From 38f138bc22ae705e8e09f75fe6bac4bb470dc29b Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 17 Apr 2025 23:37:45 +0000
Subject: [PATCH 001/901] 8354985: Add unit tests for Executor class from
 jpackage test lib

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/ExecutorTest.java       | 370 ++++++++++++++++++
 .../helpers/jdk/jpackage/test/Executor.java   |  30 +-
 2 files changed, 387 insertions(+), 13 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java

diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
new file mode 100644
index 00000000000..8175f49a2b2
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
@@ -0,0 +1,370 @@
+/*
+ * 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.joining;
+import static java.util.stream.Collectors.toSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+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.PrintWriter;
+import java.io.UncheckedIOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.spi.ToolProvider;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class ExecutorTest extends JUnitAdapter {
+
+    private record Command(List<String> stdout, List<String> stderr) {
+        Command {
+            stdout.forEach(Objects::requireNonNull);
+            stderr.forEach(Objects::requireNonNull);
+        }
+
+        List<String> asExecutable() {
+            final List<String> commandline = new ArrayList<>();
+            if (TKit.isWindows()) {
+                commandline.addAll(List.of("cmd", "/C"));
+            } else {
+                commandline.addAll(List.of("sh", "-c"));
+            }
+            commandline.add(Stream.concat(createEchoCommands(stdout),
+                    createEchoCommands(stderr).map(v -> v + ">&2")).collect(joining(" && ")));
+            return commandline;
+        }
+
+        private static Stream<String> createEchoCommands(List<String> lines) {
+            return lines.stream().map(line -> {
+                if (TKit.isWindows()) {
+                    return "(echo " + line + ")";
+                } else {
+                    return "echo " + line;
+                }
+            });
+        }
+
+        ToolProvider asToolProvider() {
+            return new ToolProvider() {
+
+                @Override
+                public int run(PrintWriter out, PrintWriter err, String... args) {
+                    stdout.forEach(out::println);
+                    stderr.forEach(err::println);
+                    return 0;
+                }
+
+                @Override
+                public String name() {
+                    return "test";
+                }
+            };
+        }
+    }
+
+    private enum OutputData {
+        EMPTY(List.of()),
+        ONE_LINE(List.of("Jupiter")),
+        MANY(List.of("Uranus", "Saturn", "Earth"));
+
+        OutputData(List<String> data) {
+            data.forEach(Objects::requireNonNull);
+            this.data = data;
+        }
+
+        final List<String> data;
+    }
+
+    private record CommandSpec(OutputData stdout, OutputData stderr) {
+        CommandSpec {
+            Objects.requireNonNull(stdout);
+            Objects.requireNonNull(stderr);
+        }
+
+        Command command() {
+            return new Command(stdout.data.stream().map(line -> {
+                return "stdout." + line;
+            }).toList(), stderr.data.stream().map(line -> {
+                return "stderr." + line;
+            }).toList());
+        }
+    }
+
+    public enum OutputControl {
+        DUMP(Executor::dumpOutput),
+        SAVE_ALL(Executor::saveOutput),
+        SAVE_FIRST_LINE(Executor::saveFirstLineOfOutput),
+        DISCARD_STDOUT(NOP),
+        DISCARD_STDERR(NOP),
+        ;
+
+        OutputControl(Consumer<Executor> configureExector) {
+            this.configureExector = Objects.requireNonNull(configureExector);
+        }
+
+        Executor applyTo(Executor exec) {
+            configureExector.accept(exec);
+            return exec;
+        }
+
+        static List<Set<OutputControl>> variants() {
+            final List<Set<OutputControl>> variants = new ArrayList<>();
+            for (final var withDump : BOOLEAN_VALUES) {
+                variants.addAll(Stream.of(
+                        Set.<OutputControl>of(),
+                        Set.of(SAVE_ALL),
+                        Set.of(SAVE_FIRST_LINE),
+                        Set.of(DISCARD_STDOUT),
+                        Set.of(DISCARD_STDERR),
+                        Set.of(SAVE_ALL, DISCARD_STDOUT),
+                        Set.of(SAVE_FIRST_LINE, DISCARD_STDOUT),
+                        Set.of(SAVE_ALL, DISCARD_STDERR),
+                        Set.of(SAVE_FIRST_LINE, DISCARD_STDERR),
+                        Set.of(SAVE_ALL, DISCARD_STDOUT, DISCARD_STDERR),
+                        Set.of(SAVE_FIRST_LINE, DISCARD_STDOUT, DISCARD_STDERR)
+                ).map(v -> {
+                    if (withDump) {
+                        return Stream.concat(Stream.of(DUMP), v.stream()).collect(toSet());
+                    } else {
+                        return v;
+                    }
+                }).toList());
+            }
+            return variants.stream().map(options -> {
+                return options.stream().filter(o -> {
+                    return o.configureExector != NOP;
+                }).collect(toSet());
+            }).distinct().toList();
+        }
+
+        private final Consumer<Executor> configureExector;
+
+        static final Set<OutputControl> SAVE = Set.of(SAVE_ALL, SAVE_FIRST_LINE);
+    }
+
+    public record OutputTestSpec(boolean toolProvider, Set<OutputControl> outputControl, CommandSpec commandSpec) {
+        public OutputTestSpec {
+            outputControl.forEach(Objects::requireNonNull);
+            if (outputControl.containsAll(OutputControl.SAVE)) {
+                throw new IllegalArgumentException();
+            }
+            Objects.requireNonNull(commandSpec);
+        }
+
+        @Override
+        public String toString() {
+            final List<String> tokens = new ArrayList<>();
+
+            if (toolProvider) {
+                tokens.add("tool-provider");
+            }
+
+            tokens.add("output=" + format(outputControl));
+            tokens.add("command=" + commandSpec);
+
+            return String.join(",", tokens.toArray(String[]::new));
+        }
+
+        void test() {
+            final var command = commandSpec.command();
+            final var commandWithDiscardedStreams = discardStreams(command);
+
+            final Executor.Result[] result = new Executor.Result[1];
+            final var outputCapture = OutputCapture.captureOutput(() -> {
+                result[0] = createExecutor(command).executeWithoutExitCodeCheck();
+            });
+
+            assertEquals(0, result[0].getExitCode());
+
+            assertEquals(expectedCapturedSystemOut(commandWithDiscardedStreams), outputCapture.outLines());
+            assertEquals(expectedCapturedSystemErr(commandWithDiscardedStreams), outputCapture.errLines());
+
+            if (!saveOutput()) {
+                assertNull(result[0].getOutput());
+            } else {
+                assertNotNull(result[0].getOutput());
+                final var allExpectedOutput = expectedCommandOutput(command);
+                assertEquals(allExpectedOutput.isEmpty(), result[0].getOutput().isEmpty());
+                if (!allExpectedOutput.isEmpty()) {
+                    if (outputControl.contains(OutputControl.SAVE_ALL)) {
+                        assertEquals(allExpectedOutput, result[0].getOutput());
+                    } else if (outputControl.contains(OutputControl.SAVE_FIRST_LINE)) {
+                        assertEquals(1, result[0].getOutput().size());
+                        assertEquals(allExpectedOutput.getFirst(), result[0].getFirstLineOfOutput());
+                    } else {
+                        throw new UnsupportedOperationException();
+                    }
+                }
+            }
+        }
+
+        private boolean dumpOutput() {
+            return outputControl.contains(OutputControl.DUMP);
+        }
+
+        private boolean saveOutput() {
+            return !Collections.disjoint(outputControl, OutputControl.SAVE);
+        }
+
+        private boolean discardStdout() {
+            return outputControl.contains(OutputControl.DISCARD_STDOUT);
+        }
+
+        private boolean discardStderr() {
+            return outputControl.contains(OutputControl.DISCARD_STDERR);
+        }
+
+        private static String format(Set<OutputControl> outputControl) {
+            return outputControl.stream().map(OutputControl::name).sorted().collect(joining("+"));
+        }
+
+        private List<String> expectedCapturedSystemOut(Command command) {
+            if (!dumpOutput() || (!toolProvider && !saveOutput())) {
+                return List.of();
+            } else if(saveOutput()) {
+                return Stream.concat(command.stdout().stream(), command.stderr().stream()).toList();
+            } else {
+                return command.stdout();
+            }
+        }
+
+        private List<String> expectedCapturedSystemErr(Command command) {
+            if (!dumpOutput() || (!toolProvider && !saveOutput())) {
+                return List.of();
+            } else if(saveOutput()) {
+                return List.of();
+            } else {
+                return command.stderr();
+            }
+        }
+
+        private Command discardStreams(Command command) {
+            return new Command(discardStdout() ? List.of() : command.stdout(), discardStderr() ? List.of() : command.stderr());
+        }
+
+        private record OutputCapture(byte[] out, byte[] err, Charset outCharset, Charset errCharset) {
+            OutputCapture {
+                Objects.requireNonNull(out);
+                Objects.requireNonNull(err);
+                Objects.requireNonNull(outCharset);
+                Objects.requireNonNull(errCharset);
+            }
+
+            List<String> outLines() {
+                return toLines(out, outCharset);
+            }
+
+            List<String> errLines() {
+                return toLines(err, errCharset);
+            }
+
+            private static List<String> toLines(byte[] buf, Charset charset) {
+                try (var reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf), charset))) {
+                    return reader.lines().filter(line -> {
+                        return !line.contains("TRACE");
+                    }).toList();
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            }
+
+            static OutputCapture captureOutput(Runnable runnable) {
+                final var captureOut = new ByteArrayOutputStream();
+                final var captureErr = new ByteArrayOutputStream();
+
+                final var out = System.out;
+                final var err = System.err;
+                try {
+                    final var outCharset = System.out.charset();
+                    final var errCharset = System.err.charset();
+                    System.setOut(new PrintStream(captureOut, true, outCharset));
+                    System.setErr(new PrintStream(captureErr, true, errCharset));
+                    runnable.run();
+                    return new OutputCapture(captureOut.toByteArray(), captureErr.toByteArray(), outCharset, errCharset);
+                } finally {
+                    try {
+                        System.setOut(out);
+                    } finally {
+                        System.setErr(err);
+                    }
+                }
+            }
+        }
+
+        private List<String> expectedCommandOutput(Command command) {
+            command = discardStreams(command);
+            return Stream.of(command.stdout(), command.stderr()).flatMap(List::stream).toList();
+        }
+
+        private Executor createExecutor(Command command) {
+            final Executor exec;
+            if (toolProvider) {
+                exec = Executor.of(command.asToolProvider());
+            } else {
+                exec = Executor.of(command.asExecutable());
+            }
+
+            outputControl.forEach(control -> control.applyTo(exec));
+
+            return exec;
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testSavedOutput(OutputTestSpec spec) {
+        spec.test();
+    }
+
+    public static List<OutputTestSpec> testSavedOutput() {
+        List<OutputTestSpec> testCases = new ArrayList<>();
+        for (final var toolProvider : BOOLEAN_VALUES) {
+            for (final var outputControl : OutputControl.variants()) {
+                for (final var stdoutContent : List.of(OutputData.values())) {
+                    for (final var stderrContent : List.of(OutputData.values())) {
+                        final var commandSpec = new CommandSpec(stdoutContent, stderrContent);
+                        testCases.add(new OutputTestSpec(toolProvider, outputControl, commandSpec));
+                    }
+                }
+            }
+        }
+        return testCases;
+    }
+
+    private static final List<Boolean> BOOLEAN_VALUES = List.of(Boolean.TRUE, Boolean.FALSE);
+    private static final Consumer<Executor> NOP = exec -> {};
+}
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 66cd422203b..053674960c4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -29,9 +29,9 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
+import java.io.Writer;
 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;
@@ -50,8 +50,16 @@
 public final class Executor extends CommandArguments<Executor> {
 
     public static Executor of(String... cmdline) {
-        return new Executor().setExecutable(cmdline[0]).addArguments(
-                Arrays.copyOfRange(cmdline, 1, cmdline.length));
+        return of(List.of(cmdline));
+    }
+
+    public static Executor of(List<String> cmdline) {
+        cmdline.forEach(Objects::requireNonNull);
+        return new Executor().setExecutable(cmdline.getFirst()).addArguments(cmdline.subList(1, cmdline.size()));
+    }
+
+    public static Executor of(ToolProvider toolProvider, String... args) {
+        return new Executor().setToolProvider(toolProvider).addArguments(List.of(args));
     }
 
     public Executor() {
@@ -414,8 +422,8 @@ private Result runExecutable() throws IOException, InterruptedException {
                         || saveOutputType.contains(SaveOutputType.FULL)) {
                     outputLines = outReader.lines().collect(Collectors.toList());
                 } else {
-                    outputLines = Arrays.asList(
-                            outReader.lines().findFirst().orElse(null));
+                    outputLines = Optional.ofNullable(outReader.readLine()).map(List::of).orElseGet(List::of);
+                    outReader.transferTo(Writer.nullWriter());
                 }
             } finally {
                 if (saveOutputType.contains(SaveOutputType.DUMP) && outputLines != null) {
@@ -475,15 +483,11 @@ public void write(int b) {
             final var exitCode = runToolProvider(ps, ps);
             ps.flush();
             final List<String> output;
+            final var bufAsString = buf.toString();
             try (BufferedReader bufReader = new BufferedReader(new StringReader(
-                    buf.toString()))) {
+                    bufAsString))) {
                 if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
-                    String firstLine = bufReader.lines().findFirst().orElse(null);
-                    if (firstLine != null) {
-                        output = List.of(firstLine);
-                    } else {
-                        output = null;
-                    }
+                    output = bufReader.lines().findFirst().map(List::of).orElseGet(List::of);
                 } else if (saveOutputType.contains(SaveOutputType.FULL)) {
                     output = bufReader.lines().collect(Collectors.toUnmodifiableList());
                 } else {
@@ -495,7 +499,7 @@ public void write(int b) {
                     if (saveOutputType.contains(SaveOutputType.FULL)) {
                         lines = output.stream();
                     } else {
-                        lines = bufReader.lines();
+                        lines = new BufferedReader(new StringReader(bufAsString)).lines();
                     }
                     lines.forEach(System.out::println);
                 }

From 0995b9409d910d816276673b5c06fdf7826bfac7 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Fri, 18 Apr 2025 02:20:39 +0000
Subject: [PATCH 002/901] 8354815: RISC-V: Change type of bitwise rotation
 shift to iRegIorL2I

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/riscv.ad   | 14 ++++++--------
 src/hotspot/cpu/riscv/riscv_b.ad | 20 +++++++++++++++-----
 src/hotspot/cpu/riscv/riscv_v.ad |  4 ++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index aca2f4dd488..1eb1464e7d9 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -6445,7 +6445,6 @@ instruct addI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immIAdd src2) %{
   format %{ "addiw  $dst, $src1, $src2\t#@addI_reg_imm" %}
 
   ins_encode %{
-    int32_t con = (int32_t)$src2$$constant;
     __ addiw(as_Register($dst$$reg),
              as_Register($src1$$reg),
              $src2$$constant);
@@ -6507,7 +6506,6 @@ instruct addP_reg_imm(iRegPNoSp dst, iRegP src1, immLAdd src2) %{
   format %{ "addi  $dst, $src1, $src2\t# ptr, #@addP_reg_imm" %}
 
   ins_encode %{
-    // src2 is imm, so actually call the addi
     __ addi(as_Register($dst$$reg),
             as_Register($src1$$reg),
             $src2$$constant);
@@ -6829,7 +6827,7 @@ instruct UmodL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
 // Integer Shifts
 
 // Shift Left Register
-// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+// Only the low 5 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct lShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   match(Set dst (LShiftI src1 src2));
   ins_cost(ALU_COST);
@@ -6862,7 +6860,7 @@ instruct lShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
 %}
 
 // Shift Right Logical Register
-// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+// Only the low 5 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct urShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   match(Set dst (URShiftI src1 src2));
   ins_cost(ALU_COST);
@@ -6895,7 +6893,7 @@ instruct urShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
 %}
 
 // Shift Right Arithmetic Register
-// In RV64I, only the low 5 bits of src2 are considered for the shift amount
+// Only the low 5 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct rShiftI_reg_reg(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   match(Set dst (RShiftI src1 src2));
   ins_cost(ALU_COST);
@@ -6930,7 +6928,7 @@ instruct rShiftI_reg_imm(iRegINoSp dst, iRegIorL2I src1, immI src2) %{
 // Long Shifts
 
 // Shift Left Register
-// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+// Only the low 6 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct lShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
   match(Set dst (LShiftL src1 src2));
 
@@ -6965,7 +6963,7 @@ instruct lShiftL_reg_imm(iRegLNoSp dst, iRegL src1, immI src2) %{
 %}
 
 // Shift Right Logical Register
-// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+// Only the low 6 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct urShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
   match(Set dst (URShiftL src1 src2));
 
@@ -7018,7 +7016,7 @@ instruct urShiftP_reg_imm(iRegLNoSp dst, iRegP src1, immI src2) %{
 %}
 
 // Shift Right Arithmetic Register
-// In RV64I, only the low 6 bits of src2 are considered for the shift amount
+// Only the low 6 bits of src2 are considered for the shift amount, all other bits are ignored.
 instruct rShiftL_reg_reg(iRegLNoSp dst, iRegL src1, iRegIorL2I src2) %{
   match(Set dst (RShiftL src1 src2));
 
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
index ed9fca13a1b..beac10ec03d 100644
--- a/src/hotspot/cpu/riscv/riscv_b.ad
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -25,7 +25,8 @@
 
 // RISCV Bit-Manipulation Extension Architecture Description File
 
-instruct rorI_imm_b(iRegINoSp dst, iRegI src, immI shift) %{
+// Rotate Right Word Immediate
+instruct rorI_imm_b(iRegINoSp dst, iRegIorL2I src, immI shift) %{
   predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
@@ -39,6 +40,7 @@ instruct rorI_imm_b(iRegINoSp dst, iRegI src, immI shift) %{
   ins_pipe(ialu_reg_shift);
 %}
 
+// Rotate Right Immediate
 instruct rorL_imm_b(iRegLNoSp dst, iRegL src, immI shift) %{
   predicate(UseZbb);
   match(Set dst (RotateRight src shift));
@@ -53,7 +55,9 @@ instruct rorL_imm_b(iRegLNoSp dst, iRegL src, immI shift) %{
   ins_pipe(ialu_reg_shift);
 %}
 
-instruct rorI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
+// Rotate Right Word Register
+// Only the low 5 bits of shift value are used, all other bits are ignored.
+instruct rorI_reg_b(iRegINoSp dst, iRegIorL2I src, iRegIorL2I shift) %{
   predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
@@ -65,7 +69,9 @@ instruct rorI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rorL_reg_b(iRegLNoSp dst, iRegL src, iRegI shift) %{
+// Rotate Right Register
+// Only the low 6 bits of shift value are used, all other bits are ignored.
+instruct rorL_reg_b(iRegLNoSp dst, iRegL src, iRegIorL2I shift) %{
   predicate(UseZbb);
   match(Set dst (RotateRight src shift));
 
@@ -77,7 +83,9 @@ instruct rorL_reg_b(iRegLNoSp dst, iRegL src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rolI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
+// Rotate Left Word Register
+// Only the low 5 bits of shift value are used, all other bits are ignored.
+instruct rolI_reg_b(iRegINoSp dst, iRegIorL2I src, iRegIorL2I shift) %{
   predicate(UseZbb);
   match(Set dst (RotateLeft src shift));
 
@@ -89,7 +97,9 @@ instruct rolI_reg_b(iRegINoSp dst, iRegI src, iRegI shift) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct rolL_reg_b(iRegLNoSp dst, iRegL src, iRegI shift) %{
+// Rotate Left Register
+// Only the low 6 bits of shift value are used, all other bits are ignored.
+instruct rolL_reg_b(iRegLNoSp dst, iRegL src, iRegIorL2I shift) %{
   predicate(UseZbb);
   match(Set dst (RotateLeft src shift));
 
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 9b135215b3d..7c1ca4f8960 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -3499,6 +3499,7 @@ instruct vrotate_right(vReg dst, vReg src, vReg shift) %{
   ins_pipe(pipe_slow);
 %}
 
+// Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
 instruct vrotate_right_reg(vReg dst, vReg src, iRegIorL2I shift) %{
   match(Set dst (RotateRightV src (Replicate shift)));
   format %{ "vrotate_right_reg $dst, $src, $shift\t" %}
@@ -3541,6 +3542,7 @@ instruct vrotate_right_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
 instruct vrotate_right_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateRightV (Binary dst_src (Replicate shift)) v0));
   format %{ "vrotate_right_reg_masked $dst_src, $dst_src, $shift, v0.t\t" %}
@@ -3584,6 +3586,7 @@ instruct vrotate_left(vReg dst, vReg src, vReg shift) %{
   ins_pipe(pipe_slow);
 %}
 
+// Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
 instruct vrotate_left_reg(vReg dst, vReg src, iRegIorL2I shift) %{
   match(Set dst (RotateLeftV src (Replicate shift)));
   format %{ "vrotate_left_reg $dst, $src, $shift\t" %}
@@ -3627,6 +3630,7 @@ instruct vrotate_left_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
 instruct vrotate_left_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateLeftV (Binary dst_src (Replicate shift)) v0));
   format %{ "vrotate_left_reg_masked $dst_src, $dst_src, $shift, v0.t\t" %}

From 0feecb7c6a982e5c65df0242711ecdb0691cef87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C5=A0ipka?= <isipka@openjdk.org>
Date: Fri, 18 Apr 2025 10:44:29 +0000
Subject: [PATCH 003/901] 8351851: Update PmemTest to run on AMD64

Reviewed-by: adinn
---
 test/jdk/java/nio/MappedByteBuffer/PmemTest.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/jdk/java/nio/MappedByteBuffer/PmemTest.java b/test/jdk/java/nio/MappedByteBuffer/PmemTest.java
index 2771295c8a0..0c931b3606f 100644
--- a/test/jdk/java/nio/MappedByteBuffer/PmemTest.java
+++ b/test/jdk/java/nio/MappedByteBuffer/PmemTest.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
@@ -77,25 +77,24 @@
  *  make test TEST=jdk/java/nio/MappedByteBuffer/PmemTest.java
 */
 
-/* @test
+/* @test id=default_architecture_test_case
  * @summary Testing NVRAM mapped byte buffer support
  * @run main/manual PmemTest
  * @requires (os.family == "linux")
- * @requires (os.arch == "x86_64")
+ * @requires ((os.arch == "x86_64")|(os.arch == "amd64"))
  */
 
-/* @test
+/* @test id=other_architectures_test_case
  * @summary Testing NVRAM mapped byte buffer support
  * @run main/manual PmemTest
  * @requires (os.family == "linux")
- * @requires ((os.arch == "amd64")|(os.arch == "aarch64")|(os.arch == "ppc64le"))
+ * @requires ((os.arch == "aarch64")|(os.arch == "ppc64le"))
  * @ignore The test described here is currently disabled on systems that are not
  * x64-based and lack an external NVRAM memory device. In order to re-enable the
  * test, you will need to mount the NVRAM device, which will typically appear as
  * /dev/pmem0, to the directory /mnt/pmem. Once that is done, you can follow the
  * instructions above to create a test directory and remove the ignore tag.
  */
-
 import java.io.File;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
@@ -173,4 +172,4 @@ public static void dumpBufferPoolBeans()
                                "\n}");
         }
     }
-}
+}
\ No newline at end of file

From eda7394551b470e9dc547be93711bcceac45f303 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Fri, 18 Apr 2025 12:05:01 +0000
Subject: [PATCH 004/901] 8354900: javax/swing/AbstractButton/bug4133768.java
 failing on macosx-aarch64

Reviewed-by: abhiscxk
---
 .../swing/AbstractButton/bug4133768.java      | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/test/jdk/javax/swing/AbstractButton/bug4133768.java b/test/jdk/javax/swing/AbstractButton/bug4133768.java
index ad5f56c0149..4ccec98c6ec 100644
--- a/test/jdk/javax/swing/AbstractButton/bug4133768.java
+++ b/test/jdk/javax/swing/AbstractButton/bug4133768.java
@@ -34,8 +34,11 @@
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import javax.swing.AbstractButton;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -47,20 +50,28 @@
 import javax.swing.SwingUtilities;
 
 public class bug4133768 {
-    private static Icon RED, GREEN;
+    private static Icon RED;
+    private static Icon GREEN;
     private static JFrame f;
     private static AbstractButton[] buttons;
     private static volatile Point buttonLocation;
     private static volatile int buttonWidth;
     private static volatile int buttonHeight;
     private static Robot robot;
+    private static int ROLLOVER_Y_OFFSET = 4;
+    private static CountDownLatch frameGainedFocusLatch =
+        new CountDownLatch(1);
 
     public static void main(String[] args) throws Exception {
         try {
             createTestImages();
             createUI();
+            f.requestFocus();
+            if (!frameGainedFocusLatch.await(5, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Waited too long, but can't gain" +
+                    " focus for frame");
+            }
             robot = new Robot();
-            robot.delay(1000);
             for (AbstractButton b : buttons) {
                 testEnabledButton(b);
             }
@@ -78,9 +89,9 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    private static void createTestImages() throws IOException {
-        int imageWidth = 32;
-        int imageHeight = 32;
+    private static void createTestImages() {
+        int imageWidth = 100;
+        int imageHeight = 100;
         BufferedImage redImg = new BufferedImage(imageWidth, imageHeight,
             BufferedImage.TYPE_INT_RGB);
         Graphics2D g = redImg.createGraphics();
@@ -114,6 +125,12 @@ private static void createUI() throws Exception {
                 b.setRolloverSelectedIcon(GREEN);
                 buttonPanel.add(b);
             }
+            f.addFocusListener(new FocusAdapter() {
+                @Override
+                public void focusGained(FocusEvent e) {
+                    frameGainedFocusLatch.countDown();
+                }
+            });
             f.setLayout(new GridLayout(2, 1));
             f.add(buttonPanel);
             f.pack();
@@ -123,7 +140,8 @@ private static void createUI() throws Exception {
         });
     }
 
-    private static void testEnabledButton(AbstractButton button) throws Exception {
+    private static void testEnabledButton(AbstractButton button)
+        throws Exception {
         robot.waitForIdle();
         SwingUtilities.invokeAndWait(() -> {
             buttonLocation = button.getLocationOnScreen();
@@ -131,7 +149,7 @@ private static void testEnabledButton(AbstractButton button) throws Exception {
             buttonHeight = button.getHeight();
         });
         robot.mouseMove(buttonLocation.x + buttonWidth / 2,
-            buttonLocation.y + buttonHeight / 2 );
+            buttonLocation.y + ROLLOVER_Y_OFFSET);
         robot.delay(1000);
         Color buttonColor = robot.getPixelColor(buttonLocation.x +
             buttonWidth / 2, buttonLocation.y + buttonHeight / 2);
@@ -141,16 +159,15 @@ private static void testEnabledButton(AbstractButton button) throws Exception {
         }
     }
 
-    private static void testDisabledButton(AbstractButton button) throws Exception {
+    private static void testDisabledButton(AbstractButton button)
+        throws Exception {
         robot.waitForIdle();
         SwingUtilities.invokeAndWait(() -> {
             buttonLocation = button.getLocationOnScreen();
             buttonWidth = button.getWidth();
             buttonHeight = button.getHeight();
         });
-        robot.mouseMove(buttonLocation.x + buttonWidth / 2,
-            buttonLocation.y + buttonHeight / 2 );
-        robot.delay(1000);
+        robot.delay(200);
         Color buttonColor = robot.getPixelColor(buttonLocation.x +
             buttonWidth / 2, buttonLocation.y + buttonHeight / 2);
         if (buttonColor.equals(Color.GREEN) ||

From 22e8a97a1ce4e1c781fbc6f1e271c477fe95f069 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 18 Apr 2025 12:12:52 +0000
Subject: [PATCH 005/901] 8354988: Separate stderr and stdout in Executor class
 from jpackage test lib

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/ExecutorTest.java       |  29 +-
 .../jdk/jpackage/test/PackageTestTest.java    |   2 +-
 .../helpers/jdk/jpackage/test/Executor.java   | 668 ++++++++++++++----
 .../jdk/jpackage/test/JPackageCommand.java    |  17 +
 .../jdk/jpackage/test/WindowsHelper.java      |  13 +-
 test/jdk/tools/jpackage/share/BasicTest.java  |   7 +-
 .../jpackage/windows/Win8301247Test.java      |  36 +-
 7 files changed, 601 insertions(+), 171 deletions(-)

diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
index 8175f49a2b2..c5d8aed845c 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/ExecutorTest.java
@@ -128,8 +128,8 @@ public enum OutputControl {
         DUMP(Executor::dumpOutput),
         SAVE_ALL(Executor::saveOutput),
         SAVE_FIRST_LINE(Executor::saveFirstLineOfOutput),
-        DISCARD_STDOUT(NOP),
-        DISCARD_STDERR(NOP),
+        DISCARD_STDOUT(Executor::discardStdout),
+        DISCARD_STDERR(Executor::discardStderr),
         ;
 
         OutputControl(Consumer<Executor> configureExector) {
@@ -213,6 +213,9 @@ void test() {
             assertEquals(expectedCapturedSystemOut(commandWithDiscardedStreams), outputCapture.outLines());
             assertEquals(expectedCapturedSystemErr(commandWithDiscardedStreams), outputCapture.errLines());
 
+            assertEquals(expectedResultStdout(commandWithDiscardedStreams), result[0].stdout().getOutput());
+            assertEquals(expectedResultStderr(commandWithDiscardedStreams), result[0].stderr().getOutput());
+
             if (!saveOutput()) {
                 assertNull(result[0].getOutput());
             } else {
@@ -272,6 +275,28 @@ private List<String> expectedCapturedSystemErr(Command command) {
             }
         }
 
+        private List<String> expectedResultStdout(Command command) {
+            return expectedResultStream(command.stdout());
+        }
+
+        private List<String> expectedResultStderr(Command command) {
+            if (outputControl.contains(OutputControl.SAVE_FIRST_LINE) && !command.stdout().isEmpty()) {
+                return List.of();
+            }
+            return expectedResultStream(command.stderr());
+        }
+
+        private List<String> expectedResultStream(List<String> commandOutput) {
+            Objects.requireNonNull(commandOutput);
+            if (outputControl.contains(OutputControl.SAVE_ALL)) {
+                return commandOutput;
+            } else if (outputControl.contains(OutputControl.SAVE_FIRST_LINE)) {
+                return commandOutput.stream().findFirst().map(List::of).orElseGet(List::of);
+            } else {
+                return null;
+            }
+        }
+
         private Command discardStreams(Command command) {
             return new Command(discardStdout() ? List.of() : command.stdout(), discardStderr() ? List.of() : command.stderr());
         }
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 3e14022a70e..da94db30925 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
@@ -370,7 +370,7 @@ public Executor.Result execute(int expectedExitCode) {
                         } catch (IOException ex) {
                             throw new UncheckedIOException(ex);
                         }
-                        return new Executor.Result(actualJPackageExitCode, null,
+                        return new Executor.Result(actualJPackageExitCode,
                                 this::getPrintableCommandLine).assertExitCodeIs(expectedExitCode);
                     }
                 };
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 053674960c4..91625603a2b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -22,9 +22,12 @@
  */
 package jdk.jpackage.test;
 
+import static java.util.stream.Collectors.joining;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -32,7 +35,6 @@
 import java.io.Writer;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -63,7 +65,7 @@ public static Executor of(ToolProvider toolProvider, String... args) {
     }
 
     public Executor() {
-        saveOutputType = new HashSet<>(Set.of(SaveOutputType.NONE));
+        outputStreamsControl = new OutputStreamsControl();
         winEnglishOutput = false;
     }
 
@@ -131,54 +133,48 @@ public Executor setWindowsTmpDir(String tmp) {
     }
 
     /**
-     * Configures this instance to save full output that command will produce.
-     * This function is mutual exclusive with
-     * saveFirstLineOfOutput() function.
+     * Configures this instance to save all stdout and stderr streams from the to be
+     * executed command.
+     * <p>
+     * This function is mutually exclusive with {@link #saveFirstLineOfOutput()}.
      *
      * @return this
      */
     public Executor saveOutput() {
-        saveOutputType.remove(SaveOutputType.FIRST_LINE);
-        saveOutputType.add(SaveOutputType.FULL);
-        return this;
+        return saveOutput(true);
     }
 
     /**
-     * Configures how to save output that command will produce. If
-     * <code>v</code> is <code>true</code>, the function call is equivalent to
-     * <code>saveOutput()</code> call. If <code>v</code> is <code>false</code>,
-     * the function will result in not preserving command output.
+     * Configures if all stdout and stderr streams from the to be executed command
+     * should be saved.
+     * <p>
+     * If <code>v</code> is <code>true</code>, the function call is equivalent to
+     * {@link #saveOutput()} call. If <code>v</code> is <code>false</code>, command
+     * output will not be saved.
+     *
+     * @parameter v if both stdout and stderr streams should be saved
      *
      * @return this
      */
     public Executor saveOutput(boolean v) {
-        if (v) {
-            saveOutput();
-        } else {
-            saveOutputType.remove(SaveOutputType.FIRST_LINE);
-            saveOutputType.remove(SaveOutputType.FULL);
-        }
-        return this;
+        return setOutputControl(v, OutputControlOption.SAVE_ALL);
     }
 
     /**
-     * Configures this instance to save only the first line out output that
-     * command will produce. This function is mutual exclusive with
-     * saveOutput() function.
+     * Configures this instance to save the first line of a stream merged from
+     * stdout and stderr streams from the to be executed command.
+     * <p>
+     * This function is mutually exclusive with {@link #saveOutput()}.
      *
      * @return this
      */
     public Executor saveFirstLineOfOutput() {
-        saveOutputType.add(SaveOutputType.FIRST_LINE);
-        saveOutputType.remove(SaveOutputType.FULL);
-        return this;
+        return setOutputControl(true, OutputControlOption.SAVE_FIRST_LINE);
     }
 
     /**
-     * Configures this instance to dump all output that command will produce to
-     * System.out and System.err. Can be used together with saveOutput() and
-     * saveFirstLineOfOutput() to save command output and also copy it in the
-     * default output streams.
+     * Configures this instance to dump both stdout and stderr streams from the to
+     * be executed command into {@link System.out}.
      *
      * @return this
      */
@@ -187,26 +183,60 @@ public Executor dumpOutput() {
     }
 
     public Executor dumpOutput(boolean v) {
-        if (v) {
-            saveOutputType.add(SaveOutputType.DUMP);
-        } else {
-            saveOutputType.remove(SaveOutputType.DUMP);
-        }
+        return setOutputControl(v, OutputControlOption.DUMP);
+    }
+
+    public Executor discardStdout(boolean v) {
+        outputStreamsControl.stdout().discard(v);
         return this;
     }
 
-    public record Result(int exitCode, List<String> output, Supplier<String> cmdline) {
+    public Executor discardStdout() {
+        return discardStdout(true);
+    }
 
+    public Executor discardStderr(boolean v) {
+        outputStreamsControl.stderr().discard(v);
+        return this;
+    }
+
+    public Executor discardStderr() {
+        return discardStderr(true);
+    }
+
+    public interface Output {
+        public List<String> getOutput();
+
+        public default String getFirstLineOfOutput() {
+            return findFirstLineOfOutput().orElseThrow();
+        }
+
+        public default Optional<String> findFirstLineOfOutput() {
+            return getOutput().stream().findFirst();
+        }
+    }
+
+    public record Result(int exitCode, CommandOutput output, Supplier<String> cmdline) implements Output {
         public Result {
+            Objects.requireNonNull(output);
             Objects.requireNonNull(cmdline);
         }
 
-        public String getFirstLineOfOutput() {
-            return output.get(0);
+        public Result(int exitCode, Supplier<String> cmdline) {
+            this(exitCode, CommandOutput.EMPTY, cmdline);
         }
 
+        @Override
         public List<String> getOutput() {
-            return output;
+            return output.lines().orElse(null);
+        }
+
+        public Output stdout() {
+            return createView(output.stdoutLines());
+        }
+
+        public Output stderr() {
+            return createView(output.stderrLines());
         }
 
         public Result assertExitCodeIs(int expectedExitCode) {
@@ -223,6 +253,15 @@ public Result assertExitCodeIsZero() {
         public int getExitCode() {
             return exitCode;
         }
+
+        private static Output createView(Optional<List<String>> lines) {
+            return new Output() {
+                @Override
+                public List<String> getOutput() {
+                    return lines.orElse(null);
+                }
+            };
+        }
     }
 
     public Result executeWithoutExitCodeCheck() {
@@ -278,27 +317,42 @@ Result getValue() {
         private static final long serialVersionUID = 1L;
     }
 
-    /*
-     * Repeates command "max" times and waits for "wait" seconds between each
-     * execution until command returns expected error code.
+    /**
+     * Executes the configured command {@code max} at most times and waits for
+     * {@code wait} seconds between each execution until the command exits with
+     * {@code expectedCode} exit code.
+     *
+     * @param expectedExitCode the expected exit code of the command
+     * @param max              the maximum times to execute the command
+     * @param wait             number of seconds to wait between executions of the
+     *                         command
      */
-    public Result executeAndRepeatUntilExitCode(int expectedCode, int max, int wait) {
+    public Result executeAndRepeatUntilExitCode(int expectedExitCode, int max, int wait) {
         try {
             return tryRunMultipleTimes(() -> {
                 Result result = executeWithoutExitCodeCheck();
-                if (result.getExitCode() != expectedCode) {
+                if (result.getExitCode() != expectedExitCode) {
                     throw new BadResultException(result);
                 }
                 return result;
-            }, max, wait).assertExitCodeIs(expectedCode);
+            }, max, wait).assertExitCodeIs(expectedExitCode);
         } catch (BadResultException ex) {
-            return ex.getValue().assertExitCodeIs(expectedCode);
+            return ex.getValue().assertExitCodeIs(expectedExitCode);
         }
     }
 
-    /*
-     * Repeates a "task" "max" times and waits for "wait" seconds between each
-     * execution until the "task" returns without throwing an exception.
+    /**
+     * Calls {@code task.get()} at most {@code max} times and waits for {@code wait}
+     * seconds between each call until {@code task.get()} invocation returns without
+     * throwing {@link RuntimeException} exception.
+     * <p>
+     * Returns the object returned by the first {@code task.get()} invocation that
+     * didn't throw an exception or rethrows the last exception if all of
+     * {@code max} attempts ended in exception being thrown.
+     *
+     * @param task the object of which to call {@link Supplier#get()} function
+     * @param max  the maximum times to execute the command
+     * @param wait number of seconds to wait between executions of the
      */
     public static <T> T tryRunMultipleTimes(Supplier<T> task, int max, int wait) {
         RuntimeException lastException = null;
@@ -334,9 +388,10 @@ public List<String> executeWithoutExitCodeCheckAndGetOutput() {
         return saveOutput().executeWithoutExitCodeCheck().getOutput();
     }
 
-    private boolean withSavedOutput() {
-        return saveOutputType.contains(SaveOutputType.FULL) || saveOutputType.contains(
-                SaveOutputType.FIRST_LINE);
+    private Executor setOutputControl(boolean set, OutputControlOption v) {
+        outputStreamsControl.stdout().set(set, v);
+        outputStreamsControl.stderr().set(set, v);
+        return this;
     }
 
     private Path executablePath() {
@@ -349,8 +404,8 @@ private Path executablePath() {
         // If relative path to executable is used it seems to be broken when
         // ProcessBuilder changes the directory. On Windows it changes the
         // directory first and on Linux it looks up for executable before
-        // changing the directory. So to stay of safe side, use absolute path
-        // to executable.
+        // changing the directory. Use absolute path to executable to play
+        // it safely on all platforms.
         return executable.toAbsolutePath();
     }
 
@@ -371,18 +426,14 @@ private Result runExecutable() throws IOException, InterruptedException {
         if (winTmpDir != null) {
             builder.environment().put("TMP", winTmpDir);
         }
+
+        outputStreamsControl.applyTo(builder);
+
         StringBuilder sb = new StringBuilder(getPrintableCommandLine());
-        if (withSavedOutput()) {
-            builder.redirectErrorStream(true);
-            sb.append("; save output");
-        } else if (saveOutputType.contains(SaveOutputType.DUMP)) {
-            builder.inheritIO();
-            sb.append("; inherit I/O");
-        } else {
-            builder.redirectError(ProcessBuilder.Redirect.DISCARD);
-            builder.redirectOutput(ProcessBuilder.Redirect.DISCARD);
-            sb.append("; discard I/O");
-        }
+        outputStreamsControl.describe().ifPresent(desc -> {
+            sb.append("; ").append(desc);
+        });
+
         if (directory != null) {
             builder.directory(directory.toFile());
             sb.append(String.format("; in directory [%s]", directory));
@@ -414,100 +465,112 @@ private Result runExecutable() throws IOException, InterruptedException {
         trace("Execute " + sb.toString() + "...");
         Process process = builder.start();
 
-        List<String> outputLines = null;
-        if (withSavedOutput()) {
-            try (BufferedReader outReader = new BufferedReader(
-                    new InputStreamReader(process.getInputStream()))) {
-                if (saveOutputType.contains(SaveOutputType.DUMP)
-                        || saveOutputType.contains(SaveOutputType.FULL)) {
-                    outputLines = outReader.lines().collect(Collectors.toList());
-                } else {
-                    outputLines = Optional.ofNullable(outReader.readLine()).map(List::of).orElseGet(List::of);
-                    outReader.transferTo(Writer.nullWriter());
-                }
-            } finally {
-                if (saveOutputType.contains(SaveOutputType.DUMP) && outputLines != null) {
-                    outputLines.stream().forEach(System.out::println);
-                    if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
-                        // Pick the first line of saved output if there is one
-                        for (String line: outputLines) {
-                            outputLines = List.of(line);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
+        final var output = combine(
+                processProcessStream(outputStreamsControl.stdout(), process.getInputStream()),
+                processProcessStream(outputStreamsControl.stderr(), process.getErrorStream()));
 
         final int exitCode = process.waitFor();
         trace("Done. Exit code: " + exitCode);
 
-        final List<String> output;
-        if (outputLines != null) {
-            output = Collections.unmodifiableList(outputLines);
-        } else {
-            output = null;
-        }
         return createResult(exitCode, output);
     }
 
     private int runToolProvider(PrintStream out, PrintStream err) {
-        trace("Execute " + getPrintableCommandLine() + "...");
+        final var sb = new StringBuilder(getPrintableCommandLine());
+        outputStreamsControl.describe().ifPresent(desc -> {
+            sb.append("; ").append(desc);
+        });
+        trace("Execute " + sb + "...");
         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 {
+        final var toolProviderStreamConfig = ToolProviderStreamConfig.create(outputStreamsControl);
+
+        final var exitCode = runToolProvider(toolProviderStreamConfig);
+
+        final var output = combine(
+                read(outputStreamsControl.stdout(), toolProviderStreamConfig.out()),
+                read(outputStreamsControl.stderr(), toolProviderStreamConfig.err()));
+        return createResult(exitCode, output);
     }
 
-    private Result runToolProvider() throws IOException {
-        if (!withSavedOutput()) {
-            if (saveOutputType.contains(SaveOutputType.DUMP)) {
-                return createResult(runToolProvider(System.out, System.err), null);
-            }
+    private int runToolProvider(ToolProviderStreamConfig cfg) throws IOException {
+        try {
+            return runToolProvider(cfg.out().ps(), cfg.err().ps());
+        } finally {
+            cfg.out().ps().flush();
+            cfg.err().ps().flush();
+        }
+    }
 
-            PrintStream nullPrintStream = new PrintStream(new OutputStream() {
-                @Override
-                public void write(int b) {
-                    // Nop
-                }
-            });
-            return createResult(runToolProvider(nullPrintStream, nullPrintStream), null);
-        }
-
-        try (ByteArrayOutputStream buf = new ByteArrayOutputStream();
-                PrintStream ps = new PrintStream(buf)) {
-            final var exitCode = runToolProvider(ps, ps);
-            ps.flush();
-            final List<String> output;
-            final var bufAsString = buf.toString();
-            try (BufferedReader bufReader = new BufferedReader(new StringReader(
-                    bufAsString))) {
-                if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
-                    output = bufReader.lines().findFirst().map(List::of).orElseGet(List::of);
-                } else if (saveOutputType.contains(SaveOutputType.FULL)) {
-                    output = bufReader.lines().collect(Collectors.toUnmodifiableList());
-                } else {
-                    output = null;
+    private static Optional<List<String>> processProcessStream(OutputControl outputControl, InputStream in) throws IOException {
+        List<String> outputLines = null;
+        try (final var bufReader = new BufferedReader(new InputStreamReader(in))) {
+            if (outputControl.dump() || outputControl.saveAll()) {
+                outputLines = bufReader.lines().toList();
+            } else if (outputControl.saveFirstLine()) {
+                outputLines = Optional.ofNullable(bufReader.readLine()).map(List::of).orElseGet(List::of);
+                // Read all input, or the started process may exit with an error (cmd.exe does so).
+                bufReader.transferTo(Writer.nullWriter());
+            } else {
+                // This should be empty input stream, fetch it anyway.
+                bufReader.transferTo(Writer.nullWriter());
+            }
+        } finally {
+            if (outputControl.dump() && outputLines != null) {
+                outputLines.forEach(System.out::println);
+                if (outputControl.saveFirstLine()) {
+                    outputLines = outputLines.stream().findFirst().map(List::of).orElseGet(List::of);
                 }
+            }
+            if (!outputControl.save()) {
+                outputLines = null;
+            }
+        }
+        return Optional.ofNullable(outputLines);
+    }
+
+    private static Optional<List<String>> read(OutputControl outputControl, CachingPrintStream cps) throws IOException {
+        final var bufferAsString = cps.bufferContents();
+        try (final var bufReader = new BufferedReader(new StringReader(bufferAsString.orElse("")))) {
+            if (outputControl.saveFirstLine()) {
+                return Optional.of(bufReader.lines().findFirst().map(List::of).orElseGet(List::of));
+            } else if (outputControl.saveAll()) {
+                return Optional.of(bufReader.lines().toList());
+            } else if (bufferAsString.isPresent()) {
+                return Optional.of(List.of());
+            } else {
+                return Optional.empty();
+            }
+        }
+    }
 
-                if (saveOutputType.contains(SaveOutputType.DUMP)) {
-                    Stream<String> lines;
-                    if (saveOutputType.contains(SaveOutputType.FULL)) {
-                        lines = output.stream();
-                    } else {
-                        lines = new BufferedReader(new StringReader(bufAsString)).lines();
-                    }
-                    lines.forEach(System.out::println);
-                }
+    private CommandOutput combine(Optional<List<String>> out, Optional<List<String>> err) {
+        if (out.isEmpty() && err.isEmpty()) {
+            return new CommandOutput();
+        } else if (out.isEmpty()) {
+            return new CommandOutput(err, -1);
+        } else if (err.isEmpty()) {
+            return new CommandOutput(out, Integer.MAX_VALUE);
+        } else {
+            final var combined = Stream.of(out, err).map(Optional::orElseThrow).flatMap(List::stream);
+            if (outputStreamsControl.stdout().saveFirstLine() && outputStreamsControl.stderr().saveFirstLine()) {
+                return new CommandOutput(Optional.of(combined.findFirst().map(List::of).orElseGet(List::of)),
+                        Integer.min(1, out.orElseThrow().size()));
+            } else {
+                return new CommandOutput(Optional.of(combined.toList()), out.orElseThrow().size());
             }
-            return createResult(exitCode, output);
         }
     }
 
+    private Result createResult(int exitCode, CommandOutput output) {
+        return new Result(exitCode, output, this::getPrintableCommandLine);
+    }
+
     public String getPrintableCommandLine() {
         final String exec;
         String format = "[%s](%d)";
@@ -539,16 +602,343 @@ private static void trace(String msg) {
         TKit.trace(String.format("exec: %s", msg));
     }
 
+    private static PrintStream nullPrintStream() {
+        return new PrintStream(OutputStream.nullOutputStream());
+    }
+
+    private record OutputStreamsControl(OutputControl stdout, OutputControl stderr) {
+        OutputStreamsControl {
+            Objects.requireNonNull(stdout);
+            Objects.requireNonNull(stderr);
+        }
+
+        OutputStreamsControl() {
+            this(new OutputControl(), new OutputControl());
+        }
+
+        void applyTo(ProcessBuilder pb) {
+            pb.redirectOutput(stdout.asProcessBuilderRedirect());
+            pb.redirectError(stderr.asProcessBuilderRedirect());
+        }
+
+        Optional<String> describe() {
+            final List<String> tokens = new ArrayList<>();
+            if (stdout.save() || stderr.save()) {
+                streamsLabel("save ", true).ifPresent(tokens::add);
+            }
+            if (stdout.dump() || stderr.dump()) {
+                streamsLabel("inherit ", true).ifPresent(tokens::add);
+            }
+            streamsLabel("discard ", false).ifPresent(tokens::add);
+            if (tokens.isEmpty()) {
+                return Optional.empty();
+            } else {
+                return Optional.of(String.join("; ", tokens));
+            }
+        }
+
+        Optional<String> streamsLabel(String prefix, boolean negate) {
+            Objects.requireNonNull(prefix);
+            final var str = Stream.of(stdoutLabel(negate), stderrLabel(negate))
+                    .filter(Optional::isPresent)
+                    .map(Optional::orElseThrow)
+                    .collect(joining("+"));
+            if (str.isEmpty()) {
+                return Optional.empty();
+            } else {
+                return Optional.of(prefix + str);
+            }
+        }
+
+        private Optional<String> stdoutLabel(boolean negate) {
+            if ((stdout.discard() && !negate) || (!stdout.discard() && negate)) {
+                return Optional.of("out");
+            } else {
+                return Optional.empty();
+            }
+        }
+
+        private Optional<String> stderrLabel(boolean negate) {
+            if ((stderr.discard() && !negate) || (!stderr.discard() && negate)) {
+                return Optional.of("err");
+            } else {
+                return Optional.empty();
+            }
+        }
+    }
+
+    private record CachingPrintStream(PrintStream ps, Optional<ByteArrayOutputStream> buf) {
+        CachingPrintStream {
+            Objects.requireNonNull(ps);
+            Objects.requireNonNull(buf);
+        }
+
+        Optional<String> bufferContents() {
+            return buf.map(ByteArrayOutputStream::toString);
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static final class Builder {
+
+            Builder save(boolean v) {
+                save = v;
+                return this;
+            }
+
+            Builder discard(boolean v) {
+                discard = v;
+                return this;
+            }
+
+            Builder dumpStream(PrintStream v) {
+                dumpStream = v;
+                return this;
+            }
+
+            CachingPrintStream create() {
+                final Optional<ByteArrayOutputStream> buf;
+                if (save && !discard) {
+                    buf = Optional.of(new ByteArrayOutputStream());
+                } else {
+                    buf = Optional.empty();
+                }
+
+                final PrintStream ps;
+                if (buf.isPresent() && dumpStream != null) {
+                    ps = new PrintStream(new TeeOutputStream(List.of(buf.orElseThrow(), dumpStream)), true, dumpStream.charset());
+                } else if (!discard) {
+                    ps = buf.map(PrintStream::new).or(() -> Optional.ofNullable(dumpStream)).orElseGet(Executor::nullPrintStream);
+                } else {
+                    ps = nullPrintStream();
+                }
+
+                return new CachingPrintStream(ps, buf);
+            }
+
+            private boolean save;
+            private boolean discard;
+            private PrintStream dumpStream;
+        }
+    }
+
+    private record ToolProviderStreamConfig(CachingPrintStream out, CachingPrintStream err) {
+        ToolProviderStreamConfig {
+            Objects.requireNonNull(out);
+            Objects.requireNonNull(err);
+        }
+
+        static ToolProviderStreamConfig create(OutputStreamsControl cfg) {
+            final var errCfgBuilder = cfg.stderr().buildCachingPrintStream(System.err);
+            if (cfg.stderr().dump() && cfg.stderr().save()) {
+                errCfgBuilder.dumpStream(System.out);
+            }
+            return new ToolProviderStreamConfig(
+                    cfg.stdout().buildCachingPrintStream(System.out).create(), errCfgBuilder.create());
+        }
+    }
+
+    private static final class OutputControl {
+
+        boolean save() {
+            return save.isPresent();
+        }
+
+        boolean saveAll() {
+            return save.orElse(null) == OutputControlOption.SAVE_ALL;
+        }
+
+        boolean saveFirstLine() {
+            return save.orElse(null) == OutputControlOption.SAVE_FIRST_LINE;
+        }
+
+        boolean discard() {
+            return discard || (!dump && save.isEmpty());
+        }
+
+        boolean dump() {
+            return !discard && dump;
+        }
+
+        OutputControl dump(boolean v) {
+            this.dump = v;
+            return this;
+        }
+
+        OutputControl discard(boolean v) {
+            this.discard = v;
+            return this;
+        }
+
+        OutputControl saveAll(boolean v) {
+            if (v) {
+                save = Optional.of(OutputControlOption.SAVE_ALL);
+            } else {
+                save = Optional.empty();
+            }
+            return this;
+        }
+
+        OutputControl saveFirstLine(boolean v) {
+            if (v) {
+                save = Optional.of(OutputControlOption.SAVE_FIRST_LINE);
+            } else {
+                save = Optional.empty();
+            }
+            return this;
+        }
+
+        OutputControl set(boolean set, OutputControlOption v) {
+            switch (v) {
+            case DUMP -> dump(set);
+            case SAVE_ALL -> saveAll(set);
+            case SAVE_FIRST_LINE -> saveFirstLine(set);
+            }
+            return this;
+        }
+
+        ProcessBuilder.Redirect asProcessBuilderRedirect() {
+            if (discard()) {
+                return ProcessBuilder.Redirect.DISCARD;
+            } else if (dump && !save()) {
+                return ProcessBuilder.Redirect.INHERIT;
+            } else {
+                return ProcessBuilder.Redirect.PIPE;
+            }
+        }
+
+        CachingPrintStream.Builder buildCachingPrintStream(PrintStream dumpStream) {
+            Objects.requireNonNull(dumpStream);
+            final var builder = CachingPrintStream.build().save(save()).discard(discard());
+            if (dump()) {
+                builder.dumpStream(dumpStream);
+            }
+            return builder;
+        }
+
+        private boolean dump;
+        private boolean discard;
+        private Optional<OutputControlOption> save = Optional.empty();
+    }
+
+    private static final class TeeOutputStream extends OutputStream {
+
+        public TeeOutputStream(Iterable<OutputStream> streams) {
+            streams.forEach(Objects::requireNonNull);
+            this.streams = streams;
+        }
+
+        @Override
+        public void write(int b) throws IOException {
+            for (final var out : streams) {
+                out.write(b);
+            }
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            for (final var out : streams) {
+                out.write(b);
+            }
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            for (final var out : streams) {
+                out.write(b, off, len);
+            }
+        }
+
+        @Override
+        public void flush() throws IOException {
+            forEach(OutputStream::flush);
+        }
+
+        @Override
+        public void close() throws IOException {
+            forEach(OutputStream::close);
+        }
+
+        private void forEach(OutputStreamConsumer c) throws IOException {
+            IOException firstEx = null;
+            for (final var out : streams) {
+                try {
+                    c.accept(out);
+                } catch (IOException e) {
+                    if (firstEx == null) {
+                        firstEx = e;
+                    }
+                }
+            }
+            if (firstEx != null) {
+                throw firstEx;
+            }
+        }
+
+        @FunctionalInterface
+        private static interface OutputStreamConsumer {
+            void accept(OutputStream out) throws IOException;
+        }
+
+        private final Iterable<OutputStream> streams;
+    }
+
+    private static final class CommandOutput {
+        CommandOutput(Optional<List<String>> lines, int stdoutLineCount) {
+            this.lines = Objects.requireNonNull(lines);
+            this.stdoutLineCount = stdoutLineCount;
+        }
+
+        CommandOutput() {
+            this(Optional.empty(), 0);
+        }
+
+        Optional<List<String>> lines() {
+            return lines;
+        }
+
+        Optional<List<String>> stdoutLines() {
+            if (lines.isEmpty() || stdoutLineCount < 0) {
+                return Optional.empty();
+            }
+
+            final var theLines = lines.orElseThrow();
+            if (stdoutLineCount == theLines.size()) {
+                return lines;
+            } else {
+                return Optional.of(theLines.subList(0, Integer.min(stdoutLineCount, theLines.size())));
+            }
+        }
+
+        Optional<List<String>> stderrLines() {
+            if (lines.isEmpty() || stdoutLineCount > lines.orElseThrow().size()) {
+                return Optional.empty();
+            } else if (stdoutLineCount == 0) {
+                return lines;
+            } else {
+                final var theLines = lines.orElseThrow();
+                return Optional.of(theLines.subList(stdoutLineCount, theLines.size()));
+            }
+        }
+
+        private final Optional<List<String>> lines;
+        private final int stdoutLineCount;
+
+        static final CommandOutput EMPTY = new CommandOutput();
+    }
+
     private ToolProvider toolProvider;
     private Path executable;
-    private Set<SaveOutputType> saveOutputType;
+    private OutputStreamsControl outputStreamsControl;
     private Path directory;
     private Set<String> removeEnvVars = new HashSet<>();
     private Map<String, String> setEnvVars = new HashMap<>();
     private boolean winEnglishOutput;
     private String winTmpDir = null;
 
-    private static enum SaveOutputType {
-        NONE, FULL, FIRST_LINE, DUMP
-    };
+    private static enum OutputControlOption {
+        SAVE_ALL, SAVE_FIRST_LINE, DUMP
+    }
 }
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 b4d2d1872eb..cb9e3a687c7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -67,6 +67,8 @@ public JPackageCommand(JPackageCommand cmd) {
         args.addAll(cmd.args);
         withToolProvider = cmd.withToolProvider;
         saveConsoleOutput = cmd.saveConsoleOutput;
+        discardStdout = cmd.discardStdout;
+        discardStderr = cmd.discardStderr;
         suppressOutput = cmd.suppressOutput;
         ignoreDefaultRuntime = cmd.ignoreDefaultRuntime;
         ignoreDefaultVerbose = cmd.ignoreDefaultVerbose;
@@ -679,6 +681,18 @@ public JPackageCommand saveConsoleOutput(boolean v) {
         return this;
     }
 
+    public JPackageCommand discardStdout(boolean v) {
+        verifyMutable();
+        discardStdout = v;
+        return this;
+    }
+
+    public JPackageCommand discardStderr(boolean v) {
+        verifyMutable();
+        discardStderr = v;
+        return this;
+    }
+
     public JPackageCommand dumpOutput(boolean v) {
         verifyMutable();
         suppressOutput = !v;
@@ -770,6 +784,7 @@ public JPackageCommand executeVerifyActions() {
     private Executor createExecutor() {
         Executor exec = new Executor()
                 .saveOutput(saveConsoleOutput).dumpOutput(!suppressOutput)
+                .discardStdout(discardStdout).discardStderr(discardStderr)
                 .setDirectory(executeInDirectory)
                 .addArguments(args);
 
@@ -1272,6 +1287,8 @@ public void run() {
 
     private Boolean withToolProvider;
     private boolean saveConsoleOutput;
+    private boolean discardStdout;
+    private boolean discardStderr;
     private boolean suppressOutput;
     private boolean ignoreDefaultRuntime;
     private boolean ignoreDefaultVerbose;
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 bc67f6e417d..1c6ac9a7669 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -323,18 +323,19 @@ public static void killAppLauncherProcess(JPackageCommand cmd,
     private static long[] findAppLauncherPIDs(JPackageCommand cmd, String launcherName) {
         // Get the list of PIDs and PPIDs of app launcher processes. Run setWinRunWithEnglishOutput(true) for JDK-8344275.
         // wmic process where (name = "foo.exe") get ProcessID,ParentProcessID
-        List<String> output = Executor.of("wmic", "process", "where", "(name",
+        final var result = Executor.of("wmic", "process", "where", "(name",
                 "=",
                 "\"" + cmd.appLauncherPath(launcherName).getFileName().toString() + "\"",
                 ")", "get", "ProcessID,ParentProcessID").dumpOutput(true).saveOutput().
-                setWinRunWithEnglishOutput(true).executeAndGetOutput();
-        if ("No Instance(s) Available.".equals(output.getFirst().trim())) {
+                setWinRunWithEnglishOutput(true).execute();
+        if ("No Instance(s) Available.".equals(result.stderr().findFirstLineOfOutput().map(String::trim).orElse(""))) {
             return new long[0];
         }
 
-        String[] headers = Stream.of(output.getFirst().split("\\s+", 2)).map(
+        final var stdout = result.stdout();
+        String[] headers = Stream.of(stdout.getFirstLineOfOutput().split("\\s+", 2)).map(
                 String::trim).map(String::toLowerCase).toArray(String[]::new);
-        Pattern pattern;
+        final Pattern pattern;
         if (headers[0].equals("parentprocessid") && headers[1].equals(
                 "processid")) {
             pattern = Pattern.compile("^(?<ppid>\\d+)\\s+(?<pid>\\d+)\\s+$");
@@ -346,7 +347,7 @@ private static long[] findAppLauncherPIDs(JPackageCommand cmd, String launcherNa
                     "Unrecognizable output of \'wmic process\' command");
         }
 
-        List<long[]> processes = output.stream().skip(1).map(line -> {
+        List<long[]> processes = stdout.getOutput().stream().skip(1).map(line -> {
             Matcher m = pattern.matcher(line);
             long[] pids = null;
             if (m.matches()) {
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index 68c1b2c76cb..bfcfe7587d4 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -237,20 +237,21 @@ public void testErrorsAlwaysPrinted(boolean verbose) {
         final var cmd = JPackageCommand.helloAppImage()
                 .ignoreDefaultVerbose(true)
                 .useToolProvider(false)
+                .discardStdout(true)
                 .removeArgumentWithValue("--main-class");
 
         if (verbose) {
             cmd.addArgument("--verbose");
         }
 
-        final var textVerifier = Stream.of(
+        cmd.validateOutput(Stream.of(
                 List.of("error.no-main-class-with-main-jar", "hello.jar"),
                 List.of("error.no-main-class-with-main-jar.advice", "hello.jar")
         ).map(args -> {
             return JPackageStringBundle.MAIN.cannedFormattedString(args.getFirst(), args.subList(1, args.size()).toArray());
-        }).map(CannedFormattedString::getValue).map(TKit::assertTextStream).reduce(TKit.TextStreamVerifier::andThen).orElseThrow();
+        }).toArray(CannedFormattedString[]::new));
 
-        textVerifier.apply(cmd.saveConsoleOutput(true).execute(1).getOutput().stream().filter(Predicate.not(JPackageCommand::withTimestamp)));
+        cmd.execute(1);
     }
 
     @Test
diff --git a/test/jdk/tools/jpackage/windows/Win8301247Test.java b/test/jdk/tools/jpackage/windows/Win8301247Test.java
index b0c11147a17..2f98141dcb4 100644
--- a/test/jdk/tools/jpackage/windows/Win8301247Test.java
+++ b/test/jdk/tools/jpackage/windows/Win8301247Test.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
@@ -21,14 +21,12 @@
  * questions.
  */
 
-import java.io.IOException;
+import static jdk.jpackage.test.WindowsHelper.killAppLauncherProcess;
+
 import java.time.Duration;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.HelloApp;
-import static jdk.jpackage.test.WindowsHelper.killAppLauncherProcess;
+import jdk.jpackage.test.JPackageCommand;
 
 /**
  * Test that terminating of the parent app launcher process automatically
@@ -48,7 +46,7 @@
 public class Win8301247Test {
 
     @Test
-    public void test() throws IOException, InterruptedException {
+    public void test() throws InterruptedException {
         var cmd = JPackageCommand.helloAppImage().ignoreFakeRuntime();
 
         // Launch the app in a way it doesn't exit to let us trap app laucnher
@@ -56,22 +54,20 @@ public void test() throws IOException, InterruptedException {
         cmd.addArguments("--java-options", "-Djpackage.test.noexit=true");
         cmd.executeAndAssertImageCreated();
 
-        try ( // Launch the app in a separate thread
-                ExecutorService exec = Executors.newSingleThreadExecutor()) {
-            exec.execute(() -> {
-                HelloApp.executeLauncher(cmd);
-            });
+        // Launch the app in a separate thread
+        new Thread(() -> {
+            HelloApp.executeLauncher(cmd);
+        }).start();
 
-            // Wait a bit to let the app start
-            Thread.sleep(Duration.ofSeconds(10));
+        // Wait a bit to let the app start
+        Thread.sleep(Duration.ofSeconds(10));
 
-            // Find the main app launcher process and kill it
-            killAppLauncherProcess(cmd, null, 2);
+        // Find the main app launcher process and kill it
+        killAppLauncherProcess(cmd, null, 2);
 
-            // Wait a bit and check if child app launcher process is still running (it must NOT)
-            Thread.sleep(Duration.ofSeconds(5));
+        // Wait a bit and check if child app launcher process is still running (it must NOT)
+        Thread.sleep(Duration.ofSeconds(5));
 
-            killAppLauncherProcess(cmd, null, 0);
-        }
+        killAppLauncherProcess(cmd, null, 0);
     }
 }

From bb08a70bd8deadc9c7522d1ce2ec779d5a6bd986 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 18 Apr 2025 17:01:42 +0000
Subject: [PATCH 006/901] 8355002: Clean up some mentions of "applet" in tests

Reviewed-by: serb
---
 .../ChoiceLocationTest.java                   |   2 +-
 .../Dialog/CloseDialog/CloseDialogTest.java   |   2 +-
 .../awt/Focus/ChoiceFocus/ChoiceFocus.java    |   1 -
 .../FirstItemRemoveTest.java                  |   2 +-
 .../FocusEmptyListTest.java                   |   2 +-
 .../GetMousePositionWithOverlay.java          |   2 +-
 .../GetMousePositionWithPopup.java            |   4 +-
 .../PageSetupDlgBlockingTest.java             |   1 -
 .../jdk/java/awt/TextArea/TextScrollTest.java |   2 +-
 .../DragUnicodeBetweenJVMTest.java            |   1 -
 .../MissedHtmlAndRtfBug.java                  |   1 -
 .../DnDFileGroupDescriptor.java               |   2 +-
 .../FileListBetweenJVMsTest.java              |   1 -
 .../URIListBetweenJVMsTest.java               |   1 -
 .../URIListToFileListBetweenJVMsTest.java     |   1 -
 .../MenuDragMouseEventAbsoluteCoordsTest.java |   2 +-
 .../InfiniteRecursion_2.java                  |  12 +-
 .../InfiniteRecursion_3.java                  |   8 +-
 .../event/helpers/lwcomponents/LWButton.java  |  12 +-
 .../EmbeddedFrameTest1.java                   |   4 +-
 test/jdk/java/awt/im/8041990/bug8041990.java  |   2 +-
 .../java/awt/print/Dialog/DialogOrient.java   |   3 -
 .../awt/print/PrinterJob/PrintDialog.java     |   3 -
 .../print/PrinterJob/PrintDialogCancel.java   |   3 -
 .../java/awt/print/PrinterJob/ThinLines.java  |   3 -
 .../java/awt/regtesthelpers/AbstractTest.java |   2 -
 test/jdk/java/awt/regtesthelpers/Util.java    |   2 -
 .../process/ProcessCommunicator.java          |   2 +-
 .../sound/sampled/Clip/ClipFlushCrash.java    |   2 +-
 .../sound/sampled/LinuxBlock/PlaySine.java    |   2 +-
 .../javax/swing/JPopupMenu/bug4212464.java    |   1 -
 .../swing/JTextArea/4697612/bug4697612.java   |   2 +-
 .../swing/JTextArea/4697612/bug4697612.txt    | 221 ------------------
 .../parser/Parser/6990651/bug6990651.java     |   2 +-
 .../SwingMark/src/AbstractSwingTest.java      |   9 -
 .../client/SwingMark/src/JMTest_01.java       |   8 -
 .../client/SwingMark/src/JMTest_02.java       |   8 -
 .../client/SwingMark/src/JMTest_03.java       |   8 -
 .../client/SwingMark/src/JMTest_04.java       |   8 -
 .../client/SwingMark/src/JMTest_05.java       |   8 -
 .../client/SwingMark/src/MenuTest.java        |   8 -
 .../client/SwingMark/src/TypingTest.java      |   4 -
 42 files changed, 28 insertions(+), 346 deletions(-)
 delete mode 100644 test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt

diff --git a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
index 78c83185cbe..5bff03d5b34 100644
--- a/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
+++ b/test/jdk/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java
@@ -25,7 +25,7 @@
  * @test
  * @key headful
  * @bug 7159566
- * @summary The choice positioned in the top of applet when clicking the choice.
+ * @summary The choice positioned in the top of window when clicking the choice.
  * @author Petr Pchelko
  * @library ../../regtesthelpers
  * @build Util
diff --git a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
index 4db2d52e4ea..93bf59d2757 100644
--- a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
@@ -32,7 +32,7 @@
  * @test
  * @key headful
  * @bug 8043705
- * @summary Can't exit color chooser dialog when running as an applet
+ * @summary Can't exit color chooser dialog when running in non-default AppContext
  * @modules java.desktop/sun.awt
  * @run main CloseDialogTest
  */
diff --git a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
index 904992f96b2..2456379f0f9 100644
--- a/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
+++ b/test/jdk/java/awt/Focus/ChoiceFocus/ChoiceFocus.java
@@ -32,7 +32,6 @@
   @run main ChoiceFocus
 */
 
-import java.applet.*;
 import java.awt.*;
 import java.awt.event.*;
 import test.java.awt.regtesthelpers.Util;
diff --git a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
index 1efcee3e675..69bd1dd6c83 100644
--- a/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
+++ b/test/jdk/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java
@@ -127,4 +127,4 @@ private void test(){
 
     }
 
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
index 67926b5fe19..1b1d4e4b5c4 100644
--- a/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
+++ b/test/jdk/java/awt/List/FocusEmptyListTest/FocusEmptyListTest.java
@@ -99,4 +99,4 @@ public void start() {
 
     }// start()
 
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
index b380af149f6..fb3ea40a531 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java
@@ -31,7 +31,7 @@
  * @test
  * @key headful
  * @bug 8012026 8196435
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  * @run main GetMousePositionWithOverlay
  */
 
diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
index 5bfadc6fbe7..663942b7630 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
@@ -33,7 +33,7 @@
  * @test
  * @key headful
  * @bug 8012026 8027154
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  *
  * @requires (os.family == "windows")
  * @run main/othervm -Dsun.java2d.uiScale.enabled=true -Dsun.java2d.uiScale=1 GetMousePositionWithPopup
@@ -48,7 +48,7 @@
  * @test
  * @key headful
  * @bug 8012026 8027154
- * @summary Component.getMousePosition() does not work in an applet on MacOS
+ * @summary Component.getMousePosition() does not work in some cases on MacOS
  *
  * @requires (os.family == "mac" | os.family == "linux")
  * @run main/othervm -Dsun.java2d.uiScale.enabled=true -Dsun.java2d.uiScale=1 GetMousePositionWithPopup
diff --git a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
index 9fbf48f3eb4..bc392ab9efe 100644
--- a/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
+++ b/test/jdk/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java
@@ -34,7 +34,6 @@
 import java.awt.print.*;
 import java.awt.event.*;
 import javax.swing.*;
-import java.applet.*;
 
 public class PageSetupDlgBlockingTest extends Panel {
     public static Frame frame = new TestFrame("Test Frame");
diff --git a/test/jdk/java/awt/TextArea/TextScrollTest.java b/test/jdk/java/awt/TextArea/TextScrollTest.java
index 4a92391e7af..fbd5c022580 100644
--- a/test/jdk/java/awt/TextArea/TextScrollTest.java
+++ b/test/jdk/java/awt/TextArea/TextScrollTest.java
@@ -38,7 +38,7 @@
 public class TextScrollTest extends Frame {
     private static final String INSTRUCTIONS = """
             1. A TextArea whose content starts with the text ",
-               'Scroll till the' will appear on the applet ",
+               'Scroll till the' will appear on the window ",
             2. Use the Horizontal thumb button of the TextArea to view the entire",
                content of the TextArea",
             3. While scrolling, if the text 'Scroll till the' appears repeatedly, Click Fail  ",
diff --git a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
index 18159dce64f..aa785f54733 100644
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
+++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
@@ -101,7 +101,6 @@ private static void verifyTestResults(ProcessResults processResults) {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public DragUnicodeBetweenJVMTest () {
         super();
     }
diff --git a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
index 0254a3f0d41..3502cd4f9c5 100644
--- a/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
+++ b/test/jdk/java/awt/datatransfer/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java
@@ -123,7 +123,6 @@ private static void verifyTestResults(ProcessResults processResults) {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public MissedHtmlAndRtfBug() {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
index 51129f26408..b106deac73c 100644
--- a/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
+++ b/test/jdk/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java
@@ -42,7 +42,7 @@ public class DnDFileGroupDescriptor {
             When the test starts, a RED panel appears.
             1. Start MS Outlook program. Find and open the mail form with attachments.
 
-            2. Select attachments from the mail and drag into a red field of applet.
+            2. Select attachments from the mail and drag into a red field of the window.
                 When the mouse enters the field during the process of drag, the application
                 should change the cursor form to OLE-copy and field color to yellow.
 
diff --git a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
index 6fc7b9e049d..102ff501040 100644
--- a/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java
@@ -80,7 +80,6 @@ private static void verifyTestResults(ProcessResults processResults) {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public FileListBetweenJVMsTest () {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
index e847752ee6a..6de649f846f 100644
--- a/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java
@@ -89,7 +89,6 @@ private static void verifyTestResults(ProcessResults processResults) {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public URIListBetweenJVMsTest () {
         super();
     }
diff --git a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
index f2e34493b8b..d9b6bd5e87c 100644
--- a/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
+++ b/test/jdk/java/awt/dnd/URIListToFileListBetweenJVMsTest/URIListToFileListBetweenJVMsTest.java
@@ -77,7 +77,6 @@ private static void verifyTestResults(ProcessResults processResults) {
         processResults.printProcessStandartOutput(System.out);
     }
 
-    //We cannot make an instance of the applet without the default constructor
     public URIListToFileListBetweenJVMsTest() {
         super();
     }
diff --git a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
index e0cfbaba1bb..41dc4709fc2 100644
--- a/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
+++ b/test/jdk/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java
@@ -150,4 +150,4 @@ public void checkEventAbsolutePosition(MouseEvent evt, String message){
             }
         System.out.println(message);
     }
-}// class AutomaticAppletTest
+}
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
index 7db513eeac8..6022ed32094 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java
@@ -27,21 +27,17 @@
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
+  @summary stack overflow on mouse wheel rotation within a Window
   @run main InfiniteRecursion_2
 */
 
 /**
  * InfiniteRecursion_2.java
  *
- * summary: put a JButton into JPanel and then put JPanel into Applet.
- * Add MouseWheelListener to Applet.
+ * summary: put a JButton into JPanel and then put JPanel into the Window.
+ * Add MouseWheelListener to the Window
  * Add MouseListener to JPanel.
  * Rotating a wheel over the JButton would result in stack overflow.
-
- * summary: put a JButton into JApplet.
- * Add MouseWheelListener to JApplet.
- * Rotating a wheel over the JButton would result in stack overflow.
  */
 
 import java.awt.*;
@@ -79,7 +75,7 @@ public void start ()
         this.addMouseWheelListener(new MouseWheelListener() {
                 public void mouseWheelMoved(MouseWheelEvent e)
                 {
-                    System.out.println("Wheel moved on APPLET : "+e);
+                    System.out.println("Wheel moved on Window : "+e);
                     actualEvents++;
                 }
             });
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
index 911e7c10864..e1f2991a2fb 100644
--- a/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
+++ b/test/jdk/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java
@@ -27,15 +27,15 @@
   @bug 6480024
   @library ../../../regtesthelpers
   @build Util Sysout AbstractTest
-  @summary stack overflow on mouse wheel rotation within JApplet
+  @summary stack overflow on mouse wheel rotation within a Window
   @run main InfiniteRecursion_3
 */
 
 /**
  * InfiniteRecursion_3.java
  *
- * summary: put a JButton into Applet.
- * Add MouseWheelListener to Applet.
+ * summary: put a JButton into the Window.
+ * Add MouseWheelListener to the Window.
  * Rotating a wheel over the JButton would result in stack overflow.
  */
 
@@ -72,7 +72,7 @@ public void start ()
         this.addMouseWheelListener(new MouseWheelListener() {
                 public void mouseWheelMoved(MouseWheelEvent e)
                 {
-                    System.out.println("Wheel moved on APPLET : "+e);
+                    System.out.println("Wheel moved on Window : "+e);
                     actualEvents++;
                 }
             });
diff --git a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
index 866844e1ce7..e45d3d5f430 100644
--- a/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
+++ b/test/jdk/java/awt/event/helpers/lwcomponents/LWButton.java
@@ -116,16 +116,8 @@ public void run() {
         repaint();
       }
     }
-    try {
-      unClicker uc = new unClicker();
-      new Thread(uc).start();
-    } catch (Exception e) {
-      // In case we're in an applet and the security has not been
-      // turned off (in which case we can't start a new thread)
-      // we can catch that and set the flag back to how it should be.
-      isInClick = false;
-      repaint();
-    }
+    unClicker uc = new unClicker();
+    new Thread(uc).start();
   }
 
   /**
diff --git a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
index fd2acaad396..7942402af4f 100644
--- a/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
+++ b/test/jdk/java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java
@@ -25,7 +25,7 @@
   @test
   @key headful
   @bug 6359129
-  @summary REGRESSION: Popup menus dont respond to selections when extend outside Applet
+  @summary REGRESSION: Popup menus dont respond to selections when extend outside EmbeddedFrame
   @author oleg.sukhodolsky area=awt.grab
   @modules java.desktop/java.awt.peer
            java.desktop/sun.awt
@@ -38,7 +38,7 @@
 /**
  * EmbeddedFrameTest1.java
  *
- * summary: REGRESSION: Popup menus dont respond to selections when extend outside Applet
+ * summary: REGRESSION: Popup menus dont respond to selections when extend outside EmbeddedFrame
  */
 
 import java.awt.BorderLayout;
diff --git a/test/jdk/java/awt/im/8041990/bug8041990.java b/test/jdk/java/awt/im/8041990/bug8041990.java
index 303fde5a459..d4bf847592d 100644
--- a/test/jdk/java/awt/im/8041990/bug8041990.java
+++ b/test/jdk/java/awt/im/8041990/bug8041990.java
@@ -26,7 +26,7 @@
  * @test
  * @key headful
  * @bug 8041990
- * @summary Language specific keys does not work in applets when opened outside the browser
+ * @summary Language specific keys does not work in non-default AppContexts of top-level windows
  * @author Petr Pchelko
  * @modules java.desktop/sun.awt
  */
diff --git a/test/jdk/java/awt/print/Dialog/DialogOrient.java b/test/jdk/java/awt/print/Dialog/DialogOrient.java
index 6650ced64f4..b89f3950e99 100644
--- a/test/jdk/java/awt/print/Dialog/DialogOrient.java
+++ b/test/jdk/java/awt/print/Dialog/DialogOrient.java
@@ -34,9 +34,6 @@
 import java.awt.geom.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class DialogOrient implements Printable {
 
    private static void init() throws Exception {
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
index fa9569e1aa7..395312aaa45 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialog.java
@@ -42,9 +42,6 @@
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class PrintDialog {
 
 
diff --git a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
index b2d3d3a2230..9a1884a5f54 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintDialogCancel.java
@@ -43,9 +43,6 @@
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class PrintDialogCancel {
 
 
diff --git a/test/jdk/java/awt/print/PrinterJob/ThinLines.java b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
index f8e4e60b319..95cbfed8796 100644
--- a/test/jdk/java/awt/print/PrinterJob/ThinLines.java
+++ b/test/jdk/java/awt/print/PrinterJob/ThinLines.java
@@ -42,9 +42,6 @@
 import java.awt.event.*;
 import java.awt.print.*;
 
-// This test is a "main" test as applets would need Runtime permission
-// "queuePrintJob".
-
 public class ThinLines implements Printable {
 
    private static final int INCH = 72;
diff --git a/test/jdk/java/awt/regtesthelpers/AbstractTest.java b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
index f5c34cc6fbd..fbf66e45e3b 100644
--- a/test/jdk/java/awt/regtesthelpers/AbstractTest.java
+++ b/test/jdk/java/awt/regtesthelpers/AbstractTest.java
@@ -30,8 +30,6 @@
      @build AbstractTest
      @run main YourTest
    </pre>
- * Note that if you are about to create a test based on
- * Applet-template, then put those lines into html-file, not in java-file.
  * <p> And put an
  * import test.java.awt.regtesthelpers.AbstractTest;
  * into the java source.
diff --git a/test/jdk/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java
index 6d570e903b6..45d9c89ee46 100644
--- a/test/jdk/java/awt/regtesthelpers/Util.java
+++ b/test/jdk/java/awt/regtesthelpers/Util.java
@@ -31,8 +31,6 @@
      @build Util
      @run main YourTest
    </pre>
- * Note that if you are about to create a test based on
- * Applet-template, then put those lines into html-file, not in java-file.
  * <p> And put an
  * import test.java.awt.regtesthelpers.Util;
  * into the java source of test.
diff --git a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
index d6806947af2..3b173009d23 100644
--- a/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
+++ b/test/jdk/java/awt/regtesthelpers/process/ProcessCommunicator.java
@@ -31,7 +31,7 @@
  *  behavior such as DnD data transfer, Clipboard data transfer, focus
  *  transfer etc., you could use the next scenario:
  *
- *  1. Write an implementation for the parent JVM, using applet test.
+ *  1. Write an implementation for the parent JVM
  *  2. Write an implementation for the child JVM or native application, using
  *     main() function.
  *  3. Execute child process using  ProcessCommunicator.executeChildProcess()
diff --git a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
index a72509fdf53..2baeb499eac 100644
--- a/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
+++ b/test/jdk/javax/sound/sampled/Clip/ClipFlushCrash.java
@@ -35,7 +35,7 @@
  * @test
  * @key sound
  * @bug 4946945
- * @summary Crash in javasound while running TicTacToe demo applet tiger b26
+ * @summary Crash in javasound while running TicTacToe demo tiger b26
  */
 public class ClipFlushCrash {
     static int frameCount = 441000; // lets say 10 seconds
diff --git a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
index ab567dacb23..ceead0dae62 100644
--- a/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
+++ b/test/jdk/javax/sound/sampled/LinuxBlock/PlaySine.java
@@ -36,7 +36,7 @@
  * @test
  * @key sound
  * @bug 4834461
- * @summary Applet hang when you load it during sound card is in use
+ * @summary App hang when you load it during sound card is in use
  * @run main/manual PlaySine
  */
 public class PlaySine {
diff --git a/test/jdk/javax/swing/JPopupMenu/bug4212464.java b/test/jdk/javax/swing/JPopupMenu/bug4212464.java
index c1c434f6b16..cbfecc989cc 100644
--- a/test/jdk/javax/swing/JPopupMenu/bug4212464.java
+++ b/test/jdk/javax/swing/JPopupMenu/bug4212464.java
@@ -36,7 +36,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import javax.swing.JApplet;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
diff --git a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
index ed7f3dba73f..ee01c38ed67 100644
--- a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
+++ b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.java
@@ -224,7 +224,7 @@ private static void createAndShowGUI() {
         text = new JTextArea();
         try {
             InputStream is =
-                    bug4697612.class.getResourceAsStream("bug4697612.txt");
+                    bug4697612.class.getResourceAsStream("bug4697612.java");
             text.read(new InputStreamReader(is), null);
         } catch (IOException e) {
             throw new Error(e);
diff --git a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt b/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt
deleted file mode 100644
index f7273541285..00000000000
--- a/test/jdk/javax/swing/JTextArea/4697612/bug4697612.txt
+++ /dev/null
@@ -1,221 +0,0 @@
-                                   README
-
-                      Java(TM) 2 SDK, Standard Edition
-                             Version 1.4.2 Beta
-
-     For a more extensive HTML version of this file, see README.html.
-
-Contents
-
-   * Introduction
-   * Release Notes
-   * Bug Reports and Feedback
-   * Java 2 SDK Documentation
-   * Redistribution
-   * Web Pages
-
-
-Introduction
-
-     Thank you for downloading this release of the Java(TM) 2 SDK,
-     Standard Edition. The Java 2 SDK is a development environment for
-     building applications, applets, and components that can be
-     deployed on the Java platform.
-
-     The Java 2 SDK software includes tools useful for developing and
-     testing programs written in the Java programming language and
-     running on the Java platform. These tools are designed to be used
-     from the command line. Except for appletviewer, these tools do not
-     provide a graphical user interface.
-
-
-Release Notes
-
-      See the Release Notes on the Java Software web site for additional 
-      information pertaining to this release. 
- 
-      http://java.sun.com/j2se/1.4.2/relnotes.html
-
-      The on-line release notes will be updated as needed, so you should 
-      check it occasionally for the latest information. 
-
-
-Bug Reports and Feedback
-
-      The Bug Parade Web Page on the Java Developer Connection(SM) web 
-      site lets you search for and examine existing bug reports, submit 
-      your own bug reports, and tell us which bug fixes matter most to you. 
-
-      http://java.sun.com/jdc/bugParade/
-
-      To directly submit a bug or request a feature, fill out this form: 
-
-      http://java.sun.com/cgi-bin/bugreport.cgi 
-
-      You can also send comments directly to Java Software engineering 
-      team email addresses. 
-
-      http://java.sun.com/mail/
-
-
-Java 2 SDK Documentation
-
-     The on-line Java 2 SDK Documentation contains API specifications,
-     feature descriptions, developer guides, tool reference pages, demos, 
-     and links to related information. It is located at
-
-     http://java.sun.com/j2se/1.4.2/docs/
-
-     The Java 2 SDK documentation is also available in a download bundle 
-     which you can install locally on your machine. See the 
-     Java 2 SDK download page: 
-     
-     http://java.sun.com/j2se/1.4.2/download.html
-
-
-Redistribution
-
-      The term "vendors" used here refers to licensees, developers, 
-      and independent software vendors (ISVs) who license and 
-      distribute the Java 2 Runtime Environment with their programs. 
-      Vendors must follow the terms of the Java 2 SDK, Standard 
-      Edition, Binary Code License agreement. 
-      Required vs. Optional Files
-
-      The files that make up the Java 2 SDK, Standard Edition, are
-      divided into two categories: required and optional. Optional 
-      files may be excluded from redistributions of the Java 2 SDK 
-      at the vendor's discretion. The following section contains a 
-      list of the files and directories that may optionally be 
-      omitted from redistributions of the Java 2 SDK. All files not 
-      in these lists of optional files must be included in 
-      redistributions of the Java 2 SDK. 
-
-      Optional Files and Directories
-
-      The following files may be optionally excluded from 
-      redistributions:
-
-      jre/lib/charsets.jar 
-            Character conversion classes 
-      jre/lib/ext/ 
-            sunjce_provider.jar - the SunJCE provider for Java 
-              Cryptography APIs
-            localedata.jar - contains many of the resources 
-              needed for non US English locales
-            ldapsec.jar - contains security features supported 
-              by the LDAP service provider
-            dnsns.jar - for the InetAddress wrapper of JNDI DNS 
-              provider
-      bin/rmid and jre/bin/rmid 
-            Java RMI Activation System Daemon 
-      bin/rmiregistry and jre/bin/rmiregistry 
-            Java Remote Object Registry 
-      bin/tnameserv and jre/bin/tnameserv 
-            Java IDL Name Server 
-      bin/keytool and jre/bin/keytool 
-            Key and Certificate Management Tool 
-      bin/kinit and jre/bin/kinit
-            Used to obtain and cache Kerberos ticket-granting tickets
-      bin/klist and jre/bin/klist
-            Kerberos display entries in credentials cache and keytab
-      bin/ktab and jre/bin/ktab
-            Kerberos key table manager
-      bin/policytool and jre/bin/policytool 
-            Policy File Creation and Management Tool 
-      bin/orbd and jre/bin/orbd 
-            Object Request Broker Daemon 
-      bin/servertool and jre/bin/servertool 
-            Java IDL Server Tool 
-      src.zip 
-            Archive of source files 
-
-      In addition, the Java Web Start product may be excluded from
-      redistributions. The Java Web Start product is contained in a 
-      file named javaws-1_2-solaris-sparc-i.zip,
-      javaws-1_2-solaris-i586-i.zip,
-      javaws-1_2-linux-i586-i.zip, or
-      javaws-1_2-windows-i586-i.exe, depending on the platform. 
-
-
-      Unlimited Strength Java Cryptography Extension
-
-      Due to import control restrictions for some countries, the 
-      Java Cryptography Extension (JCE) policy files shipped with 
-      the Java 2 SDK, Standard Edition and the Java 2 Runtime 
-      Environment allow strong but limited cryptography to be 
-      used.  These files are located at
-
-      <java-home>/lib/security/local_policy.jar
-      <java-home>/lib/security/US_export_policy.jar
-
-      where <java-home> is the jre directory of the Java 2 
-      SDK or the top-level directory of the Java 2 Runtime 
-      Environment.
-
-      An unlimited strength version of these files indicating 
-      no restrictions on cryptographic strengths is available 
-      on the Java 2 SDK web site for those living in eligible 
-      countries.  Those living in eligible countries may download 
-      the unlimited strength version and replace the strong 
-      cryptography jar files with the unlimited strength files.
-
-
-      Endorsed Standards Override Mechanism
-
-      An endorsed standard is a Java API defined through a standards
-      process other than the Java Community Process(SM) (JCP(SM)).
-      Because endorsed standards are defined outside the JCP, it is
-      anticipated that such standards will be revised between 
-      releases of the Java 2 Platform. In order to take advantage of 
-      new revisions to endorsed standards, developers and software
-      vendors may use the Endorsed Standards Override Mechanism to
-      provide newer versions of an endorsed standard than those
-      included in the Java 2 Platform as released by Sun Microsystems.
-
-      For more information on the Endorsed Standards Override
-      Mechanism, including the list of platform packages that it may 
-      be used to override, see 
-
-            http://java.sun.com/j2se/1.4.2/docs/guide/standards/ 
-
-      Classes in the packages listed on that web page may be replaced
-      only by classes implementing a more recent version of the API 
-      as defined by the appropriate standards body. 
-
-      In addition to the packages listed in the document at the above 
-      URL, which are part of the Java 2 Platform, Standard Edition 
-      (J2SE(TM)) specification, redistributors of Sun's J2SE 
-      Reference Implementation are allowed to override classes whose 
-      sole purpose is to implement the functionality provided by 
-      public APIs defined in these Endorsed Standards packages.  
-      Redistributors may also override classes in the org.w3c.dom.* 
-      packages, or other classes whose sole purpose is to implement 
-      these APIs. 
-
-
-Sun Java Web Pages
-
-     For additional information, refer to these Sun Microsystems pages
-     on the World Wide Web:
-
-     http://java.sun.com/
-          The Java Software web site, with the latest information on
-          Java technology, product information, news, and features.
-     http://java.sun.com/docs
-          Java Platform Documentation provides access to white papers,
-          the Java Tutorial and other documents.
-     http://java.sun.com/jdc
-          The Java Developer Connection(SM) web site. (Free registration
-          required.) Additional technical information, news, and
-          features; user forums; support information, and much more.
-     http://java.sun.com/products/
-          Java Technology Products & API
-
-
-------------------------------------------------------------------------
-The Java 2 SDK, Standard Edition, is a product of Sun Microsystems(TM), 
-Inc.  This product includes code licensed from RSA Security.
-
-Copyright 2003 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
-California 95054, U.S.A.  All rights reserved.
diff --git a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
index b939f3e148f..9dada22ba60 100644
--- a/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
+++ b/test/jdk/javax/swing/text/html/parser/Parser/6990651/bug6990651.java
@@ -23,7 +23,7 @@
 
 /* @test
    @bug 6990651
-   @summary Regression: NPE when refreshing applet since 6u22-b01
+   @summary Regression: NPE when refreshing embedded window since 6u22-b01
    @author Pavel Porvatov
    @modules java.desktop/sun.awt
 */
diff --git a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
index 52394054f29..8a62d196857 100644
--- a/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/AbstractSwingTest.java
@@ -86,15 +86,6 @@ public abstract class AbstractSwingTest {
           */
         public abstract void runTest();
 
-        /**
-          * This method is used to determine if a test can be run from within
-          * an applet.  If your test will cause security exceptions when run as
-          * an applet then you should return false from this method.
-          */
-        public boolean canRunInApplet() {
-                return true;
-        }
-
    public int getPaintCount() {
       return paintCount;
    }
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_01.java b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
index 83127e3bc21..fcc5fe309ba 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_01.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_01.java
@@ -66,14 +66,6 @@ public class JMTest_01 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-    * This test cannot run as an applet because it
-    * posts events to the event queue
-    */
-    public boolean canRunInApplet() {
-            return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_02.java b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
index b77844162ab..680ada9f1df 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_02.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_02.java
@@ -67,14 +67,6 @@ public class JMTest_02 extends AbstractSwingTest {
 
     int      repeat = 15;
 
-    /**
-      * This test cannot run as an applet because it
-      * posts events to the event queue
-      */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_03.java b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
index eed96da1e93..38f5dff43bc 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_03.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_03.java
@@ -65,14 +65,6 @@ public class JMTest_03 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_04.java b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
index 4c4c7f65d32..cbb32e5b916 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_04.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_04.java
@@ -70,14 +70,6 @@ public class JMTest_04 extends AbstractSwingTest {
     String MENU_ITEM_STRING =  "JMenuItem";
     String SUB_MENU_STRING =  "SubMenu";
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         loadBundle();
         JPanel panel = new JPanel();
diff --git a/test/jdk/performance/client/SwingMark/src/JMTest_05.java b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
index bd4eea45f9b..dc2a0bd1489 100644
--- a/test/jdk/performance/client/SwingMark/src/JMTest_05.java
+++ b/test/jdk/performance/client/SwingMark/src/JMTest_05.java
@@ -65,14 +65,6 @@ public class JMTest_05 extends AbstractSwingTest {
     int             DOWN = 40;
     int             UP = 38;
 
-    /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public JComponent getTestComponent() {
         JPanel panel = new JPanel();
 
diff --git a/test/jdk/performance/client/SwingMark/src/MenuTest.java b/test/jdk/performance/client/SwingMark/src/MenuTest.java
index 9d9d8751d3e..91ce63e7667 100644
--- a/test/jdk/performance/client/SwingMark/src/MenuTest.java
+++ b/test/jdk/performance/client/SwingMark/src/MenuTest.java
@@ -69,14 +69,6 @@ public class MenuTest extends AbstractSwingTest {
 
    int repeat = 50;
 
-   /**
-     * This test cannot run as an applet because it
-     * posts events to the event queue
-     */
-   public boolean canRunInApplet() {
-      return false;
-   }
-
    public JComponent getTestComponent() {
       listener = new MyListener();
 
diff --git a/test/jdk/performance/client/SwingMark/src/TypingTest.java b/test/jdk/performance/client/SwingMark/src/TypingTest.java
index 0019f7bd2c4..440b8b09e87 100644
--- a/test/jdk/performance/client/SwingMark/src/TypingTest.java
+++ b/test/jdk/performance/client/SwingMark/src/TypingTest.java
@@ -52,10 +52,6 @@ public JComponent getTestComponent() {
         return panel;
     }
 
-    public boolean canRunInApplet() {
-        return false;
-    }
-
     public String getTestName() {
         return "Typing";
     }

From a551cc929426590bfbbcaa4bd8bee5e4e8cfe16d Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Fri, 18 Apr 2025 17:07:16 +0000
Subject: [PATCH 007/901] 8353293: Open source several swing tests batch4

Reviewed-by: serb
---
 .../DrawEtchedRectTest.java                   |  77 ++++++++++++++++
 .../basic/BasicHTML/4228104/bug4228104.java   |  75 +++++++++++++++
 .../plaf/basic/BasicHTML/4228104/duke.gif     | Bin 0 -> 1929 bytes
 .../plaf/basic/BasicSliderUI/bug4220108.java  |  75 +++++++++++++++
 .../BasicSplitPaneUI/NegativeSizeTest.java    |  87 ++++++++++++++++++
 .../PreferredSizeLayoutTest.java              |  71 ++++++++++++++
 6 files changed, 385 insertions(+)
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
 create mode 100644 test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java

diff --git a/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java b/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
new file mode 100644
index 00000000000..0c5c501596c
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicGraphicsUtils/DrawEtchedRectTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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 4198822
+ * @summary Tests that the bottom line drawn by
+ *          BasicGraphicsUtils.drawEtchedRect extends to the end.
+ * @run main DrawEtchedRectTest
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+import javax.imageio.ImageIO;
+import javax.swing.plaf.basic.BasicGraphicsUtils;
+
+import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
+
+public class DrawEtchedRectTest {
+    private static final int WIDTH = 200;
+    private static final int HEIGHT = 200;
+    private static final int RANGE = 10;
+
+    public static void main(String[] args) throws Exception {
+        // Draw etched rectangle to a BufferedImage
+        BufferedImage image = new BufferedImage(WIDTH, HEIGHT, TYPE_INT_ARGB);
+        Graphics2D g2d = image.createGraphics();
+        Component sq = new Component() {
+            public void paint(Graphics g) {
+                g.setColor(Color.WHITE);
+                g.fillRect(0, 0, WIDTH, HEIGHT);
+                BasicGraphicsUtils.drawEtchedRect(g, 0, 0, WIDTH, HEIGHT,
+                        Color.black, Color.black,
+                        Color.black, Color.black);
+            }
+        };
+        sq.paint(g2d);
+        g2d.dispose();
+
+        // Check if connected at bottom-right corner
+        int c1;
+        int c2;
+        for (int i = 1; i < RANGE; i++) {
+            c1 = image.getRGB(WIDTH - i, HEIGHT - 1);
+            c2 = image.getRGB(WIDTH - 1, HEIGHT - i);
+            if (c1 == Color.WHITE.getRGB() || c2 == Color.WHITE.getRGB()) {
+                ImageIO.write(image, "png", new File("failImage.png"));
+                throw new RuntimeException("Bottom line is not connected!");
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
new file mode 100644
index 00000000000..451590c66ab
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/bug4228104.java
@@ -0,0 +1,75 @@
+/*
+ * 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 4228104
+ * @summary Tests work of BODY BACKGROUND tag in HTML renderer
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4228104
+ */
+
+import java.awt.BorderLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+public class bug4228104 {
+    static final String INSTRUCTIONS = """
+        There should be an image displaying dukes under the rows of digits.
+        If you can see it, the test PASSES. Otherwise, the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4228104 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4228104::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Background HTML Text Test");
+        String dir = System.getProperty("test.src",
+                System.getProperty("user.dir"));
+        String htmlText1 =
+                "<html><BODY BACKGROUND=\"file:" + dir
+                        + "/duke.gif\">\n" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111" +
+                        "<br>111111111111111111";
+        JLabel button1 = new JLabel(htmlText1);
+        f.add(button1, BorderLayout.NORTH);
+        f.setSize(200, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif b/test/jdk/javax/swing/plaf/basic/BasicHTML/4228104/duke.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ed32e0ff79b05c07b82863ce6fb07fa9898adaa2
GIT binary patch
literal 1929
zcmWlYe^AtB8pi`HvM4_?{J2I$8$dLc1#@!R2zwgXMWdj^k;9xr+bDW&4{JlE8WpDj
z7F-cwwK{H<)?L&#SJz$!;hJ{%BY2FYf)Wp^xl?aq!5Xcdi$c#hV~>m9_n-Hl=Xsy+
z=li^?*Q~;pZ+R1N1J40KRkeWM7ew3~jLM24A{CM-A}~TzqzYpq&od0GC=z71!w_=b
z-==B0rt2t*nA}((5YSLs6a*Z@X__WqiSjTW6oLo{5k<iyeTpP`Xj)M<MUgp%2?T<&
zEc<*umSq6|@E|zH)SHIk^Kl4*XpV}2Kfs5B99xfJZie9$WsF5|P18smlV!;g!!V-2
zn;7GvJv`6jI4%f+q3MRMtBBhU04&Ry?69iHJVr~BEXguSkeaHPbby83IEreP<$yJU
zUlheKF9@O_%VRiB_&WpPU{I1ohN5YT;srhs3=%l*<5(0yJRT28;JU73xZ9-sh=ofO
zC8UBR2oqyvMa9cVnye6lJcePa^*oFUh*gad1Rf3q{k}GiWh9=bDcYp{0l%N#W}))v
zngM|j3_^-3V<^h`+f2-(Fe1w^o#%OqqEt;&Rh1(s6hSGH^mu3=*Jj!BFsxx=p(#a{
zd>m&|K1mGAimYjhs#wwZtvV8SV~7LCFpgub+-TTAk%UQb0dE_cj+pc?!+0o?qG$?%
zVFD)%!w7Z;g)ndE8Uk6<V}@y6RST^}gurmnZnvf(DH2JCKmedUR<bI~)LSksiqgQC
zkFD2r&57bBUZ-oC|3sVB0K-s{B%WaOuq+DUpePNis%#jhZfF!mYPt$R(D`7%43B|!
z5JgcKf><w05QN<p_ry`5O-!YO$bdMEAZW1DZ&I?Vjp2lwqQi!v`~4g|AF-N^$qHl#
zArPEE+=ihU`V<I)VL{f7DFsGNQ-?v&&{YNRF-^;sbzUjsg)IUA3IK<-jliov0obR3
z5AErM5bSTVC%;i83mHX;AEmGD^!Y!9i&OH~Pegazi8u<+zVef};QV(@3+rl=y~S`|
z+ro8g8RqC2>Aky=+kLaUQ{UW`XS?Nn*s@SQ{VmFgGdkV{&&98EcEQ5hjc@H$`e)fX
zj@&GdchxpMUo|-A^M4iBP3(#Ib53Ap?5{nGT7SBA_V!o!TTzL5R~FUWe)4X?@iTd8
z1;TcF^rQLj?4p0uy?@ikb2eUSXdHVa_jIn=@W%a<6~57D>am6&Z!{lzc=@ZbuGB8`
zpU38H8d~@82Da!+qdYG5ls&Cx?~|oPMnbqTHMw%I*KlV~?fc{rSwe29?Om}fsknG#
z@n5IwY=4Mx>>0WJLG>=<wJkri44ypnpphB8Uld;%avo>yJX^WbHA30iQ$H!X)3<4K
zBe1|sf3NKKTS;)mg{$k(2eDJG^u5=&x{@M!V>EWgzRA((>}?o{WQBehp1mIHU!BGG
zYz5<PKM7?P;Z-hqMg0IYKD)fC2`{Qp#c}*PGuiCeFF{$a-|!Y+O|%`1xO+TuJHvs+
z!1C+`E#58;vh@yJz_0U+cV7L#qqcmRn>_6B(+KIVdCVoum2ItM&gXZd+SB^vQTN=a
zeYbbah=i-xCho2{4Pazv_i%2mH`EkM{r8XYDLbdY@(a7Ud}$%!$QrTN_DqwNXA9~g
zTGKxKyfto7NDp;5A3O5zgb(hyxjN@OAG!(zy^*Ug4!yjF=Y*8aHA@ovB1({&a4;sR
zTf1CVC{>Pgy`m$lG;P1$pC_6F7u%iP+qz0q4{lXT`i9g-ThiYgO^GXC`f?JNo*|@p
zr{b%U-tSKw99q0|YJa9{Va?`H{IaNICo>p5lGEY*+IDR4bfIUwq~CTRuC_mGWA%~W
zea{@eKJ(Iq^7MvdsPsR%&vt$@4i&s?bPptz#y#!FcRZEaMS0WFTyXMCUEfsNxnJ_9
zPwpt`Er4O>``2G{7=4r1GCSTO8#0xw+{<^L4X(K8y1wKj72KLrYD}Y7SJuY7y==wf
z;UkI5?(v?h+4r;vR{P*U`ul~=D@U7K5$eV8c!%rX-38vE>azU80<AIk)4^ZMA4h%d
z5`SBK>UrhFXCv#d`(ylZS4+i2a^vI91MTIxCx%9gd2&N&D9RC&xcpx8#f=GZv%9;F
z#?CEVT%UV$nk;L%RJA+d=f8ZB@U*Xz-TZbG?HKKT(VJZMBH!)$#qRuwbFc%Aljqha
zoNBs8od~V$_^vux0ZSk!iP!hI($t35SxY8`FV{pxCjpU}Ova2VIg1&>V)CvvMb_<X
z*!90jAmdxX*61uwt)25(Zl?WYIZ?giXCx*AssPawSuMAqE&Kk&(6i1)O9?Y0{+^5f
zcvyY9Exx4lRLZK4!424O^*=mi`)(<=O_!Qt<0GytnAp*ry3G^6+<z!VQo)p${W~9E
qB`qX3%gt72dTDs6HxP=`*JKL3Yrz%GU6VaOi8dNCzDWUr!v6!a5RWVX

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java b/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
new file mode 100644
index 00000000000..94cc3d65e5d
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSliderUI/bug4220108.java
@@ -0,0 +1,75 @@
+/*
+ * 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 4220108
+ * @summary JSlider in JInternalFrame should be painted correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4220108
+ */
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+
+public class bug4220108 {
+    static final String INSTRUCTIONS = """
+        If you see a slider in the internal frame, then the test PASSES.
+        Otherwise the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4220108 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4220108::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Internal Frame Slider Test");
+        f.setLayout(new FlowLayout());
+        JDesktopPane desktop = new JDesktopPane();
+        f.setContentPane(desktop);
+
+        JInternalFrame iFrame =
+                new JInternalFrame("Slider Frame", true, true, true, true);
+        JSlider sl = new JSlider();
+        iFrame.add(sl);
+        iFrame.add(new JLabel("Label"), BorderLayout.SOUTH);
+        desktop.add(iFrame);
+        iFrame.pack();
+        iFrame.setVisible(true);
+        f.setSize(300, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
new file mode 100644
index 00000000000..3a461410e4b
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/NegativeSizeTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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 4199666
+ * @summary Makes sure initial negative size of a component does not confuse
+ *          JSplitPane.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual NegativeSizeTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+
+public class NegativeSizeTest {
+    static final String INSTRUCTIONS = """
+        Click on the 'Show JSplitPane' button. If two buttons appear,
+        click PASS, otherwise click FAIL.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("NegativeSizeTest Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(NegativeSizeTest::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Negative Size Test");
+        CardLayout cardLayout = new CardLayout();
+        JPanel mainPanel = new JPanel(cardLayout);
+
+        JSplitPane splitPane = new JSplitPane();
+        splitPane.setContinuousLayout(true);
+        JPanel splitContainer = new JPanel(new BorderLayout());
+        splitContainer.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        splitContainer.add(splitPane, BorderLayout.CENTER);
+
+        if (false) {
+            mainPanel.add(splitContainer, "split");
+            mainPanel.add(new JPanel(), "blank");
+        }
+        else {
+            mainPanel.add(new JPanel(), "blank");
+            mainPanel.add(splitContainer, "split");
+        }
+
+        f.add(mainPanel, BorderLayout.CENTER);
+
+        JButton button = new JButton("Show JSplitPane");
+        button.addActionListener(e -> cardLayout.show(mainPanel, "split"));
+        f.add(button, BorderLayout.SOUTH);
+        f.setSize(400, 300);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java
new file mode 100644
index 00000000000..76d0e45b8eb
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/basic/BasicSplitPaneUI/PreferredSizeLayoutTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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 4208549
+ * @summary Makes sure preferred size returned by layout managers used by
+ *          JSplitPane is correct.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual PreferredSizeLayoutTest
+ */
+
+import java.awt.Container;
+import java.awt.FlowLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JSplitPane;
+
+public class PreferredSizeLayoutTest {
+    static final String INSTRUCTIONS = """
+        If the buttons in the JSplitpanes do not have '...' in them,
+        click PASS, otherwise click FAIL.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("PreferredSizeLayoutTest Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(PreferredSizeLayoutTest::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Preferred Size Layout Test");
+        Container parent = f.getContentPane();
+        JSplitPane sp = new JSplitPane();
+
+        parent.setLayout(new FlowLayout());
+
+        sp.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
+        parent.add(sp);
+        sp = new JSplitPane();
+        sp.setOrientation(JSplitPane.VERTICAL_SPLIT);
+        parent.add(sp);
+        f.setSize(400, 300);
+        return f;
+    }
+}

From 924638c471b0bf4a00a890ce6a3fd7e118cdd578 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Fri, 18 Apr 2025 17:08:46 +0000
Subject: [PATCH 008/901] 8353661: Open source several swing tests batch5

Reviewed-by: jdv
---
 test/jdk/javax/swing/JSlider/bug4186062.java  |  99 +++++++++++++
 test/jdk/javax/swing/JSlider/bug4275631.java  | 132 ++++++++++++++++++
 test/jdk/javax/swing/JSlider/bug4382876.java  | 110 +++++++++++++++
 .../javax/swing/plaf/windows/bug4991587.java  |  95 +++++++++++++
 4 files changed, 436 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSlider/bug4186062.java
 create mode 100644 test/jdk/javax/swing/JSlider/bug4275631.java
 create mode 100644 test/jdk/javax/swing/JSlider/bug4382876.java
 create mode 100644 test/jdk/javax/swing/plaf/windows/bug4991587.java

diff --git a/test/jdk/javax/swing/JSlider/bug4186062.java b/test/jdk/javax/swing/JSlider/bug4186062.java
new file mode 100644
index 00000000000..1db2f1bba6c
--- /dev/null
+++ b/test/jdk/javax/swing/JSlider/bug4186062.java
@@ -0,0 +1,99 @@
+/*
+ * 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 4382876
+ * @summary Tests if JSlider fires ChangeEvents when thumb is clicked and not moved
+ * @key headful
+ * @run main bug4186062
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSlider;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeListener;
+
+public class bug4186062 {
+    private static JFrame f;
+    private static JSlider slider;
+    private static volatile Point loc;
+    private static volatile int labelNum;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("JSlider Click Value Test");
+                f.setSize(400, 200);
+                f.setLocationRelativeTo(null);
+                f.setVisible(true);
+                JPanel panel = new JPanel();
+                slider = new JSlider();
+                final JLabel label = new JLabel("0");
+                labelNum = 0;
+
+                ChangeListener listener = e -> {
+                    labelNum++;
+                    label.setText("" + labelNum);
+                };
+                slider.addChangeListener(listener);
+
+                panel.add(slider);
+                panel.add(label);
+                f.add(panel);
+            });
+
+            Robot r = new Robot();
+            r.setAutoDelay(100);
+            r.waitForIdle();
+            r.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                loc = slider.getLocationOnScreen();
+                loc.setLocation(loc.x + (slider.getWidth() / 2),
+                        loc.y + (slider.getHeight() / 2));
+            });
+
+            r.mouseMove(loc.x, loc.y);
+            r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            if (labelNum > 0) {
+                throw new RuntimeException(labelNum + " ChangeEvents fired. " +
+                        "Test failed");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JSlider/bug4275631.java b/test/jdk/javax/swing/JSlider/bug4275631.java
new file mode 100644
index 00000000000..4d0aa555721
--- /dev/null
+++ b/test/jdk/javax/swing/JSlider/bug4275631.java
@@ -0,0 +1,132 @@
+/*
+ * 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 4275631
+ * @summary Tests if vertical JSlider is properly aligned in large container
+ * @key headful
+ * @run main bug4275631
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.Robot;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSlider;
+import javax.swing.SwingUtilities;
+
+public class bug4275631 {
+    private static final int OFFSET = 1;
+    private static JFrame f;
+    private static JSlider slider1;
+    private static JSlider slider2;
+    private static volatile Point loc1;
+    private static volatile Point loc2;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("JSlider Alignment Test");
+                f.setSize(400, 200);
+                f.setLocationRelativeTo(null);
+
+                // Create two sliders, verify the alignment on the slider to be
+                // used in the border layout
+                slider1 = new JSlider(JSlider.VERTICAL, 0, 99, 50);
+                slider1.setInverted(true);
+                slider1.setMajorTickSpacing(10);
+                slider1.setMinorTickSpacing(1);
+                slider1.setPaintTicks(true);
+                slider1.setPaintLabels(true);
+                slider2 = new JSlider(JSlider.VERTICAL, 0, 99, 50);
+                slider2.setInverted(true);
+                slider2.setMajorTickSpacing(10);
+                slider2.setMinorTickSpacing(1);
+                slider2.setPaintTicks(true);
+                slider2.setPaintLabels(true);
+
+                // Try to center the natural way, using a border layout in the "Center"
+                JPanel borderPanel = new JPanel();
+                borderPanel.setLayout(new BorderLayout());
+                borderPanel.setBorder(BorderFactory.createTitledBorder("BorderLayout"));
+                borderPanel.add(slider1, BorderLayout.CENTER);
+                borderPanel.setPreferredSize(new Dimension(200, 200));
+
+                // Try to center using GridBagLayout, with glue on left
+                // and right to squeeze slider into place
+                JPanel gridBagPanel = new JPanel(new GridBagLayout());
+                gridBagPanel.setBorder(BorderFactory.createTitledBorder("GridBagLayout"));
+                GridBagConstraints c = new GridBagConstraints();
+                c.gridx = 1;
+                c.fill = GridBagConstraints.VERTICAL;
+                c.weighty = 1.0;
+                gridBagPanel.add(slider2, c);
+                c.gridx = 0;
+                c.fill = GridBagConstraints.BOTH;
+                c.weighty = 0.0;
+                gridBagPanel.add(Box.createHorizontalGlue(), c);
+                c.gridx = 2;
+                c.fill = GridBagConstraints.BOTH;
+                gridBagPanel.add(Box.createHorizontalGlue(), c);
+                gridBagPanel.setPreferredSize(new Dimension(200, 200));
+
+                f.add(borderPanel, BorderLayout.WEST);
+                f.add(gridBagPanel, BorderLayout.EAST);
+                f.setVisible(true);
+            });
+
+            Robot r = new Robot();
+            r.setAutoDelay(100);
+            r.waitForIdle();
+            r.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                loc1 = slider1.getLocationOnScreen();
+                loc1.setLocation(loc1.x + (slider1.getWidth() / 2),
+                        loc1.y + (slider1.getHeight() / 2));
+
+                loc2 = slider2.getLocationOnScreen();
+                loc2.setLocation(loc2.x + (slider2.getWidth() / 2),
+                        loc2.y + (slider2.getHeight() / 2));
+            });
+
+           if (loc1.y > loc2.y + OFFSET || loc1.y < loc2.y - OFFSET) {
+               throw new RuntimeException("JSlider position is not aligned!");
+           }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JSlider/bug4382876.java b/test/jdk/javax/swing/JSlider/bug4382876.java
new file mode 100644
index 00000000000..b9ec64aab21
--- /dev/null
+++ b/test/jdk/javax/swing/JSlider/bug4382876.java
@@ -0,0 +1,110 @@
+/*
+ * 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 4382876
+ * @summary Tests how PgUp and PgDn keys work with JSlider
+ * @key headful
+ * @run main bug4382876
+ */
+
+import java.awt.BorderLayout;
+import java.awt.ComponentOrientation;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+import javax.swing.JSlider;
+import javax.swing.SwingUtilities;
+
+public class bug4382876 {
+    private static Robot r;
+    private static JFrame f;
+    private static JSlider slider;
+    private static boolean upFail;
+    private static boolean downFail;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("JSlider PageUp/Down Test");
+                f.setSize(300, 200);
+                f.setLocationRelativeTo(null);
+                f.setVisible(true);
+                slider = new JSlider(-1000, -900, -1000);
+                slider.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+                slider.putClientProperty("JSlider.isFilled", Boolean.TRUE);
+                f.add(slider, BorderLayout.CENTER);
+            });
+
+            r = new Robot();
+            r.setAutoDelay(100);
+            r.waitForIdle();
+            r.delay(1000);
+
+            r.keyPress(KeyEvent.VK_PAGE_UP);
+            SwingUtilities.invokeAndWait(() -> {
+                if (slider.getValue() < -1000) {
+                    System.out.println("PAGE_UP VAL: " + slider.getValue());
+                    upFail = true;
+                }
+            });
+            if (upFail) {
+                writeFailImage();
+                throw new RuntimeException("Slider value did NOT change with PAGE_UP");
+            }
+            r.keyPress(KeyEvent.VK_PAGE_DOWN);
+            SwingUtilities.invokeAndWait(() -> {
+                if (slider.getValue() > -1000) {
+                    System.out.println("PAGE_DOWN VAL: " + slider.getValue());
+                    downFail = true;
+                }
+            });
+            if (downFail) {
+                writeFailImage();
+                throw new RuntimeException("Slider value did NOT change with PAGE_DOWN");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+
+    private static void writeFailImage() throws IOException {
+        GraphicsConfiguration ge = GraphicsEnvironment
+                .getLocalGraphicsEnvironment().getDefaultScreenDevice()
+                .getDefaultConfiguration();
+        BufferedImage failImage = r.createScreenCapture(ge.getBounds());
+        ImageIO.write(failImage, "png", new File("failImage.png"));
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/windows/bug4991587.java b/test/jdk/javax/swing/plaf/windows/bug4991587.java
new file mode 100644
index 00000000000..e4e4fde2b86
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/windows/bug4991587.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4991587
+ * @requires (os.family == "windows")
+ * @summary Tests that disabled JButton text is positioned properly in Windows L&F
+ * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4991587
+ */
+
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+
+import javax.swing.AbstractButton;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+
+import com.sun.java.swing.plaf.windows.WindowsButtonUI;
+
+public class bug4991587 {
+    static final String INSTRUCTIONS = """
+        There are two buttons: enabled (left) and disabled (right).
+        Ensure that the disabled button text is painted entirely
+        inside the blue bounding rectangle, just like the enabled
+        button (use it as an example of how this should look like).
+    """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        PassFailJFrame.builder()
+                .title("bug4991587 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4991587::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Disabled JButton Text Test");
+        f.setLayout(new FlowLayout());
+        f.setSize(400, 100);
+
+        JButton button1 = new JButton("\u0114 Enabled JButton");
+        button1.setUI(new MyButtonUI());
+        f.add(button1);
+
+        JButton button2 = new JButton("\u0114 Disabled JButton");
+        button2.setEnabled(false);
+        button2.setUI(new MyButtonUI());
+        f.add(button2);
+
+        return f;
+    }
+
+    static class MyButtonUI extends WindowsButtonUI {
+        protected void paintText(Graphics g, AbstractButton b,
+                                 Rectangle textRect, String text) {
+            g.setColor(Color.blue);
+            g.drawRect(textRect.x,
+                    textRect.y,
+                    textRect.width + 1, // add 1 for the shadow, otherwise it
+                                        // will be painted over the textRect
+                    textRect.height);
+            super.paintText(g, b, textRect, text);
+        }
+    }
+}

From f8f1be3de56986c06f368334b7c64ef50f0117cf Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 18 Apr 2025 18:50:08 +0000
Subject: [PATCH 009/901] 8353552: Opensource Several Font related tests -
 Batch 3 8355048: ProblemList TestGlyphVectorLayout.java on all platforms

Reviewed-by: serb, aivanov
---
 test/jdk/ProblemList.txt                      |   1 +
 .../jdk/java/awt/font/BoldItalicFontTest.java |  73 +++++++
 .../GlyphVector/TestGlyphVectorLayout.java    | 121 +++++++++++
 .../GlyphVector/TestSetGlyphPositions.java    |  96 +++++++++
 .../jdk/java/awt/font/Rotate/RotateTest1.java |  97 +++++++++
 .../java/awt/font/TestGraphicPlacement.java   | 199 ++++++++++++++++++
 6 files changed, 587 insertions(+)
 create mode 100644 test/jdk/java/awt/font/BoldItalicFontTest.java
 create mode 100644 test/jdk/java/awt/font/GlyphVector/TestGlyphVectorLayout.java
 create mode 100644 test/jdk/java/awt/font/GlyphVector/TestSetGlyphPositions.java
 create mode 100644 test/jdk/java/awt/font/Rotate/RotateTest1.java
 create mode 100644 test/jdk/java/awt/font/TestGraphicPlacement.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 4a00130d3aa..b0a97929c6d 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -796,6 +796,7 @@ java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java 8172245 linux-all
 java/awt/Frame/FrameStateTest/FrameStateTest.java 8203920 macosx-all,linux-all
 java/awt/print/PrinterJob/ScaledText/ScaledText.java 8231226 macosx-all
 java/awt/print/PrinterJob/PrintTextTest.java 8148334 macosx-all
+java/awt/font/GlyphVector/TestGlyphVectorLayout.java 8354987 generic-all
 java/awt/font/TextLayout/TestJustification.java 8250791 macosx-all
 java/awt/TrayIcon/DragEventSource/DragEventSource.java 8252242 macosx-all
 java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java 7187728 macosx-all,linux-all
diff --git a/test/jdk/java/awt/font/BoldItalicFontTest.java b/test/jdk/java/awt/font/BoldItalicFontTest.java
new file mode 100644
index 00000000000..7fdefcfe2b5
--- /dev/null
+++ b/test/jdk/java/awt/font/BoldItalicFontTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+
+/*
+ * @test
+ * @bug 4935871
+ * @summary Check that correct type faces are used regardless of bold/italic styles
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual/othervm -Duser.language=ja -Duser.country=JP BoldItalicFontTest
+ */
+
+public class BoldItalicFontTest {
+
+    public static void main(String[] args) throws Exception {
+        final String INSTRUCTIONS = """
+                This test is reproduced with a non-English user locale only.
+                All the letters "X" in the first line should be in serif font.
+                All the letters "X" in the second line should be in sans-serif font.
+
+                If so, press Pass, else press Fail.""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(BoldItalicFontTest::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static Frame createUI() {
+        String[] faces = { Font.SERIF, Font.SANS_SERIF };
+        int[] styles = { 0, Font.BOLD, Font.ITALIC, Font.BOLD | Font.ITALIC };
+
+        Frame f = new Frame("BoldItalicFontTest Test UI");
+        f.setLayout(new GridLayout(faces.length, styles.length));
+        for (int fn = 0; fn < faces.length; fn++) {
+            for (int sn = 0; sn < styles.length; sn++) {
+                Label l = new Label("X");
+                Font f1 = new Font(faces[fn], styles[sn], 36);
+                l.setFont(f1);
+                f.add(l);
+            }
+        }
+        f.setSize(300, 300);
+        return f;
+    }
+}
diff --git a/test/jdk/java/awt/font/GlyphVector/TestGlyphVectorLayout.java b/test/jdk/java/awt/font/GlyphVector/TestGlyphVectorLayout.java
new file mode 100644
index 00000000000..b183b652642
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/TestGlyphVectorLayout.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.font.GlyphVector;
+import java.awt.font.FontRenderContext;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4615017
+ * @summary Display two GlyphVectors, and ensure they are of the same length.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestGlyphVectorLayout
+ */
+
+public class TestGlyphVectorLayout extends JPanel {
+    private final Font font;
+    private final FontRenderContext frc;
+    private final String text;
+
+    private GlyphVector aftergv;
+    private Rectangle pbounds;
+    private Rectangle2D vbounds;
+
+    public static void main(String[] args) throws Exception {
+        final String INSTRUCTIONS = """
+                Two lines of text should appear, the top one with boxes
+                (red and blue) around it.
+                The two lines should be of the same length, and the boxes around the
+                top line should 'fit' the text with no empty space between the end
+                of the text and the box.
+
+                Pass the test if this is true.""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(TestGlyphVectorLayout::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private TestGlyphVectorLayout() {
+        setBackground(Color.WHITE);
+        font = new Font(Font.DIALOG, Font.PLAIN, 24);
+        frc = new FontRenderContext(null, false, false);
+        text = "this is a test of glyph vector";
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(550, 150);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        Graphics2D g2d = (Graphics2D) g;
+
+        float x = 50;
+        float y = 50;
+        AffineTransform oldtx = g2d.getTransform();
+        g2d.translate(x, y);
+        g2d.scale(1.5, 1.5);
+
+        g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
+                             RenderingHints.VALUE_FRACTIONALMETRICS_OFF);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                             RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+
+        g2d.setColor(Color.BLACK);
+
+        GlyphVector gv = font.createGlyphVector(frc, text); // new each time
+        g2d.drawGlyphVector(gv, 0, 0);
+
+        if (vbounds == null) {
+            vbounds = gv.getVisualBounds();
+            pbounds = gv.getPixelBounds(g2d.getFontRenderContext(), 0, 0);
+            aftergv = gv;
+        }
+        g2d.drawGlyphVector(aftergv, 0, 30);
+
+        g2d.setColor(Color.BLUE);
+        g2d.draw(vbounds);
+
+        g2d.setTransform(oldtx);
+        g2d.setColor(Color.RED);
+        g2d.draw(pbounds);
+    }
+}
diff --git a/test/jdk/java/awt/font/GlyphVector/TestSetGlyphPositions.java b/test/jdk/java/awt/font/GlyphVector/TestSetGlyphPositions.java
new file mode 100644
index 00000000000..f56d8214395
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/TestSetGlyphPositions.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.font.GlyphVector;
+import java.awt.font.FontRenderContext;
+import java.awt.geom.Point2D;
+
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4180379
+ * @summary set the positions of glyphs in the GlyphVector to other than
+ *          their default x, y positions, and verify that the rendered glyphs are
+ *          in the new positions, not the default positions.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestSetGlyphPositions
+ */
+
+public class TestSetGlyphPositions extends JPanel {
+    GlyphVector gv = null;
+
+    public static void main(String[] args) throws Exception {
+        final String INSTRUCTIONS = """
+            'TopLeft text and >' should appear towards the top left of the frame,
+            and '< and BottomRight text' should appear towards the bottom right.
+
+            There should be some space between the '>' and '<' symbols, both vertically
+            and horizontally.
+
+            Pass the test if this is true.""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(TestSetGlyphPositions::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public TestSetGlyphPositions() {
+        setBackground(Color.WHITE);
+        setSize(550, 150);
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(550, 150);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        Graphics2D g2d = (Graphics2D) g;
+
+        if (gv == null) {
+            Font font = new Font(Font.DIALOG, Font.PLAIN, 36);
+            FontRenderContext frc = g2d.getFontRenderContext();
+            String str = "TopLeft><BottomRight";
+
+            gv = font.createGlyphVector(frc, str);
+            for (int i = str.indexOf("<"); i < gv.getNumGlyphs(); ++i) {
+                Point2D loc = gv.getGlyphPosition(i);
+                loc.setLocation(loc.getX() + 50, loc.getY() + 50);
+                gv.setGlyphPosition(i, loc);
+            }
+        }
+        g2d.drawGlyphVector(gv, 50f, 50f);
+    }
+}
diff --git a/test/jdk/java/awt/font/Rotate/RotateTest1.java b/test/jdk/java/awt/font/Rotate/RotateTest1.java
new file mode 100644
index 00000000000..c041841112d
--- /dev/null
+++ b/test/jdk/java/awt/font/Rotate/RotateTest1.java
@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.text.AttributedString;
+import java.awt.font.TextAttribute;
+
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4188328
+ * @summary In this bug, a text string is displayed rotated. Without the
+ *          fix, on Windows, the string was not displayed (boxes were
+ *          displayed which denote an unprintable character). On Solaris
+ *          2.5.1, the characters were displayed, but not rotated. Now
+ *          on all platforms, the string is displayed correctly rotated.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RotateTest1
+ */
+
+public class RotateTest1 extends JPanel {
+    public static void main(String[] args) throws Exception {
+        final String INSTRUCTIONS = """
+                In this test, a text string is displayed rotated.
+
+                Without the fix, on Windows, the string was not displayed
+                (boxes were displayed which denote an unprintable character).
+
+                On Solaris 2.5.1, the characters were displayed, but not rotated.
+
+                Now on all platforms, the string is displayed rotated.""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(RotateTest1::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public RotateTest1() {
+        setBackground(Color.WHITE);
+        setDoubleBuffered(true);
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(400, 520);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        Dimension d = getSize();
+
+        g.setColor(getBackground());
+        g.fillRect(0, 0, d.width, d.height);
+
+        // start java2d test code
+        paintRotatedTextTest(g2d);
+    }
+
+    private void paintRotatedTextTest(Graphics2D g2d) {
+        AttributedString testString =
+                new AttributedString("This is some text. Blablablabla");
+        testString.addAttribute(TextAttribute.SIZE, 32f);
+
+        g2d.setPaint(Color.BLACK);
+        g2d.rotate(Math.PI / 3);
+        g2d.drawString(testString.getIterator(), 100.0f, 10.0f);
+    }
+}
diff --git a/test/jdk/java/awt/font/TestGraphicPlacement.java b/test/jdk/java/awt/font/TestGraphicPlacement.java
new file mode 100644
index 00000000000..f0b090e8d8a
--- /dev/null
+++ b/test/jdk/java/awt/font/TestGraphicPlacement.java
@@ -0,0 +1,199 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ *
+ * Copyright 1999 IBM Corp.  All Rights Reserved.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Shape;
+import java.text.AttributedString;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GraphicAttribute;
+import java.awt.font.ImageGraphicAttribute;
+import java.awt.font.ShapeGraphicAttribute;
+import java.awt.font.TextLayout;
+import java.awt.font.TextAttribute;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4202637
+ * @summary This test ensures that graphics in a TextLayout are positioned correctly.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestGraphicPlacement
+ */
+
+public class TestGraphicPlacement extends JPanel {
+    private static final int GRAPHIC_COUNT = 5;
+    private static final float BASE_SIZE = 5;
+    private static final boolean SHAPE = false;
+    private static final boolean IMAGE = true;
+
+    private final AttributedString[] strings;
+
+    public static void main(String[] args) throws Exception {
+        final String INSTRUCTIONS = """
+                This test has text strings enclosed in boxes, in each box there is
+                a sequence of square graphics to the right of the text string.
+
+                This test is concerned with the placement of these graphics relative
+                to the text string.
+
+                Squares after 'TOP' should be placed in the top-right corner of the
+                box with their tops aligned to the top of the box.
+
+                Graphics after 'BOTTOM' should be placed in the bottom-right corner of its
+                box with their bottoms aligned to the bottom of the box.
+
+                Graphics after 'BASELINE' should have their tops (not bottoms) aligned to
+                the baseline of the text.
+
+                If all these are true, pass the test.""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(TestGraphicPlacement::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public TestGraphicPlacement() {
+        setBackground(Color.WHITE);
+
+        strings = new AttributedString[]{
+                makeString(GraphicAttribute.TOP_ALIGNMENT, SHAPE),
+                makeString(GraphicAttribute.BOTTOM_ALIGNMENT, SHAPE),
+                makeString(GraphicAttribute.ROMAN_BASELINE, SHAPE),
+                makeString(GraphicAttribute.TOP_ALIGNMENT, IMAGE),
+                makeString(GraphicAttribute.BOTTOM_ALIGNMENT, IMAGE),
+                makeString(GraphicAttribute.ROMAN_BASELINE, IMAGE),
+        };
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(350, 450);
+    }
+
+    private Image makeImage(int size) {
+        Image img = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = (Graphics2D) img.getGraphics();
+        g2d.setColor(Color.BLUE);
+        g2d.fillRect(0, 0, size, size);
+        g2d.setColor(Color.RED);
+        g2d.drawRect(0, 0, size - 1, size - 1);
+        return img;
+    }
+
+    /**
+     * Create an AttributedString with a descriptive word (TOP, BOTTOM,
+     * or BASELINE) and several graphics of varying sizes following the
+     * word.
+     *
+     * @param alignment the alignment of the graphics
+     * @param image     whether to create Shape or Image graphics
+     */
+    private AttributedString makeString(int alignment, boolean image) {
+        String name;
+        if (alignment == GraphicAttribute.TOP_ALIGNMENT) {
+            name = "TOP";
+        } else if (alignment == GraphicAttribute.BOTTOM_ALIGNMENT) {
+            name = "BOTTOM";
+        } else {
+            name = "BASELINE";
+        }
+
+        // Append the Unicode graphic replacement character to the name.
+        String nameWithUnicode = name.concat("\uFFFC".repeat(GRAPHIC_COUNT));
+
+        AttributedString as = new AttributedString(nameWithUnicode);
+
+        // Make the descriptive text large.
+        as.addAttribute(TextAttribute.SIZE, 48f, 0, name.length());
+
+        // Add the graphic attributes to the end of the AttributedString.
+        for (int i = 0; i < GRAPHIC_COUNT; i++) {
+
+            float size = (i + 1) * BASE_SIZE;
+            GraphicAttribute attribute;
+
+            if (image == IMAGE) {
+                Image img = makeImage((int) size);
+                attribute = new ImageGraphicAttribute(img, alignment);
+            } else {
+                Shape shape = new Rectangle2D.Float(0, 0, size, size);
+                attribute = new ShapeGraphicAttribute(shape,
+                                                      alignment,
+                                                      ShapeGraphicAttribute.STROKE);
+            }
+
+            as.addAttribute(TextAttribute.CHAR_REPLACEMENT,
+                    attribute,
+                    i + name.length(),
+                    i + name.length() + 1);
+        }
+
+        return as;
+    }
+
+    /**
+     * Draw each AttributedString, with a bounding box enclosing
+     * the string.
+     */
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        Graphics2D g2d = (Graphics2D) g;
+        FontRenderContext frc = g2d.getFontRenderContext();
+
+        final float drawX = 20;
+        float drawY = 20;
+
+        for (int i = 0; i < strings.length; i++) {
+            TextLayout layout = new TextLayout(strings[i].getIterator(), frc);
+            float ascent = layout.getAscent();
+            drawY += ascent;
+
+            Rectangle2D boundsRect = new Rectangle2D.Float(drawX,
+                    drawY - ascent,
+                    layout.getAdvance(),
+                    ascent + layout.getDescent());
+            g2d.draw(boundsRect);
+            layout.draw(g2d, drawX, drawY);
+            drawY += layout.getDescent() + layout.getLeading();
+        }
+    }
+}

From abbf1a02cb00ae98ed7fdb7105aa4806756f898f Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 18 Apr 2025 19:38:09 +0000
Subject: [PATCH 010/901] 8355051: Problemlist
 java/awt/Graphics2D/CopyAreaOOB.java on macosx-aarch64

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index b0a97929c6d..075ce0e9c10 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -473,6 +473,7 @@ java/awt/MenuBar/TestNoScreenMenuBar.java 8265987 macosx-all
 
 java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8266283 generic-all
 java/awt/Graphics2D/DrawString/RotTransText.java 8316878 linux-all
+java/awt/Graphics2D/CopyAreaOOB.java 8343106 macosx-aarch64
 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java 8257529 windows-x64
 java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java 8302787 windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java 8302787 windows-all

From bf63f9ffa5e107ecb01e67dbef785a7bf4c89f16 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 18 Apr 2025 20:58:21 +0000
Subject: [PATCH 011/901] 8353319: Open source Swing tests - Set 3

Reviewed-by: abhiscxk, dnguyen
---
 test/jdk/javax/swing/JFrame/bug4419914.java   | 128 +++++++++++++++---
 .../jdk/javax/swing/JRootPane/bug4614623.java |  84 ++++++++++++
 .../javax/swing/JTabbedPane/bug4613811.java   |  82 +++++++++++
 test/jdk/javax/swing/JWindow/bug4251781.java  |  76 +++++++++++
 4 files changed, 349 insertions(+), 21 deletions(-)
 create mode 100644 test/jdk/javax/swing/JRootPane/bug4614623.java
 create mode 100644 test/jdk/javax/swing/JTabbedPane/bug4613811.java
 create mode 100644 test/jdk/javax/swing/JWindow/bug4251781.java

diff --git a/test/jdk/javax/swing/JFrame/bug4419914.java b/test/jdk/javax/swing/JFrame/bug4419914.java
index 4574b1ac3d6..f87dcc8c468 100644
--- a/test/jdk/javax/swing/JFrame/bug4419914.java
+++ b/test/jdk/javax/swing/JFrame/bug4419914.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
@@ -28,55 +28,141 @@
  * @library /java/awt/regtesthelpers
  * @build PassFailJFrame
  * @run main/manual bug4419914
-*/
+ */
 
 import java.awt.BorderLayout;
 import java.awt.ComponentOrientation;
+import java.awt.Frame;
+import java.awt.Window;
+import java.util.List;
+import java.util.Locale;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
-import java.util.Locale;
+import javax.swing.JLabel;
+import javax.swing.JWindow;
 
 public class bug4419914 {
+    private static JFrame frame;
     private static final String INSTRUCTIONS = """
-        1. You will see a frame with five buttons.
-        2. Confirm that each button is placed as follows:
-             NORTH
-        END  CENTER  START
-             SOUTH
-        3. Press the "NORTH" button and confirm the button is focused.
-        4. Press TAB repeatedly and confirm that the TAB focus moves from right to left.
-             (NORTH - START - CENTER - END - SOUTH - NORTH - START - CENTER - ...)
+        This test verifies tab movement on RTL component orientation
+        in JWindow, JFrame and JDialog.
+
+        When test starts 3 test windows are displayed - JFrame, JWindow and JDialog.
+        Follow the instructions below and if any condition does not hold
+        press FAIL.
+
+        1. Confirm that each button in the child window is placed as follows:
+
+            For JFrame:
+                 NORTH
+            END  CENTER  START
+                 SOUTH
+
+            For JWindow:
+            END  CENTER  START
+                  QUIT
+
+            For JDialog:
+            END  CENTER  START
+
+        3. Press on the "START" button in case of JWindow & JDialog and "NORTH"
+           in case of JFrame, confirm that the respective button is focused.
+
+        4. Press TAB repeatedly and confirm that the TAB focus moves
+           from right to left.
+
+            For JFrame:
+            (NORTH - START - CENTER - END - SOUTH - NORTH - START - CENTER - ...)
 
-            If there's anything different from the above items, click Fail else click Pass.""";
+            For JWindow:
+            (START - CENTER - END - QUIT - START - CENTER - END - QUIT - ...)
+
+            For JDialog:
+            (START - CENTER - END - START - CENTER - END - ...)
+
+        If all of the above conditions are true press PASS else FAIL.
+        """;
 
     public static void main(String[] args) throws Exception {
         PassFailJFrame.builder()
-                .title("Tab movement Instructions")
                 .instructions(INSTRUCTIONS)
-                .rows((int) INSTRUCTIONS.lines().count() + 2)
-                .columns(48)
-                .testUI(bug4419914::createTestUI)
+                .columns(45)
+                .testTimeOut(10)
+                .testUI(bug4419914::createAndShowUI)
+                .positionTestUI(WindowLayouts::rightOneColumn)
                 .build()
                 .awaitAndCheck();
     }
 
-    private static JFrame createTestUI() {
-        JFrame frame = new JFrame("bug4419914");
+    private static List<Window> createAndShowUI() {
+        return List.of(createJFrame(), createJWindow(), createJDialog());
+    }
+
+    private static JFrame createJFrame() {
+        frame = new JFrame("bug4419914 JFrame");
         frame.setFocusCycleRoot(true);
+        // Tab movement set to RTL
         frame.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         frame.setLocale(Locale.ENGLISH);
         frame.enableInputMethods(false);
 
+        // Component placement within content pane set to RTL
         frame.getContentPane().setComponentOrientation(
-                               ComponentOrientation.RIGHT_TO_LEFT);
+                ComponentOrientation.RIGHT_TO_LEFT);
         frame.getContentPane().setLocale(Locale.ENGLISH);
-        frame.getContentPane().setLayout(new BorderLayout());
+        frame.setLayout(new BorderLayout());
         frame.add(new JButton("SOUTH"), BorderLayout.SOUTH);
         frame.add(new JButton("CENTER"), BorderLayout.CENTER);
         frame.add(new JButton("END"), BorderLayout.LINE_END);
         frame.add(new JButton("START"), BorderLayout.LINE_START);
         frame.add(new JButton("NORTH"), BorderLayout.NORTH);
-        frame.setSize(300, 150);
+        frame.setSize(300, 160);
         return frame;
     }
+
+    private static JWindow createJWindow() {
+        JWindow window = new JWindow(frame);
+        window.setFocusableWindowState(true);
+        // Tab movement set to RTL
+        window.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        window.setLocale(new Locale("en"));
+        window.enableInputMethods(false);
+
+        // Component placement within content pane set to RTL
+        window.getContentPane().setComponentOrientation(
+                ComponentOrientation.RIGHT_TO_LEFT);
+        window.getContentPane().setLocale(new Locale("en"));
+        window.setLayout(new BorderLayout());
+        window.add(new JLabel("bug4419914 JWindow"), BorderLayout.NORTH);
+        window.add(new JButton("START"), BorderLayout.LINE_START);
+        window.add(new JButton("CENTER"), BorderLayout.CENTER);
+        window.add(new JButton("END"), BorderLayout.LINE_END);
+
+        JButton quitButton = new JButton("QUIT");
+        quitButton.addActionListener(e1 -> window.dispose());
+        window.add(quitButton, BorderLayout.SOUTH);
+        window.setSize(300, 153);
+        window.requestFocus();
+        return window;
+    }
+
+    private static JDialog createJDialog() {
+        JDialog dialog = new JDialog((Frame) null, "bug4419914 JDialog");
+        // Tab movement set to RTL
+        dialog.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        dialog.setLocale(new Locale("en"));
+        dialog.enableInputMethods(false);
+
+        // Component placement within content pane set to RTL
+        dialog.getContentPane().setComponentOrientation(
+                ComponentOrientation.RIGHT_TO_LEFT);
+        dialog.getContentPane().setLocale(new Locale("en"));
+        dialog.setLayout(new BorderLayout());
+        dialog.add(new JButton("CENTER"), BorderLayout.CENTER);
+        dialog.add(new JButton("END"), BorderLayout.LINE_END);
+        dialog.add(new JButton("START"), BorderLayout.LINE_START);
+        dialog.setSize(300, 160);
+        return dialog;
+    }
 }
diff --git a/test/jdk/javax/swing/JRootPane/bug4614623.java b/test/jdk/javax/swing/JRootPane/bug4614623.java
new file mode 100644
index 00000000000..9a714d3cdfd
--- /dev/null
+++ b/test/jdk/javax/swing/JRootPane/bug4614623.java
@@ -0,0 +1,84 @@
+/*
+ * 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 4614623
+ * @requires (os.family == "windows")
+ * @summary Tests that w2k mnemonic underlining works when there's no
+            focus owner
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4614623
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.UIManager;
+
+public class bug4614623 {
+    private static final String INSTRUCTIONS = """
+            This test verifies if the short-cut character
+            (menu mnemonic) is underlined when the ALT key is held down.
+
+            Check if the following is true.
+            1) Press Alt key. The letter 'F' (menu mnemonic) of
+            the "File" menu should now be underlined.
+            2) Release the Alt key, the selection background (light grey)
+            should appear around the "File" menu. Compare "About" menu
+            with "File" menu to see the light grey selection background.
+
+            If the above is true, press PASS else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(62)
+                .rows(12)
+                .testUI(bug4614623::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createAndShowUI() {
+        JFrame frame = new JFrame("bug4614623 - File menu test");
+        JMenuBar menuBar = new JMenuBar();
+
+        JMenu fileMenu = new JMenu("File");
+        fileMenu.setMnemonic('F');
+        menuBar.add(fileMenu);
+
+        JMenu about = new JMenu("About");
+        menuBar.add(about);
+        menuBar.setSize(300, 100);
+
+        frame.setJMenuBar(menuBar);
+        menuBar.requestFocus();
+        frame.setSize(300, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTabbedPane/bug4613811.java b/test/jdk/javax/swing/JTabbedPane/bug4613811.java
new file mode 100644
index 00000000000..ecad64e95f8
--- /dev/null
+++ b/test/jdk/javax/swing/JTabbedPane/bug4613811.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4613811
+ * @summary Scrollable Buttons of JTabbedPane don't
+ *          get enabled or disabled on selecting tab
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4613811
+ */
+
+import java.awt.BorderLayout;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTabbedPane;
+
+public class bug4613811 {
+    private static final String INSTRUCTIONS = """
+            Select different tabs and check that the scrollable
+            buttons are correctly enabled and disabled.
+
+            When the very first tab (Tab 1) is fully visible
+            On macOS:
+            the left arrow button should NOT be visible.
+
+            On other platforms:
+            the left arrow button should be disabled.
+
+            If the last tab (Tab 5) is fully visible
+            On macOS:
+            the right arrow button should NOT be visible.
+
+            On other platforms:
+            the right arrow button should be disabled.
+
+            If the above is true press PASS else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(30)
+                .testUI(bug4613811::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JFrame frame = new JFrame("bug4613811 - JTabbedPane Test");
+        final JTabbedPane tabPane = new JTabbedPane(JTabbedPane.TOP,
+                                                    JTabbedPane.SCROLL_TAB_LAYOUT);
+        for (int i = 1; i <= 5; i++) {
+            tabPane.addTab("TabbedPane: Tab " + i, null, new JLabel("Tab " + i));
+        }
+        frame.add(tabPane, BorderLayout.CENTER);
+        frame.setResizable(false);
+        frame.setSize(400, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JWindow/bug4251781.java b/test/jdk/javax/swing/JWindow/bug4251781.java
new file mode 100644
index 00000000000..0152db71f24
--- /dev/null
+++ b/test/jdk/javax/swing/JWindow/bug4251781.java
@@ -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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4251781
+ * @summary Tests that JWindow repaint is optimized (background is not
+            cleared).
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4251781
+ */
+
+import java.awt.Color;
+import java.awt.Container;
+import javax.swing.JButton;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JWindow;
+
+public class bug4251781 {
+    private static final String INSTRUCTIONS = """
+            Press the button at the bottom-right corner of the gray
+            window with the mouse.
+            If the window DOES NOT flicker when you press and/or release
+            the mouse button press PASS else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4251781::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JWindow createAndShowUI() {
+        JWindow w = new JWindow();
+        final Container pane = w.getContentPane();
+        pane.setLayout(null);
+        pane.setBackground(Color.GRAY.darker());
+
+        final JPopupMenu popup = new JPopupMenu();
+        popup.add(new JMenuItem("item 1"));
+        popup.add(new JMenuItem("exit"));
+
+        JButton b = new JButton("menu");
+        b.setBounds(350, 250, 50, 50);
+        b.addActionListener(ev -> popup.show(pane, 0, 0));
+        pane.add(b);
+
+        w.setSize(400, 300);
+        return w;
+    }
+}

From 38f9b3a9738de7896d840fc114a76ced3b77c269 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Fri, 18 Apr 2025 21:11:41 +0000
Subject: [PATCH 012/901] 8353748: Open source several swing tests batch6

Reviewed-by: kizune
---
 .../javax/swing/JTree/NodeChangedTest.java    |  72 +++++++++++
 test/jdk/javax/swing/JTree/bug4118860.java    |  97 ++++++++++++++
 test/jdk/javax/swing/JTree/bug4169215.java    |  65 ++++++++++
 test/jdk/javax/swing/JTree/bug4196987.java    |  70 ++++++++++
 test/jdk/javax/swing/JTree/bug4270654.java    |  76 +++++++++++
 test/jdk/javax/swing/JTree/bug4618767.java    | 121 ++++++++++++++++++
 6 files changed, 501 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTree/NodeChangedTest.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4118860.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4169215.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4196987.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4270654.java
 create mode 100644 test/jdk/javax/swing/JTree/bug4618767.java

diff --git a/test/jdk/javax/swing/JTree/NodeChangedTest.java b/test/jdk/javax/swing/JTree/NodeChangedTest.java
new file mode 100644
index 00000000000..5461136c57b
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/NodeChangedTest.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 4199472
+ * @summary Tests that node changed for the root of the tree update the
+ *          structure.
+ * @run main NodeChangedTest
+ */
+
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+public class NodeChangedTest {
+    public static void main(String[] args) {
+        // Create 3 nodes
+        final DefaultMutableTreeNode root = new DefaultMutableTreeNode("root",
+                true);
+        final DefaultMutableTreeNode child = new DefaultMutableTreeNode("child",
+                true);
+        final DefaultMutableTreeNode leaf = new DefaultMutableTreeNode("leaf",
+                false);
+        root.add(child);
+        child.add(leaf);
+
+        final JTree tree = new JTree(root);
+
+        // Change the root node
+        root.setUserObject("New root");
+        ((DefaultTreeModel) tree.getModel()).nodeChanged(root);
+
+        // Check
+        if (!root.getUserObject().toString().equals("New root")) {
+            throw new RuntimeException("Failed changing root node for default model.");
+        }
+
+        // Change to large model
+        tree.setLargeModel(true);
+        tree.setRowHeight(20);
+        root.setUserObject("root");
+        tree.setModel(new DefaultTreeModel(root));
+        root.setUserObject("New root");
+        ((DefaultTreeModel) tree.getModel()).nodeChanged(root);
+
+        // Check again
+        if (!root.getUserObject().toString().equals("New root")) {
+            throw new RuntimeException("Failed changing root node for large model.");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4118860.java b/test/jdk/javax/swing/JTree/bug4118860.java
new file mode 100644
index 00000000000..eb266eb9324
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4118860.java
@@ -0,0 +1,97 @@
+/*
+ * 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 4118860
+ * @summary setToggleClickCount/getToggleClickCount have been added.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4118860
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridLayout;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+
+public class bug4118860 {
+    static final String INSTRUCTIONS = """
+        Push the "Single Click" button and try expanding/contracting
+        branch nodes of the tree with one left mouse button click
+        on the label part of the node (not the icon or handles).
+
+        Then push the "Double Click" button and try doing the same using
+        left mouse button double click. Single click shouldn't cause
+        expanding/contracting. A double click should now be required
+        to expand/contract nodes.
+
+        If it works then the test PASSES, else the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4118860 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4118860::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("ToggleClickCount Test");
+        JTree tr = new JTree();
+        JPanel p = new JPanel();
+        p.setBackground(Color.red);
+        p.setLayout(new GridLayout(1, 1));
+        tr.setOpaque(false);
+        p.add(tr);
+        f.add(p, BorderLayout.CENTER);
+        JPanel bp = new JPanel();
+        JButton bt1 = new JButton("Single Click");
+        bt1.addActionListener(e -> {
+            tr.setToggleClickCount(1);
+            if (tr.getToggleClickCount() != 1) {
+                throw new RuntimeException("ToggleClickCount doesn't set...");
+            }
+        });
+        JButton bt2 = new JButton("Double Click");
+        bt2.addActionListener(e -> {
+            tr.setToggleClickCount(2);
+            if (tr.getToggleClickCount() != 2) {
+                throw new RuntimeException("ToggleClickCount doesn't set...");
+            }
+        });
+        bp.setLayout(new GridLayout(1, 2));
+        bp.add(bt1);
+        bp.add(bt2);
+        f.add(bp, BorderLayout.SOUTH);
+        f.setSize(300, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4169215.java b/test/jdk/javax/swing/JTree/bug4169215.java
new file mode 100644
index 00000000000..0b8780b3939
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4169215.java
@@ -0,0 +1,65 @@
+/*
+ * 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 4169215
+ * @summary Accessibility hierarchy JTree node test.
+ * @run main bug4169215
+ */
+
+import javax.accessibility.AccessibleContext;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class bug4169215 {
+    public static void main(String[] args) {
+        // create the tree
+        DefaultMutableTreeNode root = new DefaultMutableTreeNode("top");
+        DefaultMutableTreeNode nodeA = new DefaultMutableTreeNode("A");
+        DefaultMutableTreeNode nodeB = new DefaultMutableTreeNode("B");
+        root.add(nodeA);
+        root.add(nodeB);
+        JTree tree = new JTree(root);
+
+        // find the AccessibleContext of the tree
+        AccessibleContext actree = tree.getAccessibleContext();
+
+        // find the AccessibleContext of top node of the tree
+        AccessibleContext act = actree.getAccessibleChild(0).getAccessibleContext();
+
+        // find the AccessibleContext of the first child of the table ->
+        // the AccessibleContext of nodeA
+        AccessibleContext accA = act.getAccessibleChild(0).getAccessibleContext();
+
+        // find the AccessibleContext of the next sibling of nodeA, by getting
+        // child+1 of the parent (the table)
+        AccessibleContext accB = act.getAccessibleChild(
+                accA.getAccessibleIndexInParent()+1).getAccessibleContext();
+
+        // look to see who the sibling is.
+        if (accB.getAccessibleName().compareTo("B") != 0) {
+            throw new RuntimeException("Parent node is a sibling instead!");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4196987.java b/test/jdk/javax/swing/JTree/bug4196987.java
new file mode 100644
index 00000000000..1387b669b05
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4196987.java
@@ -0,0 +1,70 @@
+/*
+ * 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 4196987
+ * @summary Test Metal L&F JTree expander icons transparency.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4196987
+ */
+
+import java.awt.Color;
+import java.awt.GridLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.UIManager;
+
+public class bug4196987 {
+    static final String INSTRUCTIONS = """
+        If the background of tree icons are red, the test PASSES.
+        Otherwise the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        PassFailJFrame.builder()
+                .title("bug4196987 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4196987::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("JTree Icon Transparency Test");
+        JPanel p = new JPanel();
+        p.setBackground(Color.red);
+        p.setLayout(new GridLayout(1, 1));
+        JTree t = new JTree();
+        t.setOpaque(false);
+        p.add(t);
+        f.add(p);
+        f.setSize(200, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4270654.java b/test/jdk/javax/swing/JTree/bug4270654.java
new file mode 100644
index 00000000000..413626d7881
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4270654.java
@@ -0,0 +1,76 @@
+/*
+ * 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 4270654
+ * @summary Tests that selection change in JTree does not cause unnecessary
+            scrolling.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4270654
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class bug4270654 {
+    static final String INSTRUCTIONS = """
+        Select the "dan" node and scroll to the right a little using the
+        scrollbar. Then press down arrow key. If the tree unscrolls back
+        to the left, the test FAILS. Otherwise, the test PASSES.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4270654 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4270654::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("JTree Scroll Back Test");
+        DefaultMutableTreeNode root = new DefaultMutableTreeNode("root");
+        String[] lev1 = {"foo", "bar", "dan"};
+        String[][] lev2 = {
+                {},
+                {"small", "a nice big node for testing"},
+                {"xyz", "pqd", "a really really big node for testing"}};
+        for (int i = 0; i < lev1.length; i++) {
+            DefaultMutableTreeNode child = new DefaultMutableTreeNode(lev1[i]);
+            root.add(child);
+            for (int j = 0; j < lev2[i].length; j++)
+                child.add(new DefaultMutableTreeNode(lev2[i][j]));
+        }
+        final JTree tree = new JTree(root);
+        tree.expandRow(3);
+        f.add(new JScrollPane(tree));
+        f.setSize(200, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JTree/bug4618767.java b/test/jdk/javax/swing/JTree/bug4618767.java
new file mode 100644
index 00000000000..d8aa52c3952
--- /dev/null
+++ b/test/jdk/javax/swing/JTree/bug4618767.java
@@ -0,0 +1,121 @@
+/*
+ * 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 4618767
+ * @summary First letter navigation in JTree interferes with mnemonics
+ * @key headful
+ * @run main bug4618767
+ */
+
+import java.awt.Robot;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
+public class bug4618767 {
+    private static JFrame f;
+    private static final JTree tree = new
+            JTree(new String[] {"one", "two", "three", "four"});
+    private static boolean menuSelected;
+    private static CountDownLatch listGainedFocusLatch = new CountDownLatch(1);
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("bug4618767 Test");
+                JMenu menu = new JMenu("File");
+                menu.setMnemonic('F');
+                JMenuItem menuItem = new JMenuItem("item");
+                menu.add(menuItem);
+                JMenuBar menuBar = new JMenuBar();
+                menuBar.add(menu);
+                f.setJMenuBar(menuBar);
+
+                menu.addMenuListener(new MenuListener() {
+                    public void menuCanceled(MenuEvent e) {}
+                    public void menuDeselected(MenuEvent e) {}
+                    public void menuSelected(MenuEvent e) {
+                        menuSelected = true;
+                    }
+                });
+
+                tree.addFocusListener(new FocusAdapter() {
+                    @Override
+                    public void focusGained(FocusEvent e) {
+                        listGainedFocusLatch.countDown();
+                    }
+                });
+                f.add(tree);
+                f.pack();
+                f.setLocationRelativeTo(null);
+                f.setAlwaysOnTop(true);
+                f.setVisible(true);
+            });
+            runTest();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+
+    private static void runTest() throws Exception {
+        if (!listGainedFocusLatch.await(3, TimeUnit.SECONDS)) {
+            throw new RuntimeException("Waited too long, but can't gain" +
+                    " focus for list");
+        }
+        Robot robot = new Robot();
+        robot.setAutoDelay(200);
+        robot.waitForIdle();
+        robot.keyPress(KeyEvent.VK_O);
+        robot.keyRelease(KeyEvent.VK_O);
+        robot.waitForIdle();
+        robot.keyPress(KeyEvent.VK_ALT);
+        robot.keyPress(KeyEvent.VK_F);
+        robot.keyRelease(KeyEvent.VK_F);
+        robot.keyRelease(KeyEvent.VK_ALT);
+
+        SwingUtilities.invokeAndWait(() -> {
+            if (menuSelected && !tree.getSelectionPath()
+                    .getLastPathComponent().toString().equals("one")) {
+                throw new RuntimeException("Mnemonics interferes with JTree" +
+                        " item selection using KeyEvent");
+            }
+        });
+    }
+}

From 76dec47f00230214e9ba58714be5a3ad26f8308d Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 18 Apr 2025 21:35:17 +0000
Subject: [PATCH 013/901] 8354340: Open source Swing Tests - Set 6

Reviewed-by: azvegint, achung
---
 .../JViewport/ScrollRectToVisibleTest3.java   | 165 ++++++++++++++++++
 .../javax/swing/JViewport/SetViewRepaint.java | 114 ++++++++++++
 2 files changed, 279 insertions(+)
 create mode 100644 test/jdk/javax/swing/JViewport/ScrollRectToVisibleTest3.java
 create mode 100644 test/jdk/javax/swing/JViewport/SetViewRepaint.java

diff --git a/test/jdk/javax/swing/JViewport/ScrollRectToVisibleTest3.java b/test/jdk/javax/swing/JViewport/ScrollRectToVisibleTest3.java
new file mode 100644
index 00000000000..bf96ab2fc46
--- /dev/null
+++ b/test/jdk/javax/swing/JViewport/ScrollRectToVisibleTest3.java
@@ -0,0 +1,165 @@
+/*
+ * 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
+ * @key headful
+ * @bug 4217252
+ * @summary Verify that scrolling beyond the visible region and scrolling
+ *          a component smaller than the viewport is not allowed.
+ * @library /javax/swing/regtesthelpers
+ * @build Util
+ * @run main/othervm -Dsun.java2d.uiScale=1 ScrollRectToVisibleTest3
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.AbstractTableModel;
+
+public class ScrollRectToVisibleTest3 {
+    private static JFrame frame;
+    private static JTable table;
+    private static JButton scrollButton;
+    private static volatile int clickCount = 0;
+    private static final String[] EXPECTED_TEXT = {"99 x 0", "98 x 0",
+                                                   "97 x 0", "96 x 0"};
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        robot.setAutoWaitForIdle(true);
+
+        SwingUtilities.invokeAndWait(ScrollRectToVisibleTest3::createTestUI);
+        robot.waitForIdle();
+        robot.delay(1000);
+
+        Rectangle frameBounds = Util.invokeOnEDT(() -> getComponentBounds(frame));
+        robot.delay(100);
+        Point scrollBtnLoc = Util.getCenterPoint(scrollButton);
+
+        robot.mouseMove(scrollBtnLoc.x, scrollBtnLoc.y);
+        robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+        robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+        robot.delay(50);
+
+        int rowHeight = Util.invokeOnEDT(() -> table.getRowHeight());
+        for (int i = 1; i <= 4; i++) {
+            robot.mouseMove(frameBounds.x + 50,
+                            frameBounds.y + frameBounds.height - (rowHeight * i + 2));
+            robot.delay(300);
+            robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+            // 500 ms delay added so that current mouseClicked event
+            // is processed successfully before proceeding to the next
+            robot.delay(500);
+        }
+        if (clickCount != 4) {
+            throw new RuntimeException("Test Failed! Expected 4 mouse clicks"
+                                       + " but got " + clickCount);
+        }
+    }
+
+    private static void createTestUI() {
+        frame = new JFrame("ScrollRectToVisibleTest3");
+        table = new JTable(new TestModel());
+        table.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                JTable testTable = (JTable) e.getComponent();
+                int row = testTable.getSelectedRow();
+                int column = testTable.getSelectedColumn();
+                String cellContent = testTable.getValueAt(row, column).toString();
+                if (!EXPECTED_TEXT[clickCount].equals(cellContent)) {
+                    throw new RuntimeException(("Test failed! Table Cell Content"
+                                + " at (row %d , col %d)\n Expected: %s vs Actual: %s")
+                                    .formatted(row, column,
+                                            EXPECTED_TEXT[clickCount], cellContent));
+                }
+                clickCount++;
+            }
+        });
+
+        scrollButton = new JButton("Scroll");
+        scrollButton.addActionListener(ae -> {
+            Rectangle bounds = table.getBounds();
+            bounds.y = bounds.height + table.getRowHeight();
+            bounds.height = table.getRowHeight();
+            System.out.println("scrolling: " + bounds);
+            table.scrollRectToVisible(bounds);
+            System.out.println("bounds: " + table.getVisibleRect());
+        });
+
+        frame.add(scrollButton, BorderLayout.NORTH);
+        frame.add(new JScrollPane(table), BorderLayout.CENTER);
+        frame.setSize(400, 300);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+
+    private static class TestModel extends AbstractTableModel {
+        @Override
+        public String getColumnName(int column) {
+            return Integer.toString(column);
+        }
+
+        @Override
+        public int getRowCount() {
+            return 100;
+        }
+
+        @Override
+        public int getColumnCount() {
+            return 5;
+        }
+
+        @Override
+        public Object getValueAt(int row, int col) {
+            return row + " x " + col;
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int column) { return false; }
+
+        @Override
+        public void setValueAt(Object value, int row, int col) {
+        }
+    }
+
+    private static Rectangle getComponentBounds(Component c) {
+        Point locationOnScreen = c.getLocationOnScreen();
+        Dimension size = c.getSize();
+        return new Rectangle(locationOnScreen, size);
+    }
+}
diff --git a/test/jdk/javax/swing/JViewport/SetViewRepaint.java b/test/jdk/javax/swing/JViewport/SetViewRepaint.java
new file mode 100644
index 00000000000..379a3e4e33b
--- /dev/null
+++ b/test/jdk/javax/swing/JViewport/SetViewRepaint.java
@@ -0,0 +1,114 @@
+/*
+ * 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 4128110
+ * @summary Verify that JViewport.setViewportView() and JScrollPane.setViewport()
+ *          force a re-layout and a repaint.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual SetViewRepaint
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridLayout;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+
+public class SetViewRepaint {
+    private static final String INSTRUCTIONS = """
+            Verify the following two cases:
+
+            1) Press "JViewport.setViewportView()" button and verify that
+               the blue label is replaced by a scrolling list.
+
+            2) Press "JScrollPane.setViewport()" button and verify that
+               the red label is replaced by a scrolling list as well.
+
+            In either case the display should update automatically after
+            pressing the button.
+
+            If the above is true, press PASS else press FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(30)
+                .testUI(SetViewRepaint::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("SetViewRepaint");
+        JPanel p1 = new JPanel(new BorderLayout());
+        JPanel p2 = new JPanel(new BorderLayout());
+
+        JLabel label1 = new ColorLabel(Color.BLUE, "Blue Label");
+        final JList list1 = new JList(new String[]{"one", "two", "three", "four"});
+        final JScrollPane sp1 = new JScrollPane(label1);
+        ActionListener doSetViewportView = e -> sp1.setViewportView(list1);
+        JButton b1 = new JButton("JViewport.setViewportView()");
+        b1.addActionListener(doSetViewportView);
+        p1.add(sp1, BorderLayout.CENTER);
+        p1.add(b1, BorderLayout.SOUTH);
+
+        JLabel label2 = new ColorLabel(Color.RED, "Red Label");
+        final JList list2 = new JList(new String[]{"five", "six", "seven", "eight"});
+        final JScrollPane sp2 = new JScrollPane(label2);
+        ActionListener doSetViewport = e -> {
+            JViewport vp = new JViewport();
+            vp.setView(list2);
+            sp2.setViewport(vp);
+        };
+        JButton b2 = new JButton("JScrollPane.setViewport()");
+        b2.addActionListener(doSetViewport);
+        p2.add(sp2, BorderLayout.CENTER);
+        p2.add(b2, BorderLayout.SOUTH);
+        frame.setLayout(new GridLayout(1, 2));
+        frame.add(p1);
+        frame.add(p2);
+        frame.setResizable(false);
+        frame.setSize(500, 120);
+        return frame;
+    }
+
+    private static class ColorLabel extends JLabel {
+        ColorLabel(Color color, String text) {
+            super(text);
+            setForeground(Color.WHITE);
+            setBackground(color);
+            setOpaque(true);
+            setHorizontalAlignment(CENTER);
+        }
+    }
+}

From bd73127d7495244f93f941530db32b4559d45689 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 18 Apr 2025 23:29:53 +0000
Subject: [PATCH 014/901] 8354532: Open source JFileChooser Tests - Set 7

Reviewed-by: prr
---
 .../javax/swing/JFileChooser/bug4357012.java  |  99 +++++++++++++++
 .../javax/swing/JFileChooser/bug4926884.java  | 114 ++++++++++++++++++
 .../javax/swing/JFileChooser/bug5045464.java  |  68 +++++++++++
 .../javax/swing/JFileChooser/bug6515169.java  | 106 ++++++++++++++++
 4 files changed, 387 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4357012.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4926884.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug5045464.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug6515169.java

diff --git a/test/jdk/javax/swing/JFileChooser/bug4357012.java b/test/jdk/javax/swing/JFileChooser/bug4357012.java
new file mode 100644
index 00000000000..2dfdcd336d5
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4357012.java
@@ -0,0 +1,99 @@
+/*
+ * 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 4357012
+ * @requires (os.family == "windows")
+ * @summary JFileChooser.showSaveDialog inconsistent with Windows Save Dialog
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4357012
+ */
+
+import java.io.File;
+import java.io.IOException;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.UIManager;
+
+public class bug4357012 {
+    private static File workDir = null;
+    private static File dir = null;
+    private static File file = null;
+    private static final String INSTRUCTIONS = """
+            <html>
+            Test is for Windows LAF only
+            <p>In JFileChooser's files list :
+            <ol>
+            <li>Select directory. Verify that the directory name doesn't
+            appear in "file name" field.</li>
+            <li>Select file. Verify that the file name appears in
+            "file name" field.</li>
+            <li>Select directory again. Verify that the previous file name
+            remains in file name field.</li>
+            </ol>
+            </p>
+            </html>
+            """;
+
+    public static void main(String[] argv) throws Exception {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            createTestDir();
+            PassFailJFrame.builder()
+                    .instructions(INSTRUCTIONS)
+                    .rows(10)
+                    .columns(40)
+                    .testUI(bug4357012::createTestUI)
+                    .build()
+                    .awaitAndCheck();
+        } finally {
+            if (workDir != null) {
+                System.out.println("Deleting '" + file + "': " + file.delete());
+                System.out.println("Deleting '" + dir + "': " + dir.delete());
+                System.out.println("Deleting '" + workDir + "': " + workDir.delete());
+            }
+        }
+    }
+
+    private static void createTestDir() throws IOException {
+        String tempDir = ".";
+        String fs = System.getProperty("file.separator");
+
+        workDir = new File(tempDir + fs + "bug4357012");
+        System.out.println("Creating '" + workDir + "': " + workDir.mkdir());
+
+        dir = new File(workDir + fs + "Directory");
+        System.out.println("Creating '" + dir + "': " + dir.mkdir());
+
+        file = new File(workDir + fs + "File.txt");
+        System.out.println("Creating '" + file + "': " + file.createNewFile());
+    }
+
+    private static JComponent createTestUI() {
+        JFileChooser fc = new JFileChooser(workDir);
+        fc.setDialogType(JFileChooser.SAVE_DIALOG);
+        return fc;
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug4926884.java b/test/jdk/javax/swing/JFileChooser/bug4926884.java
new file mode 100644
index 00000000000..29d6c4e9134
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4926884.java
@@ -0,0 +1,114 @@
+/*
+ * 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 4926884
+ * @requires (os.family == "windows")
+ * @summary Win L&F: JFileChooser problems with "My Documents" folder
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4926884
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.swing.JFileChooser;
+import javax.swing.UIManager;
+
+public class bug4926884 {
+    private static final String INSTRUCTIONS = """
+            Validate next statements step by step:
+
+            1. In the file list there are several dirs and files (like "ski",
+               "Snowboard" etc.)
+            2. Select "Details" view mode.
+            3. Make file list in focus (e.g. by pressing mouse button)
+            4. Press key "w" several times with delay LESS than 1 second.
+              Selection should be changed across files started with letter "w"
+              (without case sensitive).
+            5. Press key "w" several times with delay MORE than 1 second.
+              Selection should be changed across files started with letter "w"
+              (without case sensitive).
+            6. Type "winnt" (with delay less than 1 second between letters) -
+               directory "winnt" should be selected.
+            7. Change conditions:
+              - Move column "Name" to the second position
+              - Change sort mode by clicking column "Size"
+            8. Repeat items 4-6
+
+            If above is true press PASS else FAIL
+            """;
+
+    private static final String[] DIRS = {"www", "winnt", "ski"};
+    private static final String[] FILES = {"Window", "weel", "mice",
+                                           "Wall", "Snowboard", "wood"};
+    private static final File testDir = new File(".");
+
+    public static void main(String[] argv) throws Exception {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        try {
+            createTestDir();
+            PassFailJFrame.builder()
+                    .instructions(INSTRUCTIONS)
+                    .columns(40)
+                    .testUI(() -> new JFileChooser(testDir))
+                    .build()
+                    .awaitAndCheck();
+        } finally {
+            deleteTempDir();
+        }
+    }
+
+    private static void createTestDir() throws IOException {
+        testDir.mkdir();
+
+        for (String dir : DIRS) {
+            new File(testDir, dir).mkdir();
+        }
+
+        for (int i = 0; i < FILES.length; i++) {
+
+            try (OutputStream outputStream = new FileOutputStream(
+                    new File(testDir, FILES[i]))) {
+                for (int j = 0; j < i * 1024; j++) {
+                    outputStream.write('#');
+                }
+            }
+        }
+    }
+
+    private static void deleteTempDir() {
+        File[] files = testDir.listFiles();
+
+        for (File file : files) {
+            if (file != null) {
+                file.delete();
+            }
+        }
+
+        testDir.delete();
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug5045464.java b/test/jdk/javax/swing/JFileChooser/bug5045464.java
new file mode 100644
index 00000000000..0fbeedcec6b
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug5045464.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 5045464
+ * @requires (os.family == "linux")
+ * @summary Regression: GTK L&F, JFileChooser shows "null/" in folder list
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug5045464
+ */
+
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class bug5045464 {
+    private static final String INSTRUCTIONS = """
+            When the filechooser appears check the directory list (the left list).
+            If it starts with two items: "./" (current directory)
+            and "../" (parent directory) press PASS.
+            If something else is here (e.g. "null/" instead of "./")
+            press FAIL.
+            """;
+
+    public static void main(String[] argv) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug5045464::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JComponent createTestUI() {
+        JFileChooser fc = new JFileChooser();
+        fc.setControlButtonsAreShown(false);
+        try {
+         UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+        } catch (Exception ex) {
+        throw new RuntimeException("Test Failed!", ex);
+        }
+        SwingUtilities.updateComponentTreeUI(fc);
+        return fc;
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug6515169.java b/test/jdk/javax/swing/JFileChooser/bug6515169.java
new file mode 100644
index 00000000000..98cd813eefb
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug6515169.java
@@ -0,0 +1,106 @@
+/*
+ * 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 6515169
+ * @requires (os.family == "windows")
+ * @summary wrong grid header in JFileChooser
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug6515169
+ */
+
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class bug6515169 {
+    private static JFrame frame;
+    private static final String INSTRUCTIONS = """
+            This test is to verify JFileChooser on Windows and Metal LAF.
+            Use the "Change LaF" menu to switch between the 2 LaF
+            and verify the following.
+
+            a. Change view mode to "Details"
+            b. Check that 4 columns appear: Name, Size, Type and Date Modified
+            c. Change current directory by pressing any available subdirectory
+               or by pressing button "Up One Level".
+            d. Check that still four columns exist.
+
+            Change LaF and repeat the steps a-d.
+            If all conditions are true press PASS, else FAIL.
+            """;
+
+    public static void main(String[] argv) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug6515169::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        frame = new JFrame("bug6515169");
+        JMenuBar bar = new JMenuBar();
+        JMenu lafMenu = new JMenu("Change LaF");
+        ButtonGroup lafGroup = new ButtonGroup();
+        JCheckBoxMenuItem lafItem1 = new JCheckBoxMenuItem("Window LaF");
+        lafItem1.addActionListener(e ->
+                setLaF(UIManager.getSystemLookAndFeelClassName()));
+        lafGroup.add(lafItem1);
+        lafMenu.add(lafItem1);
+
+        JCheckBoxMenuItem lafItem2 = new JCheckBoxMenuItem("Metal LaF");
+        lafItem2.addActionListener(e ->
+                setLaF(UIManager.getCrossPlatformLookAndFeelClassName()));
+        lafGroup.add(lafItem2);
+        lafMenu.add(lafItem2);
+
+        bar.add(lafMenu);
+        frame.setJMenuBar(bar);
+
+        String dir = ".";
+        JFileChooser fc = new JFileChooser(dir);
+        fc.setControlButtonsAreShown(false);
+        frame.add(fc);
+        frame.pack();
+
+        return frame;
+    }
+
+    private static void setLaF(String laf) {
+        try {
+            UIManager.setLookAndFeel(laf);
+            SwingUtilities.updateComponentTreeUI(frame);
+        } catch (Exception e) {
+           throw new RuntimeException("Test Failed!", e);
+        }
+    }
+}

From 4f58af0a8dd5eced77259bed180f6af36501f502 Mon Sep 17 00:00:00 2001
From: Alexey Bakhtin <abakhtin@openjdk.org>
Date: Sat, 19 Apr 2025 00:30:37 +0000
Subject: [PATCH 015/901] 8259540: MissingResourceException for key
 cvc-complex-type.2.4.d.1

Reviewed-by: joehw
---
 .../apache/xerces/internal/impl/msg/XMLSchemaMessages.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
index f6402e8f65e..4f15b428c8b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties
@@ -56,6 +56,7 @@
         cvc-complex-type.2.4.b = cvc-complex-type.2.4.b: The content of element ''{0}'' is not complete. One of ''{1}'' is expected.
         cvc-complex-type.2.4.c = cvc-complex-type.2.4.c: The matching wildcard is strict, but no declaration can be found for element ''{0}''.
         cvc-complex-type.2.4.d = cvc-complex-type.2.4.d: Invalid content was found starting with element ''{0}''. No child element is expected at this point.
+        cvc-complex-type.2.4.d.1 = cvc-complex-type.2.4.d: Invalid content was found starting with element ''{0}''. No child element ''{1}'' is expected at this point.
         cvc-complex-type.2.4.e = cvc-complex-type.2.4.e: ''{0}'' can occur a maximum of ''{2}'' times in the current sequence. This limit was exceeded. At this point one of ''{1}'' is expected.
         cvc-complex-type.2.4.f = cvc-complex-type.2.4.f: ''{0}'' can occur a maximum of ''{1}'' times in the current sequence. This limit was exceeded. No child element is expected at this point.
         cvc-complex-type.2.4.g = cvc-complex-type.2.4.g: Invalid content was found starting with element ''{0}''. ''{1}'' is expected to occur a minimum of ''{2}'' times in the current sequence. One more instance is required to satisfy this constraint.

From c7c77eb6aa25cbf84ba4b7519e16c092c222e504 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sat, 19 Apr 2025 07:48:54 +0000
Subject: [PATCH 016/901] 8354077: Get rid of offscreenSharingEnabled windows
 flag

Reviewed-by: prr
---
 .../sun/java2d/windows/WindowsFlags.java      | 32 ++-----------------
 .../libawt/java2d/windows/WindowsFlags.cpp    |  9 +-----
 .../libawt/java2d/windows/WindowsFlags.h      |  4 +--
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
index 5bf2ba3227f..7333eeda3dd 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.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
@@ -55,16 +55,6 @@ public class WindowsFlags {
      *               This flag can force us to use d3d
      *               anyway in these situations.  Or, this flag can force us to
      *               not use d3d in a situation where we would use it otherwise.
-     *      offscreenSharingEnabled: usage: "-Dsun.java2d.offscreenSharing=true"
-     *               Turns on the ability to share a hardware-accelerated
-     *               offscreen surface through the JAWT interface.  See
-     *               src/windows/native/sun/windows/awt_DrawingSurface.* for
-     *               more information.  This capability is disabled by default
-     *               pending more testing and time to work out the right
-     *               solution; we do not want to expose more public JAWT api
-     *               without being very sure that we will be willing to support
-     *               that API in the future regardless of other native
-     *               rendering pipeline changes.
      *      magPresent: usage: "-Djavax.accessibility.screen_magnifier_present"
      *               This flag is set either on the command line or in the
      *               properties file.  It tells Swing whether the user is
@@ -101,7 +91,6 @@ public class WindowsFlags {
     private static boolean d3dOnScreenEnabled;
     private static boolean oglEnabled;
     private static boolean oglVerbose;
-    private static boolean offscreenSharingEnabled;
     private static boolean magPresent;
     private static boolean setHighDPIAware;
     // TODO: other flags, including nopixfmt
@@ -206,8 +195,6 @@ private static void initJavaFlags() {
         if (d3dSet) {
             d3dVerbose = isBooleanPropTrueVerbose("sun.java2d.d3d");
         }
-        offscreenSharingEnabled =
-            getBooleanProp("sun.java2d.offscreenSharing", false);
         String dpiOverride = System.getProperty("sun.java2d.dpiaware");
         if (dpiOverride != null) {
             setHighDPIAware = dpiOverride.equalsIgnoreCase("true");
@@ -217,16 +204,6 @@ private static void initJavaFlags() {
             setHighDPIAware =
                 sunLauncherProperty.equalsIgnoreCase("SUN_STANDARD");
         }
-        /*
-            // Output info based on some non-default flags:
-            if (offscreenSharingEnabled) {
-                System.out.println(
-                    "Warning: offscreenSharing has been enabled. " +
-                    "The use of this capability will change in future " +
-                    "releases and applications that depend on it " +
-                    "may not work correctly");
-            }
-        */
         /*
         System.out.println("WindowsFlags (Java):");
         System.out.println("  ddEnabled: " + ddEnabled + "\n" +
@@ -235,8 +212,7 @@ private static void initJavaFlags() {
                            "  d3dSet: " + d3dSet + "\n" +
                            "  oglEnabled: " + oglEnabled + "\n" +
                            "  oglVerbose: " + oglVerbose + "\n" +
-                           "  gdiBlitEnabled: " + gdiBlitEnabled + "\n" +
-                           "  offscreenSharingEnabled: " + offscreenSharingEnabled);
+                           "  gdiBlitEnabled: " + gdiBlitEnabled);
         */
     }
 
@@ -260,10 +236,6 @@ public static boolean isGdiBlitEnabled() {
         return gdiBlitEnabled;
     }
 
-    public static boolean isOffscreenSharingEnabled() {
-        return offscreenSharingEnabled;
-    }
-
     public static boolean isMagPresent() {
         return magPresent;
     }
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
index 528e95e326a..9ed0f38bd10 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, 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
@@ -30,7 +30,6 @@
 BOOL      useD3D = TRUE;      // d3d enabled flag
                               // initially is TRUE to allow D3D preloading
 BOOL      forceD3DUsage;      // force d3d on or off
-jboolean  g_offscreenSharing; // JAWT accelerated surface sharing
 BOOL      setHighDPIAware;    // Whether to set the high-DPI awareness flag
 
 extern WCHAR *j2dAccelKey;       // Name of java2d root key
@@ -89,10 +88,6 @@ void GetFlagValues(JNIEnv *env, jclass wFlagsClass)
     }
     useD3D = d3dEnabled;
     forceD3DUsage = d3dSet;
-    g_offscreenSharing = GetStaticBoolean(env, wFlagsClass,
-                                          "offscreenSharingEnabled");
-    JNU_CHECK_EXCEPTION(env);
-
     setHighDPIAware =
         (IS_WINVISTA && GetStaticBoolean(env, wFlagsClass, "setHighDPIAware"));
     JNU_CHECK_EXCEPTION(env);
@@ -102,8 +97,6 @@ void GetFlagValues(JNIEnv *env, jclass wFlagsClass)
                 (useD3D ? "true" : "false"));
     J2dTraceLn1(J2D_TRACE_INFO, "  d3dSet = %s",
                 (forceD3DUsage ? "true" : "false"));
-    J2dTraceLn1(J2D_TRACE_INFO, "  offscreenSharing = %s",
-                (g_offscreenSharing ? "true" : "false"));
     J2dTraceLn1(J2D_TRACE_INFO, "  setHighDPIAware = %s",
                 (setHighDPIAware ? "true" : "false"));
 }
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
index 85ba1657000..d5e34fdaa69 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/WindowsFlags.h
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2003, 2008, 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
@@ -29,7 +28,6 @@
 
 extern BOOL      useD3D;             // d3d enabled flag
 extern BOOL      forceD3DUsage;      // force d3d on or off
-extern jboolean  g_offscreenSharing; // JAWT accelerated surface sharing
 extern BOOL      setHighDPIAware;    // whether to set High DPI Aware flag on Vista
 
 void SetD3DEnabledFlag(JNIEnv *env, BOOL d3dEnabled, BOOL d3dSet);

From 128f2d1cadae3cf91e4c590e6dabe2086737b7dd Mon Sep 17 00:00:00 2001
From: Liming Liu <lliu@openjdk.org>
Date: Sat, 19 Apr 2025 10:02:13 +0000
Subject: [PATCH 017/901] 8354572: Turn off AlwaysMergeDMB for Ampere CPU by
 default

Reviewed-by: shade
---
 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 c555e393ca5..b2d34553487 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(AlwaysMergeDMB)) {
+      FLAG_SET_DEFAULT(AlwaysMergeDMB, false);
+    }
   }
 
   // ThunderX

From 4dd64b49716144cc697fb461ff88860e2cbcaaea Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 21 Apr 2025 11:41:45 +0000
Subject: [PATCH 018/901] 8354477: C2 SuperWord: make use of memory edges more
 explicit

Reviewed-by: kvn, roland
---
 .../share/opto/superwordVTransformBuilder.cpp | 89 +++++++++----------
 .../share/opto/superwordVTransformBuilder.hpp | 14 +--
 src/hotspot/share/opto/vectorization.cpp      |  4 +
 src/hotspot/share/opto/vectorization.hpp      |  5 ++
 src/hotspot/share/opto/vtransform.hpp         |  5 +-
 5 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.cpp b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
index d356fcd5109..83496f9d0be 100644
--- a/src/hotspot/share/opto/superwordVTransformBuilder.cpp
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
@@ -34,9 +34,9 @@ void SuperWordVTransformBuilder::build() {
 
   // Connect all vtnodes with their inputs. Possibly create vtnodes for input
   // nodes that are outside the loop.
-  VectorSet vtn_dependencies; // Shared, but cleared for every vtnode.
-  build_inputs_for_vector_vtnodes(vtn_dependencies);
-  build_inputs_for_scalar_vtnodes(vtn_dependencies);
+  VectorSet vtn_memory_dependencies; // Shared, but cleared for every vtnode.
+  build_inputs_for_vector_vtnodes(vtn_memory_dependencies);
+  build_inputs_for_scalar_vtnodes(vtn_memory_dependencies);
 }
 
 void SuperWordVTransformBuilder::build_vector_vtnodes_for_packed_nodes() {
@@ -58,75 +58,77 @@ void SuperWordVTransformBuilder::build_scalar_vtnodes_for_non_packed_nodes() {
   }
 }
 
-void SuperWordVTransformBuilder::build_inputs_for_vector_vtnodes(VectorSet& vtn_dependencies) {
+void SuperWordVTransformBuilder::build_inputs_for_vector_vtnodes(VectorSet& vtn_memory_dependencies) {
   for (int i = 0; i < _packset.length(); i++) {
     Node_List* pack = _packset.at(i);
     Node* p0 = pack->at(0);
 
     VTransformVectorNode* vtn = get_vtnode(p0)->isa_Vector();
     assert(vtn != nullptr, "all packs must have vector vtnodes");
-    vtn_dependencies.clear(); // Add every dependency only once per vtn.
+    vtn_memory_dependencies.clear(); // Add every memory dependency only once per vtn.
 
     if (p0->is_Load()) {
-      set_req_with_scalar(p0,   vtn, vtn_dependencies, MemNode::Address);
+      set_req_with_scalar(p0,   vtn, MemNode::Address);
+      for (uint k = 0; k < pack->size(); k++) {
+        add_memory_dependencies_of_node_to_vtnode(pack->at(k), vtn, vtn_memory_dependencies);
+      }
     } else if (p0->is_Store()) {
-      set_req_with_scalar(p0,   vtn, vtn_dependencies, MemNode::Address);
-      set_req_with_vector(pack, vtn, vtn_dependencies, MemNode::ValueIn);
+      set_req_with_scalar(p0,   vtn, MemNode::Address);
+      set_req_with_vector(pack, vtn, MemNode::ValueIn);
+      for (uint k = 0; k < pack->size(); k++) {
+        add_memory_dependencies_of_node_to_vtnode(pack->at(k), vtn, vtn_memory_dependencies);
+      }
     } else if (vtn->isa_ReductionVector() != nullptr) {
-      set_req_with_scalar(p0,   vtn, vtn_dependencies, 1); // scalar init
-      set_req_with_vector(pack, vtn, vtn_dependencies, 2); // vector
+      set_req_with_scalar(p0,   vtn, 1); // scalar init
+      set_req_with_vector(pack, vtn, 2); // vector
     } else {
       assert(vtn->isa_ElementWiseVector() != nullptr, "all other vtnodes are handled above");
       if (VectorNode::is_scalar_rotate(p0) &&
           p0->in(2)->is_Con() &&
           Matcher::supports_vector_constant_rotates(p0->in(2)->get_int())) {
-        set_req_with_vector(pack, vtn, vtn_dependencies, 1);
-        set_req_with_scalar(p0,   vtn, vtn_dependencies, 2); // constant rotation
+        set_req_with_vector(pack, vtn, 1);
+        set_req_with_scalar(p0,   vtn, 2); // constant rotation
       } else if (VectorNode::is_roundopD(p0)) {
-        set_req_with_vector(pack, vtn, vtn_dependencies, 1);
-        set_req_with_scalar(p0,   vtn, vtn_dependencies, 2); // constant rounding mode
+        set_req_with_vector(pack, vtn, 1);
+        set_req_with_scalar(p0,   vtn, 2); // constant rounding mode
       } else if (p0->is_CMove()) {
         // Cmp + Bool + CMove -> VectorMaskCmp + VectorBlend.
-        set_all_req_with_vectors(pack, vtn, vtn_dependencies);
+        set_all_req_with_vectors(pack, vtn);
         VTransformBoolVectorNode* vtn_mask_cmp = vtn->in(1)->isa_BoolVector();
         if (vtn_mask_cmp->test()._is_negated) {
           vtn->swap_req(2, 3); // swap if test was negated.
         }
       } else {
-        set_all_req_with_vectors(pack, vtn, vtn_dependencies);
+        set_all_req_with_vectors(pack, vtn);
       }
     }
-
-    for (uint k = 0; k < pack->size(); k++) {
-      add_dependencies_of_node_to_vtnode(pack->at(k), vtn, vtn_dependencies);
-    }
   }
 }
 
-void SuperWordVTransformBuilder::build_inputs_for_scalar_vtnodes(VectorSet& vtn_dependencies) {
+void SuperWordVTransformBuilder::build_inputs_for_scalar_vtnodes(VectorSet& vtn_memory_dependencies) {
   for (int i = 0; i < _vloop_analyzer.body().body().length(); i++) {
     Node* n = _vloop_analyzer.body().body().at(i);
     VTransformScalarNode* vtn = get_vtnode(n)->isa_Scalar();
     if (vtn == nullptr) { continue; }
-    vtn_dependencies.clear(); // Add every dependency only once per vtn.
+    vtn_memory_dependencies.clear(); // Add every dependency only once per vtn.
 
     if (n->is_Load()) {
-      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::Address);
+      set_req_with_scalar(n, vtn, MemNode::Address);
+      add_memory_dependencies_of_node_to_vtnode(n, vtn, vtn_memory_dependencies);
     } else if (n->is_Store()) {
-      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::Address);
-      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::ValueIn);
+      set_req_with_scalar(n, vtn, MemNode::Address);
+      set_req_with_scalar(n, vtn, MemNode::ValueIn);
+      add_memory_dependencies_of_node_to_vtnode(n, vtn, vtn_memory_dependencies);
     } else if (n->is_CountedLoop()) {
       continue; // Is "root", has no dependency.
     } else if (n->is_Phi()) {
       // CountedLoop Phi's: ignore backedge (and entry value).
       assert(n->in(0) == _vloop.cl(), "only Phi's from the CountedLoop allowed");
-      set_req_with_scalar(n, vtn, vtn_dependencies, 0);
+      set_req_with_scalar(n, vtn, 0);
       continue;
     } else {
-      set_all_req_with_scalars(n, vtn, vtn_dependencies);
+      set_all_req_with_scalars(n, vtn);
     }
-
-    add_dependencies_of_node_to_vtnode(n, vtn, vtn_dependencies);
   }
 }
 
@@ -175,10 +177,9 @@ VTransformVectorNode* SuperWordVTransformBuilder::make_vector_vtnode_for_pack(co
   return vtn;
 }
 
-void SuperWordVTransformBuilder::set_req_with_scalar(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index) {
+void SuperWordVTransformBuilder::set_req_with_scalar(Node* n, VTransformNode* vtn, const int index) {
   VTransformNode* req = get_vtnode_or_wrap_as_input_scalar(n->in(index));
   vtn->set_req(index, req);
-  vtn_dependencies.set(req->_idx);
 }
 
 // Either get the existing vtnode vector input (when input is a pack), or else make a
@@ -273,46 +274,42 @@ VTransformNode* SuperWordVTransformBuilder::get_vtnode_or_wrap_as_input_scalar(N
   return vtn;
 }
 
-void SuperWordVTransformBuilder::set_req_with_vector(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies, int j) {
+void SuperWordVTransformBuilder::set_req_with_vector(const Node_List* pack, VTransformNode* vtn, int j) {
   VTransformNode* req = get_or_make_vtnode_vector_input_at_index(pack, j);
   vtn->set_req(j, req);
-  vtn_dependencies.set(req->_idx);
 }
 
-void SuperWordVTransformBuilder::set_all_req_with_scalars(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+void SuperWordVTransformBuilder::set_all_req_with_scalars(Node* n, VTransformNode* vtn) {
   assert(vtn->req() == n->req(), "scalars must have same number of reqs");
   for (uint j = 0; j < n->req(); j++) {
     Node* def = n->in(j);
     if (def == nullptr) { continue; }
-    set_req_with_scalar(n, vtn, vtn_dependencies, j);
+    set_req_with_scalar(n, vtn, j);
   }
 }
 
-void SuperWordVTransformBuilder::set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+void SuperWordVTransformBuilder::set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn) {
   Node* p0 = pack->at(0);
   assert(vtn->req() <= p0->req(), "must have at at most as many reqs");
   // Vectors have no ctrl, so ignore it.
   for (uint j = 1; j < vtn->req(); j++) {
     Node* def = p0->in(j);
     if (def == nullptr) { continue; }
-    set_req_with_vector(pack, vtn, vtn_dependencies, j);
+    set_req_with_vector(pack, vtn, j);
   }
 }
 
-void SuperWordVTransformBuilder::add_dependencies_of_node_to_vtnode(Node*n, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+void SuperWordVTransformBuilder::add_memory_dependencies_of_node_to_vtnode(Node*n, VTransformNode* vtn, VectorSet& vtn_memory_dependencies) {
   for (VLoopDependencyGraph::PredsIterator preds(_vloop_analyzer.dependency_graph(), n); !preds.done(); preds.next()) {
     Node* pred = preds.current();
     if (!_vloop.in_bb(pred)) { continue; }
+    if (!preds.is_current_memory_edge()) { continue; }
 
-    // Only add memory dependencies to memory nodes. All others are taken care of with the req.
-    if (n->is_Mem() && !pred->is_Mem()) { continue; }
-
+    // Only track every memory edge once.
     VTransformNode* dependency = get_vtnode(pred);
+    if (vtn_memory_dependencies.test_set(dependency->_idx)) { continue; }
 
-    // Reduction self-cycle?
-    if (vtn == dependency && _vloop_analyzer.reductions().is_marked_reduction(n)) { continue; }
-
-    if (vtn_dependencies.test_set(dependency->_idx)) { continue; }
-    vtn->add_dependency(dependency); // Add every dependency only once per vtn.
+    assert(n->is_Mem() && pred->is_Mem(), "only memory edges");
+    vtn->add_memory_dependency(dependency); // Add every dependency only once per vtn.
   }
 }
diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.hpp b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
index 847f870bef6..bff900377f6 100644
--- a/src/hotspot/share/opto/superwordVTransformBuilder.hpp
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
@@ -54,8 +54,8 @@ class SuperWordVTransformBuilder : public StackObj {
   void build();
   void build_vector_vtnodes_for_packed_nodes();
   void build_scalar_vtnodes_for_non_packed_nodes();
-  void build_inputs_for_vector_vtnodes(VectorSet& vtn_dependencies);
-  void build_inputs_for_scalar_vtnodes(VectorSet& vtn_dependencies);
+  void build_inputs_for_vector_vtnodes(VectorSet& vtn_memory_dependencies);
+  void build_inputs_for_scalar_vtnodes(VectorSet& vtn_memory_dependencies);
 
   // Helper methods for building VTransform.
   VTransformNode* get_vtnode_or_null(Node* n) const {
@@ -77,11 +77,11 @@ class SuperWordVTransformBuilder : public StackObj {
   VTransformVectorNode* make_vector_vtnode_for_pack(const Node_List* pack) const;
   VTransformNode* get_or_make_vtnode_vector_input_at_index(const Node_List* pack, const int index);
   VTransformNode* get_vtnode_or_wrap_as_input_scalar(Node* n);
-  void set_req_with_scalar(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index);
-  void set_req_with_vector(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index);
-  void set_all_req_with_scalars(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies);
-  void set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies);
-  void add_dependencies_of_node_to_vtnode(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies);
+  void set_req_with_scalar(Node* n, VTransformNode* vtn, const int index);
+  void set_req_with_vector(const Node_List* pack, VTransformNode* vtn, const int index);
+  void set_all_req_with_scalars(Node* n, VTransformNode* vtn);
+  void set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn);
+  void add_memory_dependencies_of_node_to_vtnode(Node* n, VTransformNode* vtn, VectorSet& vtn_memory_dependencies);
 };
 
 #endif // SHARE_OPTO_SUPERWORD_VTRANSFORM_BUILDER_HPP
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index e607a1065dd..d2cb62c92c9 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -399,6 +399,7 @@ VLoopDependencyGraph::PredsIterator::PredsIterator(const VLoopDependencyGraph& d
     _node(node),
     _dependency_node(dependency_graph.dependency_node(node)),
     _current(nullptr),
+    _is_current_memory_edge(false),
     _next_pred(0),
     _end_pred(node->req()),
     _next_memory_pred(0),
@@ -418,11 +419,14 @@ VLoopDependencyGraph::PredsIterator::PredsIterator(const VLoopDependencyGraph& d
 void VLoopDependencyGraph::PredsIterator::next() {
   if (_next_pred < _end_pred) {
     _current = _node->in(_next_pred++);
+    _is_current_memory_edge = false;
   } else if (_next_memory_pred < _end_memory_pred) {
     int pred_bb_idx = _dependency_node->memory_pred_edge(_next_memory_pred++);
     _current = _dependency_graph._body.body().at(pred_bb_idx);
+    _is_current_memory_edge = true;
   } else {
     _current = nullptr; // done
+    _is_current_memory_edge = false;
   }
 }
 
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index d4b78515312..9d0887a993f 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -648,6 +648,7 @@ class VLoopDependencyGraph : public StackObj {
     const DependencyNode* _dependency_node;
 
     Node* _current;
+    bool _is_current_memory_edge;
 
     // Iterate in node->in(i)
     int _next_pred;
@@ -665,6 +666,10 @@ class VLoopDependencyGraph : public StackObj {
       assert(!done(), "not done yet");
       return _current;
     }
+    bool is_current_memory_edge() const {
+      assert(!done(), "not done yet");
+      return _is_current_memory_edge;
+    }
   };
 };
 
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index 588da3cd56e..555f565360d 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -264,7 +264,8 @@ class VTransformNode : public ArenaObj {
   const VTransformNodeIDX _idx;
 
 private:
-  // _in is split into required inputs (_req), and additional dependencies.
+  // _in is split into required inputs (_req, i.e. all data dependencies),
+  // and memory dependencies.
   const uint _req;
   GrowableArray<VTransformNode*> _in;
   GrowableArray<VTransformNode*> _out;
@@ -294,7 +295,7 @@ class VTransformNode : public ArenaObj {
     _in.at_put(j, tmp);
   }
 
-  void add_dependency(VTransformNode* n) {
+  void add_memory_dependency(VTransformNode* n) {
     assert(n != nullptr, "no need to add nullptr");
     _in.push(n);
     n->add_out(this);

From cd2d49f7119459f07844ce8201ca2320850cd51f Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Mon, 21 Apr 2025 17:37:58 +0000
Subject: [PATCH 019/901] 8354472: Clean up and open source KeyEvent related
 tests (Part 3)

Reviewed-by: honkar
---
 .../awt/event/KeyEvent/CharUndefinedTest.java |  95 +++++++++++++
 .../awt/event/KeyEvent/ExtendedKeysTest.java  |  66 +++++++++
 .../event/KeyEvent/KeyDownCaptureTest.java    | 111 +++++++++++++++
 .../event/KeyEvent/KeyEventToLightweight.java | 125 ++++++++++++++++
 .../java/awt/event/KeyEvent/KeyModifiers.java | 134 ++++++++++++++++++
 5 files changed, 531 insertions(+)
 create mode 100644 test/jdk/java/awt/event/KeyEvent/CharUndefinedTest.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/ExtendedKeysTest.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/KeyDownCaptureTest.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/KeyEventToLightweight.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/KeyModifiers.java

diff --git a/test/jdk/java/awt/event/KeyEvent/CharUndefinedTest.java b/test/jdk/java/awt/event/KeyEvent/CharUndefinedTest.java
new file mode 100644
index 00000000000..bc58bdab14a
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/CharUndefinedTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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 4115484 4164672 4167893
+ * @summary Ensures that KeyEvent has right keyChar for modifier and action keys.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual CharUndefinedTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+
+public class CharUndefinedTest extends Frame implements KeyListener {
+
+    static String INSTRUCTIONS = """
+            Click on the text field inside the window named "Check KeyChar values".
+            Of any of the keys mentioned in this list that exist on your keyboard
+            press each of the listed keys once and also press them in two-key combinations such as
+            Control-Shift or Alt-Control.
+            The list of keys is: "Control, Shift, Meta, Alt, Command, Option".
+            After that press all function keys from F1 to F12 once,
+            Insert, Home, End, PageUp, PageDown and four arrow keys.
+            Check the log area below. If there are no messages starting with word "ERROR"
+            press "Pass" otherwise press "Fail".
+            """;
+
+    public CharUndefinedTest() {
+        super("Check KeyChar values");
+        setLayout(new BorderLayout());
+        TextField tf = new TextField(30);
+        tf.addKeyListener(this);
+        add(tf, BorderLayout.CENTER);
+        pack();
+        tf.requestFocus();
+    }
+
+    public void keyPressed(KeyEvent e) {
+        if (e.getKeyChar() != KeyEvent.CHAR_UNDEFINED) {
+            PassFailJFrame.log("ERROR: KeyPressed: keyChar = " + e.getKeyChar() +
+                    " keyCode = " + e.getKeyCode() + " " + e.getKeyText(e.getKeyCode()));
+        }
+    }
+
+    public void keyTyped(KeyEvent e) {
+        if (e.getKeyChar() != KeyEvent.CHAR_UNDEFINED) {
+            PassFailJFrame.log("ERROR: KeyTyped: keyChar = " + e.getKeyChar() +
+                    " keyCode = " + e.getKeyCode() + " " + e.getKeyText(e.getKeyCode()));
+        }
+    }
+
+    public void keyReleased(KeyEvent e) {
+        if (e.getKeyChar() != KeyEvent.CHAR_UNDEFINED) {
+            PassFailJFrame.log("ERROR: KeyReleased: keyChar = " + e.getKeyChar() +
+                    " keyCode = " + e.getKeyCode() + " " + e.getKeyText(e.getKeyCode()));
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .logArea(10)
+                .testUI(CharUndefinedTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/ExtendedKeysTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedKeysTest.java
new file mode 100644
index 00000000000..1423b2a007e
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/ExtendedKeysTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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 4218892 4191924 4199284
+ * @summary Unable to enter some chars via european keyboard layout(s)
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ExtendedKeysTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.TextArea;
+import java.lang.reflect.InvocationTargetException;
+
+public class ExtendedKeysTest extends Frame {
+    static String INSTRUCTIONS = """
+            This test requires Swiss German input. If the Swiss German input
+            can not be installed or configured press "Pass" to skip testing.
+            Click on the text area inside the window named "Check input".
+            Switch to Swiss German input and press key with "\\" on it
+            (usually this key is above or to the left of the main "Enter" key).
+            If you see a dollar sign press "Pass".
+            If you see any other character or question mark press "Fail".
+            """;
+
+    public ExtendedKeysTest() {
+        super("Check input");
+        setLayout(new BorderLayout());
+        add(new TextArea(20, 20), "Center");
+        pack();
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .logArea(10)
+                .testUI(ExtendedKeysTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyDownCaptureTest.java b/test/jdk/java/awt/event/KeyEvent/KeyDownCaptureTest.java
new file mode 100644
index 00000000000..bf2ab7ae958
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/KeyDownCaptureTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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 4093998
+ * @summary keyDown not called on subclasses of Component
+ * @key headful
+ * @run main KeyDownCaptureTest
+ */
+
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class KeyDownCaptureTest extends Frame implements KeyListener {
+    static AtomicBoolean passed = new AtomicBoolean(false);
+
+    public KeyDownCaptureTest() {
+        super("Key Down Capture Test");
+    }
+
+    public void initUI() {
+        setLayout (new BorderLayout());
+        setSize(200, 200);
+        setLocationRelativeTo(null);
+        Canvas canvas = new Canvas();
+        canvas.setBackground(Color.RED);
+        canvas.addKeyListener(this);
+        add(canvas, BorderLayout.CENTER);
+        setVisible(true);
+    }
+
+    public void middle(Point p) {
+        Point loc = getLocationOnScreen();
+        Dimension size = getSize();
+        p.setLocation(loc.x + (size.width / 2), loc.y + (size.height / 2));
+    }
+
+    @Override
+    public void keyTyped(KeyEvent ignore) {}
+
+    @Override
+    public void keyPressed(KeyEvent e) {
+        passed.set(true);
+    }
+
+    @Override
+    public void keyReleased(KeyEvent ignore) {}
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException {
+        KeyDownCaptureTest test = new KeyDownCaptureTest();
+        try {
+            EventQueue.invokeAndWait((test::initUI));
+            Robot robot = new Robot();
+            robot.setAutoDelay(50);
+            robot.delay(500);
+            robot.waitForIdle();
+            Point target = new Point();
+            EventQueue.invokeAndWait(() -> {
+                test.middle(target);
+            });
+            robot.mouseMove(target.x, target.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyPress(KeyEvent.VK_SPACE);
+            robot.keyRelease(KeyEvent.VK_SPACE);
+            robot.delay(100);
+            robot.waitForIdle();
+            if (!passed.get()) {
+                throw new RuntimeException("KeyPressed has not arrived to canvas");
+            }
+        } finally {
+            if (test != null) {
+                EventQueue.invokeAndWait(test::dispose);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyEventToLightweight.java b/test/jdk/java/awt/event/KeyEvent/KeyEventToLightweight.java
new file mode 100644
index 00000000000..de832bf2e6d
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/KeyEventToLightweight.java
@@ -0,0 +1,125 @@
+/*
+ * 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 4397557
+ * @summary Check that focused lightweight component gets key events
+ *          even if mouse is outside of it or on top of heavyweight component
+ * @key headful
+ * @run main KeyEventToLightweight
+ */
+
+import java.awt.AWTException;
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.swing.JButton;
+
+public class KeyEventToLightweight extends Frame {
+    JButton lwbutton = new JButton("Select Me");
+    Button hwbutton = new Button("Heavyweight");
+
+    AtomicBoolean aTyped = new AtomicBoolean(false);
+    AtomicBoolean bTyped = new AtomicBoolean(false);
+    AtomicBoolean cTyped = new AtomicBoolean(false);
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException {
+        KeyEventToLightweight test = new KeyEventToLightweight();
+        try {
+            EventQueue.invokeAndWait(test::initUI);
+            test.performTest();
+        } finally {
+            EventQueue.invokeAndWait(test::dispose);
+        }
+    }
+
+    public void initUI() {
+        this.setLayout(new FlowLayout());
+        add(lwbutton);
+        add(hwbutton);
+        setSize(200, 200);
+        setLocationRelativeTo(null);
+        lwbutton.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_A) {
+                    aTyped.set(true);
+                } else if (e.getKeyCode() == KeyEvent.VK_B) {
+                    bTyped.set(true);
+                } else if (e.getKeyCode() == KeyEvent.VK_C) {
+                    cTyped.set(true);
+                }
+            }
+        });
+        setVisible(true);
+    }
+
+    public void middleOf(Component c, Point p) {
+        Point loc = c.getLocationOnScreen();
+        Dimension size = c.getSize();
+        p.setLocation(loc.x + (size.width / 2), loc.y + (size.height / 2));
+    }
+
+    public void performTest() throws AWTException, InterruptedException,
+            InvocationTargetException {
+        Robot robot = new Robot();
+        robot.setAutoDelay(50);
+        robot.delay(500);
+        robot.waitForIdle();
+        Point target = new Point();
+        EventQueue.invokeAndWait(() -> middleOf(lwbutton, target));
+        robot.mouseMove(target.x, target.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+        robot.delay(500);
+        robot.keyPress(KeyEvent.VK_A);
+        robot.keyRelease(KeyEvent.VK_A);
+        robot.waitForIdle();
+        robot.mouseMove(target.x - 200, target.y);
+        robot.keyPress(KeyEvent.VK_B);
+        robot.keyRelease(KeyEvent.VK_B);
+        robot.waitForIdle();
+        robot.delay(500);
+        EventQueue.invokeAndWait(() -> middleOf(hwbutton, target));
+        robot.mouseMove(target.x, target.y);
+        robot.keyPress(KeyEvent.VK_C);
+        robot.keyRelease(KeyEvent.VK_C);
+        if (!aTyped.get() || !bTyped.get() || !cTyped.get()) {
+            throw new RuntimeException("Key event was not delivered, case 1: "
+                    + aTyped.get() + ", case 2: " + bTyped.get() + ", case 3: "
+                    + cTyped.get());
+        }
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyModifiers.java b/test/jdk/java/awt/event/KeyEvent/KeyModifiers.java
new file mode 100644
index 00000000000..13cc35581db
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/KeyModifiers.java
@@ -0,0 +1,134 @@
+/*
+ * 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 4193779 4174399
+ * @summary Ensures that KeyEvents have the right modifiers set
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jdk.test.lib.Platform
+ * @run main/manual KeyModifiers
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+
+import jdk.test.lib.Platform;
+
+
+public class KeyModifiers extends Frame implements KeyListener {
+    public KeyModifiers() {
+        super("Check KeyChar values");
+        setLayout(new BorderLayout());
+        TextField tf = new TextField(30);
+        tf.addKeyListener(this);
+        add(tf, BorderLayout.CENTER);
+        pack();
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+
+        String keys;
+        if (Platform.isWindows()) {
+            keys = "\"Shift-n\", \"Alt-n\"\n";
+        } else if (Platform.isOSX()) {
+            keys = "\"Shift-n\", \"Alt-n\", \"Command-n\"\n";
+        } else {
+            keys = "\"Shift-n\", \"Alt-n\", \"Meta-n\"\n";
+        }
+
+        String INSTRUCTIONS1 = """
+                Click on the text field in the window named "Check KeyChar values"
+                and type the following key combinations:
+                """;
+        String INSTRUCTIONS2 = """
+                After each combination check that the KeyPressed and KeyTyped modifiers
+                are correctly displayed. If modifiers are correct press "Pass",
+                otherwise press "Fail".
+                """;
+        PassFailJFrame.builder()
+                .title("KeyModifiers Test Instructions")
+                .instructions(INSTRUCTIONS1 + keys + INSTRUCTIONS2)
+                .columns(45)
+                .logArea(10)
+                .testUI(KeyModifiers::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public void keyPressed(KeyEvent evt) {
+        int kc = evt.getKeyCode();
+
+        if (kc == KeyEvent.VK_CONTROL) {
+            return;
+        }
+
+        if ((kc == KeyEvent.VK_SHIFT) || (kc == KeyEvent.VK_META) ||
+                (kc == KeyEvent.VK_ALT) || (kc == KeyEvent.VK_ALT_GRAPH)) {
+            PassFailJFrame.log("Key pressed= " + KeyEvent.getKeyText(kc) +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        } else {
+            PassFailJFrame.log("Key pressed = " + evt.getKeyChar() +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        }
+    }
+
+    public void keyTyped(KeyEvent evt) {
+        int kc = evt.getKeyCode();
+
+        if (kc == KeyEvent.VK_CONTROL) {
+            return;
+        }
+
+        if ((kc == KeyEvent.VK_SHIFT) || (kc == KeyEvent.VK_META) ||
+                (kc == KeyEvent.VK_ALT) || (kc == KeyEvent.VK_ALT_GRAPH)) {
+            PassFailJFrame.log("Key typed = " + KeyEvent.getKeyText(kc) +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        } else {
+            PassFailJFrame.log("Key typed = " + evt.getKeyChar() +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        }
+    }
+
+    public void keyReleased(KeyEvent evt) {
+        int kc = evt.getKeyCode();
+
+        if (kc == KeyEvent.VK_CONTROL)
+            return;
+
+        if ((kc == KeyEvent.VK_SHIFT) || (kc == KeyEvent.VK_META) ||
+                (kc == KeyEvent.VK_ALT) || (kc == KeyEvent.VK_ALT_GRAPH)) {
+            PassFailJFrame.log("Key = released " + KeyEvent.getKeyText(kc) +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        } else {
+            PassFailJFrame.log("Key released = " + evt.getKeyChar() +
+                    "   modifiers = " + InputEvent.getModifiersExText(evt.getModifiersEx()));
+        }
+    }
+}

From ecb54a05c6774e1a93d76b1181bda734129b6ace Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Mon, 21 Apr 2025 17:43:09 +0000
Subject: [PATCH 020/901] 8354523:
 runtime/Monitor/SyncOnValueBasedClassTest.java triggers SIGSEGV

Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Co-authored-by: Fei Yang <fyang@openjdk.org>
Co-authored-by: Amit Kumar <amitkumar@openjdk.org>
Reviewed-by: coleenp, aboldtch
---
 .../cpu/aarch64/c1_MacroAssembler_aarch64.cpp  | 15 ++++++++-------
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp  |  2 +-
 .../cpu/aarch64/interp_masm_aarch64.cpp        | 15 ++++++++-------
 .../cpu/aarch64/macroAssembler_aarch64.cpp     |  9 ++++++++-
 src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp  | 15 ++++++++-------
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp     | 15 ++++++++-------
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp     | 18 +++++++++++++-----
 .../cpu/riscv/c1_MacroAssembler_riscv.cpp      | 15 ++++++++-------
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp      |  2 +-
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp    | 15 ++++++++-------
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp |  9 ++++++++-
 .../cpu/s390/c1_MacroAssembler_s390.cpp        | 13 +++++++------
 src/hotspot/cpu/s390/interp_masm_s390.cpp      | 12 ++++++------
 src/hotspot/cpu/s390/macroAssembler_s390.cpp   | 10 ++++++++--
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp  | 13 +++++++------
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp  |  2 +-
 src/hotspot/cpu/x86/interp_masm_x86.cpp        | 12 ++++++------
 src/hotspot/cpu/x86/macroAssembler_x86.cpp     |  8 +++++++-
 18 files changed, 121 insertions(+), 79 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
index 6b1a5a7f1e0..afa2ddb47b4 100644
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
@@ -72,16 +72,17 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
 
   null_check_offset = offset();
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(hdr, obj);
-    ldrb(hdr, Address(hdr, Klass::misc_flags_offset()));
-    tst(hdr, KlassFlags::_misc_is_value_based_class);
-    br(Assembler::NE, slow_case);
-  }
-
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(disp_hdr, obj, hdr, temp, rscratch2, slow_case);
   } else if (LockingMode == LM_LEGACY) {
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(hdr, obj);
+      ldrb(hdr, Address(hdr, Klass::misc_flags_offset()));
+      tst(hdr, KlassFlags::_misc_is_value_based_class);
+      br(Assembler::NE, slow_case);
+    }
+
     Label done;
     // Load object header
     ldr(hdr, Address(obj, hdr_offset));
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 605a05a44a7..56a91310dcd 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -360,7 +360,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   Label slow_path;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     str(zr, Address(box, BasicLock::object_monitor_cache_offset_in_bytes()));
   }
 
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index d5ba85da989..dd1d7d1d2e1 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -693,17 +693,18 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
     // Load object pointer into obj_reg %c_rarg3
     ldr(obj_reg, Address(lock_reg, obj_offset));
 
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      load_klass(tmp, obj_reg);
-      ldrb(tmp, Address(tmp, Klass::misc_flags_offset()));
-      tst(tmp, KlassFlags::_misc_is_value_based_class);
-      br(Assembler::NE, slow_case);
-    }
-
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
       b(done);
     } else if (LockingMode == LM_LEGACY) {
+
+      if (DiagnoseSyncOnValueBasedClasses != 0) {
+        load_klass(tmp, obj_reg);
+        ldrb(tmp, Address(tmp, Klass::misc_flags_offset()));
+        tst(tmp, KlassFlags::_misc_is_value_based_class);
+        br(Assembler::NE, slow_case);
+      }
+
       // Load (object->mark() | 1) into swap_reg
       ldr(rscratch1, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       orr(swap_reg, rscratch1, 1);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 1e226c70420..9a4b8e243a9 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -7034,10 +7034,17 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   ldr(mark, Address(obj, oopDesc::mark_offset_in_bytes()));
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     str(zr, Address(basic_lock, BasicObjectLock::lock_offset() + in_ByteSize((BasicLock::object_monitor_cache_offset_in_bytes()))));
   }
 
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(t1, obj);
+    ldrb(t1, Address(t1, Klass::misc_flags_offset()));
+    tst(t1, KlassFlags::_misc_is_value_based_class);
+    br(Assembler::NE, slow);
+  }
+
   // Check if the lock-stack is full.
   ldrw(top, Address(rthread, JavaThread::lock_stack_top_offset()));
   cmpw(top, (unsigned)LockStack::end_offset());
diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
index ac9c5984de0..77d3653aefd 100644
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp
@@ -83,16 +83,17 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   // Save object being locked into the BasicObjectLock...
   std(Roop, in_bytes(BasicObjectLock::obj_offset()), Rbox);
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(Rscratch, Roop);
-    lbz(Rscratch, in_bytes(Klass::misc_flags_offset()), Rscratch);
-    testbitdi(CR0, R0, Rscratch, exact_log2(KlassFlags::_misc_is_value_based_class));
-    bne(CR0, slow_int);
-  }
-
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(Rbox, Roop, Rmark, Rscratch, slow_int);
   } else if (LockingMode == LM_LEGACY) {
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(Rscratch, Roop);
+      lbz(Rscratch, in_bytes(Klass::misc_flags_offset()), Rscratch);
+      testbitdi(CR0, R0, Rscratch, exact_log2(KlassFlags::_misc_is_value_based_class));
+      bne(CR0, slow_int);
+    }
+
     // ... and mark it unlocked.
     ori(Rmark, Rmark, markWord::unlocked_value);
 
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 7a75dfd3de1..b51a0739d63 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -958,17 +958,18 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 
     // markWord displaced_header = obj->mark().set_unlocked();
 
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      load_klass(tmp, object);
-      lbz(tmp, in_bytes(Klass::misc_flags_offset()), tmp);
-      testbitdi(CR0, R0, tmp, exact_log2(KlassFlags::_misc_is_value_based_class));
-      bne(CR0, slow_case);
-    }
-
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(monitor, object, header, tmp, slow_case);
       b(done);
     } else if (LockingMode == LM_LEGACY) {
+
+      if (DiagnoseSyncOnValueBasedClasses != 0) {
+        load_klass(tmp, object);
+        lbz(tmp, in_bytes(Klass::misc_flags_offset()), tmp);
+        testbitdi(CR0, R0, tmp, exact_log2(KlassFlags::_misc_is_value_based_class));
+        bne(CR0, slow_case);
+      }
+
       // Load markWord from object into header.
       ld(header, oopDesc::mark_offset_in_bytes(), object);
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index f82395b14fb..ca0a1344d14 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -3000,7 +3000,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(ConditionRegister fla
   Label slow_path;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     li(tmp1, 0);
     std(tmp1, in_bytes(BasicObjectLock::lock_offset()) + BasicLock::object_monitor_cache_offset_in_bytes(), box);
   }
@@ -4999,19 +4999,27 @@ void MacroAssembler::atomically_flip_locked_state(bool is_unlock, Register obj,
 //  - t1, t2: temporary register
 void MacroAssembler::lightweight_lock(Register box, Register obj, Register t1, Register t2, Label& slow) {
   assert(LockingMode == LM_LIGHTWEIGHT, "only used with new lightweight locking");
-  assert_different_registers(box, obj, t1, t2);
+  assert_different_registers(box, obj, t1, t2, R0);
 
   Label push;
-  const Register top = t1;
-  const Register mark = t2;
   const Register t = R0;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     li(t, 0);
     std(t, in_bytes(BasicObjectLock::lock_offset()) + BasicLock::object_monitor_cache_offset_in_bytes(), box);
   }
 
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(t1, obj);
+    lbz(t1, in_bytes(Klass::misc_flags_offset()), t1);
+    testbitdi(CR0, R0, t1, exact_log2(KlassFlags::_misc_is_value_based_class));
+    bne(CR0, slow);
+  }
+
+  const Register top = t1;
+  const Register mark = t2;
+
   // Check if the lock-stack is full.
   lwz(top, in_bytes(JavaThread::lock_stack_top_offset()), R16_thread);
   cmplwi(CR0, top, LockStack::end_offset());
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
index 76089e8dd45..29bf3e5f2ed 100644
--- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -61,16 +61,17 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
 
   null_check_offset = offset();
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(hdr, obj);
-    lbu(hdr, Address(hdr, Klass::misc_flags_offset()));
-    test_bit(temp, hdr, exact_log2(KlassFlags::_misc_is_value_based_class));
-    bnez(temp, slow_case, true /* is_far */);
-  }
-
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(disp_hdr, obj, hdr, temp, t1, slow_case);
   } else if (LockingMode == LM_LEGACY) {
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(hdr, obj);
+      lbu(hdr, Address(hdr, Klass::misc_flags_offset()));
+      test_bit(temp, hdr, exact_log2(KlassFlags::_misc_is_value_based_class));
+      bnez(temp, slow_case, /* is_far */ true);
+    }
+
     Label done;
     // Load object header
     ld(hdr, Address(obj, hdr_offset));
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 99cbcedb8ff..39a49f8f1eb 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -289,7 +289,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box,
   Label slow_path;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     sd(zr, Address(box, BasicLock::object_monitor_cache_offset_in_bytes()));
   }
 
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index f1f9414d98a..8be5408cb2b 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -736,17 +736,18 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg)
     // Load object pointer into obj_reg c_rarg3
     ld(obj_reg, Address(lock_reg, obj_offset));
 
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      load_klass(tmp, obj_reg);
-      lbu(tmp, Address(tmp, Klass::misc_flags_offset()));
-      test_bit(tmp, tmp, exact_log2(KlassFlags::_misc_is_value_based_class));
-      bnez(tmp, slow_case);
-    }
-
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(lock_reg, obj_reg, tmp, tmp2, tmp3, slow_case);
       j(done);
     } else if (LockingMode == LM_LEGACY) {
+
+      if (DiagnoseSyncOnValueBasedClasses != 0) {
+        load_klass(tmp, obj_reg);
+        lbu(tmp, Address(tmp, Klass::misc_flags_offset()));
+        test_bit(tmp, tmp, exact_log2(KlassFlags::_misc_is_value_based_class));
+        bnez(tmp, slow_case);
+      }
+
       // Load (object->mark() | 1) into swap_reg
       ld(t0, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       ori(swap_reg, t0, 1);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index b5c311c341d..c6393be0714 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -6362,10 +6362,17 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   ld(mark, Address(obj, oopDesc::mark_offset_in_bytes()));
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     sd(zr, Address(basic_lock, BasicObjectLock::lock_offset() + in_ByteSize((BasicLock::object_monitor_cache_offset_in_bytes()))));
   }
 
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(tmp1, obj);
+    lbu(tmp1, Address(tmp1, Klass::misc_flags_offset()));
+    test_bit(tmp1, tmp1, exact_log2(KlassFlags::_misc_is_value_based_class));
+    bnez(tmp1, slow, /* is_far */ true);
+  }
+
   // Check if the lock-stack is full.
   lwu(top, Address(xthread, JavaThread::lock_stack_top_offset()));
   mv(t, (unsigned)LockStack::end_offset());
diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
index 5691a2055b3..0e873250dca 100644
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp
@@ -69,17 +69,18 @@ void C1_MacroAssembler::lock_object(Register Rmark, Register Roop, Register Rbox
   // Save object being locked into the BasicObjectLock...
   z_stg(Roop, Address(Rbox, BasicObjectLock::obj_offset()));
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(tmp, Roop);
-    z_tm(Address(tmp, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
-    branch_optimized(Assembler::bcondAllOne, slow_case);
-  }
-
   assert(LockingMode != LM_MONITOR, "LM_MONITOR is already handled, by emit_lock()");
 
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(Rbox, Roop, Rmark, tmp, slow_case);
   } else if (LockingMode == LM_LEGACY) {
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(tmp, Roop);
+      z_tm(Address(tmp, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+      branch_optimized(Assembler::bcondAllOne, slow_case);
+    }
+
     NearLabel done;
 
     // Load object header.
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index 48f4c7293a2..4ba99eb9e88 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -1002,16 +1002,16 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 
   // markWord header = obj->mark().set_unlocked();
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(tmp, object);
-    z_tm(Address(tmp, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
-    z_btrue(slow_case);
-  }
-
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(monitor, object, header, tmp, slow_case);
   } else if (LockingMode == LM_LEGACY) {
 
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(tmp, object);
+      z_tm(Address(tmp, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+      z_btrue(slow_case);
+    }
+
     // Load markWord from object into header.
     z_lg(header, hdr_offset, object);
 
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 88aedd1b5c0..0129e604978 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -6363,11 +6363,17 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   z_lg(mark, Address(obj, mark_offset));
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     const Address om_cache_addr = Address(basic_lock, BasicObjectLock::lock_offset() + in_ByteSize((BasicLock::object_monitor_cache_offset_in_bytes())));
     z_mvghi(om_cache_addr, 0);
   }
 
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(temp1, obj);
+    z_tm(Address(temp1, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+    z_brne(slow);
+  }
+
   // First we need to check if the lock-stack has room for pushing the object reference.
   z_lgf(top, Address(Z_thread, ls_top_offset));
 
@@ -6501,7 +6507,7 @@ void MacroAssembler::compiler_fast_lock_lightweight_object(Register obj, Registe
   NearLabel slow_path;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     z_mvghi(Address(box, BasicLock::object_monitor_cache_offset_in_bytes()), 0);
   }
 
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index b8873758b61..684347e35fa 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -55,16 +55,17 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
 
   null_check_offset = offset();
 
-  if (DiagnoseSyncOnValueBasedClasses != 0) {
-    load_klass(hdr, obj, rscratch1);
-    testb(Address(hdr, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
-    jcc(Assembler::notZero, slow_case);
-  }
-
   if (LockingMode == LM_LIGHTWEIGHT) {
     lightweight_lock(disp_hdr, obj, hdr, tmp, slow_case);
   } else  if (LockingMode == LM_LEGACY) {
     Label done;
+
+    if (DiagnoseSyncOnValueBasedClasses != 0) {
+      load_klass(hdr, obj, rscratch1);
+      testb(Address(hdr, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+      jcc(Assembler::notZero, slow_case);
+    }
+
     // Load object header
     movptr(hdr, Address(obj, hdr_offset));
     // and mark it as unlocked
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index a7967d83a4e..574bc081fce 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -476,7 +476,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
   Label slow_path;
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     movptr(Address(box, BasicLock::object_monitor_cache_offset_in_bytes()), 0);
   }
 
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index bd029f2e4ac..d982495d883 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1023,15 +1023,15 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
     // Load object pointer into obj_reg
     movptr(obj_reg, Address(lock_reg, obj_offset));
 
-    if (DiagnoseSyncOnValueBasedClasses != 0) {
-      load_klass(tmp_reg, obj_reg, rklass_decode_tmp);
-      testb(Address(tmp_reg, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
-      jcc(Assembler::notZero, slow_case);
-    }
-
     if (LockingMode == LM_LIGHTWEIGHT) {
       lightweight_lock(lock_reg, obj_reg, swap_reg, tmp_reg, slow_case);
     } else if (LockingMode == LM_LEGACY) {
+      if (DiagnoseSyncOnValueBasedClasses != 0) {
+        load_klass(tmp_reg, obj_reg, rklass_decode_tmp);
+        testb(Address(tmp_reg, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+        jcc(Assembler::notZero, slow_case);
+      }
+
       // Load immediate 1 into swap_reg %rax
       movl(swap_reg, 1);
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 25de76a7e40..4d3bd12ed66 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -9584,10 +9584,16 @@ void MacroAssembler::lightweight_lock(Register basic_lock, Register obj, Registe
   movptr(reg_rax, Address(obj, oopDesc::mark_offset_in_bytes()));
 
   if (UseObjectMonitorTable) {
-    // Clear cache in case fast locking succeeds.
+    // Clear cache in case fast locking succeeds or we need to take the slow-path.
     movptr(Address(basic_lock, BasicObjectLock::lock_offset() + in_ByteSize((BasicLock::object_monitor_cache_offset_in_bytes()))), 0);
   }
 
+  if (DiagnoseSyncOnValueBasedClasses != 0) {
+    load_klass(tmp, obj, rscratch1);
+    testb(Address(tmp, Klass::misc_flags_offset()), KlassFlags::_misc_is_value_based_class);
+    jcc(Assembler::notZero, slow);
+  }
+
   // Load top.
   movl(top, Address(thread, JavaThread::lock_stack_top_offset()));
 

From 684d3b336e9cb31707d35e75f9b785e04e1fdbee Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Mon, 21 Apr 2025 18:25:59 +0000
Subject: [PATCH 021/901] 8354774: DocumentBuilderFactory getAttribute throws
 NPE

Reviewed-by: naoto, lancea
---
 .../xsltc/trax/TransformerFactoryImpl.java    |  15 +-
 .../xerces/internal/impl/PropertyManager.java |  34 +---
 .../jaxp/DocumentBuilderFactoryImpl.java      |  26 +--
 .../internal/jaxp/DocumentBuilderImpl.java    |  15 +-
 .../xerces/internal/jaxp/SAXParserImpl.java   |  34 +---
 .../jaxp/validation/XMLSchemaFactory.java     |  22 +--
 .../XMLSchemaValidatorComponentManager.java   |  22 +--
 .../classes/jdk/xml/internal/JdkXmlUtils.java |  43 ++++-
 .../jdk/xml/internal/XMLSecurityManager.java  |   2 +-
 .../jaxp/libs/jaxp/library/JUnitTestUtil.java |  13 ++
 .../jaxp/unittest/common/PropertiesTest.java  | 162 ++++++++++++++++++
 11 files changed, 268 insertions(+), 120 deletions(-)
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/common/PropertiesTest.java

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
index 747ec8473fe..ee730d3900a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
@@ -371,17 +371,10 @@ else if (name.equals(ENABLE_INLINING)) {
             return _cdataChunkSize;
         }
 
-        /** Check to see if the property is managed by the security manager **/
-        String propertyValue = (_xmlSecurityManager != null) ?
-                _xmlSecurityManager.getLimitAsString(name) : null;
-        if (propertyValue != null) {
-            return propertyValue;
-        } else {
-            propertyValue = (_xmlSecurityPropertyMgr != null) ?
-                _xmlSecurityPropertyMgr.getValue(name) : null;
-            if (propertyValue != null) {
-                return propertyValue;
-            }
+        //check if the property is managed by security manager
+        String value;
+        if ((value = JdkXmlUtils.getProperty(_xmlSecurityManager, _xmlSecurityPropertyMgr, name)) != null) {
+            return value;
         }
 
         // Throw an exception for all other attributes
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
index 2167c22e001..8d83f039617 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -27,13 +27,10 @@
 import com.sun.xml.internal.stream.StaxEntityResolverWrapper;
 import java.util.HashMap;
 import javax.xml.XMLConstants;
-import javax.xml.catalog.CatalogFeatures;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLResolver;
-import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
-import jdk.xml.internal.JdkProperty;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -188,20 +185,13 @@ public Object getProperty(String property) {
         if (XMLInputFactory.SUPPORT_DTD.equals(property)) {
             return fSecurityManager.is(XMLSecurityManager.Limit.STAX_SUPPORT_DTD);
         }
-        /**
-         * Check to see if the property is managed by the security manager *
-         */
-        String propertyValue = (fSecurityManager != null)
-                ? fSecurityManager.getLimitAsString(property) : null;
-        /**
-         * Check to see if the property is managed by the security property
-         * manager
-         */
-        if (propertyValue == null) {
-            propertyValue = (fSecurityPropertyMgr != null)
-                    ? fSecurityPropertyMgr.getValue(property) : null;
+
+        //check if the property is managed by security manager
+        String value;
+        if ((value = JdkXmlUtils.getProperty(fSecurityManager, fSecurityPropertyMgr, property)) != null) {
+            return value;
         }
-        return propertyValue != null ? propertyValue : supportedProps.get(property);
+        return supportedProps.get(property);
     }
 
     /**
@@ -250,15 +240,9 @@ public void setProperty(String property, Object value) {
             return;
         }
 
-        //check if the property is managed by security manager
-        if (fSecurityManager == null
-                || !fSecurityManager.setLimit(property, JdkProperty.State.APIPROPERTY, value)) {
-            //check if the property is managed by security property manager
-            if (fSecurityPropertyMgr == null
-                    || !fSecurityPropertyMgr.setValue(property, FeaturePropertyBase.State.APIPROPERTY, value)) {
-                //fall back to the existing property manager
-                supportedProps.put(property, value);
-            }
+        if (!JdkXmlUtils.setProperty(fSecurityManager, fSecurityPropertyMgr, property, value)) {
+            //fall back to the existing property manager
+            supportedProps.put(property, value);
         }
 
         if (equivalentProperty != null) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
index 6909f2b51ff..2939058e7d4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
@@ -29,7 +29,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
-import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
 import org.xml.sax.SAXException;
@@ -114,20 +114,13 @@ public void setAttribute(String name, Object value)
             attributes = new HashMap<>();
         }
 
-        //check if the property is managed by security manager
-        String pName;
-        if ((pName = fSecurityManager.find(name)) != null) {
-            // as the qName is deprecated, let the manager decide whether the
-            // value shall be changed
-            fSecurityManager.setLimit(name, JdkProperty.State.APIPROPERTY, value);
-            attributes.put(pName, fSecurityManager.getLimitAsString(pName));
+        if (JdkXmlUtils.setProperty(fSecurityManager, fSecurityPropertyMgr, name, value)) {
+            // necessary as DocumentBuilder recreate property manager
+            // remove this line once that's changed
+            attributes.put(name, value);
             // no need to create a DocumentBuilderImpl
             return;
-        } else if ((pName = fSecurityPropertyMgr.find(name)) != null) {
-            attributes.put(pName, value);
-            return;
         }
-
         attributes.put(name, value);
 
         // Test the attribute name by possibly throwing an exception
@@ -146,13 +139,10 @@ public void setAttribute(String name, Object value)
     public Object getAttribute(String name)
         throws IllegalArgumentException
     {
-
         //check if the property is managed by security manager
-        String pName;
-        if ((pName = fSecurityManager.find(name)) != null) {
-            return fSecurityManager.getLimitAsString(pName);
-        } else if ((pName = fSecurityPropertyMgr.find(name)) != null) {
-            return attributes.get(pName);
+        String value;
+        if ((value = JdkXmlUtils.getProperty(fSecurityManager, fSecurityPropertyMgr, name)) != null) {
+            return value;
         }
 
         // See if it's in the attributes Map
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
index a8af265c325..43b986b9939 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
@@ -43,7 +43,7 @@
 import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
 import jdk.xml.internal.FeaturePropertyBase.State;
 import jdk.xml.internal.JdkConstants;
-import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
 import jdk.xml.internal.XMLSecurityPropertyManager.Property;
@@ -297,17 +297,10 @@ private void setDocumentBuilderFactoryAttributes( Map<String, Object> dbfAttrs)
                         }
                      }
                   } else {
-                     //check if the property is managed by security manager
-                     if (fSecurityManager == null ||
-                             !fSecurityManager.setLimit(name, JdkProperty.State.APIPROPERTY, val)) {
-                         //check if the property is managed by security property manager
-                         if (fSecurityPropertyMgr == null ||
-                                 !fSecurityPropertyMgr.setValue(name, State.APIPROPERTY, val)) {
-                             //fall back to the existing property manager
-                             domParser.setProperty(name, val);
-                         }
+                     if (!JdkXmlUtils.setProperty(fSecurityManager, fSecurityPropertyMgr, name, val)) {
+                         //fall back to the existing property manager
+                         domParser.setProperty(name, val);
                      }
-
                   }
              }
         }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
index 053718c657d..fe435aabbcc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
@@ -43,7 +43,7 @@
 import javax.xml.validation.Schema;
 import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
-import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
 import org.xml.sax.EntityResolver;
@@ -569,20 +569,13 @@ else if (JAXP_SCHEMA_SOURCE.equals(name)) {
                 super.setProperty(name, value);
             }
 
-            //check if the property is managed by security manager
-            if (fSecurityManager == null ||
-                    !fSecurityManager.setLimit(name, JdkProperty.State.APIPROPERTY, value)) {
-                //check if the property is managed by security property manager
-                if (fSecurityPropertyMgr == null ||
-                        !fSecurityPropertyMgr.setValue(name, FeaturePropertyBase.State.APIPROPERTY, value)) {
-                    //fall back to the existing property manager
-                    if (!fInitProperties.containsKey(name)) {
-                        fInitProperties.put(name, super.getProperty(name));
-                    }
-                    super.setProperty(name, value);
+            if (!JdkXmlUtils.setProperty(fSecurityManager, fSecurityPropertyMgr, name, value)) {
+                //fall back to the existing property manager
+                if (!fInitProperties.containsKey(name)) {
+                    fInitProperties.put(name, super.getProperty(name));
                 }
+                super.setProperty(name, value);
             }
-
         }
 
         public synchronized Object getProperty(String name)
@@ -596,19 +589,10 @@ public synchronized Object getProperty(String name)
                 return fSAXParser.schemaLanguage;
             }
 
-            /** Check to see if the property is managed by the security manager **/
-            String propertyValue = (fSecurityManager != null) ?
-                    fSecurityManager.getLimitAsString(name) : null;
-            if (propertyValue != null) {
-                return propertyValue;
-            } else {
-                propertyValue = (fSecurityPropertyMgr != null) ?
-                    fSecurityPropertyMgr.getValue(name) : null;
-                if (propertyValue != null) {
-                    return propertyValue;
-                }
+            String value;
+            if ((value = JdkXmlUtils.getProperty(fSecurityManager, fSecurityPropertyMgr, name)) != null) {
+                return value;
             }
-
             return super.getProperty(name);
         }
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
index 753fdea25cd..82960821f4d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -40,7 +40,6 @@
 import java.io.InputStream;
 import java.io.Reader;
 import javax.xml.XMLConstants;
-import javax.xml.catalog.CatalogFeatures.Feature;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -404,10 +403,11 @@ else if (name.equals(XMLGRAMMAR_POOL)) {
         }
         try {
             /** Check to see if the property is managed by the security manager **/
-            String propertyValue = (fSecurityManager != null) ?
-                    fSecurityManager.getLimitAsString(name) : null;
-            return propertyValue != null ? propertyValue :
-                    fXMLSchemaLoader.getProperty(name);
+            String value;
+            if ((value = JdkXmlUtils.getProperty(fSecurityManager, fSecurityPropertyMgr, name)) != null) {
+                return value;
+            }
+            return fXMLSchemaLoader.getProperty(name);
         }
         catch (XMLConfigurationException e) {
             String identifier = e.getIdentifier();
@@ -513,15 +513,9 @@ else if (name.equals(XMLGRAMMAR_POOL)) {
                     "property-not-supported", new Object [] {name}));
         }
         try {
-            //check if the property is managed by security manager
-            if (fSecurityManager == null ||
-                    !fSecurityManager.setLimit(name, JdkProperty.State.APIPROPERTY, object)) {
-                //check if the property is managed by security property manager
-                if (fSecurityPropertyMgr == null ||
-                        !fSecurityPropertyMgr.setValue(name, FeaturePropertyBase.State.APIPROPERTY, object)) {
-                    //fall back to the existing property manager
-                    fXMLSchemaLoader.setProperty(name, object);
-                }
+            if (!JdkXmlUtils.setProperty(fSecurityManager, fSecurityPropertyMgr, name, object)) {
+                //fall back to the existing property manager
+                fXMLSchemaLoader.setProperty(name, object);
             }
         }
         catch (XMLConfigurationException e) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
index bb4296349eb..419bfe4b250 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
@@ -48,7 +48,7 @@
 import javax.xml.catalog.CatalogFeatures;
 import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
-import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
 import org.w3c.dom.ls.LSResourceResolver;
@@ -353,7 +353,7 @@ else if (SCHEMA_ELEMENT_DEFAULT.equals(featureId)) {
      * Set the state of a feature.
      *
      * @param featureId The unique identifier (URI) of the feature.
-     * @param state The requested state of the feature (true or false).
+     * @param value The value of the feature (true or false).
      *
      * @exception XMLConfigurationException If the requested feature is not known.
      */
@@ -361,7 +361,7 @@ public void setFeature(String featureId, boolean value) throws XMLConfigurationE
         if (PARSER_SETTINGS.equals(featureId)) {
             throw new XMLConfigurationException(Status.NOT_SUPPORTED, featureId);
         }
-        else if (value == false && (VALIDATION.equals(featureId) || SCHEMA_VALIDATION.equals(featureId))) {
+        else if (!value && (VALIDATION.equals(featureId) || SCHEMA_VALIDATION.equals(featureId))) {
             throw new XMLConfigurationException(Status.NOT_SUPPORTED, featureId);
         }
         else if (USE_GRAMMAR_POOL_ONLY.equals(featureId) && value != fUseGrammarPoolOnly) {
@@ -452,18 +452,12 @@ else if (LOCALE.equals(propertyId)) {
             fComponents.put(propertyId, value);
             return;
         }
-        //check if the property is managed by security manager
-        if (fInitSecurityManager == null ||
-                !fInitSecurityManager.setLimit(propertyId, JdkProperty.State.APIPROPERTY, value)) {
-            //check if the property is managed by security property manager
-            if (fSecurityPropertyMgr == null ||
-                    !fSecurityPropertyMgr.setValue(propertyId, FeaturePropertyBase.State.APIPROPERTY, value)) {
-                //fall back to the existing property manager
-                if (!fInitProperties.containsKey(propertyId)) {
-                    fInitProperties.put(propertyId, super.getProperty(propertyId));
-                }
-                super.setProperty(propertyId, value);
+        if (!JdkXmlUtils.setProperty(fInitSecurityManager, fSecurityPropertyMgr, propertyId, value)) {
+            //fall back to the existing property manager
+            if (!fInitProperties.containsKey(propertyId)) {
+                fInitProperties.put(propertyId, super.getProperty(propertyId));
             }
+            super.setProperty(propertyId, value);
         }
     }
 
diff --git a/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java
index 1654c1b6cd5..93b63a746f1 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlUtils.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
@@ -98,6 +98,47 @@ private static class DefaultSAXFactory {
         private static final SAXParserFactory instance = getSAXFactory(false);
     }
 
+    /**
+     * Sets the property if it's managed by either XMLSecurityManager or XMLSecurityPropertyManager.
+     * @param xsm the XMLSecurityManager
+     * @param xspm the XMLSecurityPropertyManager
+     * @param property the property
+     * @param value the value
+     * @return true if the property is managed by either XMLSecurityManager or
+     * XMLSecurityPropertyManager, false otherwise
+     */
+    public static boolean setProperty(XMLSecurityManager xsm, XMLSecurityPropertyManager xspm,
+            String property, Object value) {
+        if (xsm != null && xsm.find(property) != null) {
+            return xsm.setLimit(property, JdkProperty.State.APIPROPERTY, value);
+
+        } else if (xspm != null && xspm.find(property) != null) {
+            return xspm.setValue(property, FeaturePropertyBase.State.APIPROPERTY, value);
+        }
+        return false;
+    }
+
+    /**
+     * Returns the value of the property if it's managed by either XMLSecurityManager
+     * or XMLSecurityPropertyManager.
+     * @param xsm the XMLSecurityManager
+     * @param xspm the XMLSecurityPropertyManager
+     * @param property the property
+     * @return the value of the property if it's managed by either XMLSecurityManager
+     * or XMLSecurityPropertyManager, null otherwise
+     */
+    public static String getProperty(XMLSecurityManager xsm, XMLSecurityPropertyManager xspm,
+            String property) {
+        String value = null;
+        if (xsm != null && (value = xsm.getLimitAsString(property)) != null) {
+            return value;
+        }
+        if (xspm != null) {
+            value = xspm.getValue(property);
+        }
+        return value;
+    }
+
     /**
      * Returns the value.
      *
diff --git a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java
index 394bf28e02a..90c222de40e 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java
@@ -361,7 +361,7 @@ public String find(String propertyName) {
         for (Limit limit : Limit.values()) {
             if (limit.is(propertyName)) {
                 // current spec: new property name == systemProperty
-                return limit.systemProperty();
+                return (limit.systemProperty != null) ? limit.systemProperty : limit.apiProperty;
             }
         }
         //ENTITYCOUNT's new name is qName
diff --git a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JUnitTestUtil.java b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JUnitTestUtil.java
index a31963f21de..f4eb3188242 100644
--- a/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JUnitTestUtil.java
+++ b/test/jaxp/javax/xml/jaxp/libs/jaxp/library/JUnitTestUtil.java
@@ -32,6 +32,19 @@ public class JUnitTestUtil {
     public static final String CLS_DIR = System.getProperty("test.classes");
     public static final String SRC_DIR = System.getProperty("test.src");
 
+    // as in the Processors table in java.xml module summary
+    public enum Processor {
+        DOM,
+        SAX,
+        XMLREADER,
+        StAX,
+        VALIDATION,
+        TRANSFORM,
+        XSLTC,
+        DOMLS,
+        XPATH
+    };
+
     /**
      * Returns the System identifier (URI) of the source.
      * @param path the path to the source
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/PropertiesTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/PropertiesTest.java
new file mode 100644
index 00000000000..1550c53794a
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/PropertiesTest.java
@@ -0,0 +1,162 @@
+/*
+ * 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 common;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.validation.SchemaFactory;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.stream.Stream;
+import jaxp.library.JUnitTestUtil.Processor;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.xml.sax.XMLReader;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/*
+ * @test
+ * @bug 8354774
+ * @summary Verifies JAXP API Properties as specified in the java.xml module.
+ * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest /test/lib
+ * @run junit/othervm common.PropertiesTest
+ */
+public class PropertiesTest {
+    private static final String ACCESS_EXTERNAL_DTD = XMLConstants.ACCESS_EXTERNAL_DTD;
+    private static final String ACCESS_EXTERNAL_SCHEMA = XMLConstants.ACCESS_EXTERNAL_SCHEMA;
+    private static final String ACCESS_EXTERNAL_STYLESHEET = XMLConstants.ACCESS_EXTERNAL_STYLESHEET;
+    private static final String SP_ACCESS_EXTERNAL_DTD = "javax.xml.accessExternalDTD";
+    private static final String SP_ACCESS_EXTERNAL_SCHEMA = "javax.xml.accessExternalSchema";
+    private static final String SP_ACCESS_EXTERNAL_STYLESHEET = "javax.xml.accessExternalStylesheet";
+    private static final String DEFAULT_VALUE = "all";
+    /**
+     * Returns test data for testAccessExternalProperties
+     * @return test data for testAccessExternalProperties
+     */
+    private static Stream<Arguments> testData() {
+        // Supported processors for Access External Properties
+        Set<Processor> supportedProcessors1 = EnumSet.of(Processor.DOM, Processor.SAX, Processor.XMLREADER,
+                Processor.StAX, Processor.VALIDATION);
+        Set<Processor> supportedProcessors2 = EnumSet.of(Processor.TRANSFORM);
+
+        return Stream.of(
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_DTD, null, SP_ACCESS_EXTERNAL_DTD, null, DEFAULT_VALUE),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_DTD, "http", SP_ACCESS_EXTERNAL_DTD, null, "http"),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_DTD, null, SP_ACCESS_EXTERNAL_DTD, "https", "https"),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_DTD, "http", SP_ACCESS_EXTERNAL_DTD, "https", "http"),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_SCHEMA, null, SP_ACCESS_EXTERNAL_SCHEMA, null, DEFAULT_VALUE),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_SCHEMA, "http", SP_ACCESS_EXTERNAL_SCHEMA, null, "http"),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_SCHEMA, null, SP_ACCESS_EXTERNAL_SCHEMA, "https", "https"),
+                Arguments.of(supportedProcessors1, ACCESS_EXTERNAL_SCHEMA, "http", SP_ACCESS_EXTERNAL_SCHEMA, "https", "http"),
+                Arguments.of(supportedProcessors2, ACCESS_EXTERNAL_STYLESHEET, null, SP_ACCESS_EXTERNAL_STYLESHEET, null, DEFAULT_VALUE),
+                Arguments.of(supportedProcessors2, ACCESS_EXTERNAL_STYLESHEET, "http", SP_ACCESS_EXTERNAL_STYLESHEET, null, "http"),
+                Arguments.of(supportedProcessors2, ACCESS_EXTERNAL_STYLESHEET, null, SP_ACCESS_EXTERNAL_STYLESHEET, "https", "https"),
+                Arguments.of(supportedProcessors2, ACCESS_EXTERNAL_STYLESHEET, "http", SP_ACCESS_EXTERNAL_STYLESHEET, "https", "http")
+        );
+    }
+
+    /**
+     * Verifies that the Access External Properties are supported throughout the
+     * JAXP APIs.
+     * @param supportedProcessors the supported processors for the property
+     * @param apiProperty the API property
+     * @param apiValue the value of the API property
+     * @param sysProperty the System property corresponding to the API property
+     * @param sysValue the value of the System property
+     * @param expected the expected result
+     * @throws Exception if the test fails due to test configuration issues other
+     * than the expected result
+     */
+    @ParameterizedTest
+    @MethodSource("testData")
+    public void testAccessExternalProperties(Set<Processor> supportedProcessors,
+           String apiProperty, String apiValue, String sysProperty, String sysValue,
+           String expected) throws Exception {
+        for (Processor p : supportedProcessors) {
+            testProperties(p, apiProperty, apiValue, sysProperty, sysValue,
+                    expected);
+        }
+    }
+
+    /**
+     * Verifies that properties can be set via the JAXP APIs and their corresponding
+     * System Properties.
+     * @param processor the processor type
+     * @param apiProperty the API property
+     * @param apiValue the value to be set via the API property
+     * @param sysProperty the System Property
+     * @param sysValue the value to be set via the System property
+     * @param expected the expected result
+     * @throws Exception if the test fails, which can only happen if the property
+     * is set incorrectly.
+     */
+    void testProperties(Processor processor, String apiProperty, String apiValue,
+            String sysProperty, String sysValue, String expected)
+            throws Exception {
+        Object ret1 = null;
+        if (sysValue != null) {
+            System.setProperty(sysProperty, sysValue);
+        }
+        switch (processor) {
+            case DOM:
+                DocumentBuilderFactory dbf = DocumentBuilderFactory.newDefaultInstance();
+                if (apiValue != null) dbf.setAttribute(apiProperty, apiValue);
+                ret1 = dbf.getAttribute(apiProperty);
+                break;
+            case SAX:
+                SAXParser sp = SAXParserFactory.newDefaultInstance().newSAXParser();
+                if (apiValue != null) sp.setProperty(apiProperty, apiValue);
+                ret1 = sp.getProperty(apiProperty);
+                break;
+            case XMLREADER:
+                XMLReader reader = SAXParserFactory.newDefaultInstance().newSAXParser().getXMLReader();
+                if (apiValue != null) reader.setProperty(apiProperty, apiValue);
+                ret1 = reader.getProperty(apiProperty);
+                break;
+            case StAX:
+                XMLInputFactory xif = XMLInputFactory.newDefaultFactory();
+                if (apiValue != null) xif.setProperty(apiProperty, apiValue);
+                ret1 = xif.getProperty(apiProperty);
+                break;
+            case VALIDATION:
+                SchemaFactory sf = SchemaFactory.newDefaultInstance();
+                if (apiValue != null) sf.setProperty(apiProperty, apiValue);
+                ret1 = sf.getProperty(apiProperty);
+                break;
+            case TRANSFORM:
+                TransformerFactory tf = TransformerFactory.newDefaultInstance();
+                if (apiValue != null) tf.setAttribute(apiProperty, apiValue);
+                ret1 = tf.getAttribute(apiProperty);
+                break;
+        }
+
+        if (sysValue != null) System.clearProperty(sysProperty);
+        // property value is as expected
+        assertEquals(expected, ret1);
+    }
+}

From a7128d86eac2c40dbfa79811234ab6226fb4d080 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Mon, 21 Apr 2025 20:19:45 +0000
Subject: [PATCH 022/901] 8354653: Clean up and open source KeyEvent related
 tests (Part 4)

Reviewed-by: serb
---
 .../java/awt/event/KeyEvent/AltGrTest.java    |  90 +++++++++++++
 test/jdk/java/awt/event/KeyEvent/CRTest.java  | 124 ++++++++++++++++++
 .../java/awt/event/KeyEvent/NumpadTest2.java  | 108 +++++++++++++++
 .../event/KeyEvent/TestDoubleKeyEvent.java    |  87 ++++++++++++
 4 files changed, 409 insertions(+)
 create mode 100644 test/jdk/java/awt/event/KeyEvent/AltGrTest.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/CRTest.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/NumpadTest2.java
 create mode 100644 test/jdk/java/awt/event/KeyEvent/TestDoubleKeyEvent.java

diff --git a/test/jdk/java/awt/event/KeyEvent/AltGrTest.java b/test/jdk/java/awt/event/KeyEvent/AltGrTest.java
new file mode 100644
index 00000000000..9f771ea7e19
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/AltGrTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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 4122687 4209844
+ * @summary Characters typed with AltGr have Alt bit set on
+ *                 KEY_TYPED events
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual AltGrTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+
+public class AltGrTest extends Frame implements KeyListener {
+    static String INSTRUCTIONS = """
+            Switch to German (Germany) keyboard layout and type
+            few characters using <AltGr> key.
+            Note: on windows keyboards without an AltGr key,
+            you should use Ctrl-Alt to synthesize AltGr.
+            For example, on German keyboards, `@' is AltGr-Q
+            `{' is AltGr-7 and '[' is AltGr-8
+            If you see the corresponding symbols appear in the text field
+            and there are no entries in log area starting with word "FAIL:"
+            press "Pass", otherwise press "Fail".
+            """;
+
+    public AltGrTest() {
+        setLayout(new BorderLayout());
+        TextField entry = new TextField();
+        entry.addKeyListener(this);
+        add(entry, BorderLayout.CENTER);
+        pack();
+    }
+
+    public void keyTyped(KeyEvent e) {
+        PassFailJFrame.log("----");
+        PassFailJFrame.log("Got " + e);
+
+        if (e.isControlDown() || e.isAltDown()) {
+            PassFailJFrame.log("FAIL: character typed has following modifiers bits set:");
+            PassFailJFrame.log((e.isControlDown() ? " Control" : "")
+                             + (e.isAltDown() ? " Alt" : ""));
+        }
+
+        if (!(e.isAltGraphDown())) {
+            PassFailJFrame.log("FAIL: AltGraph modifier is missing");
+        }
+    }
+
+    public void keyPressed(KeyEvent ignore)  {}
+    public void keyReleased(KeyEvent ignore) {}
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(AltGrTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/CRTest.java b/test/jdk/java/awt/event/KeyEvent/CRTest.java
new file mode 100644
index 00000000000..0cc17fd568e
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/CRTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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 4257434
+ * @summary Ensures that the right results are produced by the
+ *          carriage return keys.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual CRTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class CRTest extends Frame implements KeyListener, ActionListener {
+    StringBuilder error = new StringBuilder();
+    AtomicBoolean actionCompleted = new AtomicBoolean(false);
+    static String INSTRUCTIONS = """
+            This test requires keyboard with the numeric keypad (numpad).
+            If your keyboard does not have numpad press "Pass" to skip testing.
+            Click on the text field in window named "Check KeyChar values".
+            Press Enter on keypad. Then press Return key on a standard keyboard.
+            Then click on "Done" button. Test will pass or fail automatically.
+            """;
+
+    public CRTest() {
+        super("Check KeyChar values");
+        setLayout(new BorderLayout());
+        TextField tf = new TextField(30);
+
+        tf.addKeyListener(this);
+        tf.addActionListener(this);
+
+        add(tf, BorderLayout.CENTER);
+
+        Button done = new Button("Done");
+        done.addActionListener((event) -> {
+            checkAndComplete();
+        });
+        add(done, BorderLayout.SOUTH);
+        pack();
+    }
+
+    public void checkAndComplete() {
+        if (!actionCompleted.get()) {
+            error.append("\nNo action received!");
+        }
+
+        if (!error.isEmpty()) {
+            PassFailJFrame.forceFail(error.toString());
+        } else {
+            PassFailJFrame.forcePass();
+        }
+    }
+
+    public void keyPressed(KeyEvent evt) {
+        if ((evt.getKeyChar() != '\n') || (evt.getKeyCode() != KeyEvent.VK_ENTER)) {
+            error.append("\nKeyPressed: Unexpected code " + evt.getKeyCode());
+        } else {
+            PassFailJFrame.log("KeyPressed Test PASSED");
+        }
+    }
+
+    public void keyTyped(KeyEvent evt) {
+        if ((evt.getKeyChar() != '\n') || (evt.getKeyCode() != KeyEvent.VK_UNDEFINED)) {
+            error.append("\nKeyTyped: Unexpected code " + evt.getKeyCode());
+        } else {
+            PassFailJFrame.log("KeyTyped Test PASSED");
+        }
+    }
+
+    public void keyReleased(KeyEvent evt) {
+        if ((evt.getKeyChar() != '\n') || (evt.getKeyCode() != KeyEvent.VK_ENTER)) {
+            error.append("\nKeyReleased: Unexpected code " + evt.getKeyCode());
+        } else {
+            PassFailJFrame.log("KeyReleased Test PASSED");
+        }
+    }
+
+    public void actionPerformed(ActionEvent evt) {
+        PassFailJFrame.log("ActionPerformed Test PASSED");
+        actionCompleted.set(true);
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(CRTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/NumpadTest2.java b/test/jdk/java/awt/event/KeyEvent/NumpadTest2.java
new file mode 100644
index 00000000000..1ee47354318
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/NumpadTest2.java
@@ -0,0 +1,108 @@
+/*
+ * 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 4279566
+ * @summary Tests that numpad keys produce the correct key codes and
+ *           key chars when both the NumLock and CapsLock are on.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual NumpadTest2
+*/
+
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.lang.reflect.InvocationTargetException;
+
+public class NumpadTest2 extends Frame implements KeyListener {
+    static String INSTRUCTIONS = """
+           Make sure that the NumLock and CapsLock are both ON.
+           Click on the text field inside the window named "Check KeyChar values"
+           Then, type the NumPad 7 key (not the regular 7 key).
+           Verify that the keyChar and keyCode is correct for each key pressed.
+           Remember that the keyCode for the KEY_TYPED event should be zero.
+           If 7 appears in the text field and the key code printed is correct
+           press "Pass", otherwise press "Fail".
+
+           Key               Name             keyChar    Keycode
+           -------------------------------------------------
+           Numpad-7     Numpad-7      55         103
+           """;
+
+    public NumpadTest2() {
+        super("Check KeyChar values");
+        setLayout(new BorderLayout());
+        TextField tf = new TextField(30);
+        tf.addKeyListener(this);
+        add(tf, BorderLayout.CENTER);
+        pack();
+    }
+
+    public void keyPressed(KeyEvent evt) {
+        printKey(evt);
+    }
+
+    public void keyTyped(KeyEvent evt) {
+        printKey(evt);
+    }
+
+    public void keyReleased(KeyEvent evt) {
+        printKey(evt);
+    }
+
+    protected void printKey(KeyEvent evt) {
+        switch (evt.getID()) {
+            case KeyEvent.KEY_TYPED:
+                break;
+            case KeyEvent.KEY_PRESSED:
+                break;
+            case KeyEvent.KEY_RELEASED:
+                break;
+            default:
+                System.out.println("Other Event ");
+                return;
+        }
+
+        if (evt.isActionKey()) {
+            PassFailJFrame.log("params= " + evt.paramString() + "  KeyChar: " +
+                    (int) evt.getKeyChar() + " Action Key");
+        } else {
+            PassFailJFrame.log("params= " + evt.paramString() + "  KeyChar: " +
+                    (int) evt.getKeyChar());
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(NumpadTest2::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/TestDoubleKeyEvent.java b/test/jdk/java/awt/event/KeyEvent/TestDoubleKeyEvent.java
new file mode 100644
index 00000000000..24e0bd553c8
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/TestDoubleKeyEvent.java
@@ -0,0 +1,87 @@
+/*
+ * 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 4495473
+ * @summary Tests that when you press key on canvas-type heavyweight only one key event arrives
+ * @key headful
+ * @run main TestDoubleKeyEvent
+ */
+
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationTargetException;
+import javax.swing.JFrame;
+import javax.swing.JWindow;
+import javax.swing.JTextField;
+
+public class TestDoubleKeyEvent extends JFrame {
+    JWindow w;
+    JTextField tf;
+
+    public void initUI() {
+        setLayout(new BorderLayout());
+        setTitle("Double Key Event Test");
+        setLocationRelativeTo(null);
+        setVisible(true);
+        w = new JWindow(this);
+        w.setLayout(new FlowLayout());
+        tf = new JTextField(20);
+        w.add(tf);
+        w.pack();
+        w.setLocationRelativeTo(null);
+        w.setVisible(true);
+        tf.requestFocus();
+    }
+
+    public void testAndClean() {
+        String str = tf.getText();
+        w.dispose();
+        dispose();
+        if (str.length() != str.chars().distinct().count()) {
+            throw new RuntimeException("Duplicate characters found!");
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException {
+        TestDoubleKeyEvent test = new TestDoubleKeyEvent();
+        EventQueue.invokeAndWait(test::initUI);
+        Robot robot = new Robot();
+        robot.setAutoDelay(50);
+        robot.waitForIdle();
+        robot.delay(1000);
+        for (int i = 0; i < 15; i++) {
+            robot.keyPress(KeyEvent.VK_A + i);
+            robot.keyRelease(KeyEvent.VK_A + i);
+            robot.waitForIdle();
+        }
+        robot.delay(1000);
+        EventQueue.invokeAndWait(test::testAndClean);
+    }
+}

From 8270cd0ad2e0df72f063f36853328a935595f71f Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Mon, 21 Apr 2025 20:23:15 +0000
Subject: [PATCH 023/901] 8353470: Clean up and open source couple AWT Graphics
 related tests (Part 2)

Reviewed-by: serb
---
 test/jdk/ProblemList.txt                      |   1 +
 .../Graphics/GDIResourceExhaustionTest.java   | 121 ++++++++++
 .../awt/Graphics/RepeatedRepaintTest.java     | 137 +++++++++++
 .../java/awt/Graphics/SmallPrimitives.java    | 224 ++++++++++++++++++
 test/jdk/java/awt/Graphics/TextAfterXor.java  | 123 ++++++++++
 5 files changed, 606 insertions(+)
 create mode 100644 test/jdk/java/awt/Graphics/GDIResourceExhaustionTest.java
 create mode 100644 test/jdk/java/awt/Graphics/RepeatedRepaintTest.java
 create mode 100644 test/jdk/java/awt/Graphics/SmallPrimitives.java
 create mode 100644 test/jdk/java/awt/Graphics/TextAfterXor.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 075ce0e9c10..e1e0a695ebc 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -143,6 +143,7 @@ java/awt/Focus/TestDisabledAutoTransfer.java 8159871 macosx-all,windows-all
 java/awt/Focus/TestDisabledAutoTransferSwing.java 6962362 windows-all
 java/awt/Focus/ActivateOnProperAppContextTest.java 8136516 macosx-all
 java/awt/Focus/FocusPolicyTest.java 7160904 linux-all
+java/awt/Graphics/SmallPrimitives.java 8047070 macosx-all,linux-all
 java/awt/EventQueue/6980209/bug6980209.java 8198615 macosx-all
 java/awt/EventQueue/PushPopDeadlock/PushPopDeadlock.java 8024034 generic-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all
diff --git a/test/jdk/java/awt/Graphics/GDIResourceExhaustionTest.java b/test/jdk/java/awt/Graphics/GDIResourceExhaustionTest.java
new file mode 100644
index 00000000000..b8ba155da60
--- /dev/null
+++ b/test/jdk/java/awt/Graphics/GDIResourceExhaustionTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+import javax.imageio.ImageIO;
+import java.awt.AWTException;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Label;
+import java.awt.Panel;
+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 java.lang.reflect.InvocationTargetException;
+
+/*
+ * @test
+ * @bug 4191297
+ * @summary Tests that unreferenced GDI resources are correctly
+ *          destroyed when no longer needed.
+ * @key headful
+ * @run main GDIResourceExhaustionTest
+ */
+
+public class GDIResourceExhaustionTest extends Frame {
+    public void initUI() {
+        setSize(200, 200);
+        setUndecorated(true);
+        setLocationRelativeTo(null);
+        Panel labelPanel = new Panel();
+        Label label = new Label("Red label");
+        label.setBackground(Color.red);
+        labelPanel.add(label);
+        labelPanel.setLocation(20, 50);
+        add(labelPanel);
+        setVisible(true);
+    }
+
+    public void paint(Graphics graphics) {
+        super.paint(graphics);
+        for (int rgb = 0; rgb <= 0xfff; rgb++) {
+            graphics.setColor(new Color(rgb));
+            graphics.fillRect(0, 0, 5, 5);
+        }
+    }
+
+    public void requestCoordinates(Rectangle r) {
+        Insets insets = getInsets();
+        Point location = getLocationOnScreen();
+        Dimension size = getSize();
+        r.x = location.x + insets.left;
+        r.y = location.y + insets.top;
+        r.width = size.width - (insets.left + insets.right);
+        r.height = size.height - (insets.top + insets.bottom);
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException, IOException {
+        GDIResourceExhaustionTest test = new GDIResourceExhaustionTest();
+        try {
+            EventQueue.invokeAndWait(test::initUI);
+            Robot robot = new Robot();
+            robot.delay(2000);
+            Rectangle coords = new Rectangle();
+            EventQueue.invokeAndWait(() -> {
+                test.requestCoordinates(coords);
+            });
+            robot.mouseMove(coords.x - 50, coords.y - 50);
+            robot.waitForIdle();
+            robot.delay(5000);
+            BufferedImage capture = robot.createScreenCapture(coords);
+            robot.delay(500);
+            boolean redFound = false;
+            int redRGB = Color.red.getRGB();
+            for (int y = 0; y < capture.getHeight(); y++) {
+                for (int x = 0; x < capture.getWidth(); x++) {
+                    if (capture.getRGB(x, y) == redRGB) {
+                        redFound = true;
+                        break;
+                    }
+                    if (redFound) {
+                        break;
+                    }
+                }
+            }
+            if (!redFound) {
+                File errorImage = new File("screenshot.png");
+                ImageIO.write(capture, "png", errorImage);
+                throw new RuntimeException("Red label is not detected, possibly GDI resources exhausted");
+            }
+        } finally {
+            EventQueue.invokeAndWait(test::dispose);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Graphics/RepeatedRepaintTest.java b/test/jdk/java/awt/Graphics/RepeatedRepaintTest.java
new file mode 100644
index 00000000000..140cb48630d
--- /dev/null
+++ b/test/jdk/java/awt/Graphics/RepeatedRepaintTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+
+/*
+ * @test
+ * @bug 4081126 4129709
+ * @summary Test for proper repainting on multiprocessor systems.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RepeatedRepaintTest
+ */
+public class RepeatedRepaintTest extends Frame {
+    private Font font = null;
+    private Image background;
+
+    static String INSTRUCTIONS = """
+            The frame next to this window called "AWT Draw Test" has
+            some elements drawn on it. Move this window partially outside of the
+            screen bounds and then drag it back. Repeat it couple of times.
+            Drag the instructions window over the frame partially obscuring it.
+            If after number of attempts the frame content stops repainting
+            press "Fail", otherwise press "Pass".
+            """;
+
+    public RepeatedRepaintTest() {
+        setTitle("AWT Draw Test");
+        setSize(300, 300);
+        background = new BufferedImage(300, 300, BufferedImage.TYPE_INT_ARGB);
+        Graphics g = background.getGraphics();
+        g.setColor(Color.black);
+        g.fillRect(0, 0, 300, 300);
+        g.dispose();
+    }
+
+    public void paint(Graphics g) {
+        Dimension dim = this.getSize();
+        super.paint(g);
+        g.drawImage(background, 0, 0, dim.width, dim.height, null);
+        g.setColor(Color.white);
+        if (font == null) {
+            font = new Font("SansSerif", Font.PLAIN, 24);
+        }
+        g.setFont(font);
+        FontMetrics metrics = g.getFontMetrics();
+        String message = "Draw Test";
+        g.drawString(message, (dim.width / 2) - (metrics.stringWidth(message) / 2),
+                (dim.height / 2) + (metrics.getHeight() / 2));
+
+        int counter = 50;
+        for (int i = 0; i < 50; i++) {
+            counter += 4;
+            g.drawOval(counter, 50, i, i);
+        }
+
+        counter = 20;
+        for (int i = 0; i < 100; i++) {
+            counter += 4;
+            g.drawOval(counter, 150, i, i);
+        }
+        g.setColor(Color.black);
+        g.drawLine(0, dim.height - 25, dim.width, dim.height - 25);
+        g.setColor(Color.gray);
+        g.drawLine(0, dim.height - 24, dim.width, dim.height - 24);
+        g.setColor(Color.lightGray);
+        g.drawLine(0, dim.height - 23, dim.width, dim.height - 23);
+        g.fillRect(0, dim.height - 22, dim.width, dim.height);
+
+
+        g.setXORMode(Color.blue);
+        g.fillRect(0, 0, 25, dim.height - 26);
+        g.setColor(Color.red);
+        g.fillRect(0, 0, 25, dim.height - 26);
+        g.setColor(Color.green);
+        g.fillRect(0, 0, 25, dim.height - 26);
+        g.setPaintMode();
+
+        Image img = createImage(50, 50);
+        Graphics imgGraphics = img.getGraphics();
+        imgGraphics.setColor(Color.magenta);
+        imgGraphics.fillRect(0, 0, 50, 50);
+        imgGraphics.setColor(Color.yellow);
+        imgGraphics.drawString("offscreen", 0, 20);
+        imgGraphics.drawString("image", 0, 30);
+
+        g.drawImage(img, dim.width - 100, dim.height - 100, Color.blue, null);
+
+        g.setXORMode(Color.white);
+        drawAt(g, 100, 100, 50, 50);
+        drawAt(g, 105, 105, 50, 50);
+        drawAt(g, 110, 110, 50, 50);
+    }
+
+    public void drawAt(Graphics g, int x, int y, int width, int height) {
+        g.setColor(Color.magenta);
+        g.fillRect(x, y, width, height);
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Repeated Repaint Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .testUI(RepeatedRepaintTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/Graphics/SmallPrimitives.java b/test/jdk/java/awt/Graphics/SmallPrimitives.java
new file mode 100644
index 00000000000..7eb267cf0b9
--- /dev/null
+++ b/test/jdk/java/awt/Graphics/SmallPrimitives.java
@@ -0,0 +1,224 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Panel;
+import java.awt.Polygon;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.lang.reflect.InvocationTargetException;
+
+/*
+ * @test
+ * @bug 4411814 4298688 4205762 4524760 4067534
+ * @summary Check that Graphics rendering primitives function
+ *          correctly when fed small and degenerate shapes
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual SmallPrimitives
+ */
+
+
+public class SmallPrimitives extends Panel {
+
+    static String INSTRUCTIONS = """
+            In the borderless frame next to this window there should be a
+            set of tiny narrow blue polygons painted next to the green rectangles.
+            If rectangle is vertical the corresponding polygon is painted to the right of it,
+            if rectangle is horizontal the polygon is painted below it.
+            The length of the polygon should be roughly the same as the length of the
+            green rectangle next to it. If size is significantly different or any of the
+            polygons is not painted press "Fail" otherwise press "Pass".
+            Note: one may consider using screen magnifier to compare sizes.
+            """;
+
+    public void paint(Graphics g) {
+        Dimension d = getSize();
+        Polygon p;
+        GeneralPath gp;
+
+        g.setColor(Color.white);
+        g.fillRect(0, 0, d.width, d.height);
+
+        // Reposition for horizontal tests (below)
+        g.translate(0, 20);
+
+        // Reference shapes
+        g.setColor(Color.green);
+        g.fillRect(10, 7, 11, 1);
+        g.fillRect(10, 17, 11, 2);
+        g.fillRect(10, 27, 11, 1);
+        g.fillRect(10, 37, 11, 1);
+        g.fillRect(10, 47, 11, 2);
+        g.fillRect(10, 57, 11, 2);
+        g.fillRect(10, 67, 11, 1);
+        g.fillRect(10, 77, 11, 2);
+        g.fillRect(10, 87, 11, 1);
+        g.fillRect(10, 97, 11, 1);
+        g.fillRect(10, 107, 11, 1);
+        g.fillRect(10, 117, 6, 1); g.fillRect(20, 117, 6, 1);
+
+        // Potentially problematic test shapes
+        g.setColor(Color.blue);
+        g.drawRect(10, 10, 10, 0);
+        g.drawRect(10, 20, 10, 1);
+        g.drawRoundRect(10, 30, 10, 0, 0, 0);
+        g.drawRoundRect(10, 40, 10, 0, 4, 4);
+        g.drawRoundRect(10, 50, 10, 1, 0, 0);
+        g.drawRoundRect(10, 60, 10, 1, 4, 4);
+        g.drawOval(10, 70, 10, 0);
+        g.drawOval(10, 80, 10, 1);
+        p = new Polygon();
+        p.addPoint(10, 90);
+        p.addPoint(20, 90);
+        g.drawPolyline(p.xpoints, p.ypoints, p.npoints);
+        p = new Polygon();
+        p.addPoint(10, 100);
+        p.addPoint(20, 100);
+        g.drawPolygon(p.xpoints, p.ypoints, p.npoints);
+        ((Graphics2D) g).draw(new Line2D.Double(10, 110, 20, 110));
+        gp = new GeneralPath();
+        gp.moveTo(10, 120);
+        gp.lineTo(15, 120);
+        gp.moveTo(20, 120);
+        gp.lineTo(25, 120);
+        ((Graphics2D) g).draw(gp);
+
+        // Polygon limit tests
+        p = new Polygon();
+        trypoly(g, p);
+        p.addPoint(10, 120);
+        trypoly(g, p);
+
+        // Reposition for vertical tests (below)
+        g.translate(20, -20);
+
+        // Reference shapes
+        g.setColor(Color.green);
+        g.fillRect(7, 10, 1, 11);
+        g.fillRect(17, 10, 2, 11);
+        g.fillRect(27, 10, 1, 11);
+        g.fillRect(37, 10, 1, 11);
+        g.fillRect(47, 10, 2, 11);
+        g.fillRect(57, 10, 2, 11);
+        g.fillRect(67, 10, 1, 11);
+        g.fillRect(77, 10, 2, 11);
+        g.fillRect(87, 10, 1, 11);
+        g.fillRect(97, 10, 1, 11);
+        g.fillRect(107, 10, 1, 11);
+        g.fillRect(117, 10, 1, 6); g.fillRect(117, 20, 1, 6);
+
+        // Potentially problematic test shapes
+        g.setColor(Color.blue);
+        g.drawRect(10, 10, 0, 10);
+        g.drawRect(20, 10, 1, 10);
+        g.drawRoundRect(30, 10, 0, 10, 0, 0);
+        g.drawRoundRect(40, 10, 0, 10, 4, 4);
+        g.drawRoundRect(50, 10, 1, 10, 0, 0);
+        g.drawRoundRect(60, 10, 1, 10, 4, 4);
+        g.drawOval(70, 10, 0, 10);
+        g.drawOval(80, 10, 1, 10);
+        p = new Polygon();
+        p.addPoint(90, 10);
+        p.addPoint(90, 20);
+        g.drawPolyline(p.xpoints, p.ypoints, p.npoints);
+        p = new Polygon();
+        p.addPoint(100, 10);
+        p.addPoint(100, 20);
+        g.drawPolygon(p.xpoints, p.ypoints, p.npoints);
+        ((Graphics2D) g).draw(new Line2D.Double(110, 10, 110, 20));
+        gp = new GeneralPath();
+        gp.moveTo(120, 10);
+        gp.lineTo(120, 15);
+        gp.moveTo(120, 20);
+        gp.lineTo(120, 25);
+        ((Graphics2D) g).draw(gp);
+
+        // Polygon limit tests
+        p = new Polygon();
+        trypoly(g, p);
+        p.addPoint(110, 10);
+        trypoly(g, p);
+
+        // Reposition for oval tests
+        g.translate(0, 20);
+
+        for (int i = 0, xy = 8; i < 11; i++) {
+            g.setColor(Color.green);
+            g.fillRect(xy, 5, i, 1);
+            g.fillRect(5, xy, 1, i);
+            g.setColor(Color.blue);
+            g.fillOval(xy, 8, i, 1);
+            g.fillOval(8, xy, 1, i);
+            xy += i + 2;
+        }
+
+        g.translate(10, 10);
+        for (int i = 0, xy = 9; i < 6; i++) {
+            g.setColor(Color.green);
+            g.fillRect(xy, 5, i, 2);
+            g.fillRect(5, xy, 2, i);
+            g.setColor(Color.blue);
+            g.fillOval(xy, 8, i, 2);
+            g.fillOval(8, xy, 2, i);
+            xy += i + 2;
+        }
+    }
+
+    public static void trypoly(Graphics g, Polygon p) {
+        g.drawPolygon(p);
+        g.drawPolygon(p.xpoints, p.ypoints, p.npoints);
+        g.drawPolyline(p.xpoints, p.ypoints, p.npoints);
+        g.fillPolygon(p);
+        g.fillPolygon(p.xpoints, p.ypoints, p.npoints);
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(150, 150);
+    }
+
+    public static Frame createFrame() {
+        Frame f = new Frame();
+        SmallPrimitives sp = new SmallPrimitives();
+        sp.setLocation(0, 0);
+        f.add(sp);
+        f.setUndecorated(true);
+        f.pack();
+        return f;
+    }
+
+    public static void main(String argv[]) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Small Primitives Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(60)
+                .testUI(SmallPrimitives::createFrame)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/Graphics/TextAfterXor.java b/test/jdk/java/awt/Graphics/TextAfterXor.java
new file mode 100644
index 00000000000..c9dc56d8b80
--- /dev/null
+++ b/test/jdk/java/awt/Graphics/TextAfterXor.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Panel;
+import java.awt.RenderingHints;
+import java.awt.image.VolatileImage;
+import java.lang.reflect.InvocationTargetException;
+
+/*
+ * @test
+ * @bug 4505650
+ * @summary Check that you can render solid text after doing XOR mode
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TextAfterXor
+ */
+
+public class TextAfterXor extends Panel {
+    public static final int TESTW = 300;
+    public static final int TESTH = 100;
+    static String INSTRUCTIONS = """
+            In the window called "Text After XOR Test" there should be two
+            composite components, at the bottom of each component the green text
+            "Test passes if this is green!" should be visible.
+
+            On the top component this text should be green on all platforms.
+            On the bottom component it is possible that on non-Windows
+            platforms text can be of other color or not visible at all.
+            That does not constitute a problem.
+
+            So if platform is Windows and green text appears twice or on any
+            other platform green text appears at least once press "Pass",
+            otherwise press "Fail".
+            """;
+
+    VolatileImage vimg;
+
+    public void paint(Graphics g) {
+        render(g);
+        g.drawString("(Drawing to screen)", 10, 60);
+        if (vimg == null) {
+            vimg = createVolatileImage(TESTW, TESTH);
+        }
+        do {
+            vimg.validate(null);
+            Graphics g2 = vimg.getGraphics();
+            render(g2);
+            String not = vimg.getCapabilities().isAccelerated() ? "" : "not ";
+            g2.drawString("Image was " + not + "accelerated", 10, 55);
+            g2.drawString("(only matters on Windows)", 10, 65);
+            g2.dispose();
+            g.drawImage(vimg, 0, TESTH, null);
+        } while (vimg.contentsLost());
+    }
+
+    public void render(Graphics g) {
+        g.setColor(Color.black);
+        g.fillRect(0, 0, TESTW, TESTH);
+        g.setColor(Color.white);
+        g.fillRect(5, 5, TESTW-10, TESTH-10);
+
+        g.setColor(Color.black);
+        g.drawString("Test only passes if green string appears", 10, 20);
+
+        g.setColor(Color.white);
+        g.setXORMode(Color.blue);
+        g.drawRect(30, 30, 10, 10);
+        g.setPaintMode();
+        g.setColor(Color.green);
+
+        ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                                          RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+        g.drawString("Test passes if this is green!", 10, 80);
+
+        g.setColor(Color.black);
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(TESTW, TESTH*2);
+    }
+
+    public static Frame createFrame() {
+        Frame f = new Frame("Text After XOR Test");
+        f.add(new TextAfterXor());
+        f.pack();
+        return f;
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Text After XOR Instructions")
+                .instructions(INSTRUCTIONS)
+                .testUI(TextAfterXor::createFrame)
+                .build()
+                .awaitAndCheck();
+    }
+}

From 1526dd81d9b5bf4abaac1546c370cf7a056d01dc Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 21 Apr 2025 20:24:20 +0000
Subject: [PATCH 024/901] 8354344: Test behavior after cut-over for future ISO
 4217 currency

Reviewed-by: naoto
---
 .../java/util/Currency/ValidateISO4217.java   | 135 +++++++++++++++++-
 .../java/util/Currency/currency.properties    |   2 +
 2 files changed, 132 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index cd6e4f41a9f..607faefcfa4 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.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
@@ -26,18 +26,44 @@
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
  *      8208746 8209775 8264792 8274658 8283277 8296239 8321480 8334653
+ *      8354344
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
- * @run junit ValidateISO4217
+ * @library /test/lib
+ * @run junit/othervm -DMOCKED.TIME=setup ValidateISO4217
+ * @run main/othervm --patch-module java.base=${test.class.path}
+ *      -DMOCKED.TIME=check -Djava.util.currency.data=${test.src}/currency.properties ValidateISO4217
+ * @run junit/othervm --patch-module java.base=${test.class.path}
+ *      -DMOCKED.TIME=true ValidateISO4217
+ */
+
+/* The run invocation order is important. The first invocation will generate
+ * class files for Currency that mock System.currentTimeMillis() as Long.MAX_VALUE,
+ * which is required by the subsequent invocations. The second invocation ensures that
+ * the module patch and mocked time are functioning correctly; it does not run any tests.
+ * The third invocation using the modded class files via a module patch allow us
+ * to test any cut-over dates after the transition.
+ * Valid MOCKED.TIME values are "setup", "check", and "true".
  */
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassTransform;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.MethodTransform;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Currency;
 import java.util.HashSet;
 import java.util.List;
@@ -45,6 +71,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -113,10 +140,102 @@ public class ValidateISO4217 {
             {"XK", "EUR", "978", "2"},      // Kosovo
     };
     private static SimpleDateFormat format = null;
+    private static final String MODULE_PATCH_LOCATION =
+            System.getProperty("test.classes") + "/java/util/";
+    private static final String MOCKED_TIME = System.getProperty("MOCKED.TIME");
+
+    // Classes that should mock System.currentTimeMillis()
+    private static final String[] CLASSES =
+            Stream.concat(
+                Stream.of("Currency.class"),
+                Arrays.stream(Currency.class.getDeclaredClasses())
+                        .map(c -> "Currency$" + c.getSimpleName() + ".class")
+            ).toArray(String[]::new);
+
+    // "check" invocation only runs the main method (and not any tests) to determine if the
+    // future time checking is correct
+    public static void main(String[] args) {
+        if (MOCKED_TIME.equals("check")) {
+            // Check that the module patch class files exist
+            checkModulePatchExists();
+            // Check time is mocked
+            // Override for PK=PKR in test/currency.properties is PKZ - simple
+            // Override for PW=USD in test/currency.properties is MWP - special
+            assertEquals("PKZ", Currency.getInstance(Locale.of("", "PK")).getCurrencyCode(),
+                    "Mocked time / module patch not working");
+            assertEquals("MWP", Currency.getInstance(Locale.of("", "PW")).getCurrencyCode(),
+                    "Mocked time / module patch not working");
+            // Properly working. Do nothing and move to third invocation
+        } else {
+            throw new RuntimeException(
+                    "Incorrect usage of ValidateISO4217. Main method invoked without proper system property value");
+        }
+    }
+
+    @BeforeAll
+    static void setUp() throws Exception {
+        checkUsage();
+        setUpPatchedClasses();
+        setUpTestingData();
+    }
+
+    // Enforce correct usage of ValidateISO4217
+    static void checkUsage() {
+        if (MOCKED_TIME == null
+                || (!MOCKED_TIME.equals("setup") && !MOCKED_TIME.equals("true"))) {
+            throw new RuntimeException(
+                    "Incorrect usage of ValidateISO4217. Missing \"MOCKED.TIME\" system property");
+        }
+        if (MOCKED_TIME.equals("true")) {
+            checkModulePatchExists();
+        }
+    }
+
+    static void checkModulePatchExists() {
+        // Check that the module patch class files exist
+        for (String className : CLASSES) {
+            var file = new File(MODULE_PATCH_LOCATION + className);
+            assertTrue(file.isFile(), "Module patch class files missing");
+        }
+    }
+
+    // Patch the relevant classes required for module patch
+    static void setUpPatchedClasses() throws IOException {
+        if (MOCKED_TIME.equals("setup")) {
+            new File(MODULE_PATCH_LOCATION).mkdirs();
+            for (String s : CLASSES) {
+                patchClass(s);
+            }
+        }
+    }
+
+    // Mock calls of System.currentTimeMillis() within Currency to Long.MAX_VALUE.
+    // This effectively ensures that we are always past any cut-over dates.
+    private static void patchClass(String name) throws IOException {
+        CodeTransform codeTransform = (codeBuilder, e) -> {
+            switch (e) {
+                case InvokeInstruction i when
+                        i.owner().asInternalName().equals("java/lang/System")
+                                && i.name().equalsString("currentTimeMillis") ->
+                    codeBuilder.loadConstant(Long.MAX_VALUE); // mock
+                default -> codeBuilder.accept(e);
+            }
+        };
+        MethodTransform methodTransform = MethodTransform.transformingCode(codeTransform);
+        ClassTransform classTransform = ClassTransform.transformingMethods(methodTransform);
+        ClassFile cf = ClassFile.of();
+        byte[] newBytes = cf.transformClass(cf.parse(
+                Files.readAllBytes(Paths.get(URI.create("jrt:/java.base/java/util/" + name)))), classTransform);
+
+        String patchedClass = MODULE_PATCH_LOCATION + name;
+        var file = new File(patchedClass);
+        try (FileOutputStream fos = new FileOutputStream(file)) {
+            fos.write(newBytes);
+        }
+    }
 
     // Sets up the following test data:
     // ISO4217Codes, additionalCodes, testCurrencies, codes
-    @BeforeAll
     static void setUpTestingData() throws Exception {
         // These functions laterally setup 'testCurrencies' and 'codes'
         // at the same time
@@ -169,8 +288,8 @@ private static void processColumns(StringTokenizer tokens, String country) throw
                 if (format == null) {
                     createDateFormat();
                 }
-                // If the cut-over already passed, use the new curency for ISO4217Codes
-                if (format.parse(tokens.nextToken()).getTime() < System.currentTimeMillis()) {
+                // If the cut-over already passed, use the new currency for ISO4217Codes
+                if (format.parse(tokens.nextToken()).getTime() < currentTimeMillis()) {
                     currency = tokens.nextToken();
                     numeric = tokens.nextToken();
                     minorUnit = tokens.nextToken();
@@ -320,4 +439,10 @@ private static String getSetDiffs(Set<Currency> jreCurrencies, Set<Currency> tes
         bldr.append("\n");
         return bldr.toString();
     }
+
+    // Either the current system time, or a mocked value equal to Long.MAX_VALUE
+    static long currentTimeMillis() {
+        var mocked = MOCKED_TIME.equals("true");
+        return mocked ? Long.MAX_VALUE : System.currentTimeMillis();
+    }
 }
diff --git a/test/jdk/java/util/Currency/currency.properties b/test/jdk/java/util/Currency/currency.properties
index ff5259e5933..0420d9cb501 100644
--- a/test/jdk/java/util/Currency/currency.properties
+++ b/test/jdk/java/util/Currency/currency.properties
@@ -13,6 +13,8 @@ MD=MDD,555,7
 ME=MEE,555,8
 MF=MFF,555,9
 NO=EUR   ,978  ,2,  2099-01-01T00:00:00
+PK=PKZ,999,0,3000-01-01T00:00:00
+PW=MWP,999,0,5000-01-01T00:00:00
 SB=EUR,111,2, 2099-01-01T00:00:00
 US=euR,978,2,2001-01-01T00:00:00
 ZZ\t=\tZZZ\t,\t999\t,\t3

From f7155183d7f7c6fcea2090f906de69e02973a6d9 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 21 Apr 2025 22:35:17 +0000
Subject: [PATCH 025/901] 8353011: Open source Swing JButton tests - Set 1

Reviewed-by: serb
---
 test/jdk/javax/swing/JButton/bug4151763.java  |  94 +++++++++++++++
 test/jdk/javax/swing/JButton/bug4415505.java  |  77 +++++++++++++
 test/jdk/javax/swing/JButton/bug4978274.java  | 108 ++++++++++++++++++
 .../javax/swing/JRadioButton/bug4673850.java  | 104 +++++++++++++++++
 test/jdk/javax/swing/JTable/bug4188504.java   |  71 ++++++++++++
 5 files changed, 454 insertions(+)
 create mode 100644 test/jdk/javax/swing/JButton/bug4151763.java
 create mode 100644 test/jdk/javax/swing/JButton/bug4415505.java
 create mode 100644 test/jdk/javax/swing/JButton/bug4978274.java
 create mode 100644 test/jdk/javax/swing/JRadioButton/bug4673850.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4188504.java

diff --git a/test/jdk/javax/swing/JButton/bug4151763.java b/test/jdk/javax/swing/JButton/bug4151763.java
new file mode 100644
index 00000000000..d04b623ec4e
--- /dev/null
+++ b/test/jdk/javax/swing/JButton/bug4151763.java
@@ -0,0 +1,94 @@
+/*
+ * 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 4151763
+ * @summary Tests that button icon is not drawn upon button border
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
+ * @run main/manual bug4151763
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
+import jtreg.SkippedException;
+
+public class bug4151763 {
+    private static final int IMAGE_SIZE = 150;
+    private static final String INSTRUCTIONS = """
+            Verify that image icon is NOT painted outside
+            the black rectangle.
+
+            If above is true press PASS else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4151763::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        } catch (Exception e) {
+            throw new SkippedException("Unsupported LaF", e);
+        }
+
+        JFrame frame = new JFrame("bug4151763");
+        final JButton b = new JButton(createImageIcon());
+        b.setBorder(new CompoundBorder(
+                           new EmptyBorder(20, 20, 20, 20),
+                           new LineBorder(Color.BLACK)));
+        b.setPreferredSize(new Dimension(100, 100));
+
+        frame.setLayout(new FlowLayout());
+        frame.add(b);
+        frame.setSize(400, 300);
+        return frame;
+    }
+
+    private static ImageIcon createImageIcon() {
+        BufferedImage redImg = new BufferedImage(IMAGE_SIZE, IMAGE_SIZE,
+                                                 BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = redImg.createGraphics();
+        g.setColor(Color.RED);
+        g.fillRect(0, 0, IMAGE_SIZE, IMAGE_SIZE);
+        g.dispose();
+        return new ImageIcon(redImg);
+    }
+}
diff --git a/test/jdk/javax/swing/JButton/bug4415505.java b/test/jdk/javax/swing/JButton/bug4415505.java
new file mode 100644
index 00000000000..58ba56e1b74
--- /dev/null
+++ b/test/jdk/javax/swing/JButton/bug4415505.java
@@ -0,0 +1,77 @@
+/*
+ * 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 4415505
+ * @requires (os.family == "windows")
+ * @summary Tests JButton appearance under Windows LAF
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4415505
+ */
+
+import java.awt.FlowLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JToggleButton;
+import javax.swing.UIManager;
+
+public class bug4415505 {
+    private static final String INSTRUCTIONS = """
+            <html>
+            <p>This test is for Windows LaF.
+            Press the button named "Button" using mouse and check that it has
+            "pressed" look. It should look like the selected toggle button
+            near it.</p>
+
+            <p>If above is true press PASS else FAIL.</p>
+            <html>
+            """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(5)
+                .columns(40)
+                .testUI(bug4415505::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JButton button = new JButton("Button");
+        button.setFocusPainted(false);
+        JToggleButton tbutton = new JToggleButton("ToggleButton");
+        tbutton.setSelected(true);
+
+        JFrame jFrame = new JFrame("bug4415505");
+        jFrame.setLayout(new FlowLayout(FlowLayout.CENTER));
+        jFrame.add(button);
+        jFrame.add(tbutton);
+        jFrame.setSize(300, 100);
+        return jFrame;
+    }
+}
diff --git a/test/jdk/javax/swing/JButton/bug4978274.java b/test/jdk/javax/swing/JButton/bug4978274.java
new file mode 100644
index 00000000000..6b152259caa
--- /dev/null
+++ b/test/jdk/javax/swing/JButton/bug4978274.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4978274
+ * @summary Tests that JButton is painted with same visible height
+ *          as toggle buttons
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4978274
+ */
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.plaf.metal.OceanTheme;
+
+public class bug4978274 {
+    private static final String INSTRUCTIONS = """
+            The toggle buttons must be painted to the same visible
+            height as button. In addition to that verify the following:
+
+            a) All three buttons - "Button", "Toggle Btn" and
+               "Selected Toggle Btn" have the same border.
+
+            b) Verify that when "Button" is pressed and moused over
+               it has the EXACT same border as "Toggle Btn" and
+               "Selected Toggle Btn" on press & mouse over.
+
+            c) Click to the test window (panel) to disable/enable all
+               three buttons. In disabled state verify that all three
+               buttons have the exact same border.
+
+            If all of the above conditions are true press PASS, else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        MetalLookAndFeel.setCurrentTheme(new OceanTheme());
+        UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(createAndShowUI())
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JFrame frame = new JFrame("bug4978274");
+        frame.setLayout(new BorderLayout());
+
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout());
+        panel.setBorder(new EmptyBorder(12, 12, 12, 12));
+        JButton jButton = new JButton("Button");
+        JToggleButton jToggleButton = new JToggleButton("Selected Toggle Btn");
+        jToggleButton.setSelected(true);
+
+        panel.add(jButton);
+        panel.add(new JToggleButton("Toggle Btn"));
+        panel.add(jToggleButton);
+
+        panel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent event) {
+              jButton.setEnabled(!jButton.isEnabled());
+              jToggleButton.setEnabled(jButton.isEnabled());
+                for(int i = 0; i < panel.getComponentCount(); i++) {
+                    panel.getComponent(i).setEnabled(jButton.isEnabled());
+                }
+            }
+        });
+
+        frame.add(panel);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JRadioButton/bug4673850.java b/test/jdk/javax/swing/JRadioButton/bug4673850.java
new file mode 100644
index 00000000000..4f9058e978e
--- /dev/null
+++ b/test/jdk/javax/swing/JRadioButton/bug4673850.java
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4673850
+ * @summary Tests that JRadioButton and JCheckBox checkmarks are painted entirely
+ *          inside circular/rectangle checkboxes for Motif LaF.
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
+ * @run main/manual bug4673850
+ */
+
+import java.awt.FlowLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JRadioButton;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import jtreg.SkippedException;
+
+public class bug4673850 {
+    private static final String INSTRUCTIONS = """
+            <html>
+            <head>
+            <style>
+            p {
+              font: sans-serif;
+            }
+            </style>
+            </head>
+            <body>
+            <p><b>This test is for Motif LaF.</b></p>
+
+            <p><b>
+            When the test starts, you'll see 2 radio buttons and 2 check boxes
+            with the checkmarks painted.</b></p>
+
+            <p><b>
+            Ensure that all the button's checkmarks are painted entirely
+            within the circular/rectangle checkbox, NOT over them or outside them.
+            </b></p>
+            </body>
+            """;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        } catch (Exception e) {
+            throw new SkippedException("Unsupported LaF", e);
+        }
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(10)
+                .columns(45)
+                .testUI(createAndShowUI())
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JFrame frame = new JFrame("bug4673850");
+        frame.setLayout(new FlowLayout());
+
+        JRadioButton rb = new JRadioButton("RadioButt");
+        rb.setSelected(true);
+        frame.add(rb);
+        JRadioButton rb2 = new JRadioButton("RadioButt");
+        rb2.setHorizontalTextPosition(SwingConstants.LEFT);
+        rb2.setSelected(true);
+        frame.add(rb2);
+
+        JCheckBox cb = new JCheckBox("CheckBox");
+        cb.setSelected(true);
+        frame.add(cb);
+        JCheckBox cb2 = new JCheckBox("CheckBox");
+        cb2.setHorizontalTextPosition(SwingConstants.LEFT);
+        cb2.setSelected(true);
+        frame.add(cb2);
+        frame.setSize(200, 150);
+        return frame;
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/swing/JTable/bug4188504.java b/test/jdk/javax/swing/JTable/bug4188504.java
new file mode 100644
index 00000000000..b58ee7def03
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4188504.java
@@ -0,0 +1,71 @@
+/*
+ * 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 4188504
+ * @summary setResizable for specified column.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4188504
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
+public class bug4188504 {
+    private static final String INSTRUCTIONS = """
+            1. A table is displayed with 3 columns - A, B, C.
+
+            2. Try to resize second column of table (Move mouse to the position
+            between "B" and "C" headers, press left mouse button and move to
+            right/left).
+            PLEASE NOTE: You may be able to swap the columns but make sure the
+            width of column B stays the same.
+
+            3. If the second column does not change its width then press PASS
+            otherwise press FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(createAndShowUI())
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JFrame jFrame = new JFrame("bug4188504");
+        JTable tableView = new JTable(4, 3);
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        tableView.getColumnModel().getColumn(1).setResizable(false);
+
+        jFrame.add(new JScrollPane(tableView));
+        jFrame.setSize(300, 150);
+        return jFrame;
+    }
+}

From 9a0cff692d6f96b8c89b1510cd2b4b1a8e318b6e Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 21 Apr 2025 23:11:03 +0000
Subject: [PATCH 026/901] 8353942: Open source Swing Tests - Set 5

Reviewed-by: serb, dnguyen
---
 .../DataTransfer/DragOverFeedbackTest.java    | 117 +++++++++++++++++
 .../ListDragOverFeedbackTest.java             | 119 ++++++++++++++++++
 .../javax/swing/DataTransfer/bug4655513.java  | 106 ++++++++++++++++
 .../swing/SwingUtilities/bug4369355.java      |  87 +++++++++++++
 .../swing/SwingUtilities/bug4967768.java      |  66 ++++++++++
 5 files changed, 495 insertions(+)
 create mode 100644 test/jdk/javax/swing/DataTransfer/DragOverFeedbackTest.java
 create mode 100644 test/jdk/javax/swing/DataTransfer/ListDragOverFeedbackTest.java
 create mode 100644 test/jdk/javax/swing/DataTransfer/bug4655513.java
 create mode 100644 test/jdk/javax/swing/SwingUtilities/bug4369355.java
 create mode 100644 test/jdk/javax/swing/SwingUtilities/bug4967768.java

diff --git a/test/jdk/javax/swing/DataTransfer/DragOverFeedbackTest.java b/test/jdk/javax/swing/DataTransfer/DragOverFeedbackTest.java
new file mode 100644
index 00000000000..824f651a1a0
--- /dev/null
+++ b/test/jdk/javax/swing/DataTransfer/DragOverFeedbackTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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 4514071
+ * @summary Tests that JTable, JList and JTree provide drag-over feedback.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DragOverFeedbackTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.JTree;
+import javax.swing.TransferHandler;
+
+public class DragOverFeedbackTest {
+    private static final String INSTRUCTIONS = """
+        This test is designed to make sure that JTable, JTree, and JList
+        provide visual feedback when a DnD drag operation occurs over them.
+
+        Click on the label where it says "DRAG FROM HERE" and begin dragging.
+        Drag over each of the three components (JTable, JTree, JList).
+        While you're dragging over them, they should visually indicate the
+        location where a drop would occur. This visual indication may use the
+        selection but could be some other visual.
+
+        If above is true press PASS else press FAIL.
+        """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(DragOverFeedbackTest::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static final TransferHandler handler = new TransferHandler() {
+        public boolean canImport(JComponent comp, DataFlavor[] flavors) {
+            return true;
+        }
+    };
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("DragOverFeedbackTest");
+        final JLabel label = new JLabel("DRAG FROM HERE");
+        label.setPreferredSize(new Dimension(400, 25));
+        label.setTransferHandler(new TransferHandler("text"));
+        label.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent me) {
+                label.getTransferHandler().exportAsDrag(label, me, TransferHandler.COPY);
+            }
+        });
+        JTable table = new JTable(
+                            new String[][] {{"one"}, {"two"}, {"three"}, {"four"}},
+                            new String[] {"1"});
+        table.setRowSelectionInterval(1, 1);
+        table.setTransferHandler(handler);
+
+        JList list = new JList(new String[] {"one", "two", "three", "four"});
+        list.setSelectedIndex(1);
+        list.setTransferHandler(handler);
+
+        JTree tree = new JTree();
+        tree.setSelectionRow(1);
+        tree.setTransferHandler(handler);
+
+        frame.add(label, BorderLayout.NORTH);
+
+        JPanel wrapper = new JPanel();
+        wrapper.setLayout(new GridLayout(3, 1));
+        table.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+        wrapper.add(table);
+        list.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+        wrapper.add(list);
+        tree.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+        wrapper.add(tree);
+        frame.add(wrapper);
+        frame.setSize(500, 500);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/DataTransfer/ListDragOverFeedbackTest.java b/test/jdk/javax/swing/DataTransfer/ListDragOverFeedbackTest.java
new file mode 100644
index 00000000000..b41327a106e
--- /dev/null
+++ b/test/jdk/javax/swing/DataTransfer/ListDragOverFeedbackTest.java
@@ -0,0 +1,119 @@
+/*
+ * 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 4546134
+ * @summary Tests that JList shows the right drop location when it has multiple columns.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ListDragOverFeedbackTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.TransferHandler;
+
+public class ListDragOverFeedbackTest {
+    private static final String INSTRUCTIONS = """
+        JList should provide visual feedback when a DnD drag operation is
+        occurring over it. This test is to check that it provides the
+        feedback about the drop location correctly.
+
+        Click on the label where it says "DRAG FROM HERE" and begin dragging.
+        Drag over each column in each of the three JLists and make sure that
+        the drop location indicated is appropriate for the mouse location. For
+        instance, if the mouse is in the first column, the drop location should
+        also be indicated in that first column.
+
+        If above is true press PASS else press FAIL.
+        """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(ListDragOverFeedbackTest::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static final TransferHandler handler = new TransferHandler() {
+        public boolean canImport(JComponent comp, DataFlavor[] flavors) {
+            return true;
+        }
+    };
+
+    private static JFrame createTestUI() {
+        String[] vals = new String[] {
+                "one", "two", "three", "four", "five", "six", "seven", "eight",
+                "nine", "ten", "eleven", "twelve", "thirteen", "fourteen"};
+
+        JFrame frame = new JFrame("ListDragOverFeedbackTest");
+        final JLabel label = new JLabel("DRAG FROM HERE");
+        label.setPreferredSize(new Dimension(400, 25));
+        label.setTransferHandler(new TransferHandler("text"));
+        label.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent me) {
+                label.getTransferHandler().exportAsDrag(label, me,
+                                              TransferHandler.COPY);
+            }
+        });
+
+        JList list1 = new JList(vals);
+        list1.setTransferHandler(handler);
+        list1.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+
+        JList list2 = new JList(vals);
+        list2.setLayoutOrientation(JList.VERTICAL_WRAP);
+        list2.setTransferHandler(handler);
+        list2.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+
+        JList list3 = new JList(vals);
+        list3.setLayoutOrientation(JList.HORIZONTAL_WRAP);
+        list3.setTransferHandler(handler);
+        list3.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+
+        JPanel wrapper = new JPanel();
+        wrapper.setLayout(new GridLayout(3, 1));
+        wrapper.add(list1);
+        wrapper.add(list2);
+        wrapper.add(list3);
+
+        frame.add(label, BorderLayout.NORTH);
+        frame.add(wrapper);
+        frame.setSize(400, 500);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/DataTransfer/bug4655513.java b/test/jdk/javax/swing/DataTransfer/bug4655513.java
new file mode 100644
index 00000000000..c9f49f98939
--- /dev/null
+++ b/test/jdk/javax/swing/DataTransfer/bug4655513.java
@@ -0,0 +1,106 @@
+/*
+ * 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
+ * @key headful
+ * @bug 4655513
+ * @summary TransferHandler doesn't recognize ACTION_LINK
+            as a valid drop action
+ * @library /javax/swing/regtesthelpers
+ * @build Util
+ * @run main bug4655513
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.datatransfer.StringSelection;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragGestureRecognizer;
+import java.awt.dnd.DragSource;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+
+public class bug4655513 {
+    private static final String LINK_URL = "http://www.example.com/";
+    private static volatile JEditorPane editor;
+    private static volatile JLabel dragSource;
+    private static JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(bug4655513::createAndShowGUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            Point dragStartLoc = Util.getCenterPoint(dragSource);
+            Point dragEndLoc = Util.getCenterPoint(editor);
+            robot.mouseMove(dragStartLoc.x, dragStartLoc.y);
+            robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+            for (int y = dragStartLoc.y; y < dragEndLoc.y; y += 3) {
+                robot.mouseMove(dragStartLoc.x, y);
+                robot.delay(50);
+            }
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (!editor.getText().contains(LINK_URL)) {
+                    throw new RuntimeException("Test Failed! Drag & Drop did not work.");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(frame::dispose);
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame = new JFrame("Bug4655513 - Data Transfer");
+        dragSource = new JLabel("To Test DnD, drag this label.");
+        dragSource.setForeground(Color.RED);
+        dragSource.setPreferredSize(new Dimension(250, 50));
+        frame.add(dragSource, BorderLayout.NORTH);
+
+        editor = new JEditorPane("text/plain", "Drop here.");
+        editor.setPreferredSize(new Dimension(250, 50));
+        frame.add(new JScrollPane(editor), BorderLayout.CENTER);
+
+        DragSource ds = new DragSource();
+        DragGestureRecognizer rec =
+            ds.createDefaultDragGestureRecognizer(dragSource,
+                    DnDConstants.ACTION_LINK,
+                    dge -> dge.startDrag(null, new StringSelection(LINK_URL)));
+        frame.setSize(300, 150);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/SwingUtilities/bug4369355.java b/test/jdk/javax/swing/SwingUtilities/bug4369355.java
new file mode 100644
index 00000000000..f55d888ef31
--- /dev/null
+++ b/test/jdk/javax/swing/SwingUtilities/bug4369355.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
+ * @key headful
+ * @bug 4369355
+ * @summary To verify if SwingUtilities.convertPointToScreen() (for invisible frame)
+ *          and SwingUtilities.convertPointFromScreen() return correct values
+ * @run main bug4369355
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+public class bug4369355 {
+    private static JFrame frame;
+
+    private static volatile Point frameToScreenLoc;
+    private static volatile Point frameFromScreenLoc;
+
+    private static final Point EXPECTED_FROM_SCREEN_LOC = new Point(0, 0);
+    private static final Point EXPECTED_TO_SCREEN_LOC = new Point(100, 100);
+
+    public static void main (String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4369355");
+                frame.setBounds(100, 100, 100, 100);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                frameToScreenLoc = new Point(0, 0);
+                SwingUtilities.convertPointToScreen(frameToScreenLoc, frame);
+            });
+            robot.delay(100);
+
+            if (!frameToScreenLoc.equals(EXPECTED_TO_SCREEN_LOC)) {
+                throw new RuntimeException("SwingUtilities.convertPointToScreen()"
+                        + " returns incorrect point " + frameToScreenLoc + "\n"
+                        + "Should be " + EXPECTED_TO_SCREEN_LOC);
+            }
+
+            SwingUtilities.invokeAndWait(() -> frame.setVisible(true));
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(() -> {
+                frameFromScreenLoc = frame.getLocationOnScreen();
+                SwingUtilities.convertPointFromScreen(frameFromScreenLoc, frame);
+            });
+            robot.delay(100);
+
+            if (!frameFromScreenLoc.equals(EXPECTED_FROM_SCREEN_LOC)) {
+                throw new RuntimeException("SwingUtilities.convertPointFromScreen()"
+                        + " returns incorrect point " + frameFromScreenLoc + "\n"
+                        + "Should be " + EXPECTED_FROM_SCREEN_LOC);
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(frame::dispose);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/SwingUtilities/bug4967768.java b/test/jdk/javax/swing/SwingUtilities/bug4967768.java
new file mode 100644
index 00000000000..43f9f7cabfb
--- /dev/null
+++ b/test/jdk/javax/swing/SwingUtilities/bug4967768.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4967768
+ * @requires (os.family != "mac")
+ * @summary Tests that underline is painted correctly in mnemonics
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4967768
+ */
+
+import java.awt.Font;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+public class bug4967768 {
+    private static final String INSTRUCTIONS = """
+            When the test starts you'll see a button "Oops"
+            with the "p" letter underlined at the bottom
+            of the instruction frame.
+
+            Ensure the underline cuts through the descender
+            of letter "p", i.e. the underline is painted
+            not below the letter but below the baseline.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .splitUIBottom(bug4967768::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JPanel createTestUI() {
+        JPanel panel = new JPanel();
+        JButton but = new JButton("Oops");
+        but.setFont(new Font("Dialog", Font.BOLD, 24));
+        but.setMnemonic('p');
+        panel.add(but);
+        return panel;
+    }
+}

From 47f78a7529a2b290a07394e053bcfaff4907b7e5 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 22 Apr 2025 00:27:25 +0000
Subject: [PATCH 027/901] 8354990: Improve negative tests coverage for jpackage
 signing 8354989: Bug in MacCertificate class

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/MacAppBundler.java  |   2 +-
 .../jdk/jpackage/internal/MacCertificate.java |  18 +-
 .../jdk/jpackage/internal/MacPkgBundler.java  |   2 +-
 .../helpers/jdk/jpackage/test/MacSign.java    | 375 +++++++++++++++---
 .../jdk/jpackage/test/MacSignVerify.java      | 226 +++++++++++
 .../tools/jpackage/macosx/MacSignTest.java    | 193 ++++++++-
 .../jpackage/macosx/base/SigningBase.java     | 248 +++++-------
 7 files changed, 823 insertions(+), 241 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
index 5da01aa293c..733321dec46 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
@@ -74,7 +74,7 @@ public MacAppBundler() {
                     }
 
                     if (result != null) {
-                        MacCertificate certificate = new MacCertificate(result);
+                        MacCertificate certificate = new MacCertificate(result, keychain);
 
                         if (!certificate.isValid()) {
                             Log.error(MessageFormat.format(I18N.getString(
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
index 90f3a8c765b..c9dab481e0e 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.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
@@ -39,21 +39,25 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Locale;
-import java.util.HexFormat;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class MacCertificate {
     private final String certificate;
+    private final Optional<String> keychainName;
 
-    public MacCertificate(String certificate) {
-        this.certificate = certificate;
+    public MacCertificate(String certificate, String keychainName) {
+        this.certificate = Objects.requireNonNull(certificate);
+        this.keychainName = Optional.ofNullable(keychainName);
     }
 
     public boolean isValid() {
-        return verifyCertificate(this.certificate);
+        return verifyCertificate();
     }
 
     public static String findCertificateKey(String keyPrefix, String teamName,
@@ -295,7 +299,7 @@ private Date findCertificateDate(String filename) {
         return result;
     }
 
-    private boolean verifyCertificate(String certificate) {
+    private boolean verifyCertificate() {
         boolean result = false;
 
         try {
@@ -303,7 +307,7 @@ private boolean verifyCertificate(String certificate) {
             Date certificateDate = null;
 
             try {
-                file = getFindCertificateOutputPEM(certificate, null);
+                file = getFindCertificateOutputPEM(certificate, keychainName.orElse(null));
 
                 if (file != null) {
                     certificateDate = findCertificateDate(
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 2aca9bd0e1f..8328fa07851 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
@@ -130,7 +130,7 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
                     }
 
                     if (result != null) {
-                        MacCertificate certificate = new MacCertificate(result);
+                        MacCertificate certificate = new MacCertificate(result, keychain);
 
                         if (!certificate.isValid()) {
                             Log.error(MessageFormat.format(
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 1d5dd16fe37..67ac921b919 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -29,9 +29,9 @@
 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.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -42,7 +42,9 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 import java.security.MessageDigest;
+import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -63,6 +65,7 @@
 import javax.naming.ldap.Rdn;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
+import jdk.jpackage.internal.util.function.ThrowingSupplier;
 
 /**
  * Utilities to setup identities and keychains for sign testing.
@@ -393,15 +396,52 @@ Keychain createKeyPair(String name) {
         }
 
         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();
+            final List<X509Certificate> certs = new ArrayList<>();
+            try (final var in = new BufferedInputStream(new ByteArrayInputStream(
+                    security("find-certificate", "-ap", name).executeAndGetOutput().stream().collect(joining("\n")).getBytes(StandardCharsets.UTF_8)))) {
+                while (in.available() > 0) {
+                    final X509Certificate cert;
+                    try {
+                        cert = (X509Certificate) CERT_FACTORY.generateCertificate(in);
+                    } catch (Exception ex) {
+                        TKit.trace("Failed to parse certificate data: " + ex);
+                        continue;
+                    }
+                    certs.add(cert);
+                }
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+            return certs;
         }
 
         public static void addToSearchList(Collection<Keychain> keychains) {
             security("list-keychains", "-d", "user", "-s", "login.keychain")
-            .addArguments(keychains.stream().map(Keychain::name).toList())
-            .execute();
+                    .addArguments(keychains.stream().map(Keychain::name).toList())
+                    .execute();
+        }
+
+        public static void withAddedKeychains(Collection<Keychain> keychains, Runnable runnable) {
+            final var curKeychains = activeKeychainFiles();
+            addToSearchList(keychains);
+            try {
+                runnable.run();
+            } finally {
+                security("list-keychains", "-d", "user", "-s")
+                        .addArguments(curKeychains.stream().map(Path::toString).toList())
+                        .execute();
+            }
+        }
+
+        private static List<Path> activeKeychainFiles() {
+            // $ security list-keychains
+            //     "/Users/alexeysemenyuk/Library/Keychains/login.keychain-db"
+            //     "/Library/Keychains/System.keychain"
+            return security("list-keychains", "-d", "user").executeAndGetOutput().stream().map(line -> {
+                return line.stripLeading();
+            }).filter(line -> {
+                return line.charAt(0) == '"' && line.charAt(line.length() - 1) == '"';
+            }).map(line -> line.substring(1, line.length() - 1)).map(Path::of).toList();
         }
 
         private Executor createExecutor(String command) {
@@ -409,40 +449,57 @@ private Executor createExecutor(String command) {
         }
     }
 
-    record ResolvedCertificateRequest(CertificateRequest request, X509Certificate cert, VerifyStatus verifyStatus) {
+    private enum VerifyStatus {
+        VERIFY_OK,
+        VERIFY_EXPIRED,
+        VERIFY_ERROR,
+        VERIFY_UNTRUSTED,
+        VERIFY_EXPIRED_UNTRUSTED,
+        UNVERIFIED
+    }
+
+    private record ResolvedCertificateRequest(InstalledCertificate installed, X509Certificate cert, VerifyStatus verifyStatus) {
         ResolvedCertificateRequest {
-            Objects.requireNonNull(request);
+            Objects.requireNonNull(installed);
             Objects.requireNonNull(cert);
             Objects.requireNonNull(verifyStatus);
         }
 
-        enum VerifyStatus {
-            VERIFY_OK,
-            VERIFY_ERROR,
-            UNVERIFIED
+        CertificateRequest request() {
+            if (!verified()) {
+                throw new IllegalStateException();
+            }
+            return new CertificateRequest(installed.name(), installed.type(), installed.days(), installed.expired(),
+                    Set.of(VerifyStatus.VERIFY_OK, VerifyStatus.VERIFY_EXPIRED).contains(verifyStatus));
         }
 
         ResolvedCertificateRequest(X509Certificate cert) {
-            this(new CertificateRequest(cert), cert, VerifyStatus.UNVERIFIED);
+            this(new InstalledCertificate(cert), cert, VerifyStatus.UNVERIFIED);
         }
 
-        ResolvedCertificateRequest copyVerified(boolean verifySuccess) {
-            return new ResolvedCertificateRequest(request, cert,
-                    verifySuccess ? VerifyStatus.VERIFY_OK : VerifyStatus.VERIFY_ERROR);
+        ResolvedCertificateRequest copyVerified(VerifyStatus verifyStatus) {
+            if (verifyStatus == VerifyStatus.UNVERIFIED) {
+                throw new IllegalArgumentException();
+            }
+            return new ResolvedCertificateRequest(installed, cert, verifyStatus);
+        }
+
+        private boolean verified() {
+            return verifyStatus != VerifyStatus.UNVERIFIED;
         }
     }
 
-    record CertificateStats(List<ResolvedCertificateRequest> allResolvedCertificateRequests,
-            List<X509Certificate> allCertificates, List<CertificateRequest> knownCertificateRequests,
+    private record CertificateStats(List<ResolvedCertificateRequest> allResolvedCertificateRequests,
+            List<CertificateRequest> knownCertificateRequests,
             Map<X509Certificate, Throwable> unmappedCertificates) {
 
-        private static CertificateStats get(KeychainWithCertsSpec spec) {
+        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 allVerifiedResolvedCertificateRequest().filter(v -> {
                     return v.request().equals(certificateRequest);
                 }).map(ResolvedCertificateRequest::cert);
             }, flatMapping(x -> x, toList()))));
@@ -450,15 +507,19 @@ Map<CertificateRequest, List<X509Certificate>> mapKnownCertificateRequests() {
 
         Set<CertificateRequest> verifyFailedCertificateRequests() {
             return knownCertificateRequests.stream().filter(certificateRequest -> {
-                return allResolvedCertificateRequests.stream().anyMatch(v -> {
-                    return v.request().equals(certificateRequest) && v.verifyStatus() == ResolvedCertificateRequest.VerifyStatus.VERIFY_ERROR;
+                return allVerifiedResolvedCertificateRequest().anyMatch(v -> {
+                    return v.request().equals(certificateRequest) && v.verifyStatus() != certificateRequest.expectedVerifyStatus();
                 });
             }).collect(toSet());
         }
 
         Set<CertificateRequest> unmappedCertificateRequests() {
             return Comm.compare(Set.copyOf(knownCertificateRequests),
-                    allResolvedCertificateRequests.stream().map(ResolvedCertificateRequest::request).collect(toSet())).unique1();
+                    allVerifiedResolvedCertificateRequest().map(ResolvedCertificateRequest::request).collect(toSet())).unique1();
+        }
+
+        private Stream<ResolvedCertificateRequest> allVerifiedResolvedCertificateRequest() {
+            return allResolvedCertificateRequests.stream().filter(ResolvedCertificateRequest::verified);
         }
 
         private static CertificateStats create(KeychainWithCertsSpec spec) {
@@ -482,24 +543,24 @@ private static CertificateStats create(KeychainWithCertsSpec spec) {
                         continue;
                     }
 
-                    if (spec.certificateRequests().contains(resolvedCertificateRequest.request)) {
+                    if (spec.certificateRequests().stream().anyMatch(resolvedCertificateRequest.installed()::match)) {
                         final var certFile = workDir.resolve(CertificateHash.of(cert).toString() + ".pem");
-                        final var verifySuccess = verifyCertificate(resolvedCertificateRequest, spec.keychain(), certFile);
-                        resolvedCertificateRequest = resolvedCertificateRequest.copyVerified(verifySuccess);
+                        final var verifyStatus = verifyCertificate(resolvedCertificateRequest, spec.keychain(), certFile);
+                        resolvedCertificateRequest = resolvedCertificateRequest.copyVerified(verifyStatus);
                     }
 
                     allResolvedCertificateRequests.add(resolvedCertificateRequest);
                 }
             });
 
-            return new CertificateStats(allResolvedCertificateRequests, List.copyOf(allCertificates),
+            return new CertificateStats(allResolvedCertificateRequests,
                     List.copyOf(spec.certificateRequests()), unmappedCertificates);
         }
 
         private static final Map<KeychainWithCertsSpec, CertificateStats> CACHE = new ConcurrentHashMap<>();
     }
 
-    record PemData(String label, byte[] data) {
+    private record PemData(String label, byte[] data) {
         PemData {
             Objects.requireNonNull(label);
             Objects.requireNonNull(data);
@@ -532,23 +593,41 @@ 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());
+        private static final Base64.Encoder ENCODER = Base64.getMimeEncoder(64, "\n".getBytes());
     }
 
-    public record CertificateHash(byte[] value) {
+    public enum DigestAlgorithm {
+        SHA1(20, () -> MessageDigest.getInstance("SHA-1")),
+        SHA256(32, () -> MessageDigest.getInstance("SHA-256"));
+
+        DigestAlgorithm(int hashLength, ThrowingSupplier<MessageDigest> createDigest) {
+            this.hashLength = hashLength;
+            this.createDigest = createDigest;
+        }
+
+        final int hashLength;
+        final ThrowingSupplier<MessageDigest> createDigest;
+    }
+
+    public record CertificateHash(byte[] value, DigestAlgorithm alg) {
         public CertificateHash {
             Objects.requireNonNull(value);
-            if (value.length != 20) {
-                throw new IllegalArgumentException("Invalid SHA-1 hash");
+            Objects.requireNonNull(alg);
+            if (value.length != alg.hashLength) {
+                throw new IllegalArgumentException(String.format("Invalid %s hash", alg));
             }
         }
 
         public static CertificateHash of(X509Certificate cert) {
+            return of(cert, DigestAlgorithm.SHA1);
+        }
+
+        public static CertificateHash of(X509Certificate cert, DigestAlgorithm alg) {
             return new CertificateHash(toSupplier(() -> {
-                final MessageDigest md = MessageDigest.getInstance("SHA-1");
+                final MessageDigest md = alg.createDigest.get();
                 md.update(cert.getEncoded());
                 return md.digest();
-            }).get());
+            }).get(), alg);
         }
 
         @Override
@@ -601,14 +680,61 @@ String verifyPolicy() {
         private final String verifyPolicy;
     }
 
-    public record CertificateRequest(String name, CertificateType type, int days) implements Comparable<CertificateRequest>{
+    public enum StandardCertificateNamePrefix {
+        CODE_SIGND("Developer ID Application: "),
+        INSTALLER("Developer ID Installer: ");
+
+        StandardCertificateNamePrefix(String value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        public String value() {
+            return value;
+        }
+
+        private final String value;
+    }
+
+    public record NameWithPrefix(String prefix, String name) {
+        public NameWithPrefix {
+            Objects.requireNonNull(prefix);
+            Objects.requireNonNull(name);
+        }
+    }
+
+    public record CertificateRequest(String name, CertificateType type, int days, boolean expired, boolean trusted)
+            implements Comparable<CertificateRequest> {
+
         public CertificateRequest {
             Objects.requireNonNull(name);
             Objects.requireNonNull(type);
+            if (days <= 0) {
+                throw new IllegalArgumentException();
+            }
         }
 
-        CertificateRequest(X509Certificate cert) {
-            this(getSubjectCN(cert), getType(cert), getDurationInDays(cert));
+        public String shortName() {
+            return nameWithPrefix().map(NameWithPrefix::name).orElseThrow();
+        }
+
+        public Optional<NameWithPrefix> nameWithPrefix() {
+            return Stream.of(StandardCertificateNamePrefix.values()).map(StandardCertificateNamePrefix::value).filter(prefix -> {
+                return name.startsWith(prefix);
+            }).map(prefix -> {
+                return new NameWithPrefix(prefix, name.substring(prefix.length()));
+            }).findAny();
+        }
+
+        VerifyStatus expectedVerifyStatus() {
+            if (expired && !trusted) {
+                return VerifyStatus.VERIFY_EXPIRED_UNTRUSTED;
+            } else if (!trusted) {
+                return VerifyStatus.VERIFY_UNTRUSTED;
+            } else if (expired) {
+                return VerifyStatus.VERIFY_EXPIRED;
+            } else {
+                return VerifyStatus.VERIFY_OK;
+            }
         }
 
         @Override
@@ -623,8 +749,8 @@ public Builder userName(String v) {
                 return this;
             }
 
-            public Builder commonName(String v) {
-                commonName = v;
+            public Builder subjectCommonName(String v) {
+                subjectCommonName = v;
                 return this;
             }
 
@@ -638,8 +764,26 @@ public Builder days(int v) {
                 return this;
             }
 
+            public Builder expired(boolean v) {
+                expired = v;
+                return this;
+            }
+
+            public Builder expired() {
+                return expired(true);
+            }
+
+            public Builder trusted(boolean v) {
+                trusted = v;
+                return this;
+            }
+
+            public Builder untrusted() {
+                return trusted(false);
+            }
+
             public CertificateRequest create() {
-                return new CertificateRequest(validatedCN(), type, days);
+                return new CertificateRequest(validatedCN(), type, days, expired, trusted);
             }
 
             private String validatedUserName() {
@@ -647,13 +791,13 @@ private String validatedUserName() {
             }
 
             private String validatedCN() {
-                return Optional.ofNullable(commonName).orElseGet(() -> {
+                return Optional.ofNullable(subjectCommonName).orElseGet(() -> {
                     switch (type) {
                         case CODE_SIGN -> {
-                            return "Developer ID Application: " + validatedUserName();
+                            return StandardCertificateNamePrefix.CODE_SIGND.value() + validatedUserName();
                         }
                         case INSTALLER -> {
-                            return "Developer ID Installer: " + validatedUserName();
+                            return StandardCertificateNamePrefix.INSTALLER.value() + validatedUserName();
                         }
                         default -> {
                             throw new UnsupportedOperationException();
@@ -663,9 +807,41 @@ private String validatedCN() {
             }
 
             private String userName;
-            private String commonName; // CN
+            private String subjectCommonName; // CN
             private CertificateType type = CertificateType.CODE_SIGN;
             private int days = 365;
+            private boolean expired;
+            private boolean trusted = true;
+        }
+
+        private static final Comparator<CertificateRequest> COMPARATOR =
+                Comparator.comparing(CertificateRequest::name)
+                .thenComparing(Comparator.comparing(CertificateRequest::type))
+                .thenComparing(Comparator.comparingInt(CertificateRequest::days))
+                .thenComparing(Comparator.comparing(CertificateRequest::expired, Boolean::compare))
+                .thenComparing(Comparator.comparing(CertificateRequest::trusted, Boolean::compare));
+    }
+
+    private record InstalledCertificate(String name, CertificateType type, int days, boolean expired) implements Comparable<InstalledCertificate> {
+        InstalledCertificate {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(type);
+            if (days <= 0) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        InstalledCertificate(X509Certificate cert) {
+            this(getSubjectCN(cert), getType(cert), getDurationInDays(cert), getExpired(cert));
+        }
+
+        boolean match(CertificateRequest request) {
+            return name.equals(request.name()) && type.equals(request.type()) && days == request.days() && expired == request.expired();
+        }
+
+        @Override
+        public int compareTo(InstalledCertificate o) {
+            return COMPARATOR.compare(this, o);
         }
 
         private static String getSubjectCN(X509Certificate cert) {
@@ -697,13 +873,23 @@ private static CertificateType getType(X509Certificate 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);
+            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));
+        private static boolean getExpired(X509Certificate cert) {
+            try {
+                cert.checkValidity();
+                return false;
+            } catch (CertificateExpiredException | CertificateNotYetValidException ex) {
+                return true;
+            }
+        }
+
+        private static final Comparator<InstalledCertificate> COMPARATOR =
+                Comparator.comparing(InstalledCertificate::name)
+                .thenComparing(Comparator.comparing(InstalledCertificate::type))
+                .thenComparing(Comparator.comparingInt(InstalledCertificate::days))
+                .thenComparing(Comparator.comparing(InstalledCertificate::expired, Boolean::compare));
     }
 
     /**
@@ -715,8 +901,10 @@ private static int getDurationInDays(X509Certificate cert) {
      * 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.
+     * The user will be prompted to enter the user login password as many times as
+     * the number of unique certificates this function will create.
+     * <p>
+     * Created keychains will NOT be added to the keychain search list.
      *
      * @param specs the keychains and signing identities configuration
      */
@@ -767,14 +955,14 @@ public static void setUp(List<KeychainWithCertsSpec> specs) {
                             "-A").execute();
                 });
 
-                trustConfig.put(certPemFile.getValue(), keychains.getFirst());
+                if (certPemFile.getKey().trusted()) {
+                    trustConfig.put(certPemFile.getValue(), keychains.getFirst());
+                }
             }
 
             // Trust certificates.
             trustCertificates(trustConfig);
         });
-
-        Keychain.addToSearchList(specs.stream().map(KeychainWithCertsSpec::keychain).toList());
     }
 
     /**
@@ -820,11 +1008,11 @@ public static boolean isDeployed(List<KeychainWithCertsSpec> specs) {
             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();
+                    .sorted(Comparator.comparing(ResolvedCertificateRequest::installed)).toList();
             for (final var resolvedCertificateRequest : resolvedCertificateRequests) {
                 TKit.trace(String.format("  Certificate with hash=%s: %s[%s]",
                         CertificateHash.of(resolvedCertificateRequest.cert()),
-                        resolvedCertificateRequest.request(),
+                        resolvedCertificateRequest.installed(),
                         resolvedCertificateRequest.verifyStatus()));
             }
 
@@ -849,7 +1037,31 @@ public static boolean isDeployed(List<KeychainWithCertsSpec> specs) {
         return !missingKeychain && !missingCertificates && !invalidCertificates;
     }
 
-    public static Map<CertificateRequest, X509Certificate> mapCertificateRequests(KeychainWithCertsSpec spec) {
+    public final static class ResolvedKeychain {
+        public ResolvedKeychain(KeychainWithCertsSpec spec) {
+            this.spec = Objects.requireNonNull(spec);
+        }
+
+        public KeychainWithCertsSpec spec() {
+            return spec;
+        }
+
+        public Map<CertificateRequest, X509Certificate> mapCertificateRequests() {
+            if (certMap == null) {
+                synchronized (this) {
+                    if (certMap == null) {
+                        certMap = MacSign.mapCertificateRequests(spec);
+                    }
+                }
+            }
+            return certMap;
+        }
+
+        private final KeychainWithCertsSpec spec;
+        private volatile Map<CertificateRequest, X509Certificate> certMap;
+    }
+
+    private 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(
@@ -876,18 +1088,39 @@ private static void validate(List<KeychainWithCertsSpec> specs) {
         });
     }
 
-    private static boolean verifyCertificate(ResolvedCertificateRequest resolvedCertificateRequest, Keychain keychain, Path certFile) {
+    private static VerifyStatus 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,
+        Executor.Result result = null;
+        for (final var quite : List.of(true, false)) {
+            result = security("verify-cert", "-L", "-n",
+                    quite ? "-q" : "-v",
                     "-c", certFile.normalize().toString(),
                     "-k", keychain.name(),
-                    "-p", resolvedCertificateRequest.request().type().verifyPolicy()).executeWithoutExitCodeCheck().getExitCode() == 0;
-            if (ok) {
-                return true;
+                    "-p", resolvedCertificateRequest.installed().type().verifyPolicy()).saveOutput(!quite).executeWithoutExitCodeCheck();
+            if (result.exitCode() == 0) {
+                return VerifyStatus.VERIFY_OK;
             }
         }
-        return false;
+
+        final var expired = result.getOutput().stream().anyMatch(line -> {
+            // Look up for "Certificate has expired, or is not yet valid (check date) [TemporalValidity]" string
+            return line.contains("    Certificate has expired, or is not yet valid (check date) [TemporalValidity]");
+        });
+
+        final var untrusted = result.getOutput().stream().anyMatch(line -> {
+            // Look up for "The root of the certificate chain is not trusted [AnchorTrusted]" string
+            return line.contains("    The root of the certificate chain is not trusted [AnchorTrusted]");
+        });
+
+        if (expired && untrusted) {
+            return VerifyStatus.VERIFY_EXPIRED_UNTRUSTED;
+        } else if (untrusted) {
+            return VerifyStatus.VERIFY_UNTRUSTED;
+        } else if (expired) {
+            return VerifyStatus.VERIFY_EXPIRED;
+        } else {
+            return VerifyStatus.VERIFY_ERROR;
+        }
     }
 
     private static void traceSigningEnvironment(Collection<KeychainWithCertsSpec> specs) {
@@ -968,7 +1201,15 @@ private static Map<CertificateRequest, Path> createCertificates(Keychain private
                                 "CN=" + certificateRequest.name()
                         ));
 
-                        final var openssl = Executor.of(OPENSSL.toString(), "req",
+                        final Executor openssl;
+                        if (certificateRequest.expired()) {
+                            final var format = String.format("-%dd", certificateRequest.days + 1);
+                            openssl = Executor.of(FAKETIME.toString(), "-f", format, OPENSSL.toString());
+                        } else {
+                            openssl = Executor.of(OPENSSL.toString());
+                        }
+
+                        openssl.addArguments("req",
                                 "-x509", "-utf8", "-sha256", "-nodes",
                                 "-new", // Prevents LibreSSL variant of openssl command from hanging
                                 "-days", Integer.toString(certificateRequest.days()),
@@ -1040,4 +1281,8 @@ static Executor security(String... args) {
     // /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"));
+
+    // faketime is not a standard macOS command.
+    // One way to get it is with Homebrew.
+    private static final Path FAKETIME = Path.of(Optional.ofNullable(TKit.getConfigProperty("faketime")).orElse("faketime"));
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
new file mode 100644
index 00000000000..9fcd54d1566
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
@@ -0,0 +1,226 @@
+/*
+ * 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.ThrowingSupplier.toSupplier;
+import static jdk.jpackage.test.MacSign.DigestAlgorithm.SHA256;
+
+import java.nio.file.Path;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+import jdk.jpackage.internal.util.PListReader;
+import jdk.jpackage.test.MacSign.CertificateHash;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+
+/**
+ * Utilities to verify sign signatures.
+ */
+public final class MacSignVerify {
+
+    public static void assertSigned(Path path, CertificateRequest certRequest) {
+        assertSigned(path);
+        TKit.assertEquals(certRequest.name(), findCodesignSignOrigin(path).orElse(null),
+                String.format("Check [%s] signed with certificate", path));
+    }
+
+    public static void assertAdhocSigned(Path path) {
+        assertSigned(path);
+        TKit.assertEquals(ADHOC_SIGN_ORIGIN, findCodesignSignOrigin(path).orElse(null),
+                String.format("Check [%s] signed with adhoc signature", path));
+    }
+
+    public static void assertUnsigned(Path path) {
+        TKit.assertTrue(findSpctlSignOrigin(SpctlType.EXEC, path).isEmpty(),
+                String.format("Check [%s] unsigned", path));
+    }
+
+    public static void assertPkgSigned(Path path, CertificateRequest certRequest, X509Certificate cert) {
+        final var expectedCertChain = List.of(new SignIdentity(certRequest.name(), CertificateHash.of(cert, SHA256)));
+        final var actualCertChain = getPkgCertificateChain(path);
+        TKit.assertStringListEquals(
+                expectedCertChain.stream().map(SignIdentity::toString).toList(),
+                actualCertChain.stream().map(SignIdentity::toString).toList(),
+                String.format("Check certificate chain of [%s] is as expected", path));
+        TKit.assertEquals(certRequest.name(), findSpctlSignOrigin(SpctlType.INSTALL, path).orElse(null),
+                String.format("Check [%s] signed for installation", path));
+    }
+
+    public enum SpctlType {
+        EXEC("exec"), INSTALL("install");
+
+        SpctlType(String value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        public String value() {
+            return value;
+        }
+
+        final private String value;
+    }
+
+    public static final String ADHOC_SIGN_ORIGIN = "-";
+
+    public static Optional<String> findSpctlSignOrigin(SpctlType type, Path path) {
+        final var exec = Executor.of("/usr/sbin/spctl", "-vv", "--raw", "--assess", "--type", type.value(), path.toString()).saveOutput().discardStderr();
+        final var result = exec.executeWithoutExitCodeCheck();
+        TKit.assertTrue(Set.of(0, 3).contains(result.exitCode()),
+                String.format("Check exit code of command %s is either 0 or 3", exec.getPrintableCommandLine()));
+        return toSupplier(() -> {
+            try {
+                return Optional.of(new PListReader(String.join("", result.getOutput()).getBytes()).queryValue("assessment:originator"));
+            } catch (NoSuchElementException ex) {
+                return Optional.<String>empty();
+            }
+        }).get();
+    }
+
+    public static Optional<String> findCodesignSignOrigin(Path path) {
+        final var exec = Executor.of("/usr/bin/codesign", "--display", "--verbose=4", path.toString()).saveOutput();
+        final var result = exec.executeWithoutExitCodeCheck();
+        if (result.getExitCode() == 0) {
+            return Optional.of(result.getOutput().stream().map(line -> {
+                if (line.equals("Signature=adhoc")) {
+                    return ADHOC_SIGN_ORIGIN;
+                } else if (line.startsWith("Authority=")) {
+                    return line.substring("Authority=".length());
+                } else {
+                    return null;
+                }
+            }).filter(Objects::nonNull).reduce((x, y) -> {
+                throw new UnsupportedOperationException(String.format(
+                        "Both adhoc [%s] and certificate [%s] signatures found in codesign output", x, y));
+            }).orElseThrow(() -> {
+                final var msg = "Neither adhoc nor certificate signatures found in codesign output";
+                TKit.trace(msg + ":");
+                result.getOutput().forEach(TKit::trace);
+                TKit.trace("Done");
+                return new UnsupportedOperationException(msg);
+            }));
+        } else if (result.getExitCode() == 1 && result.getFirstLineOfOutput().endsWith("code object is not signed at all")) {
+            return Optional.empty();
+        } else {
+            reportUnexpectedCommandOutcome(exec.getPrintableCommandLine(), result);
+            return null; // Unreachable
+        }
+    }
+
+    public static void assertSigned(Path path) {
+        final var verifier = TKit.assertTextStream(": valid on disk").predicate(String::endsWith).andThen(TKit.assertTextStream(": satisfies its Designated Requirement").predicate(String::endsWith));
+        verifier.apply(Executor.of("/usr/bin/codesign", "--verify", "--deep",
+                "--strict", "--verbose=2", path.toString()).executeAndGetOutput().stream());
+    }
+
+    public static List<SignIdentity> getPkgCertificateChain(Path path) {
+        //
+        // Typical output of `/usr/sbin/pkgutil --check-signature`:
+        // Package "foo.pkg":
+        //    Status: signed by a developer certificate issued by Apple for distribution
+        //    Notarization: trusted by the Apple notary service
+        //    Signed with a trusted timestamp on: 2022-05-10 19:54:56 +0000
+        //    Certificate Chain:
+        //      1. Developer ID Installer: Foo
+        //         SHA256 Fingerprint:
+        //             4A A9 4A 85 20 2A DE 02 B2 9B 36 DA 45 00 B4 40 CF 31 43 4E 96 02
+        //             60 6A 6D BC 02 F4 5D 3A 86 4A
+        //         ------------------------------------------------------------------------
+        //      2. Developer ID Certification Authority
+        //         Expires: 2027-02-01 22:12:15 +0000
+        //         SHA256 Fingerprint:
+        //             7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03
+        //             F2 9C 88 CF B0 B1 BA 63 58 7F
+        //         ------------------------------------------------------------------------
+        //      3. Apple Root CA
+        //         Expires: 2035-02-09 21:40:36 +0000
+        //         SHA256 Fingerprint:
+        //             B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C
+        //             68 C5 BE 91 B5 A1 10 01 F0 24
+        final var exec = Executor.of("/usr/sbin/pkgutil", "--check-signature", path.toString()).saveOutput();
+        final var result = exec.executeWithoutExitCodeCheck();
+        if (result.getExitCode() == 0) {
+            try {
+                final List<SignIdentity> signIdentities = new ArrayList<>();
+                final var lineIt = result.getOutput().iterator();
+                while (!lineIt.next().endsWith("Certificate Chain:")) {
+
+                }
+                do {
+                    final var m = SIGN_IDENTITY_NAME_REGEXP.matcher(lineIt.next());
+                    m.find();
+                    final var name = m.group(1);
+                    while (!lineIt.next().endsWith("SHA256 Fingerprint:")) {
+
+                    }
+                    final var digest = new StringBuilder();
+                    do {
+                        final var line = lineIt.next().strip();
+                        if (line.endsWith("----") || line.isEmpty()) {
+                            break;
+                        }
+                        digest.append(" " + line.strip());
+                    } while (lineIt.hasNext());
+                    final var fingerprint = new CertificateHash(
+                            FINGERPRINT_FORMAT.parseHex(digest.substring(1)), SHA256);
+                    signIdentities.add(new SignIdentity(name, fingerprint));
+                } while (lineIt.hasNext());
+                return signIdentities;
+            } catch (Throwable t) {
+                t.printStackTrace();
+                reportUnexpectedCommandOutcome(exec.getPrintableCommandLine(), result);
+                return null; // Unreachable
+            }
+        } else if (result.getExitCode() == 1 && result.getOutput().getLast().endsWith("Status: no signature")) {
+            return List.of();
+        } else {
+            reportUnexpectedCommandOutcome(exec.getPrintableCommandLine(), result);
+            return null; // Unreachable
+        }
+    }
+
+    public record SignIdentity(String name, CertificateHash fingerprint) {
+        public SignIdentity {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(fingerprint);
+        }
+    }
+
+    private static void reportUnexpectedCommandOutcome(String printableCommandLine, Executor.Result result) {
+        Objects.requireNonNull(printableCommandLine);
+        Objects.requireNonNull(result);
+        TKit.trace(String.format("Command %s exited with exit code %d and the following output:",
+                printableCommandLine, result.getExitCode()));
+        result.getOutput().forEach(TKit::trace);
+        TKit.trace("Done");
+        TKit.assertUnexpected(String.format("Outcome of command %s", printableCommandLine));
+    }
+
+    private static final Pattern SIGN_IDENTITY_NAME_REGEXP = Pattern.compile("^\\s+\\d+\\.\\s+(.*)$");
+    private static final HexFormat FINGERPRINT_FORMAT = HexFormat.ofDelimiter(" ").withUpperCase();
+}
diff --git a/test/jdk/tools/jpackage/macosx/MacSignTest.java b/test/jdk/tools/jpackage/macosx/MacSignTest.java
index 4313f1900e2..7b2e06dc7ca 100644
--- a/test/jdk/tools/jpackage/macosx/MacSignTest.java
+++ b/test/jdk/tools/jpackage/macosx/MacSignTest.java
@@ -24,12 +24,23 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+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.MacHelper;
+import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSignVerify;
+import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
 
 /*
@@ -64,23 +75,173 @@ public static void testAppContentWarning() throws IOException {
             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());
+        final var keychain = SigningBase.StandardKeychain.EXPIRED.spec().keychain();
+
+        MacSign.Keychain.withAddedKeychains(List.of(keychain), () -> {
+            // --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", keychain.name())
+                    .addArguments("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN.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);
+        });
+    }
+
+    @Test
+    @Parameter({"IMAGE", "EXPIRED_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_DMG", "EXPIRED_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_PKG", "EXPIRED_SIGNING_KEY_USER_NAME", "EXPIRED_SIGNING_KEY_USER_NAME_PKG"})
+
+    @Parameter({"IMAGE", "EXPIRED_SIGN_IDENTITY"})
+    @Parameter({"MAC_DMG", "EXPIRED_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "EXPIRED_SIGN_IDENTITY"})
+
+    @Parameter({"IMAGE", "EXPIRED_CODESIGN_SIGN_IDENTITY"})
+    @Parameter({"MAC_DMG", "EXPIRED_CODESIGN_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "EXPIRED_CODESIGN_SIGN_IDENTITY"})
+
+    @Parameter({"MAC_PKG", "GOOD_CODESIGN_SIGN_IDENTITY", "EXPIRED_PKG_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "EXPIRED_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
+    public static void testExpiredCertificate(PackageType type, SignOption... options) {
+
+        final var keychain = SigningBase.StandardKeychain.EXPIRED.spec().keychain();
+
+        MacSign.Keychain.withAddedKeychains(List.of(keychain), () -> {
+            final var cmd = JPackageCommand.helloAppImage()
+                    .ignoreDefaultVerbose(true)
+                    .addArguments("--mac-sign")
+                    .addArguments("--mac-signing-keychain", keychain.name())
+                    .addArguments(Stream.of(options).map(SignOption::args).flatMap(List::stream).toList())
+                    .setPackageType(type);
+
+            SignOption.configureOutputValidation(cmd, Stream.of(options).filter(SignOption::expired).toList(), opt -> {
+                return JPackageStringBundle.MAIN.cannedFormattedString("error.certificate.expired", opt.identityName());
+            }).execute(1);
+        });
+    }
+
+    @Test
+    @Parameter({"IMAGE", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_DMG", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_PKG", "GOOD_SIGNING_KEY_USER_NAME_PKG", "GOOD_SIGNING_KEY_USER_NAME"})
+
+    @Parameter({"IMAGE", "GOOD_CODESIGN_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "GOOD_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
+    @Parameter({"MAC_PKG", "GOOD_PKG_SIGN_IDENTITY"})
+    public static void testMultipleCertificates(PackageType type, SignOption... options) {
+
+        final var keychain = SigningBase.StandardKeychain.DUPLICATE.spec().keychain();
+
+        MacSign.Keychain.withAddedKeychains(List.of(keychain), () -> {
+            final var cmd = JPackageCommand.helloAppImage()
+                    .ignoreDefaultVerbose(true)
+                    .addArguments("--mac-sign")
+                    .addArguments("--mac-signing-keychain", keychain.name())
+                    .addArguments(Stream.of(options).map(SignOption::args).flatMap(List::stream).toList())
+                    .setPackageType(type);
+
+            SignOption.configureOutputValidation(cmd, List.of(options), opt -> {
+                return JPackageStringBundle.MAIN.cannedFormattedString("error.multiple.certs.found", opt.identityName(), keychain.name());
+            }).execute(1);
+        });
+    }
+
+    @Test
+    @ParameterSupplier
+    public static void testSelectSigningIdentity(String signingKeyUserName, CertificateRequest certRequest) {
+
+        final var keychain = SigningBase.StandardKeychain.MAIN.spec().keychain();
+
+        MacSign.Keychain.withAddedKeychains(List.of(keychain), () -> {
+            final var cmd = JPackageCommand.helloAppImage()
+                    .setFakeRuntime()
+                    .addArguments("--mac-sign")
+                    .addArguments("--mac-signing-keychain", keychain.name())
+                    .addArguments("--mac-signing-key-user-name", signingKeyUserName);
+
+            cmd.executeAndAssertHelloAppImageCreated();
+
+            MacSignVerify.assertSigned(cmd.outputBundle(), certRequest);
+        });
+    }
+
+    public static Collection<Object[]> testSelectSigningIdentity() {
+        return Stream.of(
+                SigningBase.StandardCertificateRequest.CODESIGN,
+                SigningBase.StandardCertificateRequest.CODESIGN_UNICODE
+        ).map(SigningBase.StandardCertificateRequest::spec).<Object[]>mapMulti((certRequest, acc) -> {
+            acc.accept(new Object[] {certRequest.shortName(), certRequest});
+            acc.accept(new Object[] {certRequest.name(), certRequest});
+        }).toList();
+    }
+
+    enum SignOption {
+        EXPIRED_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), true, false),
+        EXPIRED_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), true, false),
+        EXPIRED_SIGN_IDENTITY("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), false, false),
+        EXPIRED_CODESIGN_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), false, true),
+        EXPIRED_PKG_SIGN_IDENTITY("--mac-installer-sign-identity", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), false, true),
+        GOOD_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN.spec(), true, false),
+        GOOD_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG.spec(), true, false),
+        GOOD_CODESIGN_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN.spec(), false, true),
+        GOOD_PKG_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.PKG.spec(), false, true);
+
+        SignOption(String option, MacSign.CertificateRequest cert, boolean shortName, boolean passThrough) {
+            this.option = Objects.requireNonNull(option);
+            this.cert = Objects.requireNonNull(cert);
+            this.shortName = shortName;
+            this.passThrough = passThrough;
+        }
+
+        boolean passThrough() {
+            return passThrough;
+        }
+
+        boolean expired() {
+            return cert.expired();
+        }
+
+        String identityName() {
+            return cert.name();
+        }
+
+        List<String> args() {
+            return List.of(option, shortName ? cert.shortName() : cert.name());
+        }
+
+        static JPackageCommand configureOutputValidation(JPackageCommand cmd, List<SignOption> options,
+                Function<SignOption, CannedFormattedString> conv) {
+            options.stream().filter(SignOption::passThrough)
+                    .map(conv)
+                    .map(CannedFormattedString::getValue)
+                    .map(TKit::assertTextStream)
+                    .map(TKit.TextStreamVerifier::negate)
+                    .forEach(cmd::validateOutput);
+
+            options.stream().filter(Predicate.not(SignOption::passThrough))
+                    .map(conv)
+                    .map(CannedFormattedString::getValue)
+                    .map(TKit::assertTextStream)
+                    .forEach(cmd::validateOutput);
+
+            return cmd;
         }
 
-        cmd.execute(1);
+        private final String option;
+        private final MacSign.CertificateRequest cert;
+        private final boolean shortName;
+        private final boolean passThrough;
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
index e3237197c74..5484245f111 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
@@ -22,16 +22,18 @@
  */
 
 import java.nio.file.Path;
+import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 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.CertificateType;
 import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
+import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.TKit;
 
 
@@ -64,10 +66,14 @@
 public class SigningBase {
 
     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()]));
+        CODESIGN(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        CODESIGN_COPY(cert().days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        PKG(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        PKG_COPY(cert().type(CertificateType.INSTALLER).days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        CODESIGN_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
+        PKG_UNICODE(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
+        CODESIGN_EXPIRED(cert().expired().userName("expired jpackage test")),
+        PKG_EXPIRED(cert().expired().type(CertificateType.INSTALLER).userName("expired jpackage test"));
 
         StandardCertificateRequest(CertificateRequest.Builder specBuilder) {
             this.spec = specBuilder.create();
@@ -85,7 +91,21 @@ private static CertificateRequest.Builder cert() {
     }
 
     public enum StandardKeychain {
-        MAIN(DEFAULT_KEYCHAIN, StandardCertificateRequest.values());
+        MAIN(DEFAULT_KEYCHAIN,
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_UNICODE,
+                StandardCertificateRequest.PKG_UNICODE),
+        EXPIRED("jpackagerTest-expired.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_EXPIRED,
+                StandardCertificateRequest.PKG_EXPIRED),
+        DUPLICATE("jpackagerTest-duplicate.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_COPY,
+                StandardCertificateRequest.PKG_COPY);
 
         StandardKeychain(String keychainName, StandardCertificateRequest... certs) {
             this(keychainName, certs[0].spec(), Stream.of(certs).skip(1).map(StandardCertificateRequest::spec).toArray(CertificateRequest[]::new));
@@ -94,11 +114,15 @@ public enum StandardKeychain {
         StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
             final var builder = keychain(keychainName).addCert(cert);
             List.of(otherCerts).forEach(builder::addCert);
-            this.spec = builder.create();
+            this.spec = new ResolvedKeychain(builder.create());
         }
 
         public KeychainWithCertsSpec spec() {
-            return spec;
+            return spec.spec();
+        }
+
+        public X509Certificate mapCertificateRequest(CertificateRequest certRequest) {
+            return Objects.requireNonNull(spec.mapCertificateRequests().get(certRequest));
         }
 
         private static KeychainWithCertsSpec.Builder keychain(String name) {
@@ -113,7 +137,7 @@ private static List<KeychainWithCertsSpec> signingEnv() {
             return Stream.of(values()).map(StandardKeychain::spec).toList();
         }
 
-        private final KeychainWithCertsSpec spec;
+        private final ResolvedKeychain spec;
     }
 
     public static void setUp() {
@@ -131,7 +155,7 @@ public static void verifySignTestEnvReady() {
     }
 
     private final class Inner {
-        private final static boolean SIGN_ENV_READY = MacSign.isDeployed(StandardKeychain.signingEnv());
+        private static final boolean SIGN_ENV_READY = MacSign.isDeployed(StandardKeychain.signingEnv());
     }
 
     enum CertIndex {
@@ -199,165 +223,60 @@ public static String getKeyChain() {
         return DEFAULT_KEYCHAIN;
     }
 
-    // Note: It is not clear if we can combine "--verify" and "--display", so
-    // we testing them separately. Since JDK-8298488 unsigned app images are
-    // actually signed with adhoc signature and it will pass "--verify", so in
-    // addition we will check certificate name which was used to sign.
-    private static enum CodesignCheckType {
-        VERIFY, // Runs codesign with "--verify" to check signature and 0 exit code
-        VERIFY_UNSIGNED, // Runs codesign with "--verify" to check signature and 1 exit code
-        DISPLAY // Runs codesign with "--display --verbose=4" to get info about signature
-    };
-
-    private static void checkString(List<String> result, String lookupString) {
-        TKit.assertTextStream(lookupString).predicate(
-                (line, what) -> line.trim().contains(what)).apply(result.stream());
-    }
-
-    @SuppressWarnings("fallthrough")
-    private static List<String> codesignResult(Path target, CodesignCheckType type) {
-        int exitCode = 0;
-        Executor executor = new Executor().setExecutable("/usr/bin/codesign");
-        switch (type) {
-            case VERIFY_UNSIGNED:
-                exitCode = 1;
-            case VERIFY:
-                executor.addArguments("--verify", "--deep", "--strict",
-                                      "--verbose=2", target.toString());
-                break;
-            case DISPLAY:
-                executor.addArguments("--display", "--verbose=4", target.toString());
-                break;
-            default:
-                TKit.error("Unknown CodesignCheckType: " + type);
-                break;
-        }
-        return executor.saveOutput().execute(exitCode).getOutput();
-    }
-
-    private static void verifyCodesignResult(List<String> result, Path target,
-            boolean signed, CodesignCheckType type, int certIndex) {
-        result.stream().forEachOrdered(TKit::trace);
-        String lookupString;
-        switch (type) {
-            case VERIFY:
-                lookupString = target.toString() + ": valid on disk";
-                checkString(result, lookupString);
-                lookupString = target.toString() + ": satisfies its Designated Requirement";
-                checkString(result, lookupString);
-                break;
-            case VERIFY_UNSIGNED:
-                lookupString = target.toString() + ": code object is not signed at all";
-                checkString(result, lookupString);
-                break;
-            case DISPLAY:
-                if (signed) {
-                    lookupString = "Authority=" + getAppCert(certIndex);
-                } else {
-                    lookupString = "Signature=adhoc";
-                }
-                checkString(result, lookupString);
-                break;
-            default:
-                TKit.error("Unknown CodesignCheckType: " + type);
-                break;
-        }
-    }
-
-    private static Result spctlResult(Path target, String type) {
-        Result result = new Executor()
-                .setExecutable("/usr/sbin/spctl")
-                .addArguments("-vvv", "--assess", "--type", type,
-                        target.toString())
-                .saveOutput()
-                .executeWithoutExitCodeCheck();
-
-        // allow exit code 3 for not being notarized
-        if (result.getExitCode() != 3) {
-            result.assertExitCodeIsZero();
-        }
-        return result;
-    }
-
-    private static void verifySpctlResult(List<String> output, Path target,
-            String type, int exitCode, int certIndex) {
-        output.stream().forEachOrdered(TKit::trace);
-        String lookupString;
-
-        if (exitCode == 0) {
-            lookupString = target.toString() + ": accepted";
-            checkString(output, lookupString);
-        } else if (exitCode == 3) {
-            // allow failure purely for not being notarized
-            lookupString = target.toString() + ": rejected";
-            checkString(output, lookupString);
-        }
-
-        if (type.equals("install")) {
-            lookupString = "origin=" + getInstallerCert(certIndex);
-        } else {
-            lookupString = "origin=" + getAppCert(certIndex);
-        }
-        checkString(output, lookupString);
-    }
-
-    private static List<String> pkgutilResult(Path target, boolean signed) {
-        List<String> result = new Executor()
-                .setExecutable("/usr/sbin/pkgutil")
-                .addArguments("--check-signature",
-                        target.toString())
-                .saveOutput()
-                .execute(signed ? 0 : 1)
-                .getOutput();
-
-        return result;
-    }
-
-    private static void verifyPkgutilResult(List<String> result, boolean signed,
-                                            int certIndex) {
-        result.stream().forEachOrdered(TKit::trace);
+    public static void verifyCodesign(Path target, boolean signed, int certIndex) {
         if (signed) {
-            String lookupString = "Status: signed by";
-            checkString(result, lookupString);
-            lookupString = "1. " + getInstallerCert(certIndex);
-            checkString(result, lookupString);
+            final var certRequest = getCertRequest(certIndex);
+            MacSignVerify.assertSigned(target, certRequest);
         } else {
-            String lookupString = "Status: no signature";
-            checkString(result, lookupString);
+            MacSignVerify.assertAdhocSigned(target);
         }
     }
 
-    public static void verifyCodesign(Path target, boolean signed, int certIndex) {
-        List<String> result = codesignResult(target, CodesignCheckType.VERIFY);
-        verifyCodesignResult(result, target, signed, CodesignCheckType.VERIFY, certIndex);
-
-        result = codesignResult(target, CodesignCheckType.DISPLAY);
-        verifyCodesignResult(result, target, signed, CodesignCheckType.DISPLAY, certIndex);
-    }
-
     // Since we no longer have unsigned app image, but we need to check
     // DMG which is not adhoc or certificate signed and we cannot use verifyCodesign
     // for this. verifyDMG() is introduced to check that DMG is unsigned.
     // Should not be used to validated anything else.
     public static void verifyDMG(Path target) {
         if (!target.toString().toLowerCase().endsWith(".dmg")) {
-            TKit.error("Unexpected target: " + target);
+            throw new IllegalArgumentException("Unexpected target: " + target);
         }
 
-        List<String> result = codesignResult(target, CodesignCheckType.VERIFY_UNSIGNED);
-        verifyCodesignResult(result, target, false, CodesignCheckType.VERIFY_UNSIGNED, -1);
+        MacSignVerify.assertUnsigned(target);
     }
 
     public static void verifySpctl(Path target, String type, int certIndex) {
-        Result result = spctlResult(target, type);
-        List<String> output = result.getOutput();
+        final var standardCertIndex = Stream.of(CertIndex.values()).filter(v -> {
+            return v.value() == certIndex;
+        }).findFirst().orElseThrow();
+
+        final var standardType = Stream.of(MacSignVerify.SpctlType.values()).filter(v -> {
+            return v.value().equals(type);
+        }).findFirst().orElseThrow();
+
+        final String expectedSignOrigin;
+        if (standardCertIndex == CertIndex.INVALID_INDEX) {
+            expectedSignOrigin = null;
+        } else if (standardType == MacSignVerify.SpctlType.EXEC) {
+            expectedSignOrigin = getCertRequest(certIndex).name();
+        } else if (standardType == MacSignVerify.SpctlType.INSTALL) {
+            expectedSignOrigin = getPkgCertRequest(certIndex).name();
+        } else {
+            throw new IllegalArgumentException();
+        }
+
+        final var signOrigin = MacSignVerify.findSpctlSignOrigin(standardType, target).orElse(null);
 
-        verifySpctlResult(output, target, type, result.getExitCode(), certIndex);
+        TKit.assertEquals(signOrigin, expectedSignOrigin,
+                String.format("Check [%s] has sign origin as expected", target));
     }
 
     public static void verifyPkgutil(Path target, boolean signed, int certIndex) {
-        List<String> result = pkgutilResult(target, signed);
-        verifyPkgutilResult(result, signed, certIndex);
+        if (signed) {
+            final var certRequest = getPkgCertRequest(certIndex);
+            MacSignVerify.assertPkgSigned(target, certRequest, StandardKeychain.MAIN.mapCertificateRequest(certRequest));
+        } else {
+            MacSignVerify.assertUnsigned(target);
+        }
     }
 
     public static void verifyAppImageSignature(JPackageCommand appImageCmd,
@@ -378,4 +297,31 @@ public static void verifyAppImageSignature(JPackageCommand appImageCmd,
         }
     }
 
+    private static CertificateRequest getCertRequest(int certIndex) {
+        switch (CertIndex.values()[certIndex]) {
+            case ASCII_INDEX -> {
+                return StandardCertificateRequest.CODESIGN.spec();
+            }
+            case UNICODE_INDEX -> {
+                return StandardCertificateRequest.CODESIGN_UNICODE.spec();
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private static CertificateRequest getPkgCertRequest(int certIndex) {
+        switch (CertIndex.values()[certIndex]) {
+            case ASCII_INDEX -> {
+                return StandardCertificateRequest.PKG.spec();
+            }
+            case UNICODE_INDEX -> {
+                return StandardCertificateRequest.PKG_UNICODE.spec();
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
 }

From 7a72f0fac9a0704c4a0ada781f1cadd7c4903b3e Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 01:03:45 +0000
Subject: [PATCH 028/901] 8354465: Open some JTable bugs 8

Reviewed-by: serb, kizune
---
 .../swing/JTable/CheckBoxFirstClick.java      | 185 +++++++++++++++++
 .../swing/JTable/IllegalStateException.java   | 187 ++++++++++++++++++
 test/jdk/javax/swing/JTable/bug4139910.java   |  68 +++++++
 test/jdk/javax/swing/JTable/bug4226181.java   |  87 ++++++++
 test/jdk/javax/swing/JTable/bug4239157.java   |  85 ++++++++
 5 files changed, 612 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTable/CheckBoxFirstClick.java
 create mode 100644 test/jdk/javax/swing/JTable/IllegalStateException.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4139910.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4226181.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4239157.java

diff --git a/test/jdk/javax/swing/JTable/CheckBoxFirstClick.java b/test/jdk/javax/swing/JTable/CheckBoxFirstClick.java
new file mode 100644
index 00000000000..91f8930103e
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/CheckBoxFirstClick.java
@@ -0,0 +1,185 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.BevelBorder;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4115930
+ * @summary Verify checkboxes in the table respond to first click.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual CheckBoxFirstClick
+ */
+
+public class CheckBoxFirstClick {
+    private static final String INSTRUCTIONS = """
+            Click over the checkbox in the table. It should change state
+            on the first click. If not - press 'fail'.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(CheckBoxFirstClick::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("ListSizeBug");
+
+        // Take the dummy data from SwingSet.
+        final String[] names = {"First Name", "Last Name", "Favorite Color",
+                "Favorite Number", "Vegetarian"};
+        final Object[][] data = {
+                {"Mark", "Andrews", "Red", 2, true},
+                {"Tom", "Ball", "Blue", 99, false},
+                {"Alan", "Chung", "Green", 838, false},
+                {"Jeff", "Dinkins", "Turquois", 8, true},
+                {"Amy", "Fowler", "Yellow", 3, false},
+                {"Brian", "Gerhold", "Green", 0, false},
+                {"James", "Gosling", "Pink", 21, false},
+                {"David", "Karlton", "Red", 1, false},
+                {"Dave", "Kloba", "Yellow", 14, false},
+                {"Peter", "Korn", "Purple", 12, false},
+                {"Phil", "Milne", "Purple", 3, false},
+                {"Dave", "Moore", "Green", 88, false},
+                {"Hans", "Muller", "Maroon", 5, false},
+                {"Rick", "Levenson", "Blue", 2, false},
+                {"Tim", "Prinzing", "Blue", 22, false},
+                {"Chester", "Rose", "Black", 0, false},
+                {"Ray", "Ryan", "Gray", 77, false},
+                {"Georges", "Saab", "Red", 4, false},
+                {"Willie", "Walker", "Phthalo Blue", 4, false},
+                {"Kathy", "Walrath", "Blue", 8, false},
+                {"Arnaud", "Weber", "Green", 44, false}
+        };
+
+        // Create a model of the data.
+        TableModel dataModel = new AbstractTableModel() {
+            // These methods always need to be implemented.
+            public int getColumnCount() {
+                return names.length;
+            }
+
+            public int getRowCount() {
+                return data.length;
+            }
+
+            public Object getValueAt(int row, int col) {
+                return data[row][col];
+            }
+
+            // The default implementations of these methods in
+            // AbstractTableModel would work, but we can refine them.
+            public String getColumnName(int column) {
+                return names[column];
+            }
+
+            public Class getColumnClass(int c) {
+                return getValueAt(0, c).getClass();
+            }
+
+            public boolean isCellEditable(int row, int col) {
+                return true;
+            }
+
+            public void setValueAt(Object aValue, int row, int column) {
+                System.out.println("Setting value to: " + aValue);
+                data[row][column] = aValue;
+            }
+        };
+
+        // Create the table
+        JTable tableView = new JTable(dataModel);
+        // Turn off auto-resizing so that we can set column sizes programmatically.
+        // In this mode, all columns will get their preferred widths, as set blow.
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
+        // Create a combo box to show that you can use one in a table.
+        JComboBox comboBox = new JComboBox();
+        comboBox.addItem("Red");
+        comboBox.addItem("Orange");
+        comboBox.addItem("Yellow");
+        comboBox.addItem("Green");
+        comboBox.addItem("Blue");
+        comboBox.addItem("Indigo");
+        comboBox.addItem("Violet");
+
+        TableColumn colorColumn = tableView.getColumn("Favorite Color");
+        // Use the combo box as the editor in the "Favorite Color" column.
+        colorColumn.setCellEditor(new DefaultCellEditor(comboBox));
+
+        // Set a pink background and tooltip for the Color column renderer.
+        DefaultTableCellRenderer colorColumnRenderer = new DefaultTableCellRenderer();
+        colorColumnRenderer.setBackground(Color.pink);
+        colorColumnRenderer.setToolTipText("Click for combo box");
+        colorColumn.setCellRenderer(colorColumnRenderer);
+
+        // Set a tooltip for the header of the colors column.
+        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
+        if (headerRenderer instanceof DefaultTableCellRenderer)
+            ((DefaultTableCellRenderer) headerRenderer).setToolTipText("Hi Mom!");
+
+        // Set the width of the "Vegetarian" column.
+        TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
+        vegetarianColumn.setPreferredWidth(100);
+
+        // Show the values in the "Favorite Number" column in different colors.
+        TableColumn numbersColumn = tableView.getColumn("Favorite Number");
+        DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
+            public void setValue(Object value) {
+                int cellValue = (value instanceof Number) ? ((Number) value).intValue() : 0;
+                setForeground((cellValue > 30) ? Color.black : Color.red);
+                setText((value == null) ? "" : value.toString());
+            }
+        };
+        numberColumnRenderer.setHorizontalAlignment(JLabel.RIGHT);
+        numbersColumn.setCellRenderer(numberColumnRenderer);
+        numbersColumn.setPreferredWidth(110);
+
+        // Finish setting up the table.
+        JScrollPane scrollpane = new JScrollPane(tableView);
+        scrollpane.setBorder(new BevelBorder(BevelBorder.LOWERED));
+        scrollpane.setPreferredSize(new Dimension(430, 200));
+
+        frame.add(scrollpane);
+        frame.setSize(500, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/IllegalStateException.java b/test/jdk/javax/swing/JTable/IllegalStateException.java
new file mode 100644
index 00000000000..427b81ab2d9
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/IllegalStateException.java
@@ -0,0 +1,187 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.BevelBorder;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4133143
+ * @summary Illegal State exception in ComboBox editor in table
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual IllegalStateException
+ */
+
+public class IllegalStateException {
+    private static final String INSTRUCTIONS = """
+            Click on a cell in the first column, delete the contents but leave the editor with focus.
+            Click on the third column popping up a combo box.
+            Verify that the text editor loses focus.
+            If it does, press "pass", otherwise press "fail".
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(IllegalStateException::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("IllegalStateException");
+
+        // Take the dummy data from SwingSet.
+        final String[] names = {"First Name", "Last Name", "Favorite Color",
+                "Favorite Number", "Vegetarian"};
+        final Object[][] data = {
+                {"Mark", "Andrews", "Red", 2, true},
+                {"Tom", "Ball", "Blue", 99, false},
+                {"Alan", "Chung", "Green", 838, false},
+                {"Jeff", "Dinkins", "Turquois", 8, true},
+                {"Amy", "Fowler", "Yellow", 3, false},
+                {"Brian", "Gerhold", "Green", 0, false},
+                {"James", "Gosling", "Pink", 21, false},
+                {"David", "Karlton", "Red", 1, false},
+                {"Dave", "Kloba", "Yellow", 14, false},
+                {"Peter", "Korn", "Purple", 12, false},
+                {"Phil", "Milne", "Purple", 3, false},
+                {"Dave", "Moore", "Green", 88, false},
+                {"Hans", "Muller", "Maroon", 5, false},
+                {"Rick", "Levenson", "Blue", 2, false},
+                {"Tim", "Prinzing", "Blue", 22, false},
+                {"Chester", "Rose", "Black", 0, false},
+                {"Ray", "Ryan", "Gray", 77, false},
+                {"Georges", "Saab", "Red", 4, false},
+                {"Willie", "Walker", "Phthalo Blue", 4, false},
+                {"Kathy", "Walrath", "Blue", 8, false},
+                {"Arnaud", "Weber", "Green", 44, false}
+        };
+
+        // Create a model of the data.
+        TableModel dataModel = new AbstractTableModel() {
+            // These methods always need to be implemented.
+            public int getColumnCount() {
+                return names.length;
+            }
+
+            public int getRowCount() {
+                return data.length;
+            }
+
+            public Object getValueAt(int row, int col) {
+                return data[row][col];
+            }
+
+            // The default implementations of these methods in
+            // AbstractTableModel would work, but we can refine them.
+            public String getColumnName(int column) {
+                return names[column];
+            }
+
+            public Class getColumnClass(int c) {
+                return getValueAt(0, c).getClass();
+            }
+
+            public boolean isCellEditable(int row, int col) {
+                return true;
+            }
+
+            public void setValueAt(Object aValue, int row, int column) {
+                System.out.println("Setting value to: " + aValue);
+                data[row][column] = aValue;
+            }
+        };
+
+        // Create the table
+        JTable tableView = new JTable(dataModel);
+        // Turn off auto-resizing so that we can set column sizes programmatically.
+        // In this mode, all columns will get their preferred widths, as set blow.
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
+        // Create a combo box to show that you can use one in a table.
+        JComboBox comboBox = new JComboBox();
+        comboBox.addItem("Red");
+        comboBox.addItem("Orange");
+        comboBox.addItem("Yellow");
+        comboBox.addItem("Green");
+        comboBox.addItem("Blue");
+        comboBox.addItem("Indigo");
+        comboBox.addItem("Violet");
+
+        TableColumn colorColumn = tableView.getColumn("Favorite Color");
+        // Use the combo box as the editor in the "Favorite Color" column.
+        colorColumn.setCellEditor(new DefaultCellEditor(comboBox));
+
+        // Set a pink background and tooltip for the Color column renderer.
+        DefaultTableCellRenderer colorColumnRenderer = new DefaultTableCellRenderer();
+        colorColumnRenderer.setBackground(Color.pink);
+        colorColumnRenderer.setToolTipText("Click for combo box");
+        colorColumn.setCellRenderer(colorColumnRenderer);
+
+        // Set a tooltip for the header of the colors column.
+        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
+        if (headerRenderer instanceof DefaultTableCellRenderer)
+            ((DefaultTableCellRenderer) headerRenderer).setToolTipText("Hi Mom!");
+
+        // Set the width of the "Vegetarian" column.
+        TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
+        vegetarianColumn.setPreferredWidth(100);
+
+        // Show the values in the "Favorite Number" column in different colors.
+        TableColumn numbersColumn = tableView.getColumn("Favorite Number");
+        DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
+            public void setValue(Object value) {
+                int cellValue = (value instanceof Number) ? ((Number) value).intValue() : 0;
+                setForeground((cellValue > 30) ? Color.black : Color.red);
+                setText((value == null) ? "" : value.toString());
+            }
+        };
+        numberColumnRenderer.setHorizontalAlignment(JLabel.RIGHT);
+        numbersColumn.setCellRenderer(numberColumnRenderer);
+        numbersColumn.setPreferredWidth(110);
+
+        // Finish setting up the table.
+        JScrollPane scrollpane = new JScrollPane(tableView);
+        scrollpane.setBorder(new BevelBorder(BevelBorder.LOWERED));
+        scrollpane.setPreferredSize(new Dimension(430, 200));
+
+        frame.add(scrollpane);
+        frame.setSize(500, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4139910.java b/test/jdk/javax/swing/JTable/bug4139910.java
new file mode 100644
index 00000000000..c9d6d62cf0c
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4139910.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+/*
+ * @test
+ * @bug 4139910
+ * @summary Column resize mouse pointer doesn't display in non-resizable JTable.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4139910
+ */
+
+public class bug4139910 {
+    private static final String INSTRUCTIONS = """
+            Move mouse pointer to the position between "A" and "B" headers.
+            If mouse pointer does not change its shape then test passes. If
+            it does then test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4139910::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4139910");
+
+        String[] colName = {"A", "B"};
+        JTable tbl = new JTable(new DefaultTableModel(colName, 6));
+        tbl.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        tbl.getTableHeader().setReorderingAllowed(false);
+        tbl.getTableHeader().setResizingAllowed(false);
+        JScrollPane sp = new JScrollPane(tbl);
+        frame.add(sp);
+
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4226181.java b/test/jdk/javax/swing/JTable/bug4226181.java
new file mode 100644
index 00000000000..70749cf5d55
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4226181.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+/*
+ * @test
+ * @bug 4226181
+ * @summary Tests that JTable setModel() correctly re-sizes and counts columns
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4226181
+ */
+
+public class bug4226181 {
+    private static final String INSTRUCTIONS = """
+            Take a look at the table and remember the number of columns you see.
+            Now press the "setModel" button. If the number of columns has changed,
+            then test fails, otherwise it passes.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4226181::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static class TestModel extends AbstractTableModel {
+        public int getRowCount() {
+            return 5;
+        }
+
+        public int getColumnCount() {
+            return 7;
+        }
+
+        public Object getValueAt(int row, int column) {
+            return row + ":" + column;
+        }
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4226181");
+        TestModel testModel = new TestModel();
+        final JTable t = new JTable(testModel);
+        JButton b = new JButton("setModel");
+        b.addActionListener(ae -> t.setModel(new TestModel()));
+        t.setCellSelectionEnabled(true);
+        JPanel p1 = new JPanel(new GridLayout(1, 2));
+        p1.add(new JLabel("dummy"));
+        p1.add(t);
+        frame.add(p1);
+        frame.add(b, BorderLayout.SOUTH);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4239157.java b/test/jdk/javax/swing/JTable/bug4239157.java
new file mode 100644
index 00000000000..025af1615e0
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4239157.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
+
+/*
+ * @test
+ * @bug 4239157
+ * @summary Tests that JTable performs cell validation properly
+ *          (i.e. does not accept entries for which stopCellEditing()
+ *           returns false)
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4239157
+ */
+
+public class bug4239157 {
+    private static final String INSTRUCTIONS = """
+            You see a JTable having one row and two columns.
+            Click in the very first cell (where "click here" is displayed).
+            Edit its content (e.g. type some letters) and press right arrow key.
+            The edited cell should stay active, its content shouldn't change.
+            The right cell (that with text "inactive forever") shouldn't become active.
+            The same should be true when you press Tab key.
+            If it is so, test passes, otherwise it fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4239157::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4239157");
+        JTable table = new JTable(new Object[][]{{"click here",
+                "inactive forever"}},
+                new Object[]{"1", "2"});
+        frame.add("Center", table);
+        TableColumn column = table.getColumn("1");
+        TableCellEditor editor = new TestEditor(new JTextField());
+        column.setCellEditor(editor);
+
+        frame.pack();
+        return frame;
+    }
+
+    static class TestEditor extends DefaultCellEditor {
+        public TestEditor(JTextField tf) {
+            super(tf);
+        }
+
+        public boolean stopCellEditing() {
+            return false;
+        }
+    }
+}

From ade67df0f363cb95434832f750ac901c1c75c29c Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 01:04:48 +0000
Subject: [PATCH 029/901] 8354233: Open some JTable bugs 6

Reviewed-by: kizune
---
 test/jdk/javax/swing/JTable/bug4129401.java |  87 ++++++++++++
 test/jdk/javax/swing/JTable/bug4193727.java | 135 ++++++++++++++++++
 test/jdk/javax/swing/JTable/bug4242631.java | 144 ++++++++++++++++++++
 3 files changed, 366 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTable/bug4129401.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4193727.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4242631.java

diff --git a/test/jdk/javax/swing/JTable/bug4129401.java b/test/jdk/javax/swing/JTable/bug4129401.java
new file mode 100644
index 00000000000..37765d34698
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4129401.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.TableColumn;
+
+/*
+ * @test
+ * @bug 4129401
+ * @summary Tests that keystroking for combobox cell editor in JTable works
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4129401
+ */
+
+public class bug4129401 {
+    private static final String INSTRUCTIONS = """
+            1. Move the mouse cursor to the cell "CELL 2 1",
+               which contains JComboBox and click left mouse button
+               to drop down combobox list.
+            2. Change selected item in the combobox list
+               using up and down arrows.
+            3. Press Esc. JComboBox drop down list should hide.
+            If all was successful then test passes, else test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4129401::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        Object data[][] = new Object[4][2];
+        JComboBox cb = new JComboBox();
+        cb.addItem("Item1");
+        cb.addItem("Item2");
+        cb.addItem("Item3");
+        cb.addItem("Item4");
+        data[0][0] = "CELL 0 0";
+        data[0][1] = "CELL 0 1";
+        data[1][0] = "CELL 1 0";
+        data[1][1] = "CELL 1 1";
+        data[2][0] = "CELL 2 0";
+        data[2][1] = "CELL 2 1";
+        data[3][0] = "CELL 3 0";
+        data[3][1] = "CELL 3 1";
+        String[] str = {"Column 0", "Column 1"};
+        JTable tbl = new JTable(data, str);
+        JScrollPane sp = new JScrollPane(tbl);
+
+        TableColumn col = tbl.getColumn("Column 1");
+        col.setCellEditor(new DefaultCellEditor(cb));
+
+        JFrame f = new JFrame("4129401 test");
+        f.getContentPane().add(sp);
+        f.setBounds(100, 100, 300, 300);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4193727.java b/test/jdk/javax/swing/JTable/bug4193727.java
new file mode 100644
index 00000000000..2ef4159e90c
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4193727.java
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FontMetrics;
+import java.util.Vector;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+
+/*
+ * @test
+ * @bug 4193727
+ * @summary Tests that resizing JTable via TableColumn's
+ *          setWidth(int) repaints correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4193727
+ */
+
+public class bug4193727 {
+    static EnhancedJTable tblResults;
+    static JButton bTest = new JButton("Resize");
+
+    private static final String INSTRUCTIONS = """
+            Push button "Resize".
+            If either of the following happen, test fails:
+            1) The size of the columns change
+            2) The JTable is not repainted correctly
+
+            Otherwise test passes.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4193727::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4193727");
+        Vector v = new Vector();
+        Vector data = new Vector();
+        Vector cols = new Vector();
+
+        cols.add("Name");
+        cols.add("Address");
+        data.add("Steve");
+        data.add("100 East Main Street");
+        v.add(data);
+
+        data.add("Richard");
+        data.add("99 Main Road");
+        v.add(data);
+
+        frame.setLayout(new BorderLayout());
+        tblResults = new EnhancedJTable(v, cols);
+        MyTableHeader mth = new MyTableHeader();
+        for (int i = 0; i < tblResults.getColumnCount(); i++)
+            tblResults.getColumnModel().getColumn(i).setHeaderRenderer(mth.getTHR());
+        tblResults.setAutoResizeMode(EnhancedJTable.AUTO_RESIZE_OFF);
+
+        JScrollPane pane = new JScrollPane(tblResults);
+        frame.add(pane, BorderLayout.CENTER);
+        JPanel panel = new JPanel();
+        panel.add(bTest);
+        frame.add(panel, BorderLayout.EAST);
+        bTest.addActionListener(e -> tblResults.autoSizeColumns());
+        frame.setSize(300, 200);
+        return frame;
+    }
+}
+
+class MyTableHeader extends TableColumn {
+    public TableCellRenderer getTHR() {
+        return createDefaultHeaderRenderer();
+    }
+}
+
+class EnhancedJTable extends JTable {
+    public EnhancedJTable(Vector data, Vector colNames) {
+        super(data, colNames);
+    }
+
+    public synchronized void autoSizeColumns() {
+        setAutoResizeMode(AUTO_RESIZE_OFF);
+        int colcnt = getColumnCount();
+        int rowcnt = getRowCount();
+
+        for (int i = 0; i < colcnt; i++) {
+            // get the max column width needed
+            Component cell = getColumnModel().getColumn(i).getHeaderRenderer()
+                    .getTableCellRendererComponent(this, null, false, false, -1, i);
+            FontMetrics fm = cell.getFontMetrics(cell.getFont());
+            int max = SwingUtilities.computeStringWidth(fm, getColumnModel().getColumn(i).getHeaderValue()
+                    .toString() + "  ");
+            for (int j = 0; j < rowcnt; j++) {
+                // add 2 spaces to account for gutter
+                int width = SwingUtilities.computeStringWidth(fm, getValueAt(j, i).toString() + "  ");
+                if (max < width) max = width;
+            }
+            // set the new column width
+            getColumnModel().getColumn(i).setWidth(max);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4242631.java b/test/jdk/javax/swing/JTable/bug4242631.java
new file mode 100644
index 00000000000..6e9d1eddc32
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4242631.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.util.ArrayList;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+/*
+ * @test
+ * @bug 4242631
+ * @summary Tests that JTable repaints itself correctly after a record
+ *          has been removed and added to the table model.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4242631
+ */
+
+public class bug4242631 {
+    private static JButton addButton;
+    private static JButton removeButton;
+    private static JButton bothButton;
+    private static SimpleTableModel tableModel;
+
+    private static final String INSTRUCTIONS = """
+            Press Add button to add a record to the table. The record added should
+            have number 0. Then press Remove/Add button some times. The record number
+            should increase as you press. If it does not, test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4242631::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4242631");
+        GridBagLayout grid = new GridBagLayout();
+
+        frame.setLayout(grid);
+        GridBagConstraints c = new GridBagConstraints();
+        c.insets = new Insets(2, 2, 2, 2);
+
+        // Add button.
+        c.gridx = 0;
+        c.gridy = 0;
+        grid.setConstraints(addButton = new JButton("Add"), c);
+        frame.add(addButton);
+
+        // Edit button.
+        c.gridx = 1;
+        c.gridy = 0;
+        grid.setConstraints(removeButton = new JButton("Remove"), c);
+        frame.add(removeButton);
+
+        // Remove button.
+        c.gridx = 2;
+        c.gridy = 0;
+        grid.setConstraints(bothButton = new JButton("Remove/Add"), c);
+        frame.add(bothButton);
+
+        // Table.
+        c.gridx = 0;
+        c.gridy = 1;
+        c.gridwidth = 6;
+        c.gridheight = 0;
+        c.anchor = GridBagConstraints.CENTER;
+        c.fill = GridBagConstraints.BOTH;
+        c.weightx = 1.0;
+        c.weighty = 1.0;
+        JScrollPane scroll = null;
+        tableModel = new SimpleTableModel();
+        grid.setConstraints(scroll = new JScrollPane(new JTable(tableModel)), c);
+        frame.add(scroll);
+
+        // Create some action listeners.
+        addButton.addActionListener(event -> tableModel.addRow());
+        removeButton.addActionListener(event -> tableModel.removeRow());
+        bothButton.addActionListener(event -> tableModel.removeThenAddRow());
+
+        frame.pack();
+        return frame;
+    }
+
+    static class SimpleTableModel extends AbstractTableModel {
+        int counter = 0;
+        ArrayList list = new ArrayList();
+
+        public SimpleTableModel() {}
+        public int getColumnCount() { return 1; }
+        public int getRowCount() { return list.size(); }
+
+        public Object getValueAt(int row, int col) {
+            String str = (String) list.get(row);
+            return str;// + "." + col;
+        }
+
+        public void addRow() {
+            list.add("" + counter++);
+            fireTableRowsInserted(list.size() - 1, list.size() - 1);
+        }
+
+        public void removeRow() {
+            if (list.size() == 0) return;
+            list.remove(list.size() - 1);
+            fireTableRowsDeleted(list.size(), list.size());
+        }
+
+        public void removeThenAddRow() {
+            if (list.size() == 0) return;
+            removeRow();
+            addRow();
+        }
+    }
+}

From f880fa91dce7b8844cfa4e95caa3a982e280165a Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 03:09:45 +0000
Subject: [PATCH 030/901] 8352793: Open source several AWT TextComponent tests
 - Batch 1

Reviewed-by: prr, serb
---
 .../awt/TextComponent/BackgroundTest.java     | 127 ++++++++++++++++++
 .../java/awt/TextComponent/DisableTest.java   |  98 ++++++++++++++
 .../java/awt/TextComponent/ModifiersTest.java |  85 ++++++++++++
 .../awt/TextComponent/TextFieldMargin.java    |  67 +++++++++
 4 files changed, 377 insertions(+)
 create mode 100644 test/jdk/java/awt/TextComponent/BackgroundTest.java
 create mode 100644 test/jdk/java/awt/TextComponent/DisableTest.java
 create mode 100644 test/jdk/java/awt/TextComponent/ModifiersTest.java
 create mode 100644 test/jdk/java/awt/TextComponent/TextFieldMargin.java

diff --git a/test/jdk/java/awt/TextComponent/BackgroundTest.java b/test/jdk/java/awt/TextComponent/BackgroundTest.java
new file mode 100644
index 00000000000..543f2cfd893
--- /dev/null
+++ b/test/jdk/java/awt/TextComponent/BackgroundTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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 4258667 4405602
+ * @summary  Make sure TextComponents are grayed out when non-editable
+ *           if the background color has not been set by client code.
+ *           Make sure TextComponents are not grayed out when non-editable
+ *           if the background color has been set by client code.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual BackgroundTest
+ */
+
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.TextArea;
+import java.awt.TextField;
+
+public class BackgroundTest {
+    private static final String enableString = "EnableText";
+    private static final String disableString = "DisableText";
+
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. When the frame appears, it should have a blue background.
+                2. The first TextField and TextArea will be the default color.
+                   The second TextField and TextArea will be green.
+                3. Press the "DisableText" button.
+                   The first TextField and TextArea should change colors to the
+                   default disabled color.  On Windows, this is usually gray.
+                   On linux and macos it will match the environment settings.
+                   If the TextField or the TextArea do not change colors as described,
+                   the test FAILS.
+                4. The second TextField and TextArea should still be green.
+                   If either of them are not green, the test FAILS.
+                   Press the "EnableText" button (same button as before).
+                   The first TextField and TextArea should return to their
+                   original colors as described in the first paragraph. If they
+                   do not, the test FAILS.
+                5. The second TextField and TextArea should still be green.
+                   If either of them are not green, the test FAILS.
+                   Otherwise, the test PASSES.
+                """;
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(BackgroundTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        Frame frame = new Frame("Background Test");
+        frame.setLayout(new FlowLayout());
+        TextField tf = new TextField(30);
+        TextArea ta = new TextArea(4, 30);
+        TextField setTf = new TextField(30);
+        TextArea setTa = new TextArea(4, 30);
+        Button enableButton = new Button(disableString);
+
+        enableButton.setBackground(Color.red);
+        frame.setSize(500, 250);
+
+        frame.setBackground(Color.blue);
+
+        tf.setText("Background not set - should be default");
+        tf.setEditable(true);
+        frame.add(tf);
+        ta.setText("Background not set - should be default");
+        ta.setEditable(true);
+        frame.add(ta);
+
+        setTf.setText("Background is set - should be Green");
+        setTf.setBackground(Color.green);
+        setTf.setEditable(true);
+        frame.add(setTf);
+        setTa.setText("Background is set - should be Green");
+        setTa.setBackground(Color.green);
+        setTa.setEditable(true);
+        frame.add(setTa);
+
+        enableButton.addActionListener(e -> {
+            boolean currentlyEditable = tf.isEditable();
+
+            if (currentlyEditable) {
+                tf.setEditable(false);
+                ta.setEditable(false);
+                setTf.setEditable(false);
+                setTa.setEditable(false);
+                enableButton.setLabel(enableString);
+            } else {
+                tf.setEditable(true);
+                ta.setEditable(true);
+                setTf.setEditable(true);
+                setTa.setEditable(true);
+                enableButton.setLabel(disableString);
+            }
+        });
+        frame.add(enableButton);
+        return frame;
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/awt/TextComponent/DisableTest.java b/test/jdk/java/awt/TextComponent/DisableTest.java
new file mode 100644
index 00000000000..820b9c8bd30
--- /dev/null
+++ b/test/jdk/java/awt/TextComponent/DisableTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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 5042122
+ * @summary Verifies the TextComponent is grayed out when disabled
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DisableTest
+ */
+
+import javax.swing.BoxLayout;
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.Panel;
+import java.awt.TextArea;
+import java.awt.TextField;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+import java.util.Iterator;
+
+public class DisableTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Click "Enable" and "Disable" buttons and verify the text
+                   components are disabled and enabled correctly.
+                2. Verify that the disabled text components are grayed
+                   out and are uneditable.
+                3. Click PASS or FAIL accordingly.
+                """;
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(DisableTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        Frame frame = new Frame("TextComponent Disabled test");
+        frame.setLayout(new BorderLayout());
+        frame.setSize(200, 200);
+        final Vector comps = new Vector();
+        comps.add(new TextField("TextField"));
+        TextArea ta = new TextArea("TextArea", 2, 100, TextArea.SCROLLBARS_NONE);
+        comps.add(ta);
+        Panel pc = new Panel();
+        pc.setLayout(new BoxLayout(pc, BoxLayout.Y_AXIS));
+        Iterator iter = comps.iterator();
+        while (iter.hasNext()) {
+            Component c = (Component) iter.next();
+            c.setEnabled(false);
+            pc.add(c);
+        }
+        frame.add(pc, BorderLayout.CENTER);
+        Panel p = new Panel();
+        final Button be = new Button("Enable");
+        final Button bd = new Button("Disable");
+        p.add(be);
+        p.add(bd);
+        ActionListener al = ev -> {
+            boolean enable = (ev.getSource() == be);
+            Iterator iterator = comps.iterator();
+            while (iterator.hasNext()) {
+                Component c = (Component) iterator.next();
+                c.setEnabled(enable);
+            }
+        };
+        be.addActionListener(al);
+        bd.addActionListener(al);
+        frame.add(p, BorderLayout.SOUTH);
+        return frame;
+    }
+}
diff --git a/test/jdk/java/awt/TextComponent/ModifiersTest.java b/test/jdk/java/awt/TextComponent/ModifiersTest.java
new file mode 100644
index 00000000000..e9e76a9b694
--- /dev/null
+++ b/test/jdk/java/awt/TextComponent/ModifiersTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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 4035364
+ * @summary Checks that Caps Lock key works
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ModifiersTest
+ */
+
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.TextArea;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+
+public class ModifiersTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Type some text in the TextArea in upper and lowercase,
+                   using the Caps Lock ON/OFF.
+                2. If Caps Lock toggles correctly and you are able to type in
+                     both cases, the test PASS. Else Test FAILS.
+                """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ModifiersTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        Frame frame = new Frame("Modifiers Test");
+        frame.setLayout(new GridLayout(1, 1));
+        frame.addKeyListener(new KeyChecker());
+        frame.setLayout(new GridLayout(2, 1));
+        Label label = new Label("See if you can type in upper and lowercase using Caps Lock:");
+        frame.add(label);
+        TextArea ta = new TextArea();
+        frame.add(ta);
+        ta.addKeyListener(new KeyChecker());
+        ta.requestFocus();
+        frame.setSize(400, 300);
+        return frame;
+    }
+}
+
+// a KeyListener for debugging purposes
+class KeyChecker extends KeyAdapter {
+    public void keyPressed(KeyEvent ev) {
+        System.out.println(ev);
+    }
+
+    public void keyReleased(KeyEvent ev) {
+        System.out.println(ev);
+    }
+
+    public void keyTyped(KeyEvent ev) {
+        System.out.println(ev);
+    }
+}
diff --git a/test/jdk/java/awt/TextComponent/TextFieldMargin.java b/test/jdk/java/awt/TextComponent/TextFieldMargin.java
new file mode 100644
index 00000000000..6baf144254c
--- /dev/null
+++ b/test/jdk/java/awt/TextComponent/TextFieldMargin.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 4129511
+ * @summary Tests that TextField margins are not exceedingly wide
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TextFieldMargin
+ */
+
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.TextArea;
+import java.awt.TextField;
+
+public class TextFieldMargin {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Examine the TextField, Label, and TextArea to see
+                   that the text is vertically aligned along the left
+                2. If all are aligned along the left, then test PASS,
+                   else test FAILS.
+                """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(TextFieldMargin::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        Frame frame = new Frame("Frame with a text field & a label");
+        frame.setLayout(new GridLayout(5, 1));
+        TextField text_field = new TextField("Left Textfield");
+        frame.add(text_field);
+        Label label = new Label("Left Label");
+        frame.add(label);
+        TextArea text_area = new TextArea("Left Textfield");
+        frame.add(text_area);
+        frame.setBounds(50, 50, 300, 300);
+        return frame;
+    }
+}

From 0be3f163ed12db305673928d97f975d6f6bb6b1c Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 22 Apr 2025 03:29:59 +0000
Subject: [PATCH 031/901] 8341608: jdeps in JDK 23 crashes when parsing
 signatures while jdeps in JDK 22 works fine

Reviewed-by: jpai, henryjen
---
 .../com/sun/tools/jdeps/ClassFileReader.java  | 190 +++++-------------
 .../com/sun/tools/jdeps/Dependencies.java     |   2 +-
 .../com/sun/tools/jdeps/DependencyFinder.java |  12 +-
 .../tools/jdeps/MalformedClassesTest.java     | 129 ++++++++++++
 test/langtools/tools/jdeps/TEST.properties    |   2 +
 .../com/sun/tools/jdeps/JdepsAccess.java      |  34 ++++
 .../lib/compiler/InMemoryJavaCompiler.java    |   8 +-
 test/lib/jdk/test/lib/util/JarUtils.java      |  20 +-
 8 files changed, 241 insertions(+), 156 deletions(-)
 create mode 100644 test/langtools/tools/jdeps/MalformedClassesTest.java
 create mode 100644 test/langtools/tools/jdeps/TEST.properties
 create mode 100644 test/langtools/tools/jdeps/jdk.jdeps/com/sun/tools/jdeps/JdepsAccess.java

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
index fc1bf5302d6..72dc4e72899 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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
@@ -41,10 +41,9 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
@@ -102,6 +101,10 @@ public List<String> skippedEntries() {
         return skippedEntries;
     }
 
+    protected void skipEntry(Throwable ex, String entryPath) {
+        skippedEntries.add(String.format("%s: %s", ex.toString(), entryPath));
+    }
+
     /**
      * Returns all entries in this archive.
      */
@@ -135,8 +138,15 @@ public ClassModel getClassFile(String name) throws IOException {
         return null;
     }
 
-    public Iterable<ClassModel> getClassFiles() throws IOException {
-        return FileIterator::new;
+    public void forEachClassFile(Consumer<ClassModel> handler) throws IOException {
+        if (baseFileName.endsWith(".class")) {
+            // propagate ClassFileError for single file
+            try {
+                handler.accept(readClassFile(path));
+            } catch (ClassFileError ex) {
+                skipEntry(ex, path.toString());
+            }
+        }
     }
 
     protected ClassModel readClassFile(Path p) throws IOException {
@@ -167,33 +177,6 @@ static boolean isClass(Path file) {
     public void close() throws IOException {
     }
 
-    class FileIterator implements Iterator<ClassModel> {
-        int count;
-        FileIterator() {
-            this.count = 0;
-        }
-        public boolean hasNext() {
-            return count == 0 && baseFileName.endsWith(".class");
-        }
-
-        public ClassModel next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            try {
-                ClassModel cf = readClassFile(path);
-                count++;
-                return cf;
-            } catch (IOException e) {
-                throw new ClassFileError(e);
-            }
-        }
-
-        public void remove() {
-            throw new UnsupportedOperationException("Not supported yet.");
-        }
-    }
-
     public String toString() {
         return path.toString();
     }
@@ -241,42 +224,17 @@ public ClassModel getClassFile(String name) throws IOException {
             return null;
         }
 
-        public Iterable<ClassModel> getClassFiles() throws IOException {
-            final Iterator<ClassModel> iter = new DirectoryIterator();
-            return () -> iter;
-        }
-
-        class DirectoryIterator implements Iterator<ClassModel> {
-            private final List<Path> entries;
-            private int index = 0;
-            DirectoryIterator() throws IOException {
-                List<Path> paths = null;
-                try (Stream<Path> stream = Files.walk(path, Integer.MAX_VALUE)) {
-                    paths = stream.filter(ClassFileReader::isClass).toList();
-
-                }
-                this.entries = paths;
-                this.index = 0;
-            }
-
-            public boolean hasNext() {
-                return index != entries.size();
-            }
-
-            public ClassModel next() {
-                if (!hasNext()) {
-                    throw new NoSuchElementException();
-                }
-                Path path = entries.get(index++);
-                try {
-                    return readClassFile(path);
-                } catch (IOException e) {
-                    throw new ClassFileError(e);
-                }
-            }
-
-            public void remove() {
-                throw new UnsupportedOperationException("Not supported yet.");
+        @Override
+        public void forEachClassFile(Consumer<ClassModel> handler) throws IOException {
+            try (Stream<Path> stream = Files.walk(path, Integer.MAX_VALUE)) {
+                stream.filter(ClassFileReader::isClass)
+                      .forEach(e -> {
+                          try {
+                              handler.accept(readClassFile(e));
+                          } catch (ClassFileError | IOException ex) {
+                              skipEntry(ex, e.toString());
+                          }
+                      });
             }
         }
     }
@@ -314,14 +272,15 @@ private static JarFile openJarFile(File f, Runtime.Version version)
             return jf;
         }
 
+        private static boolean isJarEntryClass(JarEntry e) {
+            return e.getName().endsWith(".class");
+        }
+
         protected Set<String> scan() {
-            try (JarFile jf = openJarFile(path.toFile(), version)) {
-                return jf.versionedStream().map(JarEntry::getName)
-                         .filter(n -> n.endsWith(".class"))
-                         .collect(Collectors.toSet());
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
+            return jarfile.versionedStream()
+                          .filter(JarFileReader::isJarEntryClass)
+                          .map(JarEntry::getName)
+                          .collect(Collectors.toSet());
         }
 
         public ClassModel getClassFile(String name) throws IOException {
@@ -358,76 +317,17 @@ protected ClassModel readClassFile(JarFile jarfile, JarEntry e) throws IOExcepti
             }
         }
 
-        public Iterable<ClassModel> getClassFiles() throws IOException {
-            final Iterator<ClassModel> iter = new JarFileIterator(this, jarfile);
-            return () -> iter;
-        }
-    }
-
-    class JarFileIterator implements Iterator<ClassModel> {
-        protected final JarFileReader reader;
-        protected Iterator<JarEntry> entries;
-        protected JarFile jf;
-        protected JarEntry nextEntry;
-        protected ClassModel cf;
-        JarFileIterator(JarFileReader reader) {
-            this(reader, null);
-        }
-        JarFileIterator(JarFileReader reader, JarFile jarfile) {
-            this.reader = reader;
-            setJarFile(jarfile);
-        }
-
-        void setJarFile(JarFile jarfile) {
-            if (jarfile == null) return;
-
-            this.jf = jarfile;
-            this.entries = jarfile.versionedStream().iterator();
-            this.nextEntry = nextEntry();
-        }
-
-        public boolean hasNext() {
-            if (nextEntry != null && cf != null) {
-                return true;
-            }
-            while (nextEntry != null) {
-                try {
-                    cf = reader.readClassFile(jf, nextEntry);
-                    return true;
-                } catch (ClassFileError | IOException ex) {
-                    skippedEntries.add(String.format("%s: %s (%s)",
-                                                     ex.getMessage(),
-                                                     nextEntry.getName(),
-                                                     jf.getName()));
-                }
-                nextEntry = nextEntry();
-            }
-            return false;
-        }
-
-        public ClassModel next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            ClassModel classFile = cf;
-            cf = null;
-            nextEntry = nextEntry();
-            return classFile;
-        }
-
-        protected JarEntry nextEntry() {
-            while (entries.hasNext()) {
-                JarEntry e = entries.next();
-                String name = e.getName();
-                if (name.endsWith(".class")) {
-                    return e;
-                }
-            }
-            return null;
-        }
-
-        public void remove() {
-            throw new UnsupportedOperationException("Not supported yet.");
+        @Override
+        public void forEachClassFile(Consumer<ClassModel> handler) throws IOException {
+            jarfile.versionedStream()
+                   .filter(JarFileReader::isJarEntryClass)
+                   .forEach(e -> {
+                       try {
+                           handler.accept(readClassFile(jarfile, e));
+                       } catch (ClassFileError | IOException ex) {
+                           skipEntry(ex, e.getName() + " (" + jarfile.getName() + ")");
+                       }
+                   });
         }
     }
 }
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 90682c478c7..d7df5ba77c2 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
@@ -79,7 +79,7 @@ public static class ClassFileError extends Error {
         private static final long serialVersionUID = 4111110813961313203L;
 
         public ClassFileError(Throwable cause) {
-            initCause(cause);
+            super(cause.getMessage(), cause);
         }
     }
 
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
index 179043bc578..d2bf83a50b0 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 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
@@ -173,9 +173,9 @@ private Optional<FutureTask<Set<Location>>> parse(Archive archive, Finder finder
         trace("parsing %s %s%n", archive.getName(), archive.getPathName());
         FutureTask<Set<Location>> task = new FutureTask<>(() -> {
             Set<Location> targets = new HashSet<>();
-            for (var cf : archive.reader().getClassFiles()) {
+            archive.reader().forEachClassFile(cf -> {
                 if (cf.isModuleInfo())
-                    continue;
+                    return;
 
                 String classFileName;
                 try {
@@ -187,11 +187,11 @@ private Optional<FutureTask<Set<Location>>> parse(Archive archive, Finder finder
                 // filter source class/archive
                 String cn = classFileName.replace('/', '.');
                 if (!finder.accept(archive, cn, cf.flags()))
-                    continue;
+                    return;
 
                 // tests if this class matches the -include
                 if (!filter.matches(cn))
-                    continue;
+                    return;
 
                 for (Dependency d : finder.findDependencies(cf)) {
                     if (filter.accepts(d)) {
@@ -203,7 +203,7 @@ private Optional<FutureTask<Set<Location>>> parse(Archive archive, Finder finder
                     }
                     parsedClasses.putIfAbsent(d.getOrigin(), archive);
                 }
-            }
+            });
             return targets;
         });
         tasks.add(task);
diff --git a/test/langtools/tools/jdeps/MalformedClassesTest.java b/test/langtools/tools/jdeps/MalformedClassesTest.java
new file mode 100644
index 00000000000..baa94ad78e2
--- /dev/null
+++ b/test/langtools/tools/jdeps/MalformedClassesTest.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.
+ */
+
+/*
+ * @test
+ * @bug 8341608
+ * @summary Tests for jdeps tool with jar files with malformed classes
+ * @library lib /test/lib
+ * @build jdk.jdeps/com.sun.tools.jdeps.*
+ * @run junit MalformedClassesTest
+ */
+
+import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassTransform;
+import java.lang.classfile.attribute.SignatureAttribute;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.sun.tools.jdeps.JdepsAccess;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.util.JarUtils;
+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;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class MalformedClassesTest {
+
+    static Stream<Arguments> invalidArchives() throws Exception {
+        var jarPath = Path.of("malformed-signature.jar");
+        var compiledClasses = InMemoryJavaCompiler.compile(Map.ofEntries(
+                Map.entry("one.One", """
+                          package one;
+
+                          import java.util.Optional;
+
+                          class One {
+                              Optional<String> st = Optional.empty();
+                          }
+                          """),
+                Map.entry("two.Two", """
+                          package two;
+
+                          import java.lang.invoke.*;
+
+                          class Two {
+                              int i;
+                              static final VarHandle I;
+
+                              static {
+                                  try {
+                                      I = MethodHandles.lookup().findVarHandle(Two.class, "i", int.class);
+                                  } catch (ReflectiveOperationException ex) {
+                                      throw new ExceptionInInitializerError(ex);
+                                  }
+                              }
+                          }
+                          """)
+        ));
+        var updated = ClassFile.of().transformClass(ClassFile.of().parse(compiledClasses.get("one.One")),
+                ClassTransform.transformingFields((fb, fe) -> {
+                    if (fe instanceof SignatureAttribute) {
+                        fb.with(SignatureAttribute.of(fb.constantPool().utf8Entry("Invalid string")));
+                    } else {
+                        fb.with(fe);
+                    }
+                }));
+        var classes = new HashMap<>(compiledClasses);
+        classes.put("one.One", updated);
+        JarUtils.createJarFromClasses(jarPath, classes);
+
+        Path flatDir = Path.of("flatDir");
+        Files.createDirectories(flatDir);
+        for (var entry : classes.entrySet()) {
+            ClassFileInstaller.writeClassToDisk(entry.getKey(), entry.getValue(), flatDir.toString());
+        }
+
+        return Stream.of(
+                Arguments.of("directory", flatDir, "One.class"),
+                Arguments.of("jar", jarPath, "one/One.class (malformed-signature.jar)")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("invalidArchives")
+    public void testMalformedSignature(String kind, Path path, String entryName) throws IOException {
+        try (var jdeps = JdepsUtil.newCommand("jdeps")) {
+            jdeps.addRoot(path);
+            var analyzer = jdeps.getDepsAnalyzer();
+            analyzer.run();
+            var archives = JdepsAccess.depsAnalyzerArchives(analyzer);
+            assertEquals(1, archives.size(), archives::toString);
+            var archive = archives.iterator().next();
+            var skippedEntries = archive.reader().skippedEntries();
+            assertEquals(1, skippedEntries.size(), skippedEntries::toString);
+            var message = skippedEntries.getFirst();
+            assertTrue(message.contains("ClassFileError"), message);
+            assertTrue(message.contains("Invalid string"), message);
+            assertTrue(message.contains(entryName), "\"" + message + "\" does not contain \"" + entryName + "\"");
+        }
+    }
+}
diff --git a/test/langtools/tools/jdeps/TEST.properties b/test/langtools/tools/jdeps/TEST.properties
new file mode 100644
index 00000000000..56b5043d3c1
--- /dev/null
+++ b/test/langtools/tools/jdeps/TEST.properties
@@ -0,0 +1,2 @@
+modules = \
+    jdk.jdeps/com.sun.tools.jdeps
diff --git a/test/langtools/tools/jdeps/jdk.jdeps/com/sun/tools/jdeps/JdepsAccess.java b/test/langtools/tools/jdeps/jdk.jdeps/com/sun/tools/jdeps/JdepsAccess.java
new file mode 100644
index 00000000000..16229153e13
--- /dev/null
+++ b/test/langtools/tools/jdeps/jdk.jdeps/com/sun/tools/jdeps/JdepsAccess.java
@@ -0,0 +1,34 @@
+/*
+ * 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 com.sun.tools.jdeps;
+
+import java.util.Set;
+
+public final class JdepsAccess {
+    public static Set<Archive> depsAnalyzerArchives(DepsAnalyzer analyzer) {
+        return analyzer.archives;
+    }
+
+    private JdepsAccess() {}
+}
diff --git a/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java b/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java
index 4722ef3b67a..7a289bbcce5 100644
--- a/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java
+++ b/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.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
@@ -208,8 +208,10 @@ public String getClassName() {
     }
 
     /**
-     * Compiles the list of classes with the given map of name and source code.
-     * This overloaded version of compile is useful for batch compile use cases.
+     * Compiles the list of classes with the given map of binary name and source code.
+     * This overloaded version of compile is useful for batch compile use cases, or
+     * if a compilation unit produces multiple class files. Returns a map from
+     * class binary names to class file content.
      *
      * @param inputMap The map containing the name of the class and corresponding source code
      * @throws RuntimeException if the compilation did not succeed
diff --git a/test/lib/jdk/test/lib/util/JarUtils.java b/test/lib/jdk/test/lib/util/JarUtils.java
index 3aa4ada5197..9a3d73ee410 100644
--- a/test/lib/jdk/test/lib/util/JarUtils.java
+++ b/test/lib/jdk/test/lib/util/JarUtils.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
@@ -131,6 +131,24 @@ public static void createJarFile(Path jarfile, Path dir, String... input)
         createJarFile(jarfile, dir, paths);
     }
 
+
+    /**
+     * Creates a JAR file from a map of class binary name to class bytes.
+     *
+     * @see jdk.test.lib.compiler.InMemoryJavaCompiler#compile(Map)
+     */
+    public static void createJarFromClasses(Path jarfile, Map<String, byte[]> classes) throws IOException {
+        try (OutputStream out = Files.newOutputStream(jarfile);
+             JarOutputStream jos = new JarOutputStream(out)) {
+            for (var entry : classes.entrySet()) {
+                String name = entry.getKey().replace('.', '/') + ".class";
+                jos.putNextEntry(new JarEntry(name));
+                jos.write(entry.getValue());
+                jos.closeEntry();
+            }
+        }
+    }
+
     /**
      * Updates a JAR file.
      *

From e2cb64674f5b6b4f000ab1e903fbb75416218bb3 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 05:56:07 +0000
Subject: [PATCH 032/901] 8343977: Convert
 java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest to main

Reviewed-by: prr, achung
---
 .../HoveringAndDraggingTest.html              |  43 ---
 .../HoveringAndDraggingTest.java              | 285 ++++++------------
 2 files changed, 99 insertions(+), 229 deletions(-)
 delete mode 100644 test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html

diff --git a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html
deleted file mode 100644
index 9fc7f55ceba..00000000000
--- a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- or visit www.oracle.com if you need additional information or have any
- questions.
--->
-
-<html>
-<!--  
-  @test
-  @bug 6497109
-  @summary Mouse cursor icons for TextArea should be correct in case of hovering or dragging mouse over different subcomponents.
-  @author Konstantin Voloshin: area=awt.TextArea
-  @run applet/manual=yesno HoveringAndDraggingTest.html
-  -->
-<head>
-<title> HoveringAndDraggingTest </title>
-</head>
-<body>
-
-<h1>HoveringAndDraggingTest<br>Bug ID: 6497109</h1>
-
-<p> See the dialog box (usually in upper left corner) for instructions</p>
-
-<APPLET CODE="HoveringAndDraggingTest.class" WIDTH=200 HEIGHT=200></APPLET>
-</body>
-</html>
diff --git a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
index 753fc490967..646bc6aa6b9 100644
--- a/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
+++ b/test/jdk/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,71 +21,122 @@
  * questions.
  */
 
-/*
-  test
-  @bug 6497109
-  @summary Mouse cursor icons for TextArea should be correct in case of hovering or dragging mouse over different subcomponents.
-  @author Konstantin Voloshin: area=awt.TextArea
-  @run applet/manual=yesno HoveringAndDraggingTest.html
-*/
-
-/**
- * HoveringAndDraggingTest.java
- *
- * summary: Mouse cursor icons for TextArea should be correct in case
- *   of hovering or dragging mouse over different subcomponents.
- */
-
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.Frame;
-import java.awt.Panel;
+import java.awt.GridBagLayout;
 import java.awt.GridLayout;
+import java.awt.Panel;
 import java.awt.TextArea;
-import java.awt.Dialog;
+import java.util.concurrent.CountDownLatch;
 
-public class HoveringAndDraggingTest extends java.applet.Applet {
-    public void start() {
-        String[] instructions = new String[] {
-            "1. Notice components in test window: main-panel, box-for-text,"
-                +" 2 scroll-sliders, and 4 scroll-buttons.",
-            "2. Hover mouse over box-for-text."
-                +" Make sure, that mouse cursor is TextCursor (a.k.a. \"beam\").",
-            "3. Hover mouse over each of components (see item 1), except for box-for-text."
-                +" Make sure, that cursor is DefaultCursor (arrow).",
-            "4. Drag mouse (using any mouse button) from box-for-text to every"
-                +" component in item 1, and also outside application window."
-                +" Make sure, that cursor remains TextCursor while mouse button is pressed.",
-            "5. Repeat item 4 for each other component in item 1, except for box-for-text,"
-                +" _but_ now make sure that cursor is DefaultCursor.",
-            "6. If cursor behaves as described in items 2-3-4-5, then test passed; otherwise it failed."
-        };
-        Sysout.createDialogWithInstructions( instructions );
+/*
+ * @test
+ * @bug 6497109
+ * @summary Mouse cursor icons for TextArea should be correct in case of
+ *  hovering or dragging mouse over different subcomponents.
+ * @run main/manual HoveringAndDraggingTest
+ */
+
+public class HoveringAndDraggingTest {
+    static Frame frame;
+    static Frame instructionsFrame;
+    static CountDownLatch countDownLatch;
+    public static CountDownLatch createCountDownLatch() {
+        return new CountDownLatch(1);
+    }
 
+    public static void main(String[] args) throws Exception {
+        countDownLatch = createCountDownLatch();
+        EventQueue.invokeAndWait(() -> {
+            initialize();
+            showInstructionFrame();
+        });
+        countDownLatch.await();
+        System.out.println("Test Pass");
+    }
+
+    public static void initialize() {
         Panel panel = new Panel();
-        panel.setLayout( new GridLayout(3,3) );
+        panel.setLayout(new GridLayout(3, 3));
 
-        for( int y=0; y<3; ++y ) {
-            for( int x=0; x<3; ++x ) {
-                if( x==1 && y==1 ) {
-                    panel.add( new TextArea( bigString() ) );
+        for (int y = 0; y < 3; ++y) {
+            for (int x = 0; x < 3; ++x) {
+                if (x == 1 && y == 1) {
+                    panel.add(new TextArea(bigString()));
                 } else {
-                    panel.add( new Panel() );
+                    panel.add(new Panel());
                 }
             }
         }
 
-        Frame frame = new Frame( "TextArea cursor icon test" );
-        frame.setSize( 300, 300 );
-        frame.add( panel );
-        frame.setVisible( true );
+        frame = new Frame("TextArea cursor icon test");
+        frame.setSize(300, 300);
+        frame.setLocation(450, 400);
+        frame.add(panel);
+        frame.setVisible(true);
+    }
+
+    static void showInstructionFrame() {
+        String INSTRUCTIONS = """
+                1. Notice components in test window: main-panel,box-for-text,
+                   2 scroll-sliders, and 4 scroll-buttons.
+                2. Hover mouse over box-for-text.
+                   Make sure, that mouse cursor is TextCursor(a.k.a. \"beam\").
+                3. Hover mouse over each of components (see item 1),
+                   except for box-for-text.
+                   Make sure, that cursor is DefaultCursor (arrow).
+                4. Drag mouse (using any mouse button) from box-for-text to every"
+                   component in item 1, and also outside application window."
+                   Make sure, that cursor remains TextCursor
+                   while mouse button is pressed.
+                5. Repeat item 4 for each other component in item 1,
+                   except for box-for-text
+                   _but_ now make sure that cursor is DefaultCursor.
+                6. If cursor behaves as described in items 2-3-4-5,
+                   then test is PASS otherwise it FAILED.
+                 """;
+        TextArea textArea = new TextArea(INSTRUCTIONS, 16, 65, TextArea.SCROLLBARS_NONE);
+        Button passBtn = new Button("PASS");
+        Button failBtn = new Button("FAIL");
+        Panel btnPanel = new Panel(new GridBagLayout());
+        Panel panel = new Panel(new GridBagLayout());
+        instructionsFrame = new Frame("Test Instructions");
+        passBtn.setMaximumSize(new Dimension(100, 30));
+        failBtn.setMaximumSize(new Dimension(100, 30));
+        btnPanel.add(passBtn);
+        btnPanel.add(failBtn);
+        passBtn.addActionListener(e -> disposeFrames());
+        failBtn.addActionListener(e -> {
+            disposeFrames();
+            throw new RuntimeException("Test Failed");
+        });
+        panel.add(textArea);
+        panel.add(btnPanel);
+        instructionsFrame.add(panel);
+        instructionsFrame.pack();
+        instructionsFrame.setLocation(300, 100);
+        instructionsFrame.setVisible(true);
+    }
+
+    static void disposeFrames() {
+        countDownLatch.countDown();
+        if (frame != null) {
+            frame.dispose();
+        }
+        if (instructionsFrame != null) {
+            instructionsFrame.dispose();
+        }
     }
 
     static String bigString() {
         String s = "";
-        for( int lines=0; ; ++lines ) {
-            for( int symbols=0; symbols<100; ++symbols ) {
+        for (int lines = 0; ; ++lines) {
+            for (int symbols = 0; symbols < 100; ++symbols) {
                 s += "0";
             }
-            if( lines<50 ) {
+            if (lines < 50) {
                 s += "\n";
             } else {
                 break;
@@ -94,141 +145,3 @@ static String bigString() {
         return s;
     }
 }
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
-  chunk of code whose purpose is to make user
-  interaction uniform, and thereby make it simpler
-  to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
-  for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
-  WithInstructions method.  Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
-  with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
-  as standalone.
- */
-
-class Sysout
-{
-    private static TestDialog dialog;
-
-    public static void createDialogWithInstructions( String[] instructions )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        dialog.printInstructions( instructions );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
-    }
-
-    public static void createDialog( )
-    {
-        dialog = new TestDialog( new Frame(), "Instructions" );
-        String[] defInstr = { "Instructions will appear here. ", "" } ;
-        dialog.printInstructions( defInstr );
-        dialog.setVisible(true);
-        println( "Any messages for the tester will display here." );
-    }
-
-
-    public static void printInstructions( String[] instructions )
-    {
-        dialog.printInstructions( instructions );
-    }
-
-
-    public static void println( String messageIn )
-    {
-        dialog.displayMessage( messageIn );
-    }
-
-}// Sysout  class
-
-/**
-  This is part of the standard test machinery.  It provides a place for the
-   test instructions to be displayed, and a place for interactive messages
-   to the user to be displayed.
-  To have the test instructions displayed, see Sysout.
-  To have a message to the user be displayed, see Sysout.
-  Do not call anything in this dialog directly.
-  */
-class TestDialog extends Dialog
-{
-
-    TextArea instructionsText;
-    TextArea messageText;
-    int maxStringLength = 80;
-
-    //DO NOT call this directly, go through Sysout
-    public TestDialog( Frame frame, String name )
-    {
-        super( frame, name );
-        int scrollBoth = TextArea.SCROLLBARS_BOTH;
-        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-        add( "North", instructionsText );
-
-        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-        add("Center", messageText);
-
-        pack();
-
-        setVisible(true);
-    }// TestDialog()
-
-    //DO NOT call this directly, go through Sysout
-    public void printInstructions( String[] instructions )
-    {
-        //Clear out any current instructions
-        instructionsText.setText( "" );
-
-        //Go down array of instruction strings
-
-        String printStr, remainingStr;
-        for( int i=0; i < instructions.length; i++ )
-        {
-            //chop up each into pieces maxSringLength long
-            remainingStr = instructions[ i ];
-            while( remainingStr.length() > 0 )
-            {
-                //if longer than max then chop off first max chars to print
-                if( remainingStr.length() >= maxStringLength )
-                {
-                    //Try to chop on a word boundary
-                    int posOfSpace = remainingStr.
-                        lastIndexOf( ' ', maxStringLength - 1 );
-
-                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
-                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
-                    remainingStr = remainingStr.substring( posOfSpace + 1 );
-                }
-                //else just print
-                else
-                {
-                    printStr = remainingStr;
-                    remainingStr = "";
-                }
-
-                instructionsText.append( printStr + "\n" );
-
-            }// while
-
-        }// for
-
-    }//printInstructions()
-
-    //DO NOT call this directly, go through Sysout
-    public void displayMessage( String messageIn )
-    {
-        messageText.append( messageIn + "\n" );
-        System.out.println(messageIn);
-    }
-
-}// TestDialog  class

From d1d7d2569c1745aef778c9b5a62c1bd50735e8a7 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 06:23:24 +0000
Subject: [PATCH 033/901] 8353957: Open source several AWT ScrollPane tests -
 Batch 1

Reviewed-by: psadhukhan
---
 test/jdk/ProblemList.txt                      |   1 +
 .../awt/ScrollPane/ScrollPaneFlicker.java     | 215 ++++++++++++++++++
 .../java/awt/ScrollPane/ScrollPanePaint.java  | 132 +++++++++++
 .../awt/ScrollPane/ScrollPositionTest.java    | 100 ++++++++
 .../ScrollPane/ScrollbarsAsNeededTest.java    |  72 ++++++
 5 files changed, 520 insertions(+)
 create mode 100644 test/jdk/java/awt/ScrollPane/ScrollPaneFlicker.java
 create mode 100644 test/jdk/java/awt/ScrollPane/ScrollPanePaint.java
 create mode 100644 test/jdk/java/awt/ScrollPane/ScrollPositionTest.java
 create mode 100644 test/jdk/java/awt/ScrollPane/ScrollbarsAsNeededTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index e1e0a695ebc..3fe0bcf8cdc 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -443,6 +443,7 @@ java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java 6848810 macosx-all
 java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
+java/awt/ScrollPane/ScrollPositionTest.java 8040070 linux-all
 java/awt/ScrollPane/ScrollPaneScrollType/ScrollPaneEventType.java 8296516 macosx-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
diff --git a/test/jdk/java/awt/ScrollPane/ScrollPaneFlicker.java b/test/jdk/java/awt/ScrollPane/ScrollPaneFlicker.java
new file mode 100644
index 00000000000..3594ff50f54
--- /dev/null
+++ b/test/jdk/java/awt/ScrollPane/ScrollPaneFlicker.java
@@ -0,0 +1,215 @@
+/*
+ * 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 4073822
+ * @summary ScrollPane repaints entire window when scrolling fast
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollPaneFlicker
+ */
+
+import java.awt.Button;
+import java.awt.Canvas;
+import java.awt.Checkbox;
+import java.awt.Choice;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Label;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.ScrollPane;
+import java.awt.Scrollbar;
+import java.awt.TextArea;
+import java.awt.TextField;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+public class ScrollPaneFlicker {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                When scrolling a ScrollPane fast(i.e. holding the down/up arrow
+                down for a while), the ScrollPane would inexplicably refresh
+                the entire window.
+
+                1. Select a type of ScrollPane content from the content menu.
+                2. Scroll the content using the up/down/left/right arrows on
+                   the scroll bar. Try scrolling the entire content area using
+                   the scroll arrows-- from top to bottom and left to right.
+                3. Verify that the entire pane does not refresh when scrolling
+                   - only the newly exposed areas should be repainting.
+                4. Repeat for all content types.
+                """;
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ScrollPaneFlicker::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        return new FlickerFrame();
+    }
+}
+
+class FlickerFrame extends Frame {
+    ScrollPane pane;
+
+    public FlickerFrame() {
+        super("ScrollPane Flicker Test");
+        TextPanel textPanel = new TextPanel();
+        GradientPanel gradientPanel = new GradientPanel();
+        ComponentPanel componentPanel = new ComponentPanel();
+        SwingPanel swingPanel = new SwingPanel();
+        MenuBar menubar = new MenuBar();
+        Menu testMenu = new Menu("Test Options");
+
+        pane = new ScrollPane();
+        pane.getHAdjustable().setUnitIncrement(8);
+        pane.getVAdjustable().setUnitIncrement(16);
+        pane.add(textPanel);
+        add(pane);
+
+        testMenu.add(makeContentItem("Text Lines", textPanel));
+        testMenu.add(makeContentItem("Gradient Fill", gradientPanel));
+        testMenu.add(makeContentItem("AWT Components", componentPanel));
+        testMenu.add(makeContentItem("Swing Components", swingPanel));
+        menubar.add(testMenu);
+
+        setMenuBar(menubar);
+        setSize(400, 300);
+    }
+
+    public MenuItem makeContentItem(String title, final Component content) {
+        MenuItem menuItem = new MenuItem(title);
+        menuItem.addActionListener(
+                ev -> {
+                    pane.add(content);
+                    pane.validate();
+                }
+        );
+        return menuItem;
+    }
+}
+
+class GradientPanel extends Canvas {
+    public void paint(Graphics g) {
+        // just paint something that'll take a while
+        int x, y;
+        int width = getSize().width;
+        int height = getSize().height;
+        int step = 8;
+
+        for (x = 0; x < width; x += step) {
+            for (y = 0; y < height; y += step) {
+                int red = (255 * y) / height;
+                int green = (255 * x * y) / (width * height);
+                int blue = (255 * x) / width;
+                Rectangle bounds = g.getClipBounds();
+                Rectangle fbounds = new Rectangle(x, y, x + step, y + step);
+                if (bounds.intersects(fbounds)) {
+                    Color color = new Color(red, green, blue);
+                    g.setColor(color);
+                    g.fillRect(x, y, x + step, y + step);
+                }
+            }
+        }
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(200, 1000);
+    }
+}
+
+class TextPanel extends Canvas {
+    public void paint(Graphics g) {
+        Font font = new Font("SanSerif", Font.ITALIC, 12);
+
+        g.setFont(font);
+        // just paint something that'll take a while
+        int x, y;
+        int width = getWidth();
+        int height = getHeight();
+        int step = 16;
+
+        for (x = y = 0; y < height; y += step) {
+            Rectangle bounds = g.getClipBounds();
+            Rectangle tbounds = new Rectangle(x, y - 16, x + width, y);
+            if (bounds.intersects(tbounds)) {
+                g.drawString(y + " : The quick brown fox jumps over the lazy dog. " +
+                        "The rain in Spain falls mainly on the plain.", x, y);
+            }
+        }
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(640, 1000);
+    }
+}
+
+class ComponentPanel extends Panel {
+    ComponentPanel() {
+        add(new Label("Label"));
+        add(new Button("Button"));
+        add(new Checkbox("Checkbox"));
+        Choice c = new Choice();
+        c.add("choice");
+        java.awt.List l = new java.awt.List();
+        l.add("list");
+        add(new Scrollbar());
+        add(new TextField("TextField"));
+        add(new TextArea("TextArea"));
+        add(new Panel());
+        add(new Canvas());
+    }
+}
+
+class SwingPanel extends JPanel {
+    SwingPanel() {
+        add(new JLabel("JLabel"));
+        add(new JButton("JButton"));
+        add(new JCheckBox("JCheckBox"));
+        JComboBox c = new JComboBox();
+        JList l = new JList();
+        add(new JScrollBar());
+        add(new JTextField("This is a JTextField with some text in it to make it longer."));
+        add(new JTextArea("This is a JTextArea with some text in it to make it longer."));
+    }
+}
diff --git a/test/jdk/java/awt/ScrollPane/ScrollPanePaint.java b/test/jdk/java/awt/ScrollPane/ScrollPanePaint.java
new file mode 100644
index 00000000000..0d7b7779018
--- /dev/null
+++ b/test/jdk/java/awt/ScrollPane/ScrollPanePaint.java
@@ -0,0 +1,132 @@
+/*
+ * 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.
+ */
+
+/*
+ * Licensed Materials - Property of IBM
+ *
+ * (C) Copyright IBM Corporation 1998  All Rights Reserved.
+ *
+ * US Government Users Restricted Rights - Use, duplication or disclosure
+ * restricted by GSA ADP Schedule Contract with IBM Corp.
+ */
+
+/*
+ * @test
+ * @bug 4160721
+ * @summary AWT ScrollPane painting problem
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollPanePaint
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Panel;
+import java.awt.ScrollPane;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+public class ScrollPanePaint {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Press the button marked "Toggle" a few times.
+                2. The contents of the frame should alternate between
+                    a red panel and a scroll pane containing a green panel.
+                    If this does not happen (specifically, if the scroll
+                    pane does not consistently contain a green panel),
+                    then the test has FAILED.
+                """;
+        ScrollPaintTest scrollPaintTest = new ScrollPaintTest();
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(scrollPaintTest::initialize)
+                .positionTestUI(WindowLayouts::rightOneColumn)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static class ScrollPaintTest implements ActionListener {
+        static Frame f;
+        static boolean showScroll;
+
+        public List<Frame> initialize() {
+            Frame frame = new Frame("Scrollpane paint test");
+            frame.setLayout(new BorderLayout());
+            f = new Frame("Scrollpane paint test");
+            f.setLayout(new GridLayout(0, 1));
+
+            Button b = new Button("Toggle");
+            b.addActionListener(this);
+
+            frame.add(b, BorderLayout.CENTER);
+            frame.pack();
+
+            showScroll = false;
+            actionPerformed(null);
+            return List.of(frame, f);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            Container c;
+            if (!showScroll) {
+                c = (Container) new TestPanel(new Dimension(100, 100));
+                c.setBackground(Color.red);
+            } else {
+                c = new ScrollPane(ScrollPane.SCROLLBARS_ALWAYS);
+                Panel p = new TestPanel(new Dimension(20, 20));
+                p.setBackground(Color.green);
+                c.add(p);
+            }
+
+            f.removeAll();
+            f.add("Center", c);
+            f.pack();
+            showScroll = !showScroll;
+        }
+    }
+
+    private static class TestPanel extends Panel {
+        Dimension dim;
+
+        TestPanel(Dimension d) {
+            dim = d;
+        }
+
+        public Dimension getMinimumSize() {
+            return getPreferredSize();
+        }
+
+        public Dimension getPreferredSize() {
+            return dim;
+        }
+    }
+
+}
diff --git a/test/jdk/java/awt/ScrollPane/ScrollPositionTest.java b/test/jdk/java/awt/ScrollPane/ScrollPositionTest.java
new file mode 100644
index 00000000000..9c082a8dfc9
--- /dev/null
+++ b/test/jdk/java/awt/ScrollPane/ScrollPositionTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4008152
+ * @summary ScrollPane position does not return correct values
+ * @key headful
+ * @run main ScrollPositionTest
+ */
+
+import java.awt.Adjustable;
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.ScrollPane;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+
+public class ScrollPositionTest {
+    static Frame frame;
+    static int i = 0;
+    static Point p;
+    static ScrollPane sp;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(() -> {
+                frame = new Frame("Scroll Position Test");
+                frame.setLayout(new BorderLayout());
+                frame.setSize(200, 200);
+                sp = new ScrollPane(ScrollPane.SCROLLBARS_AS_NEEDED);
+                Canvas canvas = new Canvas();
+                canvas.setSize(300, 300);
+                sp.add(canvas);
+                frame.add("Center", sp);
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            EventQueue.invokeAndWait(() -> {
+                Adjustable saH = sp.getHAdjustable();
+                saH.addAdjustmentListener(new TestAdjustmentListener());
+            });
+            for (i = 0; i < 1000; i++) {
+                EventQueue.invokeAndWait(() -> {
+                    p = new Point(i % 100, i % 100);
+                    sp.setScrollPosition(p);
+                });
+
+                robot.waitForIdle();
+                robot.delay(10);
+                EventQueue.invokeAndWait(() -> {
+                    if (!sp.getScrollPosition().equals(p)) {
+                        throw new RuntimeException("Test failed. " + i + " : " +
+                                "Expected " + p + ", but Returned: " + sp.getScrollPosition());
+                    }
+                });
+            }
+            System.out.println("Test Passed.");
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static class TestAdjustmentListener implements AdjustmentListener {
+        public void adjustmentValueChanged(AdjustmentEvent e) {
+            System.out.println("AdjEvent caught:" + e);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/ScrollPane/ScrollbarsAsNeededTest.java b/test/jdk/java/awt/ScrollPane/ScrollbarsAsNeededTest.java
new file mode 100644
index 00000000000..c5f48f80007
--- /dev/null
+++ b/test/jdk/java/awt/ScrollPane/ScrollbarsAsNeededTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4094248
+ * @summary Test initial appearance of SCROLLBARS_AS_NEEDED policy
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ScrollbarsAsNeededTest
+ */
+
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.ScrollPane;
+
+public class ScrollbarsAsNeededTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. A Frame window with a ScrollPane that is
+                   initially created with the SCROLLBARS_AS_NEEDED policy.
+                2. If there are no scrollbars around the ScrollPane then
+                    the test PASS. Otherwise the test FAILS.
+                """;
+        PassFailJFrame.builder()
+                .title("Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ScrollbarsAsNeededTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame frame = new Frame("Scrollbar as needed test");
+        ScrollPane scrollPane = new ScrollPane() {
+            @Override
+            public void paint(Graphics g) {
+                super.paint(g);
+                g.drawString("ScrollPane", 10, 50);
+            }
+        };
+        scrollPane.setBackground(Color.WHITE);
+        frame.setBackground(Color.GRAY);
+        frame.setSize(200, 200);
+        frame.setLayout(new FlowLayout());
+        frame.add(scrollPane);
+        return frame;
+    }
+}

From 33bdc807b18914bb57ca7853ab45d4fa8fdefd47 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Tue, 22 Apr 2025 06:51:18 +0000
Subject: [PATCH 034/901] 8355241: Move NativeDialogToFrontBackTest.java PL
 test to manual category

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3fe0bcf8cdc..841b1110506 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -392,7 +392,6 @@ java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java 8198665 macosx-all
-java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java 8177326 macosx-all
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8005021 macosx-all
 java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java 8051455 macosx-all
@@ -820,3 +819,4 @@ java/awt/Checkbox/CheckboxBoxSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxIndicatorSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all
 java/awt/dnd/WinMoveFileToShellTest.java 8341665 windows-all
+java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all

From a55ccd267cdfbb7a52c0647fa3b2f93b36b1805f Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 07:04:26 +0000
Subject: [PATCH 035/901] 8352905: Open some JComboBox bugs 1

Reviewed-by: honkar, psadhukhan
---
 .../jdk/javax/swing/JComboBox/bug4166593.java |  98 ++++++++++++
 .../jdk/javax/swing/JComboBox/bug4180054.java | 112 +++++++++++++
 .../jdk/javax/swing/JComboBox/bug4530952.java | 147 ++++++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4530953.java |  98 ++++++++++++
 4 files changed, 455 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4166593.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4180054.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4530952.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4530953.java

diff --git a/test/jdk/javax/swing/JComboBox/bug4166593.java b/test/jdk/javax/swing/JComboBox/bug4166593.java
new file mode 100644
index 00000000000..850aab2261f
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4166593.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+import java.awt.Robot;
+import java.awt.event.ActionListener;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4166593
+ * @summary Tests that JComboBox fires action events every time the user does an action
+ * @key headful
+ * @run main bug4166593
+ */
+
+public class bug4166593 {
+    static JFrame frame;
+    static JComboBox comboBox;
+    static volatile int numberOfActionEvents = 0;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(250);
+
+            // change selected index 3 times
+            SwingUtilities.invokeAndWait(() -> {
+                comboBox.setSelectedIndex(1);
+                comboBox.setSelectedIndex(3);
+                comboBox.setSelectedIndex(2);
+            });
+            robot.waitForIdle();
+            robot.delay(250);
+
+            if (numberOfActionEvents != 3) {
+                throw new RuntimeException("Unexpected number of Action Events!\n" +
+                        "Expected: 3\nActual: " + numberOfActionEvents);
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        comboBox = new JComboBox(new Object[]{
+                "Bob", "Fred", "Hank", "Joe", "Mildred", "Agatha", "Buffy"
+        });
+        JPanel panel = new JPanel();
+        JLabel label = new JLabel("0");
+        frame = new JFrame("bug4166593");
+        comboBox.setEditable(true);
+
+        ActionListener actionCounter = e -> {
+            ++numberOfActionEvents;
+            label.setText(Integer.toString(numberOfActionEvents));
+        };
+
+        comboBox.addActionListener(actionCounter);
+
+        panel.add(comboBox);
+        panel.add(label);
+
+        frame.add(panel);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4180054.java b/test/jdk/javax/swing/JComboBox/bug4180054.java
new file mode 100644
index 00000000000..cee68dfcb9c
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4180054.java
@@ -0,0 +1,112 @@
+/*
+ * 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.
+ */
+
+import java.awt.Robot;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+
+/*
+ * @test
+ * @bug 4180054
+ * @summary Tests that DefaultComboBoxModel doesn't fire a "contents changed" unnecessarily
+ * @key headful
+ * @run main bug4180054
+ */
+
+public class bug4180054 {
+    static JFrame frame;
+    static JComboBox comboBox;
+    static volatile int numberOfContentsChangedEvents = 0;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(250);
+
+            // change selected index 3 times
+            SwingUtilities.invokeAndWait(() -> {
+                comboBox.setSelectedIndex(1);
+                comboBox.setSelectedIndex(3);
+                comboBox.setSelectedIndex(2);
+                comboBox.setSelectedIndex(2);
+            });
+            robot.waitForIdle();
+            robot.delay(250);
+
+            if (numberOfContentsChangedEvents != 3) {
+                throw new RuntimeException("Unexpected number of Contents Changed Events!\n" +
+                        "Expected: 3\nActual: " + numberOfContentsChangedEvents);
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4180054");
+        JPanel panel = new JPanel();
+        JLabel label = new JLabel("0");
+
+        DefaultComboBoxModel model = new DefaultComboBoxModel();
+        for (int i = 0; i < 100; ++i) {
+            model.addElement(Integer.toString(i));
+        }
+        comboBox = new JComboBox(model);
+        comboBox.setEditable(true);
+
+        ListDataListener contentsCounter = new ListDataListener() {
+            public void contentsChanged(ListDataEvent e) {
+                ++numberOfContentsChangedEvents;
+                label.setText(Integer.toString(numberOfContentsChangedEvents));
+            }
+
+            public void intervalAdded(ListDataEvent e) {
+            }
+
+            public void intervalRemoved(ListDataEvent e) {
+            }
+        };
+
+        comboBox.getModel().addListDataListener(contentsCounter);
+
+        panel.add(comboBox);
+        panel.add(label);
+
+        frame.add(panel);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4530952.java b/test/jdk/javax/swing/JComboBox/bug4530952.java
new file mode 100644
index 00000000000..cf960d64c9a
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4530952.java
@@ -0,0 +1,147 @@
+/*
+ * 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.
+ */
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/*
+ * @test
+ * @bug 4530952
+ * @summary Tests that double mouse clicks invoke Event
+ * @key headful
+ * @run main bug4530952
+ */
+
+public class bug4530952 {
+    static JFrame frame;
+    static JButton btnAction;
+    static JComboBox cmbAction;
+    static volatile Point loc;
+    static volatile Dimension btnSize;
+
+    private static volatile boolean flag;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            // enter some text in combo box
+            robot.keyPress(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_A);
+            robot.keyPress(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_A);
+            robot.waitForIdle();
+            robot.delay(250);
+
+            // find and click action button
+            SwingUtilities.invokeAndWait(() -> {
+                loc = btnAction.getLocationOnScreen();
+                btnSize = btnAction.getSize();
+            });
+            robot.waitForIdle();
+            robot.delay(250);
+
+            robot.mouseMove(loc.x + btnSize.width / 2,
+                    loc.y + btnSize.height / 2);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            if (!flag) {
+                throw new RuntimeException("Failed: button action was not fired");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4530952");
+        frame.setLayout(new FlowLayout());
+
+        btnAction = new JButton("Action");
+        cmbAction = new JComboBox();
+
+        flag = false;
+
+        ActionListener al = e -> flag = true;
+        DocumentListener dl = new DocumentListener() {
+            @Override
+            public void changedUpdate(DocumentEvent evt) {
+                resetButtons();
+            }
+
+            @Override
+            public void insertUpdate(DocumentEvent evt) {
+                resetButtons();
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent evt) {
+                resetButtons();
+            }
+        };
+
+        // Add an editable combo box
+        cmbAction.setEditable(true);
+        frame.add(cmbAction);
+
+        btnAction.setEnabled(false);
+        frame.add(btnAction);
+
+        btnAction.addActionListener(al);
+        ((JTextField) cmbAction.getEditor().getEditorComponent()).
+                getDocument().addDocumentListener(dl);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    public static void resetButtons() {
+        int length = ((JTextField) cmbAction.getEditor().getEditorComponent()).
+                getDocument().getLength();
+        btnAction.setEnabled(length > 0);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4530953.java b/test/jdk/javax/swing/JComboBox/bug4530953.java
new file mode 100644
index 00000000000..a9f0c70b9bc
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4530953.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4530953
+ * @summary Tests that highlighted Item appears after automatically scrolling to the item
+ * @key headful
+ * @run main bug4530953
+ */
+
+public class bug4530953 {
+    static JFrame frame;
+    static JComboBox combo;
+    static String[] data = {"Apple", "Orange", "Cherry"};
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(250);
+
+            // enter some text in combo box editor
+            robot.keyPress(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_A);
+            robot.keyPress(KeyEvent.VK_A);
+            robot.keyRelease(KeyEvent.VK_A);
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+            robot.waitForIdle();
+            robot.delay(250);
+
+            // select orange in combo box
+            robot.keyPress(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_DOWN);
+            robot.keyPress(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_DOWN);
+            robot.keyPress(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_DOWN);
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+            robot.waitForIdle();
+            robot.delay(250);
+
+            String currSelection = (String) combo.getEditor().getItem();
+            if (!currSelection.equals("Orange")) {
+                throw new RuntimeException("Unexpected Selection.\n" +
+                        "Expected: Orange\nActual: " + currSelection);
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4530953");
+        combo = new JComboBox(data);
+        combo.setEditable(true);
+        combo.setSelectedIndex(1);
+        frame.setLayout(new FlowLayout());
+        frame.add(combo);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}

From 2f7806ffe5b5b4b2f7caa14d4559943968c34678 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 22 Apr 2025 07:07:31 +0000
Subject: [PATCH 036/901] 8355034: [JVMCI]
 assert(static_cast<int>(_jvmci_data_size) == align_up(compiler->is_jvmci() ?
 jvmci_data->size() : 0, oopSize)) failed: failed: 104 != 16777320

Reviewed-by: never, yzheng, cslucas
---
 src/hotspot/share/code/nmethod.cpp            |  2 +-
 .../share/jvmci/jvmciCodeInstaller.cpp        |  8 ++-
 .../classes/jdk/vm/ci/code/InstalledCode.java | 19 ++++++-
 .../vm/ci/code/test/InstalledCodeTest.java    | 57 +++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InstalledCodeTest.java

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 01ace66f4de..56ba76a806e 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -112,7 +112,7 @@
 // Cast from int value to narrow type
 #define CHECKED_CAST(result, T, thing)      \
   result = static_cast<T>(thing); \
-  assert(static_cast<int>(result) == thing, "failed: %d != %d", static_cast<int>(result), thing);
+  guarantee(static_cast<int>(result) == thing, "failed: %d != %d", static_cast<int>(result), thing);
 
 //---------------------------------------------------------------------------------
 // NMethod statistics
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index 79aaacec809..3a9fbc54bf9 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -825,7 +825,13 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
         // Since this compilation didn't pass through the broker it wasn't logged yet.
         if (PrintCompilation) {
           ttyLocker ttyl;
-          CompileTask::print(tty, nm, "(hosted JVMCI compilation)");
+          if (name != nullptr) {
+            stringStream st;
+            st.print_cr("(hosted JVMCI compilation: %s)", name);
+            CompileTask::print(tty, nm, st.as_string());
+          } else {
+            CompileTask::print(tty, nm, "(hosted JVMCI compilation)");
+          }
         }
       }
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/InstalledCode.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/InstalledCode.java
index 489cca81c7b..62c0b609146 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/InstalledCode.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/InstalledCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, 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
@@ -46,7 +46,24 @@ public class InstalledCode {
 
     protected final String name;
 
+    /**
+     * The maximum length of an InstalledCode name. This name is typically installed into
+     * the code cache so it should have a reasonable limit.
+     */
+    public static final int MAX_NAME_LENGTH = 2048;
+
+    /**
+     * @param name the name to be associated with the installed code. Can be null and
+     *        must be no longer than {@link #MAX_NAME_LENGTH}.
+     *
+     * @throws IllegalArgumentException if {@code name.length >} {@link #MAX_NAME_LENGTH}
+     */
     public InstalledCode(String name) {
+        if (name != null && name.length() > MAX_NAME_LENGTH) {
+            String msg = String.format("name length (%d) is greater than %d (name[0:%s] = %s)",
+                                        name.length(), MAX_NAME_LENGTH, MAX_NAME_LENGTH, name.substring(0, MAX_NAME_LENGTH));
+            throw new IllegalArgumentException(msg);
+        }
         this.name = name;
     }
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InstalledCodeTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InstalledCodeTest.java
new file mode 100644
index 00000000000..f7e68043da7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InstalledCodeTest.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 8355034
+ * @requires vm.jvmci
+ * @modules jdk.internal.vm.ci/jdk.vm.ci.code
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.code.test.InstalledCodeTest
+ */
+
+package jdk.vm.ci.code.test;
+
+import jdk.vm.ci.code.InstalledCode;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class InstalledCodeTest {
+
+    @Test
+    public void testNullName() {
+        new InstalledCode(null);
+    }
+
+    @Test
+    public void testTooLongName() {
+        String longName = new String(new char[InstalledCode.MAX_NAME_LENGTH]).replace('\0', 'A');
+        new InstalledCode(longName);
+        try {
+            String tooLongName = longName + "X";
+            new InstalledCode(tooLongName);
+        } catch (IllegalArgumentException iae) {
+            // Threw IllegalArgumentException as expected.
+            return;
+        }
+        Assert.fail("expected IllegalArgumentException");
+    }
+}

From 17b080b2c90f7fd9986fe38daebb76363d012469 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 07:44:44 +0000
Subject: [PATCH 037/901] 8353446: Open source several AWT Menu tests - Batch 2

Reviewed-by: abhiscxk
---
 .../Menu/DestroyMenuTest/DestroyMenuTest.java | 139 ++++++++++++++
 .../awt/Menu/DestroyMenuTest/MenuTest.java    | 172 ++++++++++++++++++
 .../jdk/java/awt/Menu/MenuAddRemoveCrash.java | 102 +++++++++++
 test/jdk/java/awt/Menu/MenuZOrderTest.java    |  80 ++++++++
 .../java/awt/Menu/OnFlyRepaintMenuTest.java   | 103 +++++++++++
 5 files changed, 596 insertions(+)
 create mode 100644 test/jdk/java/awt/Menu/DestroyMenuTest/DestroyMenuTest.java
 create mode 100644 test/jdk/java/awt/Menu/DestroyMenuTest/MenuTest.java
 create mode 100644 test/jdk/java/awt/Menu/MenuAddRemoveCrash.java
 create mode 100644 test/jdk/java/awt/Menu/MenuZOrderTest.java
 create mode 100644 test/jdk/java/awt/Menu/OnFlyRepaintMenuTest.java

diff --git a/test/jdk/java/awt/Menu/DestroyMenuTest/DestroyMenuTest.java b/test/jdk/java/awt/Menu/DestroyMenuTest/DestroyMenuTest.java
new file mode 100644
index 00000000000..b75ba047dfb
--- /dev/null
+++ b/test/jdk/java/awt/Menu/DestroyMenuTest/DestroyMenuTest.java
@@ -0,0 +1,139 @@
+/*
+ * 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 4209511
+ * @summary Regression test DestroyMenuTest.java Failing
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DestroyMenuTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Canvas;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Scrollbar;
+import java.awt.TextField;
+
+public class DestroyMenuTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Create many windows by randomly clicking 'Show Menu Test 1',
+                  'Show Menu Test 2', 'Show Menu Test 3' buttons.
+                2. Ignore the contents of the windows.
+                   Go to the windows created and select menu items inside the menus.
+                3. Close the windows by selecting menu item File--> Quit.
+                4. Do the above menu item selections as quickly as possible.
+                   If the program crashes when you select File--> Quit,
+                   then the test FAILS. Otherwise the test is PASS.
+                      """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(38)
+                .testUI(DestroyMenuTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame f = new Frame("Destroy Menu Test");
+        Button launchButton = new Button("Show Menu Test 1...");
+        Button launchButton2 = new Button("Show Menu Test 2...");
+        Button launchButton3 = new Button("Show Menu Test 3...");
+        f.setLayout(new FlowLayout());
+        f.add(launchButton);
+        f.add(launchButton2);
+        f.add(launchButton3);
+
+        launchButton.addActionListener(event -> {
+            MenuTest frame = new MenuTest("Menu Test 1");
+            frame.setBounds(300, 300, 300, 300);
+            frame.setVisible(true);
+        });
+
+        launchButton2.addActionListener(event -> {
+            MenuTest frame = new MenuTest("Menu Test 2");
+
+            Button closeButton = new Button("Close");
+
+            Panel X = new Panel();
+            X.setLayout(new BorderLayout());
+
+            Panel topPanel = new Panel();
+            Panel bottomPanel = new Panel();
+
+            bottomPanel.add(closeButton);
+
+            Scrollbar vScrollbar = new Scrollbar(Scrollbar.VERTICAL);
+            Scrollbar hScrollbar = new Scrollbar(Scrollbar.HORIZONTAL);
+            hScrollbar.setValues(hScrollbar.getValue(), 0, 0, 50);
+            vScrollbar.setValues(vScrollbar.getValue(), 0, 0, 50);
+            topPanel.setLayout(new BorderLayout());
+            topPanel.add(vScrollbar, BorderLayout.EAST);
+            topPanel.add(hScrollbar, BorderLayout.SOUTH);
+
+            X.add(topPanel, BorderLayout.NORTH);
+            X.add(bottomPanel, BorderLayout.SOUTH);
+            frame.add(X, BorderLayout.SOUTH);
+            frame.setBounds(350, 350, 300, 250);
+            frame.setVisible(true);
+        });
+
+        launchButton3.addActionListener(event -> {
+            MenuTest frame = new MenuTest("Menu Test 3");
+            frame.setBounds(400, 400, 300, 300);
+
+            mySimpleCanvas clock = new mySimpleCanvas();
+            frame.add(clock, BorderLayout.CENTER);
+
+            Panel p = new Panel();
+            Button closeButton = new Button("Close");
+            p.add(closeButton);
+
+            p.add(new Label("Label"));
+            TextField textField = new TextField(8);
+            p.add(textField);
+            f.add(p, BorderLayout.EAST);
+
+            frame.add(p, BorderLayout.SOUTH);
+            frame.setVisible(true);
+        });
+        f.pack();
+        return f;
+    }
+
+    static class mySimpleCanvas extends Canvas {
+        @Override
+        public void paint(Graphics g) {
+            g.drawOval(0, 0, 100, 100);
+            g.drawOval(2, 2, 100, 100);
+            g.drawOval(4, 4, 100, 100);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Menu/DestroyMenuTest/MenuTest.java b/test/jdk/java/awt/Menu/DestroyMenuTest/MenuTest.java
new file mode 100644
index 00000000000..95569f13fa2
--- /dev/null
+++ b/test/jdk/java/awt/Menu/DestroyMenuTest/MenuTest.java
@@ -0,0 +1,172 @@
+/*
+ * 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.
+ */
+
+import java.awt.Canvas;
+import java.awt.CardLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Label;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.Panel;
+
+public class MenuTest extends Frame {
+    private MenuItem quitItem;
+    private final Panel cards;
+    private final CardLayout layout;
+
+    public MenuTest(String s) {
+        super(s);
+        MenuBar mbar = new MenuBar();
+        createMenus(mbar);
+        setMenuBar(mbar);
+
+        cards = new Panel();
+        layout = new CardLayout();
+        cards.setLayout(layout);
+
+        cards.add(new MyPanelOne("Options"), "Options");
+        cards.add(new MyRectCanvas(), "MyRectCanvas");
+        cards.add(new MycircleCanvas(), "MyCircleCanvas");
+
+        add(cards, "Center");
+    }
+
+    public void createMenus(MenuBar mbar) {
+        mbar.add(createFileMenu());
+        mbar.add(createEditMenu());
+        mbar.add(createOptionMenu1());
+        mbar.add(createOptionMenu2());
+        mbar.add(createOptionMenu3());
+        mbar.add(createOptionMenu4());
+    }
+
+    private Menu createFileMenu() {
+        Menu fileMenu = new Menu("File");
+        fileMenu.add(quitItem = new MenuItem("Quit"));
+
+        quitItem.addActionListener(event -> {
+            MenuItem item = (MenuItem) event.getSource();
+            if (item == quitItem) {
+                dispose();
+            }
+        });
+        return fileMenu;
+    }
+
+    private Menu createEditMenu() {
+        Menu editMenu = new Menu("Edit");
+
+        editMenu.add("Cut");
+        editMenu.add("Copy");
+        editMenu.add("Paste");
+        editMenu.addSeparator();
+        editMenu.add("Select all");
+        editMenu.addSeparator();
+        editMenu.add("Find");
+        editMenu.add("Find again");
+
+        return editMenu;
+    }
+
+    private Menu createOptionMenu1() {
+        Menu optionMenu1 = new Menu("Option1");
+        MenuItem item1, item2, item3;
+        optionMenu1.add(item1 = new MenuItem("Item1"));
+        optionMenu1.add(item2 = new MenuItem("Item2"));
+        optionMenu1.add(item3 = new MenuItem("Item3"));
+
+        item1.addActionListener(event -> {
+            MenuItem mItem = (MenuItem) event.getSource();
+            if (mItem == item1) {
+                layout.show(cards, "Options");
+            }
+        });
+        item2.addActionListener(event -> {
+            MenuItem mItem = (MenuItem) event.getSource();
+            if (mItem == item2) {
+                layout.show(cards, "MyRectCanvas");
+            }
+        });
+        item3.addActionListener(event -> {
+            MenuItem mItem = (MenuItem) event.getSource();
+            if (mItem == item3) {
+                layout.show(cards, "MyCircleCanvas");
+            }
+        });
+        return optionMenu1;
+    }
+
+    private Menu createOptionMenu2() {
+        Menu optionMenu2 = new Menu("Option2");
+
+        optionMenu2.add("Item1");
+        optionMenu2.add("Item2");
+
+        return optionMenu2;
+    }
+
+    private Menu createOptionMenu3() {
+        Menu optionMenu3 = new Menu("Option3");
+
+        optionMenu3.add("Item1");
+        optionMenu3.add("Item2");
+        optionMenu3.add("Item3");
+        optionMenu3.add("Item4");
+
+        return optionMenu3;
+    }
+
+    private Menu createOptionMenu4() {
+        Menu optionMenu4 = new Menu("Option3");
+
+        optionMenu4.add("Item1");
+        optionMenu4.add("Item2");
+        optionMenu4.add("Item3");
+
+        return optionMenu4;
+    }
+}
+
+class MyRectCanvas extends Canvas {
+    @Override
+    public void paint(Graphics g) {
+        g.drawRect(0, 0, 100, 100);
+    }
+}
+
+class MyPanelOne extends Panel {
+    MyPanelOne(String name) {
+        add(new Label(name + " panel goes here"));
+    }
+}
+
+class MycircleCanvas extends Canvas {
+    @Override
+    public void paint(Graphics g) {
+        g.drawOval(0, 0, 100, 100);
+        g.drawOval(2, 2, 100, 100);
+        g.drawOval(4, 4, 100, 100);
+    }
+}
diff --git a/test/jdk/java/awt/Menu/MenuAddRemoveCrash.java b/test/jdk/java/awt/Menu/MenuAddRemoveCrash.java
new file mode 100644
index 00000000000..d5c80c27a4f
--- /dev/null
+++ b/test/jdk/java/awt/Menu/MenuAddRemoveCrash.java
@@ -0,0 +1,102 @@
+/*
+ * 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 4410477
+ * @summary Tests that menu does not crash during simultaneous drawing
+ *          and removal of items.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MenuAddRemoveCrash
+ */
+
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+
+public class MenuAddRemoveCrash {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Move and resize the frame.
+                2. If the test crashes the test is FAILED.
+                   Otherwise it is PASSED.
+                    """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(MenuAddRemoveCrash::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        final TestGui myTestGui = new TestGui();
+        Thread test = new Thread() {
+            public void run() {
+                while (!Thread.interrupted()) {
+                    myTestGui.changeMenuItems();
+                }
+            }
+        };
+        test.setDaemon(true);
+        test.start();
+        return myTestGui;
+    }
+}
+
+class TestGui extends Frame {
+    Menu myMenu1;
+    Menu myMenu2;
+
+    public TestGui() {
+        this.setTitle("Try to resize this frame!");
+
+        this.setSize(300, 300);
+        this.setVisible(true);
+
+        MenuBar myMenuBar = new MenuBar();
+        myMenu1 = new Menu("DemoMenu1");
+        myMenu2 = new Menu("DemoMenu2");
+
+        myMenuBar.add(myMenu1);
+        myMenuBar.add(myMenu2);
+
+        this.setMenuBar(myMenuBar);
+    }
+
+    public void changeMenuItems() {
+        myMenu1.removeAll();
+
+        for (int i = 0; i < 10; i++) {
+            MenuItem myMenuItem1 = new MenuItem("DemoMenuItem" + i);
+            myMenu1.add(myMenuItem1);
+        }
+        try {
+            Thread.sleep(100);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed :" + e);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Menu/MenuZOrderTest.java b/test/jdk/java/awt/Menu/MenuZOrderTest.java
new file mode 100644
index 00000000000..fefd3d64c28
--- /dev/null
+++ b/test/jdk/java/awt/Menu/MenuZOrderTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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 6267182
+ * @summary Menu is not visible after showing and disposing a file dialog.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MenuZOrderTest
+ */
+
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class MenuZOrderTest {
+    static class Listener implements ActionListener {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            Frame f = new Frame("Menu Z order test frame");
+            f.setBounds(200, 200, 200, 200);
+            f.setVisible(true);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Choose Menu 1 --> Menu Item 1 several times.
+                2. If menu window is shown correctly and each click
+                   creates new frame - press PASS.
+                3. If menu window is obscured by frame - press FAIL.
+                    """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(MenuZOrderTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame mf = new Frame("Menu Z order test");
+        Listener l = new Listener();
+        MenuBar mb = new MenuBar();
+        Menu m1 = new Menu("Menu 1");
+        MenuItem mi1 = new MenuItem("Menu Item 1");
+
+        mf.setSize(200, 200);
+        mi1.addActionListener(l);
+        m1.add(mi1);
+        mb.add(m1);
+        mf.setMenuBar(mb);
+        mf.setVisible(true);
+        return mf;
+    }
+}
diff --git a/test/jdk/java/awt/Menu/OnFlyRepaintMenuTest.java b/test/jdk/java/awt/Menu/OnFlyRepaintMenuTest.java
new file mode 100644
index 00000000000..617d640d907
--- /dev/null
+++ b/test/jdk/java/awt/Menu/OnFlyRepaintMenuTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 5024051
+ * @summary Tests if menu is repainted in enabling/disabling it and
+ *          changing its label while it is visible, either on MenuBar
+ *          or in other Menu. Menu items are covered as well
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual OnFlyRepaintMenuTest
+ */
+
+import java.awt.Button;
+import java.awt.CheckboxMenuItem;
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+
+public class OnFlyRepaintMenuTest {
+    static boolean menuEnabled = true;
+
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Click the button 'Change state' and wait for 5 secs.
+                2. If menu is repainted correctly after its setLabel()
+                   and setEnabled() methods called test PASSED, else FAILED.
+                   (During a 5 secs delay you may select the menu to see
+                   the effect for menu items and submenu)
+                         """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(OnFlyRepaintMenuTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame f = new Frame("OnFly Menu Repaint Test");
+
+        f.setSize(200, 100);
+
+        MenuBar mb = new MenuBar();
+        Menu menu = new Menu("Menu");
+        MenuItem menuItem = new MenuItem("MenuItem");
+        menu.add(menuItem);
+        Menu submenu = new Menu("SubMenu");
+        MenuItem submenuItem = new MenuItem("SubmenuItem");
+        submenu.add(submenuItem);
+        CheckboxMenuItem checkMenuItem = new CheckboxMenuItem("CheckboxmenuItem");
+        checkMenuItem.setState(true);
+        menu.add(checkMenuItem);
+        menu.add(submenu);
+        mb.add(menu);
+        f.setMenuBar(mb);
+
+        Button b = new Button("Change state");
+        b.addActionListener(ev -> new Thread(() -> {
+            try {
+                Thread.sleep(5000);
+            } catch (Exception e) {
+            }
+            menuEnabled = !menuEnabled;
+            String label = menuEnabled ? "Enabled" : "Disabled";
+            menu.setLabel(label);
+            menuItem.setLabel(label);
+            submenu.setLabel(label);
+            submenuItem.setLabel(label);
+            checkMenuItem.setLabel(label);
+            checkMenuItem.setEnabled(menuEnabled);
+            checkMenuItem.setState(menuEnabled);
+            submenuItem.setEnabled(menuEnabled);
+            submenu.setEnabled(menuEnabled);
+            menuItem.setEnabled(menuEnabled);
+            menu.setEnabled(menuEnabled);
+        }).start());
+        f.add(b);
+        return f;
+    }
+}

From 0b2a2f38d0b0133a562a898836d7a1b2dbd73a5e Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 07:45:56 +0000
Subject: [PATCH 038/901] 8353685: Open some JComboBox bugs 4

Reviewed-by: honkar, kizune
---
 .../jdk/javax/swing/JComboBox/bug4212498.java | 86 +++++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4459267.java | 75 +++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4519269.java | 94 +++++++++++++++++++
 3 files changed, 255 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4212498.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4459267.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4519269.java

diff --git a/test/jdk/javax/swing/JComboBox/bug4212498.java b/test/jdk/javax/swing/JComboBox/bug4212498.java
new file mode 100644
index 00000000000..b60470fdd32
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4212498.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4212498
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4212498
+ */
+
+public class bug4212498 {
+    static JPanel panel = new JPanel();
+    static JComboBox comboBox = new JComboBox(new Object[]{
+            "Coma Berenices",
+            "Triangulum",
+            "Camelopardis",
+            "Cassiopea"});
+
+    private static final String INSTRUCTIONS = """
+            Edit the value in the text field (without using the popup)
+            and then press the tab key. If the number doesn't increase,
+            then test fails.
+
+            Also, try tabbing out without making a change. The number
+            should NOT increase unless the user changes something.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4212498::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4212498");
+        comboBox.setEditable(true);
+
+        final JLabel label = new JLabel("0");
+
+        ActionListener actionListener =
+                e -> label.setText("" + (Integer.parseInt(label.getText()) + 1));
+
+        comboBox.addActionListener(actionListener);
+
+        panel.add(comboBox);
+        panel.add(label);
+        panel.add(new JButton("B"));
+
+        frame.getContentPane().add(panel);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4459267.java b/test/jdk/javax/swing/JComboBox/bug4459267.java
new file mode 100644
index 00000000000..85049936ea7
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4459267.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4459267
+ * @summary Tests that pressing PageUp in combo popup list doesn't cause
+ *          stack overflow
+ * @key headful
+ * @run main bug4459267
+ */
+
+public class bug4459267 {
+    static JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            robot.keyPress(KeyEvent.VK_PAGE_UP);
+            robot.keyRelease(KeyEvent.VK_PAGE_UP);
+            robot.waitForIdle();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4459267");
+        JComboBox jcmb = new JComboBox();
+        jcmb.addItem("JComobo1");
+        jcmb.addItem("Item2");
+        jcmb.addItem("Item3");
+        frame.getContentPane().add(jcmb, BorderLayout.NORTH);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4519269.java b/test/jdk/javax/swing/JComboBox/bug4519269.java
new file mode 100644
index 00000000000..29147998d0a
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4519269.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4519269
+ * @summary Tests that DefaultKeySelectionManager doesn't throw NPE
+ * @key headful
+ * @run main bug4519269
+ */
+
+public class bug4519269 {
+    static JFrame frame;
+    static JComboBox combo;
+    static Point p;
+    static Object[] data = {new CustomString("Item 1"), new CustomString("Item 2"),
+            new CustomString("Item 3"), new CustomString("Item 4")};
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> p = combo.getLocationOnScreen());
+            robot.mouseMove(p.x + 5, p.y + 5);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            robot.keyPress(KeyEvent.VK_SHIFT);
+            robot.keyRelease(KeyEvent.VK_SHIFT);
+            robot.waitForIdle();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4519269");
+        combo = new JComboBox(data);
+        frame.getContentPane().add(combo);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    static class CustomString {
+        String string;
+
+        public CustomString(String s) {
+            string = s;
+        }
+
+        public String toString() {
+            return null;
+        }
+    }
+}

From 7eab2d9f9140a27f7a5c5e0a57b9e6a256558690 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 07:58:30 +0000
Subject: [PATCH 039/901] 8354095: Open some JTable bugs 5

Reviewed-by: kizune, honkar
---
 .../swing/JTable/InternationalCharacters.java | 172 +++++++++++++++++
 .../javax/swing/JTable/NullTableHeader.java   |  44 +++++
 test/jdk/javax/swing/JTable/bug4118307.java   | 182 ++++++++++++++++++
 test/jdk/javax/swing/JTable/bug4138158.java   |  62 ++++++
 4 files changed, 460 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTable/InternationalCharacters.java
 create mode 100644 test/jdk/javax/swing/JTable/NullTableHeader.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4118307.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4138158.java

diff --git a/test/jdk/javax/swing/JTable/InternationalCharacters.java b/test/jdk/javax/swing/JTable/InternationalCharacters.java
new file mode 100644
index 00000000000..1d8fc2c4576
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/InternationalCharacters.java
@@ -0,0 +1,172 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.BevelBorder;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4179066
+ * @summary Tests that JTable prints AltGr characters (~\@|{}[]²µ³)
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual InternationalCharacters
+ */
+
+public class InternationalCharacters {
+    private static final String INSTRUCTIONS = """
+            Double-click an entry in the JTable.
+            Press Alt-Gr or Option with any key to type an international character.
+            Verify that the international character appears in the table.
+            If it does, press "pass", otherwise press "fail".
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(InternationalCharacters::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("InternationalCharacters test");
+        // Take the dummy data from SwingSet.
+        final String[] names = {"First Name", "Last Name", "Favorite Color",
+                                "Favorite Number", "Vegetarian"};
+        final Object[][] data = {
+            {"Mark", "Andrews", "Red", 2, true},
+            {"Tom", "Ball", "Blue", 99, false},
+            {"Alan", "Chung", "Green", 838, false},
+            {"Jeff", "Dinkins", "Turquois", 8, true},
+            {"Amy", "Fowler", "Yellow", 3, false},
+            {"Brian", "Gerhold", "Green", 0, false},
+            {"James", "Gosling", "Pink", 21, false},
+            {"David", "Karlton", "Red", 1, false},
+            {"Dave", "Kloba", "Yellow", 14, false},
+            {"Peter", "Korn", "Purple", 12, false},
+            {"Phil", "Milne", "Purple", 3, false},
+            {"Dave", "Moore", "Green", 88, false},
+            {"Hans", "Muller", "Maroon", 5, false},
+            {"Rick", "Levenson", "Blue", 2, false},
+            {"Tim", "Prinzing", "Blue", 22, false},
+            {"Chester", "Rose", "Black", 0, false},
+            {"Ray", "Ryan", "Gray", 77, false},
+            {"Georges", "Saab", "Red", 4, false},
+            {"Willie", "Walker", "Phthalo Blue", 4, false},
+            {"Kathy", "Walrath", "Blue", 8, false},
+            {"Arnaud", "Weber", "Green", 44, false}
+        };
+
+        // Create a model of the data.
+        TableModel dataModel = new AbstractTableModel() {
+            // These methods always need to be implemented.
+            public int getColumnCount() { return names.length; }
+            public int getRowCount() { return data.length;}
+            public Object getValueAt(int row, int col) {return data[row][col];}
+
+            // The default implementations of these methods in
+            // AbstractTableModel would work, but we can refine them.
+            public String getColumnName(int column) {return names[column];}
+            public Class getColumnClass(int c) {return getValueAt(0, c).getClass();}
+            public boolean isCellEditable(int row, int col) {return true;}
+            public void setValueAt(Object aValue, int row, int column) {
+                System.out.println("Setting value to: " + aValue);
+                data[row][column] = aValue;
+            }
+         };
+
+        // Create the table
+        JTable tableView = new JTable(dataModel);
+        // Turn off auto-resizing so that we can set column sizes programmatically.
+        // In this mode, all columns will get their preferred widths, as set blow.
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
+        // Create a combo box to show that you can use one in a table.
+        JComboBox comboBox = new JComboBox();
+        comboBox.addItem("Red");
+        comboBox.addItem("Orange");
+        comboBox.addItem("Yellow");
+        comboBox.addItem("Green");
+        comboBox.addItem("Blue");
+        comboBox.addItem("Indigo");
+        comboBox.addItem("Violet");
+
+        TableColumn colorColumn = tableView.getColumn("Favorite Color");
+        // Use the combo box as the editor in the "Favorite Color" column.
+        colorColumn.setCellEditor(new DefaultCellEditor(comboBox));
+
+        // Set a pink background and tooltip for the Color column renderer.
+        DefaultTableCellRenderer colorColumnRenderer = new DefaultTableCellRenderer();
+        colorColumnRenderer.setBackground(Color.pink);
+        colorColumnRenderer.setToolTipText("Click for combo box");
+        colorColumn.setCellRenderer(colorColumnRenderer);
+
+        // Set a tooltip for the header of the colors column.
+        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
+        if (headerRenderer instanceof DefaultTableCellRenderer)
+            ((DefaultTableCellRenderer)headerRenderer).setToolTipText("Hi Mom!");
+
+        // Set the width of the "Vegetarian" column.
+        TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
+        vegetarianColumn.setPreferredWidth(100);
+
+        // Show the values in the "Favorite Number" column in different colors.
+        TableColumn numbersColumn = tableView.getColumn("Favorite Number");
+        DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
+            public void setValue(Object value) {
+                int cellValue = (value instanceof Number) ? ((Number)value).intValue() : 0;
+                setForeground((cellValue > 30) ? Color.black : Color.red);
+                setText((value == null) ? "" : value.toString());
+            }
+        };
+        numberColumnRenderer.setHorizontalAlignment(JLabel.RIGHT);
+        numbersColumn.setCellRenderer(numberColumnRenderer);
+        numbersColumn.setPreferredWidth(110);
+
+        // Finish setting up the table.
+        JScrollPane scrollpane = new JScrollPane(tableView);
+        scrollpane.setBorder(new BevelBorder(BevelBorder.LOWERED));
+        scrollpane.setPreferredSize(new Dimension(430, 200));
+
+        frame.add(scrollpane);
+        frame.setSize(500, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/NullTableHeader.java b/test/jdk/javax/swing/JTable/NullTableHeader.java
new file mode 100644
index 00000000000..dc62b975d04
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/NullTableHeader.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4129409
+ * @summary Tests that JTable.setTableHeader(null) doesn't break AutoResize
+ * @key headful
+ * @run main NullTableHeader
+ */
+
+public class NullTableHeader {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            JTable tableView = new JTable();
+            tableView.setTableHeader(null);
+            tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4118307.java b/test/jdk/javax/swing/JTable/bug4118307.java
new file mode 100644
index 00000000000..537e92176ef
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4118307.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4118307
+ * @summary Tests that JTable's cell editor for Number and Date work correctly
+ * @key headful
+ * @run main bug4118307
+ */
+
+public class bug4118307 {
+    static JFrame frame;
+    static MyTable tbl;
+    static Point tableLoc;
+    static Point p;
+    private static volatile boolean flag;
+    static final String[] columnNames = {"Integer", "Double"};
+    static final Object[][] data = {
+            {5, 3.14},
+            {10, 2.71},
+            {70, 3.14},
+            {200, 2.71},
+    };
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                tableLoc = tbl.getLocationOnScreen();
+                p = tbl.getCellRect(0, 0, true).getLocation();
+            });
+            robot.waitForIdle();
+
+            robot.mouseMove(tableLoc.x + p.x + 10, tableLoc.y + p.y + 10);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() ->
+                    p = tbl.getCellRect(1, 1, true).getLocation());
+            robot.waitForIdle();
+
+            robot.mouseMove(tableLoc.x + p.x + 10, tableLoc.y + p.y + 10);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() ->
+                    p = tbl.getCellRect(1, 0, true).getLocation());
+            robot.waitForIdle();
+
+            robot.mouseMove(tableLoc.x + p.x + 10, tableLoc.y + p.y + 10);
+            robot.waitForIdle();
+
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(5000);
+
+            if (!flag) {
+                throw new RuntimeException("Test Failed.");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4118307");
+        MyTableModel myModel = new MyTableModel();
+        tbl = new MyTable(myModel);
+        JScrollPane sp = new JScrollPane(tbl);
+        flag = true;
+
+        frame.add(sp, BorderLayout.CENTER);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    static class MyTable extends JTable {
+        public MyTable(TableModel tm) {
+            super(tm);
+        }
+
+        public Component prepareRenderer(TableCellRenderer rend, int row, int col) {
+            try {
+                return super.prepareRenderer(rend, row, col);
+            } catch (Exception e) {
+                e.printStackTrace();
+                flag = false;
+                return null;
+            }
+        }
+    }
+
+    static class MyTableModel extends AbstractTableModel {
+        public int getColumnCount() {
+            return columnNames.length;
+        }
+
+        public int getRowCount() {
+            return data.length;
+        }
+
+        @Override
+        public String getColumnName(int col) {
+            return columnNames[col];
+        }
+
+        public Object getValueAt(int row, int col) {
+            return data[row][col];
+        }
+
+        public Class getColumnClass(int c) {
+            return getValueAt(0, c).getClass();
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int col) {
+            return true;
+        }
+
+        @Override
+        public void setValueAt(Object value, int row, int col) {
+            data[row][col] = value;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4138158.java b/test/jdk/javax/swing/JTable/bug4138158.java
new file mode 100644
index 00000000000..400b8b1952e
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4138158.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
+/*
+ * @test
+ * @bug 4138158
+ * @summary Tests that setAutoscrolls(false) locks autoscroll
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4138158
+ */
+
+public class bug4138158 {
+    private static final String INSTRUCTIONS = """
+            Move mouse to beginning of table, press left mouse button and drag mouse down
+            below the frame. If the table isn't scrolled down then test passes.
+            If the table is scrolled then test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4138158::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4138158");
+        JTable table = new JTable(20, 3);
+        table.setAutoscrolls(false);
+        JScrollPane sp = new JScrollPane(table);
+        frame.add(sp);
+        frame.setSize(200, 200);
+        return frame;
+    }
+}

From 367bcc5df83722231106b635068a17f92404477b Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 07:59:45 +0000
Subject: [PATCH 040/901] 8353445: Open source several AWT Menu tests - Batch 1

Reviewed-by: abhiscxk, prr
---
 test/jdk/ProblemList.txt                      |   1 +
 .../java/awt/Menu/MenuActionEventTest.java    |  98 +++++++++++
 .../jdk/java/awt/Menu/MenuVisibilityTest.java |  71 ++++++++
 test/jdk/java/awt/Menu/RmInHideTest.java      | 152 ++++++++++++++++++
 test/jdk/java/awt/Menu/SetShortCutTest.java   | 132 +++++++++++++++
 5 files changed, 454 insertions(+)
 create mode 100644 test/jdk/java/awt/Menu/MenuActionEventTest.java
 create mode 100644 test/jdk/java/awt/Menu/MenuVisibilityTest.java
 create mode 100644 test/jdk/java/awt/Menu/RmInHideTest.java
 create mode 100644 test/jdk/java/awt/Menu/SetShortCutTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 841b1110506..fe0657ff165 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -819,4 +819,5 @@ java/awt/Checkbox/CheckboxBoxSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxIndicatorSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all
 java/awt/dnd/WinMoveFileToShellTest.java 8341665 windows-all
+java/awt/Menu/MenuVisibilityTest.java 8161110 macosx-all
 java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all
diff --git a/test/jdk/java/awt/Menu/MenuActionEventTest.java b/test/jdk/java/awt/Menu/MenuActionEventTest.java
new file mode 100644
index 00000000000..70fcc81ac86
--- /dev/null
+++ b/test/jdk/java/awt/Menu/MenuActionEventTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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 4094620
+ * @summary MenuItem.enableEvents does not work
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MenuActionEventTest
+ */
+
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.event.ActionEvent;
+
+public class MenuActionEventTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Click on the Menu and then on Menuitem on the frame.
+                2. If you find the following message being printed in
+                   the test log area:,
+                   _MenuItem: action event",
+                   click PASS, else click FAIL"
+                 """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(MenuActionEventTest::initialize)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame f = new Frame("Menu Action Event Test");
+        f.setLayout(new BorderLayout());
+        f.setMenuBar(new MenuBar());
+        Menu m = new _Menu("Menu");
+        MenuBar mb = f.getMenuBar();
+        mb.add(m);
+        MenuItem mi = new _MenuItem("Menuitem");
+        m.add(mi);
+        f.setBounds(204, 152, 396, 300);
+        return f;
+    }
+
+    static class _Menu extends Menu {
+        public _Menu(String text) {
+            super(text);
+            enableEvents(AWTEvent.ACTION_EVENT_MASK);
+        }
+
+        @Override
+        protected void processActionEvent(ActionEvent e) {
+            PassFailJFrame.log("_Menu: action event");
+            super.processActionEvent(e);
+        }
+    }
+
+    static class _MenuItem extends MenuItem {
+        public _MenuItem(String text) {
+            super(text);
+            enableEvents(AWTEvent.ACTION_EVENT_MASK);
+        }
+
+        @Override
+        protected void processActionEvent(ActionEvent e) {
+            PassFailJFrame.log("_MenuItem: action event");
+            super.processActionEvent(e);
+        }
+    }
+
+}
diff --git a/test/jdk/java/awt/Menu/MenuVisibilityTest.java b/test/jdk/java/awt/Menu/MenuVisibilityTest.java
new file mode 100644
index 00000000000..cb74cd56e1a
--- /dev/null
+++ b/test/jdk/java/awt/Menu/MenuVisibilityTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 5046491 6423258
+ * @summary CheckboxMenuItem: menu text is missing from test frame
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MenuVisibilityTest
+*/
+
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+
+public class MenuVisibilityTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. Press on a MenuBar with a long name.
+                2. Select "First item" in an opened menu.
+                   If you see that "First menu item was pressed" in
+                   the test log area, press PASS
+                   Otherwise press FAIL"
+                 """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(MenuVisibilityTest::initialize)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static Frame initialize() {
+        Frame frame = new Frame("Menu visibility test");
+        String menuTitle = "I_have_never_seen_so_long_Menu_Title_" +
+                "!_ehe-eha-ehu-ehi_ugu-gu!!!_;)_BANG_BANG...";
+        MenuBar menubar = new MenuBar();
+        Menu menu = new Menu(menuTitle);
+        MenuItem menuItem = new MenuItem("First item");
+        menuItem.addActionListener(e ->
+                PassFailJFrame.log("First menu item was pressed."));
+        menu.add(menuItem);
+        menubar.add(menu);
+        frame.setMenuBar(menubar);
+        frame.setSize(100, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/java/awt/Menu/RmInHideTest.java b/test/jdk/java/awt/Menu/RmInHideTest.java
new file mode 100644
index 00000000000..b2d68400647
--- /dev/null
+++ b/test/jdk/java/awt/Menu/RmInHideTest.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4039387
+ * @summary Checks that calling Frame.remove() within hide() doesn't
+ *          cause SEGV
+ * @key headful
+ * @run main RmInHideTest
+ */
+
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+
+public class RmInHideTest {
+    static volatile Point point;
+    static RmInHideTestFrame frame;
+    static volatile Dimension dimension;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(() -> {
+                frame = new RmInHideTestFrame();
+                frame.setSize(200, 200);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            EventQueue.invokeAndWait(() -> {
+                point = frame.getButtonLocation();
+                dimension = frame.getButtonDimension();
+            });
+            robot.mouseMove(point.x + dimension.width / 2, point.y + dimension.height / 2);
+            robot.mousePress(MouseEvent.BUTTON2_DOWN_MASK);
+            robot.mouseRelease(MouseEvent.BUTTON2_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(100);
+            System.out.println("Test pass");
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    static class RmInHideTestFrame extends Frame implements ActionListener {
+        MenuBar menubar = null;
+        Button b;
+
+        public RmInHideTestFrame() {
+            super("RmInHideTest");
+            b = new Button("Hide");
+            b.setActionCommand("hide");
+            b.addActionListener(this);
+            add("Center", b);
+
+            MenuBar bar = new MenuBar();
+
+            Menu menu = new Menu("Test1", true);
+            menu.add(new MenuItem("Test1A"));
+            menu.add(new MenuItem("Test1B"));
+            menu.add(new MenuItem("Test1C"));
+            bar.add(menu);
+
+            menu = new Menu("Test2", true);
+            menu.add(new MenuItem("Test2A"));
+            menu.add(new MenuItem("Test2B"));
+            menu.add(new MenuItem("Test2C"));
+            bar.add(menu);
+            setMenuBar(bar);
+        }
+
+        @Override
+        public Dimension minimumSize() {
+            return new Dimension(200, 200);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            String cmd = e.getActionCommand();
+            if (cmd.equals("hide")) {
+                hide();
+                try {
+                    Thread.currentThread().sleep(2000);
+                } catch (InterruptedException ex) {
+                    // do nothing
+                }
+                show();
+            }
+        }
+
+        @Override
+        public void hide() {
+            menubar = getMenuBar();
+            if (menubar != null) {
+                remove(menubar);
+            }
+            super.hide();
+        }
+
+
+        @Override
+        public void show() {
+            if (menubar != null) {
+                setMenuBar(menubar);
+            }
+            super.show();
+        }
+
+        public Point getButtonLocation() {
+            return b.getLocationOnScreen();
+        }
+
+        public Dimension getButtonDimension() {
+            return b.getSize();
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Menu/SetShortCutTest.java b/test/jdk/java/awt/Menu/SetShortCutTest.java
new file mode 100644
index 00000000000..b60b83dff9a
--- /dev/null
+++ b/test/jdk/java/awt/Menu/SetShortCutTest.java
@@ -0,0 +1,132 @@
+/*
+ * 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 4203208
+ * @summary setShortcut method does not display proper text on Menu component
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual SetShortCutTest
+ */
+
+import java.awt.Frame;
+import java.awt.Menu;
+import java.awt.MenuBar;
+import java.awt.MenuItem;
+import java.awt.MenuShortcut;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+
+import static java.awt.event.KeyEvent.VK_META;
+import static java.awt.event.KeyEvent.VK_SHIFT;
+
+public class SetShortCutTest {
+    public static void main(String[] args) throws Exception {
+        boolean isMac = System.getProperty("os.name").startsWith("Mac");
+        String shortcut = "Ctrl+Shift+";
+        if (isMac) {
+            shortcut = KeyEvent.getKeyText(VK_SHIFT) + "+" + KeyEvent.getKeyText(VK_META);
+        }
+
+        String INSTRUCTIONS = """
+                1. Select menuitem 'Stuff -> Second' once to remove 'File -> First'.
+                2. Select menuitem 'Stuff -> Second' again to add 'File -> First'.
+                3. If menuitem 'File -> First' reads First """ + shortcut + """
+                       'C', press PASS. Otherwise press FAIL.
+                """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(SetShortCutTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        return new TestMenuShortCut();
+    }
+
+    static class TestMenuShortCut extends Frame implements ActionListener {
+        Menu menu1;
+        MenuItem item1;
+        MenuItem item2;
+        boolean beenHere;
+
+        public TestMenuShortCut() {
+            setTitle("Set ShortCut test");
+            beenHere = false;
+            MenuBar mTopMenu = buildMenu();
+            setSize(300, 300);
+            this.setMenuBar(mTopMenu);
+        }
+
+        public MenuBar buildMenu() {
+            MenuBar bar;
+            bar = new MenuBar();
+            menu1 = new Menu("File");
+            item1 = new MenuItem("First");
+            menu1.add(item1);
+            item1.setShortcut(new MenuShortcut(KeyEvent.VK_C, true));
+            bar.add(menu1);
+
+            // Stuff menu
+            item2 = new MenuItem("Second");
+            Menu menu2 = new Menu("Stuff");
+            menu2.add(item2);
+            item2.setShortcut(new MenuShortcut(KeyEvent.VK_C, false));
+            bar.add(menu2);
+
+            item1.addActionListener(this);
+            item2.addActionListener(this);
+            return bar;
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent event) {
+            if (event.getSource() == item1) {
+                Frame temp = new Frame("Accelerator key is working for 'First'");
+                temp.setSize(300, 50);
+                temp.setVisible(true);
+            }
+
+            // Click on the "Stuff" menu to remove the "first" menu item
+            else if (event.getSource() == item2) {
+                // If the item has not been removed from the menu,
+                // then remove "First" from the "File" menu
+                if (beenHere == false) {
+                    item1.removeActionListener(this);
+                    menu1.remove(item1);
+                    beenHere = true;
+                } else {
+                    item1 = new MenuItem("First");
+                    menu1.add(item1);
+                    item1.addActionListener(this);
+                    item1.setShortcut(new MenuShortcut(KeyEvent.VK_C, true));
+                    beenHere = false;
+                }
+            }
+        }
+    }
+}

From 50358d1ca49c26d100c5c658de29c75f864fdc60 Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Tue, 22 Apr 2025 08:00:01 +0000
Subject: [PATCH 041/901] 8354929: ZGC: Update collection stats while holding
 page allocator lock

Reviewed-by: stefank, tschatzl, aboldtch
---
 src/hotspot/share/gc/z/zGeneration.cpp    |  5 +--
 src/hotspot/share/gc/z/zPageAllocator.cpp | 49 ++++++++++++-----------
 src/hotspot/share/gc/z/zPageAllocator.hpp |  6 ++-
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index f3cd3393fc5..e74d7a8e9f3 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -279,7 +279,6 @@ void ZGeneration::reset_statistics() {
   _freed = 0;
   _promoted = 0;
   _compacted = 0;
-  _page_allocator->reset_statistics(_id);
 }
 
 size_t ZGeneration::freed() const {
@@ -860,7 +859,7 @@ void ZGenerationYoung::mark_start() {
   _remembered.flip();
 
   // Update statistics
-  stat_heap()->at_mark_start(_page_allocator->stats(this));
+  stat_heap()->at_mark_start(_page_allocator->update_and_stats(this));
 }
 
 void ZGenerationYoung::mark_roots() {
@@ -1209,7 +1208,7 @@ void ZGenerationOld::mark_start() {
   _mark.start();
 
   // Update statistics
-  stat_heap()->at_mark_start(_page_allocator->stats(this));
+  stat_heap()->at_mark_start(_page_allocator->update_and_stats(this));
 
   // Note that we start a marking cycle.
   // Unlike other GCs, the color switch implicitly changes the nmethods
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index a0d2c46c414..7bb1dcdcf81 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -1373,9 +1373,25 @@ size_t ZPageAllocator::unused() const {
   return unused > 0 ? (size_t)unused : 0;
 }
 
-ZPageAllocatorStats ZPageAllocator::stats(ZGeneration* generation) const {
-  ZLocker<ZLock> locker(&_lock);
+void ZPageAllocator::update_collection_stats(ZGenerationId id) {
+  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
 
+#ifdef ASSERT
+  size_t total_used = 0;
+
+  ZPartitionIterator iter(&_partitions);
+  for (ZPartition* partition; iter.next(&partition);) {
+    total_used += partition->_used;
+  }
+
+  assert(total_used == _used, "Must be consistent %zu == %zu", total_used, _used);
+#endif
+
+  _collection_stats[(int)id]._used_high = _used;
+  _collection_stats[(int)id]._used_low = _used;
+}
+
+ZPageAllocatorStats ZPageAllocator::stats_inner(ZGeneration* generation) const {
   return ZPageAllocatorStats(_min_capacity,
                              _max_capacity,
                              soft_max_capacity(),
@@ -1390,29 +1406,16 @@ ZPageAllocatorStats ZPageAllocator::stats(ZGeneration* generation) const {
                              _stalled.size());
 }
 
-void ZPageAllocator::reset_statistics(ZGenerationId id) {
-  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
-#ifdef ASSERT
-  {
-    // We may free without safepoint synchronization, take the lock to get
-    // consistent values.
-    ZLocker<ZLock> locker(&_lock);
-    size_t total_used = 0;
-
-    ZPartitionIterator iter(&_partitions);
-    for (ZPartition* partition; iter.next(&partition);) {
-      total_used += partition->_used;
-    }
-
-    assert(total_used == _used, "Must be consistent at safepoint %zu == %zu", total_used, _used);
-  }
-#endif
+ZPageAllocatorStats ZPageAllocator::stats(ZGeneration* generation) const {
+  ZLocker<ZLock> locker(&_lock);
+  return stats_inner(generation);
+}
 
-  // Read once, we may have concurrent writers.
-  const size_t used = Atomic::load(&_used);
+ZPageAllocatorStats ZPageAllocator::update_and_stats(ZGeneration* generation) {
+  ZLocker<ZLock> locker(&_lock);
 
-  _collection_stats[(int)id]._used_high = used;
-  _collection_stats[(int)id]._used_low = used;
+  update_collection_stats(generation->id());
+  return stats_inner(generation);
 }
 
 void ZPageAllocator::increase_used_generation(ZGenerationId id, size_t size) {
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index 05b0d6774d9..5cd08aee94c 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -235,6 +235,9 @@ class ZPageAllocator {
   void notify_out_of_memory();
   void restart_gc() const;
 
+  void update_collection_stats(ZGenerationId id);
+  ZPageAllocatorStats stats_inner(ZGeneration* generation) const;
+
   void print_on_inner(outputStream* st) const;
 
 public:
@@ -262,8 +265,7 @@ class ZPageAllocator {
   void promote_used(const ZPage* from, const ZPage* to);
 
   ZPageAllocatorStats stats(ZGeneration* generation) const;
-
-  void reset_statistics(ZGenerationId id);
+  ZPageAllocatorStats update_and_stats(ZGeneration* generation);
 
   ZPage* alloc_page(ZPageType type, size_t size, ZAllocationFlags flags, ZPageAge age);
   void safe_destroy_page(ZPage* page);

From bcc33d5ef3bdbfaee51c45014851c54028da03f1 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 22 Apr 2025 08:32:03 +0000
Subject: [PATCH 042/901] 8352504: RISC-V: implement and enable CMoveI/L
 8346786: RISC-V: Reconsider ConditionalMoveLimit when adding conditional move

Reviewed-by: fyang, fjiang
---
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |  30 ++++
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   4 +
 src/hotspot/cpu/riscv/c2_globals_riscv.hpp    |   2 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        | 124 ++++++++++++++
 .../cpu/riscv/macroAssembler_riscv.hpp        |   5 +
 src/hotspot/cpu/riscv/riscv.ad                | 103 ++++++++++--
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |   8 -
 .../os_cpu/linux_riscv/riscv_hwprobe.cpp      |   5 +-
 .../c2/irTests/ModINodeIdealizationTests.java |   6 +-
 .../c2/irTests/ModLNodeIdealizationTests.java |   6 +-
 .../c2/irTests/TestConv2BExpansion.java       |   8 +
 .../compiler/c2/irTests/TestFPComparison.java |   1 -
 .../compiler/c2/irTests/TestIfMinMax.java     |  17 +-
 .../lib/ir_framework/TestFramework.java       |   1 +
 .../compiler/vectorapi/TestVectorTest.java    |   3 +-
 .../bench/java/lang/ClassComparison.java      | 101 +++++++++++
 .../openjdk/bench/java/lang/FPComparison.java | 159 +++++++++++++++++-
 .../bench/java/lang/IntegerComparison.java    | 153 +++++++++++++++++
 .../bench/java/lang/LongComparison.java       | 152 +++++++++++++++++
 .../bench/java/lang/PointerComparison.java    | 101 +++++++++++
 20 files changed, 940 insertions(+), 49 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/ClassComparison.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/IntegerComparison.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/LongComparison.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/PointerComparison.java

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 39a49f8f1eb..0dc39744741 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2156,6 +2156,36 @@ void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Regis
   }
 }
 
+void C2_MacroAssembler::enc_cmove_cmp_fp(int cmpFlag, FloatRegister op1, FloatRegister op2, Register dst, Register src, bool is_single) {
+  int op_select = cmpFlag & (~unsigned_branch_mask);
+
+  switch (op_select) {
+    case BoolTest::eq:
+      cmov_cmp_fp_eq(op1, op2, dst, src, is_single);
+      break;
+    case BoolTest::ne:
+      cmov_cmp_fp_ne(op1, op2, dst, src, is_single);
+      break;
+    case BoolTest::le:
+      cmov_cmp_fp_le(op1, op2, dst, src, is_single);
+      break;
+    case BoolTest::ge:
+      assert(false, "Should go to BoolTest::le case");
+      ShouldNotReachHere();
+      break;
+    case BoolTest::lt:
+      cmov_cmp_fp_lt(op1, op2, dst, src, is_single);
+      break;
+    case BoolTest::gt:
+      assert(false, "Should go to BoolTest::lt case");
+      ShouldNotReachHere();
+      break;
+    default:
+      assert(false, "unsupported compare condition");
+      ShouldNotReachHere();
+  }
+}
+
 // Set dst to NaN if any NaN input.
 void C2_MacroAssembler::minmax_fp(FloatRegister dst, FloatRegister src1, FloatRegister src2,
                                   FLOAT_TYPE ft, bool is_min) {
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index a650174d90f..73fceea3805 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -129,6 +129,10 @@
                  Register op1, Register op2,
                  Register dst, Register src);
 
+  void enc_cmove_cmp_fp(int cmpFlag,
+                        FloatRegister op1, FloatRegister op2,
+                        Register dst, Register src, bool is_single);
+
   void spill(Register r, bool is64, int offset) {
     is64 ? sd(r, Address(sp, offset))
          : sw(r, Address(sp, offset));
diff --git a/src/hotspot/cpu/riscv/c2_globals_riscv.hpp b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
index de3c1b17c8e..79bdc4917c9 100644
--- a/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_globals_riscv.hpp
@@ -43,7 +43,7 @@ define_pd_global(bool, TieredCompilation,            COMPILER1_PRESENT(true) NOT
 define_pd_global(intx, CompileThreshold,             10000);
 
 define_pd_global(intx, OnStackReplacePercentage,     140);
-define_pd_global(intx, ConditionalMoveLimit,         0);
+define_pd_global(intx, ConditionalMoveLimit,         3);
 define_pd_global(intx, FreqInlineSize,               325);
 define_pd_global(intx, MinJumpTableSize,             10);
 define_pd_global(intx, InteriorEntryAlignment,       16);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index c6393be0714..218da7cde03 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -1267,6 +1267,130 @@ void MacroAssembler::cmov_gtu(Register cmp1, Register cmp2, Register dst, Regist
   bind(no_set);
 }
 
+// ----------- cmove, compare float -----------
+
+// Move src to dst only if cmp1 == cmp2,
+// otherwise leave dst unchanged, including the case where one of them is NaN.
+// Clarification:
+//   java code      :  cmp1 != cmp2 ? dst : src
+//   transformed to :  CMove dst, (cmp1 eq cmp2), dst, src
+void MacroAssembler::cmov_cmp_fp_eq(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single) {
+  if (UseZicond) {
+    if (is_single) {
+      feq_s(t0, cmp1, cmp2);
+    } else {
+      feq_d(t0, cmp1, cmp2);
+    }
+    czero_nez(dst, dst, t0);
+    czero_eqz(t0 , src, t0);
+    orr(dst, dst, t0);
+    return;
+  }
+  Label no_set;
+  if (is_single) {
+    // jump if cmp1 != cmp2, including the case of NaN
+    // not jump (i.e. move src to dst) if cmp1 == cmp2
+    float_bne(cmp1, cmp2, no_set);
+  } else {
+    double_bne(cmp1, cmp2, no_set);
+  }
+  mv(dst, src);
+  bind(no_set);
+}
+
+// Keep dst unchanged only if cmp1 == cmp2,
+// otherwise move src to dst, including the case where one of them is NaN.
+// Clarification:
+//   java code      :  cmp1 == cmp2 ? dst : src
+//   transformed to :  CMove dst, (cmp1 ne cmp2), dst, src
+void MacroAssembler::cmov_cmp_fp_ne(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single) {
+  if (UseZicond) {
+    if (is_single) {
+      feq_s(t0, cmp1, cmp2);
+    } else {
+      feq_d(t0, cmp1, cmp2);
+    }
+    czero_eqz(dst, dst, t0);
+    czero_nez(t0 , src, t0);
+    orr(dst, dst, t0);
+    return;
+  }
+  Label no_set;
+  if (is_single) {
+    // jump if cmp1 == cmp2
+    // not jump (i.e. move src to dst) if cmp1 != cmp2, including the case of NaN
+    float_beq(cmp1, cmp2, no_set);
+  } else {
+    double_beq(cmp1, cmp2, no_set);
+  }
+  mv(dst, src);
+  bind(no_set);
+}
+
+// When cmp1 <= cmp2 or any of them is NaN then dst = src, otherwise, dst = dst
+// Clarification
+//   scenario 1:
+//     java code      :  cmp2 < cmp1 ? dst : src
+//     transformed to :  CMove dst, (cmp1 le cmp2), dst, src
+//   scenario 2:
+//     java code      :  cmp1 > cmp2 ? dst : src
+//     transformed to :  CMove dst, (cmp1 le cmp2), dst, src
+void MacroAssembler::cmov_cmp_fp_le(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single) {
+  if (UseZicond) {
+    if (is_single) {
+      flt_s(t0, cmp2, cmp1);
+    } else {
+      flt_d(t0, cmp2, cmp1);
+    }
+    czero_eqz(dst, dst, t0);
+    czero_nez(t0 , src, t0);
+    orr(dst, dst, t0);
+    return;
+  }
+  Label no_set;
+  if (is_single) {
+    // jump if cmp1 > cmp2
+    // not jump (i.e. move src to dst) if cmp1 <= cmp2 or either is NaN
+    float_bgt(cmp1, cmp2, no_set);
+  } else {
+    double_bgt(cmp1, cmp2, no_set);
+  }
+  mv(dst, src);
+  bind(no_set);
+}
+
+// When cmp1 < cmp2 or any of them is NaN then dst = src, otherwise, dst = dst
+// Clarification
+//   scenario 1:
+//     java code      :  cmp2 <= cmp1 ? dst : src
+//     transformed to :  CMove dst, (cmp1 lt cmp2), dst, src
+//   scenario 2:
+//     java code      :  cmp1 >= cmp2 ? dst : src
+//     transformed to :  CMove dst, (cmp1 lt cmp2), dst, src
+void MacroAssembler::cmov_cmp_fp_lt(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single) {
+  if (UseZicond) {
+    if (is_single) {
+      fle_s(t0, cmp2, cmp1);
+    } else {
+      fle_d(t0, cmp2, cmp1);
+    }
+    czero_eqz(dst, dst, t0);
+    czero_nez(t0 , src, t0);
+    orr(dst, dst, t0);
+    return;
+  }
+  Label no_set;
+  if (is_single) {
+    // jump if cmp1 >= cmp2
+    // not jump (i.e. move src to dst) if cmp1 < cmp2 or either is NaN
+    float_bge(cmp1, cmp2, no_set);
+  } else {
+    double_bge(cmp1, cmp2, no_set);
+  }
+  mv(dst, src);
+  bind(no_set);
+}
+
 // Float compare branch instructions
 
 #define INSN(NAME, FLOATCMP, BRANCH)                                                                                    \
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index b390fb236c2..c47200579c7 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -657,6 +657,11 @@ class MacroAssembler: public Assembler {
   void cmov_gt(Register cmp1, Register cmp2, Register dst, Register src);
   void cmov_gtu(Register cmp1, Register cmp2, Register dst, Register src);
 
+  void cmov_cmp_fp_eq(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single);
+  void cmov_cmp_fp_ne(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single);
+  void cmov_cmp_fp_le(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single);
+  void cmov_cmp_fp_lt(FloatRegister cmp1, FloatRegister cmp2, Register dst, Register src, bool is_single);
+
  public:
   // We try to follow risc-v asm menomics.
   // But as we don't layout a reachable GOT,
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 1eb1464e7d9..2e9d25c8156 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1933,6 +1933,12 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_SubHF:
     case Op_SqrtHF:
       return UseZfh;
+
+    case Op_CMoveF:
+    case Op_CMoveD:
+    case Op_CMoveP:
+    case Op_CMoveN:
+      return false;
   }
 
   return true; // Per default match rules are supported.
@@ -9938,12 +9944,15 @@ instruct far_cmpP_narrowOop_imm0_branch(cmpOpEqNe cmp, iRegN op1, immP0 zero, la
 
 // ============================================================================
 // Conditional Move Instructions
+
+// --------- CMoveI ---------
+
 instruct cmovI_cmpI(iRegINoSp dst, iRegI src, iRegI op1, iRegI op2, cmpOp cop) %{
   match(Set dst (CMoveI (Binary cop (CmpI op1 op2)) (Binary dst src)));
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpI\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpI\n\t"
   %}
 
   ins_encode %{
@@ -9960,7 +9969,7 @@ instruct cmovI_cmpU(iRegINoSp dst, iRegI src, iRegI op1, iRegI op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpU\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpU\n\t"
   %}
 
   ins_encode %{
@@ -9977,7 +9986,7 @@ instruct cmovI_cmpL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOp cop) %
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpL\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpL\n\t"
   %}
 
   ins_encode %{
@@ -9994,7 +10003,7 @@ instruct cmovI_cmpUL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpUL\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpUL\n\t"
   %}
 
   ins_encode %{
@@ -10006,12 +10015,46 @@ instruct cmovI_cmpUL(iRegINoSp dst, iRegI src, iRegL op1, iRegL op2, cmpOpU cop)
   ins_pipe(pipe_class_compare);
 %}
 
+instruct cmovI_cmpF(iRegINoSp dst, iRegI src, fRegF op1, fRegF op2, cmpOp cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpF op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpF\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove_cmp_fp($cop$$cmpcode,
+                        as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        as_Register($dst$$reg), as_Register($src$$reg), true /* is_single */);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct cmovI_cmpD(iRegINoSp dst, iRegI src, fRegD op1, fRegD op2, cmpOp cop) %{
+  match(Set dst (CMoveI (Binary cop (CmpD op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpD\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove_cmp_fp($cop$$cmpcode | C2_MacroAssembler::double_branch_mask,
+                        as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        as_Register($dst$$reg), as_Register($src$$reg), false /* is_single */);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
 instruct cmovI_cmpN(iRegINoSp dst, iRegI src, iRegN op1, iRegN op2, cmpOpU cop) %{
   match(Set dst (CMoveI (Binary cop (CmpN op1 op2)) (Binary dst src)));
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpN\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpN\n\t"
   %}
 
   ins_encode %{
@@ -10028,7 +10071,7 @@ instruct cmovI_cmpP(iRegINoSp dst, iRegI src, iRegP op1, iRegP op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpP\n\t"
+    "CMoveI $dst, ($op1 $cop $op2), $dst, $src\t#@cmovI_cmpP\n\t"
   %}
 
   ins_encode %{
@@ -10040,12 +10083,14 @@ instruct cmovI_cmpP(iRegINoSp dst, iRegI src, iRegP op1, iRegP op2, cmpOpU cop)
   ins_pipe(pipe_class_compare);
 %}
 
+// --------- CMoveL ---------
+
 instruct cmovL_cmpL(iRegLNoSp dst, iRegL src, iRegL op1, iRegL op2, cmpOp cop) %{
   match(Set dst (CMoveL (Binary cop (CmpL op1 op2)) (Binary dst src)));
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpL\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpL\n\t"
   %}
 
   ins_encode %{
@@ -10062,7 +10107,7 @@ instruct cmovL_cmpUL(iRegLNoSp dst, iRegL src, iRegL op1, iRegL op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpUL\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpUL\n\t"
   %}
 
   ins_encode %{
@@ -10079,7 +10124,7 @@ instruct cmovL_cmpI(iRegLNoSp dst, iRegL src, iRegI op1, iRegI op2, cmpOp cop) %
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpI\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpI\n\t"
   %}
 
   ins_encode %{
@@ -10096,7 +10141,7 @@ instruct cmovL_cmpU(iRegLNoSp dst, iRegL src, iRegI op1, iRegI op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpU\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpU\n\t"
   %}
 
   ins_encode %{
@@ -10108,12 +10153,46 @@ instruct cmovL_cmpU(iRegLNoSp dst, iRegL src, iRegI op1, iRegI op2, cmpOpU cop)
   ins_pipe(pipe_class_compare);
 %}
 
+instruct cmovL_cmpF(iRegLNoSp dst, iRegL src, fRegF op1, fRegF op2, cmpOp cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpF op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpF\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove_cmp_fp($cop$$cmpcode,
+                        as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        as_Register($dst$$reg), as_Register($src$$reg), true /* is_single */);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
+instruct cmovL_cmpD(iRegLNoSp dst, iRegL src, fRegD op1, fRegD op2, cmpOp cop) %{
+  match(Set dst (CMoveL (Binary cop (CmpD op1 op2)) (Binary dst src)));
+  ins_cost(ALU_COST + BRANCH_COST);
+
+  format %{
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpD\n\t"
+  %}
+
+  ins_encode %{
+    __ enc_cmove_cmp_fp($cop$$cmpcode | C2_MacroAssembler::double_branch_mask,
+                        as_FloatRegister($op1$$reg), as_FloatRegister($op2$$reg),
+                        as_Register($dst$$reg), as_Register($src$$reg), false /* is_single */);
+  %}
+
+  ins_pipe(pipe_class_compare);
+%}
+
 instruct cmovL_cmpN(iRegLNoSp dst, iRegL src, iRegN op1, iRegN op2, cmpOpU cop) %{
   match(Set dst (CMoveL (Binary cop (CmpN op1 op2)) (Binary dst src)));
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpN\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpN\n\t"
   %}
 
   ins_encode %{
@@ -10130,7 +10209,7 @@ instruct cmovL_cmpP(iRegLNoSp dst, iRegL src, iRegP op1, iRegP op2, cmpOpU cop)
   ins_cost(ALU_COST + BRANCH_COST);
 
   format %{
-    "CMove $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpP\n\t"
+    "CMoveL $dst, ($op1 $cop $op2), $dst, $src\t#@cmovL_cmpP\n\t"
   %}
 
   ins_encode %{
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index a0de9d767bf..8dcffc9c646 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -248,14 +248,6 @@ void VM_Version::common_initialize() {
 
 #ifdef COMPILER2
 void VM_Version::c2_initialize() {
-  if (UseCMoveUnconditionally) {
-    FLAG_SET_DEFAULT(UseCMoveUnconditionally, false);
-  }
-
-  if (ConditionalMoveLimit > 0) {
-    FLAG_SET_DEFAULT(ConditionalMoveLimit, 0);
-  }
-
   if (!UseRVV) {
     FLAG_SET_DEFAULT(MaxVectorSize, 0);
   } else {
diff --git a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
index 06d6aaf109f..d19128cafc2 100644
--- a/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/riscv_hwprobe.cpp
@@ -233,10 +233,13 @@ void RiscvHwprobe::add_features_from_query_result() {
   if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZACAS)) {
     VM_Version::ext_Zacas.enable_feature();
   }
-#endif
+  // Currently tests shows that cmove using Zicond instructions will bring
+  // performance regression, but to get a test coverage all the time, will
+  // still prefer to enabling it in debug version.
   if (is_set(RISCV_HWPROBE_KEY_IMA_EXT_0, RISCV_HWPROBE_EXT_ZICOND)) {
     VM_Version::ext_Zicond.enable_feature();
   }
+#endif
   if (is_valid(RISCV_HWPROBE_KEY_CPUPERF_0)) {
     VM_Version::unaligned_access.enable_feature(
        query[RISCV_HWPROBE_KEY_CPUPERF_0].value & RISCV_HWPROBE_MISALIGNED_MASK);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
index dffafea7ea8..d19e2562779 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModINodeIdealizationTests.java
@@ -121,10 +121,8 @@ public int powerOf2Random(int x) {
     }
 
     @Test
-    @IR(applyIfPlatform = {"riscv64", "false"},
-        failOn = {IRNode.MOD_I})
-    @IR(applyIfPlatform = {"riscv64", "false"},
-        counts = {IRNode.AND_I, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_I, "2"})
+    @IR(failOn = {IRNode.MOD_I})
+    @IR(counts = {IRNode.AND_I, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_I, "2"})
     // Special optimization for the case 2^k-1 for bigger k
     public int powerOf2Minus1(int x) {
         return x % 127;
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
index e931ff87c09..fc08ef60603 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModLNodeIdealizationTests.java
@@ -105,10 +105,8 @@ public long powerOf2Random(long x) {
     }
 
     @Test
-    @IR(applyIfPlatform = {"riscv64", "false"},
-        failOn = {IRNode.MOD_L})
-    @IR(applyIfPlatform = {"riscv64", "false"},
-        counts = {IRNode.AND_L, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_L, "2"})
+    @IR(failOn = {IRNode.MOD_L})
+    @IR(counts = {IRNode.AND_L, ">=1", IRNode.RSHIFT, ">=1", IRNode.CMP_L, "2"})
     // Special optimization for the case 2^k-1 for bigger k
     public long powerOf2Minus1(long x) {
         return x % ((1L << 33) - 1);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
index de32b7b21f6..35d676b6ddb 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestConv2BExpansion.java
@@ -42,6 +42,14 @@ public static void main(String[] args) {
         TestFramework.run();
     }
 
+    // These IR checks do not apply on riscv64, as riscv64 supports Conv2B, e.g. for `return x == 0`,
+    // the graph looks like:
+    //      Return (XorI (Conv2B ConI(#int: 1)))
+    // On other platforms, e.g. x86_64 which does not supports Conv2B, the graph looks like:
+    //      Return (CMoveI (Bool (CompI (Param1 ConI(#int: 0))) ConI(#int: 1) ConI(#int: 0)))
+    // On riscv64, current graph is more efficient than `CMoveI`, as it
+    //      1. generates less code
+    //      2. even when zicond is not supported, it does not introduce branches.
     @Test
     @IR(counts = {IRNode.CMOVE_I, "1"}, failOn = {IRNode.XOR})
     public boolean testIntEquals0(int x) {
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
index 8445c856b4e..a06cb45d59e 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
@@ -31,7 +31,6 @@
  * @summary Test that code generation for fp comparison works as intended
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestFPComparison
- * @requires os.arch != "riscv64"
  */
 public class TestFPComparison {
     static final double[] DOUBLES = new double[] {
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index e232895257a..bb0a1200a7f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -33,7 +33,6 @@
  * @bug 8324655 8329797 8331090
  * @key randomness
  * @summary Test that if expressions are properly folded into min/max nodes
- * @requires os.arch != "riscv64"
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestIfMinMax
  */
@@ -228,7 +227,7 @@ static Object[] setupLongArrays() {
 
     @Test
     @IR(applyIf = { "SuperWordReductions", "true" },
-        applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+        applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MAX_REDUCTION_V, "> 0" })
     @Arguments(setup = "setupIntArrays")
     public Object[] testMaxIntReduction(int[] a, int[] b) {
@@ -262,7 +261,7 @@ public void checkTestMaxIntReduction(Object[] vals) {
 
     @Test
     @IR(applyIf = { "SuperWordReductions", "true" },
-        applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+        applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MIN_REDUCTION_V, "> 0" })
     @Arguments(setup = "setupIntArrays")
     public Object[] testMinIntReduction(int[] a, int[] b) {
@@ -297,7 +296,7 @@ public void checkTestMinIntReduction(Object[] vals) {
 
     @Test
     @IR(applyIf = { "SuperWordReductions", "true" },
-        applyIfCPUFeatureOr = { "avx512", "true" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" },
         counts = { IRNode.MAX_REDUCTION_V, "> 0" })
     @Arguments(setup = "setupLongArrays")
     public Object[] testMaxLongReduction(long[] a, long[] b) {
@@ -332,7 +331,7 @@ public void checkTestMaxLongReduction(Object[] vals) {
 
     @Test
     @IR(applyIf = { "SuperWordReductions", "true" },
-        applyIfCPUFeatureOr = { "avx512", "true" },
+        applyIfCPUFeatureOr = { "avx512", "true", "rvv", "true" },
         counts = { IRNode.MIN_REDUCTION_V, "> 0" })
     @Arguments(setup = "setupLongArrays")
     public Object[] testMinLongReduction(long[] a, long[] b) {
@@ -366,7 +365,7 @@ public void checkTestMinLongReduction(Object[] vals) {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MAX_VI, "> 0" })
     @Arguments(setup = "setupIntArrays")
     public Object[] testMaxIntVector(int[] a, int[] b) {
@@ -401,7 +400,7 @@ public void checkTestMaxIntVector(Object[] vals) {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MIN_VI, "> 0" })
     @Arguments(setup = "setupIntArrays")
     public Object[] testMinIntVector(int[] a, int[] b) {
@@ -436,7 +435,7 @@ public void checkTestMinIntVector(Object[] vals) {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MAX_VL, "> 0" })
     @Arguments(setup = "setupLongArrays")
     public Object[] testMaxLongVector(long[] a, long[] b) {
@@ -471,7 +470,7 @@ public void checkTestMaxLongVector(Object[] vals) {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true"},
+    @IR(applyIfCPUFeatureOr = { "sse4.1", "true" , "asimd" , "true", "rvv", "true"},
         counts = { IRNode.MIN_VL, "> 0" })
     @Arguments(setup = "setupLongArrays")
     public Object[] testMinLongVector(long[] a, long[] b) {
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index 8f70ad9b7d0..a6d738b3a09 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -146,6 +146,7 @@ public class TestFramework {
                     "UseRVV",
                     "UseZbb",
                     "UseZfh",
+                    "UseZicond",
                     "UseZvbb"
             )
     );
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorTest.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorTest.java
index 35f357c22f2..c6329c70f65 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorTest.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
@@ -35,6 +35,7 @@
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*sse4.*" & (vm.opt.UseSSE == "null" | vm.opt.UseSSE > 3))
  *           | os.arch == "aarch64"
+ *           | (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @run driver compiler.vectorapi.TestVectorTest
  */
 public class TestVectorTest {
diff --git a/test/micro/org/openjdk/bench/java/lang/ClassComparison.java b/test/micro/org/openjdk/bench/java/lang/ClassComparison.java
new file mode 100644
index 00000000000..2a768f243e2
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/ClassComparison.java
@@ -0,0 +1,101 @@
+/*
+ * 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 org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.random.RandomGenerator;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+public class ClassComparison {
+    static final int INVOCATIONS = 1024;
+
+    Class[] c1;
+    Class[] c2;
+    int[] res;
+    long[] resLong;
+    Object[] resObject;
+    Object ro1;
+    Object ro2;
+    Object[] resClass;
+    Class rc1;
+    Class rc2;
+
+    @Setup
+    public void setup() {
+        var random = RandomGenerator.getDefault();
+        c1 = new Class[INVOCATIONS];
+        c2 = new Class[INVOCATIONS];
+        res = new int[INVOCATIONS];
+        resLong = new long[INVOCATIONS];
+        resObject = new Object[INVOCATIONS];
+        ro1 = new Object();
+        ro2 = new Object();
+        resClass = new Class[INVOCATIONS];
+        rc1 = Float.class;
+        rc2 = Double.class;
+        for (int i = 0; i < INVOCATIONS; i++) {
+            c1[i] = random.nextBoolean() ? Float.class : Double.class;
+        }
+        List<Class> list = Arrays.asList(c1);
+        Collections.shuffle(list);
+        list.toArray(c2);
+    }
+
+    @Benchmark
+    public void equalClass() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (c1[i] == c2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void notEqualClass() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (c1[i] != c2[i]) ? 1 : 2;
+        }
+    }
+
+    public void equalClassResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (c1[i] == c2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void notEqualClassResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (c1[i] != c2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/FPComparison.java b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
index 9fe88b934f8..8074ada3257 100644
--- a/test/micro/org/openjdk/bench/java/lang/FPComparison.java
+++ b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
@@ -23,6 +23,7 @@
 package org.openjdk.bench.java.lang;
 
 import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.concurrent.TimeUnit;
 import java.util.random.RandomGenerator;
@@ -41,6 +42,13 @@ public class FPComparison {
     float[] f2;
     double[] d2;
     int[] res;
+    long[] resLong;
+    Object[] resObject;
+    Object ro1;
+    Object ro2;
+    Class[] resClass;
+    Class rc1;
+    Class rc2;
 
     @Setup
     public void setup() {
@@ -50,6 +58,13 @@ public void setup() {
         f2 = new float[INVOCATIONS];
         d2 = new double[INVOCATIONS];
         res = new int[INVOCATIONS];
+        resLong = new long[INVOCATIONS];
+        resObject = new Object[INVOCATIONS];
+        ro1 = new Object();
+        ro2 = new Object();
+        resClass = new Class[INVOCATIONS];
+        rc1 = Float.class;
+        rc2 = Double.class;
         for (int i = 0; i < INVOCATIONS; i++) {
             int type = random.nextInt(5);
             if (type == 1) {
@@ -79,56 +94,184 @@ public void setup() {
     @Benchmark
     public void isNanFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Float.isNaN(f1[i]) ? 1 : 0;
+            res[i] = Float.isNaN(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void isNanDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Double.isNaN(d1[i]) ? 1 : 0;
+            res[i] = Double.isNaN(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void isInfiniteFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Float.isInfinite(f1[i]) ? 1 : 0;
+            res[i] = Float.isInfinite(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void isInfiniteDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Double.isInfinite(d1[i]) ? 1 : 0;
+            res[i] = Double.isInfinite(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void isFiniteFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Float.isFinite(f1[i]) ? 1 : 0;
+            res[i] = Float.isFinite(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void isFiniteDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = Double.isFinite(d1[i]) ? 1 : 0;
+            res[i] = Double.isFinite(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void equalFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = (f1[i] == f2[i]) ? 1 : 0;
+            res[i] = (f1[i] == f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
     public void equalDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
-            res[i] = (d1[i] == d2[i]) ? 1 : 0;
+            res[i] = (d1[i] == d2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] < f2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] < d2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] <= f2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] <= d2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] > f2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] > d2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] >= f2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] >= d2[i]) ? 1 : 2;
+        }
+    }
+
+    // --------- result: long ---------
+
+    @Benchmark
+    public void equalFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] == f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void equalDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] == d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] < f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] < d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] <= f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] <= d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] > f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] > d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] >= f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] >= d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/IntegerComparison.java b/test/micro/org/openjdk/bench/java/lang/IntegerComparison.java
new file mode 100644
index 00000000000..1853be8497d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/IntegerComparison.java
@@ -0,0 +1,153 @@
+/*
+ * 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 org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+import java.util.random.RandomGenerator;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+public class IntegerComparison {
+    static final int INVOCATIONS = 1024;
+
+    int[] i1;
+    int[] i2;
+    int[] res;
+    long[] resLong;
+    Object[] resObject;
+    Object ro1;
+    Object ro2;
+    Object[] resClass;
+    Class rc1;
+    Class rc2;
+
+    @Setup
+    public void setup() {
+        var random = RandomGenerator.getDefault();
+        i1 = new int[INVOCATIONS];
+        i2 = new int[INVOCATIONS];
+        res = new int[INVOCATIONS];
+        resLong = new long[INVOCATIONS];
+        resObject = new Object[INVOCATIONS];
+        ro1 = new Object();
+        ro2 = new Object();
+        resClass = new Class[INVOCATIONS];
+        rc1 = Float.class;
+        rc2 = Double.class;
+        for (int i = 0; i < INVOCATIONS; i++) {
+            i1[i] = random.nextInt(INVOCATIONS);
+            i2[i] = random.nextInt(INVOCATIONS);
+        }
+    }
+
+    @Benchmark
+    public void equalInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] == i2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void notEqualInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] != i2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] < i2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] <= i2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] > i2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualInteger() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (i1[i] >= i2[i]) ? 1 : 2;
+        }
+    }
+
+    // --------- result: long ---------
+
+    public void equalIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] == i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void notEqualIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] != i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    public void lessIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] < i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] <= i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    public void greaterIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] > i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualIntegerResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (i1[i] >= i2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/LongComparison.java b/test/micro/org/openjdk/bench/java/lang/LongComparison.java
new file mode 100644
index 00000000000..bed5ee245b2
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/LongComparison.java
@@ -0,0 +1,152 @@
+/*
+ * 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 org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.util.concurrent.TimeUnit;
+import java.util.random.RandomGenerator;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+public class LongComparison {
+    static final int INVOCATIONS = 1024;
+
+    long[] l1;
+    long[] l2;
+    int[] res;
+    long[] resLong;
+    Object[] resObject;
+    Object ro1;
+    Object ro2;
+    Object[] resClass;
+    Class rc1;
+    Class rc2;
+
+    @Setup
+    public void setup() {
+        var random = RandomGenerator.getDefault();
+        l1 = new long[INVOCATIONS];
+        l2 = new long[INVOCATIONS];
+        res = new int[INVOCATIONS];
+        resLong = new long[INVOCATIONS];
+        resObject = new Object[INVOCATIONS];
+        ro1 = new Object();
+        ro2 = new Object();
+        resClass = new Class[INVOCATIONS];
+        rc1 = Float.class;
+        rc2 = Double.class;
+        for (int i = 0; i < INVOCATIONS; i++) {
+            l1[i] = random.nextLong(INVOCATIONS);
+            l2[i] = random.nextLong(INVOCATIONS);
+        }
+    }
+
+    @Benchmark
+    public void equalLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] == l2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void notEqualLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] != l2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] < l2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] <= l2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] > l2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (l1[i] >= l2[i]) ? 1 : 2;
+        }
+    }
+
+    // --------- result: long ---------
+
+    public void equalLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] == l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void notEqualLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] != l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    public void lessLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] < l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void lessEqualLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] <= l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    public void greaterLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] > l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void greaterEqualLongResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (l1[i] >= l2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/PointerComparison.java b/test/micro/org/openjdk/bench/java/lang/PointerComparison.java
new file mode 100644
index 00000000000..b6bcf008619
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/PointerComparison.java
@@ -0,0 +1,101 @@
+/*
+ * 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 org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.random.RandomGenerator;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+public class PointerComparison {
+    static final int INVOCATIONS = 1024;
+
+    Object[] o1;
+    Object[] o2;
+    int[] res;
+    long[] resLong;
+    Object[] resObject;
+    Object ro1;
+    Object ro2;
+    Object[] resClass;
+    Class rc1;
+    Class rc2;
+
+    @Setup
+    public void setup() {
+        var random = RandomGenerator.getDefault();
+        o1 = new Object[INVOCATIONS];
+        o2 = new Object[INVOCATIONS];
+        res = new int[INVOCATIONS];
+        resLong = new long[INVOCATIONS];
+        resObject = new Object[INVOCATIONS];
+        ro1 = new Object();
+        ro2 = new Object();
+        resClass = new Class[INVOCATIONS];
+        rc1 = Float.class;
+        rc2 = Double.class;
+        for (int i = 0; i < INVOCATIONS; i++) {
+            o1[i] = new Object();
+        }
+        List<Object> list = Arrays.asList(o1);
+        Collections.shuffle(list);
+        list.toArray(o2);
+    }
+
+    @Benchmark
+    public void equalObject() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (o1[i] == o2[i]) ? 1 : 2;
+        }
+    }
+
+    @Benchmark
+    public void notEqualObject() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (o1[i] != o2[i]) ? 1 : 2;
+        }
+    }
+
+    public void equalObjectResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (o1[i] == o2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void notEqualObjectResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (o1[i] != o2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
+        }
+    }
+}

From 7cd084cf350f66fd6ed5b6f5ba9fda71072963fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C5=A0ipka?= <isipka@openjdk.org>
Date: Tue, 22 Apr 2025 08:46:52 +0000
Subject: [PATCH 043/901] 8350442: Update copyright

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

diff --git a/test/jdk/sun/nio/cs/Test6392804.java b/test/jdk/sun/nio/cs/Test6392804.java
index a98428c3e7f..63da96162c4 100644
--- a/test/jdk/sun/nio/cs/Test6392804.java
+++ b/test/jdk/sun/nio/cs/Test6392804.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 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
diff --git a/test/jdk/sun/nio/cs/TestUTF_32.java b/test/jdk/sun/nio/cs/TestUTF_32.java
index ba042494fd2..10de9084b00 100644
--- a/test/jdk/sun/nio/cs/TestUTF_32.java
+++ b/test/jdk/sun/nio/cs/TestUTF_32.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 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

From 9eeb86d972ac4cc38d923b2b868b426bbd27a4e8 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 08:58:42 +0000
Subject: [PATCH 044/901] 8354341: Open some JTable bugs 7

Reviewed-by: kizune, serb
---
 test/jdk/javax/swing/JTable/ShiftClick.java | 187 ++++++++++++++++++++
 test/jdk/javax/swing/JTable/bug4128506.java |  84 +++++++++
 test/jdk/javax/swing/JTable/bug4190222.java | 103 +++++++++++
 test/jdk/javax/swing/JTable/bug4224179.java |  74 ++++++++
 4 files changed, 448 insertions(+)
 create mode 100644 test/jdk/javax/swing/JTable/ShiftClick.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4128506.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4190222.java
 create mode 100644 test/jdk/javax/swing/JTable/bug4224179.java

diff --git a/test/jdk/javax/swing/JTable/ShiftClick.java b/test/jdk/javax/swing/JTable/ShiftClick.java
new file mode 100644
index 00000000000..4d617b5eeda
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/ShiftClick.java
@@ -0,0 +1,187 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.border.BevelBorder;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4201917
+ * @summary Shift Click in table before making selection
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ShiftClick
+ */
+
+public class ShiftClick {
+    private static final String INSTRUCTIONS = """
+            Shift click in the table. Check that all cells
+            from the first through where you clicked are selected.
+            If the cells are selected, press pass, otherwise fail.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(ShiftClick::createTestUI)
+                .logArea(6)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("ShiftClick");
+
+        // Take the dummy data from SwingSet.
+        final String[] names = {"First Name", "Last Name", "Favorite Color",
+                "Favorite Number", "Vegetarian"};
+        final Object[][] data = {
+                {"Mark", "Andrews", "Red", 2, true},
+                {"Tom", "Ball", "Blue", 99, false},
+                {"Alan", "Chung", "Green", 838, false},
+                {"Jeff", "Dinkins", "Turquois", 8, true},
+                {"Amy", "Fowler", "Yellow", 3, false},
+                {"Brian", "Gerhold", "Green", 0, false},
+                {"James", "Gosling", "Pink", 21, false},
+                {"David", "Karlton", "Red", 1, false},
+                {"Dave", "Kloba", "Yellow", 14, false},
+                {"Peter", "Korn", "Purple", 12, false},
+                {"Phil", "Milne", "Purple", 3, false},
+                {"Dave", "Moore", "Green", 88, false},
+                {"Hans", "Muller", "Maroon", 5, false},
+                {"Rick", "Levenson", "Blue", 2, false},
+                {"Tim", "Prinzing", "Blue", 22, false},
+                {"Chester", "Rose", "Black", 0, false},
+                {"Ray", "Ryan", "Gray", 77, false},
+                {"Georges", "Saab", "Red", 4, false},
+                {"Willie", "Walker", "Phthalo Blue", 4, false},
+                {"Kathy", "Walrath", "Blue", 8, false},
+                {"Arnaud", "Weber", "Green", 44, false}
+        };
+
+        // Create a model of the data.
+        TableModel dataModel = new AbstractTableModel() {
+            // These methods always need to be implemented.
+            public int getColumnCount() {
+                return names.length;
+            }
+
+            public int getRowCount() {
+                return data.length;
+            }
+
+            public Object getValueAt(int row, int col) {
+                return data[row][col];
+            }
+
+            // The default implementations of these methods in
+            // AbstractTableModel would work, but we can refine them.
+            public String getColumnName(int column) {
+                return names[column];
+            }
+
+            public Class getColumnClass(int c) {
+                return getValueAt(0, c).getClass();
+            }
+
+            public boolean isCellEditable(int row, int col) {
+                return true;
+            }
+
+            public void setValueAt(Object aValue, int row, int column) {
+                System.out.println("Setting value to: " + aValue);
+                data[row][column] = aValue;
+            }
+        };
+
+        // Create the table
+        JTable tableView = new JTable(dataModel);
+        // Turn off auto-resizing so that we can set column sizes programmatically.
+        // In this mode, all columns will get their preferred widths, as set blow.
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+
+        // Create a combo box to show that you can use one in a table.
+        JComboBox comboBox = new JComboBox();
+        comboBox.addItem("Red");
+        comboBox.addItem("Orange");
+        comboBox.addItem("Yellow");
+        comboBox.addItem("Green");
+        comboBox.addItem("Blue");
+        comboBox.addItem("Indigo");
+        comboBox.addItem("Violet");
+
+        TableColumn colorColumn = tableView.getColumn("Favorite Color");
+        // Use the combo box as the editor in the "Favorite Color" column.
+        colorColumn.setCellEditor(new DefaultCellEditor(comboBox));
+
+        // Set a pink background and tooltip for the Color column renderer.
+        DefaultTableCellRenderer colorColumnRenderer = new DefaultTableCellRenderer();
+        colorColumnRenderer.setBackground(Color.pink);
+        colorColumnRenderer.setToolTipText("Click for combo box");
+        colorColumn.setCellRenderer(colorColumnRenderer);
+
+        // Set a tooltip for the header of the colors column.
+        TableCellRenderer headerRenderer = colorColumn.getHeaderRenderer();
+        if (headerRenderer instanceof DefaultTableCellRenderer)
+            ((DefaultTableCellRenderer) headerRenderer).setToolTipText("Hi Mom!");
+
+        // Set the width of the "Vegetarian" column.
+        TableColumn vegetarianColumn = tableView.getColumn("Vegetarian");
+        vegetarianColumn.setPreferredWidth(100);
+
+        // Show the values in the "Favorite Number" column in different colors.
+        TableColumn numbersColumn = tableView.getColumn("Favorite Number");
+        DefaultTableCellRenderer numberColumnRenderer = new DefaultTableCellRenderer() {
+            public void setValue(Object value) {
+                int cellValue = (value instanceof Number) ? ((Number) value).intValue() : 0;
+                setForeground((cellValue > 30) ? Color.black : Color.red);
+                setText((value == null) ? "" : value.toString());
+            }
+        };
+        numberColumnRenderer.setHorizontalAlignment(JLabel.RIGHT);
+        numbersColumn.setCellRenderer(numberColumnRenderer);
+        numbersColumn.setPreferredWidth(110);
+
+        // Finish setting up the table.
+        JScrollPane scrollpane = new JScrollPane(tableView);
+        scrollpane.setBorder(new BevelBorder(BevelBorder.LOWERED));
+        scrollpane.setPreferredSize(new Dimension(430, 200));
+
+        frame.add(scrollpane);
+        frame.setSize(500, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4128506.java b/test/jdk/javax/swing/JTable/bug4128506.java
new file mode 100644
index 00000000000..21273c6f318
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4128506.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableModel;
+
+/*
+ * @test
+ * @bug 4128506
+ * @summary Tests that JTable with AUTO_RESIZE_ALL_COLUMNS correctly compute width of columns
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4128506
+ */
+
+public class bug4128506 {
+    private static final String INSTRUCTIONS = """
+            If the columns of JTable have the same width the test passes, else test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4128506::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        final Object[][] data = {
+                {"cell_1_1", "cell_1_2", "cell_1_3"},
+                {"cell_2_1", "cell_2_2", "cell_2_3"},
+                {"cell_3_1", "cell_3_2", "cell_3_3"},
+                {"cell_4_1", "cell_4_2", "cell_4_3"},
+        };
+
+        TableModel dataModel = new AbstractTableModel() {
+            public int getColumnCount() {
+                return 3;
+            }
+
+            public int getRowCount() {
+                return data.length;
+            }
+
+            public Object getValueAt(int row, int col) {
+                return data[row][col];
+            }
+        };
+
+        JFrame frame = new JFrame("bug4128506");
+        JTable tableView = new JTable(dataModel);
+        tableView.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
+        tableView.getColumnModel().getColumn(1).setMinWidth(5);
+        JScrollPane scrollpane = new JScrollPane(tableView);
+        frame.add(scrollpane);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4190222.java b/test/jdk/javax/swing/JTable/bug4190222.java
new file mode 100644
index 00000000000..5d6fcd2b0cc
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4190222.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+import java.awt.Dimension;
+import java.awt.Robot;
+import java.util.Vector;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+
+/*
+ * @test
+ * @bug 4190222
+ * @summary Setting data vector on the model correctly repaint table
+ * @key headful
+ * @run main bug4190222
+ */
+
+public class bug4190222 {
+    static JFrame frame;
+    static DefaultTableModel dtm;
+    static JTable tbl;
+
+    static Vector data;
+    static Vector colNames;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                Dimension preResize = tbl.getSize();
+                dtm.setDataVector(data, colNames);
+
+                if (!preResize.equals(tbl.getSize())) {
+                    throw new RuntimeException("Size of table changed after resizing.");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4190222");
+
+        data = new Vector(1, 1);
+        colNames = new Vector(3);
+        for (int i = 1; i < 4; i++) {
+            Vector row = new Vector(1, 1);
+            row.addElement("Row " + i + ", Col 1");
+            row.addElement("Row " + i + ", Col 2");
+            row.addElement("Row " + i + ", Col 3");
+            data.addElement(row);
+        }
+        colNames.addElement("Col 1");
+        colNames.addElement("Col 2");
+        colNames.addElement("Col 3");
+
+        dtm = new DefaultTableModel(data, colNames);
+        tbl = new JTable(dtm);
+        JScrollPane scrollPane = new JScrollPane(tbl);
+        frame.add("Center", scrollPane);
+        JPanel panel = new JPanel();
+        frame.add("South", panel);
+
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/bug4224179.java b/test/jdk/javax/swing/JTable/bug4224179.java
new file mode 100644
index 00000000000..b223f3f4716
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/bug4224179.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
+/*
+ * @test
+ * @bug 4224179
+ * @summary Tests if Table default cell editor doesn't handle % (percent) character correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4224179
+ */
+
+public class bug4224179 {
+    private static final String INSTRUCTIONS = """
+            1. Click ONCE on the center cell ("Huml")
+            2. Type the following symbols one after another: a%b
+
+            If the center cell doesn't read "Humla%b" the test fails.
+
+            3. After the above, press the ESCAPE key and note that the cell
+               reverts back to "Huml"
+            4. Do the stuff in part 1 again
+            5. Press the ESCAPE key
+
+            If the center cell now reads "Huml" as it initially was,
+            the test passed and fails otherwise.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4224179::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4224179");
+        JTable table = new JTable(3, 3);
+        table.setValueAt("Huml", 1, 1);
+        table.setPreferredScrollableViewportSize(new Dimension(500, 70));
+        JScrollPane scrollPane = new JScrollPane(table);
+        frame.add(scrollPane, BorderLayout.CENTER);
+        frame.pack();
+        return frame;
+    }
+}

From 0f1c448ca15485cd7270cf0607acfceacdcefaff Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 22 Apr 2025 11:23:40 +0000
Subject: [PATCH 045/901] 8354922: ZGC: Use MAP_FIXED_NOREPLACE when reserving
 memory

Reviewed-by: aboldtch, eosterlund
---
 src/hotspot/os/linux/gc/z/zSyscall_linux.hpp              | 4 ++++
 src/hotspot/os/posix/gc/z/zVirtualMemoryManager_posix.cpp | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
index 1e1becf5a14..e5978c8d93a 100644
--- a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
+++ b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp
@@ -35,6 +35,10 @@
 #define MPOL_F_ADDR        (1<<1)
 #endif
 
+#ifndef MAP_FIXED_NOREPLACE
+#define MAP_FIXED_NOREPLACE 0x100000
+#endif
+
 class ZSyscall : public AllStatic {
 public:
   static int memfd_create(const char* name, unsigned int flags);
diff --git a/src/hotspot/os/posix/gc/z/zVirtualMemoryManager_posix.cpp b/src/hotspot/os/posix/gc/z/zVirtualMemoryManager_posix.cpp
index 4eea35c8a2e..89bde0557ec 100644
--- a/src/hotspot/os/posix/gc/z/zVirtualMemoryManager_posix.cpp
+++ b/src/hotspot/os/posix/gc/z/zVirtualMemoryManager_posix.cpp
@@ -24,6 +24,9 @@
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zVirtualMemoryManager.hpp"
 #include "logging/log.hpp"
+#ifdef LINUX
+#include "gc/z/zSyscall_linux.hpp"
+#endif
 
 #include <sys/mman.h>
 
@@ -32,7 +35,9 @@ void ZVirtualMemoryReserver::pd_register_callbacks(ZVirtualMemoryRegistry* regis
 }
 
 bool ZVirtualMemoryReserver::pd_reserve(zaddress_unsafe addr, size_t size) {
-  void* const res = mmap((void*)untype(addr), size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+  const int flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE LINUX_ONLY(|MAP_FIXED_NOREPLACE);
+
+  void* const res = mmap((void*)untype(addr), size, PROT_NONE, flags, -1, 0);
   if (res == MAP_FAILED) {
     // Failed to reserve memory
     return false;

From f2587d9bd2e86c46c49ad972790c60ec394848da Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 22 Apr 2025 11:48:46 +0000
Subject: [PATCH 046/901] 8354938: ZGC: Disable UseNUMA when ZFakeNUMA is used

Reviewed-by: aboldtch, jsikstro
---
 src/hotspot/share/gc/z/zArguments.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 67b9f6f0bb9..2c70d8417c9 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -121,9 +121,19 @@ void ZArguments::select_max_gc_threads() {
 void ZArguments::initialize() {
   GCArguments::initialize();
 
-  // Enable NUMA by default
-  if (FLAG_IS_DEFAULT(UseNUMA) && FLAG_IS_DEFAULT(ZFakeNUMA)) {
-    FLAG_SET_DEFAULT(UseNUMA, true);
+  // NUMA settings
+  if (FLAG_IS_DEFAULT(ZFakeNUMA)) {
+    // Enable NUMA by default
+    if (FLAG_IS_DEFAULT(UseNUMA)) {
+      FLAG_SET_DEFAULT(UseNUMA, true);
+    }
+  } else {
+    if (UseNUMA) {
+      if (!FLAG_IS_DEFAULT(UseNUMA)) {
+        warning("ZFakeNUMA is enabled; turning off UseNUMA");
+      }
+      FLAG_SET_ERGO(UseNUMA, false);
+    }
   }
 
   select_max_gc_threads();

From 5264d80bea25a1ef98dae4633b04b16e8de6120f Mon Sep 17 00:00:00 2001
From: Martin Balao <mbalao@openjdk.org>
Date: Tue, 22 Apr 2025 14:37:10 +0000
Subject: [PATCH 047/901] 8350661: PKCS11 HKDF throws ProviderException when
 requesting a 31-byte AES key

Reviewed-by: fferrari, valeriep, djelinski
---
 .../classes/sun/security/pkcs11/P11HKDF.java  |  43 ++++--
 .../sun/security/pkcs11/P11KeyGenerator.java  |  38 ++---
 .../security/pkcs11/P11SecretKeyFactory.java  | 138 ++++++++++++------
 .../pkcs11/wrapper/PKCS11Constants.java       |   4 -
 .../jdk/sun/security/pkcs11/KDF/TestHKDF.java |  49 +++++++
 5 files changed, 200 insertions(+), 72 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11HKDF.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11HKDF.java
index 43a036da6f3..e8bef222d88 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11HKDF.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11HKDF.java
@@ -38,6 +38,7 @@
 import static sun.security.pkcs11.TemplateManager.*;
 import sun.security.pkcs11.wrapper.*;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+import static sun.security.pkcs11.wrapper.PKCS11Exception.RV.CKR_KEY_SIZE_RANGE;
 
 final class P11HKDF extends KDFSpi {
     private final Token token;
@@ -157,6 +158,15 @@ private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
                     " instance, instead of " + derivationSpec.getClass());
         }
 
+        P11SecretKeyFactory.KeyInfo ki = P11SecretKeyFactory.getKeyInfo(alg);
+        if (ki == null) {
+            throw new InvalidAlgorithmParameterException("A PKCS #11 key " +
+                    "type (CKK_*) was not found for a key of the algorithm '" +
+                    alg + "'.");
+        }
+        checkDerivedKeyType(ki, alg);
+        P11KeyGenerator.checkKeySize(ki.keyGenMech, outLen * 8, token);
+
         P11Key p11BaseKey = convertKey(baseKey, (isExtract ? "IKM" : "PRK") +
                 " could not be converted to a token key for HKDF derivation.");
 
@@ -174,17 +184,10 @@ private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
                     "token as service.";
         }
 
-        P11SecretKeyFactory.KeyInfo ki = P11SecretKeyFactory.getKeyInfo(alg);
-        if (ki == null) {
-            throw new InvalidAlgorithmParameterException("A PKCS #11 key " +
-                    "type (CKK_*) was not found for a key of the algorithm '" +
-                    alg + "'.");
-        }
-        long derivedKeyType = ki.keyType;
         long derivedKeyClass = isData ? CKO_DATA : CKO_SECRET_KEY;
         CK_ATTRIBUTE[] attrs = new CK_ATTRIBUTE[] {
                 new CK_ATTRIBUTE(CKA_CLASS, derivedKeyClass),
-                new CK_ATTRIBUTE(CKA_KEY_TYPE, derivedKeyType),
+                new CK_ATTRIBUTE(CKA_KEY_TYPE, ki.keyType),
                 new CK_ATTRIBUTE(CKA_VALUE_LEN, outLen)
         };
         Session session = null;
@@ -195,7 +198,7 @@ private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
                     svcKi.hmacMech, saltType, saltBytes, p11SaltKey != null ?
                     p11SaltKey.getKeyID() : 0L, info);
             attrs = token.getAttributes(O_GENERATE, derivedKeyClass,
-                    derivedKeyType, attrs);
+                    ki.keyType, attrs);
             long derivedObjectID = token.p11.C_DeriveKey(session.id(),
                     new CK_MECHANISM(mechanism, params), baseKeyID, attrs);
             Object ret;
@@ -216,6 +219,11 @@ private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
             }
             return retType.cast(ret);
         } catch (PKCS11Exception e) {
+            if (e.match(CKR_KEY_SIZE_RANGE)) {
+                throw new InvalidAlgorithmParameterException("Invalid key " +
+                        "size (" + outLen + " bytes) for algorithm '" + alg +
+                        "'.", e);
+            }
             throw new ProviderException("HKDF derivation for algorithm '" +
                     alg + "' failed.", e);
         } finally {
@@ -227,6 +235,23 @@ private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
         }
     }
 
+    private static boolean canDeriveKeyInfoType(long t) {
+        return (t == CKK_DES || t == CKK_DES3 || t == CKK_AES ||
+                t == CKK_RC4 || t == CKK_BLOWFISH || t == CKK_CHACHA20 ||
+                t == CKK_GENERIC_SECRET);
+    }
+
+    private void checkDerivedKeyType(P11SecretKeyFactory.KeyInfo ki, String alg)
+            throws InvalidAlgorithmParameterException {
+        Class<?> kiClass = ki.getClass();
+        if (!kiClass.equals(P11SecretKeyFactory.TLSKeyInfo.class) &&
+                !(kiClass.equals(P11SecretKeyFactory.KeyInfo.class) &&
+                        canDeriveKeyInfoType(ki.keyType))) {
+            throw new InvalidAlgorithmParameterException("A key of algorithm " +
+                    "'" + alg + "' is not valid for derivation.");
+        }
+    }
+
     private P11Key.P11SecretKey convertKey(SecretKey key, String errorMessage) {
         try {
             return (P11Key.P11SecretKey) P11SecretKeyFactory.convertKey(token,
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
index 3ec2cfba655..9bfe55b2509 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyGenerator.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
@@ -75,9 +75,10 @@ final class P11KeyGenerator extends KeyGeneratorSpi {
     // java-specific lower limit; returned values are in bits
     private static CK_MECHANISM_INFO getSupportedRange(Token token,
         long mech) throws ProviderException {
-        // No need to query for fix-length algorithms
-        if (mech == CKM_DES_KEY_GEN || mech == CKM_DES2_KEY_GEN ||
-            mech == CKM_DES3_KEY_GEN) {
+        // No need to query if the mechanism is not available or for
+        // fix-length algorithms
+        if (mech == CK_UNAVAILABLE_INFORMATION || mech == CKM_DES_KEY_GEN ||
+                mech == CKM_DES2_KEY_GEN || mech == CKM_DES3_KEY_GEN) {
             return null;
         }
 
@@ -115,7 +116,7 @@ private static CK_MECHANISM_INFO getSupportedRange(Token token,
      * and within the supported range. Return the significant key size
      * upon successful validation.
      * @param keyGenMech the PKCS#11 key generation mechanism.
-     * @param keySize the to-be-checked key size for this mechanism.
+     * @param keySize the to-be-checked key size (in bits) for this mechanism.
      * @param token token which provides this mechanism.
      * @return the significant key size (in bits) corresponding to the
      * specified key size.
@@ -123,7 +124,7 @@ private static CK_MECHANISM_INFO getSupportedRange(Token token,
      * @throws ProviderException if this mechanism isn't supported by SunPKCS11
      * or underlying native impl.
      */
-    // called by P11SecretKeyFactory to check key size
+    // called by P11SecretKeyFactory and P11HKDF to check key size
     static int checkKeySize(long keyGenMech, int keySize, Token token)
         throws InvalidAlgorithmParameterException, ProviderException {
         CK_MECHANISM_INFO range = getSupportedRange(token, keyGenMech);
@@ -136,8 +137,8 @@ private static int checkKeySize(long keyGenMech, int keySize,
         switch ((int)keyGenMech) {
             case (int)CKM_DES_KEY_GEN:
                 if ((keySize != 64) && (keySize != 56)) {
-                    throw new InvalidAlgorithmParameterException
-                            ("DES key length must be 56 bits");
+                    throw new InvalidAlgorithmParameterException("DES key " +
+                            "length was " + keySize + " but must be 56 bits");
                 }
                 sigKeySize = 56;
                 break;
@@ -148,23 +149,26 @@ private static int checkKeySize(long keyGenMech, int keySize,
                 } else if ((keySize == 168) || (keySize == 192)) {
                     sigKeySize = 168;
                 } else {
-                    throw new InvalidAlgorithmParameterException
-                            ("DESede key length must be 112, or 168 bits");
+                    throw new InvalidAlgorithmParameterException("DESede key " +
+                            "length was " + keySize + " but must be 112, or " +
+                            "168 bits");
                 }
                 break;
             default:
                 // Handle all variable-key-length algorithms here
-                if (range != null && keySize < range.iMinKeySize
-                    || keySize > range.iMaxKeySize) {
-                    throw new InvalidAlgorithmParameterException
-                        ("Key length must be between " + range.iMinKeySize +
-                        " and " + range.iMaxKeySize + " bits");
+                if (range != null && (keySize < range.iMinKeySize
+                    || keySize > range.iMaxKeySize)) {
+                    throw new InvalidAlgorithmParameterException("Key length " +
+                            "was " + keySize + " but must be between " +
+                            range.iMinKeySize + " and " + range.iMaxKeySize +
+                            " bits");
                 }
                 if (keyGenMech == CKM_AES_KEY_GEN) {
                     if ((keySize != 128) && (keySize != 192) &&
                         (keySize != 256)) {
-                        throw new InvalidAlgorithmParameterException
-                            ("AES key length must be 128, 192, or 256 bits");
+                        throw new InvalidAlgorithmParameterException("AES key" +
+                                " length was " + keySize + " but must be 128," +
+                                " 192, or 256 bits");
                     }
                 }
                 sigKeySize = keySize;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
index 6c67e641438..bc0a7d10cf1 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
@@ -103,13 +103,37 @@ private static void putKeyInfo(KeyInfo ki) {
         keyInfo.put(ki.algo.toUpperCase(Locale.ENGLISH), ki);
     }
 
-    static sealed class KeyInfo permits PBEKeyInfo, HMACKeyInfo, HKDFKeyInfo {
+    /*
+     * The KeyInfo class represents information about a symmetric PKCS #11 key
+     * type or about the output of a key-based computation (e.g. HMAC). A
+     * KeyInfo instance may describe the key/output itself, or the type of
+     * key/output that a service accepts/produces. Used by P11SecretKeyFactory,
+     * P11PBECipher, P11Mac, and P11HKDF.
+     */
+    static sealed class KeyInfo permits PBEKeyInfo, HMACKeyInfo, HKDFKeyInfo,
+            TLSKeyInfo {
+        // Java Standard Algorithm Name.
         public final String algo;
+
+        // Key type (CKK_*).
         public final long keyType;
 
+        // Mechanism for C_GenerateKey to generate a key of this type (CKM_*).
+        // While keys may be generated with other APIs and mechanisms (e.g. AES
+        // key generated with C_DeriveKey and CKM_HKDF_DERIVE instead of
+        // C_GenerateKey and CKM_AES_KEY_GEN), this information is used by
+        // P11KeyGenerator::checkKeySize in a best-effort attempt to validate
+        // that the key size is within a valid range (see CK_MECHANISM_INFO).
+        public final long keyGenMech;
+
         KeyInfo(String algo, long keyType) {
+            this(algo, keyType, CK_UNAVAILABLE_INFORMATION);
+        }
+
+        KeyInfo(String algo, long keyType, long keyGenMech) {
             this.algo = algo;
             this.keyType = keyType;
+            this.keyGenMech = keyGenMech;
         }
 
         // The P11SecretKeyFactory::convertKey method needs to know if a service
@@ -134,8 +158,26 @@ static boolean checkUse(KeyInfo ki, KeyInfo si) {
         }
     }
 
+    /*
+     * KeyInfo specialization for keys that are either input or result of a TLS
+     * key derivation. Keys of this type are typically handled by JSSE and their
+     * algorithm name start with "Tls". Used by P11HKDF.
+     */
+    static final class TLSKeyInfo extends KeyInfo {
+        TLSKeyInfo(String algo) {
+            super(algo, CKK_GENERIC_SECRET);
+        }
+    }
+
+    /*
+     * KeyInfo specialization for outputs of a HMAC computation. Used by
+     * P11SecretKeyFactory and P11Mac.
+     */
     static final class HMACKeyInfo extends KeyInfo {
+        // HMAC mechanism (CKM_*) to generate the output.
         public final long mech;
+
+        // HMAC output length (in bits).
         public final int keyLen;
 
         HMACKeyInfo(String algo, long mech, int keyLen) {
@@ -145,6 +187,10 @@ static final class HMACKeyInfo extends KeyInfo {
         }
     }
 
+    /*
+     * KeyInfo specialization for HKDF key derivation. Used by
+     * P11SecretKeyFactory and P11HKDF.
+     */
     static final class HKDFKeyInfo extends KeyInfo {
         public static final long UNKNOWN_KEY_TYPE = -1;
         public final long hmacMech;
@@ -157,6 +203,10 @@ static final class HKDFKeyInfo extends KeyInfo {
         }
     }
 
+    /*
+     * KeyInfo specialization for PBE key derivation. Used by
+     * P11SecretKeyFactory, P11PBECipher and P11Mac.
+     */
     abstract static sealed class PBEKeyInfo extends KeyInfo
             permits AESPBEKeyInfo, PBKDF2KeyInfo, P12MacPBEKeyInfo {
         public static final long INVALID_PRF = -1;
@@ -204,24 +254,39 @@ static final class P12MacPBEKeyInfo extends PBEKeyInfo {
     }
 
     static {
-        putKeyInfo(new KeyInfo("RC4", CKK_RC4));
-        putKeyInfo(new KeyInfo("ARCFOUR", CKK_RC4));
-        putKeyInfo(new KeyInfo("DES", CKK_DES));
-        putKeyInfo(new KeyInfo("DESede", CKK_DES3));
-        putKeyInfo(new KeyInfo("AES", CKK_AES));
-        putKeyInfo(new KeyInfo("Blowfish", CKK_BLOWFISH));
-        putKeyInfo(new KeyInfo("ChaCha20", CKK_CHACHA20));
-        putKeyInfo(new KeyInfo("ChaCha20-Poly1305", CKK_CHACHA20));
+        putKeyInfo(new KeyInfo("RC4", CKK_RC4, CKM_RC4_KEY_GEN));
+        putKeyInfo(new KeyInfo("ARCFOUR", CKK_RC4, CKM_RC4_KEY_GEN));
+        putKeyInfo(new KeyInfo("DES", CKK_DES, CKM_DES_KEY_GEN));
+        putKeyInfo(new KeyInfo("DESede", CKK_DES3, CKM_DES3_KEY_GEN));
+        putKeyInfo(new KeyInfo("AES", CKK_AES, CKM_AES_KEY_GEN));
+        putKeyInfo(new KeyInfo("Blowfish", CKK_BLOWFISH, CKM_BLOWFISH_KEY_GEN));
+        putKeyInfo(new KeyInfo("ChaCha20", CKK_CHACHA20, CKM_CHACHA20_KEY_GEN));
+        putKeyInfo(new KeyInfo("ChaCha20-Poly1305", CKK_CHACHA20,
+                CKM_CHACHA20_KEY_GEN));
 
         // we don't implement RC2 or IDEA, but we want to be able to generate
         // keys for those SSL/TLS ciphersuites.
-        putKeyInfo(new KeyInfo("RC2", CKK_RC2));
-        putKeyInfo(new KeyInfo("IDEA", CKK_IDEA));
-
-        putKeyInfo(new KeyInfo("TlsPremasterSecret", PCKK_TLSPREMASTER));
-        putKeyInfo(new KeyInfo("TlsRsaPremasterSecret", PCKK_TLSRSAPREMASTER));
-        putKeyInfo(new KeyInfo("TlsMasterSecret", PCKK_TLSMASTER));
-        putKeyInfo(new KeyInfo("Generic", CKK_GENERIC_SECRET));
+        putKeyInfo(new KeyInfo("RC2", CKK_RC2, CKM_RC2_KEY_GEN));
+        putKeyInfo(new KeyInfo("IDEA", CKK_IDEA, CKM_IDEA_KEY_GEN));
+
+        putKeyInfo(new TLSKeyInfo("TlsPremasterSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsRsaPremasterSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsMasterSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsBinderKey"));
+        putKeyInfo(new TLSKeyInfo("TlsClientAppTrafficSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsClientHandshakeTrafficSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsEarlySecret"));
+        putKeyInfo(new TLSKeyInfo("TlsFinishedSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsHandshakeSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsKey"));
+        putKeyInfo(new TLSKeyInfo("TlsResumptionMasterSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsSaltSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsServerAppTrafficSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsServerHandshakeTrafficSecret"));
+        putKeyInfo(new TLSKeyInfo("TlsUpdateNplus1"));
+
+        putKeyInfo(new KeyInfo("Generic", CKK_GENERIC_SECRET,
+                CKM_GENERIC_SECRET_KEY_GEN));
 
         HMACKeyInfo hmacSHA1 =
                 new HMACKeyInfo("HmacSHA1", CKM_SHA_1_HMAC, 160);
@@ -549,34 +614,23 @@ private static P11Key createKey(Token token, byte[] encoded,
         long keyType = ki.keyType;
         try {
             switch ((int) keyType) {
-                case (int) CKK_DES -> {
-                    keyLength =
-                            P11KeyGenerator.checkKeySize(CKM_DES_KEY_GEN, n, token);
-                    fixDESParity(encoded, 0);
-                }
-                case (int) CKK_DES3 -> {
-                    keyLength =
-                            P11KeyGenerator.checkKeySize(CKM_DES3_KEY_GEN, n, token);
-                    fixDESParity(encoded, 0);
-                    fixDESParity(encoded, 8);
-                    if (keyLength == 112) {
-                        keyType = CKK_DES2;
-                    } else {
-                        keyType = CKK_DES3;
-                        fixDESParity(encoded, 16);
+                case (int) CKK_DES, (int) CKK_DES3, (int) CKK_AES, (int) CKK_RC4,
+                        (int) CKK_BLOWFISH, (int) CKK_CHACHA20 -> {
+                    keyLength = P11KeyGenerator.checkKeySize(ki.keyGenMech, n,
+                            token);
+                    if (keyType == CKK_DES || keyType == CKK_DES3) {
+                        fixDESParity(encoded, 0);
+                        if (keyType == CKK_DES3) {
+                            fixDESParity(encoded, 8);
+                            if (keyLength == 112) {
+                                keyType = CKK_DES2;
+                            } else {
+                                fixDESParity(encoded, 16);
+                            }
+                        }
                     }
                 }
-                case (int) CKK_AES -> keyLength =
-                        P11KeyGenerator.checkKeySize(CKM_AES_KEY_GEN, n, token);
-                case (int) CKK_RC4 -> keyLength =
-                        P11KeyGenerator.checkKeySize(CKM_RC4_KEY_GEN, n, token);
-                case (int) CKK_BLOWFISH -> keyLength =
-                        P11KeyGenerator.checkKeySize(CKM_BLOWFISH_KEY_GEN, n,
-                                token);
-                case (int) CKK_CHACHA20 -> keyLength = P11KeyGenerator.checkKeySize(
-                        CKM_CHACHA20_KEY_GEN, n, token);
-                case (int) CKK_GENERIC_SECRET, (int) PCKK_TLSPREMASTER, (int) PCKK_TLSRSAPREMASTER, (int) PCKK_TLSMASTER ->
-                        keyType = CKK_GENERIC_SECRET;
+                case (int) CKK_GENERIC_SECRET -> {}
                 default -> throw new InvalidKeyException("Unknown algorithm " +
                         algorithm);
             }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
index 3cd1ca12563..924bfbcc226 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
@@ -311,10 +311,6 @@ public interface PKCS11Constants {
     // pseudo key type ANY (for template manager)
     public static final long  PCKK_ANY                 = 0x7FFFFF22L;
 
-    public static final long  PCKK_TLSPREMASTER        = 0x7FFFFF25L;
-    public static final long  PCKK_TLSRSAPREMASTER     = 0x7FFFFF26L;
-    public static final long  PCKK_TLSMASTER           = 0x7FFFFF27L;
-
     /* Uncomment when actually used
     public static final long  CK_CERTIFICATE_CATEGORY_UNSPECIFIED   = 0L;
     public static final long  CK_CERTIFICATE_CATEGORY_TOKEN_USER    = 1L;
diff --git a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
index 5a3e8163600..638d4aa2bb1 100644
--- a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
+++ b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
@@ -302,6 +302,23 @@ private static void executeTest(String testHeader, String hkdfAlg,
         executeDerivation(ctx, KdfParamSpecType.EXPAND);
     }
 
+    private static void executeInvalidKeyDerivationTest(String testHeader,
+            String keyAlg, int keySize, String errorMsg) {
+        printTestHeader(testHeader);
+        try {
+            KDF k = KDF.getInstance("HKDF-SHA256", p11Provider);
+            k.deriveKey(keyAlg, HKDFParameterSpec.ofExtract()
+                    .thenExpand(null, keySize));
+            throw new Exception("No exception thrown.");
+        } catch (InvalidAlgorithmParameterException iape) {
+            // Expected.
+        } catch (Exception e) {
+            reportTestFailure(new Exception(errorMsg + " expected to throw " +
+                    "InvalidAlgorithmParameterException for key algorithm '" +
+                    keyAlg + "'.", e));
+        }
+    }
+
     private static void printTestHeader(String testHeader) {
         debugPrinter.println();
         debugPrinter.println("=".repeat(testHeader.length()));
@@ -610,6 +627,38 @@ private static void test_HKDF_after_ECDH_HkdfSHA256() throws Exception {
                 "6e09");
     }
 
+    private static void test_unknown_key_algorithm_derivation() {
+        executeInvalidKeyDerivationTest(
+                "Test derivation of an unknown key algorithm",
+                "UnknownAlgorithm",
+                32,
+                "Derivation of an unknown key algorithm");
+    }
+
+    private static void test_invalid_key_algorithm_derivation() {
+        executeInvalidKeyDerivationTest(
+                "Test derivation of an invalid key algorithm",
+                "PBKDF2WithHmacSHA1",
+                32,
+                "Derivation of an invalid key algorithm");
+    }
+
+    private static void test_invalid_aes_key_algorithm_derivation() {
+        executeInvalidKeyDerivationTest(
+                "Test derivation of an invalid AES key",
+                "PBEWithHmacSHA224AndAES_256",
+                32,
+                "Derivation of an invalid AES key");
+    }
+
+    private static void test_invalid_AES_key_size() {
+        executeInvalidKeyDerivationTest(
+                "Test derivation of an invalid AES key size",
+                "AES",
+                31,
+                "Derivation of an AES key of invalid size (31 bytes)");
+    }
+
     public void main(Provider p) throws Exception {
         p11Provider = p;
         p11GenericSkf = SecretKeyFactory.getInstance("Generic", p11Provider);

From 072b8273a4c7bd75bce440e5f1184e2926ed0f78 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 22 Apr 2025 15:10:26 +0000
Subject: [PATCH 048/901] 8354300: Mark String.hash field @Stable

Reviewed-by: liach, shade, vlivanov
---
 .../share/classes/java/lang/String.java       |  7 +-
 .../bench/java/lang/StringHashCodeStatic.java | 93 +++++++++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/StringHashCodeStatic.java

diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 033d32611b0..0632785d899 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +173,14 @@ public final class String
     private final byte coder;
 
     /** Cache the hash code for the string */
+    @Stable
     private int hash; // Default to 0
 
     /**
      * Cache if the hash has been calculated as actually being zero, enabling
-     * us to avoid recalculating this.
+     * us to avoid recalculating this. This field is _not_ annotated @Stable as
+     * the `hashCode()` method reads the field `hash` first anyhow and if `hash`
+     * is the default zero value, is not trusted.
      */
     private boolean hashIsZero; // Default to false;
 
diff --git a/test/micro/org/openjdk/bench/java/lang/StringHashCodeStatic.java b/test/micro/org/openjdk/bench/java/lang/StringHashCodeStatic.java
new file mode 100644
index 00000000000..8f4d22a1d86
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/StringHashCodeStatic.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 org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Performance test of String.hashCode() function with constant folding.
+ * The tests are using a Map that holds a MethodHandle to better expose
+ * any potential lack of constant folding.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(value = 3)
+public class StringHashCodeStatic {
+
+    private static final String HASHCODE = "abcdefghijkl";
+    private static final String HASHCODE_0 = new String(new char[]{72, 90, 100, 89, 105, 2, 72, 90, 100, 89, 105, 2});
+    private static final String EMPTY = new String();
+
+    private static final Map<String, MethodHandle> MAP = Map.of(
+            HASHCODE, mh(HASHCODE.hashCode()),
+            HASHCODE_0, mh(HASHCODE_0.hashCode()),
+            EMPTY, mh(EMPTY.hashCode()));
+
+    /**
+     * Benchmark testing String.hashCode() with a regular 12 char string with
+     * the result possibly cached in String
+     */
+    @Benchmark
+    public int nonZero() throws Throwable {
+        return (int)MAP.get(HASHCODE).invokeExact();
+    }
+
+    /**
+     * Benchmark testing String.hashCode() with a 12 char string with the
+     * hashcode = 0.
+     */
+    @Benchmark
+    public int zero() throws Throwable {
+        return (int)MAP.get(HASHCODE_0).invokeExact();
+    }
+
+    /**
+     * Benchmark testing String.hashCode() with the empty string. an
+     * empty String has hashCode = 0.
+     */
+    @Benchmark
+    public int empty() throws Throwable {
+        return (int)MAP.get(EMPTY).invokeExact();
+    }
+
+    static MethodHandle mh(int value) {
+        return MethodHandles.constant(int.class, value);
+    }
+
+}
\ No newline at end of file

From da16c839735bbf79ece4967f95a98208f74b7f73 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 15:26:59 +0000
Subject: [PATCH 049/901] 8354466: Open some misc Swing bugs 9

Reviewed-by: kizune, honkar
---
 .../swing/JPasswordField/bug4382819.java      | 86 +++++++++++++++++
 .../javax/swing/JSplitPane/bug4820080.java    | 94 +++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 test/jdk/javax/swing/JPasswordField/bug4382819.java
 create mode 100644 test/jdk/javax/swing/JSplitPane/bug4820080.java

diff --git a/test/jdk/javax/swing/JPasswordField/bug4382819.java b/test/jdk/javax/swing/JPasswordField/bug4382819.java
new file mode 100644
index 00000000000..3a8799a2d52
--- /dev/null
+++ b/test/jdk/javax/swing/JPasswordField/bug4382819.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+import java.awt.FlowLayout;
+import java.awt.event.ItemListener;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JPasswordField;
+
+/*
+ * @test
+ * @bug 4382819
+ * @summary Tests the correctness of color used for the disabled passwordField.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4382819
+ */
+
+public class bug4382819 {
+    static JCheckBox enabledCheckBox;
+    static JPasswordField passwordField;
+
+    private static final String INSTRUCTIONS = """
+            Clear the "enabled" checkbox.
+            If the JPasswordField's foreground color changes to
+            light gray press Pass. If it stays black press Fail.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4382819::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame mainFrame = new JFrame("bug4382819");
+        enabledCheckBox = new javax.swing.JCheckBox();
+        enabledCheckBox.setSelected(true);
+        enabledCheckBox.setText("enabled");
+        enabledCheckBox.setActionCommand("enabled");
+        mainFrame.add(enabledCheckBox);
+
+        passwordField = new javax.swing.JPasswordField();
+        passwordField.setText("blahblahblah");
+        mainFrame.add(passwordField);
+        SymItem lSymItem = new SymItem();
+        enabledCheckBox.addItemListener(lSymItem);
+
+        mainFrame.setSize(300, 100);
+        mainFrame.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));
+        return mainFrame;
+    }
+
+    static class SymItem implements ItemListener {
+        public void itemStateChanged(java.awt.event.ItemEvent event) {
+            Object object = event.getSource();
+            if (object == enabledCheckBox) {
+                passwordField.setEnabled(enabledCheckBox.isSelected());
+            }
+        }
+    }
+}
+
diff --git a/test/jdk/javax/swing/JSplitPane/bug4820080.java b/test/jdk/javax/swing/JSplitPane/bug4820080.java
new file mode 100644
index 00000000000..0702a3a2f59
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/bug4820080.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Panel;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 4820080 7175397
+ * @summary RFE: Cannot Change the JSplitPane Divider Color while dragging
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4820080
+ */
+
+public class bug4820080 {
+    private static final String INSTRUCTIONS = """
+            Drag the dividers of the splitpanes (both top and bottom). If the divider
+            color is green while dragging then test passes, otherwise test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4820080::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4820080");
+        UIManager.put("SplitPaneDivider.draggingColor", Color.GREEN);
+
+        Box box = new Box(BoxLayout.Y_AXIS);
+        frame.add(box);
+
+        JPanel jleft = new JPanel();
+        jleft.setBackground(Color.DARK_GRAY);
+        jleft.setPreferredSize(new Dimension(100, 100));
+        JPanel jright = new JPanel();
+        jright.setBackground(Color.DARK_GRAY);
+        jright.setPreferredSize(new Dimension(100, 100));
+
+        JSplitPane jsp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jleft, jright);
+        jsp.setContinuousLayout(false);
+        box.add(jsp);
+
+        box.add(Box.createVerticalStrut(5));
+        box.add(new JSeparator());
+        box.add(Box.createVerticalStrut(5));
+
+        Panel left = new Panel();
+        left.setBackground(Color.DARK_GRAY);
+        left.setPreferredSize(new Dimension(100, 100));
+        Panel right = new Panel();
+        right.setBackground(Color.DARK_GRAY);
+        right.setPreferredSize(new Dimension(100, 100));
+
+        JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, left, right);
+        sp.setContinuousLayout(false);
+        box.add(sp);
+        frame.pack();
+        return frame;
+    }
+}

From a4c5ed8144376f7ba0d2cb992da63b3e53d51f8b Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Tue, 22 Apr 2025 15:46:04 +0000
Subject: [PATCH 050/901] 8354561: Open source several swing tests batch0

Reviewed-by: prr, psadhukhan
---
 .../jdk/javax/swing/JComboBox/bug4139900.java | 119 +++++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4174876.java |  78 +++++++++++
 .../jdk/javax/swing/JComboBox/bug4474400.java |  78 +++++++++++
 .../swing/border/TransparentTitleTest.java    | 122 ++++++++++++++++++
 4 files changed, 397 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4139900.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4174876.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4474400.java
 create mode 100644 test/jdk/javax/swing/border/TransparentTitleTest.java

diff --git a/test/jdk/javax/swing/JComboBox/bug4139900.java b/test/jdk/javax/swing/JComboBox/bug4139900.java
new file mode 100644
index 00000000000..a9ed685d5ab
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4139900.java
@@ -0,0 +1,119 @@
+/*
+ * 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 4139900
+ * @summary height of combobox may differ
+ * @key headful
+ * @run main bug4139900
+*/
+
+import java.awt.Dimension;
+import java.awt.Robot;
+import java.awt.event.ActionListener;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+public class bug4139900 {
+    static JButton button;
+    static JFrame frame;
+    static JComboBox<String> comboBox;
+    static int initialHeight;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(bug4139900::init);
+            test();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void test() throws Exception {
+        Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(500);
+
+        SwingUtilities.invokeAndWait(() -> initialHeight = comboBox.getHeight());
+
+        for (int i = 0; i < 10; i++) {
+            SwingUtilities.invokeAndWait(() -> button.doClick());
+            robot.waitForIdle();
+            robot.delay(200);
+            SwingUtilities.invokeAndWait(() -> {
+                if (comboBox.getHeight() != initialHeight) {
+                    throw new RuntimeException(
+                            "Test failed: height differs from initial %d != %d"
+                                    .formatted(comboBox.getHeight(), initialHeight)
+                    );
+                }
+            });
+        }
+    }
+
+    public static void init() {
+        frame = new JFrame("bug4139900");
+
+        DefaultComboBoxModel<String> model =
+                new DefaultComboBoxModel<>(new String[]{
+                        "Coma Berenices",
+                        "Triangulum",
+                        "Camelopardis",
+                        "Cassiopea"
+                });
+
+        comboBox = new JComboBox<>();
+        comboBox.setEditable(true);
+
+        button = new JButton("Add/Remove Items");
+
+        ActionListener actionListener = e -> {
+            if (comboBox.getModel() == model) {
+                comboBox.setModel(new DefaultComboBoxModel<>());
+            } else {
+                comboBox.setModel(model);
+            }
+        };
+
+        button.addActionListener(actionListener);
+
+        JPanel panel = new JPanel();
+        panel.setPreferredSize(new Dimension(300, 100));
+        panel.add(comboBox);
+        panel.add(button);
+
+        frame.add(panel);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4174876.java b/test/jdk/javax/swing/JComboBox/bug4174876.java
new file mode 100644
index 00000000000..349dfa4b159
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4174876.java
@@ -0,0 +1,78 @@
+/*
+ * 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 4174876
+ * @summary JComboBox tooltips do not work properly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4174876
+ */
+
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
+public class bug4174876 {
+    private static final String INSTRUCTIONS = """
+            Hold the mouse over both combo boxes.
+            A tool tip should appear over every area of both of them.
+            Notably, if you hold the mouse over the button on the right one,
+            a tool tip should appear.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("TransparentTitleTest Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .splitUIBottom(bug4174876::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JComponent createTestUI() {
+        JComboBox<String> comboBox1 = new JComboBox<>(new String[]{
+                "Coma Berenices",
+                "Triangulum",
+                "Camelopardis",
+                "Cassiopea"
+        });
+        JComboBox<String> comboBox2 = new JComboBox<>(new String[]{
+                "Coma Berenices",
+                "Triangulum",
+                "Camelopardis",
+                "Cassiopea"
+        });
+
+        comboBox1.setToolTipText("Combo Box #1");
+        comboBox2.setToolTipText("Combo Box #2");
+        comboBox2.setEditable(true);
+
+        JPanel panel = new JPanel();
+        panel.add(comboBox1);
+        panel.add(comboBox2);
+        return panel;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4474400.java b/test/jdk/javax/swing/JComboBox/bug4474400.java
new file mode 100644
index 00000000000..ea52d0c71b5
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4474400.java
@@ -0,0 +1,78 @@
+/*
+ * 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 4474400
+ * @summary Tests JTextArea wrapping with font change
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4474400
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Font;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+public class bug4474400 {
+    private static final String INSTRUCTIONS = """
+            Press the "Change Font" button. The two lines of text should be
+            properly drawn using the larger font, there should be empty line
+            between them. If display is garbled, test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4474400 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .splitUIRight(bug4474400::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JComponent createTestUI() {
+        Font smallFont = new Font("SansSerif", Font.PLAIN, 12);
+        Font largeFont = new Font("SansSerif", Font.PLAIN, 36);
+
+        JTextArea textArea = new JTextArea("This is the first line\n\nThis is the third line");
+        textArea.setFont(smallFont);
+        textArea.setEditable(false);
+        textArea.setLineWrap(true);
+        textArea.setWrapStyleWord(true);
+
+        JButton b = new JButton("Change Font");
+        b.addActionListener((e) -> textArea.setFont(largeFont));
+
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setPreferredSize(new Dimension(200, 300));
+        panel.add(textArea, BorderLayout.CENTER);
+        panel.add(b, BorderLayout.SOUTH);
+
+        return panel;
+    }
+}
diff --git a/test/jdk/javax/swing/border/TransparentTitleTest.java b/test/jdk/javax/swing/border/TransparentTitleTest.java
new file mode 100644
index 00000000000..49a32a5890c
--- /dev/null
+++ b/test/jdk/javax/swing/border/TransparentTitleTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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 4154572
+ * @summary Tests that the area behind a TitledBorder's title string is transparent,
+ * allowing the component's background to show through
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TransparentTitleTest
+ */
+
+import java.awt.GridLayout;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
+import javax.swing.border.LineBorder;
+
+public class TransparentTitleTest {
+    private static final String INSTRUCTIONS = """
+            If all panels are correctly painted such that the title of the
+            border allows the underlying panel image (green rectangle)
+            to show through the background of the text,
+            then this test passes; else it fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("TransparentTitleTest Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(TransparentTitleTest::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("TransparentTitleTest");
+
+        frame.setLayout(new GridLayout(3, 6, 5, 5));
+
+        frame.add(new ImagePanel(TitledBorder.TOP, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.TOP, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.TOP, TitledBorder.RIGHT));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_TOP, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_TOP, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_TOP, TitledBorder.RIGHT));
+        frame.add(new ImagePanel(TitledBorder.BELOW_TOP, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.BELOW_TOP, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.BELOW_TOP, TitledBorder.RIGHT));
+        frame.add(new ImagePanel(TitledBorder.BOTTOM, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.BOTTOM, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.BOTTOM, TitledBorder.RIGHT));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_BOTTOM, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_BOTTOM, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.ABOVE_BOTTOM, TitledBorder.RIGHT));
+        frame.add(new ImagePanel(TitledBorder.BELOW_BOTTOM, TitledBorder.LEFT));
+        frame.add(new ImagePanel(TitledBorder.BELOW_BOTTOM, TitledBorder.CENTER));
+        frame.add(new ImagePanel(TitledBorder.BELOW_BOTTOM, TitledBorder.RIGHT));
+
+        frame.pack();
+        return frame;
+    }
+}
+
+class ImagePanel extends JPanel {
+
+    private final ImageIcon imageIcon;
+
+    private static final BufferedImage bufferedImage =
+            new BufferedImage(128, 128, BufferedImage.TYPE_INT_ARGB);
+
+    static {
+        Graphics g = bufferedImage.getGraphics();
+        g.setColor(Color.GREEN);
+        g.fillRect(0, 0, 128, 128);
+    }
+
+    public ImagePanel(int titlePos, int titleJust) {
+        imageIcon = new ImageIcon(bufferedImage);
+
+        TitledBorder b = new TitledBorder(new LineBorder(Color.black,3), "title text");
+        b.setTitlePosition(titlePos);
+        b.setTitleJustification(titleJust);
+        b.setTitleColor(Color.black);
+        setBorder(b);
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight());
+    }
+
+    public void paintComponent(Graphics g) {
+        imageIcon.paintIcon(this, g, 0, 0);
+    }
+}

From 477da161e62040d77079196ea27d24b27de75b64 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Tue, 22 Apr 2025 15:50:58 +0000
Subject: [PATCH 051/901] 8352638: Enhance code consistency:
 java.desktop/windows

Reviewed-by: prr
---
 .../plaf/windows/AnimationController.java     |  9 ++-
 .../sun/java/swing/plaf/windows/TMSchema.java |  3 +
 .../swing/plaf/windows/WindowsBorders.java    | 17 +++--
 .../swing/plaf/windows/WindowsButtonUI.java   |  9 ++-
 .../windows/WindowsCheckBoxMenuItemUI.java    |  5 +-
 .../swing/plaf/windows/WindowsCheckBoxUI.java |  5 +-
 .../windows/WindowsClassicLookAndFeel.java    |  3 +-
 .../swing/plaf/windows/WindowsComboBoxUI.java | 32 +++++++---
 .../plaf/windows/WindowsDesktopIconUI.java    |  8 ++-
 .../plaf/windows/WindowsDesktopManager.java   |  3 +-
 .../plaf/windows/WindowsDesktopPaneUI.java    |  5 +-
 .../plaf/windows/WindowsEditorPaneUI.java     |  3 +-
 .../plaf/windows/WindowsFileChooserUI.java    | 62 ++++++++++++++++---
 .../plaf/windows/WindowsGraphicsUtils.java    |  2 +-
 .../plaf/windows/WindowsIconFactory.java      | 56 +++++++++++++----
 .../WindowsInternalFrameTitlePane.java        | 24 ++++++-
 .../plaf/windows/WindowsInternalFrameUI.java  | 12 +++-
 .../swing/plaf/windows/WindowsLabelUI.java    |  4 +-
 .../plaf/windows/WindowsLookAndFeel.java      | 58 ++++++++++++-----
 .../swing/plaf/windows/WindowsMenuBarUI.java  |  5 +-
 .../swing/plaf/windows/WindowsMenuItemUI.java |  5 +-
 .../swing/plaf/windows/WindowsMenuUI.java     | 13 +++-
 .../plaf/windows/WindowsOptionPaneUI.java     |  2 +-
 .../plaf/windows/WindowsPasswordFieldUI.java  |  3 +-
 .../windows/WindowsPopupMenuSeparatorUI.java  |  4 +-
 .../plaf/windows/WindowsPopupMenuUI.java      |  7 ++-
 .../plaf/windows/WindowsPopupWindow.java      |  5 +-
 .../plaf/windows/WindowsProgressBarUI.java    | 11 +++-
 .../windows/WindowsRadioButtonMenuItemUI.java |  5 +-
 .../plaf/windows/WindowsRadioButtonUI.java    |  5 ++
 .../swing/plaf/windows/WindowsRootPaneUI.java |  5 +-
 .../plaf/windows/WindowsScrollBarUI.java      | 17 ++++-
 .../plaf/windows/WindowsScrollPaneUI.java     |  2 +-
 .../plaf/windows/WindowsSeparatorUI.java      |  2 +-
 .../swing/plaf/windows/WindowsSliderUI.java   | 17 ++++-
 .../swing/plaf/windows/WindowsSpinnerUI.java  |  5 +-
 .../plaf/windows/WindowsSplitPaneDivider.java |  3 +-
 .../plaf/windows/WindowsSplitPaneUI.java      |  3 +-
 .../plaf/windows/WindowsTabbedPaneUI.java     |  8 ++-
 .../plaf/windows/WindowsTableHeaderUI.java    | 13 +++-
 .../swing/plaf/windows/WindowsTextAreaUI.java |  3 +-
 .../plaf/windows/WindowsTextFieldUI.java      | 11 +++-
 .../swing/plaf/windows/WindowsTextPaneUI.java |  3 +-
 .../swing/plaf/windows/WindowsTextUI.java     |  8 ++-
 .../plaf/windows/WindowsToggleButtonUI.java   |  9 ++-
 .../windows/WindowsToolBarSeparatorUI.java    |  5 +-
 .../swing/plaf/windows/WindowsToolBarUI.java  |  7 ++-
 .../swing/plaf/windows/WindowsTreeUI.java     | 11 +++-
 .../sun/java/swing/plaf/windows/XPStyle.java  | 26 ++++++--
 .../classes/sun/awt/PlatformGraphicsInfo.java |  2 +-
 .../classes/sun/awt/Win32ColorModel24.java    |  4 +-
 .../classes/sun/awt/Win32FontManager.java     |  5 ++
 .../classes/sun/awt/Win32GraphicsConfig.java  |  1 +
 .../classes/sun/awt/Win32GraphicsDevice.java  |  2 +-
 .../sun/awt/Win32GraphicsEnvironment.java     |  4 ++
 .../sun/awt/shell/Win32ShellFolder2.java      | 27 +++++++-
 .../awt/shell/Win32ShellFolderManager2.java   |  8 ++-
 .../awt/windows/TranslucentWindowPainter.java |  4 +-
 .../sun/awt/windows/WComponentPeer.java       |  1 +
 .../sun/awt/windows/WDataTransferer.java      |  2 +-
 .../sun/awt/windows/WDefaultFontCharset.java  |  2 +-
 .../sun/awt/windows/WDesktopProperties.java   |  5 +-
 .../awt/windows/WDragSourceContextPeer.java   |  3 +
 .../sun/awt/windows/WEmbeddedFrame.java       |  7 ++-
 .../sun/awt/windows/WEmbeddedFramePeer.java   |  2 +-
 .../classes/sun/awt/windows/WLabelPeer.java   |  7 +++
 .../awt/windows/WLightweightFramePeer.java    |  3 +-
 .../sun/awt/windows/WMenuItemPeer.java        |  4 ++
 .../sun/awt/windows/WMouseInfoPeer.java       |  2 +
 .../sun/awt/windows/WPopupMenuPeer.java       |  1 +
 .../classes/sun/awt/windows/WPrinterJob.java  |  4 +-
 .../sun/awt/windows/WScrollPanePeer.java      |  4 +-
 .../sun/awt/windows/WScrollbarPeer.java       |  7 +++
 .../classes/sun/awt/windows/WToolkit.java     |  2 +-
 .../sun/awt/windows/WTrayIconPeer.java        |  2 +-
 .../classes/sun/awt/windows/WWindowPeer.java  |  4 +-
 .../classes/sun/awt/windows/WingDings.java    |  2 +-
 .../windows/classes/sun/font/NativeFont.java  | 11 +++-
 .../classes/sun/font/NativeStrike.java        |  8 +++
 .../java2d/WindowsSurfaceManagerFactory.java  |  3 +-
 .../classes/sun/java2d/d3d/D3DBlitLoops.java  | 51 +++++++++------
 .../classes/sun/java2d/d3d/D3DBufImgOps.java  |  2 +-
 .../classes/sun/java2d/d3d/D3DContext.java    |  2 +-
 .../classes/sun/java2d/d3d/D3DDrawImage.java  |  2 +-
 .../sun/java2d/d3d/D3DGraphicsConfig.java     |  4 +-
 .../sun/java2d/d3d/D3DGraphicsDevice.java     |  4 +-
 .../classes/sun/java2d/d3d/D3DMaskBlit.java   |  2 +-
 .../classes/sun/java2d/d3d/D3DMaskFill.java   |  2 +-
 .../classes/sun/java2d/d3d/D3DPaints.java     |  8 +--
 .../sun/java2d/d3d/D3DRenderQueue.java        |  4 +-
 .../classes/sun/java2d/d3d/D3DRenderer.java   | 15 ++++-
 .../java2d/d3d/D3DScreenUpdateManager.java    |  3 +-
 .../sun/java2d/d3d/D3DSurfaceData.java        | 17 ++++-
 .../sun/java2d/d3d/D3DSurfaceDataProxy.java   |  2 +-
 .../sun/java2d/d3d/D3DTextRenderer.java       |  3 +-
 .../java2d/d3d/D3DVolatileSurfaceManager.java |  5 +-
 .../sun/java2d/opengl/WGLGraphicsConfig.java  | 14 ++---
 .../sun/java2d/opengl/WGLSurfaceData.java     | 11 +++-
 .../opengl/WGLVolatileSurfaceManager.java     |  4 +-
 .../sun/java2d/windows/GDIBlitLoops.java      |  3 +-
 .../sun/java2d/windows/GDIRenderer.java       | 29 ++++++++-
 .../java2d/windows/GDIWindowSurfaceData.java  |  8 ++-
 .../sun/java2d/windows/WindowsFlags.java      |  2 +-
 .../sun/print/PlatformPrinterJobProxy.java    |  2 +-
 .../sun/print/PrintServiceLookupProvider.java |  6 +-
 .../classes/sun/print/Win32MediaTray.java     |  4 +-
 .../classes/sun/print/Win32PrintJob.java      | 10 ++-
 .../classes/sun/print/Win32PrintService.java  | 33 ++++++++--
 .../plaf/windows/ClassicSortArrowIcon.java    |  5 +-
 109 files changed, 743 insertions(+), 200 deletions(-)

diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
index a71b3b8367f..a91e1a97ee1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
@@ -62,7 +62,7 @@
  *
  * @author Igor Kushnirskiy
  */
-class AnimationController implements ActionListener, PropertyChangeListener {
+final class AnimationController implements ActionListener, PropertyChangeListener {
 
     private static final boolean VISTA_ANIMATION_DISABLED =
                         Boolean.getBoolean("swing.disablevistaanimation");
@@ -253,6 +253,7 @@ static void paintSkin(JComponent component, Skin skin,
         }
     }
 
+    @Override
     public synchronized void propertyChange(PropertyChangeEvent e) {
         if ("lookAndFeel" == e.getPropertyName()
             && ! (e.getNewValue() instanceof WindowsLookAndFeel) ) {
@@ -260,6 +261,7 @@ public synchronized void propertyChange(PropertyChangeEvent e) {
         }
     }
 
+    @Override
     public synchronized void actionPerformed(ActionEvent e) {
         java.util.List<JComponent> componentsToRemove = null;
         java.util.List<Part> partsToRemove = null;
@@ -319,7 +321,7 @@ private synchronized void dispose() {
         }
     }
 
-    private static class AnimationState {
+    private static final class AnimationState {
         private final State startState;
 
         //animation duration in nanoseconds
@@ -407,7 +409,7 @@ boolean isDone() {
         }
     }
 
-    private static class PartUIClientPropertyKey
+    private static final class PartUIClientPropertyKey
           implements UIClientPropertyKey {
 
         private static final Map<Part, PartUIClientPropertyKey> map =
@@ -426,6 +428,7 @@ static synchronized PartUIClientPropertyKey getKey(Part part) {
         private PartUIClientPropertyKey(Part part) {
             this.part  = part;
         }
+        @Override
         public String toString() {
             return part.toString();
         }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
index 90c7f797043..93628d85766 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/TMSchema.java
@@ -221,6 +221,7 @@ public String getControlName(Component component) {
             return str + control.toString();
         }
 
+        @Override
         public String toString() {
             return control.toString()+"."+name();
         }
@@ -531,6 +532,7 @@ public int getValue() {
             return value;
         }
 
+        @Override
         public String toString() {
             return name()+"["+type.getName()+"] = "+value;
         }
@@ -559,6 +561,7 @@ private TypeEnum(Prop prop, String enumName, int value) {
         private final String enumName;
         private final int value;
 
+        @Override
         public String toString() {
             return prop+"="+enumName+"="+value;
         }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
index 1e10ccce1bf..31a490bebcc 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
@@ -43,7 +43,7 @@
  * @author Rich Schiavi
  */
 
-public class WindowsBorders {
+public final class WindowsBorders {
 
     /**
      * Returns a  border instance for a Windows Progress Bar
@@ -115,7 +115,7 @@ public static Border getInternalFrameBorder() {
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public static class ProgressBarBorder extends AbstractBorder implements UIResource {
+    public static final class ProgressBarBorder extends AbstractBorder implements UIResource {
         protected Color shadow;
         protected Color highlight;
 
@@ -124,6 +124,7 @@ public ProgressBarBorder(Color shadow, Color highlight) {
             this.shadow = shadow;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                                 int width, int height) {
             g.setColor(shadow);
@@ -134,6 +135,7 @@ public void paintBorder(Component c, Graphics g, int x, int y,
             g.drawLine(width-1,y, width-1,height-1); // draw right
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(1,1,1,1);
             return insets;
@@ -146,7 +148,7 @@ public Insets getBorderInsets(Component c, Insets insets) {
      * @since 1.4
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public static class ToolBarBorder extends AbstractBorder implements UIResource, SwingConstants {
+    public static final class ToolBarBorder extends AbstractBorder implements UIResource, SwingConstants {
         protected Color shadow;
         protected Color highlight;
 
@@ -155,6 +157,7 @@ public ToolBarBorder(Color shadow, Color highlight) {
             this.shadow = shadow;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                                 int width, int height) {
             if (!(c instanceof JToolBar)) {
@@ -224,6 +227,7 @@ public void paintBorder(Component c, Graphics g, int x, int y,
             g.translate(-x, -y);
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(1,1,1,1);
             if (!(c instanceof JToolBar)) {
@@ -259,6 +263,7 @@ public DashedBorder(Color color, int thickness)  {
             super(color, thickness);
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             Color oldColor = g.getColor();
             int i;
@@ -276,7 +281,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
      * of the component's background color.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    static class ComplementDashedBorder extends LineBorder implements UIResource {
+    static final class ComplementDashedBorder extends LineBorder implements UIResource {
         private Color origColor;
         private Color paintColor;
 
@@ -284,6 +289,7 @@ public ComplementDashedBorder() {
             super(null);
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             Color color = c.getBackground();
 
@@ -302,7 +308,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
      * @since 1.4
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public static class InternalFrameLineBorder extends LineBorder implements
+    public static final class InternalFrameLineBorder extends LineBorder implements
             UIResource {
         protected Color activeColor;
         protected Color inactiveColor;
@@ -315,6 +321,7 @@ public InternalFrameLineBorder(Color activeBorderColor,
             inactiveColor = inactiveBorderColor;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                 int width, int height) {
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
index b1f7f3902e2..33dea2b3b08 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
@@ -58,7 +58,7 @@
  *
  * @author Jeff Dinkins
  */
-public class WindowsButtonUI extends BasicButtonUI
+public final class WindowsButtonUI extends BasicButtonUI
 {
     protected int dashedRectGapX;
     protected int dashedRectGapY;
@@ -89,6 +89,7 @@ public static ComponentUI createUI(JComponent c) {
     // ********************************
     //            Defaults
     // ********************************
+    @Override
     protected void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -108,6 +109,7 @@ protected void installDefaults(AbstractButton b) {
         }
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
@@ -124,10 +126,12 @@ protected Color getFocusColor() {
     /**
      * Overridden method to render the text without the mnemonic
      */
+    @Override
     protected void paintText(Graphics g, AbstractButton b, Rectangle textRect, String text) {
         WindowsGraphicsUtils.paintText(g, b, textRect, text, getTextShiftOffset());
     }
 
+    @Override
     protected void paintFocus(Graphics g, AbstractButton b, Rectangle viewRect, Rectangle textRect, Rectangle iconRect){
 
         // focus painted same color as text on Basic??
@@ -138,6 +142,7 @@ protected void paintFocus(Graphics g, AbstractButton b, Rectangle viewRect, Rect
                                           width - dashedRectGapWidth, height - dashedRectGapHeight);
     }
 
+    @Override
     protected void paintButtonPressed(Graphics g, AbstractButton b){
         setTextShiftOffset();
     }
@@ -145,6 +150,7 @@ protected void paintButtonPressed(Graphics g, AbstractButton b){
     // ********************************
     //          Layout Methods
     // ********************************
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         Dimension d = super.getPreferredSize(c);
 
@@ -167,6 +173,7 @@ public Dimension getPreferredSize(JComponent c) {
      */
     private Rectangle viewRect = new Rectangle();
 
+    @Override
     public void paint(Graphics g, JComponent c) {
         if (XPStyle.getXP() != null) {
             WindowsButtonUI.paintXPButtonBackground(g, c);
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
index c7007bec3db..6b85a88e50c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
@@ -41,11 +41,12 @@
 /**
  * Windows check box menu item.
  */
-public class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI {
+public final class WindowsCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI {
 
     final WindowsMenuItemUIAccessor accessor =
         new WindowsMenuItemUIAccessor() {
 
+            @Override
             public JMenuItem getMenuItem() {
                 return menuItem;
             }
@@ -54,6 +55,7 @@ public State getState(JMenuItem menuItem) {
                 return WindowsMenuItemUI.getState(this, menuItem);
             }
 
+            @Override
             public Part getPart(JMenuItem menuItem) {
                 return WindowsMenuItemUI.getPart(this, menuItem);
             }
@@ -80,6 +82,7 @@ protected  void paintBackground(Graphics g, JMenuItem menuItem,
      * @param text String to render
      * @since 1.4
      */
+    @Override
     protected void paintText(Graphics g, JMenuItem menuItem,
                              Rectangle textRect, String text) {
         if (WindowsMenuItemUI.isVistaPainting()) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
index f94b58c5610..3ead1228b0e 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
@@ -37,7 +37,7 @@
  *
  * @author Jeff Dinkins
  */
-public class WindowsCheckBoxUI extends WindowsRadioButtonUI
+public final class WindowsCheckBoxUI extends WindowsRadioButtonUI
 {
     // NOTE: WindowsCheckBoxUI inherits from WindowsRadioButtonUI instead
     // of BasicCheckBoxUI because we want to pick up all the
@@ -64,6 +64,7 @@ public static ComponentUI createUI(JComponent c) {
     }
 
 
+    @Override
     public String getPropertyPrefix() {
         return propertyPrefix;
     }
@@ -71,6 +72,7 @@ public String getPropertyPrefix() {
     // ********************************
     //          Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -79,6 +81,7 @@ public void installDefaults(AbstractButton b) {
         }
     }
 
+    @Override
     public void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
index 6a2c9eeae31..59eace01a4c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
@@ -31,7 +31,8 @@
  * @since 1.5
  */
 @SuppressWarnings("serial") // Superclass is not serializable across versions
-public class WindowsClassicLookAndFeel extends WindowsLookAndFeel {
+public final class WindowsClassicLookAndFeel extends WindowsLookAndFeel {
+    @Override
     public String getName() {
         return "Windows Classic";
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
index 1a601f40332..f37ce17d876 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
@@ -75,7 +75,7 @@
  * @author Tom Santos
  * @author Igor Kushnirskiy
  */
-public class WindowsComboBoxUI extends BasicComboBoxUI {
+public final class WindowsComboBoxUI extends BasicComboBoxUI {
 
     private static final MouseListener rolloverListener =
         new MouseAdapter() {
@@ -162,6 +162,7 @@ public static ComponentUI createUI(JComponent c) {
         return new WindowsComboBoxUI();
     }
 
+    @Override
     public void installUI( JComponent c ) {
         super.installUI( c );
         isRollover = false;
@@ -176,6 +177,7 @@ public void installUI( JComponent c ) {
         }
     }
 
+    @Override
     public void uninstallUI(JComponent c ) {
         comboBox.removeMouseListener(rolloverListener);
         if(arrowButton != null) {
@@ -215,6 +217,7 @@ protected void uninstallListeners() {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected void configureEditor() {
         super.configureEditor();
         if (XPStyle.getXP() != null) {
@@ -226,6 +229,7 @@ protected void configureEditor() {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected void unconfigureEditor() {
         super.unconfigureEditor();
         editor.removeMouseListener(rolloverListener);
@@ -235,6 +239,7 @@ protected void unconfigureEditor() {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     public void paint(Graphics g, JComponent c) {
         if (XPStyle.getXP() != null) {
             paintXPComboBoxBackground(g, c);
@@ -283,6 +288,7 @@ private void paintXPComboBoxBackground(Graphics g, JComponent c) {
      * @throws NullPointerException if any of the arguments are null.
      * @since 1.5
      */
+    @Override
     public void paintCurrentValue(Graphics g, Rectangle bounds,
                                   boolean hasFocus) {
         XPStyle xp = XPStyle.getXP();
@@ -347,6 +353,7 @@ public void paintCurrentValue(Graphics g, Rectangle bounds,
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     public void paintCurrentValueBackground(Graphics g, Rectangle bounds,
                                             boolean hasFocus) {
         if (XPStyle.getXP() == null) {
@@ -354,6 +361,7 @@ public void paintCurrentValueBackground(Graphics g, Rectangle bounds,
         }
     }
 
+    @Override
     public Dimension getMinimumSize( JComponent c ) {
         Dimension d = super.getMinimumSize(c);
         if (XPStyle.getXP() != null) {
@@ -380,6 +388,7 @@ public Dimension getMinimumSize( JComponent c ) {
      *
      * @return an instance of a layout manager
      */
+    @Override
     protected LayoutManager createLayoutManager() {
         return new BasicComboBoxUI.ComboBoxLayoutManager() {
             public void layoutContainer(Container parent) {
@@ -407,10 +416,12 @@ public void layoutContainer(Container parent) {
         };
     }
 
+    @Override
     protected void installKeyboardActions() {
         super.installKeyboardActions();
     }
 
+    @Override
     protected ComboPopup createPopup() {
         return new WinComboPopUp(comboBox);
     }
@@ -423,6 +434,7 @@ protected ComboPopup createPopup() {
      * @return a <code>ComboBoxEditor</code> used for the combo box
      * @see javax.swing.JComboBox#setEditor
      */
+    @Override
     protected ComboBoxEditor createEditor() {
         return new WindowsComboBoxEditor();
     }
@@ -447,6 +459,7 @@ protected ListCellRenderer<Object> createRenderer() {
      *
      * @return a button which represents the popup control
      */
+    @Override
     protected JButton createArrowButton() {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -457,7 +470,7 @@ protected JButton createArrowButton() {
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private class XPComboBoxButton extends XPStyle.GlyphButton {
+    private final class XPComboBoxButton extends XPStyle.GlyphButton {
         private State prevState = null;
 
         public XPComboBoxButton(XPStyle xp) {
@@ -504,6 +517,7 @@ protected State getState() {
             return rv;
         }
 
+        @Override
         public Dimension getPreferredSize() {
             return new Dimension(17, 21);
         }
@@ -518,7 +532,7 @@ WindowsComboBoxUI getWindowsComboBoxUI() {
     }
 
     @SuppressWarnings("serial") // Same-version serialization only
-    protected class WinComboPopUp extends BasicComboPopup {
+    protected final class WinComboPopUp extends BasicComboPopup {
         private Skin listBoxBorder = null;
         private XPStyle xp;
 
@@ -531,16 +545,18 @@ public WinComboPopUp(JComboBox<Object> combo) {
             }
         }
 
+        @Override
         protected KeyListener createKeyListener() {
             return new InvocationKeyHandler();
         }
 
-        protected class InvocationKeyHandler extends BasicComboPopup.InvocationKeyHandler {
+        protected final class InvocationKeyHandler extends BasicComboPopup.InvocationKeyHandler {
             protected InvocationKeyHandler() {
                 WinComboPopUp.this.super();
             }
         }
 
+        @Override
         protected void paintComponent(Graphics g) {
             super.paintComponent(g);
             if (this.listBoxBorder != null) {
@@ -554,13 +570,14 @@ protected void paintComponent(Graphics g) {
     /**
      * Subclassed to highlight selected item in an editable combo box.
      */
-    public static class WindowsComboBoxEditor
+    public static final class WindowsComboBoxEditor
         extends BasicComboBoxEditor.UIResource {
 
         /**
          * {@inheritDoc}
          * @since 1.6
          */
+        @Override
         protected JTextField createEditorComponent() {
             JTextField editor = super.createEditorComponent();
             Border border = (Border)UIManager.get("ComboBox.editorBorder");
@@ -572,6 +589,7 @@ protected JTextField createEditorComponent() {
             return editor;
         }
 
+        @Override
         public void setItem(Object item) {
             super.setItem(item);
             Object focus = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
@@ -586,14 +604,14 @@ public void setItem(Object item) {
      * and to show border for focused cells.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private static class WindowsComboBoxRenderer
+    private static final class WindowsComboBoxRenderer
           extends BasicComboBoxRenderer.UIResource {
         private static final Object BORDER_KEY
             = new StringUIClientPropertyKey("BORDER_KEY");
         private static final Border NULL_BORDER = new EmptyBorder(0, 0, 0, 0);
 
         // Create own version of DashedBorder with more space on left side
-        private static class WindowsComboBoxDashedBorder extends DashedBorder {
+        private static final class WindowsComboBoxDashedBorder extends DashedBorder {
 
             public WindowsComboBoxDashedBorder(Color color, int thickness) {
                 super(color, thickness);
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
index 564ae5b9f71..8da4bd7921b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
@@ -36,18 +36,20 @@
 /**
  * Windows icon for a minimized window on the desktop.
  */
-public class WindowsDesktopIconUI extends BasicDesktopIconUI {
+public final class WindowsDesktopIconUI extends BasicDesktopIconUI {
     private int width;
 
     public static ComponentUI createUI(JComponent c) {
         return new WindowsDesktopIconUI();
     }
 
+    @Override
     public void installDefaults() {
         super.installDefaults();
         width = UIManager.getInt("DesktopIcon.width");
     }
 
+    @Override
     public void installUI(JComponent c)   {
         super.installUI(c);
 
@@ -55,6 +57,7 @@ public void installUI(JComponent c)   {
     }
 
     // Uninstall the listeners added by the WindowsInternalFrameTitlePane
+    @Override
     public void uninstallUI(JComponent c) {
         WindowsInternalFrameTitlePane thePane =
                                         (WindowsInternalFrameTitlePane)iconPane;
@@ -62,6 +65,7 @@ public void uninstallUI(JComponent c) {
         thePane.uninstallListeners();
     }
 
+    @Override
     protected void installComponents() {
         iconPane = new WindowsInternalFrameTitlePane(frame);
         desktopIcon.setLayout(new BorderLayout());
@@ -72,6 +76,7 @@ protected void installComponents() {
         }
     }
 
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         // Windows desktop icons can not be resized.  Therefore, we should
         // always return the minimum size of the desktop icon. See
@@ -83,6 +88,7 @@ public Dimension getPreferredSize(JComponent c) {
      * Windows desktop icons are restricted to a width of 160 pixels by
      * default.  This value is retrieved by the DesktopIcon.width property.
      */
+    @Override
     public Dimension getMinimumSize(JComponent c) {
         Dimension dim = super.getMinimumSize(c);
         dim.width = width;
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
index 82708f571e5..355f70b4607 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
@@ -52,7 +52,7 @@
  * @author Thomas Ball
  */
 @SuppressWarnings("serial") // JDK-implementation class
-public class WindowsDesktopManager extends DefaultDesktopManager
+public final class WindowsDesktopManager extends DefaultDesktopManager
         implements java.io.Serializable, javax.swing.plaf.UIResource {
 
     /* The frame which is currently selected/activated.
@@ -60,6 +60,7 @@ public class WindowsDesktopManager extends DefaultDesktopManager
      */
     private WeakReference<JInternalFrame> currentFrameRef;
 
+    @Override
     public void activateFrame(JInternalFrame f) {
         JInternalFrame currentFrame = currentFrameRef != null ?
             currentFrameRef.get() : null;
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
index 3ceea2d31dc..49ab809dddd 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
@@ -34,12 +34,13 @@
  *
  * @author David Kloba
  */
-public class WindowsDesktopPaneUI extends BasicDesktopPaneUI
+public final class WindowsDesktopPaneUI extends BasicDesktopPaneUI
 {
     public static ComponentUI createUI(JComponent c) {
         return new WindowsDesktopPaneUI();
     }
 
+    @Override
     protected void installDesktopManager() {
         desktopManager = desktop.getDesktopManager();
         if(desktopManager == null) {
@@ -48,10 +49,12 @@ protected void installDesktopManager() {
         }
     }
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     protected void installKeyboardActions() {
         super.installKeyboardActions();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
index 2f5c45633d4..abccb6b9a48 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
@@ -33,7 +33,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsEditorPaneUI extends BasicEditorPaneUI
+public final class WindowsEditorPaneUI extends BasicEditorPaneUI
 {
 
     /**
@@ -54,6 +54,7 @@ public static ComponentUI createUI(JComponent c) {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsTextUI.WindowsCaret();
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index 7065e3db19b..37d45bbf902 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
@@ -101,7 +101,7 @@
  *
  * @author Jeff Dinkins
  */
-public class WindowsFileChooserUI extends BasicFileChooserUI {
+public final class WindowsFileChooserUI extends BasicFileChooserUI {
 
     // The following are private because the implementation of the
     // Windows FileChooser L&F is not complete yet.
@@ -194,61 +194,75 @@ public WindowsFileChooserUI(JFileChooser filechooser) {
         super(filechooser);
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
     }
 
+    @Override
     public void uninstallComponents(JFileChooser fc) {
         fc.removeAll();
     }
 
-    private class WindowsFileChooserUIAccessor implements FilePane.FileChooserUIAccessor {
+    private final class WindowsFileChooserUIAccessor implements FilePane.FileChooserUIAccessor {
+        @Override
         public JFileChooser getFileChooser() {
             return WindowsFileChooserUI.this.getFileChooser();
         }
 
+        @Override
         public BasicDirectoryModel getModel() {
             return WindowsFileChooserUI.this.getModel();
         }
 
+        @Override
         public JPanel createList() {
             return WindowsFileChooserUI.this.createList(getFileChooser());
         }
 
+        @Override
         public JPanel createDetailsView() {
             return WindowsFileChooserUI.this.createDetailsView(getFileChooser());
         }
 
+        @Override
         public boolean isDirectorySelected() {
             return WindowsFileChooserUI.this.isDirectorySelected();
         }
 
+        @Override
         public File getDirectory() {
             return WindowsFileChooserUI.this.getDirectory();
         }
 
+        @Override
         public Action getChangeToParentDirectoryAction() {
             return WindowsFileChooserUI.this.getChangeToParentDirectoryAction();
         }
 
+        @Override
         public Action getApproveSelectionAction() {
             return WindowsFileChooserUI.this.getApproveSelectionAction();
         }
 
+        @Override
         public Action getNewFolderAction() {
             return WindowsFileChooserUI.this.getNewFolderAction();
         }
 
+        @Override
         public MouseListener createDoubleClickListener(JList<?> list) {
             return WindowsFileChooserUI.this.createDoubleClickListener(getFileChooser(),
                                                                        list);
         }
 
+        @Override
         public ListSelectionListener createListSelectionListener() {
             return WindowsFileChooserUI.this.createListSelectionListener(getFileChooser());
         }
     }
 
+    @Override
     public void installComponents(JFileChooser fc) {
         filePane = new FilePane(new WindowsFileChooserUIAccessor());
         fc.addPropertyChangeListener(filePane);
@@ -584,6 +598,7 @@ protected JPanel getBottomPanel() {
         return bottomPanel;
     }
 
+    @Override
     protected void installStrings(JFileChooser fc) {
         super.installStrings(fc);
 
@@ -615,6 +630,7 @@ private Integer getMnemonic(String key, Locale l) {
         return SwingUtilities2.getUIDefaultsInt(key, l);
     }
 
+    @Override
     protected void installListeners(JFileChooser fc) {
         super.installListeners(fc);
         ActionMap actionMap = getActionMap();
@@ -645,10 +661,12 @@ protected JPanel createDetailsView(JFileChooser fc) {
      * @param fc a <code>JFileChooser</code>
      * @return a <code>ListSelectionListener</code>
      */
+    @Override
     public ListSelectionListener createListSelectionListener(JFileChooser fc) {
         return super.createListSelectionListener(fc);
     }
 
+    @Override
     public void uninstallUI(JComponent c) {
         // Remove listeners
         c.removePropertyChangeListener(filterComboBoxModel);
@@ -859,6 +877,7 @@ private void doControlButtonsChanged(PropertyChangeEvent e) {
      * Listen for filechooser property changes, such as
      * the selected file changing, or the type of the dialog changing.
      */
+    @Override
     public PropertyChangeListener createPropertyChangeListener(JFileChooser fc) {
         return new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent e) {
@@ -913,14 +932,17 @@ protected void addControlButtons() {
         getBottomPanel().add(getButtonPanel());
     }
 
+    @Override
     public void ensureFileIsVisible(JFileChooser fc, File f) {
         filePane.ensureFileIsVisible(fc, f);
     }
 
+    @Override
     public void rescanCurrentDirectory(JFileChooser fc) {
         filePane.rescanCurrentDirectory();
     }
 
+    @Override
     public String getFileName() {
         if(filenameTextField != null) {
             return filenameTextField.getText();
@@ -929,6 +951,7 @@ public String getFileName() {
         }
     }
 
+    @Override
     public void setFileName(String filename) {
         if(filenameTextField != null) {
             filenameTextField.setText(filename);
@@ -942,6 +965,7 @@ public void setFileName(String filename) {
      * @param directorySelected if a directory is currently selected.
      * @since 1.4
      */
+    @Override
     protected void setDirectorySelected(boolean directorySelected) {
         super.setDirectorySelected(directorySelected);
         JFileChooser chooser = getFileChooser();
@@ -956,11 +980,13 @@ protected void setDirectorySelected(boolean directorySelected) {
         }
     }
 
+    @Override
     public String getDirectoryName() {
         // PENDING(jeff) - get the name from the directory combobox
         return null;
     }
 
+    @Override
     public void setDirectoryName(String dirname) {
         // PENDING(jeff) - set the name in the directory combobox
     }
@@ -1032,8 +1058,9 @@ public void focusLost(FocusEvent e) {
     // Renderer for DirectoryComboBox
     //
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    class DirectoryComboBoxRenderer extends DefaultListCellRenderer  {
+    final class DirectoryComboBoxRenderer extends DefaultListCellRenderer  {
         IndentIcon ii = new IndentIcon();
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value,
                                                       int index, boolean isSelected,
                                                       boolean cellHasFocus) {
@@ -1056,11 +1083,12 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
     }
 
     static final int space = 10;
-    static class IndentIcon implements Icon {
+    static final class IndentIcon implements Icon {
 
         Icon icon = null;
         int depth = 0;
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             if (c.getComponentOrientation().isLeftToRight()) {
                 icon.paintIcon(c, g, x+depth*space, y);
@@ -1069,10 +1097,12 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             }
         }
 
+        @Override
         public int getIconWidth() {
             return icon.getIconWidth() + depth*space;
         }
 
+        @Override
         public int getIconHeight() {
             return icon.getIconHeight();
         }
@@ -1090,7 +1120,7 @@ protected DirectoryComboBoxModel createDirectoryComboBoxModel(JFileChooser fc) {
      * Data model for a type-face selection combo-box.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    protected class DirectoryComboBoxModel extends AbstractListModel<File> implements ComboBoxModel<File> {
+    protected final class DirectoryComboBoxModel extends AbstractListModel<File> implements ComboBoxModel<File> {
         Vector<File> directories = new Vector<File>();
         int[] depths = null;
         File selectedDirectory = null;
@@ -1187,19 +1217,23 @@ public int getDepth(int i) {
             return (depths != null && i >= 0 && i < depths.length) ? depths[i] : 0;
         }
 
+        @Override
         public void setSelectedItem(Object selectedDirectory) {
             this.selectedDirectory = (File)selectedDirectory;
             fireContentsChanged(this, -1, -1);
         }
 
+        @Override
         public Object getSelectedItem() {
             return selectedDirectory;
         }
 
+        @Override
         public int getSize() {
             return directories.size();
         }
 
+        @Override
         public File getElementAt(int index) {
             return directories.elementAt(index);
         }
@@ -1216,7 +1250,8 @@ protected FilterComboBoxRenderer createFilterComboBoxRenderer() {
      * Render different type sizes and styles.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public class FilterComboBoxRenderer extends DefaultListCellRenderer {
+    public final class FilterComboBoxRenderer extends DefaultListCellRenderer {
+        @Override
         public Component getListCellRendererComponent(JList<?> list,
             Object value, int index, boolean isSelected,
             boolean cellHasFocus) {
@@ -1242,7 +1277,7 @@ protected FilterComboBoxModel createFilterComboBoxModel() {
      * Data model for a type-face selection combo-box.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    protected class FilterComboBoxModel extends AbstractListModel<FileFilter> implements ComboBoxModel<FileFilter>,
+    protected final class FilterComboBoxModel extends AbstractListModel<FileFilter> implements ComboBoxModel<FileFilter>,
             PropertyChangeListener {
         protected FileFilter[] filters;
         protected FilterComboBoxModel() {
@@ -1250,6 +1285,7 @@ protected FilterComboBoxModel() {
             filters = getFileChooser().getChoosableFileFilters();
         }
 
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             String prop = e.getPropertyName();
             if(prop == JFileChooser.CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY) {
@@ -1260,6 +1296,7 @@ public void propertyChange(PropertyChangeEvent e) {
             }
         }
 
+        @Override
         public void setSelectedItem(Object filter) {
             if(filter != null) {
                 getFileChooser().setFileFilter((FileFilter) filter);
@@ -1267,6 +1304,7 @@ public void setSelectedItem(Object filter) {
             }
         }
 
+        @Override
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
             // NOTE: we shouldn't have to do this, since JFileChooser adds
@@ -1288,6 +1326,7 @@ public Object getSelectedItem() {
             return getFileChooser().getFileFilter();
         }
 
+        @Override
         public int getSize() {
             if(filters != null) {
                 return filters.length;
@@ -1296,6 +1335,7 @@ public int getSize() {
             }
         }
 
+        @Override
         public FileFilter getElementAt(int index) {
             if(index > getSize() - 1) {
                 // This shouldn't happen. Try to recover gracefully.
@@ -1320,21 +1360,24 @@ public void valueChanged(ListSelectionEvent e) {
     /**
      * Acts when DirectoryComboBox has changed the selected item.
      */
-    protected class DirectoryComboBoxAction implements ActionListener {
+    protected final class DirectoryComboBoxAction implements ActionListener {
 
 
 
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             File f = (File)directoryComboBox.getSelectedItem();
             getFileChooser().setCurrentDirectory(f);
         }
     }
 
+    @Override
     protected JButton getApproveButton(JFileChooser fc) {
         return approveButton;
     }
 
+    @Override
     public FileView getFileView(JFileChooser fc) {
         return fileView;
     }
@@ -1342,9 +1385,10 @@ public FileView getFileView(JFileChooser fc) {
     // ***********************
     // * FileView operations *
     // ***********************
-    protected class WindowsFileView extends BasicFileView {
+    protected final class WindowsFileView extends BasicFileView {
         /* FileView type descriptions */
 
+        @Override
         public Icon getIcon(File f) {
             Icon icon = getCachedIcon(f);
             if (icon != null) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
index cb4b5caa86d..b5859b08ea8 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
@@ -58,7 +58,7 @@
  * @author Mark Davidson
  * @since 1.4
  */
-public class WindowsGraphicsUtils {
+public final class WindowsGraphicsUtils {
 
     /**
      * Renders a text String in Windows without the mnemonic.
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
index 072ff606b5b..cf2fd119423 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
@@ -63,7 +63,7 @@
  * @author Rich Schiavi
  */
 @SuppressWarnings("serial") // Same-version serialization only
-public class WindowsIconFactory implements Serializable
+public final class WindowsIconFactory implements Serializable
 {
     private static Icon frame_closeIcon;
     private static Icon frame_iconifyIcon;
@@ -173,13 +173,14 @@ public static Icon createFrameResizeIcon() {
 
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class FrameButtonIcon implements Icon, Serializable {
+    private static final class FrameButtonIcon implements Icon, Serializable {
         private final Part part;
 
         private FrameButtonIcon(Part part) {
             this.part = part;
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x0, int y0) {
             int width = getIconWidth();
             int height = getIconHeight();
@@ -281,6 +282,7 @@ public void paintIcon(Component c, Graphics g, int x0, int y0) {
             }
         }
 
+        @Override
         public int getIconWidth() {
             int width;
             if (XPStyle.getXP() != null) {
@@ -293,6 +295,7 @@ public int getIconWidth() {
             return width;
         }
 
+        @Override
         public int getIconHeight() {
             int height = UIManager.getInt("InternalFrame.titleButtonHeight")-4;
             return height;
@@ -302,7 +305,8 @@ public int getIconHeight() {
 
 
         @SuppressWarnings("serial") // Same-version serialization only
-        private static class ResizeIcon implements Icon, Serializable {
+        private static final class ResizeIcon implements Icon, Serializable {
+            @Override
             public void paintIcon(Component c, Graphics g, int x, int y) {
                 g.setColor(UIManager.getColor("InternalFrame.resizeIconHighlight"));
                 g.drawLine(0, 11, 11, 0);
@@ -317,14 +321,17 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                 g.drawLine(9, 11, 11, 9);
                 g.drawLine(10, 11, 11, 10);
             }
+            @Override
             public int getIconWidth() { return 13; }
+            @Override
             public int getIconHeight() { return 13; }
         }
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class CheckBoxIcon implements Icon, Serializable
+    private static final class CheckBoxIcon implements Icon, Serializable
     {
         static final int csize = 13;
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             JCheckBox cb = (JCheckBox) c;
             ButtonModel model = cb.getModel();
@@ -425,6 +432,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             }
         }
 
+        @Override
         public int getIconWidth() {
             XPStyle xp = XPStyle.getXP();
             if (xp != null) {
@@ -434,6 +442,7 @@ public int getIconWidth() {
             }
         }
 
+        @Override
         public int getIconHeight() {
             XPStyle xp = XPStyle.getXP();
             if (xp != null) {
@@ -445,8 +454,9 @@ public int getIconHeight() {
     }
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class RadioButtonIcon implements Icon, UIResource, Serializable
+    private static final class RadioButtonIcon implements Icon, UIResource, Serializable
     {
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
@@ -579,6 +589,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             }
         }
 
+        @Override
         public int getIconWidth() {
             XPStyle xp = XPStyle.getXP();
             if (xp != null) {
@@ -588,6 +599,7 @@ public int getIconWidth() {
             }
         }
 
+        @Override
         public int getIconHeight() {
             XPStyle xp = XPStyle.getXP();
             if (xp != null) {
@@ -600,8 +612,9 @@ public int getIconHeight() {
 
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class CheckBoxMenuItemIcon implements Icon, UIResource, Serializable
+    private static final class CheckBoxMenuItemIcon implements Icon, UIResource, Serializable
     {
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
@@ -619,15 +632,18 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                 g.drawLine(x+3, y+6, x+4, y+6);
             }
         }
+        @Override
         public int getIconWidth() { return 9; }
+        @Override
         public int getIconHeight() { return 9; }
 
     } // End class CheckBoxMenuItemIcon
 
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class RadioButtonMenuItemIcon implements Icon, UIResource, Serializable
+    private static final class RadioButtonMenuItemIcon implements Icon, UIResource, Serializable
     {
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
@@ -636,14 +652,17 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                                4, 4);
             }
         }
+        @Override
         public int getIconWidth() { return 12; }
+        @Override
         public int getIconHeight() { return 12; }
 
     } // End class RadioButtonMenuItemIcon
 
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class MenuItemCheckIcon implements Icon, UIResource, Serializable{
+    private static final class MenuItemCheckIcon implements Icon, UIResource, Serializable{
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             /* For debugging:
                Color oldColor = g.getColor();
@@ -652,13 +671,16 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             g.setColor(oldColor);
             */
         }
+        @Override
         public int getIconWidth() { return 9; }
+        @Override
         public int getIconHeight() { return 9; }
 
     } // End class MenuItemCheckIcon
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class MenuItemArrowIcon implements Icon, UIResource, Serializable {
+    private static final class MenuItemArrowIcon implements Icon, UIResource, Serializable {
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             /* For debugging:
             Color oldColor = g.getColor();
@@ -667,13 +689,16 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             g.setColor(oldColor);
             */
         }
+        @Override
         public int getIconWidth() { return 4; }
+        @Override
         public int getIconHeight() { return 8; }
 
     } // End class MenuItemArrowIcon
 
     @SuppressWarnings("serial") // Same-version serialization only
-    private static class MenuArrowIcon implements Icon, UIResource, Serializable {
+    private static final class MenuArrowIcon implements Icon, UIResource, Serializable {
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             XPStyle xp = XPStyle.getXP();
             if (WindowsMenuItemUI.isVistaPainting(xp)) {
@@ -708,6 +733,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
                 g.translate(-x,-y);
             }
         }
+        @Override
         public int getIconWidth() {
             XPStyle xp = XPStyle.getXP();
             if (WindowsMenuItemUI.isVistaPainting(xp)) {
@@ -717,6 +743,7 @@ public int getIconWidth() {
                 return 4;
             }
         }
+        @Override
         public int getIconHeight() {
             XPStyle xp = XPStyle.getXP();
             if (WindowsMenuItemUI.isVistaPainting(xp)) {
@@ -728,14 +755,16 @@ public int getIconHeight() {
         }
     } // End class MenuArrowIcon
 
-    static class VistaMenuItemCheckIconFactory
+    static final class VistaMenuItemCheckIconFactory
            implements MenuItemCheckIconFactory {
         private static final int OFFSET = 3;
 
+        @Override
         public Icon getIcon(JMenuItem component) {
             return new VistaMenuItemCheckIcon(component);
         }
 
+        @Override
         public boolean isCompatible(Object icon, String prefix) {
             return icon instanceof VistaMenuItemCheckIcon
               && ((VistaMenuItemCheckIcon) icon).type == getType(prefix);
@@ -788,7 +817,7 @@ private static Class<? extends JMenuItem> getType(String type) {
          * Note: to be used on Vista only.
          */
         @SuppressWarnings("serial") // Same-version serialization only
-        private static class VistaMenuItemCheckIcon
+        private static final class VistaMenuItemCheckIcon
               implements Icon, UIResource, Serializable {
 
             private final JMenuItem menuItem;
@@ -803,6 +832,7 @@ private static class VistaMenuItemCheckIcon
                 this.menuItem = null;
             }
 
+            @Override
             public int getIconHeight() {
                 Icon lafIcon = getLaFIcon();
                 if (lafIcon != null) {
@@ -825,6 +855,7 @@ public int getIconHeight() {
                 return height;
             }
 
+            @Override
             public int getIconWidth() {
                 Icon lafIcon = getLaFIcon();
                 if (lafIcon != null) {
@@ -840,6 +871,7 @@ public int getIconWidth() {
                 return width;
             }
 
+            @Override
             public void paintIcon(Component c, Graphics g, int x, int y) {
                 Icon lafIcon = getLaFIcon();
                 if (lafIcon != null) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
index 083563b4464..ba4bde12122 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
@@ -83,6 +83,7 @@ public WindowsInternalFrameTitlePane(JInternalFrame f) {
         super(f);
     }
 
+    @Override
     protected void addSubComponents() {
         add(systemLabel);
         add(iconButton);
@@ -90,6 +91,7 @@ protected void addSubComponents() {
         add(closeButton);
     }
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
 
@@ -117,11 +119,13 @@ protected void installDefaults() {
                 UIManager.getColor("InternalFrame.inactiveTitleGradient");
     }
 
+    @Override
     protected void uninstallListeners() {
         // Get around protected method in superclass
         super.uninstallListeners();
     }
 
+    @Override
     protected void createButtons() {
         super.createButtons();
         if (XPStyle.getXP() != null) {
@@ -131,6 +135,7 @@ protected void createButtons() {
         }
     }
 
+    @Override
     protected void setButtonIcons() {
         super.setButtonIcons();
 
@@ -142,6 +147,7 @@ protected void setButtonIcons() {
     }
 
 
+    @Override
     public void paintComponent(Graphics g)  {
         XPStyle xp = XPStyle.getXP();
 
@@ -224,10 +230,12 @@ public void paintComponent(Graphics g)  {
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         return getMinimumSize();
     }
 
+    @Override
     public Dimension getMinimumSize() {
         Dimension d = new Dimension(super.getMinimumSize());
         d.height = titlePaneHeight + 2;
@@ -245,6 +253,7 @@ public Dimension getMinimumSize() {
         return d;
     }
 
+    @Override
     protected void paintTitleBackground(Graphics g) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -285,6 +294,7 @@ protected void paintTitleBackground(Graphics g) {
         }
     }
 
+    @Override
     protected void assembleSystemMenu() {
         systemPopupMenu = new JPopupMenu();
         addSystemMenuItems(systemPopupMenu);
@@ -372,6 +382,7 @@ private static int getButtonMnemonic(String button) {
         }
     }
 
+    @Override
     protected void showSystemMenu(){
         showSystemPopupMenu(systemLabel);
     }
@@ -397,15 +408,17 @@ private void showSystemPopupMenu(Component invoker){
         }
     }
 
+    @Override
     protected PropertyChangeListener createPropertyChangeListener() {
         return new WindowsPropertyChangeHandler();
     }
 
+    @Override
     protected LayoutManager createLayout() {
         return new WindowsTitlePaneLayout();
     }
 
-    public class WindowsTitlePaneLayout extends BasicInternalFrameTitlePane.TitlePaneLayout {
+    public final class WindowsTitlePaneLayout extends BasicInternalFrameTitlePane.TitlePaneLayout {
         private Insets captionMargin = null;
         private Insets contentMargin = null;
         private XPStyle xp = XPStyle.getXP();
@@ -439,6 +452,7 @@ private int layoutButton(JComponent button, Part part,
             return x;
         }
 
+        @Override
         public void layoutContainer(Container c) {
             boolean leftToRight = WindowsGraphicsUtils.isLeftToRight(frame);
             int x, y;
@@ -492,7 +506,8 @@ public void layoutContainer(Container c) {
         }
     } // end WindowsTitlePaneLayout
 
-    public class WindowsPropertyChangeHandler extends PropertyChangeHandler {
+    public final class WindowsPropertyChangeHandler extends PropertyChangeHandler {
+        @Override
         public void propertyChange(PropertyChangeEvent evt) {
             String prop = evt.getPropertyName();
 
@@ -515,7 +530,7 @@ public void propertyChange(PropertyChangeEvent evt) {
      * <p>
      * Note: We assume here that icons are square.
      */
-    public static class ScalableIconUIResource implements Icon, UIResource {
+    public static final class ScalableIconUIResource implements Icon, UIResource {
         // We can use an arbitrary size here because we scale to it in paintIcon()
         private static final int SIZE = 16;
 
@@ -562,6 +577,7 @@ protected Icon getBestIcon(int size) {
             }
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             Graphics2D g2d = (Graphics2D)g.create();
             // Calculate how big our drawing area is in pixels
@@ -580,10 +596,12 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             g2d.dispose();
         }
 
+        @Override
         public int getIconWidth() {
             return SIZE;
         }
 
+        @Override
         public int getIconHeight() {
             return SIZE;
         }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
index 19169f6e424..5c331533af9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
@@ -45,10 +45,11 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsInternalFrameUI extends BasicInternalFrameUI
+public final class WindowsInternalFrameUI extends BasicInternalFrameUI
 {
     XPStyle xp = XPStyle.getXP();
 
+    @Override
     public void installDefaults() {
         super.installDefaults();
 
@@ -59,6 +60,7 @@ public void installDefaults() {
         }
     }
 
+    @Override
     public void installUI(JComponent c)   {
         super.installUI(c);
 
@@ -66,6 +68,7 @@ public void installUI(JComponent c)   {
                                     xp == null? Boolean.TRUE : Boolean.FALSE);
     }
 
+    @Override
     public void uninstallDefaults() {
         frame.setBorder(null);
         super.uninstallDefaults();
@@ -79,17 +82,19 @@ public WindowsInternalFrameUI(JInternalFrame w){
         super(w);
     }
 
+    @Override
     protected DesktopManager createDesktopManager(){
         return new WindowsDesktopManager();
     }
 
+    @Override
     protected JComponent createNorthPane(JInternalFrame w) {
         titlePane = new WindowsInternalFrameTitlePane(w);
         return titlePane;
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private class XPBorder extends AbstractBorder {
+    private final class XPBorder extends AbstractBorder {
         private Skin leftSkin   = xp.getSkin(frame, Part.WP_FRAMELEFT);
         private Skin rightSkin  = xp.getSkin(frame, Part.WP_FRAMERIGHT);
         private Skin bottomSkin = xp.getSkin(frame, Part.WP_FRAMEBOTTOM);
@@ -100,6 +105,7 @@ private class XPBorder extends AbstractBorder {
          * @param width the width of the painted border
          * @param height the height of the painted border
          */
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             State state = ((JInternalFrame)c).isSelected() ? State.ACTIVE : State.INACTIVE;
             int topBorderHeight  = (titlePane != null) ? titlePane.getSize().height : 0;
@@ -118,6 +124,7 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
 
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.top    = 4;
             insets.left   = leftSkin.getWidth();
@@ -127,6 +134,7 @@ public Insets getBorderInsets(Component c, Insets insets) {
             return insets;
         }
 
+        @Override
         public boolean isBorderOpaque() {
             return true;
         }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
index 6266772dcf4..d10f3f47c3c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
@@ -41,7 +41,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsLabelUI extends BasicLabelUI {
+public final class WindowsLabelUI extends BasicLabelUI {
 
     private static final Object WINDOWS_LABEL_UI_KEY = new Object();
 
@@ -59,6 +59,7 @@ public static ComponentUI createUI(JComponent c) {
         return windowsLabelUI;
     }
 
+    @Override
     protected void paintEnabledText(JLabel l, Graphics g, String s,
                                     int textX, int textY) {
         int mnemonicIndex = l.getDisplayedMnemonicIndex();
@@ -72,6 +73,7 @@ protected void paintEnabledText(JLabel l, Graphics g, String s,
                                                      textX, textY);
     }
 
+    @Override
     protected void paintDisabledText(JLabel l, Graphics g, String s,
                                      int textX, int textY) {
         int mnemonicIndex = l.getDisplayedMnemonicIndex();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index 72ad51535ff..d1ee714f362 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -145,26 +145,32 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
      */
     private int baseUnitY;
 
+    @Override
     public String getName() {
         return "Windows";
     }
 
+    @Override
     public String getDescription() {
         return "The Microsoft Windows Look and Feel";
     }
 
+    @Override
     public String getID() {
         return "Windows";
     }
 
+    @Override
     public boolean isNativeLookAndFeel() {
         return OSInfo.getOSType() == OSInfo.OSType.WINDOWS;
     }
 
+    @Override
     public boolean isSupportedLookAndFeel() {
         return isNativeLookAndFeel();
     }
 
+    @Override
     public void initialize() {
         super.initialize();
 
@@ -206,6 +212,7 @@ public void initialize() {
      *
      * @see BasicLookAndFeel#getDefaults
      */
+    @Override
     protected void initClassDefaults(UIDefaults table)
     {
         super.initClassDefaults(table);
@@ -260,6 +267,7 @@ protected void initClassDefaults(UIDefaults table)
      * values, otherwise we create color objects whose values match
      * the defaults Windows95 colors.
      */
+    @Override
     protected void initSystemColorDefaults(UIDefaults table)
     {
         String[] defaultSystemColors = {
@@ -310,6 +318,7 @@ private void initResourceBundle(UIDefaults table) {
 
     // XXX - there are probably a lot of redundant values that could be removed.
     // ie. Take a look at RadioButtonBorder, etc...
+    @Override
     protected void initComponentDefaults(UIDefaults table)
     {
         super.initComponentDefaults( table );
@@ -1893,6 +1902,7 @@ public Object createValue(UIDefaults table) {
         return lazyDefaults;
     }
 
+    @Override
     public void uninitialize() {
         super.uninitialize();
 
@@ -1944,6 +1954,7 @@ public static boolean isClassicWindows() {
      *
      * @see javax.swing.LookAndFeel#provideErrorFeedback
      */
+     @Override
      public void provideErrorFeedback(Component component) {
          super.provideErrorFeedback(component);
      }
@@ -1951,6 +1962,7 @@ public void provideErrorFeedback(Component component) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public LayoutStyle getLayoutStyle() {
         LayoutStyle style = this.style;
         if (style == null) {
@@ -1981,6 +1993,7 @@ public LayoutStyle getLayoutStyle() {
      * @see #playSound(Action)
      * @since 1.4
      */
+    @Override
     protected Action createAudioAction(Object key) {
         if (key != null) {
             String audioKey = (String)key;
@@ -2018,7 +2031,7 @@ static void repaintRootPane(Component c) {
      * @since 1.4
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private static class AudioAction extends AbstractAction {
+    private static final class AudioAction extends AbstractAction {
         private Runnable audioRunnable;
         private String audioResource;
         /**
@@ -2029,6 +2042,7 @@ public AudioAction(String name, String resource) {
             super(name);
             audioResource = resource;
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (audioRunnable == null) {
                 audioRunnable = (Runnable)Toolkit.getDefaultToolkit().getDesktopProperty(audioResource);
@@ -2045,7 +2059,7 @@ public void actionPerformed(ActionEvent e) {
      * Gets an <code>Icon</code> from the native libraries if available,
      * otherwise gets it from an image resource file.
      */
-    private static class LazyWindowsIcon implements UIDefaults.LazyValue {
+    private static final class LazyWindowsIcon implements UIDefaults.LazyValue {
         private String nativeImage;
         private String resource;
 
@@ -2054,6 +2068,7 @@ private static class LazyWindowsIcon implements UIDefaults.LazyValue {
             this.resource = resource;
         }
 
+        @Override
         public Object createValue(UIDefaults table) {
             if (nativeImage != null) {
                 Image image = (Image)ShellFolder.get(nativeImage);
@@ -2072,7 +2087,7 @@ public Object createValue(UIDefaults table) {
      * Gets an <code>Icon</code> from the native libraries if available.
      * A desktop property is used to trigger reloading the icon when needed.
      */
-    private static class ActiveWindowsIcon implements UIDefaults.ActiveValue {
+    private static final class ActiveWindowsIcon implements UIDefaults.ActiveValue {
         private Icon icon;
         private String nativeImageName;
         private String fallbackName;
@@ -2117,7 +2132,7 @@ public Object createValue(UIDefaults table) {
     /**
      * Icon backed-up by XP Skin.
      */
-    private static class SkinIcon implements Icon, UIResource {
+    private static final class SkinIcon implements Icon, UIResource {
         private final Part part;
         private final State state;
         SkinIcon(Part part, State state) {
@@ -2130,6 +2145,7 @@ private static class SkinIcon implements Icon, UIResource {
          * may use the Component argument to get properties useful for
          * painting, e.g. the foreground or background color.
          */
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             XPStyle xp = XPStyle.getXP();
             assert xp != null;
@@ -2144,6 +2160,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
          *
          * @return an int specifying the fixed width of the icon.
          */
+        @Override
         public int getIconWidth() {
             int width = 0;
             XPStyle xp = XPStyle.getXP();
@@ -2160,6 +2177,7 @@ public int getIconWidth() {
          *
          * @return an int specifying the fixed height of the icon.
          */
+        @Override
         public int getIconHeight() {
             int height = 0;
             XPStyle xp = XPStyle.getXP();
@@ -2176,11 +2194,12 @@ public int getIconHeight() {
      * WindowsDesktopProperty for fonts. If a font with the name 'MS Sans Serif'
      * is returned, it is mapped to 'Microsoft Sans Serif'.
      */
-    private static class WindowsFontProperty extends WindowsDesktopProperty {
+    private static final class WindowsFontProperty extends WindowsDesktopProperty {
         WindowsFontProperty(String key, Object backup) {
             super(key, backup);
         }
 
+        @Override
         public void invalidate(LookAndFeel laf) {
             if ("win.defaultGUI.font.height".equals(getKey())) {
                 ((WindowsLookAndFeel)laf).style = null;
@@ -2188,6 +2207,7 @@ public void invalidate(LookAndFeel laf) {
             super.invalidate(laf);
         }
 
+        @Override
         protected Object configureValue(Object value) {
             if (value instanceof Font) {
                 Font font = (Font)value;
@@ -2236,7 +2256,7 @@ protected Object configureValue(Object value) {
      * WindowsDesktopProperty for fonts that only gets sizes from the desktop,
      * font name and style are passed into the constructor
      */
-    private static class WindowsFontSizeProperty extends
+    private static final class WindowsFontSizeProperty extends
                                                  WindowsDesktopProperty {
         private String fontName;
         private int fontSize;
@@ -2250,6 +2270,7 @@ private static class WindowsFontSizeProperty extends
             this.fontStyle = fontStyle;
         }
 
+        @Override
         protected Object configureValue(Object value) {
             if (value == null) {
                 value = new FontUIResource(fontName, fontStyle, fontSize);
@@ -2278,6 +2299,7 @@ private static class XPValue implements UIDefaults.ActiveValue {
             this.classicValue = classicValue;
         }
 
+        @Override
         public Object createValue(UIDefaults table) {
             Object value = null;
             if (XPStyle.getXP() != null) {
@@ -2313,7 +2335,7 @@ private Object recursiveCreateValue(Object value, UIDefaults table) {
         }
     }
 
-    private static class XPBorderValue extends XPValue {
+    private static final class XPBorderValue extends XPValue {
         private final Border extraMargin;
 
         XPBorderValue(Part xpValue, Object classicValue) {
@@ -2325,6 +2347,7 @@ private static class XPBorderValue extends XPValue {
             this.extraMargin = extraMargin;
         }
 
+        @Override
         public Object getXPValue(UIDefaults table) {
             XPStyle xp = XPStyle.getXP();
             Border xpBorder = xp != null ? xp.getBorder(null, (Part)xpValue) : null;
@@ -2337,18 +2360,19 @@ public Object getXPValue(UIDefaults table) {
         }
     }
 
-    private static class XPColorValue extends XPValue {
+    private static final class XPColorValue extends XPValue {
         XPColorValue(Part part, State state, Prop prop, Object classicValue) {
             super(new XPColorValueKey(part, state, prop), classicValue);
         }
 
+        @Override
         public Object getXPValue(UIDefaults table) {
             XPColorValueKey key = (XPColorValueKey)xpValue;
             XPStyle xp = XPStyle.getXP();
             return xp != null ? xp.getColor(key.skin, key.prop, null) : null;
         }
 
-        private static class XPColorValueKey {
+        private static final class XPColorValueKey {
             Skin skin;
             Prop prop;
 
@@ -2359,7 +2383,7 @@ private static class XPColorValueKey {
         }
     }
 
-    private class XPDLUValue extends XPValue {
+    private final class XPDLUValue extends XPValue {
         private int direction;
 
         XPDLUValue(int xpdlu, int classicdlu, int direction) {
@@ -2367,11 +2391,13 @@ private class XPDLUValue extends XPValue {
             this.direction = direction;
         }
 
+        @Override
         public Object getXPValue(UIDefaults table) {
             int px = dluToPixels(((Integer)xpValue).intValue(), direction);
             return Integer.valueOf(px);
         }
 
+        @Override
         public Object getClassicValue(UIDefaults table) {
             int px = dluToPixels(((Integer)classicValue).intValue(), direction);
             return Integer.valueOf(px);
@@ -2387,6 +2413,7 @@ private static class TriggerDesktopProperty extends WindowsDesktopProperty {
             getValueFromDesktop();
         }
 
+        @Override
         protected void updateUI() {
             super.updateUI();
 
@@ -2395,11 +2422,12 @@ protected void updateUI() {
         }
     }
 
-    private static class FontDesktopProperty extends TriggerDesktopProperty {
+    private static final class FontDesktopProperty extends TriggerDesktopProperty {
         FontDesktopProperty(String key) {
             super(key);
         }
 
+        @Override
         protected void updateUI() {
             UIDefaults defaults = UIManager.getLookAndFeelDefaults();
             SwingUtilities2.putAATextInfo(true, defaults);
@@ -2410,7 +2438,7 @@ protected void updateUI() {
     // Windows LayoutStyle.  From:
     // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch14e.asp
     @SuppressWarnings("fallthrough")
-    private class WindowsLayoutStyle extends DefaultLayoutStyle {
+    private final class WindowsLayoutStyle extends DefaultLayoutStyle {
         @Override
         public int getPreferredGap(JComponent component1,
                 JComponent component2, ComponentPlacement type, int position,
@@ -2504,6 +2532,7 @@ private void calculateBaseUnits() {
      *
      * @since 1.6
      */
+    @Override
     public Icon getDisabledIcon(JComponent component, Icon icon) {
         // if the component has a HI_RES_DISABLED_ICON_CLIENT_KEY
         // client property set to Boolean.TRUE, then use the new
@@ -2525,10 +2554,11 @@ public Icon getDisabledIcon(JComponent component, Icon icon) {
         return super.getDisabledIcon(component, icon);
     }
 
-    private static class RGBGrayFilter extends RGBImageFilter {
+    private static final class RGBGrayFilter extends RGBImageFilter {
         public RGBGrayFilter() {
             canFilterIndexColorModel = true;
         }
+        @Override
         public int filterRGB(int x, int y, int rgb) {
             // find the average of red, green, and blue
             float avg = (((rgb >> 16) & 0xff) / 255f +
@@ -2547,7 +2577,7 @@ public int filterRGB(int x, int y, int rgb) {
         }
     }
 
-    private static class FocusColorProperty extends WindowsDesktopProperty {
+    private static final class FocusColorProperty extends WindowsDesktopProperty {
         public FocusColorProperty () {
             // Fallback value is never used because of the configureValue method doesn't return null
             super("win.3d.backgroundColor", Color.BLACK);
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
index 8c6cbdff541..f663d8d1e90 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
@@ -57,7 +57,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsMenuBarUI extends BasicMenuBarUI
+public final class WindowsMenuBarUI extends BasicMenuBarUI
 {
     /* to be accessed on the EDT only */
     private WindowListener windowListener = null;
@@ -125,6 +125,7 @@ public void hierarchyChanged(HierarchyEvent e) {
         super.installListeners();
     }
 
+    @Override
     protected void installKeyboardActions() {
         super.installKeyboardActions();
         ActionMap map = SwingUtilities.getUIActionMap(menuBar);
@@ -140,7 +141,7 @@ protected void installKeyboardActions() {
      * Unlike BasicMenuBarUI.TakeFocus, this Action will not show menu popup.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private static class TakeFocus extends AbstractAction {
+    private static final class TakeFocus extends AbstractAction {
         @Override
         public void actionPerformed(ActionEvent e) {
             JMenuBar menuBar = (JMenuBar)e.getSource();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
index 2f76f929133..2ee1b2d119f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
@@ -54,7 +54,7 @@
  *
  * @author Igor Kushnirskiy
  */
-public class WindowsMenuItemUI extends BasicMenuItemUI {
+public final class WindowsMenuItemUI extends BasicMenuItemUI {
     /**
      * The instance of {@code PropertyChangeListener}.
      */
@@ -63,6 +63,7 @@ public class WindowsMenuItemUI extends BasicMenuItemUI {
     final WindowsMenuItemUIAccessor accessor =
         new  WindowsMenuItemUIAccessor() {
 
+            @Override
             public JMenuItem getMenuItem() {
                 return menuItem;
             }
@@ -71,6 +72,7 @@ public State getState(JMenuItem menuItem) {
                 return WindowsMenuItemUI.getState(this, menuItem);
             }
 
+            @Override
             public Part getPart(JMenuItem menuItem) {
                 return WindowsMenuItemUI.getPart(this, menuItem);
             }
@@ -141,6 +143,7 @@ protected void uninstallListeners() {
      * @param textRect Bounding rectangle to render the text.
      * @param text String to render
      */
+    @Override
     protected void paintText(Graphics g, JMenuItem menuItem,
                              Rectangle textRect, String text) {
         if (WindowsMenuItemUI.isVistaPainting()) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
index 4195b4e85ca..5562ce60388 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
@@ -50,13 +50,14 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsMenuUI extends BasicMenuUI {
+public final class WindowsMenuUI extends BasicMenuUI {
     protected Integer menuBarHeight;
     protected boolean hotTrackingOn;
 
     final WindowsMenuItemUIAccessor accessor =
         new WindowsMenuItemUIAccessor() {
 
+            @Override
             public JMenuItem getMenuItem() {
                 return menuItem;
             }
@@ -106,6 +107,7 @@ public State getState(JMenuItem menu) {
                 return state;
             }
 
+            @Override
             public Part getPart(JMenuItem menuItem) {
                 return ((JMenu) menuItem).isTopLevelMenu() ? Part.MP_BARITEM
                         : Part.MP_POPUPITEM;
@@ -115,6 +117,7 @@ public static ComponentUI createUI(JComponent x) {
         return new WindowsMenuUI();
     }
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
         if (!WindowsLookAndFeel.isClassicWindows()) {
@@ -131,6 +134,7 @@ protected void installDefaults() {
      * Draws the background of the menu.
      * @since 1.4
      */
+    @Override
     protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) {
         if (WindowsMenuItemUI.isVistaPainting()) {
             WindowsMenuItemUI.paintBackground(accessor, g, menuItem, bgColor);
@@ -210,6 +214,7 @@ protected void paintBackground(Graphics g, JMenuItem menuItem, Color bgColor) {
      * @param text String to render
      * @since 1.4
      */
+    @Override
     protected void paintText(Graphics g, JMenuItem menuItem,
                              Rectangle textRect, String text) {
         if (WindowsMenuItemUI.isVistaPainting()) {
@@ -245,6 +250,7 @@ protected void paintText(Graphics g, JMenuItem menuItem,
         g.setColor(oldColor);
     }
 
+    @Override
     protected MouseInputListener createMouseInputListener(JComponent c) {
         return new WindowsMouseInputHandler();
     }
@@ -254,7 +260,8 @@ protected MouseInputListener createMouseInputListener(JComponent c) {
      * true when the mouse enters the menu and false when it exits.
      * @since 1.4
      */
-    protected class WindowsMouseInputHandler extends BasicMenuUI.MouseInputHandler {
+    protected final class WindowsMouseInputHandler extends BasicMenuUI.MouseInputHandler {
+        @Override
         public void mouseEntered(MouseEvent evt) {
             super.mouseEntered(evt);
 
@@ -265,6 +272,7 @@ public void mouseEntered(MouseEvent evt) {
             }
         }
 
+        @Override
         public void mouseExited(MouseEvent evt) {
             super.mouseExited(evt);
 
@@ -277,6 +285,7 @@ public void mouseExited(MouseEvent evt) {
         }
     }
 
+    @Override
     protected Dimension getPreferredMenuItemSize(JComponent c,
                                                      Icon checkIcon,
                                                      Icon arrowIcon,
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
index 2755cc76c96..5ced1659adf 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
@@ -30,5 +30,5 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsOptionPaneUI extends BasicOptionPaneUI {
+public final class WindowsOptionPaneUI extends BasicOptionPaneUI {
 }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
index baf0997ceff..1f64c18e61f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
@@ -33,7 +33,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsPasswordFieldUI extends BasicPasswordFieldUI {
+public final class WindowsPasswordFieldUI extends BasicPasswordFieldUI {
 
     /**
      * Creates a UI for a JPasswordField
@@ -54,6 +54,7 @@ public static ComponentUI createUI(JComponent c) {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsTextUI.WindowsCaret();
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
index ed31f00a89b..9d67278526a 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
@@ -42,12 +42,13 @@
  * @author Igor Kushnirskiy
  */
 
-public class WindowsPopupMenuSeparatorUI extends BasicPopupMenuSeparatorUI {
+public final class WindowsPopupMenuSeparatorUI extends BasicPopupMenuSeparatorUI {
 
     public static ComponentUI createUI(JComponent c) {
         return new WindowsPopupMenuSeparatorUI();
     }
 
+    @Override
     public void paint(Graphics g, JComponent c) {
         Dimension s = c.getSize();
         XPStyle xp = XPStyle.getXP();
@@ -82,6 +83,7 @@ public void paint(Graphics g, JComponent c) {
         }
     }
 
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         int fontHeight = 0;
         Font font = c.getFont();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
index 3bf214aff37..4df236115fb 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
@@ -57,7 +57,7 @@
  *
  * @author Igor Kushnirskiy
  */
-public class WindowsPopupMenuUI extends BasicPopupMenuUI {
+public final class WindowsPopupMenuUI extends BasicPopupMenuUI {
 
     static MnemonicListener mnemonicListener = null;
     static final Object GUTTER_OFFSET_KEY =
@@ -67,6 +67,7 @@ public static ComponentUI createUI(JComponent c) {
         return new WindowsPopupMenuUI();
     }
 
+    @Override
     public void installListeners() {
         super.installListeners();
         if (! UIManager.getBoolean("Button.showMnemonics") &&
@@ -88,14 +89,16 @@ public void installListeners() {
      * @return Popup that will show the JPopupMenu
      * @since 1.4
      */
+    @Override
     public Popup getPopup(JPopupMenu popupMenu, int x, int y) {
         PopupFactory popupFactory = PopupFactory.getSharedInstance();
         return popupFactory.getPopup(popupMenu.getInvoker(), popupMenu, x, y);
     }
 
-    static class MnemonicListener implements ChangeListener {
+    static final class MnemonicListener implements ChangeListener {
         JRootPane repaintRoot = null;
 
+        @Override
         public void stateChanged(ChangeEvent ev) {
             MenuSelectionManager msm = (MenuSelectionManager)ev.getSource();
             MenuElement[] path = msm.getSelectedPath();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
index f23cb31dff0..b58ad07a57b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
@@ -45,7 +45,7 @@
  * @author Amy Fowler
  */
 @SuppressWarnings("serial") // Superclass is not serializable across versions
-class WindowsPopupWindow extends JWindow {
+final class WindowsPopupWindow extends JWindow {
 
     static final int UNDEFINED_WINDOW_TYPE      = 0;
     static final int TOOLTIP_WINDOW_TYPE        = 1;
@@ -69,10 +69,12 @@ int getWindowType() {
         return windowType;
     }
 
+    @Override
     public void update(Graphics g) {
         paint(g);
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void hide() {
         super.hide();
@@ -85,6 +87,7 @@ public void hide() {
         removeNotify();
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void show() {
         super.show();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
index 790dc85166b..9cc7d277ff1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
@@ -51,7 +51,7 @@
  *
  * @author Michael C. Albers
  */
-public class WindowsProgressBarUI extends BasicProgressBarUI
+public final class WindowsProgressBarUI extends BasicProgressBarUI
 {
 
     private Rectangle previousFullBox;
@@ -62,6 +62,7 @@ public static ComponentUI createUI(JComponent x) {
     }
 
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
 
@@ -80,6 +81,7 @@ protected void installDefaults() {
      * @see javax.swing.JComponent#getBaseline(int, int)
      * @since 1.6
      */
+    @Override
     public int getBaseline(JComponent c, int width, int height) {
         int baseline = super.getBaseline(c, width, height);
         if (XPStyle.getXP() != null && progressBar.isStringPainted() &&
@@ -102,6 +104,7 @@ public int getBaseline(JComponent c, int width, int height) {
         return baseline;
     }
 
+    @Override
     protected Dimension getPreferredInnerHorizontal() {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -113,6 +116,7 @@ protected Dimension getPreferredInnerHorizontal() {
          return super.getPreferredInnerHorizontal();
     }
 
+    @Override
     protected Dimension getPreferredInnerVertical() {
          XPStyle xp = XPStyle.getXP();
          if (xp != null) {
@@ -124,6 +128,7 @@ protected Dimension getPreferredInnerVertical() {
          return super.getPreferredInnerVertical();
     }
 
+    @Override
     protected void paintDeterminate(Graphics g, JComponent c) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -218,6 +223,7 @@ protected void paintDeterminate(Graphics g, JComponent c) {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected void setAnimationIndex(int newValue) {
         super.setAnimationIndex(newValue);
         XPStyle xp = XPStyle.getXP();
@@ -241,6 +247,7 @@ protected void setAnimationIndex(int newValue) {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected int getBoxLength(int availableLength, int otherDimension) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -253,6 +260,7 @@ protected int getBoxLength(int availableLength, int otherDimension) {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected Rectangle getBox(Rectangle r) {
         Rectangle rect = super.getBox(r);
 
@@ -298,6 +306,7 @@ protected Rectangle getBox(Rectangle r) {
     }
 
 
+    @Override
     protected void paintIndeterminate(Graphics g, JComponent c) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
index 584a0f1622b..f6f3d4f06d1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
@@ -41,11 +41,12 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI {
+public final class WindowsRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI {
 
     final WindowsMenuItemUIAccessor accessor =
         new WindowsMenuItemUIAccessor() {
 
+           @Override
            public JMenuItem getMenuItem() {
                return menuItem;
            }
@@ -54,6 +55,7 @@ public State getState(JMenuItem menuItem) {
                return WindowsMenuItemUI.getState(this, menuItem);
            }
 
+           @Override
            public Part getPart(JMenuItem menuItem) {
                return WindowsMenuItemUI.getPart(this, menuItem);
            }
@@ -81,6 +83,7 @@ protected  void paintBackground(Graphics g, JMenuItem menuItem,
      * @param text String to render
      * @since 1.4
      */
+    @Override
     protected void paintText(Graphics g, JMenuItem menuItem,
             Rectangle textRect, String text) {
         if (WindowsMenuItemUI.isVistaPainting()) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
index dd0a93c95a1..8fdc1a315c9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
@@ -73,6 +73,7 @@ public static ComponentUI createUI(JComponent c) {
     // ********************************
     //           Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!initialized) {
@@ -88,6 +89,7 @@ public void installDefaults(AbstractButton b) {
         }
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         initialized = false;
@@ -104,11 +106,13 @@ protected Color getFocusColor() {
     /**
      * Overridden method to render the text without the mnemonic
      */
+    @Override
     protected void paintText(Graphics g, AbstractButton b, Rectangle textRect, String text) {
         WindowsGraphicsUtils.paintText(g, b, textRect, text, getTextShiftOffset());
     }
 
 
+    @Override
     protected void paintFocus(Graphics g, Rectangle textRect, Dimension d){
         g.setColor(getFocusColor());
         BasicGraphicsUtils.drawDashedRect(g, textRect.x, textRect.y, textRect.width, textRect.height);
@@ -117,6 +121,7 @@ protected void paintFocus(Graphics g, Rectangle textRect, Dimension d){
     // ********************************
     //          Layout Methods
     // ********************************
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         Dimension d = super.getPreferredSize(c);
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
index f05da909ac1..19bfad0a1da 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
@@ -70,7 +70,7 @@
  * @author Mark Davidson
  * @since 1.4
  */
-public class WindowsRootPaneUI extends BasicRootPaneUI {
+public final class WindowsRootPaneUI extends BasicRootPaneUI {
 
     private static final WindowsRootPaneUI windowsRootPaneUI = new WindowsRootPaneUI();
     static final AltProcessor altProcessor = new AltProcessor();
@@ -79,7 +79,7 @@ public static ComponentUI createUI(JComponent c) {
         return windowsRootPaneUI;
     }
 
-    static class AltProcessor implements KeyEventPostProcessor {
+    static final class AltProcessor implements KeyEventPostProcessor {
         static boolean altKeyPressed = false;
         static boolean menuCanceledOnPress = false;
         static JRootPane root = null;
@@ -166,6 +166,7 @@ void altReleased(KeyEvent ev) {
 
         }
 
+        @Override
         public boolean postProcessKeyEvent(KeyEvent ev) {
             if (ev.isConsumed()) {
                 if (ev.getKeyCode() != KeyEvent.VK_ALT) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
index a3dd04362b9..c8d62e52834 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
@@ -55,7 +55,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsScrollBarUI extends BasicScrollBarUI {
+public final class WindowsScrollBarUI extends BasicScrollBarUI {
     private Grid thumbGrid;
     private Grid highlightGrid;
     private Dimension horizontalThumbSize;
@@ -71,6 +71,7 @@ public static ComponentUI createUI(JComponent c) {
         return new WindowsScrollBarUI();
     }
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
 
@@ -100,11 +101,13 @@ protected Dimension getMinimumThumbSize() {
                 : verticalThumbSize;
     }
 
+    @Override
     public void uninstallUI(JComponent c) {
         super.uninstallUI(c);
         thumbGrid = highlightGrid = null;
     }
 
+    @Override
     protected void configureScrollBarColors() {
         super.configureScrollBarColors();
         Color color = UIManager.getColor("ScrollBar.trackForeground");
@@ -118,6 +121,7 @@ protected void configureScrollBarColors() {
         }
     }
 
+    @Override
     protected JButton createDecreaseButton(int orientation)  {
         return new WindowsArrowButton(orientation,
                                     UIManager.getColor("ScrollBar.thumb"),
@@ -126,6 +130,7 @@ protected JButton createDecreaseButton(int orientation)  {
                                     UIManager.getColor("ScrollBar.thumbHighlight"));
     }
 
+    @Override
     protected JButton createIncreaseButton(int orientation)  {
         return new WindowsArrowButton(orientation,
                                     UIManager.getColor("ScrollBar.thumb"),
@@ -161,6 +166,7 @@ private void repaint() {
         }
     }
 
+    @Override
     protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds){
         boolean v = (scrollbar.getOrientation() == JScrollBar.VERTICAL);
 
@@ -189,6 +195,7 @@ else if (trackHighlight == INCREASE_HIGHLIGHT) {
         }
     }
 
+    @Override
     protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
         boolean v = (scrollbar.getOrientation() == JScrollBar.VERTICAL);
 
@@ -231,6 +238,7 @@ protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
     }
 
 
+    @Override
     protected void paintDecreaseHighlight(Graphics g) {
         if (highlightGrid == null) {
             super.paintDecreaseHighlight(g);
@@ -257,6 +265,7 @@ protected void paintDecreaseHighlight(Graphics g) {
     }
 
 
+    @Override
     protected void paintIncreaseHighlight(Graphics g) {
         if (highlightGrid == null) {
             super.paintDecreaseHighlight(g);
@@ -304,7 +313,7 @@ protected void setThumbRollover(boolean active) {
      * preferred size is always a square.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private class WindowsArrowButton extends BasicArrowButton {
+    private final class WindowsArrowButton extends BasicArrowButton {
 
         public WindowsArrowButton(int direction, Color background, Color shadow,
                          Color darkShadow, Color highlight) {
@@ -315,6 +324,7 @@ public WindowsArrowButton(int direction) {
             super(direction);
         }
 
+        @Override
         public void paint(Graphics g) {
             XPStyle xp = XPStyle.getXP();
             if (xp != null) {
@@ -370,6 +380,7 @@ public void paint(Graphics g) {
             }
         }
 
+        @Override
         public Dimension getPreferredSize() {
             int size = 16;
             if (scrollbar != null) {
@@ -398,7 +409,7 @@ public Dimension getPreferredSize() {
      * a WeakRef so that it can be freed when no longer needed. As the
      * Grid is rather expensive to draw, it is drawn in a BufferedImage.
      */
-    private static class Grid {
+    private static final class Grid {
         private static final int BUFFER_SIZE = 64;
         private static HashMap<String, WeakReference<Grid>> map;
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
index 6c89eabc894..393f7595402 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
@@ -30,5 +30,5 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsScrollPaneUI extends BasicScrollPaneUI
+public final class WindowsScrollPaneUI extends BasicScrollPaneUI
 {}
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
index 65526a40c1b..9ce5db3b4ef 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
@@ -30,4 +30,4 @@
 /**
  * Windows Separator.
  */
-public class WindowsSeparatorUI extends BasicSeparatorUI { }
+public final class WindowsSeparatorUI extends BasicSeparatorUI { }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
index ceaf878cbca..88dc91d572b 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
@@ -44,7 +44,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsSliderUI extends BasicSliderUI
+public final class WindowsSliderUI extends BasicSliderUI
 {
     private boolean rollover = false;
     private boolean pressed = false;
@@ -63,32 +63,38 @@ public static ComponentUI createUI(JComponent b) {
      * the HOT, PRESSED, and FOCUSED states.
      * @since 1.6
      */
+    @Override
     protected TrackListener createTrackListener(JSlider slider) {
         return new WindowsTrackListener();
     }
 
-    private class WindowsTrackListener extends TrackListener {
+    private final class WindowsTrackListener extends TrackListener {
 
+        @Override
         public void mouseMoved(MouseEvent e) {
             updateRollover(thumbRect.contains(e.getX(), e.getY()));
             super.mouseMoved(e);
         }
 
+        @Override
         public void mouseEntered(MouseEvent e) {
             updateRollover(thumbRect.contains(e.getX(), e.getY()));
             super.mouseEntered(e);
         }
 
+        @Override
         public void mouseExited(MouseEvent e) {
             updateRollover(false);
             super.mouseExited(e);
         }
 
+        @Override
         public void mousePressed(MouseEvent e) {
             updatePressed(thumbRect.contains(e.getX(), e.getY()));
             super.mousePressed(e);
         }
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             updatePressed(false);
             super.mouseReleased(e);
@@ -119,6 +125,7 @@ public void updateRollover(boolean newRollover) {
     }
 
 
+    @Override
     public void paintTrack(Graphics g)  {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -141,6 +148,7 @@ public void paintTrack(Graphics g)  {
     }
 
 
+    @Override
     protected void paintMinorTickForHorizSlider( Graphics g, Rectangle tickBounds, int x ) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -149,6 +157,7 @@ protected void paintMinorTickForHorizSlider( Graphics g, Rectangle tickBounds, i
         super.paintMinorTickForHorizSlider(g, tickBounds, x);
     }
 
+    @Override
     protected void paintMajorTickForHorizSlider( Graphics g, Rectangle tickBounds, int x ) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -157,6 +166,7 @@ protected void paintMajorTickForHorizSlider( Graphics g, Rectangle tickBounds, i
         super.paintMajorTickForHorizSlider(g, tickBounds, x);
     }
 
+    @Override
     protected void paintMinorTickForVertSlider( Graphics g, Rectangle tickBounds, int y ) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -165,6 +175,7 @@ protected void paintMinorTickForVertSlider( Graphics g, Rectangle tickBounds, in
         super.paintMinorTickForVertSlider(g, tickBounds, y);
     }
 
+    @Override
     protected void paintMajorTickForVertSlider( Graphics g, Rectangle tickBounds, int y ) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -174,6 +185,7 @@ protected void paintMajorTickForVertSlider( Graphics g, Rectangle tickBounds, in
     }
 
 
+    @Override
     public void paintThumb(Graphics g)  {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -199,6 +211,7 @@ public void paintThumb(Graphics g)  {
         }
     }
 
+    @Override
     protected Dimension getThumbSize() {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
index c17328e50cc..bad66ce3a04 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
@@ -37,7 +37,7 @@
 import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
 
 
-public class WindowsSpinnerUI extends BasicSpinnerUI {
+public final class WindowsSpinnerUI extends BasicSpinnerUI {
     public static ComponentUI createUI(JComponent c) {
         return new WindowsSpinnerUI();
     }
@@ -46,6 +46,7 @@ public static ComponentUI createUI(JComponent c) {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     public void paint(Graphics g, JComponent c) {
         if (XPStyle.getXP() != null) {
             paintXPBackground(g, c);
@@ -71,6 +72,7 @@ private void paintXPBackground(Graphics g, JComponent c) {
         skin.paintSkin(g, 0, 0, c.getWidth(), c.getHeight(), state);
     }
 
+    @Override
     protected Component createPreviousButton() {
         if (XPStyle.getXP() != null) {
             JButton xpButton = new XPStyle.GlyphButton(spinner, Part.SPNP_DOWN);
@@ -83,6 +85,7 @@ protected Component createPreviousButton() {
         return super.createPreviousButton();
     }
 
+    @Override
     protected Component createNextButton() {
         if (XPStyle.getXP() != null) {
             JButton xpButton = new XPStyle.GlyphButton(spinner, Part.SPNP_UP);
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
index 04eeb726f90..95062ef586f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
@@ -39,7 +39,7 @@
  * @author Jeff Dinkins
  */
 @SuppressWarnings("serial") // Superclass is not serializable across versions
-public class WindowsSplitPaneDivider extends BasicSplitPaneDivider
+public final class WindowsSplitPaneDivider extends BasicSplitPaneDivider
 {
 
     /**
@@ -52,6 +52,7 @@ public WindowsSplitPaneDivider(BasicSplitPaneUI ui) {
     /**
       * Paints the divider.
       */
+    @Override
     public void paint(Graphics g) {
         Color bgColor = (splitPane.hasFocus()) ?
                             UIManager.getColor("SplitPane.shadow") :
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
index 9305e46c36f..8c50e391164 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
@@ -33,7 +33,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsSplitPaneUI extends BasicSplitPaneUI
+public final class WindowsSplitPaneUI extends BasicSplitPaneUI
 {
 
     public WindowsSplitPaneUI() {
@@ -50,6 +50,7 @@ public static ComponentUI createUI(JComponent x) {
     /**
       * Creates the default divider.
       */
+    @Override
     public BasicSplitPaneDivider createDefaultDivider() {
         return new WindowsSplitPaneDivider(this);
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
index 9b4e22102eb..86e2ee1fc52 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
@@ -48,7 +48,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsTabbedPaneUI extends BasicTabbedPaneUI {
+public final class WindowsTabbedPaneUI extends BasicTabbedPaneUI {
     /**
      * Keys to use for forward focus traversal when the JComponent is
      * managing focus.
@@ -63,6 +63,7 @@ public class WindowsTabbedPaneUI extends BasicTabbedPaneUI {
 
     private boolean contentOpaque = true;
 
+    @Override
     @SuppressWarnings("deprecation")
     protected void installDefaults() {
         super.installDefaults();
@@ -82,6 +83,7 @@ protected void installDefaults() {
         tabPane.setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, managingFocusBackwardTraversalKeys);
     }
 
+    @Override
     protected void uninstallDefaults() {
         // sets the focus forward and backward traversal keys to null
         // to restore the defaults
@@ -94,6 +96,7 @@ public static ComponentUI createUI(JComponent c) {
         return new WindowsTabbedPaneUI();
     }
 
+    @Override
     protected void setRolloverTab(int index) {
         // Rollover is only supported on XP
         if (XPStyle.getXP() != null) {
@@ -119,6 +122,7 @@ protected void setRolloverTab(int index) {
         }
     }
 
+    @Override
     protected void paintContentBorder(Graphics g, int tabPlacement, int selectedIndex) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null && (contentOpaque || tabPane.isOpaque())) {
@@ -155,6 +159,7 @@ protected void paintContentBorder(Graphics g, int tabPlacement, int selectedInde
         super.paintContentBorder(g, tabPlacement, selectedIndex);
     }
 
+    @Override
     protected void paintTabBackground(Graphics g, int tabPlacement, int tabIndex,
                                       int x, int y, int w, int h, boolean isSelected ) {
         if (XPStyle.getXP() == null) {
@@ -162,6 +167,7 @@ protected void paintTabBackground(Graphics g, int tabPlacement, int tabIndex,
         }
     }
 
+    @Override
     protected void paintTabBorder(Graphics g, int tabPlacement, int tabIndex,
                                   int x, int y, int w, int h, boolean isSelected ) {
         XPStyle xp = XPStyle.getXP();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
index 507990812cc..b670bd294b0 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
@@ -50,13 +50,14 @@
 import static com.sun.java.swing.plaf.windows.TMSchema.State;
 import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
 
-public class WindowsTableHeaderUI extends BasicTableHeaderUI {
+public final class WindowsTableHeaderUI extends BasicTableHeaderUI {
     private TableCellRenderer originalHeaderRenderer;
 
     public static ComponentUI createUI(JComponent h) {
         return new WindowsTableHeaderUI();
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
 
@@ -68,6 +69,7 @@ public void installUI(JComponent c) {
         }
     }
 
+    @Override
     public void uninstallUI(JComponent c) {
         if (header.getDefaultRenderer() instanceof XPDefaultRenderer) {
             header.setDefaultRenderer(originalHeaderRenderer);
@@ -84,7 +86,7 @@ protected void rolloverColumnUpdated(int oldColumn, int newColumn) {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    private class XPDefaultRenderer extends DefaultTableCellHeaderRenderer {
+    private final class XPDefaultRenderer extends DefaultTableCellHeaderRenderer {
         Skin skin;
         boolean isSelected, hasFocus, hasRollover;
         int column;
@@ -93,6 +95,7 @@ private class XPDefaultRenderer extends DefaultTableCellHeaderRenderer {
             setHorizontalAlignment(LEADING);
         }
 
+        @Override
         public Component getTableCellRendererComponent(JTable table, Object value,
                                                        boolean isSelected, boolean hasFocus,
                                                        int row, int column) {
@@ -181,6 +184,7 @@ public Component getTableCellRendererComponent(JTable table, Object value,
             return this;
         }
 
+        @Override
         public void paint(Graphics g) {
             Dimension size = getSize();
             State state = State.NORMAL;
@@ -227,7 +231,7 @@ public void paint(Graphics g) {
      * A border with an Icon at the middle of the top side.
      * Outer insets can be provided for this border.
      */
-    private static class IconBorder implements Border, UIResource{
+    private static final class IconBorder implements Border, UIResource{
         private final Icon icon;
         private final int top;
         private final int left;
@@ -246,12 +250,15 @@ public IconBorder(Icon icon, int top, int left,
             this.bottom = bottom;
             this.right = right;
         }
+        @Override
         public Insets getBorderInsets(Component c) {
             return new Insets(icon.getIconHeight() + top, left, bottom, right);
         }
+        @Override
         public boolean isBorderOpaque() {
             return false;
         }
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                                 int width, int height) {
             icon.paintIcon(c, g,
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
index 6aca81225ea..e695d9f6708 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
@@ -33,7 +33,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsTextAreaUI extends BasicTextAreaUI {
+public final class WindowsTextAreaUI extends BasicTextAreaUI {
     /**
      * Creates the object to use for a caret.  By default an
      * instance of WindowsCaret is created.  This method
@@ -42,6 +42,7 @@ public class WindowsTextAreaUI extends BasicTextAreaUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsTextUI.WindowsCaret();
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
index be3e6276161..508d260895c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
@@ -62,7 +62,7 @@
  *
  * @author  Timothy Prinzing
  */
-public class WindowsTextFieldUI extends BasicTextFieldUI
+public final class WindowsTextFieldUI extends BasicTextFieldUI
 {
     /**
      * Creates a UI for a JTextField.
@@ -82,6 +82,7 @@ public static ComponentUI createUI(JComponent c) {
      *
      * @param g the graphics context
      */
+    @Override
     protected void paintBackground(Graphics g) {
         super.paintBackground(g);
     }
@@ -91,6 +92,7 @@ protected void paintBackground(Graphics g) {
      *
      * @return the caret
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsFieldCaret();
     }
@@ -100,7 +102,7 @@ protected Caret createCaret() {
      * DefaultCaret.
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    static class WindowsFieldCaret extends DefaultCaret implements UIResource {
+    static final class WindowsFieldCaret extends DefaultCaret implements UIResource {
 
         public WindowsFieldCaret() {
             super();
@@ -112,6 +114,7 @@ public WindowsFieldCaret() {
          * caret out into the field by about a quarter of
          * a field length if not visible.
          */
+        @Override
         protected void adjustVisibility(Rectangle r) {
             SwingUtilities.invokeLater(new SafeScroller(r));
         }
@@ -121,16 +124,18 @@ protected void adjustVisibility(Rectangle r) {
          *
          * @return the painter
          */
+        @Override
         protected Highlighter.HighlightPainter getSelectionPainter() {
             return WindowsTextUI.WindowsPainter;
         }
 
 
-        private class SafeScroller implements Runnable {
+        private final class SafeScroller implements Runnable {
             SafeScroller(Rectangle r) {
                 this.r = r;
             }
 
+            @Override
             @SuppressWarnings("deprecation")
             public void run() {
                 JTextField field = (JTextField) getComponent();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
index 372563f74f4..7858a1195e8 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
@@ -33,7 +33,7 @@
 /**
  * Windows rendition of the component.
  */
-public class WindowsTextPaneUI extends BasicTextPaneUI
+public final class WindowsTextPaneUI extends BasicTextPaneUI
 {
     /**
      * Creates a UI for a JTextPane.
@@ -53,6 +53,7 @@ public static ComponentUI createUI(JComponent c) {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsTextUI.WindowsCaret();
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
index b73b38385f2..89180ffdd5f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
@@ -55,6 +55,7 @@ public abstract class WindowsTextUI extends BasicTextUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return new WindowsCaret();
     }
@@ -64,20 +65,21 @@ protected Caret createCaret() {
 
     /* public */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    static class WindowsCaret extends DefaultCaret
+    static final class WindowsCaret extends DefaultCaret
                      implements UIResource {
         /**
          * Gets the painter for the Highlighter.
          *
          * @return the painter
          */
+        @Override
         protected Highlighter.HighlightPainter getSelectionPainter() {
             return WindowsTextUI.WindowsPainter;
         }
     }
 
     /* public */
-    static class WindowsHighlightPainter extends
+    static final class WindowsHighlightPainter extends
                      DefaultHighlighter.DefaultHighlightPainter {
         WindowsHighlightPainter(Color c) {
             super(c);
@@ -94,6 +96,7 @@ static class WindowsHighlightPainter extends
          * @param bounds the bounding box for the highlight
          * @param c the editor
          */
+        @Override
         @SuppressWarnings("deprecation")
         public void paint(Graphics g, int offs0, int offs1, Shape bounds, JTextComponent c) {
             Rectangle alloc = bounds.getBounds();
@@ -167,6 +170,7 @@ else if (secondIsDot) {
          * @param view View painting for
          * @return region drawing occurred in
          */
+        @Override
         public Shape paintLayer(Graphics g, int offs0, int offs1,
                                 Shape bounds, JTextComponent c, View view) {
             Color color = getColor();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
index feee0c0aaef..0f468fdf6b1 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
@@ -45,7 +45,7 @@
  *
  * @author Jeff Dinkins
  */
-public class WindowsToggleButtonUI extends BasicToggleButtonUI
+public final class WindowsToggleButtonUI extends BasicToggleButtonUI
 {
     protected int dashedRectGapX;
     protected int dashedRectGapY;
@@ -73,6 +73,7 @@ public static ComponentUI createUI(JComponent b) {
     // ********************************
     //            Defaults
     // ********************************
+    @Override
     protected void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -93,6 +94,7 @@ protected void installDefaults(AbstractButton b) {
         }
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
@@ -112,6 +114,7 @@ protected Color getFocusColor() {
     private transient Color cachedBackgroundColor = null;
     private transient Color cachedHighlightColor = null;
 
+    @Override
     protected void paintButtonPressed(Graphics g, AbstractButton b) {
         if (XPStyle.getXP() == null && b.isContentAreaFilled()) {
             Color oldColor = g.getColor();
@@ -135,6 +138,7 @@ protected void paintButtonPressed(Graphics g, AbstractButton b) {
         }
     }
 
+    @Override
     public void paint(Graphics g, JComponent c) {
         if (XPStyle.getXP() != null) {
             WindowsButtonUI.paintXPButtonBackground(g, c);
@@ -146,10 +150,12 @@ public void paint(Graphics g, JComponent c) {
     /**
      * Overridden method to render the text without the mnemonic
      */
+    @Override
     protected void paintText(Graphics g, AbstractButton b, Rectangle textRect, String text) {
         WindowsGraphicsUtils.paintText(g, b, textRect, text, getTextShiftOffset());
     }
 
+    @Override
     protected void paintFocus(Graphics g, AbstractButton b,
                               Rectangle viewRect, Rectangle textRect, Rectangle iconRect) {
         g.setColor(getFocusColor());
@@ -161,6 +167,7 @@ protected void paintFocus(Graphics g, AbstractButton b,
     // ********************************
     //          Layout Methods
     // ********************************
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         Dimension d = super.getPreferredSize(c);
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
index ffd6daa3ad8..5350de9ae5c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
@@ -40,12 +40,13 @@
  *
  * @author Mark Davidson
  */
-public class WindowsToolBarSeparatorUI extends BasicToolBarSeparatorUI {
+public final class WindowsToolBarSeparatorUI extends BasicToolBarSeparatorUI {
 
     public static ComponentUI createUI( JComponent c ) {
         return new WindowsToolBarSeparatorUI();
     }
 
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         Dimension size = ((JToolBar.Separator)c).getSeparatorSize();
 
@@ -71,6 +72,7 @@ public Dimension getPreferredSize(JComponent c) {
         return size;
     }
 
+    @Override
     public Dimension getMaximumSize(JComponent c) {
         Dimension pref = getPreferredSize(c);
         if (((JSeparator)c).getOrientation() == SwingConstants.VERTICAL) {
@@ -80,6 +82,7 @@ public Dimension getMaximumSize(JComponent c) {
         }
     }
 
+    @Override
     public void paint( Graphics g, JComponent c ) {
         boolean vertical = ((JSeparator)c).getOrientation() == SwingConstants.VERTICAL;
         Dimension size = c.getSize();
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
index a34ce0cf6a5..68e077fa350 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
@@ -45,12 +45,13 @@
 import static com.sun.java.swing.plaf.windows.TMSchema.Part;
 
 
-public class WindowsToolBarUI extends BasicToolBarUI {
+public final class WindowsToolBarUI extends BasicToolBarUI {
 
     public static ComponentUI createUI(JComponent c) {
         return new WindowsToolBarUI();
     }
 
+    @Override
     protected void installDefaults() {
         if (XPStyle.getXP() != null) {
             setRolloverBorders(true);
@@ -58,6 +59,7 @@ protected void installDefaults() {
         super.installDefaults();
     }
 
+    @Override
     protected Border createRolloverBorder() {
         if (XPStyle.getXP() != null) {
             return new EmptyBorder(3, 3, 3, 3);
@@ -66,6 +68,7 @@ protected Border createRolloverBorder() {
         }
     }
 
+    @Override
     protected Border createNonRolloverBorder() {
         if (XPStyle.getXP() != null) {
             return new EmptyBorder(3, 3, 3, 3);
@@ -74,6 +77,7 @@ protected Border createNonRolloverBorder() {
         }
     }
 
+    @Override
     public void paint(Graphics g, JComponent c) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
@@ -88,6 +92,7 @@ public void paint(Graphics g, JComponent c) {
      * {@inheritDoc}
      * @since 1.6
      */
+    @Override
     protected Border getRolloverBorder(AbstractButton b) {
         XPStyle xp = XPStyle.getXP();
         if (xp != null) {
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
index 5bef0e075a4..6ab2352641f 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
@@ -60,6 +60,7 @@ public static ComponentUI createUI( JComponent c )
       * Ensures that the rows identified by beginRow through endRow are
       * visible.
       */
+    @Override
     protected void ensureRowsAreVisible(int beginRow, int endRow) {
         if(tree != null && beginRow >= 0 && endRow < getRowCount(tree)) {
             Rectangle visRect = tree.getVisibleRect();
@@ -108,6 +109,7 @@ protected void ensureRowsAreVisible(int beginRow, int endRow) {
      * Returns the default cell renderer that is used to do the
      * stamping of each node.
      */
+    @Override
     protected TreeCellRenderer createDefaultCellRenderer() {
         return new WindowsTreeCellRenderer();
     }
@@ -127,6 +129,7 @@ Skin getSkin(Component c) {
             return (xp != null) ? xp.getSkin(c, Part.TVP_GLYPH) : null;
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             Skin skin = getSkin(c);
             if (skin != null) {
@@ -147,11 +150,13 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
             g.drawLine(x + 2, y + HALF_SIZE, x + (SIZE - 3), y + HALF_SIZE);
         }
 
+        @Override
         public int getIconWidth() {
             Skin skin = getSkin(null);
             return (skin != null) ? skin.getWidth() : SIZE;
         }
 
+        @Override
         public int getIconHeight() {
             Skin skin = getSkin(null);
             return (skin != null) ? skin.getHeight() : SIZE;
@@ -162,11 +167,12 @@ public int getIconHeight() {
      * The plus sign button icon
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public static class CollapsedIcon extends ExpandedIcon {
+    public static final class CollapsedIcon extends ExpandedIcon {
         public static Icon createCollapsedIcon() {
             return new CollapsedIcon();
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             Skin skin = getSkin(c);
             if (skin != null) {
@@ -179,7 +185,7 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    public class WindowsTreeCellRenderer extends DefaultTreeCellRenderer {
+    public final class WindowsTreeCellRenderer extends DefaultTreeCellRenderer {
 
         /**
          * Configures the renderer based on the passed in components.
@@ -189,6 +195,7 @@ public class WindowsTreeCellRenderer extends DefaultTreeCellRenderer {
          * The foreground color is set based on the selection and the icon
          * is set based on on leaf and expanded.
          */
+        @Override
         public Component getTreeCellRendererComponent(JTree tree, Object value,
                                                       boolean sel,
                                                       boolean expanded,
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
index f8f5e3628fb..89751f6dc94 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/XPStyle.java
@@ -90,7 +90,7 @@
  *
  * @author Leif Samuelsson
  */
-class XPStyle {
+final class XPStyle {
     // Singleton instance of this class
     private static XPStyle xp;
 
@@ -331,6 +331,7 @@ private static class XPFillBorder extends LineBorder implements UIResource {
             super(color, thickness);
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets)       {
             Insets margin = null;
             //
@@ -355,7 +356,7 @@ public Insets getBorderInsets(Component c, Insets insets)       {
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private class XPStatefulFillBorder extends XPFillBorder {
+    private final class XPStatefulFillBorder extends XPFillBorder {
         private final Part part;
         private final Prop prop;
         XPStatefulFillBorder(Color color, int thickness, Part part, Prop prop) {
@@ -364,6 +365,7 @@ private class XPStatefulFillBorder extends XPFillBorder {
             this.prop = prop;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             State state = State.NORMAL;
             // special casing for comboboxes.
@@ -383,18 +385,20 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private class XPImageBorder extends AbstractBorder implements UIResource {
+    private final class XPImageBorder extends AbstractBorder implements UIResource {
         Skin skin;
 
         XPImageBorder(Component c, Part part) {
             this.skin = getSkin(c, part);
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g,
                                 int x, int y, int width, int height) {
             skin.paintSkin(g, x, y, width, height, null);
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets)       {
             Insets margin = null;
             Insets borderInsets = skin.getContentMargin();
@@ -423,11 +427,12 @@ public Insets getBorderInsets(Component c, Insets insets)       {
     }
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
-    private static class XPEmptyBorder extends EmptyBorder implements UIResource {
+    private static final class XPEmptyBorder extends EmptyBorder implements UIResource {
         XPEmptyBorder(Insets m) {
             super(m.top+2, m.left+2, m.bottom+2, m.right+2);
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets)       {
             insets = super.getBorderInsets(c, insets);
 
@@ -494,7 +499,7 @@ long getThemeTransitionDuration(Component c, Part part, State stateFrom,
      * (component type) and which provides methods for painting backgrounds
      * and glyphs
      */
-    static class Skin {
+    static final class Skin {
         final Component component;
         final Part part;
         final State state;
@@ -566,14 +571,17 @@ int getHeight() {
             return getHeight((state != null) ? state : State.NORMAL);
         }
 
+        @Override
         public String toString() {
             return string;
         }
 
+        @Override
         public boolean equals(Object obj) {
             return (obj instanceof Skin && ((Skin)obj).string.equals(string));
         }
 
+        @Override
         public int hashCode() {
             return string.hashCode();
         }
@@ -675,16 +683,18 @@ void paintSkin(Graphics g, int dx, int dy, int dw, int dh, State state,
         }
     }
 
-    private static class SkinPainter extends CachedPainter {
+    private static final class SkinPainter extends CachedPainter {
         SkinPainter() {
             super(30);
             flush();
         }
 
+        @Override
         public void flush() {
             super.flush();
         }
 
+        @Override
         protected void paintToImage(Component c, Image image, Graphics g,
                                     int w, int h, Object[] args) {
             Skin skin = (Skin)args[0];
@@ -717,6 +727,7 @@ protected void paintToImage(Component c, Image image, Graphics g,
             SunWritableRaster.markDirty(dbi);
         }
 
+        @Override
         protected Image createImage(Component c, int w, int h,
                                     GraphicsConfiguration config, Object[] args) {
             return new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
@@ -737,6 +748,7 @@ public GlyphButton(Component parent, Part part) {
             setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
         }
 
+        @Override
         @SuppressWarnings("deprecation")
         public boolean isFocusTraversable() {
             return false;
@@ -754,6 +766,7 @@ protected State getState() {
             return state;
         }
 
+        @Override
         public void paintComponent(Graphics g) {
             if (XPStyle.getXP() == null || skin == null) {
                 return;
@@ -769,6 +782,7 @@ public void setPart(Component parent, Part part) {
             repaint();
         }
 
+        @Override
         protected void paintBorder(Graphics g) {
         }
 
diff --git a/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
index 642f98b0df2..c888106d779 100644
--- a/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/windows/classes/sun/awt/PlatformGraphicsInfo.java
@@ -30,7 +30,7 @@
 
 import sun.awt.windows.WToolkit;
 
-public class PlatformGraphicsInfo {
+public final class PlatformGraphicsInfo {
 
     private static final boolean hasDisplays;
 
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java b/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
index ec86bce8c69..fe55cacf833 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32ColorModel24.java
@@ -40,7 +40,7 @@
  * in the reverse order from the base ComponentColorModel to match
  * the ordering on a Windows 24-bit display.
  */
-public class Win32ColorModel24 extends ComponentColorModel {
+public final class Win32ColorModel24 extends ComponentColorModel {
     public Win32ColorModel24() {
         super(ColorSpace.getInstance(ColorSpace.CS_sRGB),
               new int[] {8, 8, 8}, false, false,
@@ -53,6 +53,7 @@ public Win32ColorModel24() {
      * @see WritableRaster
      * @see SampleModel
      */
+    @Override
     public WritableRaster createCompatibleWritableRaster (int w, int h) {
         int[] bOffs = {2, 1, 0};
         return Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
@@ -65,6 +66,7 @@ public WritableRaster createCompatibleWritableRaster (int w, int h) {
      * has a data layout compatible with this ColorModel.
      * @see SampleModel
      */
+    @Override
     public SampleModel createCompatibleSampleModel(int w, int h) {
         int[] bOffs = {2, 1, 0};
         return new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE,
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
index c2532ff38b3..5084d0bcabe 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32FontManager.java
@@ -70,6 +70,7 @@ public final class Win32FontManager extends SunFontManager {
      */
     private static native String getEUDCFontFile();
 
+    @Override
     public TrueTypeFont getEUDCFont() {
         return eudcFont;
     }
@@ -88,6 +89,7 @@ public Win32FontManager() {
      * Whether registerFontFile expects absolute or relative
      * font file names.
      */
+    @Override
     protected boolean useAbsoluteFontFileNames() {
         return false;
     }
@@ -98,6 +100,7 @@ protected boolean useAbsoluteFontFileNames() {
      * class reports these back to the GraphicsEnvironment, so these
      * are the componentFileNames of CompositeFonts.
      */
+    @Override
     protected void registerFontFile(String fontFileName, String[] nativeNames,
                                     int fontRank, boolean defer) {
 
@@ -175,6 +178,7 @@ public FontConfiguration createFontConfiguration(boolean preferLocaleFonts,
                                       preferLocaleFonts,preferPropFonts);
     }
 
+    @Override
     protected void
         populateFontFileNameMap(HashMap<String,String> fontToFileMap,
                                 HashMap<String,String> fontToFamilyNameMap,
@@ -194,6 +198,7 @@ public FontConfiguration createFontConfiguration(boolean preferLocaleFonts,
                                      familyToFontListMap,
                                  Locale locale);
 
+    @Override
     protected synchronized native String getFontPath(boolean noType1Fonts);
 
     @Override
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
index 6e740de6a9b..31fc0847d3b 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsConfig.java
@@ -214,6 +214,7 @@ public AffineTransform getNormalizingTransform() {
         return new AffineTransform(xscale, 0.0, 0.0, yscale, 0.0, 0.0);
     }
 
+    @Override
     public String toString() {
         return (super.toString()+"[dev="+device+",pixfmt="+visual+"]");
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
index 973eb916a5c..865fe480853 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
@@ -590,7 +590,7 @@ public ColorModel getColorModel() {
      * The listener restores the default display mode when window is iconified
      * and sets it back to the one set by the user on de-iconification.
      */
-    private static class Win32FSWindowAdapter extends WindowAdapter {
+    private static final class Win32FSWindowAdapter extends WindowAdapter {
         private Win32GraphicsDevice device;
         private DisplayMode dm;
 
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
index cb7ab363cdf..09768148f3d 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
@@ -92,9 +92,11 @@ public final class Win32GraphicsEnvironment extends SunGraphicsEnvironment {
     public Win32GraphicsEnvironment() {
     }
 
+    @Override
     protected native int getNumScreens();
     private native int getDefaultScreen();
 
+    @Override
     public GraphicsDevice getDefaultScreenDevice() {
         GraphicsDevice[] screens = getScreenDevices();
         if (screens.length == 0) {
@@ -207,6 +209,7 @@ public void displayChanged() {
  * ----END DISPLAY CHANGE SUPPORT----
  */
 
+    @Override
     protected GraphicsDevice makeScreenDevice(int screennum) {
         GraphicsDevice device = null;
         if (WindowsFlags.isD3DEnabled()) {
@@ -218,6 +221,7 @@ protected GraphicsDevice makeScreenDevice(int screennum) {
         return device;
     }
 
+    @Override
     public boolean isDisplayLocal() {
         return true;
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
index c85c2d4ced9..1777e408ea6 100644
--- a/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
+++ b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
@@ -212,7 +212,7 @@ static final class KnownLibraries {
         static final List<KnownFolderDefinition> INSTANCE = getLibraries();
     }
 
-    static class FolderDisposer implements sun.java2d.DisposerRecord {
+    static final class FolderDisposer implements sun.java2d.DisposerRecord {
         /*
          * This is cached as a concession to getFolderType(), which needs
          * an absolute PIDL.
@@ -226,6 +226,7 @@ static class FolderDisposer implements sun.java2d.DisposerRecord {
         long relativePIDL;
 
         boolean disposed;
+        @Override
         public void dispose() {
             if (disposed) return;
             invoke(new Callable<Void>() {
@@ -387,6 +388,7 @@ public void setIsPersonal() {
      * is a not a normal directory, then returns the first non-removable
      * drive (normally "C:\").
      */
+    @Override
     @Serial
     protected Object writeReplace() throws java.io.ObjectStreamException {
         return invoke(new Callable<File>() {
@@ -541,6 +543,7 @@ private static boolean pathsEqual(String path1, String path2) {
     /**
      * Check to see if two ShellFolder objects are the same
      */
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Win32ShellFolder2 rhs)) {
             // Short-circuit circuitous delegation path
@@ -588,6 +591,7 @@ public Boolean call() {
     /**
      * @return Whether this is a file system shell folder
      */
+    @Override
     public boolean isFileSystem() {
         if (cachedIsFileSystem == null) {
             cachedIsFileSystem = hasAttribute(ATTRIB_FILESYSTEM);
@@ -682,10 +686,12 @@ private static boolean isNetworkRoot(String path) {
      * @return The parent shell folder of this shell folder, null if
      * there is no parent
      */
+    @Override
     public File getParentFile() {
         return parent;
     }
 
+    @Override
     public boolean isDirectory() {
         if (isDir == null) {
             // Folders with SFGAO_BROWSABLE have "shell extension" handlers and are
@@ -742,6 +748,7 @@ private native long getEnumObjects(long pIShellFolder, boolean isDesktop,
      *         object. The array will be empty if the folder is empty.  Returns
      *         {@code null} if this shellfolder does not denote a directory.
      */
+    @Override
     public File[] listFiles(final boolean includeHiddenFiles) {
 
         try {
@@ -851,6 +858,7 @@ public Win32ShellFolder2 call() throws InterruptedException {
      * symbolic links and junctions.
      */
 
+    @Override
     public boolean isLink() {
         if (cachedIsLink == null) {
             cachedIsLink = hasAttribute(ATTRIB_LINK)
@@ -864,6 +872,7 @@ public boolean isLink() {
     /**
      * @return Whether this shell folder is marked as hidden
      */
+    @Override
     public boolean isHidden() {
         return hasAttribute(ATTRIB_HIDDEN);
     }
@@ -878,6 +887,7 @@ private static native long getLinkLocation(long parentIShellFolder,
      * @return The shell folder linked to by this shell folder, or null
      * if this shell folder is not a link or is a broken or invalid link
      */
+    @Override
     public ShellFolder getLinkLocation()  {
         return getLinkLocation(true);
     }
@@ -933,6 +943,7 @@ private static native String getDisplayNameOf(long parentIShellFolder,
     /**
      * @return The name used to display this shell folder
      */
+    @Override
     public String getDisplayName() {
         if (displayName == null) {
             displayName =
@@ -953,6 +964,7 @@ public String call() {
     /**
      * @return The type of shell folder as a string
      */
+    @Override
     public String getFolderType() {
         if (folderType == null) {
             final long absolutePIDL = getAbsolutePIDL();
@@ -972,6 +984,7 @@ public String call() {
     /**
      * @return The executable type as a string
      */
+    @Override
     public String getExecutableType() {
         if (!isFileSystem()) {
             return null;
@@ -1047,6 +1060,7 @@ private static Image makeIcon(long hIcon) {
     /**
      * @return The icon image used to display this shell folder
      */
+    @Override
     public Image getIcon(final boolean getLargeIcon) {
         Image icon = getLargeIcon ? largeIcon : smallIcon;
         int size = getLargeIcon ? LARGE_ICON_SIZE : SMALL_ICON_SIZE;
@@ -1140,6 +1154,7 @@ public Image call() {
     /**
      * @return The icon image of specified size used to display this shell folder
      */
+    @Override
     public Image getIcon(int width, int height) {
         int size = Math.max(width, height);
         return invoke(() -> {
@@ -1236,6 +1251,7 @@ static Image getShell32Icon(int iconID, int size) {
      *
      * @see java.io.File#getCanonicalFile
      */
+    @Override
     public File getCanonicalFile() throws IOException {
         return this;
     }
@@ -1252,6 +1268,7 @@ public boolean isSpecial() {
      *
      * @see sun.awt.shell.ShellFolder#compareTo(File)
      */
+    @Override
     public int compareTo(File file2) {
         if (!(file2 instanceof Win32ShellFolder2)) {
             if (isFileSystem() && !isSpecial()) {
@@ -1268,6 +1285,7 @@ public int compareTo(File file2) {
     private static final int LVCFMT_RIGHT = 1;
     private static final int LVCFMT_CENTER = 2;
 
+    @Override
     public ShellFolderColumnInfo[] getFolderColumns() {
         ShellFolder library = resolveLibrary();
         if (library != null) return library.getFolderColumns();
@@ -1300,6 +1318,7 @@ public ShellFolderColumnInfo[] call() {
         });
     }
 
+    @Override
     public Object getFolderColumnValue(final int column) {
         if(!isLibrary()) {
             ShellFolder library = resolveLibrary();
@@ -1342,6 +1361,7 @@ private ShellFolder resolveLibrary() {
     private static native int compareIDsByColumn(long pParentIShellFolder, long pidl1, long pidl2, int columnIdx);
 
 
+    @Override
     public void sortChildren(final List<? extends File> files) {
         // To avoid loads of synchronizations with Invoker and improve performance we
         // synchronize the whole code of the sort method once
@@ -1354,7 +1374,7 @@ public Void call() {
         });
     }
 
-    private static class ColumnComparator implements Comparator<File> {
+    private static final class ColumnComparator implements Comparator<File> {
         private final Win32ShellFolder2 shellFolder;
 
         private final int columnIdx;
@@ -1365,6 +1385,7 @@ public ColumnComparator(Win32ShellFolder2 shellFolder, int columnIdx) {
         }
 
         // compares 2 objects within this folder by the specified column
+        @Override
         public int compare(final File o, final File o1) {
             Integer result = invoke(new Callable<Integer>() {
                 public Integer call() {
@@ -1405,7 +1426,7 @@ public List<KnownFolderDefinition> call() throws Exception {
         });
     }
 
-    static class MultiResolutionIconImage extends AbstractMultiResolutionImage {
+    static final class MultiResolutionIconImage extends AbstractMultiResolutionImage {
         final int baseSize;
         final Map<Integer, Image> resolutionVariants = new HashMap<>();
 
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 d8bb2146798..075e3d0db50 100644
--- a/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
+++ b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
@@ -75,6 +75,7 @@ final class Win32ShellFolderManager2 extends ShellFolderManager {
         sun.awt.windows.WToolkit.loadLibraries();
     }
 
+    @Override
     public ShellFolder createShellFolder(File file) throws FileNotFoundException {
         try {
             return createShellFolder(getDesktop(), file);
@@ -264,6 +265,7 @@ static Win32ShellFolder2 getPersonal() {
      *
      * @return An Object matching the key string.
      */
+    @Override
     public Object get(String key) {
         if (key.equals("fileChooserDefaultFolder")) {
             File file = getPersonal();
@@ -408,6 +410,7 @@ public Object get(String key) {
      * Does {@code dir} represent a "computer" such as a node on the network, or
      * "My Computer" on the desktop.
      */
+    @Override
     public boolean isComputerNode(final File dir) {
         if (dir != null && dir == getDrives()) {
             return true;
@@ -418,6 +421,7 @@ public boolean isComputerNode(final File dir) {
         }
     }
 
+    @Override
     public boolean isFileSystemRoot(File dir) {
         //Note: Removable drives don't "exist" but are listed in "My Computer"
         if (dir != null) {
@@ -498,7 +502,7 @@ protected Invoker createInvoker() {
         return new ComInvoker();
     }
 
-    private static class ComInvoker extends ThreadPoolExecutor implements ThreadFactory, ShellFolder.Invoker {
+    private static final class ComInvoker extends ThreadPoolExecutor implements ThreadFactory, ShellFolder.Invoker {
         private static Thread comThread;
 
         private ComInvoker() {
@@ -512,6 +516,7 @@ private ComInvoker() {
             Runtime.getRuntime().addShutdownHook(t);
         }
 
+        @Override
         public synchronized Thread newThread(final Runnable task) {
             final Runnable comRun = new Runnable() {
                 public void run() {
@@ -539,6 +544,7 @@ leads to memory consumption when listDrives() function is called
             return comThread;
         }
 
+        @Override
         public <T> T invoke(Callable<T> task) throws Exception {
             if (Thread.currentThread() == comThread) {
                 // if it's already called from the COM
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
index 6b9d54aaa28..94a2c4df0a9 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java
@@ -355,7 +355,7 @@ public void run() {
         }
     }
 
-    private static class VIOptD3DWindowPainter extends VIOptWindowPainter {
+    private static final class VIOptD3DWindowPainter extends VIOptWindowPainter {
 
         protected VIOptD3DWindowPainter(WWindowPeer peer) {
             super(peer);
@@ -370,7 +370,7 @@ protected boolean updateWindowAccel(long psdops, int w, int h) {
         }
     }
 
-    private static class VIOptWGLWindowPainter extends VIOptWindowPainter {
+    private static final class VIOptWGLWindowPainter extends VIOptWindowPainter {
 
         protected VIOptWGLWindowPainter(WWindowPeer peer) {
             super(peer);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
index c07d116abfb..8b3218de667 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -789,6 +789,7 @@ public VolatileImage createVolatileImage(int width, int height) {
 
     // Object overrides
 
+    @Override
     public String toString() {
         return getClass().getName() + "[" + target + "]";
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
index 8aca12d268f..068d577995f 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java
@@ -541,7 +541,7 @@ public static EHTMLReadMode getEHTMLReadMode (DataFlavor df) {
  *
  * on encode: static convertToHTMLFormat is responsible for HTML clipboard header creation
  */
-class HTMLCodec extends InputStream {
+final class HTMLCodec extends InputStream {
 
     public static final String VERSION = "Version:";
     public static final String START_HTML = "StartHTML:";
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java b/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
index 7632e172b73..09c317c81f2 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDefaultFontCharset.java
@@ -46,7 +46,7 @@ public CharsetEncoder newEncoder() {
         return new Encoder();
     }
 
-    private class Encoder extends AWTCharset.Encoder {
+    private final class Encoder extends AWTCharset.Encoder {
         @Override
         public boolean canEncode(char c){
             return canConvert(c);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
index d9b169160b4..6e3de090ee8 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java
@@ -198,7 +198,7 @@ private synchronized void setSoundProperty(String key, String winEventName) {
      */
     private native void playWindowsSound(String winEventName);
 
-    class WinPlaySound implements Runnable {
+    final class WinPlaySound implements Runnable {
         String  winEventName;
 
         WinPlaySound(String winEventName) {
@@ -210,10 +210,12 @@ public void run() {
             WDesktopProperties.this.playWindowsSound(winEventName);
         }
 
+        @Override
         public String toString() {
             return "WinPlaySound("+winEventName+")";
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o == this) {
                 return true;
@@ -225,6 +227,7 @@ public boolean equals(Object o) {
             }
         }
 
+        @Override
         public int hashCode() {
             return winEventName.hashCode();
         }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
index f4ab5fe0a34..43a91c3c7ab 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDragSourceContextPeer.java
@@ -54,9 +54,11 @@
  */
 
 final class WDragSourceContextPeer extends SunDragSourceContextPeer {
+    @Override
     public void startSecondaryEventLoop(){
         WToolkit.startSecondaryEventLoop();
     }
+    @Override
     public void quitSecondaryEventLoop(){
         WToolkit.quitSecondaryEventLoop();
     }
@@ -168,6 +170,7 @@ native void doDragDrop(
             int imgWidth, int imgHight,
             int offsetX, int offsetY);
 
+    @Override
     protected native void setNativeCursor(long nativeCtxt, Cursor c, int cType);
 
 }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index e5db1d432cf..ad0745a2733 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -36,7 +36,7 @@
 import java.awt.peer.FramePeer;
 
 @SuppressWarnings("serial") // JDK-implementation class
-public class WEmbeddedFrame extends EmbeddedFrame {
+public final class WEmbeddedFrame extends EmbeddedFrame {
 
     static {
         initIDs();
@@ -79,6 +79,7 @@ public WEmbeddedFrame(long handle) {
         }
     }
 
+    @Override
     public void addNotify() {
         if (!isDisplayable()) {
             WToolkit toolkit = (WToolkit)Toolkit.getDefaultToolkit();
@@ -224,6 +225,7 @@ private native void printBand(long hdc, byte[] data, int offset, int sx,
     public void activateEmbeddingTopLevel() {
     }
 
+    @Override
     public void synthesizeWindowActivation(final boolean activate) {
         final FramePeer peer = AWTAccessor.getComponentAccessor().getPeer(this);
         if (!activate || EventQueue.isDispatchThread()) {
@@ -241,7 +243,9 @@ public void run() {
         }
     }
 
+    @Override
     public void registerAccelerator(AWTKeyStroke stroke) {}
+    @Override
     public void unregisterAccelerator(AWTKeyStroke stroke) {}
 
     /**
@@ -256,6 +260,7 @@ public void unregisterAccelerator(AWTKeyStroke stroke) {}
      * NOTE: This method may be called by privileged threads.
      *     DO NOT INVOKE CLIENT CODE ON THIS THREAD!
      */
+    @Override
     public void notifyModalBlocked(Dialog blocker, boolean blocked) {
         try {
             ComponentPeer thisPeer = (ComponentPeer)WToolkit.targetToPeer(this);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
index 4d5219cf34e..bab79c38ff4 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
@@ -32,7 +32,7 @@
 import sun.awt.EmbeddedFrame;
 import sun.awt.Win32GraphicsEnvironment;
 
-public class WEmbeddedFramePeer extends WFramePeer {
+public final class WEmbeddedFramePeer extends WFramePeer {
 
     public WEmbeddedFramePeer(EmbeddedFrame target) {
         super(target);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
index 259329d4f6d..c5267e52793 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WLabelPeer.java
@@ -31,6 +31,7 @@ final class WLabelPeer extends WComponentPeer implements LabelPeer {
 
     // ComponentPeer overrides
 
+    @Override
     public Dimension getMinimumSize() {
         FontMetrics fm = getFontMetrics(((Label)target).getFont());
         String label = ((Label)target).getText();
@@ -40,6 +41,7 @@ public Dimension getMinimumSize() {
     }
 
     native void lazyPaint();
+    @Override
     synchronized void start() {
         super.start();
         // if need then paint label
@@ -47,11 +49,14 @@ synchronized void start() {
     }
     // LabelPeer implementation
 
+    @Override
     public boolean shouldClearRectBeforePaint() {
         return false;
     }
 
+    @Override
     public native void setText(String label);
+    @Override
     public native void setAlignment(int alignment);
 
     // Toolkit & peer internals
@@ -60,8 +65,10 @@ public boolean shouldClearRectBeforePaint() {
         super(target);
     }
 
+    @Override
     native void create(WComponentPeer parent);
 
+    @Override
     void initialize() {
         Label   l = (Label)target;
 
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
index ff77a5c188c..994b81e372e 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WLightweightFramePeer.java
@@ -36,7 +36,7 @@
 import sun.swing.JLightweightFrame;
 import sun.swing.SwingAccessor;
 
-public class WLightweightFramePeer extends WFramePeer implements OverrideNativeWindowHandle {
+public final class WLightweightFramePeer extends WFramePeer implements OverrideNativeWindowHandle {
 
     public WLightweightFramePeer(LightweightFrame target) {
         super(target);
@@ -100,6 +100,7 @@ public void updateCursorImmediately() {
         SwingAccessor.getJLightweightFrameAccessor().updateCursor((JLightweightFrame)getLwTarget());
     }
 
+    @Override
     public boolean isLightweightFramePeer() {
         return true;
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
index 43d4d2b907a..f2961f79a04 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
@@ -46,11 +46,13 @@ class WMenuItemPeer extends WObjectPeer implements MenuItemPeer {
     // MenuItemPeer implementation
 
     private synchronized native void _dispose();
+    @Override
     protected void disposeImpl() {
         WToolkit.targetDisposedPeer(target, this);
         _dispose();
     }
 
+    @Override
     public void setEnabled(boolean b) {
         enable(b);
     }
@@ -69,6 +71,7 @@ private void readShortcutLabel() {
         }
     }
 
+    @Override
     public void setLabel(String label) {
         //Fix for 6288578: PIT. Windows: Shortcuts displayed for the menuitems in a popup menu
         readShortcutLabel();
@@ -165,6 +168,7 @@ static Font getDefaultFont() {
 
     private native void _setFont(Font f);
 
+    @Override
     public void setFont(final Font f) {
         _setFont(f);
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
index e5bef4fe1b9..4b785aaba69 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMouseInfoPeer.java
@@ -43,8 +43,10 @@ public final class WMouseInfoPeer implements MouseInfoPeer {
     WMouseInfoPeer() {
     }
 
+    @Override
     public native int fillPointWithCoords(Point point);
 
+    @Override
     public native boolean isWindowUnderMouse(Window w);
 
 }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
index 69b62325670..d89cbcfa53a 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPopupMenuPeer.java
@@ -70,6 +70,7 @@ final class WPopupMenuPeer extends WMenuPeer implements PopupMenuPeer {
 
     private native void createMenu(WComponentPeer parent);
 
+    @Override
     @SuppressWarnings("deprecation")
     public void show(Event e) {
         Component origin = (Component)e.target;
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index d7efc54ffd4..e50cfcff33b 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -264,7 +264,7 @@ public final class WPrinterJob extends RasterPrinterJob
     /* The HandleRecord holds the native resources that need to be freed
      * when this WPrinterJob is GC'd.
      */
-    static class HandleRecord implements DisposerRecord {
+    static final class HandleRecord implements DisposerRecord {
         /**
          * The Windows device context we will print into.
          * This variable is set after the Print dialog
@@ -2269,7 +2269,7 @@ private void setPrinterNameAttrib(String printerName) {
     }
 
 @SuppressWarnings("serial") // JDK-implementation class
-static class PrintToFileErrorDialog extends Dialog implements ActionListener {
+static final class PrintToFileErrorDialog extends Dialog implements ActionListener {
     public PrintToFileErrorDialog(Frame parent, String title, String message,
                            String buttonText) {
         super(parent, title, true);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
index e305654d91f..3a0d7bf3a71 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WScrollPanePeer.java
@@ -167,7 +167,7 @@ private void postScrollEvent(int orient, int type,
      * operation.
      */
     @SuppressWarnings("serial") // JDK-implementation class
-    static class ScrollEvent extends PeerEvent {
+    static final class ScrollEvent extends PeerEvent {
         ScrollEvent(Object source, Runnable runnable) {
             super(source, runnable, 0L);
         }
@@ -187,7 +187,7 @@ public PeerEvent coalesceEvents(PeerEvent newEvent) {
     /*
      * Runnable for the ScrollEvent that performs the adjustment.
      */
-    class Adjustor implements Runnable {
+    final class Adjustor implements Runnable {
         int orient;             // selects scrollbar
         int type;               // adjustment type
         int pos;                // new position (only used for absolute)
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
index 055f2523cea..cfc227d29d6 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WScrollbarPeer.java
@@ -35,6 +35,7 @@ final class WScrollbarPeer extends WComponentPeer implements ScrollbarPeer {
     static native int getScrollbarSize(int orientation);
 
     // ComponentPeer overrides
+    @Override
     public Dimension getMinimumSize() {
         if (((Scrollbar)target).getOrientation() == Scrollbar.VERTICAL) {
             return new Dimension(getScrollbarSize(Scrollbar.VERTICAL), 50);
@@ -46,9 +47,12 @@ public Dimension getMinimumSize() {
 
     // ScrollbarPeer implementation
 
+    @Override
     public native void setValues(int value, int visible,
                                  int minimum, int maximum);
+    @Override
     public native void setLineIncrement(int l);
+    @Override
     public native void setPageIncrement(int l);
 
 
@@ -58,8 +62,10 @@ public native void setValues(int value, int visible,
         super(target);
     }
 
+    @Override
     native void create(WComponentPeer parent);
 
+    @Override
     void initialize() {
         Scrollbar sb = (Scrollbar)target;
         setValues(sb.getValue(), sb.getVisibleAmount(),
@@ -136,6 +142,7 @@ public void run() {
         });
     }
 
+    @Override
     public boolean shouldClearRectBeforePaint() {
         return false;
     }
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index e151a69a0f1..0fdc4c6005b 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -186,7 +186,7 @@ public static void loadLibraries() {
         }
     }
 
-    static class ToolkitDisposer implements sun.java2d.DisposerRecord {
+    static final class ToolkitDisposer implements sun.java2d.DisposerRecord {
         @Override
         public void dispose() {
             WToolkit.postDispose();
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
index 90fbd880446..d6c311d3f48 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
@@ -199,7 +199,7 @@ native void setNativeIcon(int[] rData, byte[] andMask, int nScanStride,
 
     native void _displayMessage(String caption, String text, String messageType);
 
-    class IconObserver implements ImageObserver {
+    final class IconObserver implements ImageObserver {
         @Override
         public boolean imageUpdate(Image image, int flags, int x, int y, int width, int height) {
             if (image != ((TrayIcon)target).getImage() || // if the image has been changed
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
index 997db36beac..0ba2217dde5 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java
@@ -849,7 +849,7 @@ private static void initActiveWindowsTracking(Window w) {
      * it removes the list of the active windows from the disposed AppContext and
      * unregisters ActiveWindowListener listener.
      */
-    private static class GuiDisposedListener implements PropertyChangeListener {
+    private static final class GuiDisposedListener implements PropertyChangeListener {
         @Override
         public void propertyChange(PropertyChangeEvent e) {
             boolean isDisposed = (Boolean)e.getNewValue();
@@ -875,7 +875,7 @@ public void propertyChange(PropertyChangeEvent e) {
      * window is always at the end of the list. The list is stored in AppContext.
      */
     @SuppressWarnings("unchecked")
-    private static class ActiveWindowListener implements PropertyChangeListener {
+    private static final class ActiveWindowListener implements PropertyChangeListener {
         @Override
         public void propertyChange(PropertyChangeEvent e) {
             Window w = (Window)e.getNewValue();
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java b/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
index 55c5236594c..ae7573ac4e2 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WingDings.java
@@ -52,7 +52,7 @@ public boolean contains(Charset cs) {
         return cs instanceof WingDings;
     }
 
-    private static class Encoder extends CharsetEncoder {
+    private static final class Encoder extends CharsetEncoder {
         public Encoder(Charset cs) {
             super(cs, 1.0f, 1.0f);
         }
diff --git a/src/java.desktop/windows/classes/sun/font/NativeFont.java b/src/java.desktop/windows/classes/sun/font/NativeFont.java
index 7a5c29c7c73..9b0e6492d67 100644
--- a/src/java.desktop/windows/classes/sun/font/NativeFont.java
+++ b/src/java.desktop/windows/classes/sun/font/NativeFont.java
@@ -37,7 +37,7 @@
  * and the font is ignored.
  */
 
-public class NativeFont extends PhysicalFont {
+public final class NativeFont extends PhysicalFont {
 
     /**
      * Verifies native font is accessible.
@@ -53,6 +53,7 @@ static boolean hasExternalBitmaps(String platName) {
         return false;
     }
 
+    @Override
     public CharToGlyphMapper getMapper() {
         return null;
     }
@@ -61,6 +62,7 @@ PhysicalFont getDelegateFont() {
         return null;
     }
 
+    @Override
     FontStrike createStrike(FontStrikeDesc desc) {
         return null;
     }
@@ -69,16 +71,19 @@ public Rectangle2D getMaxCharBounds(FontRenderContext frc) {
         return null;
     }
 
+    @Override
     StrikeMetrics getFontMetrics(long pScalerContext) {
         return null;
     }
 
+    @Override
     public GeneralPath getGlyphOutline(long pScalerContext,
                                        int glyphCode,
                                        float x, float y) {
         return null;
     }
 
+    @Override
     public  GeneralPath getGlyphVectorOutline(long pScalerContext,
                                               int[] glyphs, int numGlyphs,
                                               float x, float y) {
@@ -86,20 +91,24 @@ public  GeneralPath getGlyphVectorOutline(long pScalerContext,
     }
 
 
+    @Override
     long getGlyphImage(long pScalerContext, int glyphCode) {
         return 0L;
     }
 
 
+    @Override
     void getGlyphMetrics(long pScalerContext, int glyphCode,
                          Point2D.Float metrics) {
     }
 
 
+    @Override
     float getGlyphAdvance(long pScalerContext, int glyphCode) {
         return 0f;
     }
 
+    @Override
     Rectangle2D.Float getGlyphOutlineBounds(long pScalerContext,
                                             int glyphCode) {
         return new Rectangle2D.Float(0f, 0f, 0f, 0f);
diff --git a/src/java.desktop/windows/classes/sun/font/NativeStrike.java b/src/java.desktop/windows/classes/sun/font/NativeStrike.java
index a28c47911ed..7b2b947d722 100644
--- a/src/java.desktop/windows/classes/sun/font/NativeStrike.java
+++ b/src/java.desktop/windows/classes/sun/font/NativeStrike.java
@@ -48,9 +48,11 @@ public class NativeStrike extends PhysicalStrike {
     }
 
 
+    @Override
     void getGlyphImagePtrs(int[] glyphCodes, long[] images,int  len) {
     }
 
+    @Override
     long getGlyphImagePtr(int glyphCode) {
         return 0L;
     }
@@ -59,26 +61,32 @@ long getGlyphImagePtrNoCache(int glyphCode) {
         return 0L;
     }
 
+    @Override
     void getGlyphImageBounds(int glyphcode,
                              Point2D.Float pt,
                              Rectangle result) {
     }
 
+    @Override
     Point2D.Float getGlyphMetrics(int glyphCode) {
         return null;
     }
 
+    @Override
     float getGlyphAdvance(int glyphCode) {
         return 0f;
     }
 
+    @Override
     Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
         return null;
     }
+    @Override
     GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
         return null;
     }
 
+    @Override
     GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
         return null;
     }
diff --git a/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java b/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
index 4512492350d..4abb8c823f6 100644
--- a/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
+++ b/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
@@ -38,7 +38,7 @@
  * The SurfaceManagerFactory that creates VolatileSurfaceManager
  * implementations for the Windows volatile images.
  */
-public class WindowsSurfaceManagerFactory extends SurfaceManagerFactory {
+public final class WindowsSurfaceManagerFactory extends SurfaceManagerFactory {
 
     /**
      * Creates a new instance of a VolatileSurfaceManager given any
@@ -49,6 +49,7 @@ public class WindowsSurfaceManagerFactory extends SurfaceManagerFactory {
      * For Windows platforms, this method returns a Windows-specific
      * VolatileSurfaceManager.
      */
+    @Override
     public VolatileSurfaceManager createVolatileManager(SunVolatileImage vImg,
                                                         Object context)
     {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
index 8f4da91eef2..9aa9837b191 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBlitLoops.java
@@ -358,7 +358,7 @@ static void IsoBlit(SurfaceData srcData, SurfaceData dstData,
     }
 }
 
-class D3DSurfaceToSurfaceBlit extends Blit {
+final class D3DSurfaceToSurfaceBlit extends Blit {
 
     D3DSurfaceToSurfaceBlit() {
         super(D3DSurfaceData.D3DSurface,
@@ -366,6 +366,7 @@ class D3DSurfaceToSurfaceBlit extends Blit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
@@ -380,7 +381,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSurfaceToSurfaceScale extends ScaledBlit {
+final class D3DSurfaceToSurfaceScale extends ScaledBlit {
 
     D3DSurfaceToSurfaceScale() {
         super(D3DSurfaceData.D3DSurface,
@@ -388,6 +389,7 @@ class D3DSurfaceToSurfaceScale extends ScaledBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Scale(SurfaceData src, SurfaceData dst,
                       Composite comp, Region clip,
                       int sx1, int sy1,
@@ -405,7 +407,7 @@ public void Scale(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSurfaceToSurfaceTransform extends TransformBlit {
+final class D3DSurfaceToSurfaceTransform extends TransformBlit {
 
     D3DSurfaceToSurfaceTransform() {
         super(D3DSurfaceData.D3DSurface,
@@ -413,6 +415,7 @@ class D3DSurfaceToSurfaceTransform extends TransformBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst,
                           Composite comp, Region clip,
                           AffineTransform at, int hint,
@@ -428,7 +431,7 @@ public void Transform(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DRTTSurfaceToSurfaceBlit extends Blit {
+final class D3DRTTSurfaceToSurfaceBlit extends Blit {
 
     D3DRTTSurfaceToSurfaceBlit() {
         super(D3DSurfaceData.D3DSurfaceRTT,
@@ -436,6 +439,7 @@ class D3DRTTSurfaceToSurfaceBlit extends Blit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
@@ -450,7 +454,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DRTTSurfaceToSurfaceScale extends ScaledBlit {
+final class D3DRTTSurfaceToSurfaceScale extends ScaledBlit {
 
     D3DRTTSurfaceToSurfaceScale() {
         super(D3DSurfaceData.D3DSurfaceRTT,
@@ -458,6 +462,7 @@ class D3DRTTSurfaceToSurfaceScale extends ScaledBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Scale(SurfaceData src, SurfaceData dst,
                       Composite comp, Region clip,
                       int sx1, int sy1,
@@ -475,7 +480,7 @@ public void Scale(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DRTTSurfaceToSurfaceTransform extends TransformBlit {
+final class D3DRTTSurfaceToSurfaceTransform extends TransformBlit {
 
     D3DRTTSurfaceToSurfaceTransform() {
         super(D3DSurfaceData.D3DSurfaceRTT,
@@ -483,6 +488,7 @@ class D3DRTTSurfaceToSurfaceTransform extends TransformBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst,
                           Composite comp, Region clip,
                           AffineTransform at, int hint,
@@ -497,7 +503,7 @@ public void Transform(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSurfaceToSwBlit extends Blit {
+final class D3DSurfaceToSwBlit extends Blit {
 
     private int typeval;
     private WeakReference<SurfaceData> srcTmp;
@@ -567,6 +573,7 @@ private synchronized void complexClipBlit(SurfaceData src, SurfaceData dst,
         }
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy,
@@ -629,7 +636,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSwToSurfaceBlit extends Blit {
+final class D3DSwToSurfaceBlit extends Blit {
 
     private int typeval;
 
@@ -640,6 +647,7 @@ class D3DSwToSurfaceBlit extends Blit {
         this.typeval = typeval;
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
@@ -653,7 +661,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSwToSurfaceScale extends ScaledBlit {
+final class D3DSwToSurfaceScale extends ScaledBlit {
 
     private int typeval;
 
@@ -664,6 +672,7 @@ class D3DSwToSurfaceScale extends ScaledBlit {
         this.typeval = typeval;
     }
 
+    @Override
     public void Scale(SurfaceData src, SurfaceData dst,
                       Composite comp, Region clip,
                       int sx1, int sy1,
@@ -680,7 +689,7 @@ public void Scale(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSwToSurfaceTransform extends TransformBlit {
+final class D3DSwToSurfaceTransform extends TransformBlit {
 
     private int typeval;
 
@@ -691,6 +700,7 @@ class D3DSwToSurfaceTransform extends TransformBlit {
         this.typeval = typeval;
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst,
                           Composite comp, Region clip,
                           AffineTransform at, int hint,
@@ -704,7 +714,7 @@ public void Transform(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSwToTextureBlit extends Blit {
+final class D3DSwToTextureBlit extends Blit {
 
     private int typeval;
 
@@ -715,6 +725,7 @@ class D3DSwToTextureBlit extends Blit {
         this.typeval = typeval;
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
@@ -728,7 +739,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DTextureToSurfaceBlit extends Blit {
+final class D3DTextureToSurfaceBlit extends Blit {
 
     D3DTextureToSurfaceBlit() {
         super(D3DSurfaceData.D3DTexture,
@@ -736,6 +747,7 @@ class D3DTextureToSurfaceBlit extends Blit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
@@ -750,7 +762,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DTextureToSurfaceScale extends ScaledBlit {
+final class D3DTextureToSurfaceScale extends ScaledBlit {
 
     D3DTextureToSurfaceScale() {
         super(D3DSurfaceData.D3DTexture,
@@ -758,6 +770,7 @@ class D3DTextureToSurfaceScale extends ScaledBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Scale(SurfaceData src, SurfaceData dst,
                       Composite comp, Region clip,
                       int sx1, int sy1,
@@ -775,7 +788,7 @@ public void Scale(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DTextureToSurfaceTransform extends TransformBlit {
+final class D3DTextureToSurfaceTransform extends TransformBlit {
 
     D3DTextureToSurfaceTransform() {
         super(D3DSurfaceData.D3DTexture,
@@ -783,6 +796,7 @@ class D3DTextureToSurfaceTransform extends TransformBlit {
               D3DSurfaceData.D3DSurface);
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst,
                           Composite comp, Region clip,
                           AffineTransform at, int hint,
@@ -804,7 +818,7 @@ public void Transform(SurfaceData src, SurfaceData dst,
  * IntArgbPre->D3DSurface/Texture loop to get the intermediate
  * (premultiplied) surface down to D3D using simple blit.
  */
-class D3DGeneralBlit extends Blit {
+final class D3DGeneralBlit extends Blit {
 
     private final Blit performop;
     private WeakReference<SurfaceData> srcTmp;
@@ -817,6 +831,7 @@ class D3DGeneralBlit extends Blit {
         this.performop = performop;
     }
 
+    @Override
     public synchronized void Blit(SurfaceData src, SurfaceData dst,
                                   Composite comp, Region clip,
                                   int sx, int sy, int dx, int dy,
@@ -917,7 +932,7 @@ public synchronized void Transform(SurfaceData src, SurfaceData dst,
  *
  */
 
-class D3DSurfaceToGDIWindowSurfaceBlit extends Blit {
+final class D3DSurfaceToGDIWindowSurfaceBlit extends Blit {
 
     D3DSurfaceToGDIWindowSurfaceBlit() {
         super(D3DSurfaceData.D3DSurface,
@@ -935,7 +950,7 @@ public void Blit(SurfaceData src, SurfaceData dst,
 
 }
 
-class D3DSurfaceToGDIWindowSurfaceScale extends ScaledBlit {
+final class D3DSurfaceToGDIWindowSurfaceScale extends ScaledBlit {
 
     D3DSurfaceToGDIWindowSurfaceScale() {
         super(D3DSurfaceData.D3DSurface,
@@ -955,7 +970,7 @@ public void Scale(SurfaceData src, SurfaceData dst,
     }
 }
 
-class D3DSurfaceToGDIWindowSurfaceTransform extends TransformBlit {
+final class D3DSurfaceToGDIWindowSurfaceTransform extends TransformBlit {
 
     D3DSurfaceToGDIWindowSurfaceTransform() {
         super(D3DSurfaceData.D3DSurface,
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
index 890bb87d66b..7ca0130391b 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DBufImgOps.java
@@ -37,7 +37,7 @@
 import sun.java2d.pipe.BufferedBufImgOps;
 import static sun.java2d.d3d.D3DContext.D3DContextCaps.*;
 
-class D3DBufImgOps extends BufferedBufImgOps {
+final class D3DBufImgOps extends BufferedBufImgOps {
 
     /**
      * This method is called from D3DDrawImage.transformImage() only.  It
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
index 055e636bb69..5d9b6c30b5b 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DContext.java
@@ -106,7 +106,7 @@ D3DGraphicsDevice getDevice() {
         return device;
     }
 
-    static class D3DContextCaps extends ContextCapabilities {
+    static final class D3DContextCaps extends ContextCapabilities {
         /**
          * Indicates the presence of pixel shaders (v2.0 or greater).
          * This cap will only be set if the hardware supports the minimum number
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
index f814dc2f613..e847c7ba7cd 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DDrawImage.java
@@ -37,7 +37,7 @@
 import sun.java2d.loops.TransformBlit;
 import sun.java2d.pipe.DrawImage;
 
-public class D3DDrawImage extends DrawImage {
+public final class D3DDrawImage extends DrawImage {
 
     @Override
     protected void renderImageXform(SunGraphics2D sg, Image img,
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
index 53d64017a3e..aab6b720d6a 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
@@ -223,7 +223,7 @@ public void flip(WComponentPeer peer,
         }
     }
 
-    private static class D3DBufferCaps extends BufferCapabilities {
+    private static final class D3DBufferCaps extends BufferCapabilities {
         public D3DBufferCaps() {
             // REMIND: should we indicate that the front-buffer
             // (the on-screen rendering) is not accelerated?
@@ -244,7 +244,7 @@ public BufferCapabilities getBufferCapabilities() {
         return bufferCaps;
     }
 
-    private static class D3DImageCaps extends ImageCapabilities {
+    private static final class D3DImageCaps extends ImageCapabilities {
         private D3DImageCaps() {
             super(true);
         }
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
index e9f02a5d98c..1c838d0d32d 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
@@ -128,7 +128,7 @@ public void run() {
         return d3dCaps != null ? d3dCaps : new D3DContextCaps(CAPS_EMPTY, null);
     }
 
-    public final boolean isCapPresent(int cap) {
+    public boolean isCapPresent(int cap) {
         return ((d3dCaps.getCaps() & cap) != 0);
     }
 
@@ -234,7 +234,7 @@ public void run() {
      * REMIND: we create an instance per each full-screen device while a single
      * instance would suffice (but requires more management).
      */
-    private static class D3DFSWindowAdapter extends WindowAdapter {
+    private static final class D3DFSWindowAdapter extends WindowAdapter {
         @Override
         @SuppressWarnings("static")
         public void windowDeactivated(WindowEvent e) {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
index 835bcb733ad..6ba766d2b13 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskBlit.java
@@ -36,7 +36,7 @@
 import static sun.java2d.loops.CompositeType.*;
 import static sun.java2d.loops.SurfaceType.*;
 
-class D3DMaskBlit extends BufferedMaskBlit {
+final class D3DMaskBlit extends BufferedMaskBlit {
 
     static void register() {
         GraphicsPrimitive[] primitives = {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
index fb78616a98f..d00e3fe2ee1 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DMaskFill.java
@@ -36,7 +36,7 @@
 import static sun.java2d.loops.CompositeType.*;
 import static sun.java2d.loops.SurfaceType.*;
 
-class D3DMaskFill extends BufferedMaskFill {
+final class D3DMaskFill extends BufferedMaskFill {
 
     static void register() {
         GraphicsPrimitive[] primitives = {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
index 7d5bd4423ea..74b7cfc6967 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DPaints.java
@@ -76,7 +76,7 @@ static boolean isValid(SunGraphics2D sg2d) {
 
 /************************* GradientPaint support ****************************/
 
-    private static class Gradient extends D3DPaints {
+    private static final class Gradient extends D3DPaints {
         private Gradient() {}
 
         /**
@@ -96,7 +96,7 @@ boolean isPaintValid(SunGraphics2D sg2d) {
 
 /************************** TexturePaint support ****************************/
 
-    private static class Texture extends D3DPaints {
+    private static final class Texture extends D3DPaints {
         private Texture() {}
 
         /**
@@ -201,7 +201,7 @@ boolean isPaintValid(SunGraphics2D sg2d) {
 
 /********************** LinearGradientPaint support *************************/
 
-    private static class LinearGradient extends MultiGradient {
+    private static final class LinearGradient extends MultiGradient {
         private LinearGradient() {}
 
         @Override
@@ -228,7 +228,7 @@ boolean isPaintValid(SunGraphics2D sg2d) {
 
 /********************** RadialGradientPaint support *************************/
 
-    private static class RadialGradient extends MultiGradient {
+    private static final class RadialGradient extends MultiGradient {
         private RadialGradient() {}
     }
 }
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
index d77e90456df..be20e1c4e4c 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderQueue.java
@@ -33,7 +33,7 @@
 /**
  * D3D-specific implementation of RenderQueue.
  */
-public class D3DRenderQueue extends RenderQueue {
+public final class D3DRenderQueue extends RenderQueue {
 
     private static D3DRenderQueue theInstance;
     private static Thread rqThread;
@@ -132,11 +132,13 @@ public static void disposeGraphicsConfig(long pConfigInfo) {
         }
     }
 
+    @Override
     public void flushNow() {
         // assert lock.isHeldByCurrentThread();
         flushBuffer(null);
     }
 
+    @Override
     public void flushAndInvokeNow(Runnable r) {
         // assert lock.isHeldByCurrentThread();
         flushBuffer(r);
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
index fd63d758548..7361a09973b 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DRenderer.java
@@ -87,6 +87,7 @@ void copyArea(SunGraphics2D sg2d,
         }
     }
 
+    @Override
     protected native void drawPoly(int[] xPoints, int[] yPoints,
                                    int nPoints, boolean isClosed,
                                    int transX, int transY);
@@ -95,12 +96,13 @@ D3DRenderer traceWrap() {
         return new Tracer(this);
     }
 
-    private static class Tracer extends D3DRenderer {
+    private static final class Tracer extends D3DRenderer {
         private D3DRenderer d3dr;
         Tracer(D3DRenderer d3dr) {
             super(d3dr.rq);
             this.d3dr = d3dr;
         }
+        @Override
         public ParallelogramPipe getAAParallelogramPipe() {
             final ParallelogramPipe realpipe = d3dr.getAAParallelogramPipe();
             return new ParallelogramPipe() {
@@ -133,19 +135,23 @@ public void drawParallelogram(SunGraphics2D sg2d,
             };
         }
 
+        @Override
         protected void validateContext(SunGraphics2D sg2d) {
             d3dr.validateContext(sg2d);
         }
+        @Override
         public void drawLine(SunGraphics2D sg2d,
                              int x1, int y1, int x2, int y2)
         {
             GraphicsPrimitive.tracePrimitive("D3DDrawLine");
             d3dr.drawLine(sg2d, x1, y1, x2, y2);
         }
+        @Override
         public void drawRect(SunGraphics2D sg2d, int x, int y, int w, int h) {
             GraphicsPrimitive.tracePrimitive("D3DDrawRect");
             d3dr.drawRect(sg2d, x, y, w, h);
         }
+        @Override
         protected void drawPoly(SunGraphics2D sg2d,
                                 int[] xPoints, int[] yPoints,
                                 int nPoints, boolean isClosed)
@@ -153,28 +159,33 @@ protected void drawPoly(SunGraphics2D sg2d,
             GraphicsPrimitive.tracePrimitive("D3DDrawPoly");
             d3dr.drawPoly(sg2d, xPoints, yPoints, nPoints, isClosed);
         }
+        @Override
         public void fillRect(SunGraphics2D sg2d, int x, int y, int w, int h) {
             GraphicsPrimitive.tracePrimitive("D3DFillRect");
             d3dr.fillRect(sg2d, x, y, w, h);
         }
+        @Override
         protected void drawPath(SunGraphics2D sg2d,
                                 Path2D.Float p2df, int transx, int transy)
         {
             GraphicsPrimitive.tracePrimitive("D3DDrawPath");
             d3dr.drawPath(sg2d, p2df, transx, transy);
         }
+        @Override
         protected void fillPath(SunGraphics2D sg2d,
                                 Path2D.Float p2df, int transx, int transy)
         {
             GraphicsPrimitive.tracePrimitive("D3DFillPath");
             d3dr.fillPath(sg2d, p2df, transx, transy);
         }
+        @Override
         protected void fillSpans(SunGraphics2D sg2d, SpanIterator si,
                                  int transx, int transy)
         {
             GraphicsPrimitive.tracePrimitive("D3DFillSpans");
             d3dr.fillSpans(sg2d, si, transx, transy);
         }
+        @Override
         public void fillParallelogram(SunGraphics2D sg2d,
                                       double ux1, double uy1,
                                       double ux2, double uy2,
@@ -187,6 +198,7 @@ public void fillParallelogram(SunGraphics2D sg2d,
                                    ux1, uy1, ux2, uy2,
                                    x, y, dx1, dy1, dx2, dy2);
         }
+        @Override
         public void drawParallelogram(SunGraphics2D sg2d,
                                       double ux1, double uy1,
                                       double ux2, double uy2,
@@ -200,6 +212,7 @@ public void drawParallelogram(SunGraphics2D sg2d,
                                    ux1, uy1, ux2, uy2,
                                    x, y, dx1, dy1, dx2, dy2, lw1, lw2);
         }
+        @Override
         public void copyArea(SunGraphics2D sg2d,
                              int x, int y, int w, int h, int dx, int dy)
         {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
index a1afb5cd4c4..58dfd17dea7 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java
@@ -58,7 +58,7 @@
  * There are some restrictions to which windows we would use this for.
  * @see #createScreenSurface
  */
-public class D3DScreenUpdateManager extends ScreenUpdateManager
+public final class D3DScreenUpdateManager extends ScreenUpdateManager
     implements Runnable
 {
     /**
@@ -401,6 +401,7 @@ public void runUpdateNow() {
         }
     }
 
+    @Override
     public void run() {
         while (!done) {
             synchronized (runLock) {
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
index c8e082b59d6..374fce63db0 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java
@@ -441,6 +441,7 @@ public void run() {
      * Returns the D3DContext for the GraphicsConfig associated with this
      * surface.
      */
+    @Override
     public final D3DContext getContext() {
         return graphicsDevice.getContext();
     }
@@ -448,6 +449,7 @@ public final D3DContext getContext() {
     /**
      * Returns one of the surface type constants defined above.
      */
+    @Override
     public final int getType() {
         return type;
     }
@@ -455,7 +457,7 @@ public final int getType() {
     private static native int  dbGetPixelNative(long pData, int x, int y);
     private static native void dbSetPixelNative(long pData, int x, int y,
                                                 int pixel);
-    static class D3DDataBufferNative extends DataBufferNative {
+    static final class D3DDataBufferNative extends DataBufferNative {
         int pixel;
         protected D3DDataBufferNative(SurfaceData sData,
                                       int type, int w, int h)
@@ -463,6 +465,7 @@ protected D3DDataBufferNative(SurfaceData sData,
             super(sData, type, w, h);
         }
 
+        @Override
         protected int getElem(final int x, final int y,
                               final SurfaceData sData)
         {
@@ -486,6 +489,7 @@ public void run() {
             return retPixel;
         }
 
+        @Override
         protected void setElem(final int x, final int y, final int pixel,
                                final SurfaceData sData)
         {
@@ -508,6 +512,7 @@ public void run() {
         }
     }
 
+    @Override
     public synchronized Raster getRaster(int x, int y, int w, int h) {
         if (wrn == null) {
             DirectColorModel dcm = (DirectColorModel)getColorModel();
@@ -541,6 +546,7 @@ public synchronized Raster getRaster(int x, int y, int w, int h) {
      *   - the source color is opaque
      *   - and the destination is opaque
      */
+    @Override
     public boolean canRenderLCDText(SunGraphics2D sg2d) {
         return
             graphicsDevice.isCapPresent(CAPS_LCD_SHADER) &&
@@ -564,6 +570,7 @@ void disableAccelerationForSurface() {
         }
     }
 
+    @Override
     public void validatePipe(SunGraphics2D sg2d) {
         TextPipe textpipe;
         boolean validated = false;
@@ -803,10 +810,12 @@ public void run() {
     /**
      * Returns destination Image associated with this SurfaceData.
      */
+    @Override
     public Object getDestination() {
         return offscreenImage;
     }
 
+    @Override
     public Rectangle getBounds() {
         if (type == FLIP_BACKBUFFER || type == WINDOW) {
             double scaleX = getDefaultScaleX();
@@ -821,6 +830,7 @@ public Rectangle getBounds() {
         }
     }
 
+    @Override
     public Rectangle getNativeBounds() {
         D3DRenderQueue rq = D3DRenderQueue.getInstance();
         // need to lock to make sure nativeWidth and Height are consistent
@@ -836,10 +846,12 @@ public Rectangle getNativeBounds() {
     }
 
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsDevice.getDefaultConfiguration();
     }
 
+    @Override
     public SurfaceData getReplacement() {
         return restoreContents(offscreenImage);
     }
@@ -909,6 +921,7 @@ public void setSurfaceLost(boolean lost) {
      * such resource doesn't exist or can not be retrieved.
      * @see sun.java2d.pipe.hw.AccelSurface#getNativeResource
      */
+    @Override
     public long getNativeResource(int resType) {
         return getNativeResourceNative(getNativeOps(), resType);
     }
@@ -920,7 +933,7 @@ public long getNativeResource(int resType) {
      *
      * @see D3DScreenUpdateManager
      */
-    public static class D3DWindowSurfaceData extends D3DSurfaceData {
+    public static final class D3DWindowSurfaceData extends D3DSurfaceData {
         StateTracker dirtyTracker;
 
         public D3DWindowSurfaceData(WComponentPeer peer,
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
index 66e98882a19..6ea095666b3 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java
@@ -38,7 +38,7 @@
  * SurfaceData with a cached D3D Texture and the code to create
  * the accelerated surfaces.
  */
-public class D3DSurfaceDataProxy extends SurfaceDataProxy {
+public final class D3DSurfaceDataProxy extends SurfaceDataProxy {
 
     public static SurfaceDataProxy createProxy(SurfaceData srcData,
                                                D3DGraphicsConfig dstConfig)
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
index b892ed4b10c..31b2cc207cd 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DTextRenderer.java
@@ -59,10 +59,11 @@ D3DTextRenderer traceWrap() {
         return new Tracer(this);
     }
 
-    private static class Tracer extends D3DTextRenderer {
+    private static final class Tracer extends D3DTextRenderer {
         Tracer(D3DTextRenderer d3dtr) {
             super(d3dtr.rq);
         }
+        @Override
         protected void drawGlyphList(SunGraphics2D sg2d, GlyphList gl) {
             GraphicsPrimitive.tracePrimitive("D3DDrawGlyphs");
             super.drawGlyphList(sg2d, gl);
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
index 4aac1c248a6..0fedb478362 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java
@@ -48,7 +48,7 @@
 import static sun.java2d.pipe.hw.AccelSurface.TEXTURE;
 import static sun.java2d.pipe.hw.AccelSurface.UNDEFINED;
 
-public class D3DVolatileSurfaceManager
+public final class D3DVolatileSurfaceManager
     extends VolatileSurfaceManager
 {
     private boolean accelerationEnabled;
@@ -75,6 +75,7 @@ public D3DVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
               gd.isCapPresent(CAPS_RT_TEXTURE_ALPHA)));
     }
 
+    @Override
     protected boolean isAccelerationEnabled() {
         return accelerationEnabled;
     }
@@ -86,6 +87,7 @@ public void setAccelerationEnabled(boolean accelerationEnabled) {
      * Create a pbuffer-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig).
      */
+    @Override
     protected SurfaceData initAcceleratedSurface() {
         SurfaceData sData;
         Component comp = vImg.getComponent();
@@ -124,6 +126,7 @@ protected SurfaceData initAcceleratedSurface() {
         return sData;
     }
 
+    @Override
     protected boolean isConfigValid(GraphicsConfiguration gc) {
         return ((gc == null) || (gc == vImg.getGraphicsConfig()));
     }
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
index 768f2df08ad..c6658bf2914 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
@@ -158,7 +158,7 @@ public void run() {
      * This is a small helper class that allows us to execute
      * getWGLConfigInfo() on the queue flushing thread.
      */
-    private static class WGLGetConfigInfo implements Runnable {
+    private static final class WGLGetConfigInfo implements Runnable {
         private int screen;
         private int pixfmt;
         private long cfginfo;
@@ -184,21 +184,21 @@ public static boolean isWGLAvailable() {
      * See OGLContext.java for a list of supported capabilities.
      */
     @Override
-    public final boolean isCapPresent(int cap) {
+    public boolean isCapPresent(int cap) {
         return ((oglCaps.getCaps() & cap) != 0);
     }
 
     @Override
-    public final long getNativeConfigInfo() {
+    public long getNativeConfigInfo() {
         return pConfigInfo;
     }
 
     @Override
-    public final OGLContext getContext() {
+    public OGLContext getContext() {
         return context;
     }
 
-    private static class WGLGCDisposerRecord implements DisposerRecord {
+    private static final class WGLGCDisposerRecord implements DisposerRecord {
         private long pCfgInfo;
         public WGLGCDisposerRecord(long pCfgInfo) {
             this.pCfgInfo = pCfgInfo;
@@ -374,7 +374,7 @@ public void flip(WComponentPeer peer,
         }
     }
 
-    private static class WGLBufferCaps extends BufferCapabilities {
+    private static final class WGLBufferCaps extends BufferCapabilities {
         public WGLBufferCaps(boolean dblBuf) {
             super(imageCaps, imageCaps,
                   dblBuf ? FlipContents.UNDEFINED : null);
@@ -390,7 +390,7 @@ public BufferCapabilities getBufferCapabilities() {
         return bufferCaps;
     }
 
-    private static class WGLImageCaps extends ImageCapabilities {
+    private static final class WGLImageCaps extends ImageCapabilities {
         private WGLImageCaps() {
             super(true);
         }
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
index fa4cb6a3cc2..8f97980811f 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLSurfaceData.java
@@ -75,6 +75,7 @@ public double getDefaultScaleY() {
         return scaleY;
     }
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsConfig;
     }
@@ -151,7 +152,7 @@ public static WGLGraphicsConfig getGC(WComponentPeer peer) {
         }
     }
 
-    public static class WGLWindowSurfaceData extends WGLSurfaceData {
+    public static final class WGLWindowSurfaceData extends WGLSurfaceData {
 
         public WGLWindowSurfaceData(WComponentPeer peer,
                                     WGLGraphicsConfig gc)
@@ -159,10 +160,12 @@ public WGLWindowSurfaceData(WComponentPeer peer,
             super(peer, gc, peer.getColorModel(), WINDOW);
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return peer.getSurfaceData();
         }
 
+        @Override
         public Rectangle getBounds() {
             Rectangle r = peer.getBounds();
             r.x = r.y = 0;
@@ -174,6 +177,7 @@ public Rectangle getBounds() {
         /**
          * Returns destination Component associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return peer.getTarget();
         }
@@ -188,7 +192,7 @@ public Object getDestination() {
      * belongs to is showed, it is first copied to the real private
      * FLIP_BACKBUFFER, which is then flipped.
      */
-    public static class WGLVSyncOffScreenSurfaceData extends
+    public static final class WGLVSyncOffScreenSurfaceData extends
         WGLOffScreenSurfaceData
     {
         private WGLOffScreenSurfaceData flipSurface;
@@ -235,10 +239,12 @@ public WGLOffScreenSurfaceData(WComponentPeer peer,
             initSurface(this.width, this.height);
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return restoreContents(offscreenImage);
         }
 
+        @Override
         public Rectangle getBounds() {
             if (type == FLIP_BACKBUFFER) {
                 Rectangle r = peer.getBounds();
@@ -254,6 +260,7 @@ public Rectangle getBounds() {
         /**
          * Returns destination Image associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return offscreenImage;
         }
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
index 750bb94df08..c90f8102e7e 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java
@@ -43,7 +43,7 @@
 import sun.java2d.pipe.hw.ExtendedBufferCapabilities;
 import static sun.java2d.pipe.hw.ExtendedBufferCapabilities.VSyncType.*;
 
-public class WGLVolatileSurfaceManager extends VolatileSurfaceManager {
+public final class WGLVolatileSurfaceManager extends VolatileSurfaceManager {
 
     private final boolean accelerationEnabled;
 
@@ -62,6 +62,7 @@ public WGLVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
                 && transparency != Transparency.BITMASK;
     }
 
+    @Override
     protected boolean isAccelerationEnabled() {
         return accelerationEnabled;
     }
@@ -70,6 +71,7 @@ protected boolean isAccelerationEnabled() {
      * Create a FBO-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig).
      */
+    @Override
     protected SurfaceData initAcceleratedSurface() {
         SurfaceData sData;
         Component comp = vImg.getComponent();
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
index 3f1996309cd..18d44ea6a49 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIBlitLoops.java
@@ -43,7 +43,7 @@
  * that is faster than our current fallback (which creates
  * a temporary GDI DIB)
  */
-public class GDIBlitLoops extends Blit {
+public final class GDIBlitLoops extends Blit {
 
     // Store these values to be passed to native code
     int rmask, gmask, bmask;
@@ -134,6 +134,7 @@ public native void nativeBlit(SurfaceData src, SurfaceData dst,
      * Composite data because we only register these loops for
      * SrcNoEa composite operations.
      */
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy, int dx, int dy, int w, int h)
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
index f08273c76fb..9bb3ba38b20 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
@@ -50,6 +50,7 @@ native void doDrawLine(GDIWindowSurfaceData sData,
                            Region clip, Composite comp, int color,
                            int x1, int y1, int x2, int y2);
 
+    @Override
     public void drawLine(SunGraphics2D sg2d,
                          int x1, int y1, int x2, int y2)
     {
@@ -68,6 +69,7 @@ native void doDrawRect(GDIWindowSurfaceData sData,
                            Region clip, Composite comp, int color,
                            int x, int y, int w, int h);
 
+    @Override
     public void drawRect(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -85,6 +87,7 @@ native void doDrawRoundRect(GDIWindowSurfaceData sData,
                                 int x, int y, int w, int h,
                                 int arcW, int arcH);
 
+    @Override
     public void drawRoundRect(SunGraphics2D sg2d,
                               int x, int y, int width, int height,
                               int arcWidth, int arcHeight)
@@ -103,6 +106,7 @@ native void doDrawOval(GDIWindowSurfaceData sData,
                            Region clip, Composite comp, int color,
                            int x, int y, int w, int h);
 
+    @Override
     public void drawOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -120,6 +124,7 @@ native void doDrawArc(GDIWindowSurfaceData sData,
                           int x, int y, int w, int h,
                           int angleStart, int angleExtent);
 
+    @Override
     public void drawArc(SunGraphics2D sg2d,
                         int x, int y, int width, int height,
                         int startAngle, int arcAngle)
@@ -140,6 +145,7 @@ native void doDrawPoly(GDIWindowSurfaceData sData,
                            int[] xpoints, int[] ypoints,
                            int npoints, boolean isclosed);
 
+    @Override
     public void drawPolyline(SunGraphics2D sg2d,
                              int[] xpoints, int[] ypoints,
                              int npoints)
@@ -153,6 +159,7 @@ public void drawPolyline(SunGraphics2D sg2d,
         }
     }
 
+    @Override
     public void drawPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints,
                             int npoints)
@@ -170,6 +177,7 @@ native void doFillRect(GDIWindowSurfaceData sData,
                            Region clip, Composite comp, int color,
                            int x, int y, int w, int h);
 
+    @Override
     public void fillRect(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -187,6 +195,7 @@ native void doFillRoundRect(GDIWindowSurfaceData sData,
                                 int x, int y, int w, int h,
                                 int arcW, int arcH);
 
+    @Override
     public void fillRoundRect(SunGraphics2D sg2d,
                               int x, int y, int width, int height,
                               int arcWidth, int arcHeight)
@@ -205,6 +214,7 @@ native void doFillOval(GDIWindowSurfaceData sData,
                            Region clip, Composite comp, int color,
                            int x, int y, int w, int h);
 
+    @Override
     public void fillOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -222,6 +232,7 @@ native void doFillArc(GDIWindowSurfaceData sData,
                           int x, int y, int w, int h,
                           int angleStart, int angleExtent);
 
+    @Override
     public void fillArc(SunGraphics2D sg2d,
                         int x, int y, int width, int height,
                         int startAngle, int arcAngle)
@@ -242,6 +253,7 @@ native void doFillPoly(GDIWindowSurfaceData sData,
                            int[] xpoints, int[] ypoints,
                            int npoints);
 
+    @Override
     public void fillPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints,
                             int npoints)
@@ -303,6 +315,7 @@ public void doFillSpans(SunGraphics2D sg2d, SpanIterator si) {
         }
     }
 
+    @Override
     public void draw(SunGraphics2D sg2d, Shape s) {
         if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) {
             doShape(sg2d, s, false);
@@ -318,6 +331,7 @@ public void draw(SunGraphics2D sg2d, Shape s) {
         }
     }
 
+    @Override
     public void fill(SunGraphics2D sg2d, Shape s) {
         doShape(sg2d, s, true);
     }
@@ -331,7 +345,8 @@ public GDIRenderer traceWrap() {
         return new Tracer();
     }
 
-    public static class Tracer extends GDIRenderer {
+    public static final class Tracer extends GDIRenderer {
+        @Override
         void doDrawLine(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int x1, int y1, int x2, int y2)
@@ -339,6 +354,7 @@ void doDrawLine(GDIWindowSurfaceData sData,
             GraphicsPrimitive.tracePrimitive("GDIDrawLine");
             super.doDrawLine(sData, clip, comp, color, x1, y1, x2, y2);
         }
+        @Override
         void doDrawRect(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int x, int y, int w, int h)
@@ -346,6 +362,7 @@ void doDrawRect(GDIWindowSurfaceData sData,
             GraphicsPrimitive.tracePrimitive("GDIDrawRect");
             super.doDrawRect(sData, clip, comp, color, x, y, w, h);
         }
+        @Override
         void doDrawRoundRect(GDIWindowSurfaceData sData,
                              Region clip, Composite comp, int color,
                              int x, int y, int w, int h,
@@ -355,6 +372,7 @@ void doDrawRoundRect(GDIWindowSurfaceData sData,
             super.doDrawRoundRect(sData, clip, comp, color,
                                   x, y, w, h, arcW, arcH);
         }
+        @Override
         void doDrawOval(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int x, int y, int w, int h)
@@ -362,6 +380,7 @@ void doDrawOval(GDIWindowSurfaceData sData,
             GraphicsPrimitive.tracePrimitive("GDIDrawOval");
             super.doDrawOval(sData, clip, comp, color, x, y, w, h);
         }
+        @Override
         void doDrawArc(GDIWindowSurfaceData sData,
                        Region clip, Composite comp, int color,
                        int x, int y, int w, int h,
@@ -371,6 +390,7 @@ void doDrawArc(GDIWindowSurfaceData sData,
             super.doDrawArc(sData, clip, comp, color, x, y, w, h,
                             angleStart, angleExtent);
         }
+        @Override
         void doDrawPoly(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int transx, int transy,
@@ -381,6 +401,7 @@ void doDrawPoly(GDIWindowSurfaceData sData,
             super.doDrawPoly(sData, clip, comp, color, transx, transy,
                              xpoints, ypoints, npoints, isclosed);
         }
+        @Override
         void doFillRect(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int x, int y, int w, int h)
@@ -388,6 +409,7 @@ void doFillRect(GDIWindowSurfaceData sData,
             GraphicsPrimitive.tracePrimitive("GDIFillRect");
             super.doFillRect(sData, clip, comp, color, x, y, w, h);
         }
+        @Override
         void doFillRoundRect(GDIWindowSurfaceData sData,
                              Region clip, Composite comp, int color,
                              int x, int y, int w, int h,
@@ -397,6 +419,7 @@ void doFillRoundRect(GDIWindowSurfaceData sData,
             super.doFillRoundRect(sData, clip, comp, color,
                                   x, y, w, h, arcW, arcH);
         }
+        @Override
         void doFillOval(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int x, int y, int w, int h)
@@ -404,6 +427,7 @@ void doFillOval(GDIWindowSurfaceData sData,
             GraphicsPrimitive.tracePrimitive("GDIFillOval");
             super.doFillOval(sData, clip, comp, color, x, y, w, h);
         }
+        @Override
         void doFillArc(GDIWindowSurfaceData sData,
                        Region clip, Composite comp, int color,
                        int x, int y, int w, int h,
@@ -413,6 +437,7 @@ void doFillArc(GDIWindowSurfaceData sData,
             super.doFillArc(sData, clip, comp, color, x, y, w, h,
                             angleStart, angleExtent);
         }
+        @Override
         void doFillPoly(GDIWindowSurfaceData sData,
                         Region clip, Composite comp, int color,
                         int transx, int transy,
@@ -423,6 +448,7 @@ void doFillPoly(GDIWindowSurfaceData sData,
             super.doFillPoly(sData, clip, comp, color, transx, transy,
                              xpoints, ypoints, npoints);
         }
+        @Override
         void doShape(GDIWindowSurfaceData sData,
                      Region clip, Composite comp, int color,
                      int transX, int transY,
@@ -434,6 +460,7 @@ void doShape(GDIWindowSurfaceData sData,
             super.doShape(sData, clip, comp, color,
                           transX, transY, p2df, isfill);
         }
+        @Override
         public void devCopyArea(GDIWindowSurfaceData sData,
                                 int srcx, int srcy,
                                 int dx, int dy,
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
index 52e0d47c55d..38b57f77bce 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java
@@ -51,7 +51,7 @@
 import sun.java2d.loops.RenderLoops;
 import sun.java2d.loops.XORComposite;
 
-public class GDIWindowSurfaceData extends SurfaceData {
+public final class GDIWindowSurfaceData extends SurfaceData {
     private WComponentPeer peer;
     private Win32GraphicsConfig graphicsConfig;
     private RenderLoops solidloops;
@@ -139,6 +139,7 @@ public SurfaceDataProxy makeProxyFor(SurfaceData srcData) {
         return SurfaceDataProxy.UNCACHED;
     }
 
+    @Override
     public Raster getRaster(int x, int y, int w, int h) {
         throw new InternalError("not implemented yet");
     }
@@ -155,6 +156,7 @@ public Raster getRaster(int x, int y, int w, int h) {
 
     }
 
+    @Override
     public void validatePipe(SunGraphics2D sg2d) {
         if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON &&
             sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
@@ -223,6 +225,7 @@ public void validatePipe(SunGraphics2D sg2d) {
         }
     }
 
+    @Override
     public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
             sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY)
@@ -232,6 +235,7 @@ public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         return super.getRenderLoops(sg2d);
     }
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsConfig;
     }
@@ -299,6 +303,7 @@ public SurfaceData getReplacement() {
         return mgr.getReplacementScreenSurface(peer, this);
     }
 
+    @Override
     public Rectangle getBounds() {
         Rectangle r = peer.getBounds();
         r.x = r.y = 0;
@@ -307,6 +312,7 @@ public Rectangle getBounds() {
         return r;
     }
 
+    @Override
     public boolean copyArea(SunGraphics2D sg2d,
                             int x, int y, int w, int h, int dx, int dy)
     {
diff --git a/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
index 7333eeda3dd..b5b1e6376e9 100644
--- a/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/WindowsFlags.java
@@ -28,7 +28,7 @@
 import sun.awt.windows.WToolkit;
 import sun.java2d.opengl.WGLGraphicsConfig;
 
-public class WindowsFlags {
+public final class WindowsFlags {
 
     /**
      * Description of command-line flags.  All flags with [true|false]
diff --git a/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java b/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
index f9ac7621aa4..677831a9245 100644
--- a/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
+++ b/src/java.desktop/windows/classes/sun/print/PlatformPrinterJobProxy.java
@@ -27,7 +27,7 @@
 
 import java.awt.print.PrinterJob;
 
-public class PlatformPrinterJobProxy {
+public final class PlatformPrinterJobProxy {
 
    public static PrinterJob getPrinterJob() {
        return new sun.awt.windows.WPrinterJob();
diff --git a/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
index 4dbcf3a4701..7af6f1b61f8 100644
--- a/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
@@ -43,7 +43,7 @@
 
 import sun.awt.util.ThreadGroupUtils;
 
-public class PrintServiceLookupProvider extends PrintServiceLookup {
+public final class PrintServiceLookupProvider extends PrintServiceLookup {
 
     private PrintService defaultPrintService;
     private PrintService[] printServices; /* includes the default printer */
@@ -105,6 +105,7 @@ public PrintServiceLookupProvider() {
      * This isn't required by the API and there's a risk doing this will
      * lead people to assume its guaranteed.
      */
+    @Override
     public synchronized PrintService[] getPrintServices() {
         if (printServices == null) {
             refreshServices();
@@ -199,6 +200,7 @@ boolean matchingService(PrintService service,
         return true;
     }
 
+    @Override
     public PrintService[] getPrintServices(DocFlavor flavor,
                                            AttributeSet attributes) {
 
@@ -260,6 +262,7 @@ public PrintService[] getPrintServices(DocFlavor flavor,
     /*
      * return empty array as don't support multi docs
      */
+    @Override
     public MultiDocPrintService[]
         getMultiDocPrintServices(DocFlavor[] flavors,
                                  AttributeSet attributes) {
@@ -267,6 +270,7 @@ public PrintService[] getPrintServices(DocFlavor flavor,
     }
 
 
+    @Override
     public synchronized PrintService getDefaultPrintService() {
 
         // Windows does not have notification for a change in default
diff --git a/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java b/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
index 43ce6a19d6a..3cb8c858e39 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32MediaTray.java
@@ -35,7 +35,7 @@
  * It also implements driver-defined trays.
  **/
 @SuppressWarnings("serial") // JDK implementation class
-public class Win32MediaTray extends MediaTray {
+public final class Win32MediaTray extends MediaTray {
 
     static final Win32MediaTray ENVELOPE_MANUAL = new Win32MediaTray(0,
                                                       6); //DMBIN_ENVMANUAL
@@ -96,6 +96,7 @@ protected static int getTraySize() {
       return (myStringTable.length+winStringTable.size());
     }
 
+    @Override
     protected String[] getStringTable() {
       ArrayList<String> completeList = new ArrayList<>();
       for (int i=0; i < myStringTable.length; i++) {
@@ -106,6 +107,7 @@ protected String[] getStringTable() {
       return completeList.toArray(nameTable);
     }
 
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
       ArrayList<MediaTray> completeList = new ArrayList<>();
       for (int i=0; i < myEnumValueTable.length; i++) {
diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
index f8ee2d3db0b..cd4eec9926b 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java
@@ -73,7 +73,7 @@
 
 import java.awt.print.*;
 
-public class Win32PrintJob implements CancelablePrintJob {
+public final class Win32PrintJob implements CancelablePrintJob {
 
     private transient ArrayList<PrintJobListener> jobListeners;
     private transient ArrayList<PrintJobAttributeListener> attrListeners;
@@ -113,10 +113,12 @@ public class Win32PrintJob implements CancelablePrintJob {
         this.service = service;
     }
 
+    @Override
     public PrintService getPrintService() {
         return service;
     }
 
+    @Override
     public PrintJobAttributeSet getAttributes() {
         synchronized (this) {
             if (jobAttrSet == null) {
@@ -129,6 +131,7 @@ public PrintJobAttributeSet getAttributes() {
         }
     }
 
+    @Override
     public void addPrintJobListener(PrintJobListener listener) {
         synchronized (this) {
             if (listener == null) {
@@ -141,6 +144,7 @@ public void addPrintJobListener(PrintJobListener listener) {
         }
     }
 
+    @Override
     public void removePrintJobListener(PrintJobListener listener) {
         synchronized (this) {
             if (listener == null || jobListeners == null ) {
@@ -254,6 +258,7 @@ private void notifyEvent(int reason) {
        }
     }
 
+    @Override
     public void addPrintJobAttributeListener(
                                   PrintJobAttributeListener listener,
                                   PrintJobAttributeSet attributes) {
@@ -273,6 +278,7 @@ public void addPrintJobAttributeListener(
         }
     }
 
+    @Override
     public void removePrintJobAttributeListener(
                                         PrintJobAttributeListener listener) {
         synchronized (this) {
@@ -293,6 +299,7 @@ public void removePrintJobAttributeListener(
         }
     }
 
+    @Override
     public void print(Doc doc, PrintRequestAttributeSet attributes)
         throws PrintException {
 
@@ -697,6 +704,7 @@ private native boolean startPrintRawData(String printerName,
     private native boolean endPrintRawData();
 
     /* Cancel PrinterJob jobs that haven't yet completed. */
+   @Override
    public void cancel() throws PrintException {
         synchronized (this) {
             if (!printing) {
diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
index 7d85755bf0c..3bca5b581bb 100644
--- a/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
+++ b/src/java.desktop/windows/classes/sun/print/Win32PrintService.java
@@ -78,7 +78,7 @@
 import javax.print.event.PrintServiceAttributeListener;
 import sun.awt.windows.WPrinterJob;
 
-public class Win32PrintService implements PrintService, AttributeUpdater,
+public final class Win32PrintService implements PrintService, AttributeUpdater,
                                           SunPrinterJobService {
 
     public static MediaSize[] predefMedia = Win32MediaSize.getPredefMedia();
@@ -242,6 +242,7 @@ public void invalidateService() {
         isInvalid = true;
     }
 
+    @Override
     public String getName() {
         return printer;
     }
@@ -857,6 +858,7 @@ private boolean isSupportedResolution(PrinterResolution res) {
         return false;
     }
 
+    @Override
     public DocPrintJob createPrintJob() {
         return new Win32PrintJob(this);
     }
@@ -868,6 +870,7 @@ private PrintServiceAttributeSet getDynamicAttributes() {
         return attrs;
     }
 
+    @Override
     public PrintServiceAttributeSet getUpdatedAttributes() {
         PrintServiceAttributeSet currSet = getDynamicAttributes();
         if (lastSet == null) {
@@ -896,6 +899,7 @@ public void wakeNotifier() {
         }
     }
 
+    @Override
     public void addPrintServiceAttributeListener(PrintServiceAttributeListener
                                                  listener) {
         synchronized (this) {
@@ -909,6 +913,7 @@ public void addPrintServiceAttributeListener(PrintServiceAttributeListener
         }
     }
 
+    @Override
     public void removePrintServiceAttributeListener(
                                       PrintServiceAttributeListener listener) {
         synchronized (this) {
@@ -923,6 +928,7 @@ public void removePrintServiceAttributeListener(
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T extends PrintServiceAttribute> T
         getAttribute(Class<T> category)
@@ -955,6 +961,7 @@ public void removePrintServiceAttributeListener(
         }
     }
 
+    @Override
     public PrintServiceAttributeSet getAttributes() {
 
         PrintServiceAttributeSet attrs = new  HashPrintServiceAttributeSet();
@@ -979,6 +986,7 @@ public PrintServiceAttributeSet getAttributes() {
         return AttributeSetUtilities.unmodifiableView(attrs);
     }
 
+    @Override
     public DocFlavor[] getSupportedDocFlavors() {
         int len = supportedFlavors.length;
         DocFlavor[] supportedDocFlavors;
@@ -998,6 +1006,7 @@ public DocFlavor[] getSupportedDocFlavors() {
         return supportedDocFlavors;
     }
 
+    @Override
     public boolean isDocFlavorSupported(DocFlavor flavor) {
         /* To avoid a native query which may be time-consuming
          * do not invoke native unless postscript support is being queried.
@@ -1017,6 +1026,7 @@ public boolean isDocFlavorSupported(DocFlavor flavor) {
         return false;
     }
 
+    @Override
     public Class<?>[] getSupportedAttributeCategories() {
         ArrayList<Class<?>> categList = new ArrayList<>(otherAttrCats.length+3);
         for (int i=0; i < otherAttrCats.length; i++) {
@@ -1049,6 +1059,7 @@ public Class<?>[] getSupportedAttributeCategories() {
         return categList.toArray(new Class<?>[categList.size()]);
     }
 
+    @Override
     public boolean
         isAttributeCategorySupported(Class<? extends Attribute> category)
     {
@@ -1072,6 +1083,7 @@ public Class<?>[] getSupportedAttributeCategories() {
         return false;
     }
 
+    @Override
     public Object
         getDefaultAttributeValue(Class<? extends Attribute> category)
     {
@@ -1255,6 +1267,7 @@ private boolean isAutoSense(DocFlavor flavor) {
         }
     }
 
+    @Override
     public Object
         getSupportedAttributeValues(Class<? extends Attribute> category,
                                     DocFlavor flavor,
@@ -1457,6 +1470,7 @@ private boolean isAutoSense(DocFlavor flavor) {
         }
     }
 
+    @Override
     public boolean isAttributeValueSupported(Attribute attr,
                                              DocFlavor flavor,
                                              AttributeSet attributes) {
@@ -1586,6 +1600,7 @@ else if (category == Chromaticity.class) {
         return true;
     }
 
+    @Override
     public AttributeSet getUnsupportedAttributes(DocFlavor flavor,
                                                  AttributeSet attributes) {
 
@@ -1622,7 +1637,7 @@ else if (!isAttributeValueSupported(attr, flavor, attributes)) {
 
     private Win32DocumentPropertiesUI docPropertiesUI = null;
 
-    private static class Win32DocumentPropertiesUI
+    private static final class Win32DocumentPropertiesUI
         extends DocumentPropertiesUI {
 
         Win32PrintService service;
@@ -1631,6 +1646,7 @@ private Win32DocumentPropertiesUI(Win32PrintService s) {
             service = s;
         }
 
+        @Override
         public PrintRequestAttributeSet
             showDocumentProperties(PrinterJob job,
                                    Window owner,
@@ -1649,7 +1665,7 @@ private synchronized DocumentPropertiesUI getDocumentPropertiesUI() {
         return new Win32DocumentPropertiesUI(this);
     }
 
-    private static class Win32ServiceUIFactory extends ServiceUIFactory {
+    private static final class Win32ServiceUIFactory extends ServiceUIFactory {
 
         Win32PrintService service;
 
@@ -1657,6 +1673,7 @@ private static class Win32ServiceUIFactory extends ServiceUIFactory {
             service = s;
         }
 
+        @Override
         public Object getUI(int role, String ui) {
             if (role <= ServiceUIFactory.MAIN_UIROLE) {
                 return null;
@@ -1669,6 +1686,7 @@ public Object getUI(int role, String ui) {
             throw new IllegalArgumentException("Unsupported role");
         }
 
+        @Override
         public String[] getUIClassNamesForRole(int role) {
 
             if (role <= ServiceUIFactory.MAIN_UIROLE) {
@@ -1685,6 +1703,7 @@ public String[] getUIClassNamesForRole(int role) {
 
     private Win32ServiceUIFactory uiFactory = null;
 
+    @Override
     public synchronized ServiceUIFactory getServiceUIFactory() {
         if (uiFactory == null) {
             uiFactory = new Win32ServiceUIFactory(this);
@@ -1692,20 +1711,24 @@ public synchronized ServiceUIFactory getServiceUIFactory() {
         return uiFactory;
     }
 
+    @Override
     public String toString() {
         return "Win32 Printer : " + getName();
     }
 
+    @Override
     public boolean equals(Object obj) {
         return  (obj == this ||
                  (obj instanceof Win32PrintService &&
                   ((Win32PrintService)obj).getName().equals(getName())));
     }
 
+   @Override
    public int hashCode() {
         return this.getClass().hashCode()+getName().hashCode();
     }
 
+    @Override
     public boolean usesClass(Class<?> c) {
         return (c == sun.awt.windows.WPrinterJob.class);
     }
@@ -1727,7 +1750,7 @@ private native float[] getMediaPrintableArea(String printerName,
 }
 
 @SuppressWarnings("serial") // JDK implementation class
-class Win32MediaSize extends MediaSizeName {
+final class Win32MediaSize extends MediaSizeName {
     private static ArrayList<String> winStringTable = new ArrayList<>();
     private static ArrayList<Win32MediaSize> winEnumTable = new ArrayList<>();
     private static MediaSize[] predefMedia;
@@ -1787,11 +1810,13 @@ int getDMPaper() {
         return dmPaperID;
     }
 
+    @Override
     protected String[] getStringTable() {
       String[] nameTable = new String[winStringTable.size()];
       return winStringTable.toArray(nameTable);
     }
 
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
       MediaSizeName[] enumTable = new MediaSizeName[winEnumTable.size()];
       return winEnumTable.toArray(enumTable);
diff --git a/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java b/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
index 6430a71f06e..f1180b3ae38 100644
--- a/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
+++ b/src/java.desktop/windows/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
@@ -37,7 +37,7 @@
  *
  */
 @SuppressWarnings("serial") // JDK-implementation class
-public class ClassicSortArrowIcon implements Icon, UIResource, Serializable{
+public final class ClassicSortArrowIcon implements Icon, UIResource, Serializable{
     private static final int X_OFFSET = 9;
     private boolean ascending;
 
@@ -45,6 +45,7 @@ public ClassicSortArrowIcon(boolean ascending) {
         this.ascending = ascending;
     }
 
+    @Override
     public void paintIcon(Component c, Graphics g, int x, int y) {
         x += X_OFFSET;
         if (ascending) {
@@ -89,9 +90,11 @@ private void drawSide(Graphics g, int x, int y, int xIncrement) {
         g.fillRect(x, y, 1, 2);
     }
 
+    @Override
     public int getIconWidth() {
         return X_OFFSET + 8;
     }
+    @Override
     public int getIconHeight() {
         return 9;
     }

From 1889dacb1981d3d15174bc5a201e683a6cdab725 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 16:01:34 +0000
Subject: [PATCH 052/901] 8353007: Open some JComboBox bugs 2

Reviewed-by: kizune, honkar
---
 .../jdk/javax/swing/JComboBox/bug4185024.java | 109 +++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4201964.java |  77 +++++++++++
 .../jdk/javax/swing/JComboBox/bug4249732.java |  72 ++++++++++
 .../jdk/javax/swing/JComboBox/bug4368848.java | 129 ++++++++++++++++++
 4 files changed, 387 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4185024.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4201964.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4249732.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4368848.java

diff --git a/test/jdk/javax/swing/JComboBox/bug4185024.java b/test/jdk/javax/swing/JComboBox/bug4185024.java
new file mode 100644
index 00000000000..da0360143d6
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4185024.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Point;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4185024
+ * @summary Tests that Heavyweight combo boxes on JDesktop work correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4185024
+ */
+
+public class bug4185024 {
+    private static final String INSTRUCTIONS = """
+            Click on the JComboBox button inside the JInternalFrame to bring up the menu.
+            Select one of the menu items and verify that the choice is highlighted correctly.
+            Click and drag the menu's scroll bar down and verify that it causes the menu to scroll down.
+
+            Inside JInternalFrame:
+            This test is for the JComboBox in the JInternalFrame.
+            To test, please click on the combobox and check the following:
+            Does the selection in the popup list follow the mouse?
+            Does the popup list respond to clicking and dragging the scroll bar?
+            If so, press PASS, otherwise, press FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4185024::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4185024");
+        JPanel p = new JPanel();
+        p.setLayout(new BorderLayout());
+        JDesktopPane desktop = new JDesktopPane();
+        p.add(desktop);
+        frame.add(p);
+
+        JComboBox months = new JComboBox();
+        months.addItem("January");
+        months.addItem("February");
+        months.addItem("March");
+        months.addItem("April");
+        months.addItem("May");
+        months.addItem("June");
+        months.addItem("July");
+        months.addItem("August");
+        months.addItem("September");
+        months.addItem("October");
+        months.addItem("November");
+        months.addItem("December");
+        months.getAccessibleContext().setAccessibleName("Months");
+        months.getAccessibleContext().setAccessibleDescription("Choose a month of the year");
+
+        // Set this to true and the popup works correctly...
+        months.setLightWeightPopupEnabled(false);
+
+        addFrame("Months", desktop, months);
+
+        frame.setSize(300, 300);
+        return frame;
+    }
+
+    private static void addFrame(String title, JDesktopPane desktop, JComponent component) {
+        JInternalFrame jf = new JInternalFrame(title);
+        Point newPos = new Point(20, 20);
+        jf.setResizable(true);
+        jf.add(component);
+        jf.setLocation(newPos);
+        desktop.add(jf);
+
+        jf.pack();
+        jf.show();
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4201964.java b/test/jdk/javax/swing/JComboBox/bug4201964.java
new file mode 100644
index 00000000000..5c3a0f30199
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4201964.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 4201964
+ * @summary Tests that JComboBox's arrow button isn't drawn too wide in Windows Look&Feel
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4201964
+ */
+
+public class bug4201964 {
+    private static final String INSTRUCTIONS = """
+            Does the arrow look too large?  If not, it passes.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        } catch (Exception e) {
+            PassFailJFrame.forceFail("Couldn't load the Windows look and feel.");
+        }
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(8)
+                .columns(30)
+                .testUI(bug4201964::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4201964");
+        JPanel panel = new JPanel();
+        JComboBox comboBox;
+
+        comboBox = new JComboBox(new Object[]{
+                "Coma Berenices",
+                "Triangulum",
+                "Camelopardis",
+                "Cassiopea"});
+
+        panel.add(comboBox);
+
+        frame.add(panel);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4249732.java b/test/jdk/javax/swing/JComboBox/bug4249732.java
new file mode 100644
index 00000000000..b8de7fa48b7
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4249732.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.
+ */
+
+import java.awt.BorderLayout;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 4249732
+ * @requires (os.family == "windows")
+ * @summary Tests that Windows editable combo box selects text picked from its list
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4249732
+ */
+
+public class bug4249732 {
+    private static final String INSTRUCTIONS = """
+            Click on combo box arrow button to open its dropdown list, and
+            select an item from there. The text in the combo box editor should
+            be selected, otherwise test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        } catch (Exception e) {
+            PassFailJFrame.forceFail("Couldn't load the Windows look and feel.");
+        }
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .rows(8)
+                .columns(40)
+                .testUI(bug4249732::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4249732");
+
+        JComboBox cb = new JComboBox(new Object[]{"foo", "bar", "baz"});
+        cb.setEditable(true);
+
+        frame.add(cb, BorderLayout.NORTH);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4368848.java b/test/jdk/javax/swing/JComboBox/bug4368848.java
new file mode 100644
index 00000000000..1673c458cac
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4368848.java
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+/*
+ * @test
+ * @bug 4368848
+ * @summary Tests that mouse wheel events cancel popups
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4368848
+ */
+
+public class bug4368848 {
+    static final String[] names = {"First Name", "Last Name", "Veggy"};
+    static Object[][] data = {
+            {"Mark", "Andrews", false},
+            {"Tom", "Ball", false},
+            {"Alan", "Chung", false},
+            {"Jeff", "Dinkins", false},
+            {"Amy", "Fowler", false},
+            {"Brian", "Gerhold", false},
+            {"James", "Gosling", false},
+            {"David", "Karlton", false},
+            {"Dave", "Kloba", false},
+            {"Peter", "Korn", false},
+            {"Phil", "Milne", false},
+            {"Dave", "Moore", false},
+            {"Hans", "Muller", false},
+            {"Rick", "Levenson", false},
+            {"Tim", "Prinzing", false},
+            {"Chester", "Rose", false},
+            {"Ray", "Ryan", false},
+            {"Georges", "Saab", false},
+            {"Willie", "Walker", false},
+            {"Kathy", "Walrath", false},
+            {"Arnaud", "Weber", false}
+    };
+
+    private static final String INSTRUCTIONS = """
+            Click any cell in the 'Veggy' column, so that combo box appears.
+            Make sure mouse pointer is over the table, but _not_ over the combo
+            box. Try scrolling the table using the mouse wheel. The combo popup
+            should disappear. If it stays visible, test fails.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4368848::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4368848");
+        ExampleTableModel dataModel = new ExampleTableModel();
+
+        JComboBox _editor = new JComboBox();
+        _editor.addItem(false);
+        _editor.addItem(true);
+
+        JTable tableView = new JTable(dataModel);
+        tableView.setDefaultEditor(Boolean.class, new DefaultCellEditor(_editor));
+
+        frame.add(new JScrollPane(tableView));
+        frame.setSize(200, 200);
+        return frame;
+    }
+
+    static class ExampleTableModel extends AbstractTableModel {
+        // These methods always need to be implemented.
+        @Override
+        public int getColumnCount() {
+            return names.length;
+        }
+
+        @Override
+        public int getRowCount() {
+            return data.length;
+        }
+
+        public Object getValueAt(int row, int col) {
+            return data[row][col];
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int col) {
+            return true;
+        }
+
+        @Override
+        public String getColumnName(int column) {
+            return names[column];
+        }
+
+        @Override
+        public Class getColumnClass(int col) {
+            return getValueAt(0, col).getClass();
+        }
+    }
+}

From 6a310613392b9d619ae1bbe3e663cb4a022165d9 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Tue, 22 Apr 2025 16:11:55 +0000
Subject: [PATCH 053/901] 8354248: Open source several AWT GridBagLayout and
 List tests

Reviewed-by: abhiscxk
---
 test/jdk/ProblemList.txt                      |   2 +
 .../awt/GridBagLayout/ComponentShortage.java  |  99 +++++++++
 .../awt/List/ListScrollbarCursorTest.java     |  70 +++++++
 test/jdk/java/awt/List/ListScrollbarTest.java | 197 ++++++++++++++++++
 4 files changed, 368 insertions(+)
 create mode 100644 test/jdk/java/awt/GridBagLayout/ComponentShortage.java
 create mode 100644 test/jdk/java/awt/List/ListScrollbarCursorTest.java
 create mode 100644 test/jdk/java/awt/List/ListScrollbarTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index fe0657ff165..56224181b0a 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -464,6 +464,7 @@ java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.
 java/awt/PopupMenu/PopupMenuLocation.java 8259913,8315878 windows-all,macosx-aarch64
 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/GridBagLayout/ComponentShortage.java 8355280 windows-all,linux-all
 java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java 8238720 windows-all
 
 # Several tests which fail sometimes on macos11
@@ -815,6 +816,7 @@ java/awt/PopupMenu/PopupHangTest.java 8340022 windows-all
 java/awt/Focus/MinimizeNonfocusableWindowTest.java 8024487 windows-all
 java/awt/Focus/InactiveFocusRace.java 8023263 linux-all
 java/awt/List/HandlingKeyEventIfMousePressedTest.java 6848358 macosx-all,windows-all
+java/awt/List/ListScrollbarCursorTest.java 8066410 generic-all
 java/awt/Checkbox/CheckboxBoxSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxIndicatorSizeTest.java 8340870 windows-all
 java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all
diff --git a/test/jdk/java/awt/GridBagLayout/ComponentShortage.java b/test/jdk/java/awt/GridBagLayout/ComponentShortage.java
new file mode 100644
index 00000000000..dd641bbf066
--- /dev/null
+++ b/test/jdk/java/awt/GridBagLayout/ComponentShortage.java
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4238932
+ * @summary JTextField in gridBagLayout does not properly set MinimumSize
+ * @key headful
+ * @run main ComponentShortage
+ */
+
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JTextField;
+
+public class ComponentShortage {
+    static final int WIDTH_REDUCTION = 50;
+    static JFrame frame;
+    static JTextField jtf;
+    static volatile Dimension size;
+    static volatile Dimension fSize;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(() -> {
+                frame = new JFrame();
+                frame.setLayout(new GridBagLayout());
+                GridBagConstraints gBC = new GridBagConstraints();
+
+                gBC.gridx = 1;
+                gBC.gridy = 0;
+                gBC.gridwidth = 1;
+                gBC.gridheight = 1;
+                gBC.weightx = 1.0;
+                gBC.weighty = 0.0;
+                gBC.fill = GridBagConstraints.NONE;
+                gBC.anchor = GridBagConstraints.NORTHWEST;
+                jtf = new JTextField(16);
+                frame.add(jtf, gBC);
+                frame.pack();
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            EventQueue.invokeAndWait(() -> {
+                size = jtf.getSize();
+            });
+            System.out.println("TextField size before Frame's width reduction : " + size);
+
+            EventQueue.invokeAndWait(() -> {
+                frame.setSize(frame.getSize().width - WIDTH_REDUCTION, frame.getSize().height);
+            });
+            frame.repaint();
+
+            EventQueue.invokeAndWait(() -> {
+                size = jtf.getSize();
+                fSize = frame.getSize();
+            });
+            System.out.println("TextField size after Frame's width reduction : " + size);
+
+            if (size.width < fSize.width - WIDTH_REDUCTION) {
+                throw new RuntimeException("Width of JTextField is too small to be visible.");
+            }
+            System.out.println("Test passed.");
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/java/awt/List/ListScrollbarCursorTest.java b/test/jdk/java/awt/List/ListScrollbarCursorTest.java
new file mode 100644
index 00000000000..fc832029b13
--- /dev/null
+++ b/test/jdk/java/awt/List/ListScrollbarCursorTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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 4290684
+ * @summary Tests that cursor on the scrollbar of the list is set to default.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ListScrollbarCursorTest
+ */
+
+import java.awt.Cursor;
+import java.awt.Frame;
+import java.awt.List;
+import java.awt.Panel;
+
+public class ListScrollbarCursorTest {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. You see the list in the middle of the panel.
+                   This list has two scrollbars.
+                2. The cursor should have a shape of hand over the main area
+                   and a shape of arrow over scrollbars.
+                3. Move the mouse cursor to either horizontal or vertical scrollbar.
+                4. Press PASS if you see the default arrow cursor else press FAIL.
+                """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ListScrollbarCursorTest::initialize)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static Frame initialize() {
+        Frame frame = new Frame("List Scrollbar Cursor Test");
+        Panel panel = new Panel();
+        List list = new List(3);
+        list.add("List item with a very long name" +
+                "(just to make the horizontal scrollbar visible)");
+        list.add("Item 2");
+        list.add("Item 3");
+        list.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        panel.add(list);
+        frame.add(panel);
+        frame.setSize(200, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/java/awt/List/ListScrollbarTest.java b/test/jdk/java/awt/List/ListScrollbarTest.java
new file mode 100644
index 00000000000..b676303b927
--- /dev/null
+++ b/test/jdk/java/awt/List/ListScrollbarTest.java
@@ -0,0 +1,197 @@
+/*
+ * 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 4096445
+ * @summary Test to verify List Scollbar appears/disappears automatically
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ListScrollbarTest
+ */
+
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Event;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.List;
+
+public class ListScrollbarTest extends Frame {
+    static final int ITEMS = 10;
+    List ltList;
+    List rtList;
+
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                1. There are two lists added to the Frame separated by
+                   a column of buttons
+                2. Double click on any item(s) on the left list, you would see
+                   a '*' added at the end of the item
+                3. Keep double clicking on the same item till the length of the
+                   item exceeds the width of the list
+                4. Now, if you don't get the horizontal scrollbar on
+                   the left list click FAIL.
+                5. If you get horizontal scrollbar, select the item
+                   (that you double clicked) and press the '>' button
+                   to move the item to the right list.
+                6. If horizontal scroll bar appears on the right list
+                   as well as disappears from the left list [only if both
+                   happen] proceed with step 8 else click FAIL
+                7. Now move the same item to the left list, by pressing
+                     '<' button
+                8. If the horizontal scrollbar appears on the left list
+                   and disappears from the right list[only if both happen]
+                   click PASS else click FAIL.
+                """;
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(ListScrollbarTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public ListScrollbarTest() {
+        super("List scroll bar test");
+        GridBagLayout gbl = new GridBagLayout();
+        ltList = new List(ITEMS, true);
+        rtList = new List(0, true);
+        setLayout(gbl);
+        add(ltList, 0, 0, 1, 5, 1.0, 1.0);
+        add(rtList, 2, 0, 1, 5, 1.0, 1.0);
+        add(new Button(">"), 1, 0, 1, 1, 0, 1.0);
+        add(new Button(">>"), 1, 1, 1, 1, 0, 1.0);
+        add(new Button("<"), 1, 2, 1, 1, 0, 1.0);
+        add(new Button("<<"), 1, 3, 1, 1, 0, 1.0);
+        add(new Button("!"), 1, 4, 1, 1, 0, 1.0);
+
+        for (int i = 0; i < ITEMS; i++) {
+            ltList.addItem("item " + i);
+        }
+        setSize(220, 250);
+    }
+
+    void add(Component comp, int x, int y, int w, int h, double weightx, double weighty) {
+        GridBagLayout gbl = (GridBagLayout) getLayout();
+        GridBagConstraints c = new GridBagConstraints();
+        c.fill = GridBagConstraints.BOTH;
+        c.gridx = x;
+        c.gridy = y;
+        c.gridwidth = w;
+        c.gridheight = h;
+        c.weightx = weightx;
+        c.weighty = weighty;
+        add(comp);
+        gbl.setConstraints(comp, c);
+    }
+
+    void reverseSelections(List l) {
+        for (int i = 0; i < l.countItems(); i++) {
+            if (l.isSelected(i)) {
+                l.deselect(i);
+            } else {
+                l.select(i);
+            }
+        }
+    }
+
+    void deselectAll(List l) {
+        for (int i = 0; i < l.countItems(); i++) {
+            l.deselect(i);
+        }
+    }
+
+    void replaceItem(List l, String item) {
+        for (int i = 0; i < l.countItems(); i++) {
+            if (l.getItem(i).equals(item)) {
+                l.replaceItem(item + "*", i);
+            }
+        }
+    }
+
+    void move(List l1, List l2, boolean all) {
+
+        // if all the items are to be moved
+        if (all) {
+            for (int i = 0; i < l1.countItems(); i++) {
+                l2.addItem(l1.getItem(i));
+            }
+            l1.delItems(0, l1.countItems() - 1);
+        } else { // else move the selected items
+            String[] items = l1.getSelectedItems();
+            int[] itemIndexes = l1.getSelectedIndexes();
+
+            deselectAll(l2);
+            for (int i = 0; i < items.length; i++) {
+                l2.addItem(items[i]);
+                l2.select(l2.countItems() - 1);
+                if (i == 0) {
+                    l2.makeVisible(l2.countItems() - 1);
+                }
+            }
+            for (int i = itemIndexes.length - 1; i >= 0; i--) {
+                l1.delItem(itemIndexes[i]);
+            }
+        }
+    }
+
+    @Override
+    public boolean action(Event evt, Object arg) {
+        if (">".equals(arg)) {
+            move(ltList, rtList, false);
+        } else if (">>".equals(arg)) {
+            move(ltList, rtList, true);
+        } else if ("<".equals(arg)) {
+            move(rtList, ltList, false);
+        } else if ("<<".equals(arg)) {
+            move(rtList, ltList, true);
+        } else if ("!".equals(arg)) {
+            if (ltList.getSelectedItems().length > 0) {
+                reverseSelections(ltList);
+            } else if (rtList.getSelectedItems().length > 0) {
+                reverseSelections(rtList);
+            }
+        } else if (evt.target == rtList || evt.target == ltList) {
+            replaceItem((List) evt.target, (String) arg);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean handleEvent(Event evt) {
+        if (evt.id == Event.LIST_SELECT
+                || evt.id == Event.LIST_DESELECT) {
+            if (evt.target == ltList) {
+                deselectAll(rtList);
+            } else if (evt.target == rtList) {
+                deselectAll(ltList);
+            }
+            return true;
+        }
+        return super.handleEvent(evt);
+    }
+}

From d783a940988677dc91975f884adeaf9f047f7e07 Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Tue, 22 Apr 2025 16:46:44 +0000
Subject: [PATCH 054/901] 8332368: ubsan aarch64: immediate_aarch64.cpp:298:31:
 runtime error: shift exponent 32 is too large for 32-bit type 'int'

Reviewed-by: adinn
---
 src/hotspot/share/adlc/output_h.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/adlc/output_h.cpp b/src/hotspot/share/adlc/output_h.cpp
index a4ab29008f0..dd149064a5a 100644
--- a/src/hotspot/share/adlc/output_h.cpp
+++ b/src/hotspot/share/adlc/output_h.cpp
@@ -870,7 +870,8 @@ void ArchDesc::declare_pipe_classes(FILE *fp_hpp) {
   fprintf(fp_hpp, "  }\n\n");
   fprintf(fp_hpp, "  void step(uint cycles) {\n");
   fprintf(fp_hpp, "    _used = 0;\n");
-  fprintf(fp_hpp, "    _mask <<= cycles;\n");
+  fprintf(fp_hpp, "    uint max_shift = 8 * sizeof(_mask) - 1;\n");
+  fprintf(fp_hpp, "    _mask <<= (cycles < max_shift) ? cycles : max_shift;\n");
   fprintf(fp_hpp, "  }\n\n");
   fprintf(fp_hpp, "  friend class Pipeline_Use;\n");
   fprintf(fp_hpp, "};\n\n");

From 594b26516e5c01d7daa331db59bdbe8ab7dc0a6d Mon Sep 17 00:00:00 2001
From: Jamil Nimeh <jnimeh@openjdk.org>
Date: Tue, 22 Apr 2025 16:49:29 +0000
Subject: [PATCH 055/901] 8350126: Regression ~3% on
 Crypto-ChaCha20Poly1305.encrypt for MacOSX aarch64

Reviewed-by: aph
---
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  16 +-
 .../aarch64/macroAssembler_aarch64_chacha.cpp | 149 +++++--
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 408 +++++++++---------
 3 files changed, 315 insertions(+), 258 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 11d1985e50b..af09f97e938 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_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.
  *
@@ -1611,11 +1611,15 @@ class MacroAssembler: public Assembler {
   void aes_round(FloatRegister input, FloatRegister subkey);
 
   // ChaCha20 functions support block
-  void cc20_quarter_round(FloatRegister aVec, FloatRegister bVec,
-          FloatRegister cVec, FloatRegister dVec, FloatRegister scratch,
-          FloatRegister tbl);
-  void cc20_shift_lane_org(FloatRegister bVec, FloatRegister cVec,
-          FloatRegister dVec, bool colToDiag);
+  void cc20_qr_add4(FloatRegister (&addFirst)[4],
+          FloatRegister (&addSecond)[4]);
+  void cc20_qr_xor4(FloatRegister (&firstElem)[4],
+          FloatRegister (&secondElem)[4], FloatRegister (&result)[4]);
+  void cc20_qr_lrot4(FloatRegister (&sourceReg)[4],
+          FloatRegister (&destReg)[4], int bits, FloatRegister table);
+  void cc20_set_qr_registers(FloatRegister (&vectorSet)[4],
+          const FloatRegister (&stateVectors)[16], int idx1, int idx2,
+          int idx3, int idx4);
 
   // Place an ISB after code may have been modified due to a safepoint.
   void safepoint_isb();
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_chacha.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_chacha.cpp
index 1f7bb8f46f6..083e81af5d9 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_chacha.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_chacha.cpp
@@ -28,60 +28,119 @@
 #include "runtime/stubRoutines.hpp"
 
 /**
- * Perform the quarter round calculations on values contained within
- * four SIMD registers.
+ * Perform the vectorized add for a group of 4 quarter round operations.
+ * In the ChaCha20 quarter round, there are two add ops: a += b and c += d.
+ * Each parameter is a set of 4 registers representing the 4 registers
+ * for the each addend in the add operation for each of the quarter rounds.
+ * (e.g. for "a" it would consist of v0/v1/v2/v3).  The result of the add
+ * is placed into the vectors in the "addFirst" array.
  *
- * @param aVec the SIMD register containing only the "a" values
- * @param bVec the SIMD register containing only the "b" values
- * @param cVec the SIMD register containing only the "c" values
- * @param dVec the SIMD register containing only the "d" values
- * @param scratch scratch SIMD register used for 12 and 7 bit left rotations
- * @param table the SIMD register used as a table for 8 bit left rotations
+ * @param addFirst array of SIMD registers representing the first addend.
+ * @param addSecond array of SIMD registers representing the second addend.
  */
-void MacroAssembler::cc20_quarter_round(FloatRegister aVec, FloatRegister bVec,
-    FloatRegister cVec, FloatRegister dVec, FloatRegister scratch,
-     FloatRegister table) {
+void MacroAssembler::cc20_qr_add4(FloatRegister (&addFirst)[4],
+    FloatRegister (&addSecond)[4]) {
+  for (int i = 0; i < 4; i++) {
+      addv(addFirst[i], T4S, addFirst[i], addSecond[i]);
+  }
+}
+
+
+/**
+ * Perform the vectorized XOR for a group of 4 quarter round operations.
+ * In the ChaCha20 quarter round, there are two XOR ops: d ^= a and b ^= c
+ * Each parameter is a set of 4 registers representing the 4 registers
+ * for the each element in the xor operation for each of the quarter rounds.
+ * (e.g. for "a" it would consist of v0/v1/v2/v3)
+ * Note: because the b ^= c ops precede a non-byte-aligned left-rotation,
+ *       there is a third parameter which can take a set of scratch registers
+ *       for the result, which facilitates doing the subsequent operations for
+ *       the left rotation.
+ *
+ * @param firstElem array of SIMD registers representing the first element.
+ * @param secondElem array of SIMD registers representing the second element.
+ * @param result array of SIMD registers representing the destination.
+ *        May be the same as firstElem or secondElem, or a separate array.
+ */
+void MacroAssembler::cc20_qr_xor4(FloatRegister (&firstElem)[4],
+    FloatRegister (&secondElem)[4], FloatRegister (&result)[4]) {
+  for (int i = 0; i < 4; i++) {
+    eor(result[i], T16B, firstElem[i], secondElem[i]);
+  }
+}
+
+/**
+ * Perform the vectorized left-rotation on 32-bit lanes for a group of
+ * 4 quarter round operations.
+ * Each parameter is a set of 4 registers representing the 4 registers
+ * for the each element in the source and destination for each of the quarter
+ * rounds (e.g. for "d" it would consist of v12/v13/v14/v15 on columns and
+ * v15/v12/v13/v14 on diagonal alignments).
+ *
+ * @param sourceReg array of SIMD registers representing the source
+ * @param destReg array of SIMD registers representing the destination
+ * @param bits the distance of the rotation in bits, must be 16/12/8/7 per
+ *        the ChaCha20 specification.
+ */
+void MacroAssembler::cc20_qr_lrot4(FloatRegister (&sourceReg)[4],
+    FloatRegister (&destReg)[4], int bits, FloatRegister table) {
+  switch (bits) {
+  case 16:      // reg <<<= 16, in-place swap of half-words
+    for (int i = 0; i < 4; i++) {
+      rev32(destReg[i], T8H, sourceReg[i]);
+    }
+    break;
 
-  // a += b, d ^= a, d <<<= 16
-  addv(aVec, T4S, aVec, bVec);
-  eor(dVec, T16B, dVec, aVec);
-  rev32(dVec, T8H, dVec);
+  case 7:       // reg <<<= (12 || 7)
+  case 12:      // r-shift src -> dest, l-shift src & ins to dest
+    for (int i = 0; i < 4; i++) {
+      ushr(destReg[i], T4S, sourceReg[i], 32 - bits);
+    }
 
-  // c += d, b ^= c, b <<<= 12
-  addv(cVec, T4S, cVec, dVec);
-  eor(scratch, T16B, bVec, cVec);
-  ushr(bVec, T4S, scratch, 20);
-  sli(bVec, T4S, scratch, 12);
+    for (int i = 0; i < 4; i++) {
+      sli(destReg[i], T4S, sourceReg[i], bits);
+    }
+    break;
 
-  // a += b, d ^= a, d <<<= 8
-  addv(aVec, T4S, aVec, bVec);
-  eor(dVec, T16B, dVec, aVec);
-  tbl(dVec, T16B, dVec,  1, table);
+  case 8:       // reg <<<= 8, simulate left rotation with table reorg
+    for (int i = 0; i < 4; i++) {
+      tbl(destReg[i], T16B, sourceReg[i], 1, table);
+    }
+    break;
 
-  // c += d, b ^= c, b <<<= 7
-  addv(cVec, T4S, cVec, dVec);
-  eor(scratch, T16B, bVec, cVec);
-  ushr(bVec, T4S, scratch, 25);
-  sli(bVec, T4S, scratch, 7);
+  default:
+    // The caller shouldn't be sending bit rotation values outside
+    // of the 16/12/8/7 as defined in the specification.
+    ShouldNotReachHere();
+  }
 }
 
 /**
- * Shift the b, c, and d vectors between columnar and diagonal representations.
- * Note that the "a" vector does not shift.
+ * Set the FloatRegisters for a 4-vector register set.  These will be used
+ * during various quarter round transformations (adds, xors and left-rotations).
+ * This method itself does not result in the output of any assembly
+ * instructions.  It just organizes the vectors so they can be in columnar or
+ * diagonal alignments.
  *
- * @param bVec the SIMD register containing only the "b" values
- * @param cVec the SIMD register containing only the "c" values
- * @param dVec the SIMD register containing only the "d" values
- * @param colToDiag true if moving columnar to diagonal, false if
- *                  moving diagonal back to columnar.
+ * @param vectorSet a 4-vector array to be altered into a new alignment
+ * @param stateVectors the 16-vector array that represents the current
+ *        working state.  The indices of this array match up with the
+ *        organization of the ChaCha20 state per RFC 7539 (e.g. stateVectors[12]
+ *        would contain the vector that holds the 32-bit counter, etc.)
+ * @param idx1 the index of the stateVectors array to be assigned to the
+ *        first vectorSet element.
+ * @param idx2 the index of the stateVectors array to be assigned to the
+ *        second vectorSet element.
+ * @param idx3 the index of the stateVectors array to be assigned to the
+ *        third vectorSet element.
+ * @param idx4 the index of the stateVectors array to be assigned to the
+ *        fourth vectorSet element.
  */
-void MacroAssembler::cc20_shift_lane_org(FloatRegister bVec, FloatRegister cVec,
-    FloatRegister dVec, bool colToDiag) {
-  int bShift = colToDiag ? 4 : 12;
-  int cShift = 8;
-  int dShift = colToDiag ? 12 : 4;
-
-  ext(bVec, T16B, bVec, bVec, bShift);
-  ext(cVec, T16B, cVec, cVec, cShift);
-  ext(dVec, T16B, dVec, dVec, dShift);
+void MacroAssembler::cc20_set_qr_registers(FloatRegister (&vectorSet)[4],
+    const FloatRegister (&stateVectors)[16], int idx1, int idx2,
+    int idx3, int idx4) {
+  vectorSet[0] = stateVectors[idx1];
+  vectorSet[1] = stateVectors[idx2];
+  vectorSet[2] = stateVectors[idx3];
+  vectorSet[3] = stateVectors[idx4];
 }
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 467505ed337..a6cc757f6a0 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -4405,89 +4405,44 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  /**
-   *  Arguments:
-   *
-   * Inputs:
-   *   c_rarg0   - int crc
-   *   c_rarg1   - byte* buf
-   *   c_rarg2   - int length
-   *
-   * Output:
-   *       rax   - int crc result
-   */
-  address generate_updateBytesCRC32() {
-    assert(UseCRC32Intrinsics, "what are we doing here?");
-
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::updateBytesCRC32_id;
-    StubCodeMark mark(this, stub_id);
-
-    address start = __ pc();
-
-    const Register crc   = c_rarg0;  // crc
-    const Register buf   = c_rarg1;  // source java byte array address
-    const Register len   = c_rarg2;  // length
-    const Register table0 = c_rarg3; // crc_table address
-    const Register table1 = c_rarg4;
-    const Register table2 = c_rarg5;
-    const Register table3 = c_rarg6;
-    const Register tmp3 = c_rarg7;
-
-    BLOCK_COMMENT("Entry:");
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-
-    __ kernel_crc32(crc, buf, len,
-              table0, table1, table2, table3, rscratch1, rscratch2, tmp3);
-
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(lr);
-
-    return start;
-  }
-
-  // ChaCha20 block function.  This version parallelizes 4 quarter
-  // round operations at a time.  It uses 16 SIMD registers to
-  // produce 4 blocks of key stream.
+  // ChaCha20 block function.  This version parallelizes the 32-bit
+  // state elements on each of 16 vectors, producing 4 blocks of
+  // keystream at a time.
   //
   // state (int[16]) = c_rarg0
   // keystream (byte[256]) = c_rarg1
-  // return - number of bytes of keystream (always 256)
+  // return - number of bytes of produced keystream (always 256)
   //
-  // In this approach, we load the 512-bit start state sequentially into
-  // 4 128-bit vectors.  We then make 4 4-vector copies of that starting
-  // state, with each successive set of 4 vectors having a +1 added into
-  // the first 32-bit lane of the 4th vector in that group (the counter).
-  // By doing this, we can perform the block function on 4 512-bit blocks
-  // within one run of this intrinsic.
-  // The alignment of the data across the 4-vector group is such that at
-  // the start it is already aligned for the first round of each two-round
-  // loop iteration.  In other words, the corresponding lanes of each vector
-  // will contain the values needed for that quarter round operation (e.g.
-  // elements 0/4/8/12, 1/5/9/13, 2/6/10/14, etc.).
-  // In between each full round, a lane shift must occur.  Within a loop
-  // iteration, between the first and second rounds, the 2nd, 3rd, and 4th
-  // vectors are rotated left 32, 64 and 96 bits, respectively.  The result
-  // is effectively a diagonal orientation in columnar form.  After the
-  // second full round, those registers are left-rotated again, this time
-  // 96, 64, and 32 bits - returning the vectors to their columnar organization.
-  // After all 10 iterations, the original state is added to each 4-vector
-  // working state along with the add mask, and the 4 vector groups are
-  // sequentially written to the memory dedicated for the output key stream.
-  //
-  // For a more detailed explanation, see Goll and Gueron, "Vectorization of
-  // ChaCha Stream Cipher", 2014 11th Int. Conf. on Information Technology:
-  // New Generations, Las Vegas, NV, USA, April 2014, DOI: 10.1109/ITNG.2014.33
-  address generate_chacha20Block_qrpar() {
-    Label L_Q_twoRounds, L_Q_cc20_const;
+  // This implementation takes each 32-bit integer from the state
+  // array and broadcasts it across all 4 32-bit lanes of a vector register
+  // (e.g. state[0] is replicated on all 4 lanes of v4, state[1] to all 4 lanes
+  // of v5, etc.).  Once all 16 elements have been broadcast onto 16 vectors,
+  // the quarter round schedule is implemented as outlined in RFC 7539 section
+  // 2.3.  However, instead of sequentially processing the 3 quarter round
+  // operations represented by one QUARTERROUND function, we instead stack all
+  // the adds, xors and left-rotations from the first 4 quarter rounds together
+  // and then do the same for the second set of 4 quarter rounds.  This removes
+  // some latency that would otherwise be incurred by waiting for an add to
+  // complete before performing an xor (which depends on the result of the
+  // add), etc. An adjustment happens between the first and second groups of 4
+  // quarter rounds, but this is done only in the inputs to the macro functions
+  // that generate the assembly instructions - these adjustments themselves are
+  // not part of the resulting assembly.
+  // The 4 registers v0-v3 are used during the quarter round operations as
+  // scratch registers.  Once the 20 rounds are complete, these 4 scratch
+  // registers become the vectors involved in adding the start state back onto
+  // the post-QR working state.  After the adds are complete, each of the 16
+  // vectors write their first lane back to the keystream buffer, followed
+  // by the second lane from all vectors and so on.
+  address generate_chacha20Block_blockpar() {
+    Label L_twoRounds, L_cc20_const;
     // The constant data is broken into two 128-bit segments to be loaded
-    // onto SIMD registers.  The first 128 bits are a counter add overlay
-    // that adds +1/+0/+0/+0 to the vectors holding replicated state[12].
+    // onto FloatRegisters.  The first 128 bits are a counter add overlay
+    // that adds +0/+1/+2/+3 to the vector holding replicated state[12].
     // The second 128-bits is a table constant used for 8-bit left rotations.
-    // on 32-bit lanes within a SIMD register.
-    __ BIND(L_Q_cc20_const);
-    __ emit_int64(0x0000000000000001UL);
-    __ emit_int64(0x0000000000000000UL);
+    __ BIND(L_cc20_const);
+    __ emit_int64(0x0000000100000000UL);
+    __ emit_int64(0x0000000300000002UL);
     __ emit_int64(0x0605040702010003UL);
     __ emit_int64(0x0E0D0C0F0A09080BUL);
 
@@ -4497,144 +4452,142 @@ class StubGenerator: public StubCodeGenerator {
     address start = __ pc();
     __ enter();
 
+    int i, j;
     const Register state = c_rarg0;
     const Register keystream = c_rarg1;
     const Register loopCtr = r10;
     const Register tmpAddr = r11;
+    const FloatRegister ctrAddOverlay = v28;
+    const FloatRegister lrot8Tbl = v29;
+
+    // Organize SIMD registers in an array that facilitates
+    // putting repetitive opcodes into loop structures.  It is
+    // important that each grouping of 4 registers is monotonically
+    // increasing to support the requirements of multi-register
+    // instructions (e.g. ld4r, st4, etc.)
+    const FloatRegister workSt[16] = {
+         v4,  v5,  v6,  v7, v16, v17, v18, v19,
+        v20, v21, v22, v23, v24, v25, v26, v27
+    };
 
-    const FloatRegister aState = v0;
-    const FloatRegister bState = v1;
-    const FloatRegister cState = v2;
-    const FloatRegister dState = v3;
-    const FloatRegister a1Vec = v4;
-    const FloatRegister b1Vec = v5;
-    const FloatRegister c1Vec = v6;
-    const FloatRegister d1Vec = v7;
-    // Skip the callee-saved registers v8 - v15
-    const FloatRegister a2Vec = v16;
-    const FloatRegister b2Vec = v17;
-    const FloatRegister c2Vec = v18;
-    const FloatRegister d2Vec = v19;
-    const FloatRegister a3Vec = v20;
-    const FloatRegister b3Vec = v21;
-    const FloatRegister c3Vec = v22;
-    const FloatRegister d3Vec = v23;
-    const FloatRegister a4Vec = v24;
-    const FloatRegister b4Vec = v25;
-    const FloatRegister c4Vec = v26;
-    const FloatRegister d4Vec = v27;
-    const FloatRegister scratch = v28;
-    const FloatRegister addMask = v29;
-    const FloatRegister lrot8Tbl = v30;
-
-    // Load the initial state in the first 4 quadword registers,
-    // then copy the initial state into the next 4 quadword registers
-    // that will be used for the working state.
-    __ ld1(aState, bState, cState, dState, __ T16B, Address(state));
-
-    // Load the index register for 2 constant 128-bit data fields.
-    // The first represents the +1/+0/+0/+0 add mask.  The second is
-    // the 8-bit left rotation.
-    __ adr(tmpAddr, L_Q_cc20_const);
-    __ ldpq(addMask, lrot8Tbl, Address(tmpAddr));
-
-    __ mov(a1Vec, __ T16B, aState);
-    __ mov(b1Vec, __ T16B, bState);
-    __ mov(c1Vec, __ T16B, cState);
-    __ mov(d1Vec, __ T16B, dState);
-
-    __ mov(a2Vec, __ T16B, aState);
-    __ mov(b2Vec, __ T16B, bState);
-    __ mov(c2Vec, __ T16B, cState);
-    __ addv(d2Vec, __ T4S, d1Vec, addMask);
-
-    __ mov(a3Vec, __ T16B, aState);
-    __ mov(b3Vec, __ T16B, bState);
-    __ mov(c3Vec, __ T16B, cState);
-    __ addv(d3Vec, __ T4S, d2Vec, addMask);
-
-    __ mov(a4Vec, __ T16B, aState);
-    __ mov(b4Vec, __ T16B, bState);
-    __ mov(c4Vec, __ T16B, cState);
-    __ addv(d4Vec, __ T4S, d3Vec, addMask);
-
-    // Set up the 10 iteration loop
+    // Pull in constant data.  The first 16 bytes are the add overlay
+    // which is applied to the vector holding the counter (state[12]).
+    // The second 16 bytes is the index register for the 8-bit left
+    // rotation tbl instruction.
+    __ adr(tmpAddr, L_cc20_const);
+    __ ldpq(ctrAddOverlay, lrot8Tbl, Address(tmpAddr));
+
+    // Load from memory and interlace across 16 SIMD registers,
+    // With each word from memory being broadcast to all lanes of
+    // each successive SIMD register.
+    //      Addr(0) -> All lanes in workSt[i]
+    //      Addr(4) -> All lanes workSt[i + 1], etc.
+    __ mov(tmpAddr, state);
+    for (i = 0; i < 16; i += 4) {
+      __ ld4r(workSt[i], workSt[i + 1], workSt[i + 2], workSt[i + 3], __ T4S,
+          __ post(tmpAddr, 16));
+    }
+    __ addv(workSt[12], __ T4S, workSt[12], ctrAddOverlay); // Add ctr overlay
+
+    // Before entering the loop, create 5 4-register arrays.  These
+    // will hold the 4 registers that represent the a/b/c/d fields
+    // in the quarter round operation.  For instance the "b" field
+    // for the first 4 quarter round operations is the set of v16/v17/v18/v19,
+    // but in the second 4 quarter rounds it gets adjusted to v17/v18/v19/v16
+    // since it is part of a diagonal organization.  The aSet and scratch
+    // register sets are defined at declaration time because they do not change
+    // organization at any point during the 20-round processing.
+    FloatRegister aSet[4] = { v4, v5, v6, v7 };
+    FloatRegister bSet[4];
+    FloatRegister cSet[4];
+    FloatRegister dSet[4];
+    FloatRegister scratch[4] = { v0, v1, v2, v3 };
+
+    // Set up the 10 iteration loop and perform all 8 quarter round ops
     __ mov(loopCtr, 10);
-    __ BIND(L_Q_twoRounds);
-
-    // The first set of operations on the vectors covers the first 4 quarter
-    // round operations:
-    //  Qround(state, 0, 4, 8,12)
-    //  Qround(state, 1, 5, 9,13)
-    //  Qround(state, 2, 6,10,14)
-    //  Qround(state, 3, 7,11,15)
-    __ cc20_quarter_round(a1Vec, b1Vec, c1Vec, d1Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a2Vec, b2Vec, c2Vec, d2Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a3Vec, b3Vec, c3Vec, d3Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a4Vec, b4Vec, c4Vec, d4Vec, scratch, lrot8Tbl);
-
-    // Shuffle the b1Vec/c1Vec/d1Vec to reorganize the state vectors to
-    // diagonals. The a1Vec does not need to change orientation.
-    __ cc20_shift_lane_org(b1Vec, c1Vec, d1Vec, true);
-    __ cc20_shift_lane_org(b2Vec, c2Vec, d2Vec, true);
-    __ cc20_shift_lane_org(b3Vec, c3Vec, d3Vec, true);
-    __ cc20_shift_lane_org(b4Vec, c4Vec, d4Vec, true);
-
-    // The second set of operations on the vectors covers the second 4 quarter
-    // round operations, now acting on the diagonals:
-    //  Qround(state, 0, 5,10,15)
-    //  Qround(state, 1, 6,11,12)
-    //  Qround(state, 2, 7, 8,13)
-    //  Qround(state, 3, 4, 9,14)
-    __ cc20_quarter_round(a1Vec, b1Vec, c1Vec, d1Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a2Vec, b2Vec, c2Vec, d2Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a3Vec, b3Vec, c3Vec, d3Vec, scratch, lrot8Tbl);
-    __ cc20_quarter_round(a4Vec, b4Vec, c4Vec, d4Vec, scratch, lrot8Tbl);
-
-    // Before we start the next iteration, we need to perform shuffles
-    // on the b/c/d vectors to move them back to columnar organizations
-    // from their current diagonal orientation.
-    __ cc20_shift_lane_org(b1Vec, c1Vec, d1Vec, false);
-    __ cc20_shift_lane_org(b2Vec, c2Vec, d2Vec, false);
-    __ cc20_shift_lane_org(b3Vec, c3Vec, d3Vec, false);
-    __ cc20_shift_lane_org(b4Vec, c4Vec, d4Vec, false);
+    __ BIND(L_twoRounds);
+
+    // Set to columnar organization and do the following 4 quarter-rounds:
+    // QUARTERROUND(0, 4, 8, 12)
+    // QUARTERROUND(1, 5, 9, 13)
+    // QUARTERROUND(2, 6, 10, 14)
+    // QUARTERROUND(3, 7, 11, 15)
+    __ cc20_set_qr_registers(bSet, workSt, 4, 5, 6, 7);
+    __ cc20_set_qr_registers(cSet, workSt, 8, 9, 10, 11);
+    __ cc20_set_qr_registers(dSet, workSt, 12, 13, 14, 15);
+
+    __ cc20_qr_add4(aSet, bSet);                    // a += b
+    __ cc20_qr_xor4(dSet, aSet, dSet);              // d ^= a
+    __ cc20_qr_lrot4(dSet, dSet, 16, lrot8Tbl);     // d <<<= 16
+
+    __ cc20_qr_add4(cSet, dSet);                    // c += d
+    __ cc20_qr_xor4(bSet, cSet, scratch);           // b ^= c (scratch)
+    __ cc20_qr_lrot4(scratch, bSet, 12, lrot8Tbl);  // b <<<= 12
+
+    __ cc20_qr_add4(aSet, bSet);                    // a += b
+    __ cc20_qr_xor4(dSet, aSet, dSet);              // d ^= a
+    __ cc20_qr_lrot4(dSet, dSet, 8, lrot8Tbl);      // d <<<= 8
+
+    __ cc20_qr_add4(cSet, dSet);                    // c += d
+    __ cc20_qr_xor4(bSet, cSet, scratch);           // b ^= c (scratch)
+    __ cc20_qr_lrot4(scratch, bSet, 7, lrot8Tbl);   // b <<<= 12
+
+    // Set to diagonal organization and do the next 4 quarter-rounds:
+    // QUARTERROUND(0, 5, 10, 15)
+    // QUARTERROUND(1, 6, 11, 12)
+    // QUARTERROUND(2, 7, 8, 13)
+    // QUARTERROUND(3, 4, 9, 14)
+    __ cc20_set_qr_registers(bSet, workSt, 5, 6, 7, 4);
+    __ cc20_set_qr_registers(cSet, workSt, 10, 11, 8, 9);
+    __ cc20_set_qr_registers(dSet, workSt, 15, 12, 13, 14);
+
+    __ cc20_qr_add4(aSet, bSet);                    // a += b
+    __ cc20_qr_xor4(dSet, aSet, dSet);              // d ^= a
+    __ cc20_qr_lrot4(dSet, dSet, 16, lrot8Tbl);     // d <<<= 16
+
+    __ cc20_qr_add4(cSet, dSet);                    // c += d
+    __ cc20_qr_xor4(bSet, cSet, scratch);           // b ^= c (scratch)
+    __ cc20_qr_lrot4(scratch, bSet, 12, lrot8Tbl);  // b <<<= 12
+
+    __ cc20_qr_add4(aSet, bSet);                    // a += b
+    __ cc20_qr_xor4(dSet, aSet, dSet);              // d ^= a
+    __ cc20_qr_lrot4(dSet, dSet, 8, lrot8Tbl);      // d <<<= 8
+
+    __ cc20_qr_add4(cSet, dSet);                    // c += d
+    __ cc20_qr_xor4(bSet, cSet, scratch);           // b ^= c (scratch)
+    __ cc20_qr_lrot4(scratch, bSet, 7, lrot8Tbl);   // b <<<= 12
 
     // Decrement and iterate
     __ sub(loopCtr, loopCtr, 1);
-    __ cbnz(loopCtr, L_Q_twoRounds);
-
-    // Once the counter reaches zero, we fall out of the loop
-    // and need to add the initial state back into the working state
-    // represented by the a/b/c/d1Vec registers.  This is destructive
-    // on the dState register but we no longer will need it.
-    __ addv(a1Vec, __ T4S, a1Vec, aState);
-    __ addv(b1Vec, __ T4S, b1Vec, bState);
-    __ addv(c1Vec, __ T4S, c1Vec, cState);
-    __ addv(d1Vec, __ T4S, d1Vec, dState);
-
-    __ addv(a2Vec, __ T4S, a2Vec, aState);
-    __ addv(b2Vec, __ T4S, b2Vec, bState);
-    __ addv(c2Vec, __ T4S, c2Vec, cState);
-    __ addv(dState, __ T4S, dState, addMask);
-    __ addv(d2Vec, __ T4S, d2Vec, dState);
-
-    __ addv(a3Vec, __ T4S, a3Vec, aState);
-    __ addv(b3Vec, __ T4S, b3Vec, bState);
-    __ addv(c3Vec, __ T4S, c3Vec, cState);
-    __ addv(dState, __ T4S, dState, addMask);
-    __ addv(d3Vec, __ T4S, d3Vec, dState);
-
-    __ addv(a4Vec, __ T4S, a4Vec, aState);
-    __ addv(b4Vec, __ T4S, b4Vec, bState);
-    __ addv(c4Vec, __ T4S, c4Vec, cState);
-    __ addv(dState, __ T4S, dState, addMask);
-    __ addv(d4Vec, __ T4S, d4Vec, dState);
-
-    // Write the final state back to the result buffer
-    __ st1(a1Vec, b1Vec, c1Vec, d1Vec, __ T16B, __ post(keystream, 64));
-    __ st1(a2Vec, b2Vec, c2Vec, d2Vec, __ T16B, __ post(keystream, 64));
-    __ st1(a3Vec, b3Vec, c3Vec, d3Vec, __ T16B, __ post(keystream, 64));
-    __ st1(a4Vec, b4Vec, c4Vec, d4Vec, __ T16B, __ post(keystream, 64));
+    __ cbnz(loopCtr, L_twoRounds);
+
+    __ mov(tmpAddr, state);
+
+    // Add the starting state back to the post-loop keystream
+    // state.  We read/interlace the state array from memory into
+    // 4 registers similar to what we did in the beginning.  Then
+    // add the counter overlay onto workSt[12] at the end.
+    for (i = 0; i < 16; i += 4) {
+      __ ld4r(v0, v1, v2, v3, __ T4S, __ post(tmpAddr, 16));
+      __ addv(workSt[i], __ T4S, workSt[i], v0);
+      __ addv(workSt[i + 1], __ T4S, workSt[i + 1], v1);
+      __ addv(workSt[i + 2], __ T4S, workSt[i + 2], v2);
+      __ addv(workSt[i + 3], __ T4S, workSt[i + 3], v3);
+    }
+    __ addv(workSt[12], __ T4S, workSt[12], ctrAddOverlay); // Add ctr overlay
+
+    // Write working state into the keystream buffer.  This is accomplished
+    // by taking the lane "i" from each of the four vectors and writing
+    // it to consecutive 4-byte offsets, then post-incrementing by 16 and
+    // repeating with the next 4 vectors until all 16 vectors have been used.
+    // Then move to the next lane and repeat the process until all lanes have
+    // been written.
+    for (i = 0; i < 4; i++) {
+      for (j = 0; j < 16; j += 4) {
+        __ st4(workSt[j], workSt[j + 1], workSt[j + 2], workSt[j + 3], __ S, i,
+            __ post(keystream, 16));
+      }
+    }
 
     __ mov(r0, 256);             // Return length of output keystream
     __ leave();
@@ -7008,6 +6961,47 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  /**
+   *  Arguments:
+   *
+   * Inputs:
+   *   c_rarg0   - int crc
+   *   c_rarg1   - byte* buf
+   *   c_rarg2   - int length
+   *
+   * Output:
+   *       rax   - int crc result
+   */
+  address generate_updateBytesCRC32() {
+    assert(UseCRC32Intrinsics, "what are we doing here?");
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::updateBytesCRC32_id;
+    StubCodeMark mark(this, stub_id);
+
+    address start = __ pc();
+
+    const Register crc   = c_rarg0;  // crc
+    const Register buf   = c_rarg1;  // source java byte array address
+    const Register len   = c_rarg2;  // length
+    const Register table0 = c_rarg3; // crc_table address
+    const Register table1 = c_rarg4;
+    const Register table2 = c_rarg5;
+    const Register table3 = c_rarg6;
+    const Register tmp3 = c_rarg7;
+
+    BLOCK_COMMENT("Entry:");
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    __ kernel_crc32(crc, buf, len,
+              table0, table1, table2, table3, rscratch1, rscratch2, tmp3);
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ ret(lr);
+
+    return start;
+  }
+
   /**
    *  Arguments:
    *
@@ -11403,7 +11397,7 @@ class StubGenerator: public StubCodeGenerator {
 #endif // COMPILER2
 
     if (UseChaCha20Intrinsics) {
-      StubRoutines::_chacha20Block = generate_chacha20Block_qrpar();
+      StubRoutines::_chacha20Block = generate_chacha20Block_blockpar();
     }
 
     if (UseKyberIntrinsics) {

From e020752ea4a6f74c321bc83597fadac51332e188 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 22 Apr 2025 16:55:11 +0000
Subject: [PATCH 056/901] 8354484: SIGSEGV when supertype of an AOT-cached
 class is excluded

Reviewed-by: ccheung, shade
---
 src/hotspot/share/cds/aotArtifactFinder.cpp | 29 +++++++++++++++++++--
 src/hotspot/share/cds/aotArtifactFinder.hpp |  1 +
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 95d242c2089..65eb06ca7f0 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -207,11 +207,36 @@ void AOTArtifactFinder::add_aot_inited_class(InstanceKlass* ik) {
   }
 }
 
+void AOTArtifactFinder::append_to_all_cached_classes(Klass* k) {
+  precond(!SystemDictionaryShared::should_be_excluded(k));
+  _all_cached_classes->append(k);
+}
+
 void AOTArtifactFinder::add_cached_instance_class(InstanceKlass* ik) {
+  if (CDSConfig::is_dumping_dynamic_archive() && ik->is_shared()) {
+    // This class is already included in the base archive. No need to cache
+    // it again in the dynamic archive.
+    return;
+  }
+
   bool created;
   _seen_classes->put_if_absent(ik, &created);
   if (created) {
-    _all_cached_classes->append(ik);
+    append_to_all_cached_classes(ik);
+
+    // All super types must be added.
+    InstanceKlass* s = ik->java_super();
+    if (s != nullptr) {
+      add_cached_instance_class(s);
+    }
+
+    Array<InstanceKlass*>* interfaces = ik->local_interfaces();
+    int len = interfaces->length();
+    for (int i = 0; i < len; i++) {
+      InstanceKlass* intf = interfaces->at(i);
+      add_cached_instance_class(intf);
+    }
+
     if (CDSConfig::is_dumping_final_static_archive() && ik->is_shared_unregistered_class()) {
       // The following are not appliable to unregistered classes
       return;
@@ -229,7 +254,7 @@ void AOTArtifactFinder::add_cached_type_array_class(TypeArrayKlass* tak) {
   bool created;
   _seen_classes->put_if_absent(tak, &created);
   if (created) {
-    _all_cached_classes->append(tak);
+    append_to_all_cached_classes(tak);
     scan_oops_in_array_class(tak);
   }
 }
diff --git a/src/hotspot/share/cds/aotArtifactFinder.hpp b/src/hotspot/share/cds/aotArtifactFinder.hpp
index d890d874af9..5d293f20af0 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.hpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.hpp
@@ -79,6 +79,7 @@ class AOTArtifactFinder : AllStatic {
   static void scan_oops_in_array_class(ArrayKlass* ak);
   static void add_cached_type_array_class(TypeArrayKlass* tak);
   static void add_cached_instance_class(InstanceKlass* ik);
+  static void append_to_all_cached_classes(Klass* k);
 public:
   static void initialize();
   static void find_artifacts();

From f98af0ad617a445362859e58af48258bfd5bed03 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Tue, 22 Apr 2025 17:31:31 +0000
Subject: [PATCH 057/901] 8354701: Open source few JToolTip tests

Reviewed-by: honkar
---
 .../jdk/javax/swing/JToolTip/TooltipTest.java | 90 +++++++++++++++++++
 test/jdk/javax/swing/JToolTip/bug4225314.java | 72 +++++++++++++++
 test/jdk/javax/swing/JToolTip/bug4255441.java | 64 +++++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 test/jdk/javax/swing/JToolTip/TooltipTest.java
 create mode 100644 test/jdk/javax/swing/JToolTip/bug4225314.java
 create mode 100644 test/jdk/javax/swing/JToolTip/bug4255441.java

diff --git a/test/jdk/javax/swing/JToolTip/TooltipTest.java b/test/jdk/javax/swing/JToolTip/TooltipTest.java
new file mode 100644
index 00000000000..c081730a8d7
--- /dev/null
+++ b/test/jdk/javax/swing/JToolTip/TooltipTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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 4207474 4218495 4375928
+ * @summary Tests various tooltip issues: HTML tooltips, long tooltip text
+ *          and mnemonic keys displayed in tooltips
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TooltipTest
+ */
+
+import java.awt.FlowLayout;
+import java.awt.event.KeyEvent;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+
+public class TooltipTest {
+    private static final String INSTRUCTIONS = """
+        1.  Move the mouse over the button labeled "Red tip" and let it stay
+            still in order to test HTML in JToolTip. If the tooltip has some
+            text which is red then test passes, otherwise it fails (bug 4207474).
+
+        2.  Move the mouse over the button labeled "Long tip".
+            If the last letter of the tooltip appears clipped,
+            then the test fails. If you can see the entire last character,
+            then the test passes (bug 4218495).
+
+        3.  Verify that "M" is underlined on the button labeled "Mnemonic"
+            Move the mouse pointer over the button labeled "Mnemonic" and look
+            at tooltip when it appears. It should read "hint".
+            If the above is true test passes else test fails (bug 4375928).
+        """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+
+        PassFailJFrame.builder()
+                .title("TooltipTest Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(TooltipTest::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JComponent createTestUI() {
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout());
+
+        JButton b = new JButton("Red tip");
+        b.setToolTipText("<html><center>Here is some <font color=red>" +
+                "red</font> text.</center></html>");
+        panel.add(b);
+
+        b = new JButton("Long tip");
+        b.setToolTipText("Is the last letter clipped?");
+        panel.add(b);
+
+        b = new JButton("Mnemonic");
+        b.setMnemonic(KeyEvent.VK_M);
+        b.setToolTipText("hint");
+        panel.add(b);
+
+        return panel;
+    }
+}
diff --git a/test/jdk/javax/swing/JToolTip/bug4225314.java b/test/jdk/javax/swing/JToolTip/bug4225314.java
new file mode 100644
index 00000000000..d36bd461272
--- /dev/null
+++ b/test/jdk/javax/swing/JToolTip/bug4225314.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 4225314
+ * @summary Tests that tooltip is painted properly when it has thick border
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4225314
+ */
+
+import java.awt.Color;
+import java.awt.FlowLayout;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JToolTip;
+import javax.swing.border.LineBorder;
+
+public class bug4225314 {
+    private static final String INSTRUCTIONS = """
+            The word "Tooltip" in both tooltips should not be clipped by the
+            black border and be fully visible for this test to pass.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4225314 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4225314::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JComponent createTestUI() {
+        JToolTip tt1 = new JToolTip();
+        tt1.setTipText("Tooltip");
+        tt1.setBorder(new LineBorder(Color.BLACK, 10));
+
+        JToolTip tt2 = new JToolTip();
+        tt2.setTipText("<html><b><i>Tooltip</i></b></html>");
+        tt2.setBorder(new LineBorder(Color.BLACK, 10));
+
+        JPanel panel = new JPanel();
+        panel.setLayout(new FlowLayout());
+        panel.add(tt1);
+        panel.add(tt2);
+
+        return panel;
+    }
+}
diff --git a/test/jdk/javax/swing/JToolTip/bug4255441.java b/test/jdk/javax/swing/JToolTip/bug4255441.java
new file mode 100644
index 00000000000..4a90c975502
--- /dev/null
+++ b/test/jdk/javax/swing/JToolTip/bug4255441.java
@@ -0,0 +1,64 @@
+/*
+ * 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 4255441
+ * @summary Tests that tooltip appears inside AWT Frame
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4255441
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import javax.swing.JButton;
+
+public class bug4255441 {
+    private static final String INSTRUCTIONS = """
+            Move mouse pointer inside the button.
+            If a tooltip with "Tooltip text" appears, the test passes.
+            """;
+
+    private static Frame createTestUI() {
+        Frame fr = new Frame("bug4255441");
+        fr.setLayout(new FlowLayout());
+
+        JButton bt = new JButton("Button");
+        bt.setToolTipText("Tooltip text");
+        fr.add(bt);
+
+        fr.setSize(200, 200);
+        return fr;
+    }
+
+    public static void main(String[] argv) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4255441 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4255441::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+}

From 486a66469bc0c814d07e03ce0e7231b408a4d579 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 22 Apr 2025 17:49:52 +0000
Subject: [PATCH 058/901] 8353486: Open source Swing Tests - Set 4

Reviewed-by: azvegint, dnguyen, tr
---
 .../javax/swing/JFileChooser/bug4464774.java  |  62 +++++++++
 .../javax/swing/JFileChooser/bug4522756.java  |  64 +++++++++
 .../javax/swing/JFileChooser/bug4759934.java  | 124 ++++++++++++++++++
 .../javax/swing/JFileChooser/bug4943900.java  | 118 +++++++++++++++++
 .../javax/swing/JOptionPane/bug4194862.java   |  94 +++++++++++++
 5 files changed, 462 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4464774.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4522756.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4759934.java
 create mode 100644 test/jdk/javax/swing/JFileChooser/bug4943900.java
 create mode 100644 test/jdk/javax/swing/JOptionPane/bug4194862.java

diff --git a/test/jdk/javax/swing/JFileChooser/bug4464774.java b/test/jdk/javax/swing/JFileChooser/bug4464774.java
new file mode 100644
index 00000000000..368063e46cd
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4464774.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4464774
+ * @requires (os.family == "windows")
+ * @summary JFileChooser: selection of left-side folder buttons shown incorrectly
+            in Windows L&F
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4464774
+ */
+
+import javax.swing.JFileChooser;
+import javax.swing.UIManager;
+
+public class bug4464774 {
+    private static final String INSTRUCTIONS = """
+            Click any button from the buttons to the left
+            ("Documents", "Desktop", "My Computer" etc.) in FileChooser dialog.
+            When the button is toggled, it should be lowered and
+            should NOT have focus painted inside it (black dotted frame).
+
+            If the above is true, press PASS else FAIL.
+            """;
+
+    public static void main(String[] argv) throws Exception {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(65)
+                .rows(10)
+                .testUI(() -> {
+                    JFileChooser jfc = new JFileChooser();
+                    jfc.setControlButtonsAreShown(false);
+                    return jfc;
+                })
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug4522756.java b/test/jdk/javax/swing/JFileChooser/bug4522756.java
new file mode 100644
index 00000000000..87c430cfb1d
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4522756.java
@@ -0,0 +1,64 @@
+/*
+ * 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 4522756
+ * @requires (os.family == "windows")
+ * @summary Verifies that the Desktop icon is not missing when
+            JFileChooser is opened for the first time.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4522756
+ */
+
+import javax.swing.JFileChooser;
+import javax.swing.UIManager;
+
+public class bug4522756 {
+    private static final String INSTRUCTIONS = """
+            Verify the following:
+
+            1. If Desktop icon image is present on the Desktop button
+               on the left panel of JFileChooser.
+            2. Press Desktop button. Check that you actually
+               go up to the desktop.
+
+            If the above is true, press PASS else FAIL.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .rows(12)
+                .testUI(() -> {
+                    JFileChooser jfc = new JFileChooser();
+                    jfc.setControlButtonsAreShown(false);
+                    return jfc;
+                })
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug4759934.java b/test/jdk/javax/swing/JFileChooser/bug4759934.java
new file mode 100644
index 00000000000..08ccdebfb2b
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4759934.java
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @key headful
+ * @bug 4759934
+ * @summary windows activation problem
+ * @library /javax/swing/regtesthelpers
+ * @build Util
+ * @run main bug4759934
+ */
+
+import java.awt.Dialog;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+public class bug4759934 {
+    private static JFrame fr;
+    private static Dialog dlg;
+    private static JFileChooser jfc;
+
+    private static JButton frameBtn;
+    private static JButton dialogBtn;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoWaitForIdle(true);
+            robot.setAutoDelay(50);
+
+            SwingUtilities.invokeAndWait(bug4759934::createTestUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            Point frameBtnLoc = Util.getCenterPoint(frameBtn);
+            robot.mouseMove(frameBtnLoc.x, frameBtnLoc.y);
+            robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+            robot.delay(500);
+
+            Point dlgBtnLoc = Util.getCenterPoint(dialogBtn);
+            robot.mouseMove(dlgBtnLoc.x , dlgBtnLoc.y);
+            robot.mousePress(MouseEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
+            robot.delay(500);
+
+            robot.keyPress(KeyEvent.VK_ESCAPE);
+            robot.keyRelease(KeyEvent.VK_ESCAPE);
+            robot.delay(500);
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (frameBtn.hasFocus() && !dialogBtn.hasFocus()) {
+                    throw new RuntimeException("Test failed! Focus was passed back" +
+                            " to Frame instead of Dialog");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (dlg != null) {
+                    dlg.dispose();
+                }
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createTestUI() {
+        fr = new JFrame("bug4759934 - JFrame");
+
+        frameBtn = new JButton("Show Dialog");
+        frameBtn.addActionListener(e -> createDialog());
+        fr.add(frameBtn);
+
+        fr.setSize(300, 200);
+        fr.setLocationRelativeTo(null);
+        fr.setVisible(true);
+    }
+
+    private static void createDialog() {
+        dlg = new JDialog(fr, "bug4759934 - JDialog");
+
+        dialogBtn = new JButton("Show FileChooser");
+        dlg.add(dialogBtn);
+
+        dialogBtn.addActionListener(e -> {
+            jfc = new JFileChooser();
+            jfc.showOpenDialog(dlg);
+        });
+
+        dlg.setSize(300, 200);
+        dlg.setLocation(fr.getX() + fr.getWidth() + 10, fr.getY());
+        dlg.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JFileChooser/bug4943900.java b/test/jdk/javax/swing/JFileChooser/bug4943900.java
new file mode 100644
index 00000000000..0cea17e764c
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/bug4943900.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4943900
+ * @summary Tests that FileFilter combo box is shown in FileChooser
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4943900
+ */
+
+import java.io.File;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+import javax.swing.filechooser.FileFilter;
+
+public class bug4943900 {
+    private static final String INSTRUCTIONS = """
+        <html>
+        <ol>
+        <li>When the test runs, a <code>JFileChooser</code> will be displayed.
+        <li>Ensure that there is a filter combo box with these two items:
+          <ul>
+          <li><b>Text Files (*.txt)</b>
+              &mdash; <em>[must be selected when the dialog opens]</em>
+          <li><b>All Files</b>
+          </ul>
+        <li>Leave the <b>Text files</b> item selected and check that the
+        filter works: only <code>*.txt</code> files can appear in the file list.
+        You can navigate directories in the file chooser and find one
+        that contains some <code>*.txt</code> files to ensure they are shown in
+        the file list. On macOS when the text filter is applied verify
+        that the non-text files are greyed out.
+        <li>Try switching the filters and ensure that the file list
+        is updated properly.
+        <li>If the <code>FileFilter</code> works correctly,
+            press <b>Pass</b> else press <b>Fail</b>.
+        </ol>
+        </html>
+        """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+
+        PassFailJFrame.builder()
+                .title("bug4943900 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .rows(14)
+                .columns(50)
+                .testUI(bug4943900::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createAndShowUI() {
+        JFileChooser fc = new JFileChooser();
+        fc.setControlButtonsAreShown(false);
+        TextFileFilter filter = new TextFileFilter();
+        fc.setFileFilter(filter);
+
+        JFrame frame = new JFrame("bug4943900 - JFileChooser");
+        frame.add(fc);
+        frame.pack();
+        return frame;
+    }
+
+    private static final class TextFileFilter extends FileFilter {
+        @Override
+        public boolean accept(File f) {
+            if (f != null) {
+                if (f.isDirectory()) {
+                    return true;
+                }
+                String extension = getExtension(f);
+                return extension != null && extension.equals("txt");
+            }
+            return false;
+        }
+
+        @Override
+        public String getDescription() {
+            return "Text Files (*.txt)";
+        }
+
+        private static String getExtension(File f) {
+            if (f != null) {
+                String filename = f.getName();
+                int i = filename.lastIndexOf('.');
+                if (i > 0 && i < filename.length() - 1) {
+                    return filename.substring(i + 1).toLowerCase();
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JOptionPane/bug4194862.java b/test/jdk/javax/swing/JOptionPane/bug4194862.java
new file mode 100644
index 00000000000..2a2822ebf1d
--- /dev/null
+++ b/test/jdk/javax/swing/JOptionPane/bug4194862.java
@@ -0,0 +1,94 @@
+/*
+ * 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 4194862
+ * @summary Tests that internal frame-based dialogs are centered relative
+            to their parents
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4194862
+ */
+
+import javax.swing.JButton;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
+
+public class bug4194862 {
+    private static final String INSTRUCTIONS = """
+            In the internal frame titled "Main",
+            click the "Show JOptionPane Dialog" button.
+            A dialog will appear. It should be centered with
+            respect to the JInternalFrame - "Main".
+
+            If the above is true then click on JOptionPane's "YES" button
+            to PASS else click JOptionPane's "NO" button to FAIL the test.
+            """;
+
+    public static void main(String[] args) throws Exception{
+        PassFailJFrame.builder()
+                .title("Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4194862::createAndShowUI)
+                .screenCapture()
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createAndShowUI() {
+        JFrame frame = new JFrame("bug4194862 - JInternalFrame JOptionPane");
+        JDesktopPane desktop = new JDesktopPane();
+        frame.add(desktop);
+        JInternalFrame jInternalFrame = new JInternalFrame("Main", true);
+        desktop.add(jInternalFrame);
+        jInternalFrame.setBounds(5, 30, 390, 240);
+        jInternalFrame.setVisible(true);
+
+        JButton b = new JButton("Show JOptionPane Dialog");
+        b.addActionListener(e -> {
+            int retVal = JOptionPane.showInternalConfirmDialog(
+                                      jInternalFrame, "Am I centered?",
+                                      "bug4194862 JOptionPane", JOptionPane.YES_NO_OPTION);
+            switch (retVal) {
+                case JOptionPane.YES_OPTION -> PassFailJFrame.forcePass();
+                case JOptionPane.NO_OPTION ->
+                        PassFailJFrame.forceFail("JOptionPane isn't centered"
+                                + " within JInternalFrame \"Main\"");
+            }
+        });
+        jInternalFrame.add(b);
+
+        for (int i = 0; i < 4; i++) {
+            JInternalFrame f = new JInternalFrame("JIF: "+ i);
+            f.setBounds(i * 50, i * 33, 120, 120);
+            f.setVisible(true);
+            desktop.add(f);
+        }
+        frame.setSize(450, 400);
+        return frame;
+    }
+}

From d61765f64d6361b6e71c6f783c8c5a127b1ac745 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 22 Apr 2025 17:56:04 +0000
Subject: [PATCH 059/901] 8353488: Open some JComboBox bugs 3

Reviewed-by: kizune
---
 .../jdk/javax/swing/JComboBox/bug4135833.java | 62 ++++++++++++
 .../jdk/javax/swing/JComboBox/bug4171819.java | 89 +++++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4248128.java | 80 ++++++++++++++++
 .../jdk/javax/swing/JComboBox/bug4436376.java | 95 +++++++++++++++++++
 4 files changed, 326 insertions(+)
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4135833.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4171819.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4248128.java
 create mode 100644 test/jdk/javax/swing/JComboBox/bug4436376.java

diff --git a/test/jdk/javax/swing/JComboBox/bug4135833.java b/test/jdk/javax/swing/JComboBox/bug4135833.java
new file mode 100644
index 00000000000..3b2888c862d
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4135833.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @bug 4135833
+ * @summary Tests that JComboBox draws correctly if the first item in list is an empty string
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4135833
+ */
+
+public class bug4135833 {
+    private static final String INSTRUCTIONS = """
+            Press the combo box. If the popup is readable and appears to be sized properly,
+            then it passes. The First item is blank intentionally.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4135833::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4135833");
+        JPanel panel = new JPanel();
+        JComboBox comboBox = new JComboBox(new Object[]{"", "Bob", "Hank", "Joe", "Fred"});
+        panel.add(comboBox);
+        frame.add(panel);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4171819.java b/test/jdk/javax/swing/JComboBox/bug4171819.java
new file mode 100644
index 00000000000..108512edf7e
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4171819.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 4171819
+ * @summary Tests that JComboBox uses a lower bevel border in windows
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4171819
+ */
+
+public class bug4171819 {
+    static boolean lafOk = true;
+
+    private static final String INSTRUCTIONS = """
+            This test is for Windows L&F only. If you see
+            "No Windows L&F installed" label just press "Pass".
+
+            Look at the combo box.  If the border around it looks like it's
+            lowered rather than raised, it passes the test.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(50)
+                .testUI(bug4171819::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame createTestUI() {
+        try {
+            UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+            System.out.println("succeeded");
+        } catch (Exception e) {
+            System.err.println("Couldn't load the Windows Look and Feel");
+            lafOk = false;
+        }
+
+        JFrame frame = new JFrame("bug4171819");
+        JPanel panel = new JPanel();
+        JComboBox comboBox;
+
+        if (lafOk) {
+            comboBox = new JComboBox(new Object[]{
+                    "Coma Berenices",
+                    "Triangulum",
+                    "Camelopardis",
+                    "Cassiopea"});
+            panel.add(comboBox);
+        } else {
+            JLabel label = new JLabel("No Windows L&F installed");
+            panel.add(label);
+        }
+        frame.add(panel);
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4248128.java b/test/jdk/javax/swing/JComboBox/bug4248128.java
new file mode 100644
index 00000000000..311cae4b61a
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4248128.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import javax.swing.BoxLayout;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4248128 7148092
+ * @summary Tests that alt+down arrow pulls down JComboBox popup
+ * @key headful
+ * @run main bug4248128
+ */
+
+public class bug4248128 {
+    static JFrame frame;
+    static volatile JComboBox combo;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+
+            robot.keyPress(KeyEvent.VK_ALT);
+            robot.keyPress(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_DOWN);
+            robot.keyRelease(KeyEvent.VK_ALT);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (!combo.isPopupVisible()) {
+                    throw new RuntimeException("Popup did not appear.");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("4248128 Test");
+        Object[] fruits = {"Banana", "Pear", "Apple"};
+        combo = new JComboBox(fruits);
+        frame.setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.X_AXIS));
+        frame.add(combo);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/JComboBox/bug4436376.java b/test/jdk/javax/swing/JComboBox/bug4436376.java
new file mode 100644
index 00000000000..064efe8c958
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/bug4436376.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.event.InputEvent;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 4436376
+ * @key headful
+ * @summary Tests that ComboBox items can't be deselected with Ctrl+click
+ * @run main bug4436376
+ */
+
+public class bug4436376 {
+    static JFrame frame;
+    static volatile Point p;
+    static volatile JComboBox combo;
+
+    final static int SELECTED_INDEX = 2;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(250);
+            SwingUtilities.invokeAndWait(() -> createTestUI());
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() -> p = combo.getLocationOnScreen());
+            robot.waitForIdle();
+
+            robot.mouseMove(p.x + 10, p.y + 10);
+            robot.waitForIdle();
+
+            robot.keyPress(KeyEvent.VK_CONTROL);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.keyRelease(KeyEvent.VK_CONTROL);
+            robot.waitForIdle();
+
+            SwingUtilities.invokeAndWait(() -> {
+                if (combo.getSelectedIndex() != SELECTED_INDEX) {
+                    throw new RuntimeException("Failed: selected index has been changed");
+                }
+            });
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    public static void createTestUI() {
+        frame = new JFrame("bug4436376");
+        String[] items = new String[]{"One", "Two", "Three", "Four"};
+        combo = new JComboBox(items);
+        combo.setSelectedIndex(SELECTED_INDEX);
+
+        frame.setLayout(new FlowLayout());
+        frame.add(combo);
+        frame.setLocationRelativeTo(null);
+        frame.pack();
+        frame.setVisible(true);
+    }
+}

From 239760ac09c78a9c989df54f6526b67448540eda Mon Sep 17 00:00:00 2001
From: Eric Caspole <ecaspole@openjdk.org>
Date: Tue, 22 Apr 2025 19:59:41 +0000
Subject: [PATCH 060/901] 8355233: Add a DMB related benchmark

Reviewed-by: kvn
---
 .../openjdk/bench/vm/compiler/DMBCheck.java   | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/DMBCheck.java

diff --git a/test/micro/org/openjdk/bench/vm/compiler/DMBCheck.java b/test/micro/org/openjdk/bench/vm/compiler/DMBCheck.java
new file mode 100644
index 00000000000..0552e52fb02
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/DMBCheck.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.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import java.util.concurrent.TimeUnit;
+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.Group;
+import org.openjdk.jmh.annotations.GroupThreads;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@BenchmarkMode(Mode.Throughput)
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@Warmup(iterations = 8, time = 4)
+@Measurement(iterations = 6, time = 3)
+public class DMBCheck {
+
+  // The allocations of DoubleDMB$A and DoubleDMB$C
+  // will cause aarch64 dmb barrier instructions.
+  // The different latency of the dmb ish/ishst/ishld modes
+  // may make a noticeable difference in the benchmark results.
+  // These modes may be set by cpu defaults or XX options.
+
+  class A {
+
+    final String b = new String("Hi there");
+  }
+
+  class C {
+
+    private A a;
+
+    public A getA() {
+      if (a == null) {
+        a = new A();
+      }
+      return a;
+    }
+  }
+
+  static C c = null;
+
+  @Setup
+  public void setup() {
+    c = new C();
+  }
+
+  @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+  void action(Blackhole b) throws Exception {
+    c = new C();
+
+    if (c.getA().b == null) {
+      throw new Exception("a should not be null");
+    }
+    b.consume(c);
+  }
+
+  @Benchmark
+  @Fork(value = 1, jvmArgs = {
+    "-XX:+UnlockDiagnosticVMOptions", "-XX:+AlwaysMergeDMB", "-XX:+IgnoreUnrecognizedVMOptions"})
+  public void plusAlwaysMergeDMB(Blackhole b) throws Exception {
+
+    action(b);
+  }
+
+  @Benchmark
+  @Fork(value = 1, jvmArgs = {
+    "-XX:+UnlockDiagnosticVMOptions", "-XX:-AlwaysMergeDMB", "-XX:+IgnoreUnrecognizedVMOptions"})
+  public void minusAlwaysMergeDMB(Blackhole b) throws Exception {
+
+    action(b);
+  }
+
+}

From 1b8f760d1b60e63c1391dcad42753a7ebb3f80ec Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Tue, 22 Apr 2025 20:17:01 +0000
Subject: [PATCH 061/901] 8354928: Clean up and open source some miscellaneous
 AWT tests

Reviewed-by: prr, dnguyen
---
 .../event/InputEvent/InputEventTimeTest.java  | 115 +++++++++++++
 .../event/MouseWheelEvent/HWWheelScroll.java  | 160 ++++++++++++++++++
 .../MouseWheelEvent/WheelEventCoord.java      |  95 +++++++++++
 .../MouseWheelEvent/WheelScrollEnabled.java   | 129 ++++++++++++++
 4 files changed, 499 insertions(+)
 create mode 100644 test/jdk/java/awt/event/InputEvent/InputEventTimeTest.java
 create mode 100644 test/jdk/java/awt/event/MouseWheelEvent/HWWheelScroll.java
 create mode 100644 test/jdk/java/awt/event/MouseWheelEvent/WheelEventCoord.java
 create mode 100644 test/jdk/java/awt/event/MouseWheelEvent/WheelScrollEnabled.java

diff --git a/test/jdk/java/awt/event/InputEvent/InputEventTimeTest.java b/test/jdk/java/awt/event/InputEvent/InputEventTimeTest.java
new file mode 100644
index 00000000000..38339f8e877
--- /dev/null
+++ b/test/jdk/java/awt/event/InputEvent/InputEventTimeTest.java
@@ -0,0 +1,115 @@
+/*
+ * 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 4176525
+ * @summary InputEvent.getWhen() returns the wrong event time.
+ * @key headful
+ * @run main InputEventTimeTest
+ */
+
+import java.awt.AWTEvent;
+import java.awt.AWTException;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
+
+public class InputEventTimeTest extends Frame {
+    public void initUI() {
+        setTitle("Input Event Time Test");
+        enableEvents(AWTEvent.MOUSE_EVENT_MASK);
+        enableEvents(AWTEvent.KEY_EVENT_MASK);
+        setSize(200, 200);
+        setLocationRelativeTo(null);
+        setVisible(true);
+    }
+
+    public void center(Point point) {
+        Point loc = getLocationOnScreen();
+        Dimension size = getSize();
+        point.setLocation(loc.x + (size.width / 2), loc.y + (size.height / 2));
+    }
+
+    public void processEvent(AWTEvent e) {
+        long currentTime;
+        long eventTime;
+        long difference;
+
+        if (!(e instanceof InputEvent)) {
+            return;
+        }
+
+        currentTime = (new Date()).getTime();
+        eventTime = ((InputEvent) e).getWhen();
+        difference = currentTime - eventTime;
+
+        if ((difference > 5000) || (difference < -5000)) {
+            throw new RuntimeException("The difference between current time" +
+                    " and event creation time is " + difference + "ms");
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException, AWTException {
+        InputEventTimeTest test = new InputEventTimeTest();
+        try {
+            EventQueue.invokeAndWait(test::initUI);
+            Robot robot = new Robot();
+            robot.setAutoDelay(50);
+            robot.waitForIdle();
+            robot.delay(1000);
+            Point center = new Point();
+            EventQueue.invokeAndWait(() -> test.center(center));
+            robot.mouseMove(center.x, center.y);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.mousePress(InputEvent.BUTTON2_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON2_DOWN_MASK);
+            robot.waitForIdle();
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            for (int i = 0; i < 6; i++) {
+                robot.keyPress(KeyEvent.VK_A + i);
+                robot.keyRelease(KeyEvent.VK_A + i);
+                robot.waitForIdle();
+            }
+            for (int i = 0; i < 150; i += 5) {
+                robot.mouseMove(center.x - i, center.y - i);
+            }
+            for (int i = 150; i > 0; i -= 5) {
+                robot.mouseMove(center.x - i, center.y - i);
+            }
+        } finally {
+            EventQueue.invokeAndWait(test::dispose);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/HWWheelScroll.java b/test/jdk/java/awt/event/MouseWheelEvent/HWWheelScroll.java
new file mode 100644
index 00000000000..2851ff668fe
--- /dev/null
+++ b/test/jdk/java/awt/event/MouseWheelEvent/HWWheelScroll.java
@@ -0,0 +1,160 @@
+/*
+ * 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 4425654
+ * @summary Test wheel scrolling of heavyweight components
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual HWWheelScroll
+ */
+
+import java.awt.Choice;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import java.awt.List;
+import java.awt.TextArea;
+import java.awt.Window;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+
+public class HWWheelScroll {
+    public static final int TEXT_TALL = 0;
+    public static final int TEXT_WIDE = 1;
+    public static final int TEXT_SMALL = 2;
+    public static final int TEXT_BIG = 3;
+    static String INSTRUCTIONS = """
+            Test for mouse wheel scrolling of heavyweight components with built-in
+            scrollbars or similar functionality that is controlled by guestures
+            such as Apple Magic Mouse or trackpad scrolling guesture.
+            Several windows containing either a TextArea, List, Choice, or a
+            FileDialog will appear. For each window, use the mouse wheel to
+            scroll its content, and then minimize it or move away
+            and continue with the next window.
+            Do not close any of the opened windows except the FileDialog.
+            For the FileDialog, first change to a directory with enough items that a
+            scrollbar appears.
+            Some of the other windows don't have enough text to warrant scrollbars,
+            but should be tested anyway to make sure no crash or hang occurs.
+            If all scrollbars scroll correctly, press "Pass", otherwise press "Fail".
+            """;
+
+    public static ArrayList<Window> initUI() {
+        ArrayList<Window> retValue = new ArrayList<>();
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_BOTH, TEXT_BIG));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_BOTH, TEXT_TALL));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_BOTH, TEXT_SMALL));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_BOTH, TEXT_WIDE));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_VERTICAL_ONLY, TEXT_TALL));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_VERTICAL_ONLY, TEXT_SMALL));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_HORIZONTAL_ONLY, TEXT_SMALL));
+        retValue.add(makeTextFrame(TextArea.SCROLLBARS_HORIZONTAL_ONLY, TEXT_WIDE));
+        retValue.add(makeListFrame(TEXT_TALL));
+        retValue.add(makeListFrame(TEXT_WIDE));
+        retValue.add(makeListFrame(TEXT_SMALL));
+        Frame f = new Frame("File Dialog Owner");
+        f.setSize(150, 150);
+        f.setLocationRelativeTo(null);
+        FileDialog fd = new FileDialog(f, "FileDialog");
+        fd.setDirectory(".");
+        retValue.add(fd);
+        retValue.add(f);
+        Frame choiceFrame = new Frame("Choice");
+        Choice c = new Choice();
+        for (int i = 0; i < 50; i++) {
+            c.add(i + " choice item");
+        }
+        choiceFrame.add(c);
+        choiceFrame.setSize(150, 150);
+        choiceFrame.setLocationRelativeTo(null);
+        retValue.add(choiceFrame);
+        return retValue;
+    }
+
+    public static Frame makeTextFrame(int policy, int textShape) {
+        Frame f = new Frame("TextArea");
+        f.add(makeTextArea(policy, textShape));
+        f.setSize(150, 150);
+        f.setLocationRelativeTo(null);
+        return f;
+    }
+
+    public static Frame makeListFrame(int textShape) {
+        Frame f = new Frame("List");
+        f.add(makeList(textShape));
+        f.setSize(150, 150);
+        f.setLocationRelativeTo(null);
+        return f;
+    }
+
+    public static TextArea makeTextArea(int policy, int textShape) {
+        TextArea ta = new TextArea("", 0, 0, policy);
+        if (textShape == TEXT_TALL) {
+            for (int i = 0; i < 50 ; i++) {
+                ta.append(i + "\n");
+            }
+        } else if (textShape == TEXT_WIDE) {
+            for (int i = 0; i < 2; i++) {
+                ta.append(i + "very, very, very, very, very, very, very, long line of text number\n");
+            }
+        } else if (textShape == TEXT_SMALL) {
+            ta.append("text");
+        } else if (textShape == TEXT_BIG) {
+            for (int i = 0; i < 50 ; i++) {
+                ta.append(i + "very, very, very, very, very, very, very, long line of text number\n");
+            }
+        }
+        return ta;
+    }
+
+    public static List makeList(int textShape) {
+        java.awt.List l = new java.awt.List();
+        if (textShape == TEXT_TALL) {
+            for (int i = 0; i < 50 ; i++) {
+                l.add(" " + i + " ");
+            }
+        }  else if (textShape == TEXT_WIDE) {
+            for (int i = 0; i < 2 ; i++) {
+                l.add(i + "very, very, very, very, very, very, very, long line of text number");
+            }
+        }  else if (textShape == TEXT_SMALL) {
+            l.add("text");
+        } else if (textShape == TEXT_BIG) {
+            for (int i = 0; i < 50 ; i++) {
+                l.add(i + "very, very, very, very, very, very, very, long line of text number");
+            }
+        }
+        return l;
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(HWWheelScroll::initUI)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/WheelEventCoord.java b/test/jdk/java/awt/event/MouseWheelEvent/WheelEventCoord.java
new file mode 100644
index 00000000000..418151d3798
--- /dev/null
+++ b/test/jdk/java/awt/event/MouseWheelEvent/WheelEventCoord.java
@@ -0,0 +1,95 @@
+/*
+ * 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 4492456
+ * @summary MouseWheelEvent coordinates are wrong
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual WheelEventCoord
+ */
+
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.lang.reflect.InvocationTargetException;
+
+public class WheelEventCoord extends Frame {
+    static String INSTRUCTIONS = """
+            This test requires mouse with scrolling wheel or device,
+            that has capability to simulate scrolling wheel with gestures
+            such as Apple mouse or a trackpad with gesture control.
+            If you do not have such device press "Pass".
+            Move mouse to the top of the button named "Button 1".
+            While constantly turning mouse wheel up and down slowly move
+            mouse cursor until it reaches bottom of the button named "Button 3".
+            While doing so look at the log area.
+            If despite the wheel direction y coordinate is steadily increases
+            as you move the mouse down press "Pass".
+            If y coordinate decreases when cursor is moving down or suddenly jumps
+            by more than 50 points when crossing to another button press "Fail".
+            """;
+
+    public WheelEventCoord() {
+        super("Wheel Event Coordinates");
+        setLayout(new GridLayout(3, 1));
+
+        add(new BigButton("Button 1"));
+        add(new BigButton("Button 2"));
+        add(new BigButton("Button 3"));
+
+        addMouseWheelListener(e -> PassFailJFrame.log("Mouse y coordinate = " + e.getY()));
+        pack();
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Wheel Event Coordinates Instructions")
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(WheelEventCoord::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
+
+class BigButton extends Button {
+    public BigButton(String label) {
+        super(label);
+    }
+
+    public Dimension getPreferredSize() {
+        return new Dimension(300, 100);
+    }
+
+    public Dimension getMinimumSize() {
+        return getPreferredSize();
+    }
+
+    public Dimension getMaximumSize() {
+        return getPreferredSize();
+    }
+}
diff --git a/test/jdk/java/awt/event/MouseWheelEvent/WheelScrollEnabled.java b/test/jdk/java/awt/event/MouseWheelEvent/WheelScrollEnabled.java
new file mode 100644
index 00000000000..cbdd7676e94
--- /dev/null
+++ b/test/jdk/java/awt/event/MouseWheelEvent/WheelScrollEnabled.java
@@ -0,0 +1,129 @@
+/*
+ * 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 4372477
+ * @summary Test disabling of wheel scrolling
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual WheelScrollEnabled
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Checkbox;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.ScrollPane;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.lang.reflect.InvocationTargetException;
+
+public class WheelScrollEnabled extends Frame {
+    static String INSTRUCTIONS = """
+            This test requires mouse with a scrolling wheel or
+            device that is able to simulate scrolling using gestures.
+            If you do not have such device press "Pass" to skip testing.
+            You should see a ScrollPane with some labels in it and two checkboxes.
+            For each of the four combinations of the two checkboxes,
+            move the cursor over the ScrollPane and rotate the mouse wheel.
+            When (and ONLY when) the 'WheelListener added' checkbox is checked,
+            scrolling the mouse wheel should produce a text message in the log area.
+            When (and ONLY when) the 'Wheel scrolling enabled' checkbox is checked,
+            the ScrollPane should scroll when mouse wheel is scrolled on top of it.
+            If all four checkbox combinations work properly press "Pass",
+            otherwise press "Fail".
+            """;
+    MouseWheelListener mwl;
+    Checkbox cb;
+    Checkbox cb2;
+    ScrollPane sp;
+
+    public WheelScrollEnabled() {
+        setLayout(new BorderLayout());
+        Panel pnl = new Panel();
+        pnl.setLayout(new GridLayout(10, 10));
+        for (int i = 0; i < 100; i++) {
+            pnl.add(new Label("Label " + i));
+        }
+        sp = new ScrollPane();
+        sp.add(pnl);
+        sp.setWheelScrollingEnabled(false);
+        mwl = new MouseWheelListener() {
+            int i;
+            @Override
+            public void mouseWheelMoved(MouseWheelEvent e) {
+                PassFailJFrame.log("mouseWheelMoved " + i++);
+            }
+        };
+        sp.addMouseWheelListener(mwl);
+        add(sp, BorderLayout.CENTER);
+
+        Panel pl2 = new Panel();
+        ItemListener il = new ControlListener();
+
+        cb = new Checkbox("WheelListener added", true);
+        cb.addItemListener(il);
+        pl2.add(cb);
+
+        cb2 = new Checkbox("Wheel scrolling enabled", false);
+        cb2.addItemListener(il);
+        pl2.add(cb2);
+
+        add(pl2, BorderLayout.SOUTH);
+        setSize(400, 200);
+    }
+
+    class ControlListener implements ItemListener {
+        public void itemStateChanged(ItemEvent e) {
+            if (e.getSource() == cb) {
+                boolean state = cb.getState();
+                if (state) {
+                    sp.addMouseWheelListener(mwl);
+                }
+                else {
+                    sp.removeMouseWheelListener(mwl);
+                }
+            }
+            if (e.getSource() == cb2) {
+                sp.setWheelScrollingEnabled(cb2.getState());
+            }
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Wheel Scroll Enabled Instructions")
+                .instructions(INSTRUCTIONS)
+                .logArea(10)
+                .testUI(WheelScrollEnabled::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
+

From cc9148ddef95c6ca27ff9fee4c17fb0d4ba7f88e Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Tue, 22 Apr 2025 20:27:17 +0000
Subject: [PATCH 062/901] 8354695: Open source several swing tests batch7

Reviewed-by: kizune, achung
---
 .../jdk/javax/swing/JRootPane/bug4403624.java | 106 +++
 .../HorizScrollers.java                       | 234 ++++++
 .../RTLScrollers.java                         | 684 ++++++++++++++++++
 .../javax/swing/JScrollPane/bug4166037.java   | 167 +++++
 .../javax/swing/JScrollPane/bug4237517.java   |  69 ++
 .../javax/swing/JScrollPane/bug4237560.java   |  77 ++
 .../javax/swing/JScrollPane/bug4244899.java   |  99 +++
 7 files changed, 1436 insertions(+)
 create mode 100644 test/jdk/javax/swing/JRootPane/bug4403624.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/bug4166037.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/bug4237517.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/bug4237560.java
 create mode 100644 test/jdk/javax/swing/JScrollPane/bug4244899.java

diff --git a/test/jdk/javax/swing/JRootPane/bug4403624.java b/test/jdk/javax/swing/JRootPane/bug4403624.java
new file mode 100644
index 00000000000..1c3ba3ddd2a
--- /dev/null
+++ b/test/jdk/javax/swing/JRootPane/bug4403624.java
@@ -0,0 +1,106 @@
+/*
+ * 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 4403624
+ * @summary Tests JRootPane layout with invisible menubar
+ * @key headful
+ * @run main bug4403624
+ */
+
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.Point;
+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.SwingUtilities;
+
+public class bug4403624 {
+    private static JFrame f;
+    private static Container c;
+    private static JButton b;
+    private static volatile Point p;
+    private static volatile int bWidth;
+    private static volatile int bHeight;
+    private static final int OFFSET = 2;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                f = new JFrame("bug4403624 Test");
+                JMenuBar mbar;
+                mbar = new JMenuBar();
+                mbar.add(new JMenu("Menu"));
+                f.setJMenuBar(mbar);
+                b = new JButton("Hide Menu");
+                b.addActionListener(e -> mbar.setVisible(false));
+                c = f.getContentPane();
+                c.setLayout(new FlowLayout());
+                c.setBackground(Color.GREEN);
+                c.add(b);
+                f.pack();
+                f.setLocationRelativeTo(null);
+                f.setAlwaysOnTop(true);
+                f.setVisible(true);
+            });
+
+            Robot r = new Robot();
+            r.setAutoDelay(200);
+            r.waitForIdle();
+            r.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                p = b.getLocationOnScreen();
+                bWidth = b.getWidth();
+                bHeight = b.getHeight();
+            });
+
+            r.mouseMove(p.x + (bWidth / 2), p.y + (bHeight / 2));
+            r.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+            SwingUtilities.invokeAndWait(() -> p = c.getLocationOnScreen());
+
+            Color c = r.getPixelColor(p.x + OFFSET, p.y + OFFSET);
+
+            if (c.getGreen() < 240 && c.getBlue() > 10 && c.getRed() > 10) {
+                System.out.println("EXPECTED: " + Color.GREEN);
+                System.out.println("ACTUAL: " + c);
+                throw new RuntimeException("Failure to hide menu bar.");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (f != null) {
+                    f.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
new file mode 100644
index 00000000000..b584fd66da3
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
@@ -0,0 +1,234 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 5078454
+ * @summary Test horizontal wheel scroll behavior of (including RTL)
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual HorizScrollers
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+
+public class HorizScrollers {
+    private static final String INSTRUCTIONS = """
+            This is a semi-automatic test with three phases.
+            For each phase, you will need to change the mouse setting, as
+            directed by a dialog. Once the correct setting is confirmed,
+            the next test phase will run automatically.
+            DO NOT TOUCH ANYTHING DURING TESTING!
+
+            The test will automatically FAIL during testing if something
+            fails. Otherwise, the test will automatically PASS after the
+            third testing phase.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("HorizScrollers Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testTimeOut(10)
+                .splitUIRight(ConfigPanel::new)
+                .logArea(6)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static final int[] SCROLLAMTS = {1, 30, 3};
+    private static final String[] CONFIG_MSGS = {
+            "Set the scrolling speed to the slowest value (1 line).",
+            "Set the scrolling speed to the fastest value (30 lines).",
+            "Set the scrolling speed to two ticks above the slowest value (3 lines)."
+    };
+
+    private static int current = 0;
+    private static final String MW_TEXT = "Rotate the mouse wheel here";
+    private static final String CONFIG_INSTRUCTION_TEMPLATE = """
+            Configure Mouse Wheel for Phase %d
+
+            Open the Mouse Control Panel and go to the 'Wheel' tab.
+            If 'Wheel' tab is not available just press Pass.
+
+            %s
+
+            Test the setting on the area below.
+            Once the mouse is setup correctly, the area will turn green.
+            When you're ready for the next part of the test to run, press GO!
+    """;
+
+    static class ConfigPanel extends JPanel
+            implements ActionListener, MouseWheelListener {
+        JTextArea msg;
+        JButton goBtn;
+        JLabel mwArea;
+        int scrollAmount;
+
+        private final Color defaultBg;
+
+        ConfigPanel() {
+            this.scrollAmount = SCROLLAMTS[current];
+            Container content = this;
+            content.setLayout(new BorderLayout());
+            msg = new JTextArea();
+            msg.setMargin(new Insets(5, 5, 5, 5));
+            msg.setEditable(false);
+            msg.setLineWrap(true);
+            msg.setWrapStyleWord(true);
+            content.add(msg, BorderLayout.NORTH);
+
+            mwArea = new JLabel(MW_TEXT, SwingConstants.CENTER);
+            mwArea.setPreferredSize(new Dimension(200, 250));
+            mwArea.setBorder(BorderFactory.createLineBorder(Color.BLACK));
+            mwArea.setOpaque(true);
+            mwArea.addMouseWheelListener(this);
+            content.add(mwArea, BorderLayout.CENTER);
+
+            defaultBg = mwArea.getBackground();
+            setPhase(current);
+
+            goBtn = new JButton("GO!");
+            goBtn.setEnabled(false);
+            goBtn.addActionListener(this);
+            JPanel flowPanel = new JPanel();
+            flowPanel.setLayout(new FlowLayout());
+            flowPanel.add(goBtn);
+            content.add(flowPanel, BorderLayout.SOUTH);
+
+            setPreferredSize(new Dimension(600, 400));
+        }
+
+        public void setPhase(int phase) {
+            if (phase < 3) {
+                setVisible(true);
+                PassFailJFrame.log("Phase %d scroll speed %d"
+                        .formatted(phase + 1, SCROLLAMTS[phase]));
+                PassFailJFrame.log(CONFIG_MSGS[phase]);
+
+                scrollAmount = SCROLLAMTS[phase];
+                msg.setText(CONFIG_INSTRUCTION_TEMPLATE
+                        .formatted(phase + 1, CONFIG_MSGS[phase]));
+                mwArea.setBackground(defaultBg);
+                mwArea.setText(MW_TEXT);
+            } else {
+                // all cases passed
+                showFinalReminderIfNeeded(false);
+            }
+        }
+
+        private void showFinalReminderIfNeeded(boolean isFailure) {
+            if (scrollAmount != 3) {
+                JOptionPane.showMessageDialog(
+                        ConfigPanel.this.getTopLevelAncestor(),
+                        ("Test %s. please make sure you have restored " +
+                                "the original speed value blah blah")
+                                .formatted(isFailure
+                                        ? "failed"
+                                        : "passed"),
+                        isFailure
+                                ? "Failure"
+                                : "Success",
+                        isFailure
+                                ? JOptionPane.WARNING_MESSAGE
+                                : JOptionPane.INFORMATION_MESSAGE
+                );
+            }
+
+            if (isFailure) {
+                PassFailJFrame.forceFail();
+            } else {
+                PassFailJFrame.forcePass();
+            }
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (e.getSource() == goBtn) {
+                goBtn.setEnabled(false);
+
+                new Thread(() -> { // new thread to avoid running robot on EDT
+                    boolean passed;
+                    try {
+                        passed = RTLScrollers.runTest(SCROLLAMTS[current]);
+                    } catch (Exception ex) {
+                        PassFailJFrame.log("Failure: " + ex);
+                        SwingUtilities.invokeLater(() ->
+                                showFinalReminderIfNeeded(true));
+                        return;
+                    }
+
+                    PassFailJFrame.log("Phase %d passed: %b\n"
+                            .formatted(current + 1, passed));
+                    if (passed) {
+                        SwingUtilities.invokeLater(() -> {
+                            goBtn.setEnabled(true);
+                            setPhase(++current);
+                        });
+                    } else {
+                        SwingUtilities.invokeLater(() ->
+                                showFinalReminderIfNeeded(true));
+                    }
+                }).start();
+            }
+        }
+
+        public void mouseWheelMoved(MouseWheelEvent e) {
+            int eventScrollAmt = e.getScrollAmount();
+            if (eventScrollAmt == scrollAmount) {
+                mwArea.setBackground(Color.GREEN);
+                mwArea.setText("Mouse wheel configured - press Go");
+                goBtn.setEnabled(true);
+                goBtn.requestFocusInWindow();
+                PassFailJFrame.log("Proceed to the test with go button");
+                return;
+            }
+            if (eventScrollAmt < scrollAmount) {
+                mwArea.setText("Increase the scroll speed. (Want:"
+                        + scrollAmount + " Got:" + eventScrollAmt + ")");
+            } else {
+                mwArea.setText("Decrease the scroll speed. (Want:"
+                        + scrollAmount + " Got:" + eventScrollAmt + ")");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
new file mode 100644
index 00000000000..24e8df6fad8
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
@@ -0,0 +1,684 @@
+/*
+ * 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.
+ */
+
+// A few Swing components which use the mouse wheel to scroll
+
+import java.awt.AWTException;
+import java.awt.Color;
+import java.awt.ComponentOrientation;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.ListModel;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
+
+public class RTLScrollers extends JDialog
+        implements MouseWheelListener, ActionListener {
+    private static final int ROWS = 5;
+    private static final int COLUMNS = 150;
+    private static final int WINWIDTH = 1000;
+
+    static RTLScrollers rtl;
+    static volatile RTLScrollers f;
+    static volatile boolean retVal;
+    static volatile JScrollPane jsp;
+    static volatile JScrollBar hsb;
+    static volatile JScrollBar sb;
+    static volatile Point loc;
+    static volatile Dimension size;
+    TestList list;
+    JScrollPane listScroller;
+    JTextArea text;
+    JScrollPane textScroller;
+    TestTable table;
+    JScrollPane tableScroller;
+    JCheckBoxMenuItem rightToLeft;
+    ImageIcon photoIcon;
+    int scrollAmount;
+
+    private static Robot robot;
+    private static BufferedImage logo = genIcon(166, 39, Color.PINK);
+    private static BufferedImage photo = genIcon(59, 80, Color.MAGENTA);
+    private static BufferedImage photo2 = genIcon(80, 53, Color.ORANGE);
+
+    private static BufferedImage genIcon(int width, int height, Color color) {
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        Graphics g = image.getGraphics();
+        g.setColor(color);
+        g.fillRect(0, 0, width, height);
+
+        return image;
+    }
+
+    public RTLScrollers() {
+        this(0);
+    }
+
+    public RTLScrollers(int scrollAmount) {
+        super(new JFrame(), "RTLScrollers", false);
+
+        this.scrollAmount = scrollAmount;
+        Container content = getContentPane();
+        content.setLayout(new GridBagLayout());
+
+        DefaultListModel<Object> listModel = new DefaultListModel<>();
+
+        photoIcon = new ImageIcon(photo);
+        for (int i = 0; i < COLUMNS / 4 ; i++) {
+            for (int j = 0; j < ROWS; j++) {
+                listModel.addElement(new ImageIcon(logo));
+            }
+            for (int j = 0; j < ROWS; j++) {
+                listModel.addElement(photoIcon);
+            }
+            for (int j = 0; j < ROWS; j++) {
+                listModel.addElement(new ImageIcon(photo2));
+            }
+            for (int j = 0; j < ROWS; j++) {
+                listModel.addElement("Text Item " + ((1 + i) * 3));
+            }
+        }
+
+        list = new TestList(listModel);
+        list.setVisibleRowCount(ROWS);
+        list.setLayoutOrientation(JList.VERTICAL_WRAP);
+        listScroller = new JScrollPane(list);
+        listScroller.addMouseWheelListener(this);
+
+        text = new JTextArea();
+        for (int j = 0; j < ROWS ; j++) {
+            for (int i = 0; i < COLUMNS ; i++) {
+                text.append(i + " some text, some more text, a really long line of text ");
+            }
+            text.append("\n");
+        }
+
+        textScroller = new JScrollPane(text);
+        textScroller.addMouseWheelListener(this);
+
+        DefaultTableModel model = new DefaultTableModel(ROWS, COLUMNS);
+        table = new TestTable(model);
+        table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        for (int i = 0; i < COLUMNS; i++) {
+            for (int j = 0; j < ROWS; j++) {
+                table.setValueAt(j + ", " + i, j, i);
+            }
+
+            TableColumn column = table.getColumnModel().getColumn(i);
+
+            if (i % 4 == 0) {
+                column.setMinWidth(0);
+                column.setPreferredWidth(0);
+                column.setMaxWidth(0);
+            }
+            else if ((i + 1) % 4 == 0) {
+                column.setMinWidth(95);
+                column.setPreferredWidth(95);
+                column.setMaxWidth(95);
+            }
+            else if ((i + 2) % 4 == 0) {
+                column.setMinWidth(26);
+                column.setPreferredWidth(26);
+                column.setMaxWidth(26);
+            }
+            else {
+                column.setMinWidth(50);
+                column.setPreferredWidth(50);
+                column.setMaxWidth(50);
+            }
+        }
+        tableScroller = new JScrollPane(table);
+        tableScroller.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS);
+        tableScroller.addMouseWheelListener(this);
+
+        GridBagConstraints tableGBC = new GridBagConstraints(0,
+                0,
+                1,
+                1,
+                1.0,
+                0.3,
+                GridBagConstraints.CENTER,
+                GridBagConstraints.BOTH,
+                new Insets(0,0,0,0),
+                0,
+                0);
+        content.add(tableScroller, tableGBC);
+        GridBagConstraints textGBC = new GridBagConstraints(0,
+                1,
+                1,
+                1,
+                1.0,
+                0.3,
+                GridBagConstraints.CENTER,
+                GridBagConstraints.BOTH,
+                new Insets(0,0,0,0),
+                0,
+                0);
+        content.add(textScroller, textGBC);
+
+        GridBagConstraints listGBC = new GridBagConstraints(0,
+                2,
+                1,
+                5,
+                1.0,
+                1.2,
+                GridBagConstraints.CENTER,
+                GridBagConstraints.BOTH,
+                new Insets(0,0,0,0),
+                0,
+                0);
+
+        content.add(listScroller, listGBC);
+
+        rightToLeft = new JCheckBoxMenuItem("Right-To-Left", false);
+        rightToLeft.addActionListener(this);
+        JMenu menu = new JMenu("Component Orientation");
+        menu.add(rightToLeft);
+
+        JMenuItem close = new JMenuItem("Close");
+        close.addActionListener(e -> RTLScrollers.this.setVisible(false));
+        menu.add(close);
+
+        JMenuBar mb = new JMenuBar();
+        mb.add(menu);
+        setJMenuBar(mb);
+        setBounds(0, 0, WINWIDTH, 760);
+        setLocationRelativeTo(null);
+    }
+
+    public void actionPerformed(ActionEvent e) {
+        if (rightToLeft.getState()) {
+            applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        }
+        else {
+            applyComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+        }
+    }
+    public void mouseWheelMoved(MouseWheelEvent e) {
+        System.out.println("Rotation: " + e.getWheelRotation());
+    }
+
+    public static boolean runTest(int scrollAmount)
+            throws InterruptedException, InvocationTargetException {
+        System.out.println("RTLS.runTest()");
+        if (robot == null) {
+            try {
+                robot = new Robot();
+                robot.setAutoDelay(150);
+                robot.setAutoWaitForIdle(true);
+            }
+            catch (AWTException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+
+        SwingUtilities.invokeAndWait(() -> {
+            rtl = new RTLScrollers(scrollAmount);
+            rtl.setVisible(true);
+        });
+        robot.delay(100);
+
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                retVal = rtl.runTests(scrollAmount);
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                rtl.setVisible(false);
+                rtl.dispose();
+            }
+        });
+
+        robot.delay(100);
+        System.out.println("RTLS.runTest(): " + retVal);
+        return retVal;
+    }
+
+    private boolean runTests(int scrollAmount)
+            throws InterruptedException, InvocationTargetException {
+        if (robot == null) {
+            try {
+                robot = new Robot();
+                robot.setAutoDelay(150);
+                robot.setAutoWaitForIdle(true);
+            }
+            catch (AWTException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+
+        //
+        // run robot tests
+        //
+        robot.delay(500);
+
+        System.out.println("Testing Table");
+        testComp(table, scrollAmount);
+
+        System.out.println("Testing List");
+        testComp(list, scrollAmount);
+
+        SwingUtilities.invokeAndWait(() -> {
+            applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        });
+        robot.delay(100);
+
+        System.out.println("Testing RTL Table");
+        testComp(table, scrollAmount);
+
+        System.out.println("Testing RTL List");
+        testComp(list, scrollAmount);
+
+        return true;
+    }
+
+    public boolean testComp(TestTools comp, int scrollAmount)
+            throws InterruptedException, InvocationTargetException {
+        // Make sure we start from the beginning
+        SwingUtilities.invokeAndWait(() -> {
+            jsp = (JScrollPane)((JComponent)comp).getParent().getParent();
+            hsb = jsp.getHorizontalScrollBar();
+            hsb.setValue(hsb.getMinimum());
+
+            loc = jsp.getLocationOnScreen();
+            size = jsp.getSize();
+        });
+        int midx = loc.x + size.width / 2;
+        int midy = loc.y + size.height / 2;
+        int maxIdx = 0;
+        robot.mouseMove(midx, midy);
+
+        // Don't bother for max scroll w/ RTL JList, because the block increment is broken
+        if (scrollAmount != 30 || !(comp instanceof TestList)
+                || getComponentOrientation().isLeftToRight()) {
+            scrollToMiddle(jsp, robot);
+
+            // check that we're lined up
+            comp.checkTopCellIsLinedUp();
+
+            int startVal = hsb.getValue();
+            int leadingCell = comp.getLeadingCell().y;
+            System.out.println("leadingCell is " + leadingCell);
+
+            // become unaligned
+            int width = comp.getLeadingCellWidth();
+            int midVal = startVal + width / 2;
+            System.out.println("becoming unaligned: startVal is "
+                    + startVal + ", midVal is " + midVal);
+            SwingUtilities.invokeAndWait(() -> hsb.setValue(midVal));
+
+            //
+            // Check partial inc up
+            //
+            robot.mouseWheel(-1);
+
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, -scrollAmount + 1);
+            }
+            comp.checkTopCellIsLinedUp();
+
+            //
+            // Check partial inc down
+            //
+            SwingUtilities.invokeAndWait(() -> hsb.setValue(midVal));
+            robot.delay(100);
+            robot.mouseWheel(1);
+
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, scrollAmount);
+            }
+            comp.checkTopCellIsLinedUp();
+
+            //
+            // Check full inc down (3 times)
+            //
+            SwingUtilities.invokeAndWait(() -> hsb.setValue(startVal));
+            leadingCell = comp.getLeadingCell().y;
+
+            // Once...
+            robot.mouseWheel(1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, scrollAmount);
+            }
+            comp.checkTopCellIsLinedUp();
+
+            // Twice...
+            robot.mouseWheel(1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, (2 * scrollAmount));
+            }
+
+            comp.checkTopCellIsLinedUp();
+
+            // Thrice...
+            robot.mouseWheel(1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, (3 * scrollAmount));
+
+            }
+            comp.checkTopCellIsLinedUp();
+
+            //
+            // Check full inc up (3 times)
+            //
+            leadingCell = comp.getLeadingCell().y;
+
+            // Once...
+            robot.mouseWheel(-1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, -scrollAmount);
+            }
+            comp.checkTopCellIsLinedUp();
+
+            // Twice...
+            robot.mouseWheel(-1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, -(2 * scrollAmount));
+            }
+            comp.checkTopCellIsLinedUp();
+
+            // Thrice...
+            robot.mouseWheel(-1);
+            if (scrollAmount == 30) {  // hack for max scroll amount
+                comp.checkTopCellIsMax(maxIdx++);
+            }
+            else {
+                comp.checkTopCellIs(leadingCell, -(3 * scrollAmount));
+            }
+            comp.checkTopCellIsLinedUp();
+        }
+
+        //
+        // Test acceleration for max scrolling
+        // (this part should still work for RTL JList)
+        if (scrollAmount == 30) {
+            SwingUtilities.invokeAndWait(() -> {
+                hsb.setValue(hsb.getMinimum());
+            });
+            robot.delay(100);
+            robot.mouseWheel(2);
+            robot.mouseWheel(2);
+            robot.mouseWheel(2);
+            if (hsb.getValue() < hsb.getMaximum() - hsb.getVisibleAmount()) {
+                throw new RuntimeException("Wheel acceleration for max " +
+                        "scrolling doesn't work: hsb value (" + hsb.getValue() +
+                        " < hsb max (" + hsb.getMaximum() +
+                        ") - hsb vis (" + hsb.getVisibleAmount() + ")");
+            }
+            robot.delay(100);
+            robot.mouseWheel(-2);
+            robot.mouseWheel(-2);
+            robot.mouseWheel(-2);
+            if (hsb.getValue() > hsb.getMinimum()) {
+                throw new RuntimeException("Wheel acceleration for max " +
+                        "scrolling doesn't work: hsb value (" +
+                        hsb.getValue() + " > hsb min (" + hsb.getMinimum() + ")");
+            }
+        }
+
+        return true;
+    }
+
+    class TestTable extends JTable implements TestTools {
+        final int[] MAXVALS = {23, 67, 67, 89, 111, 89, 66, 45};  //Lookup table
+        public TestTable(TableModel model) {
+            super(model);
+        }
+
+        public void checkTopCellIsLinedUp() {
+            boolean isLeftToRight = getComponentOrientation().isLeftToRight();
+            Point leading = getLeadingCell();
+            Rectangle visRect = getVisibleRect();
+            Rectangle cellRect = getCellRect(leading.x, leading.y, true);
+
+            if (isLeftToRight) {
+                if (cellRect.x != visRect.x) {
+                    throw new RuntimeException("leading cell is not aligned!");
+                }
+            }
+            else {
+                if (cellRect.x + cellRect.width != visRect.x + visRect.width) {
+                    throw new RuntimeException("leading cell is not aligned!");
+                }
+            }
+        }
+
+        public void checkTopCellIs(int col) {
+            Point cell = getLeadingCell();
+            if (cell.y != col) {
+                throw new RuntimeException("leading cell (" + cell.y
+                        + ") is not " + col);
+            }
+        }
+
+        /*
+         * Account for 0-width cells
+         *
+         * shift is a non-0 number of visible cells to shift.  The shift is
+         * augmented for zero-width cells, and the new sum is passed into
+         * checkTopCellIs().
+         */
+        public void checkTopCellIs(int col, int shift) {
+            if (shift == 0) {
+                checkTopCellIs(col);
+                return;
+            }
+
+            int row = getLeadingCell().x;
+            int newShift = 0;
+            int foundCells = 0;
+            int direction = shift > 0 ? 1 : -1;
+            int index = col;
+            Rectangle cellRect;
+
+            while (foundCells < Math.abs(shift)) {
+                index += direction;
+                cellRect = getCellRect(row, index, true);
+                if (cellRect.width > 0) {
+                    foundCells++;
+                }
+                newShift++;
+            }
+
+            checkTopCellIs(col + (direction*newShift));
+        }
+
+        public void checkTopCellIsMax(int idx) {
+            checkTopCellIs(MAXVALS[idx]);
+        }
+
+        public int getLeadingCellWidth() {
+            Point leading = getLeadingCell();
+            Rectangle cellRect = getCellRect(leading.x, leading.y, true);
+            return cellRect.width;
+        }
+
+        public Point getLeadingCell() {
+            boolean isLeftToRight = getComponentOrientation().isLeftToRight();
+            Rectangle visRect = getVisibleRect();
+            int row = rowAtPoint(visRect.getLocation());
+            int column;
+            if (isLeftToRight) {
+                column = columnAtPoint(visRect.getLocation());
+            }
+            else {
+                column = columnAtPoint(new Point(visRect.x + visRect.width - 1, visRect.y));
+            }
+            return new Point(row, column);
+        }
+    }
+
+    class TestList extends JList implements TestTools {
+        final int[] MAXVALS = {5, 16, 15, 20, 25, 20, 15, 10 };
+        public TestList(ListModel model) {
+            super(model);
+        }
+
+        // Note - implemented in terms of columns
+        public Point getLeadingCell() {
+            System.out.println("TL.gLC(): first vis index is "
+                    + getFirstVisibleIndex());
+            return new Point(getFirstVisibleIndex() / ROWS,
+                    getFirstVisibleIndex() / ROWS);
+        }
+        public void checkTopCellIsLinedUp() {
+            boolean isLeftToRight = getComponentOrientation().isLeftToRight();
+            int visIdx = getFirstVisibleIndex();
+            Rectangle cellRect = getCellBounds(visIdx, visIdx);
+            Rectangle visRect = getVisibleRect();
+            if (isLeftToRight) {
+                if (cellRect.x != visRect.x) {
+                    throw new RuntimeException("leading cell is not aligned!");
+                }
+            }
+            else {
+                if (cellRect.x + cellRect.width != visRect.x + visRect.width) {
+                    throw new RuntimeException("leading cell is not aligned!");
+                }
+            }
+        }
+        public void checkTopCellIs(int col) {
+            int firstVis = getLeadingCell().y;
+            if (firstVis != col) {
+                throw new RuntimeException("leading cell ("
+                        + firstVis + ") is not " + col);
+            }
+        }
+        public void checkTopCellIs(int idx, int shift) {
+            checkTopCellIs(idx + shift);
+
+        }
+        public void checkTopCellIsMax(int idx) {
+            checkTopCellIs(MAXVALS[idx]);
+        }
+        public int getLeadingCellWidth() {
+            int visIdx = getFirstVisibleIndex();
+            Rectangle cellRect = getCellBounds(visIdx, visIdx);
+            System.out.println("TL.gLCW(): leading cell width is " + cellRect.width);
+            return cellRect.width;
+        }
+    }
+
+    private interface TestTools {
+        /**
+         * Throws a runtime exception if the top cell isn't lined up
+         */
+        void checkTopCellIsLinedUp();
+        void checkTopCellIs(int col);
+        void checkTopCellIs(int col, int shift);
+        int getLeadingCellWidth();
+        Point getLeadingCell();
+
+        void checkTopCellIsMax(int idx);
+    }
+
+    public void scrollToMiddle(JScrollPane jsp, Robot robot)
+            throws InterruptedException, InvocationTargetException {
+        SwingUtilities.invokeAndWait(() -> {
+            sb = jsp.getHorizontalScrollBar();
+            loc = sb.getLocationOnScreen();
+            size = sb.getSize();
+        });
+        robot.setAutoDelay(250);
+
+        robot.mouseMove(loc.x + size.width / 2,
+                loc.y + size.height / 2);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        SwingUtilities.invokeAndWait(() -> {
+            if (jsp == listScroller) {
+                int idx = list.getFirstVisibleIndex();
+                list.ensureIndexIsVisible(idx);
+            }
+        });
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            SwingUtilities.invokeAndWait(() -> f = new RTLScrollers());
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                f.setVisible(true);
+                f.dispose();
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JScrollPane/bug4166037.java b/test/jdk/javax/swing/JScrollPane/bug4166037.java
new file mode 100644
index 00000000000..e2ce75867a7
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/bug4166037.java
@@ -0,0 +1,167 @@
+/*
+ * 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 4166037
+ * @summary Tests if changes to JScrollPane propagate to ScrollPaneLayout
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4166037
+ */
+
+import java.awt.Color;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneLayout;
+
+public class bug4166037 {
+    static final String INSTRUCTIONS = """
+        Press button "Never". Scroll bars should disappear.
+        Press button "Always". Scroll bars should appear.
+        Press button "Colhead". Label ColumnHeader should
+        get replaced with yellow rectangles.
+        Press button "Corner". You should see 4 green
+        rectangles in the corners of the scroll pane.
+        Press button "Rowhead". Label RowHeader should get
+        replaced with yellow rectangles.
+        Press button "Viewport". Viewport (the rest of the
+        area except scrollbars) should get replaced with yellow
+        rectangles.
+        If the behavior is as described, the test PASSES.
+        Otherwise, this test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4166037 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4166037::createUI)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("JScrollPane in JScrollLayout Test");
+        JScrollPane scroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+        JPanel p = new JPanel();
+        scroll.setSize(200, 200);
+        f.add(scroll);
+        f.setLayout(new BoxLayout(f.getContentPane(), BoxLayout.Y_AXIS));
+        JButton bn = new JButton("Never");
+        bn.addActionListener(e -> {
+            PassFailJFrame.log("pane before: "
+                    + scroll.getVerticalScrollBarPolicy()
+                    + scroll.getHorizontalScrollBarPolicy());
+            PassFailJFrame.log("layout before: "
+                    + ((ScrollPaneLayout) scroll.getLayout()).getVerticalScrollBarPolicy()
+                    + ((ScrollPaneLayout) scroll.getLayout()).getHorizontalScrollBarPolicy());
+            scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);
+            scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            PassFailJFrame.log("pane after: "
+                    + scroll.getVerticalScrollBarPolicy()
+                    + scroll.getHorizontalScrollBarPolicy());
+            PassFailJFrame.log("layout after: "
+                    + ((ScrollPaneLayout) scroll.getLayout()).getVerticalScrollBarPolicy()
+                    + ((ScrollPaneLayout) scroll.getLayout()).getHorizontalScrollBarPolicy());
+        });
+        JButton ba = new JButton("Always");
+        ba.addActionListener(e -> {
+            PassFailJFrame.log("pane before: "
+                    + scroll.getVerticalScrollBarPolicy()
+                    + scroll.getHorizontalScrollBarPolicy());
+            PassFailJFrame.log("layout before: "
+                    + ((ScrollPaneLayout) scroll.getLayout()).getVerticalScrollBarPolicy()
+                    + ((ScrollPaneLayout) scroll.getLayout()).getHorizontalScrollBarPolicy());
+            scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+            scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+            PassFailJFrame.log("pane after: "
+                    + scroll.getVerticalScrollBarPolicy()
+                    + scroll.getHorizontalScrollBarPolicy());
+            PassFailJFrame.log("layout after: "
+                    + ((ScrollPaneLayout) scroll.getLayout()).getVerticalScrollBarPolicy()
+                    + ((ScrollPaneLayout) scroll.getLayout()).getHorizontalScrollBarPolicy());
+        });
+        JLabel ch = new JLabel("ColumnHeader");
+        scroll.setColumnHeaderView(ch);
+        JButton b1 = new JButton("Colhead");
+        b1.addActionListener(e -> {
+            JPanel filler = new JPanel();
+            filler.setSize(150, 150);
+            filler.setBackground(Color.yellow);
+            scroll.getColumnHeader().add(filler);
+        });
+        JButton b2 = new JButton("Corners");
+        b2.addActionListener(e -> {
+            JPanel filler1 = new JPanel();
+            filler1.setSize(150, 150);
+            filler1.setBackground(Color.green);
+            scroll.setCorner(JScrollPane.LOWER_RIGHT_CORNER, filler1);
+            JPanel filler2 = new JPanel();
+            filler2.setSize(150, 150);
+            filler2.setBackground(Color.green);
+            scroll.setCorner(JScrollPane.LOWER_LEFT_CORNER, filler2);
+            JPanel filler3 = new JPanel();
+            filler3.setSize(150, 150);
+            filler3.setBackground(Color.green);
+            scroll.setCorner(JScrollPane.UPPER_RIGHT_CORNER, filler3);
+            JPanel filler4 = new JPanel();
+            filler4.setSize(150, 150);
+            filler4.setBackground(Color.green);
+            scroll.setCorner(JScrollPane.UPPER_LEFT_CORNER, filler4);
+        });
+        JLabel rh = new JLabel("RowHeader");
+        scroll.setRowHeaderView(rh);
+        JButton b3 = new JButton("Rowhead");
+        b3.addActionListener(e -> {
+            JPanel filler = new JPanel();
+            filler.setSize(150, 150);
+            filler.setBackground(Color.yellow);
+            scroll.getRowHeader().add(filler);
+        });
+        JButton b4 = new JButton("Viewport");
+        b4.addActionListener(e -> {
+            JPanel filler = new JPanel();
+            filler.setSize(150, 150);
+            filler.setBackground(Color.yellow);
+            scroll.getViewport().add(filler);
+        });
+
+        p.add(bn);
+        p.add(ba);
+        p.add(b1);
+        p.add(b2);
+        p.add(b3);
+        p.add(b4);
+        f.add(p);
+        f.setSize(300, 300);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JScrollPane/bug4237517.java b/test/jdk/javax/swing/JScrollPane/bug4237517.java
new file mode 100644
index 00000000000..4e1d1356199
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/bug4237517.java
@@ -0,0 +1,69 @@
+/*
+ * 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 4237517
+ * @summary Tests that scrolling with blit draws the right thing
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4237517
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+
+public class bug4237517 {
+    static final String INSTRUCTIONS = """
+        Select the first item in the list and hit PageDown
+        key two times. If the list is redrawn correctly,
+        i.e. if the digits go in order, then the test PASSES.
+        Otherwise, the test FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4237517 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4237517::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Scrolling Window Blit Test");
+        String[] data = new String[100];
+
+        for (int counter = 0; counter < data.length; counter++) {
+            data[counter] = Integer.toString(counter);
+        }
+        JList list = new JList(data);
+        JScrollPane sp = new JScrollPane(list);
+        sp.getViewport().putClientProperty("EnableWindowBlit", Boolean.TRUE);
+        f.add(sp);
+        f.setSize(200, 200);
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JScrollPane/bug4237560.java b/test/jdk/javax/swing/JScrollPane/bug4237560.java
new file mode 100644
index 00000000000..4f8f27683e5
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/bug4237560.java
@@ -0,0 +1,77 @@
+/*
+ * 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 4237560
+ * @summary Tests that JScrollPane do not distort TAB order in an HTML page
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4237560
+ */
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+
+public class bug4237560 {
+    static final String INSTRUCTIONS = """
+        A JEditorPane contains 10 input fields and is inserted into
+        JScrollPane. Click text field #8 so that it is selected. Press
+        TAB three times (even if text field #9 and #10 are not visible in
+        the ScrollPane). If this gives focus to the first text field (#1)
+        the test PASSES, else it FAILS.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4237560 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4237560::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static final String TEXT = "<html><body><form method=\"POST\"><table>\n" +
+            "<tr><td><input type=\"text\" value=\"1\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"2\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"3\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"4\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"5\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"6\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"7\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"8\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"9\" size=\"20\"></td></tr>\n" +
+            "<tr><td><input type=\"text\" value=\"10\" size=\"20\"></td></tr>\n" +
+            "</table></form></body></html>";
+
+    private static JFrame createUI() {
+        JFrame frame = new JFrame("JScrollPane HTML TAB Test");
+        JEditorPane viewer = new JEditorPane("text/html", TEXT);
+        viewer.setEditable(false);
+        frame.add(new JScrollPane(viewer));
+        frame.setSize(300, 300);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JScrollPane/bug4244899.java b/test/jdk/javax/swing/JScrollPane/bug4244899.java
new file mode 100644
index 00000000000..4cb5367f4f5
--- /dev/null
+++ b/test/jdk/javax/swing/JScrollPane/bug4244899.java
@@ -0,0 +1,99 @@
+/*
+ * 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 4244899
+ * @summary Tests whether scrolling with blit has artifacts
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4244899
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+public class bug4244899 {
+    static final String INSTRUCTIONS = """
+        Widen the first column of the table, so that
+        you get a horizontal scrollbar. Click in the
+        scrollbar (not on the thumb, but in the track).
+        If you notice some artifacts/flashing at
+        the bottom of the frame, the test FAILS.
+        Otherwise, the test PASSES.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4244899 Test Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(bug4244899::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static class TestModel extends AbstractTableModel {
+        private final int rows = 20;
+        private final int cols = 5;
+
+        private Integer[][] data;
+
+        public TestModel() {
+            data = new Integer[rows][];
+            int realCount = 0;
+            for (int counter = 0; counter < rows; counter++) {
+                data[counter] = new Integer[cols];
+                for (int y = 0; y < cols; y++) {
+                    data[counter][y] = Integer.valueOf(realCount);
+                    realCount = (realCount + 1) % 23;
+                }
+            }
+        }
+
+        public int getRowCount() {
+            return data.length;
+        }
+
+        public int getColumnCount() {
+            return data[0].length;
+        }
+
+        public Object getValueAt(int row, int column) {
+            return data[row][column];
+        }
+    }
+
+    static JFrame createUI() {
+        JFrame f = new JFrame("Scrolling Blit Artifact Test");
+        JTable table = new JTable(new TestModel());
+        JScrollPane sp = new JScrollPane(table);
+        sp.getViewport().putClientProperty("EnableWindowBlit", Boolean.TRUE);
+        table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        f.add(sp);
+        f.setSize(400, 400);
+        return f;
+    }
+}

From b7e8952ad6def4ebae8c8c3c04cf6793f472b029 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 22 Apr 2025 23:21:26 +0000
Subject: [PATCH 063/901] 8355071: Fix nsk/jdi test to not require lookup of
 main thread in order to set the breakpoint used for communication

Reviewed-by: lmesnik, amenkov
---
 .../BooleanType/_itself_/booleantype001.java  | 11 +----
 .../addInstanceFilter/instancefilter002.java  | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../addThreadFilter/threadfilter002.java      | 12 +-----
 .../addThreadFilter/threadfilter003.java      | 12 +-----
 .../location/location001.java                 | 13 +-----
 .../jdi/ByteType/_itself_/bytetype001.java    | 11 +----
 .../jdi/CharType/_itself_/chartype001.java    | 11 +----
 .../definedClasses/definedclasses001.java     | 11 +----
 .../visibleClasses/visibleclasses001.java     | 11 +----
 .../addClassExclusionFilter/filter003.java    | 15 ++-----
 .../addClassFilter_rt/filter_rt002.java       | 12 +-----
 .../addClassFilter_s/filter_s002.java         | 13 +-----
 .../DoubleType/_itself_/doubletype001.java    | 11 +----
 .../nsk/jdi/Event/request/request001.java     | 13 +-----
 .../EventIterator/nextEvent/nextevent001.java | 13 +-----
 .../nsk/jdi/EventQueue/remove/remove004.java  | 15 +------
 .../jdi/EventQueue/remove_l/remove_l004.java  | 15 +------
 .../addCountFilter/addcountfilter001.java     | 12 +-----
 .../jdi/EventRequest/disable/disable002.java  | 12 +-----
 .../jdi/EventRequest/enable/enable001.java    | 12 +-----
 .../jdi/EventRequest/enable/enable002.java    | 12 +-----
 .../getProperty/getproperty001.java           | 12 +-----
 .../EventRequest/isEnabled/isenabled001.java  | 12 +-----
 .../putProperty/putproperty001.java           | 12 +-----
 .../setEnabled/setenabled001.java             | 12 +-----
 .../setEnabled/setenabled002.java             | 12 +-----
 .../setEnabled/setenabled003.java             | 12 +-----
 .../setSuspendPolicy/setsuspendpolicy001.java | 12 +-----
 .../suspendPolicy/suspendpolicy001.java       | 12 +-----
 .../accwtchpreq002.java                       | 12 +-----
 .../breakpointRequests/breakpreq002.java      | 12 +-----
 .../classPrepareRequests/clsprepreq002.java   | 12 +-----
 .../classUnloadRequests/clsunlreq002.java     | 12 +-----
 .../craccwtchpreq003.java                     | 12 +-----
 .../crbreakpreq003.java                       | 12 +-----
 .../createClassPrepareRequest/cpreg001.java   | 12 +-----
 .../createClassUnloadRequest/cureg001.java    | 12 +-----
 .../createExceptionRequest/crexreq009.java    | 12 +-----
 .../createExceptionRequest/crexreq010.java    | 12 +-----
 .../createMethodEntryRequest/menreg001.java   | 12 +-----
 .../createMethodExitRequest/mexreg001.java    | 12 +-----
 .../crmodwtchpreq003.java                     | 12 +-----
 .../createStepRequest/crstepreq002.java       | 12 +-----
 .../createStepRequest/crstepreq003.java       | 10 +----
 .../createStepRequest/crstepreq004.java       |  6 +--
 .../createThreadDeathRequest/tdreg001.java    | 12 +-----
 .../createThreadStartRequest/tsreg001.java    | 12 +-----
 .../createVMDeathRequest/vmdreg001.java       | 12 +-----
 .../deleteAllBreakpoints/delallbreakp002.java | 12 +-----
 .../deleteEventRequest/delevtreq002.java      | 12 +-----
 .../deleteEventRequests/delevtreqs002.java    | 12 +-----
 .../exceptionRequests/excreq002.java          | 12 +-----
 .../methodEntryRequests/methentreq002.java    | 12 +-----
 .../methodExitRequests/methexitreq002.java    | 12 +-----
 .../modwtchpreq002.java                       | 12 +-----
 .../stepRequests/stepreq002.java              | 12 +-----
 .../threadDeathRequests/thrdeathreq002.java   | 12 +-----
 .../threadStartRequests/thrstartreq002.java   | 12 +-----
 .../vmDeathRequests/vmdeathreq001.java        | 12 +-----
 .../eventIterator/eventiterator001.java       | 13 +-----
 .../eventIterator/eventiterator002.java       | 14 ++-----
 .../eventIterator/eventiterator003.java       | 11 +----
 .../eventIterator/eventiterator004.java       | 13 +-----
 .../nsk/jdi/EventSet/resume/resume002.java    | 13 ++----
 .../nsk/jdi/EventSet/resume/resume003.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume004.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume005.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume006.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume007.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume010.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume011.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume012.java    | 12 ++----
 .../nsk/jdi/EventSet/resume/resume013.java    | 12 ++----
 .../suspendPolicy/suspendpolicy001.java       | 12 ++----
 .../suspendPolicy/suspendpolicy002.java       | 12 ++----
 .../suspendPolicy/suspendpolicy003.java       | 12 ++----
 .../suspendPolicy/suspendpolicy004.java       | 12 ++----
 .../suspendPolicy/suspendpolicy005.java       | 12 ++----
 .../suspendPolicy/suspendpolicy006.java       | 12 ++----
 .../suspendPolicy/suspendpolicy007.java       | 12 ++----
 .../suspendPolicy/suspendpolicy008.java       | 12 ++----
 .../suspendPolicy/suspendpolicy009.java       | 12 ++----
 .../suspendPolicy/suspendpolicy010.java       | 12 ++----
 .../suspendPolicy/suspendpolicy011.java       | 12 ++----
 .../suspendPolicy/suspendpolicy012.java       | 12 ++----
 .../suspendPolicy/suspendpolicy013.java       | 12 ++----
 .../suspendPolicy/suspendpolicy014.java       | 12 ++----
 .../suspendPolicy/suspendpolicy015.java       | 12 ++----
 .../suspendPolicy/suspendpolicy016.java       | 12 ++----
 .../suspendPolicy/suspendpolicy017.java       | 12 ++----
 .../addClassExclusionFilter/filter002.java    | 12 +-----
 .../addClassFilter_rt/filter_rt002.java       | 12 +-----
 .../addClassFilter_s/filter_s002.java         | 12 +-----
 .../addInstanceFilter/instancefilter002.java  | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../addThreadFilter/threadfilter002.java      | 12 +-----
 .../addThreadFilter/threadfilter003.java      | 12 +-----
 .../exception/exception001.java               | 12 +-----
 .../notifyCaught/notifycaught001.java         | 12 +-----
 .../notifyUncaught/notifyuncaught001.java     | 12 +-----
 .../jdi/FloatType/_itself_/floattype001.java  | 11 +----
 .../IntegerType/_itself_/integertype001.java  | 11 +----
 .../jdi/LocatableEvent/thread/thread001.java  | 11 +----
 .../jdi/LongType/_itself_/longtype001.java    | 11 +----
 .../jdi/Method/isObsolete/isobsolete001.java  | 17 +++-----
 .../jdi/Method/isObsolete/isobsolete002.java  | 17 +++-----
 .../addClassExclusionFilter/filter002.java    | 12 +-----
 .../addClassFilter_rt/filter_rt002.java       | 12 +-----
 .../addClassFilter_s/filter_s002.java         | 12 +-----
 .../addInstanceFilter/instancefilter002.java  | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../addThreadFilter/threadfilter002.java      | 12 +-----
 .../addThreadFilter/threadfilter003.java      | 12 +-----
 .../addClassExclusionFilter/filter002.java    | 12 +-----
 .../addClassFilter_rt/filter_rt002.java       | 12 +-----
 .../addClassFilter_s/filter_s002.java         | 12 +-----
 .../addInstanceFilter/instancefilter002.java  | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../addThreadFilter/threadfilter002.java      | 12 +-----
 .../addThreadFilter/threadfilter003.java      | 12 +-----
 .../_itself_/mwevent001.java                  | 12 +-----
 .../disablecollection002.java                 | 11 +----
 .../classPath/classpath001.java               | 15 +------
 .../_itself_/primitivetype001.java            | 11 +----
 .../classLoader/classloader001.java           | 15 +------
 .../ReferenceType/getValue/getvalue001.java   | 15 +------
 .../ReferenceType/getValue/getvalue002.java   | 15 +------
 .../ReferenceType/getValue/getvalue003.java   | 15 +------
 .../ReferenceType/getValues/getvalues001.java | 15 +------
 .../jdi/ReferenceType/isFinal/isfinal001.java | 15 +------
 .../ReferenceType/isStatic/isstatic001.java   | 11 +----
 .../ReferenceType/isStatic/isstatic002.java   | 11 +----
 .../nestedTypes/nestedtypes001.java           | 15 +------
 .../nestedTypes/nestedtypes002.java           | 15 +------
 .../jdi/ShortType/_itself_/shorttype001.java  | 11 +----
 .../addClassExclusionFilter/filter002.java    | 16 ++-----
 .../addClassFilter_rt/filter_rt002.java       | 12 +-----
 .../addClassFilter_s/filter_s002.java         | 12 +-----
 .../addInstanceFilter/instancefilter002.java  | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../nsk/jdi/StepRequest/depth/depth001.java   | 12 +-----
 .../nsk/jdi/StepRequest/depth/depth002.java   | 12 +-----
 .../nsk/jdi/StepRequest/depth/depth003.java   | 12 +-----
 .../nsk/jdi/StepRequest/size/size001.java     | 12 +-----
 .../nsk/jdi/StepRequest/size/size002.java     | 12 +-----
 .../nsk/jdi/StepRequest/thread/thread001.java | 12 +-----
 .../addThreadFilter/addthreadfilter001.java   | 13 +-----
 .../addThreadFilter/addthreadfilter002.java   | 14 ++-----
 .../addThreadFilter/addthreadfilter003.java   | 11 +----
 .../addThreadFilter/addthreadfilter005.java   | 12 +-----
 .../popFrames/popframes001.java               | 15 +------
 .../popFrames/popframes002.java               | 14 +------
 .../popFrames/popframes003.java               | 19 ++-------
 .../popFrames/popframes004.java               | 12 +-----
 .../popFrames/popframes005.java               | 12 +-----
 .../addThreadFilter/addthreadfilter001.java   | 13 +-----
 .../addThreadFilter/addthreadfilter003.java   | 11 +----
 .../addThreadFilter/addthreadfilter005.java   | 12 +-----
 .../jdi/VMDeathEvent/_itself_/vmdeath002.java | 11 +----
 .../jdi/VMDeathEvent/_itself_/vmdeath003.java | 11 +----
 .../allClasses/allclasses001.java             | 15 +------
 .../canAddMethod/canaddmethod001.java         | 15 +------
 .../canPopFrames/canpopframes001.java         | 15 +------
 .../canredefineclasses001.java                | 15 +------
 .../canreqvmdev001.java                       | 15 +------
 .../curc001.java                              | 15 +------
 .../canusefilters001.java                     | 15 +------
 .../canwatchaccess001.java                    | 15 +------
 .../canwatchmod001.java                       | 15 +------
 .../redefineClasses/redefineclasses001.java   | 25 ++++-------
 .../jdi/VoidType/_itself_/voidtype001.java    | 11 +----
 .../addClassExclusionFilter/filter003.java    | 12 +-----
 .../addClassExclusionFilter/filter004.java    | 12 +-----
 .../addClassFilter_rt/filter_rt003.java       | 12 +-----
 .../addClassFilter_rt/filter_rt004.java       | 12 +-----
 .../addClassFilter_s/filter_s003.java         | 12 +-----
 .../addClassFilter_s/filter_s004.java         | 12 +-----
 .../addInstanceFilter/instancefilter003.java  | 12 +-----
 .../addInstanceFilter/instancefilter004.java  | 12 +-----
 .../addInstanceFilter/instancefilter005.java  | 12 +-----
 .../addInstanceFilter/instancefilter006.java  | 12 +-----
 .../addThreadFilter/addthreadfilter003.java   | 12 +-----
 .../addThreadFilter/addthreadfilter004.java   | 12 +-----
 .../addThreadFilter/addthreadfilter005.java   | 12 +-----
 .../addThreadFilter/addthreadfilter006.java   | 12 +-----
 .../jdi/WatchpointRequest/field/field001.java | 13 +-----
 .../jdi/WatchpointRequest/field/field002.java | 12 +-----
 .../vmTestbase/nsk/share/jdi/JDIBase.java     | 42 ++++++++++++++++++-
 189 files changed, 462 insertions(+), 1923 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
index 92bb93ad15c..49c0b778c76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BooleanType/_itself_/booleantype001.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
@@ -244,14 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
index e37ee7eacbe..31dd6718177 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter002.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
@@ -257,15 +257,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
index 612792a417b..5562d2c4239 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addInstanceFilter/instancefilter003.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
@@ -245,15 +245,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
index 6d39e3d31c1..b76ccc799f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter002.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
index 421ffc26185..ff18b6b6cf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/addThreadFilter/threadfilter003.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm = "lineForComm";
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                debuggeeClass,
-                bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
index f2d2de73210..325159b6eb5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointRequest/location/location001.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
@@ -250,16 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
index 4c56c75ad13..36666e3b08e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ByteType/_itself_/bytetype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
index 66579c598b7..3b0d71619ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/CharType/_itself_/chartype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
index 59fc1a0ab11..c7b9cb92858 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/definedClasses/definedclasses001.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
@@ -241,14 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
index 63b6fec010c..1d561c27b95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassLoaderReference/visibleClasses/visibleclasses001.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
@@ -255,14 +255,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
index cabaf723c14..c0bfe91a750 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.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
@@ -244,18 +244,9 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
+        setupBreakpointForCommunication(debuggeeClass);
 
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
-
-    //------------------------------------------------------  testing section
+        //------------------------------------------------------  testing section
 
         log1("     TESTING BEGINS");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
index dfaaa176977..9be0d89a4b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
index c175dff4e2f..1cc0dff5c99 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.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
@@ -250,16 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
index c7aa128fa94..99ddbbdcbcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/DoubleType/_itself_/doubletype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
index c6d7b7292e7..970aedb047d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001.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
@@ -308,16 +308,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
index 11b6e4824fc..a6018450771 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001.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
@@ -306,16 +306,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
index a5d74ff3d95..f6cf40dad38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove/remove004.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
@@ -243,18 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
index 056030aab3d..9a84dd3f0fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l004.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
@@ -238,18 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
index 41411b88ac9..f4e41409cae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
index 2bf6c911e6d..b46bf2ee1a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
index 109ab148806..615cf46c746 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
index f4f9a14ac1d..767f069438f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
index 886993a4bb0..b4b9f0edcbc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
index 3ef5500e4ab..d91db9a5a6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.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
@@ -245,15 +245,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
index fcedeca850b..479c40904e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
index 1d7c80dfa34..57ed8454eda 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.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
@@ -243,15 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
index c7bcfaa47b7..25b665dbed9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.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
@@ -247,15 +247,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
index 8e129027b51..7ebe5b99a1f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
index e1b315519fd..04995ea0b13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
index 7f927de1577..b11a291b2f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
index f27f6a12e31..c7b1af9d79b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/accessWatchpointRequests/accwtchpreq002.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
@@ -245,15 +245,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
index 4046560e444..69979345382 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/breakpointRequests/breakpreq002.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
@@ -240,15 +240,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
index c9719ba3a54..b2905b6527e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
index b6bc52f154e..c185b8b398e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classUnloadRequests/clsunlreq002.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
index 2be4f8afc9d..9326ce5c7d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createAccessWatchpointRequest/craccwtchpreq003.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
index 610a691b269..b4af90a642c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createBreakpointRequest/crbreakpreq003.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
index dd0848af06c..62761b58d33 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassPrepareRequest/cpreg001.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
@@ -240,15 +240,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
index bba4427d531..4cedae783cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createClassUnloadRequest/cureg001.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
@@ -239,15 +239,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
index 4ba4bba13a3..fa92b0e5b96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq009.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
@@ -242,15 +242,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
index 6d466265ddf..28a787d957f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createExceptionRequest/crexreq010.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
@@ -243,15 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
index e744ec1e8f8..7bfeb11932a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodEntryRequest/menreg001.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
@@ -239,15 +239,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
index 9d107ee60b0..94b97da9c0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createMethodExitRequest/mexreg001.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
@@ -238,15 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
index 24198633580..6059dead131 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createModificationWatchpointRequest/crmodwtchpreq003.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
@@ -243,15 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
index da62eaea146..a5dd9023dfd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.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
@@ -243,15 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
index 129d9470730..d712fb34c42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.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
@@ -157,14 +157,6 @@ private int runThis(String argv[], PrintStream out) {
     //--------------------------------------------------------- mutable common methods
 
     private void execTest() {
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-/*
-        BreakpointRequest bpRequest = setBreakpoint( mainThread,
-                                                     debuggeeClass,
-                                                     "methodForCommunication",
-                                                     2,
-                                                     "breakpointForCommunication");
-*/
         BreakpointRequest bpRequest = setBreakpoint( null,
                                                      debuggeeClass,
                                                      "breakInThread",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
index 24305ec29f2..1ab0ce68af8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.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
@@ -158,9 +158,7 @@ private int runThis(String argv[], PrintStream out) {
     //--------------------------------------------------------- mutable common methods
 
     private void execTest() {
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = setBreakpoint( mainThread,
+        BreakpointRequest bpRequest = setBreakpoint( null,
                                                      debuggeeClass,
                                                      "methodForCommunication",
                                                      lineForBreakInThread,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
index 5c650112f56..e2045f9a94d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadDeathRequest/tdreg001.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
@@ -239,15 +239,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
index 8b594d43285..ed81b00561e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createThreadStartRequest/tsreg001.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
@@ -238,15 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
index dcc5c1b680c..29f1cacf7e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createVMDeathRequest/vmdreg001.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
index 072277425cc..9ed87be5e11 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteAllBreakpoints/delallbreakp002.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
@@ -240,15 +240,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
index 9cfafaea23e..5b5481af063 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequest/delevtreq002.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
index 8a53a91e8e1..03e5e38a3ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/deleteEventRequests/delevtreqs002.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
index 7c59958fb89..78219909d03 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/exceptionRequests/excreq002.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
@@ -242,15 +242,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
index 2b37b6e47fa..95a9b36d826 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
index e63a1cd4349..f975441a9ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.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
@@ -240,15 +240,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
index fe60b2c3963..8a9d5fcbd34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/modificationWatchpointRequests/modwtchpreq002.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
@@ -247,15 +247,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
index b4354995389..e1f2677c429 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq002.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
index ab46a848c8e..9e1b9d8edec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadDeathRequests/thrdeathreq002.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
index f7607b22e08..d192c61470d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
index 7f839dcc192..3f740b2f30e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/vmDeathRequests/vmdeathreq001.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
@@ -241,15 +241,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
index f16ab02ddfe..e56fb00108d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator001.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
@@ -266,16 +266,7 @@ private void testRun()
 
                 cpRequest.disable();
                 debuggeeClass = event.referenceType();
-
-                String          bPointMethod = "methodForCommunication";
-                String          lineForComm  = "lineForComm";
-                ThreadReference mainThread   = debuggee.threadByNameOrThrow("main");
-
-                BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                              debuggeeClass,
-                                              bPointMethod, lineForComm, "zero");
-                bpRequest.enable();
-
+                setupBreakpointForCommunication(debuggeeClass);
             } else if (property.equals("TestClassPrepareRequest")) {
                 nn2++;
                 if (nn2 > 1)
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
index e0a32aa0aa2..0d374f39e37 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator002.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
@@ -255,16 +255,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -286,6 +277,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
index 323dea95fe7..35a9eedfd4d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator003.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
@@ -251,14 +251,7 @@ private void testRun() throws JDITestRuntimeException, Exception {
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread, debuggeeClass, bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
index 084db7b6676..20686736deb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/eventIterator/eventiterator004.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
@@ -276,16 +276,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
index 09bcb91cbdd..b391036fa26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002.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
@@ -260,14 +260,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -287,10 +280,10 @@ private void testRun()
 
         ReferenceType testClassReference = null;
 
-
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
index 3ea05a0c7d9..0e13529f5e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003.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
@@ -260,14 +260,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -291,6 +284,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
index 413309e92ad..398e6f074a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -285,6 +278,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
index 13e0344dd3f..7074828dc8d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -285,6 +278,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
index ef87bba8a0d..492afad89ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -282,6 +275,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
index 235fe36c35c..8052c193954 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -282,6 +275,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
index d49e0c516a3..443b7e94286 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -281,6 +274,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
index fb9c1e6fde4..0eb923321bd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume011.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
@@ -254,14 +254,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -280,6 +273,7 @@ private void testRun()
 
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
index 3d153675ee8..32f30882efb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume012.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
@@ -255,14 +255,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -281,6 +274,7 @@ private void testRun()
 
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
index d1fc3cb68bb..6019903d6b8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume013.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
@@ -255,14 +255,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -280,6 +273,7 @@ private void testRun()
 
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
index dd51b0d0390..d145bf46136 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.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
@@ -257,14 +257,8 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
index 01be6ad55c4..93f0a5ca627 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy002.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
@@ -258,14 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -300,6 +293,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
index 522d6019f25..5c0052e84f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy003.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
@@ -265,14 +265,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -308,6 +301,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
index cddb7ace5b0..d6b6a76be19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy004.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
@@ -259,14 +259,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -303,6 +296,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
index 9d0c7604aba..cfdb6513482 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy005.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
@@ -259,14 +259,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -303,6 +296,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
index 068dd94eead..660f4bbbc36 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy006.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
@@ -258,14 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -301,6 +294,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
index 4601a0039fa..71abca720e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy007.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
@@ -258,14 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -300,6 +293,7 @@ private void testRun()
 
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
index d507d8c6a38..f0838067241 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy008.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
@@ -258,14 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -295,6 +288,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
index ca284271be8..21bffce5cf3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy009.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
@@ -258,14 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -295,6 +288,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication(debuggeeName);
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
index ec015576277..7bd3b660b93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy010.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
@@ -257,14 +257,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -294,6 +287,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
index 03d7677c0fb..47025717ed7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy011.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
@@ -266,14 +266,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -300,6 +293,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
index bb5488d9eb6..420b2fe6c87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy012.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
@@ -265,14 +265,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -299,6 +292,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
index d78655d1b2a..db3a15f3571 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy013.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
@@ -266,14 +266,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -300,6 +293,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
index 511dc1ddcc1..d1258b93b0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy014.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
@@ -267,14 +267,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -301,6 +294,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
index a3961c1d005..a14f2485129 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy015.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
@@ -267,14 +267,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -301,6 +294,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
index 0b6257f34ef..3c270b547fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy016.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
@@ -265,14 +265,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -299,6 +292,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
index c7589574ee5..171db5a9bb6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy017.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
@@ -267,14 +267,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        String            bPointMethod = "methodForCommunication";
-        String            lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         vm.resume();
 
@@ -301,6 +294,7 @@ private void testRun()
         int policy = 0;
 
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
index d0dac294c8b..9402145c3a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassExclusionFilter/filter002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
index c3a39e40d0b..ea0e2d36891 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_rt/filter_rt002.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
index 8fa62d0edfc..c5cad69c37d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addClassFilter_s/filter_s002.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
index 6f62f5b08d5..c39f6c8c15d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter002.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
@@ -257,15 +257,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
index f1e9f6607ff..80f8c4024e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addInstanceFilter/instancefilter003.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
@@ -245,15 +245,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
index d641750204c..bb20c736a06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter002.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
index 467a66f52fc..0d6f85304c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/addThreadFilter/threadfilter003.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
index 4c0d1824812..ef0bf984182 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/exception/exception001.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
@@ -244,15 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
         vm.resume();
 
     //------------------------------------------------------  testing section
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
index ad747876586..fd3410f5d4c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyCaught/notifycaught001.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
@@ -242,15 +242,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
index 883e020caa6..557f60138ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionRequest/notifyUncaught/notifyuncaught001.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
@@ -242,15 +242,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
index 156d4b471ba..5a051ad546f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/FloatType/_itself_/floattype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
index 206882b2768..e40dbb1b784 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/IntegerType/_itself_/integertype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
index 543123066cf..f2031008b2f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001.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
@@ -253,14 +253,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
index 05d5baf3a66..a483e04e5d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LongType/_itself_/longtype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
index 02ce3f5e020..6ccbbca659c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete001.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
@@ -261,16 +261,7 @@ private void testRun()
             return;
         }
 
-
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference mainThread = debuggee.threadByName("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -288,6 +279,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -315,7 +307,8 @@ private void testRun()
                       log2("     : isObsolete() == false for m2 method before redefineClasses() invocation ");
 
                   // Create breakpoint request to have isobsolete002b.m2 on the top of the stack.
-                  bpRequest = debuggee.makeBreakpoint(redefClass, methodName, brkpLineNumber);
+                  BreakpointRequest bpRequest =
+                      debuggee.makeBreakpoint(redefClass, methodName, brkpLineNumber);
                   bpRequest.addThreadFilter(mainThread);
                   bpRequest.setSuspendPolicy( EventRequest.SUSPEND_EVENT_THREAD);
                   bpRequest.putProperty("number", "one");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
index 1693a63843e..35f59f55524 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete002.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
@@ -259,16 +259,7 @@ private void testRun()
             return;
         }
 
-
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-        ThreadReference mainThread = debuggee.threadByName("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -284,6 +275,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -315,7 +307,8 @@ private void testRun()
                       log2("     : isObsolete() == false for m2 method before redefineClasses() invocation");
 
                   // Create breakpoint request to have isobsolete002b.m2 on the top of the stack.
-                  bpRequest = debuggee.makeBreakpoint(redefClass, methodName, brkpLineNumber);
+                  BreakpointRequest bpRequest =
+                      debuggee.makeBreakpoint(redefClass, methodName, brkpLineNumber);
                   bpRequest.addThreadFilter(mainThread);
                   bpRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
                   bpRequest.putProperty("number", "one");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
index 5fef3066c44..6e293a98670 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
index 1d83e104b72..b34e5c577db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_rt/filter_rt002.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
index 7cb4c40ee47..215639d825f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassFilter_s/filter_s002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
index 3f013618ac9..02cdff05b4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter002.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
@@ -257,15 +257,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
index 67009ca963d..a6386045f20 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addInstanceFilter/instancefilter003.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
index b889d75510b..a5a2b16318e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter002.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
index 161190a7abd..da83ab4ece4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addThreadFilter/threadfilter003.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
index 75f7ad3a523..3fd039e10d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
index 374ebace2ff..4dedd0debb0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_rt/filter_rt002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
index 3d243865d1a..917bc96c467 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassFilter_s/filter_s002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
index 25ccf74fe0d..a00e92c32e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter002.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
@@ -257,15 +257,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
index 33d8d261291..c5414ae5ae1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addInstanceFilter/instancefilter003.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
index b87bfba5fa6..8d2dab19a45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter002.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
@@ -251,15 +251,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
index b09d7f46f9e..0067f7dde19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addThreadFilter/threadfilter003.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
@@ -251,15 +251,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
index 42a1e08eb3b..ef10699b5fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ModificationWatchpointEvent/_itself_/mwevent001.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
@@ -252,15 +252,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
index 89dcfde4d99..b7ea4154fec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/disableCollection/disablecollection002.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
@@ -261,14 +261,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
index 97908175e7b..f67e21a7cdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PathSearchingVirtualMachine/classPath/classpath001.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
@@ -244,18 +244,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
index a3c32fb0d27..bb3d23352a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/PrimitiveType/_itself_/primitivetype001.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
@@ -237,14 +237,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
index 644e60f4844..1040f7eba69 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classLoader/classloader001.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
@@ -230,18 +230,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
index bcd64b0b460..ad2be88a6db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue001.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
@@ -231,18 +231,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
index 5d7439b2f8c..8c9aae8802b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue002.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
@@ -230,18 +230,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
index b81bfd78729..46411cb9d74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValue/getvalue003.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
@@ -230,18 +230,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
index b14d687b411..4e7fb04fe0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/getValues/getvalues001.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
@@ -234,18 +234,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
index 885e1ec17a4..88d0d5d8138 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isFinal/isfinal001.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
@@ -218,18 +218,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
index e6e901f31e5..d72a6480dbf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic001.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
@@ -246,14 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
index d07705fe4c6..b3cf2483d80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isStatic/isstatic002.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
@@ -246,14 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
index 69d2a8ed24b..7369b663876 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes001.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
@@ -224,18 +224,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
index 344e1fd199a..dce3f638f28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/nestedTypes/nestedtypes002.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                    debuggeeClass,
-                    bPointMethod, lineForComm, "zero");
-        } catch (Exception e) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
         //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
index fea3e5c78b4..54e297f27e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ShortType/_itself_/shorttype001.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
@@ -238,14 +238,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
index e53f12004cf..d64fa09323c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter002.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -271,6 +263,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -287,8 +280,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     ThreadReference thread1 = debuggee.threadByNameOrThrow("main");
-                     eventRequest1 = setting23StepRequest(thread1, testedClassName1,
+                     eventRequest1 = setting23StepRequest(mainThread, testedClassName1,
                                               EventRequest.SUSPEND_NONE, property1);
 
                      eventRequest1.enable();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
index e12e48e9ebf..23be3eab4c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
index db080ef80ed..d4ff86268da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
index e75a998a07c..19ddd279425 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter002.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
@@ -257,15 +257,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
index f4fa3e1bf68..1f8236db782 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addInstanceFilter/instancefilter003.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
index 99d24970e6d..de63a0af86b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
index 09b0fa297b4..5cd109f6fa3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
index ef3668a66e8..03b8f415b56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
index 33b2c02e8eb..db59bf6e498 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
index 5a0df354569..09b0c53ea8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.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
@@ -246,15 +246,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
index 8bb9711d37b..a8d3769c6c2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
index 542a5280d4b..020c04c05d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter001.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
@@ -243,16 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
index 4d572e1d12c..961a38a6393 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter002.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
@@ -240,16 +240,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -259,6 +250,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
index 70d9e87fee4..3a5770ff03c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter003.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
@@ -254,14 +254,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
index 30fac8e0aaa..d07758242ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadDeathRequest/addThreadFilter/addthreadfilter005.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
@@ -254,15 +254,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
index 69c30d0aa24..3091f510977 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.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
@@ -260,18 +260,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
index 2e5b28c2dfc..c47358e96f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.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
@@ -111,7 +111,6 @@ public static int run (String argv[], PrintStream out) {
 
     //====================================================== test program
 
-    BreakpointRequest bpRequest;
     BreakpointRequest breakpointRequest2;
     BreakpointRequest breakpointRequest3;
 
@@ -259,16 +258,7 @@ private void testRun()
             return;
         }
 
-
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        log2("......setting BreakpointRequest (bpRequest) in main thread");
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        log2("bpRequest.enable();");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
index 27866885bdb..84ee5996a77 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.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
@@ -110,7 +110,6 @@ public static int run (String argv[], PrintStream out) {
 
     //====================================================== test program
 
-    BreakpointRequest  bpRequest;
     MethodEntryRequest meRequest;
 
     BreakpointRequest  bpRequest2;
@@ -260,18 +259,7 @@ private void testRun()
             return;
         }
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference threadMainRef = debuggee.threadByNameOrThrow("main");
-        try {
-            bpRequest = settingBreakpoint(threadMainRef,
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -284,9 +272,10 @@ private void testRun()
 
         vm.resume();
         breakpointForCommunication();
+        ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
         log2("......setting MethodEntryRequest (meRequest) in ForCommunication.methodForCommunication");
-        meRequest = settingMethodEntryRequest(threadMainRef,
+        meRequest = settingMethodEntryRequest(mainThread,
                                               debuggeeName + "$ForCommunication",
                                               "zero");
         log2("meRequest.enable();");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
index 5e06aec1810..eb46fac37da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.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
@@ -258,15 +258,7 @@ private void testRun()
             return;
         }
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        log2("......setting BreakpointRequest (bpRequest) in main thread");
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        log2("bpRequest.enable();");
-        bpRequest.enable();
+        bpRequest = setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
index 7618a200e28..ec499eba24d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.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
@@ -262,15 +262,7 @@ private void testRun()
             return;
         }
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        log2("......setting BreakpointRequest (bpRequest) in main thread");
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        log2("bpRequest.enable();");
-        bpRequest.enable();
+        bpRequest = setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
index ace63e511aa..b9a15b2c377 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.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
@@ -243,16 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
index 21cf8a9d164..cacda11b6c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter003.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
@@ -254,14 +254,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
index 8dad0781d16..255984d7a01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter005.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
@@ -248,15 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
index 1fa254e7d4a..12804532315 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath002.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
@@ -237,14 +237,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
index 8070d8143c1..26b4693d696 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.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
@@ -242,14 +242,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
index 44477e156f9..e5981bf0b34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allClasses/allclasses001.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
@@ -236,18 +236,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
index f0eea0731c0..d31f547f80d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canAddMethod/canaddmethod001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
index 03f38b66f1f..31e29c10240 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canPopFrames/canpopframes001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
index 88e54ac79a4..b1023026c47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRedefineClasses/canredefineclasses001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
index 8d057c809cb..aa43d39b559 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canRequestVMDeathEvent/canreqvmdev001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
index 62d44d8c7bb..b95f5a19a31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUnrestrictedlyRedefineClasses/curc001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
index c03cef0d05c..ad337dd54f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canUseInstanceFilters/canusefilters001.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
@@ -225,18 +225,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
index 466c2c6ed78..6b0d64d9781 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldAccess/canwatchaccess001.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
@@ -236,18 +236,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
index b64d346994d..07410545e9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canWatchFieldModification/canwatchmod001.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
@@ -237,18 +237,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        try {
-            bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          debuggeeClass,
-                                          bPointMethod, lineForComm, "zero");
-        } catch ( Exception e ) {
-            throw e;
-        }
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
index 5db62c170de..aab5c173f30 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses001.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
@@ -264,15 +264,7 @@ private void testRun()
             return;
         }
 
-
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -293,6 +285,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -310,9 +303,9 @@ private void testRun()
               case 0:
                   List          classes = vm.classesByName(bpClassName);
                   bpClass = (ReferenceType) classes.get(0);
-                  bpRequest2 = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          bpClass,
-                                          bpMethodName, bpLineName, "one");
+                  bpRequest2 = settingBreakpoint(mainThread,
+                                                 bpClass,
+                                                 bpMethodName, bpLineName, "one");
                   bpRequest2.enable();
 
                   vm.resume();
@@ -335,9 +328,9 @@ private void testRun()
 
               case 1:
 
-                  bpRequest3 = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                          bpClass,
-                                          bpMethodName, bpLineName, "one");
+                  bpRequest3 = settingBreakpoint(mainThread,
+                                                 bpClass,
+                                                 bpMethodName, bpLineName, "one");
 
                   bpRequest3.enable();
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
index f3e0c7f583d..90da9975df4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidType/_itself_/voidtype001.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
@@ -237,14 +237,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        bpRequest = settingBreakpoint(debuggee.threadByNameOrThrow("main"),
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
index 7b77beedc1a..d7a182cba79 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter003.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
index 6be78f1d596..0b8d7135cfb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassExclusionFilter/filter004.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
index 1fd6ae0ffde..0d2176b0910 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt003.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
index 1e37d5cac41..0bd09aca339 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_rt/filter_rt004.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
index 92234071cc6..d2ea9213899 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s003.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
index 21030c2bf40..3790d2e7dcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addClassFilter_s/filter_s004.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
@@ -250,15 +250,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
index 1d71e9990d3..5b3184ded80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter003.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
@@ -258,15 +258,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
index 12a0fdac2c8..dd02ed1c67f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter004.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
@@ -258,15 +258,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
index 005367911af..9e690424420 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter005.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
@@ -247,15 +247,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
index e479bb104eb..21756dfd59c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addInstanceFilter/instancefilter006.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
@@ -247,15 +247,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
index 344d0e36428..75f4e45345d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter003.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
@@ -261,15 +261,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
index c875dcaa034..b4c7b60971b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter004.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
@@ -261,15 +261,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
index e5bc8a555ed..9e371abf8ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter005.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
@@ -261,15 +261,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
index 3ee70ff8202..8f24855f9af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/addThreadFilter/addthreadfilter006.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
@@ -262,15 +262,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
index 36af014db0b..0b6d1b67a42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field001.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
@@ -248,16 +248,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
-
+        setupBreakpointForCommunication(debuggeeClass);
     //------------------------------------------------------  testing section
 
         log1("     TESTING BEGINS");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
index 3fbbeb5915b..314b0b32cc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointRequest/field/field002.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
@@ -249,15 +249,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
index bc722844afd..ac99b121651 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.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,12 +89,33 @@ public final void log3(String message) {
     protected Location breakpLocation = null;
     protected BreakpointEvent bpEvent;
 
+    protected final BreakpointRequest settingBreakpoint(
+                                                     ReferenceType testedClass,
+                                                     String methodName,
+                                                     String bpLine,
+                                                     String property)
+            throws JDITestRuntimeException {
+        return settingBreakpoint_private(null, testedClass, methodName, bpLine, property);
+    }
+
     protected final BreakpointRequest settingBreakpoint(ThreadReference thread,
                                                      ReferenceType testedClass,
                                                      String methodName,
                                                      String bpLine,
                                                      String property)
             throws JDITestRuntimeException {
+        if (thread == null) {
+            log3("ERROR:  TEST_ERROR_IN_settingBreakpoint(): thread is null");
+        }
+        return settingBreakpoint_private(thread, testedClass, methodName, bpLine, property);
+    }
+
+    private final BreakpointRequest settingBreakpoint_private(ThreadReference thread,
+                                                     ReferenceType testedClass,
+                                                     String methodName,
+                                                     String bpLine,
+                                                     String property)
+            throws JDITestRuntimeException {
 
         log2("......setting up a breakpoint:");
         log2("       thread: " + thread + "; class: " + testedClass +
@@ -119,11 +140,14 @@ protected final BreakpointRequest settingBreakpoint(ThreadReference thread,
                 try {
                     breakpRequest = eventRManager.createBreakpointRequest(lineLocation);
                     breakpRequest.putProperty("number", property);
-                    breakpRequest.addThreadFilter(thread);
+                    if (thread != null) {
+                        breakpRequest.addThreadFilter(thread);
+                    }
                     breakpRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
                 } catch (Exception e1) {
                     log3("ERROR: inner Exception within settingBreakpoint() : " + e1);
                     breakpRequest = null;
+                    e1.printStackTrace(logHandler.getOutStream());
                 }
             }
         } catch (Exception e2) {
@@ -188,6 +212,19 @@ protected void getEventSetForThreadStartDeath(String threadName) throws JDITestR
         eventIterator = eventSet.eventIterator();
     }
 
+    // Sets up the standard breakpoint for communication. The breakpoint is set on
+    // methodForCommunication() using the line number stored in the "lineForComm"
+    // local variable. The breakpoint is enabled.
+    protected BreakpointRequest setupBreakpointForCommunication(ReferenceType debuggeeClass) {
+        String bPointMethod = "methodForCommunication";
+        String lineForComm  = "lineForComm";
+
+        BreakpointRequest bpRequest =
+            settingBreakpoint(debuggeeClass, bPointMethod, lineForComm, "zero");
+        bpRequest.enable();
+        return bpRequest;
+    }
+
     protected void breakpointForCommunication() throws JDITestRuntimeException {
 
         log2("breakpointForCommunication");
@@ -219,6 +256,7 @@ protected void breakpointForCommunication(String debuggeeName) throws JDITestRun
 
             Event event = eventIterator.nextEvent();
             if (event instanceof BreakpointEvent) {
+                bpEvent = (BreakpointEvent) event;
                 return;
             }
             if (EventFilters.filtered(event, debuggeeName)) {

From 53924882326d3756a4ec52f37a59c8a81059a069 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Wed, 23 Apr 2025 00:13:09 +0000
Subject: [PATCH 064/901] 8355332: Fix failing semi-manual test EDT issue

Reviewed-by: azvegint
---
 .../HorizScrollers.java                       |  7 +++---
 .../RTLScrollers.java                         | 24 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
index b584fd66da3..61124ea1e97 100644
--- a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
+++ b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java
@@ -161,8 +161,9 @@ private void showFinalReminderIfNeeded(boolean isFailure) {
             if (scrollAmount != 3) {
                 JOptionPane.showMessageDialog(
                         ConfigPanel.this.getTopLevelAncestor(),
-                        ("Test %s. please make sure you have restored " +
-                                "the original speed value blah blah")
+                        ("Test %s. Please make sure you have restored " +
+                                "the original scrolling speed in the " +
+                                "Mouse settings.")
                                 .formatted(isFailure
                                         ? "failed"
                                         : "passed"),
@@ -231,4 +232,4 @@ public void mouseWheelMoved(MouseWheelEvent e) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
index 24e8df6fad8..da395282bf5 100644
--- a/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
+++ b/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java
@@ -265,22 +265,21 @@ public static boolean runTest(int scrollAmount)
             }
         }
 
+        robot.delay(1000);
         SwingUtilities.invokeAndWait(() -> {
             rtl = new RTLScrollers(scrollAmount);
             rtl.setVisible(true);
         });
         robot.delay(100);
 
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                retVal = rtl.runTests(scrollAmount);
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
+        try {
+            retVal = rtl.runTests(scrollAmount);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
                 rtl.setVisible(false);
                 rtl.dispose();
-            }
-        });
+            });
+        }
 
         robot.delay(100);
         System.out.println("RTLS.runTest(): " + retVal);
@@ -312,9 +311,8 @@ private boolean runTests(int scrollAmount)
         System.out.println("Testing List");
         testComp(list, scrollAmount);
 
-        SwingUtilities.invokeAndWait(() -> {
-            applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
-        });
+        SwingUtilities.invokeAndWait(() ->
+                applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT));
         robot.delay(100);
 
         System.out.println("Testing RTL Table");
@@ -467,9 +465,7 @@ public boolean testComp(TestTools comp, int scrollAmount)
         // Test acceleration for max scrolling
         // (this part should still work for RTL JList)
         if (scrollAmount == 30) {
-            SwingUtilities.invokeAndWait(() -> {
-                hsb.setValue(hsb.getMinimum());
-            });
+            SwingUtilities.invokeAndWait(() -> hsb.setValue(hsb.getMinimum()));
             robot.delay(100);
             robot.mouseWheel(2);
             robot.mouseWheel(2);

From 4c373703d9ed63dfc85df7cdcc04ecad5b02ade0 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Wed, 23 Apr 2025 02:04:46 +0000
Subject: [PATCH 065/901] 8354668: Missing REX2 prefix accounting in ZGC
 barriers leads to incorrect encoding

Reviewed-by: aboldtch, sviswanathan
---
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp      | 14 +++++++-------
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp      |  2 +-
 src/hotspot/cpu/x86/gc/z/z_x86_64.ad               |  4 ++--
 src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 9cdf0b229c0..0891d303563 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -391,8 +391,8 @@ void ZBarrierSetAssembler::store_barrier_fast(MacroAssembler* masm,
     if (rnew_zaddress != noreg) {
       // noreg means null; no need to color
       __ movptr(rnew_zpointer, rnew_zaddress);
-      __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
       __ shlq(rnew_zpointer, barrier_Relocation::unpatched);
+      __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
       __ orq_imm32(rnew_zpointer, barrier_Relocation::unpatched);
       __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
     }
@@ -969,13 +969,13 @@ void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm,
 #define __ ce->masm()->
 
 static void z_uncolor(LIR_Assembler* ce, LIR_Opr ref) {
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shrq(ref->as_register(), barrier_Relocation::unpatched);
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
 }
 
 static void z_color(LIR_Assembler* ce, LIR_Opr ref) {
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shlq(ref->as_register(), barrier_Relocation::unpatched);
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
   __ orq_imm32(ref->as_register(), barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
 }
@@ -1278,8 +1278,8 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
 
 static int patch_barrier_relocation_offset(int format) {
   switch (format) {
-  case ZBarrierRelocationFormatLoadGoodBeforeShl:
-    return 3;
+  case ZBarrierRelocationFormatLoadGoodAfterShX:
+    return -1;
 
   case ZBarrierRelocationFormatStoreGoodAfterCmp:
     return -2;
@@ -1300,7 +1300,7 @@ static int patch_barrier_relocation_offset(int format) {
 
 static uint16_t patch_barrier_relocation_value(int format) {
   switch (format) {
-  case ZBarrierRelocationFormatLoadGoodBeforeShl:
+  case ZBarrierRelocationFormatLoadGoodAfterShX:
     return (uint16_t)ZPointerLoadShift;
 
   case ZBarrierRelocationFormatMarkBadAfterTest:
@@ -1327,7 +1327,7 @@ void ZBarrierSetAssembler::patch_barrier_relocation(address addr, int format) {
   const int offset = patch_barrier_relocation_offset(format);
   const uint16_t value = patch_barrier_relocation_value(format);
   uint8_t* const patch_addr = (uint8_t*)addr + offset;
-  if (format == ZBarrierRelocationFormatLoadGoodBeforeShl) {
+  if (format == ZBarrierRelocationFormatLoadGoodAfterShX) {
     *patch_addr = (uint8_t)value;
   } else {
     *(uint16_t*)patch_addr = value;
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 8bb653ec5fb..6976452bd63 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -49,7 +49,7 @@ class ZLoadBarrierStubC2;
 class ZStoreBarrierStubC2;
 #endif // COMPILER2
 
-const int ZBarrierRelocationFormatLoadGoodBeforeShl = 0;
+const int ZBarrierRelocationFormatLoadGoodAfterShX  = 0;
 const int ZBarrierRelocationFormatLoadBadAfterTest  = 1;
 const int ZBarrierRelocationFormatMarkBadAfterTest  = 2;
 const int ZBarrierRelocationFormatStoreGoodAfterCmp = 3;
diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index 045aa5d5381..e2484a71e7d 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -35,15 +35,15 @@ source %{
 #include "gc/z/zBarrierSetAssembler.hpp"
 
 static void z_color(MacroAssembler* masm, const MachNode* node, Register ref) {
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shlq(ref, barrier_Relocation::unpatched);
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
   __ orq_imm32(ref, barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
 }
 
 static void z_uncolor(MacroAssembler* masm, const MachNode* node, Register ref) {
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shrq(ref, barrier_Relocation::unpatched);
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
 }
 
 static void z_keep_alive_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref) {
diff --git a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
index 9e6a4789dc2..7e239a68983 100644
--- a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
+++ b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
@@ -221,7 +221,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
       return true;
 #if INCLUDE_ZGC
     case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL:
-      _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
+      _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
       return true;
     case Z_BARRIER_RELOCATION_FORMAT_LOAD_BAD_AFTER_TEST:
       _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadBadAfterTest);

From a8c6ff161c2c4f1dcf0f8588c9d007994c84e703 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Wed, 23 Apr 2025 02:10:25 +0000
Subject: [PATCH 066/901] 8355239: RISC-V: Do not support subword scatter store

Reviewed-by: mli, fjiang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 7c1ca4f8960..6fea439954c 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -89,6 +89,8 @@ source %{
         return UseZvbb;
       case Op_LoadVectorGather:
       case Op_LoadVectorGatherMasked:
+      case Op_StoreVectorScatter:
+      case Op_StoreVectorScatterMasked:
         if (is_subword_type(bt)) {
           return false;
         }

From bc518a6cbb9fadc47b00239b4d721c1c62dc5dad Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Wed, 23 Apr 2025 02:32:36 +0000
Subject: [PATCH 067/901] 8355240: Remove unused Import in StringUTF16

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

diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java
index 99226ac1012..a07c022040f 100644
--- a/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/src/java.base/share/classes/java/lang/StringUTF16.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,6 @@
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 import static java.lang.String.UTF16;
-import static java.lang.String.LATIN1;
 
 final class StringUTF16 {
 

From 8c89fb95351ea0bc5ffdd920c18f9e820231f233 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Wed, 23 Apr 2025 03:40:26 +0000
Subject: [PATCH 068/901] 8355179: Reinstate
 javax/swing/JScrollBar/4865918/bug4865918.java headful and macos run

Reviewed-by: abhiscxk, serb
---
 .../swing/JScrollBar/4865918/bug4865918.java  | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java b/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
index 96b1034c943..d68f1bff597 100644
--- a/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
+++ b/test/jdk/javax/swing/JScrollBar/4865918/bug4865918.java
@@ -24,14 +24,16 @@
 /*
  * @test
  * @bug 4865918
- * @requires (os.family != "mac")
+ * @key headful
  * @summary REGRESSION:JCK1.4a-runtime api/javax_swing/interactive/JScrollBarTests.html#JScrollBar
  * @run main bug4865918
  */
 
 import java.awt.Dimension;
+import java.awt.Robot;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import javax.swing.JFrame;
 import javax.swing.JScrollBar;
 import javax.swing.SwingUtilities;
 import java.util.concurrent.CountDownLatch;
@@ -41,24 +43,33 @@
 
 public class bug4865918 {
 
+    private static JFrame frame;
     private static TestScrollBar sbar;
     private static final CountDownLatch mousePressLatch = new CountDownLatch(1);
 
     public static void main(String[] argv) throws Exception {
-        String osName = System.getProperty("os.name");
-        if (osName.toLowerCase().contains("os x")) {
-            System.out.println("This test is not for MacOS, considered passed.");
-            return;
-        }
-        SwingUtilities.invokeAndWait(() -> setupTest());
+        try {
+            Robot robot = new Robot();
+            SwingUtilities.invokeAndWait(() -> createAndShowGUI());
 
-        SwingUtilities.invokeAndWait(() -> sbar.pressMouse());
-        if (!mousePressLatch.await(2, TimeUnit.SECONDS)) {
-            throw new RuntimeException("Timed out waiting for mouse press");
-        }
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> sbar.pressMouse());
+            if (!mousePressLatch.await(2, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Timed out waiting for mouse press");
+            }
 
-        if (getValue() != 9) {
-            throw new RuntimeException("The scrollbar block increment is incorrect");
+            if (getValue() != 9) {
+                throw new RuntimeException("The scrollbar block increment " +
+                                            getValue() + " is incorrect");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
         }
     }
 
@@ -73,8 +84,8 @@ private static int getValue() throws Exception {
         return result[0];
     }
 
-    private static void setupTest() {
-
+    private static void createAndShowGUI() {
+        frame = new JFrame("bug4865918");
         sbar = new TestScrollBar(JScrollBar.HORIZONTAL, -1, 10, -100, 100);
         sbar.setPreferredSize(new Dimension(200, 20));
         sbar.setBlockIncrement(10);
@@ -83,7 +94,11 @@ public void mousePressed(MouseEvent e) {
                 mousePressLatch.countDown();
             }
         });
-
+        frame.getContentPane().add(sbar);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        frame.toFront();
     }
 
     static class TestScrollBar extends JScrollBar {

From 9a2b425b13cc468d8627c1548d1d39015ce17af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Wed, 23 Apr 2025 05:17:41 +0000
Subject: [PATCH 069/901] 8354920: SA core file support on Linux only prints
 error messages when debug logging is enabled

Reviewed-by: cjplummer, kevinw
---
 .../linux/native/libsaproc/libproc_impl.c     |  4 +-
 .../linux/native/libsaproc/ps_core.c          | 89 ++++++++++++-------
 .../linux/native/libsaproc/ps_proc.c          | 34 +++++--
 .../macosx/native/libsaproc/libproc_impl.c    |  4 +-
 .../macosx/native/libsaproc/ps_core.c         | 43 +++++----
 .../share/native/libsaproc/ps_core_common.c   |  2 +
 6 files changed, 114 insertions(+), 62 deletions(-)

diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
index 977347048a3..74563aa0d6c 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
@@ -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
@@ -349,7 +349,7 @@ const char* symbol_for_pc(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* p
 thread_info* add_thread_info(struct ps_prochandle* ph, lwpid_t lwp_id) {
    thread_info* newthr;
    if ( (newthr = (thread_info*) calloc(1, sizeof(thread_info))) == NULL) {
-      print_debug("can't allocate memory for thread_info\n");
+      print_error("can't allocate memory for thread_info\n");
       return NULL;
    }
 
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
index b1b69c81e2e..808ef42e069 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
@@ -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
@@ -30,6 +30,7 @@
 #include <stddef.h>
 #include <elf.h>
 #include <link.h>
+#include <errno.h>
 #include "libproc_impl.h"
 #include "ps_core_common.h"
 #include "proc_service.h"
@@ -67,7 +68,7 @@ static bool sort_map_array(struct ps_prochandle* ph) {
   // allocate map_array
   map_info** array;
   if ( (array = (map_info**) malloc(sizeof(map_info*) * num_maps)) == NULL) {
-    print_debug("can't allocate memory for map array\n");
+    print_error("can't allocate memory for map array\n");
     return false;
   }
 
@@ -189,8 +190,10 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size
    prstatus_t* prstat = (prstatus_t*) buf;
    thread_info* newthr;
    print_debug("got integer regset for lwp %d\n", prstat->pr_pid);
-   if((newthr = add_thread_info(ph, prstat->pr_pid)) == NULL)
+   if((newthr = add_thread_info(ph, prstat->pr_pid)) == NULL) {
+      print_error("failed to add thread info\n");
       return false;
+   }
 
    // copy regs
    memcpy(&newthr->regs, prstat->pr_reg, sizeof(struct user_regs_struct));
@@ -256,20 +259,20 @@ static bool core_handle_note(struct ps_prochandle* ph, ELF_PHDR* note_phdr) {
    // we are interested in just prstatus entries. we will ignore the rest.
    // Advance the seek pointer to the start of the PT_NOTE data
    if (lseek(ph->core->core_fd, note_phdr->p_offset, SEEK_SET) == (off_t)-1) {
-      print_debug("failed to lseek to PT_NOTE data\n");
+      print_error("failed to lseek to PT_NOTE data\n");
       return false;
    }
 
    // Now process the PT_NOTE structures.  Each one is preceded by
    // an Elf{32/64}_Nhdr structure describing its type and size.
    if ( (buf = (char*) malloc(size)) == NULL) {
-      print_debug("can't allocate memory for reading core notes\n");
+      print_error("can't allocate memory for reading core notes\n");
       goto err;
    }
 
    // read notes into buffer
    if (read(ph->core->core_fd, buf, size) != size) {
-      print_debug("failed to read notes, core file must have been truncated\n");
+      print_error("failed to read notes, core file must have been truncated\n");
       goto err;
    }
 
@@ -282,6 +285,7 @@ static bool core_handle_note(struct ps_prochandle* ph, ELF_PHDR* note_phdr) {
 
       if (notep->n_type == NT_PRSTATUS) {
         if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) {
+          print_error("failed to handle NT_PRSTATUS note\n");
           return false;
         }
       } else if (notep->n_type == NT_AUXV) {
@@ -314,8 +318,10 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) {
    ELF_PHDR* phbuf = NULL;
    ELF_PHDR* core_php = NULL;
 
-   if ((phbuf =  read_program_header_table(ph->core->core_fd, core_ehdr)) == NULL)
+   if ((phbuf = read_program_header_table(ph->core->core_fd, core_ehdr)) == NULL) {
+      print_error("failed to read program header table\n");
       return false;
+   }
 
    /*
     * Now iterate through the program headers in the core file.
@@ -344,6 +350,7 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) {
       switch (core_php->p_type) {
          case PT_NOTE:
             if (core_handle_note(ph, core_php) != true) {
+              print_error("failed to read note segment\n");
               goto err;
             }
             break;
@@ -351,7 +358,10 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) {
          case PT_LOAD: {
             if (core_php->p_filesz != 0) {
                if (add_map_info(ph, ph->core->core_fd, core_php->p_offset,
-                  core_php->p_vaddr, core_php->p_filesz, core_php->p_flags) == NULL) goto err;
+                     core_php->p_vaddr, core_php->p_filesz, core_php->p_flags) == NULL) {
+                  print_error("failed to add map info\n");
+                  goto err;
+               }
             }
             break;
          }
@@ -376,6 +386,7 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li
   int page_size = sysconf(_SC_PAGE_SIZE);
 
   if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL) {
+    print_error("failed to read program header table\n");
     return false;
   }
 
@@ -391,6 +402,7 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li
       if (existing_map == NULL){
         if (add_map_info(ph, lib_fd, lib_php->p_offset,
                          target_vaddr, lib_php->p_memsz, lib_php->p_flags) == NULL) {
+          print_error("failed to add map info\n");
           goto err;
         }
       } else if (lib_php->p_flags != existing_map->flags) {
@@ -412,7 +424,7 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li
             (existing_map->fd != lib_fd) &&
             (ROUNDUP(existing_map->memsz, page_size) != ROUNDUP(lib_php->p_memsz, page_size))) {
 
-          print_debug("address conflict @ 0x%lx (existing map size = %ld, size = %ld, flags = %d)\n",
+          print_error("address conflict @ 0x%lx (existing map size = %ld, size = %ld, flags = %d)\n",
                         target_vaddr, existing_map->memsz, lib_php->p_memsz, lib_php->p_flags);
           goto err;
         }
@@ -442,12 +454,12 @@ static bool read_interp_segments(struct ps_prochandle* ph) {
   ELF_EHDR interp_ehdr;
 
   if (read_elf_header(ph->core->interp_fd, &interp_ehdr) != true) {
-    print_debug("interpreter is not a valid ELF file\n");
+    print_error("interpreter is not a valid ELF file\n");
     return false;
   }
 
   if (read_lib_segments(ph, ph->core->interp_fd, &interp_ehdr, ph->core->ld_base_addr) != true) {
-    print_debug("can't read segments of interpreter\n");
+    print_error("can't read segments of interpreter\n");
     return false;
   }
 
@@ -463,6 +475,7 @@ static uintptr_t read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehd
   uintptr_t result = 0L;
 
   if ((phbuf = read_program_header_table(ph->core->exec_fd, exec_ehdr)) == NULL) {
+    print_error("failed to read program header table\n");
     return 0L;
   }
 
@@ -473,7 +486,10 @@ static uintptr_t read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehd
     case PT_LOAD: {
       // add only non-writable segments of non-zero filesz
       if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) {
-        if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz, exec_php->p_flags) == NULL) goto err;
+        if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz, exec_php->p_flags) == NULL) {
+          print_error("failed to add map info\n");
+          goto err;
+        }
       }
       break;
     }
@@ -484,18 +500,19 @@ static uintptr_t read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehd
 
       // BUF_SIZE is PATH_MAX + NAME_MAX + 1.
       if (exec_php->p_filesz > BUF_SIZE) {
+        print_error("Invalid ELF interpreter info\n");
         goto err;
       }
       if (pread(ph->core->exec_fd, interp_name,
                 exec_php->p_filesz, exec_php->p_offset) != exec_php->p_filesz) {
-        print_debug("Unable to read in the ELF interpreter\n");
+        print_error("Unable to read in the ELF interpreter\n");
         goto err;
       }
       interp_name[exec_php->p_filesz] = '\0';
       print_debug("ELF interpreter %s\n", interp_name);
       // read interpreter segments as well
       if ((ph->core->interp_fd = pathmap_open(interp_name)) < 0) {
-        print_debug("can't open runtime loader\n");
+        print_error("can't open runtime loader\n");
         goto err;
       }
       break;
@@ -555,7 +572,7 @@ static uintptr_t calc_prelinked_load_address(struct ps_prochandle* ph, int lib_f
 
   phbuf = read_program_header_table(lib_fd, elf_ehdr);
   if (phbuf == NULL) {
-    print_debug("can't read program header of shared object\n");
+    print_error("can't read program header of shared object\n");
     return INVALID_LOAD_ADDRESS;
   }
 
@@ -571,7 +588,7 @@ static uintptr_t calc_prelinked_load_address(struct ps_prochandle* ph, int lib_f
 
   if (ps_pdread(ph, (psaddr_t)link_map_addr + LINK_MAP_LD_OFFSET,
                &lib_ld, sizeof(uintptr_t)) != PS_OK) {
-    print_debug("can't read address of dynamic section in shared object\n");
+    print_error("can't read address of dynamic section in shared object\n");
     return INVALID_LOAD_ADDRESS;
   }
 
@@ -607,7 +624,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
   dyn.d_tag = DT_NULL;
   while (dyn.d_tag != DT_DEBUG) {
     if (ps_pdread(ph, (psaddr_t) addr, &dyn, sizeof(ELF_DYN)) != PS_OK) {
-      print_debug("can't read debug info from _DYNAMIC\n");
+      print_error("can't read debug info from _DYNAMIC\n");
       return false;
     }
     addr += sizeof(ELF_DYN);
@@ -618,14 +635,14 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
   // at debug_base we have struct r_debug. This has first link map in r_map field
   if (ps_pdread(ph, (psaddr_t) debug_base + FIRST_LINK_MAP_OFFSET,
                  &first_link_map_addr, sizeof(uintptr_t)) != PS_OK) {
-    print_debug("can't read first link map address\n");
+    print_error("can't read first link map address\n");
     return false;
   }
 
   // read ld_base address from struct r_debug
   if (ps_pdread(ph, (psaddr_t) debug_base + LD_BASE_OFFSET, &ld_base_addr,
                  sizeof(uintptr_t)) != PS_OK) {
-    print_debug("can't read ld base address\n");
+    print_error("can't read ld base address\n");
     return false;
   }
   ph->core->ld_base_addr = ld_base_addr;
@@ -634,11 +651,13 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
 
   // now read segments from interp (i.e ld.so or ld-linux.so or ld-elf.so)
   if (read_interp_segments(ph) != true) {
+      print_error("failed to read interp segments\n");
       return false;
   }
 
   // after adding interpreter (ld.so) mappings sort again
   if (sort_map_array(ph) != true) {
+    print_error("failed to sort segment map array\n");
     return false;
   }
 
@@ -654,14 +673,14 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
 
       if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_ADDR_OFFSET,
                    &lib_base_diff, sizeof(uintptr_t)) != PS_OK) {
-         print_debug("can't read shared object base address diff\n");
+         print_error("can't read shared object base address diff\n");
          return false;
       }
 
       // read address of the name
       if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_NAME_OFFSET,
                     &lib_name_addr, sizeof(uintptr_t)) != PS_OK) {
-         print_debug("can't read address of shared object name\n");
+         print_error("can't read address of shared object name\n");
          return false;
       }
 
@@ -687,6 +706,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
                  lib_base_diff = calc_prelinked_load_address(ph, lib_fd, &elf_ehdr, link_map_addr);
                  if (lib_base_diff == INVALID_LOAD_ADDRESS) {
                    close(lib_fd);
+                   print_error("failed to calculate load address\n");
                    return false;
                  }
                }
@@ -696,15 +716,17 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
                            lib_name, lib_base, lib_base_diff);
                // while adding library mappings we need to use "base difference".
                if (! read_lib_segments(ph, lib_fd, &elf_ehdr, lib_base_diff)) {
-                  print_debug("can't read shared object's segments\n");
+                  print_error("can't read shared object's segments\n");
                   close(lib_fd);
                   return false;
                }
                add_lib_info_fd(ph, lib_name, lib_fd, lib_base);
                // Map info is added for the library (lib_name) so
                // we need to re-sort it before calling the p_pdread.
-               if (sort_map_array(ph) != true)
+               if (sort_map_array(ph) != true) {
+                  print_error("failed to sort segment map array\n");
                   return false;
+               }
             } else {
                print_debug("can't read ELF header for shared object %s\n", lib_name);
                close(lib_fd);
@@ -716,7 +738,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
     // read next link_map address
     if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_NEXT_OFFSET,
                    &link_map_addr, sizeof(uintptr_t)) != PS_OK) {
-      print_debug("can't read next link in link_map\n");
+      print_error("can't read next link in link_map\n");
       return false;
     }
   }
@@ -732,13 +754,13 @@ Pgrab_core(const char* exec_file, const char* core_file) {
 
   struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
   if (ph == NULL) {
-    print_debug("can't allocate ps_prochandle\n");
+    print_error("can't allocate ps_prochandle\n");
     return NULL;
   }
 
   if ((ph->core = (struct core_data*) calloc(1, sizeof(struct core_data))) == NULL) {
     free(ph);
-    print_debug("can't allocate ps_prochandle\n");
+    print_error("can't allocate ps_prochandle\n");
     return NULL;
   }
 
@@ -750,39 +772,42 @@ Pgrab_core(const char* exec_file, const char* core_file) {
 
   // open the core file
   if ((ph->core->core_fd = open(core_file, O_RDONLY)) < 0) {
-    print_debug("can't open core file\n");
+    print_error("can't open core file: %s\n", strerror(errno));
     goto err;
   }
 
   // read core file ELF header
   if (read_elf_header(ph->core->core_fd, &core_ehdr) != true || core_ehdr.e_type != ET_CORE) {
-    print_debug("core file is not a valid ELF ET_CORE file\n");
+    print_error("core file is not a valid ELF ET_CORE file\n");
     goto err;
   }
 
   if ((ph->core->exec_fd = open(exec_file, O_RDONLY)) < 0) {
-    print_debug("can't open executable file\n");
+    print_error("can't open executable file: %s\n", strerror(errno));
     goto err;
   }
 
   if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true ||
       ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) {
-    print_debug("executable file is not a valid ELF file\n");
+    print_error("executable file is not a valid ELF file\n");
     goto err;
   }
 
   // process core file segments
   if (read_core_segments(ph, &core_ehdr) != true) {
+    print_error("failed to read core segments\n");
     goto err;
   }
 
   // process exec file segments
   uintptr_t exec_base_addr = read_exec_segments(ph, &exec_ehdr);
   if (exec_base_addr == 0L) {
+    print_error("failed to read exec segments\n");
     goto err;
   }
   print_debug("exec_base_addr = 0x%lx\n", exec_base_addr);
   if (add_lib_info_fd(ph, exec_file, ph->core->exec_fd, exec_base_addr) == NULL) {
+    print_error("failed to add lib info\n");
     goto err;
   }
 
@@ -790,19 +815,23 @@ Pgrab_core(const char* exec_file, const char* core_file) {
   // here because read_shared_lib_info needs to read from debuggee
   // address space
   if (sort_map_array(ph) != true) {
+    print_error("failed to sort segment map array\n");
     goto err;
   }
 
   if (read_shared_lib_info(ph) != true) {
+    print_error("failed to read libraries\n");
     goto err;
   }
 
   // sort again because we have added more mappings from shared objects
   if (sort_map_array(ph) != true) {
+    print_error("failed to sort segment map array\n");
     goto err;
   }
 
   if (init_classsharing_workaround(ph) != true) {
+    print_error("failed to workaround class sharing\n");
     goto err;
   }
 
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
index de81e962d8a..fdaa30c3f5d 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_proc.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
@@ -349,7 +349,7 @@ static bool read_lib_info(struct ps_prochandle* ph) {
   snprintf(fname, sizeof(fname), "/proc/%d/maps", ph->pid);
   fp = fopen(fname, "r");
   if (fp == NULL) {
-    print_debug("can't open /proc/%d/maps file\n", ph->pid);
+    print_error("can't open /proc/%d/maps file\n", ph->pid);
     return false;
   }
 
@@ -447,13 +447,14 @@ Pgrab(pid_t pid, char* err_buf, size_t err_buf_len) {
 
   if ( (ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle))) == NULL) {
     snprintf(err_buf, err_buf_len, "can't allocate memory for ps_prochandle");
-    print_debug("%s\n", err_buf);
+    print_error("%s\n", err_buf);
     return NULL;
   }
 
   if ((attach_status = ptrace_attach(pid, err_buf, err_buf_len)) != ATTACH_SUCCESS) {
     if (attach_status == ATTACH_THREAD_DEAD) {
-       print_error("The process with pid %d does not exist.\n", pid);
+       snprintf(err_buf, err_buf_len, "The process with pid %d does not exist.", pid);
+       print_error("%s\n", err_buf);
     }
     free(ph);
     return NULL;
@@ -461,7 +462,12 @@ Pgrab(pid_t pid, char* err_buf, size_t err_buf_len) {
 
   // initialize ps_prochandle
   ph->pid = pid;
-  add_thread_info(ph, ph->pid);
+  if (add_thread_info(ph, ph->pid) == NULL) {
+    snprintf(err_buf, err_buf_len, "failed to add thread info");
+    print_error("%s\n", err_buf);
+    free(ph);
+    return NULL;
+  }
 
   // initialize vtable
   ph->ops = &process_ops;
@@ -469,7 +475,10 @@ Pgrab(pid_t pid, char* err_buf, size_t err_buf_len) {
   // read library info and symbol tables, must do this before attaching threads,
   // as the symbols in the pthread library will be used to figure out
   // the list of threads within the same process.
-  read_lib_info(ph);
+  if (read_lib_info(ph) == false) {
+    snprintf(err_buf, err_buf_len, "failed to read lib info");
+    goto err;
+  }
 
   /*
    * Read thread info.
@@ -491,7 +500,10 @@ Pgrab(pid_t pid, char* err_buf, size_t err_buf_len) {
       continue;
     }
     if (!process_doesnt_exist(lwp_id)) {
-      add_thread_info(ph, lwp_id);
+      if (add_thread_info(ph, lwp_id) == NULL) {
+        snprintf(err_buf, err_buf_len, "failed to add thread info");
+        goto err;
+      }
     }
   }
   closedir(dirp);
@@ -510,11 +522,15 @@ Pgrab(pid_t pid, char* err_buf, size_t err_buf_len) {
           delete_thread_info(ph, current_thr);
         }
         else {
-          Prelease(ph);
-          return NULL;
+          snprintf(err_buf, err_buf_len, "Failed to attach to the thread with lwp_id %d.", current_thr->lwp_id);
+          goto err;
         } // ATTACH_THREAD_DEAD
       } // !ATTACH_SUCCESS
     }
   }
   return ph;
+err:
+  print_error("%s\n", err_buf);
+  Prelease(ph);
+  return NULL;
 }
diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c
index ff48c402f8d..8bcd09d40ce 100644
--- a/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c
+++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/libproc_impl.c
@@ -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
@@ -323,7 +323,7 @@ const char* symbol_for_pc(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* p
 sa_thread_info* add_thread_info(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id) {
   sa_thread_info* newthr;
   if ( (newthr = (sa_thread_info*) calloc(1, sizeof(sa_thread_info))) == NULL) {
-    print_debug("can't allocate memory for thread_info\n");
+    print_error("can't allocate memory for thread_info\n");
     return NULL;
   }
 
diff --git a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
index e07b3a8fd97..149997dc4bb 100644
--- a/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
+++ b/src/jdk.hotspot.agent/macosx/native/libsaproc/ps_core.c
@@ -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.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -74,7 +74,7 @@ static bool sort_map_array(struct ps_prochandle* ph) {
   // allocate map_array
   map_info** array;
   if ( (array = (map_info**) malloc(sizeof(map_info*) * num_maps)) == NULL) {
-    print_debug("can't allocate memory for map array\n");
+    print_error("can't allocate memory for map array\n");
     return false;
   }
 
@@ -280,6 +280,7 @@ static bool read_core_segments(struct ps_prochandle* ph) {
 
   lseek(fd, offset, SEEK_SET);
   if(read(fd, (void *)&fhead, sizeof(mach_header_64)) != sizeof(mach_header_64)) {
+     print_error("Failed to read program header table\n");
      goto err;
   }
   print_debug("total commands: %d\n", fhead.ncmds);
@@ -287,6 +288,7 @@ static bool read_core_segments(struct ps_prochandle* ph) {
   for (i = 0; i < fhead.ncmds; i++) {
     lseek(fd, offset, SEEK_SET);
     if (read(fd, (void *)&lcmd, sizeof(load_command)) != sizeof(load_command)) {
+      print_error("Failed to read command\n");
       goto err;
     }
     offset += lcmd.cmdsize;    // next command position
@@ -294,14 +296,14 @@ static bool read_core_segments(struct ps_prochandle* ph) {
     if (lcmd.cmd == LC_SEGMENT_64) {
       lseek(fd, -sizeof(load_command), SEEK_CUR);
       if (read(fd, (void *)&segcmd, sizeof(segment_command_64)) != sizeof(segment_command_64)) {
-        print_debug("failed to read LC_SEGMENT_64 i = %d!\n", i);
+        print_error("failed to read LC_SEGMENT_64 i = %d!\n", i);
         goto err;
       }
       // The base of the library is offset by a random amount which ends up as a load command with a
       // filesize of 0.  This must be ignored otherwise the base address of the library is wrong.
       if (segcmd.filesize != 0) {
         if (add_map_info(ph, fd, segcmd.fileoff, segcmd.vmaddr, segcmd.vmsize, segcmd.flags) == NULL) {
-          print_debug("Failed to add map_info at i = %d\n", i);
+          print_error("Failed to add map_info at i = %d\n", i);
           goto err;
         }
       }
@@ -318,7 +320,7 @@ static bool read_core_segments(struct ps_prochandle* ph) {
       uint32_t size = sizeof(load_command);
       while (size < lcmd.cmdsize) {
         if (read(fd, (void *)&fc, sizeof(thread_fc)) != sizeof(thread_fc)) {
-          printf("Reading flavor, count failed.\n");
+          print_error("Reading flavor, count failed.\n");
           goto err;
         }
         size += sizeof(thread_fc);
@@ -326,14 +328,14 @@ static bool read_core_segments(struct ps_prochandle* ph) {
         if (fc.flavor == x86_THREAD_STATE) {
           x86_thread_state_t thrstate;
           if (read(fd, (void *)&thrstate, sizeof(x86_thread_state_t)) != sizeof(x86_thread_state_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(x86_thread_state_t);
           // create thread info list, update lwp_id later
           sa_thread_info* newthr = add_thread_info(ph, (pthread_t) -1, (lwpid_t) num_threads++);
           if (newthr == NULL) {
-            printf("create thread_info failed\n");
+            print_error("create thread_info failed\n");
             goto err;
           }
 
@@ -370,14 +372,14 @@ static bool read_core_segments(struct ps_prochandle* ph) {
         } else if (fc.flavor == x86_FLOAT_STATE) {
           x86_float_state_t flstate;
           if (read(fd, (void *)&flstate, sizeof(x86_float_state_t)) != sizeof(x86_float_state_t)) {
-            print_debug("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(x86_float_state_t);
         } else if (fc.flavor == x86_EXCEPTION_STATE) {
           x86_exception_state_t excpstate;
           if (read(fd, (void *)&excpstate, sizeof(x86_exception_state_t)) != sizeof(x86_exception_state_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(x86_exception_state_t);
@@ -387,14 +389,14 @@ static bool read_core_segments(struct ps_prochandle* ph) {
         if (fc.flavor == ARM_THREAD_STATE64) {
           arm_thread_state64_t thrstate;
           if (read(fd, (void *)&thrstate, sizeof(arm_thread_state64_t)) != sizeof(arm_thread_state64_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(arm_thread_state64_t);
           // create thread info list, update lwp_id later
           sa_thread_info* newthr = add_thread_info(ph, (pthread_t) -1, (lwpid_t) num_threads++);
           if (newthr == NULL) {
-            printf("create thread_info failed\n");
+            print_error("create thread_info failed\n");
             goto err;
           }
 
@@ -443,21 +445,21 @@ static bool read_core_segments(struct ps_prochandle* ph) {
         } else if (fc.flavor == ARM_NEON_STATE64) {
           arm_neon_state64_t flstate;
           if (read(fd, (void *)&flstate, sizeof(arm_neon_state64_t)) != sizeof(arm_neon_state64_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(arm_neon_state64_t);
         } else if (fc.flavor == ARM_EXCEPTION_STATE64) {
           arm_exception_state64_t excpstate;
           if (read(fd, (void *)&excpstate, sizeof(arm_exception_state64_t)) != sizeof(arm_exception_state64_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(arm_exception_state64_t);
         } else if (fc.flavor == ARM_DEBUG_STATE64) {
           arm_debug_state64_t dbgstate;
           if (read(fd, (void *)&dbgstate, sizeof(arm_debug_state64_t)) != sizeof(arm_debug_state64_t)) {
-            printf("Reading flavor, count failed.\n");
+            print_error("Reading flavor, count failed.\n");
             goto err;
           }
           size += sizeof(arm_debug_state64_t);
@@ -631,6 +633,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
       lseek(fd, -sizeof(uint32_t), SEEK_CUR);
       // This is the beginning of the mach-o file in the segment.
       if (read(fd, (void *)&header, sizeof(mach_header_64)) != sizeof(mach_header_64)) {
+        print_error("Failed to file header\n");
         goto err;
       }
       fpos = ltell(fd);
@@ -641,6 +644,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
         // LC_ID_DYLIB is the file itself for a .dylib
         lseek(fd, fpos, SEEK_SET);
         if (read(fd, (void *)&lcmd, sizeof(load_command)) != sizeof(load_command)) {
+          print_error("Failed to read command\n");
           return false;   // error
         }
         fpos += lcmd.cmdsize;  // next command position
@@ -652,6 +656,7 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
         if (lcmd.cmd == LC_ID_DYLIB) {
           lseek(fd, -sizeof(load_command), SEEK_CUR);
           if (read(fd, (void *)&dylibcmd, sizeof(dylib_command)) != sizeof(dylib_command)) {
+            print_error("Failed to read command\n");
             return false;
           }
           /**** name stored at dylib_command.dylib.name.offset, is a C string  */
@@ -710,13 +715,13 @@ struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) {
 
   struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
   if (ph == NULL) {
-    print_debug("can't allocate ps_prochandle\n");
+    print_error("can't allocate ps_prochandle\n");
     return NULL;
   }
 
   if ((ph->core = (struct core_data*) calloc(1, sizeof(struct core_data))) == NULL) {
     free(ph);
-    print_debug("can't allocate ps_prochandle\n");
+    print_error("can't allocate ps_prochandle\n");
     return NULL;
   }
 
@@ -738,12 +743,12 @@ struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) {
 
   // read core file header
   if (read_macho64_header(ph->core->core_fd, &core_header) != true || core_header.filetype != MH_CORE) {
-    print_debug("core file is not a valid Mach-O file\n");
+    print_error("core file is not a valid Mach-O file\n");
     goto err;
   }
 
   if ((ph->core->exec_fd = open(exec_file, O_RDONLY)) < 0) {
-    print_error("can't open executable file\n");
+    print_error("can't open executable file: %s\n", strerror(errno));
     goto err;
   }
 
@@ -779,7 +784,7 @@ struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) {
   }
 
   if (init_classsharing_workaround(ph) != true) {
-    print_error("failed to workaround classshareing\n");
+    print_error("failed to workaround class sharing\n");
     goto err;
   }
 
diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c
index 3c244aab0f3..40757a346fe 100644
--- a/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c
+++ b/src/jdk.hotspot.agent/share/native/libsaproc/ps_core_common.c
@@ -141,6 +141,7 @@ map_info* add_map_info(struct ps_prochandle* ph, int fd, off_t offset,
                        uintptr_t vaddr, size_t memsz, uint32_t flags) {
   map_info* map;
   if ((map = allocate_init_map(fd, offset, vaddr, memsz, flags)) == NULL) {
+    print_error("failed to allocate map\n");
     return NULL;
   }
 
@@ -158,6 +159,7 @@ static map_info* add_class_share_map_info(struct ps_prochandle* ph, off_t offset
   map_info* map;
   if ((map = allocate_init_map(ph->core->classes_jsa_fd,
                                offset, vaddr, memsz, MAP_R_FLAG)) == NULL) {
+    print_debug("failed to allocate class share map\n");
     return NULL;
   }
 

From 27faf45422082009f23463984b8a6e43c15e9e71 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 23 Apr 2025 06:22:30 +0000
Subject: [PATCH 070/901] 8354826: Make ResolverConfigurationImpl.lock field
 final

Reviewed-by: dfuchs, jpai
---
 .../unix/classes/sun/net/dns/ResolverConfigurationImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
index a466331de93..2f633ad711d 100644
--- a/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java
+++ b/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.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
@@ -41,7 +41,7 @@ public final class ResolverConfigurationImpl
     extends ResolverConfiguration
 {
     // Lock helds whilst loading configuration or checking
-    private static Object lock = new Object();
+    private static final Object lock = new Object();
 
     // Time of last refresh.
     private static long lastRefresh = -1;

From 263983d0fb9ca567b03d2be4c82cf9fe3d0e6f61 Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Wed, 23 Apr 2025 08:04:57 +0000
Subject: [PATCH 071/901] 8298733: Reconsider monitors_on_stack assert

Reviewed-by: pchilanomate, coleenp
---
 .../share/runtime/continuationFreezeThaw.cpp  | 59 +++++++++++++------
 src/hotspot/share/runtime/stackWatermark.hpp  |  3 +-
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 12a75c6c62e..d20cfde09ca 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -565,10 +565,50 @@ void FreezeBase::copy_to_chunk(intptr_t* from, intptr_t* to, int size) {
 #endif
 }
 
+static void assert_frames_in_continuation_are_safe(JavaThread* thread) {
+#ifdef ASSERT
+  StackWatermark* watermark = StackWatermarkSet::get(thread, StackWatermarkKind::gc);
+  if (watermark == nullptr) {
+    return;
+  }
+  ContinuationEntry* ce = thread->last_continuation();
+  RegisterMap map(thread,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  map.set_include_argument_oops(false);
+  for (frame f = thread->last_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
+    watermark->assert_is_frame_safe(f);
+  }
+#endif // ASSERT
+}
+
+#ifdef ASSERT
+static bool monitors_on_stack(JavaThread* thread) {
+  assert_frames_in_continuation_are_safe(thread);
+  ContinuationEntry* ce = thread->last_continuation();
+  RegisterMap map(thread,
+                  RegisterMap::UpdateMap::include,
+                  RegisterMap::ProcessFrames::skip,
+                  RegisterMap::WalkContinuation::skip);
+  map.set_include_argument_oops(false);
+  for (frame f = thread->last_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
+    if ((f.is_interpreted_frame() && ContinuationHelper::InterpretedFrame::is_owning_locks(f)) ||
+        (f.is_compiled_frame() && ContinuationHelper::CompiledFrame::is_owning_locks(map.thread(), &map, f)) ||
+        (f.is_native_frame() && ContinuationHelper::NativeFrame::is_owning_locks(map.thread(), f))) {
+      return true;
+    }
+  }
+  return false;
+}
+#endif // ASSERT
+
 // Called _after_ the last possible safepoint during the freeze operation (chunk allocation)
 void FreezeBase::unwind_frames() {
   ContinuationEntry* entry = _cont.entry();
   entry->flush_stack_processing(_thread);
+  assert_frames_in_continuation_are_safe(_thread);
+  assert(LockingMode != LM_LEGACY || !monitors_on_stack(_thread), "unexpected monitors on stack");
   set_anchor_to_entry(_thread, entry);
 }
 
@@ -1621,23 +1661,6 @@ static void jvmti_mount_end(JavaThread* current, ContinuationWrapper& cont, fram
 #endif // INCLUDE_JVMTI
 
 #ifdef ASSERT
-static bool monitors_on_stack(JavaThread* thread) {
-  ContinuationEntry* ce = thread->last_continuation();
-  RegisterMap map(thread,
-                  RegisterMap::UpdateMap::include,
-                  RegisterMap::ProcessFrames::include,
-                  RegisterMap::WalkContinuation::skip);
-  map.set_include_argument_oops(false);
-  for (frame f = thread->last_frame(); Continuation::is_frame_in_continuation(ce, f); f = f.sender(&map)) {
-    if ((f.is_interpreted_frame() && ContinuationHelper::InterpretedFrame::is_owning_locks(f)) ||
-        (f.is_compiled_frame() && ContinuationHelper::CompiledFrame::is_owning_locks(map.thread(), &map, f)) ||
-        (f.is_native_frame() && ContinuationHelper::NativeFrame::is_owning_locks(map.thread(), f))) {
-      return true;
-    }
-  }
-  return false;
-}
-
 // There are no interpreted frames if we're not called from the interpreter and we haven't ancountered an i2c
 // adapter or called Deoptimization::unpack_frames. As for native frames, upcalls from JNI also go through the
 // interpreter (see JavaCalls::call_helper), while the UpcallLinker explicitly sets cont_fastpath.
@@ -1714,8 +1737,6 @@ static inline freeze_result freeze_internal(JavaThread* current, intptr_t* const
 
   assert(entry->is_virtual_thread() == (entry->scope(current) == java_lang_VirtualThread::vthread_scope()), "");
 
-  assert(LockingMode != LM_LEGACY || (monitors_on_stack(current) == ((current->held_monitor_count() - current->jni_monitor_count()) > 0)),
-         "Held monitor count and locks on stack invariant: " INT64_FORMAT " JNI: " INT64_FORMAT, (int64_t)current->held_monitor_count(), (int64_t)current->jni_monitor_count());
   assert(LockingMode == LM_LEGACY || (current->held_monitor_count() == 0 && current->jni_monitor_count() == 0),
          "Held monitor count should only be used for LM_LEGACY: " INT64_FORMAT " JNI: " INT64_FORMAT, (int64_t)current->held_monitor_count(), (int64_t)current->jni_monitor_count());
 
diff --git a/src/hotspot/share/runtime/stackWatermark.hpp b/src/hotspot/share/runtime/stackWatermark.hpp
index 8d51f694a1d..4f1c65c903c 100644
--- a/src/hotspot/share/runtime/stackWatermark.hpp
+++ b/src/hotspot/share/runtime/stackWatermark.hpp
@@ -102,7 +102,6 @@ class StackWatermark : public CHeapObj<mtThread> {
   void yield_processing();
   static bool has_barrier(const frame& f);
   void ensure_safe(const frame& f);
-  void assert_is_frame_safe(const frame& f) NOT_DEBUG_RETURN;
   bool is_frame_safe(const frame& f);
 
   // API for consumers of the stack watermark barrier.
@@ -151,6 +150,8 @@ class StackWatermark : public CHeapObj<mtThread> {
   void on_safepoint();
   void start_processing();
   void finish_processing(void* context);
+
+  void assert_is_frame_safe(const frame& f) NOT_DEBUG_RETURN;
 };
 
 #endif // SHARE_RUNTIME_STACKWATERMARK_HPP

From c2e90bcc8026fb2047b42deae6cdad738d6d01b8 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Wed, 23 Apr 2025 08:21:07 +0000
Subject: [PATCH 072/901] 8355363: [BACKOUT] 8354668: Missing REX2 prefix
 accounting in ZGC barriers leads to incorrect encoding

Reviewed-by: chagedorn
---
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp      | 14 +++++++-------
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp      |  2 +-
 src/hotspot/cpu/x86/gc/z/z_x86_64.ad               |  4 ++--
 src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 0891d303563..9cdf0b229c0 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -391,8 +391,8 @@ void ZBarrierSetAssembler::store_barrier_fast(MacroAssembler* masm,
     if (rnew_zaddress != noreg) {
       // noreg means null; no need to color
       __ movptr(rnew_zpointer, rnew_zaddress);
+      __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
       __ shlq(rnew_zpointer, barrier_Relocation::unpatched);
-      __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
       __ orq_imm32(rnew_zpointer, barrier_Relocation::unpatched);
       __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
     }
@@ -969,13 +969,13 @@ void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm,
 #define __ ce->masm()->
 
 static void z_uncolor(LIR_Assembler* ce, LIR_Opr ref) {
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shrq(ref->as_register(), barrier_Relocation::unpatched);
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
 }
 
 static void z_color(LIR_Assembler* ce, LIR_Opr ref) {
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shlq(ref->as_register(), barrier_Relocation::unpatched);
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
   __ orq_imm32(ref->as_register(), barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
 }
@@ -1278,8 +1278,8 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
 
 static int patch_barrier_relocation_offset(int format) {
   switch (format) {
-  case ZBarrierRelocationFormatLoadGoodAfterShX:
-    return -1;
+  case ZBarrierRelocationFormatLoadGoodBeforeShl:
+    return 3;
 
   case ZBarrierRelocationFormatStoreGoodAfterCmp:
     return -2;
@@ -1300,7 +1300,7 @@ static int patch_barrier_relocation_offset(int format) {
 
 static uint16_t patch_barrier_relocation_value(int format) {
   switch (format) {
-  case ZBarrierRelocationFormatLoadGoodAfterShX:
+  case ZBarrierRelocationFormatLoadGoodBeforeShl:
     return (uint16_t)ZPointerLoadShift;
 
   case ZBarrierRelocationFormatMarkBadAfterTest:
@@ -1327,7 +1327,7 @@ void ZBarrierSetAssembler::patch_barrier_relocation(address addr, int format) {
   const int offset = patch_barrier_relocation_offset(format);
   const uint16_t value = patch_barrier_relocation_value(format);
   uint8_t* const patch_addr = (uint8_t*)addr + offset;
-  if (format == ZBarrierRelocationFormatLoadGoodAfterShX) {
+  if (format == ZBarrierRelocationFormatLoadGoodBeforeShl) {
     *patch_addr = (uint8_t)value;
   } else {
     *(uint16_t*)patch_addr = value;
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 6976452bd63..8bb653ec5fb 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -49,7 +49,7 @@ class ZLoadBarrierStubC2;
 class ZStoreBarrierStubC2;
 #endif // COMPILER2
 
-const int ZBarrierRelocationFormatLoadGoodAfterShX  = 0;
+const int ZBarrierRelocationFormatLoadGoodBeforeShl = 0;
 const int ZBarrierRelocationFormatLoadBadAfterTest  = 1;
 const int ZBarrierRelocationFormatMarkBadAfterTest  = 2;
 const int ZBarrierRelocationFormatStoreGoodAfterCmp = 3;
diff --git a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
index e2484a71e7d..045aa5d5381 100644
--- a/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
+++ b/src/hotspot/cpu/x86/gc/z/z_x86_64.ad
@@ -35,15 +35,15 @@ source %{
 #include "gc/z/zBarrierSetAssembler.hpp"
 
 static void z_color(MacroAssembler* masm, const MachNode* node, Register ref) {
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shlq(ref, barrier_Relocation::unpatched);
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
   __ orq_imm32(ref, barrier_Relocation::unpatched);
   __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterOr);
 }
 
 static void z_uncolor(MacroAssembler* masm, const MachNode* node, Register ref) {
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
   __ shrq(ref, barrier_Relocation::unpatched);
-  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
 }
 
 static void z_keep_alive_load_barrier(MacroAssembler* masm, const MachNode* node, Address ref_addr, Register ref) {
diff --git a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
index 7e239a68983..9e6a4789dc2 100644
--- a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
+++ b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
@@ -221,7 +221,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
       return true;
 #if INCLUDE_ZGC
     case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL:
-      _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodAfterShX);
+      _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
       return true;
     case Z_BARRIER_RELOCATION_FORMAT_LOAD_BAD_AFTER_TEST:
       _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadBadAfterTest);

From e76f20301c3dcd65610e982fc98b7a08ebf0c8f1 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 23 Apr 2025 10:13:26 +0000
Subject: [PATCH 073/901] 8354309: Sort GC includes

Reviewed-by: eosterlund, iwalulya, kbarrett
---
 .../c1/shenandoahBarrierSetC1_aarch64.cpp     |  2 +-
 .../shenandoahBarrierSetAssembler_aarch64.cpp |  6 ++---
 .../cpu/aarch64/gc/z/zAddress_aarch64.cpp     |  2 +-
 .../arm/gc/g1/g1BarrierSetAssembler_arm.cpp   |  1 -
 .../arm/gc/shared/barrierSetNMethod_arm.cpp   |  2 +-
 .../ppc/gc/shared/barrierSetNMethod_ppc.cpp   |  2 +-
 .../c1/shenandoahBarrierSetC1_ppc.cpp         |  2 +-
 .../shenandoahBarrierSetAssembler_ppc.cpp     |  6 ++---
 src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp     |  2 +-
 .../gc/shared/barrierSetNMethod_riscv.cpp     |  2 +-
 .../c1/shenandoahBarrierSetC1_riscv.cpp       |  2 +-
 .../shenandoahBarrierSetAssembler_riscv.cpp   |  6 ++---
 src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp |  2 +-
 .../s390/gc/g1/g1BarrierSetAssembler_s390.cpp |  4 +--
 .../c1/shenandoahBarrierSetC1_x86.cpp         |  2 +-
 .../shenandoahBarrierSetAssembler_x86.cpp     |  4 +--
 .../os/windows/gc/z/zSyscall_windows.hpp      |  1 -
 .../gc/epsilon/epsilonMonitoringSupport.cpp   |  2 +-
 src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp |  2 +-
 src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp |  2 +-
 src/hotspot/share/gc/g1/g1AllocRegion.cpp     |  2 +-
 src/hotspot/share/gc/g1/g1Allocator.cpp       |  2 +-
 .../gc/g1/g1AnalyticsSequences.inline.hpp     |  1 +
 src/hotspot/share/gc/g1/g1BarrierSet.hpp      |  2 +-
 .../share/gc/g1/g1BlockOffsetTable.inline.hpp |  3 ++-
 src/hotspot/share/gc/g1/g1CardSet.inline.hpp  |  1 +
 .../gc/g1/g1CardSetContainers.inline.hpp      |  1 +
 .../share/gc/g1/g1CardSetMemory.inline.hpp    |  1 +
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  6 ++---
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +-
 .../share/gc/g1/g1CollectionSet.inline.hpp    |  1 +
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  2 +-
 src/hotspot/share/gc/g1/g1ConcurrentMark.hpp  |  2 +-
 ...ConcurrentMarkObjArrayProcessor.inline.hpp |  2 +-
 .../gc/g1/g1ConcurrentRebuildAndScrub.cpp     |  3 +--
 .../share/gc/g1/g1ConcurrentRefine.cpp        |  1 +
 src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp  |  2 +-
 src/hotspot/share/gc/g1/g1EdenRegions.hpp     |  2 +-
 .../gc/g1/g1EvacFailureRegions.inline.hpp     |  3 ++-
 src/hotspot/share/gc/g1/g1EvacStats.cpp       |  2 +-
 src/hotspot/share/gc/g1/g1EvacStats.hpp       |  2 +-
 src/hotspot/share/gc/g1/g1FullCollector.cpp   |  2 +-
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp    |  4 +--
 .../share/gc/g1/g1HeapRegionManager.cpp       |  2 +-
 src/hotspot/share/gc/g1/g1InitLogger.cpp      |  2 +-
 .../share/gc/g1/g1MonitoringSupport.cpp       |  2 +-
 .../share/gc/g1/g1MonitoringSupport.hpp       |  2 +-
 .../share/gc/g1/g1MonotonicArena.inline.hpp   |  1 +
 .../gc/g1/g1MonotonicArenaFreeMemoryTask.cpp  |  2 +-
 src/hotspot/share/gc/g1/g1NMethodClosure.cpp  |  2 +-
 .../share/gc/g1/g1OopClosures.inline.hpp      |  2 +-
 .../share/gc/g1/g1ParScanThreadState.hpp      |  2 +-
 src/hotspot/share/gc/g1/g1Policy.cpp          |  7 +++---
 src/hotspot/share/gc/g1/g1Policy.hpp          |  2 +-
 src/hotspot/share/gc/g1/g1RemSet.cpp          |  4 +--
 src/hotspot/share/gc/g1/g1ServiceThread.cpp   |  2 +-
 src/hotspot/share/gc/g1/g1SurvivorRegions.cpp |  2 +-
 src/hotspot/share/gc/g1/g1Trace.cpp           |  2 +-
 src/hotspot/share/gc/g1/g1VMOperations.cpp    |  2 +-
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  |  6 ++---
 .../share/gc/g1/g1YoungGCPreEvacuateTasks.cpp |  2 +-
 .../share/gc/parallel/parallelInitLogger.cpp  |  2 +-
 .../gc/parallel/psAdaptiveSizePolicy.cpp      |  2 +-
 src/hotspot/share/gc/parallel/psCardTable.cpp |  2 +-
 .../share/gc/parallel/psCompactionManager.cpp |  2 +-
 .../share/gc/parallel/psCompactionManager.hpp |  2 +-
 src/hotspot/share/gc/parallel/psScavenge.cpp  |  6 ++---
 src/hotspot/share/gc/parallel/psScavenge.hpp  |  2 +-
 .../share/gc/parallel/psVMOperations.cpp      |  2 +-
 .../share/gc/serial/serialArguments.cpp       |  4 +--
 src/hotspot/share/gc/serial/serialFullGC.cpp  |  4 +--
 .../gc/serial/tenuredGeneration.inline.hpp    |  1 +
 src/hotspot/share/gc/shared/ageTable.cpp      |  2 +-
 .../gc/shared/barrierSetConfig.inline.hpp     |  2 +-
 .../share/gc/shared/barrierSetNMethod.cpp     |  2 +-
 src/hotspot/share/gc/shared/bufferNode.cpp    |  2 +-
 .../share/gc/shared/c1/barrierSetC1.hpp       |  2 +-
 .../share/gc/shared/c2/barrierSetC2.cpp       |  2 +-
 .../gc/shared/c2/cardTableBarrierSetC2.cpp    |  2 +-
 .../share/gc/shared/c2/modRefBarrierSetC2.cpp |  2 +-
 src/hotspot/share/gc/shared/cardTable.cpp     |  2 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp |  6 ++---
 src/hotspot/share/gc/shared/gcHeapSummary.hpp |  2 +-
 src/hotspot/share/gc/shared/gcInitLogger.cpp  |  2 +-
 src/hotspot/share/gc/shared/gcLocker.cpp      |  4 +--
 src/hotspot/share/gc/shared/gcLogPrecious.hpp |  2 +-
 .../share/gc/shared/gcOverheadChecker.hpp     |  4 +--
 .../share/gc/shared/gcPolicyCounters.cpp      |  2 +-
 src/hotspot/share/gc/shared/gcTimer.cpp       |  2 +-
 src/hotspot/share/gc/shared/gcTraceTime.cpp   |  2 +-
 .../share/gc/shared/gcVMOperations.cpp        |  2 +-
 .../share/gc/shared/locationPrinter.cpp       |  2 +-
 src/hotspot/share/gc/shared/memAllocator.cpp  |  2 +-
 .../share/gc/shared/parallelCleaning.cpp      |  3 +--
 .../share/gc/shared/partialArrayState.cpp     |  1 +
 .../shared/partialArrayTaskStepper.inline.hpp |  3 ++-
 .../shared/referenceProcessorPhaseTimes.cpp   |  2 +-
 src/hotspot/share/gc/shared/satbMarkQueue.cpp |  2 +-
 .../gc/shared/stringdedup/stringDedup.cpp     |  2 +-
 .../shared/stringdedup/stringDedupTable.cpp   |  4 +--
 .../shared/stringdedup/stringDedupTable.hpp   |  2 +-
 .../share/gc/shared/taskTerminator.cpp        |  2 +-
 src/hotspot/share/gc/shared/taskqueue.cpp     |  2 +-
 .../shared/threadLocalAllocBuffer.inline.hpp  |  2 +-
 src/hotspot/share/gc/shared/weakProcessor.cpp |  2 +-
 .../shenandoah/c1/shenandoahBarrierSetC1.cpp  |  2 +-
 .../shenandoah/c2/shenandoahBarrierSetC2.cpp  |  6 ++---
 .../gc/shenandoah/c2/shenandoahSupport.cpp    |  2 +-
 .../shenandoahAdaptiveHeuristics.cpp          |  2 +-
 .../shenandoahAdaptiveHeuristics.hpp          |  2 +-
 .../shenandoahCompactHeuristics.cpp           |  2 +-
 .../shenandoahGenerationalHeuristics.cpp      |  3 +--
 .../heuristics/shenandoahGlobalHeuristics.cpp |  3 +--
 .../heuristics/shenandoahHeuristics.cpp       |  2 +-
 .../heuristics/shenandoahYoungHeuristics.cpp  |  1 -
 .../mode/shenandoahGenerationalMode.cpp       |  2 +-
 .../shenandoah/mode/shenandoahPassiveMode.cpp |  2 +-
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |  2 +-
 .../shenandoahBarrierSet.inline.hpp           |  2 +-
 .../shenandoah/shenandoahClosures.inline.hpp  |  4 +--
 .../gc/shenandoah/shenandoahCodeRoots.hpp     |  2 +-
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  |  6 ++---
 .../shenandoah/shenandoahConcurrentMark.cpp   |  4 +--
 .../gc/shenandoah/shenandoahControlThread.cpp |  6 ++---
 .../gc/shenandoah/shenandoahControlThread.hpp |  4 +--
 .../gc/shenandoah/shenandoahController.cpp    |  3 +--
 .../gc/shenandoah/shenandoahController.hpp    |  2 +-
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  4 +--
 .../gc/shenandoah/shenandoahEvacTracker.cpp   |  4 +--
 .../share/gc/shenandoah/shenandoahFreeSet.cpp |  2 +-
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  2 +-
 .../share/gc/shenandoah/shenandoahFullGC.cpp  | 13 +++++-----
 .../share/gc/shenandoah/shenandoahGC.hpp      |  2 +-
 .../gc/shenandoah/shenandoahGeneration.cpp    |  5 ++--
 .../gc/shenandoah/shenandoahGeneration.hpp    |  2 +-
 .../shenandoah/shenandoahGenerationSizer.cpp  |  2 +-
 .../shenandoahGenerationalControlThread.cpp   |  8 +++---
 .../shenandoahGenerationalEvacuationTask.cpp  |  2 +-
 .../shenandoahGenerationalFullGC.cpp          |  4 +--
 .../shenandoah/shenandoahGenerationalHeap.cpp |  2 +-
 .../shenandoah/shenandoahGlobalGeneration.cpp |  2 +-
 .../shenandoah/shenandoahGlobalGeneration.hpp |  2 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 25 ++++++++-----------
 .../share/gc/shenandoah/shenandoahHeap.hpp    |  8 +++---
 .../gc/shenandoah/shenandoahHeap.inline.hpp   | 14 +++++------
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |  6 ++---
 .../shenandoahHeapRegion.inline.hpp           |  3 ++-
 .../shenandoahHeapRegionCounters.cpp          |  2 +-
 .../shenandoahHeapRegionCounters.hpp          |  2 +-
 .../gc/shenandoah/shenandoahHeapRegionSet.cpp |  2 +-
 .../gc/shenandoah/shenandoahHeapRegionSet.hpp |  2 +-
 .../gc/shenandoah/shenandoahInitLogger.cpp    |  4 +--
 .../share/gc/shenandoah/shenandoahLock.cpp    |  3 +--
 .../share/gc/shenandoah/shenandoahMark.hpp    |  2 +-
 .../gc/shenandoah/shenandoahMarkBitMap.cpp    |  2 +-
 .../shenandoah/shenandoahMarkingContext.cpp   |  1 -
 .../shenandoahMarkingContext.inline.hpp       |  1 +
 .../gc/shenandoah/shenandoahMemoryPool.cpp    |  2 +-
 .../share/gc/shenandoah/shenandoahMetrics.cpp |  4 +--
 .../gc/shenandoah/shenandoahMmuTracker.cpp    |  2 +-
 .../shenandoahMonitoringSupport.cpp           |  2 +-
 .../share/gc/shenandoah/shenandoahOldGC.cpp   |  2 +-
 .../gc/shenandoah/shenandoahOldGeneration.cpp |  2 +-
 .../gc/shenandoah/shenandoahPhaseTimings.cpp  |  4 +--
 .../gc/shenandoah/shenandoahPhaseTimings.hpp  |  4 +--
 .../shenandoahReferenceProcessor.cpp          |  4 +--
 .../gc/shenandoah/shenandoahRootProcessor.cpp |  2 +-
 .../shenandoahRootProcessor.inline.hpp        |  2 +-
 .../gc/shenandoah/shenandoahRootVerifier.cpp  |  6 ++---
 .../share/gc/shenandoah/shenandoahRuntime.cpp |  2 +-
 .../shenandoahScanRemembered.inline.hpp       | 11 ++++----
 .../gc/shenandoah/shenandoahSimpleBitMap.hpp  |  4 +--
 .../shenandoahStringDedup.inline.hpp          |  3 ++-
 .../gc/shenandoah/shenandoahTaskqueue.hpp     |  2 +-
 .../shenandoah/shenandoahThreadLocalData.hpp  |  8 +++---
 .../share/gc/shenandoah/shenandoahUnload.cpp  |  4 +--
 .../share/gc/shenandoah/shenandoahUtils.cpp   |  2 +-
 .../share/gc/shenandoah/shenandoahUtils.hpp   |  2 +-
 .../gc/shenandoah/shenandoahVerifier.cpp      |  2 +-
 .../gc/shenandoah/shenandoahWorkGroup.cpp     |  3 +--
 .../shenandoah/shenandoahYoungGeneration.cpp  |  2 +-
 .../shenandoah/shenandoahYoungGeneration.hpp  |  2 +-
 .../gc/shenandoah/vmStructs_shenandoah.hpp    |  2 +-
 src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp   |  2 +-
 src/hotspot/share/gc/z/zHeapIterator.hpp      |  2 +-
 src/hotspot/share/gc/z/zMarkContext.hpp       |  2 +-
 src/hotspot/share/gc/z/zMarkingSMR.hpp        |  2 +-
 src/hotspot/share/gc/z/zNMT.cpp               |  2 +-
 src/hotspot/share/gc/z/zNMT.hpp               |  2 +-
 src/hotspot/share/gc/z/zNMethod.cpp           |  2 +-
 src/hotspot/share/gc/z/zNMethodTable.cpp      |  2 +-
 src/hotspot/share/gc/z/zObjArrayAllocator.cpp |  2 +-
 src/hotspot/share/gc/z/zRuntimeWorkers.cpp    |  2 +-
 src/hotspot/share/gc/z/zStat.cpp              |  2 +-
 .../share/gc/z/zUncoloredRoot.inline.hpp      |  2 +-
 src/hotspot/share/gc/z/zVerify.cpp            |  2 +-
 .../gc/z/zVirtualMemoryManager.inline.hpp     |  2 +-
 197 files changed, 281 insertions(+), 284 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
index e33ef47cf3c..e4db8a9ab1f 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
@@ -27,9 +27,9 @@
 #include "c1/c1_MacroAssembler.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
-#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 
 #define __ masm->masm()->
 
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index ac22b43faaf..a2b3f44c68b 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
@@ -30,10 +32,8 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
-#include "interpreter/interpreter.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"
 #ifdef COMPILER1
diff --git a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
index 20e37528c04..7008615ed43 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zAddress_aarch64.cpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zBarrierSetAssembler.hpp"
 #include "gc/z/zGlobals.hpp"
diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
index 466dcc8fe66..049477cda76 100644
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp
@@ -26,7 +26,6 @@
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
-#include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
index 224a499ff54..c6cc0ce406e 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
@@ -29,8 +29,8 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/sharedRuntime.hpp"
 #include "runtime/registerMap.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
index 19084ed27c7..1b44a169e67 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "code/codeBlob.hpp"
-#include "code/nmethod.hpp"
 #include "code/nativeInst.hpp"
+#include "code/nmethod.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
index 48422bc6621..5b24259103f 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
@@ -26,9 +26,9 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
-#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 
 #define __ masm->masm()->
 
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index 842201e1584..ec5b98bd4c5 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -24,8 +24,10 @@
  */
 
 #include "asm/macroAssembler.inline.hpp"
-#include "gc/shared/gcArguments.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcArguments.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
@@ -34,8 +36,6 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "interpreter/interpreter.hpp"
 #include "macroAssembler_ppc.hpp"
 #include "runtime/javaThread.hpp"
diff --git a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
index 2e3eed8ec60..f3a7a948f70 100644
--- a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
index 39da77181c6..f24e4f789bc 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetNMethod_riscv.cpp
@@ -31,8 +31,8 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/sharedRuntime.hpp"
 #include "runtime/registerMap.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #if INCLUDE_JVMCI
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
index 2a96bd32cf8..11c4e5dc81b 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
@@ -26,9 +26,9 @@
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
-#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 
 #define __ masm->masm()->
 
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index 3021351cca8..4c1056e75a5 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
@@ -30,10 +32,8 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
-#include "interpreter/interpreter.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "interpreter/interpreter.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"
 #ifdef COMPILER1
diff --git a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
index 1f2f0146f04..5f783e6fb8b 100644
--- a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
@@ -22,8 +22,8 @@
  * questions.
  */
 
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zBarrierSetAssembler.hpp"
 #include "gc/z/zGlobals.hpp"
diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
index 2054c3db36c..dea3317270e 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
@@ -24,16 +24,16 @@
  */
 
 #include "asm/macroAssembler.inline.hpp"
-#include "registerSaver_s390.hpp"
-#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "interpreter/interp_masm.hpp"
+#include "registerSaver_s390.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
index 298e5640b27..66fb4cbb8c7 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
@@ -26,9 +26,9 @@
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
-#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 
 #define __ masm->masm()->
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index 45e4c46161f..deb8111adad 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
@@ -30,8 +32,6 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "interpreter/interpreter.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"
diff --git a/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp b/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
index d6174de7d88..3d20fa5a924 100644
--- a/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
+++ b/src/hotspot/os/windows/gc/z/zSyscall_windows.hpp
@@ -27,7 +27,6 @@
 #include "utilities/globalDefinitions.hpp"
 
 #include <Windows.h>
-#include <Memoryapi.h>
 
 class ZSyscall {
 private:
diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
index 540ede9dd83..a2ae6f8a14a 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/epsilon/epsilonMonitoringSupport.hpp"
 #include "gc/epsilon/epsilonHeap.hpp"
+#include "gc/epsilon/epsilonMonitoringSupport.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metaspaceCounters.hpp"
diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
index a0eb218dd6c..c4791311e9b 100644
--- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
+++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "c1/c1_LIRGenerator.hpp"
 #include "c1/c1_CodeStubs.hpp"
+#include "c1/c1_LIRGenerator.hpp"
 #include "gc/g1/c1/g1BarrierSetC1.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 57e481668f8..bca2255479b 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -29,8 +29,8 @@
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1ThreadLocalData.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/block.hpp"
 #include "opto/compile.hpp"
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index 29907cbc051..7e748cf7e9f 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/g1/g1AllocRegion.inline.hpp"
-#include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 49a4958f718..c44234fa11c 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -24,9 +24,9 @@
 
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1AllocRegion.inline.hpp"
+#include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
-#include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionSet.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
index cd59cac80b4..9fae49320bc 100644
--- a/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1AnalyticsSequences.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1ANALYTICSSEQUENCES_INLINE_HPP
 
 #include "gc/g1/g1AnalyticsSequences.hpp"
+
 #include "gc/g1/g1Predictions.hpp"
 
 bool G1PhaseDependentSeq::enough_samples_to_use_mixed_seq() const {
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 3212aec2780..8c2605b9746 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -27,9 +27,9 @@
 
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
+#include "gc/shared/bufferNode.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
-#include "gc/shared/bufferNode.hpp"
 
 class G1CardTable;
 
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index 7e6b0e56d93..e35ae08dfad 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -26,11 +26,12 @@
 #define SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
+
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/memset_with_concurrent_readers.hpp"
-#include "runtime/atomic.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 
 inline HeapWord* G1BlockOffsetTable::block_start_reaching_into_card(const void* addr) const {
   assert(_reserved.contains(addr), "invalid address");
diff --git a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
index 7d753f00bfb..4909e922c6b 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1CARDSET_INLINE_HPP
 
 #include "gc/g1/g1CardSet.hpp"
+
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 61707dcf012..0efc44dea12 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1CARDSETCONTAINERS_INLINE_HPP
 
 #include "gc/g1/g1CardSetContainers.hpp"
+
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/checkedCast.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
index 8c0fab3fd11..7bb618e79b4 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1CARDSETMEMORY_INLINE_HPP
 
 #include "gc/g1/g1CardSetMemory.hpp"
+
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1MonotonicArena.inline.hpp"
 #include "utilities/globalCounter.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 31f0cc12aa5..8b36bf124f2 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -35,16 +35,16 @@
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1CollectorState.hpp"
+#include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
-#include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1FullCollector.hpp"
 #include "gc/g1/g1GCCounters.hpp"
 #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
-#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1GCPauseType.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
@@ -91,8 +91,8 @@
 #include "gc/shared/taskqueue.inline.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/tlab_globals.hpp"
-#include "gc/shared/workerPolicy.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
+#include "gc/shared/workerPolicy.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/heapInspection.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 8d449ceedc6..0f583e8dcbf 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -27,8 +27,8 @@
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BiasedArray.hpp"
-#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1CardSet.hpp"
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
index f295eff3edd..717f6860eb6 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_G1_G1COLLECTIONSET_INLINE_HPP
 
 #include "gc/g1/g1CollectionSet.hpp"
+
 #include "gc/g1/g1HeapRegionRemSet.hpp"
 
 template <class CardOrRangeVisitor>
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 0b8e66f9043..ef62587d868 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -52,8 +52,8 @@
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
-#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
+#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "jvm.h"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
index d54f9bc96f1..2fb9732b88e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
@@ -31,8 +31,8 @@
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
 #include "gc/shared/gcCause.hpp"
-#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
+#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/verifyOption.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/shared/workerUtils.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
index d51c5c74082..bc2fd565aab 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
@@ -27,9 +27,9 @@
 
 #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
 
+#include "gc/shared/gc_globals.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
-#include "gc/shared/gc_globals.hpp"
 
 inline bool G1CMObjArrayProcessor::should_be_sliced(oop obj) {
   return obj->is_objArray() && ((objArrayOop)obj)->size() >= 2 * ObjArrayMarkingStride;
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index 993df8b47ce..0633e18411d 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -23,10 +23,9 @@
  */
 
 
-#include "gc/g1/g1ConcurrentRebuildAndScrub.hpp"
-
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
+#include "gc/g1/g1ConcurrentRebuildAndScrub.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
index ce4738d784e..dc88f09f980 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
@@ -38,6 +38,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <math.h>
 
 G1ConcurrentRefineThread* G1ConcurrentRefineThreadControl::create_refinement_thread(uint worker_id, bool initializing) {
diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
index ce2f88c9b48..6beb536df87 100644
--- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
+++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp
@@ -25,9 +25,9 @@
 #ifndef SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
 #define SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP
 
-#include "gc/g1/g1FreeIdSet.hpp"
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1ConcurrentRefineStats.hpp"
+#include "gc/g1/g1FreeIdSet.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
 #include "gc/shared/ptrQueue.hpp"
diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
index 81d02381c9b..a6e005ff2dc 100644
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_G1_G1EDENREGIONS_HPP
 #define SHARE_GC_G1_G1EDENREGIONS_HPP
 
-#include "gc/g1/g1RegionsOnNodes.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
+#include "gc/g1/g1RegionsOnNodes.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
index 0d4f5091d9e..6d5084a1447 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
@@ -25,8 +25,9 @@
 #ifndef SHARE_GC_G1_G1EVACFAILUREREGIONS_INLINE_HPP
 #define SHARE_GC_G1_G1EVACFAILUREREGIONS_INLINE_HPP
 
-#include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.hpp"
+
+#include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "runtime/atomic.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.cpp b/src/hotspot/share/gc/g1/g1EvacStats.cpp
index b0e5f7b6864..049175a4ecc 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/g1/g1EvacStats.hpp"
-#include "gc/shared/gcId.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcId.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp
index 8b7360f55e3..4227cbab936 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_G1_G1EVACSTATS_HPP
 #define SHARE_GC_G1_G1EVACSTATS_HPP
 
-#include "gc/shared/plab.hpp"
 #include "gc/shared/gcUtil.hpp"
+#include "gc/shared/plab.hpp"
 
 // Records various memory allocation statistics gathered during evacuation. All sizes
 // are in HeapWords.
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
index e9d6d23149f..a1e1d152fd8 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -35,9 +35,9 @@
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.inline.hpp"
+#include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
-#include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/verifyOption.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index ebe77b2551d..5b0d5ca8eb9 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -31,11 +31,11 @@
 #include "gc/shared/oopStorageSet.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workerDataArray.inline.hpp"
-#include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#include "runtime/timer.hpp"
+#include "memory/resourceArea.hpp"
 #include "runtime/os.hpp"
+#include "runtime/timer.hpp"
 #include "utilities/enumIterator.hpp"
 #include "utilities/macros.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index 016b2046265..0098839c1a4 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -24,8 +24,8 @@
 
 #include "gc/g1/g1Arguments.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1CommittedRegionMap.inline.hpp"
+#include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
 #include "gc/g1/g1HeapRegionPrinter.hpp"
diff --git a/src/hotspot/share/gc/g1/g1InitLogger.cpp b/src/hotspot/share/gc/g1/g1InitLogger.cpp
index 1e09eed9043..1838b55e4d3 100644
--- a/src/hotspot/share/gc/g1/g1InitLogger.cpp
+++ b/src/hotspot/share/gc/g1/g1InitLogger.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/g1/g1InitLogger.hpp"
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
index 03bd1840206..6d1ffdb7c00 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
@@ -23,9 +23,9 @@
  */
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1MemoryPool.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/g1MemoryPool.hpp"
 #include "gc/shared/hSpaceCounters.hpp"
 #include "memory/metaspaceCounters.hpp"
 #include "runtime/mutexLocker.hpp"
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
index f22581ad9b1..62c502d497c 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
@@ -27,9 +27,9 @@
 
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/generationCounters.hpp"
+#include "runtime/mutex.hpp"
 #include "services/memoryManager.hpp"
 #include "services/memoryService.hpp"
-#include "runtime/mutex.hpp"
 
 class CollectorCounters;
 class G1CollectedHeap;
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp b/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
index f01248424a0..4ded4bcccae 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
@@ -27,6 +27,7 @@
 #define SHARE_GC_G1_G1MONOTONICARENA_INLINE_HPP
 
 #include "gc/g1/g1MonotonicArena.hpp"
+
 #include "runtime/atomic.hpp"
 #include "utilities/globalCounter.inline.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
index cc857a53969..40c199dee49 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArenaFreeMemoryTask.cpp
@@ -28,8 +28,8 @@
 #include "gc/g1/g1HeapRegionRemSet.hpp"
 #include "gc/g1/g1MonotonicArenaFreeMemoryTask.hpp"
 #include "gc/g1/g1MonotonicArenaFreePool.hpp"
-#include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "runtime/os.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1NMethodClosure.cpp b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
index 8dc817f1452..d74aa5eae1d 100644
--- a/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
+++ b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
@@ -23,11 +23,11 @@
  */
 
 #include "code/nmethod.hpp"
-#include "gc/g1/g1NMethodClosure.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
+#include "gc/g1/g1NMethodClosure.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
index 5ab1f58bce1..8d84f144f02 100644
--- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
@@ -38,8 +38,8 @@
 #include "memory/iterator.inline.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
-#include "oops/oopsHierarchy.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/oopsHierarchy.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/align.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index 94ca0878df8..4d569622238 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -26,8 +26,8 @@
 #define SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
-#include "gc/g1/g1RedirtyCardsQueue.hpp"
 #include "gc/g1/g1OopClosures.hpp"
+#include "gc/g1/g1RedirtyCardsQueue.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.hpp"
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index deb67656a41..6488bf44e41 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -28,20 +28,21 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1CollectionSetCandidates.inline.hpp"
+#include "gc/g1/g1CollectionSetChooser.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
 #include "gc/g1/g1ConcurrentRefineStats.hpp"
-#include "gc/g1/g1CollectionSetChooser.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1IHOPControl.hpp"
-#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "logging/log.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -49,8 +50,6 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/pair.hpp"
 
-#include "gc/shared/gcTraceTime.inline.hpp"
-
 G1Policy::G1Policy(STWGCTimer* gc_timer) :
   _predictor((100 - G1ConfidencePercent) / 100.0),
   _analytics(new G1Analytics(&_predictor)),
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index fb24b5ab72b..37d66ee6535 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -31,8 +31,8 @@
 #include "gc/g1/g1HeapRegionAttr.hpp"
 #include "gc/g1/g1MMUTracker.hpp"
 #include "gc/g1/g1OldGenAllocationTracker.hpp"
-#include "gc/g1/g1RemSetTrackingPolicy.hpp"
 #include "gc/g1/g1Predictions.hpp"
+#include "gc/g1/g1RemSetTrackingPolicy.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index a25fce2d006..c4f84b02d01 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -40,12 +40,12 @@
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/g1RootClosures.hpp"
 #include "gc/g1/g1RemSet.hpp"
+#include "gc/g1/g1RootClosures.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/bufferNodeList.hpp"
-#include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ServiceThread.cpp b/src/hotspot/share/gc/g1/g1ServiceThread.cpp
index 5f664cfba3a..22675ec2a64 100644
--- a/src/hotspot/share/gc/g1/g1ServiceThread.cpp
+++ b/src/hotspot/share/gc/g1/g1ServiceThread.cpp
@@ -26,8 +26,8 @@
 #include "logging/log.hpp"
 #include "runtime/cpuTimeCounters.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/timer.hpp"
 #include "runtime/os.hpp"
+#include "runtime/timer.hpp"
 
 G1SentinelTask::G1SentinelTask() : G1ServiceTask("Sentinel Task") {
   set_time(max_jlong);
diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
index dd3323f4079..edd4f35d5ed 100644
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
@@ -24,8 +24,8 @@
 
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
-#include "utilities/growableArray.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/growableArray.hpp"
 
 G1SurvivorRegions::G1SurvivorRegions() :
   _regions(new (mtGC) GrowableArray<G1HeapRegion*>(8, mtGC)),
diff --git a/src/hotspot/share/gc/g1/g1Trace.cpp b/src/hotspot/share/gc/g1/g1Trace.cpp
index 3cc8a8a28e1..6c9a87e4d98 100644
--- a/src/hotspot/share/gc/g1/g1Trace.cpp
+++ b/src/hotspot/share/gc/g1/g1Trace.cpp
@@ -23,9 +23,9 @@
  */
 
 #include "gc/g1/g1EvacInfo.hpp"
+#include "gc/g1/g1GCPauseType.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "gc/g1/g1Trace.hpp"
-#include "gc/g1/g1GCPauseType.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "jfr/jfrEvents.hpp"
 #if INCLUDE_JFR
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index 9552bd6d418..260817f7a57 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -25,8 +25,8 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1Policy.hpp"
-#include "gc/g1/g1VMOperations.hpp"
 #include "gc/g1/g1Trace.hpp"
+#include "gc/g1/g1VMOperations.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcId.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 44803564de1..69586b4ebf2 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -32,9 +32,9 @@
 #include "gc/g1/g1CollectionSetCandidates.inline.hpp"
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
-#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
 #include "gc/g1/g1EvacInfo.hpp"
+#include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
@@ -49,9 +49,9 @@
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
 #include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
-#include "gc/shared/gcTraceTime.inline.hpp"
-#include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcTimer.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/workerPolicy.hpp"
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
index 63e77979812..839b70d93af 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
@@ -25,9 +25,9 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentRefineStats.hpp"
 #include "gc/g1/g1DirtyCardQueue.hpp"
-#include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
 #include "gc/g1/g1RegionPinCache.inline.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
+#include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
 #include "gc/shared/barrierSet.inline.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "memory/allocation.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/parallelInitLogger.cpp b/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
index b28f0385c51..1d9c9f840ba 100644
--- a/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
+++ b/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/parallel/parallelInitLogger.hpp"
-#include "gc/shared/genArguments.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "gc/shared/genArguments.hpp"
 
 void ParallelInitLogger::print_heap() {
   log_info_p(gc, init)("Alignments:"
diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
index 3bb0c0bf119..b4f860e053f 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
@@ -27,8 +27,8 @@
 #include "gc/parallel/psGCAdaptivePolicyCounters.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/shared/gcCause.hpp"
-#include "gc/shared/gcUtil.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
+#include "gc/shared/gcUtil.hpp"
 #include "logging/log.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/align.hpp"
diff --git a/src/hotspot/share/gc/parallel/psCardTable.cpp b/src/hotspot/share/gc/parallel/psCardTable.cpp
index f8841b9a164..22a38d816f6 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.cpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.cpp
@@ -32,8 +32,8 @@
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
-#include "utilities/spinYield.hpp"
 #include "utilities/align.hpp"
+#include "utilities/spinYield.hpp"
 
 // Checks an individual oop for missing precise marks. Mark
 // may be either dirty or newgen.
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index f00e18c3297..ba936277821 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/parallel/objectStartArray.hpp"
-#include "gc/parallel/parMarkBitMap.inline.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
+#include "gc/parallel/parMarkBitMap.inline.hpp"
 #include "gc/parallel/psCompactionManager.inline.hpp"
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/parallel/psParallelCompact.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index 739d2cb1cc7..b013238a9f8 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -28,8 +28,8 @@
 #include "classfile/classLoaderData.hpp"
 #include "gc/parallel/psParallelCompact.hpp"
 #include "gc/shared/partialArraySplitter.hpp"
-#include "gc/shared/partialArrayTaskStats.hpp"
 #include "gc/shared/partialArrayState.hpp"
+#include "gc/shared/partialArrayTaskStats.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/taskqueue.hpp"
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index be31da5b05d..661bc3da3e1 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -44,8 +44,8 @@
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
-#include "gc/shared/oopStorageSetParState.inline.hpp"
 #include "gc/shared/oopStorageParState.inline.hpp"
+#include "gc/shared/oopStorageSetParState.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
@@ -57,18 +57,18 @@
 #include "gc/shared/workerPolicy.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/shared/workerUtils.hpp"
+#include "logging/log.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "logging/log.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
 #include "utilities/stack.inline.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index 55abdfd3cf3..8da555a8bb4 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -28,8 +28,8 @@
 #include "gc/parallel/psCardTable.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/shared/collectorCounters.hpp"
-#include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/gcTrace.hpp"
+#include "gc/shared/referenceProcessor.hpp"
 #include "memory/allStatic.hpp"
 #include "oops/oop.hpp"
 #include "utilities/stack.hpp"
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.cpp b/src/hotspot/share/gc/parallel/psVMOperations.cpp
index 4873853a3dd..dc96d9506e2 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/parallel/psParallelCompact.inline.hpp"
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
+#include "gc/parallel/psParallelCompact.inline.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/psVMOperations.hpp"
 #include "gc/shared/gcLocker.hpp"
diff --git a/src/hotspot/share/gc/serial/serialArguments.cpp b/src/hotspot/share/gc/serial/serialArguments.cpp
index 9b55e0cd9f6..aed1c2353b4 100644
--- a/src/hotspot/share/gc/serial/serialArguments.cpp
+++ b/src/hotspot/share/gc/serial/serialArguments.cpp
@@ -22,10 +22,10 @@
  *
  */
 
-#include "gc/shared/fullGCForwarding.hpp"
-#include "gc/shared/gcArguments.hpp"
 #include "gc/serial/serialArguments.hpp"
 #include "gc/serial/serialHeap.hpp"
+#include "gc/shared/fullGCForwarding.hpp"
+#include "gc/shared/gcArguments.hpp"
 
 void SerialArguments::initialize() {
   GCArguments::initialize();
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 9d0dc1932fc..15468704547 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderData.inline.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
@@ -43,11 +43,11 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/fullGCForwarding.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/modRefBarrierSet.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/referencePolicy.hpp"
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index c6a6a0ae716..d88b2566299 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
 
 #include "gc/serial/tenuredGeneration.hpp"
+
 #include "gc/shared/space.hpp"
 
 inline size_t TenuredGeneration::capacity() const {
diff --git a/src/hotspot/share/gc/shared/ageTable.cpp b/src/hotspot/share/gc/shared/ageTable.cpp
index f5b62466556..2ed6ea967db 100644
--- a/src/hotspot/share/gc/shared/ageTable.cpp
+++ b/src/hotspot/share/gc/shared/ageTable.cpp
@@ -28,11 +28,11 @@
 #include "gc/shared/gc_globals.hpp"
 #include "jvm.h"
 #include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/perfData.hpp"
 #include "utilities/copy.hpp"
-#include "logging/logStream.hpp"
 
 /* Copyright (c) 1992, 2025, Oracle and/or its affiliates, and Stanford University.
    See the LICENSE file for license information. */
diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
index 38c568889d1..f637c227ee1 100644
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
@@ -27,8 +27,8 @@
 
 #include "gc/shared/barrierSetConfig.hpp"
 
-#include "gc/shared/modRefBarrierSet.inline.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
+#include "gc/shared/modRefBarrierSet.inline.hpp"
 
 #if INCLUDE_EPSILONGC
 #include "gc/epsilon/epsilonBarrierSet.hpp"
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index c5d8a7e5401..41eb0a24b62 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -35,8 +35,8 @@
 #include "oops/method.inline.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/threads.hpp"
+#include "runtime/threadWXSetters.inline.hpp"
 #include "utilities/debug.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciRuntime.hpp"
diff --git a/src/hotspot/share/gc/shared/bufferNode.cpp b/src/hotspot/share/gc/shared/bufferNode.cpp
index e27b1279c79..b064f9c7efe 100644
--- a/src/hotspot/share/gc/shared/bufferNode.cpp
+++ b/src/hotspot/share/gc/shared/bufferNode.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/shared/bufferNode.hpp"
-#include "utilities/debug.hpp"
 #include "memory/allocation.inline.hpp"
+#include "utilities/debug.hpp"
 
 #include <new>
 
diff --git a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
index 3d0621cdc7a..e618a81b26b 100644
--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
@@ -26,9 +26,9 @@
 #define SHARE_GC_SHARED_C1_BARRIERSETC1_HPP
 
 #include "c1/c1_Decorators.hpp"
-#include "c1/c1_LIRGenerator.hpp"
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_LIR.hpp"
+#include "c1/c1_LIRGenerator.hpp"
 #include "memory/allocation.hpp"
 
 class LIRGenerator;
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 92154e7a46e..f0ed9687f11 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -24,8 +24,8 @@
 
 #include "code/vmreg.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
-#include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/c2/barrierSetC2.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/block.hpp"
 #include "opto/convertnode.hpp"
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index 7df210d9fb6..536cd6da1ef 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -23,9 +23,9 @@
  */
 
 #include "ci/ciUtilities.hpp"
+#include "gc/shared/c2/cardTableBarrierSetC2.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
-#include "gc/shared/c2/cardTableBarrierSetC2.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/graphKit.hpp"
diff --git a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
index cf5d3fc7e16..ddc9caedd71 100644
--- a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.cpp
@@ -22,10 +22,10 @@
  *
  */
 
+#include "gc/shared/c2/modRefBarrierSetC2.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/graphKit.hpp"
 #include "opto/idealKit.hpp"
-#include "gc/shared/c2/modRefBarrierSetC2.hpp"
 
 Node* ModRefBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) const {
   DecoratorSet decorators = access.decorators();
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 3236d73933c..e5dbbcc0746 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -24,8 +24,8 @@
 
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/space.hpp"
 #include "logging/log.hpp"
 #include "memory/memoryReserver.hpp"
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 9c55a894ee7..ec9872bf402 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -29,15 +29,15 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/gcLocker.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
-#include "gc/shared/stringdedup/stringDedup.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/gcWhen.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/memAllocator.hpp"
+#include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/tlab_globals.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
diff --git a/src/hotspot/share/gc/shared/gcHeapSummary.hpp b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
index fb048d06a41..ae08f60d3a6 100644
--- a/src/hotspot/share/gc/shared/gcHeapSummary.hpp
+++ b/src/hotspot/share/gc/shared/gcHeapSummary.hpp
@@ -26,8 +26,8 @@
 #define SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
 
 #include "memory/allocation.hpp"
-#include "memory/metaspaceStats.hpp"
 #include "memory/metaspaceChunkFreeListSummary.hpp"
+#include "memory/metaspaceStats.hpp"
 
 class VirtualSpaceSummary : public StackObj {
   HeapWord* _start;
diff --git a/src/hotspot/share/gc/shared/gcInitLogger.cpp b/src/hotspot/share/gc/shared/gcInitLogger.cpp
index f2d9fffdc11..91bebf726c1 100644
--- a/src/hotspot/share/gc/shared/gcInitLogger.cpp
+++ b/src/hotspot/share/gc/shared/gcInitLogger.cpp
@@ -22,9 +22,9 @@
  *
  */
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/globals.hpp"
diff --git a/src/hotspot/share/gc/shared/gcLocker.cpp b/src/hotspot/share/gc/shared/gcLocker.cpp
index caf752f70c8..fbc953512bb 100644
--- a/src/hotspot/share/gc/shared/gcLocker.cpp
+++ b/src/hotspot/share/gc/shared/gcLocker.cpp
@@ -25,15 +25,15 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcTrace.hpp"
+#include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #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/spinYield.hpp"
 #include "utilities/ticks.hpp"
 
 // GCLockerTimingDebugLogger tracks specific timing information for GC lock waits.
diff --git a/src/hotspot/share/gc/shared/gcLogPrecious.hpp b/src/hotspot/share/gc/shared/gcLogPrecious.hpp
index ec8b1c670f3..8aa70252b3d 100644
--- a/src/hotspot/share/gc/shared/gcLogPrecious.hpp
+++ b/src/hotspot/share/gc/shared/gcLogPrecious.hpp
@@ -24,10 +24,10 @@
 #ifndef SHARE_GC_SHARED_GCLOGPRECIOUS_HPP
 #define SHARE_GC_SHARED_GCLOGPRECIOUS_HPP
 
-#include "utilities/globalDefinitions.hpp"
 #include "logging/logHandle.hpp"
 #include "memory/allStatic.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 class Mutex;
 class stringStream;
diff --git a/src/hotspot/share/gc/shared/gcOverheadChecker.hpp b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
index d4a9b5cd70d..e29ae2ab911 100644
--- a/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
+++ b/src/hotspot/share/gc/shared/gcOverheadChecker.hpp
@@ -26,9 +26,9 @@
 #ifndef SHARE_GC_SHARED_GCOVERHEADCHECKER_HPP
 #define SHARE_GC_SHARED_GCOVERHEADCHECKER_HPP
 
-#include "memory/allocation.hpp"
-#include "gc/shared/gcCause.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcCause.hpp"
+#include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
 
 class SoftRefPolicy;
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.cpp b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
index d24ad745aa1..343ad6ca41e 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/shared/gcPolicyCounters.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcPolicyCounters.hpp"
 #include "memory/resourceArea.hpp"
 
 GCPolicyCounters::GCPolicyCounters(const char* name, int collectors,
diff --git a/src/hotspot/share/gc/shared/gcTimer.cpp b/src/hotspot/share/gc/shared/gcTimer.cpp
index 85859750151..a5bc7bfb02f 100644
--- a/src/hotspot/share/gc/shared/gcTimer.cpp
+++ b/src/hotspot/share/gc/shared/gcTimer.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcTimer.hpp"
 #include "utilities/growableArray.hpp"
 
 // the "time" parameter for most functions
diff --git a/src/hotspot/share/gc/shared/gcTraceTime.cpp b/src/hotspot/share/gc/shared/gcTraceTime.cpp
index def8a3f3f5c..5839027b585 100644
--- a/src/hotspot/share/gc/shared/gcTraceTime.cpp
+++ b/src/hotspot/share/gc/shared/gcTraceTime.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcTrace.hpp"
+#include "gc/shared/gcTraceTime.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/universe.hpp"
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index 8e5768ce6a9..1632dca61d5 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -25,10 +25,10 @@
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.hpp"
 #include "gc/shared/allocTracer.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcId.hpp"
 #include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcVMOperations.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "gc/shared/softRefPolicy.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shared/locationPrinter.cpp b/src/hotspot/share/gc/shared/locationPrinter.cpp
index b5efb540d45..85fdcd37524 100644
--- a/src/hotspot/share/gc/shared/locationPrinter.cpp
+++ b/src/hotspot/share/gc/shared/locationPrinter.cpp
@@ -25,9 +25,9 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/locationPrinter.hpp"
 #include "memory/universe.hpp"
-#include "runtime/os.hpp"
 #include "oops/klass.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/os.hpp"
 
 bool LocationPrinter::is_valid_obj(void* obj) {
   if (!is_object_aligned(obj)) {
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 64ca4635718..74ef1f66184 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -35,8 +35,8 @@
 #include "prims/jvmtiExport.hpp"
 #include "runtime/continuationJavaClasses.inline.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/sharedRuntime.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/sharedRuntime.hpp"
 #include "services/lowMemoryDetector.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/gc/shared/parallelCleaning.cpp b/src/hotspot/share/gc/shared/parallelCleaning.cpp
index 1b1eaf4d79a..8cb09939f22 100644
--- a/src/hotspot/share/gc/shared/parallelCleaning.cpp
+++ b/src/hotspot/share/gc/shared/parallelCleaning.cpp
@@ -22,13 +22,12 @@
  *
  */
 
-#include "classfile/symbolTable.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "code/codeCache.hpp"
 #include "gc/shared/parallelCleaning.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
-#include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 
 CodeCacheUnloadingTask::CodeCacheUnloadingTask(uint num_workers, bool unloading_occurred) :
diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index f79e012a36d..8db39281a05 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -32,6 +32,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+
 #include <new>
 
 PartialArrayState::PartialArrayState(oop src, oop dst,
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
index 1d43578b5fe..9d127697e58 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
@@ -25,8 +25,9 @@
 #ifndef SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
 #define SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
 
-#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
+
+#include "gc/shared/partialArrayState.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
index 83eaccd9813..fd2bd8f3edc 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/shared/gcTimer.hpp"
-#include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/referenceProcessor.inline.hpp"
+#include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/workerDataArray.inline.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.cpp b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
index 6e33d27897c..915eaa116fb 100644
--- a/src/hotspot/share/gc/shared/satbMarkQueue.cpp
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/shared/satbMarkQueue.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/satbMarkQueue.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp
index 9ad8decec7e..b3f96da1cce 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.cpp
@@ -25,9 +25,9 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/oopStorage.hpp"
 #include "gc/shared/oopStorageSet.hpp"
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/stringdedup/stringDedupConfig.hpp"
 #include "gc/shared/stringdedup/stringDedupProcessor.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
index 5c6628cba5c..83c6fea8c5b 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp
@@ -33,10 +33,10 @@
 #include "gc/shared/stringdedup/stringDedupConfig.hpp"
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
 #include "gc/shared/stringdedup/stringDedupTable.hpp"
-#include "memory/allocation.hpp"
-#include "memory/resourceArea.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/allocation.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/access.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/typeArrayOop.inline.hpp"
diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
index 19df8184a05..a163319e84c 100644
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
@@ -25,9 +25,9 @@
 #ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
 #define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
 
-#include "memory/allStatic.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
+#include "memory/allStatic.hpp"
 #include "oops/typeArrayOop.hpp"
 #include "oops/weakHandle.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/shared/taskTerminator.cpp b/src/hotspot/share/gc/shared/taskTerminator.cpp
index 1353c3f8c8a..cc84665087b 100644
--- a/src/hotspot/share/gc/shared/taskTerminator.cpp
+++ b/src/hotspot/share/gc/shared/taskTerminator.cpp
@@ -24,8 +24,8 @@
  */
 
 #include "gc/shared/gc_globals.hpp"
-#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
+#include "gc/shared/taskTerminator.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/javaThread.hpp"
diff --git a/src/hotspot/share/gc/shared/taskqueue.cpp b/src/hotspot/share/gc/shared/taskqueue.cpp
index a244ba45415..162eadc3cf0 100644
--- a/src/hotspot/share/gc/shared/taskqueue.cpp
+++ b/src/hotspot/share/gc/shared/taskqueue.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/shared/taskqueue.hpp"
-#include "oops/oop.inline.hpp"
 #include "logging/log.hpp"
+#include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
index 32a830a2bb1..22d19b77806 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
@@ -29,8 +29,8 @@
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/tlab_globals.hpp"
-#include "memory/universe.hpp"
 #include "logging/log.hpp"
+#include "memory/universe.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/osThread.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/gc/shared/weakProcessor.cpp b/src/hotspot/share/gc/shared/weakProcessor.cpp
index d7de8b5d8a8..bc7e9ad6375 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.cpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.cpp
@@ -27,8 +27,8 @@
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageParState.inline.hpp"
 #include "gc/shared/oopStorageSet.hpp"
-#include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/oopStorageSetParState.inline.hpp"
+#include "gc/shared/weakProcessor.inline.hpp"
 #include "gc/shared/weakProcessorTimes.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
index 9a12e0ed1a1..9f58016a6f1 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
@@ -26,6 +26,7 @@
 
 #include "c1/c1_IR.hpp"
 #include "gc/shared/satbMarkQueue.hpp"
+#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 #include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
@@ -33,7 +34,6 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
 
 #ifdef ASSERT
 #define __ gen->lir(__FILE__, __LINE__)->
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index 8df4413cc2f..d71e84d33b0 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -25,15 +25,15 @@
 
 #include "classfile/javaClasses.hpp"
 #include "gc/shared/barrierSet.hpp"
+#include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
+#include "gc/shenandoah/c2/shenandoahSupport.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
-#include "gc/shenandoah/c2/shenandoahSupport.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "opto/arraycopynode.hpp"
 #include "opto/escape.hpp"
 #include "opto/graphKit.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 4652dbce0e3..56d88d44d27 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -25,8 +25,8 @@
 
 
 #include "classfile/javaClasses.hpp"
-#include "gc/shenandoah/c2/shenandoahSupport.hpp"
 #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
+#include "gc/shenandoah/c2/shenandoahSupport.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahForwarding.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 5280e9b2ac4..eb87a9dc4c1 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -26,9 +26,9 @@
 
 
 #include "gc/shared/gcCause.hpp"
+#include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
-#include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
index a47024f3a4b..68e540960c7 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
@@ -26,10 +26,10 @@
 #ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
 #define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
 
-#include "memory/allocation.hpp"
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
+#include "memory/allocation.hpp"
 #include "utilities/numberSeq.hpp"
 
 class ShenandoahAllocationRate : public CHeapObj<mtGC> {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
index 9d211314474..403405b984d 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
@@ -24,8 +24,8 @@
  */
 
 
-#include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
+#include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
index afc9abc496e..08fd4599346 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
@@ -26,13 +26,12 @@
 #include "gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
+#include "gc/shenandoah/shenandoahEvacInfo.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahEvacInfo.hpp"
 #include "gc/shenandoah/shenandoahTrace.hpp"
-
 #include "logging/log.hpp"
 
 ShenandoahGenerationalHeuristics::ShenandoahGenerationalHeuristics(ShenandoahGeneration* generation)
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
index 919f6c88afa..b8d85de0487 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
@@ -25,10 +25,9 @@
 
 #include "gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
+#include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
-
 #include "utilities/quickSort.hpp"
 
 ShenandoahGlobalHeuristics::ShenandoahGlobalHeuristics(ShenandoahGlobalGeneration* generation)
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
index 4c7ed07b2a0..b151a75e6e7 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
@@ -25,10 +25,10 @@
  */
 
 #include "gc/shared/gcCause.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
 #include "runtime/globals_extension.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
index 9f8c6225d23..ba09eeb8794 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
@@ -30,7 +30,6 @@
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-
 #include "utilities/quickSort.hpp"
 
 ShenandoahYoungHeuristics::ShenandoahYoungHeuristics(ShenandoahYoungGeneration* generation)
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.cpp
index 6c885834155..fa784d5bb90 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
 #include "gc/shenandoah/mode/shenandoahGenerationalMode.hpp"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
index 893321db1dc..296a1979b01 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
@@ -23,8 +23,8 @@
  */
 
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
 #include "gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp"
+#include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
 #include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 446e1914407..5d19a6a34e3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -24,8 +24,8 @@
  */
 
 #include "gc/shared/barrierSetNMethod.hpp"
-#include "gc/shenandoah/shenandoahBarrierSetClone.inline.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+#include "gc/shenandoah/shenandoahBarrierSetClone.inline.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetNMethod.hpp"
 #include "gc/shenandoah/shenandoahBarrierSetStackChunk.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index 20937b9d08e..b176446452a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -30,6 +30,7 @@
 
 #include "gc/shared/accessBarrierSupport.inline.hpp"
 #include "gc/shared/cardTable.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp"
@@ -40,7 +41,6 @@
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "memory/iterator.inline.hpp"
 #include "oops/oop.inline.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
index c08c9501201..725e4e6e3e9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
@@ -31,10 +31,10 @@
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp"
-#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahNMethod.inline.hpp"
 #include "gc/shenandoah/shenandoahMark.inline.hpp"
+#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
+#include "gc/shenandoah/shenandoahNMethod.inline.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
index 34db132ab83..d29c446f210 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
@@ -26,9 +26,9 @@
 #define SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
 
 #include "code/codeCache.hpp"
-#include "gc/shenandoah/shenandoahSharedVariables.hpp"
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
+#include "gc/shenandoah/shenandoahSharedVariables.hpp"
 #include "memory/allStatic.hpp"
 #include "memory/iterator.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 7b9aafad149..5b5fe2c1af6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -35,11 +35,10 @@
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
-#include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahMark.inline.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
+#include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
@@ -47,8 +46,9 @@
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
-#include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
+#include "gc/shenandoah/shenandoahWorkGroup.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "memory/allocation.hpp"
 #include "prims/jvmtiTagMap.hpp"
 #include "runtime/vmThread.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 4a0f43226d7..facba2236be 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -33,13 +33,13 @@
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahMark.inline.hpp"
+#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
-#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
+#include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "gc/shenandoah/shenandoahStringDedup.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/continuation.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 0b20b4ddf9f..6975bd9f350 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahConcurrentGC.hpp"
 #include "gc/shenandoah/shenandoahControlThread.hpp"
@@ -34,11 +36,9 @@
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 #include "gc/shenandoah/shenandoahPacer.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "logging/log.hpp"
-#include "memory/metaspaceUtils.hpp"
 #include "memory/metaspaceStats.hpp"
+#include "memory/metaspaceUtils.hpp"
 
 ShenandoahControlThread::ShenandoahControlThread() :
   ShenandoahController(),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
index be99ef1d865..9d95b5df7ed 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
@@ -25,10 +25,10 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
 
-#include "gc/shared/gcCause.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
-#include "gc/shenandoah/shenandoahGC.hpp"
+#include "gc/shared/gcCause.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"
+#include "gc/shenandoah/shenandoahGC.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
index c430981bfe6..52182b092c9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
@@ -24,9 +24,8 @@
  */
 
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"
-
-#include "shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
index 83cde94f509..d24f52cb3f1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
 
-#include "gc/shared/gcCause.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
+#include "gc/shared/gcCause.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 8cc4e2de8ea..7aaf7bd9f48 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -39,9 +39,9 @@
 #include "gc/shenandoah/shenandoahSTWMark.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
+#include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/events.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
index 3ddc8bf636e..d393c17f64a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
@@ -24,11 +24,11 @@
  */
 
 #include "gc/shenandoah/shenandoahAgeCensus.hpp"
-#include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahEvacTracker.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "runtime/threadSMR.inline.hpp"
 #include "runtime/thread.hpp"
+#include "runtime/threadSMR.inline.hpp"
 
 ShenandoahEvacuationStats::ShenandoahEvacuationStats()
   : _evacuations_completed(0), _bytes_completed(0),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index e87c771dec4..9787611d4fb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -31,9 +31,9 @@
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/orderAccess.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 80954af6d1a..902e6547afd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -26,8 +26,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
 
-#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
 
 // Each ShenandoahHeapRegion is associated with a ShenandoahFreeSetPartitionId.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 9436f09cbe0..f017b3de962 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -34,23 +34,22 @@
 #include "gc/shared/workerThread.hpp"
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
-#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahConcurrentGC.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
+#include "gc/shenandoah/shenandoahConcurrentGC.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahFullGC.hpp"
 #include "gc/shenandoah/shenandoahGenerationalFullGC.hpp"
 #include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
-#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
-#include "gc/shenandoah/shenandoahMark.inline.hpp"
-#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
+#include "gc/shenandoah/shenandoahMark.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahMetrics.hpp"
+#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
+#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
 #include "gc/shenandoah/shenandoahSTWMark.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGC.hpp
index f10d5eef969..f08bdce0a20 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGC.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHGC_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHGC_HPP
 
-#include "memory/allocation.hpp"
 #include "gc/shared/gcCause.hpp"
+#include "memory/allocation.hpp"
 
 /*
  * Base class of three Shenandoah GC modes
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index ad91119ddad..9a511de939c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -23,8 +23,9 @@
  *
  */
 
-#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSetPreselector.hpp"
+#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
@@ -37,8 +38,6 @@
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-
 #include "utilities/quickSort.hpp"
 
 template <bool PREPARE_FOR_CURRENT_CYCLE, bool FULL_GC = false>
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 31c86985c6f..242acbdea8c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -25,12 +25,12 @@
 #ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHGENERATION_HPP
 #define SHARE_VM_GC_SHENANDOAH_SHENANDOAHGENERATION_HPP
 
-#include "memory/allocation.hpp"
 #include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
 #include "gc/shenandoah/shenandoahAffiliation.hpp"
 #include "gc/shenandoah/shenandoahGenerationType.hpp"
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
+#include "memory/allocation.hpp"
 
 class ShenandoahCollectionSet;
 class ShenandoahHeap;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationSizer.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationSizer.cpp
index c6827878cd1..17f3d2f199f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationSizer.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationSizer.cpp
@@ -23,13 +23,13 @@
  *
  */
 
+#include "gc/shared/gc_globals.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationSizer.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shared/gc_globals.hpp"
 #include "logging/log.hpp"
 #include "runtime/globals_extension.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index 4d291ba50f7..2f2f13ca87b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -27,22 +27,22 @@
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahConcurrentGC.hpp"
-#include "gc/shenandoah/shenandoahGenerationalControlThread.hpp"
 #include "gc/shenandoah/shenandoahDegeneratedGC.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahFullGC.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
+#include "gc/shenandoah/shenandoahGenerationalControlThread.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
-#include "gc/shenandoah/shenandoahOldGC.hpp"
-#include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
+#include "gc/shenandoah/shenandoahOldGC.hpp"
+#include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahPacer.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "logging/log.hpp"
-#include "memory/metaspaceUtils.hpp"
 #include "memory/metaspaceStats.hpp"
+#include "memory/metaspaceUtils.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/events.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
index 6a845afa4fd..ba9ef5979a8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
@@ -31,8 +31,8 @@
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahPacer.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 
 class ShenandoahConcurrentEvacuator : public ObjectClosure {
 private:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
index 3387ed9d7a8..142c2d47989 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
@@ -25,14 +25,14 @@
 
 #include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalFullGC.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
-#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 
 #ifdef ASSERT
 void assert_regions_used_not_more_than_capacity(ShenandoahGeneration* generation) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index 09b985e3b8d..1f84feb20e8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -40,9 +40,9 @@
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahRegulatorThread.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
+#include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shenandoah/shenandoahUtils.hpp"
 #include "logging/log.hpp"
 #include "utilities/events.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
index 230fff16252..a16a71b8175 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "gc/shenandoah/shenandoahAgeCensus.hpp"
 #include "gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp"
+#include "gc/shenandoah/shenandoahAgeCensus.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
index d51a77fdf8f..5857170d4cc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.hpp
@@ -26,8 +26,8 @@
 #define SHARE_VM_GC_SHENANDOAH_SHENANDOAHGLOBALGENERATION_HPP
 
 #include "gc/shenandoah/shenandoahGeneration.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 
 // A "generation" that represents the whole heap.
 class ShenandoahGlobalGeneration : public ShenandoahGeneration {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 045f485090d..82c6cdb8971 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -27,7 +27,6 @@
 
 #include "cds/archiveHeapWriter.hpp"
 #include "classfile/systemDictionary.hpp"
-
 #include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/fullGCForwarding.hpp"
 #include "gc/shared/gcArguments.hpp"
@@ -37,24 +36,26 @@
 #include "gc/shared/memAllocator.hpp"
 #include "gc/shared/plab.hpp"
 #include "gc/shared/tlab_globals.hpp"
-
 #include "gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp"
 #include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahGenerationalMode.hpp"
+#include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
+#include "gc/shenandoah/mode/shenandoahSATBMode.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
+#include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahCodeRoots.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahConcurrentMark.hpp"
 #include "gc/shenandoah/shenandoahControlThread.hpp"
-#include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahInitLogger.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
@@ -73,18 +74,9 @@
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
-#include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
+#include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shenandoah/mode/shenandoahGenerationalMode.hpp"
-#include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
-#include "gc/shenandoah/mode/shenandoahSATBMode.hpp"
-
-#if INCLUDE_JFR
-#include "gc/shenandoah/shenandoahJfrSupport.hpp"
-#endif
-
-#include "memory/allocation.hpp"
 #include "memory/allocation.hpp"
 #include "memory/classLoaderMetaspace.hpp"
 #include "memory/memoryReserver.hpp"
@@ -103,9 +95,12 @@
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/vmThread.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "utilities/events.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
+#if INCLUDE_JFR
+#include "gc/shenandoah/shenandoahJfrSupport.hpp"
+#endif
 
 class ShenandoahPretouchHeapTask : public WorkerTask {
 private:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 46f8a134051..4f24b9e1abd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -27,19 +27,19 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
 
+#include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/markBitMap.hpp"
 #include "gc/shared/softRefPolicy.hpp"
-#include "gc/shared/collectedHeap.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"
-#include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahEvacOOMHandler.hpp"
 #include "gc/shenandoah/shenandoahEvacTracker.hpp"
-#include "gc/shenandoah/shenandoahGenerationType.hpp"
 #include "gc/shenandoah/shenandoahGenerationSizer.hpp"
+#include "gc/shenandoah/shenandoahGenerationType.hpp"
+#include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahMmuTracker.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
 #include "gc/shenandoah/shenandoahUnload.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index f4ef186743c..cf9d808f7ce 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -30,28 +30,28 @@
 #include "gc/shenandoah/shenandoahHeap.hpp"
 
 #include "classfile/javaClasses.inline.hpp"
-#include "gc/shared/markBitMap.inline.hpp"
-#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
+#include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
+#include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "gc/shared/tlab_globals.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahForwarding.inline.hpp"
-#include "gc/shenandoah/shenandoahWorkGroup.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
-#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
+#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
+#include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/prefetch.inline.hpp"
 #include "runtime/objectMonitor.inline.hpp"
+#include "runtime/prefetch.inline.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index a25e2dfd88f..d00a99ee728 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -29,14 +29,14 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahGeneration.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index 7f29a8628aa..0df482c1e2d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -27,8 +27,9 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
 
-#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
+
+#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahPacer.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
index 360c7d2d649..918e6bf1be6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
@@ -28,8 +28,8 @@
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
-#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionCounters.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
index c139980af41..508b40e49a8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
@@ -26,8 +26,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
 
-#include "memory/allocation.hpp"
 #include "logging/logFileStreamOutput.hpp"
+#include "memory/allocation.hpp"
 
 /**
  * This provides the following in JVMStat:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
index 46d54c70fe1..368738fe5ea 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.cpp
@@ -23,9 +23,9 @@
  *
  */
 
-#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#include "gc/shenandoah/shenandoahHeapRegionSet.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
index d933fda60b1..f81bf77d26e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
@@ -25,10 +25,10 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
 
-#include "memory/allocation.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
+#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ShenandoahHeapRegionSet;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahInitLogger.cpp b/src/hotspot/share/gc/shenandoah/shenandoahInitLogger.cpp
index b4ea327965b..b5e5e6fd698 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahInitLogger.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahInitLogger.cpp
@@ -24,11 +24,11 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahInitLogger.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "logging/log.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
index 47a144a638f..fcfe0d1d5d6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
@@ -23,12 +23,11 @@
  */
 
 
-#include "runtime/os.hpp"
-
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/os.hpp"
 #include "runtime/os.inline.hpp"
 
 void ShenandoahLock::contended_lock(bool allow_block_for_safepoint) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
index ae8d52a3d0e..4aef14f2c9a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
@@ -29,9 +29,9 @@
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/taskTerminator.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationType.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
-#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.hpp"
 
 enum StringDedupMode {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
index 9986afc6f20..34e6af41b42 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.cpp
@@ -24,8 +24,8 @@
  *
  */
 
-#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
index 399db525cf9..0babeaffd3e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.cpp
@@ -27,7 +27,6 @@
 #include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
-
 #include "shenandoahGlobalGeneration.hpp"
 
 ShenandoahMarkingContext::ShenandoahMarkingContext(MemRegion heap_region, MemRegion bitmap_region, size_t num_regions) :
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
index d9bddd5fbb6..e3ba774283c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
@@ -28,6 +28,7 @@
 #define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
+
 #include "gc/shenandoah/shenandoahMarkBitMap.inline.hpp"
 #include "logging/log.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.cpp
index e9aa69b5555..ebfe5267160 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.cpp
@@ -25,8 +25,8 @@
  */
 
 #include "gc/shenandoah/shenandoahMemoryPool.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 
 ShenandoahMemoryPool::ShenandoahMemoryPool(ShenandoahHeap* heap,
                                            const char* name) :
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
index 32386e6aec0..edd4f875be4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
@@ -23,10 +23,10 @@
  *
  */
 
-#include "gc/shenandoah/shenandoahMetrics.hpp"
+#include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
-#include "gc/shenandoah/shenandoahFreeSet.hpp"
+#include "gc/shenandoah/shenandoahMetrics.hpp"
 
 ShenandoahMetricsSnapshot::ShenandoahMetricsSnapshot() {
   _heap = ShenandoahHeap::heap();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMmuTracker.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMmuTracker.cpp
index 663864b1294..5867478d734 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMmuTracker.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMmuTracker.cpp
@@ -24,8 +24,8 @@
  */
 
 #include "gc/shenandoah/shenandoahAsserts.hpp"
-#include "gc/shenandoah/shenandoahMmuTracker.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahMmuTracker.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
index 31265addda8..6b72cbdd62b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
@@ -25,9 +25,9 @@
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/generationCounters.hpp"
 #include "gc/shared/hSpaceCounters.hpp"
-#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionCounters.hpp"
+#include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 #include "memory/metaspaceCounters.hpp"
 #include "services/memoryService.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
index 7c28378bf24..1724fc2849f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
@@ -25,11 +25,11 @@
 #include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 #include "gc/shenandoah/shenandoahOldGC.hpp"
-#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "prims/jvmtiTagMap.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index b0c42c7b40f..35d963f1801 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -26,6 +26,7 @@
 #include "gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
+#include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
@@ -35,7 +36,6 @@
 #include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
index e16275b480a..62a25881b5a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
@@ -25,11 +25,11 @@
 
 
 #include "gc/shared/workerDataArray.inline.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
-#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/ostream.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index 9100ad2b220..0a456151318 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -26,9 +26,9 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
 
-#include "jfr/jfrEvents.hpp"
-#include "gc/shenandoah/shenandoahNumberSeq.hpp"
 #include "gc/shared/workerDataArray.hpp"
+#include "gc/shenandoah/shenandoahNumberSeq.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "memory/allocation.hpp"
 
 class ShenandoahCollectorPolicy;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
index 0e10e8c819f..2bbce179af8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
@@ -26,14 +26,14 @@
 
 #include "classfile/javaClasses.hpp"
 #include "gc/shared/workerThread.hpp"
-#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "runtime/atomic.hpp"
 #include "logging/log.hpp"
+#include "runtime/atomic.hpp"
 
 static ReferenceType reference_type(oop reference) {
   return InstanceKlass::cast(reference->klass())->reference_type();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
index b3b5109f6b3..8693046297d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
@@ -26,9 +26,9 @@
 #include "classfile/classLoaderData.hpp"
 #include "code/nmethod.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
-#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
+#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
 #include "gc/shenandoah/shenandoahStackWatermark.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
index f1544c1762e..fa3fa90b2f5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
@@ -29,11 +29,11 @@
 
 #include "classfile/classLoaderDataGraph.hpp"
 #include "gc/shared/oopStorageSetParState.inline.hpp"
+#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
index 4c7ae68fdbe..11ff92cd9cc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
@@ -28,16 +28,16 @@
 
 #include "classfile/classLoaderDataGraph.hpp"
 #include "code/codeCache.hpp"
+#include "gc/shared/oopStorage.inline.hpp"
+#include "gc/shared/oopStorageSet.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
-#include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahRootVerifier.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "gc/shenandoah/shenandoahStringDedup.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shared/oopStorage.inline.hpp"
-#include "gc/shared/oopStorageSet.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/threads.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
index 2984debd9f8..d2a5f71bca6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
@@ -26,8 +26,8 @@
 #include "gc/shenandoah/shenandoahBarrierSetClone.inline.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "utilities/copy.hpp"
 
 JRT_LEAF(void, ShenandoahRuntime::arraycopy_barrier_oop(oop* src, oop* dst, size_t length))
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
index b0fc55631e0..68bec5c2071 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.inline.hpp
@@ -26,18 +26,19 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSCANREMEMBEREDINLINE_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHSCANREMEMBEREDINLINE_HPP
 
-#include "memory/iterator.hpp"
-#include "oops/oop.hpp"
-#include "oops/objArrayOop.hpp"
+#include "gc/shenandoah/shenandoahScanRemembered.hpp"
+
 #include "gc/shared/collectorCounters.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahCardStats.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahScanRemembered.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "logging/log.hpp"
+#include "memory/iterator.hpp"
+#include "oops/objArrayOop.hpp"
+#include "oops/oop.hpp"
 
 // Process all objects starting within count clusters beginning with first_cluster and for which the start address is
 // less than end_of_range.  For any non-array object whose header lies on a dirty card, scan the entire object,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
index 55d21b06e4b..3a4cb8cf742 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp
@@ -25,10 +25,10 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHSIMPLEBITMAP_HPP
 
-#include <cstddef>
-
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 
+#include <cstddef>
+
 // TODO: Merge the enhanced capabilities of ShenandoahSimpleBitMap into src/hotspot/share/utilities/bitMap.hpp
 //       and deprecate ShenandoahSimpleBitMap.  The key enhanced capabilities to be integrated include:
 //
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp
index 042143254bc..1559dd81849 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.inline.hpp
@@ -25,9 +25,10 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_INLINE_HPP
 
+#include "gc/shenandoah/shenandoahStringDedup.hpp"
+
 #include "classfile/javaClasses.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahStringDedup.hpp"
 #include "oops/markWord.hpp"
 
 bool ShenandoahStringDedup::is_string_candidate(oop obj) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
index 10887ad8c19..342b599caf5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
@@ -26,8 +26,8 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
 
-#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
+#include "gc/shared/taskTerminator.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "nmt/memTag.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
index 933cc501562..c1cebdf1dde 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
@@ -26,16 +26,16 @@
 #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTHREADLOCALDATA_HPP
 #define SHARE_GC_SHENANDOAH_SHENANDOAHTHREADLOCALDATA_HPP
 
-#include "gc/shared/plab.hpp"
-#include "gc/shared/gcThreadLocalData.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcThreadLocalData.hpp"
+#include "gc/shared/plab.hpp"
+#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahCodeRoots.hpp"
-#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahEvacTracker.hpp"
+#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahSATBMarkQueueSet.hpp"
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "runtime/javaThread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/sizes.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
index 6bd50154b4f..83151313f75 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
@@ -29,11 +29,11 @@
 #include "code/codeBehaviours.hpp"
 #include "code/codeCache.hpp"
 #include "code/dependencyContext.hpp"
-#include "gc/shared/gcBehaviours.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
+#include "gc/shared/gcBehaviours.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
-#include "gc/shenandoah/shenandoahNMethod.inline.hpp"
 #include "gc/shenandoah/shenandoahLock.hpp"
+#include "gc/shenandoah/shenandoahNMethod.inline.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.hpp"
 #include "gc/shenandoah/shenandoahUnload.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
index ecca550d553..176baa133c8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include "jfr/jfrEvents.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcWhen.hpp"
@@ -36,6 +35,7 @@
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "utilities/debug.hpp"
 
 ShenandoahPhaseTimings::Phase ShenandoahTimingsTracker::_current_phase = ShenandoahPhaseTimings::_invalid_phase;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
index fd30279d318..8a508c4afd8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
@@ -37,8 +37,8 @@
 #include "jfr/jfrEvents.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/safepoint.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "services/memoryService.hpp"
 
 class GCTimer;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index 37951c311ed..cdf78485207 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -27,11 +27,11 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahForwarding.inline.hpp"
-#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
+#include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "gc/shenandoah/shenandoahRootProcessor.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.inline.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp
index d6c47339f28..f2431a5ad0a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.cpp
@@ -25,10 +25,9 @@
 
 
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahTaskqueue.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 #include "gc/shenandoah/shenandoahWorkGroup.hpp"
-#include "gc/shenandoah/shenandoahTaskqueue.hpp"
-
 #include "logging/log.hpp"
 #include "runtime/threads.hpp"
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
index 8663515d019..daf5d456af5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.cpp
@@ -22,13 +22,13 @@
  *
  */
 
+#include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
 #include "gc/shenandoah/shenandoahAgeCensus.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionClosures.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "gc/shenandoah/shenandoahYoungGeneration.hpp"
-#include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
 
 ShenandoahYoungGeneration::ShenandoahYoungGeneration(uint max_queues, size_t max_capacity, size_t soft_max_capacity) :
   ShenandoahGeneration(YOUNG, max_queues, max_capacity, soft_max_capacity),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
index 1237e28c06e..a8ebab507b6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahYoungGeneration.hpp
@@ -25,8 +25,8 @@
 #ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHYOUNGGENERATION_HPP
 #define SHARE_VM_GC_SHENANDOAH_SHENANDOAHYOUNGGENERATION_HPP
 
-#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 
 class ShenandoahYoungGeneration : public ShenandoahGeneration {
 private:
diff --git a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
index 851fa394722..a245f91fa71 100644
--- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
+++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
@@ -24,9 +24,9 @@
 #ifndef SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
 #define SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
 
-#include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
+#include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
 
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
index f3643c0a325..7bd24955910 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
@@ -21,12 +21,12 @@
  * questions.
  */
 
+#include "c1/c1_CodeStubs.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_LIR.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_LIRGenerator.hpp"
 #include "c1/c1_MacroAssembler.hpp"
-#include "c1/c1_CodeStubs.hpp"
 #include "gc/z/c1/zBarrierSetC1.hpp"
 #include "gc/z/zBarrierSet.hpp"
 #include "gc/z/zBarrierSetAssembler.hpp"
diff --git a/src/hotspot/share/gc/z/zHeapIterator.hpp b/src/hotspot/share/gc/z/zHeapIterator.hpp
index fb58e3abe5f..2b570e98f1c 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.hpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.hpp
@@ -25,8 +25,8 @@
 #define SHARE_GC_Z_ZHEAPITERATOR_HPP
 
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
+#include "gc/shared/taskTerminator.hpp"
 #include "gc/z/zGranuleMap.hpp"
 #include "gc/z/zLock.hpp"
 #include "gc/z/zRootsIterator.hpp"
diff --git a/src/hotspot/share/gc/z/zMarkContext.hpp b/src/hotspot/share/gc/z/zMarkContext.hpp
index 009252e524d..788e17cae8f 100644
--- a/src/hotspot/share/gc/z/zMarkContext.hpp
+++ b/src/hotspot/share/gc/z/zMarkContext.hpp
@@ -24,8 +24,8 @@
 #ifndef SHARE_GC_Z_ZMARKCONTEXT_HPP
 #define SHARE_GC_Z_ZMARKCONTEXT_HPP
 
-#include "gc/z/zMarkCache.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
+#include "gc/z/zMarkCache.hpp"
 #include "memory/allocation.hpp"
 
 class ZMarkStripe;
diff --git a/src/hotspot/share/gc/z/zMarkingSMR.hpp b/src/hotspot/share/gc/z/zMarkingSMR.hpp
index a6c5afe76c9..26670d95959 100644
--- a/src/hotspot/share/gc/z/zMarkingSMR.hpp
+++ b/src/hotspot/share/gc/z/zMarkingSMR.hpp
@@ -26,8 +26,8 @@
 
 #include "gc/z/zArray.hpp"
 #include "gc/z/zValue.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 class ZMarkStackListNode;
 
diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp
index 76e164308dd..1019bcfdd96 100644
--- a/src/hotspot/share/gc/z/zNMT.cpp
+++ b/src/hotspot/share/gc/z/zNMT.cpp
@@ -24,9 +24,9 @@
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNMT.hpp"
+#include "nmt/memoryFileTracker.hpp"
 #include "nmt/memTag.hpp"
 #include "nmt/memTracker.hpp"
-#include "nmt/memoryFileTracker.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 MemoryFileTracker::MemoryFile* ZNMT::_device = nullptr;
diff --git a/src/hotspot/share/gc/z/zNMT.hpp b/src/hotspot/share/gc/z/zNMT.hpp
index b5b1aa07870..5fea74ee8ae 100644
--- a/src/hotspot/share/gc/z/zNMT.hpp
+++ b/src/hotspot/share/gc/z/zNMT.hpp
@@ -27,8 +27,8 @@
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "memory/allStatic.hpp"
-#include "nmt/memTracker.hpp"
 #include "nmt/memoryFileTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ZNMT : public AllStatic {
diff --git a/src/hotspot/share/gc/z/zNMethod.cpp b/src/hotspot/share/gc/z/zNMethod.cpp
index 4ae440ea231..bf592c20fa2 100644
--- a/src/hotspot/share/gc/z/zNMethod.cpp
+++ b/src/hotspot/share/gc/z/zNMethod.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "code/codeCache.hpp"
-#include "code/relocInfo.hpp"
 #include "code/nmethod.hpp"
+#include "code/relocInfo.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
diff --git a/src/hotspot/share/gc/z/zNMethodTable.cpp b/src/hotspot/share/gc/z/zNMethodTable.cpp
index 0aec0d5a9c7..bbc8f56b654 100644
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#include "code/relocInfo.hpp"
 #include "code/nmethod.hpp"
+#include "code/relocInfo.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "gc/z/zHash.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index a4484ba1023..ddb0ca49278 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#include "gc/z/zThreadLocalData.hpp"
 #include "gc/z/zObjArrayAllocator.hpp"
+#include "gc/z/zThreadLocalData.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "oops/arrayKlass.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zRuntimeWorkers.cpp b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
index f19e5cd5469..c8c4cde9ba0 100644
--- a/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
+++ b/src/hotspot/share/gc/z/zRuntimeWorkers.cpp
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/gcLogPrecious.hpp"
 #include "gc/z/zRuntimeWorkers.hpp"
 #include "runtime/java.hpp"
 
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index 558ccdf105a..a6b2bd0930d 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -24,9 +24,9 @@
 #include "gc/shared/gc_globals.hpp"
 #include "gc/z/zAbort.inline.hpp"
 #include "gc/z/zCollectedHeap.hpp"
+#include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zDirector.hpp"
 #include "gc/z/zDriver.hpp"
-#include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGeneration.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNMethodTable.hpp"
diff --git a/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp b/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
index f0b3dfcb42c..0d9fccde87c 100644
--- a/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
+++ b/src/hotspot/share/gc/z/zUncoloredRoot.inline.hpp
@@ -27,9 +27,9 @@
 #include "gc/z/zUncoloredRoot.hpp"
 
 #include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zBarrier.hpp"
 #include "gc/z/zBarrier.inline.hpp"
 #include "gc/z/zHeap.inline.hpp"
-#include "gc/z/zBarrier.hpp"
 #include "oops/oop.hpp"
 
 template <typename ObjectFunctionT>
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index 117d27997ee..68290c2c009 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -32,8 +32,8 @@
 #include "gc/z/zResurrection.hpp"
 #include "gc/z/zRootsIterator.hpp"
 #include "gc/z/zStackWatermark.hpp"
-#include "gc/z/zStoreBarrierBuffer.inline.hpp"
 #include "gc/z/zStat.hpp"
+#include "gc/z/zStoreBarrierBuffer.inline.hpp"
 #include "gc/z/zVerify.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/z/zVirtualMemoryManager.inline.hpp b/src/hotspot/share/gc/z/zVirtualMemoryManager.inline.hpp
index 78f966d0f84..27159b4eff8 100644
--- a/src/hotspot/share/gc/z/zVirtualMemoryManager.inline.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemoryManager.inline.hpp
@@ -26,8 +26,8 @@
 
 #include "gc/z/zVirtualMemoryManager.hpp"
 
-#include "utilities/globalDefinitions.hpp"
 #include "gc/z/zRangeRegistry.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 
 inline bool ZVirtualMemoryManager::is_multi_partition_enabled() const {

From 82c249446f2bd6f3b0e612c5ef3e6bfcab388c3b Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 23 Apr 2025 10:40:45 +0000
Subject: [PATCH 074/901] 8354228: Parallel: Set correct minimum of
 InitialSurvivorRatio

Reviewed-by: tschatzl, gli
---
 .../share/gc/parallel/parallelArguments.cpp   | 23 ++++++++++---------
 src/hotspot/share/gc/shared/gc_globals.hpp    |  2 +-
 .../TestMinAndInitialSurvivorRatioFlags.java  |  2 --
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelArguments.cpp b/src/hotspot/share/gc/parallel/parallelArguments.cpp
index 6309f52c82e..2cddbafd871 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.cpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.cpp
@@ -66,6 +66,18 @@ void ParallelArguments::initialize() {
     }
   }
 
+  if (InitialSurvivorRatio < MinSurvivorRatio) {
+    if (FLAG_IS_CMDLINE(InitialSurvivorRatio)) {
+      if (FLAG_IS_CMDLINE(MinSurvivorRatio)) {
+        jio_fprintf(defaultStream::error_stream(),
+          "Inconsistent MinSurvivorRatio vs InitialSurvivorRatio: %d vs %d\n", MinSurvivorRatio, InitialSurvivorRatio);
+      }
+      FLAG_SET_DEFAULT(MinSurvivorRatio, InitialSurvivorRatio);
+    } else {
+      FLAG_SET_DEFAULT(InitialSurvivorRatio, MinSurvivorRatio);
+    }
+  }
+
   // If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the
   // SurvivorRatio has been set, reset their default values to SurvivorRatio +
   // 2.  By doing this we make SurvivorRatio also work for Parallel Scavenger.
@@ -101,17 +113,6 @@ void ParallelArguments::initialize_alignments() {
 void ParallelArguments::initialize_heap_flags_and_sizes_one_pass() {
   // Do basic sizing work
   GenArguments::initialize_heap_flags_and_sizes();
-
-  // The survivor ratio's are calculated "raw", unlike the
-  // default gc, which adds 2 to the ratio value. We need to
-  // make sure the values are valid before using them.
-  if (MinSurvivorRatio < 3) {
-    FLAG_SET_ERGO(MinSurvivorRatio, 3);
-  }
-
-  if (InitialSurvivorRatio < 3) {
-    FLAG_SET_ERGO(InitialSurvivorRatio, 3);
-  }
 }
 
 void ParallelArguments::initialize_heap_flags_and_sizes() {
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index ba29daf2fe1..56b8bc4e4ff 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -412,7 +412,7 @@
                                                                             \
   product(uintx, InitialSurvivorRatio, 8,                                   \
           "Initial ratio of young generation/survivor space size")          \
-          range(0, max_uintx)                                               \
+          range(3, max_uintx)                                               \
                                                                             \
   product(bool, UseGCOverheadLimit, true,                                   \
           "Use policy to limit of proportion of time spent in GC "          \
diff --git a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
index 0e91f7f20ab..5f585575e7a 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java
@@ -65,8 +65,6 @@ public static void main(String args[]) throws Exception {
         testSurvivorRatio(-1, 15, 3, options, true);
         testSurvivorRatio(-1, 15, 3, options, false);
         testSurvivorRatio(-1, 10, 10, options, true);
-        testSurvivorRatio(-1, 3, 15, options, true);
-        testSurvivorRatio(-1, 3, 15, options, false);
     }
 
     /**

From ef0cd1823d7d57e42e66255a0e80bfa495a7102d Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 23 Apr 2025 11:48:48 +0000
Subject: [PATCH 075/901] 8354949: JFR: Split up the EventInstrumentation class

Reviewed-by: mgronlun, liach
---
 .../jdk/jfr/internal/ClassInspector.java      | 361 +++++++++
 .../jfr/internal/EventInstrumentation.java    | 759 ++++++------------
 .../classes/jdk/jfr/internal/JVMUpcalls.java  |  16 +-
 .../jdk/jfr/internal/util/Bytecode.java       |   9 +-
 .../jdk/jfr/internal/util/ImplicitFields.java |   5 +-
 5 files changed, 621 insertions(+), 529 deletions(-)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
new file mode 100644
index 00000000000..e7e0eac54ff
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
@@ -0,0 +1,361 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 static jdk.jfr.internal.util.Bytecode.classDesc;
+
+import java.lang.classfile.Annotation;
+import java.lang.classfile.AnnotationElement;
+import java.lang.classfile.AnnotationValue;
+import java.lang.classfile.Attribute;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.FieldModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.constant.ConstantDescs;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import jdk.jfr.Enabled;
+import jdk.jfr.Name;
+import jdk.jfr.Registered;
+import jdk.jfr.SettingControl;
+import jdk.jfr.SettingDefinition;
+import jdk.jfr.internal.util.Bytecode;
+import jdk.jfr.internal.util.ImplicitFields;
+import jdk.jfr.internal.util.Bytecode.FieldDesc;
+import jdk.jfr.internal.util.Bytecode.MethodDesc;
+import jdk.jfr.internal.util.Bytecode.SettingDesc;
+import jdk.jfr.internal.util.Utils;
+
+final class ClassInspector {
+    private static final ClassDesc TYPE_SETTING_DEFINITION = Bytecode.classDesc(SettingDefinition.class);
+    private static final ClassDesc ANNOTATION_REGISTERED = classDesc(Registered.class);
+    private static final ClassDesc ANNOTATION_NAME = classDesc(Name.class);
+    private static final ClassDesc ANNOTATION_ENABLED = classDesc(Enabled.class);
+    private static final ClassDesc ANNOTATION_REMOVE_FIELDS = classDesc(RemoveFields.class);
+
+    private final ClassModel classModel;
+    private final Class<?> superClass;
+    private final boolean isJDK;
+    private final ImplicitFields implicitFields;
+    private final List<SettingDesc> settingsDescs = new ArrayList<>();
+    private final List<FieldDesc> fieldDescs = new ArrayList<>();
+    private final String className;
+
+    ClassInspector(Class<?> superClass, byte[] bytes, boolean isJDK) {
+        this.superClass = superClass;
+        this.classModel = ClassFile.of().parse(bytes);
+        this.isJDK = isJDK;
+        this.className = classModel.thisClass().asInternalName().replace("/", ".");
+        this.implicitFields = determineImplicitFields();
+    }
+
+    String getClassName() {
+        return className;
+    }
+
+    MethodDesc findStaticCommitMethod() {
+        if (!isJDK) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append("(");
+        for (FieldDesc field : fieldDescs) {
+            sb.append(field.type().descriptorString());
+        }
+        sb.append(")V");
+        MethodDesc m = MethodDesc.of("commit", sb.toString());
+        for (MethodModel method : classModel.methods()) {
+            if (m.matches(method)) {
+                return m;
+            }
+        }
+        return null;
+    }
+
+    String getEventName() {
+        String name = annotationValue(ANNOTATION_NAME, String.class);
+        return name == null ? getClassName() : name;
+    }
+
+    boolean isRegistered() {
+        Boolean result = annotationValue(ANNOTATION_REGISTERED, Boolean.class);
+        if (result != null) {
+            return result.booleanValue();
+        }
+        if (superClass != null) {
+            Registered r = superClass.getAnnotation(Registered.class);
+            if (r != null) {
+                return r.value();
+            }
+        }
+        return true;
+    }
+
+    boolean isEnabled() {
+        Boolean result = annotationValue(ANNOTATION_ENABLED, Boolean.class);
+        if (result != null) {
+            return result.booleanValue();
+        }
+        if (superClass != null) {
+            Enabled e = superClass.getAnnotation(Enabled.class);
+            if (e != null) {
+                return e.value();
+            }
+        }
+        return true;
+    }
+
+    boolean hasStaticMethod(MethodDesc method) {
+        for (MethodModel m : classModel.methods()) {
+            if (Modifier.isStatic(m.flags().flagsMask())) {
+                return method.matches(m);
+            }
+        }
+        return false;
+    }
+
+    static boolean isValidField(int access, ClassDesc classDesc) {
+        String className = classDesc.packageName();
+        if (!className.isEmpty()) {
+            className = className + ".";
+        }
+        className += classDesc.displayName();
+        return isValidField(access, className);
+    }
+
+    static boolean isValidField(int access, String className) {
+        if (Modifier.isTransient(access) || Modifier.isStatic(access)) {
+            return false;
+        }
+        return Type.isValidJavaFieldType(className);
+    }
+
+    List<SettingDesc> getSettings() {
+        return settingsDescs;
+    }
+
+    List<FieldDesc> getFields() {
+        return fieldDescs;
+    }
+
+    boolean hasDuration() {
+        return implicitFields.hasDuration();
+    }
+
+    boolean hasStackTrace() {
+        return implicitFields.hasStackTrace();
+    }
+
+    boolean hasEventThread() {
+        return implicitFields.hasEventThread();
+    }
+
+    ClassDesc getClassDesc() {
+        return classModel.thisClass().asSymbol();
+    }
+
+    ClassModel getClassModel() {
+        return classModel;
+    }
+
+    boolean isJDK() {
+        return isJDK;
+    }
+
+    private ImplicitFields determineImplicitFields() {
+        if (isJDK) {
+            Class<?> eventClass = MirrorEvents.find(isJDK, getClassName());
+            if (eventClass != null) {
+                return new ImplicitFields(eventClass);
+            }
+        }
+        ImplicitFields ifs = new ImplicitFields(superClass);
+        String[] value = annotationValue(ANNOTATION_REMOVE_FIELDS, String[].class);
+        if (value != null) {
+            ifs.removeFields(value);
+        }
+        return ifs;
+    }
+
+    private List<AnnotationValue> getAnnotationValues(ClassDesc classDesc) {
+        List<AnnotationValue> list = new ArrayList<>();
+        for (Attribute<?> attribute: classModel.attributes()) {
+            if (attribute instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
+                for (Annotation a : rvaa.annotations()) {
+                    if (a.classSymbol().equals(classDesc) && a.elements().size() == 1) {
+                        AnnotationElement ae = a.elements().getFirst();
+                        if (ae.name().equalsString("value")) {
+                            list.add(ae.value());
+                        }
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
+    @SuppressWarnings("unchecked")
+    // Only supports String, String[] and Boolean values
+    private <T> T annotationValue(ClassDesc classDesc, Class<T> type) {
+        for (AnnotationValue a : getAnnotationValues(classDesc)) {
+            if (a instanceof AnnotationValue.OfBoolean ofb && type.equals(Boolean.class)) {
+                Boolean b = ofb.booleanValue();
+                return (T) b;
+            }
+            if (a instanceof AnnotationValue.OfString ofs && type.equals(String.class)) {
+                String s = ofs.stringValue();
+                return (T) s;
+            }
+            if (a instanceof AnnotationValue.OfArray ofa && type.equals(String[].class)) {
+                List<AnnotationValue> list = ofa.values();
+                String[] array = new String[list.size()];
+                int index = 0;
+                for (AnnotationValue av : list) {
+                    var avs = (AnnotationValue.OfString) av;
+                    array[index++] = avs.stringValue();
+                }
+                return (T) array;
+            }
+        }
+        return null;
+    }
+
+    void buildSettings() {
+        Set<String> foundMethods = new HashSet<>();
+        buildClassSettings(foundMethods);
+        buildSuperClassSettings(foundMethods);
+    }
+
+    private void buildClassSettings(Set<String> foundMethods) {
+        for (MethodModel m : classModel.methods()) {
+            for (Attribute<?> attribute : m.attributes()) {
+                if (attribute instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
+                    for (Annotation a : rvaa.annotations()) {
+                        // We can't really validate the method at this
+                        // stage. We would need to check that the parameter
+                        // is an instance of SettingControl.
+                        if (a.classSymbol().equals(TYPE_SETTING_DEFINITION)) {
+                            String name = m.methodName().stringValue();
+                            // Use @Name if it exists
+                            for (Annotation nameCandidate : rvaa.annotations()) {
+                                if (nameCandidate.className().equalsString(ANNOTATION_NAME.descriptorString())) {
+                                    if (nameCandidate.elements().size() == 1) {
+                                        AnnotationElement ae = nameCandidate.elements().getFirst();
+                                        if (ae.name().equalsString("value")) {
+                                            if (ae.value() instanceof AnnotationValue.OfString s) {
+                                                name = Utils.validJavaIdentifier(s.stringValue(), name);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            // Add setting if method returns boolean and has one parameter
+                            MethodTypeDesc mtd = m.methodTypeSymbol();
+                            if (ConstantDescs.CD_boolean.equals(mtd.returnType())) {
+                                if (mtd.parameterList().size() == 1) {
+                                    ClassDesc type = mtd.parameterList().getFirst();
+                                    if (type.isClassOrInterface()) {
+                                        String methodName = m.methodName().stringValue();
+                                        foundMethods.add(methodName);
+                                        settingsDescs.add(new SettingDesc(type, methodName));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void buildSuperClassSettings(Set<String> foundMethods) {
+        for (Class<?> c = superClass; jdk.internal.event.Event.class != c; c = c.getSuperclass()) {
+            for (java.lang.reflect.Method method : c.getDeclaredMethods()) {
+                if (!foundMethods.contains(method.getName())) {
+                    buildSettingsMethod(foundMethods, method);
+                }
+            }
+        }
+    }
+
+    private void buildSettingsMethod(Set<String> foundMethods, java.lang.reflect.Method method) {
+        // Skip private methods in base classes
+        if (!Modifier.isPrivate(method.getModifiers())) {
+            if (method.getReturnType().equals(Boolean.TYPE)) {
+                if (method.getParameterCount() == 1) {
+                    Class<?> type = method.getParameters()[0].getType();
+                    if (SettingControl.class.isAssignableFrom(type)) {
+                        ClassDesc paramType = Bytecode.classDesc(type);
+                        foundMethods.add(method.getName());
+                        settingsDescs.add(new SettingDesc(paramType, method.getName()));
+                    }
+                }
+            }
+        }
+    }
+
+    void buildFields() {
+        Set<String> foundFields = new HashSet<>();
+        // These two fields are added by native as 'transient' so they will be
+        // ignored by the loop below.
+        // The benefit of adding them manually is that we can
+        // control in which order they occur and we can add @Name, @Description
+        // in Java, instead of in native. It also means code for adding implicit
+        // fields for native can be reused by Java.
+        fieldDescs.add(ImplicitFields.FIELD_START_TIME);
+        if (implicitFields.hasDuration()) {
+            fieldDescs.add(ImplicitFields.FIELD_DURATION);
+        }
+        for (FieldModel field : classModel.fields()) {
+            if (!foundFields.contains(field.fieldName().stringValue()) && isValidField(field.flags().flagsMask(), field.fieldTypeSymbol())) {
+                fieldDescs.add(FieldDesc.of(field.fieldTypeSymbol(), field.fieldName().stringValue()));
+                foundFields.add(field.fieldName().stringValue());
+            }
+        }
+        for (Class<?> c = superClass; jdk.internal.event.Event.class != c; c = c.getSuperclass()) {
+            for (Field field : c.getDeclaredFields()) {
+                // Skip private fields in base classes
+                if (!Modifier.isPrivate(field.getModifiers())) {
+                    if (isValidField(field.getModifiers(), field.getType().getName())) {
+                        String fieldName = field.getName();
+                        if (!foundFields.contains(fieldName)) {
+                            fieldDescs.add(FieldDesc.of(field.getType(), fieldName));
+                            foundFields.add(fieldName);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
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 7567aea664c..96e6f36e5c8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -25,71 +25,49 @@
 
 package jdk.jfr.internal;
 
-import java.lang.constant.ClassDesc;
-import java.lang.constant.MethodTypeDesc;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
+import static jdk.jfr.internal.util.Bytecode.classDesc;
+import static jdk.jfr.internal.util.Bytecode.getfield;
+import static jdk.jfr.internal.util.Bytecode.invokestatic;
+import static jdk.jfr.internal.util.Bytecode.invokevirtual;
+import static jdk.jfr.internal.util.Bytecode.putfield;
 
-import java.lang.classfile.Annotation;
-import java.lang.classfile.AnnotationElement;
-import java.lang.classfile.AnnotationValue;
+import java.lang.classfile.ClassBuilder;
 import java.lang.classfile.ClassElement;
-import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 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.MethodTransform;
 import java.lang.classfile.TypeKind;
-import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
-import jdk.jfr.internal.event.EventConfiguration;
-import jdk.jfr.internal.event.EventWriter;
-import jdk.jfr.Enabled;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.util.List;
+import java.util.function.Consumer;
+
 import jdk.jfr.Event;
-import jdk.jfr.Name;
-import jdk.jfr.Registered;
 import jdk.jfr.SettingControl;
-import jdk.jfr.SettingDefinition;
-import jdk.jfr.internal.util.Utils;
+import jdk.jfr.internal.event.EventConfiguration;
+import jdk.jfr.internal.event.EventWriter;
 import jdk.jfr.internal.util.Bytecode;
-import jdk.jfr.internal.util.ImplicitFields;
 import jdk.jfr.internal.util.Bytecode.FieldDesc;
 import jdk.jfr.internal.util.Bytecode.MethodDesc;
-import static jdk.jfr.internal.util.Bytecode.invokevirtual;
-import static jdk.jfr.internal.util.Bytecode.invokestatic;
-import static jdk.jfr.internal.util.Bytecode.getfield;
-import static jdk.jfr.internal.util.Bytecode.putfield;
-import static jdk.jfr.internal.util.Bytecode.classDesc;
+import jdk.jfr.internal.util.Bytecode.SettingDesc;
+import jdk.jfr.internal.util.ImplicitFields;
 
 /**
  * Class responsible for adding instrumentation to a subclass of {@link Event}.
  *
  */
 final class EventInstrumentation {
+    private static final FieldDesc FIELD_EVENT_CONFIGURATION = FieldDesc.of(Object.class, "eventConfiguration");
 
-    private record SettingDesc(ClassDesc paramType, String methodName) {
-    }
-
-    private static final FieldDesc FIELD_DURATION = FieldDesc.of(long.class, ImplicitFields.DURATION);
-    private static final FieldDesc FIELD_EVENT_CONFIGURATION = FieldDesc.of(Object.class, "eventConfiguration");;
-    private static final FieldDesc FIELD_START_TIME = FieldDesc.of(long.class, ImplicitFields.START_TIME);
-    private static final ClassDesc ANNOTATION_ENABLED = classDesc(Enabled.class);
-    private static final ClassDesc ANNOTATION_NAME = classDesc(Name.class);
-    private static final ClassDesc ANNOTATION_REGISTERED = classDesc(Registered.class);
-    private static final ClassDesc ANNOTATION_REMOVE_FIELDS = classDesc(RemoveFields.class);
     private static final ClassDesc TYPE_EVENT_CONFIGURATION = classDesc(EventConfiguration.class);
-    private static final ClassDesc TYPE_ISE = Bytecode.classDesc(IllegalStateException.class);
+    private static final ClassDesc TYPE_ISE = classDesc(IllegalStateException.class);
     private static final ClassDesc TYPE_EVENT_WRITER = classDesc(EventWriter.class);
-    private static final ClassDesc TYPE_OBJECT = Bytecode.classDesc(Object.class);
-    private static final ClassDesc TYPE_SETTING_DEFINITION = Bytecode.classDesc(SettingDefinition.class);
+    private static final ClassDesc TYPE_OBJECT = classDesc(Object.class);
+
     private static final MethodDesc METHOD_BEGIN = MethodDesc.of("begin", "()V");
     private static final MethodDesc METHOD_COMMIT = MethodDesc.of("commit", "()V");
     private static final MethodDesc METHOD_DURATION = MethodDesc.of("duration", "(J)J");
@@ -104,446 +82,242 @@ private record SettingDesc(ClassDesc paramType, String methodName) {
     private static final MethodDesc METHOD_SHOULD_COMMIT_LONG = MethodDesc.of("shouldCommit", "(J)Z");
     private static final MethodDesc METHOD_TIME_STAMP = MethodDesc.of("timestamp", "()J");
 
-    private final ClassModel classModel;
-    private final List<SettingDesc> settingDescs;
-    private final List<FieldDesc> fieldDescs;;
-    private final String eventName;
-    private final String className;
-    private final Class<?> superClass;
-    private final boolean untypedEventConfiguration;
-    private final MethodDesc staticCommitMethod;
+    private final ClassInspector inspector;
     private final long eventTypeId;
+    private final ClassDesc eventClassDesc;
+    private final MethodDesc staticCommitMethod;
+    private final boolean untypedEventConfiguration;
     private final boolean guardEventConfiguration;
-    private final boolean isJDK;
-    private final Map<MethodDesc, Consumer<CodeBuilder>> methodUpdates = new LinkedHashMap<>();
-    private final ImplicitFields implicitFields;
 
-    EventInstrumentation(Class<?> superClass, byte[] bytes, long id, boolean isJDK, boolean guardEventConfiguration) {
+    /**
+     * Creates an EventInstrumentation object.
+     *
+     * @param inspector               class inspector
+     * @param id                      the event type ID to use
+     * @param guardEventConfiguration guard against event configuration being null.
+     *                                Needed when instrumentation is added before
+     *                                registration (bytesForEagerInstrumentation)
+     */
+    EventInstrumentation(ClassInspector inspector, long id, boolean guardEventConfiguration) {
+        inspector.buildFields();
+        if (!inspector.isJDK()) {
+            // Only user-defined events have custom settings.
+            inspector.buildSettings();
+        }
+        this.inspector = inspector;
         this.eventTypeId = id;
-        this.superClass = superClass;
-        this.isJDK = isJDK;
-        this.classModel = createClassModel(bytes);
-        this.className = classModel.thisClass().asInternalName().replace("/", ".");
-        String name = annotationValue(classModel, ANNOTATION_NAME, String.class);
-        this.eventName = name == null ? className : name;
-        this.implicitFields = determineImplicitFields();
-        this.settingDescs = buildSettingDescs(superClass, classModel);
-        this.fieldDescs = buildFieldDescs(superClass, classModel);
-        this.staticCommitMethod = isJDK ? findStaticCommitMethod(classModel, fieldDescs) : null;
-        this.untypedEventConfiguration = hasUntypedConfiguration();
-        // Corner case when we are forced to generate bytecode
-        // (bytesForEagerInstrumentation)
-        // We can't reference EventConfiguration::isEnabled() before event class has
-        // been registered,
-        // so we add a guard against a null reference.
         this.guardEventConfiguration = guardEventConfiguration;
+        this.eventClassDesc = inspector.getClassDesc();
+        this.staticCommitMethod = inspector.findStaticCommitMethod();
+        this.untypedEventConfiguration = hasUntypedConfiguration();
     }
 
-    private ImplicitFields determineImplicitFields() {
-        if (isJDK) {
-            Class<?> eventClass = MirrorEvents.find(isJDK, className);
-            if (eventClass != null) {
-                return new ImplicitFields(eventClass);
-            }
-        }
-        ImplicitFields ifs = new ImplicitFields(superClass);
-        String[] value = annotationValue(classModel, ANNOTATION_REMOVE_FIELDS, String[].class);
-        if (value != null) {
-            ifs.removeFields(value);
-        }
-        return ifs;
+    byte[] buildInstrumented() {
+        return ClassFile.of().transformClass(inspector.getClassModel(), this::transform);
     }
 
-    static MethodDesc findStaticCommitMethod(ClassModel classModel, List<FieldDesc> fields) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("(");
-        for (FieldDesc field : fields) {
-            sb.append(field.type().descriptorString());
-        }
-        sb.append(")V");
-        MethodDesc m = MethodDesc.of("commit", sb.toString());
-        for (MethodModel method : classModel.methods()) {
-            String d = method.methodTypeSymbol().descriptorString();
-            if (method.methodName().equalsString("commit") && m.descriptor().descriptorString().equals(d)) {
-                return m;
-            }
+    private void transform(ClassBuilder clb, ClassElement cle) {
+        if (cle instanceof MethodModel method && instrumentable(method) instanceof Consumer<CodeBuilder> modification) {
+            clb.transformMethod(method, MethodTransform.transformingCode((codeBuilder, _) -> modification.accept(codeBuilder)));
+        } else {
+            clb.with(cle);
         }
-        return null;
     }
 
-    private boolean hasUntypedConfiguration() {
-        for (FieldModel f : classModel.fields()) {
-            if (f.fieldName().equalsString(FIELD_EVENT_CONFIGURATION.name())) {
-                return f.fieldType().equalsString(TYPE_OBJECT.descriptorString());
-            }
+    private Consumer<CodeBuilder> instrumentable(MethodModel method) {
+        if (isMethod(method, METHOD_IS_ENABLED)) {
+            return this::methodIsEnabled;
         }
-        throw new InternalError("Class missing configuration field");
-    }
-
-    public String getClassName() {
-        return classModel.thisClass().asInternalName().replace("/", ".");
-    }
-
-    private ClassModel createClassModel(byte[] bytes) {
-        return ClassFile.of().parse(bytes);
-    }
-
-    boolean isRegistered() {
-        Boolean result = annotationValue(classModel, ANNOTATION_REGISTERED, Boolean.class);
-        if (result != null) {
-            return result.booleanValue();
+        if (isMethod(method, METHOD_BEGIN)) {
+            return this::methodBegin;
         }
-        if (superClass != null) {
-            Registered r = superClass.getAnnotation(Registered.class);
-            if (r != null) {
-                return r.value();
-            }
+        if (isMethod(method, METHOD_END)) {
+            return this::methodEnd;
         }
-        return true;
-    }
-
-    boolean isEnabled() {
-        Boolean result = annotationValue(classModel, ANNOTATION_ENABLED, Boolean.class);
-        if (result != null) {
-            return result.booleanValue();
+        if (isMethod(method, METHOD_EVENT_SHOULD_COMMIT)) {
+            return this::methodShouldCommit;
         }
-        if (superClass != null) {
-            Enabled e = superClass.getAnnotation(Enabled.class);
-            if (e != null) {
-                return e.value();
-            }
+        if (staticCommitMethod == null && isMethod(method, METHOD_COMMIT)) {
+            return this::methodCommit;
         }
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    // Only supports String, String[] and Boolean values
-    private static <T> T annotationValue(ClassModel classModel, ClassDesc classDesc, Class<T> type) {
-        String typeDescriptor = classDesc.descriptorString();
-        for (ClassElement ce : classModel) {
-            if (ce instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
-                for (Annotation a : rvaa.annotations()) {
-                    if (a.className().equalsString(typeDescriptor)) {
-                        if (a.elements().size() == 1) {
-                            AnnotationElement ae = a.elements().getFirst();
-                            if (ae.name().equalsString("value")) {
-                                if (ae.value() instanceof AnnotationValue.OfBoolean ofb && type.equals(Boolean.class)) {
-                                    Boolean b = ofb.booleanValue();
-                                    return (T)b;
-                                }
-                                if (ae.value() instanceof AnnotationValue.OfString ofs && type.equals(String.class)) {
-                                    String s = ofs.stringValue();
-                                    return (T)s;
-                                }
-                                if (ae.value() instanceof AnnotationValue.OfArray ofa && type.equals(String[].class)) {
-                                    List<AnnotationValue> list = ofa.values();
-                                    String[] array = new String[list.size()];
-                                    int index = 0;
-                                    for (AnnotationValue av : list) {
-                                        var avs = (AnnotationValue.OfString)av;
-                                        array[index++] = avs.stringValue();
-                                    }
-                                    return (T)array;
-                                }
-                            }
-                        }
-                    }
-                }
+        if (inspector.isJDK() && isStatic(method)) {
+            if (isMethod(method, METHOD_ENABLED)) {
+                return this::methodEnabledStatic;
             }
-        }
-        return null;
-    }
-
-    private static List<SettingDesc> buildSettingDescs(Class<?> superClass, ClassModel classModel) {
-        Set<String> methodSet = new HashSet<>();
-        List<SettingDesc> settingDescs = new ArrayList<>();
-        for (MethodModel m : classModel.methods()) {
-            for (var me : m) {
-                if (me instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
-                    for (Annotation a : rvaa.annotations()) {
-                        // We can't really validate the method at this
-                        // stage. We would need to check that the parameter
-                        // is an instance of SettingControl.
-                        if (a.className().equalsString(TYPE_SETTING_DEFINITION.descriptorString())) {
-                            String name = m.methodName().stringValue();
-                            // Use @Name if it exists
-                            for (Annotation nameCandidate : rvaa.annotations()) {
-                                if (nameCandidate.className().equalsString(ANNOTATION_NAME.descriptorString())) {
-                                    if (nameCandidate.elements().size() == 1) {
-                                        AnnotationElement ae = nameCandidate.elements().getFirst();
-                                        if (ae.name().equalsString("value")) {
-                                            if (ae.value() instanceof AnnotationValue.OfString s) {
-                                                name = Utils.validJavaIdentifier(s.stringValue(), name);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            // Add setting if method returns boolean and has one parameter
-                            MethodTypeDesc mtd = m.methodTypeSymbol();
-                            if ("Z".equals(mtd.returnType().descriptorString())) {
-                                if (mtd.parameterList().size() == 1) {
-                                    ClassDesc type = mtd.parameterList().getFirst();
-                                    if (type.isClassOrInterface()) {
-                                        String methodName = m.methodName().stringValue();
-                                        methodSet.add(methodName);
-                                        settingDescs.add(new SettingDesc(type, methodName));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+            if (isMethod(method, METHOD_SHOULD_COMMIT_LONG)) {
+                return this::methodShouldCommitStatic;
             }
-        }
-        for (Class<?> c = superClass; jdk.internal.event.Event.class != c; c = c.getSuperclass()) {
-            for (java.lang.reflect.Method method : c.getDeclaredMethods()) {
-                if (!methodSet.contains(method.getName())) {
-                    // skip private method in base classes
-                    if (!Modifier.isPrivate(method.getModifiers())) {
-                        if (method.getReturnType().equals(Boolean.TYPE)) {
-                            if (method.getParameterCount() == 1) {
-                                Class<?> type = method.getParameters()[0].getType();
-                                if (SettingControl.class.isAssignableFrom(type)) {
-                                    ClassDesc paramType = Bytecode.classDesc(type);
-                                    methodSet.add(method.getName());
-                                    settingDescs.add(new SettingDesc(paramType, method.getName()));
-                                }
-                            }
-                        }
-                    }
-                }
+            if (isMethod(method, METHOD_TIME_STAMP)) {
+                return this::methodTimestamp;
+            }
+            if (staticCommitMethod != null && isMethod(method, staticCommitMethod)) {
+                return this::methodCommit;
             }
         }
-        return settingDescs;
+        return null;
     }
 
-    private List<FieldDesc> buildFieldDescs(Class<?> superClass, ClassModel classModel) {
-        Set<String> fieldSet = new HashSet<>();
-        List<FieldDesc> fieldDescs = new ArrayList<>(classModel.fields().size());
-        // These two fields are added by native as 'transient' so they will be
-        // ignored by the loop below.
-        // The benefit of adding them manually is that we can
-        // control in which order they occur and we can add @Name, @Description
-        // in Java, instead of in native. It also means code for adding implicit
-        // fields for native can be reused by Java.
-        fieldDescs.add(FIELD_START_TIME);
-        if (implicitFields.hasDuration()) {
-            fieldDescs.add(FIELD_DURATION);
-        }
-        for (FieldModel field : classModel.fields()) {
-            if (!fieldSet.contains(field.fieldName().stringValue()) && isValidField(field.flags().flagsMask(), field.fieldTypeSymbol())) {
-                FieldDesc fi = FieldDesc.of(field.fieldTypeSymbol(), field.fieldName().stringValue());
-                fieldDescs.add(fi);
-                fieldSet.add(field.fieldName().stringValue());
-            }
+    private void methodIsEnabled(CodeBuilder codeBuilder) {
+        Label nullLabel = codeBuilder.newLabel();
+        if (guardEventConfiguration) {
+            getEventConfiguration(codeBuilder);
+            codeBuilder.ifnull(nullLabel);
         }
-        for (Class<?> c = superClass; jdk.internal.event.Event.class != c; c = c.getSuperclass()) {
-            for (Field field : c.getDeclaredFields()) {
-                // skip private field in base classes
-                if (!Modifier.isPrivate(field.getModifiers())) {
-                    if (isValidField(field.getModifiers(), field.getType().getName())) {
-                        String fieldName = field.getName();
-                        if (!fieldSet.contains(fieldName)) {
-                            fieldDescs.add(FieldDesc.of(field.getType(), fieldName));
-                            fieldSet.add(fieldName);
-                        }
-                    }
-                }
-            }
+        getEventConfiguration(codeBuilder);
+        invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_IS_ENABLED);
+        codeBuilder.ireturn();
+        if (guardEventConfiguration) {
+            codeBuilder.labelBinding(nullLabel);
+            codeBuilder.iconst_0();
+            codeBuilder.ireturn();
         }
-        return fieldDescs;
     }
 
-    public static boolean isValidField(int access, ClassDesc classDesc) {
-        String className = classDesc.packageName();
-        if (!className.isEmpty()) {
-            className = className + ".";
+    private void methodBegin(CodeBuilder codeBuilder) {
+        if (!inspector.hasDuration()) {
+            throwMissingDuration(codeBuilder, "begin");
+        } else {
+            codeBuilder.aload(0);
+            invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_TIME_STAMP);
+            putfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
+            codeBuilder.return_();
         }
-        className += classDesc.displayName();
-        return isValidField(access, className);
     }
 
-    public static boolean isValidField(int access, String className) {
-        if (Modifier.isTransient(access) || Modifier.isStatic(access)) {
-            return false;
+    private void methodEnd(CodeBuilder codeBuilder) {
+        if (!inspector.hasDuration()) {
+            throwMissingDuration(codeBuilder, "end");
+        } else {
+            codeBuilder.aload(0);
+            codeBuilder.aload(0);
+            getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
+            invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_DURATION);
+            putfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+            codeBuilder.return_();
         }
-        return Type.isValidJavaFieldType(className);
-    }
-
-    public byte[] buildInstrumented() {
-        makeInstrumented();
-        return toByteArray();
     }
 
-    byte[] toByteArray() {
-        return ClassFile.of().build(classModel.thisClass().asSymbol(), classBuilder -> {
-            for (ClassElement ce : classModel) {
-                boolean updated = false;
-                if (ce instanceof MethodModel method) {
-                    Consumer<CodeBuilder> methodUpdate = findMethodUpdate(method);
-                    if (methodUpdate != null) {
-                        classBuilder.withMethod(method.methodName().stringValue(), method.methodTypeSymbol(), method.flags().flagsMask(), methodBuilder -> {
-                            methodBuilder.withCode(methodUpdate);
-                        });
-                        updated = true;
-                    }
-                }
-                if (!updated) {
-                    classBuilder.with(ce);
-                }
-            }
-        });
-    }
-
-    public byte[] buildUninstrumented() {
-        makeUninstrumented();
-        return toByteArray();
-    }
-
-    private void throwMissingDuration(CodeBuilder codeBuilder, String method) {
-        String message = "Cannot use method " + method + " when event lacks duration field";
-        Bytecode.throwException(codeBuilder, TYPE_ISE, message);
-    }
-
-    private void makeInstrumented() {
-        // MyEvent#isEnabled()
-        updateEnabledMethod(METHOD_IS_ENABLED);
-
-        // MyEvent#begin()
-        updateMethod(METHOD_BEGIN, codeBuilder -> {
-            if (!implicitFields.hasDuration()) {
-                throwMissingDuration(codeBuilder, "begin");
-            } else {
-                codeBuilder.aload(0);
-                invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_TIME_STAMP);
-                putfield(codeBuilder, getEventClassDesc(), FIELD_START_TIME);
-                codeBuilder.return_();
-            }
-        });
-
-        // MyEvent#end()
-        updateMethod(METHOD_END, codeBuilder -> {
-            if (!implicitFields.hasDuration()) {
-                throwMissingDuration(codeBuilder, "end");
+    private void methodShouldCommit(CodeBuilder codeBuilder) {
+        Label fail = codeBuilder.newLabel();
+        if (guardEventConfiguration) {
+            getEventConfiguration(codeBuilder);
+            codeBuilder.ifnull(fail);
+        }
+        // if (!eventConfiguration.shouldCommit(duration) goto fail;
+        getEventConfiguration(codeBuilder);
+        codeBuilder.aload(0);
+        getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+        invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT);
+        codeBuilder.ifeq(fail);
+        List<SettingDesc> settingDescs = inspector.getSettings();
+        for (int index = 0; index < settingDescs.size(); index++) {
+            SettingDesc sd = settingDescs.get(index);
+            // if (!settingsMethod(eventConfiguration.settingX)) goto fail;
+            codeBuilder.aload(0);
+            getEventConfiguration(codeBuilder);
+            codeBuilder.loadConstant(index);
+            invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_GET_SETTING);
+            MethodTypeDesc mdesc = MethodTypeDesc.ofDescriptor("(" + sd.paramType().descriptorString() + ")Z");
+            codeBuilder.checkcast(sd.paramType());
+            codeBuilder.invokevirtual(eventClassDesc, sd.methodName(), mdesc);
+            codeBuilder.ifeq(fail);
+        }
+        // return true
+        codeBuilder.iconst_1();
+        codeBuilder.ireturn();
+        // return false
+        codeBuilder.labelBinding(fail);
+        codeBuilder.iconst_0();
+        codeBuilder.ireturn();
+    }
+
+    private void methodCommit(CodeBuilder codeBuilder) {
+        Label excluded = codeBuilder.newLabel();
+        Label end = codeBuilder.newLabel();
+        codeBuilder.trying(blockCodeBuilder -> {
+            if (staticCommitMethod != null) {
+                updateStaticCommit(blockCodeBuilder, excluded);
             } else {
-                codeBuilder.aload(0);
-                codeBuilder.aload(0);
-                getfield(codeBuilder, getEventClassDesc(), FIELD_START_TIME);
-                invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_DURATION);
-                putfield(codeBuilder, getEventClassDesc(), FIELD_DURATION);
-                codeBuilder.return_();
+                updateInstanceCommit(blockCodeBuilder, end, excluded);
             }
-        });
-
-        // MyEvent#commit() or static MyEvent#commit(...)
-        MethodDesc m = staticCommitMethod == null ? METHOD_COMMIT : staticCommitMethod;
-        updateMethod(m, codeBuilder -> {
-            Label excluded = codeBuilder.newLabel();
-            Label end = codeBuilder.newLabel();
-            codeBuilder.trying(blockCodeBuilder -> {
-                if (staticCommitMethod != null) {
-                    updateStaticCommit(blockCodeBuilder, excluded);
-                } else {
-                    updateInstanceCommit(blockCodeBuilder, end, excluded);
-                }
-                // stack: [integer]
-                // notified -> restart event write attempt
-                blockCodeBuilder.ifeq(blockCodeBuilder.startLabel());
-                // stack: []
-                blockCodeBuilder.goto_(end);
-            }, catchBuilder -> {
-                catchBuilder.catchingAll(catchAllHandler -> {
-                    getEventWriter(catchAllHandler);
-                    // stack: [ex] [EW]
-                    catchAllHandler.dup();
-                    // stack: [ex] [EW] [EW]
-                    Label rethrow = catchAllHandler.newLabel();
-                    catchAllHandler.ifnull(rethrow);
-                    // stack: [ex] [EW]
-                    catchAllHandler.dup();
-                    // stack: [ex] [EW] [EW]
-                    invokevirtual(catchAllHandler, TYPE_EVENT_WRITER, METHOD_RESET);
-                    catchAllHandler.labelBinding(rethrow);
-                    // stack:[ex] [EW]
-                    catchAllHandler.pop();
-                    // stack:[ex]
-                    catchAllHandler.athrow();
-                });
-            });
-            codeBuilder.labelBinding(excluded);
-            // stack: [EW]
-            codeBuilder.pop();
-            codeBuilder.labelBinding(end);
+            // stack: [integer]
+            // notified -> restart event write attempt
+            blockCodeBuilder.ifeq(blockCodeBuilder.startLabel());
             // stack: []
-            codeBuilder.return_();
+            blockCodeBuilder.goto_(end);
+        }, catchBuilder -> {
+            catchBuilder.catchingAll(catchAllHandler -> {
+                getEventWriter(catchAllHandler);
+                // stack: [ex] [EW]
+                catchAllHandler.dup();
+                // stack: [ex] [EW] [EW]
+                Label rethrow = catchAllHandler.newLabel();
+                catchAllHandler.ifnull(rethrow);
+                // stack: [ex] [EW]
+                catchAllHandler.dup();
+                // stack: [ex] [EW] [EW]
+                invokevirtual(catchAllHandler, TYPE_EVENT_WRITER, METHOD_RESET);
+                catchAllHandler.labelBinding(rethrow);
+                // stack:[ex] [EW]
+                catchAllHandler.pop();
+                // stack:[ex]
+                catchAllHandler.athrow();
+            });
         });
+        codeBuilder.labelBinding(excluded);
+        // stack: [EW]
+        codeBuilder.pop();
+        codeBuilder.labelBinding(end);
+        // stack: []
+        codeBuilder.return_();
+    }
 
-        // MyEvent#shouldCommit()
-        updateMethod(METHOD_EVENT_SHOULD_COMMIT, codeBuilder -> {
-            Label fail = codeBuilder.newLabel();
-            if (guardEventConfiguration) {
-                getEventConfiguration(codeBuilder);
-                codeBuilder.ifnull(fail);
-            }
-            // if (!eventConfiguration.shouldCommit(duration) goto fail;
+    private void methodEnabledStatic(CodeBuilder codeBuilder) {
+        Label nullLabel = codeBuilder.newLabel();
+        if (guardEventConfiguration) {
             getEventConfiguration(codeBuilder);
-            codeBuilder.aload(0);
-            getfield(codeBuilder, getEventClassDesc(), FIELD_DURATION);
-            invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT);
-            codeBuilder.ifeq(fail);
-            for (int index = 0; index < settingDescs.size(); index++) {
-                SettingDesc sd = settingDescs.get(index);
-                // if (!settingsMethod(eventConfiguration.settingX)) goto fail;
-                codeBuilder.aload(0);
-                getEventConfiguration(codeBuilder);
-                codeBuilder.loadConstant(index);
-                invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_GET_SETTING);
-                MethodTypeDesc mdesc = MethodTypeDesc.ofDescriptor("(" + sd.paramType().descriptorString() + ")Z");
-                codeBuilder.checkcast(sd.paramType());
-                codeBuilder.invokevirtual(getEventClassDesc(), sd.methodName(), mdesc);
-                codeBuilder.ifeq(fail);
-            }
-            // return true
-            codeBuilder.iconst_1();
-            codeBuilder.ireturn();
-            // return false
-            codeBuilder.labelBinding(fail);
+            codeBuilder.ifnull(nullLabel);
+        }
+        getEventConfiguration(codeBuilder);
+        invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_IS_ENABLED);
+        codeBuilder.ireturn();
+        if (guardEventConfiguration) {
+            codeBuilder.labelBinding(nullLabel);
             codeBuilder.iconst_0();
             codeBuilder.ireturn();
-        });
+        }
+    }
 
-        if (isJDK) {
-            if (hasStaticMethod(METHOD_ENABLED)) {
-                updateEnabledMethod(METHOD_ENABLED);
-            }
+    private void methodTimestamp(CodeBuilder codeBuilder) {
+        invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_TIME_STAMP);
+        codeBuilder.lreturn();
+    }
 
-            updateIfStaticMethodExists(METHOD_SHOULD_COMMIT_LONG, codeBuilder -> {
-                Label fail = codeBuilder.newLabel();
-                if (guardEventConfiguration) {
-                    // if (eventConfiguration == null) goto fail;
-                    getEventConfiguration(codeBuilder);
-                    codeBuilder.ifnull(fail);
-                }
-                // return eventConfiguration.shouldCommit(duration);
-                getEventConfiguration(codeBuilder);
-                codeBuilder.lload(0);
-                codeBuilder.invokevirtual(TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.name(), METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.descriptor());
-                codeBuilder.ireturn();
-                // fail:
-                codeBuilder.labelBinding(fail);
-                // return false
-                codeBuilder.iconst_0();
-                codeBuilder.ireturn();
-            });
-            updateIfStaticMethodExists(METHOD_TIME_STAMP, codeBuilder -> {
-                invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_TIME_STAMP);
-                codeBuilder.lreturn();
-            });
+    private void methodShouldCommitStatic(CodeBuilder codeBuilder) {
+        Label fail = codeBuilder.newLabel();
+        if (guardEventConfiguration) {
+            // if (eventConfiguration == null) goto fail;
+            getEventConfiguration(codeBuilder);
+            codeBuilder.ifnull(fail);
         }
+        // return eventConfiguration.shouldCommit(duration);
+        getEventConfiguration(codeBuilder);
+        codeBuilder.lload(0);
+        codeBuilder.invokevirtual(TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.name(), METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.descriptor());
+        codeBuilder.ireturn();
+        // fail:
+        codeBuilder.labelBinding(fail);
+        // return false
+        codeBuilder.iconst_0();
+        codeBuilder.ireturn();
+    }
+
+    private void throwMissingDuration(CodeBuilder codeBuilder, String method) {
+        String message = "Cannot use method " + method + " when event lacks duration field";
+        Bytecode.throwException(codeBuilder, TYPE_ISE, message);
     }
 
-    void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
+    private void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
         // indexes the argument type array, the argument type array does not include
         // 'this'
         int argIndex = 0;
@@ -576,7 +350,7 @@ void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
         invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_LONG.method());
         fieldIndex++;
         // stack: [EW]
-        if (implicitFields.hasDuration()) {
+        if (inspector.hasDuration()) {
             // write duration
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
@@ -588,14 +362,14 @@ void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
             fieldIndex++;
         }
         // stack: [EW]
-        if (implicitFields.hasEventThread()) {
+        if (inspector.hasEventThread()) {
             // write eventThread
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_EVENT_THREAD.method());
         }
         // stack: [EW]
-        if (implicitFields.hasStackTrace()) {
+        if (inspector.hasStackTrace()) {
             // write stackTrace
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
@@ -603,6 +377,7 @@ void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
         }
         // stack: [EW]
         // write custom fields
+        List<FieldDesc> fieldDescs = inspector.getFields();
         while (fieldIndex < fieldDescs.size()) {
             blockCodeBuilder.dup();
             // stack: [EW], [EW]
@@ -622,19 +397,19 @@ void updateStaticCommit(BlockCodeBuilder blockCodeBuilder, Label excluded) {
         // stack: [int]
     }
 
-    void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label excluded) {
+    private void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label excluded) {
         // if (!isEnable()) {
         // return;
         // }
         blockCodeBuilder.aload(0);
-        invokevirtual(blockCodeBuilder, getEventClassDesc(), METHOD_IS_ENABLED);
+        invokevirtual(blockCodeBuilder, eventClassDesc, METHOD_IS_ENABLED);
         Label l0 = blockCodeBuilder.newLabel();
         blockCodeBuilder.ifne(l0);
         blockCodeBuilder.return_();
         blockCodeBuilder.labelBinding(l0);
         // long startTime = this.startTime
         blockCodeBuilder.aload(0);
-        getfield(blockCodeBuilder, getEventClassDesc(), FIELD_START_TIME);
+        getfield(blockCodeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
         blockCodeBuilder.lstore(1);
         // if (startTime == 0) {
         //   startTime = EventWriter.timestamp();
@@ -654,7 +429,7 @@ void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label ex
         // }
         blockCodeBuilder.labelBinding(durationEvent);
         blockCodeBuilder.aload(0);
-        getfield(blockCodeBuilder, getEventClassDesc(), FIELD_DURATION);
+        getfield(blockCodeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
         blockCodeBuilder.lconst_0();
         blockCodeBuilder.lcmp();
         blockCodeBuilder.ifne(commit);
@@ -662,11 +437,11 @@ void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label ex
         invokestatic(blockCodeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_TIME_STAMP);
         blockCodeBuilder.lload(1);
         blockCodeBuilder.lsub();
-        putfield(blockCodeBuilder, getEventClassDesc(), FIELD_DURATION);
+        putfield(blockCodeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
         blockCodeBuilder.labelBinding(commit);
         // if (shouldCommit()) {
         blockCodeBuilder.aload(0);
-        invokevirtual(blockCodeBuilder, getEventClassDesc(), METHOD_EVENT_SHOULD_COMMIT);
+        invokevirtual(blockCodeBuilder, eventClassDesc, METHOD_EVENT_SHOULD_COMMIT);
         blockCodeBuilder.ifeq(end);
         getEventWriter(blockCodeBuilder);
         // stack: [EW]
@@ -687,39 +462,40 @@ void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label ex
         invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_LONG.method());
         fieldIndex++;
         // stack: [EW]
-        if (implicitFields.hasDuration()) {
+        if (inspector.hasDuration()) {
             // write duration
             blockCodeBuilder.dup();
             // stack: [EW] [EW]
             blockCodeBuilder.aload(0);
             // stack: [EW] [EW] [this]
-            getfield(blockCodeBuilder, getEventClassDesc(), FIELD_DURATION);
+            getfield(blockCodeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
             // stack: [EW] [EW] [long]
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_LONG.method());
             fieldIndex++;
         }
         // stack: [EW]
-        if (implicitFields.hasEventThread()) {
+        if (inspector.hasEventThread()) {
             // write eventThread
             blockCodeBuilder.dup();
             // stack: [EW] [EW]
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_EVENT_THREAD.method());
         }
         // stack: [EW]
-        if (implicitFields.hasStackTrace()) {
+        if (inspector.hasStackTrace()) {
             // write stack trace
             blockCodeBuilder.dup();
             // stack: [EW] [EW]
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, EventWriterMethod.PUT_STACK_TRACE.method());
         }
         // stack: [EW]
+        List<FieldDesc> fieldDescs = inspector.getFields();
         while (fieldIndex < fieldDescs.size()) {
             FieldDesc field = fieldDescs.get(fieldIndex);
             blockCodeBuilder.dup();
             // stack: [EW] [EW]
             blockCodeBuilder.aload(0);
             // stack: [EW] [EW] [this]
-            getfield(blockCodeBuilder, getEventClassDesc(), field);
+            getfield(blockCodeBuilder, eventClassDesc, field);
             // stack: [EW] [EW] <T>
             EventWriterMethod eventMethod = EventWriterMethod.lookupMethod(field);
             invokevirtual(blockCodeBuilder, TYPE_EVENT_WRITER, eventMethod.method());
@@ -731,90 +507,33 @@ void updateInstanceCommit(BlockCodeBuilder blockCodeBuilder, Label end, Label ex
         // stack:[int]
     }
 
-    private void updateEnabledMethod(MethodDesc method) {
-        updateMethod(method, codeBuilder -> {
-            Label nullLabel = codeBuilder.newLabel();
-            if (guardEventConfiguration) {
-                getEventConfiguration(codeBuilder);
-                codeBuilder.ifnull(nullLabel);
-            }
-            getEventConfiguration(codeBuilder);
-            invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_IS_ENABLED);
-            codeBuilder.ireturn();
-            if (guardEventConfiguration) {
-                codeBuilder.labelBinding(nullLabel);
-                codeBuilder.iconst_0();
-                codeBuilder.ireturn();
-            }
-        });
-    }
-
-    private void updateIfStaticMethodExists(MethodDesc method, Consumer<CodeBuilder> code) {
-        if (hasStaticMethod(method)) {
-            updateMethod(method, code);
-        }
+    private static boolean isStatic(MethodModel method) {
+        return (method.flags().flagsMask() & ClassFile.ACC_STATIC) != 0;
     }
 
-    private boolean hasStaticMethod(MethodDesc method) {
-        for (MethodModel m : classModel.methods()) {
-            if (m.methodName().equalsString(method.name()) && m.methodTypeSymbol().equals(method.descriptor())) {
-                return Modifier.isStatic(m.flags().flagsMask());
-            }
-        }
-        return false;
+    private static boolean isMethod(MethodModel m, MethodDesc desc) {
+        return desc.matches(m);
     }
 
-    private void getEventWriter(CodeBuilder codeBuilder) {
+    private static void getEventWriter(CodeBuilder codeBuilder) {
         invokestatic(codeBuilder, TYPE_EVENT_WRITER, METHOD_GET_EVENT_WRITER);
     }
 
     private void getEventConfiguration(CodeBuilder codeBuilder) {
         if (untypedEventConfiguration) {
-            codeBuilder.getstatic(getEventClassDesc(), FIELD_EVENT_CONFIGURATION.name(), TYPE_OBJECT);
+            codeBuilder.getstatic(eventClassDesc, FIELD_EVENT_CONFIGURATION.name(), TYPE_OBJECT);
             codeBuilder.checkcast(TYPE_EVENT_CONFIGURATION);
         } else {
-            codeBuilder.getstatic(getEventClassDesc(), FIELD_EVENT_CONFIGURATION.name(), TYPE_EVENT_CONFIGURATION);
+            codeBuilder.getstatic(eventClassDesc, FIELD_EVENT_CONFIGURATION.name(), TYPE_EVENT_CONFIGURATION);
         }
     }
 
-    private void makeUninstrumented() {
-        updateExistingWithReturnFalse(METHOD_EVENT_SHOULD_COMMIT);
-        updateExistingWithReturnFalse(METHOD_IS_ENABLED);
-        updateExistingWithEmptyVoidMethod(METHOD_COMMIT);
-        if (staticCommitMethod != null) {
-            updateExistingWithEmptyVoidMethod(staticCommitMethod);
+    private boolean hasUntypedConfiguration() {
+        for (FieldModel f : inspector.getClassModel().fields()) {
+            if (f.fieldName().equalsString(FIELD_EVENT_CONFIGURATION.name())) {
+                return f.fieldType().equalsString(TYPE_OBJECT.descriptorString());
+            }
         }
-        updateExistingWithEmptyVoidMethod(METHOD_BEGIN);
-        updateExistingWithEmptyVoidMethod(METHOD_END);
-    }
-
-    private final void updateExistingWithEmptyVoidMethod(MethodDesc voidMethod) {
-        updateMethod(voidMethod, codeBuilder -> {
-            codeBuilder.return_();
-        });
-    }
-
-    private final void updateExistingWithReturnFalse(MethodDesc voidMethod) {
-        updateMethod(voidMethod, codeBuilder -> {
-            codeBuilder.iconst_0();
-            codeBuilder.ireturn();
-        });
-    }
-
-    private Consumer<CodeBuilder> findMethodUpdate(MethodModel mm) {
-        MethodDesc m = MethodDesc.of(mm.methodName().stringValue(), mm.methodType().stringValue());
-        return methodUpdates.get(m);
-    }
-
-    private void updateMethod(MethodDesc method, Consumer<CodeBuilder> codeBuilder) {
-        methodUpdates.put(method, codeBuilder);
-    }
-
-    private ClassDesc getEventClassDesc() {
-        return classModel.thisClass().asSymbol();
-    }
-
-    public String getEventName() {
-        return eventName;
+        throw new InternalError("Class missing configuration field");
     }
 }
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 36dc2259be9..18b76cc3ff9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
@@ -72,7 +72,8 @@ static byte[] onRetransform(long traceId, boolean dummy1, boolean dummy2, Class<
                 }
                 boolean jdkClass = Utils.isJDKClass(clazz);
                 Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Adding instrumentation to event class " + clazz.getName() + " using retransform");
-                EventInstrumentation ei = new EventInstrumentation(clazz.getSuperclass(), oldBytes, traceId, jdkClass, false);
+                ClassInspector c = new ClassInspector(clazz.getSuperclass(), oldBytes, jdkClass);
+                EventInstrumentation ei = new EventInstrumentation(c, traceId, false);
                 byte[] bytes = ei.buildInstrumented();
                 Bytecode.log(clazz.getName(), bytes);
                 return bytes;
@@ -105,9 +106,9 @@ static byte[] bytesForEagerInstrumentation(long traceId, boolean forceInstrument
         }
         String eventName = "<Unknown>";
         try {
-            EventInstrumentation ei = new EventInstrumentation(superClass, oldBytes, traceId, bootClassLoader, true);
-            eventName = ei.getEventName();
-            if (!JVMSupport.shouldInstrument(bootClassLoader,  ei.getEventName())) {
+            ClassInspector c = new ClassInspector(superClass, oldBytes, bootClassLoader);
+            eventName = c.getEventName();
+            if (!JVMSupport.shouldInstrument(bootClassLoader,  c.getEventName())) {
                 Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Skipping instrumentation for " + eventName + " since container support is missing");
                 return oldBytes;
             }
@@ -118,14 +119,15 @@ static byte[] bytesForEagerInstrumentation(long traceId, boolean forceInstrument
                 // No need to generate bytecode if:
                 // 1) Event class is disabled, and there is not an external configuration that overrides.
                 // 2) Event class has @Registered(false)
-                if (!mr.isEnabled(ei.getEventName()) && !ei.isEnabled() || !ei.isRegistered()) {
+                if (!mr.isEnabled(c.getEventName()) && !c.isEnabled() || !c.isRegistered()) {
                     Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Skipping instrumentation for event type " + eventName + " since event was disabled on class load");
                     return oldBytes;
                 }
             }
-            Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Adding " + (forceInstrumentation ? "forced " : "") + "instrumentation for event type " + eventName + " during initial class load");
+            EventInstrumentation ei = new EventInstrumentation(c, traceId, true);
             byte[] bytes = ei.buildInstrumented();
-            Bytecode.log(ei.getClassName() + "(" + traceId + ")", bytes);
+            Logger.log(LogTag.JFR_SYSTEM, LogLevel.INFO, "Adding " + (forceInstrumentation ? "forced " : "") + "instrumentation for event type " + eventName + " during initial class load");
+            Bytecode.log(c.getClassName() + "(" + traceId + ")", bytes);
             return bytes;
         } catch (Throwable t) {
             Logger.log(LogTag.JFR_SYSTEM, LogLevel.WARN, "Unexpected error when adding instrumentation for event type " + eventName + ". " + t.getMessage());
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
index 1241993e762..3cea5e80643 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.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
@@ -33,6 +33,7 @@
 import jdk.jfr.internal.LogLevel;
 import jdk.jfr.internal.LogTag;
 import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.MethodModel;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import jdk.internal.classfile.components.ClassPrinter;
@@ -74,6 +75,12 @@ public static MethodDesc of(String methodName, Class<?> returnType, Class<?>...
             MethodTypeDesc mtd = MethodTypeDesc.of(returnDesc, parameterDesc);
             return new MethodDesc(methodName, mtd);
         }
+
+        public boolean matches(MethodModel m) {
+            return this.descriptor().equals(m.methodTypeSymbol()) && m.methodName().equalsString(this.name());
+        }
+    }
+    public record SettingDesc(ClassDesc paramType, String methodName) {
     }
 
     public static ClassDesc classDesc(ValueDescriptor v) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
index c97efe0bdb9..4c82569a83f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ImplicitFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import jdk.jfr.internal.RemoveFields;
+import jdk.jfr.internal.util.Bytecode.FieldDesc;
 /**
  * Class that describes fields that was not directly named
  * in the event definition.
@@ -37,6 +38,8 @@ public final class ImplicitFields {
     public static final String DURATION = "duration";
     public static final String EVENT_THREAD = "eventThread";
     public static final String STACK_TRACE = "stackTrace";
+    public static final FieldDesc FIELD_DURATION = FieldDesc.of(long.class, DURATION);
+    public static final FieldDesc FIELD_START_TIME = FieldDesc.of(long.class, START_TIME);
 
     private final List<String> fields = new ArrayList<>(4);
 

From 44c5aca54d1e0aaf0616f77845c5b3b1e2fccf5a Mon Sep 17 00:00:00 2001
From: Robert Toyonaga <rtoyonag@redhat.com>
Date: Wed, 23 Apr 2025 11:53:09 +0000
Subject: [PATCH 076/901] 8341491: Reserve and commit memory operations should
 be protected by NMT lock

Reviewed-by: stuefe, stefank
---
 src/hotspot/share/runtime/os.cpp       | 10 ++++
 test/hotspot/gtest/runtime/test_os.cpp | 68 ++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index e4bab3410c1..943f81d752c 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -2251,6 +2251,11 @@ void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint,
   MemTracker::record_virtual_memory_commit((address)addr, size, CALLER_PC);
 }
 
+// The scope of NmtVirtualMemoryLocker covers both pd_uncommit_memory and record_virtual_memory_uncommit because
+// these operations must happen atomically to avoid races causing NMT to fall out os sync with the OS reality.
+// We do not have the same lock protection for pd_commit_memory and record_virtual_memory_commit.
+// We assume that there is some external synchronization that prevents a region from being uncommitted
+// before it is finished being committed.
 bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
   bool res;
@@ -2273,6 +2278,11 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
   return res;
 }
 
+// The scope of NmtVirtualMemoryLocker covers both pd_release_memory and record_virtual_memory_release because
+// these operations must happen atomically to avoid races causing NMT to fall out os sync with the OS reality.
+// We do not have the same lock protection for pd_reserve_memory and record_virtual_memory_reserve.
+// We assume that there is some external synchronization that prevents a region from being released
+// before it is finished being reserved.
 bool os::release_memory(char* addr, size_t bytes) {
   assert_nonempty_range(addr, bytes);
   bool res;
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index ee6d1427d0b..04d71a55a49 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -28,6 +28,7 @@
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threads.hpp"
+#include "testutils.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -1113,3 +1114,70 @@ TEST_VM(os, free_without_uncommit) {
   os::release_memory(base, size);
 }
 #endif
+
+TEST_VM(os, commit_memory_or_exit) {
+  const size_t page_sz = os::vm_page_size();
+  const size_t size = 16 * page_sz;
+  const char* letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+  char* base = os::reserve_memory(size, false, mtTest);
+  ASSERT_NOT_NULL(base);
+  os::commit_memory_or_exit(base, size, false, "Commit failed.");
+  strcpy(base, letters);
+  ASSERT_TRUE(os::uncommit_memory(base, size, false));
+  os::commit_memory_or_exit(base, size, page_sz, false, "Commit with alignment hint failed.");
+  strcpy(base, letters);
+  ASSERT_TRUE(os::uncommit_memory(base, size, false));
+  EXPECT_TRUE(os::release_memory(base, size));
+}
+
+#if !defined(_AIX)
+
+TEST_VM(os, map_memory_to_file) {
+  const char* letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  const size_t size = strlen(letters) +1;
+
+  int fd = os::open("map_memory_to_file.txt", O_RDWR | O_CREAT, 0666);
+  EXPECT_TRUE(fd > 0);
+  EXPECT_TRUE(os::write(fd, letters, size));
+
+  char* result = os::map_memory_to_file(size, fd, mtTest);
+  ASSERT_NOT_NULL(result);
+  EXPECT_EQ(strcmp(letters, result), 0);
+  EXPECT_TRUE(os::unmap_memory(result, size));
+  ::close(fd);
+}
+
+TEST_VM(os, map_unmap_memory) {
+  const char* letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  const char* path = "map_unmap_memory.txt";
+  const size_t size = strlen(letters) + 1;
+  int fd = os::open(path, O_RDWR | O_CREAT, 0666);
+  EXPECT_TRUE(fd > 0);
+  EXPECT_TRUE(os::write(fd, letters, size));
+  ::close(fd);
+
+  fd = os::open(path, O_RDONLY, 0666);
+  char* result = os::map_memory(fd, path, 0, nullptr, size, true, false, mtTest);
+  ASSERT_NOT_NULL(result);
+  EXPECT_EQ(strcmp(letters, result), 0);
+  EXPECT_TRUE(os::unmap_memory(result, size));
+  ::close(fd);
+}
+
+TEST_VM(os, map_memory_to_file_aligned) {
+  const char* letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  const size_t size = strlen(letters) + 1;
+
+  int fd = os::open("map_memory_to_file.txt", O_RDWR | O_CREAT, 0666);
+  EXPECT_TRUE(fd > 0);
+  EXPECT_TRUE(os::write(fd, letters, size));
+
+  char* result = os::map_memory_to_file_aligned(os::vm_allocation_granularity(), os::vm_allocation_granularity(), fd, mtTest);
+  ASSERT_NOT_NULL(result);
+  EXPECT_EQ(strcmp(letters, result), 0);
+  EXPECT_TRUE(os::unmap_memory(result, os::vm_allocation_granularity()));
+  ::close(fd);
+}
+
+#endif // !defined(_AIX)

From c873837da6e373613866f5f5c0017f0fccb97b57 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Wed, 23 Apr 2025 13:01:42 +0000
Subject: [PATCH 077/901] 8355300: Add final to BitSieve

Reviewed-by: liach, pminborg
---
 src/java.base/share/classes/java/math/BitSieve.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BitSieve.java b/src/java.base/share/classes/java/math/BitSieve.java
index 8d0d370f9be..4403d79a22f 100644
--- a/src/java.base/share/classes/java/math/BitSieve.java
+++ b/src/java.base/share/classes/java/math/BitSieve.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2007, 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
@@ -44,22 +44,22 @@
  * @author  Michael McCloskey
  * @since   1.3
  */
-class BitSieve {
+final class BitSieve {
     /**
      * Stores the bits in this bitSieve.
      */
-    private long bits[];
+    private final long[] bits;
 
     /**
      * Length is how many bits this sieve holds.
      */
-    private int length;
+    private final int length;
 
     /**
      * A small sieve used to filter out multiples of small primes in a search
      * sieve.
      */
-    private static BitSieve smallSieve = new BitSieve();
+    private static final BitSieve smallSieve = new BitSieve();
 
     /**
      * Construct a "small sieve" with a base of 0.  This constructor is

From a372937d8480404e69eff43682c91506997fd8ee Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 23 Apr 2025 13:22:57 +0000
Subject: [PATCH 078/901] 8350983: JShell LocalExecutionControl only needs
 stopCheck() on backward branches

Reviewed-by: jlahoda, liach, asotona
---
 .../execution/LocalExecutionControl.java      | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
index 1f4dae2df38..5f547b25178 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.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
@@ -29,11 +29,16 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassTransform;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.Label;
 import java.lang.classfile.instruction.BranchInstruction;
+import java.lang.classfile.instruction.LabelTarget;
 
 /**
  * An implementation of {@link jdk.jshell.spi.ExecutionControl} which executes
@@ -90,11 +95,19 @@ public void load(ClassBytecodes[] cbcs)
     private static byte[] instrument(byte[] classFile) {
         var cc = ClassFile.of();
         return cc.transformClass(cc.parse(classFile),
-                        ClassTransform.transformingMethodBodies((cob, coe) -> {
-                            if (coe instanceof BranchInstruction)
-                                cob.invokestatic(CD_Cancel, "stopCheck", ConstantDescs.MTD_void);
-                            cob.with(coe);
-                        }));
+                        ClassTransform.transformingMethodBodies(
+                            CodeTransform.ofStateful(() -> {
+                                Set<Label> priorLabels = new HashSet<>();
+                                return (builder, element) -> {
+                                    switch (element) {
+                                        case LabelTarget target -> priorLabels.add(target.label());
+                                        case BranchInstruction branch when priorLabels.contains(branch.target())
+                                            -> builder.invokestatic(CD_Cancel, "stopCheck", ConstantDescs.MTD_void);
+                                        default -> { }
+                                    }
+                                    builder.with(element);
+                                };
+                            })));
     }
 
     private static ClassBytecodes genCancelClass() {

From 3c7f78c066b303d32defeda95d617fd90dc6e066 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 23 Apr 2025 13:26:22 +0000
Subject: [PATCH 079/901] 8341833: incomplete snippet from loaded files from
 command line is ignored

Reviewed-by: liach, asotona
---
 .../jdk/internal/jshell/tool/JShellTool.java  |  3 ++
 .../jshell/tool/resources/l10n.properties     |  1 +
 .../langtools/jdk/jshell/StartOptionTest.java | 33 ++++++++++++++++++-
 .../jdk/jshell/ToolProviderTest.java          |  1 +
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 5d95bc7c77d..1317a036982 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -1312,6 +1312,9 @@ private String getInput(String initial) throws IOException{
                 continue;
             }
             if (line == null) {
+                if (!src.isEmpty()) {
+                    errormsg("jshell.err.incomplete.input", src);
+                }
                 //EOF
                 if (input.interactiveOutput()) {
                     // End after user ctrl-D
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
index 44ad74611e5..351a0f812ad 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties
@@ -169,6 +169,7 @@ jshell.err.exception.thrown = Exception {0}
 jshell.err.exception.thrown.message = Exception {0}: {1}
 jshell.err.exception.cause = Caused by: {0}
 jshell.err.exception.cause.message = Caused by: {0}: {1}
+jshell.err.incomplete.input = Incomplete input: {0}
 
 jshell.console.see.synopsis = <press tab again to see synopsis>
 jshell.console.see.full.documentation = <press tab again to see full documentation>
diff --git a/test/langtools/jdk/jshell/StartOptionTest.java b/test/langtools/jdk/jshell/StartOptionTest.java
index 296fb397c4b..a83a7122cd3 100644
--- a/test/langtools/jdk/jshell/StartOptionTest.java
+++ b/test/langtools/jdk/jshell/StartOptionTest.java
@@ -22,12 +22,13 @@
  */
 
  /*
- * @test 8151754 8080883 8160089 8170162 8166581 8172102 8171343 8178023 8186708 8179856 8185840 8190383 8341631
+ * @test 8151754 8080883 8160089 8170162 8166581 8172102 8171343 8178023 8186708 8179856 8185840 8190383 8341631 8341833
  * @summary Testing startExCe-up options.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
  *          jdk.jshell/jdk.internal.jshell.tool
+ *          jdk.jshell/jdk.internal.jshell.tool.resources:+open
  * @library /tools/lib
  * @build Compiler toolbox.ToolBox
  * @run testng StartOptionTest
@@ -38,13 +39,16 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.ResourceBundle;
 import java.util.function.Consumer;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
+import jdk.jshell.JShell;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -149,6 +153,14 @@ protected void startCheckUserOutput(Consumer<String> checkUserOutput,
         check(usererr, null, "usererr");
     }
 
+    protected void startCheckError(Consumer<String> checkError,
+            String... args) {
+        runShell(args);
+        check(cmderr, checkError, "userout");
+        check(userout, null, "userout");
+        check(usererr, null, "usererr");
+    }
+
     // Start with an exit code and command error check
     protected void startExCe(int eec, Consumer<String> checkError, String... args) {
         StartOptionTest.this.startExCoUoCeCn(
@@ -427,6 +439,25 @@ public void testInput() {
                              readPasswordPrompt);
     }
 
+    public void testErroneousFile() {
+        String code = """
+                      var v = (
+                      System.console().readLine("prompt: ");
+                      /exit
+                      """;
+        String readLinePrompt = writeToFile(code);
+        String expectedErrorFormat =
+                ResourceBundle.getBundle("jdk.internal.jshell.tool.resources.l10n",
+                                         Locale.getDefault(),
+                                         JShell.class.getModule())
+                              .getString("jshell.err.incomplete.input");
+        String expectedError =
+                new MessageFormat(expectedErrorFormat).format(new Object[] {code});
+        startCheckError(s -> assertEquals(s, expectedError),
+                        readLinePrompt);
+    }
+
+
     @AfterMethod
     public void tearDown() {
         cmdout = null;
diff --git a/test/langtools/jdk/jshell/ToolProviderTest.java b/test/langtools/jdk/jshell/ToolProviderTest.java
index 67038c878ab..8fad066bc87 100644
--- a/test/langtools/jdk/jshell/ToolProviderTest.java
+++ b/test/langtools/jdk/jshell/ToolProviderTest.java
@@ -40,6 +40,7 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
  *          jdk.jshell/jdk.internal.jshell.tool:+open
+ *          jdk.jshell/jdk.internal.jshell.tool.resources:+open
  * @library /tools/lib
  * @build Compiler toolbox.ToolBox
  * @run testng ToolProviderTest

From e8a1a6462d3fd4782c383adc85e0327f2595c012 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 23 Apr 2025 14:08:20 +0000
Subject: [PATCH 080/901] 8355401: Remove unused HWperKB

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/utilities/globalDefinitions.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 95ebc77d1c9..95971f16ed9 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -307,7 +307,6 @@ const jdouble max_jdouble = jdouble_cast(max_jlongDouble);
 const size_t K                  = 1024;
 const size_t M                  = K*K;
 const size_t G                  = M*K;
-const size_t HWperKB            = K / sizeof(HeapWord);
 
 // Constants for converting from a base unit to milli-base units.  For
 // example from seconds to milliseconds and microseconds

From 023f30bcaa820080ed5b5aa6f9a0a996a62c7d34 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 23 Apr 2025 14:10:04 +0000
Subject: [PATCH 081/901] 8355394: ZGC: Windows compile error in ZUtils

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Reviewed-by: aboldtch, tschatzl
---
 src/hotspot/share/gc/z/zUtils.inline.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp
index 07a49f144e9..b83f42d18e6 100644
--- a/src/hotspot/share/gc/z/zUtils.inline.hpp
+++ b/src/hotspot/share/gc/z/zUtils.inline.hpp
@@ -86,11 +86,10 @@ inline void ZUtils::sort(T* array, size_t count, Comparator comparator) {
   using SortType = int(const void*, const void*);
   using ComparatorType = int(const T*, const T*);
 
-  static constexpr bool IsComparatorCompatible = std::is_assignable<ComparatorType*&, Comparator>::value;
-  static_assert(IsComparatorCompatible, "Incompatible Comparator, must decay to plain function pointer");
+  ComparatorType* const comparator_fn_ptr = comparator;
 
   // We rely on ABI compatibility between ComparatorType and SortType
-  qsort(array, count, sizeof(T), reinterpret_cast<SortType*>(static_cast<ComparatorType*>(comparator)));
+  qsort(array, count, sizeof(T), reinterpret_cast<SortType*>(comparator_fn_ptr));
 }
 
 template <typename T, typename Comparator>

From 6befc189741069cc4b188e4822541fb9ab72ee28 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 23 Apr 2025 14:23:38 +0000
Subject: [PATCH 082/901] 8355278: Improve debuggability of
 com/sun/jndi/ldap/LdapPoolTimeoutTest.java test

Reviewed-by: aefimov
---
 .../sun/jndi/ldap/LdapPoolTimeoutTest.java    | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
index 66865f85942..123c5120daf 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.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
@@ -30,10 +30,8 @@
  * @run testng/othervm LdapPoolTimeoutTest
  */
 
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.directory.InitialDirContext;
@@ -44,13 +42,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
 
 import static jdk.test.lib.Utils.adjustTimeout;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.expectThrows;
 
 public class LdapPoolTimeoutTest {
     /*
@@ -101,12 +94,13 @@ public void test() throws Exception {
             executorService.shutdown();
         }
         int failedCount = 0;
-        for (var f : futures) {
+        for (int i = 0; i < futures.size(); i++) {
             try {
-                f.get();
+                futures.get(i).get();
             } catch (ExecutionException e) {
                 failedCount++;
-                e.getCause().printStackTrace(System.out);
+                System.err.println("task " + (i + 1) + " failed:");
+                e.getCause().printStackTrace();
             }
         }
         if (failedCount > 0)
@@ -119,20 +113,31 @@ private static void attemptConnect(Hashtable<Object, Object> env) throws Excepti
                    2 * CONNECT_MILLIS + TOLERANCE,
                    () -> new InitialDirContext(env));
         } catch (RuntimeException e) {
-            String msg = e.getCause() == null ? e.getMessage() : e.getCause().getMessage();
-            System.err.println("MSG RTE: " + msg);
+            final String msg = e.getCause() == null ? e.getMessage() : e.getCause().getMessage();
             // assertCompletion may wrap a CommunicationException in an RTE
-            assertNotNull(msg);
-            assertTrue(msg.contains("Network is unreachable")
-                        || msg.contains("No route to host") || msg.contains("Connection timed out"));
+            if (msg != null &&
+                    (msg.contains("Network is unreachable")
+                            || msg.contains("No route to host")
+                            || msg.contains("Connection timed out"))) {
+                // got the expected exception
+                System.out.println("Received expected RuntimeException message: " + msg);
+            } else {
+                // propagate the unexpected exception
+                throw e;
+            }
         } catch (NamingException ex) {
-            String msg = ex.getCause() == null ? ex.getMessage() : ex.getCause().getMessage();
-            System.err.println("MSG: " + msg);
-            assertTrue(msg != null &&
+            final String msg = ex.getCause() == null ? ex.getMessage() : ex.getCause().getMessage();
+            if (msg != null &&
                     (msg.contains("Network is unreachable")
                         || msg.contains("Timed out waiting for lock")
                         || msg.contains("Connect timed out")
-                        || msg.contains("Timeout exceeded while waiting for a connection")));
+                        || msg.contains("Timeout exceeded while waiting for a connection"))) {
+                // got the expected exception
+                System.out.println("Received expected NamingException message: " + msg);
+            } else {
+                // propagate the unexpected exception
+                throw ex;
+            }
         } catch (Throwable t) {
             throw new RuntimeException(t);
         }

From 12c3a231e6c1709660e61995f09ad857858e2e36 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 23 Apr 2025 14:55:15 +0000
Subject: [PATCH 083/901] 8354898:
 jdk/internal/loader/NativeLibraries/Main.java fails on static JDK

Reviewed-by: jpai
---
 test/jdk/jdk/internal/loader/NativeLibraries/Main.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java b/test/jdk/jdk/internal/loader/NativeLibraries/Main.java
index 4709810b0cd..5d96777a6f1 100644
--- a/test/jdk/jdk/internal/loader/NativeLibraries/Main.java
+++ b/test/jdk/jdk/internal/loader/NativeLibraries/Main.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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8240975 8281335
+ * @library /test/lib
  * @modules java.base/jdk.internal.loader
  * @build java.base/* p.Test Main
  * @run main/othervm/native -Xcheck:jni Main
@@ -31,6 +32,7 @@
  */
 
 import jdk.internal.loader.NativeLibrariesTest;
+import jdk.test.lib.Platform;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -55,7 +57,9 @@ public static void main(String... args) throws Exception {
         test.unload();
 
         // load zip library from JDK
-        test.load(System.mapLibraryName("zip"), true /* succeed */);
+        if (!Platform.isStatic()) {
+            test.load(System.mapLibraryName("zip"), true /* succeed */);
+        }
 
         // load non-existent library
         test.load(System.mapLibraryName("NotExist"), false /* fail to load */);

From 32a597b36f994d6e720e0576ad110dac4a5304fe Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 23 Apr 2025 15:44:56 +0000
Subject: [PATCH 084/901] 8355333: Some Problem list entries point to
 non-existent / wrong files

Reviewed-by: serb
---
 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 56224181b0a..c7168e9800e 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -443,7 +443,7 @@ java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java 8194751 linux-all
 java/awt/image/VolatileImage/BitmaskVolatileImage.java 8133102 linux-all
 java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java 8203004 linux-all
 java/awt/ScrollPane/ScrollPositionTest.java 8040070 linux-all
-java/awt/ScrollPane/ScrollPaneScrollType/ScrollPaneEventType.java 8296516 macosx-all
+java/awt/ScrollPane/ScrollPaneEventType.java 8296516 macosx-all
 java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java 7107528 linux-all,macosx-all
 java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java 8080676 linux-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersInKeyEvent.java 8157147 linux-all,windows-all,macosx-all
@@ -483,8 +483,6 @@ java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeNextMnemoni
 
 java/awt/Window/GetScreenLocation/GetScreenLocationTest.java 8225787 linux-x64
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 8266243 macosx-aarch64
-java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java 8029249 macosx-all
-java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java 8029249 macosx-all
 java/awt/Dialog/ChoiceModalDialogTest.java 8161475 macosx-all
 java/awt/Dialog/FileDialogUserFilterTest.java 8001142 generic-all
 
@@ -683,7 +681,7 @@ javax/swing/JFileChooser/8194044/FileSystemRootTest.java 8327236 windows-all
 javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
 javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all
 javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all
-javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
+javax/swing/JFileChooser/bug6798062.java 8146446 windows-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
 javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765  macosx-all,linux-all
 javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
@@ -783,7 +781,7 @@ jdk/jfr/jvm/TestWaste.java                                      8282427 generic-
 javax/swing/JFileChooser/6698013/bug6698013.java 8024419 macosx-all
 javax/swing/JColorChooser/8065098/bug8065098.java 8065647 macosx-all
 javax/swing/JTabbedPane/bug4499556.java 8267500 macosx-all
-javax/swing/JTabbedPane/4666224/bug4666224.java 8144124  macosx-all
+javax/swing/JTabbedPane/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

From 1a72febc97de3d0ade8813951797dfda1984650f Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 23 Apr 2025 16:04:40 +0000
Subject: [PATCH 085/901] 8355228: Improve
 runtime/CompressedOops/CompressedClassPointersEncodingScheme.java to support
 JDK build with -XX:+UseCompactObjectHeaders

Reviewed-by: syan, stuefe, coleenp
---
 .../CompressedOops/CompressedClassPointersEncodingScheme.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
index 6a7ab088fac..0e72341e565 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointersEncodingScheme.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
@@ -74,7 +74,9 @@ private static void test(long forceAddress, boolean COH, long classSpaceSize, lo
     private static void testFailure(String forceAddressString) throws IOException {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
                 "-Xshare:off", // to make CompressedClassSpaceBaseAddress work
+                "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:-UseCompactObjectHeaders",
                 "-XX:CompressedClassSpaceBaseAddress=" + forceAddressString,
                 "-Xmx128m",
                 "-Xlog:metaspace*",

From f097aa90c91826ba6c3c7380a84b8e98f1d42bbb Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 23 Apr 2025 16:07:36 +0000
Subject: [PATCH 086/901] 8355215: Add @spec tags to Emoji related methods

Reviewed-by: joehw, iris, jlu
---
 src/java.base/share/classes/java/lang/Character.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index f5a9ab77b52..4347a3bc8aa 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.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
@@ -11089,6 +11089,7 @@ public static boolean isIdentifierIgnorable(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji;
      *          {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmoji(int codePoint) {
@@ -11107,6 +11108,7 @@ public static boolean isEmoji(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character has the Emoji Presentation
      *          property; {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiPresentation(int codePoint) {
@@ -11125,6 +11127,7 @@ public static boolean isEmojiPresentation(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Modifier;
      *          {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiModifier(int codePoint) {
@@ -11143,6 +11146,7 @@ public static boolean isEmojiModifier(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Modifier Base;
      *          {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiModifierBase(int codePoint) {
@@ -11161,6 +11165,7 @@ public static boolean isEmojiModifierBase(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Component;
      *          {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiComponent(int codePoint) {
@@ -11179,6 +11184,7 @@ public static boolean isEmojiComponent(int codePoint) {
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Extended Pictographic;
      *          {@code false} otherwise.
+     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isExtendedPictographic(int codePoint) {

From 2ec61f0f34d2fa313ae3ed5d6aa0881ec091b347 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 23 Apr 2025 16:13:23 +0000
Subject: [PATCH 087/901] 8353214: Add testing with --enable-preview

Reviewed-by: erikj
---
 make/RunTests.gmk                             |  5 +++
 .../jtreg/ProblemList-enable-preview.txt      | 31 ++++++++++++++++++
 test/jdk/ProblemList-enable-preview.txt       | 32 +++++++++++++++++++
 test/jdk/jdk/modules/etc/DefaultModules.java  |  1 +
 4 files changed, 69 insertions(+)
 create mode 100644 test/hotspot/jtreg/ProblemList-enable-preview.txt
 create mode 100644 test/jdk/ProblemList-enable-preview.txt

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 80c1ff99b2e..69dc47a0c61 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -929,6 +929,11 @@ define SetupRunJtregTestBody
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
   endif
 
+  ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
+  endif
+
+
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt
new file mode 100644
index 00000000000..a6b922da6a5
--- /dev/null
+++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing with --enable-preview
+#
+#############################################################################
+
+vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java  8351188 generic-all
+
diff --git a/test/jdk/ProblemList-enable-preview.txt b/test/jdk/ProblemList-enable-preview.txt
new file mode 100644
index 00000000000..42c3a70db82
--- /dev/null
+++ b/test/jdk/ProblemList-enable-preview.txt
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing with --enable-preview
+#
+#############################################################################
+
+java/lang/System/SecurityManagerWarnings.java                                        8351188 generic-all
+java/lang/System/LoggerFinder/SignedLoggerFinderTest/SignedLoggerFinderTest.java     8351188 generic-all
+
diff --git a/test/jdk/jdk/modules/etc/DefaultModules.java b/test/jdk/jdk/modules/etc/DefaultModules.java
index 6f2822fe84d..febb5baf70f 100644
--- a/test/jdk/jdk/modules/etc/DefaultModules.java
+++ b/test/jdk/jdk/modules/etc/DefaultModules.java
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8197532
+ * @requires !java.enablePreview
  * @modules jdk.compiler
  *          jdk.jlink
  *          jdk.zipfs

From 8bd564521804e98911cc9ff3b7696165e3243139 Mon Sep 17 00:00:00 2001
From: Sangheon Kim <sangheki@openjdk.org>
Date: Wed, 23 Apr 2025 16:37:07 +0000
Subject: [PATCH 088/901] 8346568: G1: Other time can be negative

Reviewed-by: tschatzl, iwalulya
---
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp   | 26 +++++++++++---------
 src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp   | 20 ++++++++++++---
 src/hotspot/share/gc/g1/g1RemSet.cpp         | 13 ++++++++--
 src/hotspot/share/gc/g1/g1YoungCollector.cpp | 21 +++++-----------
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 5b0d5ca8eb9..f7b0cb23b65 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -193,6 +193,7 @@ void G1GCPhaseTimes::reset() {
   _cur_region_register_time = 0.0;
   _cur_verify_before_time_ms = 0.0;
   _cur_verify_after_time_ms = 0.0;
+  _cur_prepare_concurrent_task_time_ms = 0.0;
 
   for (int i = 0; i < GCParPhasesSentinel; i++) {
     if (_gc_par_phases[i] != nullptr) {
@@ -407,10 +408,7 @@ void G1GCPhaseTimes::trace_count(const char* name, size_t value) const {
 }
 
 double G1GCPhaseTimes::print_pre_evacuate_collection_set() const {
-  const double pre_concurrent_start_ms = average_time_ms(ResetMarkingState) +
-                                         average_time_ms(NoteStartOfMark);
-
-  const double sum_ms = pre_concurrent_start_ms +
+  const double sum_ms = _cur_prepare_concurrent_task_time_ms +
                         _cur_pre_evacuate_prepare_time_ms +
                         _recorded_young_cset_choice_time_ms +
                         _recorded_non_young_cset_choice_time_ms +
@@ -419,9 +417,12 @@ double G1GCPhaseTimes::print_pre_evacuate_collection_set() const {
 
   info_time("Pre Evacuate Collection Set", sum_ms);
 
-  if (pre_concurrent_start_ms > 0.0) {
-    debug_phase(_gc_par_phases[ResetMarkingState]);
-    debug_phase(_gc_par_phases[NoteStartOfMark]);
+  // Concurrent tasks of ResetMarkingState and NoteStartOfMark are triggered during
+  // young collection. However, their execution time are not included in _gc_pause_time_ms.
+  if (_cur_prepare_concurrent_task_time_ms > 0.0) {
+    debug_time("Prepare Concurrent Start", _cur_prepare_concurrent_task_time_ms);
+    debug_phase(_gc_par_phases[ResetMarkingState], 1);
+    debug_phase(_gc_par_phases[NoteStartOfMark], 1);
   }
 
   debug_time("Pre Evacuate Prepare", _cur_pre_evacuate_prepare_time_ms);
@@ -545,6 +546,11 @@ void G1GCPhaseTimes::print_other(double accounted_ms) const {
   info_time("Other", _gc_pause_time_ms - accounted_ms);
 }
 
+// Root-region-scan-wait, verify-before and verify-after are part of young GC,
+// but these are not measured by G1Policy. i.e. these are not included in
+// G1Policy::record_young_collection_start() and record_young_collection_end().
+// In addition, these are not included in G1GCPhaseTimes::_gc_pause_time_ms.
+// See G1YoungCollector::collect().
 void G1GCPhaseTimes::print(bool evacuation_failed) {
   if (_root_region_scan_wait_time_ms > 0.0) {
     debug_time("Root Region Scan Waiting", _root_region_scan_wait_time_ms);
@@ -559,15 +565,13 @@ void G1GCPhaseTimes::print(bool evacuation_failed) {
 
   double accounted_ms = 0.0;
 
-  accounted_ms += _root_region_scan_wait_time_ms;
-  accounted_ms += _cur_verify_before_time_ms;
-
   accounted_ms += print_pre_evacuate_collection_set();
   accounted_ms += print_evacuate_initial_collection_set();
   accounted_ms += print_evacuate_optional_collection_set();
   accounted_ms += print_post_evacuate_collection_set(evacuation_failed);
 
-  accounted_ms += _cur_verify_after_time_ms;
+  assert(_gc_pause_time_ms >= accounted_ms, "GC pause time(%.3lfms) cannot be "
+         "smaller than the sum of each phase(%.3lfms).", _gc_pause_time_ms, accounted_ms);
 
   print_other(accounted_ms);
 
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
index f3bc0efafb9..ea868cd939e 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.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
@@ -177,12 +177,12 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
 
   double _cur_merge_heap_roots_time_ms;
   double _cur_optional_merge_heap_roots_time_ms;
+  // Included in above merge and optional-merge time.
+  double _cur_distribute_log_buffers_time_ms;
 
   double _cur_prepare_merge_heap_roots_time_ms;
   double _cur_optional_prepare_merge_heap_roots_time_ms;
 
-  double _cur_distribute_log_buffers_time_ms;
-
   double _cur_pre_evacuate_prepare_time_ms;
 
   double _cur_post_evacuate_cleanup_1_time_ms;
@@ -192,6 +192,7 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
   double _cur_ref_proc_time_ms;
 
   double _cur_collection_start_sec;
+  // Not included in _gc_pause_time_ms
   double _root_region_scan_wait_time_ms;
 
   double _external_accounted_time_ms;
@@ -211,9 +212,13 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
 
   double _cur_region_register_time;
 
+  // Not included in _gc_pause_time_ms
   double _cur_verify_before_time_ms;
   double _cur_verify_after_time_ms;
 
+  // Time spent to trigger concurrent tasks of ResetMarkingState and NoteStartOfMark.
+  double _cur_prepare_concurrent_task_time_ms;
+
   ReferenceProcessorPhaseTimes _ref_phase_times;
   WeakProcessorTimes _weak_phase_times;
 
@@ -318,6 +323,10 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
     _cur_ref_proc_time_ms = ms;
   }
 
+  void record_prepare_concurrent_task_time_ms(double ms) {
+    _cur_prepare_concurrent_task_time_ms = ms;
+  }
+
   void record_root_region_scan_wait_time(double time_ms) {
     _root_region_scan_wait_time_ms = time_ms;
   }
@@ -389,8 +398,11 @@ class G1GCPhaseTimes : public CHeapObj<mtGC> {
   double cur_collection_par_time_ms() {
     return _cur_collection_initial_evac_time_ms +
            _cur_optional_evac_time_ms +
+           _cur_prepare_merge_heap_roots_time_ms +
            _cur_merge_heap_roots_time_ms +
-           _cur_optional_merge_heap_roots_time_ms;
+           _cur_optional_prepare_merge_heap_roots_time_ms +
+           _cur_optional_merge_heap_roots_time_ms +
+           _cur_collection_nmethod_list_cleanup_time_ms;
   }
 
   double cur_expand_heap_time_ms() {
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index c4f84b02d01..6ef99d49085 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1445,6 +1445,7 @@ void G1RemSet::print_merge_heap_roots_stats() {
 
 void G1RemSet::merge_heap_roots(bool initial_evacuation) {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
+  G1GCPhaseTimes* pt = g1h->phase_times();
 
   {
     Ticks start = Ticks::now();
@@ -1453,9 +1454,9 @@ void G1RemSet::merge_heap_roots(bool initial_evacuation) {
 
     Tickspan total = Ticks::now() - start;
     if (initial_evacuation) {
-      g1h->phase_times()->record_prepare_merge_heap_roots_time(total.seconds() * 1000.0);
+      pt->record_prepare_merge_heap_roots_time(total.seconds() * 1000.0);
     } else {
-      g1h->phase_times()->record_or_add_optional_prepare_merge_heap_roots_time(total.seconds() * 1000.0);
+      pt->record_or_add_optional_prepare_merge_heap_roots_time(total.seconds() * 1000.0);
     }
   }
 
@@ -1465,6 +1466,8 @@ void G1RemSet::merge_heap_roots(bool initial_evacuation) {
   uint const num_workers = initial_evacuation ? workers->active_workers() :
                                                 MIN2(workers->active_workers(), (uint)increment_length);
 
+  Ticks start = Ticks::now();
+
   {
     G1MergeHeapRootsTask cl(_scan_state, num_workers, initial_evacuation);
     log_debug(gc, ergo)("Running %s using %u workers for %zu regions",
@@ -1483,6 +1486,12 @@ void G1RemSet::merge_heap_roots(bool initial_evacuation) {
   }
 
   print_merge_heap_roots_stats();
+
+  if (initial_evacuation) {
+    pt->record_merge_heap_roots_time((Ticks::now() - start).seconds() * 1000.0);
+  } else {
+    pt->record_or_add_optional_merge_heap_roots_time((Ticks::now() - start).seconds() * 1000.0);
+  }
 }
 
 void G1RemSet::complete_evac_phase(bool has_more_than_one_evacuation_phase) {
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 69586b4ebf2..450fc957bdc 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -486,7 +486,9 @@ void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info)
   calculate_collection_set(evacuation_info, policy()->max_pause_time_ms());
 
   if (collector_state()->in_concurrent_start_gc()) {
+    Ticks start = Ticks::now();
     concurrent_mark()->pre_concurrent_start(_gc_cause);
+    phase_times()->record_prepare_concurrent_task_time_ms((Ticks::now() - start).seconds() * 1000.0);
   }
 
   // Please see comment in g1CollectedHeap.hpp and
@@ -743,11 +745,7 @@ void G1YoungCollector::evacuate_initial_collection_set(G1ParScanThreadStateSet*
                                                       bool has_optional_evacuation_work) {
   G1GCPhaseTimes* p = phase_times();
 
-  {
-    Ticks start = Ticks::now();
-    rem_set()->merge_heap_roots(true /* initial_evacuation */);
-    p->record_merge_heap_roots_time((Ticks::now() - start).seconds() * 1000.0);
-  }
+  rem_set()->merge_heap_roots(true /* initial_evacuation */);
 
   Tickspan task_time;
   const uint num_workers = workers()->active_workers();
@@ -812,6 +810,7 @@ void G1YoungCollector::evacuate_next_optional_regions(G1ParScanThreadStateSet* p
   Tickspan total_processing = Ticks::now() - start_processing;
 
   G1GCPhaseTimes* p = phase_times();
+  p->record_or_add_optional_evac_time(task_time.seconds() * 1000.0);
   p->record_or_add_nmethod_list_cleanup_time((total_processing - task_time).seconds() * 1000.0);
 }
 
@@ -830,17 +829,9 @@ void G1YoungCollector::evacuate_optional_collection_set(G1ParScanThreadStateSet*
       break;
     }
 
-    {
-      Ticks start = Ticks::now();
-      rem_set()->merge_heap_roots(false /* initial_evacuation */);
-      phase_times()->record_or_add_optional_merge_heap_roots_time((Ticks::now() - start).seconds() * 1000.0);
-    }
+    rem_set()->merge_heap_roots(false /* initial_evacuation */);
 
-    {
-      Ticks start = Ticks::now();
-      evacuate_next_optional_regions(per_thread_states);
-      phase_times()->record_or_add_optional_evac_time((Ticks::now() - start).seconds() * 1000.0);
-    }
+    evacuate_next_optional_regions(per_thread_states);
 
     rem_set()->complete_evac_phase(true /* has_more_than_one_evacuation_phase */);
   }

From ac41bc31c96951b9fe51c22d16f31bdc1806a881 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 23 Apr 2025 16:52:42 +0000
Subject: [PATCH 089/901] 8354343: Hardening of Currency tests for not yet
 defined future ISO 4217 currency

Reviewed-by: naoto
---
 .../java/util/Currency/ValidateISO4217.java   | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index 607faefcfa4..34635f5c53a 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -26,7 +26,7 @@
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
  *      8208746 8209775 8264792 8274658 8283277 8296239 8321480 8334653
- *      8354344
+ *      8354343 8354344
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
@@ -71,6 +71,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -111,6 +112,8 @@ public class ValidateISO4217 {
     private static final List<Arguments> additionalCodes = new ArrayList<Arguments>();
     // Currencies to test (derived from ISO4217Codes and additionalCodes)
     private static final Set<Currency> testCurrencies = new HashSet<>();
+    // Special case currencies that should only exist after the cut-over occurs
+    private static final Set<String> currenciesNotYetDefined = new HashSet<>();
     // Codes that are obsolete, do not have related country, extra currency
     private static final String otherCodes =
             "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
@@ -235,13 +238,14 @@ private static void patchClass(String name) throws IOException {
     }
 
     // Sets up the following test data:
-    // ISO4217Codes, additionalCodes, testCurrencies, codes
+    // ISO4217Codes, additionalCodes, testCurrencies, codes, currenciesNotYetDefined
     static void setUpTestingData() throws Exception {
         // These functions laterally setup 'testCurrencies' and 'codes'
         // at the same time
         setUpISO4217Codes();
         setUpAdditionalCodes();
         setUpOtherCurrencies();
+        setUpNotYetDefined();
     }
 
     // Parse the ISO4217 file and populate ISO4217Codes and testCurrencies.
@@ -294,6 +298,11 @@ private static void processColumns(StringTokenizer tokens, String country) throw
                     numeric = tokens.nextToken();
                     minorUnit = tokens.nextToken();
                     testCurrencies.add(Currency.getInstance(currency));
+                } else {
+                    // Add all future currencies to the set.
+                    // We process it later once 'testCurrencies' is complete
+                    // to only include ones that should not be defined yet.
+                    currenciesNotYetDefined.add(tokens.nextToken());
                 }
             }
         }
@@ -339,6 +348,17 @@ private static void setUpOtherCurrencies() {
         }
     }
 
+    // Future currencies that are already defined as ISO 4217 codes should be
+    // removed. For example, in CW=ANG;2025-04-01-04-00-00;EUR "EUR" would be
+    // removed as it is an already valid ISO 4217 code
+    private static void setUpNotYetDefined() {
+        var allFutureCurrencies = testCurrencies
+                .stream()
+                .map(Currency::getCurrencyCode)
+                .collect(Collectors.toSet());
+        currenciesNotYetDefined.removeIf(allFutureCurrencies::contains);
+    }
+
     // Check that the data file is up-to-date
     @Test
     public void dataVersionTest() {
@@ -419,6 +439,18 @@ private static List<String> codeCombos() {
         return codeCombos;
     }
 
+    // Any future currencies that do not already exist before the cut-over
+    // should not be instantiable. This scenario is when a country transfers
+    // to a new code, that is not already a valid ISO 4217 code. For example,
+    // what occurred in the 176 update situation.
+    @Test
+    public void nonDefinedFutureCurrenciesTest() {
+        for (String curr : currenciesNotYetDefined) {
+            assertThrows(IllegalArgumentException.class, () -> Currency.getInstance(curr),
+                    "The future cut-over currency: %s should not exist".formatted(curr));
+        }
+    }
+
     // This method ensures that getAvailableCurrencies() returns
     // the expected amount of currencies.
     @Test
@@ -427,6 +459,8 @@ public void getAvailableCurrenciesTest() {
         // Ensure that testCurrencies has all the JRE currency codes
         assertTrue(testCurrencies.containsAll(jreCurrencies),
                 getSetDiffs(jreCurrencies, testCurrencies));
+        // Implicitly checks that jreCurrencies does not contain any currencies
+        // defined in currenciesNotYetDefined
     }
 
     private static String getSetDiffs(Set<Currency> jreCurrencies, Set<Currency> testCurrencies) {

From 35716647b531f0c20f9803138dfe2cedd6c4deee Mon Sep 17 00:00:00 2001
From: Sergey Kuksenko <skuksenko@openjdk.org>
Date: Wed, 23 Apr 2025 17:03:37 +0000
Subject: [PATCH 090/901] 8353478: Update crypto microbenchmarks to cover
 ML-DSA, ML-KEM, and HSS algorithms

Reviewed-by: ecaspole
---
 .../openjdk/bench/java/security/MLDSA.java    | 830 -----------------
 .../bench/java/security/MLKEMBench.java       | 835 ------------------
 .../crypto/full/HSSBench.java}                |  89 +-
 .../bench/javax/crypto/full/KEMBench.java     |  82 ++
 .../crypto/full/KeyPairGeneratorBench.java    |  25 +-
 .../javax/crypto/full/SignatureBench.java     |  15 +-
 .../bench/javax/crypto/small/HSSBench.java    |  27 +
 .../bench/javax/crypto/small/KEMBench.java    |  32 +
 .../crypto/small/KeyPairGeneratorBench.java   |  20 +-
 .../javax/crypto/small/SignatureBench.java    |  15 +-
 10 files changed, 242 insertions(+), 1728 deletions(-)
 delete mode 100644 test/micro/org/openjdk/bench/java/security/MLDSA.java
 delete mode 100644 test/micro/org/openjdk/bench/java/security/MLKEMBench.java
 rename test/micro/org/openjdk/bench/{java/security/HSS.java => javax/crypto/full/HSSBench.java} (92%)
 create mode 100644 test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
 create mode 100644 test/micro/org/openjdk/bench/javax/crypto/small/HSSBench.java
 create mode 100644 test/micro/org/openjdk/bench/javax/crypto/small/KEMBench.java

diff --git a/test/micro/org/openjdk/bench/java/security/MLDSA.java b/test/micro/org/openjdk/bench/java/security/MLDSA.java
deleted file mode 100644
index 36b616ab599..00000000000
--- a/test/micro/org/openjdk/bench/java/security/MLDSA.java
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * 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.
- */
-
-package org.openjdk.bench.java.security;
-
-import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-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.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.InterruptedException;
-import java.security.DigestException;
-import java.security.NoSuchAlgorithmException;
-import java.security.KeyPair;
-import java.util.Arrays;
-import java.util.HexFormat;
-import java.util.concurrent.TimeUnit;
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MICROSECONDS)
-@State(Scope.Thread)
-@Warmup(iterations = 5, time = 1)
-@Measurement(iterations = 5, time = 1)
-@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"} )
-        private static String algorithm;
-
-    @State(Scope.Thread)
-    public static class MyState {
-
-        Object mldsa44;
-        Object mldsa65;
-        Object mldsa87;
-
-        MethodHandle keygen, siggen, sigver;
-
-        @Setup(Level.Trial)
-        public void setup() throws Throwable, Exception {
-
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-            Class<?> kClazz = Class.forName("sun.security.provider.ML_DSA");
-            Constructor<?> constructor = kClazz.getDeclaredConstructor(
-                    int.class);
-            constructor.setAccessible(true);
-
-            Method m = kClazz.getDeclaredMethod("generateKeyPairInternal",
-                    byte[].class);
-            m.setAccessible(true);
-            keygen = lookup.unreflect(m);
-
-            m = kClazz.getDeclaredMethod("signInternal",
-                    byte[].class, byte[].class, byte[].class);
-            m.setAccessible(true);
-            siggen = lookup.unreflect(m);
-
-            m = kClazz.getDeclaredMethod("verifyInternal",
-                    byte[].class, byte[].class, byte[].class);
-            m.setAccessible(true);
-            sigver = lookup.unreflect(m);
-
-            mldsa44 = constructor.newInstance(2);
-            mldsa65 = constructor.newInstance(3);
-            mldsa87 = constructor.newInstance(5);
-        }
-    }
-
-    @Benchmark
-    public void keygen(MyState myState) throws Throwable {
-        switch (algorithm) {
-        case "ML-DSA-44":
-            for (KeyGenTestCase testCase : KeyGenTestCases44) {
-                myState.keygen.invoke(myState.mldsa44, testCase.seed);
-            }
-            break;
-        case "ML-DSA-65":
-            for (KeyGenTestCase testCase : KeyGenTestCases65) {
-                myState.keygen.invoke(myState.mldsa65, testCase.seed);
-            }
-            break;
-        case "ML-DSA-87":
-            for (KeyGenTestCase testCase : KeyGenTestCases87) {
-                myState.keygen.invoke(myState.mldsa87, testCase.seed);
-            }
-            break;
-        }
-    }
-
-    @Benchmark
-    public void siggen(MyState myState) throws Throwable {
-        byte[] rnd = new byte[32];
-        switch (algorithm) {
-        case "ML-DSA-44":
-            for (SigGenTestCase testCase : SigGenTestCases44) {
-                myState.siggen.invoke(myState.mldsa44, testCase.msg,
-                        rnd, testCase.sk);
-            }
-            break;
-        case "ML-DSA-65":
-            for (SigGenTestCase testCase : SigGenTestCases65) {
-                myState.siggen.invoke(myState.mldsa65, testCase.msg,
-                        rnd, testCase.sk);
-            }
-            break;
-        case "ML-DSA-87":
-            for (SigGenTestCase testCase : SigGenTestCases87) {
-                myState.siggen.invoke(myState.mldsa87, testCase.msg,
-                        rnd, testCase.sk);
-            }
-        }
-    }
-
-    @Benchmark
-    public void sigver(MyState myState) throws Throwable {
-        switch (algorithm) {
-        case "ML-DSA-44":
-            for (SigVerTestCase testCase : SigVerTestCases44) {
-                myState.sigver.invoke(myState.mldsa44, testCase.pk,
-                        testCase.msg, testCase.sig);
-            }
-            break;
-        case "ML-DSA-65":
-            for (SigVerTestCase testCase : SigVerTestCases65) {
-                myState.sigver.invoke(myState.mldsa65, testCase.pk,
-                        testCase.msg, testCase.sig);
-            }
-            break;
-        case "ML-DSA-87":
-            for (SigVerTestCase testCase : SigVerTestCases87) {
-                myState.sigver.invoke(myState.mldsa87, testCase.pk,
-                        testCase.msg, testCase.sig);
-            }
-        }
-    }
-
-    static class TestUtils {
-        static void printHex(String s, byte[] h) {
-            System.out.println(HexFormat.of().formatHex(h));
-        }
-        static byte[] hexDecode(String s) {
-            return HexFormat.of().parseHex(s);
-        }
-    }
-
-    record KeyGenTestCase(
-            byte[] seed) {
-    }
-    record SigGenTestCase(
-            byte[] sk,
-            byte[] msg,
-            byte[] sig) {
-    }
-    record SigVerTestCase(
-            byte[] pk,
-            byte[] msg,
-            byte[] sig) {
-    }
-
-    static KeyGenTestCase[] KeyGenTestCases44 = new KeyGenTestCase[] {
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541""")
-            )
-    };
-
-    static SigGenTestCase[] SigGenTestCases44 = new SigGenTestCase[] {
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-8109bb66b04ddeddb48e77501a8b1e2431fefb69da28a572fc535be604e351cd9301291a5725ca7d7f76270174b0db0688bcb93ecfcf0910b31afe84d7f16ab5782238b7afe42480fd01964142f634d8d50924dee8016f381b69cf0e6f9606e3c2d68b0929c489a45eaecc40008d64ea69676d454115d8d2f1413962db5eb800db36210a246581384eca982121076083a609c4828089424511996c5c164c183669841624e016259334021b123003840920b6854c984921b760021666943849813442c8c84dc8820124829064460c5a4430828089da381253b665898290e0086cda86802428721a244c9ca41108c550dc868120b93121052210134a93a4284ca485914826d3480a59124e63944464223161362e52b824e1346ddc34511c084523823192c29084b89100c92819139294186ac326494224214a0821c0382c9842504a8884cac2882102865c366420080614b330e4380604a820c390450ca48d63062561946c42947014972198c2094b422dca06015b000cda468edb00659a18712448840ab1814300900bc84523010802b240d08865a31262213091598024d908081c89051a1502db3850033666030521c1b489800070e3048061a25058c6091c318244244dc444300b130cc8c401d2320a51a26c88226a01b4810015711a2840631629624866804202a3440d0a160ec3204d0212481b406ccc4611418200030781049588243822621200e2c24c1a19682224008ca46844c608dc288cd034411c03520c0050501082d44885d2b66d50088103160c22c964db2484c84290dcc801a3227254322e14030e189808c4385122a69111266402182a210172649240d844248420210ac9414b80448ac669e1c664c3808598020948982d01450660446424264c09122ad2b04c9c4691211832238841c0a66d41422a49a20022204ca0360120968c18a088dc142a9042082122640c2649d014048c90280300700c40822420229bb285e18651c0a86c94b0218822805306250800111212008440224028728aa60ce2867114354264a409c2228604385282428e103422e0c0480a968954966c20c87181382894463003104cc4462d22068dcc180ec400911291644a926c9ba26908b9411ab08082966d03026d9a16422244419bb49112a06108c71112b625010202c90862201646212731db144113152521c22199322c10832522495010250ec3844d4cc6658a24129b24001b020c91c4105b88710c44851b227012278d138871d31ee0376e3631e0a724ad187fe258ba1af825ab5c3a8bb76a3ae308d11580696408ca1d21d4591311c3d6fbc0744aae0431c7c70d40c7447f5b9f6530c21f965022b9919db9f553dd1cb74faef7163c83b219533d3c2fd3a8204b55cee8792de783358f944c2674fb79230fa808353907f1e56aec8c39e9e6e64f83b4552d76723f41d44ce494483113c6f63e3fa0a8868fced1433adb004b8cb502a9998671fe73a914adc2c42c64cf9eb2e77ae709229bdff22046d5018a5193c6de49fd45f15d151e1c0dc4473a9948bb5bbcf29489a072ad81200c16182b034e29654f9da3d35d7b1f3cb9bbc4e6acbd97836ec4787a8b918509aeb811bfeb242be7fabebe5bdef46aa405dfdf36811e1cf980acb00eb323493b260a542dd2b0b46a3d571901216369e58e855c18a6276db360b0eab396672ad9635bba154b1b4fe0490818b17039da441f055a87c65d902bfbc2a39e94729522b69d4e47c4122b5b19b87e6fb85a1bd682edabb0772e74ad9eeea2e0758e2f8d3e4dcec752e88e936bcdced768911cf6c33819a5a86eb6fcdc4efc375c3e0a21e49cd4ab4827442c96bc176de8b294daa0f41b8ca536e6e12b915750304a71a1b3983b6330289f646e98b3c7fc38af5ff63a988564d85f0608ae9937d2c425464a59150e83daa2d049c1c80205acdc18f65187ead4bc78fbf1416c00fe0960355649786d83520cc7e3f4779b212abd329c4d4093d07c9e0082267a0abfcd6a391645eff624e47137765df08c924abc1a52ba8f4067c3073e7b2d48eee5b366db9e960a6e55aa0e4b48e4695b880dceb98912a18f671d262703541c8e5e4bc16b9362bed20f58d5f5a1818800308b1922cca258e8429490ee4fa79ac5f654b67993933e983c5874d696a8aa46ea0c27113229387fc6679cbda800c4a934625ef3102032db2674b7123cb748521b0a67e83aa906bc52ebe7f222b118661a3980102711ff679e4b6242b9010e8a894ba5c93188d03ad8da548a9e59e0d9f1e08c27abb8027708eaa8899495bb4b289ab03f562e821a7b97118cee1389ca5257efd73cc53a5c5ea9d2588a3e835acb268159434c09923ca92f34aaa22a7f8cce15c800fa385f49a7d15772f81277a8ac2238fd34c0eedf75ed2bb6a983f45d27d9b972f4796923274c588f9d1e6366c805623255528cba1500c88870395207f19d39c5eaa80ee5bd9e776fe73017ca32ba0b0055da4452bd1f96a162ee32edc587553ea47fc3bcc10e27f9a29ef9deba54150032a2608cbe2ae2b8f597fff99fea769b76d090f5922207f17aac49355c756ae802a50f7f5f6990cdcb0b31d8fd6a9b4915d91f0fba752f8424c4aa257c78f2c378364fa6b6892efe4744e2d77d0c5f02c2cf7ac28ba757d96c2c26dcaab0e9f2371ce6e1e7111cc5209a0e053924bd5202eece6d4135ea05c76040ee5f2c195fd76b4dabc10eb03a9b4b36c8e0b723110b1a5ff8cb4bd3f0f49f7dd866f8803c84c083171b1a3ccfbf1bbf90b524dd69acdb9ee7d0928cf484f90d442b815bc91c6b98368bdfefe0e63b5e9039959e7c369b38cfc78a49f596581282f820609ea8e76b2a15d78fd3cfe70cc933af7e8b5d1b28aa0ca8f14479c6bad013d93df59e237ebd3c4f96be20893577b8e98b875e40fb96da3fd0b69b2c4a9803f92d7443db64b61c5bb8f3493b7d3d7115e97c83448a17170364d7342b19f7f1eb8a28907ae0dfc62ea5b17154d4ca3a91a3b61db1bed25dd2b9436925d4de903e559441a7cb80b464ad873227230295676f2ae7822ea85f30c88596fa988e05a60b8d53beda03e203432428bf799561186b1fc1d2c499daef45cb555556ed52fd8ced0864814bb27616171e95239d1dcb3bbbfd91e5e1f0d876cc6ceebeb8be145ee063ce49faffd41145db908b13dee8df37f8b01d1a800f10bcadedb5e8f663a4af4c37a0b09f9e0b2e42dcd4aaa901b6781f5ed8591ede5613241d67c71a077da204ce912a4db8d5d083e405abc3e6ec6d5781a9499eb8e2427e7a928fbc0feb403b797f1dce6c7a83dfba45ba76af2a3231d751bbc9e1f7d0750a998b3b39df2cd0fa485523b359b93ca56de28087830cf984559a899b0d55a9ef696cc60b0fb2217da1f7e57fca279b7a4d5e948d1cdb7fac235445950b0fa7dd9b1284fb09ae113ab9fb4b03f130114f1091a471f185384a0913da65c9153a239cf69e5977a387ea9a3f1c665acb9130e7256d40f8a8e029554c047ad63eb9bca4198b45f7b03e8cd22d1ab05fe4f30de749d97fcea394482cd4c2116870b009d1c890ac6f5099d45d0c37909d9ae58b0823fed17137eb7ef016466c1cd06a"""),
-                    TestUtils.hexDecode("""
-430B1F46E87DDE9A3D055A7D4D6AB1277B2DA6EDA642896412126391AA2B29AFD81C246EC839929F5C06749491DC4D81D58CC989D8500B6879E8807B1C3AA0B199EB599AEB86B344B77E3DB1AA034C938D80CB4BDCC29B31B710F57C7E491D99B71E97DD6FDA01A0D8A54C7481C2786F64FFC53AD358CF31C9C875ED278CEA03F2BF732372B19252BB9FA4ABF465FA2CFD1C08684D10582B410A8E012DBD407C5140D97CEE768C6D68124B2C84113B58C9A2AA67093B44CC3B6199FF1EFA6506CC28BD30BEC4CEA88411A491DD948DDB09ADFB92C40CA50E709840BC1F107E0CA428C111EC4505C5346E74AE4AB5647C1EB80F9C07092F8D39A975C4890317F9C0EF474110AB941949029BF39ADFB8E65CCAC0360A3EFCEB69D2BD805E4FC8D0620F8E039BC046DFEF1ADB03F5995FF62AD41352D479084EF3E302578B83332506918CFAD6E3BA701C94B0138DF0CF6C2948049274CE61EE0A64E756306273A02D68F3C405883F2F668820356812B2DA3A32B9FF23608DFA559183151221F83DCA18253FCA099FE24728F302C8B7808D7AF978299F3EB853A8BECDA46B8657598BE9ECE8A02DD4B25C593DDCB436B82335EF9C6A7B8426B701C66C9EBBFB3C8405A73881DAB57D1664F3AEC6F5BA19155D89A0A80B5D01C46BC79E1D4338A50B203397CD4B16ACD597A7C77C49917E9FE4B0D761065CB89C758498868B14BE2B6FF758745AFDC535EAA605C3F97648034D2A320264150278A7F1CB114B977C9D6BC1F29295CCCA16B23B7709D5608E4095E41D08B22AEC6289ED402414787062B0DA2387B6DEE76B32E42C51788B65E815E089BCF92D778F49A9707D37FCFBDF8CEF953A48A4201FA0173529BA360BFA6A77200F57FD5245146C2CD7FE8882670EE6878386D06036F0E1BA4B728CFB75806F05BA6409C514731B0BA8DA11015A63A8B5B5AB8C69703185191D12C5611F1407E8FFE3E50FC39C3310EF4091BC09FECC11D3AC107C696EE89F74CD6147830B4B3A971A0027747B62C528F6D858D1F9E67F59496C6B4E9E03FF0A598B26625B06C79863B5F07E265A40175E1A6D6EF3F900F3C4A28AD3E49D4D0B7E4ECEBB79244264474CCBFADA43FCD33F4FEBEB0F7E5928479F869D6A0FE52EB0CAC1232D7F674A057DEC4C2248934A40F5E2C9CBFDD53F71FC3BE06E48E13398ED426D8D3CC82118B7E8E5BDCA248380F4E64C427D1BF2384F60F6A07F01EE62AA1746CB143F26412547E7EF0E8FD1F2DC606F3643DEAF330D81CD6309465F9ED7F34D9B175FE1641D90212D4FFFB91CC300E7DFA0C555F7B35D2AF6A343D1467436EEC7AB95F2C34010FC99D66391377770A7DB8CD4D5C6BBF931092322741929F790E037318D6ADB74B4768C11F0E4674D18185DFB3D051725F93800CD38F58688AAC747F885908804D6CADAEDECB43131D75B18FBA2D4BED8D9BCC2156FB23F8F6378C622153EA8301300D0FCDEF1E2BB4E6F807784EA0171E95C372EC19B05A6C7B8DECE7080A057D29CE5A445A83410EB83B174590647424736A3B6967BCDF8A416A51202CE3F00E4D97DCC2C48A78D12CDA98E94A9BD6CCBE09DAF8085304F6911ECED3547DE9512461E16721322E4E6233BC7CA360A9004DA5AE064514603EFF0DF4E2D8EB04E9574C59F3AC14726C10100C688203F4960197CE696730AD7E558D7B939E3E6E7EAC4E70A7F6AAA80C1F1546E282B5CC7AA193213769B137C7F450AE5410817166F29F2E4E7E962932DF282A9F08A1DEF3E19C251F95611DDA9CFF4E2FED873439B45F8451B9AE06C6B2C698778BC4C742708BDB54CB35B686F0E7FC856CDBF977AFB663DFE44F7FCCE0E0555BE81EB28984BAFBD6FED3F0182F78A1396AF7B7081280864E5E4BFD7C52DA28BB5DE5FFA211678D13D41BF825F4B21BE1CBD29719ABA341E7B0C3F101CEDFE2F709E4DA4B5A6D0C021152AB546837024F4DCC4C45C132A038315A0F1D69AE768F70606D070169AE0818685C4BDB7341BFE15AA0455F535766FBEBB50875246A6DAE86C7B9F6F3A9FE01AB9928A99C13E6628431D41C1506381A63FAAB57BFB3B180F5D7FF59A434233EBC5A659B71CAE6970CC838D5FB638676216E3B16E8BA6C01349A7482AAF32ABD17DF7FAB8C69789F0194022BC4E62B6A6AAA4CDEF13B1E3BF5E1F4FA69F82B1EE3FDCC16DDE1106E3D2C41F6E661E33984DE7AD6021EAAD3E64D8C9CD7B5CB538AF88DB82FA048E5705EFDAC0EF479827EDCA0255BA60771A5EBC716C690CD3AC840FB6FF462063503D68C199050BFBD64533D94E093A47658822A25D54CBBFC689DFCBEB1DDD5BC6190B8F02C6FF3D001AC63729D35C8C50FAD3DCA2E67C5CCC6A8799420B159C7C5CACAB958B423964C489DAB1982A4E2222D700BA5AB772C4A11A44FF64018AF477D054217EAE28FB8E37595941FEE7AF87FD44960A144DB0CE2A44B33DC79B1EE31CAF80DAD620666D0ACEA76841EEE6CE81C6FF1F6D1027502EF89F1595065CDEC19B30E4B5314EFD64031B3B9DDFC6C95A4943247ADF7E4C93350C241ECA71260A454707B84017C5EB7AFFEB5DBB863A1CBDE0062C662308A2E824CDF6397863EF78F62319E2873B506F8A9EE82135B803025D962E609E006961EA3F7B67347518E70D9273893D79530F67CB678D6A8D28A0342BAF904BFC0A69AD575CDA4AB73AF22B52AE5D58372E0C26795CA96A16B8461AC61E6F68433ABCEFCBC16B857A89C475D1A322D34266539A17D485B8FA356EC3E154D37BAFC4CE75829FBE8BC823FAFF15A49F847C286F999A1F2C12B03E8F8A4C34A97588D91971279FFCB100EDB943E636F78ABFBAF88BCA5C55C935F6147E51BF798267E1350D2F5E3F74B339F6EFE86208C5BDE149C5B71056BEE748D06614AFEAF6DDA2A6EFFBB56B0880AF9B201B3C12055D292E3BB556240DD031C29A67BF244F59112BFB6865EEEC1DFE1CDB1E27F0A9E3372638FE4407099D0E54E9A188079C8BB9470BE6F63C83612D80BD60C21B251B64236E5CAF09A11C12F1A5E94F199DBC7C9E394C0B0E07A583E707E5241B8FB33E39BB26C31929F39316F4FDE206493566E17B51CE635420493176D8FD353206EF87F0994F039DF8F008AF602F50D7F9C0051B56227F3A2ED20B29611219FC4376234EB900093A81389ED00991272B739389F1F978A92A3E41F0A28985D697C01240875AC46A82B2FE94004CBD7B1E7594AE38A9DA0E84FE7E122482BB391538EB8E85AF9DC022CB32CC08FDA7A95165725EC29A0F824F97F0251BE636B57E0791A7F50EE190D45749472B29A674239AF95B373A40A6E0E09C674071186B125EF5AF72CB434AC0AA990341F063EBFE30963451491474B603733959A23A6D5B8A378F15A5A5B9CE4BA44BAEF6AA531AF5097ADE73F64AED0A541784119665F548FAEB447DE108AB74A74893017F0A1AF84AEF0730B555767B0CF6AE502E7693374D2E01C54C64E411AA93C96DC5FA010267B387299D4376FBB190E1C51A560871B559FC800D82ABD119A5732B50270BEDBCC8A636E7499149AE0E47F736FDB71EBF1995D1E8BDCB0EE96E732E8C2509F98717C3D174C78A4A2BE43DD89195408CD300505A219305809A1BFE7294BC2EECE6D98C768A8A1E0F74B665EE3D652AE8E008EBBB11F0D2148E4E5C93D7FE0190D27B3EBB7D2194BFBB624AF3A894CEF7AED571954D006824950A981F4ADA72BEAA0D820C5DD9BD519D39BB7915681F266DA66D49BDAB9E55879B953A7332F877DC5F5CC7BB3C9E1C1F2E41EB55EFC02A450B5142514F1E06D43E48FBF5DC80DF241169D5936432BFE9BE99DCB17293CF968A17F3111C884635EF2BEDFC87DBB80BF25EE9BF57B55CFE635FD99554F5FF2B4482D1948BD282FA282C48C0302348982E30A772BF14195CAC7FE39F836E6238EB1E1FD074E63B9AD0A8D37111087E47FE5D04B62DEB496353457BC76C53A2FC9D5AC9AE6A47F632E6D45E08786DA128464FF2266BFF92B5CD89176A19226F2EB14CDEB331C497F1836FB6C0A117ED6BAF95E9DB8254487B0DFA7301397AA29D95FF2065D851BD302B747AB47BA0AF408B51E4BBBF042ED1B2B604EEF4C266FE243261515778BC9451A8DFB025FA3212E868C3A078C7CFF65077DE94E50ED90A259FAFAEB398A94FF15C838EFA7F49904BEAFCCECD8C9ED4E014EA00C7AEF1D437DA306E8B7DFCE536912C169BAF0A3B78A643D6E210E5550E3B2BAF7EDFE01E721E3D05BAC1378EC1DFDEB2E2AC0F0BC368E0A8CC64F375DFEA2FC20CBDC515440FC2ABBBCEA3584E103BD686C5403EFE376D44F5242D35C9F9D35E1A869FFCB6657823EA0D4331ADD5CCFA99BD6EB3494A48ABBA7B7ABC32ACB8FF00512E1B0AD493F579898847E328C06FE05FE282F8D4AF48A1AAD0495AF1AC7354275A6D45AD5A7B3F6787F893EA558BC5D4ADDE1F0D265ABF73C86550D25C00821C3138B385448E3E02901E2E6EBC6A0F211CB6F22F8F865F0DF3893B987DD086B6674F5464ACE18B9F0EAE948667B2FC04FECEA3E2B7EA6B869D5F66D02D4DB124A59621B96E0DEFBF99A91AFA0CFD6D5A5968E62EF42B4C8908C3719BA0254929A9A183D50C566CE4FC970E047474490FFB07F576765AC5286B2E0FDBF1EC56A8AE8E6F560C69614FDF5C89BA53B8B7189E6388F7CDF7B819F78F3E6EA54C40865262BD2C8CE87284FEC36E2E73BDB8AA9CB5283272A90A6BBBFC3F7FED5F124E8BFD770B6254CDC695FBA0D8627315370E2CCDB89BCC84C96E20805AAF087F9E9BD1A189F4C6D66A6DC3FEF773788B3B57EF876CFEAE1F2C876CD239BE3B8A94F21350EDAE6C269698CC66BAF90B3641593F96399C71B2ECBE50F61B5D6F37D47DF702A9B9E47BED2824DEB19ADE7D7D8830A8F610088CF4BD0AD22A5A4FBA767D01987688BE710235A74129666FF7917B506A18E6B5D6166E8B682BE6B1946A4D4420926FF8CDF2488EABE71EFA7F2536B9DBEFBA08BB9E94086F55B1B991E18E6023E6952D4A563F2420A1536A1EDDE119E5779223CB712AB5C0BA4F0C176830FE523DD8603F1B316E128579E65454C2BE62C922C1DFE09DFB47D4497CC552AA9987A8BFE19C44E207397204686C718A0936145FC102B8A7111F74A421226AE016EDE658DE5DF9D3C28A247A87F2BC6FECF66CE7A6699880E0871CDB6F066D2CB3F9F625DC5E80751DBBC85982982E2EFAE3AB8F4F1EDA0D13C3B65FD2178E8AE4A712B521B7539785BB058176AB4396E6EFF2FD9052D4C6AF17DC30F50630233C3F05C62E151EECE13CE124E58A25F0F3AB65033ACAC9EA6E41CB3FA435D367DFEB0B9C9B37414CF32DC85A3C43087A578165C86D100E47DBA1FE7061111AAA961E67ED057C715974D3144912A58B6DB22D51BEDF6A8646D810190D91B61F0776DA00C8B0BAA7A83F4433F357E758F5AE8F278119908497E717A7AD25B09EA7C76B306A9A3AFCD9AE6B4F64016D5E80BD3FBE2F5EE673A7459B03AD9356148EA83461B66716346DBE85678C37C932EBC53B033A3F46DC28219880CFA8BB5E15F8862D345923BBC179FD763A0F943FC56BAB69F26C0C15D668BAD923D7AE6B35C07621768F9D972E2D6F46551D45E3FBBB577D13F01E8C1AFDBDD2F052E931C0529380F290FA1DE8BF5A11F82612943BAA2C0D086EBEC84069B271AC8656883F686C67B1808E27C860ECD1B95FF6CC6E6A5846DA29992CBA450081B8C37DD4911470EFF281FE94F10636A29B790E41EA6A342A5BE79CAF575FE9B0147F2EFE02874BC8A0E136A395B42E77D9F18CA4F61501E6C1805CDCDC10D0292593481F7E0F93281D0456EB51F6ABB7C379C028890F445D9FAC0D96AF68CDF6CC879A406CF2F0991916B33A72A193CF170B45AA079DB1BFD4B4126FA9AD3ED13FC98CE4C6C3C30923C8C53BCE1812B21BB644ED3A0CC0596C60032FFB1462DF5182528553AE865BF87FB7C7F61D1FD8E40D830B8D8F54924EDF934D1EBB88DA90BC59EEF1F6BF9FC2D17D8E9E0E39FFAD22EB84EFF39BAA70447B124E492D760E55D6301DCDFBCF9173FE293AC4D6CAF2E1964B32973067EC76BBECC65113C1FAB85375D92CE1436E1D1B205A88202B304264620B282E62CAAF5CFE1169EDAD9459B15BF0060C5744A17460F9FB164974CC55B3FFA71AAC13437BE58325E5E27E151C71D195F886F5630925D441A54695DF23F64C6BC3B0CA83F0E88D01BA4DC748A29F42AC2997C2A21EC258E430032C09E73E73AC2B21B55E1DFB2DBA281426620A0545D2507D1E96A3778C780FE77F1DA3B615E1B0D14DE8729229472E6619AB3B67CCAF21CFBFFD1F237E780927F147425B2142BF62CAD6B467A10F7B3DB922F095A0012EC179C4F8D5437AA8024F13A2A485E8890940DB69FB719B94B7D2629D277B593B94ECC744AA4CFF3D33D2250236C74DA057496BEFDB961B89BD6F44D581AD7A28524A6AF2253FD27530B7FF16FB5804FCA7E44BA2A3AB85FEDEED837DC130F533E8215B3AC3F584A2EC0E9B6194F97741EC050576E16349AD852DE8AAE2BF83CB1894107299F101AD5A2C05EC590B2CC698663C44FC0DC7F893F42BC5A2DECFF2FAF46CC1C00FA7294A0184A85CDDA2B1F38A89B1B17EC08555D082411A4CAEDED562C9FBBC1F512118EEC3BC931CC91636461151BDA454C4F029E01231BF170EBE17C526F3D8F705DC46560642B1AF36E3B401325A6CF59B88BCD4B3242D676FF4066E4252ADCA37786CBDB340DD81C5DD0540992F0B142C5A18D3BD1070719AF996E3C3768C3B234D303E6E9850B35C7AE52496C76106D7CAE4CF8ED01767B6DB5603F339FBAA019B08FA35E3DE1129A6A4D578264CF1FC8A1DBF218DD72B4865214DAA795A00505D4AE2B85E90F589065D65FC60CDD828007D4D3A4C084C7EC159C5D86817860CA03545FF74F17AD8570B2ADA55ECA12BFAB5C10067A086A34A57AAD8694C953137BBE901F8D3DEC27DB5DAD2AC96D56C312E25FE48BDC889373ED252B4F88D32DED6702B58D35A1FB40ABE2F2ABDE21CAA5FD0F67E7407A8"""),
-                    TestUtils.hexDecode("""
-d3bed8aae32df74803b6961baa9a2266122e26fd3cfdf1568b460abf5ebd475e1764c7814c6a48cfd6d4df272ea9790c8ebf12fcf5836b0926d593e90828bd49ebdb997e79b79ea68e66f48dad497fbd3a6c3e317162a3f46a4dcc45616be6cefa68210b11fcfc9a906945d30297d1714ad28b1fc7b4c6cec5ece1f5d20729918070cbfb25f285a6fba5e195d2dd75a8c62f581be2d75607b5a8740dd2339682f31230354ea03d0e7cf945f167937592a2d2dcaecc5cb0d36217453809886151073e5d15e6bf7763cce81da19738be3a3bfe96788a56c47d2d166efd18250ad525b4e9e5566c19287ffc277d26a888d0b1073242da5e92b23556552b841ec3355e14173090649a14cfc0134b7714dcbe52095d759d0eaecc7d26f3f12494e4247435d5a6eaa9957aa503f710f8e2844905664905de2f30285e774b46270c58f45d267e850e1a6f711b00e5153040ce090660c97b14432c27d0dd50c0585a8f4c4e1e15d2888a90c184508cb400af2f5d3dc0af3eda99a5e97d0836d079eed38aa6e3e4f724cc63adab509ea5f28bacf3181cb7617a3884407a274824742623eb441ffe1ef15bf6509e7b2305b5341c7a3d73e5dece5b9ead5b99f7e65169ed1673bdb925b52a6b8d524ee37e8538e6917327a8237bfc3ed3f729cef6840e75ef1cef707fa10009e4d5c72561eed18c06e3be94c579f6629373af6a55019c3faeed00abc22deabc59dcd87ecd40e9dc0a5f4b7fe1d711990fc8c03ae9fce980450739c0a441e3512ab7602038dbd1352fe0da554176a58c47c29111eda3d2b9560b3fdcda292c31621e22bce8695748fcde6c81a1270a1944790c174de8a18a505543b459932c6f4228a00984166ddf33e981c2d3ad2e3cd9ce87aadc57e1e437029223e729a99667ad87ca718db5b133a930e73dcfa2d37ad7580373da272e54f62f3d13db9a4bdafb1922145a1624fa96921c0b6bb1b3d7a115ee58dbb2872db79f4d38255c11f160397052aae3ec34921bdad97da72714f37eed4765769e996e45974961e7439352445147dec09b1bd02a776c2c22be612a723b8711f8391e4918a95605fdc866ed64cff6cde9baec4eb42bd880dd0265befe1a33f4d2c0900627f0c7727228aad47d0922caf2a7c86d70960ac2634cea63dbf5d33af04cb149eb618f9ee97adeeb0df8bf599358a82ceeeca582551298a63cbac754b6975cebf7d6e78b6d5ee24dd6c78b51b022f857e230fab176446cc2cbf6986caf8e76734f5280f463641bbda5137fab4800c58f0e1c4dfd45d5813df3f917666bbadb3547c7381eb33b00fd569d58dacdc95a25962024786770aed94d97d4682f9e94d34ecf09e9269993f547901d0120e5e969e3f12a5ac219158750ed0f381dd72a91ffce01f2b612decbef0fa5441925195b813e1273dcd9988457214c9cc503206eb4756e46f900cf2011963e761e12a3774381b877d93aa1c7892f512fc0eeeb225ace5dd7816b919d1717b6e4a34dbd30171a1d036d9ef9d37ab821bc03d881ced0f2aa94eec2fe0b1ca72b7049f749c9e86ba4ff44afdc90931029fa59538014c519f76264a2a45bdab759da02761303ece94fdc2654cc9c818f4af979dad60a9506dd381d150a66e5b0fbdb6e734404f4cc71e6b4e7f5690556d28158cf049f8ce6e4043a82d1ca3c15e480ebeb7e211b2fb00b4bde2733f03f9cc705038050769f9aebb5a1ffc1c9e3d05132ec1ac7b55b6b3b127ffec67cd6e3a1649fc9313e3625c01ebb600c30f622f8bccea15d6f0388439fae057fb1ca54c7aaecff7b1316e74273a2c66037926b246626ea2321c311aac3b5b907e551d7b03f069ae354ddca45d1e5ed3023c576fdfd1c1bce9d8edad78acfde17c9e4d83ba9087d889dee4bfbcd8908a41ebcb4738861abb6b6d8e65251dc4b7c26de398c687b30efd895069410e58d7bc2a105640866321a83dec80ba7b47cd64b002300a9fdb7e7648c2d0f9784ba55f837904df1fd1db46ea82802d4c3e925d4c3e3cde9b9b6063d303d410f3e917f10aa0a18fde5849d14d0a79d71a983f9b09a41e9a3f80dd36e46bdabe65a1d40d7e53b94aa9677561a549aefd98826cc32f6dc5961714d9cfbe913dd3bc68b8891017915066792cded38946c0316fb0eb6d89c10b84df01e0f910a9ce8fa1cbde71edb210918562910cb540d3eab21c8c8e43151a333c516239370ea3dd42294712d6cb920b1f5469e74fa82d4bd7892cec246db13f3f37ef0e980e095faf06e5aa417f5e16de83c8c1ee5ba8340d10785e1b10aa7573dd6f77fd87eab89a014449210e285fb17d0ff7cc3a2c61e6485c2f2e81fec821abf0c694b77f71a91790037d0f141cfb4a74caa4125dfd7236251526a44d4ffaba4589d5237fe647a4082ccd708e27e82bd28597081fecc184a5ecb2d19d115acb18d9d463e3f642e2e606d3f6d496fbbf19149ccac758dcfe8eb53378b65608940925c23754e0f1a390d520f26c4cc088c091e55b3cc475565c0d166265a0396c50d9983e3433bc5527e9fce7fca2bb408b39dbf96bc183c3659f6e8fee0f23e4230c0eef54ae9581b3a38436810accd7c37e83326e3fe7ed1821393a11127027821bef0b96f58a66968271915c1cbcdbcbcd8c62a54bee08b3cf143e859564b798892fbb9c430a6645bb4c8a2be76c37afaa67b7b5a621f987034e88b1608de8a0a09384d85b0c2c872cc2a9f8ac348c5f864d28558f6c6e4523f408586490a78ef95ecffe5b8fdbbc264944869aeaa3ef428d5cc5fcd363d1003239a6651532a442935e674e3cf1aec6f8b32e32db762bf2512efe763c88b9bf4413ea3344835b96fdcdf71c83afd75ae5925c3e76b9afb9fdc72b17f41ec516ab23529e73b9639f5ca42457c5afcc0f2add498456e1db6b3e775ce48753a9a70840c45dfe7cf396b627fad775acd051829f409bd37046bc4cbb57938cb490891c3aa6a04f60769e04685ac1167c9de32fb20cf43f730d8d09b0d74e7f80aeac659509d7941460018c38eda19de38967fee38f7e9526babd21ca1be031dff0591d765ae30361fd8c2a33bc1dded2c43e0e43533a55e72bf1015f5167c8d6bd5e6a19cd4e2ff19f1d47cf42fc361649a669e4524c731bfe7bd11c2e4ff599724de173dd6990f30db8d3b2084d2d3aaa0c0d8b648667b951d510480a28d40c938b71974d749e62d88cbc686eaa31e7f89cb86dda1e778a167610e7bb3cc97cb27f37ef9121ac1baec0a10b40211cc314b02b5df4274acfcd13de277e470b63c0f0fa387dced40050607517a979ccadff817383b404b4d627d8e92b8c1d8e9ecedfc2d344c4e85878b91a4a5aeb2bbc9e3f5010611121a23333a42546d6e8e909aa3b6c4cbe6ec000000000000000000000000000000000a1b2b40""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-f7dca662f79909c3ddab57a31bf75b9d925ee06460453ccc8687ed15f17d9b3de688567d9057463268b74002ea5a1ebc35df84945f296a52665eb737350da32513ec98468356bd8519b3518b104422594072d906b1e37392310e089acd08eadba8e647a2bccaa8ab65335bba2d87e7ac2f1ac90996724fed92021ff93acf1797dba20442942de3a04824454521350e08858124186e04334562082a82b451598451c2020842341218878510c540193060ccc071011492218320c0a21022182ee3a28021880024a7050a9631dc2832118471242430121866d0800940c865cc006911086a23c72dd8c068103028d9040e144029131989a4468e139268091492828630c0200648142061286d00a61013492d5c302a6044681892880ca589a0088691486410463210314044868dd4c228539489422432c49650992831dc3626e0b8311c816d0bb404233291a29491a342711b838122a268cc8845d0008adb4872d99229c12804a40200993401200571e0987014c34cc0026148166824451190104c8980858c366894486422b6700b2324e04626241192a1900541146ec906520835828b366481462cc9106218098e04b951a4309284b628a1122a0c43050b28850b210c5c30501900811c096e83964581c28459b80414858d530031209130180664400802243904e3284554280452325219312a133364c9a8251aa2680a28229480600cb5054ab88109a52912360c200261031142d89251db062119126212a320d9b24d0b391164a20820374c6498908b362ce082290c174063246e811828e388455b20261c264508162288b0890113008cc69164146c13c7855c40852225294b969123a0886184110205888ba41144182259a271cac00d491081d8b229cbc02480a04c4300424a86419116100a976401850d24117009216400924048440ce18248031406c9004a110886421465cc9090d1424c124370c342452180281a150222426590248a613810c28050e2b4259b204e413281a1829193184d981244180684d8a26592a269d4100e90a2241c0541604409cc102d99287121a1210ac2610399500c156d0bc72919320e1a86699a4249c948064b2668492840c4222100400a03c67164b091c0286901470dd0221011a12d91448488886c084464ca0662cc384a63460004396c23c1650a090cdc06325396800242614b3249cb282d44385004889121a48100a78410476de40232c9282519077183a0691b23224116091c088080240147916415573a7a76b6e004d7d3fe8a894ad12949d2c0aa943f5a7210f31077de2af8e27d10ca043ddb29e828db0c39953bd50fddbbbf839d5e242f2623aee99abcec0edaa8893b5c79f1a68387d232995823eb46a1968173ee79bda6e849e254b0e5c63499b9c8e07edf0bca6f0436a4fce62b7d57bd80f49fbf2b7d4ab1bbf1ed004950616ab009ef6e935d4447e287d834106cf017746340e79c317547d051a8026a31c8868bdfdb6ee50c1645ec8e0aa9f716f42502d9eead700f29a60058821504dc6b0bbc9512e1af92ec73b7582676d2ac13f2c9cdfea411fca42f2fa5d286bda79ba0739b0522e18b22d831fc29ea101e835932861b705803a2abb60fad2185c076a8dd469dc8f80522fc546ff0226f8916bade8e2763f3182e431482bec626b2f18d1c046e19a11d79eae753640ffcde6345531dd557c7bbbaf8b727aaa3591abbedbd5f9afb8cf7ad0f645db4de84d91be8b52cb7a407624a0b13a2976f42aa40a1a28a1559be8c539df3d8124c5c111880a8aac2367c312a8914fbce07838804dc956763147fec591eef9961a9c71f11c71512355234c29b65d8a5b232116dbdcaf72d00c78bee6f8c5508b83b4981cbef5b21430ac2bfbb892817254e20c5c3d7611dbcc101b4fbaccc4856b37bf06fbfb231c587ef281cd7bb99f5bb2ac8681d05631c61c3e31f506976e90a130aee0416fad01b68c760d54b5f63231f3d118f18b4d04f44c255d95e1f8bdd7cae7ab36b68c62a353a8f85d70b6f78a9dd7429feaf4626204cfab0e267bfc9717eccc4b2a2849ec803975b1237d01c1acafaf02bac8e6cb84408c327de940107c067c69e481822581056162531b120cdaa067a7d65a3a47a7ae35f507a9c519f7be179be822b1dcbb8cb7561b9d7822e936e5913dff73c3c02f74e419f8185661e60ce39c411295c346d692def165c38ea53b1d61b08f9d6830fc3c13f0b8edd1dd56b1cca3c18248cfb43313c7f91a5a7f0bbf24e0c0b26093eea6779d93fe128cb19266968bba07f75eeff77ef02b509045d08098cb00af145d1ab06a4e8065b9ae3c208a1556237bc2a269c030238d4fc2e0661c6b1cd2c1dceaea81b837cb4c7b032921d8e77a2304b70d1e9b1140a0866284c50389f581c5c733afd3d18651d84c0717943b86c3c8438defa777f0215e270c94074e1458cba5e0e51d3fef04fa3c51b150068f8daa4ccf533ecb075782104436a1333b2d9e71add8a1684b8a98d5050b62a56df930515cb50567d678cc782c3f72599a8e348c753fb3eb1e01c36a74d3e8ef8c82d92cbdd9f759fee568525f5d1b509907737b595aa2f77333b499896a877ed157d230c765da0e0597388d98eaa4c6a49d2147c5fe963abab12ed3e00fbf0e09982e7c15651ff87b3b11596a95c320e495277963dcb1e621bcc4f6dc81bcdec747a879569c1a99f23f2613e781abb0b3b330d5271f25e780560fd5cbc06f859de47531b1b8ca0c6b60b6c668b59decd66a395e6f6d7b170bbda9ad458b8832ed1e232de0e8f973af0f0e2c5e902c7253f22310740cbebf1830b428d5eea36734db9a83fdf8ec49e91c01f0edeffef4327195516e2dd062caf366209f99802efd1fa460b6122ae840d2ae809cfdd27eb403f4b6e26473936cb11fe381caa01ad7565d682ffc2df5617d16e36cb1debcd2a6c42a2d8588a5186ce7bbfac7ccda8b00b32af6e265f7b9dfad36d0f98fd5a70042f40c2e4649eadc95f147122b437bd91b3a0749a02bec4b0f31f2a256a3f59344d192934a4c41bc4f02208a967a096bf198e9021de7aa8bf646186c1c8e42917c1b6ba03920ebe1c6eff205d027f7ef7e4f8a17e87ad83a7bf706d16115aa66deb41bc486d932bfc14b4478b37e104467004ea19e5d91a0c8128a0c0df11f7e76f7febae4368dedec4ec34eb1c46a45d671850b95340e6fdcc1f69fa63858f5c9e94935431f0681d2a81230e44675db413a8b475a29bd1102febb27ce0a60f265b767a91f67a8c7ce172694f933c856b3f0c4f4a5362222c0fbeb16ddfab6bdb62293ace0224baadd06248173cb6a3c3b31f0dfe2969d42b28cabf0600f220fdfdfb126b459f8f9b1ea285bb7b2899b3352a452bd1ca3b807ae648d2fefe4595537f4f8f285a37270b96ee31f8381b96a54ee36df081bfab2b518d6cbb0e3848bdb8ad4b9bc74544de21b5d4f04a847cc88076ad7124aed1ee2014ee352b69373f2a300acdcccd58c622d55dcc95672d62bfbdba992d1c8db3b686856742de083d664880d9804b7e71002e1b76963d3d5e32737db07698dd8d67e1b1c0d89f37d62be3dcb27df8aa39a12060060645486252ed"""),
-                    TestUtils.hexDecode("""
-8F69A33C4CB9627BF27401D4A1BC131D28AD0E2E5A317CE983BA2CC7465861A414FB72745E4DA31C0E04576DFE0D0EE834A1EE323D5A0901DD0189EFD6718049E2FFE1AFA548BE16E04B8963325AEB0CA90238C7A243A3F6AA17BC1D63836898688AC8E919B8EB6D689075E050B4189A1FEC723E0AE8D4AAE9FB6790B527A7552CDA174BF40BF91C4142B076ED8CF112A871450AD994737FD5BCF513D42DB01906636D42C6C10B64F74BD37D68A966DE0F3BBE6541AEB9991DDD0C0070F16715C01820546A014E66D786B8922E905DE2BC65053C42703227B7D8431427E3EBB0DD010DC58C2343147700D673D5707160F234E35BA24516CEDEAC77AE15C667AEFA8E029FF14F169FC0A781593E11D42E8659DA8E91E53EE0A1FF15A3C203BBF9591584A99FF8BACDC37541E126B8CDF3503AB2D1BFC0C37F38A298AB1DDA150288A8110C052469382A9A4F5565778339AB327DD80644A26B218ACE0830E56813CAA658A9F17826CD12B815612BE40906ABC89185EDDFA8E05102842CF27BF040FC7B396E7E2E023CB86AB7AE25F36DA6B6C0842126658E0315D6D8F4B5DF38CA663B55998ABFC72FE9B7EB7CE3BEB72AF73A0B2A45577C5215C42E465EECF4A4E69B6DDC1E65E0C1EBCA"""),
-                    TestUtils.hexDecode("""
-f0fddedba6482c562d0ea6791254b7aa34da8b70ca4f0a7cbdfb0e4fa31f902aa37484c4167f74093f5ebd508e4b89966aba03065194cfe3376066b848da8faf1768c397a0e3797bf09e1dd02be5f1e77703ddac9063901b52c9b4be73daa5d44da1a59510b25a974d9c54f8f7889587c6f69a17989ea8b69f4dabced9e23442f337d015ebcf84cf8c5776f4863275532c4bad840d314797e07de00a9c7fdbb60f83392efc382220ecf3f9d60b5594da6fcf00580df29a378a9cc3156bac8ec8bcaa7de1d8d48d2a1f33ea8a8f4956e3c46f386628ca96e009852405b6333710287e376aee2ee7c6f67b1adf07f76fec3688201bd3b152e202c192db41d9bbc0d8411ca019f9a1bf1268b34ce82a7c037fc63d9c63a561003d8247c645173e01c8ef63853e4451185d45cc2d5d2da4261eede504c6da88a55d7cc7bb8df33eca74e9f4b9f9139b9f98964aecc5278448ff9f2a032226e908b32d741037ae689c204bc1f3bc07850debc3fbc839580e6ae1fcfdbd62257ad64c2d6f6945a6757242d1473e64f089c46fe050d79a082e43cfe656f09d01ea219eeb7684188fe80ad59c4bdb57905cba37fe0fdc1b205f1a5a899ab55a37c7d3e003f1051bd3b322b37289df3d350053d6ec8ec1c9cafb49fe147c01f092dcdbd9ffd2b7900205334a077b2ad5c57a53410bc5b9f32930fc6f6a270d84d4436d8c716344df877f5e523ec9e1ecdd43ac21e2c4cb8706415be0ea1060c7127d6a327eca92956771af363c03ec4a0ccdf958bee76803208191946dea6e51a85dd071f3711555cba324e5a7d7459a7662fa6cce043b34845fe77cc651883c478d0d4b2c09e76bf401f0c12721d21357546dc78d2f054b409b6a702328d720023096e911144b7bb724f1d799b0b446954a305bf46944f122867cea17b9798636498a8393bc2dd328b0b3ae78b44ae35cbabe62e0f0d3ea4cd6db0bfce87c6e9fb3364c2ee27b5edbfce17c8df592882dd057dda81855abe0d0898961ace81b0ff22b4471bf96ce814a45f7c6b3e07ef1f18c9eb238b44dc6a50d7489a1af58d2dd1ea2ab2b1a0b4b661e55bbe6dbe9314e76207ec0a02edb2fe7e8fad8141401d1f1a80237cf5a10604ebd26ca46c0ed5d8bfe96c3a1d6ff5b7d2de69402d348e5db561e531deafe29b0767620d7613b817d4d3a6568911c291c3436b40043cdef83a8b7f527aa8e9ca89dc923c2bee6e41312af6ca1530ec7c6aae798e25a6a31ecd29f4ddd56d663e430e5c1ead28a23d424148b1a8aebe9ad7faafa4e295215962d294edb7b1f994ccf43238038ff1af9597d24ecfb68aad4e4d2be280c6fda0cb88b4a1b0deacf678857d83c955115c094980ef8fddfa5045a3e38e733bafa243a91e89a5676312db195f1fe7c0f7b0262628a68c6619db1fd85d84a02b9e7da8234304192aa3db15a294dc4e9e7cb32f8662ff0a49fc4309700e0dea871edeef3df09ec78c3791fa604ad69bbd8c211f136dbbfd49009fb5e4fcbb2c995bbe361c580a3aeb1c88dbb2f148cd05fa9ced0d826e24c268b741953c8ec804add66a9b8dbda05a9296201d0f447b45a4bb7271fbd3359a29815bedd33ae87b52bb270cec2369dbac94528eb48a1a66c129793a4365212f1cbe7e24c87a805ec0f41cc2f36bb2f2423ce6904406b1362c46d51d6d5685dcc06915636e20ea3649d6d1da39c6177630d1d48f393d7093fc12415e5789b15e1ffd07e1f810057ab6545b22b24a93f9af3ae254407f9920af8a48ec40412998dca523ee1e122a5e1107a1121cad25652c1e00f6fa115c58b4a7a60cb4e3b219d9828f2c8efb04a443717e73146a89fe1a4f887b564010eeba3695164704c517d3597ddf34dc51dc460773394d8cb4d562498cd127020973bcb2315c25ad136dafcfc0d674341045ab1de0e4230ec91d579ef1a42ad69892f17dd271e9eab28097f8f9c5e78c50c36c8a02f1625ec41132ff1731e3c59ba20cafacc9ea890db35b8c9606bbd5457262d0c44c4659f933adb64fc74a884e152627cafdb20cc64ca10ed9ee16d814b506415cd0141406b0286124e37f777dc810d70d4125a72bd98a2b73bb26173494568bec76350b2b3b399fde1e3c115f1fbc99929a58a8ccc2b9cc1efcdffd210d88ad48c54a48e837cf841c9f1a350531b695c6fa08ce3148682fceb9fd17f121fc1e3275f65b5a8cd93a25d42318bd21e94ea8873744f2ab530c58dd3bc1109a5c872e61887bddc455b1bcdddb91c0ef4437a49a9f6c73fd371bc6c6d2fa594f78224646f2b8cfee3563c57149aa3a6995dbcf0e6782c53694b39b8812dd069c0cbe713fe44446e44beb4ffe38072deebf3ccb20134168702fc023c4ddf9aedd387a8bd6fcb075850cf1f29f2bc283f5731b75b68169dda2289ac221217bee3e2ed479fc5ea8244a99cb27a015d7a3ebbd1f7acef07b63f17011c5e39ccd0c025d0bce5aed7c482685c39f1fd82a9b08c197f9cc18da457ad0ad55250ea935bee50df659b2c7a501a348b8759643881a9c5555015799adafe10130d6107e0b964b48d23c909e55843b62b9dcd1dd3b235c487968c2c3d87fe29b2fe3ec7a8fc1c1666fc8d2b6adddea39ad704cf5eb6c22f0a5aeb80e2bb04f6c2c6bb9ceadcdf7945140ba942581213dba8428a8c06155f200082f7faf357ffaa653245e2752787fc1598e000eb567cedd49b98d5e4fcbcfd5c4ee10793c16a4767445fcd16ce4201cdd005e95cf5a714a9e0f648673269b5fcd8ca0cc254b6cd2fb428075a12b7ab2bb07a5ddd82e58c04676563b11dfede4daf13e1362a5171364a2f556c36130c1eadb59dd966622f8b86502f379e0dddf69a1f73f58ca6867b4612f28e67c7dfc49dcb56dcb17a79aa0e56a08c14e1e909fd21d05003ea921ab717bae0ce1f15a74a71c4d7e6936d20c7e661806d5f8a5f4cd93ab6720775057d4c0450a6c9e2211af47c57a7127f59983d824d35f48848043aaf3e76209a6cb6f34b15e5099b2c3801bcdca3a5c626bec9b6e92a67189dbcdad0d59d2b30a1f9cf9de45084ed6d35e32722b6642ab870247b42eb8f5fe39e97709141e36b5888fbf496199675274d840f15f5ffe40d74be3bba8b4dc51425f839ef7d041a4232ccb93b754c524ba141c75ba94209f9e76a0d7c8f2aa3e126e6eae35f19de3fbe38f17143d1a83830a2b9b4c8a8b0bbac29363ea9ed0fb1001f67e1501b6f4d6406e2335a61f3386c9e6a2447e3249d3db8390158af9b7e57d81fcc00a4210194ef6f872821a8cc475187780d658903040b0c0e172030576772769facc1d3d6dcec001c30335b5d5f62656b8f96aab7c4d9dceef3f5051b2240435b75797d90a2c9d20b1b1c585d89919ce1e5e6ebf500000000000000000000000000000013273441""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-8a37e080550701795416f5587b977446898ac8147890840db53ae4c7a65508bbecd64901b484b1e1ca4764c26360fef4654b49d61b9b180ba16c6d346251b630e2b21822a4c2d9409a025868c3dea90b7eea36f9dfd34822ce07865fb847d73e1c6e9755cc9cd520d6120fc21ece975c4f2cbd0cdf71c565f3511cfddc2e711210192dd40664c21805c93229cac8219bc609d9388c20498e839821d390881bb58081400c000345200485e3400e489851d34468400025113051c1c821a0c08499988ce3400e1386690a022da2a051d8a2605b9611a4a8092293308bc4450b276ac91269dba648c33484d2243163246d0804660b234d4428021b004110a0641a0870c39811c4100164240019a46dc88811c306656342048c0040119289d3a8700037400cc96423896804119203196c5b120a1b02461c1428db464c62080ccb006de4286ac80621a3388da0406124123019c449e030521280642306888384281cb40c412692d3b80124117191c60d201110049060da949004974409332ac11472584069db1431d1322a243289542628809431e30891c8a84d131960082171c1326800225119002c51006658442d40b02581268c429088cc102d8ac68153442058a689d980485082281ca86c44264a5ca2686130641a310209b38048360e4a9285a2a88c02c6250889214b30094a101104382962b60dc830614a2205a0420d8a880511b09022356884062982026550446ad9424e10418408b5710093491cb6844342854b02321937410931502296655044618b08869b006a09262ed800412190711800091c33660b1785c1c04012990454b01081440819204e5c3466daa484cc3491d8143218174092342288281048a8700b190c91a0850ba771214022910241889808c9188ad4a64892b48ddb062500310643328964a20d82288c21304112394619218818156d51928562984c40a024633281e0022884b24d51948124295010934c18295281a22d60a620a2324a0a13059910880a083101990c1c102d8110054220868ca6080039115b2822d8c03004076623084898346289b24d483890db848d5100811c228c00b8240cb8209a344d4c4420c1988194b8694ca86512318d60167152820c0a012189142ca32231491824a106281a2904988450241160e2124c8b02812214221c316cc8442a12010c8c325121290222b14048a60508b201a1c2811045050336619b32220b8089203352a29049cc12900c124019a47083b66c63a8057a10b245a52f0ad7febf3d3801447b8222ba342649dae8395ca98831880c859419bf766393ec97f18e26b6e6e29718332b2fd9486ef5c149fc4f49ad1d2a2f7ff7397b44771f3e9d90c38232a6f30a2278527df3ab103a952fa94621628537a3cd9dc1a1b770e6ee8a62e0f72d187e9ba284ea8e264f5aca8d6ee3b566113310c813929129a04354a7ae12a1e0ff6a9282f776fe56b6cdc159da1f5dffd17631c84cd5fba7040450b924b93000317fe80bfc062e1f4cf7d991f5aafba5db5928850684d3d5c719355854f0ff74e42d9fbe4264e29f5cc74e717d5b8f592cb9e070b252f1514e3a17b3035f10168f86d688956a0461e0369aa2f7d3fd7840895b56f2c8b9bfe0347efc370d6bbcfe1c885c5c906934c1b188d3183443133273780dd187a066df1d1589457fe2f619265381f50bde9758cfac5fede514a2ce0861d297f1f47d512ca1fb15cea7d3a4582a4492f8a5c6dbaefe67c314fee1ffdfc251270f69b2cc654b2a77ec0219e85b5814c082dc618391d8a0e5b860ed1391a2bc99493ade19152c069cff589440481aebe4cfa286b9e15977405cfcf944c115a8866f88733d9fce246357652e7861bb3c9024e49e3b9efd99316a4eee4156422ede4fae9221334e2b4763bbe7fd7f88ef7f196685e00f4fb99d38570914e257c0f6b5da76c84c9590c418518f0825aacd131ccb8667abe7cfb428b27e4732290edbcd6f207609a71162e7eb4f9c370bab3de6dc0e531fa41dd63ce11c42bdeb4cd1a6b34ccefd8a9e78bf0fc924070e0281dcb67cef5ea3f4da04b9bfe85c622919e7de5fdc1cef8969a7484ee87bcfdae4d329d4627cda2a05a4334a1b0a326e1ea8cef839bd5317b7a2d84ba7737f4274e9258cbad6d07cd611a4276377f74b1f238b5fc2fef9bfa18c8196e303388fccd2a582b431b50de50a403b7560f31eb3b22252fc4558faa9a3a46e62469f0536848516e820c9c233ebfe1ace57b42937ae2ab801c5e9ab16b2dc06edfade1e86b5385e8b11a782ab21765279a5584122fbc8e85eb9d08106f8702a31d434e44dc780a05d2f47ea8ba5e999096bcfe20dcefbdaea955b08506fc3c7e4a912686d4d0ddd96e3db254f0585405ef8472336129d348a7c98be6ae4fe6e15068e76926018837e3d330bcea69233a6b07eaa5e0e773b0090c5068c79ba2457d23f7ac0f70a4ceef3323b5d4bc10b840b2b7a58444d00212f9fe767a00ccb3b740fd4f7502f12ff86c22aec43f1571c907b6e317ca9fd25a4f10bf5d1e839809742b0f116625735343f6337a77c1a9b63cbad92877a910830e0336010b8794f28f7073f5f7193aaa68f5923cb3700cd3283e912633a8e406067397e84788f067065d7f21a265c8ed878df6e0373c32a2aaeecf51d97418dc8cd77999191043263ea1caad2f23997e6cb400aa1fd54a968fce4d69d44b37632220e25df409fa2628bf17d39c4a2fa90ce1d39027177aa445a352344be19cc25ca0cab87a456ceb256d0928890f638d3f8fa046ccdad16b49ae0e71c9b9b947a5866671a029c8feb90a23e8273f351eb407ddd7dda03d30ddbe9750a05a6158ae14b84330ffb20666d17d73255c5bafa6a02d9bef615b9925aa716d20368eab7550328dd2d251d5a127070b1317ed7ade82e4d49ff9c7069dabbad20b2dbd9fab0978e1114f50f9ff10474906c3be4118103b8d4a2a576d5291685c37627a55fcf9187e9385a76429726646edb07ace3e02843212ef78f91dbcd9c54bbf5b6ad234834ff8647905a87afd41666fe007c96a2315c3595ee2196091c0ef5e0d1a3749d7957c864642caa2b52bca30fb62e455ad102b830800d1e01ef05acfd5677bbf4030a8800ed9afd9fed444dae96e85ceb9bede5b34230ba8030e887b27a907ce533ad40294cff8baa73483f0a6a346372172b095f435eb9acbcc2f6568d9f2e9f64decc6f0c584a71fa128de4a1f5d7ae55f7243fd83ba7449d4f5d1812dbfb7d1e49a5d027c240fa71e5d5636b07a4c0e65a168a0cb17a9fe088c86ad0913de787d2cead5930b4dcc2d097f8ffe8a04a078bd83ba6a6282663e0d821e432e3574861191aa82b1322441402120fe80fc5f60f05f4bcd242693b9fb89f0856af628d69a21d5a046395092c20c5860941dc4d129b7a2ec51fa56149112f0af7c3afc121ffe7caeb41370642ee8b4c3ad7f0a1970fdd0b37d13377a52fb4db0fffc71a1726e63dc9b914bace81506d320a26c8fc946cc68caabc990bf611e2cee065e55ff11c44d95d819c56826e61c088e24b2e01a697be804a8cb82be56b097039c57a854497015eddfc1ccdabe6cb7ac7b3989bc1a51ba9"""),
-                    TestUtils.hexDecode("""
-5DE75924D05BBEF6B34CEB195AE3349EB621187051B1EF95A779B99A3E0F729994BD19C7D1172418BBD3E015B20699DD09D8BFB0A343F477AE2A3BF5737AC994619D1FF3C13E7676D1BCB446289DBFE36E2D1508A3D437B4B0DA06478DF6D4701909B272E9070B1FE06385DBF8A552B471C8EB48EAE39D141009FBCC5D57D95697ACEB7B5231AB5976FFEC41E947BEACA7639F664C6C1D058505A49561811ECDA46E23B651F918112F38B407E82219B49E5C4E7C247DC4BA633C746B42DB912B07D56302FC5C08F5E0C3E311268041F970E670F3AD26A207701F1359EEF9D4134ADB882A1C899B0E4FFBA2C68535D97796636417EEDC0790FF808C976B57F0838A694700F8D75DD4FE5ECFB4B6A188FCB77FB1DF7C5F7C91DC81017A5E9A6D1EAF59680D3291F74743E1776A6DE31101FAEA31D876A0DDF3777A91EF1EA0B575C83C97C7A283E7E958287F5A52F30B6E70201A1410355B47210B911A7A4F6FC23BC95D7951822115FE410ED2E7FEFE08940B3F8E63F13F26B6E949C498E62A66FA675850FB9F7AAFAF7D054F5C12306ACF2900A5B66A29931A5919CB31D19304916AE41869CE3294B0F5F88D845A7FCFB57B952BEABCD1DF7FC11E2D342AA5A70A8AA9DBE1E6E66555EA618849A95439864DF6D7789D8E3B46C6FE4F33877F127D4136D993061DAB530EC979F818A57E1052B5B33D22E941643DE2FF9239741F6459A0EE28658C3C0033FA62DFF37928C59189A7A7E36B1E305F3E1F421EDF4D71A96C71406A0F9AFA5C96A9411AA1A35D241D7186E5C8D0CAE15938FF869897DC3B7D8196D64DE202108D6FB436FF89983EA6DBB5BC88EE2A02488E4D12AA87CC4BDF41A339E10300D32E0FD4F3D3136FA64BA90D64E2BC7C20BA77DA4DB5311F616288496F2FE3E7B3409879050FE57A23DB0344CAE82ED329B0D31DC9B7406CA715E3D84E364BA98F73F693B6E62DF4D741928D21D934453BD67FBBD9725BAAD34E5F3204BDBBB569251DFE2D69A9A96BAD90256213BB0747E7950AEBB4CEAC7224FD5F8F99A16866F5A1DCE07C2CD1E06B70A81FCECED0AEEECBA62521AA0A01FD7B5A3A8A14DB55AFF331E469F5138DBB2B96BFD0AAEE7F38EAA375F71759268546D590BA8C0C022F78CABC4E089992409D3D7BD19048D30B15C796170BCD7AAF7FED0387542BF8A6674F197EF994FF81BB80C59208A572495DE4E584B36A7E9149B5E2081A4DC162CF8376029231EFFB4B4981895FC36562F51DD5158DC82ADE52ABB0E98F4BCB3C0A24566D07686732FA734CDD48D03DF99F7253E589CB8725F17E6BF964E96F9827CA5A9DBD04D448025EE014EE1B5DBDA514D3FEE4F20664C11371DCB16991DA883BF9A68EE30D727137D7902F4839635B1C63F6C4F7D42070E880CA774680DAEF105D277EB8D9090A98F6B813774D42DEE922314480EBE562775F68ED180B67EFEB077D8B174C7D4DA877B0DD3698CF506EE382AE6FC6F68EE93ECA3627B28248D3EEAC469EB0C26BD1A10A7779CEA142958F9F9A533BDE974E1B3CD9B74FEEB2EE29ACD7DB65E00D7ED6E94E5E44A925188285166570727FC687AC7EBE4042BAEF68BC23F4B9C51BA5040BC6BBA41FFA9AFB1AFA09DE1BAA4DA091A08086128A9CA5F27D3F4420327C8FF4801BBF2057282D05D1CBDE60E1E6FB6715EC41AA9A852686DCFC47279FCCE5D86ABF02A6B5B57DE22B2097B12381EEC567E4ED1855F9B482C174D6D40A5825687C02E1D0AB634C020497A44E07E8FBB2D05280C53562DB4C90AE0901B88179D06F9F991E33BF17E7A9227A30454430CB768F56842995081520158FC34BF5257EC8EA9338B3714126D6A95A3D77FB61207154F6DD0041BB03D84D8F75E6EE910460F22CA765A2206D6C56C6E498E063B08B76B1DDF98571F492F9DBD3DEAE7D9C8EF21EDBABED962331F06371364DFCB3216E24638A20F77FCDD894FCC5525DD0C8FC329494841EAFD93CFDF0053FCC27F5A1263C7F4599C186B35FCA9C6F5F2FE169B00275F15447AAA3A823E27E322CA2316B25823F3A79FFA785E9CBC953815FE06F376B6F5860C6A87CB9BE98690C9C2A93EFF1BF1050A01C72CD521BEF265D66BC4B8ACE5736215DE59290DA957175D704BBEFB0E81C2CF906C3A579BEAC3A0C945409DEE4A1E683A0DADB3C4AA7E0174710C72A33F1BBC62A6E6F3EB9C138C0CEDA817688BCE8CCE523A2A4E2566775015F3BF66C09E716CA929BCC6DCBA7427EBD93B21CE276820734331B078558C63ADD096004B67E618D9E58FF3FEF00183EAA293A1DA2520BC03FADEB6A74B52292DBBC6EE4E5ECA8F8B0556FED36C2B41F9D8FBDA8EAA1F74BED46F05E7712E20E463502A420B6CE67D125BE999EF906300C627C57C468C8DD608F9AB354791E6FEF0EE63DF3C1821AE78111B27E57DA88FA44D89581D11C2C72F565A3D0B5E8E2D83DF178810075E5F8FD29E1953BD2C6326B693C5CF6ACE086673D69A67A181062A6ED511E0CF36381358C2DB2A394B05E0C1EE9C54B89C68E10857463F71A842BDB8429EB31D250542F88E6BD3BF10BDCA160C0FF44EBE7D0D982F15C4892091B4A69A3AE7051BECD1D2DB132599F1101E2BCF60136CE947F339A3DEF9F6D81E1BA3F5D4CF2ED989861F7CED86B1A6A167291CACA74C45BA7B5969C09EA20C4EB061D4CC4B68392AC866AC591764A16D0A42710645988FE070314D0859A1F022789442381EA0E3E83F5245272CB5FBB861C3729EC484D2F299F37D2F50688D1D8DD91F131D03207CD1459B289B19E3ED609D70D6BF8E0B97A75F4B4F1DB52DCA7AD03100A36C45D2AA221CD01C8A51D5328AE47E3307EDCEE9B27F62E5DA9EEE15B7A2FCFF1678551BB3DEAD4CE54A16C22119BCA343822DCD20271BB1518688CF69B566A123F65C4787C1C525BAFF00CE20C46C536E47DB1E4410E572BFECDD7904583BF61847868D7D1AEB1EA071EE15A9CB9E3EFF8D17A5BB7EE8BA83C95272E065979904AA99CF036BE085ED869D3CCB694C025FBDEE9BE140A0A21689F95D90D8A54DAEA98EE5DDFDFCEE2908E65C210F347D26F35B95B34642939067CCF04A098ED3E2CE3C0FE66305BB5391E223E43119D38A33672FBC980BEAB96558D3A940700B3CCA9D3AD2CEA08E23082DBF30FC08E94B6640CA04BBAE80091ECE96F128B37141131FED2A5549CAFD7BEB5B180509880C49FC6CB1C11E4CB7C7901C89ADFA0E5335C43A74053347D3028B23085647993B5844FB2716B7154D93E25DAD1CCD889EF3B16FAE34D04145237378D66BD09A254D395736990204A5627F5446787B467B619EE8F06CE664BF7B94392B5C77BCE828D6186348EA2DECA1CC84999FCCD95C9EC55E28C8C2FB559C9020C6EEB661F708E40351D7E530BFB7B1C3683BF15FAC5B17D1CE7EC5CC3C27E04889A9E59E6534C08AEF6934747083CCEE84FF2345D519CABC7D2BA6B783D36C864C65C47CA636B28B71D6797717950D652659AFA8BE3CAE4E269BD527C0425168D04C097DE8F34834A7D1728367F148524366F9E53C4CC255D3BD6FEE7B5A6CF459E1685FE740CC203EDBF58082820B967A40822D36BB4A489BF0CEB51387009D5205056387C292D584309076956E56926283657BF7CF096F54E0128A265050DF528AEED9247E19EFCC79EC301A9F38BE7AE5057456631840EE39E191B25F4F7070BB15CE2CC18777F7CBEF100FE7993681D4E965D0C19A68591BAAABE601BBAB89FC27B3C5BA83545AD645F0DB716C98D5C7A37E0AD97C986EDB88B025D25E3DCCCA816C707F0E2542E44F4D69F943E1DBD08E344F88661B68A822C3EFD648AA23AFFA2F533879540BE2F670F4D53091AF68867E7C71EDB6E9E494E9D30A1839653422AA8AE34A525EFAA62D3F5FF00D91F5DDF80FBDDE464A8502AD9AC85EB21025C0E4E2C2877D50962C5AB8283BFC823FB221CC285F3629056D1260AAF87B556E556B4C723D44279A106EE4075BB79773588333B42065811D671016AF177105106203EFC36FDAB2F5E5EC8DE043902583C1782BFD8BB772353EBC5CF03A0D869E5F3797713B58EB7480CF7B92AACFC9C41040BC9E1F5447F9852B2C5B5F33B5517F28A01D5435C47E063B41D3B0F7605B07AC33FF6F05C6FF44EBB70FD6E1AFC2A32C9A0B1AC17044401B93D6439CE53C3B033CFF06688E1933CAEEC48A04999A01956096339B5E44AB3A57FD1F0ACA23A03114708BB16803C2CDA679061B8E9808A2E11DB0957D4F73C8A06E6C50D6DA43E4D008ACA23CE2A3213BA0DAD20D5BA8B44DE5D50E188039C112B8A40B250E7E815B1367375C5698B61BD915A70096815479916F455B9EF837300908C5A8BEFA5157EB688EA02245AD3B309D10C769CA1B8E5CCA2F5FC66CC3920759A203C3F6B8E9ED10CAB20FA143B0BF0BC8529A4E89AB0C99AF77E43E68B61A9E4176066C4708FFAB05F3652817FC42039E2F22DE2058CFA8701AFFA894F3143FDA27AD85C45D3AEB30CA9759537CA4AF2079317CE5F4B5EEFBCAB981E42065AD5CB8A4CC9B628CCFAC18D2E637CB73399CE3D90A9060F88EF438E8511CE6F403A0CF14C6B641830983C1EDDE73BA27E41BD678E834167C718F5B1E2E6C109199F756905FAF9F0005CC1D110CE277DA02675461AE70EB6A412EC455B6575F16A4DEC0565DBC8F387D84F9D3AE67AB35E511657D82B5606A4DB45CEEE81C94FFAFCB88B8185CFB67E4D7171EEB391E9E1DAC625B56FED22D86E8A34924740F94A3D50CBD05B8E2476CBC7C54D2F742F0FD7162E7A138D4AC788E710AA45824513BEA162E2A1C1F709413942BAB5AABF7E347A148D53B8EBA0336D91539766AF0E827BF8EFF36389ECA38232FF2D7E341A3AA710F590C78EB69156462BAE9B8B73386F38EAC4FA26456FA555E26E7DF679983FEF23DAE87DBA66BCEA19A9F991F864A17C23F7CD592ACAEADE0E82F4737B70F0243F94F015B59330B71E25F1304DB3D8D7E2F96669BD7F8313EF9E10EB1EDB0F0BD94745D03C83768A618AD9ADDEDA7C1E6E134F8B7BC96B84652C982B1D9242F8D2CF0ACAD146EA3185E2332904E84088CA2D7D60D3E2DAE411171726B5FB6C95B3DE961E62474CEC73226E55AE7D9C7C534E278927F5D669EE6D111E325D54F338E2A6A06493D6F1B7A556A94CC9512235498409EEA477597EFAB239380491C9CCBA1F00A0D1C5D758162E9F4F5464A1A64A22C32721AE57E246722A6B2E07E544A5FEB06AF86C580DAB2B9DFB5AA0F0251E6840EAD66FCB6B89F80C2AD38383B329F9EF4589BF0E8A0C9996EC19E1DA539CFDEFB2BB0F3D9544392A06F765A74218B7DC34F38D230D1AFCF9130410A4B4FE038F7AC59B6B062EE2D2ACCD288606AD9AFDBE95D9572B78B54D26166C7817E6F72F7E6C55DD1576720E4AB99CC26722107F7C278BAC2D82FBD0A3B0E1793C2D8B498F90A9172D17244A4107D9274958FE078FA8A5A33087BF278383F439C0B41523E0E51A662A9F2822CBBB34EDA97F5398EAA12D52506C2EAAF6D4B75639EF0676F482A69DF0E8A9BDFBF6105E32B6FB3ADA2E29C62A0AA687820B4ED35C2418DB1A67A3A5B92DC61368585CF7F3B1B644A8137A52CA21DD982760CAB7FB111558ED0310E9FBA34E5480F4E707A2CEE74DC24AE5717C06DE2B509E4807824707505FFFC5DBFF798E8D85F758A94C2D3770674DFE03627457B2DF10628A31D44BD89D3435D93E4F9BC14D47E6D4B9BD3BB2287ADBCE1FA58495D9032A9A3ADCD56CCB116787E060EA431C1EA9E60A30B609AA9C66064017EA05BC16392992B7DFF62EF1046FC7E64F8F811CE50AAB40AC122CBD5119D3045ED0812F6E30EF6B6001285427B643E3C6FCB6390A9FE76B342A462994F2B9074B56A848538DE205C98BBBCC75DF6BF23CC1AF0B201E5A0618D4BC5035B9F71BCE9D3493A97FA47607D65865A5FF3FF17A7CE28C0E87A57FE951C8F804EADC21F161CCB5D1E66F1E4DBE92C69D4358E0CCC13A12DBE87C9B530579189EF2359A9DF5A8FDE00CB2B58EBD748B23F884626A66EA39847917995EADC1839BFEDCC24AB6BF22A5C247B6FABE8CF382DB48148915167BB47F505C184EC027C3AC741BB0F6676B0D0E7781E19FB8D4D630E71ED4843010198DB9B122CC301D432856B393632369FA1C99BA252F086E317229486C034F1960087ED4606288A7C89DB0EA0DE94700785322249E901897611913AA74F8BBF412639DDB639CBD1C41374A3EC66A87451D9E4127F7627DFDE4E1701D7FC9DE13DC7754952F659EBA7B1A861B8DFC78D1379274530B976C66F9CC4002563837C852D83B3F3BBFD892F14DBF64C976C924E3C656B69131EC17B7905507F78F073A7E509157215C988D490685F8AF23F64ED338915E72B518E4305C9CD44C219876456E87C0C59C5D7524C86CAA161C745364A12890064CA9061056F37ED1BD56B5B09B1423775BF0FCC898AB1BBC283B23DB6E91A3D749125992FF1BB598260DCFE428D2524050C1F545FFDA18A63B052C0C8CA4DF8C3BDE83EE5474395135FCA2B05157C25548B0804D1EDE"""),
-                    TestUtils.hexDecode("""
-0692e4fa67413edeabd602bff25ccbfad2e3402aa7399d8a9f7d0d6d389532019b7d3e63229d12ade7d487f1cade7f9533fbe2eb22a810c94b814a923ea83d7bccbd975af424bf5535f235117afa08156650728d96283a92d6276e34f864c37f8c11674307d653060d8310c0c7bba86515e051c3b1193087df6b22648ee59d6bc7a8c1b509b71620e3f7b5a0aa445f628e15e0725fb49e757cfbfd3dc5fe92a627bee707e33537fced3489e58fa73b49cffb2df08cd45aabaaaa491e77cf205d5be4f86f5a8d4272a5513ccdedfcc210fba346322ffeef9e11dfece2cfb7b854eba1ab581cc533cc6335b2195a20dadb86fae9efea0ab0c7d17710f8b0d8a157272509803c3b49fde1063e9297920bf245fe6502d8bf0a9a1f064d5a58b30b5a14dda6698ae37127f8d867f9aea40e93da3f4af04b91caacd66031d03c0c7e229ebeec8b818f4c970acd5c4dc8e17a3ce618ca96f4ca29f46f5e4059becc5f16ee43df8ba2ee1706c41621da8530689b42136b8a62dab7c691e566b9d48a28b45af799af56bcba07bc6044b64253e9a80e9b5ee01e8af0ca627a84d1a2a7ca9b0659dd1a60b788e5f6538a8223973476e9466459fc4f20cf2d1dab3ab137c5cfab433c436e7f3a6a681f675358b6721dc2850ec7b43aafbda90d13254e4ace6016175bafc1bc28dbf29541639527f246f6c007f41ed1fe6c0329260ce2ecc19395489b5c39d66543c0609120449037f321db95a85be51f1d01a485939390c47b53d82741edd3a5febac17ae6a8a4ca45df32fa6875b4e907d544e529ad26f29b6f923e21acd7964fe739fc1864d72eabe0859ad5e98142ead24c91167fc072a2c2673c7c5bf6da83fc7d662283347388891ca575f275907d06bab987ee5081c2ec808c81c563c902203f8d525243e20b5963967bbbdfa2e8ca9ec8ed703d8dd66c29c8a550c4676044703bc93f969e35f77194412bfb20441bc5e89b5e3238b766940779217af090e0da162e0f95761f63e05a378d0424af4c899a0a68060d9d0e5a035f6ecadbd550961850ee9345111491140810e2eaeff08d8a817700ab4c148c95086ee0663c4261b3cd53f8ab5b5841ba8cb9be8c5ad146d8549f21750be69951fffcca492624e136ed58a5e81cfb01a2147cfc5ca07a0721a38adcd25fed771411c75a5f7ff37457cab19d866b2da0fc45bc77e122143800546bc49f44909042d96bfdc63ac60f09bf4a75e171ece95bfffdfa73b4e509750ec6579996d0c83d59afc88ce9af26715be98cc8e6d05a14188a0fac6af1e96fdebe8f10b994d50ae6e84be257e6392e78d70441bdc5de30a1a4a5cfc7d5637810651fd471e162df2a76571c6d3df3b227e89cebcfec352d0f1af41a29e993af22514960c64dffc72a9819a6092150bd440487108024f0243db54ea68881d1c99b529ab529ebca98ea690046b1e37f6f1110686f6d9a7a725aa115c5e9be4189eba063d28801ef85973d0e9eb15179cb64378b6a5304cce09c82864bfed361ffe1702a9ff8e51a214b584247b967e5bb7f64b955acf25bd1073179776d9c03790d46f828342b90ffa2a45081184c3be0caf7aaf6c354b698e9256421ea3688c6fc18132d4e8d956baf9b821e64a579b1462ed4e990259867899ebddb19a861b24c20c2b0a6c274a064e1d1db366a293673153752847a2a5acc23b573ce0975655b79fe1a1ccb347773e3b1c5bb3028a1508687d17f9bf86ebbecb3086db5ef2559be02a68f1cabb47eec1671e6d3d35b65371fd5487b413fee14691745d0eb260c9008f07b5ce629c6d748c452c3131225f8c7586d99b2122202860f6e73c7def4401919e02e18471d1fd874b7c728296648b5ab571c517dea55be9f9ba65ff2cb349576a76030789dec17102a375ef8d779f2f2ed17be8fc41b84b1ef69ed18cefe28122127f211ee1abaf2a4044a3b1ee653395141da50db99dd3f73f85b5c0158a74f6f9707c7f62beffd70c068db1d6ef686cad7bb859c98049935e73aa4ea76c3225d4f19b333a4290ed0d723c6192034618fe3214306536741e20b066a6b9190972f4c4722534bf760a07e8d3a45dfbc67dbb8a5874332a4fc0e0a0640ca3999b93d34e4d8731957465e213577bade1f9b371540dbba188674ea205db7b244c77b6a772caf69f8b46b7b05439a852232348ef6d437bf7c6c79a4c0520a8ead1f3c00de2a063eb5a1e162f4db1ee94f1fb94f56f62d951da29f6b3018485c4a5c2c5f8573691aa096d8cd2922b66c8b7fc828d49e92a3d648cfa8ef524199b4bf5a8f15693960c5f59862825ccdda554b17e9c35f7e6a24365508f5a23c6ae211e3db71740fa444f92159c8df59c4b073f362cdb658842466efde20e9ba0472e2f682ecb655961ba8ad7575e8b02320ab6fce9188321816968a15789977084409d89b487253c778ef1ea1a1f47c750e37138735bcd58f6956ab7c8dd1c8a7ad35067c0ba0940b3b091c362d3165007df94167f33e0c660cf02ee5d6ed90c8ab4655ed47655d810751dfb2f1e65c890ed24c976bba0b8a998102d660a05325261b38fdfc82ba300683df5d561f73a11fe6f06425d11ef4c6f32e6de2ee6081a9b772e07614866f54e63ccbf7b1d9a1c3701ccbd1d9087241d8e2987203dc798d9431b8ab1fde5ad788db13c2e996a1d21b1559cffe3f7132e1aa83acf6c517d8e8d719076a36c08b2c6afbe5d23dfb9c5272ffb2af2b8febd51946199b90f98e7d49358057fb881f4e8641e0524c3471c0f6bb4cf59bccc7dcf09ab2c2d8a783710c982a35e4512c30e1c19bbfeffd992884ade3dd2a90039ebef2c23ab98fdfaaf6ebf34ae7fcb7fe742798c50a49d740244e65c49b22144c05047061e592b32ab61733a73b55ae04c9f36273dcb2eeb4872e7b7d009d4a54b867613ca0f69c4e7756a48ba7f9539048d495a578b8a76cac198d77aeb6c3a7dd474390f91faea384c94cfd73486ec226319946fd829c3ced266ab11db84176c7f67502b6d50ddf46994d6bf748f118045457e3ad7192f0b03c2bcb2455d018bd0ab1306b473f3761fee60d941637c562cdcda0dd5d5e86af9e95bc22570c07c25d5bbc6f1ce04be9e7bce5f7f095afec8b7c4cd930f9bc106e85eb8620668b52c9d09897460b1c8d74febabd73ff9b730c291c28f1410b442d91c533383ac3f2f41f0bcfebc9121b00015d8c506b2183b7d183751636da9226b795eacb2a1223004ea8a18a805b272384ea239ab86b41c556591fbabb783a6f909d5a181f3563ff1f9abe58cc921c751f3340497d94b1b2c6ced1e3e4345e73879296bfd9dade021b25436d73a3caced5e2ea070824262b5d6877aabfc0e8ecf6fe0000000000000000000000000000000000000000000000000000000000000d172332""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-a15c38cf5d89e1912b7ecbd269ebc6ac156697942a3b2557f5cb631782ee2ebfc52465310ec4700da139935b04ecf37bdb69f0db1edb595256837cacbbfa9188a2a46e985e6b1f7342a1f663244570c6d67dcbcbbf4ea86cfbf98cfccb03d10c2848232ba97093e393ee4db23cdf7791f1adc46d9de05a91791d4702f9ac41bc5002645124910bc6404a1451e130285a025160a629084850d2c205d324401a963003452194488848b61101436ad2940911a36d04a90c1b05708986881a97051249291c22325a948dd1462c19b36d03c74148c08822377263082c6038450c28889bb60da240285130248002685186601ba46942266ec2b484d30206db041203301193183261c42519c2290b0152e4c08dcb2011d1889119a7450b2548cb222e49882c4aa664a13848099851e2026d54b2219c800959381122010924349053224220060859406009274ce1164dcc360cd1b810d94032c24662dca84d43122a11424c180122838811e014060349814830320b132e2285699244895a36504b241102954de2a0109ca6495ac00dd4264a511222049440d3460cca2229e3321108054581902d6036900c826cc8880843000c64384262326d1b408821842dcc264c1399089b48690b3970c1481282142613206252226208389112278c4ab02dd8c2604a240c53a20508c5241cb48514c869d2324a19318a59022459106c02c929e1264ec380009802125b16529844010919410c221098c69012108d20002cc0346e031091222131908020d9c22400278421a98820938804a4894446859c322d82287262940503094aa0c22c20820c22b5855aa42914850c20c680c09661db126221324a19a2694c12025a1291911629122171c0406a49340adaa6091929714bb405e1108e1a448524c420d1244164302c00432acb3024a18225cc0869520024d2186614846dd2b66811c311e22866093225e1b24902c14c131165420070a032715b848cc032281a2068da226a519641e32464882631124952e382910ca06411456c84b24498384923a66488b208e198088a364408288cd01401e41400d282318b00469bb24410432541c668cb4426212910a002260aa8450b262893b6444ab0005a4801e4444e81c830cb8490183931841820813285023951c01824914289c40406c1304054a831d4b61018998d1a368911b765e24465cc1650a41251dc0812e1c00c00b5650b1229c4284104c84588a271e3188cc48608001349d8368280406514b045ae75b458c51bf83c97926488b9319add26f6fdc0a6e6b427d7dba22425aea8bdae2838ce001237c886d3ff6d54cd7c7e3e6af667c824a63e53772c5ec84d83519391755e37b16b80fad2ed94725bdddc3486bafb38e521839fd4ded253cdaad925e61e613f1aab1a448212259009260fb80e0a7d0ffd726c7a40d462a1a3fe2f3e4717429bc8dfb40f332bd927d064ea025e002aa2210eed1a457ab68bc0248b68325537c328af312744d16cbe8ac0b1c9ac1a3a79afb3109aa934f2a21f45b0c5d6171ee1cf71db9940d186be0df7c9d8149aacf1f01d46ae77e41635d2f73202393f73e7b2d14ebd62662c94d65f1320f8802d9486388ecf6b6a93732646c8c043d39dc1b5efa33a72c1fe0bb345598724325d3f921694d0ffe115aca5347f73754d5fa7f601efbc5217827abcbb2ff39bf453398e896218f821cf5a0eaa60048e1329f0ba4db933a2d6aad7e1de6d011db3305a8d6a1893a55de3073a5e4cc381f74805d163f238e81b55cfcd3362b774a3ab1f99823abc8d9801c90d8597a8feb3be962b9552145401b81a4febf84a269bec2fc81e1e77aca7db60f18fe3e42eac782247cb617578863120284bd8874f798fc1c427cd2138a8b5b6fdee8a3b271ce23e45dcb71ab8e63040274338179f60729650a245fe491b25efad8b000b91cf551afeb7cd7ce185de74a2e79a57fbc10f9afa86a869a5261e555a39e814b72bb251277ad9fb91d8d1565b3b0929f043cc4ff692ff0b1dd92530904521a56d6d2916f1516b09d35cb7b03e5b40a1ce80a9077ca6c2159c8eb5b259d5edb6d800463fedf135748de6d2adf32eb6be0637d567ea71acf992512ba6493ce3f318bf7089cbb195526c4b01b43752de84247c38a7a26acc2de492fe300fd19759c47e87b4587e4a6f6c92c3cb78cdd20650ef3d2bbd33388129cc01ea69dcabfcad0bbcab9757cffab601b6058e0424036815cbbd337a7fdf4b5f10f345ef80b3f357dbccdad0c6661adedb7cdb49a796379face0861a1c3ded98b63042bcd670eb19484de9f7bb5219e48eb89011ef3ae9973de2c95c84f6cc92c09b84d32da39ea91b9990f1e5f39a9e0380769d5c0b6434d1a687d6eaa0c199ec2f297f47f160370e22bc8dbcb127ef9e40316fc5d6fe7ae17e0b4a5a606b3b717d2ed49cea5fb905615380ab861e051aa98b6cdba93b5687755ea3c94dca0dd3cf0a23a88b2e13126931afe60949c3fa2ee88b6f33ebdbb1dfe2c4a7b09d154d01edf95f93fa4adb187f8bcbfd736e02357f5bfff2c393ee27fbee56402ffb58aa8fd9cf0d51d6dadbea4ab97057ed0c7308eb93c7734cdd5c1bbdeb97e57ccdeba01a8c808403a4091f92c6f296cab71e159e71b7b7b0b38ace2c4129f8d2851a8ed353cb2eba0853e2d3b80f39646a6566ab1294eda5f39c211a130d6fd5fa66372c96cad36c4664fd5b6c43ace7913c4babfc343dc99b87d67e1d4644524e5f62573b44cfe62fb9718be0ebbfe9c2924c0dff234898c5378565bee676ec0cbe2b50abf191ed15f3125987af4e0d78a19e5208f1cbc8c73d8be34be57c373aade97ec18dbf4dbbfc06b976261cf9b1e0395997eb8773a15dab297f71afe40d8baec46a96143d8104b7385669f23d1497f99a525f72a278ae4ef39add1ac5ae5c92c1fad9473229779cfb9440a2412ff4ca5ed6c2abfbedd16bc9585c0900861464c8e489089102abb0e585352fff291fd6a52aaa187f4d977b6fe3d3429c9d46d79e21508e400732d318cfccebfa1f6f5fb0f2063179cf1df2bb59323efa12766e81a572ab221a06e5a043808d43a2275d9d51013f91a2825e084bf9dd5e1e3c2ddd5c149c0fb66f80b2c90dc09d132bf834156e605f33f0091983d600fea8cb5710414f60536a3f9efba209b3eb06b597a5eb6af3f80f92b12c9ad310dfd1d7a3e3cc23444542d351a3d4b6d08be61ff43756bcdadef51bd4aa335a174073ddc551b661ee1c211866a52bd0ca197c72078803325956d78dd38a9247676890f46a1a38630048d266e059df2b9051b17f8c453c532a818429296bd71c91c446142313e399d08447610e941a9bc7d225770a075a955d8ae027ae0bf880862ad81b3d2b6cdd9839a7bc9da8ecfd6c6d56140f0cdbc8fff13d8fdfbd8ba47d93fdd75df792e8428460523fdcfae6e4419f38e797bb06ddfa896576a4693bb8046bb27042f3899cb36da3f8650828b99b6945ffd6c7e31595ef679a1277be4e627abe37216515afa2b4599b7cff8d493601abf2bf09ae9df92a04d34881ed1efb5bfcd7a7e1afcc1e40b5716b3cd36d98c91730b795df899c5c8c26a7d74cfa8b1aa90c1648"""),
-                    TestUtils.hexDecode("""
-22AA98C685E1552B525B4302C943037F668279C224B6270DCAF2B06C4F4AB1254C48DE253829FE6DFFA9CB6BB294F054711BAE3FBACFB900CFD1F0844E55D51EC6F697B998759B14C13392DDB6F7DEBA77FFC22468781CE402"""),
-                    TestUtils.hexDecode("""
-5129dae7c620ef4c5d6b0e0f7b43acd806adc035cfb3901e162be14f2371bba72674649e2004b4d055ab533316dc520afa8c80e5285f40f7ea4ef876e68b0aa4a559ec2363032efe5fd5a1d5050be8221c24b23c403ccf71bde5410b7e5ded038255dfca9439992fddc4fddf96654c78098c84e0182d954e204510bc7e5635ac29cfef21042bd52dde771a500099c75311c8657c5fc5bf303b7769ce8c2de7548b388224e727505c42e6bb69d48d845d9a43e845e7305a098657385307ab23c6bdc70de07868ecc1470b98e2da98fde4636af76fddbde6af2b60b4f27e38d4a86bed60e6f995533261cf91a618c07df0f659561f61bbbd70dd2b020cb04ac1fb6ee1a31ee4f4ae5d0bc2af22d60701700a44f2e8d11b72f4d03b3a96e2fa491e6e61f8dfd3ca678e4eedaac1e6bf418cc4a34b24bddfce3975d84740f7fb92ac2dd7aea450f91bd6ced924f7204754026f649868ccb103100b79d3ab2fdd2f916a76a6212bc583f1f5e541dfbbfb10234681c42ad56a95331c90f5e8b3be82a5b82ed4292094d9d60569fa760628e082740bb2da0a14b2516dda632c007ae3089a2068d2ef48b3f713999a699ab180ca99d7c49c4a0f40b908dc51d9a17db286721f8541839d6acb5eaefcaba5b1ba21e5ace4be0924eb0246e4d195a6eea6e962bb07bef9001a23dc0be7497a1ac79da047ed45b4c38196100b7ce06f466df295655076d14308d94d55103d36799a0683573768bb6baac4a10bd3120e9d47d7798121ab46521d7de8d1c3cd9618347d8947c47676c547231e5be77153f02a3eccaa99a75230e45fd4c1e6a6f951d1a5e6c3be098caf4a16ea3ee88473b1a8d91c0886685409ba9a099bbc0438fedd280f459de3c9c57c92609a865add4cfe76eae9af088680f92a68ab78765f7ad0b95aadfc0a91e175f07ab1f0887b1f448530866f002fc089a63a2e2d33ba63ca1985737ab0b9a73d23af11420d62a8b619dfec0830cf62757ae7f0402a4c0f209d03ed8f1731db5079dc5671c19c5bef712d34479b7f879dbe694e1bfbabc9c05109c615be763dd9ff5ffba888f88b62128b09475527d12203ae67f1ee8da83678b8a4b7b16f7700f919874eaaca48c10cef50a0f447baa17dd19eda59a1f71ad1cdc88e91fd91424e8c668fc93690b9b5914db40ba677a3c71a6d2cd05f42321463c12d55de1a717f69c132dc35e3bddfc23064ee2183e175e1ead1d075c7c1115c8cab91677ad6b483d7151010a7314ad558eafc3128c2dd590aa4e32e8c86cf769ff58ca5f37ee3a4ca0c9f9b2c4a9cdf2a8ae52d1d09110245a8884ac52c597e97b0b0304ee706795abed33f2f1885973253da8728742b54d4e908536c93ee11c1cc36da21d8ed4956255c0a28262baf50ff4a8df767e71a2d920f53b25084ed2cd8069fd13c0d1ef81f6989c0e93609038e9c6174d2a9333b3676ba24886917f32b7316d45dc6e99497f813b599d0bacc432ede0584c654551d3217c63911654b21e0631a5f7abf66d48b2cebff62cbf41ded241a59816fa9ba99cb29a9d000873fff81c689ee95bb9fd31a31863e1bf08fae8b27169c7705344b7085c917bc4434c9bcbaa27423f634233f75b82ebc7adb307f6cc3310ba95478572820973732f4cd3d1f749b728605ffdf23472810d01f6f9580b3852a5c2c7be4f93615960541eb2dc4d5557dffa8646d916370f89e09947e4e14092073357283fff846bd6b83d81092639de3b6ee260770b21275491a6300c12d5ad261f19d8081c9a659bb3f45cff2dc6c04313c7f3fb1b2d4ca96a603259310628356cab1431bee201ef7181f0f9d35e13b6f89a3698a56c3fe08a76418b6ea10b70bb2c0649f7b506f4b15a2578902d6df4065d4c3e79ed26a0d965e97b5ccb47110cf3317b7d90abcc9c7567ad4f2c11c5ca6617e643ee55096894c793d18adcce74c19620b112ab80152984de200d4e4a6ee29ce266b47d662accbb42fc74e7e088138faeb06f32e469d019979cf0b55aec3f420f97029852379417498605cd513fae94c5a5bdf3eec29c54634b94c6a96b0087ef2c8b2e32ad49144a70d27026a5900f9bde658645190ad83583ce8d4a174bf3956f3a581d7e4ee013a4263172d09b3e888299a06a0dd4cdd7e2a118fd753791afd91e0acc9eb1e4d3322feb169e47ac2e9e3e47908f293cb7988387c956806bc4e5bb9f65a84cdf2df9376c2eaf3ebae6a9a710da2083af685a8de79e9e27143c6894a847aa9134cb184b7dc7028b664246dda558891bdbcff3af3a5e0ca8ed06c1402d31cb5afca6260f4cae55fb6a6781768e6a1fbeedaaaee620ec0b7b964a38bf46651de29e4ad7247359df1cf4e50e71f691b73092a2f75f4669a145ffc5a51d51187f42dba767d28a39800789c88752be0c0e0b5aa2aeb3737f1028db4fba59dfba974f9ed8734a57f1f2db29d14f708cb83fbea9e4889f6bfd6f09d714ffe825056215be601bb8b6168d787a6d17335b87986913ff6aee38ad38f571435195b439cd82930a3386ba6e304b72fb5cf04b1ad8d64d8334f5ce0d14718232c613cc12ac1341706f829fa50a5c3010f8d5daf04c3bfde5ba88fc873a2e018d274bcbe85a9559eb224f6c23df124263772aa1262d9932ab813f50317bd7d4a6b0cfc207d8dad53d193d7330c9330d9bf866047237df5baedc69ff546308d2547b5c7f9e0909ff97da474bd3075413b94cf97fe331201f2cb565438182f13acb95529fa6cbd18ef92dab1bd8522f332ab5f375fcfbe01a83e38eef6381a032f9adb60b59e5eb54786f5dff4f5e003b79c7e119663c38e7e9baa0199d3ba32235166936a850c57227b1a16561ee407f7bf09cf6671ce0d0ed0f9d7f916a0ff7f41d8adff8c42b8f4640f1488841cd3cc1e38918dcadd752318080b4f15e58dc7f79aedf3805e1cffc25bb01591f15f54155c59a798a8bb9d5247eeb5d9bbb3abfd65f0bb65f119dc05cc0105475fed4f006e61a1864a29b53770e5b3cae2fa13b5a0d1b05ab9db868a7b1349c9b31d1a1abc19250be50627e8f7283af7d12c57a1c110cbf4acaf5990621d5c04729d475a97cf21c5fb252f5f1514b8d3090cf6e4e22a0146fce697d88d0637b3a60e77b9cbf527c4269adebd5eaddf12633c53f1ff09d869a846d3121371aca8252a5ca1f4fb1b7afbbb3256e53a9f25a3dfbb3a95e9beb67711d27689a28aac998b3129861d9acc72122d43c300bd58d934bd9aaff2ebb55268b94fe7013aa8670a89b19e1cc5d201ce2e73f6bcd8649a18f8caf1af021d374570728690a6cff0f3fb04050a0e17344e7483879798adbfd2ec112325282a3b5d6d72868c95999da4a7c7cacf141a1e2c5e657d7f939ca1a4f3000000000000000000000000000000000000000d1d303d""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-85c8fae58f6c8a7690e2098cdcb1e487e83a1ff669b31724113a0d9f796a68c860945d21c640c54b863814c3ef5a180dca61d3cd000d610ac6b0e25ca8b73b33df1d991902efee947777975b942d55d9af67fa96b7e45dab6fd52248361f3197b26baf40426b4e05c81d1138e78a7c907e39f7c05d0f3870b4a0cc9ab408d0052298105b8040e3c028142926488888a2a4101b2081d14266a1404c11032e5c1864a10030dc144c012509588604c9200403152284204e99a4119392111ca66cdac0100a086a0c086ce326261398489418889ca8715b262d4090881b2944e238065a9891c1300944262643a888a04826da3070ca40464a8851481866da28468a346d1bc48599a4700c305110b60088266560465120180e59927091a685c346528996309430320a38118a94714b340454108904326a09944ca2c640942492509270c0926090366a403832098648c032801908646394291416685c822da2366d0428841cb2501c99218114041b0981c2104a9c02040ba05122236e1410045a304419460a10184ecaa470e2180d81022a04186122a241891828ccc82c04212d110186d3186880b8651c335211c34499a66903a50c840062d3a23043440602c56108357110234121c561502828e4480221281084c84d93948002a32521254c22b730e19048914065c4440408118e0290892407211820119b828ce3205299b00524c78821a61150c20d80a650110012cc262aa4244642126543000d8242288c38016124601b072d0143088c2450a018241b212ddb4032cc94412416504b14404306061ac54544b600e1404218b141220405432844d8c641930652018881c2a81124b405d39821211450db065211c26cd41621631884c0b06c9c366da1240913134558a00818409241222452280120838d0b22449344210910904392715bb02922252a04c38c8a10904c047264484e01952122994c0a2166d8326a211522019540611866a4a80022b70dcab00d64208a1c28841420891c18124934320a330a0420804332921b476c61800da2a80d14c8711c4844c3966512900c08093243a08910318062144c8b948d931648439684c206288ab810da202d1b384e4b364e4b2461da886d6424691c348e8b98115218859b2669d04800a2449089240e9302121b4765a3c8841432040c8808649020023428a2c2049b461294166113106559422258144d500408221401e11822d4b210dc482c1a064ecc900400210ce40632113530040620d8d109619eb9c8ab718f85d404caf02e2be1703a4b04070f4d1261a153069f796c9295b1f6c405c47034bfa4fdbf2840a939322858cee0056ea8d7ccbe8c58dfce601cbd113bf5e8213fa32a73f07430012ac8ceff89c87907f6101e21c8dd4617a83509cbec27c7be57f9394e067489755087407fa69791c3c2aebeebebbbf43e8345b772b451d213135a0572316f52008fe4ef5812bc0c1d78e7660986b337eb896324598b19de9d6d3f7a2d670223fdd4ad7f41e46ccae6955132bd34723dc8fcc37ca79b9b8111f1461731214a158ac65a2a2ea9cd5a856b6713a1e07107f6b11d38320d4e51c1144e91cfbc89dbf4fc56023da26530e7614ab1c7c9eb5e2491c1f2a0abcff2e4d4fd3c1e39b061d390a60b6adb103d1ff198e70f945018cce7af3c25e58935b340a94423171cf610c57ffa775172c0fd3d4fe30c33c894e8b634f435d47300751def4d8f20aba4b2ecf649e52ca40562cb7807e5f43718567fdf09e92d444d0bef10961e4141faba4ae1359c49c0426c6f05b89c93270b1cd8dfe77fa865940d5f2e33ff2aaea1da3165e3cc38ab8c3149079ff747edad263a45f5a0dd55de409b611c2da6fe5b0ce3740064e5c9dc65ed9facb892e970af44646287812611539813aac695a1e0466a12c6c0912c492270e9f19728c9d8b68dca842d462ad41d914f8acb729e37e43693c39db2057c457b12ea78e6c4cabfd0cf14089523a60a5a223b228f8c64163b003e6af0026a7cc947856bbbf38ba43226e4857bab84d143477a40bbe194ac92ab0bf2282fdee0798a5827e2d82662e5744333ae9fd9063310a1c5f77438789e7cfc96c3ae961cda792d572d07adfa814ea068df14782f5dcaf3173a5246250d0ee9b4fcf3b145f2eb3e3a4371228af90f7737053496307704db71ee0eed602ca596a994a7de34ccaaf15d987afad5318476b826051c482965ced549f49ff07fad9001ff081fd49d903e18cffc6c824d60613bc4e8433f3eefb0ec666ce7d8a0f8decc80139c77b18e60c2d8bcbcb4060cad940665f9cebb9537ef55c18fdd474da07b3333e0cc6144f9069fe6496da1f9c60eda3ae7ffaa851d518634f8e80fe1fed6ab797289ef2d36910a17e3e825f7fd91629c411b7747d4e64b751540321c1b83e5146da1cb94bed6c063e26522695bd167d0fa5c455c1d3b7544b1b3ae6b5a080bd140c2709caf4394207ff5a08ea14739af0199328f5ce29fe31314eb169c6569d0197570ba2cc9eb6519d70d451efd270ea6caec116f43c5295d6504422b0efc8e16740626239fd20b815af715ebfc8e552737f17fade233f9674ab47d35615518b17d2b5f8677245295d6d79520ca1bb2a4ef675fae5cf719c99e86af39879c576dd3092f6a13471b248b10e3d19ca8257a4f2b73ae373f37fbd7eb79b97e41820dd8d048bf77d6487576aa0984c399b8eb247a0a416a50f615ad80fab612b532a2126d47043abd20198c49894b9a265e87ec93b519793fc363f2a1028123bd72a25953e2402b7bb6912945cf8b540821e173c2a606c448707f3b7a6a2ed692cf87588e26e08a6667cf281638a1d6e3858d96563b29058988ee461cf1f1895cca095f116b7cb35cc1b49ea3f94189efb5ed82e1d52574d269b4370cc235a3edfd4ce0d4e945b3cc5f316740954be77796d54a12b1be196706639de8851fe42643a22ed1b8c640dfe5fbcc15b402c7ce42d4038be2a0f8fe5a340a5492cd65ee3af3a03ed1e25452663d195ac43d696eddd08d47a64c63fb8572edce217f894917f30035c5c8c1065a2ca39a73f7c3172e7c0b4387cbae9123437b0c55ce5401b4a965362ddc86b4ff3e3b433ab15cb2edabe5aedfb8b9bff2e4658c875755fdd0d0a615499ff59adae936f0f04e086f9adc29e47b7e4fa8b94828df077a73d8a3651a23efd8def526e1a8e0a8a8c1ea4abc5983ec20ee7c530269fb1f23554d79092c24c4bfbaa7bd60e271b4fff69f48d3ddd4ddf94ce3808135034cbc78a2cd31488a4a5e25a81bd41edc5999dc1fc4767c9f82144934eb0233044407becd09e0aa0e0d5b531c1c010ca35b97da6cb9709b78cc0d96499cf229862840bb1d03f561addbb3f8f0f1e6d5c8de369dff715e57d21cd095a316a640b6b077c4aa6149167f11412a42cac3da1a25464752e24e0d1047c361b2ee9b6e6ccc58a683cb681eb116df43c9133f4ad39d4377b38b89b2a1abd6505044860e8ddea6332e79db6436fbbcd7f94ea293dec7f46e6c8096a127db1bc7f65ef2ceeb372fc66c7d8ccdc777d3d88cd1d65d5110a9b197d17ff1f2bc8515206346825795cc3386c9723be137b2d2a9479d"""),
-                    TestUtils.hexDecode("""
-0B0F604B53752973C4A72EF940C3FBA910AA9AF2916D673D69C4AE4DE92A237F271E84921C309B59B92E795BD26C5C015EC5176155DDAE8FA17D7BEFCEE3A23E0201669CC55A6F270CF0D03FFC09BBE4B47D318B6926808EBB49EC8B57A849896E76648D51117E8F518088D66B69D88E09D298186C10B5678EB8AE43E9C0A794C63CA9D597C4B74C959E9C1E8E0F46698CD64CFF3C0FC6174CFC51095E142DED9F16E5B2D3656555D2D42832280164E0C10C5817AE47ABACEE7C3BFD198A21BDD1C420F2EF0776E5EEFA46E8BCB49388FA6B937FD1FEB2BF09D5B9494A534F19BDE4E7BB8A5E4C558C2A166006B481A7C5865069A3DEA2B880AA503B5C020F045A4D9C3E5C590E4AD5375E74B732695A11164B5A57AA665922431498A9218CEB9ECD92700E92BD11E0A8140938C4FB9543FA5DE8EDADD1EDBDAAD11A6AEFF2EA409638B2C7AD546EFE390729982304F35D7F889C0CCC81D67F5A1D6201BC4BE8D1AD2D3CB85815CB9669B56F845148DA0DD2D6B5D7C4986DD3F10BDC78EAD8B4A88B7AE1FE11C634355F60A43A55C88B37954CDA71F4744C8E2B4D7F8D4A2BF60EF0C44CDC7F7059AC48A94B10279921709827A3E1E7A46DD857616E6B737CDFAB71CBD47639245E392DC116614CA3F099B8F2092AD667DAC43B8501DEA9876E5E0B98B41733DA63A2517A49C169A95E583F18F2E1DAEB4425E307509CC6B0B376827F0BAAFC2FB2ABD4E4151A8DBDCB8C22C78F5DFEF0DD1743B047E58537866795D67E35358020CF75F0D2B80287D62AECD6D34D18494D01B4412B1CFF279CA69C18A263E7B862F514A7A64BF192586ECD460D22DD2280373A66ED987635761C3CC34A5BF6A370F9F8B16F98808767A2D9A1517544D869E674980758B15BA7844027D3593432101FBC51FA4709F4D041BE9FF31DB9B7430F1D7F8E06C22C4BF3F8798D50C92641CDBF0B2C88E88666029FC985FD4E9FFDCD779C7F7600D02AE8D9E3CE6FF76F0B449C41BDB785BBAC9CF58ED7ED1525D7C7E885C0D46ADD0F7CC3B14394235B9176B69A222567E6533870EA540F4DED9A1D78F2CB89E6C1DEBE67249ED8F31C87499E24DAB0434FB9B40EA695499C76A1618A37B1AAA5309A914B6574209A61DE0633F086EE4F2455299C70B981532A23DC453939D223BA3A25122AD498795624C727E973C052E69AC40AD465DF55ADBB20FEEE76BF2906EFA7B0D9D5EAE860FE02500E2E0F4A21CABCF963D91262EAFEE814BDF9775874D656F8BDE11DA29327E3E7C7C95395D0DDF766CF34005CE86592F6787D1044E5CA1962C4DF2719308B2D6335FAC77DF46092CD3D5D228E381BD7E5FB4D2EC18B19E18E4748F662AB34C3F2C33877BF4A8D43A63F9B5DC75861AABB42D34EF37EF19CADBA110A3807D1699B247BEFE3D61AB84941ACB227C79CA05180FD3415D0E76EB31B4DD903D78553F2C22563F9B22BB876E81EDAECA4B8FB9415E2BD5AC32CC08775A20E8F90A1681C9957DFC330B6343E58F841906EE3562ADD6AA53FA1EC4AA2E894AFE769116E29AF49D0FBE2D8FEBA215E470ECEA81B258977A0FFCB17666953C29B2F70559DA00610398A08E0A17D69705707569D6484C4203C06B17439E9D4D9DB8456682A79659DAB332DDF45C67E527304013A422E46F2989BCF033DB143676A4EA720D0DD75584298CBAA765CBB0B09EF267D503F2782A427459FD2A83676DEA43C01D288429A82527A69B1EB19DD3BA1AB7428220BA74F79A81377F7ABBC027D96903AF6ADB4644E9F5CE676FC4D3ABD977D6438F4743476F77F3DA6E822AE61E0AD38549BD21E0FAC1C963F1D47F9E6BA6019591DE22BCEE5D5C9CBC4106A369C04BDF633F41EB1D6821B1F43194CC14B02B753584A659EA46C49B983F592C83BD959690845E872B471A38381CF3B2E8F4DC157D9A60FF56EC63B1C66D2227A069CEE7E48DB0E0D5991F96740D364DF89B08BA67098652958A14516534103ADD9E457E6AFC4DE1AF332EF3ECF6897B3DC8E5D6980FC5E5D829D4326F6023F48CFC9D0D787416EE61A0BA3CFF5E7C69BC83B18928AD277AABBDE271EABF8269701E526960460EEF521E83CF7A61A3CAABBEE1F1C99402EF55FD438753790CF56034AEA3292828AE858B2D3B9C8D77FF4545FAE7B4F2AE1EB17B8198F4846A8F4A105CE250F900969696E477B2C46AE786481BCDF85715BD270F9C29BECF4579F2DFFFF7750E375113E33ECABFC52E4DA5405849FE5D5F4A17C1F0984A1479D561943CD1120037EE821A2B57A12D7F1797E64E38A4B71E2FB10207ACECB96B3F3ADFF82EDCB633E388FCF11C8D105C1F6EDD41B553B4B559C3199745F3B0EB7326B867FD4CEDF4E9ABA1FD6A10E1494847FB5DC83C91F7A2DD351CD1AFDF95865701FDC658A41ACCA58E574B67929EEFEB371589374285148EB09157AA9A67F2FD54FCAFC1248F6D84951AB1A676637E9CB76C17C282DB53B1BEFAD8019F51B0400DC1CB012B97575ED81C129636C38998A2E6FC5AB7F0BF1FFDDB588BDE4590A7A0F879FFFC1183A3C6CFB341FB518D0786A6473FF9614877B1B722AF4B2E1E9B5E0DE7C3DB004EFA16F5CBF07870D7208A93A9FCE0EEB598CC54F04B1BAAA992C02BB2D27217AB20A3381EBEFA04CCB1F23E59E4B0DEC700E069DB7620E22235A4C5F54522D96ED4785ADBA7FF95F2A7DB212D3DD05E58C560E5ABD0EC238B7ED01E54ECACA7D32F7C2A3309A437E68C3AC7A9BC51025409A2A1ED05F8DB0EBB647FEFE6222D6F74DD8E4034580B675DEBA4BBFADEFFEECFF4771A0C1CB0ADCC6E9B050B85D230F6B288AC3FC24880CCBDF9C6A6976D46797B75B8532411FD89BE027CD8C81547B24B535825695A35BCDA4E2E0A3A6BCEDB73DD10DD847C4A0AAE059A07F56B0ADC0401026648BA469C534CDF6E2CAB8F581A7233D2F15BB35DC990EFBFE688F9B9AC5AA5C9B3E95DA7B0122947DA03AB9DB58090FF14B736B9CAC65F966206AE7C84B971D83944D8AB61589A28058E14193751B685058E632E32EF1E8C94BF005A3A2EC5EE2CE2FF6C05A67D87E56998E952E4557250E8AB5A979ECB28B0EE41DEE07F919E67670D9CC4077DB0D90ACCFE17CF6AE69DE0C9DBCD3D552A7FB37383574692A267B0A8BDCAF3532AB47887FCC94AEC3461A9257322095F1024C880273222295107864903F3DC8FB353FBE51C4D89F30FEAA5A570979A38B0B4AC9A4AB6B7169984C576BC4AD6DA1719CD0D5ABA03BCBF1336DE48CBBE167E4293DADDE3997061469F200A391646C8FE712EBE087B448F7A7DE437186D38A4CFBFC2919FC888487B15C60E93373D076DF6A60452E62E05256AA66BD1FB771CADB331661DB4BFA47581A4367069FA20E9C6229F79D6680125D0464F7CFDCA1F5C46688D5816CD90862FDABAE753E56BAA1369AC1AD3530630998CEB4545C4404C8B9A65D5A43443624D62DCEC989AA2CB8B85414E06AAE6BC4E219C5A3FDDF8FCC75381F6A0F73F54A7A2B5BA0F546235E71B233EC107900D8116CCD398FB14F32CEC310AC089D6BEC40255A6A877C30B05355544D115E8F85E428087A5F3670D596E31D25F676B3C6FF444AA0FFE5011AE62D6FFF86E615EBE80622BB646A318BC65950889616DEC254DB332649788C07E46CE590C2362EE66BB33BD43807A1336B94198BECE586CBBE3136B5CC809F24DB5BC3069E9C1FDFE53C6D1DE29DF48A9000A7E89D6862A773832DE2151423D9D11D722D923233137DB6F34F8DFA4EEC134BC9EF5A70424D895638D1B09D95D98CFA17308908D65AF00259DFB5ECFEAC55DD7FAAEEAFD4E94EFB36698D2315D795A93B8BA6A3CA93F6B79F2E599149BFBFC6F5C5742A83C886BDD4539BCC128F30B370FFABBE724AA3F3D571785AA6234FD2359FB3468A06A8E74918EE6E87CB29178900B49891F565A80BFF302BAFD0D5C2C123973BA7B9B425973CB3D7F2AFF3059D272A7CE611F5CDDB5AFF3E2B4024FDF0E01D7AD1C63FB47D9BA986C341030B3E5C6CD3CDC6A3DF9D6901E76D31C141C37619F5BB316209FAF8428AF19236DD426D70EC81E77309D5D9AC33CF3AACC0259A19F91E4579AE49EEBA41CF79B9499CD1211AF1E6DCDC70383A35E0ABF7B53A1203AADCD3AE638862D35EC4E441100E8CDEC7F0E6D22845F6CDCDA801111C4C7F261189C7D67B981101C40F21D33D05E336F1C7443560238C72B34E47758927E37F972247F4457EA60B2546F6B5B7A91B151E8B3800CC1748587E0D5421A43648BBC5D87C591B01C229C8104CA87C0B7F0770ECABD1E2A858147B62F607A86E1C71EF73C036B18C01CA5C1BA8242BC4BB7414FC90C0A8372F860F2EE51DCC1E457135776C377F940400AC5309112E6742617FC226EDDF51E95CAB40CAB58CAE1E662DD78C6E253B373BE970129193DAC7DAE372CBEA847248C2E69273B7CFEE70BEE59DECF64126D44BACAB5F2813CFEE1EF89AA3FD6D030319CDCE94FA86E4E64998266082F8BF74877038ED888C16907A8DF99BB53809E54520E4B5B6AD44849A33EC3FA44A7B179350DB07524823FE8384413F0A7E1936D8CAAAFE1052C462778B36AB8A9A14BCCC0319CF6EE2AFF01EF5077A10BC0FD0DF76D9B806481BAD1F49EA013942F38BFE52FB194EF8ACB283B1462BFFE4AC618D6FEE7E25130EC71D68C81A9532A16520075EBC1E9C3FCDF5FFCC150F3815E8647F34DAA814935D0E1AB68EC6A1B14FC7566415CC11E0C14A9693B8711DE2D3F78EBC468269BC851D2ACDFF5E8A6388B73E33F20C0C7621C6B644649AB088DC191418292A698EFA4871224232A7788EFA2D69F9F9FBE80FB8E6B0106405F6406D00A6D6185EB521372CEDF51C2E0876C7A86A90F1F5DCC0EB3187DF8BC62736663F713A1D403665BD5AEFD6BCD3413FC63CD68B3C5C7FDE3AC4164FC3737C2703AAC85E6ECEB29E34A6ED70D4178402814B5207ED2AE12E9DE009D0DE6A0BABCBC4ED41D5C28B1943C4B61D8B1DBF4395F5BACE1E47ECF0EB9E21F9E7F663EAC3788E935A1AF73B19714ED91BCCCDBEDAF1C74155CF235A58485BCDFEA58A929ED1E959DC99345C36109E42A14438466B1F9E728801BCADD16B2D8F762E4BB8B3F01E531339DE79634F43117DF5C585D7D2FB4A5D3E82BC25FD92BB1298AC79211B3866CA1019666AFCB10BBEE1AB63263F2823A86DD3EC57E8632C9F4975155A01F22859EBC400F5A3B8302ADAA5892A320487AD077B144392528F100F0A222DDCE5636AD5962AC6D62A2382167EA977743CAA6BA2F140655DFDEF168BD620C73A47A8831DFD66DC6F2A9F47E0724081681BE62FD15C74846980683B729AF1757203F457FF12925B6B7BC81775A9E5C53862B07D4B93CB2E9FA896AF58D258384115F1C63779E4189832C29C8B142DFF30C00DCAD2328A63C92CD1E42B2A8D2E18542BA3A81686452C83AFD5F6955A708CC1DAE500718C6DB89ADCBEBF119C4707B931E685BAC00AA60E3B5F9F42FDA6EA90F5C77295E84A3AB05D69212C5368E24F18F43B450181884D7AE8BBC61E1603FDEB13797F9620AD6C2B863C495821F7F726BD5801A3D5A36F4609B595B7653799B3794E4A60090D71F5DE1AA5F0CF562F7E722C55AFB676395ED988A491A34B462B2D18AF517569531308B8190F0148CFAD463802AC62C6CB289FC0C95C207AADF82AA7399E0476B774D9B876829ED91EA3E5C40B504370D266B7B3C72DDE2CCB7F3AB8E820ECB5715289451D352D83DB67EEA889EBF9E8B012C8265376C841BAF6EDA4067A400D4C6FB00539F3839A8D0B29906F9923B9244132282E38242257C339A0D0BA8F05F75D41ADA51E29E33BF65F78981F04F397BD5F9580376A8D1C552363D6BE90EC83C2AF748CBB7783D6B26098C641777A260F5F60A712C7A7D1CE681CA1FF969B8F25B90F9A2B03F71E06A848DF3C5C8571C5626D5A1F123DD14A9F90B3958A7EFB3FD522C7E83F897CBA80B95099F1705E1CB22C7E91DB644880F7DAB480B29FC0F8E1D0ADBAA123F1E1FE36835ABEC924531065354B77DC1082DD690B316A7BF104140F6316C46E81E777F56EECE625EA030C1FFBA3A4D40745E77129230A69D76C226A80A8CD31720B08D9207F22F8F3068C169B41E7136F94B73047377A8AC0987490E4DA2B7619A760E3B61369BF762FA9A3ADCB014CFD0644AB1FE6D8D3EFBFEC893E98289DA93AE19D8DE41AB33FD717200B6949AD21B3290C77D5B1FA44EEC7D0C6A9978D50B40DF77823FF2613BC80D0E11DC2B790B332D5267851B6315AC08D0A2D6FC0A8F93DCD20DA6054894F84C88CE254057CD2FE36693F868D812DD1D978897597840CB336223F8A8EEA9C15AC05D3E40333391680C4F4CD5C2F600CAA684BF09EFC8A9B71E6883E9353C22B379BB6ED8ED83A2468287121207D9ABF61D2DD5116D3B163F262BD3D57A23EF2E6154BF6EEC1DF88B961C4505F7CFD2E23E0E0D245A9418292A5AE6E60F3852D78D19E1EACBE9F42A522FA57554308A1D01E31DDCFB7C38534F7B48E0384AAB4B81A93681ECE4C55BEB089092E757A4633B2F30BA83E470B3ABDEDF9135DF22E2B29CCD0893C54C329DA1B16C2FE4221F1C7EBF6B3D6DE84EA1DA57392762FD9C64C0771966B0E1FA9A6E286C23128DF317F704237B97A339A623C985BFD6A0C60DE48EBDD73A0610A22B02D0978E626B50171FC8390B80F37E5E536CC184259D4ECFFA958DEE1A27CF3D2EFC9B218809909B19D573EF86087A1C9BE161C54DD1279E022F98030669FC93A7BF03FB101A3FB5321F654D2B40EF8298844806BB66EC32F7AB3BC7BED2AA7F22AF20759B12A0E3F82D3C3A141F393DE746D5A0D91F32D8249F0DB0FE37D27E49795C648EC6D96E352115FE4F10D1F56C39FF9140E3E87F13AF3C6480D6150E1B7B4AE614A577D6E81694C19E468761039E970335FDE9945F6119F6ADC184C9F2A434C681D593F34D258F2A8847E02DA5EA2605A007B25031DCCBA8A8C50C77411D197E742D4B3994471AE84E2B612B09B2BBAA38C5E71C22A8E3DD1F284A681DDD45E962F9D061846EDB9713D4F925A9DAC0E32D2A4496F68C68448EDFA87FDE3ECD47411AF5DA95D8C48D5CED988AFD72BCB7A81896EB1496F468D4664A58EC3874BC6FF6A85692790BB405592DFAF53CBAC93884A842EB2D3DE9619843919CD9D68AD89DC7A84BE54C406B8208428066011807D722C2B34D4A279EE43BDEB967360D9BAE50F654B2A06B576B803544DCDDAD670CF8D2D7723929842C6AFC4093BBFBB75D1F5E03682500AA0A34FC66CE4409D08C726552ED5ABB0C646E89B35A659C67F6F398D6BE39D9725BB0322D458DE2A62E46B62013F2BAE5E60C3D41975C6A4C6231F4B0EA2827329279459840911891B0111FB4B1FE99FBB482FED56C7BFBA15882CE5E2FA2C73E0B682EADEE6F68E4E1A9CD92FDC2CF30902453A16622AAB1273407B985FA4B7DB40D87812F2A10183464F8173D22D5603C44586B107B4B82E94DD80E87AD49E9C0FAB5C3330B74E89F742CA1A5940F0F329F56DFD40C6869D0BA8CA412AF9C5116ADBB3C22080F93142C7778D52C4D75F1EABE13FE50877C26D7DB429E991506ECF1DDF30A00F9E0B355306B889F41BBFD1B4D27B67952E4A0B53D1BF8B2E84497F00826D84A913F02649D5145383163F3C3F586EDAD06F518B64D9B300C4540A67593B9F3358FF2A22AC4BD7E7B9AEE507D184E039ECA3BBA0B5C584D3359D7121BCCE01691E11C120925A7D8B100751E8ADE99D3676C7355BA4BE451920BC7D2AD6E8EF0A9693F16FBB570122FE5F5FFBDFA490B3C84809ACD898FC0F807C77937C7CEB6F03308D3E9C657F80730EF3A1CEC6959850FAA6C158F23B23D28ED53BD77531F1012DC1753CE1AD6E0A629E14BCCE9D56B74E09AD6EEC9DC4A5C92049D48AE21222AF706B1C4DE65AA814AEF5B7E1EDF2D8A9C5B98853A17199DDC3233C5583B95756F5A9C175FF7D0891010F5D36A268ED5C9F58433A69185931E11BCBEEECAA240C2C5A4ADB4E770109F3F16CFAA37AF98E1228FFA7C584B13F850FED0187FB836E0A01B19CF700849EFF09BE1A57DE41CE1D52EA6F182E0DDDF741DBD2150113B10CC3D9E44917E0FD9717D6D361A88060E202039AAD8F31E4E6FBB4D7FD1BB5D6DC20C3D83F23D120EC98FF4912F3D9AB18D8EECBD7EFD1CF9B19081B38CD959660E8C63A539939D0CEDA897F5ECDFDEE16ECA492B216BEA35A167178F4A0FB76175D160FE2EF97BD6BA0E296922CE60D91FCBB3343ADF477F8A92AEB56A471B0711CAC45DA8EEBD21FE83FA68EB74C8502C81C65506C92C4A3F19ECDC2B7A5AB47704DDFB2E8D5AE620CA0D67197699677EDA3FC4FB821BFFB5F2DB03D4DDEC0BEB13EF84EC372A5C56C1E712C8D23D1A2DB1BA077645C85689CA2258E9B1B807DCC6394680B72938E1B61AC3E8A5B9E84BB4B58CE5C8C2246A604C05701C026185CFB872BA78CEE33EAFD0486A22C6D5CF9264EC134DD79548F3CF5FAA67D8B1FE74F6AF7B897AB0A0D8CABD5E1B2829CFE66D58CE00E68C6F23FC35397FBBF96D2E63825C96BC3CEB22FCF9CA46C93538F8DF566145D06207533627B665E39DD284F4275051229F3CCE9E9E62EDDFA55BB2AB1D1D8E8E6145B3E38F35F90B89C15FE799EC14F7E415FCE4EFA72615EAD26C10C1FFA4FDBA2EE04C4845489C21BE45C478D8B2116C84AAC21B48BD4181FC28C7C21AC9CF95D8B04C0D817C8ED8083D9CF8B81213AA2E3B8BBF4AD66A7AFDCDC4C420945F5B3E8C8AEC5C4F98005A0CE1B3283F5FC0FCF8567A150E12639CA85D298CE8E4F9E0C53817D3009284A5A0BD5D3A07234AF751AD059E301076946DECFED43DB1176A2BBA4B8A571299FDE4AA3574B6C189A721674E004F259B00B26EF5AA90794FD622040B80CA6C5E9FBD44B3DB21290353878F4D8D87496E374B05E6A5B25742A885569DBA2501367EF4C549BD5CE6169914A7F1D311D52CCFBE2091F0DB436506F210C137C2180B89626F52B4192C67ED06C1F9175E44B9468E6FC2208A98DE577962D9B4C31D5B0DCF4017DB1BBB2F80512C89B9AADE69DBD584452D25CAC97A4A7E6F48BCB909907B93F5B8108EDAD38CF7FB541328C5E8AB867DDCADD6A1B5083869E68EBC785C80ACD260C715624360F2F3D78FC1B2A464FE0525059A3D5E04BCCD72D23BC680CF7B25C5CD2AD6A0BB8366DB24B671D5BB3C12554D37C7A662AF9B9DB61DC6C7DE288DF1976DE08743426CDD30AFFDA05A8390A8F3A4A94D7CCD33BDB229E32850A77B2256CC595BE515F9E6854463966D4DB7A946276F594AD4BDF0B9C59D4D38E211A4465AEE023CE6C062FDF4123ACDED834F672C1A724BC17D44DE9632A588E7EAA77F3183E09D2ED55099BB1AC8198C96EC7B1635139980D5CA4B8B3102375A2E08BC3BC754D9FE659C3FA403218BC8C00FA87A0FA6F096E336865DDF02BB05049CDC9680E99C4F567ACD25AA7CC76C182A8DFC174BF6FAAF4D2553A4207922C1EA10CA8DA3E35DFBBFB5F6919FD4088A3A8E48358CEF25576A3A6447980F1C716EB58E755196A672C378F6615E54E9A16CEBA33CEA918768961C244A561164B61754F679856575DDCB32C70447BB738E84CA590CB523C6553F13EAC77461A58A7D4E1CC1E36E7BC5E85860B0E6B67C70D398AC0BABE1F42426D9E7F12B5E362BF3BDBAC42C572730C5F4EEA957FD3F17050625BA9D9938380249290AAF31BAC"""),
-                    TestUtils.hexDecode("""
-d90e5ad6ce804eb56c37cc30b96369f19a67ee324697634f7a40b3d150ba7891f9d8e5a7499781b5ef8f462ce1626eba1213bdf47ea40203aa7b9f6632a02c172826d96683de98ef1fbd163f817d6b4c71ed7fc9ec3a2db3d0bc692f94812d69ddfa81c15292b507d7aa3642b100472acdd9db20f19b60d98e10f1f47fd8f1498cc618a00b8c23ddf109957b78ebb9f5a7d6167fa907f52e312fb333b224c2e1b9b45ffe6027a90efea98d854ab6c6de67a5f24ee28d917caf0014774770989a4816f39fef30dc70b7e068bb306ab404611620b9dcfd40e1cc72400e398cfa342a616fbd5eb075d340d9f1d095b54d01d190b055f21d4de73ccebaec652f982535919e8ec7df3ce42f6e0807252f88d4fae025c68e5dfcd9ac0af5af610608011c630beab1b1bc760c550e79696333b34eab93fa7afc68e900686d1828bfe2bdb57332a9dcb84c66f12638a1ca4ab413efb847078b79610c51ae1cd81fac71319f8e43d356baba173c9775f9dd2569c3699a2cd2e9accc5ff725bc951b6c007e7d7b16b5f3efbde405d7d945dd1fb38724c52958427cc14d7a1f913c2c911fbc50e61a1aea400383561c78d32a38677ee62b201067c6744500f27135fd789e6adbafcd841a2796bedebe47059a8917f5eddc09eedf7aa6187f7f9e91e3893a3870b307a47da4366f767045390e1df69909d50e57ce6b2656a9f9eea5222cb8a05142c09ce230dc49edd7c4107241a4f317577c135a656071335408b809a18588f7dba155bff5acab476e99e62b0249e362d75ac201772552865f91eda373f722d19eb4e4f66c94627667af033c4d4f8e6eacdbb2a6abf47c931527c66da42f8ac3bc1a9c38e88a9d862beb1785ef9e1edcc3aac6477fcb78bea88b5a7796bc6e3e33ff1e0ca1fa73e66307e409365ccc8cf5a0cdba2bc96a7150d030b1349b15469ba21c7d53c641402776d61fca08d0a6268b43c063f51f110b8708251030cf393eed4898e2fc4f9654c05e700ca3e9d9b68274556f88c61c35860579ccbbfbf3dc367a88b076a4618772cac1c225069ed77168bc9e50737d2502d6b102a8904cb3118489e39c31507203175b35a295980cce3f9653330307583e3cbe2ec1d6e5578db4e5fed4bceb20922036891dd58b00e0e98a408f2212c5cebc7faaee235162bcfe6e482d4d1ca012078aa78bc9001a021c14e2ce86e484ad41ddae6c256f05cbbd64d99d20ca4fd0fa65d3565bd749689ded6c835d1370b047dbf1da76cb99f43ce660654725a40f7e8dc99716bd12bc3b3cc140eac2d230ee9177c8766e3cdd8d83948c98ac97b28826918a8835b5b563e887fa2ae18fd47d2c56e7a213d92533f05bb608baa68518ffcbb15e6847a776029809450ff9c0d4fa422fee078fefb04e860f5edc713412436e836f873bca3515842f70841f400db22e21c7a9c1ae25727a39e7e00e29abf256cfd8817115303a40c61577ce6e914b8c6e9481165f554be7a58c22c6a66266222ec80f1af4c6455301cbd80f5cb42d69f524d9a121699eca6d78bfc4db7bebdd8d03f83a638882aba3967f377be4f54295205b8f284a341796b4a00ce517e41ad2ac1d1dec2189a702b957a4d5d67fa1625341266585a220f0c276e339c29f58b13227021b6631cc37701899f0d7a761e13220ac0c39b5f98c688571915c38f8d0a23811d11cea0ff0e319e2bb06ff31990e00aa254e671f350bb9be4a5c78a992ea5de9276b0c542e2544d6a9a2e0339805ab40a9066352e2cf864a102406c4a11268b0ea22d029bdf694cd2ae75d9184920a9a707ab649a8f422ce4a85fd30aadcc07d3dde5b3b753668a303267aa1e43c81617b6aff5c7cdfcdb66eae646146903cf84a014c696473d0c52e19fc5da06bafc475ebbc367cd775676175b4268b42132f2959349a39e73ed553fbb50c8b213e4ae9d8682b837a3d8d938d4a4cfa72b564a39f5137afaaa442b562ff09bbb5c2faa2197f227979a9cf580dcbf01a07da6239f709fa91185e1a0d0847d77a50a4825fc0c2a6dc7140de2d4789b1fb4587c2e9b24f33d11728071548ea967622a1b97af44b51b2300c2c87d1f05b8d0e710a2ea5e123e479717cda447c0d4cc2ccfe753e6da45c38f568a8c2a82418420fa5de3fe08e196f2e2c6691b7774f4d4351c37e974721d4c505a6ba037969034627d05014a543e96956cc991e583abc9125aac8324f46e71345811f7ed8553bab0d166cd8bfe2fc21aa96c1ac168b40c61aaa7ff5461cd2c1339e8ac3c54cb1a8abf0ca4e7edd9e9842a01a91eeb6f3702be5e81936d53f11ae7d191cc6b8afbbf1f78dec898a0c30df889f43a8cfa8ce1d2a324c15b501a0ace8076b26334fcf03bb3db377d285a812f3ad76c0ecd7aa3b76f9072e40b272d514fad2d661d168b00c2b27ed394d4cffbbe38ffd1e7b84bfac69b4fca99b8f316471fd37678e4501f16ae1b2acb472c065aad5b482cc893fba258f29a90e1faa8f4c5235f136b25d1e451f20784e6b761dbe4fa68a41285baa9634f7d87807c407a9e7be6e483f3f224367caeba42f0df19b5dce47630396ec6ac6ff1b5c23e02f599cad3ef117ff74d7331facf763c39ea70c2071087774ef8a2ff268f27d06b96e50bd52eb5ab55a9f5530339abe6f07d5a27f64aa8015b5d2a768452f8ca82484113420464d06d7c61ec25c89a422b788f3bae8e79c0020fc93122f53356a9e678087f80b1938e42fbee9efab604f959b7f4d8c52d900d71b24c39a1cac0831c22907ab3348ad20bd6818023a72266983678edad084a13ee07196fddeb52c79bfb925e3ef4bae2ac564b04956c0097800546e965687584c2738a2009b0caa15183ba1b6966488fdcca6937bffdd9cd6f51424a83cb6324d2c845dbcc9237bde7126516ea59d36cf2b63ce239db57c01bce472886eff29ca612510ca318398aae4618b8d6fd9f6c6e8cceb4b3dbe5d059038b9a6b81e07f3599cb1febf3b0dae4eb9d5e3b6a3e11b24aef1377cd941f94a56f7c7f1fd85807d9d97ea0aace9d94516dd7ee271880f4a7bd18b4266c510e16f95aead24a9d3202ef331028b0f4233023aef2d18aefcb5dc66eea08013463c008b86faf617fcb6929a2bb78ee0459788792c9e3b5d3cf92371f4555c0955bc746264cf6f56edcd8bc8d044c170610fe76edf0e875f9d6d12eceeafd955e0130805963455a348ce41788cea9e2601decc02006907f5e092fa70d2f0f21945a5f24edc734da33efef7efeb22c8b142d86a47d9d5c13f93258eaa396e3ce55b8f6ce736a5010a347b7f9298babcc6d7e4fb03192d4e57daeaf7fd03041d262d47676d8b8c93b0b6b7bfe4e9f9fc0a161e3368a1c7cce7f200000000000000000000000000000000000000000000000000000000000d162933""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-c298f170b4286195747d986e0de1fbb602feb53b5f242a12bfa2b7602b22358a8a23b61c155fe3630218b5ef74b2273071172cee1ff382fb09b779728674dba788475bd8daffacda50631973d3a038d986fa56e33293538d828f48d4292fae5487dff146e3e3ff99d2ceefe847f17e0274f2e9edc0c3b7a6b184d2c7d771510259180c02294d08c021e1128c01b9004906315b180d1929411895259b3285082964e310414c920c4b9611c380101aa86d1cb12c611286a498699a385019018de13882d0b8401c340a824689a21640612886022028d3166d1c328a18b06de0383164b46588487243069202900858226e181428da4640e2c4694118859a044e0301041bb4411235011195415a962499380e04c72110458523824101a929519029082064932669a2102160360e0c860112312c44a28c0b2272e3280ac3962cd1844514482a4cc26d04a1110c834c8a026d43b83113890113c60d49461014408a129725d8369020b325138728a4a44904814d1a324edab810248590c8406423c22849c265d1068de3865104a2805198298a126964084604b07043346519c1916204080a27608a144e1b2270120731c4a808a0968ce3884d2210682231481ac49180a80c582031c2120adbb4441b82641a94080aa5659b46711b15445bb81113a360203660443608a02432d922318c22054138605312220aa700ca441290946d5c405223264588b80864c4251144240b051244200a09c4101b938993261118c08d9008241b364660022c18060e5018864b40051888418c806800152610c30c91162dd1360e0b491014c18da44212a4844d22193164a04503b70c212690032661922862201106434471da324890389258b260d32028d096240c074610a36413c24494888c0b328a4b320a9ca691dc284240220d23b671e3121200a16004938c5c3288c1469121870511912d8a285114354012b86c4200460a350489a49164048d001405cc266143a82d2048061a184d0c056ac2a06d9914710c26251b33218b144ec932685a9221134541042770c2227213b909db0001010485008000c33640d2882924355122982da1322e1a280021246cd8a451903464d8144263260d9a080ad220111031258914890a1951cc043209028d11392151b428dc3628a406119ba6009194110c912913206e5030850b10121428419a04450b1871082581c22601183090dcc661d04089e2400a23044190a64401116093166090360e14859108368403414d7fe04cc3486ee59a1d7e5ceeac111381d6bf881ab59d8eba528410c1f10133a1aac55b4e0c69407bca0aa1efa29ed38ae018ac2f892be5d6f4d6099421cbe1328b07913fb0eff2be86b6785500416f14777de98d5129d4bbdc1e7d0c2dd161c3b53568ec0710fb80ff1407927b82261dbc6a301a5ab780b88d080d7e8a75e5253fa666e6499718ed9135d2658235755a107f617dbadd6ebeb40906bf2c29dfedf24ca3667029f642770fe012ace1dd503c33e0e033fb90e0e8598870a92cf3b467d667f6747570da2c86a328b1b4c769f4bd99a90a46000018a6a8126b61b51f9b77d66d91704c5431a2c5e4a7b680f053e7e1f5505d74af6a79ec08e7de4d45fed1888c790e2473e716c7b1cbd1fe9944fb56fa502b5685e75bf23ae5ffcc4d5a525b91575fe8baa856a445d7005a2cc81d0442e4edc3fc19e4f5bebabe21a6c1f2520c38d1827874261b5e802514b5df1816510f894eb6d5c493c82ee8f3d2e7b159da2022586525548037e078ee6a1ab31803b0595f0ebf07870051aeb5582702d9755b98cd30ad128e455c15a05f48ef20448f395af79a5127c4a9c4b04c29764ebaa3116b9fd10bb6138750eaf6a300d7f3294522fc92e2e95644d2fc35222a08a51e49a53ca180cdfceeebd5f6cf0625862770b338246533d35d31c78395206145f88cf17e80c13ae5b9f3aacac15d526e9561e5608dedf8d2163b9b283bad1a58d08b14a201bb0fd91fb659296bf847ab47a85cc58f5a8e9c9a5c132cabe71fe3bfbd899a60fb98b84d962607689c1295470c23df93f60ba2162dee0893230ca5bcb4dfb2ee08ababf98992e27ff92d5569cdbd77dbaa44dd2fd21e8b398525a5ea3f2632a581e7d94675a2b51148afc18413c9e39b489a6155f089cd1ea205e9b650be0f1d3befd1d8189fe94793965cbc0b118913a1b5e4de66d969317c2fe4f4c289070c663db3684b54d8b5c29d84cf1ca9b77794ed6171c945e42e808ec0709d2d284e5e022495c7bb67f215c023f97a0f248ddb6061c7f68cb0c6f688f785cfd352021ad700d410968f389a17261bd1cedf8be5b623fab823d5a27e67e68894d533742375ecd6d41f124a39fe2e3e548f3c041b61179ae7961c248a05e7ae1b3023890203c95b73e70c65413a8f2d97272dddee2445220cb6f1f69e5d47f9f8e6f2feb116d688f7ffb9afae3a6a7b7335fdcdf6c1b2f28ce98e1ee76ed2b0303f242cdbca4091abaa25275e98faca3b16d3293f165d5e653faf20d6afa94ca6f899008e31aeac9ded97911c1fbbc3de8ac9e16b20bc91a13706b427aab96699f46e5815add64be24cb3484e20fcc9b113c8da4be3b0f39dd183a483f8f6f233a3b7d41008ea66c1b0fdd111847e0abdb4dc1a73c22500b39035d78048b2a7b1b537f4009656cf7a2744737bc7066f99d7b23d0d109a2e9e679742edd3d89ef423c5c57bd2947fef985898dc986cbe3ce2e9d57dca7d4fd7d5095728822d687f22a3d7d291856451a5aaff706b4a7f68f36a753da02562133be2e3a30e0f5ea8fe18b2602ce263c6065aaf15719d8d45166216d37bbb46915da50aab9a0f7900784e7547a0c90658d5af3d8f4c88e5790eabfe578976c8157fa0fb6db133394c7f16e79b6854900fdd9b6ad0b35a877e336abb0c484c8c258d165c83fb72595978f7b2c01b05a34826202cb73d88f5e8cc879e9994be5b3eb47b336287d7c3c036e5666afa557c834ef222a0e8768827c6d56d315a61630106a4ffa250e3bfe1de6a6cfc311d3f3e48165d8fea2afcb14247c2da102e88d726f4865bd848d87c01dd6fed84e0623d564bfbe8bb90963d6bdacf36df337f00afa83b1eeb5309cd6335e4156d307a28ae3dc791210b482e9a0504895dcede6dc951c3c7ec8098de79a51741eadef5fc2800ee410bcdc2999ef9e38e33dc3bf0107af5d32236f26c31d1ddf62b6ab6628a5bc4136d9bcf62ab95ddacabd6dbd3afddf7556e83931035a6e737915f1f8dcc217e247402745af979538c28f91de1375056f0e369c648482877518ccc1c976e21abb3c8ff30853d5967655a0f7d4ab3fa1de5736d80024b34f940aa744bb427a2350e72e2abad49cb6a91a066efabd87d286da00d9c731d8348d4b094e089da1938c74185df1390646ce73c0687e63a417c0681cc4438ea446fe36496fdf5a808a8354237f4838b51182dd9f062ab6143985524f01ed273db2dfde919865c1a5d82c67c1feee76609fa9634e0056b7803dad0015a27445028e5e87e439f820042888b489b0de499cc3ba6d5aba0260a0cf24f718b013b72918909283fdd28025c011d0abe811e6f484d58b27dccf5b5fe"""),
-                    TestUtils.hexDecode("""
-0C39B65F4C2094AC626652CD33CFE44EDB2667CF722443514CAB443DC398A8EA009277BE397E1C1E7ADCD1B24376AF0F19EA50E56C90D683F8EFDE693F0F8834199544E2DEFE392B0BD46048A83C412A14834C4BCDC180457456BC72AA28F2DB247AEE84A1C49266361DA7EDD54BD9B562889131EAADAE071AE5A671646F49B2C1359382F1A3B2A6B437F87CC99A2A1BC821E1F3DBB311B8FCDF28546A479E2F9970870066A2D6447B6CE4FB65ABE7423910B9039EE3234836F924C8E82E1299335E27B0DD642B812480D6FEFC47B121A710827DE1D18DC12064649224FBC4526AE14317CC8E53BC8E9BD42BA444AD9B8B48C3AC807D7A7675F43E3021BA1DF9AC7A42A9E23D696BBD03FB5C4702B55F95854C41F470CDAD8A255436F910C089F71C2E59A44221D78AB81D4E2B059CC92A3841E1431415DAD4E6EB0315F423DA512661E4CCE098D6678F560A4BA19475296A2A1DEB12AF5900FA3A3C188867E0C268EFBF7AC53455552DF4F36E16D50E23048C7DD4E64341E6DCAA0036EE045B82C42121B0B779B5E7FF032F549536ABFB702B1CE4EAA5E389A077F47B1B55595D4888A4C1D17F4E21706779C9CDE25DD1261C8B4761A40B69E2F22F069A264E79CDFD36F307D117FC737D88F50EC67CD07D8FA269CF265A7E7CAC93E97BC29EF95C88904AB2DB61C8865A6EBB23871576DBABC83920AA015D47E8CE699A9E57E139AB7D233C577B46C9C314D084A1674A152D87D2A3D8A5D9ABCDA22E212B8C9A2BF25D8AD22AA3627E6C12C684AD2BE917F094263982D396364F4DE0BAFAB2DB89997DAF8B7E3AA953C055776FDC29F8AE5C28D4071534A9A2E9090CD3F723D3E381A2ADA6D9463FC49B3C6D2B76803F5C21D8DDCE965D2C472389D2BEFF448F2D81EDEF1C851A863AF66B64417BCC2CBBC70C18875055D171BE32C06081362FFF7DE8F8A23B076839602E2368CEEB79E4EA53F42F440D167A902A23ED53E6691AD3332DF5B0160EBC3B5C9567CF619BE2201447EA500332ABDEA9B849C3A395F596F2C96ACD9AF8313E453277B9F4234874E791E9DCFF0C9D9DFA8FA9474C026DD34E5CF3AA10CAB1FD23EA5DA0D0A66E520096C6116944F2E5747A974BF55428A3D2475F6276490AADA25220F2F2111892DB9E9C75A5401BADBF69F31B77535044DC50B1E93849F19C0B6C5184F1B14F68960F9F469805F3843198AC68E51619F3D712A34279AEA27BE4357A99C44C456BD2D9319147285680922B98DBC4D6D2860515D1371D2141C7A1E76EEF8586AFC973713EB89C1F09A84AC064BB7644625224FF1F7316B9DD1091CEB151D1A040F7E60F202728F7862589E7F1FA32D39653383F90C67D96D9949967AF234592903CBB968E0D979B92B5C69D09EF4E767741F1F6E361DCFC8D751CB8C3BAAC4CC393D63F71AA1488491CA06CC20B0BF54C5C225B6F0825677C2C40A395E1B7322288A815E59AD2999D61FE09C95828CE18B2997AEDCED56CA8BCDA4343B1E948256AC5EBDA23A8E6D7102A4474CE23567084547F2ADD9DE77483398D81A9A9C7A573D7EDAF99536D31C3588BB649EFE1495CEDED788EBBFD5775842D91DAAA2F9BE08D63B06DB35E72CD0EE5DBF45DF9B0CA682BD944A733D6875A62F8C53A3FA9337F13429FACB288C73220C29285B2D87DF2CB1A54631AF3D0035C1F3B26A5EDD07760A63576A395827F3D5F9B03D9E47A9E1E6A271021942648B8424234080492BBC56C692C769B5DF32A75F7403C88469E54432A37A895E3CAD3AB110089ACF534A0D78C2083CFE149A2D0A5055EF9F4C943CBE1FD393292518CECFC57E4FFC4D07A563A30528A6A3540636A3BE770B7CF03F5004D7C6F8ADA08DEAAED0422AC0C0C8D7515C9F8BF44195D6DC30D9B3036DA007A910BD05DF06B032812CE8393AE2777D717A691D07E860C1EDA60F6DE31F0787097D0D483E3A51CA7997646503738CDBAEBCC21AE4B984B668FB4020C139D9F581EBACB7BE263A33955DD68C9ED9BD2DD6C0A7BD049972B624CB7E787DE7184023F33EC0A1539C4679D6B4677FB971D763BE17D989FDF8C0AC4E0B5A6CB40A49B5464610A110EBEE9A21BB0D6A2F043015EB2C8820DD966A13EFD18D32367834D41E8673E997B2803638A710580CA08DDB4D90E4E8EE584BCA2FB853A122274142130A1ABCDF7DA6C0056689195099CC3382AF6987BA47EE294353674E7295ACC1C070F1D8E4107AA7189F20CC818F1D86F6D646CEE911B304E2FECD5A14CF5F36331AA86E10C319C96E52996D4CC12810AD7C1DD1DBDFDC78DF029BFDE9E8F9B1FC7D9DA99FBB0304A8129EC58A82177EECB7330E715BB3C0B4482923C7B1EC0D1823FF643014C7D08A8F2D9F9090B0F83663AFC5E601E5FBE1DDBE678B9D93C5A23F564B8A4DD29C8D19106747959E72AFA4B16B879E3C6E7F79A212A144F9AAF665253F1360ACF7DF37642270656583E06FAC85389A3AD76E69BC2735B1C3E13B80CCBD298EE25C29F9F5C275AAD83BA0E7C47526253BB3125EBDF5CCD6E1C4F9D9CD4891167BB4E4D2AA644D5D362C6F790E2776BDBAF8D96DC3A543C72ED46E431FABD737B4BF0F4B32E12E0520E60401CCEBBB40180985948045C58B0017C3D8797E433A2E2C64B9679EC7409D59B3992053EEF2ACD7B152E5F564196876EA0A31CB6ED47F2455BBEE6827D96C6B99E46F3DF1FA21F593E842B26E83D843118F6833BC273E12C7224E00E840B0041544893C6C8A06523DEDE2ACE7365693BCC6A8D7DD81B01310CBB8084C5FD3868539F8B5179519CA6745B56C4A5EEE8F2A8A60CBC7453E1E0990D176446D97F34A2D0BD5C5712E2D82601D0B9FC9A3F2420C65E4532DB3810FBE3635B2AC3A84415535FE41208B907EB3E97AD63DDC4FD694127EF1E948801B5CF651119CE17BEAE3396C098A86548B67DDABADCEEDF60F57D2941815778AC14F78C78516F84C5F9749B433DB97A9283A94697419CF94248B6819D9310324977D47A133AE9F1FC141B56D6302817761BBD52B4A1EF808E0AC761426C99E0504ACB6B552F9550D55DE787C12A0409A9F9EE3674617D15E229AAA98BBF4FE49CDC81DA3AD110645132B332B6D2AA38B35320925135BDD225053D6594E78389909E596C63B85DCA8B3F6C3233A31A1F8F3E900E49DF83F649E592979C9CA4BE65E7D6D1F23A7744626972D52B07B7B89CD90238A5E871666F4CA6DAFCBF34FE15983AEA5BB7F9917736F7BA46F342F0C08F56D19AB9569FD23288EBCBEE7B5924B8C86EF77748F3AA9CF2FB884398F83772C9771958B6DD063162A3AAA42E6A3280FEDEEB7A628A07702950975CD135D6338FF959ADDA2296B3E85A024F63D4ED8A5859786E2BC76C2325F37B4D91EE8B64F30E781BF48ADA774C1641CFAD2D63A59E294B5D99C94108154E38B499E3CA2A29AF7CC77A8BB3A3B712376CD081715EA715305C18B51470D5F3A6A82E9189848311511E8B0ABACF856312AE3916FBBCF6664523684D3C7ACE08D2345A3907C9C07183CB3E68C5EC3899A95430E278A72701E2355A4AF606DD8F8750F7F3682FB84290B2BE23BED99CA06D5E54190A5558C927C369C00C512342EFFC41618CA6F8FE6E3A38D1714FC44BF5679C1A49CD8BC8B28499602E277DC8832F738225920709799DE6961E0B4EC12397E7891AA772627F66F494AF719C55D056DCBF10E8E3DDF1B6C1BB2F0B2FA61949D1CA7D4E1F60EF836B086FF8C03A5916A14EB2670AF56264D7390761E6EB6F638D6FACF56B72A48F271ADE4541C8EFC91D15F69E0AA6B97EC0E9C0C3EF169E4A4DB1C1AF04762B98ECBD0DC374224D98FDF7788435BC154E1FB06C970A914C34DE52678F61ECC1969A2C5B1FF4D82E2C80CB543B4B7C9DB541229CC50CC6C448DC029CA24ECE635233C401D3715671BC75785DCFD929377AF5B65EC43EF45A9B00CC766695A4A5DE9A2E6582F7936B9FE7DBBA6762C41453683146F4ACFD809847F866DDF559972FE0C093EE7C9FAB3CAB0BC2BF8DA19466A96BBF2DD4859E2D1CE122A3CF16AAAA9A4708F72BBEBE285E1B794B2B9C7A699B36F39F033277E8B7BEAC3BC70A572556EE5C070A309D9D0BC35F4B6E55ECC91CE9AD273B0098F64E1327C85CCAEBBE67E8A118669653495D2FA09C29C6FCDF870905B2C8BE0DF806C29D5E7AFACDAC5F89116A3474D2229C76E649F99EB9EC71A2C229764A477853D68C39B8F0BF4378993AE2B26E814A337CFC103760CE92FB564E3A3E4546996CC4D8B6BE069E99861DA9C731B543BFDC006FBDE3B33D2C8C4A3F5789466122616C98F52E5E4BA239E0C3758C5BDD3BAED8809F67A70504BA061409A9D87A499236230EF0F1985DA0D765E9B7F733A154E8300490F458847A89E7C6BBEB7A9ECA7B6CBFFC3124DEDC1093C02C808DA1CDCFF5237745C5FFF51F3F15CF746D3397916A45990070490CA74A55F34EA4BA9EB73A281F123035C005BF6C7B30852665860ED13A2B5808F81435A77A8504B58CBA45559BD3BAA663A571F108685E414FC4DBF8033075E30CD6FCD9B893DA32F7C8D5D971D5EB417F1201B00F65DEF4EEED3B55B7FC7E6194B72A861439B865558157E65D4C2F8A1A93F48192099B375D111370F830B34EAF3225A16006D4749494B9AB9D3B05015E34866A4A2D94B9588A8DE8AD4CF90F2CF422634E8DBFA0FE3FAF27C3F3C2EAF9C1BDF23FDF43D196732E1FA6D2B343BB7D9F5F26FFC31B26C64A8EFE2B2D86AA34BB618FB58CCB54486211A8E66648CEAE52F07A6C1EB5234DA7CCAA971AF984D6050D1A81F10E6D19CC44B5E668CE92F4251924B25DAF41D5E381C3FAE4208D18F710B5F93CF3C776A3D81C608B06CE6BC68FB8A8117CE7BA065675B88510F2E8A440EC363A5983DDC1352E446A482C593A490AD6093258E447EF52BFD189ACD11C87A8B75F08B5D166C1DA69602EAA5916474131E20F704DF84C3FEF2AE99F9B9E8F7315A143A07C7AEDE5797F503086DF7DA971244A61909C4AFB00842FBF4C3A59B991B58AD6C0B8667C449F0D97F34CC41FE935D9F55821299F780359E2F631858617437D4AFE67DE4A1AA382B93CC3FF596726F0D1C071FD0E00883E9E03811FC659495AF2A62B45DA079A66552F2928B6A25C6416F8DECF723623764441E5E581F9B2E36479A1B6CB3DE9B090E3343277CD7F84E80219793CAED4945DF782C4B72B498A62A1F5362745662F711A7E47CB816EC7069D10CA8314845AB0C9FC326C5BCA0E2AFFB4E6948522F8CD9C8DC008855E592AEF1F8239748916878ABC493E33CCFFDB86CC2ADB99B6251F493F0D2A0BE56D133B66395AA695F6298F7F4BAB41420CA9B8CCEDF2719590287928CF6BB3A506D6678B814076B7A774BE9B7029DF9F4719AAC1D012BBD49EBCA6AF124D0AB5C5FFA92B4A895CB76B88DEA9C7105136D78B76D92079A5B001B214DDF7E140861D86ACC260B72ABEF2CB3A75C2BC87B39A9D9052D4283B71C10AE275474E82A5FEA1654EC3ECD468DE4A015CEB67BAE3275C2C79863E2883D46FAE351F0908F42825DC7D9FAE0FC7171791FCAB10E16F3F027E5043AACBDB1F05FCD2B3EC7F6F46AD6DCCD6F9E6A6AC702451194788D14261219F794EA195F2B3778654BB373C68AB4333E224D161A1F89FE440BD8E968B518EEA28E81B89E04FF1A85B879E4B54650FA8DD1322D14B4A87"""),
-                    TestUtils.hexDecode("""
-c2112c791ee26987cafdde1bc02fbb99d5b97ad71d4c75cc36cda559ba853a351b3088a5727856774fb3a100640034901b886b9aad882c879f7f7a50090b1b4372ef71a124563aaa22ed2b227f76c4c5ad691499766556691ac72d3ed717eb83c06951bc8ba4c8829b225aca7eddd999e9e6e9cfca939ba21d2f7f79c750f43719c520b344252a283cc677fcf1dc27a4dfb396541c97d7e948ab873640d1a1a0d941d2677878360eb2b703f727a00cff03547f5516d5e18b07d904e3d978a905c83b45a2a58f407a5778d6e6da955705f0e55931fb31a1b1be5196b6e80574b8e37022d4e7778bce58a817aeee7ce13c07196dfd6c00a6604e40f3d12a46c11bc6295788be5bcb2a39db2bd64780b966530496a23f9e60ab9c7a4a48a5cfc3b1f657e00aeb99eaf8ae38e723cd14191f927ebd7944da428584b23da5ada543d3c071cfe95910aecd65f7be88aa6c7bfb6e52ec3c925fcb0fa4b09d7612a8b19a4156f44d07c77eb229edc08d78b52ddb7bb3e42e95faa1b013d4861ce5166fbd0d0822baef9bb5d1f41956be5cd1efef4bd3f92beb656957c0ba51dfd4d186e4804b71e91bca6f3341ca585f0c48c3cd496a1f1736f513650fcae2379bd1d127641f1a92c0c394d2c02301d29116b3245ccfcb6ae3b55b29503a49fe6357d3f027a20c30528abe22623c53c73970090b12d994f1a69d5a9877ef15f3475cd1b9d58cc38a0289e12a09ff756c7e93bd675b2354d78ec79492051751db9b3f35a58eac539d4c6efb259de9383d5eea913c98a6daa6173b113f8d7bac440e1bc4652d1645b96c4e3ae6697c9e6e7a1332d27f28704b850cccf469f829a6aee604e0906d1b84fe104303cb9e187a19b9ef212dd334f134cdf6256dcdd39e91283e6d7f3f808fa5cebe6263fba31f766bd86fb271a524042d3b42b9d1e7729c00c6e4104eea77934fb44fbf7b22ad80eba63fcf1ac416429df3c012afd4f42984b8006e5ab52b94fca1f54fe91ddd2ba4f8366cf74597dc4c2fb1554c20ca28ca4262888d70f342b55916f6eb5a2e6df5a9d0299f2c15ca37f5cd688792a5c255e2f684035770cf4a8894b750f1f97f9c226f9c451ce0b5701a4486b9feabdd379ad31f1164706a137aa487a25c088882c282b5f67599f8f9488b3c1b0540cdd48ad57754d760880478b686914cc7cbb3f478baf3742382749edb287e867d5863fc40a5f57805d1a7006a2b45046698ce63bf85fde10d9171a618a10da3b20d97052fa9416e56ebbfc9b1cbacaafdbfdfecf18d23df346f6838d90d2f0a45aa650d08be2360ad8b3259541f86946fa047ba2cf05e9542e67307dff451a0bea83f3acd2a328f0e9a7c870dcb1b3ef6a387c208f5128951b4115aa4f58193844d54113a5d13cc6e58cc210cc4865613db00c6c515720de072a9fbc60dfb50f48fc9ee71072e14a2380b62d644dd49c7c8f5b30233434f56ebb4c00bc1106f2f7b89d6f4076480fd24857efaecb3a3921a3f9d9bb84353792bbc017ec91775660c21cc6b7c2c5b629258fe1655afda4bde38fb66d9f5b90e0f70419d06b38de8bf050e7278cc02b9b7d762dcd32245c9776da3fe15af5bde873bbfd1d84e8083a06ae1d030a7d32e9a50be599ed816e47b54ec7b686f5e8c55c8edb7d7f34302f343ae7027234205c8d3943244f91ea9c2e6f2f33fb56af3a0ccc1c101608275ffd7a18201a0cf3291320e8c1e397684c604dcb23953aac9cbd65fb8fa615dfe77dd2b7033195030b57e005e28f14b316e63c6a62d81fee131d3ae71734e90e3ca43c6516996fe169bc279e3b398e8ef8929760da3389b29c0e7139a2d889403b823b3361c310ab668167eed34f3ff6e32542619d7d5298bdf4c9e7b4849f0310f386faee38f5e94f5455ebbfce87a34fa93b808d5eac6a62b1fdc84d3895d8c78e211a7074c78262c24c5153234882a4bc043703d997a1b8ea707712ed46f6fb654758634d1591ee3d79804c8417ace22343bce4d0754f4e72e2f518bdcdff3bad1313b974f7f2b7100e6fdbf2fcc34f5eccddf570905659ace5cecd78ceb88f7fffa03bcdb71a77f975f3d13146422c765a228063cd9cc92f0031b8ba6796025ecd4caa8bab5c48b0e6f164739150ac00bbfba4ce69cd212debadd620242fd5610f3fab75e7a0eb587e4ccdd010fac040d8c0b71673f6a6165b188fb59293138048805ffaa283b9539b947efc6382c929295769bf9d5e434b9eac6d1b9ff9ac26c0a1d1f0efa3108401e4f522579e1bd504a64d1359e44fa59f4f33ac4cf3e7508aab3388cd5be219937185ef7459b9c565034c8d4920d5fc62080db0f0930630d14c285ca11e360705f8ca5786e394842230636241a461966252d634cba8f68e0fc398b4298f4ecc907f5a1fd9795e427e6de785d7bc87130d986b286afcc646723010b329e8cadbafe1a9ee23f8010fa6ae67d1bf950c5f0e6fd53d31ad52ca81dfc5225f61de691d868130bf71d6428474215c9d5236a796c29f983064a2c9f40e69efd090ba55c47313f13b52b5d9edb7206ceb0eaf57198f32a722f9a60400bf550d5ecbdb0e460c791c44e56a1301f6f6bf0d9c1ff04ef6d238c060bc10e75114f7d055b5c3c0ac2961ff42c1145a8505e5d6c53389f04b20d2cbdc56759b861c803897be3eebf932a4877b1c4a0b63c96ef9369445e48f4b0ac34bf1799075db6dbb7d18d28f15f58152b0e2e618fb4551a85f5d1613a0a908a2edbc40e4d7e9683ebf5f9f8879e415e070a8eb52c71ee5451f95f0d351c3013e160d55c1207883c8e6fc20a4aef495c4194a7bfc8afee6af3b82bbd0a32aeab5023169d0361a4449af7a19318d063e4f2ed690b28f5d0786bd6ce5f72b9a6e411d878abe616767fdae52cdac529eb07074ec518723f8f870666211bd427b5253a67e40a318563a8b2d8916a746fc47e3ce26103c437e07db67ef057bae6a953614ee7acd16532d0485ad02b4bec1b84302e1e28c41e508eac18f33f76c150c3142e1c383c28ed902dc79922749842efc4c91c75754ea5e0678a117612dfc7ea07025cfe2e4213780734c4f18e191cbd815619b41b0f2e9965499ae19666c4ea34dc1af69dd60dbbe78c6f462a20699b58f50682e9602e7f16580149797067d0ed1b0b36099a0c5732d64d1efc1f370d4c71a6e77c5d319571c3d9274444db155b11286edbb625b77d1294d6dce64ad7fe58a7808b7c9edf7699bbc0e0342dc74158ae419c01b64c07bafb6452f131bd0f889cc40419d3dfd9c7c4418a37763218498c29f19a0b0d2b3e404b525d707c8cb9ecedfd22303a597091a3c3cfd1f8fd1d252641799a9bb3c4c5c9cedee10e172b2c33393c5054777f9eb5d9e0efff000000000000000000000000000000000000000000000f1b293a""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-53a902d7abe3103058efce7d2beeea878d48063b6dc8aad68420073c43fa51732003aed7006824b025934e1c8fc76d0afe681d830c45802205474b5de6388748ac11a6112123d1cc78db7b24bc040fdd3d546fe3bab7663bd5ef49eeef652e200b8f9745383522cf74a481e2b63b4f55fd245f2e9648a24eb158069b1a0a29759b0686e184310130408ca61062344a01b04954b068932848c834408c804912a5200bc9298b00509a120ecbc86808a62d10254a5208450c842924336510a069043809c04444a0902d98102e22a95120332a24000cd9166ea3c86924401203380ae4426d82146a98a88550185201b6485b068ed9a889002391d94292dc900c19222048968421b50cd88411c2966022274813928918c8480846505b1651a4b26ca08804013960d18870491251c0080a8b086422024ec2a865d3b24c1b492204190290044a21b92882a800c000860822058a32258c00661202601b4200044104d1344683c00023382800218d24858d8090400a057052946c242200e2a628123904da362adb106961481144468e833049d8a45021a46d5884092023860ca849d002001bb22118146a49240921398c0129240c42848bb064120632c3322a2386254a02520304299b305183108c14267062460ae39409a11411a00002c3b6099c0845032509084932038200e12200c43492232621918685d224245b003123b04d0c218622c04d0b2665db309108a708dbc07108358d08b4848aa069a0282519318221332a1a284603a40091340a91022842126410466004922819b47058b89101b340092000a39465241392e10229d3a0219a364d14880d132762c9446aa1842183a40111284a21200890b82093300d082562031001e2b44c4226005994000cc14c01302142b64d19c26490a08d1b328e91302e93308243104844c05059084d01488cd2b20108978d9a1209123751d0b6809890810ac104e100400b02261011492132249c4832d426904816648b488c93944c42982d10c14c02a64cda1248ca26602004861228301bb269c3b4694130229344105b442042304021293149268c44060402992c20a780d3488a0927218c068dcc202084362823916958a08ca1b60960b660c84884a33221c80408ca960954b811949209842208c9c670a4c42093222e20a849a308609130605812919c884590006d821001d0b431a344501ab48501024911476050022e63266241362ed4362611b360d002461130451141701341681296092d2abc12b905d68c3f7eb17d160fa397ade12d639bf6fed96b90ff181d3b3cab8c3014eaf7e666aca774de4a4756fe41f540a66a61d7c48de0e5efb6b64dc7495416c50c7d9ceebbfa166e65aa83dee366a6f946173e87c14d85056fe473eafe0ea81226f568e81c6b2fb2406e2c7a7dac0dd4e79efb77adf9721a4803b56d5363e263da9f7915921778fdc9d7b441ca49f0f196db87362a7243ad8b2a2b292e1fcc34d91bb8b985b6d9a3c324cde93ff97b2515ddc90b1e089af7431d8756414ad15ef8a383aa4ccae41c56ff103ea19f4461ae307c511854db39ffd0b97ffdd773b6dc6ef6bcfc62cc46eca01364a7b10c1189e98e34a360aa1e28d4a0fbb329fcf318d382699e990d88304a96a1b520acabf3acafd5c2a8dd28d22a956486a1df040e35d9d1b6b66d261f4813b9785561d1e32f7b62b703d066c151a6795744ae6fe287d75defb3cf9622a6a98753bdd47854b12c3d919d603f2bdf846dc2200500c13caf8357ccc9b2a194d55777ffc9ae29395d9cce2ba921eb07ba57fcad946459d3131cf270e7eb9f2bc13769d7534f3b5fee9abf73b4923d635b1d40b4a953b9f8847574bfef1adc4c79d12b21316ded675e4c02b043c2a4c6c7ed17e0dd68b0be4d60dd4431e96f290477b3a058ff1dc4d3d0fb547dd2510a442b72dae5b3fd6a20fc10f31c60414c7187e6ee85e3c1c0349d15d161a339a91271823f3870188b75b5fd628a2b89da504bc6ef6bd9e15bafd49726722c90a50505fd44ec7704e9c6dd0c1ee6fed3802086d724f23bc11d0f1bb0604add497d4cbc2671c9a9c941a19eb3345a90f611a45f7faaefc88c5e9dd65c736285f4429d8c57048d59d88b395b39c517db477486b7b5f32cd9b3286d59a70762ff2bce191355ddfc1846698bded592107d99825bb6e74fe914eeaf61632d68cfe952adc627054ba70606086ee16e9d07de9645183a853a71656ae4143e2b52e1b72161150ebbd2a80c071b8f68ff67ac7b78b8df1792298ea58e6e6a538d0f73b58edeea526ab1be7d51d3b77919697dabf7de38165b016f5baed1c6379aeb31ad94e20c70b38fb04b15ee8d3f53d6a75e65072fb160177b8abc26024e74e6f620b62b321105cc65ae44d4d309137da386c493428556ccf43a53c1878621d2f4e77fe84eedba5f26f4b9eeaa151dc292f9ee1000612c64d71756523627dae08762c121feab8b81576bde8fe3a3ed682741cb5ada7b7d9037abc35552024e074957df2e48e361ae2a8e707a5f16072d9144ca4339f2f211ef6ae0a81fd4e261e61bac97a47e52ee08a8883947c3be9bf942f4fd625ab2765f0a6f9f50734bdf1f8f185d73d62902ea45ffed411540e745c9f61adbe829f7b46a453473746de0440b29ad93e17c967d767a486eface4ffaece84f9697674ab4b4b136702c93c5da872a8d4a5aa2bbb095e0734d3a7fabc5c800fa77ec325d6ef7875a57617300e938b13d7aa4e9bd41f253560a3a46f479dcc0a72c0923d25551e90f80c34a89fb9a0fa0c2947f50ba0526c61dd4795f72080881ae7a9fbbc0543c895e12bb1d6ba8a486f53d12fc694c5ed63fdf7c32a5cf8f096a96b5a0f679f1fd12367600db4b9ae01d2b3cf4e54240a85cd4f36367967646e4c0edcd6c6f81d674a571fa135221bd48d26744a02c9d1e0368dc772d8f391b985f76a91e657cc970a2acf2671c5df8b9f226b49df5db806b2123fa1e4ea83c5bdcfc2d1eaa64814ec5872b339cdbf4db240148982ca77e3b411bb02f798a22e08d7fd49a1bfdad6839d511c9a8bf2f28c6b32b32f13370f2e7270ac2c84919f0a7522f0aa53c3cdf3059e7beefa7c98bd446e79213520f2ccf91948607365d020a25b27b01b2e8304dea9a42bb111ac822d33e3bbc3c106f21a5ed8cd0c39856dca0649f458ec122a00bce59b1be66281ffeb07080e5e746c3c2ba813307207b5066dae808b944c30b4b8a039ee85a54a32c11ebb0c06f148983ea8d684d434e6200a3f713eb713804780ef113823f759c72227f85e474fa90091a9804241a647cb32778d0bd71bef5f59d55dfe18efa62ad701312b023a920eb53e92b486af3d14471b1f0bc706841328d34883c1717f94244002317dc6e60bdecc68396c016fe647c0f9bd146472660a67fd251171ff4a5e4b4a5a76b2ef0ec2d107449200e5a4bd600946213cbf10f1e8ee23cd3c34857acae9d592cdbcd1fe17f2c61e8e3dd60086bd3c79aad928e34d13c263f49b099d0ab3afd734821399207902b2bab437ca6aa478151473147ca0605a34bf9be2b5284d4484a842386dc7bdf0c15aaba8a043fc571839d78b09be8f37ef34cb980"""),
-                    TestUtils.hexDecode("""
-214BC54C508E63F77B261DC59588A87CF95C233C22A339E7158C47931C1EFEF775EB3C91A32C56E888214F9F68D7CD2525B23F695871CF5EDC6979A677EC19CBC5859C63ADCE2E38C67CAEF20116508F33BE8035E9C47D124EEA5FD1651D64371451B6B96601E4A6E8292ED6841E483C3ADFC3DB242D1D7B3F036492741661F45232104A528B6FF79AA4630740BD16B37CD3E7C711B76A259C0845D6F87E4A4B306E939AD1C41022A7D5938E52B98485D95D11BE629263E6CDE20F63AE16CC2E32B6C1C442EF108D92495A759D3707AB6CF3ECC5AD7C02F133D689E252A26C014A31C65A65F079C622BE3B648496BC57C462051B17175FF81126B5BBB5324CCEAEDE0B5A8ECC0D710F04DC0C751318E8913F149E701AE0568B5426736288CAFECAB1779C7F4E96D9007635F76DEB4D379918447F30167F257B8BA825A50EE845FC4AF7C34AB200D5BF45B5F0405BE2347ACC814BCDC648C274C24F8024561FB66676534F1FC8041B63114679D9F4E8CB0BCD7BC4C54FBB4F9A178B4FCE64E705BF8FE42826EE01F691479A8815E2DA00111DE40B5CDE464A9F7A3D21BE9562FD9A5C5CB3F4F9E8F0D8D8A20B9A5AC9D7394AE4316181621B43D8220FDEDACE345234E3DFBA134BF54E458DBEF98923C1891CFB8DC9B5317E3B16C740EF373666969C95BD1C53F435D7ADE792FF9E310A191246154064D0E8F20032AF4823A335D88D5C2A943CD4CF313CF2999E237F6EC50F63936D0FF3F2C729FAF0232671C94785B67E0CF71A7CA5B32434579711EDF155D5BAEDEBBB8F0C6922AEB9798356714931AF1070C49BCA507E289F005BE9D8B46AA67CE2137935C7EFD192E4CC24DBC434B381E9A15CFC529D0064F057FC3AB592869E5F1AA5FCB299B2CCC0ED6750E318F6FC969E6A3A08059788102CCE79BC92804B1D08F3BA30492054DB6401EA251191BED1B8CD35DEA3A653D5D546D2EE8D31C2D88D6275D6C7B463D449DDAF586D5E57FFBC07ED5558D87F7DCA82E4ADF49EB9135A578468907BD8A6228EB723241D58BAF3C78C46451D2F11CA0552A05A85620001D376C6194AC6494E337388EA49821C233F32579FBAE6D11E9DB257C426D99516A16DA63A7BFA261F2B012CEE4EAF7C5C16C6331B79A26E79B1421371E574505F61D699C6DF33EA734ED14129608260B1233C387638F7ED3A34866D656D74F06C2B8D70AE60A0994F3D6C1267DCA2001EA781E5D6E17BECD284F967788227E060381ECC60A10832091319F225C972349BFEF08D4DD5298BF7EE11B693AAAC682F91DCDA113EFE0F35CFBAFF6C73DAE43B8C1124EB57713C122F0A5FB03D02C4128565FFAEADC0AC23DBE5BF123CBA024DC2F3956EBEEE95918B87D2EB22EB1A8ECC3B267528A62F2280E3DAEC02C89A01F5829B5891914DAC"""),
-                    TestUtils.hexDecode("""
-8ec19a12690fcc4af18b44a46b33caf661ff986315472e2fb9cbf0db6b11f596b5d540572ff4b722d39e5685205ae44f62645ecb6a4f319b1dff9c685f6bc65a311cdd61204bc23da3dbb96f71ecb3922ac19580212e57c121abe10baca724b0acec03dbb6de182f1bf5090131eb5ced5b8cede5444055d33838272afbf8a9d9752c0536f5b544dfd0f20d4994638157e64ff51ea35539244dfad50261f282ee2fbd5fe3b90607a4b2590cc24e67911927ada6cf9b03fd482df572e6cc7441b6129677f3d3d0c0f5e7212bbc652bf53140630bb0e3236d09943796ef92e7916a2c4fcde8c9af522d9661feb6dacacce83e14a6384afaface04e3c8c0febc6306445b84df88cd91f34235c7351048c0d75b6039a102bb0ef30f6e5fae78718be6412db19dbf7536e42b0e5efd950e764c6a80f70839d356f55d607ef58eb366a840706be8f79e8e2ba251063336c819ea3fc60ad76665cd7fc8ad9e404847e0a8ccd5aadf3fc36dd091972959e3de4a5c49bf799c97fe4ac5e993fccd03994e6afd1562a564b111c52860f564e1b335664d57de6fffe5cc93885bc34ac7d278dd28efb850f3e67e810285f47e170243454ac65a18807dca131c99be1f85e34c1c6c3bd3c1f2a13c0341ca961d871e92a2353d813c06396dd29b835971551cdd4d7fffce4d32facc1026b05ce3ac795d54db67983c5bf4aa269cce8470e535bb2555096769215d3df109e2e21b6ffeb6b7461481b80d4894300400851118abb4253b9b86c774522d544dc6c6c2a3c75ce8fb5c3ff2564b9a696ad05b228b8effdf6f54506e2afd2c284d3a988857e4aa22d9d90feef71eceb135f7d6e9462c7302acde68bbc9a813521293d515e8f36aa5ea94a7727837aca76c6fcab11013eb18921091002701166c586abac8f20770e6df05bc682a19c65dcbecc86bca8c85c9175d5f0fba67b33a383987e7483366793ba7b35942b3627a33c23a9172807b578b536fd0faa8c3d9f3d90b6bad5d2b582634b44f9ea81f3cde12ebcf48999d1da8651cbc89e87e0cc049c4d1efbe3eb625ef4e09c2f879ac1eb7e20ef58544332a50953643b02a73308cd481d0582b4edec16c4f31f8ad1ee6d3575ed3e318a8df9a0bf81eaf7bfc720268c1955033bd16fc652cf68ac5289488532665c4b584fcff68aa04b1d4ee55556973eff4d8713b2c3bb6dfe6614b9e6138ce9799ad65d824159e1cfc1519a741cce18ad822de048f19e01d40287494822393bd6d321b8ec3cfe0f402aabdf03743ed8343d442871a6a56821596144f9005f72f5bb36841975970caf6df22724959ff6c8b57049c88176f61bb1b08543d03a7c872b87ff2fb7a66ac64954feec8343f99dc5a84ef8c207033bb837bdeb64c5d4674014ec3ee792303ce5690f2d47d176037ba7ad21b8d4fa2b83d6bafce3cff48e12e12066be8ec16bb2127a26516afba6a87a1f7951ad2ba40b76a800e2c27aad75f883343ca988862a6dc4e481faea5a6dccc8fefcc79f4970bb831fc514cb993624cb7eab874af102ce5e06dbaf57d37cad159541791afb1a47f9c838db9168b27290633e0cef4446d8765ab5e70c7995d437d1128c0a3b0d5c6da7bb7b3e450574018687549eabb5122a89ebda3de0763497658f160fdf054042465eb25174609f26f4755a50d2df918dfec074aedfdf151645b73461d3eab7234aabe1d19ae9896029b57b44b90654666a2e8847d1aaab3b3525952eeb5f0f8cdbc8e3e54ebbf6be367d689e7140596ba674ba940baa5b9637c685f1a1228acd893478365ce039a0a67155eabc02ccfe8f7731d8ccf754cbfa512e604682bb1be083feb424114da3d7243498be28857f19468e5667f59625902b9cd228c366b684154a47acc23b03ff98dfe0c2d02502f6c5e7a5dd212722f5c06793b86d43494003e88818db45102e790ed30f20eac90be73df9b92f5064827fd43c9be4423f61c23dd661a6fd9856f41a2f65127d555e509919b17b0be2e27bb45b07e39482877651ab5e4222875a988a9f97a6dbf9cdccad27576426927153dc4310583c9bd8cf6fb5d50a2d2956986c7bfac0f552693355d8ce9c4dbf4dc5fd6523cf4d32ff62b4e8d9e281eca16ac706b3b737c0d2c977ce4cd4bb41e5e1e2cc16e63ee0c408713ce2831e68e271b52a86c2b8bd7a9d0fba9706a55a5b62ef3eb8a29c793f7a66e182ba4ea249a90ca8988c00396c2d858e3ad362076a97ebfe8d9870a339c0a12bf997b66ff5367b4591c8b0deff659c133e4f97740802a73fb1cc6bdb46b3f9cb31086efe81f62bc087786d1e984773aa976ac597537ff1b1e84991be89df4c1ec1e29a2d72c2dbc5449af5bb95090d1159d6b80e2c5936db148aecac22d39803cead75e78a05731f382b09b51b9a9b79ca9d5bb51b78e591bde312625e52b4ab6eaca92e95edde3baa07b8d12588c7bcd8c2ca4a7e6e5a776eca1168694da493e96fccfa6f68e25cd4d441a111d8de31a0914e19900b218ae50f21ae0659f8f8dbd7f301a061b80add0697f6201ffb0d8c6d42e3926dfd98897d967e928802c9ea3cc2d3c3b9e36b1a29e95fed603f46d990db7034d53159e5a5cd7a72f08e451b5d7dcbe0437a2f20ba5cb69046e218cd3a7b491d1eb47fbb22e2a3b103396bc7273c218bd0eac9f272e6d01a7ded0595b02694981cba45020c10aad67735d5772078099136786401282c850448fbf27e71c1233e5a992a47cda05c1946c6f3cc6cec3899dbd435a1d016b3c771153f44e46bf55fa7fb3c39d8fd1bc14244fb70d4a5b8823b39e449e4d5237e0d99e49e88a85813efd60296b8bdd24d27725f993850b2f66825b9c469f212d6ea131ad96a089350cb76f434e1d2054fc083571f857a36a93f0e6f5fb80ab74f9bef3c5bb7df3f47885f3d136acea283085b4080dbaa5b555faeee52948e6a5e0b0d7c202fd036108998704022d7361ec72a89ca5008f48d11814e8420b453ec202cd6ddbbdbfeaa03ebfbba50c508c5c1a81f6f4367a9f817c39613713c6ce439cca013e1b645854e10256f48ed38c50a7e4a76d01102782d433e612ece1aecc1f48ce45b1da41962c89e811e26895a4a953c38efb620d2285c05a99c27d8e02ff419924c99daad70827ba815c68b0165fd7c4b6ca77d3db1a61f8f95d2c5e93ed860f90abc418791dcd1f95f29f4a45a8bb637889c16c7bbea2ed4a87eb11d4c2d8a7ddc6a68d1f83b82f0d206ddaf76f796c21e0ba9dc3179e85dae4d7b3fa40da3c65c0d499b38362e179e8306b1361f3212b0df9001f325a747b808991969ea2a9b5c5d5def00b0f3139587d8890989ba5bfcbdde2e3e4e7eaf8fb162326354a53f0f2fb080c1c25474f5355627b868a9fa3babfca00000000000000000000000000000012273041""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-8786af4f2617911e937b31037e66d478136009c090bf4a971bc2f286aa31c252c1374f612e7f68634201e3eb5857631d0bdb0c10237831abfde8ec3a0707d79a6823ed6d5b5dd176c813b4473c92173db04935e42a920636592188cd4cbd733894485d415a6b7c095e7edb84998ed6f8ac81b9d8d7d3463d3d5c9934c1fa9484e2428a5902529bc47011258853205284080ae14412ccb60c49068c5142424a366e49305182b08c63362e0bc505e31841cc188d63b26d4a484e10306c8aa62d08256ad82030c916299b006d914052c0b66044b88493407112294042488da2048eda08841a098600265204092004c89024902c09a4284000801c173284942823362a20104690c62811c9640b064601304e21122d4906894c926822036cdb8880884282891689e0c248e4b431c02650daa0040c9211d1008020c86453160618024c10a92103466de2a448d8486a8ab66c09c584dc44224848011b07315046081800205832212082288b1092d246499208491c184aa03889a3b204120845429228011641d8b0011ba5515482614a22312126691c39004a86280ba62c40027221308484284ac818241bc41103836403086d99266210254644b669d0827108c15114952c23868824a30c233900d8442de0086482280dd1b68141b888c842641b896521988924b43010b16963209020114118828dc18670c42811e31442c0146ce340424a2670ca00456424615492250200251097001a3084121912800206521650ca180903c9250a454090160c13350200056424891152362220012d1ac110d4388ac39420232329203710d3428ec9864900078c88206118240201a1510433491c9751c42232d894281a3851534292cb2691d9325008226e6482601139069b3651c010010188804882600c089048360e198830d8008890401020c72c59c85108942d18b20ccca66d09b125d89820a136888c96098c308adb466923202d94a68c8b8061e3b6110c225101a025c116889cb865423030c0026212b0241cc68c102609e4306221a45122371060b63003156982b200e402085102329b081113346edc366811104d4b9041d900915aa42594920cc21246c8322104433160822dd1106642200644024edbb6605ca66cc220208b182a0202069b804460a0008c282dc446012046088248804b201151966059304801956461a80949a26023b52413976421468c033431e21009c024680bb34514a8090b048a93006e5a8471528004c0228499828470c8d8a0fcee58e3fef7ec257174ae39ec4d8e78a56f35e87a388ecd2a2e145f77b6a83b61d87437335cc858b8d74ba922ddefe22c434bc8c82ae545a194a19d67c7e3b857b2f2d42a70ddd90ca9503eb7da05bfea7e9dcc9f02158982bec07ca961fd8e288e07683c9ae97a5cc8ddc6e8356ab44827626a4930c683df67aa55162947ae38c88681231901927e8dc6a6f5c318fb8dafde698796c11e799cdd13e24cb6eab09209c71108f0920e5c9282f7b5d5585cf1cd70feabff9a98786ab90daeac9040bc2243737993dcb7a1338fa8baefc0bb6f9aed2511275dc008b8de75bfba4747999f032d4fb676a5b8344eb4d6ca29aab4d36fd99def5baee9a6920129e1d15d2a227352940b7d4129401c22578c2126078e85ab4ec15874047fb3ad53c9a7e9e92e30fc059d92316cc1c992bfc3171455639d6262cef30745958c3ea541df6ab9414b326b7edbabc29e0ceb6e4435c49eb07564a08cb611d30ca9603de65327ecccd20a8207fbf4c89d2914233180dcd25cd5b6325e23d591af9618ae1ec1f33908983e686456de3c6d030991ff03e1e3fd43402e723ae17c9793fd8203e041dc8ced303127161e296b73213242958552eed804e0c74b8c2d1f72043dbe02e0bb984a533647bd7b8625ee85119ad3ceec74444c87ccecf99a11ce5a382cb7b20b4c1610e9f12fc6ba5887bacb9c6e46d4fe49c86c61337c18a93da4d33a7cbdb0a609935643ec3b561a7d797261f61d085abba60874eed0f97fed77609f13d56a60edb328a8b7f3c93f270ee0e96f752713549a0dd055f07e36c1fbea98fa85be51e9cfaca9531cce28c563b67dee766383fef8c3b1fb56592f936f164fbeb09ffe4ba44da30af06a2995803f64cd90ec912507446624e13377b83046da93f373373b5f8b62249f477206f0ded335be688d9494503bada0e7bbd80cc14def6934a159030e50ca9a2d08cd6b529669a5ea6e92884dfd515f58d3e2e2969c6732a8d28a30951929c9afe0db0c41a13dd7d817514f3aaf2e8bed5b6b5d7c5cdb8587a51dd78204669979c845ba412072b925cc78c8041b7c35b9b9c2784e70329103dd53bb4b42d97fa5e4ad73363aba999152b37079f64cbfa9d4fcc48280e355b4c12df212cf806ee7e4c060c5eabbc2ea493ebaef3f3363539f2a19413b19c6c64a8fba77047b4c43531cb0510abe7c9f476c35fc8cb5a5cc1b883847f9938e8a48a913fff14ce6f4d04e1314b39acc919602a2d013a8c59fcbec8955b1ccc236eb4b03e304cc0440eb5444d91eff5f9f2fc8c08984eef85fd550b76948f2a48368a6cc84bbda74510f9132539f75abc6992a0423645cba1ccdae50d78e10a2291144c814bc056963f8cfeca4cc81adf3f2629b0b687adc55dc86ec6af5e390307b89821b6999cc62067ea0aea384cfc8be76e55d1c893e306b2f2812c6793bfe8945b7d121e3e760f4dc7fac172f5b398d066bda33ca46a35e0a24562e7516e645ac2e00be09dcfd531c39955be696ff7eaaf7192c50f3d1601dc2fe47f9ce3ef9084edbda8ea81a4fedb37eb2aa3869cd78aa1b1a3293317f748f8406fd83f26c581d5f139b9145e1538fa71bc30b8f9e3116592cff2b1ffb8288d87ae9af70330e57929dcc8982c7320cc7f48041fad10522d96851112d6bc80e71133000d125aec57bccf6bf96bcf0d08b557c67fc33a8fb627f4fdf768c83692aa8b5b6baae585b404f3863e3cbd13c1ec105c699124fc569edc3c68da55146e52ff0c0fa831003a13c50509597a361613fb6eb30d881eaa4c7371eb6ee2dac3527577b8dd404ac55ecd3c11ed984c2c62cff35b1c5833eed91c4fce2684e694ac53e7a669d560b631a898c38d40d99f112c58c3ead838ae8461d5c1cc6e3103890b3650563eeaaa1bcd0c4808809fc9814fd8364e4b81152ef67a90a2bb6932c59a2833e89f2749959e49ead34556b430855913928fa26bd6a3fe74571519a2c2352e27023ba2ce62da49dd02441218c2f7f492dd465fb496bca836af0fe47e96ab5cd04f6e3d27d61b2c3a1ca3b7a45681456c427a1f752c7b8dd540ecadf8621f125bd910fc755d349a00e64a20063ccb3d2c27d2808c86ca8d80d6edee233ea88f6a4cb1484670fa62e7fca366ec6c1bbb227f2db5a2ab9f68f541353eaadfdce5fab49dcace06203cd43db0617530c109a3c9b8885a972c7db25d489cd816e98da33f2b742333fe88a839de2e364346fb47af793b639997a0e2c6b5293c14c97964faa65656e6f624b36a7dd00afc5cecc8b9bb5a1c79525f0fbdd568c4acd72678ed26013d3d6aed9696e4272dc1293d224b83893a83184966c25a3"""),
-                    TestUtils.hexDecode("""
-E742D452F392CD3CE405908EB380CB0225A4725065AFCB0C91C5E4823471376E6424AB24D57FC4265B24DEF6CA73E28FE20468B6E26BCC9267AAD2B7B82960C3FB5A01960FAE078D5A54BB324232B6647C9DAB943533C865BABBD3DC0D1E7A1756212980D75F2C8E999DE9ABD1874E3A86DFD53340B6E424DAD9F53C3CA02B44FF8DB9906D3D4352D0EC4B1A57A33FAFF7107D38637AA410B196BD1BB1FD7AE4B7414E1037454A031839AEE4C796BA98F4A739B785E3854E9EF0D5B7415C8B7ED012B0123C335730C7021CE8C94200874EFE783D7C4BF768538A448E76120635217727C81D08976CE4B5027D4BD9D9E27E4BCA4791ADF6F8DACD1BD3A03BE5CA7F68C2A2247FD3184609EB7243D2366E5EE4C95CDD869DE41A4B47F021DE76CF27464F814837C648A7A7CE2F91104322BE3CB1160A0D10CFE90ADAEBC87BBF14387C8387F4F5AA10FBD469ED5587EEF537106CE0F3AF4CABCD4476F248C21D119523B680067B332A1CA4C657B9DE1360FD23ADE58C5538EFFC8902281FC7B5C12C22CC69E7EB18E5F6F8352B9E4935D06C96BAFD834934618D9E6B1F60292352D064A0EEAE80F7B721312FC1B6C58D68A96351431A8626CC117BE9DFA33A1625BAECF12CB1DE33BEDAD584A91546DC767D0E59764FDE3FC29052CCE23ED28CA5DA4507933C0A7702D9A1225A48B71FDE5D27B12FDFF16AC2802E3629E10D5FFC2FCC6135243A9E2F3E3867BAA0C0F0C77BAEEF9DCFBC723C7A2BCEDA39B53B415BC21A397F9A8C4DC580EC512DE4EE4E0870DF1C4FBABF4906E0CFB08863AF2A89949F8E0FF9385ACA3F588E05781C49DC563EE9E0C5D6FA512932B7F5568C1E0FF1C9492ECAA5465ABFE125B511723998C4071481BF1C53DECD59B440931AAC640D9F78B1B40EE46AC0A8FD18B4C8AADD734B0F03F02CAF6A7BFE3DAF100703BDFADA7DBB50ACE3D40A05AE6E87CEDC0B08C44796D7A63E8B5BC95D97E3EF706E1684E791D3B3A2BAE1E7A92FB70A33D896219E80751A41E16B506FF266C4BCB4346578BAA7732CA745BCB01988AADBCBBCC45C9FA3A5D38F3F8E04005AE777910032D992D5EF9DF2C0422548A980707050CAD9DE56BCE60EF74EAA4465EDE96B055999F81A2C9596A2B35C8AB3CBDDE9D26AED44527DEB9A2AF3BF6A853FA51DCCD913876A43DA3E0E2C5B42571101B7B930840B0AB64419E1043CF56AA3C2FEF5B39CB582971A5776F8FA9696CD9F67E9290E483E9BD1698E961E849A513608C3F20FF678EBE0C778C2A6DC1FD3AFFF89D646A1AB85F005AA14A0635E92191CD41A6A46CC283D2FCABACD2FA07B7E2FF97D17B36E0B222D39DC1EB61BAB8146F147579D02A87DA08AB4ACCEB32AE1C8CBBB0EE0D90A642BB76DEF4AC8C7E477888159824349EB075DF0BED236DA9B2826E67EFF220AC84AC99BE6EEB0DA904887E3A84E5208AF49BB31EAA1552EC79E5BA02458106B5A31D0AC8AF392A63947911400FE78F6C94B3F8E6B7C3B98F6548E7894EA22215C87E121441C53EED726AE26394C825517EF8A477A6DF33B5315C8DEE16ACCE76ECA60835390E65392B9FC5EB88EADBF336FE361D190ECBD0B35B22A6FE6A8D48466B5E70BB6C5FA515CD8672BFE70054038C5893E514E23B16C39198B37B06B21275C2994EDF7F9F921B320B39E29444E3D621F52C9FCE19049D403AFBF1C047C8B065543BF43A25817533A33DE6C866FE9D8A73B2CF7277CA0E8D78F4F104C5CE6FE2025992E26E49D4C49F0798278216453C00C78EA7BAC2BEE71E5273FA46044B4B5578EEBC2A9E42025A8A3526B11CEFFCFF47191109C56AE105CD70A04C3F4EC43E49346203347319D8986D15B3C4A49F02C02994D8798499DAF1E0ADB81A9AC79FE8EB55ABE2BD18EBE18A9E5F35D2F66B38CAD6F6EEBD29AEE054C05D6F0B5326CC5B86BB0FC7CDA720838593238A2FB24E0CC36DB193FB7FA66573B064497F771DB1D965953477FC28989AEA2CC004640524A6DE8270E8A5B12BFF87B3F63FBB7DA25337EE34E6E4EB45DE9A39BC9B95ED37A6A404ED2970F9C79A7C2953420732C496B855F19BBBC8ABCBABE1D26D5BA828EB060D7280046AB93979E0BF90B6F1C07CA70833BEC83DB41684F1842A23417B3BBA0A33D7AF7BAEEC14C9C96FDF30BD201C05AEC6D3D2F539D511FBB356DDF333409EC16411DC7255DF0791BD67892880A4DB082684BBCA8B7E55B421C17DF3B68720E907C1620B142C3382AE6E738F8943CD214A847A6439A682D62CF0AE8961B5F020E7126C5DD6258CA0E8F5711E5472A4C05ADFA9A6B8180B741F382090CD1C781F7CC7F23E041800F42B228C351AA21E4D916BA5D9C56CF8E9507065D729B7C3653A8BB062C0463BF0B97F13A1016BE4851F5A489081A2AB3D2AC2744008BA734ED38DA10F372D97EA0C278C709A23ABD4B07E91ACF6A6F2DB9AF7806820381845FFBDC4BD30A503A0F74F37748E3624BB2AA478210072FCA83AD1A43ACE9F2943AC1AB6CEDED67938AF921FF34F2DAD4F224EF7498BC450A67CA383A9DDA333073286A22B85570A11FE03F55119794BBE8B81EDF1966BCA5E363C15E8E8673C94E3396C9AEC28D110408DA5561296E2928C6C111A4826309F119E5456675AAF935A17E80C0BD82A9CAC2627D6FAEBEC9A928D33980A86ACDB35686306B57D466864A0320F21751FB0041BA0F4F1660774A519D3ADB304438C1709711B982EA84D1B193D026081A4663AE69C5E12C3E4A683FB356DCA618191B29290C5DB4AA6A069C3B8D61C8B7FDA779E1F34A5F62EB7DF5C563ECF1200D3FF499DD06C2BF44A2B4254318BC402EA3A047FDB3570EB40630CF1DF84D1E2BDF5449A1F65A9DEF76954B5814691C4C12BEB10A1C006189968F37A4B236D9EE0D39AC340852EC54AA64FE15E1A4433ED48153D23B2B648C8852F3E3AE485474AB2DFD58A7F0CE6691ED36818DEADC8973E6ED06AB841B0A915425D7B87E41E1E68B00BE2EB725C287FE575736F6E1AD2AAC61F02A3A00ABEB2C0FCDB35564E8446C776E980636D5D61740AB2F0736A021D82C1D66864E5DFA98C4648CFBD9C7AA865F6C97038656C9C8767898FB43B0919BC98C1D0F6FA4D90F711E5D009D4C8FD8A773B7C73CEA654A2CD52A276C6CB62265294869A052FA1634D3EDEBA1F69DA09F0568F9D2F6C511F6BD6169BA0DE25F09FFF63AED2FDD0F6D89BD01FC5B088D3EE5344FCCC0215B6436987D6167A0F2D5EA47A984DC86D45534BAF35129488F3BC2D05BFFB84A51A87A1774033244277D0F2B45EA43500F4034081711CAD67BAA9CB0A58E1D01013032EDD5EBC7095D4BCCBD28A5F32BEB685F7901BA7A839650023B0C908FF33B37D038162FB96EBA35C2919560267EE5A94035825938D168481D8E59813E20DD611E4E23D8D42C9DE1D2398CE3CCB3DE5CBC4BB16D555985F411EB5B56508C6F4E75621304DBA2F4F1A2D8B2BEC5793478E5AA0DAE6F52C43253FE7BC91D3FBA84F8525D002CC307CAFA20BF198BD8F28CB579960A1168A1D26340C8E26CEF1261F23E97B806E9F27BB51F16102527721BE0E8B930A1ACC38F0A63EA1F3FBCEA1031E441FEF4D3746EAA37B7D4F8AB354D5F079E56FF4446333C8B8B7B589CB36DF40EBC5A75D2237F3FB874E7E0FF1B96DE43BCF229DE1FED3FB6D01752B3271E1F98D4134114911BFAC8351E3186E90DA3DE2E7FBBD305C822FE6F06ED1D4774D7A66DCA0CBF740DC277C62FA641ECAFBCBE359A28FEC48D62E1D3B6215392C0F8DB601E35A6CBD978567E806168A9F5B4915A80DE405038C4A370D898ED6441F727985037A040163F14DA78378931D3B96BA486958AE8902C98BE75BD0AED53CFB609923C63615917EF0BC6D07CD183192DE3854133F701B9D4B499F958064ADAABF4080C4A019DF1E5B98C8CA265E031B8CEC355C8FFC3BE16DC3D01533ED17C9769365D023CE7F0384D40F7B6179612B5EC382982E244E2510B4831F2D53F26B142A33877961EF1F845370CE115CA5F0D2FD6926482BF3BA1AEF3212DDF36705A210D8076A4428C7F9CAC411DE590452C761028469947BEC31ADCBA229D8EA58755F2715AF6D51E581D2CAC4182557E6815BFBB84BDC54C9368764CC29AA9AB49EEC37364F85AEB3295E60CE6DB2639669F55CC49D7934BC8566AB5E207B33F29128868BCBC1DBDE1089317088EA3FE1D595376DAD3BDD156802F82B63CF4C5ADEF9A89D94493BA152F9F07A9E9CBF8D821F1D6CD602EC49B61AC4F7633EC810F3D01D4867B1F0F3021D70897593303CFA6B5A3BD0303AEC32105F854C3DBED373760DDEC9B9E8EC4AFDAD00FF2E5A05A0113522024B86F1AEE6F250AE3BF0AF1E6FB7DFA8E04E3F9D5C876731D9C33460FDC13CDCDD433B45A6BF17E98638C264DEDAC262BB03714E020F4576DCA85DFEEBD6D70E557DF9321A8AAC519C419CA20E33DA37C22047D4CF925AD67545D04300A42B22DAC098A912848302D830E06CE5BACCACEB6E9316F9B1DEEE271BC6AD9D74927CAE725CCAD0C596653731869E8071E23BF"""),
-                    TestUtils.hexDecode("""
-a99a8d52ee69a69d91581ac798a7b34cc594801ad2f15e8769de6761048ad79b7dfebfc6f97cb7694d14fc315c879de9029b2b5331f64ae72e36833d3e5bf3c4ab64b8ad225d7b17a146f4d15f05ff72a7ce975e6558d11e3dd0e24c5b8d81ecbf96c732ddc2af021f62ff48719eb70ecef5e65a3acd389afe3ebf1fd6bc218dacffe07c78ed1ea343b603e61d5af9f6399153572549b29f88139d08ac0899ef084a847ec0fa58d0ee3856dff6262fb2355873cfa1426eb3f80ab52d3f6cfac2bae2a1abb12a68e6476f7593f5e5694d541d7d09b02a39832450c80eb785fd1cc13b441a96f22910a886aaf3ff61df7ff9f079cebeeeee218495f5307da9ce916bd86698560f758896675af604a3bfc2721e8e3dd4bd6664950d7e8575a09d439ff54086efa2405dd362f03c6df688120573884b46e45970e65934b5baa1255d6344fb115ffb51aa25b1bcdee1020e754bcce521ef28bf26d7bdfa498a5a182ec8d202d7dd0c0926b71c12eb74ab4b541c822f399bb4f4a50411ff28784930e8c9a6e77afa420a958528d4848f6255067d19496a23b39b21b572158178fe1e4749b3292133ecedc0db2038fe2eac7ad1fe02f426af8391988e46bdc8b621e2c17704360decaf8d6ed08ca825b1b3b8ff95024f174949c7a6f9d8a4a079f2fab1fa0132c01f09b7f7abe7d6aadf9c53d58a97d270a1f9065b295b5c524f3bfa0de09ae02ea5b98ce4403418af601e5cc876b4f0c95ecb7c1b8bb2f72448f721d81c13cefb99106251d4f37e47dc57d9449b405a132d25a2f08ddd8dc77f0eb905d6f6eb0d0cce96b95068d669286c02f1cefdade77b3dbadfa7cb912c62279d0a4530cc5c52941b19de495e2a2a3713537b584b2f7b76e3952ead9ca20b7bc9bf26bd36176521f4347cc8b3c2553d37ee02066258dadf33306a2743917287c09ab07cef7bc4435d582e3cc2fe79c272d719f133e6e5ff1341cfc139257d5a7eb146327c03e897b9668567b6cd9fcb74711e73df074ee139a57229879b903e55a04c5c9fe9b6cf669998444b93963f85ac7176a3f021d7c9409d7ee827de8a11cdc431521c96ed22fa6f13759eb03687d997a25a9bd60800f3f534b3e9c9dba97206b7c2f326b34a087be1798866d1914e59c8eb2c77414be030f8dc270c6ab76a6e1515fc70ce50c497364fc55f0ee4f49d3d22a08c6b9348042d904ec2f8862ccf5ee0b3d22d2f1a99579d35a916748ef608406883c53f18ef4caeddcd780e4a44c872bf2dca063aa11cc715e23cd996e4e3874463a1b4711bbcdc2418e4df10667930cbc7af5ed9b629ed452c240e02b58ef61ee4f1429a6d9aa57471781887f2e1890e70f7589f8d8b4e5ad223ba9d0f73d3ec74d8249b82596c8ec733881fdd0c96d2455ff5e340298a5a6fc91cbbc1ea5a8a3908f6da6ccbec88756874de1518602557d2df30505dbdd6d59469a6f2bfd240aeab1099c350d6730892585c577936181bc9f7fa6ef3dbb0c1d39a082b1a35a86899cf26261927d52b373120225752792f02cd2f196b5540121c3f9c0fab27b44b9462f6396195e21f2e1f736095554de7221f3c9ba23b72b480852c86b179c0e4778441c3c5242d4feb9851165dad83804c7ce5d534dcf918d27ab36ea1faa48149307b95cc3bf51a6bca256f115e3c618b9787a21941b58ce52abe359eb1a5a19aaf67dd56950a6d0179637ed0ea5421b899325ba05a26771b9449ba0de0b3e674d62398e30363d1d885f424dbbc200af85c87d28ae8a3054d82d4be0196188089d180acc7197f07033cca984e20732e9029e832268ea405cadb00dd002e3506e621d3fa7b023454329abe1a48f7dc35730f5f352c25694eb2a0650f9505866d9013e8b88b19b0c5dc12ce799ce8de35caa4b6552f399f8a7b06bf1e5bea54092b504d9ce81fc3fa2a40dd9ba5a2b8711d02dc46ecc222b14655b151499f4b537260b6595a89703ff56ff4c976a4592dd53d12b6fa9a4a775acba17a1b3dcc5ec0a4e03db9c9402ef6380e62d7f76aacd613a482d31cc17a7ae99311a01916a3abffc336959a491995183f531ca9ed0af40131a28da068038649639155bd12b9d3a06238cd3c4b754905b56dcd52cd213a2ea369623f32ac7877e6150d0f5ee25de926829beda4ef67cd3c4323042aaf3deecaa4d404426f234fca778826dd3f29b007d369ff1a0af66ccbbcf20d9f33565b7ed745c160cbc5242c683588a67223d81409d77611cdce68a0478bc50422da24632852862319f20b446917557588d19d8add012137959e6791aa7ae19597a8a2f875bb8b78b17d6f5d5b10c1996414ffa08e698c7789343487a62a98474a39cac820ecb1a855dc825d1d7bb9c302f9945b4ef5ecf2e85d22fdb7f440018181ce3c71fd8a6493c7e0ac2d38ae115a018a3583eb45abb5542e66cf77587ae2e1da41ef8b98b2c2616f6b62d3e2c7e467955b0ab3431d1f5ab617adf90334d87b2c01e450c5750347c1c98fd4fd4109f13482e11e2a6ebc4a362d26c6ac9e4d112d18c1e90726a2042ea3d5543c33d32ac108dcc34999db8488895315f18fc0d359714eb6c10b0dd405f6baf03c0c7a3b89d6ec2593c317e359488ab2a1e85a722b2ccfeafcdca2e22718a17363634036af5aadae7bbe6f48ea36ae216b827aee084696c7094dfb6e4fa563b51cb1fe41f8e72db7cd527c363bb00bf8d22896f438ba637bb7fe64054d69b628254a4cdce5ad92f753cee7889c460af2fc4cb10ff6458bca2547193ee76e816a39880f48fd2e246b66efb3056cffc0d233a86307e13e7fe87e4b4c8408cf7bdcea51d189dda4c4cb4fa44b222e4d0ed51a18abf77b49fa0280dea06852e864431c1b4473e876e2fe4f00d423aaffac81b95f186467e409583252662a0761a63ac3511058b4b0028d0ad1b760994c98fd7ae64bbbcf8e615e416bf0c1a594c0fdc46f760d5dc394497cecbdbf06d7db93d2a711756a3534f7550dafa01954f291bbbb511b652b032eb00b804d654698127e2ef480c53f47efb10c949f50168b1d888c62c9bbc422dcd07ea4005d751dc31d374357c10af8991adba9e139e75e3367bd18c7e1ac9753b2241960999e6a0ab795c475f5a330baba955dd34fdeadc193d9a6ea7015b44a04d0d5fea544c140c2a419c86f89ea54e4cc2ed8830938b171514a189e5517949c94ab77a5e9521a38560f3bc4e389c7fcb0b49da3f037ad53f75a85c0fff2c43945bb3d3ad65a197c6db5fa9fe3c78293a2a499ab553af3756ddcca3892133c1ee40a7b73bd19262b33364c575e7492a5b0bcbfcacdcfe4e9ec0e264b4d52576c727d9a9da3a7d0d4e3fbff2137789499a3a5b6bac5d4d7dee0fe0317192e4144484d60626f767a7d8c99aab4bee60000000000000014263549""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-194345a0607b1df8fd01f58d30010604261e15d712806f9fb99d3dd6afc994a9dbdb0934a7bee40434598e9fad7e0c7914ed8f127b35ffc7d25d5431d9b6f7d85c5015968ebf6bd70ee835d8da55ad1b9a9147db756e7ac35cc3fefbb3a83586e27cd96dc334a6ddad65f8e4c907bf243d46949290f68bd7ca9a3979131629b66028008c9850a33229e3b841a03244c8a20d4b183251a8209084115c1608cc9611d916095cc6040aa76c14b54822054113a2510c178492b82cdb12408a082d141481114300089090c482418a322258104d4036260c0446c9488c40903199488989286e59c48c1c464608b7010b234d99286c9246010c2765d48860e2a091dbb01002067108348e03466803c52904c84101224553089118022ec90665e2006111021108258d63102482c009920652d324820b361198b40418b7851b184ac2083192426c24448819926821286c59b22c03033184b00091b6059102086000060c3491d1324e18c4094c923009456261b07061102818328200a92de08869cb12848b944c04190840048cd1087054306019197108810848c6841aa94952c0010c442151a0602009516088312243059c0486431629d2064e494420d4484523b64823288d9a367214a39088b04101a4095bc46413276ed8c465103450448010db908d5912480ba54824a18cc0366dc48690d3c48cccc82c1ac62c09c684c80489621451e1044e022704e2124514916c893288e0c480899249e2204408966c4c402da1884dd1145040140409b25024a805043752202369e02225c1464000178da2b291a41646201832d2066a21942484006a43c00420c349d48011132168a2380d4a4848e2c889d1a065c40849083909802480d0a269a39625092204c13805803844090471c0920c24300ad8126623a5310008501b814819446c13b61110a80cc0b871123885819671089669cba46c0c8525489211e096090a2640481644240322d0c851d81452c3128a9aa0611a414d11334a9424520c062e81141263984810417298460d0ba64c98b81024a76d5040320b427083b8044c88050349116382214ca2014a2445e3922020c76d22238a59b849cb0250100946a2484e624490c920228134018c088224b78c03a20524862404178a1101464046880b460e8b8640a3b6514b240d24443104082d22a265da98645240059c824ca21640ca266843006d41c6519046449b82405b226020155048044c59a41163888944826c5bb40124914c23366cf182345ebc795b4629109448f210245d70b278c08f9ba6a8fe4367262321945042fd365c70fd042e81b3c244cd92fee3289626e175cd20642852cfdc1e72a16d4537f85c1dbc25d69bb8dad510dc259e5d7ba1575ac940431a237806900b8fbedf88594c69ea597d4b3dec2328796b644604e63855770dec3d439ede08c27e01950b3bdead4a0b546bd0e6bd2b6b62f10335f9356dfed825fad33fe0a81c0dffef21effa8960cf65c22282ab77d66a351e4e1c56a4318abdfc6e20229b14a0d3e8de682c50e9f26c9bab44ec000a8d78dbf63d5bbada80089e6c3a300eca7949f554511f647060e23bbdbe9cf77d68ed3cdac0ea0b491768eafd65ba35cc29194a1e0349fa2ab09c920c2cb87199cce638a15010f3b235e7f46357b5ca7372b6e1cc172ff2df92179062b47f78a977040418fb79a4dd9a48dfd7024727376e254a64822002e7060d297a9d081ca39f148e1c472cec5c34c39e84526dfe3ef6153d21720266de887bab12a0f37fd0a79f8402e1fe9f2c149789b25057cad2d4073bb54d56982ec23c541cd3e6f7727ecac5d075344402ec3400401be314b4b4428f0d7d619bb2b8c3d0b35ee824ff079a3431acbb8b644dd841c92cfa8610aa302da74f2f8c91ec5b91a3b19c10a5d3bbd92b5dd1112630cbc606e0ba22db2b71f6b3f24aa171ab2efa4de7151e1fc879fbcb5828f232083d055507930e7bfd54f34aecaadf28a4d0a3220abd4a7c03b32e635223f963337ff7f048d7465116fd149bb0d1ecd112f32f38de619b50544593e1b23f661a56f6abec97211194f03c03697c4b5a8ca1ae309629a6737347f23307aee2886ee24b46f8ed8d0f44680a0e9d2af553cd154a2c2812a8132da51773d20c7128057c5db127b271a2453d7e5bb72ed1012dc88f37687da5e721b6848cecda1984df797100dc57a7ddb8d751b9e16c3755f85ad8adada51b3f13a08c93701214cc26b33b5e763f9bf8c3e793cf224f03df1aaa58e95333015904f2da7526482856560022bbea43626953a375dbf8d0fd6aecd506d6e9e6fed3ea6cd2313f57be0c0939a82b95e9151f9453029bd4223dfc55f8f609ed52d78d114373d6a0ae370f5a28e0ed6d29dce7f2b7f00a02eeb31b76ab98c432873705a43ed9194f5ed014874b019116b63c9408673cc4812594b682098c42c69b70e2e7b29c2ce0fde2a19190bc5a36de97c3d6ffa1bca253f2344ac9c0373f0604b0d08377469f38e7ffe86bdc130838452a1f790efde6f8aff903c837b0416507dc69c61d39c2009f4913c0750f4b3c16efdadbf755401c455d9e4d3169323414251e6c80257d75870e4e274a2e7b042ff8b6b80270b27d999669002e811308211cd7c74f566080f3cf591656810fe1ce9ca2af33825c9526531c34ea29f13327990e42b45595153ecff4489c1c25b6b5a565432ccdb880534189485903b4b3c05504e8b8ae71eacd12c57cedd28d0116254c725d79529d17451ec12e05d1e468effe2641f5d7268c9ab0db2663505d65ec2c02959937c95d3a531a2fa91f99bbf527c4effb4607f140fe0a0b33cad4fedd87e5702eef7933eb05bbd42c853f022144ed5886ff31ff633f8a5f8f88ab32c925deeb8d12e72de7e92c5db2c4a7b32fde5a7a5a381a631ac547aa3287183371f6d81ebf5432cfb0d93ea3e8fa981bdeba4f5e81d60ac6ece3d26ab9a12b311b21685bbb9917acef5d43c9e4dee2e98811d6866f008b159ca3e43e849d9097d8c74d1ee28b8c6700fe5c2175cdd004f9a4e6b7f25fcb61f562f38b0b3a82693052f023ddaf9c88950a379a0651b23791722f4600d6bafe33b364a0c66495d9f360cc66b80df56eff38261835ebaaf3ec8ef799b54030c9abbc0ad6ba83a366533683a9db29170e074eee296efaa38fe782064a0aec2bef0be52c780c16981bc8c6bcf748c109349e7e659ad14e6c8ce6d35ac6f1cbaa938b39e869444aa08643134e5871d2676d11d205441406e378c26dd1afbb2fea274c5b718d4ac16c077d6e15bc0dad0b3d9dc81e2a1c9089130eaf417bc50fe35e8724bc420ffa1f761f6cd83bdb0bfaa6d0f399026c6146ae4d5d580f4cf490a464461a430d8f40c60f4aab01fab0e35ce12b0337253c54ff1db1f11165b315565be66ce094fc289e6d4b72189d4551df40c6c86878185db87cefdedaf24be22922046674805df74111c3cfb89351e92c01d207253841afced4c5daff0df1864d8e22bcf81c17565f2226d3ae2cd929c234f376205a6962e024ff08a3f00bc71a3d39d67fb67cb94e9f3d7ef78a5d8a7b86585eb8999af3b054d5523b9e4a4d944c7d195d41c286eb95197808"""),
-                    TestUtils.hexDecode("""
-7EBAAFA6D04129716131907EAD0832AD490D09E97D865B4AFC5D6B0FFF4EDE6A52E961ED88DB60A325AFF2675DFCD6A87984884AFB8680DFA7378130E44F205398ED7B83B1AC32D2580570FD6603827E8E4F5E20A27758CE6D1299BAADB8A895AD586BDF7B64F8D7A52BC15455EEF240F22FE98CE4CEAC03CDF7E8A983D7FD1A59C5EC594474AE77DC43EE4E7B25C556BC1D91ABD2015B99B1AF5329DCD41B93793D791A44AF5D83DABB8E40675EB32120C57D9E6B7757D3E03008A2F788336B8355AD2E47E61B39BBFC2229D53BC9BA514BB20F3F9EE9266BC0015FE81980FDE5637B3018046DD3D4BC3D549EC394E190F1BB788619CFFF86C532B4B9F0F6F951C0ED691C59AB0CC438290E9D6FEC9E75BA4FDF12D2BED2CD988AC411310BFECBDAC48A61099CE0D0CE4B44EC9C97108A44E5C5EEC1D3154B4E72B8397CDB0F7D15AA358076E25B7F3EA1E6E80A214051C440EC4189137610450144641B1E71B5334F0DDCE9D5CA30274E0237E45B4D92D7D458ED9142CC23871E56411382CE40D9CA4358B417261C2E7E845637FD2E9B4357E7EA5F4A8076A7C2F40FF1F8AFABA5393512F690EABEBFB73811B974E57C2D473AC22E747A0EDD39E99FD6E5D3668F3DCA1C795CE27D1A155ED9595EAF9061CAF5C55F3EE97056AF6ED90E05D41E90926F69044746230C990118E4D0BE4C12F7A4AA0464F8FFA7CF64C07FEF171B2E43A917AAC2880675F929583E9040BA6FEEC8262002613AA91A2B8D4DBC1D36F23FA9248A2D3ADB1DC5AD669EA219D35DB17C9C25095AD7673445E59DA6CB2260C8FA57639D6BEC8AEE307BD9C96EEF00C93318DF7DFEED970DC1F61AC5C94D4086300D91199C90C95C1A24F7F1E4292A60AB67F30BA990D58C71002D3548A412276DBEF3984FAB312723880ED479080EEE2B636ADC75AD4423A6E0C5CEB7EDE528F871FAF21855C3164469B9EEB47B6D37CFE4222DCD0B9867B00BEE12C27590DD77C24FE640DDD34E9138E70D15F52E94F3874447CA5CEB48573ACFECA3554E2B76CEE4E31060BF132CED8AB953F0A280F7916810A107AB5BA66047FFF0003B1CF13BFEB77526265B98E54E76B891A89F3AC0ECDF71406674865A0936BC57F87B64424BFC8FDC41E471D951077C32B5AF960457E97CA05F3C378D94B60A9735E9EDCAA96E413FA391AA687FD07D9D021B1014CDF241E5460DB08D3B336DEB4CF0AACEA57E4DC6C464F698CFC2AD10CA72C102A25787E0B89249F63406A39A2A792B2DE04710C41DB36B55D2FA789004E593DECE9865771D8B16B5436A792FBAC9934852B1F55D518F9A07CFA56BCF488D61AE355D63BDC27DDED6A56154B8BA3AFA3EC9C01D6593C83C315527F5FC61BB169723346AB4075D09701789268EC1F02EC4A1CD8A5F2584E29F126B1ACBEEF660CBEF16A8E9FF9C0B542042EA76684F9D70F2E3F3C18606ADCB1D695112B129B301008EDD5E6121A8948E1165D350FF09647DCCF4A1F8605ACC750A0AA8319A6685153A7672B31A3DE785EB22E1D223D6271282AC18AEC83C760190799F082D7FB0F238F627271BE62AE5A36A34D65B5DEEAA12D6B14B59BD0C619D8D9A44238AEF1FF83C30118039E834F7716CD59E138E2ABEC2921D9FA92F6808A760031B2157103FD2EAE988AD6CA4F350F488261409FE91B5667A9A2EF1E226B8BFEDDEDB84ECF993E9A71220E0253D2C4B918C5521C7953FDFA00D50A32879FC0A68D2AAD13EE181DD47DB9E3D715574CB3D566BDF30209297B01A666DD7DBC5464F913599086AA2FC6C8541592CEFFA067B287EEDBF4C9B9D6CB23CE1DEED628935CB2D6B5CEFF3BC442B2BCBBEFE4AECFC455A3A64FA117CFD9289FC27E6289750005877DBF64CD562E2E7D1C99830F5AE63C70685B3898D420862A8C4569F2CFDF564EEF4F94FC34CDFEDED8854855F3A4E52C612258DB5EE4D702BBA98B450D070264FF86A440129DA2C126978DAB3341C4079A66F9C23445C5938FA799E78F157656208BA7C7BC7F936AF49D11148856BA55910A6A736D32E0974E50BFA608975E37AC0601FDA7551204EA66F524DD03F44F5DA28EED5D126C32794F1CCE747DC1E9B1FE287CA607F81FE7C795C96569E66B2F3413DA810035D472B7F5AF74F9CC70306A8EC36F1383617D0FFD92F6DEFA7EFE91C840EDF24430B197802979752FD55A8CA85FD8D4FCE774F1CCC540F77C02E16F1494DF170CD8BA57A86BFB086349D53E8A62E1DBDE03369757EADB0E985A038B31DCBEF513D4FF9A3BA6E8338EDCECA7C3E9417F9E133BC399F2EC0C72E60E809F79D55FE1A917CBE28FEF19D6D08A43F74DF496EA9305072C90AE3BA0D21A1AC0BF040920D3F5B8703C12A32A6864382E9CEE8D00CF4F93830623E76197F7F52309824B08B8E0D5DAF5662A36981D50880FD3A8D73D24430A1CB201A9D0BDE656593B37B8EC47F235B5CA251249A04507DDB81F8E5E4E5E414B3750AB168BA51A8873E6ED153E302F61F7159B658E316D6D183575D87ECA30185CF72C67543CDB658AA07B1DB220032DF80D287E769E3253C80F43570AA538EEF49F45316E176F1F9411F3C085257C6B8C708DA7B924B792389A7EC34C7F778E6100333E8B9FAE75A4D1A32E306AEE36D29FC6823399FF37CDD0D11C8D03F14740342B736C4EFB5302C141A86C857309A70BD74DB6C7C29C839F8D86F2A136F67A0FB3A3749542A9DD8D4A062672C75B67D3BDC3FA6B56F3E79008AEF8D8E04CC7781B23D0DAED64CFD1A91DBBAA2C9C4E765FE2FDFE6E8533848E51FA027B86AB05A0530F15C1B7B6BBB268F09A7865E202B1645F8B4267CB1A49A2929410823AA9B834101E9EFFEAAF6E406639AF7D2710E60A84B6205339B0719E05BC6724FC2892A017AF86D80D361A7FEE8C284CB84F5F09B90CAADD49CFD396E6AC36052F5CCC8E7667CC762A9F173F837A231D57584A3BB19671B8B71907E415A1672475ADFA11998F94F28B00903AC551E651A3F9485DC0ABA3297E561E0B5A5786BAD9EC8169CBD706AFA60AE764BFE01EC514623BAC6C4100F707C5E8A02F4B0D6265502AE4170AC3EF95B49ED1A2BAEF56F63D5667C9FC0AF4C0A8648FB6AC5444EC8A1FAF4715027AC9F5987735D1AF7C55AF4C838FE9FC84FF71F929758DD52E2BD4A34237350642C0E641B6710A66C9C1EA1D9BDA80198FCC56D45D67C3511BAC0971AC9B6166633B1713A969B8DBC3CF60FCD6998137AD713EA3ADA84169D49FBB7F5CDE362ABEB0B71D022D9ACE7FF48C9EC1A7E0C72B564FD2C620272A482941443838D0506E2294B760AC9DED5404D3C4D2898315D3E3A82D2E944D537817B9901AFEC343B95F2844CDC4AAC3836E7713739F4201B95C42FB7C99AF8667628C1B60115BCB185754148B3C7226DF14B6DE1AB4C6043329B176C9DB9B1D73B3814FEB89E84A4C91C84993752B7AD30CC707A71339E8A277A5586BA85CD090F799A6B75523A62C6DF1549D787BD8722D1F26BC2C150D6A38951F3014B83DE665B21F5D9D97F2237333CC10A4114796D56D13D643364306E7445F475729602A11F8BEB002BDDF30E579E26F2BE4AE87DC666974E24FEF2462120B6CD8E79D65A2E80542A9240D4EE1F616326AA528E2A1282EF49F0312174B67D40FFCB1370BAC5D1444D75FBFFB6B0887F4573A8C4622082E1FE349B2C73CDC92592F684769FA7D7CE6FB5AEADF38023E51DA4EE3EDB10368442B218919341FAFB22EE80DA96A52434B184D499A4C49317C62F6D6DC9EC1413D01A1CC3DC8853444E52718798EA158A12B72AF023079E5E76F41AE685494E947618C4AB3036ECDC74F7A043230A0BE116F2B617818A2C94C54CFAC964C73BEF969591A3CB2B7DC9CFAC7B4F9B64AB70BD7FAEC138E42908BC90D6ADFFBC88EF473CA8CE7BC960C4B3EFFCAB92E8259CFAFA85EDB7832B3E630D6D2CF031B8CB570E38C101A56B426C654464228D152ABCC6DEB888DFFD7FFDA974E60CCC2AF7531F38A813E263D9B20DCCB50229E7D8F379F81A280CEB90B64BA3657F1E50381B468D0A6608A4B5E107C4736FB4CAA10FF3045C05453EE12A9FB0B79845E077803C69CDCBF7CCF7D6FE6067ED152F67023CAA6095D1748414580232007AB3426FB2889E1BCDDDBA539A2D79CA523A2CD1B1314C87502909DA849BA9B11F9104772BBA27410018348832B0BFDA4F09AF02B351927F2B6D29D9CA9F330266EC035908C9D4023CDF2343B177F57903D37AB89D0F9E23EB0C4100BC6421235CE5FF2729C2ADCAC24D1151757D8C6D6DE53DEBC38FE866142D1BB593974F4D3198C03DE4625F41BE3D488575B25007C2D5970BB152BC1C23E48A88036C070BD38604C5844E4205F1EF3D7FAC0B4B9FB51F229BA322D3355E458C27685130FCBDF591C0520626E5703A2E85871A62AF0CF2DA3468C401644656CCAB33B2402074C59A0EBB57928F548B5FA4871A8B2AF0BFD9A871A5C257044C17E4967B70D0DFB59F1345526FE59B4BD92A1C06B15E3A6226A4821FD614D8DF612A3D2DDB2DB67BAA3878C68C16645CC747BA9B366677541171A9264B89EE18D9D169D341629393C5526C28B24CD4CFCACEA9C42DB2B1CAFD7F906FC17CCE16612B1261E62E2A700CE74DE73174D3A1E06AA31AA05044EC324F026CD39F7B13399D9D86EEB53A6DE84914719EE31AFFEB630F3D8F08B4FFB10016209C13BA2158ECCB4B74BF04EFA73222554FF5EC49709F7F8DC1D40005E91245F3A5E2A00B9F64678B2D8A9E6BF1D011900D9D12F7F3BB023D1E5985BF78F8D6132AF5C0B9C330F361EDE00473DC9EE7469478FEC02670E8659B643B92C5546C32FE7B0AD816A5080B5E3867DC209EA15AEB4B14E42AD58F34CED65ECB3B519A54BC25117EF8D392A85C2895B5A4B73CF93077E360A828570FFA02ABA84D6534F3EE0C935D97D1D1CFABBC0D82E48937797FAB31704588605082A950CAA23D6569AB793FDC31BBA561E729E80979DAB84ACD4EE6B2CFE06D2EE8C4183D33B9F894C6865D9CD405C7665E0150B2B649159BE684839BD12CF0091614E1F821046238DC9F538F769FCE51E9B8DEC0E98442CABD3A4296F1D4331A16D33CA356B11E3DC13937F814D3D6281A746F054606DC52B737AA40422471139867624CC8E9C559BD25C7C6D7F902677A84BA63E8CB817820048C1C0ADB6288000EF2163B51ADD4D758D1C87FFD574354B41CA5AC72228A7E9E9E75BE9DB18FED47C32E3C561C972A67D50A560017BE794AB9BB6B50CFC43D2F6D57E8D73CAD6227C896BCD18E0D7087F57C365FB9EBF5864DFA4A13B6B5DD7FFFCB648C1E1FE40B6A10EC0C45C74504CF2105AD443DFAD1E306F720B9CC37B4A30198D3123FA9FB2A7A9DB3BDD98D441B03E0EE6A8180989E76CBC71B0E8607C3A9E5D20B6008B010702FC5D59847AFCE122F3FD4FB5D89D3A3331AEFB96B593F724C04885B574A43B5EAC70B543BD191BB818768C67A10AD6E2D62AA4C65FA373A19116AD86A4F9A97064E0C0BF80106DE6654B4A3945983B7DDF3AAF1E14A04F6D3035542B0F710352AFC20FEC78B61D8548B9669F10B3D6E531AD07A84C493264DD49759D95A6AFDBEA5AED1C7D7D2AE6D2FB6747151CB6A5C2F9C1AF5CEDBD9CDE8D5993ACF080A0008BABC759A9DF035C648609E610F226ED128E2656A057862246B65C70774B68F54D68073393B85110285FB463DFE394D9DA0AE85985FD6882EF5B11FAEF2BAC18F9D9D9B5CBF0F80AE7AC4418EA658D68B14BAC135452DF271DD3348BC338BC6C789ED95D5C5625762E4CAC6514866613E6D533AB9814B7C337260BF16716478401689F4079644DF4F734281C16164D19C4ABA20ACCCDC517EF42C19A5B1CAA4658C27B61902ABF88EFF0795D2C971608B0570E016CA0568CCA3F7B38FD3DF5608154A33C1F0D70C2AD0EBB134A8F475A8BBEC8408D3B9B0BFE8A6F10FD6C979B13C3EC73F191B788A79B4D07AC45172950689584C909247DC8A4CDD686186DEA16676851B8A7C311439149B1A963B0CC60E5395B56ADF27C25A51BB4A2FB19E14CE66B6D11781E89B3EC22CB854A12D46970D1A009AAD071C479D9C731770D666CDF0BCC381A3D328542F6371FC6F5FF7C4D3BB06186C048B2A3774EAAA3CCBA1342927B498F2195213326C9E393153BC8846AFE2120B8FF4A455B59AF6E65BC0CE9CA3502BE73D74B6CD12A760A9E0E0D26BD105FD993DD879539CD666CF2025DACD481A122627594CAD7C4FE30948412C1C6A160C358E16B6B67653418A22321DF5B1A9EA0DFC3C82DE3B8CB0F48EEFA7DD6188023D1B8B7632270E63AA38873A2C4472F9EF1E8DA56D5328C00548DDC4D9FD79115C5F6168AA98099BA1AAD606FB92F8D253C9A55773E5629E84350F3BC3B00D803E83CC2516C6C29476018ACFF2ACF61584A175E67EB8952885772E6C2D7F9C2B79C8B2F2A77C73C8B0230F080DE716B2A13DBA5FDC8648F17573A2898E72B8850997B6085F98523F00516DC7A90B9C2701BDDFE505A6C330D1118AFABC731A1DEAB813AA0E17708122C0069FB61A02FF6D5EFDA990A23E1D42C520CF1975FF06F123E1AC0B0A86FE666F8843C406F5F1E1A36FBB7A0B41CC641EB49416D6F0AB03CAA6AC0CE3A3DD1977B4D16EA33CF75A37A6092003D097D0ED8FAEE89F761B40F7E600FD502887AD90BE4BA311B9F4CD9D348DF230A2EACBA3FC356B506ED8C357E228970A948FC4983AC3ED9C3ACC22FBFF56783A73231F7E0B91DFED20E754ACE7DDDDDCEFCCF3ACC76554C269D634DC228B38C284AA35C00487D7873C8CFE8E8657726FA845863719FCE5A9E32406E2191B791F76DA035A4C862176040DA9AC0F37E66FB84DF89CAAAE9D8804824725FEDB95E5380DC66CC72BBCA1E131E6B785EA2B2B4A05BDAE01B22C3D47CA85092802A8EAC42E963A62307476FCF94ED7EBE5538A8C6F28A6C65914CF48299D3BA2B89B3008D29CD874B79A72AB840815827566E50627C2C332B1BC60060BF2FDA320FB040FD14D52CA59B24E325B5783BA1BDA3B27415C9DBDAA01562466322706CDCD0307C3305DB08D2663C57F6D3307E1C73832F8CA712402C7402EFEE0F1BD77CDA08F5F6582540D34F1B2809F84EB2F540558EF9ED46D5C636C45856AE57FD9E4650359635BE72028D1CD37CD876E0DC598E360CAA1DCD1F9F2BB4CA27CDE012980080E91B1C7376622907BA6674F1EB9E80148E6A959EC74950A2B934D42B84D739F1DA528F5C6E1C90A238E5167041D4E9AE5352B74C89DAE368778A90170461ECC0D6B6C6C53CE36745A72F79AAA1C82D494BD89D719800A89127BC3FD55247C1A29FB8387F1E3576E0C45F4D327C0B24A75FE25EC6147C890F25E50AB3C43B94F451E5B5D67F8D3BAAAEA1FE211FCE8622600400F73C1398459EA7FC59D02582C2806D01023D84BB50E99AE9ACC217B7223EDAD956FE155152E7F35B2AEE1535885EC048C6E0C50D395B0F1C9D767048E9D2DA7F15BDE192C923F1C74ACE06600628602D1B0189FCADE0873880EE8544AF3E29314E2B5DF87BEB5A50ED72FDC093800B12CB2F870304289A73A65D7E2384EF3A388EA9F0013B2B5C92149E2538542D95FF020A23E976A7DB3E2C9913D87D6EFF12BB51EE298F1D2CFF18FDBAEF56B70CBA35EB9273F1E58A6CD38F1E682A759FDF8D8BFF60E7CBEA948E25DF0114BEBD4AF13E4E0D4E7C9EAAC2C5F579A1AB14E7FECF9E13F20DF873F8D0E090905D32C8F8C0033F5D8E9F1B9FF17EE04FE3656EB66F5E4777B60B047DAB9BDD883EAC31A6455D1719CB475D1715CA0D12762F94AE78CF3C8EE90E55E71D0AA4EBA6216A0E81566F7813E7759BED30860BF22178407783B9A8AAC30CB4D53AF140E33A47ABD60F33EE700C323277E751E5B32B221E4B9815FDCD400DC544DF845619FD733F164937144FC3D89D8186F8B898418459811B3E66796DE51D1373B248A9B3B9609FEA374784A33989FE9F5BB26D2148F7282E09C35E13295D90BBC7795DD72CDD4955E9D148BC779AEE9C7992BB85D8EAFD102FD690F2C679CB7003FC4E182678320738361C361747F49AC6149CF4CDA4B80581844F5EE4818BF61750047C35A4B10697892A80F07E946F357574527FD2D0187873BCE78EC99062C70CB4ABB72A104A770CD7ADBD20894E7BCE2874E45302DC0BCB9645EF28136F36E7B179BD003D5DFA68A572BEEBD40EB9AC1F9228C74A788671BBF4781AA31C7F8699813F32EA8B60414C3ECB894DC7B01E50924482E5C068F0BCA79BAD9F469770FBFCB3942D1A3E54250E87B3693329479217514A8D7B734D256C5D28EF854FC3F234BC671F5225B1DCC20E590D8E5D09C07B22EF0A89A5B863C2E652CC0B1623579541C63CE9C2C4F66BC43323D7000BBF2923F5B8A76933FAF950D2172C1D90F522301D9A0C22F470EB8673CDA0A1B494FD7EE9AC1B4597B2DBC26FEE33A08CDF91E3C59BA4F93E02D010FE3F1C1FCD694F05B7A8FD32D8E7CBC2934A25C481D9C58FED7E0AF3AAB527D6DEF43D53756F0C95B2B58A426F7F61D09F4FBE55D9AF053B92818ED9FEF1CB41FB5CA23AC85B0241900F73971558116C5809F565F71333713EF5BE87B0AC95364C9FAA80DBB9EA84B5A5790D20343141093F86942817D195ED8DF4A2DFC7F7090CA3DB46A92AABEEAE2D7DD8B9110F23A89E4FA7B5A1DA27D643BB879888A2238E221E2F67D9DF58E73C46023FB7E999059D3B81FB753B2AD333207873831AE42FAD8092AA04C0E4103B1CE0DCBD6B06CC2F0AB37CD1D10EC4C83428CDEF84041D12BF9ABEA5C80050A853CC73FFF3076BEE68078737F6EF483F486215118C640790D0CFB4C6E5243691FB73B1294E0D3A494A4A538B94FDD2746193D9FEA24C1C04F5B20D2D40B638CB932C35D953A9D31260B76DA878FD52EDED058D1DEFD9CE214D14C3112FAB00B7F2DC88F7EBCF79EEB1C9C8607D6919B8D32CC8416E2B981C141198DD9884DC3927EB0192B6361AB556EB3977E5E242E5E26BA60BD42892F46F3F2DF684D0D9FB41BE42C04F0C248938AC79F110075B42181DAE62801DF76AAB50AEDABF4361C0EC597F31245B0390CE2629DB933E450E09DD39E6A1B644B0FF672B52ACE2AF52780D3F6505551F52045028C4DEE6D1C6A34BCD5E95E9DE1BCE849643BD07E0E6FAF8B27504F859D73BDFC07FD2034595AAD85A9DD9AA5B3A72346D6F3C4B21C4CFFAD8247C8CAF0DD9A708E11450502BF3C28EEEDCB0E1D32D3EF1A3F6237E34C0E4D0222F496839B7374EBB7D786973E85392AA8FF2A9901D076DD4C65635286276698DD4388F867D1ED18650FEDA9B03C80A3B5BD0AB3A62A45ABECFD55898BDAFBA58137D4BE29EEE8B3B3D1C4467B63DBA1EFEF2C81CDE7CFB101B1E65084A0E92955690C8CDE6F93E23FD79B76DB475CD24DD92A7504510F8DC3B22EBCD0288B4E479F8DD835297B196531D2DC759364306EB6780FEF31C9E34142B55988F81312B310093F77CB89C6E819A7CD3450D0790CB7B5E33A3E5E51DF05A3BFEF63320CFF072D450D71E7239AB24E4D83A8E8E501A5BDBB041219E15517B15EEE237836672A761D36D11EC973BAF65320B368906392E2689A9936752563172B3A5ADD90066E01EB394C77E40D57553B883F446C42EBB9CCB47FA56816B06AAEB62C21C8F57F926420AB7C1D5E97E73F024C259011CD585C23D30F99D22197B569D67BF5965887AECF553A9B48DCA0C418778AAD65D4843221B8217D2D61BA5A46C4F9FF5B00B78CFA8B6496007A1444503DFB8D7CDE7A63D5D7F54EE5823A33EB3A155C20F0011304068CE0385A09170606FF6895A6955C211AEF5D13BB93866C9CF00A911A4A50A59133113A9C7DC53409097808A6D0DC44A7776B41A7A43818C77CB51F3E20107F080F6682D90399853104B8F3AC4DE8521048B22BCA58B5F7B5EB3E3503F638C1FD24568F23EC8C59A3359A5C9CED0305B1B81677E20EA35F9E896E665D3CBBCB6155E1B0539A0B26BF95396DB8548124519B71BEC19A17DFD4AA2A2E134BEFDCA352B01E1255A12377D811FAED7809C9B881B24C185F1D1273F405F5BE82FED08F26E6C11D39A604E88A1EDFAC8AD3DA9FE8B1111C7E038A14CE58B9598AAE96B7BE84C153A9B26993CECB1CE931E0CBAD5F7F6C18B68E14E83A6BCFA33AD2B3A707118D56803A1E55CAC8AA93EBC47F9EFB"""),
-                    TestUtils.hexDecode("""
-551742a530ae4d15d68f1e222c8865e6fa59541a5e4b6e137197b52a5cb84548c099c3328b28865c34e90095e8959c65f68d8e4ef9e9cab97590736dac647c93cdec474c3e6d1c934e2eea593479349b6e56b95dc356cab1e2a2a7a94dd6490d9a186879ab75f16e0bb792863a7a8a19ed88d74d22f7c17f3b55b4d6440fffd4c24d814d3c09cd80b3d3d137882439f628337061253522775d68c1072b8df9403ff65679d24b06f1a2779ed76ca3ce153c264a06cf04948eece4f06243f22898bc815a90344479a8edbee87d0c5473474b1b588006f6dce5be82c7bcc2db7b50fab4c2cf06eefed93110aa634f6691e9b757aa8a01ca52912040a3ca6cd6f9c596eedc0a9d49f1bbee32eceb2374336f07e74b425d6a894f8c3e49a255068d08ddff453dff688f9c74a2be872e2a205018fb3e0149113ce438a7b83e60f536ac616d748fb2c590f3ec7e4c81629a4fbd993ced51995432cb8b3778f7d4e375fa54c9511e8e97323ac021b7cb2184bcce98f87a2712740ea1bf33670c4a718b475b31249ddc1a9c2b216efa7b5bc01f792cdcbd07f3e7719f71b81c3a31d8cfb7dc07efa06e0740743c9bc515c0983c845b1c7b2cfe7745c8d0e6967156cd36e88c8e3eaeb3c96ede6f94a53eb05abbd3ce8abb9f4d2c350969a8d5fdd673188cf5f8da51704b7390d8de842a18f5d900da6f0de22b9b4836947acd4d49de53e6bf96295c3f89a01070fa3742ca5070b56afd534fd4bcc280bfa5233ba58e3bcc46cdcefb5a07904ead0092cc088e8ef1de2ae418a8f977dbba6b23a634b93abf5135504ec8adae1647042210be6e6e0c9b333c3f1d0dc906ea63eca4697823fa06cbaf999ffa6894353d0b886bc89b6d8b80d88a80b570aabd37e8bfebb692a61ef6e344b4bc5d10a4d4d7aa2b2c47935ce37c1f2143be5df3d55f9a947c1d7244d80a74e92822a7e178229d703ed770a3a2e8e07cd465d6b4fda758867bf09dcbf050203796ca9a6926196f13d8a5d034f566522954999ab327307189e0791866385a3eede8b8485d6c673ca69452d0a7ed6a32142b74115cd39c797e48f38111b309a3b5a122fff1c8afbfa7eac2dcac8cf225c971b88a49e845447ccfc634341e2eeb214ab57de15ec8de38300871207d8bf98a4b9a44642679a67fc1792a46bc051cbdceb15b4355f56233ea87dd6613afa535b333104292e946ac29b73d04be3b83a0a6afd275fc02d99fa0a0b1796275b45aee6fbf801f5394fd5bb2670d18bba553e533d39d0e66ff194a7555bd23ce14ecc97ebd99facaaeb8a0d0e088d2b9bebbc48b4fe32da39a310e28150936dc5e86bab264baed9721beec5a6ab21db810f1bf539d4e6283b7a382984595eabb42b21aef0a1186d66c988132b0fcd17ebf0bf9347d64e334e165d1e8107f6b49403d77516f55e973469ec6d3ca2ecfa2df3c7a82d08ce5875e4a0997ab9c4189e1b4c37b5567fa7731d6981d96e9fdc35abe9ae1a4ab30c5b329cc617a2f92cb91109738a7a41da00c48eeefd6e003d3e25de538bf85d83a4610c0f86e7af160703666e6fb525122ecbacd13242679cb02298777001fa2ae853ec73eb581229400c93408644bd64cac57854113aff1fff6855e2632e1e47bd145865a142c9ca2000b2595fd4edc7a4b4cced9dd87a596a9e245c25fc87a91d676fa0b02a237f895df9dbf2eb099a60fadc4b8829bbf7aaf94d1fdd10dc560244f0d6f5394318497eeac7cceef0bfd8316914f766396d9a5a7cf907866f85ac6e188133614490e1031dbb8abb003b2fe2995a28fac84d07dde5987a981101087606d6b4d4fc1bf7b3cf56f667ffdfc28adfefe6dfce01579859b662a189306cb048bb4b8d66fa9861e83fb28c325b89abd6838e71e5ebeead3e014f40b48a36f1d468a4a24954f571f4972afdce0d6f9dfea1cb500b6212bbac96e7a3193691eb0823a48e6f49b63eb4b571dc1b60654b6a882d84ec4a10b5faff8c0e71bf1548578a8bb4b772a9dbd1a76792e4186ccaf692a5cfeed5414be448da61b1abed7d58acf60c60022d6f87f25b291c226bd22c9445d15e2dabcdebc6fc91d780493865f4dfe420932d9a106e81f254d97b91d00efba45517edea7c8dbf369a32c9d04a5d141d3427c68b19f189af86b3e2fa8ff622a14947d4a5c4dcd12d3e12c714b32075dd9a9c35e8edd715901559efabebda589fd123d0a7ad33bb67f353bd01c4ef51b26a187986edf0ad892b4c71b2ceace37f103dfa8e933bc422a2799dce9b7ff3de92b578e065b79a8e7d4c028002f5b667886bb783bef181f4040c5b03050f9ce2b9cda0787ce21675222dfe20c40640a37058910069a0cc037ce13a2bada74027901a186b5f194792105708877eecf678aba0436c2dc304e8fc040996e488f764f3d0f52056edc69b5a6e901bb0dcc75acb8acc9f22249961cc5df3d10992a32d724699120a264cddf1450504feb09d82b0181e0148f7ea9ba61e99bcaadef0912e1c545ba9b97a93c9cf5a8c29d3ef2a2608a32684b30ee7d43e6006e81c37b636616e736a019e26079d3025b1c5a3997fd9021634627964a01786891218711daf4812cda28892fd4803dc5ab334f18355cae65eb68924ea9fae67b74ade42b96ebd43010dbd0536f7224fff388433de015721b73c60d4dfbe1101100efe6e69965fcbc8eb442a233654b94f79ac0dd967612fafff60141e1fb714a3e88147072c2b44ac434421eb5295a9ea7752abfd6dfe4e10760f0f1e6e486172d8d4b092e043d085c800a58f5c6882e37099f21565a04ff5c12ad4d716b30164d8951f6cfa56c93388fad772ac2fcbb80276a235fb4369f01c77266f2286b61510eebeccf4a610f995c850b2ca952c27875801b692f8c1ebb61758c44f97ca4628837ab1f6807b57ba56c1b2e39e1a002dc724f06a3fb1510f18b37b0b48dfc21d453ec3a576fcd3302ce89f313ff2aa895f0103e11b3c01291c112a4d9b5f67b48767dbbceb8e1a0393dc8fa7b0b7304a02e30612cee891cad631778726124860518fae5a1b162aac95a6a3aca66e1dfaded70547e4d934bb01034038a23f63e2695f554cda78d42808c750ea5dd3c7c34e74fefaa93a91ca66a472f2c1f8a1de3c6e876fb7721105685639cf82ee003704637125e9177cfd964acec7bc1474ecbb0283e317a03696bcff64e4bf6e58e3893c7fe4d41886690b29c2d6f32ce57ca25559c3739e14af58af1d96f581e469f146d727ed4ff89425f4be0f5384ccfd5941f6c859d6d532126dcf4529564be166d880b4d5b5c617173778197afc8d3dddfec020c17373d494a5461676c7b8c99a3eef2f3f52c2d304160696c7a7e8384919a9da1a7a9ddff071016172229405d707cadbedbdfec000000000000000000000010233645""")
-            ),
-
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-d7910e2ff97acc1d1ab59e023ffe199ab92906dfd6ab2e463731ae484d0393ed5e0870cc0eddc5d81acbe1f76adac417fbc11eb77d0c7e4921068792f54c5aa194aa933197110060309ab597bd1c5ce33101ab6e50fe871d4ec627437694d6df728d21ccfda87d828ac5950e846a311e48103071ae5b66f3155d87e68c0a77d70c964008122590b029e1346d60820c40480c0c428421424a1c364d90a06dc1004c4016895b940c94108d5bb820ca420ca44208e32248024722e2202dd4c444da18814a806c54167208126591a2500a012a082284d442284ca86814098c5808281a830188b88c0a076683344662268c21122890b04891204059422dca96650ac44c1a426e02a38d021944d826208b107111024103a44823906c64021049844803c9499c326d82c04da100651897214a3685e3844cd4464e8148651c430d1bb1901b067121434e0a864453c46cc4466d10a2848ca46d0a022d19c76113c311d4188011879124086e422221c1904850369022a40411396043b08001c904134146013188d1248e91408401110e903682e2a2459810661b858902a50cc044650920494820318c388dc488001c08611c07225136068c466994360e0c200622096599346a5c8824d4180c63961024c79153c428c204815b948913212049922ce2822518c12d12994558a881990871e33432da442dd2342518274d622630981248a2805064a491d8a0480a25511a03458a30865b848d9b8850a1b69008112a1226441b9324a2146124107023a20c08233004b16403490a9ab86519a105199464943249482441d2b025d008891aa629d0a48491940989284044266041182858124ce440828348251113694b908552366663342e1119281bb2010b327209364e020142e32066232661a3248a20910820989144b6311a30020b994810836809290a0431300c954c50808091306501c325c83241a014044b444ac80852c22649c2128a18054c14097213092edba60de4220d0b2751109760dc1466a2c45189b26994384982200e84466dc4848dcc206908130ad2a44152b0092380210c121209820ca282314a282c21c7850827248a062c2195648326668c2031522020e42250c3324153180613836400c121d912808a94414ab065e4a809232190c2060013362e59128d238930081968c0040281048ae1206a0a290400466c0b3885e2486d48380e0a412e1b932422234993a8655a3824d4800c2042512199090c302aa2a8211b471111c38414b90dd546a07aa699e317ddc7e720d95e02563ac6dfed69d7b6f0091060c20f3dd65d9ae0463516f8ddac070d5c8f9cfc446f7a279b2b6b10329e69194903eb9ce9aea7b23784d6a267b62edc162970ef7b885ecd1babfe34b1eef17cece401a53b3c0a48c906a35020632709159c48bad06c7c1845ac966e4bb4c549ea4ded612acd9369a8c8852688718548f41f7c36a22325ec219b94e3ae3186b97508fb004848f1eab5f4510322b634d92bb5ca846ce8b691b2b0e242a522a745089f29253a5b3f812a054e2a4403ea7da12597bc66261bb6e2ad226e91d543fb40dba3f1dc7abe57858ad77c083c1c775108b1f2779147808d9cfc0eb56b76e129525cbc143124e7ab4fe9dc1ec8f9ef61e37de3d7fd0ae9a1980360ad141453b8be2e1b845b9f6ba64533f532420ea769fbfbaa4036b7956e971a9f71d32c0854aeb911069f2486ec8a52e575d53fa0f4bd6b87c3d6bf364f1531a3531b04db09f0b2344640cb3123a05eb8edc7c23474114c3663897e3022d3c1c49e44ee6aa0da201b6d7480b0a4fe496eb3d1abb932e7b246ca9fcee9ca2de6daf873f24a6928d3e1e42ce415d205fa4d0e7c44d29e728b845dc0d6b3719c171b5aed9d539f94328a23ff125fd5a4c048d6b70084ff3a96d5433807cd011ea4886669c2875184d644d88e9224cd2c78c3a6c5450082aba8d25c86d3a183bbca15394a965fed396568c0a11557c87b8bf7f797be047a844593267ea7b81fea58cc0ef9241a8ceda3fb2c93a28616c8aacd5c22e652c58720a2ee810ac91090ca53a10d47c055f5753373e983c457b914eea12a78a55d7f9a37bec0a609337ef580aa434e41f9030a3e9e69c8bc0eaebd1a987946a6ffec018eba885994fd64965b9be87b59b13083ce43a5d86bc5b2366c90254f0a598fb5b78044f67703bbe49657bd8da1f1e853381c05fc43bde6a0d6a952d281f3efcf9db89f8ef00d21b9630e604d27ae41d09d3e4c02953329c31829cfbcb3bec32935f68b9d466320d7af551ef29632f38d2c80360657572bd76bf26ea1515b4f31494a89c06b487ed546aefafe5620785a2654bbc15da74487898819ddfa07f648d4925626582e244538a0c3932d5e04d839c008e5e3538dc66a9ba917df7f4ade6d0e13cb267f15bc6b2dec78666a49137d13464f8707f08d525e5a70e3eed15aef54e9ad1d96bdfeee080d7eb022d79d54f9c194d41f626755a36048edfe6dc9aec7adcfc099adf527cd46eaa3e3371d7c17e4f34c6f6e0cc4e63814b148a4e8d9a60e76648111a8056405ea4060d0f6e042c3280d0480aaa3e92bab91085bfab153a1cb9a5639ed18baeeeacdce1ba2677f4eb60933111d28f8d09a558add70c6a62cf9b665227f6de4c19fa1b5d7f8bcc3a48458e67432ecb12bc6785e87f6b4838c2b1dd87aa56716dffd7857ee6155ebf64cf721b40ec05d2829a79d4d3f07a818c3e615369e46c6f475748d254ffcbd8f971523211a86bfb96f51bc6d7443f2cb2fe1ad567f8e41dc1a3a27455197dc3d8f66592497826c63b7d12f489c167c400a38d45a9ece1b579462850a3a04087b974cf0f6aa4f2e86fc17132ffec7ae947a4b0274bd54cea6a12a1225676d21aa7c72492a510947198f5c9f5ac22f75b368c74bb68736fcf4c688a41e09bf3bb06a721b71eb1edae90c93434fedbead5b1d76e0790d0f99140d328a338f99fd788c719ebdeeeb4a6fd793f7c255ad076b5bd2bc59fed6699b39e0e5f8a03bd1ad76dfecd16bd10324f1b0fcedb3030d09184899ccb6aec4ce031cf0b10541c114d56b760dd6fc630d7a77dc98095239e2292416fafd9a2cdb7c2fb6eed1d971c39cb7efd7ab31f353255ad342e9129534f769640f6808a11b173231679d244880a8541c299cd0caae9bb61b90ffe01f93395fab1fd65a0930d285d1ecb510e8de8ff93b2b63614b0389d7332f6f20b61737c29769d0a05e472759dbe68ab17cc9586f07d4c2beb47e609dfe2a00a27dff3db68a65784b1d9b4ddb1b454bd49b0adcf63155c5c7979762c2248a0dffa7d31c8486e1ed4bdd01155ddd4a5830edabc74c509bb79ae6ae3c94d34e4fd1e6944d41b8ef5de8cd11774878bede8aee51b87303a502abb5394c8dbad7636f0c71aaf4230772441f0066094421550d4010cc2f71bf055b263a0b53bcdeee45b7517eaa4e3b4801b09bdfca83b45c68c52d8f0dc7f8aff1aaac45e1e86be07e61a6fb65c65f1ce21e508ec0ba3477c0bab7ee1c211e071b4449f3ae379e5c46fc4ed23c99de77e5675a026c71a90696528dc29998285f6d9a411cd1bbbf3fcd522713e0941f92468646dcafe9db8a"""),
-                    TestUtils.hexDecode("""
-3F1B179FA452CFFC1F4776B275BC9DC61A4448989A5C74AA4F6A42748E49DF12AA62C5DA238BAB9F4309D563EAFD739B54E8957C0E91DB05F63B2A50F11205F5AB60B0E857F1AEAFC0562A76626AE579BA3387943E8B735A4B1CCBD23A6CF56D7F38CDCF772ECFDB7CD40781EC2622C10D65BCE780852D7930281726CC2B83C8D8179D842CF3DE761B071A6B04A383624398FEBE34CD841CBDF9C256A5EAE3973F0C256F89665A0B23F0B505A2EA73F37EBC11AFC2C3D4FD8626EB86FF0267D00DBC567796011E5548C08208CB0B43A880C1590CBBF0549683BC71A8BBA2CCA5F98011E592F3B5D7C8CCA0165A58BAF8CEA629CBA860511EA2E86B4CD9E721E8D7DC608504114EA98D016C0C0EF67EEF084B8FDD8BA4825A0615F7E09C42D935D9AF0DD847C2435D84B4702ABA573499C9088EB21CFB97E5B5A847476FD25EFE2C2763429048F797FDACD8238937024E5D66B3FB40055C3DF19E213E5941095CD8FA62BCA591007D03CFB879388983D6E7A189782F36F88EE409D490C5FA66B62510AD0D0EE9EFE6DFE23139944046C62EE639C0F82E6D850770A69577DF6034084DB97E4FB2BD206281A79CBBFFFF8A9E4B70252F6F03DE8FFDBFCB0A5267877FED3893CBE5119F0C6930FC0DFD82C63CB1E7DE66DF2141E184646151CA8A927DB49A3EC63B3B862AD60551B0E562F35E109594E4E43B192BFECF066B3C7612BAE0E170F0E1D7D246CCC3A2F94D3FB08BCF9DC7DC44735E258B1F9D0D8152EE79FF9EF095EEC3FCD872D9584361A44B9BDC88BE2AEF1158D1765EB4DEAF441F2407039E98DB8D148DC8B7EE9C44D5833FFE4C52A077F57D9E36CB220251C58F61759D18E4E449E72F29351F6CB08F9D996005A33EA695C21FE883E1C3BC3DC3E8239F2BE16FE445A18AF83639156521188EDF3F15ADB300A17F88C829EB72275F6F35D2D1A72B79A01A50F1A63741A8B1ACCC35E49D331DF670D30DE8855FF27C9F6D7BBD16CDE4C4C4DD48CAA971758D714E89DDEEC7CCEBF2E89F8CF03D7E631B9A18ACCF19FF35AA24AB6A1E10DF105FFE2603C30E16B7194AD615038FE96F4767DB8882D48C97514CEC057EE636C9FEA31BDAADC5CAF6239A805BB05081962A2A5054D9DDB47AD9D3C98D053A5199A687668425139998BCB466364F656B1AD9F13FCF7FDC50652841EE475D86AB89D0CFC01C6B5B876AF9D0312A43DCBBC71B2714B0C3226967A3D1E0AD7E9368EDDEA9120B2C8641EEA203F2E943F43708EE6CDBC6748A33E3DBEDA2AC492A6DEBB9751E7AE4AA33F6ED893AF7054454467E29D7EB7F2163FD24F7B5607C2E77DDFAF72E983AB532C6585AE8D78757DA904D1FDBC10768E3E70D582F17708B51D561C24EE0D5A26559EADF5463097155540F26EBCE03D89F49D7033AA00E1DA5ACBDF148DDABEAB739EDDF99A6B2BBEB48F83E3516380FC7AA9FFACA8DDB53388485061EF5B94E92443C24DDCA823E44A29116F346A22BB3DCE7022C3E2EF35ECAA91CE5F65D7C5EEC85D741ECEBAEACCB39F881391EE2A06BFD7B72173B171B7D11C8792F0A7D9A125011294296B157591A675649716F92234BF074F78EAEFDAE1AD79E4208C6338F42F2A9B105EC5C717301C638C63555AF0A81F63D0CDD04F9C22E2FF223CA5AE1A01C7FC61E9DA4412E80D493A7C0DD49CAC10C62A7D3ABC1B9C74EAA2D8AF248946EF8A37F1F7017E49D11B89EBEC111D85D7C1512EF4F99BFFEE68FB588DF3F39735169D1B5A647D71F52F76C6BC09F5703320DC92BBBE6D7CA592566483636957D235F5D18150B6A4641CED6276319244CD8EBBF74BC5DD3AF82E6C1118D19ED291ECF84E4EC2FEFF28286898E9659B01A37F4612460B34DA8444A4805FDEDCCCA5D6D8013335B4139101F28090517FACAEBBEFE59E44A969FE3B8402D690012AB908EA590249BD9354D456EF65331608478B2050F985C5903FDA5AF0D918E7F7E167C3A669B727DF0CE96B63D4D944493C5D2BCE97F2827CAF54103A18CA8CC0483BC8B98C42657349B8438C0274E4401463CB55E93023BA114FF8CF3A718740756DD8C92958BD07A304FECBACA3CCA8135AAB901AF23E1104E202395A08784873E03FCF2D07AAB003E6581741389C238942D7A2B9FB30B53CF5D0C408C0EDFB1C4FF448D745FAFB0D659B4BB76B16D5B61B0A38039488682907151802A815AF220F82680E523E838ADB47425369CC421DD36C2E60100A9EA7F29B05D985D644A7FEA573BD24B922396A481E33306AC41CEE9DD8ECCD9DD7833F8CC77477EDC2E97A72CE2DD930BBBC58FBFDE78DDE34CA1F8DC758CFCF2ABCD35CEDE0657B35583F9C016524D3AAA5E698BBF85AAAD01D7D3CFFAD4602858BD7E2F173D6A24504E448926DEBA1F70F3B0D5B454B02AFC4D0C482BA8019A0C209ED071BD2D5B341EE06FAFA7FB0D1FFE77FC6F6C49F78EEFEC44999E4330BDF33021EBD91DE8EF2042FE4C3F19E992A5E66FD9BF8E3D428AAA8FA51C7C761C2CAEC8908DB3066D50BBFDA98B82387E92611514605D6CBCC0AF9FE08B39AA1DEC89CE77987BF3BBFBCF362B4AFDF12A8A1ADEC69962A6FB26610C816F023D87E648A77DACC3997127AF770658921DCD300EE2C8C0916593067B3B31ED1B6B73D68EBE68CB22386DE39E57FFF6AD766193F99CDA751316A5B0729FE5307C107FAF6DB4CEF4B1C6CDE957DCD6361606A6606BAEFD9A1AE08A5DB21991F022C4BF758D16FD53D6CD41F637F5569D7357CA048F07F53C850CC56A07A4C2F3BD04DEAE79498EE10B366861EA82A7E04B9202750D4FF4017239BF1BF7088A3F2E2C79DED5A12F75CDD754840868754428BD7392E4F01F36E3B450A9BE5BB95FBA71C960C7D09DBF24E6662C86D8B5C3E37D76B16845B0F88C40AE7360545B3304DA5CBD2B58C29F6EDBD794E9AC779227B0FD198EBE3A172FF4B8896F0C9BFB7A4FD9FE6ADC73E097046FA25CDFEC45CA1E7FFC4FD582DDD8C79A9F3959A4DD7E3473D6F242B0A6AD4DEF109C12DEC994F2E313EA1930ED25CB401B82212E86150BB53BA88138AE3269157FC2A7A919E21CC068E0B9E934701B572AF0E20FC2CDB2B7452CC1E5545AC4CDD34EA0097CF531FD92E3FC38CC50E1FC8ED59272FF3D631FCC239E4AE0AFA46419863A166DAA2CBC63E24C26ED7EDAE476A194F8BFDD540D640DB3A8B294E0DF0AEAB7A735589E23CE524F534AC82D80CC51DFC08EAE4FD02E6F6E0BCDFA0FB23697EE1AFFA735566223A70EAD827DD31881A3C2471677F905B64E6AAE00467561FDD6C79B45016F1326D705A854877DD91D0B147071B00C5F8A600116487D39284F6334FF56F124951333F723D68465B765B32B396FC4C432D51E8C6A9782461EFADC2CB93EE38D4945833435E2E27E17CA98998F9B33057B1C73E2E43B6A184868DA05559B3050FF42C76D7440E1A5B803C8D4B0CBAFF9FF31C7E98FE2D011B3F87416889A81DF9F48643E943336430602C5B44C1D11BC7F62A0D67BCF9964815CA0AB83E7A87DB714F2C1872E5B9F0843B82846516E54A3F7FE311839F4910AEC6CF0D23F86BF2B0B05BB71B5B47E93B80F7060A350EE4D73EA09A6D489BDD064763CACEF5818B319CC973FBBC78E01A505A2F6C4F6812819E02A573AD8F7A345763943B623995B0634562479072D9E42437FCB2D02479DBAF2D088B31EE870F11047E965D04524D0CFF90B943B1BE969DE752249E8B48C609F14FC48692BFF40EA6095F1967DB766C8B4E18FA73DCFEF18F2DE1D295B51A63880E288ACED85B188B3D10A0B025BBD934BA43A5AC5E1829DA836EFDC88F4BC6BA0F4F23A4AB16DEF3B5488BF6C974EE1BBA51D17BD472C731DD35D5B74EDDD3C9177A3503D783968BCF8A1F2549F70069164C965304DE2434530B3841A2AE7DD47DC5FDD9DE046840B4D65A08A71A3D15778865CCA2418F154403183FD44B622982C64F771C87E18C09489493E378476B3B1C8D14C8009ABD3D1A51CF806189496A4D70FE857822049D3DCD4CFECC2F95D2A8A16D94DC6703B4C4EF3E8C7EB9D6859350131E1A03EC8A21E13F045F822C48EE3E3A481EECCA508F189954AC267E6CD19C80F8688410E2E97C71A6C792DD6E33EAB2FD16B82214588B923AF6C6069387F6A72CE06033913B50F0310112DC2143802AA2CA066388C96158AC154C33E9BD72C993B410FE5E9D7CF37A30EB85A127A7773ABFB416419A5B4DDECEC10E2EDB312C86C3F3C8BACADA66D057FDD40740176D137B1F1ADA098D978CDBB938F45D4B7814F2C5B894CAE249CA8E1FDF31E81997F7C55B7A43461F5C7C9893AD0494F4F0272FBC20D80F327EE55250F9560A301078BDCDE94D72A7D113ADC7C739D7AC2B8775D961F89245C5AEA8ECEB1732FA345FCD84A0C07C65F091B4B32DC4E117D24D782C404E8FDDFD6E9E65B3633985D6DB8CA841B9F9A3B3C617F1D69FB454045C5024AD09C5C1080F3EAA64202C08838B42E218F56422722536160F97ED3C08F285EF7BCD1119BDA59DB5EC6BC8E9DC1789B3CBCD469A4BCBE1CE237366A5B51B062D0A08201D4F0EAF6F8FBFFE53F35999763DA2470F2F9FE79BDA60285D052D65DABFBC43659DC76602DC662A3357BC3E4BD07BC32AE5B5E94D7DBDE4B5117BD5A9E3461021A569E200CD3CC518ED6559BF2539D8DAD74920DFEDE8DF8FD8333FA17F0798A17B5385A9569A640685D7365D3DBCE8411D44B17BF79B852B1348AB31335AE013B2877C1D8AF62F88C5186B7313F2C8736472FC5F2B4B38F761009F7623292EF14A4A4006305CC419A3ECC73082F63BB2CECE6A624C2A6DF29DBC6A4F0FD3658C58EE694FA58741DED54889994DC6A3DB4FAF5998B577EFA399E58D822B99623D76050736C17B5218671FDA3BCDF7E81B3E85D87200DB9150253ACB07AFA8FEAF74578125E1E26128116A7446C804DE54FD2D2B1A48E684F73AE91932A37372DB66A230AC4CD54869A0115895D2CC494E6D6E8B12845551B4F3DE0B3A4C114979F0471311434BB3784FAF7F9A9B88D536235543ECED732289B383E8005D98192FBBF41EA8026CA3A14B6895A6EF0548EBEE58C25530F56E0EFF157DF6ED0ED0D5565E9FD474B38EF5BA74D24B82219F317AD51F3E7D6F8E4BD8836B91525E162DB417C87E36B3C0FD874FB4BF4136926AA6D045033C94FD1EDCD69835A116357F341372148C4601CFD84BC36A8E5B2260B90CA797CD5A41362C44B4488399394AAA431A63A74B774E68025D7DCB1963911F2BDEEA60DFB24E87196FF38479D235C98E83F1FC419C87F708677F98C84F9C4848B255DEF2D92E3506A533D36E56DF81F6461AB5BBE9D171ADDD39FDE7552C5D4351DB59543C0FA939ADD6130E25D4326566FDF49CDFAA240BBA0B027257D2ECB83209329944E8F44AB785560DED2BA8EFBC55CA31E48F4C94749E4D205A50BEF3E3F039DEB3EECB213FE92C1C3E98A9F72B6CC316D6C0B87BE7F688000A2433E3A184A68722D44C7F6C90F2AD0B248AFC9E57448E3450888A875CB3006E27C232963740B985484E7FEB07775F4B4FD89AF6F627CC56CA1AF23E3BDF61443786D3F04DECD3CF71E2C6139B584F52B6B656CE0737F50BB270830B102B781E621B3356CA16019696A23EEB238ED74D160269A3EDD35F7ADD9E065F836A61A0CDF99272956555106A349166B2C299B8D0066581DC3608048DD8BC2F267BDB2808E1ADCD37A7538B9435E9E5D7ED4389BD2CCB6E926A927BC6DA19E8E0E946442A6943F65C56E5AB7507FC6EA1DEDEA7C1AD087CC005914CE80A241D42C88380A49BC4B6850536C5A99B6423B77A75FAF76CB17479EADFEF1FC90B832C8F36D92BA3E927C9D60473117267AFE4B115E39D50AC7991BF248DB38E8C99784848013B48D4CD6E034B93E643239E78936DAC6283DB748062220071473B0579FAC64510D033525D786778C53CEBC3BF95C4FE9406943E9D68E17EAB3245C57C00D0C206E3343D8201A2F6C278DD61D0CD42B71CB7064ACCDD38551DC554007F29E1929EBC81025CD1A5AA41510BC5CDFF340F42C4FF6DA37F8E97F5911F37ABF457DE3EAB6114DC858C0C14B9BA5B652DF63D0CFFF4D6F8103E0FD15D87D8EDCA53FBBC70E3B42C410F379BF77DD17F6FF57D7A0D01FFE0044F226F8D65DBCD1803928B29CB6AAB703A0EFFE4EB47329D9D373954F0F15CEF2577EB8F34665FFF2C774EB07F0CA72ED27AFE6EDF158C3AA193F3B5CAF99F52430A3662997DEB386DCF0A6781E42180ECF44E9043AFE95BDA84FD1F9EBDCE26EEC0A4A08D8423111B320EB87156BFAEB3827389108E12E7AAB3F6CC8EF67A7C877BCE3192E503608D6F1E5697941FC1418C16093A55A2ACF2378590F4B0702998A65C8127F13AC98BADEEB32B152F3054EB7D0F200322E40CE632CDAE8F0E6C22497BB6D464ACBE9B461C5D39AF9334F5342FF31C9273146D20F5D4BFC61F980B1862BE4A147474DE89A1A3278004F2CAE293CE2709748507C5DB48D98B484CE933DD3E925E1788F2470C91177ADA3869DF6FF81308DBE846F50C51AD66CBEB2AC91DF1C86EC22ADAA6C702F1CB7A141778BF957663060725A5AD6478E22FC959FE5C918EF1A11964E66B1910018DF4698543CD3015E9876AACE37988370135BFD7047FBFD3996B45EFAB6FFA70A4191F259B8A27EFA05E7E1C75285CF70910465589B41A9D29F51F7BBCE06457A3DFC540608157479B499B2F0CD9D8A8D6F2C01FC79E5079597FB6E2D1C3394B8D8AF65DD133F9D9300DF3DA3D740CD0E7E13EF62BE1D29A3DA6745A5A87558F23D89319BAB09A15F8FC01AA388E1FDDCA117A27426D142094A11E6B49E2C541A82C685D41D6E2520881534012774B4C01CE3D2FD8FDAB8C25E4F0AD1292974C4C141173CA219C07314314FDF94A05955E210DE13F0165C990227EEDDE23A52D7F4C8A181C996D0FAF6C313EB74BBEA4C2CEC0B7B01698C63C2E1D37313B637271DC49A7EED8542EE8BDF7C7D791F7BD59A029419616F9C8F478F060B855CDA73418D0AF090844FC0066DEA9DF8D4F3C9ED58CFED2A78B427B42B033C46485B767D75526DE8682D6AF0BE91169650BA4ACC4D54E0D357E993FAF358BEEE3F7F988381EDB31FBF174239A345130BAE1B0DEAF27BC5E1DFF86B29712CFFAB670D35D19DC5B25DA43D481336C0CCC2120427F30326FC74503548344B585C082A78F96F072510D50E1110EEF01617282CB681CD352A23607C3CF7AD9AC06FB52B38294DE8F87894D25C1D278678B048E3E3F4BA0D884154C5E16780BAE2322C389667A15EFB0B21718F56767EE942E4BCB190CDECA74C92DA8848F41AEA2328D29B10C95C6DFA74B0E162591B1BDC0ED6826ADD0B04C7495FC30E586FBC03D4E871915AF71866278F9CD1B4F1AC56E8E1B7B11DBF0C9A64F608E1C3958910829654057103BEC687A02AE9A568BE514187A3E27F3F9928EEE29519BDA0065179423A7242EDDD8CC337F0B7E7FB7CF90FC682C9E60253BD0997F34F9081FD785712E52262CD17C3508AE4D2FDA3BFE232269ABB185E635E659D405AB12E17A80AEE5BA7DDAF1FAA819A284A60B85B49F1A57DA72A0866B2B9C2D28178995E79D4458B58EDB187B0CDC5C37F111D20371FB8F410A7EBED95474859645FED6F451A396781EF7A02E6B52593189EADFB1226316FE8DF79B23CC67BD2EF973CD561DD612D0C3047698EA0D3895A28B4111938F0A0354E4DA7484697C85908A3BA3E80BCCCAFC73303C767BD3587C1F9D48FD4DB93517A561DAA10F53F330ED14CD65B4A54FC43E5F5CB421B8B6CF7B83D86CBD72A55791588D4B81094BDFE45E3F32A2C3FFE809F66FF310D66032AD6BAA5B33E79F1C476029A49D49CAAE427D8A81EB642B15EF0C544C9EECB7CAFD2A854BA79E4D7EE01A96CDE9EEF45E430EEFD8A16D5D22B751F981667F36DE2E139391980DAD22462BFF4896D277D89DCACBD5CAE5EE90BC2D5954C083AADF632D9051B782190ED4AABE8FFE195000A6BA05115EAA0BCE755B23B10C81DCF4BBED61E6D31E9292DC1A7FD6B453EBEFDE55D6AD8866CCD50473705A24F519548172D3D9F92E668D679D782B7F1041E5A558A625D65E679FC75B15499BFA304435FEE6F6498138848BAD0BFFF6942029BD0C5465395F5368692D6B21B2E22A638D6EBFAF3A0EF1F9BDEF8529C6D0BD328CC82BC66DCDB2F5AE20F53B8AF66400D6C2C0A3C6BCE1E8D2B222FC54F1896E58F61816E301365E12866C1BE7C4BBE0DBDA2B504F0628A4DF1EC7942BC58C0A4CED0046D73FEAF2231FB9FF61C0F7AA564EC1E10BD65B693CFF56DDF3596DDC85CDECDF7F123F9DCB27269A7F65A435ECCAFD89A211C829BC7F5916DDA61959AA296505F6D46543D863F2D3F007D8960634841CB317F5EAC3D3A3E4561801CDFB269257FBAA6A60E7A0A1980C9BFD6053BF2EEF7414704C7160A051355CF48A0C0F6FFD683C453513F8212364775B7424D9315A920DCD5B140A8440EF7E5908D4061F580022399509C0ED416F945705A19FDF8E65C8802B67701FA1D15F06013990C7BB8D0D0404679713222924DB33BC659FE58F82A99BB1AC551426A13C2CF316664AC8037B41755F110F6441C7BC9446430D7BF917AFDB8FBEF84E895388A68763E0E16F89FF630BDE9732852B70A4A3AD8A29D2A4670757AA4202DE5D53E653848FB26C6031D07CD010501F0785D1B1D69BED49DC3B07265D51A15A7C432C3EA63A0B0D228B4F8AD4060DBB8D54B94BAC7F2179829C8D9F9CE4F7BFCCB472EDCBED73B0D18E3108156FE659CAA40B45016E0EFF20F81C29EADC8B638364FACA6FC85F98A9BAA9BB7E5261AEC6786C18487B14B77ED2B62B762D6B8B39AF5A870EACD236CC53C016158DD1E71382475657C512EDEC0977320F1BEC79D0CF39403975210DCEC3ED5B58F"""),
-                    TestUtils.hexDecode("""
-e870f21e348b630a1326a0334c872302d0a6da460dc9a0bedb6daebc027b22b9b332c967a2f5991252bccc646e484b83d4fbbaf2887629032de5b3e1b86002cb089bbc58e35737f8c07a694b5cfd38ee3976fd25244e6acb2ccaed20d926af4c9c7526475cb89a72a26ee9b2a25c29128d53446f797344d3eff20d91eba8ba9d02f939d38a775911604124896569964fe5f835df7cbf044f2565a32e017caa93a8848f7c4fff257b885374a6af0df150b79488551200332d176955f304d86340a6df8f98cf93dc12909e1693ce62de02192e63b8af668a0fbb2c345bcfb9b5151131b7b4c7d7eeea48666a8219d5f8b0cc430443ea3d531dbaa6360e51a842fbe1e40ec5fc9ecf9bf172570bf8b31399ba8f12f3b83c40205953414caf7324182657e0fbcc2fffff801c52259294f0b23eeb5ef14c34d955b92ae782739a9f9dae5eb03af4bf4e911c7e758cba1a0f1d0ac1c7256e5d5fae242312f18f6747c5b56d907a49151080485999605246550a6ce8e6341bbd1ec122b179b3102a2673c163ed7174089c10b29cf33b9b5fd1ba22dc73a164404804faed60958c6faa6a09b03dd2eed0fa8782212f1da486543ffc688e37bd43621ab857aba0b13c1e0969a482ce92e00d62ebec1870188734135b0419cb3b9f3a9fcdd68b5b4a53169ae0bc4959462b8eed39264c0b0b34e0595c7a719672abedad01638f3ebfe9e4a460cec890339595a9699db82819723ba08c7bc82080f8989d3d8709386ed1c9fc791ae0cf954e3a897a93d8e235eeb69ae131a912736fecdbe1ba34eb03206110fdb1f81e71dceea673fbb98886ee0d94cb4d76e1e94278b8f2501fea2718466802d3d4a068a2ec53029018df3eb088246b767043f843f79b5ae5537924a9b5e5bd46b19bd7dcf7f14d4c9f4dd05b2c941377434cb37d80a899ee97a5d68345cdec8a43cfef1f286c0102c2d8c9b0d07adef966992dc7ce8b9606917e238625707393552ba9c01c4e72f6e3b533a734c0d60e3a2aba08a823a12a45263b61402d8e62da3e5f5a5c12e0cdee0d255551b8af7d500b547699f72b31a91519891850e4109f4ef380757013fd57a0fa0ec0721dbe825d4cce624cdd8b7f7cf64fb31332f374f6c470b9b8a5171f25d005da4e184665430e7ae553caf2ef9eba994f34b04ed6886c1b768f03868522959fdb164e8ee825f08c4a4dce01de6686695b5dfe6102c7463ab54b084c7fb1366a0b292898c0d7499a3a6ae1995bd2139f7d7c84a0f96b497bb2306028389b983f2e02a2fcfd3c5f8a0b4d2e334d4f3a460829efca41806ba82f2e5ef585531a3f1ff67617ec112f613acafb8420a1cf6230468601cd8b0807d975065fd36aefe77111a5a72ee622da403a51194f8467a122e408a0c3998a3a7f18c2f7774915289a1522f5670527e63e6bde7ee0a84750099d949ff87c6dde67de9cb220518ccda5135d3bf58a42b7d96d14dba0ab87e79547888f6e87b4bb9ed754133d16444eca15045ba54026767e93114e8a3a75a1ff65d0f03c667a8222248119fc8994a84fdf73817bc2d61d6b764d86c69d68b7ca3ae85031181204c39085af1c7efd687fb91d00255dcc934d47228c714cbdc66d4b418112ff0ddc030dab0f4edbcb0309419120ac944e15ddedea5cd3a1d62abdfd8729edcf40d43231e378b2c69670c59c30b4218e7b7f2dcc0ded133b585ad673bed77194b98965fd4a04d93db53ce26128e481de6053a14f40b34f60a169e26e99b4b29979c03e4880fe84474f11627620d196369592c0cdd88c3639c1346d3ee265e550d470b8440c5676387769382ad4b57fac799926cba49f042833301834033d668a4f0e95e2bfdbf295ee9732e30a75b1a76d7a4f0c12029514252d98bcc4330fc2a3172bfe72c8f8202a308de53c4587a17c5e149c92ffb88b79d8b07962cdf91f0310d457c7eff09485a01481313b2aebd081c49b47558c252202b4639dce456a4e786db6a91a24a032d47d1cf9d37969d07e2acfce0067a20994310948821510051ea1ff97f0a5e88f0d36825f7a9b71d5c64d42dead04fed5f6b63dd80bc0325bef6d413644c1b5ac212bf9da2edafef2e6b6d99354470e25c5050703e524dfe08af14dd431e609be5809012ff5d0d4dc260f10fff302168b9d73c86ebc71c21d76ed34f08b12a6dc7ea174ba1c2790ad34a7b5d2e55607ab26eea6289fef0886187f43d5b98b7687b227b58692d61e6a8b9bd04a9c3a5df88e03b20c66d618a6d5a979cc0e33ca400f55918a0d2669c19817e9bc0126a406fe4816a24d06e072717435576868303e961abdef730d973768373b4f413b006c137d63fd1a7937c0ddce317078b610a5fcc1a49d83778260c088cff2cd6e35f58263d43edcb81692121d737960b77b17275765218d0b686907ddbcf0f681bd2662451dfe012db5598c061fc03920011a245c3d8fd3a8b0ee6291959a01e811957dfca6351df838ad3cffc5f28926042c1919a446cdd525d0a1b56591ee9574c16f88557d54b97cd4e077289ee304537176c4cf21e63e33203c076b00642665431183c8b6ea4c58b2d11011d1a1fcb3325a1f7cb148e0a0c70484ebfc6a460de38392761da4f101a2274b21dfd8a5b6870cefe3f1ac9fab09c49acd26de288d43326cfa68248fde5a5d0c2adf5ee4f7a87a570374aa40c904bd3052836b275feca785d29a5cf3af7df0ea226d5fa5aa33df234354a84ecfbc2e2a3d2b3cd2630b765dc0d6a7ea00884d7e805cd5b4d7219b7f5452e27b761d2734bc68d6da9b45de8b69007e6a961a73aa42eeeea30700474cbcbafb4304fac39b6dbbdd2f2a9eb5b959ef1a6efd9a41661265c70db1828f66147fdd9a7865dc9f0a605081ef41202c731184d754e499c95c19af4aaa7a018c8f1bcb1bb3ec4357bb7ccdd227f37179eadd63b10c2c10fff271a3765e9470e06fbfd3e5195ef39a52b20041507f3cc360c37608e976bc29797183feb75e61d4653e90c4a82c744b952efa874c92a675191ba7cac12479bbbe83b5a4b2e919b8e318869a9da789be9a8ae806081bee3c6376f54e5f687a2900a9e610094b6d21e4037066f9c85d65fbcfefaea7f2936aa95adf632bb83b1d5630ae48a2b8c3ffa79e44296a60125d14a5ad30e70f97e072da5b00e115313c0f3e572da51faa8741e98bc2741c8c44ab6d4d60fe0a145eec8bb91c742a0a8eb133a688d322a836a2cc4663ebf2eecfb80fdf1f95e83115d10364baa9357e1e133338b01d6ac2fc08910f7ca44ef8cfce5f5d675346417a40010b2c384a58626378819293aeb6c8cdd0141c3c404a738badafb8bec8d5e3f026405b5e6b7e99acd1d5d8e7e9fc01092d3031536062646a6d747879829295a7b8c0dce2eef5fb00000000000000000011202e47""")
-            )
-    };
-
-    static SigVerTestCase[] SigVerTestCases44 = new SigVerTestCase[] {
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-8109bb66b04ddeddb48e77501a8b1e2431fefb69da28a572fc535be604e351cd18beb9691c57c1187703ca63921cf5df53c1a1d8472c844298cc59b0906ebf085a85a174ec9cb709aa81328db8a3b3d95ae191e334b021c966398fe2d975db14dade081aa77ad15d4aca49e87a2c376a64258219c1d72c50ca2354d78c5444ba570125773e9088d0275de193b402909c9f1e9754adade9e8103bf8d41bd81d2eb5587e4039b64bbd41525a2c2312eb17e0c47071af5bb3eab2627e92ea39cf6babf0a5f4d55208649742c847cac30a2af906c688ee987d2b9f103fafc9e86f59584e616b15ab231b64402c2c98f3fcc95cddc447741f2dc3ab4302b863f32b4b5071158bd66258343f1d045f1ff297cb287e3164593462d56df6b0705ab71e0c75ed1722611ba541254fc381f064f6226178d1354cdaa9b47c13b1bfd54a41d9bab19929e25aca0ea68d8ec2f42e816a9784293919fbb01bbefb93f77e3dcc89cbad5bad43b5358207d36d98a74626c33d84524d0263a188c3da78c9242fe1d7819bae24012800d11fc5068e351272f12ca8b57f4a6365268e1df64e4d5dcd2cb7a04e66de16cbd8092be8af5dc85c9300979525b507600d8590ff68a61290d1f4d29cb3c39a462c16f4fc3365835d2b172d1976ca92b6bf7d28a803151c47fa8ff00243864b60d80872cba15e20b1a0bee3b7ab1fc2aceb4c87c2e69616d1fc8e1bdf5daa83e9b297b3b744d1a1528c9caf12c459f78c0a4d6e62da5cb8c06a504d0d68a05288822874891e1b8bcde599eff5dc2b8e7a5d3d5e8ef1c28ce2e2a8c56f2a3911a82dfb2178172808fb81f4c171f73b10e29d3c8923d2377b64ad9c56d0cac35ffa23fe98120f1760afebd25b26bb4fc977306a829cd7dbc90c7f05a76948bac0428f93463e0c04e8d00326e57608e66fcdfbf91d4dfd9caa1452a2d91cff100538f6935e054d679390b21e8e45260cabf1acc2fbdfa27142b25c4c2e3bdc6df8bc30f26f2558caa5b68c34c87f2054cec383088bb5147791652192b936e1aa27ea851336b2e80b1ad9cd8d6412910b1750fe471f9e7aaef8cd21e1e53fa1283f0a32b3d2d17635ab1f965b8a4c052cb0e90d624b832eb2e18b5fb19c504d4b999850b03a4828913878dc519644d570a7957bd571021ddb29aae7043e18c8acd95e5a0c3ba4da989ae53422abf52e386d476d444ad15204110fa28bf28c6ea2e896b3ff5a2d58ecc0ca5801ec916fb59e135ab3e8e05b83fcb2bfa6af62c0d05719781bbc7305005b2b9a790ef912c0fbcdd9df52806173ac6d5d63aee49e10fd03191e722e68450247a7696ee3b3de8c325762795239084622abb2ac462dd4e57532335a51756d5e8e56095d21925ff3ff0f6ebd1a9bd1ab13a23607de3ceb409422a6bffde90b5d3eb5ed2b06f5d29fe146c7a3401e1741730dc5ae0ded6a98f227ca625e741a1b2e5b0d7c92bd9af5e12e09f792c5a3e45c24dee0dc489d2ff1e1960aab472c820194e3aca1d34fad159e5a021353b29be8624c6ce946687255bde401f4ce8161ae901ece6da3b9c69bf3742b31afc4258c79c8492bf6155439c787e63713b3b277e093a95776004399a075dda189b84b3a3e219f0df2a1218ef6778294920e74f1c59ec86fe1d4129c84d6dc428783364788418a83c098ffd774b13b830b3e9e5882a73e05915692134624d2a79df7b6a88f301aa200ecdbbafca0a9be8d981ca4340fa808b7d8bf862e9243cb94dc2659262cdb5b0a7aeb497d0ca6a2d1977bd375c9d9f977068d0115d4a552ae364f46a558ad29a0eea0f10ebf629e12deaaa40b916a435b3571663d570f9605129bfe9c"""),
-                    TestUtils.hexDecode("""
-430B1F46E87DDE9A3D055A7D4D6AB1277B2DA6EDA642896412126391AA2B29AFD81C246EC839929F5C06749491DC4D81D58CC989D8500B6879E8807B1C3AA0B199EB599AEB86B344B77E3DB1AA034C938D80CB4BDCC29B31B710F57C7E491D99B71E97DD6FDA01A0D8A54C7481C2786F64FFC53AD358CF31C9C875ED278CEA03F2BF732372B19252BB9FA4ABF465FA2CFD1C08684D10582B410A8E012DBD407C5140D97CEE768C6D68124B2C84113B58C9A2AA67093B44CC3B6199FF1EFA6506CC28BD30BEC4CEA88411A491DD948DDB09ADFB92C40CA50E709840BC1F107E0CA428C111EC4505C5346E74AE4AB5647C1EB80F9C07092F8D39A975C4890317F9C0EF474110AB941949029BF39ADFB8E65CCAC0360A3EFCEB69D2BD805E4FC8D0620F8E039BC046DFEF1ADB03F5995FF62AD41352D479084EF3E302578B83332506918CFAD6E3BA701C94B0138DF0CF6C2948049274CE61EE0A64E756306273A02D68F3C405883F2F668820356812B2DA3A32B9FF23608DFA559183151221F83DCA18253FCA099FE24728F302C8B7808D7AF978299F3EB853A8BECDA46B8657598BE9ECE8A02DD4B25C593DDCB436B82335EF9C6A7B8426B701C66C9EBBFB3C8405A73881DAB57D1664F3AEC6F5BA19155D89A0A80B5D01C46BC79E1D4338A50B203397CD4B16ACD597A7C77C49917E9FE4B0D761065CB89C758498868B14BE2B6FF758745AFDC535EAA605C3F97648034D2A320264150278A7F1CB114B977C9D6BC1F29295CCCA16B23B7709D5608E4095E41D08B22AEC6289ED402414787062B0DA2387B6DEE76B32E42C51788B65E815E089BCF92D778F49A9707D37FCFBDF8CEF953A48A4201FA0173529BA360BFA6A77200F57FD5245146C2CD7FE8882670EE6878386D06036F0E1BA4B728CFB75806F05BA6409C514731B0BA8DA11015A63A8B5B5AB8C69703185191D12C5611F1407E8FFE3E50FC39C3310EF4091BC09FECC11D3AC107C696EE89F74CD6147830B4B3A971A0027747B62C528F6D858D1F9E67F59496C6B4E9E03FF0A598B26625B06C79863B5F07E265A40175E1A6D6EF3F900F3C4A28AD3E49D4D0B7E4ECEBB79244264474CCBFADA43FCD33F4FEBEB0F7E5928479F869D6A0FE52EB0CAC1232D7F674A057DEC4C2248934A40F5E2C9CBFDD53F71FC3BE06E48E13398ED426D8D3CC82118B7E8E5BDCA248380F4E64C427D1BF2384F60F6A07F01EE62AA1746CB143F26412547E7EF0E8FD1F2DC606F3643DEAF330D81CD6309465F9ED7F34D9B175FE1641D90212D4FFFB91CC300E7DFA0C555F7B35D2AF6A343D1467436EEC7AB95F2C34010FC99D66391377770A7DB8CD4D5C6BBF931092322741929F790E037318D6ADB74B4768C11F0E4674D18185DFB3D051725F93800CD38F58688AAC747F885908804D6CADAEDECB43131D75B18FBA2D4BED8D9BCC2156FB23F8F6378C622153EA8301300D0FCDEF1E2BB4E6F807784EA0171E95C372EC19B05A6C7B8DECE7080A057D29CE5A445A83410EB83B174590647424736A3B6967BCDF8A416A51202CE3F00E4D97DCC2C48A78D12CDA98E94A9BD6CCBE09DAF8085304F6911ECED3547DE9512461E16721322E4E6233BC7CA360A9004DA5AE064514603EFF0DF4E2D8EB04E9574C59F3AC14726C10100C688203F4960197CE696730AD7E558D7B939E3E6E7EAC4E70A7F6AAA80C1F1546E282B5CC7AA193213769B137C7F450AE5410817166F29F2E4E7E962932DF282A9F08A1DEF3E19C251F95611DDA9CFF4E2FED873439B45F8451B9AE06C6B2C698778BC4C742708BDB54CB35B686F0E7FC856CDBF977AFB663DFE44F7FCCE0E0555BE81EB28984BAFBD6FED3F0182F78A1396AF7B7081280864E5E4BFD7C52DA28BB5DE5FFA211678D13D41BF825F4B21BE1CBD29719ABA341E7B0C3F101CEDFE2F709E4DA4B5A6D0C021152AB546837024F4DCC4C45C132A038315A0F1D69AE768F70606D070169AE0818685C4BDB7341BFE15AA0455F535766FBEBB50875246A6DAE86C7B9F6F3A9FE01AB9928A99C13E6628431D41C1506381A63FAAB57BFB3B180F5D7FF59A434233EBC5A659B71CAE6970CC838D5FB638676216E3B16E8BA6C01349A7482AAF32ABD17DF7FAB8C69789F0194022BC4E62B6A6AAA4CDEF13B1E3BF5E1F4FA69F82B1EE3FDCC16DDE1106E3D2C41F6E661E33984DE7AD6021EAAD3E64D8C9CD7B5CB538AF88DB82FA048E5705EFDAC0EF479827EDCA0255BA60771A5EBC716C690CD3AC840FB6FF462063503D68C199050BFBD64533D94E093A47658822A25D54CBBFC689DFCBEB1DDD5BC6190B8F02C6FF3D001AC63729D35C8C50FAD3DCA2E67C5CCC6A8799420B159C7C5CACAB958B423964C489DAB1982A4E2222D700BA5AB772C4A11A44FF64018AF477D054217EAE28FB8E37595941FEE7AF87FD44960A144DB0CE2A44B33DC79B1EE31CAF80DAD620666D0ACEA76841EEE6CE81C6FF1F6D1027502EF89F1595065CDEC19B30E4B5314EFD64031B3B9DDFC6C95A4943247ADF7E4C93350C241ECA71260A454707B84017C5EB7AFFEB5DBB863A1CBDE0062C662308A2E824CDF6397863EF78F62319E2873B506F8A9EE82135B803025D962E609E006961EA3F7B67347518E70D9273893D79530F67CB678D6A8D28A0342BAF904BFC0A69AD575CDA4AB73AF22B52AE5D58372E0C26795CA96A16B8461AC61E6F68433ABCEFCBC16B857A89C475D1A322D34266539A17D485B8FA356EC3E154D37BAFC4CE75829FBE8BC823FAFF15A49F847C286F999A1F2C12B03E8F8A4C34A97588D91971279FFCB100EDB943E636F78ABFBAF88BCA5C55C935F6147E51BF798267E1350D2F5E3F74B339F6EFE86208C5BDE149C5B71056BEE748D06614AFEAF6DDA2A6EFFBB56B0880AF9B201B3C12055D292E3BB556240DD031C29A67BF244F59112BFB6865EEEC1DFE1CDB1E27F0A9E3372638FE4407099D0E54E9A188079C8BB9470BE6F63C83612D80BD60C21B251B64236E5CAF09A11C12F1A5E94F199DBC7C9E394C0B0E07A583E707E5241B8FB33E39BB26C31929F39316F4FDE206493566E17B51CE635420493176D8FD353206EF87F0994F039DF8F008AF602F50D7F9C0051B56227F3A2ED20B29611219FC4376234EB900093A81389ED00991272B739389F1F978A92A3E41F0A28985D697C01240875AC46A82B2FE94004CBD7B1E7594AE38A9DA0E84FE7E122482BB391538EB8E85AF9DC022CB32CC08FDA7A95165725EC29A0F824F97F0251BE636B57E0791A7F50EE190D45749472B29A674239AF95B373A40A6E0E09C674071186B125EF5AF72CB434AC0AA990341F063EBFE30963451491474B603733959A23A6D5B8A378F15A5A5B9CE4BA44BAEF6AA531AF5097ADE73F64AED0A541784119665F548FAEB447DE108AB74A74893017F0A1AF84AEF0730B555767B0CF6AE502E7693374D2E01C54C64E411AA93C96DC5FA010267B387299D4376FBB190E1C51A560871B559FC800D82ABD119A5732B50270BEDBCC8A636E7499149AE0E47F736FDB71EBF1995D1E8BDCB0EE96E732E8C2509F98717C3D174C78A4A2BE43DD89195408CD300505A219305809A1BFE7294BC2EECE6D98C768A8A1E0F74B665EE3D652AE8E008EBBB11F0D2148E4E5C93D7FE0190D27B3EBB7D2194BFBB624AF3A894CEF7AED571954D006824950A981F4ADA72BEAA0D820C5DD9BD519D39BB7915681F266DA66D49BDAB9E55879B953A7332F877DC5F5CC7BB3C9E1C1F2E41EB55EFC02A450B5142514F1E06D43E48FBF5DC80DF241169D5936432BFE9BE99DCB17293CF968A17F3111C884635EF2BEDFC87DBB80BF25EE9BF57B55CFE635FD99554F5FF2B4482D1948BD282FA282C48C0302348982E30A772BF14195CAC7FE39F836E6238EB1E1FD074E63B9AD0A8D37111087E47FE5D04B62DEB496353457BC76C53A2FC9D5AC9AE6A47F632E6D45E08786DA128464FF2266BFF92B5CD89176A19226F2EB14CDEB331C497F1836FB6C0A117ED6BAF95E9DB8254487B0DFA7301397AA29D95FF2065D851BD302B747AB47BA0AF408B51E4BBBF042ED1B2B604EEF4C266FE243261515778BC9451A8DFB025FA3212E868C3A078C7CFF65077DE94E50ED90A259FAFAEB398A94FF15C838EFA7F49904BEAFCCECD8C9ED4E014EA00C7AEF1D437DA306E8B7DFCE536912C169BAF0A3B78A643D6E210E5550E3B2BAF7EDFE01E721E3D05BAC1378EC1DFDEB2E2AC0F0BC368E0A8CC64F375DFEA2FC20CBDC515440FC2ABBBCEA3584E103BD686C5403EFE376D44F5242D35C9F9D35E1A869FFCB6657823EA0D4331ADD5CCFA99BD6EB3494A48ABBA7B7ABC32ACB8FF00512E1B0AD493F579898847E328C06FE05FE282F8D4AF48A1AAD0495AF1AC7354275A6D45AD5A7B3F6787F893EA558BC5D4ADDE1F0D265ABF73C86550D25C00821C3138B385448E3E02901E2E6EBC6A0F211CB6F22F8F865F0DF3893B987DD086B6674F5464ACE18B9F0EAE948667B2FC04FECEA3E2B7EA6B869D5F66D02D4DB124A59621B96E0DEFBF99A91AFA0CFD6D5A5968E62EF42B4C8908C3719BA0254929A9A183D50C566CE4FC970E047474490FFB07F576765AC5286B2E0FDBF1EC56A8AE8E6F560C69614FDF5C89BA53B8B7189E6388F7CDF7B819F78F3E6EA54C40865262BD2C8CE87284FEC36E2E73BDB8AA9CB5283272A90A6BBBFC3F7FED5F124E8BFD770B6254CDC695FBA0D8627315370E2CCDB89BCC84C96E20805AAF087F9E9BD1A189F4C6D66A6DC3FEF773788B3B57EF876CFEAE1F2C876CD239BE3B8A94F21350EDAE6C269698CC66BAF90B3641593F96399C71B2ECBE50F61B5D6F37D47DF702A9B9E47BED2824DEB19ADE7D7D8830A8F610088CF4BD0AD22A5A4FBA767D01987688BE710235A74129666FF7917B506A18E6B5D6166E8B682BE6B1946A4D4420926FF8CDF2488EABE71EFA7F2536B9DBEFBA08BB9E94086F55B1B991E18E6023E6952D4A563F2420A1536A1EDDE119E5779223CB712AB5C0BA4F0C176830FE523DD8603F1B316E128579E65454C2BE62C922C1DFE09DFB47D4497CC552AA9987A8BFE19C44E207397204686C718A0936145FC102B8A7111F74A421226AE016EDE658DE5DF9D3C28A247A87F2BC6FECF66CE7A6699880E0871CDB6F066D2CB3F9F625DC5E80751DBBC85982982E2EFAE3AB8F4F1EDA0D13C3B65FD2178E8AE4A712B521B7539785BB058176AB4396E6EFF2FD9052D4C6AF17DC30F50630233C3F05C62E151EECE13CE124E58A25F0F3AB65033ACAC9EA6E41CB3FA435D367DFEB0B9C9B37414CF32DC85A3C43087A578165C86D100E47DBA1FE7061111AAA961E67ED057C715974D3144912A58B6DB22D51BEDF6A8646D810190D91B61F0776DA00C8B0BAA7A83F4433F357E758F5AE8F278119908497E717A7AD25B09EA7C76B306A9A3AFCD9AE6B4F64016D5E80BD3FBE2F5EE673A7459B03AD9356148EA83461B66716346DBE85678C37C932EBC53B033A3F46DC28219880CFA8BB5E15F8862D345923BBC179FD763A0F943FC56BAB69F26C0C15D668BAD923D7AE6B35C07621768F9D972E2D6F46551D45E3FBBB577D13F01E8C1AFDBDD2F052E931C0529380F290FA1DE8BF5A11F82612943BAA2C0D086EBEC84069B271AC8656883F686C67B1808E27C860ECD1B95FF6CC6E6A5846DA29992CBA450081B8C37DD4911470EFF281FE94F10636A29B790E41EA6A342A5BE79CAF575FE9B0147F2EFE02874BC8A0E136A395B42E77D9F18CA4F61501E6C1805CDCDC10D0292593481F7E0F93281D0456EB51F6ABB7C379C028890F445D9FAC0D96AF68CDF6CC879A406CF2F0991916B33A72A193CF170B45AA079DB1BFD4B4126FA9AD3ED13FC98CE4C6C3C30923C8C53BCE1812B21BB644ED3A0CC0596C60032FFB1462DF5182528553AE865BF87FB7C7F61D1FD8E40D830B8D8F54924EDF934D1EBB88DA90BC59EEF1F6BF9FC2D17D8E9E0E39FFAD22EB84EFF39BAA70447B124E492D760E55D6301DCDFBCF9173FE293AC4D6CAF2E1964B32973067EC76BBECC65113C1FAB85375D92CE1436E1D1B205A88202B304264620B282E62CAAF5CFE1169EDAD9459B15BF0060C5744A17460F9FB164974CC55B3FFA71AAC13437BE58325E5E27E151C71D195F886F5630925D441A54695DF23F64C6BC3B0CA83F0E88D01BA4DC748A29F42AC2997C2A21EC258E430032C09E73E73AC2B21B55E1DFB2DBA281426620A0545D2507D1E96A3778C780FE77F1DA3B615E1B0D14DE8729229472E6619AB3B67CCAF21CFBFFD1F237E780927F147425B2142BF62CAD6B467A10F7B3DB922F095A0012EC179C4F8D5437AA8024F13A2A485E8890940DB69FB719B94B7D2629D277B593B94ECC744AA4CFF3D33D2250236C74DA057496BEFDB961B89BD6F44D581AD7A28524A6AF2253FD27530B7FF16FB5804FCA7E44BA2A3AB85FEDEED837DC130F533E8215B3AC3F584A2EC0E9B6194F97741EC050576E16349AD852DE8AAE2BF83CB1894107299F101AD5A2C05EC590B2CC698663C44FC0DC7F893F42BC5A2DECFF2FAF46CC1C00FA7294A0184A85CDDA2B1F38A89B1B17EC08555D082411A4CAEDED562C9FBBC1F512118EEC3BC931CC91636461151BDA454C4F029E01231BF170EBE17C526F3D8F705DC46560642B1AF36E3B401325A6CF59B88BCD4B3242D676FF4066E4252ADCA37786CBDB340DD81C5DD0540992F0B142C5A18D3BD1070719AF996E3C3768C3B234D303E6E9850B35C7AE52496C76106D7CAE4CF8ED01767B6DB5603F339FBAA019B08FA35E3DE1129A6A4D578264CF1FC8A1DBF218DD72B4865214DAA795A00505D4AE2B85E90F589065D65FC60CDD828007D4D3A4C084C7EC159C5D86817860CA03545FF74F17AD8570B2ADA55ECA12BFAB5C10067A086A34A57AAD8694C953137BBE901F8D3DEC27DB5DAD2AC96D56C312E25FE48BDC889373ED252B4F88D32DED6702B58D35A1FB40ABE2F2ABDE21CAA5FD0F67E7407A8"""),
-                    TestUtils.hexDecode("""
-d3bed8aae32df74803b6961baa9a2266122e26fd3cfdf1568b460abf5ebd475e1764c7814c6a48cfd6d4df272ea9790c8ebf12fcf5836b0926d593e90828bd49ebdb997e79b79ea68e66f48dad497fbd3a6c3e317162a3f46a4dcc45616be6cefa68210b11fcfc9a906945d30297d1714ad28b1fc7b4c6cec5ece1f5d20729918070cbfb25f285a6fba5e195d2dd75a8c62f581be2d75607b5a8740dd2339682f31230354ea03d0e7cf945f167937592a2d2dcaecc5cb0d36217453809886151073e5d15e6bf7763cce81da19738be3a3bfe96788a56c47d2d166efd18250ad525b4e9e5566c19287ffc277d26a888d0b1073242da5e92b23556552b841ec3355e14173090649a14cfc0134b7714dcbe52095d759d0eaecc7d26f3f12494e4247435d5a6eaa9957aa503f710f8e2844905664905de2f30285e774b46270c58f45d267e850e1a6f711b00e5153040ce090660c97b14432c27d0dd50c0585a8f4c4e1e15d2888a90c184508cb400af2f5d3dc0af3eda99a5e97d0836d079eed38aa6e3e4f724cc63adab509ea5f28bacf3181cb7617a3884407a274824742623eb441ffe1ef15bf6509e7b2305b5341c7a3d73e5dece5b9ead5b99f7e65169ed1673bdb925b52a6b8d524ee37e8538e6917327a8237bfc3ed3f729cef6840e75ef1cef707fa10009e4d5c72561eed18c06e3be94c579f6629373af6a55019c3faeed00abc22deabc59dcd87ecd40e9dc0a5f4b7fe1d711990fc8c03ae9fce980450739c0a441e3512ab7602038dbd1352fe0da554176a58c47c29111eda3d2b9560b3fdcda292c31621e22bce8695748fcde6c81a1270a1944790c174de8a18a505543b459932c6f4228a00984166ddf33e981c2d3ad2e3cd9ce87aadc57e1e437029223e729a99667ad87ca718db5b133a930e73dcfa2d37ad7580373da272e54f62f3d13db9a4bdafb1922145a1624fa96921c0b6bb1b3d7a115ee58dbb2872db79f4d38255c11f160397052aae3ec34921bdad97da72714f37eed4765769e996e45974961e7439352445147dec09b1bd02a776c2c22be612a723b8711f8391e4918a95605fdc866ed64cff6cde9baec4eb42bd880dd0265befe1a33f4d2c0900627f0c7727228aad47d0922caf2a7c86d70960ac2634cea63dbf5d33af04cb149eb618f9ee97adeeb0df8bf599358a82ceeeca582551298a63cbac754b6975cebf7d6e78b6d5ee24dd6c78b51b022f857e230fab176446cc2cbf6986caf8e76734f5280f463641bbda5137fab4800c58f0e1c4dfd45d5813df3f917666bbadb3547c7381eb33b00fd569d58dacdc95a25962024786770aed94d97d4682f9e94d34ecf09e9269993f547901d0120e5e969e3f12a5ac219158750ed0f381dd72a91ffce01f2b612decbef0fa5441925195b813e1273dcd9988457214c9cc503206eb4756e46f900cf2011963e761e12a3774381b877d93aa1c7892f512fc0eeeb225ace5dd7816b919d1717b6e4a34dbd30171a1d036d9ef9d37ab821bc03d881ced0f2aa94eec2fe0b1ca72b7049f749c9e86ba4ff44afdc90931029fa59538014c519f76264a2a45bdab759da02761303ece94fdc2654cc9c818f4af979dad60a9506dd381d150a66e5b0fbdb6e734404f4cc71e6b4e7f5690556d28158cf049f8ce6e4043a82d1ca3c15e480ebeb7e211b2fb00b4bde2733f03f9cc705038050769f9aebb5a1ffc1c9e3d05132ec1ac7b55b6b3b127ffec67cd6e3a1649fc9313e3625c01ebb600c30f622f8bccea15d6f0388439fae057fb1ca54c7aaecff7b1316e74273a2c66037926b246626ea2321c311aac3b5b907e551d7b03f069ae354ddca45d1e5ed3023c576fdfd1c1bce9d8edad78acfde17c9e4d83ba9087d889dee4bfbcd8908a41ebcb4738861abb6b6d8e65251dc4b7c26de398c687b30efd895069410e58d7bc2a105640866321a83dec80ba7b47cd64b002300a9fdb7e7648c2d0f9784ba55f837904df1fd1db46ea82802d4c3e925d4c3e3cde9b9b6063d303d410f3e917f10aa0a18fde5849d14d0a79d71a983f9b09a41e9a3f80dd36e46bdabe65a1d40d7e53b94aa9677561a549aefd98826cc32f6dc5961714d9cfbe913dd3bc68b8891017915066792cded38946c0316fb0eb6d89c10b84df01e0f910a9ce8fa1cbde71edb210918562910cb540d3eab21c8c8e43151a333c516239370ea3dd42294712d6cb920b1f5469e74fa82d4bd7892cec246db13f3f37ef0e980e095faf06e5aa417f5e16de83c8c1ee5ba8340d10785e1b10aa7573dd6f77fd87eab89a014449210e285fb17d0ff7cc3a2c61e6485c2f2e81fec821abf0c694b77f71a91790037d0f141cfb4a74caa4125dfd7236251526a44d4ffaba4589d5237fe647a4082ccd708e27e82bd28597081fecc184a5ecb2d19d115acb18d9d463e3f642e2e606d3f6d496fbbf19149ccac758dcfe8eb53378b65608940925c23754e0f1a390d520f26c4cc088c091e55b3cc475565c0d166265a0396c50d9983e3433bc5527e9fce7fca2bb408b39dbf96bc183c3659f6e8fee0f23e4230c0eef54ae9581b3a38436810accd7c37e83326e3fe7ed1821393a11127027821bef0b96f58a66968271915c1cbcdbcbcd8c62a54bee08b3cf143e859564b798892fbb9c430a6645bb4c8a2be76c37afaa67b7b5a621f987034e88b1608de8a0a09384d85b0c2c872cc2a9f8ac348c5f864d28558f6c6e4523f408586490a78ef95ecffe5b8fdbbc264944869aeaa3ef428d5cc5fcd363d1003239a6651532a442935e674e3cf1aec6f8b32e32db762bf2512efe763c88b9bf4413ea3344835b96fdcdf71c83afd75ae5925c3e76b9afb9fdc72b17f41ec516ab23529e73b9639f5ca42457c5afcc0f2add498456e1db6b3e775ce48753a9a70840c45dfe7cf396b627fad775acd051829f409bd37046bc4cbb57938cb490891c3aa6a04f60769e04685ac1167c9de32fb20cf43f730d8d09b0d74e7f80aeac659509d7941460018c38eda19de38967fee38f7e9526babd21ca1be031dff0591d765ae30361fd8c2a33bc1dded2c43e0e43533a55e72bf1015f5167c8d6bd5e6a19cd4e2ff19f1d47cf42fc361649a669e4524c731bfe7bd11c2e4ff599724de173dd6990f30db8d3b2084d2d3aaa0c0d8b648667b951d510480a28d40c938b71974d749e62d88cbc686eaa31e7f89cb86dda1e778a167610e7bb3cc97cb27f37ef9121ac1baec0a10b40211cc314b02b5df4274acfcd13de277e470b63c0f0fa387dced40050607517a979ccadff817383b404b4d627d8e92b8c1d8e9ecedfc2d344c4e85878b91a4a5aeb2bbc9e3f5010611121a23333a42546d6e8e909aa3b6c4cbe6ec000000000000000000000000000000000a1b2b40""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-f7dca662f79909c3ddab57a31bf75b9d925ee06460453ccc8687ed15f17d9b3d5fc251767fd178116899bcb8d29b81a71bf5fcd021349f4d8b9f99edd4c737300e23b29f425671f66fbf2d51e1a668961ef145edbedfc6d1749a5cff043c58a433d4469a3e1f956bffe2142fc6ba5e86c8e326d65ad16ab4a8d0af6644dd046a6176b92f147a04ff674b572b319b9fff5a9fbcd7ffc68eae3197d9b3799e94e18a7ffa1452f1b41c7fb7b98ac7d30f6f371233d4170fd10e95cba9905eece5e06dc153340436c1dd34ceb8334369e9ba4b3c14e9ec3fd29a701fa8baed707a7d51dec96e43de8f4b3b30fa1de919da643d138e911d5bd800e336402bc74fdb6522125a8cd1b252bfa663cc1fc4462a017ca356a0f96bdcb3d54462ec5994fb32c2648361f6230159c74b4869d98c048562eb5837d711ea29abad6d99f8e95613e0069770ba7fd265c555b010dad0619199a44db46e9b362998bd758b882ef26d90fe04b8b18a8887945362c025edfda0db7a750670397a5c9fa8801399fff8f67f071a8a2d8abcbf548f0393f93c89a28dccfcadbc204d108a05c3ab07249d5d4e7afead91645fa7396368622bd2ad3bf3ecfef493dc235365af7f42abae241b7e0f9f52a66acfea9bfee57631f1a921ab1798834d30af1d58bfba62d4818ee30826e0b8b620b885f55dc08b346e7f868e113fe9bdd60b974812d5991b3b9beefb4802a4c1f759e38736b2f4761cd608128887e88637fb5f4d5bc548e9cc121e3fce98a415c64a28b901d26e4a406979511fbfb0d8c1bc02e0533c2ec33e17fc2cb5f430a029d69950a980bb7ef7c1911e28b355478e348dcf4be4d3b30b1279f0e3f0238277fa32c2ae9fe12f1ac3ce5d94a8c1d641ff55458a1fb9b450b0475476dfc41177bf65ab97b85b1064a6b40005ebe1d537515ab664f3c42c61986a11bd93a806f7336b338e9dd8cf5717157aed7ea3747517fc91e75ee9fde429988df68362b4bc31c7a464b07f7a0dc8e91f8fb34679a3d38224c4ef7b7726ad7a17fa68b9d417be3d66ec95720b288f3578ab366ab1e569f66117db15aa5f4b0019cdf305b3fd2297acaf1404e944f9763179b613b896c5be2ceb56c854cddcb3c8fd71d2a62526c1a1d2170c9303ac4e74ce34bd04a28fb5e53461e5ea9aef756b189aa0b5f311cee714ac8e7aeb65693b8c77cbea41bcc9f3bd3387feae9f000abbe7c3f6966c07b5ef0c926e53206cbb2118b3817df8a4b254d03ad98b6c0d86320a9fb8af7d6f6a1dc827e78ac28fec3408e142fb114929fefd1f5a613413462b5a9dd244d820165c87f0c5ea2dd13a5aeb3bbd19c9563ba2937701647edefb1b518fd4b2f7f31055933715d17263a798de2025225212d41e3788d3f4b7b6653071018e35366d2cd39ce7442c70105cbbbb261dfc73308a443f613afa4aab199474ad2f2647f9d94acdb8c11bcdc2c4f8e93dc16bcf9b40f3fbf0130b2776175a3a0370f6dd7c1c84a55057e95848fd3d040a820db1d32229f38fcb790585bf6d896798eda3d27c1229293c0751d689f67dc6bc4e2f973fb6b62355538947fab1b1f6399b8e13faef7a2ff8a20e03faede7d95416854e5e6f1b5ff4a77b24c74fdac038bc1a12e6890f9c5a34f3ee6ece510f1a536ec613ce47173f09d4863d86158b7042bb0df99322bf55c6d5dc14f7f766b43901e77fe6281d5e5e6d722ea65460444172d91f0f99b3140f4a75585c1fe21ae8edfe3862539bd6ceb398450caca1cbe6ceaf6ae59e961cb0b106541bd7eca3ceb2e367921eb4566dc3d0444b766b0cf2a951171dd73b02f668ca8a4221d933791ac84cc6c73235ec468b"""),
-                    TestUtils.hexDecode("""
-8F69A33C4CB9627BF27401D4A1BC131D28AD0E2E5A317CE983BA2CC7465861A414FB72745E4DA31C0E04576DFE0D0EE834A1EE323D5A0901DD0189EFD6718049E2FFE1AFA548BE16E04B8963325AEB0CA90238C7A243A3F6AA17BC1D63836898688AC8E919B8EB6D689075E050B4189A1FEC723E0AE8D4AAE9FB6790B527A7552CDA174BF40BF91C4142B076ED8CF112A871450AD994737FD5BCF513D42DB01906636D42C6C10B64F74BD37D68A966DE0F3BBE6541AEB9991DDD0C0070F16715C01820546A014E66D786B8922E905DE2BC65053C42703227B7D8431427E3EBB0DD010DC58C2343147700D673D5707160F234E35BA24516CEDEAC77AE15C667AEFA8E029FF14F169FC0A781593E11D42E8659DA8E91E53EE0A1FF15A3C203BBF9591584A99FF8BACDC37541E126B8CDF3503AB2D1BFC0C37F38A298AB1DDA150288A8110C052469382A9A4F5565778339AB327DD80644A26B218ACE0830E56813CAA658A9F17826CD12B815612BE40906ABC89185EDDFA8E05102842CF27BF040FC7B396E7E2E023CB86AB7AE25F36DA6B6C0842126658E0315D6D8F4B5DF38CA663B55998ABFC72FE9B7EB7CE3BEB72AF73A0B2A45577C5215C42E465EECF4A4E69B6DDC1E65E0C1EBCA"""),
-                    TestUtils.hexDecode("""
-f0fddedba6482c562d0ea6791254b7aa34da8b70ca4f0a7cbdfb0e4fa31f902aa37484c4167f74093f5ebd508e4b89966aba03065194cfe3376066b848da8faf1768c397a0e3797bf09e1dd02be5f1e77703ddac9063901b52c9b4be73daa5d44da1a59510b25a974d9c54f8f7889587c6f69a17989ea8b69f4dabced9e23442f337d015ebcf84cf8c5776f4863275532c4bad840d314797e07de00a9c7fdbb60f83392efc382220ecf3f9d60b5594da6fcf00580df29a378a9cc3156bac8ec8bcaa7de1d8d48d2a1f33ea8a8f4956e3c46f386628ca96e009852405b6333710287e376aee2ee7c6f67b1adf07f76fec3688201bd3b152e202c192db41d9bbc0d8411ca019f9a1bf1268b34ce82a7c037fc63d9c63a561003d8247c645173e01c8ef63853e4451185d45cc2d5d2da4261eede504c6da88a55d7cc7bb8df33eca74e9f4b9f9139b9f98964aecc5278448ff9f2a032226e908b32d741037ae689c204bc1f3bc07850debc3fbc839580e6ae1fcfdbd62257ad64c2d6f6945a6757242d1473e64f089c46fe050d79a082e43cfe656f09d01ea219eeb7684188fe80ad59c4bdb57905cba37fe0fdc1b205f1a5a899ab55a37c7d3e003f1051bd3b322b37289df3d350053d6ec8ec1c9cafb49fe147c01f092dcdbd9ffd2b7900205334a077b2ad5c57a53410bc5b9f32930fc6f6a270d84d4436d8c716344df877f5e523ec9e1ecdd43ac21e2c4cb8706415be0ea1060c7127d6a327eca92956771af363c03ec4a0ccdf958bee76803208191946dea6e51a85dd071f3711555cba324e5a7d7459a7662fa6cce043b34845fe77cc651883c478d0d4b2c09e76bf401f0c12721d21357546dc78d2f054b409b6a702328d720023096e911144b7bb724f1d799b0b446954a305bf46944f122867cea17b9798636498a8393bc2dd328b0b3ae78b44ae35cbabe62e0f0d3ea4cd6db0bfce87c6e9fb3364c2ee27b5edbfce17c8df592882dd057dda81855abe0d0898961ace81b0ff22b4471bf96ce814a45f7c6b3e07ef1f18c9eb238b44dc6a50d7489a1af58d2dd1ea2ab2b1a0b4b661e55bbe6dbe9314e76207ec0a02edb2fe7e8fad8141401d1f1a80237cf5a10604ebd26ca46c0ed5d8bfe96c3a1d6ff5b7d2de69402d348e5db561e531deafe29b0767620d7613b817d4d3a6568911c291c3436b40043cdef83a8b7f527aa8e9ca89dc923c2bee6e41312af6ca1530ec7c6aae798e25a6a31ecd29f4ddd56d663e430e5c1ead28a23d424148b1a8aebe9ad7faafa4e295215962d294edb7b1f994ccf43238038ff1af9597d24ecfb68aad4e4d2be280c6fda0cb88b4a1b0deacf678857d83c955115c094980ef8fddfa5045a3e38e733bafa243a91e89a5676312db195f1fe7c0f7b0262628a68c6619db1fd85d84a02b9e7da8234304192aa3db15a294dc4e9e7cb32f8662ff0a49fc4309700e0dea871edeef3df09ec78c3791fa604ad69bbd8c211f136dbbfd49009fb5e4fcbb2c995bbe361c580a3aeb1c88dbb2f148cd05fa9ced0d826e24c268b741953c8ec804add66a9b8dbda05a9296201d0f447b45a4bb7271fbd3359a29815bedd33ae87b52bb270cec2369dbac94528eb48a1a66c129793a4365212f1cbe7e24c87a805ec0f41cc2f36bb2f2423ce6904406b1362c46d51d6d5685dcc06915636e20ea3649d6d1da39c6177630d1d48f393d7093fc12415e5789b15e1ffd07e1f810057ab6545b22b24a93f9af3ae254407f9920af8a48ec40412998dca523ee1e122a5e1107a1121cad25652c1e00f6fa115c58b4a7a60cb4e3b219d9828f2c8efb04a443717e73146a89fe1a4f887b564010eeba3695164704c517d3597ddf34dc51dc460773394d8cb4d562498cd127020973bcb2315c25ad136dafcfc0d674341045ab1de0e4230ec91d579ef1a42ad69892f17dd271e9eab28097f8f9c5e78c50c36c8a02f1625ec41132ff1731e3c59ba20cafacc9ea890db35b8c9606bbd5457262d0c44c4659f933adb64fc74a884e152627cafdb20cc64ca10ed9ee16d814b506415cd0141406b0286124e37f777dc810d70d4125a72bd98a2b73bb26173494568bec76350b2b3b399fde1e3c115f1fbc99929a58a8ccc2b9cc1efcdffd210d88ad48c54a48e837cf841c9f1a350531b695c6fa08ce3148682fceb9fd17f121fc1e3275f65b5a8cd93a25d42318bd21e94ea8873744f2ab530c58dd3bc1109a5c872e61887bddc455b1bcdddb91c0ef4437a49a9f6c73fd371bc6c6d2fa594f78224646f2b8cfee3563c57149aa3a6995dbcf0e6782c53694b39b8812dd069c0cbe713fe44446e44beb4ffe38072deebf3ccb20134168702fc023c4ddf9aedd387a8bd6fcb075850cf1f29f2bc283f5731b75b68169dda2289ac221217bee3e2ed479fc5ea8244a99cb27a015d7a3ebbd1f7acef07b63f17011c5e39ccd0c025d0bce5aed7c482685c39f1fd82a9b08c197f9cc18da457ad0ad55250ea935bee50df659b2c7a501a348b8759643881a9c5555015799adafe10130d6107e0b964b48d23c909e55843b62b9dcd1dd3b235c487968c2c3d87fe29b2fe3ec7a8fc1c1666fc8d2b6adddea39ad704cf5eb6c22f0a5aeb80e2bb04f6c2c6bb9ceadcdf7945140ba942581213dba8428a8c06155f200082f7faf357ffaa653245e2752787fc1598e000eb567cedd49b98d5e4fcbcfd5c4ee10793c16a4767445fcd16ce4201cdd005e95cf5a714a9e0f648673269b5fcd8ca0cc254b6cd2fb428075a12b7ab2bb07a5ddd82e58c04676563b11dfede4daf13e1362a5171364a2f556c36130c1eadb59dd966622f8b86502f379e0dddf69a1f73f58ca6867b4612f28e67c7dfc49dcb56dcb17a79aa0e56a08c14e1e909fd21d05003ea921ab717bae0ce1f15a74a71c4d7e6936d20c7e661806d5f8a5f4cd93ab6720775057d4c0450a6c9e2211af47c57a7127f59983d824d35f48848043aaf3e76209a6cb6f34b15e5099b2c3801bcdca3a5c626bec9b6e92a67189dbcdad0d59d2b30a1f9cf9de45084ed6d35e32722b6642ab870247b42eb8f5fe39e97709141e36b5888fbf496199675274d840f15f5ffe40d74be3bba8b4dc51425f839ef7d041a4232ccb93b754c524ba141c75ba94209f9e76a0d7c8f2aa3e126e6eae35f19de3fbe38f17143d1a83830a2b9b4c8a8b0bbac29363ea9ed0fb1001f67e1501b6f4d6406e2335a61f3386c9e6a2447e3249d3db8390158af9b7e57d81fcc00a4210194ef6f872821a8cc475187780d658903040b0c0e172030576772769facc1d3d6dcec001c30335b5d5f62656b8f96aab7c4d9dceef3f5051b2240435b75797d90a2c9d20b1b1c585d89919ce1e5e6ebf500000000000000000000000000000013273441""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-8a37e080550701795416f5587b977446898ac8147890840db53ae4c7a65508bbab7a2ae6095c3238547f76228d5527b3cf1a6f773c1df211fbc5c754b69e27dee951eeadc89246b2a5fc047cb04416c905d36b9aa8f449c2198aeaf57a7aee84b4cdee17f94e1099fbac56e943298ffb574dae6d616ad7e13788d56b841acd970b4c14d9842452175539e3721ed4b00fcd9585b05915580593421fbb449ab9be941f0d91cff4c6756dab0cc6ea5266d8dd8e79e86a4401a85112d3c871de6e96c86472022c9809b8e1e648adea7e2c3166a7c1529c2ccbef40397051e17e53d0000c6dda30386bcc82254e6126247cbfc19e3c4f2f94db3a05a8fcf608feac3f3eed55fb53724e97ff20e31ba8ed2befd52259e3a3eeb8e7bd80fe56f9e9806e26bca49f0e28be54ce1cd53e75c2c9346cf4d585afe8f9c260ce6eae3649d1ae093becd4220083927ece4f17557a5af9bbb6477d3b0da0dd23f0896a663227700df6df2ce10a0b268d5762696fd9a9ca3ff22eb28b8f999e9f91818e29459c46c3c6a5b6c5eda8b880da621d9fc1792539cfacd58a1b7eb3a54bdaecf96b37d16752659ca51525e6e9dcb06fe54242ae65b9ac8ac5c749c09c12c310371915ecb7ea3cf46d2bd13c66ddfa2b6690e885c469ee34351fe07b749480be85515deb9b70caf055ff56ab85e33a029edf98394d94dea7bb8bf3373de77813233fdcab6377ad20a5dbd3144f2a6243d4f73710c97f9e113d70aa9771b52f19adbd074a790af5d3ce83c74855334161be8d572ce59f1ffb5877f4c56eee62336c7e690295fe8e0e1c964d1938cfaa6ca8f93896716605858ebd9a3c6ee3dcc8a803017f8270df26f7aea45df98f4f3a88f6943e3cad22a79b057d7b3d13554c2dcecb040172eca89ac6d55add4da96165ddb336d439370e71f56dd67612427be4fffaaed5b9f6a4a30884499dac7b82d536833db4480e050089c766120635d9811e0873863d0b1d355592aad472a3f18a1cd217b3d2c203f24e795df30db4350647c1821ca7995883d6db4aad4c141e49af64989e85cdb398968de223f80ebab4b3deeb771aa7270022983ee63ced61fbc4daaf578ae25bcdac546f4e2335f4910f1f5f58562e7ae7b4cfe50ef5e30de69d637da2e50fce483adbaf75a5a7ec6d796432e5ae95461c45ac74c024d4a515b81d18d702b49514e16db48944da5a7b86319c432a84bbd3898007d515620665ba4a5fc83cbe7e060bc9203d1cd971fa73b538d949810e7cde88d082eef96c72c2c0cc6aaa883ba6e4bb92f90f72388a7814cf03c86fd6c60bb92b36a072cd81ecc3bc8952f313e71f981ac53e9a9afd2d996e88fa7d0ddfc9eed0ae45c3665c60ad92e509a183a95aaf2989e9eeb92f09f5b9a462a9a3d5acef6af41ba5c6396d61008d0edc1ebd3e998849fad4026fcd4901448ae94d66950f7939103d2392ec78c7b9ad4fcecd43be503eeaa5763b0d03a55e052051c79f8ad82ec98d24f293b1e339e5093845f37b76d33c74f37f17093124dd18ec1282d0b42a10155da458ed0ec68bc4ad35884abdbbe9592e5e82c78a19f413d6cb41fb1c896246ed4e043d08da02f1f3706427e2d963c6c6f9181f4057a21e2d69597a84b54b197f42caa629b99e20e28a9d2d1905309245dd7e0cd5b5fdac815acdfb64b6128b3ba8d10c83e61618a7e8558715ce1f5430db60fe6e6f0e01791dc734dfaf19d48e813fc1d5fe1f353f4dcaf70b7fac6a170e97c6c541374476c4db1220a4712b1e285d2f91a5fcc4057e6767f1fddf4fcb83e16258b93419d7d25ddb3e36eb7837629253adb7c79aa1fefbe81b2dc59cb93f5390fe"""),
-                    TestUtils.hexDecode("""
-5DE75924D05BBEF6B34CEB195AE3349EB621187051B1EF95A779B99A3E0F729994BD19C7D1172418BBD3E015B20699DD09D8BFB0A343F477AE2A3BF5737AC994619D1FF3C13E7676D1BCB446289DBFE36E2D1508A3D437B4B0DA06478DF6D4701909B272E9070B1FE06385DBF8A552B471C8EB48EAE39D141009FBCC5D57D95697ACEB7B5231AB5976FFEC41E947BEACA7639F664C6C1D058505A49561811ECDA46E23B651F918112F38B407E82219B49E5C4E7C247DC4BA633C746B42DB912B07D56302FC5C08F5E0C3E311268041F970E670F3AD26A207701F1359EEF9D4134ADB882A1C899B0E4FFBA2C68535D97796636417EEDC0790FF808C976B57F0838A694700F8D75DD4FE5ECFB4B6A188FCB77FB1DF7C5F7C91DC81017A5E9A6D1EAF59680D3291F74743E1776A6DE31101FAEA31D876A0DDF3777A91EF1EA0B575C83C97C7A283E7E958287F5A52F30B6E70201A1410355B47210B911A7A4F6FC23BC95D7951822115FE410ED2E7FEFE08940B3F8E63F13F26B6E949C498E62A66FA675850FB9F7AAFAF7D054F5C12306ACF2900A5B66A29931A5919CB31D19304916AE41869CE3294B0F5F88D845A7FCFB57B952BEABCD1DF7FC11E2D342AA5A70A8AA9DBE1E6E66555EA618849A95439864DF6D7789D8E3B46C6FE4F33877F127D4136D993061DAB530EC979F818A57E1052B5B33D22E941643DE2FF9239741F6459A0EE28658C3C0033FA62DFF37928C59189A7A7E36B1E305F3E1F421EDF4D71A96C71406A0F9AFA5C96A9411AA1A35D241D7186E5C8D0CAE15938FF869897DC3B7D8196D64DE202108D6FB436FF89983EA6DBB5BC88EE2A02488E4D12AA87CC4BDF41A339E10300D32E0FD4F3D3136FA64BA90D64E2BC7C20BA77DA4DB5311F616288496F2FE3E7B3409879050FE57A23DB0344CAE82ED329B0D31DC9B7406CA715E3D84E364BA98F73F693B6E62DF4D741928D21D934453BD67FBBD9725BAAD34E5F3204BDBBB569251DFE2D69A9A96BAD90256213BB0747E7950AEBB4CEAC7224FD5F8F99A16866F5A1DCE07C2CD1E06B70A81FCECED0AEEECBA62521AA0A01FD7B5A3A8A14DB55AFF331E469F5138DBB2B96BFD0AAEE7F38EAA375F71759268546D590BA8C0C022F78CABC4E089992409D3D7BD19048D30B15C796170BCD7AAF7FED0387542BF8A6674F197EF994FF81BB80C59208A572495DE4E584B36A7E9149B5E2081A4DC162CF8376029231EFFB4B4981895FC36562F51DD5158DC82ADE52ABB0E98F4BCB3C0A24566D07686732FA734CDD48D03DF99F7253E589CB8725F17E6BF964E96F9827CA5A9DBD04D448025EE014EE1B5DBDA514D3FEE4F20664C11371DCB16991DA883BF9A68EE30D727137D7902F4839635B1C63F6C4F7D42070E880CA774680DAEF105D277EB8D9090A98F6B813774D42DEE922314480EBE562775F68ED180B67EFEB077D8B174C7D4DA877B0DD3698CF506EE382AE6FC6F68EE93ECA3627B28248D3EEAC469EB0C26BD1A10A7779CEA142958F9F9A533BDE974E1B3CD9B74FEEB2EE29ACD7DB65E00D7ED6E94E5E44A925188285166570727FC687AC7EBE4042BAEF68BC23F4B9C51BA5040BC6BBA41FFA9AFB1AFA09DE1BAA4DA091A08086128A9CA5F27D3F4420327C8FF4801BBF2057282D05D1CBDE60E1E6FB6715EC41AA9A852686DCFC47279FCCE5D86ABF02A6B5B57DE22B2097B12381EEC567E4ED1855F9B482C174D6D40A5825687C02E1D0AB634C020497A44E07E8FBB2D05280C53562DB4C90AE0901B88179D06F9F991E33BF17E7A9227A30454430CB768F56842995081520158FC34BF5257EC8EA9338B3714126D6A95A3D77FB61207154F6DD0041BB03D84D8F75E6EE910460F22CA765A2206D6C56C6E498E063B08B76B1DDF98571F492F9DBD3DEAE7D9C8EF21EDBABED962331F06371364DFCB3216E24638A20F77FCDD894FCC5525DD0C8FC329494841EAFD93CFDF0053FCC27F5A1263C7F4599C186B35FCA9C6F5F2FE169B00275F15447AAA3A823E27E322CA2316B25823F3A79FFA785E9CBC953815FE06F376B6F5860C6A87CB9BE98690C9C2A93EFF1BF1050A01C72CD521BEF265D66BC4B8ACE5736215DE59290DA957175D704BBEFB0E81C2CF906C3A579BEAC3A0C945409DEE4A1E683A0DADB3C4AA7E0174710C72A33F1BBC62A6E6F3EB9C138C0CEDA817688BCE8CCE523A2A4E2566775015F3BF66C09E716CA929BCC6DCBA7427EBD93B21CE276820734331B078558C63ADD096004B67E618D9E58FF3FEF00183EAA293A1DA2520BC03FADEB6A74B52292DBBC6EE4E5ECA8F8B0556FED36C2B41F9D8FBDA8EAA1F74BED46F05E7712E20E463502A420B6CE67D125BE999EF906300C627C57C468C8DD608F9AB354791E6FEF0EE63DF3C1821AE78111B27E57DA88FA44D89581D11C2C72F565A3D0B5E8E2D83DF178810075E5F8FD29E1953BD2C6326B693C5CF6ACE086673D69A67A181062A6ED511E0CF36381358C2DB2A394B05E0C1EE9C54B89C68E10857463F71A842BDB8429EB31D250542F88E6BD3BF10BDCA160C0FF44EBE7D0D982F15C4892091B4A69A3AE7051BECD1D2DB132599F1101E2BCF60136CE947F339A3DEF9F6D81E1BA3F5D4CF2ED989861F7CED86B1A6A167291CACA74C45BA7B5969C09EA20C4EB061D4CC4B68392AC866AC591764A16D0A42710645988FE070314D0859A1F022789442381EA0E3E83F5245272CB5FBB861C3729EC484D2F299F37D2F50688D1D8DD91F131D03207CD1459B289B19E3ED609D70D6BF8E0B97A75F4B4F1DB52DCA7AD03100A36C45D2AA221CD01C8A51D5328AE47E3307EDCEE9B27F62E5DA9EEE15B7A2FCFF1678551BB3DEAD4CE54A16C22119BCA343822DCD20271BB1518688CF69B566A123F65C4787C1C525BAFF00CE20C46C536E47DB1E4410E572BFECDD7904583BF61847868D7D1AEB1EA071EE15A9CB9E3EFF8D17A5BB7EE8BA83C95272E065979904AA99CF036BE085ED869D3CCB694C025FBDEE9BE140A0A21689F95D90D8A54DAEA98EE5DDFDFCEE2908E65C210F347D26F35B95B34642939067CCF04A098ED3E2CE3C0FE66305BB5391E223E43119D38A33672FBC980BEAB96558D3A940700B3CCA9D3AD2CEA08E23082DBF30FC08E94B6640CA04BBAE80091ECE96F128B37141131FED2A5549CAFD7BEB5B180509880C49FC6CB1C11E4CB7C7901C89ADFA0E5335C43A74053347D3028B23085647993B5844FB2716B7154D93E25DAD1CCD889EF3B16FAE34D04145237378D66BD09A254D395736990204A5627F5446787B467B619EE8F06CE664BF7B94392B5C77BCE828D6186348EA2DECA1CC84999FCCD95C9EC55E28C8C2FB559C9020C6EEB661F708E40351D7E530BFB7B1C3683BF15FAC5B17D1CE7EC5CC3C27E04889A9E59E6534C08AEF6934747083CCEE84FF2345D519CABC7D2BA6B783D36C864C65C47CA636B28B71D6797717950D652659AFA8BE3CAE4E269BD527C0425168D04C097DE8F34834A7D1728367F148524366F9E53C4CC255D3BD6FEE7B5A6CF459E1685FE740CC203EDBF58082820B967A40822D36BB4A489BF0CEB51387009D5205056387C292D584309076956E56926283657BF7CF096F54E0128A265050DF528AEED9247E19EFCC79EC301A9F38BE7AE5057456631840EE39E191B25F4F7070BB15CE2CC18777F7CBEF100FE7993681D4E965D0C19A68591BAAABE601BBAB89FC27B3C5BA83545AD645F0DB716C98D5C7A37E0AD97C986EDB88B025D25E3DCCCA816C707F0E2542E44F4D69F943E1DBD08E344F88661B68A822C3EFD648AA23AFFA2F533879540BE2F670F4D53091AF68867E7C71EDB6E9E494E9D30A1839653422AA8AE34A525EFAA62D3F5FF00D91F5DDF80FBDDE464A8502AD9AC85EB21025C0E4E2C2877D50962C5AB8283BFC823FB221CC285F3629056D1260AAF87B556E556B4C723D44279A106EE4075BB79773588333B42065811D671016AF177105106203EFC36FDAB2F5E5EC8DE043902583C1782BFD8BB772353EBC5CF03A0D869E5F3797713B58EB7480CF7B92AACFC9C41040BC9E1F5447F9852B2C5B5F33B5517F28A01D5435C47E063B41D3B0F7605B07AC33FF6F05C6FF44EBB70FD6E1AFC2A32C9A0B1AC17044401B93D6439CE53C3B033CFF06688E1933CAEEC48A04999A01956096339B5E44AB3A57FD1F0ACA23A03114708BB16803C2CDA679061B8E9808A2E11DB0957D4F73C8A06E6C50D6DA43E4D008ACA23CE2A3213BA0DAD20D5BA8B44DE5D50E188039C112B8A40B250E7E815B1367375C5698B61BD915A70096815479916F455B9EF837300908C5A8BEFA5157EB688EA02245AD3B309D10C769CA1B8E5CCA2F5FC66CC3920759A203C3F6B8E9ED10CAB20FA143B0BF0BC8529A4E89AB0C99AF77E43E68B61A9E4176066C4708FFAB05F3652817FC42039E2F22DE2058CFA8701AFFA894F3143FDA27AD85C45D3AEB30CA9759537CA4AF2079317CE5F4B5EEFBCAB981E42065AD5CB8A4CC9B628CCFAC18D2E637CB73399CE3D90A9060F88EF438E8511CE6F403A0CF14C6B641830983C1EDDE73BA27E41BD678E834167C718F5B1E2E6C109199F756905FAF9F0005CC1D110CE277DA02675461AE70EB6A412EC455B6575F16A4DEC0565DBC8F387D84F9D3AE67AB35E511657D82B5606A4DB45CEEE81C94FFAFCB88B8185CFB67E4D7171EEB391E9E1DAC625B56FED22D86E8A34924740F94A3D50CBD05B8E2476CBC7C54D2F742F0FD7162E7A138D4AC788E710AA45824513BEA162E2A1C1F709413942BAB5AABF7E347A148D53B8EBA0336D91539766AF0E827BF8EFF36389ECA38232FF2D7E341A3AA710F590C78EB69156462BAE9B8B73386F38EAC4FA26456FA555E26E7DF679983FEF23DAE87DBA66BCEA19A9F991F864A17C23F7CD592ACAEADE0E82F4737B70F0243F94F015B59330B71E25F1304DB3D8D7E2F96669BD7F8313EF9E10EB1EDB0F0BD94745D03C83768A618AD9ADDEDA7C1E6E134F8B7BC96B84652C982B1D9242F8D2CF0ACAD146EA3185E2332904E84088CA2D7D60D3E2DAE411171726B5FB6C95B3DE961E62474CEC73226E55AE7D9C7C534E278927F5D669EE6D111E325D54F338E2A6A06493D6F1B7A556A94CC9512235498409EEA477597EFAB239380491C9CCBA1F00A0D1C5D758162E9F4F5464A1A64A22C32721AE57E246722A6B2E07E544A5FEB06AF86C580DAB2B9DFB5AA0F0251E6840EAD66FCB6B89F80C2AD38383B329F9EF4589BF0E8A0C9996EC19E1DA539CFDEFB2BB0F3D9544392A06F765A74218B7DC34F38D230D1AFCF9130410A4B4FE038F7AC59B6B062EE2D2ACCD288606AD9AFDBE95D9572B78B54D26166C7817E6F72F7E6C55DD1576720E4AB99CC26722107F7C278BAC2D82FBD0A3B0E1793C2D8B498F90A9172D17244A4107D9274958FE078FA8A5A33087BF278383F439C0B41523E0E51A662A9F2822CBBB34EDA97F5398EAA12D52506C2EAAF6D4B75639EF0676F482A69DF0E8A9BDFBF6105E32B6FB3ADA2E29C62A0AA687820B4ED35C2418DB1A67A3A5B92DC61368585CF7F3B1B644A8137A52CA21DD982760CAB7FB111558ED0310E9FBA34E5480F4E707A2CEE74DC24AE5717C06DE2B509E4807824707505FFFC5DBFF798E8D85F758A94C2D3770674DFE03627457B2DF10628A31D44BD89D3435D93E4F9BC14D47E6D4B9BD3BB2287ADBCE1FA58495D9032A9A3ADCD56CCB116787E060EA431C1EA9E60A30B609AA9C66064017EA05BC16392992B7DFF62EF1046FC7E64F8F811CE50AAB40AC122CBD5119D3045ED0812F6E30EF6B6001285427B643E3C6FCB6390A9FE76B342A462994F2B9074B56A848538DE205C98BBBCC75DF6BF23CC1AF0B201E5A0618D4BC5035B9F71BCE9D3493A97FA47607D65865A5FF3FF17A7CE28C0E87A57FE951C8F804EADC21F161CCB5D1E66F1E4DBE92C69D4358E0CCC13A12DBE87C9B530579189EF2359A9DF5A8FDE00CB2B58EBD748B23F884626A66EA39847917995EADC1839BFEDCC24AB6BF22A5C247B6FABE8CF382DB48148915167BB47F505C184EC027C3AC741BB0F6676B0D0E7781E19FB8D4D630E71ED4843010198DB9B122CC301D432856B393632369FA1C99BA252F086E317229486C034F1960087ED4606288A7C89DB0EA0DE94700785322249E901897611913AA74F8BBF412639DDB639CBD1C41374A3EC66A87451D9E4127F7627DFDE4E1701D7FC9DE13DC7754952F659EBA7B1A861B8DFC78D1379274530B976C66F9CC4002563837C852D83B3F3BBFD892F14DBF64C976C924E3C656B69131EC17B7905507F78F073A7E509157215C988D490685F8AF23F64ED338915E72B518E4305C9CD44C219876456E87C0C59C5D7524C86CAA161C745364A12890064CA9061056F37ED1BD56B5B09B1423775BF0FCC898AB1BBC283B23DB6E91A3D749125992FF1BB598260DCFE428D2524050C1F545FFDA18A63B052C0C8CA4DF8C3BDE83EE5474395135FCA2B05157C25548B0804D1EDE"""),
-                    TestUtils.hexDecode("""
-0692e4fa67413edeabd602bff25ccbfad2e3402aa7399d8a9f7d0d6d389532019b7d3e63229d12ade7d487f1cade7f9533fbe2eb22a810c94b814a923ea83d7bccbd975af424bf5535f235117afa08156650728d96283a92d6276e34f864c37f8c11674307d653060d8310c0c7bba86515e051c3b1193087df6b22648ee59d6bc7a8c1b509b71620e3f7b5a0aa445f628e15e0725fb49e757cfbfd3dc5fe92a627bee707e33537fced3489e58fa73b49cffb2df08cd45aabaaaa491e77cf205d5be4f86f5a8d4272a5513ccdedfcc210fba346322ffeef9e11dfece2cfb7b854eba1ab581cc533cc6335b2195a20dadb86fae9efea0ab0c7d17710f8b0d8a157272509803c3b49fde1063e9297920bf245fe6502d8bf0a9a1f064d5a58b30b5a14dda6698ae37127f8d867f9aea40e93da3f4af04b91caacd66031d03c0c7e229ebeec8b818f4c970acd5c4dc8e17a3ce618ca96f4ca29f46f5e4059becc5f16ee43df8ba2ee1706c41621da8530689b42136b8a62dab7c691e566b9d48a28b45af799af56bcba07bc6044b64253e9a80e9b5ee01e8af0ca627a84d1a2a7ca9b0659dd1a60b788e5f6538a8223973476e9466459fc4f20cf2d1dab3ab137c5cfab433c436e7f3a6a681f675358b6721dc2850ec7b43aafbda90d13254e4ace6016175bafc1bc28dbf29541639527f246f6c007f41ed1fe6c0329260ce2ecc19395489b5c39d66543c0609120449037f321db95a85be51f1d01a485939390c47b53d82741edd3a5febac17ae6a8a4ca45df32fa6875b4e907d544e529ad26f29b6f923e21acd7964fe739fc1864d72eabe0859ad5e98142ead24c91167fc072a2c2673c7c5bf6da83fc7d662283347388891ca575f275907d06bab987ee5081c2ec808c81c563c902203f8d525243e20b5963967bbbdfa2e8ca9ec8ed703d8dd66c29c8a550c4676044703bc93f969e35f77194412bfb20441bc5e89b5e3238b766940779217af090e0da162e0f95761f63e05a378d0424af4c899a0a68060d9d0e5a035f6ecadbd550961850ee9345111491140810e2eaeff08d8a817700ab4c148c95086ee0663c4261b3cd53f8ab5b5841ba8cb9be8c5ad146d8549f21750be69951fffcca492624e136ed58a5e81cfb01a2147cfc5ca07a0721a38adcd25fed771411c75a5f7ff37457cab19d866b2da0fc45bc77e122143800546bc49f44909042d96bfdc63ac60f09bf4a75e171ece95bfffdfa73b4e509750ec6579996d0c83d59afc88ce9af26715be98cc8e6d05a14188a0fac6af1e96fdebe8f10b994d50ae6e84be257e6392e78d70441bdc5de30a1a4a5cfc7d5637810651fd471e162df2a76571c6d3df3b227e89cebcfec352d0f1af41a29e993af22514960c64dffc72a9819a6092150bd440487108024f0243db54ea68881d1c99b529ab529ebca98ea690046b1e37f6f1110686f6d9a7a725aa115c5e9be4189eba063d28801ef85973d0e9eb15179cb64378b6a5304cce09c82864bfed361ffe1702a9ff8e51a214b584247b967e5bb7f64b955acf25bd1073179776d9c03790d46f828342b90ffa2a45081184c3be0caf7aaf6c354b698e9256421ea3688c6fc18132d4e8d956baf9b821e64a579b1462ed4e990259867899ebddb19a861b24c20c2b0a6c274a064e1d1db366a293673153752847a2a5acc23b573ce0975655b79fe1a1ccb347773e3b1c5bb3028a1508687d17f9bf86ebbecb3086db5ef2559be02a68f1cabb47eec1671e6d3d35b65371fd5487b413fee14691745d0eb260c9008f07b5ce629c6d748c452c3131225f8c7586d99b2122202860f6e73c7def4401919e02e18471d1fd874b7c728296648b5ab571c517dea55be9f9ba65ff2cb349576a76030789dec17102a375ef8d779f2f2ed17be8fc41b84b1ef69ed18cefe28122127f211ee1abaf2a4044a3b1ee653395141da50db99dd3f73f85b5c0158a74f6f9707c7f62beffd70c068db1d6ef686cad7bb859c98049935e73aa4ea76c3225d4f19b333a4290ed0d723c6192034618fe3214306536741e20b066a6b9190972f4c4722534bf760a07e8d3a45dfbc67dbb8a5874332a4fc0e0a0640ca3999b93d34e4d8731957465e213577bade1f9b371540dbba188674ea205db7b244c77b6a772caf69f8b46b7b05439a852232348ef6d437bf7c6c79a4c0520a8ead1f3c00de2a063eb5a1e162f4db1ee94f1fb94f56f62d951da29f6b3018485c4a5c2c5f8573691aa096d8cd2922b66c8b7fc828d49e92a3d648cfa8ef524199b4bf5a8f15693960c5f59862825ccdda554b17e9c35f7e6a24365508f5a23c6ae211e3db71740fa444f92159c8df59c4b073f362cdb658842466efde20e9ba0472e2f682ecb655961ba8ad7575e8b02320ab6fce9188321816968a15789977084409d89b487253c778ef1ea1a1f47c750e37138735bcd58f6956ab7c8dd1c8a7ad35067c0ba0940b3b091c362d3165007df94167f33e0c660cf02ee5d6ed90c8ab4655ed47655d810751dfb2f1e65c890ed24c976bba0b8a998102d660a05325261b38fdfc82ba300683df5d561f73a11fe6f06425d11ef4c6f32e6de2ee6081a9b772e07614866f54e63ccbf7b1d9a1c3701ccbd1d9087241d8e2987203dc798d9431b8ab1fde5ad788db13c2e996a1d21b1559cffe3f7132e1aa83acf6c517d8e8d719076a36c08b2c6afbe5d23dfb9c5272ffb2af2b8febd51946199b90f98e7d49358057fb881f4e8641e0524c3471c0f6bb4cf59bccc7dcf09ab2c2d8a783710c982a35e4512c30e1c19bbfeffd992884ade3dd2a90039ebef2c23ab98fdfaaf6ebf34ae7fcb7fe742798c50a49d740244e65c49b22144c05047061e592b32ab61733a73b55ae04c9f36273dcb2eeb4872e7b7d009d4a54b867613ca0f69c4e7756a48ba7f9539048d495a578b8a76cac198d77aeb6c3a7dd474390f91faea384c94cfd73486ec226319946fd829c3ced266ab11db84176c7f67502b6d50ddf46994d6bf748f118045457e3ad7192f0b03c2bcb2455d018bd0ab1306b473f3761fee60d941637c562cdcda0dd5d5e86af9e95bc22570c07c25d5bbc6f1ce04be9e7bce5f7f095afec8b7c4cd930f9bc106e85eb8620668b52c9d09897460b1c8d74febabd73ff9b730c291c28f1410b442d91c533383ac3f2f41f0bcfebc9121b00015d8c506b2183b7d183751636da9226b795eacb2a1223004ea8a18a805b272384ea239ab86b41c556591fbabb783a6f909d5a181f3563ff1f9abe58cc921c751f3340497d94b1b2c6ced1e3e4345e73879296bfd9dade021b25436d73a3caced5e2ea070824262b5d6877aabfc0e8ecf6fe0000000000000000000000000000000000000000000000000000000000000d172332""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-a15c38cf5d89e1912b7ecbd269ebc6ac156697942a3b2557f5cb631782ee2ebf3158452ea076bbbf6eafbea078f2da4b969380c279ee4c5133ba8b1e9e3243c30e9085c353bc1210717f47b099d405b0878e0dbc24cd59c6a5181cf07355c10891059c18fd085f9b2aec6df7e6a21ab24094d8357d1b86aa6bd15ae92e9b0929d7bace3d73160d312dd7bb5af9fcdb0cdfd91dda2688d8e507ae12063c22128c69514c8d61a3912397d031549003dc5e2974f6db4238a8c5f1e5ab7d53751e5165f7c3d443a3fab54af972f7f6cb2b154a215ff6b410f45ae17d654fdfb58d0cd19fe75b61aa0f10ee1448d850fc7582b16a4ee6876ef6cc3663921607ce6da3709bcaaa92f15dad54eb8db0ae01f6e093663e0748c33f1ce041bc4566545c0b78dd606991d43fc76a9a1e1fac2c1765bbfd70eef0ef941763f0e32e83258bf2950dbfe8a391aeb927959447a7930dd5a006bc449091ffad53a3c725d5e3b01870cd5bcf9bbcd0bd33de9cad5407ec36b69a7bbb9cb0eadd182b9efa59c1423271217ccc268690ecb7c82c5f8df1df4726bb67ad80b04d3658a6dd1e98201d7c0062bd2bfeab30dcdbaad3b0bad393f1baf3924814ccf5bf6f4c8fdf5976f7b7dfd6242890a7306922c347547d051665c6288444a2bdd918f7346fc7cc8959ee3f8b936011e7e96b2a255af38158cea9df1faf6217d1bb989b09a8de3741d95ee834fdd2ab3962372a2879cfe93b1db989f9503da17e4c4294a6ecaf99a48ce2c79e2ee84c093cfae7bbf2dbbb9373ed2ab1c4e99da39d2b2a25633364c3e08a89b18b82aceed6a77fd805ec3b924f7dc96db19aa0737bf3d5606ba6e95808844a9395995f3a1341f3178159ae83b06b816b73e6e403ce72a93bd60ed2cd3c82863410f1d8e43d9f4c85573085ac80721344bedcafeb14171359a4df9486c844d17e38a4e0006e8c7196198ea8466007ba4e98d6119af88eea0925cebb1f998f988b42961c44f74e337cc693223bfc34142268d33f30e8bdf8480b44bfad1e3f8266d35dc1b5bd6758d0a8d66c7c5a1b93e49f6e0134d49f437257850fd8a6af26fb31b9f7384a7275bdcd69aac0474dae9778f054673bbde6e9dbf441368cef3f8829c45bbfeffbf8d07d7611abe67a5d55c8f2edee611fffacd9b8e1139d39c152a461232c972a8259a8bc7131d1d8b04709dd16e9a2771c95a7e57f7159c723bbf154771d34c7eb85230c57ba06e031da4be80202d7d12ccc74ec2ffcaea3dcda60259b6cf894b9af179f9f627846ceefd4088977911993b49b225fd886185a2739c44b11915896b442ba1ae53777ba23f21cba23f78aaef5a881f92d87827e27990db4de004d17891aeeaf1f91b86dd3f7e1a956f960131b78b3d7eb9789e7a914c4a635ca5181e1396f25b4fd71a7c3da7c1406337390163cff9cd04d74ac34d4debdaa4b4cc212fd5aab3031ba539816be8ea7391ecaaa467041590f36d2a68905e3cf2f5c33ecfd2fcc982d536ee9517069a05f4d6c7fec442dd12fdffb0b6ff021d2f981b44c22d9ea74d2f49f34a43fe96713878f9f0ed43b7864d2b8155dc48a377f93f07a0432c2594ef63c0ec8d26276962c91898643674cb1b11420991deb3fb49650d5c009586519e166fdd0e178078db1554b9484be3313629a835548baca23beafc403e15b89be58810f1eb7aeb302b94d7ef6ecdaff0866c28a98a3d3d283946bed126396f3f3f3f8738e7b69ca9c7c5e856b8f91f325c342dac913098e775af449f0655b6dff597a74ed92187a0bbada59fdb2e23c1c76ddeb19eb017f9c0b0302052db7c6edd11ae1de302f97a4f0f0d95dcc3c2c3e58"""),
-                    TestUtils.hexDecode("""
-22AA98C685E1552B525B4302C943037F668279C224B6270DCAF2B06C4F4AB1254C48DE253829FE6DFFA9CB6BB294F054711BAE3FBACFB900CFD1F0844E55D51EC6F697B998759B14C13392DDB6F7DEBA77FFC22468781CE402"""),
-                    TestUtils.hexDecode("""
-5129dae7c620ef4c5d6b0e0f7b43acd806adc035cfb3901e162be14f2371bba72674649e2004b4d055ab533316dc520afa8c80e5285f40f7ea4ef876e68b0aa4a559ec2363032efe5fd5a1d5050be8221c24b23c403ccf71bde5410b7e5ded038255dfca9439992fddc4fddf96654c78098c84e0182d954e204510bc7e5635ac29cfef21042bd52dde771a500099c75311c8657c5fc5bf303b7769ce8c2de7548b388224e727505c42e6bb69d48d845d9a43e845e7305a098657385307ab23c6bdc70de07868ecc1470b98e2da98fde4636af76fddbde6af2b60b4f27e38d4a86bed60e6f995533261cf91a618c07df0f659561f61bbbd70dd2b020cb04ac1fb6ee1a31ee4f4ae5d0bc2af22d60701700a44f2e8d11b72f4d03b3a96e2fa491e6e61f8dfd3ca678e4eedaac1e6bf418cc4a34b24bddfce3975d84740f7fb92ac2dd7aea450f91bd6ced924f7204754026f649868ccb103100b79d3ab2fdd2f916a76a6212bc583f1f5e541dfbbfb10234681c42ad56a95331c90f5e8b3be82a5b82ed4292094d9d60569fa760628e082740bb2da0a14b2516dda632c007ae3089a2068d2ef48b3f713999a699ab180ca99d7c49c4a0f40b908dc51d9a17db286721f8541839d6acb5eaefcaba5b1ba21e5ace4be0924eb0246e4d195a6eea6e962bb07bef9001a23dc0be7497a1ac79da047ed45b4c38196100b7ce06f466df295655076d14308d94d55103d36799a0683573768bb6baac4a10bd3120e9d47d7798121ab46521d7de8d1c3cd9618347d8947c47676c547231e5be77153f02a3eccaa99a75230e45fd4c1e6a6f951d1a5e6c3be098caf4a16ea3ee88473b1a8d91c0886685409ba9a099bbc0438fedd280f459de3c9c57c92609a865add4cfe76eae9af088680f92a68ab78765f7ad0b95aadfc0a91e175f07ab1f0887b1f448530866f002fc089a63a2e2d33ba63ca1985737ab0b9a73d23af11420d62a8b619dfec0830cf62757ae7f0402a4c0f209d03ed8f1731db5079dc5671c19c5bef712d34479b7f879dbe694e1bfbabc9c05109c615be763dd9ff5ffba888f88b62128b09475527d12203ae67f1ee8da83678b8a4b7b16f7700f919874eaaca48c10cef50a0f447baa17dd19eda59a1f71ad1cdc88e91fd91424e8c668fc93690b9b5914db40ba677a3c71a6d2cd05f42321463c12d55de1a717f69c132dc35e3bddfc23064ee2183e175e1ead1d075c7c1115c8cab91677ad6b483d7151010a7314ad558eafc3128c2dd590aa4e32e8c86cf769ff58ca5f37ee3a4ca0c9f9b2c4a9cdf2a8ae52d1d09110245a8884ac52c597e97b0b0304ee706795abed33f2f1885973253da8728742b54d4e908536c93ee11c1cc36da21d8ed4956255c0a28262baf50ff4a8df767e71a2d920f53b25084ed2cd8069fd13c0d1ef81f6989c0e93609038e9c6174d2a9333b3676ba24886917f32b7316d45dc6e99497f813b599d0bacc432ede0584c654551d3217c63911654b21e0631a5f7abf66d48b2cebff62cbf41ded241a59816fa9ba99cb29a9d000873fff81c689ee95bb9fd31a31863e1bf08fae8b27169c7705344b7085c917bc4434c9bcbaa27423f634233f75b82ebc7adb307f6cc3310ba95478572820973732f4cd3d1f749b728605ffdf23472810d01f6f9580b3852a5c2c7be4f93615960541eb2dc4d5557dffa8646d916370f89e09947e4e14092073357283fff846bd6b83d81092639de3b6ee260770b21275491a6300c12d5ad261f19d8081c9a659bb3f45cff2dc6c04313c7f3fb1b2d4ca96a603259310628356cab1431bee201ef7181f0f9d35e13b6f89a3698a56c3fe08a76418b6ea10b70bb2c0649f7b506f4b15a2578902d6df4065d4c3e79ed26a0d965e97b5ccb47110cf3317b7d90abcc9c7567ad4f2c11c5ca6617e643ee55096894c793d18adcce74c19620b112ab80152984de200d4e4a6ee29ce266b47d662accbb42fc74e7e088138faeb06f32e469d019979cf0b55aec3f420f97029852379417498605cd513fae94c5a5bdf3eec29c54634b94c6a96b0087ef2c8b2e32ad49144a70d27026a5900f9bde658645190ad83583ce8d4a174bf3956f3a581d7e4ee013a4263172d09b3e888299a06a0dd4cdd7e2a118fd753791afd91e0acc9eb1e4d3322feb169e47ac2e9e3e47908f293cb7988387c956806bc4e5bb9f65a84cdf2df9376c2eaf3ebae6a9a710da2083af685a8de79e9e27143c6894a847aa9134cb184b7dc7028b664246dda558891bdbcff3af3a5e0ca8ed06c1402d31cb5afca6260f4cae55fb6a6781768e6a1fbeedaaaee620ec0b7b964a38bf46651de29e4ad7247359df1cf4e50e71f691b73092a2f75f4669a145ffc5a51d51187f42dba767d28a39800789c88752be0c0e0b5aa2aeb3737f1028db4fba59dfba974f9ed8734a57f1f2db29d14f708cb83fbea9e4889f6bfd6f09d714ffe825056215be601bb8b6168d787a6d17335b87986913ff6aee38ad38f571435195b439cd82930a3386ba6e304b72fb5cf04b1ad8d64d8334f5ce0d14718232c613cc12ac1341706f829fa50a5c3010f8d5daf04c3bfde5ba88fc873a2e018d274bcbe85a9559eb224f6c23df124263772aa1262d9932ab813f50317bd7d4a6b0cfc207d8dad53d193d7330c9330d9bf866047237df5baedc69ff546308d2547b5c7f9e0909ff97da474bd3075413b94cf97fe331201f2cb565438182f13acb95529fa6cbd18ef92dab1bd8522f332ab5f375fcfbe01a83e38eef6381a032f9adb60b59e5eb54786f5dff4f5e003b79c7e119663c38e7e9baa0199d3ba32235166936a850c57227b1a16561ee407f7bf09cf6671ce0d0ed0f9d7f916a0ff7f41d8adff8c42b8f4640f1488841cd3cc1e38918dcadd752318080b4f15e58dc7f79aedf3805e1cffc25bb01591f15f54155c59a798a8bb9d5247eeb5d9bbb3abfd65f0bb65f119dc05cc0105475fed4f006e61a1864a29b53770e5b3cae2fa13b5a0d1b05ab9db868a7b1349c9b31d1a1abc19250be50627e8f7283af7d12c57a1c110cbf4acaf5990621d5c04729d475a97cf21c5fb252f5f1514b8d3090cf6e4e22a0146fce697d88d0637b3a60e77b9cbf527c4269adebd5eaddf12633c53f1ff09d869a846d3121371aca8252a5ca1f4fb1b7afbbb3256e53a9f25a3dfbb3a95e9beb67711d27689a28aac998b3129861d9acc72122d43c300bd58d934bd9aaff2ebb55268b94fe7013aa8670a89b19e1cc5d201ce2e73f6bcd8649a18f8caf1af021d374570728690a6cff0f3fb04050a0e17344e7483879798adbfd2ec112325282a3b5d6d72868c95999da4a7c7cacf141a1e2c5e657d7f939ca1a4f3000000000000000000000000000000000000000d1d303d""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-85c8fae58f6c8a7690e2098cdcb1e487e83a1ff669b31724113a0d9f796a68c81164211555e9d9dfec48b46c5eec597bac9fc1fd484cefa07338594b3634b8b58639a8d50a12f76aa7db8ae4c68e733d0903eb94ca3c69012c0b674f198c4f8cd1ed5c345efe6e94d42cdcfeea184fc0bd8986611968503a96f0f2dc5dfd56b6880f211f64d23d4c4e0451381d0a5b917ee0d31a6f782de660381b0f791b371a71506a12b8ed520b9843a34c29abb0795fd661daa226bad6e21345f93ac59aabcef6b7404ecdd11c52fd7c76b5d7e588562489b2a27d039214f41be58f9dc89a6e1daf1d47d6324d96f9dd35e15d83fe686af8f3a65f99a45f918e43d404b481130a1039df8f453e53f7df54ab4fc70006dcc578bb2b2ee96c4816856142de04e43215c0b1f33cb3381ae07062a2698967e965539d435f9b010a38336c303ce8a41591e9cfb9b5cb491faf8b60890a313dde19616a200d844fbe125a25f61495a48af66ae3a490c415fabe05794c841e5e8b27c39e3c05fdd2bc44baca13cbcae569998c172e5325b3f89464d8240273e7a0da097ff7b4116ef1adab1b436d80150bed523682c9ceb8e308b50761ea061b6aa23a0c9e22ab02502f8482183e13cd90a0826698ea63da26d60dd3f7b6d514efba52f351822bb7b2373c2a33318a20f4d74b5bdd17b68e7aec62d80b09278a051c7c769db9a3f416cbc9ba411af50d9ffeb6665cb5b40e0cff170460a6a26e37725f49d1170953a4be705d4fb88086decc49303e761b7bfbea9f289f49378a793bd58be0a34ebd819fd40ae07edb975414dc4e61ef23e5cd503dadd7250e50ab8c6236c3f1b0d836129d735122b6c7a30080347a8140185da8a899fcebf6d8d76387feed318be512d00e9ead0c2d5f8d14fd212019bd68d5084fc4781089d867678fea30c26788f1e724f1a989d542dd96f4d8c30d30dc819eaac63278334a44b4d7b8b91cfe9e3b3999ad77d72605ac293c135061613991403c2fb84367ad98efcc1e793dd717e2ae9e24b8f7ef98f1739f46cc46b7d4226ce5c1dc03b5aa14ddb72725970df13bbf9c7dc607361661d311fec0a6e44f36e115c18b78b9d1949ce5eb36dcefd33c23c53c05b2d17289453fa359d2bb1f1ec04c604b6b356cb86870215c3e474cfc893b1141868958e3707e3d64adf77d4a3c637be8bd7909f0260d91a48f5bed9bf42bd00fb9262d9fc1d40af8566ae13b4043d274ab0a87e9897ec1ea945b88d9eec3beba831999a4acb35e42a3639cf0e8d506b61dce0f0df241326f9892cb93eb1e0dc9fb57ceaa04004ae2a1274aef2596f3daee8ffc4c07df06b476efbedef82325e8adc14279dffdc43592fc8e20ac1f307383defea6e97ae06d96272f4ff56fcd97b15f7fc48b499ab625dde351ace7b3aa8dd6786bb3f376407aa7b1d11aab9a587386ba98fc3a255ba62f00191b464b28cffe3806a0541ddb97308d1172b62353c8e724aa2358226b11480e3d93644bcb552820b86cb46f4379b1f51ef09049c43ff0b97ae65f44ff03380933d80e733f11eedb8001f6ef3bbfc4365f7e1e242f88047f7089cef1385bdc0aa723b1a7acec932884b9df3637bd9218697b91370462ebe8de16163d2aed8a32c9af887f7b282e13fb88c0b062fe2c819217495fc63e81c7b26cfee142ca9568bac3dba7edaa0697976cceed5963697248475aa311a17cea8a24819b8245fb1073de9f13b24804caefd25502940d24f40b5993b135decebe4ac0abfc611185bdc4749646d72f47326b2318c5ce173499a189fad25a2d2e830a381730d5e8c43d3bc3862c6324f8765413468a39abc37631e98bb79059ed"""),
-                    TestUtils.hexDecode("""
-0B0F604B53752973C4A72EF940C3FBA910AA9AF2916D673D69C4AE4DE92A237F271E84921C309B59B92E795BD26C5C015EC5176155DDAE8FA17D7BEFCEE3A23E0201669CC55A6F270CF0D03FFC09BBE4B47D318B6926808EBB49EC8B57A849896E76648D51117E8F518088D66B69D88E09D298186C10B5678EB8AE43E9C0A794C63CA9D597C4B74C959E9C1E8E0F46698CD64CFF3C0FC6174CFC51095E142DED9F16E5B2D3656555D2D42832280164E0C10C5817AE47ABACEE7C3BFD198A21BDD1C420F2EF0776E5EEFA46E8BCB49388FA6B937FD1FEB2BF09D5B9494A534F19BDE4E7BB8A5E4C558C2A166006B481A7C5865069A3DEA2B880AA503B5C020F045A4D9C3E5C590E4AD5375E74B732695A11164B5A57AA665922431498A9218CEB9ECD92700E92BD11E0A8140938C4FB9543FA5DE8EDADD1EDBDAAD11A6AEFF2EA409638B2C7AD546EFE390729982304F35D7F889C0CCC81D67F5A1D6201BC4BE8D1AD2D3CB85815CB9669B56F845148DA0DD2D6B5D7C4986DD3F10BDC78EAD8B4A88B7AE1FE11C634355F60A43A55C88B37954CDA71F4744C8E2B4D7F8D4A2BF60EF0C44CDC7F7059AC48A94B10279921709827A3E1E7A46DD857616E6B737CDFAB71CBD47639245E392DC116614CA3F099B8F2092AD667DAC43B8501DEA9876E5E0B98B41733DA63A2517A49C169A95E583F18F2E1DAEB4425E307509CC6B0B376827F0BAAFC2FB2ABD4E4151A8DBDCB8C22C78F5DFEF0DD1743B047E58537866795D67E35358020CF75F0D2B80287D62AECD6D34D18494D01B4412B1CFF279CA69C18A263E7B862F514A7A64BF192586ECD460D22DD2280373A66ED987635761C3CC34A5BF6A370F9F8B16F98808767A2D9A1517544D869E674980758B15BA7844027D3593432101FBC51FA4709F4D041BE9FF31DB9B7430F1D7F8E06C22C4BF3F8798D50C92641CDBF0B2C88E88666029FC985FD4E9FFDCD779C7F7600D02AE8D9E3CE6FF76F0B449C41BDB785BBAC9CF58ED7ED1525D7C7E885C0D46ADD0F7CC3B14394235B9176B69A222567E6533870EA540F4DED9A1D78F2CB89E6C1DEBE67249ED8F31C87499E24DAB0434FB9B40EA695499C76A1618A37B1AAA5309A914B6574209A61DE0633F086EE4F2455299C70B981532A23DC453939D223BA3A25122AD498795624C727E973C052E69AC40AD465DF55ADBB20FEEE76BF2906EFA7B0D9D5EAE860FE02500E2E0F4A21CABCF963D91262EAFEE814BDF9775874D656F8BDE11DA29327E3E7C7C95395D0DDF766CF34005CE86592F6787D1044E5CA1962C4DF2719308B2D6335FAC77DF46092CD3D5D228E381BD7E5FB4D2EC18B19E18E4748F662AB34C3F2C33877BF4A8D43A63F9B5DC75861AABB42D34EF37EF19CADBA110A3807D1699B247BEFE3D61AB84941ACB227C79CA05180FD3415D0E76EB31B4DD903D78553F2C22563F9B22BB876E81EDAECA4B8FB9415E2BD5AC32CC08775A20E8F90A1681C9957DFC330B6343E58F841906EE3562ADD6AA53FA1EC4AA2E894AFE769116E29AF49D0FBE2D8FEBA215E470ECEA81B258977A0FFCB17666953C29B2F70559DA00610398A08E0A17D69705707569D6484C4203C06B17439E9D4D9DB8456682A79659DAB332DDF45C67E527304013A422E46F2989BCF033DB143676A4EA720D0DD75584298CBAA765CBB0B09EF267D503F2782A427459FD2A83676DEA43C01D288429A82527A69B1EB19DD3BA1AB7428220BA74F79A81377F7ABBC027D96903AF6ADB4644E9F5CE676FC4D3ABD977D6438F4743476F77F3DA6E822AE61E0AD38549BD21E0FAC1C963F1D47F9E6BA6019591DE22BCEE5D5C9CBC4106A369C04BDF633F41EB1D6821B1F43194CC14B02B753584A659EA46C49B983F592C83BD959690845E872B471A38381CF3B2E8F4DC157D9A60FF56EC63B1C66D2227A069CEE7E48DB0E0D5991F96740D364DF89B08BA67098652958A14516534103ADD9E457E6AFC4DE1AF332EF3ECF6897B3DC8E5D6980FC5E5D829D4326F6023F48CFC9D0D787416EE61A0BA3CFF5E7C69BC83B18928AD277AABBDE271EABF8269701E526960460EEF521E83CF7A61A3CAABBEE1F1C99402EF55FD438753790CF56034AEA3292828AE858B2D3B9C8D77FF4545FAE7B4F2AE1EB17B8198F4846A8F4A105CE250F900969696E477B2C46AE786481BCDF85715BD270F9C29BECF4579F2DFFFF7750E375113E33ECABFC52E4DA5405849FE5D5F4A17C1F0984A1479D561943CD1120037EE821A2B57A12D7F1797E64E38A4B71E2FB10207ACECB96B3F3ADFF82EDCB633E388FCF11C8D105C1F6EDD41B553B4B559C3199745F3B0EB7326B867FD4CEDF4E9ABA1FD6A10E1494847FB5DC83C91F7A2DD351CD1AFDF95865701FDC658A41ACCA58E574B67929EEFEB371589374285148EB09157AA9A67F2FD54FCAFC1248F6D84951AB1A676637E9CB76C17C282DB53B1BEFAD8019F51B0400DC1CB012B97575ED81C129636C38998A2E6FC5AB7F0BF1FFDDB588BDE4590A7A0F879FFFC1183A3C6CFB341FB518D0786A6473FF9614877B1B722AF4B2E1E9B5E0DE7C3DB004EFA16F5CBF07870D7208A93A9FCE0EEB598CC54F04B1BAAA992C02BB2D27217AB20A3381EBEFA04CCB1F23E59E4B0DEC700E069DB7620E22235A4C5F54522D96ED4785ADBA7FF95F2A7DB212D3DD05E58C560E5ABD0EC238B7ED01E54ECACA7D32F7C2A3309A437E68C3AC7A9BC51025409A2A1ED05F8DB0EBB647FEFE6222D6F74DD8E4034580B675DEBA4BBFADEFFEECFF4771A0C1CB0ADCC6E9B050B85D230F6B288AC3FC24880CCBDF9C6A6976D46797B75B8532411FD89BE027CD8C81547B24B535825695A35BCDA4E2E0A3A6BCEDB73DD10DD847C4A0AAE059A07F56B0ADC0401026648BA469C534CDF6E2CAB8F581A7233D2F15BB35DC990EFBFE688F9B9AC5AA5C9B3E95DA7B0122947DA03AB9DB58090FF14B736B9CAC65F966206AE7C84B971D83944D8AB61589A28058E14193751B685058E632E32EF1E8C94BF005A3A2EC5EE2CE2FF6C05A67D87E56998E952E4557250E8AB5A979ECB28B0EE41DEE07F919E67670D9CC4077DB0D90ACCFE17CF6AE69DE0C9DBCD3D552A7FB37383574692A267B0A8BDCAF3532AB47887FCC94AEC3461A9257322095F1024C880273222295107864903F3DC8FB353FBE51C4D89F30FEAA5A570979A38B0B4AC9A4AB6B7169984C576BC4AD6DA1719CD0D5ABA03BCBF1336DE48CBBE167E4293DADDE3997061469F200A391646C8FE712EBE087B448F7A7DE437186D38A4CFBFC2919FC888487B15C60E93373D076DF6A60452E62E05256AA66BD1FB771CADB331661DB4BFA47581A4367069FA20E9C6229F79D6680125D0464F7CFDCA1F5C46688D5816CD90862FDABAE753E56BAA1369AC1AD3530630998CEB4545C4404C8B9A65D5A43443624D62DCEC989AA2CB8B85414E06AAE6BC4E219C5A3FDDF8FCC75381F6A0F73F54A7A2B5BA0F546235E71B233EC107900D8116CCD398FB14F32CEC310AC089D6BEC40255A6A877C30B05355544D115E8F85E428087A5F3670D596E31D25F676B3C6FF444AA0FFE5011AE62D6FFF86E615EBE80622BB646A318BC65950889616DEC254DB332649788C07E46CE590C2362EE66BB33BD43807A1336B94198BECE586CBBE3136B5CC809F24DB5BC3069E9C1FDFE53C6D1DE29DF48A9000A7E89D6862A773832DE2151423D9D11D722D923233137DB6F34F8DFA4EEC134BC9EF5A70424D895638D1B09D95D98CFA17308908D65AF00259DFB5ECFEAC55DD7FAAEEAFD4E94EFB36698D2315D795A93B8BA6A3CA93F6B79F2E599149BFBFC6F5C5742A83C886BDD4539BCC128F30B370FFABBE724AA3F3D571785AA6234FD2359FB3468A06A8E74918EE6E87CB29178900B49891F565A80BFF302BAFD0D5C2C123973BA7B9B425973CB3D7F2AFF3059D272A7CE611F5CDDB5AFF3E2B4024FDF0E01D7AD1C63FB47D9BA986C341030B3E5C6CD3CDC6A3DF9D6901E76D31C141C37619F5BB316209FAF8428AF19236DD426D70EC81E77309D5D9AC33CF3AACC0259A19F91E4579AE49EEBA41CF79B9499CD1211AF1E6DCDC70383A35E0ABF7B53A1203AADCD3AE638862D35EC4E441100E8CDEC7F0E6D22845F6CDCDA801111C4C7F261189C7D67B981101C40F21D33D05E336F1C7443560238C72B34E47758927E37F972247F4457EA60B2546F6B5B7A91B151E8B3800CC1748587E0D5421A43648BBC5D87C591B01C229C8104CA87C0B7F0770ECABD1E2A858147B62F607A86E1C71EF73C036B18C01CA5C1BA8242BC4BB7414FC90C0A8372F860F2EE51DCC1E457135776C377F940400AC5309112E6742617FC226EDDF51E95CAB40CAB58CAE1E662DD78C6E253B373BE970129193DAC7DAE372CBEA847248C2E69273B7CFEE70BEE59DECF64126D44BACAB5F2813CFEE1EF89AA3FD6D030319CDCE94FA86E4E64998266082F8BF74877038ED888C16907A8DF99BB53809E54520E4B5B6AD44849A33EC3FA44A7B179350DB07524823FE8384413F0A7E1936D8CAAAFE1052C462778B36AB8A9A14BCCC0319CF6EE2AFF01EF5077A10BC0FD0DF76D9B806481BAD1F49EA013942F38BFE52FB194EF8ACB283B1462BFFE4AC618D6FEE7E25130EC71D68C81A9532A16520075EBC1E9C3FCDF5FFCC150F3815E8647F34DAA814935D0E1AB68EC6A1B14FC7566415CC11E0C14A9693B8711DE2D3F78EBC468269BC851D2ACDFF5E8A6388B73E33F20C0C7621C6B644649AB088DC191418292A698EFA4871224232A7788EFA2D69F9F9FBE80FB8E6B0106405F6406D00A6D6185EB521372CEDF51C2E0876C7A86A90F1F5DCC0EB3187DF8BC62736663F713A1D403665BD5AEFD6BCD3413FC63CD68B3C5C7FDE3AC4164FC3737C2703AAC85E6ECEB29E34A6ED70D4178402814B5207ED2AE12E9DE009D0DE6A0BABCBC4ED41D5C28B1943C4B61D8B1DBF4395F5BACE1E47ECF0EB9E21F9E7F663EAC3788E935A1AF73B19714ED91BCCCDBEDAF1C74155CF235A58485BCDFEA58A929ED1E959DC99345C36109E42A14438466B1F9E728801BCADD16B2D8F762E4BB8B3F01E531339DE79634F43117DF5C585D7D2FB4A5D3E82BC25FD92BB1298AC79211B3866CA1019666AFCB10BBEE1AB63263F2823A86DD3EC57E8632C9F4975155A01F22859EBC400F5A3B8302ADAA5892A320487AD077B144392528F100F0A222DDCE5636AD5962AC6D62A2382167EA977743CAA6BA2F140655DFDEF168BD620C73A47A8831DFD66DC6F2A9F47E0724081681BE62FD15C74846980683B729AF1757203F457FF12925B6B7BC81775A9E5C53862B07D4B93CB2E9FA896AF58D258384115F1C63779E4189832C29C8B142DFF30C00DCAD2328A63C92CD1E42B2A8D2E18542BA3A81686452C83AFD5F6955A708CC1DAE500718C6DB89ADCBEBF119C4707B931E685BAC00AA60E3B5F9F42FDA6EA90F5C77295E84A3AB05D69212C5368E24F18F43B450181884D7AE8BBC61E1603FDEB13797F9620AD6C2B863C495821F7F726BD5801A3D5A36F4609B595B7653799B3794E4A60090D71F5DE1AA5F0CF562F7E722C55AFB676395ED988A491A34B462B2D18AF517569531308B8190F0148CFAD463802AC62C6CB289FC0C95C207AADF82AA7399E0476B774D9B876829ED91EA3E5C40B504370D266B7B3C72DDE2CCB7F3AB8E820ECB5715289451D352D83DB67EEA889EBF9E8B012C8265376C841BAF6EDA4067A400D4C6FB00539F3839A8D0B29906F9923B9244132282E38242257C339A0D0BA8F05F75D41ADA51E29E33BF65F78981F04F397BD5F9580376A8D1C552363D6BE90EC83C2AF748CBB7783D6B26098C641777A260F5F60A712C7A7D1CE681CA1FF969B8F25B90F9A2B03F71E06A848DF3C5C8571C5626D5A1F123DD14A9F90B3958A7EFB3FD522C7E83F897CBA80B95099F1705E1CB22C7E91DB644880F7DAB480B29FC0F8E1D0ADBAA123F1E1FE36835ABEC924531065354B77DC1082DD690B316A7BF104140F6316C46E81E777F56EECE625EA030C1FFBA3A4D40745E77129230A69D76C226A80A8CD31720B08D9207F22F8F3068C169B41E7136F94B73047377A8AC0987490E4DA2B7619A760E3B61369BF762FA9A3ADCB014CFD0644AB1FE6D8D3EFBFEC893E98289DA93AE19D8DE41AB33FD717200B6949AD21B3290C77D5B1FA44EEC7D0C6A9978D50B40DF77823FF2613BC80D0E11DC2B790B332D5267851B6315AC08D0A2D6FC0A8F93DCD20DA6054894F84C88CE254057CD2FE36693F868D812DD1D978897597840CB336223F8A8EEA9C15AC05D3E40333391680C4F4CD5C2F600CAA684BF09EFC8A9B71E6883E9353C22B379BB6ED8ED83A2468287121207D9ABF61D2DD5116D3B163F262BD3D57A23EF2E6154BF6EEC1DF88B961C4505F7CFD2E23E0E0D245A9418292A5AE6E60F3852D78D19E1EACBE9F42A522FA57554308A1D01E31DDCFB7C38534F7B48E0384AAB4B81A93681ECE4C55BEB089092E757A4633B2F30BA83E470B3ABDEDF9135DF22E2B29CCD0893C54C329DA1B16C2FE4221F1C7EBF6B3D6DE84EA1DA57392762FD9C64C0771966B0E1FA9A6E286C23128DF317F704237B97A339A623C985BFD6A0C60DE48EBDD73A0610A22B02D0978E626B50171FC8390B80F37E5E536CC184259D4ECFFA958DEE1A27CF3D2EFC9B218809909B19D573EF86087A1C9BE161C54DD1279E022F98030669FC93A7BF03FB101A3FB5321F654D2B40EF8298844806BB66EC32F7AB3BC7BED2AA7F22AF20759B12A0E3F82D3C3A141F393DE746D5A0D91F32D8249F0DB0FE37D27E49795C648EC6D96E352115FE4F10D1F56C39FF9140E3E87F13AF3C6480D6150E1B7B4AE614A577D6E81694C19E468761039E970335FDE9945F6119F6ADC184C9F2A434C681D593F34D258F2A8847E02DA5EA2605A007B25031DCCBA8A8C50C77411D197E742D4B3994471AE84E2B612B09B2BBAA38C5E71C22A8E3DD1F284A681DDD45E962F9D061846EDB9713D4F925A9DAC0E32D2A4496F68C68448EDFA87FDE3ECD47411AF5DA95D8C48D5CED988AFD72BCB7A81896EB1496F468D4664A58EC3874BC6FF6A85692790BB405592DFAF53CBAC93884A842EB2D3DE9619843919CD9D68AD89DC7A84BE54C406B8208428066011807D722C2B34D4A279EE43BDEB967360D9BAE50F654B2A06B576B803544DCDDAD670CF8D2D7723929842C6AFC4093BBFBB75D1F5E03682500AA0A34FC66CE4409D08C726552ED5ABB0C646E89B35A659C67F6F398D6BE39D9725BB0322D458DE2A62E46B62013F2BAE5E60C3D41975C6A4C6231F4B0EA2827329279459840911891B0111FB4B1FE99FBB482FED56C7BFBA15882CE5E2FA2C73E0B682EADEE6F68E4E1A9CD92FDC2CF30902453A16622AAB1273407B985FA4B7DB40D87812F2A10183464F8173D22D5603C44586B107B4B82E94DD80E87AD49E9C0FAB5C3330B74E89F742CA1A5940F0F329F56DFD40C6869D0BA8CA412AF9C5116ADBB3C22080F93142C7778D52C4D75F1EABE13FE50877C26D7DB429E991506ECF1DDF30A00F9E0B355306B889F41BBFD1B4D27B67952E4A0B53D1BF8B2E84497F00826D84A913F02649D5145383163F3C3F586EDAD06F518B64D9B300C4540A67593B9F3358FF2A22AC4BD7E7B9AEE507D184E039ECA3BBA0B5C584D3359D7121BCCE01691E11C120925A7D8B100751E8ADE99D3676C7355BA4BE451920BC7D2AD6E8EF0A9693F16FBB570122FE5F5FFBDFA490B3C84809ACD898FC0F807C77937C7CEB6F03308D3E9C657F80730EF3A1CEC6959850FAA6C158F23B23D28ED53BD77531F1012DC1753CE1AD6E0A629E14BCCE9D56B74E09AD6EEC9DC4A5C92049D48AE21222AF706B1C4DE65AA814AEF5B7E1EDF2D8A9C5B98853A17199DDC3233C5583B95756F5A9C175FF7D0891010F5D36A268ED5C9F58433A69185931E11BCBEEECAA240C2C5A4ADB4E770109F3F16CFAA37AF98E1228FFA7C584B13F850FED0187FB836E0A01B19CF700849EFF09BE1A57DE41CE1D52EA6F182E0DDDF741DBD2150113B10CC3D9E44917E0FD9717D6D361A88060E202039AAD8F31E4E6FBB4D7FD1BB5D6DC20C3D83F23D120EC98FF4912F3D9AB18D8EECBD7EFD1CF9B19081B38CD959660E8C63A539939D0CEDA897F5ECDFDEE16ECA492B216BEA35A167178F4A0FB76175D160FE2EF97BD6BA0E296922CE60D91FCBB3343ADF477F8A92AEB56A471B0711CAC45DA8EEBD21FE83FA68EB74C8502C81C65506C92C4A3F19ECDC2B7A5AB47704DDFB2E8D5AE620CA0D67197699677EDA3FC4FB821BFFB5F2DB03D4DDEC0BEB13EF84EC372A5C56C1E712C8D23D1A2DB1BA077645C85689CA2258E9B1B807DCC6394680B72938E1B61AC3E8A5B9E84BB4B58CE5C8C2246A604C05701C026185CFB872BA78CEE33EAFD0486A22C6D5CF9264EC134DD79548F3CF5FAA67D8B1FE74F6AF7B897AB0A0D8CABD5E1B2829CFE66D58CE00E68C6F23FC35397FBBF96D2E63825C96BC3CEB22FCF9CA46C93538F8DF566145D06207533627B665E39DD284F4275051229F3CCE9E9E62EDDFA55BB2AB1D1D8E8E6145B3E38F35F90B89C15FE799EC14F7E415FCE4EFA72615EAD26C10C1FFA4FDBA2EE04C4845489C21BE45C478D8B2116C84AAC21B48BD4181FC28C7C21AC9CF95D8B04C0D817C8ED8083D9CF8B81213AA2E3B8BBF4AD66A7AFDCDC4C420945F5B3E8C8AEC5C4F98005A0CE1B3283F5FC0FCF8567A150E12639CA85D298CE8E4F9E0C53817D3009284A5A0BD5D3A07234AF751AD059E301076946DECFED43DB1176A2BBA4B8A571299FDE4AA3574B6C189A721674E004F259B00B26EF5AA90794FD622040B80CA6C5E9FBD44B3DB21290353878F4D8D87496E374B05E6A5B25742A885569DBA2501367EF4C549BD5CE6169914A7F1D311D52CCFBE2091F0DB436506F210C137C2180B89626F52B4192C67ED06C1F9175E44B9468E6FC2208A98DE577962D9B4C31D5B0DCF4017DB1BBB2F80512C89B9AADE69DBD584452D25CAC97A4A7E6F48BCB909907B93F5B8108EDAD38CF7FB541328C5E8AB867DDCADD6A1B5083869E68EBC785C80ACD260C715624360F2F3D78FC1B2A464FE0525059A3D5E04BCCD72D23BC680CF7B25C5CD2AD6A0BB8366DB24B671D5BB3C12554D37C7A662AF9B9DB61DC6C7DE288DF1976DE08743426CDD30AFFDA05A8390A8F3A4A94D7CCD33BDB229E32850A77B2256CC595BE515F9E6854463966D4DB7A946276F594AD4BDF0B9C59D4D38E211A4465AEE023CE6C062FDF4123ACDED834F672C1A724BC17D44DE9632A588E7EAA77F3183E09D2ED55099BB1AC8198C96EC7B1635139980D5CA4B8B3102375A2E08BC3BC754D9FE659C3FA403218BC8C00FA87A0FA6F096E336865DDF02BB05049CDC9680E99C4F567ACD25AA7CC76C182A8DFC174BF6FAAF4D2553A4207922C1EA10CA8DA3E35DFBBFB5F6919FD4088A3A8E48358CEF25576A3A6447980F1C716EB58E755196A672C378F6615E54E9A16CEBA33CEA918768961C244A561164B61754F679856575DDCB32C70447BB738E84CA590CB523C6553F13EAC77461A58A7D4E1CC1E36E7BC5E85860B0E6B67C70D398AC0BABE1F42426D9E7F12B5E362BF3BDBAC42C572730C5F4EEA957FD3F17050625BA9D9938380249290AAF31BAC"""),
-                    TestUtils.hexDecode("""
-d90e5ad6ce804eb56c37cc30b96369f19a67ee324697634f7a40b3d150ba7891f9d8e5a7499781b5ef8f462ce1626eba1213bdf47ea40203aa7b9f6632a02c172826d96683de98ef1fbd163f817d6b4c71ed7fc9ec3a2db3d0bc692f94812d69ddfa81c15292b507d7aa3642b100472acdd9db20f19b60d98e10f1f47fd8f1498cc618a00b8c23ddf109957b78ebb9f5a7d6167fa907f52e312fb333b224c2e1b9b45ffe6027a90efea98d854ab6c6de67a5f24ee28d917caf0014774770989a4816f39fef30dc70b7e068bb306ab404611620b9dcfd40e1cc72400e398cfa342a616fbd5eb075d340d9f1d095b54d01d190b055f21d4de73ccebaec652f982535919e8ec7df3ce42f6e0807252f88d4fae025c68e5dfcd9ac0af5af610608011c630beab1b1bc760c550e79696333b34eab93fa7afc68e900686d1828bfe2bdb57332a9dcb84c66f12638a1ca4ab413efb847078b79610c51ae1cd81fac71319f8e43d356baba173c9775f9dd2569c3699a2cd2e9accc5ff725bc951b6c007e7d7b16b5f3efbde405d7d945dd1fb38724c52958427cc14d7a1f913c2c911fbc50e61a1aea400383561c78d32a38677ee62b201067c6744500f27135fd789e6adbafcd841a2796bedebe47059a8917f5eddc09eedf7aa6187f7f9e91e3893a3870b307a47da4366f767045390e1df69909d50e57ce6b2656a9f9eea5222cb8a05142c09ce230dc49edd7c4107241a4f317577c135a656071335408b809a18588f7dba155bff5acab476e99e62b0249e362d75ac201772552865f91eda373f722d19eb4e4f66c94627667af033c4d4f8e6eacdbb2a6abf47c931527c66da42f8ac3bc1a9c38e88a9d862beb1785ef9e1edcc3aac6477fcb78bea88b5a7796bc6e3e33ff1e0ca1fa73e66307e409365ccc8cf5a0cdba2bc96a7150d030b1349b15469ba21c7d53c641402776d61fca08d0a6268b43c063f51f110b8708251030cf393eed4898e2fc4f9654c05e700ca3e9d9b68274556f88c61c35860579ccbbfbf3dc367a88b076a4618772cac1c225069ed77168bc9e50737d2502d6b102a8904cb3118489e39c31507203175b35a295980cce3f9653330307583e3cbe2ec1d6e5578db4e5fed4bceb20922036891dd58b00e0e98a408f2212c5cebc7faaee235162bcfe6e482d4d1ca012078aa78bc9001a021c14e2ce86e484ad41ddae6c256f05cbbd64d99d20ca4fd0fa65d3565bd749689ded6c835d1370b047dbf1da76cb99f43ce660654725a40f7e8dc99716bd12bc3b3cc140eac2d230ee9177c8766e3cdd8d83948c98ac97b28826918a8835b5b563e887fa2ae18fd47d2c56e7a213d92533f05bb608baa68518ffcbb15e6847a776029809450ff9c0d4fa422fee078fefb04e860f5edc713412436e836f873bca3515842f70841f400db22e21c7a9c1ae25727a39e7e00e29abf256cfd8817115303a40c61577ce6e914b8c6e9481165f554be7a58c22c6a66266222ec80f1af4c6455301cbd80f5cb42d69f524d9a121699eca6d78bfc4db7bebdd8d03f83a638882aba3967f377be4f54295205b8f284a341796b4a00ce517e41ad2ac1d1dec2189a702b957a4d5d67fa1625341266585a220f0c276e339c29f58b13227021b6631cc37701899f0d7a761e13220ac0c39b5f98c688571915c38f8d0a23811d11cea0ff0e319e2bb06ff31990e00aa254e671f350bb9be4a5c78a992ea5de9276b0c542e2544d6a9a2e0339805ab40a9066352e2cf864a102406c4a11268b0ea22d029bdf694cd2ae75d9184920a9a707ab649a8f422ce4a85fd30aadcc07d3dde5b3b753668a303267aa1e43c81617b6aff5c7cdfcdb66eae646146903cf84a014c696473d0c52e19fc5da06bafc475ebbc367cd775676175b4268b42132f2959349a39e73ed553fbb50c8b213e4ae9d8682b837a3d8d938d4a4cfa72b564a39f5137afaaa442b562ff09bbb5c2faa2197f227979a9cf580dcbf01a07da6239f709fa91185e1a0d0847d77a50a4825fc0c2a6dc7140de2d4789b1fb4587c2e9b24f33d11728071548ea967622a1b97af44b51b2300c2c87d1f05b8d0e710a2ea5e123e479717cda447c0d4cc2ccfe753e6da45c38f568a8c2a82418420fa5de3fe08e196f2e2c6691b7774f4d4351c37e974721d4c505a6ba037969034627d05014a543e96956cc991e583abc9125aac8324f46e71345811f7ed8553bab0d166cd8bfe2fc21aa96c1ac168b40c61aaa7ff5461cd2c1339e8ac3c54cb1a8abf0ca4e7edd9e9842a01a91eeb6f3702be5e81936d53f11ae7d191cc6b8afbbf1f78dec898a0c30df889f43a8cfa8ce1d2a324c15b501a0ace8076b26334fcf03bb3db377d285a812f3ad76c0ecd7aa3b76f9072e40b272d514fad2d661d168b00c2b27ed394d4cffbbe38ffd1e7b84bfac69b4fca99b8f316471fd37678e4501f16ae1b2acb472c065aad5b482cc893fba258f29a90e1faa8f4c5235f136b25d1e451f20784e6b761dbe4fa68a41285baa9634f7d87807c407a9e7be6e483f3f224367caeba42f0df19b5dce47630396ec6ac6ff1b5c23e02f599cad3ef117ff74d7331facf763c39ea70c2071087774ef8a2ff268f27d06b96e50bd52eb5ab55a9f5530339abe6f07d5a27f64aa8015b5d2a768452f8ca82484113420464d06d7c61ec25c89a422b788f3bae8e79c0020fc93122f53356a9e678087f80b1938e42fbee9efab604f959b7f4d8c52d900d71b24c39a1cac0831c22907ab3348ad20bd6818023a72266983678edad084a13ee07196fddeb52c79bfb925e3ef4bae2ac564b04956c0097800546e965687584c2738a2009b0caa15183ba1b6966488fdcca6937bffdd9cd6f51424a83cb6324d2c845dbcc9237bde7126516ea59d36cf2b63ce239db57c01bce472886eff29ca612510ca318398aae4618b8d6fd9f6c6e8cceb4b3dbe5d059038b9a6b81e07f3599cb1febf3b0dae4eb9d5e3b6a3e11b24aef1377cd941f94a56f7c7f1fd85807d9d97ea0aace9d94516dd7ee271880f4a7bd18b4266c510e16f95aead24a9d3202ef331028b0f4233023aef2d18aefcb5dc66eea08013463c008b86faf617fcb6929a2bb78ee0459788792c9e3b5d3cf92371f4555c0955bc746264cf6f56edcd8bc8d044c170610fe76edf0e875f9d6d12eceeafd955e0130805963455a348ce41788cea9e2601decc02006907f5e092fa70d2f0f21945a5f24edc734da33efef7efeb22c8b142d86a47d9d5c13f93258eaa396e3ce55b8f6ce736a5010a347b7f9298babcc6d7e4fb03192d4e57daeaf7fd03041d262d47676d8b8c93b0b6b7bfe4e9f9fc0a161e3368a1c7cce7f200000000000000000000000000000000000000000000000000000000000d162933""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-c298f170b4286195747d986e0de1fbb602feb53b5f242a12bfa2b7602b22358a3334e7bc913d08f6457753c611730936fabf6e8c5863a0ad142f8b4fa0f1e68ca0e588749fdc255de072dec16e7d62e2b4fc1a20cedc7879c6fad196e4f6de33df29dfd6df65470515f6be6c9f9273473a6a6daf1d58c279e81b578cf5192b839cea97b8fc3d54048772ce1c009aee0381e37f39f82585dae69d8e03ac9d0b2d9a772b0e4a8ac46456c2f98820d1111a4db13eb26a33cef728017a0d9793d880b9d06a57b8dbb41270cc203a0f4367e52abb424533a426034e6e746a077963aba533cc54004e7a4d17a0ca93904bf1dd4da52908cec4df9abe86ea50290d3c792bbd1d629610669975ec9682a4afa4a06a37b8c90a4bfc407161f1ef6539d104c39b14ccb6d7f36ccc0a573d79c70f5b1d1f049893a31a228e32f20ea84503a1b7f2115a74089e61ad991022b11757f5c361b8bda665bc96d6fc2b999e546e48e431457016de365a50163a53ccceb193fd80e4bcfd658aa2b916bac07052d9c17c6d0c8c94017fbaa1a1f4638cc7351dfcd4b5beeee945f5ccd602fea693a105c0834ac9d730fd0bfb83c4ea5d137bbf3cc7a6ed840d5f6a22f4891d29e8d0ef2146f2785acc3404117f606b20a13bd0912e46bb3e7b707f1cb348055ab50da962fdea841bba33d43fcc2a3dc4359b0f7648f648c2600e3c84a0c9cd58b7e05cd041aea383eb7f0b6e078bc425bbedd4a29d09e095e0e44d4778d6f5733581c29231833871ee121aa2c09e44bbd3c3b8411643b67b86494859623d9d135aad0153949af237eab32f50e9cae3a6c30b2c873a5416e2c9d3cf00cc03f29cacf723f9340810c632db0801a8d8de3b7ac08f6313800f7fe501a5ec92b28bd06731fa1b95023fb635c02aa6822d88a28d595068603def2116fc0405e6d936e327364f78329f194e1d9651d7bb607908089eb25d9dec4e56991f4850a32843f10a245d2c71b58e5b5954e75a00e276b03237b23e9ec3ff258c501710e1f7bc4a03b88754ea03d84adf76b0f5e20f3fe76b5fce6eb355941a2875e2ed797069dc9f4ea3659b55fa3eeba496a153befa37fcf3004a6502717f61754854855f7b3e6b7782099603754f201bd1f49355974bb4276c70a59593e44733cb1b5c99964d4ff89611a55a1d82a91b8ae03ca4a3362cadd29ce9207c9c836f989c09b590f5f070becff4c35b318a974a923216385b6b57808ab3fea3bdf6f17ac0e4e1bc0f18473bc97a89ce5358a8c4fa04859a915f15f9a06725c77517ea112ebad0a4913af1080700b8f700af9fee59c3067ba30fbeb995b0b88eb59dbd45a1971240f15fb40e0a1084c482a01bc773559b6b8e83bdb4ffb70df25cc30212e8f22c09abb514f8152bd1affa3c7856c90bdf8b4024a1a8af3d70c3de23999f36834659eeca8bf225e16f0185409609ae8ea5d861794481cfa5b75a275d9294543c4a257f3dfdfce9c91e46468b2235bb161850bcaf76fa405dccf9918a0e2903ffa5433412ff09ba73d3c3c342525c9f653feec2d5b1596d2b8e79612d913e2c371384d1376f56a2cc9268d9c82e80567f1f27434aef775163a8b162801bef77f299c58a3363df141c63e86c717a8091d7a079afdab2835b11be5f216116018d70b0512747a066abdeea688f82d859a79a5cd2a839a907caf5469d2758d5120d4f9d7f4445f0107645e63f6af7b9078842d034ec39337f17f01fbcc31ecc4feeba4588f567a6a467f8a7870c655683c46eb776853c0f1ec4c890cf408d2e3f808673eb455bb9f333a982e7f9f393a65dad51974b1a35fad8e8077a8ef3971bb823d6f9ab494868"""),
-                    TestUtils.hexDecode("""
-0C39B65F4C2094AC626652CD33CFE44EDB2667CF722443514CAB443DC398A8EA009277BE397E1C1E7ADCD1B24376AF0F19EA50E56C90D683F8EFDE693F0F8834199544E2DEFE392B0BD46048A83C412A14834C4BCDC180457456BC72AA28F2DB247AEE84A1C49266361DA7EDD54BD9B562889131EAADAE071AE5A671646F49B2C1359382F1A3B2A6B437F87CC99A2A1BC821E1F3DBB311B8FCDF28546A479E2F9970870066A2D6447B6CE4FB65ABE7423910B9039EE3234836F924C8E82E1299335E27B0DD642B812480D6FEFC47B121A710827DE1D18DC12064649224FBC4526AE14317CC8E53BC8E9BD42BA444AD9B8B48C3AC807D7A7675F43E3021BA1DF9AC7A42A9E23D696BBD03FB5C4702B55F95854C41F470CDAD8A255436F910C089F71C2E59A44221D78AB81D4E2B059CC92A3841E1431415DAD4E6EB0315F423DA512661E4CCE098D6678F560A4BA19475296A2A1DEB12AF5900FA3A3C188867E0C268EFBF7AC53455552DF4F36E16D50E23048C7DD4E64341E6DCAA0036EE045B82C42121B0B779B5E7FF032F549536ABFB702B1CE4EAA5E389A077F47B1B55595D4888A4C1D17F4E21706779C9CDE25DD1261C8B4761A40B69E2F22F069A264E79CDFD36F307D117FC737D88F50EC67CD07D8FA269CF265A7E7CAC93E97BC29EF95C88904AB2DB61C8865A6EBB23871576DBABC83920AA015D47E8CE699A9E57E139AB7D233C577B46C9C314D084A1674A152D87D2A3D8A5D9ABCDA22E212B8C9A2BF25D8AD22AA3627E6C12C684AD2BE917F094263982D396364F4DE0BAFAB2DB89997DAF8B7E3AA953C055776FDC29F8AE5C28D4071534A9A2E9090CD3F723D3E381A2ADA6D9463FC49B3C6D2B76803F5C21D8DDCE965D2C472389D2BEFF448F2D81EDEF1C851A863AF66B64417BCC2CBBC70C18875055D171BE32C06081362FFF7DE8F8A23B076839602E2368CEEB79E4EA53F42F440D167A902A23ED53E6691AD3332DF5B0160EBC3B5C9567CF619BE2201447EA500332ABDEA9B849C3A395F596F2C96ACD9AF8313E453277B9F4234874E791E9DCFF0C9D9DFA8FA9474C026DD34E5CF3AA10CAB1FD23EA5DA0D0A66E520096C6116944F2E5747A974BF55428A3D2475F6276490AADA25220F2F2111892DB9E9C75A5401BADBF69F31B77535044DC50B1E93849F19C0B6C5184F1B14F68960F9F469805F3843198AC68E51619F3D712A34279AEA27BE4357A99C44C456BD2D9319147285680922B98DBC4D6D2860515D1371D2141C7A1E76EEF8586AFC973713EB89C1F09A84AC064BB7644625224FF1F7316B9DD1091CEB151D1A040F7E60F202728F7862589E7F1FA32D39653383F90C67D96D9949967AF234592903CBB968E0D979B92B5C69D09EF4E767741F1F6E361DCFC8D751CB8C3BAAC4CC393D63F71AA1488491CA06CC20B0BF54C5C225B6F0825677C2C40A395E1B7322288A815E59AD2999D61FE09C95828CE18B2997AEDCED56CA8BCDA4343B1E948256AC5EBDA23A8E6D7102A4474CE23567084547F2ADD9DE77483398D81A9A9C7A573D7EDAF99536D31C3588BB649EFE1495CEDED788EBBFD5775842D91DAAA2F9BE08D63B06DB35E72CD0EE5DBF45DF9B0CA682BD944A733D6875A62F8C53A3FA9337F13429FACB288C73220C29285B2D87DF2CB1A54631AF3D0035C1F3B26A5EDD07760A63576A395827F3D5F9B03D9E47A9E1E6A271021942648B8424234080492BBC56C692C769B5DF32A75F7403C88469E54432A37A895E3CAD3AB110089ACF534A0D78C2083CFE149A2D0A5055EF9F4C943CBE1FD393292518CECFC57E4FFC4D07A563A30528A6A3540636A3BE770B7CF03F5004D7C6F8ADA08DEAAED0422AC0C0C8D7515C9F8BF44195D6DC30D9B3036DA007A910BD05DF06B032812CE8393AE2777D717A691D07E860C1EDA60F6DE31F0787097D0D483E3A51CA7997646503738CDBAEBCC21AE4B984B668FB4020C139D9F581EBACB7BE263A33955DD68C9ED9BD2DD6C0A7BD049972B624CB7E787DE7184023F33EC0A1539C4679D6B4677FB971D763BE17D989FDF8C0AC4E0B5A6CB40A49B5464610A110EBEE9A21BB0D6A2F043015EB2C8820DD966A13EFD18D32367834D41E8673E997B2803638A710580CA08DDB4D90E4E8EE584BCA2FB853A122274142130A1ABCDF7DA6C0056689195099CC3382AF6987BA47EE294353674E7295ACC1C070F1D8E4107AA7189F20CC818F1D86F6D646CEE911B304E2FECD5A14CF5F36331AA86E10C319C96E52996D4CC12810AD7C1DD1DBDFDC78DF029BFDE9E8F9B1FC7D9DA99FBB0304A8129EC58A82177EECB7330E715BB3C0B4482923C7B1EC0D1823FF643014C7D08A8F2D9F9090B0F83663AFC5E601E5FBE1DDBE678B9D93C5A23F564B8A4DD29C8D19106747959E72AFA4B16B879E3C6E7F79A212A144F9AAF665253F1360ACF7DF37642270656583E06FAC85389A3AD76E69BC2735B1C3E13B80CCBD298EE25C29F9F5C275AAD83BA0E7C47526253BB3125EBDF5CCD6E1C4F9D9CD4891167BB4E4D2AA644D5D362C6F790E2776BDBAF8D96DC3A543C72ED46E431FABD737B4BF0F4B32E12E0520E60401CCEBBB40180985948045C58B0017C3D8797E433A2E2C64B9679EC7409D59B3992053EEF2ACD7B152E5F564196876EA0A31CB6ED47F2455BBEE6827D96C6B99E46F3DF1FA21F593E842B26E83D843118F6833BC273E12C7224E00E840B0041544893C6C8A06523DEDE2ACE7365693BCC6A8D7DD81B01310CBB8084C5FD3868539F8B5179519CA6745B56C4A5EEE8F2A8A60CBC7453E1E0990D176446D97F34A2D0BD5C5712E2D82601D0B9FC9A3F2420C65E4532DB3810FBE3635B2AC3A84415535FE41208B907EB3E97AD63DDC4FD694127EF1E948801B5CF651119CE17BEAE3396C098A86548B67DDABADCEEDF60F57D2941815778AC14F78C78516F84C5F9749B433DB97A9283A94697419CF94248B6819D9310324977D47A133AE9F1FC141B56D6302817761BBD52B4A1EF808E0AC761426C99E0504ACB6B552F9550D55DE787C12A0409A9F9EE3674617D15E229AAA98BBF4FE49CDC81DA3AD110645132B332B6D2AA38B35320925135BDD225053D6594E78389909E596C63B85DCA8B3F6C3233A31A1F8F3E900E49DF83F649E592979C9CA4BE65E7D6D1F23A7744626972D52B07B7B89CD90238A5E871666F4CA6DAFCBF34FE15983AEA5BB7F9917736F7BA46F342F0C08F56D19AB9569FD23288EBCBEE7B5924B8C86EF77748F3AA9CF2FB884398F83772C9771958B6DD063162A3AAA42E6A3280FEDEEB7A628A07702950975CD135D6338FF959ADDA2296B3E85A024F63D4ED8A5859786E2BC76C2325F37B4D91EE8B64F30E781BF48ADA774C1641CFAD2D63A59E294B5D99C94108154E38B499E3CA2A29AF7CC77A8BB3A3B712376CD081715EA715305C18B51470D5F3A6A82E9189848311511E8B0ABACF856312AE3916FBBCF6664523684D3C7ACE08D2345A3907C9C07183CB3E68C5EC3899A95430E278A72701E2355A4AF606DD8F8750F7F3682FB84290B2BE23BED99CA06D5E54190A5558C927C369C00C512342EFFC41618CA6F8FE6E3A38D1714FC44BF5679C1A49CD8BC8B28499602E277DC8832F738225920709799DE6961E0B4EC12397E7891AA772627F66F494AF719C55D056DCBF10E8E3DDF1B6C1BB2F0B2FA61949D1CA7D4E1F60EF836B086FF8C03A5916A14EB2670AF56264D7390761E6EB6F638D6FACF56B72A48F271ADE4541C8EFC91D15F69E0AA6B97EC0E9C0C3EF169E4A4DB1C1AF04762B98ECBD0DC374224D98FDF7788435BC154E1FB06C970A914C34DE52678F61ECC1969A2C5B1FF4D82E2C80CB543B4B7C9DB541229CC50CC6C448DC029CA24ECE635233C401D3715671BC75785DCFD929377AF5B65EC43EF45A9B00CC766695A4A5DE9A2E6582F7936B9FE7DBBA6762C41453683146F4ACFD809847F866DDF559972FE0C093EE7C9FAB3CAB0BC2BF8DA19466A96BBF2DD4859E2D1CE122A3CF16AAAA9A4708F72BBEBE285E1B794B2B9C7A699B36F39F033277E8B7BEAC3BC70A572556EE5C070A309D9D0BC35F4B6E55ECC91CE9AD273B0098F64E1327C85CCAEBBE67E8A118669653495D2FA09C29C6FCDF870905B2C8BE0DF806C29D5E7AFACDAC5F89116A3474D2229C76E649F99EB9EC71A2C229764A477853D68C39B8F0BF4378993AE2B26E814A337CFC103760CE92FB564E3A3E4546996CC4D8B6BE069E99861DA9C731B543BFDC006FBDE3B33D2C8C4A3F5789466122616C98F52E5E4BA239E0C3758C5BDD3BAED8809F67A70504BA061409A9D87A499236230EF0F1985DA0D765E9B7F733A154E8300490F458847A89E7C6BBEB7A9ECA7B6CBFFC3124DEDC1093C02C808DA1CDCFF5237745C5FFF51F3F15CF746D3397916A45990070490CA74A55F34EA4BA9EB73A281F123035C005BF6C7B30852665860ED13A2B5808F81435A77A8504B58CBA45559BD3BAA663A571F108685E414FC4DBF8033075E30CD6FCD9B893DA32F7C8D5D971D5EB417F1201B00F65DEF4EEED3B55B7FC7E6194B72A861439B865558157E65D4C2F8A1A93F48192099B375D111370F830B34EAF3225A16006D4749494B9AB9D3B05015E34866A4A2D94B9588A8DE8AD4CF90F2CF422634E8DBFA0FE3FAF27C3F3C2EAF9C1BDF23FDF43D196732E1FA6D2B343BB7D9F5F26FFC31B26C64A8EFE2B2D86AA34BB618FB58CCB54486211A8E66648CEAE52F07A6C1EB5234DA7CCAA971AF984D6050D1A81F10E6D19CC44B5E668CE92F4251924B25DAF41D5E381C3FAE4208D18F710B5F93CF3C776A3D81C608B06CE6BC68FB8A8117CE7BA065675B88510F2E8A440EC363A5983DDC1352E446A482C593A490AD6093258E447EF52BFD189ACD11C87A8B75F08B5D166C1DA69602EAA5916474131E20F704DF84C3FEF2AE99F9B9E8F7315A143A07C7AEDE5797F503086DF7DA971244A61909C4AFB00842FBF4C3A59B991B58AD6C0B8667C449F0D97F34CC41FE935D9F55821299F780359E2F631858617437D4AFE67DE4A1AA382B93CC3FF596726F0D1C071FD0E00883E9E03811FC659495AF2A62B45DA079A66552F2928B6A25C6416F8DECF723623764441E5E581F9B2E36479A1B6CB3DE9B090E3343277CD7F84E80219793CAED4945DF782C4B72B498A62A1F5362745662F711A7E47CB816EC7069D10CA8314845AB0C9FC326C5BCA0E2AFFB4E6948522F8CD9C8DC008855E592AEF1F8239748916878ABC493E33CCFFDB86CC2ADB99B6251F493F0D2A0BE56D133B66395AA695F6298F7F4BAB41420CA9B8CCEDF2719590287928CF6BB3A506D6678B814076B7A774BE9B7029DF9F4719AAC1D012BBD49EBCA6AF124D0AB5C5FFA92B4A895CB76B88DEA9C7105136D78B76D92079A5B001B214DDF7E140861D86ACC260B72ABEF2CB3A75C2BC87B39A9D9052D4283B71C10AE275474E82A5FEA1654EC3ECD468DE4A015CEB67BAE3275C2C79863E2883D46FAE351F0908F42825DC7D9FAE0FC7171791FCAB10E16F3F027E5043AACBDB1F05FCD2B3EC7F6F46AD6DCCD6F9E6A6AC702451194788D14261219F794EA195F2B3778654BB373C68AB4333E224D161A1F89FE440BD8E968B518EEA28E81B89E04FF1A85B879E4B54650FA8DD1322D14B4A87"""),
-                    TestUtils.hexDecode("""
-c2112c791ee26987cafdde1bc02fbb99d5b97ad71d4c75cc36cda559ba853a351b3088a5727856774fb3a100640034901b886b9aad882c879f7f7a50090b1b4372ef71a124563aaa22ed2b227f76c4c5ad691499766556691ac72d3ed717eb83c06951bc8ba4c8829b225aca7eddd999e9e6e9cfca939ba21d2f7f79c750f43719c520b344252a283cc677fcf1dc27a4dfb396541c97d7e948ab873640d1a1a0d941d2677878360eb2b703f727a00cff03547f5516d5e18b07d904e3d978a905c83b45a2a58f407a5778d6e6da955705f0e55931fb31a1b1be5196b6e80574b8e37022d4e7778bce58a817aeee7ce13c07196dfd6c00a6604e40f3d12a46c11bc6295788be5bcb2a39db2bd64780b966530496a23f9e60ab9c7a4a48a5cfc3b1f657e00aeb99eaf8ae38e723cd14191f927ebd7944da428584b23da5ada543d3c071cfe95910aecd65f7be88aa6c7bfb6e52ec3c925fcb0fa4b09d7612a8b19a4156f44d07c77eb229edc08d78b52ddb7bb3e42e95faa1b013d4861ce5166fbd0d0822baef9bb5d1f41956be5cd1efef4bd3f92beb656957c0ba51dfd4d186e4804b71e91bca6f3341ca585f0c48c3cd496a1f1736f513650fcae2379bd1d127641f1a92c0c394d2c02301d29116b3245ccfcb6ae3b55b29503a49fe6357d3f027a20c30528abe22623c53c73970090b12d994f1a69d5a9877ef15f3475cd1b9d58cc38a0289e12a09ff756c7e93bd675b2354d78ec79492051751db9b3f35a58eac539d4c6efb259de9383d5eea913c98a6daa6173b113f8d7bac440e1bc4652d1645b96c4e3ae6697c9e6e7a1332d27f28704b850cccf469f829a6aee604e0906d1b84fe104303cb9e187a19b9ef212dd334f134cdf6256dcdd39e91283e6d7f3f808fa5cebe6263fba31f766bd86fb271a524042d3b42b9d1e7729c00c6e4104eea77934fb44fbf7b22ad80eba63fcf1ac416429df3c012afd4f42984b8006e5ab52b94fca1f54fe91ddd2ba4f8366cf74597dc4c2fb1554c20ca28ca4262888d70f342b55916f6eb5a2e6df5a9d0299f2c15ca37f5cd688792a5c255e2f684035770cf4a8894b750f1f97f9c226f9c451ce0b5701a4486b9feabdd379ad31f1164706a137aa487a25c088882c282b5f67599f8f9488b3c1b0540cdd48ad57754d760880478b686914cc7cbb3f478baf3742382749edb287e867d5863fc40a5f57805d1a7006a2b45046698ce63bf85fde10d9171a618a10da3b20d97052fa9416e56ebbfc9b1cbacaafdbfdfecf18d23df346f6838d90d2f0a45aa650d08be2360ad8b3259541f86946fa047ba2cf05e9542e67307dff451a0bea83f3acd2a328f0e9a7c870dcb1b3ef6a387c208f5128951b4115aa4f58193844d54113a5d13cc6e58cc210cc4865613db00c6c515720de072a9fbc60dfb50f48fc9ee71072e14a2380b62d644dd49c7c8f5b30233434f56ebb4c00bc1106f2f7b89d6f4076480fd24857efaecb3a3921a3f9d9bb84353792bbc017ec91775660c21cc6b7c2c5b629258fe1655afda4bde38fb66d9f5b90e0f70419d06b38de8bf050e7278cc02b9b7d762dcd32245c9776da3fe15af5bde873bbfd1d84e8083a06ae1d030a7d32e9a50be599ed816e47b54ec7b686f5e8c55c8edb7d7f34302f343ae7027234205c8d3943244f91ea9c2e6f2f33fb56af3a0ccc1c101608275ffd7a18201a0cf3291320e8c1e397684c604dcb23953aac9cbd65fb8fa615dfe77dd2b7033195030b57e005e28f14b316e63c6a62d81fee131d3ae71734e90e3ca43c6516996fe169bc279e3b398e8ef8929760da3389b29c0e7139a2d889403b823b3361c310ab668167eed34f3ff6e32542619d7d5298bdf4c9e7b4849f0310f386faee38f5e94f5455ebbfce87a34fa93b808d5eac6a62b1fdc84d3895d8c78e211a7074c78262c24c5153234882a4bc043703d997a1b8ea707712ed46f6fb654758634d1591ee3d79804c8417ace22343bce4d0754f4e72e2f518bdcdff3bad1313b974f7f2b7100e6fdbf2fcc34f5eccddf570905659ace5cecd78ceb88f7fffa03bcdb71a77f975f3d13146422c765a228063cd9cc92f0031b8ba6796025ecd4caa8bab5c48b0e6f164739150ac00bbfba4ce69cd212debadd620242fd5610f3fab75e7a0eb587e4ccdd010fac040d8c0b71673f6a6165b188fb59293138048805ffaa283b9539b947efc6382c929295769bf9d5e434b9eac6d1b9ff9ac26c0a1d1f0efa3108401e4f522579e1bd504a64d1359e44fa59f4f33ac4cf3e7508aab3388cd5be219937185ef7459b9c565034c8d4920d5fc62080db0f0930630d14c285ca11e360705f8ca5786e394842230636241a461966252d634cba8f68e0fc398b4298f4ecc907f5a1fd9795e427e6de785d7bc87130d986b286afcc646723010b329e8cadbafe1a9ee23f8010fa6ae67d1bf950c5f0e6fd53d31ad52ca81dfc5225f61de691d868130bf71d6428474215c9d5236a796c29f983064a2c9f40e69efd090ba55c47313f13b52b5d9edb7206ceb0eaf57198f32a722f9a60400bf550d5ecbdb0e460c791c44e56a1301f6f6bf0d9c1ff04ef6d238c060bc10e75114f7d055b5c3c0ac2961ff42c1145a8505e5d6c53389f04b20d2cbdc56759b861c803897be3eebf932a4877b1c4a0b63c96ef9369445e48f4b0ac34bf1799075db6dbb7d18d28f15f58152b0e2e618fb4551a85f5d1613a0a908a2edbc40e4d7e9683ebf5f9f8879e415e070a8eb52c71ee5451f95f0d351c3013e160d55c1207883c8e6fc20a4aef495c4194a7bfc8afee6af3b82bbd0a32aeab5023169d0361a4449af7a19318d063e4f2ed690b28f5d0786bd6ce5f72b9a6e411d878abe616767fdae52cdac529eb07074ec518723f8f870666211bd427b5253a67e40a318563a8b2d8916a746fc47e3ce26103c437e07db67ef057bae6a953614ee7acd16532d0485ad02b4bec1b84302e1e28c41e508eac18f33f76c150c3142e1c383c28ed902dc79922749842efc4c91c75754ea5e0678a117612dfc7ea07025cfe2e4213780734c4f18e191cbd815619b41b0f2e9965499ae19666c4ea34dc1af69dd60dbbe78c6f462a20699b58f50682e9602e7f16580149797067d0ed1b0b36099a0c5732d64d1efc1f370d4c71a6e77c5d319571c3d9274444db155b11286edbb625b77d1294d6dce64ad7fe58a7808b7c9edf7699bbc0e0342dc74158ae419c01b64c07bafb6452f131bd0f889cc40419d3dfd9c7c4418a37763218498c29f19a0b0d2b3e404b525d707c8cb9ecedfd22303a597091a3c3cfd1f8fd1d252641799a9bb3c4c5c9cedee10e172b2c33393c5054777f9eb5d9e0efff000000000000000000000000000000000000000000000f1b293a""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-53a902d7abe3103058efce7d2beeea878d48063b6dc8aad68420073c43fa5173338893b842805ab8c6b94060698d44b066b008a8209d8ddb3c4c6c0b69ac78166bc97b52b4302e8fcb4a30d102f863b67cc332a2fd4d3f1858613b126a6416e528f2e7a0e12eb547acd956914391edfb42fba61dd2418ead4d0297336b75ce069e3621f5e729d2974afaf595291030a557f5256f63d08c0b475fd47a05299e29f4dd0aba10ecb6a473af5223445faf46c2d06c326d3e407061c4799f8eda4ee8a1958a16ca8a0b8f3cb8658c77429a459a67210cc325ef0b361a8e226ead6a8675f9f97be9556ff40817d169a95cf026b38afe7e28836fb14ebc9aff7c02254ab5256183312e450646885f6177110daa1675d2b2bbc722391b7e55e6d6e0dedaa772715dea46ad23e03d6b11000a187cf51f8ce5154883f80dcf200197b9b9bbd5fa870327e2d173f2ce1a43d89d7b75db2aed4d790e6e452584dd8f525a7d2e8375dc70d4a85520981d36e5378a429ebbbe858f8ce43d6a24623d7b145d29e9660b36b3ab1729b53806ba0fac817109448422f5a7bf366ce1f424ff8fa8be40855af63753ff59dd1063d39314a95f171c72c42a6a9870d09111f2ed626ede30e58074cfd938fe3eb334cc90d7ff7dfa03d6463597b2a882340ff39d018a698a16126e796e93eef162e215daa91c08106526dbfe79a7837743ca396777300f56c3e969757300f2627ecb95a0bbb553578a679652d0a2ad07efc2a55eb6f5baa7e992e6d9c2650970c6e93ca06293b7482416605b176571b1f516e0c9a2dad7fa54c0256f469e98cb1e82ece83bb4b70ee8750aab2927cba821d53f3425677ac92871d0926a2f1ecbc1dd194eb61b408acb43c712f825e153e1a996a833b199a9436384a2007678dfbc76083d51af71e032c42d4d8998a5c0ebcfc43b1a69f8b1c78c98fe57cf0d56a051fada6148d5ae7284a882ca1e912673b6b5df84fc9e6d8a76a7f57f6aef0ddc005e56bb35cd88597a15499cd55cae68ff75c43e4651d965037e4eba881adfafcabf85efb416d3df34f16372a30c83bcc56663a8439459883c6ea4776de4ae02c1f8e038525ee9a862aabd0b4465ab3c0e352ab5094ba58719c2373b3d34f11d1eb25ac268893fd511a49ca86fe7442cac88af7f2571c512817c3f324fe5a4cfda13a02659abe2c35c750abf9d39cde64b81987a177d9ba5c0759d264a1fa080b4681987bb5e5e04a3460a7c8bf230cb26fe9ddd6a97f633259affd1aafa54ccffb39e5da6241ed98a9e95d3388456e7342cfbc095dd2502456ea067dc640eb421b636fc6da7110ab35409ab52a8597f3bae8d34fcdce772c78293c2aa62c940d806dac0e67737e7480fcdd0c7a9ed9e98a7b1bb70c60df6546b5508c5dde0f75a744802ec5bf19fed717b2a878a80ae472e1895333532d7ed13810fa158cb66d93443a6baf8765db2a18e5fa35cf21001215e4ad365f10c38ee777e9cb38efc319ebe4eb106accfcd8182d9673233403f2b55cff98617a1b8be9cd65ab4c79704f082b7ca9f208177fe25a5d79cda75b4b5381b5ec55ddea73c5e837081e34aa68ac01a1412ac438ccd96f763845d58ea897ca67ced998934e310281c3a60c82140413fa130356a7d7974860ff08948bd955ff8b954a03a3d072fdbd1bc772e5a93ee4c9ff1ba44bf47a5e15de0c9746577a21e7e1c16e41c07780969d442ba5d95ceb93b05b9b5fd6993b090ecfd4b75f18d03fdd5589c830069cb32093aaa556f5a8bc49f1c0eab930899e60401ff4503d6aa56a09abdd37ad7b9536de631b0bd0b2d6eed874cd5774394560d0bdb1f5237b7d332bd"""),
-                    TestUtils.hexDecode("""
-214BC54C508E63F77B261DC59588A87CF95C233C22A339E7158C47931C1EFEF775EB3C91A32C56E888214F9F68D7CD2525B23F695871CF5EDC6979A677EC19CBC5859C63ADCE2E38C67CAEF20116508F33BE8035E9C47D124EEA5FD1651D64371451B6B96601E4A6E8292ED6841E483C3ADFC3DB242D1D7B3F036492741661F45232104A528B6FF79AA4630740BD16B37CD3E7C711B76A259C0845D6F87E4A4B306E939AD1C41022A7D5938E52B98485D95D11BE629263E6CDE20F63AE16CC2E32B6C1C442EF108D92495A759D3707AB6CF3ECC5AD7C02F133D689E252A26C014A31C65A65F079C622BE3B648496BC57C462051B17175FF81126B5BBB5324CCEAEDE0B5A8ECC0D710F04DC0C751318E8913F149E701AE0568B5426736288CAFECAB1779C7F4E96D9007635F76DEB4D379918447F30167F257B8BA825A50EE845FC4AF7C34AB200D5BF45B5F0405BE2347ACC814BCDC648C274C24F8024561FB66676534F1FC8041B63114679D9F4E8CB0BCD7BC4C54FBB4F9A178B4FCE64E705BF8FE42826EE01F691479A8815E2DA00111DE40B5CDE464A9F7A3D21BE9562FD9A5C5CB3F4F9E8F0D8D8A20B9A5AC9D7394AE4316181621B43D8220FDEDACE345234E3DFBA134BF54E458DBEF98923C1891CFB8DC9B5317E3B16C740EF373666969C95BD1C53F435D7ADE792FF9E310A191246154064D0E8F20032AF4823A335D88D5C2A943CD4CF313CF2999E237F6EC50F63936D0FF3F2C729FAF0232671C94785B67E0CF71A7CA5B32434579711EDF155D5BAEDEBBB8F0C6922AEB9798356714931AF1070C49BCA507E289F005BE9D8B46AA67CE2137935C7EFD192E4CC24DBC434B381E9A15CFC529D0064F057FC3AB592869E5F1AA5FCB299B2CCC0ED6750E318F6FC969E6A3A08059788102CCE79BC92804B1D08F3BA30492054DB6401EA251191BED1B8CD35DEA3A653D5D546D2EE8D31C2D88D6275D6C7B463D449DDAF586D5E57FFBC07ED5558D87F7DCA82E4ADF49EB9135A578468907BD8A6228EB723241D58BAF3C78C46451D2F11CA0552A05A85620001D376C6194AC6494E337388EA49821C233F32579FBAE6D11E9DB257C426D99516A16DA63A7BFA261F2B012CEE4EAF7C5C16C6331B79A26E79B1421371E574505F61D699C6DF33EA734ED14129608260B1233C387638F7ED3A34866D656D74F06C2B8D70AE60A0994F3D6C1267DCA2001EA781E5D6E17BECD284F967788227E060381ECC60A10832091319F225C972349BFEF08D4DD5298BF7EE11B693AAAC682F91DCDA113EFE0F35CFBAFF6C73DAE43B8C1124EB57713C122F0A5FB03D02C4128565FFAEADC0AC23DBE5BF123CBA024DC2F3956EBEEE95918B87D2EB22EB1A8ECC3B267528A62F2280E3DAEC02C89A01F5829B5891914DAC"""),
-                    TestUtils.hexDecode("""
-8ec19a12690fcc4af18b44a46b33caf661ff986315472e2fb9cbf0db6b11f596b5d540572ff4b722d39e5685205ae44f62645ecb6a4f319b1dff9c685f6bc65a311cdd61204bc23da3dbb96f71ecb3922ac19580212e57c121abe10baca724b0acec03dbb6de182f1bf5090131eb5ced5b8cede5444055d33838272afbf8a9d9752c0536f5b544dfd0f20d4994638157e64ff51ea35539244dfad50261f282ee2fbd5fe3b90607a4b2590cc24e67911927ada6cf9b03fd482df572e6cc7441b6129677f3d3d0c0f5e7212bbc652bf53140630bb0e3236d09943796ef92e7916a2c4fcde8c9af522d9661feb6dacacce83e14a6384afaface04e3c8c0febc6306445b84df88cd91f34235c7351048c0d75b6039a102bb0ef30f6e5fae78718be6412db19dbf7536e42b0e5efd950e764c6a80f70839d356f55d607ef58eb366a840706be8f79e8e2ba251063336c819ea3fc60ad76665cd7fc8ad9e404847e0a8ccd5aadf3fc36dd091972959e3de4a5c49bf799c97fe4ac5e993fccd03994e6afd1562a564b111c52860f564e1b335664d57de6fffe5cc93885bc34ac7d278dd28efb850f3e67e810285f47e170243454ac65a18807dca131c99be1f85e34c1c6c3bd3c1f2a13c0341ca961d871e92a2353d813c06396dd29b835971551cdd4d7fffce4d32facc1026b05ce3ac795d54db67983c5bf4aa269cce8470e535bb2555096769215d3df109e2e21b6ffeb6b7461481b80d4894300400851118abb4253b9b86c774522d544dc6c6c2a3c75ce8fb5c3ff2564b9a696ad05b228b8effdf6f54506e2afd2c284d3a988857e4aa22d9d90feef71eceb135f7d6e9462c7302acde68bbc9a813521293d515e8f36aa5ea94a7727837aca76c6fcab11013eb18921091002701166c586abac8f20770e6df05bc682a19c65dcbecc86bca8c85c9175d5f0fba67b33a383987e7483366793ba7b35942b3627a33c23a9172807b578b536fd0faa8c3d9f3d90b6bad5d2b582634b44f9ea81f3cde12ebcf48999d1da8651cbc89e87e0cc049c4d1efbe3eb625ef4e09c2f879ac1eb7e20ef58544332a50953643b02a73308cd481d0582b4edec16c4f31f8ad1ee6d3575ed3e318a8df9a0bf81eaf7bfc720268c1955033bd16fc652cf68ac5289488532665c4b584fcff68aa04b1d4ee55556973eff4d8713b2c3bb6dfe6614b9e6138ce9799ad65d824159e1cfc1519a741cce18ad822de048f19e01d40287494822393bd6d321b8ec3cfe0f402aabdf03743ed8343d442871a6a56821596144f9005f72f5bb36841975970caf6df22724959ff6c8b57049c88176f61bb1b08543d03a7c872b87ff2fb7a66ac64954feec8343f99dc5a84ef8c207033bb837bdeb64c5d4674014ec3ee792303ce5690f2d47d176037ba7ad21b8d4fa2b83d6bafce3cff48e12e12066be8ec16bb2127a26516afba6a87a1f7951ad2ba40b76a800e2c27aad75f883343ca988862a6dc4e481faea5a6dccc8fefcc79f4970bb831fc514cb993624cb7eab874af102ce5e06dbaf57d37cad159541791afb1a47f9c838db9168b27290633e0cef4446d8765ab5e70c7995d437d1128c0a3b0d5c6da7bb7b3e450574018687549eabb5122a89ebda3de0763497658f160fdf054042465eb25174609f26f4755a50d2df918dfec074aedfdf151645b73461d3eab7234aabe1d19ae9896029b57b44b90654666a2e8847d1aaab3b3525952eeb5f0f8cdbc8e3e54ebbf6be367d689e7140596ba674ba940baa5b9637c685f1a1228acd893478365ce039a0a67155eabc02ccfe8f7731d8ccf754cbfa512e604682bb1be083feb424114da3d7243498be28857f19468e5667f59625902b9cd228c366b684154a47acc23b03ff98dfe0c2d02502f6c5e7a5dd212722f5c06793b86d43494003e88818db45102e790ed30f20eac90be73df9b92f5064827fd43c9be4423f61c23dd661a6fd9856f41a2f65127d555e509919b17b0be2e27bb45b07e39482877651ab5e4222875a988a9f97a6dbf9cdccad27576426927153dc4310583c9bd8cf6fb5d50a2d2956986c7bfac0f552693355d8ce9c4dbf4dc5fd6523cf4d32ff62b4e8d9e281eca16ac706b3b737c0d2c977ce4cd4bb41e5e1e2cc16e63ee0c408713ce2831e68e271b52a86c2b8bd7a9d0fba9706a55a5b62ef3eb8a29c793f7a66e182ba4ea249a90ca8988c00396c2d858e3ad362076a97ebfe8d9870a339c0a12bf997b66ff5367b4591c8b0deff659c133e4f97740802a73fb1cc6bdb46b3f9cb31086efe81f62bc087786d1e984773aa976ac597537ff1b1e84991be89df4c1ec1e29a2d72c2dbc5449af5bb95090d1159d6b80e2c5936db148aecac22d39803cead75e78a05731f382b09b51b9a9b79ca9d5bb51b78e591bde312625e52b4ab6eaca92e95edde3baa07b8d12588c7bcd8c2ca4a7e6e5a776eca1168694da493e96fccfa6f68e25cd4d441a111d8de31a0914e19900b218ae50f21ae0659f8f8dbd7f301a061b80add0697f6201ffb0d8c6d42e3926dfd98897d967e928802c9ea3cc2d3c3b9e36b1a29e95fed603f46d990db7034d53159e5a5cd7a72f08e451b5d7dcbe0437a2f20ba5cb69046e218cd3a7b491d1eb47fbb22e2a3b103396bc7273c218bd0eac9f272e6d01a7ded0595b02694981cba45020c10aad67735d5772078099136786401282c850448fbf27e71c1233e5a992a47cda05c1946c6f3cc6cec3899dbd435a1d016b3c771153f44e46bf55fa7fb3c39d8fd1bc14244fb70d4a5b8823b39e449e4d5237e0d99e49e88a85813efd60296b8bdd24d27725f993850b2f66825b9c469f212d6ea131ad96a089350cb76f434e1d2054fc083571f857a36a93f0e6f5fb80ab74f9bef3c5bb7df3f47885f3d136acea283085b4080dbaa5b555faeee52948e6a5e0b0d7c202fd036108998704022d7361ec72a89ca5008f48d11814e8420b453ec202cd6ddbbdbfeaa03ebfbba50c508c5c1a81f6f4367a9f817c39613713c6ce439cca013e1b645854e10256f48ed38c50a7e4a76d01102782d433e612ece1aecc1f48ce45b1da41962c89e811e26895a4a953c38efb620d2285c05a99c27d8e02ff419924c99daad70827ba815c68b0165fd7c4b6ca77d3db1a61f8f95d2c5e93ed860f90abc418791dcd1f95f29f4a45a8bb637889c16c7bbea2ed4a87eb11d4c2d8a7ddc6a68d1f83b82f0d206ddaf76f796c21e0ba9dc3179e85dae4d7b3fa40da3c65c0d499b38362e179e8306b1361f3212b0df9001f325a747b808991969ea2a9b5c5d5def00b0f3139587d8890989ba5bfcbdde2e3e4e7eaf8fb162326354a53f0f2fb080c1c25474f5355627b868a9fa3babfca00000000000000000000000000000012273041""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-8786af4f2617911e937b31037e66d478136009c090bf4a971bc2f286aa31c2525c8f9b56e09a9fcf16fea34672f563b3155acf083bd828ebecf0efd3e39064b9711f3211e1f39634a3725df3096e7569d1ddcc691b199ca2c20e578ad772eff6cd0d68c97043e2530efc0b1905e48a3edfdb51afdf8a6b2742b63784aaf511e29bef9c39d5fc9b33aa61e95acf13a7109e8a92825f7fde5171ca31b0b22652f90325f96817697a661ffc0b42180be669d2065a0196a2a857bb7a3c79fda83533392b10b9aac11b0ea53aff7c323a7291fea59cd8df052f2d3b22fb268b8cce4e081bd2ff05c57f7434b09d26d222c012bfa3329da7d6fc00f69fb1c162ceb12e4b6af61ab58b0f8ecc0ac3aa1d87c84ed60afd0711c550a29fb13f4e9388dab0cc11eb0e2bec3da4a7e80aafd7f94443ace3ff4aff51c12b79dab5f05f736bcbe3dcc4675a5f339844671d623bc4964d6d771e1696ed85c5749f3b2c4face72cbe8b93d500dc6a056fedd1798f8b01798c317b5a977a4b9e79f8ade91aee8b73c0af3c06e9347b18d797c642303572e168848d60a84d3343fff120edc804fe79bb34065000e316bcbd0c925fa2487e8f10ec89cfb986206f1c6b2d6aaec470b2354df70dd5ecfc396f108b78e0475f2617ee65fab93080dc0eb31a0e12df889aeef18b97417ab5deea3215b238b2413f8d53b22a61388a5364c898eebcceeaacdeec1af995be8f32942797a9863a5ca675864f563616fe52b4c349360f4a9b823d0eeb22d3ae744306f84442e75586b6b1c1f9c205e805805f2055d4d7e836a957de5dce2677256a51b7ab6a30aaf660344c7c2927f180d231120dd9540c968da520105a524a2b141ffc96eb9039bee53da2cacaf5b9b5a750a95fe2b32aab89236a4eba885042c97c61cebbe18cbe34ce20792674be6e32e605b4b2e7461e1e7a95c67c59a7da8e8b0561164f4b8490bb7255ad58951bab2ea936e6446d115de213893d27ed1282304794fe889a6b7a523a051af7e577271ffd0a532e056f7c22b0899f8802868a2932f3d4b3697e769a406e0568fd3f3f371833a7c89cfd035536b766abb9351c2d3a09ab9abb6138f0cea3defb6001aef54314bcb1567cda06cb68565967765474ad31631d001312cbaa60ee16794e26e1c27bbbbf2bf6f2d08e48c0a910f3d79870d6de87feef4915e52f65ed6893d82e03a3c3c9f4d22deba3d9dd8cce4685f16e675d95e2e4254e46bb8d72c553f114ff041a1534b34ce7eb9bdeafbc3e1d3271ef774a8154ca31b068e89bcc41344be537226b57ffb5a7a4e3b905b377ecbe87be3aa51ea17e3eab7561e1b71f40709f9590e8b3fbfb8a89622b495a6356ac1a7d002bcf63ab4774db1ac1e257af66a6ac4175894d3b637d23aec12f57d1004b7a7a8df5766bc78a5ebbe1eb1ee9f84d496f83d6de920503d03e7310f401e6862e63f2b39dc2c899ac5e014a90e574f96c7abfe7a08475d34c4bd8053883a379f362a34cb062eef2a1b2207e50facfb47d97fc111dc887b23df7022186113aaa39caba060f58bed427107de9b05afaaac1fd09c5e86a799d975e3eea727082106b14516a06fc8fd4563c7f7255be155785d3f3ee486b15fcbe0d7feb27a0ef0468ccfc447fbe04e7d4cdc2a28ea98dd279689c1d5192c95db184c8bcd657c436387e816170d8f1b8d0fd970f3761539e29f2a41d73316c6a6ad5b6e1f59804237821a16800072f7bf113c7f874761874223412e533cd5f0d601e18792c17599e535a9accf340de625feee6680ad14b84f33efaa35ef3e57eb11b4fdaa855b91314ec966380e76ea352b4967f4c222dad5a9dbc456a9c"""),
-                    TestUtils.hexDecode("""
-E742D452F392CD3CE405908EB380CB0225A4725065AFCB0C91C5E4823471376E6424AB24D57FC4265B24DEF6CA73E28FE20468B6E26BCC9267AAD2B7B82960C3FB5A01960FAE078D5A54BB324232B6647C9DAB943533C865BABBD3DC0D1E7A1756212980D75F2C8E999DE9ABD1874E3A86DFD53340B6E424DAD9F53C3CA02B44FF8DB9906D3D4352D0EC4B1A57A33FAFF7107D38637AA410B196BD1BB1FD7AE4B7414E1037454A031839AEE4C796BA98F4A739B785E3854E9EF0D5B7415C8B7ED012B0123C335730C7021CE8C94200874EFE783D7C4BF768538A448E76120635217727C81D08976CE4B5027D4BD9D9E27E4BCA4791ADF6F8DACD1BD3A03BE5CA7F68C2A2247FD3184609EB7243D2366E5EE4C95CDD869DE41A4B47F021DE76CF27464F814837C648A7A7CE2F91104322BE3CB1160A0D10CFE90ADAEBC87BBF14387C8387F4F5AA10FBD469ED5587EEF537106CE0F3AF4CABCD4476F248C21D119523B680067B332A1CA4C657B9DE1360FD23ADE58C5538EFFC8902281FC7B5C12C22CC69E7EB18E5F6F8352B9E4935D06C96BAFD834934618D9E6B1F60292352D064A0EEAE80F7B721312FC1B6C58D68A96351431A8626CC117BE9DFA33A1625BAECF12CB1DE33BEDAD584A91546DC767D0E59764FDE3FC29052CCE23ED28CA5DA4507933C0A7702D9A1225A48B71FDE5D27B12FDFF16AC2802E3629E10D5FFC2FCC6135243A9E2F3E3867BAA0C0F0C77BAEEF9DCFBC723C7A2BCEDA39B53B415BC21A397F9A8C4DC580EC512DE4EE4E0870DF1C4FBABF4906E0CFB08863AF2A89949F8E0FF9385ACA3F588E05781C49DC563EE9E0C5D6FA512932B7F5568C1E0FF1C9492ECAA5465ABFE125B511723998C4071481BF1C53DECD59B440931AAC640D9F78B1B40EE46AC0A8FD18B4C8AADD734B0F03F02CAF6A7BFE3DAF100703BDFADA7DBB50ACE3D40A05AE6E87CEDC0B08C44796D7A63E8B5BC95D97E3EF706E1684E791D3B3A2BAE1E7A92FB70A33D896219E80751A41E16B506FF266C4BCB4346578BAA7732CA745BCB01988AADBCBBCC45C9FA3A5D38F3F8E04005AE777910032D992D5EF9DF2C0422548A980707050CAD9DE56BCE60EF74EAA4465EDE96B055999F81A2C9596A2B35C8AB3CBDDE9D26AED44527DEB9A2AF3BF6A853FA51DCCD913876A43DA3E0E2C5B42571101B7B930840B0AB64419E1043CF56AA3C2FEF5B39CB582971A5776F8FA9696CD9F67E9290E483E9BD1698E961E849A513608C3F20FF678EBE0C778C2A6DC1FD3AFFF89D646A1AB85F005AA14A0635E92191CD41A6A46CC283D2FCABACD2FA07B7E2FF97D17B36E0B222D39DC1EB61BAB8146F147579D02A87DA08AB4ACCEB32AE1C8CBBB0EE0D90A642BB76DEF4AC8C7E477888159824349EB075DF0BED236DA9B2826E67EFF220AC84AC99BE6EEB0DA904887E3A84E5208AF49BB31EAA1552EC79E5BA02458106B5A31D0AC8AF392A63947911400FE78F6C94B3F8E6B7C3B98F6548E7894EA22215C87E121441C53EED726AE26394C825517EF8A477A6DF33B5315C8DEE16ACCE76ECA60835390E65392B9FC5EB88EADBF336FE361D190ECBD0B35B22A6FE6A8D48466B5E70BB6C5FA515CD8672BFE70054038C5893E514E23B16C39198B37B06B21275C2994EDF7F9F921B320B39E29444E3D621F52C9FCE19049D403AFBF1C047C8B065543BF43A25817533A33DE6C866FE9D8A73B2CF7277CA0E8D78F4F104C5CE6FE2025992E26E49D4C49F0798278216453C00C78EA7BAC2BEE71E5273FA46044B4B5578EEBC2A9E42025A8A3526B11CEFFCFF47191109C56AE105CD70A04C3F4EC43E49346203347319D8986D15B3C4A49F02C02994D8798499DAF1E0ADB81A9AC79FE8EB55ABE2BD18EBE18A9E5F35D2F66B38CAD6F6EEBD29AEE054C05D6F0B5326CC5B86BB0FC7CDA720838593238A2FB24E0CC36DB193FB7FA66573B064497F771DB1D965953477FC28989AEA2CC004640524A6DE8270E8A5B12BFF87B3F63FBB7DA25337EE34E6E4EB45DE9A39BC9B95ED37A6A404ED2970F9C79A7C2953420732C496B855F19BBBC8ABCBABE1D26D5BA828EB060D7280046AB93979E0BF90B6F1C07CA70833BEC83DB41684F1842A23417B3BBA0A33D7AF7BAEEC14C9C96FDF30BD201C05AEC6D3D2F539D511FBB356DDF333409EC16411DC7255DF0791BD67892880A4DB082684BBCA8B7E55B421C17DF3B68720E907C1620B142C3382AE6E738F8943CD214A847A6439A682D62CF0AE8961B5F020E7126C5DD6258CA0E8F5711E5472A4C05ADFA9A6B8180B741F382090CD1C781F7CC7F23E041800F42B228C351AA21E4D916BA5D9C56CF8E9507065D729B7C3653A8BB062C0463BF0B97F13A1016BE4851F5A489081A2AB3D2AC2744008BA734ED38DA10F372D97EA0C278C709A23ABD4B07E91ACF6A6F2DB9AF7806820381845FFBDC4BD30A503A0F74F37748E3624BB2AA478210072FCA83AD1A43ACE9F2943AC1AB6CEDED67938AF921FF34F2DAD4F224EF7498BC450A67CA383A9DDA333073286A22B85570A11FE03F55119794BBE8B81EDF1966BCA5E363C15E8E8673C94E3396C9AEC28D110408DA5561296E2928C6C111A4826309F119E5456675AAF935A17E80C0BD82A9CAC2627D6FAEBEC9A928D33980A86ACDB35686306B57D466864A0320F21751FB0041BA0F4F1660774A519D3ADB304438C1709711B982EA84D1B193D026081A4663AE69C5E12C3E4A683FB356DCA618191B29290C5DB4AA6A069C3B8D61C8B7FDA779E1F34A5F62EB7DF5C563ECF1200D3FF499DD06C2BF44A2B4254318BC402EA3A047FDB3570EB40630CF1DF84D1E2BDF5449A1F65A9DEF76954B5814691C4C12BEB10A1C006189968F37A4B236D9EE0D39AC340852EC54AA64FE15E1A4433ED48153D23B2B648C8852F3E3AE485474AB2DFD58A7F0CE6691ED36818DEADC8973E6ED06AB841B0A915425D7B87E41E1E68B00BE2EB725C287FE575736F6E1AD2AAC61F02A3A00ABEB2C0FCDB35564E8446C776E980636D5D61740AB2F0736A021D82C1D66864E5DFA98C4648CFBD9C7AA865F6C97038656C9C8767898FB43B0919BC98C1D0F6FA4D90F711E5D009D4C8FD8A773B7C73CEA654A2CD52A276C6CB62265294869A052FA1634D3EDEBA1F69DA09F0568F9D2F6C511F6BD6169BA0DE25F09FFF63AED2FDD0F6D89BD01FC5B088D3EE5344FCCC0215B6436987D6167A0F2D5EA47A984DC86D45534BAF35129488F3BC2D05BFFB84A51A87A1774033244277D0F2B45EA43500F4034081711CAD67BAA9CB0A58E1D01013032EDD5EBC7095D4BCCBD28A5F32BEB685F7901BA7A839650023B0C908FF33B37D038162FB96EBA35C2919560267EE5A94035825938D168481D8E59813E20DD611E4E23D8D42C9DE1D2398CE3CCB3DE5CBC4BB16D555985F411EB5B56508C6F4E75621304DBA2F4F1A2D8B2BEC5793478E5AA0DAE6F52C43253FE7BC91D3FBA84F8525D002CC307CAFA20BF198BD8F28CB579960A1168A1D26340C8E26CEF1261F23E97B806E9F27BB51F16102527721BE0E8B930A1ACC38F0A63EA1F3FBCEA1031E441FEF4D3746EAA37B7D4F8AB354D5F079E56FF4446333C8B8B7B589CB36DF40EBC5A75D2237F3FB874E7E0FF1B96DE43BCF229DE1FED3FB6D01752B3271E1F98D4134114911BFAC8351E3186E90DA3DE2E7FBBD305C822FE6F06ED1D4774D7A66DCA0CBF740DC277C62FA641ECAFBCBE359A28FEC48D62E1D3B6215392C0F8DB601E35A6CBD978567E806168A9F5B4915A80DE405038C4A370D898ED6441F727985037A040163F14DA78378931D3B96BA486958AE8902C98BE75BD0AED53CFB609923C63615917EF0BC6D07CD183192DE3854133F701B9D4B499F958064ADAABF4080C4A019DF1E5B98C8CA265E031B8CEC355C8FFC3BE16DC3D01533ED17C9769365D023CE7F0384D40F7B6179612B5EC382982E244E2510B4831F2D53F26B142A33877961EF1F845370CE115CA5F0D2FD6926482BF3BA1AEF3212DDF36705A210D8076A4428C7F9CAC411DE590452C761028469947BEC31ADCBA229D8EA58755F2715AF6D51E581D2CAC4182557E6815BFBB84BDC54C9368764CC29AA9AB49EEC37364F85AEB3295E60CE6DB2639669F55CC49D7934BC8566AB5E207B33F29128868BCBC1DBDE1089317088EA3FE1D595376DAD3BDD156802F82B63CF4C5ADEF9A89D94493BA152F9F07A9E9CBF8D821F1D6CD602EC49B61AC4F7633EC810F3D01D4867B1F0F3021D70897593303CFA6B5A3BD0303AEC32105F854C3DBED373760DDEC9B9E8EC4AFDAD00FF2E5A05A0113522024B86F1AEE6F250AE3BF0AF1E6FB7DFA8E04E3F9D5C876731D9C33460FDC13CDCDD433B45A6BF17E98638C264DEDAC262BB03714E020F4576DCA85DFEEBD6D70E557DF9321A8AAC519C419CA20E33DA37C22047D4CF925AD67545D04300A42B22DAC098A912848302D830E06CE5BACCACEB6E9316F9B1DEEE271BC6AD9D74927CAE725CCAD0C596653731869E8071E23BF"""),
-                    TestUtils.hexDecode("""
-a99a8d52ee69a69d91581ac798a7b34cc594801ad2f15e8769de6761048ad79b7dfebfc6f97cb7694d14fc315c879de9029b2b5331f64ae72e36833d3e5bf3c4ab64b8ad225d7b17a146f4d15f05ff72a7ce975e6558d11e3dd0e24c5b8d81ecbf96c732ddc2af021f62ff48719eb70ecef5e65a3acd389afe3ebf1fd6bc218dacffe07c78ed1ea343b603e61d5af9f6399153572549b29f88139d08ac0899ef084a847ec0fa58d0ee3856dff6262fb2355873cfa1426eb3f80ab52d3f6cfac2bae2a1abb12a68e6476f7593f5e5694d541d7d09b02a39832450c80eb785fd1cc13b441a96f22910a886aaf3ff61df7ff9f079cebeeeee218495f5307da9ce916bd86698560f758896675af604a3bfc2721e8e3dd4bd6664950d7e8575a09d439ff54086efa2405dd362f03c6df688120573884b46e45970e65934b5baa1255d6344fb115ffb51aa25b1bcdee1020e754bcce521ef28bf26d7bdfa498a5a182ec8d202d7dd0c0926b71c12eb74ab4b541c822f399bb4f4a50411ff28784930e8c9a6e77afa420a958528d4848f6255067d19496a23b39b21b572158178fe1e4749b3292133ecedc0db2038fe2eac7ad1fe02f426af8391988e46bdc8b621e2c17704360decaf8d6ed08ca825b1b3b8ff95024f174949c7a6f9d8a4a079f2fab1fa0132c01f09b7f7abe7d6aadf9c53d58a97d270a1f9065b295b5c524f3bfa0de09ae02ea5b98ce4403418af601e5cc876b4f0c95ecb7c1b8bb2f72448f721d81c13cefb99106251d4f37e47dc57d9449b405a132d25a2f08ddd8dc77f0eb905d6f6eb0d0cce96b95068d669286c02f1cefdade77b3dbadfa7cb912c62279d0a4530cc5c52941b19de495e2a2a3713537b584b2f7b76e3952ead9ca20b7bc9bf26bd36176521f4347cc8b3c2553d37ee02066258dadf33306a2743917287c09ab07cef7bc4435d582e3cc2fe79c272d719f133e6e5ff1341cfc139257d5a7eb146327c03e897b9668567b6cd9fcb74711e73df074ee139a57229879b903e55a04c5c9fe9b6cf669998444b93963f85ac7176a3f021d7c9409d7ee827de8a11cdc431521c96ed22fa6f13759eb03687d997a25a9bd60800f3f534b3e9c9dba97206b7c2f326b34a087be1798866d1914e59c8eb2c77414be030f8dc270c6ab76a6e1515fc70ce50c497364fc55f0ee4f49d3d22a08c6b9348042d904ec2f8862ccf5ee0b3d22d2f1a99579d35a916748ef608406883c53f18ef4caeddcd780e4a44c872bf2dca063aa11cc715e23cd996e4e3874463a1b4711bbcdc2418e4df10667930cbc7af5ed9b629ed452c240e02b58ef61ee4f1429a6d9aa57471781887f2e1890e70f7589f8d8b4e5ad223ba9d0f73d3ec74d8249b82596c8ec733881fdd0c96d2455ff5e340298a5a6fc91cbbc1ea5a8a3908f6da6ccbec88756874de1518602557d2df30505dbdd6d59469a6f2bfd240aeab1099c350d6730892585c577936181bc9f7fa6ef3dbb0c1d39a082b1a35a86899cf26261927d52b373120225752792f02cd2f196b5540121c3f9c0fab27b44b9462f6396195e21f2e1f736095554de7221f3c9ba23b72b480852c86b179c0e4778441c3c5242d4feb9851165dad83804c7ce5d534dcf918d27ab36ea1faa48149307b95cc3bf51a6bca256f115e3c618b9787a21941b58ce52abe359eb1a5a19aaf67dd56950a6d0179637ed0ea5421b899325ba05a26771b9449ba0de0b3e674d62398e30363d1d885f424dbbc200af85c87d28ae8a3054d82d4be0196188089d180acc7197f07033cca984e20732e9029e832268ea405cadb00dd002e3506e621d3fa7b023454329abe1a48f7dc35730f5f352c25694eb2a0650f9505866d9013e8b88b19b0c5dc12ce799ce8de35caa4b6552f399f8a7b06bf1e5bea54092b504d9ce81fc3fa2a40dd9ba5a2b8711d02dc46ecc222b14655b151499f4b537260b6595a89703ff56ff4c976a4592dd53d12b6fa9a4a775acba17a1b3dcc5ec0a4e03db9c9402ef6380e62d7f76aacd613a482d31cc17a7ae99311a01916a3abffc336959a491995183f531ca9ed0af40131a28da068038649639155bd12b9d3a06238cd3c4b754905b56dcd52cd213a2ea369623f32ac7877e6150d0f5ee25de926829beda4ef67cd3c4323042aaf3deecaa4d404426f234fca778826dd3f29b007d369ff1a0af66ccbbcf20d9f33565b7ed745c160cbc5242c683588a67223d81409d77611cdce68a0478bc50422da24632852862319f20b446917557588d19d8add012137959e6791aa7ae19597a8a2f875bb8b78b17d6f5d5b10c1996414ffa08e698c7789343487a62a98474a39cac820ecb1a855dc825d1d7bb9c302f9945b4ef5ecf2e85d22fdb7f440018181ce3c71fd8a6493c7e0ac2d38ae115a018a3583eb45abb5542e66cf77587ae2e1da41ef8b98b2c2616f6b62d3e2c7e467955b0ab3431d1f5ab617adf90334d87b2c01e450c5750347c1c98fd4fd4109f13482e11e2a6ebc4a362d26c6ac9e4d112d18c1e90726a2042ea3d5543c33d32ac108dcc34999db8488895315f18fc0d359714eb6c10b0dd405f6baf03c0c7a3b89d6ec2593c317e359488ab2a1e85a722b2ccfeafcdca2e22718a17363634036af5aadae7bbe6f48ea36ae216b827aee084696c7094dfb6e4fa563b51cb1fe41f8e72db7cd527c363bb00bf8d22896f438ba637bb7fe64054d69b628254a4cdce5ad92f753cee7889c460af2fc4cb10ff6458bca2547193ee76e816a39880f48fd2e246b66efb3056cffc0d233a86307e13e7fe87e4b4c8408cf7bdcea51d189dda4c4cb4fa44b222e4d0ed51a18abf77b49fa0280dea06852e864431c1b4473e876e2fe4f00d423aaffac81b95f186467e409583252662a0761a63ac3511058b4b0028d0ad1b760994c98fd7ae64bbbcf8e615e416bf0c1a594c0fdc46f760d5dc394497cecbdbf06d7db93d2a711756a3534f7550dafa01954f291bbbb511b652b032eb00b804d654698127e2ef480c53f47efb10c949f50168b1d888c62c9bbc422dcd07ea4005d751dc31d374357c10af8991adba9e139e75e3367bd18c7e1ac9753b2241960999e6a0ab795c475f5a330baba955dd34fdeadc193d9a6ea7015b44a04d0d5fea544c140c2a419c86f89ea54e4cc2ed8830938b171514a189e5517949c94ab77a5e9521a38560f3bc4e389c7fcb0b49da3f037ad53f75a85c0fff2c43945bb3d3ad65a197c6db5fa9fe3c78293a2a499ab553af3756ddcca3892133c1ee40a7b73bd19262b33364c575e7492a5b0bcbfcacdcfe4e9ec0e264b4d52576c727d9a9da3a7d0d4e3fbff2137789499a3a5b6bac5d4d7dee0fe0317192e4144484d60626f767a7d8c99aab4bee60000000000000014263549""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-194345a0607b1df8fd01f58d30010604261e15d712806f9fb99d3dd6afc994a917dda45b8e4e58058632273a75c00a98e026389b18ba7bfb412cfb510a335d5f7bcf8c192d6e4e643404f1fba8094a76c16682fc7aa910a572be4500a034440dd666e6c1a4f0ec33c699720a44ea8ba52eaf34dab236ebdeff18516606215c8e8071d7f40443253752f9e7593c754ac2891a640633d6d0b1178ef8e52a40f840d78c972b3040eabe17b5d24f99c75b7b949ce2b4d00802b1b0c14c786483310ec86a6fa24d47283c8f3ac2033ba4745830b26751897e121a0b190befe243f034a40f43817308f9f4d37264e99f43c9a6e5ea7c5d03787a0f1e288dc24d93cd0354b32004c9891a11845d07dbabe68ed9505beeda51ce431b38a8fe8f1499b54116956dc11532c6598e0c87e7dd57422c0490f74cfa1d084d9893838b115b4241cd55ad6eb382b0c287d2135d8df9b5d026fdbb4bbba19fcaadb38e26c3d14f844e22f870026f7bea480eaff61bef74ca4d304a5b49974de22951f069744df5cfcb0b8d13d2a8e2682184d79bff6e492ddd04b51014b205a4814e2953f8c94b080b071209187678d9460dc1ae115c83e6e597035dc3578137d781d4ed549f8d66c855022069a86cc91f0ae27974cff924ea9c5e8032c4190a384f9e1eaecb7821497cb44c4bb411e107e6c507d23c877e6417fc313695c99bb71e7ff5c3f8a6093d08228b8342ae11fcb09fdaf38698b98895f519f5c87e754a4dfbbc70867661c5a6a8e6034f1b3153e779406eab5681f7697cb3b2e95f0473405b0126068963b74a08c5810310dd41058fb7180119b5138e44ef42a3debca1260b60c65daaa004616ca73d59bfcc24b18a96d72eea6dcfd018d3234278b56e398cc24367ad598cb1defadcc6e1949cb7894e7dde1e4012f432cd3d3d86e7a8ba4c96dc49002012655a11ddd17d4eab510d4dbceabc40c8bf2879e7e1fd5ae4d6d3d16840b026803e1e06116bbd74c3e3a864a2c72f4b758392377038fcf436fb83aae85c0e56676ed444248f0004d88cca4ecfb96fe1e4ad34e723a5d4a33ddd433c848cef1a65cc0bf8b16cea1bba4660af54555b48c4b1eb89d189419c2bc65b6681c1673d5998c2e51436080d3173229c84ad475b1552cbe0f937e60c4fadf3734683347216908e93cf2d41594a41b703fe7005c6bd7b1762d2ab3f0fe7e69dc5ec4f53e6460f7e924950584ee44fb3354edcf1f971f4c05c8a7be858f601d70435603f7487c9d7f51e4644aaef76e9748d8f2ed2ff6d03b4df231d63e563726eba99e549b5dd3cdc811093d255ce0b59b60e68d89c38bccbf5d37df816a286eeeea5eef12ed8e04f2222d71ae0fef9d901042b22131d7f788ab9d53a6f82f3c0fa46c9ee90d2b5d7187885fdbed61247cd44b80065a543f9806657f0e61d8e27050f817121270e7871c038377b97d3dbb26b6f935a0eb001eca6800cf4bddd0758373583e78e7cbb26db88ac874e4e183e7a0d7e4664bc573728744faa48d83c7f8fb56c06b91adb52c419f7d73446b9ac7c7c607bebb424b7a86a3a8ccc2aad419dbf7999163162facd2036ad2267e34293b710da6e6fa31b904fda337847b83f179a5936cfeecc03fe121964642d6245e63a4a5d264631d7b82278a4a689642fbcb9cfac6af2e9d81363fa46e1b71725779abd771eacfbf0d6d92e59d52b485203d568b2a6b55819a73bd129e939b1095770861a43d0f6cc44b53f50949c755c6b274612b611d5418bdb7753c337c48ef6ec49045644d875960beab7707ae7610c1382bffabefd20eef4c68eecd2c17f1bce375048b236ab98f1fe1db575475db6e1bb"""),
-                    TestUtils.hexDecode("""
-7EBAAFA6D04129716131907EAD0832AD490D09E97D865B4AFC5D6B0FFF4EDE6A52E961ED88DB60A325AFF2675DFCD6A87984884AFB8680DFA7378130E44F205398ED7B83B1AC32D2580570FD6603827E8E4F5E20A27758CE6D1299BAADB8A895AD586BDF7B64F8D7A52BC15455EEF240F22FE98CE4CEAC03CDF7E8A983D7FD1A59C5EC594474AE77DC43EE4E7B25C556BC1D91ABD2015B99B1AF5329DCD41B93793D791A44AF5D83DABB8E40675EB32120C57D9E6B7757D3E03008A2F788336B8355AD2E47E61B39BBFC2229D53BC9BA514BB20F3F9EE9266BC0015FE81980FDE5637B3018046DD3D4BC3D549EC394E190F1BB788619CFFF86C532B4B9F0F6F951C0ED691C59AB0CC438290E9D6FEC9E75BA4FDF12D2BED2CD988AC411310BFECBDAC48A61099CE0D0CE4B44EC9C97108A44E5C5EEC1D3154B4E72B8397CDB0F7D15AA358076E25B7F3EA1E6E80A214051C440EC4189137610450144641B1E71B5334F0DDCE9D5CA30274E0237E45B4D92D7D458ED9142CC23871E56411382CE40D9CA4358B417261C2E7E845637FD2E9B4357E7EA5F4A8076A7C2F40FF1F8AFABA5393512F690EABEBFB73811B974E57C2D473AC22E747A0EDD39E99FD6E5D3668F3DCA1C795CE27D1A155ED9595EAF9061CAF5C55F3EE97056AF6ED90E05D41E90926F69044746230C990118E4D0BE4C12F7A4AA0464F8FFA7CF64C07FEF171B2E43A917AAC2880675F929583E9040BA6FEEC8262002613AA91A2B8D4DBC1D36F23FA9248A2D3ADB1DC5AD669EA219D35DB17C9C25095AD7673445E59DA6CB2260C8FA57639D6BEC8AEE307BD9C96EEF00C93318DF7DFEED970DC1F61AC5C94D4086300D91199C90C95C1A24F7F1E4292A60AB67F30BA990D58C71002D3548A412276DBEF3984FAB312723880ED479080EEE2B636ADC75AD4423A6E0C5CEB7EDE528F871FAF21855C3164469B9EEB47B6D37CFE4222DCD0B9867B00BEE12C27590DD77C24FE640DDD34E9138E70D15F52E94F3874447CA5CEB48573ACFECA3554E2B76CEE4E31060BF132CED8AB953F0A280F7916810A107AB5BA66047FFF0003B1CF13BFEB77526265B98E54E76B891A89F3AC0ECDF71406674865A0936BC57F87B64424BFC8FDC41E471D951077C32B5AF960457E97CA05F3C378D94B60A9735E9EDCAA96E413FA391AA687FD07D9D021B1014CDF241E5460DB08D3B336DEB4CF0AACEA57E4DC6C464F698CFC2AD10CA72C102A25787E0B89249F63406A39A2A792B2DE04710C41DB36B55D2FA789004E593DECE9865771D8B16B5436A792FBAC9934852B1F55D518F9A07CFA56BCF488D61AE355D63BDC27DDED6A56154B8BA3AFA3EC9C01D6593C83C315527F5FC61BB169723346AB4075D09701789268EC1F02EC4A1CD8A5F2584E29F126B1ACBEEF660CBEF16A8E9FF9C0B542042EA76684F9D70F2E3F3C18606ADCB1D695112B129B301008EDD5E6121A8948E1165D350FF09647DCCF4A1F8605ACC750A0AA8319A6685153A7672B31A3DE785EB22E1D223D6271282AC18AEC83C760190799F082D7FB0F238F627271BE62AE5A36A34D65B5DEEAA12D6B14B59BD0C619D8D9A44238AEF1FF83C30118039E834F7716CD59E138E2ABEC2921D9FA92F6808A760031B2157103FD2EAE988AD6CA4F350F488261409FE91B5667A9A2EF1E226B8BFEDDEDB84ECF993E9A71220E0253D2C4B918C5521C7953FDFA00D50A32879FC0A68D2AAD13EE181DD47DB9E3D715574CB3D566BDF30209297B01A666DD7DBC5464F913599086AA2FC6C8541592CEFFA067B287EEDBF4C9B9D6CB23CE1DEED628935CB2D6B5CEFF3BC442B2BCBBEFE4AECFC455A3A64FA117CFD9289FC27E6289750005877DBF64CD562E2E7D1C99830F5AE63C70685B3898D420862A8C4569F2CFDF564EEF4F94FC34CDFEDED8854855F3A4E52C612258DB5EE4D702BBA98B450D070264FF86A440129DA2C126978DAB3341C4079A66F9C23445C5938FA799E78F157656208BA7C7BC7F936AF49D11148856BA55910A6A736D32E0974E50BFA608975E37AC0601FDA7551204EA66F524DD03F44F5DA28EED5D126C32794F1CCE747DC1E9B1FE287CA607F81FE7C795C96569E66B2F3413DA810035D472B7F5AF74F9CC70306A8EC36F1383617D0FFD92F6DEFA7EFE91C840EDF24430B197802979752FD55A8CA85FD8D4FCE774F1CCC540F77C02E16F1494DF170CD8BA57A86BFB086349D53E8A62E1DBDE03369757EADB0E985A038B31DCBEF513D4FF9A3BA6E8338EDCECA7C3E9417F9E133BC399F2EC0C72E60E809F79D55FE1A917CBE28FEF19D6D08A43F74DF496EA9305072C90AE3BA0D21A1AC0BF040920D3F5B8703C12A32A6864382E9CEE8D00CF4F93830623E76197F7F52309824B08B8E0D5DAF5662A36981D50880FD3A8D73D24430A1CB201A9D0BDE656593B37B8EC47F235B5CA251249A04507DDB81F8E5E4E5E414B3750AB168BA51A8873E6ED153E302F61F7159B658E316D6D183575D87ECA30185CF72C67543CDB658AA07B1DB220032DF80D287E769E3253C80F43570AA538EEF49F45316E176F1F9411F3C085257C6B8C708DA7B924B792389A7EC34C7F778E6100333E8B9FAE75A4D1A32E306AEE36D29FC6823399FF37CDD0D11C8D03F14740342B736C4EFB5302C141A86C857309A70BD74DB6C7C29C839F8D86F2A136F67A0FB3A3749542A9DD8D4A062672C75B67D3BDC3FA6B56F3E79008AEF8D8E04CC7781B23D0DAED64CFD1A91DBBAA2C9C4E765FE2FDFE6E8533848E51FA027B86AB05A0530F15C1B7B6BBB268F09A7865E202B1645F8B4267CB1A49A2929410823AA9B834101E9EFFEAAF6E406639AF7D2710E60A84B6205339B0719E05BC6724FC2892A017AF86D80D361A7FEE8C284CB84F5F09B90CAADD49CFD396E6AC36052F5CCC8E7667CC762A9F173F837A231D57584A3BB19671B8B71907E415A1672475ADFA11998F94F28B00903AC551E651A3F9485DC0ABA3297E561E0B5A5786BAD9EC8169CBD706AFA60AE764BFE01EC514623BAC6C4100F707C5E8A02F4B0D6265502AE4170AC3EF95B49ED1A2BAEF56F63D5667C9FC0AF4C0A8648FB6AC5444EC8A1FAF4715027AC9F5987735D1AF7C55AF4C838FE9FC84FF71F929758DD52E2BD4A34237350642C0E641B6710A66C9C1EA1D9BDA80198FCC56D45D67C3511BAC0971AC9B6166633B1713A969B8DBC3CF60FCD6998137AD713EA3ADA84169D49FBB7F5CDE362ABEB0B71D022D9ACE7FF48C9EC1A7E0C72B564FD2C620272A482941443838D0506E2294B760AC9DED5404D3C4D2898315D3E3A82D2E944D537817B9901AFEC343B95F2844CDC4AAC3836E7713739F4201B95C42FB7C99AF8667628C1B60115BCB185754148B3C7226DF14B6DE1AB4C6043329B176C9DB9B1D73B3814FEB89E84A4C91C84993752B7AD30CC707A71339E8A277A5586BA85CD090F799A6B75523A62C6DF1549D787BD8722D1F26BC2C150D6A38951F3014B83DE665B21F5D9D97F2237333CC10A4114796D56D13D643364306E7445F475729602A11F8BEB002BDDF30E579E26F2BE4AE87DC666974E24FEF2462120B6CD8E79D65A2E80542A9240D4EE1F616326AA528E2A1282EF49F0312174B67D40FFCB1370BAC5D1444D75FBFFB6B0887F4573A8C4622082E1FE349B2C73CDC92592F684769FA7D7CE6FB5AEADF38023E51DA4EE3EDB10368442B218919341FAFB22EE80DA96A52434B184D499A4C49317C62F6D6DC9EC1413D01A1CC3DC8853444E52718798EA158A12B72AF023079E5E76F41AE685494E947618C4AB3036ECDC74F7A043230A0BE116F2B617818A2C94C54CFAC964C73BEF969591A3CB2B7DC9CFAC7B4F9B64AB70BD7FAEC138E42908BC90D6ADFFBC88EF473CA8CE7BC960C4B3EFFCAB92E8259CFAFA85EDB7832B3E630D6D2CF031B8CB570E38C101A56B426C654464228D152ABCC6DEB888DFFD7FFDA974E60CCC2AF7531F38A813E263D9B20DCCB50229E7D8F379F81A280CEB90B64BA3657F1E50381B468D0A6608A4B5E107C4736FB4CAA10FF3045C05453EE12A9FB0B79845E077803C69CDCBF7CCF7D6FE6067ED152F67023CAA6095D1748414580232007AB3426FB2889E1BCDDDBA539A2D79CA523A2CD1B1314C87502909DA849BA9B11F9104772BBA27410018348832B0BFDA4F09AF02B351927F2B6D29D9CA9F330266EC035908C9D4023CDF2343B177F57903D37AB89D0F9E23EB0C4100BC6421235CE5FF2729C2ADCAC24D1151757D8C6D6DE53DEBC38FE866142D1BB593974F4D3198C03DE4625F41BE3D488575B25007C2D5970BB152BC1C23E48A88036C070BD38604C5844E4205F1EF3D7FAC0B4B9FB51F229BA322D3355E458C27685130FCBDF591C0520626E5703A2E85871A62AF0CF2DA3468C401644656CCAB33B2402074C59A0EBB57928F548B5FA4871A8B2AF0BFD9A871A5C257044C17E4967B70D0DFB59F1345526FE59B4BD92A1C06B15E3A6226A4821FD614D8DF612A3D2DDB2DB67BAA3878C68C16645CC747BA9B366677541171A9264B89EE18D9D169D341629393C5526C28B24CD4CFCACEA9C42DB2B1CAFD7F906FC17CCE16612B1261E62E2A700CE74DE73174D3A1E06AA31AA05044EC324F026CD39F7B13399D9D86EEB53A6DE84914719EE31AFFEB630F3D8F08B4FFB10016209C13BA2158ECCB4B74BF04EFA73222554FF5EC49709F7F8DC1D40005E91245F3A5E2A00B9F64678B2D8A9E6BF1D011900D9D12F7F3BB023D1E5985BF78F8D6132AF5C0B9C330F361EDE00473DC9EE7469478FEC02670E8659B643B92C5546C32FE7B0AD816A5080B5E3867DC209EA15AEB4B14E42AD58F34CED65ECB3B519A54BC25117EF8D392A85C2895B5A4B73CF93077E360A828570FFA02ABA84D6534F3EE0C935D97D1D1CFABBC0D82E48937797FAB31704588605082A950CAA23D6569AB793FDC31BBA561E729E80979DAB84ACD4EE6B2CFE06D2EE8C4183D33B9F894C6865D9CD405C7665E0150B2B649159BE684839BD12CF0091614E1F821046238DC9F538F769FCE51E9B8DEC0E98442CABD3A4296F1D4331A16D33CA356B11E3DC13937F814D3D6281A746F054606DC52B737AA40422471139867624CC8E9C559BD25C7C6D7F902677A84BA63E8CB817820048C1C0ADB6288000EF2163B51ADD4D758D1C87FFD574354B41CA5AC72228A7E9E9E75BE9DB18FED47C32E3C561C972A67D50A560017BE794AB9BB6B50CFC43D2F6D57E8D73CAD6227C896BCD18E0D7087F57C365FB9EBF5864DFA4A13B6B5DD7FFFCB648C1E1FE40B6A10EC0C45C74504CF2105AD443DFAD1E306F720B9CC37B4A30198D3123FA9FB2A7A9DB3BDD98D441B03E0EE6A8180989E76CBC71B0E8607C3A9E5D20B6008B010702FC5D59847AFCE122F3FD4FB5D89D3A3331AEFB96B593F724C04885B574A43B5EAC70B543BD191BB818768C67A10AD6E2D62AA4C65FA373A19116AD86A4F9A97064E0C0BF80106DE6654B4A3945983B7DDF3AAF1E14A04F6D3035542B0F710352AFC20FEC78B61D8548B9669F10B3D6E531AD07A84C493264DD49759D95A6AFDBEA5AED1C7D7D2AE6D2FB6747151CB6A5C2F9C1AF5CEDBD9CDE8D5993ACF080A0008BABC759A9DF035C648609E610F226ED128E2656A057862246B65C70774B68F54D68073393B85110285FB463DFE394D9DA0AE85985FD6882EF5B11FAEF2BAC18F9D9D9B5CBF0F80AE7AC4418EA658D68B14BAC135452DF271DD3348BC338BC6C789ED95D5C5625762E4CAC6514866613E6D533AB9814B7C337260BF16716478401689F4079644DF4F734281C16164D19C4ABA20ACCCDC517EF42C19A5B1CAA4658C27B61902ABF88EFF0795D2C971608B0570E016CA0568CCA3F7B38FD3DF5608154A33C1F0D70C2AD0EBB134A8F475A8BBEC8408D3B9B0BFE8A6F10FD6C979B13C3EC73F191B788A79B4D07AC45172950689584C909247DC8A4CDD686186DEA16676851B8A7C311439149B1A963B0CC60E5395B56ADF27C25A51BB4A2FB19E14CE66B6D11781E89B3EC22CB854A12D46970D1A009AAD071C479D9C731770D666CDF0BCC381A3D328542F6371FC6F5FF7C4D3BB06186C048B2A3774EAAA3CCBA1342927B498F2195213326C9E393153BC8846AFE2120B8FF4A455B59AF6E65BC0CE9CA3502BE73D74B6CD12A760A9E0E0D26BD105FD993DD879539CD666CF2025DACD481A122627594CAD7C4FE30948412C1C6A160C358E16B6B67653418A22321DF5B1A9EA0DFC3C82DE3B8CB0F48EEFA7DD6188023D1B8B7632270E63AA38873A2C4472F9EF1E8DA56D5328C00548DDC4D9FD79115C5F6168AA98099BA1AAD606FB92F8D253C9A55773E5629E84350F3BC3B00D803E83CC2516C6C29476018ACFF2ACF61584A175E67EB8952885772E6C2D7F9C2B79C8B2F2A77C73C8B0230F080DE716B2A13DBA5FDC8648F17573A2898E72B8850997B6085F98523F00516DC7A90B9C2701BDDFE505A6C330D1118AFABC731A1DEAB813AA0E17708122C0069FB61A02FF6D5EFDA990A23E1D42C520CF1975FF06F123E1AC0B0A86FE666F8843C406F5F1E1A36FBB7A0B41CC641EB49416D6F0AB03CAA6AC0CE3A3DD1977B4D16EA33CF75A37A6092003D097D0ED8FAEE89F761B40F7E600FD502887AD90BE4BA311B9F4CD9D348DF230A2EACBA3FC356B506ED8C357E228970A948FC4983AC3ED9C3ACC22FBFF56783A73231F7E0B91DFED20E754ACE7DDDDDCEFCCF3ACC76554C269D634DC228B38C284AA35C00487D7873C8CFE8E8657726FA845863719FCE5A9E32406E2191B791F76DA035A4C862176040DA9AC0F37E66FB84DF89CAAAE9D8804824725FEDB95E5380DC66CC72BBCA1E131E6B785EA2B2B4A05BDAE01B22C3D47CA85092802A8EAC42E963A62307476FCF94ED7EBE5538A8C6F28A6C65914CF48299D3BA2B89B3008D29CD874B79A72AB840815827566E50627C2C332B1BC60060BF2FDA320FB040FD14D52CA59B24E325B5783BA1BDA3B27415C9DBDAA01562466322706CDCD0307C3305DB08D2663C57F6D3307E1C73832F8CA712402C7402EFEE0F1BD77CDA08F5F6582540D34F1B2809F84EB2F540558EF9ED46D5C636C45856AE57FD9E4650359635BE72028D1CD37CD876E0DC598E360CAA1DCD1F9F2BB4CA27CDE012980080E91B1C7376622907BA6674F1EB9E80148E6A959EC74950A2B934D42B84D739F1DA528F5C6E1C90A238E5167041D4E9AE5352B74C89DAE368778A90170461ECC0D6B6C6C53CE36745A72F79AAA1C82D494BD89D719800A89127BC3FD55247C1A29FB8387F1E3576E0C45F4D327C0B24A75FE25EC6147C890F25E50AB3C43B94F451E5B5D67F8D3BAAAEA1FE211FCE8622600400F73C1398459EA7FC59D02582C2806D01023D84BB50E99AE9ACC217B7223EDAD956FE155152E7F35B2AEE1535885EC048C6E0C50D395B0F1C9D767048E9D2DA7F15BDE192C923F1C74ACE06600628602D1B0189FCADE0873880EE8544AF3E29314E2B5DF87BEB5A50ED72FDC093800B12CB2F870304289A73A65D7E2384EF3A388EA9F0013B2B5C92149E2538542D95FF020A23E976A7DB3E2C9913D87D6EFF12BB51EE298F1D2CFF18FDBAEF56B70CBA35EB9273F1E58A6CD38F1E682A759FDF8D8BFF60E7CBEA948E25DF0114BEBD4AF13E4E0D4E7C9EAAC2C5F579A1AB14E7FECF9E13F20DF873F8D0E090905D32C8F8C0033F5D8E9F1B9FF17EE04FE3656EB66F5E4777B60B047DAB9BDD883EAC31A6455D1719CB475D1715CA0D12762F94AE78CF3C8EE90E55E71D0AA4EBA6216A0E81566F7813E7759BED30860BF22178407783B9A8AAC30CB4D53AF140E33A47ABD60F33EE700C323277E751E5B32B221E4B9815FDCD400DC544DF845619FD733F164937144FC3D89D8186F8B898418459811B3E66796DE51D1373B248A9B3B9609FEA374784A33989FE9F5BB26D2148F7282E09C35E13295D90BBC7795DD72CDD4955E9D148BC779AEE9C7992BB85D8EAFD102FD690F2C679CB7003FC4E182678320738361C361747F49AC6149CF4CDA4B80581844F5EE4818BF61750047C35A4B10697892A80F07E946F357574527FD2D0187873BCE78EC99062C70CB4ABB72A104A770CD7ADBD20894E7BCE2874E45302DC0BCB9645EF28136F36E7B179BD003D5DFA68A572BEEBD40EB9AC1F9228C74A788671BBF4781AA31C7F8699813F32EA8B60414C3ECB894DC7B01E50924482E5C068F0BCA79BAD9F469770FBFCB3942D1A3E54250E87B3693329479217514A8D7B734D256C5D28EF854FC3F234BC671F5225B1DCC20E590D8E5D09C07B22EF0A89A5B863C2E652CC0B1623579541C63CE9C2C4F66BC43323D7000BBF2923F5B8A76933FAF950D2172C1D90F522301D9A0C22F470EB8673CDA0A1B494FD7EE9AC1B4597B2DBC26FEE33A08CDF91E3C59BA4F93E02D010FE3F1C1FCD694F05B7A8FD32D8E7CBC2934A25C481D9C58FED7E0AF3AAB527D6DEF43D53756F0C95B2B58A426F7F61D09F4FBE55D9AF053B92818ED9FEF1CB41FB5CA23AC85B0241900F73971558116C5809F565F71333713EF5BE87B0AC95364C9FAA80DBB9EA84B5A5790D20343141093F86942817D195ED8DF4A2DFC7F7090CA3DB46A92AABEEAE2D7DD8B9110F23A89E4FA7B5A1DA27D643BB879888A2238E221E2F67D9DF58E73C46023FB7E999059D3B81FB753B2AD333207873831AE42FAD8092AA04C0E4103B1CE0DCBD6B06CC2F0AB37CD1D10EC4C83428CDEF84041D12BF9ABEA5C80050A853CC73FFF3076BEE68078737F6EF483F486215118C640790D0CFB4C6E5243691FB73B1294E0D3A494A4A538B94FDD2746193D9FEA24C1C04F5B20D2D40B638CB932C35D953A9D31260B76DA878FD52EDED058D1DEFD9CE214D14C3112FAB00B7F2DC88F7EBCF79EEB1C9C8607D6919B8D32CC8416E2B981C141198DD9884DC3927EB0192B6361AB556EB3977E5E242E5E26BA60BD42892F46F3F2DF684D0D9FB41BE42C04F0C248938AC79F110075B42181DAE62801DF76AAB50AEDABF4361C0EC597F31245B0390CE2629DB933E450E09DD39E6A1B644B0FF672B52ACE2AF52780D3F6505551F52045028C4DEE6D1C6A34BCD5E95E9DE1BCE849643BD07E0E6FAF8B27504F859D73BDFC07FD2034595AAD85A9DD9AA5B3A72346D6F3C4B21C4CFFAD8247C8CAF0DD9A708E11450502BF3C28EEEDCB0E1D32D3EF1A3F6237E34C0E4D0222F496839B7374EBB7D786973E85392AA8FF2A9901D076DD4C65635286276698DD4388F867D1ED18650FEDA9B03C80A3B5BD0AB3A62A45ABECFD55898BDAFBA58137D4BE29EEE8B3B3D1C4467B63DBA1EFEF2C81CDE7CFB101B1E65084A0E92955690C8CDE6F93E23FD79B76DB475CD24DD92A7504510F8DC3B22EBCD0288B4E479F8DD835297B196531D2DC759364306EB6780FEF31C9E34142B55988F81312B310093F77CB89C6E819A7CD3450D0790CB7B5E33A3E5E51DF05A3BFEF63320CFF072D450D71E7239AB24E4D83A8E8E501A5BDBB041219E15517B15EEE237836672A761D36D11EC973BAF65320B368906392E2689A9936752563172B3A5ADD90066E01EB394C77E40D57553B883F446C42EBB9CCB47FA56816B06AAEB62C21C8F57F926420AB7C1D5E97E73F024C259011CD585C23D30F99D22197B569D67BF5965887AECF553A9B48DCA0C418778AAD65D4843221B8217D2D61BA5A46C4F9FF5B00B78CFA8B6496007A1444503DFB8D7CDE7A63D5D7F54EE5823A33EB3A155C20F0011304068CE0385A09170606FF6895A6955C211AEF5D13BB93866C9CF00A911A4A50A59133113A9C7DC53409097808A6D0DC44A7776B41A7A43818C77CB51F3E20107F080F6682D90399853104B8F3AC4DE8521048B22BCA58B5F7B5EB3E3503F638C1FD24568F23EC8C59A3359A5C9CED0305B1B81677E20EA35F9E896E665D3CBBCB6155E1B0539A0B26BF95396DB8548124519B71BEC19A17DFD4AA2A2E134BEFDCA352B01E1255A12377D811FAED7809C9B881B24C185F1D1273F405F5BE82FED08F26E6C11D39A604E88A1EDFAC8AD3DA9FE8B1111C7E038A14CE58B9598AAE96B7BE84C153A9B26993CECB1CE931E0CBAD5F7F6C18B68E14E83A6BCFA33AD2B3A707118D56803A1E55CAC8AA93EBC47F9EFB"""),
-                    TestUtils.hexDecode("""
-551742a530ae4d15d68f1e222c8865e6fa59541a5e4b6e137197b52a5cb84548c099c3328b28865c34e90095e8959c65f68d8e4ef9e9cab97590736dac647c93cdec474c3e6d1c934e2eea593479349b6e56b95dc356cab1e2a2a7a94dd6490d9a186879ab75f16e0bb792863a7a8a19ed88d74d22f7c17f3b55b4d6440fffd4c24d814d3c09cd80b3d3d137882439f628337061253522775d68c1072b8df9403ff65679d24b06f1a2779ed76ca3ce153c264a06cf04948eece4f06243f22898bc815a90344479a8edbee87d0c5473474b1b588006f6dce5be82c7bcc2db7b50fab4c2cf06eefed93110aa634f6691e9b757aa8a01ca52912040a3ca6cd6f9c596eedc0a9d49f1bbee32eceb2374336f07e74b425d6a894f8c3e49a255068d08ddff453dff688f9c74a2be872e2a205018fb3e0149113ce438a7b83e60f536ac616d748fb2c590f3ec7e4c81629a4fbd993ced51995432cb8b3778f7d4e375fa54c9511e8e97323ac021b7cb2184bcce98f87a2712740ea1bf33670c4a718b475b31249ddc1a9c2b216efa7b5bc01f792cdcbd07f3e7719f71b81c3a31d8cfb7dc07efa06e0740743c9bc515c0983c845b1c7b2cfe7745c8d0e6967156cd36e88c8e3eaeb3c96ede6f94a53eb05abbd3ce8abb9f4d2c350969a8d5fdd673188cf5f8da51704b7390d8de842a18f5d900da6f0de22b9b4836947acd4d49de53e6bf96295c3f89a01070fa3742ca5070b56afd534fd4bcc280bfa5233ba58e3bcc46cdcefb5a07904ead0092cc088e8ef1de2ae418a8f977dbba6b23a634b93abf5135504ec8adae1647042210be6e6e0c9b333c3f1d0dc906ea63eca4697823fa06cbaf999ffa6894353d0b886bc89b6d8b80d88a80b570aabd37e8bfebb692a61ef6e344b4bc5d10a4d4d7aa2b2c47935ce37c1f2143be5df3d55f9a947c1d7244d80a74e92822a7e178229d703ed770a3a2e8e07cd465d6b4fda758867bf09dcbf050203796ca9a6926196f13d8a5d034f566522954999ab327307189e0791866385a3eede8b8485d6c673ca69452d0a7ed6a32142b74115cd39c797e48f38111b309a3b5a122fff1c8afbfa7eac2dcac8cf225c971b88a49e845447ccfc634341e2eeb214ab57de15ec8de38300871207d8bf98a4b9a44642679a67fc1792a46bc051cbdceb15b4355f56233ea87dd6613afa535b333104292e946ac29b73d04be3b83a0a6afd275fc02d99fa0a0b1796275b45aee6fbf801f5394fd5bb2670d18bba553e533d39d0e66ff194a7555bd23ce14ecc97ebd99facaaeb8a0d0e088d2b9bebbc48b4fe32da39a310e28150936dc5e86bab264baed9721beec5a6ab21db810f1bf539d4e6283b7a382984595eabb42b21aef0a1186d66c988132b0fcd17ebf0bf9347d64e334e165d1e8107f6b49403d77516f55e973469ec6d3ca2ecfa2df3c7a82d08ce5875e4a0997ab9c4189e1b4c37b5567fa7731d6981d96e9fdc35abe9ae1a4ab30c5b329cc617a2f92cb91109738a7a41da00c48eeefd6e003d3e25de538bf85d83a4610c0f86e7af160703666e6fb525122ecbacd13242679cb02298777001fa2ae853ec73eb581229400c93408644bd64cac57854113aff1fff6855e2632e1e47bd145865a142c9ca2000b2595fd4edc7a4b4cced9dd87a596a9e245c25fc87a91d676fa0b02a237f895df9dbf2eb099a60fadc4b8829bbf7aaf94d1fdd10dc560244f0d6f5394318497eeac7cceef0bfd8316914f766396d9a5a7cf907866f85ac6e188133614490e1031dbb8abb003b2fe2995a28fac84d07dde5987a981101087606d6b4d4fc1bf7b3cf56f667ffdfc28adfefe6dfce01579859b662a189306cb048bb4b8d66fa9861e83fb28c325b89abd6838e71e5ebeead3e014f40b48a36f1d468a4a24954f571f4972afdce0d6f9dfea1cb500b6212bbac96e7a3193691eb0823a48e6f49b63eb4b571dc1b60654b6a882d84ec4a10b5faff8c0e71bf1548578a8bb4b772a9dbd1a76792e4186ccaf692a5cfeed5414be448da61b1abed7d58acf60c60022d6f87f25b291c226bd22c9445d15e2dabcdebc6fc91d780493865f4dfe420932d9a106e81f254d97b91d00efba45517edea7c8dbf369a32c9d04a5d141d3427c68b19f189af86b3e2fa8ff622a14947d4a5c4dcd12d3e12c714b32075dd9a9c35e8edd715901559efabebda589fd123d0a7ad33bb67f353bd01c4ef51b26a187986edf0ad892b4c71b2ceace37f103dfa8e933bc422a2799dce9b7ff3de92b578e065b79a8e7d4c028002f5b667886bb783bef181f4040c5b03050f9ce2b9cda0787ce21675222dfe20c40640a37058910069a0cc037ce13a2bada74027901a186b5f194792105708877eecf678aba0436c2dc304e8fc040996e488f764f3d0f52056edc69b5a6e901bb0dcc75acb8acc9f22249961cc5df3d10992a32d724699120a264cddf1450504feb09d82b0181e0148f7ea9ba61e99bcaadef0912e1c545ba9b97a93c9cf5a8c29d3ef2a2608a32684b30ee7d43e6006e81c37b636616e736a019e26079d3025b1c5a3997fd9021634627964a01786891218711daf4812cda28892fd4803dc5ab334f18355cae65eb68924ea9fae67b74ade42b96ebd43010dbd0536f7224fff388433de015721b73c60d4dfbe1101100efe6e69965fcbc8eb442a233654b94f79ac0dd967612fafff60141e1fb714a3e88147072c2b44ac434421eb5295a9ea7752abfd6dfe4e10760f0f1e6e486172d8d4b092e043d085c800a58f5c6882e37099f21565a04ff5c12ad4d716b30164d8951f6cfa56c93388fad772ac2fcbb80276a235fb4369f01c77266f2286b61510eebeccf4a610f995c850b2ca952c27875801b692f8c1ebb61758c44f97ca4628837ab1f6807b57ba56c1b2e39e1a002dc724f06a3fb1510f18b37b0b48dfc21d453ec3a576fcd3302ce89f313ff2aa895f0103e11b3c01291c112a4d9b5f67b48767dbbceb8e1a0393dc8fa7b0b7304a02e30612cee891cad631778726124860518fae5a1b162aac95a6a3aca66e1dfaded70547e4d934bb01034038a23f63e2695f554cda78d42808c750ea5dd3c7c34e74fefaa93a91ca66a472f2c1f8a1de3c6e876fb7721105685639cf82ee003704637125e9177cfd964acec7bc1474ecbb0283e317a03696bcff64e4bf6e58e3893c7fe4d41886690b29c2d6f32ce57ca25559c3739e14af58af1d96f581e469f146d727ed4ff89425f4be0f5384ccfd5941f6c859d6d532126dcf4529564be166d880b4d5b5c617173778197afc8d3dddfec020c17373d494a5461676c7b8c99a3eef2f3f52c2d304160696c7a7e8384919a9da1a7a9ddff071016172229405d707cadbedbdfec000000000000000000000010233645""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-d7910e2ff97acc1d1ab59e023ffe199ab92906dfd6ab2e463731ae484d0393edabdcd6ede796a718c4421fb97c22ed9634ee00dd4b97beb6045c3239c48027aa536f568fe384526ca7595031d0a9f254a7059f5f9654d6bb94535445cac6b0d0a55e26160f6d8dd8bef00d1bfed6c333946e5a23ca8ffdabde68ffa4ae1792cd8debce255f99a305d4cb77145f929d4fda712b0f595486ab1b2efc45818923fb11c1d96faff901f631dfa41a112e042b57f5ee2df7a8924888a22de6000d749babc1662c29901acf7289c893694bc3b09d4148438f8bb532faac79f335287c54413924682b3ab01c01082187530562ead6ac24b7a2a1e91f1f3ebcdfcfb233b22a2f250d3aa97240ca78e21be8e8709807b2c7ff115e4e1f5cd5a899f3466dbad9bd1ed59d305f5cd4d84e4904cc9f28d9930e799d745c3e6089804182e0c18d6a3db171812f8ab1ccb08db164f43893477f6c3b056dbb043b9b3e4e6164688436d6a9384d6aa09ec8005db3e5e490c2b8a8445d8b85b9afa01cf9985c17316341b8f37d2a35aa5239a4fb41a4b1564f7b0ab44f01915e1db94ae448f20f295fc3c3aa5fec745f434d1b9990701fa54f2a18395b15602952b18a10a1aba1e02c53dd9ec4e736e9c3289452f0c179c15ab49ad63c87bc1d74a1ac5405bfa70e21bca11904991bb37cc3e5d4c6efa43f6e697cb761a85e3c0ee987d39e2250a5c09428ee71957575a468dff29301ce72c06c5893eeed5d3128e8dad4f880fb0ec59ff3df2b0a8321b8a3015cb55b52c38ce16a8f49353ef4731c38ed0e747ddd63348e89763b91bc6b4e37616978777a5f57f021868e0c2a75dbefa8eafcffb53fb9732d3439c2234a913cd54ca5d973ac9f07086b45c62ab7ca99133932f638226e31e6aa59f458a45ea8f240e95546b069329c2095d9c9b182094adfc99a1f800cf3894c9a1e034bd00a635c5847d633b6e4d99b7ebeef00b18ea44a90809676feede9dd62ad8585cdf4f8ca5e9c5c236d88c9d19a9c5bef612bb815b4c10b782b40cfc59768138b3336ca4e5a9de60d20280212e17f674d524a51a5018dbc2991599b6547661314c1f38b86b6eef5f1de03a86d95bc919e6becfe9d2c0d646eaaaf173938b7698f4cffc9cf33c189f6174feb11073b4314ed0cf5154c5813c353c06f4f18fb36173f7fb543510168bdc96a47f0c088b9de3d43e63f13e4be4d8e351bb3e27da62c37df0c5d461da8d30b1350d7615f591205d3a0308427498da258658364408e1e59849058a1708f7683a07b8f6daec05142ed4c5ed5b9f59cf6fdd74138702a8d799ce3331b996770873afcc15de2a546bac34f866483b418207ba6e5f1ccf126cbc0456def3c1cbd2b5ebbeecb61d37c8ab2cd413fe3e42cebf8b0bd903426a682977a7d81f117cfbe82a75381af76a58253dadb8e1f2d3e2fc20f6b2b3bd106950ef08f8cfb140900cc29d00265797ac8dd7727e354c8caedbd2f305139127b3d27694c53243a25ddcd67c2ca83f9753acb061c1a0ac52295c28732dd1c4437b6b4fe3480b6b8e3b15e2bca16a7a51492105256f1504718a1954492f6e340177a71989bf5b77f24e608674b550287aa8200a96469a8fae17147d802e6efccaeae8195d2cb5b88ed045359df4820326e5238e376d42f69600b9a7ab03fa9da7f8e32eac544c51aabf8524a108900b8ed928d36742c3ea7824bc2f8f25ed52da46852b728d36c017462b337f4a21ee33d7ba0e43fdef3aed3bd07ccc81f36c62dc3495c22134eabdcd3ffc75ad8ebd59746497eb32ebbb964f50112ee4cf76dca1f467585d372dcb37132770291dfece7be819cb092ea229e"""),
-                    TestUtils.hexDecode("""
-3F1B179FA452CFFC1F4776B275BC9DC61A4448989A5C74AA4F6A42748E49DF12AA62C5DA238BAB9F4309D563EAFD739B54E8957C0E91DB05F63B2A50F11205F5AB60B0E857F1AEAFC0562A76626AE579BA3387943E8B735A4B1CCBD23A6CF56D7F38CDCF772ECFDB7CD40781EC2622C10D65BCE780852D7930281726CC2B83C8D8179D842CF3DE761B071A6B04A383624398FEBE34CD841CBDF9C256A5EAE3973F0C256F89665A0B23F0B505A2EA73F37EBC11AFC2C3D4FD8626EB86FF0267D00DBC567796011E5548C08208CB0B43A880C1590CBBF0549683BC71A8BBA2CCA5F98011E592F3B5D7C8CCA0165A58BAF8CEA629CBA860511EA2E86B4CD9E721E8D7DC608504114EA98D016C0C0EF67EEF084B8FDD8BA4825A0615F7E09C42D935D9AF0DD847C2435D84B4702ABA573499C9088EB21CFB97E5B5A847476FD25EFE2C2763429048F797FDACD8238937024E5D66B3FB40055C3DF19E213E5941095CD8FA62BCA591007D03CFB879388983D6E7A189782F36F88EE409D490C5FA66B62510AD0D0EE9EFE6DFE23139944046C62EE639C0F82E6D850770A69577DF6034084DB97E4FB2BD206281A79CBBFFFF8A9E4B70252F6F03DE8FFDBFCB0A5267877FED3893CBE5119F0C6930FC0DFD82C63CB1E7DE66DF2141E184646151CA8A927DB49A3EC63B3B862AD60551B0E562F35E109594E4E43B192BFECF066B3C7612BAE0E170F0E1D7D246CCC3A2F94D3FB08BCF9DC7DC44735E258B1F9D0D8152EE79FF9EF095EEC3FCD872D9584361A44B9BDC88BE2AEF1158D1765EB4DEAF441F2407039E98DB8D148DC8B7EE9C44D5833FFE4C52A077F57D9E36CB220251C58F61759D18E4E449E72F29351F6CB08F9D996005A33EA695C21FE883E1C3BC3DC3E8239F2BE16FE445A18AF83639156521188EDF3F15ADB300A17F88C829EB72275F6F35D2D1A72B79A01A50F1A63741A8B1ACCC35E49D331DF670D30DE8855FF27C9F6D7BBD16CDE4C4C4DD48CAA971758D714E89DDEEC7CCEBF2E89F8CF03D7E631B9A18ACCF19FF35AA24AB6A1E10DF105FFE2603C30E16B7194AD615038FE96F4767DB8882D48C97514CEC057EE636C9FEA31BDAADC5CAF6239A805BB05081962A2A5054D9DDB47AD9D3C98D053A5199A687668425139998BCB466364F656B1AD9F13FCF7FDC50652841EE475D86AB89D0CFC01C6B5B876AF9D0312A43DCBBC71B2714B0C3226967A3D1E0AD7E9368EDDEA9120B2C8641EEA203F2E943F43708EE6CDBC6748A33E3DBEDA2AC492A6DEBB9751E7AE4AA33F6ED893AF7054454467E29D7EB7F2163FD24F7B5607C2E77DDFAF72E983AB532C6585AE8D78757DA904D1FDBC10768E3E70D582F17708B51D561C24EE0D5A26559EADF5463097155540F26EBCE03D89F49D7033AA00E1DA5ACBDF148DDABEAB739EDDF99A6B2BBEB48F83E3516380FC7AA9FFACA8DDB53388485061EF5B94E92443C24DDCA823E44A29116F346A22BB3DCE7022C3E2EF35ECAA91CE5F65D7C5EEC85D741ECEBAEACCB39F881391EE2A06BFD7B72173B171B7D11C8792F0A7D9A125011294296B157591A675649716F92234BF074F78EAEFDAE1AD79E4208C6338F42F2A9B105EC5C717301C638C63555AF0A81F63D0CDD04F9C22E2FF223CA5AE1A01C7FC61E9DA4412E80D493A7C0DD49CAC10C62A7D3ABC1B9C74EAA2D8AF248946EF8A37F1F7017E49D11B89EBEC111D85D7C1512EF4F99BFFEE68FB588DF3F39735169D1B5A647D71F52F76C6BC09F5703320DC92BBBE6D7CA592566483636957D235F5D18150B6A4641CED6276319244CD8EBBF74BC5DD3AF82E6C1118D19ED291ECF84E4EC2FEFF28286898E9659B01A37F4612460B34DA8444A4805FDEDCCCA5D6D8013335B4139101F28090517FACAEBBEFE59E44A969FE3B8402D690012AB908EA590249BD9354D456EF65331608478B2050F985C5903FDA5AF0D918E7F7E167C3A669B727DF0CE96B63D4D944493C5D2BCE97F2827CAF54103A18CA8CC0483BC8B98C42657349B8438C0274E4401463CB55E93023BA114FF8CF3A718740756DD8C92958BD07A304FECBACA3CCA8135AAB901AF23E1104E202395A08784873E03FCF2D07AAB003E6581741389C238942D7A2B9FB30B53CF5D0C408C0EDFB1C4FF448D745FAFB0D659B4BB76B16D5B61B0A38039488682907151802A815AF220F82680E523E838ADB47425369CC421DD36C2E60100A9EA7F29B05D985D644A7FEA573BD24B922396A481E33306AC41CEE9DD8ECCD9DD7833F8CC77477EDC2E97A72CE2DD930BBBC58FBFDE78DDE34CA1F8DC758CFCF2ABCD35CEDE0657B35583F9C016524D3AAA5E698BBF85AAAD01D7D3CFFAD4602858BD7E2F173D6A24504E448926DEBA1F70F3B0D5B454B02AFC4D0C482BA8019A0C209ED071BD2D5B341EE06FAFA7FB0D1FFE77FC6F6C49F78EEFEC44999E4330BDF33021EBD91DE8EF2042FE4C3F19E992A5E66FD9BF8E3D428AAA8FA51C7C761C2CAEC8908DB3066D50BBFDA98B82387E92611514605D6CBCC0AF9FE08B39AA1DEC89CE77987BF3BBFBCF362B4AFDF12A8A1ADEC69962A6FB26610C816F023D87E648A77DACC3997127AF770658921DCD300EE2C8C0916593067B3B31ED1B6B73D68EBE68CB22386DE39E57FFF6AD766193F99CDA751316A5B0729FE5307C107FAF6DB4CEF4B1C6CDE957DCD6361606A6606BAEFD9A1AE08A5DB21991F022C4BF758D16FD53D6CD41F637F5569D7357CA048F07F53C850CC56A07A4C2F3BD04DEAE79498EE10B366861EA82A7E04B9202750D4FF4017239BF1BF7088A3F2E2C79DED5A12F75CDD754840868754428BD7392E4F01F36E3B450A9BE5BB95FBA71C960C7D09DBF24E6662C86D8B5C3E37D76B16845B0F88C40AE7360545B3304DA5CBD2B58C29F6EDBD794E9AC779227B0FD198EBE3A172FF4B8896F0C9BFB7A4FD9FE6ADC73E097046FA25CDFEC45CA1E7FFC4FD582DDD8C79A9F3959A4DD7E3473D6F242B0A6AD4DEF109C12DEC994F2E313EA1930ED25CB401B82212E86150BB53BA88138AE3269157FC2A7A919E21CC068E0B9E934701B572AF0E20FC2CDB2B7452CC1E5545AC4CDD34EA0097CF531FD92E3FC38CC50E1FC8ED59272FF3D631FCC239E4AE0AFA46419863A166DAA2CBC63E24C26ED7EDAE476A194F8BFDD540D640DB3A8B294E0DF0AEAB7A735589E23CE524F534AC82D80CC51DFC08EAE4FD02E6F6E0BCDFA0FB23697EE1AFFA735566223A70EAD827DD31881A3C2471677F905B64E6AAE00467561FDD6C79B45016F1326D705A854877DD91D0B147071B00C5F8A600116487D39284F6334FF56F124951333F723D68465B765B32B396FC4C432D51E8C6A9782461EFADC2CB93EE38D4945833435E2E27E17CA98998F9B33057B1C73E2E43B6A184868DA05559B3050FF42C76D7440E1A5B803C8D4B0CBAFF9FF31C7E98FE2D011B3F87416889A81DF9F48643E943336430602C5B44C1D11BC7F62A0D67BCF9964815CA0AB83E7A87DB714F2C1872E5B9F0843B82846516E54A3F7FE311839F4910AEC6CF0D23F86BF2B0B05BB71B5B47E93B80F7060A350EE4D73EA09A6D489BDD064763CACEF5818B319CC973FBBC78E01A505A2F6C4F6812819E02A573AD8F7A345763943B623995B0634562479072D9E42437FCB2D02479DBAF2D088B31EE870F11047E965D04524D0CFF90B943B1BE969DE752249E8B48C609F14FC48692BFF40EA6095F1967DB766C8B4E18FA73DCFEF18F2DE1D295B51A63880E288ACED85B188B3D10A0B025BBD934BA43A5AC5E1829DA836EFDC88F4BC6BA0F4F23A4AB16DEF3B5488BF6C974EE1BBA51D17BD472C731DD35D5B74EDDD3C9177A3503D783968BCF8A1F2549F70069164C965304DE2434530B3841A2AE7DD47DC5FDD9DE046840B4D65A08A71A3D15778865CCA2418F154403183FD44B622982C64F771C87E18C09489493E378476B3B1C8D14C8009ABD3D1A51CF806189496A4D70FE857822049D3DCD4CFECC2F95D2A8A16D94DC6703B4C4EF3E8C7EB9D6859350131E1A03EC8A21E13F045F822C48EE3E3A481EECCA508F189954AC267E6CD19C80F8688410E2E97C71A6C792DD6E33EAB2FD16B82214588B923AF6C6069387F6A72CE06033913B50F0310112DC2143802AA2CA066388C96158AC154C33E9BD72C993B410FE5E9D7CF37A30EB85A127A7773ABFB416419A5B4DDECEC10E2EDB312C86C3F3C8BACADA66D057FDD40740176D137B1F1ADA098D978CDBB938F45D4B7814F2C5B894CAE249CA8E1FDF31E81997F7C55B7A43461F5C7C9893AD0494F4F0272FBC20D80F327EE55250F9560A301078BDCDE94D72A7D113ADC7C739D7AC2B8775D961F89245C5AEA8ECEB1732FA345FCD84A0C07C65F091B4B32DC4E117D24D782C404E8FDDFD6E9E65B3633985D6DB8CA841B9F9A3B3C617F1D69FB454045C5024AD09C5C1080F3EAA64202C08838B42E218F56422722536160F97ED3C08F285EF7BCD1119BDA59DB5EC6BC8E9DC1789B3CBCD469A4BCBE1CE237366A5B51B062D0A08201D4F0EAF6F8FBFFE53F35999763DA2470F2F9FE79BDA60285D052D65DABFBC43659DC76602DC662A3357BC3E4BD07BC32AE5B5E94D7DBDE4B5117BD5A9E3461021A569E200CD3CC518ED6559BF2539D8DAD74920DFEDE8DF8FD8333FA17F0798A17B5385A9569A640685D7365D3DBCE8411D44B17BF79B852B1348AB31335AE013B2877C1D8AF62F88C5186B7313F2C8736472FC5F2B4B38F761009F7623292EF14A4A4006305CC419A3ECC73082F63BB2CECE6A624C2A6DF29DBC6A4F0FD3658C58EE694FA58741DED54889994DC6A3DB4FAF5998B577EFA399E58D822B99623D76050736C17B5218671FDA3BCDF7E81B3E85D87200DB9150253ACB07AFA8FEAF74578125E1E26128116A7446C804DE54FD2D2B1A48E684F73AE91932A37372DB66A230AC4CD54869A0115895D2CC494E6D6E8B12845551B4F3DE0B3A4C114979F0471311434BB3784FAF7F9A9B88D536235543ECED732289B383E8005D98192FBBF41EA8026CA3A14B6895A6EF0548EBEE58C25530F56E0EFF157DF6ED0ED0D5565E9FD474B38EF5BA74D24B82219F317AD51F3E7D6F8E4BD8836B91525E162DB417C87E36B3C0FD874FB4BF4136926AA6D045033C94FD1EDCD69835A116357F341372148C4601CFD84BC36A8E5B2260B90CA797CD5A41362C44B4488399394AAA431A63A74B774E68025D7DCB1963911F2BDEEA60DFB24E87196FF38479D235C98E83F1FC419C87F708677F98C84F9C4848B255DEF2D92E3506A533D36E56DF81F6461AB5BBE9D171ADDD39FDE7552C5D4351DB59543C0FA939ADD6130E25D4326566FDF49CDFAA240BBA0B027257D2ECB83209329944E8F44AB785560DED2BA8EFBC55CA31E48F4C94749E4D205A50BEF3E3F039DEB3EECB213FE92C1C3E98A9F72B6CC316D6C0B87BE7F688000A2433E3A184A68722D44C7F6C90F2AD0B248AFC9E57448E3450888A875CB3006E27C232963740B985484E7FEB07775F4B4FD89AF6F627CC56CA1AF23E3BDF61443786D3F04DECD3CF71E2C6139B584F52B6B656CE0737F50BB270830B102B781E621B3356CA16019696A23EEB238ED74D160269A3EDD35F7ADD9E065F836A61A0CDF99272956555106A349166B2C299B8D0066581DC3608048DD8BC2F267BDB2808E1ADCD37A7538B9435E9E5D7ED4389BD2CCB6E926A927BC6DA19E8E0E946442A6943F65C56E5AB7507FC6EA1DEDEA7C1AD087CC005914CE80A241D42C88380A49BC4B6850536C5A99B6423B77A75FAF76CB17479EADFEF1FC90B832C8F36D92BA3E927C9D60473117267AFE4B115E39D50AC7991BF248DB38E8C99784848013B48D4CD6E034B93E643239E78936DAC6283DB748062220071473B0579FAC64510D033525D786778C53CEBC3BF95C4FE9406943E9D68E17EAB3245C57C00D0C206E3343D8201A2F6C278DD61D0CD42B71CB7064ACCDD38551DC554007F29E1929EBC81025CD1A5AA41510BC5CDFF340F42C4FF6DA37F8E97F5911F37ABF457DE3EAB6114DC858C0C14B9BA5B652DF63D0CFFF4D6F8103E0FD15D87D8EDCA53FBBC70E3B42C410F379BF77DD17F6FF57D7A0D01FFE0044F226F8D65DBCD1803928B29CB6AAB703A0EFFE4EB47329D9D373954F0F15CEF2577EB8F34665FFF2C774EB07F0CA72ED27AFE6EDF158C3AA193F3B5CAF99F52430A3662997DEB386DCF0A6781E42180ECF44E9043AFE95BDA84FD1F9EBDCE26EEC0A4A08D8423111B320EB87156BFAEB3827389108E12E7AAB3F6CC8EF67A7C877BCE3192E503608D6F1E5697941FC1418C16093A55A2ACF2378590F4B0702998A65C8127F13AC98BADEEB32B152F3054EB7D0F200322E40CE632CDAE8F0E6C22497BB6D464ACBE9B461C5D39AF9334F5342FF31C9273146D20F5D4BFC61F980B1862BE4A147474DE89A1A3278004F2CAE293CE2709748507C5DB48D98B484CE933DD3E925E1788F2470C91177ADA3869DF6FF81308DBE846F50C51AD66CBEB2AC91DF1C86EC22ADAA6C702F1CB7A141778BF957663060725A5AD6478E22FC959FE5C918EF1A11964E66B1910018DF4698543CD3015E9876AACE37988370135BFD7047FBFD3996B45EFAB6FFA70A4191F259B8A27EFA05E7E1C75285CF70910465589B41A9D29F51F7BBCE06457A3DFC540608157479B499B2F0CD9D8A8D6F2C01FC79E5079597FB6E2D1C3394B8D8AF65DD133F9D9300DF3DA3D740CD0E7E13EF62BE1D29A3DA6745A5A87558F23D89319BAB09A15F8FC01AA388E1FDDCA117A27426D142094A11E6B49E2C541A82C685D41D6E2520881534012774B4C01CE3D2FD8FDAB8C25E4F0AD1292974C4C141173CA219C07314314FDF94A05955E210DE13F0165C990227EEDDE23A52D7F4C8A181C996D0FAF6C313EB74BBEA4C2CEC0B7B01698C63C2E1D37313B637271DC49A7EED8542EE8BDF7C7D791F7BD59A029419616F9C8F478F060B855CDA73418D0AF090844FC0066DEA9DF8D4F3C9ED58CFED2A78B427B42B033C46485B767D75526DE8682D6AF0BE91169650BA4ACC4D54E0D357E993FAF358BEEE3F7F988381EDB31FBF174239A345130BAE1B0DEAF27BC5E1DFF86B29712CFFAB670D35D19DC5B25DA43D481336C0CCC2120427F30326FC74503548344B585C082A78F96F072510D50E1110EEF01617282CB681CD352A23607C3CF7AD9AC06FB52B38294DE8F87894D25C1D278678B048E3E3F4BA0D884154C5E16780BAE2322C389667A15EFB0B21718F56767EE942E4BCB190CDECA74C92DA8848F41AEA2328D29B10C95C6DFA74B0E162591B1BDC0ED6826ADD0B04C7495FC30E586FBC03D4E871915AF71866278F9CD1B4F1AC56E8E1B7B11DBF0C9A64F608E1C3958910829654057103BEC687A02AE9A568BE514187A3E27F3F9928EEE29519BDA0065179423A7242EDDD8CC337F0B7E7FB7CF90FC682C9E60253BD0997F34F9081FD785712E52262CD17C3508AE4D2FDA3BFE232269ABB185E635E659D405AB12E17A80AEE5BA7DDAF1FAA819A284A60B85B49F1A57DA72A0866B2B9C2D28178995E79D4458B58EDB187B0CDC5C37F111D20371FB8F410A7EBED95474859645FED6F451A396781EF7A02E6B52593189EADFB1226316FE8DF79B23CC67BD2EF973CD561DD612D0C3047698EA0D3895A28B4111938F0A0354E4DA7484697C85908A3BA3E80BCCCAFC73303C767BD3587C1F9D48FD4DB93517A561DAA10F53F330ED14CD65B4A54FC43E5F5CB421B8B6CF7B83D86CBD72A55791588D4B81094BDFE45E3F32A2C3FFE809F66FF310D66032AD6BAA5B33E79F1C476029A49D49CAAE427D8A81EB642B15EF0C544C9EECB7CAFD2A854BA79E4D7EE01A96CDE9EEF45E430EEFD8A16D5D22B751F981667F36DE2E139391980DAD22462BFF4896D277D89DCACBD5CAE5EE90BC2D5954C083AADF632D9051B782190ED4AABE8FFE195000A6BA05115EAA0BCE755B23B10C81DCF4BBED61E6D31E9292DC1A7FD6B453EBEFDE55D6AD8866CCD50473705A24F519548172D3D9F92E668D679D782B7F1041E5A558A625D65E679FC75B15499BFA304435FEE6F6498138848BAD0BFFF6942029BD0C5465395F5368692D6B21B2E22A638D6EBFAF3A0EF1F9BDEF8529C6D0BD328CC82BC66DCDB2F5AE20F53B8AF66400D6C2C0A3C6BCE1E8D2B222FC54F1896E58F61816E301365E12866C1BE7C4BBE0DBDA2B504F0628A4DF1EC7942BC58C0A4CED0046D73FEAF2231FB9FF61C0F7AA564EC1E10BD65B693CFF56DDF3596DDC85CDECDF7F123F9DCB27269A7F65A435ECCAFD89A211C829BC7F5916DDA61959AA296505F6D46543D863F2D3F007D8960634841CB317F5EAC3D3A3E4561801CDFB269257FBAA6A60E7A0A1980C9BFD6053BF2EEF7414704C7160A051355CF48A0C0F6FFD683C453513F8212364775B7424D9315A920DCD5B140A8440EF7E5908D4061F580022399509C0ED416F945705A19FDF8E65C8802B67701FA1D15F06013990C7BB8D0D0404679713222924DB33BC659FE58F82A99BB1AC551426A13C2CF316664AC8037B41755F110F6441C7BC9446430D7BF917AFDB8FBEF84E895388A68763E0E16F89FF630BDE9732852B70A4A3AD8A29D2A4670757AA4202DE5D53E653848FB26C6031D07CD010501F0785D1B1D69BED49DC3B07265D51A15A7C432C3EA63A0B0D228B4F8AD4060DBB8D54B94BAC7F2179829C8D9F9CE4F7BFCCB472EDCBED73B0D18E3108156FE659CAA40B45016E0EFF20F81C29EADC8B638364FACA6FC85F98A9BAA9BB7E5261AEC6786C18487B14B77ED2B62B762D6B8B39AF5A870EACD236CC53C016158DD1E71382475657C512EDEC0977320F1BEC79D0CF39403975210DCEC3ED5B58F"""),
-                    TestUtils.hexDecode("""
-e870f21e348b630a1326a0334c872302d0a6da460dc9a0bedb6daebc027b22b9b332c967a2f5991252bccc646e484b83d4fbbaf2887629032de5b3e1b86002cb089bbc58e35737f8c07a694b5cfd38ee3976fd25244e6acb2ccaed20d926af4c9c7526475cb89a72a26ee9b2a25c29128d53446f797344d3eff20d91eba8ba9d02f939d38a775911604124896569964fe5f835df7cbf044f2565a32e017caa93a8848f7c4fff257b885374a6af0df150b79488551200332d176955f304d86340a6df8f98cf93dc12909e1693ce62de02192e63b8af668a0fbb2c345bcfb9b5151131b7b4c7d7eeea48666a8219d5f8b0cc430443ea3d531dbaa6360e51a842fbe1e40ec5fc9ecf9bf172570bf8b31399ba8f12f3b83c40205953414caf7324182657e0fbcc2fffff801c52259294f0b23eeb5ef14c34d955b92ae782739a9f9dae5eb03af4bf4e911c7e758cba1a0f1d0ac1c7256e5d5fae242312f18f6747c5b56d907a49151080485999605246550a6ce8e6341bbd1ec122b179b3102a2673c163ed7174089c10b29cf33b9b5fd1ba22dc73a164404804faed60958c6faa6a09b03dd2eed0fa8782212f1da486543ffc688e37bd43621ab857aba0b13c1e0969a482ce92e00d62ebec1870188734135b0419cb3b9f3a9fcdd68b5b4a53169ae0bc4959462b8eed39264c0b0b34e0595c7a719672abedad01638f3ebfe9e4a460cec890339595a9699db82819723ba08c7bc82080f8989d3d8709386ed1c9fc791ae0cf954e3a897a93d8e235eeb69ae131a912736fecdbe1ba34eb03206110fdb1f81e71dceea673fbb98886ee0d94cb4d76e1e94278b8f2501fea2718466802d3d4a068a2ec53029018df3eb088246b767043f843f79b5ae5537924a9b5e5bd46b19bd7dcf7f14d4c9f4dd05b2c941377434cb37d80a899ee97a5d68345cdec8a43cfef1f286c0102c2d8c9b0d07adef966992dc7ce8b9606917e238625707393552ba9c01c4e72f6e3b533a734c0d60e3a2aba08a823a12a45263b61402d8e62da3e5f5a5c12e0cdee0d255551b8af7d500b547699f72b31a91519891850e4109f4ef380757013fd57a0fa0ec0721dbe825d4cce624cdd8b7f7cf64fb31332f374f6c470b9b8a5171f25d005da4e184665430e7ae553caf2ef9eba994f34b04ed6886c1b768f03868522959fdb164e8ee825f08c4a4dce01de6686695b5dfe6102c7463ab54b084c7fb1366a0b292898c0d7499a3a6ae1995bd2139f7d7c84a0f96b497bb2306028389b983f2e02a2fcfd3c5f8a0b4d2e334d4f3a460829efca41806ba82f2e5ef585531a3f1ff67617ec112f613acafb8420a1cf6230468601cd8b0807d975065fd36aefe77111a5a72ee622da403a51194f8467a122e408a0c3998a3a7f18c2f7774915289a1522f5670527e63e6bde7ee0a84750099d949ff87c6dde67de9cb220518ccda5135d3bf58a42b7d96d14dba0ab87e79547888f6e87b4bb9ed754133d16444eca15045ba54026767e93114e8a3a75a1ff65d0f03c667a8222248119fc8994a84fdf73817bc2d61d6b764d86c69d68b7ca3ae85031181204c39085af1c7efd687fb91d00255dcc934d47228c714cbdc66d4b418112ff0ddc030dab0f4edbcb0309419120ac944e15ddedea5cd3a1d62abdfd8729edcf40d43231e378b2c69670c59c30b4218e7b7f2dcc0ded133b585ad673bed77194b98965fd4a04d93db53ce26128e481de6053a14f40b34f60a169e26e99b4b29979c03e4880fe84474f11627620d196369592c0cdd88c3639c1346d3ee265e550d470b8440c5676387769382ad4b57fac799926cba49f042833301834033d668a4f0e95e2bfdbf295ee9732e30a75b1a76d7a4f0c12029514252d98bcc4330fc2a3172bfe72c8f8202a308de53c4587a17c5e149c92ffb88b79d8b07962cdf91f0310d457c7eff09485a01481313b2aebd081c49b47558c252202b4639dce456a4e786db6a91a24a032d47d1cf9d37969d07e2acfce0067a20994310948821510051ea1ff97f0a5e88f0d36825f7a9b71d5c64d42dead04fed5f6b63dd80bc0325bef6d413644c1b5ac212bf9da2edafef2e6b6d99354470e25c5050703e524dfe08af14dd431e609be5809012ff5d0d4dc260f10fff302168b9d73c86ebc71c21d76ed34f08b12a6dc7ea174ba1c2790ad34a7b5d2e55607ab26eea6289fef0886187f43d5b98b7687b227b58692d61e6a8b9bd04a9c3a5df88e03b20c66d618a6d5a979cc0e33ca400f55918a0d2669c19817e9bc0126a406fe4816a24d06e072717435576868303e961abdef730d973768373b4f413b006c137d63fd1a7937c0ddce317078b610a5fcc1a49d83778260c088cff2cd6e35f58263d43edcb81692121d737960b77b17275765218d0b686907ddbcf0f681bd2662451dfe012db5598c061fc03920011a245c3d8fd3a8b0ee6291959a01e811957dfca6351df838ad3cffc5f28926042c1919a446cdd525d0a1b56591ee9574c16f88557d54b97cd4e077289ee304537176c4cf21e63e33203c076b00642665431183c8b6ea4c58b2d11011d1a1fcb3325a1f7cb148e0a0c70484ebfc6a460de38392761da4f101a2274b21dfd8a5b6870cefe3f1ac9fab09c49acd26de288d43326cfa68248fde5a5d0c2adf5ee4f7a87a570374aa40c904bd3052836b275feca785d29a5cf3af7df0ea226d5fa5aa33df234354a84ecfbc2e2a3d2b3cd2630b765dc0d6a7ea00884d7e805cd5b4d7219b7f5452e27b761d2734bc68d6da9b45de8b69007e6a961a73aa42eeeea30700474cbcbafb4304fac39b6dbbdd2f2a9eb5b959ef1a6efd9a41661265c70db1828f66147fdd9a7865dc9f0a605081ef41202c731184d754e499c95c19af4aaa7a018c8f1bcb1bb3ec4357bb7ccdd227f37179eadd63b10c2c10fff271a3765e9470e06fbfd3e5195ef39a52b20041507f3cc360c37608e976bc29797183feb75e61d4653e90c4a82c744b952efa874c92a675191ba7cac12479bbbe83b5a4b2e919b8e318869a9da789be9a8ae806081bee3c6376f54e5f687a2900a9e610094b6d21e4037066f9c85d65fbcfefaea7f2936aa95adf632bb83b1d5630ae48a2b8c3ffa79e44296a60125d14a5ad30e70f97e072da5b00e115313c0f3e572da51faa8741e98bc2741c8c44ab6d4d60fe0a145eec8bb91c742a0a8eb133a688d322a836a2cc4663ebf2eecfb80fdf1f95e83115d10364baa9357e1e133338b01d6ac2fc08910f7ca44ef8cfce5f5d675346417a40010b2c384a58626378819293aeb6c8cdd0141c3c404a738badafb8bec8d5e3f026405b5e6b7e99acd1d5d8e7e9fc01092d3031536062646a6d747879829295a7b8c0dce2eef5fb00000000000000000011202e47""")
-            )
-    };
-
-    static KeyGenTestCase[] KeyGenTestCases65 = new KeyGenTestCase[] {
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541""")
-            )
-    };
-
-    static SigGenTestCase[] SigGenTestCases65 = new SigGenTestCase[] {
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-36fa0dd4a24ec6fcb09f2302dadf25bb8118be5ada70e1eb7f57b93fa96b1b84a7e94374f9fdb9452e2748558e6f5a787b2dde0cd9d68747ac506baaa454bfb065f1e500ebc68dadb6def405dad689f5d7fa5772765e8576d5edc6babeb42a69374bbc305ba09b1ab4f9820ce3a63bfa30f237af73c551924bea0f171231a1c7138517400832116516721081381534111864540573008215505304258180167218805633031837711834125446757374064802656602288551324300464424570070430775604467700373727218654382113085402384714385137710073132881352767634653213083382164661807507572063084014331381071513408847516228741575401075645618078474251072366778856403233687514470818323256487352405414024741457321505602326684655106051751226763771126438165164374510847344324473582005510013087276273103305247274346862062415125625613058163863147647838223024704832800525016847583411847321486547525343755162746617268246640865568078283725452875420148460064305561603552781415016532336383827535812536128531582855048732745734304562153661720882314551774378733337650373165711441772228701657277386017735824150430521336520550036374316583310125155614734342460731628214452004760130486772345084803242082312015236540131133778828125485315367333404602814074230332231645775734006082655405074336518265056780405423405171643707672231357803711010227186374560188573728767460207070474058460834711808584073145111570274757730536084417433361080031773164730537111576081735558366046746463012324065660876052137008052508762676453141806072122540753112240128218525337055738681721237286528627580731113241785778878812404656335421440725752111111156405682027841442788638820213821775468455868881572107124844588501722102737751182078020774402721847287133760733436178462865784183457884478713270388562378112101074746047443670038258180805476134351522560745400142355780715532180431550238645138105666571424718347700224316576316240153341251132303832382487412204627864764456730060500534645228115033152663747635135007237347168666208148716707533808368153357853523066243657213114358240560560762242824400720503468848503214451133047326042414766776505632362566828364757557628727414157415555332465830353045707545360708480663616301475251681455722668010152887031873716282756337882326408515168141310476348177234206113218677788287661680051776170836537302227562814480456821237427740234145435547342505460352122655426431817848535455552351110307364674577347661170167232588300102408838001733245265836505674067103567726335661342615280304861068871308556030576265263455076841315203671823018446077528186184441157454628072317228030475837445608207541643840387761867421333788142240721568555218641850673185763821882055574358025326482476866447683505537318274722216107033672426311407351407766566165264047443754760608262846715247610402653383732324630537084112247353840248444247113603737643465255683685837537448132411273502758336260275317671716402152714475531868478637736432604357116462758307044401162120081820772432707307585501206687567887071026881271434401570353027344416280106317363532310068331157303265448711314613062006813077352761435726341110116125784437040253348451460505741467381411200515685843585007382002820405613751758033727624146204482040301733053d1bf1b1a1af54c10411e25eb7b0de530b1e7173975fc197ef3a8a750143bb963c1e63e8442eed45f9d9d52c1cad3b07f6ef7b0b63c9ae6bfac1b846a6cd055a7fad31424db4074dfd83659df20fc75650d6300abbf78efcf70e634d1a172707520b52dab4cb90361801bb2eeb5d29c0d9f3c7679c2319fb7cb91213061bd97f48c649ea13ce226fcb0673be270f7169583ace40af1f03a14f4d16f64ddbcc68f6301ee523477248625f3293f5422241eb08ee7718bcc25a12b923b9825779f1f4f240789fd47a484e319d18008d465f5fc08cc504af12f4ce024030e148423e46e3aa78ec7ee132724d003304848675b7251d500380a613c31945cb3355761902b15d5c8a0ff5503af2587c2938f793ce14521347a2cc4be9bc8d723e3878f0e5df30801fb98bd95724eefa5c16ae55fae1d93b1a14d14d2fa3ebfd811078bed68b485f30f05b66507b20fab2b00dbc9d776bae1b3edce5d99057898491629d6d5b5229f76cdd1b3fc466d322743e43ca3b002a3d4542648155a71e274b42ccc9ea50a1199d3e72020c86c8a57d8a1e3798fd27bb505bb23818c9289d847097ba3c83c54874f2abfe416b14942623de55d874317dec351d88d97e163d729a08e7edc1be5c66ab0f4505dd3496b34271da51a8f8595591adc55cc13bbbfa9683948e511f4db8bd3a458150aae844c72bce87dffb11dd52279598f9750091a3af472666648f69348d457e60cd4d46d900a75bbe9bca3417a8eea32eb8fe46d92b6181b093ccfbc7598289641df2bc0bac8064bddfc801bd1cfdcc8e2b37edb726e1724a2c98e3a4c71ba8e389e30e68a92b50ffe7119c8c6948864f24b3a64669bbcf515aedbb4b1702147aa0e9302de84e0a9536d9528b74dee3693c21f3744c56936bdbf7cd8ef7541dc3afbf58cc3c7638762a09cd88a3a8684bd3af99640db653fef63994e6636cbe2eca91ae3943aba282b24c070b55f8a7326db2161ae3c9fc784be0ea8db00aef4eec5a468e700de2db247e98566a690e56cc8607c29df308ac4830dfa98eee2918e387df0e57a62043bbd35517f4b4c3d7fd5890b8c0a013f533c53774949c7003549211e34df5c1a97f393321b8fa8d5689c3a973c01ce454ef59a6a65b4a04a2212044c69aab73d0ecd69d81a0a275f8fa07cd50f53944e416654b47061100e89542bf9bae7224e098f934d90790296432d53e59cf766839ebf6607e712c8d4fb07a620072d4974e398194f099ea90d1a8cb78286bc6b3e9cd996f03be3ce22c3fdc96a0e01004f5df6343c84a910d5b11bd8ac6778f8747c85b59ab5db48d31cf256f316f0c9d851816e2d55661926beea6c7b5547153829a1d2c1b5e8b94d824114f7beb05780b68ef086218f3ffba3f7a471e6dd89ad3b78bc57e9d43b467c7a82fb5402013e8d99ab99fe7a63fca0e4304059d2c7906d72a546adf05294ad33d1ffefb733bf10c5bd5728ee38a645f433a7e8993c6d56f168117e428318fbb591c07cc0d1eafb990dc9a004428f4cda912bb1892ba329bd00bf7db39f2e3deb80d0cf4d3a875f0852e50dd1f6d06e440e69aabb4b0857f1b4496a5361b721b28195dc3b5db38339d7fa2c2b702269f87cf95f65194aa4de80241eca399fe71afe2e92dd57ce509f3a152036b42d058a5f1815d5764054155ff2ea857dfe894b987d9b38e59ea112a35f9618b43a7244d6006527c740563733203b6cf80c3b8aa13ef9863bf88469c1432bdf582ee1934e31d9b88aa8a195b0e491115a30b2d87df76c4c0357d37f2164db21ef1f7e4a70275499d215d2a8e345cfab9bddb5b66dc2ca37f0b5e2ea828a140ca7a4a31f5ff145d6a5be068ef2163bd93913cf837a6729f1b3009bfb3ab1fd45212ad12e2564042d9a7c27b7be2f2607b84acbb98619c5142c6f4aebf56274c1c6991a773f9170704ab0a0e1e214c94fac9fee3f2b4afd09dfbe57bece690b7849b8f7e6ed6c8dc9c031c97deae660382656d5d9fc03549039e02247cd237954380cd6b958b1e4e4f4f2fd06092810835e10ba9f1cf0f9f036445491191fe580c307f17bb9a3c9e50b8aec761a13ce38aa0271d7338a699bf5b85caba825a45e37b405e247c7cf6f0db6ed834d0514272ae00d25c70aa18d26e70e3ef19b1b9cfe002563149b4239732b9a1d3cac31183f7d588aec578b9b816e698de982da0bcfef2c2998ab639938186339119f2fe89f39327f7a77989d7bdc93a12e26e9548bc2fa14cb455baae40d96baf3749c387e1b7c297dd4c179298c5eaf0c5dd02f6febf37fd0ea45a505d9df9d32d21fe34d8bf119cd77fd469ef396180947168daa54a317bafe46e57399ea395fe8ec12a636d7700d882306a2cced9ace3db9ff5a0ce8d422cde201441f7045637b9854b83094a9b61b92202cec7cbf0aed007330e59bea1d641de6b8a0b72e175d11c32333e85ea0534d6b7316a8726b37ca55d0b66456e926d43e9396861f5ac04a6d235537d940cd765b67abce6d600b58b542664ffaf1afba5750182ddf1e965a70298fc01f2ef1b6d80132650762fcc2da1502a97784e84e9cc0096c86de42c51a07d8a20eb1e92a3e545ffca4500e1a23c2bfc220c7e02592d6cabef6652870de97c7e5dae28712ebf9361a74063320c8d90afc4b9d65ae6498010364c561816b249267f829e8eea99223f2a91ee9f30260e11cba163142f736526b97c70d7317ac2241a82befd6823351efe822cd632d1bf26cae52794489bf681420415cc70b201645bc8e4b04bec1f8420a7f13e838c50ea122fcd2f0b39aedb50a42ac99121f99db7ae23a43f00d91545c7badcc8e23e8acd366f71d6a22def8b4d031b6aca1cf59cbc8101650950a3acccecc2dd308479d7303b814ccda9b72c885b9b1f8d41bc381a3f4150f59802d24bf58b2fb6d176f4a6b74b35e4fdccb7e3e4d04430896f0c9170e422c4fa2d5ed57e83489e777ab1083f4835af038271bbc8943ba53a5247083519f21a5781b64f9d29ff49324f302dd71d28d2c02e0be75671082a31a9649512998b8d5ab1f9db850c664c878ba4dc67ea99d715e4b1d5e451d186fb51e1e57b9dade68e92e61782761ba17fcb69e522e9febe22363c617298e76d7b6e575d177e1ed0ae4391b9d5dfa4fe86c3ccf6994cd51473185cbe666919d27aeaa39453018008a5b10bf32ef08993e1ad3e27bdb643dcb9f9021567868c90749d31bfc229531779c90b695b97151011e0340a165295df9a339321ee4bc1e14c459c45435c2cbf0605b975299c6a29974cf6f6236eb5ff6c39b1d497cb030987207e3ad3e681edd3b16a91c9061cd8068436da3b157ddbc1888a6580fdc1d856a2b78f73565e7fe68b2f2e083a93966151149619cd43947c4e849e2ad613e222c394dd7b789b86370a040bd039fc95e246ebf175d45d8c0e07bf895562cfeb44a33c2744b8d52424dd0377aaa1777d0437ad04ba425552ecdb294b610ce744faab39c4e20fdd8b53ffbd66a8af0eaf265d23f9f8a"""),
-                    TestUtils.hexDecode("""
-E3D54DBA675DE7530D3854C8CDBD581C6E392F69CF9793D8C0BBAFEE7334C5878BF13B3BDCF1D993A47A7E8EDD4B6C3EC915A5E8FBF2071F112AAC41F08CCD8CC731143AFC223213212A5BD6B6A4026CFC9F7A41C08CB99F2B375D0E04FBBE00503533DFB869DE43566574B49232566E38B13CAF8C1EC1FA11CCA3DB66887996DFEE090D133B1D394F075F8286CA6CCE13C3977D929DEF5943461BD5A22D4BB5E8FB7EFE016932D02ECF4D7B7705412CA14508B13E61925EEC0B77460C4C089C83D687C8F70D141C75D6DF24FCDB64BB8C2721AAC9CE8C6FC4750C1686A7A70DF34957DCC0CE53C3F0D280CBD056D4F921FDEDB35AFCE5DBB348964AD105EEF5A1B07BD0D586B87ADA7CA7AFA93FB75AC0DE1C749C48BD6F192D6279482D3F9781290B88B095D73E728AFC186BFF0816C1DE78119D701FAD382C65ACC42B04D69412AEB255793839EFB9E5BBF6F69B7FDA27A44C04D3AA2FDC6101E9CEC6F75745F20E077EE23D652B7DE547A0FB0E3A153473BC824AC8A31A2C9493DE64B6D40185B60431B1B34EE32797CC77C45C71F4E04E849BF8DDFCF640B83130208DC2495C0CFC6C031B63B80FB45F47BFE3D25EC5B36C2700300D8223074C156C5D9887DE8C5A97BA36A84D7585CC065F20FE8DCE9E8EB814A1D5B7A3B7A3AB68D93EDBBBBF67BD70A0FC536C81C8D6E8B139C6B3B5EEAA3953464549CB38B78A15CE3D5BB4B798E6B142BC48C70C5BE61F82DB6E2EC03616999073574E6FB35D441B78DCAFF56B8CA8F473EC0543C9C69E93B97F95FCA58DAAED511F4440DB252EC18C90D2F97AD901716AD34EE103EAB0B7982994E21ED1AC4BD62ACE6DFE12C8C2CD092E7A7E37BD4E61B4CD51D980171F8D4253A4E7FCCABA0A513038276325372527621B0A3DFAECCD7CDFE98CB79C0662F5D0234AEEE9302438B778238BCA409D5908768779155D659E92D12CEEF3C2C954C3F1A4C2912E9EE994209B608A604D0CD87F79665A25E774E6DC1D8819B85852D9ADEB174C75D982DCE29FFDD24B7AAF5946A74C14A301AE09F1386AB17ACC341D6DAC040FA6527FCB8E095CD4F1651E47CE02E6ED76C085B2FABE9FF5A510E63E73EE386AC17D5C2C94C2D528B3A9C8902D10C1610BA70BA616C58D037F148E6332107DB9F64C579064F19481669C7888C21F0A3374194FF1A72FB6180DC01D29443BC52C318AB03843357A5A98B3D5CDDE9BC49D3ED29EF73CAF44A7849AC6DF4B2D353B6A562386BD480512108CA0ECD63BB3D3A0695679762F8254116D8049488BE6389FAC08916E6407944B1526BF03551504E40E6A3266D4E773E892EAC4DD5128374BA341EB4097E20A9BBD4E5EA26BE6FC325D9B71C232DCE1974928516EA2519974C82AEA5247627F802C6442B67FBC10E359672EEB9DFF768E9333A2166336FF0004DE5E7BCA55998C860FC1A86B75CBEB3FB5A5A2519D5227A6B5A7E0EE058FEE0CAE2B4AA75099FF098089F0261C443B13911CF3250CAE2F2906CB6454A20D0FFFE8C5AFB1DE7C5BA8CAAE00CD7C2D7219FC83FB158FD6D15EDC2924AB41C9B881566C538F5E38978C3182FBDD0C0C532A77A61E5B8E666B3C540DE976098D2BC68C0CDACF57E9BF1BDE8A7BFB13256BC69F2E386D8F458D303BAB781E537517AD7D0F0378D2F258B013AEA01C97A7E8CD2C3DEB203AA8D59084ACC2B09AD3C97EA613A2FBF297038B4E721665D512DDFE5C13F11DF4BDC0200BF610D57EA7232914752F75A544E01D5AE0DEFBC9E18695824058BDFCDDF4D5884840D2B55D6C2D6EDF475CA75F3EB4D0EDFAE99349684BC9C533EAD591085BD1D6D4E4F9B00A54C97244322D505AB52B2D4E0438C6AC5D2C3983BFB2359FB21174AC02156AE11EF233AF40A695854C84E620754419CF7ED9EA4FDACEFC8879B2EBC7B29CDF9C4CA2921E084486477C1452BC3BAF529DD92748E2B1B684B1103CF4C6EE11999E4121CFC7E2F3F6C7BB9C055F800DC46D78D9D94C3B20BD1B697411FF0B41E38173D2C9FF1CCA77B27384026ED2EE25223B0007D2930D700A20EC9159A66A4BBE0BD84DA52F006D7FAC6D59AB2BDE08FBCEB76A57FFEF59C077F9008A4A231FCC302E4DDAE9F3DAA55707C1EDCDE8042176DC7DC6377BEC58B236990AA6C5876D5A27942FFF7FD74B7DA1D2EC470CF71103A64FD2917AF4C45D4C59C13F58472AF408F9C5F907C7C6AE0F402B404AA40CF8D962EDEF7B7654EC8E36C645855BBECC1337EC18F0EA65933F4D07CEE15294139F479A16133D2BF412B5E46D5B06FB170F0C93DFB8AC3F7478002CA76B67A272A3224C8172CDD8A616A4C52F5FDE946CF5733583C53835EBC90DE3ECE34299D7E5434BF072F08A44905818EE9708815CED10E9043E88B6EF12BE72FC1169FF2F925C38E03B827CDE77740C7C2848AA3B09F555E2712B341E248772EFCF01B99CD5403642448B5243F35A3073A6DA7685AD42FECB05D46FC99F7D6B8EC56F39A7E7B3579FCD587E07C05BB7E1F5D49B9015375E09A9A14F2CDF049AC392139EAA3C2547426B8CBC0C4BA76C55014FCD3940FEA2631A75CD2FF5C22B8A65C9AF2DB1B831C30EDC8EB79B797E76D045EF0B8EFF8D41404F626DE8551FFA445885CA1E3C9BF05B5C39CD40E3B37CE3B58514BC70E2EA94CD694CA88C1F47AACF9B4FF6622C555AAB7C71EA210FAA9C0BF9089DC9C9DFA77C2C4A92F59BD7CD24EF4F8D5088DDBE22DE854F8966C017FB414464ED6B991E289F7E3FEA783831CCFB51E227A6DD4F5EF50963E80847FA6B350A2DCDA3C875D176342ED73BB42B416E58D1612C4D066F1207B6E16A955DCD557A9EA37A9F24CCB20E74AC4D6166ACEBCD7D651450E5D4AEA86DC89528DFEBE07B39A160160FEBBEE5B11122B4177FD04B0A49803E498F1BFFBA898BE3B26320966165E136F7F517FEA35EDF01D36831F9AB478CFF8241E01AD7570C26EA62439013F61D48797B92964903802AAAF356C6AF7645F5F4338C7EAD5AB2898C600123888AF42A2FE06FF03D81320FC08E7589E19887EC86CC1B08204C29E86CCF187B1240B81F7D375F3762CBC10F3BADCAD7431E59A4DC136440AA72628E17D2BCFF916DBC8A66B8A83A3C6400EA0CC57A82DB41BB28CEA9E9CECA1ED826719B9B62B6CED5B52FA518FE47274DC6E22E5F8398D42AB23572CD6623EC307FB7EF61892AE3196C48125605F4F09B9C0F0DBBFB9D9015D325C546CF3B1DC886AB0DEFE2C35CD39E2AFD13AEA74F787B410883EB72DB8CA7D225E6FE8143695BC0FE556C6CDDA493F92ED62A38E8F90CC4C713A4798984007A5CBF68F0CDCC01274C96A15C3C4355ADFC75F7DB0603918ED6CB4E4491A8569FB1A9AF32528F6E26B2303C7987E39015573521E024B2230BF1BB803BF2B358880F2840CC58ACE31E551C8E2A0F8349570741F8E93066C8F17608DE35AEC342415A4BFDD13A9757501F5246ECA49913D0F02EFF35F4B3D40DF97A64B0FD02709C0832C423543A850776ED9C0574C26CDAB8DB371F5F4B731E6F510BC09FCE3DBB58BBAE1074CCAC284D5F8068D2435E053A037E3ABDC957B74339EF0063D367F7556E49D2C7A7DE3616F5E8B703B7585F526E9306C59329A18E76B85303C31E3616831F2AA2B173CD0A43CDE76AE52EFB8CF3C381097D7A7598EC833A75E97AE4DD539C31B3E45216EF9C844008C28D12B12D3C7EA7FB89B3B5D20EF5C7636A8E83D6A9F8F7DF29C9716B7D92313048A7E14B9EDF77FEBA874B9410DCAEC4816D2FB57050696F5D4F0DB47C6183D447C5AFBCB948D09944F4271368542E377DEECD006779F6F7649B946E79BBF2E19AB4E93F142BB24E6D962F6648CD0BF1BE876F6F431E883105C3E86B973E30735A6FE17346ECBEED5D101EF0AAFBBB4C072BADAA2F4D517C272F2BD2190F5F8C87D961041A121D6B319EBC959AB0603096017BF7CBB74DBC74FB866358EF8C1AA5B9A10B2C524E822278627C0AC577AE9383C2A529054528E58D56699540E4931BC65A125EF4B459A7A5FC10E0324ACB641BA33C83A7E100CB00FFE0ABF6281F8942AE5490DCCA37BF464D0B061028E46E025FBD5F6DD6CA1BEBEE282B749FF5B002210916B9CDC4D903A95972FCECB9292A554AEBD821AB4CC50D5EA0A33A699FBF07F2CA520FC44D4A9581182290294A8FCC66DE3FB5B7F5EC5B267D1A0E6F84C27C02253649F5903389A0901797A7EC8B78AF12BF2B1CC22D291347A0F8D6EB2698AFCA7CB4C23EDF250A5B77E51EFFA3C675F1FA951D72467EDAF987D5B63DE4177535974BB2006AA9A8DD9E624108229B1C5735BB039CCE47162EB52DE88703A8BDB8ED409BC01DABADFD31EBB95CAD9026705DBAE5A2D06376320BCFAC17A7DAC957BFEE98480C7A111B5ED300447A21FE62448F62CCFF7DA68689A73A2EC70BD13130337EABF26A00BF86E52077EA00DA46FE7323780CF98B3E998BB30C3998017F4BEA455568FCD567086EC68ABC40113DB474C6C88B1C1C7588E7A8C8D2082D4C70DCB8FC3D8FBAC53CAE95286F13254253861567E4715B03E682E422C111169D96359EE18265C3CADBAB3AE61F03F86D096ADAE9A6C4820EBE3B61015995707695B42B67802FAC2D6FBB2B67801A3E48843EB83288AB52C29C1F112F9233860612BA015D4B7CABC19C6294F8871E2ECF6AF334DF9C8330971277E32CF1488F04B4B285AEEAA83BB81D54B6B8426439804B027822373AB99868EC068735C816521BD75DC19F79D2E2166B1A551C998318FE19F5079BAADB12732528BC8B522438AAD252C57D3899400913CD124D2DBE90A891D95900C0256D9DDBF939BADCF6E37E6783DA2A2BAAD872F6C8C11878ED6D5EE2988135A39F2DAC7CF127100C36D2D4E58B3A9B1D7341120FFCA0EED2E98E020A46F1AECBC809A21EF79E6DBCE76F96B6930107F078A5D4464CFEAC414CA41A5EE4F87CCD8868E7922A14C247885F0DA9E23A7604EDE703C2BE3633AF9CCC32B9E5F51CF51978F10A06F5D77C67927D80AE480E7E5E005401ED95467972ED87029029DA05DFBCF2F0B9D50441E8F15804B0A59D23CFC2E3C0FBFCB10B69AADF0B37C06DBF972E264C6CDE4142C04FFD9FA0AF2451F8BEC3FDE9723306085ECEFB17C591E691F9B4D4F796E293C0CD322F02B96938A5F7D1C8A7FEB94C031DE24E71020FF37E00590AE7CA48CA876AFCA2BE3723EAAD40FD27B90FE6EA039C9F3F6069FDBC70F16626A41678A31E8AD88DE9BCE8A25D43B86EBF80E5E426FE21606E67545FF8E55FA7D9802D65AFBDA79EF40DE924FD0DA7B5C8F6A2CF993FA6D27B2861C629CC9BD2E1E6AF04F88065614F7E24CDD19C88CF2D7D2B93B7408D898525E5141FF71D18DABAC186DCD432F3895A1027C92CF8613C80BD46E4758CA26C8CD92B74EEBC5FA5EDF9C9FEC54FEAC40F0944E3FA165E515A03DB57C205D383C04B2CBFF703939EF321DF8A49BC3F5B1409EA491062B7B9982277825B52C6CC8313BA05ABFFCDFA525445B1CFF773D28536A989D257967B50D7BEC4FDE5F338D2AE81BC8EC592BE93BDA0A7DD089057E675674E8B997B05D049CA3DBD60B7F3FB23BA5F4E5A48ED8535234E5C66C41B157C25B5D9EF5C8C0ED016D6B217F4B60BFD0DA223A5D40C2A403DE8268AD5E6207C54B217C2F009C5DD052266722DC21D4AD8314DE498692E3C77C9F8226A14F27D49E0DA1101E32E5B86BC0F0348A20A360A919EC863695D2EC318A61F654C9A1526AF1538F928DB76F9B14EF598F2551EE85D6E0429192C5F18D339DD5A280DD5B1A8F59EC1F2947996C7E190C87502FDF5004772224BBD1C4DD62A8DA1723EDB41176A9AF04B1F30D09050E73579364360DB4F98034FEC1B43E6E9E0226409E6AF1609FEB862D845994BC20E67010237B74DF1AB59EDF14B1623FDC990B87B929FB7E837B1ED905286A886F59B023F40B07A989EF7A99E974EBAEC49B45FEE1F405D11A641B2B150EBE854F7853F06026CB1287FD8BCEFB15D2AEA623D7C3ADAA00B35A105ABF2D8F9715BE65AFCC1381D29C5EF398F2B76FE1651348BAAC147CFAFF34778242B32A1620E0332EEC7AF5E750DFEC30A899452ADC530DD933A07748DD522AC20AE2B2889FAC3237D23C4472FC8C6B236D4A4D19F67264F54BB9B25318156B30EDF273BBF3598AF5B34BAD41585982F6039F6E488308B47EAEA5D21A91E5838F7D9CCC8F726EB2DB82D022BAF103AB2DD444489B94E8DDBA71E62AB6251DD5D5F69E44F377674A5C2B032150C32664C96C072867BB7A2DC29033E6BCCAEDDEA430E5E155DD0724FCBC0415B2AB6DFE68A2E59403B206BBE7F421FAAC53F66040C5CCCEB19F17BF000AEA7E775211E48AE04AB32B2EA470FF97707D9C073FE72A7B77D49FF8DEA36610C2A83306435861BE01DC4B20DBB8AA6CB780328DCFC2A32D74CABA83929CBC85E406E74EEDB727A2FB5BD9D304AF46225832858B295A17B9E710BD7B0B5D19DBBF4FD021EAF29F4D1B6BD7E78C8A3E3235B5D0BC687BD5B428D2318CF4330EC343566D42D17BE838EEEDF70F1E409C189DB1AE0A205D222C92A1ADD33B8E3B126AF62818A2DBE3E3C001098A986865C6B57D0B2F5579B97B6F101EB56FA839F8789F6774074185A8E0F383E9D8813CA1670D8B7586A3A1C27A3F5A3874C4E743EAE21BC519DCC430E281D2F73C23BAB948938A46FC24DA94647150DB72783AB3FAC01D834A8544F144779A51480643CB1ACCA0BF88D203F865664A5ECE18A88CE31B0D8FEEC585F9531329002D4FFABED01EF42AF52DDF08400C58D07E98046D77C7A142B513DA0EE795DD57EA43F4CE36C8F6D2862044945DC293C8D47D9F207B0344220E3177D6E17A4B39B22CCAE3C53D4E0DC87F70CBE9BF743CEACB8932DF8F84A527C9FB84C6CF5206EC2E43D1FF8E846DA06EBFFFB87BEC09C63E9633713768060ECA6259AAFE7C787F3947D5B94A6B80FF0A7A4785836F9A1396833347C13034040D1C6B1F83782AA6458328160FA04971DE04A16B6C031B2571DD131912CDF2515DD56983ED6EF3BBE5B3989E951BF0B99C5605C38181E96690487E87240059DE21BD220059E5D7E3C832FD4569BB7DF06437197CAC141E8FE5B369B542CBEED2F9025A030C54F0B5D2B1E79011CF2A0A0DB14312E352D07BC03E654AABAA95AFD30F1483B57BB1A74A0CDF8C9FDEBE4B0E156FE86BB1E21D861F8EBE0C4AB2B23E776EC01A281F6DA9BEC4C560668B4EEC71856E6CC41741DF2EBBD4E95B661EC24FE31B1DAABC9373CCBC82F3C13C31E478097259850221928C7AC6BB933A5631C896ACA87FB6F5E3EEF36EF5B9CE59F5676813A1A7E768FC9B8AD4A0A072672BA23CC21B21A95C9BBB1A40FDFEBD2D611B773DFA55F87E9AB1CE51CC42B0FE2FE15DA2D73F656CA56279AA16722ABAED5727519EA258794503F1808E4EBF056530B318B99A74886D05D042DF4D829C425C908B58162EE30A073D4BB7D27275B548E7A90E6D178DD27F67CD955270825FB96300C4645E4CD9C175C1185707D4D365955FCFD245A55D64EFB66308A47FC85592BFB755EB4AA8B78B541274E2C225DAD649C248E7F2792A56BFBEF704551588460B192DAFB9BF6798B7D4CECFA424AEAD675DCA081E60BBED670F9AB2316F5012E2290770D3323403DA5748BE6681565A713873A5386A6F1299F0E1EDB341FFF08325510A7F2FE5EB0302727D7355EE48ED5DF4316FD34833238690B91D47165CD4CC0454DA33B87569D38880AD92A92ABA0F24D99ED4CC977A2B4E37954FBE9B9320101C80A858122793062C7AC26E71BE2608DBD2A97CF4E884FD3255D008700FF3531C045750B2EAF7730BC9A51C675D94179DCFCE9EE63C1473D15B4319AA9EDFD19739CC05C5C3C8AA618FA9096C6648756F8AA74FD18A8CD81A2D248B856902B4D30182BFC2F392450F902973043EA0F5E6C872AD43A2D319F99F095808D83A8B02BD380D6C3F3DD227EAE2B4A4867713853D63CFF405621B1EEEEF00D5BA2FF254CDF97B4226334A9866A2B5BDF1F8E8AFDF1238DA9F48FC388A339F79D648CAA0A0A69D6F16E297663E5F4CF1AA95427E68D71E74C0A2FB6B689224BD9978F7A3A4505334774176FD87097D8AB454CABEE138F2CDFC6EF0F3DB14B09DD02E7FABE9F156654433B75B951AE3C196D670192004DC1924D1950AC597682EAD1C087ACB1461247DFAB3CD42279F9169B69B33435DB9D8994AC04B15D45007F0F98334AC5D783219B376D9ED7553F52CBADF159F69282050A4C843467AE7E4C4A142A61CCC4C48DC3AAC6B8E0A8D618E06C60DC924A943AF9000F896446CB62EF4E47AD6D1FBE2B8984A48ACD7C0519D6E87A33106E9A91C298808BF04E1267349334E6C2AC015A9F704B2DDB56D27A8B00D876AD00F62434095A6F7A5E9CD4B27FE09FF69019AE5F27330792CF9A1C07FBE98D23C4E615332A77DB5B6182D277DDFD7572DA75748DFB3B9315294EABE4B6D0FC3114B2AFF5537A6B05A7AA9ABB4930E17B7FD3D8F81AA2D674DB69AD967C8306FC3E1CA8BF78F446B26D8F2FD1AF6F7FD7E52867BCCC3B4DBD7227EA992DD995D77C4A2BC808C7A3E68FA433675F489BC503DB70115A824669E4B1861CDBD557A1F78F1A4B3582B2553AC23F12A4326EF943C56F847B8C679695614BBB1DDEA9CFB7D799CE42DF8B735FEB9DC119DBCA306DA4FA84A50F79905E5C2AC1F61241D88359EE6F62DC9D3E4A1593F41CC5F3C02241CE5EB62C28A547FCAADF1DD688F3DFBA870D9BED723B02B0B1CDB4C08D093C48977E0621930A668A5CD517A0EFFBE248B4AACF3009BAC0D47F49378F30A3D2C2800CD16B3C9464563DA4A7321082FAE95DE5645FCCBC5569E942B5F860A32F04082723E9E53F2D18099BEC5E23A916354198325FA8DAEAA3F6B7AB6AAD6EF12A03CBDC27B83C818F44"""),
-                    TestUtils.hexDecode("""
-7dfa6f43cf7e66cb9e8830871ea48edb07de9845daf9433d74ba10cded10ae8fb4955732aa5f11581322d945bd5b0c05ca195e5373453435602784c9e386ad0766d81c9c954614533a0ab7407d4eead99582655ed634e9a7db1458e3f91bf0c4ff63adb0b62c4e813c396d8a640d0464aff2abc80dac7a5d0329e31eb34d00c2d90142f47e1dcaa203f730de8723ff5f6e9db3dc53923c1dc413ce54f5049496cb69e1280ba7ecc7cb540a62e441c97743e196a0144db65e3c0022c9a6ec621eb1ef79c93b4b224c4a1df88afe1c4513988a9aa4d6aa2a440a9d2b3946dceb5954b0f5634af19cb9de528dfd8bfe857375a8c903b124fe6b9584fa68f56dde10114aa62aafde3159db334294c06b2774fd660a13e997403f04f5027bda9745e16684edbbdcde4155adfe34e0febff14bb05057ee9188c2f7ec829389e7fb24c24d3ceec6f37e53b592b40fbfde40cec330639e585017f79fc86c68de2d24e49b33b5368fd1c7d027503f12b339aac9a4dfbe711918e9eda6bba049154d4f3aa0519078e9ae18f5a94f31adbcc199a72a7b09de94c7a9ca94a04d016fe4051e5b778d5de31f3fb76fa68a71574fdeafcea5e72b563e99982ffcef751e8422d2750809786b57850b832c34a1ea88176861a4176a6623159d63535b5897ef1621564c1882e2ab954455cfd5eb080f9e979a580fd8ed7b02bd504c6ce24c55c1e582e524b6aaa8ef66c666807aaa994d22df7bd5c1a01b128a408b9dc762f2a5fae6a61da1ff4a2feb7e4389bf3fa4357c61acefdbe386b6e55eb3220eecc005cc0047b45bff02e87f1f55177c78c16f142c27e6e9c3ef81a5c5cc77e70695a7ca57e93da2b5c0b32a8df6a77dccb47f3c9406ac58bcac1ba5aa511e417648c4160979d7cd710d35f4b405e7b3d09d229d011013e7c84ca8d0693696b4028eaec2993755bddee22be25b4ab0c5541d6379a067b9fe755955cf11f7f83399bcf28c331c69e2f9a80431da37b14c7e854232037284e91978ef928fe68021138649d3cbc669126910cd648e39cd91efae120eb275b114d33629bf451416ca9affe96d67ddbdfea590b7babfbb49a8e6fada738b0f2bb907e34a856a835e09a8c9076ee222bbffaa25a30aaa21309449c4cd0a7fcb6110a1c82fa8d4a737bab8d92e4bdde60827442e9f74d135f3834073da3867b5094f4653d88607e8551f0c2951595fde2880f0407b60146b5f83ce3e589ef16368b7e058db6b3e8b98d6d459428635f1fe23fbbae5e96d5afbbded8dc22010c58d11e84edaf7ffb8c6598d15e8d3800cdde92ba519f3773ae13219b7e2b967f360162431f50b0de5c634dce2a361760bf2c656e47f8d10336c0c8a0694c148d43dcadb3f84ba52a2f8a167732f106df835e50af089652c7c806b1f51ed4dcdec2cb5d97b5c06f6c64c2be83ec4c1b228fe5615b7531921a5ab4e2357deff9d75e04586f0d325e0bc6306cc22f59e26dec56a2b0ac627f95be580a8efc9d7c27104a852df113d443664a9fb27c0a7e9181372eab430394ef71bb5327e2ed828b60a7b93a42b054cace4b029a8f4fa8fdbabd0b728971ba99c641ce864b627f9fa17c33a6f50d3df9c97d066546a37ecc518b6eec761351240ed4ac606e498daffcc4cb2ccb061619377d33d791938a32cc3640f45549f625e8c2c284a7fea4fe1a864417183177f9c914348d7a693e2d53a95dff9fbe6b26604ae005bb1244176ddb2eefc07942edc0b0fd336f267006979bd82c4499460185d7ad41301fbf5b17e78491a02b8df328aa35eca2346c1f37ca775d11facf01e26d7473956f28551bae4afa6039faf145ade0da17470beb6857ff7435b7ecfcfe51417282095d7a83316d16bfd0a209bddb52461fbd14a74bfe06183c01c40cd6086c6594921073e6a49580aab6b28c71b960ad575471fc6276b4df624870ed01346e3a6252b8e9ad82b40cc88f5627ea5d8073efa300eec86ea921cde8cec9e172314081eee5f6cc665f2b0f6e5a0e56a9d55d8fd1079ce1b5ee10fd69b1a1e8fce047cf7264edb9c44e51443387f9d2fc54b3ef09055f819fbb065d6f0f09e53b3d5536f1c5a98c1778a5a45755894290e45d27f93fdd72e948fb5a1e4b2b97798eb030933180e8aa5bef5d89770c546320c9e2080eb7a1ee3c03a424891517c3281a0f2a7865a138e7cdb1b417809c3c3f62b12baf9b02f9156ab6c774c03d698a9b52380124d863008bf3875dcb7a8a80191c288fcd856e138783a0fb301e395ade94de2193b7f316c63fafeb388a52bb934409064aa9822f5582f632324e11b6e4bd668c0c3d57267d64311556bf855524191565c02da543f1cbacf62a1d5d9839990ce77590f138e7db0641e51ad911c3c116addea6fad97243e9ee4efa3619e8809d67e8907aa0d63f4d9ed863999212e5edfc8e7c761795792e7d9c1d05af67f10645f76ef119c6ce384e92f1f91003761c9203f2e2e6afb3ed4daa3c24d74b9cec3526159f7f88b6df5354db2e7eb0dc1240cddcdf076b8b8f4567eefb4b27e07aa3a6dd9e17695f58a647002283b2f853e9c5abf16b5c4c1f4cf6dc67e14e2ffac3ea0e98830d8613fa7a149109d054ad4858fca3ee6bcef6bed0ed48a877ee4d0c758cae7394d1fa4d65e6fead01c555ed81e9757641d48ddf8ca28e3a6448e67eb0daf3dfdcbe10a376db16063c1a3c48abf242a5ce4e65ab7d3e535339e5689017337b6051820045bee408764b4578c6d0d7e1e17b9bf537912925cad18cda39c8402e3897ed04ca387dad9cc68d049350c2b9d8440f4195144c5704251e5164cb969f08a4ab01d230dcff7c769a026ae57fdd36abf805d114716a8bae45c099994eef19abaf515a0963633763fd2c42f4fce201ec61da3b5dd9d2d89c62b9dc8dfe0ae91fd52b67822cddc9e4604da09865e3a5f9db7e19f1c13420b07afbd84725095ffaa7f3f301937842ea821ddba3e138a0e2ff251d03830a885b5efa7f38492e376f610d89af18c7878e0e179c587d33c2e17241a570496e9ff8e0e980d8d7eafdea8f6cdb92ce8479f21d0a45855a41f5f20103389d3edcae037113c6777bea02de2fe919c021476b8ba937d1272dbdf038cf74e5bc7c94f25e85a8314ab2c1ebcb0db37daea22c2411c77489425be5a37509fb21dd995badd07c3c0cb55400f3df5253d856068a0c643ab1599a30844664e0c1234663f447a1d6eed317b362ca8574e724c263c29221231e41f980c8a773736572f282b5818220e34ee47ea2266f9291cc5ed376aba26385a5252e44d05a49755b1f7b0856f855070ab9ecb1a9de29a5b3920b3ceda55c0aaaac031f935e563c50c840f9002b49dd06fec768a9a258eec5b6aebb997a9e2fade8a95fb824c9fe7332528e62b23d82f99cb9e13e9a339f1f086a7a60aace5f34d2502a715df1d1ad9ce421ed1802f6acfcc96836e481a9f3963b0f28f5ac8381f83a7447e2cfe35f3f95276d54a8143b458bd195cfd4a2b474923791e8edd3ce383e80c9a87a258734656d7e82cc26aa4f038bff3d13512ca976408466f32fe5202dfef7a8bb8aa0b24d798191d8086b5a3ba1742f2c105439c58ce3288d19aaa535818ebcabf73678f27856da1507aea1df0202b01965042602c582bc9a3642ce2b04d4b0bb4fdf3d82fd3c4f4c99ac960530b04bf5fc3b885b0a5fc6fea3103ec3649f40ee24da9d140ca64f28cf0fe98d57f72fdedd468b27601cb5e34d34beee6151ed6e3c452925fdf6b9601d69ae3c36e9fff6d6a1b6af87b9a09c3f65e121e21d6b5d02e068098dd1394894e472ded09f085396a4a71cac238a878c215e7a955cda7f3742fdd1e2dc4348f9abfc46df4650e82373f08e08dac0a59ca8ffd419ca2886c891e88e41ceb85e10c57a915f14c79f5820ed8dac9a6bde0ad419198efaa1ce3dd2f30bfc82fb37103e7091d75c23ccd5b7d7fdf1ea49aade37b3e7fdfd9892597be68b47c912470b518667c28e7c8ed0fe339114bdacfc4b61ad2268929c0e3d49e77ea2a3a4469b79977e928b4deef31617f8d97d879293318ceb5c16ed2df4f1c0a7259786270836ed39ab184a0390e0d0d084c5313f9cdcfab7490c0f8df7f9fb8d2ba658aaee470524d96d90fb51f509ca6db5b0193f817707b6afe3faf49779c95976d57eb710498d9e7d4e1dbc7026a19d079bd8175ce4f98d07462f1ed85fd34101b213cba0cd73eeaca9133dc380031f6ebdac8f05eb29a4f22ba34e1a6fc29e5aad9fed9a74ad8ebb6463858bd894e390499d715c5140b5cb342effdc7184c53c33624fed2f9aa05e085cb7d68e7e3d425e6a08f91dca36e18c8061453bd980f41d85df2924f3903b1ca62841d4545f8ad8a4949166990499814a3db50a62730c88ab592be1209aeb8d2d5bcb3597d5160ebcc24e8601900010fddaf5842745be0b72359e5b90e6c11bcf5cad521bb23fcf452dadc00d83a9cec6f24184e90a3e35eeb3ec473cb0a9ece0ddb5418734231a399728a09387d82acd1690a66acd28ccde630704ca4e7d232ca5d37eec3925a3874581d181b7391af5d0adaeea556515a2a8e3b164a7b85adbf667992b6bff10356b3c3e085fd3d676d90bcd741577f000000000000000000000000000000000000000000000000000000060c1113191c""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-f91692cbc904c6920af9eff6f57b6134b45bda6ebe9ae873a39c1e0f4330b9bf72955189bbc843cd72a944b95833371e4c06bf3eb2a665b4da4df5b987edcdbd5ab0e7c5823abf0bb6bff471837b8a002bd65bf7fcd76328e6fe6f15e57a8ec933a72cc3ed112ee597fdfac91601e2e58582dc4b609080ba634851b25358d0c9754350281637262521374777556415104864154860206041352465214453553137345236775358075282056885647303768587045030113278731814115881114551057578670817173873534401000711068401828428263081481017277750831465187625833523810016354580868548401441857264083372314878161522270727064333711682546124068264412643840758358838408447627025338300737308371266614001014336245214783358451307745761748303240644786363764736471825520567742255620673034736885603143848540366770518635837224344520418782013854701432613146461232406724061145508623762757104474481846413463435761547477850512744612861336161462154873852416844183351672874258434175215466573313077127617803725473868377265620842720484140613811225841166435350043412651265702675883751576272877822642382142060654556010885518346603814832385350857032673022330504364602345802637766037480027500017672070832862507221411804200675641531481158012220062173320173332478120312762320104164307572211150304777112577368026515022475227221526237672850742604350673830034371436706872072077285850737337730722006562010420468188176586122488432407536587767541380746858122020430172573028068160420648031447532653223555442726570477084433678280835588627680013544120740664444462067616224381176624820425675553845610766215101372521016340175780778380183351722838167847841251851220785205763271604276632836107100703635177680045501506353524230801541453041757868356061560200675564087263218478015205085086217587120816787626038643588882256045332002685650850864406716310262225785367023646170404536861170031214215780548215656682163386848637204727003614771133743560622307402732767066875005724512425272665757480306650470488674004187536675155577445440765742464370661551864815504156136385586564574816703676147564638005517426348048822375856871184345217602738766260417585746271507507570510040056317530803348186642144653053831678540337242413885416064200831201636480323423582817278526413532750432252553652348063287644833408001231444005103050185162038400434420347056323560663011208233834176232267471065573612368558534828568744114127618310560854752054526264330215157680613584083161688058026515337171512715422432583342201257422527403383585446750778640127544781836365130507331711865536268214184662407615508115011054020552746102778440301043766846753320370386223010231318077850584875767675687354456847801617844783652736474218216364370170532852111846533242685183301345366137533712315337353808163275816037073475315320481278357032512385723425657218052577281508084872030258232370206340126045035642787353202504281812581273174383414764882523037835526007680523372518155181435704877226072110817710451470716262037413701434382786533247683254721230801265816050461107728147240545711084436157023770440121161026812170048186872204082147300617864005286020058133765464066235461034572838713356310701101481833843686614643073413362213303431440568171734005681464884814c96a6419af7dd18e6a547708560dea1bb476c511c946ef5f593f69649f9ab3123a5ff302107bb4367f068e2f66ef0cc9a16a69a10c91e003811c76aec82791918fb00f736573bda22f517252c72da1f973386e41509e46131701e690a9717053661d4c1ce3dfac2d14427f63bf6f9c53cc3d946a83ca34e09242abe5fffb63781bd21ab2ce57dd687f3f77e1edfacab5014be6c6d742e7e91792b489e8cdd932ce6777cd412729be11248dbc8c31a6f13e430ad1faf5f0d99c19e5e5bd26827f2d4bbf4b7a5ca2fd4026507b81828d84a56ec69485d011bce465b461262ae6aada92a67745b696371145acb33cac858c4b48039d6fb1ced29e3bf963b4530737eadfc1e7d9ece7d24f442f6e0f2e47576def5008cd01e85128e211fc27aa80c558a0bddae7cdfa6f14a9de7c68ee5d611d9527ef9e3feafac55f11e748e125d2fbcad6373338a579ecb332b99095bbab9b2efb3b4da9fad20b48ddbcae17cc05e530c5f8910cca285a23eab49db9b9a052af08307a634b3b8e38144800b32260e0f33ab2fb0ace0f4325b9f091cf99c80de5cf88d62249b68596c5cee719e34cac3bcb25f3f1872d8c358c2f93639c5bbaab0d41f75ed11cf1b98d373c855cbd254c2b3487dd779ba6f28f8977fe1d470531d5efb392bf3ccaefb1c33f5ca462465d79b32aa2ffd9c98bb455b3b306ca41054435b727fda48fce34b31f81fcae6c07296ef8a4a5acf37ccc14384f0d31d21d31d7131827cd0a16e112c7572e291c67bf1900c647b3c1b5872110b9c411b15f7acea2a7aecb97a671e4308cb77227c92333d2d24a0db6945bbbd13c86cbedf46906cf41878f0c3d1e1b304aa9a3cb36549d6fb1c7559704d76bcab57b2b06d4a52e92e1c3cdfd200423d33722671279f9698f23dc56139258c02cf9f44d5c7d9ffa67b0060911084a464485280428481ce1ce470d96fb8d336b9a4d548140607c37f2d1bd3f4645a96519e50be01d3912471254034be81b9b627a3c8f60c70edd394776a7b9506f7886a1f76472674c5c93221babdb60100a379db220963338221c6f811e47229d1116c1ca211131500ba2dc0973c16153e28180f03721f46e2a58bcd521bff6967612bbd5b70f6039e5849534a3789fb5d80d498f91a7db68ceefb7ec802be752c3c4519968024eaea470e33723376dcd7d1cf0cdf67363b805c65f366d5b1d8e967f86347c16bc3fc70b7222de5b5593f65f9b99d8ad8ac8f5a25630d4202c59a8029f240747d2ab784d3a8d20182e0063b8b8ec64217a05abe4960b265c72a75052dbe5e4bf24dbb5db6e7a0ba448b3c8da5797f15fec696dd82f0a2a9eb867d1a65d95f3220a64226ab0148cd67fd6ffc95063cdf7207e015487dcce5dbbb841de6f2d3cbe3da332ad75d8a7b6982e5cfd28aa7cc64947050dc40ddcde3f77f304a7d5342cc332724e19ebf36d083da2289d4536b47bcdaa31dda127dbd90c41868cc81ac638f116f9cbf5fbfc787a1c1f7835d7efd5933ca85965f419c16f3f4d5a618c6af610055667224119f9f869aa618ab5e2fa10e92cacb53c9b4abdd62dc1bd82e8854fa7469b7f4621245ca3c7f97067d40ace3f7e48a3bd6f1006d89047f3e4ca07848b72ff50d3b1de761e8381274f25af3ac755c3d29c1bccdf810933ea9fac28c596928014f07d654c786e61bddeb97bd654a36cc757700f988d3a27b023c889489bbd1c70ad863aa7a8cdc7adf720940d57f24c52c6c83821bb84589a7fc30b52f954da9d69d9e41b046dd3e8b37b4b6e2376aa0e7f715212dad754bbeb64a0a2a0160584f18646ab4c2b19bf1d3c3c383d7b6efaca49e5101ccaa64667e1bc29af611fc94aff9da7334984431e0e4397a355d1c8f9fe76635492aa891b90531b7ee9f5ebf87cddcda8b060d09cf85eb4e7859b93c7c56af470b908a3b31462ca08bdf66ad9e28a7b3e438d967df3c7c844a6da2d57a61fe85adf971acef4bb824ac9a4a9bbb8206e5ead3d96f539325647114585aefe1752e405805b987650ef7fd2ec8aa0069f5dd64e9a3541d43dfe09c96a83bab1c9ca6799cd4789d082d620b4898212288a7a92792803d204c6b77042634f2daec62bfc7b282cfbc80494fa2bce24493f0795d0ca8bb21d79fd5d1e4a53fd695fb8def7786aab4d8a6e6b5a1c48ba6461134ce550f1ffb0e0fe236284789dd3c10e63a748b6b9966518f641c5ad3346c1a6be1437dd06232111fa2045ba2a7521c6662b9aed1397509e7dd10e3343d9d439843af2f40fd3a9b6ffc8dcbbe2f89e3e718e83043fe84e0847dd9276bb20800ac07a6a0ce94e9c2735cdaa5dfc5e626f25b902ade09a1bab18509d1b0e075286272fd99e469a525523f1ef103b71b9870380324c64f4ecd0e1b40f6c2142c49cac8629941cf68318440ccc15933954ce61e48006b9aaa466b3c69a8cfe8519a21aad7a9c04e6e3571878ac468b72f09ba30446d95cc7ada23d7413061224ce2ed10b9a626e3014710444e13101cb5b2eb3e208ca67a755b7f0bc166b53bfdb7b08476c42e8f8123d295cc07d5a7b74df3fcdc1447ec23a5f1d7ab98a965caa69e466e80826696c1f46e7be9cef62f7d82d448bc5a5fdc6f0b3e355db9230b17ef9950356af47ff1f24813f8fc9b667d375b7897d2a7dc0d84c6c7ebb82e3655f1e84ca5f5472d230ed0e2d1ba71bb99af8092fa7c6d4ea037913cc4b265d29bf9d2a2cf9593ebb6448f6c43501da30dcb7cde661a59c9e45bd694f30d3549814f52f3e01733102f48bbaf0f48a3684b37293126abba486d0dfdf8c075262bfa6d9f095dea8ee9328a5bdc0db76498d6ca91d6314f1e3c9ca11018c551785edd5d90bb6e9659f117f62854fc62a0c707c25a42f5be89aff9daa67f0fa026df50548e8c2086d919da914b21f1f907d146e72a286863cae693f1d2022344e67acd3d70357957dfb3e90af2f829427043b41a3b52b1fc34e0d80ce1a47dd5b12877326437f9628eb25386c51c59d0bde81862035b185dbaf7c574ad4abc0d50e86ec3e23c6f51f9c871f2f55db0c4a6fb9a0756b61f86bc3b2f0c9604bbe4a495abc83bb1a07ce7e9d9d60546b53523328104b66fab69db63cd6ef2f44e405276b45dec335e1762aca37f3e348a4c4a348442453cde7ef103bba64269e0152f6e292fc54bd7a84d015e809def97deefd6f24042d5be6bd1ef4b105abbf567ca98ebc8a2a93d0e1fdb5c1027f639fefdbb34a062d83f6b9155171f0ee7133782b6f742071cd2b727563b7d6114360f9c1d5f208b34ccea4a9b4762192010f698c2f160828ce9fff3aced38db4bb47985cdffd3f089128a789696386f07336728380133767e1955595375caefdb9d3c6f13d427f2a61b6a0ad529791f095f22c77c1937cee13b419ce545a82dd1d7f5a79370a2bff47ad9cf0b8da35586da8333ef7658ae73f284e147f78f98eb0f67fab6f588b446c43204edbb0d01344c50bd496c5223318c7dbad4e24ed7dc51e559488e8df5b071fec03b"""),
-                    TestUtils.hexDecode("""
-DBB70175E063054DDA24BCFCAF671F820D674F1D09CA173D4A1440AAF50F1FC8FADC1810F390286AC101D60507DD285275C6F97C0D2B2CF3C7F50609CEC64EB029C3DAD8B9954807E35D4836BEDF32501D0E7143BF488CD5B4D1A53C980BC70A3794E4392E4560E609B9C49900E1C56D319E1495D085440DFD081D1A7C52C0A8F64917834C64EF32A441C9045689DDD2EC218F58B3BD534F18309E1D780528D3BD1B23DDB3B18FC1F7C85324D45C3E9B25961FA5257EC31927CA35DB25E6FAF7669D60952502680BC7B5D777D77B194D0CC40372FC8F711EB048E01BBD5676CE3F2A9FEEAA4B5F29081C34969C746208E6F2329CB53A22058C0AE0852B7127FC4C74EB3A8300403F60B8AD1F95FD2991CE0C8CE452C2432B6422EFEA8AC0E1B53BC994C606301473D7855EF86687287BF56B450D2762C5E03AF26A987317C4BFB013A6BD791EFD141AB34718A37D1DCFBB63014F7F92C9E2870DE503452E271E9D02768357E3DEF6BAC5A0F0444DEE1FF5AFC79B3562C12696FEA15815B7D9BAA38C66919D137F82FE36B140B960E02966FABA1EE9CBAA04941396D665DD2C6B0559502577541AB0CEB066E066553A2DD407354123DF14F4B1DDE6B8C34E3264161796F48DB5319B3CDDFDFDBF5CE17BCB5924984143839B4EDDDAA8F0568ECCAD253C48D00687F9A07785A67B62D28B86D70E511AE08A525F66FB15AFD112C184785F91E76852DAAA3E78CB96E20249F38979031712440DB723B022E1323818431B897DACC51400DB25635EEE41761089DC47E8EA56DD0DF60B56FC682D000E9D660D0CF38C263B716359F41F3B190D201950E140D67F50287C09D2008664341A829A074F9629DABD88BE69A6058900DE5782CC621A91376E5CA31C66E3C430CD00FAA83BF765A2E6B2FCD20EEEACCB996FB5C4B63235142BD5FFB4390F8CB95BCD5853D0226F931C38FE972FBD0D6E10DC2CF29D1FFD2653CACBAB8B81DBE44A2B8F1C5DBDA7C56252E4B35888DFF7808B3514F4D7E5EAE9B51078E8D2E600EC57200FB48EF946F021CA8209E7DC6443B37D7281C73C6A3B43AA570398E62CD5ED9A34ED23AAFEFDB7DB3141202D940C1411CEFFBCED878C0D325E8CF7FDCC520CA3377BE97855827D2E6F4EC8786EA1374E006539387924161D65782C7B2C262AF9BA8FCFCB5B1477083836129DA973AB8B082324F74BC6320646448DCC8AB56582EC72EB192D3F72255D85FFAC2B5C62F245B73191A9176BA5A9FC0ACD3AD48D37E23EFA0C65F0423AB5CD0EB76BDC035112C7A118ED47C0E67E510A6F7A28F26C3D6A882EAE74BAE6CF1FD969FEEAF6B36C85F62D40CAA26B6CA98120D612598F360CA2628F6FD608F4E1E290B32C90FF71E181D4B72978DFCD189D857DAFC7B2AF8C958EEA6894ED59AD56B9AA6F83092EFECF9EC4091BCC9B8CCA245C30B54B9B8DFF3636BEFD417F46DDD2F6136B983CFAB532FB623FAFC3CC4CE8A91434377F4DCD1607BF04E431"""),
-                    TestUtils.hexDecode("""
-5c796ec117395c38a9d7fa1a02d81e3b51522aebf68f3fff55cbf7d584ec75e547d413562c4c87f28f57433cdbe7c96644619b9f03d119c7f87f0a970a46075cb8c29c506f67007470bb4843af6d3dd1c91bb3c2c62443eb18a69e675e3711a08dabee5cc1a03d35a1399755566dd2f07084a9039c7710ab57b380712b39cd6f3cd2098225785665bbb94f3761d5a8d431cebcb533cbee5afeba6cc877fbb168009b3f05f9829606055e71638b50f4c6a41b0b226134391ae0efae4cb1d2e31c782b55035cd9e2d0bb53fd72749de022537ad8f8ec49a297f9bc81d1ee0f5e6b96470d30d6b78f48266eea5d3d4805028f90abbe90232fea807b50323e722a42fb455f02cd2c6f5d932b9bc606f9509fe2b1c133eb12de12db0206d78b49154c34adfe204fbf5469a0a50301be999015c5798c567729b60b2690ed93db0eac4021d38665a3a7db7b5ad55d94b8cdc9171a00ffa3ddbea750e83e495f7db132fc253c82b6b901bcd00fe68f0277988a1b0b2cd1d051d10ee189cf971f79ab6d1bb641b1f3b160b4a4d095144d1f9ce0dbadbdf6955622a8b300c69ae67dec7f1b777f0266e71413d57b454cea0dcd8cf3c32b9bbccc36e1eaeb17c87734afde3feec5432a18ab9a7c6a1fb30e2e84af2c367b4f47529bf4e0782a26d41520df8ac3cad44d4e792af7f427c75221e4a5230e282bf938a6072574e23f4cd35aa49758829d521360db34cadf94f9ba90d5139179f877723150d4d6f53a5300ea3e26392399adb258bc8075cd19517cb70ed48ba9c61e5e5f3d245d45f44f5e6e033334dee3a95bff8dbad0a1f8ecedb431cd52530d7c2d06ebc8f1b80e5e30e746f9b3b3fc192e359119170e2216081dd908d0a5b03670cef41420585653521ffbdfa58957d06d7a0ed23088a5835690df344473f44b6213fa10832539197afbb410556b8046e06d814c2702ce1c50fd5677de3015575e42b78aea720270aa303e3a6539bf343c52ff933aa238770e7fda2d0d0702c1c7a829e798b0677c1044a7e4af1df817c4167909c158074a9933f364a1800e76234751e7463c78255c3d5189c2a3cce7c2e55dc55fe97131cd4255d92b3f9f5c888029d4b92ff3a544e25b80ac12e73c9a65fcf0b755ffd0a497c6113897ee8bfcff0dc8c9bd583af6fdb71523be596bf0753b25b47766d5be895dcfb63d7c7d9f6143efc509629d310dfff428a1d5328b5307edb41822695f56a09ff2202567ae1b80318f827e0bc29c5df5e4cb075f1d7c1cf2df62dc258544e3dea90239a1d997e52e568632e259def0bcdcfc6f9306c76558dbb30a880d41fcb4f99988e6a9186296e7a5a31c7b910fb2624a0400bbdc6fe0657865a6537131f0b0dd2f56e2d6e2201a843bef51916226577e6bb0e891247f93b5bc36c49fb37e458d363762c12b4b95ba75ac1b38f177fca6515c240c40007eeecea8dbef687a77d3c09f9b5bc5450231ee83294e5a8d0fa79430fc2e701ab39d3bd891e73a695ac6559d8a8b4dc4a6ceb7472ad032036e4aeaff3154099a6f2e8297c6e4bf121631b545b472ab316aa0a3e1192874793597e0fa0cf173a78507ea55b2ed0c13fb045a96acd9d9bf8cd5197f968efdd359bc4449458ac42e2efa187190790de076f56445f92a79be0469efa11c98992ec82e3a2ca311d76e282e91665f5659be663a33139e80952b444914fab59910ac08daacb6cfcda1dc75c00077391e2b38ca54c1e056968c4c41fe7201a3c637b37f48be5672828d5f20c06bbc818332f48e0a4c0cda579d4c114d0446896b60392bfb66ec8e4eb5c3e8932259c423025da0611e06b34209f35413be186d98f8494d18eb0b2d56aa47c6d72c5b57e2f68da8ec1039dc565dcd5c5937ce1d358d6c83ded381060647ddb52badec80e92a98dcd4be27a5990c85192e2989dc2553e3606f6e6ef8353202671a1f2dab2d3130946254a686121a26a29ac8553ef5a58d31f9607bf3912fd4340562ff48b38a12b7f4d8ef2e058c9c721467e0787aa0eb2ff53ffab5c2b3c40f52524d8ff1cd0df1edba1dcafcf983a9e8e9840ef269f9648d3ed8e7778e086bcb887c54e49c8848d21002ed58f163a6888b171a945a9269f410b3d541b07f7c83c0e6b80dde9bff6c3f6da1f780f52ce0da11c196c0493b6765bf01aaff22e44f2b538672b4db58a616e2d2a36b1a20a618acb6e7523546e61c8ec4b593407d0ccaa0ca85d2db46a6cf188939ed9583f591499fa436443287fda7e49602dd8677f171b487e4fd6229de805f4693fbc8f27b52f283fb0384a2994755c5a6c0ea99a8be6f6f743d05b75405f9e70d68d4904b258d0f5f3ad0b23d62767d54ec493f15bda17b34c31eb50210788d38ccd4490e0b65ed46e50875da092c35b0100aae8bc387ad595be005bb52ad0f3281ac662305e0a62ec6254c4e091b1fb0552398b9cdcf2c12069b90b6ca5d67ebeb22b6aba91a7ddd85ba31addb18ea61d98429e633e5296eda442264dfd6bafdd3f26c9d6cfa7d8c89f273c4058c7b88ddcf79d7cf5c8bedc4ccd69c4b545a0069906c12c0b5dd5514cc1d45a50173c4f51e0cb89e2e56025539394be823889e0b7cd3b2563f756bb6d95336a22a1f84215915507708fa18e425a6de61a7ac74689bd85bef8aee1a48226a96ac318bb3d8fe95be46eebfda3662e04741f93995e5c30b1b3864feae3b476f341c473d449f3d675c3335617a201e992e9e96d35640d0152587c7edf50ee5542164e12d268c0bdd808ebe067e4891172a4d765650decb3e9baedae4c39834b5b6df1c8252a9b588c30b25167c543f389f4d4db14fd1319161453311572c85bdb5fba5886325b5118b6bdf774c76fce3de923761e22054867a19a06e2f84463a737ee6b4f42cf97e062db911ef8dd2a6cfa15a4698ab96c9e70c7823956665386aab0ae235b485391542ff57967b67274a4a308818ffad47b82051e674ae13ff73a111c5da089500f14c7d05af77d777c612628b157f3a921bf8b0cac0fb426866833ee35a2176653dace88dbd03cbad446bece7c6177373db768d561aba1d86ef2a5680f5d71e2c4e35832e8ca69de760893f3e6dca2e9b39dfbfa2bd4e1f3c2f5ac06e7b07c9c3c85de16244a273385f9014263614cecc9ba3bc1679d8b2721211b7fe7fc96612abc39312d8d05dd530e9e6f00977bdb27b0632eff254f54213213f608177334ef02f79cbcd5062c9b50f9c3ab14a8fb019d0c2b11ed1a5f93d769d3fa14eb3a7e2a96c738d1a3d62dd49a5dcb34ddf6944c066ed1d4c662752fbc961eedf9606c40922c43c543f6c79cc4e91432d652c6ee492679f84ddf1e1e6fb885af725a63168a6c6eac8cb180fc2b71f8d83112b81b168e96e42d3f069b69995c351c6b2bf1344f98c5fdb2f3fc503dd6ccf5cbc9a1bbe111ba2380bcc2392cd3726bba4afe7dc66a103a2defa50516d7d0d5bd058c7361bc6a81379a6c48fe76e81cccab97af3cc2a96d4abd8d5399c8ebbec651320d66019aeee16dd9e126a4f6b16ddea40a36f2ddc9e5d91bf8d5a39cf7069ee917c23770c18c54a5d2ca8f23ca2c9d21f9003b7381c077b7607dd3e3b0c34cb12c77ef08547501085370c6225e45c40069c87161bfb45498397c5d714c86442cb1489accfb34531a14199cf29e0e611f4047f22d40db532956a20c8f5561d9c6120a80507c525dd8584d60f41e999686096454475a2c92bef5880e554a09cda2238323fad2827d9ba6cac319b01d2f89d708a593d660f9c19499328167c5843ff20a17bf0ba26c8418fef3ad764a865f471099708048a624c39bc7ac317badb19226d8c0943e0fb8aeee9789c0ab6e43f932621e89c424da8a6eda10b936218264161433976904836c0c913b5a0f2fcd701ae18ff8309f583f75946a02b930c897aa85ccd239ce2edfc7dac8689b8e678b620cc853e5dc57fea9221f3c5ece3a1484022934d9457b6d3a34b801baf8afa4adf307a8c7b6092168dc5fc35393f772b576345b2f6e1fdd9ccf27452174b8ef6bde9cfb37dfedc43755be905373f54e13a1a40c3757a15bc36aa21657ae4a64a16bbd4463fbaaf69cf4778306876b62abd4305d753da808f0728c3f51f838b640be0c093b732595b153e2615da3c0d5ce5801322689ce85f91767bcaeb81cabc3baeb76deb7154b79528766282bbea6d026687d2f823fc25b97ae523e1eecdcbebf460b447b1a2e677c0215fbae2da1dcd182bcfdc912b94c732b793588ffb0d1e118d02b093a3cffa510d159ccc74ceea63ed881ca79957dda6db1329c22c10a082baf48fd6a2b635b3f1b896e77087734528d0943da51d31b1619e549ee1366e9df05d0a356aae84cf8f3d0c8fd5ab534a3524be784eb0208501f17e3b8f70a52de886bc691db2bcdeb63f7bd739fa3dca52e4d44a7b6b57564f17076104da5169b46d47bfd01d2610a9fe55129e6249956233a911eef491d9c5877e55585f62f1d17a84bebd25738d11d830c2bbc5b55d7fc60894f4db0bfcc6639277d290ebffd8a02e4d0593f65223168240e528822a90d4fa94febfd55e5562fec1f279af1bf7333d5b8b8eabaec3ea262a40586d8ea1e12b3b417789ed00010f333a787d86ced10a233e7385c3d4de1c3450557ea5000000000000000009111721292f""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-775194fa9e30c689e7302d8c2fc00a7f00841fcdae64e399a53e0be6954663065429981a74f61454a21dc8dcdddf4c4066ddce8e5468b7bd5b26dbd4283fa7a877923797381790c1713da02709968ff0832d6c4d89d20eb3145a7c15ac09eacb033a7da76730e09b3d046aa5af01efe52e3a0f027fba5011fa546fb5fc0cfab8123354588821124761125462867143201068176532572015662021787412776133663461662516613127305076874123764663443174716886480125868463106558201008703176818888335470841078863525124780848221402401271324205864713506180015021080561066460302752630337573872578318172800670886377121683873150166316433017633687422041072550783123188513067875320218141887780241707861057474220312532464675542836737678404710137071730427208884644822180077044878772244308013004077287021731285122144771457608441245004186732638806268712328246273182373310817212362101711217128744356367251232358767873630286444004265228015852545234702853700543220230385386347720606804853040270356121170354546661117884006288624425424261076447101017261433632246067153565133005185584112568087530887400354165514575612710107518105111212880423160320776164322663187851666826475266514506542017236133470881016371558026467184825281620822370012506573522580870410800578835360423727437546187382604545324437380583851840368564484147868560247314316431274136074313628586112642714347270355050863242834182541260623061362670072443286601140011122260170704886474038621622106223074831064667433402301675534076201486620401610182475848155741838435013666012256742055143062248642370042501004404201220472422713362532468454186164808851065576017668724284048886510873771246805247433731476322167183106422148886801663744886227641807258575643350158780032653053403277082020512364842215836461740846432310100831764051262516215812253404208551486515827351162618003733466066543352780177355410552035840806874540435161826802664586320781278338035028133718746822122511552230063508641532268816678453680866581380828033615673280874678758324088400275448388454607317108875831531354227470725076141144534686412537824563825722877183411550677700373524533067445807141178142157871184851387873106405258723664717374150224651476366210256351366353505453335354526742522767451684323424516401350610873104848665032166533585003470786668323686852545850637165171575158723631707561800080148548322850210080726687771640233236848368300075578486270244466218706477857038331816632104585010604237368056736578088326582476813804678062134825523128202303334241720070686472747774265138046574103501028660081182563722570666424860667805087485053108754536312327142124803354804743005550286355268320427431215730548114172563283722026208424375640424116413408624467633266482015723581236203131518862113064822005608608433723653237120352587004423311474456472088471536172214481065711267885838858351122324414845814341224441731416501101677844383118405826224634471523326237030353065105122703137580526125512333342624572870570653773585614446713440410767104157105715385272211378045570506026334811377158286601313708787117102676024340056353641642212118688236601230400305723181867775275010672436885537146518804123060448460341683143361006382558285618843318316025426272581550022725e3ab52ad317a7288f7ef740ffd3fbe62f1a96ddcb6d8bd300d46f4f2cc1cad162d5f0bc4a1c0d46f8c0f567ff3a962f5037da119a596bebad2129918de11be09cffa73a7026b1c4a94ab98184f7f6b214e37b06843bc197f6e54084cd03f427691ebba03207bfc412133b8f73dfee78df80421a3c30b30962b6d06cf8e41520e8c9a7975a48e45b9d6371e3029f63b7972072cf5c30ecaadb3d763f2acbce180c172836e2f866a894cfb2193268616d8bc36157f48d7846b317c6adffad1f4197d5151b1f60f65762de9ab5244a5a7ad8d6feb6cfde27e5adc7e48bbf7f37e7db6d8b42324c070be778426a242e805dc353b88916bf2c32158512be8d0a62215a4e9ee2535a1a123661cba33ad1fe6f8e61c62b34dfc7edb12e9aaadc76d6633315fe128cd6df60830057d5769008029be02154b385bf1daa32633a8b73d39549f2ef157b00cc8e347257c9c409113dcb0008d0d9f9a68ba9c0e2cdb1c5585c76498365e81717906f6e2e6fe9153813500d447c101ad6ba8c0ce13803396cb44e6ee31cad12e9e934b101b9c4a4e18f9a795e270ed2305552e43c74c6f9673cc78e8d88eb2f30674367415944ec31fc5976a09fa62750125d609f5af9f06e4480922100d8031aba6ef774bcba84a1b3b1805787efe2af85a7e592eedc320bab69cf52a9467b45d9132e45e54db62c53154fe963293c252b4e4e29e832016414f4dae7f2e9d0f87d050abd1a72ca7348bd4ef25f9efeb7b4f25795f8f15ffb8b5947f7f99eedbe22f238cebd8d747f50547ec451854a363c726796c9adffee62ddf079b8b39d4d2b9c77ce9a629c1fade8f4a9940aade74d3f6194f72c3af20deb8c5e4588cbd9db261704df134b3b147b526a50dac889551c7c866147e1cef784eaa27f940327f713e4f0e1c2f77a09160ca8cb6acca67778c6f9f5cf50723ad9edd8ee2eb93bf784a4e6ba07c2bfbc581bb80cc4525594e98baacda06999dbfbb49609481c9eeb1082a7f05cfdc95a43a0d309e6d3315ea1a98e658f394f239162c8b417635c5a100687984a3a458e276f6cf964a87c72c275e35771ccfd9293a13aed45526352421447064ad00a5457f04ce2066c92cbc2c287056036cd8726fcfc5e9dfbeedf73493c95be8f260db775d5d733577893d871a0281cba27f93fba8e5520361c5e9108299666179e3f40313e0c6ce6012abe07f2dfe2171f4da5358733188bba4b1059e516b0a2a00493e9e7386b9f00bc402f6986775bd2f1d5ab7455aa574a0576117dbed54e8bd7173a9afe2b5428f1576ba498bfbecb42e6f86164dd5d69b744dfdef0ecdae1ce1c9a03da3e02d707f405ce5cebf694671b41f034bb8757ff3f403d4153573fe46cdf0a91b5e0f34676f1ccdd8b37e12a737e0735cafeb5ba7a086639a7298712e67c56c71c3c81fcf2667187b7c5487a0fd292e1a836dd576d177e01a24949ca3c7251e9c522782dda331ab2008a77c55616cbb163233a45b7ff45af92434c00a590aeb1f4df607077dd9e8e1eeec4efa64fc1b51c15759ac1c3e7c6389614e657d314066ba3d84a5020ab46006424914177b19dbf6ee27a3ecacab4e2779ce9be2651dd4128f1a3c5acd58c3106695eb403d5fc7a8dfdf625b4929dd6903c7f4a27436d3ab1ef51f74845a7ab5498a9e5b10e57714864383bbe2d6584e7da26ea0ca3059ac96fd8020fe4d67d8442d91f3fdfc26cdcc9ef55877a460944251115db42e7470f80784aa8b7e4fd21642d9d91282e52221d6fcd04a9b7acdd23f124149e6823c250281eb1b0ebc31bfa8ba142ae0bfdf6097b14408a9e61b9c2b0f0e10efd2cf3cc1079119e7c23948941de9f927ac5b2d718c19ae41c14802f0675f3b75f084f622daea75d65b05c0e17098b402f05923b9011cc96e86a103fbad491faa1b8be68f8f5738b199e14086da38ce13196e3b2f4b9c038b93bbde1fcc3f277be2d37b4bba08fa8e8504760f63cb954e511b89d8dfef063682502417759885b1a48d93100d6eabf14cbeeecf2ce6c17903ce588036e4e499c22cff789f0d311fee8e4127819679730893009d46abbf837881e26e490c437489437408b64d12114b7201abd6b4591afc083402e959bc9c510930abac67563759b95415251db053b68a5278adfcf26cdcd18463226338b46b07900ae532488a1a4fd172163e36e3f7c219b86292c92d68d6d0123314ca3a75487e920f2b1b12c0d605f153f65eedf3d98a587bf6eff36dd53ef6686a88a3f0265248c5ff91a4a1b755aa1597d1c2cf37174dcf082c3f89148ed8d4852ab2120a53697e9538d4cf661968d6d8d71861b32efbabd9778bfb75607432c765dd3aa2f026f38a477e65958b9e3c2d1d8eb0533b1f9f939279d687e4398d2ba454c29c420be58c3054b3cc2054a4c064f3702a409bc47abbcb70c59a1d6af84719e067805599502608645563c4bae11644415f1b82542feef87605e389d8c9afcc191472fba3987e4a0135f78f97b34cb10889e11bb9ef1149b57735ad77f841650448775dbac5d82ab0294b35dab15eccb5cf979021f59e0cf02bdac2b3533d2cb56543d9b1896ce9e774dac74f647674dfbb9ebf78b9aa02eb756182977a8e5eee876d2fcd9a943fb38850c1de8e8a831249d2c3ab9e3ee4a25c4e37bec0d71bc2a5a06b04706ff801b5f0d0ae9220f667f18480db1df8fbf38be4c3d5bddb133e102c4ce030713609819632c472e85a01262c1e2286897208c3f9871f8640a171bd4e41db5852525ce5a8da599e845169cf140f33f105219e7d03cf4a1aeb90341902a2010a172955983a252c32f0a5e120b099541145b8cf23a3f5a3839d5fa649eedd624a19a2530f570c7ca1941b112749ffdf96717c73506639eb3a96677fb97c66a613aa21bd77a5302be163d726ee5741c15bfb187bec0c0c1052a1715a2cb4573d4c3f9c3618d2c433f38145ff88c8b0287650f6a50d2ee661e699ca59b6385f10e250dc70dad3a5e12c5e002cecaaec22ac8b57f5ac5ebed502a8e1e6f2ff2936d8eb7294aa89778361cf9b325ec79197ca4e67b5836d3d025e5cda054186c214f9b920bf2132d403cd8dbb24573055b775aeb18151b1bfe53cf1b71f58a9a33a62d5431e3e0513cb0b0790f7d4b167b91ddf78e00f988ae84cb81b724f1981cca7f78e5553fdcd93059664fc84ead17b59f5832f67966d93e3dee2e57c25174d217f4c054206e53bbeb341ed71f6fdca79c55bbe8ab26ee08007ceaccb99884400e1a4cefbac6858012419903397f64bcc9949fe070f02f227e62c563887b68c0b1b3c2c2854c4d4e828736faf01c5354fdb9c8a7806ce33047d591d80d3af33cb455818b228627f57b1973fc396f3c3711603b286c4379830044e3982c93ea0e8a9cb1b8a16595f442bcb11b9a51fcab5b37047bc114daddc06d03ff76af94ced219201585039f0ba8a95bfd17e5a8d24cd7c34a99284db28bc54bd2d5c4540451e1858805f188dd41a70be6cfde8ba28d4ee999d3fdf8"""),
-                    TestUtils.hexDecode("""
-5F8F32FE68B556ED1D2EB8D2BC20AA36DEC7900F8E5D4BD3715419B28771E5B0A080DEB2F3EA6CF415D40EDA46FCF8A439954471B7308D3E4226E9D5A96BC22B08FECEB4C5E3CC2239473F1C9B8DFA5A29C31D499CEEAF6E34A396BF0DA53B54F1AA674056216756DFE15F669FC2E1D8E6F67BE5BFB3D5703F25D62D3AAB0398AEDEDF7C65E051A4A8DDFC725EEE940BD0D06B103EEA32D027CC20A8C61034DC54BD5533CDB1A85107B9CFF283FC3C5FCD9C3D6F8857560311AC2E0E31585E77D0806F9A4E61A70D3FF36895ED447C55DB52002488045CC358A39475BFE8456F4FBC36005218B2CEC1C573E41BAFA7A622EDF776C8AD340680C1B3002F69D3B3D8844494EA9F42D2C9C9D2BC0BDD850BA3C4DE929C1DF49351219F95EA7B9794827FC1A1BB4A6A00809393BC41852820569D7BC6FD55339925FFDF55A0C2655C85144234FDDCA91E8BDCE8CFB7199330763F5750D71CA8C4B3BF7E6469F5DD68624BD6D5B69E5FAEEE53E3A61AE659A364484B7D2BC8A85BE9F8D35C8B97716E8202B610BDF878C1BD83187F7892BD861C09FCDA64606A185B93CD2F601C3107D35B38D76D75AD6023AFDD95E103EEB7283379BD9E44CABAD923856A599B719A18FA836749E5BA95C79B1F2F1B443CE1FD26CBD2B74A0156C381BC270B74FC42DFF8D91DE4ECDDF3053007A09B8E3C964B90DE55DE5193F218685327D8C0C6CE3BBABD57DA8772DB7CA9234A3D19BE16A895E7D14337FD9D50B4A556C75A9D287B44BA5AA4E52C3262218DDCEEE3A7BDBE1B8175E84113F515623C07BAD4FC0985112DE4D77D31290BD013562D12FF8CBC5F2BC463223AA82991D7D60E38037578BBEEED70631CEADFE49823EA3D87EC384B3FBD4974C474FF9D47F467110EA4F3FD94B5FF38D8FC1C75392896394671853FE71DDCF7730C70ED26485F395F180D2F5C31AE0C2C20691CB4BC81356225E6A72DC72A1CD3502E42C22B594118D131BA5EF95F2C18B3061139B047A24E32197F89780B91D36B28BB5EC6C03232A3CDFC5ECF687BA5701F3958FD87FC0C8D09825E8BE4E5CE9089C674049C38EC5E0FC1AD542F57B4770B6E5DDA215D319DBFFBFEAD9141647A508E271CF3B0DE7C137A5AB999CC88082FF0CD495F1F1FB1E367B57BB400D8697B4620B75FE467D9B8BDF9400E14047576B3AD6AABE0C0714686015B8A963A0DBB68CE9E41FFBBDD5A792920916538E4C33F12EF0E93D249E562B71BC1C252E1DD8AA646F8C7B489A2BCFE7D29A6D3FDA2C21DDD78179861AFC766F6885E9959F753C66462DAA6E01C8B06A6F581104B583F7A5B1B4935A4EF08219FA8D114A963F3FF3AF22C3D1C1E3927AEBC886AD0670FC89C08FD4DF68EB990A0F7C51A4439C32F5F51785B20DC82586940C35D80A91865C3154D6C925250B24D4C1A9E76A267711A0813E8CCD2DDE9748FA0464006DDBA963BBDABAADD377239442DFEC6F7E8098604645D63AEA080C1F749CAC589F77B4AE0955FABED757E6576966D539FE1BE5965D03882279B2C9B6899205C9DE8D0B1819DA8B5426E573CE785FEDA3BE95A18A667AD5AA8FCE7894BA11A44B266EB7571A93CF9FA64C1132AE07F0F24773C83DED2C2885D415ABD96A21A0381811D66952252786C39EB68EF0B9B03BA7E2B66A49BC6CFCD8097C321A932E5CDB11EC6E43A8E50DDE01EA5A28F08F5047C67C988E8B4A04701A0237330598ADE8EF8F801A07F2148B44E593B0ED16DA30BF37A341073C6A92066645BD7042C3A59B374FDAC00F7F69BDAFCAE5EC0AE65FCFB785C93E49102F5A5029876BC23B0FDB7FBBC376A9E834F0D19A276BC4E22FEDA18FAB529F15570AB674B844703B47D726AADE3AD4015F52D86843A01AD5DF086E07A71A0236765DE6A777F94B1D69253A424193FA9DF54899AD9915634DA23E6DF351E9608219684EC8C8C949E900718DB6FDCD144D0BBFE1079C1BAEC516BF60C1E24B8EE6DC380F55E0F65DD64025C937EA89FD12F0404ED0C03CBA18CE2FCF169F9A1EC9B96830FAD0149D4A90B13446347CE4E5C6005BF115385F1D22EF6A7E40EE87847BFDA4CF7FC3135C4164091F49DD08389E1005271E9AC76E27B0CDF360EEBEA9C08E233CA58305CB276A8BEC9686CDE0E2DB5CFF9858029F3A5A42759E4AC6DD40AF9617CDEB03FB1F9D7F112A01B87A265C4E27BBFF596695F127A97E1558A68BB5EE4EF0F44D20F318FEE1CE988051F3C09AF6E142932EFE970C1B0C07040E7F3DB9BA53BC4AB1433F7A4F1E480D920C23A07223D7E43570320B3BA590507D580D29CC3A8C85A442BECED5880350F9D2B1AB5C746C1B9909E446D9508D701204F2427F41E043A78024EE3F60EE19B71B5BC925A2557FAA8C7BAC7E3405C920FE3FB3A1BA7C559BD75DB1E4169804B6627AEF19AE6E41B8A40CFB977C1AF53208F4D775A48C220A756783F41E13B7780328992947D215C5B5682DEC76CB035B41C007CE1017EEFBA426EBC423F710C1E962528F7636F200C2E79D8377D621513BA7EB3EE5A0DA55B81F6039D2E8BD42EBA5B2A82C3F033CFEED6EFA7D970B1460CEACD13A0C67AC0A7EBE7963F0FE21D20B2A82EA922FD889253B5D4CE4D47698D43AC11A8F4E1638AD3A4C179C522A3ABBDF420DA3E89B9FB7608822904944CAD615C62B28EDB15D3826D33DCF9FF9BD5DFD8639AF4CAEAA55F9F8409B4E5F70681BB7861F88283218E15A4282E199BFA12360FFB9BCD68D9BE5A3411FCA4E8279562F595FAAE0CEED4FE675DA4A8FF94B180AE9D0C8C687650730F05715820F67248D02EAD4C7BC0D41C880444B94CCD60A66A1C9B5B6F6690A2E1766EE10B5D03AC16F175603A1B9D49F97CF3F91932E97DE67CB523A38839468EE7681909CE997BFE5EEB364B472220403EE4A9AC1F8A4A8F78AFA4D9010A0127C0A75D3CDD87DD269F19A47C78F696218F25AE8A61073644A4F791ABBF1B180267AE41DD44AF65EC6E0AB356CFEE86095B64F4190D69D60284A1EB42744C31536F736AFFFFF186833EBBF43709BBE6903A06F7F06E8776D2AE41CFCA33A3A86342BD11B67EC10F525563A1843C8443546C1EE61DAF7310802AE9C00F44DBE7E04030BC4D0F53AE2023A7647F08A0BC6F5013A61A84E994FE0A20092DE133FABAE3AA24F8F3946812396B0643721AA13417A2423F96CA8A6529B0E17766E88B2AEBD79AA9D4D31193533CE50E4EBDAEEC976F156D5DE5917D54F9CC0527BB4F1F795401210739A42D10A0242748DE5FF6B50932B507057EECF8A1E37800223378642DEDADB464F5CA251D73DCD28A1E3772CC285A33B34C6701B585FC03C94A847CF7B16616D1C3DD646669546D80A27E9DE6424AA7AF6F1694037E774259308E71E15D7408BC1EB517CF0AA2C9E16B802CC8553458BB66D96CBA233487DAAD6E093235D901CF46F31B9A060D88DBD0B7380652EFC73AC1A6BB5E434EB0394F1EDC937E9A99A3867EB71D6E19622137B009D36ED7F9890187CCCE7D884DFE118AB3682EC08CDA8BA6DD4B79C9C18E7438E6914DC1C403870A540B74244964CA31E730A7D7591E42569532DA8094559241F2C7EC182FF8BB5A3F88DFCE3020D8B8CC0D1F54CF67FFD3A97CBA7F5EC79333D9A545221C963E0685763E59F1EBD34FB2394727896CE638E909AE6DFF41D17EE1D0BA036F8AF11335A8C1B5A0E9DC58EAB9C12F46740493A8B5AD0EAA73AF462BDF43CE44BD0973688D9C8DFF8FED961758E1AF88FD5D249FFEC179FE5AA1D135C0448D80F4B0CB68492CA399A3916A2EAB684B44E407706CC3C2F48972BC9531353091F91B427FA32693906DCAE862F34AEBBAEFD30666523EA9C27354F2FCD99A6E810685B51965571E4B4B5AAE158636497B6F952FA0B73617AE35A8D7C272DFEA1CE06E983CC65A501F73BE9D69EDDE6A4A1764DCC4B74EF09EC27C74B677920AE8C49CF4F18160E04B5AE7EFA8D5D92BAA5E4E547CC8AFB9D55F1A9DA7A6AA06626673431889C9996BE0A473702450B960231A617DF4705B07B47DBA1BCCC0EFCD5713F88F394EC4BFCC49EC24B76D531A356A6796785D755F027C664D8966B5CDC82ADE776BEECA8AB0D9DB6ACF5E841BCB4381828DB8F7358A637D04D97598A8B3BC823B891F5EB6ECF54E6F9200C380813FC3210E68894A656796C9A5B780FF486E6A93DE055B8F658FEA17035D9C212D23BB5974E1161E4F6041E5AEC446D70D52CD2F21F1A33C9938032487D9ABA74C448EEB8F8D51169E8B848242F5C769B471F0AF04E965BB0F4AE7C6F7B4AAD4E283DA762DFA49FD01D21887ADB28781FEFBD931AD8E2A26BBBBE5D88B52E8B7133134CA76C6648EA39E3D2F102177F4237219E06CBD05174D503C9288EC9C3E0128A824A7ABF418DC45EEB3A67777F74D6EC52891EAE0BB56DC756ADF40D39151E3A68719C563E99BABCA4C785BF4C2BB1BD25C7EEE22A8B0C1E90B948FC3A691670E9A3A331320CA4416B492907C3FE70AF9A2E765F9607EE1BB2CE52D2DB15F5DDCF59BDCCCB5BEBAC2784FA0896BEECF38C24022046E5DAA7607E8D2DB8CBC65541CFC6A0F20CC3AC5EBD4560BF5E9A3FFC0BAE917B479D960ABFC99EF84A696CE5A95720FED90F3AC58D77D48BD5573A0D85681238AC0EA8F0B58A01378929C691C146068897C5642DE74D79E08E5B94B101182200FB3E2BBFEFC8B44D2D1203075862D77A184B25A7790D76D7CE88C979D73E599C212F04A8B01EC3CD6CED3B5E25487957C56BEF6AB4433FFFE6DBDEA396212A6870284FD1BAACD5F7A5D9FAB90D5DA39D3C5F9AF196D9C46100BF45861679A7679638BBC8E5B5A7606D863478B430BF2C61F52D3D88B0913BF12597620D337DEA52BEE9CC8A1592698D23B23815C596981152C99453FA16800545EE781F24841FBE5A3E5AD8D08F2B898127AF40A681DF9DB68681533C349109C29D19311BEAB4C2F2DE97A5345EA7E41CC0988B2042925F1F9409D947128CE1D38F278863385A19B2CF8338D0FF31B06FD865B9167488EA157C7965F4679286077894660F17BC7289BEFFA93CB7DB990A0E40D998945A77E536902FBAD3C8A278CFE0AC883BBEA0B20E5D70EC6E10B59C2449CD1A0B55F8252C91CDC87E70E72FEC175D6D67BD43CB5AE4EE9C7F9476F4589E2BBAF89E801D5E14458F8A0B96ECF9F080E5150E2A5004C5A89B735639621157C4056DD1106CFC727B921D5890F37051E2B906885C1CA3999C18FB8C9FC9B652D82AFF074EECA9976D612ADDE990DEA418031FEFC4E972B31CBCBDCA0469E3966FF6F97F9788650298DB71CEDFC04659D30FE673602659C19A869FB3EF4262EF3FFA9E3FFAB1A3FE7670061EBB0D49BC60AD0C774913910E26E4213B76DB72AEFA3CCC197CB6F6DF773F86F12480B5BBC2068F61E16D1C0C141AE6F1811B2E0D713AAF60B90BB2F00EEDD4651FB5191DE5A246A4D8F3E9999D85253FA705CD4B94A6A64D9E9B6E18BB6855CAF6B991494A8DF75E56C2A427883E0C27246E5854B8DB2EB0FE639BDD00AD678D1B61D799AC59ADFF6A8616B357A4B12A786EB612E5613CDE533D92E87D51D47D860BCC39687485EA814DC5F5A971EE915C193ED52AED98D7AB301E32342F3D207BC03546460D33B733E1008E48D80E716FD717BA82403DBB520246AC3BC9CB91CC0ECDB7E35E6863C3C11558A8EAE9E1DC49FBFFC0F92F397828A4AE7107785939B96932B9EACB6BC6D8B3A189B5D3F6B0C7A3A413054B25318792AEBA3F4C77629F1E8CE1AAA98FFE1EF50C2E60C11AD76EDDCD8EEAF858364ADD637AB97ACBE4D2124AC0AB559E85229F1B5D81701EEB1D6834FB215984E9DF3847392EB29D2A428DAE7FAC283F93C8FED86FD2377E8216922D46A51E628091F6F8EAF967740B0EFD84F002358D3ABEDA0993DA16D0D8233090A2CD9C27D78DA0A53962FE7DD282B276A30F91C2B734EAD2CCE5E03137205BD97739F6CD75A08491D4ECB22591A6FF840B5DF123FCA7DAA98B11C85C1F8591EB988024C206CDC4A4239E7A91DE75F49541FFB6D91BE4699C0C0D8B4A44A8204F7E90AB863C3183C2270D185643D6A7165C1D043FC5108C340650F38A8FFBB13BE4BE68858C50A2463F7BE998286FFD0F981B45F5E414FDE71637D6EE77B33E10A530C630D63F21A212E844C2F7A26BED4F7B4DCE0C566CBAEF4EB4BDF2B53E743EE13A845D3C7AD5E9525C50CFED35DAF5D993B6377CF1DFC5236D51151B046F4904A02D7D51B6E331754B0E3621DE4CAFC9D8F7247788DF0EA7E6141FAC4B24608282AE29D594CEC0C82DB05C0087AB377D0D504F64F1CBB2D9F3121087AB6F35A70ECDDD15C9AD2A185C16333BB901CA069BBB0B80CB6F505FB3F382CED72CDE60FC050241B1D32818D11AC4421B66CD85D0F7B479C021AC111F8EE8F1C60B2320585EA276879AFE4034DBA277806FEEACE548CA0A5D36CFAE7B99ECB0236CF4838254A20A13A2DEAAF201B09FD027BAFC3F0C5ECA9EB5850A58C6196645F051E57B82AF4B6C2DA9441358BFD2412864950022A07542601631A00E27BCE6E203B1D3F1B844CCBB2EEF71A12AA4E725188073004849A225D733C77C068B0D2AE53E0DA6F759A8E7A5486C529B29A3EDADA69924E7DC200158DB4B612C62039B321CDACE8294DBB1A56ADC685B0B0122A4F3DE0A264F47B00C903BD30B5E4281B0C75DAC5C48E18BB0BF642F8C2CA194AE56CF7EF3B4529FB9271774108C61198A6894FC9FAF896472D1CE78DF00E714045C5F7C77DCEA45B3ED5BE5AD545D8F3833206340A5E10DD3375BDE0A068D050CB4C87E0BA95CBACBE59280BD5CABCEAFC88F5C05E3D8DCDA6B15C487B62B467E093259230D47B79F36572972BB78F90BD384255CFB1E4F1DFB7B5360EBE1230F154C3645A7A233FDDC472432F6C845CE86B078D93A5BBA3F8800C5313593D66A8A103B01377FBC5C6D5FB8A55DC71EB0BC9904B24BAD2F505D6DB5640E914D84FC71FA058902578B72C47659AC07AD4D64C3D28328D2DC8425C4039EFB2F20E3B954BD0B0483848F2C2D9528214514510CB0932F7506E9B98D0E891D8183A907FCA7AEC068B9FDF7F3479A128C6982BED19512A4271D8B682525B5028B77D6B6301181B403E5F62F64BA3CF06F0EDF321114855839E9198E5BA2A65ED952B2204809215B9BA3C366FD5C9D409BD71ACB748E653DA82EBF617D2D57C74CE37BF20AD8D789DA53C086423D86F94A96ABA379F3425554BCF92F82FBBF5C2A15947455D7D7478A84BEC6E3B9FAA14E425D2C8971DCD157C1D9E210620E891AA4304CDEC54BA7B3352556C49A172EAF19919184CA005A526349918F9A7CBFEB83510AD899BAEFD3D1F689DC3F449153597C8D21FA1C7BAF18E689B51F89B9BEF196193B7A781B96B38B9145AF7338FCFEA109542BB1719C9C8540B551A35F733C394F7831900452C0B8D36BB90824699BDB587EFCF5E8410E4ACB8ECAEC5F96E74A5DD3DCD4C85720064A14028FE768041BA1A13A46CD8A0D2C4D09E724591ADCD5EB907038853D8C92C5BA7FF57D5B54B2B324073C7CD2EACE0C521254E9E5C0CA197FDB3C1AC73FA8EDA729A858098E6F5EC11A19D4F655C6DC9AFFC4E67A49EF62D80EFBCAA383DD3DDC22C2A9B7590C16F8CF23D52392186B95EF9E947D851079C35FA11595682DF4EF4D770EB16CBC3994326B8AB3B2C279149122D178BC7B53318406738290596449D797F61B3D0CC8B11750F8D841FDD9D333A5FECC67CC7733824BBE257D40E53B43CCA19C95ACCA8FFF393533AED57D423BE0C38584A81689248BC7F78CB7FA4C94A7BDBF3015B4072B83748E55ABBF4A334AED679D89E2F18BE1B249B3F61363C79AEF6E1FB09D1948610F77A9927AD6D57BEDA02BB1E77415DD7FDD3EFC683AFB1E20C08284B620EB091974FDF8CEFBCEE1461C210E81E86B61F2D5D1882261D60D60689E39C81B981EAEBD9A42E608A34155516E4E385B86BF0A4AA05E3F99B6B3B7E401724D1442A45A696A189765BCA3240111E9259DE161DADB4E0ACFF27818C631A8A2ABD752773A83DC29CD619A58556040A7B27CF56086BD499F8B8D283683377A21BE120374B8D4561AFE781F246AD987E828FB40306366B4BF4C0B4B909ECA91DC85F521ED5869A2F2AD58C74B6C959AC71DB6F11503F026DFFF6BDE6BD70363B5B38BCA0590A5AF2A1054209A36B41B2A671293F2805568400AB282F783C356DDE30E0F87C001D9B1B9716A7C4021928253622F2DD156B3C3038A077A5768AB8AC070BBD9467E9C9630754934186BDA122CEA503F5E274EAED746065CA81A2702B582E82A33CF6CB3917D451FF59B0909E6BF847E6B610DA89AFF98B3323E1385954EDF1175C0C1B158CB905BCFD9AE7FF9389ABB9FBC5194A45DEB0570C58F31D914F9941B0242717B243ABCF5A20676051978C16FFCAA8ED2EA23B8323CD58388860DD64FA39971F9FAB83A4B248EC8161D32565917B7E6EB4937B4743C6C236E75E1747A1C83377FD1D927D385D81A9EA7F4AE5034097A0A77E2D2EB1943D3128BC0134F2D600ABB929A5281C26EDE1C12CDC80F8EAF2E893091EA274EDA1A246AEA3263E43D6C60043CFF6282AAAC620A21B523783E0CBE33F78C89D00EF8920CD53C6EC0E83DD7E1303D9B6D5280BD2BBA26376C17099758F34C22054DA031C86CC50367C81C3059114A71C565B1702981D77040B0FEC1E89436ED1896E93BA202F11ED2BA4EF33A76F86AE8E23B8FD064C8FE894244C97BA7BDA6BB56B7517C236400F591E4F28050C2958A7A79964AF233CFF8655F1603F6A0C7ACCF440D0C82D5528876721434C163D86858B02C6F6A660F53B3E45185FC7777A629C3E4392AEE4A96D900B0F19783DCB6E5028B6E56E160A37D37FACD7C3B992773ABC8AE1ACD6AD41E7340CB198C9BBEA1CDC185AEEB51E2620F0695C2691A29CBCA8E23328E84B6882A59A8C3C2A273CDBD26965564F1F1DF0B2CAF83F30E782C049DBC00596BD85426EA90ED30ED8EAE8A88C0D1363E69868E8CAE56E8DD62CB36D9A15150FE567DF7DC93CE78706BA983885155C9AF05B5FF1D0EBFD9D020BAA9196D9C871236DBEE8A703BE458938D3C882719881BD49476386387DA3508780878271C0DA821BAA1E9719E437BEE6294D8E4E2483932D0257B44B8CCD8C55028B3B7D2BB3866216A7F52CAEBFA0FBAE120609F95213BC05AE24473C98C29F4A46D985336DF8305787A0374098DB279EF0E34E6DD79BDB106EEA24E4DEEAB6DF35C58AE73FEC926174E0942D242AF0D30825274FA1D510D1C0C41FFF59A4381CCE5C6B89AF30C41733EF42E76C9CD58DEA7E881706843BA04E3A170304C551B6C801CAF9B8DA52913D2DD4DC755E0BD7C723C4AA5B001D9855236401C1014507CCB84577749DB1AF29E318241D91C4B23BD80549CD1D6E0D793E966A8A7B755552F16D3A1146B0CC6D92C8C90E97D7EC8EEE7C365697F93AF257BE24691E41F2AD26BCF47D52A1B80F5BE1C658616537630088CB6E227B0EE6EB8DB2FEC0284E58202A73CF3AEC16BAEB59D2A6E0257F0ABDE5926D9A13D89A8B2F69695BA3682E87A77DE06FF54892F56581FB16991654F60EA22856D6FF9E0BE2C4837F0C1F6C54E840F67A75185F0DE9439AB1E37D4FB3E9757B0FBD17C89DF8568755567C390032DE93E9C93E6C89B2E66E9E9D96616919D9FB461F9F33"""),
-                    TestUtils.hexDecode("""
-02dede66fc74f94ce000d6c4898fcf4464b834b848d2bb2d98d3a5862ec632dc9636201321c793ab26e4a42ae4f13debf105d087b112849946c76b54b801382b9727d65bc732a5620e8f4f158f0c1737b0e4ab8e7404383f76c848b36f58f5f9d70ba14a8ebf622bc848a9bc3e116fd7b2627c41ccaea47d493ebc6d3dd167f79fc6ededc36c809ac87e77ee1b006e96ccccafb88d965bc1cc15388e6410c68a74d72b6632487c284fbfc10135da29f29264cbb9ef620c2668066a2fa80fcf2132e93a29383e56c8bd89b3aaf8a905d4e60c6f8002132d38abc3d3c3b6fdc6cf508c8f6a7cfe9f78be8445f00a13414e41c27ba31efc46d0e028b778ca57b2326d624e3af6be0d4cb2a80e44b3f1b83bf572e8b7516b8e4715376e5da06bdb7d487d6a2d268afdf5654023ef4a13aaee221fdf7b9a668b2f4e1858da3c1ae3a7a7279163ca9c1407e8c0fb69f0ddf75cca64f4b0f277acf9c469dcce264b8f37f9918626dcb4252391526ccb4f068879809a2b115ca1d75d7a1ddbe5c8261531a98494ff634dff81515fe3ea4e289d75631ded8b8ada415f6438ada0738bdf9f89e986dee9c80d82ec13aabf10849dad939e81441fb063aa627c4e316461fff15e61c85821bdd55b2cd1545f810c1f280e7852604be73963b75e33eda2e2300196590b9b77cac44d059016c0b08a2f18f18ededd8dcb1474b3e088a6e84c12eb0470cef4b409214eb47de0e277de2665c661ae7766de5d05bc357a2db50ce51d9087a66b1d3715f5be97a9ac56ef866fc3bd3025738d4310e4761b57b3f901c5165df95385cf70f064a760b37341fe2c8466aca8258fe821308d8be08f4d569e27365dc4be8a2ee4e5e13f9d467d8b6ea272e407386e9f448c1758858d038c18f49dd7f60874cd4059b5950b8e969df6a2400a628759d6d7839488674bc128e947594521a998a7e9aac9d61ced0aa7629035bdcdde11a82ebdee6145af1f9c31ab104219beeb4f222e0f0e155e6b67160f09f6ab6943a589bc4ea4a1eb3231bea73f16da8998af58b8f71d3aab3e2fa736f3307180e6d777bc5ad02be4d7c718855177d7c1826bdf9f3848c1b9b65c6a25a93af48c728b6485ab765d36ebe3fc82104d043238867683169cf120dcdd016156283a7e6171167ed19996ac57e4691ca3f49b43b03aeba25fcb3d5d89cfde475eac580b58291084d8f7d554b463b3620a63bad5c1fdbbf98a5d8200f0e0ff1aefab7754e70e4d666e0b31ba193fbc70d4dfc601464a7642c56385abe64df8f377e2e7b7c451e903a13df6020d3cc7bd73fac7f95dccc9be71af4facc9edd60e9e5cc5c99bdee1339fdde03b3342a4c0635c71106dbcc4ca3ccaa8ae7e0b9ce740fd9a6fce8cd805937b3daf103c246d3bf61a10eea6af21bc42867e471991459ea895bd74d6899da56c22ba33294cce17b88b39691c493d7ca312776dffb953720f02fd814e6b9c96e4e4a9aa6e2d255735ada1d02ebdefdfcb74573c77b4b19f751f55e20a5229a22e326ac75858d7eb4c7fe9a4ed48dd49be353269223d3021365569da4c2cbc3dc6ac620056c5aa7382a363f93b894c0a4fb1af983d90d8127115837531e9ec7ade4a419051d503c1501afdab4d9b9b9a741810693e256e3f03415901ca0eb9eb74083d88d7a1db546c4436e3b19f3be3da87a6e4a7033d0cde55ebc2f7123b750475886244bb6444ea293fe498fb1e98d9ef7b31a86cf05cc660841f0b21a3ced89cffba8cc08112fb9c20a8abaf1e9eeb7fc7c678377ff2edd2e4c4d3140bfa4106f46a8b137c4d68985dbe4b8d67342f409f75a3027dc6a71acfdec2b723a4e1b96a12e42e49eeef5ca77a8961c77c39d5542d5be19511d6bd5364ae79cb254da944281ded04e1e06b7d4de33e40b1086de49543e56e5d7d4ad2e224f31337351707819f96d36db4d3a29018403556995a098cde94138f71cefad7d8dace8a6e08008b22aa5d257508cc4f6a9811f036e7715c67ac369b6d80c425c79a8ee97c094c93dc18771394a56dd527a676d660472b9fcac4fe783500676a9aa6b0322752a73ab982fb28e5eb4ae639033340b9ccc8ba036ef1164d293627c41e094bba0bd851480d2f91ed8ec8a1d4a229f4d08dc25b5b7dadbcdf22b2269cea9c7c6b886ba74bc156590e440a9a0e128a35ec8aec4eac360fd9bb61e9804dedfdbed1e17454394ddaf851c73327022da9456ba7c4edbfe7a0031458088f026830c3695c5d89a60810c2cb6543880b892d8d5c93214ef78d8e7538028419592df1f630144856ea1ef215ef6658c350a50e018cf0dba35fda2694e1efa93cca66931d9560d90bb434501f5f420b8bfa02a566126dc2bbc9f4e0fb929e2c42637de5e2e77e07659ee590fd3b8facbe7847b9400df4bcd858925c15cbf1a385fd395d50b9590c154928cd95798b735faa3acdb4a8874672041d585e45318ee942b3e36711dcc706bda76966cc0100f14014f9ea47ed9c924035e2138107f52dd26bc5d0312879505d7ddb3b468765086169e24a6e1919de2eb169acb18267fd0ab0c468da0ac6436acd2c4e08fb85f134e648a992a69cb871173675e87906f30e7cedca148c00ddae418e07e1aabb8f82f53127635e09cd898b348d4bc5c575cb6656d4bf33af7414bd26a84b5184b9be5e15c384902b1c66a6bf08b16172ed8084de06331119df75913d29ddf181de3bfb9de1242183ee797309ca14ebfd5f8ac368aa72ed7403fbddcac4077d669930d742240dbffc1a2b4a83b043d904285ebc0937c087c9025c0472a2b6e546b6629cddad4b9e60d64c01e0ed4d4bf8e580013e2b215d24893b3dd7629e71cd6c9f906205ac2a1572fece8a7d95adf21ae18f530a6bc18291f22e1b05349abf287d50f1f6724f01d0cb3fb7e0a576997c3cd9c013ddcae7071a7edf496605715568407f86ea78b20e66404676f2b34618060e180e4f9dbfd9a70a1f96acad53deca1db22d87342ad2eead7289c7e481d2068a74e62f9c9b90eb02aed47b57352b23009adc93787eaa74c7b8981525eb077fd502e6c476f6fade93b53c29cea27cb4a7594b55e4ca11b66f94ecd43187fc23d27bc72d0f48a23987fe95b06940a360e9026a022d2ee3a11eb72c8573eea76accc0fc2acfc61fd9e1655c77bd652a5dc40de7dd0182ff371d5a8d3047bd82a69a4b75452dd2f4409c5176b02488b9ce6e8b5c0173d96e1a83e5889ae16b4a07b09afd8f11b9b80f812c9ce794da70ce46cc3e31e24325f5358cc0c64deb9305941c0511ebbdc302c2e362123dc4bb4c9579c6ae2f692949e92a76f9aad182ab69549702421d94c5625904af24a42620f331b8ca6f8d6ce59306517ad93fd6d1fffbfbdd16f4f120540753a630c0f56b178b1672504d1cc0a20bef9d93c8777c036d881a42a72dfaeb14a1a0b60990a8c27f978c95ce44edd72e677d3be62dbd26b3c9bb1ccf1128f79aeb2a41f6ba6d021300f0ccc1ad36169bf63e36b6da9b3a9a6e54815d3445125a2d5078ec0eebd58df4487919fadd4977129aa61ac337f347b3adda82072d758925f4ce6a5125b9e4f87dfdc5cc4b3af5f9589a9cc4969afe7c6b99edd05462d1da3c40d785b8067c4c866a8579fbe4d94786e0fb0b717c6fb96e2e3ebd72b6901acf96c0fb174c272f3559898019a3d87ebd6d9ece260ec913300392b541a1efc0811c10af0671206345b46a588abc932f58be6149ae6591250a8740dde925cb9fa12150c9f8d191163ecb613418058769c54f883e9c0b533f6d8f568c6a907c227d16054af09c6c73676f5b9859beeb5a762ea323eb76853f4a3ecb113ebc42f9c99d89e5869777448a26c40407362a45730621c700e3710a65ef8a49d9c19a2692bbb37c1fb4573498126522468f738da44bbd4a719383582244a284645b318bf7de280d1b9b9829af334d24c49c50fad08a3c1c630a8e682ed700682998fe7b121bce47bbde010fbc9ab70494d5d0b300b846e8987efee9ce09cc1bfcd828f18ea2bc4f40440f89ed48cfb103a80e77e26967b7ec56740d18ee40bfc9fbc6ae8a0d7f46f3bc09b7dfcc590b55e3d8fec26e7f4dbd7806f550519ba3ad64c15b657fc726001b0644054aa24f9b1dad492dadbea8082b176c5fd819a8e73665751578e74ef32779127616a28ebca4be7270c195ac077fd71627faf95fd02f3b6dc45a9f47d3f666c318d752ae08c17d2385e810408d90fe0aaffea328466c5fa82958e840ea6b7ec4f2bc6980db0f3a86461f51cb55dc262ebad5f326533b6bbe0d9c4b283f564949f9cb05291ddd5371af7713a088fb9033bce4436d93190fa742dda242d725bb1fc261925efed8df4b6e3040b7e4989384a464752833f83a087ab09eb0d2be8320ffe552741a5a6b90ac91150fe3df65323ddbfee23f6237c623eb57a44f7dd67be498c97bce8a03dc2f695d0a41e270663a06c67819f4ba401a45886d78853efce02a00335cffa3b47c29b5341f43756fc5c180edb367aa43f104be106d233224623da7738147527e42a904f5a1fcf1d35261139752f9bc38dc992095ac84d03f889024bc8dc211a1b41979ddfe455f696b8199a2e5ecf61625293a6e8f9e36718e9097badaf37098ace700000000000000000000000000000000000000030711182024""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-02b250a84d15d015d65daf64921d441de7eaced5dae8d5ed5aaae0780710cc6f297bde76b46a47751c9af90b775ee5fb60558c3223e3eb5732b02721aaf4b2c571e7ef940126874e4da1e3caf1cc2ad7e27ce78891f1291341fdee7cb3956ab7ea4619840bd86c7f9dfea16dfe4183317150514ae0802275ffa49f6024b73fe8647141425335708465313201426464485346242381251600248884382713606716557375714102105768868264738542155467388816816356812542627664178831841037254605688411724580237205731280866143526825234680318656422704153533366183723757466871843688178028881525836875501828568435457286665223064636185645230082113325530524164585450807060828648444577380467366336754361347002616478552715650545343028378024652505823347436461673212376362234025530852856734378445453462845284101853812575565581884827462217026026422104812154576826272426053254068887115864026255272878171100133062131322881708327412284661110206142314411622224337587412032420350668587700242526761482182726675778500830622782044207773116013105023034233776328272350126302720568518583358656451354230083043841277280712565820402201860064335052181175517311735442231750885473485037215718385878270138340154607044703158207867761262843151363863357713438131822607823220673301000044571035402768713538116316681661333581683446254512203172240767614876605304851065554516305534873744587532285306102132174272346747240832551816548184855245064521871825764413883184880638014732810482403611487478652300457226475201288323730148184350722032842227130834781121602654604023710282810767482168615127440306717714253337676650252810422380412017358174362723207845211345873075406185684783381847626578275162801521336142056152170155712241310876237617136086741136380504866038451845470225151278835071185512660605346805647733377213630110431352442082411744260720818165866163256467725736467210364865838535371781843306701265611455343258201250377030186530054148020488730682653287712420076332033632152360007738566311722306842342001442552108785228736068105822832556448320553027240817753888583045860088518418735447717834455361718663826710688326265670546627753121815634362520041561353322020182806804003170603630646666735317632666212644884747232226042203107541782711326203571075272838712027837538612884105214213440255641088764071225378263327161071701133325304617456360706381304876424815454081020463654588185224521206112700043112564040383368163743670720762520847703261453336085324624132272682450408103756773710773186063277457057200638057521356383470147541687564530335405582586576663835354166674556028404827843742364212470042005558685247530877324355223572703600740553684760470530433178478246407657755282728728664872333848341350211277700011176401760584128238436637505138325505065217756818608062404186640767275603751648614303125612236426720624257485313257806504351724443061164254862845182170346255843504017541208163705313707842235716441111165511437066602366003214233060621717318057200645070765311025637234215854421157547802133221647713605385536202724237457842541827665838172167350548151224528361420224511555686218886503218704567755513515188462180482327014724401365004608425761256824684371031461705077834160654441852347634061406138085734353c75788bc566b064f5526de67e27b5f64a800d39cb62e3aff6ffe4617aaf109673efda26bbf69d235d5ce4a5b9d07c36b392cb04a53fa09456c88242b54e4e96f3b72447d6216178506c1f380b2dc277ff6d09613d7ee8aba57fd05a35a69b850ee29a90c857e06b63e904e73bcdf2908c8940598f4bd78b1b642879c8f635c908f7653df743c94d8482f2f727f9fe18bc78a590bd0985fdd040f7b879e2fe8858bfb442890e584c3fd5234529e2852ef752edd0e24dccffd1ecd9f78e3fe754339e1fea97d49652dceb41d3b7209558c860d82f25df260d8a482b3061dc1161ac6b181a4c2bc1a5b54616d0b65744966636ae1ec8bd61c7d7432cf5c41ddefa21b2d84b3b65208d13095cda462cbb08a9d4cf071fee7b6dffde22532405dad2e96e6b5066af20abb7a6a58c5d656774354dd504cc795552f8c2677730e31ee16f39f9a19351be7fb01716b121298da000653be35f50ddb3e7babee81b455eb30e7cbdd4319ea1af95c5ca3980dad25fa11fd69561ac94729e63d2878209ec3fad599a52f742b1ad9fd58dda60ea1ad7b4df59629a6559cf2999b7138510e14a55ac0bd242e92d12f989254d5135736653be42f86c004ad17025a0a234ba21c0e9d9721b46396d5e9a9b95d3007e59a5673d28d3935bad4d58fed72920f160af1853c624181ae74349a914cbfdc01a50e6ec008263f70fbefe9a939e1ac02f370545237a31abf3edfcd0bf395066a1349a99ea2c1cee48d46ede993a300253634820e60cb6340aa1da98a83178696d21c1e701f92133ea8c1ecbd7dd199cdd7e6809197978f40da4c8d22d1f459a8fd7baa08ccc7c5e16951bd523c84181e3d7fee55c8b1544068af3d3cfa6bf545cff8b7207bc288fc6ce3e6db3404a2e5c85005a515881f4103084128e29858c3fe94fa2f01cceff445d7b57f0d8cd12a983ebfa0b5c857c9fc1e37220f82a2df00043867c6fcaf3cd16cb549f4239fc42da69fc35ff58affeb5d4013ef14531e7a6fa437b910989e7f5a75009023702c1380467854974acf722090a7a8b7721941501a34365fb1baeb02ebf3b9c27c04615c2cbe5ac506c69d0c581681d2bd3f8b8f8af00e34ab4e64f21b75bb443c41edb3909c0f5b899df77ea4d4e0d9f3bf12cdc91c010e94d74e1636b0e90c47f1adb2e6f31dbaea300bc9e3604e81044dc4c00a0ed3883682415099f8297a0499fae7d26a0c7017e3abbb8211b5b5dfb24bebb37b1e1dfb9c3de36eb45bf2e0e9fc6faba5db70adceb53ed5ddac5e5f097e6b97a8a1f328e08e0f242316053b163bc950a065b2ea29996e1978dafe0d35263ed72d3d2748f0e289c41d0245a92acc3f06fe4704fd5df117d02350f01cebf300fd19be1c710b85b956c75707840c24183e28a4b455a3bc804b1cf4e71209086efd7f4ee877f341df27ea2842be106bdc8c57b86e127a359b3a26fc148f754e8ca99823d9055b45572f51417b0e89ef34c1e36d4c6d9fd2fdbda0c2d084760583b8afd08e5f25944fd3133fe0fc6a446b2bcf51e7d3473f498ddd4d50c4929c164ada3149236e0d9ad31bd14bc0ffea2ca972c3e7cd2339eb727fdd73b00a958729b9ee58da1a0057483268d5c0992bd0c49a5272695fbdabea68860b4ee535ba1c94fcaae8d74df85fff8e8e5f8146147fb7d0cf1c267981019661db028779578d772c5d2bde7574db97569b9cadcf0eeff8d4226f687f5d1e65b209e5a9ac2941ce6c26c2c0dde60a8dd76dcf124fe32f7665af15d86ce0db8aa4e0e662c6d1f6d319869f1dc7e51a4cca6f3af028e11a837fc4aea7b00f2cfc52e71cb126944f1a7599f3945348a828c6106fffb5d88ce5a234cb6e83f0a2bd3b63a7680f69ab58970a32275a2aff8dcfc9ecb1e1dae60c3d57dab0f9d5ce5420d5af282e025ce51e7130b86a88a209ceaf9a351ec039c9f1948521450ade546aa06a2a7f77c59dabd381b688980731d4fc7754bb9ef99ab175674ac3de181d5c5b21a22a1d2a54ef81566f2c2d157e68b0cd76a1c67896a12a933c0839c7b1ab3dfbc042e426be112b988752cee46cb78c746f0f2f7c5b77a229441b9f338fd34c7e882eccf38c9b0107b9409bce97194ac94c5e26f5c3b09a9ebd0d6ba206ba8a06291b4e4dffc1511c7a8b8e15afaeb5f3c96c0473d23d693b07435d6d2668d67ac57957def609df4ec6e40edc6fdf2251af26a0b023e7236e4c9b1b5b8340c19d791301dc06611c988e8f1d30dc62232c7ffade76b31efd49c978c2ec271f1a2500e5d48b056c3dcf367fb3ef7d4574154c9e51001fc0428ebe89180a68885e0e3ffc47e273bd802874d876c9b8bb1da540e3779b1a1069880fc2b5db177cac551d70a780c4c24fe90b9f252734d0df53559ea363f88101d584dab86977bd9e643dec35a6b98127aabddbfb60f42dbd5fc83e0ea6fe8dd3974f140fd5aebe7f96afaab7f16c49518aed0711e8dbe67b222029c3ba237a9058d09cd740c91e11ae8fb0a343b85d3330ad680080e52f9c7a67cb27c3d6f9f2a8b69c0a65b27870d23987414c968652475896d420f13ce0f511d394774b92a09dab3c89770d0e30fd56055dcc88b6b25b6f42a30f72e37fe2990c4b2faea18bd9f77d0bb712ccd2635ad98d5051ee593f82b2942c520b64997c2271621c335df8a36b4564ca3f80b02b3b6aa0f5317f7d4062b8c890ffe003be32db5607333fef37fd415a37fc7e987ffbb305d96a6bd856d09eaf7978b9f8343c340c477927d82727e91110efdf462132ae09b40101a3c26e9657b777e74ecec165986fd1f392e5c5ef1500d5e98cbb3440075734d0fd38d05ced139589b1a42a1d32de2014cfcfe5b32ac85473d7a877978edf5535c93a2e447f76972ca0d9fa1011d6eb55953ad22e67623cf59ddb2e1acee6c0cd762b565d03e547fe26eef6eba891de2599c1b0825fe70f2b0806959947ee2e956537b7840d982492aa295cfbcd3668203a3d02de4ef54f44e82baadfc4efc50ef42dc005b3dd186851ff44003b74bc48ae4b8c8a431d03af1cd23198e4a8e2da45d0b134133dbd124dccd3a269d64439e79753c4b1074b27a6b99b0339f5630158641c07001493864268ab8409ca6a986f8e7353f0e1cab155ffc60f6f8a70db47ab74d16e271c0e669c2c8c4630470d1397aa40c3040f93fad09033413d96ccc2b1f8b933c7c4d215000e5c4e7c6dcfcb4519e59122a80506b96a4a00dbfc7c02fc29a3360feb00e1f5cbb999f773c1de0f6da976c62b5ef787a3c08f07db51ffceac046ea9dd8f5cdd22eaf7c2ca3be7d410dd87a477df1a8838eab8ef72ea38e5d99c594b57c2f79a831db704c393c29c9659db0dd1082c8df0130b8b0760aee0685a289d8dcdf526f3bac8509cacdb96625af6339664dde755e74fc8acba8b6dcb57d79beba260446e6cc33ab2c27263232db07ead25fae4b2548f652cc193f8a0e93ef835e15aeb18e401e3875ba4b82fac32cab00b3b4abe14a8bdd235971fcfaa8b5852152f0b"""),
-                    TestUtils.hexDecode("""
-320D1B2976A4A4673900C7B75B23EDBC25B9AE867FBB79B55B29B3780EAE8C159A3AFAA47CF1D9E452CAA8EDDA3304BBAC47EFDCF96CE92DB1981A5088F731E1EDA1EA5FDE9A031595A8F268E92B4D75793C6F408F79B78599D93E80066F8C4432911828A87EF71C877F55B1F18207F01820C0153B647205CA93DDD6B78B94EB59E3EAF01B66953951ABA4027F811877B0F60C9A5AE6281D82348E3EB749C82C81D53309F9B7E624BB1BFC6382F43A58D1951F7FB716C08DEDE4A8028B50544D0F26F7B9DAEA0CD075C3B11B7315022A37198F0C96D752798E0EF406875CE86C367079841F717261A2B6570A8F4F9BE1EA305E73BC8BBD88AB162B4D4BAE86CCCD406A0FF6ED5A968D4C985460FD8FBA5B3FB40E29B6ACA07F70717A0700AD3A0BB7081E09F7219F3F8829692C3DF91C90334DF9E89284D65F7406188C9A1EB7B5C491591A20EDA9399DA1AE8C0C158588FE1426B763FE9D11223FF7A05A3DE036B67541C2811AA459045CE73096F89E6BA672CA7A546D2B0554DB35C547AD9585D14485AA812BFBC88F7B248E03F2EC57043F4DEFC2B27A3B20C2EE7CE334D428EAEB228350A3ABF4628C2DCFA84BC7435818F91CD67F70F3C7D54E2C205E55BC4ACCDACB354470FD5C246F32A542106EEE0EDB38F01FF5C4B657C7C1A00718D2BFD311B8BAB6523351E93CCB44274B8F96EE343830148F5C8594818777C1E798EFB45AF1D2A75D22470B4D7F7C7A5938DF3F8288A0088719C4E36018D9993F9E69B8469E5F2ACF1977D441B82E5340E5AD5B21B66051513553BA1BA1C1D5F788C47CD3BC60079300F6E3D9F13EDAD4DF8521EDD022031A3D74A6A5F32AC6FC51C67F920233C5079A2B44BA7B8EC6DCF9AD4667BD26BD07567E078267A1BF44B15E68B71AD38226EDDF138D2A599944F70D47B26F775BB97D9966845AB3E6AEB96E1414D3BDE94160B6DF19E03BA1BD0361354E5078B3C5733B740314E2DCCCF8F4C9CB179DA62D5C982B223CCEF5F29D7B673680DFA2823A2BB279EA45D98CD91BE7D52E3E386B98B62DF3FAEDF025B55F49EE6FB5E8DFC9F70A4F093EE3898B25102CF3AA52E669D6EC69BF6C79457BBBB7CECF65B1E948DA808025A242841FEC6073326BE16C2D1953209F31BA4A772FF24BC30376EB994398D4177FFFBCF78C9A79B7F1746D077AD146514A2DE0AF9800255F3A11BA661765A7D8E8E7FE5FA46BCD1269E278555186D4BDDD03FEEB70BDFF7E5F616259ACE39969CABE8D4F8F23544918516C977F84C09D6A6749B1CE719676378E82F9B4E563D67AF7D911233F2527B5CC5D0733360CE15A173F10B91360A3CFB08EB44A09157559A0CE8B661AB4A97803C52F156627C642CD02CA5BBC7648833F2CD7E99D2A7AFB736E5AFC4FAE5DE19ACD2F5CE3E3FC887852758411E8C7FBCADB1578964445332113F963AF3E944286DC448471125E55A46D2DE35E9C0F6DD10A3BE4F1E4BDDE51A16F4239A1F6A535D3202055990606C0065C542297D490553204A6E3CA16A7FC9A1D77191E5C01C1507A332C659FD6B11FAE088BBA796F18886195A2B8F5B0064D85F56FB7256F0FE70E9C06ED18B7C8A75ED97A1DF482908D2E3E8D6BE8D0EC8020451C687D10F829257F3D09FC47C7EF008B89E2312792A25EEDC71E9835674CA50235E0A6C832E7BBAB458725EE7BF65D26A0501C91835625C330B0F8B4D46A0762F7773D2415A0DCA573B47EB8658F9EBFD26D9F6EAE9D7A7304BC690F8D2F60C33F8A7D19B52F9340BFCB2FFDC92A7F9ABF85E3352E46ED7591F354A9E19B70A3B247E3E4295E45B6A2CEB59B120B6758654BAAFED2120B226FA778FAE5350E756741093083E4E56A84B64739695C1C09EE39DEEF11D7E5BB7866C90FC9C96CEA071FF82F145592443BBCD6B7CE848839B641C4522016945F711E86152820275A6E16BDF296D34AB38CFF06A63756DAFF7BF230F024DA00C4128F025F091F4341620E0EA883042BE731E82D21DBA6EE737D90346B6189697CBF41F7C2BA7C9CBA20E14D26CA578FB05E92798D57C0060951BDDCA5D96322AF35D80013B48A79AB7684E1E1B040315A350DCF84389E54C054AC4C3428123E01C2FD66FBB2C5BE2D16B22BAB805AB59DF205B71764E4AC9BD4B2D872B8905DA230623C65DD235FEC253468E53928722D1F04C486B46E63FE63441F11B1E3617E9765D4F388D4A2B68B6C86C8E20FE0F3C48A561A0FF5070455C43A7FDAEB58ACFD4BF51A1C37B7751ED37BBC73B9C29DC4FAFD0A8F5FC98C7FF02B404AC08A0728FA82A5ADA4EDC195E679D88187F58004844065F281A67FF0A2BE0AF94D5C97ACFD43683AC721045FEF8C36DEBA2E3EFA248DA65837046B62BD6CCEA84CB1211C5893B0C5F0A5922A989CF7ED093D5D706657AA6E79EF3FAD0959DF594B9CFBE779"""),
-                    TestUtils.hexDecode("""
-c344d3409be7db98ef0a349092d4bfa68e022cdf72abd10851fb824519086e7cb35ae13a93132867d90ce67d9c99315a3c548f7bed393d9eb71231bd9cfd951c53cf8a7555c2e8899d7914549a5565d8531685c7a02b82f3b95f38fcfe9c24118358f4dc4b0bad89c5e169e8f71e97e5f874bc8dea40c70e9fb2322131eced692b164c011d04844f0cf95a663a90e0409f2b36d8d936613343f6078751a082056d1c077fff3c3e0bbf5a9edac10d8ee0be319df29a998e5a52f06dfd12c47eaf72a457b18c73bce7931b74f28e2b3ca2037f0711b8a4755a860fd79bff06218b965a1e1368128e3db4401bf37185421d4b080e20a017f9695feb484b7a4ec6623cf5f82d99d1e0a3873d380cc5ba715021cc8b24f0839d10eb2b1679098330d772a081bcb20ba8613bad19841b411cb84e4f9bce9449b5d1b79922733e0acaaaf3c518d316c63a51ec49f4a5f30671df7b36e3996201fc625c91ec7cb621b54f98bce47381bc062be82eebbbd2196fc8fb1f26405a80a1cba591820c6b90f9374406c97020e0d8bbc4cf71d5379d54e3412f69d19b59237669e1751355c1721d097f07a218214428348ccbc0c954ea7029dc6aeb605ed6fa8334206e230c39ed5a836664a6c0b848de5c6a219a63ff24264ee44ee5d9f068a41cfe62cfbf885a2bb4c71f17863f5172b9b4203e9e9f21e0e744807277cabd3094d2727d78f930ba8779af85026e45b809b8b3ff259dd8511981e7955924bc29d448a5175c7742b7a1bd7db170c55a9831631267789adf7952fcba1391fc4eaacb7c3429f43a2b634553d8fe47ad9f39f81e54b0461061f6f67ab6b72a25e99801616737e8687c738b45a8ff6f05f6b5a30c8d87f6bb4e2d4aa82ecf9f7ff4d1a6d6b5ba61661e8a75d4dec3daa6ac96c0abf7ac09da08efe3eb73ec0de8ff231078bac1cf98ee9ac6aff210ce15f8cdabb143ec77860bb090463c0e6b63c0b12249633510404cbedad4eb85641630cd131a7897b46443008e79edbcfe471d37159a27a9622bdd6e34c1943e0b5ccf35d8885a9d584f6a54cfe7b1b45162360b573fc19055f6ac05df20662026072faa0f0fbdcf4f9b7d89d77fa0a3ca7ea0d857d0d9b94e95a406bc039799ed56e076114dd9f7c8c028c97e2bb813d8862da972b069d7c1e251487472c291baa0c0a9c9f349f29091d8a4332a56084e11296d1c72b7014045ee584056e9822b113136ca9fc27b1487f64e4fae57b31df3e6e2728fdeddb4437a8257af982cd08fff4c4e6e9aa82067182290da938b3b969e5ef0d15717f0c34130cc2d9bd29d9a4ea6707c9a45830c66a2598d8678581d9a389bfad0e34c3cf45c3596aa986380458c5cffc1dc06c5e143952a211288ef0d67c7375f0d9f59ef10a55623af7b6d2faae4802882d09cafc9da95e7e0254b147fdadd9b8b28498d625e9b0603c9e7e0a710d34134e6b4d2e31003ba30acb30df03a913851d5191adde83fb0278aec64262de99b7ccb1c6ad5358651f336083f59089beb924db5af90be237520b5354ba63393c2514f2f5c815b694258cbd56cb7caa5de34986f214c566305163782b9a67db2f1e51c0172f757e3c8d9804cefb63df98d4297555aa95781e8c1114d5c53b06491b2c4463790030d2d28d159c071c081286071d95cf5fc624b69eda6b2cee5d84ba30ee0b4357eaf5429c26fbcc455357de8730f0b50aca059334ac5af33c7169208be3b060abad80a41d5a720e262075442b1f514958120dfd51927363fb0b43767f3bf4ba7bd2669f79d9ae38c8b244c9a1334f802e7295c1a5b2d236edb5ef8eab028dd2bd8fec9f0ded1dced5a352f55f4b502f5aa12a3131bccbc88a2dfe990cf2cef02ae787db30e8bfe26079bed383e363576ee704e2b2b3b6dc0254ed4039bd0155fafa471919703f632bd8623350cefdcdad074337d5ea637a95f995141b21fef74b93be8fa18ada82dca3bb6ebbca0544d790ca07c42086bc4908a4dfded5d0c09e8c8d4382dd30fd6c586d5c379fdfb11f69faef1dbf46b0b03432c0b9967e6c7417b2488aa22682c5ee0fe6a08e90d6740af02f131c5acb53fed64329f8f108f53d762736519923ab734654f968783dfe8d13d715e9db219ab7441fcb739fc75913b20334155dafe6b85f28512d71a02e463e8f58162a2075d301d4215c61164b5143f096decc998b006051752431e1d1d7d109f92c986c40d2a8f17ce6fe1c32c33631974e47c73b5512697f5e3fcafcab2a4f8b462685fcd5c19decaea96d45a7c3d35eb6b81d52d3d300f4f94f2f831e3412b12429b71b46253c83d849250072c035003b8f4c0c7376e502183848ab14ed9f8b6ed1c87d554223fba1bc99d1d065cbb945de8968fe41c161c301b3cfb9c181ef3bbc120cbef645da02c295d6ed66925802868bc8ac6b437550637e5a16d429dfa4b124c1f1045174507f706d3c01f9343ec58bf79e5611109530e2543ddfaa2fc0641c69ec8f3947b4350bef318a55998fbc25686a5e115c35db12a12e77c8dd43863c2c024745410a0fcf1560f1a902bacc961d931f793238684944140150a99f2894748d03a83e030ca52fd83fe43bb9b7fe43a9451f3850f92df5e242a1e75c3a101efa727667ac45164c35fe7143b4ca2119d76980506e8981c4990c8f391a0c9416647554db2c46256f3e56963bd4f7ef309914dedbd893fc6855caccaee377d70cdd54c64ccc3e3d1c0e197684fc692e9d64be1b07af246bf6d2e4f38d2e8844e01efdac0b24dfbaf32f08492a99b38486a8db4661dac565fd847d83993cefa810c42cabd357b3b1d5669afb73274be28d637d8c2de41305c33ea3569f865834effe4ba3cced51fa00ea3dd7f442894bb2ef9a92378ea447fa6af9ab8b3fc01ac45c7221981471aa121d59e77a1d472906c437004ebbb168cca7f518145494516b1d3a1aaec164e5f73a96c244afe367943eca32c4e61bb5766122f1f19e9768c4eec5d76f3b10376191c5d42005a99eef0fe332cf5cfd4ba59f725bd50916348b5704943cd5d14bfa826630a9529744148d9ebac15a84cbf6490be826ea51fd42e505fe9e74a13ec9a1ad546c8c22e8d498ee7a0dd75387240c3d166fcce4d957fdaa53d0573ed995a229e2744bd8493d44d774910625310b4edb8e46ae665c40599c7b48058f104199ea6ce1070a37fcb383ce4e2af436185c4a3f20e186a25b8dbf4dfbad8304125e186eb76b6f6ceb7fdc51ed324272945e44b0bf11ce27b5b6b683fb4efb7e168ff13e46f1f0f4a136827d8d56cc6fed0a9fc8a2abc8f5c06d1dc0de33042c5b840c6d66a8f27331645a87fa6710f9f057685fe00247cb7f12b229a43f539f9c4a6727a8897c69d8ade9c2af6538c594699a9f428a998bc1e8d11adacba134649315ad51f73c1bdc11d8e5eaca86a138ad934b30b376d754bafb3fca13963eb800818592eca6807867d9bd23ec931a343776da195c8d43830028cf4328701faf124a19beaa44293e797c2bb89b2c9db45c7d3785a0cf5c9fc783d727da3a3f20f5366d9f39bf49bd1ef9811dcd74804716f82c0afe9a73c88138bb23babcf5b7acc87f5dbdc0ce1e39540a5e5979ced0aacc221362e2a18a4af86f34f9b2c03a21dd21f70ffd443be4bab058acac295aebc452b4fd32ea5750f4a2fe6260c30eea5bff0fa17f25c3dabe3b58fa72f75cbfc18a84e2ea3d568cf6e66e401ec82753652f44e9410bbc435721a10da1eec613e71f04023f3121df6b45316795f110c81ec9124b9a5568c08041eef364ee59b4eed261f3edd834741845ece57fc5ad1f50d183d03c0aadd61eddb2f13c46093082182b21d4bc5832081fee8c81c1d9a77f132e8e5e9f5a94650222dbe47f5d7f846b1e91d52f62609cf0420446b55ae4a96c2bafdab6a8793beedf7a7ee9f678a099996b6d6f8221427fc86e1a260d7426ebbfd7b9f3e0b9029907b00cf77409b24f73b7f21fd2030cdd4e36fc09322ff6176f49b6f3492076eb9de2d79f41316a202994871bf7ff96ab0cf94ea11ab959ebb4fbdef3813698b1c78e13f2422efa15198dba6af17ca9b2ad199f133076f9ffbe8496fd28e003575579d6f62c69a237c588ea8bbac99b32c43393b20112779db5f9989c04e9530af29a7cd959fa4eb1276c69d46a67ebe363d635aebe19452416e01db478ab32a32c6e95d43ed4693d51f4ded754c62f53524d4179dd05a102acb6e7057c63aba9c8664d9140f866a359f755ca2bb4b0e66b3794206bfb311535810a24a6256a8c0c79c4a87a8fd40bcb9bc23321fed6cef599deffa6994cad1bdb655eaf85d082cc1c626727918e63eb27521b6de4ef5857a2ea372f64409d4c6885d7eedc15c95aea623bf081991890b8d5673cc9ca26483d6b7bb88fa61b31a13f114923e7332eb2a52b9c42b7b341ac6495d1c4fe01f627350089daa8de8cb8b4c660ec9bb065ce689d965e14488e67976502337f1de27d825cb3e6f563312f1a3467e1d2b2628b5a3ebe401b6533f549263babe79b0ec66132bbde277a1b4b8d913b1c378e864d3c56820b6de08e3462882e72573e8ae08c64861669ab8e92b575c6e7fd5db3a698895d8dfef064b5fbfdef1f411373a788082a2bd0000000000000000000000000000000000000000060d141b1d23""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-2bd5cb469bc4c91a3b3064b58eac4e6e03a617650702c0d2d7a74874743bd42ccadfd0a0426a18eb3bd2cfd8725609ec1dd664876ea3166bdfa5661bf98aa6bd4dc43c4310e2e2aba9342cc140161769ae9a63b145fb51948db18bdb445b795e36e0b1dafbcea3f1511748327d816eaac6223285317767e6662cfdbe74165a1f837627263848874756877165276577221012676651444137680132351130784766788147465478471367074350475415218011258206321522104032260216358087115052487816640447746366553266721274514170003637258758343506047250725516568524230380681128162115337361701040586852051744264103454573305535062334537784484077656163074677272568625252463165155875317358360146115625063886554172373584244342527435771442357733353661235042676104117250321606683502032000304787780284453048403518686437812433703270542350835714767753404446076203235271085334487676035830264555553820638166783022256245427730457125514514141754877787346727386770507351017331511724787024054365575235864224380446106330453668340626638555373327516062516306886475621371718244701207532814635187371248030251086845214367337305121680057762817347221343477236268755411121538120032625527387087820444367451140486361827338170805820871463737404481676878720218775500220783387826711830344223526751174102542172057377317130427127801480471835257171264437133768081188782016312740871764452200326044135076454347426856278612352770234227783765776357757573058200813686182602844752021610350156033010746466432146177667445420481264340135175072877232526365606487634201345884304360040750110731501650471000248242232213628325476255740664880703348565832321588525453628717041246764467867301880535846172546126865811071742130263724618348008631416206332005206121853267247108855712233132683424345244848303807538204405258230042874387023163681814017812032137307221648277008410212678058052583746378836842645158534814724670837823578171856506780408155350888617676567180531567033882322162555145138678874828584823364454732222602030751015404558527231541350450340703321417116030531380476526278516178561184083623485516537445054173805185443648434260361525335872750562508727141471515701062834537455105224861345443200067381243725158316423820424705434846600327113226176138138454231433663300613423772776824764225234116254171433001668148037672821722303011538105181471258064724308067107564661085382384052651662161671371345002406584155285674885115884255623875833515644444012106045031335230435125421350485781633764533072382585016230120814462005013470878246287428846070527816201075813467457643587442707224786278733035472163083440581148234114732088143538867042226061853513505227741830721305557406052855436154702188382365521173365277022316072781138710386701325360744315647482770676701727178207307406733252332236826413631243466755010000556060201513176671172088364088733451430652141371747471387788002657666744184645502366471414202007085075162567246527800734147856021313101363062687280452240370150345431545834251037064708377637257784423423561853746000277450201775363821445037005416848448528210732571687768775128345304188263680432021232840435830262414877006657477861158627541208278123144738555315743158402874328317821771457820661201658137582861032041e31fdc3c1b5655d9e975489b7d89e8323046b49a6cf03abfbe1536a5ded60ff7c2f6a4623e6d40fcc62dd75bcc3ff33da3dbf4f21aa7cf1fb38ed42e330891963d504b03020f68a30bba4e6bc2a91d0be9a1a48553ba44d362ddc405f46c426c7342dd4f72694f49bf36fb98eea3ba0cfd5429733aed165610815437adab5aea371c1c82e9231023d2770da62d93941374d5e130e5cf7f57df615313fbd2fd93399b62f09d97e9b055b8cd8c179836416d27e6425c888b64d5d4343c6a5837740cab52c9271c928c3647af1a120e567f3b1c312eeba09002f3ae4e90e96f1fe80c005113d9bc1a1b7e755936a9fc22e670bd36a9077b263a7e286e8b0c57ef594927ab23d88441ce3b2a62ba3e95ca800bd30ea65d0c8a443bd060be70b49d2a1596f29ba16df338701ab6da24c06da858d8be565606e6b579ec8c1ff30a4819b04c83ce8b84018b26695e3e5715f11f9fe2427d0974ceb701b9695fad3cde0aed6d68c8649387cb9eb6ed4b7814e4ac262e44dbae89845e28b58c2b6372f74e8dedb43c4e68717a3d3007fe0e678e1627b3e3ff2a5e1cd2a1f6dfe2a43c736effb67060c08b2b000dc995cff9d47a8463861d088cfe609d21baf712adabce3a30c5c4eda380e61eff53a5341aef7fb5be2fef6c9ff5a03bbfd314eb43df88f20d40c8bf8ec86f4d268846e34585c2c7e7983d28a6136d1ef222ec3754a1ef0d2a155463275ab103bdb2d1a1087646ac0437b15b838c883f2b870fb1e324d20bcade9a80c08f306c2e7fda542f34a3fb242649203df14083cc9cd801e4a9576c60df4e601a477dbf9c1417deef0d0e8564980ccea153af41baf6c68ebb772a8377b222851a015351a748f5ad260fcec7bd9e3bd4651d08ab9475173c98f5846702bb68514d4a5e486e65b09f163b11d29b2293b127fad2703bc3e95925186b6c439c35e979a0163608900df4dc83f28d15582f20a7dd8b4a9c3fdf6cda6cc3c6b98b9c09b9823fe9be87ecff183701781933fcb4e1b877d2e722a2647b8e55e6adf0a498ccc382a27b0fbddb6bce5242ce1f1b0e47ae3f0a1c2a4c49898c56a3e9c49f4d53d3825e0948369f36b4c6b81be9b1c5bede763653f7a3967c9466a9b4dd0cc826d1ff276181bb770b9ce59871e906b5e3102ca3f6e567c6c275958442d66407b5f3a899814d07a0356d168596824db9c84850291cfc7cf119424949a778275deab8a5cba7926d07b82b6c6b296cb433bba7fb45b679c15a6f177562158f8c1a9e54df79cafcaa7bb6e002952250fe2d533bc27a9479bc03db36919d90ae4f074bf88da84e651cfeec8715c918ff605bd60c4bf3843816c7b30e11bab3537f14253f100646c7d0072998761d1122485f80b28bbd24fa0d53aff658202c42efe00385c778c611351d152b353e3265baf90808737271337310c0e8893fa16e9725386737b64ef5e41fb080b65102ec6197910700d309ca7f7643885163be8d9bde7580e591480f0de498c00b22b810f76e11b4b656df3611183c36d17c204e34c18f1d2e2946816506b68647b5cb4222b27499c4a66d3fbab7700a7e1f1419921a19f39a24dd5a905921e7d895f1289a0f07338cc2a72a50c95b2f8bdb3912929354d4945d4c327e6ce0779dd8b126ec891170f073fcfa03daef28f0e3a214224e683141199b25c31b0f47ad1c58e1b47994f2801829842b84dc5d583efecbc528181a39857dd19be0d3cfa07f3e63b358eac6c2786a1aea7ff5ead542985f42149a98a1ddb89ced1279dfbe56363946e27e8ce0046ac2244658c4ed3b97a18bea6c4e1caf48eaa7536c65b936af37fb3ae8f78adadd1588cfb42cbf14b9e30e0a9761fd8701953b3842da1d567b249a1eef29fd29f2d73e15b34eb4d1f11e0db7286303ae426ac2f84dbedf6ce07c1919f0205ff59f369132e27875a2657e6d560e74f8c8f3e5af044585f0272c1eaec7972aac43baaf68e884dd3f88d4ab66a471e4fccfdda4658068611e5f5c33756ddd38ee0023ad2faff603cb0f86659560d10e7845d5175a88c1eed5fc9f7beb33315d2eaf0273829b26ff6f3b99e31adc4752dc5cb651e8de0974ae5d07e38f08d7dea694b56a83c47731b0e14269b4f68cdfb66a5cd33b53fa01bb3f15660b7f21ac6bf82b69d8eefb52b75242e7a2879802bdbcfc3ef969ea12ea287a7a3cc17149b2271012b58d760e00e7b36269560a29cec00cef0d979366fac58fe69bd30e80c051d65268c7e8e50caf51edc9ba36825d7b3f9edaa2b2314bb62d0c244d78a52c4d5e2f3114fd1291bb25355a8cbc250931aacfc716617c884f74c2360fb383a04d5172ac24c7bb01ffe26801c7e20e4c35711dc0d4e9a22de14e047a45aee60d5cb4589aa53979b51a73f720966dd1c1d714af9e5179cae4e760b7a4598d8d46988777dbcc759effacda8075393de7403ef5c1d405572f8b49641799b26db4efd1f2c821b453c0704134a1215cffc835b5a63104cd0110d455902361ba484127cc84ea642405e73904b857e4c94467fe322108f5159eae46449c125ab62bf864c0daca0cb5ff09067b520c69c81ca2fcf59d2bb924ebb443296126198a0615867ceab2636b98f87495cb6f732868d29f27b6e1f4859aba4a83f172ce5e73385f075ff3c37c166cb360ea16dcfdb53c8d29159a65bbad099394bd63a5d3ebb2c46f003424eb81889090876b6ff0a69a18a438ce6989c465d5e32ee545558b75a28f51622831cafef18822100f2bc5b8e45e495b13ec7ee150c02112b70cbf245310344a6341072e48784f01cdae1cb885b1853de04c43121910ccf30c9c24f491e56db7538e99ac00bf0224eaee2e50fa9cdbd0679a500ca1d835ec1a129b42e88c11dd90f84e413d0db6a22a21d7c090d641c34807145bb0ee35fdd8348b75e045fd7e2136ae8bad14feeb2581e862d9ef964280f9ffdd2ac55ce4935f88858da06e683520c9be9aa447691e3bf37c0652b944f1b1bc458b6e67e3b760086e274089ca9177970a5906d45cb50862e5c30620be6943cd075c7babb86a2aa0bbd9fa06d5388239c2606edd34e729fd78a76b597af751cec41ca553300d0db0ee933239487493f606f6b8b5e2f49d87e061d56104444e23659da7a65e6bcfb2b767643183efe835889452e94149017dd16271f78d50cc74ca7e259e128f02f6beb925a9cd8fea3d11b105c11620c10954a744c65df3ed7ca978994b85d6ae53a89c675d58e805ecab90e575a9b553e3b85507a190a62b3e59389892ff078b0d5196469a2c4ef1edbfbf64ec4a917fff3f7361cdb7a31b360cd44a129db7fa091c3b87c89028e49d62dba7db65326ff9358dac88745b1be5975a6d519be7c9caf432cf876bf1463632bf4a9bdb67b1d6a16a7c89e2845af39e1a92c73aaaa39a917bcaeb3cd7b7804829a65eca1a885c08d381e4bbdc6b8792404e8bd273b2940c60613467e6e2756d4035681de14cd875ab004b4df747c4f6e0ae913717ec7054c37b253320e8991bb9a"""),
-                    TestUtils.hexDecode("""
-C9ED9B897C34D7119115A0758332FE70D4A9E11FFB2D6A800AAE33F85FAC59E715AAD93BD79DC8D958079F3B5C2422F8FD1A1AF9406E8DA3297226440E30183051FC9AA52AFB8BEEA2228E88D193F231F2422977DDABE4AF4F0437628C6AFBE68F70CF4F56153A2691F7A4241EDCA760D4B3AE0A17A8A0214BF1BA65221DE64647AC6578F4C7E4A14C401F7DCC30A10A695A7F72B04393F4E9C4163AB68667B1757154BFE711BB54255F4DAA9D8AE6622C71EC8ACE5BB79C6B4C8AAF1B0A0099EBBD07B292CD7B55E44ECD68DFFF4173743145B71F536E7D23E78C63679FA2F3C72CAADEFD5A9471280CDD3DD8DB83F8AFF14FBEFDC8C5969B050D263EA462C28CA64362F7F165C3EF427FE5E90A83310DCB07C9612E9A0B8EA1D0631D84B4A7F1C7485B0C91C3B7BBB0EC98D353376B692BAAF24C5389D50250F3BBA82173DCDB52382176EC5CB8BD531DEA049C5B815D788491608FFA2AE8BF486849810AD89BF0352ED595E4EDBC0B81467D72944AB83C3CB2F90FCD10810EB65BDA18C43F9A9A5D98E714BE992B7DA02E9F7C389F1A22810DC0A473F8891C43932E0F6B5D3A21C3B611AF6C394AFC576C07572DC4A1E56B4576FE615E516F48544D099683EAA886CD41DA848567F70C2103C467D271919CC5935605C0EF05909635D431571E5A316E299E553EAAFE9C7CBF5063E2057D297F60B5DE1C17AF6B97192E840474CB7266A76D509A10FC7A71721D705A9DAAC5BAD8A52290C1D8DC7938663B24700F992FAB008CCB3801258245A0F5F329A4FE5553F4130DFB1D673338889B357FBF11681099FE9BFF18AEEBB31DAD290C1401D49CBBE38277AAC8A99C8BE4E6EDD8A0F3C901082A789A1037768AB7C3C704BF1C6E890D20B3DB6918C477350F4F25756BE1742DCB31705EA9DC975DE0C38C21D29B340C63438268F6CC399BD644EDCED36A7B50E8D65A507BEC51A31BD136525F4E7AFC1EF9E0E6325D032682EB4AFB7FB22F1716EC6F4C9852054429B5C5FAF3BC86213F6D800281913D5722F3A380307B59E1CC290EE66FB9699FFC627770B52619256C7B76D993FB4024D2DF0602F102A6A1257A200DE1F39DB54614FEC2B60F3728F59482D71C7E5BEC36F0D90D6FB0B4FA252E7FEC4F0FB9EF539257EFE87715ABEC75B2A5FCCBCFA5666F1C9BE2F0489E04E63ACBBB239EA8397FA2EC24C25C538BBBFEB74EB8E15FF93B0FEDB7F36FF67F7CB244CAA067EB2C005EDD2AC9E0765DD38E51E7C71AB72B056B230ECAA8985DCDB50439BA261A0DE57E68700C64655E1EB8608BCCC33480ECFFF1BB75D0AB69CEEA8F2E3E9515331A1EAAFB9BA32AF62798DF761267475DE343CFCF5A352C907A0314365B8CF6FD2E72F2142018C4BBCE4CF0A160266DE320EBBA359344A60D32CB135F5FF943173A3F9C7F4A68489E78621401425E5B8E6273309FA3313DCBF13D7C69B63C1EE34D3200BBB4CF57518A5E66D010984AAF34CA9B7DDC914A3AFB514FA1B9D3FCDF3324998D0D9058FEF10C30ED6B381C41DE363CB31C5107E7C00D4C0CCE485DBB4CD2092CD929E5717DB8CEE4790A48475E1DE9178E49B13C5173B6F301D5B7BFF1A9F8B3807A5FC84DCAFCCD8D585B77014EE285074E64448589A738F1323C7A865C3DD482499640A3F166F38E37C6F9ABA8263E4F3D1C2E7D7AFD16BB02B9B4BE8A055452071F278C32C3247DE2BF83A0633BABE7FA048BB18FDBA27022736615"""),
-                    TestUtils.hexDecode("""
-6d9ffac759de540cb67a1d3ed0e50afaee62c1bdeae34e94e8c88d8fa0a86e22b911655d83e0197987aa1151adbb629f7d130a143a3c0f34ea817898a86d76f54ec5fbcf4d0ddc93ce671516be812b1eaa2fe2da29d0381d9d5cb8e702c038b8b8e51d3ae18d0837fe459be7cf6e4967233344749fea70a74f143fde0a0a9582366710648c4f1b26152ca0b56bb6bbb6011264960f9639ed7239881337eaaefd07908359dbbea6dca1834f03a753dc02ebf67371af2ae1a82183f654fe20ce6212eea1aa256b8c1366b4d13ed800e116365e8f3277eb522f2793812329e730f56f6af17cfde3273045aae0ec8188cb956a0058dce1c4d481ffb1e114405fab0a5e9a70af8d438a2a266d9a93332e621231c4ca1d2aa02e417a327a6feda50ac402263e797fea04579ff60b9f026bf7a97fc3378790e3dbc9e7b6cc12d1c01813367647bdd5f8b867c9e1b2d05c870b5935e5f19772fcde0d8116a9ca9d84cd340ed26adc1033a8615ddcd29f86659f3e742e7c08cbf197e4c2f680547099b364fc67b8140a22eff4119906322ea1badd4af4bd008bc46d335569052cf26520938e417c8a8a12c72cf0a451ae2f209532e214bfaffe20414b4243d9351093215ec3ea78a5689e4f89397c7d309abc54d55d3dbee907ebcc6a8ef921ad61c67c2094081d901ba8631745ca131a302fa813c7137c1f3fd66207ae753d0eafb1211ca4e0d247182b3155e12a42e1cce1c415f74677928f7db645889ea70928679c7fdc7e36e43231ec831a6a6b6241bf54466bf530553c268cf5d63b22d755fe9d341b0ac7ab830a303d3f74acbba37de4c109a63a6457e9f79955232e368e9b4aaf27c6c5d3984e7acbb9d19d4cce1b8d53a04d7e137811f10ce33ea05a0b25f0f5ad1499e39542a264ea0830cc2b20646c170495e71a428d35ce3b726ccbfa1499ea716df3a01186e776586d431b90978be9536e5587555aba18ac6f7aa3bd44867d85b6fe9727496d6e0c8e8e776cfe346c5546bd262d30492cb480040c42aaed646969120db4dcf7c3adc8a4e469680e1d5d1092594436655355631bf037a3cd4b9dada49c259e0c6998d466d6f3df582bf86cecb7f4c874f392806cb1dd3b08d3759792875a08d589cd8f8dd8bcb533accfe23001773d6b9ac4dd6686b4ec3ef8cf4335f70d86bd155e5e473666c3ab5b27f069616c6d87f3969a55a80e59825840feb3c82816ca0e7c544eae787ced30e7e5d0b911273909ac11c5f0407848a96fe139887569491fc82b02e70134a1325956e65f02cd97254d4f469455f5ddadb32d99b851020ffdebfec3c83fe99ac4143bc4de6e2341948494dbff83f13603bac25fc5801cd694eefa4439afc61ed048a811b355b75ca4f7f7cbe88debd671657bde2840e95032129f2f40fcdfd160a13c7c123fbc811a7759e86f914288b417a6051393fb564a8a2473c3cd5216b31848cae14dd935b79647aeb287a262a59d37da18b085a86745b2090a83b6796203baded78332e5a76ae6d8920473d268230c00a442af276d11c5179e0b776719f02f4d380861ef73ef946dd03cedc6b7e19c812cf6367d6fb847f0f00b0ae2d5296122bf26553bff501afe0d217628dd44a8a39b509fd5a50c2b991d70eaed000d85343135c8e1f9a4bc703559e08da575ce134e07a33e3f3214d75f959c85e28329aa2242d8dc69b12ea2c95be537b8d1de119a7ce7d7a672c7172bb7f9a5df91ed8e10adb5ca072a493f4199f1135ac519484678681bbc88135a766490f99c2b3d4c6951d3e5da5e169b908a60ea803227fb870510c1963196712d0283102d6883b9164d9c30f9853a799696d488ad8834b6903602d14565faf6be82e911ea41d2cdefafa2506b28f1ee5a77eaa115b91e1ab44b7123ec70114d0c4a13846bb046bfcbfea6097220fa91d1e0605017f3849f9e2be6507fa4b7bd4239ed56961e70bef8daec13fb486d458c7186b99adcc45ddddb818e4947c0e6c5eeada18f564bc664f51efac7a8f12a259956ffb2165f450d728ed5a3c9b4cd6dfeb2f90a7711620374a66510fb3c2b3fc316e15e52a5f91d3e38b3313b7f9b5a80b6b181e4c4fc036ea2574d219f179bc1afa98fc918e33a52cfbc95e20c09b4140367c978532e6be246c8cd1d2c5508721eb298db406a92e77d833bfa7c5865c997b402cd8c09df2c5668cb38b03eb0e86da9707853b20f1ab23e11b6d38421ec2d6882a9121b847f55923601914a11650f02f99895f9920e1df904c6f45715a4c0d7218933149297191f72eab16eafb816d5dc1f59c30a249b8545e6947ad81d5b8f562f42c016ad46f19f5ba10fbfd2a1c22974669c376f496519525bc7ffdd937da7845efd848aa2431344c7314d6eeaed5610ed1ff144794091ffdae46c31fa9e7116aed7dc93c4765b9b72e021b825107e248b988d11aad8a9d466b4b109ffb874f26d6d7f1a12dfcaba5093d60179d1cfd2b435cdac23f6b64cfddd536c55354aaf6a76d738bfc12ccb003a14d19b54e6ddba35dedfd5e4f7f8a18dbdb4d7a8b34acfa4ec462b9a9ac8fa962ae9bfe353ba9ee19d576a320e0f9e22347a84fcf58c0ad61429f9a5f22809b72e91574052534e96832a99db4fe9e22e20dc2ea8f5cc4cb70c844ca9a0334f92ee2703b58b2b09e77c71e27851824c78bf3f4d177237b212f73d6681c6bcc29f12116bae1a25666035313ea2af3e4e98af8f6cac0236c392c39516b610234304b4e4d1d02d8d8e349dd00db7b8acbcaa4c79aa99f711ba693c7e93c9a71342453add96a124e3d06e46c503425a311bc5249034ce01fcda3c5809de83a87d4eeca01b26f92d9ea61616fb5383918e87522bb636110aec1d2b43afdb4258a51f06ce0af14a8687276d67033d922026dd190346844df0974280d56c22fc76fca0132615d1d61bed3facb80f8ccf45ab82121ac3cdd34c425f0efc86e1546f35cf470bacc1976e8c8561b086c52dc71d9fca01223707341c9af7ea6791bb08c2d46a578ba479fd36a2ce79558387afe1375090a53aeb2183294e747043eff104374f6f247591860028a49ee51c5327007d08bda15dfe2de5109683f0c10b620e455d265411a460c3474c3c2c9de9e72356bdbd7309b6e6dd2fd9260131b595630932f46c372a3da2563f31fe5dbe9faac52abd5c842eb8eaade71500f235fe806fd906ae53a2b65a906dda24b3839a0492b206687931dedcf96c57f05c28bd3e1e97731523ee0bfb74cd9367676f142f73d861b070843e772fa18a80dd641f430236a96b294c68ec871f957e4f04546a0610b727b4bc9d46433434e43e9d6c0421997701c5464fd62d7f73768f92645b251151bbc11a9a968b863a2a25de9b1bf547cc6857bb65c3fdc38268b9a89d8a4e49f1c62190812148e2c2617a92ee7003a3de676129e1f6b92b81081f1be2d9715bb83c31fd3136c80a0b23b902a9a3e5f9383b1206d2d8638fb0a5e5c0e2df646235b6a40b5f4f2bc4a13041f44850bb8cb1ef1d525f2ced545246b830547136c8fcfe69c86d4846391d1b8d78a63f50a09ca62ba8c1578eb7ba182ed67975889ad92458caeddd358dbeedaa34e160051b2346ba269003fccc4c3f58d511bc74949b152ae37ef64d0ab0560b8c474d3a1f78b04de729c9f0c4ad7ad2812f037195c85f3d3130559a336610541de8dbce1c91ff95b4d73ca6e4f4023378a5e4e49c8a907cf89b3b71ebc5729b783764a8b9f998e5a299c877cad7bcfd34252ca87de197343c01249c205ec4057912afd681c5062897c79b272c9977af12ae543570f2d8c4977684a2689c627ea4f97a8dd9600a17b6bc10a71a9cae8b18737e3d4e070402d8925d8c81d49854806528d5b03fb90a4a01c03cde8213522cc3372e49fb12adede707ac55eeef0c72a1ce7793925ea6416728a2afd328d2241091049beea09b93158c0835f9e28d0fe34ad0e6cc4cd82651b3c9524e50b6e6e509fba04dcd311b679dc7c82d96490b2f3f7c48604860afd25d38786d7adee7dda54acdef35bf58c2fa5bb0c226b535a9f6230c9428175ddc939fbe2f2191adf27a496644d1004c05c06e4a2e8b82a1910665062c10e6fbcb6d4e49df3e6d17b02cb891f89070288c94ce4faff7709cf88994af70a256059e6bc4df8e2769f9d2871aaecd023d11b44c7ccb0b0f40f4bca202dfb1db1890c89c4121c3a221ca70592742c1c624f9c54ffa3ddcfdd40864836184cfb075417f28a6d5dd5ba9eb4fa2a5fed82c86900dc96aca2342d29dd7208270bd4d6ebeba516fa6d8809eef26e6e929853df5b7b22a66628d9a728170da4a4eda26af530fa05778698e85f02d979a76706b2daa3d154db0872ea5c8b06ca7235305b1d5c1021b0334dc8df6b267760e652a0e1a1fcbd0039d6f585879c7b53a2dd3f664e36fca174322e93989f78ec66ecb613b0a694f13fe2715a930b2ac5cc4ee65a120c3c309b97b8e1ff856857cd88c0ba77aa5557f4184002fb96b35f367bb62502fd6fedea2df3ddb6f4015b018fc00ee6a79ab78c25aacfef26b1d5b1fbcd372b296f320c3cbd02128827678f54ff94c2c5a677193999eb2c1d7f7080b1d4667828e292f373b47696f7b91aaccd4e9ebfb020a58acf20a39586173da2d737583d10000000000000b1221262c31""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-c80f02072f243218956d3770dfa0eee288f8b5372ccff67c93318ebecefcfbdf18881d022533b778eb8b65b8881dc3c5a2fef36a869bd5cf304c457305af5cdda268b9cec761d38a2314eb1b8317184e325be289861c3518cea2a10dbb70a66f2c5f67c71d0ae6320e319afab670774d6f34ff4ac770a48ccfda9b1d8dfeddb5057025530050677416582278274505667301351576466870331032351083264716862836432486031506605800101361627684822632826581466212345526573758007433333477862751355246324087300847423142180181328073136142622170774306280323704618416477570515142514130455832022610134088876138124058114320611080670118018464085050380678730326046531300536216285206033762276762775135456675305781306813144351058438878403307687115162445758762435444306181475864556088114581615805216153138726620282135405184773253214002763042432742285182025418687637550727618630446721381621561150288271788350383608014736387120213568217622652045405551120320576502871101420474433680435304327652662515883127565314215370838830033816150283507766554275413064230572085558518426058845885530120407528323186266567602237370105201014564604774882172584373620026546053363771278173628600720520652860065382001123825403357873050136310704810102517285164840568604863133864655787425780060514544323632362181675425103051333048832104182222534843223257707062722432431888444556263685673774854726073818648517112141628084551561504640265646442511001786808432003757262538078314515135755137018852833864121201105007256358100857612560813851383702108482160852481266481713382031618845286043105732050857858607353564132122344423377458771167748115086680288573474886275656287884524782738240452330508132453212563243264052512022138236723506415274361568172077584546563246848741847227366113853277677187003120672803312751338731535378660130452317062527513307208683812056457672618347100420828582478354158351014326870707345131061078405044837370213315684511333215646478872283027464677328772837066376715434438300243146756128411654274728230883102040147160236612421547335046566446706883215132525265735424774111734410163874662657464330762111581252861488544800081145110813466088381404533445272646402333765551273564033557176722630105714613135526825771388525741752552048313468426860581660618780270076873311738236518776476873827573031770438878487513011411361583071301445561663156520265240035804757477167382832424463451480481240152163665000582805647367208703027114876055755766242113201847066246108435208437356368155043852753534553884800410550611352563613328277231178785005471510106804217363330510438775850050201541533244435247577721612262085330353712227748025886768140455853781817167865520612743051656428875760637056123627868651516386807077756848254735200340838355075611101746703364144574811707376411548585113884075077423148765742857850822700384480233506021262883121710116835788133723704346757345521270442111754166000801666758036038382282534825367627860280876821686044258467073362032026126470206571804580600827540023301101145187820771648116401787587233440067756345560263886241380357614771073381647234280567584172010660461051813086315325671588023055102007554535774637007241602270404175218044451787766283416771207805266403201725203a5a72c38850214325e10e875c90dee2ae6991fc05b67acf1130453620aa0f16b3eb56700a11ae3340ebb059808062a52757126da288c4d6b913956f99c53715f2b7520caa18f15695ef52294bdfd7ebfe3d668ee773d7b49e7fae905b8e16aec6e314362245f4978fa92e5fa66906f875b74ed5705e4374e90ef2d4dafc3348d49c17027403ff6e18d4576e61b21b540f9b89f5604db87721ffc19a6e58e4582cfe90fdc3c8f1a06467125fc6b133619c19a299c2208ac729a2471152f58ab9221fb1f8b8ee99bc5562295e136c1d7491fe4a3272012e7cf23db42474500a6c3fac8f9fc80f5464feb32a81bad914c1034fb278bc6223e09a3b3a5d891540ae563116f2ab2719368627d70100c7156e1131f8778d605ee6da8b78a7681f79e681081c94c2032655ecbc5c54d813d1d3e4c3875b90a5bf28424d0f3aa44ea16709455e9d8b024f5cd288507cc5c4207a85b1780a40421c996c1e385c96b8a168c27fb7dd18b80ddd5cb27e815cc3456cfd285e3a451483ba46f8031e66bb2f26e3b34dca9229fc737f60e3bec555f749be2ce66967f842f519df636727ae2b0ad8fd7054ab44b3e676bbdc087c5e744ed20ee4d70451a3f991a2e11df9309307848714f5c5173234481528041f5c4cc401a59812652e7536f944a124359e24fe0e915a605f8f8cb656e6e29a2c62a58df629548cc7429fc016953c5c6cdfff738359f156f504d514c501cfbcd63c012e6e4a98a96abd0265a8cae4c287e8d44e9198d53c16fcc50237e227787adaac3e53097aae470812d7885e8a9fdec4c683178fa31699e09b66765e643eb3aefb034c471cf83fa6f6b900d8e9b76a25941356886d8bef84444a788103478bb73ec2e0772698f8d05c859dd7e37eb065e3bd9bf54bf30a37bc784adb358dabb075060e9777c74898d576ffb8b352a576252d203a0fd11b24bd73919ce83271e5ca576cb1237f2df574c65cce4051f89ba91e22e9c1e1e3d981e45597488fb23548a0c6f555a148a6f5b520293a2dc1655b62719d4defb596b613be1a131b08e29d3cac60bbbed0fb11a6bbefb006e6aa7fddd6667323a09ecd9d6b39073092c1162682ab5ed6fe878007609d361abc09f61d156eaeb34c4c01d660458c0e31af7f43e6ee71ca77564bca40f39e2949008afd9028e6bad1cd2fe320971e2cadc9d79a2c860a41c658ea8aa2f8842938bcdf8887cca5df17750722c135f92da46d749c43eda79f966449948fb955a39d90a725298566d8d010c4706ba4137aee184bbfb74650ba401a7d08410d8d8634765868805032b2605714f866c169ee247efc2991c6dc62e5978b787352011e006bbabda578ea283f510906b6c641e999c263f53fac8c00213338f021bd1c07ffc4184050a3c07e926d99e10f53b6017d297c29bc5762ff0eb64fe011a2296810a52c3dc0e0d5a44a0f576bedcada7defbd51595cc7e9d223acef03ce265ebc8e47f326a672daef305df9d8137c93786f791452842837ff9db6c480770edd3c1aab4577527d669d3a656b742f89d153036de73628f6d27c7816b105646cc9ed77d602e5fe2cf1d203aaa9cf8585d576f4a73ebcc5185f541b8dd3c0a42c34899d2350132680f1e95a5caa76cb97ca22ac2d149294eb0cc8a53d597fa77a686cf5699620c393073fcb41636d52861920ab80b8fc5eb1716389991a6517481c107055ea08c341c9da52ec48d44e80900038d0fd105bdf79be232a2c2b3c7d66adb018977cbd762c0f2feffa3aeab21b2ed461326b22ff1dfab712903ffd798c819b493ee7651e179873bf28167d8afee704450e826d7cba86a119e044e52a80b0ce31f1fa95e67c7dcba3e78d0569073e38508e3c2327a429030ea59a4384c8c29561d410dc24630a80673a7068aa518b8274c68cf4355db661804b5b44abaa70390dabce2f16b51537956b7356f46194b5056feb47445756d32ea2b853a3879652dd5a77c4c93cdbf5dfb3c94254071e0e054b49e85149b12b8d0edacceab8f4d8d8351d2c2929d3930c1d684ebd797e9a2528b01b249daced8dd27669bfb184de5e3d007a194a310314dd50489ac49bcd5e0648311a9489ea505a3eb26fe6eefdb5859e479c8ff00b719e0ceefacd729dcb9b00be0c1a5688b192594f5b9da5cda8745b925a6d768ad753c3006e644a1b790ea8906f791f879e1b9c90a124ae504f80f0c17ad9d823a794bf0db57a8240e982d9f99cfd9195305729a279f39dd2b1821fe09d757e875d6e9f162612fe0dfa08be5ce075bbf6845623ed468792a8a15e72deb7f3b7f2b44b903b5170e98f3691f32faad1b65213cb4198dde740b87ce9ee43da004160d773747d7e2506d7c41f0b6ac80b1f0a3c9666d864db66c42b8b4c839a2f19b85e3978807a2b0d8522ed3c6d1afababddfc0a06c6d5897daf6a72f62a49243012daf2e6f08e4077312fee54b5ac8f7bb9932c06b8dca2ec95ad741861bd12cbb87f0ad8e2383b2c1aadf8f9786585ec65d61db5f66d5caa23d86778d5d186537b6e65667212709e7dce06b86d88ab40ce21ec3c75320b08c9f92e216d2e3480e7cc9442e73eb1664e081ca56080c3c4570eb5cd51b0a0d7872c95798ab6f027c2c32044d937d05dd72a0ee4ef973dcdc2623cbfaf0925f375cd22878b2f28ab048cbca8777a6eb52def28d90c5327b21924492ab7d1e24fe6a24b37404e8de633fe6185aeb2cdf1093420b847530601330d914990d764b33bcfb7d3fa90ee25197fa585992c9d0726e3ddb72bb6b03f7ba66a888fb522e33a6a8132a6d39b7b83e255e84be3c6bd55714d0d0146647d7484d5737ff6dcd5e9f128434919e0259f8766d814d69811a25a6d36ded06f7a6ae919401383a87fd451fe1d59ac85205efa636ceedb523d39c048f45c36aa6ba72eaf527bfdfcc4d8e99264455274335ebe5141ea71803e7e2fc66d041848847717d37a4f7656ce2de0c4a23acb5214b78009259eac4ef77980e80ad76442c6df57e7507008d51dcd2b49c28df2bbd66f8a6a9d99c946ed37561384f1b981eff93a64d8282c71fe39cacd5cd8b087ffa3e52eea33d88c06944a025edfce077795525d33c75656fd4f314a0f6089375d96ad2bd29a62df58a45af0a03c7b9d917ec56f3b3083da68aeb20e034e113ef67b07b58bd7e49705fa600fb36be0f345390deb3d82286d4d04329fa60ff76958214775764c7874cff5287e435442aefb809fccdfdb56adcf00c5f420e70ffaa04c0f768750424f16a7b25533ce438ca89e33ca9afaddb2136e6b1c68468aa9e7434adf614d0e9d07a729c2aadeee1cc07db336d3bc2083d0d87f0e6b13659184da03434e93028c93123aa1be5f0ea0d41a1fbc6ac2b7987a66693c46b9d4539b3020d5422897d4f2b5c33e802df1de3e65fe7840b793bf0ae4aee817152b00a9f3ebf6a2d7ce5df3e4ffd5d0e35e958f59fe742d052f8119b4cca8f0f7605b2f7f9fe15f95cca1f59b443005bc97824c3f64d835b6326669ef53c12"""),
-                    TestUtils.hexDecode("""
-258FBC2A94EE48B415DDADDF470F14FF8DFC069CD949BB88812CD27B2BC3D9522E00F302C0B72533C9A612A251BCD292A291F3652695D318927CE1B922125B287FFF9B1AA2B79180622C32AC624E0463E5F48E86EB5952CA1A95BA51388760FC5374F0561FB8873018DEBF785FEDAE4CCD1A41820EAE9D7056BBD329E7A95F21A4919A109BD27D26779C3588C9A886EDBEA1FB97A8048DED858B299DDFFECD4D678820E5DB6CEEC8B1EA879C9C22FB7F59B227B4F7C6AAC577767D899B2F11FE39D1ABC527DFA0E656F25E53CA05630215C5CCF0FC071F124E48C57C5344BB103D51A1FF24114426A324BB16D8F80D3CF2D0CE573F4E50DBD1CFD66C05430A1109374CD84156D2E31C0C3F4DE2F1E225B5CAC05D56C4478929E356F7F46032E2719E07BB1EC207B32D241C87D87ABF28C7CBCD38267CB011F26A9B49090008389417C7A219A9F18203E6D907D63AF4C42C60F7FD99C7F9394021640F450A9A072BF2C1CC3EEC88BEC866FF1FB5F032567AE053A408342A56E3068EA168B9E902068EF808916EA58004FF31C31DDC3FCFC2CCC92E0DA09623FB523AE46C8CBEF92A1CFCF4C0F523430E60449E5825A81DEAFB2E26B3131F0383B8FEB4B1B4E1499E89E9C5FA2ACAF1F37C422CA41ADBF907EB984DD65D8314E2F71E8AE616C0518DE9B8331FB00983490483362802FBA242E4CB71056E3256BD097504AD13F577B36A2F9FBC1EDDD25D9DBC09B3401D58FBCC9DDC8E74BBBC897552FC826620060D3777455BF76EDFC059E5C02BBCCC0F05F86ACE1903AF2BB08A962BFE9E2C435EE8C580502351669AB7DF3D9F6B4720A0509BAEA97FEED3B8C769AC5D0997A097852C72DD6D5FA0A7144E08D667F21936F434953EC3C88B5BA2EDAFC4F87BE8BFB5A592847D15D5E5D972710A4A75A5772DA4D9F156563C17B1F0F242457A198658524B0D6A46DBCD26EB9400DF3C4C942FF53E1102411101B2FCCB58E3FBD16E725147960AD56C6CB6DB336857EF137C49D53D16E98CD7A0E856E2D6B391A95954ECEFF3B9956A6D0C279DD9E1FA5895D37EEA8C54255A6244002C7542789453B41463B084E7FB3361923C43EE1BA115CB254F47E55E6EB79C74DAB4C9CCFF486B8CF5830F23BA23C5CFEAC2DDF7D71EB5F54141C100E0AA9873D43F0AC1034C54193BC63A560A0C661047C508062A70B3E575CC185462A75230D91A3021330D95F3C807688B032AC15A9623A833DB718D04603ECE983F1D21A4513E80CC67FD34EFF8E377B775142344645872844BA46F5AE6971E68FD8ED640BFDE9F276E26B208A8F3D74ACB739C7EA6CB26165EE182F165EFF21905DCE3D02E432B1193CA108B6ED066CE95D549D9B12445E05E0583EBEF32F17EB121D80EC26C1F154C4DA2ECAC841BE1CC7224576EA43ADEEBA53C4D58785F36B6BC0F8AB23340B92CB87DEB0230869A52DC634F68A83BC1AB8A4102264CCDCA39A51C331F6DBE30C18C00A966E5692CA86399264399DBD3F02FF8706302462D62E4D16B5C2FFEEB02A7E8447C2CF1A3FBA5046C792FAE0B1079621D59C1D7AAD17CD6578964D1ADCF1256F2A4EB4D534C51313BAC17A9383B5BD02EDCCDFE59998D2FCA7F3EF52CE0B1842368EA66E0A83FEB581A7137004655957E91B25F5435BEDC0ACCF69238AA4CACE418F08ED0D961E13B2234187597FCC012769F798D969C13F6BB4042897B0D8C32E6CFFC06680B1E0A40F5F149B5974B0E7F0D45367E93B415F7F6DCF86C2131137DCD0DE30A3F1FBCD5F8214AB20BEC9738AEAAAC200900F4B2074688C8F3026140A354A22F83BC2ABA66407F87671C3E7EA4EC6F8272B6D16F3C66C76ADA231677A9B1CF496B3C241D2D1ED7DB703119CEB162EB097A0AF2729D0D6CA8DA57D83E1BEFB880EBEFE090F6E98D64296F7CA90EA1C2B26131676232BB394BCD1A06BA83004BEDDA287073154D3BE16C242DD65839C2E1125B3E66DC93A95C62F5DD31CAF9895646D5E2D183D40EA09843F5DB189B41AA4CD1B40C5792C2BCF9F44823EDD4246100457299E30EB2C66896F89F4FA250AB19CA06EF5B899CB96FC5E0369B773691E3447E68475A7552C10F96F44B3282D92AE49A246508A67EAEB9F4586074D6FE8A44D2D27C7B8FB4EF6BF701084B73641E41AA7275C1D6B517FBE3D60F64BEB9119F3FBE96A11AD45610E63CBDBD79929003BD1F2DE89DCA036973974FE5C5D5A8B5BF82DE0368DC60D75A138CD91E8A9233BBD439666ED1211EC2FE7D7BABB1247315DC480CC64CD8F7859BB9BFE8C668F112FA96EA48BD91088EA44F40D3E57314D3759F867BA52E52BE822400D9B0C2123F50601EC5F8E8B562C4B1F49F9779A99C926FABD8A74173195CE23173F4CC4098EED74C8E0FA74320772EBD1847AFA1B397F5A6F05A00179DEF2E6C3B092D9182CA3C4E382C4092396005D8BEDF6248C81D3AA0854F0AD43C1079CFA1E0A42650EC9D7B9077BEED377BF5FB2F3D2717BED04CDF2F7E7D1F45CCC6F71A780D2E5C3516E5F6211815FD691E036E4FA002079448AF0E005B67D2939CA88CBC57567F634BD0402EAB06805ADF8BE550B3E27452B372CF8C92A7055714A228986FDCF4045421321555BA06173CA0A761BEE635C541FC984C5BD3857DE696E9B21EBCFB87ECA437E9A7B54F4CBE2A601824EBEDFD5446556B64E1A88B0BD9CBA507C5419CB8CC4CACE48A0C9668FD2D045E9057B13BF0785F59B35338501B73B44CB749EC2EBEA97C9D29EECCA6AE1FB719F9A67E8E175D50B2705B6149E9D5D257B34487B547FD050FE5C998412AD0B4159C2225EECB67903FFE332CC3B86266C22FF7776334543C1E954AF5A89C4FE59C1F1AAB5097024E2AA7BC09831C9A5ADB713591106CD3304873BCF11A9138FB08B7485E123DD8F7C107E336659DAFDB866487E197589DE47D2DE8298EC3560EDE21A633F820BE6352CDE9AD51515D309C4BB4709F171CAFEB407ED1A02BC4AAB53588C2CD4C273BD527F8B4078925FCFF8954536E0B4366E474801F5B938A4B81F037764D5CBAF19F237CE37D00246C60DA652B76469BECABD51F873DC75E520A75B52BF585D664B4CB9A09F8EF3C03FCBDE6B9E595C1371C2CFC24C16EBC392C75D2BA04212947944BC0377DB718A7FAE0F6F9008AC7DD30B94C1FCC6BAF750217C0119736E4F3B7E744AD72F1F0694BC88F71E4BE51ED8669F0E814E12FD9F833286E2064708951DAB852774D4620A26100FB44A8A92B86E17507C036CE6F3ABCFAB91193CA4BC4D4198DEAD7CEFB71B01FE2506995F2ED3A02EBB0355E6B67A2294648B8D1C1445164D99B966588CC253D1EA1361163024372E2550E9D29AEB4234F5F9B20AECEC01862CC98365F1C57FA4D5E0C1F8BF189E169669F825DB43172D1F682DFC7729B2AC0C103ECE4ACD982D86C515A208519D23F62934AF981DA66B97DE2389F2F669EB92CA4A5C4C844FCB19903371AEAEFB32E210F2D1155576566C7B529A98A1CDBA36B450F3948F34F90A49F50E7412E6EA68BC3BB0B0A0AFE3BDDEDB718D5A150EAEA784859953FF1DD1B371C539243547FCDFF4ADB06C61CB49EA5783AD06BC8C1F3E32A95AD3CA6D69EC1D226BF9DE0562888839E6243CD150EF6953C158F9FEE5EDBF173997D08509EAD1ED4DC2AAA33E18DCA6F59269CE457C412B58C4483BC96AF5069D1C2E3F2F8DCC5FE2825DA21AB2280984C359DAE44C2367D6F002D64AB47F9B64B5656622517A5F7D5E1A78D4182B6BAA82E0490659CBF2724080A9ED39BDFCFB21BA362DC29C750C5034A04EA5A85799E01FF8B16ACD2EFB8328BEC686AFA20E591E7C7FC55BCA8BA1A3C388B785AB0F57208CEBBC5619AE3A0B799D1816B013BD67D440A7AECA7D0BA517846B68F70CB5D6ED46C36F663D6F242E8FD8C620C9383EE1BE9250D63467504B229378D2589B525348DFF852AF1676A18DE321DD46D7AAFD3DB1825F192FBD3F160E8CA400B201B1A61D0864257CA340F179F5F1967659AF4789846A4D086041441DCF4267681B83D4C8539086E276C21BDF677961015CE550E41C2C45D67A09AD8F56AC3ECF1058F366F2E35BAA9353A5CA40C7021DD09AC9FE0187C10EFAC7BBBF3B1A462C9C6C96699741AC16D3526BED3B30AE25B8E8A9ACD8CB2BB6C28AB89F0A3F0D0F40D10AFEFCCB067A37A2C93D3E8399A366B5FE4829870DA75B93249DBBE3C9AC9FAA70C4E414EBA720C323E6627759E7287472C3DB9CA9B1A5FF03E872374D6B893BA4887AB227E989D9D4D348B3965F7B96C5094F42D84432EB771BFE757105966C9A08D6C58DED7DC216B3D0ECAD2D0B025DF33CD3D813348B5E08AF95BBA08DB5BFE5D0A151C98A01ED27661CCF80F416A1AA260EBB56526AAA289F17FF5AE97CD0907D9143BCAC73F1F83A2A8DEEB3ED209EF0952D5E463D87145E0E4D8BFA1741E3FB737E14B5924F436D0183D98EF836DCA3F9623B50CC13EBB5F94EFBB76EF9BDF40CE6EAC9C49852D08E2A5A193D1DACFA04EAF3C545E0E25E37E94DF51FC1976BAD069CA530E19EED277141BE62239F47441B88F6555B0A998C1BAB53758A41CFD8CC4CDC54E1158DE15910408A6E79D33CC37F61917027E9D2F186466F704647B1CC1CEC06DC1AC37D1A668D44DD8B12621AC3CBD2039BF5A843A86FA492A847D6552E1570DBFE008F51652D65D03D8B613AD917B81CACDFD19DB7F4DC9A14E237CC6D7268FC5D3B228BD88ED36D8360488509C974E01433D78701CE07108C67D0489AE94076106B045DF7CC508466D35BCF156901E53AD2B5ADF8795751891A5839033A40EF3F5DFE0BBEBFB2C9D1C000691F902AE490D382EBC87FD40E76B30DAA963254674C7B6F304DA2C8BDBE8E1DCC87DE0486B4FE6B57A18D5A9E9E4BAE776D6147FF9C98372426EFD30C3B2479231E624A253A7B0BEE31E0FF739F862010AF03E227A12C3ED1F33EF1C0DC9D48A100FA24CE5C5D8B5F88F92BDB6A3A5328B0AFA983D57A1D3320A682B5CA94E75DCC69BDF2AED0C05887B791CE6F6F8885E4CC55C3FB050ABEFCD3AF2CA603172AC78B3AF2B047E506639498D0391A06DFD328B8E1BFAED8F76C6E4A93E733ED1097DAD8663F5BAEADBE1562D40C772D376786509323BF059FF17A5E6EF5A31BD668954766417E6633BBEC90B53ECA61BADD4037030A55A5EF4129D4958F6A8A5ECAA1AE7E220A87AE996AE8D9AE46B9C60FEDD98FF1E67807037970C92CFF9EA4B64F0BF8907198A6C038F9826CB968B1F301952E1F409DD6AA4EFFCAB157E792ED45830708ACD7A50BE8C08FCD12560344221104827BFA495604A57826A49F90B8B694B2BCACE4040627AA0989E3DB4FB7167F50E8A04982084FB3ECB0DDCCA5F24A7398620D19B37309A4DC0DF28909E16645F35A81EB3C5EF6BFD650571DAB03A7FC02FDCCA5FD09C9D2D3DCA888B8261433DE88D05DEE5D6165080A237D55ED718486AAAF1E2534CEC3A87048ADB40EB9F9DDACFB2C883EA6B20BE1EACBDD72432C7A6C97721FE1E0D9A5589C951F7D46F2C5F0FFA909FBE12E1CCF00161E741C4505681B0B018FFACD460528795CC3810BF7F94FF9B75884956798F21ABF36DEDDC1F95890894EFC15EAA6F19E9148C71EE9BF4CFD41EE3E5DF8A449FD95E5744793B9C223D26ACB44E691D7E5B68D49A19687F0237E7287841D3B0B4483E2A7C29CA81BDAFA5D96D9D2CB6FD9724B9903E8CDD03DA810EFBF94BC7179349E10566B5A314F81327F76C5A8346E222C408EA43FE29439132CDDE79D0D69C45C7217399205C2DA4D33DB521940C4EED74CA22645D5B6A549E8712D0B8CC50DC180067D13457ECE66D489F687DE218449D974620B3B5462FF3A7F00C439AEC73A53303AC51EB84BBEBD51AA48A5DFB8F93556BA540F5101CADB8BDB912D7BC87EC2AC67971AB99093C8616C4D1F3E7B06003E4FF22D99E6CAD7558EAF5C1410199EC97720E5C9278548E7EDE62BE9105A2B27A54D95673849CD5D60424ED97BB64798263F98A63DB58BD55965D3A4283797CD88C7CA67B1C4F90FC7237EA35AA24DB18A4420B827B3FF7FA5472C31499480EEF5A97BB967D1EC46E7B05A3D25212C75972D48A9269D67048132399E1BE0C02150A3D48717E4DEC2ED47458EB870A1EEE5381209B5D182DA2093AE46A4D99E3D4F12ADD71001BDB936FE8AA96797982F88EE67AA2E0F340E7AF498D5AE05C177F0BD2650A02ACD4CE23018F9E00DCEB9794C5C76418EFA65634E01ED5E9FF94FF86AA73641117BD554A9391874A75C7CD1E7759755B9D2A7F367621C0011F61B588D913C7AA0A0EEE3A2201426EDDCD56A020F54AB41CD899721D6E1F05F8774CD5FF6417CB68EE14C20D9234369C9CA59627B8796C37B4ECF1DE2F981ED0FBCD5737DF0B82637D599A61826909C978A2B68CEF01C5CF84B50BE77B49C1887544779BFEAE3F533286287E48F0ECC0D36C27F1209314726855E61E5EB5E9A5D7E3516E29DD369F94D72004742E246AD4699C64EE996BC7B2A079344ED32A528A9CAD6D5AC02970D0168A8B5BC713E28934F2880774418550AC2F534D06B61E627BCB8711AD9FC6F2A4D9301EBB74E1F3C73B05F28DCE5623BE1BFA871C14A947A947CFA806AAC43AE515D6CA65436BA6B66F62B0FDC8AA4A748DBB72D9AB087AA39561271A986229EC02BA3719CBB1798DD333248E4DDD0B6EEA4169D3B03C9F4DEF9616BDF97AE993F0FEDAD31834B6F78E23164B556A39AC1F209581F61AEADD8E504E81A808B1E97F79F987892A8F7FC35FED9B1A2E9D3E17BFC5AA64680DE98664FEA7B479567CBE307AF2A8516BE4CBF9EA030471428CF802FAFF85701AF96CA1D8F50F5A79AD63F20C5CBB954011BE4B1A7F627A8B5F5A0D022D27BA6FCB8D3587E8632A2FE5794C7E8FD09C9AFA3021B9F43BA82EF48A3B1F3E40F2FAE182DDF9558F7033773F5627906E159B794C4220219BF1A9878B175996A16F3CA1DDEDA56B16E63C504354E5E42FB90CE4D2C1AE7C93D8CE27480F3BCCC076CC253B574A7BFA6D3BFABEB3FA6A19F196C7E31A0D6E9477F828689FD951E0FB033DBEFED6C680F0FEDF2F43F48C0136C722601CC7C4B48B24121ECB6BF84D6B3DB240FBA1E014F7E3ABDFC1F9B98A16F4D39826BC1EAE44385FDFEBBD649BDDA129FC7EA3F50A5F481D3B7508EDEB04FDDB3006D6EE943930E3F0AB405D151F21E8AEE5BD87F225DA6E155158DE27290B2048D384BCC54F0EB905961AE4CE5E6E93543016F62445AFB5C39C3EA2F3367A0B8F0FBB83B37518C5DBE1CCA1DA9D0B54F34B15A1349A2F03563732DE14EA9BD238F481D9B262DF69D24A91534805ECF57A538D8F08B2FF11E96EE692DFEB106D3515A7C69386A781DB1D5434AC18713CCA12C92557D1E7DFBB15605AE3BA86267F3E6CBA42B6084478E460F092BA2649C8C94D66128FABA2D0EA7D9BCB20663B0DE6EED2623A061778DCB40373B8CA38B02B7A49F6940D6D11CEF549CE80212CE8D3A85CF2D774431343FA1FFDBC71C5334B1CEC4D4E0EB643E1AAD67D1A5B73FBB1BFE47EFD83CD17C798044A504FBBA5726429F41DDEA7B7265A76A48B0BAB4845704C771638977511092BF6C6DC9D574E6288C6A3B96BFD37FAB695F8DE20F28ECB27EDA70A07FB2ACDAD88DBDFB2DDF06E83ACFD3A136C5DF4811D34C242BF9206D579BA8DC6D20E8600B726C9F1B918EA573B9DB2F96444E17B6EDC15822B85D452CD99CBC847AA205EF79E574ED9625E33B6EDC793E5"""),
-                    TestUtils.hexDecode("""
-d645f682a1b7aa2650f431a828463cdb131c1c317bc2d9a92477f9ce4a7190d287bd352213726174bb967d2538e6f796698924d4808a15377e3d05877a560d2cfbc13150acab39cc6ec464ae5fe51ef788aad862bdce80a3c3669186598ea3f01dfdf9479caf10033fa89d5bf164b454b1c909edc6a85793b2f3662ca4dabc42bf621b2c5f55b357d2b7c97b21a1748d6e6d0cb3c2e1d891b057f0c3bf482f04add99ecb92d32a099443987c25b1a5e26930082e9719fe2ca845343c3c0208d35cada03bf51f8952ef49c18c916c03417e217342ebf7234cf9270522b3f6bf7dbf5f7aff8b245f1833b8cb314f86b1e407f4e0b49f2f2917bde67c9ddb7fe39a64ad96811980b530df51645a89c365602dc6a6b53b67e56c74951d72e0cc2a7ca5ca0c1b32c3c9700fff54c317b3bd1474cb3cb402a85ba80def7b994f84018b9241ca20cc5ebe6cb24b26b4ee21904b658954fd9716004a009b762c5eb5afccfa8f6153d1cba1358653a88c0b87dc6478578929baee5bf33065aea3dc0bf333453ed0fda613d9a35e00eaef91ea96d87b676b66963d2affec30cbd7dbeed1f36dc93527db0a082d494afded3ac6df843e385a53d8a7a0dddc2a38cab1a92a649072768608fead5c538d8767a75f46bb73f7971a41401b8fd50312aadc6fc5f2096007d6002013ef9fd66be15822ca3b001540652636a8dbe65b2b6324885504ce3233f6fab6bdb5d05a10d85ca8b9934a5fe39d7c3a095530554d058f2f99f9c2775a0822ceccea548a35fcae73ee931ca01ccaadb226f91f0104743c423b220b9c76654c9baa1a1e60310673fe86e8c71eba544763f94b80dd075b3fcfd82956da9ffd4d4a0364e26cf4c4d7f0d2ba435a4e7b51b01e9cf55251a5f8fb4e32ed1fdfb6dffac187bfeab67b7bc06fbd1d623c68823d45d708ab29117ec17fb2df9ff17378ca7a021b504e678e4b7371f2aa05588d710f292e547f719f7d2e66ba39d382807ccd3cfa8ef2d33516053e6ebdb2a8584982efb880180c45480939af7b3d72e71d046fc78088c16aada249506b079daeb16056bcf49d495e5f5bc9b64125f66c809e02282e26a8b8c9656d19b75eddb4310daef82ff90bb199142ce3ea68dd6ef33cf4d0f2e7981f2d6d78beb9aa10ff7421804231b02b39b3e9c4be9363c49fce0b5a460f49094389ef2c28bfc45c805a563dc2202bd9da12485eff443013dc8090be20ba1430eb71516fb36926db06d59f5313d43294d09a5c242edc04ca7f1f69b3f87861fdd572385ad400f66ff9bf127e866957b5b7ef7e16f0cf93cd10d77b87894fd8c0f184f0a359cadbfb5fe6d91a06bdb000720f202f077cd4bf5c8b149565c43b4a07cdc5a3dae7599d26f3931d101d086b9546be593ea0bb85a1807eebaaa798e57d88d4b042aa3e3f621206e22f66335792b606f419d1dc63367d73dc462ebb177d3d9d4532ab6c39341b447af8a982d24300226fb367987aa37ed10223083e4db66a5a344628310d46174e0c8b466fbc0809905d416e1b742f3749ffe7ea56ec6c28b085d71d4e315b4e49d6ec945d23ecf5dcf503c59b839446abaa0ee57179a6567ab4d02fd1025b671aa5a464e1892e9e2b96248107fbe5fc4b792d1b6f62ecc6195be7acd19d76eabee8e8deea2ca2661a382f06e4ef90179a4fbe255f4a617bf6c1c3c564e05d1eac7cf110759364e7d3045b2330a52bdbc8ab2307e876df8b0011bd2361471c6cfd7fec98dd4161bd7f7517fa6bdd2d678dd4dedf71dfef7eef7d28d03131aa2db37f163d16818aac1e4daa94c6fc8ac8d76f03f981d98166431fb42081dc565049be93013f71832aea1c20dba0112222bd1acbd7e7c112ebfaa6e264655950a6fd78da09d55838d2f79a87a311eee67f023af189511c7e215cf8bf5b8f47ec397ff8ed22f5825814c86712c289977998dc8c7ac8eb60cce95ba56efe213043e7065d8c6e6c1c6b7c4b87f807e6375fd93e8133b9ca61735d2399bc2f0cd4e6d28c21c4172f26808a70ec7d5502449e335abfd7ec5e45fd298cdfc8699b2607745c30c89803cc741b1c74fc6698fa95c1397b59ce6a08a19d3572fa395af1f913af021cce85d40f53d511b2d6ca6860ffac07dae4de99cec54b0608ccefa3395e327d67aac3f8940c03c737f0066da5435ff060320aa68868b2fe309669a014e0ce7eebcb3e9f3d27684c0d14be48ef4d8de1f0f541c2dc22160aa238f736de0f31996fd1e554ddfd33892e998180e4a47fbe34f6e9f2004d009e83fc55e7c921a73390f6fd44a7f32122968e174fed54ad1117344325897482707ce6cb45121266c870f3f560c4315f046e3798073ee0ca7ef718176458c761825f7288b6663bf48b6efcc50e35a5ad124772fb64967056ab6a39658973471ecadd3d666e6f0377fad3b7390dc9ea67545fa030d1085244082ac60d0ba4d6f0ab44167571324e40ad664fc95c25dec94bfd59b32332ca5efda8288965284c7f88fb8045af9169eb63e98405e2aa3e949d4ebe07f3450ce6caa14e2b399e26a347d88b2fa8a301032c39bbbd945ef5d213cd4b3418c25cdd175a3ab8ffa41679cf6359ea3c28905309af59f0f92cb1db581e21da648f096171953fbf62d53da61da8eee1d24053270ef6911539a7ee93c6ff45a0b465ca879498e131d37d1a05be88fad8cc28a3026c7853b9a48bb8f1680889ebb3978b738ac7c3c54a0bbf1ddd79819a70e9d083775095e1daff66f72df70cf17e746c70f3d291a343d4530b6c9dbdc861816ad799b1a63f807fcf791fb1ca2e3160543abbd10e4fab61c18c3c4f150519d9690f7d22c10bcfed5c211a6af6f438737402b425c5ae274ca98716bf64b127ec0c7a6cf3598e9bac44149b93310ef5de9fd8381a961d5b9c166b7a687072a1aa27a8ecb2d9a023d353bdd29870650e0626931654ad80a995d6c5ce63ed42ec35444ee57444ef7edf45afe7255739b7ea731dd4c48a1497b5e6c135f4ddf4cae02577920f795809c1d00a391f15e7e376271c0cc0a09ef69efd28f6a44b6d2a9577ab7fd2198f81b92cf4094c7186e72fc3a379ec9e31b7bc12873a0008f40c14a81180f4caa16aee8ed827341c08fa4c98d3be393d524abfdf5546999acc4bb74e6d72b7db9c443bf8bc300fbb0d19ab0a716001cc87dd27bf2605930cfa437c08b0392e8526a26dac97e1e692baefc515eba1b82fec70c5eb4fc950386be3a5eb3379537100649cd192d611dc90e5787dccc69a364afa632abb31de145279e9d736ac1f6185f332b75875006f01eab3a48ad573d4e9b6849cba181d1aaeea5120fac5da72d81e7a36fd0847fdfc5f7f8f589b98511bc086a107d1ccc4797308be5b590ccfdab138078ca19679a5bde6962909491e1df2b048924a235819a7a28e3e3e97105a1a400c0997376ed9ff34b48d6076fc8d9668e6498171b82d7dab2418146610d80c2c7be50f614c6d5adf8511ce282d2175ca5101bb18dac9207813b9be0510a2195cc2c746d2bb99d3049f29374664d74497e0372994583c788765f3ac918db9a4d4d1f2c2482f50d013e7e93e0a5228cc03f4db0cfd14aacd90ed05b7ff5cca2b00f577e0ba47e7a0eda068f1aebbe688f167e3af3bcde28b3bcf0e89c63389564fd60be1c8919ac245db3cab86fef9d0bd4e365c1edb0472f4ba23b22c1918a399e3e08933031b2d0ada07b4c89abeff516f06b67e2b5c6bfe4fb6671ea4a45c375b9310f07278f0594e4943f4e45098e3c68c2c7f8b4eaec3b3d49a21c077469c84407b2ecf958c7aa3ccba4833a0b8c6f6cd8475c4d239608b9d25bcd9324326b4251b89579f2e902724f26943ae92b95487b215d719236f69eafc46070695e8d4a93053e275b93cf87723bdd589c15f722c093ca50c1d54121bcbcdff8c4e306cd4f11fcc681d6af09cc0de076a252bc8583b5afba1405798756432a729b177906ace7f3b8340f3526e7688fd49206e6853b4c72979469a30c584786f2b8c75cadea9eed04cfe68dfefbdd2ed5e1e2b3397ffab7c5d84e645a4049e50bdb9cb2453092354e0112cf00fd214e22681e4111a7d4563b84828d6bf6450facbdeca5137699c551f2b0c7a0bd5ce147dc71dc2bca5b0abbeeb109e6e951115c9c8448d455bf723b8e18e31b480e5b17c8de45d3f73ed313b9bd6a8f5156cabf25eea4737d4dfc8ffe042c6cf665bb346d89477d1faf60ace914eff5db92d82ab2da4e08de466f532d1f7c639d71e6c3dca9bff0c5a4948540cbecf4aa65c4dcd7caae9cc3ac56c04511518c1ebdd02aa8285b05393ce9fc2d2a3d8fcfcf79d4f1811d9073346d67f4f9af28d15706d577f8592c653c315a396e03f3dbe81c339c220aabd4f654239b14dae453dbd213da8819df690f38ab52a1f67319dce8ba5cd33e9bd8f5e61c0e0107e97b7bdc384269d410cbb77e19f2d89e38305c6e7dffb952e331bccdf884956c9c67ddf2d56c048b31ecaadea55e8efbbc94ee0a19980cd30edfc85d6b3ebfbeaa51ab1bb01008554717bbc6b17ce9b8b255707f95b7302d63b0189aa4e9eaa966429c1c1b9d2aaee73460a2335455f8e9df22a2c3861cd354f5163b1f1fc212f709c040516172a63acc5e6ee051f5a8a9195a3c0e3000000000000000000000000080d1418222b""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-8ee898ba956b2d9173be3179771f705dfaea460258d89ebb97518aee95f7560af3a7aed5924ba5d41fc95d1e38a50f933d02fdd280aa39c5afe63c3d9d1794d60cd72286b030b4148763878971ed0b5148ed040f91506cc5443983ff03d71e76f9f9c56b1aa8cef53b23b78dfadf10a4c5a1644dd5b2a2e33818effc45eddc2e4335271321448822403470047324138804438087588843706214268172475025276564145746423461361702544370526584123688122766438025344681178752630841205185142880034051070654535540731775307511227772152582388516212136381805636674882762427882403274050386855208724802323635371166346386078303506483716037112661182682653125854143637634378471542132612773664523401452863833035254314658307485600331255344301038588760626073667657566824783054365633462288132682748533875185444862162254814415860001373078718255261684106327781124677850673185831163442273852312501053226141146222163634824506148584236864562146634065825411836882440250464233048824316504534284448710354356011222712187424043071220737224254741123321834651238540136100320462350627487576313802878824634827083482111278134020462438040464126408725167702172738314238282431041864706527654420367467388153108253278207884852246535046221737521426013710361237422631134378231064331038366647860156765065640638568152013685218854640261823187005008782410321125585430133008257133230477257543211558420767576103710054360341783614605248464771084540585787050215372485563434880427653241876310603860874544450548477278031034433603287642374200174807130835462067337683542725204412564185801303727563151045102036044470344241431513253750453344181068301323415742204353382058206486112246730432277510678825603044373307002101505886672800331788627547508848481601812208166603083203168784821438117303781442370283147018313617430171084244275611261755507351877717165262323632087124473071680850882748858017077344541605881657867251885383643636341482257133852421828175577536553188518014245127151435848786816878767508827008813446037762050021601433060112405756553576443238728042504312434387673134061740013051122052603863687228884263102734303648422212081046737102202224817233883384451275044472426612740355787867625181118451686770774617255260137575557073363187168671736888138141114578031460423674014223161125708738168365636487634115108663062235075448825402171750743877411053310363480603171263331785410245534061202488708057726864521028558241854255843757183423680846382543841745715138847777161848558266446618833657585682227476126378777007712556452110415211151557863105527250341262385616773256816580020285012073863107105853065263780724346221555084082217168843148616386286504840733176160868120580618151810200358586663211701312313183338517302461622880660528360255424478558281645501247851806440186653100125027022143448400050752276372082722240442876067275785022216006585466382364038365267686378250502150410212655602182568087652266441770205884064038705815040665563873705223720346716224782001233877143608776246446162061440454784430547646856536083466603722577250585160465535136334037007631745875388337766277366743877607052036743878504071126007836356552360764414077761063784001337335478033158818132673068800873836568074230378648445702875646304c0271d6e8c228b00eafc0d3759106302375985b74ae9848bbc6737ca0e0004e600a1208cca1189f40a7e02deb82f24343ce1dd15b6edf8bfb273ca6b01a29b9dcb7ccfcb3603564612bb0278ad176a72945dd9537ee8e61055db402662736e6d760b2f48194cd3c8f64b7157c0c598231e4994a50d837e29c7153a2ad127735672361e7cd7c50ed7e9466a3794c388dfa6ac647ae4fc7b4fe23e4ebecb77b54b382fd35c9d462acba17a5c143b52df0e5fc607cc4a5c5c504cbe12b8c226a0a954f69139cc1ba4a050c754773e38c5d43524ab7b76179d51ea7cbb54edf38fe67b71031273eb8c38cecab0ef49418716fbd2f2977fb1747e9818db3a8af81bcc4f93531f0e6f1a96666d32b2f5faa306648cb48c670e1597981643cc703056739317310728d16f6b0fa1ec0c27eb3897a76c85a8b33cf7fbc8dc5577c96de4c012563f84e9eb255ef38c2f3ee893a514f854ea1032f9d4ab2f9c12334f1fe48fbd71b6b115f33f6909f154596a3eb69ac7c91455c8097f5ebc088f1f7970f61e62bd19f825e54547c9ffacb0be763f8d85e4aebcc057c4a21d87b24a93969dca10d8ef3d8cbe138dbc8142fe9b25d3e14889d9ebab76b1c578757992eae0242b4fc7085041472ceb93e91ada06a75f7fd0d65cf21535ea945be4c96e6861da836b0a6bc8d524fa0f5559e28de32f5683d83e8359bc1dc63c579612c0b8fc621a7574b360a825e5cc74f24e03f171ef6d1f46e9fa47e2b2b97e377356eb0221a29a0c807c43988ed87433747039fb3757bf45db3c8767136d495e1422ddb72773b6839fa9bd028d9be2ea8af7f2dcdef13fed5f0fd44cc07f6096b03d6d4e7649b2f408b77f77156b7a52170a778e595713055dbac83b783c18765bb7dd90a6de2ff459f71f8171b5e33342a3aefbd500c222bd1224f1a3c3cd659f982303eb76c1a85a54c14c076ec49ff14021d84b51409729358d658e94becc1e3eb1c11bbfe79ef4837e9f0ee82bce0141f6ff8fe89567014c5cb2f077ca957e5d0c8cc77f2c2991f9bd50bfa07de7f5257845b5155e64948f60082027fa48a4e573a5879442420d39868dff08fd4fd4be01f0f4029c1d248bb5f0460cf9ddfbf16ae8f0bf845e472afb0c116f442f65c08f5abc517d3f001c2f6ea767d0ed5392bbb6d0a5183fb9b49410c7cde2fcb06a388b1df37ee982a8a07f0855b19ea4c2debc518b22d2347a1861a253d71cb980da4d9db62a982bba68b5d7b67fcab2d59a12b4a07fa5d720737d3729ac05a017ea2a6a14b1e0d708879561559da4f96721043fb9e525f84a4d5b746eeeb29c786b7fb0067c313ec6c3e1b15babd04503a437fc65f09be43f52deb92afd83c409c3c844d69354c9bc1fa3e4b57b9590efe6c64f185975a82a50f4abfcac043b2fcfec6992c1b0584306d0f6cf87654afe94559a06ee672c0d8650ed629311c63305a9b58679276faa5370a2ec225b693527452edd3a654eae692178995f0020a8f98d0438dfee350430b8a32639adbed99dbd89a32e3a1aac453735fc706369e477c7c176d446dd2a75e39e116643e3ed043d8c1a653a5a6804f5cc5b2de7f0fea5a9dc5b1593bdb481f0de3e4ab6881c81b5785e56a4a4c4651571a063df331bb7171919017a9594334e9befbb31b696a43a50a5768cb523deefc30c681296ca22c6a7d29fe07cc3ceb8693721af0f3d157348b22a7f42fdcb480aee1a878e476add1575e6196ae974075919e7ce786b8ce2b9122d88888452bf8d7d152643dbd3a2ed09d82324f0bfb16322d4cfb5ccbb0ad9a5d6b00a023a2a0a131c8dd26bc8c6ed0af34522c49cb7c171458cbaabfc30d3663bcb5091cd82f5a9564d835cff8362dccd71ed1ce4ff4486faf9f7c1d4f7f4a97f7f6e39cccbdf894828c9ceb0480e1dd8803ae0105deada46ff07bfd10f78e40ac8f6c024df3730f9125895012ce82f4141c1d57d25709c43eda091d15c0516bb88570f85f83ffeb0bc566d4babc7cb000afb3acea4151fa6872bafb8f161959a48bf1350c2de505174ed12b1c8ff13cba9fa06208269efe0b7dfec049990482fbd5e0befc66e6cbfd4a51247777b186fc071d16b6a097a026629d9ac25a8b19c4d792fa83676aeb4095ad170b0444699656838438f44e99e9573843775a513ad2d410c1b75e8387b0f43c85a7a47de8b178c997df7caf16bd0447e58add034c4d80acfc35d028de6cc5bb629b1246ebb814e162580325ea90f11c45163cb54405910bbe326019db6e01a46584672c8d890e1012244c75adbf85427ea5f3ca3885d7fe1bedff5181c4710b5291e9d40762c4ecb01ec87f4c56ccfbce91c8cf5a30cb07971a987379a61884221d5863b8ac975db6cbdeaaa9843a0536db58d10dc69fbdd40d50a87330e69b2f37f68b56eaeef9c954e2ab82ec848c9836877c2626a1e827ffb3e9306b2f5177580fb08796a8c84f45eeb9ec0e39e71323dd29f2cc3efed0e3b45347ad0aafac1a55f27b85a097ff3d472e3433a713fdbb7ade4c5be07db18549d6a8b13e679e5afa6697b7dc09b173582cc2cbd6070947638e5a6ac3fc55395f1cd9d3e721cad91c561c2c6f1702576c164764e5681c2b3b743a69fcfd6f0f83e21b695eb602f0f1c93ee7df80b4bbc1bf9ae1429733a052a232c3e3783a59b8eed4fdd2f3901ed0e0d160075c08c687478ff1156d239e0c21113c9281854d9afef67e2cbb6e41159124d217c57ab53cf667822e7dd01ba93af3e5948541d2e837172ae1623a07ee6155dbde9d2a576df6186de1c2aec399d22682603e7909610e463cccbcdad8addde5a3b37b7ebdb7bc7c2852bc6603568edae193fa204bdb5ff53177d1498b4a6d8eb5ef0a40528fe207567e070f8315fd4a03dc968e3f74edc11a3d2373821d38b074793c2b4bd3a39005d36a787ea2ef9d355fdb535d118af4897c4428d5e9150378e464ecea9a43a791070b64a455729d02565c6ab91771a483375158f24a0780ac7b42226367cca45d1b605d7e60467b50ae7a70d87b3b5020fd4e191e651878b509f5b5fef74fc0cf137ad6d93208a6794f17241fb462833d223a3dff1f179c69d7afcb9d19d803d4c7933456beef432fce5d642f72fef9b0e40211a660eabc4df8354968394a59fab78c44e36e65357e6a5963d828a2e801db6b266daa51de44ba2ac6bfac4a6bd0ae41c8704e290d7515adb26867c4530564bfdc76d98d4250539dffb46fbeaf7efbce573e177378745732dd9325ac98a747abcff929413f73e27502c433b589f879078ea826823d4d418660ea49457b21eff272778b240ca64a56e2349476dbeabb27c57bd51af02cda5b310a0eea25d2910c75784be6910418ae30f36bac9e78f80ea3fb68c681f3556d3f59b9516ecf88b4c16fdc9c5a8b8cf14e496741413903ebd4500b6812e4c3d2f7718d4d0a2e39a316b90f546a5b9aec24606fff6559cdf9ab48797a60ebdd5229a62dc872ec0d36f9f2afdab779b913b5a2dcab68943bebd5ad57a"""),
-                    TestUtils.hexDecode("""
-7C29C0B8E2A111F457E2384845E7698DE4BC9BAEF093F15EB03828664AD31C387B247A525623282460D60290FC479A928024CF62571A57F77B17DB0AC572CB59723490DF79E9B1B31EF2C9488B6D758C43EDD9162D8F6C0B03F43B08D646172A1F8DFD71D4DD805A3AFCF1C4265BEBB71FB251DC9DEAE670A664BDF943ECB00FB7EFA37624953F94CA760013FF1270C1EE7FF58756CE19C204220713724AD03B10F1D6961CDA361539A8AAB6ADEA92AD782F441428C0018D85C0505BAA793C752DADFE92BFE8F033931D47575C9F83547DB18DAEC0FEE90E83967E0D0DC93281000755303F0F5F05DE041211CF842404CD5E24DDFA3C7C83DE3EA21EEECE37A52E16DC80A350B3A18E88EB3C81C74D25B56CDB446F6198DC88F981F2B1ED8DC94194D81CAAD971A9A3933E9319047C5F31530C7C98793A0633875A14FA5635CD1B0441FE267E79C1E874BEA968CB63E20E7C48E7BAA9CE8393FF9A239B5A1D613DA65F7DE78BDB793AC72566FDCD06CDAAF56E18B773737A82298902F7B4890EDABB766E990ED87C94005A2E2450AC1D0192D72468F81DB414F88CBF07707A95F549B7A9EA0760821AD710D52787730EE8917272497E5891656176F991F254A5D582B5975F95AF740421A3C18A82158AF11DB15C154F17ABE1163F997C64A3BD989A573D12642B9AEE87C1612A39A8A4FAF25E35AFED3F2DBFC8FC8A2F9DFBC683CDFA3227107C50526149557CD773DDA16E36782A278A93CD7F4D8FB47DFC37DC3E389D164913316A885C3A800DAD0C57B1082BD4D804BB6A117C3B41E7D8AE9CC9622AE3CA8EAA9A0B502FE3F5A449BA8E768D2C98013F681C68A5F4AD3CBBB83F302457679BCD3F35C4D6176DD8D2B670E87EA291EDCCEEB9917F98CDDF5EE1689DBBC85BBAA30D191F1965EFF8FA9B0073D30B1E2456FAF880110BA9E75E4E29C6106874D32944F49DC7E7E7C56ECB9D287F2C2E87A779052F9B84FF97AAE007012A5EC497C4809F0193C69E5B29940510A354C866505424D4FF3853C94687636543115A73DC407C47927EDBCC4E0567EF4E451F0E464A1385D2A0D740C7327F6E92EC6091845356C2620EB163D9F774D7781BFBC6F6F652A4A2DEC73203DF5643E1B4C3C3DCDF0B4A0B160598EFB56499D2DB1F1E76612356AF3D708F9D61D968A6A0193D9146B2983972271A4C02E2136E6593DC47FDE4FAF2540A8F7744BC3230529AD1C9D2FF65B7671B5A5B16AABACDE8D45A940ABA4171E21090AC6AFF54CD8230F7BCAFFC42C028E6023E55DD02E4B7F976998AB5614A5681C615BF8E9E6959B038188F71C75F6DE44A6B0498F2A9254F3B0968AE7DBB49872D775CB0A5725206D648862734F202DF470770AAD184F822C56400F16F30F8BE40C463CA3EB5ECBB15D51CEBCCEAB43BFAD7DE7679894B90419B65912D67DCF2335212E82EFDB6267EEA331C1439BE2AF62E584C222C1052AD91C7F5DB6AA649F230248A14AA6A532401A28ADCF822089140FCD3B1CF2358DC26939850DB2721750F1537424F6BF2020A1B4684ED79402917D1028C1B59076867DA809D6C5D3F47277755384C20624388EF0AD68BBFB6A63005AD1B6E48ED654E8362B2AF7BF114F2D144A420712FC4EC71D408BE55EBCA8C2F185E7132196B1B76AA7BE44EB55DF7C82C768943D649631E4D87B408DCF8FE470164D9E8DD1F48CEE7F6BA93E239F889119A4DEA118D93F1474E516139036D640EC788AEE708637A619BD1693BAB6C9EE9EE0C495C0D0F8912C0F14199AA69B960F53E4FD8E2771DE4AAF72117A5B2388FEA0CA3BDCD594D1760905F26482459BDE80EEDE3FC89F592CA16B65B27E9A21F1789BD0327A26EE2224C61D80AE8FA6053480048D15019A80FCB5F3B3C6F64C168690E4384AC05E856BF341531045D2952F2CA8BAA0B8926CC41AF2D8BC5A1576292DD67114D521DD4AB535A77E5E9BEF8EA01DDC7C65446D11F90D6CADA94AA1AACFB1BC3551353D09252FE515A465C1879071F6FBB035DADA0BD25A022B026AAA5B5BD420237FF097099CA2402E68E4530F97A003E50CF693D1DFB551DC4695C760138E88B8D11F3075DBF8A6D9BCB9B1242648C0C9DABDD9D49CF132B0766302437C0CD81A0889585869DE92E6CB30C31265C84F58E9437CEBA891422967AA546EEF720A8FCC16EC7591AA0D47998275DF1AAA5ACAD1E1C5868CA430F4FEFA0277262C69311FEDBCC083114AAEC9F99FD98631137A117A9B48B32A6D88E76F96DC58D741395BFC102E147C456D3A78A0FA3D186485D65B4E6755B53D301BD13CC88E75277AF3CCF1EAC6E9C56FE1F10DE05A796A14381551705234F65DD6E717E9EC275E38690B73973C9CAB27DB909C5C13041723BB18EFECAD808667643E87620191008E4D10F471AD153D27F1FF00D8AC6A8C5E59197AECA5AB496D8D10BC79C49D16DC7948C6AF62703D36059587F6EE038820A84C0F287D79C713B066E1DA5B32BD89E5FEEC248B34AA5841E8666CBF09C47EFB17BC82170CCB557D41D40CC87F2E6C0246F0B272733854CE162538DF34559473BA5979AEBFC0D6A16EA7B399687E672145A1149E382954815B41E7E37CC415057D7536E65FA1A35B8EFAABC7B9B0000E08B593496B01E8F14FC950632C659C0A7F7D59787C7FE6E8FA7FA0211A945ABBA5044918CE8482C6EDB366368A9DDB2F2BB66C146BB50251CE61DDEDD8D6A4A60FEAF0F794B7B0DB91C52D7ED1A54AC85D7907BF3A5A96A60BDDD08F60148C0B3237DBD56628982375A67F025B0E3F9EE13DF254E1D6DDDBB057203CEB267200C7788D01342C064FDDE996183646FD3C1ABBA5D2155383CF391FF16C78660D0BBEB549483A4A4A971017A8659616FBB1C3A8A2E83230B610C0C74B8EB32667765F3C2F31F8C0D4BDA3D812DB64448684AEB482DFEC5C37EDE742091EF7EE6F22E31CBA2C9B9A6656888F446A1E9D52D9E6437D22594A830958CACC6F175D4CE8423178B71E7CC81BD6DC2A7F6580A8A3A1207C34D6A1646BC3D89953A63D22A30EB9FAC74103FA527843D3BDA656D1F22E729C3A004B923D08C9CB18CF406FAA89D0D63782C7264D5A8C8078EE6D259EE168A415E7BC83E4F17D9E674154DF08CCB21ADBF5B35AC28883F6943083AA97210C6DAE492C6CA4ACCBFADD99AED15110B10C9904469B4F06ED32546130B0EC4B281622A5EFC9C94B1F2280F251AFCAE857C4E17FF5CF472F038E02E5B7B3CF5CFD2F3969B9B8D5A27C8EC38DCA4284F0280C24F01DD97A618FDC5EB57C45D9E2A05B44E69FE2E47CB50F596030C70B62437F2B91A67FB84205D95CAE259AB1D5FF0454C5B4D87F439DCB7FC62B704ADC7A84502E1BD8E6F52109BF0F36824834D574E07B9375E693AD477A9D74E94BC4E883206DCF875AEF7FE84B9B7C1C9B1858E4BF6735235FAAE21FA566C866ED7C952B1BC19A911984EC25AEE310D8A342AE32F46255E0E00444CB0EE90C37152EDB6C741F5F394B5D47154825279465F0F8B19DDD85B8D9194A7AFAE5FE609A245AD68786C9AC044C008A1B3EFA3A8F4FA0FD49A65B6FF562F33DCB63754BE76244326FB6E416EE3267F93D7B2BDC4705EE7021D5D2EE66BA8D7B9DA7EE6C354E05470B31406DCFD2C32C94C22A72DE90E5A9DFBA99ECA95F73A014A3E9B15EFCBB67FDFA6D3CAFBE3ABBB28C4DEA6AA21F87693D68F0A60331786DE02BFA9E85A8D2AC8524EE184EE738BB3FEFEAD7E19030AE883707DF67ED12E8757B86E6E5FBA26715DBFAE2BE0F90453868931629FDE97712E08A280FF8888007AC27DF2C7113C30604C5DB17538F026F17C7F07D2A94AD5AB367F9CEA87BDBA712363D11FF5CF0590030BE9B342A7ADA48C08BC42F923DE939DE79616CD346B3511F41CE695B3F939C101F687DE7292CC96691EF3F3CB653F4A67D2EE09C791F993C726D574440EABFBB00E5E6328FA70D69FDD5F2EFFFD37C9902AA45EF4E9D06059B0D8E3686C74C94CF2F0032ECF740B31E3F297F15343A0093EE0B8D7F8EDA1118D329D05A1B992755181429D410771E37B56E28AE2ED8C4DDE8422FFE91ACE348E443640578687C57D79DFDF917F8E60E0A2F1C6223056C373F58C297F0FEE3060D31DCF6851856D1D05BB38B1FF426BADA10FD84B2E08AC149F91DDF4A5CB38B290DED4EA3B02EF7A3DF42BDC6B6205D281CE4A48A1C13FA8080B6B4100AA123097A4140415EC7CEC57790D6EB0B4200AD3DD9FB7FBD056A5E3E9D7B7EF47F44A63DC908B6DD8B020854618F7662391DFC35A88F4F5750D282F81DDC50D0132707174914293E3655BD2942C09F88627C0AFE4B921B766BEF41E246FD23482B5B14F117E8EE340C47C7C405BB3692C4C9E541148C2B38281EF0274835860E19C2D48953545247BD1F7A76CA43956C069A17CCFB4D0B0FD478556A209B5376BE9207AB174D2CEC96E09E1F8C0FA07D8920B2ABAC3490216DEBC67030E9285B3EF6767AB11E8CC935C4019B7E68FB9AF8864358E6927D350CC8B9A40662A0987C1C8877AA9903CC89A93E1979ACFA279FCCD2E171A467B76E1103C4EB166273ED7B4878908B67DB77C4FD4E49DB46109DA4BA78D69E03B48518F302647B8186F787F4CFCD87CC5A45B98F7558ECD0612378306C9D69FBE23B06005CD5AD84F73A563B1A3C7988CE0157D2D2703ECA8575D8BFF972CBED32A231395655DDB2188BFFB413624639D361B3388A9C9E13645C563A87C610F6FE79AD50765CFA8149E27F7083A316EBA050860A69BA56D002A78640D71794980C83573A5DE69A697C2CF2E17C90BAFAAD3D421C6E1D8A55B3FB4700B666AE3CC3EC114E9DB428F27CE427E4101ADB49B84CA7855458841DD1F4FE76D9074D940102FC47EA633744C2A664E22B5C5AA2721017F3FAAF4FB033FBB1D508EB98E1D643406ABD4D69C030A2349408C80993D9F75271F913D7417DA995443377E6F73A7DBA24E034A9C4820117D1F0BD69C93FF55CFFD2D36F8078209F5711FBD1587435517291498926E7354558945F721D00A73014C06B2C9BF04B7E695B9109D769BC2172CA7A70700A1D5AFF6F5FCBE699FAE81BC34B0495A82BED01B983444224B4B860360C07F8C3035FC4F0C4B7DD4D37ECAFD32E8C121C677ED263338359E25BC4173D191E869ACB4A5F6D20FD16FE50454CDD269DF8CBE5795482A2B40D52BCE5FDEBA62D9274C9C67127580795BC01752740E606D849AFCD6ABB8340613C61A764B6B92863779622E40EE7A8994034E7D303F07EFA11ACB70419A53897ADD558CFE157CAA3D47917CFE0287500B3D70FE42AFE36853188BC815CFCEC9F56030C83E85C60401912C14A75A082DE2E0400F6348EAABA59312C51A7E3B6A5B39D606306A304B4DD3472C5B89FC65DDA54650392A02CC6761336FD114D848BD889DA4BFE6D32931793A6515510CD802E3D9F2C6F8F2F9DD96ED039462C587395C7E6861FF48B7980D492C23E0635464C7D1969C12A43BF0FFA3089E6B367AA65D4678A571A0D47A75056B34E3F8819F8B6ECBDD6BE580D423D902D3C22D9D787E0F1B6202DFD392AE028292795FCA0177CBCB09AFF8B579A87A854432827CF797E494ADF9F96A56777AD6215F284EA91D35563F25355D12BD155C6C364B0C8423E1BBC809E736CE0BF03E0C0B728F04E6BC8F3F07A0D952AC9D9530C77547B687E193EE2D3565AC755DDFFE880AB0524624E17E019466B7D0E8FD6E94AC2BEBEFC617BCC5D529C83A90D36D57A93BAA0C2ADCF360377C9E9D58C456FE9F3D49CA37A8C3B5BC7C231842B57D320310943FFC0ED2F5F622988ACC7842F8410BEF0E0671673E7BA61AFCD2EA83CF066A169BBD97098F4B4F3C9FE73F5CD779F502C584849D1AAB52D7059D1D4432C27FC9284FBBEE43D07493A38B139152ACB71A171D454FCF936656ABDBDA03DEF3C7B27891088F940C200AD454308001FEB2DFA0FC38FA74F85A30DF4FFA64DB48E7D40C158F058B58174F18BA482AC445A6A63FB54CC6C7D4C8089794E8AB5B38C41C7FF4C6A8A5F294EDC3FFCE3C01F2C5C7FB569CA06567C8D3BD34F82046DB4EE7F7491D890DA1FDDC55B12D90A7853D8FB52E86AA1FBC669C7ED349A2CEEA9EF18F76C23E817AF58101BC5CCB0346A607D6C60BE5CCDE5DB9889E040223FE98B17D31D64E8C1456C01353887D75EE3B82D66CA0679B1C2366C44E52D73B09D48A39D1BA3FC87D73772DA601EF442208DB763F0BF888D28338709FCB008B83671442CD9F7ECAB2C1E26428391E559306904FDE5BA21E1757D94F84F18A5FD8A067C556834AB257B9D2E1290FE0ABD3BD622A2AD92BEB2C6BC61852D58384A20B7409E4F212F630BB280A46CF89DD702B2508752D6A4DA94BB769797B6E7FC318B0B3ED50D7F8C5D8579526D536E4D43F93C055479D53BF6159BCEAD8CE87504EDF7DB35E1D03EC7B4F13802AAE0207A2414802BECEA39664110A54C37415EBD7BFD5D73E871587967F24EA34B7D06CAD805EEDB95F1023B7BC3A74A59A6C9F3A4737FA1BB087012E0162CFF15A539E86AFEE30144F320FBAF088C6884489F84F16458755561C9CB0723CEB6ECB134083C3B82E93BBB57FCE8D51374D38746BECD09A059AD6623EDE82EBCACE009C0C27D5FFFCAF76C9E91BDF5EB895FA1E9C3C0AEC0BD73B1582C067A45CA5D15E2D45E7316CD4B176D9DC7241B05922A682DF919B2D2DE2F45942D3AE254FA55C5D90B8DA3C7DFE2DD8381AEDCC9558566E8DF302022FEFE51F23AF6A018AAEF3C93FD608B0903376E193CB1C13021808ACD538D3426F9B3399686B6FF4DFC0A4552DEFE49D042BA76136719D62884D8B93A349C22E0320B823740DDB3794AD53312DA5608DABACF69767D76327BEA7A644A304A132F2D2FA8E7C8F4AFAC30E389A995C0A2F912E98447CB400FEAE35B3BE089F46CD48EC8E38D4F2BB44F1734C67D5125D7266AEE3E9D1E91F800ACF8038D43B6E10750DADF6CF70DE75176A2E9C340BCD2F6D87F976AFBCDAF5E35DA9B268D3AE1F0F8172A342CAF9602593A5ACDE03DDB482E80B825A7E91E8B0EFC1C8D00309BD170D9F12BF5017780A54F440A58BE4A5257AB67190C62DAF9332F3594303B419D44A38C3A8032E38599B49872D241AA44905CC851DDD0750D04815ED88711353DC2264C0302DAAF2FFD34E9716FDF8A81F7CCB5757913B380A68F153F62E0BA8335F8525CC3A20145C2416581612B9C29C0B1B941946B2624731FA50420716162C64AACFBF94B43B10E59E0AF3836A05B9335B0C44370CDD2E45BA817631FAFA2E0ADC801772F6F71860CC2623E1A802B370823D02442108E5C142B68CCC9CDD0BC2EB9B861D763C715D516540F19E70FB474E120F06BC19A6629E8DAF67556AC60D17C252A44901839143BE5EC76B834FF11DE13762EB23843D3FCF1FF9CEB41CB02DAC74ED6219288575FA294157E532BD877D1B711AF3B98CB0B4BD7286F88C6C00B6AD9E40D66F38525156A4AF35F2FD42A5F25A201C66DA4AB5C4D1517BD6CC9FD9764AE2756379D73C8D81CD044174860FEE5DC42B4576008F13A3504674E0D224A9F1AA780C3003B7856692676A5E581418C65BA9F049CA20C3EFA566315DA220E837639A899ED54A07B5741097C47FB90A81A41700BB5C0D8C3317E27A0A6CFA77292BE9186396BCDE5C654C565754DAD120719E571A4A14207CFD205BB4A66C02CB68EB9E50DA7B1FFC324AD07D8A8A54729621776FC5DF15CA39F3DEB6B810A735CAE0E1A84C6842E80D1CF95FDF5A6FDCD613C54DA1CCAB4994EBB81C632D192CA9AFD7FA662A865C6F193B7029A9B6F21041E3D13D50E5A1DA47D3D3C4B101488D2308954C801DBAE5029E866E869167BE7DCE6476A64FB245247A84E46B5F0D9FA9F7BB10756FDEA659788C032AC654CBB83F23BEA1F285DE190BBB5EC4135E8FA1B134DB5D1FFDA08C06682C2DCC51E0D848F8CAEEAF51DED21830730F6BACC2A4BACF7BA62D14B009116EF2D157F64A7ECBC971D50349712DDB0871D007B2FBF83A832416CFABA2B9CECD37207EB9DB8A017AC266A5FC28DFE64B52D0CD7FD7498F718B32804CF98D2F17D22C2957782DD83F4FDEFC8A6AC5B6A562C939D2D0A0FA6078F7E6B4C95159BEF010C1DF8448158BA29E1FD1AA076972E64A9D534B1F27930BADA08EB87BDE6FB0A691D4379DF0001D84F2F833050E18869F2FA7C00A6481E4F87C75483310949653D6B91FEF1116F25E5EB0A10C8C8723E9C1C80F75C2875FB0C448B3E25E7B359304C08C310148683E1D8391C432A8413057A7AF45289B1363EB203779550FE1F074D3B4CDB77B90700E3710D6EB4BD1FCC209F2406CAA67B98E44AC91B876762D597D0F03A404394AE81BEF8F54A1A898B2F0F0CC3D3B6D84D759D1F1C5788BFDC7657794E384ECB2D5307CD92F3E135F35720A44743D93D111F38791B60E7A64F51ECD6801DE0ABC356409D00D7F785EEB88FF3FDC801C94CD7972EE402217DF018958A79DFEE835B2E7C591D2604B83E2C8B3CEED7BED4DC66B66EA13BDA4FBF5DC3158035A279F57ECBBCACEE3FF346386ABE41D0DBB32E15B02C49D3F216DB19474D295AE0A8DADD1DBA9AECFA9C92F0429352B558F69AFC7070DE8D47032956A9978AC2F388DBBD63AAD776BFAE969EB990E72B7D74A0D2002CD3CC664E77E52"""),
-                    TestUtils.hexDecode("""
-98b2f93395be5e131e0c5fb8a0792062513dd8be0e820804d26f937064f5c0bb3525d053e16da6567186dda337dff3c6f30c8cf96891ddbe0e15b349c03c6d53ea00c6ad4f6bebecf17b32a6b57c9ec32ab4397ec8062d9e8cec7e747a8d9fac7fdb897c43003780ad783874c2fcfec8a0d86ec519c07531a8f0008fd88395e44adff523568e526d190c65ba17b2bd7a383bb3f5df73cc2b646b40c49d2b87486a368d43e6d616e45ed0d9b3e772c7261faa5e5e68ceff3b6abf9ab7677949facd2690d6c88f8ffa3e05544603fed81516a829bd3d9bc55e53f85f31e98b01086c31995834d4fa0eb82ed75d3d510e4210ea4dd3cb8f2a8b446ea8283fb5cae01f7e733d3c60356bfb1411f8be5a6d0b6c20558f77e7c101e99419f94711a98b121fb7f953e0c19f91b3897baa245a62c7f3336fddd02358fc3d2672e9147dd3c7ea8cc3b1813ef8045fa37786c83f387731bc9e3e706468fc99a88917499d8603589e5d8b6d028d2dc2ffa4f03d6359bff057763ba7c106b4ff4dda55d9f1b71ded84896d844e44c9f3b1d174f368f220d7fb6dbe0d844f5b10c29d26ec169dbe54967e00f70fef69096bc8354a8bef7fe0be76e5f95758580c93ac8d9a349ceb388df4cc173f4bc2d1fe054ee7c649d238a656194bf77d5afac4a6115ec54278d17e93f73f9a4658a8f9f9820a31222f327613a2b66ab471132565f9dfe0388e622f784c7e09c0218603a17f83f246fb36a40f3b1d4e2a1bd2a49f388d3c4a7a06de761825b8ba7c580ac8c5ec6f44d371b43af52a62c31968155140e3903d0cbbd19397f80192e356e94523f7d4ecd4b2c55f7b88892fe94c0589a01807eaa594ff962ebad271a1f1998c517dcc3b98c5fc4d73b6efe16c4c45fbfbd18f5eb489ed9e1212bd07bce3e486c1264a595496401be6a914b2238d5f39f5b17a60886228e5e9b2d841cba626b26640edc619a444cfd036c54dc610a2102de9dfee18e18cf32a74245501cca7e49d987ef34f7a9adcdd3567e357244c012a7170b0d375be8a445e5b8752301d7ea633485974c30232fce5e6e9ea1be14f466d3a8241943872a1a881cd4ef436f1ead2ad9227143be6792406bd7c07d925091b51e5395cfbd30b8208eb6103a45fea3dcdd7ec9f478d303132705f3126942d19626d5009ed347db6e75e6a5f4f5651f72265f14a01fd48dbce38b2ebf162d25c4c3b0665a5bb30da9321f2cf070e16fe7b12f7ad39ea6b92755c4ff0d988ac561d310f6e492694ddd4c35c48c13d62848205ff97a58a12602c5575a1f755eb14e50f409b90924030ee3b58964f58dd8c600fb999bbd5daee8addbc185c52d7151bad1aef8d83a3a6d80137cea0f9b731249fcfa996b421b046b7cdebccd240b871a8dbd5bc072e69968f482538fb67b40d13f8bbd2341428d5a5d6bf50c19f89d54d239a0adea5bd89c12e548b69a19ccf9f9402316363aa7959fe3ab63f350f3fca1350b892ca634bda0b6656a44ef5995acee1f355fae403b7e05900cc4d6688bce46227c941400870a3e13bdf468646c828a39a072cbdb495c773fecddde1f37b1643802f565ecacfa1ccccc2a2829a68d9594af2cd44503ddfe823c8117f0cfde7c77397d7da69b37bb765e2e7dba9ab70e3b802a009f511bf762820a8c491c6c19ec72965508a82d199b34f17867be0669b4c792434e6e4e4c1efa395f1c4bd83a1414a51d71688544d57c2d5167a1929856076f7310c768a1919392171a57821109ac3e9b1bf7cef03088d98bd2dad5b0290072d7e5db27ae08e4bffe11d359dd5b58468e8d86d787c9adc8717986408b2d67c9e0e53cfebae82cb27f0919c62e89a68ac8903e80a7a11b7bd56ae232081af3146927271d3c2f2f7247a3def6de720917b014d6f03eb6ef9dceb771cabbc645f2cac7acc3f8d6dd40f6fd2bbe69ffcc5a083eb3a10993bbf6edb5872e001ef31e2a0e86ad58f6829c0f1f560fa7ef734de2e84857e3ef86cbbd0c1ef2fbcf282116297b5de572d10968edffa402de0ef9c4273f793598d94aef6e294d4ace8cccf70acd9f86ae774d15e9a1714ac761af94b446e4f0cde48748cc5db05ab4fd3bac0a1c43bb8f73a7ef7285866ff80fb41dc837a0f9d3ecf93ed0b79bcf6e94177d34084c597abd2fc46fdb4acd11d543f8c0b512efbf63ada213b2d955569da12b88b2d6605fc99c76ebef188881c7dd195e6ba6d5e55f1ca19202ac94c360d76d0359c3cb1f801414d97535313ab2ced2db1ecbbc3cb68e81988bff134138cc393b8ace18e20ee4e0f04c2206df124e4cc496c2acc185489cca0aa1f9848382a55d991fe5b1228f913ff81b7c564bc779ab311e9dcae58e7009eaa806896b1f7cb6718cbc8f8b6c4a65738a87e2338c6ffee4cdcc5ac060e0021a5836c45732cd668d2760de9597f719d26bdfd2403f795b8e7d52e657ae968d027b0da9e5e76d2fba34f1de7425b780bfe96c05f817dd8f0cfe176870201da00deb460d12a84f8bbc43c713793530062dc78e92dbde7a9f53e08259333253a42f5f7b1a7f35fb89e69efb700f7c6c465e80cf47efb8b396ae3455af4fa48b45a1fa87a110975cce3e92bc2394a456eab040c2fd333f70d8165e2b6431677fa28edc67dcae5f0aac65f879ca9c690648689c94d6f657065aaeed5dfae5658f4922439437c65a2ae5bb0853478178b890561a69a24bd0419e2a089ceb0196b232c45c7373938c51591ba527df1f21490883e62e99b0c4b914bc5e7be903824fc12da0654bb03d3c15261691db25a6f6fd53e3d4e9d8ece3d331f42d2c99e9f1fd9af4d68a361922b897ea6ab23d8c896208bcfa6f2c3b06ce3c88fb86994befac763586c2f0c37f55edba60286a764e4cccc5ff915739c510a5d45ead80d14465af87377ea019da46245597bb6af0918654596365f20c63c074c8a896e5b6efa0d2ba7318fb5a42c6eb52806ab9c6dd8f3b160900cd4d71be8262217b9877739e8344ec1a90511a23f38c5b5c2f23552743b953168de2bbb3a993691d0d87aa20cc70eda60839a20eb3ddcbd6abad31d3ea359938e76191507f298dcd7110e0ce6216bf9ffe2f361c8246a9299a1fed48aff683ec8475fabf36126ab166601981dab806616f38bb1bb93c335fbfa3b250e31560bc8d0dc53957da03da2f80cdf04764f2e9fa8e7d2f7a89724c74471d2bf713d4a4adfcb4cb178a492e64c1711761f9eb9d0e65e04b64f9b94f918f4ba6835f68aa523d147414531b925d3d9e7d315e1fdc533ee0c498e9f66bf813a25ff95873de22448924b36e6172a87d7adfffb9abc2bf2272c270b83cddece1cf189ff52e209dfb78b8a952142cb72c969c4ad7cff67b1ee5e5bb40caf0dd45cd37673908c430d0d776dc2519dc4984170ee7ca6365936369df16c4a094b86c1b3ed3d3cce82b2e56a5681c204e0acdd4a712b5cff260f4c27ea6c32e23c227dd8e1f8e99a67df32e7a24e0aed3dc9630b4b3331cfd625072c0024e96e79c4cf2ee92ea18a5e9182028d39b937029a4700d93deacdd4933cc31e93cb234214d334e1dfb5c323c964d90387ea4bccccd0e4386e4d770ea889aa480f0c8f828cd2185c18a49ce112c70d140e18d9aa6ca9ca2bfdc12003a63f67eb31f0699586ea8fb50d44fe9da2d01f0be10d6da99783821c07e892aa6fc6b190d9639d9249492c154b12e45e2009adcfa97b86650649599a9ebe07bbf8dc8d452071bc4f0e8203f81671e3bbe599c76589764c0c1923b141df67e260f7ff14752d7a84154dedad28c0bef90c9aaebf5d2b248e2e20a4ae9373e692bbbbd20c408f0ce99cd7435a4610fc51f051b1d17509a34d4804529a877828c0c263b19f84cc0b8d24b9910f6ad8006bb84e1a4c8eeba6e165efd50e5a444bc342bb8ebfea30385fc0c69f53d04286ca24c0a0a402668503bc94237daa53d1b41242a13050232772ac1b2c6ce9f6bcbb53ef6b94ff5d0c8294bd5a4b077c5ad5144b44a63ec630d84fa559ea329d0dc27dc7b8ba68a96777250244066cf1b8971261826d29f18bb34fc37a6a39e4870878eac95503dc5799dc8923a15a7c063f2e4f362294c1bde18d3289e67cc883f56ae5f56fe9ccc1e5101d67a552be55e06d54df6e97b49b33ca50ff15dfa8b7436e5ea540aea188dff17c3c657544d600fa5a3e7b783adc2065f05ddd72e65a69c7619a0bdd93c731afa3336d3e408e9bf09650b66026a6d691447db90e08800d2aa08fe312b5ed3ca2dee411bd17d7239f143259d697216e2f74d7980dc8ba3ef2ca2c95af10f36d9b28b1bb464155ffb6807e15facbad8b3ab23403bb9ae6546b183fbab7d4fe2fc507931fcfabbf868c6e21d23b0e02952db97e610b8857d84c777863f820978e29efc1d9c5ced05bb8e75b1246aaf401ff1d0d777ca6eb8d74c25821fd9a5dde41eb13d766c30345965553af361395076029184d32187e82dd7aeb73cc648893801441476a6b7a2914ab77063878d53a539f7774abd4fc9d19d5af3b143dddad76ba439466d646752b7ddadc708ac9a0751d9eb72559ab30043f41bd91fee7947106bc185f0406a7adcc2327517988aed2eb5bdde90e2779b5e3f6042757749da9c811162a93999f000000000000000000000000000000000000000000040c0f151c22""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-ab36c995c472d4212dacc8ea95f1ee25ec693ed8457bc6a62ed291a979b6a6e1c416d7e12a3146ac339866453960f2cc24f111573619dda31c999b213756e600bcb5a9d8375e25785b3c7069a72665195ee513f97cc8e28caa640266d2608fe2ff226de704047cf464619bbd363a3feb73e2d47df01f349cd7625d0b18db432b75565336477487553267568843606205253515824068244711850114744643273532787341658558327430044333402256081587535171344517634807008807633370820620716546413274855846856252544627040674022028836536373827541383208773875186683648348251757680728801003125128261155712544258157561003783166005674620687157083581564877088627841842774555801327868575542204308434338323004214761341056456765383014204440531581435680561577131503777667672352532047844617684265448124123648660177808165135746172300650565522412255582600451666165313587027165521854762330581587085455114053121351480023751688405763412618786711845681776135402575773758344478047280051103556627734803186240861770021185247176527722616358816145814811514060536870221854621103182625663607180318144650624216546754871047354164624168153471233044805141080414748807425068851107065574334428366872837263077015337257003145080344316436144048521253116726263513728883204823510034774420126602825342667117084583176238806802150804442282673267271486472381037062547008151325781823217223485168630253776236628044381354407638670266448373507274370405422728852575225681247624224047810183611221407283627210041154333112305767268423663105344701776876275776517745683745418040746282736048644080338088807621666361225348583347786063141187736408336260660304704562625306077687181373631777676838530485071857324430785113302862380543075448275258445010873417527535411864322146042506652578588203571265358102874051054007007776170787482703271464817538581744672845563458322856648331004411805884263244442853851516248334713570062784255773680035331352808764851703537003444265730315085260866221186817288644666201567677688523466252680113168206560036818856824456538181826060511868565280840760317143604778433077304400237144626857286674168627055580074352625485506271072107874512276371843427885818413042213077704005342270702186026772188022317550666001372885810325505652365822465535512370066430047748068806757050035812872642027575531211007684233425471123235162013764134784547815023440552134372432253283276337435244242126148441271544135651721106665301008825258874607420268833040324132761306885310670370146287074551022775376248768550262631878346375634603880661215657881831633748677608483166410002275602835021486452601600514087467338762747001627354482273888861763812343484084480461145702461577820200710217152348451601811752115404520872323133341274887524408314117823537425067462227764805412734655554112853716412560146010777511244114304537730212331208586841302127078636408840851673413682282356472403680742643508655605151500267084283273334113430051706200026602181421815041272467830421155788883212025787175681764014305848564807130860788478271203230488154661057461528415230351078146182662384624808617877187200274648170028523531546858533027676641325203473546874864283376606416207307326881524723857216011843510612852412265535601518443563181343067be4e4e886f61b24e817847be9d3ad4b033e1f03e2c698f42ffa611d25621991861248d97c61f318726b3eb116bd545400c2f5e1c08294e3bc8c4d4846c7fc5bf23759ba32c95bae32b756ab1ffdc337e7d23e26fe601589ac97b74ea1dab26669d7f5dbdfd017586ebfdc10dafa5c641ed6b8d4c4293d0f76fba4e19e83d843e00922c7b35d9cf4f657e832f2ea4878288288e479ea2988e62e27dbddf355d08f5298c763a23f65b0b9edf84eb7e2090056d1ec21a7f666fe933db5a8413748350bea0e5c49530b18529ae94663b12277cc2fbe2f6ef372a78abf5e3760f036e98562ca5c1ed862337cf8ff8e37c1178b4eba53e50f74650d084541357dba684ec0c63d8b7be0e38793ef4085d6e6a5167536cbf29d36429580c7e9b925de24d11a48cfd43b6b199fbaaea0846c890db3825cf8868f0ef75bed833494583113093347b2a3078686a39d0e0f27900771d252f4930f1d9b5a57cabb712f8c6342f01b61b8cdfcce1c61d02a64f70dd01fce50df23efa5145274ed73cb201247a99997bf7996ef04ac8063d1c9c68e714cfeafc8d0ef261bfea3f88f90c573a4ac7651d441f3ea832bb1b648b509e290a94b11a1341cf61d81bd94b3e2f6bdbc4c652b87d98ac250ba30c7e14850cc92b8d97c67d31fd6c6426c9b53f0de6cfc2d2ebada0d2b8524a1682b3ac360084f5e8ffbe980692d988e499aa3e2aa0a7ee16f7180c29994474a01406fdcc9551c3649854beba55ed18c1707e3ed886cf286abdd07462c25e6d54bb7a66a0d84181e93863fb96006c2900f6c88cd090fa606848da29dd5eb8b0becf44bf6f5e519ba99d68d68d3e158dbf604335d8328fc28a52b3a58f2d78432716f474cd7f6a1030db967e4752d55f8bac1280f7ca3aaea99fa77f8129a5dba6963cb419fcfad7b2f174a83210f86c24c824e7b3209e2d0f52ada2a7e4d5ea0a1b1ba9c7b177869f80ee8a279a3a6d76e7dee2e3550471db770fcad139f03db4b99336eff5c3fc01adea008b7c482b04fef014120ab90338ed94c5b333383c07f180d86114484d7e4616533cb4174aaf7b72ced331b8d57a500f5d73c2e32fef18ba2f0999b6a053878f50115dfdb51fd9c8ccb0aaa78542ade15909466212d6059da9e3105a81e351d44d2aa6a8dabdb7e00bcbd32cdb1fa6f362cac5ebafc3c672aec57a6bda2e1f316e83112271fa86a084942214d869e4dcec2b3f09eda04e488d388c9635cd2c780901eef2b9ddeec1a99d3270b37dee43e827ca0252abf972115637c8e6f67ee39736ec00f08c2709ba7d715a5f1fd5f29c470829a9587db239fe562a8210ef12bd2ef28f8d9385da3cfbb555a09d51113cc7d37d4ec2f73ba3d9c3a8ad9b3513839ccaf0be054574b9ba5e230d866ff5238e14bd43bfeed4d597b4e29ca9cdf3a93cba7c1657ffa5bdee1633bb24c81df0fac649ad231db891111762630df8a7b83545458ba0fe51003c17822d1811a033393db4bd4dcc8c34269a2098b144f3f1251fbde8bc12277817ac7e6dfcff9b1dd7350bf22f8b4f8a5e2f4c79095b9823c995a6a2aad82de004a0a0e5838d2e3361a1f69bc3bb6d425400d3470723d80eb9ad97f159499885cd93d0d317d8ae9c6e80781874ec8b023d9db11e1ade79e3e5f78d4ac2256820fa2fe82137d909800e43bf00a83ec73c050cb4fce1d3fc5a18f88f8611f9fe3de7b4ab1415bc18955c02e550b00dfc6c4b14177d7c9fdc5665154a2563450f892f131cb29de6fc755ffe71e7cbb90a199c46c01b5f20a9c0e177908d340433b0518442897a5f00bf6eb8dbc6d46aceda6fd94fd42f7736941f633f6406d4dab88f2eb276b332f3dd19b641a3abe3a2d095893114a1d1996052ac689b059476e19495df304535d4755f3c8b5367b9d9c6201d100622f4aa48c20722a2a1b48b2df2c7f34695264434755a9cf52326705a44e38fcf28bee00fe9a91c06dc6172926183ec2d6963cc8c330d0bbd74754c74db1d5df618858bcb2a6d31671aa72cd8534568eab19ea67edb2461866c12e409695f41314d6bb6609a77625c3799c1d708e38d387f69d738e88cebbda49cce3e76f9cbd727f65d847408ca65ecd8c2adcc349ab559969d82bc3276ab9ae90e827fccec87b549c677597a8e3bef7e9d93584c5295abd6c8b761a56123ec2c75c5d44d23c98bc0eca433e715e4f745cc8cb0acd056675365406aff32d637d04f3591858993ed26f72d5fd2f51ab35757a2b71491029f1e8d7516697902097b2e820a56b1f0d74bd59dba71927c3d05a741b9227a0dc0e80ab395e9d5dda03a4fa22fe8b9fa5222aa682fbd954def3245338f97f8afe2a02c4f049d7c0adbfb4a80a5bb45660757a41593aa1c70bf5c4d49bc70d0d00893da8cebeee56c83061f4ee4448d1e4d0469d397708898f8d435af0ff9b7aeeb81e42d82a21e1aa02de748715f30c5eeef03c95d758612daf29c5553ac143030e0c7c6d003cd7f83f582c34f28d9003611ce06dd96c4d0a29c6117b3d9269435888542adc989ac164868b2eaa7202ec17ed70d4d45f5d5f5582753b66ce243cc3f5039dcc5f309693d59520c2e02b6b0d67d11b3dedceeb13e6d901bc086372462c97d20aa7519f1c3ec1abf680d111ecb51a40302f5ff185226f4e46ce970d83c1271ef7d3b7ac7bdcf7474a169d76f02deca3d60d7a913e79c8c03c81c6050e974a6b2cec76e2d4673a83c606b69f17767b60da6a4a4d659dfc4e962b212cde0b7fe4f0505be5734da9095cfb6e9aaf0abcdb48bf7997f49fb38b5c9cc366f16eded384ccefc725c5cd36e0d4623500a5badddd0c31d9aff05a15ccaee106aa20b481d029f9e9d502094dae21e651740efe441890124dd9908dff0894ffbaa6dd8a56bf30cec6d0d433bb6540162f6f52b8c121294f7d662c3c36b6caa40970b09e1f06d7942c6872c92fe354704f3a38d5ec1036bbed80b11ca3558490c59858599c9a04c06a4cc0e943c12df6e673f5e704ebd4adfc7a2c2c7f3f63b79147edb224782e85d89b6c4bd119bfecc46ff40ddfa36afb45fb6681e1927938c20325ac0a6862d1ef291d63f7356d67c7bdcfd11629558f96d15dc8e65554bbee419a99f96b5dced87c43645caba673b2f66b37466841f64df734b4ff0d20110eedd3b6677757cbd020263ba85c4466a16bf299f263091598b2f3f6b9eb152c2b51e8adf36fc932d4804d3d4d1e398857d5a0b7e0acb7dcb6dfafe0041bd0a8552d649769bd6a3b0e3e6d4cb6afd0f7f2935e00fe09e518c19bfb5668d38417136f79a5665cdef97b109d1ea03df21cec5ee116cbd8b9d55c6962bb452f8f9fe618b267a8883776d237d1175b51140bff60e0eb1c0911250272612976661964e820312cf9d2304f97207ad71cc46bcf4cb4b396dbcc062eef8d891d88ba38984bfca2c6054ff31085f3525c16fb80dce23e4e13415225cde498f84884b5d768dc2cbc517c4a00139cae2ffb60a4906c3fd0a097816d5b9d84970669bb39762b"""),
-                    TestUtils.hexDecode("""
-F55B1A381D9258CAC6DD7B5A57899867FB659A56873F31F815716075DBDD56D6D0D1480AE1242A17485AD259BDA2533CBECE28A906271A3E65FB5D48AAA124993738FDAAC65736230FA07EA27D96F372B90A16FF778D0ECD7C0F62174839B8C7FC50F0B0150D47D5CE9F3715F5964DC712A681626821EA27E912B80D2D04C346B67439CB5E06193B6D7F2161B4F8E0341D8F1C0C7F6E3B351C4EB62E48B555EF00EC0DD5CA6A572FB201D1A4570676A04000C382F4C332C34A0436B535CB3C3F2378682A982034E01211CFB23285395204ECF985F478686817A5F6FF4B694082B3032990597A8C3A85B7FB5C2C49694103811F754DF0434D09C1A5245BBA980D6EFCFC9BC63DD42362477537C6712ABDC952BAE377AE7EAF9FF0CE2E9EEE82FBEFC1CE56063293BE659624CCA0E23DD7EF4412DDB587CF3C5302CE5AFB39BA8613151A04491901DC30706B46EBD1B26D4ACA67587595100AC51770080FC32ED0DC109D525088A2579D8873C6929554C30BDD1E2A0A9797B1676A8CEB719F64A336FDDC3F95BD4A68F472F00C4778745203E1A7736764CEB94F33109AF197C98D94BA3F07E857A5B251858ED850E7E578057E833A2CF95D7505C4973B709CEE834A40F32CF07AD1861CD46CC4DAD37DE66F8037DF1B14CD88E62F81B9DEC286BE4968ABCDCE54F83C5E9E4FFA8144A5877D75FDF75A38ECF60DC180E9B72F256BCEEE087F5AFA5C6D779117070ADB4A671839E8032E55AC52E806C82AC16FCE76A659D6CBABBEC066782C4C068AD4FCD5EC425885A5CBC5A4BAB43D1A60D499C497A2DC06B136A971BE8ECEF3FA6606252029FE5B33661883608702542F7EF44720466D91FA1CFEEB9D8CEBBE4E252CBC096D99551BB90A0534D723B02146FEA94D1C1926221092B97F1A143E6B4D5A8438239B2E2842633A6D90A18DD67D05B2CB560BA8A964E0A49BC1987FF47895D664F92E27F8C90059C5C38B02B42D7A179A09B70023BF7D664A94F7289B29FEF89356BB51959FBB82562F6827CA2A3892E934A9F271282C204BC3C6B34C57882EEB552DEDC0644B43FB28284FDFC82A1148447F2457E94EC0437CB5E0E3B6AB7F7E48F0F53C80D7695801DBC0E96F9C00A4A96AF8D60676DC4A6A6D97CEA344D7E911BE7CC9CEBBB23C562BCEC6992AB1148384278D94913DC4BAC4F73313BF83CFA2591420B18429D1F88D68443B960F61A1AB8E2713794225DF2D4EF88CAACABF6F095DA88C52C011AB3A07D7B71CF209BC84DEDD7FF2D8FF02A0727196D50CFF6520602D9FCBE57F890D19EB7845C6529EE5CD98AA2FDFCF37FD7472D1491FC5267F1D7E6E91EE891D880D5EC20FFC761344BAB59A327F829ECFBF8E550208976BDCFB75BCD996599B68CB29B27D9EF68BC975DAE08AA121F4D95805EB89F2E8B2BFDC61058740881E9B403C54745CF6D4AA1747EBBA56473D00FCFC62B5F5DBA4209E0E7473A0A311619437D2DF22F1D5BABAE064970850CD51D4A62A51E9B3D3121B766632B18F8B7CDEF40B249812A6274D4C69C9EEC096044026022B1FF055A05B6BF1C919230723A952589F540E77D7D24A413F542E7E0D3F7F55B8B335CF3693603210E979718E8CBDF76CCED68396DEB561EE27E9008D7BDB428BB293E1A1BF2675D8A4568D3339682854BCF9E8820A084C94D78E5D0938D66676ACAAF7B411B466B6588E9E2B4A387D84F23963E252EF36A948F25625DCCE664281D76BB6EC1B8E20DB3A7140B194872DB439D89F18E74E1861E3CF9FD442F1CACF4FBFD16532BECBD97CC9A007978D17922A68CE98369240A8D1E8AAE6679CA5DB79D83EAC1A571D0871D5AA28F6EA4A8EB60770E8CC43A78E6BEBBD4FC63CAE26F297F1E21BCE999A509BDCDD20AC938E38702215C398726ABA5A7AB3F26DA34DB3CBD58A7882FED91C33803FAE62E9E69FAFBD698962F2C7226A641AA7B6CED1DA8A400992333EF5DAAC77B55F94D51F74226AC03F7ED8F3D567BEB678D98694E9E0D483815D080A70FCE76255C82FE020DDF32D4BB7B1AE0EC1679B3DAEF2C20FCD7D8F74F6FC684FB678F02DE6B53D03FB656A9B9562666F49797EC658C0E8ED14480A0532DB85478FC2AD1E21F8883F2EF3FD97DFD757D883C1507C44F812639711256EF56BF6F8FC4A73EC3AEA3099F6C2BE6B2380FF3AB7007129D4829103AFE70851917E02EC5F2117DE110FD8F4EA25FED6FBC24BA063B7ECF7585519132884FC12DE1BBEF498B92D6E2062F1A4F7C97FEE96BA87ABFAE76C50729AA68C8F374102B3CFBD69139491836E4587D0085F92FFE2A94B6A87AFE29C84D289293D9CB4A733F90389C96198E2250F5BDC83F123FCC4E42844DF74FCB65986CBAB77B692CA210AC22B5B56E30BEE2BDE84663B22507E00E0D066D5B1F5245EDFAC6D860D0493C218A541A1FCA4B48F1A916921153933383284BA268C3AB003CD58FA979A08BC48A57C755688B0859AF7F21061F9F1B7DA44088ECA4D393E8DFCCA52823FAB812AF36212CD137741C14F0860CBC7ACCE1FDA39431C32AFABB84989CEC971D4A257BDD70EC71192148824C17AF8F18816CA94C457E1023E01012A245F28FF6582C9015153DD7662E4321B465B33B1D5DCA9B1CE2FF49EA3A811B5852AF5C42FCE7FF42BCECD31C798C3B8F685AB50B68654192357CEE577F5CF1F85A50F269C28A1F2ABEA382AF5CD089C146B9473C8965A945091ECD1C02BDF64F9C3FFD035D8238AF974E7111BA4AB10288F105659C9E2847544FEC0B29B6692FB53CEA0DD312B24C1ED3CAA1BCFD94E529F6C27BDDBB7C764DC0161FCE578361E02E0F5F3FDB095B6CD311190466177A5FBA62BD18595DC49C29E8EC7E1F2F3FFCDF17D477F4AF8CA3EAC53B7018A026BC942EED87704108027753DF67BD36221E9121B49CD40E8EA7FA2D6961604BE0095099A4413DC11E93B4A876834776D144269BBBF8A9875648702B589ED4CCBAFDD726DE8E8A58AA5D1A6E142A470EC342BC3E2E1B49C7203F283E99E81E38F1D8D2CD820AC98D8244A705BFD9B67E771A0366C7C6958DCB6921A81C0C9D5152DA37CAA8CE18D6B97404B399052051D7343B3739610329A37B8BAAD173018708400AE02B8DB2A2414CD7DAF038F94714031B1D83A5A15DBA53585B606A13814F04FC925C3454E251CEECEABECD8CFBD6FC04F504508C04E25724807004612E2796987D34D04318F82F7E1FBA83A4DEE3C86FD1884B17E77231629F5D5D11CFDE976E639C60B436DD9D302C380E3654E671ED81D44FC595FA34EDF90710A6384BB62DE0D89B50C14A44215DD1121C602A79A003955D860C88470EFD320E8AFEEB114E547E50CE967572DF5A5C4DED09222FF7821F91598A0A9C41A731D64429AE7D9BCE1B4E90120BBF94EED78098C9EE30C38628297C86DF59930E72CA561A61B6EAE517DB39F5A61FBB8C1838E3ADAAB46187F0B5D09962A39955343631B74BBD17BB2E338E5FC8C43BF8B2DF3A78BED744A481A1D789721928962AF2B9E2187E6B52A19274EF68F329C83F42A28B49C447FE284A25B71FC95D9322E752E28C7B4B656A743CF6C56CEEB758E742CFBC4B8D8DE5465D63D3D5D6EE993A4C47AA72BF82126ED6C7423D3475AE098CE6A7E6DD6F3EFD654BFD5DC4414B8F23F9E29CB0D5DDFAA689BABC7B5A925AB19817226DCD242EE46B588D7CB8E88183CD87C6D06FA1A40915A3F19E2368CDD97A16ACC2DF4CBBC0B30C6289D7004A8B48EFE4186BC4D844EA01BA78E4D1F0CDD2648D0363CA73A19032A537F68E0AC01CE6701426A03E071A109D42EE5BF358445907E1D05761B8F41AC8A9CBE2657754A8C4D83A3516EA465D5AD57367BC58DC712A5C055F68D1CEAA494D9A845474F610BAAAA4CFC96EB51D41493930534D58533E20575B980F4379A80393DBF797969405D6A514AC0A9171B79D6EBC5B66ADED19821BFB090BF76FBF50CA6AE07CAAAFF584A7013A71D54A2B60678F6F02DA726E7448A2379C28BCE7DF968154CCD22F1CDDBF25D91C616234539731B8DF4F55E21F37B29BC77DB4BA802D9BE419ADC292105EAE58CC81A636D479B550D33D057B7AAAF28F743F7B8C17E26AB2A846AE08E804E5D4BAC09D11C736DB32F9DC9CEAD0442AB7B6AAA70633692959A36D6DAFACAF2D7027E5BF9562A93A1B35AEE5313C1E2015E65AB805850DCA7A65FFCAF14200E1EF0DD8F8F05A11126EB02C13FDE38F496E5EBFB09E9E2B4920E619A67517FA4749ACD8B0857C7EC5A6E94630CE3EA0841C64D2EB895A9EB7CE5E757F2FB80BB4F0FA429E779BBE314A491B2D45F9A79655396E70CCEB319C3B405C33BDC91EC2169C3A75C4F5CD7AE5AFD6CAF6C9F81A9223484E7A12512B600794351693E1111401F74E1439C99D77E8932E069193DF7562C79EEA22C41DEA4EAF9E93456378CDDD6C8AA97D8D69C222614E203B6A1FA6377A7A0CAEFE709C90CB91939BCFE926B35970B13A06FFECD44DD8A360AEB5D0432A532E8A3C275E1DC4A07D6A3E100B04AEDEF14A52C09AA90438D65C8E6141490BD1ABCAFDD5925ACB040A91A8E11D242521C1F00EDC14D62E1C6FCE721921DF42164B4B34203660DEF02677A6B8C564075865B030936F472CEFFB3446714AE18BA14A6E45247C9AE1F2836E2341B61940A63FCCFAAD809C84906FA0CB1863625E59B96CC2161A4715606DB12FE3E79C90B64CB9D3A93B451E1C746F6B820B4FB3B3521ADE56DF9D50136635F29EA908FFDB32C6582715B06487B391A36A6A7B96505FD8ECE767C38CA4D0F9599FDCC1BE27C9C60D9190139C4F02461A5C42310CBFD5CF506720C9A13067F83AA1FF66CDCDFDF59B673B6C1FB0301DB118F3F49D1BAB49069A9FBC2D653D390DAFC3CC5CB35F0E50EF4CA808DC69F0134E3EEE697597FE7E5C2A2CDC5ED4E81F344879A0536BE0076D7A351A199530C77C0AF25D5C7D5629641FC8A3567BCB1456C1AE1D216C1E408C3AD6CBC1629E14DD834819F94EE0D255AB1C61BC7C324445F67CB7BA0E5AC424EB9C3D5FABC47081752F98B0011AD389581B8C20333C2878367795E31F99FD2C082B04126A3A61273C94E894BA7ABD8C6FD743FB76CC4FFFBEA78A1CFBBD266DB4432ACEA74350AC06F2EC832BD71FB09481A045F7A17F22F9AB65CAE6782A2928147BCA3B521E001D4BACE5FF499B1462709525D64E72201D5620B5537DF7A3E8DBCCC6EB822129B7768469D18C891A60B948DE2C12F4E4DB574C6C8BC586A1B57E727853FBCDBB4EB148DB234D8759B2AC8ADA2FAD225B5420C2B93D7FEAF051B7B768E64BC6EB83688B5E7E59059E1079DC66C5D8696CE758B42AE75123CA0FB72438DB97D39F1340B2891A19A4084BAA1A5149FAA785F09300B9DADA3C45F19568226151382ADB16617D5E59FFE8029F0513A7156F67D9859A13C2BEA574BE10E319F1B69740CDB176A962810B8AA6C368805EFA56E4AF69E908A205DC41CFC3FE69E4A6BB7B1F541DFE0A0EC1B29E3C199EF07538BC8AD7B0BD31B6A4DBAF70B83443A9C6C06268F597A6D1BC50171ABF56D18BB277F83203BB671DE404FBC4DFC66EE8DD4D92FB1AB2ED20FE8E9327CB15CB90908F37171D10E759BB8D1BE2C895604F87E2307AF7720AF99F0552FB15229B0FE7B45A3005E6CB0DC88A6D15AC7C364189A84A6615A344FABF4D0DD82EAFD42892C86EFEE6E9F7C248462E4C6CCA369CED819AE94B3DC856A3412A0DB90353E6C6D9DFE31913C3249195A3EDF9F84BE94AC6EB82969AF272AB8802BA0E8967EC342834B8A38163C90431844DB073DEB60B388710FF880EFB8283648CDCD75615D35451D8AE4711C1D7DB1AA59675061004EF8164AF3B4095F0E2FFC5433BA41ED72AC2C683D3959C9D265C302E0FEE7258B7C870F62D40961AE5AC43D3BEF8241B38A574F75EC7CD608781EFC16B7B9D36C3844B6FBF477CAFBA155B91061"""),
-                    TestUtils.hexDecode("""
-5bd74b9ad4b08f18b54784c7c6952152a4f597cee14d967851ae2d781f249d926ebb4f4490487d1ab299a179928f69811f39a8a019bd808c500010aa684ac9954aaa005c9319d75d6049ecd99ad4a3dd535d881e8eaea118635cc5dea0ff3d4a7d8bd9d2bd00b78777f6528b94cf8de6ecba3829e8fdbaaafec7a16106457f0204192d88bcc76271fa31718e6ab4be525b04e547f9774fa47a8e4a88a4fd9b058412f92b27a2e191d32f015ee31cad4321c62ca55e572cbb7c2872615e5a2924d7945f1ef161e407f415b4f963d4cf6272d954923da0db3b04649906ef6e2da18592227b2b301a36298861e793b88e7fd1de2957d8a92c727b492cde702ef2b123e9968774604b71323cc4e7e58114c3ec7b59c94d9a17453795f426f706d98235c99ac4b4288d894e480efa3dfd19b14872fcfea1836ca639fc7242a55a0d01e1e21301f39dcc9aa94d2d83bfdefc26cad8614406c70bb96c149ea652f66f8d26ee0455c6cdc8e648fb20886334d512fd940fef6d0d52a14fd9c33e0be6077a10b4729a8f6200ff5a5669b3b533d366b81cb6fab41dbb9dde1581e4f3bddbbbd5f18cc00123c82e9f82412b5fc8970b69bf2e68fd5fdd17b7288949e1a7a6eab8986ba2e7e2f98b5bf2a561ddbd935802fb59a20262a77137c99274f4597d070c0c7ab5eb82aa445fcc882b1dd0a825a1f0a2c8181bb6c608a53704b9d587e555d756333bea70a5e73ccc5ec20260c8ba150a44232aba5ed55f49281b0e697527a59e4cb579d27183921dd55492cfc2abe640e1aff9147927ca2a1d1ac594c52502536d1942fea6b3e52793e2a410fd6ca7dbea45a5a696695100f53b9fe1f28bbc0014ea9fa3b134f2cf0c0a2b0a74525468bccc4677e3959d62f2cff8119e5895211316b448451fee29720a74d0e09bfec52913b0a26d1a60e404b2c2ccd036d73a2cd4dfef3d9a10549287d70bcb561a3d466c8933668f69d2e3f1a90951ae4def67d49fd09dc61342a15d1d576ab41b7f145d73a99faabd04b9afbf8491a28c5483674e9f95f3e4146ea0d9b1ca61359c604b0c821a9cce85e53b5e666cf1786100fa4c4f14dfc178b63581bf502b7909c68e4587892188934c0472412667e552bd32184a306148019d56236fe38b03799c2a8c748c0b969d9d6de27a0b842be7580ec8e186c76eadfdfe4222628448abca620a246214d2629b2be13cfa9e9fa3c26c24b03da758d5870c4f79f68c3be2bf16f97a7459795e1e30d0706f33c4f865348785abc4e6feaaeff79b1b45527357d31ccf575785390c35b2a4c87cca14fe7bbbe6ba82d96cb9bd6f47d9ad73ea3b061e030bc03a670bec41615f86360a01a37a3ccc307e31aa6c32fd558d362142fd5668e948441275f265697e4700d87853b4d1b8f50c1c9eb96d05b96992daf7e9d3dc5b78a62867ebd7b901fc37ff34b67af0ece5fe7050c94a43ca96af0463ddeaebee931bfa9e14226b2c7bd40cc99cb7b3791bd57fbab3d4961fbcfa4d9fac748d73b2de0c7eff554699cee1a72b197d6ad5343aa72d7d0bcfe6c3b458d24e7e75d00a90628100d635f032f24834a3dd0ca0f5fa0d040b98ac6e0ad4a3c09445d91d929ffcd5424800bbf06a747c7a05eb87cebe5d64a383cd77a7cf3dcc80300927443692c50c7aa0d12e1482f071ac1d9acd625f6e8c59068f1a08eb163a11685c7699493cb28b1fcef193aa1151ae7519474629485b7e6fadf01f369f05a1c37d157be7560b38a59643ac997b18a16dfd211e23c1c02f936c773b8b3440115beac0fee20269302ba0ca35d0838799ab67bfcb300e89909e2fa63d83b035d855bee14c47d847ec7f7ed15bf16130ab8fb33eff281407f376b3fa4f6894e1681e6eb025be02de783b22680e6ba9c4646b88d91e18a48f751fbe168096bbbd16a2f4b2a13085158d55c5283a069362f83c9247b0c65639aa21405f343a19dc877843bb72e39e6cda5b7ea3f198cf59c9607e1c5f09bf8962bba657f609f4e9d3ca99cc58f6283689c9ca4d0c4f659831abd54e1f154b26d4b7a103d9ca6b6112cf5bdf0e70103c8147fa7f5223665f75bd153d9e5aa982ac475413083d9baf3cc20584c792ace31ca3c3ce87cc16fde69df770f717bf9b0f10a097595ae2bbab69dce06d1973b01ff9922d8199735d6e16dbf4e7b94493b1106fc938ed093eca657e173b107cf995a251e5b6b7c97daf07bbc2ff89f5f52121522d175ae97cec1e98183f646defd2b15cfa13107cca9ddd0cd9912a23b139f84a2265e35b7053cfb7be23b79f28fddc9e3190b0355d0922543ebff420493a9ee7bc1c18d36e2e76437404301180bd3695d7d059601e204f46da1c5224966fe6c099f0ebf6a2f8c61ccfecf12f9dd4f1a197138e013654280a7c5bd26ab1743e40d8971c8b6e4908113b84537a410faa756251faff8fc8bf0fe8d325dbe0c1a6f7e099535e08bfe584b232a36401d9340ce323eae8e8eb4fb3fb57687037b7b98c6ac8fd7d919b71beb9273f4234028ac2f034685c81e630d57a83162aec955bff545d8d0a9c24d4a023988890301ffd37af5824f59384f596a4c242fa8378ba2b09908c74c8144ef1a6a4ef0b9a6738f8ec52e114b9aea248a8d2d3733f71649222c8737764fb440c9f2972390d3d4ad7467cf238f48a0a299c891210a60deeea020e4b8a56d2b5fa61aec1b341044fabd4abda13c6e85fd70170d18295538bc8da2908c103a799448441c50250455f5481f7a4f6eef5792f97cabeaa99936557b0ca845bea86234c1de788cf2abc1f32a80b13573dc2b21b110fdddefead44d94f01ec772078b1175b0297b0b6de6d6097e8aa3e5278944fc9e7a884d3267632917bf56bb53dc074ea14a8dd6e6c1a73d9959a5d2ae385f5dba4b8447eb451dc441832a69c1c0a3ed41b0997878c966510dd500d61666827435b7dd7ccbd125f157a419ac5b614ba6d65438b6c99e4d8e5e6776809edafe8fa6a76e11f5f400975df6e6769f2c2c1ffe3d40482be08581d5e79088fbff8da514abbbca7b3ccfdfaa1915c373361a971ab7f5c1c09e9499592dccd610f14ed84db0a2be1c94e5bcda339e14ffb27af1ba66c7130f45942c687ce96ed553ad7776dd532ccbb0faf1aa41b7765023d56c9068d56c3c405b8b2890c4fa6bd79466a4a146657d9248d8a348bdcf41e3388993e8ff2be2fc8b8dae8d15269fdcc040f7e72872539205992444a4d19552ddc5e51b778c5b5786f2d7b79036b73e738d7200aafe96850887c44c982b0347c7646dbcbeb4b6b55971004ade87ff20adef58d3aadb40d320d43585e7e55da08344dcd9fd8345a2c612f656ae178c914b5662d088c3437a6e5928d3410cf65dbe2ad31f1fc3781d6a5006ca8136233814be8d655b94152ac70df8cfc6f9e9101f5b53cd5fd37176341e1eaf25f2fb477d1d212333ea200a5e9da88b19db4163a44cd4c9d3ee1af413fc6ccde64a9cedf21c8b8f113d62a63df2233f9a195aa67803d632ca873fa11069b5998c1200dbbdb9647a98acfb4e3229185b8c220a6079c72bd4645b04f32ffc85214bffd8ef2cf27d8459eea21069c13bfe052ef92a070e63d05c9a9a82699676ea5cad84e508d7e811073e17bf943516fd4512d53c7b3fccedcab36921945a19d0ec3d9303bd479a446ea1a5d5e4adc5a97b92db843b54de9498592c4859011bd4df412a6151bcaaa703fcd97e702d96b0ab14d7fb0ee225f8097c174b517ea051f8f8b8af47a75a93fab99ebfa84f8ba8dcc9c9927e24f6c99b66f34f86c2fdc88755154f06d9b1ff731411f35377e14d2375480b688108212f75d74695008a61fcd452b6dd23c4d910c409d9edb69d294a5bb46fbda29d6b31b24613e751b3aa8605046cdb449ba86f27d226e91757a242ec2e9d241aedcabca88269dbda5fe8e5d8bf4a4cf1bb1585f1166d36a388a47241245d0001e35a790d6d201a92f34ea315933c67aa26b4b22ffa7d87482c7a63b7544ab511644b9e95152998af887bdbbdeb6f2218f8936d5fa50686216e30db9686ff1e924c850cfa31ac950bba1cc1124a892fa1c40f62a99eb452a344f65a1410f500ab650f9e91244ce5e962caa13832df55c4b41f53509d13d1765063380b942a5d4e718b9fbdfdf31259b879614b2bcd5c7a637c0868abec9be94a132be2c62111e5f22f420630ca64031ee7f43df2f8709e9b200f0f459d9f0b4bfc370f6faebb0345da46aa11c975670cd94ade1781d56a3ccf2c0729a8238e9cfdb1ee2e575c524661d089f894a1502bde21465f430561a72b835a39a70c60d64f371affb8ea30849956b767a5ad7648be643e0071cf9f08e880f6926ae2fe97b8fd9ba02dfc965b3ef7c102eb207555f6037c634496fe8de5cc8ae0184b6df1201e8ebbabfabc4dee1df3a15a46414e5627c7b99982acf3fcc7806d0e8b9e9356f21f15366d6327a3fe4d332eb8ebd410407b1b57220ed702dba8783c1d7088e66ff9bea1af5794c964cc95c415b26598d39f448a428c575de927e7eb129539a267c3e9d2c7b844e80b1c396810f8b703c2f6f141339bbbd34938cc12ed634425b7d80829a9cb7c8d1f3050f1351587a898c92bda2e1e366b5cbec034750b2b8c4dc00000000000000000000000000000000000000080c16191d24""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-48862a8bc5235f5337a82329e949240dade33fc7d17ace18be0227ec719ac4f772476711c39ed4d858cef667f47b1f58122e3439253b354ffd3d915c4bdd94e14e1437d30cb3ca8309258b6817c6ccbffab6c0a3ee80a7f9fff6ec3cb6ac304fee454d34bf07d0dc401088d8e24c52088a2ed7532b1d1132cc318417a77d907823576447516518710576715261823080317441353842046341354050886265582772661606782518508611552437807857666558606283636012283372443712522471787143475036431221671374672177808348236368861183147027640303725752144220330577506201512281522412264744467558561844471460507113285137145681843753253233607103662808040646312553435805068686713021651551288186147173278000431232842530725086636536773248376333615710033580724287113217601158383102361765586225028003127168204582787754742332377107533753763435244134327846130710212236212502511434853724442254425760443666601728131748563348431443881772136248213437648571843333076605047807073574052864732182876230740017065188788771270704823801338454355646476150321745651674118477033827545476526811583337650082472640360778341752532318807731320471123877320418483134405327185031072657067505600530116026654376786484528715283751501655402235447554314302138750568000710650360358713328803146805241243333606411738065128618661601325618272020045460442876423666675125470876321815280508701035085287150558773181677875461325332283334727340248486766321227570432481736758471138718778336553655678374617640076187623705748317870051465306308631471164143125864382210850207037600801483176770823170512204183673005287714683025272251861111883335402830333124682817107801561558206108211583307868462172333836188447073517304086124212046766573468260178581350370628407538556485260427522413086381780024171423115611318634706688173315285184218216530827364657525801602715121163523751110241061654623125368751825650235250504687050676307022630474870177551460272562683173561881600018327858345460086545888832362730652277030632381537043054430486562858656784006651831205857461151350742124275134228231555266425448144823577652200562843884080828074164108067807813048034752063108461004688565567130111503260414200662701827228631380277228312536583180231613518706187317673565216727460305500638601142676751668444553816121742080426160705368816025138664265303251756273518518730862720233072246811417507756553878850845757381845611611422648644164086485286238466162363344057001121677343220818506083371862137010661622364338330831553574200538183745361417458005568372756687548621686745287630528168882410633428605048633053118632852608812837104176254134662751162608810027054020624335538722216288583065164064022144016266843214800315064071387443667213588713004105783804025667840388024407076618450445474568131706508618522810713016468684712241576080034862203542207230705607763336537074655487503315215184658500108525582024400658005247070468306680407777644277626555608647187201348840567607555587763581721687238845086303878721607273784881465433510511023765272770875070743787323471685410337833852203753384551444805788008435488871070137354718580371634437430075140476153835584426742701702300124680652654464582223832650777543526458673251282420373030035772844807176263355c300aa552835b4adb640a708d6c7fdcf8276730c8d30cb56df2cdf1fcee402cbcac2db33776f7f917458b10a470c1857d61131fb46e412a18569d4b8bf289e72bdbaf3eebbdb5fa6586c2b06ee55c39b2bc31db5dcf959366eabe602be533c08ae39d64ce46396bb1e4a8be9ca49afeb48a69e0084b4aa124ed85548ec4e1a992126bad1b391b49b3c711623e17544ec5afa38009bc99696dc6c1a749754adce3573aefa80f8a8586274159a2ac3119b4a8ac94d3766fe22f6eae181c619ec2fd487fe71505e6abbd6424f760b085d44ba33ff9d1a4f4f3de4cc1aba85b44ba77bb5545e9d652e264899e52d91a6fd02fbea09f7eceaf4837d74c8048c18bcfe4e1e0b9800d5c9ae5bd36ecf89ce860fcfcb0ee2f53feb79b1befc511e08fef900088763b959c7f497356c89a23436a98f70404c2d8dbe04c6fe0f82f781fd2e86c20464720363d4b84ecb44c5c282f665f28e0255fe98f260f711619c4663978dd9aa860b768056951ba1187a2c89436b89a161f14d693a230a5b6a65e10d8976f08b30bba4c59969a571216a470a04ef29a19b28b346093349e9a1e1836e1a9c911db91e73636592af1def9a5d6ec2a1b92683eaec682a4746cbbf8c6d5f72d724c41787cb5fe344fa20bdae6c890df2427d52f7bf6bac0234a763053727d24f580c68e890fd0157cc671f686a3d119996b3d3dc93ae2174c4c0883d2fa3edfaaa510b649db5b7d4a927f71d577f45dceca495f031898eada50604d9e7858ef6ebabb6f6249ec499194b5943488b010bda13ae262cd13f587c8ec42eba297e0f76ebf1be24f727071ddae5e32234742343fe63dd4cf59ab948a32beafb14335cb6d0eb60618ba5dac68c83639200408d90f5238ed455ead4851b71f21b7b9eac2d2e63b54ffd813c7366656100e3ab0f7f2491e3abbcaf07fafcb145e5ec677608a3a3c02cbc5e33d9bfc833ddb53d4da04fc3bd9b518b9c604a93d87a7535473f44c050bc73ebc62ba042c47d9c384b3de5e043181246f9bf792c385201173a5c759d18f138e3535e42f540f50c42664992425f57212bfb294d102a1a4094feabc90b27bab69ebb26ce4f49999cc217b7bec571b8c8b4aed446ea4ea105a68e48b9b73e4213c9f7355424fb40f78ee68901947fabe7e8c8be7ac7cf15eb7f6c93d424f2695b272641f83f028c8e13e0f9f2708d319554491fde76759b444681a6bc006a5bbf1bf9f115a37fd99e7686cdfa1312f9f22e915fe65501ba51df73e403e12baa7093088c27adb9da489ae95aec3ecabe59da3fc9036a801fdebf5ed75ab072e6ce1c4ba60bce26a3a4bbb204a22e1114883fc02471931b9aa472ba85731d3218255569f3f3938cacc9a0a9c86130bfc6c50a8574aba9dbc0f1423ff1c195dae72fbc1d2b43eb8bf59033ca66ea7de3968e1e21c3f1e8123a8e9696b2512693e5a2a29346ebff481192f268497b5133854f906114abb48efef96fc4d3d085236dcf5182287aaca94dd75e8ca0d1cc27fd25f7f7c238e8ef0c76d9bce030369e03af39b667a87044493c28a5e66ce15df046e920763e2c892b92216a563e82aaa93410c69cf06b32d76ae9c5c8be300c02fec3c7f4c578a7d74861e4d088670d71de16e56b0e2fd10c6449e877902dd324754e831472ff2559653f1a4a3d00cbef4c3c9d78d93fb121a69f3e1a0d569ef3a339c9f22e2fc10db1fe26e009016a7af39600f4524fadc422689de41fecae27ba755f39974acf21532f94b47cdab45b42ae49e89e80be15287d8f63e8b5cf075055209743c7e848cd1cdc0c24b913768ee317704601a258f31c46a8b20c1740e4f3b2b672b4c5771ae8218c8ec253a1644d1f36549aececb79fb169b31aa0c941da99c26dc4b6e3310ab69fed8358576332c82f3276118b23b609437242ae6b4f0897f9007a661167662b7bc381df4bf1bbc0f2df58f854ffb42d9735003a4fe0380e479e3f9ac63be1daee8adc35326206dd158e8c574f3292207fe4ae5d0500b7ef5a8d15686d2111a040a010691a623e4734d3ea7c2f813a897e81d1d26bb40a4b19e896294bb47602cb0cf1acdb97892ef3aac21b35c5c7cc111a437783550388aa97537a44e700eecb4d5a090c929a785ab5c1318e731c93378ef929e153c6f5ab343da506188480e502bbd2dbe9053df466d011e7c8a29a19eeb71e947286ed418618a6fcdfe157b4dcf86e96c665dc7714f68f0c61c88715f9826b85cefa4788aedf6489dfe53e26db0dcc35521ec218940935e9d02214962ba9c826a136e8043c2e4287eafb348f427ff5fc56f3b0370e5e2d0384f195398e88cbd3817479750b1aba1bd61199623623392d19e21a2edd0887766183567e087889e546971429180f0564a91e4259306a73baa9f12e142c4107c167293ae7bdbc13dc82b698d729bc9816b266edc814cb4f7e844b30e4fb6f5424202977a7220f11e8065c872e63a2545bb12d109f162c8dbb4ab9963fcced90b1735a4e2de740968a6f9b2ef93f9166a94809e9abd21d79437821766afa021909d075741f76c6412a7af8f05d03bb28a30064eb6935838bfc848046b214f43f17bcca2290a8e769f51979bb7c2c9ec7d5fd960a0222194e147164ba3e0552c4c225d31aa053b3c5d3927910769d40c26c300c8ae8b133266d2d9a4ff8a2141fc77863e3130e755c156a1c672475f4b091f956307525357a7f894950c8deb0fdb5c6700c2c6558ae00d29aaf17daee47be70be6a2206d39b04d49fd2b27e9e3b95ea995a2c721ea172d3ebf3ddde306942a030a5acb5b25b4ecf0f9f42d172a7863a12df9ab3015b5a7bd4b370662285a55690f05fdf3d66f7f924df032cbec839c0142917b4321cc8546a6ca0f32e983a102968c2fd2bfc150d1e7a2a61b8f6584beee3617e2a287f26293687596ca6378d7cbc19b45855eb8cdf16985c0eea06acf12a3080918748659fdee069f88310275f606f5232b5b41471aaa6e59cb2e534ddc4839cae92291dedc946a16ed408ab5cb607264b8e789d7e0cc8b693a148e0fd3c22811d8474247bb90c6f70f706cc58213d5d56b875903f7ad767ee3d0193421e69d88b6be7da34736fb36fd53b9566ebe0394b458a1780d1f20b0c155de48e58afa27fc211526d2f4ecf4f1f0165488cc3ecdf15c102c9eb7a22cdcf062c41664302deae6a3c48a6e1a1faa659dfabf0539c47c9245fcc4f8f356d325a36aaaa401486ee1a375725064423a5d9114c35b5e753cb8f6162bcf3fd071f26cef612017f5648fa0764faa4b805724e798b3285a6a93d8226de734cdc63602089f84fbf2f09bd8fc3c23d1e57573b0da75fcfbfd0101a7921d6d6eea998c6659444c0c5ad15460906b653adf7ee831206375dfa8611c4ea5a0c429253bc6cee49f69ceeb4ee700fad3e43cfe04177a4838ff2e4ffed9484a4c949a85268645f2494c01ce621e39c3ee9d168d76e3dc596fabe4a4067494b9ef6308b74cd7c578da7bae4bf8ccf566c2997b583a1266d8ca9"""),
-                    TestUtils.hexDecode("""
-DA2755DCE32D07B6D2C2DAD6BBF7CF5D4C26FF0C9B6FB9E064B51829A1ED51A712E26DF8047B487FF0755CBBA8FFB60DAC3C45E238608F48205A582BADF82C2E7E83D672057B9A9209386D2AB8D93BBDE0C522CD1BCF2AE95573749E0D51B85EA01494E3BD97D3CE0A61B26249E4BB94F9667D6556CC4313669409D94AA4F3BB9AB70F736D34245E2A789A5FE2917D5F4CBE43010C5215AF880118E1F5FD47A4C195F3C74307523C688AB76B7CCB157F75FFD79149B5508E7E527ABF718CE8E2E4162BF810F35E234F8CB65DE0930202C1896DDDE02BBBEC8D03BAA12AA1C91EE798FF7ECED608E3DDB7BD04A1DD9139F4A5613AABCF7AE495F9CE18D73BDA0C91583B72CCF6A722C319AD5B1051E65C1B91DD05AE5A77220BCC7576F9CBFC8A12CD55883AADCAD1AA109522F286B00B70C8E3D4C6EDDAE7E1752097C85233583BA0E1C05C5624FF65A3F3894158982B633EC92C24382AF48EB2DF5EAD30759E99D67B8BB1144939F4080DF0E1689AC0D4CDC73DF1CC2FB72B92D5A69019087294D5F2DB196CF82B7BBAF953F0568663596F78B5A309738BB294F7AA3FC5F3ED5BFD4768CCF3304C836B476458E14B233C156C8407636FDB3EBECF49B97C96C31F51353B79C378C6F47F1913E5B14A82DEB126D688133F9139C12C45BA24CC9C7E2C16A26329D463ECF59746F5A99C6B03896E851815EF36F499654E2764BB8BC60EBC821C4D0B4C363EEB7849332A9F1053A975B092AA3AAE33F06F760BA1D76DE07A1F48ADBEADFF1E17C34F9D69E409DC5AC83C296C402E042FDBFB0B6B4E023B15B318337B6A1CE69F1CD3D93FDD0FEB7AE259A41383939253C317DB949E3BEB9C8F7A79D083BFB46C50AC00D382C846B78FAAA7399ECB902CE8B73A1E89374B1DA65B0723C67B24899342DF13C07A0BFE3565CBEA5892F8979E404BA84847AF30BFC04D8EC77B1C5B9400CB97622E6D3360836639670BDDF4E9CF9FE3D6B98A5FDA42422DAD6C829B9E33F53686E2663D232162D3A78A7202EEFBFA4917BB8E89375279C96C9054C2570DC3D90DCCF0E418B69E6443C1B2540BAEBE022ED9A9620C030377C67FF4C186A59459DE7DB1ADFE2923C01D9B8D3AC940486052DB67EB67A257BE7AEE0D3C77BBFFD0FC7C94540F11DD96C5100463C27D65D3BB6B7D867590D573D1C1BEDCC0E8D122FE4FB82F1404CCD061DD7C3D15287F39CBCD2448DEFE1FB4ABA858DCE13F74414E1A8C41B730A1DFB45B859545811C2A9DA01C342A1F3C8B916F60B5E4802BE672C2BE31531DD9E7014E681A8AB1240B5E3D5C0D26E7040D4CE05F9017A32E1C760F466A8D7A68FAAD421B2E2D886BF0007858129DA2F6B92C4CACBC1786291D7C95A3F6A12483B750FAAF1DA03059F89C761641C0AAB21A05E78E1131B8F45C60BB5E8681086717B918BD4FBCFCA1BB5DDD740BE289D8DB1C24FE083B3DCF0E496B1941ECB7D51182F9CB9986CF3F04F0CA4E01C63EC879FD4A3D5619EA1085B1431FFC019286ACDF3B4AAB03D6265A7B18F24CC2815269681BD37263B44DCCA5CF6FAC2ABB1DE317118219A73095D1BDA10B66B6B55421F049B71E759DBE6154F1DB98A7E3FC877FA90217A242B21F39490F2116A2BE8067168F26439C8D1928255B5A50CE1ACCC222087536BC37806FFABA03B7E787B04C2C67C1B0BEAA871F39D3DAC2221AF44CC7089E520BADCFD840E5EE24AC53FCFF1E7D6AC26694CBC15B80E48B10C054E8DEB00AE387CEC9972A28448A6BE3A01D5EEA837703D2FCD1EB2521D444F900846F59074D715AEAA2F46E956365B7E67C5528841145C442E6FD7B3D7171BE05BF8BAA415260F645E2FBC93C46B9F94D2997929349B88C2FB1AC6743B73DE66B30B44E5DB3E07E0FE9713D9D7575EE4E40327A58DCEFBA0EE95E22D06FDFB720993EB134073A80A4F06F8303C7758DD37CD7236E5D80AAE2E9569834846E7F6C75051302486B2564A1D8D987D1A3648192A63EEF4C2D25AD41FAA02C9F227CC9F655A72CF7207ABBC66F9C822EEBDC89833757013776C11C310A22C226ECD33E5B0772AE2DE8B8E9A876650D4A57B863BCC6197261D7D06903D414AF0922312B7DE6D9E64F99509CAAB8D808DFC5F046BA2CE55817512535EDC2477D8462A1817E45D33B9D7390A11E30C3860CBE2C4B519812ABA3AF7050227759DF3B6FCD6D3EE5C60C1042DFCDD7880888A147AC47A282EC51D0DF664451E37D7C40672A27B965CDB805CECD3EEAE38A0AF4C2349FF39947659686D30B9ECBDADD80C9B06293FC4BD5E7A0E1E9E883D7A4EB05102CC1FE45F1C9BE23043BB458E6B8B6C1C187761004EEF59E398B1124B98B0EC0F7B29394418B38D8A3003ACB85D96CFA0C3C63B2ACFDC2BF5540D029A261243E06393253B2C3FE253A220DC7AE4BDE0AB4B386DECA15FA2A05465740B072FBB0C8E81663E320AE931A2DC7A627C805AD80819B9D12EC271D9D16736156195302C93490B4F85E8B4F5199CAF233974079A7AD590374C4E5589D0FC26F70FF2CE51FFB3E6742AD5BD9840F62F745C42D6085E46182FF73FD079BD2625338105FB39110B660F8C55D0830587671CC802AFF63FA7FCFB3BDF6D65B362CA0B68B31FB802E7870C3905B04B41440F549583EC87218DF6A0BE0E209807AF053CA121D704DC0C90A499D1742658BB096C776514C89F6B2D3FC7FBC4A38C10DDBD3C08F64AB076C9BA4C7BF24EBDCE9C82B1BCB8E55C4135976C878B95B6ED108C2031F4E53DBB19205A7109C50289C743818B90ACACFDEF20EE33F5C9A7142B5640F4D875122E0E5"""),
-                    TestUtils.hexDecode("""
-1fb3b6053f9518cc51b4a20cb33d02a7abcf1cad4ae7806efe9fbf8652e3755275a641f27879f163a1b265e886a1b21b129d48807bc4933df0cfee53f26305170c547145f3ff67fc6f317c5ffcd94f96fcc4453ac3fce38cbe41b6dc01c2146ea3d1e7a0bf001be3136362d75aa2785efafce667640dafb1b39d555a106b8cea129c5432867e0eaa493c43d21ab388aff1b6037621c1f134adab6093ee7e5760e9f33a0d8e8c63cd70c86438d3f94461a2d4bc9f41243e362bdfb4c809fb28157a6e5ab2f5c6e16a7336cdc4183ac4272920485fe34fe03057ae7b1440aaf99f28ba89ef1b0021cd863ba36e8deea60aa14cc7f2dab46dc401f12f5b61fb82a195781e337c195160fc474e52aecf4c6ff277908c481d51adac39219b29fa7ac703027354491b869e3ec404b4c35b214196822828079ec85ed0edefa0ed2a426ab9bf4c3784238390e8eec61cf7fa1c4a1ea1308e0815202f1109250fdcf69309ef634c4f0b134ad6d33ccb4a5e30c0472bd292c42de895de1c5989922bba6004283fd1376a0a263ebf74e414da5c058ed9788a862408de4de14b54d2adc7fb5e36f827f53b779e549698c8ae7fe4eccbca4b41b81e7239114720147851f0a72cd3183e33c6e82c557a5eecd4d07a824c6ea653168bdaac37a444fb63b29cbc35bdba265c5718421dc104206d224ef985992786180627df4b2f3ec5e6c200c2e0cbb6fad82db3f54d67f5fa7a9d1396c3b8376b3d83af731fbe8eed49bcd99e4fb693c87e259f20f61a6d67c8d87c967d65d03fe81e5d5f14021f8deb4d1a5d25902065e4ef707205a8159f02b4469be4c2094aa73580572a3568481f63e470bc86cfdf7b809c17801918f2a6f742892aaf696e2cbd2bc617f92efc482dc6bf8640a91582e988112cdb6161a41ab879e8c3c15e48bc2a7dd6b4fd25b5e7efd7388e6f3959bbafe518db3b73df504a6f6cbc6086ff160b3e7391845c9797a494000a23a9488008a595334b7b92db4b2f9a267869ee63b8d3b83bce7d57b9018bbc858943f0c7e8fe0c94cd0718672e4473692a2809423b2df248b2e61dea545b2f1db86b7246a345ec591083f4662b64664bc9200c3ae8ce7006cd795cc146aac8315129d62eb20e940aac6430165476742a19c17d906c3fd94a543b453a2f5d3c880ae6a1f64125efef20d7a0091e4bd66801fab9f7a396c84c4ed28526fc1b0042d4245d3f57731d56165e26e1ee72976cdc40b3574801255709cadd4361e7984527e6b9168a8f1b507b1a3f94d20b76bd4a0fd5ec81274207df86ef1b18c09e4f77d0670534a6ac9eaf076052d6d037ec469ab453404749c3c15cceef412a87301cd438c1e5c8d016a2c125a296c4deb4a12b4bf04d9593bd9d66814dff60549ec0a91acc5bb00a2f445c7989af4d3ba9d35868f7fd8a3687495f2580780f8a4c3e9f012f0cd07cfdd7e513c9a84bbf7dffdbe2934480ad3cb241a155248e9c30ba5f5d1574d73488beb96ae47913ef87530dbc9c941bcadc6a69b9acb06be7ceffd8cc7745a4fcf978c1fa126a22864e912e9c14fa73914ab1b9ff31988e6c859bf069bd1f912766680111d9996ce8565704046ceb64610f0c6162f74de87be26889ba868eaa8e3fd8c1c4eac20deba9467f4fe5427c06192a5ef0e84d2a063532131a366ba13b48a3735b7ac98d5d800f6ec7cb5b8bd604f7d3c72dc56e126ae14cb101afc3f5832fed4e94e5e7614e1232e970597997cfb3b9e6c5bba771552c38c9d6729ba0ffc2bd146754a3605c64718e9744e4f7c1ea184c477de17208f7baa9ba1913598889ac44b1d30f5b81aaa06a42c8f31c889737a8d15e6d473e0eb16fcb57a56f2fa9169a56a4d5b687b50e77bff964522f14530608fcb7f405cb5faf36ff235869b99b08765fbc6e21c91833a5c5e6e85aaac997fee4e800dab3c8fd5b35e1cd639931690f656f05b325ed80bccff2013c683b0419b5f43c3c14c245e40f537b55d20165a92e7b6bf8af9c81cb4b205f327b946c39a0ff087915b015c77930f221bb6c2c8d6500a521ea549f2d7fdb4108aed7a5aa6217450e238f1727535b3635f7e1b15b583743ffc9a2436e99c8f6e2a46bce90434f345090a76c422d778ebd3d9f4364af2c89d1353d64ec72d691d414f56c7a1747c7ea3ee8b284d3aa6612fcd30a08eb7eafc3dd42f221200fd0b394c99235ecebac79fe467c747b3ed5c09ebbbee5dc240287cceefe186f0a5b5f4fbddb0675f0159c750d715d0b01978cdd4e85ba77cae57024c6e6348155071016a96575e5f9b227c87e82db0a8470124b6572da0cbf2cab372d85708adadb04165b6cbe6950253e2c1034537ade941ab6633c1ee634371764ded5c131cd57eb9d3a794a2d26750d01498214ec9b78ba4c9400cbf7b910643a6ee5fb12fe1f2cb348d566e63dba6c1fddca6a0a6644eb7187a53d0b5d8bee99d31b92981fd81cad326a8c107abafb623a0d11e861177a58f1e3307fde29d63a3924bbeb0e946bf7f667599b92d98ab6af9d896e2ede95ca65cdc98b07456bdd037aafdc4c91bd387204ba7ea14dfe387430d290ada9a8296198e89b746f0264ef95c45ef3748bb9806f24a61565624fa84326594a572c701602c7317fdfa1990426ef70a5d3434e7b1ffd779e13b23bea25d63dbd7d9fcb713bca6c203d1b2f337a6e768ff8d5a1b1fed4d69f973f0e0a59f3c3527c30a1942054d3cfd04443d4611259b63c14f8eff56d17465e29a824afe408168acb215b5bb0252bb7c705280cc003311303373f30074bfa769676ec7a48df2d9f68fdb043b035fc1807fe7457e01e794a5130a857c56e92a8dc234f03c5c7fddf0f385f63b4ee438a2ed5a027af36eadab17dbd7eb9eb541e6ed5af00e1415622b083855f23d1c4639dc7c5b95c71673a2580e88092e446c29236900f685219aabdd06720f0e50dfca6bdf53c09ab3477833bb835304ffc65f1d6513acee999682bb70665806deb596566ac785afebd6ae7227ea882941257ebb10809923ae562cb34be2acde2b8b0de3f2a8b81c53d47a80a3b1d360c9cce2b484cc5dc62b948a6f990aec5d9c34b745943ba361e14de27232dadf5c72ad2f47e24d0872b2517843f3c43d1f348fdcb5fb589c4b304ddacd5451771ab0c53c03a33dcfd13e2720ddbca5fcd3f112eb81ad6bc1aa059e2261d7cfeab30fccb952a0254d92ab6c884ebe18c878adeee97721267393bfc85a5a4ebb7327c6f69a71a864e8fed0665b0ef302f16ca3d6ae033bbdb9443bc40c78eb7b3c5af66ba91ecd852e4682ae25575cd7d09adb3b74798d14bffca4f5bd837e80afbd77510ee78c32ee219f4156076dc6bc9ce87971e232aa4d034366a3e079e21cd17ce42c3f60f47225ec2407147bfe01eace5552956e6697a0a64eaa3b02ced7a39d1a1c2eefee96c2f8bd2c122ddb0960929e57247fa3a85fca43f63de635ad5d4fad02565aeb7f00db0c55c5552fcbbe5889b6495c59541a77a8dd20503cdf916b3bfc8f5e87b217134f2fc7a6cd13a736059348b3106bc431d929c09d4d6c0e39a93759953ed35f1df0ee90366e73cf0ddaa03bd39293e95929cefe9cfd06079b592b42c6e9f47ad6c4263233123092155047ee7c48e3e4e62f531d3810011a76f477a8650bbd7be790606775e1f932dba57e5d4bb2b2401a01a20b83b69ed97bf1ad8c765c93d8d4e1bdce3a524eebd6e54734d568711804d4da19fc69997129876d235fe53c78408e78081da0edb8d9c085c863c6603c06b8eec7733dd5713d79830b8debcf6d3e9183852502fc9bce62e85c20cc098cfce099d0a810df722d67932c2e3fbaef6efabbb67a83afd4cf9514598f316b72551abff34d1d13c93dc679bb58868148fbd33628d8279fee785dcc605073a000473e8ea9dd6646242ca2dc3c4863de1d0f8ad955682a9ba9fe52317c2e5d130892d5b6dbc41bd0ff3148308393d717ac0e96fc1f45e0539bb55eb50549e508da7db93d68f1711342a9d6ab64e178f55cd6eed8e8c28a497336fdee128df52ec475e46cefe3651ab9935ade5adf0b29ba5358d35d3b6516c8d3996aff1e2cd06363de48eab1bd00120a0d407b092870c2e76b276c70d4d7ac85366f60f2343241200253f92de66b037fae4fdeb1db275b7ae6ec196902ac69e9783fa6684584dc9067c7cd4a68405e0aeb2a4eddca1959cf788c0a516eb94f0824120ea24b9fa2354028afedbafff79917820d4d15b12def7f9efe49899c715c7b500f70980a8c799b93db838ca2859a06cdbdd5f84ced9987e1dbbf74ecf24d5f2484950dcd57347da8b8aece55d4afc7adcb0b232082157b0bbd455ca7ebcd0ebf257b184b3eb0d1ef736dc7d02681624622947c4f31f0dec5b430616a19b1300427495088898be15f27cbc4688ad4a93fa208ea20bed26e94984525db33a34b7631018e55d1b8ec54dc75c85e0c9a95c4f212092801e1578ea2e1a8a7850952a1bbd2642d7328a558c0fba8c167eb38d105d31be1cc497460fdc3973b7f004f1aa58fab493d29501e09568b3fdd7b1c8447cf154bf57356fca7c412c79417dc20e2d34485e6c757aacb1d7ec1c6d7bd97374b2c2d0132f6e749fa2b7eaf3ff2b385c6df71c232458babc000000000000000000000000000c10151f242a""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-4253129ba04cd46ebdd117f477bae35bdc6eede60df6a94a580b28abcf8bca383dcd4aca34a318f090c2e236534f4553838b273b1e19dae5a0a6e70df38f33620e3f56d4771ab8edd27ecbee13b41307dea5ffc221ced73da8412ebf90f75e2aa93345937b9904a2ed07488ba7ed7e4a81090fe062407bee215ebbcee51da2e828261181076284017672316008373864314512556411366470351751143502866044174407124820856040124488104747272515157471031535270113332160138362452220861568703310713026080445200335431724117012102776173821368242414322435313184718783246033107615466525681321552700103062228600000840774147702724033480557386354023651330688348535523803036286522510808766140743508450507325777827878388653358828424230141362086225062486351844571254365553532888807256428865656187770583403731862707663306640370460154257323706150367768487752435420042742000513678740407626635145864204641386338346560256308062427383571700177385585843713267024345387573110261418834745377370755318806263742534245857530816728343281562502028178701327753748533284210485466764187235630784126521676840661086401264013631703807186376500638136763122620442512142676466534030816270880344503216655687600047664410317731124621554758747218007662107353206105566073663637081672051334882604615032232175024506440432064120430260450083670328621582421263218843557281084706151204677842415170883722854410034757158564146427433758348366115784744267072344336485111151074443578456122766023544273207851855377881232551654715102510021504036666050106505181807202727601475270388715857665482658610113502167076780287676474561852324234606005157113274325186444642470880201270443712501306260351304114821810185605303043238284024437451570501376818478325118637534878857561622073620761344171515046664327007668000250703168414702270712204854655478324382503648846018628324746162773268200331863534240746136243061806136513225515463704681748620517137525684815620567421644267582106184168262077744160744640345713287127475166803710860415216047606452515703723634771387073742473032414765016712438084131313707771744375662530042820602754771770732427347323015241056073588430468326642327633874772054784104288772127348184355306138573334063016081114262046005810176822754772155254184315401382566282513565023308512153305535166000375507505468255224611413162316477215685285240584136066250035404431257447544533343721406440410427154285517050886855413301515367856571818385181216353325456801442712220023633562061334384508683454077205058063306076017652740557282608146518640164805154524586314027143055784545430125532435466675334181613266512656618060266525616044526063355534408344640284357448206104624813586486385052737045107351812257722833754030787678053325738580428316055350681501643208864705287440678342323163267667345570457764846348710225558572315558323425473721125854230718764686451881373313105016726435620741154216770706556760718055054212814415730370754160475426486577163328361465582221712086205043168328155862243642470841072233880412735188447232451728835468422631647766377207132637428468083840544508143008035708525281067178685206541635074543234105443801377662237826630832273024730474837626134806557367081725831768171583080066473638657717e70bdfdc8bad9d0d859850ac3d18cbb32b70bcba14d4e918230a54a8132484ece197ae8a2a6311d0966f800594271dfd7859fe7b49e9a8a0afaf0ea5a4196428683334fbed3b2925023da8c6db5f6dcffe45d237072acd40f8c75f205628f6be070a24cbe2f41d1d4c08d2fdf9576e08845c31fdb9041f70dc18add5a64d548cd0706d8180687d15b98bc2973944f951ce63765f9a8ba439732a76554223408b658118fb347942439a2a1a38f9074b64b9df696f245b83029e59b352f5811a11ca86a46bb6a84c6eee2baa3672bed15876f1ac1c7c90d3aec56ed2907bb991843b6c2421b4ca6e503bea965671f85dc5afdfa79fb5e512496ee8b096e12cee410c973aec9673ad11fc802972195af9395042c71ad560ee16476b56c12c94786985928874633aa61c5396f819588d8d8d59b0b7b507c371060a974fa1afc142116a1fd7cd6923a7234050edec5c3096d11c9ff9c73c374d7a8e2415be0f277716ca566ac3760c87a98b2b7ce7b2f4932d8f8f2ee9a20a17532934642f39712948c8db39c9a8d1de46a4bfd6db147546db864f9bb95bae22845079577b771f7bae4ea6df336ae203185f9b08803f2fd4c2f0c56b3924b9f3328ce242ecfa31c5841125d5c16f975087d98dbc3f8141b1e4be6c9ab3f3cdff90a6104d2ccb6bb6e4ae7db2519432b728ad46308ac1f81e96568f60dbf4d36e45c663a29c4963a0c51350cddb77d8112ccafd4ce2ba45eef4cdabe7a83c53d5d4c98ed9999666e71d2cff7b07a9a65e35670f23e7eceaa04eec4ad1db0998ee5cd9e03496af5c174810266f7fbb2abeaf568944c7dc3f801941304d72f3644dcd8e2bbc034374750d328ef5e8a52d13936d7147af311cbf9b43c36e32df55be0f19cca9356ff9217bbe7ba2ac63af7d33c43702edd8aab86cb24fd6debe0678dd230dbde3fdbdc2d0d8ad74229c377201b794cfe1fd38bf0ac11f59c765aa3ba2eec27f3bdd2f6440b3a93392030e7338ac012622e4cbcc854d52fa39314ab36269d0848b8cb7b84e491de5bc55f42f147588847b48d62d72b448d112d4f7efa2279bd970bbf428a1ab9b21558e1234638237607adb6c74a01c4337cacf5ce2148c8b8fa9406c57e2c817cd810e552ce2f22d7833d1baa56c791f20421ab96f4b1786edd225b1d1b86a1c71d069c56d67da303aeb30aa7ed170370b04da8a325860eba8d88636861afe173b48deba835f04bce8c723da490d5c01ce033d6f360c3f13c07f77b8841362a69ac1884cad08871cb6b5b6d44b3aa8a6379d52c3d313a38f55408e6373d67d90ce7aee2da39a5f4baef11cb029f6185c4095b9ebfa0c21e3868b048a09cef166ea4998baa869e7bfcb38c4f21a355f268ed4ac94622654992d81f067556f20062186b7371aee40c2e2039d328f4055fcb89ff3ca2a386854c33187d924b5b2759c115c5c2db629ce439b336d84d24e3757c29c2cd942443b2d25d82ac88593da79a9e94b8f2cd730a9b11b3a3b4c95ee312ecd6252f3cb75642e74047f0b9091704d62d79478b199346dd49f3ede0264942d9c407b0e1d7f6351ef62ee2c4a88e0a33ee3292667711cff0f8fdfe8ebb97e06d2cca8a2b1539922f076e21656be5313c37da55a032b9c63b39076b365369a6774e2c3912573f6074a9d53202540465622f98efb447c57dee9d3d9be834824f9a01272293b5623bf062eac9be3a36e94a30df6631e5192194cfa4598699be808ab90935625dbb76e49e868328c19aaf6f6e0627e52b2ce30dde55da986579772370d3a17d2fb7e996595d8c2f8c8c66e97a51dba18174f4bc91ba39de6027318dfec5b083e2e931c420fe04b33e590c2010751013aadd0088fbd832f4318026362963e9e74e1eab1b7634f427040ffbeb2be690f0f36b55ce72be3465f7bab45f0b0861871430f0f063e7b3c3ed1fdf5f2eb2ebaea3763d60cbf578899a76dec331bddb4bb8730597c2fd13c97192b03d2d9199e3589c90e48042481f5169129c52f12469d8d20cecb8cebd5539dcfbba31bf02af7aa6656335530c51c2f9685aa9a658da2cdf3db47d841dc3eacf9ed9374cf07a02adf76cba9ad3102116cba090969a4cb3e2fe0ecbf73c7742645e718dc141d613947744970fdfcc3104c99e742e1a2e54c7bcc5e4530eaf55bf64c4b8d5639026dcc181f68ea40c5ceb84af301e9552474fea73695376d6c2e48104e61f8a9e0c5dce582c50433c583cddfe4ca40fa5b3de2a49b18680f0b07d1f1b563517af97ddacb984ab391a1d1c6848594b68d13389fc110a04551bfbb6d937e300d4b2d73013e052b215189ba0c11523f9c1f80482fccbcf438dba0a68e9fa6ff9b08b966ce916bf46951dd2e03e9eebb47adf1db15abdef480ac1b5d4adacf0142d3d8c33c0c959157bbed6c7240b48cef19112f2bb1cd98e84a23ba46c494a802b194da40aa5df2401c1423ec0a14cfab7728805c407413031a6d6b1998e7c6624343acdd90ac56a3f158883babade104802037b531d8b763050816caea682b0484ff0ab5be3692b1b59e78648087abefccd2314ead501a9f5928d42b64ef5fce259c69d2208143384b7740ee96a4aa1407cbbc4a6f191637168f0ccd8e7e2c21ce2aae1b363d7ee66e44cb53ffd1ec9093650b1f436e311eb16605b22fb1b3bf2e44e165f1b16c526ff0121af634d36a3fb594046f4ce5c9e4f3282a3cba9dd859fb957f20195d591996db6c55308978c03b7e241f7f0ea8026f5d324b859e5a4f0312c7d15c694be788b89d1bb2bda8dc12cc8591a1f32ed662fd3abf7c46be3ba804df0d3e17693fe1702ed8f360f1f92294e73d4ab2e4fa003a8104db60fc88252165272a1e9d1fed431727b06907605e3cf92bb60631ff5b94675883e37951323623b49b77ba5d477908d943f3cfb6c82c1e32a17b0dbdd3ce0647cb47a483e2f036ddef6c8361f15acf6fed93b751e6bfaa7b7a06493aeded3d1659945fea951918c0f2162a0f56934dda177f745d5734b4ba3503914ed460e56cf844bc82abb4be5ad413c0b4891ea5eb16e4bb8ea9984b20721231a7d2d3242b9941bda7df08bfff643bf9683f50b130a194d53808cbbaebd350532e07f2ac5857464240b066655717af04e3e9e5ec9d39351c8a5164055b28b411f4baa88540f8fbb0184eb8994181691e20cb4c79ff2a470262da05269f08a8e6c48fb2071f8c38eae0debf788b6dcf2fc6ff15f6a6be15450652089486d9e4fd0742c83ad6f7898baaa5d7197268c1498e0a426dbd32d2afc73cb44f7917391cb5ef2888cb46516d7269d098d5d63e3e59485337ed26fa18b9a54712e555af1bda8c1391c131f9d0113d058aed3c20cbf0348c65f110766b1a24bc9049ca9fc8b780b964b941065c66d4216d3c78462e6999c360f50709fe1de08ef86d42e1a9957990ed615d197fb77aa1f30b8ec6cfec3de1e3580acd7b57006140e680f3a3b9cc22db2d7d15e9f52db332df876e3d9f6b4340f6e1d84130db69e2a31cb8fb33"""),
-                    TestUtils.hexDecode("""
-5870BB288AA6130708F7BBAD9FBDD6D41E249D620495ACFE90C61737B57DBA890213D4741718545CCD8B3FFFC2DB33C39AD631D5B5CC902DE4D340DF03E09248F67E89D28071AA50FA532E94C391D2D1A61B1847C6B1088BE555E5C2694EB0FC1F029095ACD9DEB21EF886BE577682CA96AA2EB3DCB24B871336AC5F23C8488011860B455B687BD4CEF5FA11381BC292B4098BB2CFC1822B48ECFD28AEADA71809BFDA190836D3215CFE755FDD9374115E5A0CCAE15240EBA0147C2F89D8D24454D7A5AC2D20ECC0D46C040FAD233FC51C870080F1FCEFAE6C073AF5F7A78D610E23831D5990985FDBFDC6D101ACF3DB0A74D71739E0"""),
-                    TestUtils.hexDecode("""
-4211c0fbcd62764b125a8c5263404d7848a1812dad1056f3368817cab3cdc97f852487ff9d2bf404029ae58f9ddba2fcf1cf5006568c2f424aa647b4024ef30a1ac57d831cb0eeb85414d3b9069918d92e0fd933b640f0a6a777637245081aa0d27b2fbca9deb27ca1d1338189124269a14120101f0fc279ecedaab6b5006ca4c7c0baee72c5d44f4c330c56bb4a822ffd3e9c3f2602ada56da71ff40a712f115cbb4bcfc484b9e778bde49ed7df2d9f233ce065d1a9b3eca2c494fb8b7ff6b35d64ce62ca335c27a3c157c801ee1988dd9c7d0cb0b6d9c2295b17f88ca760496dbdc9f68910fa07e48986bab423f9059ed8d4ce90b8d1943d1231c8442dff36a63d28e667bfd075a66a7d729a2d852e89d8f580ae18d6652d8c06e02bcdd48970a658ff1293b6eef87108f9192e65001a21bb2e5dbe932a524cd0a44155e52ed18e1f09b9c5d46483774b49a6559fa78377442c9652b879597b0569cb791731007d556a6a26efcb57910692925f041d4d55a71c7a221f52cc578df50d0b5176a262250f55bfa3abefafef82d31d1af2facb5b6d46c554f67d27a143fe7ad83d4529183a02594b584baf860c1141d50ec50db36ab24adf208289635a7106c3b0bfcf48c6ab881b75f379779fed7f1dac26a4698d1ab9334f88ffcbf9a96eff8e85b34a6ae4d2228b7ba474bb2bf32706ae6d35409477269baf4a8effd70f98fe8aa791bc49b7fda540d80d31d699508d3f9a502f90ced18fd6512aa02a22d941acd43e3ff4fc802f05da84ce5c367f9497e165ed4c5de86fd284e0c181a2cbd1f16b66bd3221fd07e368b1e00193020162ab47e61d05f54be7354b497cf7b6e8d77b932eb0f8161cd015c089ae62d604b647193819b21171c1f493bf0fc7f67407045f56e022ed791c17606633967986c9d93219b7db49f3ba21ccfd1bedaf84315a770d978ab657ec5d4e3e39d8de6a163ed199b5d713d206c9eaaaca1ec4415b015aed58797e4e116b366081825dfa54c25759212f4485eec2cef8f455109e893b4732b437c301db78978831edc4154a1be9972d4facf9137e59e2b04b89fce1b6cecbbdba092518d1d78d7086e55125e22edbdf53dbc67f38eabbe9e76c69554fab97dbb290192f1a5c66384a062c974df996b618fa8478fbdd0e30f11549040643d583ad80480c1fd0106c1f2367cf2ab8eeb641917381815b064905ed6e900b7be712d3ccdb0b1004ad33bb6e8a34b94c228940afa09623c85e490c32023e157b451f02aa6017c1656ae1dbb4e795aba6198e6b6abf66874acd91ea4028e3a9e1b68321fb6e707a72443a0a4749ca460cfc0422c7c6b2d322ace8b51270514d0fbe36d6dee137a89d32e2d55610a60dec2266fd7218ca4d925f15a7c84edeaefe84cfe9a1d672b551f5f2e32308d0a456d59c26b7a1689ffb0a3e4817c5e385a0f4658868814272451015ace5bce4150306621cf53e232cedd3dae72eb1a240e625de8556f5cbee438cbd913b3cd744146228535ea23f310379ab18c24ceebb685d0f61e5c81a2c3c9b4f4a7a533a49c8ef32ad14f2e77e210eaf1eed44cd6c845aeb78c63d7c12c6e5f91b59489fdcf68c4c0948a858933604033209a9d5a2bfb68b101f604f6f10bd9703fb9768c2aebca6ed5b00e4974bb348da101f7f2653d55decfd624a7d79c13c05a7da0ea3211f7bdcf7bf1df8d21ab5f4130f67d5576a4c8a927b7c7890fcf42e1a431c0befa7b86a5c56b283ec96a2f27309ed629b8bbacd4eeef278d7775d1c5ec5bd331cf622298a343cd473b905abd0904803d72bd2463d9a88cc11d62068f0d7fba61781fbbdea6842bcc58385c4f3493ceaf5d105a2ec7764030961546d89a8aa5252c117611c8313ee2d7c96cfa76b1f3daa4e9c885b2d271781c654b52ae904f5ddb3d58335dd81e2e6202925268eff4a6676b80f9042c1e1971fe8a9d6b7c8d88ea282e1696c70619a1baa29584c0acd26967b4dd0252fdc8dfb645a255d32b6065951e7c3da633b92017bf381f1788cdc24b205dd6a7db1335440d62d81ae8afbf2640162cb92095270a8ccd65ddf5fb667fe2b5d33fb1bc5014a6af35cc4e4232fe052014cf4bf2ad9b46684704532f33a0f165473ed2850293f6bad8fa8cac3d74a995b02980fe5275aefa92374719e218185a5d62a6347f64f9e64ee8d06cd9d509294f18542d432ee24177a0af0d2374b5e29735abec655bc4aa1eccb6b8c6cd5d0602b8de15ecf20dfb64f5b0b57cd4bf2e88495da925e98f46799d344c070d95e7527ee7d2bc1e5da7e7e857b2c3c91489d188b4b43477082773c95479290b13779c25682dea8fbe6c8d7cab9b07342894eea86e708d1e1e7f3ed998df17cd752e947e5d2cf4b4c3fb9adc9049bdbed6badc20124a694dcff1deab7a33fc3f7c8a9c7fda5ef59ba4ed3f3ee925aab58cc74b789103500aface7eb0311a90c13b1740a54541e95ed0982c9409800f89c9519ebe0f1f8017d639ea1f9cf33a70633ebe2abcaad745ef5edbbd50442265b477a2eb61e89054d50c8956e6e2743c23a387d316cc5d0b02182989c1f01580b597e0a9f578d3a3aa6d5f0ac1534497c5e8312055e434c7719567be933cf6d213be58ac37527999a9260e7a0850cab48097fd68175d24c6f1b1ad8e104b3578e4fe746621a50bbac09fcc3a0951cc968d708bbeea3e7437bc269416d826e8ffa279b755abff5bfca14e90d791ae0357d45a301d166c19dee82f2c2e6035895b294f0ef30d003c60422f78178c5305996363dc281f8627ac75bcbd28c2a7e1ca918d438c88cfaa57766a372513615592861b9872ad6fc4639e885bf03e32820a49687e0df3598b45a2f81e33fed4e91b9bb458fb55ca35d99351b20dbde76038188f01935c261f07b4287aef1158a5e2db5fb136446cf1ac6bc8265f84a1314f41cf40e283ec5da03269307a31cbc5a3a80b723b63c0366febd211a0a448604bd7e56d4d5d9a7e6d8a1247f098f01bab54f27e598fbe6483744e3bee936adbe1fa4869ed81931cd1d7b4f9ee02ede169104f910cb6dc75e10358e1ddb3f2a661595eb44cb851c53c3f2835f5434ed0945a354483203564d3377e78e3959b93244e836ed4475f82fc829946037bfe7300742203d35d55cbb5c18eff04f30bb9ff99ff1b45858d5a46774088bf295ccb5e03792779dea64d4318f800e10029995e3bd7cae442a8d9ab8cde1a26c1de7aea6a9a70bc16597e54e93729fe27d938b205a0edae98eb80c95e6ac8770f5a2db81bf1fef6fe3063e4681751e9003db29209d1f84851a0afcf62eb0e6605fa69da74650cbc4fd7347743075d9cca143a8084c15d4372a1d325adff6f2b945ac8f7e9bba76b6869abbf9704ccfa718d6926562dfc899c2498b073184ea1c6824a245be772b9276f279e2dbdf62fb28d3295f364f18032361a5db82d16cfa57b21b4270af55130c029b573ccceaeb81293f29c1ba5c0cd6292307c9f0c88100ae57ac1892e422891039541287499d3afbc1d3c68e93a14d5a3b0efb6ff267039fa3aef140953b23cc1d7882023407e7c77dc0924f58529e18b41b2f89747d8f1fb6c166807193100ee0a26b57beb8da3c34fd134a28d5df3cda61683e0ca0f9d92266cf0675081dc18946586e5b9e070504d6125fd485094f3df2eff6d9197b3c7953303f62e276df391c8abf86aef1931d60488556e412ae00f7c201e8d64070aa72e291e804c209c8dc3fe968d06311d569d726fca4a094c7d4dd4b16014d4a1cebaa97131ef1ee66d734b9f85c9a6e70afedb26e7ee8d150d611b852b0bdb34513ee3db302395492b845affb16680f5bea4896b866fc13081eb86f509970b69df9d7c023c160456eb94d7eba2e9e2e076c10ad52b9c966ac387f808811138b9f7416bd0a9d21dfe8b706ce321f284342aa301f4d8361bf20bccd478386673d2afbab6288b8aff15eebfcab25406864842b7fd6bcf6c42fbd8b2cd526c5dca80e46a04be95cd7d63d936eb8f5430415b9b1232e4ad3dda1abb1b1c0286e4d89b9750fc67eeb22342a2aaaf83766ffd72efd993dec4a06dcfbe5dc3c067dca721d41b14f8a3536e69923d34bab47021bd1a16640da14fee5e587a833f2b415f4c454b80c700a4d9bcad4c94b6db9cd969d199f0a3f4fdb7225d445cefee5c67b1d6ac63e8e51d80cf32ae75247436bef80affa4b36096b19b1dff52a88f7a3f2e29dfdb9c5dd994f3bcbafd976f318fc59e3d1ab60e92a2c0ca7eebf68da24253b4bf1bc99c98ac429becba641fc2642074a07a9249ebe6508dc5d0d460f6c7bb873cc6a2ad7b91f03edcdc731507ad451ee3d9a4527721a5e76a55dc008f438014fd0797066a51910e958d5a0d92ee2245c853b4c9a7b2e7efb1e9e749b420b126f0a0240c516882686660b38c60007f45d7648eaa2d7b1c6b1bdba8aa5ca140e8c38b0cb6d54e3083e903f7c3f6ac97d95293506613b3a35f1c2a8d401f66d917906210c758563e4722d30b05d375c8ecc41d898574c3a20d218b581db4c85ddb2125e56c4918d021f96bac324ff9e9789c921cc5281c0f0c98a98fcf218232a8b99a2bc34a4b7c9d9031b1d408bbec6e3e633555e8fabcb0115324e000000000000000000000000000000000000000000000001080d161c20""")
-            )
-    };
-
-    static SigVerTestCase[] SigVerTestCases65 = new SigVerTestCase[] {
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-36fa0dd4a24ec6fcb09f2302dadf25bb8118be5ada70e1eb7f57b93fa96b1b842b748c1f9ccc78cef5d647c28fe8a346ec60afd8a79dcf46d5a9666b0e50816972701861835ba933a4ed0df8b13eb32f07761ab2f9fb622346059777c7c75b2f370fa623cf1d71595827294cf14bfc36f0ccaeb3b9162825737481012d4547d1843873aae1a2ac6f262ec5d4b2403ff7cbb3e6758920a6dfc12f48396f8f96e144c1afa6f0a150c1a05047e35e95a3530748c121f953682cea77ac0e4dc7cf205cd63e8aa64e278cd6ea2726519fef2d0180931cb2e06739ccf01e2bc1ef7cbfdd6bab7b9bf82092e18440945bccd91ec8a703765615cbc42492925b3515a20c8e676593d0a4492011a3cfaaa78a21ee10bd266e27faf13ea69691bf5bdb89bf7bd13642fc757af3e5217696b6d0f25386a8e2e2476742b5b050813afda57377141f0fbea06f83544f14b1f027a05d9fe5d431ab6adc86623824c466f3d37b9f70a9318b52688d209a869c78a1f063742380c18961fd3cb19b3e0d90898025fc8d7785791d6ee155899e1c0c082657dbe848c1c03ef6ae62ac00e1ee2a71527338776085554a3929db26d61d842c15e24a917fff823ac1bd9deb37af188a6584bda29bced6401230efeabdc5e96bc2c77c23347e5f60ba29c581877edb9eec6831a9db4f93c383a5f2f770055a50c9d4579e69a22899901d1c9f2c5b892976d980ba4ad0864c0a046837791ef23540b603a5f7cb074d94620661e924d017d29d6fe6b4b9168cab2325a6f35e7d1dab818d4fca14f6af4b0eef66f869a0e1d7a8ed15ebb9b1d3cada4fcf106ce5d0c740c9d8eb5771933226ad5af16f8364d506cd700fb5270cb26dd0b17e04d7db7e5f503c9ce3c44d0b8297e619dbdb382c29d7801a9cde6cd5e6f8e4ecd6cb9e8e89ce2782812496a0948788fefd3fa8172df501475cb6d68cde63edce6b7b989281b2b95d60a301f10f60fb23d8dbaf6e4b4b345b0249434623580936e9ddb6440d7ef60fd96e1115585d16725e224a4c86356bf5275ac911864cf1631c6fa8e6ca3f093914638f40517a2102f23505a571e8578d4b5a7b97af3a0df8ba735d6e53bd6e0563dbb21c37ce4ce99f45752d69322675bd522046a89dd447a34fe781095126c774bba2b26c9d7cfe4df858e7a5304c5183d24bd59f41d7f22414dd6ad5865dcf10bb42857b738d11b2d6712d76bd252615e68c91aab09c8de5cc36cd9ea66a8ef4b65a91e86cc39bd107ba15b1e5be3f7e856070026827a16dfccb6943877ad4d3dafdf5afccb3ead3bbe493fe4d2928c335a9ec128f11dbcfffb8d439a7807cf035c01ad29d90f767d7f8456b4511321919e0a27220c411d94639de6ee232da1544671981c200642de22f01a8b14e8ea8ae91cc05f2a41acd085239ee00dd3e31bd21673fd2ed5a5692b3d163d99b1c19539445a3aaee990daba896e67ac125007115f126bfb6902fc8f53501656ba204677dd4b6132813d9064000d024cf0b2ad70168c8bfd6f78ffe6d1e6ad8731e880bdd52056f2bd42c825ff5dcad7b4b42275adc52b8eea33e23178ca2361d55d829de69edb56bb2a9ec300a4691cbc1fbe0b8f8f999eb6259fe49d6fa63d665722e542fac9a2ab5f203d1403ef328ed290fc2bfa1da1240076123d425e485589eb6c7ba701658fa6ceebe2fc2d211d0c14160ca5518aaac2c7763c4393e41c31a8b62b3af2ab12bce0f2324ffc1bf4d1cacb245da239406fbe105310f494502d6aed8fabd2042c7b1e4bbcc8b44d22f34850db34f8d8134ca2d7a7e7c57e447d66660c83001a54aadbf616517867f1a9a127a7073ab120ef4f6ebed8b66640dbab85f7e4f6c379d6962ea30b849b1919442aa6cd3defcddf35cfe6e4e9443b5c130503fb37dfbbaec995cae8b2bee478b99cea9a030368aa1070b17909d27024bff039dc4e1916d8006480d83858c04f22e0876e9eafdb67688d62c94252a74c1275c135631e162e4588b3f6d9f8140f28e8ab98e11cd96c7d5a528dc8af32ac90831bd74f2481983c62ef4111057b02621f89c85731edbd1b17f525f0a7c732fe8738df6f20912159a3a44b9b1518017e59e02b418dd08d066642c120af3ce2d22e7925fa7d811aad41328c66ec31ab05e1185351ef5cd3f88d931e70e4d60175634a8df275a96b669024f2a5d7dd9e8fb09ed16d5a754a25bfc0148b6b690ac7bb9e44062baab6f2c7e2dbda94a641a07fbfce7856bdd329ffda4a6ea637caaf36d1776ffbbb17241c7a69533adad3c242dd98168f0dddd11df24c0e2ad33db04cce7d8422d7211b6b04a93314655b7999093954674341f25989b19c2cc7851f8d3632543e5f706c1a4a71cd37f9d9aa06bc81220e8792baf65e69a75b9f1f9d709cf73f4819300efab7505f3f2a3ccf913cdea82c65a446817b316fe1048db8e7158a80ec221497a243a16b6292131573a6374c68deab40bcfbd4bc955778345eaa8fd9c8e405a9cb2ef79842bab9f48bbec5764dc6159cf34f4d6729e1451dff16a92b9920301522650ec397c4839857a03e991185fad483898e37485b7329a74929e7b865d1805ed02158b209fbc0661d4f9324f3be701928d65a04784b8fdae59666d70b1ed2d5310a2a66a3d7b948b160e16dee03a694403b7e10f4c9d860ab54c34b49dfc4789118f0bd4141158be72d710d9812f66f2070f5542064cd9fb7030e9b8a82e2ea74c2cfffaa3ba0046a59f4cd06ce680f5a9f2"""),
-                    TestUtils.hexDecode("""
-E3D54DBA675DE7530D3854C8CDBD581C6E392F69CF9793D8C0BBAFEE7334C5878BF13B3BDCF1D993A47A7E8EDD4B6C3EC915A5E8FBF2071F112AAC41F08CCD8CC731143AFC223213212A5BD6B6A4026CFC9F7A41C08CB99F2B375D0E04FBBE00503533DFB869DE43566574B49232566E38B13CAF8C1EC1FA11CCA3DB66887996DFEE090D133B1D394F075F8286CA6CCE13C3977D929DEF5943461BD5A22D4BB5E8FB7EFE016932D02ECF4D7B7705412CA14508B13E61925EEC0B77460C4C089C83D687C8F70D141C75D6DF24FCDB64BB8C2721AAC9CE8C6FC4750C1686A7A70DF34957DCC0CE53C3F0D280CBD056D4F921FDEDB35AFCE5DBB348964AD105EEF5A1B07BD0D586B87ADA7CA7AFA93FB75AC0DE1C749C48BD6F192D6279482D3F9781290B88B095D73E728AFC186BFF0816C1DE78119D701FAD382C65ACC42B04D69412AEB255793839EFB9E5BBF6F69B7FDA27A44C04D3AA2FDC6101E9CEC6F75745F20E077EE23D652B7DE547A0FB0E3A153473BC824AC8A31A2C9493DE64B6D40185B60431B1B34EE32797CC77C45C71F4E04E849BF8DDFCF640B83130208DC2495C0CFC6C031B63B80FB45F47BFE3D25EC5B36C2700300D8223074C156C5D9887DE8C5A97BA36A84D7585CC065F20FE8DCE9E8EB814A1D5B7A3B7A3AB68D93EDBBBBF67BD70A0FC536C81C8D6E8B139C6B3B5EEAA3953464549CB38B78A15CE3D5BB4B798E6B142BC48C70C5BE61F82DB6E2EC03616999073574E6FB35D441B78DCAFF56B8CA8F473EC0543C9C69E93B97F95FCA58DAAED511F4440DB252EC18C90D2F97AD901716AD34EE103EAB0B7982994E21ED1AC4BD62ACE6DFE12C8C2CD092E7A7E37BD4E61B4CD51D980171F8D4253A4E7FCCABA0A513038276325372527621B0A3DFAECCD7CDFE98CB79C0662F5D0234AEEE9302438B778238BCA409D5908768779155D659E92D12CEEF3C2C954C3F1A4C2912E9EE994209B608A604D0CD87F79665A25E774E6DC1D8819B85852D9ADEB174C75D982DCE29FFDD24B7AAF5946A74C14A301AE09F1386AB17ACC341D6DAC040FA6527FCB8E095CD4F1651E47CE02E6ED76C085B2FABE9FF5A510E63E73EE386AC17D5C2C94C2D528B3A9C8902D10C1610BA70BA616C58D037F148E6332107DB9F64C579064F19481669C7888C21F0A3374194FF1A72FB6180DC01D29443BC52C318AB03843357A5A98B3D5CDDE9BC49D3ED29EF73CAF44A7849AC6DF4B2D353B6A562386BD480512108CA0ECD63BB3D3A0695679762F8254116D8049488BE6389FAC08916E6407944B1526BF03551504E40E6A3266D4E773E892EAC4DD5128374BA341EB4097E20A9BBD4E5EA26BE6FC325D9B71C232DCE1974928516EA2519974C82AEA5247627F802C6442B67FBC10E359672EEB9DFF768E9333A2166336FF0004DE5E7BCA55998C860FC1A86B75CBEB3FB5A5A2519D5227A6B5A7E0EE058FEE0CAE2B4AA75099FF098089F0261C443B13911CF3250CAE2F2906CB6454A20D0FFFE8C5AFB1DE7C5BA8CAAE00CD7C2D7219FC83FB158FD6D15EDC2924AB41C9B881566C538F5E38978C3182FBDD0C0C532A77A61E5B8E666B3C540DE976098D2BC68C0CDACF57E9BF1BDE8A7BFB13256BC69F2E386D8F458D303BAB781E537517AD7D0F0378D2F258B013AEA01C97A7E8CD2C3DEB203AA8D59084ACC2B09AD3C97EA613A2FBF297038B4E721665D512DDFE5C13F11DF4BDC0200BF610D57EA7232914752F75A544E01D5AE0DEFBC9E18695824058BDFCDDF4D5884840D2B55D6C2D6EDF475CA75F3EB4D0EDFAE99349684BC9C533EAD591085BD1D6D4E4F9B00A54C97244322D505AB52B2D4E0438C6AC5D2C3983BFB2359FB21174AC02156AE11EF233AF40A695854C84E620754419CF7ED9EA4FDACEFC8879B2EBC7B29CDF9C4CA2921E084486477C1452BC3BAF529DD92748E2B1B684B1103CF4C6EE11999E4121CFC7E2F3F6C7BB9C055F800DC46D78D9D94C3B20BD1B697411FF0B41E38173D2C9FF1CCA77B27384026ED2EE25223B0007D2930D700A20EC9159A66A4BBE0BD84DA52F006D7FAC6D59AB2BDE08FBCEB76A57FFEF59C077F9008A4A231FCC302E4DDAE9F3DAA55707C1EDCDE8042176DC7DC6377BEC58B236990AA6C5876D5A27942FFF7FD74B7DA1D2EC470CF71103A64FD2917AF4C45D4C59C13F58472AF408F9C5F907C7C6AE0F402B404AA40CF8D962EDEF7B7654EC8E36C645855BBECC1337EC18F0EA65933F4D07CEE15294139F479A16133D2BF412B5E46D5B06FB170F0C93DFB8AC3F7478002CA76B67A272A3224C8172CDD8A616A4C52F5FDE946CF5733583C53835EBC90DE3ECE34299D7E5434BF072F08A44905818EE9708815CED10E9043E88B6EF12BE72FC1169FF2F925C38E03B827CDE77740C7C2848AA3B09F555E2712B341E248772EFCF01B99CD5403642448B5243F35A3073A6DA7685AD42FECB05D46FC99F7D6B8EC56F39A7E7B3579FCD587E07C05BB7E1F5D49B9015375E09A9A14F2CDF049AC392139EAA3C2547426B8CBC0C4BA76C55014FCD3940FEA2631A75CD2FF5C22B8A65C9AF2DB1B831C30EDC8EB79B797E76D045EF0B8EFF8D41404F626DE8551FFA445885CA1E3C9BF05B5C39CD40E3B37CE3B58514BC70E2EA94CD694CA88C1F47AACF9B4FF6622C555AAB7C71EA210FAA9C0BF9089DC9C9DFA77C2C4A92F59BD7CD24EF4F8D5088DDBE22DE854F8966C017FB414464ED6B991E289F7E3FEA783831CCFB51E227A6DD4F5EF50963E80847FA6B350A2DCDA3C875D176342ED73BB42B416E58D1612C4D066F1207B6E16A955DCD557A9EA37A9F24CCB20E74AC4D6166ACEBCD7D651450E5D4AEA86DC89528DFEBE07B39A160160FEBBEE5B11122B4177FD04B0A49803E498F1BFFBA898BE3B26320966165E136F7F517FEA35EDF01D36831F9AB478CFF8241E01AD7570C26EA62439013F61D48797B92964903802AAAF356C6AF7645F5F4338C7EAD5AB2898C600123888AF42A2FE06FF03D81320FC08E7589E19887EC86CC1B08204C29E86CCF187B1240B81F7D375F3762CBC10F3BADCAD7431E59A4DC136440AA72628E17D2BCFF916DBC8A66B8A83A3C6400EA0CC57A82DB41BB28CEA9E9CECA1ED826719B9B62B6CED5B52FA518FE47274DC6E22E5F8398D42AB23572CD6623EC307FB7EF61892AE3196C48125605F4F09B9C0F0DBBFB9D9015D325C546CF3B1DC886AB0DEFE2C35CD39E2AFD13AEA74F787B410883EB72DB8CA7D225E6FE8143695BC0FE556C6CDDA493F92ED62A38E8F90CC4C713A4798984007A5CBF68F0CDCC01274C96A15C3C4355ADFC75F7DB0603918ED6CB4E4491A8569FB1A9AF32528F6E26B2303C7987E39015573521E024B2230BF1BB803BF2B358880F2840CC58ACE31E551C8E2A0F8349570741F8E93066C8F17608DE35AEC342415A4BFDD13A9757501F5246ECA49913D0F02EFF35F4B3D40DF97A64B0FD02709C0832C423543A850776ED9C0574C26CDAB8DB371F5F4B731E6F510BC09FCE3DBB58BBAE1074CCAC284D5F8068D2435E053A037E3ABDC957B74339EF0063D367F7556E49D2C7A7DE3616F5E8B703B7585F526E9306C59329A18E76B85303C31E3616831F2AA2B173CD0A43CDE76AE52EFB8CF3C381097D7A7598EC833A75E97AE4DD539C31B3E45216EF9C844008C28D12B12D3C7EA7FB89B3B5D20EF5C7636A8E83D6A9F8F7DF29C9716B7D92313048A7E14B9EDF77FEBA874B9410DCAEC4816D2FB57050696F5D4F0DB47C6183D447C5AFBCB948D09944F4271368542E377DEECD006779F6F7649B946E79BBF2E19AB4E93F142BB24E6D962F6648CD0BF1BE876F6F431E883105C3E86B973E30735A6FE17346ECBEED5D101EF0AAFBBB4C072BADAA2F4D517C272F2BD2190F5F8C87D961041A121D6B319EBC959AB0603096017BF7CBB74DBC74FB866358EF8C1AA5B9A10B2C524E822278627C0AC577AE9383C2A529054528E58D56699540E4931BC65A125EF4B459A7A5FC10E0324ACB641BA33C83A7E100CB00FFE0ABF6281F8942AE5490DCCA37BF464D0B061028E46E025FBD5F6DD6CA1BEBEE282B749FF5B002210916B9CDC4D903A95972FCECB9292A554AEBD821AB4CC50D5EA0A33A699FBF07F2CA520FC44D4A9581182290294A8FCC66DE3FB5B7F5EC5B267D1A0E6F84C27C02253649F5903389A0901797A7EC8B78AF12BF2B1CC22D291347A0F8D6EB2698AFCA7CB4C23EDF250A5B77E51EFFA3C675F1FA951D72467EDAF987D5B63DE4177535974BB2006AA9A8DD9E624108229B1C5735BB039CCE47162EB52DE88703A8BDB8ED409BC01DABADFD31EBB95CAD9026705DBAE5A2D06376320BCFAC17A7DAC957BFEE98480C7A111B5ED300447A21FE62448F62CCFF7DA68689A73A2EC70BD13130337EABF26A00BF86E52077EA00DA46FE7323780CF98B3E998BB30C3998017F4BEA455568FCD567086EC68ABC40113DB474C6C88B1C1C7588E7A8C8D2082D4C70DCB8FC3D8FBAC53CAE95286F13254253861567E4715B03E682E422C111169D96359EE18265C3CADBAB3AE61F03F86D096ADAE9A6C4820EBE3B61015995707695B42B67802FAC2D6FBB2B67801A3E48843EB83288AB52C29C1F112F9233860612BA015D4B7CABC19C6294F8871E2ECF6AF334DF9C8330971277E32CF1488F04B4B285AEEAA83BB81D54B6B8426439804B027822373AB99868EC068735C816521BD75DC19F79D2E2166B1A551C998318FE19F5079BAADB12732528BC8B522438AAD252C57D3899400913CD124D2DBE90A891D95900C0256D9DDBF939BADCF6E37E6783DA2A2BAAD872F6C8C11878ED6D5EE2988135A39F2DAC7CF127100C36D2D4E58B3A9B1D7341120FFCA0EED2E98E020A46F1AECBC809A21EF79E6DBCE76F96B6930107F078A5D4464CFEAC414CA41A5EE4F87CCD8868E7922A14C247885F0DA9E23A7604EDE703C2BE3633AF9CCC32B9E5F51CF51978F10A06F5D77C67927D80AE480E7E5E005401ED95467972ED87029029DA05DFBCF2F0B9D50441E8F15804B0A59D23CFC2E3C0FBFCB10B69AADF0B37C06DBF972E264C6CDE4142C04FFD9FA0AF2451F8BEC3FDE9723306085ECEFB17C591E691F9B4D4F796E293C0CD322F02B96938A5F7D1C8A7FEB94C031DE24E71020FF37E00590AE7CA48CA876AFCA2BE3723EAAD40FD27B90FE6EA039C9F3F6069FDBC70F16626A41678A31E8AD88DE9BCE8A25D43B86EBF80E5E426FE21606E67545FF8E55FA7D9802D65AFBDA79EF40DE924FD0DA7B5C8F6A2CF993FA6D27B2861C629CC9BD2E1E6AF04F88065614F7E24CDD19C88CF2D7D2B93B7408D898525E5141FF71D18DABAC186DCD432F3895A1027C92CF8613C80BD46E4758CA26C8CD92B74EEBC5FA5EDF9C9FEC54FEAC40F0944E3FA165E515A03DB57C205D383C04B2CBFF703939EF321DF8A49BC3F5B1409EA491062B7B9982277825B52C6CC8313BA05ABFFCDFA525445B1CFF773D28536A989D257967B50D7BEC4FDE5F338D2AE81BC8EC592BE93BDA0A7DD089057E675674E8B997B05D049CA3DBD60B7F3FB23BA5F4E5A48ED8535234E5C66C41B157C25B5D9EF5C8C0ED016D6B217F4B60BFD0DA223A5D40C2A403DE8268AD5E6207C54B217C2F009C5DD052266722DC21D4AD8314DE498692E3C77C9F8226A14F27D49E0DA1101E32E5B86BC0F0348A20A360A919EC863695D2EC318A61F654C9A1526AF1538F928DB76F9B14EF598F2551EE85D6E0429192C5F18D339DD5A280DD5B1A8F59EC1F2947996C7E190C87502FDF5004772224BBD1C4DD62A8DA1723EDB41176A9AF04B1F30D09050E73579364360DB4F98034FEC1B43E6E9E0226409E6AF1609FEB862D845994BC20E67010237B74DF1AB59EDF14B1623FDC990B87B929FB7E837B1ED905286A886F59B023F40B07A989EF7A99E974EBAEC49B45FEE1F405D11A641B2B150EBE854F7853F06026CB1287FD8BCEFB15D2AEA623D7C3ADAA00B35A105ABF2D8F9715BE65AFCC1381D29C5EF398F2B76FE1651348BAAC147CFAFF34778242B32A1620E0332EEC7AF5E750DFEC30A899452ADC530DD933A07748DD522AC20AE2B2889FAC3237D23C4472FC8C6B236D4A4D19F67264F54BB9B25318156B30EDF273BBF3598AF5B34BAD41585982F6039F6E488308B47EAEA5D21A91E5838F7D9CCC8F726EB2DB82D022BAF103AB2DD444489B94E8DDBA71E62AB6251DD5D5F69E44F377674A5C2B032150C32664C96C072867BB7A2DC29033E6BCCAEDDEA430E5E155DD0724FCBC0415B2AB6DFE68A2E59403B206BBE7F421FAAC53F66040C5CCCEB19F17BF000AEA7E775211E48AE04AB32B2EA470FF97707D9C073FE72A7B77D49FF8DEA36610C2A83306435861BE01DC4B20DBB8AA6CB780328DCFC2A32D74CABA83929CBC85E406E74EEDB727A2FB5BD9D304AF46225832858B295A17B9E710BD7B0B5D19DBBF4FD021EAF29F4D1B6BD7E78C8A3E3235B5D0BC687BD5B428D2318CF4330EC343566D42D17BE838EEEDF70F1E409C189DB1AE0A205D222C92A1ADD33B8E3B126AF62818A2DBE3E3C001098A986865C6B57D0B2F5579B97B6F101EB56FA839F8789F6774074185A8E0F383E9D8813CA1670D8B7586A3A1C27A3F5A3874C4E743EAE21BC519DCC430E281D2F73C23BAB948938A46FC24DA94647150DB72783AB3FAC01D834A8544F144779A51480643CB1ACCA0BF88D203F865664A5ECE18A88CE31B0D8FEEC585F9531329002D4FFABED01EF42AF52DDF08400C58D07E98046D77C7A142B513DA0EE795DD57EA43F4CE36C8F6D2862044945DC293C8D47D9F207B0344220E3177D6E17A4B39B22CCAE3C53D4E0DC87F70CBE9BF743CEACB8932DF8F84A527C9FB84C6CF5206EC2E43D1FF8E846DA06EBFFFB87BEC09C63E9633713768060ECA6259AAFE7C787F3947D5B94A6B80FF0A7A4785836F9A1396833347C13034040D1C6B1F83782AA6458328160FA04971DE04A16B6C031B2571DD131912CDF2515DD56983ED6EF3BBE5B3989E951BF0B99C5605C38181E96690487E87240059DE21BD220059E5D7E3C832FD4569BB7DF06437197CAC141E8FE5B369B542CBEED2F9025A030C54F0B5D2B1E79011CF2A0A0DB14312E352D07BC03E654AABAA95AFD30F1483B57BB1A74A0CDF8C9FDEBE4B0E156FE86BB1E21D861F8EBE0C4AB2B23E776EC01A281F6DA9BEC4C560668B4EEC71856E6CC41741DF2EBBD4E95B661EC24FE31B1DAABC9373CCBC82F3C13C31E478097259850221928C7AC6BB933A5631C896ACA87FB6F5E3EEF36EF5B9CE59F5676813A1A7E768FC9B8AD4A0A072672BA23CC21B21A95C9BBB1A40FDFEBD2D611B773DFA55F87E9AB1CE51CC42B0FE2FE15DA2D73F656CA56279AA16722ABAED5727519EA258794503F1808E4EBF056530B318B99A74886D05D042DF4D829C425C908B58162EE30A073D4BB7D27275B548E7A90E6D178DD27F67CD955270825FB96300C4645E4CD9C175C1185707D4D365955FCFD245A55D64EFB66308A47FC85592BFB755EB4AA8B78B541274E2C225DAD649C248E7F2792A56BFBEF704551588460B192DAFB9BF6798B7D4CECFA424AEAD675DCA081E60BBED670F9AB2316F5012E2290770D3323403DA5748BE6681565A713873A5386A6F1299F0E1EDB341FFF08325510A7F2FE5EB0302727D7355EE48ED5DF4316FD34833238690B91D47165CD4CC0454DA33B87569D38880AD92A92ABA0F24D99ED4CC977A2B4E37954FBE9B9320101C80A858122793062C7AC26E71BE2608DBD2A97CF4E884FD3255D008700FF3531C045750B2EAF7730BC9A51C675D94179DCFCE9EE63C1473D15B4319AA9EDFD19739CC05C5C3C8AA618FA9096C6648756F8AA74FD18A8CD81A2D248B856902B4D30182BFC2F392450F902973043EA0F5E6C872AD43A2D319F99F095808D83A8B02BD380D6C3F3DD227EAE2B4A4867713853D63CFF405621B1EEEEF00D5BA2FF254CDF97B4226334A9866A2B5BDF1F8E8AFDF1238DA9F48FC388A339F79D648CAA0A0A69D6F16E297663E5F4CF1AA95427E68D71E74C0A2FB6B689224BD9978F7A3A4505334774176FD87097D8AB454CABEE138F2CDFC6EF0F3DB14B09DD02E7FABE9F156654433B75B951AE3C196D670192004DC1924D1950AC597682EAD1C087ACB1461247DFAB3CD42279F9169B69B33435DB9D8994AC04B15D45007F0F98334AC5D783219B376D9ED7553F52CBADF159F69282050A4C843467AE7E4C4A142A61CCC4C48DC3AAC6B8E0A8D618E06C60DC924A943AF9000F896446CB62EF4E47AD6D1FBE2B8984A48ACD7C0519D6E87A33106E9A91C298808BF04E1267349334E6C2AC015A9F704B2DDB56D27A8B00D876AD00F62434095A6F7A5E9CD4B27FE09FF69019AE5F27330792CF9A1C07FBE98D23C4E615332A77DB5B6182D277DDFD7572DA75748DFB3B9315294EABE4B6D0FC3114B2AFF5537A6B05A7AA9ABB4930E17B7FD3D8F81AA2D674DB69AD967C8306FC3E1CA8BF78F446B26D8F2FD1AF6F7FD7E52867BCCC3B4DBD7227EA992DD995D77C4A2BC808C7A3E68FA433675F489BC503DB70115A824669E4B1861CDBD557A1F78F1A4B3582B2553AC23F12A4326EF943C56F847B8C679695614BBB1DDEA9CFB7D799CE42DF8B735FEB9DC119DBCA306DA4FA84A50F79905E5C2AC1F61241D88359EE6F62DC9D3E4A1593F41CC5F3C02241CE5EB62C28A547FCAADF1DD688F3DFBA870D9BED723B02B0B1CDB4C08D093C48977E0621930A668A5CD517A0EFFBE248B4AACF3009BAC0D47F49378F30A3D2C2800CD16B3C9464563DA4A7321082FAE95DE5645FCCBC5569E942B5F860A32F04082723E9E53F2D18099BEC5E23A916354198325FA8DAEAA3F6B7AB6AAD6EF12A03CBDC27B83C818F44"""),
-                    TestUtils.hexDecode("""
-7dfa6f43cf7e66cb9e8830871ea48edb07de9845daf9433d74ba10cded10ae8fb4955732aa5f11581322d945bd5b0c05ca195e5373453435602784c9e386ad0766d81c9c954614533a0ab7407d4eead99582655ed634e9a7db1458e3f91bf0c4ff63adb0b62c4e813c396d8a640d0464aff2abc80dac7a5d0329e31eb34d00c2d90142f47e1dcaa203f730de8723ff5f6e9db3dc53923c1dc413ce54f5049496cb69e1280ba7ecc7cb540a62e441c97743e196a0144db65e3c0022c9a6ec621eb1ef79c93b4b224c4a1df88afe1c4513988a9aa4d6aa2a440a9d2b3946dceb5954b0f5634af19cb9de528dfd8bfe857375a8c903b124fe6b9584fa68f56dde10114aa62aafde3159db334294c06b2774fd660a13e997403f04f5027bda9745e16684edbbdcde4155adfe34e0febff14bb05057ee9188c2f7ec829389e7fb24c24d3ceec6f37e53b592b40fbfde40cec330639e585017f79fc86c68de2d24e49b33b5368fd1c7d027503f12b339aac9a4dfbe711918e9eda6bba049154d4f3aa0519078e9ae18f5a94f31adbcc199a72a7b09de94c7a9ca94a04d016fe4051e5b778d5de31f3fb76fa68a71574fdeafcea5e72b563e99982ffcef751e8422d2750809786b57850b832c34a1ea88176861a4176a6623159d63535b5897ef1621564c1882e2ab954455cfd5eb080f9e979a580fd8ed7b02bd504c6ce24c55c1e582e524b6aaa8ef66c666807aaa994d22df7bd5c1a01b128a408b9dc762f2a5fae6a61da1ff4a2feb7e4389bf3fa4357c61acefdbe386b6e55eb3220eecc005cc0047b45bff02e87f1f55177c78c16f142c27e6e9c3ef81a5c5cc77e70695a7ca57e93da2b5c0b32a8df6a77dccb47f3c9406ac58bcac1ba5aa511e417648c4160979d7cd710d35f4b405e7b3d09d229d011013e7c84ca8d0693696b4028eaec2993755bddee22be25b4ab0c5541d6379a067b9fe755955cf11f7f83399bcf28c331c69e2f9a80431da37b14c7e854232037284e91978ef928fe68021138649d3cbc669126910cd648e39cd91efae120eb275b114d33629bf451416ca9affe96d67ddbdfea590b7babfbb49a8e6fada738b0f2bb907e34a856a835e09a8c9076ee222bbffaa25a30aaa21309449c4cd0a7fcb6110a1c82fa8d4a737bab8d92e4bdde60827442e9f74d135f3834073da3867b5094f4653d88607e8551f0c2951595fde2880f0407b60146b5f83ce3e589ef16368b7e058db6b3e8b98d6d459428635f1fe23fbbae5e96d5afbbded8dc22010c58d11e84edaf7ffb8c6598d15e8d3800cdde92ba519f3773ae13219b7e2b967f360162431f50b0de5c634dce2a361760bf2c656e47f8d10336c0c8a0694c148d43dcadb3f84ba52a2f8a167732f106df835e50af089652c7c806b1f51ed4dcdec2cb5d97b5c06f6c64c2be83ec4c1b228fe5615b7531921a5ab4e2357deff9d75e04586f0d325e0bc6306cc22f59e26dec56a2b0ac627f95be580a8efc9d7c27104a852df113d443664a9fb27c0a7e9181372eab430394ef71bb5327e2ed828b60a7b93a42b054cace4b029a8f4fa8fdbabd0b728971ba99c641ce864b627f9fa17c33a6f50d3df9c97d066546a37ecc518b6eec761351240ed4ac606e498daffcc4cb2ccb061619377d33d791938a32cc3640f45549f625e8c2c284a7fea4fe1a864417183177f9c914348d7a693e2d53a95dff9fbe6b26604ae005bb1244176ddb2eefc07942edc0b0fd336f267006979bd82c4499460185d7ad41301fbf5b17e78491a02b8df328aa35eca2346c1f37ca775d11facf01e26d7473956f28551bae4afa6039faf145ade0da17470beb6857ff7435b7ecfcfe51417282095d7a83316d16bfd0a209bddb52461fbd14a74bfe06183c01c40cd6086c6594921073e6a49580aab6b28c71b960ad575471fc6276b4df624870ed01346e3a6252b8e9ad82b40cc88f5627ea5d8073efa300eec86ea921cde8cec9e172314081eee5f6cc665f2b0f6e5a0e56a9d55d8fd1079ce1b5ee10fd69b1a1e8fce047cf7264edb9c44e51443387f9d2fc54b3ef09055f819fbb065d6f0f09e53b3d5536f1c5a98c1778a5a45755894290e45d27f93fdd72e948fb5a1e4b2b97798eb030933180e8aa5bef5d89770c546320c9e2080eb7a1ee3c03a424891517c3281a0f2a7865a138e7cdb1b417809c3c3f62b12baf9b02f9156ab6c774c03d698a9b52380124d863008bf3875dcb7a8a80191c288fcd856e138783a0fb301e395ade94de2193b7f316c63fafeb388a52bb934409064aa9822f5582f632324e11b6e4bd668c0c3d57267d64311556bf855524191565c02da543f1cbacf62a1d5d9839990ce77590f138e7db0641e51ad911c3c116addea6fad97243e9ee4efa3619e8809d67e8907aa0d63f4d9ed863999212e5edfc8e7c761795792e7d9c1d05af67f10645f76ef119c6ce384e92f1f91003761c9203f2e2e6afb3ed4daa3c24d74b9cec3526159f7f88b6df5354db2e7eb0dc1240cddcdf076b8b8f4567eefb4b27e07aa3a6dd9e17695f58a647002283b2f853e9c5abf16b5c4c1f4cf6dc67e14e2ffac3ea0e98830d8613fa7a149109d054ad4858fca3ee6bcef6bed0ed48a877ee4d0c758cae7394d1fa4d65e6fead01c555ed81e9757641d48ddf8ca28e3a6448e67eb0daf3dfdcbe10a376db16063c1a3c48abf242a5ce4e65ab7d3e535339e5689017337b6051820045bee408764b4578c6d0d7e1e17b9bf537912925cad18cda39c8402e3897ed04ca387dad9cc68d049350c2b9d8440f4195144c5704251e5164cb969f08a4ab01d230dcff7c769a026ae57fdd36abf805d114716a8bae45c099994eef19abaf515a0963633763fd2c42f4fce201ec61da3b5dd9d2d89c62b9dc8dfe0ae91fd52b67822cddc9e4604da09865e3a5f9db7e19f1c13420b07afbd84725095ffaa7f3f301937842ea821ddba3e138a0e2ff251d03830a885b5efa7f38492e376f610d89af18c7878e0e179c587d33c2e17241a570496e9ff8e0e980d8d7eafdea8f6cdb92ce8479f21d0a45855a41f5f20103389d3edcae037113c6777bea02de2fe919c021476b8ba937d1272dbdf038cf74e5bc7c94f25e85a8314ab2c1ebcb0db37daea22c2411c77489425be5a37509fb21dd995badd07c3c0cb55400f3df5253d856068a0c643ab1599a30844664e0c1234663f447a1d6eed317b362ca8574e724c263c29221231e41f980c8a773736572f282b5818220e34ee47ea2266f9291cc5ed376aba26385a5252e44d05a49755b1f7b0856f855070ab9ecb1a9de29a5b3920b3ceda55c0aaaac031f935e563c50c840f9002b49dd06fec768a9a258eec5b6aebb997a9e2fade8a95fb824c9fe7332528e62b23d82f99cb9e13e9a339f1f086a7a60aace5f34d2502a715df1d1ad9ce421ed1802f6acfcc96836e481a9f3963b0f28f5ac8381f83a7447e2cfe35f3f95276d54a8143b458bd195cfd4a2b474923791e8edd3ce383e80c9a87a258734656d7e82cc26aa4f038bff3d13512ca976408466f32fe5202dfef7a8bb8aa0b24d798191d8086b5a3ba1742f2c105439c58ce3288d19aaa535818ebcabf73678f27856da1507aea1df0202b01965042602c582bc9a3642ce2b04d4b0bb4fdf3d82fd3c4f4c99ac960530b04bf5fc3b885b0a5fc6fea3103ec3649f40ee24da9d140ca64f28cf0fe98d57f72fdedd468b27601cb5e34d34beee6151ed6e3c452925fdf6b9601d69ae3c36e9fff6d6a1b6af87b9a09c3f65e121e21d6b5d02e068098dd1394894e472ded09f085396a4a71cac238a878c215e7a955cda7f3742fdd1e2dc4348f9abfc46df4650e82373f08e08dac0a59ca8ffd419ca2886c891e88e41ceb85e10c57a915f14c79f5820ed8dac9a6bde0ad419198efaa1ce3dd2f30bfc82fb37103e7091d75c23ccd5b7d7fdf1ea49aade37b3e7fdfd9892597be68b47c912470b518667c28e7c8ed0fe339114bdacfc4b61ad2268929c0e3d49e77ea2a3a4469b79977e928b4deef31617f8d97d879293318ceb5c16ed2df4f1c0a7259786270836ed39ab184a0390e0d0d084c5313f9cdcfab7490c0f8df7f9fb8d2ba658aaee470524d96d90fb51f509ca6db5b0193f817707b6afe3faf49779c95976d57eb710498d9e7d4e1dbc7026a19d079bd8175ce4f98d07462f1ed85fd34101b213cba0cd73eeaca9133dc380031f6ebdac8f05eb29a4f22ba34e1a6fc29e5aad9fed9a74ad8ebb6463858bd894e390499d715c5140b5cb342effdc7184c53c33624fed2f9aa05e085cb7d68e7e3d425e6a08f91dca36e18c8061453bd980f41d85df2924f3903b1ca62841d4545f8ad8a4949166990499814a3db50a62730c88ab592be1209aeb8d2d5bcb3597d5160ebcc24e8601900010fddaf5842745be0b72359e5b90e6c11bcf5cad521bb23fcf452dadc00d83a9cec6f24184e90a3e35eeb3ec473cb0a9ece0ddb5418734231a399728a09387d82acd1690a66acd28ccde630704ca4e7d232ca5d37eec3925a3874581d181b7391af5d0adaeea556515a2a8e3b164a7b85adbf667992b6bff10356b3c3e085fd3d676d90bcd741577f000000000000000000000000000000000000000000000000000000060c1113191c""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-f91692cbc904c6920af9eff6f57b6134b45bda6ebe9ae873a39c1e0f4330b9bf87aab1b9261fba98fc8681bd292e3e83cdf26046b01439457225d4fe957d9fa30e2edcbe49c1e920e9b4e1da4144a7918c575673b5728a3317247c1c38bbf42ba2491adc298d3f93d9061053b72d2677a5b168927d1739bb0540b3eba64ad0ff3869c7ca75bcdef3e697ddd18282f7e31622773f49cd2de94e93ee48f947c537ab55ae7cf18455a3b0ca3a933b562c51515beee14324e51416669fb931e4289e73ad6180f11994f5202af25df3c01dc9d8aad259c310e8bb17a77787b6492316c1b38785e127683653c33df908bcde08f4d4dcd56f70d44f3e37cc978019d04ffe2b2d940adb6e12197d951ee44b1c6219d4633f750066e86d3cbe36395ebf0e41f124522a6bd13f6ba9e95271ca11e4f6ed4ff76c08b3d3449ef64585ba266255b9f331d0ef2d7ee81cfa9918cd806b88cf3d1eb2e2e8444238d78929c3bb8a7a46b54b346bd0597d9bfefedd0d9267cafd84b11dc0793dc4bc9476fda6f1ccfb0c07d494345b50859a686f39c3aa487b6709790fad1688703c27baa9c783b77a07686c98b66063efbfa5a8de3ef43c59760607ef2b775396f096e3d9e4bd4bdc30a28bb62dbed11a0f9b02c64c1b43d98c2da2efdee1edf36dd2883a67c619204f0a6317899ea0269bfe5c6708920401e78a658dc4dedc7b35f5249d706f70c8b6e835093cd9b7dcd3afbcd8a94cbbed4600d86d7019a9b96d10a7a0bb4be62169195ace3dff5ddaf4c18815789ef97bb91023a33c3044f14068553913af1726ab597c534ac7011cd018f4a85b6d78648a3a1e5ddb20bbe862cd31b603bb275738801de06fb2133af9eb60a38daf9591c03a6c74c56283f658ffe6e0758c3e732bd7c0dde78ebd95d71302f3ac2d8f362cb8dcb5e8df32924e4c508c2e0166524e9f183df5933623ad00019730d2e8586a14776daf9d72dec6e3643aa32ae33fa5657bb00ebe779e4e9489abf8f768b181826617893321310b72e58f751d7a0d85bf68ab81daf73389700b65f8d16c2b075d1ed4e8db23619e960945978bd2db49ec1e17a9b7dc62c8037f20c45090d7482c0f66a1099cbfaa74669a2b7ca33e009d2a74db56453bab247a5bc28454435ae4196d74749904e790bb9fcf0108a471278debbb1002c5474040be81778077d02595a6b55123fa463a84343bf3501405b84fcf3921ee4e58aed85b623b14ca1b921494b26cb1bf53f5129e1f2184dfbdcd6e33675c09b4b1af71415849ad88c8c8a39f28300aaf8eb394776dbe1f2663014521011e41ed7fa1300febdbb59923bbaf121bba4dd42f3811e5d785c5512cea5e2fb787b26238a97845a9a60402484939932a183995fbe89b34120a839a91732bd0e7ba6864073967bce180af23f6ffb12b7e47cccfbd32a52d28a4acacf8e7abffd727e8c586c93e72e246f36060e88bef41c42a4ee0fd3025e24e739b6a648cbf2211d7803f9c94e3fa4adda936e30813aa9448dfed56b8c06695ac3605fa8754b4e6f1308cbe5237e0706358e1fca470c60757b9880f471f6655d138cc1dea586fb6765b6e0c2aa4cdaff60a6b2a696aacd5cfd433fcc6331d2cbae3a0f260079b692055012a1b684996ab5fe9a12ddc6b6a04437311408f938d634be38437928406ce2fc62d000e92398e8b06ce73def5fbe7d9f3f0e63854bb65269c9fc96590cd312d150d8447444c0581a4f6f35aaa90e1370c6b676133f2f78f151f223ca2131f2d561b7d08f4f83b255d1b33b9845284310ed342bba58e1f3ae9b5285803c7575b0e8c9c3be2fa58ed1025d9e9ca20ef203e9362222ddc0009a7e33dffb4de33bbd0a0aa7187d583cfa935ce26890f63f97caf2afcb8aaa482b5b6dd0ad1570e6e008b28bd9679046b9118d187be2e7f7f8ad6fbe10094b1fad46f78f372f68fd870566afd524e39216aee752ff5f9fc8a9eb6f5adae11ae83da416b982408376a99530f1bab6119f472a1d45864e611bb2a474342000938b5f9612d876b4278596a00d3db2351ea296fc2d606ba494b07b0dfe846b04f9899af02f9116b415279470e35663fe7e32d3ff5a2162e9f10b1fe42a5d04b14a55fb658e86eee8ac3a2ad85a1171a9e001a7a3bdf834db3192c5cdda3b08d31fdaacd3667d3577d40e0f79f037f4538de224dd3ddc62232e50e61b2f3de62823d58437a7c7462fee714a29b5cc366617fd12bf924f86a3308f8e57609dec2031fba77b52cf2888df554f814ee984f0108e55cab728c7af61d1f4e4b12ea7d027788ab973ecb10b7d668c3e77f7ae1b4b05ab8cdd73b0722498079a246ebc7eac75e831aadef51153d9ccc0cf5e82f7c57a5c57d95f2e0f623c24e05a3e8497e3937d9b8d095745beb6dc6c7a9d20d57f89864088a1bfb137726742e2a82ac544428fed5725b4e78ee4a9c66ba91eaaf4dc7c6c7cf23a37ca8db3ce626cd0c3fb086aa2866b6ad8113e2349908dcf155426d1c208467bcf8eccbfb74ab2e84a9de986b16a3a4bbb822f5dd6f9fa0ac93c4af7b4b332b0efe11e66482215102e0ce72617c1ae45d6f5fee32b27cd5bb18416f3f6f11d13c75be821dddc55df6c5d736f44371456b3827cbecb9d06d19513b8ca24dd0ee4dd31e9a6ae9d1b1a10b10e5bd7acbcc562449da200aa2ad9b3c4663b1be48fbf0b79cb7ac43ffd106699301c4412aa7ada34d1166056ab6cf9e0daa73240a3b0bd1267acdec0b04d5eb48"""),
-                    TestUtils.hexDecode("""
-DBB70175E063054DDA24BCFCAF671F820D674F1D09CA173D4A1440AAF50F1FC8FADC1810F390286AC101D60507DD285275C6F97C0D2B2CF3C7F50609CEC64EB029C3DAD8B9954807E35D4836BEDF32501D0E7143BF488CD5B4D1A53C980BC70A3794E4392E4560E609B9C49900E1C56D319E1495D085440DFD081D1A7C52C0A8F64917834C64EF32A441C9045689DDD2EC218F58B3BD534F18309E1D780528D3BD1B23DDB3B18FC1F7C85324D45C3E9B25961FA5257EC31927CA35DB25E6FAF7669D60952502680BC7B5D777D77B194D0CC40372FC8F711EB048E01BBD5676CE3F2A9FEEAA4B5F29081C34969C746208E6F2329CB53A22058C0AE0852B7127FC4C74EB3A8300403F60B8AD1F95FD2991CE0C8CE452C2432B6422EFEA8AC0E1B53BC994C606301473D7855EF86687287BF56B450D2762C5E03AF26A987317C4BFB013A6BD791EFD141AB34718A37D1DCFBB63014F7F92C9E2870DE503452E271E9D02768357E3DEF6BAC5A0F0444DEE1FF5AFC79B3562C12696FEA15815B7D9BAA38C66919D137F82FE36B140B960E02966FABA1EE9CBAA04941396D665DD2C6B0559502577541AB0CEB066E066553A2DD407354123DF14F4B1DDE6B8C34E3264161796F48DB5319B3CDDFDFDBF5CE17BCB5924984143839B4EDDDAA8F0568ECCAD253C48D00687F9A07785A67B62D28B86D70E511AE08A525F66FB15AFD112C184785F91E76852DAAA3E78CB96E20249F38979031712440DB723B022E1323818431B897DACC51400DB25635EEE41761089DC47E8EA56DD0DF60B56FC682D000E9D660D0CF38C263B716359F41F3B190D201950E140D67F50287C09D2008664341A829A074F9629DABD88BE69A6058900DE5782CC621A91376E5CA31C66E3C430CD00FAA83BF765A2E6B2FCD20EEEACCB996FB5C4B63235142BD5FFB4390F8CB95BCD5853D0226F931C38FE972FBD0D6E10DC2CF29D1FFD2653CACBAB8B81DBE44A2B8F1C5DBDA7C56252E4B35888DFF7808B3514F4D7E5EAE9B51078E8D2E600EC57200FB48EF946F021CA8209E7DC6443B37D7281C73C6A3B43AA570398E62CD5ED9A34ED23AAFEFDB7DB3141202D940C1411CEFFBCED878C0D325E8CF7FDCC520CA3377BE97855827D2E6F4EC8786EA1374E006539387924161D65782C7B2C262AF9BA8FCFCB5B1477083836129DA973AB8B082324F74BC6320646448DCC8AB56582EC72EB192D3F72255D85FFAC2B5C62F245B73191A9176BA5A9FC0ACD3AD48D37E23EFA0C65F0423AB5CD0EB76BDC035112C7A118ED47C0E67E510A6F7A28F26C3D6A882EAE74BAE6CF1FD969FEEAF6B36C85F62D40CAA26B6CA98120D612598F360CA2628F6FD608F4E1E290B32C90FF71E181D4B72978DFCD189D857DAFC7B2AF8C958EEA6894ED59AD56B9AA6F83092EFECF9EC4091BCC9B8CCA245C30B54B9B8DFF3636BEFD417F46DDD2F6136B983CFAB532FB623FAFC3CC4CE8A91434377F4DCD1607BF04E431"""),
-                    TestUtils.hexDecode("""
-5c796ec117395c38a9d7fa1a02d81e3b51522aebf68f3fff55cbf7d584ec75e547d413562c4c87f28f57433cdbe7c96644619b9f03d119c7f87f0a970a46075cb8c29c506f67007470bb4843af6d3dd1c91bb3c2c62443eb18a69e675e3711a08dabee5cc1a03d35a1399755566dd2f07084a9039c7710ab57b380712b39cd6f3cd2098225785665bbb94f3761d5a8d431cebcb533cbee5afeba6cc877fbb168009b3f05f9829606055e71638b50f4c6a41b0b226134391ae0efae4cb1d2e31c782b55035cd9e2d0bb53fd72749de022537ad8f8ec49a297f9bc81d1ee0f5e6b96470d30d6b78f48266eea5d3d4805028f90abbe90232fea807b50323e722a42fb455f02cd2c6f5d932b9bc606f9509fe2b1c133eb12de12db0206d78b49154c34adfe204fbf5469a0a50301be999015c5798c567729b60b2690ed93db0eac4021d38665a3a7db7b5ad55d94b8cdc9171a00ffa3ddbea750e83e495f7db132fc253c82b6b901bcd00fe68f0277988a1b0b2cd1d051d10ee189cf971f79ab6d1bb641b1f3b160b4a4d095144d1f9ce0dbadbdf6955622a8b300c69ae67dec7f1b777f0266e71413d57b454cea0dcd8cf3c32b9bbccc36e1eaeb17c87734afde3feec5432a18ab9a7c6a1fb30e2e84af2c367b4f47529bf4e0782a26d41520df8ac3cad44d4e792af7f427c75221e4a5230e282bf938a6072574e23f4cd35aa49758829d521360db34cadf94f9ba90d5139179f877723150d4d6f53a5300ea3e26392399adb258bc8075cd19517cb70ed48ba9c61e5e5f3d245d45f44f5e6e033334dee3a95bff8dbad0a1f8ecedb431cd52530d7c2d06ebc8f1b80e5e30e746f9b3b3fc192e359119170e2216081dd908d0a5b03670cef41420585653521ffbdfa58957d06d7a0ed23088a5835690df344473f44b6213fa10832539197afbb410556b8046e06d814c2702ce1c50fd5677de3015575e42b78aea720270aa303e3a6539bf343c52ff933aa238770e7fda2d0d0702c1c7a829e798b0677c1044a7e4af1df817c4167909c158074a9933f364a1800e76234751e7463c78255c3d5189c2a3cce7c2e55dc55fe97131cd4255d92b3f9f5c888029d4b92ff3a544e25b80ac12e73c9a65fcf0b755ffd0a497c6113897ee8bfcff0dc8c9bd583af6fdb71523be596bf0753b25b47766d5be895dcfb63d7c7d9f6143efc509629d310dfff428a1d5328b5307edb41822695f56a09ff2202567ae1b80318f827e0bc29c5df5e4cb075f1d7c1cf2df62dc258544e3dea90239a1d997e52e568632e259def0bcdcfc6f9306c76558dbb30a880d41fcb4f99988e6a9186296e7a5a31c7b910fb2624a0400bbdc6fe0657865a6537131f0b0dd2f56e2d6e2201a843bef51916226577e6bb0e891247f93b5bc36c49fb37e458d363762c12b4b95ba75ac1b38f177fca6515c240c40007eeecea8dbef687a77d3c09f9b5bc5450231ee83294e5a8d0fa79430fc2e701ab39d3bd891e73a695ac6559d8a8b4dc4a6ceb7472ad032036e4aeaff3154099a6f2e8297c6e4bf121631b545b472ab316aa0a3e1192874793597e0fa0cf173a78507ea55b2ed0c13fb045a96acd9d9bf8cd5197f968efdd359bc4449458ac42e2efa187190790de076f56445f92a79be0469efa11c98992ec82e3a2ca311d76e282e91665f5659be663a33139e80952b444914fab59910ac08daacb6cfcda1dc75c00077391e2b38ca54c1e056968c4c41fe7201a3c637b37f48be5672828d5f20c06bbc818332f48e0a4c0cda579d4c114d0446896b60392bfb66ec8e4eb5c3e8932259c423025da0611e06b34209f35413be186d98f8494d18eb0b2d56aa47c6d72c5b57e2f68da8ec1039dc565dcd5c5937ce1d358d6c83ded381060647ddb52badec80e92a98dcd4be27a5990c85192e2989dc2553e3606f6e6ef8353202671a1f2dab2d3130946254a686121a26a29ac8553ef5a58d31f9607bf3912fd4340562ff48b38a12b7f4d8ef2e058c9c721467e0787aa0eb2ff53ffab5c2b3c40f52524d8ff1cd0df1edba1dcafcf983a9e8e9840ef269f9648d3ed8e7778e086bcb887c54e49c8848d21002ed58f163a6888b171a945a9269f410b3d541b07f7c83c0e6b80dde9bff6c3f6da1f780f52ce0da11c196c0493b6765bf01aaff22e44f2b538672b4db58a616e2d2a36b1a20a618acb6e7523546e61c8ec4b593407d0ccaa0ca85d2db46a6cf188939ed9583f591499fa436443287fda7e49602dd8677f171b487e4fd6229de805f4693fbc8f27b52f283fb0384a2994755c5a6c0ea99a8be6f6f743d05b75405f9e70d68d4904b258d0f5f3ad0b23d62767d54ec493f15bda17b34c31eb50210788d38ccd4490e0b65ed46e50875da092c35b0100aae8bc387ad595be005bb52ad0f3281ac662305e0a62ec6254c4e091b1fb0552398b9cdcf2c12069b90b6ca5d67ebeb22b6aba91a7ddd85ba31addb18ea61d98429e633e5296eda442264dfd6bafdd3f26c9d6cfa7d8c89f273c4058c7b88ddcf79d7cf5c8bedc4ccd69c4b545a0069906c12c0b5dd5514cc1d45a50173c4f51e0cb89e2e56025539394be823889e0b7cd3b2563f756bb6d95336a22a1f84215915507708fa18e425a6de61a7ac74689bd85bef8aee1a48226a96ac318bb3d8fe95be46eebfda3662e04741f93995e5c30b1b3864feae3b476f341c473d449f3d675c3335617a201e992e9e96d35640d0152587c7edf50ee5542164e12d268c0bdd808ebe067e4891172a4d765650decb3e9baedae4c39834b5b6df1c8252a9b588c30b25167c543f389f4d4db14fd1319161453311572c85bdb5fba5886325b5118b6bdf774c76fce3de923761e22054867a19a06e2f84463a737ee6b4f42cf97e062db911ef8dd2a6cfa15a4698ab96c9e70c7823956665386aab0ae235b485391542ff57967b67274a4a308818ffad47b82051e674ae13ff73a111c5da089500f14c7d05af77d777c612628b157f3a921bf8b0cac0fb426866833ee35a2176653dace88dbd03cbad446bece7c6177373db768d561aba1d86ef2a5680f5d71e2c4e35832e8ca69de760893f3e6dca2e9b39dfbfa2bd4e1f3c2f5ac06e7b07c9c3c85de16244a273385f9014263614cecc9ba3bc1679d8b2721211b7fe7fc96612abc39312d8d05dd530e9e6f00977bdb27b0632eff254f54213213f608177334ef02f79cbcd5062c9b50f9c3ab14a8fb019d0c2b11ed1a5f93d769d3fa14eb3a7e2a96c738d1a3d62dd49a5dcb34ddf6944c066ed1d4c662752fbc961eedf9606c40922c43c543f6c79cc4e91432d652c6ee492679f84ddf1e1e6fb885af725a63168a6c6eac8cb180fc2b71f8d83112b81b168e96e42d3f069b69995c351c6b2bf1344f98c5fdb2f3fc503dd6ccf5cbc9a1bbe111ba2380bcc2392cd3726bba4afe7dc66a103a2defa50516d7d0d5bd058c7361bc6a81379a6c48fe76e81cccab97af3cc2a96d4abd8d5399c8ebbec651320d66019aeee16dd9e126a4f6b16ddea40a36f2ddc9e5d91bf8d5a39cf7069ee917c23770c18c54a5d2ca8f23ca2c9d21f9003b7381c077b7607dd3e3b0c34cb12c77ef08547501085370c6225e45c40069c87161bfb45498397c5d714c86442cb1489accfb34531a14199cf29e0e611f4047f22d40db532956a20c8f5561d9c6120a80507c525dd8584d60f41e999686096454475a2c92bef5880e554a09cda2238323fad2827d9ba6cac319b01d2f89d708a593d660f9c19499328167c5843ff20a17bf0ba26c8418fef3ad764a865f471099708048a624c39bc7ac317badb19226d8c0943e0fb8aeee9789c0ab6e43f932621e89c424da8a6eda10b936218264161433976904836c0c913b5a0f2fcd701ae18ff8309f583f75946a02b930c897aa85ccd239ce2edfc7dac8689b8e678b620cc853e5dc57fea9221f3c5ece3a1484022934d9457b6d3a34b801baf8afa4adf307a8c7b6092168dc5fc35393f772b576345b2f6e1fdd9ccf27452174b8ef6bde9cfb37dfedc43755be905373f54e13a1a40c3757a15bc36aa21657ae4a64a16bbd4463fbaaf69cf4778306876b62abd4305d753da808f0728c3f51f838b640be0c093b732595b153e2615da3c0d5ce5801322689ce85f91767bcaeb81cabc3baeb76deb7154b79528766282bbea6d026687d2f823fc25b97ae523e1eecdcbebf460b447b1a2e677c0215fbae2da1dcd182bcfdc912b94c732b793588ffb0d1e118d02b093a3cffa510d159ccc74ceea63ed881ca79957dda6db1329c22c10a082baf48fd6a2b635b3f1b896e77087734528d0943da51d31b1619e549ee1366e9df05d0a356aae84cf8f3d0c8fd5ab534a3524be784eb0208501f17e3b8f70a52de886bc691db2bcdeb63f7bd739fa3dca52e4d44a7b6b57564f17076104da5169b46d47bfd01d2610a9fe55129e6249956233a911eef491d9c5877e55585f62f1d17a84bebd25738d11d830c2bbc5b55d7fc60894f4db0bfcc6639277d290ebffd8a02e4d0593f65223168240e528822a90d4fa94febfd55e5562fec1f279af1bf7333d5b8b8eabaec3ea262a40586d8ea1e12b3b417789ed00010f333a787d86ced10a233e7385c3d4de1c3450557ea5000000000000000009111721292f""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-775194fa9e30c689e7302d8c2fc00a7f00841fcdae64e399a53e0be695466306a8c2bcff2f1de6a5c7b2034f2581179849bab2b4166de1c203dc8c85878e9309eecca9cc75283fc90ef0e01e172630a1fa8075644c31e94da3d541eee7e08a1c3bcaf746798113c7a7d70f4eac26fdc630b692bd734e5a65b913133dca7d9a432e2f1195d4a76a6a011f2577a1699ae37852fa0ece9f007a429411282115ac4d55d1e7f073758e8dce2d93e2e81a857985a6567d28a155a0cc1dde48a3abdfbba3e562acce270827c77421780fa60556ccf9764f636cc54d094e19155267985d066b8af7a7cdbd0e76e18324bd77d92aa27795ad2f9abb5d68d0f768e1b124189b2078d133ac72cdf4d9d697c24aeab5684386c81dd11f5bff5039c0da8fbd0143278660abb563248fdcbe666a708ce2988ac38891a4e953913fe544014b4f05f75a92b14e29de39eb008b6b23875bf02076518036aebe85bff546d326d9bb9f7226271f5f6b655a8824029acdd548c075107e8316c839d9e4f94b71ee49ee62101c3dd49960eac7c6bb9f113bc7ae4975f50dfed974dcec3bcf3b90c77211bc4304ae5a73a277732ea37247ae7410858cfb053316ac2426bad05c656c6fae3f3c762b384cb6a3626dd14006e9621d3615249a61e39d665f516ae5720ca55f5a52aad68e5217a0ea27a8a02a4c502bcce7d9f80d5ad0ef395b9e55bd2b6f0fdb12cb7817908f2907f8a625e65a13d7947f15fab77009aab91ecd20964af49d008d32fab27589f393a36c088578f7b8207298cd028731b614ffe2fadf0b25b940cddc8b7d80c3885f437789d5bfe7668d51cdcf0db684fb4afa7506b828aead4fc51964af184c63e94424520c99a44ec01c1d7074d09ff0bc8408a7a6cc9b1d6af804794c4d81f71828e3ee97901f92d4a8ce677744492e15b2499ac9424850bf89126d8e7e895fafc2581ae1b593f9bdcd1eff97ada3be693eeb7316a6b41ae9cd719d7e1b0e9f41ae109a15ce1dc9407d01941826b7523e2ca34e8ca07ba1e94ca3ae63207c6185378dae26e4c675a676406eff2e89eccdb516059edb647c79aca7cde5a17f592d3334346b3148b34fa723f4a005a0d16864128560e805db41c6eae80fa1d8f0a07ba509baac7a10d0d34eee421a01a4d752853bf8cf5474109dc49d0a2e25b08cf36481902f911031fef980c5cdacea31f22949009c540e033e21495e740b559b3065a1ea6cb602979f331000dd442124ef0b1be09a4bad6668ca435c34c2a20ed8b254b12bf84992b43159efaebb5bb34a8cdd692c41be6c88dcb42e802f01d3a1ecddb061ff829487a3f5055c6aee621a811100ab764c7a20d662af257bb0def598e59b5d7c3f8729e5dc55535ad77e611fb20662a30f8267d20d8f60614e2a71585dd46b6762b93696bd012ed319e7c8f65c253bdcb977c063499672901214616d8f699ff0b04fc074384c648014f15225e5786fa1534cc85202db0213bcb1e494fe0da6110cc806f029b27625275f9b5bd783e86e494795fae430a042f90485cf18adaf974344d43dfb5ad13af1144e85ee57836702b2133774451a7d51007370b8d621f155980a417789537f7e1012ad2f9c5e70a579f7affb84e3a41cbbf33a1dc197776f816dff08e2e0f7e0537f4fe16589c66fd28e36feee9fbb959e269fb919f07ac55cd424f6570a55bf0514b86db71bf626786d6ec56073151b97974ae857eb651bc6a3866ae5fd61fc16ae29db7996d277b7f6c85b3d78928f4c84f0789348bf122768e7b17577667ccb5b7bbbbe5373e1b5aad9c3c4f7f3f1a96d6d4e42ced4e18760068a4a667550bee909946e57d5fdd66e92cf2bc195b5a2b2bf0214210640891a71f7be9aceebcb9cb463dd8b02190ad9aa006413c2784d468a2730ec70225c2a8eeab4c12bee8cadaba579c3db5b3f4dc210994e1bc26c8c548b9ca340a658368a405db1efc98114e24f2cd20fc8743261a262fd474ee6c7f254f89f0cb6c16161202342a8d1aa31e7d8a829a7e1c980a62306e7a3032f4addb96582966b56b37818875a14aa80457bb281a87ce72a5f90b0b30ed57cda8146f9dafb2d7e8ae79e8b0067f3323337c799aa849779ebf718ab52b8bca6a660795ae5a4adcab49f9f5555c1241100962d2d8f1c78a330b5ddf49bca2e06baf77d8480fe32570dc55cd009e94106de4cbcb6f0efb3f9b41308a5ce341c573ef085735667ab20ce51320df124806e7afbaf9cfeb57ada0aaff578056993aa5fbfdca313b1b0142e9159f89f25def669c8846feb01d2e06c6a1c1c4faf302330fa223ec9b52ccb85e284a98007e61f889bba87dd520f2f9d836741d01112928363a1e968cd77108fdf0b8624d5f01cf4af2354377e70c61da9ece5c40e8bed1b62da6a3c9840975bf8854f075812ec58c4d814d7c0d0686438b5d9a2bf273a54be6930e336928fc04657a17865a073c6ec72f8eac813b9e944edeab724185c75ab2910ec4a9b47d7abbdd41865936fe5cd7778bc0fa0db378c73e404c96f093123b183e5d9da04f157990bd3274892681d40be1387f96776a272300f2b3ce6d581a8faebbff01e6e0d5aaffe8f4412cd7bf3e593170dd0e3fb42cdefb4201e4448278571ade12a62f6ec6240951ee8e731a0f600c7c008900818bf46a585d64fc47d9897abad71a258a35e4ddd78607b175b60e3732ea47ec5e06b1cd47feed7f4116cee6e0c815bdd06e72c9206700e10a60deb5f2a7c03"""),
-                    TestUtils.hexDecode("""
-5F8F32FE68B556ED1D2EB8D2BC20AA36DEC7900F8E5D4BD3715419B28771E5B0A080DEB2F3EA6CF415D40EDA46FCF8A439954471B7308D3E4226E9D5A96BC22B08FECEB4C5E3CC2239473F1C9B8DFA5A29C31D499CEEAF6E34A396BF0DA53B54F1AA674056216756DFE15F669FC2E1D8E6F67BE5BFB3D5703F25D62D3AAB0398AEDEDF7C65E051A4A8DDFC725EEE940BD0D06B103EEA32D027CC20A8C61034DC54BD5533CDB1A85107B9CFF283FC3C5FCD9C3D6F8857560311AC2E0E31585E77D0806F9A4E61A70D3FF36895ED447C55DB52002488045CC358A39475BFE8456F4FBC36005218B2CEC1C573E41BAFA7A622EDF776C8AD340680C1B3002F69D3B3D8844494EA9F42D2C9C9D2BC0BDD850BA3C4DE929C1DF49351219F95EA7B9794827FC1A1BB4A6A00809393BC41852820569D7BC6FD55339925FFDF55A0C2655C85144234FDDCA91E8BDCE8CFB7199330763F5750D71CA8C4B3BF7E6469F5DD68624BD6D5B69E5FAEEE53E3A61AE659A364484B7D2BC8A85BE9F8D35C8B97716E8202B610BDF878C1BD83187F7892BD861C09FCDA64606A185B93CD2F601C3107D35B38D76D75AD6023AFDD95E103EEB7283379BD9E44CABAD923856A599B719A18FA836749E5BA95C79B1F2F1B443CE1FD26CBD2B74A0156C381BC270B74FC42DFF8D91DE4ECDDF3053007A09B8E3C964B90DE55DE5193F218685327D8C0C6CE3BBABD57DA8772DB7CA9234A3D19BE16A895E7D14337FD9D50B4A556C75A9D287B44BA5AA4E52C3262218DDCEEE3A7BDBE1B8175E84113F515623C07BAD4FC0985112DE4D77D31290BD013562D12FF8CBC5F2BC463223AA82991D7D60E38037578BBEEED70631CEADFE49823EA3D87EC384B3FBD4974C474FF9D47F467110EA4F3FD94B5FF38D8FC1C75392896394671853FE71DDCF7730C70ED26485F395F180D2F5C31AE0C2C20691CB4BC81356225E6A72DC72A1CD3502E42C22B594118D131BA5EF95F2C18B3061139B047A24E32197F89780B91D36B28BB5EC6C03232A3CDFC5ECF687BA5701F3958FD87FC0C8D09825E8BE4E5CE9089C674049C38EC5E0FC1AD542F57B4770B6E5DDA215D319DBFFBFEAD9141647A508E271CF3B0DE7C137A5AB999CC88082FF0CD495F1F1FB1E367B57BB400D8697B4620B75FE467D9B8BDF9400E14047576B3AD6AABE0C0714686015B8A963A0DBB68CE9E41FFBBDD5A792920916538E4C33F12EF0E93D249E562B71BC1C252E1DD8AA646F8C7B489A2BCFE7D29A6D3FDA2C21DDD78179861AFC766F6885E9959F753C66462DAA6E01C8B06A6F581104B583F7A5B1B4935A4EF08219FA8D114A963F3FF3AF22C3D1C1E3927AEBC886AD0670FC89C08FD4DF68EB990A0F7C51A4439C32F5F51785B20DC82586940C35D80A91865C3154D6C925250B24D4C1A9E76A267711A0813E8CCD2DDE9748FA0464006DDBA963BBDABAADD377239442DFEC6F7E8098604645D63AEA080C1F749CAC589F77B4AE0955FABED757E6576966D539FE1BE5965D03882279B2C9B6899205C9DE8D0B1819DA8B5426E573CE785FEDA3BE95A18A667AD5AA8FCE7894BA11A44B266EB7571A93CF9FA64C1132AE07F0F24773C83DED2C2885D415ABD96A21A0381811D66952252786C39EB68EF0B9B03BA7E2B66A49BC6CFCD8097C321A932E5CDB11EC6E43A8E50DDE01EA5A28F08F5047C67C988E8B4A04701A0237330598ADE8EF8F801A07F2148B44E593B0ED16DA30BF37A341073C6A92066645BD7042C3A59B374FDAC00F7F69BDAFCAE5EC0AE65FCFB785C93E49102F5A5029876BC23B0FDB7FBBC376A9E834F0D19A276BC4E22FEDA18FAB529F15570AB674B844703B47D726AADE3AD4015F52D86843A01AD5DF086E07A71A0236765DE6A777F94B1D69253A424193FA9DF54899AD9915634DA23E6DF351E9608219684EC8C8C949E900718DB6FDCD144D0BBFE1079C1BAEC516BF60C1E24B8EE6DC380F55E0F65DD64025C937EA89FD12F0404ED0C03CBA18CE2FCF169F9A1EC9B96830FAD0149D4A90B13446347CE4E5C6005BF115385F1D22EF6A7E40EE87847BFDA4CF7FC3135C4164091F49DD08389E1005271E9AC76E27B0CDF360EEBEA9C08E233CA58305CB276A8BEC9686CDE0E2DB5CFF9858029F3A5A42759E4AC6DD40AF9617CDEB03FB1F9D7F112A01B87A265C4E27BBFF596695F127A97E1558A68BB5EE4EF0F44D20F318FEE1CE988051F3C09AF6E142932EFE970C1B0C07040E7F3DB9BA53BC4AB1433F7A4F1E480D920C23A07223D7E43570320B3BA590507D580D29CC3A8C85A442BECED5880350F9D2B1AB5C746C1B9909E446D9508D701204F2427F41E043A78024EE3F60EE19B71B5BC925A2557FAA8C7BAC7E3405C920FE3FB3A1BA7C559BD75DB1E4169804B6627AEF19AE6E41B8A40CFB977C1AF53208F4D775A48C220A756783F41E13B7780328992947D215C5B5682DEC76CB035B41C007CE1017EEFBA426EBC423F710C1E962528F7636F200C2E79D8377D621513BA7EB3EE5A0DA55B81F6039D2E8BD42EBA5B2A82C3F033CFEED6EFA7D970B1460CEACD13A0C67AC0A7EBE7963F0FE21D20B2A82EA922FD889253B5D4CE4D47698D43AC11A8F4E1638AD3A4C179C522A3ABBDF420DA3E89B9FB7608822904944CAD615C62B28EDB15D3826D33DCF9FF9BD5DFD8639AF4CAEAA55F9F8409B4E5F70681BB7861F88283218E15A4282E199BFA12360FFB9BCD68D9BE5A3411FCA4E8279562F595FAAE0CEED4FE675DA4A8FF94B180AE9D0C8C687650730F05715820F67248D02EAD4C7BC0D41C880444B94CCD60A66A1C9B5B6F6690A2E1766EE10B5D03AC16F175603A1B9D49F97CF3F91932E97DE67CB523A38839468EE7681909CE997BFE5EEB364B472220403EE4A9AC1F8A4A8F78AFA4D9010A0127C0A75D3CDD87DD269F19A47C78F696218F25AE8A61073644A4F791ABBF1B180267AE41DD44AF65EC6E0AB356CFEE86095B64F4190D69D60284A1EB42744C31536F736AFFFFF186833EBBF43709BBE6903A06F7F06E8776D2AE41CFCA33A3A86342BD11B67EC10F525563A1843C8443546C1EE61DAF7310802AE9C00F44DBE7E04030BC4D0F53AE2023A7647F08A0BC6F5013A61A84E994FE0A20092DE133FABAE3AA24F8F3946812396B0643721AA13417A2423F96CA8A6529B0E17766E88B2AEBD79AA9D4D31193533CE50E4EBDAEEC976F156D5DE5917D54F9CC0527BB4F1F795401210739A42D10A0242748DE5FF6B50932B507057EECF8A1E37800223378642DEDADB464F5CA251D73DCD28A1E3772CC285A33B34C6701B585FC03C94A847CF7B16616D1C3DD646669546D80A27E9DE6424AA7AF6F1694037E774259308E71E15D7408BC1EB517CF0AA2C9E16B802CC8553458BB66D96CBA233487DAAD6E093235D901CF46F31B9A060D88DBD0B7380652EFC73AC1A6BB5E434EB0394F1EDC937E9A99A3867EB71D6E19622137B009D36ED7F9890187CCCE7D884DFE118AB3682EC08CDA8BA6DD4B79C9C18E7438E6914DC1C403870A540B74244964CA31E730A7D7591E42569532DA8094559241F2C7EC182FF8BB5A3F88DFCE3020D8B8CC0D1F54CF67FFD3A97CBA7F5EC79333D9A545221C963E0685763E59F1EBD34FB2394727896CE638E909AE6DFF41D17EE1D0BA036F8AF11335A8C1B5A0E9DC58EAB9C12F46740493A8B5AD0EAA73AF462BDF43CE44BD0973688D9C8DFF8FED961758E1AF88FD5D249FFEC179FE5AA1D135C0448D80F4B0CB68492CA399A3916A2EAB684B44E407706CC3C2F48972BC9531353091F91B427FA32693906DCAE862F34AEBBAEFD30666523EA9C27354F2FCD99A6E810685B51965571E4B4B5AAE158636497B6F952FA0B73617AE35A8D7C272DFEA1CE06E983CC65A501F73BE9D69EDDE6A4A1764DCC4B74EF09EC27C74B677920AE8C49CF4F18160E04B5AE7EFA8D5D92BAA5E4E547CC8AFB9D55F1A9DA7A6AA06626673431889C9996BE0A473702450B960231A617DF4705B07B47DBA1BCCC0EFCD5713F88F394EC4BFCC49EC24B76D531A356A6796785D755F027C664D8966B5CDC82ADE776BEECA8AB0D9DB6ACF5E841BCB4381828DB8F7358A637D04D97598A8B3BC823B891F5EB6ECF54E6F9200C380813FC3210E68894A656796C9A5B780FF486E6A93DE055B8F658FEA17035D9C212D23BB5974E1161E4F6041E5AEC446D70D52CD2F21F1A33C9938032487D9ABA74C448EEB8F8D51169E8B848242F5C769B471F0AF04E965BB0F4AE7C6F7B4AAD4E283DA762DFA49FD01D21887ADB28781FEFBD931AD8E2A26BBBBE5D88B52E8B7133134CA76C6648EA39E3D2F102177F4237219E06CBD05174D503C9288EC9C3E0128A824A7ABF418DC45EEB3A67777F74D6EC52891EAE0BB56DC756ADF40D39151E3A68719C563E99BABCA4C785BF4C2BB1BD25C7EEE22A8B0C1E90B948FC3A691670E9A3A331320CA4416B492907C3FE70AF9A2E765F9607EE1BB2CE52D2DB15F5DDCF59BDCCCB5BEBAC2784FA0896BEECF38C24022046E5DAA7607E8D2DB8CBC65541CFC6A0F20CC3AC5EBD4560BF5E9A3FFC0BAE917B479D960ABFC99EF84A696CE5A95720FED90F3AC58D77D48BD5573A0D85681238AC0EA8F0B58A01378929C691C146068897C5642DE74D79E08E5B94B101182200FB3E2BBFEFC8B44D2D1203075862D77A184B25A7790D76D7CE88C979D73E599C212F04A8B01EC3CD6CED3B5E25487957C56BEF6AB4433FFFE6DBDEA396212A6870284FD1BAACD5F7A5D9FAB90D5DA39D3C5F9AF196D9C46100BF45861679A7679638BBC8E5B5A7606D863478B430BF2C61F52D3D88B0913BF12597620D337DEA52BEE9CC8A1592698D23B23815C596981152C99453FA16800545EE781F24841FBE5A3E5AD8D08F2B898127AF40A681DF9DB68681533C349109C29D19311BEAB4C2F2DE97A5345EA7E41CC0988B2042925F1F9409D947128CE1D38F278863385A19B2CF8338D0FF31B06FD865B9167488EA157C7965F4679286077894660F17BC7289BEFFA93CB7DB990A0E40D998945A77E536902FBAD3C8A278CFE0AC883BBEA0B20E5D70EC6E10B59C2449CD1A0B55F8252C91CDC87E70E72FEC175D6D67BD43CB5AE4EE9C7F9476F4589E2BBAF89E801D5E14458F8A0B96ECF9F080E5150E2A5004C5A89B735639621157C4056DD1106CFC727B921D5890F37051E2B906885C1CA3999C18FB8C9FC9B652D82AFF074EECA9976D612ADDE990DEA418031FEFC4E972B31CBCBDCA0469E3966FF6F97F9788650298DB71CEDFC04659D30FE673602659C19A869FB3EF4262EF3FFA9E3FFAB1A3FE7670061EBB0D49BC60AD0C774913910E26E4213B76DB72AEFA3CCC197CB6F6DF773F86F12480B5BBC2068F61E16D1C0C141AE6F1811B2E0D713AAF60B90BB2F00EEDD4651FB5191DE5A246A4D8F3E9999D85253FA705CD4B94A6A64D9E9B6E18BB6855CAF6B991494A8DF75E56C2A427883E0C27246E5854B8DB2EB0FE639BDD00AD678D1B61D799AC59ADFF6A8616B357A4B12A786EB612E5613CDE533D92E87D51D47D860BCC39687485EA814DC5F5A971EE915C193ED52AED98D7AB301E32342F3D207BC03546460D33B733E1008E48D80E716FD717BA82403DBB520246AC3BC9CB91CC0ECDB7E35E6863C3C11558A8EAE9E1DC49FBFFC0F92F397828A4AE7107785939B96932B9EACB6BC6D8B3A189B5D3F6B0C7A3A413054B25318792AEBA3F4C77629F1E8CE1AAA98FFE1EF50C2E60C11AD76EDDCD8EEAF858364ADD637AB97ACBE4D2124AC0AB559E85229F1B5D81701EEB1D6834FB215984E9DF3847392EB29D2A428DAE7FAC283F93C8FED86FD2377E8216922D46A51E628091F6F8EAF967740B0EFD84F002358D3ABEDA0993DA16D0D8233090A2CD9C27D78DA0A53962FE7DD282B276A30F91C2B734EAD2CCE5E03137205BD97739F6CD75A08491D4ECB22591A6FF840B5DF123FCA7DAA98B11C85C1F8591EB988024C206CDC4A4239E7A91DE75F49541FFB6D91BE4699C0C0D8B4A44A8204F7E90AB863C3183C2270D185643D6A7165C1D043FC5108C340650F38A8FFBB13BE4BE68858C50A2463F7BE998286FFD0F981B45F5E414FDE71637D6EE77B33E10A530C630D63F21A212E844C2F7A26BED4F7B4DCE0C566CBAEF4EB4BDF2B53E743EE13A845D3C7AD5E9525C50CFED35DAF5D993B6377CF1DFC5236D51151B046F4904A02D7D51B6E331754B0E3621DE4CAFC9D8F7247788DF0EA7E6141FAC4B24608282AE29D594CEC0C82DB05C0087AB377D0D504F64F1CBB2D9F3121087AB6F35A70ECDDD15C9AD2A185C16333BB901CA069BBB0B80CB6F505FB3F382CED72CDE60FC050241B1D32818D11AC4421B66CD85D0F7B479C021AC111F8EE8F1C60B2320585EA276879AFE4034DBA277806FEEACE548CA0A5D36CFAE7B99ECB0236CF4838254A20A13A2DEAAF201B09FD027BAFC3F0C5ECA9EB5850A58C6196645F051E57B82AF4B6C2DA9441358BFD2412864950022A07542601631A00E27BCE6E203B1D3F1B844CCBB2EEF71A12AA4E725188073004849A225D733C77C068B0D2AE53E0DA6F759A8E7A5486C529B29A3EDADA69924E7DC200158DB4B612C62039B321CDACE8294DBB1A56ADC685B0B0122A4F3DE0A264F47B00C903BD30B5E4281B0C75DAC5C48E18BB0BF642F8C2CA194AE56CF7EF3B4529FB9271774108C61198A6894FC9FAF896472D1CE78DF00E714045C5F7C77DCEA45B3ED5BE5AD545D8F3833206340A5E10DD3375BDE0A068D050CB4C87E0BA95CBACBE59280BD5CABCEAFC88F5C05E3D8DCDA6B15C487B62B467E093259230D47B79F36572972BB78F90BD384255CFB1E4F1DFB7B5360EBE1230F154C3645A7A233FDDC472432F6C845CE86B078D93A5BBA3F8800C5313593D66A8A103B01377FBC5C6D5FB8A55DC71EB0BC9904B24BAD2F505D6DB5640E914D84FC71FA058902578B72C47659AC07AD4D64C3D28328D2DC8425C4039EFB2F20E3B954BD0B0483848F2C2D9528214514510CB0932F7506E9B98D0E891D8183A907FCA7AEC068B9FDF7F3479A128C6982BED19512A4271D8B682525B5028B77D6B6301181B403E5F62F64BA3CF06F0EDF321114855839E9198E5BA2A65ED952B2204809215B9BA3C366FD5C9D409BD71ACB748E653DA82EBF617D2D57C74CE37BF20AD8D789DA53C086423D86F94A96ABA379F3425554BCF92F82FBBF5C2A15947455D7D7478A84BEC6E3B9FAA14E425D2C8971DCD157C1D9E210620E891AA4304CDEC54BA7B3352556C49A172EAF19919184CA005A526349918F9A7CBFEB83510AD899BAEFD3D1F689DC3F449153597C8D21FA1C7BAF18E689B51F89B9BEF196193B7A781B96B38B9145AF7338FCFEA109542BB1719C9C8540B551A35F733C394F7831900452C0B8D36BB90824699BDB587EFCF5E8410E4ACB8ECAEC5F96E74A5DD3DCD4C85720064A14028FE768041BA1A13A46CD8A0D2C4D09E724591ADCD5EB907038853D8C92C5BA7FF57D5B54B2B324073C7CD2EACE0C521254E9E5C0CA197FDB3C1AC73FA8EDA729A858098E6F5EC11A19D4F655C6DC9AFFC4E67A49EF62D80EFBCAA383DD3DDC22C2A9B7590C16F8CF23D52392186B95EF9E947D851079C35FA11595682DF4EF4D770EB16CBC3994326B8AB3B2C279149122D178BC7B53318406738290596449D797F61B3D0CC8B11750F8D841FDD9D333A5FECC67CC7733824BBE257D40E53B43CCA19C95ACCA8FFF393533AED57D423BE0C38584A81689248BC7F78CB7FA4C94A7BDBF3015B4072B83748E55ABBF4A334AED679D89E2F18BE1B249B3F61363C79AEF6E1FB09D1948610F77A9927AD6D57BEDA02BB1E77415DD7FDD3EFC683AFB1E20C08284B620EB091974FDF8CEFBCEE1461C210E81E86B61F2D5D1882261D60D60689E39C81B981EAEBD9A42E608A34155516E4E385B86BF0A4AA05E3F99B6B3B7E401724D1442A45A696A189765BCA3240111E9259DE161DADB4E0ACFF27818C631A8A2ABD752773A83DC29CD619A58556040A7B27CF56086BD499F8B8D283683377A21BE120374B8D4561AFE781F246AD987E828FB40306366B4BF4C0B4B909ECA91DC85F521ED5869A2F2AD58C74B6C959AC71DB6F11503F026DFFF6BDE6BD70363B5B38BCA0590A5AF2A1054209A36B41B2A671293F2805568400AB282F783C356DDE30E0F87C001D9B1B9716A7C4021928253622F2DD156B3C3038A077A5768AB8AC070BBD9467E9C9630754934186BDA122CEA503F5E274EAED746065CA81A2702B582E82A33CF6CB3917D451FF59B0909E6BF847E6B610DA89AFF98B3323E1385954EDF1175C0C1B158CB905BCFD9AE7FF9389ABB9FBC5194A45DEB0570C58F31D914F9941B0242717B243ABCF5A20676051978C16FFCAA8ED2EA23B8323CD58388860DD64FA39971F9FAB83A4B248EC8161D32565917B7E6EB4937B4743C6C236E75E1747A1C83377FD1D927D385D81A9EA7F4AE5034097A0A77E2D2EB1943D3128BC0134F2D600ABB929A5281C26EDE1C12CDC80F8EAF2E893091EA274EDA1A246AEA3263E43D6C60043CFF6282AAAC620A21B523783E0CBE33F78C89D00EF8920CD53C6EC0E83DD7E1303D9B6D5280BD2BBA26376C17099758F34C22054DA031C86CC50367C81C3059114A71C565B1702981D77040B0FEC1E89436ED1896E93BA202F11ED2BA4EF33A76F86AE8E23B8FD064C8FE894244C97BA7BDA6BB56B7517C236400F591E4F28050C2958A7A79964AF233CFF8655F1603F6A0C7ACCF440D0C82D5528876721434C163D86858B02C6F6A660F53B3E45185FC7777A629C3E4392AEE4A96D900B0F19783DCB6E5028B6E56E160A37D37FACD7C3B992773ABC8AE1ACD6AD41E7340CB198C9BBEA1CDC185AEEB51E2620F0695C2691A29CBCA8E23328E84B6882A59A8C3C2A273CDBD26965564F1F1DF0B2CAF83F30E782C049DBC00596BD85426EA90ED30ED8EAE8A88C0D1363E69868E8CAE56E8DD62CB36D9A15150FE567DF7DC93CE78706BA983885155C9AF05B5FF1D0EBFD9D020BAA9196D9C871236DBEE8A703BE458938D3C882719881BD49476386387DA3508780878271C0DA821BAA1E9719E437BEE6294D8E4E2483932D0257B44B8CCD8C55028B3B7D2BB3866216A7F52CAEBFA0FBAE120609F95213BC05AE24473C98C29F4A46D985336DF8305787A0374098DB279EF0E34E6DD79BDB106EEA24E4DEEAB6DF35C58AE73FEC926174E0942D242AF0D30825274FA1D510D1C0C41FFF59A4381CCE5C6B89AF30C41733EF42E76C9CD58DEA7E881706843BA04E3A170304C551B6C801CAF9B8DA52913D2DD4DC755E0BD7C723C4AA5B001D9855236401C1014507CCB84577749DB1AF29E318241D91C4B23BD80549CD1D6E0D793E966A8A7B755552F16D3A1146B0CC6D92C8C90E97D7EC8EEE7C365697F93AF257BE24691E41F2AD26BCF47D52A1B80F5BE1C658616537630088CB6E227B0EE6EB8DB2FEC0284E58202A73CF3AEC16BAEB59D2A6E0257F0ABDE5926D9A13D89A8B2F69695BA3682E87A77DE06FF54892F56581FB16991654F60EA22856D6FF9E0BE2C4837F0C1F6C54E840F67A75185F0DE9439AB1E37D4FB3E9757B0FBD17C89DF8568755567C390032DE93E9C93E6C89B2E66E9E9D96616919D9FB461F9F33"""),
-                    TestUtils.hexDecode("""
-02dede66fc74f94ce000d6c4898fcf4464b834b848d2bb2d98d3a5862ec632dc9636201321c793ab26e4a42ae4f13debf105d087b112849946c76b54b801382b9727d65bc732a5620e8f4f158f0c1737b0e4ab8e7404383f76c848b36f58f5f9d70ba14a8ebf622bc848a9bc3e116fd7b2627c41ccaea47d493ebc6d3dd167f79fc6ededc36c809ac87e77ee1b006e96ccccafb88d965bc1cc15388e6410c68a74d72b6632487c284fbfc10135da29f29264cbb9ef620c2668066a2fa80fcf2132e93a29383e56c8bd89b3aaf8a905d4e60c6f8002132d38abc3d3c3b6fdc6cf508c8f6a7cfe9f78be8445f00a13414e41c27ba31efc46d0e028b778ca57b2326d624e3af6be0d4cb2a80e44b3f1b83bf572e8b7516b8e4715376e5da06bdb7d487d6a2d268afdf5654023ef4a13aaee221fdf7b9a668b2f4e1858da3c1ae3a7a7279163ca9c1407e8c0fb69f0ddf75cca64f4b0f277acf9c469dcce264b8f37f9918626dcb4252391526ccb4f068879809a2b115ca1d75d7a1ddbe5c8261531a98494ff634dff81515fe3ea4e289d75631ded8b8ada415f6438ada0738bdf9f89e986dee9c80d82ec13aabf10849dad939e81441fb063aa627c4e316461fff15e61c85821bdd55b2cd1545f810c1f280e7852604be73963b75e33eda2e2300196590b9b77cac44d059016c0b08a2f18f18ededd8dcb1474b3e088a6e84c12eb0470cef4b409214eb47de0e277de2665c661ae7766de5d05bc357a2db50ce51d9087a66b1d3715f5be97a9ac56ef866fc3bd3025738d4310e4761b57b3f901c5165df95385cf70f064a760b37341fe2c8466aca8258fe821308d8be08f4d569e27365dc4be8a2ee4e5e13f9d467d8b6ea272e407386e9f448c1758858d038c18f49dd7f60874cd4059b5950b8e969df6a2400a628759d6d7839488674bc128e947594521a998a7e9aac9d61ced0aa7629035bdcdde11a82ebdee6145af1f9c31ab104219beeb4f222e0f0e155e6b67160f09f6ab6943a589bc4ea4a1eb3231bea73f16da8998af58b8f71d3aab3e2fa736f3307180e6d777bc5ad02be4d7c718855177d7c1826bdf9f3848c1b9b65c6a25a93af48c728b6485ab765d36ebe3fc82104d043238867683169cf120dcdd016156283a7e6171167ed19996ac57e4691ca3f49b43b03aeba25fcb3d5d89cfde475eac580b58291084d8f7d554b463b3620a63bad5c1fdbbf98a5d8200f0e0ff1aefab7754e70e4d666e0b31ba193fbc70d4dfc601464a7642c56385abe64df8f377e2e7b7c451e903a13df6020d3cc7bd73fac7f95dccc9be71af4facc9edd60e9e5cc5c99bdee1339fdde03b3342a4c0635c71106dbcc4ca3ccaa8ae7e0b9ce740fd9a6fce8cd805937b3daf103c246d3bf61a10eea6af21bc42867e471991459ea895bd74d6899da56c22ba33294cce17b88b39691c493d7ca312776dffb953720f02fd814e6b9c96e4e4a9aa6e2d255735ada1d02ebdefdfcb74573c77b4b19f751f55e20a5229a22e326ac75858d7eb4c7fe9a4ed48dd49be353269223d3021365569da4c2cbc3dc6ac620056c5aa7382a363f93b894c0a4fb1af983d90d8127115837531e9ec7ade4a419051d503c1501afdab4d9b9b9a741810693e256e3f03415901ca0eb9eb74083d88d7a1db546c4436e3b19f3be3da87a6e4a7033d0cde55ebc2f7123b750475886244bb6444ea293fe498fb1e98d9ef7b31a86cf05cc660841f0b21a3ced89cffba8cc08112fb9c20a8abaf1e9eeb7fc7c678377ff2edd2e4c4d3140bfa4106f46a8b137c4d68985dbe4b8d67342f409f75a3027dc6a71acfdec2b723a4e1b96a12e42e49eeef5ca77a8961c77c39d5542d5be19511d6bd5364ae79cb254da944281ded04e1e06b7d4de33e40b1086de49543e56e5d7d4ad2e224f31337351707819f96d36db4d3a29018403556995a098cde94138f71cefad7d8dace8a6e08008b22aa5d257508cc4f6a9811f036e7715c67ac369b6d80c425c79a8ee97c094c93dc18771394a56dd527a676d660472b9fcac4fe783500676a9aa6b0322752a73ab982fb28e5eb4ae639033340b9ccc8ba036ef1164d293627c41e094bba0bd851480d2f91ed8ec8a1d4a229f4d08dc25b5b7dadbcdf22b2269cea9c7c6b886ba74bc156590e440a9a0e128a35ec8aec4eac360fd9bb61e9804dedfdbed1e17454394ddaf851c73327022da9456ba7c4edbfe7a0031458088f026830c3695c5d89a60810c2cb6543880b892d8d5c93214ef78d8e7538028419592df1f630144856ea1ef215ef6658c350a50e018cf0dba35fda2694e1efa93cca66931d9560d90bb434501f5f420b8bfa02a566126dc2bbc9f4e0fb929e2c42637de5e2e77e07659ee590fd3b8facbe7847b9400df4bcd858925c15cbf1a385fd395d50b9590c154928cd95798b735faa3acdb4a8874672041d585e45318ee942b3e36711dcc706bda76966cc0100f14014f9ea47ed9c924035e2138107f52dd26bc5d0312879505d7ddb3b468765086169e24a6e1919de2eb169acb18267fd0ab0c468da0ac6436acd2c4e08fb85f134e648a992a69cb871173675e87906f30e7cedca148c00ddae418e07e1aabb8f82f53127635e09cd898b348d4bc5c575cb6656d4bf33af7414bd26a84b5184b9be5e15c384902b1c66a6bf08b16172ed8084de06331119df75913d29ddf181de3bfb9de1242183ee797309ca14ebfd5f8ac368aa72ed7403fbddcac4077d669930d742240dbffc1a2b4a83b043d904285ebc0937c087c9025c0472a2b6e546b6629cddad4b9e60d64c01e0ed4d4bf8e580013e2b215d24893b3dd7629e71cd6c9f906205ac2a1572fece8a7d95adf21ae18f530a6bc18291f22e1b05349abf287d50f1f6724f01d0cb3fb7e0a576997c3cd9c013ddcae7071a7edf496605715568407f86ea78b20e66404676f2b34618060e180e4f9dbfd9a70a1f96acad53deca1db22d87342ad2eead7289c7e481d2068a74e62f9c9b90eb02aed47b57352b23009adc93787eaa74c7b8981525eb077fd502e6c476f6fade93b53c29cea27cb4a7594b55e4ca11b66f94ecd43187fc23d27bc72d0f48a23987fe95b06940a360e9026a022d2ee3a11eb72c8573eea76accc0fc2acfc61fd9e1655c77bd652a5dc40de7dd0182ff371d5a8d3047bd82a69a4b75452dd2f4409c5176b02488b9ce6e8b5c0173d96e1a83e5889ae16b4a07b09afd8f11b9b80f812c9ce794da70ce46cc3e31e24325f5358cc0c64deb9305941c0511ebbdc302c2e362123dc4bb4c9579c6ae2f692949e92a76f9aad182ab69549702421d94c5625904af24a42620f331b8ca6f8d6ce59306517ad93fd6d1fffbfbdd16f4f120540753a630c0f56b178b1672504d1cc0a20bef9d93c8777c036d881a42a72dfaeb14a1a0b60990a8c27f978c95ce44edd72e677d3be62dbd26b3c9bb1ccf1128f79aeb2a41f6ba6d021300f0ccc1ad36169bf63e36b6da9b3a9a6e54815d3445125a2d5078ec0eebd58df4487919fadd4977129aa61ac337f347b3adda82072d758925f4ce6a5125b9e4f87dfdc5cc4b3af5f9589a9cc4969afe7c6b99edd05462d1da3c40d785b8067c4c866a8579fbe4d94786e0fb0b717c6fb96e2e3ebd72b6901acf96c0fb174c272f3559898019a3d87ebd6d9ece260ec913300392b541a1efc0811c10af0671206345b46a588abc932f58be6149ae6591250a8740dde925cb9fa12150c9f8d191163ecb613418058769c54f883e9c0b533f6d8f568c6a907c227d16054af09c6c73676f5b9859beeb5a762ea323eb76853f4a3ecb113ebc42f9c99d89e5869777448a26c40407362a45730621c700e3710a65ef8a49d9c19a2692bbb37c1fb4573498126522468f738da44bbd4a719383582244a284645b318bf7de280d1b9b9829af334d24c49c50fad08a3c1c630a8e682ed700682998fe7b121bce47bbde010fbc9ab70494d5d0b300b846e8987efee9ce09cc1bfcd828f18ea2bc4f40440f89ed48cfb103a80e77e26967b7ec56740d18ee40bfc9fbc6ae8a0d7f46f3bc09b7dfcc590b55e3d8fec26e7f4dbd7806f550519ba3ad64c15b657fc726001b0644054aa24f9b1dad492dadbea8082b176c5fd819a8e73665751578e74ef32779127616a28ebca4be7270c195ac077fd71627faf95fd02f3b6dc45a9f47d3f666c318d752ae08c17d2385e810408d90fe0aaffea328466c5fa82958e840ea6b7ec4f2bc6980db0f3a86461f51cb55dc262ebad5f326533b6bbe0d9c4b283f564949f9cb05291ddd5371af7713a088fb9033bce4436d93190fa742dda242d725bb1fc261925efed8df4b6e3040b7e4989384a464752833f83a087ab09eb0d2be8320ffe552741a5a6b90ac91150fe3df65323ddbfee23f6237c623eb57a44f7dd67be498c97bce8a03dc2f695d0a41e270663a06c67819f4ba401a45886d78853efce02a00335cffa3b47c29b5341f43756fc5c180edb367aa43f104be106d233224623da7738147527e42a904f5a1fcf1d35261139752f9bc38dc992095ac84d03f889024bc8dc211a1b41979ddfe455f696b8199a2e5ecf61625293a6e8f9e36718e9097badaf37098ace700000000000000000000000000000000000000030711182024""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-02b250a84d15d015d65daf64921d441de7eaced5dae8d5ed5aaae0780710cc6f6478e91ececa60d2de17019195875bb3bcc202adda53a06e8b8faef1dbb67e391e8c8e7145908fbed14602f4cd5e8c5c5024cb3e65fcd88368454b7fbf8b08553c0abd7dea5834b8ac4da6968cf7d4e4a6771111de335b8a1ed45a18a20d7cd4e9eeaf18868950880600a531f49ab5a53deed6c37ea1c22fc0769d8a8ba5a3c49134a80a649b0435e457314c10b7cebe346a822a005b4adea250c449c4025db99c8cd8a3b44a3582e8fe2c1f37dc64503f90143a4f60df3a0e123917d68ea2bd0ed734718e38a306e64516e7a30eff69cb22956eb3fcfca07806ecd92d31ccb06d2db525118fc75973c04c3ded11f9425d2f89e3442e8a4393f469278cad14b61b6a7b15931d647a867f2753b69b22f3ec80dae692d7cc06bd82249da6e24570831ee4088b052687d8277385fdd1f88b4291db8736884928eb2a3fedc6b57e0a4c9db49962ba32d0b75b0c453e63a17a85932e18853bb860869a022dc48a96d6ceb1bb78d262ccafea8f05d61d4f9131efd3683e371c60781e36219ca5648cb69e65b11c2f2035f26827a123ba43e86de7f3f2d91f07f0bce7bb833634fe33d094b9c0ec790a8560e7475f9570fa638f104b67a7c0bfb8ca02df96596a4a7c41b5d192c44c9086e387f6a868b8600aac16fab9582c7db786d859348d66ed769ab476f69aed6513178d594e268d4a2edd29e684ff71aed82504281589da608904bcfc3e21ae7ebf53ae4acfbee19324cf10bd49803a2508cb0d80940840a9b8c0d7ccf651f134e03218b076d5ba213491163bcbf407e42dda28aed332d455395866e6d5e11c08f4b76b25844fe2a44c28b13299a0f924d6b541492977c6d779a06f8e7d19a145f70b42a55f4d200d6bc97e052ace5af0d2429d752046f25a8d51eb43c13faa172d4a9553d0ac05e6655c57be3f232329c97c97f7315016a80e6e1c79d12c269129fc89b9f859d298933d7b0128a69508c6ff454fbb56a502cb740acd4623b23382f3b3857d1bfb0776c3f1405271c551cca1b4083a8059d755f2a55c39c2ea836f8992a1f386800627f30fb3ab6998d3b644855a8ebe7c92f45accdb7ddbc2ab67932cc4e75b02c78fac8edb89d5e68cd9bce2187eae5f612e7e4e80ebb50fc63abacb76e0f317a299d72088253308f8c5c1b9772f064c90496aee1282a4e3a9de98ef74a2c3a4899d117376aa2f5ebac04eb83d57eb887ddb6419bb266c94578fec097ff2ec3f06230430b1fed1262992f0172ccabbce8979b5cd43c87c2cef2144270561c6823a9dbdbc408b81af10680f1c6939f7c8f2487418d7eb696f491957a4ba1a9a261eba8d234a958c7ea2766915a3d483019d83daf0b4e1e8059e81c3894c4280288179700b0eb984a401d80bc537e979d3a50543e6865eb5b73e4dc0ba55514f22c034cda20874124d95ef6df0eb7e37d7e425dc53d0b0b81d6a3b222b6c066af30e1fd6d04b732e4ea9be724bc115d49e0ec3db841db81d9e0405c5005b475a1ce6f84b8ae38019cf2c21fb9ba58a59e983b55aed4b758851dee4885127c5655a54e3a79eac74256c4928274147d61a4c6f1347f4e3f49fd25b154caf3db3cdf7f885bfdbeb24ffc02226569ce08127fb17701bd8ab0c792891d0433013bbd62a359852c5f90bafbab1ecfc0b74d6937320b9019a955c05d9e121eaf87d08c4f55068f3b2973a2f4d1cbbc74887654d6ef8ef201d2b0c90af205f15bb460c4a01808bdc27911342a476458504c01de66877b9acbd8c015e049e37fd1f90c0b4e50b54bd83db0f87011f5d56e85eb4cc75e9bfd9e92b739f833119590e409be30bc75adcacfd0e6f31555f86bfe4436b9230e519d0983da0138f31278e6b7ba165030855d433fef12032855ac24d7d8148a2ce54f3ed2996bfbaaeaab3595ec02bcfd0c77480e87252f2ba6874d713a61849d303794d940deb31c1306963111fcb6ae6e1db1715c1ad5b49b0ba4262abe8d7c8227ac428d51ab503d12caafbe0539711c956cb5a19adb5cef22bd1c52f8a297913403d8bde655af805e96d20f277fe873c463b0bb747342804a0e74657c6c14d53049f3e42eac9e945e50d771c7467774a755a2209a1182a7f7e5e131c61f792e4fd962e40d5cfcedb4add6eb476689c508ad8dfc5552d65c937e39018b151555d605075023598fc479dca05d227fdce3bff4e2583dc972d3cbeb3b2d6d2de7e6ec44c00ded46ca34b8358842d0415f7332bd032b933be3b758b7ef285354610c0abb9d05ad104d44fc8e057f6585c2a1844cccd3bc394b0e097ff09da8841ff7e3fe82aef8cb8af844e70a1cfba3d7b88cbe2a82a01f49c06d00a8a44ca2ddb0d8080faed34fd0da509e80361ab110170631d00ca8d5d8c85cf788f105aed5e2d90f870d47c07d08dc16db01440c671d1c7f880bba7a69a76c3bf64ead43c3b7f0477c5fa030f93286a2781b435778450b4e73572423671f4861419c8057a4d5672877970e9121fcfe6b51ec469a0f71b5c69718c54c3165041d177480d761152eb05e2c3cd49a063a25b05f5e75a597c840235fd599618d72f99f088086cbda1a2a655aa528df1d694afbb5e27f910449863c01cbec95a297c5f89ef2e67fd0064ee5fc2449098a43e2bf86c2943007ddf82708326d5fcbdd6e8a5821f9707b6a7a509e27306f8808f5c0bb85b8edad600f1bb4d58cb4b9cf6a74767f9ff52dc"""),
-                    TestUtils.hexDecode("""
-320D1B2976A4A4673900C7B75B23EDBC25B9AE867FBB79B55B29B3780EAE8C159A3AFAA47CF1D9E452CAA8EDDA3304BBAC47EFDCF96CE92DB1981A5088F731E1EDA1EA5FDE9A031595A8F268E92B4D75793C6F408F79B78599D93E80066F8C4432911828A87EF71C877F55B1F18207F01820C0153B647205CA93DDD6B78B94EB59E3EAF01B66953951ABA4027F811877B0F60C9A5AE6281D82348E3EB749C82C81D53309F9B7E624BB1BFC6382F43A58D1951F7FB716C08DEDE4A8028B50544D0F26F7B9DAEA0CD075C3B11B7315022A37198F0C96D752798E0EF406875CE86C367079841F717261A2B6570A8F4F9BE1EA305E73BC8BBD88AB162B4D4BAE86CCCD406A0FF6ED5A968D4C985460FD8FBA5B3FB40E29B6ACA07F70717A0700AD3A0BB7081E09F7219F3F8829692C3DF91C90334DF9E89284D65F7406188C9A1EB7B5C491591A20EDA9399DA1AE8C0C158588FE1426B763FE9D11223FF7A05A3DE036B67541C2811AA459045CE73096F89E6BA672CA7A546D2B0554DB35C547AD9585D14485AA812BFBC88F7B248E03F2EC57043F4DEFC2B27A3B20C2EE7CE334D428EAEB228350A3ABF4628C2DCFA84BC7435818F91CD67F70F3C7D54E2C205E55BC4ACCDACB354470FD5C246F32A542106EEE0EDB38F01FF5C4B657C7C1A00718D2BFD311B8BAB6523351E93CCB44274B8F96EE343830148F5C8594818777C1E798EFB45AF1D2A75D22470B4D7F7C7A5938DF3F8288A0088719C4E36018D9993F9E69B8469E5F2ACF1977D441B82E5340E5AD5B21B66051513553BA1BA1C1D5F788C47CD3BC60079300F6E3D9F13EDAD4DF8521EDD022031A3D74A6A5F32AC6FC51C67F920233C5079A2B44BA7B8EC6DCF9AD4667BD26BD07567E078267A1BF44B15E68B71AD38226EDDF138D2A599944F70D47B26F775BB97D9966845AB3E6AEB96E1414D3BDE94160B6DF19E03BA1BD0361354E5078B3C5733B740314E2DCCCF8F4C9CB179DA62D5C982B223CCEF5F29D7B673680DFA2823A2BB279EA45D98CD91BE7D52E3E386B98B62DF3FAEDF025B55F49EE6FB5E8DFC9F70A4F093EE3898B25102CF3AA52E669D6EC69BF6C79457BBBB7CECF65B1E948DA808025A242841FEC6073326BE16C2D1953209F31BA4A772FF24BC30376EB994398D4177FFFBCF78C9A79B7F1746D077AD146514A2DE0AF9800255F3A11BA661765A7D8E8E7FE5FA46BCD1269E278555186D4BDDD03FEEB70BDFF7E5F616259ACE39969CABE8D4F8F23544918516C977F84C09D6A6749B1CE719676378E82F9B4E563D67AF7D911233F2527B5CC5D0733360CE15A173F10B91360A3CFB08EB44A09157559A0CE8B661AB4A97803C52F156627C642CD02CA5BBC7648833F2CD7E99D2A7AFB736E5AFC4FAE5DE19ACD2F5CE3E3FC887852758411E8C7FBCADB1578964445332113F963AF3E944286DC448471125E55A46D2DE35E9C0F6DD10A3BE4F1E4BDDE51A16F4239A1F6A535D3202055990606C0065C542297D490553204A6E3CA16A7FC9A1D77191E5C01C1507A332C659FD6B11FAE088BBA796F18886195A2B8F5B0064D85F56FB7256F0FE70E9C06ED18B7C8A75ED97A1DF482908D2E3E8D6BE8D0EC8020451C687D10F829257F3D09FC47C7EF008B89E2312792A25EEDC71E9835674CA50235E0A6C832E7BBAB458725EE7BF65D26A0501C91835625C330B0F8B4D46A0762F7773D2415A0DCA573B47EB8658F9EBFD26D9F6EAE9D7A7304BC690F8D2F60C33F8A7D19B52F9340BFCB2FFDC92A7F9ABF85E3352E46ED7591F354A9E19B70A3B247E3E4295E45B6A2CEB59B120B6758654BAAFED2120B226FA778FAE5350E756741093083E4E56A84B64739695C1C09EE39DEEF11D7E5BB7866C90FC9C96CEA071FF82F145592443BBCD6B7CE848839B641C4522016945F711E86152820275A6E16BDF296D34AB38CFF06A63756DAFF7BF230F024DA00C4128F025F091F4341620E0EA883042BE731E82D21DBA6EE737D90346B6189697CBF41F7C2BA7C9CBA20E14D26CA578FB05E92798D57C0060951BDDCA5D96322AF35D80013B48A79AB7684E1E1B040315A350DCF84389E54C054AC4C3428123E01C2FD66FBB2C5BE2D16B22BAB805AB59DF205B71764E4AC9BD4B2D872B8905DA230623C65DD235FEC253468E53928722D1F04C486B46E63FE63441F11B1E3617E9765D4F388D4A2B68B6C86C8E20FE0F3C48A561A0FF5070455C43A7FDAEB58ACFD4BF51A1C37B7751ED37BBC73B9C29DC4FAFD0A8F5FC98C7FF02B404AC08A0728FA82A5ADA4EDC195E679D88187F58004844065F281A67FF0A2BE0AF94D5C97ACFD43683AC721045FEF8C36DEBA2E3EFA248DA65837046B62BD6CCEA84CB1211C5893B0C5F0A5922A989CF7ED093D5D706657AA6E79EF3FAD0959DF594B9CFBE779"""),
-                    TestUtils.hexDecode("""
-c344d3409be7db98ef0a349092d4bfa68e022cdf72abd10851fb824519086e7cb35ae13a93132867d90ce67d9c99315a3c548f7bed393d9eb71231bd9cfd951c53cf8a7555c2e8899d7914549a5565d8531685c7a02b82f3b95f38fcfe9c24118358f4dc4b0bad89c5e169e8f71e97e5f874bc8dea40c70e9fb2322131eced692b164c011d04844f0cf95a663a90e0409f2b36d8d936613343f6078751a082056d1c077fff3c3e0bbf5a9edac10d8ee0be319df29a998e5a52f06dfd12c47eaf72a457b18c73bce7931b74f28e2b3ca2037f0711b8a4755a860fd79bff06218b965a1e1368128e3db4401bf37185421d4b080e20a017f9695feb484b7a4ec6623cf5f82d99d1e0a3873d380cc5ba715021cc8b24f0839d10eb2b1679098330d772a081bcb20ba8613bad19841b411cb84e4f9bce9449b5d1b79922733e0acaaaf3c518d316c63a51ec49f4a5f30671df7b36e3996201fc625c91ec7cb621b54f98bce47381bc062be82eebbbd2196fc8fb1f26405a80a1cba591820c6b90f9374406c97020e0d8bbc4cf71d5379d54e3412f69d19b59237669e1751355c1721d097f07a218214428348ccbc0c954ea7029dc6aeb605ed6fa8334206e230c39ed5a836664a6c0b848de5c6a219a63ff24264ee44ee5d9f068a41cfe62cfbf885a2bb4c71f17863f5172b9b4203e9e9f21e0e744807277cabd3094d2727d78f930ba8779af85026e45b809b8b3ff259dd8511981e7955924bc29d448a5175c7742b7a1bd7db170c55a9831631267789adf7952fcba1391fc4eaacb7c3429f43a2b634553d8fe47ad9f39f81e54b0461061f6f67ab6b72a25e99801616737e8687c738b45a8ff6f05f6b5a30c8d87f6bb4e2d4aa82ecf9f7ff4d1a6d6b5ba61661e8a75d4dec3daa6ac96c0abf7ac09da08efe3eb73ec0de8ff231078bac1cf98ee9ac6aff210ce15f8cdabb143ec77860bb090463c0e6b63c0b12249633510404cbedad4eb85641630cd131a7897b46443008e79edbcfe471d37159a27a9622bdd6e34c1943e0b5ccf35d8885a9d584f6a54cfe7b1b45162360b573fc19055f6ac05df20662026072faa0f0fbdcf4f9b7d89d77fa0a3ca7ea0d857d0d9b94e95a406bc039799ed56e076114dd9f7c8c028c97e2bb813d8862da972b069d7c1e251487472c291baa0c0a9c9f349f29091d8a4332a56084e11296d1c72b7014045ee584056e9822b113136ca9fc27b1487f64e4fae57b31df3e6e2728fdeddb4437a8257af982cd08fff4c4e6e9aa82067182290da938b3b969e5ef0d15717f0c34130cc2d9bd29d9a4ea6707c9a45830c66a2598d8678581d9a389bfad0e34c3cf45c3596aa986380458c5cffc1dc06c5e143952a211288ef0d67c7375f0d9f59ef10a55623af7b6d2faae4802882d09cafc9da95e7e0254b147fdadd9b8b28498d625e9b0603c9e7e0a710d34134e6b4d2e31003ba30acb30df03a913851d5191adde83fb0278aec64262de99b7ccb1c6ad5358651f336083f59089beb924db5af90be237520b5354ba63393c2514f2f5c815b694258cbd56cb7caa5de34986f214c566305163782b9a67db2f1e51c0172f757e3c8d9804cefb63df98d4297555aa95781e8c1114d5c53b06491b2c4463790030d2d28d159c071c081286071d95cf5fc624b69eda6b2cee5d84ba30ee0b4357eaf5429c26fbcc455357de8730f0b50aca059334ac5af33c7169208be3b060abad80a41d5a720e262075442b1f514958120dfd51927363fb0b43767f3bf4ba7bd2669f79d9ae38c8b244c9a1334f802e7295c1a5b2d236edb5ef8eab028dd2bd8fec9f0ded1dced5a352f55f4b502f5aa12a3131bccbc88a2dfe990cf2cef02ae787db30e8bfe26079bed383e363576ee704e2b2b3b6dc0254ed4039bd0155fafa471919703f632bd8623350cefdcdad074337d5ea637a95f995141b21fef74b93be8fa18ada82dca3bb6ebbca0544d790ca07c42086bc4908a4dfded5d0c09e8c8d4382dd30fd6c586d5c379fdfb11f69faef1dbf46b0b03432c0b9967e6c7417b2488aa22682c5ee0fe6a08e90d6740af02f131c5acb53fed64329f8f108f53d762736519923ab734654f968783dfe8d13d715e9db219ab7441fcb739fc75913b20334155dafe6b85f28512d71a02e463e8f58162a2075d301d4215c61164b5143f096decc998b006051752431e1d1d7d109f92c986c40d2a8f17ce6fe1c32c33631974e47c73b5512697f5e3fcafcab2a4f8b462685fcd5c19decaea96d45a7c3d35eb6b81d52d3d300f4f94f2f831e3412b12429b71b46253c83d849250072c035003b8f4c0c7376e502183848ab14ed9f8b6ed1c87d554223fba1bc99d1d065cbb945de8968fe41c161c301b3cfb9c181ef3bbc120cbef645da02c295d6ed66925802868bc8ac6b437550637e5a16d429dfa4b124c1f1045174507f706d3c01f9343ec58bf79e5611109530e2543ddfaa2fc0641c69ec8f3947b4350bef318a55998fbc25686a5e115c35db12a12e77c8dd43863c2c024745410a0fcf1560f1a902bacc961d931f793238684944140150a99f2894748d03a83e030ca52fd83fe43bb9b7fe43a9451f3850f92df5e242a1e75c3a101efa727667ac45164c35fe7143b4ca2119d76980506e8981c4990c8f391a0c9416647554db2c46256f3e56963bd4f7ef309914dedbd893fc6855caccaee377d70cdd54c64ccc3e3d1c0e197684fc692e9d64be1b07af246bf6d2e4f38d2e8844e01efdac0b24dfbaf32f08492a99b38486a8db4661dac565fd847d83993cefa810c42cabd357b3b1d5669afb73274be28d637d8c2de41305c33ea3569f865834effe4ba3cced51fa00ea3dd7f442894bb2ef9a92378ea447fa6af9ab8b3fc01ac45c7221981471aa121d59e77a1d472906c437004ebbb168cca7f518145494516b1d3a1aaec164e5f73a96c244afe367943eca32c4e61bb5766122f1f19e9768c4eec5d76f3b10376191c5d42005a99eef0fe332cf5cfd4ba59f725bd50916348b5704943cd5d14bfa826630a9529744148d9ebac15a84cbf6490be826ea51fd42e505fe9e74a13ec9a1ad546c8c22e8d498ee7a0dd75387240c3d166fcce4d957fdaa53d0573ed995a229e2744bd8493d44d774910625310b4edb8e46ae665c40599c7b48058f104199ea6ce1070a37fcb383ce4e2af436185c4a3f20e186a25b8dbf4dfbad8304125e186eb76b6f6ceb7fdc51ed324272945e44b0bf11ce27b5b6b683fb4efb7e168ff13e46f1f0f4a136827d8d56cc6fed0a9fc8a2abc8f5c06d1dc0de33042c5b840c6d66a8f27331645a87fa6710f9f057685fe00247cb7f12b229a43f539f9c4a6727a8897c69d8ade9c2af6538c594699a9f428a998bc1e8d11adacba134649315ad51f73c1bdc11d8e5eaca86a138ad934b30b376d754bafb3fca13963eb800818592eca6807867d9bd23ec931a343776da195c8d43830028cf4328701faf124a19beaa44293e797c2bb89b2c9db45c7d3785a0cf5c9fc783d727da3a3f20f5366d9f39bf49bd1ef9811dcd74804716f82c0afe9a73c88138bb23babcf5b7acc87f5dbdc0ce1e39540a5e5979ced0aacc221362e2a18a4af86f34f9b2c03a21dd21f70ffd443be4bab058acac295aebc452b4fd32ea5750f4a2fe6260c30eea5bff0fa17f25c3dabe3b58fa72f75cbfc18a84e2ea3d568cf6e66e401ec82753652f44e9410bbc435721a10da1eec613e71f04023f3121df6b45316795f110c81ec9124b9a5568c08041eef364ee59b4eed261f3edd834741845ece57fc5ad1f50d183d03c0aadd61eddb2f13c46093082182b21d4bc5832081fee8c81c1d9a77f132e8e5e9f5a94650222dbe47f5d7f846b1e91d52f62609cf0420446b55ae4a96c2bafdab6a8793beedf7a7ee9f678a099996b6d6f8221427fc86e1a260d7426ebbfd7b9f3e0b9029907b00cf77409b24f73b7f21fd2030cdd4e36fc09322ff6176f49b6f3492076eb9de2d79f41316a202994871bf7ff96ab0cf94ea11ab959ebb4fbdef3813698b1c78e13f2422efa15198dba6af17ca9b2ad199f133076f9ffbe8496fd28e003575579d6f62c69a237c588ea8bbac99b32c43393b20112779db5f9989c04e9530af29a7cd959fa4eb1276c69d46a67ebe363d635aebe19452416e01db478ab32a32c6e95d43ed4693d51f4ded754c62f53524d4179dd05a102acb6e7057c63aba9c8664d9140f866a359f755ca2bb4b0e66b3794206bfb311535810a24a6256a8c0c79c4a87a8fd40bcb9bc23321fed6cef599deffa6994cad1bdb655eaf85d082cc1c626727918e63eb27521b6de4ef5857a2ea372f64409d4c6885d7eedc15c95aea623bf081991890b8d5673cc9ca26483d6b7bb88fa61b31a13f114923e7332eb2a52b9c42b7b341ac6495d1c4fe01f627350089daa8de8cb8b4c660ec9bb065ce689d965e14488e67976502337f1de27d825cb3e6f563312f1a3467e1d2b2628b5a3ebe401b6533f549263babe79b0ec66132bbde277a1b4b8d913b1c378e864d3c56820b6de08e3462882e72573e8ae08c64861669ab8e92b575c6e7fd5db3a698895d8dfef064b5fbfdef1f411373a788082a2bd0000000000000000000000000000000000000000060d141b1d23""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-2bd5cb469bc4c91a3b3064b58eac4e6e03a617650702c0d2d7a74874743bd42c097727845d5a69c2146cf89053741be3476ad6a7d574fa59f868e30f5d4d1f78157b0db9753ed7e6687383c367d9168806c52d5ee1cd548c65449576ca155cd2668aac7faa7a692f3660832c4e3d65ca6e31b1fd5f7a1ecdf76d4eee120d353e683b67760c52ddeb28c967c5a99cfea6a74a1bbbf468d8a6ec400253b81c6780292965478d5b1d90c37bb6a42cffc2d086d2bb03845e9f1f1d09b0bdd27a9c0495b9a86a4d0535d84c3c2748c7345090c2cb6d4fd1dd330bfe860d1f666567e0e164602073d427c293046ecc8d62d50fea16458e7cc18dfdcc76a01dfdf5a8dfef558c94e6200f65220f67d5831809b2c17911778ee60e724b9cb8cf7d54f3fc8717b2067c17926c69d7d05830ccb3d3d3ef910b622a95127e0b017eef9bb43823f977e904c7fcac76aa44b08ebae23f8898409db11fc2697225d06ea646fe78afe6c6c5861f361f15bc3008aa194250b3d2d14232535bc612afb523d4967370021ea8b6e4a8406b4e933c6f96c244eb363b38b65c35a3ae906051d2980f98483653c03a8e36490bd8d5bb80608eeca2ee9e8e570262ad2e0c77850eb8bdd1099de5aef34aacccdff2c152c3cbbcba38980f227d76d563b6ab1b8f62892e51d24dc2e648160f4cee0b095f9d9bd406ab0f1dc4ba9706611d9b5eac5fab8e246e2686b3ee96bfe4ddaeb26d0b1accde64707406572898cb41ecbf927794e422fffed966a0247a76dcf13d61c3fd256773ac41466befc8aad6f6c26d7a63d0f51efd63fe12274e0952c0047af384e7ce9bf7d7cfd329dbd9bce351290f9ec015cf784f49fc31648147bb46bc9bdd59418f998eb36636d82c5f6acd769ac965a04119aeddcb199f055ec3770c19329926830226d12a990057a2c60d4fccfd4fb20350b54ac2e7b3822cb6a81b0c2928a95c37ad33fc7760018c1a09c50b5e0ae0ac0fb0f89b3224b5c21adb473df9a1aaa9a338256b54cc5eaf2883bd282ff8c406aab2b67575fa1f6039d59bcdadcf4306f1e6b3f28e843205033101f7839b63b067fc1bb727ea98f9d2d30e874d2f825c1115a6b24623e0526246d9a4b8e8436231a9c815df3689596fead6c7bba5e739ae08b59be3c01241e73c1a7a2f9f0cf3feed564f1a2d5f045bc550707c52b367bded98e00d91190830024c28a3fa944edbbd4f292dddab123fadc3b14166e55c8eccfab9fcad135acb7bab9d00510d422232d5eef19ce46d742be4c2fe83cf6143028b8e0bb0aa4660564df0d717afb305638553170116ca5622e73fd7f92ec1a5a702ba0e26b0e1980c4eb38faa56ea64711e0e2a141e9e4062e6bc9bfcc387b100677a9deb0999fbc064a997b3a0c809b11456433ae9220ba1b0f4029fe4da9be24e66124e48f9edc05e9e86656fb7b1033cced41d50a0055be663e9bbb8a5d161b78226ecde3d7cb6e5b1995631cecac52be9c8986c0b22e3e8dcaf108d09ef484c579c6a207598aab00446b0bc847ca42e155b730570c365033498f0105023ca8859421aa3b43b37210eda50ac4d9ccc6aa69580fbec6d775aa2d31d6f97d3a079e0a164b5b5d48b5bbfd7ed8eceeee109e051f357f658bb41623120fc116bb202154def1bc1c11fa9956ac89ac065329d00dd0390e2611d244377a7b2aef7f00911fa3a464f68c88fe01e1dd5ed2743c11802af5a531f0956ca860f02009fb4dcb3034af02c905147038e3cfdbe401ba8998a91be1e119f9b1c674846bcb10c6c294ab4ba9e8732a01c1b8a0691753299c7ebc20e888e232cb56842aa9cb232dd585d52a1a46e7537a4fb271adf102b87e65a7694198ddbec6a697237a06091c81d33159a9b1b09af04fbbf368d6b44fe6ff7948977d339883821132959cf9f4c7b01eaa18c7bc0c38ef87e5c782e2f5de44316490e4c94621fb6a967241c49307d1356a7770eb5d0489e4631a159e4559516e0ff342bc093d2bc3bb4c4fd27ce3d21bbbc906c12c8060d11202de3ab3cbff4488676531bad3bde099adb4b547b8e916ea61565b6986325c7f2fd8649d79f42ed035104ceaea3afe21caeff7941a5ab5728c070ab717b675dd9ef985cfc0a9103d89ce52822aa532429bd612a0c13f65d24cfd27ede804411f81665fa13e08f9a1e39efa23821f2d21209bd02a05a41e6b5a9847becd791978fc3d90b78c57b5eb693548104f959822a78c097cbd1c12a09bc175ef97ae954c738588590517f6a7afda7732d2864845316d17121ce00e889843b76fc250b3c865e4509b1811cfdbeb619f21f6579ee26ea37e35198e59d416841876785cf967ca9d17ae1e31688035eca51859296ba364c8bb88f28580a75e195c00a036c8ccdb6f13beb393f4f5430479516c98efae15f2124a46a6b506830e50a8e37ee6e64a6722d659eea4a52d2d6def30d6387fe820ca189ce3c3ba7f45b0eec9fda6c18448cf33ec43906d6bcf98e20045c7b30967b6b28c988ec7e9aee979f0a310046a48641f982a7d9997c7f0bbe386f05458ba7dbf49647708ef232b3ac57fafd418bcef724ed3bbc9f540f2a186df0187b1e49bb0853acdf9dd18b95331ec1d5628a51c352a0f10b63ef512fdb150c63d6531b0811d9a4f071c76446b3aeba7fd2f0fc301e5f56fe5386ecf5c1759530a88e642b4b45ff7b67d7d3a234532890ccd8803a851adee2aeb35f6b4de938da6b8bc76668739a63da699a9b731bdd5a8b2f"""),
-                    TestUtils.hexDecode("""
-C9ED9B897C34D7119115A0758332FE70D4A9E11FFB2D6A800AAE33F85FAC59E715AAD93BD79DC8D958079F3B5C2422F8FD1A1AF9406E8DA3297226440E30183051FC9AA52AFB8BEEA2228E88D193F231F2422977DDABE4AF4F0437628C6AFBE68F70CF4F56153A2691F7A4241EDCA760D4B3AE0A17A8A0214BF1BA65221DE64647AC6578F4C7E4A14C401F7DCC30A10A695A7F72B04393F4E9C4163AB68667B1757154BFE711BB54255F4DAA9D8AE6622C71EC8ACE5BB79C6B4C8AAF1B0A0099EBBD07B292CD7B55E44ECD68DFFF4173743145B71F536E7D23E78C63679FA2F3C72CAADEFD5A9471280CDD3DD8DB83F8AFF14FBEFDC8C5969B050D263EA462C28CA64362F7F165C3EF427FE5E90A83310DCB07C9612E9A0B8EA1D0631D84B4A7F1C7485B0C91C3B7BBB0EC98D353376B692BAAF24C5389D50250F3BBA82173DCDB52382176EC5CB8BD531DEA049C5B815D788491608FFA2AE8BF486849810AD89BF0352ED595E4EDBC0B81467D72944AB83C3CB2F90FCD10810EB65BDA18C43F9A9A5D98E714BE992B7DA02E9F7C389F1A22810DC0A473F8891C43932E0F6B5D3A21C3B611AF6C394AFC576C07572DC4A1E56B4576FE615E516F48544D099683EAA886CD41DA848567F70C2103C467D271919CC5935605C0EF05909635D431571E5A316E299E553EAAFE9C7CBF5063E2057D297F60B5DE1C17AF6B97192E840474CB7266A76D509A10FC7A71721D705A9DAAC5BAD8A52290C1D8DC7938663B24700F992FAB008CCB3801258245A0F5F329A4FE5553F4130DFB1D673338889B357FBF11681099FE9BFF18AEEBB31DAD290C1401D49CBBE38277AAC8A99C8BE4E6EDD8A0F3C901082A789A1037768AB7C3C704BF1C6E890D20B3DB6918C477350F4F25756BE1742DCB31705EA9DC975DE0C38C21D29B340C63438268F6CC399BD644EDCED36A7B50E8D65A507BEC51A31BD136525F4E7AFC1EF9E0E6325D032682EB4AFB7FB22F1716EC6F4C9852054429B5C5FAF3BC86213F6D800281913D5722F3A380307B59E1CC290EE66FB9699FFC627770B52619256C7B76D993FB4024D2DF0602F102A6A1257A200DE1F39DB54614FEC2B60F3728F59482D71C7E5BEC36F0D90D6FB0B4FA252E7FEC4F0FB9EF539257EFE87715ABEC75B2A5FCCBCFA5666F1C9BE2F0489E04E63ACBBB239EA8397FA2EC24C25C538BBBFEB74EB8E15FF93B0FEDB7F36FF67F7CB244CAA067EB2C005EDD2AC9E0765DD38E51E7C71AB72B056B230ECAA8985DCDB50439BA261A0DE57E68700C64655E1EB8608BCCC33480ECFFF1BB75D0AB69CEEA8F2E3E9515331A1EAAFB9BA32AF62798DF761267475DE343CFCF5A352C907A0314365B8CF6FD2E72F2142018C4BBCE4CF0A160266DE320EBBA359344A60D32CB135F5FF943173A3F9C7F4A68489E78621401425E5B8E6273309FA3313DCBF13D7C69B63C1EE34D3200BBB4CF57518A5E66D010984AAF34CA9B7DDC914A3AFB514FA1B9D3FCDF3324998D0D9058FEF10C30ED6B381C41DE363CB31C5107E7C00D4C0CCE485DBB4CD2092CD929E5717DB8CEE4790A48475E1DE9178E49B13C5173B6F301D5B7BFF1A9F8B3807A5FC84DCAFCCD8D585B77014EE285074E64448589A738F1323C7A865C3DD482499640A3F166F38E37C6F9ABA8263E4F3D1C2E7D7AFD16BB02B9B4BE8A055452071F278C32C3247DE2BF83A0633BABE7FA048BB18FDBA27022736615"""),
-                    TestUtils.hexDecode("""
-6d9ffac759de540cb67a1d3ed0e50afaee62c1bdeae34e94e8c88d8fa0a86e22b911655d83e0197987aa1151adbb629f7d130a143a3c0f34ea817898a86d76f54ec5fbcf4d0ddc93ce671516be812b1eaa2fe2da29d0381d9d5cb8e702c038b8b8e51d3ae18d0837fe459be7cf6e4967233344749fea70a74f143fde0a0a9582366710648c4f1b26152ca0b56bb6bbb6011264960f9639ed7239881337eaaefd07908359dbbea6dca1834f03a753dc02ebf67371af2ae1a82183f654fe20ce6212eea1aa256b8c1366b4d13ed800e116365e8f3277eb522f2793812329e730f56f6af17cfde3273045aae0ec8188cb956a0058dce1c4d481ffb1e114405fab0a5e9a70af8d438a2a266d9a93332e621231c4ca1d2aa02e417a327a6feda50ac402263e797fea04579ff60b9f026bf7a97fc3378790e3dbc9e7b6cc12d1c01813367647bdd5f8b867c9e1b2d05c870b5935e5f19772fcde0d8116a9ca9d84cd340ed26adc1033a8615ddcd29f86659f3e742e7c08cbf197e4c2f680547099b364fc67b8140a22eff4119906322ea1badd4af4bd008bc46d335569052cf26520938e417c8a8a12c72cf0a451ae2f209532e214bfaffe20414b4243d9351093215ec3ea78a5689e4f89397c7d309abc54d55d3dbee907ebcc6a8ef921ad61c67c2094081d901ba8631745ca131a302fa813c7137c1f3fd66207ae753d0eafb1211ca4e0d247182b3155e12a42e1cce1c415f74677928f7db645889ea70928679c7fdc7e36e43231ec831a6a6b6241bf54466bf530553c268cf5d63b22d755fe9d341b0ac7ab830a303d3f74acbba37de4c109a63a6457e9f79955232e368e9b4aaf27c6c5d3984e7acbb9d19d4cce1b8d53a04d7e137811f10ce33ea05a0b25f0f5ad1499e39542a264ea0830cc2b20646c170495e71a428d35ce3b726ccbfa1499ea716df3a01186e776586d431b90978be9536e5587555aba18ac6f7aa3bd44867d85b6fe9727496d6e0c8e8e776cfe346c5546bd262d30492cb480040c42aaed646969120db4dcf7c3adc8a4e469680e1d5d1092594436655355631bf037a3cd4b9dada49c259e0c6998d466d6f3df582bf86cecb7f4c874f392806cb1dd3b08d3759792875a08d589cd8f8dd8bcb533accfe23001773d6b9ac4dd6686b4ec3ef8cf4335f70d86bd155e5e473666c3ab5b27f069616c6d87f3969a55a80e59825840feb3c82816ca0e7c544eae787ced30e7e5d0b911273909ac11c5f0407848a96fe139887569491fc82b02e70134a1325956e65f02cd97254d4f469455f5ddadb32d99b851020ffdebfec3c83fe99ac4143bc4de6e2341948494dbff83f13603bac25fc5801cd694eefa4439afc61ed048a811b355b75ca4f7f7cbe88debd671657bde2840e95032129f2f40fcdfd160a13c7c123fbc811a7759e86f914288b417a6051393fb564a8a2473c3cd5216b31848cae14dd935b79647aeb287a262a59d37da18b085a86745b2090a83b6796203baded78332e5a76ae6d8920473d268230c00a442af276d11c5179e0b776719f02f4d380861ef73ef946dd03cedc6b7e19c812cf6367d6fb847f0f00b0ae2d5296122bf26553bff501afe0d217628dd44a8a39b509fd5a50c2b991d70eaed000d85343135c8e1f9a4bc703559e08da575ce134e07a33e3f3214d75f959c85e28329aa2242d8dc69b12ea2c95be537b8d1de119a7ce7d7a672c7172bb7f9a5df91ed8e10adb5ca072a493f4199f1135ac519484678681bbc88135a766490f99c2b3d4c6951d3e5da5e169b908a60ea803227fb870510c1963196712d0283102d6883b9164d9c30f9853a799696d488ad8834b6903602d14565faf6be82e911ea41d2cdefafa2506b28f1ee5a77eaa115b91e1ab44b7123ec70114d0c4a13846bb046bfcbfea6097220fa91d1e0605017f3849f9e2be6507fa4b7bd4239ed56961e70bef8daec13fb486d458c7186b99adcc45ddddb818e4947c0e6c5eeada18f564bc664f51efac7a8f12a259956ffb2165f450d728ed5a3c9b4cd6dfeb2f90a7711620374a66510fb3c2b3fc316e15e52a5f91d3e38b3313b7f9b5a80b6b181e4c4fc036ea2574d219f179bc1afa98fc918e33a52cfbc95e20c09b4140367c978532e6be246c8cd1d2c5508721eb298db406a92e77d833bfa7c5865c997b402cd8c09df2c5668cb38b03eb0e86da9707853b20f1ab23e11b6d38421ec2d6882a9121b847f55923601914a11650f02f99895f9920e1df904c6f45715a4c0d7218933149297191f72eab16eafb816d5dc1f59c30a249b8545e6947ad81d5b8f562f42c016ad46f19f5ba10fbfd2a1c22974669c376f496519525bc7ffdd937da7845efd848aa2431344c7314d6eeaed5610ed1ff144794091ffdae46c31fa9e7116aed7dc93c4765b9b72e021b825107e248b988d11aad8a9d466b4b109ffb874f26d6d7f1a12dfcaba5093d60179d1cfd2b435cdac23f6b64cfddd536c55354aaf6a76d738bfc12ccb003a14d19b54e6ddba35dedfd5e4f7f8a18dbdb4d7a8b34acfa4ec462b9a9ac8fa962ae9bfe353ba9ee19d576a320e0f9e22347a84fcf58c0ad61429f9a5f22809b72e91574052534e96832a99db4fe9e22e20dc2ea8f5cc4cb70c844ca9a0334f92ee2703b58b2b09e77c71e27851824c78bf3f4d177237b212f73d6681c6bcc29f12116bae1a25666035313ea2af3e4e98af8f6cac0236c392c39516b610234304b4e4d1d02d8d8e349dd00db7b8acbcaa4c79aa99f711ba693c7e93c9a71342453add96a124e3d06e46c503425a311bc5249034ce01fcda3c5809de83a87d4eeca01b26f92d9ea61616fb5383918e87522bb636110aec1d2b43afdb4258a51f06ce0af14a8687276d67033d922026dd190346844df0974280d56c22fc76fca0132615d1d61bed3facb80f8ccf45ab82121ac3cdd34c425f0efc86e1546f35cf470bacc1976e8c8561b086c52dc71d9fca01223707341c9af7ea6791bb08c2d46a578ba479fd36a2ce79558387afe1375090a53aeb2183294e747043eff104374f6f247591860028a49ee51c5327007d08bda15dfe2de5109683f0c10b620e455d265411a460c3474c3c2c9de9e72356bdbd7309b6e6dd2fd9260131b595630932f46c372a3da2563f31fe5dbe9faac52abd5c842eb8eaade71500f235fe806fd906ae53a2b65a906dda24b3839a0492b206687931dedcf96c57f05c28bd3e1e97731523ee0bfb74cd9367676f142f73d861b070843e772fa18a80dd641f430236a96b294c68ec871f957e4f04546a0610b727b4bc9d46433434e43e9d6c0421997701c5464fd62d7f73768f92645b251151bbc11a9a968b863a2a25de9b1bf547cc6857bb65c3fdc38268b9a89d8a4e49f1c62190812148e2c2617a92ee7003a3de676129e1f6b92b81081f1be2d9715bb83c31fd3136c80a0b23b902a9a3e5f9383b1206d2d8638fb0a5e5c0e2df646235b6a40b5f4f2bc4a13041f44850bb8cb1ef1d525f2ced545246b830547136c8fcfe69c86d4846391d1b8d78a63f50a09ca62ba8c1578eb7ba182ed67975889ad92458caeddd358dbeedaa34e160051b2346ba269003fccc4c3f58d511bc74949b152ae37ef64d0ab0560b8c474d3a1f78b04de729c9f0c4ad7ad2812f037195c85f3d3130559a336610541de8dbce1c91ff95b4d73ca6e4f4023378a5e4e49c8a907cf89b3b71ebc5729b783764a8b9f998e5a299c877cad7bcfd34252ca87de197343c01249c205ec4057912afd681c5062897c79b272c9977af12ae543570f2d8c4977684a2689c627ea4f97a8dd9600a17b6bc10a71a9cae8b18737e3d4e070402d8925d8c81d49854806528d5b03fb90a4a01c03cde8213522cc3372e49fb12adede707ac55eeef0c72a1ce7793925ea6416728a2afd328d2241091049beea09b93158c0835f9e28d0fe34ad0e6cc4cd82651b3c9524e50b6e6e509fba04dcd311b679dc7c82d96490b2f3f7c48604860afd25d38786d7adee7dda54acdef35bf58c2fa5bb0c226b535a9f6230c9428175ddc939fbe2f2191adf27a496644d1004c05c06e4a2e8b82a1910665062c10e6fbcb6d4e49df3e6d17b02cb891f89070288c94ce4faff7709cf88994af70a256059e6bc4df8e2769f9d2871aaecd023d11b44c7ccb0b0f40f4bca202dfb1db1890c89c4121c3a221ca70592742c1c624f9c54ffa3ddcfdd40864836184cfb075417f28a6d5dd5ba9eb4fa2a5fed82c86900dc96aca2342d29dd7208270bd4d6ebeba516fa6d8809eef26e6e929853df5b7b22a66628d9a728170da4a4eda26af530fa05778698e85f02d979a76706b2daa3d154db0872ea5c8b06ca7235305b1d5c1021b0334dc8df6b267760e652a0e1a1fcbd0039d6f585879c7b53a2dd3f664e36fca174322e93989f78ec66ecb613b0a694f13fe2715a930b2ac5cc4ee65a120c3c309b97b8e1ff856857cd88c0ba77aa5557f4184002fb96b35f367bb62502fd6fedea2df3ddb6f4015b018fc00ee6a79ab78c25aacfef26b1d5b1fbcd372b296f320c3cbd02128827678f54ff94c2c5a677193999eb2c1d7f7080b1d4667828e292f373b47696f7b91aaccd4e9ebfb020a58acf20a39586173da2d737583d10000000000000b1221262c31""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-c80f02072f243218956d3770dfa0eee288f8b5372ccff67c93318ebecefcfbdf44eb324573f1e7cab8f0bf2c46e14121dfa84a543892c7c90dfd5a6e2d9e97ebbe6fcac50f96b1471833441ea67805670c91d070814d14ed96d43d8478aff217c5045047e832a55914de5c621ce927144a790873ad5bf955e6b84650b6dbd479fd99ff33fbd0b58a9d057cd6ca317cc9e47a830badf04377d34768ab32b7316f2fd1e40b3a413370c0d64b360f3f46f447e9d3bd66a5207c73415add021ad7a32c0229f1b12d70f4b4bc545e8f56610ed11db236a139ff2eab8d38c2c39f258a94d52c3c947f0a3cf7acc0be3b0bed7d63f046644f28ff966c4f40d499c9350d74a81f76248603fce5692a0db585ed18c2d0791baf6eae4e932e2476e56f7b59c73acb881279ed46adb0116820456d9f4cc2fcd5c0b6bed1f1d1f5a83af213dbd244a10c1e3965526261481c4512df81faaad7f730052ee184841140f0f2002671f4031412a31117fcdf55534435fe123dcd0374e331d2136bada30418330d67b747ee45ba7b47b917257db42023048219635d07694064b5bb4b47e4a3950c50d15ef318eb4fc532ff7a2a455dbacdf04a3389b2d11e403247c84a6cb66cf9d2441ef0c453aac1d69f45be2291d4870dd91345b516d0243c4a76956a6880df06f9b527b32b6b05b0acf884a58b4ab42b4d4f92bafaa3d2c2bf9fbf6fd4804f884ce38c6f4501318a3efa1b0f9f7dee7d573a86e3108e3ce93f69bd35888cd0f0f98d3eb11c7571cad0573db31a692f09189eb5020d52196aac39a621380679a246868554e9f6b85eac016c1fc0847784ab92ce22c3a033892c09a834f68f03275d7b4e5980fdb51098d3fbb951e7599600e36f760d202f7f76f9f61a6e04a974b08fe2e6c2fafde4ee15d97d7c0c6e049ee9f66a4fc4e11fc65f29c91e31fb63a667dfc3b6445b56e7cad1aa237c56b16b6cf6d82349fe3dfb9eeceb332f97cb6fead2c791c846275e389835db39abd041ec91726b93a81bf3c45b948ca8dab2f98773b33f9e1ee1bf8bb0971c3dd10f2eeafd84f391f3fcbc481a3f6b87efb5756ca9699aae68f6effaa27b5c78a43b5c64411c7923937e7e03b0c9a39c125d268106e2fd2fcc1cdcf6f37e02a0848b46f169d65a184213f7d65026c57ba242a093c6f651cb7bd47d4adc50cab9ed9e9aec5da84210c7671e0df9a620fa27c43e44f3e0f8a1e143eb6fc1c120c4da0e30bf9de21f0a973e796ec08fb4d01976d9996af6c8bfa33400978ad16810faa80723b4e3748734891ae6e590eb411dd291efc808cadc857f64cbcf7e5f66f1a0fe7a687e1c83228722f3d111dfe2f9b0d992ce32795d3ad43f3022cb635234d7dd36320bb6dbb5289a03dd9e7a68febe91e6076e19eb979601199bdcd0239bfc9cfa43958a05c7f3185564cc457a088d0b02ee953e7c665e2eb53d709cda597d0fbe25f7538611086a5f42e1b8756906eadc43ec6bdc3d813b5e3e08fa7f8d9ee200bc098a16b5e5c382f500b45232dbff31a632b5fbb846b65a5a2829b4692b192569206ddd0d8b972e5273166919915c7bc77d5225aa75132bc115da4399b05009c258539f514005603c34e83d1a7ec6b277354d7128f09c5c05250d4d4567a7299bcc30e2a4475ca3a476cb61e2f994bc481c30d24bb11139ba0aebaa4dc48a229f3e6abf570ac3794c1117eb9b1fc682ecba28224274f63baf26bf1fb25be6120871958e81ab6e27594e15bbb06bbdd5b05d727f9e31328c7e60d5a069cf22eac5d4d617f3be9ad78e78b10c37b4ff083085230e23f8a57c4eddf6930bdfcb9484759310d62c4ed02cca6ba7fc3f5ebb23b65dffef3c1d5d020570865f7d2e13dc090c8aea4f6f02f666abc01d2b17623fd5c9bada469ef4b70f74011e494eb040357acf588aa2cfbb3ebdc4d0c087d7692c4c39be0bda4894c834dfbc11083586a641133ddbdf87a1078a73b4187f75cafeeafeb674a64b83cedf3a2d65e9a494a6c01df470c5b46f3581c36462301c9ae910daf7a8309d95f39e630f8f53ac368f51c7fd77dec9cd73069b392cc5929269c0a2eb82bd29e8952a27e03ac427498b6310fa2e93517b1388d125330a9ec3431b95f1f724bc6711b3e9b7cc111ee39a485281adb05d422f0833d6cdd5a9ba3f8b29796a8706024ab87f8f46e459bd6e8db00346d356d8d9ab9b7ec821fc8d962c5373f146243036e3c859972985f574874094a3f76cd925375485113778c4b4905bf8a50268781b96acf0539baf9d2a05d75ea81142198feb5fe2743783c83a8c80b77eda68e353d18cbc07894c460bca8f1cf96eb73cf39a300c9ac13dae0995423f19ee40665d6277014b9266919455bc2a1a7f3589c426593ba3138cf7fa976fd768db68e86356b7606b1e713b3c41c065ce17dee516b673689b7520dc4206000c5c5f47d64559ead4134b74a6ece8eca619dcc36fc61c825e6416dbcf4821db0eb38496d0e2ad86786e3176cefc73909023c4b50e60f1860d3b9436c20c5d91f1471b95f82df96825deb20d84c8a3fd053c3e20b8567c1694c20ef4a66f5edc24c07f511f1732427943414f601c9b376629a2bd307983834e167bc6552ed069517680bb2d3cbda51986c5331ca35806bdf327a9c262e8a26770c84d227e1cf3cb785429960f145e2ff4232d5f80388f15916cdccf82a44b548605138c5312b087aeae0f2712cbd61d3557160b14d4abf04317fda74db11186f0"""),
-                    TestUtils.hexDecode("""
-258FBC2A94EE48B415DDADDF470F14FF8DFC069CD949BB88812CD27B2BC3D9522E00F302C0B72533C9A612A251BCD292A291F3652695D318927CE1B922125B287FFF9B1AA2B79180622C32AC624E0463E5F48E86EB5952CA1A95BA51388760FC5374F0561FB8873018DEBF785FEDAE4CCD1A41820EAE9D7056BBD329E7A95F21A4919A109BD27D26779C3588C9A886EDBEA1FB97A8048DED858B299DDFFECD4D678820E5DB6CEEC8B1EA879C9C22FB7F59B227B4F7C6AAC577767D899B2F11FE39D1ABC527DFA0E656F25E53CA05630215C5CCF0FC071F124E48C57C5344BB103D51A1FF24114426A324BB16D8F80D3CF2D0CE573F4E50DBD1CFD66C05430A1109374CD84156D2E31C0C3F4DE2F1E225B5CAC05D56C4478929E356F7F46032E2719E07BB1EC207B32D241C87D87ABF28C7CBCD38267CB011F26A9B49090008389417C7A219A9F18203E6D907D63AF4C42C60F7FD99C7F9394021640F450A9A072BF2C1CC3EEC88BEC866FF1FB5F032567AE053A408342A56E3068EA168B9E902068EF808916EA58004FF31C31DDC3FCFC2CCC92E0DA09623FB523AE46C8CBEF92A1CFCF4C0F523430E60449E5825A81DEAFB2E26B3131F0383B8FEB4B1B4E1499E89E9C5FA2ACAF1F37C422CA41ADBF907EB984DD65D8314E2F71E8AE616C0518DE9B8331FB00983490483362802FBA242E4CB71056E3256BD097504AD13F577B36A2F9FBC1EDDD25D9DBC09B3401D58FBCC9DDC8E74BBBC897552FC826620060D3777455BF76EDFC059E5C02BBCCC0F05F86ACE1903AF2BB08A962BFE9E2C435EE8C580502351669AB7DF3D9F6B4720A0509BAEA97FEED3B8C769AC5D0997A097852C72DD6D5FA0A7144E08D667F21936F434953EC3C88B5BA2EDAFC4F87BE8BFB5A592847D15D5E5D972710A4A75A5772DA4D9F156563C17B1F0F242457A198658524B0D6A46DBCD26EB9400DF3C4C942FF53E1102411101B2FCCB58E3FBD16E725147960AD56C6CB6DB336857EF137C49D53D16E98CD7A0E856E2D6B391A95954ECEFF3B9956A6D0C279DD9E1FA5895D37EEA8C54255A6244002C7542789453B41463B084E7FB3361923C43EE1BA115CB254F47E55E6EB79C74DAB4C9CCFF486B8CF5830F23BA23C5CFEAC2DDF7D71EB5F54141C100E0AA9873D43F0AC1034C54193BC63A560A0C661047C508062A70B3E575CC185462A75230D91A3021330D95F3C807688B032AC15A9623A833DB718D04603ECE983F1D21A4513E80CC67FD34EFF8E377B775142344645872844BA46F5AE6971E68FD8ED640BFDE9F276E26B208A8F3D74ACB739C7EA6CB26165EE182F165EFF21905DCE3D02E432B1193CA108B6ED066CE95D549D9B12445E05E0583EBEF32F17EB121D80EC26C1F154C4DA2ECAC841BE1CC7224576EA43ADEEBA53C4D58785F36B6BC0F8AB23340B92CB87DEB0230869A52DC634F68A83BC1AB8A4102264CCDCA39A51C331F6DBE30C18C00A966E5692CA86399264399DBD3F02FF8706302462D62E4D16B5C2FFEEB02A7E8447C2CF1A3FBA5046C792FAE0B1079621D59C1D7AAD17CD6578964D1ADCF1256F2A4EB4D534C51313BAC17A9383B5BD02EDCCDFE59998D2FCA7F3EF52CE0B1842368EA66E0A83FEB581A7137004655957E91B25F5435BEDC0ACCF69238AA4CACE418F08ED0D961E13B2234187597FCC012769F798D969C13F6BB4042897B0D8C32E6CFFC06680B1E0A40F5F149B5974B0E7F0D45367E93B415F7F6DCF86C2131137DCD0DE30A3F1FBCD5F8214AB20BEC9738AEAAAC200900F4B2074688C8F3026140A354A22F83BC2ABA66407F87671C3E7EA4EC6F8272B6D16F3C66C76ADA231677A9B1CF496B3C241D2D1ED7DB703119CEB162EB097A0AF2729D0D6CA8DA57D83E1BEFB880EBEFE090F6E98D64296F7CA90EA1C2B26131676232BB394BCD1A06BA83004BEDDA287073154D3BE16C242DD65839C2E1125B3E66DC93A95C62F5DD31CAF9895646D5E2D183D40EA09843F5DB189B41AA4CD1B40C5792C2BCF9F44823EDD4246100457299E30EB2C66896F89F4FA250AB19CA06EF5B899CB96FC5E0369B773691E3447E68475A7552C10F96F44B3282D92AE49A246508A67EAEB9F4586074D6FE8A44D2D27C7B8FB4EF6BF701084B73641E41AA7275C1D6B517FBE3D60F64BEB9119F3FBE96A11AD45610E63CBDBD79929003BD1F2DE89DCA036973974FE5C5D5A8B5BF82DE0368DC60D75A138CD91E8A9233BBD439666ED1211EC2FE7D7BABB1247315DC480CC64CD8F7859BB9BFE8C668F112FA96EA48BD91088EA44F40D3E57314D3759F867BA52E52BE822400D9B0C2123F50601EC5F8E8B562C4B1F49F9779A99C926FABD8A74173195CE23173F4CC4098EED74C8E0FA74320772EBD1847AFA1B397F5A6F05A00179DEF2E6C3B092D9182CA3C4E382C4092396005D8BEDF6248C81D3AA0854F0AD43C1079CFA1E0A42650EC9D7B9077BEED377BF5FB2F3D2717BED04CDF2F7E7D1F45CCC6F71A780D2E5C3516E5F6211815FD691E036E4FA002079448AF0E005B67D2939CA88CBC57567F634BD0402EAB06805ADF8BE550B3E27452B372CF8C92A7055714A228986FDCF4045421321555BA06173CA0A761BEE635C541FC984C5BD3857DE696E9B21EBCFB87ECA437E9A7B54F4CBE2A601824EBEDFD5446556B64E1A88B0BD9CBA507C5419CB8CC4CACE48A0C9668FD2D045E9057B13BF0785F59B35338501B73B44CB749EC2EBEA97C9D29EECCA6AE1FB719F9A67E8E175D50B2705B6149E9D5D257B34487B547FD050FE5C998412AD0B4159C2225EECB67903FFE332CC3B86266C22FF7776334543C1E954AF5A89C4FE59C1F1AAB5097024E2AA7BC09831C9A5ADB713591106CD3304873BCF11A9138FB08B7485E123DD8F7C107E336659DAFDB866487E197589DE47D2DE8298EC3560EDE21A633F820BE6352CDE9AD51515D309C4BB4709F171CAFEB407ED1A02BC4AAB53588C2CD4C273BD527F8B4078925FCFF8954536E0B4366E474801F5B938A4B81F037764D5CBAF19F237CE37D00246C60DA652B76469BECABD51F873DC75E520A75B52BF585D664B4CB9A09F8EF3C03FCBDE6B9E595C1371C2CFC24C16EBC392C75D2BA04212947944BC0377DB718A7FAE0F6F9008AC7DD30B94C1FCC6BAF750217C0119736E4F3B7E744AD72F1F0694BC88F71E4BE51ED8669F0E814E12FD9F833286E2064708951DAB852774D4620A26100FB44A8A92B86E17507C036CE6F3ABCFAB91193CA4BC4D4198DEAD7CEFB71B01FE2506995F2ED3A02EBB0355E6B67A2294648B8D1C1445164D99B966588CC253D1EA1361163024372E2550E9D29AEB4234F5F9B20AECEC01862CC98365F1C57FA4D5E0C1F8BF189E169669F825DB43172D1F682DFC7729B2AC0C103ECE4ACD982D86C515A208519D23F62934AF981DA66B97DE2389F2F669EB92CA4A5C4C844FCB19903371AEAEFB32E210F2D1155576566C7B529A98A1CDBA36B450F3948F34F90A49F50E7412E6EA68BC3BB0B0A0AFE3BDDEDB718D5A150EAEA784859953FF1DD1B371C539243547FCDFF4ADB06C61CB49EA5783AD06BC8C1F3E32A95AD3CA6D69EC1D226BF9DE0562888839E6243CD150EF6953C158F9FEE5EDBF173997D08509EAD1ED4DC2AAA33E18DCA6F59269CE457C412B58C4483BC96AF5069D1C2E3F2F8DCC5FE2825DA21AB2280984C359DAE44C2367D6F002D64AB47F9B64B5656622517A5F7D5E1A78D4182B6BAA82E0490659CBF2724080A9ED39BDFCFB21BA362DC29C750C5034A04EA5A85799E01FF8B16ACD2EFB8328BEC686AFA20E591E7C7FC55BCA8BA1A3C388B785AB0F57208CEBBC5619AE3A0B799D1816B013BD67D440A7AECA7D0BA517846B68F70CB5D6ED46C36F663D6F242E8FD8C620C9383EE1BE9250D63467504B229378D2589B525348DFF852AF1676A18DE321DD46D7AAFD3DB1825F192FBD3F160E8CA400B201B1A61D0864257CA340F179F5F1967659AF4789846A4D086041441DCF4267681B83D4C8539086E276C21BDF677961015CE550E41C2C45D67A09AD8F56AC3ECF1058F366F2E35BAA9353A5CA40C7021DD09AC9FE0187C10EFAC7BBBF3B1A462C9C6C96699741AC16D3526BED3B30AE25B8E8A9ACD8CB2BB6C28AB89F0A3F0D0F40D10AFEFCCB067A37A2C93D3E8399A366B5FE4829870DA75B93249DBBE3C9AC9FAA70C4E414EBA720C323E6627759E7287472C3DB9CA9B1A5FF03E872374D6B893BA4887AB227E989D9D4D348B3965F7B96C5094F42D84432EB771BFE757105966C9A08D6C58DED7DC216B3D0ECAD2D0B025DF33CD3D813348B5E08AF95BBA08DB5BFE5D0A151C98A01ED27661CCF80F416A1AA260EBB56526AAA289F17FF5AE97CD0907D9143BCAC73F1F83A2A8DEEB3ED209EF0952D5E463D87145E0E4D8BFA1741E3FB737E14B5924F436D0183D98EF836DCA3F9623B50CC13EBB5F94EFBB76EF9BDF40CE6EAC9C49852D08E2A5A193D1DACFA04EAF3C545E0E25E37E94DF51FC1976BAD069CA530E19EED277141BE62239F47441B88F6555B0A998C1BAB53758A41CFD8CC4CDC54E1158DE15910408A6E79D33CC37F61917027E9D2F186466F704647B1CC1CEC06DC1AC37D1A668D44DD8B12621AC3CBD2039BF5A843A86FA492A847D6552E1570DBFE008F51652D65D03D8B613AD917B81CACDFD19DB7F4DC9A14E237CC6D7268FC5D3B228BD88ED36D8360488509C974E01433D78701CE07108C67D0489AE94076106B045DF7CC508466D35BCF156901E53AD2B5ADF8795751891A5839033A40EF3F5DFE0BBEBFB2C9D1C000691F902AE490D382EBC87FD40E76B30DAA963254674C7B6F304DA2C8BDBE8E1DCC87DE0486B4FE6B57A18D5A9E9E4BAE776D6147FF9C98372426EFD30C3B2479231E624A253A7B0BEE31E0FF739F862010AF03E227A12C3ED1F33EF1C0DC9D48A100FA24CE5C5D8B5F88F92BDB6A3A5328B0AFA983D57A1D3320A682B5CA94E75DCC69BDF2AED0C05887B791CE6F6F8885E4CC55C3FB050ABEFCD3AF2CA603172AC78B3AF2B047E506639498D0391A06DFD328B8E1BFAED8F76C6E4A93E733ED1097DAD8663F5BAEADBE1562D40C772D376786509323BF059FF17A5E6EF5A31BD668954766417E6633BBEC90B53ECA61BADD4037030A55A5EF4129D4958F6A8A5ECAA1AE7E220A87AE996AE8D9AE46B9C60FEDD98FF1E67807037970C92CFF9EA4B64F0BF8907198A6C038F9826CB968B1F301952E1F409DD6AA4EFFCAB157E792ED45830708ACD7A50BE8C08FCD12560344221104827BFA495604A57826A49F90B8B694B2BCACE4040627AA0989E3DB4FB7167F50E8A04982084FB3ECB0DDCCA5F24A7398620D19B37309A4DC0DF28909E16645F35A81EB3C5EF6BFD650571DAB03A7FC02FDCCA5FD09C9D2D3DCA888B8261433DE88D05DEE5D6165080A237D55ED718486AAAF1E2534CEC3A87048ADB40EB9F9DDACFB2C883EA6B20BE1EACBDD72432C7A6C97721FE1E0D9A5589C951F7D46F2C5F0FFA909FBE12E1CCF00161E741C4505681B0B018FFACD460528795CC3810BF7F94FF9B75884956798F21ABF36DEDDC1F95890894EFC15EAA6F19E9148C71EE9BF4CFD41EE3E5DF8A449FD95E5744793B9C223D26ACB44E691D7E5B68D49A19687F0237E7287841D3B0B4483E2A7C29CA81BDAFA5D96D9D2CB6FD9724B9903E8CDD03DA810EFBF94BC7179349E10566B5A314F81327F76C5A8346E222C408EA43FE29439132CDDE79D0D69C45C7217399205C2DA4D33DB521940C4EED74CA22645D5B6A549E8712D0B8CC50DC180067D13457ECE66D489F687DE218449D974620B3B5462FF3A7F00C439AEC73A53303AC51EB84BBEBD51AA48A5DFB8F93556BA540F5101CADB8BDB912D7BC87EC2AC67971AB99093C8616C4D1F3E7B06003E4FF22D99E6CAD7558EAF5C1410199EC97720E5C9278548E7EDE62BE9105A2B27A54D95673849CD5D60424ED97BB64798263F98A63DB58BD55965D3A4283797CD88C7CA67B1C4F90FC7237EA35AA24DB18A4420B827B3FF7FA5472C31499480EEF5A97BB967D1EC46E7B05A3D25212C75972D48A9269D67048132399E1BE0C02150A3D48717E4DEC2ED47458EB870A1EEE5381209B5D182DA2093AE46A4D99E3D4F12ADD71001BDB936FE8AA96797982F88EE67AA2E0F340E7AF498D5AE05C177F0BD2650A02ACD4CE23018F9E00DCEB9794C5C76418EFA65634E01ED5E9FF94FF86AA73641117BD554A9391874A75C7CD1E7759755B9D2A7F367621C0011F61B588D913C7AA0A0EEE3A2201426EDDCD56A020F54AB41CD899721D6E1F05F8774CD5FF6417CB68EE14C20D9234369C9CA59627B8796C37B4ECF1DE2F981ED0FBCD5737DF0B82637D599A61826909C978A2B68CEF01C5CF84B50BE77B49C1887544779BFEAE3F533286287E48F0ECC0D36C27F1209314726855E61E5EB5E9A5D7E3516E29DD369F94D72004742E246AD4699C64EE996BC7B2A079344ED32A528A9CAD6D5AC02970D0168A8B5BC713E28934F2880774418550AC2F534D06B61E627BCB8711AD9FC6F2A4D9301EBB74E1F3C73B05F28DCE5623BE1BFA871C14A947A947CFA806AAC43AE515D6CA65436BA6B66F62B0FDC8AA4A748DBB72D9AB087AA39561271A986229EC02BA3719CBB1798DD333248E4DDD0B6EEA4169D3B03C9F4DEF9616BDF97AE993F0FEDAD31834B6F78E23164B556A39AC1F209581F61AEADD8E504E81A808B1E97F79F987892A8F7FC35FED9B1A2E9D3E17BFC5AA64680DE98664FEA7B479567CBE307AF2A8516BE4CBF9EA030471428CF802FAFF85701AF96CA1D8F50F5A79AD63F20C5CBB954011BE4B1A7F627A8B5F5A0D022D27BA6FCB8D3587E8632A2FE5794C7E8FD09C9AFA3021B9F43BA82EF48A3B1F3E40F2FAE182DDF9558F7033773F5627906E159B794C4220219BF1A9878B175996A16F3CA1DDEDA56B16E63C504354E5E42FB90CE4D2C1AE7C93D8CE27480F3BCCC076CC253B574A7BFA6D3BFABEB3FA6A19F196C7E31A0D6E9477F828689FD951E0FB033DBEFED6C680F0FEDF2F43F48C0136C722601CC7C4B48B24121ECB6BF84D6B3DB240FBA1E014F7E3ABDFC1F9B98A16F4D39826BC1EAE44385FDFEBBD649BDDA129FC7EA3F50A5F481D3B7508EDEB04FDDB3006D6EE943930E3F0AB405D151F21E8AEE5BD87F225DA6E155158DE27290B2048D384BCC54F0EB905961AE4CE5E6E93543016F62445AFB5C39C3EA2F3367A0B8F0FBB83B37518C5DBE1CCA1DA9D0B54F34B15A1349A2F03563732DE14EA9BD238F481D9B262DF69D24A91534805ECF57A538D8F08B2FF11E96EE692DFEB106D3515A7C69386A781DB1D5434AC18713CCA12C92557D1E7DFBB15605AE3BA86267F3E6CBA42B6084478E460F092BA2649C8C94D66128FABA2D0EA7D9BCB20663B0DE6EED2623A061778DCB40373B8CA38B02B7A49F6940D6D11CEF549CE80212CE8D3A85CF2D774431343FA1FFDBC71C5334B1CEC4D4E0EB643E1AAD67D1A5B73FBB1BFE47EFD83CD17C798044A504FBBA5726429F41DDEA7B7265A76A48B0BAB4845704C771638977511092BF6C6DC9D574E6288C6A3B96BFD37FAB695F8DE20F28ECB27EDA70A07FB2ACDAD88DBDFB2DDF06E83ACFD3A136C5DF4811D34C242BF9206D579BA8DC6D20E8600B726C9F1B918EA573B9DB2F96444E17B6EDC15822B85D452CD99CBC847AA205EF79E574ED9625E33B6EDC793E5"""),
-                    TestUtils.hexDecode("""
-d645f682a1b7aa2650f431a828463cdb131c1c317bc2d9a92477f9ce4a7190d287bd352213726174bb967d2538e6f796698924d4808a15377e3d05877a560d2cfbc13150acab39cc6ec464ae5fe51ef788aad862bdce80a3c3669186598ea3f01dfdf9479caf10033fa89d5bf164b454b1c909edc6a85793b2f3662ca4dabc42bf621b2c5f55b357d2b7c97b21a1748d6e6d0cb3c2e1d891b057f0c3bf482f04add99ecb92d32a099443987c25b1a5e26930082e9719fe2ca845343c3c0208d35cada03bf51f8952ef49c18c916c03417e217342ebf7234cf9270522b3f6bf7dbf5f7aff8b245f1833b8cb314f86b1e407f4e0b49f2f2917bde67c9ddb7fe39a64ad96811980b530df51645a89c365602dc6a6b53b67e56c74951d72e0cc2a7ca5ca0c1b32c3c9700fff54c317b3bd1474cb3cb402a85ba80def7b994f84018b9241ca20cc5ebe6cb24b26b4ee21904b658954fd9716004a009b762c5eb5afccfa8f6153d1cba1358653a88c0b87dc6478578929baee5bf33065aea3dc0bf333453ed0fda613d9a35e00eaef91ea96d87b676b66963d2affec30cbd7dbeed1f36dc93527db0a082d494afded3ac6df843e385a53d8a7a0dddc2a38cab1a92a649072768608fead5c538d8767a75f46bb73f7971a41401b8fd50312aadc6fc5f2096007d6002013ef9fd66be15822ca3b001540652636a8dbe65b2b6324885504ce3233f6fab6bdb5d05a10d85ca8b9934a5fe39d7c3a095530554d058f2f99f9c2775a0822ceccea548a35fcae73ee931ca01ccaadb226f91f0104743c423b220b9c76654c9baa1a1e60310673fe86e8c71eba544763f94b80dd075b3fcfd82956da9ffd4d4a0364e26cf4c4d7f0d2ba435a4e7b51b01e9cf55251a5f8fb4e32ed1fdfb6dffac187bfeab67b7bc06fbd1d623c68823d45d708ab29117ec17fb2df9ff17378ca7a021b504e678e4b7371f2aa05588d710f292e547f719f7d2e66ba39d382807ccd3cfa8ef2d33516053e6ebdb2a8584982efb880180c45480939af7b3d72e71d046fc78088c16aada249506b079daeb16056bcf49d495e5f5bc9b64125f66c809e02282e26a8b8c9656d19b75eddb4310daef82ff90bb199142ce3ea68dd6ef33cf4d0f2e7981f2d6d78beb9aa10ff7421804231b02b39b3e9c4be9363c49fce0b5a460f49094389ef2c28bfc45c805a563dc2202bd9da12485eff443013dc8090be20ba1430eb71516fb36926db06d59f5313d43294d09a5c242edc04ca7f1f69b3f87861fdd572385ad400f66ff9bf127e866957b5b7ef7e16f0cf93cd10d77b87894fd8c0f184f0a359cadbfb5fe6d91a06bdb000720f202f077cd4bf5c8b149565c43b4a07cdc5a3dae7599d26f3931d101d086b9546be593ea0bb85a1807eebaaa798e57d88d4b042aa3e3f621206e22f66335792b606f419d1dc63367d73dc462ebb177d3d9d4532ab6c39341b447af8a982d24300226fb367987aa37ed10223083e4db66a5a344628310d46174e0c8b466fbc0809905d416e1b742f3749ffe7ea56ec6c28b085d71d4e315b4e49d6ec945d23ecf5dcf503c59b839446abaa0ee57179a6567ab4d02fd1025b671aa5a464e1892e9e2b96248107fbe5fc4b792d1b6f62ecc6195be7acd19d76eabee8e8deea2ca2661a382f06e4ef90179a4fbe255f4a617bf6c1c3c564e05d1eac7cf110759364e7d3045b2330a52bdbc8ab2307e876df8b0011bd2361471c6cfd7fec98dd4161bd7f7517fa6bdd2d678dd4dedf71dfef7eef7d28d03131aa2db37f163d16818aac1e4daa94c6fc8ac8d76f03f981d98166431fb42081dc565049be93013f71832aea1c20dba0112222bd1acbd7e7c112ebfaa6e264655950a6fd78da09d55838d2f79a87a311eee67f023af189511c7e215cf8bf5b8f47ec397ff8ed22f5825814c86712c289977998dc8c7ac8eb60cce95ba56efe213043e7065d8c6e6c1c6b7c4b87f807e6375fd93e8133b9ca61735d2399bc2f0cd4e6d28c21c4172f26808a70ec7d5502449e335abfd7ec5e45fd298cdfc8699b2607745c30c89803cc741b1c74fc6698fa95c1397b59ce6a08a19d3572fa395af1f913af021cce85d40f53d511b2d6ca6860ffac07dae4de99cec54b0608ccefa3395e327d67aac3f8940c03c737f0066da5435ff060320aa68868b2fe309669a014e0ce7eebcb3e9f3d27684c0d14be48ef4d8de1f0f541c2dc22160aa238f736de0f31996fd1e554ddfd33892e998180e4a47fbe34f6e9f2004d009e83fc55e7c921a73390f6fd44a7f32122968e174fed54ad1117344325897482707ce6cb45121266c870f3f560c4315f046e3798073ee0ca7ef718176458c761825f7288b6663bf48b6efcc50e35a5ad124772fb64967056ab6a39658973471ecadd3d666e6f0377fad3b7390dc9ea67545fa030d1085244082ac60d0ba4d6f0ab44167571324e40ad664fc95c25dec94bfd59b32332ca5efda8288965284c7f88fb8045af9169eb63e98405e2aa3e949d4ebe07f3450ce6caa14e2b399e26a347d88b2fa8a301032c39bbbd945ef5d213cd4b3418c25cdd175a3ab8ffa41679cf6359ea3c28905309af59f0f92cb1db581e21da648f096171953fbf62d53da61da8eee1d24053270ef6911539a7ee93c6ff45a0b465ca879498e131d37d1a05be88fad8cc28a3026c7853b9a48bb8f1680889ebb3978b738ac7c3c54a0bbf1ddd79819a70e9d083775095e1daff66f72df70cf17e746c70f3d291a343d4530b6c9dbdc861816ad799b1a63f807fcf791fb1ca2e3160543abbd10e4fab61c18c3c4f150519d9690f7d22c10bcfed5c211a6af6f438737402b425c5ae274ca98716bf64b127ec0c7a6cf3598e9bac44149b93310ef5de9fd8381a961d5b9c166b7a687072a1aa27a8ecb2d9a023d353bdd29870650e0626931654ad80a995d6c5ce63ed42ec35444ee57444ef7edf45afe7255739b7ea731dd4c48a1497b5e6c135f4ddf4cae02577920f795809c1d00a391f15e7e376271c0cc0a09ef69efd28f6a44b6d2a9577ab7fd2198f81b92cf4094c7186e72fc3a379ec9e31b7bc12873a0008f40c14a81180f4caa16aee8ed827341c08fa4c98d3be393d524abfdf5546999acc4bb74e6d72b7db9c443bf8bc300fbb0d19ab0a716001cc87dd27bf2605930cfa437c08b0392e8526a26dac97e1e692baefc515eba1b82fec70c5eb4fc950386be3a5eb3379537100649cd192d611dc90e5787dccc69a364afa632abb31de145279e9d736ac1f6185f332b75875006f01eab3a48ad573d4e9b6849cba181d1aaeea5120fac5da72d81e7a36fd0847fdfc5f7f8f589b98511bc086a107d1ccc4797308be5b590ccfdab138078ca19679a5bde6962909491e1df2b048924a235819a7a28e3e3e97105a1a400c0997376ed9ff34b48d6076fc8d9668e6498171b82d7dab2418146610d80c2c7be50f614c6d5adf8511ce282d2175ca5101bb18dac9207813b9be0510a2195cc2c746d2bb99d3049f29374664d74497e0372994583c788765f3ac918db9a4d4d1f2c2482f50d013e7e93e0a5228cc03f4db0cfd14aacd90ed05b7ff5cca2b00f577e0ba47e7a0eda068f1aebbe688f167e3af3bcde28b3bcf0e89c63389564fd60be1c8919ac245db3cab86fef9d0bd4e365c1edb0472f4ba23b22c1918a399e3e08933031b2d0ada07b4c89abeff516f06b67e2b5c6bfe4fb6671ea4a45c375b9310f07278f0594e4943f4e45098e3c68c2c7f8b4eaec3b3d49a21c077469c84407b2ecf958c7aa3ccba4833a0b8c6f6cd8475c4d239608b9d25bcd9324326b4251b89579f2e902724f26943ae92b95487b215d719236f69eafc46070695e8d4a93053e275b93cf87723bdd589c15f722c093ca50c1d54121bcbcdff8c4e306cd4f11fcc681d6af09cc0de076a252bc8583b5afba1405798756432a729b177906ace7f3b8340f3526e7688fd49206e6853b4c72979469a30c584786f2b8c75cadea9eed04cfe68dfefbdd2ed5e1e2b3397ffab7c5d84e645a4049e50bdb9cb2453092354e0112cf00fd214e22681e4111a7d4563b84828d6bf6450facbdeca5137699c551f2b0c7a0bd5ce147dc71dc2bca5b0abbeeb109e6e951115c9c8448d455bf723b8e18e31b480e5b17c8de45d3f73ed313b9bd6a8f5156cabf25eea4737d4dfc8ffe042c6cf665bb346d89477d1faf60ace914eff5db92d82ab2da4e08de466f532d1f7c639d71e6c3dca9bff0c5a4948540cbecf4aa65c4dcd7caae9cc3ac56c04511518c1ebdd02aa8285b05393ce9fc2d2a3d8fcfcf79d4f1811d9073346d67f4f9af28d15706d577f8592c653c315a396e03f3dbe81c339c220aabd4f654239b14dae453dbd213da8819df690f38ab52a1f67319dce8ba5cd33e9bd8f5e61c0e0107e97b7bdc384269d410cbb77e19f2d89e38305c6e7dffb952e331bccdf884956c9c67ddf2d56c048b31ecaadea55e8efbbc94ee0a19980cd30edfc85d6b3ebfbeaa51ab1bb01008554717bbc6b17ce9b8b255707f95b7302d63b0189aa4e9eaa966429c1c1b9d2aaee73460a2335455f8e9df22a2c3861cd354f5163b1f1fc212f709c040516172a63acc5e6ee051f5a8a9195a3c0e3000000000000000000000000080d1418222b""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-8ee898ba956b2d9173be3179771f705dfaea460258d89ebb97518aee95f7560abe8e02119cec52c27d34c28ef28453699fd6ce193970443d211c471db1d15d60c59facdf1e49a57e03e2398a1e1375ba9f1250828cab80097369832edbaddc174c175033649f9dcaf8cb0e3bfcea913eb47a34946919f79809194df8daa2c4ae96c85bfbaef5d2519e3248b475b1e3f99cca049afc80599e671eca3ca8db36163dd4356d03929fffae072fafb039c2b091e89294083573550f5f7a5d8eed887e26379856a771f65d31a70a74db83ffe8814b7b52ae41bbce25aa4c33082177045d6d2acdaaef17bb73855f42001469c6b0717ea0a1dacab68372d25b575abcda54cc68db475132d20cd722f2e9eb7c2de6280ec574ece4c921952e79833f1338307d468df5cda8a70441b362cedfe524f2e9167070d475eaf2339821a1a1d576574b986d20e82d69e91cc84ce00cc82f4aa1c9907f6462119997701d9bca1788f1472c03bedc490d840301dba631eae8c1113274faf8923ab9ebf52cc80bce16b1db45d2ed8e4a14c4d63a74cd8d91a48b1663f8246312624c125e3abebf2d57229ded63f422e4bb0f126f9e47f5c301493d4c63b0ef611a7b141b74bc4971e2b16d8156dd759213ec7febbe076a8a534535353d01617b2d119f912d112e4f53a06b9f267b1b4d2feb6688195ff5d57065f54b2a18cbdd8f9d57a3588acb5822291cb8e01e2cca5d74547db3cb84cddc2fa2afb9008af15aba2409662989772108283c78b6a745b3f8e311998de25c880ee8a74f2fe99e45a7ab3db69e7849accfce7f8c5b726a888dd2bba623ab26145c933db5ccffcf7dad6fb7ad918f93fdef9f710fafa54a29b774d1ebf7f21c339c56616fa1c3865a0d57b45d0c4100efb16f8f62972cf5c9855bcc537270dc50c354c324462ac1c71d671e0bf37db744542e4ea766cd5d96c9e6349f64046d8c402036372d43705b33fbb3a261ee63700f79e1c18ccacab0d351c697ef40029c08a76c3a7c2bc185e03589a91d4851af6bdf83e3711aae0037452a2495d7a88d881504d4d251a24dfa389721c52afbfd0ecef34ea2458acf120bb122e614658fee8af89dac06797ea2d74ec3ccf3a1ab4ff120d5d69e0e6b08caf9ece5c58d0907419107d610ba0a61359dcf3fdb6209c6ace63e9442e67b7e8e78e94cb21143386eb5d5011ab83cc9d5c5bd03af2e1131e18433f0372a29c4f187049f7d58b18ddef1fad39c46c433268ae6d09ace463a5e49a130376a0dd89b38b3728161b14ade010f532172b71e887487e9ab4eb97f471f6aaf1e61b9e7c6742cc63d6b96443d67488746a69fa23cd89e977b891c2b57351ff75f2e0fd0316a561fbd37720cac1bb938ecc8fb5f5a96b97fffc1029dd1ffaeb87b20ac792e96294eccd88d2e8ec625e0fa8fec32b1592eac7f63c53320653dcf54ed35a05809ebabc6d382fd6eef515adc3e47319052278fd2f6f2aa22f6b85a71294e9d905228090a70314287802dbde42cd94e06747d09371e9860089f62c2ffcde6913a7b01880ef254ce9f02e6817ca231053d1578eeecb88c5afbd1cc23d5e8f10d983bb9b653f03c21fed44c3a327b967fec03ddcfb6fcd6ae38f2b0e1ad455c772b5628f2db1a9928a5be2e782871dc99c5e53d47a7adffff983ddc0768a52a4ffc3295f804bd06271f134c3d54b7539ec4431b34c7ff5dcbadb2cda2dc2934da8c153df98ccc225df28998467a782593225e7dcfa86f51c65777fb79d26473353a871d82341bf9685ecfb2a10a8525d7962247c399d19fdfcd24da464b04e3e312292bc7749f15fc3948b1b49c592f0b5ad01b0d01cc63c3274a16c1ca68b27ecc446a440895009251245a0989d2a643293ee17569c6f8551125279d3454472c8697914d22dcf5c2b0da92466fb66f08710957cd1d54928de436409760d481e9279fe250d3d4f2759db8fd7d7702e552cf5cb8aa30acfcd2af2c0546fb2aca0c687570dd398cbf0c1578b39c1b20e433f0b8a96d9ff715cf72b09b78f011f9c0c05ee2112074b7824179be2eb9099748fcd2d79919399e16c31adbd4decbb52bafaf895575e0c7bab7688f237cf0e0b88b714a3ac1b7742257d5ffce53f92c793f5c06b6193e55fd4dfaaf05559e2df4e12e5982c3679520db10dbb04f88a2a643d6ea0d96a0cae9b45c9d185d2a896083cb2c002d56f4559cf2aaf8cab564e7a5f14628b22cb8c0e2818f2e7da1ad694f9164228a773113fdb0c3734932d9c845fc694ec3c8b0237ece02ee1675e26ed57aa28d932caf8d31f9f6043b326211161266ddbd61a9c8d241ab049713977d1bf2d446f3c0860270a401095620db0f6faf43af3b1a6b1e33fd0d769501a27229e4195a138057befd232417282d9e65754d2311e5c547e5a85fbc34900edca8cf487ad2e3e7fea9ca7d88fdbebbc2fe736353df14221accd45de5ec983847d37821b8456c687eec93ce790e1a2cb6c84dfa2fd9aac2bd669d23c02ce78abcb1de43c4f3ea879b8b73123c00b48517b3de903922ebdf51fa632bfd4debb845113ed4ff66f9f20133a3f2a02c933a16ed747668313bf533bed5515b3058e86ee68f0d3f043e797e54aecdf7ccdf5d771613b000b7ac754a4ca6f2e2227d00dfb5231799698f12ba2975f842aff5f7252d49f05a6713487cebded694aa861bedd2fe11fd0fc4b4dd6a54fafcc6934aced6c75680042cb4137b669786219c197803f34b27ebc00c13"""),
-                    TestUtils.hexDecode("""
-7C29C0B8E2A111F457E2384845E7698DE4BC9BAEF093F15EB03828664AD31C387B247A525623282460D60290FC479A928024CF62571A57F77B17DB0AC572CB59723490DF79E9B1B31EF2C9488B6D758C43EDD9162D8F6C0B03F43B08D646172A1F8DFD71D4DD805A3AFCF1C4265BEBB71FB251DC9DEAE670A664BDF943ECB00FB7EFA37624953F94CA760013FF1270C1EE7FF58756CE19C204220713724AD03B10F1D6961CDA361539A8AAB6ADEA92AD782F441428C0018D85C0505BAA793C752DADFE92BFE8F033931D47575C9F83547DB18DAEC0FEE90E83967E0D0DC93281000755303F0F5F05DE041211CF842404CD5E24DDFA3C7C83DE3EA21EEECE37A52E16DC80A350B3A18E88EB3C81C74D25B56CDB446F6198DC88F981F2B1ED8DC94194D81CAAD971A9A3933E9319047C5F31530C7C98793A0633875A14FA5635CD1B0441FE267E79C1E874BEA968CB63E20E7C48E7BAA9CE8393FF9A239B5A1D613DA65F7DE78BDB793AC72566FDCD06CDAAF56E18B773737A82298902F7B4890EDABB766E990ED87C94005A2E2450AC1D0192D72468F81DB414F88CBF07707A95F549B7A9EA0760821AD710D52787730EE8917272497E5891656176F991F254A5D582B5975F95AF740421A3C18A82158AF11DB15C154F17ABE1163F997C64A3BD989A573D12642B9AEE87C1612A39A8A4FAF25E35AFED3F2DBFC8FC8A2F9DFBC683CDFA3227107C50526149557CD773DDA16E36782A278A93CD7F4D8FB47DFC37DC3E389D164913316A885C3A800DAD0C57B1082BD4D804BB6A117C3B41E7D8AE9CC9622AE3CA8EAA9A0B502FE3F5A449BA8E768D2C98013F681C68A5F4AD3CBBB83F302457679BCD3F35C4D6176DD8D2B670E87EA291EDCCEEB9917F98CDDF5EE1689DBBC85BBAA30D191F1965EFF8FA9B0073D30B1E2456FAF880110BA9E75E4E29C6106874D32944F49DC7E7E7C56ECB9D287F2C2E87A779052F9B84FF97AAE007012A5EC497C4809F0193C69E5B29940510A354C866505424D4FF3853C94687636543115A73DC407C47927EDBCC4E0567EF4E451F0E464A1385D2A0D740C7327F6E92EC6091845356C2620EB163D9F774D7781BFBC6F6F652A4A2DEC73203DF5643E1B4C3C3DCDF0B4A0B160598EFB56499D2DB1F1E76612356AF3D708F9D61D968A6A0193D9146B2983972271A4C02E2136E6593DC47FDE4FAF2540A8F7744BC3230529AD1C9D2FF65B7671B5A5B16AABACDE8D45A940ABA4171E21090AC6AFF54CD8230F7BCAFFC42C028E6023E55DD02E4B7F976998AB5614A5681C615BF8E9E6959B038188F71C75F6DE44A6B0498F2A9254F3B0968AE7DBB49872D775CB0A5725206D648862734F202DF470770AAD184F822C56400F16F30F8BE40C463CA3EB5ECBB15D51CEBCCEAB43BFAD7DE7679894B90419B65912D67DCF2335212E82EFDB6267EEA331C1439BE2AF62E584C222C1052AD91C7F5DB6AA649F230248A14AA6A532401A28ADCF822089140FCD3B1CF2358DC26939850DB2721750F1537424F6BF2020A1B4684ED79402917D1028C1B59076867DA809D6C5D3F47277755384C20624388EF0AD68BBFB6A63005AD1B6E48ED654E8362B2AF7BF114F2D144A420712FC4EC71D408BE55EBCA8C2F185E7132196B1B76AA7BE44EB55DF7C82C768943D649631E4D87B408DCF8FE470164D9E8DD1F48CEE7F6BA93E239F889119A4DEA118D93F1474E516139036D640EC788AEE708637A619BD1693BAB6C9EE9EE0C495C0D0F8912C0F14199AA69B960F53E4FD8E2771DE4AAF72117A5B2388FEA0CA3BDCD594D1760905F26482459BDE80EEDE3FC89F592CA16B65B27E9A21F1789BD0327A26EE2224C61D80AE8FA6053480048D15019A80FCB5F3B3C6F64C168690E4384AC05E856BF341531045D2952F2CA8BAA0B8926CC41AF2D8BC5A1576292DD67114D521DD4AB535A77E5E9BEF8EA01DDC7C65446D11F90D6CADA94AA1AACFB1BC3551353D09252FE515A465C1879071F6FBB035DADA0BD25A022B026AAA5B5BD420237FF097099CA2402E68E4530F97A003E50CF693D1DFB551DC4695C760138E88B8D11F3075DBF8A6D9BCB9B1242648C0C9DABDD9D49CF132B0766302437C0CD81A0889585869DE92E6CB30C31265C84F58E9437CEBA891422967AA546EEF720A8FCC16EC7591AA0D47998275DF1AAA5ACAD1E1C5868CA430F4FEFA0277262C69311FEDBCC083114AAEC9F99FD98631137A117A9B48B32A6D88E76F96DC58D741395BFC102E147C456D3A78A0FA3D186485D65B4E6755B53D301BD13CC88E75277AF3CCF1EAC6E9C56FE1F10DE05A796A14381551705234F65DD6E717E9EC275E38690B73973C9CAB27DB909C5C13041723BB18EFECAD808667643E87620191008E4D10F471AD153D27F1FF00D8AC6A8C5E59197AECA5AB496D8D10BC79C49D16DC7948C6AF62703D36059587F6EE038820A84C0F287D79C713B066E1DA5B32BD89E5FEEC248B34AA5841E8666CBF09C47EFB17BC82170CCB557D41D40CC87F2E6C0246F0B272733854CE162538DF34559473BA5979AEBFC0D6A16EA7B399687E672145A1149E382954815B41E7E37CC415057D7536E65FA1A35B8EFAABC7B9B0000E08B593496B01E8F14FC950632C659C0A7F7D59787C7FE6E8FA7FA0211A945ABBA5044918CE8482C6EDB366368A9DDB2F2BB66C146BB50251CE61DDEDD8D6A4A60FEAF0F794B7B0DB91C52D7ED1A54AC85D7907BF3A5A96A60BDDD08F60148C0B3237DBD56628982375A67F025B0E3F9EE13DF254E1D6DDDBB057203CEB267200C7788D01342C064FDDE996183646FD3C1ABBA5D2155383CF391FF16C78660D0BBEB549483A4A4A971017A8659616FBB1C3A8A2E83230B610C0C74B8EB32667765F3C2F31F8C0D4BDA3D812DB64448684AEB482DFEC5C37EDE742091EF7EE6F22E31CBA2C9B9A6656888F446A1E9D52D9E6437D22594A830958CACC6F175D4CE8423178B71E7CC81BD6DC2A7F6580A8A3A1207C34D6A1646BC3D89953A63D22A30EB9FAC74103FA527843D3BDA656D1F22E729C3A004B923D08C9CB18CF406FAA89D0D63782C7264D5A8C8078EE6D259EE168A415E7BC83E4F17D9E674154DF08CCB21ADBF5B35AC28883F6943083AA97210C6DAE492C6CA4ACCBFADD99AED15110B10C9904469B4F06ED32546130B0EC4B281622A5EFC9C94B1F2280F251AFCAE857C4E17FF5CF472F038E02E5B7B3CF5CFD2F3969B9B8D5A27C8EC38DCA4284F0280C24F01DD97A618FDC5EB57C45D9E2A05B44E69FE2E47CB50F596030C70B62437F2B91A67FB84205D95CAE259AB1D5FF0454C5B4D87F439DCB7FC62B704ADC7A84502E1BD8E6F52109BF0F36824834D574E07B9375E693AD477A9D74E94BC4E883206DCF875AEF7FE84B9B7C1C9B1858E4BF6735235FAAE21FA566C866ED7C952B1BC19A911984EC25AEE310D8A342AE32F46255E0E00444CB0EE90C37152EDB6C741F5F394B5D47154825279465F0F8B19DDD85B8D9194A7AFAE5FE609A245AD68786C9AC044C008A1B3EFA3A8F4FA0FD49A65B6FF562F33DCB63754BE76244326FB6E416EE3267F93D7B2BDC4705EE7021D5D2EE66BA8D7B9DA7EE6C354E05470B31406DCFD2C32C94C22A72DE90E5A9DFBA99ECA95F73A014A3E9B15EFCBB67FDFA6D3CAFBE3ABBB28C4DEA6AA21F87693D68F0A60331786DE02BFA9E85A8D2AC8524EE184EE738BB3FEFEAD7E19030AE883707DF67ED12E8757B86E6E5FBA26715DBFAE2BE0F90453868931629FDE97712E08A280FF8888007AC27DF2C7113C30604C5DB17538F026F17C7F07D2A94AD5AB367F9CEA87BDBA712363D11FF5CF0590030BE9B342A7ADA48C08BC42F923DE939DE79616CD346B3511F41CE695B3F939C101F687DE7292CC96691EF3F3CB653F4A67D2EE09C791F993C726D574440EABFBB00E5E6328FA70D69FDD5F2EFFFD37C9902AA45EF4E9D06059B0D8E3686C74C94CF2F0032ECF740B31E3F297F15343A0093EE0B8D7F8EDA1118D329D05A1B992755181429D410771E37B56E28AE2ED8C4DDE8422FFE91ACE348E443640578687C57D79DFDF917F8E60E0A2F1C6223056C373F58C297F0FEE3060D31DCF6851856D1D05BB38B1FF426BADA10FD84B2E08AC149F91DDF4A5CB38B290DED4EA3B02EF7A3DF42BDC6B6205D281CE4A48A1C13FA8080B6B4100AA123097A4140415EC7CEC57790D6EB0B4200AD3DD9FB7FBD056A5E3E9D7B7EF47F44A63DC908B6DD8B020854618F7662391DFC35A88F4F5750D282F81DDC50D0132707174914293E3655BD2942C09F88627C0AFE4B921B766BEF41E246FD23482B5B14F117E8EE340C47C7C405BB3692C4C9E541148C2B38281EF0274835860E19C2D48953545247BD1F7A76CA43956C069A17CCFB4D0B0FD478556A209B5376BE9207AB174D2CEC96E09E1F8C0FA07D8920B2ABAC3490216DEBC67030E9285B3EF6767AB11E8CC935C4019B7E68FB9AF8864358E6927D350CC8B9A40662A0987C1C8877AA9903CC89A93E1979ACFA279FCCD2E171A467B76E1103C4EB166273ED7B4878908B67DB77C4FD4E49DB46109DA4BA78D69E03B48518F302647B8186F787F4CFCD87CC5A45B98F7558ECD0612378306C9D69FBE23B06005CD5AD84F73A563B1A3C7988CE0157D2D2703ECA8575D8BFF972CBED32A231395655DDB2188BFFB413624639D361B3388A9C9E13645C563A87C610F6FE79AD50765CFA8149E27F7083A316EBA050860A69BA56D002A78640D71794980C83573A5DE69A697C2CF2E17C90BAFAAD3D421C6E1D8A55B3FB4700B666AE3CC3EC114E9DB428F27CE427E4101ADB49B84CA7855458841DD1F4FE76D9074D940102FC47EA633744C2A664E22B5C5AA2721017F3FAAF4FB033FBB1D508EB98E1D643406ABD4D69C030A2349408C80993D9F75271F913D7417DA995443377E6F73A7DBA24E034A9C4820117D1F0BD69C93FF55CFFD2D36F8078209F5711FBD1587435517291498926E7354558945F721D00A73014C06B2C9BF04B7E695B9109D769BC2172CA7A70700A1D5AFF6F5FCBE699FAE81BC34B0495A82BED01B983444224B4B860360C07F8C3035FC4F0C4B7DD4D37ECAFD32E8C121C677ED263338359E25BC4173D191E869ACB4A5F6D20FD16FE50454CDD269DF8CBE5795482A2B40D52BCE5FDEBA62D9274C9C67127580795BC01752740E606D849AFCD6ABB8340613C61A764B6B92863779622E40EE7A8994034E7D303F07EFA11ACB70419A53897ADD558CFE157CAA3D47917CFE0287500B3D70FE42AFE36853188BC815CFCEC9F56030C83E85C60401912C14A75A082DE2E0400F6348EAABA59312C51A7E3B6A5B39D606306A304B4DD3472C5B89FC65DDA54650392A02CC6761336FD114D848BD889DA4BFE6D32931793A6515510CD802E3D9F2C6F8F2F9DD96ED039462C587395C7E6861FF48B7980D492C23E0635464C7D1969C12A43BF0FFA3089E6B367AA65D4678A571A0D47A75056B34E3F8819F8B6ECBDD6BE580D423D902D3C22D9D787E0F1B6202DFD392AE028292795FCA0177CBCB09AFF8B579A87A854432827CF797E494ADF9F96A56777AD6215F284EA91D35563F25355D12BD155C6C364B0C8423E1BBC809E736CE0BF03E0C0B728F04E6BC8F3F07A0D952AC9D9530C77547B687E193EE2D3565AC755DDFFE880AB0524624E17E019466B7D0E8FD6E94AC2BEBEFC617BCC5D529C83A90D36D57A93BAA0C2ADCF360377C9E9D58C456FE9F3D49CA37A8C3B5BC7C231842B57D320310943FFC0ED2F5F622988ACC7842F8410BEF0E0671673E7BA61AFCD2EA83CF066A169BBD97098F4B4F3C9FE73F5CD779F502C584849D1AAB52D7059D1D4432C27FC9284FBBEE43D07493A38B139152ACB71A171D454FCF936656ABDBDA03DEF3C7B27891088F940C200AD454308001FEB2DFA0FC38FA74F85A30DF4FFA64DB48E7D40C158F058B58174F18BA482AC445A6A63FB54CC6C7D4C8089794E8AB5B38C41C7FF4C6A8A5F294EDC3FFCE3C01F2C5C7FB569CA06567C8D3BD34F82046DB4EE7F7491D890DA1FDDC55B12D90A7853D8FB52E86AA1FBC669C7ED349A2CEEA9EF18F76C23E817AF58101BC5CCB0346A607D6C60BE5CCDE5DB9889E040223FE98B17D31D64E8C1456C01353887D75EE3B82D66CA0679B1C2366C44E52D73B09D48A39D1BA3FC87D73772DA601EF442208DB763F0BF888D28338709FCB008B83671442CD9F7ECAB2C1E26428391E559306904FDE5BA21E1757D94F84F18A5FD8A067C556834AB257B9D2E1290FE0ABD3BD622A2AD92BEB2C6BC61852D58384A20B7409E4F212F630BB280A46CF89DD702B2508752D6A4DA94BB769797B6E7FC318B0B3ED50D7F8C5D8579526D536E4D43F93C055479D53BF6159BCEAD8CE87504EDF7DB35E1D03EC7B4F13802AAE0207A2414802BECEA39664110A54C37415EBD7BFD5D73E871587967F24EA34B7D06CAD805EEDB95F1023B7BC3A74A59A6C9F3A4737FA1BB087012E0162CFF15A539E86AFEE30144F320FBAF088C6884489F84F16458755561C9CB0723CEB6ECB134083C3B82E93BBB57FCE8D51374D38746BECD09A059AD6623EDE82EBCACE009C0C27D5FFFCAF76C9E91BDF5EB895FA1E9C3C0AEC0BD73B1582C067A45CA5D15E2D45E7316CD4B176D9DC7241B05922A682DF919B2D2DE2F45942D3AE254FA55C5D90B8DA3C7DFE2DD8381AEDCC9558566E8DF302022FEFE51F23AF6A018AAEF3C93FD608B0903376E193CB1C13021808ACD538D3426F9B3399686B6FF4DFC0A4552DEFE49D042BA76136719D62884D8B93A349C22E0320B823740DDB3794AD53312DA5608DABACF69767D76327BEA7A644A304A132F2D2FA8E7C8F4AFAC30E389A995C0A2F912E98447CB400FEAE35B3BE089F46CD48EC8E38D4F2BB44F1734C67D5125D7266AEE3E9D1E91F800ACF8038D43B6E10750DADF6CF70DE75176A2E9C340BCD2F6D87F976AFBCDAF5E35DA9B268D3AE1F0F8172A342CAF9602593A5ACDE03DDB482E80B825A7E91E8B0EFC1C8D00309BD170D9F12BF5017780A54F440A58BE4A5257AB67190C62DAF9332F3594303B419D44A38C3A8032E38599B49872D241AA44905CC851DDD0750D04815ED88711353DC2264C0302DAAF2FFD34E9716FDF8A81F7CCB5757913B380A68F153F62E0BA8335F8525CC3A20145C2416581612B9C29C0B1B941946B2624731FA50420716162C64AACFBF94B43B10E59E0AF3836A05B9335B0C44370CDD2E45BA817631FAFA2E0ADC801772F6F71860CC2623E1A802B370823D02442108E5C142B68CCC9CDD0BC2EB9B861D763C715D516540F19E70FB474E120F06BC19A6629E8DAF67556AC60D17C252A44901839143BE5EC76B834FF11DE13762EB23843D3FCF1FF9CEB41CB02DAC74ED6219288575FA294157E532BD877D1B711AF3B98CB0B4BD7286F88C6C00B6AD9E40D66F38525156A4AF35F2FD42A5F25A201C66DA4AB5C4D1517BD6CC9FD9764AE2756379D73C8D81CD044174860FEE5DC42B4576008F13A3504674E0D224A9F1AA780C3003B7856692676A5E581418C65BA9F049CA20C3EFA566315DA220E837639A899ED54A07B5741097C47FB90A81A41700BB5C0D8C3317E27A0A6CFA77292BE9186396BCDE5C654C565754DAD120719E571A4A14207CFD205BB4A66C02CB68EB9E50DA7B1FFC324AD07D8A8A54729621776FC5DF15CA39F3DEB6B810A735CAE0E1A84C6842E80D1CF95FDF5A6FDCD613C54DA1CCAB4994EBB81C632D192CA9AFD7FA662A865C6F193B7029A9B6F21041E3D13D50E5A1DA47D3D3C4B101488D2308954C801DBAE5029E866E869167BE7DCE6476A64FB245247A84E46B5F0D9FA9F7BB10756FDEA659788C032AC654CBB83F23BEA1F285DE190BBB5EC4135E8FA1B134DB5D1FFDA08C06682C2DCC51E0D848F8CAEEAF51DED21830730F6BACC2A4BACF7BA62D14B009116EF2D157F64A7ECBC971D50349712DDB0871D007B2FBF83A832416CFABA2B9CECD37207EB9DB8A017AC266A5FC28DFE64B52D0CD7FD7498F718B32804CF98D2F17D22C2957782DD83F4FDEFC8A6AC5B6A562C939D2D0A0FA6078F7E6B4C95159BEF010C1DF8448158BA29E1FD1AA076972E64A9D534B1F27930BADA08EB87BDE6FB0A691D4379DF0001D84F2F833050E18869F2FA7C00A6481E4F87C75483310949653D6B91FEF1116F25E5EB0A10C8C8723E9C1C80F75C2875FB0C448B3E25E7B359304C08C310148683E1D8391C432A8413057A7AF45289B1363EB203779550FE1F074D3B4CDB77B90700E3710D6EB4BD1FCC209F2406CAA67B98E44AC91B876762D597D0F03A404394AE81BEF8F54A1A898B2F0F0CC3D3B6D84D759D1F1C5788BFDC7657794E384ECB2D5307CD92F3E135F35720A44743D93D111F38791B60E7A64F51ECD6801DE0ABC356409D00D7F785EEB88FF3FDC801C94CD7972EE402217DF018958A79DFEE835B2E7C591D2604B83E2C8B3CEED7BED4DC66B66EA13BDA4FBF5DC3158035A279F57ECBBCACEE3FF346386ABE41D0DBB32E15B02C49D3F216DB19474D295AE0A8DADD1DBA9AECFA9C92F0429352B558F69AFC7070DE8D47032956A9978AC2F388DBBD63AAD776BFAE969EB990E72B7D74A0D2002CD3CC664E77E52"""),
-                    TestUtils.hexDecode("""
-98b2f93395be5e131e0c5fb8a0792062513dd8be0e820804d26f937064f5c0bb3525d053e16da6567186dda337dff3c6f30c8cf96891ddbe0e15b349c03c6d53ea00c6ad4f6bebecf17b32a6b57c9ec32ab4397ec8062d9e8cec7e747a8d9fac7fdb897c43003780ad783874c2fcfec8a0d86ec519c07531a8f0008fd88395e44adff523568e526d190c65ba17b2bd7a383bb3f5df73cc2b646b40c49d2b87486a368d43e6d616e45ed0d9b3e772c7261faa5e5e68ceff3b6abf9ab7677949facd2690d6c88f8ffa3e05544603fed81516a829bd3d9bc55e53f85f31e98b01086c31995834d4fa0eb82ed75d3d510e4210ea4dd3cb8f2a8b446ea8283fb5cae01f7e733d3c60356bfb1411f8be5a6d0b6c20558f77e7c101e99419f94711a98b121fb7f953e0c19f91b3897baa245a62c7f3336fddd02358fc3d2672e9147dd3c7ea8cc3b1813ef8045fa37786c83f387731bc9e3e706468fc99a88917499d8603589e5d8b6d028d2dc2ffa4f03d6359bff057763ba7c106b4ff4dda55d9f1b71ded84896d844e44c9f3b1d174f368f220d7fb6dbe0d844f5b10c29d26ec169dbe54967e00f70fef69096bc8354a8bef7fe0be76e5f95758580c93ac8d9a349ceb388df4cc173f4bc2d1fe054ee7c649d238a656194bf77d5afac4a6115ec54278d17e93f73f9a4658a8f9f9820a31222f327613a2b66ab471132565f9dfe0388e622f784c7e09c0218603a17f83f246fb36a40f3b1d4e2a1bd2a49f388d3c4a7a06de761825b8ba7c580ac8c5ec6f44d371b43af52a62c31968155140e3903d0cbbd19397f80192e356e94523f7d4ecd4b2c55f7b88892fe94c0589a01807eaa594ff962ebad271a1f1998c517dcc3b98c5fc4d73b6efe16c4c45fbfbd18f5eb489ed9e1212bd07bce3e486c1264a595496401be6a914b2238d5f39f5b17a60886228e5e9b2d841cba626b26640edc619a444cfd036c54dc610a2102de9dfee18e18cf32a74245501cca7e49d987ef34f7a9adcdd3567e357244c012a7170b0d375be8a445e5b8752301d7ea633485974c30232fce5e6e9ea1be14f466d3a8241943872a1a881cd4ef436f1ead2ad9227143be6792406bd7c07d925091b51e5395cfbd30b8208eb6103a45fea3dcdd7ec9f478d303132705f3126942d19626d5009ed347db6e75e6a5f4f5651f72265f14a01fd48dbce38b2ebf162d25c4c3b0665a5bb30da9321f2cf070e16fe7b12f7ad39ea6b92755c4ff0d988ac561d310f6e492694ddd4c35c48c13d62848205ff97a58a12602c5575a1f755eb14e50f409b90924030ee3b58964f58dd8c600fb999bbd5daee8addbc185c52d7151bad1aef8d83a3a6d80137cea0f9b731249fcfa996b421b046b7cdebccd240b871a8dbd5bc072e69968f482538fb67b40d13f8bbd2341428d5a5d6bf50c19f89d54d239a0adea5bd89c12e548b69a19ccf9f9402316363aa7959fe3ab63f350f3fca1350b892ca634bda0b6656a44ef5995acee1f355fae403b7e05900cc4d6688bce46227c941400870a3e13bdf468646c828a39a072cbdb495c773fecddde1f37b1643802f565ecacfa1ccccc2a2829a68d9594af2cd44503ddfe823c8117f0cfde7c77397d7da69b37bb765e2e7dba9ab70e3b802a009f511bf762820a8c491c6c19ec72965508a82d199b34f17867be0669b4c792434e6e4e4c1efa395f1c4bd83a1414a51d71688544d57c2d5167a1929856076f7310c768a1919392171a57821109ac3e9b1bf7cef03088d98bd2dad5b0290072d7e5db27ae08e4bffe11d359dd5b58468e8d86d787c9adc8717986408b2d67c9e0e53cfebae82cb27f0919c62e89a68ac8903e80a7a11b7bd56ae232081af3146927271d3c2f2f7247a3def6de720917b014d6f03eb6ef9dceb771cabbc645f2cac7acc3f8d6dd40f6fd2bbe69ffcc5a083eb3a10993bbf6edb5872e001ef31e2a0e86ad58f6829c0f1f560fa7ef734de2e84857e3ef86cbbd0c1ef2fbcf282116297b5de572d10968edffa402de0ef9c4273f793598d94aef6e294d4ace8cccf70acd9f86ae774d15e9a1714ac761af94b446e4f0cde48748cc5db05ab4fd3bac0a1c43bb8f73a7ef7285866ff80fb41dc837a0f9d3ecf93ed0b79bcf6e94177d34084c597abd2fc46fdb4acd11d543f8c0b512efbf63ada213b2d955569da12b88b2d6605fc99c76ebef188881c7dd195e6ba6d5e55f1ca19202ac94c360d76d0359c3cb1f801414d97535313ab2ced2db1ecbbc3cb68e81988bff134138cc393b8ace18e20ee4e0f04c2206df124e4cc496c2acc185489cca0aa1f9848382a55d991fe5b1228f913ff81b7c564bc779ab311e9dcae58e7009eaa806896b1f7cb6718cbc8f8b6c4a65738a87e2338c6ffee4cdcc5ac060e0021a5836c45732cd668d2760de9597f719d26bdfd2403f795b8e7d52e657ae968d027b0da9e5e76d2fba34f1de7425b780bfe96c05f817dd8f0cfe176870201da00deb460d12a84f8bbc43c713793530062dc78e92dbde7a9f53e08259333253a42f5f7b1a7f35fb89e69efb700f7c6c465e80cf47efb8b396ae3455af4fa48b45a1fa87a110975cce3e92bc2394a456eab040c2fd333f70d8165e2b6431677fa28edc67dcae5f0aac65f879ca9c690648689c94d6f657065aaeed5dfae5658f4922439437c65a2ae5bb0853478178b890561a69a24bd0419e2a089ceb0196b232c45c7373938c51591ba527df1f21490883e62e99b0c4b914bc5e7be903824fc12da0654bb03d3c15261691db25a6f6fd53e3d4e9d8ece3d331f42d2c99e9f1fd9af4d68a361922b897ea6ab23d8c896208bcfa6f2c3b06ce3c88fb86994befac763586c2f0c37f55edba60286a764e4cccc5ff915739c510a5d45ead80d14465af87377ea019da46245597bb6af0918654596365f20c63c074c8a896e5b6efa0d2ba7318fb5a42c6eb52806ab9c6dd8f3b160900cd4d71be8262217b9877739e8344ec1a90511a23f38c5b5c2f23552743b953168de2bbb3a993691d0d87aa20cc70eda60839a20eb3ddcbd6abad31d3ea359938e76191507f298dcd7110e0ce6216bf9ffe2f361c8246a9299a1fed48aff683ec8475fabf36126ab166601981dab806616f38bb1bb93c335fbfa3b250e31560bc8d0dc53957da03da2f80cdf04764f2e9fa8e7d2f7a89724c74471d2bf713d4a4adfcb4cb178a492e64c1711761f9eb9d0e65e04b64f9b94f918f4ba6835f68aa523d147414531b925d3d9e7d315e1fdc533ee0c498e9f66bf813a25ff95873de22448924b36e6172a87d7adfffb9abc2bf2272c270b83cddece1cf189ff52e209dfb78b8a952142cb72c969c4ad7cff67b1ee5e5bb40caf0dd45cd37673908c430d0d776dc2519dc4984170ee7ca6365936369df16c4a094b86c1b3ed3d3cce82b2e56a5681c204e0acdd4a712b5cff260f4c27ea6c32e23c227dd8e1f8e99a67df32e7a24e0aed3dc9630b4b3331cfd625072c0024e96e79c4cf2ee92ea18a5e9182028d39b937029a4700d93deacdd4933cc31e93cb234214d334e1dfb5c323c964d90387ea4bccccd0e4386e4d770ea889aa480f0c8f828cd2185c18a49ce112c70d140e18d9aa6ca9ca2bfdc12003a63f67eb31f0699586ea8fb50d44fe9da2d01f0be10d6da99783821c07e892aa6fc6b190d9639d9249492c154b12e45e2009adcfa97b86650649599a9ebe07bbf8dc8d452071bc4f0e8203f81671e3bbe599c76589764c0c1923b141df67e260f7ff14752d7a84154dedad28c0bef90c9aaebf5d2b248e2e20a4ae9373e692bbbbd20c408f0ce99cd7435a4610fc51f051b1d17509a34d4804529a877828c0c263b19f84cc0b8d24b9910f6ad8006bb84e1a4c8eeba6e165efd50e5a444bc342bb8ebfea30385fc0c69f53d04286ca24c0a0a402668503bc94237daa53d1b41242a13050232772ac1b2c6ce9f6bcbb53ef6b94ff5d0c8294bd5a4b077c5ad5144b44a63ec630d84fa559ea329d0dc27dc7b8ba68a96777250244066cf1b8971261826d29f18bb34fc37a6a39e4870878eac95503dc5799dc8923a15a7c063f2e4f362294c1bde18d3289e67cc883f56ae5f56fe9ccc1e5101d67a552be55e06d54df6e97b49b33ca50ff15dfa8b7436e5ea540aea188dff17c3c657544d600fa5a3e7b783adc2065f05ddd72e65a69c7619a0bdd93c731afa3336d3e408e9bf09650b66026a6d691447db90e08800d2aa08fe312b5ed3ca2dee411bd17d7239f143259d697216e2f74d7980dc8ba3ef2ca2c95af10f36d9b28b1bb464155ffb6807e15facbad8b3ab23403bb9ae6546b183fbab7d4fe2fc507931fcfabbf868c6e21d23b0e02952db97e610b8857d84c777863f820978e29efc1d9c5ced05bb8e75b1246aaf401ff1d0d777ca6eb8d74c25821fd9a5dde41eb13d766c30345965553af361395076029184d32187e82dd7aeb73cc648893801441476a6b7a2914ab77063878d53a539f7774abd4fc9d19d5af3b143dddad76ba439466d646752b7ddadc708ac9a0751d9eb72559ab30043f41bd91fee7947106bc185f0406a7adcc2327517988aed2eb5bdde90e2779b5e3f6042757749da9c811162a93999f000000000000000000000000000000000000000000040c0f151c22""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-ab36c995c472d4212dacc8ea95f1ee25ec693ed8457bc6a62ed291a979b6a6e100ce9fd5dd70be6f21f54ef6648cb4882ed6eb92916a7ed3a4230ea9e92f8a3d03d7587ee6bedf6721f6d053cdbb9a487e2fe5604e0dfd0cbbe7679ddb1a4a27eed08d07da3e3e0c99fd7b3a50830effbf4502422264648ebdfd319664aa8c044f0a66e1ccce5a4b16cb7b180040b981191c751e684df289ed95f0974f82601aaf29dcc4d76ab93a3db4db5b4776cbff98fad420253968639c02b63da7f4659e9174c6abaf1c8e83f6b266a6df25bf52e3acfec600361ab92fee2590327e8879477e85d6f58349eab0ba292792ce6769affb157c05e79df66a498c4d312c55c292b7d6cf25d5030eab40eef294c36dbede934d32ca45a6a9fccc5cab367521c60fd1d79a7513812c9fc9698480a7d7a2add5afe1e24fbd2256b760c91f0cff0db3817ae4952ea7df13528987bfb441777a85d9e36df043a3182a07c410f4b6bc23b28bb860c6f0ea769db2848fd7b21459e08f10141b4fa63e52d92ded8fb54983bbcf1d854b87f4bf025fb5a0a09df89bd3f725da9bfdd413d1dc131d1ea5d54f899301c2c68afbff488a54122eae136cc38ac30b105273a8a1f89e115ca8a57b52e8b9fb1f85e4d126aa968d3125918355716a8ebab72e51e79678251f64f5d3daa326dbe96bf5bbc2f3f78659da5317773e379aa31457f446d84319da92caaef07d82d4c2a5cb2c6a03f1865be0fc1808862b46d30ee13c855237651844fc45a13162aecd01c56231e01507deedd06d432ef7ecfbe123cec60359df65bd276040eac6d7a4375a38bb62abb4e5121670d94f74b31f798459bd195006f8ed8b9319b572e74dc82842dbd403c0a8a63f7f7a2b2f48f71d13f96f37b0dbac0829ae5b6380d64cd468278642120442a59784ddccf85464e783f3d99a2dd613fc301521c0cd9d38488debaf36e47c93df341a50e4f1a68a2e615f91969f196e3f969f36119397fe59eb9332c2097d8e7501dfca1d1ea7499ea5f602cbbabf826a8b16cdae05a700f50212d62d781fd393fa238c83294b7ce60e0059523d6337b473bfdb80f9fb655533d3743984ffe028676519cb5d2a4a1a38f139a0c6c896ed9ca988e82c16c5088e8d15c2243bebff9c20ff059cbc91e93b29345f783658071f4be8277ac27c6a9d394749ac3edc77c9f3a93964e3463f075cd0b91dd6b5045fd6767447104e78cac5c0675533ca1deac92359d1fe0334902fa6f6619a52df272dd458552f1cc6f27c7c0274f49a2a80416b3a99d5666516cfc630f9c28280b3b522a93ba98ff91f08e8c1988e4aa32b965c59d8c8a6466912d351648065169ab873678ed25157a8dde08c1a2181e84d1aaf4f98bd5f3f7ed46f68ede8410c543e5a814305fc0cdbf82e416392600d29dbe2cded9938c086befd7d0adcbad5da5b4004b962109928ca5728fcc4ffb28e4fb337329217e31e61b99391a37340b990e4fff46303576899a383d663aa17cb212f98ee01276c071e84e6448d93513bd1ae775d448496f48508752732df8589e5dd030e1eb521ab986c4a3dd0f58269c3a74acc144396a6a83b9700d58c760d8b1af6325cd3f11136e45902283146c031589cde05c53568e14eb06e9cbe3e1c2ca20ba15226e6eda3ad9d274d86bfc8d3deebd0fb6b30da0aad3142d45ce40d8c531b928a5f7eda470f2ef443f790c649645264b35f1f1af690cc80b591d02281ca979f87a1e09c1b2ac16100178be5dcaba6ea4cc4a45dcc77f4d4f6f7be8fecba275047fb572c5ca4cadc7e3016959a16cdbd241b4adde01100ea0e3c7994b90a16e590f2aeb9de243be0614520d41a70fbce0ffd3c85a18be640cbdfcb1379318791f1cb50bf51175592c88edd4816833083f2b7b5554d59a23e4cbe712d2d49cc1a9f2208756f050f8120cead2cd8fac0e1f65ec5ad6ec0e06494217acff5219860233a65dbd3e2b1e20916137c0cf4518090ee4897b5fc90921279ec30cea06d116ccd8159403f3d2197ddd95c7e21a9ed25404a658c64437d98d9525cbbb223d91578257f0e63ba8f78c217f985390206e01acd31dda5cb260367cb68233b85e4bb72d82932538f50efcaa67f97284833f04058576656e770840ccb72f2157be55a6107b8ca27b12a6cabaf45e70ed6bdf077022bed277e1259e12255504777b0cd961a9d0cec2b985977893c43b6c22e4bacc99180eafbf1e59fc1532aba2ff9bb0418c80fc9d33ebb18531049ce73541fd96bc1c92d94da2e7105e2e2471eeecf32b1c51c1e00a9d3701b73b57b9e406d700ee4ed9738e0067ee58f2ed871252599e01315a168d452f496e8efb0ea455537806780f83d976e7e9b839590568f1f799f4c1282f00cbb571d934de2a610df4ccab317648ac384d32a5959ecad1f65f31932152a8a66aaf7acc9dd597db79c85a76f38ace97807fc0c8c759d1e58b9d4a061f62cb8826417ec7c7dd06608568bfa5d8333ba6ced03e9f06044218f19222ef5f79823b5e015f965ee9a17d25c09095cbcdbf08344f4d0129c44fcd509c8a76355aaa09cd726fd085f74b321069e53d151662fffa8bca2274fd35d84694fbaead2430652a60129f9173dd7877f01e21c50965895ece33bf904523e10765174a69986669ebf95d1515c605f1e38c34f83ee28aac1e362cc052ac558e1d5c9c24f20e447b12d25c81f75c4cb2f55a6f1522c21ab8bfe5c18f76b460ab41d202c47a9cc02b05c7ffb07"""),
-                    TestUtils.hexDecode("""
-F55B1A381D9258CAC6DD7B5A57899867FB659A56873F31F815716075DBDD56D6D0D1480AE1242A17485AD259BDA2533CBECE28A906271A3E65FB5D48AAA124993738FDAAC65736230FA07EA27D96F372B90A16FF778D0ECD7C0F62174839B8C7FC50F0B0150D47D5CE9F3715F5964DC712A681626821EA27E912B80D2D04C346B67439CB5E06193B6D7F2161B4F8E0341D8F1C0C7F6E3B351C4EB62E48B555EF00EC0DD5CA6A572FB201D1A4570676A04000C382F4C332C34A0436B535CB3C3F2378682A982034E01211CFB23285395204ECF985F478686817A5F6FF4B694082B3032990597A8C3A85B7FB5C2C49694103811F754DF0434D09C1A5245BBA980D6EFCFC9BC63DD42362477537C6712ABDC952BAE377AE7EAF9FF0CE2E9EEE82FBEFC1CE56063293BE659624CCA0E23DD7EF4412DDB587CF3C5302CE5AFB39BA8613151A04491901DC30706B46EBD1B26D4ACA67587595100AC51770080FC32ED0DC109D525088A2579D8873C6929554C30BDD1E2A0A9797B1676A8CEB719F64A336FDDC3F95BD4A68F472F00C4778745203E1A7736764CEB94F33109AF197C98D94BA3F07E857A5B251858ED850E7E578057E833A2CF95D7505C4973B709CEE834A40F32CF07AD1861CD46CC4DAD37DE66F8037DF1B14CD88E62F81B9DEC286BE4968ABCDCE54F83C5E9E4FFA8144A5877D75FDF75A38ECF60DC180E9B72F256BCEEE087F5AFA5C6D779117070ADB4A671839E8032E55AC52E806C82AC16FCE76A659D6CBABBEC066782C4C068AD4FCD5EC425885A5CBC5A4BAB43D1A60D499C497A2DC06B136A971BE8ECEF3FA6606252029FE5B33661883608702542F7EF44720466D91FA1CFEEB9D8CEBBE4E252CBC096D99551BB90A0534D723B02146FEA94D1C1926221092B97F1A143E6B4D5A8438239B2E2842633A6D90A18DD67D05B2CB560BA8A964E0A49BC1987FF47895D664F92E27F8C90059C5C38B02B42D7A179A09B70023BF7D664A94F7289B29FEF89356BB51959FBB82562F6827CA2A3892E934A9F271282C204BC3C6B34C57882EEB552DEDC0644B43FB28284FDFC82A1148447F2457E94EC0437CB5E0E3B6AB7F7E48F0F53C80D7695801DBC0E96F9C00A4A96AF8D60676DC4A6A6D97CEA344D7E911BE7CC9CEBBB23C562BCEC6992AB1148384278D94913DC4BAC4F73313BF83CFA2591420B18429D1F88D68443B960F61A1AB8E2713794225DF2D4EF88CAACABF6F095DA88C52C011AB3A07D7B71CF209BC84DEDD7FF2D8FF02A0727196D50CFF6520602D9FCBE57F890D19EB7845C6529EE5CD98AA2FDFCF37FD7472D1491FC5267F1D7E6E91EE891D880D5EC20FFC761344BAB59A327F829ECFBF8E550208976BDCFB75BCD996599B68CB29B27D9EF68BC975DAE08AA121F4D95805EB89F2E8B2BFDC61058740881E9B403C54745CF6D4AA1747EBBA56473D00FCFC62B5F5DBA4209E0E7473A0A311619437D2DF22F1D5BABAE064970850CD51D4A62A51E9B3D3121B766632B18F8B7CDEF40B249812A6274D4C69C9EEC096044026022B1FF055A05B6BF1C919230723A952589F540E77D7D24A413F542E7E0D3F7F55B8B335CF3693603210E979718E8CBDF76CCED68396DEB561EE27E9008D7BDB428BB293E1A1BF2675D8A4568D3339682854BCF9E8820A084C94D78E5D0938D66676ACAAF7B411B466B6588E9E2B4A387D84F23963E252EF36A948F25625DCCE664281D76BB6EC1B8E20DB3A7140B194872DB439D89F18E74E1861E3CF9FD442F1CACF4FBFD16532BECBD97CC9A007978D17922A68CE98369240A8D1E8AAE6679CA5DB79D83EAC1A571D0871D5AA28F6EA4A8EB60770E8CC43A78E6BEBBD4FC63CAE26F297F1E21BCE999A509BDCDD20AC938E38702215C398726ABA5A7AB3F26DA34DB3CBD58A7882FED91C33803FAE62E9E69FAFBD698962F2C7226A641AA7B6CED1DA8A400992333EF5DAAC77B55F94D51F74226AC03F7ED8F3D567BEB678D98694E9E0D483815D080A70FCE76255C82FE020DDF32D4BB7B1AE0EC1679B3DAEF2C20FCD7D8F74F6FC684FB678F02DE6B53D03FB656A9B9562666F49797EC658C0E8ED14480A0532DB85478FC2AD1E21F8883F2EF3FD97DFD757D883C1507C44F812639711256EF56BF6F8FC4A73EC3AEA3099F6C2BE6B2380FF3AB7007129D4829103AFE70851917E02EC5F2117DE110FD8F4EA25FED6FBC24BA063B7ECF7585519132884FC12DE1BBEF498B92D6E2062F1A4F7C97FEE96BA87ABFAE76C50729AA68C8F374102B3CFBD69139491836E4587D0085F92FFE2A94B6A87AFE29C84D289293D9CB4A733F90389C96198E2250F5BDC83F123FCC4E42844DF74FCB65986CBAB77B692CA210AC22B5B56E30BEE2BDE84663B22507E00E0D066D5B1F5245EDFAC6D860D0493C218A541A1FCA4B48F1A916921153933383284BA268C3AB003CD58FA979A08BC48A57C755688B0859AF7F21061F9F1B7DA44088ECA4D393E8DFCCA52823FAB812AF36212CD137741C14F0860CBC7ACCE1FDA39431C32AFABB84989CEC971D4A257BDD70EC71192148824C17AF8F18816CA94C457E1023E01012A245F28FF6582C9015153DD7662E4321B465B33B1D5DCA9B1CE2FF49EA3A811B5852AF5C42FCE7FF42BCECD31C798C3B8F685AB50B68654192357CEE577F5CF1F85A50F269C28A1F2ABEA382AF5CD089C146B9473C8965A945091ECD1C02BDF64F9C3FFD035D8238AF974E7111BA4AB10288F105659C9E2847544FEC0B29B6692FB53CEA0DD312B24C1ED3CAA1BCFD94E529F6C27BDDBB7C764DC0161FCE578361E02E0F5F3FDB095B6CD311190466177A5FBA62BD18595DC49C29E8EC7E1F2F3FFCDF17D477F4AF8CA3EAC53B7018A026BC942EED87704108027753DF67BD36221E9121B49CD40E8EA7FA2D6961604BE0095099A4413DC11E93B4A876834776D144269BBBF8A9875648702B589ED4CCBAFDD726DE8E8A58AA5D1A6E142A470EC342BC3E2E1B49C7203F283E99E81E38F1D8D2CD820AC98D8244A705BFD9B67E771A0366C7C6958DCB6921A81C0C9D5152DA37CAA8CE18D6B97404B399052051D7343B3739610329A37B8BAAD173018708400AE02B8DB2A2414CD7DAF038F94714031B1D83A5A15DBA53585B606A13814F04FC925C3454E251CEECEABECD8CFBD6FC04F504508C04E25724807004612E2796987D34D04318F82F7E1FBA83A4DEE3C86FD1884B17E77231629F5D5D11CFDE976E639C60B436DD9D302C380E3654E671ED81D44FC595FA34EDF90710A6384BB62DE0D89B50C14A44215DD1121C602A79A003955D860C88470EFD320E8AFEEB114E547E50CE967572DF5A5C4DED09222FF7821F91598A0A9C41A731D64429AE7D9BCE1B4E90120BBF94EED78098C9EE30C38628297C86DF59930E72CA561A61B6EAE517DB39F5A61FBB8C1838E3ADAAB46187F0B5D09962A39955343631B74BBD17BB2E338E5FC8C43BF8B2DF3A78BED744A481A1D789721928962AF2B9E2187E6B52A19274EF68F329C83F42A28B49C447FE284A25B71FC95D9322E752E28C7B4B656A743CF6C56CEEB758E742CFBC4B8D8DE5465D63D3D5D6EE993A4C47AA72BF82126ED6C7423D3475AE098CE6A7E6DD6F3EFD654BFD5DC4414B8F23F9E29CB0D5DDFAA689BABC7B5A925AB19817226DCD242EE46B588D7CB8E88183CD87C6D06FA1A40915A3F19E2368CDD97A16ACC2DF4CBBC0B30C6289D7004A8B48EFE4186BC4D844EA01BA78E4D1F0CDD2648D0363CA73A19032A537F68E0AC01CE6701426A03E071A109D42EE5BF358445907E1D05761B8F41AC8A9CBE2657754A8C4D83A3516EA465D5AD57367BC58DC712A5C055F68D1CEAA494D9A845474F610BAAAA4CFC96EB51D41493930534D58533E20575B980F4379A80393DBF797969405D6A514AC0A9171B79D6EBC5B66ADED19821BFB090BF76FBF50CA6AE07CAAAFF584A7013A71D54A2B60678F6F02DA726E7448A2379C28BCE7DF968154CCD22F1CDDBF25D91C616234539731B8DF4F55E21F37B29BC77DB4BA802D9BE419ADC292105EAE58CC81A636D479B550D33D057B7AAAF28F743F7B8C17E26AB2A846AE08E804E5D4BAC09D11C736DB32F9DC9CEAD0442AB7B6AAA70633692959A36D6DAFACAF2D7027E5BF9562A93A1B35AEE5313C1E2015E65AB805850DCA7A65FFCAF14200E1EF0DD8F8F05A11126EB02C13FDE38F496E5EBFB09E9E2B4920E619A67517FA4749ACD8B0857C7EC5A6E94630CE3EA0841C64D2EB895A9EB7CE5E757F2FB80BB4F0FA429E779BBE314A491B2D45F9A79655396E70CCEB319C3B405C33BDC91EC2169C3A75C4F5CD7AE5AFD6CAF6C9F81A9223484E7A12512B600794351693E1111401F74E1439C99D77E8932E069193DF7562C79EEA22C41DEA4EAF9E93456378CDDD6C8AA97D8D69C222614E203B6A1FA6377A7A0CAEFE709C90CB91939BCFE926B35970B13A06FFECD44DD8A360AEB5D0432A532E8A3C275E1DC4A07D6A3E100B04AEDEF14A52C09AA90438D65C8E6141490BD1ABCAFDD5925ACB040A91A8E11D242521C1F00EDC14D62E1C6FCE721921DF42164B4B34203660DEF02677A6B8C564075865B030936F472CEFFB3446714AE18BA14A6E45247C9AE1F2836E2341B61940A63FCCFAAD809C84906FA0CB1863625E59B96CC2161A4715606DB12FE3E79C90B64CB9D3A93B451E1C746F6B820B4FB3B3521ADE56DF9D50136635F29EA908FFDB32C6582715B06487B391A36A6A7B96505FD8ECE767C38CA4D0F9599FDCC1BE27C9C60D9190139C4F02461A5C42310CBFD5CF506720C9A13067F83AA1FF66CDCDFDF59B673B6C1FB0301DB118F3F49D1BAB49069A9FBC2D653D390DAFC3CC5CB35F0E50EF4CA808DC69F0134E3EEE697597FE7E5C2A2CDC5ED4E81F344879A0536BE0076D7A351A199530C77C0AF25D5C7D5629641FC8A3567BCB1456C1AE1D216C1E408C3AD6CBC1629E14DD834819F94EE0D255AB1C61BC7C324445F67CB7BA0E5AC424EB9C3D5FABC47081752F98B0011AD389581B8C20333C2878367795E31F99FD2C082B04126A3A61273C94E894BA7ABD8C6FD743FB76CC4FFFBEA78A1CFBBD266DB4432ACEA74350AC06F2EC832BD71FB09481A045F7A17F22F9AB65CAE6782A2928147BCA3B521E001D4BACE5FF499B1462709525D64E72201D5620B5537DF7A3E8DBCCC6EB822129B7768469D18C891A60B948DE2C12F4E4DB574C6C8BC586A1B57E727853FBCDBB4EB148DB234D8759B2AC8ADA2FAD225B5420C2B93D7FEAF051B7B768E64BC6EB83688B5E7E59059E1079DC66C5D8696CE758B42AE75123CA0FB72438DB97D39F1340B2891A19A4084BAA1A5149FAA785F09300B9DADA3C45F19568226151382ADB16617D5E59FFE8029F0513A7156F67D9859A13C2BEA574BE10E319F1B69740CDB176A962810B8AA6C368805EFA56E4AF69E908A205DC41CFC3FE69E4A6BB7B1F541DFE0A0EC1B29E3C199EF07538BC8AD7B0BD31B6A4DBAF70B83443A9C6C06268F597A6D1BC50171ABF56D18BB277F83203BB671DE404FBC4DFC66EE8DD4D92FB1AB2ED20FE8E9327CB15CB90908F37171D10E759BB8D1BE2C895604F87E2307AF7720AF99F0552FB15229B0FE7B45A3005E6CB0DC88A6D15AC7C364189A84A6615A344FABF4D0DD82EAFD42892C86EFEE6E9F7C248462E4C6CCA369CED819AE94B3DC856A3412A0DB90353E6C6D9DFE31913C3249195A3EDF9F84BE94AC6EB82969AF272AB8802BA0E8967EC342834B8A38163C90431844DB073DEB60B388710FF880EFB8283648CDCD75615D35451D8AE4711C1D7DB1AA59675061004EF8164AF3B4095F0E2FFC5433BA41ED72AC2C683D3959C9D265C302E0FEE7258B7C870F62D40961AE5AC43D3BEF8241B38A574F75EC7CD608781EFC16B7B9D36C3844B6FBF477CAFBA155B91061"""),
-                    TestUtils.hexDecode("""
-5bd74b9ad4b08f18b54784c7c6952152a4f597cee14d967851ae2d781f249d926ebb4f4490487d1ab299a179928f69811f39a8a019bd808c500010aa684ac9954aaa005c9319d75d6049ecd99ad4a3dd535d881e8eaea118635cc5dea0ff3d4a7d8bd9d2bd00b78777f6528b94cf8de6ecba3829e8fdbaaafec7a16106457f0204192d88bcc76271fa31718e6ab4be525b04e547f9774fa47a8e4a88a4fd9b058412f92b27a2e191d32f015ee31cad4321c62ca55e572cbb7c2872615e5a2924d7945f1ef161e407f415b4f963d4cf6272d954923da0db3b04649906ef6e2da18592227b2b301a36298861e793b88e7fd1de2957d8a92c727b492cde702ef2b123e9968774604b71323cc4e7e58114c3ec7b59c94d9a17453795f426f706d98235c99ac4b4288d894e480efa3dfd19b14872fcfea1836ca639fc7242a55a0d01e1e21301f39dcc9aa94d2d83bfdefc26cad8614406c70bb96c149ea652f66f8d26ee0455c6cdc8e648fb20886334d512fd940fef6d0d52a14fd9c33e0be6077a10b4729a8f6200ff5a5669b3b533d366b81cb6fab41dbb9dde1581e4f3bddbbbd5f18cc00123c82e9f82412b5fc8970b69bf2e68fd5fdd17b7288949e1a7a6eab8986ba2e7e2f98b5bf2a561ddbd935802fb59a20262a77137c99274f4597d070c0c7ab5eb82aa445fcc882b1dd0a825a1f0a2c8181bb6c608a53704b9d587e555d756333bea70a5e73ccc5ec20260c8ba150a44232aba5ed55f49281b0e697527a59e4cb579d27183921dd55492cfc2abe640e1aff9147927ca2a1d1ac594c52502536d1942fea6b3e52793e2a410fd6ca7dbea45a5a696695100f53b9fe1f28bbc0014ea9fa3b134f2cf0c0a2b0a74525468bccc4677e3959d62f2cff8119e5895211316b448451fee29720a74d0e09bfec52913b0a26d1a60e404b2c2ccd036d73a2cd4dfef3d9a10549287d70bcb561a3d466c8933668f69d2e3f1a90951ae4def67d49fd09dc61342a15d1d576ab41b7f145d73a99faabd04b9afbf8491a28c5483674e9f95f3e4146ea0d9b1ca61359c604b0c821a9cce85e53b5e666cf1786100fa4c4f14dfc178b63581bf502b7909c68e4587892188934c0472412667e552bd32184a306148019d56236fe38b03799c2a8c748c0b969d9d6de27a0b842be7580ec8e186c76eadfdfe4222628448abca620a246214d2629b2be13cfa9e9fa3c26c24b03da758d5870c4f79f68c3be2bf16f97a7459795e1e30d0706f33c4f865348785abc4e6feaaeff79b1b45527357d31ccf575785390c35b2a4c87cca14fe7bbbe6ba82d96cb9bd6f47d9ad73ea3b061e030bc03a670bec41615f86360a01a37a3ccc307e31aa6c32fd558d362142fd5668e948441275f265697e4700d87853b4d1b8f50c1c9eb96d05b96992daf7e9d3dc5b78a62867ebd7b901fc37ff34b67af0ece5fe7050c94a43ca96af0463ddeaebee931bfa9e14226b2c7bd40cc99cb7b3791bd57fbab3d4961fbcfa4d9fac748d73b2de0c7eff554699cee1a72b197d6ad5343aa72d7d0bcfe6c3b458d24e7e75d00a90628100d635f032f24834a3dd0ca0f5fa0d040b98ac6e0ad4a3c09445d91d929ffcd5424800bbf06a747c7a05eb87cebe5d64a383cd77a7cf3dcc80300927443692c50c7aa0d12e1482f071ac1d9acd625f6e8c59068f1a08eb163a11685c7699493cb28b1fcef193aa1151ae7519474629485b7e6fadf01f369f05a1c37d157be7560b38a59643ac997b18a16dfd211e23c1c02f936c773b8b3440115beac0fee20269302ba0ca35d0838799ab67bfcb300e89909e2fa63d83b035d855bee14c47d847ec7f7ed15bf16130ab8fb33eff281407f376b3fa4f6894e1681e6eb025be02de783b22680e6ba9c4646b88d91e18a48f751fbe168096bbbd16a2f4b2a13085158d55c5283a069362f83c9247b0c65639aa21405f343a19dc877843bb72e39e6cda5b7ea3f198cf59c9607e1c5f09bf8962bba657f609f4e9d3ca99cc58f6283689c9ca4d0c4f659831abd54e1f154b26d4b7a103d9ca6b6112cf5bdf0e70103c8147fa7f5223665f75bd153d9e5aa982ac475413083d9baf3cc20584c792ace31ca3c3ce87cc16fde69df770f717bf9b0f10a097595ae2bbab69dce06d1973b01ff9922d8199735d6e16dbf4e7b94493b1106fc938ed093eca657e173b107cf995a251e5b6b7c97daf07bbc2ff89f5f52121522d175ae97cec1e98183f646defd2b15cfa13107cca9ddd0cd9912a23b139f84a2265e35b7053cfb7be23b79f28fddc9e3190b0355d0922543ebff420493a9ee7bc1c18d36e2e76437404301180bd3695d7d059601e204f46da1c5224966fe6c099f0ebf6a2f8c61ccfecf12f9dd4f1a197138e013654280a7c5bd26ab1743e40d8971c8b6e4908113b84537a410faa756251faff8fc8bf0fe8d325dbe0c1a6f7e099535e08bfe584b232a36401d9340ce323eae8e8eb4fb3fb57687037b7b98c6ac8fd7d919b71beb9273f4234028ac2f034685c81e630d57a83162aec955bff545d8d0a9c24d4a023988890301ffd37af5824f59384f596a4c242fa8378ba2b09908c74c8144ef1a6a4ef0b9a6738f8ec52e114b9aea248a8d2d3733f71649222c8737764fb440c9f2972390d3d4ad7467cf238f48a0a299c891210a60deeea020e4b8a56d2b5fa61aec1b341044fabd4abda13c6e85fd70170d18295538bc8da2908c103a799448441c50250455f5481f7a4f6eef5792f97cabeaa99936557b0ca845bea86234c1de788cf2abc1f32a80b13573dc2b21b110fdddefead44d94f01ec772078b1175b0297b0b6de6d6097e8aa3e5278944fc9e7a884d3267632917bf56bb53dc074ea14a8dd6e6c1a73d9959a5d2ae385f5dba4b8447eb451dc441832a69c1c0a3ed41b0997878c966510dd500d61666827435b7dd7ccbd125f157a419ac5b614ba6d65438b6c99e4d8e5e6776809edafe8fa6a76e11f5f400975df6e6769f2c2c1ffe3d40482be08581d5e79088fbff8da514abbbca7b3ccfdfaa1915c373361a971ab7f5c1c09e9499592dccd610f14ed84db0a2be1c94e5bcda339e14ffb27af1ba66c7130f45942c687ce96ed553ad7776dd532ccbb0faf1aa41b7765023d56c9068d56c3c405b8b2890c4fa6bd79466a4a146657d9248d8a348bdcf41e3388993e8ff2be2fc8b8dae8d15269fdcc040f7e72872539205992444a4d19552ddc5e51b778c5b5786f2d7b79036b73e738d7200aafe96850887c44c982b0347c7646dbcbeb4b6b55971004ade87ff20adef58d3aadb40d320d43585e7e55da08344dcd9fd8345a2c612f656ae178c914b5662d088c3437a6e5928d3410cf65dbe2ad31f1fc3781d6a5006ca8136233814be8d655b94152ac70df8cfc6f9e9101f5b53cd5fd37176341e1eaf25f2fb477d1d212333ea200a5e9da88b19db4163a44cd4c9d3ee1af413fc6ccde64a9cedf21c8b8f113d62a63df2233f9a195aa67803d632ca873fa11069b5998c1200dbbdb9647a98acfb4e3229185b8c220a6079c72bd4645b04f32ffc85214bffd8ef2cf27d8459eea21069c13bfe052ef92a070e63d05c9a9a82699676ea5cad84e508d7e811073e17bf943516fd4512d53c7b3fccedcab36921945a19d0ec3d9303bd479a446ea1a5d5e4adc5a97b92db843b54de9498592c4859011bd4df412a6151bcaaa703fcd97e702d96b0ab14d7fb0ee225f8097c174b517ea051f8f8b8af47a75a93fab99ebfa84f8ba8dcc9c9927e24f6c99b66f34f86c2fdc88755154f06d9b1ff731411f35377e14d2375480b688108212f75d74695008a61fcd452b6dd23c4d910c409d9edb69d294a5bb46fbda29d6b31b24613e751b3aa8605046cdb449ba86f27d226e91757a242ec2e9d241aedcabca88269dbda5fe8e5d8bf4a4cf1bb1585f1166d36a388a47241245d0001e35a790d6d201a92f34ea315933c67aa26b4b22ffa7d87482c7a63b7544ab511644b9e95152998af887bdbbdeb6f2218f8936d5fa50686216e30db9686ff1e924c850cfa31ac950bba1cc1124a892fa1c40f62a99eb452a344f65a1410f500ab650f9e91244ce5e962caa13832df55c4b41f53509d13d1765063380b942a5d4e718b9fbdfdf31259b879614b2bcd5c7a637c0868abec9be94a132be2c62111e5f22f420630ca64031ee7f43df2f8709e9b200f0f459d9f0b4bfc370f6faebb0345da46aa11c975670cd94ade1781d56a3ccf2c0729a8238e9cfdb1ee2e575c524661d089f894a1502bde21465f430561a72b835a39a70c60d64f371affb8ea30849956b767a5ad7648be643e0071cf9f08e880f6926ae2fe97b8fd9ba02dfc965b3ef7c102eb207555f6037c634496fe8de5cc8ae0184b6df1201e8ebbabfabc4dee1df3a15a46414e5627c7b99982acf3fcc7806d0e8b9e9356f21f15366d6327a3fe4d332eb8ebd410407b1b57220ed702dba8783c1d7088e66ff9bea1af5794c964cc95c415b26598d39f448a428c575de927e7eb129539a267c3e9d2c7b844e80b1c396810f8b703c2f6f141339bbbd34938cc12ed634425b7d80829a9cb7c8d1f3050f1351587a898c92bda2e1e366b5cbec034750b2b8c4dc00000000000000000000000000000000000000080c16191d24""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-48862a8bc5235f5337a82329e949240dade33fc7d17ace18be0227ec719ac4f71fad5a97f5d2cdf1c20dd6ef13760d4e0a1fc9535aaec433e7cf198e9b538d0a4a6482d60a005b195667769b820f677dd046b2b21af2c092abb4852bd66cad25888946d501cfc431187b25f773911ffb9e82785ab72df779f415cd506e52ef5b1828e20bb1ed742fc434ab38f3129dd3c50bfd1db5dccab13f2328740c5fd9f48da27f3f13df19e576fde636ab53f3c4ebb08681e288cf42b8bcdabeb3dc6c6c4e1a43e88e63d4e3797d7e8ad84835000206ba20f003fc90cd41e8b0230a1d80320d1a14d4a04788094aa376b2cfa10b72c66764fdc83223c39f8876407a05a5307f7748339547ef844012b48bc11799e72e67f993c601c6bf9bee389af261cbd8d07532a9d53888c543293e66e9149d8ea8862f69213c3421cfa0c2f121b5145cf9c4278b8dcf8facb6c5249837cf7c67b41c491a3345ba1dd03e6721b63ba12953055d5572dda5e34c0af2bccc6c4a0f98484108caa81d595ca4b23dd797dc814e4d724763cf782a531791873941f9873d7f6c0ba62080059cf0c3eeeaf7f04cb0d21ffb7608d279dedad1fade567e9f4725a98f041fdef9370cf1a1680feba08bb8205bb95cb9aaa16b7d2a818c3c3fcdd5bebc63099b4c4eafeca407e16678f3f15cad13c11275d786c033dd6fd280e263c83651e094bdcf87499323d179a383cdcf99fb8953228ca51382f81fe110c20265639636dbf562bd51d6398eca94e02daa1699a72c8d9ad005c4f4e21bcf4d1d4d935d25d02e0a672d419307cf720f65e11f0f1c45a0222c4583d94072381e8d5cafb06debbc117bb4fecdee6161e2a72589ed6da1b17f3f1d3ee85fba69993a9a7e389969de31ec514c1dcdb7ea4f2a5046ce463fa79ca665280cbff802b611ffe9ec0d63324626a83ad99535ac565ab42f17802d8e6f1f72edd03344d865270e374dac7e4701357ffdf256b185065521084319edcb56a55cdb91ba16c6ac647c8bdd9739de7ca426544ac9c0c59cba79897420531e1e1858f715cada8ae69d48d95cea603ef3569b98dcdf3497d784929aa0428a190908f796bba2e88b809c21385dad8bc18a05736efdfba2a81cadc11d06774c1a976d42b11367dda0a7daeaa1a271a54217a38acf3bedfa756eccfeef5ca121e4ed57eb006a103c471b5a104554e2f66d93f0c7343d78a6ec02dddccc2aee0d045cc9426fe6fac1e87ac8b2bbd6aaed7022d36719cb2d5324a1ae7d58ed779d3b33a4226b2156863a2fae4dc53725217751757a25e487be29a2507dc078aa0c45fd275ba4cb0874b74cc77eb516fab1bdc83cfca42c77c23dee74bae46afcee27d99f3035c67ec00bfc9d55f5317890bb744c15c5e2c871298a76413795d3af7bbcadfad9d1bb14a2aea340a08aa26c1c29f297bd31e40c5be7020fe29fe6f2dfdc86197389ac2b67d8b78ec6943b561dad1cec3324e7d7809ab3f6dca3e0c3568fec588e70f3ecec53112f6e7d3505eea1892a4fde381a2b672db39971d27a6400058a4b72bb7c51648ee3acd8fb1bf0b85f44fd20fa0e217ee9b9b92dca1e3b68e50d8d7415d08eb4d711c1dd7cdb3f43c87d60e8af1f2a6722fbb50c9d242674937573d0d9fee8a3f16aa781a1bf5df9cf8541a00ad026c2a0be05b3113576b6b84365f2cfcb110760ce7ff47d2e152436c8cf245c8a54da42062e072f9f90a83c73be236fa45d26129ec0791bd91fb5c389abf9315e27a0535b26e761e4441bcfc2b3b9a5dc0509affc072886852afdbd0869e18ca80960e8eb3cb77b2bd635a59ab0990a2c32e905288928f8063084c3ec9b53d31231cfbfe06bf15c6500d10ee110817f42253ee753c57cf5871929d9b512ee557cb4f9b8fda70fc43d1aaa7584842c6729cba6253c70faaf15f322434f39eacc0fe52079aabc00693b49d73223ea9341fecbbf5fd70b09bb2b5fc4e7c638f63d4eb4113447f8afa3766e3d39b0c507413c488dcdb53e5ee20118446684daa4e3f74e4b2297077f301151b06879e6ca608af5759c7b1297af86543755290c341442c61fef8c4b04a8579c9f321f4b8bc744c1f9d8ce90534a5bf92d780a222b1d452193cc6c25ecb816a3f4edd4a3a961ace14577dc824baadb5bbd363b3a426d8161c463538c5a6b15a9108024f4bf64e32e1cfe96e44063b27917501c87f10a7524694473554dbbba8f29a572846e54a16e6fd895a15b106ede3aa5ceae9755bad27a09b0fe67c41e8ce9006ffae11abd1b9b3e359b65f4b6181fc8d8c512fc22662ce71890335d9811180e329553dfa037a8fb0053e669d5d870b0d2a5100c4bb78fd297520bbad94d67471741bcf2e1c2ca4f6304e35663399f67840cdeeb9edb621c8ba854de5c52f306cc3d42e1c081e1debc8021f972549b8a9cfa033c7901da060e17f982f6cd2f195c87614d8bb787cd1b10ed6d31c5d4d561c1bbabaed7ff626a312470fae5ef2e51a05972b905b9c5bc284d7053d0585f1a91bd403769e8cf9bde215229259c43e02323155b13b5fb0d542aa625c0d6628579929f7040644e91ce4fcd47a895bf3dde0d0097bb42647807d7008caca01304f403ca8f49cf5c11d276d115d000fb2f220718649fb73dd06ae38fead76e80c20932444cba2a4aeccedccb7a29d57214d72780e38921a0d50879a014f52ca2604df524bc5fd650fef98cfaa1eba14d7380ca1f6c303c0aeae7cb9cf0cc2e3acedd6f151d"""),
-                    TestUtils.hexDecode("""
-DA2755DCE32D07B6D2C2DAD6BBF7CF5D4C26FF0C9B6FB9E064B51829A1ED51A712E26DF8047B487FF0755CBBA8FFB60DAC3C45E238608F48205A582BADF82C2E7E83D672057B9A9209386D2AB8D93BBDE0C522CD1BCF2AE95573749E0D51B85EA01494E3BD97D3CE0A61B26249E4BB94F9667D6556CC4313669409D94AA4F3BB9AB70F736D34245E2A789A5FE2917D5F4CBE43010C5215AF880118E1F5FD47A4C195F3C74307523C688AB76B7CCB157F75FFD79149B5508E7E527ABF718CE8E2E4162BF810F35E234F8CB65DE0930202C1896DDDE02BBBEC8D03BAA12AA1C91EE798FF7ECED608E3DDB7BD04A1DD9139F4A5613AABCF7AE495F9CE18D73BDA0C91583B72CCF6A722C319AD5B1051E65C1B91DD05AE5A77220BCC7576F9CBFC8A12CD55883AADCAD1AA109522F286B00B70C8E3D4C6EDDAE7E1752097C85233583BA0E1C05C5624FF65A3F3894158982B633EC92C24382AF48EB2DF5EAD30759E99D67B8BB1144939F4080DF0E1689AC0D4CDC73DF1CC2FB72B92D5A69019087294D5F2DB196CF82B7BBAF953F0568663596F78B5A309738BB294F7AA3FC5F3ED5BFD4768CCF3304C836B476458E14B233C156C8407636FDB3EBECF49B97C96C31F51353B79C378C6F47F1913E5B14A82DEB126D688133F9139C12C45BA24CC9C7E2C16A26329D463ECF59746F5A99C6B03896E851815EF36F499654E2764BB8BC60EBC821C4D0B4C363EEB7849332A9F1053A975B092AA3AAE33F06F760BA1D76DE07A1F48ADBEADFF1E17C34F9D69E409DC5AC83C296C402E042FDBFB0B6B4E023B15B318337B6A1CE69F1CD3D93FDD0FEB7AE259A41383939253C317DB949E3BEB9C8F7A79D083BFB46C50AC00D382C846B78FAAA7399ECB902CE8B73A1E89374B1DA65B0723C67B24899342DF13C07A0BFE3565CBEA5892F8979E404BA84847AF30BFC04D8EC77B1C5B9400CB97622E6D3360836639670BDDF4E9CF9FE3D6B98A5FDA42422DAD6C829B9E33F53686E2663D232162D3A78A7202EEFBFA4917BB8E89375279C96C9054C2570DC3D90DCCF0E418B69E6443C1B2540BAEBE022ED9A9620C030377C67FF4C186A59459DE7DB1ADFE2923C01D9B8D3AC940486052DB67EB67A257BE7AEE0D3C77BBFFD0FC7C94540F11DD96C5100463C27D65D3BB6B7D867590D573D1C1BEDCC0E8D122FE4FB82F1404CCD061DD7C3D15287F39CBCD2448DEFE1FB4ABA858DCE13F74414E1A8C41B730A1DFB45B859545811C2A9DA01C342A1F3C8B916F60B5E4802BE672C2BE31531DD9E7014E681A8AB1240B5E3D5C0D26E7040D4CE05F9017A32E1C760F466A8D7A68FAAD421B2E2D886BF0007858129DA2F6B92C4CACBC1786291D7C95A3F6A12483B750FAAF1DA03059F89C761641C0AAB21A05E78E1131B8F45C60BB5E8681086717B918BD4FBCFCA1BB5DDD740BE289D8DB1C24FE083B3DCF0E496B1941ECB7D51182F9CB9986CF3F04F0CA4E01C63EC879FD4A3D5619EA1085B1431FFC019286ACDF3B4AAB03D6265A7B18F24CC2815269681BD37263B44DCCA5CF6FAC2ABB1DE317118219A73095D1BDA10B66B6B55421F049B71E759DBE6154F1DB98A7E3FC877FA90217A242B21F39490F2116A2BE8067168F26439C8D1928255B5A50CE1ACCC222087536BC37806FFABA03B7E787B04C2C67C1B0BEAA871F39D3DAC2221AF44CC7089E520BADCFD840E5EE24AC53FCFF1E7D6AC26694CBC15B80E48B10C054E8DEB00AE387CEC9972A28448A6BE3A01D5EEA837703D2FCD1EB2521D444F900846F59074D715AEAA2F46E956365B7E67C5528841145C442E6FD7B3D7171BE05BF8BAA415260F645E2FBC93C46B9F94D2997929349B88C2FB1AC6743B73DE66B30B44E5DB3E07E0FE9713D9D7575EE4E40327A58DCEFBA0EE95E22D06FDFB720993EB134073A80A4F06F8303C7758DD37CD7236E5D80AAE2E9569834846E7F6C75051302486B2564A1D8D987D1A3648192A63EEF4C2D25AD41FAA02C9F227CC9F655A72CF7207ABBC66F9C822EEBDC89833757013776C11C310A22C226ECD33E5B0772AE2DE8B8E9A876650D4A57B863BCC6197261D7D06903D414AF0922312B7DE6D9E64F99509CAAB8D808DFC5F046BA2CE55817512535EDC2477D8462A1817E45D33B9D7390A11E30C3860CBE2C4B519812ABA3AF7050227759DF3B6FCD6D3EE5C60C1042DFCDD7880888A147AC47A282EC51D0DF664451E37D7C40672A27B965CDB805CECD3EEAE38A0AF4C2349FF39947659686D30B9ECBDADD80C9B06293FC4BD5E7A0E1E9E883D7A4EB05102CC1FE45F1C9BE23043BB458E6B8B6C1C187761004EEF59E398B1124B98B0EC0F7B29394418B38D8A3003ACB85D96CFA0C3C63B2ACFDC2BF5540D029A261243E06393253B2C3FE253A220DC7AE4BDE0AB4B386DECA15FA2A05465740B072FBB0C8E81663E320AE931A2DC7A627C805AD80819B9D12EC271D9D16736156195302C93490B4F85E8B4F5199CAF233974079A7AD590374C4E5589D0FC26F70FF2CE51FFB3E6742AD5BD9840F62F745C42D6085E46182FF73FD079BD2625338105FB39110B660F8C55D0830587671CC802AFF63FA7FCFB3BDF6D65B362CA0B68B31FB802E7870C3905B04B41440F549583EC87218DF6A0BE0E209807AF053CA121D704DC0C90A499D1742658BB096C776514C89F6B2D3FC7FBC4A38C10DDBD3C08F64AB076C9BA4C7BF24EBDCE9C82B1BCB8E55C4135976C878B95B6ED108C2031F4E53DBB19205A7109C50289C743818B90ACACFDEF20EE33F5C9A7142B5640F4D875122E0E5"""),
-                    TestUtils.hexDecode("""
-1fb3b6053f9518cc51b4a20cb33d02a7abcf1cad4ae7806efe9fbf8652e3755275a641f27879f163a1b265e886a1b21b129d48807bc4933df0cfee53f26305170c547145f3ff67fc6f317c5ffcd94f96fcc4453ac3fce38cbe41b6dc01c2146ea3d1e7a0bf001be3136362d75aa2785efafce667640dafb1b39d555a106b8cea129c5432867e0eaa493c43d21ab388aff1b6037621c1f134adab6093ee7e5760e9f33a0d8e8c63cd70c86438d3f94461a2d4bc9f41243e362bdfb4c809fb28157a6e5ab2f5c6e16a7336cdc4183ac4272920485fe34fe03057ae7b1440aaf99f28ba89ef1b0021cd863ba36e8deea60aa14cc7f2dab46dc401f12f5b61fb82a195781e337c195160fc474e52aecf4c6ff277908c481d51adac39219b29fa7ac703027354491b869e3ec404b4c35b214196822828079ec85ed0edefa0ed2a426ab9bf4c3784238390e8eec61cf7fa1c4a1ea1308e0815202f1109250fdcf69309ef634c4f0b134ad6d33ccb4a5e30c0472bd292c42de895de1c5989922bba6004283fd1376a0a263ebf74e414da5c058ed9788a862408de4de14b54d2adc7fb5e36f827f53b779e549698c8ae7fe4eccbca4b41b81e7239114720147851f0a72cd3183e33c6e82c557a5eecd4d07a824c6ea653168bdaac37a444fb63b29cbc35bdba265c5718421dc104206d224ef985992786180627df4b2f3ec5e6c200c2e0cbb6fad82db3f54d67f5fa7a9d1396c3b8376b3d83af731fbe8eed49bcd99e4fb693c87e259f20f61a6d67c8d87c967d65d03fe81e5d5f14021f8deb4d1a5d25902065e4ef707205a8159f02b4469be4c2094aa73580572a3568481f63e470bc86cfdf7b809c17801918f2a6f742892aaf696e2cbd2bc617f92efc482dc6bf8640a91582e988112cdb6161a41ab879e8c3c15e48bc2a7dd6b4fd25b5e7efd7388e6f3959bbafe518db3b73df504a6f6cbc6086ff160b3e7391845c9797a494000a23a9488008a595334b7b92db4b2f9a267869ee63b8d3b83bce7d57b9018bbc858943f0c7e8fe0c94cd0718672e4473692a2809423b2df248b2e61dea545b2f1db86b7246a345ec591083f4662b64664bc9200c3ae8ce7006cd795cc146aac8315129d62eb20e940aac6430165476742a19c17d906c3fd94a543b453a2f5d3c880ae6a1f64125efef20d7a0091e4bd66801fab9f7a396c84c4ed28526fc1b0042d4245d3f57731d56165e26e1ee72976cdc40b3574801255709cadd4361e7984527e6b9168a8f1b507b1a3f94d20b76bd4a0fd5ec81274207df86ef1b18c09e4f77d0670534a6ac9eaf076052d6d037ec469ab453404749c3c15cceef412a87301cd438c1e5c8d016a2c125a296c4deb4a12b4bf04d9593bd9d66814dff60549ec0a91acc5bb00a2f445c7989af4d3ba9d35868f7fd8a3687495f2580780f8a4c3e9f012f0cd07cfdd7e513c9a84bbf7dffdbe2934480ad3cb241a155248e9c30ba5f5d1574d73488beb96ae47913ef87530dbc9c941bcadc6a69b9acb06be7ceffd8cc7745a4fcf978c1fa126a22864e912e9c14fa73914ab1b9ff31988e6c859bf069bd1f912766680111d9996ce8565704046ceb64610f0c6162f74de87be26889ba868eaa8e3fd8c1c4eac20deba9467f4fe5427c06192a5ef0e84d2a063532131a366ba13b48a3735b7ac98d5d800f6ec7cb5b8bd604f7d3c72dc56e126ae14cb101afc3f5832fed4e94e5e7614e1232e970597997cfb3b9e6c5bba771552c38c9d6729ba0ffc2bd146754a3605c64718e9744e4f7c1ea184c477de17208f7baa9ba1913598889ac44b1d30f5b81aaa06a42c8f31c889737a8d15e6d473e0eb16fcb57a56f2fa9169a56a4d5b687b50e77bff964522f14530608fcb7f405cb5faf36ff235869b99b08765fbc6e21c91833a5c5e6e85aaac997fee4e800dab3c8fd5b35e1cd639931690f656f05b325ed80bccff2013c683b0419b5f43c3c14c245e40f537b55d20165a92e7b6bf8af9c81cb4b205f327b946c39a0ff087915b015c77930f221bb6c2c8d6500a521ea549f2d7fdb4108aed7a5aa6217450e238f1727535b3635f7e1b15b583743ffc9a2436e99c8f6e2a46bce90434f345090a76c422d778ebd3d9f4364af2c89d1353d64ec72d691d414f56c7a1747c7ea3ee8b284d3aa6612fcd30a08eb7eafc3dd42f221200fd0b394c99235ecebac79fe467c747b3ed5c09ebbbee5dc240287cceefe186f0a5b5f4fbddb0675f0159c750d715d0b01978cdd4e85ba77cae57024c6e6348155071016a96575e5f9b227c87e82db0a8470124b6572da0cbf2cab372d85708adadb04165b6cbe6950253e2c1034537ade941ab6633c1ee634371764ded5c131cd57eb9d3a794a2d26750d01498214ec9b78ba4c9400cbf7b910643a6ee5fb12fe1f2cb348d566e63dba6c1fddca6a0a6644eb7187a53d0b5d8bee99d31b92981fd81cad326a8c107abafb623a0d11e861177a58f1e3307fde29d63a3924bbeb0e946bf7f667599b92d98ab6af9d896e2ede95ca65cdc98b07456bdd037aafdc4c91bd387204ba7ea14dfe387430d290ada9a8296198e89b746f0264ef95c45ef3748bb9806f24a61565624fa84326594a572c701602c7317fdfa1990426ef70a5d3434e7b1ffd779e13b23bea25d63dbd7d9fcb713bca6c203d1b2f337a6e768ff8d5a1b1fed4d69f973f0e0a59f3c3527c30a1942054d3cfd04443d4611259b63c14f8eff56d17465e29a824afe408168acb215b5bb0252bb7c705280cc003311303373f30074bfa769676ec7a48df2d9f68fdb043b035fc1807fe7457e01e794a5130a857c56e92a8dc234f03c5c7fddf0f385f63b4ee438a2ed5a027af36eadab17dbd7eb9eb541e6ed5af00e1415622b083855f23d1c4639dc7c5b95c71673a2580e88092e446c29236900f685219aabdd06720f0e50dfca6bdf53c09ab3477833bb835304ffc65f1d6513acee999682bb70665806deb596566ac785afebd6ae7227ea882941257ebb10809923ae562cb34be2acde2b8b0de3f2a8b81c53d47a80a3b1d360c9cce2b484cc5dc62b948a6f990aec5d9c34b745943ba361e14de27232dadf5c72ad2f47e24d0872b2517843f3c43d1f348fdcb5fb589c4b304ddacd5451771ab0c53c03a33dcfd13e2720ddbca5fcd3f112eb81ad6bc1aa059e2261d7cfeab30fccb952a0254d92ab6c884ebe18c878adeee97721267393bfc85a5a4ebb7327c6f69a71a864e8fed0665b0ef302f16ca3d6ae033bbdb9443bc40c78eb7b3c5af66ba91ecd852e4682ae25575cd7d09adb3b74798d14bffca4f5bd837e80afbd77510ee78c32ee219f4156076dc6bc9ce87971e232aa4d034366a3e079e21cd17ce42c3f60f47225ec2407147bfe01eace5552956e6697a0a64eaa3b02ced7a39d1a1c2eefee96c2f8bd2c122ddb0960929e57247fa3a85fca43f63de635ad5d4fad02565aeb7f00db0c55c5552fcbbe5889b6495c59541a77a8dd20503cdf916b3bfc8f5e87b217134f2fc7a6cd13a736059348b3106bc431d929c09d4d6c0e39a93759953ed35f1df0ee90366e73cf0ddaa03bd39293e95929cefe9cfd06079b592b42c6e9f47ad6c4263233123092155047ee7c48e3e4e62f531d3810011a76f477a8650bbd7be790606775e1f932dba57e5d4bb2b2401a01a20b83b69ed97bf1ad8c765c93d8d4e1bdce3a524eebd6e54734d568711804d4da19fc69997129876d235fe53c78408e78081da0edb8d9c085c863c6603c06b8eec7733dd5713d79830b8debcf6d3e9183852502fc9bce62e85c20cc098cfce099d0a810df722d67932c2e3fbaef6efabbb67a83afd4cf9514598f316b72551abff34d1d13c93dc679bb58868148fbd33628d8279fee785dcc605073a000473e8ea9dd6646242ca2dc3c4863de1d0f8ad955682a9ba9fe52317c2e5d130892d5b6dbc41bd0ff3148308393d717ac0e96fc1f45e0539bb55eb50549e508da7db93d68f1711342a9d6ab64e178f55cd6eed8e8c28a497336fdee128df52ec475e46cefe3651ab9935ade5adf0b29ba5358d35d3b6516c8d3996aff1e2cd06363de48eab1bd00120a0d407b092870c2e76b276c70d4d7ac85366f60f2343241200253f92de66b037fae4fdeb1db275b7ae6ec196902ac69e9783fa6684584dc9067c7cd4a68405e0aeb2a4eddca1959cf788c0a516eb94f0824120ea24b9fa2354028afedbafff79917820d4d15b12def7f9efe49899c715c7b500f70980a8c799b93db838ca2859a06cdbdd5f84ced9987e1dbbf74ecf24d5f2484950dcd57347da8b8aece55d4afc7adcb0b232082157b0bbd455ca7ebcd0ebf257b184b3eb0d1ef736dc7d02681624622947c4f31f0dec5b430616a19b1300427495088898be15f27cbc4688ad4a93fa208ea20bed26e94984525db33a34b7631018e55d1b8ec54dc75c85e0c9a95c4f212092801e1578ea2e1a8a7850952a1bbd2642d7328a558c0fba8c167eb38d105d31be1cc497460fdc3973b7f004f1aa58fab493d29501e09568b3fdd7b1c8447cf154bf57356fca7c412c79417dc20e2d34485e6c757aacb1d7ec1c6d7bd97374b2c2d0132f6e749fa2b7eaf3ff2b385c6df71c232458babc000000000000000000000000000c10151f242a""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-4253129ba04cd46ebdd117f477bae35bdc6eede60df6a94a580b28abcf8bca385164de3e24f7792faf3d87c7eefe208adcca6f711f57d4860bd6df7f3950fdde40ca14784f71a397f300730072cb47d82ebe5c2360b09201e54b0e371efea2f1602ce195786dbcbd291a787e9fad05bcc548c4a8149d69b1b600f1111984774aff6083ba2dc1d1aee5d0d34483f9bf970229d87c858159225c3bb28b406f060dcd62f95770c78fba88f99e27093908cfee69b3d71a12f2d165bc8ed692209989f37c6bfc194a1ed596a38c4dfd284d734777864199cffd431d2479b24b3d77d6f33d92b684685e04dca571ca860f757c6cbadf7b1a96bcaaa2d349fdb057e066c613ea88c59c656ca5c10f521fa8bd770d982d7f042701146e16434dfd174a7ffa4efbe5845b6640763ae0b8df89e19beb0f3b21dde514da0693dfb0918ea8778ae0bb668b306a842b9c058aa8b3d3128fd468e4cd88e76e6f7cf737f85a36d52a1a8f3e185c455f57ad8fa5b1ca0e8ddc6548dbb6b217d1aed1e3fd82a335b8a41f2276c07bf9b08d2dd4e56ff71e22a66c7727f0a6a354c4c97826c9226b3de7931c252d11e098279f5a2b81117cfebc677ed05a2a81a0d74382ace17dc6a42e98df023115e03412b55a0e9edb4f1c7ea91841678c5c5cabaddd8fa57b5f1a5c1570ec341628d2f56268fe48ec9ad88f0cfe1a0b546bd10da7d81c39036c6a852841b8e060da573c61983502aa36e2874127f6f2c3461c7bf96119dbc5e1ebce6f33aa62eda8c7363aa842cc21cbbf2c1151d009226ed4f1b3afa65b06818805e41e7e2e63ef2a816f1d88f53f80963e9918136f84b1114bd2472c351816c4770722d797b6ed610526f8f27642d13bd31eeed3f8bd5cde13edc38c5d288e190fc7eeb5603ecccbf2e97ac9222cc7531dd1736cc6e93abfcc5386d1ba9f7143bfd369ca09f5b959e7700805597dae9eeb54194817c1b29d7f0519c39282b4ce257b191a1dc287ede4bde95f22c3f3b49c33a2f939c9dae34375ccb3d8995b3ad06af98d5b7370ffb863dc321c12d49bb94597ce00ba560ee60ad72cce2567c06f1d3fb5e277d252b6fdd2e291cf57438a015ea85b4977bb4766b3e439be35576718ed67a0ece1b590967082d6b813add2790d59ea20b088d30da760fc054f9d0d798c2c477d81a3d0bdc2197b74d41a9be185048c7497e8397b6881b5acf15090661651cd27f5ce524b326301221c06233f49396781dbc25f72caac8f26dcb17833647a4c704e4b1adf084bad42e041af26af4bfd75182fbafe5e6450a774548ef7f3ced7f4ce107f4c0e4044cf55f8f7d5e09974c79e36a85a6e7caf60b3693745ec9e09b047c7de351074ab58cbba84b0d93460086770d7f59d5e1b6291cb44a62e90ff7732b0d7d1e238ebbaa9dc8328012e1520e6a36ec864a769cbf39788db9a95a78e2d29f40b673cde57490ffbc36f973e7b13f0bbc977e43dd16716ca23fb865ba1b7c8b02d5323c166275472e90e6c72de1f08101084012706309c4aaa95c7b5c4165e7731782b508b085b825f2dfbb5017da0066a7b17fd22b7b71f9cfbb799589b633dd6de11f156d7aa0ce4278415b6a0f896e33e055f40e4c9f5fe63e72cc0d623100137a4cc43e90776d58ecd533fa1fadd505f416b65d528a209d29af23e268d420e67627f88fca6b019115cfc5d4731f793c9a7b7c8627e801d2644425e8cb2735361d4fb7866a460dc12cec76a4d82f1c2c0174b585b6a51f5aeae8e90c0d17c02f85ca2548ba685b1b04031fc82a12b55b00fad79e494f6285708502e3e387387e8ccbafe1907f33aebcf2662a4ee6097aff44a9117b3fb14403eeb36dd779782341527d59f5e7ae04f18a242c907927e27d32c46b5f0f6e2f097ae2f5f817dd66b6ed80c7d97aa3828de63df8975c4e83dd69d30fbca2164c61dea8d1c553c20afb3061ee242d33dc5c53fb0045c07d837ed97c77756b7fccb948dc89bb4221405f7d65388d62a52139b1b489afc181ee209ad37afb879488e14e286005dd4b3459722c5f2234cd5125b627ac46716d5f0e92712da986e95dc8d22fe9681645e9d7d2ed93fc223aebeeed8b1bbfdfde8c932a3052b6e45f49f85ee1561e455e96f6dafbb9fb89f2a64631e0757172172099a8b9e43965f014684b527576c72f6cb5b7d84df202830989d4ebc1160ff9e170f6b36d7136621611c725758b1e5713d99732014e6ae2b6b30c1ad4ed1d529fc3e4db71b16c03b0d12ef8f2fd2d5f9a2a3c369d4250472e5fc8d8987f9334a5b54adbef49ba79bc9e2249e2a2b726a354b596a957e17e03e4f3dd7562f6f7c3d8f8ed1f93b026d4f77e14cac27fdc6f5e567ddd8ac4ad88aba3b418bf03041ef47f4ee2e29ae4bcb0c4d0a40cec26a808d4e9a8fe90d4df0c2aecb9c713b55220306b4bf58b0373e7450388922f2ff2adda092a11127f6442a8e358914b9a9eb48196e3ffd9dbaa66c9730682b84c048a4023dd220b80d7cb185cf35e21369eed4e92d3c0ad70a33c409aa20402a2f0856f87e562befabc8ae292d720686c2ba269847ca0f1878e43056ad20807d1433e7e1e6c0f97bfcb6775505f581ff8dbeb4d11ba1a8343c517e472b631e6c325df855ba0a8b0a7b1cd21767375a34f60c61a72667e8bf2594c6f21eaead5efd2159a3a116a8dec925cafe3adbc050bde5a64292f18f0ae2a38a2206f33782b51407104a733f31b4922c531f6f6b57a626d97239e698"""),
-                    TestUtils.hexDecode("""
-5870BB288AA6130708F7BBAD9FBDD6D41E249D620495ACFE90C61737B57DBA890213D4741718545CCD8B3FFFC2DB33C39AD631D5B5CC902DE4D340DF03E09248F67E89D28071AA50FA532E94C391D2D1A61B1847C6B1088BE555E5C2694EB0FC1F029095ACD9DEB21EF886BE577682CA96AA2EB3DCB24B871336AC5F23C8488011860B455B687BD4CEF5FA11381BC292B4098BB2CFC1822B48ECFD28AEADA71809BFDA190836D3215CFE755FDD9374115E5A0CCAE15240EBA0147C2F89D8D24454D7A5AC2D20ECC0D46C040FAD233FC51C870080F1FCEFAE6C073AF5F7A78D610E23831D5990985FDBFDC6D101ACF3DB0A74D71739E0"""),
-                    TestUtils.hexDecode("""
-4211c0fbcd62764b125a8c5263404d7848a1812dad1056f3368817cab3cdc97f852487ff9d2bf404029ae58f9ddba2fcf1cf5006568c2f424aa647b4024ef30a1ac57d831cb0eeb85414d3b9069918d92e0fd933b640f0a6a777637245081aa0d27b2fbca9deb27ca1d1338189124269a14120101f0fc279ecedaab6b5006ca4c7c0baee72c5d44f4c330c56bb4a822ffd3e9c3f2602ada56da71ff40a712f115cbb4bcfc484b9e778bde49ed7df2d9f233ce065d1a9b3eca2c494fb8b7ff6b35d64ce62ca335c27a3c157c801ee1988dd9c7d0cb0b6d9c2295b17f88ca760496dbdc9f68910fa07e48986bab423f9059ed8d4ce90b8d1943d1231c8442dff36a63d28e667bfd075a66a7d729a2d852e89d8f580ae18d6652d8c06e02bcdd48970a658ff1293b6eef87108f9192e65001a21bb2e5dbe932a524cd0a44155e52ed18e1f09b9c5d46483774b49a6559fa78377442c9652b879597b0569cb791731007d556a6a26efcb57910692925f041d4d55a71c7a221f52cc578df50d0b5176a262250f55bfa3abefafef82d31d1af2facb5b6d46c554f67d27a143fe7ad83d4529183a02594b584baf860c1141d50ec50db36ab24adf208289635a7106c3b0bfcf48c6ab881b75f379779fed7f1dac26a4698d1ab9334f88ffcbf9a96eff8e85b34a6ae4d2228b7ba474bb2bf32706ae6d35409477269baf4a8effd70f98fe8aa791bc49b7fda540d80d31d699508d3f9a502f90ced18fd6512aa02a22d941acd43e3ff4fc802f05da84ce5c367f9497e165ed4c5de86fd284e0c181a2cbd1f16b66bd3221fd07e368b1e00193020162ab47e61d05f54be7354b497cf7b6e8d77b932eb0f8161cd015c089ae62d604b647193819b21171c1f493bf0fc7f67407045f56e022ed791c17606633967986c9d93219b7db49f3ba21ccfd1bedaf84315a770d978ab657ec5d4e3e39d8de6a163ed199b5d713d206c9eaaaca1ec4415b015aed58797e4e116b366081825dfa54c25759212f4485eec2cef8f455109e893b4732b437c301db78978831edc4154a1be9972d4facf9137e59e2b04b89fce1b6cecbbdba092518d1d78d7086e55125e22edbdf53dbc67f38eabbe9e76c69554fab97dbb290192f1a5c66384a062c974df996b618fa8478fbdd0e30f11549040643d583ad80480c1fd0106c1f2367cf2ab8eeb641917381815b064905ed6e900b7be712d3ccdb0b1004ad33bb6e8a34b94c228940afa09623c85e490c32023e157b451f02aa6017c1656ae1dbb4e795aba6198e6b6abf66874acd91ea4028e3a9e1b68321fb6e707a72443a0a4749ca460cfc0422c7c6b2d322ace8b51270514d0fbe36d6dee137a89d32e2d55610a60dec2266fd7218ca4d925f15a7c84edeaefe84cfe9a1d672b551f5f2e32308d0a456d59c26b7a1689ffb0a3e4817c5e385a0f4658868814272451015ace5bce4150306621cf53e232cedd3dae72eb1a240e625de8556f5cbee438cbd913b3cd744146228535ea23f310379ab18c24ceebb685d0f61e5c81a2c3c9b4f4a7a533a49c8ef32ad14f2e77e210eaf1eed44cd6c845aeb78c63d7c12c6e5f91b59489fdcf68c4c0948a858933604033209a9d5a2bfb68b101f604f6f10bd9703fb9768c2aebca6ed5b00e4974bb348da101f7f2653d55decfd624a7d79c13c05a7da0ea3211f7bdcf7bf1df8d21ab5f4130f67d5576a4c8a927b7c7890fcf42e1a431c0befa7b86a5c56b283ec96a2f27309ed629b8bbacd4eeef278d7775d1c5ec5bd331cf622298a343cd473b905abd0904803d72bd2463d9a88cc11d62068f0d7fba61781fbbdea6842bcc58385c4f3493ceaf5d105a2ec7764030961546d89a8aa5252c117611c8313ee2d7c96cfa76b1f3daa4e9c885b2d271781c654b52ae904f5ddb3d58335dd81e2e6202925268eff4a6676b80f9042c1e1971fe8a9d6b7c8d88ea282e1696c70619a1baa29584c0acd26967b4dd0252fdc8dfb645a255d32b6065951e7c3da633b92017bf381f1788cdc24b205dd6a7db1335440d62d81ae8afbf2640162cb92095270a8ccd65ddf5fb667fe2b5d33fb1bc5014a6af35cc4e4232fe052014cf4bf2ad9b46684704532f33a0f165473ed2850293f6bad8fa8cac3d74a995b02980fe5275aefa92374719e218185a5d62a6347f64f9e64ee8d06cd9d509294f18542d432ee24177a0af0d2374b5e29735abec655bc4aa1eccb6b8c6cd5d0602b8de15ecf20dfb64f5b0b57cd4bf2e88495da925e98f46799d344c070d95e7527ee7d2bc1e5da7e7e857b2c3c91489d188b4b43477082773c95479290b13779c25682dea8fbe6c8d7cab9b07342894eea86e708d1e1e7f3ed998df17cd752e947e5d2cf4b4c3fb9adc9049bdbed6badc20124a694dcff1deab7a33fc3f7c8a9c7fda5ef59ba4ed3f3ee925aab58cc74b789103500aface7eb0311a90c13b1740a54541e95ed0982c9409800f89c9519ebe0f1f8017d639ea1f9cf33a70633ebe2abcaad745ef5edbbd50442265b477a2eb61e89054d50c8956e6e2743c23a387d316cc5d0b02182989c1f01580b597e0a9f578d3a3aa6d5f0ac1534497c5e8312055e434c7719567be933cf6d213be58ac37527999a9260e7a0850cab48097fd68175d24c6f1b1ad8e104b3578e4fe746621a50bbac09fcc3a0951cc968d708bbeea3e7437bc269416d826e8ffa279b755abff5bfca14e90d791ae0357d45a301d166c19dee82f2c2e6035895b294f0ef30d003c60422f78178c5305996363dc281f8627ac75bcbd28c2a7e1ca918d438c88cfaa57766a372513615592861b9872ad6fc4639e885bf03e32820a49687e0df3598b45a2f81e33fed4e91b9bb458fb55ca35d99351b20dbde76038188f01935c261f07b4287aef1158a5e2db5fb136446cf1ac6bc8265f84a1314f41cf40e283ec5da03269307a31cbc5a3a80b723b63c0366febd211a0a448604bd7e56d4d5d9a7e6d8a1247f098f01bab54f27e598fbe6483744e3bee936adbe1fa4869ed81931cd1d7b4f9ee02ede169104f910cb6dc75e10358e1ddb3f2a661595eb44cb851c53c3f2835f5434ed0945a354483203564d3377e78e3959b93244e836ed4475f82fc829946037bfe7300742203d35d55cbb5c18eff04f30bb9ff99ff1b45858d5a46774088bf295ccb5e03792779dea64d4318f800e10029995e3bd7cae442a8d9ab8cde1a26c1de7aea6a9a70bc16597e54e93729fe27d938b205a0edae98eb80c95e6ac8770f5a2db81bf1fef6fe3063e4681751e9003db29209d1f84851a0afcf62eb0e6605fa69da74650cbc4fd7347743075d9cca143a8084c15d4372a1d325adff6f2b945ac8f7e9bba76b6869abbf9704ccfa718d6926562dfc899c2498b073184ea1c6824a245be772b9276f279e2dbdf62fb28d3295f364f18032361a5db82d16cfa57b21b4270af55130c029b573ccceaeb81293f29c1ba5c0cd6292307c9f0c88100ae57ac1892e422891039541287499d3afbc1d3c68e93a14d5a3b0efb6ff267039fa3aef140953b23cc1d7882023407e7c77dc0924f58529e18b41b2f89747d8f1fb6c166807193100ee0a26b57beb8da3c34fd134a28d5df3cda61683e0ca0f9d92266cf0675081dc18946586e5b9e070504d6125fd485094f3df2eff6d9197b3c7953303f62e276df391c8abf86aef1931d60488556e412ae00f7c201e8d64070aa72e291e804c209c8dc3fe968d06311d569d726fca4a094c7d4dd4b16014d4a1cebaa97131ef1ee66d734b9f85c9a6e70afedb26e7ee8d150d611b852b0bdb34513ee3db302395492b845affb16680f5bea4896b866fc13081eb86f509970b69df9d7c023c160456eb94d7eba2e9e2e076c10ad52b9c966ac387f808811138b9f7416bd0a9d21dfe8b706ce321f284342aa301f4d8361bf20bccd478386673d2afbab6288b8aff15eebfcab25406864842b7fd6bcf6c42fbd8b2cd526c5dca80e46a04be95cd7d63d936eb8f5430415b9b1232e4ad3dda1abb1b1c0286e4d89b9750fc67eeb22342a2aaaf83766ffd72efd993dec4a06dcfbe5dc3c067dca721d41b14f8a3536e69923d34bab47021bd1a16640da14fee5e587a833f2b415f4c454b80c700a4d9bcad4c94b6db9cd969d199f0a3f4fdb7225d445cefee5c67b1d6ac63e8e51d80cf32ae75247436bef80affa4b36096b19b1dff52a88f7a3f2e29dfdb9c5dd994f3bcbafd976f318fc59e3d1ab60e92a2c0ca7eebf68da24253b4bf1bc99c98ac429becba641fc2642074a07a9249ebe6508dc5d0d460f6c7bb873cc6a2ad7b91f03edcdc731507ad451ee3d9a4527721a5e76a55dc008f438014fd0797066a51910e958d5a0d92ee2245c853b4c9a7b2e7efb1e9e749b420b126f0a0240c516882686660b38c60007f45d7648eaa2d7b1c6b1bdba8aa5ca140e8c38b0cb6d54e3083e903f7c3f6ac97d95293506613b3a35f1c2a8d401f66d917906210c758563e4722d30b05d375c8ecc41d898574c3a20d218b581db4c85ddb2125e56c4918d021f96bac324ff9e9789c921cc5281c0f0c98a98fcf218232a8b99a2bc34a4b7c9d9031b1d408bbec6e3e633555e8fabcb0115324e000000000000000000000000000000000000000000000001080d161c20""")
-            )
-    };
-
-    static KeyGenTestCase[] KeyGenTestCases87 = new KeyGenTestCase[] {
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba""")
-            ),
-            new KeyGenTestCase(
-                    TestUtils.hexDecode("""
-741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541""")
-            )
-    };
-
-    static SigGenTestCase[] SigGenTestCases87 = new SigGenTestCase[] {
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-f72a05ee9f7d9072a579e3743771e12eb5c748904b15ff67e6a82e1bb77cafc30e16139c1793315fa0b9f5947c2c5b423ef79dda9a5608d73fab61fdf5ade1b323042a98cecd925d9ab15eb79da754237d157db7937297373e8a8df9ff72bfbbc7aa2846a0afd39f61b35ee1e3b3bdd9aca2400d1b007a8d84264e688731d0714a068440100e923048082749e33491c4c04458124e5c4261098480039344043208012760a3a60098200513420952180280042264262288446a52348518374204162043a829a49220cc2626e3b430893430ca2481caa8610014090a842418b488e0886513278c812221002412a1b44913b9614a160c12322098242423370e1b028dc9a86462160d200202a0106a5a3812032108910230114801d9a0490bb148d8122e23464ca4c600581432d8002de3c04d410045e0c2641134448a1012c2464e20484a1ab0689a4265198840da284c4cc00523c58c24204293388614b56d0b170e4ba46820a66cc91600231802d4b2644806828c96485026244a428664402e8c92481214415a0660a18481d18245cc409010141082267018378d10406a2283450a256012314ecca88d53c80148100524a92ce1284e23412621a405613605ca4832d1845043c62498c041d804281bb2718c948c101345a18645a2084891a660e2964443183240b60420c710624662d8c451d34245243428c1c0299c82311a496d9cc811a142040c160a08412904c941634208c286294c988d630409c440291c39895bc0609c02714108291ab345dc843122342208280604364648220da34412dab41124b40d21c7011bc324ca8250d8146c80c08d60b20c83124ad13666cc46259a00880a07484aa8290b8204024862dc203021862154981003304409b96de42420c2962d88b46822c06c1841016118100b2449c14449984206e3206a60480652828513118888b2681ca549d0864ce4342a1b929161802dd9440000964d2310461885612119660934684a080098067122c32111b8889a146d244944cc1485c1828852288e6480410c870da0c010e2c86490c87158424c9442618a984420254e0c84898c28098a4805114089e03846e024040ac190dc388060221119018cca422489204da40085104350e218614338915b408de24411a32081e4122d53c43003b06d13458a1988218c1686511044e1c849a1260e1306481c46520900659aa630e4228eda209113036190888d531851c3b664028768009941a448269a4044d0944dc1a844e1c028c2980523b48d64186e88a4641a058563386dc9804c94862502271110333204a9604426665430459a98001c31401a330d19c98509036940005058062d0bc26114168d1ba111a2380992c2709c308910c830d19071d4926540388609148e00278c4c92890438051c038563920810266948b62492b28190b44014a0211433205334709a2051121389c33462d8986c1a42221bb188dc243049484d1ab1640481601b06500a936982c24823280c03c9504810661ba871082666a00692cc12840299100342029b266922a56cd2088803417009138862124d41140042342ee30200e010491cb025c3202121b990c4a80520802cd018280a39469202205144401a428d9a441040264260246153882c23316e14a241093549048424081652d1405299246aca10060a15660a31250a47521a052813b52908252d010802da04055c9681a4180983026561a22d10958d180146a4b081522080c026414b287100c53124466902015103b370824482243661c212065a1832d9427100088e0c279204076d0315804026111c175109192554006d4ca48514494d8b1689e2120a19016da0386211306e82c2240c932d44a86404028dc9464c02b50da318420049458b220c09c02814c30918a56420b58480984d4ac60411c0700820494a488ddb3611c9002c642081da48504b047120180ea3068219346e949065d9c42d03a9899cb64ddbc831d1342694206619860091b66001014e5948705c288523220c1b81200488240cc34023c740c22045d24250c33681220646c1c4685a306193a6685aa22dcac6210909264906290a992c4c42714c224584b004dc0072a228690841419a3020e4042a888071993244643662cb106409398dc2927058884123352c41180ca31804dc08246132201a1064c2848c12372c611201641604e2388a1c3950d3c8019dac3259917e5cd5cedc8d8305d2f2e16c706b20a3165c635370df6083a64be12031114dd323be97ac280053b276dc5f65045a54c13712955917ed389f5b46e884e256af84a5e957183d0cc38a6c089fd764521a78a244e930eed89a632702849993a7f00c501e383bc265558313637a7b234ec6f3d1543071d61350603efcf9004015f5048415cad1f297a9c9d1b15f7542721222b50c30c26b87db16aad438a2b34ba750d58f48213e351a472e48e54996b421952d00ec579ec39bc0b855389c837f2963bbef650a986cb0f32ce660d539da55193389014130cd102f4cfe130f537721585bc2327cc7daa3cade515981571060c46c015cfe52c9008628228486f880702f97ade1a5e6320eeabf4e1ac3f72776863c8e8a3e89368385173a509c2d7cdb9d07777cb60fc42d0210570c2e8f59a8e043e3343f2086917dd317f62750d310a51744842752bd1a60400a2c3389a874b88a66d2ece5a9b9c864c9d3d4ad5fd79e95955ae3e48bfda369e8fed4e38764a38193481bb5c79a054085ff2b762b241783dfd2d9072d0352a726c32ec38233831585e021a0c97fd1114b7182cc6babc319984bc5a999450e595e03a88a24453c9d926a025b80b53a4a47c58ba9bf5e5fa69151391294bb5004d6e5bd1c730a4b07f0402a15dd600ee13163a5a63902efd52861520197986b7ba28f988a420e6c81fb0afd647873d724683ffae1d6c9e65d001fc1e22f68bd96eaafce4c2041b13b02e0b3d3ac6885cb44e2c254d9ab56ee42189d7dde62cac7c74ae5b6175f430735de71a047ed245ec77195163737d5bf2cf880d1e42d6ffebc751708ddd43a60bfaad314e69208f140ef140a2435d3b64d3e9e3339b64c303564f92384fb9d132072aa2b53239f2022e211b7b023c503faa1f886f4e0f21f814811b0020c2a31b857dad723ffec88da75a4705c08f7c3a28f1ce7680e9ff66d47cec632abfc98fa1c7bdb9e5709e1022ea50d54c7b57e25d13c5990fdce177a198fe7e401e7b51cb73408f358d91b7ca3afb2bef8af7378bf07ac21bcd4668b99591a433981d0d8412d758873de0f12a6de4a37ce12cfb7e5ff8e32dab15a8ad9830e188390d0d8ab109b662c8b61372873d80f2a24f7bc12021c73384d2c38c4c28d8055a85a5df24e6167c0c6ea24ccb4d349c35355b3e924423ca06307f78656b7c0279cd5a25000e7c501711e5fea3ccfa049f59bd9702e6b5c9675416d16aab1e58a878e21242447828c29327bfef77594d4c52c36d33b83f66d81c53632268d2db050ae37a86784ef62ab14939aeb3a8567ce95293dbc155afce0664630b9aa76a272e8db240c736444975b5031c9f7676c7fcf2af3066197d87af0e1efd8c6068ed8bbb387cb359d7e05b38b3d04a4ae7d944d58e8db3b100ded132ea1dc3e3241c5dea374cfe691a050a7de51eb807158319a6893f1d141fdb3094450817c8af9ee50e44e65934d5a1fd039a7dcbc0274bbe98142fe6f50b69cbc2f5c105c0150ae1cf0df64bd7cf73c2714130166c35ad1b5bad3431354305ffbd354bab3e77274bc933c110bc96cddcda6986f0993dc63cfecaf177b8343ff937fce2978adc74b36c8ea698eca417b91548155df19163748121b31f1f075562b2aca99c89459641da7106831ca0a3aec9603597b1a7bec843fd7dc50f644ed6e5fbce214c0c7863bb47a45fa73c884db1d440d3da5c1a7599a73dedb6a093dfe8ae0c8a702d1f37a6cea458a40e8dccb8b4f667022ed84bf613b3f10ad57bce248d2569b11054a43fa9e0152f9bdf331ee7f0b051b3fa90f3f411b719de22c3ba7b2e78481100494a4aaed9d321885b395a63d9db18bc7412ad9704cbcca305b3b04da6b47cb3b8382a7c2de112c46f2d0b870ab38cab5bfdf23413af1b964bd68868a34ed8129d522e0255660a6b717d450c2ffcbf467177e00e5c55acb1ec853832d00af31e8d36b58df62bcfe7f95831fcd9cfb7f51cf7f1a12b84d5cc6ce6d818e7201fb15c2217738d2de405301f0ee1f3f8934d13dcb34852afaa7e0af86a5d31a85c6bb02431be3e0b05fed5209d3f1c51c618d8d261a20043f353d30cfcae57e8662f7d6ad92278cb988f85363cfb6fa2e0f9efccb6c154d0385f2e40e57e82c814ba4903971df4e27995f4a788c36329a715b0b2ff58ef48ee65925c557bb4ac45e2b3d0e1b0a23f9120d731f73c8da7c52fcdcfbe02edc0afdad6f3e7af6b2ce0a29c2ab8ccf775ba2135230ee0a55f9b39e9f392fc66039434c47292bfd4cbe857dc12418442996b90155373167a5b84a9fda96229610bec43d32f403b816e873cb39989e2ee3a885c0fac0bd977546383270acd725904d08623b984c9e46707b9c5a934c624b3b7c817a37cffc9cf093ec52b2b00d33a96d6bb9132673a39a5684c6efe1d1d11f9ebb7dc17c36d40fabb33e396276343c8a2a94fd4c6c8b2415ca91e9be9bd89b31902fa260ae9495d3562316bef4735a830ba7d20fa6e22aeb80b09fa07c9d6419e6dc3c23623427dda2bdfdd5269758399012fd6ce62a57b819c5dbc227ed99a06046fb7137ec13950ddcd577f4b528b34fe3b18ac114d5da5bf7871e13e24a5e38cbf2ec211fbb9698ae59577f66746f3dec2f04b48c68cd0803f0a9bed8d3a54da72d787d5419c8f2bc7ff40be74147ac1b2a471d5fc5d9a135508f203bdd28948a6b2b06ba41a33f598d208e5d857c23342db274ee63cb7813a3c863c8e1bad529f5aca98ea4e9b602497ba913b98e9d1c21510b02e388d958032e5cbf1ab0475b3c3bdacb02142eef236ad34ef9d011122173910767a691f55642fae6b762e1242341aaefa38ea2744ee67bffa470c7b32d87175b5c57ddc1a16aeddc915ac1835c6f0040470f6d3ca4f2611a61f4cbb55570f91406d0f3e0abebcd8abff8b344e582b8d17fa651c89f82181f75d3c88e30563413915255430a29f885c4e51f054da4f304e2ddfbd7f41782f1093e8268fa40d02e970abda862beb0051ea3ec3068f1e3958696ba329c62670a582670834047bd433bb2485c434172f4192b598f04cca6d36f7bd83247bbeec937f1f6e1cfd05f5af2c5f0bed0467a5c3697ee7772051492f8e7345691247d0a151791062062184427801423b398b098043ac0db62fbbdbb76be4c13992d33aa0b8525ba037b76c7f2ee0c76144fd033003ea6720f29ba9ef500c8d78acc27ede081e88766a4f368d87c14d900b45b65046e3652be033c1c83f6ef86c9e003279a798fe58382209a0005661ce13e53afdff6370d6b6c782061016e77f3d3f705b25aca287d5b634b0928d39949bf68bf35e7a1917c26fbfa38f73300a6e849b3fd8f908d37dfab5664ec3d379d6a4eb0ef4554b0f0bc5ffbe85dbf7447c9c5164471dc580494831e3212472d3d2f84189854c98762e8d3ae016425a3418319a8f186dbb781c89feb8ff09fa8f173bcb60b2b352bc2aad3d1c7086ae269ef37e92108285a815b1c1e3517a5426c5d94c2888c10cbdd815c9a7c1f83b4d8b0774377a1e7c799e8c652fb35389f283ebe142a1a2dbe6574ae029194936ff61db61887d4103cb1e2bd21f2a0de551e6f9e1e423a0ef516ede1abe694a97f82decf666708aa8672a3f9b063bf4fe5606a76b3743b16c1381e3e5f4208b9c4f8bba582bf60b3b5d3fa1a90648db008204ea56a9863365c4e478cb9f1155357be84d1faab4db013e49aa46bf050e3f0de60b94de01704c26268b9342a3a33b8ace7fcf9bf80c23fb912fa36765a41bbdaf51d6ead90097176c586f65be9857fc6b07b721fbdf788129aa979124692b9b1b7851fe236a4098d45679d3cce0e4c7aa723259ebf101f3202088f4afcadb686475444bf0c7d38bf7fcf909ccc6c01d12e2cc53823bf9adda6c8138abe27dc835ca7588d9093b1697fe156a6efbecbce0c3115fd1cdb985621f4836cf27835239b24cebfc3b26b0e0b9f9346360e2428c8d7210933c94abc05ac01e7196dd3de6588a3189d7b2fb7efed84d6c53428522a4763f110429d5995ab83de1443560d942becf1d2d741db6fb6d37ad521f8f1426ba8e3dea7d14e3750cfa17f10e8d2a04c01a34185c9113587288349a8c6a70a62539a7f3851e03f74186a3354f83f358500318749e1c34f35bee080d25879a44eab7f28765345e10493bf266607a977e2090d366d07eaa0fc887d4b6c574e9f215748e746ce9c52c46421aac960b014591760f4717eef1b2359342fda9b810a821698afe5270aeaabb9eaa621706497dbf6cd4cb5b4b6b32f870f05b1dec64c67077c8db2f80c1adc1bd5faa31f932fd4c993118733e7a9f544b2985deeddd39670a7d1562d95e6a4746a6c255b8f74772c8ac313726b649bdcb7f7e8b83b558f7352c8524837768f10de5c39dee63f348c25964b1902daa8ded48e03a1a07acb72f0738d42595a4cdfc0c10120ce027175a3f86ee51a3880dd1f470b24d129fbc2921ea1073472ef9d0ecdb634121bce9dcea720a115871606fec35e970fc0ccb626a8ed2962a7f4a7eccd3c93e73ab8aa3d75a3bb0a66d1f7d947f5ce23fc505bf135fa4e6986319299fd6d93ddd12f6f84e191eb04d8df4da1198cc98414640a6d70b6fb2d65fa37d2c7d61c175578bcf194c73143755f0e69375387aef20c27e58d9b870e7b6d6279e55be1a0eadb6de09bf35a79b7"""),
-                    TestUtils.hexDecode("""
-67D7F4FE3CC57FC8BE9A3D06BCA0FE4A39F39E3A6158D3E4ADA9CCBABEB542CA67CAC48167928336993C569AB5AE55BF95C8291AE1A1AB2B595C90C0FB19041435F3B411609412630D80DB0C832D413D69C8D3C3CA78BD1BDC24167AF590B67449DAC7F6ECBF87698BF3929FBC874F6FD68551B28E4EEEFDE9A0D0E7FE9E569F1F9893D39C17C3BA7A6211B875A7BCAD0C14194C30D60CDDAD640EAF7A02CC9DAC074779345B83F0D282899B2B9B61F8504BEACA3C02A76611C82F2007953D04FD3C54D7A00DF8F6DE554FD83D1EA5DC841645B706C9D900DEE7862D526245215AC6B9D178E60F9602F1931503864D97F582834DB797CAB60DCDBDAFA3FAE8726B525E8BB69B5E0763FC4ED17FE7CD9C9629273AD5B073B9516F6CD7EE729351C213FDD122E3C11DBC58FD2A501B267AA4AB21364BAA856823816E77B81B6061279FEDA6617247B86073E55B19973BC0E725F34ED4BAF0AFB95E436A9B2290A2B316C18CDC0D9F98F9F6F13C5A3FC767EC0A9A49BE1378E92BC9B3010B41AE52AF409AE0FE27CB816EB2614DA41C796D5F4FAC4A743FE34EF7C0B3A78E0E4A5B439659D4AC27B698550E89A1626FAADF71420F559DF2E808144707B5C02090F754C3BD4EFCEBAF6FA4493C5D48F895FE7674C81F069E1F00E455BF5C965BE2926BD19AF76E20533A6115F4BCF2CC5DD3A49E10A2B3FCC9EEBB2B6E4F25118599062F2AA6CC3A9D86167B1BD08DDB2C53A5E46E1BF4E8C1967866320BA66AB67CE581981F2003B812BA058B75924254EE3715BADB8E6B1B9E4F4AA9844D578CA2F0AD12E1C964685FBFFC87108711E022EA7F63330CA72AF86262838863780F4115138672643E6D9B48C782B8637E01D3D20CFD5C98A1B57720762037FFB12742B4EA8E89E4B32EE7DBFCD5C11E4A6E839A83398ABBC32BA39C6A25922649971D88A102D1019B560C96B820C44551E14509468196CEAFE3B7BC8F253ABFC59FFBC01A13008F77C91B19083A9E7BE733C1A5E558C64557389CA19249CAB77014D0569BAC7812862A610DC6EE074C844A055ADCAAD496F6976C932587BAD9D7E2080F8623C5ED8D9D4FB9EFBDDCC4CCC1284D22A2997824577A619905B0D6E451CAA3B2D30DAD9728FC7623F9ED71F80599D65D9F2AA285BAE393D05C15891472B2DD2ED5CA669785EC4D441F3308EB4BBDAE8FC449962EF9787C39A533847540965601D8BCB6B4299AA636589BFE371D3904E18BC9AAC9B3B6EB8B7E8F322C22A6E01E6B26244F9E39586F124AE4E504FBC9D860A61B20B4C127FD0C55EE810AB9803D810233E6126488A6E95F8ADBB3F8E06D113DE6A3E361209E0D36B326E042CE9D2698DEE469DA15464AFF82D5603434C07CCFC4D956A7D55FE79CC127AAD2A56B34EB10E8B85C3CD5163C4BB8C1083BCE5E5EF986AE028837809641A6AF2B8295B743DD9B03931E755673DBDEDE56F6294270532D685DAF1187137CD7D29248F21B290EB8317E3EB28B62E45E140F4AFC6D1438F81E9EBFC6FC0F1A4146AAD83AD1F0EE2952643E7B6872CB2823AB21A155C281ABCD19E20A52611C6FFAA724578A070935B1A0BFEFBF061101A81227187E14E96B016242DA269FC91253FD827A73743A4BC49FB63E2D830D0FF409AA1C73706D7C2297CBC552CED567DFED72CD15060A522F9B88EC910B03CD2794A9FC07A8FFC5CB97817DC769E64D8C474A305035A49D05B1C572363913A315932E391B62AF291DC203B9A40F04F40EBF26A4AE186056CEC45EB7D21D88CF50258DCB5EF40CB2ECF949B18C72626469978FBE0964C8A25E8C2D27149C2266748F2B06746E8C9E7E2F0977BBBFE3FBEC7353F583FD5F7C2B0139EA928AE1F67004706F6D4ED7BD8D13BC68E0F4A49877C0B2F692936BE5FF99544B2B19B23A97EA6B5F585ABC9E69E689EFE25E15804C650444C479E0DC63C9CA2AEC41A316039EC7F675F1FD7C0476707370CFAEC9C3418CCF30B5D85FE0E15056D6C015DA59F9BE9028D9C2D93434F99DD8C1BDB41FA1EB021BFD0FC12EF0D038CA32B0FE1449342D83CD6BAE43A8CC4077074FB1191A8887BF29238D27415D93880682017470A42872D6CFA729AA2B3F8B37038C83583E4C33256FB871A704527594596FE858777A93D3095767BCAD2FE295352C93D227E1766A59ECEB38FB7C2E3664D6DA0DD4C063975FAB3AB4B68D125AF16D233389D96A337DBC18DA11F37F430C1E49BF8AD30258601CAC9215F32771C6FC2B7BC03B55AE9664E0D719C3B40C3E4FA7DEFED8571CE8E46FDE8701975D94319DC5FFBE93B4FC4898E2EFEB3CCFFB3494AC50BBA364C22A3953F052F62E46D0C35692AF40D2FBF899A23C1A4721375F307E2FDE2E588830753F908FAD96EBD5FC360D742E2CB2C38A7E142C95376ACAE29DE8E1034207D1CBC1DBF2968677AECED152B1EC1AFC195F3320352953F2503227152444BAA74EE8F98F2B4512F7ABB43D7F87889CF1F8C12D9BAB91EFCA5AED21058E322CEB4E59DB4DDE13BE46FBDFB225F4AEDF7137B548503008002A36D7A3E98C0ED65ED9322D66FAD4A741125EA4ABBB26A2FDD7AD136590061E7BC0D5228555D1A59F8A6E4B97ABB61F4B1AD9564E84C000585DF8BB31AE61CD25C9D91D1A1FC21A69AD286CBC7E00F592DFC1C65E2BE755DDF041486F3B52C8F72ACA97A149FE0CE1378236D99EF099A668F6847659F7EF617B66192CA452ECE3010AAC18A65D8964381F561B48D044096DECC22736C902D7E23EFFD26245018D9D7EA9E2F907932A1EBB405BCFD29F7A397C71A5E08962ABEDA5203988A81F787B25EDE84A7D85DE92A2B19974EF7D0378877B82BD7CB28B67F45F7EE625CCD054B44B4CD51802B4FE2E219315CA9F4C24065F5578732DC671C3004D31830DB435C763143CA209D7DDF3F5EA42244E68429102F4D90297B7C987EEDFF0DFA7F31964B76432E1DE27FA38570F2BF64D5FA3F12DD9772618ED2B95F51AC90410350320E19084F1596F6B791AF1EFC24DBFA2B7E30015AB14FAF43B568C5149A1152A47D278B5F01786F242858C210D28812147646A1A3A7CD69996809B784BB2F0053CFE18446F060622FE3B9181AE9175D6CFD8033AA752296016E7BBF639842DD4073AB282FF50F94B9E116C63DDED805277D4FD7987F740EF8118946851A5336A9F6F6E2FE3ECABCC518B31E741AA79AB500D9C6DEFCC437569966EAB1D4BD6CFF8AD0E5698D15F1342ED46CB6DA986F0C4B2B427752C18ADC5070043FFEEBA98569E90C79A3D5E0434119A077A097D69DA6E9AD7E32C6E8875A893F6D69424DCF4C0D4EA12605E5E8A9853E4B58E5659FED6D724CBAF582A89A228F99BE89D88F55095D0627B40B29365863C57F82B9EA22FDE731D1A2D8A9037665213F2C410D4AADCE12CF888DD4AF53FF839E962F0F53BEC60F97133D131C2C8EB588AA7D25EC025B9E821DA8E8FD8E550EC5E4D5923BFDDBAC522D1FA64C503078618B52F452B57874285AFD3F6B182CA6C979734C94F040EBAEDFEB547683E98F4D13F12A252E8839317A827CD97A7C3D81962A25DF7D8C62B57812EAFEA9EEAAD7D6A9E755AE4CF3AF42CA2152F663C1BADA0E653EB165F6FB56D86212378C0B9BD5733D4C37178FFB58E7357487B98DEA35127AB58A804B13E61E6D3E385C96884EA91C744DF6CD44B3EFBEFC79ED19C406AA6ECE144A44F1E78B33046C33EB17E3BF61A17D849493D08F0FCF8232AF2922D96213647A47A05A9A08D28AADD3B3BF412F29063C9D78CDD3385BFA9F8BF06DCDA23FF79A5912D867EE1B0D526718EAFA6F0E231CE6C51959BDCD8D201838A50634F1C6BEBE2E4F5235FD01A6D27B90C58C12D8210692BF68FEA5B8A8651E64EFC1DFCE07EE670D473F29AFA63E080F7675F23E7D2866E5F2F9A525BB657E8BE5933FBED1E206C7BA9FF097EC95B91E14612E16F0F4082F70A1B01EB6219D47C716455F4C1C60948CF3228557E787A3186B4758AD35922AF28BDB328693BAED15487F7448D1796BB9DB5C931EFABB4BE436B2710EA280368A8E20C5782A7FE986417003236BE9CADC560B3D7C2CA92341536CF67D412E855B92D0229C45B1C518D8BFC82DFC9F413D3FB23D37EBD96AA0CD0B39EF88B23609AE0FC2BD16FA9E934329558759F05C8D4C8F3F8728335B659D3986E44508322E47121E592C9DBC6F49656B473EF7DA53FF8EF7BAE07D1BBC68EF4AC369D7F8BE60948F34444C0C443A100443EFC444E7FCF0BC4DB6A2C2C64662A538D1F68F4DB95B0B83DFD744ABCCBE5DA343621F0E182CB9E915B2097C186F1B98E7D8F297C347B60EC26D04B6D9C1FFC01EDB2551FB8D11D49E52956F69CDE0E49E2E7DCC8E7C8E78C41A9B2A01483BAB11733A0943A9B765A5811451C07A195D87060F157D114358E478FBA2F2B755A2A455E9831B77EA9D33FAEDC1C562E1CFBD8DE156FAEFF10AF655713E36FB508342D9B4A239D6DB786CF9F57E1C39AE65A7329E434AA88C68F82359E6F057873968F9FB63D898F24BC13C0F7748F92E404C6185CE24C98D4E4D8D4B3C129CB46C614E773A89EAD73CF0C30CD7E6C9F6435F7C83A4C3F877E034755EAFC5F30ECE03F6413F4C7DCCD01649B6ACA9C1C3AC3D112F216AB852A27DB3B846CAED86B76FB699AA7623548EADFE6D16AAF5A3ECCC298D5CAA7E84ADA0B75290FC6ACE736051924DAE8FC5BA6DC9AFEF65F369D054A4A18950E71901F4483A4BDDB2584DEDC31A04C5F8916DA2DE33B37078E5DAF3304344A8AC368A6668464FFD7898A18D10685BDE6D0097F95A3587717F6A3A8827B46653D56E461EF861D6908AB7D865B532DAB37E02A7A6A72A06F25572D83ED6DAA540FE56BFFB2BC9D104A74F135127ECE457991152DD0564BA955971E8C9767DDFAE190052A98A63C4C0DFBD1B51BF60643E4C5EBCA678CE5150F03A6EF09AB0B1C2A0D2C19C2B30A645C7DB9B56B5AACFB862837A38407070DA9C7DDA20B99CAC7B03D10C8F28D6B1C686FD26F9A8FDCEDA6B188D472BC593AD51EA62DCF73D32EED5444484853AD0EFCAA60DD42DD2C50F5AD15DEC7B71BF585581B9F9C68C7C94C154CC7E0D19ABC90508C8EB2DE93F0BE4295973C1F443A1B2419E20F3D5F883912BBD5CDEB938A4452FE0BF2361A9E3B2ADDFBF000DB07EA19B2735CDF0E8E5C7EC5CC7CCE1A9C3E869718272E54CD9875C21DCCBB06FEDE38A4E787D111DC6A253A4604B314FE47A9B6F6FEBA3F8F013A456DBB78B497C4CA7F90CC6145F47C96D266BE5507DEE27E968052CAC85EC87049CDC68D723D8CF89B0C91F67CDE2908C0C71808004A070CFA2EB6408F5FD6108749406FFD3D5DEB6FBEA00FEADDAC4CC0E22A9F6F50B9893CC4CAD028FBB73C1B7BD4292AEAEBEB668859BAD444D0C5FEDE3C469CF28C5C726B59E828C473C8787453BAA3AB2BFC29C691FCAC2CF496ADF3949CC42FB16F3677D456E614B1F88406E6C9DA7DB9937B00764D61C3D347C140FDDABDF8CE5E3E2D385C3FA6FD9F13F3BF8073B5D6AACD5294938DEF9C6ED414FDE4B3C5EC43865A7FB02787E50F94033CFE32A85BBE24B09FAA3B55B8BDDE60E325B691A350F2F128CF74FB5B6DFCD0E946AC7BCFB839B3765616DF35AF29F3AC82F4E2DF7D4AE87A016094719A07B5897105E2B08AE3D807960FED396CF38863E69662238541EE295C06B290404985444F4B28388DD942E51867216C734580B3F1D5BB204B05D4993D6F8ACDC8F16FB77B607FEDA67939A2B6AE285ADB2C98E7D37A81AF0101A5CE39CEB2C67CF99441C1FD980C2C542E7284BD21F1D30E68EF3606C65D3230B5146DAB41D4ECBD5FD89FFC68441BCFED9AD8B4E0B616127A7AA39E84DBD1343E2A41B4DB1AEE0627657438034E890C8EBAE19791705BF6C948C630DB1423D310A34BF151AA8ACF3269253BADDF5B40AB7EB3A7AFE2D7891B925F65EA206F4CA121175E8F348B4162917A68FA768928AEB0504A60C4F42802DA25DCECEC60ACD21FB236080AF1FCC9146BA30AD964416F4B524ACC416B5357206980305555CE3485425EB8F87401FB1D8CCC184C486B5B563242BA9531147D6A2E7C0BEC1A56E083F05344BF97A18D0CE0FE56E8BE869C746D4AAB365225D8871D4F99020DDB1CE2B5D7D2E5DFC8A0DE780CBA0A9B9ABAC87F19C73639965AC2382488387F06199A08F283794E1B8D3580E5CCADE811ABA6881908277624D5395021016DFE21C345B9A21B474043E187403E5B0ECFABE43991865A424BD33D233AC4BD30A3CE73DCF49B58CC4A3D2CE25C54FAB3480FFE0D51A43B71FDB7E1126E66856D263DDC3BF1A31DCDB935DECCF858FA2CE5AC89BF32E36D8009657F11691201290A243B5680E060D2CE30F1BF2444D67DC94A24708F8F9261945D1B5275ECFEAAF40311CED5C3770A1C194EC44501DD25B7F5FE67BCF62D1BF31119F8EA7DEC1CF536C1026A8E72C7B2E167BCAA8673AE5506CF6208F3E1B6057B5D488B29EB84D6F94AB8AF322B8657075B9EAD3297505AA521D601C21540EE71349614CACE0E7F14EF42D6CD5377DDD0241E34CF273A1171135A376B98C53B218503A908577C268F6DD46CA9C26DFF5942998851627474DE9E6B46F49DEDE85CEB993A52D01F6AAD6F96439C18B0DD5A4FD559812227BBC0567A28C1299626B171855AA0C74E2F9B1AAA781D34CA58C72C708AC49F5AE1453902A1FFBB8458E8B4786771780ACAD999F8DB036CF4C3F77AE345817EDA2AD8F7D2AA9228C994F6AEE512F7C2D2AB72F2099EC932D818E495CAC8507B06CDC6702944237DBCE338C20EDC84D958C14233C1884BA09A023BF5284F0B0157048B6AEB508415DF337A553F6435140D0CE5D5CAA77F9137B2C1AD5A02B13738772743F192E53E970DDB401983535CB096F7D98644797F487CFCD18F1B22BA7494D892C1E5AA05E66B1A4326C70E348350C97DBC26CB110AE8289C97CCAAB150020827B7D7AC7913B4FF515583677018949D39CD73BC7DBB90696D5EBDBAE6BD6FC78E3826C8218996F079A387A17456875952B268211891404E80F8360F042EA3D9F7F7BEF772E64FA1EE8B4EBE0A1162A46EC1E9899766BF4D3099AF712A847CC86291B3D6FBF51B3B3CFF87D7DE71E73069619480F6056AAACDB9ED8E228BA075622C2FF242CB050342DF8F02118D071D27D1FDCBFADFF49184F5A100F95E1BCB019864E58E0F02672C8F5FEB97EFA06FBAE6EC3D57A10EC712BE0144323292A2CB27F1B1FCC104140F556D09A6074F853AD4328B00E6F2F24A61A7932311BC999805F2E774DB44ED72ED244A945928B9512556EFCB2BA7BE0E668C41AE7601339F0162CEC0A1AA91C3FEB6A8A40158D7A3560924455B9AFBD4B3881F6C08EC2895C84CEC30CB0F5B499B4A66267C719785F94A9B9F96FCEBEE939AD0FCF42D0E65DC241698DED0EDF1A9BB4147898E6E83851499175105BADFE4CB00B9000404DC92EFB4EBF41D9A9262EDA550DBD0B99353D001F90AA05591100BB678634FDE4E0B1C174222C253870DA3B8A797CAEA9B446309DE5210F9A932D6AD48A4A7361A943C1BC66BFDF75CAF5409034A8768BD535B20996A728A26E28340191E03DB17A7032FFF883EF664FD7351DD37DC2D72F0CC4B80BEDD1DC33BA3046162F5D0003140DF78FA588A9FDBDF778836C6CAE7E5A20FEF030C57867B295712DED14474FB87A301C31214FFBB4F8D166498ED93B6E233A669CB88D441A38A0E5846EF68F5DB20245980CA184878BA8BE1992A0638B058CD3A3A501CACFC818D2B5D7876DB6EB08E9F26430FB06EE0B9E834D1C331B66CD0BCCAD7A66ABF4A9D8F7A872932A3C0B25C5BBCA480159711E0BADCF69A1107B286AB199B210CE95BCBC4244780C074C42B6BD43869F27BD666F9B2541B1561B4C207E9A667EB1E31942697FCEBFD0B920EF80CFBC5CABA6F528187403D7E8262C110458B5382BC376799032362CE57ED39F0D29D7822C408923C29242385CA9749FACA43EB4483E095851E89D24CAC7BA5AAC60815CB5C8C5331CFD66352BC8623D5700F49FD98FFF9E869D5AE173961138D76E00CED6DBA09144083437CC8FF5ACDA10BAEC0081C8BD2F5838666A093B412532C521753C4E11ED0521923D1EE6BEF3B4FABED7467B9C8F75FB24FD8D96759A6146B34EF951C4DF92228C2E58231A8D25E3F08ED5A27BF6041AD7011DB41F815FEA503973D4E7B5798489B261A0AA4D0C32A19D17C584B1702713D1174E542BE4EDCEF27016BFC78118445A63FC1D17FBEE5F71DFF46F1EDCD050239C68DDBDEEFDAE7EB8963B5BB4819186D45191C05AA049E50C4319936C8788AB72744912AF28BBF5CC77C835C35BB4F987DBA6657BC2A7E58B7CE69AF37AF680DC0EA7797B29528AC70D92F295C561E2EE0D0E530854AA19EDC43C01A383035F6A5DFB354E9306962EAECA25EC85B9B78E8A1DF6CA50EEC733F60C81BF812981337F784F8CE07D0C03D8B3E72BEE1FFA55FB92DD0446CEE29D8825CBAF1A6ED295E613FC700FA31167224D99338C4F59B1BB9C1E63CF77476BF84F2001D42E4161F7737B47C1A5F219F6AC8B8E3ADAECA827AFCD6BC0CA09615BCE15F1BD0803BDCBD41E68F781517907EF3DD8E8A33A1E30ED09D7EC1D3605DC72C9232EF9F92475743164E92D953177B98906DFE5E414E134EBB63C79220D4907869CB2D93280F60DBECCC81B532CA336510E2A7F1D631F7BFC517AFF223430F9804C4A4877D8B7A385ED48F390ED9666A56EBD62F6C943D0E52AB1EA247BFB07C05908E99358A51E6111486133F4A6BE3BAF6B2D4C01529925ED911CE728B4CE4E8CF8379BD216108BF964496269BE76379912E94A4984B890A4BBB9692107D56AAADAF27ADE475E98A566C0C9E33DD1970A3DFF0E2F79197F6315E320BEB5E2CA3E3C904B557075981118B363042BA687DC682F13D213974B1647FB43DF7FA168C9D4F599C5BDFF2941C111C6C43FC75E69C290601EBC9F23D665F944A9B75932DF7792CB8A005A7CC83DD071376DB11F9C950B38B270E06C907FAA102AC76722325934755F53F3650B42D0FF293FA37086241C00E99B9C03FCE21F8D7555CFA93D09A0EAEE3733A8A5E4C45E74DD5EBFFD2F75EA60942BE34412BC82FC9959CFA155DC87FFA0AFFC1E7CA5057EE016B9751C16DF25610F1981A08B8E3352254AFA433E9B86D3CC13FE9B5B7FBDAD83CFA0FFE511E44412DFF1636BCBB49E9769FC52B302AFC7A96A3DFB233831007CFD6C302CCABC119DAD45EE63303DFA1F11C39C702AAAE00FCDCA913371F158BE5493A9B5C3B06AF66C8D5DE2BF9563FB617D1490FF6510971203DD25B27E1AFB289DF894396B8C26548BD53B320203AAF053B19CFC815C5D37E3115FD6CF8231B88FE4C330545F131A01124BB2487A3363B3E534BFD38B1D5138F8887EA63776D78783AC45675ED598617077AEAD86206B9FF61E3669C93C3C3A3A8F39E7848A88C0F94878E5D359C22BAE891FC7478BC8227FF320B047D0DFFC8218C1110136FA803EF6395E52DB8326CE8E3AA928CE42FBA04B1E7F1AC7B73296CBC1567090B9E92238859A87686D8E623B780F0376B8537F41B1BB102CC8C480C0B6C069F562468D4E1FE111B24D51F63E9BD38C47F35D8C2B5BE2E737274229974CC4CA63BD0E1F0446F6C4448EDB2498F2376EE26BDD8581242703715AD434E425908D61EAF865FAC5E82578EEB0525F54320B6C264F37DA36B55C2308D4FC6C7FB2F4D12A88CAFD93953193B7CC46804A0C464740B4972A71B7EAB5F6098FF78BDD452540AC5BAA894C10CD69A992217B422C88CC7849B4D8357D86234449B452AB4D49EDB1D2769512CF8A797F5FFF4E1E0A3FBDE292D91722D71322F0BD48C68A3CC998D03F7581EA7B5F5150E7AF58A076D09D103E9F64E61A2D375461007210DB511EA89FC4EEA75FFC71F7BF31400E7783F12F69A1EB5B7228952E2CD1D6FD57109237BDC024780006C229EAD71EBF4B543647FDD9216D98DC78B43CFEAE12166CDEDDE09B52BDCBFF089B1F7427EAECC21CCAF3FD5A35EE72C3107DF0670891E1AE12C1FB81581F3A45480F1FE06BECE6A494074FF3C47F90C961E371E8014707AB0FD004D19166140AF7B1C9D6B7E4B6826601AE104CE18E17939CF77C2A31F711D5C7D5126F4CB642178CE542973466696FAC1A0858ED62E4F2741E47B83B97DCF4610B1E4E262E700A06FDBFC6709BB1D4AFA7C20EFB72E0D623389DCCB049054CBBB322E63B09176E2903DBCE49083B01EB07F140D498B793E149573D8CA91DD2BBF8DEABAD9CECA0F896A7B306C22F8A761A65CE2BC1358A6ED07327AA0FF4C0B6E2906882A12C50D61D021A1316646461013D8169C4B54C61614CC9EDB2CE0AB0BAC96B36908BA3ABDF92D11D96EBBB9A60DA780AA58B804DC6F91E54D82068FE2FB10EC1FED54B794836F54503135A7F91921E2BBC2A61C99B6A0BDC04FBD2D4E7E430F16B5D3C7F06243517452BB7D2D51340BAF550D260A26A2F3B5451AD7D4E3A70CAF63F92E25D137C9E9B1433CAA5502DA269211F58AF2720FE3F899282C2C02B78E66D3302C5B9DC04B98197D3685EC4E6D4603D79B357282932689C2928361022E79C197A470212A69AC2BFC7505366CBB2BAB8D2E31314FFD77A04E85076D76948E836CF2A87918D43208CD856FFA33740FCAFFF9F690B2E6B33F1D89F65C71"""),
-                    TestUtils.hexDecode("""
-a7a908a5bd14b14de2439fdbaba72b5ee9bd54df9c52b17b2e3561949f4739205c112010edf1acd95513c740e1a23beab2269f5db9b432bbbee5db53bddc1fd355d8ee23f018cdf3108404b0d1ddd3b815dfa8b1c724bfc8f9e0c0e610a8b1260ae33ed202e1e270cb27755f10404dd66d3d32c530aed7963b5ae36aa4c1d0ef442b149b71a0756c9e016b7ff63fb4ed25c59edb578d01a0dcf04935a4b5609f4018a32d18f9a59f0edc0d2e90bd7e0ae75b5402652dfa30cc0938c7e35b3666093157f1c2f6ad80024539443557db996783056c63730cfa60c46c86b79ce446e2e66d2b279c192cb4773409fb8cb918e363220c0c1ed95e9a7524d0c0ac53c172eb3fe311b14d16c2460d0e583aa3ce251057b5ca59fee59f72627fb3b1c8e74a8920f10ee9f96a080d6f0a143fdf029c71f20451757b2519fe0c10e006134a2ef8d51cff472dfa63f934e13fa2d9f9705092712bca99be482313668f52a5e996a59511ab9bed2a7a4ec0ec1f17a3df944d4222b32e7c4826cdeb3abdbf325f7f9c76f5b7de28b1d5208ce9e19e853b90c9c7e2a26cd1590152fb61ae4fe56238b5e52fdaa6a17afbe5078d4af5403b620acc4942d01a432849fb5a6bc19bac30efed04e629d3caa74fb0d7c2873a3609c0b6f8c41d88d394bce13f3a144f0fb3d60a5ed31225badb206848c13c156a2b7be5d9df517d5d71ea3b578f90cc85fa72c3057442c95571dd20c9c9b1424566a408f6e135d74728b4b1aa1918aa38dd2108346a3189f54c9ee83684b1630a29a69d6280e47099ef989c3907b95fa9c1119152d97f9d9181fe2bb89759987a7dc16556223bb0738d1a10ad7959270bb737fc7601f2552a322181e1730228c4f0889cf196bb570002cc439ddb83bbea27f5ad9db5e62ef69290368544e271dad0e880a032a188cf4ae1b290f6576ea5c20ff9ac3b3950566fb8081768a4bd804c22539684572105505d2d2507308e5e50d05ddf24655089c2cfa4185265737894310f66d29551e842e9df5dc36d2e1a894d10504099511c68a0a81900c70fc6c2b32e84587d6e4654c97ada0ac1b7493a8efb756a4aa0278b773cd302f0746a6a18e3b1aea24ffcb32a57844955bab9abb85076ebbc568b4c5ecc898f9a1d9e65c6852c64a1995733420e0ba5a61329b191e750e212a68ee37717ca8961593f146e0093d1b70f07cca6b6f2805f48e66c1b3d6405ae5f6a95fe27d427482fcc5bbbc2c5e0e0449c73eadbdc261ee9636bfdea73a13c0a9ad432b4b7037432c799cff8051a331b261028739bfcb17544732bea4c2c3ec1d42685d007740bf49d8f8caa8bc31c7e59f9ca033f27eeb57f03af68b8ca30a27f78c06dd3a7f821f58579353c325982273415975b03cd8649c9632374f25bf010aa1c0bb82eabba168c3e2ed17213734718cff337eafe9e48b6ab79655e98a38bb1f74519aa07ad10529370ea2581f99c59a824a5ee0747fb6bce34396514a6a3dc4755e913304a28f4bf4019a42acda382a7a7211a30b2878264c4266043cbdbe2c711fd0da53106b0b5b16e78bcd1a075b253c98cb0aa9b980af82425751a7192e42f5057d5e5e71a2d0dcc9404035e63a905133c7724ffa110c942c54e8970dcbcf99fe1987931a5fc14e83b731aad5f2ec0a29f6872e43f18a94f5f9f11e2b7508ebe29a803fe159aabe2cdc242a6ffe976044feedd0b5826c129dec3c05764451feb8b99953a635e7250e74772da18755e819be7db6560b5ebe2de9eac9fdd490a6aaeff8bf568a38f70bd0ca443d336ae6776212e0d99593f4123d91dff7ef68222d497d1799ebe6decd2f7acc6c363e43dfdf9f72b88c25e9bf740cd1207421b476ec3b68843cdd285e292986409aa4ef04ce4b6479c95e52ccc8b5b0247afb94f43af536ad9ee79b58b636afa64a2be3fb22fd128f1f1f05b949921bb050892ed61cbcdf66b11ec042eaac3765d7aa524c0cb022d386032ed7449262529d2a6eb8c5a7a539deb3d1db814f0284e9dee64661f8cf3906a9802efb7fb5c4033502eeccdafd77a6d0f6ecbbbd39aa21f14afc3ec5def48b48afcf5ec99acefeb3007a90a54da935eb5d4aaa68502b1c469acb166646a3af67fdbb51d1338085d2798174db7ce74f2ea9c61a50a6fbb718dbf62ac33dcb7fa80aa982924f4310adbc07b2b672438c837d1c58eb8b9093229cab0d6047091b4152a75beffe7b17e44989dbef1c68feacf11a47d9dcbb230b9b180f9a7d10036ccad63454f3da00537078db225cb746466f1d56df35fd9380620e37f4692aa0b9b5bb1784a4cb80a53a25bd9cbd7ffd2d3177ac7023ebd1127adc732ef7d4963f70b130af5c33a824c3b7ed6d2e1bbced1959560cb753917781af33478ffb947488c8372d227e5efc9f5db11bb010c278cb40ead48ae49b2df5f927363a9e78bc125072929ef80efee18c7592271393b6f29cd1e339e512b1214fc5757b1ddf0bd1b9742a0a11ce469a78866b24035d8499c42be66110a624c928641e59078bd1cf6771c7446bd1977578c165695c4d6aa4ba9383ecd2c41677c3c5cf9af096f4c8c9f5f244e5395ef1db825d2593554c7c741ff0e0540f0ec897a1d8cd88d2f86a1aa21e5473b1fd21a8065d49d682d4dce206f4b511f4d466a56be1bd99d1335b17f4170a08899c2015e687f1caf70140770dddc885cac8c29dffa7d5df823b3b8d64e96008f5aed8d52ed710375e34a7743a98f714dbfaf70e78b177156634c0ae931f5082d2c6b7e8d7b1f025802ad9f74c711e218955938b14fec5d0983bd2f44d9288edb72bd1eb41839297ba5915e518a1e57e28a4ef8eadbc6ac4e14b4f61ff5834b1fc6f21a8065f7e84cd99e1d86cc9fb8582fd40eb4f1f1f4e05161cba9e54c823e77f882cdabd8ec501be12e855e0f492fe572311a01e2aa73c9c0c0ef43df7256ce9a41502e15d7fc76a3786dfc2812ba4451ee9a4d159d1052e0fcac791df2027258c5f0ef51d23498d0ef333c59eaba21765783f7fe51db331be068ec4e3e779eb5cd47e036a5bfb6634dae1e4fc719636a3e4944b64af890b1ec70f89b73b33b626d5b3f4c33e45ffae3472929818e1de7eae0f0135937f4e065b2b1dd045ba8372820a294d4a4c9d44af6e321ff565c69ffe8babd43d095509163bbf8a503ec55588ac3c58074a96f3e32499a6845387f9f8b4520cdd3ad129165501d28b68339c1b0b43dd1dac6d02fa89b3c381373a94c1a59ef4839a671b7fcd08c61cb12b6c66edb631988fdead1a818f843f070a66ec46523f8879d43c98e3a4884c8683f9eb73a4d186fb43a343165202bbe8e1735749b64c9ee36f062f2f8129e227ef8d38a7f35677b01f68162d9c5310aec1a8f8ab1365546ae313c90be351030641004c735c2ffb07d7edfdd7434ba984790cc7c3c843c23531593caf985d63c4eef255962825a44a2c9a5c73d1878b6e149fa754a46b77239539851b2adaa293dc29cac659a0d0840bc545401984682144d7b651b125dcbc3ac272edd7e8805e086e7e33e2367beeee06458dd2dd80deb7e36ae6f9d10f84459a9b828aca738136f2dfdec4dddb3dc6c0ca72e2bf19b5b87ed28ff661de8ae64d7dcbfb71f17f362897e12e94f3197e58b2d62eb849a169524ab78962b25288f87321a753241b123b2aee98e60e2ad7341d8e1796a160932c51ab8c6a0c97b188ab05dab278cb64f025a42ff8e40a424858f7e56b27d0eb08746def560c8dfd11bc359b8afb1a3b922bd34dd1f4588572d26401074e4ef4f37500d39456e458b6a9f30b94003fd110987ecec56629a013245b48be1f8df1b2ad80b3097552841186ee787be2e8ebd555253f59e12c255db9967f8f506746b8fa49203e4b2bb48d04bc117338c40a6badaad1bf8f100b8420aff9231d20bdb2e78ce173b12a87c83f0b594ee7225d4d0b975a60ad615f8a21f3a4abf819bad041fd01c740233cbed5e690e6061998af1f0fa406862025feddd62ee72ef314eb3b12d40227d92de05a960cfe96707f9c9fe8d51728fc8258531ad38cb8206d978283436f6b7aea2282cf63b27b639c78abdaa21be576a55388febd14807625391dbb8689896d08ca7d41d28d6cd342426dbcec96d6d44e78739818a757a94f615cfed9134e38c4d34569242c51b8992aa6419c24b4a80c9593ff77d8bc840e6bc7328b69a95354606602f0f8f13d480166c4c69fb5c74fe5874ec7d98a9170f47096fab89d9ada1285aa2ffcc968ba5dab962248471b2de8ac7126988362b845127bee0edadac224e552b0bd83f0a0d9439bf24de27d54243f8106b5e95716d835a7813fe504f195b6f2d28e12dc041f50e31858cc79ed3a143d9c7f4fc8badcfc3a8b756150168ec302ede64999450b0359b368e3acf00bbc9608aea9c5714dda27888d63f60830cfa1ce2b224b854136a204dbed8e034cb5c77f9b86ea2d342bf3a0b37a2fe3978e4a9c7d881655014bb23d8617ff04f6bdf39c01da6a324ac58805396ad35733e42629ef4ceaf840fc83ccdb66e96c6e148256059e3b9eb1e8de429c77f8fff51bc994fe35900059b044c1ef5b336031f3b67d3bd471db0b7c8138b36ece1f56101e9298d7f222fa9f48b9f195f1dd87a869bf8cd0810e424b82cf6841e686f91fa3c443c7e7e547f7b920b774207212de69e7e4ac8d79b45d076b82d8d8d78c9c55aa6f57a7fbfa48e03005bb65fce5548f3fe6ba2af580f5881ff739a098f7c5841e4f1351c5afb3258c39bb39f96e751c043c98b46f218b44aeb90947d291cf6042aecf045cb51fcd687769eb88f07099d3718de8a836f7af203028a5560544f170099475f374f8cd296e4daaf3963d3ac620966584659600233838d0c5c62796df7085b19d42982315cde7335f73178cecd12708124004b937fe29ee2b72fc91b94e2a6a433b2a35449bbe0bae6b866e1a10b4021357e7dabc76c6b9eebf238473e953abcedffb63b4dcf4f73dc21a2beae5036cfec91e22dba6470d2ce404a7b22883b8735567dca179df3d908a725e2e5af4201b6be97f11e9dd58ec44256e2fc223156a07040bb3008aa633a70c76879a4311918a748c98c9f2e485ad45b90b9a59defbfe2741b96904f1619ae66a70180a1c3b550cb2fab06f80d4fd2ec44cfc09ed26da85163f7c51e8357ea149774b77c41a11dca2b70ea2a6f82375f61a4e1815cd019220a8ce7a24b6f94eb3aabab0241c8c585c1d35422268a3c9bb9ef43d3a3490bb231fab37a466723ee47366d71f6131f52dcdb19768a911ae8d9b11e31c946e0a663171d53ec51688603bdea9d2830bc87ebe860c8f7bc1ee1d18980f95ded0b462764d840b70d4dba5e022110993cbf58888ae3bd6dff8f4b2e1acf367df31d03375e45379e33defb73b2a605f402d364d8b9f7e48223c979239ed5b2b9707555a698bffb93200ba565b38453c9452186300ecebb1294db3a092b3ea1ff78ee1bc1f85a51f50d1fca7ca0d634a027ea705ec6cbc10ce51fa13afa4e7e756eed9d19e9c0b8a9daa9f00b11d2248ef3dd74bd01ae7a93ea2ad16fd0f0a8321a67d39b07eb49418f475513075082fd9e0fddb7d225d064d354c2b3f57343220211cfce889e69149b5db154054dde2736df5efc993e743ac1445e676d6401b5039834fe10c49011e3f03bcae6cfc3eb2ecb8f8055d6a17de626ce8caf8d8061f7addb6fc9c229a2b3152bb17e6c40ce3ff89acee7fb5ec800fd18ad698306e2c25146f22aaa62aef8e054ae7730d2dc0477c51b0efe2148ffd7daea402118658bbe0cf265e29a046258d3b3977b0305d30bb496e24e0ed6d997b235c310f36f4cc884abf0fe62b6fd3f164914e6d78c6d4abc9d130a442163b4f2b3234286ab7b361ad062c6d6d4a2908e3033ae5db787717a6a4abbd5975faa48ad91738d0b29f50ae36d0712fcb86ed1820d9bea175e295c0e9213be5226414718842d3539d7eedd89d6459eb50cc34a058b8b453d38890d76893be1de65d6d2cc8d23156e2a414073aebea846bc157a92feee6f6a256fcf4346ea061041774103be4161229c079c5a529e3f375256f9731a60d7c106aea032927baf6b3991c2bfb69433a3f21bdb0271132eb43e027b404cd9a882798995351facc5acea7b2b006b649fd1cdf6628fdca1e4fbbc71006743ac2767501b2116567b911deedf5936175edc26a65a6fcb29dabbc3f8db466a21a08fc34267c557e6371f23b7ab7f698565d9161b0a658cdd82278c7c0f9728f5a63d821260d2b33428f728bfdc32e3f3d3050d2b87e19dfc9603363b2718c039751746396eed60cb7fcf3f7b965503d6ebab7e04faab921a143c37b8fd68260f3f4e6e0ee396876c2df262e5f55d145e410294d1da139ecf80c792e12f121862b6edf6cc5a9de9403a0d141a1d4eb8ca2e8aabb6babc44cad5fd4d647ea147d00e122633575f94b2d0f10a1e34570b0c2232505e7a898bb4bbcf0000000000000000000000000000000000000000000000000000070d111517212531""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-a12619d8176840867fd76c85b14a43f92b39487e19dc0bc5078a6ad5bb20ca92ace50ce68a6bb9ba3da7e58c2a40ad87729bf63ac51a2d4a58b9481279ed7d7a4e6fa5cb2f0e044555d05a83176c203f85d02157a149565b329a18d0963ffc378d02874aa78fb009073a6bb453d992a240eb7ef84149d000acfc8fe56af5be9390062e082991432664122412a2822114b6810bb581cab4650049894c824892824c8228020a3472909271cc28208a462a0833129828301c83401ab2849a48322097055a3628a028488c285194824d624282480206042281428624e49265822440e1084a5b42015c183163228192b4295ab82983b63101816d490004d4480e8184858cc805e4c089c9a05122348ac4b26801a9480a2902cb9829db108623230250488e439461d4204a9028699b960588286c94200c089484d3a864018604540811c8a449a12001e1c46d002106d1248d0c36848200819038210220128926280341495ca66c20b9880a1224dca6911827059892514c16919a06000a090d13128254140892406c11a76452c27054164408440051449289020020017209178d0ba801602869240865ca8464ca44652022218b082859c210219120c1b24c594441832660c30611e4326c53c40d50340dd31405634852e08409c218514aa021110366d022715b80050815708aa401e4302114b68541b004e1002e0103200402601a252858a22c8430685bc27001096511050699482ee03424880440daa42163062d944011d8328922a9310235210a484a54c02481c8681bb825e2448624c821e0384e1b150c8a168681c80402922981046d62444d8c08600c0904d0b245c092480aa930201810421028cc886992c870da00081423601812481b3322892652409884548285524089a136292326402028681001309018429910405a484d114692240860d1861108122d53b211c2c24c24c42019214da3c4500c2410e1262241a450413492214665d94091d22840d9c84d580426dc8650caa68412282a01a71188464a84a46021c38d0c390a8b081222846c1cc48444228642120accb26493328adaa41001154a94108e891406a412458c9680a0082260b208813882e24011244011000464482612113064622872e0068493004523012218b40408318d584280e31844418891c2228208098d1ab7852244804346261342861b36094c046c62040219362911026d24c6094834521a878513208a141065d34211e2486e884860003305db340492201008a12864446501936c50880c1b324c0cb4809b3086810224d48221d0b2844c020813478e0b874051342d238969db148124a4884380701c104924002913174223a5404326111c3382894465e410304c3829242610433690a1c8900cb4241933855b9490140364198949090269c2c04004978d22100e0cb8881c003193240c11022ae4a225e1002a62200dcb0821c9064d80104018a70c5024224182708382285aa4448c044a09160d48a42942442a04092a03174213059158b85040006a112724011726a1464dc9c605c0807012430ca4106400a245e2804008282cd4b20c58208688922824472893b829243520891812d3880ce24288e1888891462d82925050962d12448809954062c648081006132270211549d8806520431111c48c82b8085248210417451a94458cb86589882c9bc6488c206cd346828c0490522885a2460c1b08258018818c1262d9108e41a80523b7719ca40c1202425816724c4610038068144308082431500411193861a4306e14026ec49445a3a489e1125221141013b8800287311aa6701a398423a56de2142619032ac3266953281153066a90b66462028444b290ca04860a312e9cb2300a492080162d5122908c180204274220084cd3141151262d1807840b3608448824c3840d1ba2088c822008a2891ab62414c81064908012c6492093284b02615cb82d4094109a3060dc220064c86c8ab45123348da3022d00c830a3126a044668e1240619b9642328680bb105922809db302450180a209188801062a3b8116298319a266263288a11892d41289283844918c82410c1111114220bc88904859191286a143148a4828c51c480c4042659365001862422870c5a969119308d00a665e13830ca384910a00c0c923153c685d2c410499465a3866441801013262e6316000c49811c160211b92cd0c0497cda1a2038e94cc9434a919eb67de0c9982db1508cbb8471e4c0a2409980bdd2c41d4ada62f2f6a8a783ad512eeeab3b46f501b0a0f9a5c6e3572d1ec107bc431a95f7321bd2bcabbd951b2a544666141d24e2c200fcf2eac7ac8170e137971121862e74a9929db36472e42e1d928ae6ac4c15cf130b5fc7ca39c87dae2327f58bf048591416996bceab419a1dbf6d64bb53fdfc4c9ba426a6b1c20a21005fe2a80ee053814a44ae6f9c5a2af37785f5360f7f9e89e0d4d9df1a3a6d37a5b32017a7ea1196a6891c46ab6050b8e3af590d98eb670607ca1f3d8069200bdf40cbf61981ea4ef96392d56e2669e65784f57fca0e0dece5897fadd854482bc47d4407925a98750fd0a5a94a891b6cf66508e70e8971ae4b8382a7bc93613726eb26fe38931e4c5f384fdae6014d680451d723cf65aeef4a64609aa7d1df828ae3d8bd422e20e2b5cd44ea45d27a0c7223d72f1f93189a5eb39d9e3b622987cd57be3231ec5d6e9c6d73b54db0a9430c203bc6424c9783941bcd85ad59089dda8f71b1e0f620cfb7a24c0e16dc68681e6fc7060e28d216e5211de4c405b321ac0f7053a3eadc7bce05b34afbdfddbd30fa79abb5524a2600e83c935d70e0e31d31f30d14ddaba909fd868414412fa11696cbfe7338dee676f146e5032764e830897a022ca3a1d5e0fd78f360789d50a8f885ffd6ef62e1ef686f3020c9592d675280f9f99b4aad173e57a8ef11ad450c367e220dbc1f76f1a549954cf319cc859b8fe69b90aa0f63033e93a454ab569c570dc99fab2a5b42ad091904c31affb3569103545dd02e14621ffa97dfa373dcba17d970dec2fa02d99638348202b06b82fa65e75c2bab28a85ef546e760921acdc7421925aabe2f5af75bf7c361f326e3521d95763fa507607c43b2056f16e0375f3d742367ce49b841178a6f99c32fe99db478d78fd4607c3cf02823a6fef86fe2f77017b028f3518ce40eac99a80e0556b4de6e79c26c1bb5369f6ae01bd86e485ef4e45dcbb795af382d151db6b030c4d1e7fd35e3f7a757ad89a7577e65626da96a8a778763a4c764291b88436b7f731e62194f59cdbb60089b8f09c938e1b0055d489cd35567dc7748fe2e4dca6fd24005841daa87cd2a9403a869c93316f7acc22ad87ba0b8bcef3c0e270fe14dadcf6f95306fc2caa8086046ea8f1c6c11f304eff5a60a3a3c3390c9cc91616f78d72ecd5d9cfd2cd63a745433c3d96f3b3492df5e301f3b9576a8ea6f807e19ab3b75ba9759e6d325300a76ef7a8df818f43a2949c40f2c71ebbeaf5a21e2acb0b3b493349c82e7846e8740ec0ebee35b3e73e197d4128802abcfb9c4d5f48e1296dc13e868ee67ad00ccfcb0b09ca4036187bd5bad3382bc54d85d9b375bb27255276c2528fd2dde64770dbc59c49b4e000d1ac54ec66bce72fb50048073748462141daa2765d237612317fab755f83f2e83d3f7d20cccbb5b7c3f16a8d56e061216df7c1827591c3b75a46563be548840be63781d929bc08aef7ad6523d29e84bab02bc9c7eae34e760319e9ebda2fc6e1082489c8493693da37868ba7ef00b4048d555065bee64dcdbfea9d1aed92943e7a437fba543675e749790098da3a0774abd3d7bae399bb68d283c02032b0f3f39683f66eabf5025b870a16670f5c1ee4efe3ffcbbc3bf0da235ef4767f4ad8557f348ef0b49ae214a1ae4ddc7d95b74620c8c4d838cbd842b40229c0a0636513f78d8aac02f5862cfa8026acc57157cde593aa4f5da5e1a7293d4752c5a5e3e8a4a2789b759e392ac4261bbd6eedec10d496d874b8be5df5adc9819ce72305a4164d59122d59739e789229941767ee2e3137973264a9d15dbd151ae6589f497cb7d5d89df571e7392bd452e54e3bbf8376665e0a6ea8495410dfc268910f240eb2296c547633d86b0d67f4816ce21f50f771d093c81850f3fd0e08d2ae9ea659f636c13931a386d9f26091f47becc5d3a9e8cd7d7608f34eea7353d92dfc8bd73938e616eadb59c9587ec2dd946dcc71558c1e1b3bde7b3c576dccdc787687dd3a6e82f03add4cab5e703a1b49d348f6dcb270d59ca35d4192a4a2f4d34559996566db8ad704f8ccf5fd993d6fd7cfbe95e23d4832f37d59174c29ed5f6e81b0195392a6cd8e6d98c5f07225df8e9845bb019876971f6d7bf9c65cd14aab830db62bdb1909007f6e6a3e3f83cba9b2b1dacf01158923f078cf0f00b1c7e2a6fb0d58ecac00ba84b06ff99bef03109d19db64f641620c8a9981f670db917c4bf0957283547cfa55ddd7fe7ec05f1c3b3d11c0708e961a6fcc2e3dccc3fdd72d7345f51c530d22f3f8132f117de2c515935175107d93865f3c785109efc56bd9a7a8f6bbf2e0b7b79cc9b1b616b937b6d85516e48b7acf6106419f5845a751c7dfb247d8c8d93e24af0e5a85706a7d0d40ad1bf7e7d9c118f9748c40ded2543f83059922dca232968b88ce0b1755a693b5c57bd572477be7a1dea9b119b80830832462ddb89aa3a641199b15b067930bdb10b7ca4959019e700f065630ac1df5b8b4953847462ec1e9ae3d7152506aa92f2109b90a7ab2fc016868f627b5dc5c7e3d37da672a3ea4c3285bafb72d4db33373acf9d46406cca5d8823c3bfc0aaf8e91a9aadce204e2c10124e48d9482b2c254d2f221941e619d45ca9c2c7dd23c86c22112a59ff851648bf891d12bd6a7822470a8d934b3550c7fd8a1fa622c0da69ca2d36d8c5bf85b1ab20bd286f8c0c50fcb40a3decbf231a111a8637a7a97311ac3f620d7ad373965079b7a6b426173abddda12aea3d5daf9071ec87379845335886407b9d1a5740b5905ff06a0d0ea48934828ab8e80a28ef06483965ccc78dba14c1dac75d63b0b636131d43d6be22a7ac1e6fcdccc36229ab90e1e22e48d61fc6f52d177804f7dd47131fa7d3452fddc77b873d97e2d107ee6bd610739123e92496f0ede1532dfaa3d1dc762369bc76b202ca19295c5fcc02b59d8a744c487bf4ab50802564c1fde84678a3fd04fb21206e3e72ccc64f617b675a394dc1ff13cd220f09add174c418aeffe992a623c5cbee9aac03bcf5fd57d0520bd025b3332feb1fd4fd60489c391accfd32a83fe60eeab20590f3d8d8a4b5425df91ef0b7aa9414ae253896f05cd076f0fdd7954056d1b06aa5d35eb552422b9f77666cf477939f298476fc627c5e053fbfeb94aed83794e85e43aefdef8b6eaf6e2f4615af9e7566b9326f71837c423c91a98edf9bbba43e48fe49440a3d3957738c54e1aa6f5293e7ff2969d046111af130280745eec959e69703f77e9ec6906f417e367b3d7c093e15a6413eaf1a461dd00b5e0866114099d77ad24f45ac13e2d4870cf764858e7530cafb5b9d23c1e0ed0992fc0817d93628ab47eabdcc1bb781c4a5443ae20e053bfc58342396c2bca64d331169e316b3df073cadc87b4c9742b26e7c9d9cf9493e48e148c89d9639551c2ca98c843b27bdd9b3ea6821d26572dbda3a6aace7bf6102f11e91a64bdcfd83bb75ff6fbcbcdf33f82d026ad8d4eb189126573fae906f4104a668d0754c231fe0418e3644f64c1741db1a4c9a45554a12a924bee0c513076268421ae2621938ffb41394c80737a890ffa44b236329caabdc3d162af0beb93c3900c5bddf154f53f29f6ca9d3c04d60de97d8fcd314eebd93731677f52236793e423d37046188e9753fe42f475e36b2b66b55757958082b4ade20e47be6ea790ddc1d40f71a01adcfdf6d09d9db36707c13a66475e00bb98335eae6f283a7626c03ed45d5e2e910c0f83b3697ac58a7ca1db4076b1f8e80d88da73d6a0f786fe7b34104c335aaf53b9d73b89d517a62337729e99a7945aa32b8fc6772e735a649a27e6bb6065012ef9514bcf29bcf15581dbbf52d144d254328ec6c1030f870478b20d9fa844cf5db5111924f294ecc4039ac8e594942f2e60ccd62a244e224d487741218fb169e49ffcc48d6639ce66409e1f9638ecda661c871ad7a7752f8ec9b3af5a33b13fd7f816e97f300a506360dfa894e97428f8dc9ad64e79c1537945fea2b821d2fbf738ac4c126031e5b40d846dc3ace19ff3a46db533ba71a09b986faebb61ee77a709b45dca1b3c4d650e801a94b992485b5eaad7479631127c5b5a77a6331f8b2df656fd3e30badec74a0c2e2fd505147d3aa24ad26440cd7d724b7fea346476176a1002be8f4eb2d0f3b65f17a8050f77af6bbe2efa2d18c9be5fdc304f4bdd5ddad9e5c8fd4c4c9ce65529aa846205bb1531ccaa83bf9fd02de6bafa089d73a795c0d7c084f4d8c344eb1f00aaef38c53e0616571e4b0a46f5606fca5a9448b179c889ceacc444b33d6bd01dcfbcb09441222dce92cbd889790671fb536aa22ccc73ec34fa3fd63a2b2b1fe770bbcf758d9e1213fdf4014edb30eab83de89ed535947f34112680a3c85f18ff5ef055dc45403eafe35d22c741e1d498ba0014a2216c6b8791828c910ae231b717d75a61e07a0da4abdb846bf407d56cec5a54501cfc78e960532d3c440fb5c082a6d16c47b0a9b1d2cc7c415361ef20456c798689d457314378ca7bfa7812539481594a26e4cb0cbce956362a9e751272026706f95c560ad41ca190534d734486ffaa6182e6995d09543c538c4c7e066c3366fd7824a87ac587a9fa7994a7306acc560ff602c565c5ba028a624db4d9f"""),
-                    TestUtils.hexDecode("""
-36DC7A310D995379B796EB8F9CA346EDF60DEC7F6C00AA311B3E09EF96A6795C4B077C1D371DD8D4A538AEB78B81927D08008E817A6FC6B3F9B14FE56EF9B2664E76112F214EEE848E67EF33B4A4E26A2378E9480CC7D25C369E6C25A2673B946B635B6EECB5F5F1499B484DCCFD5165D6F14CAA8E1EC9A9E4FDE417403720D7B4BB30060AB95C6F227767D671B75A1BB5AC5CC33EF0509C69652748251869B072B9042618071233B48A9BDEBA330F0C450A2FAAE79291B9E2480D1CED11FABE56210A80C39F25E5574356CFAA32E57782145920D6C0D27C3AC7C63DED6A770A5A45119FAA92209F2A066AB90FCB81A886FB87641C550368C1B412E43F4FECC2FD659B2BDA6B7309797575DA2893314DAB058DD92C7470F570EC0B1D9C9A149FE0934D40182CAD14D5B3D98C4B7454CDD2AE7E54EFCD554AA5B458888048BD5201C04E7D6004FC2A597DA781BF15AAC9748B6659EC16602F10AD44145607917C3599A1F53DC95839086A6A4FFD66F8EAC8AF8F11C4F2EBA3B58C46B93D0494C4CDA4E8B8FF7278049D2B4BD7BA16BC57678219EBCB5E211D51A168B5CDF66453412565B9BD606CE29A5A70E60F3D451D4214B0A258D6E9325EA5196C55125F0E115B14FF34FF6B172471C2B4917FC36B0DBDC82D0475AF56249AB9297790535C0F0265D2A853DB0B41B418072D0ECC17CF91FCA86F6E10762EBC520F0AADCC3C79EFC25E9692FC0A66389B15ECDD1377A9C3D744CCCC4BD160FC65A45D4144DDCA04E5408576DBA6D5C875BB4071729361B0514E8B96405E2F48D47138D2D2DCF4DC865F717428FA1262DB0D2B7B1A356E9E76301D38BA506456B4AD70ED09B0D5A1375AA6E132D7E06F8745E7A5B5E4F6455F4282A87D2B372C40A34C09699AA8C2B2E060107BCDE0F9D99B64F17DA5FA01B6DA87B1738882976B21AE12D1BA0AEB37644AAFE5AC20E7F3F631FFC2A24EEFB61DC37485DF27FD9045BD9BB5D3F00B9B2694CB94B01E7A4F0D909B8612DD28BD64E6C1C5A612CB30DF6004276FF58491B8129FCB0B539CDF891A97AB58DDF04AE40BAA5781C3AEC65FD7E84DFD0369A53CF36303270DC80E3E428854D82B08C7AD022BD99AC0851B16C7D8D462DA21126F70D661A59E4D0FE4441806DEC48E37AC4A271F15D916135408A2751CAD53564967196763B512D52240B2B0D3D924B83CF482B5316B7988D73A16B773705097F5ECE0027CCB2C2EFF598B8F61ED4D6BC015E56D4549432A6A95328FE3122EAED0149E2144E4CD2262C7FE7495E41E0AC9FAC9A11E21AC940D25E74AED8EF6FECD21747FF8166589B7038EF1DD504F51E01F1ED911FCCF44949638AA6E8526F0B9DBC5E536FE2AE7D4DA9DEE66402A45CF55D0137FAFDA9207AA7E22FE396455F2F43108961FA6B0339D89EB8ED7EF13B936E3D2DA18E5EAE45B05DCAF5D845DC62CC55553E37CB328AA2C649ABEED0D862E8083962B81B84A85EC12D3CE5B600123AA7CE4764139BA7AFE5CD02F70D06DD9AB0BBE868070A9AACB951D362E2606FD940A8F5BE632393E0A179C2A62151A094901F5625D952D39D7CAA87B77C4919A8633458AD9B6DAA16D1B1CAEAA8075741094FBC0C08D30D9956812C1D3A75926C546ABD78A2B9D44C1B6EF8D6EC2A2EA8B7C23D0EA57E1320ACFB576FB9C575DA98B714D6B01F03364E618A2C03BA84BDF0E5D2A0403B1379416D87B5E022BD958B0C9170E82F8E9A727D39C8F7549E34A14792776AF0D72A27FCF63EA985B3882A717091EF35F5835D4DA127554B6637AC313BA3BAE8170B9E70A6DDA2DBE813A49F045D8C3A65ECFB4D5F71FC75AADEDAA91A81A958273ECF0CDC4512F0D0ACCF9D9D001A30D0B6B2D50BD216D6086AC5C9DE7388A7B1319F2E9E6CE128B1F72F765804E060A8A92C93295A99C66D6D79BD7DD4F7F02317927D60B2E9FD59EC3F95A874337228339EC673BBBF53BF0FE1886A4B14F19CD7FA9B771894377F904EE8BE48D64EE5D40882C684C81DA3198604FA599DA8D4EDEE8EC3294620B6555B3BC9627D4514DBD1F7E3E9DF7B56BDB4CD395A8CCADC184B2B8DEB2AC7CBEC6C96001EDB67E6CF6F872469B110097C69EDE1121D22FB5B5AA4CA540474630651A4F9E8F7B0ABA5DF568D882626BD158F925F8DCE1D81668EF7CF770DC615ED0F5A807E25991EC97BBF2F9E997A532A1BD82A2A616250D2232F72067A17550EE516F28940D8EDA9CCC0E02EEFA496010E499E62C50B03F1D3C1571342DB8A5BDE1F432F7B6163BA3AEF35656434937A42C4E1F473331E38467DEAA483189902364463832ED8C5E04E0195D3435A6FCE75EA3BDBDDB0A0319262083141B1BBC0C278CFD40319647E90BFB51374B0AA5EBF3C564EE95B7AF618669C935756AFF3150A93EDA92F0ADC29253758A6C8A83EF55F97F1A4C0DB566668F30DE59D93D8185BDC1CFFAFAE472E0B0FC4B1E16F0B748220EB2EB85EF127838D576638E738E9F93A05D41CC1264AC6BA03B202D9E3B06946CCC68DC15261A029B0C5E91DD81EC1D79BC51F74BB5EF778F00AC091513443308410F60AC1850F2548C8101DB3B6B4D453541E36F0ED57C2C14F465196F8F1D0D3ACD49CE3252BAA0C10521311B8B8366C579A430526ED58BDE92FED3F0B359ADB31D67BFD212BEDA7236DEE4615ABF13C856CCC93DD02AA28D1CE1F12C2DD69FEA828BDB9F4CBC9242E1017D1063A7BF842B00C75243303EF9060C8EA501BC73B3EE470919443EC91D1F0D6D0F23A899AB86F2E8A0898D318BA520DD15D9B24F4F10A1B9FC52457714A151E075BBE419E4216857500B8354A8445B5FBB526A6E008229F33D8DBA14DD42F424DE3675E704DB308048B2D17904DE46B76622BA08C62F17EBA3E9F414A1B10921858832EEFBC282755B319E176ECCDC32A25CC5E76479AC112570AA86518BB1E6CA3F46E010E8132C0A1E8273403C5C4D7046A05398D461CB6843D70EEF8C94DEA5DF53CA1A4C7842AF5DBBC6451554FC7F9913E56957C51E0A602D882BC389C5E5C7899539DBE6832B0AAB5EF26B2C96CB03D1795179A62F748CA501CFA34D5ABBAE3271AC1F005112645F10863AABB062FD2C781E4573173935B5392CF9E88A1A31989E1B8E94F77CEFBEC591DF6529C6D2FAB72E678C534C4EFF40177C41D02AF0EFEB6371835CB55AE0AA99C0653876CCB56ECA127A0A1DFC0F9EEB49525C9A5786F618DBF57C41C5CAA971A9505BECEA8969D9DB28B0E707C659EDC42280035254E91C522300368F49F2C36211E455FD620DC956AFEE41A2493BDB2B0B8AB78E0B838DA6584FF753BF88CA6A523042A285F84ED90E0FD5E28F75A21B53F618145C16925486DBF6B1E7D76585D0D117EC562E22239E14A49ED714814F01DE2B250E9B3B6A1C99D1A71CEDEEB3ADADF611C4A4F97E1B26AF9780AFED5783129FD58B1232C7E2DB9050AD3D494EAC254DC46B0461A1B4B63840621D45ADE97EE5663C9BD8FB7261152545AE35536611B5C65DD6D66878DB71640EA429F801D6FFE291B06062EBAB9B416DDA7D261A46E58B154684E86176169CFDC4A60EA38300C3D44F9A4C9DCA0CE1BF37DF8F786F28B5B3CC7B0199D3322CFDFD2CF88C5B794C69F59543FB985890471DBC93A313992ABD33691CCF69B96A9396E5F55B54FF7BCA82A31199E5E81CE94B6B523EC5C3E2F2884D8BD744CF0C072E29E4B542DBB370FA5966F68CB20ABF40619E76C099BC7A9A373707707624E8999D4CF0A75D4AEAE113D7823D7D2ABF54FB4E68B8A6A57A198B128DC69584D2DBA473B6725FBB8EC9561D6614D606ADC4FD9CF449008C0D54BE4F62EC1441FF79EB59442AEFBDF1F0976844B4FA3969EEFEA10794FDBE35E89EA52F50AB26319BD1604D3FF5AC660431F1073575ABFAEEA00E1246DCD1D9399939D655C222E19E9DBA5FF42709FC11E7E365D7F7CE2274FBF1738DC5CF5631547549F2BD4DE896C8FE039720F5E0149BD81533022DAEE22B93A3AAB9AA9DA15180EA071D98E9FD176804A5B04D089E9C2D386271A8B13E7D668AA74BFFFFCDA3B4E528937C41D43A87DBB46C2B49B63BEEAAB978415536A87D845F6C2484F21D71D0F904438C46E7B0A3C6DE5ABC01C6F7CBCFF21D3E74AEE96C20C32884DE4EBA0F282C0FAD06BD9CD6B7B5031F149E4788F102D2AC2C99FD09B14A4AE3BD6859CAFE6F5A494EE8CEA29F49D871B79BB66AA6E6EC3718B97E83765E96D5603B209027BBBBCB09EE6FDE3AEB65AB1D73684820AB1FDEF88086B93B6338BEC7088E04F5F6E520E3D715C6C5E5B79E73B9E7AE1C5EDEEE4015860CDB9FA21FB434C3F28AD865042284A7FE9A5FF47E8C6158DD83EDF28BFB18DD5AFA07A48BD5AF25B9644400CC976A9B0FE9D9071E708113802A78CFDAED28378AA4FD6FBD9390D8A17D6500A0E1835652C7E0B332A382576AC4381CAD51A31E64E5E24FEDBC62EF9D0CABA0C8EBD8B94625207D0C8C1C6DF4EA2B20832EE44D1E2DEB799BC97B7245EC404F10764296E5BC4A919EC24B4F5F7D18692FA8DCDD5BBC170A81BE7590B7BF4058DC7BEA0C545BC85F0B3F0936386C37115A333285451CCAFB8397F1AE1B56D0A8F884BC968E729D622D21FA26B89BA2726C91E6886838DC9912797FF2BDF6800665C1D1DADFA4A240BB9BBE21B6DD750389AFA49C5C366ACA5E9C3B31B358FDEC42B0032D9E2C22112E43BED2023B364DAB334BBBE2C3B669EF700702B5D1837A6EC15CEC2B2036D56B8760129F593A669FF00237D26BAD9F9C2F4ED4018D998E555D2C3CA1D53EAD6A1E27906353983D4408904E5FD9D79AFEFEC26ACEA1F39218C36637977F6E2F3F6211AA06AB9D5F991C76F420B152BC95C4BC10047E107CC82E3B00B2325ABBFDB0FFB2966D5FBA0EC7E8DE1DBCC053C4186AF23A6BDF3F14A7186665AC2682FB94B0E10516D500B7F67BE4BD2523E194A1ADD8B5564FAD9105C86B6D16B08AABA604419D55F571F11F4989197144DD12867D1636D12800D54D36FA88C620008095560103366711B8E3AADD5624FBC7FF51318D17311F02A807770466AD559CFDA0AE1439442E4413944855D4D0074D529CA8DD621DA02FA98F46327A7BA600387EAE5E724D64A82E94ABB760C891EE39F27F0CAE8D1AACFE20629DEC5DD9BF4CA91E65BF413FD2A9566B7DCA9E500C2C328F533AF2A957E46D9FB11F0DFE99127656B1D4BE20C946BAFF58E5FE1A9ED282ABEBF6EB35A35AF324DF0A858CA8AF507CE43D228ED81D863F7096044A084DAA37ACB6AEE98E5A94D363963D4F852B955C2F076848092E6199E07990372E56BA1D590BB83D0C7F834C852CBC39B666B801CD32A0C36B034264F3BA6911A719001FD0F4B63D2D628FD0CAD34B4C9355534A8A38512E758B110F48E5A09B504D20D178508E09B1423A1E61164E7D138B4A9455B95EC8EA786F5FFE67806781F1E619505FD7DDE9A904E9003CA7E5EA1077C94C228D36667031502D78B3B52C3B5A09FC398D8B5497B6E3F0C5381BC99DD7B11DADA2DCFAE352DDEA2C749F8CF5AF39587083C2C19576EFFE871AB94D1C7CA2183FABDB74B27A80FC4F20CB86B46B0B7F86384540EFF1C888168F74634F2C0BF7FB54F7002EBF90B6C4B2B25DFF068DFC7D087A27749D6C36AB0A33423044AE027DCA8C42678987005FB9DE5C2774924AD2A5A8FD2E89C288975F89B5C0EF70A20EDAD1925060A12606A9B03626039635BFF332A0E6BDDC4F5DDDA209AF8DAA0FEF045FBEA9523D04458FBB0BD81F65396938436AFF5FA66E997AE58D64E7B5C1B589558B3DFF6D035E31008D2C76CA426B07F1644F609945909DBD16559B36461CE882A361D0415A9D93CB98A5370C56913A299B2DD1AA372CB75C7E590A9629CAA6C439CC5C7D94A21F36F998C6FDEC1C1721ECC500ECE1214EFFDE65E479D38C635EA223286DB326EF9B19B3CB862C96C162D3DE238C2948E7613A0FA4843E39EAC51EF293AD7EEAFF0F522934C982890F83E922B2BD52815136D0A758B33641C54E7D4E0F3B19AA85859B750E7A7FB80892C3DAC5048767132E2DAC5804709B8560A4B3828B1CD25DAF263A2466AF7FE328ABC84EBBA26902FFD92B0D765AACC0C0DCBEF962E1B35B1195676E8A67ED593B23B2B0305B611F9E16633E77E3F31794C58C5309BA07DB5CF9AA1CC108186318A3F16A7141854C2FC8B469BC0F54BCB22976A3CA05FC2C8E23F1B6A891E7527F204ECCA0A5400B68565906E795FE4DAF52ADA95A9883676F9110B14CEEA389CE9BFFBB5D040E60D3D03C4E6D6CBE9ED53EA44B1AB6ED7EDBACD0AE0613DBA5A5C673A534D48B539DC85F48175F13404016C5289348504141338FE958AC28331853AE80ADFEB49A6637936BF82FB26B95295B2E46F4F9534720A4E86FF18B31335877C9CBA96A9B450C1C8C9C9862E51CFEDBE3DE5C8B901D792A179AF9A782C330035A14CE6A710D398BD28416CD72373FE216744F6237B38B97351A77D5D0DEA1A26A0A9A24FE15503240933E1CB5AF458E6FCA8624669A0DF439CD7FC13F7A1F10A0CC7DB8C6AFAD9C99B5FC45A7C565B5DCB74FF0EF426FE7C260D3ACB1E9E83DD8E6E11A642145BFBB7566D582D0540D7931AA28B7F8F682E6E2D90B6E6812FF8B7F15FCD3DEE686DF06E8E6C456C99C6B4215C4E874BCEEE3B4F94BA825C6A45C2A2B4C6DC04F8FF5939C74E7DA37E02D8230340C6E2AB7CB82BD226DDC1A7C7BD0C0FB36F71F9C772233132B8871A0D76728C2A141741C2662438C5CC7B129A6C8FC587A0E475545D176818B51190F0F19E91E05C04477283A0A7D4D646EEDA3BE64459780BAC1862D83E6B99C5731DF91F0CAB454E70A0D94D934D0CD83C8B8301DE282F9A1FFE49E73EDCB520C016FDB4AD02C261DC1A1E73E38809E60F91A4E38C69EC70D2A621DF0D21588F24CCD59D331C69E16F0F6BCAA8F24031DD5718875BD9EDA5B420C116E4316137D4B77623C9D73D182900BD7A0F90A193CD16107E692D469AF09F74702492E22C796B6B4A960D47FDC571B4A264EE3528A0F5A9D66DDAA33FF20C3101D50299EDA3225834C9429976EC8E590C6D48A721A14972BE70955EC1A0348D2F84347C1E8E21EB0C1FE67223B42A6BCCAC43648F3BB5464121180F8E3E682B4B664D91584AF55FD1C7D2E6F79A93C680238D29CB7FF36D259CB703DE03B2EEF6DE0CB77AAA8F49C61EE482A8DAD30824E603411D5F09482DC84BE794BB6EB65A7BC1DA92C8BC8364AA88D4B8212561745BCF3CBA0D6AC8B8AF80373DE3F44EE39CA3CE4C5763F422CD4E8827B1E7BDFF79DB990A52530E4A1E21F6CCDF50A322A086AFDF24EB5FE4D99F1D1BB4D6DA965D168E9726FF7A4C82F327A748DDB1DA5A3D0E9C8E0B060872B009CC9F913D35D94FAA912B0D6FBF233DEA3AE3C2A4E35BBCACE21CA3E5F7A7B9A486AE9D7A7D2E0B79FDB11D87072F1B307402BDB22746B86A1A0E6B41433D5BAEB2048ECA53A1ECF895E9EB9BC5D6AB5D5DF72353566BB90578F12C6A16A163E95CD35DA27C79379756141DD05C315B466871E2B726B8821FB6FB439B49430CB3CA47CD211D03DF40AE4A0BE87B6000BC9C75AD23552E2129F47AB64BC9E5E1620C99405CEDF7BC059547D547E2868A6D470D813AA5095D0AA4BB18D91964988391EE6F05DD47CA1DA0423CA238C5E50D43CFB0527973506B9F1DA4A8055C47D1FA1E0DC783CE3CF75FFAADF574EC2849631E2551368291AFB5F2C40A4F1A184E37A19E511F482B7920F6D51B13065E6327F3C21DAA7F73986F2D1FBF375DFE2505C0FBD35F403D253BDFD0BA1B00CCC5A20B683D4F1E1F2374FD914C7D674901A0F01BDFDC007E8021013BB9A2F885F0699D16805F9F2511A0C7D3CDC06E36679983A2A0F12662C88BB7DC643FBFFB58CB51AAB3CED28553910D063ED8FA37FD756B79AE4151521450E552E4F2B62EB6F6BCC8086BBBD30331F3F2534AB3ADEEACCF2A6E66F205935A167FA1D5C747936050E276E8E4CCAFD9E0A056E4AC2AC08738BC3A598F07E933B0ED285BACE3D24AE6FF7574351758F983FD7EEB3944473EDB4EC9A9828A5FC656BBF04DC623C75F8B8038F3699BD5F255CCD3EEDE4FEFA12AFE8F64436DDB1FF2DF100B09BEC657DC5D2B18E5722D5AB30D075D9A52A576B6F9FC8C8BA3ACA6A92E6596F688FF5D2A7E3183B696AB277B0B17F004843E58760683F90BE0C61DD0D1BF9099A865CAFD1BD1D8AB1B7D4AF2F86D51C18D7868BEFF3F6C53EC68FC46EC9F23D1AE1FE85CD97D8CECFD57A562E7E574ED1D0A7005813EB980C2A46A98CEC602C0E022E87D4A6EDBFD7DE9FDA8C02EF85701BB1CEF6013F4869D32CBA56B0AD6EB007591D03C76A839F9D01985C546C39E49D59395B10346820324F3E298C5CD977FC2FF83BD422CA550DDF2A69607BB8125647B389246ADF0095F22692BF907EC86BF8D70D7E8F2C50E35DC6EF34FD1258E1FEBA0B254470D43C77CB0073AEB2D4CE5F6772D49A101052D8CE943E1C7760F2994071644D27D26BACA88EA07F29B2F2050BAC5E05F2226F1F584D17DB80E4056B7F9C60A5D9DA0CC577C6BC802FAB26E570BF017DCC7236A1173E273397E373640ED02B4F9863C40D2A2A7828C3875D8081AEBEF349143BAAECF9089EE736EFF0EF80078D2CA7942FB24A92071D229A1FDD0F6A87D362E5165D57F62D927757BC31964B5DA63B90EB3591552F2B9902E2269A163FF221863ADEADC9BC92CAC0087ABDA02004C0B9F34E5CA8599DC3C4261489F7527FD27AD2B6501E602FDE47DEEBF3F3EFC0166B1EED95116CF43C8AFC0EF89BDAA9ACFB6DAC613770DEA78960C99C9628C0D21FAF63A0FF7A3F2733EDC0FC07B83F107A811BB3C1DFC6CFBFEC105193272A4BF915B1DAEB232E16216E40FD3F9D9399B15CC4C073BAE8D08A4EC42D91609574EB009A9B52F06D3F428F6EA9B0511D8319A1B1299C154C94B103CB586370A58F18F04F5D21AD3B638660D6C04E99D356A7289E37EFAD643A5EBB488D54F4A0194FBC4283A8C4ABB8D9A1D70150AA50F991204C038AF54B5B74F722CD6515045D62276A9E936476F42B282C3B08D9328089AEA259510240B95BD5E81FB9D7E006DCE0DA832BD9A833799E05CAAFA6305D16DBA4461BE13D3CAA95773B98F09230F2DBE13936495C2DF5BE3A8F3EEB4FD211810F4B07D3E2BE1A11CC87079DF1B32D44B6FE7942DF2627AC19FD9F584E771D7ED98AA4C074A9DA5B7C156F83D90EBBDAE78D636D51EB0CB30C7C7CBC1A96273C0AE0ACAD8E15D1196BCB2EEBDA332896BABAEF76B4275F863732D646C24627AB014AB602A47594D6031795B17144E6E2C23F0341422886C1E2512222ECD530017DA02FC015EBD5BDFB319F3AE942D75A55C21BF347A44B300ACCED7A339007A2527EF4499E3BA5DE334BE58D59918DD0CB55B2F478837F71E9CEFCBBC90808E0BEF8CC7712A3B008B69476C61535FF0787B7833B70C69B1EF506EC4F445B72AA12FAC2589815874E9123BA13A17477D61E41163CB21ADB8151658C99F1422C71A8183B8D0B1D489EF436564C47ED8482A0DE9170CD1BC34D88CE76E1B47B84E770020125F718B4AFB1E4587668634FC7464114762A9D74A93E33A5C0CDFA824CACBEB097B5CAC3B554BC0D41C402812D8E43DB37C730A6219AB6F0BACD096BBF261C78E991DE0A2278DCA7D1BE0E5F2FED72CA38BAA86924A84275BFED3B91FC8DCC5024316EA0587C96E030544F631076DEF65F05F98C7641A958313686B8580CFC20221ED50DE4D2CF32461FAACD0174AC46A6949EF8ADEE6FFA3F537228AEDCFFDB2250D7BDBC848AFDFEA67AE53CE9ACA45F349557E81F70F9DB92926FD0CED8C104E6B7AD180C7B3BEB86171EE84A8DD2C243F6869E04C2DAFDF0C938C0768415C56330C9BB6EE756BB335BAAF96EEAA5CB52E554E39E2435B0731B0062376F4730108DD2F05824A798DA24C239724D19F12C6F2FBDB52652352021E0167F31E0F5941C4687DCD13A81A20A0AF05A55D2533280941865DB4D5715AEC293A64AA2E5151C8F44A14B72C0879499027E67E4E2B487612216F6122361E8D34E92C2163B0C88583E3887DA93A3AA0E77FFAE3FE8FD5455BC86AE6D6D5AC7CB7BDF156A960C98B0BE50E1370A43E7D183636DEB2C64B264FC5922D4BD46A8206F911E7A742E72E4EBDBA39B6151AEDF5A6CB4157B375D9A59899808F1838C61EB4388B923423D3879E8228AFE0CEE9561135849A89363F84B41BCB166EBCD0E65A2A74FE710F2B3B55CA9DE2FA9DC163BFFF4BE91F10493936FCA15F5F39422C75233DB22299456D1EA3BAC26F6671557B2A5FB0E9460997DCA797C67C49DF109CFD597BE34C8E0FA0353F28B815D0CEB31DA93E49EF29CEAF20FEB0A8F5924DCC62E830353463245899900304A8C8DB5830BC0E97AB83853D8EB05660D6A9303833D170E138FF6F1C30D9DD64574D5F875F974225DA81ADE3D97924A38F552276F46A5208403AEF82D1E92959675EA6B353E5C6091034A295D9C12C288241055A2334C30DF0A37D2590626A7D1787A4F591A6E494BF55ABC76842BBBD508FE54C5630D11C54386A487A756ECBFC0AE8957E7CA8678D5B9B044117365AEBE79AFF2E6678001D23624"""),
-                    TestUtils.hexDecode("""
-e8b08c99776fe554292851f9d80f785b8109d6edcf9d30b4b3c8c11fe8b2e024e333272f4d72e697aa20953d03f013c0c3800e840aba56daf36846b0e958f7e1a465deee3fae6e45931424ac278b6d1916dc71760b7518643185cdc7b06b1dc0a54c83597e6a2aee0894c2066b5fb1e2439b2782ceec63aee1742d10f4c36793b845d5b86db9d22a200e12611bbd102cabaa00ed5cd47e6cdbfc06d7bee55e65e4ebcae019ab28f0f05ff2efcc3c44a5c89a5e80fc8758d774ddb3554975346aad922319273ea930b3718562c3a96602645c58e375e8b78f38cf636b42e674ab4c5e1a8da59c64100984605035e1f735d6ebd2948b556b056a07ab86f8d07f8cbc72cb7251543ceb39a9deea50b8189face6b5ff23bf62ea3686fc0f97598f36ca445942cf3c2acc5258f9a870eba919b99c75bf598031edb693552c086377ab84aed818e795b70a62c14f84d5d01fe9257cc9df2f4cb2f40173be7d11592e9289eec23ad30a8e5dfba2f6a779464e79cb5b07e6e5a19dbb9a829eca1ff64c0a672844ed2e636903bac6edfce1315cab8751e9f12635160df14cbf5ddd341824e8033507de1f6cb7dd87c5496342a27a8746e94da455ddbca610c7990ed01ae5dedc90cee503d525ec5033258465e282cacb2c0e0ea7457e62d06c194a958322e64a5433e4936292fa700dad6fb7ea4d5689d4e3efff132d61493859aa5436c9087fa9ac5b67419a836460fc9bbb4d53d0c9b6fefab2d513b76f0600d097b0c3eb7d7a82e01ba3abed5354fcbce02cc7e85fbeedefde5652187fceaef8e6c05b4f37c33a752fea5af6160a7da084e41dc7134534fda67c4e1c6b8dabf7bf05d25a0ab7e05c41c4e0070e8add04f20d8c72bf941ca284eae27cd9568e9938adf4f55ab2c40d03bb49c58c6fd8d74245cc3b4922891b865dad534e256ebbcecdf5227b39ac335005bdefe1be10c2b7c969f4dea6f581c278f8479cd7a40a6d369bc5e1fe5e074230d01795dc664e488e4e360b169976b99a0b9d257badf3f397ac914b15b8ce4b3c38e6c758a169ca015fb6fd339c4255c51013e7430c991a006591fd69a069cc2f966c24ad78b8c0a4f4601ea08ccb683e8d427d1a0db844308e86afb0e3f6965af9ccca755b5e2a8358fd2417b46bce7a69b2edd6e9b3fb617dc5bbbf2803a557e33c907b4ee7fa7a9cfd9f148730d48e471097526e4330515f3dfd5e4f0e6c6dd2c2db73c2c0913c82559032c15b3e580e3b11f5c319db8b04ee4a3dcc87a4251e8ca8f77a8e61d67a5586f2494c3be2d70d95076e6470cd3c3ed1b780ad9217153fda872911bb01edf13c13143e4082cfc9fba96f14e7844f3ab040567faef1f03caf66eb10d92eada39afc6d70d16325008f628489ebd9e80913227e270a8c272709658aa843a486039a21951467dc1e5df0feabc68c28ae9e9cdf95f7db12cff0167657328985f19595b5aa33f44701a8f40242a0f33ff9829078abc53be36c002405557c61b9c5585f7d61d0fae020b2ad18358a278aee3250b12bc7f0887d8cf42137f26ca12a866c35876bdc737a22b8a722e71ef500ce958723728aea23748924eab3552a7cd4142dc7e138c84df1251a2ed8f94c939bc7aa0ea4c0ebb4cbe817aeb65ee5f0f9cd407899459e719f0558f8f40d73b1226a004b910e26648852bcb3b08aa5340f6ac6426aac89acc4945b180dc4f401d97a6fc68e3fa4b8ed65ac74727e3ee5da732b02caec13b88cb167b15e4c7da21dbd937549685e8068c3eccad584698291b9c3410aa8314762fc838f9336b6b09c191409d1aa2dd5e2a075b070413c805f116d42f90af6c7ebf8c322bbaa14a5692ac0749ec7df91e5eddc7ded2dd873907e07b01f14fea1e0efe6d7a1a5ecb95f822be8f3a2f65224c3d801284de6f29a25725c3784d7bccd1253706e107fb9dedbec4620c87c615f4458c4c7078a1e69a0f5178b318fcec51e73995df8dda6ece7b7267d28daa1fbe7f36680fc001974577e4a128282b67819227e5d100baa5101c5a1422f096083b3b522a6b71f8943b536d7798e86e18129d1484cee60ac63cd849f5c9e8a58fa42c0298e3d595c3c4f145aef17f79fba8d7424e5ad7d6831321e51ac88eb1c54c6c1e2f3263c899550b65cfc52da78b7ebfabd474851b3a2b5457f4e646c15ff50efee6a8ad5c99e91853656255fd429e8982c56d65d005cf3ee1a725e224c768e8c92003a72f3060cb088f7a8cffac0d526c028f3dbbe84600d5a9568f03b2304ef37d5ed28941169f8e204a1240e6d910dcdb901932982a6d45a7a10b1630587d31551b6e4424fd929b5a7fee3c4a20929102f5791062acb3c53a6edc93ab5ccc703b8cdaa39857ab06b7f818a59d8324dd1ab342aa1c3b0a32dffa0512b92c1ab9a4f66e57e9bd27734ce2b2788058637cbf94b03b7a1b640f03735f36bb36052bb461c22fff6c0580b6eb4bc572fabc9a141c1964d664168116d9836f7c7581cc9537bba32d1e3e5519e29858f889e282c805084fe3a64db0234bb3e1dbf57956ce4165795648f4865c1232e24a6769e24c0b271aef1146425a9032884393d275fb68e3b3c91599ee82a4cc34338715a8590f436e4185246df9bc4c066ed975f502b967a5761c1b8f5aeee302f96aae3dfdb6f4519aba3e04cfe5c9b2d342048a4c2721484e9b311c9a18ee5f726a512c93a8d37cdaf6ee96928fba315a4680dccdfced6a13f46e06aa162a7ae445bae5b1134f1656a2d700dcb2b5138c780b428d346feb98be8ed911de7aa5ebd72e2a6a8592a81ad4fd6a6da64edd2f5490cead76fc652998181018457f1cc0ec4f4588cb8f418f1b6d801635847914c3f317369027b4c4608e65457f949e08110b23dbb6941632afc1d1292c55c169965f0153ec72d93498f5a68140ce2c8282a59b1011ac705fd5f0a8ed1ecdadd58d4a1fbd4b09e94802a0c67f2f5faf905bc4a35471f886a8f2366c25b710eb43aee8fea692d12b4f94513337b0ea9fce3c255188ab7b432ae37383470eb94abc2554c6f165bb356415a1f8d8790e1bf76f4411c8f32fc550e38a0ea7b8d37537855724c08eff4730484e55accb2f975637b74f29937c19fdedb5aab7d5a3bc9ee1df2c83ae8d0e59782fe18b3a17c82cf649a4299b74f022012e189f19d88b06387314b65add0720aefd0018a09bb3d13cd63f98fb73b8a57564137e89811d59f1c74a047e264ce816b01e942038574a9d1f4fa5408ad1661c31bef7e97742aec79b74df757065e8e1b059b5134e53cc8560bd87e9a68003b124b15afb6534cc6181b6b71eda535ae7a3c107abfd2d8e5886cf8a7d67a4b723ba794c0c5a9d1a63f67a6c42de3e3632b8a9e7bc7eb9a5e404930265a7d04c1e16ac17a7b5e1535e1bc80ddd1800a7ba1b0d73ba053688137e1db64eebfa9b5dd8573a51db93aeb0c6c644c97ba9dc87efb2a5d79b3e3ff396a45ac1f0aab064dd05c1e6ae48b2686d662b8bff1e87db3745c7b3126a091e688091d84d3caa1adb471df496e79e42b276088a600a6f8d2aaf3d31b22f7e7efd2b894fdef314f2258d32371fa022e272760c704997b2a605b0e1a8d0602ad3a134357b0f2785d79c557cb04121fb054354608655afa7a763c8276170c13f9e76dfa711e26ceaa999fc14c686e2ebd61d18e74ed08fa1b872e09246856d9e0477e5e21a72c7869b57785248aef0d516f670978ba4dbac563b77f365cd46cecbce0b7fc7c9fe7373d6ad47d094b3669849dc21084124999ed55f13106d4be1e52433d86ffafbad0e4f221c305aca71063037b7a26ca73ca37129aec69e665cd2e70a94dc5aa8d22e1a425853645a3eb05f8998c6d766806087f14f08fc95ae3b2b9190721bf536ac20cf49222f5a0dd03307995adadefa43a205fe9dc839b5f27447611a93012d3abccf3f5d7a766756111dbdadf6c5920782545c853ae1a550a08b14a87bf296ef0aba7669fabc13a8d0d85d67e36abb24a77bf87bdebbcec1e28c1f82fcb95e82ee936f0c1a60a38ca3ab846eb39cf27acd9a219abc2c6244878ee25efc38a6552773b7444e466c24a15458df3cac856201a12c3bba6483d886482d58112effb0cd72c7aba4df0c11474a41e1fac0419495166d5b88b7e5e169c96c9ea6ac96dc5c2f749c858ad524e7f3d32177aacbc836abbea91ff9dac9d313a8004a186ab52083662a03d42518199bb2b81f9b03501ed8d1e8a8069e6a4fcad2657d4e69c0cd8e4ee56389d026717c72c99f13b2d21780c122bdff75c0469f32a1c519afc5900855539b1c75a3019342b7d5fd8ad7fb02af96fc94ec29583a48b964c65586a6f17af9f268a6cb9bbff237ddf393dc40d03b69ce5925a5fa8af87a6d0f497ae82d6468726714f7b53bfcbb647253c9db17a7bd5e760531ed90d7cf044ec0bdcf9724b640a201f5a08e223ff20e818e16e88fd92300b07e89ca333bbc05e8fd01d847bf9d7ce85da9478833f5566662888c8238b70cc3481ce0b8fb5c5e144d05ca8b8952c4374b261e48352bda2bd2e8de39b6318a0cbcfe3c36e6dd924e52d82928e964930ea6526aae08ca596fb732dfa02f2f6da72a05a227648e1fbf49554117aed210263cc6f5ebdfe2ba852d1c4c4af8f71a8a6501927109026e544432504a5bd066d7c03d443a191629a2c67b00f634023bb07c676294159db4df69555ffbd6c4b5a6d4726a54f9a0ab243cac6ff603e2ffa3c4acc6046a849b099654d0d894ae6536deecfd326aee5164eb1a59838da8cb33724697c17d6735687c860a13c8b8fbe497b99c98b58c8a0f0c67e1239b5a0880c1d4b0e2cbfe268141d035c02047d0a5c64c4fc79f245e50c43f3f64130be4b8def3085330461a12b1cd047afce58b05d2d75ac4980376a2739821149c95e17dee53f6da1afab57c02c7cfa3652784caf90f6f66a93966c636a29df19b2ed5699ffa1aa0cf5de784f5b57c15ccd22f5963924fc55f997b8a508f10d8520c5498f3408daa04028ec66b3885c5495e10666f8125f4761cc09071717244928ebcb985cc8ec8ac777fd411b8a2aa51320c60f6c71bdcbae9f6e37eea62c1f595ed27bb83b25842d2e26988d48217862afade93f152155166ca55c13c143d6c176208157fc8a836ca68ad5094de00d82665b2675baa86a6012fc36593e1c9aeec4da750c5c747643072dea8fd786738f5e788e36767bbd29a87ad1731adc579396eae378f8c4fdfaccdba49304649d108b19dac8caed2d08f116cd33af7bd22091330ff4e99936dec531ca9d735430cb4a0cbc4652a9c1c43168b1ee012a46b1cb92d3035714eb4f7f4d6b63b60589b946e5a47e961f3c575d13e1486d9a388dff8c8e9aa4663e5ed91cdd8d3d59f02deb394ba37ee4a05df162208286c19bf0204f4d609b229087351981b6e62fc580ab06ff34474db029a16466d9630eb263de0b76e8b53239a044f15f90c4836aee8b2203d6db413b583d62c8bbe7d657b2c1185a5720457a79f621bad76674112e28c34ac65abbf65e73f54f918d0b912c429b29c5c32a370ec1810cbb07375a85df5167b32a321844cc54c34ab54b87fa6378924e54a874ab871c928d49e704dcaa40b88d7a7c5774163522a6620abf5d73643338be36e5b2e30659d0e39695fa97a6ff8cb8064e370eee36c5a3b57de7d218fa325646cfa4fa2e9a0622bcf139eca8acc28de6f0a5d2e37dd2b0d6f6b39989eda0de372b20e2cbbde73857ae39b7f0cbb2f4337e04a52f1549bc4daf89e484b06177bc9cd6b199906b62789431e4a29251cbb4539c62ea6fdca9c84721c02b8af585f64e8420a7ec91e6387a897196685ebb760d1b4276cfa36b51f4d3e840e2c5e074c69ec7f6557afad4ef6774dde534f88cd7683a6855bbbf8d43d520cbe0312c9e189f710c75ad64926a97ca0e3b2b575e3aecf7b9145c160c415f8c90160aa5208744addd8b52580645fed9c66a2f6d8b0afe577ff63e3fda7e9a25519f0d2fbc3bffa9f45c40f70452a78b903d923e4f0fa9475659910f75455d144295e4091f8a760e1e68460227d37fa6220b4f0322d61b8fd7a40275c4d9446255862682f775176c67d294ff45205726eb733e5d21302f4df66fec98102611e3bf8084035b42448e86ff9225935ebf7db9a847e8a0f72ed177fa3812f4f5c0dfb7e452acf0e1a23d781607de22bdf31177d5eb5e2840bad442feb2f8baeff6f17bd63ed9495b0351949ccbb6337d907831e22ed31cedaff7cdd13bc3de40421ac6afb536ff89bf041a3026ce04316b6a082c06e0437440313ffd36ff78d6e31a4f5652c52e53f06fbeac2a7f13c64c061dca9ce9dc2e7598ed90a12307e5125397629887f0a3d3bf8d24b675db85ecfbcdf8b3fceb50e96b0a863d30a7791db30ce4cafe8d85999ea1282ba61f667497a8c52a2fa3bfceea070b2e8a9cd8e51a244b73a0a60a1e4076829c1a4668717495adbecde4f4fc0323325d71aae30000000000000000000000000000000000000000000003090f161c222e35""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-f5e15972ad2246b58dc056182273172d39b05662b5048af41a6516a04e042cf25c9c233ecaf6416295430b3e77e8bc81d1939c0c6a6304ff1b750bd145a18a2a85e53116f2d3ae39e39afb5e342b59e66196b1155c886ed149278db268c22e7202ebd8ff6da2768ac4d5fb15b1f3307ec53dad5e6ad6db55255e7460677ed6cd8ac2446414600185000ab66d1292600b8120ca1611c2486c628828099929c2a6640411651c164684364adb887021348c094182da0664c0386263020e40926404b8410336228a046292421111956800032dd0321014832001122cc2042113100d6048650b108ca24428020865e3022924c28514c34580a864c4308290c86181982912014c92308d04901001852c44402a59b4414b022c49822100329199b00dc204915a082da42245e11632c84044ccb82488469022b66098288ea2a088da4432c3124ea01469233546134708c8a66dc02825120084cc868901a5311bb8500b0046820088218804a236481aa9411a0351d1340900c62861384109b081d1208a9a282160448818996859c60d011829429485e4a6900b9129210368081545240522d44444a002121294048a3840932852019590410870cc068ce4380923828512090d44b20082b8651ac42c22922dc2c03119a7259048208a0286e4c24c1c170224c58c02174a5a380811268a19298a08232a01010502b361d39270e2b409e40830a11629099821c222059c3661a3b050d3844dc92431c03029d4400d2443468ba4645c36054cc828a1b4201c4706102648a4466d00a86848b26464884914454d23b1644a3440a446525432521000911b4580a0b4219210311b802491120d1a16110c432e92122a1b037012111120096d1a252189c40d8a2849e1168d804602241170cc842462b08d890068d29004022884013421dc8401a2328d58260e49140244b081140946e2383089446c1a2946e398459b224c9238000915401b956523098ea2081208937021264903210621c79198026c1a4869c3424219908dc83452923650221571c4125101866cc3829058a6480c442a1305066338919c422dcab431a030298108110b425120c42010b28c21388e9990491412105986495046441cb405c1b8501897840ab9240b3260e2c6059c30628c48211ac78800182c89408881484de0260d1044108b920820166c12381019b78460286ddc328e4c04099a8450c396659814814288214a4405948484a0c8045a08040c3529c8488e8aa66d183890d9b46101394941a64549986c9ab20484c4110431914b002508330683487090c251224006d0c84121090544348622b345e1960589009010344eda02515948468c0462882491a28830010606c0b4008c24292436508c14662046085822244c90610c066dd8b20054906d8300919118259a04001a014809c42d0c088658b28ce0984ca3060d8b162563002e20340613b93183c624442884c1140512354e58028e8a8849dc4266a3b0210b3690048988da383153b6105b124e99182c8924918bc80ca1c48d194751c9c42da3a4911439241b19819a28868b320e48c26483c42143c6690907215c30660c086cd2b88c19c9004286054cb28d9a00295ba2401b3409c028129b285003a96c20146aa2044a60486922170ee1b6308b186cca085114b524643800c210055ab48112378c12420423c98dd0a82c90309124164e2496840b1924009300181160e4466219a620d3c04de1c04510301193202e60086c2189851131309ac84c9bb230244001024384ca245003c44158a06021b761882091999805d4926954a201c0a4288ab42d81a80853086ac8002614c12cd30825849024d3c40023002e08276d1c270d8ab86861a62118a648e230248c862024a584598804d2c849a4048922394c13000c11a310c9b08014016284448911b841a3c24d62a0890b861123146524006199200e520830940890c0c001c436600ba791d98601cb268292c221c8c668e01864491088520865e0062c18882ca2006a64c28919196c90220514178dc8000a11a6851aa8841213440b176959c02590804899260448b670c0a06943089212170554c02522000d1b360d01068e23376c1905648bb481c42202c824080a002e11064c2335725b1222132969cc2030100725c010821c17500027880ab70443a68123a82d0b8149584621d2c8215086280a896c233282440648f7997f3a4a02dd96ea05f99886e7035f7b872fd07fa322f21a3dc47f787d9914bee7c696dc22a45366e839af8eb0bb2bf61719b225d0d53ec79c27dbdb681f325d0a4c58d4e86f7dc0767a4d3f20e19025679b924d3953b1213ce7b1a08fcbf127dfe860cbecb06b90ff62d704fcfbbc0b7478a4e63e14ead7ee05634c7278f7d659a8706b0f16c40bf909b18f01bec20e95437aeb585899c0bb0af3328015af0aef1f14029b01f3a7d9cf188022296ac5501a61a6145b1ae36eac142b5c75fa314fec0a1d482690fe98c0895a042e2d893f42fd446cab8fea7b6f2eeae767abcf521aeae0620a7d5c6d8693371ff320af03cde468166b0b592d9cc188efa31b42b0e7eaff7356436ab7382e0a12a57aecbe989fc249f6c0dbdc11441e63b1dcd707eee1948df10d6a2521f8abd525ea05987867e9ecf3a1cce6b978ef0fd869c8d0c0539b58f3355f0dcd6ec6016d276e38455c67638572c6738d90e2877a6bac552cbbc596e474d403d8ab8ab69f40b7c694179a5e7db3664d4107de70c5ed848012af5edaf718380da6bb3eeac6250bb50d1b994bb96524e580cc3413c9e7bad19065c0575906ba4ee7b582be8048c5126ff2c45f1be6eabaeeee090c1fb716e16477cd029bba2ab1085fa4afab3481ad0aefbb216086c6c4d82986ab1f5d4695fd2f9f2488f741346a7fef2574568d0632a7d1b8ba706c849e524c0cbb397e18f2085c5ae5cbe2a829b3755127e35c2db720194824dc40e75144d764d7a2ff253a6f1b109a455e319c5ab28578121d641f41af2beb6bb71514a84efabcd56c19319e1bd3468531e8a4ce78c4f1b89164ba170123ff8efc61f01a92dd9a19027e11e2141ba7b4211e47ea5206608fa8fd9abefe0995a6857dd0bd3ed0cbe96cafacd110cf3233b67e8daba02a1f28c14529676f9902a87bcd0b05fd183ef4ed1cce31527cf25a30ec2098af07d8658e789c2b94aa9169708ed686401b73d828bfbdc8e943c259585da6ee392853c1f7fdb65ce2b5871f67b38aa35cbf851d4c721ba59b3a49e251e533f92c40128ffcc3403feb3d66b342e3fb58ad621e86ae4ea694e33c24e132ca123be19bf33f933edee5ed9a5ed6eaec769815eeffddf1892f9e76ea0893efbc9377366eabf1e32a628e26a0362451e4db704d1445f4aef183c43ae37d9e96af9702e5287275d2fc2c563f6a03528be62cda89cacf9458eb4b336ee78c814e52222b503dee582fee523473b97fc08a41b4f4068db2ed9ff94527c38b3e4369b702983539aabea9c88aff8f7c4a424f45634ab5258e3959681bdf1a038777b7525e53748abe024d824db279ebf2534adca871fe186b3bca61769c065486cd8c289c9b88cf6500fe7d691e1aaed1579ddea5f149ee1b4f5be1ec98b2978a82b8dde4a79b799fe6c98c7f0a7ab2aaa4d103e484014d6b989f560dd2ea6d9e6df9b1b267ffa1ed895ae6bdd5b13f9f0a4ec1a5d65180119abb4a841ac1d73841d481c37ce1b40b9ddb5bf36f0fceb9f33e98ba0cd4b57fe9c36cbb07a104c2e0b3481831ac2da6824edb76277e9c06e48347184208e4137498864dfaef57b45232afe4170fe85e7dab426b8f918d34ae28043f81a914062cc5e35d761c701ad6891ed3d008a800f1c63600690f14ecca044373648a0c1e7f15bb7655c88abeca60883f275a23e50de845f594ae839dec8cf9676f3abf2e2223aadcb68815d4519343f73e551ee7fffb015196728977bc8c6addd870e96bf439b37ed849f42ae9ca1d850b601c74382604d484c742874dc35ab740df13473b5bd55e61adaa012c5dac04696df0fa2ca3df9943ecfb6a76bd8ed39f185f45503b3dbaf7d4582fcb7a3825f3125e1c804488474cff917eaf61143750da50136311663a4fd4e8a9addc415ffd694c4cd7d4998c057aba4adf6c07ec5b1f6d622ff3f8f8d77deb65bd6c088a47caca00d551c38a55b6b2ecc773be718719a6355560d00686a77c68cda8efeea442026d99badbaafb6a861f222d6f9d7edd75267f5cfc87731801ca22a863afd7f4b394d90af2008fd2e799659a0843584bc6329b6a84f7ebdb3c374cde50f6bb5f9884b39830c4409c967654f5a64a6b8d7e0e316c7936fb84a3651eb5bce7ba80f3ae6093273dbd3ba337484720712caf9b3cbf191c8a49968c1e5e2499c4ade3cb350fa6049c491d52c2ed697d2d70d62aeecce9ad561547090b7e4ea7ffa0f21bed61468686f75303721109b440cc8cac0814c293bd9b219cd86843e6d3ed498203e7ca8f4ff82c9cccd229a2210c7f32e7b0a6b0646b8e4e9617707183f0f5edb0124bd0201588baf7e8b23fc7bf2d7aae16f54b37c963b3660a2c3257bc889ff9d00de92e1c2da98e25ca31549cf854d58af17fe346f0ea6ac4bbefb393f5908f1b64254e6176cb28fb9dfa70b7a0462cdb263a2a46858d1f37dba969e0226ab9af0b22a141e52bf8c0ce9f7234194a462deb924ff4771a5beeeb6d5686121a5fc01ac1ab9fcf701d7401373fdc2af3d8810a6783d3fc175f23f85a113bef7027057a967fc94a5c93b60f15b1d87d1be3d74d1d377b1604536720af47f6a7c2ea931a9fc6a0d9de8c2cd4c9b71c7e653a67b7aed5a8c2d0ce3c4e3c51ffe12357ca08438934952de8de66ea836a90b644e6a4241da70a15c08ca9f74bf3fc6d7f5eaa7cc2e8abcce78c8a19aa597980603ddff36eebed77f658bbf3d5e7498b16668bc8956066f3f5c64df78c6b9301834c91943be35c6e4f860e7662d1f6d9b36fa30a4b23322e6f7b328bd86e92da8937837fde1766adbdf647d7a2718f5447536280bac48bb1b53d884327b7077e17c4de67e6ecff8e89f18afb82f5e2b2e2dc7d78f8273affa55efc33e73935ca0016933259fd09e07d183ff884298df3aabf7e7907b08e457403cb99e99ba95eb854234f5593003cfe661daeba368aa456f9408b46f7ff92fbef9886bb93fecd778d09c4f43ffa5fe88f32dc4a404fec7a6d4b368403c38efff8d1758049a778af5023e626a01046f36e5c569ecd3859781caf50558cc8649301d0fdf323042834d7ccaf212ee8a4955fa9e4cf65ebb2029a0835e5db69993956956545de4cd1715980ff554a160e1f3e48c323e35b64274ef64bc7106c15e2f9d41ab4a92692a9f6edec8e66a73c2d4a6ff1a881e63163764fd3cbcb3f5601a84d4c26bec4fb978a3e2473d50bd561c08d16af2542a49851c8f63e0653bbd6b489799736fa39d8707f477218d918fb283218619bdd569e52b63fccc6e3c859a7febc7196326a69143af3da337cf0653a5d6370a5323f6c31f8791b1d5e55032261c5df8e07b8df185a31a9b398abc345b87ed8198555a0841e0927035f5f3cf5da4fb2c0ca18b1bbbe3a9c3b3df9d1d448e242513f5d0dd481d3d586ef61d5b857bbf2d1f771a2aed0ef2bced9a6d0bd576c1c8bd2e3ea9ca6a6b6f9e8296117012d48af013b1a607dd70fb2edbf409a0a9d5fc0a438464c773e045b8d124a0c2ab99b26f81afb2dd5d11ef44aac1eb1242de61af723667d1d25a349b4d842544fcb4e3bcb45e0e9563039bed3c0f25f6e3584c80a5c19e4f5c83929549ffc9f9c2be16c4bd36394ff69634a1550eb60c53d7b17e08f21121e10e2d792cafe97cfacc8ac6728d3d0950d3c33c5ddeec089e979598c6839cf981e48b5dd11003e91564f8bf52d2d20dd61001d3fbd329c22a89b6cf70816c268afcfc3576a29285c9123fbce1f0f6bed472a23d9b09f7eaa7be73451392f9130c7264ce87b942e679af7c91954cfe529869555a4cba8485f9ff3a9419649477ba45c1e7e852c3dcdb637cbec5261c94df5ccc30e904bda8413c4570bb978abc02aa0e909bf74bba0549ca34377ccbe36f1e132c074244926f0008671c9ca6a04aaa8f8466eab60543f5a0a39826aa231c97ee6704d685caf2873d918ee42ca7454dfc30746b8078829e8c89c831dde2ef7a6b2e5d6038ceaf4e24bab7b4a54792b58cd14548979e0fbc10114fbe23804eb997b765bff34b162a354a4d9702f4acdbf46d11b679e0f423b5c6e942bf5567cacd39053ab5512bd6e745c9073911f5735be1e5289cb7239ae1c784074e76d9364ae0f6482c1a31692156cdf4cbf4c140745cbbcb3b213ab1d8eee1370e9174e62bba205659507b195bda05b229d00be377c6697fc35cbbb14f9ddc32ecc66357321c915041dffe20be5a6d71d5236fff001ecc4b69fe08bb4533498e00695f6dffd34564e5c69a63ce0a0492b40a7aa45d0a6c90d6fb86f8ac006a1df480eae6adf7c78ae447ba7a771114345972d2cda9a0af25ffc15ddcc243fc2e90fdcaad91a216bcdd35a5f7d735ac4048a72dd510c6824df4098d9ffd7d71229ade24c5dfdaeb09070c99bb6b84cc91d1bb754e963e5a0d88a04282620102a5266a5f0ffb43a0e41e4370d66474ca6bb95144336a4c54bfdac1e59a678706f6bdddaee602c9bd3c0081c13dbe1644a755928f206a9e28006b3db33b6f265815e666ff3403d118d41c099c5be988332141bb73d2ed7ec71b3c2c4b2541b9ec06c3cd563c5e7ee8e6ed289be91969ad646b1260b4490aead12ba8f206e438f9260914f9c79549157455cda2dfbba3b4c1aa48de004bf002f366afa46573acce2c54d863c865415e887b18f31fabe9cb109c222f97097891f4198776cc8d710526956"""),
-                    TestUtils.hexDecode("""
-CA0104B9DF99E87474389167359968A307F63AA32F0C804A96B18FFBE00C748B1D6894CBE2B7BA06EF17B6947ECE31DDC9F614348F01995FCCE77099A0D88B2BCD1035667631991C2BCAA4C86B4D31074A2FD46C38429B52CF0BFD7CD3E5D194DF22E2B0D57C0C9D624C772B54686AC963447E716C6B4DAFC00AE383CFFC69A2F6F931D616954BC9A140D785F15C5DB28ECC793D88C78D11F8F8452046ADDD3AD26988B21BF895DC810739FA7C45A8062B2931AD363B0C7EAB4CCFAC71CDD0DA3B54CA9A6388DCBF79AF799446395DC7A5B7ED1788188E9D03EB3BF7B80F8CFB9B7F33DA0D4DBE1840B9C6C5D80F6AE64487BBFEC86C596E2ED8E721A11D783F7552A4B01FA24F60B5B683E287BD75EA0DDC15314E014D402F527C5DAD74CFC49B4D824EFA77C359B90AFF15AC89C1AA35959570E2148DF7A09E27E2FC096AB5CB306B4868AB80A24DF745DCF9EDDE57357866182A9AF50796EAF97A1A1051FFE6F9038BE1F6239CADBF0BD81B23E2991941F34D0851AFCEBC4D3F8B472D6259CF61FFDB87F79928C66E69D969B254D57541A87C692160E5D58A837A1FE90A1799758A70F958DBC1BE5D6E6836845940C75E745245FBCE59D1F83462B9578534D7A05DC3F21C34EA93ED78387B32DE09ED3CD2A51EE2B8F7387C8C2D426EAF3795E99B158D467D9A039234FDF207D65D2577D1688E1B1E72B5EB096FB6377DC8EB6B3F51900380BEA561C03D546EE242EB4264C0369AA2D53B2B190E0422FBC4CF896CD549C2A08A37070331F15A9ECFFA0E91B1FC4D5157418914308EB8C6A992B197F33DDD517DF4610E88F2E35E505BA7C7CACB8E76677CA9B39A4094EB4590F6154FAAFA76C1D95D4072B5CE01F42355C47AFE569FA80142EDB49E2ADB34D3C356F4D882A52021C5216B3678AA6A5D52C51CC8BF09E7EAEDD2501A9886FAC977EA5F385F46E8718D39073D8995D392074C2525A4ABBE228F531E6B16AD5BCD5EF5CC4C3C71AA77EAC1747E2B763D0B3D66C7F35458BE43369BAA0ABED23202B733B3C7A111F9CF407A7D62EFF5BE3A5DDC3E49AF130012BC6D5D3641EBF268236473EAB09BE87BAF7707546B7AB194D2ECF5B03A56662B1D6462898DA94747CEE9DDA08A9026538D799F163E1E771EF7EADF8833C0510104FE7AD7EE75F44F8D4572E299A87FB17429718C576B29983B50FF81F8D48D41CC764809429A7CFE05F68168B6B36FF66CD75DC0021D774D07BC716A74F9450EAD2995089FEB89D1EA73A9CEB83155ADBA737B3DE33B6B617EE7F5CB6C6672AFC439990B612A6AE71540FC6D7FF535FC88DED0E6A80A484735F63209D39F12E6E129C4ED2EDD8C8B5A24472B83A058B0F1C86B7F4C53D88927C7E9EDB5C40C5D6C7F0ED8A626C5F35E1D3981936F0F1FE4E8CEE0FC7F66F0016B14F3D1EAA993A5DB9B92C03D99C0A867FEB343D9F43BBBBBD85F58B2380811CF153FE66E5B5DD07D5A87ABCADBBD472692358777BF17AAFB622D487A100062465D9BFBE0E63B9D862A02F09E371EE820D969B29B4E6F6A1120CDA9F9E3FB804B26E2E9C3DE219044D1D6E62A28CBC90C262B76914B8929465FD901777F6F5C112D196A002A0F4C4FFAFD2578B5CAEA21452968400DAD6490E313D32A708A42F64E9CF412EC0E358F6B833EB0190C5933037202C266ABAD212B570E609FB7D338AD3F850EFDEE9347EBCFEBBBCE90E7F27372E244C3F035D4ABF1008055215E573F0C4001FFCDA5E6B6C5B29B7F59132CD86481FD0E1245EE4084DCA3D44A0C9E6B6B14E1BCBF56F470F15609DE76588795D5CB62BFC9C253EEFCC155C116D70CCF9112D8E0A801A3C640C7D16634EA02DA9DB9AC57DC2F7D43F48ABE631D3438C2BD3EC97832244E81223EEE47054878BB2472F64E9ACA0D5A8B0B04F783C5052E0ED6AFADA5274C94084621E989084EF9814128226346996CEB6FA07FB957C7432878505442FAFC4D945A953336F9C92B8ABE4E4A092DA65E2BF1A7A274E1EE9D7958E35334D9B7CF8B314F0AA5C45E93111460A8F5409C0BCB842DF9C9887FE4643BF8958CDB40EB66438BA53972E359EB712BF4C553D871ED702F74C41D1217D7887C891E49043C0826FCCEB2897BFAF9F217DC9F566DE1C416DE9118491162113E2EB56CDD4C024DCA4A33359D88CB0247BDD6802455063DE9666A4C52075359316B3B557D42B7C99700F55CABCB2B802AE4209C6B937C798433AF94159A4EC0A7DE00C809F6E6675A4213A1CE8A7099FB7FE6A0C7FB383233444B64AA120BABA1C4E61C6426001184E897A3C6B0BDCF9759A72146EF848EFA65EF09076A4FF2E6DA518C5A08F2A2A12D904C893297234E53CFFA04F285F350412456C9A13E153421D65DD30B236653AC13CCE3D5CF1EBCB8AB46808414BD3725987D6E464EB4F97321595153DBF9994F7E19AFBD19E9BE929D18563789567B28B1AF05BDB5D2C5C289FCBE8EB159D0017E09DA8FE5E9D49D3A231814778370DFE703ADABFB175859A895A6ED86F9B6B52CCDBBF936622C5E5A01D50E2B6D5730EA4588680EFCCF390211F211472F9E10314482CFB45A24706BBCA8CB515B6A9AA6EE1D2509E8F9AE9D6F545BD3971A02CC26699608FE1F076A925008AB6CA8576CC5A962326A369BDA8ACED3618F02BBC55337FAB2D66050514F904083D4386B43B6EAD553DF5603201C6D684F7156FBD2D3DDE3D7EB0D569AFD42886E57B747F21D44B88AD58FA2370FE6BF2DFA4D94D8FF983A1C2B89876E75AAE3828D1306DB9A639D052EFA6A0EFA0F61737CCC45E0C516815E92E256BA49E7853F9E9D4670593BF9402E59EE80F6CDFF8244D156FAEA8220D483601794A3CB5E1D7B60DCF991A545D2C72F62E5EA05BEAA77FA86A80400A07B97D8159F0EC170913ED885B578767CCA7A5BFB8BFDB7AC99002555145D9DF5011654700D6FBF2EC2BA609C969EBECFCC0EE346FA01B6CF07E6855F3C832BF1DB6E247448438BAEC055FD41CDBE921E5F62D93F4E7964258A9CB3991E8084BFFC2E5B29BD1E32A64E32BF5E27416CBA7FA3DFC143281F3797E1927AE9D9E07FB424833A7911C23F231D676EB0FB061C179C72FF0038E48068D43A805D56C3B6A16F5A2E5E8457F1A3E0F927A8880CD261F0D0AD8F82EF0E52E1BED003661F1D4510F7BCCE680CE84A0181F046366126A53EE67C7309C6982C28966B6CA1F324D03F5E09AEB111486C44B6551B1C36E84C2A72F78AEF5CA31AA66EDFB0792C00579C0C7C1FAE501735706CCFADE03E9A0847E498A24AC1DCBC7DB8FFC946B8D914633559B63E3031C214414BCC1921D2A53726695340648CF6C2BB4FDF132C77BC39E9CEB2E4D22EB138D807D7B79F78CD9713F5BE7512FD32E73E886DE16A9B1B19026B91EE6AB92DE4DE663D9774344B283149AF4890BFA57ABD1C9DFF128F9F169E4CECEBA0FEE1C33D4E34B877EF04DC887F7109B2BA65EF5732ED4B7C6B33131EB5867811D4A8A3536102F5AEFCACAA681A6A45A3BDCB24C4FDBF49A134244044E2B424996CF6F3C514C77EDF2AEC177B8F80A1AB77F6D3D920E508C76EB71ADFE2209A132839E9BB16BD9991A545AA0587B7594E0422647DC84CD355B20983AD582324D4F19E33E9CFA5CEDC739B26F43BBAD1F165720306F48CB15B23B961E5990C2DCC39E5BF58A9BFC10829590A7AA8F60E13EE1DBA85EF5EB9B1F6DDA891ADF7357E16CEEA4ACDC00E20F8F364AE3EA838CB4A0FDCCF8B439A242F8D18B8E0B9FB8E074922E0C25922CBEC46C98A82E93F0E95884BA9853CC738AFADA3F08BFB66C17DE7977EB7CE5495B8620B537B49D1D37EA4B3477B79759EC7D9AF17EFDB2EF89945D453BCBDB349CFC623FBDB8F125EC492CCBAF30006523B543B6A17245CDC5EE7E28EA895654A5EA74781CCB0F30343C73B4BB88CE07BD37DE9220712F11748EFACCE925626FFDD8447D37BD9CF2476437C093BA4CC0AB674E4CF9543CEA67BC25B9BD56946C0D077F0849796EFB74C7F66D5B86CD9A38B8138D816F677CE08DE6A6A911BA4DD1834751548578CEE4CFAC50C11D685E52DECB77A475FF5468C38DB23853BB2118C78AC3D52079042FB7F370B3D0406E402EFA6432D3055C572C81DD999876E8306021118BA87D5D430E4AB9C24670EAA1274ABF4BFB8149D9067C427DCC026A61C5B724CAE1858ADE366FB42CEE52C36F0F99AC02E8BDF784EBF311334B83B2B277982519DFFA3AC35D97F9F30635CC17BF8E017EC4E209EAD104B52C58E8762052CA62BA7A82FD011860E4F298D889A11F6A2BB1B4157CDA42AF9CCD0B5324329A92CB9FD6EB81DB3FC58431BC5C9A6DC1B07F7D2B00B32E5A39960C5E2CD69CA2914F23365B518ED746B27733D713E8ABEAF9D1FFC6D3D9B601FB386A6911F24CC818C0353658CB826F43FEEA792055720065601F1364BB6184699F16E3EE2B359CF0642C85E9115B18E55482356E2F91121C5884578F3D2C45462E47A3D477B3D63448A8C1679E68F9B7AE509100B7B2B142FB6BA20179E599259414520B02B745E592FD10D0D40D780A95C164D651E96A7052B69BBDA979216989A57506638F891336E2EA123303F997194B7AAB4F22CB192AB59A8BDA7CC88D0F43E4DD949146006CA3F91CF28535ED42662A61F630AD6E7319A7B98FF5C7200FECA768F14BFD43BD60DBEC814E22C26F1A8191ACC869A6BCE61991E4F36148908A5B1557A507C407D73A6FE75A548CBB8CACF13E57BA6B01FF0DF900051AE7C0C346D5DADE5F1C1BBFF967236BA5BAEF19A70FEB320BD76035F3A6B11383F13E6DCB8D1533A6529C98334A3F2A9105A5CF1C940659459C405C197130EBA44F0A2881B4614B7A0BBDAD5930DE5C3389A7349265629E29C0123CC89F3F540FE5C9019662A4383A38248F22201967D908EB48D530D17D50A08B35FCAB73AE8ADFDD72A8A7551EC28C7573E2B33EA4F61EE84C3DCA33DD5861B8FB7176C4AFBC174250D51F86B1452903191E39EF099C0CBCC15B3FB5DD30A2822F68AA37D59583BDC1CCDAB1B2E0337BF397647FEA9111A5B94C6A3369E90F3B86C266F4C11C9A7D9E24802B31B5F93B8EA9AEDC6C2944965D6B54601311D251E81C77AC1BB2159263D0A92F377F111DBC8D554C3AF747FE7E82A6E6BF0E4E3743B7AA42C3B5B8D3E5D9C3B427B3290452136E61592609826F4B61D4960B7C3784D0E2508363212AEEAE624489B739D0573CE23B35D30826182DB5F4D09772582E4D6B61938041344EA434614C21B01530327C08539A84F03275D0C4A77FDF230FBE6639CC7A12C34545C5CAD34AABF8E25D64AFCA8206948737DBA643867A146F17ABF81A926294E2368A5A2F0C381E2C244B21843E3ABBA680CC3F1F0509DFAFF4C70B68C82D3D7EF8EE053DBD154376FAAB5D561A19362314B037CFE18DD03BB817444FBF08D771A13B9D745DC066C89C10ACD53597B74916BA719F9EEEBA865252FE13EDDF97978092FDD1524CDD865FD6AE9C14329EB62B322F46905804AF1CFFC13B46B6AF4ABCB107D44DD27B460101F7A38DC786239E34CA9D1A444898673BB3DD92EE88478A3C539A563CEAF5CF499AE8E07BDAC0CD5419DEFE2977105B5E0138D84A8F9BFAD82F58884377B803C8B68164A3E678648C18127A832FA994EBEDCDE4FECE85DAFF8CD6F44F4CE57694522DC30BFC492BF62796D05A9B87BF13A7D538EE5C55E6898D50ED127E8C12F87D160AEEBD3CB126BC4144A51F685079E962DB6FDDE3BA6D0C8038BD6FD8377C4BEFC2EBF1A876833516D206C2E309C61E4CEAB5F86ED83FF20C8723BFE63D8E480798292E6EC6D418D3CEB623AC6983A3F8A3AD568F73E408F15AB88C8F56F3CCF5B32C76BDCEB1FA41357C42E1215CC503A316EA0A83FB341ED6ED20B1154E5001A754F92E97570F9DA7EA8AB7F2EFEE7B79A1DDA705645ABC5B1E04CE4F922BB03435D11FC83EB580CDFF7EDEB78F2CEBBB6053410E84477864C16D4CD7CD9D16B932372FDB99DBCCE2DC3B5CDCCF7DB86AEC9BDCB8E4F27B65ACA9A3FB985CF95C5BAE253797C8474D0C25F0FFBD151E6558E524C6E96267677EB7A3E128C918CD3B09F1DDE311401152C62B4C59EA1D408ACCC4A12A34664D7C0858D7E99A0327724AE9CA55A9322D865EFB4FBFD37FC79F8D7B2BF08B1824D44777153ED6604E05DB1FC9B1ACCE05F8C53C32594A84F32D97AE49E819029204AB7713AF2AF2C281448A34C69D5F3DC76345031D2CC05B6B26303198E182901FE65710EA95793DC8495F1995F0196DC9473B7AB922786BBC61A91868BB0BE05E2034EFFB288502DDFE2595887CCD144E98ECA4D1E0C044C642396F98473BFDEEE796530467F6B5EC0D5B79674EBDF5D1416F94A8EAC7F4833947F1DE610029779CD436729E55AE3D959F99D5438E0E4407D0A870A38AB31E08F16A06345B7BA730CCF55CF1FDA1E9D04833ADE5FD74A34E2629DCB75A3482312860404F7E75D94D7FD2C8215C6A21BD5FCAE81CF4467931A984AA24B927039526B95C2F5F39AB2040A23C76B64CD2D04E95DE6DD9B8EA849F9F7919A619EFAC498E7E3F4A70432E28B1C5DEDB08D122AE503E98D34D13A4E8A69FA267C3E20671077F977F71308D3EA1AAED5DC33B3F41E0ED981050B3B915EDA07AFD71CFD3AF13A2063813039BE85EF98706399299118D2427A7912A131DB7BA731D18DC2838A116E05C4CBC660895294A73D170C060CD83C9AA0884C5F3FE52F4891C2101997D688709F356A556CE202C571E1170BC339F3E2A75A5A13810E3A2F2133438C1705895523D03F00BBE4F4FA9BCE6D7A14517BD54E281F202BAB40DF35253961DC9E94DF5C2C5C3F0E420AC67A85BEC2ED70545B94202AACE5E58180104E42C5AA6F7F59915BEA69AC10F678D40506AD2B502D77EBE4D05CF8253B4795094F04BBDFCC8033EA131BE83F3F647D22D1212C16895F52FEA576EFB344A476D2A8EC74739BA62632C4B5B08076905BC0103CC9B2193EF6C4785685F2B3F79FC39B5ED09B258E5E9BD346557F24CB542B69A3ABE367123179879A02F941F9781935D44BCABCC563BB1F31C44BB77D5E7A4FC7EC2C11D597E7288C6088497DCC97910CFD8245A4F255CFBCB8FFF95905E8224B770E910A253356916EAF1B3277D831BEA5BD6681C6C7D57D363608EE78973B7BBBC156FE5536C963030B6BC8D306F3C1EE72F14163DE0DCD0CE741EF975A9DDA77EE386B991F3096FEC95FD394E26578269F491572B36AF42CEF1D86CDC82D63DF00AA397E1960378763F5CED239BD2A6D0EB7C5BD7CDA2228B684FA57B7FAF497310D510CD386DE6406924CD592ABB1E9753EC8BCC594ED52B70C04F7C53E19B0CB607DEBA79FABD6748A52692CDA34BB7CBF95D1ABBFF8AEF8F8AC7E5D52EF58FC79B0C7662DA90A0F737CBD42E64B648B624AB497162A7B27E41850A9BB4AF0489550773EBF1EC6742CE8D53A20921149563AA74337ED4CF1EE8685F41D36F748B6DED5F894BBC50A8DEC84621B6AAE690D6EE0B392A7266A480CF985295361B14AF0A5CEFC1EB737ED3AEA5E5894FDE80CAE477FE742395CACD1174CF2B345774BDDF71853BA1854EDC8F5CB03D33C5F58EC386ECBAC8E4209F8881473A4FFE306ED3194F455D4441D132B7685425435E58AF1F2964B657C71EB6E28FE3568183F7A0E570821EA49DECFBA3128002E77208749DCBD3F5E15453AB6DE9EB313D7445377B3BA74BD2F67AE31F560ABB628CA0DDB120CAC6CB62EC9CCC65051F70FC41BDCDF29F885FC9A558929F58CDE1200072F96C3D8F22032A0AB3F705884F0D827823FBDB62FFAA39EEBFECD9F57DA083D1ED541CF36465A999558F2299A865456C94D67E74F1EDC7166F91F4CBAC8F89E680BDED946A174E9260DD50C6B0A980A4B886850797149FCAF8871AB3080A76B645E333290A0DF319DE058981B8CFAD7A54FCD62345DFD9C3E6F7A26D212C97FA6F09866E23D5A19EB9CAE760E876B2AAF43BDF9004D5CFDC41570EABACACD4B57662087B6A91B6249CDAF905BC2B1AF5934F1A05D20E6C6784F0FFDA0A3E79A2C0939BF36C55EA0E31B1AE614D44CD413118EA165FA549026574D1549FF7D63B4C464A896C5C0E8D5569AB2B10D1DC56458FD1E069B5F91B1D084F7AE34F67ECDCBF33299B12C102F953CC48B0661AB4EFB493F7E4B2EA8F6FE59C3D5EF7D121B26B912B86BC0AE987B6A3543558F0B935AE62B4711A586DDAC9E5960C48B99CB80191B11F4053527905123D20C549457BA87608948933442CB06BEA0E73FE99E3C4198E9E7C51BBB7074DA46E752E46B3E419FAE2AD60D180303D710C0A59C6B980B24F0BFD39959368B5F56AB3845A2167F4683AA82A9613257BC801F5146CFCA857F2DF4FBEA85C54930D4373F70C083F661077567F1173819EBAA585EA3675F97951CF8C9997887BBEA9B99E17A1E0215DFC2B9A66760A277F68E747141AFE5CAB6B25D73D562B91BADDCC7938F2EA75F1C990E88311549F38FCE2C52933498B22E2810227D1EAFED4BEABCB153324622E107A6D96214F3C6D5DB91855005056A8D1BC5D5518867C373709D24DC1FCE21537C58999E26CDF4FE61ABE5E1225DE80F98D02253999F39A145FF3008F12880C173A7ADEE15025E3E186FF0C2090872A0A51505A09094FA2946AFA1840B0D6D526DEEEA95FD8E259E70B2E794C97F50E7833B165E7BEEAF5D3CAB7C3AA1CEF00003B94159F0F6DCBC74808E3FF237D5C3E94353FC0E700CAF48DA8BD94B991EFFF2DACC9E423A2AD63824CF879EF838C784C7D4C0CEE3DACF5884941BCC14E043082D382AFF598BBE0321DFE9406434DDF558EE2BDC272C2B04CBF8CEF92EF8180D0FEBD3D62E1F73F3B1E7FB0EDF9B50538D49C52CEE53F3000E581FCD7E6FEA1CEEC9DCB4876B3F1D1B1A301A2D395DEAC54D68181406D7ECA05A416D3D8E0EE10228483D8515A0F662D933C53F945B50C65C5B8D51EC45360661C92761A1F74EE06FAF8889244620DABA05593DDD4D6A82A30F34DCEF50B1B1D261CC357AB0673370A38DFEDEF3D591377CA29DF609682EFFA212092ABF84FCAD677DFAD758575CA35046467C6925B6185F9B734D5E194F5CA48DD10D0B84B7E9096703A9EEF0D3EFEFFC0F58C4D38D741F15AE766D06156B26E9C82B464C9F609F0A4FF699D52E0E11E054738476456CB81859ABE457F3595E9D7F1CFEE5D0437094CF093F468C79C093CD615F7409A505C610169010F46E148F3D264FEEA1DF42B3E78D1C4B33C92EE9BBD9C508E89BC4CE0BA0C412F75821EB54730FBB627C6C93694810CD741167D5288768165A68034CE2B16B0E73ABFBF75A905C9A9E577024EF2070EBE8A68076AE37BDF3507C7CB10EAE13D3A05BB3DA33F873F488150CE67AB892D61A11FAF5850B6A26862FF0CE85E4B0AB3EEBDC81F68BFDE39B0582185E4322404A0195BF5951BF7CDDAA6530DB0EFA0A2E6B2A9CF8DCD8B0D15447448847D1EB5FCCDC80EEDF166988D55DCF3BCE37E24A0A5F302F820C2782849E70BA47523A7AA1FF12F144148E9B5A1E05035A346FC4028BDA824B8D5FDECEC4036EB2C3A7DA612A703EFBE4D5E5E17CBCE1EBF546880C227EEE2D9CA4113D0ED61AFA70171700F0F9A1BC7CE7807A081EF09E9CEDA5DFFDDECADAA7CB5ACB2DBBE26550ED006C5B7DD89A2585EBED5995F8F76F3EF8F13B6AE77084727DC894C74268D4D91000155FDC94DEE049E54F4E4D2494EF926F23B73E60EE16CC3711B67B6F6B3A3BA6BA8CE602AE1BA87ACAD58650AA8F7F0F36AEA21080CA8DFC618AAF865B14BBD69FF7B413FFC81DC6C8BF2A7B122EC2C13DD7832610DB9E6EA0E5CACBE1703AF551997E6C51BCE7BAD4B3EB1F392EE12C5691F795090C6F1D6405D0E682F279B3DE64A9F45B1853346D8D337FF8037370CB4DBE5B241959FB8DD985A4F154470833E422AD9EAD7A14EC1CAF6308FCF7E9AAC13ACAFAAD98011148A2D52D40511CF13C7CF0ED1E320617B908BD1A6A442FAFB2E543703844B0D40FCBD1B392CDF5DAC9CE4C2CA69C8F04AA033F5D6D11DC1A5667FB352BE6BF88A9978AAD37B01BF8652A2C475E8516AE1A6E56F8CD596B9A780864ADC65A04F615ABB2BD4BA97301FB0CB7D9AB5423BB14C29030DCD5345C54D556ABB116051C04D79C81402B70AA9F32CD01B6C06FCFB416C4CB7709CEB12DF3E8BC541333C90E6D991B24D7D1D98D0839AA86614F3D91ABBEE5DF138A9DF2C0591204FEB3D9DD546305FD017B72FCA4DF01A7C1728606EDBA07EC101D7172971C9F4ACE7D6D09E06BF9E8552A4CB3ABF6FD84FD350F60A3E1826BBCBA484D4B5B284E2E1EF2A164FEDCD0D22AE77026C4A6596ABCCEBF6ACE68C11ED108BD3C"""),
-                    TestUtils.hexDecode("""
-a3426182a616883300b2c714932258a288d6f9d23c8339e1639f0cb6affa7245fcd901acc5612dfafe3e4fff1171e24db746e388f629bf6ab0e2090deeeef36a3b3c610ef0570193067af930c98accbc0d6830173136316ac7d5459e4a2cdda6f26f6509c35d1232af44470fddd0142b6d584766de939dbfa3edc9c905189e0c861eb16667d53576a9d4a7df0073a5d54058500e1f54d3898faaafc08b116336669568d1d18004d33c2b71acb0686472ad04b23a667d6d3d7d0d9e3a434e34d505d63f17b26933b4427931701aa35f2f6864465b650c9a6673397ff4aeb6af2730206f1049febad306ae06f30c856ef643c8c8ae9e3cb249a10a4646f9b7d985bde15103d57630cdbbb6716f41d0b7b1064346ec31907531bd35fff03872661bba13bba7d9a03031ee4943fb2aa549a208709a528555da3a42020a5c5827b06e7c917eb07c02732f7f559c122c545fc36cd006f33bddc2ec1a2dd67a60355c971e699d400110aa001a442fae92e24d05d1d091eef447f643aaa825d974f4b049e6e0f988ece4d510e79db57ccadf9b5e1a564c64b029cd265845d41474868afd6554996e7dbb2b3e92fa5f544de6f8840e841e886f7a5b77d1afe3b29f74dbab86a3f68cf223f9cbf41715e6f1f14b91146b64475a336fdeb668b27ea28fb87321f340c910b1814ec7305e11a0dfd0eac1283c0d0131092267de75cef5b2586399804afe72f7da133d04c02f19c2289c17bf4a2ab1d01bc2830b34bc77b15edc8fddbd0359587fb9316c3ea1ac8a146fd5229f86c38920907d77eff0b1c581f6925a1bccac2d234c52d159ae44f6d93a11d133edd6d0f6683f5165abf5c7197a50827fdaf713eb3bcd562ee9055be72e879849b7e4105755d0b9052885195e100ce302d3372fa4e41e3ab9e48f61a2ca054fea7132ee7ef77b62d61e02bd8acf7bae2b56cbe5f0224d15c3ef29fa051d2f27d56b0057b846fefa044ec57171549c81d7baa27e59e134c28cf6326d49fcbef62af5937d42953bf5662b60729ffcdb8471733c44cbf34765996a58430c02dacb23c6dbd9d8550eea2dfb669e1738fde0c9fb34f0051fb99cee29bf5ffc1ee95419580dc56c9b2118ea80a7b34c1a2231074195f45dd778dcb1426aa7feadf475e065f9ecc00333d05ec3ca0e0cebb2940fd7ee81e8a18821b59341582acc43ae576cf850f8e7cb040d4c4dab557b2a80fb3891669f86a00879c45c73e6a363ebbad67f99df0c5fadecd53494b5872f902e20f3d41e4be6b7ceccd89783ae2464feaa9fec596440fefa3111bf3efe416481f5e739fff33e3b7ee1c90064acfe18528b8ad3a9f3dfea879308521416da9f6131a3279def7f9ecf8a46373352cd14a0765f4e28ea8f313a988dd751d0a15b525c3f2b19ef0d098298014230bd7c8a042afc6d6eb6886e22449a36ade8b5c8e114cd408dc54ca4554f291882272645f8c1c10eee4ee4d6206525d0656867c0d2b4a134a40ea26019897e6f2bed4b325ada4af846b1db43358d140d54bf61bc8ad585715345aa2fdfc6ff62453bad6d00ba9ea11b053e776d72e0bc28f54056c7e0feb06314b3dd0023b257eed796bfd594d2a2b0ef19ed5eedf68a6dd19558fab24c9a751021c5fd964872e4a8eacbbe9406dbdb98fd505870ce79e64ed57c83887edf6ea916b29ad0c1c34d02f115e9a81b76d70ed6bc0900ada79fb5f7dc069fd7fc2f87ef9ada6be01f3e5c2e87ce02b38bb4c5372fe69fd7cca02898618d952c6706c88bb7a8b05a3ac163baf9deb64a0c5523ea486825f00cc298da63274b4d085b7fc6324b984d86d9e39d2cfce97c2e2a3ad8c3c04399e23af07f4e4c8a49e58971f8c379c88258e7ba25f6c6e9bf8c090eaf06424ace3e91e3ae12bd552193057f2542c6bb89bf1d16b7039395a8f8f54bce4a67caf3baee88af88a4a34ffd0d3673710dad8b1a98aa7a7678675f87da138971b0446e868fe1a39ef268252fb06366eb194d1f69c7a86b7e805761ee0de00c7113a2e1c5f405cea7207ec634cae3a43308d6d3caff7a9baa0670c9256fb90c61a116abb81910fdd638075283bc76928a82074255a4375872f02cc9ff13b75240609fc44125d46e8071a94cfe1e8fc68ec03665daccfd0dc385687c79e5537661bfdca8462d3fd86ce26d599f5add12e57c49c0ab1347c2fd967cd62b6e88613051904a975051309d5a43f9782ee31fdba8ca641f8d5a27c8cac9131e33e24bf5a1425dd771aadde8bf0fb7a0b7b896dceba013aa5c0687e327c27106ffe79e545f2249eaddac393a6e062dc296aaf4496c4936dd0365d3d248dd2811a95b2789797fa05e33cae686819789fd2b1315aa90395b0afb2f6084836ab2c78216b27ba6a65f09b23006957522679a4e372369aa65a3bbbb8c8af19039ff0cbd191ba65c0d7e0acddfb468a253f631c4495a808083e945496432a10195fc221535e240fead5672421cc1ab3010ffd3faa39f818ae105dba8d6a6fb621f0b86ba9abb68dbbeffc24b26e55184d4f21d8ad733ef0fecd4c6cfd5a403e551c91000cb9b6a26c3f6a246eace5717c784921cf154bc7fa61da54cd0eb55846c086a6a134716dcc49f44b55994217d5e92523a07a28733a95efdb2c6ecebc6d3ef790ab10ccd113d4fe96144d0e4caac971370d78331fe91648d32c2373c595ae848ef70a5a786c36c61d5961195b8a2c287608b9596224ee165c22336c07643b08d3c92aa5808bdef9c3c35bb3a5004f386dbff06c9dddc925fceb7f10ada52c9b5e100ce0e45fc23869f18ac4b3ca6561f98c148a86ae197d17066da6421f4d73ff4c16b489e84c4b09afe4c1e8f728f9dc4e4563c36ea110870a341632a390981fc1d114052eacffcc06d550c329bf38d7460c51a3ee0342d87157450989c43788b508e9537d08ba1017bcc0dc4c5a8d99ae5591d82fa8b258cec35a1446054aa449b48371db2f04f25cd618636309b5a40b7a32e589c80b69ef5cf19bfad44da6687abcefdd35603f32028fe079c1e541854e5b0b56998b4bb02ad89b3ef22229c9a8da7a381fda304ecbd458c625c779d7e52c8c44fcc45322a21e7a78d896417b513e298700389d0de1a50c7a3b653c87006bff64fd297a54fca09a4662d9710132d16e2e38ff4eb2a4eee0bf9b9d59da5d828da4cafe77262af02a279fc22a1a83aea33f9887880542e274c950d707e766eafe8610b0cb8aede80cf900f6a36432019e4d1f561f33ba1d273573cf1908a9dfe9922804f9e5ac279270b21d3b5edddd51c1fb2e8aa8789d0cd75c672eda3b06686ff6e8c7f5cc3fd67d2fe91aeda8a22e73aa9624b7b18d0060a64d6ce2ec77657b1d1a878672d5bc033aebbe3b9a7a224b74d859d47d89a360e2f7a1b03a4bb1ae92c063ed85d5d60391d9553e4d3776c5d4628146aac13c22eadd0ac57c46e65c525775ed3edbf0b41a01f83a2758aafb5324c1888a284ef0d47c12b15c6c5d68affe6c330110e0e8bdfc2b1a8f2fd67617e76f975a7d72630cc24e98eb45b5e9c8c442a5af3ebe4b3d3809db4abd88e49004d339a36265898c5a65bf5263d062cc9a307563081ec6b0c46bb45b92eade67a15449e0ba26e280fcd403cab8c29ffa15d306285b4052611ab63ea0549e8aeeb037e29cf23dbf5baaec582754768b2e357187343b3186bd6e1128ff92bd7c707f8b5f7dd9eb88915229eb0c8437d715f1b59d1e478b696da3ae27fb756db092c885b6636f6c11abd70ba3f0bcaa6340aff1acbf2182186981e74490f679c6b619522a85441902f9983231c2319a1420a2c3e050fd62433631a7d9b6947b247571303e22121d25c30c130e90b73fcc0367d4b7747688ec709079d9b28b981576e0fcf89593be1bc2868d12cd9b2159244286f46d3c270ed38bffe97bfd1d51e0254313703439c148f495dc73c6e534d05d0041c3a4f02ddec5fe88842b4ee59284a1cb2dbc3ee0c4c5ff17a5fd6b9ece5b23f8f9548cf537c4dfb6d231c0e8ae2fa7352d2c6df9d78865418415fce33cb613593071d83bbc30ac710d2c313648543a762977d43979b5f48c2608a68769b2abc933046762736a42a9b319c78e98be5500fe55b9dfe9976654e95999eaa2dfcc090500c8155369f49f3b9d296db180268de2bc26e3fbb428803d9075a20582e075330aa8d84fbe36417f9a3ffc3204583ff4d2731c27ae4620cf065acce9df4e8c728dade6eddfd09acb726d27a7abf9409a49739f84044d6403f5b9d1855da0daab9d54e2ac26e4dc9c71e63da692f60a755902e9930c21ed5c3ba5d1afeeb892794c5c948a236a2e01066892cef70267bda3415ff51a404207f2f681bb72fc0a14e2720277558dc201958eab0acf7157cc78ef8a9c12266932d2548a559c401cb4c63b36600638a61cce16da6005fe9d59f6a7ef14fb2a4b860fd7b79f0a27b8a7d631075f6ffdb9fbfd8d2764b069f0e10b78605b25fdfd14bfa6825db8c46cb6aa0c976fde81a5929c92240e0b5dd8d664013e561cfdfc59bc7f09bd499aeb45b8623698ad7242808e50f568d830cbbe864aa4bd403dad6a4eb67c33d7db2180d7ef9df51b91bb946bfcfbe0d216673ec34bf2dd72b2656344311191b8b24b263aa6852d1fafbe14b45e803c2b6d0b6293d4f58de21f6ea849f3e8fda46111416eaf6b8284de908f28e7f07eda6d42e4f6196af945fc41301545a848d76201cb84b3be2be65d14425d7cf0822177be934488a439bcd1120f3131d5c78c213df7bca4f92d39bc4274bf0b984fe7d6a35af08362f07250d98e8941d7859fb19a2fda77481d13563eb44b0ab019801d3535ce9ee1b8c24170196a8d42549345bc4d8af3d7a12f66b3dbab325ba4451c345588878c697f16fdc7c75a0077c31b2542407d339a90db740a9f2f3f696ed9d8729c61d296e0eab52a95eb5d3d6f1a9207cecb9b85661128ce3fd6f53b205783c95b11f3d599639d66967729fabf5e0dc1d4e24d7126c73ff941d6d996592cf26a6f124b5a08272b88d6f9f3869b10a7adfba87cc683f2a99e695bc29220b611203e82f67d80ca3275a79004479802182431d2d7d8dc4859820d17c483cd94b0ea11c286fddf5766a048456390ec48b2d5a94d2a59a236ed193f14a9d65f30e82d3df3571bcf7883da9bfb2d95dc6549cd0b9dde70ac082efdef59beb75299ad178cfe7f00679b9fac03adfd44677b8991f9b2da8e3a74b47b4f41f9a063886073a19a43408362497250e8428cd18ed437643766577306975a566ea499ccd3b78ab89382cd5b0bd9b84edead83285a6954264ab6e602e018e69754776070566408719e16ed075d9129fee670113899015690b3696d55b95b15ce290b2a9e8aaef3b869c215de4e1775a480a05be21e2a699717c7c568a755f4411bc2f05800841284939d08bb3bf552c2630f541cbaf3f5e12a12f907863afc72172bc56166c0ebed4e904c05a767dbf47683af7f8b98a16c859180cda8ee3d92b143aad733bdcafc7fd88fce16c39667e9ad26b73a496de9f5065eee7fdf2e7babf2ec58ce83d3762fdfcf44f76aa8c48a32d546761c1011e785fa09bdd5b9b08acf3e5f407b1c733270d495005d5f8709fbc3b3eeaf3b4845e437ba8d2ad2c20faa5c7f4de572ec1357e9c8ee7fa2987529a72572b59bca31467a6b77720acc272529b0e00ef04331e143946287d0ac080d80240d2b31297687f56a7a199b8f49a727d40cd14b61643b6548aafb0d760f3867829bde610960df12851e32c8ad61a507ce824fffa4656e92ab12dec825104c5a19379e11a2eca89165569d0de12b25a9083a355172c34e4a0e26b32aea3ded77f04bd2a6df6f951e295a6544871a06c4554a645b2e29216b3131832b4291230a0f85af29c1a5bf84e38c0753d8bb381bc5414b458c9c5568837885431d5db43edb64d81ef9bce7c20d89a5e574f376600d3e9b356fb1a819b73f6bc16491f7f0af200b787359e5de299f35567888796ae99b3a6c82e2b579c8338da8ecd499cba4a1ea92dc8090487145ad6965e702f3d9ba5a09f32e18a507a2ba1b40342ea2e3c4e02c908c99a2ac2c4a25d08387d8c444f78a4cd6237c047bc605afedea209df85ed0924489209a3da321dbe671041d827e022dd97ced029b73f6c8bb503bdffeb6d326c6a4cf5bd3716fb01a0d3cc43ee43dbe5692049591171209b47b86154d91cabcb955646479ce9d11ea660c39d7b4bcf1ad8b459b4f1589bcc7e1683bb4966cfdecb626ae1379fb66539a3cd5b28e24a0ebd290d2f214307f3d39c64d15e45d5aa17d339fc6a09a14db59e1dc2f07d16c97b117712c468b1beae5037ec65ccd569262fc9b8e250f6951bfaa7ec3b0511eee88d13001c4fa091efe03e41be5eb09e2a54d56b166ae26b4cea5869937801359193aabe0d17313460697e82b2cce51936393b6ce83167c5eef9131b2f7d85893a464a6bbfe7072fbac1f74c5f6579ebecf3fc000000000000000000000000000000000000000000000611171c22282d35""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-b5ddc2872c67aee1328b8becc910a85ebc35da9cb9ac8d19f282096d0022bc51e742ef864c6da6116ca688a707e1f4bb86b77749f35d50d0f196d788539cc83fa9c2066c61d643639b246a346f2ed24b2e585f0a43b16277b8d4a17f68c9d0f8aad05598b904ed2de85e7dfcc478259e10b452cd33c058d477abfdb4e97e5d13102944211091984860443421d4928944105182b82c99c65118394222292583183118b305231584a3164e08886504488089b08498b40500380508b148dc022114872c1a330001044619134c10c9011a36829a407240947060c4689190045b9600c2b0514a429009a6811819658a16854bb090413492232690c048488cb68d4a0664da1082c9b080422852a1860c21a18124b590921042a484480c900d01154111213062c80de4c00022849003094814c1092034800380311805481122702325319206861b93114148048438706110620932620cc60480a22848020658348201866920808d60085084c84420264c0a1272893881c246889c947042442a13b420a190305c420e5208714034260183258c064a1918655882700902601c148cc2340a931204c89265c2468188a2849a8880530472dcc008d122410a014999104a90442124373004372a12c37112002d10b180a248929cc2250cc8042396681c004c09c46420a92c09974013296214054e61942d18210e809631142284cbc04d8ba681030321504426181531030882e1120961168604186824c14d91268d01108a80444c53a02c6392655c264d1110510b1665d9b8490b336248242808852c113462129591d8008c843884a33671c49640639428ca406e53c6001124649cc000c34290a38690d9060c24c3011a8350504246093784d0146609130c1c39101cb90589923021a0845c90840802511b9924c0982d1407018b262d18099021062813900cd9288858a6841c480120081260906449087099a00ce1386920a42c21b56099020942808423460d133089642622e1c44d88a28121814092b42cd4a40003336588246c443429898641114981d010515ac40c123420c1c86189442a144771110632180102a02012089965021081183989819489ca40020b282112074521a84813834509398299146051368e01480841042ea2a80d24a680d04065c9222614029122a9298c8624c42470014086cb406902036e11a2251037640017088c988404496154269049a070249861d8408e2106094a122d64224d0cc59114441299c070124931043065114500213765e0b240a00071208140c8826c13880949068e0030021449258c26269448045b026d0c842de3368189446cdc40450cc48c90206943422843106cd1168c4186804006915000891ac148c4202ce3a429cb8805cc4262e4166582882413c3401437401b3204909640d09044a2308a63268e51b22d0a1624ca9224d2186601118149b8048c30895c0822990005e208894c000e01a24c0cb57040c82163840441948818802914b130c0382a8bb89002220010c38d8cb22cd8284624a7701b4741184461a2028e0915869408480ac96dc4440a0a927008252902064c0c346592946c4c4801c004641b170c4c022884b6512125611bc90012c184981251d4968c13404c523868e0344e4332645220914bc4515b8609d4c841d3260e0cb94964265140240461482e8008820a3025cba29109462a12010e019985d39425e148800bc51113b92018437209188ca10662433241c8c871d4346d64a04d9c360013a300929691922621dac0891a346ae0c6641823511ac080a1888498a66800244c5c8868240501c14861c2206e092865c944029a486e83080648a00552c04c09396453a20803115103290223c52482824cc2b86924178e02428a94262d82a46011a705249860e3040994c41101904402b101a044285ab4118cb8092437429138009244240cb925832809e1c240e0006ac1282498b0405c406d504445114342a4c63061b408d49865cab80854b620208741cbb04409132248848813206c81b85002146012074a1946491c420a0337050cc42520b351601062501029ca1422c9a06c0407020b90618b323102038404404a03024404074062228619930d541011909240d04806c90252944270110568030830cc0612c3c085442280da408992b0650220614186294c404d91343160144a4196691a154d1904214b266660206084838bcdef36d832a9f7ec4fb59f74ba844968c5b6af5fff4aaace98c3a72fdc15ef08d34c9408502f59947b051408b44e5994c7f9690f1c62ea8e9d28c28035b015c5686cde3cf6701b222877ea972204e42e6122927b89595b79d347a63b98d54ddd0174e4b17ee672dec0b36e3d10b849eda667c4e6fc973a56d2e2e048451e27aad10ffaec0b7cba07a1c1600b78b25c0f5057798f8a394a06a95bee4265f900520855fc268eb18907805f48779076e43f9d7377f109292f932d3539f41ce74ba337762ef193d2e10a26cc96b89c53c7615ca39fdcfbac0b7e98504bbe2b63e1b12f851002958734a742cf4fd4d623d557fcf5bc4c30a44234e76fa15e8d151cccc190d1d41546919304a284c8aa13e7be101e628da63c014e6208c0ed1a686ed261f6df4620d47abcd375723d3bdcae88bb5b2892828636030e55c65b152b45a93c775f597e87965b06fd357c0a1b3f626524fd54eeca30854a79a9229fa3655235af6cb282c359be16c38115d3c56429cc9f06c69615e745fc331d1f22154b393aad861ad2c32f84bb86d191ab2c3061886d8d19d98f61ec8d7d367c4b49e0bb0e397c357d03488e61c839482112a5f048e459c1c17147f3b86ec6084800a1e76b40bc93015a8a970fa303fe0a14611f9b56f3ffc158a0a56d2fe88e79e3d7f6b081e45101685e1d39508bd4e12885e528f2851373b098a6f194d3de6e9691f7c6da983c851d57a3fc7f880eff8763b442f259b7ccd1b8512efd92cb5998e34fcb66800d262750ab5a48b06302a6bdf3e5db99295bfab4495e3b000c9560d1e0b47f3b09c8ac152aa3ea2beb0baaced4ac848dd0bca3d469e7185ea8ccdaf3a00dfc5b94d8cac2e2808a124ddebc0a9cd8cf149b0667bfac04528036dbb4f712119bc16d64a3021b2224b87d71eeec8c7bc76fcfe73b379e88f3333de4907c37275f687716d9a800f20daa4c997d31645c607d68675ca11786fc0ef0661dfd86999f8f74ef0a725eeb0542322c8d93b44e88ed5f5c14cbe844298883328e3a308dc45f5f1621acbcdf07d6d9d50046ff4b9291c29da17ad852e6c9fff7fc079744c43f5e15b09dc936c2e0bec0b193e46fc554eab6141edf6ebb6f1c2850c2b86d7de1328168d452e7e5579c5b073a644ec6a7fac8bfa84395a61ca58ebeae4ec25904e434fddabc46b5f20995e3c9777b00a596ff5941b5a314f107ff6f998498b3105c4af87e4ecfcd8028f45f1bd153e755a5dad284d9378831eb7adbf77fd9aff89ad3103ae36a15c1ce0e0790779b831d41f1b46c3debb9cb0de31014b256bff1e762648e8281cbfc14d9d112ab09bc0797edff3e9091891dd1d3d4793a5b3e3bbff48c547c4f85ca692a119dfe7441c391631cdf88bb96c87b604bd07b0fb8371442a00184fb25a5e667b3941bf2efac804846f083ed3da56822580360053820730f2d2a5e1cee420d6dfe4d332c1247ea5289723cb85e388ce90282100589800d3cbca235188ecb2d5abfb570c7eefcdf22306f21bb4da8c43a15ba12e9c6fef7285435b27cb68220bac84e391cfe771155d76765029a419fffa8e816e5ff29a68bb06a7f47cbcdf1a26e906244fc72c386e659d19df4eee6d367160ffc2cfe817f29d7ff909da9409c3299e234f134d9973925f36629a8782bc9ab3512d8728bfb5050a5869224a5cf48bd69d2872aab8ab5adddbea766fd0232f4d356db56e8b160cf96d6091bd5d778e168799b324d9956eacaee57addf8d248651e818510e84e0c4405fc142619b684d7a877b1a38c0185e4e6868f2fd5127e053787df17b5c395912f398ed3bfe4cc71266f70c03669e832ffed231d0205a80338adf332aecbebd18f144d49d5f4a56df53125293588ae01b0759d89f9065892e34d2a3249b8b725578f0f3cf714dfad1974988c4ca3773b9645f4b3042aede71e7806583a6c99a23034a30b11d9781cea44ff6682169a7674707dbb1ea2fb116e040147c09b136a659859982bfd823ed02d1a0d76e31881d04d4fda5abd11ac7c1e940e47862d97060a19f6ac1d1e765f3beb1b1b2dd4598cd7919f7532b809a6868f1376a37775a878c70893151dfa0295e26b28d02fab07de2230c655b93b3ce9a100edff4de288ec6342696a19cfc94cc2050b7f9a31320746b098d58eb1ae658b9498ba464e22813e0fc4857c6859dbb25839130eecf8739088b15922b58b2b313d1485d246d45b01604d24f824520f8de195a1be7bcb091a73da2dd24c9b6ed7f7e37b457dd159a42d2ce3b583ed58a9101af5952049e13a48cefe3fdbf2742ff036bde3033903e4ffaec611e56930111fa57de20491b27aa3d0a4b9d49f2edb4b2cb5b2158e5d2afb85a120c7571e302ba8282c72a642dce90518040852855e0a5014104afb9ba59e99694a3115684d584e53c6b7e4b91da922634bdbd39989a78bd1a78a0b704d19efde686e0335a4b9a336377a61defed1df47392e3a7d8fb54e9cfaad9152f151ee3becb9d2cc120694aa7226e31297f075aab8ddff85b9e8d2432b0aa1b4f566c1d5450309cd04a87cf7fd98d1c32798e20ccf5186ef04f6855d1ffdd007258769cf503426181c0db43fc4475b15d0fbaee1a108caebd0e45b61f4f713f0930d4245639bf5a280ec5f9117107352e40441f55384d65219d0bd16581d84b66db1ab08ae02fe364143c487a792fe25ddd943c79216f060b26722213af273a77c71b116d472c1192ab17476e14329e91b97e628c0fe31cdab79776743d1b5502febaf7b4997c5acb7f972e4c14f29404729503c2b777798107436654ef7d587109a7c84cf3446e9acd6e02098470ca57d362666807d070106fe0b2dd8b5ae2df7df00af2fbb16d1c8b682c2d78cbb30a012c61381bdd4f4bb40e782be5f298b238a78daf7d7b9fee2cf5741fc874143a3b2a23009fe9c393fb07b9eb9bd47c81da68cf36ea55d026513e8b24e32256023bc25c04ff1012a53c391e0e1a9d67d9c0534ba3851658bf5aab9358e1058d0cf765a5342c1a22ff844093170c98a8978cbfe9fdd66ee2f0a5212402fb671ff514176b6e682476f99c52a3c92415b16bd0683f5934a72c5896f0ef8e66641bf57d8a3c32d439df35daea00233156e7bd0e0344472a5c61b12f0f56d685a2a33a930f01abdc5486afbe88acd708bd1d91a8ad67ff790bcc1c5182d90b3c773888abed5d40858a6772466cfdd615c939a5d05751c31a840f8527c92b1610199f8b805f49eb2f6357c3514edfe1408f15d80a279acac7b81bcb0573929efcc46028e010fd63da182b275f782b440f97ad406fc7874fd82fcef86e66474e495da746b66761335c5c4f91ea4ec4ef1e0a6e7c1d2b387038c9c1ec2f0a3d43723ac87a3dfb11fcec3f5237711eb51ae05e922bf191bedd7195701ca7eb4954e0ffd4b5847aea2b2371a1190655877fb3f6db2b2b711e7d78f94bebe7a13c80bb60fdf39ef3ab8a41f2320d54afa737544fd4c15676f3f233d66fe0a15d3359d391e8c3459a4c7d45832e3bfe9ed84d259322844b1eac42c4671c4c83682ee33fcead04dd9f7071e0c05141ef4696a34f04312c33a422a99c38c908ff288c82c615ed6547caef3ad525c159304ef2ef0d43fae4931025616592d52e74abbcd29c4f70e5e3f34bf518812f856996039a5d935a83e50c8fbbdad797b3b8f7384e32eeeae3311914b4c3af5ab44f571b951d93b4223535be0710107b179ff0ed2e54ea1a1ee0c1f16f9fd0bfb49067c7d1131876047372b088f8edae28743d1ba88db1446766ccca6da5920d8906e6efcbde6900e7c1258855c8beceeccf688c0fd33c662e299ae99d6893808a731e153388d34f9800fb79962ca0ef9a74a8436027f9e3f7e675acd04f7a229fb90a8528ec858f54f27d86470d41be50e2d0b7429287585650f8fd4fb8d6e59330a48dcdf3006fe6f42df93daa5895c58b88f0aad85750d3c334159b28f10d2789fc7b6da5151495b351bfacba9d93e095312fdacfd4ea0820f01862fa15eb854a0e6b35555e175c9943774f597db629bd819b7f9fc2739d0d05d7d4c0597d0f47559d1ee568d3b46636e84bd8655bdcc860b8bd83b0224fbe0012e65807d11f32dae38386ca685f7e29293597898652db252be08133dab4e135cf51f8b0d673d3044c609745ae0f2ee1be7424ad13b7c9b1a4cee828ae9e42e67eb6d788434332ddaccc39461482d2735794e83dd84a3a06c79c5ce6890c6edc46a5c659526ac61918080ba96aeae6aba17f6a7251abad39ff239ce1b246c1633c7c3cb23baaccffd2c14e8166e592464bd52af8692854e18398dff5dcbfc0b13bd5354765083e7f5512ae0944a682c874c85b4daf0bf4284d1192523b43e31c138d8d539437ffac9ab1f7b87554de81b2d0c6ec325da31dbbeb0a02bfe7aded25961d104401c59625f4527ad3c6387e98289a2ca2ece960d8d17d3ef8898753f09242cc7cf4d5e1c012efe7c2941a884c974138981f4459d19f2bad9e635d80d4c5155fe0da12e712406861fb8347af5dcc60e58867b860ad3824f713fa41022747387d0da1f4f973fa1bf65ba4fb4c805b9ff38559535c40acc74ff0cd8d60534257c668017bb041944e37096243ecf3e79e479938175edfed4a14432773aacc5a245a96c1e5fb4e5735bb07332e6774a36fea31dae9f471c1ec818677345c67"""),
-                    TestUtils.hexDecode("""
-D46F4482D570F26C7E9F0F74A354174CA145033097CED3896350DFCE8200CB9448F522B118698DAD51F6C672E1B12A412DB6B7B95CDBDAF6205DEB631E44634412F026CD95440258FE5F0C72C5F3E64FB3FD13E545DD856EC2B7F51AC28C0D5D698C66C700DD3E409BFD96E14A9DAE1677ADEF2CA2CCD178B826AAD3859E569541561073095EFCA329B5B216563D956D8B7BB918224FB479FF7025FD8168F54D14ED1FDF0B399130C6117B5645D0E8DD242C3C7AEC6A8361361CAD9A8FC3B5A40BF7E73F1BBA9AC7F5A583A5B0EB95AD0AB4C1360D0145FC2C3A9AA50186D649B72B41DB7EF392E663497B3166AF9BD0C1AE21650D6CD04DD36532AEA0FD1071D6E9554CBB575B2C1ACEA3DD4E18615FE83AA211F8AD330C78FD32D920ACB40627CA4AC80F840A64C019124079484B053F525A5403383C21B164D0C6BC1B462C0E1C269A1EA0B2438FA64934CEE47149C4EFF566D9C2234E656969C1C89A0B0A4DE124EB920FF534B934172686A18A1A269960C725940D3307B8A913D56B78A6CDCFD559FF97E225B61AFAE7F62B060E7D3E2D4040D8D9233A24827434AB4EB31B0D528CB0085953D9A1A0FFB748588A2DDEBF241F93B41F5C856159EBBBC6571AB12F4EB534ED3C624CD3F5F836A99C7E6E2FFA0369654A5C07C19D44BC9FAD96983660E4D6F95DD9C38D84DE11271D23A6158B685CF050121425AF91C6FFEFD0B2061F54CC4393F99857F3B9775F81B6526444AB705F9CB88A2D276AF2F530B646FC3D93DE7087EBC1FBC7F9A8DB3F3C8FA186F7B636CCEF99FDC4532E54F560519C94B79B1158D85BFBE23D4F36B64F8056BEE7558252DBB3D9A43748E2E6A338162F5E2BC0934E89DC79091180C93D340D3615F82E7780FABF782E5FE2B5D504F3BD1874EB5DB76CB616CC034D9B2B080319FEB8EB97F62FA4498878FF049FA97C56ACACD2414E0BEF018F25A6254448F02E64815E525AA06AEAB53969A66D453B732891E31C36679B5C0A4637611A5983F21F6D4ADA1DA5E890C909A9E968F947C686C17EC73A0F9BAE5C7BF7433133F35F22D2A0B40CC135A7591E2CD216F7D8018969940EB9A5C4BF21579C524C41AFF5DBC0E141FBD02F1BCF376DFFCFBD06F9CD4384E128CF1F03139C853CDD04DEC61EFB8F1DF1A6450E4ABDDDD8A9D85BA79479562A08CDF06BDDD2E740DE7AD9AD1016D72A649A73246E8DAE183AFCD6FBDC64B6B6B2EFDDF525F3B764CAB39BF8D617D47FD3380B4A30081AE6C3165E9437B2F37A73AFC5E596AA626FE5A32D8873712F99910DADD0DE296577D4749F88639D07F83B0F6A05B1668D8008EA749580EE5A629FC2313FAA2F8ADDB5764B242B6B595A39AD76CED4CE5BC34C580069071BED1F98CAF4BDF740A5B1DE3FD30C29DAD808537CB16D0EF22D937F297F50E1681C898375FE0374ADD6EA1B84C10261DBECCCA8E1D224A4709497CE696BCD2BC1369F4135E815A781EA26A055DEA28AFCFDEAF6AB1117085EBF6B8AA6845FD4763FF9274BFE5FC6E377B9F9DA8263DC1F3D53C83F446ABA5EEA4095AFF91F3BE30022B9BBC2C74FC52A3B15CC76F29E541A84C5BF42D499F9B5EA134E24F01E8D866FCD20B7F7A302120B13DE636F48FE8EB99F17ACC153CE4371B266CA61D13E19793CBEF12C0EBA9C728096A3DC6A6750DDB0F52E3807C22EBE4DC6B2407593A1B7BBCED799DC3EAFCE50B483818D903765A63FF572F5D4481357CD6ABD89EC260417306DA1CCF71DA568240D4FD6858BB7833B2C9C98B9E7286FA491F9E318F25D0459071848BBA0D3DB8D2BDDFCB7B8E9C64ED67B4A2B5E1E49B55C6DCBF93394010A078E6F52065AB777C7F6D831DDCC115CF316ACF3680BE8766B4E15574AA383030EDA83CA45B965836FB2374695B50472C4159CB7980FE48B58B40C6CDD2629FE3C6DE6E13ED6728FCE45024C96402B78BAF37E74A1C071F4BCC2A1B84933C872FFCD87C02DBE65438A3E770903A04DF96C569FA69828CCC32D13A0A419FCCE454F06EDE43A97CE5A9A169C6E849F075C66BAB418791778ECB2C158FC19FF5927ADFCA90BFDB3B4216E19BE11157E858610BAA373237B42F811EA97EEB93D735828B2ED092518160A2ED894BB108AD74AB0113A8D5882D99A06CE2313BEE3F902D5CE9CECC835974A47FCF6FD1648C635FE56D1B2404927C49EB53FBD625E0624D5AA04D6C0D5A082C37BD67F477850458B8672C408CEADD9A55CC268B75BC51D7B3D75668D52BB701BD980ED22CC20611EF618277B82624A1192287B46BB5C4468F94C68D96F3CA3ADED476A18BE6CCED70924139F2E16C8A54FD6C9F6695E624499AC8E9AF86A430AB856924A0899E75C1FE4A51DA0DE1588E66044B2465C04809272B2A5C8EDBCAE42B47E439FAE06938810526DDFF4B64C515787B41885BE369A31F90E2D6F6C71528412572A67DF6E155C3705929EB28B80DF15345E0E32540BA9AB7E1D1CF0C015E50C9180372C678CE6C34BDACADF45B0172A1D3082565E16938F57CE6B55D9A711CF72E362A2ABFD45B7B56D48E89A0079E973F597D2E457EFF423E229AD439C3193C264E0BF9A8A1FB50266AE4E0BB671817CAEF10A3BD43452A2FD2DCBB2481D63BB539E0C81F6986400D3A619AA92F250ADDCF661FFEDE7617162B532EE2088A87F58E1FD071F5D720FF1F72335A5B4582F1BEB3BF19DBC9D51A62CDF68A855F7F6DBBE5FEB226C9918E7FFBC8A38079E411EDB44177F843EB8CC1F73B9765A0EAD825B3C43F6760B5F03BB75DC7469701AE555C2B7037952180255612DCC9CD35DDB31F3A9218397E1924791D29C410D2E4C3F5549B7EADF75045EC78D579EA7948D121E8297BC5A3A9F7AA2E2EF5776CAE3B9CB73316170F9B48B657BBE365B352A8129130BF1E718B386AA27E493016ADA86C4B3D3D116B7252A747FD50DC14AA28676F1C25150A86C9F4547189523280A3A897F80FDBBA073EC645C9953B7F8CEC3BD08BC0CA5640545B08F728AA38A860ED38C068F0D"""),
-                    TestUtils.hexDecode("""
-4e4fc796e18a11fe191e08e2e59c8864e0040297897b07d4f62d8a003c50f26e7a6e3d6aac87899b27b308c206efb435b7d48b32a6384e6c733ff5f47bb86ab493d403027cda502831dee50a116708aa01dafa83fefbbbb7aa7411ed417620ce6b035cf27cfa6ad1cbe7e1979f024a436a39fb6a6db40dd21ec16b90a42f61daab8b86efd38ab87121c17fa77bcc761afda7d9196de6d6e4a9b45f32d9cc64ba40aec6c9ec42a4350f841c1e280d60fb1382540f5ea25ad4e7c72333d4a6a4c911a9bf142062a50c2c7f61329ec502e4b4295409392facedf088c321929be05caff934dea89cf0f13b771bbb7832b956aaaa329c666e5582d3e4c51c53bfffe1502559c542f5cd0c6961f1a8a6f4db4e109818519c85f781fc8b81ad4db1a2444016523d79f33b9deadc30030a453bf9c9f48b8bfeac3a563038544141ae621961de26af46860e0d80d4b66bb47607a559dfc34cedbdadf7903ae4271ced072c49c8b91aefac658d1482c913559325be77794481ef2ee6007b643a27a3eddcf29a89237c340867dd3a8bdbbc0a1c8d07586fbc8c3bdba699f08afb44d728376d12aa7547912fd9b8069d5d699773e426f6aad6256853c65a896b5266475b283c17e60dde89a3b79f6b8c262d418b219a9aee8de0718f171d31c24a632e0f9db87dd6ccde3e295241a1f85e439f09a8e17a8cbc8d2e2c5f68147c3cb0138a6b386d42652efcc71315ffcf218630f96734f0c93d0f7ae946a71ba6939401b7d60f9fafab00021628408c3cbdc4c25e2eeb9af29a16871843d124551a4437af15a6042a9b2ccc227190eb7b22eac650a5ff9bdc1bbe867e0ce4222b2ff68d042772f7035ba911f2c4e3f8aa094290584d3902e4e1416f11c313efe437128761e2c9bb160aa58be7f2e3b821c128d69849c6fbd2a4ea4662477491e48c482051ef8f9e1c62fbcb03ea8fc25134e59cdc995575570056cb57fa0460731f3a82af5441759ac4f7c1ab5f2b2f5207e9d1350e1d47cf338c7be3aa05bb9ea4ea2632eac008ec50d7980d681bf91d1bcc583332c949674cf42de62632fcfbed112da44fae1845ee2490801528dc5a9f14f226d18db70a744e5bfe097ae1d17d6e557f670998317d64b45be39b9fae81adddb53aa5c451fa9d525d8205adef6bf5a500adc87a0af2069db0da6dc56a0a8807cbf19172bf8f96992c3c0d2b4e83722463e6f6a702abb058c0f868e9d9080760f2c80a1f85e30018642c3c88b1489145de6d53d27ce3c9f1765dbb459e865d3f8c05afa507d6421f303080c77647486a0611dadaa0a9a58d83d0859dd57b492c941d47f97529d962863821455e52415a231e3704e8d208c15ccd4a1e5cd0c2b434bcf9f82495f0d94f3c91d1cb74cf5da019d0c2a42fd45580db8545366a56febec804a944ade29a2cf87fe5772b3c969495e304c6a7ec148651ee93e2d894342c830849db83f40d9908d11ab2c919704ad55c74aa968501a38069ab310945f0dfe253d1f58fb8dabea9a8160a9fd2b5a0455b6d899a22386c8e814cf50c0aaa35e4b0420c59c339b84332047c9f193de73a9cdaa6463ed2bbc81060a36dec8b10f002161dc56f2085ac03475a6ed6f7ce9695f8a0f4fc044d2494d632598d778afe58221e5d435491ebdc30c2a719f90ce17ec6aad77df11b50232bf1d4eed0195765e3d1c636ae13f0cf95984581fc24a699640ec5ec9374588f8d74baaebb831c219b4df35b73eab7e6e15bd5a17a2803152c0053f3f3aa8096facd15a4ba1d2e0d90300f548180cf9b9ffcacb0cab9d6e4877f7a63d2ffda4d9697149b61f8ccef1daa976f92889c3090c7fc5c69bd87cd39d02d2de8ce16c6eaef9ca623872cf4f91fd426eb23ecc9457ff881da1b25373f1f6959dc4986cb0fbab15f7ed3497896621dd6b45bda78b7ed75c7d38cf7e74443a53ffd456ca84ee9070421b796285e023b5165020d3dec38078e599ac79ab1eda37a09b67d4e20fecf31c0244846fe3ad9b5ff9ed2b2f1400b7647a1a12db22bc24a2a5f1becab6bbd4a911e0faa4f4758219c19d970d07c90efcf8f3de432f526082f73b4a6e6b9b048e00e9887c164a62f3758b8b2a7d0ae30ade451fb5b405fd3a7aa2454a70ac22af75b986e03d8de972814b25ca0ffc3335206d30a7b748a10ea20149477610874348c07fd45ddf69c65d1e1854e3eaa00f6e6e0018c7238c7c311285f1ab9c876c52d212781006a8300bc2ce4c3729121b8b2edff63b99a29a8bc8166351b84ad61b66620fc7d0d5760b6409e42450d5fe58ceeaae5abfe937091d2d2d022057b2bdbca1ff2c6f1413021611e09b3a79455aaf2512c6a3d2a949e45db154ad328ef646db243a3242440159f05ec72ee2f5cd2eead4885f2d6dfe23ddc70ecccedab451645e61b17e88cb39d6bf1f1600b2272e3fa523ee9b570e515d59c8e04ccda564ed5ac3651d206695a0b8eea30a097bda798645d6ce20164a2cae126154fb5d50ca5749ec608db68396d9b6ce620cd8d78b701d6f9dfc701a7900db628fc9c25f06e41a70ba6e9745c4be3c0c9b0913d2c584fb2630582cfa1d74fb598515a104423124ed855a9a900cd6985eca4fe1a921a43188fd87cfa5e9defc046000641f58573a70222f6bc22462fb959df93d1d5c2a2266dd4bb01ba465e4e301c26cb9f49ccd87f92b5d92a30c4e7e4583d95a38ba2fd2fda90c8beb60ea9510a43608b817a51b3c5f05275dea1a857e581cde0a5751a334c9e233353a213bf3f7fc38d6843c839cc06df3c6e76b4b6df73c9aa90bc24196f9668cdc2df584aa10dc8ab41882a532bfe758cfcf16f2e6d0e7ef2fc900a3e5f3e261b4062b1fa3aa49422c7c6baf56d0120710459b949ce7b21089c02a14d5907ffc10c53557477599d59d83f368d5ba349c3f3693da678f2764dc4caa11a669e5b703a97a908ea7abb18175b1f208e448b1b05f1cb3deba9b4f244c5905f4659c51f0152aff9cab8bfffaa61a98150425f14acb154e4db9aa03d73860973750377284c275405d726dd615802c8f4738799fac49515f8c04a9b2fd693d083d3ace8b5e872413767114fcfd32436181f30c25621bd6e808919c0abc67fba98af581aa4383133b47d7d8fb67de035f65d507aafb8e1908c8a3ab305b0b40ebb2f70958cd69ba48c3d0f94807f0159f3c3205affad6b2e48fdd54be8e5a7e5bfdb3f1599f62a52c11819b0a7852a3bc1a424596c4da3b1ea7e6e7989d3c403979263424397ebb5b5a739137c1b3d1566ead912214341ddae970955904d9a5e79a002e3cae156694cd895873fa5559a7a9d21f090ad77d09471d0d00f3ea2238043fbcb76e5ed947a3384b05b838a796410b87971f95910bbee1c6815dfc9b3752382f980d48db75e28ab8efd094046de4725c802e1c3de5fee6503d383acc450ca7d637a1b5a68d7f099ded08791a3e845b0a8f6dbad10395b76745a4576bbb66fd6a8750a83616fb5dcedf961c2aa6d90d602d0526974a93ea30b26b01245c74ad5d060f8cdb3476e2a6c155a676ffe0e4939790daac867517a48271501a702568e7b349507db9383f6001c596077f82458291ec65813d6d7306e8a83c36d76ccf76e7531823e8ba7becaccfce8ff2e25504fe2cf86434d81a43b28daa7d479ade72e302f82030e240bd61a52b84b372d460d606fb4b2f649bdc51ff2cf379274e1c6bad82b5407516b792d7c3cb6545557fb2db306945dea8092e7ba6d033afe77833375214c816a4c463374cf36cbeb77a12ff095e9bc4631a3b459273bd3494b1cd49493a712bafd08c6a4d2c866958fbb773eed52f7398275128622b7436a39eb724c28d70f55694cf22fc3ab311653fc7c210265fd6eee872add33250ac495a2f54c9bb856d1ec8704c1c9fe0208a312ef3a08445ce3e9b4db2ea1c4b1ca4e79aa5ded13ac3c7fb69612e74255e0e6cc3a063d28b8e883fcbe3fea5db704e674497fecf7ca75110199434d79ed8102c510d732e612a18a8ddb3384b60f19aceb88e4cc35cc4af247edde5c8b26101db84dff825f9878761a6e96e104303441b9954091e5406aa9cf5d8e4010b4c075c374cddd31f471f694b3b9191a1f3d7e399693e235898bedc55628de4fe245e59fb02ca5fbf1944ab74e2783d9c9fe59f0e6f0de1b2bd70ced8f5e87c732c82bdac560e714546afa3836b73ad16373b72eae416e31b2ef999b2f3fd13f6f52deac065d0de6562cce840ba490d7fd1121d8fc66a53a27d3cab9db374e5b96d44f64b11232b2859df9468286f268bd4f186d434ed3b3c807cff498d1140d7d4b018a03b7b2b86be6c6b3a76a49c94a821989d2372744b1ed2e93e6e978c9cdd5564104d6ad141415ebd06a2559887af6b20f6b664e0bf7582d0dc1ed3e66661ceab0533f4758ca9d9c20211adfbb18a7eb7ed460539a48a131c59ead08680e8723276c1926a35081573d4e0c057457047e0a8e031861e5305e04c0619a06867be34f58200e4504919916c0f85945d19c7d2b2fc20af7c058e5f99fcf83206607f561e9619219da8867c73c933896e24f55363c0deb0d258c3f05c3ad71b3c03e2005145a6d7aa4546d53dd24109f20f902f7b77c8c475538788d3c0d0cd7cbe07706e144ca238c08b3f95672b90076ed237212adac8751d335320d2ee0ae94e95bc7f5c27af3c8da67b8b5d3630c7c6d006ae3ee184b5ff781ee470b7a2a9fc87f5d64187538100fde4bbd67be7a2f9c25c4a6f8e0301595963c280457395883a80ca695e98af29f0ecdd33dc3b417d09d0b2d01c5e074cc1abaf544ba9048649525f59ed02df6b9baa0b61871c4605678124cf5fd1dad07e892d2b8c0b14c0a9bf031493aa304bac36ea200f8247305394bef54f4608efad7435ef3ed5d5f5393225587e1ac3123dc1d92ee383e17d74f0ecb1bb025fdcfdbe7f2d41d0708f1ad2f766ebf69f4933ec0f8ef6f65abed4d883a38e0127530e8fd6ea36bacf454abd510b1ec49dc1d3bc31bc7d2b76c949a24cbbe7f676ba4677e19198d86ce72628e26f56b7c595cd07daaec87602c78a7838ae0d7d03a8ccaa8f90fc2f9e4cb9555d096bdfeacf4619eb3562d91a5414d2a5ccc90b565453f03a0f08d4ab41e6542bd2c687f62a9f41f348a7382bde0561e7c03700b0102962314b014b83980eb887783858a0c2e7818e7c7435a02c21a004360f29097eb414eed5ad78084a1f3cce2112639ec7f9ee6efaf166b3e31aa4af7925e6866743ff8c22d865f28ca97e47a3c979d0c2ba32eda8f862db63e07acda1757c8c7aa4b61d6011f5169f0fed9638b3662af701e486fddf0d599892d4215ef4252dc3248d9fd9f5ba3b5fb3fdd9ed601ee2a1b2192a5e01373441004841190d4a3b44eb80ead8bfa9c541939732913eae7904374d288645f4d5832691e338c82e2fc2ced10cc75e353103f383cdedb81e22ecb341ee19e400451ad3bbf0d10181a796c3063c66b1db825ea00e197d7b41558eb05a18c8e2accf0592a331055d5d09e436983efca0c334919d44f5cf729a26dc9c2abaa4c9086c7c0bded5814de50b86b86408473172e0e90d5d32fd6f93621a37abe618ccb7dcc2df0573d4006bdc0d832156c82735bcfe95527dd6b10e71f38e8b46ecddaf6eb7175879b7f843d821c7edf653b776cde1d389db91c3333a1c733dc45ead2f72644e125e4e2c7694dc4a80b4bb594cd052b470afa7323c5d9de044e9de8fc307512df126e794fcda65d4906ccd8caa5607eb203d4d183569d9cc530bf8db3989b331c7b4372ad0514614de405634d8cd1dc603189bce42e53584dbd7412dc3a7c9fed69f194bc753f45e24a289db30970a9a68245cb62196cd8a36a02dbed39edd9c40f4f5e6412ea5d9ce4d92505112f6dfc1fc46d0e83916693a35e01deb29b5c0d08c9ffe75aabcfb9af18c35e04611429e52285c5936f782c11f2b849280f009d83911bd6ed58b7c0ec9f8d822a538db8492e5f410020973536cc460861e41515c2e137d1f373e6687136a5057903e1afa8aa7700d5e39a23be933e972dcb1cd67ae7edd452dd3d229d957c5822fc1846175d48a5dd25adbe1963048bdcb5ebbea8bcac5498e7d805a0746a95f6ba9a8386c387d4ef863c424d62276a90c847e9019eb752ac6d844e0e45d78aaaaf567af013c3bd313ef23e06f4fc751537561ba52f7ec15cd460d8ab9ec917e1e33f175c3c1f38ec99a09da921ac62dfa458ef2d0d15d4669aeea8d797ea057ccc86431b4010f56fcaf4e7894b97d542bfe0321886333608e9d56674c8eb885086e9f312c6926713ad129c6faba2b764e4646500b72ad52f4158a071e0c0697dcd50bbb17b4689092a36bca28b1c6c02d39dae78e2484ff6b00ef8b5311cdfbfd061884d23dd65d1b0ca4a9aa491939e13202b515d6c709ed4eb0b86c4ee45484f84b2c8d5ec485686999bcbe0e746acbce53977aaeaf400000000000000000000000000000000000000000000000000000000000000000000020c10181d202429""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-dd746786f61c3e55ab5c50adf85106c1e6b427fcd102ca6495b52558626a21a47f456ec45fa057d0e1aa9010416f9d3e8481ed052935217b3ec0baae80beb73688b4f772a3c3ec7114072a3a9ac5e19a0c32fcbe7331521bb83ce5560700240420fedf21d515a4b69121325116da94da0ab9b51f0c66fdaf466baa0ed1d354a51b41685942056304820103911881001a1480e04251814632c894804ab80121166d0ab64d04a36cd984508a462503458a20873059a02899c06c510268da865140982859c48c0a106ec0c42092b86508363022126cd144254ca2095c0062c3968cc9a80490029103128d19288dcb1448184784633241418670c434925a322e9ba228038905dc1880a0322dccb22049b80861a00c819044194680092345a02231012221cc00122316001480401c46400142268c027198b84004024ce098692425895c440999a28460182c1b898d83b08d10a50c120466c99004e2860949080d1c08410b49219a022e59c42d212770818664c90624442440d8a448a4c8400149655cb24410c9081c4664c2a284001668a24644214404814825c90021e4801044368ad2b00559a82524b391e2c229d4304524838cc9162114206989100594009121354dd4045012a86403418ca21865a44421e196309ca44c0aa210238984d8b82c229600002041db328214c02560124609c985cb32115944891a13429122048308491cc621d9c829880245e3a60990802554042cd80465da066d03060a01c10800173200206a5ba4315412254bc2240b089000242d83468e243105a406658b285103264ad1b42c5cc04c09a18180226c9c98910a35840b868d44106204b52cc8482441100c01846004b065c1a86960882ca1288d94b265a1c20123c369214721622042981489212962228500540072594029cc0622cc342091866902c889643025e1242cca406c84a48c1c1321c1924dc89209e4148908b121d8a4011a957048166d01190951320c99148d18150a6314688b44260214469b140d922822c0208941a86d191220492806604209898888541085a122484aa28dc1846008110414c60199c80509088951440e84a04d21a271a0b02c03282c894880c43011e220881b1846da36241a499220a061d3068048c00488a0299916042123402411690222699914925c262c48963192044c08304e8ab67104216160266c03456e2290618140051c049223354d0b42500407924a306551c470d91012133385c40806248640e202498a8289cb08661c3650049844a3a20c0944250a872d01c6485ca48c11931184464222018018a145d4120a2147605910209b9605e1288213854412a28d1c930004c065e2362062b4601282495436704ac245a0a801c4b631ca82282201921b922920a925d8348658464d110449809668cba484e398500b470288020582a82cd4b820d34231caa08d6222890b236c0b87211909281925128c40709a2808e3c851ca867059148aa248729210285a0812c89450d1300022b8654884202490082396116128001a460dd1b0280aa14104044840c045539401414832a19421dc2686e0b01019184888324a09026da0a045119429238005e028255c968082087220a3910b0452c0b04124b505d8380148126898088c6406301a842c53c24d112409422264cc0602d00869c4468d0b366a218649a114301a95704440128b286cc0388edba648119881a2b2702244690432685484289cb2451008720005101a881002250510a2500b35724ac05050a2811a1688cab8205882610c152523166a93107053348a00438ddb08328308094a10080bb98103c3851a16319c0461e33809d8268c4ca041012591d9925104a6688c8024dc4886142310c2386a843289c948450c128ac3826c8448221c09801c108d19048804373022308401285024c561e3108e09322111b404d102096148128a866513a02562162003194251122024324d183666e024614116888a46910bc24802368de0341058046150445150b689a3a091d4c488d1b0059016329b48654c100ec9b84d2096809a088aa3168a930084a3102418c54599808488841118a7699908604b108cd40608a4c82044a0415410845cc06550424d10379104360083c4404b448d9ca8400a876c9ba4609b0211d3b209d410891319058212060b2551a3c86812a69140b6005c862ce1882044920819b3101bb860ce18425f2c44a094f3f95c4b2b11bea59d00c8adcf72931628dbe4a8b1c4aadf1bdd97e0db31ec98e63b76a8fb0cbc0c9487e76ebcb198aa0fcb2c82162ef9c980e437810129717ee8f285a8b6fd0dfbe360de8a006966c495c560a1a57a41cbff1857dca6efd5359e3b31f5dbc8a3d79c6fb73de995b77fcd5cc359321b18636392ce1a9aa47b7ff9fd4deb6996471ffb7d34a1afc3cc59a1b8ed15cf2b1cc1862de68d421a7029d79adfa9eebeeaed25237344b0a05693e4a61370ed3e08c4f2fe844674ec64c70fe2fecec799e3ef09348b6bf74de004098e6fb5a8351f4749fa43a2035e443e0b5f1bcb0db0ea30958c417def6e6111a68f101ad11441a758fb8ba2212044b7524041fa12a417793a708b31f7e4ebc8850616143efbb9b1db20e8e306a05fae31afdf6f1a5a389cf8aa3e17befa6eada3d231186d7be8e076b3dd72345fe539bed1622645b75a7cce268753e95974277f242d52f70e61daa57a630311d7f709d59b782445cc3be2509ced95bc4ed23daec3e130684d9ed85cfaaa457b877a940786ce854e9cd0d0f87b37f3683b2cdc8540afc14270a5c661d3d99f8dc978e67b57b4792d4626202e8f61be355aba47eefa5a3e55a17b49eb124be57836f27e5cfc0289d28b2c3960eaa9d677a0d2698bb5bb9d3b53aa48eed8a828ccb71987bf65e443c6e38f5f5bd143bfade0a1b48d60ce5f0ecff2029c9122bfbae67cb74f956dc36d6fe9a722b24e6aa2cefbf084141f725c7178ca5e7892c076ea64ead689efe46c7bb64d825c1cb567e00228f1ecdb84c9c8c5f49508addffe58830981f2f57bd88a3c8962eb4b22195bcdccf42d584bb878d10ce5bbf38ecefe75f285f2ab3a594b8a3a12a889162d6a45895db914e99e35884c9b031612b2cc1e0bc552f49142666914454b1069ccb13cfea0e30b7e4c978aaccc77db7049db19a58f0bedc857d869ca91bfe2dba2fc8495d2c557419b7f92a1db1084321a3791b3811d7ad096a121b338c15dbf494dd703f7ef85b44c445f6e93847039da73409ef04c75ccd4bf524238f4cc2ed1da38198ce8a20a1a956eb078cb59309d11eede544c36d273ad18ff32234d906ff357f4ad6f5d85fd8628d16114cbbea2810f3af8c484681354ff6bba268d5553d1a2962672fc2eed27f2e77fe47b96e11903af01c96d919322f533013dfabdde8a3e94f56bb8377ee3be1a7583142655a49c52eee7c7503c65be61ce0ec04341a71187acfe329b2ed51678a7c63f750ca2932bef1bb60dd7889f4e0565e0afa105b19918fe47e57eaedd6fbbac2706a2de315416d54874b065958df969d7c1dade1e0b615a90c1f2708cc6dc27ca66b3d261f933407baf18bb51736941628034dfd1fd1730421dc92ccc7e29b87067c17a03d12a921eeb642a7705d9abcc023fed08a34b621a265262f706f13b7accd54017acab57b2bd7813c5058abc6d1c3e393f3cb7c6c2be70c27c3bc2f7cd01011d71a9a682dfff4f7037c2db2006bf8c30423b3e94298075f7bf7ceff8453143109202c93f1dca8d5d60bb276aabb8ee2dd07e30e8a720abc5ab9957abc3af8c478e8b5ca2520d81b9d1f6bdcdfc588862deb4c67071f18d90a95f3d4805a8e1d44b8590659096d4f7cee1df9f55f137f05a316b293b36a06f4a2b66d428ba141d45cc0d85abebfac417a56933313e9faffe934c9d930de5b5b1af5df86881bedc6691fe899ef9c1398f0ebe790e5d7ac055050f7bfd319e151aeddeed96f368035f82114a85aaedf5068f81e6daef4430d4e4a1b30703278cb3f72f370108e78649706da8003ea913ad4586ba821e313aabc5fb4abf57aeaa53a641f8b9ef2c1153efa20916d3a1ede4580e20c93b50dce1bfb4d08ac6c4f1e7a0e1a860b809700cc42e2baa77bd691757c7766a61d535e2710d2a61f25dbde1c08fd373400b733a7734f580c53e3460ea4ec5dbd7a628b237032888f665758c38a17380c4f29f848355fab6db832e48f1c64ace6d227f783748da451d080a58bd4edceac5c1318c17c9780a3d7838c9977dae07a24f5414911c519a52659640d3ae703cb8ad7a8f3ed7b43e862608a4fd54e2218acf43b1b8c0d0eacf4e019c38ba7474ab4f614d3ee034b5907159a9a37c07f74381f66efaabb51af473a271361c6654cc60f3f992120f9072e466b0c0e99f95efd64c9b56d02a138c66f558efaf6e7118659bf14137eba0e72149992e88689db0177e099b3eba33c4ea14c74f0366ff699a45c80db076a16390d64b18168a03afdaa0e028aaf5e96d9dc9e300c2de01471dcc3aabefc758676895609fc53b7d49a3cf7db81d314f295955d3a19dcf279fc8ced5c4e101df8e0d4c40de7fff3a1eb6811bec0c88e0daf9306547ec320acbd1b2221ea016a4c21de0d6729174fcd2939ea354f16da58f69a911cccc60bc9189d4a98991b20a3279aa560971549f8406d7e31bd393730b7cc2837b228144876b8327f4bd13c59f46ebb23acc80f3763decc027542f9b939331baecc47fb979e8044ed740d5c3202df98c46b387da579373a9e454260d96e6c6f40f8c080506a08c891ab9be829b309292e8d064297ff9aa1c1360a3821317666bc8ae7316e12642836e17e344c063ad9c5686bd6dbe41bf87f2987cbd75c0ac83ce63ea7241f93e413b78eb69278a062b99dd6dbd5e76a77f47eec2a024adc31f50a2c76049f93bca73caf5f4956dca7f52e758299589a1b985008ba07d0691e6fc6dd430dcb099b0549d3ac09a941f89f5f5f6e9e45bac41c197229c757d1d56d3515e054074fdab808377b68cc1a2d5b115411df06a8e3a0c8191c2b078d3ec29d1e17c2ee657e7ee63fd9bb120aa97e5fdf1b6b01b5026007d7e65934280b43164a9cc408281d2e91c330f49aee15d5e5b2db0d579e897f80d1cccbad5014cde2e1987e3b5766a926f875457088ceb508a59464632a798a47c3a2a2dd15f7558f26b7c750405f90ce2211dbefab598da23da68f00820eed189eed8ce73ae9845ff79be89e3f42228d53defbe2fbb8de0df315e6d96632c81f6f455ef87e0d2079f6aebab3f5b318e178157d5ae0de7729ddfaf8a17c1536ea9f05bcfd01d7d8992cc7ae7be182c8c7c6529f381615ceb8fc4cd39e3630445a65575159727e56bade8c331b9579b42f9c92197a239969825ff6d7bbc1afc517efe8fb48b792e823b2c2a34507b137d8d92675ba19ca752fc102c652536755411f40b2b135daee04bcc34acbb428541ac894e52d02b29b5b33ebb46ff4a499b1a5a143181f8b143ae0f0f7d47666c0ba7c058477c1e86d030a384c1a4eb670aa4e1a979cae06b60f3f53bd69d7cabd28554adb61666e1722e17b32cac684ce514b8b8f497899a27423c97efe80d8d0c157b2d34ae04d632cd7a5cafdf3ca06be5db51b478dcaafa0dc9cd0c3da2cb98af35361f8cf659fd73af41f536c8e50f940908507ffd8e99733831e1858eb6046348cc85b1067efcacbb157da93ea757af2b9bba0c22178ce1001a57483e30774bfabe3116225613eb5291936c48b2d0b5273c5be7863b677c628dc3636da5ed2fc4acca2da553b2bd0f2cd4ebdbfae4b5782c2a9b0f62249d1c1fa04b5b641aec8faf451a1f342a430a0b2104064dff17c85cc7ad8020cde6bcf3fc4d414c2a2e98d468a02f4f4a060223222817cf2013e24404c441e448b6e88cb8fb7420281aa007cf980cb7bbe1d9bd49f3e832f5ef6e8af20b1ffc9d63d68862ad5582a23b2a568daee6a3aa368e441a477e275d917d53db06285c56864d9e29ca08e34ec9ddba84b4b02fe11148fa01471cfef24f37f697bb9ea0f81449bb6f81f3c860a08efaf658c5bbf049691e08f5be510d88f3ca1ca6fffa4cf0890731e865811f21d2daee7ea57ae7cde041963091d7a8ea7d47ac649a72a9d1e1db6d428acf9de800bce90bd097391d281ff0d18f6faf4fd7e1f47411da694f1ae6f38e68a561a7d7a9e8bd7dcbec874e5946c63b5dcc707db8a32a7e9d6e6a642430402304a7acc5b4cfc4a7981f2187f7988b78601d9e45f767f80c7af2bc102d8174319ed108745f3ab7bcaeb6d5e8ca7d1c466d214871ebccfb1386d4e5e7a30be8b85a447273f6f14f9d6c2f3931810bfffb1648514b245f25ae4b1c2ae3df9dfdfea596ba3784e937f4ca2d1cbbfe09111b753d55c22149dd41efd2807c349f80f18aced772b3178f1c6ae4c03d36319384c8bcd061e881df41114d5b26d4145514d52800fcae2e72eed53a86164a69b72bb48e124916e3648d99813a7ae05f446373a1a582d21426c3533f34503c70982a15fbd9602ac997f27588d34ad16821e6f11b4903635099c2ab02bfd6dabca6334560bc6e0ead7b2205f483b0b032ffdc8af9332978ad9657917897e8666b1835938553188280dcaa2c704a5eef827209a1089c99c8869f23db2c102589963a70e85fb0f8ce503a8b9f5e0aceb65acac58acafe6d82d3320a5b828b49f9f21061ef74dea4262fed180b5f88dd8d8c1794c19e01e3ea26bd6c31f7befccbaa422138809ebda613d145ea5ad67008a794db89460face27a1b0b715be9b21abb14128d7c7aab6cf2c646ce2557f692c0d063a265e3e8e91f0ae9e4a8615fffd8c2d84d8585e1927bc50218381a8df3e976e73bf8bb3932598c8d89d67b70e030e0c6ad710a3d79e449ea1470"""),
-                    TestUtils.hexDecode("""
-78A2B7A4C8441C36E0A9831F65D41773FE6B81B3FA6259A320AB03D460D7E38F4AAB2B93C6142FB0F9584E4D47074670B07F3CC4513675A4367EB8F7F4168F2EF7CA26AC45C8F23B2FD3E970068F21D9A3F7EAF005DB5A7157715CB94F5E83E3C955DD68E0EA689B6F419FACA7CD159237085678FA5883D5330796AD64627CCE7F913D1C2259E1F970E44988B08E78ED1EC01CCC2D0274067100C1C1E3D880B9CA4F3A1FBB345354D4837A6E5FF4D5F5C87985E51C471EB9B0F85075ADB57DEB53A87D85834167A4A538134CBC24FEC2756F7760C3D46248D5BD6022D8F88CE7D037935DB74A6440DA49B97E8FF376101B296E3A9D4D22E70634CFE88142EE5FB6A33F323519EBE3A915AEE5BB687DA4A5E264C657438B0F6AC977A22D0E56882F74E70D981CF37FF0C57D285D8CB07ED7FDF6D7CB1DD39EB0D84F2999DBA9273E0B716CE754A29CBA2FE32BE13BE8B9F2117DD7359494A0E0CE623AB9ADAFD3F15F644545A39055D42C6C5FBDB46D121308D649AF9B86A350B70F77A977C8268FA1E04F4EFBC2C95A2D72BC37E558F0460BB281D33F75D2AEB240086CEB8246E8A44416A5B31EC58AAA88246D355591BF7C622CBEB1CAD3B785026CC04C73E352DFF28D77186CA93870339E132D57B11F0154E0CED426DB31BB2E125C5635BD489B52C5E77593145D3100E48CFC8FE6975FC3F60ABC7FA4A4D9030A2CCADA3854BF9AA213EF11E2F85E9D4E79CBB434C65ADC378F8A7DE33E66B4F8588B73FA7F79AF4130554173975280879FBE0A59D25B969FC45AB20401CBF85463A83578E63D0C8324878F5CFAA191428E7EAE37BB17A18D0459378CFDD4C8C0B23B1429950F054DF5C67174E99AF9FCE6B0D8C98BAA9078D2CA87EB8A014995FB79F7F49D78F2674839E14C8F74588B45C28E4769C439A930B2A187764D87D71200E841263EBF74F7428EC554C12A7352FD3912D95C96E4BB1D325DECEAA9D6FE360DBAE7AB897ED467A300A8F4C6630F8E721F24860D1FBBCFEDAFBD94DC9B4237B91B243A01C41D5E98E67B52B4A8CDF0F1C985EC0EB85131F5E970A6DD6D4E1F525D9D94530157F70B333F5E50B1B95D569A012ABA959456AF773B59BC2891D745CC036D06238AF3F34081A20F00A831422CCF6E4593EB56CAA3B7DDF44B388CD54E5EF9E3FB8A260847BEA5EB5FF9665530A4F4B56726A4C5E669904A933AB1E56C020967FE61E72185D56B38B03D343302712FFC1DF9D857C6F744E3ABABDEB3F65628932D69C65FA112AE3F7D6ABD2B4C3CF572EDA73C959637D0C5C188343415E9A26E698170F8E31CA45A8E6E8E96BD066BDFDFF49C98C491149D61AA7C456D3DAE0C017A32B81CD5668A400127ABD4316F3DCEA171C3F6A3E99B398CCD4AA7E45BB51963C82C43398050B8923CAE2D4E2A2FF5232AC8F2C770C9A775F29C261E1C7DAF54F9FF606560F869638B666C90112B29F469C3620B0912622892A432EAB443F8A93E3E7953235EE78CD3FCDAD3F1391A2487DA621526EE92735284C347853D5F65395ECA2B50B0CFCBD988F99C86B5AC56ECB82813A93208096ACA04F22AC015CD9860889E9006DDAFEE0B472FF7FC3D5677EE089B0AF7C6C2FD5A322D60BED621B8F099C30C2344F453320B6FF405639CF764B101E1CDBD312495C2D4FB30E2FA7B3C345B9935BB28EFEA69C829EB57BF2E2E5E42B8515DED4C32F9C84C33DEBDFB345A4BC592CA56A769533FBA0A631D5D0E07DAEEDD2FD588FAEE648B6391422924D28D08B4CE36084C20E827E6E73A97852BDD7508E1CDC1630094C9D3A2C8517A25A244FBA388EC7DE2CFABF139888EB7372E2BE3BC4FC71788AC3CBBB3EA1CCBD9616E76F2CEB356C13257A8E5490F3C4F7DBEBF942BDB941937C956DFADAF3A78903B49C5DE34F5EDBF0E98E3E04E51021B686325955C14AA335427C4A116CFCB3B89349B1258B8E0E354F13F86C86E5E8EF8F57D7B7501C5D75B1D9615D942B04E1FAC4EACE0FA10E6DE9B9721EB0651EB3C9DE4C61EEAE7D7E17C0D699EBF7EEB122B8C1A599A2CDCBB9B665DD9A653698735D5572EC379ACC6A8470CD7CC8245F871C83E6FD92111F5128A9797AE802889E4362104775CDB69FCF37AAC22EE4532FD0B5ACFDC4DBD56D9CE8B9EE2A8B923F42FC512B54204CB971BBC9677EBC49D287A3F68A31DB8AA49D6477B287285B88AF298E68C6EAC3C73FDEC94F7062D204AB310686144168C155281627F78C883AFB49DA50C0F5139E2A0ACB9A9CEFCCA39C6F4F0F5356D2898A4F5DEA78FDD20B79662F4D066E73EA4069DCE6CAE300B3028F15C98801912A86E0CF34DF53F7F6E1868DAD92DF22A238C710F471596A49843D3E60E4C381F713C21C3910ACB1515E5E30252C94F040F00A9D1A08A4FCA329DFE190B5464521BBAA32932022BCC5E119A96DFC941965CDF3B739F53DA156553C6BCD72927B07CC3CC945FABE44B7348257A9FB41EF85AD5423304E016E74E03D5164D9F15838C3A4BFDC29C6B9F134054B53B29183A6A145CECACB3EAC7C18E31CB4BF78BC8FE60A3B8EF880CB6C1EFE7EFA8D77580CE200ED96713E32FF23B86CF532D8EFA2FFC8DB1A9E65A78EDC30090E3DC02475D84F8D9F2BBC48B114C9E4A01FA79C17FCACCAB1FD304C7F901942B9EF57C918588C9CCEF0DC5FCA7AC84ADAD547982EF9E855F6E88D02751E8E7B8B76C3796F94C9F7B7C6860042A3A33EFFA55AFE1B94C97D68B76DD240346355012F036DA9C7E025C3633CE867510D54CACD36D8638FAA8EE47D315FCA9D5AE4BEFD6150086DFC368DCE8DC623ADEAAA07287F9B291252628F1BDBA5FE6DE45129509651FB048D3A686FFAC5F2299AB0133FCDBEEE8445555F5C649598649678847FFFCE6E0DD9C4E75E2F6E77B1CEE3A1740A94E678C1191EF46FC4D9648887DE6277B11D4C242DC4A427AFAD5459BF213E0A20EC74EB0C210D0A922B9E690EFDCCC2C160E011AB94F709C174F22629969B6332738654A133E8A13EF7C914CE75ACA1C37DE05A84708DA741161EE4D23C025B405CDEBBAF9040A1CB7492294C381FD069C4622BE1EBB0113F25F4E1D5A415C121055CDE5616662599C2364481BCDD35F7E498E80D2350AD3B34C205C5EA73F1B923E6197E07C502BC6F4F4288EB46013BBACC49A5DEE5071ECAE62B192294E904BF3FD7BE08F0C43E3EC6E23A7F68115FEB285AD388A0F8FB94126EDC0331834179C1F10CA5EC54159FC256D7E0AB3129B22E5AA5D662C6A03C7D9A6D066400859EC2D5B091C37E35DE31365F5125793E7F653013C722045F7292C014123246D611A7FD59E9B09EF24221C7EAB249330C91BC9F4D3A223D9C2CBF7130C5C057961BE89894221AFB1EB27A4604BE310EE3C395E479D852CEBA4C2F74D4DF416C8836861BC13D0692863667AFF8EC89BB9194407222589E1C27B9D59AC49131765273228E79C2933445B83D07E48A789FD6E406064593EFBAC4FFEE64614C5AB34E5C2A717C50AFA79A96161203531C161E46D71F447FD28CE4AEEF197A3DCA6BCA306AF09086D6BDF35A861820C469A40958923BA824F3A95CCAF8531E930210BE46D66CF7156EA0728F3448292F47ECF20DAC7C5E78A2A0AD5215FF37594D37A2AF4778B15BB1B5C4E0A44AD5910B62CA3FAC5BCAA4CFF5BF97C8B8CB239126CA09E92492121C9E6977111E6E5248661AD122C87007318BD3D98ADDFA1B2CD60F12AD1E072643FCF82C630C2093CF4A75B2D3F809A0496727E04AD60F14CADC7331B23D9CBE28EEC92C68C97E597C2EBF99F2B"""),
-                    TestUtils.hexDecode("""
-b9e56f9dfe73c5da4ec32b02af5fddebd5c84e216deae6a4f8611a876fa4993b9b333360ee00007dbb16bdacae8af597cc2d3a82359d8dca6582fbf9546b31867497b6cdf6f42ed3b09cfd094672218c40a24c8905ea468ba91c02c677a45abf5aa0421bf5bd398fad978fddc4634f6e9d36a03cb3d6eb64ee2c35f85481b1c4bed1b268de1483ddb4896a89bd9853c8f5beaee8b760c8202d17af8012a859f30c3023507d6bd8e41476174c2fb24fb1c944fc525b35c6e81d090c69713836e236b12106e02792ad51000aac32cea27d42c197e88f500ad336bc6feb4b79dbbd29a90c6e0f30011821357d111ec1cbb395212cad14b339a40fd9fce06bea1397369188c0d79e112f8c453605aaa3e28afb24730578eb8bc738d1c8e699fdf40438a16100e30d023b5d5be050a934d84d735a5650e2f599a52d36d1f9bdd91e46316bd62e774bcbeecdc7f43a89fa59241c12d2788ffa8e7277707c7df292da5141167d130aff17369c49d978add54af557dab19e746391c9f67157a58b4efc7463ac0615368006fb12c3554ecf35902e5752dfd7c34c97846547c3da9020ecd665487607c084ce909c2b7719acd1c3768ab6464c07c17e1329608afffe63a4ca07f6c9ceb74605c02772615de81364524121f8ffae29360d69f8900e5e9fb628e9ab0af8200fecff1ba1bd01fb6f1470a3771ef57d9b8e8103b3c2201d233de6e6602d490ba822b8eb4ec515c46b7b7dd0bf95cb7eed44573cfe11c168217e32961180d74e4f10463a5f38404540afbb48b21c878f1e7cecc13d664b03fddd6a33bb4d8c89023bc54602acc1cc434f5886906b5de13e89b5a414ba0f75d8253bbe031f2d82863e4e2f85f882a8a64ccc90a663ec9b6abd7edf2e8992f9aecb12a24acb52e0b05dee0803f521f833d0c0f238b06dd530c14bbe9a64a38198ce98a91f80358e6af37fa804710f043e7fb8cb5562f0c093d40c57f1b2c476520ab60782702d79423c64c874ea0ea0f4d9bbcf029b54b11bd114d50ffd80f38b21b4caeb54e9b83e0fd4551b7d56aa89ff0ea546433abc7e2b71a1a73897c803709a85b9f2c45996243445b089d8b3a75fce6decd0c42d622b52dedae2dbcc83181fa23a9d7b813127d58457f03b5e0cf4326188ed9bb894b9d468044897ed7397bfb6634808687937c8dc0d9883d9926d1cd63e0755ab868ab1de5a6d8cef72f72ce4e183d626605d6ceb6da8bb821161f3ad12eb124a1f09789b67f71a7b5819c3a285b7a8027d1cbef580779444dec21bf6509f27e7286c9d8274106cd3ad0baec6fc6f40fa3bd30a96c27d48280b8f051ce1679ea89a4981d270cf34eec5ca1ac399c422ff114232e68601d328f4a4c23ad3d52843c963b21f106f82eb38a379442b0ac389c59992c4326c9a54573b54ccdf1358389346df8c5d8c4064dd216f1d5e8f5ffe31205da0724de69187349a54b916fba25bbc4fc9b4518c57d5b715bbbfad14e50f8f48c81baa2246712b02cbc6f83cfb0e033ea90734495c9f82d185038a843a1f2d0a40666168a4df0b8e7c08973f64c4af66006109fe69a016242709877801e73319e1b2409825f9d827fccf2001b4dd0a4f455a92a58d13886f5ce9efe226dce7f3b4e817fb4f2185eb328c3b20192cb01901d5563b83fd7e13d0fbc3cde890cfccf91abfcf6c93a8c9ff31bfbe12a592e6337a0451983fedeecb6ed9ce67b6a3628fe15d9d6e8281097f8200fbd8742eb1138d3e6c70c1ed95c18d156bd9bb879610c28e5087097dd4a40a102a400b7ccea6babd3c419436024052a8a3c6c4233627d967a91bf700e10687a30316b67379fed8f4d208e27cd811cd27021abe8a295245f865655d2956d60d8564902fac029b65a337aabe99073b70162027995799552e779aca9ae9de29a458d6eec2f8d2fee0102786381b4ebe8707bcf9400c0241b83a4724f81e776b996c112226b8c7e1f5c1d090e9fa9b88c26445367935ff26c8d3c08a2347851a8f40b677b6fc5503a48f99782bf182a177fff9f28b5f2224b77454b545f018a131f8a9df7c61f35ac74edd7481a4bc18492cde936d5cefe03c96fe2f60be3edbe53d7b5d3f8b883523ac6235fb777f1d7a41906dbaa1727d1defeb67504a482beb8ac2ccd9261aeb746f422b5e9a11cc21ebd22dbea164c46e59b09bfb5213576955089ade4ba711d4f03646ae86df0c5495e0b5b5356d55628f40089d4d78ee33ba6f0f4080aae73fb20b47e979ad7dafda20c69925ce818ae62d2a534727d146d8bff6276eb02a52b2d56712da8cba1c0b48ed1f3e180d1bb4c365d6f14946b5f76147aeae4c55fd8be9d11b4633659df5a6a2e6dbcb56d32c7bbb88fd102e8515e959f322db8b6ddb21bad4a5c345d43f1b9a244a24578c75c626dbafc3f10e65e023783394a8357a6d5e005962af2e2f8fe8757a7cdc45823b50a0bcbbfcc6a46809d46ad639e918c97d1f038d7a3d9d87fb67ca95023d40793f96aa31c4bd3431d997746d305579495e41fd4d5b08cba5176924025bcdde3e36ff0c7b04b1b157021522d76e61ac37cd4fd8afb8c86609afd86a521f42b6e1892cf64cf278b02a7df422953e45c49cd07b9be6a0694e977d8e38b582c353442e850d488e26403f42fc2b533247eece1bf8dcc3808592ca51e100e71b50ea0714652f15c308b59d2b5936168acd227cf1a069e607fb6fe0fef48d582811106aaa4eb93ac836466319ba1597dd6a21ee2221bb0a6c068aca48b10a71ed42814a5273347e176c860845445c6f3e8dfd85ec2da37cb08fb2fba67bca6ecc5616e937e5f24464e22e4a699f27ca0aa321162bc5dcb799d4eba8f9725f9240dd2a10e1057e625f286bb999db6bad91f53c7abf54ef8e8a7741d5528f1adcff8783e69c535d79f279cd046373a012da01a3530d65c5aa3d0772e773dc7e692d0b8e17892e4808a24188c0bd48dea755b98a92ed4d8bc9046c81c9bd9800d8ebb100baa447a3432c4de07a68f666177230109c733be367d73c724a118fb665c858417512d91e993d83047622a9f5594a9e91467608b62c27bc07988be98187ee0ecaa7120d0ed54531fd9ccb17329b033b1b9c771c32a2bf99be223271c91feafc475656cdf78b4acd5226236cf50e9a4e79d7b4b4d9cfd14622a2638fd2c634acd4ee0b91977802ba013a98fffe5d6744d75d1a20a3cf3c851387d08c79d9b6b4dd418965eaff722b926c02f1a06563f0d963a2e6e99f10228152fd2a6bdd6468fe97955d4e81d0ad1f0ee301b1fe33c6935c3f5f8d4f7cef773550d32825b7ff05867c76e9797c71aafe5fd6da4767bf4f8c1a62ccf588521157c252c6d5431c5d4b1f15fe45ca0780989a9e99b7e1ef1d73cab9906a27f7d92609388d11b6381a9c21da36cd5245b2c9193dbc1c74e7967ef694a0e928720646b90a296dcedb5de5d90541641220e03e2abde8c2cec28ee3e7b04ef380dc913ba595c7c3352a5edde20b85c2d2a7525035e5f6db59d82a01768c7c1be0c57ca4eb389d958e0c96443e60fc6ff57a1e37c3bd0571215097fe26a87b835da2ea03c83fdf607ce72e5c76ec4a89e1378cc042bd70effa1e823f2129feb64e5ed7ed216c0d37fdf8d42a5320dcefecdeb28e99ec636f01973df6610767341da3233f1d2d50a7d922e93b14dd5d713049da206d3f31422f9f8d88014aa6091820525b50d1ba5e1f9d33f084bd2b5b65210c37f352cac249bfdd0c9d38d4d62e6c2bbe3541bd692721458b3743f902ca8ef6a150e8538d9dc348b704475d45ca3480bafe55265c578f3cdac8c0b0e281a6827687f391775f05979791d3e673b2cfb1bea5dcbb1cebec43a32b34b2e3ad97493c179abec83d02a249d52dd10edec00299704f0daf869d28c2bd29597215aced1e184d5e587caba773461499b46ed8c7a036ccb433982cb89af1a7e243a3466b1b2a9243770e427feee9dd64a96a3a8b526bd2df6ce6ce3425a59b7147c86997804cb109f862df5151e94a734020be056df7769e3f164de280bb45d7a5c43da8b8dccc48d4b4bd3400f31aa5c04a76e863fcf9c7d7e7eb04f5d769aa3cce83251a40e3e32f0d437ea9a279fdc21b4331286441faf0e0e18abcf11318b127daab6c8e2a8c2d67aebd6fac6139e5cf996ba502080dee6cb6fa55aed98f8e28211ee175702e9a16a2cdee3d08a7150881ba3b44f785ab768cc857bedecc1ab8f006a1377043f731ad801b23e6f18d6404c58c0d738cf5fad7cfa87cfe6446eceacf44ca811e1a48fdeefd940324c904fccfaf2a36b2bbb2c2383fb8c995051881a7e9d96327ee92ac43832f98932997069b21bb0868403c6c586f986949a43a42fc982d33b5039acff3d3dedd48ef05e61afbecc2d113de784925a101552d5084f05720230b6fcc357b63a72588317af5fbadeb229fd1221c5bc5f7a53efce19ac146d677027a87e0d49876e12830b43392f1f68069d5702699ea0321ac7ea78c18e64af520c333a8f3f591a1835d4b34b428abe29d1f0377c9305e0aca4f903e5127a397149d4be75369cd42135c7415d0298610572c6b95cffec5b0ae2fff70de6e12386db711ec9b676ec483be1cea8ddfa0df57bc60d2c8a76fc87d273c6ae4b724c4d8d3dfaaa11ae2da40f7990f8591adf689cf800ceda9ef2c8faa96de3290a3bedb2b73350846de4b754d3f7ef20c4defed3d9cb5afeaa6e1d686a3d16c4f1b2e65ed51b505dc3fcad64aea1c491338c4a33292088b60bfe491e1e6ff0314252cdd6767e983b53cd660dcaa4fe83bf0433edbc28b53a5efb2f5e6793ab1177f29be6cbe572619c7d191117a7bc4dad806dc102aff25067eb47a5bbb1d492f80d37c5968c2e40e9d600e7910ec77a0bafd7d8fd938ec3e0086d84926a75f9908392764c8dd8a76439f0adc99ffeb7af9d0966bad2b0a924184a5e9415c1abf791e15c700a69c0e7a62a854886797fa0d5c7a42519a6c887a23165808a608d9bc625f7775fe7635b537b5a35eb94eb5e81fd9a7c0b1c74b27d0af81938714761081411cb484ba7387c6c233bf7ce09091ab8673a3f10aac3f126cbb090f55336caabbe31d05695185635fc85d2ac59ed0066e51b023350083b2b2408ba874b19b98bd360c12885d64634d3c8c2f19f0feda4bcab389038ace498af6e2824c101fe5b069f6679044aed84ca5dd4dc2817b3c3e6fcd4e2f1874f6011ad05fe9e6a5b474b6c082e7ce64f3ec5d276074af695b6d3ec3b158a99d6de3f4237592abaf05a460ed2437e66a78fbabb0bacf03aecf9b96b3ea916d96db12d7cc6f8bbee54183459748a9c8837824d5f7c6015b564b146c255cbdf16ca894186566185574273344098aa03acdfcb8679387ed2c98dbacb6f2e6150306ea35f1bc05694110d83394fc1a7b4b93557a969131b70890933c530204ffc2371cdfddb7c6342a06d87c2229473654efb2b53f0826a349ee93d90fc4d4ad3e7e3ff8c16d74ebff6faea4b07dd5e88999bacdb1b51d8a9d9c0b5e5276153ac0483b96ca76dda17b931c526c7b5858bfa793c166bb680a44a0c0c66148f81177d8e9bcfdbfb64346c9179bf45390ac550db7af5d9a9b43bcc168ad29546e0b168cf9a5b44747a36b9c4e1f630c832883f9e6d10e2f89fc436de0c59f3b8e23ee0c156cc395de1c135a9de0e24568cac9c2911b21a0a9cff405a8ac222a3ffdc0d9ffc47aff2a3e89ddfdc6a8cf60cf28b3c7cae78b6bebea7bff5a8a47a3b707f24b8b6c4441718ef88108ccc26034ece28f80517991530273a5888eb1e36352d45e917b0283534830e914c5f083704e87e3c4c4f2205d99e1480d3ccc44f66a5dfb0607ec052a5a114c73d7bace17576b9345149325614c0076d7f044ab3f34482091be999a269a266f86a95d11baeb907e636f85fda7439cbe8d31839816ad20fa2fbac9b9ed2414a28d7e70cbcfa80f8e4e059ed003add7553056f7b94cdb4459f3ac54cc2c003fe60d6a44a7fb6fd0520c50f5c226a2bdae8b6e8eb7f18f94ee1b2692675f1b52c8da3141e5f859f7468b88e25a7d556fe1598137e893ba1c07ddd1af840e7f568db4b139f1d9f791451f76261f3948ba69354b16187cb77996848b629fade50a4d33e5760673e7b7466633f5426b17157e7165933de8547163903aa002df55a20a1a90a5c7c93c25bfb53f3f57e0045dbca341b9f14fbe2710532947e3e1bbf9d98a2f46bc526db5455189fd359f4a9c52dd5e5350650b010cc58b6ba0d5d11bebcd9b6e512d3c2faa728456b7053485f24fb351de898dae7893f08aa5509f808e6d0cf2b3bc46d3a9d3fb73633de694a0ec1d73dcd22e818b61558be653590663c3c66cf008ce3f74f0cdb241a9b54d59e426ec1a0436ed7e7fef471fc927432c09c8a65591531726723e0a46527cbd28527ca0bde9165860839dfa2e405b71728a8d96a1c3eaf516327895fd14476265777e828792a4b2f230638790afdc0312214448b1bac8000000000000000000000000000000050b111d222e343c""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-846d5071be9f3c8a2a99cb9490b9aa8c794e568b4c2da75439df54fb42f618280fc24c2b6d37d4a841f700c29115645a056aacd102a508bf68446b00ca392f0da08bd805296edfb26d8b885fbeb00743923c30b75f74a6af4be86b02e83c7a5fac80ec7fff129e338d766a4c75f8d35a18819b860306c6d44ddf230cb26718e942308810322d90263120890504422a5890242004850b3648c9465090b06053a40d48c48483920009a23124c20921307262103201a4304c248d520231e24630da262dda382962446d21484d8132885aa8405c326001c74104004684a86da3c41141b60c82002894184011114d51983019234118b3001c356994282261a688d83450121608033705001506220746cb467262a46c12212410478ec130710106725a1640d3482ea3a289c9a40d5b340c484426c3980443b24444124092c290544251c924300c1705cc06849bb26914234dc90611948669934092814421c9c0019918861cc5618a802ca0922c5aa04463808822156409b69082c02cda2606428261e3426491c21113157221196ad2067091164adc3085c49091500440200611d404121a862d041672e1b4052101320129611b991064880c51c281531408d0c80c2344010c45511c126921c171db820040108a9c48620303299b060a01078e0820919b304cd1a2054ac2286240865900641417411a836943a46d00473114424092c88140044a13a951c0264801058c24b80d9246109294684928241ca3289a9209c4389259c6908a3652da089100390458c290d0129160846184a4856120021195891b941150a209d4140194402e94102153329108032c830022539004230386c816254ac04588b81094403299a2681a3672d04240a20285482864ca20100135520bc36410176c04c02d81985114100a03c370cc30041b421154b60903a4405116891aa0405b044a42a63099208c10074503962882868508273003a4110c4431cc846c132570611448a326621b206ecb4664420228a12290991646a282811b95319c122451b8319c46319842284c284cc0b0210c990991002da1a86958348d22168114318a1c8691a4240a24256a50089104284ad236019008045348800cb58c51166618c689a2226419094a1a4385c3c44dc3b82813130a04c7290ac74124894194c86943b86808a30c4ca4299b243211b9880c9228804449099431c2a840189630d8368d54a64c21498c04b82c03174acc063243466899320a51866043284c00461124246662a48dda044c132985a1264e18b044182188834009c4a8500321469012910848444a1669400845c4306d81222c19283110a6059a9069d0a88de1340cdcb664020146ca2286e132911b1702cb167222a650809601143531a1a600d2242801845198368501062e0b0105e3008822b7850235414434891b333022374a800885c8142554368a9020055a442682c244c8241100262e0114648a064ecb8811d38205a008401c348d94a06900386022424c1240020ca8699440821a140083326ac0284622c3501bb740a100505b9069e2040409924d19436a43165224174d9bc0904802055aa20489b42d9308911248298210500a432d13326a9b341224246e828604022862143184d4b281502689dcc8009b02700bc344a4840120436583b23108134a1021680037255b207013a20882324823414ce04240598481e4346902198da4440c60b0515b2431d82825634808829268d0044c638631cb4630244021421260848288d200024aa0218c242a0a022d82026c9a144c9396914ca88823143222a5655a920c4a24319b324c19c60023a341ca96611c112920408e54066c21260521918902160d4996510ac590a0328d9210259b94441ba69009884509156dc100509938091b33501c460c1c909152304424c440ca8205023426a3284802394e62000a8c04900c021220046ce1004418a06418a951a10645132546c03461c48431118524da166913934409474d81c04c49a660c8066d9214701a0291e1221283022e22b389ca022801a0019bc8450b446d13486609c28c192090100128e1b84c1129820404444234310c4428a04609420649d4c48dc914221c264e54164e641230611292e496094bb8840b098cc80808a21630809490a3104e22350044103040146809a9852317225a480c22120ca112645b1630128440543066193006210926e6c23cad48453c6e03f5c98d6c20db81181b02581e8410ab820fe98d518d35181824493ec940daad34d09bb90374b3763a57cb813ba4caa9b3696d793f6515dcaa31a1f58fb85c931c8ded334a20950bc9a82b3a6df9052970c09033ca0b5c3fb95410b28fcceddd5cc4ddaf0f313c5db025077856a4bb9d04b3459171c68b1e3f7a233ead36f40f1f20c8d8f4c478a5c73e26aac5e9aeb0aba57147031df73106b05ae4159a5e9ff514620a7919f360c3c94e4965e48d350f4492675d6c86bd5eec098895f657c036182f8e3ab3dd467a23fa4a5d6aa775319f86d38945a415bbd2ae6166fd619e5461560af8241c585beb7f15564d0503adaf4ad6b6242f698768b70f306d66487959ec26c3eb7d2bf074533ba3f99ea291b51d72fa15302c74c03c2ef2d58cd241bafcfdc081398bf85c6f9754f699d602bdcbd789d415631cbced0b54c35d19f79a71410c828d3840de9131b607000f1516420caf078dc85fcfd087c8047235c878440a07668996c149a5980974bbbf4dc32f82139900c5246e002d5a211c63e5c3d873dcc966bcbb48ca6bcfc8d8f54e3a7055f5efb3cd8af0b46b3dd5dc26d5b70d249e0073647f3ae84d835675e871c5222f317b5c243e3fce32017ca9a03891acd4c986898e174f80a9436be2d4b0a99ba4511f8ee21dbdf44689d085846f8d8c2ee48faf14d8cfe6cd7ceb6fa1bd61721492f1ba5ad52dec7b49dc9a23d939152e4042a0096c5556174da9a589a226b6f5dfe5448b73555b2110cdb09cca3edea2c7afb6f38c6432ad7c6a0405a41bb570f0570e5a056820b5dc16e80ff419ad7160b98a386a7427dbd4b1e26ad0839f542c5e71534b6c5285fa5f4b12f75ea94b9272eea21e163bea4c0651fd59b0c54262f70ee81303e3b3df93a8bfd1243f1a1b692110de4a5e2cc5e75dc201c491d8a1336f1e21edd5b9d20a59fbb89cd6d4715a04a0b923155ad110771c0ce326fa4c9e3d2e62e3baf9ddea1d3f0c2d0432b8073611058ca545dd387267bd3fae1ab362ecbb952625a9cb2038c7feb192aea08c6a92d141f06e888206330bfdfdb552ac5ebc6c2fb7ad2619fd1f149a93cad33615958e064f0eb89353b82cd26e4a34c518983e882f171d91aa75c62a6b4b318d732b063e8ab3862c97e40ffe20571f065901bea3e2d9e89c08e22a000b76b788cf5442add8495b63545d939a18de4e1b49821ead033c7479602b0c2388e3434209b00db520a7b16f22af9d3e5508d6d848aacf6b3055f82384e637a0981b4fdb68a61d1a845154a65c4287cf8da9159a2650bba6ebc853e2b6b32df16d1588d8f5b48732c6154efc55295cd8a5b765e35f88a9b4025156963aa7ff2e414af1305af3ab9aa9723881005ecb1188f36d21d2f7074c74f17c4c37eeb959a602362443c62e40d628a5c47682a4ca3346ad90a8499dd28d7d10f72872b7e0b73eb3041fc2de354bd3fcf962f0589a2859c8ff71b0146af27bb66d3757a6dc26ba7c5bb7eca491bee443c8d48d6df9f24d40e81fe168b545a34dc298271920fc97546f6f304c505fe43d6c8e75487c04640474e3943e34945f30f7ed533855c716c5ecfe6481167e50114b784ac3860fd606ae4e7fcf4b01f11f7b48523c81071e7c9c234a4eec5c329d83d38e82deb37f1f18dc7cab2241507795674f830e00681ed9cfb2765a6e81193be5a8cd5b832765eb814539f8522fd9b4802e26049aad26ec3c5feaf9203e65d5c4f544b8f214cc5831180fbc2c096499edc37ff51c44b3dbd826777596ef0da35bcb38daf077e2fb717910e5b68ca8a7c5e70c400c107a972ab3cd13694c5c21f7ff2e4293e5cd8278e37806a19c053947df531d843aae717dd2f5f7268e9b642900324993cccec5fea04db7778cfa203e6e9781daf9f53582f80c8ccfd5f0d32bb627a12585c98b57ecafaf7f00217dc99bc9a0148009e0fdcf9c2cacba1c1a7d3aaad3f6dc969f7363ebcba222fb3def7ab17d3a28dd4a16235e64bfd4843956faf04732c4b226f25fd831865b3f17cb1aea0fd409feac59ad100a37020d91f7176c8b6e11c3957c6b8835c4c0ef25280d321c8621e72100248bde7bb9c1b8d1eab666414aaf9a19ad34f97fb68e68f3b0e58d29cc01ab09b8b73ef51813427ae84662bbd753d6864f0902f02b1f2f52abcbc0d580d971d13feb60b949befc22889aaf7223b09b22883884ed491b527a6dd7c420d8990bff759ad5ba9dff47631abcda7396c75e3f420a295ce38a1d3109c85571a69fa5ef7488f21fcb02cc20765e09a9cc2928925affcfb997111da0fec5d5e3f540822afe153b1c55687f7b6463e690ef816160707effdf743de401494504d28c8706fa70aab284e235e6b576f84c9f8ef70f0cdcc1a21f091871f146c6dcbef0f90baed20096c1d94ebdd6ad568fb97fe122df75b80fc3180b76c25e9852e94ae7394cdec927ac17011d43959d0dd0c5cf4c8d3b7a69f2bd311ddd7cfa202d39524b087b10a7e6c970f3698c21c0a18d639a56ade76f22e192f3ba2a50e415df716a3436f82de8318ab7d82f3ed86e3e9138a53b82da653f768183d653352436df927ac92a5e21adfc3647d6a3ed7ba9e238f52b5510b31f61591d89b2cf468c9d1594589ad2e7922424fea97b04b012153bdaae7f0e5ac84f2277a822a0e509d0e5f05eee5b5454b76288537c348003a9ae12bf01a4d747bad04b3f25cc776edce8e0d96ce9cb6082d7ae639ccfae14872d76710a9559f478e876bf0c3e1081bc64881287441eb3b79eb2354cc8703802267d5fe37c68e9410fcef8072a73ab8b9fc2e8c088a1de7c6534a38d7ba422fe79966b4bf222d9387d01e83856a02b6d0a985b0c496941e78a9e6f49e27590105ec1390a0eacd09eb3c8b828dec970c9a060c7031693dfb8a3fc3b44756d780f3399b806a8b0a5802f553b6085916fe619490a8158dd8b0b4d02af33d9d831915b5245d41c0474c4113a053860c75e8b36d9f84d5e5341d8361efafa2b0acc8976d74a568443f70a87d00ff488437f5f76d15d3bda26ee3d271a5178e0baa0f2ccd2927fea5e351aad15f71da838d210bcbec73f70f084887f4e013af4bd0cfd44d775b0f02421dba1356e6c83bc88f1c917c5f4dcb8f637ae36e425062a0f7b5b4a31c5a16a366c8fbe1da0a2e5b6d83379db1e8d1cebd9749bbff7d66806c0982878bd9b54b29ff158d4a1f36f515f27322f9ac4119b88d723cd37a66901e4f45a64cf3272169f8dba8a57f83d1ab0762d3b7e679432572dbba5946f9014a803f8dc823781a72334933a10d59cdde09e1248ffdd493dde94f9b07e933ebc6732c0a84ce233127ffbd4e6d136adbcb45ee02beaa6c0952d364ee33a4a0724db751f99719d1d52195d78e363aaead6e2addd8b04c174c3aa5ebba2a2ea395a314d6b85be9f391e4d13c586ffc63f9f4532c003de1b6fd07a549cc3b72220ca39ca73fc447d0fba82c42948b42cef9e88762fa5d5f00d7c3f41789640f1a70f57a9f8313e0085af505272098630b0e6d7ffd601d887e48220f323acd9b6f6c71d49ae9d7d325424f94a7f537e775b8c6b3957a1feeeaa2c4977477b12752b21a219504f9c7cd030ea7475422c810049a9eaf9e2e838881d67aa8491f41334640f941ee966f370d0245b7d7c90b15107c9a2ca9b5cc4df050f57ad3b9ecc10f41b501f6041c52c1b2d82b65ed49f4cf69df483e62ecdb8d33c14d9736ab11e560b443a5704bb023a71a814bf3711562362af9b89babc229181ff804e5d0d0315b198939377574aff8054ad079e4ffc18d77c4b93071842a2907b0dd8f6d7c3910403b34848bb030b16e6e57ac801f2cddd7202cc99192f810dbd41428847a93b18c2a5cb72f1207a2caf341e9e175162575f3649cc2f64f7d86367b87177c7317f86af8d14eb411272feec8693cb1745c94a1850d726525b563b2625430e9545e6ebc5df8a7bc44c5d11ec4e7c8af86e12e0dbf9a6dfb23efa2f74f612cddf04d3e696fb0e15b606694bb5412472cc2f29cc9c2ad22f48d6c3f270fb94116278f6f6f37525752f942f71060d41622970dae6b7f2b355f619c509b62a17f61007495e1e33053fe776a3022b34710ad48e81eb1a7aee5c8acbcb9e97c9fc1469973fe5a0a5b119fdd39658a56e8397f358898c41e44638362829f5106557ab81b0504f9751a2d3dcf2da9a88869fc04278cdbd68e6e5c0c8135ffaa114f16c68245ecaa9a1a105fb5c9630579016b975fbde1d6a0567224da9c32b3e1b42f2bfbe4828d1c3c2bbcb3eaea5fbf19ea55d86a58948150bc0a8c126487adae8906432369d93412481501bf32b423d5db70cb3413b52bc5a586faf82622d5331d1e1138045849bc8e1eb9fd02d3e713bb9f7e2a2a25c5cbecaf7b2463b9f42d33d52e17521364178c046741a408265ff0c95a2a1a61fef9667b17225c90169e991a101eb71e428bbfe730a8b3fd83370e7436dac68a81e5c4c42e8474fde53fd98db57ef79bdd13721b6c7b4e8ff982729c14b04a653808ce18077bdf210bbfbb7fd07fc39b8919500da55c0ba13c21725c7edc69c3f4abcf07b047f63397f3afab2b1c4d5918bb6328c3b522eb19a83af43fdacee087955b734c45266eed1cdb112ff8612db42a2da0ccf3abb22f198fd38f234ace12e80c0dc3edcf3d98323d0cef04e91987c"""),
-                    TestUtils.hexDecode("""
-B5CD00AE06396DEB95C9BE213BEA279AF0D10F1423B5A71854413E99F7216D9EAE76C8AB884545496559B14AC9A69801EE3FD2EEECCC557D7988F34B82D244461388C7D4EB16DAC3C0FCE0783321A1488DC16C3C688126754BB4C26308054545D2E46C6BEE26C25A7C3B701341A0323BEBFC50C718162B7FF3B6FAAE7156FE300F2219655D8D44DE89845393011A2B466233B907355467EC49C9F832044BDFCFCF722D6DE7946FA503861C80037549ECE8FFF95026CDA33C9000FACC334765A60456084A0614455C83E0D5D991F7ED43952B7A69F1E326D7BD33822CF1F286D85FAE78F0B8DE186368EB334CA56070122DEBBEB920C5547C46C1291E78AE48B72C7A39020A1A2E54E59A2E46606C99E652FADB39AAB25399B0830AE733FDFD973294B93F47C30D0824686C735E05FF51A95C1C76467A4BE6BA80C5182353BD510E8D4B60BD43436F7021B3F5980D1A769B2E3BF04E0C257EF577828B327E2AD85E0581787B9B7FE44D6B826BF8405D3D0BF8974D2B1C569006C7FC3D2891DAF38DAC36F64A256E337B660CA59D2B45F1B4AA1C0C72B78495FBCC9EE9CFFA4B5A101F973E3211E728040904B0B2515DA4B1CB3774EBEA1324EB6907324E733C7F17BEF6FAD0F6BCEC1F08F785DC6FFE02FFED5C0B7A631907196835EFFD0730FC8FE020B0545C920DD7B2D705F22D8D205804397F6FCC60386F4A576204949EF60DEAB269905707396CCCD8DA9B895270CB39839BFD3EE64149B0085B96FEDAAF8C738E449E585ADBA037BD560EAAE978A6ED61DF432B6A9C2E50C2EA33A8702A23E6848401F85E2C18C7C767DB15920C9B3B030728FD9511F8903DFC8572A3679F986CA1B684B3AAF489DCD93C622C6C4D475DD60F10C390873B09B5A352B6F5A104C90782E053F8121317EB8D1D4C0145E04E3B68446B69A0EF81097CC6BD0B756AF78963724D9C83C61B7B79647F0844867B605E2B60988D2D7AD07CD6BE2D8F904F0D269187C141AC67C9DCF9961BBFFDDF3BF34D9CC5781D1BEA348F49EA8FF7750F7F3E0624C16FAEFAF1D8B6A818AF5FC5C04E2504A0CF4C2DB54930EFA759A292A2AECA1EC3A08918513D95C44BD133657FF043318A17BE4A5DCAC54B87FF38869D017A4B14DEB60480AF1C5F19A9F87B94B8EFE0DF3F931CFADFFD7AA50AC86D9CAF6D434CC81E6ED123711E34B8295A446B554F6DD5350B44C614324D8727F1CE501743043DE6EA085DB5154AD8E30E114A02CDFC96BEB4F2718033B227CB8638BCF617C73BA4473851E62C8A287CC4F9C659190E60AEC468DE7EA8841E3CEF893F3DC79DDDD56B63102EAA5B2793711A0451EE1655C6768393F59CA6085866FB41541D9997C94BB56F6ED5D731585E7B25B1DC853830DE5DD75F66298BDBD2E505DCB3850F96CCE0D7274633234EE2FA1E2782DA3D6CD8F5DA2C3063A923DCB6A2F82614527CA2A88C1AF21025B88A08C3104C679175DE2CF00602B13E58FAC9376BECAE56A60A6A8F144F1C98C8FBDCDE6FBCA4ED13228FA77CBA5CE631BCDB368AD9219568777FB4397BB40485A9AB63E9E3FB343154108D8117CE25BEA30BC854A241745FC6C26AF0D64124AF10BE4BE01B8A3D842FD9CC4D805B2BE26F8B7BA0631443F48C7F74207F640B215E0DDC42B1954A1EAB2C68E63601DE3AE3EA54E16282BDED00FC7665A9E8B098BF034F5E950ECDC46CDD22210244F102E41E0930FDCB24AD6C72507E5AB6FCCD4D6B2A2703C358EC1B51AC87302A5F507BD01CA6B5FE04EA2A5322EDFAE8161965524C61956CD201C4BF2F01B54F008F5F4B6770D0622099CDBF94D6C41DAB4A5362D630B9BF9CE240ED08D698D1AABF29E60BA533697C3C830521314F13EECD95C7D2600E2A756AF19AD94D9EA39FEEF0E3EAB3EB401225C2E55B2F2A8D7D1A3AA77A38BF9BA31399F6E6458F3F21DE354BBECC2E29740FFF91FBB23E0F61D7E0698CBF82D439AFB018DC5F5011B7BE98993E8B655D83C666FC0CF84A532C7655365746FDB97874D62329B1EFDB0B0C8A46056A85B60E38AF8979FA4910D2D9CACC3B5C1E42049D04C44273953350E0F756081D2DF6429193768802577C381897BFE540BC036293643360C848A1AE388CD17781296A99AF0CF75F81D568D0648C8A15436BDCB16FD83287C6A54F88F2F75E6B28E1C5A3AC03501D6D723AC5EBF90517D194A596F7F95947CC169CFF2A65D2BC9B54CA6AA45BA9E901D4AAC81FFE9E62A479EEC5B3F9BFF24C69FF56EC52F1183B5AC48A5BAA90BF595990B6EBA5B1CB6D88511C7D0D165FDF2615351B0343918B966ED1CA0CEBF6956BD2CA599E18619E1A5930E47CAEA92B8E9647A0262A2B24E955040750E6C7B935982CB742EE756DB65B462F677AE09A7521B0D3A42C2E97890C47148618FA6089975F5D491F4D3F69EBCD54C2B53130698A1F4A47505194F675D68F2DDF5983B008E498AB4A25956CF724F5C1250D5F9C75F3DF9BAA696E300AA86FB4B9378EE18E79D015CDA55D6ABBF5B0BE819F9EE58B49656D3B112AD8FA6651A8905061A8E37760C3F2EBE6DA611BADD44268975B5000051BDF7158EE3DC200B47FBF8568C9F22719FBEFE5906444DE9300689BFA1AD167"""),
-                    TestUtils.hexDecode("""
-fca242816e6b98578837b5592bcd66732c06ac3794932640ca3b71112407c8a4c0989723966ef76b5409a893b8c2981d6b72a1f5cd92d81c12b9cccfc75547f44c27a56431f324a4f73ce4f91da398fdbe6a97ce171f4483fd0c1cbab53fb80c41963798eb10dc422ea82719a0770ba82e1491512bc40d726b83b3cc1887b5648204b00e8231a654b4a796d7c1c0304e93579ae6ba4f0945afcc0812b86cb8872842ee8782ede142087a46dccc78275aa2e52f2e9344a81c4a0ee65d4a9b8ce1ad020ef6fd1e6cbdf8d5e56b1751e67be662b90fba01a983df891eb2eef4886a1da0b6bc0cedc4b44f33df8ad946b68e5389104b46e213690ebad5b50fef7dbf2aa6f51b125657e779d9718244aaeaa55ad0bbacdb76dc66973e331be8aa3e6a13dad7d227121e5fd1edffdaadc6bb667e40d49c1d95c6db663b4cf374a3b93e5f270139c28e98fee799a3ea015ceaafb881807058b199dcf0b447f46d263bd43d02cf232ad1c27c3ca8e0cfc1c07541aece1980c9240e77b9f134694be94bbf05eb6710797a2ea2436cd6c10b18a260bdef24530eafc2618d17f86922e91c9fefe7528de98bcfca9194e53affc13da5787124dfdaa0e95f3924fcf6fdbca78a61aed2b5125c6b94733eab6a215856185ab31106fb293d996c9a8e80f9bd1bb2287a88df24f7f127c371d5c8503622b3986206acd99395bed7633e5f73a918a45362d58c921362053a0d2133a1989516cbb8bc29dd2fdae2dbb94669a122e81ddeec46fd04ba600d149cd728285f2836a3023521ab1362736a8d33635a6fceaf6f9684af304a557225e4a80ca403583b637c4db7e9185df6bb77dbb3b09ff915400bca75a645a8ebe36b99948369cad683c56f0030f4f8b8f6610d20c7662f538c855bd1d08b719df8b34873c4dfed8046372063ef58800ee7abd99ba66b60098e0004395c2646ffb158411526dede3d9c9e1b481a2dc5298f27538c6ed535fd0e7374ebf2ebf214eb14bc3c674f61c1baddef4435344ddbb08d6fc8240ff5e41b817e9795670f399965cee0d8a4540b795580ceeea3a31c61c81e3613331f21b496e8dc833ff7494f50e81f0366718622602759d598f1831042a5779ffa9ada2a00c79b0419ecb05d3ceed113160653bb7db0d06a40fd272afcf7f20fa18dcef490387b84dff70e761dd1bbec5e1b25eb30fe2c4d18135b3c5f315da29a98855f81f9b1e01450557ce6fde5b2471dfc90da07207a6f6d181cd71e33af713c0dc353f7166bd6aa7b90f82eba2c03423144fd12883e80538de76f02a0e12cc65051b981eff9d25a36ff79b4c6c84ea537075886e9be23f700570e43e76e8d61f54b49a576a99a57b464f2be6dc8c993c78a1330ff3580138964a6cc2cd46006ee1a72a268ababe373646674dfb4bf33126fbb8f5dd24f4c79596c783fc88b393a75355ccaaaf698a45d678b01f175bb31bf7d28bd44a766a60dd8d2510f55bed7fed53f6718578fde622c49d17fa64926be1a084dbdff206c025ff726ddd2adeea11a021680f3e75b865bc364dd7d752d3b62b7b240838c5645f5338326897e751e968fca1b99c0baec1c9fb227d6f1fe61abddbe26613e5abdf6bac54d658b22cbf8cd498114019f712027aac6e7b1fab7016aa96ff61bde12a44d540e33c30bcec417f11fec1a0536f61eeba565d4faf3b624eb1205143e3b6e6d22b8a0ab3767739206a89eab990bef3f3d763a816cba5aba2b2d8390235a197362382c2487d80f9f47f0714206b1aa9f40840098c6f94d920fe21950274f7ca9d22a506a76a328cb28a50ba569909897b15ac2964a111ce48ffe137d86c5aac313050e25f43b9c041c93dac0293a8694f76845a7a83b8e14db7fb2a724df1f4e64a772e6c3078e465565e1eacd56c0c4f13a3a90b53bcaa0451b44ee94be4d6d23707057b4eaa6879203ba81ea953090eb450408eb6a9dab8c5bca27c87cc302f286e703be7022044e0ac4559d4e861f4e31f8915831cc9b81dbe937c8b0abc02b61c57debcfd0f5f8ab3d7bf0b05a5eb7fb0bb587de8c2bdc41299e744db3c6f92aaae2008a14f965023f17ea55fb0a5ec6c884c478cb3a95722844dd823be55f15a363354634a1b3171e349ad6c69f1342bb3dcbf0cb44efaa6d06932e064311057a97fccbb1430aff5509d0f34aa57a7cebcd5eb5e9fd373960065c79f52a414d16ce959c97c1fe0101e4bea038dc6b27ee847335073f62a91d1d74ebcdab4965e1cc501c07cf4a6050c406028f6250d24796fd4736144ff84616a63a2136fe4b8ac9652d95965659d55b67355f5de40f6f11e08fbfbc2ef005b3937204345e03c07e67803a8c378368a7cea377f53318bb140e0760bf79fae16f4132bbc88d8af335c07496fdff21e36ca375889ed56faf2622377126d399fd76ef9b2746e1ab666461a949c06727d1ed191e197418ab7574bfe292b92ca61e7972e4d0fbc6001dfc5438f95b54c9f226bda6968fe5e5df06e915fbb58c6123799f6c8624a40b18542c18cf82b89b606ba532584b1542f0b0684be46457fd6f295f0a3e79ab8634b8fd747d5bb87ac0b33902804f691c16874f881a3acc4b1f88183dfc3defe276968bf7f7ed53e59e2e5fc0db0f13dbc772286f6d83cbd47617bd067035c93259ba9daad2f229835f7c9ce8759109bd1db0e71b9d015c55ea94325cae586fb1b50f4792bc4c57569c83c26ba4cd7a809e799b5a45961ffa5387f91d9d653fe2cef5783312e12fb695a1b9d2004bf5d73819dfb406a7d3243613356b851370fa34bc32aec270984c77cb373cbf6c65d1774ef95539d4b4142d50f3cdfc9695e96cd1a0a3844ff8507ece66c2ea7bf27bdf020ea8fa95c6a7cd0dcf37a591f2cdf7a6d7a04de5a89583a094a53f68636bb57fc83968ceb47a53d37aa7099c76633e23b5eb1b828d2efa427fde9cfa24df7518886af10ed7734aa278bec197a60dd8279df60fd5012852167e9038ffd1388f6753af0b75800aec92ccdc0feb08684c28d51ad1ba8a14b33eb0a13ed08020f8416c9817a63dae74a2ad51bd9c9db0c187ba1df3deda995727ee0e8d78c9a3d70d2bbaf759fbde9226646a412500865e2391189e46a671f7a9b2281509c412e5ae2cd89ef17a42414fdaa90d12e39b07ed4744217e4a461a48aab8e427eb7cd1d07cae97886ca0f4b8d2c88c397c96436b0540aad3e6962c78914b3ad092b1a46cd1aea2cadf236c9d0d1e7669bb3035bf8354ccfe5ca70e7e6e6acea47396800a8407017d64c4199cf13155bdf44b06e01b92628836712d34e2ce4c8d635cdf1c3ce21b7a2ff1268c9ee9df0792b79d35e466242f25209bcda6f68f07d80db030e244c479c66cfe823220075e9c08c2f8406ef7a5600677f4a0673b0b5bac9d5e388dda323cf3e2d967cc0b3a705a456cd194c1833855af620952dfa2fd1f147d6a58ac35231377956e4b91ac100e3f9d8b966db4861ca45ccaccc6ea63b0d2d71d4367bfc0911e106ce7cd73f31887536754c880b54b5a6abcd3913c505c2145fbed44a23dd7b04280410cd648b59e7ae00b10099ce56a3d615f031f9091ff00c2248ce6cff217fac3158aef781b88603ce37e9aeb4efabafdd59f0a460859b1f1a1b4369043869a27cbde6a8914d1d3d88e440927af82083950eeb3bab126e9507c8baadc1fe98353f01022df09d8848142ccb7429a5b4a7669c1008d61ac50d6373b258f8afee8d830990853b9cd18b869544bff788f5cef93a9e3debae6afb138bce6ecdd9b071dffb5d629e0fc544bd909bb7bbeb3597d0a285e447eb49f7ddadb510dcad32807d3d0a571a731069e22aab4e730f50e295357813cd46ac3f34c4fe2d5029fc19a772f7e647cb18635fabe67f1588b18a7cd0ebcb6994cf4334316f6a538370887a0f009adf3348257fe9668b7d784ea64e8e9931fba22bf2f673b222196eb5df852ae2715b58cb9b737583c4b8c1003178093fc288736c246fa0357daa68e89150cf7876928b9525a264625991fc403b1b5edcf4f9a58a570925044c669a3f1960c06f35a21b826603086e7e889adae25db3eff02f990af85efb01e1bcfce2eb1520d2846c5de1ad3caa65c968dbcd8af5b925a13871f19524f1db6c914827c818d76b1e05df95ba322ed03061eab164cd501545d3b4ad2c4f9b5d7abe1dfd3d92a422a114ef56a4b2b47d31f5df38fa7e3853ba5b1c1e9e955dd4a294119c3c314fbe4ae14362a6522e34b7fd467d22aef1a31bc8bfda12025701df52ebe6fcc52c1fcfb8ff94d62d2a7b0f1b8db243391320e7fdcc0ec40576caedd0f327c5a0a950ddb2994fc389fa77e54f569217f4139b91e545432cb7ed0d11e1d27e9c4536a9012509d9043557051c01911393c592f36a4f162f131af522f978e940774aebc0b672fe88c590ea572f39dd5c87828d3d9d16e78b9433e54da904418c5ab6e8db7851f4807d4c93c60503ceecd837bc068aad6813206e382e84b6e64510f64f1346b9fad25c37d77be5292f1fd9d5463c640baa331ccd636e7485b752db11ebdebefab0cd9d8b9ae11f724439525661fbce8341badfc03ec2375536876a954a0c553e274027f9f53582bfb7d20520e1b8ea9322fe0abc9179711768bb2e78554eaa5b0be9023e6acd94f5eaa7b74a98adafcfac88fb21d810feb9f38dbc0c8cc006618c771c31fc82aeffd693497bbbcdfba2028cbc73e49ce074f425ca33585c891bde72455606aaa252ed42e2edc7ad7aefbd9ede2a51217f2c6e1ac300f6868cb8d0fb6bb5ebcdab839d4f63255b7079ad483a6fb383c4f0acb7128c500da9fcf7ce9e28068f265d3e266dfeca0e808c0cf8e98de0f61fe495eb160888df53bd872bdd9a7b8c89ba1a5517ae69c2b49753dce1fa1c215d6c1efca5d241cab5229ca657d28a57d34aa16c6fbd829b0aabb4099e472b922387022885de324ca45a8eb9245ad53923beec04f245e4fc6147895e7e0fcd457a3786db95174d8480701e2d659a2131d89ac98c627357851bf57dace645a1d00b3636c45374a5c2229b002a0ad8c9aa148fb6521fe35dc4ed09e3e0d5cc6bcda45925ef6f5df442f1ec4da7583f63bb2381fce6a7a9da4fb79d0ccaf2a4bdceb6cfe584a33b9cdfd6c9f3c4a8b71d4b3da17f174d6fb3b8c48a6a6f6cb78289f3f217bb377d7d210845e09ba7543fae4de9d397bc76b3a46bd7aa47a93a891775898cf4e865c5587746b353ddf1edbd0b6384512e558a9f346ceb265cc3c4d7d37ff83e6f60899f3768c495f49919ae6e80aeba85c4cd34b7d90d311f03a1f4356188df30d402031b916530e0e9da31b17ce87537f0b0b8d918fdabe536ae6bb6b903173f834921f5c998b39dc5cbb74a7ef677d72aa4cbe88a8823a8a0efc7de88713ea127c7e8fd10bfeff3e19334c7fecef45876f89a6800de74276920fcb6c248263b850b5c7a945e1a3a5129e774309c606f6585d037c15e5f824dab8fb74a9cfd49b659c98fb1c66c2484761cbed75343db437eab18ed7b56e5a3c0cc150ea98447c3b5c08c9f9d1801bd6b6ba15fc3be608aacb92c4abe8f3f506e75714b6876f5b2ec036a1456627e567c6e488cb6ace2cf54e42ddd41b6810bc93f83270b40fdbb79be84ce8e60cf527a1d04f89f22c4b936353015a8e05c23799cfbfc7fa58405c07ced8fc16d50004e364a6db3d3d11afec9f6f6037bb7061ae0b0f4f4ba3157728d24f819a3d12e237421a22c0efd8ae99651437bfa486c033e833e360935dd433a1d5aeafef73c71b5326b65d6df9994f988d00a03898d2354f58e3308b3c73b149c8a2b0165309d64ffe190a4bbf89a8633f30d674d73b1910811951b25aef8313e510cebc2f8e4a5c4286e2dd4db0dcb40b1745358f511c29645a0cae474954fbd907345b30203a32ed6848f10b5489f58914397046796e143bd412a2ea5feaa811e0a7ac8a756ce752d75eab8b6606d8d3da0900d621fb42b90e94e3aad05e0c42f9daed64af510f4846a4f66b1782d9d76dce9ac84fa2912808851c9bd23656465a64c5fa582e7bd1fed8c38e7200b601d0504f2578497be90818e69d1dae9a86fb5c2772e891d699f002bb4d579d3023df87651ec9dbb06ee3bd4a9ced0451a1c5e0a658712d704a92c2bf21527417278c8c105671e68b06aa838ead92c6a8566ee5912a18b995e9d1b6f9978fb6e378eb0924143da6fa15198686b8f5620b607e25e0540827f3454ca9dd085adc6e2c10763a20d6c70c5bfe0bb1d1b773bd267ce33a2b9c08a04a254d9c844475cc013c4276f947ceacad1c31976898d198c91e5ebf2623ba825e762665caedf1674775d15310972ddded3c75178dc3fb715d75ed071a292040223fcddf82a3e29af547a18633434534b15bc10334bd1c8504e210b104100c3a4e596573b2c8f11c304eb88ebebfcad0df1b2f5361676f899eddf0233b5d6f80828410172c36397f9495aff2001f4667a209394a585f607bb8e0000000000000000000000000000000090d131d242e333c""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-a163f0cce9b86d8807e6ed09b486e1aa12807f2370f2cb6d886eb2ba3978ee8462f903c8c43e7c35ab95413dc49c9cf6598e255ac8a4226e38764e3ef4cd04fd408ef017e7b8d3f418422c71e12a228cf65ecff31d2ac2334c9848425f63c9594b6644a26861997faf2b82aaef2a804d3c9114b4c64db479c8041cdee8c8fe1d63164c081221923408db142684084183062212076148c2906082898a1410d0b62d61104180488da3800501004080c648d9844d63466d0999111c440493448ec82482523068901862222686a2368a1c424840800459b82d9b448dc8a68004c12092a88c4a3869c202715c324d2415646404109208050cb26cc11062011689dbc4459ac0901ba8494328080a10619a462654026910432e4c8660d2300543c6459b127123490419285084882104b74523279114b9098120305a8484e22464994262c8c00de2a28564c4680b0251501691a0224054402c12a689248321c216610ab95013b285da306922482c19c90d10c6918a46818a260000986809c10014b9710cb368c812081a285019808410102050328d8092081132520b033211a32918156e042629a0a011cb124a1922801a042419154591384424230411346288a66de4141150328c09c6205bb2290446089a945143042e1bc18ddc828d48c04512039253986820182a82102243464589a444123402213162a03264a4b2718aa40181900dd1869014930010c865140570103544d2a44983462123b605d1440e0b36281816329c2850a3084221a56d1b148249908c8c0889cb444213310e0ca16da18890800202d31404c926501a14429a0671cb4685501488d30412090865c2c6440b3622dc022648305281986dc8a4880b286a50348a0ab7451ac969201726122588101384102061a0120521a1880b410082048a5c042e233984db224ae3060c20877012a0210042718c888d889449890620614064e148480495811a2132492801a1402c09b03102811192122491c22950188813174a11a06122a601042492883668d1024204236482246a0b07869440051b3862d88090500209a4243281b440a2420940b291883232c29805c93086a028694a40204a008540362dca44450a207224c58cc4204cd18240d1a6609934220c35820a2405128251db220903438ce4122a02912c14186d62184c82069241062a43388500b48899168624a784241349882870d4181143c6258aa284e2366a024261c8c26088b66d5a844d931246c84449a326108c484c219928e4b84540b04d9b020919908102142d424040c2848d0cc41192b84dc94824c30846430664d9342e203849cc2050c0202d08940d5c369263b02009b551828440642665542264c20411631401c2422611974959340c9cc4704a246619066510113249284ce4c884048945c42021d9b660d21069c9a64c5aa62c5ac0840c346e18104500289124822821442c91486ddc34649c9610d902440b142149444c12c10c881408c9244a1c034d53062112166024185063c288d382054b004188a6680b176ad9382823100d93186a49082ccac028234328d91262e2400583460dc43071a33620108421d2c891a4466c0986049b1280180511e48031c400320b9849141688818400c3c62c1b462641080901050003428090882d9086642016411820699b2225cbb2504b028084882c639605db2028188540013282e046608b2291219605409884a1880419086110055110264e00308d20a74d0c884c033080030825a2087208284d18324a1a96850c80710447484ca86994406da3843189228101405143226d9aa84c02b364c9986418062921320d204861d2987023138c43a8244b82908246205396910a380ed0a02411996822b7718b368d0a806902c67144a02912350282b4040a91314b2404182228199640a2426e904809020160083041092352643621d1064504b70114b04d4b424902086ad0b4305a00311b438458b80552142e1c2301229684989625501602e0242e014162149440633829a4b64c01354aa4106a0413111b854050969101132214b88520810d21856913202c8494010a3812482842c3142684162581927151c8051a9008d8442c01186e13034423b73050843091344d5bc65122a700820222112720141404c31864c3180483962c222132dc848c04a76819164c41228a4316518b840000b0705b424920b5815036108286941d2c20b22a5d79c004deb5dc374c0bdb539556c4b634d40da50855be06d8d36b11059aa84db6ae3f4d1c2167d07081a11a7f53a15c35494cf79319c17d6d9299cd94bdf976b0c944cfcce53d853bf421e2384c1b613d49da392012b100c05a190450877f0721f5cf930a81736eaa2098ffaba84c274b2a3e8abb8b5091342963674d95c46911db81fed0db546c97252415bc8e4d180749bec73dbc34f819dec3544b0b64e44070c225a6171342a7f3d9c35c4a2cf01f6f4a46fbdcaae316e9b946093058b7217f5da366c6ee69db19168bcb2f485370e0e80ad094d81c2061bda7362473c99e26dd4b7213c58e8a66bf6378aef003d90e0f74999fe0ed315f61318e2f09cfa31c3b77962cd3a98e65c1a39d703849d719ce1085c99e0df37d215227da4c2987d63cbe5cab98b1bffe0c6f0c6402fd44b27586ca19a4cc594fd9f3faa1e0aa8fec1b790cf8ed6cca095c457ebd57d0a89071b8371b7a6f65ed35f6e90b51731c09c5ee8760fce61b81cb37e7f82fb8ea45682d065aa6fbd17eb7f119a8bc3342cef4b9afcd225437b8bd9110dfa7a5ceeda7657f651211c09cd314ea63f3c8ef8624429fc4caeb94cde59ac6f63528d4990af5c4d6238aeba9b933aefc6911cbaa5c352fc2e0a31771b8479462ef3011865da42521da4f28b5cd3b564c52d5110382199f149af1d0968ef6d009ac528eded9b75f05e1c1fab84793cc5fb8eb734e8f25ca337676b8ecdaefc7f828a41a71691f701cdfd4b0c24d19b9a8a2ac7195af559e0b19a18e25a4f369e442a7104169473a7eece2b82cf061a45dd73b6857faa70d98739369e64ced1abbc600f63074b6270ea2025abd90844f4aaa226c92871a6e47a2ade36f700b5c56e1899f27076eb37406a39f4c5fcc8253e9777f84f847211f6a665fbfb7659fe160287342074b9de16542c1d1cea4fb6f2e8e53e7a097b384a4281e48dccf3a9c34ca5a18bcdd67f046b703b144ab3f95a18498da217fb0fbe38c429a04d92032dc5d1f70559198604a1ab55986d5736f36c9e6a5e0afc487bed3fea09d580ed55f3ae240f4c914ebecdd866e839401da3450547da22b3706a626570d2cb13fa68c7f248b635aa6a87b819b2c56f3ef34f2f8cb786e3d7a07d53cdc3396611961c289b52c4fb7b1b3802d0efcb20bffad9c11b3015a23f8145015b2905f83435e9570a123bc37e8298ea12f1e23c4ff4f4eb9f07bd3e1fb6b33233656ca4745086af7578cbe377e87eb8265e80b12eac8c142230d040a373f58d758626e3d7db31f40c81c974e82f806f81d320539d1c26c22dcef85e143cbc22f0ddec442464e1d5b68fcf18b32b8980ddad469fbaa75c9f57f51c7ec36f7f641a3dffa45477e28ac254b414030e8efb55984d94d747cbd8c6f5613e814449c5c41d1b816dde3fc0a8f298aaefd6c3f26eb1406d57d8b644461bcc7f108fcee5ecad8c0e554a5178d68bba842e1042648e76f5ba7e70d44acdf6c1ed0e993552ec8b83dd0885e3a747500eb5a23bd9577c418b2fd572becd5af7b6cff842b38936f8350db784b34e601f9a548be49bb79a700f858bc1b8f06bc50c288e81df024aa93337e0f0dc1316b23779a84a3443b47985c118792950b1161d4c498317b6a84b339462c3b01b504fe093063771171027c37c5501f78d01a291a3d4c3bfe2b8a4e375c5586b2d25650f54305bb00fb9e950c2f18fefa95ce61aa70eb9657ce6e003f679e274035a2c61c8f2e9f33cbaaa86f5aa619c35e3398babd960d4fcc0c8513deab5860be248bf171080187ed76a420417223544475c8941e9b040baa988e1a9a327130eb281d1a7c06bb9eb5de26b166a3eaae1c226dcf781cc86c717ef334d74ec79de525bd97eb9f9558c652b758c38b4fcaf1ba0c3d15f9d3da495dedae25b8e9e059ae4c347238b9ba355ad4fd5bae85b85cd47d0a67e13f986700b1e5ca919350364a2d8c72f97be3b0493d02a0266c1fe806d520da5753585abb0f3d39ef5d464042d39119de9a7f3ffef132611e47b69e6c1250b8214a40c8b701e2bd5bde16651b550ef0e75a13598a47d2a33be3ead32394d88c3d799785fc70dfbea2dc42e5e77534250410558d3a8f5592164e78accfabe2e040967c21d3d8d30490133d4a9d3981df7c0777f49fa8671e449ce5dc445c2def7d7c2704067d28e5d85b5d39ddfcdbe6abfa4b19e7f7582863b2e636b0c9451dceb0b959ed38c8f85571e567278cb872abf78ce645769308b2df27d13533912c969757a1e540f90dd3f6c9a5e768cbf2dcb6ae6eeb4d7fc0a82e8db38f4b8283f0649fd00d1891b28c79f0df11d749bebb6fa0b1c084286a2c74add86d82b1513237e134dc1b44b2a12323d84a11799dd980c87e18a54f223c476527345b55b8fab4485fb5522a98ef8c8f3e5339670e836c8d54631f741fc4b3d4cc30d646a4983c45d5b3bfa09bbc87e5b3c22a0332886ebeba1453b4c002b1b8be06a8be16be13b440eae017cb90a61bab9e3d3dfcdf5a0836e47669832d827b88881c99c1b1ecf8085344522a4fdb5ca7c3393e7df89ac3c89f3b9757cd476fe15af14341c2bccf47014cfcdc42a5b72222f466ca2b324a7c3b2c9ce0c1abe933ee39159e3f4b502ebde7c1dbded5077cbd69f66e3d23d358e0b207150526f42ff0862058d928ca604db982f4e41092bed105f7d288617d55bae32e96c44f50c9955af0247eb3844269f95834e28d4e0a37ef5b03b79455c0ae660e32941ac675cc8d7e2e036353cf615b45be3fd0029121f72c68280f5353d1286bf10cc0cd378db30e7f8c0bd0fbde1cfdee548ec7faa55251f07d8551432cf572569836baeca30db5bd194be89160f449857799ae7e765a99bb8e468127f65c7e9a1f7de9cb961bec1026455f503ce5d199dd07a6012d74efd44403fcfb246eee1fc6f2945867f37507feff0b641eba4e94c532a4bce063503add362874523d88cf1502ec6b1f7b64fd267e754018152275f3465acdac0c94ce28ee844d93dca47686675deaa3e0492870d3c7e2c5271f843a7c29b952d0536ca961ee0d69a2a4fe5a23f672e5aa920112cac08b771078348197d381ccb4d2b9c2001fd3bf042a44bf8de877ef7c0ebea6933f23657cedc368f9a51ea8c1e33f4b52850162bab8ed40d6e01e0ce3258cc28504f1a594aba83969230a3e4655f85756b4d835867d7cd6c0b73794fc894bdb0e77d4397cf46bd81050fba18ff6f168b7cf09435243fc635727bd5f600e45cc157c7ac9a328861bf8e9c49cba350147e1b861948800300710abd5ab3af61f1303bc46243656a64f4ecb655be8614b5e4d6ac5da50472a3661891eabb731524a31b646e6998317ec4e46f62c3c946a610905cbd83926c907be48a15d7f5614b0f7730aed5cba25a684c3178caf93fed05baab1107f0512f63f9636fb001026bd2e7eda3cc1dc31a7eec5c5d14e206bfa68e1ce5fcc956a65f98878e09e5304b481d2db018873dee5aa6d2855e596c8e8c388c64fd7ee42435894c5bf62e7c05f554d471b8fd10184d7cf2b4a8abe84942915b3eefdbb38bba5a92b2a5495bdb612c31770e5ae46c745e609263dade6a873346577f9c3a70a1813f57e35ae2fc248d563229ab03b81f3ff5e4b0c93ad944851e99daf551e2c1f685a0d034b198a7a89d75c05399443c5c46f1c1158da88132a1f116b387eaec5bc7d6e5bc55657a7dcb7312129e1f2f78173771e58349501b63c7f9e5a41b51cfb10765190a3c0d328fa7a205dc7fecd8544cc14fa1a0f26bbd12560710369ca3fc995b4524393d700e42203f3c33731cfc71a77a22e197cb595a6e2a3d197fd299a2bbb32fadb8b694df8bf11510764b9ab7df1e1a3c398de2b49683b84cfe0ed9e615d8ff07b55762c495bbb784af37f737762b952eac37d9d894861b33c9ae075d0c1e8e8d9d85e4f1d99247727edb6c31a0202ab85be0a3bc550d59d699961fee34d2fef1c975256366f99429a60dc411eab31ea5d531769241d4241a7e482899745a3910ed84baa3e58d1e0ccc311eac6ac45a5d96034fbb4589ddc4035b8911472bc579473d9091b15fad1b5112887b32e8d2287f82d2c6fe6a2d37931244cc25d33fba2e3e00b47f5c8d5ae2aa53535183b72147c65e0dc4052c6a38466b777aaf404a6c8a5522427afda01b4d7140c9f7f057b47491af06a557b9b4443ed9c4625d4c817d7a128c97289349f9cdf14371f7bf933c4654f0968df4f5dc0cceced0f305a5efc0d8778977a9e549d09a6efeb3034aca5d5f1d1f04170c8da622826ce9fde2b05e1063cfe1b0063af1bde69034dfdc7c1a912972a35b4b3def486ff1546fca7193ecaa8c9aaf1355368e9c143f59674211fa7cbbc64ee2a7a51ca3c3e9d8035e0ff0c5889453777538066e6d122fee1d332f6a41ba0130400c531952f23256f5443d75d718355d1497bc522f5b0b671185ed21b4dd6bbf7e91c27a0384a4d7216ab6a29675cf07de1c67eebdf31b491251591960d28570f00abe45353c26c61ebd9cc30036f4297d9a1cbc4c45a8f71f0a860179270beb3707bcff3ed7d86a7713b9e4a1259cf4f351dad881d1a40f897d661c32721ab409fd87ef2144c2bf03b763267d137224d11ccc9c5b94fbc4118732d1df1c1a5729ba934a5e9181f5c6778f33a7a72ab931647c40d8f788ddd3259"""),
-                    TestUtils.hexDecode("""
-506462786389055DE2E4AA2A7C80388315711A7B5DCC73F2039DB99380D48D9A3DD8CC8B929B0AB224DAE74EA90808C302197EE9D847261DEFF4136D3B2A37CA32533384443B9D935AF2C384EA63E7160BF4BEB89EC0EE705D10C72F2F65A4E75ED2B1901F14B8C1D21DA9C6B8842DB62443D3DF12969CE4E45298FCFD6FB103B87B0817190C5ADED4D04E3BA4D2C3F60CC49FE0695D6366EACB9C79F28C9121584D997B7A3A7AC3243C3C75FC86AF81CC8B888E90095051F7825294CF7E1A11464BC153548F8195522FEAB9AF5AE93C5F6CF80D9ED76C19A0ED0BFBCFCDF30FF6EBD0E5C20EEEC4992765FD23F13F027E2261C38D11FD1631846142541ABCB82C0EABEE5D675EC130861F9BEE9D9E02305F168C85201DA1DA2E4D21CF1E4BB8C2539BC1F3706194AEE7E3ABB2D7447EA531619FD27F0CC7D09E5FBFFB0DA81432D173321C433391FEE90B92E8EE3F39ED492E78327D8A3586B7052602607EBA79CC9AF21132C7D3A9931D5DB4937FD5C5611F79C722E0CDC48564E416DD251C46C02567C4059A0DC2F59A124A4EBAEB9B1B04277CC47A9F345FF8AC3F8AC844A668AC6F7E1BF1C9889C3E42C1142CBC31A46EDE21CC84F230A483B5CE23A901375B27770BEC8F0AFA25F301B7AB43B714C6D0E98B009FCDDFB75C0E26EBEF7C9DF5ED04CB4183028DFADFC09963AA8CB3A9A1BDA047F62460F2B88FEE1C05D9E68D646137F660B68470308225FFC097474B2B2BC5D50A025724FB2CF70873BE7D04C05AFBF1D7DED56693AA4A4E495B1FAF9762DB83DDA6E75F530ED5351D171B7BD06E5ADF46DEAD06AEA37CF262AA33D062141F8E394E731B3942D084E583090F9CADF87C2B81C4B7F114D150C221A12393BAB92727B828C9EB86600B969E1B80F33E1304CEC68A1B3B474762175EA19A4D67220004FD4EB0B2C643B69C00FF3876E9AF63BBEF8AB6BBBE247668DA8F2E3CFD0B95D6926AA3A2CFF4587C45DA60BDB03DA78DDD9758FCF9926FA1F080A61FC0FC7660BDE9B4913C40534887B04E2DC666E981AEEE38746C52BF46FCE0E2233CE02C9307262499BE567C150CC54FB9D96B81D3A3E200EC8F7E87E28272E7B956600DD7692799473A8C63AEDBC8F3F43542B9E399398349B896BBA16E5F26210558DDFFB984FC924E1B0D272CB8834B1FF641A894EC113460C65C66BAE86248B48F675F1313EA76EB4DD0AB6EE41014FD7589D1A7DAB16CB8F113A3FBE7E01EC67B0B3CCD81C0A8C7E9824658C926736A574E9A0729C3BFCC34E0D4BCB1606E93287494577A6C4B1090FA6B997DA098C6CF555B5574473B1063B739CCD139C2541CC3F962EC42BFB3A40F4E64D322836EADA5F574B48B5722D7809A3A20EF1FDF5F3EBC000E466BC4CA10E0CC6A1390FDF159BCF0182293D9C408A8570789C485DBB977642074C869960E9648641C2A80D8A1C4E474FB98D7A3DD75D7AF01D2605945E89493699EB53E30EBB0F936B63ADF5859D9EA1DCAC44D0BCDBF2A069982BE907F1B560AD8327BAE013FBFE6E2709C9FDD498491F1D8603F9F6C9B1A643F6FAB97DCA752D9BDA1DD6BDBF52B03ED7768D98E46092D556C266E30C77A10E68AF76AC3D359D8752E2453B2E75DFECE6F66E6AB00EF37DA6E6A367FC808E1F4905339F4FA73545D13DA7E7DE49CC0A2A63639A96EA039C4EB643627B7EC4FACA1374EA800A505A80F554B3AB3233FA492ED6C17B5832BDEFB3A99FF1C64B35F1531A023415290124EEE2C9A7E34FE8563528B6A4B64DE425A8FFA91B753973CF0C96FB2A8A3F71D58B77C93C5866DF5CB5152B3A0A32884E349C63870E9CACA82F121EC2ACAD7B6052B0D74E9C28B20C76A7A821D192E11B59A7C8059FC49662C655551A7356046D46FCCCEB4DE1F5FC91F35B950F630D743C8218A10AB25D2FAC25308225540FC24CA794EF171DAD7258C2B7FCF43297F6E77A6E83184114DBDBE408EB644ECF49E04FD79769E4FE9B0530F21F8E3913A51094D0E49DF012144EFEC415B8B2A34AE2462607E7B89BB86F0C733A5553CAAFF9B19E0799A1901657BF4FF5AD6DA7886B477358E90D56BEAC6A963E0669C38EF47173503B0E9255AF1F153E673813053A899418E2BF217D01D9162C073F256CEDB73DC062D201FF6056180A8A6887B286AD6D3BD6B1462231D6223D0DF2BBB7299FA6FEFAA9A297C56ACA28E163533406141EB2E65F0C94A6286A0579C76A3A8EF96DDDAC9DC6A550538AD345FC4AABEBAC04682D4AB0977D439CB14F02FB504E10252C1F3ED01A7C4BFDA6E689D842D9B9086517A84AA4257D1C8CB842E15DFA615D2E3F2464E4012C0067EEE60489C044F43050E5B1AB3E54507422E1368CB3EC8CFB03A887DDF9695AD95378F875F14F7DEECFA54A775C60C6B7025E5D6C0563E0E76C05C93E33C3E5AB6D1E1C051B52D2805D3BE0A4D3E8F0DCE6BBA1DF04C7F76F7E13D8C3CFCB2AB04A1E605D4DAD72A43D5223FCC36EFB34D999095E742FB9DD7B69A28E070FD28138B403DF1DCA75E00A160ECE9562C92091DFD3A24C53645DED8E17B39D8CCA4C20C96F9C9F9D14AD3B45A1E87DA75B831D400AC14BF34A9840936C3277A135BC0E8C65E0F5E670AC912FA586FBB4E149B09F64D338C8C886BA65730039B5DCD0DCAD9D6EF11C228213438A1489F4FDC39395E8447212599BEB570D186883E02B442F8BF97884EF98D3D6E59254B3DDB77DEB8429D110F0689715F3E0A4F65908E5EEC867AC7BBF27CFB965727AF0A1EF37B21EC18CD60A1C87287527BCBF5249596083069315699CAD10FFEB2D87810C4DA090074FB26978E56B7D06186C48BFA4830A0BFCEF8FC7B95E73F64EFF78043E8D93F57EF6DC636C8FF612ED22FB21174EDAA59BCF89D1A60F0E1C15C5F8EB8E6A39139D500E8F28A5DB86C125C6C76A99BC47DAF66E679121557D85F5093806B748B3EA65CAC386B59C0A372AF2FB7C84111F0E0FA2C71E137958239534C4A012B1B421435B7BB8CA577DCD8C8B0A798902BAC9B95AB87B6A0735D1839DEE336996C2357C748F4EDAD858C81E2115595ADBC173782E36D4E720A5D29A5681231F9BEE91D455554A8632F7F02FAFAC0FD9D03804B10DDF4828A69AC1CF0581D2C88877BA30EF2982E0827147766F8B71E264E82C3949BB87562F810DE835CCF78A7E5FAB219E64B1FC615E7C952577B9B482F78C0D0C512833994895A125F43EFF066CEE293004E9E0E5288A61EF209EC52233EC64BC0DE76C78EB2678559724FBC05BB5B43CDBE86F6C481AF3BDA11EBFC0FB384AE00F4ABC212B0518644638F01C38030DD05FB06A7EDC6406CA18878DF38ACE8E974123D3699613ED46673BD04ED51C352F124A8F89DF8C13D2B44245084B7FA02677D5287D22102AEF4A4A0AE046BB1C6D9FC9733AE5066C69A10589B0F33780622C1709F179D4E8857564804BF5C4D83E03484FDBD1CC4D71C6A2421AA59043DA85F0B51EF91FA5DF9555072278331BF3102F5147021662D135F3011FA48DDA7C97087F01B7F86D549F41E244AD7374C7C1F698801CEAD305026D17666435217799A4A5FD0ADDF9B8BF6E31E51B654E4D697554D5F574213CF579EFB1B11CB2C136FDB9EBC0DE4D16DC9DF43E17D88EE22EC88326F65875439066CB47E4C656A3AC59BD9A576D05ECAC5B3E7AB7B1A3C0C1C48807C06F1AE4881158D6BAE9620B08BBFFCB9940B6A6D04396014CFD54E93D863156D16F6F9C1556DB1E13E630326C8B681CAAD146F32B6977200B204B632F6CBCFB2BCE9670D89A9CE043E2004773913188608455FA715D1577E03826A2471EF0143DB3C39E03D890F0CBC85040D1675821D282822F80EAAEFF5CAA49699B68B89422D1BEDBC3041AE2A3D6D5205C72123991B21AFFB312F5EC8F96922EBB44D7A0F8ACC2E390F9E3FD82353276D73E85FEC904AE6319B140E5C54FD5B6F19D17E65DAC5EE270DB3E402534B0F408BB3C554D93BBD32B255D478F33BEDF4A192233294B320393D38284D7D9987708C019742F2FC023C041219FBFE2B603501629BDABB9C4223F5B751DB78C144CC50D3A35370EE563D6DDECFD6D715F08E14A00FC265D8433055083048396F1BD4E9F010EFB974D6102401B2FECD972C26008A4B94952EBC61C35DC846FF7B3E20DD9C6E033BF1185F35A5F02139068E1D4F30C4778FF87057F34CE1D2D40BB61423EC055BB57B56C502DB8D0685B0ADA42F9C52B590610CE2F8237F92B71B3AC2AB75D2E6ABBDBAA1E554D99CDB687B72DE98ED0FCD618AF5D2B0196F1D3C19DB77686F01228C3D1DAB1F171A56DF9311939CCED0F7B22A1B77F473E8DB65C0FD6E307B6F7A0F0FAD69E5C1F87D01EA4699F4D5DE39880CF2D8E910313AA6026C17941C41252C06687A085903A502048726AE8EDDD2D8918B71A19B807889B6C2E866FB818810F427D2A7B6CB137D94746A88BBF068EAD31216A5511A54D81031D36C8139776E0FE29EF7C8A5EAA730C3BBF05988BB892F699F72F098F2931F9B4DA17243404F64C311767A98547284063D44AE74735DD246B0C189DB322058198F1D176EAE6E076965CDE68DD0DF2B284D23B94BADAFB8650F21B148B9C990F7044A777F9BD229F7905B242CC2E267610A42A5C3185C64079DB340D86598C589F9A96F3741356BF3E6D2A811B6551850F917E07E5289A07382B8B506C510C9396DDA81DB336179EAC1F84DB9D0E7BF52B906E82FD132647A84A299BA202DEB338B79F976A8D257E246B2B1B60425161C72D534B04355B2665129AD8A44C09D73AF51DEE7043228EDB62B858399B5A4312DDD7ABDA09A846A60FDA8D0C00E0ECC364A6CA95643FAED93D44BC8BF1264FAFA6D98528CD3BD1BFA352BFE1FBCC202F44496FDAF9F9EC53007915EB67F9F8BFBC88D82100210CD471C48F5092AF4253302475F9E60C287F0A8549DA00538432A342814E1F6043BA4355D72268F6E84A43264EEC3CAC024DD6E79143EB502A58E6F8478AE985797F00A295E84A0F669BD9252A3AAC6B2AFACD7AD398DF546"""),
-                    TestUtils.hexDecode("""
-fdec4bc58e167745f07a2c4e30f8d8ecf9c7a6eeee6793f77c27353dab270398dd811c611b6191d597edf44df73fdc14bdc440529b77ffeaf18ed94a613fc3f340c55dd156e8d56769d509416beb75167dedc3fa35281ba7913e94ff5a374e0647a7f6bc99ea6ac30c3e477e69823f663e8748e8b5fc43f1728612d109a2947019331c718ac31e663d44041f88b7861e074f4e1c12ab2077dc59587fbc451aafd29e9a7d584b744d83d36f794ad034c014bcee229b847e8bdb120407201121f9f58fbd0e17ae318dc1674f1c7d9d3481629cdf02fe819de516854b2819cd6a9e97bb92662757a9861c113f67ffb191a086cc6cf612d13f0147bcda5fea3c05fd29115359bbe08a25c33a58a3b38c3214f8e4379b64fbabb00a7221fb01181c7cc2dac81e6271550bce192958a93f2f5a11035b411a00b610728f704d59d7a7e51ef2b06a2000fce618a6f82a06d18a899f7c59a3d12141979e8ba62aa4485caedbd6b8ae8f2dadfe21b7e27f911daaa80b6e22b91012ee5fa16164c5a734265b81aedcbd820b8fc5c8802a5e7cee4f50adc824dc0f0ffd626aed8fc5173b51ec373dfde19973df541b031dcc238a7fff8c01b36f8df74a0a5705a13880f1b49bb82cda0faebcdb8445048ed05cec1fd95011316a53712241f837f7a544c99c631422072ff58f579e5148885f5df4172044aa9ac4bef20e852b46ebba4410b05a5a8cd5993203f44075b0b96901fb73e1e561fe40b0decdc4b719c16391891957f97bd0eed0ce3c3b82f83d0afc9658d84d5e64bc83b2b68762b00eb2a0a474c2386fbbc87ec8b2dd03432506169f3f58f69f0dc62f140d437ef524700ff0e55e39264aaeeb3fc62940bbddc9fd1a13b9d291d82705ec87507e28c1ea90e15c8d3d6e94a66adc386b10a07c81daffb2b8d1176b958f61370ef1f0189285a49058a31c2257939df230e1218693f3dfdd9820407b509f7307cbf02b1dc1f182f9b3aadebfa7c73a6d6fe4aeffd3aaad272443df14939dd94af7543aae1212bb24dc7962e9e96d70f85a17464639f2e89344cc9b6867a6bdcd4191c91da327a003e62c1117af999f2f027ae14522bfb753bb93def9153c2d6c2a6fb8ffbe7923701e516c6a9c67ca2b2b5f66cee09864b6414716a0684fd2e3c2ff1f1d09731237dddad175b9debb722728049ae1a78401b7dcce662fa33fefc2c647b116467f25a42a932abe1742b1f486df764075ee8e765dd139f58762f3c61564b5fd52d4e511c900eec222116d27ad9dca25517449bda55b1509569677b2f0bc99c4d22de9114a8469a4e401f33e7576057d4f735e1c7661a8e986a5aad28026f6af030242535fb87372ef76023761a2b46fe30002e947a0b208f95663b34f8e92f72f8c6b58a9df690426c3c7352b8100c87b48639c072f0ad37f66d2b0e6c84fdbcb7ff506b911425a260f2a4e3ce3d6abf5d42af4fda4f37d0d4d511efd204c09fdc42d868cb8e036ef79b2425780df904fbef6e22f5117434da776e99253f0d444d1ef9cfb10f4e0782d3a5ae10b1627f7b71b040f081c6f5377dc927e65965bec75a5cbaf4eabe36c65ce71c75476c0b962a278077bd765600330570474fb68a30e9e427030825674408c0534eb2db8dfa2e986d45f06072cbbce4b3a2e03a1209fa8a9eca591128166b40bbb20419d31bb82e30b2ee7962c9fef7e788b55be7b9bac11cfbce39259ec32bf200d0b490fb540e1d218b52d04dbed8c3f650c8310e257d887c472e24ea02d3108712fc88de316657cadaa0d8ebc417da228dbda1ec98a61d1d1989dc7f10a0b4fca9f6dd2c614755bfbfe26586fdf8046bde39a2f8130d5bb9f55f67db1c9d9c7e626641a97b09d4dbc3178039d78e92b5049b7a5cd637cfe35d6c6b86771db2442040d15667c256c6beca875675a5106ca68ec6f7a01257c9c7b3464e01e8146085cc3a9aded04711d2c363cf7f262ef90f17c8ea28a0c15fc2eca9d970b33ab22fc43619cd42839f7ef53660e9aa88a32fbdcc5a74f370c6696922c4981048cde02342bcd5182f0d633cdc90b383068178de2499d41159d32f6c22989d230e0802ef40823a64625003c29b0b6c1d9eb39d15baa69947508c141dd169caf1c617a2ef16149876a56c6b2c4a92be4d48b3d277bb5967fa9931611a57893486fe3b8e8b92a8cae0496b0808b49b712cc6473ad44216ce3d1855d704561abf8988ca52cbcf7cf95d6b071acb061f03aadf2c50c4159380262edda1827050675cc375a82010e3e3299911db2d93727497ca0d75f5e539cf75d412177469afd91b1a8c8f36a2e4ac5484020eb0c7124ec570f94778e8a43e80d8fe145205ade385ea279d4bf6c4ce8998b118147edf888391488596f2737bb381cf46c939db876de724e141dbe7066f4a13c35cde58c718bea1e2b75f6b6d9600fa08835abd0863f2e3fb8f7d776b1604fb068f0c8260672fda6062e5585c595b087e399f6a6d1d26857425f600ab13113528bd2de7b8b78e933aaf344880e0aa06facaa7090627b4bce3b193308f8c152eb82e13573770e3a9171b2177e9593911ef00efee1237166261a38111f07cacd74f6a0c2283757f182a508ff531568cb05572eedc6e5b706c5ee3b3e8139b7ff6fb42a9b87cde81b21ff2e6e48d0f89a8adb77aa4be8db46ebad82b4033e857f6575c1bfc0500ae6b95c4c43843cbe7d83e8684a1275ee586e50b7241ddc72c017bd7d4aad25e468b824a043504ce3950b79a5dd2919fe3411dd250ea82ce01477306b09d0cb9a789bf24d22288e73909a57ffb7a1a395be080518d4bdb46e8648486ca8af29cf0311548690a2800648cff58534afbb5226c2e860178308236beee319c14811354b6b05a324115dbe53ea9bf37b7f8284f4b39dad5ffa4ea97ebd9bdf35d593d63026667da30e0df76941822908f6df732a8dc018bd2a93be0a21d64e33da01292fe3fdb5370a0fcae68f860af88dd8a4055960621524ceffc2391dfc237205efadb78f1df769e070b09431fb7206c2cbe3319312668eedbfdadd9cd246d3d5dd648d20758882ff7f3f156412394b7568dba0150e27fd442b6217495d2c42108e9f16e9167684caa81366cc25a31766e4743c49eeabe051cbccf225016f067939b238fa3e9330e4a7443d36134d7df29f8b260d0b7a3e14345b497de4816cba4921e18dc9dde508075da67ab8c210c730abeaddb040cf4e673ec03bd8d803fded05e1256d90d3c050aea4c223c174dc9242de76e95fe9ad0970c3ef6eb5e7afc8725c77c5fb8d265699779f9cb2bf8bb26a095472c939bb3356bdd218f0b2d99b29f0475a4858dba236123ed647e94ed485a1aaac64b7c2ed19d98f2d24019055c5c7ecc88ed2cca17019388419b3f9819b489eb837bd3c7daccff555c7daf5e5fb5c75694c96f566aebc5ad5a48c6f272f812b4606e21473e295c006c190a6430f7137c9ac20727e68b0eb6fbc8255cbab5cf3832938b7d85e6a4c46e7f7051571981bc3f6f86b9a6b149ae260360d21587485ca40dffc6e93c78e15b875bc82d31e04538863ad8bb8f736c23bed9a9698b51550f91caaab6731bd6feef0226fd3e08b3dcccd33cc6f7c8d8d36e8ac344f851c3596fe6f432017653df0030a64e73b1758322786694613bfe06cf75586e12b92ab563b583161292f328b56ef3648b050f75fb108102f0e28be8c4cb7dfc4283f68eb6bede47696b1c9156194c7152b79a96cd36639488215ec9d49f8abcd5264d89b51d72c447e31ac2011f7223789a82c702340a4ce59a298713aa95e17c6a3e92011f5ec81a3a9b6537f1331ae446965e58c2e1aff4931824fba76940c5f0abdb079f4ba8b32e169e3947594173832dc34e824f296e93099ae8e20437ef564da9fd48d6b6a2cb938a9cf884fcf3327e1ad935257157d0e8e379971cee3d5df59135207930ec1212b7f38b324aab2f172726712a9d60e40a0054f26586d5b3a794edf8f33819da983c209f9f4b514875975e40f72cf9ac1ec28811cca5896e9b4cccff414650d00e71ae2e37c4bb03274df43ea5edb923e157ed3adbfb79b2410b088c6ae9f78b10eb87b0d336c5adb19db50093a7b26fe1f39cb7c6b19001e4baccce386684acd8850cfc64aa0e16ac6cd15625e73b798651fd44828f2d6c4179b21af6dda2262c79322f41a49b9327f8ff0381fddcacc5d1444f449b54d8cd0103140c292aa49bd3a807e5af3fcf33a0176a3bf32ae337c4e187cff519a2589ec5a75bc531ae8092b72fc906f1d82735070b76818d0d5ca9266e7c0f4b9506f8adad55bd8f04f5b9baab4662d20eb3cfab00ab81bca5926b6909b5fd30b14c5581152aa37a3a275642f790913aa9f44f95161bb00c736eae908f7b3c0745514b595d947f97e67758cca97f754cd359d5a4cafe7884c10f379c9233e8f9de5e1a4688dbf92d92a256eccdf06819d7badfadc0f5235b3fb9c66cf65c6d755c5aed48610cea135d8e1bd748fcce6fe74cbea0cde943ef57d26cb7d0699f9069ea14ce1a66a5b57fc442c123409b896535283cc724c27240850ea8b9014d01d4ab2d8d151719f3b2421b60e2ce0792345f88bc26f2e3d4f9cd3a69777a114014ab481459d5c5d74278cf1c0ebbbac2919fc1a77e0997aee5ed24560563448b471e5679b13adf445634742ac1acab6fa5a0b6a0e8e285714c12fc05031c0ee83ed821bfeb0bafe978f785ba36392aedeed53e4cdefca5f4026b535d7a1a1c4ec9155b42f79c8224d286927c8af6b24c0d87e9089d2becaa48f11365e40df4810dc90e12ea6288cbc3cb2b84ac36af1867843be343c3c734eea10a54519d9c6bc0f04cd978360d5eef8c5fff75a3e4748d4dd37735919a1d6c7c4c48f5aa34567737d3084686b1fbe2f23e4a639542cbbe7f99c18a80f97033795a81c9ea029d51e2111e59c7b66a2c78629a1594db70c5ca13f3a55cbddf56f1e66fc9f3176bd073532db09afdea26530bbba27ecac9d5c164ac88f7fc3fd71781dee0612ec04b790d66bef2f748e93a6215408bfab48c4932277e3052dacb3384588456dbf15fde73c3a2036123e99d698ac5785f7027bdc21a130e875870513c1acd7802959f29cc2c3a27c1d9b97256e48666efe178bf7a1b6764cd25a4e8e97f0f55089af7fcc40ac1c3174f9e9d7c2601c8ccdb7c62930ea25e3ad4b63af9c2dcfed98ec7360e85327622f01fdb3617aa4c47ceae1dcb3b64471cd1d810d03540685d2a34cdf58ebed79b81aa1b0d2157f68ffbccbd4e617d61eb23c4c77c5bab60c1bc66e021c67a26e383aa01d3b9f53f20b9ca367d1e571dbff0bc8baf1baf9a934f7cfd06103aff1db525bcabb83b254460909151355d60303b86bce2a5d0642e951a5f1b356fedc9f6cb84fdc9c30e39231b15ca1d5e26730cb175803f4f9df3521e1f15ec7ad77fad4664cc1f96813c119874e5390b2b3b04682bc5ae2a81788426b185f57b308e3b061df87c9e69b1629dcff9b4104146c063143a40219e4c0844a58d2f91cc58dc9012de1b4c7ad6afa9ad0741fa13c651be4f27b09ec40d8bb47196068ce43e9585b1813ac01825dba7b02aded59d3df27ab5a18a7100b5df7f68b51d0557a5c26d794cbe0a63539a16e1c3f612d8a30965271ffc16a088c9b70967ee3229e2404d793086ca6f378cfc5d0c560f9de81493cfebd6349b7923e16980d2f04c5c48f7f85e56853b11f78e21900b9d9dfdba973b87c1db5c860a4c890292c4aa4760cf5aa9972a1db9ebae714c93e29af2d9b3ecea7e9777e6d4fb2550f3f952666686cad6282e0dee72b88d1b68bb1ac9021d89dac8a56a01c0c2138fd71883c7654f30117019dc70c85fe42cb57c23a2a37060402a37f8fae690abd43221fdcc23d992150de4ab217d35aa5752c3bdf2fa3fdca3202f7b0edfa83d6a0938a3e2349c51d6ce1680654c38c8d6bf2659c1885f8ead0bd687cf56144f1fa6f32e90e08f059bcf34e3493f42a85814c24cd68103230430567a960618dc99cda88cadf09e854acd79a2a54dd70dcaa5510e0cc3e4bd32b86bba8f8cef4e08867fea37a14d3412ab5f2c36c61e6e96eae2a00ae94dd5f27d7a914fcc2eb6f88b8a73fb0ecdbef7a4e2d15b7e9263a37880d242f8c230afafda5a7e919260b6e14a8d65381d73878858b0001a581e7add55c06ce1d8e30caf6802b33805e2b78d4b8eeeb20c747f7cef3a27cf17e3c1be070e8fa1adf20ddadf2e46e53d8702d75c637c2e9d9b244e12faa41f1ecabc5d98979dbaf2f0a00d061f1bbd0231c94fa5ca97a75b93a48bb3d2babc9cb0a589df0f8cc72265971e49172b588490752854f599ea4a97e71b0a6d415d058dcc875ef3f09c37fa7e4c0f45045a7bfea8fc0bd9e0c1eb36a0d3e7e03240baed7cb5d3e6aa8ceda0a0b394584bde43190bbd0ec6ea5fb3973799db1f0fc11232c3e588ca4aadaf4f7141831468183a3aed6fa4caceced00000000000000000000000000000000000000000000000000030a0f1219242e32""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-89ad3b5244d66fc84f3dbb02bb51be6fa25bd2ea3deb3bb6d964448351d9821ff3350a0923768e299160662ec5f29db9d9591e3b6730565c74af37804e43d888b6ce506ec5390c18b510f7f40702ba377ecd3e482c23f10ddd8e2dcf132ff6caaa6cbbe799d88e81dc0465de420f7dee501868661eee9c9a2113091bbabd22a2d10692099725cb201163862d88c4845944051a414010460912c764a0066a081666e3484cc4c440d8a408c4466ea3460509170909844ccc2822da9481901449880831c0c20c9b106082c6601c9871d8320ed1942161246c91068201386dd21811183131c108282091450a248d09329219277222042891020ec80228e022429b2011e1922004b92c204440044329e3983110435118232d19b761448425d918901347614ab6084c8428083229c4206403b364d246856230721283000ab94409086188c64d24164012c281182186144632143825c48281cb9230dc162219414820432e1124221023124c1068e086640883811884210446525810725348485a142024119101166c1a8011d0244900934dd13891828470e4260919b06183b649d3b488819285123692d1b685d08261c1080e21b78c0a305013408d0a101098208a81c24d44102143202d0845280208264ac8700b342cc2186102394423280c40369208047020b948199951e420204b464e124066e2c06522202d10236dcc246a89926040281008c1119cb28898a630cb0464428045d006909b8211192646da90241b824c2212892005861b9451013165e21604c8347200448952124c1a290d21a74581942812268048382240400d0007301a056ec1244c1219822088480c4829d930828488048c40489a064c4aa40061308d1a25314c348e58822093a204212268800684d2328211244a1ab96512092440140a91166e4a845019057120178559426c8aa41114c0651b98654b9609d146480ba24c99024142344222024042480504883022426984024d23205244006ca1806c14060112c2251c289052b66452b82808b30d9308094126100b8749c81285483429c922019924450bb16d000460202742c1162590380622b5050a4060c0b24018266c89000964882d81320aa3b68de328250218469b34899180894c20012419469104611bc931a04052d4400d1b04300933648a0031c4a8500c430802252cdbb631c1482e00a92954a850a43804a3006ddab88820078ad03880904620cc4846a0960d10b5211c373289346503a2201b88084482805bc644d10885929208da84211292841826329ab43051904141a844a044120212311992290949244c4428c99251620820141244508404d1049112262902b620603208a3a270c4367241422593882c18a00060a24521378c4b14441c222061366e249641e3a86d59c201a292700a0006e3405021174e090942a1348dd3a0299a96219c924d1421520b430e0812129cc868e2b04804b94108b64c24016d5a868c20c8459a082d5096689994101aa5608c0091088950a4b4484b24654380211a266411968d80a22049369118c6290aa16c62806cd4a40d8cc201e4324619261008122924c42409a10c10230c01c609c010069b84699a14240404814324620a1162031548203191418209c4165220b72181a20010396163b86814374641a06d98344a9314869b92459c044ed03805980249a3b041d0960c5010048214060439249c02498c4220082828e3426d2228308b3451a3046463466a19018c5bb24022a30454146403221210182689044e53828804a72193b840c0c06d0a8144d9100440b20444900181a664843825c386812394645b806059080d08c760922262e1b2501a41721a3100029111e01065900000014669d8021122c8401b1192cb0850e0166a22812c601261c41649613442003089a3a490e0c009e3b8289ab42820242a0aa6451a073264482d04362648882140002ecc168503286e99b0614c342c802260e0b0080392110c841018130a19188a9c36610b465041b88d22a129db307083008423a124629661e00465c400681b28451b444dcb802c54c688db4265d0121119038c0c036a0413115016048ab2090b09260c050954486163a2640c281092800c03804053928508004904b9845b186144a85194186ddc92040a4904a00811c8b26c548645189544121685c04265c38860d4c42d61844d11b52c42228400b611241a129dcefb764c1653d46b842bdf5501ca1428a8af384c3016be82afe02e5a8c299790705b58a1f23e130b87ee9058545ca4762cc1fc1bbb0b5f9e7774e12c40cf09d64146aceb54d786746a48974aa907cdbe16dcdd77eaa11f1d6681e810144694fa949a4342b6b7511314bce155af629d90a93a3cd10a6b2ef2486634aa06121a8f1c1595e6e0350f470c0f44b37724e8bfa4773ff0c6d76d9a597d4fe2ee9f388ae8dd477beba96ea6be86e026468ef471e5135a5350d72e7f82d775eaf3d797c89ae0b90bcdeacb6752e775d7e90a3095cb725b5d6a82b994b439d0df25115cee06c9d0369f237684178860baa33fec3248860483389b8379e53c6eb16fbc8191603197c63f0419e9a98e833f4691229dcd5d94c71e37144efdbfd3a3d27e31d29d08abf2cf5ad55c3d93fe29650990f00859d0d2b6ab597246e7fb071a213c7c9e6090eb450a1e3fb1dc67c1f82fede9a3b84291930bd18975476dfa714ec3a2abad61a3bd4ec0210da3691d40aeac169ea03d9252fe7676d6d9262505e560796fa073a55f8c08b88e050dbcf80b813c55496045e2c8c45fa6da9248e18f5ddc1c3f1578a65eae7406d7cf41e67aff1e47520a1a208b6cb98fc3e6efb11c735287cc64dca777a4a9d269f40f77a99bff4bf40c18ff417b6ff9c4bc4927b0faabe301f6d98a52a9fefd655ae1f25d1d39d8a2963a8dcd54d3a9a6103d676727dae68e774ab301989f4d8f7ce36f0eaf5bbb736305ae2631e783799354d4124c75eb03973aefdbed89b6a91578eaf23a57cfcbafb9bd453320eb6e7dab046bd83629778226190ffab199abb162768975a6daac7a899d4586aaacc03497bf99e4ef318ec68e08d38b19d71a5c637941494fb428ac8273ac37b829bd8c9efb230e1c5925251f0f5e97913ae05ae2b9a94a06c3a3f50e720615766d2996625376d1c3837e587a9a6bfb7b22a52f1239d137dc5f82b4003a082e1afd13ec71f0177ffb29b6c7ca1d029a848a7a51615dfd49f1238ab7ecd99a4c247c6521136f713bd607b64d688e028ff223f4abce8ba86ccf2e467819556f7ca046046c3745211de9619087cfaced23db4d37c4d01756df82f3b2abe99ba612d222e5c013eeb0b75b4bbd55bf94201cacb7c6c661eefa52fbd8a1fd06567695a07fb596b13222141f7ffc72cf791d5773dcf847749859c27aaa4b5704c3b92031af9f527076dda5f45de8ab53bd023c3816478325782cb71b5d17335e235cd6386a816a10a7ed30f8dd9137cd5f66e76b6fd8862a8dedd5e6c388dfc4f73d060c6a19a6bb792ec2ef5f96fc5e470fc3d3895188dd051e59f43094ee61fde3f7b98ba1bb22debdf26acceb87ddaa01363f81beeec856ef25902a3692d0f46b3a37ea4c47a72aac18d77f3417a901de6e5b5117ac810017c280c37c8e0f19b157d84087ea8f74e817a1c647c699fb8ee25c473c8932cf723ac4df3d96475cc77fefc54ff6cdd8490519c97328abb27bf387c78274c42bf6beb338e07dbf954f37da0964a36bdd7740a93eb2a15b553e0879bf08ffef6f48a6983d3a419bab890f0fe797ff96aea354fdd4720aa4a80d81f58ce31039c4176dd6894f19ad915bc52645f4098c6a99306e9f842ee21e735a4092ea05fca13d63c6d41c9d799965124946dfde3108f45334af1daadff53ad649654c176d3d1239c7433da7a383b09d335b1219cabfa72faf74aa4c9ace7d7c35e3ef24283fbc33d52d9f9ae369edd9ba948c6a6e0c8ff652c5dd3249ba4ee9190548df9d44553ea48fc35521eaa19e5067015ffff30bdce2378c22493d4ab73678173a68f5c28e9b3b08de6ca1ad3feb47ae9b95708ad2abb571099faa68c92d2f64af1d3ac55301e71ceed47c9c21738397cfb834b6441ec1b1ae9a96f326590867cde1375634f74a42b5fe376a1856d9d3b4370407d99edfe986235f62e8862a4b2c25d37f15aa1ef6420fb7a9c41f1fc59e9e621084e8babeb2164dfbd0c8c27de2c938896dc918afabae6af451e53fe3478e41a9fd95a339bb010fa98353e5f17e07fe1581386b0d860991d1b3ce8be86c9eb0f6dda114448f42bffa2467a4ce338ee2e41d5fda6af91a333345d904a8ac8d1f9cad18f06a23b02d32c480fabd9982adee870acae3fc0b018bfeda93b163255814cb7a874ae669070ada5a9ba584baa3737d7729ea50d233c7e4a002ba3a5feb7b738fe176193a628f165204fd147b1f8d48c39122cc2987eed7f5f059c176836a28333fd5cdc1547a62e647e17c29e9f5e55c7707211dabde4983ea5dc9b6fdc600fcb8e522953d2bc3ac7d14c3bdcf1bd2ffb62db49c0c756875016adf31909e9c7a409279cf074e230267a7c30d07cba46652e6209e3be8a970af8c8ba6e0abfe8fa53340f06ab556be351cdb6df4f88a892a569a54bd3ecd71391094f2805f6c97e2c4dd8ef01caa44aa0bbf01e5f6b96c37c6f59f2aa8abae86cbbb01ab64afedf832772897ceee3c1a8676c25eb2d306ede14b53dc4b131201196c6eaaf52e5ccc1e38c904fd00951fc0f5368792841384091d47ca81b2f9b15c5efdf13524e97101911f89ac3065dd6888253f9bc6a13464c822791a240f1867dd92a43bd5f2407cd2c85bebcae207acd4e18630dee496a926184757eb76d6567e2be02f8e1260f4b996d689bbefa840f69bb410393e6eb1dafd44d9e9b5d16df766ec1acfc36c7cb0393343d266b1f1038c7a93e96912f5ab45c4152f5c41e5146f94d363bf7507ce873a9e3aae23f2507c5593cd3aba4329b9cc282f51a25fb50e6a8c87911f36d7e249603fd8aeeb7075839b4cf6dd2a39d19bc4d6a3e7c1864d682700d70972fcb47d614df7697685ed768bea835dba162c720c2f4edf2e6be50af9b198cb46ac8791a4b86e8c677a572ec142cfc8aacc8fdc655654c4afa8fdafb3bda9bc8c9d719b9b47da3073ffe1de8e60621c4e98372252673abf4dcddd2a48b9c431ddd3fa156c16fac044dad53e30bc38bd58d7f36a9751161acbaa04861a3fcdb3a3b6d92217f9d43f093198de2ba201d3fafe8f8b9501ec822335d3e38ddfe2f85259d29df67d6a6b54a4ce9b42950d4879db4d5e2fc8619ec15737f2a986ce120160fe68100eb4997aea3531948031445f0f0c1047fdb41e09440bf5655e1a72becc30369ec37729967fe08e75c6bbe07d7a9e25016540f3a1902dab57d8ac90fc4ffe079e0c4e42f9ce69b201f878e0b63a85702ae51a27a0fa5ac968eaf676e2759bfeeadadab6b70cb54510b8d0c5d9fcfecdb5047cd333872d5754b3018b5cca68d78114bac87d37bb3afa465e3e7dea2cc023b56e729d7df130c9161911ed1d56e5eb8617596dc4c1e167f4a976d63339bd444c31362716554c7072c65f483a3bc44e93b3ab41f177dc20cf32550b7346d42d28421b23eea1a3b2c38738ce9803996369b3dc44b5042ab7ee5faba539c208e65562757242dcb1b9dc34c453be1869fd575b3b32336beadc238a3486e9fb9f2c13c3c4688928397224e06294302d158eac9405b11f607020d8f410410460b2b54c4612dd992daaae186d130d2cd6cb59b3db055449d4293d0ec7459f99a5c89a6bbda86956b28b372f2e4b330b07bf280d2b498c785597536fad5c3e5bd2ea1061f036ad4df26dd7a19e3a5ffbb61831761b622877b0b61fff288d340a5bd9e67b32a3b1a182f2334273ff29ddc92c9af073280659c5180cc38eccd73417ddd1250ad04b7c241e41c993518dbbc9adeb525b102fa52d6c5c82da07d09364e14b2722eba04681408056e10c3cb95d68905ac63512c66da44186edee4db51d2ead4af3ba930ce11bfcf316b007a3eaaecb36f99aafa98f9eb58aa4be48afb11bd9ba5bb0c11ed31f2f221766204796aa21a6be78afeeb2bc239602be1c4c5d37643ed6847b3396a3e3f541493a6d038531b08d3ff3bc9b0bae0d686612a19c8786af55f744afbd0400f79381a4949a4918f9dfa67e7428b7449edcb13ae371fdbcce79a2e09d5e43f8f89511ec74482885bd2606fc5a50c46a57ff5f9fa416dc163e47e5e55de6e15e91c1ec9da4c424fbc7491c5863affbc4ff8a3e70640a4a200c8c332fbd6438adcdd402bde5cd2ca3f44365aa1b5bf6a4acb87f953521bd04c4dfcaa108726a9143338ea67a60543a383c2d95c6810e96f75202cc13664fc60df2e278aa81dc7309cae1c0bab58ec267e39dfc01ba3de9af0713d2c7882a6787b5d2cec943a5925449b912b5e5f9f2ceebdc723c375ca5fdbe49af7fcb5546bf3c741e1e1decd8f537a9aa7f351646807e6b6f2476913c1868245a1bd0a8421869feb3bf7db2d19151a7e918a0aed4ebbb3199e3fd7af74117f51900969466814323ed64a3aa9c817178c1a6d7dbc465bd2301d9e6f9878fca977dd82411807a747f5f33c4d4ab5e7bd6cf3d361292c7fe43ee50bf40ba8597a725333bc4505fdc08629feecad7eab499f6ee6fd3033986779920c7056fc7f8c01223efd7c5bc52d65a51c5d3fd5d96db44ef6650a26ddaa20bba2565d753e5667c4e883643c02dd5b7b62cd590ed41a2a970642c3be4c427347539e4b19e8a8ce898d014caac039cb822cf49bb225ff4ad402827e7784570ad6f5a99be49c167de94cd81a3acb72be029b50c072b03906c0e88e26b631034c9279fa87bf75a1ec57f87f5af302fc0cdb272"""),
-                    TestUtils.hexDecode("""
-701B8AE25CD8187095349A4D41A067D4FD48732E62547E491D38845B3507A7A6AD8F8AFC53D139E47FC5AF2723B1BB057FC797519AC93CFB18DEB496BD9735455CBDFFFCA5E69C95990EF89F509728D1CE41F36A4C0364AC8C30E3EF67D3F3776400BF4C838A477231E455FF76C92CFCCE1B69B00F99451B0A8287ED59CD79EF0D6E697C93F7ED38F20204921E6E2F141D3DBDE1C201E5CE7C524370C339753676746DA5DE4A398CFC2CB1F568C16D4DF34A27CF04F0637B1447C6CC83E965A3F86C538CBC235E440CC2D1257CF916421EC75928DD6DA3CA002AC93C8F464ECD522EEF7E048C154D73053DA7BB63A5DD845512D2B6B7D1E7EB5818D170D14A4A698C8922D69A98319A10E0AF558E2318FC390ED990B75ADB50C6199DBEAF5D53B49235DE7CA116932EA38A109322AD05F5D681CE25FFDC9F6A05C4ED2EC6D4242173D2039318EF7D0733D86D57C4E114B3476392D47FC68796C9F66B1F1EC70610E1D57436614D5969564DEB8673686170E40BF5CDE506F7E70964E07258D4551F5EE0BF2651F8BF3D3177DA76AE90FAAA69C4F373E664F0A1FCC62F208A8BE130C499166D13CB34D77FDB32D5A7F3AD38856BFD3A0419B8744DD2F186D03E18634D826A5BC87F1566FEF88D9ED93E74ED4C005EA3EE2EB22FF5DEED283132D00C7A0B131BE1FA38E30EEC68B748AD533BFB23B9A14A936F609D4C560163235367B0D64C2C796F1106A1A9365E8F507B4BE0514C849A81E2C7388C8AF300D98D444BF808C4F9338C47A853222D5AA8ED283F57DBF0689E5FB89A456005B6B95AC3D791077C79BAA2BB42B423F93A7D0D999241AC5B9D64D65274817F9BEFCEFBCB4D5CAA67427F69ECB279553EF0D33A19E14FD4B284A72081F949FBE2A7543497F314CD7496EEE866F33102BEE5CF9C706426EF2365EFDF1AD141552BE65D1DB4373B0E8D449F3FD1733AA164C1F2C24F74E240C5096CD201A11113D6BF5CA19595C4B0A81E1153A4EBF88F38F1812BE517158787F2B378E8E32C9F97432BC9027292E5EDD7DA64FC6A32788154B62E40A85701895E13287BB18883820DBDD7647AE4EE1FC1D43C199EE69B1A2E2A7067AFAC541A8F44E660B2A7C114F402E2054DA7ACC41DDDEDFD7291CD4573DA22739C7785EFC2240B27A90BFCAFD1AFAB6C2B0EF5509D0DDF349C173E9A6C906BAF5692C39F6E0D1442F84AD2FC118A14B12C3AD5DF8A79056017F4FDD76603717B080E3AE560D7A601EE7FCAA36DF7289AEEA59EDD0B73BE91782377150F03C2C2ED40F33A250356CA17E153480A7E848F090DDA29C65FBBFB495FE9B7A2BEE342C7D422F28631A8C9CF643DC76F07F162DA1AD3F24589971032796BCDCD262F55A8C34FFCE05FA9DC001FB35D6FEE75B42DB6DDD2138C0517D003512F0EA8E982C2ADB5E5BC1F19B8ECE67E4AA1681383A97976B6A8F2025EA80B1BFA1796C27F6A54C583711E2EA46D85C515EAAD22ECFD68C5D02853D688302704EAC4863DB1FC69F8C35411EC6F4A9F0A7E7B3385ACF6DF805447BFE863181A945E8E7944770340496F5A19CB7DBD0D9010B7EEA3C585926408FD40F245D852DD208EA97CDAB0C16C1EF80B3E5BE77D953A04C1B6F53A23080B54F439705E417B9874B3FB524794D26DE3DDE88E9DB9FC36B1508754EB51D389FCC46F822F50FCE199DC14E4B4468B8B15A2460EAD05D0C47668C05A2315748897AF99D320E70F2AEB96936D7D739F72ABAA6960DA6A3996988F6A3F7AE7772D49915753B936367E022179E69B6853E1A83B429B42BE19EE03520A5666124B657D2FD6D15447AEEE45AB1FF4593DE9A2E6D152C64DF45C1F62AB9B67257B2A2115D224850A3AB2FA028F8F9FDE7C9A9FBA2FD291346037A1B4E00B0642B07ED54BFD70F3DCA3D1B8628627859611006DB2DD17A351751F85C60028DCF21481291526B1DEEA4C7CD2D3230653E6FEA1DDBDFE1BC3DA93FBFCDC5A405975A5DC68DA0D8338EFBD6CCDA1F2374D72FBE007599E81CF7D5C37985EA09C561A1EC40A70784FC606FB7C3FCD981F112C599C78B15B7739AF4DE129D489336BFD3966C10363A60E749162D1D8311C5E850B22910B999080DFC86D1787C35768CD5470E9F7A51D4EEBA71241DB57021D6569ED2BF201C06E235D6621B292B686D23E29DA4E81C873371593CB07B3DE46E91FAA3D4A2AA6F62FBF6BBF1954647E731AF4B99EEB3C0FA6385699F8EF2D8E1D7F75161129A1C7F8C7C68B906EAB8DAE8BBB3541FBC65F36BB67ECF19EBEF54BFC2EC4E1130A2E4F36B5644A73CB0E244738B6E5788A4B4457291B57F1FDAD2C11FE5C7DCFD4E742A0AECC460BB660D7BFDDEE4CEA074958AB94B6FA4CCEFE02FC7001D3A2CD013684A1ECC2E2F6D90D246726EFFFA99C12D1FE4AD10A6BE38D70AE3DE5C4843FE6CCEEF587191B56F666C1662F5C6FB03955C557E1B4CE247A2806DE39EC40CF8B97835EB0E3F2D829E0FEA02FE60C934FE72A25930FD6692B9ED979F14536F406F04C3CF0BE98647A5967B81DFAC353A2F8236FE147BFD7D3731C49476C3191981C9AF239AE8C72570C6C53E7AADD48E721E623D6CF11A1E386EA7C30F070E7AC4F63FB42AB74881BFA3FF3E8A35EBEF04D39B853DDE0FB17DD9DAE37A76C96FF55F64669CD9521DA3900B7CB297E813521239D87703CA395CDC8D8CC4EC21CB10A1C672493E013EAC0298F8076C8E0B56AFDF9C31EA01CBC1BDA4AE17FE103C9812E940A34EB321BE7BB288CF8BE7017AA58AD528C9DE09E269B10C6FBFBA5E8B6883FE7E08A0D184F8561FE3F43582CA045DC25CABA52C0157495410382A048BA67D051EA115D867D780CDE5EF512BCDD14489C43604F86D929F83D118B905C63BFF451FF3540E9E220851A402BEA0DB1A7CD94DE0407AEB9CF862BFA3FA703924D0A4803C463AAA827A04B0F09556054F27DB98E22A96D07F81662E0E910836B9423968C3F002E605BB688720FA7CF3167140BC21398B5E4968804F3C3065FAF125BB6D887C869FE3FCC27D88E048FFD0925E748C096C74BFB1E54A8FF6E2C838F16769FA4D8564E5CCC58DAE3B102EA300361EF89EEC689FB5BB0DE16C5CA98A60B8990EEC0006A147036871FC2A6ACFC6A6EC907D28E18A76560A5436BBF9353789C8A5DFE559FCD68C117066EEE5B00F349D6591E104295E78F445FCDD3D6883DF50D1DA6A04541C7E8171523FF36A9C072164147D14985BA30FD449667B580D73B06A5971B720A8B1D2A6896FDC5E4D4DAC78353ADC3449AA53919AAD15EF250AE12E9E40B8487F66AEF0B15E42BF34AA816F559062EEA24EBB01BA369747B29404DC1F1108DEAD021898298E72F4BC1DD821E4C88329D6F03F971F554A87FEC87F34430ECD1CCC6627D8CA49EEE1D5DA6704CE960021C847DAEC2DD544D4EAD2E2086058CF131296B7F4FA4B71A1DC6D6C642A256AE0C0EF9D1211EFA3845B12243BFBCB4F423E913A2976C1015569ECCBC159AFE70F1EDDC3AFAAFDA45CC02EB60BA0DB9EA83EC604113479BE848F381FC63C63B3111DC5179A637E0832A26EA32555908D79B308351CB104C43668371DB32056BB63540B9C3E5551A063D2B525F8A016BBACEB402CE7D7072CB9F37CEC13E1EAF7D867534C013D78B9DFE01C13DDCEC7A3444AFF9E182F12B6901CD9A70F21908FE692E4C0536B069C89685BFA9D973983AA8C1DA461D18ABD27A6A717D9F2122BEAA9BB1742622F51FF616FA2EC3A6D4724A3A9215D7B29A1BA372282CCF60DE90B3834FADE6E3743AD6B2F9B7344F45A29740DD7DB2D642F94998579A5DCCD2EFCD2F7D08486BB327B844EB19ACE3B4FB0D85F8A24FACBF318C98199A0B2C7FC2CCA59AE84A522890E22C2A7207CE91623362C7DD8E9F946817C75B71FB9654E2B7F2E83E46E75ED5638741E414D7F8E70914315F0E37B5B4E3E1CFA8288B1724113E4A00B59B7764C2D61443537849E77083FD13BA652001F39DD9BD4B20AB77CB945C5EBE686A0627ECC52F38A852BC9E1AC8D303E3B96D9D086920A19E5088054DECA635E802385600F673D3BD0A5CBE7A5B9BA8B1C4B73B9246C1A1C1071E5F98ED42041037FAB67184C89BF4FFE3CA0AE2A9BCB020F390F0B76DE2B8AADBC99268D3A1D467A024184CC9A455A8F2FF287A4C9DD1B0C86C8E176BB15B12023B291D44E7FF0C44577F7A6D788D82A75C68C9F5BBE504E7D64FD2AD18BE209E85C45627FC045BC81E3531A2B886173F3C3029D1FA98C792501A4942C72A7A892232F390CCBFD7863AC38D837755011F919AD8934742D0795523E6D48A958BACB9A9F7B9A5A9D914C37114CB111CB536EED3D753D6333219EC993AA5D39BF74E8E9FA02D8BEFF369EDAEC67A5CBD128FC9BA6F82E31A4C59D783A99912C7C389EC708824AC7FF05D56BA6D228C0A9D96324C6D9725E3BE17C44CAC7C4D49235BD15384F95345DC36519466A13110A58300F7E3362295DD7069DC6A88B542F2BC5C9F33328D9D8D1683902C025427F32FD562BE3F0680FA05851296E15C5FC67E96BAC924407AE6BE37E9B61D9A6383FFBDC6E77CC0887726C474AD735BC50039AEC665D827B0F6BCDF7EC87EA6BF793386F2A65C997545FB93F0D53737C53D00685DDC13960AF2632380F105840A1699ABE53999C568978ADAFBE21913193DD0844D89BD582418BF8B6BC430FF1FF7750AE8507495C14DF21A3437AFCA7DCEE7B1F1247C802081FC5ACE5B125AB2BF11ABAC97E201EEC2A8C90ADED920728EE77E1FE2BF31A222A1CA5263586A16FCF80E582258654D0793B1551EA3C24C4EBD27C52956ABCE6ACD05FC2F088273FEE8ADA0256F30B5ADA8768D8E9B70279DF95AE5CC68FFA99934C7520E12F57D213FF18ECA6046A9A3F32E280044023220140E2485A3B3EF7778006B18D4A9DCD177D190CD903CAC1EE0897F58762299A0E026B8EEC6F4F3D0BE1F070C648A2D73869F22DDA21246CCFDEB7A9784AE967F0DD0A2011C637099AF33E0D608AA0A5B2103060CA1A6718328D451368EA3049FF60FB66FE54E778DABC48413966EA14E22083A884E8C8EC33F885093F01B5E34477745A9F82C645C8C5498306AB00B78684252ECD74C163BB8AF9B49AA03E244F4EFC4A2E7099074F512D465C84773DBD1FA96D26053230C192DB289A1596E60B96178DD8CDD72FF14B340FB5830696B393CA319649BA56DCD517F5A08A528350E2D9531B3AC187414FA6E06C0F05D9987BB2FC98F7C8D4F922B8AA45287FA83B900ECB6C9F02669063296F1EA389858F6D2E10228E136FAE35F21DA151EA7AAEC593E5948536B68BE58ABC57771AEB406A0C3F931E7DCF85A350A3558E5C1B1F70E6299EC9FF8B9CC13E905D9902FED957ABFD7D09FB84FF22BF8410D387BA85D8555A75F432EC5789498EA36CF235276176ED48D1E374DB5C2DD1A64714D64FD20D4FDE2A605034E4DF607EC6E11D0465DB25B9D79C83182384D64477C126E9B8558489F69AF29730B4D5650B9860326249777DFE9EA5669736692D0780E9BA346C1727138F5DDD4914487CF32A4E9CB1DDD5617B6B45CF8C981944684BBB7921C88F5A25120047BAF2D9346E220EA08AD168B30A1B82B3B63C4913C708C02258B6AEF1CAC96E2A90EF7D0E1EFC0BC5BBE05D286E143FC0CA4A23833CA12727F0F83079F7BA80D809D6C739EC4D0DD9CF75C4FE30B12A892096BC4B9167F16819694B2CD5DB4B80DE8DE988AD50677695C4FB3E0940913C250645333B6F55E36F649A43C3A39ECAA3DE3EC1FD4F9F65D9F7AAF75B60DCA3BD1EC06495FF5F1D4FD6D83CC6316E40BC469EE5F44E5AE56ADB229A7CA5CA37A1508531E44B0142B4330048350A40FC82279D25A87E043240B4BFA7321340502F0D37073DF068596C4753F8709BAA2A7264ADBCF5F934E857B3225CA47D8A182B80D3DF24C3612FE4931EED565BE563115414CC2B6BD102DC6BCA9F104CEC8B24BA5465FEBB7E9730C928D6FC1144224232A990F8BED27FE6D28AA35A91F90D6A0AFE9A7E37A5BAE51D8AFDEBB7D5670F2521095A56862354D2AD946663B4BBC7049ED1884347734BF3E78ED227428476F1070F4DB011F8DC86EDC5BAE1BEDC9C5D253E4C5C6816347EC96C5F62AA3298588625304118EC32DB2DE0597BF2056046E17C69EAECFD26475066AC54D40A673741BCE72F138DD98F1939598E5D94D565C1337D1179DA057D4453DEE27B5C04777EA710D77B317A6E8DD3B4F26A6A9B3F4917A0E881E5EE528462508DEC6762DE2BC3F8F8C42E8D721BFEF7583C99DFA4D1CB49DE2A303B67AFD505F8A3865D853BF19C4A0F7CFA92F5CB18CD5D8E378A5B041449EC9ECFB80E0865CEC1734D34BC44E664243AA8F605366CE9F849700593C76BE0CB19CA1255B074A8630FC962B50106CD93DB41C6E4DF53B6B1257872B0D8CE9AD5F245C3027A3F75F19DC568ED1E0F60CC20DE625241D300DCDC8C953676363868B680B471C2EE623DA408C7E030833DBAAEE8E701374156A6B785E0EC7D1A0A55A599605BCA0FB517EF99939889C862CD790240709BEE0226DC7E8177F641C747A151A89340A6CCFF6982EF39683325390DE72E4451BBA74E3CB102870F1E9ACED30BDBBEF160A49746A23C432C3ED7EEF580969110AA438D00AA03F54E039195D61B7840222AC994784EEEA538B7E830A6508AA0B460DA4B4C0DD9CB052CE6254774FB147F7E4F80214AF1FAE59F8ADA6509123438E90AC13FF7CE71AAEAEF7A39C434C3824D49B894C389CF320A430A7F84A5F4972FF98C388D61C936E453BB1A340528A9FA5F0B0DA9543275435E91B0F5560E95F9AE4EFCDECDE1584761F8F60F0280ABF40FC5834BFE456EF66AF66ECA1098DD49BA2CC4B12CA9CFE256FBEEC328D049BD6BD19E2358502672F029888DC3AF3350BC2EDF5C4E07D59DF8DB9C14B86F1FE384227953E98978997902C8F237C8BDF300A72248B3DDEFD52577BCC0F99F75B92BC056719243F7EE67932A2DECFB15B59C95B43E183BA3DAA41B97E177D03CA320A5FD5D7E5A88C4D54A8467B883E0CD5924912642A65F191DD4DC2B08DD28EC0AD2B1CDB86EEA3DBBF6D47754B1BF7036A0BE90CC3775D263A5BC688844BBB9B1D9296804176E17C55D6DB888C2BEDA3D546FC496EAC5243AB5D51686AF9B29BF6D4A138BECD49665458B816BB09848CC4318136E6B170BECA544E8ADC35D40DED979111B8B1D4577DE2FADE6A1D97F9E82E9D3F069F3287E559E99224C6494F36233453036DBA617088D619395518B4E6725125850B3121EA957E721244DF53FB343483D27E6C3A53224B38C11C1D64CBFCD7041A44836AA606D170A80E84BBC0973556B9E4B1BD776C6A0876D727BB0526809700A0EB318BED67843CE4A6BE2BC10FE9D8228A4C94D7A506760E580E8A0E544ECCB07DD0810D79443046951C72E017CEE5B2C959754D477D706C3E043298CAD200189F4390F59BA27B0099DC551673B5138AA654E054676BF30DC61CAFF444CA22EB32E5952A598C07AAAEDDB83B8B3789EEF97663ECBD33FE356DE981A24C29DD5217E14DFCA30C0109419D8765A061F747BFFC1E221D3ACC7FE239375A9548483543599C837F48EA189880278AB2E06EA44417EB945F20ACB464CC458E249A8969273A460F063C5FAA907E42C9EE304B27C85BF41FB170708969A2BFDEF37B97DB4A16BBFE07370039369D04D0A9155623AA390ABB75D47FE2394E4606759648954FECDF4554F660D3176AF33153A9D7B0A935753B11E6C7295B0FF5680A18A42ACE577981C500581F741CA23DFDDBF22EB6511E19C016EDC96DA545AD16D5EFB9A8F10C45D78E01C74E3552FFAF35CFA1BC0C3DF9D14C1BDA9D510FC7C7A755C71B5273CD7CAF3AF44AF066DCF18B1B7D6C0D546C9C0B0B1BBE88F512824CB8B512438ACBB23CAE1178DA05DD67DA6392649213805D680AA61D26092BC1B2CE50CECEB7541D7F10808DB2D4A6B12841C8B4B6C5519C8683C998A74AC3BC3CC44D81B606A9A3174929E4AF06E032A24E67E9C66885004F07D4775A6C66A8F42F94920749FF902A8F1C3BC5A1A35BFA24040EF3B7ECD05654CAB696D3323485EF855361DB57A65C5AA0B238DC551ABD6B4A8DA0EB987A82F56E5EF05CEBCB4155181BBC61C645B2A4FA8B316FC6C5B3BA12829E74899D0A42B42821094B57E6D221FFA108D5D0EDE9012A88A2BC361D90673BB3D19D6355B9239131B42FB3CE832DEEA6E4551BF6C6533CD8DE572ED3E5DC51BC1ADA13C0C7E4F723CB964125DA08E0D08F1CFAE124568DE55E2B39B1475DC8F6558ED763FD7EC2DE373F4C54399A0317087630AED2A64BF13D113E8AC32E6318EB7BC0DE20E846C0CACD876F47CBF79DB6FCDFAB75B371156CF74B443E8DACBEAF94203037BA14E821A66244BBB7E989567D176FED12AD0BACF79834D067662C11422631554D1ACD6BCCBE23BF1D0C042C1CACA4B9BD01D6C5757E52877FB5DFC92161C8BB15A60222D12CEEE973812B4920B38547304E720AE246FB503C9F97BBA79640485624DFA2F4D508300BB80C70CF8E271770876062AA1EE0F548F6F7D95CFAA17FF1FAD847CBF6CF90B01D29C33B43473379F4B5491532432F6CAB98C365B84D357B48B416C2A00B25D07594ED4E4CA0E1BA5C92AA2F1DC7A6109AE8D71B9F06440A770FDC2501900B9EE466DDD853CA5482B4636BFD58AD8B24D91852ABAA0A37536D4118A122951DC78F02DDA8EC8029ED938125D759B24C90B0FEBA1F589AA1C10FC9597CB7E703D93AC4AFA43D3C239337AA454BCC471CC6BECF89266F588C3EA71AE50F146097D9CCF21E75790A5F3A252977E4D848DCF5D96DDD4FC1D0CB583A28AF9D7648BDAF8F1E94A83CF5349B1F4AF63AB1C66757B75C58D10F27F8619A5A6BADA67E841B6429AB40A09451313EED76B93166B3A5D5561CFB6421D83A5E343C8D277389950328A1646C3DAED357BCF2E8615695D7E8922030148844058D177D4E68A8EE31D5D810C73D9B38F6863083A8266652DB82A43615A45E6D14EFDF00A4333404DB65194EB432187C1EA7C48F819C34E48EBCB0836C84534A238C42E0B9BADFBB15B220DD0BF40F8C0511BA69EF82FA57D099BA84EE4AB6FC422442C3BE1E8DD910B4117BF4047D49419FCD2380966F665001FE4793F06F272E14E1893D502BD3343AFF5EE94A58CEE04E745E72E51124AE8013EAF2C2141012FAC54CD25E97B6FD3F0891BA1DE663EBF009A7008222F461B4E7D50628133DCCBA7CD0AE44BFE9F675E094D972D896551A1205FFE0CA8FCB739192488D2BDDD4E10493B43C7EFEF60888CB11ED68F34630623206E81ED04D300C2C43B6F27E41F18241651FC6B84C19EE1EB018BFD7A0D4483B0B6DCF57236AB27BF4CA17E52739E4D1C508C78F6B6E9FD53F423AFFAB01F75A9B1AB725C247492DAE3227ECEE2D60EB186BD8972FE455C393919E6D9760AD1BB706138824FC3C9EA0F673C1323366DEAFD260591DAE60AEA2DC22FFE5EA2421F35920550C0FBD78C4F6469092F89FB6908457BC81A175D75B1F97E2750194E68705B9D1E9F762068EE2FA9286BCCD3ABE98007AD1AB27AD2A094C6E164C5BBF88CD4C5F325E4E91FE2867A94E9FE1A78DAE2ED1C11CB4D365EC2F3888612FF58B493268645BE9ED69C196857F8C995A42D5CF4542E609BB35B0BB1B4BB85295ADE635E8FA237C5DF471B8CAD7E98420077BF1DBF6DCDCC1322C8BE1B8DD5E228B6E6E04ADA1D533B0C6221FA83BE7C19273F9AADADE041CEAE389D0572D2317906005BFAA17940026CCBAFAF8C7A4BBFCE30EDBF4EF82902E181B41A1FC006AC01BE64CF6E4A4A14FED995D6F323405242BCC5797E43276ADFBA44EB8E3EEC029292D2DCDC8E6C93AA6C02766308CD367D3"""),
-                    TestUtils.hexDecode("""
-16c069f82e6f6efe9eb825ae1b6e908e32c28e3b0ffc443e9472356bb19fe58378012592c1afc414e0ff970a13a9b8cb51b968a7ba9a2f7d0c326b5e1d074f5af742c2b548f87b8cf1baf45f86000801486773a4240372f8f1c05e0e9ceb1bf5f18556c62765cd06c472781f73f6c766b44c2f94e436eaedf8612cd1fe381e645689cb6e7befaf031823029f5a6d8913e2245fec9159995956825ee81fd66ecac65d960506f2b3f58aa4e9a6606bae585205b351c5654b9ff455b08aa9ac45ad3b20e7619a3383913defcc42c0d25acb6aa2f3d4e17e4febb6dcb59c31e853fc5db50770059aa70d8d3c58d3b98efea00f9756260d843cfda0c079fbbd4933ff8512ea6e379b7b1b92ed4146cd0135b2c8ac61496cc70b55de5eff005a310eaf50ea88666e342850ec6c22d2d5cfdeaeea40321c8278e341b8422bafdfe71b42cd3483d71df4c1ac8bb0c86a72480055d272dff99203919fc2a7836adc985befb8025e6e491957159183949343d316004c075332466101f14aa78296cba1072799d978c1b36e94f042eec38b989e0c7e40db362fbccdbdb56236397435b65b12cce3f13bf55abc805973dde8f9c65157c3a3751209afd01396ebd7bb20fc16229ab289848c1aa48f5bf86791468df8950ebb317d72c050270f275cc219faad9980c69c377679c4e137810813734726ec78ce545199e43552ed33ab3689b6ac18fc54fe847af97fff3e2d6fd2bd6885fb675278c4d897b507d37b5cd1eb291d6195c03b5beaecfd90244a497c69345f70a118f88ed8568386b1af2bd23c9d0f2763c19b669a7378c42942a242c3721c59a5c0390137077ab10d792e2670da72dcae6042778d691ed96dbe126c2ac03e6f5a71eb1cc363997ce106c6111e3ddf50da12a23447af30d684548536c2402b60b75805cd0a8ff2ce7b4d7863a0baffd5c0b98df8dbe6fecdc37b2c882027f0d5b78ba3bc35a352d419978bee8f39faf096d31196590c415044500140e8ca976340496f084eef29a1a1fdd8df215da732f37e140aa48aaa393e5d3af9b266f98f5ed1410c9b4c88936f1e2b225a6e1c99ee9ddb7aab09b55be15aff94d2f43a8ba09d673b5d1327ea95f42fd26b4e13cd02a6a26c0d20fca8dbea95e71a9d9b6ce80fce8c7c0cf0ccea591916e4b9eceb3b42645615a40fd063d1e0c7753211ffca88a67b3029d6f7e387b11ca34d5357df38f5d92042b2f9a7d8d27ef6c8ebbce9377568cdbdb146d2e15858cd7133b5cf242406a857e4247462d87994959ab3b350cbdbe521f81b9375ee660b53eb534195a7cb0751c54f3af3ba72ef2cb3aa6c748270a64b17685d046641c20156575846e42b93fb1c754140ed6a6a02df039cffd970c21349e2bbcb6323815f1849d38052e6bb143d11890518da4a213434b820c79994586638b70d6c006acd43e43a79821478bba9ec09f9442fb15308d01f533c460b70a28c710da2b3f4ac7449129081081c4c87a241ab2f9483add71974846a3f32c3c96a08ad090098f38021fdfeaf50a36261c728aa6395b2114a88cf9577793cc7bfe45a7e238b997bd35b2ffb0c3992f188de916f7c004c5f83da5aac274a47bb7348df3590668efe9c2503b2c316dc074262fe874ea700b93a9d2545ad3e22b395d294bca1a2b5615d259744c56cd3d736be2c4624a1302cd31ef33f75373d2bf8b22a9e85db1df34ea4d24f0593cf9d494ede243517e2618dd0a6bbd0ff46987995805ccc3439e39babab22a53893223e25eff5276ff7a5eaffb88fdd248f3b2a4936ae56bfac6d778126930b25f05bbf031fb0574aaa129e4614eb1a38171e9d19b7fa0ca5fe7b4860ae3447bf2de8a89b8d0e85c7e130bdeb0f40e6326b1167f744e2b664e370f8a9d31f662364f442f1cda1da1f9437ae6255367e242253a325de08f6a12774612997a2f8b2a6a6e084ba51a07947ee7f4eb68545594756582be6232224172439c1105f46da151fcf9ca328497f952151b38631f4797f6d6ba367ee502dac0b1c5f45137578a5fa947e311cc84b73c56f058a1265ca45c10423aa165f08c53bbbc7ea42309297f7f37a98d146c48a7cbb566e005b76ec243ce6f7b9231428cfc17eb4b1e0b8d3002628e3ed7bda600a5840d4c1b2fd97024bf2f9ed637b521e8e1645400a7037ce6db2bb696b604d6b5f4b40a9e4eb443517c00a5ac6c1859dd18b6fb772155f2d8be3099b638602bdb9e3941d31bbbba3cc52d7060f7b45416c9923ee3697caf14e7f51361051bcd540cda6a14a71cb62e033603bc9d58ecb39ade2144b13d1746f0de2d1742cb6b34d91917adb69634084e08b9b37dd2c62f55eb64ca81a60ab5b71bcafe2c42f9c8d9ce59e6be9c2f0019c3d96c6ab738cc9df2976f0b9c47579fcc2d72161317c541d5f7de0bdc19b6f7d3264db1079cf3deb1619fb6531aa0032b19d2cb2ccef9fd6c1149c12b701cf8387768c6eb004fa6bb876f7ec010abfcf631caa27cf36d30c1738d50e868214ff8989ad497d0b12ed2ae83be1772a531610e4698bd721630dc427f07bf6b4356d720f335ea66969d14b246b757ddd96d1607dcc72d9d36fb10f9a529056255b9f962ba7a02950a0b9c988fd381d801af73d7d9abdd842cac56a77c5e2a9ab91785ad17966a2fc31e42a663ac583488081c236d13b82b09933afc57e25847f8511b0cfcf472ca6b21898ae47ca8fe674a55f8737053ddcf963dce0568839660b47f2dfc9eaced787aab897d16cf1a1e969f4e5fff7a8ec5c3ca33b6047fccd8d32f4c3a61d2c69075e37640d9120330cdb9732ea9325e4fab3e94ed580fc5be75acfb14468fd12f6e4cf87a7ac340f990e33ee4e1d2cc48a793c8c480b59fcc4bec660d101fa1c61a50b423c16c09a29d2dfce1d2011d4e4cae986e4822090379c17ff077cf56d72478a9bd703c2ea037ee7419b8b4464388d3bcd5544d3a2ebf12be85917021388950c180f2b020ed1d6dcb3a7e0770c7c1f5a44030bb4076e568996c307182b103050bd43ae645aa96be787f1d82cdbd629220104bc5167c0a8b8436d828cd70d34c9ab0c039cdb0a1ef137783e92bd7eac1c995268ada3e1e8a494fb00c5d678f5b6010c8687b57bde36d001452b0a73912f6ad0f7076481210a975b44410fceacd0699fcf7c1489e42728ad705600cfe6c2267a9c7979274e73bc2aab80155fa561390cc9460a93f29c4db673b00dd95d5421b8c9ab003fa7b48f82fd6bfaa264f0debe6af3aae7716b66c5533c94bc595e646c38b004bfd638e261b14562ae061164db1716208f79e5ec5e457a9ec47d2b0b7b7b68a62c95de164217b7472fe600a52a3aac43775f267832bf98ee2112ca9db28be3e8a828bb1ac676178ed490e0d27fae273a7d1de1fbca15aabd065890467ad7d4648487c525bf1ded91ae1bd3a99c6c734d580c69895dff04f3409c2f7a3e0416b8a2c53c75dacaa8bc020c803ad12e8a48f850737fe8d88f08643bb6863ae7b23103b0037255cf87f27aecaa703db904d789c61147b8307928bb184bf94ea902f14032d3ab1d6d13066ef6dcfd80cbf155f68024fd9fe95ffa782b2de5c97e1027e7f794c4ad6a2c23e3b5c2de5289a1f96a4f549dd32e9e4cc07771da9d1c170a315ef9d6846bf10dc97c1ec7b748b5cdcecab920d93bcb5a706b23e70bda6ac80b8efc06eb3594e5edfa4326caf3afab8cbd479f5c689e86e20247a42e828e589d831a6f1b2eeaf747f903100540ae7d725b0e48a3d921c303e13cb2a3ab5f8cc20502b90ffbdd69cb42ec092cd2a24ae408436e77565084a7bc20742fe0983744d7c876b646b1385a383bec18fabda857b91088b8c7fdb5ac5591bfd8b4f5c8f880509d0b6a54ce45d15c639f3b818508c08e6ed4a37497b2080364ddf01465df73e2e91a7a9424b10ed9a6bf1f05bf559eced1d0b667c35885c43db657520609a3f55017f8ab363fd83ff7a88974aec48d9b359d25ac9e201302102b8e62ec176918449e7fb745ef5dfc03381237e259f4cf200714830b2ccc4925afed71a4b956d1bc55b9aacfd42aefd9d4815a6e1f6151fdc9379e34faf98911e2d5a64152c426c0e8f386e06a86190fd5aff238128a62f07e02934356511cfa2212cfe3df6d5c87cdef644e7a78b34a95dde40002d4fdb43243a2f33cd3bcbe00d3503451073c3b13bc772f98a579c72116f57f7bbd07f966bafea91fe80541acc19e4010723daf868ea6b5760e66d317090ae218f57ad67c2992b36e84d513052eceee456c29cf57b8336516148ce3835d6ca526913cce6acb9a6fa1e0ecbfd9f34609a6751367c07a6017a78e078f2627e9f7be020482731cb93e778728e0a35a7f5bb2d6c4c9e893f0f7581effe6881f645223b699367feb54b8bae06a68e025a9d8ff507efb1ee6a0b9a74b14d47c8c32a4188f98d9b359ad1dc9967d19aa737355356442e659db0097635fd03e6d2f629380a5a6394e28a13ff69f36ea8f0fc4b70d2d002500f988db49c8d4da0a71e720be07034ebb3389b2c75e3c6254a82e2e841ea0c99755dff1ae01e51367d4e02eecd304932510a947f948007414e2bac773d7359243b8bb9e973cd4a11f7e6406f450e42416ad0927b133e0767adf949efc3dcabd9b523dd92b63add6c12d211edda7dcc73deefa427ac96b72589ae0c9808e7bf62ac31ed8aa5bbbdb33db466bf8a33a7e3b170058b1cfe84c96eacf005ad0796aba2c994c375b79862fcb6cae4d13bad1dab2b838c657a55f85b988892f62c3581cf60f24478735c04288c1fa09896e7fccfe1a102daa51c24924ce9ea1ef8831c91d526a55ba7ef2149e0a5045d8362329b6e3487ce8a7f0c33a428149c55543bbaea26b533ac8103820d405138c17510970cf367b3e3a4c46822d10e05ed47ba4c3bcdd02eb7e4fd990da55a518761335f9d2efa6878f8d0e29b2704d3af11dec3f7a8c2fa9a7104e971ecdb7f18d93ad2a1ecdc8a4d1dcf8ccdd66608859438ed23e5179f6594c631103828dc2d9f8c784d2a4cff15c58084318c18571af7940cee704e9f3cd0bc758ae7cf9d70995f1f1422bdbd2bc441831aa72b66253be6ce186f6e93613f2d3888a555b578481ca324878518dd9537e5e1e7b27094dc5114a4e51a776fa8e5e86c556f45145cc3216569c17fe22bfe281579a6fd70334c574d1d7aa5fe461b3c0262830a2afd4b485d348babfe81a3418bacda574019077cfdcbef5de1e73c8a8bc3eb9113713b563da34073670cde452e84866d688ac9f691916bd443b02c8bf15c672e1e75b50156e1e5254fc23e0b0d6fa530435ae5fe06132d691a3e59489c7102aeec1ae9656aa334321b8f07aac206dc80cabc6b3c8aeae941438ff5cfbfc494fe08661ea496b7a81cfc949d60928251ba6217813140d050fa68c34dc58771b80b84e79f469442584db07c6b5ed39a5f83398965b715966a3ade89570b09a501860accccfe10aada86ae989bae9adc4ca7480916e1bd4733d6484959e4cd199086f413c17b61e16f42ad93a85ab8ee86e09fc1dff1087384ad087a6d95dd845e457f740e538faea88985df42fa2e0ad89c8885de6e0b1514cdfff9e86364dd37ae591a1843f60f71b8e8b6aedc3155ce76d1fd9c4a20d077050d7942e8369cfd9e0cbc19e62e32d15edd34b7f2645dc31c1de6ac3c36c5850d43a6c479e7680f02e23c8870c1730ad163dd31d38e1e7de492ffebab9f3366e85dc9ff42dbdd1eee8bf448abc8017a2bcee2367e958a01986fe9d7083e45e262595937e3287b499090d4ff466f52824b032428757eac7756ffe76ad43e6f70c98b4e0769ab91695a6ead1a1ed45ee36218dfbc4994b7e5227f0fa0536a9b73b01701d10f97d0c4b1bc9adfe7c2bda52e8e042b976a0ba1b9d988acacf9481831cf6881e70b21520cb0abfbca56bc3fde95dfc84de3b3aa9d4f598dc5aea2473ab0b2d9758b4bcf353c3fc2c6a7e487cdf1af90ba9b5a464539e788b86077ad0ef611a2910f784d72c75169ca095e14e4916c346e55cc1bf042b0d578d2923580709536adf49bbcbb7fee7d4c8a61fb39dcac21ee50f80a7bc76e82b285b0bc3f0b0fc9e70563e82ae65345d521a5ecbe211dc07acfc85f707c6d23326124eae586bf2fc77b6021630ccdb6dab8569b00374a1623f1a99138b870bc25d20911836d1aa907e9029436cf0d17dbc9bb350ecaed0bcbf4d48a4a7cb78e602e33d13f243347496765c40c8b786d8bd4ae6d9eb6ab879d4f56a004f9d6a3b6e98e2ab72296b546cc34abb697e7eceea1273f7d8658e60112932673e090be0c212d3d664237b91714d93edc6c86ec4a3c98731f7c102652015d58abca17b412ba07502d79ba43963dabc05bcff231d342951f36dbf8f8097e363595dcf7141215284cb4517474a85e0f0212c2e3c687d868794d51d1fa9b0cf102a62a3de0e2082848b90f31f203291b8bbbcd0eeff6b769095ebf9ff344ca7dee7eb000000000000000000000000000000000000000610151a212b3238""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-a01e3186a88928fad593837cd6f24d201ab8aa8cd445521805be6ad197e670b8119552cd53b89c7240f90d6338b72556b13b536a015192d33c5cd605381bbc81a8b98cc0eba107cd87de9f70329dd0fd02079212805b9160fc2a5a9a60d441e3ba26dddb791b77640f153b1b81f3e48274f1d040fbe3bbcac672adc977b3de8fcb26892097491c424624b08419936809c44980422d0bc52858c04d12246de036900b1552c92082e212294a1491d482006244014a884d5284810b928513c5042290485a462608c7086192118b88699ba621a1484823148ecc442e44189091b6090b4701d016901a036218a920a40622d0220611b18110164e8a022c9288410b2690d9882101118551803020392ad188245ba23113110ad4c808d0a281e404026246519b9889a3c068a2b6115a326208344a11c3895a982843940c03021121356c0a218accb24421c42900480aa2004990808002496513010d882011c1386520430644b22d00928c52224a00a8099c822881224020168d031166c49204012011e3104a044641598081414665d31422080788990884d9026588224610812c88462888c44511908014846180162041480a0aa3891c345023b1509c826508c1011c8485a1480502223123464c40304a11256e0312244cb88880226891b4801a21500c27840cc300c2c64082182e40a620589044e1a251c3166d5b964d98820404152180a0649a1862e43812a1b84d503005033989020324d9844514420d24a14424830488949101c22ca3067014284a89340458360c92267282968549482223c50980865040448d09812100048c08a24d021382849604003286c8424ec9464c1c308a193046a0828c18b62543420401c4205b90815b084d220268081405c1980022092c00a1114002819b967001b00520234911c6219092881b8410e1300881840d0a040091a445c99285011330d84850a0b6711888611038108c3472c40040a4326843b0610c186a000600c2a601dcb480240386a000058ab6440cc281182769134565131090c4101201498a10b10922a1511aa92cda28251a844d4a06715c3600198490e2941124176a94164c4212490b0765c1c80c2006240ab38954042c43422601434ce1c44d1ac450c1b040112141c3c461191531e4882c1b260d10118148084e238790caa04d01040d032284c9028d0cc05061a20d8b884082282141b6080c208d993640880229d1a66512c988832828e44022881031c1266554306d19231049804153882c1a9745db264813364dc13851442430dc886c00c349014306221008d296241b124a41128219c705c490898b16209aa06841b48022985059066501801160285101c1459994889b84800c02809c4482099661d4c45063a001e28869413870a1b42118144d90c848581846132966c1380060b41120008409326c442270443600184010e42692a124901a072adb125210498220379124c52c84c2840a3849e380410b2389092892d4a071a2b28000c511d4461151367010b08943088c6110720a014502002611b650d182250a24040383099c3091e39830d1b471818249d21680c44600a4c0209836488912851b920cc222660b302112050918b384193862dac229cc800c62c4681a990920962c10834de2842908222aa132821b09856132512015701b1484a440650b4790dcc8801a10311813404186808292494812698c2470981826a0886d14314602a36003289120098823062ad3268ce20451148970d3366c02a6681245454a3092a4186a5a90111b3864c2109191368e440882008344d2920c143149d4206659404d219444e3325190a0899a322d0cc530c010928c408000162413186c204872d8428404306e18a00cd4b24118c8701b22681b266821c9254c1288220091d4c009191950d8c6081111262388881cc8041125460aa8449c444588124ce4a42d03a311e4b88858928c18966c241521da887023264081100540946403a36864b00149b489dc26614ca440211342d2465214456c59224d0c052882b43159125121120844a049d040290cb270110711d932645b060620216089228c03a911caa464c42401029749c9205098483283b06c19290e61b24044a688448681593810411048c4c22149104591101010c6501a3940cab47120a22084802552b011422050424804d1808d0849324088044200081b804d9136922feecd418babb28c61376c9c351e1bc00c8a240f716116db00b6eccbfdbf5ef2f846486c0b7924448d1d803c741615efea5fcc8e10c6d62b9610bbb81ee811d7893c49735721a490539c6fc0fcbaa4e39437bcf193288a48dfd1a9c0904bc7ead823acfc3c3a8a0d794185088ee6f2d2c3d52c1ffe802dfc3c6e174cdcaf2e9157c43dd2a1ab564566458ba32e883df122b81139981cb3c39d0fbc5ef8d99976f3ca7da7774be9356083ee8a62cd1fb2cb75992485d99e06c3b80e730ae834ba0e9712b03b5043ec23ccff02818b633d08adbfbbca8c73fdc2e13987e7e41059992305dba7197107436c150f7d6d32d5287f9525fc223abacd6b738e5c9e0224f782d572cace63db70ad231c4b4f847813b83f7fc3bfa1773be383ff9ee5f2f4fb6cf285aa29c85f79354c5aebc52ef273a18906ff1c8090772ad99c2b36ac609ce4dadc7bdb5413da59318dc99467c2fa50824362f1d3a90b5687e0a538806c376b66c9c51279429bdf512a95aaf44a6a111d8965155138e204115830bbaed35e48f49a11a005b158d50d9817888aa6c5d0850975a2e83672653b4e96b3714dfd0e7ee462d9e102e68cde6b74a7c2db937139b45bb0a7a5cdec9c78c05c87b3911bc62793ba5b30be3ddcb8f53df6819a5c3caf15d5feffb2a9e604cd56565685cf1073c4a6a055d79f7611f0787a9f14c986fc3bd355aa2798d5b5a82e3455e372bf3a7c464b9df7f7b9afd3f79e897d2289ec7e671b31908dd6922fe5095e78a59295e11bfc99b439199ba20999d792a71bf6c89fd4bab83831a82867ff448a05153f0c08829c8f60651a0bcb758390596686dad84d89b1cbe0f5789b9927bebc1548da0469324aa11c78ff3f71b1ceee67a7b081fa27568e1a931a01c401e28fd054c2c9e06f77486cb1ca8d63f0f9005711391617a8a5492d84fea3bc6fce46bf4dbb35d0533fbf71b84724fa7d633c06855981f6fedf5d27c659d7db2d15c7f5f61bb3543df201e314d29433aa35ae101fb46ba5a72b6c222e5a5e953e3f057c5d8c0e2a22ffb01bc79353fd5d5078e66f110a4053c04a541e6bd274ec4e3d33bf93490564ee3c0fe3eabcaced466947472314fba5fa531cd49b94cd1924924d00503e681a280762f18c05b3e26fe8cb68b40ac0149e1fb912eae03101c763f7b3ff32dae52b9c5c7d616c6c0243536a6f1f5a2b9c68257f3f3f33c966c2892a42940b20a29cd52e418484ffb4f956023e464c60b762580208a340056aea262b14c70bcd5518071d514ab5899f9da5f06c4cb49df15d2bbf9c0da6f65842604861769fe51695bf0c37f986a6f71b75fa7799b24c1b7b04a6f3f5db7d9d3083c503d0a4d35470010cd06ec41e2dd8d071171ee1a3f55077f405b58be9a57e772583f35c4cdfc15cbac417ed746b8117d906df3374d41c48b892dddf227069a6d3e74547e8e197f1a52d4243f124b7505310916e02b3d12a9b67f9def13b19abc0b5047ba0ccff1f2ee7b4a45d820b70c365bdfa6c43affeec05a804f60b95743a40f89af27fc68655f0cde5275b4fc29de0f924d16ba08d1769f97c204773c1ce0024a75bada5480beea6118b9d0ca14b1ae13bc3bc1d5b5c3862738f912aefe10bd34a0f2d7ef421906741b7555a1b1e466f962178210826b67f96dcfe906fb42aa1562d228dec1c3602d1317f2fa064f687387bbc54def6d2ab3cf56c5eee183394e0aa3e9b713631023858156cd6e653dc0f7ac14a352e74777d610ccb627df440f9813f32037176a6d829da5d1e96798c4e11d593fb11703929bce06539f62c3a240ff8ca0afc48295b862181fe5f18561f8afec8d04cef4a21c4d722ef1f28a576c1d3b7ef34b2b929b7413a6cfe17d427a48cc63ecc57a6c319e29a680221dd170a09e5ca741931579159183ab153502131b526e64cb3d9dd2e54d97aa55592ffddd7579596a7c914cd4eb58206bae6ca45ae77fa10bf594551c8fe54e3d19ee186f16e9f4095ed00025f60b2d2eb5a51764220396dcb5eaab8579ea0d4758b0b50745ac6f3eff405abea6f79305a45fa60b3c0b985cba79237464487f42159dbaf40678a493995e2cad9b34077b82d121f5d4c09e43c4655cca7cd101f231352d49155c2048ef22668006cc6468c88d18e584e66bf20fbc8158f12da209d5b46004acc588ee5c57798be1c76e2ff042eef7fddad582181589c38e9bbfaf66178f23425582c4cb32847dd6a97d0c68c3090290c4f195308b98eddfdb785d9cbad02da8a75e91040067ea5b39a0ce35ddb8b335954613957d6e20d4c86517ab282fefd5215f3f67bcde507de19f7591eaab854183561e718bd6b5559548a843d695acaf1ee18627c01df6be8739ee0f613cea0715dbe08909698ec70ede5fbd3a2171ba7270f15283ccdd07532ed99fbddedf8e71a5be19af6901d9e6a3c8cf67f5625649c045fe83ceeab6ce4f7815c04196d9df019197637fca994fbd464b90577ee3c71112e48a308a82cd05748f1c8ccae603c5712ac9e3266c14e1fc6517b21d4b4aa0529848015e88fbf8f23791f8281bbd3b0a15f6857567858aaa1c09de9ff64a21bed7280fa3a8da10a00c1e2100c94e0407e44b5426902aaf628e164efee710488c8195d1c893bd45cbd663618596fb6d0177f4df8d1b33433d5f77a00fe9fdddabd3d244a674a59e307d7beeb0635b3b1a5a62c55ae5a517e1c866cb65a3ecf35140a5e196c5022bb8a453a3893bb706cc203d663da21c5f1fab533260ec6e89d0d0c489ff259c5843a318e9e84d1426c4552a8f3a021cf7e80d6983d9004ba0ad05be45e72e5982a9fc2d27537d63002006f828c984029ef9c68395c352791f26b6148523c107ca06a1c0dc8d7bf456523b172f8723a5fa87c2a67a9567fe88bde24287bc4aab8707bb1d0398b06d1102c008d563c7f20da9eec461a399e752ed46330a22cfb6b771207956225a6a2929127cd2b754ccf529ce917895bf163262f373d788ed13fd935c167ee9dc74bdf86d47d96f4f57514c12f5017ad536f7570272fe531327a44b5186814dcb358fa64b74f2deaab4e02a48678334d394911fdde0fe031f33719a38245891bc88251cc3b5f08c0c112311df85094cdf5ad8176dac30e14db04bf08e208571884b6c760262bff7699081fbe3fad6d6dbea91789718375b7ec126cd202ecce6f45a82e6b0366ca4b38e7babf1f4449a1ab10c24af43238d92daef68a306e291662f946ccee2213070be28c6309b60b71750323473bea788a3a62ebcf36a3f0e385f3a8d73bdfb23a11a25b3d9bb788640917174adb18992ba039ebb8952c9cdfadb09175cd9dc99161cd4226c428716cf286a4a46e690a7344a227abffd8a44c45245dfda6dbbbbbfc43f804964f18890d8598c65a8b2190dc64c63c11843c036fbf78f7d474c7cc4e6bb0061c7c895fa3be6f490394e43f2d3299790f0b4df8c95cbd613a6e4fd14c12f12a819944e9dc5ccafc923190cb81e4965b665a054fe8a31706bc946ad02c22ff82f2e907751ae7bd8d2bf79e89a33e06d64fa609449c7e961e36db8932e47136bc13fe765dfe6c14f10ad5868c6cd0e9e14360057488eb539616fd314681669554c783fc82764026aef71c6da8d2c2450273993dd0d754de43dda5e06903bb545e8a0cf40975b2d5854d00f3fab2de99443c3f3e47f6d2f1aa3c852966997ff83a28e63f72de52d77b59db23d6f8871eb9d003553185a970b7ec3d8ccb378251868decf460cb8e404316be05e401f205b9edfceb56a5e8d9a51c36ebb6d0daf0a825da082d71d49b0fe44d4e6b4d090c225484083abcf40d90762d601c3e9732a03baf44f4946ccd7d2a9a6336a401bd7b710d2925ea48c91d22954ed77027aee78afba4db204b33539c024f0ead4e511e74c8e02de35c3c0a76cb673bd74af6b9d953404b58bab7d1858259f71d3a95c48c5d8f37213b1a921bcd18061126b09596686233fc5261c811c5c027d760798aa529e0f4e38ac364066c4016600d7d627826f1390ca3dfa1977b4eb692592a7242de5c39394e9b6197190f71d86ae8e053e2e212593acff4563a05c60e8c74a6dc1a5b5971533b62f5be776add5901353633c0144b16c3ba55d7858bd9b10157f45651fadc369f6ee6014de59769b57b51c9c7ee4bf95111b96292349cec45d511be4936859844ea45da7b111d37ee78f7da498d0756d30fe337f3b37793d3561219d8809f425baeade422fc4af67b403a8cadffa25ae8a38babb6575b687e3b9c2a714958e9c3fb38200deaf1a49d9f74ffc5f6e4bbe7476f898c86ee7ec497efc4058ac272adac5df5fc8eac3c8313844ce4fb5a17c0c159094f00a64b78869f25fb8b459d56117758ada058009c51af5b0fe8b824929b4ee7237c8a7a78257253bc54187633a25bc9b5c6a826b2f5a904fe692d10b0dcdd5fa77da652b793c1c5b7374fe01cd8043247eefec7c35e96fcfaed4d69e87ce0efaffa9096e3fbda53fb48102306885519d424ee45d3d6af88f362c72e8dd51fd04e6c78849afcf45ac52dbe4273d229642f2ae715367a6365135be67cb68bf251538bf61af416e5dfe6816801a03324d23866be83817f1541b84126131165cad1ada28bcaafbc7f059c4c7ac8dfcd0a92612fa215aefde1861e1ce7ff10ea331019495e02e1c2e27f020ff7c805023f75b340"""),
-                    TestUtils.hexDecode("""
-14A8B812B4C9129CED02A09C8AB19443D34DBCEE85AA12528B61F84A2AA9D9DA49011C8E2C3C3856FCF761EA9C9882FB18666F3EC2C8543037E54FEC1F0F944FED3D350CACADA9428B7FB7D9DA4937DA4D1859BEF8C6177F0EC93BD67FC3D5B3D13C34D472D01372246704DA4763FA73BBCEB0F4C3658B2111A7DDC01FCEAA9059FE3DD5BDF2A9FE0D1C2384E82926EB895AA529532FB20E12F1C61BCE208E48ECED036E4F84CD60F8042475749E13D8C3ABE0AE17967D5C6D8C598A53A10231929822FB01EA976A08BCC0D18B1F9B6C7C1ABDD15121E00EE80459E6EFD61CB8D5AF950F0A8FF2807C32CFF7A56661C67348617059D7E128A72C8AF36B149DD8B46537EDE60EB5DE8A16A93349883B73F7C4FB8CAFD01E0C9D7B1EBF6D7C9725651980E0DA598A6ED5114178E47EA4C6ECF870033A03F134461146717C8AEFCB8E8DB1ED4E286C68C7358FA105641EE3ED9B4A5D4826B31706CF0946C152A365B246DC036191613655B829ED1AF8044F5707C320EFA1126B90137EB05FC220F122AA990AB476EBB0BB3AFF5B92442A857F6808E144C60F4B5190794C411C705513BC32447D83B760E907E6FEED63FC0A60C0CCD01734AD55EE178E6BD6D4B8A238ECBE8E4F8A464C381F16F11BFE62DFFC5021FABEA941D24B81CFC3D0F07F00F902FC5042F95A81BB8B795907F8D6BEDB5E5C56D4B2A4353D0188A90C01D7B2781EEAF2BC3D3D58A6F6AD63DF7FD4D32ADBC5A7A2F81EE3F5B98E8052017868EE59D8DCCC0199A006FE4FF39699EECC82DBAA846AC60B51FAB6F456DE4357F5EA43FDCE4B57AED55F2F6EAE49199AE90F6CC4AAF662ACEC2724337AD7F9CF74AC990D3083FE384685A1E616B233752E31CC4FAEB8048EF77480CC849D3376464621E2BF48CBB55E1A7CAE855A216DF4A8D1AE4E4016958F5855FC395C53C23327403720271EFFDF1A90C44E93E74D71BA29D860679E877E410ADE48ABD0EFDECA426DA792271D813116ECC894D799369EA8094C328D7694E8CA47459F31F5065858252C1EEB1AC4750AEDDD327048894F7D79A1D64737EF6E8B93ADEB938C1EF31E38DD60E8B4174AE093697DE4207C7733D82B4FE92590358515D30264A408746AC252ECC0BC28A9C98BFCD76C75845E9611909B0089B571259D1D115EE0D5DC6BD6F3697E1289C4742CD99F97B5D3A22631E33A81734A5D2BD1FF4A819CD6A22A938D3F18AA90794C120F4BE7E14324E89EAD34820070F8160B140E8CD5D68378C081DADABB41D365663AF26C606940E08B20581F4E63AC6E68FB5A7EF5DF86047BAC502223AF08F6CD82E6ACDE60116593046B5CDBFE2411A3FE89C438A1E84CE6D1CD72CFD3E5F67C331E72754F6CF2BF921FDE2C6DD5481F20F509A6852AEBF55BFB4B52D1F8B3E397C9B147433198073049638DDEA7E21C2043C786C88E45E566B6A7E8742209F5ADBCD34FF26962E87CD235CA1052AC02E4BF75DAEE60A06B19A4B0A61A15D9651473DF8AAAC6DB951EB6E669FA5F89175DC1FD4D881D688C477D16CEFE809E623B2F2A996909C3E10CFEF756ECE8E93072AF27B87715953E0C48946DA8E893160CD351E48FFCC6847975621E5C75D5DBEBBFB79297AB368D13BA95308E3D576F1C54CCC1C4D5EF2A41BE63AEA2A9F9A27822ABFF58B06AD99515B97F260843DD2304C855184EFE96BF10420184CBA2CD3ABC38D11B7A74E4A9E40FC26CAF3A84BFE8794477335EB1F4C67ACC9513BDA5D8252E608D03C69D493F8876FFF25D39DCD71442707AF2681CC6D5E117BD24315B0FB5C9E8175CD42AEABF699B7B77C9A8918AB94518B48DEE1777EAD8F18709A824F277BC06CB67915A5A2508E18094B0ADD29FC7CD554D8671CFB47EED2F850FC84B1C0F27767B3052869B653BFFBECBF6D8077697D1F440019E3381FCB917F5C06008A04C8A88B4493698C1964E25A551B03805244570D0EB6999AF2BC467EA4732B460A40F7C2EDD2CBB07A2DFA99B4E5F4663A45F2774C1ACB0C8B965E1053E3AA140E973049714DD644CB9317D9B3252150CC9A525E8729ED4A9A7900B417875391F7BDCEE646B1009CA479A1295555759C5A7597A775A1D1CD8D870A71DA7ACE7CCC7D2F38B18BD66441D80068F76AC194FADB3ED5F4201F26F670621D254264A4D2A88426FA6077895B9BD794C8C84DEF942FC43F2FA115509429A939052200196CC921454A65C4BF1A6E871970A3409FB9773F356BC17E03EDDE8CBF2F91E7D2B548380967F756D36520009DA5032F20D8C8CAFCF4B561A4C2894CA13929DF2AFC2C1C9FC41968746433FACD66309D2A7FB5D90EBCE40ED1E80C12D07BCB075FED76DE423D9EE6B1C787E1039749A0E559B86C4079CCA1CA7E4A3EAACB300C453782071725F6E2DC0652DB5EBE7D1C16B6EE0078004ED1F49DF439107AED04A2E69F70A35057C36A307C8F5BC13FCEA76AA997DFD2E2E4B835677EE961234895BE9C9E7D1486C04ECDE36AF4F7075C0CED9A33C372C33F751C953A2096815D9B6186632D3CAC31AE6D0A931258014D6F88157ABEBEBA1C11B9CB2956253D4950F5B2F64476E4125848F27D9ED4F93035FB5F5DEFE2435E67DADA015F048A90EAA9780B983748CED6056D021D21F6FBCB1A2DE0C627F2D9015B3D9D35CA17C54B0FAF85D0C45A53DC2575E2CB54B9A5681FDB66C9D5A09A3F48DFF29B24E45BE82856C6C76F0B9680F7B666B22221E14DD8B22A15FFFDA1D666F4EC6ADB5B929C2804ED36077E1A39F166C777770124253ADDE6B77083ED159CCE35894597E7BF3DEDB346571C2BBF69AAA9ED133E94AC7E31F2C30AD079EB4B4452232D83E49B43DAB60BBD92673D90F187FA6F3859EEE1630D3A232B99F3F960E8BE49CCA0F1A519156D2D861F8B6C15FEA4C4635C23F2ABEFDE8589A45947D391CD1DC3439F965C6DBB5C5C9AD14192B3D784D1C78B3DF6719D5C474E02D471B9B857611E2FED83869BFE8A2A74493C25D39C78DB019BE93E3BE331131CE85C4586C0D40D676640405FE363646C2264DE6F64365F19F87A8C54C884703DD369FF52F65CD9179B8A09EB92C38C284E06B0537EE686D7BF3BD399FBA8E1703BE3236F8BA262E2C84D55EB1E1E55DC14780DBA04BC1106D98B05593F9164F1651809E8AFA0A04BB0B51F9FFD5062B495133B509A569845CBC3003BFE23A7D7ED433B70C2EAFF5FD898009CF1ECD9E9B6F37CD7794234A098CCC39EF078E3C152017CC73A19B811FAB4A2CEF721029F6200A4D1E4F9E95A0A758A7AFCFA047B6707CE048C3BEA6BC561D152AC4F161347C098F4F44AD92006090324757D73DC074F1E1D445A500AF5A92CBE19EF631D99FFF870C60BCA8515125EEC36D004F22FFB420F5CB01330315F00CECFEE3254E54A047A7FA3C7495E6ACD579A9159F667FCAC4C4448579E7A68148D5518EFE269E97D90D67CEEDC378657A45E9DA855EC55E7BFD0AC3E52DADAF76E800ECFA61F2BF532E7365C4FBC8CE882AB327961C6A48C24CF0F0E6F2C54D732BC9B592008F2E6C80F7EFA788AA6BEEF0B6AB7B21DA3F9D92ED8A8F5F3F4B1D1BED6F66B6BF3ED52E49715C07DBAFD67F4F253DE368619A306C513E645CB5F154F7823781EB3E15F38EE482757009E42CEEEC1530A0159D25F052F4D4326412CBE6CD11C0DCC56B6556DDF806868B83602671C96F81D8210842144757A36CD187EA0900F36A0A9DB85B9609C11DE03A38A9984003EBFDD4E7C07CCA7A7DC7FB5F9F16E6C0C32CF86774B46C56BFE2840D8EC51E9FCB719DD1CAC4206372126DC8EDC9A4A2EDC8FDC8370C7589CE9FABE0DF3C8CEA90E82944B8D489C0F52F73EA3E3BF56BC3644A1BB0AF88F4B556A554851593E5FCAB03E235670638E4AD77BF012AE074F331F67222899694CB5EABBF0D6E6E6CEF75151FAFE89DB9D66DA4464353526116B3C2F382825B11CAB3CBD221DDA588F4BA13548CF627B52478F47D9B61479730CD9CB3F6622702C9A115D69EC232CBEB3FA88AEB832EB266B855A98424B2E08A699453A891C89C45FED7BBA98D6E7A2179A24D41D201C4214444BFFE6D01A15CBE640C3C54458E8DEA5DED484FF7AA78541686C60F9FEE76D1A7ED1F5686A2EC1F0AA037E6CE38FF695DE0C17895C9326415840FEDC1675E9CF30B8C45F8EACA1E65DD18290E8ED826738876FE8B69DC3432174151C051FD23CA4675A75E73F1D3DE4CE172FD657B57D5D03FBF8B29E268B3EBB8E9BEA96A4750168E8AE5AEF6B34701276DD18F1FEB01FFFA2A984D3A59D05A56552639D506BAB3021D507D56D0FBD80DC582B3C20940DF2393AF24FA5233DF073C7FF28B54C7A921949960CB2593AA4F93A06D38D896D547B28E9CAFDB479B7D1BA2EA7B4A6BAD33BA8B59DF8792B22F5FFF41EDB1FAA926FA3CF602FA63ACED78E85DD7C3094ED48D1F3381BCD084A9909613873513657879AD8599403A52ED0D16AF0B3B43C672867700167323D37FD6373C4D51B90327F4981A897CD54C8E35A6A5904F5AE0CDE36440393A59119437016E8CC88894B2A6FF661C10AAD7C7B03B7085B70A8145C305D5E66CAA265AB42B34539CFCC9A62B5D9BD09FA4D3B94BACE361B4C6BF6B550B89922EC01041CF05C0E4632274949D244B7776D6504C9803A67CECF65F750F9876109167CA77D412A7EFF06CBCF129D057143BCF03CB1C1AFAF937E55477F5B15020149D64F53887467AA16C6692FDDE61406D552660B88AADF65C03FE1B8D485C57FEBACF8B11C569622FBC56CA1056FD3600E1BF51084FDAE32876BAA1E97637F73677E8FA1462222DA72FB0936ED66C16A5E892C44093CFE7B4E3EE33F21091E04FC4A07C6CA21E93A500E5D7378EC716A9ACB27A5687BCD7F4559C32F6C82E8C06E82135ED16C35762E94BFD6BC33D5116E4FB209C98C871FA8E9230FA807CF1FD509A75DFDDFBA5CD4F131FF8B666878697B372B92CDDA15D0113E8BB91A7750843B3D14AC4E8C956B44C7A3A26720E774EC1A1F68435B122E539C8A7515A1AC94D456BC4DDD54839AAF6EEDDFF8797C9BA3A15AC70C34DAF78AF1F0C21734DA32A79C1BD3CC8B2636E12B9D2E42AD10446EA1A9FFD45430E03A78D8F38B64B64C9D308D18CDDB4D5DA13F1B4D15157063E58C36DD71677334B4D9BF09D8C765FC68B233B31105D0957F1B675798E5B9E982B1BAF1611EFED0E39E1E9E70BC790886A422DEFEF325A07D97FC603866C2C3682FC651CFFCA09B8122B636A65E2D6B8B9FBE6BB9220959038AEE11AA7003A9C4C4EC9E27F4A8350FEBF1084C292B6BA9A6E03C00979854CDFE566831B077823B025FD1B9C7127BDBBEF34186C74759E32FC222023EAC24A6A6653A7073F4033D77CF83831E8B6BC8F26AACBC3EFB2328C6EC35C3A509FA85E2E04532DB6E466BBF8071FA6020CF5585C70C29320786EBA815EECA6FB2BDF9C9F3A3DDD0F1800E93DEC3C5E6DB4EA5A695865303C48986CE26346B6CEA4A734668D5BED675EB0C2A1FFDBB9E5511EC715BB4BA3604629FA28A53CC0DBA1E819A521AF8B7BFF16B4FBC6766543C0111E232157B7BE4D561618D6ED7D13AC8817641E7AF77042E96C7209F1B65C42D115234F6C63B84D381F1820CD656C88BDEC7CD2A814D6346E90841005F66D6E36E63C5906D19904EA0D33502BDED36E7D77FF5E2592290D6F29200668A25A6B6F44FEA1D3EA00BD4BA165D122455E8F97EDB36061DCB335870F44068EE4A64FDE5695896D6A5B30D7613BD8C8B11DB330AEEB0EF239C105CE6C0B2E1BD81E867A2D823FF88E3E82FCA69923E281A2933D5FDFAC6B217D60958D18ACED57D670851D5A6A445A120F5B563070995793E618F885F149A3A3D498C69A0B9D99D92C16327B7568BA8CC35128500FF515273099B645C683EDA30092C225D01E6337AC652586C0872C9C5EBF09DFECA43697BD97B86FD5463F529CF303A105194BCC3014F4458CD3BEE8088B8B05D58A960334C73E1CEA934CA0ABB2597F703428EAC5DF6983A76A5EFBB4A20221E6EA04F67273D52D0311AB99979CB0EBCE738B0BAD72F0DA80097609F4422D962DE43D5B9E27F2FB3FD55DB5B9E98C1E74533DE23930052446A31E656E150261C6658324BB243E0C55C43BB397367D9E6EE51FF7A3F4FBB008F87FDC3448C07B88F4EC3788FB04944AE1D734E00E1CC58052AD2F908B55B39C0B1FBFB889EE2CF91CC1B3FCFEF11C14B083F8A898BB28B838662274B9974AA8E83579181944CEDA7FCD9C36D5FEE67522E828D6FD9CD28537D9FD57C8ACC7B8F888FAE4673FFDD859F6446B41609135BEEB20804F4331E31AE057171D27D1C338DD976634A460436977192E7FED668FF01B7F996F00958FEF2F89C78367507225C458A7EF81513D849081E4D22013A4A8DA7E6E9AF687918486E785E2E5D4EA5CEC4F92910E6A6F89198FF7911A16D7B46BAC5752AD5F7457E9B65AF0DB57148812FFE9F7C70F5531D11CF96ADF7A3AE1D86039FA5CFD5BD5465AA1649C40A513FAD60B54F7AF15A5A6B34F0935BAB28A1AF631816A0F5F1E53E1A7DDB5FCE521252E25910555D70AE1A309BB1BAFB7ED3856618161CB41206810AACFB9F748B06F6BB8ECA8EAE07B77934CAB2FC72FFDB061D5FEAC548CDD1BCE7CE5D04E9D2E4F38834AAD674F0D540DD6EEA85CEEE4F67B1D572597E9F2B66554F7F835894E81F4081EAB2578CEB8FA95964742436FC6741A5A9D1F2257572E7026360708EAA41D31ECCCB55811D5BB7648EF4021268C8AFF001F2D6BB3E1D4D304374E892E4384D66869CFFAC575398808D2042B2A33A874BF364B6E7A859BBCC67ACD4B5DC3494C1A6B55CE004A354C8EA8F14E9D9A4ED282AC4D78909F42BD38D044FBC1C730F921A1C678062A200CAEDB0EBD42D48C0B758F138EBD6BEEE1E45BF92157E3279C6534232AA6C361953A0AE37E81261832F29CDEE864962D44CC6C3C68C05B16915A8FE35B067EA754777725EAB0BB4E20C3BA7D6E75812C498F29A94D18D90D60F49339CF46DCEC6F0A546A90E0BD6E75B95441CEBC0B25945F2A38F3EEB1A9E20805A81E3008750588397A9A168C73C81C97FEC1BC16659DB16AD7BCE275A884EF801D53868B0DB816FDE421A9D7FE37E61B699736986325592EA93DC18B036D5B237115C35AE3862E355A1F3CBECC5BA89947E6E304A86196E0AD6A113BED701D21E07532A6D02D014C9BDEF9F9060799BB79AFFB218F3B98A4BC9488E5D2CA13531842C6651621484207723F41055274364FE30601C33663A6DA49C8187008BFDB1FFF4B7B3DE89F7FB0BF57F2E273EE84ACF8EE91A5335364BD034DB6A1F8025E6522B4F3D6212F3E75AB34179B21AA28FF6911736724FDD4F3229C6C26142BE5D6F2148C9BEDEEBE6C56B6A20746875A6F74CACCDED95179AF50E1C5E09B942B4E3C5E227C1A9DCA36F04CB89EAC24D5E87D07BB407922341590A739B825AFB80F544F2B1B70D877300B46000E660A568999EB8F54A3809D6879935492CDD67DF15A1FA902AE6ED30D5C5EC1178AAEA8E539068EA2A0132EFE51DA8A43E5D48ECD5D8BBD0FEF8F90288E3068D17EEF4204D639665BA3DB7C172E99913E97613DC4304006CCB37F1E9F62327E1C2B5D97E31822A52298BE0D6457708E0E2EF25A0C4C932F16D25A277C5BFE1AB13FD488BDA7BF30F26E89585F56D827DAFC799D7DE3BEF0B41A3EA3491514ABF11E633D7F4B8A88CB6F3ECA3D48495475A33C9107EF39157D53D447308BA03139C7A1A9AB4ECB178D818DB6F83B4489626E2EE9464D7392C80F8B4B6317095926370681D1ABC3A48D82DE7A810124099E375F39E5C6683F4972556FF258996BFB0FB81C44E3C0C1A814AFAE8CBC041D7E7EA4FD830568DE534B65926D6CB83D306A36861FA2874234E33F4EA5BB8AAE05C3DBAB96CAD63295D7BECC26F5A4E862546A166A09E059293AC85937FEB612178B8812541A929B81A090FFFBB17DFC3C774C5BCEA1398DD530C5286658D326D7BA7DA3F2E15FAEB038B8A397B68AEF622EB10B248DCC942E7BF4B4C942D33A4427B685A0DF2BEE8271E89A366708C9E48F6A3992174E8D401D821DCFE12099D3EF0BA0806E7ECD674422731B0DB2B198C495E9DBA6294FC736F41EAD9232A5E404A8E918A18D7A7846E0BB6716C4343C2FB00286049D7BD823410EE8F71347008A89DF42EFE049C61CEE782102730944DD15C0DA322F6DE4EAD8F9EA549767BF02BEDB1F091252F08B34B6728165B11D2C62805ED24ABE65A8E95441D1D5FBD361FA87B39135A75D749325F09416CD3E1ACBC04F6AC8B989716C55B06FC784B0254A884EA4CCE8ECB2EA278CD32FD1FD99C3085585201EE9492B7F7A2259479B1FF820661466022321457088B202B5F1E67709B763A3A945B19CB5A6EF0A322272D98F8921B775A37B6CF92F66CF86FFD26F84547BBA75AE82411E890A7D8F1B74D657380287606ACC8572D8522B87CF26C0247F25A7F8CA12911081224128ED444C5AED9EADBFF6EEA9FB7485884093C340CB326BD467CFC4F6E6C17D4F13C7F9F76192BF4A10F2F28F538C76BDC1F8528ED1360922E5A6DF1A38AF9FB28542357231478192219477D554507A47E9FCA585730292493A2B3EE225E0DF87C747E0CED460BA677EC691637F444D248805FA183666FA65110AD3ECAEFF59B2F8F619A275034CE415DCEC6E68A3530D17EDE27E93D87EE1EA55D22045CF436A34F907D35264116A848DF0B448E4BBE32A18BBF16A8DAC00CA6B07876ED0720591345223877E26D2DF4C0C3FD8484DF1DC40F1B7D4D49E871D8F527837F1B790CDC9FD95D698231CD090C60915C98F1CE43F7825613FCF8EC929BBAB9BF663A555210868653131556553F7A36368B0D83AED6F9A970CB2D63163C607ED896FC7342A71C6A1C90A53DA0F32141600F28F31A9340ABE97D0C6E8AA3270850B6598670DA455F8E2816EF82D3267D39A8163D34B135221D7D5D98069A8233802810C7605AF9764C6DB44FB55E29470503090CE6A720617DC9D17A5091CD3267DC4DBC1A2B7032B50CE46522A2FBFEE7BE29C3DCFA1FCDD43AE2E09DAE7330D2E6F2B15D10F53EC6D607066504AC50AA7F18D3C290296A8D9ACD1F5A3708BC035979CF03966E0081FC53F654AD68A15A3D17A65A768A4CA5F647BB21872B1ACC5BA3DDB5F69DC215735A5CDCCF50D555FE968551D507A7272FB591587383DC5930C5A572BE9FE0C2797B622DA16C6B87A03EA563845B8201168C45E7603B80E5780E493AE87584A40A09AD6718CDA3759CF1940479545789F08DE83333FACC26D28AEB54E2088934332EB7DBD5829F0ECF89D22C62636063532B4361B9C7C2B1D582E9A7DC72FF7F2DF667D9B7BAA543FFA20AF6BCA1A9CC22B7D7D177B73AAB087F868AC68EA0CA808EDE0C2F931B3B0CCB28E472CB316C0DB0367D4D7FFE0C02977CD2E5B20F28867DB1EE0DA77C5935155175B33D3275426C3CC5B73748426CEBB3ABFC50405E30EC21A53073C83A85EDB485B26AE7B633692326003004A822F261D5E20246F99B03D0AAE36"""),
-                    TestUtils.hexDecode("""
-e3204112bf82f4849550037d8b6325da7435333c716595e2f17c8a85d66bc4a612e19abd17411d3f4b7e3a8eadad39a819fe5ba968c8640243fb5d18a7674a3368099088c000a1c9906573a2957b57d5132fa2df9423c64e0f7d89a338d0d41e9300f563a82993c8e43009eef3fd91c10dc21bf4524dde27c4013756a1cf7b5c2829aa1698a5ebc4c46b80cce01384678f5c444648ed513a8e0c6e4d29b3b4721627c1c8832d736d98c17f6c00aee528abf0908b030edb381770e6d23a261731817b4ba5e632b1f77e5beb60f2e34bc2f16e6feb6fcf8605367b5d2dbec8668cf6a7b47fe5802a9eb93451f96e2ad72432726c9579cf08c4337ded15690a1906b82df1e07fa995eef43df8edb543bfc3a7403877b4bcca16aa105b625dd23e1d938d4d89293e841245472a0c38b77a6697923e213eada80659269fb642089b311e2818f8ee998b227a2130ba594a27e985aee0c6a3b34652b54581eea40f2c1e235ec06e055247cdc106164d6856fa8798e0da03c1b4a6b89778fef781dd6c5c77147db302df8ae78b819da5b8ce171f53bae732a100211cf232faff1e0588054a0ee99891a26f88b19fccb49693a844270fcb1a43f26677abdbe3c33261ebaf69f8f417ae6df03b55506c463088d49415c0e5f3d9cceea7518692649fbd2e0153b1612a84e229ca9a69eef15882d402425bad02039426358124d0603decfed2101e93876d057725f6cd131ee346f047d7e2e0398a5bbda6e1fc5029b57f78e49a49cab5febc682931f3a2b167d553e4f1b6511b8b07a8f62e4744c20a7b2731b317ebfa1e89825d4b7fec5c775243c9af25fef92f61261f2b4377593dbb3008385c92bb779ec703a7e76b785b8aa46c8c3a2bc5069d69ed865f1e5e6283f2aea3740a62226d341deb55d420eab001398596c88406387b293ebd1663c2bf94041f3c13b8579111fd7d53b66a3528d9bfbc6b97e72730a53ba95e0549473cb4141abca8c8330b1b4e0e0967b2aef589efee973c3718eef61d27b2a355be3c92f7654a6d33e5441e3a0f389911b40f6640080a752ca53ca9db239216dbc3d95eff963ab43973fd8633299d5adad7020a862a594c656e34af356066885494b1a02fd6fc5cb257cdbd56e85e74de7005f2b160f6ec6f0a61083bb046d9ca90c04478d8489cd75e176d027351a84bcb6fff940eca4fcd464dd577780473eea0a72732d435eb41d219ef7c2619400339ad2c30cb4ecd48deb40d713e148b474c4de28b91efef85e4f16750bec38224c0916892032bff8b89a4e0aff665ebc050e46cf7b7cba9fe8dc8696c5842f82e6e6bb6b58663e1669be1e4469cc8982650e468b6c9e5a1d49a44172f86676d9f4731994d74c4eabb9086eeab469a8a7de0e18845797ed73742864149d659df3118658f8cee2cec3c8a8b388432ad98d4d78f3dead445af3fd698fc01bb81d4658624312fe1da6465b7f53ecfa4e6f958b9f474711c9a2ac9fc8abdb0682b5eb282e5ec116c45c3236baba0cdf49a7478400dd8a67fa4704a8e98b29b7dc9913d15f56e613592dc60db932f374b1a0ddc46435feb7412b290587fd9e925987e80d155ff821e27d77de3141b8cf38694e3cd0e7ee0d822c213656fcb7be166767da6522cf9c1f29cf044efd1fe7f0d9e9df64c417aae894e354bad581a66432f4ba9b94226b1b577f64a931c62bcc6c97e5f20f0c53f35ae39f38d33600208a1c6986aca3bd143e920a430e9b6a311a751509316abadd632dbc82abc94ae234243edb75d362928f0d8a7ff9f7ba927780bd7bf62f3849f3fd937960ed08794f8df99dd27c241539c41d27ece05215f2e63e7305d09cc384223a3bdf8df83d0cb1f76231529faebaa18e76b35ef77d9ce6d2973ecdfde9ebb91d7fe2ff38bf0e4ba8f9c3efa3185f6ffb72a10bdab1fb829931858ca37e1d3356bb199d9e5d9d90b11339643ce9c528ff7fda54f907126fc745cffd1d9c60dcb92efc39469c70899ff3d5fdc6c18ccb0b3bf04bbd9d14b34c857467185e5f427b134c95622d34f3bb5fc4bedb7fa8e7c16abc277447ec511acb82de3d1372f63d9a30c40e6485598e707415a572a29ed1c82bf0e138bf6c6267380760f6f2d42040948e96d4a792abb2912ce8dfd5ad3c20bcd63fc84717a5b0c79bf6acf89199cca48e502661a949cb3123506318dcd0079edd930126c0e879cad817ee9faf22a49b11f44b0719554da894a7fde9e67ed576f562c787832b7cdb0ce85dd90ad391abb590cc33c83a57a1e7c088fef90937f39b423977eb5d48028af46a43d664f3ce89be3f153857210668a7f152d94aa8ce1305e5c467b3fe47306dc75cd2717b67f1bdbd77b7acf6d4bc79cdb65b291e7356201f7fc0176f826290cb70b54ee4f2442a658812274e08c0ff222750703f7127c72184fefe2cc8e6b0769c56eaada9bdc39d44e8464c3c789b8254919fccc48d692ee13e70745b790f5e89ccf04eac5708734ef847a00d4bdb4a7773d8a8e14779741b76b1a3be2b5bff279d8ea3f750c4ea5aa82203f55b332b785536e30d5448acc215c10a2e63a6104afc5d9002eb3cd9b98f76f66679766a0562a1e0ef9a69d46a453d0777046097dfe965e1b380cafbd62ba18753ade14c2a663c7ebe2fa88ec4cbdbc841bf49366dfb13162ef6d6dbaae627975d3f5d6ff47f7685c713c59dab2e0629d6a14fbaf1895526ee00a32405d2f4930ebae1d4c0ba243e0b77b0575650c1964cdaa8a09d70592a6e50f0586fa398009bd40a2666f0e9f4512fd9453e54df633b6ed72916cf87455ad6e67bfeb91e5bf15221e01bd61738f5e92d5fbb15d43df14f3355d54bfc97b061a1db68354e06d1a2fe0da4e1a6c0c0c593fff12496e42761235ec1238879a2c9797d97c833a76a3a65bbedb8012722c4c4347c30bab6d0897f9bbc0cd8b20030d7e84507cee4069192cae1437715c2179c6165d38b534c63123e9b6f07fcb4dc1c73c376d35d94fb4ff945d6b9f2e8f41a01ba5b58d7b5afac6f7f74d5aff530e3183a0b8992d2e885bc6c2d5415a572cd8cb8b5f09094998025b86eec33fee6f19e8fa5fa11cb49932508f066f38192afa3d11b033a6b635e9a32cf0dce3512a9d7af02dcca39c3c7d62861402586f8f08e0ca459e96f2767e991f70590a1303917476df719c38b8c7dbcd8f61e787131c093e2ba97cecca4d52c75e18d855c491d1bbf517542494928061f24f142fb8fff689635d57170be21f8bdb1944729eb2c48a66debf5399ca10d883c37c860921feeaa1ce240c419a987f71484762db1f6ab4cfc83c1bd9e4ca85c7730e9a58630150784fccf9faa926a28bdbce010a355ef4e8fe3bec648ee207e187fc3a8f73f80850d254cd0f9d9e92a0bf91e73d63faad0f6fe7908158ced03f396527e7b96ed2bcd521a5ac0e81fb60afbe91bb0e70fa6d5c39317158f67bffc160f0b80663267752bb5a9aa97d85d9e9f40f557a215aacc03d022341baebb7ab7eeec8425af176f3b97eb80351158095708083dd51d896bfc03d308906c31eddcb816ccb28eaac48bcce688a479dedf9417c950a7a8c95ae7b452cf83dc548b64d58b52928e2f6411d4b02466543e361de3db17d8994ef28dff206b493564876d5e274658e69b5cd70a0090d669a865e56e24150b57ea6d3c261b11c1e45d7bc387aee61add50c7f756e593de9c3057855ff761e95760813e5d30b41ad700bf544c451bc6ff51998bcf48bd6046d9bd461924121a3d8daaf3978f792d9cd23978f1c8ccd999bc79d2a10daebb3c9d065d30e970ace94a0f774d872c700949f2ff6a997c6e3193c5782c82a077c4524981e7aa6abb27b86bdc75928dc9599a1376a2a0ab53b6668292e4d34346dd2658fc9d10232b7e39ff5843c620319e530c71052952f75f2ab69fa193ee321c5702b6e3107dfb93b60cc99cc88f1fb48c0bf48c032e2ab5a3085fc9ae1f542f7e0abccc90b8dbedc9a2468da43edd62864be9f7f50149300ae6e2eba570ded34fdfbacdff6bedc092e49810a3e0e860438e3ef56f15dae6a1f3e01d1fc6624602a486d4f2494a3a81694971fad50647f1f0d2bf9e2b4580877b98917b22c55207689da27039b3e46e7f37bc785c338cd0519fffdf11c1bac606dc58f36f5a6902ae32391c7eeb9fe1251ea7575632aa86ce0bf516bc370b3b02ac8a66c2b82a5d69506211c5d3ae15d3c78d47df76babf0c7fb0a5ca3dea741dba47e67851ff66b84c8b3004f8862d6e8f6317c708ddcd6f232f78d081232ad98aeb17402a9ced35420a5e2802381912f9773d0d431544b7466f778ea3f379cd9b095fd51c2a3bb6fe7bdfef1188506047a31905a3a62ab7ddebd4c5655797b90e7fa78cc80dc7e9acb634da42540cb27720f67699e357ddcf45fb4bb9c8c555793cc885c31ffbf6674648615faf691440dc456126a5194ada986c9387e282a3e8c4efd5601f55273296dd8a351adb1e1f954a7d466e75057d8ef0f3d187cd0f8c2203967c7aa3049968ece39674260ec8ce49a25c87cb4fbdb73f1ad1981c19984c8a7fc6ec2e8dbf74889cf6ee30ad325fbaf3ce1be4d06255353742b14128c74765d32ea790b3235a3ca4a6e3adbeb39c26daf148ce4fbcb993b48f04cbbdfc88f67da205c910cc6d0c85b355689d7a5f6794990cd5a8380322d807f4282f79f2d2686deb4d598f072bfa2df4644c8f098a1c9589ee93fb48926675c7e1481de74304aadd8b104384f4df77cadf60df790a394f021889e098f960650e40b9f71193c642c2b28dc8e73934646862a9ed47763ef721c0c01be4da0de58dac976c7e52ac407eae45bf11243f741d05b90ba2a351d19f0d91d115dfb4626e2baa22a8d1a047b7a527ee81cc059756cfd529db5630068c8d5120ea7a6125d5fdc982f6dd91efa9d4f19891986140cc788285f0cc715e9b21f2175360b67dbedc68ff3b41bfbbd1d3adbade1c46083eb973876fcc9ed1e264e8213111bd18beda97fa555b1cd2f9fc8d216358fbcfe430751152c09c02a78b8437616d4326e6d9b87a71e5dc04e61ffcbad9c2dd9e2f9b28885c3b5383d968611de6be2655f24dd0cdf262e134e8cb9db1abb07d6fce167a9dd323b1b8f7232a8355d3ecb3bd4ba9a3ff17bf0d97fa29064762a6c9b7ba14b1264cbcd276d85e985926862c96e322308242ce44679502fe70654f54d41cc4ecfd6933df5eb3b3f2bc47d76e85cac79393bf6d77bba0164f6f06922474c9c1f9ab86da8051a7ceb0a29aac113b4d1430424e8e498a6dc40d46fd0c341b00a069128f37e56a25734e9e446a500e6790ddaf9acb20f5f67037b2267bae2d4003e1f6104067ce5a360e031cc604dc828c7ee79fb9aa5261e14f473d6b5f0cd365c5dbaeab2997624e705b0a09650bd386b78bb38cf7e5a3cd67aee3a985bf25fd1017d3f1870d726d4f211e0987e9251ed9dddc27f5322c68254850b4a4845f1610fe728092d34f6f9b55af7c167bd8f5939f1f5fecc9d1e375f97961a304c775c36bde5c065076245a9d6bc90c8476d958d00f5421f869c4109f6388a8c905850ef8cd80927b44eeb042adfeb13d808dc337b0d3eb738782fb4322becff76b85105e0e737dddfbfb423c11bbf3bf93aeda6af3634ad5d2d49b5d36aa2d9c72537a69fc0db81d8b033b82c8921b7d50a51546415e51e7e5a47f3c71c5da157e25ecb701cb9128400f0a7fe4ef801a306ee61c2cd975143959f7ee2df91fdd3678719597df544a1686aa9a81b81cebaf521deeab903c45659b270b5906698af28afeb37ced3362e43a0adeab50e2c9a2019f338aea7e29195ad472467cd35fc8d7bc8e5e16f86b273e5af3583718cd0967b32e39ede17770e77abc124b0879e997caf22ca684cb60ca3860f4f2525a989434b132c2ff173383c74582cba5dceea5d947263b6980eda24555a778e8d676d2570e5049d38f386d68b13ef53b035a83364d8247a6b32627756bcedf14c9dafaf82a4af23b232e37eb4b4b36f4bdfbc9ab5d1a963bbabfec682c548789b2ada1d73f283aa8b98ad214c7e509f5943daab0b54a5f9d94958a0e3887feb46afcf00bb0202794af85caff85580f7647fa3e0a9183f202487ea5ddb661416be051ca0da39769fe2f99793509acbfc3efa82318c69803f386cad629b4160a33b743594b0e379b7e9d483c2e5d2dee40489b306981aef5541a8639533f46e058b83ccc878600a43f1c97e36aa1a5b65ad3b2dde0362e35063d6ab2018e2b866ee1d13cc204a2949ec14ff98b36408392751962c889e975de56ac5bf00ae7df15768f02d9243685207c530531af5b4d838d63f418e9261fdb9204e14139e7890e290c047a795dd7aa9ed45a2ae86e0a20bb1489b2366d292b5c8cd2401c5039ff21b734600a046696d728ba8e4e9697f9ea7cddcfa1417272b61689d9fdfe5f95c626c92d6ef364447505e6188abd7e544838aaceffe14768e94a6e0ecfd4e5c6b91cfd80000000000000000000000000000070e191f292f373d""")
-            ),
-            new SigGenTestCase(
-                    TestUtils.hexDecode("""
-fe28a25123cd888c478aac1d081ea7efc0ad28c299b7cf879c70474654b0bfc86095607a496c78350e34307d09bfe1c2440919feedd0b55e8f495f7da65c3415cc63f6996debcb3c67831c2db563ea863c2ca586cc66742ee69b014ac318e8553fb9a3d3c407f9f27c5fe91702bd52331103624c503cdf2a6dd0e9dac9f27aab90261120b905ccb81043122d21146e1b83308c12220a34521a3646a1942103924d1337700844890b098283a891d980685246458c004912388dd91828d2300e0c82690a3288a29689c8a67190826de2425224b45000306a424292dca22954946483865192b22414c46520a91194a60d0948809984891a160218074e6324845906511931715832615bb091da9229a124861a963008020c23246662a24dca98801a369204c24888221123319064a440caa828233131da344911412913038863b48d8aa6301ba4884c4249041990211745cbb848203509d8463004272a21298d12b26840b22843005211b381d2466c02048d0a1104db260811078a012590014810020210dc84651836024c0622db2208cc96259336280821268222101383900a364d22108dc92802e3126091c465a2a42c9c000613133102c1641a202a11c820149928e1228c5892251c1851c2a0049a982849484200166001996d22a08d8aa804cc184522496dc816910c4331a28268e4466a4cc66052a42449a6250a15468c480d02c72840462cda302da004241a170c1b387161124213158c5b920812886001844d4142600b4891a2948d8b802c08b250811224c4a0911304845b14819c9690213806dc88858ab810113760cb80300c212eca2661213081cc2625e432488834400a808912234e5036121836665cc868d0068199186113a42148206609466064486a13362061447021c601208671d1085194066cc3845059242e641640ccc83050142e98884d52066a8118460180919c2482239550e1400c54b868c3c68c5a3064c81645db422c18448d0a914c1344821c27680b212a5a246c1aa76d4a0226dc44804290311b3464238524c4020d88b28492020253b8311cc91098404ae40030a2924522018ae316429c44719c460451b04c14a63052126edab4511a246d2226714bc891c418249c186e630049221446e40069c8102211262e14c86189a4044bb6901a28861b02604914210b118e0bc18c13252a8236910c47889c246c02988840886059460150b06c11a18041260c03a42c9a300d0c48448a148e41400d633866e3b280a14422ca027011440411814041c609500046d138801112454ca2719136009b4865c1442dc0b084c380405838821ac22cc2124114904de140211c39122414019b1691838671ca30516184642295690b808919c9891280012223325098651a01119b421002a14599c6615804700911012349605ba25118229122996c1a239112048cd4b80503300114888058b6512332445a4491c9464551120cd004812195200bc33140182ce2122a184652a48268a336681a1121db348214446d84a060e13424da400d0ca6090214521a05720b361141804550186699a01110b60c198525d41628d3446240366d5b0286084750cb268da09465d3006d64842922368c1c096ac23011c23024a0949120464dda400c20816591209163086118016e88448e11a5059b148a4b38208004641c4051cc80081b074861824562c84554286ca0340014056d58282c8b021222c20863b804cb4472d2229284982d22885100c421149270532251832682c8366ee296088148319a444e201902002544e02091e2324e080742db0691dc0206a4468ac98011009645a2004a50380558200c1cc76852924d08a74c141700e0462108000a1bc03058964551a86c14153151164624040501097120a88411988503367262209153403109396ac8448e9912099b862550004d63c63108a208143821003982d302862022519c448d58126d624669894026cb2222802868c8106d92100144260d1a93300b166264884409a2415a886c0899040a3929db264d140644a430115c9865211541432865d2a2201ac00542b050c11230e4a8400a4180c004101c90296426919b84409936401236446310628240924ab00dda3066232942da048d223492d8302001900822a98cdab25103174a4cb03104186e924244c4281119a80d1932304120459a8601e1a04c11882412006299a600d0de68d40b4872c5c415d2aca8c2feaa1ae9dc06b16212d382caecea0b4bea0a1a4eedd4ed8203ee52e2e455b5d542a745bec1f76d74a497dc7172059da0fbb4ac038204c13cf6e8c61b590534ad23f02fb6d32ea4964898d9768c319e931861679a1cca240b2c0cb6c01a2474927e1dd15b63475b3fa68924d4502b3511df5b91723e59d9d97e909473f9cdf3e9c27391196d537273b3dbbfd7a16d808425f11f5fbf5e6c89b80e0df01c576db331ee6562b4d2ea4632b5c9132f4b88a409f93612ce7b2a074a3a6e8f498dcd1fe2996d9d7f604f1063d0e803cd71307d3dc882d5ded30fd5a799a52e28896b9312bb53d72f3bc4a7dd9e963e2f4d05d06cc4d80230ecfb70c5b826a2844d714729d9b8e391571adbe98766d5b180d4216e902ebff86c226e0bd5c3d00ec141b00f17b0d1d6f3a4f407a0cb015d70c7ececa5026c143710cd530a15052b4f8c4092de12bfd598693922007139e0a6c924d2a8491d982b653d5ae9b8762939fbe8870aef52714e7fe67a2da7751c91f8ab5fd73b2dce38ef6b21e869dbcf4224b9af61a773553701783a17187e2a5b28c8dfe501946f16e15621ba55f169b10542b6f07c445e44deeb1ed07708ca5d5c14230ddf8dd5faa0eb2e209dc3244039611cc9fce09c2c2b6d56b23c790fccd3787667e252823ce6bf9d60155dbc855a4c7b274883c5e2d7ccabf9b0640f8bfee4acc35f0cf8c7a9d71735e2c22ead23d6be69926de7010323083e66571680d2508d6e9e4c752eba3a3f050d4e53ddd657a4d09cfbfb9d8768ebc539874d27458dcfc8d2fc84e8a78ae7bfe1ffa6c0fbba1fdcb56b65ed5985f2e35243328b4f43771fcd9a735b3a721d84cd92082ae4b4d050d0954d9814627385e5cb538324c5a315474c156f4710be47eb9e5c66bb4eefd2cb13d066838d8ecaf73a4ad25af96c570d9b5ca331eb03040ca41e2d23a469072d506a6496fd33163f391b914c36f681ddbe497b5108bb5363b162c7e333f2172645f4363e8c849adc9c5f53d26ca93146bf967e77acf6106ec06db4c909e97cca3b005eb790ebd994bfbc8316c749b7c3c55849288a18f65004a3a975b3f72a8ae8aad361a1c7c5572a99713af4409b1f91d3d8da85def0360442f46b86bce3bcc53445cd93647d0168bbe1df9b9edd77c7d02596dfda2be9ca70b8d959e06961efb24e2effdc4182b347904587a80bc9a0783cd65fc32b3e6b48f67941b8842d3f48a819d52cae5dbd54d0d2a8479dffd63afdb882ceb95e36211861e4cd3ef0341c373951e8446df7fd2bb43beaa246d0bcfe24770f42861ec978d00efafb27e8b1b4974177f192e490eb75ba2faacefbae949b7a236ca1b4141a625683aa652d90f0876fc8bf90dc843715f869b0db24f9bd9a42ba188b048998e7f0b0691dd0087f0ac1cb770120c63af237a45f9fe45b3687c9f9ae9a66525af9447f0944cb4ecf84f01a2b34068b8457d01051f092834e6be601160a5ee17d94e168f6a9ebabd85686fdae3bd7f60f20aa4f9e669b1fc39da73dce2014dad3820d6f125c0c8bb3386b3ae5de0e193f6ddea02da3a5f8873bf8b0cae80fffb5e1acba58292bdbd9d380deceab59a29147f6b05f26ecd3d69a8e428cbba2b78f2069bbba85a28c441222e649dd7adbb3c3b2b3456a026f806834b9f3d43186b9720a7154ba4a12de629997f9aaca8139e3a773d7330c3da727037021618a2adb7ad5aa119bcaa3c366ba2ece4f48ac6ebee1df641a33e14f9ee478fb59c04a2051c88b09cab337af5b5908b4312abe14e1dce9dfca692cbc59625dd0dd7faca4ae82facae15dc860b4649032ef6bcf1dfeca621962bcb3101d1c263dfcfc8c7f14fe007611df65d8c2f308df5317edb623e18bca8a569c74c2c63e4be52ee4b0df90cef8b31c81271c2ccc8a3b21be2da5b733826f66e29fc91e299ba4f2f3f2701d51ab9283185c02746cc9d4350a3ab0781d3a2ebd37992a2439586abe5c23642dce99a413cbf2e1177b0a396ad5c0ef18949b1cd5c067a9e558de1b235a7b5b86b9abe8cd7cfb77752b692c28248823d09d52158e81205cb4342cb032d655b93db39ddda37d03118f70063e04a3a52b50c6112671643f53098e62078599323b9b63ae618aaccc9c28bf995dda6923287083671b10277b95fcc1649a2694c68cd5c35fd87042fbd83dfa792c71332e7a98fd7d98a85cb4eebd3ed4a3570b99e82e9fd421ef3ba9f7c1693ef62687854b32c3e8d22812726ae71186372a1f7c8af334a62bd1373adc9daa77ad5984aae2adeb45c9ee3f268f1e07f9cd4afaeed2b008dc38322bf820666aca43052f4503d47f2a9e2d78ad3381f5156f52b64fb793715dd812ab19bf7e7d65acae18e0ae092d403a3d7fcb551996becc7a7c1a195a418b91e4f4b8df8a478230b8e7e3383135d5a3084c4da9cfba60229a7bef26032e50a721ffd0b279681c1d8ce2e37afb9f58f5e871be0303d484af6b6cd21f6475d3b1514ac221d6ed2b756346875594b0b4003e6a4a798312fc76833b6c04d5aadf1d731283e898226642436dc59b933fa1dda83f7cf2f5fc4b0f16320e5f963b431ed2211176916937c43ef261ba2a930699555114ffbaa00ac6361d2e35b440ae4c063d6856d837103497c8b487fa00b6360d86251bd5faa7d23a213fd16106f8891a103167f167008c1d09c7e1c9d82fae09e5a3ea7c7193147930fef0b8c04a63ccfb986ea736b5d3fbe7a80a2524994332ecce5f0439c0660f9c7c1245cf622749fff13c132b5190aedca8b19fa660063bb18c7a6a3e469643bacc479c6d9df840dee239b582b5f469333f9abc063052d74f75d98bbb0d06c5c5da6d7b93b617a0f574274b2d8b25aa3b21079d463013e961fab521c67f5183e0a3613cfbd8f5ece6d3791efdb20ba9777c5cd95aa1209a9a95abe030134afe843d15e6a6874f3bc6570ed17df31c7b15ff9f3e4b8ec000cbf520dc164afc8c511cd35efba2b178e613908489cf5a17039df559abef9e8033c8c772052eba33577fb840b276ac325041ffaad171880f37830cb60da1997241cb6ee5594b97fb353bdd575916f9705010d04f9f90835b81bb949b6f35bff409d5588cfa50838a96b22ee7d5b66d973f614f6d323ba3b0581ee407791a20ff4a66cb4c208f049ab46617dc6d26d51c4b6dda716c018b70d6331aa999bcb898511191dcaf47001d1127e1f9886de617c2002e2ba2f27b04d3e53515a504a2d8d31c1fb587a160a9edfd1dd31966c013c2406725e79a7a93a73756b9a29f5e5b8b80e3b9c53977541df0c2043dc42dee4ed68819bb8387a33bc2be6f4b33db215d28a983873e200f685d7794d9a1d2c38608f477dd24178817f05884c01d1f2ea94738b5601ca99fe21f07234c7174c5b20d88986cf717507699ea651de129878b2264083dda1beb6afeca929e98df36308be0c8213ce94d4e5954c6cd1f2a4e19a3ae9e5e9d94178cfb6a9c90bc3bfeae5acc91e0493896bf8e20fc3d78204449eb3aad69261d768c263fdad21b4631d08379bbc27e4070a5bd3b10d8727351831a7ef1decb217366f4bdfad707c9e1698d6869bee22f3579e9a79e7107725303ff48353eec66bec3f00d23f2e56cc872f29d1865550b4584f0079804655375e07738b9bcb4ae00414243cab9ba6b91f3e158e87f8881401da309d549b456290a13e0f9e4d48432663edb082fcb0d84d0eed0a8b0ec2df577240b92638d99ffdc5246f6ee8ddf37af524625abb38c23792133c8a7fea5054040b1e64af208f1f0fd02b4ea1f62197390aeb4275328a32e4c8f6d68001b6b9323d4763a72abb5f7246856ce65faa9431c11e13457ea3698611659ada89b8d755e8ce1711420608b67be66a9e417ddf39bf9b4f9f63c160f679955c6cc80f2ecfd72c280e1c803d1afbaaaa37dbf996b1d612c861b8e42ecb1c1a3d40c35bed6b2378af865d5ea21a3511a4dcc4710769443ca30636c7dd175b6afbb976bbd849073e4f3ecd3095cda97c74682c0307fd13a3b754150e2d282c8b42b6d312e901f74f3fbbab48b92cb40d271588f1f71eb8f68fe494ea9feee165ee9e4c038229e707ec8f4b79bae7f3d908a4c1c71ebd574aff7772bd1d7baba202d472b3c24d44f0f2c459d8b903b171d2b39d5da366bbc8c03c2487fa0620db7346251a86aca3cae7b62ef4d0d487430463640c47748fb7d52a53f683f5a49d3f7eee3cbfe59696ddea73d2956aa9f7322f4828f949d42330e65880a1d7b3ec79eaddba9043ebc9e47b9c010bd230b2b68870401c42694ee96faabd822c5d216cdcab834faa71e3d3c2d24d12f70948e3b7b5a4e5511642c3b43157e2b9d1d54b1ae8a5d7deb3d4aac990a040b8320b0ae049bf25dd0ad3fba1beae1d6ea69c1f1ab631f06dce637a8244a3cbdfaca18d1375e0448992affae4a7d08653f6a475b2ca80057112e77b8e6a7c0f91e365b74504b3c19eb529741d2f6df00d965b611ff000d7e85f087ba0a99f1c4ebd1d3e8c30ebc2e6ed249154a709077d7683173c0b160f8aa7cdf7f6a7b39f85f4ff70ce1fde27e7a6197165a08faa439ae93a3d28cee7b1ba2e20f39ec6217aaa6800e1314408552ceba1f8dbbbc216403b976adde8509cdec0650b70a3d1b5daef27354bf1ff057b9992bd1f8512a04020c45d35684a781a3d2e891"""),
-                    TestUtils.hexDecode("""
-4F4C7E0134BE5200C4512299D134770A64A76B73A82463FD8C86594939DCFD9DC55B895B32A2E96B8AFDB8CA83AB857679C372CD88754CD8A7B0A31D2ADDFD7D1BA64556AAF1CDD674F3E8F5FC0BAD2FA38326365918430AB2344CFF785D5F73F2B5D631DB29FAA0F9CCE5CB7FFE0CF4AF1C7A8950EF32F1D72080A492C7A25ABF67F409FF5D4B1E0D77268C0A1B2A32D9DEC61BB71EDAE6BFD58F274707182058F0E6AA31E6D3763732A82BD6F2C76647C7ACAAE7FB4AA51125F0D2D48351B6A3FC7FD18172FA8689AE1602C4EC0CAFA863AA98BDBB1CD8C2681C2B6C5C254E346C18E2A270CAF2606A6504D30C0E2E505C2FF9D18523BBDF21424C645AF0EFB2EA0FD21B5D0CD85C7C1EE176FCF904B481855C4CD739443F3340AE48276E7F4BDC00CD11C2B0D6B97BD00AC962EE1FCF8A73D3DA3CCBB3B72095CB33C5542D86E843641CC98E27545F99188AF064D5FE74739C54F5678F411D96A0EA043652935BFB2E37EC934327C7C841CB0CD04EC17FD06A18E88882177B51B00DB6EF1DA164245A3F2554CEDE8C84DD777F0B92CDA456D922D8B7B8B63B548CBB72CFACA540C0D69F9EF21759F243CFA03EBD6B080D23DD62945E623BC4F8323DAEC1215B251C35EA13A0F081B86E803BF37DAE6D913B7D942BD1C276ABEA3F8F74D0C8727EC21EED2AFD438BB7"""),
-                    TestUtils.hexDecode("""
-74bd615dc15e9ddf76b9f9bfe3092d48d80a2e8fe813b8b54d48297a3a3cc255927f7d8eb3bfacf8ba83c73455ef02ad7fb58606a401c0b29d8ee5c2146dee8824eed0d40dc886a5a0f4cb73a0a25c563fb78d9b347c1b0677d5b1f4fd9b01cde28958ff5ed00199921e2d72a63a4d5a3c43b9f5a47f5e80dcac8db898353bcdc754e89b0fd3279ef60fdc3114761c611f5d51a7c4ec9d4a3616376956a6b755d2e162db6df7c916d1054cc9e624a7b05fab4ae9080358497d8172b90bd2fdd8219e86663deec82ba86c2ecf63624c5d7aeee9f1ac56738c58dbc87d968fa3ee5098c51188169b188120015a00ef3a5bc03c52616cd04579604cc1affd3aa92270491673887b232eb65f3c0b2135157b6e57184b10f262605c26424cdf5c3a5694beb6a74ff252df89bd7693abc92ca4998d9c644cc737e8baa2ec6380d10154c212422c069c9d6fd38aca468ac10e08fb4e49b4d734f284c3e641182276a45be15cb2a75b78d52dc63799a5a2e4e800b30871655a507c2d0b6baeaaef0923d67057574559b87d8765a4c3f87ed76f1ab5bfd5eac40870dd7510b3bfcd84dd9ea15e5845626319e5faac3255bd9aa7686aef2410dba1221f67b3a649c5528a7f87f0ce8556e3f32d5c48622844c113454d08855d8a930b1c7d68522a9d284f1970f8944ed9882d515a877c21d3a85cc247da447d8005d72b688cd17490d88c9028c140f70052416815331fab6c073ed191288bfeebaa7325991edf0ad3520628f91d6aad43411e7ad0f8aeb6825f9b9d63b2f7d5c0f18c67d58634a9d85ef2a932cb231cac3f057656ad2c0e87a35fca332f132b68d60e39822409657c06dcc1cc92fae42a6c940c379e1fc61b6af60022a76e52c1a73033d6877fabcf9b17583aac80b5922148aa45434fcd0212634d5009aa509fb35e57905e033fe1026cfd4e227861d5be4e69838a92e070b96e61c747596e3bf27084e804dbf380aacb659ae79cc4c17f20ae64117088e297c82b8df7235974c4eade96a4567891eaaefdd7fc8ed1185a8ada618e440c4b85b698028f7ba29d46010d2f965d357a8b469281f5a2d3ad786092d5954ac780793f70ec4ce0ba58b2d755c590284c0062374d9a1453119d78b900b33d0ae9a7c2becfb014516d6b5a71da7c16c9215008cd1fa18b0e2d4b1a189c698e0ef49d230b7b284283b54cf907710730020e4c64a935ae5817803ea1f295f19464122c952de6870cef17bb4830f74e253ed99fc9d39618d1755003ce2c6434d5b4815a791df5478388dc9d6b3a72fcb326b71163922a7660304a9b9a0dc3a4df7f7d1d12fca8f3337adad6144add960229ed4b0de6eaca288ffd38a0a0ed6e0454e95527c18efbe3a3b4a18885e5f568577d903583ead64d60b82175aa2b19e100068bef823e2e8972feb348ec9f315b0a46d672d17effae1b47d60fcefef137956df1b4addad9587f6769269ba0d4e8d90090ddc2fe579dcca0980787ff8e41837e4306dda5f10d3f63762cb2f1b88558e749402b37ffa8cc75dec83fb44a6ab62260a15bc5f6e55eb7c1bec665ff4fd2a3d6e5360b3965187daff84ea0e42ebd3c33e57be120002e17e27d23cc5db3519afc91d9a6cdfb04bd7ee04a69ed087c4eab2ceeacbc0a0f4d6997f8471cebc6552bcb17e33ee72a197b5025b1499b1a19183fbca863b749758023dcca325bbf934fd1eee220e10ad10a49a3c5d861e91fcccde741b28ee26065812b371e25ade89e9a4bdb74956b9763ae2ed876b012d9c9e1278845806d9b22774b107443293848f2c510ea69fb45283ee91d08784c88f31de801244012ebb472b1a5032ec6c7404a03e6ba6c804aaa7aafacb204e3dbf5b9b7c455ad35a976706b0b217ddb0009562daa02a09e6a16484d4d85a4b5e5760b8b7e05c5310cb9eb1302447fd94b64963f64e2f182e5cac29ccb93233d43c398a7adc0d782da927a5978f7678b693d3c91988eee0c11f8614d351f48a3b35c8a5d1cd343ddd8f913e91f82f13922d84fe4a1c1599eb4574d1b1c3b0664695ad132627f8e24e0422caa6dbc0631d44244eb1025020f3018a14629eed3ebd1020b65ca21cc46480d958f67dff1926f99c7eafc6ff893dff9d804ab937dd9a5249d377eb2a9dcb8461c3a45e010690e8179343c8fdd033a2ceef78f2fb158087c93533d3b12b0d02417eb067cb63b3f961f56f7924d549e8a4ef12fbed383997e41ca1dc7ef6bc6629c947ea1a4750e3de3477c9d278d35f109f877d8af9dbf8a5be216b7a3511792efe170d79309910206de37a69877079a6d74b2a46192bee571b47e64a1458f590203789137bf3fa3a11defc15c00b976ee977e97a173502a3c13e01d1ab7c385f216ba812263096d0ef9d7c0c61dd2656771bae1edd5073e6a0e61991e4c163b5f6847231dbc2dbe261cddf6f31b614158cf41c3baa1e9b82bc2c4624f1be8322fb23f94912c2b89d82152e84f19ec84eab678fc79cb31ab6ffc25a56056066784fa5356cc4a39b33ee83f41ace4e6ba647d43e5717137c294093ba7c4d5d2f462d63b9ee0fde8b02d430179c84e79c168dec2e0a24578d067b6445972e0576cf5517284498e061ccc215898e15bfb1be5d8eadfdebe789188852a4e596474c0aaf581ada0f472ccd1a1ba6705bbbc6b938e2bf0b115557d73c3f456badae8422835bd12fd4f5a48ade113261eff298097c33dab6320603d813a198bcf6cc7fd9ccb78cdab417e6a8047e11867c91ab4072763d5e63369a58e8a3cd53258aca1c13f153c226a356b3c111a6fdb0bb51e5e6fbb400584fd4258bec8ad1b72796f0920a316564fccbd05e9bd5dd98552e04abc6a402ca47a9ed76bac30bd66df28aff95d7b86d95377349b7ff0a775b32dc5d6f726d16821c217f9deec62138e6b7b659d985dbbd57c7af7d6d0b8d234b47b122a02ea2813bfaeea52fac4100abe3567b18640f0e39828798b9788cc51f2cf987cd41602291195d4cd1fa1d1f152a2130fa6631dbf21fa1ffd933dd9137f7d1cc0c7fa133d3e4d04976ad8270ee85887b3d630576b45be5f2600a5c8159cee9154d7a0e4acb1bac445c033e57827908ae303d59564268f14abbf4b616e21b944c907ac9a30646f37d53b6d512f9c3212254d35e87aaced28d5d3bfebbb3c9e06c806a5b2ca6702e276c74d9900e08f8345001b1f720240813243c78aeaabce954018ddeda0ee6b1d7638e97b6d5b159984a901f297f10921a681ffc28834cf5b51c9fc761d327ee9585bd88c425459ab657095f793c8f07b255c84c5a0baf15c6cbf14335031347a03d11ba6ba49536d6812ec4e35dff2641bf4782f3c57d2d8e4b0d5d16b339caa4517ce6e8fe2f13f7d9837adf95500adcde6aa4191fd0cfd66f866c520ad3871f4f3bfaa5d0b8b3e1954bab44ac6b26713d2af52133c704d5237a32ed5e8ae69b897c29358c4a89ebc7431aaa97a031bf243e1a41658c8de7ba7e769e73b0b57a5b53cca25993c43f63244789e41b9be75859efb110390b8cda0aa314f96bc73b176d8cfe5f0acbbfa245ac49aeddc82e2fcfe9742c26a0f6128afbfd02ced63b67c26ed4755ccac4bb26963bf98f29c5146dbe5593d7a5b372d726d23e2947f6d98fa34454f6b9271a0fff5bb32a91b9140ef7e1751b3efe5571629784b271bac9d4b48c7fb0ac426dbd46dbf86aeb137a8c9b0d3025be5d71d7123581ddddac339535825eec433455a38ca8c6d6ddc59f12f6b4fe4e5ecb35bb3ad77a2bcdeb5315dffc072ba16565ae879e52e7652c9a45cf8ca840e913cd71dda69a81a09faaeb51a44f342812df6e88ddb34ce2e6a9a39b72d8128dd973ee94d6f86ac4b95af05940914f40ff800c3b25f3ef7f8a0261700415391ff4e9f8bca688b4ada9639da8e0ed0c754eee0e1d75f7c4e148971e7a72ab0233ee2aa77a4cfd345fa3062b921a9e49d444acafeb8c7796725dc84f2e5629b91f876fdfea92484aef3f28f9645973b47e9c607ab78877b035f64b8df0789fcab17f8d7ad2bf3a30bebd4233dd9ec3761bf23ff636ce7262974b332cbc3033c38bce5f9452dcfe3ed46aa3ae7c2c133160996e93a83ac01c4a50b0bdb0d6fe30c0d2b88122514aca33083a88b86768a46d11808beaef3412ba771eb77a17bf6328581d8213c5a7271adb13ee318f6b11624ac249857237d13c4308fa3aad7e148d0fe8b7a2c32ec48db9c2fc12fc536f5e9356dc83a8b57fc082a687a854ddb1aaace41e07845600cea04572c98a2a5482301d6c6e77be14bfb481ed5d36d9ead04ebd29e2c72f6855d4e13c58b338608923ff7ce5d366dfa8692b92c5356b6980d7ba133a979cc5f0e5fa066b575b0f7fac0e4eb0b531e404dfe328ee6ef263fc652a5ed151585d7fa47b11edba2b6ea5aca517b2bf5a38785caee5096354f4b703b8f2b6e2e7cec9b3c4fe09b0785734ef10555eca3e0fac89bc0293db20f64891f4b2773e2a2124e64ca5e5904c5d17e5d8dae7bd268c8a537d6fb7f11287a49e63e028186f9686b3bc6ba6c55a851f28804f53a0bd43098a63f5c005c4d3970cef231379a46561d41a94c18b2141843896a3644f1f19675ca47b4bceb6da613c0800c214df0c543dc6449831a7486dce0a6f9a349a4327209ffd5d240344912fe4315d9f38ed9e9995c814864de81e093517ab59e4ac5ff9d3c625c2e3db325092eeb5dacc6c3e5e3841b6df280543ab79b7edaa510dd39fdc44640b37f1cf44160c067432d32e4d83e60064e803a7c2bb5749e8cfb4c65f4fd515a15db304930279e95cbdaf3df8960f59ab547d527031d3d63d94d937a3115d3405e622a3f0a6c14c8aadb7464d5da999f16b327b61e9ed9296b0a8ffa10bf4ee900c2a3b55ac356f98076b705a8712613844aad76f961cf4829a1ba18238f2265a08c74e0f7ae875c19f70e9f73a328e48a7fd22e5657abb9b393bf766557fd834c6e81b07e1d1d92ff689ad1c794a46e6eb85f4d342caf54a0ed148ede130b7bbe1f1c2e868ffb20ea9c20b45f0311b352b85055d3e162944c91a89d00f2f9cf0e9a93743646379eacaa4ab3e54bcbce08e4ff015d0c424462c2acdf08c747fc3b7c7baee4e909af894c09395b570ae516ae687ac6d75c695b06fd8767b871ee41113b9eb7f5eb7d0d46d88369fed3148798736f31678d06b0d3402bb1577dc0f3f19a0a2f9d101a611d1b33ff99aff52937fc21d44e3f2c293d37b9a901ca71bcbe03965f2a458069c9dad2310b58a0c5662dc113d7ba619ce3e2b66b929e6770ecc3f6026e9ccfead7df2e44cd7e7fae06683a4b5c0a3a77bad76c8754133d7c548bee11be8cc084605f24668b294a6a0a633c7fcbf3822443a90477c8c501fd33c8778848f049a710971853bcbc2ae666493faa6426a96483ad0bcf8ed0c4ef0b58164b202650fce31b3ab76dc96edf271415c5a8b0414d7f60a51f01818b4e8c4df3f35f51f7738ffe534b2f9c2fe2acbf7c5e272a2d1fd4996ed30acb03abb0dee3e099b0430dcd620bbd639f3fb8b32d66c02dbdb262596c6e177d4aa7f74a959e90bd1dbfc061363870c42bd573abce58ac853b85766cd52724f158be47d62a90dfb5f0025e208c9daa5a386433ef5072da5d8938ed6683c7131dc5b0c66a4c4c2e14b04dea6fef564dac183478620e5c0ef74497974222f2788c84523ebc5391516ad6dc540095080042a5a52611cd4bc7785fef1768737ff1d9775a29a3a442f97dedf434d0fcaf2d8ec4931960e5ee03b91c6b16bb050bd9b64c9f8858958e1e6884cb916d6fe9643f05887b97f1696a7c111fc949009cad4f2ffd42f891cdb39292e9183b5eaef8c463a9226e71cf2ea4db2a6c66b7564b38aa04ab38d718aaa8ec5cceb4589e4f72e31e80910d209296e4342c65fae64b55be04a8927f0b9e7bab21f37af331218f43439087bd67d639bdeb92c3f774f7fcfb4fb33171659e00f03537983cd481895349a534395c40addddec7404c6adb90ad2a049ee457528a40821d4e57b94224d686a7ba70b5b2d35102b73de70870bafedf2b30ac3fb7f26679a2471afbe8f9c0f645e7d50d2d9b1e921ec8b84a1493e96e3463d1785b452a58077bd78708c1b54a96d8cb5b186e56cffe16f6ef668ed05cc0967305b409714679cd775168333d5042c9ca581c3ae2ef99e76fc7c42221c2ce3e138bc85e202fd3136c35613396fc259c4e223ea528bf7e0d7a48ee2ca96bb81e687813bf2c04dfde469c649a13816d3ea3e13b2f1fc1f6faf526dea7e3e39715ea1d6542e1a3b007fec2051531404040d929fa91c88a73ee9a717a93df44430598fa2d5922564a73b77651f24a4265c83ff09b25daf7c1b682da1498d5377ec73b00b408a4dcc9bfbfeba175220a6928623238412f1937228e9daf416a6c9aeafc06083d4d525c8eaf1f216299aec3d7e9ebf4193a42649fb4b9bbd7dd27367382849ae718394d86adc23270737c8fa8aebbd4001eaad3e4e700000000000000000000000000060e1822292f383e""")
-            )
-    };
-
-    static SigVerTestCase[] SigVerTestCases87 = new SigVerTestCase[] {
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-f72a05ee9f7d9072a579e3743771e12eb5c748904b15ff67e6a82e1bb77cafc34ea6f06d0f391a3eaef39db6331f1f9660795a5e7415ea21799da7f73b9e11d1f349dd10d258fb5ad40e6421b71a2fb114f893c051929bc4b5e5d9ea311c3c892ab045948fffaf578319fc5a73314fa93a88010bbaca9eb5ad63cf8f88497dd7520d12138628a52a5bb3010a3ee713ae6bd21fbc3ba12e2d444e8d96a3d06be555ac317d856fbfa97b46efcc1b15625457f065c9f8c73c203ea957acd2b865866869399ab9bdae1d30242b31bf8f29e445f07c74afd7e665bc9087d3fc94140393c6b4a81621c534cccbe0018bb3fc3e50342caaaea0f374e23500a2fe2d73dc1b0b0f7047de062b44e2e1362e16dc62306cf4edd306fa423d1b95b847b7974f547f0ee79181a4937094f1efd2864931048f5fc3535434c2b2df5b846ab4c7817b2814c6b4a984b8a3fe290cb63984fa8daed775fe4c2e452548476b2f33c727a0278b4712ce339fa7c68a6db7fb0c25dbd074a9b3bc5f6bbc22232f2ce264246fda6784f18282c904cec36fdbd92a7474733c63ce05a6e7a911cc85cc7ae477a301f069b62da720879f1ee02469ac49a69119c61f4db5bee7f00d93892b05e57ce3f58de9e3429c9432df433d6e111c8eaa02d1583b28a07dc5b3eb57261b7f158df82255cdac5bc7a559ac2fb30706029b843d304cb3e6b4a67f06f465ba45057e0d1220ada4e636075613acf81ed702ca3f1ee717dab24abd513514d7d893c2d10506f95b3988f875200801bf7a4739ac5cff8a30553131b10a317954c11e490793ddb7ce0faafa9f276ef47ba7545422e15653487300d678806f10e5025a7e9667c456fba359d09a11a17b0d0ac75ce9ea941b0fd218d6f3e81761831b9613c641cd85f658a9aae69a8b2b56342a1d879dd21c8485aaa5c3db1f3e19b00d1c83395b2045ce76a2067773e4cbd9408674184b3c333d3e887ce6c0b576808ced66eaeb8a8cd166b94796d60218d37aaa21ef12ef3b3b548bb72a672629583fd994b9f26759d71c7e15de4b10453ca02a64b37448a5eb632913e084db89ebad69eaa9587c1d205436a871a3ebfa7a2ca6a0b657b615a101e4fa29eb7862e804ab0d6e7a61f973c47171eedfe909807c88a0c9f0536f1c2eeb4826b68adbd4f987449e7a5e45b7efe1eaf09226778522a1998f9d79fc62ec7de72a05bd5e99f6aead845fa9ac32929ca2514671db615c916c0046e36951efa903571926766b8fd96db3e187c9c6355b92ca681a2244767e5bf7c1f565940e072536ced11f37a64036749cfeca9cabf0905e39d6d1a434831bd89492e9bf1a5ab9aab5176e697cfd5b0982266ecffd197a20326783972c972be1c21605398685bfe4091332fc53a396111b24f072d0b0e21e67fdc9a8d8088c1f9dee7430e8c75f69f3750aa6ce9ef7dfbaae0d58de48ae87137260e7a5f9ca430e141aa81921cc02a304dd3cbcb1c444eb96b4e689aa61a77f58cf5546b58b51287f4a9bfacc2096e8f555d5f69f50f5e8efc33715bacd6bc920439fd9eaf9968f6771275e16e286606a860263fd947febbdf046247a460f52f3f5e422a7b88b42ca4fc771dde31076254ed22402836af677b32773a9f331a2314c31925957a96c801fc20da62118b5074cffb95c2d31a0b80ae6fac13c13fcabec3cbe4731aebf1fdd3e4fb00e5a30f368d63cf7366631b56d691664e50367cc20753c6e9f6694ab7d090f94d337b54d00413b38531fa4f5bd9e56842e9574f226de48cc283c4c23fec937a8369d9b1a4bb2150ac0ee50b8da8d2dc874b53de33752d7bab603d1fb49c5ea5ccf7b6be07d6fd11e04dab95ef3b087abf23b1983461efd3a5db010317417fbf59e7fec98746be9be60b51381f3e5647ee7ee8b17e3e6c1157d992339f098e424f335bd17703d7cb4cf3d695f0e2d9c112cc71f8ff0d28ae3e2e3a0ad57051396b7b044054d6408a568aa0fe0bac15265c22d9274c5bf3977b4ca5b441da6dcb301e5e14406ee5a1b7f10e682f55c94fd2c0f6b97e6a75a4d7ed7b641cc2d01a2e18adbd02af4cc798a5c11c4d74a342a6e44e85099d4fca4eb68aaf1314f0f9e157c38b15fda038fbbe2bf1f8b3a4464c57104786e92dbd18c6e69c3bf6a6700b1b0873551e5f949ee94bbea0ebda0c036804b4fe6664456fd961e7f3141a0c1ab1b985876c998620944f89dd207ff7baba22bd198636102b3ec3deeac711edd17ea302fe9fd99897487788a3f5fb117b4d2cc64062a7ddc90f2f421a03044ff7d7a864e3a110fd002a9207f7b3d0214406a30dded64c5c76e04d0b09d3fb8782327172d4f27fef14ab8ec3efa160ebe010203460eb6694d0b6994e5053a03df54537101d48cc63930dc35e5360c3de909f8e060e53ec15ec2652b17a12befdd313bfc01335cd678ca4fed253398a61451e4ab83eeb7c29ef8a617b1cd3a09a470b4ede67593aa3f20ebd3e49e65840a2c5c6abc8a7365d4eb18d73e1f6fb5308ac006c8c43d33477a0b4329b6a9271f02ef6094ac6d236df8d5c95b0111dcde62248cc4bece19fdcd7869e9df88047cda20eee20a663d9c48b856cbe1ac561049b8366dae8e811bf9e307a7ee37a2d801e7fa02cf6177940dc6732544dc9293c751c547068f91dc984bb024b0dfa6c9702adb74df91cb6dfbebe498c0f715ab0cc744f364559929fe1a44855dcc43a6afb49e73643e5160b9b5fcf8df8d11ea90f1e573f94ea1a7f472cedfbd8de99b2748370dde471484c58ae5c337d8d5ebe022e3a1b2498a6897d4d0b4a20e2de6f6ebbda6aa83ab221c9f89bd0807d3461580018d83db68d632e0ec538c3d415d022a4411a664e669711513525f89e1fb47d7d3b54b90d227d5bd64d86a4a7b29266116a804f77db66195ac93070fe6b81d7480c360da18b8b57702ffe608010ece065c42695e2033690d1cc14f167de0bb3e5de2b5340c67b2eef8105b4a0f8d4daf5ee3134aa2ae557f1250abb6101d1494a34716d1b91bdb21afd8566662a5b6d4cdd968bdb2500e754ccb42826de1dac6612a43188b847d69ad8aa23b6745aa965d44d7d82b9ad1044706dafb952e1cf8a9db9681414467fed1471cec2fc9c49562529d7b8b22cd7b825f37783747fdfd2f2bb8f8d95b499cda043db9189d59d66b486485192629ce2ae833e9ef0487f8d9735e1b8651a45dcbf9040197c1b026143b3042117e0ec190942c72f120f13265816a6865113b8c7816f14ebe5ba9afb3e772b61330d0494705a5e31fb7a7823b0ea6553ae1736de468ffc67765d1474d8d2dac5140600718ff82d38ff19468c9f0f7747a3ca90db86d7d7c579d2e47bafcaf92d145250a88d11ad6556e24fef74a857fdd216b5b394f229b70e6dc5be32724cbd6b59889685e9ad1c36335f52e3ca2c4e96d332a950fca062cc31360a2fc405e418a25b237df6a393e92c4c02c987c1d8b88778481a825e3537dd8f1013d64ef1aeb966f0f94038e901b8c1814caa1cc8642497591f9c670888a2b7362543ecea4af57b99a5f1144a797157b842220df4b96ca7088c981f030fce4fa85d29ce754638cae597603793062d5d01acdc08aecc52ba59d8e46cf7eb84c5ccfac75f01cb8ec8c45c761d20d6c59e78bf36df162"""),
-                    TestUtils.hexDecode("""
-67D7F4FE3CC57FC8BE9A3D06BCA0FE4A39F39E3A6158D3E4ADA9CCBABEB542CA67CAC48167928336993C569AB5AE55BF95C8291AE1A1AB2B595C90C0FB19041435F3B411609412630D80DB0C832D413D69C8D3C3CA78BD1BDC24167AF590B67449DAC7F6ECBF87698BF3929FBC874F6FD68551B28E4EEEFDE9A0D0E7FE9E569F1F9893D39C17C3BA7A6211B875A7BCAD0C14194C30D60CDDAD640EAF7A02CC9DAC074779345B83F0D282899B2B9B61F8504BEACA3C02A76611C82F2007953D04FD3C54D7A00DF8F6DE554FD83D1EA5DC841645B706C9D900DEE7862D526245215AC6B9D178E60F9602F1931503864D97F582834DB797CAB60DCDBDAFA3FAE8726B525E8BB69B5E0763FC4ED17FE7CD9C9629273AD5B073B9516F6CD7EE729351C213FDD122E3C11DBC58FD2A501B267AA4AB21364BAA856823816E77B81B6061279FEDA6617247B86073E55B19973BC0E725F34ED4BAF0AFB95E436A9B2290A2B316C18CDC0D9F98F9F6F13C5A3FC767EC0A9A49BE1378E92BC9B3010B41AE52AF409AE0FE27CB816EB2614DA41C796D5F4FAC4A743FE34EF7C0B3A78E0E4A5B439659D4AC27B698550E89A1626FAADF71420F559DF2E808144707B5C02090F754C3BD4EFCEBAF6FA4493C5D48F895FE7674C81F069E1F00E455BF5C965BE2926BD19AF76E20533A6115F4BCF2CC5DD3A49E10A2B3FCC9EEBB2B6E4F25118599062F2AA6CC3A9D86167B1BD08DDB2C53A5E46E1BF4E8C1967866320BA66AB67CE581981F2003B812BA058B75924254EE3715BADB8E6B1B9E4F4AA9844D578CA2F0AD12E1C964685FBFFC87108711E022EA7F63330CA72AF86262838863780F4115138672643E6D9B48C782B8637E01D3D20CFD5C98A1B57720762037FFB12742B4EA8E89E4B32EE7DBFCD5C11E4A6E839A83398ABBC32BA39C6A25922649971D88A102D1019B560C96B820C44551E14509468196CEAFE3B7BC8F253ABFC59FFBC01A13008F77C91B19083A9E7BE733C1A5E558C64557389CA19249CAB77014D0569BAC7812862A610DC6EE074C844A055ADCAAD496F6976C932587BAD9D7E2080F8623C5ED8D9D4FB9EFBDDCC4CCC1284D22A2997824577A619905B0D6E451CAA3B2D30DAD9728FC7623F9ED71F80599D65D9F2AA285BAE393D05C15891472B2DD2ED5CA669785EC4D441F3308EB4BBDAE8FC449962EF9787C39A533847540965601D8BCB6B4299AA636589BFE371D3904E18BC9AAC9B3B6EB8B7E8F322C22A6E01E6B26244F9E39586F124AE4E504FBC9D860A61B20B4C127FD0C55EE810AB9803D810233E6126488A6E95F8ADBB3F8E06D113DE6A3E361209E0D36B326E042CE9D2698DEE469DA15464AFF82D5603434C07CCFC4D956A7D55FE79CC127AAD2A56B34EB10E8B85C3CD5163C4BB8C1083BCE5E5EF986AE028837809641A6AF2B8295B743DD9B03931E755673DBDEDE56F6294270532D685DAF1187137CD7D29248F21B290EB8317E3EB28B62E45E140F4AFC6D1438F81E9EBFC6FC0F1A4146AAD83AD1F0EE2952643E7B6872CB2823AB21A155C281ABCD19E20A52611C6FFAA724578A070935B1A0BFEFBF061101A81227187E14E96B016242DA269FC91253FD827A73743A4BC49FB63E2D830D0FF409AA1C73706D7C2297CBC552CED567DFED72CD15060A522F9B88EC910B03CD2794A9FC07A8FFC5CB97817DC769E64D8C474A305035A49D05B1C572363913A315932E391B62AF291DC203B9A40F04F40EBF26A4AE186056CEC45EB7D21D88CF50258DCB5EF40CB2ECF949B18C72626469978FBE0964C8A25E8C2D27149C2266748F2B06746E8C9E7E2F0977BBBFE3FBEC7353F583FD5F7C2B0139EA928AE1F67004706F6D4ED7BD8D13BC68E0F4A49877C0B2F692936BE5FF99544B2B19B23A97EA6B5F585ABC9E69E689EFE25E15804C650444C479E0DC63C9CA2AEC41A316039EC7F675F1FD7C0476707370CFAEC9C3418CCF30B5D85FE0E15056D6C015DA59F9BE9028D9C2D93434F99DD8C1BDB41FA1EB021BFD0FC12EF0D038CA32B0FE1449342D83CD6BAE43A8CC4077074FB1191A8887BF29238D27415D93880682017470A42872D6CFA729AA2B3F8B37038C83583E4C33256FB871A704527594596FE858777A93D3095767BCAD2FE295352C93D227E1766A59ECEB38FB7C2E3664D6DA0DD4C063975FAB3AB4B68D125AF16D233389D96A337DBC18DA11F37F430C1E49BF8AD30258601CAC9215F32771C6FC2B7BC03B55AE9664E0D719C3B40C3E4FA7DEFED8571CE8E46FDE8701975D94319DC5FFBE93B4FC4898E2EFEB3CCFFB3494AC50BBA364C22A3953F052F62E46D0C35692AF40D2FBF899A23C1A4721375F307E2FDE2E588830753F908FAD96EBD5FC360D742E2CB2C38A7E142C95376ACAE29DE8E1034207D1CBC1DBF2968677AECED152B1EC1AFC195F3320352953F2503227152444BAA74EE8F98F2B4512F7ABB43D7F87889CF1F8C12D9BAB91EFCA5AED21058E322CEB4E59DB4DDE13BE46FBDFB225F4AEDF7137B548503008002A36D7A3E98C0ED65ED9322D66FAD4A741125EA4ABBB26A2FDD7AD136590061E7BC0D5228555D1A59F8A6E4B97ABB61F4B1AD9564E84C000585DF8BB31AE61CD25C9D91D1A1FC21A69AD286CBC7E00F592DFC1C65E2BE755DDF041486F3B52C8F72ACA97A149FE0CE1378236D99EF099A668F6847659F7EF617B66192CA452ECE3010AAC18A65D8964381F561B48D044096DECC22736C902D7E23EFFD26245018D9D7EA9E2F907932A1EBB405BCFD29F7A397C71A5E08962ABEDA5203988A81F787B25EDE84A7D85DE92A2B19974EF7D0378877B82BD7CB28B67F45F7EE625CCD054B44B4CD51802B4FE2E219315CA9F4C24065F5578732DC671C3004D31830DB435C763143CA209D7DDF3F5EA42244E68429102F4D90297B7C987EEDFF0DFA7F31964B76432E1DE27FA38570F2BF64D5FA3F12DD9772618ED2B95F51AC90410350320E19084F1596F6B791AF1EFC24DBFA2B7E30015AB14FAF43B568C5149A1152A47D278B5F01786F242858C210D28812147646A1A3A7CD69996809B784BB2F0053CFE18446F060622FE3B9181AE9175D6CFD8033AA752296016E7BBF639842DD4073AB282FF50F94B9E116C63DDED805277D4FD7987F740EF8118946851A5336A9F6F6E2FE3ECABCC518B31E741AA79AB500D9C6DEFCC437569966EAB1D4BD6CFF8AD0E5698D15F1342ED46CB6DA986F0C4B2B427752C18ADC5070043FFEEBA98569E90C79A3D5E0434119A077A097D69DA6E9AD7E32C6E8875A893F6D69424DCF4C0D4EA12605E5E8A9853E4B58E5659FED6D724CBAF582A89A228F99BE89D88F55095D0627B40B29365863C57F82B9EA22FDE731D1A2D8A9037665213F2C410D4AADCE12CF888DD4AF53FF839E962F0F53BEC60F97133D131C2C8EB588AA7D25EC025B9E821DA8E8FD8E550EC5E4D5923BFDDBAC522D1FA64C503078618B52F452B57874285AFD3F6B182CA6C979734C94F040EBAEDFEB547683E98F4D13F12A252E8839317A827CD97A7C3D81962A25DF7D8C62B57812EAFEA9EEAAD7D6A9E755AE4CF3AF42CA2152F663C1BADA0E653EB165F6FB56D86212378C0B9BD5733D4C37178FFB58E7357487B98DEA35127AB58A804B13E61E6D3E385C96884EA91C744DF6CD44B3EFBEFC79ED19C406AA6ECE144A44F1E78B33046C33EB17E3BF61A17D849493D08F0FCF8232AF2922D96213647A47A05A9A08D28AADD3B3BF412F29063C9D78CDD3385BFA9F8BF06DCDA23FF79A5912D867EE1B0D526718EAFA6F0E231CE6C51959BDCD8D201838A50634F1C6BEBE2E4F5235FD01A6D27B90C58C12D8210692BF68FEA5B8A8651E64EFC1DFCE07EE670D473F29AFA63E080F7675F23E7D2866E5F2F9A525BB657E8BE5933FBED1E206C7BA9FF097EC95B91E14612E16F0F4082F70A1B01EB6219D47C716455F4C1C60948CF3228557E787A3186B4758AD35922AF28BDB328693BAED15487F7448D1796BB9DB5C931EFABB4BE436B2710EA280368A8E20C5782A7FE986417003236BE9CADC560B3D7C2CA92341536CF67D412E855B92D0229C45B1C518D8BFC82DFC9F413D3FB23D37EBD96AA0CD0B39EF88B23609AE0FC2BD16FA9E934329558759F05C8D4C8F3F8728335B659D3986E44508322E47121E592C9DBC6F49656B473EF7DA53FF8EF7BAE07D1BBC68EF4AC369D7F8BE60948F34444C0C443A100443EFC444E7FCF0BC4DB6A2C2C64662A538D1F68F4DB95B0B83DFD744ABCCBE5DA343621F0E182CB9E915B2097C186F1B98E7D8F297C347B60EC26D04B6D9C1FFC01EDB2551FB8D11D49E52956F69CDE0E49E2E7DCC8E7C8E78C41A9B2A01483BAB11733A0943A9B765A5811451C07A195D87060F157D114358E478FBA2F2B755A2A455E9831B77EA9D33FAEDC1C562E1CFBD8DE156FAEFF10AF655713E36FB508342D9B4A239D6DB786CF9F57E1C39AE65A7329E434AA88C68F82359E6F057873968F9FB63D898F24BC13C0F7748F92E404C6185CE24C98D4E4D8D4B3C129CB46C614E773A89EAD73CF0C30CD7E6C9F6435F7C83A4C3F877E034755EAFC5F30ECE03F6413F4C7DCCD01649B6ACA9C1C3AC3D112F216AB852A27DB3B846CAED86B76FB699AA7623548EADFE6D16AAF5A3ECCC298D5CAA7E84ADA0B75290FC6ACE736051924DAE8FC5BA6DC9AFEF65F369D054A4A18950E71901F4483A4BDDB2584DEDC31A04C5F8916DA2DE33B37078E5DAF3304344A8AC368A6668464FFD7898A18D10685BDE6D0097F95A3587717F6A3A8827B46653D56E461EF861D6908AB7D865B532DAB37E02A7A6A72A06F25572D83ED6DAA540FE56BFFB2BC9D104A74F135127ECE457991152DD0564BA955971E8C9767DDFAE190052A98A63C4C0DFBD1B51BF60643E4C5EBCA678CE5150F03A6EF09AB0B1C2A0D2C19C2B30A645C7DB9B56B5AACFB862837A38407070DA9C7DDA20B99CAC7B03D10C8F28D6B1C686FD26F9A8FDCEDA6B188D472BC593AD51EA62DCF73D32EED5444484853AD0EFCAA60DD42DD2C50F5AD15DEC7B71BF585581B9F9C68C7C94C154CC7E0D19ABC90508C8EB2DE93F0BE4295973C1F443A1B2419E20F3D5F883912BBD5CDEB938A4452FE0BF2361A9E3B2ADDFBF000DB07EA19B2735CDF0E8E5C7EC5CC7CCE1A9C3E869718272E54CD9875C21DCCBB06FEDE38A4E787D111DC6A253A4604B314FE47A9B6F6FEBA3F8F013A456DBB78B497C4CA7F90CC6145F47C96D266BE5507DEE27E968052CAC85EC87049CDC68D723D8CF89B0C91F67CDE2908C0C71808004A070CFA2EB6408F5FD6108749406FFD3D5DEB6FBEA00FEADDAC4CC0E22A9F6F50B9893CC4CAD028FBB73C1B7BD4292AEAEBEB668859BAD444D0C5FEDE3C469CF28C5C726B59E828C473C8787453BAA3AB2BFC29C691FCAC2CF496ADF3949CC42FB16F3677D456E614B1F88406E6C9DA7DB9937B00764D61C3D347C140FDDABDF8CE5E3E2D385C3FA6FD9F13F3BF8073B5D6AACD5294938DEF9C6ED414FDE4B3C5EC43865A7FB02787E50F94033CFE32A85BBE24B09FAA3B55B8BDDE60E325B691A350F2F128CF74FB5B6DFCD0E946AC7BCFB839B3765616DF35AF29F3AC82F4E2DF7D4AE87A016094719A07B5897105E2B08AE3D807960FED396CF38863E69662238541EE295C06B290404985444F4B28388DD942E51867216C734580B3F1D5BB204B05D4993D6F8ACDC8F16FB77B607FEDA67939A2B6AE285ADB2C98E7D37A81AF0101A5CE39CEB2C67CF99441C1FD980C2C542E7284BD21F1D30E68EF3606C65D3230B5146DAB41D4ECBD5FD89FFC68441BCFED9AD8B4E0B616127A7AA39E84DBD1343E2A41B4DB1AEE0627657438034E890C8EBAE19791705BF6C948C630DB1423D310A34BF151AA8ACF3269253BADDF5B40AB7EB3A7AFE2D7891B925F65EA206F4CA121175E8F348B4162917A68FA768928AEB0504A60C4F42802DA25DCECEC60ACD21FB236080AF1FCC9146BA30AD964416F4B524ACC416B5357206980305555CE3485425EB8F87401FB1D8CCC184C486B5B563242BA9531147D6A2E7C0BEC1A56E083F05344BF97A18D0CE0FE56E8BE869C746D4AAB365225D8871D4F99020DDB1CE2B5D7D2E5DFC8A0DE780CBA0A9B9ABAC87F19C73639965AC2382488387F06199A08F283794E1B8D3580E5CCADE811ABA6881908277624D5395021016DFE21C345B9A21B474043E187403E5B0ECFABE43991865A424BD33D233AC4BD30A3CE73DCF49B58CC4A3D2CE25C54FAB3480FFE0D51A43B71FDB7E1126E66856D263DDC3BF1A31DCDB935DECCF858FA2CE5AC89BF32E36D8009657F11691201290A243B5680E060D2CE30F1BF2444D67DC94A24708F8F9261945D1B5275ECFEAAF40311CED5C3770A1C194EC44501DD25B7F5FE67BCF62D1BF31119F8EA7DEC1CF536C1026A8E72C7B2E167BCAA8673AE5506CF6208F3E1B6057B5D488B29EB84D6F94AB8AF322B8657075B9EAD3297505AA521D601C21540EE71349614CACE0E7F14EF42D6CD5377DDD0241E34CF273A1171135A376B98C53B218503A908577C268F6DD46CA9C26DFF5942998851627474DE9E6B46F49DEDE85CEB993A52D01F6AAD6F96439C18B0DD5A4FD559812227BBC0567A28C1299626B171855AA0C74E2F9B1AAA781D34CA58C72C708AC49F5AE1453902A1FFBB8458E8B4786771780ACAD999F8DB036CF4C3F77AE345817EDA2AD8F7D2AA9228C994F6AEE512F7C2D2AB72F2099EC932D818E495CAC8507B06CDC6702944237DBCE338C20EDC84D958C14233C1884BA09A023BF5284F0B0157048B6AEB508415DF337A553F6435140D0CE5D5CAA77F9137B2C1AD5A02B13738772743F192E53E970DDB401983535CB096F7D98644797F487CFCD18F1B22BA7494D892C1E5AA05E66B1A4326C70E348350C97DBC26CB110AE8289C97CCAAB150020827B7D7AC7913B4FF515583677018949D39CD73BC7DBB90696D5EBDBAE6BD6FC78E3826C8218996F079A387A17456875952B268211891404E80F8360F042EA3D9F7F7BEF772E64FA1EE8B4EBE0A1162A46EC1E9899766BF4D3099AF712A847CC86291B3D6FBF51B3B3CFF87D7DE71E73069619480F6056AAACDB9ED8E228BA075622C2FF242CB050342DF8F02118D071D27D1FDCBFADFF49184F5A100F95E1BCB019864E58E0F02672C8F5FEB97EFA06FBAE6EC3D57A10EC712BE0144323292A2CB27F1B1FCC104140F556D09A6074F853AD4328B00E6F2F24A61A7932311BC999805F2E774DB44ED72ED244A945928B9512556EFCB2BA7BE0E668C41AE7601339F0162CEC0A1AA91C3FEB6A8A40158D7A3560924455B9AFBD4B3881F6C08EC2895C84CEC30CB0F5B499B4A66267C719785F94A9B9F96FCEBEE939AD0FCF42D0E65DC241698DED0EDF1A9BB4147898E6E83851499175105BADFE4CB00B9000404DC92EFB4EBF41D9A9262EDA550DBD0B99353D001F90AA05591100BB678634FDE4E0B1C174222C253870DA3B8A797CAEA9B446309DE5210F9A932D6AD48A4A7361A943C1BC66BFDF75CAF5409034A8768BD535B20996A728A26E28340191E03DB17A7032FFF883EF664FD7351DD37DC2D72F0CC4B80BEDD1DC33BA3046162F5D0003140DF78FA588A9FDBDF778836C6CAE7E5A20FEF030C57867B295712DED14474FB87A301C31214FFBB4F8D166498ED93B6E233A669CB88D441A38A0E5846EF68F5DB20245980CA184878BA8BE1992A0638B058CD3A3A501CACFC818D2B5D7876DB6EB08E9F26430FB06EE0B9E834D1C331B66CD0BCCAD7A66ABF4A9D8F7A872932A3C0B25C5BBCA480159711E0BADCF69A1107B286AB199B210CE95BCBC4244780C074C42B6BD43869F27BD666F9B2541B1561B4C207E9A667EB1E31942697FCEBFD0B920EF80CFBC5CABA6F528187403D7E8262C110458B5382BC376799032362CE57ED39F0D29D7822C408923C29242385CA9749FACA43EB4483E095851E89D24CAC7BA5AAC60815CB5C8C5331CFD66352BC8623D5700F49FD98FFF9E869D5AE173961138D76E00CED6DBA09144083437CC8FF5ACDA10BAEC0081C8BD2F5838666A093B412532C521753C4E11ED0521923D1EE6BEF3B4FABED7467B9C8F75FB24FD8D96759A6146B34EF951C4DF92228C2E58231A8D25E3F08ED5A27BF6041AD7011DB41F815FEA503973D4E7B5798489B261A0AA4D0C32A19D17C584B1702713D1174E542BE4EDCEF27016BFC78118445A63FC1D17FBEE5F71DFF46F1EDCD050239C68DDBDEEFDAE7EB8963B5BB4819186D45191C05AA049E50C4319936C8788AB72744912AF28BBF5CC77C835C35BB4F987DBA6657BC2A7E58B7CE69AF37AF680DC0EA7797B29528AC70D92F295C561E2EE0D0E530854AA19EDC43C01A383035F6A5DFB354E9306962EAECA25EC85B9B78E8A1DF6CA50EEC733F60C81BF812981337F784F8CE07D0C03D8B3E72BEE1FFA55FB92DD0446CEE29D8825CBAF1A6ED295E613FC700FA31167224D99338C4F59B1BB9C1E63CF77476BF84F2001D42E4161F7737B47C1A5F219F6AC8B8E3ADAECA827AFCD6BC0CA09615BCE15F1BD0803BDCBD41E68F781517907EF3DD8E8A33A1E30ED09D7EC1D3605DC72C9232EF9F92475743164E92D953177B98906DFE5E414E134EBB63C79220D4907869CB2D93280F60DBECCC81B532CA336510E2A7F1D631F7BFC517AFF223430F9804C4A4877D8B7A385ED48F390ED9666A56EBD62F6C943D0E52AB1EA247BFB07C05908E99358A51E6111486133F4A6BE3BAF6B2D4C01529925ED911CE728B4CE4E8CF8379BD216108BF964496269BE76379912E94A4984B890A4BBB9692107D56AAADAF27ADE475E98A566C0C9E33DD1970A3DFF0E2F79197F6315E320BEB5E2CA3E3C904B557075981118B363042BA687DC682F13D213974B1647FB43DF7FA168C9D4F599C5BDFF2941C111C6C43FC75E69C290601EBC9F23D665F944A9B75932DF7792CB8A005A7CC83DD071376DB11F9C950B38B270E06C907FAA102AC76722325934755F53F3650B42D0FF293FA37086241C00E99B9C03FCE21F8D7555CFA93D09A0EAEE3733A8A5E4C45E74DD5EBFFD2F75EA60942BE34412BC82FC9959CFA155DC87FFA0AFFC1E7CA5057EE016B9751C16DF25610F1981A08B8E3352254AFA433E9B86D3CC13FE9B5B7FBDAD83CFA0FFE511E44412DFF1636BCBB49E9769FC52B302AFC7A96A3DFB233831007CFD6C302CCABC119DAD45EE63303DFA1F11C39C702AAAE00FCDCA913371F158BE5493A9B5C3B06AF66C8D5DE2BF9563FB617D1490FF6510971203DD25B27E1AFB289DF894396B8C26548BD53B320203AAF053B19CFC815C5D37E3115FD6CF8231B88FE4C330545F131A01124BB2487A3363B3E534BFD38B1D5138F8887EA63776D78783AC45675ED598617077AEAD86206B9FF61E3669C93C3C3A3A8F39E7848A88C0F94878E5D359C22BAE891FC7478BC8227FF320B047D0DFFC8218C1110136FA803EF6395E52DB8326CE8E3AA928CE42FBA04B1E7F1AC7B73296CBC1567090B9E92238859A87686D8E623B780F0376B8537F41B1BB102CC8C480C0B6C069F562468D4E1FE111B24D51F63E9BD38C47F35D8C2B5BE2E737274229974CC4CA63BD0E1F0446F6C4448EDB2498F2376EE26BDD8581242703715AD434E425908D61EAF865FAC5E82578EEB0525F54320B6C264F37DA36B55C2308D4FC6C7FB2F4D12A88CAFD93953193B7CC46804A0C464740B4972A71B7EAB5F6098FF78BDD452540AC5BAA894C10CD69A992217B422C88CC7849B4D8357D86234449B452AB4D49EDB1D2769512CF8A797F5FFF4E1E0A3FBDE292D91722D71322F0BD48C68A3CC998D03F7581EA7B5F5150E7AF58A076D09D103E9F64E61A2D375461007210DB511EA89FC4EEA75FFC71F7BF31400E7783F12F69A1EB5B7228952E2CD1D6FD57109237BDC024780006C229EAD71EBF4B543647FDD9216D98DC78B43CFEAE12166CDEDDE09B52BDCBFF089B1F7427EAECC21CCAF3FD5A35EE72C3107DF0670891E1AE12C1FB81581F3A45480F1FE06BECE6A494074FF3C47F90C961E371E8014707AB0FD004D19166140AF7B1C9D6B7E4B6826601AE104CE18E17939CF77C2A31F711D5C7D5126F4CB642178CE542973466696FAC1A0858ED62E4F2741E47B83B97DCF4610B1E4E262E700A06FDBFC6709BB1D4AFA7C20EFB72E0D623389DCCB049054CBBB322E63B09176E2903DBCE49083B01EB07F140D498B793E149573D8CA91DD2BBF8DEABAD9CECA0F896A7B306C22F8A761A65CE2BC1358A6ED07327AA0FF4C0B6E2906882A12C50D61D021A1316646461013D8169C4B54C61614CC9EDB2CE0AB0BAC96B36908BA3ABDF92D11D96EBBB9A60DA780AA58B804DC6F91E54D82068FE2FB10EC1FED54B794836F54503135A7F91921E2BBC2A61C99B6A0BDC04FBD2D4E7E430F16B5D3C7F06243517452BB7D2D51340BAF550D260A26A2F3B5451AD7D4E3A70CAF63F92E25D137C9E9B1433CAA5502DA269211F58AF2720FE3F899282C2C02B78E66D3302C5B9DC04B98197D3685EC4E6D4603D79B357282932689C2928361022E79C197A470212A69AC2BFC7505366CBB2BAB8D2E31314FFD77A04E85076D76948E836CF2A87918D43208CD856FFA33740FCAFFF9F690B2E6B33F1D89F65C71"""),
-                    TestUtils.hexDecode("""
-a7a908a5bd14b14de2439fdbaba72b5ee9bd54df9c52b17b2e3561949f4739205c112010edf1acd95513c740e1a23beab2269f5db9b432bbbee5db53bddc1fd355d8ee23f018cdf3108404b0d1ddd3b815dfa8b1c724bfc8f9e0c0e610a8b1260ae33ed202e1e270cb27755f10404dd66d3d32c530aed7963b5ae36aa4c1d0ef442b149b71a0756c9e016b7ff63fb4ed25c59edb578d01a0dcf04935a4b5609f4018a32d18f9a59f0edc0d2e90bd7e0ae75b5402652dfa30cc0938c7e35b3666093157f1c2f6ad80024539443557db996783056c63730cfa60c46c86b79ce446e2e66d2b279c192cb4773409fb8cb918e363220c0c1ed95e9a7524d0c0ac53c172eb3fe311b14d16c2460d0e583aa3ce251057b5ca59fee59f72627fb3b1c8e74a8920f10ee9f96a080d6f0a143fdf029c71f20451757b2519fe0c10e006134a2ef8d51cff472dfa63f934e13fa2d9f9705092712bca99be482313668f52a5e996a59511ab9bed2a7a4ec0ec1f17a3df944d4222b32e7c4826cdeb3abdbf325f7f9c76f5b7de28b1d5208ce9e19e853b90c9c7e2a26cd1590152fb61ae4fe56238b5e52fdaa6a17afbe5078d4af5403b620acc4942d01a432849fb5a6bc19bac30efed04e629d3caa74fb0d7c2873a3609c0b6f8c41d88d394bce13f3a144f0fb3d60a5ed31225badb206848c13c156a2b7be5d9df517d5d71ea3b578f90cc85fa72c3057442c95571dd20c9c9b1424566a408f6e135d74728b4b1aa1918aa38dd2108346a3189f54c9ee83684b1630a29a69d6280e47099ef989c3907b95fa9c1119152d97f9d9181fe2bb89759987a7dc16556223bb0738d1a10ad7959270bb737fc7601f2552a322181e1730228c4f0889cf196bb570002cc439ddb83bbea27f5ad9db5e62ef69290368544e271dad0e880a032a188cf4ae1b290f6576ea5c20ff9ac3b3950566fb8081768a4bd804c22539684572105505d2d2507308e5e50d05ddf24655089c2cfa4185265737894310f66d29551e842e9df5dc36d2e1a894d10504099511c68a0a81900c70fc6c2b32e84587d6e4654c97ada0ac1b7493a8efb756a4aa0278b773cd302f0746a6a18e3b1aea24ffcb32a57844955bab9abb85076ebbc568b4c5ecc898f9a1d9e65c6852c64a1995733420e0ba5a61329b191e750e212a68ee37717ca8961593f146e0093d1b70f07cca6b6f2805f48e66c1b3d6405ae5f6a95fe27d427482fcc5bbbc2c5e0e0449c73eadbdc261ee9636bfdea73a13c0a9ad432b4b7037432c799cff8051a331b261028739bfcb17544732bea4c2c3ec1d42685d007740bf49d8f8caa8bc31c7e59f9ca033f27eeb57f03af68b8ca30a27f78c06dd3a7f821f58579353c325982273415975b03cd8649c9632374f25bf010aa1c0bb82eabba168c3e2ed17213734718cff337eafe9e48b6ab79655e98a38bb1f74519aa07ad10529370ea2581f99c59a824a5ee0747fb6bce34396514a6a3dc4755e913304a28f4bf4019a42acda382a7a7211a30b2878264c4266043cbdbe2c711fd0da53106b0b5b16e78bcd1a075b253c98cb0aa9b980af82425751a7192e42f5057d5e5e71a2d0dcc9404035e63a905133c7724ffa110c942c54e8970dcbcf99fe1987931a5fc14e83b731aad5f2ec0a29f6872e43f18a94f5f9f11e2b7508ebe29a803fe159aabe2cdc242a6ffe976044feedd0b5826c129dec3c05764451feb8b99953a635e7250e74772da18755e819be7db6560b5ebe2de9eac9fdd490a6aaeff8bf568a38f70bd0ca443d336ae6776212e0d99593f4123d91dff7ef68222d497d1799ebe6decd2f7acc6c363e43dfdf9f72b88c25e9bf740cd1207421b476ec3b68843cdd285e292986409aa4ef04ce4b6479c95e52ccc8b5b0247afb94f43af536ad9ee79b58b636afa64a2be3fb22fd128f1f1f05b949921bb050892ed61cbcdf66b11ec042eaac3765d7aa524c0cb022d386032ed7449262529d2a6eb8c5a7a539deb3d1db814f0284e9dee64661f8cf3906a9802efb7fb5c4033502eeccdafd77a6d0f6ecbbbd39aa21f14afc3ec5def48b48afcf5ec99acefeb3007a90a54da935eb5d4aaa68502b1c469acb166646a3af67fdbb51d1338085d2798174db7ce74f2ea9c61a50a6fbb718dbf62ac33dcb7fa80aa982924f4310adbc07b2b672438c837d1c58eb8b9093229cab0d6047091b4152a75beffe7b17e44989dbef1c68feacf11a47d9dcbb230b9b180f9a7d10036ccad63454f3da00537078db225cb746466f1d56df35fd9380620e37f4692aa0b9b5bb1784a4cb80a53a25bd9cbd7ffd2d3177ac7023ebd1127adc732ef7d4963f70b130af5c33a824c3b7ed6d2e1bbced1959560cb753917781af33478ffb947488c8372d227e5efc9f5db11bb010c278cb40ead48ae49b2df5f927363a9e78bc125072929ef80efee18c7592271393b6f29cd1e339e512b1214fc5757b1ddf0bd1b9742a0a11ce469a78866b24035d8499c42be66110a624c928641e59078bd1cf6771c7446bd1977578c165695c4d6aa4ba9383ecd2c41677c3c5cf9af096f4c8c9f5f244e5395ef1db825d2593554c7c741ff0e0540f0ec897a1d8cd88d2f86a1aa21e5473b1fd21a8065d49d682d4dce206f4b511f4d466a56be1bd99d1335b17f4170a08899c2015e687f1caf70140770dddc885cac8c29dffa7d5df823b3b8d64e96008f5aed8d52ed710375e34a7743a98f714dbfaf70e78b177156634c0ae931f5082d2c6b7e8d7b1f025802ad9f74c711e218955938b14fec5d0983bd2f44d9288edb72bd1eb41839297ba5915e518a1e57e28a4ef8eadbc6ac4e14b4f61ff5834b1fc6f21a8065f7e84cd99e1d86cc9fb8582fd40eb4f1f1f4e05161cba9e54c823e77f882cdabd8ec501be12e855e0f492fe572311a01e2aa73c9c0c0ef43df7256ce9a41502e15d7fc76a3786dfc2812ba4451ee9a4d159d1052e0fcac791df2027258c5f0ef51d23498d0ef333c59eaba21765783f7fe51db331be068ec4e3e779eb5cd47e036a5bfb6634dae1e4fc719636a3e4944b64af890b1ec70f89b73b33b626d5b3f4c33e45ffae3472929818e1de7eae0f0135937f4e065b2b1dd045ba8372820a294d4a4c9d44af6e321ff565c69ffe8babd43d095509163bbf8a503ec55588ac3c58074a96f3e32499a6845387f9f8b4520cdd3ad129165501d28b68339c1b0b43dd1dac6d02fa89b3c381373a94c1a59ef4839a671b7fcd08c61cb12b6c66edb631988fdead1a818f843f070a66ec46523f8879d43c98e3a4884c8683f9eb73a4d186fb43a343165202bbe8e1735749b64c9ee36f062f2f8129e227ef8d38a7f35677b01f68162d9c5310aec1a8f8ab1365546ae313c90be351030641004c735c2ffb07d7edfdd7434ba984790cc7c3c843c23531593caf985d63c4eef255962825a44a2c9a5c73d1878b6e149fa754a46b77239539851b2adaa293dc29cac659a0d0840bc545401984682144d7b651b125dcbc3ac272edd7e8805e086e7e33e2367beeee06458dd2dd80deb7e36ae6f9d10f84459a9b828aca738136f2dfdec4dddb3dc6c0ca72e2bf19b5b87ed28ff661de8ae64d7dcbfb71f17f362897e12e94f3197e58b2d62eb849a169524ab78962b25288f87321a753241b123b2aee98e60e2ad7341d8e1796a160932c51ab8c6a0c97b188ab05dab278cb64f025a42ff8e40a424858f7e56b27d0eb08746def560c8dfd11bc359b8afb1a3b922bd34dd1f4588572d26401074e4ef4f37500d39456e458b6a9f30b94003fd110987ecec56629a013245b48be1f8df1b2ad80b3097552841186ee787be2e8ebd555253f59e12c255db9967f8f506746b8fa49203e4b2bb48d04bc117338c40a6badaad1bf8f100b8420aff9231d20bdb2e78ce173b12a87c83f0b594ee7225d4d0b975a60ad615f8a21f3a4abf819bad041fd01c740233cbed5e690e6061998af1f0fa406862025feddd62ee72ef314eb3b12d40227d92de05a960cfe96707f9c9fe8d51728fc8258531ad38cb8206d978283436f6b7aea2282cf63b27b639c78abdaa21be576a55388febd14807625391dbb8689896d08ca7d41d28d6cd342426dbcec96d6d44e78739818a757a94f615cfed9134e38c4d34569242c51b8992aa6419c24b4a80c9593ff77d8bc840e6bc7328b69a95354606602f0f8f13d480166c4c69fb5c74fe5874ec7d98a9170f47096fab89d9ada1285aa2ffcc968ba5dab962248471b2de8ac7126988362b845127bee0edadac224e552b0bd83f0a0d9439bf24de27d54243f8106b5e95716d835a7813fe504f195b6f2d28e12dc041f50e31858cc79ed3a143d9c7f4fc8badcfc3a8b756150168ec302ede64999450b0359b368e3acf00bbc9608aea9c5714dda27888d63f60830cfa1ce2b224b854136a204dbed8e034cb5c77f9b86ea2d342bf3a0b37a2fe3978e4a9c7d881655014bb23d8617ff04f6bdf39c01da6a324ac58805396ad35733e42629ef4ceaf840fc83ccdb66e96c6e148256059e3b9eb1e8de429c77f8fff51bc994fe35900059b044c1ef5b336031f3b67d3bd471db0b7c8138b36ece1f56101e9298d7f222fa9f48b9f195f1dd87a869bf8cd0810e424b82cf6841e686f91fa3c443c7e7e547f7b920b774207212de69e7e4ac8d79b45d076b82d8d8d78c9c55aa6f57a7fbfa48e03005bb65fce5548f3fe6ba2af580f5881ff739a098f7c5841e4f1351c5afb3258c39bb39f96e751c043c98b46f218b44aeb90947d291cf6042aecf045cb51fcd687769eb88f07099d3718de8a836f7af203028a5560544f170099475f374f8cd296e4daaf3963d3ac620966584659600233838d0c5c62796df7085b19d42982315cde7335f73178cecd12708124004b937fe29ee2b72fc91b94e2a6a433b2a35449bbe0bae6b866e1a10b4021357e7dabc76c6b9eebf238473e953abcedffb63b4dcf4f73dc21a2beae5036cfec91e22dba6470d2ce404a7b22883b8735567dca179df3d908a725e2e5af4201b6be97f11e9dd58ec44256e2fc223156a07040bb3008aa633a70c76879a4311918a748c98c9f2e485ad45b90b9a59defbfe2741b96904f1619ae66a70180a1c3b550cb2fab06f80d4fd2ec44cfc09ed26da85163f7c51e8357ea149774b77c41a11dca2b70ea2a6f82375f61a4e1815cd019220a8ce7a24b6f94eb3aabab0241c8c585c1d35422268a3c9bb9ef43d3a3490bb231fab37a466723ee47366d71f6131f52dcdb19768a911ae8d9b11e31c946e0a663171d53ec51688603bdea9d2830bc87ebe860c8f7bc1ee1d18980f95ded0b462764d840b70d4dba5e022110993cbf58888ae3bd6dff8f4b2e1acf367df31d03375e45379e33defb73b2a605f402d364d8b9f7e48223c979239ed5b2b9707555a698bffb93200ba565b38453c9452186300ecebb1294db3a092b3ea1ff78ee1bc1f85a51f50d1fca7ca0d634a027ea705ec6cbc10ce51fa13afa4e7e756eed9d19e9c0b8a9daa9f00b11d2248ef3dd74bd01ae7a93ea2ad16fd0f0a8321a67d39b07eb49418f475513075082fd9e0fddb7d225d064d354c2b3f57343220211cfce889e69149b5db154054dde2736df5efc993e743ac1445e676d6401b5039834fe10c49011e3f03bcae6cfc3eb2ecb8f8055d6a17de626ce8caf8d8061f7addb6fc9c229a2b3152bb17e6c40ce3ff89acee7fb5ec800fd18ad698306e2c25146f22aaa62aef8e054ae7730d2dc0477c51b0efe2148ffd7daea402118658bbe0cf265e29a046258d3b3977b0305d30bb496e24e0ed6d997b235c310f36f4cc884abf0fe62b6fd3f164914e6d78c6d4abc9d130a442163b4f2b3234286ab7b361ad062c6d6d4a2908e3033ae5db787717a6a4abbd5975faa48ad91738d0b29f50ae36d0712fcb86ed1820d9bea175e295c0e9213be5226414718842d3539d7eedd89d6459eb50cc34a058b8b453d38890d76893be1de65d6d2cc8d23156e2a414073aebea846bc157a92feee6f6a256fcf4346ea061041774103be4161229c079c5a529e3f375256f9731a60d7c106aea032927baf6b3991c2bfb69433a3f21bdb0271132eb43e027b404cd9a882798995351facc5acea7b2b006b649fd1cdf6628fdca1e4fbbc71006743ac2767501b2116567b911deedf5936175edc26a65a6fcb29dabbc3f8db466a21a08fc34267c557e6371f23b7ab7f698565d9161b0a658cdd82278c7c0f9728f5a63d821260d2b33428f728bfdc32e3f3d3050d2b87e19dfc9603363b2718c039751746396eed60cb7fcf3f7b965503d6ebab7e04faab921a143c37b8fd68260f3f4e6e0ee396876c2df262e5f55d145e410294d1da139ecf80c792e12f121862b6edf6cc5a9de9403a0d141a1d4eb8ca2e8aabb6babc44cad5fd4d647ea147d00e122633575f94b2d0f10a1e34570b0c2232505e7a898bb4bbcf0000000000000000000000000000000000000000000000000000070d111517212531""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-a12619d8176840867fd76c85b14a43f92b39487e19dc0bc5078a6ad5bb20ca92e505b3f93603bb83db02fa9bdf62c7265a7cfaea6cacdcd374e271d3d6ac510ce9158b03163e38327a68a1ecd5250c3d4dd32837d802e124d4fed040f7e14db378d1b8c3609a47c641fb9d9f9895fc968e95dd51c36b55fbbcbb5d0dc8e7067401c983eb0d0e31158e96960541f7bc0a721c2124e88eef835bc88387ce8e50f08da1f192499f6a722f46e2edaf1fa459fa98b753c8bc6c9b494d21d95b76e39e0b296279bfb37a0d7ccbb804d0098461325a53e8c61a098a8a19ef767200de1de9a50867f0860b37f022720d0a050ac9ec738c56f3839a0ecc0a6825adfe08efa4d5aff1314d4345cf74f75d44c2babfd2fe751397ca453a1b835471fb6afa4d33405ec9f3940d03cb1b1baade4088a9958c3fe56dbdef0ef1f7482ad9aab7c05cc5b1d6b537eebcb3453dea0961cfc8c370923dd97b4ed7c37ad628ea456958d98aca0e8a0c94f027e359b3a6d3a0401720899a090cb163b8643b9247f58fffdbab10d76517ac25c3cdb65f8fb9fa8ed5370f4005cdd88ee38c2e6c84ee06857618bb143db9462c256b0242a0be101fd459c180b5f1a1e54a123e0577d38e1616fdcc2480784c25c8e5da8740d132be3f5a498be74eba102bdad5716c9b9af34628c1a9dfe14b44aa52b69e5aa21f482f14d76228d49cf73c4710679e663be5242df2de684f5e1538827f612e7d2e2df673c97b4262990b4af83163041564c8f82abd740f434cdaf68e3ba0b33fa68a63807aee5b998091fb4c6cdfa37b4b9379d4e841054cd0d4df3b353e5c1960cebc031521da09cd4875fcd216ac0a57f3a95db3ccb6415f6da06dcb9cfc1f40d7024bc619a7267a78e0b1b8431e25580915c2dc2b328ad88ca3b551f271b217b0e1f749dd53c6d2de9ac24f93b683f268c2ffdeb1d421dd91ad3b3f9db1af344d27ee4bba7c6add4340277aac9759de7612f64192652e464269e919f73e50372df8d9854471b997fd4d84320fc17eb53da8c7980b36ae1351221d9a8a1f893a897e6043ef1962711cc4babf1b6a08353b03bed793d3d5c1d2da8aa8f6303a5e74fe2570876c9fed2e65db4b73a6285b68aac8d7eae27ea873d07f28d55f98b65bb0e19fd2d4302b5b0258b11d40a5afa0c7661b6394c1d0e533545e45c185a38b98a2f54010c87a58b321b6c5da226b4a326700457410903c2ccd591adda69ed0799543cabd39019314aeaa125ffbe4cd71abb849998e98d781780fb1425d32339f20f5b8562888aaab6beba58ec69c40520ab2f62d1d30b66eef52419196796ca59fd0d990f09f7375a6f32c2a473b2e58ae5ee07d8af938993c1b9b827936d103910719b6d46851d28e9d14189e004637c494f48a0c62cb5cc421ac919222cea674c8bb40fff2021352a7c504160ba7fb11a67b8e7743a11f8be1149e61961e82b284193d965632927a17b0d5dbcbafb732333a7fdbd7b14ad0e74f63999193fbd5613993997fd8cc79fb77b7f1228cef72acb76fcd9187dbb40135d3f6da905dfd5db52c61fad72767aa72c120d8b60e831fcd1e85c2d3a4262fd098e019ff4775f8b2506c33f1ac969da1a5b4dddeaaeae533916c18cc5e986b9f1ec39a374d375a1cfe8b41422ea4b316a50be72f56ab39e6107234ecb087031083b2cdc34076d76b0a25a3dc6523dab07fdc55e88dbd6ab7355f464db2636a6efe2eb2f12502f2ab38acb143058e636536fcbf6bc50fca85b353179f506c8647dbda379e0f1d04df6f785e56486144d5568579250bc18088714653df6350b6618889f28ac4117bd2c82e9f1ee80c29cb9d41541bdf27589b63dc300d49b72e1fd9f9836038396b569b4c02a58ad98e344a5a7a72c907058a193d840388e1f3a23a7ae512ca1e3ae2ad910ef498b19b0678a6b382b0aeffff8aa26851393f602dcf3348a303439b63c4856756b8dfd4fefc601c2f39b68e6274c6bcc58e56859b5d3b22b90ddc5047ddc813baa7fe0302833101a4bd217adfb3de05dccc25bc0f786ba55b8c498fb92203ebf2441b087d28799901452abeb87fbe8e6eca37342e782978f187d471957530379f573fef8d5b059e6a080be35fccd10b1d880609583488c15c49c4ae298a313ee008ff66c7eae1f78a657ab126d5402d4ed70fe9b93f278f2282c20763592bff5e6f51b415717ed651e99a93de7312811a35240b70f8a90449906b62c83a78e6c76449de415c84951001f2bc61c8c99d88c2cfa44858a91d4ce5323a3865e4b85bc281e5139f219d00ae9ef8f850778571fba831394774dfb237ceafeea621d6b32b8480ea566eaa95b4dc31dea36dbcbc8f4a370b7273047dce6ab39ec54ae2225eb64398568358eede9566d2a0a19794b5efa5b4fcf742b6098c800f693a26b3cd8d2834417a471f55c9160bee9ef34792b80f6692a066a951ddc520dd1cfe9354a3229cf030b625e7bc0a2bc60847d7bce334c1629f73b9f4d44ab5f0ba588edbe5a9c477a6c4716e8a8bdc47582b25f9cf94b349ce8aec25c8bf23efd8b393f66ff457a92cab8f04dd039c54ab0d42899410393507733e29d2094dbf57341108082ad11a127edf57d5f9b47e5a31e30c7e8708a00d9dd5d33eac2c3418435ef1f2e9d7b675eced020c4b38abafee74e66c3f6fd18126087a0154a429b40603d4f95a7db725d167690feaec9b9654bcdfd181741af7f0c00b8f8c558f6fffd0fed1b3d3c501ea911f0709bed24e57a68bda19441a3c420bea91f0b43733e4fbf23072727131315314933924a50cdff938c1e4754a05447a09b5b01140b4b095986fa0c5f065d36d83d47974c86c29f09f3bb4306f8927d4c7843d16dc9ad1ea594d742cabef956829042d550137aa38cd98be854b3dc02442c8358a4994ebcf253078dae428d084de52936079da403eca30b93d4ca5f3b0f40ad15052fe501d27c63a6af4f1ec3ce9dd63be7b3c1fcdd539f6d27cb58f9e6487cb95d268caa6f3e98c761bb651627c193e2e9a9b99fa56b4b608990983c8f4d4d14dcbdcc43b56fc8d35c62656188fdacf1970aa4dcd8e4de72ce813150e1ee2c9ee3ce5eca09fdd8e9d518ce0a4c32bccef10e566b305c0a93bb58680908988b84fb90087387fc41b013367d170dd64e11f7f245351f24d054d18ced50faf5fa58c30732874b76163b5e38a0665790c1b49ca13ee419abe708093d80e628d9ecce057ebee211b5dcae6e938575fde133a2ee7a011891c53cd6ad59716a2719c675d36ad09ff8fe60f7821584a21345ffd3072685717efd29f3b977c028606df2a8407c1a60449a60c0bb837dad423d1367429bf85f19eb539997f0d0db1fca77e32014fe50e17b449b0db6a5b5b7efbbe4593e24cffbee6eee071fec63163bd5968431b32a6fa996fbcf270a91e91710bb537ede6c8c84cb7145f78a636c205670dc8cf8db465431b377fa6b1df41c4a44cc89777a1144fa77db35b6ebcd8a98722b3e0d6111037c34fdaa632fe3ebef1c5bbc3c70852ef5cdc9edbf9c280407d213606af1180483e3d6a33781e9a78d8734d72a3675d7575ff567f6944447df15d75e306df470cdc12d6a3dcce7fa21ac11baa4c7f7d081cb0f10f60f02247452bb0e2bd1c676bf47a1ccf2787"""),
-                    TestUtils.hexDecode("""
-36DC7A310D995379B796EB8F9CA346EDF60DEC7F6C00AA311B3E09EF96A6795C4B077C1D371DD8D4A538AEB78B81927D08008E817A6FC6B3F9B14FE56EF9B2664E76112F214EEE848E67EF33B4A4E26A2378E9480CC7D25C369E6C25A2673B946B635B6EECB5F5F1499B484DCCFD5165D6F14CAA8E1EC9A9E4FDE417403720D7B4BB30060AB95C6F227767D671B75A1BB5AC5CC33EF0509C69652748251869B072B9042618071233B48A9BDEBA330F0C450A2FAAE79291B9E2480D1CED11FABE56210A80C39F25E5574356CFAA32E57782145920D6C0D27C3AC7C63DED6A770A5A45119FAA92209F2A066AB90FCB81A886FB87641C550368C1B412E43F4FECC2FD659B2BDA6B7309797575DA2893314DAB058DD92C7470F570EC0B1D9C9A149FE0934D40182CAD14D5B3D98C4B7454CDD2AE7E54EFCD554AA5B458888048BD5201C04E7D6004FC2A597DA781BF15AAC9748B6659EC16602F10AD44145607917C3599A1F53DC95839086A6A4FFD66F8EAC8AF8F11C4F2EBA3B58C46B93D0494C4CDA4E8B8FF7278049D2B4BD7BA16BC57678219EBCB5E211D51A168B5CDF66453412565B9BD606CE29A5A70E60F3D451D4214B0A258D6E9325EA5196C55125F0E115B14FF34FF6B172471C2B4917FC36B0DBDC82D0475AF56249AB9297790535C0F0265D2A853DB0B41B418072D0ECC17CF91FCA86F6E10762EBC520F0AADCC3C79EFC25E9692FC0A66389B15ECDD1377A9C3D744CCCC4BD160FC65A45D4144DDCA04E5408576DBA6D5C875BB4071729361B0514E8B96405E2F48D47138D2D2DCF4DC865F717428FA1262DB0D2B7B1A356E9E76301D38BA506456B4AD70ED09B0D5A1375AA6E132D7E06F8745E7A5B5E4F6455F4282A87D2B372C40A34C09699AA8C2B2E060107BCDE0F9D99B64F17DA5FA01B6DA87B1738882976B21AE12D1BA0AEB37644AAFE5AC20E7F3F631FFC2A24EEFB61DC37485DF27FD9045BD9BB5D3F00B9B2694CB94B01E7A4F0D909B8612DD28BD64E6C1C5A612CB30DF6004276FF58491B8129FCB0B539CDF891A97AB58DDF04AE40BAA5781C3AEC65FD7E84DFD0369A53CF36303270DC80E3E428854D82B08C7AD022BD99AC0851B16C7D8D462DA21126F70D661A59E4D0FE4441806DEC48E37AC4A271F15D916135408A2751CAD53564967196763B512D52240B2B0D3D924B83CF482B5316B7988D73A16B773705097F5ECE0027CCB2C2EFF598B8F61ED4D6BC015E56D4549432A6A95328FE3122EAED0149E2144E4CD2262C7FE7495E41E0AC9FAC9A11E21AC940D25E74AED8EF6FECD21747FF8166589B7038EF1DD504F51E01F1ED911FCCF44949638AA6E8526F0B9DBC5E536FE2AE7D4DA9DEE66402A45CF55D0137FAFDA9207AA7E22FE396455F2F43108961FA6B0339D89EB8ED7EF13B936E3D2DA18E5EAE45B05DCAF5D845DC62CC55553E37CB328AA2C649ABEED0D862E8083962B81B84A85EC12D3CE5B600123AA7CE4764139BA7AFE5CD02F70D06DD9AB0BBE868070A9AACB951D362E2606FD940A8F5BE632393E0A179C2A62151A094901F5625D952D39D7CAA87B77C4919A8633458AD9B6DAA16D1B1CAEAA8075741094FBC0C08D30D9956812C1D3A75926C546ABD78A2B9D44C1B6EF8D6EC2A2EA8B7C23D0EA57E1320ACFB576FB9C575DA98B714D6B01F03364E618A2C03BA84BDF0E5D2A0403B1379416D87B5E022BD958B0C9170E82F8E9A727D39C8F7549E34A14792776AF0D72A27FCF63EA985B3882A717091EF35F5835D4DA127554B6637AC313BA3BAE8170B9E70A6DDA2DBE813A49F045D8C3A65ECFB4D5F71FC75AADEDAA91A81A958273ECF0CDC4512F0D0ACCF9D9D001A30D0B6B2D50BD216D6086AC5C9DE7388A7B1319F2E9E6CE128B1F72F765804E060A8A92C93295A99C66D6D79BD7DD4F7F02317927D60B2E9FD59EC3F95A874337228339EC673BBBF53BF0FE1886A4B14F19CD7FA9B771894377F904EE8BE48D64EE5D40882C684C81DA3198604FA599DA8D4EDEE8EC3294620B6555B3BC9627D4514DBD1F7E3E9DF7B56BDB4CD395A8CCADC184B2B8DEB2AC7CBEC6C96001EDB67E6CF6F872469B110097C69EDE1121D22FB5B5AA4CA540474630651A4F9E8F7B0ABA5DF568D882626BD158F925F8DCE1D81668EF7CF770DC615ED0F5A807E25991EC97BBF2F9E997A532A1BD82A2A616250D2232F72067A17550EE516F28940D8EDA9CCC0E02EEFA496010E499E62C50B03F1D3C1571342DB8A5BDE1F432F7B6163BA3AEF35656434937A42C4E1F473331E38467DEAA483189902364463832ED8C5E04E0195D3435A6FCE75EA3BDBDDB0A0319262083141B1BBC0C278CFD40319647E90BFB51374B0AA5EBF3C564EE95B7AF618669C935756AFF3150A93EDA92F0ADC29253758A6C8A83EF55F97F1A4C0DB566668F30DE59D93D8185BDC1CFFAFAE472E0B0FC4B1E16F0B748220EB2EB85EF127838D576638E738E9F93A05D41CC1264AC6BA03B202D9E3B06946CCC68DC15261A029B0C5E91DD81EC1D79BC51F74BB5EF778F00AC091513443308410F60AC1850F2548C8101DB3B6B4D453541E36F0ED57C2C14F465196F8F1D0D3ACD49CE3252BAA0C10521311B8B8366C579A430526ED58BDE92FED3F0B359ADB31D67BFD212BEDA7236DEE4615ABF13C856CCC93DD02AA28D1CE1F12C2DD69FEA828BDB9F4CBC9242E1017D1063A7BF842B00C75243303EF9060C8EA501BC73B3EE470919443EC91D1F0D6D0F23A899AB86F2E8A0898D318BA520DD15D9B24F4F10A1B9FC52457714A151E075BBE419E4216857500B8354A8445B5FBB526A6E008229F33D8DBA14DD42F424DE3675E704DB308048B2D17904DE46B76622BA08C62F17EBA3E9F414A1B10921858832EEFBC282755B319E176ECCDC32A25CC5E76479AC112570AA86518BB1E6CA3F46E010E8132C0A1E8273403C5C4D7046A05398D461CB6843D70EEF8C94DEA5DF53CA1A4C7842AF5DBBC6451554FC7F9913E56957C51E0A602D882BC389C5E5C7899539DBE6832B0AAB5EF26B2C96CB03D1795179A62F748CA501CFA34D5ABBAE3271AC1F005112645F10863AABB062FD2C781E4573173935B5392CF9E88A1A31989E1B8E94F77CEFBEC591DF6529C6D2FAB72E678C534C4EFF40177C41D02AF0EFEB6371835CB55AE0AA99C0653876CCB56ECA127A0A1DFC0F9EEB49525C9A5786F618DBF57C41C5CAA971A9505BECEA8969D9DB28B0E707C659EDC42280035254E91C522300368F49F2C36211E455FD620DC956AFEE41A2493BDB2B0B8AB78E0B838DA6584FF753BF88CA6A523042A285F84ED90E0FD5E28F75A21B53F618145C16925486DBF6B1E7D76585D0D117EC562E22239E14A49ED714814F01DE2B250E9B3B6A1C99D1A71CEDEEB3ADADF611C4A4F97E1B26AF9780AFED5783129FD58B1232C7E2DB9050AD3D494EAC254DC46B0461A1B4B63840621D45ADE97EE5663C9BD8FB7261152545AE35536611B5C65DD6D66878DB71640EA429F801D6FFE291B06062EBAB9B416DDA7D261A46E58B154684E86176169CFDC4A60EA38300C3D44F9A4C9DCA0CE1BF37DF8F786F28B5B3CC7B0199D3322CFDFD2CF88C5B794C69F59543FB985890471DBC93A313992ABD33691CCF69B96A9396E5F55B54FF7BCA82A31199E5E81CE94B6B523EC5C3E2F2884D8BD744CF0C072E29E4B542DBB370FA5966F68CB20ABF40619E76C099BC7A9A373707707624E8999D4CF0A75D4AEAE113D7823D7D2ABF54FB4E68B8A6A57A198B128DC69584D2DBA473B6725FBB8EC9561D6614D606ADC4FD9CF449008C0D54BE4F62EC1441FF79EB59442AEFBDF1F0976844B4FA3969EEFEA10794FDBE35E89EA52F50AB26319BD1604D3FF5AC660431F1073575ABFAEEA00E1246DCD1D9399939D655C222E19E9DBA5FF42709FC11E7E365D7F7CE2274FBF1738DC5CF5631547549F2BD4DE896C8FE039720F5E0149BD81533022DAEE22B93A3AAB9AA9DA15180EA071D98E9FD176804A5B04D089E9C2D386271A8B13E7D668AA74BFFFFCDA3B4E528937C41D43A87DBB46C2B49B63BEEAAB978415536A87D845F6C2484F21D71D0F904438C46E7B0A3C6DE5ABC01C6F7CBCFF21D3E74AEE96C20C32884DE4EBA0F282C0FAD06BD9CD6B7B5031F149E4788F102D2AC2C99FD09B14A4AE3BD6859CAFE6F5A494EE8CEA29F49D871B79BB66AA6E6EC3718B97E83765E96D5603B209027BBBBCB09EE6FDE3AEB65AB1D73684820AB1FDEF88086B93B6338BEC7088E04F5F6E520E3D715C6C5E5B79E73B9E7AE1C5EDEEE4015860CDB9FA21FB434C3F28AD865042284A7FE9A5FF47E8C6158DD83EDF28BFB18DD5AFA07A48BD5AF25B9644400CC976A9B0FE9D9071E708113802A78CFDAED28378AA4FD6FBD9390D8A17D6500A0E1835652C7E0B332A382576AC4381CAD51A31E64E5E24FEDBC62EF9D0CABA0C8EBD8B94625207D0C8C1C6DF4EA2B20832EE44D1E2DEB799BC97B7245EC404F10764296E5BC4A919EC24B4F5F7D18692FA8DCDD5BBC170A81BE7590B7BF4058DC7BEA0C545BC85F0B3F0936386C37115A333285451CCAFB8397F1AE1B56D0A8F884BC968E729D622D21FA26B89BA2726C91E6886838DC9912797FF2BDF6800665C1D1DADFA4A240BB9BBE21B6DD750389AFA49C5C366ACA5E9C3B31B358FDEC42B0032D9E2C22112E43BED2023B364DAB334BBBE2C3B669EF700702B5D1837A6EC15CEC2B2036D56B8760129F593A669FF00237D26BAD9F9C2F4ED4018D998E555D2C3CA1D53EAD6A1E27906353983D4408904E5FD9D79AFEFEC26ACEA1F39218C36637977F6E2F3F6211AA06AB9D5F991C76F420B152BC95C4BC10047E107CC82E3B00B2325ABBFDB0FFB2966D5FBA0EC7E8DE1DBCC053C4186AF23A6BDF3F14A7186665AC2682FB94B0E10516D500B7F67BE4BD2523E194A1ADD8B5564FAD9105C86B6D16B08AABA604419D55F571F11F4989197144DD12867D1636D12800D54D36FA88C620008095560103366711B8E3AADD5624FBC7FF51318D17311F02A807770466AD559CFDA0AE1439442E4413944855D4D0074D529CA8DD621DA02FA98F46327A7BA600387EAE5E724D64A82E94ABB760C891EE39F27F0CAE8D1AACFE20629DEC5DD9BF4CA91E65BF413FD2A9566B7DCA9E500C2C328F533AF2A957E46D9FB11F0DFE99127656B1D4BE20C946BAFF58E5FE1A9ED282ABEBF6EB35A35AF324DF0A858CA8AF507CE43D228ED81D863F7096044A084DAA37ACB6AEE98E5A94D363963D4F852B955C2F076848092E6199E07990372E56BA1D590BB83D0C7F834C852CBC39B666B801CD32A0C36B034264F3BA6911A719001FD0F4B63D2D628FD0CAD34B4C9355534A8A38512E758B110F48E5A09B504D20D178508E09B1423A1E61164E7D138B4A9455B95EC8EA786F5FFE67806781F1E619505FD7DDE9A904E9003CA7E5EA1077C94C228D36667031502D78B3B52C3B5A09FC398D8B5497B6E3F0C5381BC99DD7B11DADA2DCFAE352DDEA2C749F8CF5AF39587083C2C19576EFFE871AB94D1C7CA2183FABDB74B27A80FC4F20CB86B46B0B7F86384540EFF1C888168F74634F2C0BF7FB54F7002EBF90B6C4B2B25DFF068DFC7D087A27749D6C36AB0A33423044AE027DCA8C42678987005FB9DE5C2774924AD2A5A8FD2E89C288975F89B5C0EF70A20EDAD1925060A12606A9B03626039635BFF332A0E6BDDC4F5DDDA209AF8DAA0FEF045FBEA9523D04458FBB0BD81F65396938436AFF5FA66E997AE58D64E7B5C1B589558B3DFF6D035E31008D2C76CA426B07F1644F609945909DBD16559B36461CE882A361D0415A9D93CB98A5370C56913A299B2DD1AA372CB75C7E590A9629CAA6C439CC5C7D94A21F36F998C6FDEC1C1721ECC500ECE1214EFFDE65E479D38C635EA223286DB326EF9B19B3CB862C96C162D3DE238C2948E7613A0FA4843E39EAC51EF293AD7EEAFF0F522934C982890F83E922B2BD52815136D0A758B33641C54E7D4E0F3B19AA85859B750E7A7FB80892C3DAC5048767132E2DAC5804709B8560A4B3828B1CD25DAF263A2466AF7FE328ABC84EBBA26902FFD92B0D765AACC0C0DCBEF962E1B35B1195676E8A67ED593B23B2B0305B611F9E16633E77E3F31794C58C5309BA07DB5CF9AA1CC108186318A3F16A7141854C2FC8B469BC0F54BCB22976A3CA05FC2C8E23F1B6A891E7527F204ECCA0A5400B68565906E795FE4DAF52ADA95A9883676F9110B14CEEA389CE9BFFBB5D040E60D3D03C4E6D6CBE9ED53EA44B1AB6ED7EDBACD0AE0613DBA5A5C673A534D48B539DC85F48175F13404016C5289348504141338FE958AC28331853AE80ADFEB49A6637936BF82FB26B95295B2E46F4F9534720A4E86FF18B31335877C9CBA96A9B450C1C8C9C9862E51CFEDBE3DE5C8B901D792A179AF9A782C330035A14CE6A710D398BD28416CD72373FE216744F6237B38B97351A77D5D0DEA1A26A0A9A24FE15503240933E1CB5AF458E6FCA8624669A0DF439CD7FC13F7A1F10A0CC7DB8C6AFAD9C99B5FC45A7C565B5DCB74FF0EF426FE7C260D3ACB1E9E83DD8E6E11A642145BFBB7566D582D0540D7931AA28B7F8F682E6E2D90B6E6812FF8B7F15FCD3DEE686DF06E8E6C456C99C6B4215C4E874BCEEE3B4F94BA825C6A45C2A2B4C6DC04F8FF5939C74E7DA37E02D8230340C6E2AB7CB82BD226DDC1A7C7BD0C0FB36F71F9C772233132B8871A0D76728C2A141741C2662438C5CC7B129A6C8FC587A0E475545D176818B51190F0F19E91E05C04477283A0A7D4D646EEDA3BE64459780BAC1862D83E6B99C5731DF91F0CAB454E70A0D94D934D0CD83C8B8301DE282F9A1FFE49E73EDCB520C016FDB4AD02C261DC1A1E73E38809E60F91A4E38C69EC70D2A621DF0D21588F24CCD59D331C69E16F0F6BCAA8F24031DD5718875BD9EDA5B420C116E4316137D4B77623C9D73D182900BD7A0F90A193CD16107E692D469AF09F74702492E22C796B6B4A960D47FDC571B4A264EE3528A0F5A9D66DDAA33FF20C3101D50299EDA3225834C9429976EC8E590C6D48A721A14972BE70955EC1A0348D2F84347C1E8E21EB0C1FE67223B42A6BCCAC43648F3BB5464121180F8E3E682B4B664D91584AF55FD1C7D2E6F79A93C680238D29CB7FF36D259CB703DE03B2EEF6DE0CB77AAA8F49C61EE482A8DAD30824E603411D5F09482DC84BE794BB6EB65A7BC1DA92C8BC8364AA88D4B8212561745BCF3CBA0D6AC8B8AF80373DE3F44EE39CA3CE4C5763F422CD4E8827B1E7BDFF79DB990A52530E4A1E21F6CCDF50A322A086AFDF24EB5FE4D99F1D1BB4D6DA965D168E9726FF7A4C82F327A748DDB1DA5A3D0E9C8E0B060872B009CC9F913D35D94FAA912B0D6FBF233DEA3AE3C2A4E35BBCACE21CA3E5F7A7B9A486AE9D7A7D2E0B79FDB11D87072F1B307402BDB22746B86A1A0E6B41433D5BAEB2048ECA53A1ECF895E9EB9BC5D6AB5D5DF72353566BB90578F12C6A16A163E95CD35DA27C79379756141DD05C315B466871E2B726B8821FB6FB439B49430CB3CA47CD211D03DF40AE4A0BE87B6000BC9C75AD23552E2129F47AB64BC9E5E1620C99405CEDF7BC059547D547E2868A6D470D813AA5095D0AA4BB18D91964988391EE6F05DD47CA1DA0423CA238C5E50D43CFB0527973506B9F1DA4A8055C47D1FA1E0DC783CE3CF75FFAADF574EC2849631E2551368291AFB5F2C40A4F1A184E37A19E511F482B7920F6D51B13065E6327F3C21DAA7F73986F2D1FBF375DFE2505C0FBD35F403D253BDFD0BA1B00CCC5A20B683D4F1E1F2374FD914C7D674901A0F01BDFDC007E8021013BB9A2F885F0699D16805F9F2511A0C7D3CDC06E36679983A2A0F12662C88BB7DC643FBFFB58CB51AAB3CED28553910D063ED8FA37FD756B79AE4151521450E552E4F2B62EB6F6BCC8086BBBD30331F3F2534AB3ADEEACCF2A6E66F205935A167FA1D5C747936050E276E8E4CCAFD9E0A056E4AC2AC08738BC3A598F07E933B0ED285BACE3D24AE6FF7574351758F983FD7EEB3944473EDB4EC9A9828A5FC656BBF04DC623C75F8B8038F3699BD5F255CCD3EEDE4FEFA12AFE8F64436DDB1FF2DF100B09BEC657DC5D2B18E5722D5AB30D075D9A52A576B6F9FC8C8BA3ACA6A92E6596F688FF5D2A7E3183B696AB277B0B17F004843E58760683F90BE0C61DD0D1BF9099A865CAFD1BD1D8AB1B7D4AF2F86D51C18D7868BEFF3F6C53EC68FC46EC9F23D1AE1FE85CD97D8CECFD57A562E7E574ED1D0A7005813EB980C2A46A98CEC602C0E022E87D4A6EDBFD7DE9FDA8C02EF85701BB1CEF6013F4869D32CBA56B0AD6EB007591D03C76A839F9D01985C546C39E49D59395B10346820324F3E298C5CD977FC2FF83BD422CA550DDF2A69607BB8125647B389246ADF0095F22692BF907EC86BF8D70D7E8F2C50E35DC6EF34FD1258E1FEBA0B254470D43C77CB0073AEB2D4CE5F6772D49A101052D8CE943E1C7760F2994071644D27D26BACA88EA07F29B2F2050BAC5E05F2226F1F584D17DB80E4056B7F9C60A5D9DA0CC577C6BC802FAB26E570BF017DCC7236A1173E273397E373640ED02B4F9863C40D2A2A7828C3875D8081AEBEF349143BAAECF9089EE736EFF0EF80078D2CA7942FB24A92071D229A1FDD0F6A87D362E5165D57F62D927757BC31964B5DA63B90EB3591552F2B9902E2269A163FF221863ADEADC9BC92CAC0087ABDA02004C0B9F34E5CA8599DC3C4261489F7527FD27AD2B6501E602FDE47DEEBF3F3EFC0166B1EED95116CF43C8AFC0EF89BDAA9ACFB6DAC613770DEA78960C99C9628C0D21FAF63A0FF7A3F2733EDC0FC07B83F107A811BB3C1DFC6CFBFEC105193272A4BF915B1DAEB232E16216E40FD3F9D9399B15CC4C073BAE8D08A4EC42D91609574EB009A9B52F06D3F428F6EA9B0511D8319A1B1299C154C94B103CB586370A58F18F04F5D21AD3B638660D6C04E99D356A7289E37EFAD643A5EBB488D54F4A0194FBC4283A8C4ABB8D9A1D70150AA50F991204C038AF54B5B74F722CD6515045D62276A9E936476F42B282C3B08D9328089AEA259510240B95BD5E81FB9D7E006DCE0DA832BD9A833799E05CAAFA6305D16DBA4461BE13D3CAA95773B98F09230F2DBE13936495C2DF5BE3A8F3EEB4FD211810F4B07D3E2BE1A11CC87079DF1B32D44B6FE7942DF2627AC19FD9F584E771D7ED98AA4C074A9DA5B7C156F83D90EBBDAE78D636D51EB0CB30C7C7CBC1A96273C0AE0ACAD8E15D1196BCB2EEBDA332896BABAEF76B4275F863732D646C24627AB014AB602A47594D6031795B17144E6E2C23F0341422886C1E2512222ECD530017DA02FC015EBD5BDFB319F3AE942D75A55C21BF347A44B300ACCED7A339007A2527EF4499E3BA5DE334BE58D59918DD0CB55B2F478837F71E9CEFCBBC90808E0BEF8CC7712A3B008B69476C61535FF0787B7833B70C69B1EF506EC4F445B72AA12FAC2589815874E9123BA13A17477D61E41163CB21ADB8151658C99F1422C71A8183B8D0B1D489EF436564C47ED8482A0DE9170CD1BC34D88CE76E1B47B84E770020125F718B4AFB1E4587668634FC7464114762A9D74A93E33A5C0CDFA824CACBEB097B5CAC3B554BC0D41C402812D8E43DB37C730A6219AB6F0BACD096BBF261C78E991DE0A2278DCA7D1BE0E5F2FED72CA38BAA86924A84275BFED3B91FC8DCC5024316EA0587C96E030544F631076DEF65F05F98C7641A958313686B8580CFC20221ED50DE4D2CF32461FAACD0174AC46A6949EF8ADEE6FFA3F537228AEDCFFDB2250D7BDBC848AFDFEA67AE53CE9ACA45F349557E81F70F9DB92926FD0CED8C104E6B7AD180C7B3BEB86171EE84A8DD2C243F6869E04C2DAFDF0C938C0768415C56330C9BB6EE756BB335BAAF96EEAA5CB52E554E39E2435B0731B0062376F4730108DD2F05824A798DA24C239724D19F12C6F2FBDB52652352021E0167F31E0F5941C4687DCD13A81A20A0AF05A55D2533280941865DB4D5715AEC293A64AA2E5151C8F44A14B72C0879499027E67E4E2B487612216F6122361E8D34E92C2163B0C88583E3887DA93A3AA0E77FFAE3FE8FD5455BC86AE6D6D5AC7CB7BDF156A960C98B0BE50E1370A43E7D183636DEB2C64B264FC5922D4BD46A8206F911E7A742E72E4EBDBA39B6151AEDF5A6CB4157B375D9A59899808F1838C61EB4388B923423D3879E8228AFE0CEE9561135849A89363F84B41BCB166EBCD0E65A2A74FE710F2B3B55CA9DE2FA9DC163BFFF4BE91F10493936FCA15F5F39422C75233DB22299456D1EA3BAC26F6671557B2A5FB0E9460997DCA797C67C49DF109CFD597BE34C8E0FA0353F28B815D0CEB31DA93E49EF29CEAF20FEB0A8F5924DCC62E830353463245899900304A8C8DB5830BC0E97AB83853D8EB05660D6A9303833D170E138FF6F1C30D9DD64574D5F875F974225DA81ADE3D97924A38F552276F46A5208403AEF82D1E92959675EA6B353E5C6091034A295D9C12C288241055A2334C30DF0A37D2590626A7D1787A4F591A6E494BF55ABC76842BBBD508FE54C5630D11C54386A487A756ECBFC0AE8957E7CA8678D5B9B044117365AEBE79AFF2E6678001D23624"""),
-                    TestUtils.hexDecode("""
-e8b08c99776fe554292851f9d80f785b8109d6edcf9d30b4b3c8c11fe8b2e024e333272f4d72e697aa20953d03f013c0c3800e840aba56daf36846b0e958f7e1a465deee3fae6e45931424ac278b6d1916dc71760b7518643185cdc7b06b1dc0a54c83597e6a2aee0894c2066b5fb1e2439b2782ceec63aee1742d10f4c36793b845d5b86db9d22a200e12611bbd102cabaa00ed5cd47e6cdbfc06d7bee55e65e4ebcae019ab28f0f05ff2efcc3c44a5c89a5e80fc8758d774ddb3554975346aad922319273ea930b3718562c3a96602645c58e375e8b78f38cf636b42e674ab4c5e1a8da59c64100984605035e1f735d6ebd2948b556b056a07ab86f8d07f8cbc72cb7251543ceb39a9deea50b8189face6b5ff23bf62ea3686fc0f97598f36ca445942cf3c2acc5258f9a870eba919b99c75bf598031edb693552c086377ab84aed818e795b70a62c14f84d5d01fe9257cc9df2f4cb2f40173be7d11592e9289eec23ad30a8e5dfba2f6a779464e79cb5b07e6e5a19dbb9a829eca1ff64c0a672844ed2e636903bac6edfce1315cab8751e9f12635160df14cbf5ddd341824e8033507de1f6cb7dd87c5496342a27a8746e94da455ddbca610c7990ed01ae5dedc90cee503d525ec5033258465e282cacb2c0e0ea7457e62d06c194a958322e64a5433e4936292fa700dad6fb7ea4d5689d4e3efff132d61493859aa5436c9087fa9ac5b67419a836460fc9bbb4d53d0c9b6fefab2d513b76f0600d097b0c3eb7d7a82e01ba3abed5354fcbce02cc7e85fbeedefde5652187fceaef8e6c05b4f37c33a752fea5af6160a7da084e41dc7134534fda67c4e1c6b8dabf7bf05d25a0ab7e05c41c4e0070e8add04f20d8c72bf941ca284eae27cd9568e9938adf4f55ab2c40d03bb49c58c6fd8d74245cc3b4922891b865dad534e256ebbcecdf5227b39ac335005bdefe1be10c2b7c969f4dea6f581c278f8479cd7a40a6d369bc5e1fe5e074230d01795dc664e488e4e360b169976b99a0b9d257badf3f397ac914b15b8ce4b3c38e6c758a169ca015fb6fd339c4255c51013e7430c991a006591fd69a069cc2f966c24ad78b8c0a4f4601ea08ccb683e8d427d1a0db844308e86afb0e3f6965af9ccca755b5e2a8358fd2417b46bce7a69b2edd6e9b3fb617dc5bbbf2803a557e33c907b4ee7fa7a9cfd9f148730d48e471097526e4330515f3dfd5e4f0e6c6dd2c2db73c2c0913c82559032c15b3e580e3b11f5c319db8b04ee4a3dcc87a4251e8ca8f77a8e61d67a5586f2494c3be2d70d95076e6470cd3c3ed1b780ad9217153fda872911bb01edf13c13143e4082cfc9fba96f14e7844f3ab040567faef1f03caf66eb10d92eada39afc6d70d16325008f628489ebd9e80913227e270a8c272709658aa843a486039a21951467dc1e5df0feabc68c28ae9e9cdf95f7db12cff0167657328985f19595b5aa33f44701a8f40242a0f33ff9829078abc53be36c002405557c61b9c5585f7d61d0fae020b2ad18358a278aee3250b12bc7f0887d8cf42137f26ca12a866c35876bdc737a22b8a722e71ef500ce958723728aea23748924eab3552a7cd4142dc7e138c84df1251a2ed8f94c939bc7aa0ea4c0ebb4cbe817aeb65ee5f0f9cd407899459e719f0558f8f40d73b1226a004b910e26648852bcb3b08aa5340f6ac6426aac89acc4945b180dc4f401d97a6fc68e3fa4b8ed65ac74727e3ee5da732b02caec13b88cb167b15e4c7da21dbd937549685e8068c3eccad584698291b9c3410aa8314762fc838f9336b6b09c191409d1aa2dd5e2a075b070413c805f116d42f90af6c7ebf8c322bbaa14a5692ac0749ec7df91e5eddc7ded2dd873907e07b01f14fea1e0efe6d7a1a5ecb95f822be8f3a2f65224c3d801284de6f29a25725c3784d7bccd1253706e107fb9dedbec4620c87c615f4458c4c7078a1e69a0f5178b318fcec51e73995df8dda6ece7b7267d28daa1fbe7f36680fc001974577e4a128282b67819227e5d100baa5101c5a1422f096083b3b522a6b71f8943b536d7798e86e18129d1484cee60ac63cd849f5c9e8a58fa42c0298e3d595c3c4f145aef17f79fba8d7424e5ad7d6831321e51ac88eb1c54c6c1e2f3263c899550b65cfc52da78b7ebfabd474851b3a2b5457f4e646c15ff50efee6a8ad5c99e91853656255fd429e8982c56d65d005cf3ee1a725e224c768e8c92003a72f3060cb088f7a8cffac0d526c028f3dbbe84600d5a9568f03b2304ef37d5ed28941169f8e204a1240e6d910dcdb901932982a6d45a7a10b1630587d31551b6e4424fd929b5a7fee3c4a20929102f5791062acb3c53a6edc93ab5ccc703b8cdaa39857ab06b7f818a59d8324dd1ab342aa1c3b0a32dffa0512b92c1ab9a4f66e57e9bd27734ce2b2788058637cbf94b03b7a1b640f03735f36bb36052bb461c22fff6c0580b6eb4bc572fabc9a141c1964d664168116d9836f7c7581cc9537bba32d1e3e5519e29858f889e282c805084fe3a64db0234bb3e1dbf57956ce4165795648f4865c1232e24a6769e24c0b271aef1146425a9032884393d275fb68e3b3c91599ee82a4cc34338715a8590f436e4185246df9bc4c066ed975f502b967a5761c1b8f5aeee302f96aae3dfdb6f4519aba3e04cfe5c9b2d342048a4c2721484e9b311c9a18ee5f726a512c93a8d37cdaf6ee96928fba315a4680dccdfced6a13f46e06aa162a7ae445bae5b1134f1656a2d700dcb2b5138c780b428d346feb98be8ed911de7aa5ebd72e2a6a8592a81ad4fd6a6da64edd2f5490cead76fc652998181018457f1cc0ec4f4588cb8f418f1b6d801635847914c3f317369027b4c4608e65457f949e08110b23dbb6941632afc1d1292c55c169965f0153ec72d93498f5a68140ce2c8282a59b1011ac705fd5f0a8ed1ecdadd58d4a1fbd4b09e94802a0c67f2f5faf905bc4a35471f886a8f2366c25b710eb43aee8fea692d12b4f94513337b0ea9fce3c255188ab7b432ae37383470eb94abc2554c6f165bb356415a1f8d8790e1bf76f4411c8f32fc550e38a0ea7b8d37537855724c08eff4730484e55accb2f975637b74f29937c19fdedb5aab7d5a3bc9ee1df2c83ae8d0e59782fe18b3a17c82cf649a4299b74f022012e189f19d88b06387314b65add0720aefd0018a09bb3d13cd63f98fb73b8a57564137e89811d59f1c74a047e264ce816b01e942038574a9d1f4fa5408ad1661c31bef7e97742aec79b74df757065e8e1b059b5134e53cc8560bd87e9a68003b124b15afb6534cc6181b6b71eda535ae7a3c107abfd2d8e5886cf8a7d67a4b723ba794c0c5a9d1a63f67a6c42de3e3632b8a9e7bc7eb9a5e404930265a7d04c1e16ac17a7b5e1535e1bc80ddd1800a7ba1b0d73ba053688137e1db64eebfa9b5dd8573a51db93aeb0c6c644c97ba9dc87efb2a5d79b3e3ff396a45ac1f0aab064dd05c1e6ae48b2686d662b8bff1e87db3745c7b3126a091e688091d84d3caa1adb471df496e79e42b276088a600a6f8d2aaf3d31b22f7e7efd2b894fdef314f2258d32371fa022e272760c704997b2a605b0e1a8d0602ad3a134357b0f2785d79c557cb04121fb054354608655afa7a763c8276170c13f9e76dfa711e26ceaa999fc14c686e2ebd61d18e74ed08fa1b872e09246856d9e0477e5e21a72c7869b57785248aef0d516f670978ba4dbac563b77f365cd46cecbce0b7fc7c9fe7373d6ad47d094b3669849dc21084124999ed55f13106d4be1e52433d86ffafbad0e4f221c305aca71063037b7a26ca73ca37129aec69e665cd2e70a94dc5aa8d22e1a425853645a3eb05f8998c6d766806087f14f08fc95ae3b2b9190721bf536ac20cf49222f5a0dd03307995adadefa43a205fe9dc839b5f27447611a93012d3abccf3f5d7a766756111dbdadf6c5920782545c853ae1a550a08b14a87bf296ef0aba7669fabc13a8d0d85d67e36abb24a77bf87bdebbcec1e28c1f82fcb95e82ee936f0c1a60a38ca3ab846eb39cf27acd9a219abc2c6244878ee25efc38a6552773b7444e466c24a15458df3cac856201a12c3bba6483d886482d58112effb0cd72c7aba4df0c11474a41e1fac0419495166d5b88b7e5e169c96c9ea6ac96dc5c2f749c858ad524e7f3d32177aacbc836abbea91ff9dac9d313a8004a186ab52083662a03d42518199bb2b81f9b03501ed8d1e8a8069e6a4fcad2657d4e69c0cd8e4ee56389d026717c72c99f13b2d21780c122bdff75c0469f32a1c519afc5900855539b1c75a3019342b7d5fd8ad7fb02af96fc94ec29583a48b964c65586a6f17af9f268a6cb9bbff237ddf393dc40d03b69ce5925a5fa8af87a6d0f497ae82d6468726714f7b53bfcbb647253c9db17a7bd5e760531ed90d7cf044ec0bdcf9724b640a201f5a08e223ff20e818e16e88fd92300b07e89ca333bbc05e8fd01d847bf9d7ce85da9478833f5566662888c8238b70cc3481ce0b8fb5c5e144d05ca8b8952c4374b261e48352bda2bd2e8de39b6318a0cbcfe3c36e6dd924e52d82928e964930ea6526aae08ca596fb732dfa02f2f6da72a05a227648e1fbf49554117aed210263cc6f5ebdfe2ba852d1c4c4af8f71a8a6501927109026e544432504a5bd066d7c03d443a191629a2c67b00f634023bb07c676294159db4df69555ffbd6c4b5a6d4726a54f9a0ab243cac6ff603e2ffa3c4acc6046a849b099654d0d894ae6536deecfd326aee5164eb1a59838da8cb33724697c17d6735687c860a13c8b8fbe497b99c98b58c8a0f0c67e1239b5a0880c1d4b0e2cbfe268141d035c02047d0a5c64c4fc79f245e50c43f3f64130be4b8def3085330461a12b1cd047afce58b05d2d75ac4980376a2739821149c95e17dee53f6da1afab57c02c7cfa3652784caf90f6f66a93966c636a29df19b2ed5699ffa1aa0cf5de784f5b57c15ccd22f5963924fc55f997b8a508f10d8520c5498f3408daa04028ec66b3885c5495e10666f8125f4761cc09071717244928ebcb985cc8ec8ac777fd411b8a2aa51320c60f6c71bdcbae9f6e37eea62c1f595ed27bb83b25842d2e26988d48217862afade93f152155166ca55c13c143d6c176208157fc8a836ca68ad5094de00d82665b2675baa86a6012fc36593e1c9aeec4da750c5c747643072dea8fd786738f5e788e36767bbd29a87ad1731adc579396eae378f8c4fdfaccdba49304649d108b19dac8caed2d08f116cd33af7bd22091330ff4e99936dec531ca9d735430cb4a0cbc4652a9c1c43168b1ee012a46b1cb92d3035714eb4f7f4d6b63b60589b946e5a47e961f3c575d13e1486d9a388dff8c8e9aa4663e5ed91cdd8d3d59f02deb394ba37ee4a05df162208286c19bf0204f4d609b229087351981b6e62fc580ab06ff34474db029a16466d9630eb263de0b76e8b53239a044f15f90c4836aee8b2203d6db413b583d62c8bbe7d657b2c1185a5720457a79f621bad76674112e28c34ac65abbf65e73f54f918d0b912c429b29c5c32a370ec1810cbb07375a85df5167b32a321844cc54c34ab54b87fa6378924e54a874ab871c928d49e704dcaa40b88d7a7c5774163522a6620abf5d73643338be36e5b2e30659d0e39695fa97a6ff8cb8064e370eee36c5a3b57de7d218fa325646cfa4fa2e9a0622bcf139eca8acc28de6f0a5d2e37dd2b0d6f6b39989eda0de372b20e2cbbde73857ae39b7f0cbb2f4337e04a52f1549bc4daf89e484b06177bc9cd6b199906b62789431e4a29251cbb4539c62ea6fdca9c84721c02b8af585f64e8420a7ec91e6387a897196685ebb760d1b4276cfa36b51f4d3e840e2c5e074c69ec7f6557afad4ef6774dde534f88cd7683a6855bbbf8d43d520cbe0312c9e189f710c75ad64926a97ca0e3b2b575e3aecf7b9145c160c415f8c90160aa5208744addd8b52580645fed9c66a2f6d8b0afe577ff63e3fda7e9a25519f0d2fbc3bffa9f45c40f70452a78b903d923e4f0fa9475659910f75455d144295e4091f8a760e1e68460227d37fa6220b4f0322d61b8fd7a40275c4d9446255862682f775176c67d294ff45205726eb733e5d21302f4df66fec98102611e3bf8084035b42448e86ff9225935ebf7db9a847e8a0f72ed177fa3812f4f5c0dfb7e452acf0e1a23d781607de22bdf31177d5eb5e2840bad442feb2f8baeff6f17bd63ed9495b0351949ccbb6337d907831e22ed31cedaff7cdd13bc3de40421ac6afb536ff89bf041a3026ce04316b6a082c06e0437440313ffd36ff78d6e31a4f5652c52e53f06fbeac2a7f13c64c061dca9ce9dc2e7598ed90a12307e5125397629887f0a3d3bf8d24b675db85ecfbcdf8b3fceb50e96b0a863d30a7791db30ce4cafe8d85999ea1282ba61f667497a8c52a2fa3bfceea070b2e8a9cd8e51a244b73a0a60a1e4076829c1a4668717495adbecde4f4fc0323325d71aae30000000000000000000000000000000000000000000003090f161c222e35""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-f5e15972ad2246b58dc056182273172d39b05662b5048af41a6516a04e042cf2f0c5ddafb57cdadd0def1a82bfc1a4f6fc1c5f2e934016eff45dcaf88535735c50f3bf6e8cf4193e53e118a828cee10640664ac6fe927f1d3317e26333d1320fa0cedacb8cdac09f35aa4ffe425e9d76c4dbcf07f5853c521f80689a8f8dc36b4ee2c2de91cbc3ae01cca416522008a0372515438a42398b3cb6e8162e003dee631a0d6ce6ca42662cc5161aab21dc999bf840665fe093dd7f3eadf35eddbd3d5712b49735724d367ede964eda26337c412310bbb326b1a83454d90dc2c64a477db6c90ef3a451a38ab814cbab44f19e8c2fc24283ec18f60b4b3c683954bc78afb64ab8e0f6817ae0095b14c83604b934cdb75c263e99bdb5cece8382539dce358adddaefdb2a568071347a68f75893fd210057de0bea4c2fa882a86f120934c72a94dfc8629ce6aeb024c5c561e1f5e8230d830b0a593b42ba6d29c52997256bb9186446786566d9224120d95e8c1793aaee0fac3eec75aff47e90547cb7b42cad315ab5c0813ea269cfbbb4eff999002de0541ab117e6d374b9f956f44ac01371fbbb2cbfcc47e6696a16d1d731f878ee362f3355c6b625a9f77a9455b51cf54468d1a71580595dd4c7968149a0c39580016b1d01ad59504db610f7891b5e0d2ffe9bce4a2f32d64894396bc6a91aef4722367ca39e4c723f538d4e8d444d0e53fa8f434040751069e62f42a6d8ec29950b8fba9878533013983c8809af7e8252ed9186919c561c12a39a75be5dd4d1a8a6bffb00d7b305f13be81c188718a128b98c5795b2083fd221e950898c6c929b5b06b1e9649025c68a6fe0ac6b0de9a8acf6d53dc361e3727527ce4100bcd9a99293e85c0cf2c6c4e13b349c1f2b0512278661b3e1d08420d15cdbd0265b6eea3540641b18e5f301b63cb46cd7c404c8a0e5489f072da3cc013f7895f2d368dc37cfe65d50c613b5dd6b2d1d27bfd074cdc20062c00d8a32795e61056a4287bfc455dc0c9a9832f188a1f390a5ff3c7cdd8416ac997480982935480bad96c215079f32cb9dbacf094e0f36fcb701d834ab851d98f478acc3fe5cc352d8c31be7571dea6a4f2dc003264a5673fa9a8254fc0bf489c39baefea294e808fd6ccc6bcfe724042b9bc3e2d57b82ade7f3a85519829a1e39313ed34ffb00853bc3cefb0656529d7cd3557a7a3fea8a07239a9d2eaa4cae666b4e77bdb04e0cfaa75516658d53f1c99d6122ff64fba6f01ed7ad50619a62d9af7325e549ef4d8bdd09284cf10432f58826d29c1e3c06991a04affdc5d1af3aaa7c8bcb5929c20fed0338803db2db0a3ef6cbf4745c511b0824da52874b1f3e3efe9812017b9eb3dda24f12e8713bc5f23c4abc34fea3ff86489c16e12d5d1729549f8140649963dda606affe6884a7759cdbc9c7d1f7c0ea84d0c8b42bc133b43d3cf24a404eff4853c458d795c1a3097b6350223aab7b86aa4e9700aa0794c0993dbab8ffd4ed89277a51112b20feee0fe66207db1e9b98059a80c6b0739f55859eaf867f0a64c08596cf08942266b61b391ec772c2c809319d177b081362e1ee216cabb281e79e896d093d13761fc0b5589db0d72c1995e05fd4b2095b57c24917b8974421ffcead3900834ca801c841dc4aaa46ad0e2b8b64b84d66c8668aa3d78ef19c6e13eff3d3d45be3b35fdbf88845b868df1bcb25f7ba7b7e52542b79e829682ce01d55b254fd66119cb8583ab33177b86b6fd92ceade0a8471016a3ec439df031c9b15439e0295a3050962bc2e9acfff0da13b9ddfdf864b1091df92132e9120573474fcc15594d9248ffaa873d0597e77d63fae88a69c0fb226dbb81b304fb3b9f3869503c18aac521938985af600b55dd67387704faadae2376514a12cba29dd0486c954fd48fb3e36d54d72dc81991275c17db80c900ee6197321ba86faae1404c7d091cab83a0e4b54d39b9f2e3bc7431da20263ecffeb3b732c24e81a814a0f4798739d856d89c976e2ba1910d4fd5fc4090322f7ab5892ba2b45636e0eb9ad7d39a1fe65f6917ce299c862682fcedf6a357f82df9daebac485e5c44213980f1042e0c5f01221ffc73495dffb389a3a49fa323338d123dca12a11109d3c2f983f13b79e35b525ee2496e9e0daa9237ec2556af9fefd3d79fba73bd291b3de7f95326d60d029d418639f0a6724fc6c38f7862a7f1bd84ec9f90f090b5dc56d2186987f4b2ecb491f7f271151c7c270962ca1337ccb7fca3e32985e370b11985dc143d5eee404af8309e102798f8f39c829c693e1e9ceac552d4a782ac70758a851caec473ff3900c52f6f5c372df2a132cd4f216c5ed6cf4c9b827ecbe313b0254dc163389329223769de91631793d8325704768bc824994b45c3084c9498669d5b89a2d39a5fa83d27d41490a2c7232c8d26efde3887f82ce24c7436626ddaa2b4a049e84037a6708db1948ef1b95913366b695e4c097fc73e6d1d24b670c81b57806d0fd4520f0ff772cd9f7833a6165b6a9e4a0b6b8428c9a21f34f195c4057e313da89a55e21aaea8c5fb9165385d0e9d475e9088f7fa701db2bf4fa32cab7851cd538a6851ceeb3a21a44bd89df644c919dc95cde8c946d2b33ff19138b33d5a81421f47b9c8ecc2e2d9cad606216e9e35f4ac025f3c49aab0db157449ac7c471ca4317755b26b3561d279aa193ab67d91da3e33a7ab072888f5df300c0ccaabb9d2cc34522b0e865b55f850bcdb835a10d41befa6fda0f84a86877e6c83de62ebfb5bc7c0f291282a70bf3f6ec5b6109c3d9fb30b5f596c8177f996d3b4a91eb113de00361ee6398ced54b65ad054cbe1bef0a9586f2d6fce45358ac9da2f62a1285e71832c762265128c53836bb3d488bf13a4452053a6b2af4e98a32996a5218a761d3a847b0a2abe9f222970f0cdba9f40e5e04ee155ec9cb3c3d5172408d7b0d99b93d15266be3c174fd25729027fb02b23ce3304b5553680fc6bccbddbf8cf18d0290c865d55d057442e37f02726c89affc7016124ee3e7cafffde04f8f6588f63266bb5cc91169e954d98502a8fdd9cd68e786df2e4d512dc4a05a58945f2a4e66651d4c53f921e234c7f24fda5402570ff610f56c8fe45c5947f217f7935e4f7014bb14815b9c7d49c5c64b1178fdaf39db843f94e711658a13178a9bc5d46f0adbcff5232ab09b84ea33940b94fd8fe885c5c7fea6d0505d675b8d602f4c91893c09170b6596bde36f3f118a8c375563f94ac6d7a19d581f31332588f365608cb09bd01d7f4e5e01655578b28a366379f760e6de3ba8d031cdaba280349f9e4f8091589476323039c7e08f3c2cedbbfb69d64910a7b50ed2654e56a8e119838656a8049ff33dd81e7ed46766e1dfaa7a0480565f0e2ce6575ee811f4f854c8341ab1a72742970a3cbabef8d4e8eadc579eb9ebdffa35ac2860c8168540c0ff06427d3b4f065134b972d97f6ce49fed68b0e99e61d17c0f89952a40d375dbf2f971dbc67d7e64a6ff0ce7ecf4d921d68c67dfd55faf634ed322449a9ee445327be4df5762f17104de608abec72396f450bf60465b04644035ada94d19cdca98a4dbe51c75485b665a8b0fa6174d7ac9b385bbb964255d74f7b61ced4db2a1d7bb37562a2acf0e25070449"""),
-                    TestUtils.hexDecode("""
-CA0104B9DF99E87474389167359968A307F63AA32F0C804A96B18FFBE00C748B1D6894CBE2B7BA06EF17B6947ECE31DDC9F614348F01995FCCE77099A0D88B2BCD1035667631991C2BCAA4C86B4D31074A2FD46C38429B52CF0BFD7CD3E5D194DF22E2B0D57C0C9D624C772B54686AC963447E716C6B4DAFC00AE383CFFC69A2F6F931D616954BC9A140D785F15C5DB28ECC793D88C78D11F8F8452046ADDD3AD26988B21BF895DC810739FA7C45A8062B2931AD363B0C7EAB4CCFAC71CDD0DA3B54CA9A6388DCBF79AF799446395DC7A5B7ED1788188E9D03EB3BF7B80F8CFB9B7F33DA0D4DBE1840B9C6C5D80F6AE64487BBFEC86C596E2ED8E721A11D783F7552A4B01FA24F60B5B683E287BD75EA0DDC15314E014D402F527C5DAD74CFC49B4D824EFA77C359B90AFF15AC89C1AA35959570E2148DF7A09E27E2FC096AB5CB306B4868AB80A24DF745DCF9EDDE57357866182A9AF50796EAF97A1A1051FFE6F9038BE1F6239CADBF0BD81B23E2991941F34D0851AFCEBC4D3F8B472D6259CF61FFDB87F79928C66E69D969B254D57541A87C692160E5D58A837A1FE90A1799758A70F958DBC1BE5D6E6836845940C75E745245FBCE59D1F83462B9578534D7A05DC3F21C34EA93ED78387B32DE09ED3CD2A51EE2B8F7387C8C2D426EAF3795E99B158D467D9A039234FDF207D65D2577D1688E1B1E72B5EB096FB6377DC8EB6B3F51900380BEA561C03D546EE242EB4264C0369AA2D53B2B190E0422FBC4CF896CD549C2A08A37070331F15A9ECFFA0E91B1FC4D5157418914308EB8C6A992B197F33DDD517DF4610E88F2E35E505BA7C7CACB8E76677CA9B39A4094EB4590F6154FAAFA76C1D95D4072B5CE01F42355C47AFE569FA80142EDB49E2ADB34D3C356F4D882A52021C5216B3678AA6A5D52C51CC8BF09E7EAEDD2501A9886FAC977EA5F385F46E8718D39073D8995D392074C2525A4ABBE228F531E6B16AD5BCD5EF5CC4C3C71AA77EAC1747E2B763D0B3D66C7F35458BE43369BAA0ABED23202B733B3C7A111F9CF407A7D62EFF5BE3A5DDC3E49AF130012BC6D5D3641EBF268236473EAB09BE87BAF7707546B7AB194D2ECF5B03A56662B1D6462898DA94747CEE9DDA08A9026538D799F163E1E771EF7EADF8833C0510104FE7AD7EE75F44F8D4572E299A87FB17429718C576B29983B50FF81F8D48D41CC764809429A7CFE05F68168B6B36FF66CD75DC0021D774D07BC716A74F9450EAD2995089FEB89D1EA73A9CEB83155ADBA737B3DE33B6B617EE7F5CB6C6672AFC439990B612A6AE71540FC6D7FF535FC88DED0E6A80A484735F63209D39F12E6E129C4ED2EDD8C8B5A24472B83A058B0F1C86B7F4C53D88927C7E9EDB5C40C5D6C7F0ED8A626C5F35E1D3981936F0F1FE4E8CEE0FC7F66F0016B14F3D1EAA993A5DB9B92C03D99C0A867FEB343D9F43BBBBBD85F58B2380811CF153FE66E5B5DD07D5A87ABCADBBD472692358777BF17AAFB622D487A100062465D9BFBE0E63B9D862A02F09E371EE820D969B29B4E6F6A1120CDA9F9E3FB804B26E2E9C3DE219044D1D6E62A28CBC90C262B76914B8929465FD901777F6F5C112D196A002A0F4C4FFAFD2578B5CAEA21452968400DAD6490E313D32A708A42F64E9CF412EC0E358F6B833EB0190C5933037202C266ABAD212B570E609FB7D338AD3F850EFDEE9347EBCFEBBBCE90E7F27372E244C3F035D4ABF1008055215E573F0C4001FFCDA5E6B6C5B29B7F59132CD86481FD0E1245EE4084DCA3D44A0C9E6B6B14E1BCBF56F470F15609DE76588795D5CB62BFC9C253EEFCC155C116D70CCF9112D8E0A801A3C640C7D16634EA02DA9DB9AC57DC2F7D43F48ABE631D3438C2BD3EC97832244E81223EEE47054878BB2472F64E9ACA0D5A8B0B04F783C5052E0ED6AFADA5274C94084621E989084EF9814128226346996CEB6FA07FB957C7432878505442FAFC4D945A953336F9C92B8ABE4E4A092DA65E2BF1A7A274E1EE9D7958E35334D9B7CF8B314F0AA5C45E93111460A8F5409C0BCB842DF9C9887FE4643BF8958CDB40EB66438BA53972E359EB712BF4C553D871ED702F74C41D1217D7887C891E49043C0826FCCEB2897BFAF9F217DC9F566DE1C416DE9118491162113E2EB56CDD4C024DCA4A33359D88CB0247BDD6802455063DE9666A4C52075359316B3B557D42B7C99700F55CABCB2B802AE4209C6B937C798433AF94159A4EC0A7DE00C809F6E6675A4213A1CE8A7099FB7FE6A0C7FB383233444B64AA120BABA1C4E61C6426001184E897A3C6B0BDCF9759A72146EF848EFA65EF09076A4FF2E6DA518C5A08F2A2A12D904C893297234E53CFFA04F285F350412456C9A13E153421D65DD30B236653AC13CCE3D5CF1EBCB8AB46808414BD3725987D6E464EB4F97321595153DBF9994F7E19AFBD19E9BE929D18563789567B28B1AF05BDB5D2C5C289FCBE8EB159D0017E09DA8FE5E9D49D3A231814778370DFE703ADABFB175859A895A6ED86F9B6B52CCDBBF936622C5E5A01D50E2B6D5730EA4588680EFCCF390211F211472F9E10314482CFB45A24706BBCA8CB515B6A9AA6EE1D2509E8F9AE9D6F545BD3971A02CC26699608FE1F076A925008AB6CA8576CC5A962326A369BDA8ACED3618F02BBC55337FAB2D66050514F904083D4386B43B6EAD553DF5603201C6D684F7156FBD2D3DDE3D7EB0D569AFD42886E57B747F21D44B88AD58FA2370FE6BF2DFA4D94D8FF983A1C2B89876E75AAE3828D1306DB9A639D052EFA6A0EFA0F61737CCC45E0C516815E92E256BA49E7853F9E9D4670593BF9402E59EE80F6CDFF8244D156FAEA8220D483601794A3CB5E1D7B60DCF991A545D2C72F62E5EA05BEAA77FA86A80400A07B97D8159F0EC170913ED885B578767CCA7A5BFB8BFDB7AC99002555145D9DF5011654700D6FBF2EC2BA609C969EBECFCC0EE346FA01B6CF07E6855F3C832BF1DB6E247448438BAEC055FD41CDBE921E5F62D93F4E7964258A9CB3991E8084BFFC2E5B29BD1E32A64E32BF5E27416CBA7FA3DFC143281F3797E1927AE9D9E07FB424833A7911C23F231D676EB0FB061C179C72FF0038E48068D43A805D56C3B6A16F5A2E5E8457F1A3E0F927A8880CD261F0D0AD8F82EF0E52E1BED003661F1D4510F7BCCE680CE84A0181F046366126A53EE67C7309C6982C28966B6CA1F324D03F5E09AEB111486C44B6551B1C36E84C2A72F78AEF5CA31AA66EDFB0792C00579C0C7C1FAE501735706CCFADE03E9A0847E498A24AC1DCBC7DB8FFC946B8D914633559B63E3031C214414BCC1921D2A53726695340648CF6C2BB4FDF132C77BC39E9CEB2E4D22EB138D807D7B79F78CD9713F5BE7512FD32E73E886DE16A9B1B19026B91EE6AB92DE4DE663D9774344B283149AF4890BFA57ABD1C9DFF128F9F169E4CECEBA0FEE1C33D4E34B877EF04DC887F7109B2BA65EF5732ED4B7C6B33131EB5867811D4A8A3536102F5AEFCACAA681A6A45A3BDCB24C4FDBF49A134244044E2B424996CF6F3C514C77EDF2AEC177B8F80A1AB77F6D3D920E508C76EB71ADFE2209A132839E9BB16BD9991A545AA0587B7594E0422647DC84CD355B20983AD582324D4F19E33E9CFA5CEDC739B26F43BBAD1F165720306F48CB15B23B961E5990C2DCC39E5BF58A9BFC10829590A7AA8F60E13EE1DBA85EF5EB9B1F6DDA891ADF7357E16CEEA4ACDC00E20F8F364AE3EA838CB4A0FDCCF8B439A242F8D18B8E0B9FB8E074922E0C25922CBEC46C98A82E93F0E95884BA9853CC738AFADA3F08BFB66C17DE7977EB7CE5495B8620B537B49D1D37EA4B3477B79759EC7D9AF17EFDB2EF89945D453BCBDB349CFC623FBDB8F125EC492CCBAF30006523B543B6A17245CDC5EE7E28EA895654A5EA74781CCB0F30343C73B4BB88CE07BD37DE9220712F11748EFACCE925626FFDD8447D37BD9CF2476437C093BA4CC0AB674E4CF9543CEA67BC25B9BD56946C0D077F0849796EFB74C7F66D5B86CD9A38B8138D816F677CE08DE6A6A911BA4DD1834751548578CEE4CFAC50C11D685E52DECB77A475FF5468C38DB23853BB2118C78AC3D52079042FB7F370B3D0406E402EFA6432D3055C572C81DD999876E8306021118BA87D5D430E4AB9C24670EAA1274ABF4BFB8149D9067C427DCC026A61C5B724CAE1858ADE366FB42CEE52C36F0F99AC02E8BDF784EBF311334B83B2B277982519DFFA3AC35D97F9F30635CC17BF8E017EC4E209EAD104B52C58E8762052CA62BA7A82FD011860E4F298D889A11F6A2BB1B4157CDA42AF9CCD0B5324329A92CB9FD6EB81DB3FC58431BC5C9A6DC1B07F7D2B00B32E5A39960C5E2CD69CA2914F23365B518ED746B27733D713E8ABEAF9D1FFC6D3D9B601FB386A6911F24CC818C0353658CB826F43FEEA792055720065601F1364BB6184699F16E3EE2B359CF0642C85E9115B18E55482356E2F91121C5884578F3D2C45462E47A3D477B3D63448A8C1679E68F9B7AE509100B7B2B142FB6BA20179E599259414520B02B745E592FD10D0D40D780A95C164D651E96A7052B69BBDA979216989A57506638F891336E2EA123303F997194B7AAB4F22CB192AB59A8BDA7CC88D0F43E4DD949146006CA3F91CF28535ED42662A61F630AD6E7319A7B98FF5C7200FECA768F14BFD43BD60DBEC814E22C26F1A8191ACC869A6BCE61991E4F36148908A5B1557A507C407D73A6FE75A548CBB8CACF13E57BA6B01FF0DF900051AE7C0C346D5DADE5F1C1BBFF967236BA5BAEF19A70FEB320BD76035F3A6B11383F13E6DCB8D1533A6529C98334A3F2A9105A5CF1C940659459C405C197130EBA44F0A2881B4614B7A0BBDAD5930DE5C3389A7349265629E29C0123CC89F3F540FE5C9019662A4383A38248F22201967D908EB48D530D17D50A08B35FCAB73AE8ADFDD72A8A7551EC28C7573E2B33EA4F61EE84C3DCA33DD5861B8FB7176C4AFBC174250D51F86B1452903191E39EF099C0CBCC15B3FB5DD30A2822F68AA37D59583BDC1CCDAB1B2E0337BF397647FEA9111A5B94C6A3369E90F3B86C266F4C11C9A7D9E24802B31B5F93B8EA9AEDC6C2944965D6B54601311D251E81C77AC1BB2159263D0A92F377F111DBC8D554C3AF747FE7E82A6E6BF0E4E3743B7AA42C3B5B8D3E5D9C3B427B3290452136E61592609826F4B61D4960B7C3784D0E2508363212AEEAE624489B739D0573CE23B35D30826182DB5F4D09772582E4D6B61938041344EA434614C21B01530327C08539A84F03275D0C4A77FDF230FBE6639CC7A12C34545C5CAD34AABF8E25D64AFCA8206948737DBA643867A146F17ABF81A926294E2368A5A2F0C381E2C244B21843E3ABBA680CC3F1F0509DFAFF4C70B68C82D3D7EF8EE053DBD154376FAAB5D561A19362314B037CFE18DD03BB817444FBF08D771A13B9D745DC066C89C10ACD53597B74916BA719F9EEEBA865252FE13EDDF97978092FDD1524CDD865FD6AE9C14329EB62B322F46905804AF1CFFC13B46B6AF4ABCB107D44DD27B460101F7A38DC786239E34CA9D1A444898673BB3DD92EE88478A3C539A563CEAF5CF499AE8E07BDAC0CD5419DEFE2977105B5E0138D84A8F9BFAD82F58884377B803C8B68164A3E678648C18127A832FA994EBEDCDE4FECE85DAFF8CD6F44F4CE57694522DC30BFC492BF62796D05A9B87BF13A7D538EE5C55E6898D50ED127E8C12F87D160AEEBD3CB126BC4144A51F685079E962DB6FDDE3BA6D0C8038BD6FD8377C4BEFC2EBF1A876833516D206C2E309C61E4CEAB5F86ED83FF20C8723BFE63D8E480798292E6EC6D418D3CEB623AC6983A3F8A3AD568F73E408F15AB88C8F56F3CCF5B32C76BDCEB1FA41357C42E1215CC503A316EA0A83FB341ED6ED20B1154E5001A754F92E97570F9DA7EA8AB7F2EFEE7B79A1DDA705645ABC5B1E04CE4F922BB03435D11FC83EB580CDFF7EDEB78F2CEBBB6053410E84477864C16D4CD7CD9D16B932372FDB99DBCCE2DC3B5CDCCF7DB86AEC9BDCB8E4F27B65ACA9A3FB985CF95C5BAE253797C8474D0C25F0FFBD151E6558E524C6E96267677EB7A3E128C918CD3B09F1DDE311401152C62B4C59EA1D408ACCC4A12A34664D7C0858D7E99A0327724AE9CA55A9322D865EFB4FBFD37FC79F8D7B2BF08B1824D44777153ED6604E05DB1FC9B1ACCE05F8C53C32594A84F32D97AE49E819029204AB7713AF2AF2C281448A34C69D5F3DC76345031D2CC05B6B26303198E182901FE65710EA95793DC8495F1995F0196DC9473B7AB922786BBC61A91868BB0BE05E2034EFFB288502DDFE2595887CCD144E98ECA4D1E0C044C642396F98473BFDEEE796530467F6B5EC0D5B79674EBDF5D1416F94A8EAC7F4833947F1DE610029779CD436729E55AE3D959F99D5438E0E4407D0A870A38AB31E08F16A06345B7BA730CCF55CF1FDA1E9D04833ADE5FD74A34E2629DCB75A3482312860404F7E75D94D7FD2C8215C6A21BD5FCAE81CF4467931A984AA24B927039526B95C2F5F39AB2040A23C76B64CD2D04E95DE6DD9B8EA849F9F7919A619EFAC498E7E3F4A70432E28B1C5DEDB08D122AE503E98D34D13A4E8A69FA267C3E20671077F977F71308D3EA1AAED5DC33B3F41E0ED981050B3B915EDA07AFD71CFD3AF13A2063813039BE85EF98706399299118D2427A7912A131DB7BA731D18DC2838A116E05C4CBC660895294A73D170C060CD83C9AA0884C5F3FE52F4891C2101997D688709F356A556CE202C571E1170BC339F3E2A75A5A13810E3A2F2133438C1705895523D03F00BBE4F4FA9BCE6D7A14517BD54E281F202BAB40DF35253961DC9E94DF5C2C5C3F0E420AC67A85BEC2ED70545B94202AACE5E58180104E42C5AA6F7F59915BEA69AC10F678D40506AD2B502D77EBE4D05CF8253B4795094F04BBDFCC8033EA131BE83F3F647D22D1212C16895F52FEA576EFB344A476D2A8EC74739BA62632C4B5B08076905BC0103CC9B2193EF6C4785685F2B3F79FC39B5ED09B258E5E9BD346557F24CB542B69A3ABE367123179879A02F941F9781935D44BCABCC563BB1F31C44BB77D5E7A4FC7EC2C11D597E7288C6088497DCC97910CFD8245A4F255CFBCB8FFF95905E8224B770E910A253356916EAF1B3277D831BEA5BD6681C6C7D57D363608EE78973B7BBBC156FE5536C963030B6BC8D306F3C1EE72F14163DE0DCD0CE741EF975A9DDA77EE386B991F3096FEC95FD394E26578269F491572B36AF42CEF1D86CDC82D63DF00AA397E1960378763F5CED239BD2A6D0EB7C5BD7CDA2228B684FA57B7FAF497310D510CD386DE6406924CD592ABB1E9753EC8BCC594ED52B70C04F7C53E19B0CB607DEBA79FABD6748A52692CDA34BB7CBF95D1ABBFF8AEF8F8AC7E5D52EF58FC79B0C7662DA90A0F737CBD42E64B648B624AB497162A7B27E41850A9BB4AF0489550773EBF1EC6742CE8D53A20921149563AA74337ED4CF1EE8685F41D36F748B6DED5F894BBC50A8DEC84621B6AAE690D6EE0B392A7266A480CF985295361B14AF0A5CEFC1EB737ED3AEA5E5894FDE80CAE477FE742395CACD1174CF2B345774BDDF71853BA1854EDC8F5CB03D33C5F58EC386ECBAC8E4209F8881473A4FFE306ED3194F455D4441D132B7685425435E58AF1F2964B657C71EB6E28FE3568183F7A0E570821EA49DECFBA3128002E77208749DCBD3F5E15453AB6DE9EB313D7445377B3BA74BD2F67AE31F560ABB628CA0DDB120CAC6CB62EC9CCC65051F70FC41BDCDF29F885FC9A558929F58CDE1200072F96C3D8F22032A0AB3F705884F0D827823FBDB62FFAA39EEBFECD9F57DA083D1ED541CF36465A999558F2299A865456C94D67E74F1EDC7166F91F4CBAC8F89E680BDED946A174E9260DD50C6B0A980A4B886850797149FCAF8871AB3080A76B645E333290A0DF319DE058981B8CFAD7A54FCD62345DFD9C3E6F7A26D212C97FA6F09866E23D5A19EB9CAE760E876B2AAF43BDF9004D5CFDC41570EABACACD4B57662087B6A91B6249CDAF905BC2B1AF5934F1A05D20E6C6784F0FFDA0A3E79A2C0939BF36C55EA0E31B1AE614D44CD413118EA165FA549026574D1549FF7D63B4C464A896C5C0E8D5569AB2B10D1DC56458FD1E069B5F91B1D084F7AE34F67ECDCBF33299B12C102F953CC48B0661AB4EFB493F7E4B2EA8F6FE59C3D5EF7D121B26B912B86BC0AE987B6A3543558F0B935AE62B4711A586DDAC9E5960C48B99CB80191B11F4053527905123D20C549457BA87608948933442CB06BEA0E73FE99E3C4198E9E7C51BBB7074DA46E752E46B3E419FAE2AD60D180303D710C0A59C6B980B24F0BFD39959368B5F56AB3845A2167F4683AA82A9613257BC801F5146CFCA857F2DF4FBEA85C54930D4373F70C083F661077567F1173819EBAA585EA3675F97951CF8C9997887BBEA9B99E17A1E0215DFC2B9A66760A277F68E747141AFE5CAB6B25D73D562B91BADDCC7938F2EA75F1C990E88311549F38FCE2C52933498B22E2810227D1EAFED4BEABCB153324622E107A6D96214F3C6D5DB91855005056A8D1BC5D5518867C373709D24DC1FCE21537C58999E26CDF4FE61ABE5E1225DE80F98D02253999F39A145FF3008F12880C173A7ADEE15025E3E186FF0C2090872A0A51505A09094FA2946AFA1840B0D6D526DEEEA95FD8E259E70B2E794C97F50E7833B165E7BEEAF5D3CAB7C3AA1CEF00003B94159F0F6DCBC74808E3FF237D5C3E94353FC0E700CAF48DA8BD94B991EFFF2DACC9E423A2AD63824CF879EF838C784C7D4C0CEE3DACF5884941BCC14E043082D382AFF598BBE0321DFE9406434DDF558EE2BDC272C2B04CBF8CEF92EF8180D0FEBD3D62E1F73F3B1E7FB0EDF9B50538D49C52CEE53F3000E581FCD7E6FEA1CEEC9DCB4876B3F1D1B1A301A2D395DEAC54D68181406D7ECA05A416D3D8E0EE10228483D8515A0F662D933C53F945B50C65C5B8D51EC45360661C92761A1F74EE06FAF8889244620DABA05593DDD4D6A82A30F34DCEF50B1B1D261CC357AB0673370A38DFEDEF3D591377CA29DF609682EFFA212092ABF84FCAD677DFAD758575CA35046467C6925B6185F9B734D5E194F5CA48DD10D0B84B7E9096703A9EEF0D3EFEFFC0F58C4D38D741F15AE766D06156B26E9C82B464C9F609F0A4FF699D52E0E11E054738476456CB81859ABE457F3595E9D7F1CFEE5D0437094CF093F468C79C093CD615F7409A505C610169010F46E148F3D264FEEA1DF42B3E78D1C4B33C92EE9BBD9C508E89BC4CE0BA0C412F75821EB54730FBB627C6C93694810CD741167D5288768165A68034CE2B16B0E73ABFBF75A905C9A9E577024EF2070EBE8A68076AE37BDF3507C7CB10EAE13D3A05BB3DA33F873F488150CE67AB892D61A11FAF5850B6A26862FF0CE85E4B0AB3EEBDC81F68BFDE39B0582185E4322404A0195BF5951BF7CDDAA6530DB0EFA0A2E6B2A9CF8DCD8B0D15447448847D1EB5FCCDC80EEDF166988D55DCF3BCE37E24A0A5F302F820C2782849E70BA47523A7AA1FF12F144148E9B5A1E05035A346FC4028BDA824B8D5FDECEC4036EB2C3A7DA612A703EFBE4D5E5E17CBCE1EBF546880C227EEE2D9CA4113D0ED61AFA70171700F0F9A1BC7CE7807A081EF09E9CEDA5DFFDDECADAA7CB5ACB2DBBE26550ED006C5B7DD89A2585EBED5995F8F76F3EF8F13B6AE77084727DC894C74268D4D91000155FDC94DEE049E54F4E4D2494EF926F23B73E60EE16CC3711B67B6F6B3A3BA6BA8CE602AE1BA87ACAD58650AA8F7F0F36AEA21080CA8DFC618AAF865B14BBD69FF7B413FFC81DC6C8BF2A7B122EC2C13DD7832610DB9E6EA0E5CACBE1703AF551997E6C51BCE7BAD4B3EB1F392EE12C5691F795090C6F1D6405D0E682F279B3DE64A9F45B1853346D8D337FF8037370CB4DBE5B241959FB8DD985A4F154470833E422AD9EAD7A14EC1CAF6308FCF7E9AAC13ACAFAAD98011148A2D52D40511CF13C7CF0ED1E320617B908BD1A6A442FAFB2E543703844B0D40FCBD1B392CDF5DAC9CE4C2CA69C8F04AA033F5D6D11DC1A5667FB352BE6BF88A9978AAD37B01BF8652A2C475E8516AE1A6E56F8CD596B9A780864ADC65A04F615ABB2BD4BA97301FB0CB7D9AB5423BB14C29030DCD5345C54D556ABB116051C04D79C81402B70AA9F32CD01B6C06FCFB416C4CB7709CEB12DF3E8BC541333C90E6D991B24D7D1D98D0839AA86614F3D91ABBEE5DF138A9DF2C0591204FEB3D9DD546305FD017B72FCA4DF01A7C1728606EDBA07EC101D7172971C9F4ACE7D6D09E06BF9E8552A4CB3ABF6FD84FD350F60A3E1826BBCBA484D4B5B284E2E1EF2A164FEDCD0D22AE77026C4A6596ABCCEBF6ACE68C11ED108BD3C"""),
-                    TestUtils.hexDecode("""
-a3426182a616883300b2c714932258a288d6f9d23c8339e1639f0cb6affa7245fcd901acc5612dfafe3e4fff1171e24db746e388f629bf6ab0e2090deeeef36a3b3c610ef0570193067af930c98accbc0d6830173136316ac7d5459e4a2cdda6f26f6509c35d1232af44470fddd0142b6d584766de939dbfa3edc9c905189e0c861eb16667d53576a9d4a7df0073a5d54058500e1f54d3898faaafc08b116336669568d1d18004d33c2b71acb0686472ad04b23a667d6d3d7d0d9e3a434e34d505d63f17b26933b4427931701aa35f2f6864465b650c9a6673397ff4aeb6af2730206f1049febad306ae06f30c856ef643c8c8ae9e3cb249a10a4646f9b7d985bde15103d57630cdbbb6716f41d0b7b1064346ec31907531bd35fff03872661bba13bba7d9a03031ee4943fb2aa549a208709a528555da3a42020a5c5827b06e7c917eb07c02732f7f559c122c545fc36cd006f33bddc2ec1a2dd67a60355c971e699d400110aa001a442fae92e24d05d1d091eef447f643aaa825d974f4b049e6e0f988ece4d510e79db57ccadf9b5e1a564c64b029cd265845d41474868afd6554996e7dbb2b3e92fa5f544de6f8840e841e886f7a5b77d1afe3b29f74dbab86a3f68cf223f9cbf41715e6f1f14b91146b64475a336fdeb668b27ea28fb87321f340c910b1814ec7305e11a0dfd0eac1283c0d0131092267de75cef5b2586399804afe72f7da133d04c02f19c2289c17bf4a2ab1d01bc2830b34bc77b15edc8fddbd0359587fb9316c3ea1ac8a146fd5229f86c38920907d77eff0b1c581f6925a1bccac2d234c52d159ae44f6d93a11d133edd6d0f6683f5165abf5c7197a50827fdaf713eb3bcd562ee9055be72e879849b7e4105755d0b9052885195e100ce302d3372fa4e41e3ab9e48f61a2ca054fea7132ee7ef77b62d61e02bd8acf7bae2b56cbe5f0224d15c3ef29fa051d2f27d56b0057b846fefa044ec57171549c81d7baa27e59e134c28cf6326d49fcbef62af5937d42953bf5662b60729ffcdb8471733c44cbf34765996a58430c02dacb23c6dbd9d8550eea2dfb669e1738fde0c9fb34f0051fb99cee29bf5ffc1ee95419580dc56c9b2118ea80a7b34c1a2231074195f45dd778dcb1426aa7feadf475e065f9ecc00333d05ec3ca0e0cebb2940fd7ee81e8a18821b59341582acc43ae576cf850f8e7cb040d4c4dab557b2a80fb3891669f86a00879c45c73e6a363ebbad67f99df0c5fadecd53494b5872f902e20f3d41e4be6b7ceccd89783ae2464feaa9fec596440fefa3111bf3efe416481f5e739fff33e3b7ee1c90064acfe18528b8ad3a9f3dfea879308521416da9f6131a3279def7f9ecf8a46373352cd14a0765f4e28ea8f313a988dd751d0a15b525c3f2b19ef0d098298014230bd7c8a042afc6d6eb6886e22449a36ade8b5c8e114cd408dc54ca4554f291882272645f8c1c10eee4ee4d6206525d0656867c0d2b4a134a40ea26019897e6f2bed4b325ada4af846b1db43358d140d54bf61bc8ad585715345aa2fdfc6ff62453bad6d00ba9ea11b053e776d72e0bc28f54056c7e0feb06314b3dd0023b257eed796bfd594d2a2b0ef19ed5eedf68a6dd19558fab24c9a751021c5fd964872e4a8eacbbe9406dbdb98fd505870ce79e64ed57c83887edf6ea916b29ad0c1c34d02f115e9a81b76d70ed6bc0900ada79fb5f7dc069fd7fc2f87ef9ada6be01f3e5c2e87ce02b38bb4c5372fe69fd7cca02898618d952c6706c88bb7a8b05a3ac163baf9deb64a0c5523ea486825f00cc298da63274b4d085b7fc6324b984d86d9e39d2cfce97c2e2a3ad8c3c04399e23af07f4e4c8a49e58971f8c379c88258e7ba25f6c6e9bf8c090eaf06424ace3e91e3ae12bd552193057f2542c6bb89bf1d16b7039395a8f8f54bce4a67caf3baee88af88a4a34ffd0d3673710dad8b1a98aa7a7678675f87da138971b0446e868fe1a39ef268252fb06366eb194d1f69c7a86b7e805761ee0de00c7113a2e1c5f405cea7207ec634cae3a43308d6d3caff7a9baa0670c9256fb90c61a116abb81910fdd638075283bc76928a82074255a4375872f02cc9ff13b75240609fc44125d46e8071a94cfe1e8fc68ec03665daccfd0dc385687c79e5537661bfdca8462d3fd86ce26d599f5add12e57c49c0ab1347c2fd967cd62b6e88613051904a975051309d5a43f9782ee31fdba8ca641f8d5a27c8cac9131e33e24bf5a1425dd771aadde8bf0fb7a0b7b896dceba013aa5c0687e327c27106ffe79e545f2249eaddac393a6e062dc296aaf4496c4936dd0365d3d248dd2811a95b2789797fa05e33cae686819789fd2b1315aa90395b0afb2f6084836ab2c78216b27ba6a65f09b23006957522679a4e372369aa65a3bbbb8c8af19039ff0cbd191ba65c0d7e0acddfb468a253f631c4495a808083e945496432a10195fc221535e240fead5672421cc1ab3010ffd3faa39f818ae105dba8d6a6fb621f0b86ba9abb68dbbeffc24b26e55184d4f21d8ad733ef0fecd4c6cfd5a403e551c91000cb9b6a26c3f6a246eace5717c784921cf154bc7fa61da54cd0eb55846c086a6a134716dcc49f44b55994217d5e92523a07a28733a95efdb2c6ecebc6d3ef790ab10ccd113d4fe96144d0e4caac971370d78331fe91648d32c2373c595ae848ef70a5a786c36c61d5961195b8a2c287608b9596224ee165c22336c07643b08d3c92aa5808bdef9c3c35bb3a5004f386dbff06c9dddc925fceb7f10ada52c9b5e100ce0e45fc23869f18ac4b3ca6561f98c148a86ae197d17066da6421f4d73ff4c16b489e84c4b09afe4c1e8f728f9dc4e4563c36ea110870a341632a390981fc1d114052eacffcc06d550c329bf38d7460c51a3ee0342d87157450989c43788b508e9537d08ba1017bcc0dc4c5a8d99ae5591d82fa8b258cec35a1446054aa449b48371db2f04f25cd618636309b5a40b7a32e589c80b69ef5cf19bfad44da6687abcefdd35603f32028fe079c1e541854e5b0b56998b4bb02ad89b3ef22229c9a8da7a381fda304ecbd458c625c779d7e52c8c44fcc45322a21e7a78d896417b513e298700389d0de1a50c7a3b653c87006bff64fd297a54fca09a4662d9710132d16e2e38ff4eb2a4eee0bf9b9d59da5d828da4cafe77262af02a279fc22a1a83aea33f9887880542e274c950d707e766eafe8610b0cb8aede80cf900f6a36432019e4d1f561f33ba1d273573cf1908a9dfe9922804f9e5ac279270b21d3b5edddd51c1fb2e8aa8789d0cd75c672eda3b06686ff6e8c7f5cc3fd67d2fe91aeda8a22e73aa9624b7b18d0060a64d6ce2ec77657b1d1a878672d5bc033aebbe3b9a7a224b74d859d47d89a360e2f7a1b03a4bb1ae92c063ed85d5d60391d9553e4d3776c5d4628146aac13c22eadd0ac57c46e65c525775ed3edbf0b41a01f83a2758aafb5324c1888a284ef0d47c12b15c6c5d68affe6c330110e0e8bdfc2b1a8f2fd67617e76f975a7d72630cc24e98eb45b5e9c8c442a5af3ebe4b3d3809db4abd88e49004d339a36265898c5a65bf5263d062cc9a307563081ec6b0c46bb45b92eade67a15449e0ba26e280fcd403cab8c29ffa15d306285b4052611ab63ea0549e8aeeb037e29cf23dbf5baaec582754768b2e357187343b3186bd6e1128ff92bd7c707f8b5f7dd9eb88915229eb0c8437d715f1b59d1e478b696da3ae27fb756db092c885b6636f6c11abd70ba3f0bcaa6340aff1acbf2182186981e74490f679c6b619522a85441902f9983231c2319a1420a2c3e050fd62433631a7d9b6947b247571303e22121d25c30c130e90b73fcc0367d4b7747688ec709079d9b28b981576e0fcf89593be1bc2868d12cd9b2159244286f46d3c270ed38bffe97bfd1d51e0254313703439c148f495dc73c6e534d05d0041c3a4f02ddec5fe88842b4ee59284a1cb2dbc3ee0c4c5ff17a5fd6b9ece5b23f8f9548cf537c4dfb6d231c0e8ae2fa7352d2c6df9d78865418415fce33cb613593071d83bbc30ac710d2c313648543a762977d43979b5f48c2608a68769b2abc933046762736a42a9b319c78e98be5500fe55b9dfe9976654e95999eaa2dfcc090500c8155369f49f3b9d296db180268de2bc26e3fbb428803d9075a20582e075330aa8d84fbe36417f9a3ffc3204583ff4d2731c27ae4620cf065acce9df4e8c728dade6eddfd09acb726d27a7abf9409a49739f84044d6403f5b9d1855da0daab9d54e2ac26e4dc9c71e63da692f60a755902e9930c21ed5c3ba5d1afeeb892794c5c948a236a2e01066892cef70267bda3415ff51a404207f2f681bb72fc0a14e2720277558dc201958eab0acf7157cc78ef8a9c12266932d2548a559c401cb4c63b36600638a61cce16da6005fe9d59f6a7ef14fb2a4b860fd7b79f0a27b8a7d631075f6ffdb9fbfd8d2764b069f0e10b78605b25fdfd14bfa6825db8c46cb6aa0c976fde81a5929c92240e0b5dd8d664013e561cfdfc59bc7f09bd499aeb45b8623698ad7242808e50f568d830cbbe864aa4bd403dad6a4eb67c33d7db2180d7ef9df51b91bb946bfcfbe0d216673ec34bf2dd72b2656344311191b8b24b263aa6852d1fafbe14b45e803c2b6d0b6293d4f58de21f6ea849f3e8fda46111416eaf6b8284de908f28e7f07eda6d42e4f6196af945fc41301545a848d76201cb84b3be2be65d14425d7cf0822177be934488a439bcd1120f3131d5c78c213df7bca4f92d39bc4274bf0b984fe7d6a35af08362f07250d98e8941d7859fb19a2fda77481d13563eb44b0ab019801d3535ce9ee1b8c24170196a8d42549345bc4d8af3d7a12f66b3dbab325ba4451c345588878c697f16fdc7c75a0077c31b2542407d339a90db740a9f2f3f696ed9d8729c61d296e0eab52a95eb5d3d6f1a9207cecb9b85661128ce3fd6f53b205783c95b11f3d599639d66967729fabf5e0dc1d4e24d7126c73ff941d6d996592cf26a6f124b5a08272b88d6f9f3869b10a7adfba87cc683f2a99e695bc29220b611203e82f67d80ca3275a79004479802182431d2d7d8dc4859820d17c483cd94b0ea11c286fddf5766a048456390ec48b2d5a94d2a59a236ed193f14a9d65f30e82d3df3571bcf7883da9bfb2d95dc6549cd0b9dde70ac082efdef59beb75299ad178cfe7f00679b9fac03adfd44677b8991f9b2da8e3a74b47b4f41f9a063886073a19a43408362497250e8428cd18ed437643766577306975a566ea499ccd3b78ab89382cd5b0bd9b84edead83285a6954264ab6e602e018e69754776070566408719e16ed075d9129fee670113899015690b3696d55b95b15ce290b2a9e8aaef3b869c215de4e1775a480a05be21e2a699717c7c568a755f4411bc2f05800841284939d08bb3bf552c2630f541cbaf3f5e12a12f907863afc72172bc56166c0ebed4e904c05a767dbf47683af7f8b98a16c859180cda8ee3d92b143aad733bdcafc7fd88fce16c39667e9ad26b73a496de9f5065eee7fdf2e7babf2ec58ce83d3762fdfcf44f76aa8c48a32d546761c1011e785fa09bdd5b9b08acf3e5f407b1c733270d495005d5f8709fbc3b3eeaf3b4845e437ba8d2ad2c20faa5c7f4de572ec1357e9c8ee7fa2987529a72572b59bca31467a6b77720acc272529b0e00ef04331e143946287d0ac080d80240d2b31297687f56a7a199b8f49a727d40cd14b61643b6548aafb0d760f3867829bde610960df12851e32c8ad61a507ce824fffa4656e92ab12dec825104c5a19379e11a2eca89165569d0de12b25a9083a355172c34e4a0e26b32aea3ded77f04bd2a6df6f951e295a6544871a06c4554a645b2e29216b3131832b4291230a0f85af29c1a5bf84e38c0753d8bb381bc5414b458c9c5568837885431d5db43edb64d81ef9bce7c20d89a5e574f376600d3e9b356fb1a819b73f6bc16491f7f0af200b787359e5de299f35567888796ae99b3a6c82e2b579c8338da8ecd499cba4a1ea92dc8090487145ad6965e702f3d9ba5a09f32e18a507a2ba1b40342ea2e3c4e02c908c99a2ac2c4a25d08387d8c444f78a4cd6237c047bc605afedea209df85ed0924489209a3da321dbe671041d827e022dd97ced029b73f6c8bb503bdffeb6d326c6a4cf5bd3716fb01a0d3cc43ee43dbe5692049591171209b47b86154d91cabcb955646479ce9d11ea660c39d7b4bcf1ad8b459b4f1589bcc7e1683bb4966cfdecb626ae1379fb66539a3cd5b28e24a0ebd290d2f214307f3d39c64d15e45d5aa17d339fc6a09a14db59e1dc2f07d16c97b117712c468b1beae5037ec65ccd569262fc9b8e250f6951bfaa7ec3b0511eee88d13001c4fa091efe03e41be5eb09e2a54d56b166ae26b4cea5869937801359193aabe0d17313460697e82b2cce51936393b6ce83167c5eef9131b2f7d85893a464a6bbfe7072fbac1f74c5f6579ebecf3fc000000000000000000000000000000000000000000000611171c22282d35""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-b5ddc2872c67aee1328b8becc910a85ebc35da9cb9ac8d19f282096d0022bc51dfd6718ccc09f953319df7a435f6492f9ab11438f6007646030cfe2d41849d540e6ffa22065d712eb7b36a2974a7e566e8672554c1d5ea9fe6a1f122a6ffa98102dd59d43193333d38fc6a1be550672ff1bcc4bcab186df01a9584c52047693c35e998827c0d855f0274584cb09776311470523e6d35eef3771e1b8d553e19f62c31cf3022113314f25f322d6791a670766f95d3e21c2faa57e714b2d8dc03e28d77bf8d6a102cf218c8a4aa4fded4cf88ba4c9558c66488127b8e52cdaa10487fcf90515a5216d0ba6a6e89756c664d31cd38d281ced994a1b1c72369b82c2a49b606e3cec00fb2746ab6f2b53f7b4ae4ed2838e9d7d08f9bd1709d7cabdf1f3f4113f06a0c8f0c8c8ecd0b516b3d47d9133c3ae054262c7190f23c802fb760c02a3dd60b182be708cb158caa516165a0919fb0738f72bbee1a4a270967461f3c707e5e03c76f8139a6976a5602570f3fe8bb15843301a51625a664bb45af4e80f6beb7be5b30a93f1658443aef86ca794a384a8e391a1f90ba6abba29702cade0c31aa199f4d5e01d4f8f26605f4d1dc03b33e269f27aebe4eca4fb85bc99043ef37a2be5fe91a9c273e1e06e1b38d6ed67ab34ca81975f9e1eba3ae888cb339152b9bece9e90d57154f728d0511aa8d3b210142d11de874a12160d7d61d73c176f35f547fdfda27bd5d5ef1d6fba1aa881e7766847b920c49bc389732fbf636fe3d13440207699b0ad309f7ee917b84b281e9661f920cb8289da2a8b9bd17fa75db956461e16cc494c3a3c46e4f7e2df3b5b21bac9ff26930be68c92315ab527dc603ddca5d4a12f4517a20785e791332bf898e50fe3292c4f1b9b9db4b41c5daab37cc8c75f90d5a586d97d0ba0ea01d9e177cacdb3e5f0e6e9287d3f2fb28fc0e4561139cd41266fe6c861785eeeba1ddcbb6c7bc03a4f268e9834d64c555ed30872e8f0b5643efe0f62afbe2ad9efbc4843c5733838ae72006437c254f968022745a49447365f39d1c189b7a7bec75cf345cc62dda809e64209f2302a3942035d0abce86f627fa07065d064428c02d9a48dac5466175ce9b83bdfcdefc9364da1ad356ff962eae2c22d580e915c8a003a62a20fe204a7fb03fef5c0fa56bff205f4e3cc1cc54d0b27df5450b93261ab21f1e056b9bd913f10d5c57bdedc888a0cd8c3f61febd456ca9d6d9dcebebedd2b732c80d6d5a2a2db403e8176826d47d4e1ed7267092879e5a4880ac9a10dc249adb18dc763ded9275a2dc580da01fdd0d4c60a2a2b918f163d91f423e4740f8d92a1422494842b36189dec000118b468456f43f0c48930065472f71810040d4ce3ccb51c800e62e164367a05f80c3283a562c06e4a8f7017b81ef0b0df71081a672454ffadc60dad337f4170a056935aeee88b0f81f356302e8a577d9cff5ca1e812f9ea7fd01b97d4211686206868403ccea209dfd24b89bc2d437f9ea81e1667b09a2e0893fc9c65f99d7a99ac266ab92983b3c443675f680772d7693864e75071ae430ebf59b56d6c73033e6b00476c0f0a596351fa2bad14517671f6a73206d0896712b824590fe2ff7ebc591fa6d556252c59083622067a1390427719e6301b743199cf14471a551e8962415b4c64c2847f76013409f6504238edcdb4616bb5ae54150b339499b30bcfaa09db9a30b612282cfea47c666735d3ff2994eac8dedaea997c337157e34afe74c563ae5997415ca2d1e59a32a29be23f51b0e5d763a5b0151f0abd44144073602451380ee27524dc89016dcbd5685dc34b18a41da3c483c6610abee38055d6668e9a4d5548047a10128877e57a9e55e3868393814e8e44ab79a099b51694b6196daa5e4d7e8442bb59c53c3b13e899727ca79ff9153fbc9e2810404076f07c60537d4ae110f2fbdc6fb8bf2e73211d5ed153589799db063be2df9378a14ba8704770c141af838cca295f33593739a6f94187827032704e716736c3f9b0af684b485822cb77c87c30f2783bf3fa9d4e1ac2201f8793d85e60049ce8f6ad2c4699e5364f3bd3a225b46d713890cf3d1f7e591893c9563dccf566ae6f880cf87d198e6f2ce29cb8683911858b3518bc4406845393f0e7240470119af07f4a5747249af96cb074a395b21f2a4fbaf50a780e688e8acd342ea93aed5fa9256e366506240738adf50369381520521538a5dbc4b73caba8a52c5e8184d9c40c14f5f0fa8bdb7b93b6e95aef7e1c79491c90b6225307c3fe7727f928f85f728a9480410b805496cf605ff284ab5a160b3fcd9c97ee4a8249cc90e1def62ee4621579ca78760b63ffba86d70e32e642cf4d4bfe3e65d221ff3ba11bf8c5fbe3303d94dd464d08dedbbc3b6e9c223dddb17d84f800e4a4002946baa6e327028d7f96c1299f7b3c8d630a0c56df6d4724d1fa14158f48b0b132eb56a73e8861c18ceed8df1b12c11c1009be26415c1ec76752c60bd8e850ec2337437fcce7e54cb9d0725ab60e0991759e61371ee7f3e90214ada3e2804c0b41eb77910a567a775bc9f548d90c51b1c7cbcc13b7de64dd0912c334f5b0beeb47b8e5bbb8a256403a66354382ae881d794e83d3254423816bed41456acad89388babd6b6365878438066cbec43480d713e0a11aa85cfc9b4937dc962b67d9d286453974cc85bf6b85da2dede72d2e42ef6f02e3bce340a0109fd70892661cbbae2a5aee9a17222e713ccd05e4b1671ee0c7baea4930837083fc33038843b95570a190e60fe1894573dc3e277bf005aebb27212fb4c4f30fa3148840d1600a9ea9b2a2356f1d528f76b0ce13c4c0e700f6192518c324ab0ae21add8f3ab29465e4eba6dc40d8c8d0c03c4f9835d4a941b82ccb86f021338f4297ff378fe6873e582434c6da35d9b854db0a8beb1725e3895f333309ad31bb23a4fdd6e6dc323c2f83865ddea3b60d1d1828c816d305494be5fa15df73b9723d454221e9bb262f2671c412e60e1353f542de2aeb5d379f552b963ea65b630a3b35e4d1dde64583b48e6651b4891000da1339e61f5823390df035f596c25d8f8028b2203b446ca4f35a979f9dded0268222cd3114957d087692517ced7dd73304e1a3861cd85ab9abcfdeab0179f4dc4f58351243ef76215f989d73882eddee5c83751684877353e9c4c55d37efdd4e9f8f8a8e01e8910c5721ad3f2d8cab4102dbd604d8b304090e21afffbbcdf48a87b35499441d8ce0d9680f7f2cb147bf4f28d2b3ab5574a5c51f2415c34fb4fa9a2e97badb824ef46753b012c439ca057768e7318b1bf1c7343955b6a8eb434ec62a236440d83c985f47692a425619e3d6f197c9b24b3720b20dd9bb21858d14e00f577d37b1030e5c39d4b17a01007c32d4fcd982ba4821db371d0bc9a4e13789c8f7481f9a687af04a91a5657a190ec75a12cb973c6123dcbc728d1bcea67afe1d752d05ce6fd53aa510d541907276305066500dfaeae4219876cd42e039e009ecd79acd6cc2a3e4270f1f3b8d9615c0825a13227130e3fbf4b4209ce1aad976a7134ba93455121be23cb7ade9486b9bcb3414645fc1075785bbfcad4389b0eaff8cb54d69a6be42abb56ee6d5a2505fe3658cfbca5d020f824febd71baa578c3fd67e4"""),
-                    TestUtils.hexDecode("""
-D46F4482D570F26C7E9F0F74A354174CA145033097CED3896350DFCE8200CB9448F522B118698DAD51F6C672E1B12A412DB6B7B95CDBDAF6205DEB631E44634412F026CD95440258FE5F0C72C5F3E64FB3FD13E545DD856EC2B7F51AC28C0D5D698C66C700DD3E409BFD96E14A9DAE1677ADEF2CA2CCD178B826AAD3859E569541561073095EFCA329B5B216563D956D8B7BB918224FB479FF7025FD8168F54D14ED1FDF0B399130C6117B5645D0E8DD242C3C7AEC6A8361361CAD9A8FC3B5A40BF7E73F1BBA9AC7F5A583A5B0EB95AD0AB4C1360D0145FC2C3A9AA50186D649B72B41DB7EF392E663497B3166AF9BD0C1AE21650D6CD04DD36532AEA0FD1071D6E9554CBB575B2C1ACEA3DD4E18615FE83AA211F8AD330C78FD32D920ACB40627CA4AC80F840A64C019124079484B053F525A5403383C21B164D0C6BC1B462C0E1C269A1EA0B2438FA64934CEE47149C4EFF566D9C2234E656969C1C89A0B0A4DE124EB920FF534B934172686A18A1A269960C725940D3307B8A913D56B78A6CDCFD559FF97E225B61AFAE7F62B060E7D3E2D4040D8D9233A24827434AB4EB31B0D528CB0085953D9A1A0FFB748588A2DDEBF241F93B41F5C856159EBBBC6571AB12F4EB534ED3C624CD3F5F836A99C7E6E2FFA0369654A5C07C19D44BC9FAD96983660E4D6F95DD9C38D84DE11271D23A6158B685CF050121425AF91C6FFEFD0B2061F54CC4393F99857F3B9775F81B6526444AB705F9CB88A2D276AF2F530B646FC3D93DE7087EBC1FBC7F9A8DB3F3C8FA186F7B636CCEF99FDC4532E54F560519C94B79B1158D85BFBE23D4F36B64F8056BEE7558252DBB3D9A43748E2E6A338162F5E2BC0934E89DC79091180C93D340D3615F82E7780FABF782E5FE2B5D504F3BD1874EB5DB76CB616CC034D9B2B080319FEB8EB97F62FA4498878FF049FA97C56ACACD2414E0BEF018F25A6254448F02E64815E525AA06AEAB53969A66D453B732891E31C36679B5C0A4637611A5983F21F6D4ADA1DA5E890C909A9E968F947C686C17EC73A0F9BAE5C7BF7433133F35F22D2A0B40CC135A7591E2CD216F7D8018969940EB9A5C4BF21579C524C41AFF5DBC0E141FBD02F1BCF376DFFCFBD06F9CD4384E128CF1F03139C853CDD04DEC61EFB8F1DF1A6450E4ABDDDD8A9D85BA79479562A08CDF06BDDD2E740DE7AD9AD1016D72A649A73246E8DAE183AFCD6FBDC64B6B6B2EFDDF525F3B764CAB39BF8D617D47FD3380B4A30081AE6C3165E9437B2F37A73AFC5E596AA626FE5A32D8873712F99910DADD0DE296577D4749F88639D07F83B0F6A05B1668D8008EA749580EE5A629FC2313FAA2F8ADDB5764B242B6B595A39AD76CED4CE5BC34C580069071BED1F98CAF4BDF740A5B1DE3FD30C29DAD808537CB16D0EF22D937F297F50E1681C898375FE0374ADD6EA1B84C10261DBECCCA8E1D224A4709497CE696BCD2BC1369F4135E815A781EA26A055DEA28AFCFDEAF6AB1117085EBF6B8AA6845FD4763FF9274BFE5FC6E377B9F9DA8263DC1F3D53C83F446ABA5EEA4095AFF91F3BE30022B9BBC2C74FC52A3B15CC76F29E541A84C5BF42D499F9B5EA134E24F01E8D866FCD20B7F7A302120B13DE636F48FE8EB99F17ACC153CE4371B266CA61D13E19793CBEF12C0EBA9C728096A3DC6A6750DDB0F52E3807C22EBE4DC6B2407593A1B7BBCED799DC3EAFCE50B483818D903765A63FF572F5D4481357CD6ABD89EC260417306DA1CCF71DA568240D4FD6858BB7833B2C9C98B9E7286FA491F9E318F25D0459071848BBA0D3DB8D2BDDFCB7B8E9C64ED67B4A2B5E1E49B55C6DCBF93394010A078E6F52065AB777C7F6D831DDCC115CF316ACF3680BE8766B4E15574AA383030EDA83CA45B965836FB2374695B50472C4159CB7980FE48B58B40C6CDD2629FE3C6DE6E13ED6728FCE45024C96402B78BAF37E74A1C071F4BCC2A1B84933C872FFCD87C02DBE65438A3E770903A04DF96C569FA69828CCC32D13A0A419FCCE454F06EDE43A97CE5A9A169C6E849F075C66BAB418791778ECB2C158FC19FF5927ADFCA90BFDB3B4216E19BE11157E858610BAA373237B42F811EA97EEB93D735828B2ED092518160A2ED894BB108AD74AB0113A8D5882D99A06CE2313BEE3F902D5CE9CECC835974A47FCF6FD1648C635FE56D1B2404927C49EB53FBD625E0624D5AA04D6C0D5A082C37BD67F477850458B8672C408CEADD9A55CC268B75BC51D7B3D75668D52BB701BD980ED22CC20611EF618277B82624A1192287B46BB5C4468F94C68D96F3CA3ADED476A18BE6CCED70924139F2E16C8A54FD6C9F6695E624499AC8E9AF86A430AB856924A0899E75C1FE4A51DA0DE1588E66044B2465C04809272B2A5C8EDBCAE42B47E439FAE06938810526DDFF4B64C515787B41885BE369A31F90E2D6F6C71528412572A67DF6E155C3705929EB28B80DF15345E0E32540BA9AB7E1D1CF0C015E50C9180372C678CE6C34BDACADF45B0172A1D3082565E16938F57CE6B55D9A711CF72E362A2ABFD45B7B56D48E89A0079E973F597D2E457EFF423E229AD439C3193C264E0BF9A8A1FB50266AE4E0BB671817CAEF10A3BD43452A2FD2DCBB2481D63BB539E0C81F6986400D3A619AA92F250ADDCF661FFEDE7617162B532EE2088A87F58E1FD071F5D720FF1F72335A5B4582F1BEB3BF19DBC9D51A62CDF68A855F7F6DBBE5FEB226C9918E7FFBC8A38079E411EDB44177F843EB8CC1F73B9765A0EAD825B3C43F6760B5F03BB75DC7469701AE555C2B7037952180255612DCC9CD35DDB31F3A9218397E1924791D29C410D2E4C3F5549B7EADF75045EC78D579EA7948D121E8297BC5A3A9F7AA2E2EF5776CAE3B9CB73316170F9B48B657BBE365B352A8129130BF1E718B386AA27E493016ADA86C4B3D3D116B7252A747FD50DC14AA28676F1C25150A86C9F4547189523280A3A897F80FDBBA073EC645C9953B7F8CEC3BD08BC0CA5640545B08F728AA38A860ED38C068F0D"""),
-                    TestUtils.hexDecode("""
-4e4fc796e18a11fe191e08e2e59c8864e0040297897b07d4f62d8a003c50f26e7a6e3d6aac87899b27b308c206efb435b7d48b32a6384e6c733ff5f47bb86ab493d403027cda502831dee50a116708aa01dafa83fefbbbb7aa7411ed417620ce6b035cf27cfa6ad1cbe7e1979f024a436a39fb6a6db40dd21ec16b90a42f61daab8b86efd38ab87121c17fa77bcc761afda7d9196de6d6e4a9b45f32d9cc64ba40aec6c9ec42a4350f841c1e280d60fb1382540f5ea25ad4e7c72333d4a6a4c911a9bf142062a50c2c7f61329ec502e4b4295409392facedf088c321929be05caff934dea89cf0f13b771bbb7832b956aaaa329c666e5582d3e4c51c53bfffe1502559c542f5cd0c6961f1a8a6f4db4e109818519c85f781fc8b81ad4db1a2444016523d79f33b9deadc30030a453bf9c9f48b8bfeac3a563038544141ae621961de26af46860e0d80d4b66bb47607a559dfc34cedbdadf7903ae4271ced072c49c8b91aefac658d1482c913559325be77794481ef2ee6007b643a27a3eddcf29a89237c340867dd3a8bdbbc0a1c8d07586fbc8c3bdba699f08afb44d728376d12aa7547912fd9b8069d5d699773e426f6aad6256853c65a896b5266475b283c17e60dde89a3b79f6b8c262d418b219a9aee8de0718f171d31c24a632e0f9db87dd6ccde3e295241a1f85e439f09a8e17a8cbc8d2e2c5f68147c3cb0138a6b386d42652efcc71315ffcf218630f96734f0c93d0f7ae946a71ba6939401b7d60f9fafab00021628408c3cbdc4c25e2eeb9af29a16871843d124551a4437af15a6042a9b2ccc227190eb7b22eac650a5ff9bdc1bbe867e0ce4222b2ff68d042772f7035ba911f2c4e3f8aa094290584d3902e4e1416f11c313efe437128761e2c9bb160aa58be7f2e3b821c128d69849c6fbd2a4ea4662477491e48c482051ef8f9e1c62fbcb03ea8fc25134e59cdc995575570056cb57fa0460731f3a82af5441759ac4f7c1ab5f2b2f5207e9d1350e1d47cf338c7be3aa05bb9ea4ea2632eac008ec50d7980d681bf91d1bcc583332c949674cf42de62632fcfbed112da44fae1845ee2490801528dc5a9f14f226d18db70a744e5bfe097ae1d17d6e557f670998317d64b45be39b9fae81adddb53aa5c451fa9d525d8205adef6bf5a500adc87a0af2069db0da6dc56a0a8807cbf19172bf8f96992c3c0d2b4e83722463e6f6a702abb058c0f868e9d9080760f2c80a1f85e30018642c3c88b1489145de6d53d27ce3c9f1765dbb459e865d3f8c05afa507d6421f303080c77647486a0611dadaa0a9a58d83d0859dd57b492c941d47f97529d962863821455e52415a231e3704e8d208c15ccd4a1e5cd0c2b434bcf9f82495f0d94f3c91d1cb74cf5da019d0c2a42fd45580db8545366a56febec804a944ade29a2cf87fe5772b3c969495e304c6a7ec148651ee93e2d894342c830849db83f40d9908d11ab2c919704ad55c74aa968501a38069ab310945f0dfe253d1f58fb8dabea9a8160a9fd2b5a0455b6d899a22386c8e814cf50c0aaa35e4b0420c59c339b84332047c9f193de73a9cdaa6463ed2bbc81060a36dec8b10f002161dc56f2085ac03475a6ed6f7ce9695f8a0f4fc044d2494d632598d778afe58221e5d435491ebdc30c2a719f90ce17ec6aad77df11b50232bf1d4eed0195765e3d1c636ae13f0cf95984581fc24a699640ec5ec9374588f8d74baaebb831c219b4df35b73eab7e6e15bd5a17a2803152c0053f3f3aa8096facd15a4ba1d2e0d90300f548180cf9b9ffcacb0cab9d6e4877f7a63d2ffda4d9697149b61f8ccef1daa976f92889c3090c7fc5c69bd87cd39d02d2de8ce16c6eaef9ca623872cf4f91fd426eb23ecc9457ff881da1b25373f1f6959dc4986cb0fbab15f7ed3497896621dd6b45bda78b7ed75c7d38cf7e74443a53ffd456ca84ee9070421b796285e023b5165020d3dec38078e599ac79ab1eda37a09b67d4e20fecf31c0244846fe3ad9b5ff9ed2b2f1400b7647a1a12db22bc24a2a5f1becab6bbd4a911e0faa4f4758219c19d970d07c90efcf8f3de432f526082f73b4a6e6b9b048e00e9887c164a62f3758b8b2a7d0ae30ade451fb5b405fd3a7aa2454a70ac22af75b986e03d8de972814b25ca0ffc3335206d30a7b748a10ea20149477610874348c07fd45ddf69c65d1e1854e3eaa00f6e6e0018c7238c7c311285f1ab9c876c52d212781006a8300bc2ce4c3729121b8b2edff63b99a29a8bc8166351b84ad61b66620fc7d0d5760b6409e42450d5fe58ceeaae5abfe937091d2d2d022057b2bdbca1ff2c6f1413021611e09b3a79455aaf2512c6a3d2a949e45db154ad328ef646db243a3242440159f05ec72ee2f5cd2eead4885f2d6dfe23ddc70ecccedab451645e61b17e88cb39d6bf1f1600b2272e3fa523ee9b570e515d59c8e04ccda564ed5ac3651d206695a0b8eea30a097bda798645d6ce20164a2cae126154fb5d50ca5749ec608db68396d9b6ce620cd8d78b701d6f9dfc701a7900db628fc9c25f06e41a70ba6e9745c4be3c0c9b0913d2c584fb2630582cfa1d74fb598515a104423124ed855a9a900cd6985eca4fe1a921a43188fd87cfa5e9defc046000641f58573a70222f6bc22462fb959df93d1d5c2a2266dd4bb01ba465e4e301c26cb9f49ccd87f92b5d92a30c4e7e4583d95a38ba2fd2fda90c8beb60ea9510a43608b817a51b3c5f05275dea1a857e581cde0a5751a334c9e233353a213bf3f7fc38d6843c839cc06df3c6e76b4b6df73c9aa90bc24196f9668cdc2df584aa10dc8ab41882a532bfe758cfcf16f2e6d0e7ef2fc900a3e5f3e261b4062b1fa3aa49422c7c6baf56d0120710459b949ce7b21089c02a14d5907ffc10c53557477599d59d83f368d5ba349c3f3693da678f2764dc4caa11a669e5b703a97a908ea7abb18175b1f208e448b1b05f1cb3deba9b4f244c5905f4659c51f0152aff9cab8bfffaa61a98150425f14acb154e4db9aa03d73860973750377284c275405d726dd615802c8f4738799fac49515f8c04a9b2fd693d083d3ace8b5e872413767114fcfd32436181f30c25621bd6e808919c0abc67fba98af581aa4383133b47d7d8fb67de035f65d507aafb8e1908c8a3ab305b0b40ebb2f70958cd69ba48c3d0f94807f0159f3c3205affad6b2e48fdd54be8e5a7e5bfdb3f1599f62a52c11819b0a7852a3bc1a424596c4da3b1ea7e6e7989d3c403979263424397ebb5b5a739137c1b3d1566ead912214341ddae970955904d9a5e79a002e3cae156694cd895873fa5559a7a9d21f090ad77d09471d0d00f3ea2238043fbcb76e5ed947a3384b05b838a796410b87971f95910bbee1c6815dfc9b3752382f980d48db75e28ab8efd094046de4725c802e1c3de5fee6503d383acc450ca7d637a1b5a68d7f099ded08791a3e845b0a8f6dbad10395b76745a4576bbb66fd6a8750a83616fb5dcedf961c2aa6d90d602d0526974a93ea30b26b01245c74ad5d060f8cdb3476e2a6c155a676ffe0e4939790daac867517a48271501a702568e7b349507db9383f6001c596077f82458291ec65813d6d7306e8a83c36d76ccf76e7531823e8ba7becaccfce8ff2e25504fe2cf86434d81a43b28daa7d479ade72e302f82030e240bd61a52b84b372d460d606fb4b2f649bdc51ff2cf379274e1c6bad82b5407516b792d7c3cb6545557fb2db306945dea8092e7ba6d033afe77833375214c816a4c463374cf36cbeb77a12ff095e9bc4631a3b459273bd3494b1cd49493a712bafd08c6a4d2c866958fbb773eed52f7398275128622b7436a39eb724c28d70f55694cf22fc3ab311653fc7c210265fd6eee872add33250ac495a2f54c9bb856d1ec8704c1c9fe0208a312ef3a08445ce3e9b4db2ea1c4b1ca4e79aa5ded13ac3c7fb69612e74255e0e6cc3a063d28b8e883fcbe3fea5db704e674497fecf7ca75110199434d79ed8102c510d732e612a18a8ddb3384b60f19aceb88e4cc35cc4af247edde5c8b26101db84dff825f9878761a6e96e104303441b9954091e5406aa9cf5d8e4010b4c075c374cddd31f471f694b3b9191a1f3d7e399693e235898bedc55628de4fe245e59fb02ca5fbf1944ab74e2783d9c9fe59f0e6f0de1b2bd70ced8f5e87c732c82bdac560e714546afa3836b73ad16373b72eae416e31b2ef999b2f3fd13f6f52deac065d0de6562cce840ba490d7fd1121d8fc66a53a27d3cab9db374e5b96d44f64b11232b2859df9468286f268bd4f186d434ed3b3c807cff498d1140d7d4b018a03b7b2b86be6c6b3a76a49c94a821989d2372744b1ed2e93e6e978c9cdd5564104d6ad141415ebd06a2559887af6b20f6b664e0bf7582d0dc1ed3e66661ceab0533f4758ca9d9c20211adfbb18a7eb7ed460539a48a131c59ead08680e8723276c1926a35081573d4e0c057457047e0a8e031861e5305e04c0619a06867be34f58200e4504919916c0f85945d19c7d2b2fc20af7c058e5f99fcf83206607f561e9619219da8867c73c933896e24f55363c0deb0d258c3f05c3ad71b3c03e2005145a6d7aa4546d53dd24109f20f902f7b77c8c475538788d3c0d0cd7cbe07706e144ca238c08b3f95672b90076ed237212adac8751d335320d2ee0ae94e95bc7f5c27af3c8da67b8b5d3630c7c6d006ae3ee184b5ff781ee470b7a2a9fc87f5d64187538100fde4bbd67be7a2f9c25c4a6f8e0301595963c280457395883a80ca695e98af29f0ecdd33dc3b417d09d0b2d01c5e074cc1abaf544ba9048649525f59ed02df6b9baa0b61871c4605678124cf5fd1dad07e892d2b8c0b14c0a9bf031493aa304bac36ea200f8247305394bef54f4608efad7435ef3ed5d5f5393225587e1ac3123dc1d92ee383e17d74f0ecb1bb025fdcfdbe7f2d41d0708f1ad2f766ebf69f4933ec0f8ef6f65abed4d883a38e0127530e8fd6ea36bacf454abd510b1ec49dc1d3bc31bc7d2b76c949a24cbbe7f676ba4677e19198d86ce72628e26f56b7c595cd07daaec87602c78a7838ae0d7d03a8ccaa8f90fc2f9e4cb9555d096bdfeacf4619eb3562d91a5414d2a5ccc90b565453f03a0f08d4ab41e6542bd2c687f62a9f41f348a7382bde0561e7c03700b0102962314b014b83980eb887783858a0c2e7818e7c7435a02c21a004360f29097eb414eed5ad78084a1f3cce2112639ec7f9ee6efaf166b3e31aa4af7925e6866743ff8c22d865f28ca97e47a3c979d0c2ba32eda8f862db63e07acda1757c8c7aa4b61d6011f5169f0fed9638b3662af701e486fddf0d599892d4215ef4252dc3248d9fd9f5ba3b5fb3fdd9ed601ee2a1b2192a5e01373441004841190d4a3b44eb80ead8bfa9c541939732913eae7904374d288645f4d5832691e338c82e2fc2ced10cc75e353103f383cdedb81e22ecb341ee19e400451ad3bbf0d10181a796c3063c66b1db825ea00e197d7b41558eb05a18c8e2accf0592a331055d5d09e436983efca0c334919d44f5cf729a26dc9c2abaa4c9086c7c0bded5814de50b86b86408473172e0e90d5d32fd6f93621a37abe618ccb7dcc2df0573d4006bdc0d832156c82735bcfe95527dd6b10e71f38e8b46ecddaf6eb7175879b7f843d821c7edf653b776cde1d389db91c3333a1c733dc45ead2f72644e125e4e2c7694dc4a80b4bb594cd052b470afa7323c5d9de044e9de8fc307512df126e794fcda65d4906ccd8caa5607eb203d4d183569d9cc530bf8db3989b331c7b4372ad0514614de405634d8cd1dc603189bce42e53584dbd7412dc3a7c9fed69f194bc753f45e24a289db30970a9a68245cb62196cd8a36a02dbed39edd9c40f4f5e6412ea5d9ce4d92505112f6dfc1fc46d0e83916693a35e01deb29b5c0d08c9ffe75aabcfb9af18c35e04611429e52285c5936f782c11f2b849280f009d83911bd6ed58b7c0ec9f8d822a538db8492e5f410020973536cc460861e41515c2e137d1f373e6687136a5057903e1afa8aa7700d5e39a23be933e972dcb1cd67ae7edd452dd3d229d957c5822fc1846175d48a5dd25adbe1963048bdcb5ebbea8bcac5498e7d805a0746a95f6ba9a8386c387d4ef863c424d62276a90c847e9019eb752ac6d844e0e45d78aaaaf567af013c3bd313ef23e06f4fc751537561ba52f7ec15cd460d8ab9ec917e1e33f175c3c1f38ec99a09da921ac62dfa458ef2d0d15d4669aeea8d797ea057ccc86431b4010f56fcaf4e7894b97d542bfe0321886333608e9d56674c8eb885086e9f312c6926713ad129c6faba2b764e4646500b72ad52f4158a071e0c0697dcd50bbb17b4689092a36bca28b1c6c02d39dae78e2484ff6b00ef8b5311cdfbfd061884d23dd65d1b0ca4a9aa491939e13202b515d6c709ed4eb0b86c4ee45484f84b2c8d5ec485686999bcbe0e746acbce53977aaeaf400000000000000000000000000000000000000000000000000000000000000000000020c10181d202429""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-dd746786f61c3e55ab5c50adf85106c1e6b427fcd102ca6495b52558626a21a4fb55fe9ba5eb91b87bce568487ebcc93e0a21fedb007f71d08cfd354477e9037e89d2a29f95069de968d619058963dba16a62b6dea9d773f7c1c269d889c622240233a6a092118c0545a06ffd50ffcb1dbcb5750aa4afd30458502c0d0efd753e7c86819353c71287e31de22e48a98e69c22cd25875844cf29e9a3e19749101a7a0dcab9daa82954a7a9106e274ba1da75e46f9d80ef302b52da908eeaead2fcce93be69c2c62532f0a666d6621a616767f2397973949d7b434773bef0a03c9481bf2574c225b5be10edee03c612dfe8adf07a5e1e6abda7168e04d128aa900cb82687d5f738969360b03626043946caf151717d27a1d3d0172696b9ba476c215fadc652d25298775fd4d7d3e35261d58d081d5393851b955b8f09aba98889fa54f78267d4289043a041fe871521e7f6518ce67a0c3e83ac47895a3fab018425a0532987855d4fe4a549ad372f1aa9483e3c6fca47beba9e2e217d606684c92f56709758f3da75929c37eeb99c031a9b446319e79f07e5a676275a59ad658738634ba8b8a7f8ce6d29eba2889c6d2b7d1914220e60137eeda3f6277f1399677c149fe6cdafff59fe1e31b38c863ba140e35c88fe8e3164b9e0715ee9dcc0815a4e1b3f4ae5b0ef18b1b76501f05d1304ae1e444c62899e74588cf9a262ebf2721badd1f3b684f56efb78cd38845dd3b0f417bf3b3157464b96c04946cd825b2b02278cc88173b7415dcf35ef6948087c84fe130c5a0b28cd6b0c45c3989050afa72c5b406dd2dc4d6ecc65821c716361cc8735d703073c50536e7aed7430eb35be8ee3d193812846ec860b9a0d363b83a3ff8415e2a9512a09fe671945e5b32702e477ba1870a53abd27544af0b431353d2f09f323a6cc69ccb5541da3d29ca3d6608b98640bbcbdcde5979b4d6b7a5b829c10b891f1b4f49eafe6e7464d78ec377b85290889bfd5cb5aeef23c9d6628834813867b7969b6382b9c4a18d81723c8c68d983009b03a1a8c269030d8eef2f84d5b860e8cbad943487ef691c78027e41be206c692e3214a13719b45c2273843b042711c58ba8711d31c0e6055ac73527de16afd81ce41a2882633a8b03fd975c3579fe4beb04fb6530567f5985954702e45734918adfa15431e33f65e10b8bdd9a7ebeaafc57562b47b1db5fdc8436f07c00d1c04d598cb6191c0e1fbfdda1549e5e0fcea7f27b6d4d34296eb39958129dde5b7e61eaf7440a75c07ac5ff2c3c656cb8d424dd992914f530984ed09c62b067f419fcde877e6333ee1875ff5188c7c35921e2e803f3d6abf93ee58326cce90fc22de31640c46bb44de19c20d72bc7672d39a02025eec9010defef580152c84b3763227b1958e2200216e9983dba36009ab592e2a2c9a80084a3595816098e53c424522fb89c154087e8da923672a3a9f3ae7c5225cbcb1cf9b0eed8bf98633da2b4bb5bbced0c08c81fde4156c9c6a5f8203bf52ce662343df25b5dd04c9fb0b814603274d503d6c1c335f71693830fdcb18f14e358d9bd49ec412201713022e00496674d43fed07068409cac95236b117943822590a3b756d9af2051ace8ea5933df1fcccacec0e291be9a4c65ec0e2b30a27768bb41eff2ee1f862ba7274f0a473125f9182461ecddfdbfd8fbe891822f088659acb0f1f36776ba219c4bf07c2a6ff9154f98c447cf0292cef0b698cc91173f5d94a629db45ea1c1ee1de5cd4b29630756fbf5b5ec7afb33dea594d45e7d37ded62efcd6063ce7a33068ebdeb4c444accfd8915bb24eacd7c5e537d4bad580b87a6273f1d0fc76750df29521102fc83ca432b918d9b66327b661ae03363df65256e4d642b55484dbb5203223c957940d3b059c822aa036d6e77178fbbc54fb020df2e81296ae6a7360ac767e2e88b74a88830eafb203ce5837e14a083c46de3bce7e0eecaafa5e7de831564191a8b9166c36df7d6a60343b837aecb8366de91509b54d973c9d6d8b5921a7ded1f2e431fbaeba893d4e5b9363d4bd737ab270cbb2c6d5655b8dea2c4a931a719428f3e9f905e03d885ca15f3d1647cc26a6bf91b7ca400eb3ae4aa03445bce54634cde581b471e3c03040413a7ac5019a113749918c1c8d24c979e7914f677f5135a84fb0535b6781e5bbd96d7ee1cda0afcaf28b1d47ed240cab6f2388e3c826d34fc13adfca7c41d6eda4ccf7021f2121f16057e70a1a68c97943dee4260e783babc3377a9a4a73a4393ca57ad398904f116e33fd83ee291c92602696c5b3806bf5898c4e56216be8a7691cc80c2563cfd1df4a06e437465f8a155a795880c61de03492bc9aa3dc9c6249582ce894b7e55ef06376da4088ac64c4bc227099c2ea30963f99ec6c7149d233276f15f2f0e21af7fba63c8caf54bd96d674f824862417273cfa7547cfe89692ce254bd6986a1cf52f480ab6f4cf8edfeb676fa4bccb0dfb2ddedc87c41cae31c5699a2a6cb413434978dbfe44025a0294db796a8c6e892be55220fe5e2be391366f7506f78cfbaa16f7cf43384182743fca7861a3d4c7af134037e297a55a5f1abda942dc1acb5a4874e5af451465a6dd2840545e9dc9539fffbd34c8db9834e7a7a9a5dc368c80f33ae01ca4453420dd9de645b209c8bc3dab783d7ffad5da47f318bdddad918d4b15608e7681c695418345bb64f67f5c1270fb97708b39973d8b4aaa2dc9c66efbbc6bf7239d781bef6885b8b35f11ee4028dcaf58cf8e23ce27a1b0426087a6408c43fb97ec56565d7c9fd7291ec8d24ef6b6c857f5f830d3a032b06a89f2ff23e62ec34beaacece7d4bd2ec04d70a2586694e208909d0da2190a03915b853bfafb36bb6eb6e9b8386f7d1ef8425d98c0d2af53f50cccc33a7fc4c8422e202038e320af2edde374b80d310f2972cf1cb80c279cb55668a298c9fc4489dafd79361aa4368c8e411b360f5c40eecf727a1850fc8522b210e39a4872a3207f2e73ea761e235031a1c2e33a337a6c1e1e365379fc96c3599bf8ba1af7b4b1000e7b64ead57893e24564201a04416bccc1ebdd8826933e0d7ac15f0ed8e70939c9660d0a23711b4ec8c1659e658e1165d2eac42f99751b4c0c2ae1a444c0e61441956312e279ae940914edad7297480fd44ac29b6a71f97eabbdb7090c3cb45e4a78e223877867227a9dcf8f2476f92b9329cb674b4bfa14079fb6b0acb38ad69dfe947d13424b0820e7860654d2a48dbd09e8d29d2ac1a51a6c1b300a536ea30aab4e26bbe287e47b2601a5822b6aecf3761907924c0906a1f91649b1bab2ee5e6996515118dbd0b77016c1a5622496d2a22e40f66be9963f6cc8f7c85dfbd3402b77b4ca78c59c494ea8703d5a656732279add7f0350bdf0baefa88216f9a09d065a339fc2132a07eb0019ef97fd0663a4b68ffb809f771e95f279f57e3d70d0bef7859ce3f22facd32f4dcb1787bc8a00f0e547c9d40940bda8aa13455e8a82b0a5cf4e482aa422cfe55d163d638fcac3d4abef3278be141a9c67d1588441f5b8c5ccb5930adb6d323fb086834a1cb5c6d2feaa8677e22cbbf992cdc742af799d7d17f0b30bb0f36d6ef7ac3fbe41d696d4896269a4c64825efb9b412d6fe4b3f3ee1386f2b5f1750"""),
-                    TestUtils.hexDecode("""
-78A2B7A4C8441C36E0A9831F65D41773FE6B81B3FA6259A320AB03D460D7E38F4AAB2B93C6142FB0F9584E4D47074670B07F3CC4513675A4367EB8F7F4168F2EF7CA26AC45C8F23B2FD3E970068F21D9A3F7EAF005DB5A7157715CB94F5E83E3C955DD68E0EA689B6F419FACA7CD159237085678FA5883D5330796AD64627CCE7F913D1C2259E1F970E44988B08E78ED1EC01CCC2D0274067100C1C1E3D880B9CA4F3A1FBB345354D4837A6E5FF4D5F5C87985E51C471EB9B0F85075ADB57DEB53A87D85834167A4A538134CBC24FEC2756F7760C3D46248D5BD6022D8F88CE7D037935DB74A6440DA49B97E8FF376101B296E3A9D4D22E70634CFE88142EE5FB6A33F323519EBE3A915AEE5BB687DA4A5E264C657438B0F6AC977A22D0E56882F74E70D981CF37FF0C57D285D8CB07ED7FDF6D7CB1DD39EB0D84F2999DBA9273E0B716CE754A29CBA2FE32BE13BE8B9F2117DD7359494A0E0CE623AB9ADAFD3F15F644545A39055D42C6C5FBDB46D121308D649AF9B86A350B70F77A977C8268FA1E04F4EFBC2C95A2D72BC37E558F0460BB281D33F75D2AEB240086CEB8246E8A44416A5B31EC58AAA88246D355591BF7C622CBEB1CAD3B785026CC04C73E352DFF28D77186CA93870339E132D57B11F0154E0CED426DB31BB2E125C5635BD489B52C5E77593145D3100E48CFC8FE6975FC3F60ABC7FA4A4D9030A2CCADA3854BF9AA213EF11E2F85E9D4E79CBB434C65ADC378F8A7DE33E66B4F8588B73FA7F79AF4130554173975280879FBE0A59D25B969FC45AB20401CBF85463A83578E63D0C8324878F5CFAA191428E7EAE37BB17A18D0459378CFDD4C8C0B23B1429950F054DF5C67174E99AF9FCE6B0D8C98BAA9078D2CA87EB8A014995FB79F7F49D78F2674839E14C8F74588B45C28E4769C439A930B2A187764D87D71200E841263EBF74F7428EC554C12A7352FD3912D95C96E4BB1D325DECEAA9D6FE360DBAE7AB897ED467A300A8F4C6630F8E721F24860D1FBBCFEDAFBD94DC9B4237B91B243A01C41D5E98E67B52B4A8CDF0F1C985EC0EB85131F5E970A6DD6D4E1F525D9D94530157F70B333F5E50B1B95D569A012ABA959456AF773B59BC2891D745CC036D06238AF3F34081A20F00A831422CCF6E4593EB56CAA3B7DDF44B388CD54E5EF9E3FB8A260847BEA5EB5FF9665530A4F4B56726A4C5E669904A933AB1E56C020967FE61E72185D56B38B03D343302712FFC1DF9D857C6F744E3ABABDEB3F65628932D69C65FA112AE3F7D6ABD2B4C3CF572EDA73C959637D0C5C188343415E9A26E698170F8E31CA45A8E6E8E96BD066BDFDFF49C98C491149D61AA7C456D3DAE0C017A32B81CD5668A400127ABD4316F3DCEA171C3F6A3E99B398CCD4AA7E45BB51963C82C43398050B8923CAE2D4E2A2FF5232AC8F2C770C9A775F29C261E1C7DAF54F9FF606560F869638B666C90112B29F469C3620B0912622892A432EAB443F8A93E3E7953235EE78CD3FCDAD3F1391A2487DA621526EE92735284C347853D5F65395ECA2B50B0CFCBD988F99C86B5AC56ECB82813A93208096ACA04F22AC015CD9860889E9006DDAFEE0B472FF7FC3D5677EE089B0AF7C6C2FD5A322D60BED621B8F099C30C2344F453320B6FF405639CF764B101E1CDBD312495C2D4FB30E2FA7B3C345B9935BB28EFEA69C829EB57BF2E2E5E42B8515DED4C32F9C84C33DEBDFB345A4BC592CA56A769533FBA0A631D5D0E07DAEEDD2FD588FAEE648B6391422924D28D08B4CE36084C20E827E6E73A97852BDD7508E1CDC1630094C9D3A2C8517A25A244FBA388EC7DE2CFABF139888EB7372E2BE3BC4FC71788AC3CBBB3EA1CCBD9616E76F2CEB356C13257A8E5490F3C4F7DBEBF942BDB941937C956DFADAF3A78903B49C5DE34F5EDBF0E98E3E04E51021B686325955C14AA335427C4A116CFCB3B89349B1258B8E0E354F13F86C86E5E8EF8F57D7B7501C5D75B1D9615D942B04E1FAC4EACE0FA10E6DE9B9721EB0651EB3C9DE4C61EEAE7D7E17C0D699EBF7EEB122B8C1A599A2CDCBB9B665DD9A653698735D5572EC379ACC6A8470CD7CC8245F871C83E6FD92111F5128A9797AE802889E4362104775CDB69FCF37AAC22EE4532FD0B5ACFDC4DBD56D9CE8B9EE2A8B923F42FC512B54204CB971BBC9677EBC49D287A3F68A31DB8AA49D6477B287285B88AF298E68C6EAC3C73FDEC94F7062D204AB310686144168C155281627F78C883AFB49DA50C0F5139E2A0ACB9A9CEFCCA39C6F4F0F5356D2898A4F5DEA78FDD20B79662F4D066E73EA4069DCE6CAE300B3028F15C98801912A86E0CF34DF53F7F6E1868DAD92DF22A238C710F471596A49843D3E60E4C381F713C21C3910ACB1515E5E30252C94F040F00A9D1A08A4FCA329DFE190B5464521BBAA32932022BCC5E119A96DFC941965CDF3B739F53DA156553C6BCD72927B07CC3CC945FABE44B7348257A9FB41EF85AD5423304E016E74E03D5164D9F15838C3A4BFDC29C6B9F134054B53B29183A6A145CECACB3EAC7C18E31CB4BF78BC8FE60A3B8EF880CB6C1EFE7EFA8D77580CE200ED96713E32FF23B86CF532D8EFA2FFC8DB1A9E65A78EDC30090E3DC02475D84F8D9F2BBC48B114C9E4A01FA79C17FCACCAB1FD304C7F901942B9EF57C918588C9CCEF0DC5FCA7AC84ADAD547982EF9E855F6E88D02751E8E7B8B76C3796F94C9F7B7C6860042A3A33EFFA55AFE1B94C97D68B76DD240346355012F036DA9C7E025C3633CE867510D54CACD36D8638FAA8EE47D315FCA9D5AE4BEFD6150086DFC368DCE8DC623ADEAAA07287F9B291252628F1BDBA5FE6DE45129509651FB048D3A686FFAC5F2299AB0133FCDBEEE8445555F5C649598649678847FFFCE6E0DD9C4E75E2F6E77B1CEE3A1740A94E678C1191EF46FC4D9648887DE6277B11D4C242DC4A427AFAD5459BF213E0A20EC74EB0C210D0A922B9E690EFDCCC2C160E011AB94F709C174F22629969B6332738654A133E8A13EF7C914CE75ACA1C37DE05A84708DA741161EE4D23C025B405CDEBBAF9040A1CB7492294C381FD069C4622BE1EBB0113F25F4E1D5A415C121055CDE5616662599C2364481BCDD35F7E498E80D2350AD3B34C205C5EA73F1B923E6197E07C502BC6F4F4288EB46013BBACC49A5DEE5071ECAE62B192294E904BF3FD7BE08F0C43E3EC6E23A7F68115FEB285AD388A0F8FB94126EDC0331834179C1F10CA5EC54159FC256D7E0AB3129B22E5AA5D662C6A03C7D9A6D066400859EC2D5B091C37E35DE31365F5125793E7F653013C722045F7292C014123246D611A7FD59E9B09EF24221C7EAB249330C91BC9F4D3A223D9C2CBF7130C5C057961BE89894221AFB1EB27A4604BE310EE3C395E479D852CEBA4C2F74D4DF416C8836861BC13D0692863667AFF8EC89BB9194407222589E1C27B9D59AC49131765273228E79C2933445B83D07E48A789FD6E406064593EFBAC4FFEE64614C5AB34E5C2A717C50AFA79A96161203531C161E46D71F447FD28CE4AEEF197A3DCA6BCA306AF09086D6BDF35A861820C469A40958923BA824F3A95CCAF8531E930210BE46D66CF7156EA0728F3448292F47ECF20DAC7C5E78A2A0AD5215FF37594D37A2AF4778B15BB1B5C4E0A44AD5910B62CA3FAC5BCAA4CFF5BF97C8B8CB239126CA09E92492121C9E6977111E6E5248661AD122C87007318BD3D98ADDFA1B2CD60F12AD1E072643FCF82C630C2093CF4A75B2D3F809A0496727E04AD60F14CADC7331B23D9CBE28EEC92C68C97E597C2EBF99F2B"""),
-                    TestUtils.hexDecode("""
-b9e56f9dfe73c5da4ec32b02af5fddebd5c84e216deae6a4f8611a876fa4993b9b333360ee00007dbb16bdacae8af597cc2d3a82359d8dca6582fbf9546b31867497b6cdf6f42ed3b09cfd094672218c40a24c8905ea468ba91c02c677a45abf5aa0421bf5bd398fad978fddc4634f6e9d36a03cb3d6eb64ee2c35f85481b1c4bed1b268de1483ddb4896a89bd9853c8f5beaee8b760c8202d17af8012a859f30c3023507d6bd8e41476174c2fb24fb1c944fc525b35c6e81d090c69713836e236b12106e02792ad51000aac32cea27d42c197e88f500ad336bc6feb4b79dbbd29a90c6e0f30011821357d111ec1cbb395212cad14b339a40fd9fce06bea1397369188c0d79e112f8c453605aaa3e28afb24730578eb8bc738d1c8e699fdf40438a16100e30d023b5d5be050a934d84d735a5650e2f599a52d36d1f9bdd91e46316bd62e774bcbeecdc7f43a89fa59241c12d2788ffa8e7277707c7df292da5141167d130aff17369c49d978add54af557dab19e746391c9f67157a58b4efc7463ac0615368006fb12c3554ecf35902e5752dfd7c34c97846547c3da9020ecd665487607c084ce909c2b7719acd1c3768ab6464c07c17e1329608afffe63a4ca07f6c9ceb74605c02772615de81364524121f8ffae29360d69f8900e5e9fb628e9ab0af8200fecff1ba1bd01fb6f1470a3771ef57d9b8e8103b3c2201d233de6e6602d490ba822b8eb4ec515c46b7b7dd0bf95cb7eed44573cfe11c168217e32961180d74e4f10463a5f38404540afbb48b21c878f1e7cecc13d664b03fddd6a33bb4d8c89023bc54602acc1cc434f5886906b5de13e89b5a414ba0f75d8253bbe031f2d82863e4e2f85f882a8a64ccc90a663ec9b6abd7edf2e8992f9aecb12a24acb52e0b05dee0803f521f833d0c0f238b06dd530c14bbe9a64a38198ce98a91f80358e6af37fa804710f043e7fb8cb5562f0c093d40c57f1b2c476520ab60782702d79423c64c874ea0ea0f4d9bbcf029b54b11bd114d50ffd80f38b21b4caeb54e9b83e0fd4551b7d56aa89ff0ea546433abc7e2b71a1a73897c803709a85b9f2c45996243445b089d8b3a75fce6decd0c42d622b52dedae2dbcc83181fa23a9d7b813127d58457f03b5e0cf4326188ed9bb894b9d468044897ed7397bfb6634808687937c8dc0d9883d9926d1cd63e0755ab868ab1de5a6d8cef72f72ce4e183d626605d6ceb6da8bb821161f3ad12eb124a1f09789b67f71a7b5819c3a285b7a8027d1cbef580779444dec21bf6509f27e7286c9d8274106cd3ad0baec6fc6f40fa3bd30a96c27d48280b8f051ce1679ea89a4981d270cf34eec5ca1ac399c422ff114232e68601d328f4a4c23ad3d52843c963b21f106f82eb38a379442b0ac389c59992c4326c9a54573b54ccdf1358389346df8c5d8c4064dd216f1d5e8f5ffe31205da0724de69187349a54b916fba25bbc4fc9b4518c57d5b715bbbfad14e50f8f48c81baa2246712b02cbc6f83cfb0e033ea90734495c9f82d185038a843a1f2d0a40666168a4df0b8e7c08973f64c4af66006109fe69a016242709877801e73319e1b2409825f9d827fccf2001b4dd0a4f455a92a58d13886f5ce9efe226dce7f3b4e817fb4f2185eb328c3b20192cb01901d5563b83fd7e13d0fbc3cde890cfccf91abfcf6c93a8c9ff31bfbe12a592e6337a0451983fedeecb6ed9ce67b6a3628fe15d9d6e8281097f8200fbd8742eb1138d3e6c70c1ed95c18d156bd9bb879610c28e5087097dd4a40a102a400b7ccea6babd3c419436024052a8a3c6c4233627d967a91bf700e10687a30316b67379fed8f4d208e27cd811cd27021abe8a295245f865655d2956d60d8564902fac029b65a337aabe99073b70162027995799552e779aca9ae9de29a458d6eec2f8d2fee0102786381b4ebe8707bcf9400c0241b83a4724f81e776b996c112226b8c7e1f5c1d090e9fa9b88c26445367935ff26c8d3c08a2347851a8f40b677b6fc5503a48f99782bf182a177fff9f28b5f2224b77454b545f018a131f8a9df7c61f35ac74edd7481a4bc18492cde936d5cefe03c96fe2f60be3edbe53d7b5d3f8b883523ac6235fb777f1d7a41906dbaa1727d1defeb67504a482beb8ac2ccd9261aeb746f422b5e9a11cc21ebd22dbea164c46e59b09bfb5213576955089ade4ba711d4f03646ae86df0c5495e0b5b5356d55628f40089d4d78ee33ba6f0f4080aae73fb20b47e979ad7dafda20c69925ce818ae62d2a534727d146d8bff6276eb02a52b2d56712da8cba1c0b48ed1f3e180d1bb4c365d6f14946b5f76147aeae4c55fd8be9d11b4633659df5a6a2e6dbcb56d32c7bbb88fd102e8515e959f322db8b6ddb21bad4a5c345d43f1b9a244a24578c75c626dbafc3f10e65e023783394a8357a6d5e005962af2e2f8fe8757a7cdc45823b50a0bcbbfcc6a46809d46ad639e918c97d1f038d7a3d9d87fb67ca95023d40793f96aa31c4bd3431d997746d305579495e41fd4d5b08cba5176924025bcdde3e36ff0c7b04b1b157021522d76e61ac37cd4fd8afb8c86609afd86a521f42b6e1892cf64cf278b02a7df422953e45c49cd07b9be6a0694e977d8e38b582c353442e850d488e26403f42fc2b533247eece1bf8dcc3808592ca51e100e71b50ea0714652f15c308b59d2b5936168acd227cf1a069e607fb6fe0fef48d582811106aaa4eb93ac836466319ba1597dd6a21ee2221bb0a6c068aca48b10a71ed42814a5273347e176c860845445c6f3e8dfd85ec2da37cb08fb2fba67bca6ecc5616e937e5f24464e22e4a699f27ca0aa321162bc5dcb799d4eba8f9725f9240dd2a10e1057e625f286bb999db6bad91f53c7abf54ef8e8a7741d5528f1adcff8783e69c535d79f279cd046373a012da01a3530d65c5aa3d0772e773dc7e692d0b8e17892e4808a24188c0bd48dea755b98a92ed4d8bc9046c81c9bd9800d8ebb100baa447a3432c4de07a68f666177230109c733be367d73c724a118fb665c858417512d91e993d83047622a9f5594a9e91467608b62c27bc07988be98187ee0ecaa7120d0ed54531fd9ccb17329b033b1b9c771c32a2bf99be223271c91feafc475656cdf78b4acd5226236cf50e9a4e79d7b4b4d9cfd14622a2638fd2c634acd4ee0b91977802ba013a98fffe5d6744d75d1a20a3cf3c851387d08c79d9b6b4dd418965eaff722b926c02f1a06563f0d963a2e6e99f10228152fd2a6bdd6468fe97955d4e81d0ad1f0ee301b1fe33c6935c3f5f8d4f7cef773550d32825b7ff05867c76e9797c71aafe5fd6da4767bf4f8c1a62ccf588521157c252c6d5431c5d4b1f15fe45ca0780989a9e99b7e1ef1d73cab9906a27f7d92609388d11b6381a9c21da36cd5245b2c9193dbc1c74e7967ef694a0e928720646b90a296dcedb5de5d90541641220e03e2abde8c2cec28ee3e7b04ef380dc913ba595c7c3352a5edde20b85c2d2a7525035e5f6db59d82a01768c7c1be0c57ca4eb389d958e0c96443e60fc6ff57a1e37c3bd0571215097fe26a87b835da2ea03c83fdf607ce72e5c76ec4a89e1378cc042bd70effa1e823f2129feb64e5ed7ed216c0d37fdf8d42a5320dcefecdeb28e99ec636f01973df6610767341da3233f1d2d50a7d922e93b14dd5d713049da206d3f31422f9f8d88014aa6091820525b50d1ba5e1f9d33f084bd2b5b65210c37f352cac249bfdd0c9d38d4d62e6c2bbe3541bd692721458b3743f902ca8ef6a150e8538d9dc348b704475d45ca3480bafe55265c578f3cdac8c0b0e281a6827687f391775f05979791d3e673b2cfb1bea5dcbb1cebec43a32b34b2e3ad97493c179abec83d02a249d52dd10edec00299704f0daf869d28c2bd29597215aced1e184d5e587caba773461499b46ed8c7a036ccb433982cb89af1a7e243a3466b1b2a9243770e427feee9dd64a96a3a8b526bd2df6ce6ce3425a59b7147c86997804cb109f862df5151e94a734020be056df7769e3f164de280bb45d7a5c43da8b8dccc48d4b4bd3400f31aa5c04a76e863fcf9c7d7e7eb04f5d769aa3cce83251a40e3e32f0d437ea9a279fdc21b4331286441faf0e0e18abcf11318b127daab6c8e2a8c2d67aebd6fac6139e5cf996ba502080dee6cb6fa55aed98f8e28211ee175702e9a16a2cdee3d08a7150881ba3b44f785ab768cc857bedecc1ab8f006a1377043f731ad801b23e6f18d6404c58c0d738cf5fad7cfa87cfe6446eceacf44ca811e1a48fdeefd940324c904fccfaf2a36b2bbb2c2383fb8c995051881a7e9d96327ee92ac43832f98932997069b21bb0868403c6c586f986949a43a42fc982d33b5039acff3d3dedd48ef05e61afbecc2d113de784925a101552d5084f05720230b6fcc357b63a72588317af5fbadeb229fd1221c5bc5f7a53efce19ac146d677027a87e0d49876e12830b43392f1f68069d5702699ea0321ac7ea78c18e64af520c333a8f3f591a1835d4b34b428abe29d1f0377c9305e0aca4f903e5127a397149d4be75369cd42135c7415d0298610572c6b95cffec5b0ae2fff70de6e12386db711ec9b676ec483be1cea8ddfa0df57bc60d2c8a76fc87d273c6ae4b724c4d8d3dfaaa11ae2da40f7990f8591adf689cf800ceda9ef2c8faa96de3290a3bedb2b73350846de4b754d3f7ef20c4defed3d9cb5afeaa6e1d686a3d16c4f1b2e65ed51b505dc3fcad64aea1c491338c4a33292088b60bfe491e1e6ff0314252cdd6767e983b53cd660dcaa4fe83bf0433edbc28b53a5efb2f5e6793ab1177f29be6cbe572619c7d191117a7bc4dad806dc102aff25067eb47a5bbb1d492f80d37c5968c2e40e9d600e7910ec77a0bafd7d8fd938ec3e0086d84926a75f9908392764c8dd8a76439f0adc99ffeb7af9d0966bad2b0a924184a5e9415c1abf791e15c700a69c0e7a62a854886797fa0d5c7a42519a6c887a23165808a608d9bc625f7775fe7635b537b5a35eb94eb5e81fd9a7c0b1c74b27d0af81938714761081411cb484ba7387c6c233bf7ce09091ab8673a3f10aac3f126cbb090f55336caabbe31d05695185635fc85d2ac59ed0066e51b023350083b2b2408ba874b19b98bd360c12885d64634d3c8c2f19f0feda4bcab389038ace498af6e2824c101fe5b069f6679044aed84ca5dd4dc2817b3c3e6fcd4e2f1874f6011ad05fe9e6a5b474b6c082e7ce64f3ec5d276074af695b6d3ec3b158a99d6de3f4237592abaf05a460ed2437e66a78fbabb0bacf03aecf9b96b3ea916d96db12d7cc6f8bbee54183459748a9c8837824d5f7c6015b564b146c255cbdf16ca894186566185574273344098aa03acdfcb8679387ed2c98dbacb6f2e6150306ea35f1bc05694110d83394fc1a7b4b93557a969131b70890933c530204ffc2371cdfddb7c6342a06d87c2229473654efb2b53f0826a349ee93d90fc4d4ad3e7e3ff8c16d74ebff6faea4b07dd5e88999bacdb1b51d8a9d9c0b5e5276153ac0483b96ca76dda17b931c526c7b5858bfa793c166bb680a44a0c0c66148f81177d8e9bcfdbfb64346c9179bf45390ac550db7af5d9a9b43bcc168ad29546e0b168cf9a5b44747a36b9c4e1f630c832883f9e6d10e2f89fc436de0c59f3b8e23ee0c156cc395de1c135a9de0e24568cac9c2911b21a0a9cff405a8ac222a3ffdc0d9ffc47aff2a3e89ddfdc6a8cf60cf28b3c7cae78b6bebea7bff5a8a47a3b707f24b8b6c4441718ef88108ccc26034ece28f80517991530273a5888eb1e36352d45e917b0283534830e914c5f083704e87e3c4c4f2205d99e1480d3ccc44f66a5dfb0607ec052a5a114c73d7bace17576b9345149325614c0076d7f044ab3f34482091be999a269a266f86a95d11baeb907e636f85fda7439cbe8d31839816ad20fa2fbac9b9ed2414a28d7e70cbcfa80f8e4e059ed003add7553056f7b94cdb4459f3ac54cc2c003fe60d6a44a7fb6fd0520c50f5c226a2bdae8b6e8eb7f18f94ee1b2692675f1b52c8da3141e5f859f7468b88e25a7d556fe1598137e893ba1c07ddd1af840e7f568db4b139f1d9f791451f76261f3948ba69354b16187cb77996848b629fade50a4d33e5760673e7b7466633f5426b17157e7165933de8547163903aa002df55a20a1a90a5c7c93c25bfb53f3f57e0045dbca341b9f14fbe2710532947e3e1bbf9d98a2f46bc526db5455189fd359f4a9c52dd5e5350650b010cc58b6ba0d5d11bebcd9b6e512d3c2faa728456b7053485f24fb351de898dae7893f08aa5509f808e6d0cf2b3bc46d3a9d3fb73633de694a0ec1d73dcd22e818b61558be653590663c3c66cf008ce3f74f0cdb241a9b54d59e426ec1a0436ed7e7fef471fc927432c09c8a65591531726723e0a46527cbd28527ca0bde9165860839dfa2e405b71728a8d96a1c3eaf516327895fd14476265777e828792a4b2f230638790afdc0312214448b1bac8000000000000000000000000000000050b111d222e343c""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-846d5071be9f3c8a2a99cb9490b9aa8c794e568b4c2da75439df54fb42f6182850b620d6efd426e4a843d6d7ec259d33a3631f45f153b2c1ac14fe1579c5aed8566f5ad80eade4ee8290e3f2cedc98290c92b83f94e0ad6910163f734ebe5f92bf6fb3ab56e03725a86593c35a9f7fc5bb99664beb330b3cab837772dc2ca1fef7747589758898d62e0c53373097fb2b2321f8f8c397d2631c4d0900e9ff7d5a8e3fcb453034e1c70f3bc4451c649cbb31989b8b0a2d3e33b9f138458c5eb2fa76a2b27f9aa34841e8c108daa5ccb0ba3847d2847055bd1553a467e8554ab3c54c0cdcc439ba7ea6a39795d7008239599f09d5c7060410a8a12301dd5e68f65865b7cb636d7cdda135436615bca0a20d982274551e549373f43c435729c98147f87bd0b344411750da35ffe77b73d9d429bafd7f2c7d6f43fb6a00afe8492f45c0be3431db3aea58e945303c5d1d4d4672727848d72e32bf2f7143e2de29e3c00678b64a7a9c275322f1039ea4f751e4b5fbead29b85a823bce1d4c0d1cff1a5084f252b10d8281764c1ee8aff68ababc78567c759095fb64425d4ff00a5491ae6812658478e8b062742442bbdff9ac8e288af8f2a64087c2dda5c116edebe039135c5ed850c190ff60cdcc64a10b3a849a028e0c66420f7643e98aab79dee9d943ce7438e82705dd1d7a8f7c45cfe442ecf3f7b474f0aaaf1891f857351a2438f2d688384ddd33f0821167189edf67908c0f9ab6dc928fb6e0f69ac40363ccc7eb1bba1c38726eaaeddd350f3a5b077800c2f0557f9bb1f116f0256f99ae103bed8e8250f2f1ae4c01dfae76aac4f4025fe9897ebd7baca7a74ef7d6eda19e80c5701c1dc995f0de8c15d7767c11c572d4c5c4af1f8155d8ae1e196f83035d5fd89f2b6e4893d5df8b16b70a36a674892f393cf4f83168c3b12e428e1ee2a16770ee7d4c2bca95763a0ca91452c5643835196ae0c00d6bbb8ba6a76ebbd198577cfafa536b71c8b837f2b501ec08be9470bccb69925b625876812e02254b17ec5a7a7f2aa2f32707bb84831775a8e49ae31d82b006e76bf4c4e965ed437f5298b985248261df1e657b6fdc51f7340be6a56d3d358667f9df996bf97fd6fb4c7870565f49788e600e9e54fcd8c3a487523c6ba49a2d5f0afa819b01f00ca75b846c0f398df771b34e253db4e6f7748c4630b1d32e047b7686bc201ce3e850faeffff7a2a5efc3433a6e5a386fbd8204c18243cc582e9f3ce606be436b0f957ad73dc7cd65b3dd0c0b336556e4d9247cb041aa33ac5e7d8080883b0e7359b7128ff0c6ba39d6f392cb1f7371e4c496bee32f0785eb0134f74ad9bf244a6ef9f1cd67175795b9a965b6316fc008c1c02415a20f44713724e1c9a644a6b5d1150e31cd54c29368afaf2293f7c2ff68906cf99f5d32fea44b7c4ef08f627ff91627f8a0a2d828803e6af4b93905125640a32409fef71e00837a9d89e776b88d50e2c0415534223af6c950bc2a2e8a7cf852bbd21a0f2f20cd03a9fb7e8214df84a3dad03a3345dc44a1d15eaee127f50ed2588269f1c6cf55157b9f96239607cfddbcf55bcf1d24ecd3953e20a54a073ff3749c8882595decd36d8b0fdfd0571807e233208b34324c244a2887adfe1cb5daf8b79440a44a019c872813ac2dce13fef6e58ac58987241ece2a3299024b7adbdc89120d88823e1bc8cb8ce2217b443770e411ea969459c8c56e40346b2899db2abb764cfdfe82c7dbc1ae868baf4bfce840f68826e41e627df189910a780598cff166be972117b5c61c02dcede2d298acc8eab96ee718cbf4614d1bbd93d8f231dc6d18e4d8f4b396b5474e70c229e6219c3af9b41b83bb5525c1ea4f415fd06da7787a9d9d318c298446071e13971f7c742f3ff61d86bbb9a2347e0608fa335f006db2a618b43c2225ccffd8e34d924f8dc60bb1e34c1822bf1860a64df7b8a8c0d09e78a3fa17587d50aac69a6eeac1204a23fd3c4d7f02635988fe5555ee85a247c2bf6e952346b8ec11e76149e672a8be470132a010c73ce62171da95cc84bc086070d13eedc88840540f81d2980fea2cbfa94e5255e475c51732fa82c7a8795df3421ee7e55d391cce70e7daf7a80766a84d23063f93f75119a70bfb8086d41fe9b2840b4a48f0157f6a0382da9c332971d99805f2af01941b654cccafdfd95818131373b3746c00cb663cda6592e913558e61eef2eb5a2bcf2936f86ac5ab935d525fb0202b116e4ef0ea063643c7b58a172923aa8b312ab64be7ab8dcb04dbb35136d7d7a15d9b77ab3fd6ea1d45fe3b8c9f7286456d33f2cdd48c5f777769e570ac0d7ae56543ee4b0c6997041e0c67d82cd21b8b6d6f4399a7372f95ea0b580254704cef65e8d4bfb2ae556cabbc26f513e02c2be2cd9b1352b925dda37310d72df63436289bfbcaeaaeccb84a34ca75552f7b545e97c75add87bc3b93c8c7cb01f0fd813dd47eff1e40ae3e230c203b7d982cd29fd22f2b8548b98699e706155539b05d052c7ffb3150abcb5d990c9171db4f88ee7e42cf56d10eba0cd08c17ae14a7b41da377121902564c2088e647bac379e062b04643acf9d07750d3b95f7132e41434d4e3bb73ce29267761fe66866db875ad5d798c10bd14cb7c382132f19b577f3c24b1994b97bf488a3b3075a1c20c4447618694bc25b4f92283819a6a445fe7b3b389dfc74a544dc26a3429502601d19c38fc7cfdcf5d0aff6c28264cef679daa32d0bd0b80532d02478c09514118d9ef3aa3b093983c1f800d048454c7ab27a8220fc00a4285785230e7b97c415eb2cdc2c98131fb49ad4a7fd96d51b6077ec872cc95935aeb42da23e5e23342d0c5459603cb948d2426f68be756ed544a300474b4de646841b6ebdf4ee27e80d6820212335093eb29a5224ccec99af8cc84c65ab1b648f24aaa48be9c9fdb91dfa44e071a69f127e2206a00171513404f051a829271380a1d0eb14493fbc9ad99a205a2b76049489bce56af1946873a0900ac6294c11acd40a026abfc366198786eea707d5c97cb1bff25471125295d3e3ef6cf9ef7913a71204d162e00a614286c06325439d45ea06fe03e07d97566cf100b7e24ae606ebb7681679003517be905e7faa97a4ec9e57b97793d91b998be6c4d78b72b37dedf10620d57702445655b36476e893b3e212c0dc0b12c1a84b163189f008217945b60108d058029df8affb251756001ce79d5d8b917b20c4cc246548011824ea921d376ec7edb15e35d5e5d66646714244e228bc2f7956291a38f2f36da55f1a2134ede281026b32ed374c6023259c43e85437bc3938a869f6d5df3a50df8f2fc70622e1671a4ea290e36be376a99c681b517aa68bef04a252a4dca9dc19ce11e8a75c8a9f4146d670771855418b2c19a861e4bae7e73587a4aa9036a7d99a261ee745a03a32e5a13008c9b81d0837006beea487668296c8b683c98a44f5c155ee35277a4b97e7beaf690a21c5cb208cfc53d3c7949922cdfe18493efcb1426e8bc5707aa7282ca81b00e9d3d86d33d3b6b3364abaae0d25ff027d471b03abef975e27df7d8aa2ce5f657e2f9e120ad97a6280836754f16e86cce203c1246cffed258b0ce9c1848e05720663034019c43b2a43e25cbe96ab2fc8c7b58485f9bb105f"""),
-                    TestUtils.hexDecode("""
-B5CD00AE06396DEB95C9BE213BEA279AF0D10F1423B5A71854413E99F7216D9EAE76C8AB884545496559B14AC9A69801EE3FD2EEECCC557D7988F34B82D244461388C7D4EB16DAC3C0FCE0783321A1488DC16C3C688126754BB4C26308054545D2E46C6BEE26C25A7C3B701341A0323BEBFC50C718162B7FF3B6FAAE7156FE300F2219655D8D44DE89845393011A2B466233B907355467EC49C9F832044BDFCFCF722D6DE7946FA503861C80037549ECE8FFF95026CDA33C9000FACC334765A60456084A0614455C83E0D5D991F7ED43952B7A69F1E326D7BD33822CF1F286D85FAE78F0B8DE186368EB334CA56070122DEBBEB920C5547C46C1291E78AE48B72C7A39020A1A2E54E59A2E46606C99E652FADB39AAB25399B0830AE733FDFD973294B93F47C30D0824686C735E05FF51A95C1C76467A4BE6BA80C5182353BD510E8D4B60BD43436F7021B3F5980D1A769B2E3BF04E0C257EF577828B327E2AD85E0581787B9B7FE44D6B826BF8405D3D0BF8974D2B1C569006C7FC3D2891DAF38DAC36F64A256E337B660CA59D2B45F1B4AA1C0C72B78495FBCC9EE9CFFA4B5A101F973E3211E728040904B0B2515DA4B1CB3774EBEA1324EB6907324E733C7F17BEF6FAD0F6BCEC1F08F785DC6FFE02FFED5C0B7A631907196835EFFD0730FC8FE020B0545C920DD7B2D705F22D8D205804397F6FCC60386F4A576204949EF60DEAB269905707396CCCD8DA9B895270CB39839BFD3EE64149B0085B96FEDAAF8C738E449E585ADBA037BD560EAAE978A6ED61DF432B6A9C2E50C2EA33A8702A23E6848401F85E2C18C7C767DB15920C9B3B030728FD9511F8903DFC8572A3679F986CA1B684B3AAF489DCD93C622C6C4D475DD60F10C390873B09B5A352B6F5A104C90782E053F8121317EB8D1D4C0145E04E3B68446B69A0EF81097CC6BD0B756AF78963724D9C83C61B7B79647F0844867B605E2B60988D2D7AD07CD6BE2D8F904F0D269187C141AC67C9DCF9961BBFFDDF3BF34D9CC5781D1BEA348F49EA8FF7750F7F3E0624C16FAEFAF1D8B6A818AF5FC5C04E2504A0CF4C2DB54930EFA759A292A2AECA1EC3A08918513D95C44BD133657FF043318A17BE4A5DCAC54B87FF38869D017A4B14DEB60480AF1C5F19A9F87B94B8EFE0DF3F931CFADFFD7AA50AC86D9CAF6D434CC81E6ED123711E34B8295A446B554F6DD5350B44C614324D8727F1CE501743043DE6EA085DB5154AD8E30E114A02CDFC96BEB4F2718033B227CB8638BCF617C73BA4473851E62C8A287CC4F9C659190E60AEC468DE7EA8841E3CEF893F3DC79DDDD56B63102EAA5B2793711A0451EE1655C6768393F59CA6085866FB41541D9997C94BB56F6ED5D731585E7B25B1DC853830DE5DD75F66298BDBD2E505DCB3850F96CCE0D7274633234EE2FA1E2782DA3D6CD8F5DA2C3063A923DCB6A2F82614527CA2A88C1AF21025B88A08C3104C679175DE2CF00602B13E58FAC9376BECAE56A60A6A8F144F1C98C8FBDCDE6FBCA4ED13228FA77CBA5CE631BCDB368AD9219568777FB4397BB40485A9AB63E9E3FB343154108D8117CE25BEA30BC854A241745FC6C26AF0D64124AF10BE4BE01B8A3D842FD9CC4D805B2BE26F8B7BA0631443F48C7F74207F640B215E0DDC42B1954A1EAB2C68E63601DE3AE3EA54E16282BDED00FC7665A9E8B098BF034F5E950ECDC46CDD22210244F102E41E0930FDCB24AD6C72507E5AB6FCCD4D6B2A2703C358EC1B51AC87302A5F507BD01CA6B5FE04EA2A5322EDFAE8161965524C61956CD201C4BF2F01B54F008F5F4B6770D0622099CDBF94D6C41DAB4A5362D630B9BF9CE240ED08D698D1AABF29E60BA533697C3C830521314F13EECD95C7D2600E2A756AF19AD94D9EA39FEEF0E3EAB3EB401225C2E55B2F2A8D7D1A3AA77A38BF9BA31399F6E6458F3F21DE354BBECC2E29740FFF91FBB23E0F61D7E0698CBF82D439AFB018DC5F5011B7BE98993E8B655D83C666FC0CF84A532C7655365746FDB97874D62329B1EFDB0B0C8A46056A85B60E38AF8979FA4910D2D9CACC3B5C1E42049D04C44273953350E0F756081D2DF6429193768802577C381897BFE540BC036293643360C848A1AE388CD17781296A99AF0CF75F81D568D0648C8A15436BDCB16FD83287C6A54F88F2F75E6B28E1C5A3AC03501D6D723AC5EBF90517D194A596F7F95947CC169CFF2A65D2BC9B54CA6AA45BA9E901D4AAC81FFE9E62A479EEC5B3F9BFF24C69FF56EC52F1183B5AC48A5BAA90BF595990B6EBA5B1CB6D88511C7D0D165FDF2615351B0343918B966ED1CA0CEBF6956BD2CA599E18619E1A5930E47CAEA92B8E9647A0262A2B24E955040750E6C7B935982CB742EE756DB65B462F677AE09A7521B0D3A42C2E97890C47148618FA6089975F5D491F4D3F69EBCD54C2B53130698A1F4A47505194F675D68F2DDF5983B008E498AB4A25956CF724F5C1250D5F9C75F3DF9BAA696E300AA86FB4B9378EE18E79D015CDA55D6ABBF5B0BE819F9EE58B49656D3B112AD8FA6651A8905061A8E37760C3F2EBE6DA611BADD44268975B5000051BDF7158EE3DC200B47FBF8568C9F22719FBEFE5906444DE9300689BFA1AD167"""),
-                    TestUtils.hexDecode("""
-fca242816e6b98578837b5592bcd66732c06ac3794932640ca3b71112407c8a4c0989723966ef76b5409a893b8c2981d6b72a1f5cd92d81c12b9cccfc75547f44c27a56431f324a4f73ce4f91da398fdbe6a97ce171f4483fd0c1cbab53fb80c41963798eb10dc422ea82719a0770ba82e1491512bc40d726b83b3cc1887b5648204b00e8231a654b4a796d7c1c0304e93579ae6ba4f0945afcc0812b86cb8872842ee8782ede142087a46dccc78275aa2e52f2e9344a81c4a0ee65d4a9b8ce1ad020ef6fd1e6cbdf8d5e56b1751e67be662b90fba01a983df891eb2eef4886a1da0b6bc0cedc4b44f33df8ad946b68e5389104b46e213690ebad5b50fef7dbf2aa6f51b125657e779d9718244aaeaa55ad0bbacdb76dc66973e331be8aa3e6a13dad7d227121e5fd1edffdaadc6bb667e40d49c1d95c6db663b4cf374a3b93e5f270139c28e98fee799a3ea015ceaafb881807058b199dcf0b447f46d263bd43d02cf232ad1c27c3ca8e0cfc1c07541aece1980c9240e77b9f134694be94bbf05eb6710797a2ea2436cd6c10b18a260bdef24530eafc2618d17f86922e91c9fefe7528de98bcfca9194e53affc13da5787124dfdaa0e95f3924fcf6fdbca78a61aed2b5125c6b94733eab6a215856185ab31106fb293d996c9a8e80f9bd1bb2287a88df24f7f127c371d5c8503622b3986206acd99395bed7633e5f73a918a45362d58c921362053a0d2133a1989516cbb8bc29dd2fdae2dbb94669a122e81ddeec46fd04ba600d149cd728285f2836a3023521ab1362736a8d33635a6fceaf6f9684af304a557225e4a80ca403583b637c4db7e9185df6bb77dbb3b09ff915400bca75a645a8ebe36b99948369cad683c56f0030f4f8b8f6610d20c7662f538c855bd1d08b719df8b34873c4dfed8046372063ef58800ee7abd99ba66b60098e0004395c2646ffb158411526dede3d9c9e1b481a2dc5298f27538c6ed535fd0e7374ebf2ebf214eb14bc3c674f61c1baddef4435344ddbb08d6fc8240ff5e41b817e9795670f399965cee0d8a4540b795580ceeea3a31c61c81e3613331f21b496e8dc833ff7494f50e81f0366718622602759d598f1831042a5779ffa9ada2a00c79b0419ecb05d3ceed113160653bb7db0d06a40fd272afcf7f20fa18dcef490387b84dff70e761dd1bbec5e1b25eb30fe2c4d18135b3c5f315da29a98855f81f9b1e01450557ce6fde5b2471dfc90da07207a6f6d181cd71e33af713c0dc353f7166bd6aa7b90f82eba2c03423144fd12883e80538de76f02a0e12cc65051b981eff9d25a36ff79b4c6c84ea537075886e9be23f700570e43e76e8d61f54b49a576a99a57b464f2be6dc8c993c78a1330ff3580138964a6cc2cd46006ee1a72a268ababe373646674dfb4bf33126fbb8f5dd24f4c79596c783fc88b393a75355ccaaaf698a45d678b01f175bb31bf7d28bd44a766a60dd8d2510f55bed7fed53f6718578fde622c49d17fa64926be1a084dbdff206c025ff726ddd2adeea11a021680f3e75b865bc364dd7d752d3b62b7b240838c5645f5338326897e751e968fca1b99c0baec1c9fb227d6f1fe61abddbe26613e5abdf6bac54d658b22cbf8cd498114019f712027aac6e7b1fab7016aa96ff61bde12a44d540e33c30bcec417f11fec1a0536f61eeba565d4faf3b624eb1205143e3b6e6d22b8a0ab3767739206a89eab990bef3f3d763a816cba5aba2b2d8390235a197362382c2487d80f9f47f0714206b1aa9f40840098c6f94d920fe21950274f7ca9d22a506a76a328cb28a50ba569909897b15ac2964a111ce48ffe137d86c5aac313050e25f43b9c041c93dac0293a8694f76845a7a83b8e14db7fb2a724df1f4e64a772e6c3078e465565e1eacd56c0c4f13a3a90b53bcaa0451b44ee94be4d6d23707057b4eaa6879203ba81ea953090eb450408eb6a9dab8c5bca27c87cc302f286e703be7022044e0ac4559d4e861f4e31f8915831cc9b81dbe937c8b0abc02b61c57debcfd0f5f8ab3d7bf0b05a5eb7fb0bb587de8c2bdc41299e744db3c6f92aaae2008a14f965023f17ea55fb0a5ec6c884c478cb3a95722844dd823be55f15a363354634a1b3171e349ad6c69f1342bb3dcbf0cb44efaa6d06932e064311057a97fccbb1430aff5509d0f34aa57a7cebcd5eb5e9fd373960065c79f52a414d16ce959c97c1fe0101e4bea038dc6b27ee847335073f62a91d1d74ebcdab4965e1cc501c07cf4a6050c406028f6250d24796fd4736144ff84616a63a2136fe4b8ac9652d95965659d55b67355f5de40f6f11e08fbfbc2ef005b3937204345e03c07e67803a8c378368a7cea377f53318bb140e0760bf79fae16f4132bbc88d8af335c07496fdff21e36ca375889ed56faf2622377126d399fd76ef9b2746e1ab666461a949c06727d1ed191e197418ab7574bfe292b92ca61e7972e4d0fbc6001dfc5438f95b54c9f226bda6968fe5e5df06e915fbb58c6123799f6c8624a40b18542c18cf82b89b606ba532584b1542f0b0684be46457fd6f295f0a3e79ab8634b8fd747d5bb87ac0b33902804f691c16874f881a3acc4b1f88183dfc3defe276968bf7f7ed53e59e2e5fc0db0f13dbc772286f6d83cbd47617bd067035c93259ba9daad2f229835f7c9ce8759109bd1db0e71b9d015c55ea94325cae586fb1b50f4792bc4c57569c83c26ba4cd7a809e799b5a45961ffa5387f91d9d653fe2cef5783312e12fb695a1b9d2004bf5d73819dfb406a7d3243613356b851370fa34bc32aec270984c77cb373cbf6c65d1774ef95539d4b4142d50f3cdfc9695e96cd1a0a3844ff8507ece66c2ea7bf27bdf020ea8fa95c6a7cd0dcf37a591f2cdf7a6d7a04de5a89583a094a53f68636bb57fc83968ceb47a53d37aa7099c76633e23b5eb1b828d2efa427fde9cfa24df7518886af10ed7734aa278bec197a60dd8279df60fd5012852167e9038ffd1388f6753af0b75800aec92ccdc0feb08684c28d51ad1ba8a14b33eb0a13ed08020f8416c9817a63dae74a2ad51bd9c9db0c187ba1df3deda995727ee0e8d78c9a3d70d2bbaf759fbde9226646a412500865e2391189e46a671f7a9b2281509c412e5ae2cd89ef17a42414fdaa90d12e39b07ed4744217e4a461a48aab8e427eb7cd1d07cae97886ca0f4b8d2c88c397c96436b0540aad3e6962c78914b3ad092b1a46cd1aea2cadf236c9d0d1e7669bb3035bf8354ccfe5ca70e7e6e6acea47396800a8407017d64c4199cf13155bdf44b06e01b92628836712d34e2ce4c8d635cdf1c3ce21b7a2ff1268c9ee9df0792b79d35e466242f25209bcda6f68f07d80db030e244c479c66cfe823220075e9c08c2f8406ef7a5600677f4a0673b0b5bac9d5e388dda323cf3e2d967cc0b3a705a456cd194c1833855af620952dfa2fd1f147d6a58ac35231377956e4b91ac100e3f9d8b966db4861ca45ccaccc6ea63b0d2d71d4367bfc0911e106ce7cd73f31887536754c880b54b5a6abcd3913c505c2145fbed44a23dd7b04280410cd648b59e7ae00b10099ce56a3d615f031f9091ff00c2248ce6cff217fac3158aef781b88603ce37e9aeb4efabafdd59f0a460859b1f1a1b4369043869a27cbde6a8914d1d3d88e440927af82083950eeb3bab126e9507c8baadc1fe98353f01022df09d8848142ccb7429a5b4a7669c1008d61ac50d6373b258f8afee8d830990853b9cd18b869544bff788f5cef93a9e3debae6afb138bce6ecdd9b071dffb5d629e0fc544bd909bb7bbeb3597d0a285e447eb49f7ddadb510dcad32807d3d0a571a731069e22aab4e730f50e295357813cd46ac3f34c4fe2d5029fc19a772f7e647cb18635fabe67f1588b18a7cd0ebcb6994cf4334316f6a538370887a0f009adf3348257fe9668b7d784ea64e8e9931fba22bf2f673b222196eb5df852ae2715b58cb9b737583c4b8c1003178093fc288736c246fa0357daa68e89150cf7876928b9525a264625991fc403b1b5edcf4f9a58a570925044c669a3f1960c06f35a21b826603086e7e889adae25db3eff02f990af85efb01e1bcfce2eb1520d2846c5de1ad3caa65c968dbcd8af5b925a13871f19524f1db6c914827c818d76b1e05df95ba322ed03061eab164cd501545d3b4ad2c4f9b5d7abe1dfd3d92a422a114ef56a4b2b47d31f5df38fa7e3853ba5b1c1e9e955dd4a294119c3c314fbe4ae14362a6522e34b7fd467d22aef1a31bc8bfda12025701df52ebe6fcc52c1fcfb8ff94d62d2a7b0f1b8db243391320e7fdcc0ec40576caedd0f327c5a0a950ddb2994fc389fa77e54f569217f4139b91e545432cb7ed0d11e1d27e9c4536a9012509d9043557051c01911393c592f36a4f162f131af522f978e940774aebc0b672fe88c590ea572f39dd5c87828d3d9d16e78b9433e54da904418c5ab6e8db7851f4807d4c93c60503ceecd837bc068aad6813206e382e84b6e64510f64f1346b9fad25c37d77be5292f1fd9d5463c640baa331ccd636e7485b752db11ebdebefab0cd9d8b9ae11f724439525661fbce8341badfc03ec2375536876a954a0c553e274027f9f53582bfb7d20520e1b8ea9322fe0abc9179711768bb2e78554eaa5b0be9023e6acd94f5eaa7b74a98adafcfac88fb21d810feb9f38dbc0c8cc006618c771c31fc82aeffd693497bbbcdfba2028cbc73e49ce074f425ca33585c891bde72455606aaa252ed42e2edc7ad7aefbd9ede2a51217f2c6e1ac300f6868cb8d0fb6bb5ebcdab839d4f63255b7079ad483a6fb383c4f0acb7128c500da9fcf7ce9e28068f265d3e266dfeca0e808c0cf8e98de0f61fe495eb160888df53bd872bdd9a7b8c89ba1a5517ae69c2b49753dce1fa1c215d6c1efca5d241cab5229ca657d28a57d34aa16c6fbd829b0aabb4099e472b922387022885de324ca45a8eb9245ad53923beec04f245e4fc6147895e7e0fcd457a3786db95174d8480701e2d659a2131d89ac98c627357851bf57dace645a1d00b3636c45374a5c2229b002a0ad8c9aa148fb6521fe35dc4ed09e3e0d5cc6bcda45925ef6f5df442f1ec4da7583f63bb2381fce6a7a9da4fb79d0ccaf2a4bdceb6cfe584a33b9cdfd6c9f3c4a8b71d4b3da17f174d6fb3b8c48a6a6f6cb78289f3f217bb377d7d210845e09ba7543fae4de9d397bc76b3a46bd7aa47a93a891775898cf4e865c5587746b353ddf1edbd0b6384512e558a9f346ceb265cc3c4d7d37ff83e6f60899f3768c495f49919ae6e80aeba85c4cd34b7d90d311f03a1f4356188df30d402031b916530e0e9da31b17ce87537f0b0b8d918fdabe536ae6bb6b903173f834921f5c998b39dc5cbb74a7ef677d72aa4cbe88a8823a8a0efc7de88713ea127c7e8fd10bfeff3e19334c7fecef45876f89a6800de74276920fcb6c248263b850b5c7a945e1a3a5129e774309c606f6585d037c15e5f824dab8fb74a9cfd49b659c98fb1c66c2484761cbed75343db437eab18ed7b56e5a3c0cc150ea98447c3b5c08c9f9d1801bd6b6ba15fc3be608aacb92c4abe8f3f506e75714b6876f5b2ec036a1456627e567c6e488cb6ace2cf54e42ddd41b6810bc93f83270b40fdbb79be84ce8e60cf527a1d04f89f22c4b936353015a8e05c23799cfbfc7fa58405c07ced8fc16d50004e364a6db3d3d11afec9f6f6037bb7061ae0b0f4f4ba3157728d24f819a3d12e237421a22c0efd8ae99651437bfa486c033e833e360935dd433a1d5aeafef73c71b5326b65d6df9994f988d00a03898d2354f58e3308b3c73b149c8a2b0165309d64ffe190a4bbf89a8633f30d674d73b1910811951b25aef8313e510cebc2f8e4a5c4286e2dd4db0dcb40b1745358f511c29645a0cae474954fbd907345b30203a32ed6848f10b5489f58914397046796e143bd412a2ea5feaa811e0a7ac8a756ce752d75eab8b6606d8d3da0900d621fb42b90e94e3aad05e0c42f9daed64af510f4846a4f66b1782d9d76dce9ac84fa2912808851c9bd23656465a64c5fa582e7bd1fed8c38e7200b601d0504f2578497be90818e69d1dae9a86fb5c2772e891d699f002bb4d579d3023df87651ec9dbb06ee3bd4a9ced0451a1c5e0a658712d704a92c2bf21527417278c8c105671e68b06aa838ead92c6a8566ee5912a18b995e9d1b6f9978fb6e378eb0924143da6fa15198686b8f5620b607e25e0540827f3454ca9dd085adc6e2c10763a20d6c70c5bfe0bb1d1b773bd267ce33a2b9c08a04a254d9c844475cc013c4276f947ceacad1c31976898d198c91e5ebf2623ba825e762665caedf1674775d15310972ddded3c75178dc3fb715d75ed071a292040223fcddf82a3e29af547a18633434534b15bc10334bd1c8504e210b104100c3a4e596573b2c8f11c304eb88ebebfcad0df1b2f5361676f899eddf0233b5d6f80828410172c36397f9495aff2001f4667a209394a585f607bb8e0000000000000000000000000000000090d131d242e333c""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-a163f0cce9b86d8807e6ed09b486e1aa12807f2370f2cb6d886eb2ba3978ee84b7929d54580b5a86b0b7c29360399d37ac01374ee32107c9a97d857a7cdde38bfdd98150c2cedc2f10221a9061eda3b576958b8350cb89e27d4a3c30fff090a550643bdd0075da1b9831f971256805f102a6d59bb803b3201eb312924efda3e379f7b6130da6814c91529c23031ac3909d0e02e2110ad1f9d56abe22a1d359ae7db28ed5b6adfebf17055803967a1127d771f4c9adee662dbb277862240e03f2fcb6915fc99436775c91fdfd84151cf571a728cce6c4055ad18bb9ec10e39e6b3c7094ed3db3193256926a102cc94d2567a37f665dcf052e20863e9f8fc66b56bd471168681fef3ec42b641ec2eac3f42f99f702da13d9aade502e04e41cd57d5b05cde8861406b99e12e37a482014dec0cb4a6b90d97d5ed10153a23a86093105e27da2d7f3f34736f1613c4e86dec37597a85460c104508a5fe555bb77e951eddab081f9cbac0487c76dbe00eaf1c1ad87c06a4d7572c57037e94eb60be1ee07fa39b343335b16cf487f327bcb731f1592db0ea833121b21c2712374aa0fce26d676ef67ebbeb3f220e4c5caed17aadd42f09cef9b2fb7d5b5a6dd983eaf15312bb69186607bb3144dace7e4a603d3f82b7394ccfe67d555057e822c86e68b6ce0f18c218fc5a0145eed4c32a792c3cc8c9a56b6cb5b80fa444314470d72d6d84bed3db7328153899cdc04c2b753285fc44e3eab5d74e77977db248fb774166086bd37856f0be4cc7a0503a901443ae965b183dd75205d8dc86349b38d1b58ca7b8415a5f3ce70fc6fba330cb5b22067ff75cf074d91fc57cd95e74633ae348eb89efdeecb6e2f40cebf31122e0ba834cd30a35cf52478bb9e6a2c7b880a88f76ecc534d928d75f59be681a181d22fa5661a7d58cc9748eaf8d789c1a5741b2ab91219cada5047d815714c1e66e476dab23af40c1275408f3cbf8c8d7e591e571885f64c6548a066eaac99b9f92ed7c5abc4267fa926e961deb28a98fe0492085706aaf4810518bdf965ac32c6666b59eee893e773febcbe5de8db551f409593600659428be7b23951359d5394875f00c31fa7b707929550dbd62fd2696a193c49687f872936907feb2bbde12b3fd874a4e9d72d2765508f9ce08d9fbc2964c9abc93e83556a51f1e446d9b92a2834e316c822fa5f361d44c05948740ecf776794e453ca7057465e20e6819d617c8d0e245d2588e15c71e7a7ddd5cf3613f35da272c437bc8c334d6f9fd186d31cbb9de5a9f739258d44497086deb7e564a0c95d6a5431f31d470a1f872b20bad7af0a8b03c01cdf71567324efa383eba0e1f15f8474bb4e205f6e89f9a85d66eb57c6d9be0e50a958dd4b587ae9b4c3c7899d5bbf7d4d2945598bce9111ae4bede064d57f151fa171736719e0fd27625ecd15fc8b46e06477fc9c8f29c01874eefa8f7bc964ae223ff1e9c98814c01f5ec513509447cdabbc73cf7b96d06166e5524d2d433315c4d4f2e9d709fe0f78e88603336d47c7e301aa91a3fe1dab1eeddefaef17ac096017069e2ef40e3bc17035b80709142d8eed4c34637f41c4045ebedc268f6fb20c339dc5a5e89584722a4a156c26b04ea424426d70580bbfd9a2e095e5aa0ebad35c825d19df64557826f0c5c455107a5c06644afc4ad1115c1a08764d3af872ed3487a2e40e894c1515b16c953d07dc01ea9f2a54b2f2502661260e64b9a58c5000d4adede0347eb75c6af9add72e595fcac36ee0a08d7cd2da6e0bb3a3023b772c5535c3a8e6ccd52b3aed80a1f50a86906eac6a552ba07a8c7b16eb17b62f63f423dec086262bbe90736a47e4d5501682c5147c03d06a8060166790ed0673c2eb8bf54e890c579b2fa77a863411467a09a7673f5234c5213321ccada607a58a55229f8953159d3b67688305268c2a7c799a619a7d3fa69d4ca86969d428033b5adf318db78818f136f651f2696cc3aff43c3012fc1781aacf3de7973b165655f98ac9e7d5158a4edd4cc4b33064bba97b57f30908630624c13dce7627823b9708df52389bc4f1742d86b244f74d48dfe67b2076723294eab5cfc8539c21401480bcb1e745c1fe803e6e1fccbc0dab6273abf1e2f27155534f6b9a2d06aa82a7a7aadd1fc574f42214f3442422e12d3bbf7b2857fdfb8bfe4398b16be9a225f94934615461fd9a430db0c5e50c25beb3e3341e91dea7e8b3f2b05c25af2c1e63448fe311115758432cb09d8330d28398d9cb360eda112c245144742b733f524e8e7368acf8c48c1c1a3641822ff56388f0db4f3988cec2888bdee3d67a75bbf0ae0e6661582c7975e9a05d3b7b50c86359aa4240573cf27d7a6011cd295d3edf1bd0162290c0ea094546dd36d470c63166fcb4950a96f7272cc0b05144ff5d6342a27523787af5f23dd985720e1a8bad426f6dbf2c5f42178d8a71b7f473a0c9dbe278a0ec837da78b9cbe74b230db8a4079b2cc2c49539f78d55a1253995a2a822c7711f46c1cfd379ed523fda80ea91af7c5d872a5b6119cb70cda9bdc3fa8c4a83531c71f5da27ce6d876fe653e2e808eeb7209eeaf4b492c09d47385763775902afb05ab939f6406d582442ac3bf1113f172601c168b1407f701799d16b56c82da29ae0067d6c7f48c2b4a6b34d53fabc300ae7f55ef5f7094e403df40731538204b47f8fdf28f855722263e3c3f058f53e585275dd8cc5457003d60fdf32dc3703696c23fabad72cd64dfe195f2a5a3a54bb5c8e39443fc1c621fa1c140b5291617974f6f2600f47420b3332208c1f39f6155bb0c2502bcc942278ed27434077046d7a9d393ea87ac2990b9f3c7aaaa3107f40614a1fcb5711151f85f595018e48234d567814674aa0ed81a3a1b597d8c410124cec8a45cffc4acfc8a9429ed52008fe6fcedaa856b5001ce12da270aa7b7adf5c079eb88dad4d640064cf3ec2eef00934b75aed8a03cf04bd154ffa5804dc96fe81bcc2fd48b3b59ee470c4cb841b7b73e21e3b35a3c6aa8c793b97f51d552e66b8a5dcea3e138666f957beb6c64c3f8200f147bdd2714dc60d605fc6e47ba644fbe648f5cc8ea2bf52251242bfb4796c6462e48375143fc4f9ddb0543ad0ab15c54bc029b9c95be7da19aca2235085a2157b3a2968f987b738c395f99095c490f8a3f3ac186a86f2d09c8280799e6810c9fec0af33bd5b27b855c70c3b6ffa6cf85b6f76d32f076ca4f11878bc38d58e308676e8ab1587f9f889df68c3712394478987e70c3a15ef5b5249293f8e18ef6024776cf53b10f3611bae24ad3e3a4a78319e7ee8ddd478a43894a7c104e42a5b0f8d0f0774553c4efdc2bf72188e23d954032e2dd1dcbe5282e800057ae0f170e4ea9aa076c60cd4840ea1ee2d887b9a1c95aed4b0df041aa3c88214d47107f8e11315b9cdfdd2f488c88baf8479a163ca994880b3607c99625e1d1cbf59effce1661a520943242c63707f1b1ee6d331c2834e4bad510d04d96159ffe1e76be6ef380afc6234c530c479ebb1431a0eef0dad3b909e75977b25336b76899ed0ffb50897f2d523e8d5e346adc4d5bda3f647bf624b85c66c29797c97c579290f7cbfd5bf20539629ccc65648238b02ca58ebb2a8fc314357747a95d2821b1b04485320d"""),
-                    TestUtils.hexDecode("""
-506462786389055DE2E4AA2A7C80388315711A7B5DCC73F2039DB99380D48D9A3DD8CC8B929B0AB224DAE74EA90808C302197EE9D847261DEFF4136D3B2A37CA32533384443B9D935AF2C384EA63E7160BF4BEB89EC0EE705D10C72F2F65A4E75ED2B1901F14B8C1D21DA9C6B8842DB62443D3DF12969CE4E45298FCFD6FB103B87B0817190C5ADED4D04E3BA4D2C3F60CC49FE0695D6366EACB9C79F28C9121584D997B7A3A7AC3243C3C75FC86AF81CC8B888E90095051F7825294CF7E1A11464BC153548F8195522FEAB9AF5AE93C5F6CF80D9ED76C19A0ED0BFBCFCDF30FF6EBD0E5C20EEEC4992765FD23F13F027E2261C38D11FD1631846142541ABCB82C0EABEE5D675EC130861F9BEE9D9E02305F168C85201DA1DA2E4D21CF1E4BB8C2539BC1F3706194AEE7E3ABB2D7447EA531619FD27F0CC7D09E5FBFFB0DA81432D173321C433391FEE90B92E8EE3F39ED492E78327D8A3586B7052602607EBA79CC9AF21132C7D3A9931D5DB4937FD5C5611F79C722E0CDC48564E416DD251C46C02567C4059A0DC2F59A124A4EBAEB9B1B04277CC47A9F345FF8AC3F8AC844A668AC6F7E1BF1C9889C3E42C1142CBC31A46EDE21CC84F230A483B5CE23A901375B27770BEC8F0AFA25F301B7AB43B714C6D0E98B009FCDDFB75C0E26EBEF7C9DF5ED04CB4183028DFADFC09963AA8CB3A9A1BDA047F62460F2B88FEE1C05D9E68D646137F660B68470308225FFC097474B2B2BC5D50A025724FB2CF70873BE7D04C05AFBF1D7DED56693AA4A4E495B1FAF9762DB83DDA6E75F530ED5351D171B7BD06E5ADF46DEAD06AEA37CF262AA33D062141F8E394E731B3942D084E583090F9CADF87C2B81C4B7F114D150C221A12393BAB92727B828C9EB86600B969E1B80F33E1304CEC68A1B3B474762175EA19A4D67220004FD4EB0B2C643B69C00FF3876E9AF63BBEF8AB6BBBE247668DA8F2E3CFD0B95D6926AA3A2CFF4587C45DA60BDB03DA78DDD9758FCF9926FA1F080A61FC0FC7660BDE9B4913C40534887B04E2DC666E981AEEE38746C52BF46FCE0E2233CE02C9307262499BE567C150CC54FB9D96B81D3A3E200EC8F7E87E28272E7B956600DD7692799473A8C63AEDBC8F3F43542B9E399398349B896BBA16E5F26210558DDFFB984FC924E1B0D272CB8834B1FF641A894EC113460C65C66BAE86248B48F675F1313EA76EB4DD0AB6EE41014FD7589D1A7DAB16CB8F113A3FBE7E01EC67B0B3CCD81C0A8C7E9824658C926736A574E9A0729C3BFCC34E0D4BCB1606E93287494577A6C4B1090FA6B997DA098C6CF555B5574473B1063B739CCD139C2541CC3F962EC42BFB3A40F4E64D322836EADA5F574B48B5722D7809A3A20EF1FDF5F3EBC000E466BC4CA10E0CC6A1390FDF159BCF0182293D9C408A8570789C485DBB977642074C869960E9648641C2A80D8A1C4E474FB98D7A3DD75D7AF01D2605945E89493699EB53E30EBB0F936B63ADF5859D9EA1DCAC44D0BCDBF2A069982BE907F1B560AD8327BAE013FBFE6E2709C9FDD498491F1D8603F9F6C9B1A643F6FAB97DCA752D9BDA1DD6BDBF52B03ED7768D98E46092D556C266E30C77A10E68AF76AC3D359D8752E2453B2E75DFECE6F66E6AB00EF37DA6E6A367FC808E1F4905339F4FA73545D13DA7E7DE49CC0A2A63639A96EA039C4EB643627B7EC4FACA1374EA800A505A80F554B3AB3233FA492ED6C17B5832BDEFB3A99FF1C64B35F1531A023415290124EEE2C9A7E34FE8563528B6A4B64DE425A8FFA91B753973CF0C96FB2A8A3F71D58B77C93C5866DF5CB5152B3A0A32884E349C63870E9CACA82F121EC2ACAD7B6052B0D74E9C28B20C76A7A821D192E11B59A7C8059FC49662C655551A7356046D46FCCCEB4DE1F5FC91F35B950F630D743C8218A10AB25D2FAC25308225540FC24CA794EF171DAD7258C2B7FCF43297F6E77A6E83184114DBDBE408EB644ECF49E04FD79769E4FE9B0530F21F8E3913A51094D0E49DF012144EFEC415B8B2A34AE2462607E7B89BB86F0C733A5553CAAFF9B19E0799A1901657BF4FF5AD6DA7886B477358E90D56BEAC6A963E0669C38EF47173503B0E9255AF1F153E673813053A899418E2BF217D01D9162C073F256CEDB73DC062D201FF6056180A8A6887B286AD6D3BD6B1462231D6223D0DF2BBB7299FA6FEFAA9A297C56ACA28E163533406141EB2E65F0C94A6286A0579C76A3A8EF96DDDAC9DC6A550538AD345FC4AABEBAC04682D4AB0977D439CB14F02FB504E10252C1F3ED01A7C4BFDA6E689D842D9B9086517A84AA4257D1C8CB842E15DFA615D2E3F2464E4012C0067EEE60489C044F43050E5B1AB3E54507422E1368CB3EC8CFB03A887DDF9695AD95378F875F14F7DEECFA54A775C60C6B7025E5D6C0563E0E76C05C93E33C3E5AB6D1E1C051B52D2805D3BE0A4D3E8F0DCE6BBA1DF04C7F76F7E13D8C3CFCB2AB04A1E605D4DAD72A43D5223FCC36EFB34D999095E742FB9DD7B69A28E070FD28138B403DF1DCA75E00A160ECE9562C92091DFD3A24C53645DED8E17B39D8CCA4C20C96F9C9F9D14AD3B45A1E87DA75B831D400AC14BF34A9840936C3277A135BC0E8C65E0F5E670AC912FA586FBB4E149B09F64D338C8C886BA65730039B5DCD0DCAD9D6EF11C228213438A1489F4FDC39395E8447212599BEB570D186883E02B442F8BF97884EF98D3D6E59254B3DDB77DEB8429D110F0689715F3E0A4F65908E5EEC867AC7BBF27CFB965727AF0A1EF37B21EC18CD60A1C87287527BCBF5249596083069315699CAD10FFEB2D87810C4DA090074FB26978E56B7D06186C48BFA4830A0BFCEF8FC7B95E73F64EFF78043E8D93F57EF6DC636C8FF612ED22FB21174EDAA59BCF89D1A60F0E1C15C5F8EB8E6A39139D500E8F28A5DB86C125C6C76A99BC47DAF66E679121557D85F5093806B748B3EA65CAC386B59C0A372AF2FB7C84111F0E0FA2C71E137958239534C4A012B1B421435B7BB8CA577DCD8C8B0A798902BAC9B95AB87B6A0735D1839DEE336996C2357C748F4EDAD858C81E2115595ADBC173782E36D4E720A5D29A5681231F9BEE91D455554A8632F7F02FAFAC0FD9D03804B10DDF4828A69AC1CF0581D2C88877BA30EF2982E0827147766F8B71E264E82C3949BB87562F810DE835CCF78A7E5FAB219E64B1FC615E7C952577B9B482F78C0D0C512833994895A125F43EFF066CEE293004E9E0E5288A61EF209EC52233EC64BC0DE76C78EB2678559724FBC05BB5B43CDBE86F6C481AF3BDA11EBFC0FB384AE00F4ABC212B0518644638F01C38030DD05FB06A7EDC6406CA18878DF38ACE8E974123D3699613ED46673BD04ED51C352F124A8F89DF8C13D2B44245084B7FA02677D5287D22102AEF4A4A0AE046BB1C6D9FC9733AE5066C69A10589B0F33780622C1709F179D4E8857564804BF5C4D83E03484FDBD1CC4D71C6A2421AA59043DA85F0B51EF91FA5DF9555072278331BF3102F5147021662D135F3011FA48DDA7C97087F01B7F86D549F41E244AD7374C7C1F698801CEAD305026D17666435217799A4A5FD0ADDF9B8BF6E31E51B654E4D697554D5F574213CF579EFB1B11CB2C136FDB9EBC0DE4D16DC9DF43E17D88EE22EC88326F65875439066CB47E4C656A3AC59BD9A576D05ECAC5B3E7AB7B1A3C0C1C48807C06F1AE4881158D6BAE9620B08BBFFCB9940B6A6D04396014CFD54E93D863156D16F6F9C1556DB1E13E630326C8B681CAAD146F32B6977200B204B632F6CBCFB2BCE9670D89A9CE043E2004773913188608455FA715D1577E03826A2471EF0143DB3C39E03D890F0CBC85040D1675821D282822F80EAAEFF5CAA49699B68B89422D1BEDBC3041AE2A3D6D5205C72123991B21AFFB312F5EC8F96922EBB44D7A0F8ACC2E390F9E3FD82353276D73E85FEC904AE6319B140E5C54FD5B6F19D17E65DAC5EE270DB3E402534B0F408BB3C554D93BBD32B255D478F33BEDF4A192233294B320393D38284D7D9987708C019742F2FC023C041219FBFE2B603501629BDABB9C4223F5B751DB78C144CC50D3A35370EE563D6DDECFD6D715F08E14A00FC265D8433055083048396F1BD4E9F010EFB974D6102401B2FECD972C26008A4B94952EBC61C35DC846FF7B3E20DD9C6E033BF1185F35A5F02139068E1D4F30C4778FF87057F34CE1D2D40BB61423EC055BB57B56C502DB8D0685B0ADA42F9C52B590610CE2F8237F92B71B3AC2AB75D2E6ABBDBAA1E554D99CDB687B72DE98ED0FCD618AF5D2B0196F1D3C19DB77686F01228C3D1DAB1F171A56DF9311939CCED0F7B22A1B77F473E8DB65C0FD6E307B6F7A0F0FAD69E5C1F87D01EA4699F4D5DE39880CF2D8E910313AA6026C17941C41252C06687A085903A502048726AE8EDDD2D8918B71A19B807889B6C2E866FB818810F427D2A7B6CB137D94746A88BBF068EAD31216A5511A54D81031D36C8139776E0FE29EF7C8A5EAA730C3BBF05988BB892F699F72F098F2931F9B4DA17243404F64C311767A98547284063D44AE74735DD246B0C189DB322058198F1D176EAE6E076965CDE68DD0DF2B284D23B94BADAFB8650F21B148B9C990F7044A777F9BD229F7905B242CC2E267610A42A5C3185C64079DB340D86598C589F9A96F3741356BF3E6D2A811B6551850F917E07E5289A07382B8B506C510C9396DDA81DB336179EAC1F84DB9D0E7BF52B906E82FD132647A84A299BA202DEB338B79F976A8D257E246B2B1B60425161C72D534B04355B2665129AD8A44C09D73AF51DEE7043228EDB62B858399B5A4312DDD7ABDA09A846A60FDA8D0C00E0ECC364A6CA95643FAED93D44BC8BF1264FAFA6D98528CD3BD1BFA352BFE1FBCC202F44496FDAF9F9EC53007915EB67F9F8BFBC88D82100210CD471C48F5092AF4253302475F9E60C287F0A8549DA00538432A342814E1F6043BA4355D72268F6E84A43264EEC3CAC024DD6E79143EB502A58E6F8478AE985797F00A295E84A0F669BD9252A3AAC6B2AFACD7AD398DF546"""),
-                    TestUtils.hexDecode("""
-fdec4bc58e167745f07a2c4e30f8d8ecf9c7a6eeee6793f77c27353dab270398dd811c611b6191d597edf44df73fdc14bdc440529b77ffeaf18ed94a613fc3f340c55dd156e8d56769d509416beb75167dedc3fa35281ba7913e94ff5a374e0647a7f6bc99ea6ac30c3e477e69823f663e8748e8b5fc43f1728612d109a2947019331c718ac31e663d44041f88b7861e074f4e1c12ab2077dc59587fbc451aafd29e9a7d584b744d83d36f794ad034c014bcee229b847e8bdb120407201121f9f58fbd0e17ae318dc1674f1c7d9d3481629cdf02fe819de516854b2819cd6a9e97bb92662757a9861c113f67ffb191a086cc6cf612d13f0147bcda5fea3c05fd29115359bbe08a25c33a58a3b38c3214f8e4379b64fbabb00a7221fb01181c7cc2dac81e6271550bce192958a93f2f5a11035b411a00b610728f704d59d7a7e51ef2b06a2000fce618a6f82a06d18a899f7c59a3d12141979e8ba62aa4485caedbd6b8ae8f2dadfe21b7e27f911daaa80b6e22b91012ee5fa16164c5a734265b81aedcbd820b8fc5c8802a5e7cee4f50adc824dc0f0ffd626aed8fc5173b51ec373dfde19973df541b031dcc238a7fff8c01b36f8df74a0a5705a13880f1b49bb82cda0faebcdb8445048ed05cec1fd95011316a53712241f837f7a544c99c631422072ff58f579e5148885f5df4172044aa9ac4bef20e852b46ebba4410b05a5a8cd5993203f44075b0b96901fb73e1e561fe40b0decdc4b719c16391891957f97bd0eed0ce3c3b82f83d0afc9658d84d5e64bc83b2b68762b00eb2a0a474c2386fbbc87ec8b2dd03432506169f3f58f69f0dc62f140d437ef524700ff0e55e39264aaeeb3fc62940bbddc9fd1a13b9d291d82705ec87507e28c1ea90e15c8d3d6e94a66adc386b10a07c81daffb2b8d1176b958f61370ef1f0189285a49058a31c2257939df230e1218693f3dfdd9820407b509f7307cbf02b1dc1f182f9b3aadebfa7c73a6d6fe4aeffd3aaad272443df14939dd94af7543aae1212bb24dc7962e9e96d70f85a17464639f2e89344cc9b6867a6bdcd4191c91da327a003e62c1117af999f2f027ae14522bfb753bb93def9153c2d6c2a6fb8ffbe7923701e516c6a9c67ca2b2b5f66cee09864b6414716a0684fd2e3c2ff1f1d09731237dddad175b9debb722728049ae1a78401b7dcce662fa33fefc2c647b116467f25a42a932abe1742b1f486df764075ee8e765dd139f58762f3c61564b5fd52d4e511c900eec222116d27ad9dca25517449bda55b1509569677b2f0bc99c4d22de9114a8469a4e401f33e7576057d4f735e1c7661a8e986a5aad28026f6af030242535fb87372ef76023761a2b46fe30002e947a0b208f95663b34f8e92f72f8c6b58a9df690426c3c7352b8100c87b48639c072f0ad37f66d2b0e6c84fdbcb7ff506b911425a260f2a4e3ce3d6abf5d42af4fda4f37d0d4d511efd204c09fdc42d868cb8e036ef79b2425780df904fbef6e22f5117434da776e99253f0d444d1ef9cfb10f4e0782d3a5ae10b1627f7b71b040f081c6f5377dc927e65965bec75a5cbaf4eabe36c65ce71c75476c0b962a278077bd765600330570474fb68a30e9e427030825674408c0534eb2db8dfa2e986d45f06072cbbce4b3a2e03a1209fa8a9eca591128166b40bbb20419d31bb82e30b2ee7962c9fef7e788b55be7b9bac11cfbce39259ec32bf200d0b490fb540e1d218b52d04dbed8c3f650c8310e257d887c472e24ea02d3108712fc88de316657cadaa0d8ebc417da228dbda1ec98a61d1d1989dc7f10a0b4fca9f6dd2c614755bfbfe26586fdf8046bde39a2f8130d5bb9f55f67db1c9d9c7e626641a97b09d4dbc3178039d78e92b5049b7a5cd637cfe35d6c6b86771db2442040d15667c256c6beca875675a5106ca68ec6f7a01257c9c7b3464e01e8146085cc3a9aded04711d2c363cf7f262ef90f17c8ea28a0c15fc2eca9d970b33ab22fc43619cd42839f7ef53660e9aa88a32fbdcc5a74f370c6696922c4981048cde02342bcd5182f0d633cdc90b383068178de2499d41159d32f6c22989d230e0802ef40823a64625003c29b0b6c1d9eb39d15baa69947508c141dd169caf1c617a2ef16149876a56c6b2c4a92be4d48b3d277bb5967fa9931611a57893486fe3b8e8b92a8cae0496b0808b49b712cc6473ad44216ce3d1855d704561abf8988ca52cbcf7cf95d6b071acb061f03aadf2c50c4159380262edda1827050675cc375a82010e3e3299911db2d93727497ca0d75f5e539cf75d412177469afd91b1a8c8f36a2e4ac5484020eb0c7124ec570f94778e8a43e80d8fe145205ade385ea279d4bf6c4ce8998b118147edf888391488596f2737bb381cf46c939db876de724e141dbe7066f4a13c35cde58c718bea1e2b75f6b6d9600fa08835abd0863f2e3fb8f7d776b1604fb068f0c8260672fda6062e5585c595b087e399f6a6d1d26857425f600ab13113528bd2de7b8b78e933aaf344880e0aa06facaa7090627b4bce3b193308f8c152eb82e13573770e3a9171b2177e9593911ef00efee1237166261a38111f07cacd74f6a0c2283757f182a508ff531568cb05572eedc6e5b706c5ee3b3e8139b7ff6fb42a9b87cde81b21ff2e6e48d0f89a8adb77aa4be8db46ebad82b4033e857f6575c1bfc0500ae6b95c4c43843cbe7d83e8684a1275ee586e50b7241ddc72c017bd7d4aad25e468b824a043504ce3950b79a5dd2919fe3411dd250ea82ce01477306b09d0cb9a789bf24d22288e73909a57ffb7a1a395be080518d4bdb46e8648486ca8af29cf0311548690a2800648cff58534afbb5226c2e860178308236beee319c14811354b6b05a324115dbe53ea9bf37b7f8284f4b39dad5ffa4ea97ebd9bdf35d593d63026667da30e0df76941822908f6df732a8dc018bd2a93be0a21d64e33da01292fe3fdb5370a0fcae68f860af88dd8a4055960621524ceffc2391dfc237205efadb78f1df769e070b09431fb7206c2cbe3319312668eedbfdadd9cd246d3d5dd648d20758882ff7f3f156412394b7568dba0150e27fd442b6217495d2c42108e9f16e9167684caa81366cc25a31766e4743c49eeabe051cbccf225016f067939b238fa3e9330e4a7443d36134d7df29f8b260d0b7a3e14345b497de4816cba4921e18dc9dde508075da67ab8c210c730abeaddb040cf4e673ec03bd8d803fded05e1256d90d3c050aea4c223c174dc9242de76e95fe9ad0970c3ef6eb5e7afc8725c77c5fb8d265699779f9cb2bf8bb26a095472c939bb3356bdd218f0b2d99b29f0475a4858dba236123ed647e94ed485a1aaac64b7c2ed19d98f2d24019055c5c7ecc88ed2cca17019388419b3f9819b489eb837bd3c7daccff555c7daf5e5fb5c75694c96f566aebc5ad5a48c6f272f812b4606e21473e295c006c190a6430f7137c9ac20727e68b0eb6fbc8255cbab5cf3832938b7d85e6a4c46e7f7051571981bc3f6f86b9a6b149ae260360d21587485ca40dffc6e93c78e15b875bc82d31e04538863ad8bb8f736c23bed9a9698b51550f91caaab6731bd6feef0226fd3e08b3dcccd33cc6f7c8d8d36e8ac344f851c3596fe6f432017653df0030a64e73b1758322786694613bfe06cf75586e12b92ab563b583161292f328b56ef3648b050f75fb108102f0e28be8c4cb7dfc4283f68eb6bede47696b1c9156194c7152b79a96cd36639488215ec9d49f8abcd5264d89b51d72c447e31ac2011f7223789a82c702340a4ce59a298713aa95e17c6a3e92011f5ec81a3a9b6537f1331ae446965e58c2e1aff4931824fba76940c5f0abdb079f4ba8b32e169e3947594173832dc34e824f296e93099ae8e20437ef564da9fd48d6b6a2cb938a9cf884fcf3327e1ad935257157d0e8e379971cee3d5df59135207930ec1212b7f38b324aab2f172726712a9d60e40a0054f26586d5b3a794edf8f33819da983c209f9f4b514875975e40f72cf9ac1ec28811cca5896e9b4cccff414650d00e71ae2e37c4bb03274df43ea5edb923e157ed3adbfb79b2410b088c6ae9f78b10eb87b0d336c5adb19db50093a7b26fe1f39cb7c6b19001e4baccce386684acd8850cfc64aa0e16ac6cd15625e73b798651fd44828f2d6c4179b21af6dda2262c79322f41a49b9327f8ff0381fddcacc5d1444f449b54d8cd0103140c292aa49bd3a807e5af3fcf33a0176a3bf32ae337c4e187cff519a2589ec5a75bc531ae8092b72fc906f1d82735070b76818d0d5ca9266e7c0f4b9506f8adad55bd8f04f5b9baab4662d20eb3cfab00ab81bca5926b6909b5fd30b14c5581152aa37a3a275642f790913aa9f44f95161bb00c736eae908f7b3c0745514b595d947f97e67758cca97f754cd359d5a4cafe7884c10f379c9233e8f9de5e1a4688dbf92d92a256eccdf06819d7badfadc0f5235b3fb9c66cf65c6d755c5aed48610cea135d8e1bd748fcce6fe74cbea0cde943ef57d26cb7d0699f9069ea14ce1a66a5b57fc442c123409b896535283cc724c27240850ea8b9014d01d4ab2d8d151719f3b2421b60e2ce0792345f88bc26f2e3d4f9cd3a69777a114014ab481459d5c5d74278cf1c0ebbbac2919fc1a77e0997aee5ed24560563448b471e5679b13adf445634742ac1acab6fa5a0b6a0e8e285714c12fc05031c0ee83ed821bfeb0bafe978f785ba36392aedeed53e4cdefca5f4026b535d7a1a1c4ec9155b42f79c8224d286927c8af6b24c0d87e9089d2becaa48f11365e40df4810dc90e12ea6288cbc3cb2b84ac36af1867843be343c3c734eea10a54519d9c6bc0f04cd978360d5eef8c5fff75a3e4748d4dd37735919a1d6c7c4c48f5aa34567737d3084686b1fbe2f23e4a639542cbbe7f99c18a80f97033795a81c9ea029d51e2111e59c7b66a2c78629a1594db70c5ca13f3a55cbddf56f1e66fc9f3176bd073532db09afdea26530bbba27ecac9d5c164ac88f7fc3fd71781dee0612ec04b790d66bef2f748e93a6215408bfab48c4932277e3052dacb3384588456dbf15fde73c3a2036123e99d698ac5785f7027bdc21a130e875870513c1acd7802959f29cc2c3a27c1d9b97256e48666efe178bf7a1b6764cd25a4e8e97f0f55089af7fcc40ac1c3174f9e9d7c2601c8ccdb7c62930ea25e3ad4b63af9c2dcfed98ec7360e85327622f01fdb3617aa4c47ceae1dcb3b64471cd1d810d03540685d2a34cdf58ebed79b81aa1b0d2157f68ffbccbd4e617d61eb23c4c77c5bab60c1bc66e021c67a26e383aa01d3b9f53f20b9ca367d1e571dbff0bc8baf1baf9a934f7cfd06103aff1db525bcabb83b254460909151355d60303b86bce2a5d0642e951a5f1b356fedc9f6cb84fdc9c30e39231b15ca1d5e26730cb175803f4f9df3521e1f15ec7ad77fad4664cc1f96813c119874e5390b2b3b04682bc5ae2a81788426b185f57b308e3b061df87c9e69b1629dcff9b4104146c063143a40219e4c0844a58d2f91cc58dc9012de1b4c7ad6afa9ad0741fa13c651be4f27b09ec40d8bb47196068ce43e9585b1813ac01825dba7b02aded59d3df27ab5a18a7100b5df7f68b51d0557a5c26d794cbe0a63539a16e1c3f612d8a30965271ffc16a088c9b70967ee3229e2404d793086ca6f378cfc5d0c560f9de81493cfebd6349b7923e16980d2f04c5c48f7f85e56853b11f78e21900b9d9dfdba973b87c1db5c860a4c890292c4aa4760cf5aa9972a1db9ebae714c93e29af2d9b3ecea7e9777e6d4fb2550f3f952666686cad6282e0dee72b88d1b68bb1ac9021d89dac8a56a01c0c2138fd71883c7654f30117019dc70c85fe42cb57c23a2a37060402a37f8fae690abd43221fdcc23d992150de4ab217d35aa5752c3bdf2fa3fdca3202f7b0edfa83d6a0938a3e2349c51d6ce1680654c38c8d6bf2659c1885f8ead0bd687cf56144f1fa6f32e90e08f059bcf34e3493f42a85814c24cd68103230430567a960618dc99cda88cadf09e854acd79a2a54dd70dcaa5510e0cc3e4bd32b86bba8f8cef4e08867fea37a14d3412ab5f2c36c61e6e96eae2a00ae94dd5f27d7a914fcc2eb6f88b8a73fb0ecdbef7a4e2d15b7e9263a37880d242f8c230afafda5a7e919260b6e14a8d65381d73878858b0001a581e7add55c06ce1d8e30caf6802b33805e2b78d4b8eeeb20c747f7cef3a27cf17e3c1be070e8fa1adf20ddadf2e46e53d8702d75c637c2e9d9b244e12faa41f1ecabc5d98979dbaf2f0a00d061f1bbd0231c94fa5ca97a75b93a48bb3d2babc9cb0a589df0f8cc72265971e49172b588490752854f599ea4a97e71b0a6d415d058dcc875ef3f09c37fa7e4c0f45045a7bfea8fc0bd9e0c1eb36a0d3e7e03240baed7cb5d3e6aa8ceda0a0b394584bde43190bbd0ec6ea5fb3973799db1f0fc11232c3e588ca4aadaf4f7141831468183a3aed6fa4caceced00000000000000000000000000000000000000000000000000030a0f1219242e32""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-89ad3b5244d66fc84f3dbb02bb51be6fa25bd2ea3deb3bb6d964448351d9821f8b1bb2aac85f6bdd7573795e228fc04b4b30dc6940c3d6fcdd803035a8d61344515b7983ecbafa0c23e961ebcce057ba857d058576d0cd929d9e5538c5b3818c2a697677ca30faa37b887f0309a8f59ebbf7f34b471abc65f533955172ee610971f85662ce59db9b4c7e49e75c5b03239533094362b94d5d399ae4b7f94d0cdfa51e0bd6d720eb3468c177273c3c0afb7569ca5514849053e433464a6136b160b35ff19406613e31e7c3b8265b585792a8e69d53a83498b089da59798b54d62cb669ac1c917f77901392fa1d667545e3103902104103c2ef080025978041f324196cfa0de5d9f4e2929b6a9a67057fa479c9484ce55165c9d0a60265b2ecc69430e3081b1dadc91056c8ea701e2ea48495153c86ee3b317ba127aaebd85349b94cd8fb60e28a4fd027ff1d96da4bd2b8fd1c0ded721f61168dc73823e9b68b8f6dfd3b27769e3f737be70a19c20b5dd06f91c5172eac3077c2273aca458315bceb77f3d2e84e4ef8ab66e26f8194b8fe666e66d34bb779406f1f60245e4014d4aa8b6d265c9ac85df71709d9d09cf9278d1ff37765698879fc3fef617139998f37630fb51e76b47dff86c367e270905643032387bc4fba84a63c539ceee7247b68e95a5c513c43b8b35e2f1228ff1c06478dee9461eec9763a227f9bc90db9c20796dd98c5d178de643df332e229daa52a1bfc0f445e2aa8ea64f233aced5d7197a32dd2954eb8ef28e8ede22aad2edcd334ea41995355eed254bbaa46af4c00c33862ce3c3f88bb2e60f6b1b9997769c91e4aa6e16aaba35688751054abe29545527b761e7b84a25a7c932706a772918994b446e531e75c94a00c1e4d5b2fca578664ad492517d149d656de717c834d6ed62bec4b78a6a7290497c0f6fca54de83cb42cf8480f67e83d0226f5b6f99562a024962920e75d4c6f766a6de0d16f7965d0b68b322743ef29f84dd1f374eb4e2be7b6deed0ec99c778994e2b267edb1b198e49a27d54306a484084d9906425be4232edfb9477651660876dd3b234c16f30496dde0704004c7474ea045ddde3ab0a13f62fc5367a4be561e1ff50a4d035e6360dab880429471ee57ad84898732d9f8f93763624ab53d8ce7e7d03029749ea625d424da59d22c593302cced4b7da41e9727cb9ee5d4a5ff5c7e6e4a2ec98520553d90afc6d0928201576210ed2dea2ace73dd5c072ece53068bbffe6a0ac44767df1433b4353540595f28d0238509f52b4588be42d9eccf8d3480199945e2d83dd64e279e25849e22bd4216af75045c5bc5ace43f3a5045bc15e7b6a8e099a709afa8c86bbb5c153d6d5cc522c115b56dc6eab85f76dddc857369c3355c15d9cdea649208c7a7579380fee044d98f8f1f6b108589a89877ca10d5bf94bda70d5d218efea9a24b9b6a6e724a056343099c04b2a13477d6d87c16817ffbceb55ba0046d1840e1f9d1e316fe35c6f06b4cec777013960a87712e3f33bfdfcca8c214bdb9a646d2eaca0f8ceedbc230d888de849c37035b550f17a927129fc04d4a51508a36ea478127b87e04116076e215aba3a925facb757bb5947c09e1cee47b4987983e1bbff5bba5432178dcb18b4f58c4aea40732ded1ee98858b936998fa5e7539a81b8fa94a852b44d824c3607856f1de4f8bc179673e0370cdb4f57f9c1a958174dced4f50c1f7eee29f8cea9518b48986e0f8867d96b0b497fb83a7feea379ef9fad3792c60d3f0e08fd70f09065396c9e2b1dc3072bdcd85ca66a5e541ce76426a56ba840a1a14f080dd3efedd7b4c1aa80aaab9c51a8878b7d7ba79122fa3356cd59fc8e616587e3214bd925808b5a7ce4dda34f42c76aa8d2916d5605c1d265f9abc7228b680aef5ae5e71b2281cc3765ba98ca9771dc2f0992263622232ae9aea0c790ffbb765028f17409a2e19a9d3ad5bff30c1e82bcb584245183d70cca5b2707384ae504f3ca475d2daedd1feb8ab8bde4e25f25326fe9e2f69557394010d346b025ad480306d46b259329a84d6b9477910529f6ebb7a92c9a196f495700729d71ab94890f1ca2d4a34128d1807bd2987df2b37cd490e7ebc91167b9dbcc34fd896089b748c63d6b6b4c8cc156b3e554f326eb08ac7170894b2eee348c9478f1f2ba488a1c3ce8ff7aa19a31474a8054de2b1b14bee71fe4abb259fac2da5e7e4a43f5b70948d44d03d3be1514da9ee932b4e4415f5f70de11f5ed3f437d2d0885cb7e4131c97760ddf5014b137e25869daaf0302dc26dce0b557187d418799392490c75dfb0d40469eff1b83ccb0dcd48ef1175e9c035b29b5f6c93ac5fe41b2cc2fc2d7cb8912f6a1f79d38ae7fba2600ea9a91be79dee4550fb613a8e29cd90e575cd55b54a3375a10bfe6de49d33f0d1a3f70a9526330c97e191a133a07d49ee12d9fe18c7c1c1ba5b6a74ba57c794e296e95ee063d615d77048e919977011087c419118deab38d7df9f7e79ecf51e45318df85820e2bb7c2d69a11c17d31ed1e86df304a4845bc8cee05d36f59d610a20bdf9b16e428fc267f585faa573b779bbd6e540b3e32ad3d9cd1c24a818ee83de5a91008e33e0a46a511c26a88fc61399efa2fdae38f75d1634fd57f9849c5a361b94f8b97c04cac9c0f7109bcb638775238711867f7b32b852feb3ee5653b0cce063415c9fe9dd7f8add3e4f996db03ba5f37a1cb344693ea95e35357772c68d090feaa3d2c61f4156bc530178b70e4b9a8e75aa1c3738a2219d3fdb5dcfaf5d9d77b541c944eca7c9af42a358222ae334ff5fa5f5eec2367040414d01b4c6876b79a78c006afb5a357a78b96ec3d502de789828b04eeae19cfc5fbfc01441da3e86934c4fe38804751e2d3b47d16c5a9a246ac5731186e97c9671eda1fd0f68ae37c00065b8c4092640153d30023a3298acee9550ada9aa5315c46fa879efa35280074f80b3a689f41a3408881f8b9c42eab59dddb4358776dea5d7a553545ac5a6a9de2ec05f70e29d81627eaf1d3e23eb019f1921752779b71c2a8f24fbeb800a12556cb12cbf7b426d3aea37a32b2782894cc23b5fad1f1dbdadd1adcf9df42afa30a2e2829b12f6050156d6c5c39dbabc32a02dc4383e889b0edd16c3061f730679a7bd95c07b197076675422e480d642c7b1d1865a7c472b30c50cadbf222374ff392d5a9f72dd8441ca3f3d688366e7f918142bc00e5045cbfa5df33abafa9f22a205bbcb1f3009b903480c5a72f804afc37808a29fc5a732fa606cb4b9745dde61e50faf8cace5b203b3c24828aab5140458cb4acd31d4795726dcbe47e27a48705062994584a7f51c3ef1d2e3e64d1149da353fea5ac3fdf544b5faf728e675c77341d0c6ab0dfde580a0cfa07ac93f4280357886c072b2afcae3c0c678c9003ddd1a0d2d9b9a04e93789cbeee7a13a58981c77e6f8b6190895d629606bc1c0f38b2ba1b1507c1a7a02d195c4ca2ecea6de3f793eed2541fcb96cc2ef03f82ce4b23ff0b5536d64c178dd6d24203409f85c8707a319cacc11ede0fd14344f7348908ba8f9179fef6c7ccb52f81c5ac8621467ab977d59ca0ad4bcaf38d36fb2776e4ca7e2c082297905d4fd95a7dff36857b3a4d45025eba22f3a893c748"""),
-                    TestUtils.hexDecode("""
-701B8AE25CD8187095349A4D41A067D4FD48732E62547E491D38845B3507A7A6AD8F8AFC53D139E47FC5AF2723B1BB057FC797519AC93CFB18DEB496BD9735455CBDFFFCA5E69C95990EF89F509728D1CE41F36A4C0364AC8C30E3EF67D3F3776400BF4C838A477231E455FF76C92CFCCE1B69B00F99451B0A8287ED59CD79EF0D6E697C93F7ED38F20204921E6E2F141D3DBDE1C201E5CE7C524370C339753676746DA5DE4A398CFC2CB1F568C16D4DF34A27CF04F0637B1447C6CC83E965A3F86C538CBC235E440CC2D1257CF916421EC75928DD6DA3CA002AC93C8F464ECD522EEF7E048C154D73053DA7BB63A5DD845512D2B6B7D1E7EB5818D170D14A4A698C8922D69A98319A10E0AF558E2318FC390ED990B75ADB50C6199DBEAF5D53B49235DE7CA116932EA38A109322AD05F5D681CE25FFDC9F6A05C4ED2EC6D4242173D2039318EF7D0733D86D57C4E114B3476392D47FC68796C9F66B1F1EC70610E1D57436614D5969564DEB8673686170E40BF5CDE506F7E70964E07258D4551F5EE0BF2651F8BF3D3177DA76AE90FAAA69C4F373E664F0A1FCC62F208A8BE130C499166D13CB34D77FDB32D5A7F3AD38856BFD3A0419B8744DD2F186D03E18634D826A5BC87F1566FEF88D9ED93E74ED4C005EA3EE2EB22FF5DEED283132D00C7A0B131BE1FA38E30EEC68B748AD533BFB23B9A14A936F609D4C560163235367B0D64C2C796F1106A1A9365E8F507B4BE0514C849A81E2C7388C8AF300D98D444BF808C4F9338C47A853222D5AA8ED283F57DBF0689E5FB89A456005B6B95AC3D791077C79BAA2BB42B423F93A7D0D999241AC5B9D64D65274817F9BEFCEFBCB4D5CAA67427F69ECB279553EF0D33A19E14FD4B284A72081F949FBE2A7543497F314CD7496EEE866F33102BEE5CF9C706426EF2365EFDF1AD141552BE65D1DB4373B0E8D449F3FD1733AA164C1F2C24F74E240C5096CD201A11113D6BF5CA19595C4B0A81E1153A4EBF88F38F1812BE517158787F2B378E8E32C9F97432BC9027292E5EDD7DA64FC6A32788154B62E40A85701895E13287BB18883820DBDD7647AE4EE1FC1D43C199EE69B1A2E2A7067AFAC541A8F44E660B2A7C114F402E2054DA7ACC41DDDEDFD7291CD4573DA22739C7785EFC2240B27A90BFCAFD1AFAB6C2B0EF5509D0DDF349C173E9A6C906BAF5692C39F6E0D1442F84AD2FC118A14B12C3AD5DF8A79056017F4FDD76603717B080E3AE560D7A601EE7FCAA36DF7289AEEA59EDD0B73BE91782377150F03C2C2ED40F33A250356CA17E153480A7E848F090DDA29C65FBBFB495FE9B7A2BEE342C7D422F28631A8C9CF643DC76F07F162DA1AD3F24589971032796BCDCD262F55A8C34FFCE05FA9DC001FB35D6FEE75B42DB6DDD2138C0517D003512F0EA8E982C2ADB5E5BC1F19B8ECE67E4AA1681383A97976B6A8F2025EA80B1BFA1796C27F6A54C583711E2EA46D85C515EAAD22ECFD68C5D02853D688302704EAC4863DB1FC69F8C35411EC6F4A9F0A7E7B3385ACF6DF805447BFE863181A945E8E7944770340496F5A19CB7DBD0D9010B7EEA3C585926408FD40F245D852DD208EA97CDAB0C16C1EF80B3E5BE77D953A04C1B6F53A23080B54F439705E417B9874B3FB524794D26DE3DDE88E9DB9FC36B1508754EB51D389FCC46F822F50FCE199DC14E4B4468B8B15A2460EAD05D0C47668C05A2315748897AF99D320E70F2AEB96936D7D739F72ABAA6960DA6A3996988F6A3F7AE7772D49915753B936367E022179E69B6853E1A83B429B42BE19EE03520A5666124B657D2FD6D15447AEEE45AB1FF4593DE9A2E6D152C64DF45C1F62AB9B67257B2A2115D224850A3AB2FA028F8F9FDE7C9A9FBA2FD291346037A1B4E00B0642B07ED54BFD70F3DCA3D1B8628627859611006DB2DD17A351751F85C60028DCF21481291526B1DEEA4C7CD2D3230653E6FEA1DDBDFE1BC3DA93FBFCDC5A405975A5DC68DA0D8338EFBD6CCDA1F2374D72FBE007599E81CF7D5C37985EA09C561A1EC40A70784FC606FB7C3FCD981F112C599C78B15B7739AF4DE129D489336BFD3966C10363A60E749162D1D8311C5E850B22910B999080DFC86D1787C35768CD5470E9F7A51D4EEBA71241DB57021D6569ED2BF201C06E235D6621B292B686D23E29DA4E81C873371593CB07B3DE46E91FAA3D4A2AA6F62FBF6BBF1954647E731AF4B99EEB3C0FA6385699F8EF2D8E1D7F75161129A1C7F8C7C68B906EAB8DAE8BBB3541FBC65F36BB67ECF19EBEF54BFC2EC4E1130A2E4F36B5644A73CB0E244738B6E5788A4B4457291B57F1FDAD2C11FE5C7DCFD4E742A0AECC460BB660D7BFDDEE4CEA074958AB94B6FA4CCEFE02FC7001D3A2CD013684A1ECC2E2F6D90D246726EFFFA99C12D1FE4AD10A6BE38D70AE3DE5C4843FE6CCEEF587191B56F666C1662F5C6FB03955C557E1B4CE247A2806DE39EC40CF8B97835EB0E3F2D829E0FEA02FE60C934FE72A25930FD6692B9ED979F14536F406F04C3CF0BE98647A5967B81DFAC353A2F8236FE147BFD7D3731C49476C3191981C9AF239AE8C72570C6C53E7AADD48E721E623D6CF11A1E386EA7C30F070E7AC4F63FB42AB74881BFA3FF3E8A35EBEF04D39B853DDE0FB17DD9DAE37A76C96FF55F64669CD9521DA3900B7CB297E813521239D87703CA395CDC8D8CC4EC21CB10A1C672493E013EAC0298F8076C8E0B56AFDF9C31EA01CBC1BDA4AE17FE103C9812E940A34EB321BE7BB288CF8BE7017AA58AD528C9DE09E269B10C6FBFBA5E8B6883FE7E08A0D184F8561FE3F43582CA045DC25CABA52C0157495410382A048BA67D051EA115D867D780CDE5EF512BCDD14489C43604F86D929F83D118B905C63BFF451FF3540E9E220851A402BEA0DB1A7CD94DE0407AEB9CF862BFA3FA703924D0A4803C463AAA827A04B0F09556054F27DB98E22A96D07F81662E0E910836B9423968C3F002E605BB688720FA7CF3167140BC21398B5E4968804F3C3065FAF125BB6D887C869FE3FCC27D88E048FFD0925E748C096C74BFB1E54A8FF6E2C838F16769FA4D8564E5CCC58DAE3B102EA300361EF89EEC689FB5BB0DE16C5CA98A60B8990EEC0006A147036871FC2A6ACFC6A6EC907D28E18A76560A5436BBF9353789C8A5DFE559FCD68C117066EEE5B00F349D6591E104295E78F445FCDD3D6883DF50D1DA6A04541C7E8171523FF36A9C072164147D14985BA30FD449667B580D73B06A5971B720A8B1D2A6896FDC5E4D4DAC78353ADC3449AA53919AAD15EF250AE12E9E40B8487F66AEF0B15E42BF34AA816F559062EEA24EBB01BA369747B29404DC1F1108DEAD021898298E72F4BC1DD821E4C88329D6F03F971F554A87FEC87F34430ECD1CCC6627D8CA49EEE1D5DA6704CE960021C847DAEC2DD544D4EAD2E2086058CF131296B7F4FA4B71A1DC6D6C642A256AE0C0EF9D1211EFA3845B12243BFBCB4F423E913A2976C1015569ECCBC159AFE70F1EDDC3AFAAFDA45CC02EB60BA0DB9EA83EC604113479BE848F381FC63C63B3111DC5179A637E0832A26EA32555908D79B308351CB104C43668371DB32056BB63540B9C3E5551A063D2B525F8A016BBACEB402CE7D7072CB9F37CEC13E1EAF7D867534C013D78B9DFE01C13DDCEC7A3444AFF9E182F12B6901CD9A70F21908FE692E4C0536B069C89685BFA9D973983AA8C1DA461D18ABD27A6A717D9F2122BEAA9BB1742622F51FF616FA2EC3A6D4724A3A9215D7B29A1BA372282CCF60DE90B3834FADE6E3743AD6B2F9B7344F45A29740DD7DB2D642F94998579A5DCCD2EFCD2F7D08486BB327B844EB19ACE3B4FB0D85F8A24FACBF318C98199A0B2C7FC2CCA59AE84A522890E22C2A7207CE91623362C7DD8E9F946817C75B71FB9654E2B7F2E83E46E75ED5638741E414D7F8E70914315F0E37B5B4E3E1CFA8288B1724113E4A00B59B7764C2D61443537849E77083FD13BA652001F39DD9BD4B20AB77CB945C5EBE686A0627ECC52F38A852BC9E1AC8D303E3B96D9D086920A19E5088054DECA635E802385600F673D3BD0A5CBE7A5B9BA8B1C4B73B9246C1A1C1071E5F98ED42041037FAB67184C89BF4FFE3CA0AE2A9BCB020F390F0B76DE2B8AADBC99268D3A1D467A024184CC9A455A8F2FF287A4C9DD1B0C86C8E176BB15B12023B291D44E7FF0C44577F7A6D788D82A75C68C9F5BBE504E7D64FD2AD18BE209E85C45627FC045BC81E3531A2B886173F3C3029D1FA98C792501A4942C72A7A892232F390CCBFD7863AC38D837755011F919AD8934742D0795523E6D48A958BACB9A9F7B9A5A9D914C37114CB111CB536EED3D753D6333219EC993AA5D39BF74E8E9FA02D8BEFF369EDAEC67A5CBD128FC9BA6F82E31A4C59D783A99912C7C389EC708824AC7FF05D56BA6D228C0A9D96324C6D9725E3BE17C44CAC7C4D49235BD15384F95345DC36519466A13110A58300F7E3362295DD7069DC6A88B542F2BC5C9F33328D9D8D1683902C025427F32FD562BE3F0680FA05851296E15C5FC67E96BAC924407AE6BE37E9B61D9A6383FFBDC6E77CC0887726C474AD735BC50039AEC665D827B0F6BCDF7EC87EA6BF793386F2A65C997545FB93F0D53737C53D00685DDC13960AF2632380F105840A1699ABE53999C568978ADAFBE21913193DD0844D89BD582418BF8B6BC430FF1FF7750AE8507495C14DF21A3437AFCA7DCEE7B1F1247C802081FC5ACE5B125AB2BF11ABAC97E201EEC2A8C90ADED920728EE77E1FE2BF31A222A1CA5263586A16FCF80E582258654D0793B1551EA3C24C4EBD27C52956ABCE6ACD05FC2F088273FEE8ADA0256F30B5ADA8768D8E9B70279DF95AE5CC68FFA99934C7520E12F57D213FF18ECA6046A9A3F32E280044023220140E2485A3B3EF7778006B18D4A9DCD177D190CD903CAC1EE0897F58762299A0E026B8EEC6F4F3D0BE1F070C648A2D73869F22DDA21246CCFDEB7A9784AE967F0DD0A2011C637099AF33E0D608AA0A5B2103060CA1A6718328D451368EA3049FF60FB66FE54E778DABC48413966EA14E22083A884E8C8EC33F885093F01B5E34477745A9F82C645C8C5498306AB00B78684252ECD74C163BB8AF9B49AA03E244F4EFC4A2E7099074F512D465C84773DBD1FA96D26053230C192DB289A1596E60B96178DD8CDD72FF14B340FB5830696B393CA319649BA56DCD517F5A08A528350E2D9531B3AC187414FA6E06C0F05D9987BB2FC98F7C8D4F922B8AA45287FA83B900ECB6C9F02669063296F1EA389858F6D2E10228E136FAE35F21DA151EA7AAEC593E5948536B68BE58ABC57771AEB406A0C3F931E7DCF85A350A3558E5C1B1F70E6299EC9FF8B9CC13E905D9902FED957ABFD7D09FB84FF22BF8410D387BA85D8555A75F432EC5789498EA36CF235276176ED48D1E374DB5C2DD1A64714D64FD20D4FDE2A605034E4DF607EC6E11D0465DB25B9D79C83182384D64477C126E9B8558489F69AF29730B4D5650B9860326249777DFE9EA5669736692D0780E9BA346C1727138F5DDD4914487CF32A4E9CB1DDD5617B6B45CF8C981944684BBB7921C88F5A25120047BAF2D9346E220EA08AD168B30A1B82B3B63C4913C708C02258B6AEF1CAC96E2A90EF7D0E1EFC0BC5BBE05D286E143FC0CA4A23833CA12727F0F83079F7BA80D809D6C739EC4D0DD9CF75C4FE30B12A892096BC4B9167F16819694B2CD5DB4B80DE8DE988AD50677695C4FB3E0940913C250645333B6F55E36F649A43C3A39ECAA3DE3EC1FD4F9F65D9F7AAF75B60DCA3BD1EC06495FF5F1D4FD6D83CC6316E40BC469EE5F44E5AE56ADB229A7CA5CA37A1508531E44B0142B4330048350A40FC82279D25A87E043240B4BFA7321340502F0D37073DF068596C4753F8709BAA2A7264ADBCF5F934E857B3225CA47D8A182B80D3DF24C3612FE4931EED565BE563115414CC2B6BD102DC6BCA9F104CEC8B24BA5465FEBB7E9730C928D6FC1144224232A990F8BED27FE6D28AA35A91F90D6A0AFE9A7E37A5BAE51D8AFDEBB7D5670F2521095A56862354D2AD946663B4BBC7049ED1884347734BF3E78ED227428476F1070F4DB011F8DC86EDC5BAE1BEDC9C5D253E4C5C6816347EC96C5F62AA3298588625304118EC32DB2DE0597BF2056046E17C69EAECFD26475066AC54D40A673741BCE72F138DD98F1939598E5D94D565C1337D1179DA057D4453DEE27B5C04777EA710D77B317A6E8DD3B4F26A6A9B3F4917A0E881E5EE528462508DEC6762DE2BC3F8F8C42E8D721BFEF7583C99DFA4D1CB49DE2A303B67AFD505F8A3865D853BF19C4A0F7CFA92F5CB18CD5D8E378A5B041449EC9ECFB80E0865CEC1734D34BC44E664243AA8F605366CE9F849700593C76BE0CB19CA1255B074A8630FC962B50106CD93DB41C6E4DF53B6B1257872B0D8CE9AD5F245C3027A3F75F19DC568ED1E0F60CC20DE625241D300DCDC8C953676363868B680B471C2EE623DA408C7E030833DBAAEE8E701374156A6B785E0EC7D1A0A55A599605BCA0FB517EF99939889C862CD790240709BEE0226DC7E8177F641C747A151A89340A6CCFF6982EF39683325390DE72E4451BBA74E3CB102870F1E9ACED30BDBBEF160A49746A23C432C3ED7EEF580969110AA438D00AA03F54E039195D61B7840222AC994784EEEA538B7E830A6508AA0B460DA4B4C0DD9CB052CE6254774FB147F7E4F80214AF1FAE59F8ADA6509123438E90AC13FF7CE71AAEAEF7A39C434C3824D49B894C389CF320A430A7F84A5F4972FF98C388D61C936E453BB1A340528A9FA5F0B0DA9543275435E91B0F5560E95F9AE4EFCDECDE1584761F8F60F0280ABF40FC5834BFE456EF66AF66ECA1098DD49BA2CC4B12CA9CFE256FBEEC328D049BD6BD19E2358502672F029888DC3AF3350BC2EDF5C4E07D59DF8DB9C14B86F1FE384227953E98978997902C8F237C8BDF300A72248B3DDEFD52577BCC0F99F75B92BC056719243F7EE67932A2DECFB15B59C95B43E183BA3DAA41B97E177D03CA320A5FD5D7E5A88C4D54A8467B883E0CD5924912642A65F191DD4DC2B08DD28EC0AD2B1CDB86EEA3DBBF6D47754B1BF7036A0BE90CC3775D263A5BC688844BBB9B1D9296804176E17C55D6DB888C2BEDA3D546FC496EAC5243AB5D51686AF9B29BF6D4A138BECD49665458B816BB09848CC4318136E6B170BECA544E8ADC35D40DED979111B8B1D4577DE2FADE6A1D97F9E82E9D3F069F3287E559E99224C6494F36233453036DBA617088D619395518B4E6725125850B3121EA957E721244DF53FB343483D27E6C3A53224B38C11C1D64CBFCD7041A44836AA606D170A80E84BBC0973556B9E4B1BD776C6A0876D727BB0526809700A0EB318BED67843CE4A6BE2BC10FE9D8228A4C94D7A506760E580E8A0E544ECCB07DD0810D79443046951C72E017CEE5B2C959754D477D706C3E043298CAD200189F4390F59BA27B0099DC551673B5138AA654E054676BF30DC61CAFF444CA22EB32E5952A598C07AAAEDDB83B8B3789EEF97663ECBD33FE356DE981A24C29DD5217E14DFCA30C0109419D8765A061F747BFFC1E221D3ACC7FE239375A9548483543599C837F48EA189880278AB2E06EA44417EB945F20ACB464CC458E249A8969273A460F063C5FAA907E42C9EE304B27C85BF41FB170708969A2BFDEF37B97DB4A16BBFE07370039369D04D0A9155623AA390ABB75D47FE2394E4606759648954FECDF4554F660D3176AF33153A9D7B0A935753B11E6C7295B0FF5680A18A42ACE577981C500581F741CA23DFDDBF22EB6511E19C016EDC96DA545AD16D5EFB9A8F10C45D78E01C74E3552FFAF35CFA1BC0C3DF9D14C1BDA9D510FC7C7A755C71B5273CD7CAF3AF44AF066DCF18B1B7D6C0D546C9C0B0B1BBE88F512824CB8B512438ACBB23CAE1178DA05DD67DA6392649213805D680AA61D26092BC1B2CE50CECEB7541D7F10808DB2D4A6B12841C8B4B6C5519C8683C998A74AC3BC3CC44D81B606A9A3174929E4AF06E032A24E67E9C66885004F07D4775A6C66A8F42F94920749FF902A8F1C3BC5A1A35BFA24040EF3B7ECD05654CAB696D3323485EF855361DB57A65C5AA0B238DC551ABD6B4A8DA0EB987A82F56E5EF05CEBCB4155181BBC61C645B2A4FA8B316FC6C5B3BA12829E74899D0A42B42821094B57E6D221FFA108D5D0EDE9012A88A2BC361D90673BB3D19D6355B9239131B42FB3CE832DEEA6E4551BF6C6533CD8DE572ED3E5DC51BC1ADA13C0C7E4F723CB964125DA08E0D08F1CFAE124568DE55E2B39B1475DC8F6558ED763FD7EC2DE373F4C54399A0317087630AED2A64BF13D113E8AC32E6318EB7BC0DE20E846C0CACD876F47CBF79DB6FCDFAB75B371156CF74B443E8DACBEAF94203037BA14E821A66244BBB7E989567D176FED12AD0BACF79834D067662C11422631554D1ACD6BCCBE23BF1D0C042C1CACA4B9BD01D6C5757E52877FB5DFC92161C8BB15A60222D12CEEE973812B4920B38547304E720AE246FB503C9F97BBA79640485624DFA2F4D508300BB80C70CF8E271770876062AA1EE0F548F6F7D95CFAA17FF1FAD847CBF6CF90B01D29C33B43473379F4B5491532432F6CAB98C365B84D357B48B416C2A00B25D07594ED4E4CA0E1BA5C92AA2F1DC7A6109AE8D71B9F06440A770FDC2501900B9EE466DDD853CA5482B4636BFD58AD8B24D91852ABAA0A37536D4118A122951DC78F02DDA8EC8029ED938125D759B24C90B0FEBA1F589AA1C10FC9597CB7E703D93AC4AFA43D3C239337AA454BCC471CC6BECF89266F588C3EA71AE50F146097D9CCF21E75790A5F3A252977E4D848DCF5D96DDD4FC1D0CB583A28AF9D7648BDAF8F1E94A83CF5349B1F4AF63AB1C66757B75C58D10F27F8619A5A6BADA67E841B6429AB40A09451313EED76B93166B3A5D5561CFB6421D83A5E343C8D277389950328A1646C3DAED357BCF2E8615695D7E8922030148844058D177D4E68A8EE31D5D810C73D9B38F6863083A8266652DB82A43615A45E6D14EFDF00A4333404DB65194EB432187C1EA7C48F819C34E48EBCB0836C84534A238C42E0B9BADFBB15B220DD0BF40F8C0511BA69EF82FA57D099BA84EE4AB6FC422442C3BE1E8DD910B4117BF4047D49419FCD2380966F665001FE4793F06F272E14E1893D502BD3343AFF5EE94A58CEE04E745E72E51124AE8013EAF2C2141012FAC54CD25E97B6FD3F0891BA1DE663EBF009A7008222F461B4E7D50628133DCCBA7CD0AE44BFE9F675E094D972D896551A1205FFE0CA8FCB739192488D2BDDD4E10493B43C7EFEF60888CB11ED68F34630623206E81ED04D300C2C43B6F27E41F18241651FC6B84C19EE1EB018BFD7A0D4483B0B6DCF57236AB27BF4CA17E52739E4D1C508C78F6B6E9FD53F423AFFAB01F75A9B1AB725C247492DAE3227ECEE2D60EB186BD8972FE455C393919E6D9760AD1BB706138824FC3C9EA0F673C1323366DEAFD260591DAE60AEA2DC22FFE5EA2421F35920550C0FBD78C4F6469092F89FB6908457BC81A175D75B1F97E2750194E68705B9D1E9F762068EE2FA9286BCCD3ABE98007AD1AB27AD2A094C6E164C5BBF88CD4C5F325E4E91FE2867A94E9FE1A78DAE2ED1C11CB4D365EC2F3888612FF58B493268645BE9ED69C196857F8C995A42D5CF4542E609BB35B0BB1B4BB85295ADE635E8FA237C5DF471B8CAD7E98420077BF1DBF6DCDCC1322C8BE1B8DD5E228B6E6E04ADA1D533B0C6221FA83BE7C19273F9AADADE041CEAE389D0572D2317906005BFAA17940026CCBAFAF8C7A4BBFCE30EDBF4EF82902E181B41A1FC006AC01BE64CF6E4A4A14FED995D6F323405242BCC5797E43276ADFBA44EB8E3EEC029292D2DCDC8E6C93AA6C02766308CD367D3"""),
-                    TestUtils.hexDecode("""
-16c069f82e6f6efe9eb825ae1b6e908e32c28e3b0ffc443e9472356bb19fe58378012592c1afc414e0ff970a13a9b8cb51b968a7ba9a2f7d0c326b5e1d074f5af742c2b548f87b8cf1baf45f86000801486773a4240372f8f1c05e0e9ceb1bf5f18556c62765cd06c472781f73f6c766b44c2f94e436eaedf8612cd1fe381e645689cb6e7befaf031823029f5a6d8913e2245fec9159995956825ee81fd66ecac65d960506f2b3f58aa4e9a6606bae585205b351c5654b9ff455b08aa9ac45ad3b20e7619a3383913defcc42c0d25acb6aa2f3d4e17e4febb6dcb59c31e853fc5db50770059aa70d8d3c58d3b98efea00f9756260d843cfda0c079fbbd4933ff8512ea6e379b7b1b92ed4146cd0135b2c8ac61496cc70b55de5eff005a310eaf50ea88666e342850ec6c22d2d5cfdeaeea40321c8278e341b8422bafdfe71b42cd3483d71df4c1ac8bb0c86a72480055d272dff99203919fc2a7836adc985befb8025e6e491957159183949343d316004c075332466101f14aa78296cba1072799d978c1b36e94f042eec38b989e0c7e40db362fbccdbdb56236397435b65b12cce3f13bf55abc805973dde8f9c65157c3a3751209afd01396ebd7bb20fc16229ab289848c1aa48f5bf86791468df8950ebb317d72c050270f275cc219faad9980c69c377679c4e137810813734726ec78ce545199e43552ed33ab3689b6ac18fc54fe847af97fff3e2d6fd2bd6885fb675278c4d897b507d37b5cd1eb291d6195c03b5beaecfd90244a497c69345f70a118f88ed8568386b1af2bd23c9d0f2763c19b669a7378c42942a242c3721c59a5c0390137077ab10d792e2670da72dcae6042778d691ed96dbe126c2ac03e6f5a71eb1cc363997ce106c6111e3ddf50da12a23447af30d684548536c2402b60b75805cd0a8ff2ce7b4d7863a0baffd5c0b98df8dbe6fecdc37b2c882027f0d5b78ba3bc35a352d419978bee8f39faf096d31196590c415044500140e8ca976340496f084eef29a1a1fdd8df215da732f37e140aa48aaa393e5d3af9b266f98f5ed1410c9b4c88936f1e2b225a6e1c99ee9ddb7aab09b55be15aff94d2f43a8ba09d673b5d1327ea95f42fd26b4e13cd02a6a26c0d20fca8dbea95e71a9d9b6ce80fce8c7c0cf0ccea591916e4b9eceb3b42645615a40fd063d1e0c7753211ffca88a67b3029d6f7e387b11ca34d5357df38f5d92042b2f9a7d8d27ef6c8ebbce9377568cdbdb146d2e15858cd7133b5cf242406a857e4247462d87994959ab3b350cbdbe521f81b9375ee660b53eb534195a7cb0751c54f3af3ba72ef2cb3aa6c748270a64b17685d046641c20156575846e42b93fb1c754140ed6a6a02df039cffd970c21349e2bbcb6323815f1849d38052e6bb143d11890518da4a213434b820c79994586638b70d6c006acd43e43a79821478bba9ec09f9442fb15308d01f533c460b70a28c710da2b3f4ac7449129081081c4c87a241ab2f9483add71974846a3f32c3c96a08ad090098f38021fdfeaf50a36261c728aa6395b2114a88cf9577793cc7bfe45a7e238b997bd35b2ffb0c3992f188de916f7c004c5f83da5aac274a47bb7348df3590668efe9c2503b2c316dc074262fe874ea700b93a9d2545ad3e22b395d294bca1a2b5615d259744c56cd3d736be2c4624a1302cd31ef33f75373d2bf8b22a9e85db1df34ea4d24f0593cf9d494ede243517e2618dd0a6bbd0ff46987995805ccc3439e39babab22a53893223e25eff5276ff7a5eaffb88fdd248f3b2a4936ae56bfac6d778126930b25f05bbf031fb0574aaa129e4614eb1a38171e9d19b7fa0ca5fe7b4860ae3447bf2de8a89b8d0e85c7e130bdeb0f40e6326b1167f744e2b664e370f8a9d31f662364f442f1cda1da1f9437ae6255367e242253a325de08f6a12774612997a2f8b2a6a6e084ba51a07947ee7f4eb68545594756582be6232224172439c1105f46da151fcf9ca328497f952151b38631f4797f6d6ba367ee502dac0b1c5f45137578a5fa947e311cc84b73c56f058a1265ca45c10423aa165f08c53bbbc7ea42309297f7f37a98d146c48a7cbb566e005b76ec243ce6f7b9231428cfc17eb4b1e0b8d3002628e3ed7bda600a5840d4c1b2fd97024bf2f9ed637b521e8e1645400a7037ce6db2bb696b604d6b5f4b40a9e4eb443517c00a5ac6c1859dd18b6fb772155f2d8be3099b638602bdb9e3941d31bbbba3cc52d7060f7b45416c9923ee3697caf14e7f51361051bcd540cda6a14a71cb62e033603bc9d58ecb39ade2144b13d1746f0de2d1742cb6b34d91917adb69634084e08b9b37dd2c62f55eb64ca81a60ab5b71bcafe2c42f9c8d9ce59e6be9c2f0019c3d96c6ab738cc9df2976f0b9c47579fcc2d72161317c541d5f7de0bdc19b6f7d3264db1079cf3deb1619fb6531aa0032b19d2cb2ccef9fd6c1149c12b701cf8387768c6eb004fa6bb876f7ec010abfcf631caa27cf36d30c1738d50e868214ff8989ad497d0b12ed2ae83be1772a531610e4698bd721630dc427f07bf6b4356d720f335ea66969d14b246b757ddd96d1607dcc72d9d36fb10f9a529056255b9f962ba7a02950a0b9c988fd381d801af73d7d9abdd842cac56a77c5e2a9ab91785ad17966a2fc31e42a663ac583488081c236d13b82b09933afc57e25847f8511b0cfcf472ca6b21898ae47ca8fe674a55f8737053ddcf963dce0568839660b47f2dfc9eaced787aab897d16cf1a1e969f4e5fff7a8ec5c3ca33b6047fccd8d32f4c3a61d2c69075e37640d9120330cdb9732ea9325e4fab3e94ed580fc5be75acfb14468fd12f6e4cf87a7ac340f990e33ee4e1d2cc48a793c8c480b59fcc4bec660d101fa1c61a50b423c16c09a29d2dfce1d2011d4e4cae986e4822090379c17ff077cf56d72478a9bd703c2ea037ee7419b8b4464388d3bcd5544d3a2ebf12be85917021388950c180f2b020ed1d6dcb3a7e0770c7c1f5a44030bb4076e568996c307182b103050bd43ae645aa96be787f1d82cdbd629220104bc5167c0a8b8436d828cd70d34c9ab0c039cdb0a1ef137783e92bd7eac1c995268ada3e1e8a494fb00c5d678f5b6010c8687b57bde36d001452b0a73912f6ad0f7076481210a975b44410fceacd0699fcf7c1489e42728ad705600cfe6c2267a9c7979274e73bc2aab80155fa561390cc9460a93f29c4db673b00dd95d5421b8c9ab003fa7b48f82fd6bfaa264f0debe6af3aae7716b66c5533c94bc595e646c38b004bfd638e261b14562ae061164db1716208f79e5ec5e457a9ec47d2b0b7b7b68a62c95de164217b7472fe600a52a3aac43775f267832bf98ee2112ca9db28be3e8a828bb1ac676178ed490e0d27fae273a7d1de1fbca15aabd065890467ad7d4648487c525bf1ded91ae1bd3a99c6c734d580c69895dff04f3409c2f7a3e0416b8a2c53c75dacaa8bc020c803ad12e8a48f850737fe8d88f08643bb6863ae7b23103b0037255cf87f27aecaa703db904d789c61147b8307928bb184bf94ea902f14032d3ab1d6d13066ef6dcfd80cbf155f68024fd9fe95ffa782b2de5c97e1027e7f794c4ad6a2c23e3b5c2de5289a1f96a4f549dd32e9e4cc07771da9d1c170a315ef9d6846bf10dc97c1ec7b748b5cdcecab920d93bcb5a706b23e70bda6ac80b8efc06eb3594e5edfa4326caf3afab8cbd479f5c689e86e20247a42e828e589d831a6f1b2eeaf747f903100540ae7d725b0e48a3d921c303e13cb2a3ab5f8cc20502b90ffbdd69cb42ec092cd2a24ae408436e77565084a7bc20742fe0983744d7c876b646b1385a383bec18fabda857b91088b8c7fdb5ac5591bfd8b4f5c8f880509d0b6a54ce45d15c639f3b818508c08e6ed4a37497b2080364ddf01465df73e2e91a7a9424b10ed9a6bf1f05bf559eced1d0b667c35885c43db657520609a3f55017f8ab363fd83ff7a88974aec48d9b359d25ac9e201302102b8e62ec176918449e7fb745ef5dfc03381237e259f4cf200714830b2ccc4925afed71a4b956d1bc55b9aacfd42aefd9d4815a6e1f6151fdc9379e34faf98911e2d5a64152c426c0e8f386e06a86190fd5aff238128a62f07e02934356511cfa2212cfe3df6d5c87cdef644e7a78b34a95dde40002d4fdb43243a2f33cd3bcbe00d3503451073c3b13bc772f98a579c72116f57f7bbd07f966bafea91fe80541acc19e4010723daf868ea6b5760e66d317090ae218f57ad67c2992b36e84d513052eceee456c29cf57b8336516148ce3835d6ca526913cce6acb9a6fa1e0ecbfd9f34609a6751367c07a6017a78e078f2627e9f7be020482731cb93e778728e0a35a7f5bb2d6c4c9e893f0f7581effe6881f645223b699367feb54b8bae06a68e025a9d8ff507efb1ee6a0b9a74b14d47c8c32a4188f98d9b359ad1dc9967d19aa737355356442e659db0097635fd03e6d2f629380a5a6394e28a13ff69f36ea8f0fc4b70d2d002500f988db49c8d4da0a71e720be07034ebb3389b2c75e3c6254a82e2e841ea0c99755dff1ae01e51367d4e02eecd304932510a947f948007414e2bac773d7359243b8bb9e973cd4a11f7e6406f450e42416ad0927b133e0767adf949efc3dcabd9b523dd92b63add6c12d211edda7dcc73deefa427ac96b72589ae0c9808e7bf62ac31ed8aa5bbbdb33db466bf8a33a7e3b170058b1cfe84c96eacf005ad0796aba2c994c375b79862fcb6cae4d13bad1dab2b838c657a55f85b988892f62c3581cf60f24478735c04288c1fa09896e7fccfe1a102daa51c24924ce9ea1ef8831c91d526a55ba7ef2149e0a5045d8362329b6e3487ce8a7f0c33a428149c55543bbaea26b533ac8103820d405138c17510970cf367b3e3a4c46822d10e05ed47ba4c3bcdd02eb7e4fd990da55a518761335f9d2efa6878f8d0e29b2704d3af11dec3f7a8c2fa9a7104e971ecdb7f18d93ad2a1ecdc8a4d1dcf8ccdd66608859438ed23e5179f6594c631103828dc2d9f8c784d2a4cff15c58084318c18571af7940cee704e9f3cd0bc758ae7cf9d70995f1f1422bdbd2bc441831aa72b66253be6ce186f6e93613f2d3888a555b578481ca324878518dd9537e5e1e7b27094dc5114a4e51a776fa8e5e86c556f45145cc3216569c17fe22bfe281579a6fd70334c574d1d7aa5fe461b3c0262830a2afd4b485d348babfe81a3418bacda574019077cfdcbef5de1e73c8a8bc3eb9113713b563da34073670cde452e84866d688ac9f691916bd443b02c8bf15c672e1e75b50156e1e5254fc23e0b0d6fa530435ae5fe06132d691a3e59489c7102aeec1ae9656aa334321b8f07aac206dc80cabc6b3c8aeae941438ff5cfbfc494fe08661ea496b7a81cfc949d60928251ba6217813140d050fa68c34dc58771b80b84e79f469442584db07c6b5ed39a5f83398965b715966a3ade89570b09a501860accccfe10aada86ae989bae9adc4ca7480916e1bd4733d6484959e4cd199086f413c17b61e16f42ad93a85ab8ee86e09fc1dff1087384ad087a6d95dd845e457f740e538faea88985df42fa2e0ad89c8885de6e0b1514cdfff9e86364dd37ae591a1843f60f71b8e8b6aedc3155ce76d1fd9c4a20d077050d7942e8369cfd9e0cbc19e62e32d15edd34b7f2645dc31c1de6ac3c36c5850d43a6c479e7680f02e23c8870c1730ad163dd31d38e1e7de492ffebab9f3366e85dc9ff42dbdd1eee8bf448abc8017a2bcee2367e958a01986fe9d7083e45e262595937e3287b499090d4ff466f52824b032428757eac7756ffe76ad43e6f70c98b4e0769ab91695a6ead1a1ed45ee36218dfbc4994b7e5227f0fa0536a9b73b01701d10f97d0c4b1bc9adfe7c2bda52e8e042b976a0ba1b9d988acacf9481831cf6881e70b21520cb0abfbca56bc3fde95dfc84de3b3aa9d4f598dc5aea2473ab0b2d9758b4bcf353c3fc2c6a7e487cdf1af90ba9b5a464539e788b86077ad0ef611a2910f784d72c75169ca095e14e4916c346e55cc1bf042b0d578d2923580709536adf49bbcbb7fee7d4c8a61fb39dcac21ee50f80a7bc76e82b285b0bc3f0b0fc9e70563e82ae65345d521a5ecbe211dc07acfc85f707c6d23326124eae586bf2fc77b6021630ccdb6dab8569b00374a1623f1a99138b870bc25d20911836d1aa907e9029436cf0d17dbc9bb350ecaed0bcbf4d48a4a7cb78e602e33d13f243347496765c40c8b786d8bd4ae6d9eb6ab879d4f56a004f9d6a3b6e98e2ab72296b546cc34abb697e7eceea1273f7d8658e60112932673e090be0c212d3d664237b91714d93edc6c86ec4a3c98731f7c102652015d58abca17b412ba07502d79ba43963dabc05bcff231d342951f36dbf8f8097e363595dcf7141215284cb4517474a85e0f0212c2e3c687d868794d51d1fa9b0cf102a62a3de0e2082848b90f31f203291b8bbbcd0eeff6b769095ebf9ff344ca7dee7eb000000000000000000000000000000000000000610151a212b3238""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-a01e3186a88928fad593837cd6f24d201ab8aa8cd445521805be6ad197e670b8ac1410aac5c88a4469cb7ee7b1e2588fe97a400d5cb948553a8bdd0ace8201d7ad26e7db90c6f841f7a30f31f167e5a3873dab36258655ef0cd745ffc8e3ba7be7f241ba2e97f456aa4292288d0825b921d8b266eec4fd51fc0d5efd1d9f67ce4bce0a521d2e693dfd86f3d3d308bb337ea64625b1404f0121f90c6ff06e14059bbe9cadb32051cd3bc9181d78f7268438729e1570e2bd89ce7e28afb134373120afcc99bf30d963f4bd616d8cf0c02c4f436592395ece85d2bf650553fa720b1ce842b0daad2f610a4a458ed4a4ca98f87eb5ed4bc0a57d892eaf62e9b525e6e6e30f0f9f0a5490ade1c10b8aeedffba0bbd7976aed7a24f1cae8670e9901ea3d72d6a895307ec5caa87b18ffa6286a802248f6e1eda5c5191ad3c8f015bc607b79e91522f729f966b1685752a927ff28b59b0e4584f02f456a6c6a81ca4ab7548e4768ea744461882c24cfd4d4212fb4733786e10b23574a3ed5310e65fe9e32ede340e6a2349b551f5a99b238e4bb0496e56b65d88cce8551b23a89937c534c1f38b2f09958d0b017c06ddd26fe08463dc6737a31c1d74add57eb32fb5acccef4258551bf5bd845a2e872cafd171a030db69944b594fe5c7214b21a0f5edc80ae3d3c6c8472fb546ef13c0d0d764087c8c68c39b61f805de2b3d9cd02a86a00c4cd585416a8c25369c959d2a0911da264404a5a95db3688a2b25461a5f26e941ac9da45f18d1ad2fe82614327ded1ebcdd50471e7ed37d32e3b48d12f090cc550b2e64e3527a81b1e66762ad75198787487c4bc3743ae3d4bbcb6cc2b279f088bbb2624980f9ad78efd1c0dadb870e6732b53e63a025e012628b9cacf5cd0ecc66b21754fcafb6e5fbfc99214b080b0373c5dd5bc70b28b727f943223dd69c8908a54e49c86f74da456492d06dd8e454953033de489dbc3fb7c98613a79f303e28b0f01c82270c671490105ff598f7e6f6bf6a6ea0288ec7ffdb90c4c7c8961874c8f020d7228fa79b9b0f86ca39738b755058d341a90bf63fe98104de55fc04a287905933c49e5d5475a49b873272a8498fdfc1e6b043bc0881bedaae1abde9ac55ba925af591037bcbfc768932e3749f2336ed3affb2530b4bd527cfe1589a0a0ae83320dbb8905d31a48d77c1df191d76311ab02de75591da5f2b9e34e470cfbc6e3459cff655518cd2e070c4b506d24f1281349d57732cdc303af02436dcd57ca2d1b716ba8f70cce68035f1bf9b932618d3913b1dc9a9bb6f60d35a68d90584077d02d93af025f84a414fb939b0246888dac3680534b2ba9f2e224b10e44ca412c94dca680b62845e441d3efad02ffb944950cce3c6fcfcfa14e3c9208e9fabc52b1499830cddb6bf6db50f9899833e2fa09e09d06555978a4006c0188bc13150cbf94232938f382633ebc6d41a8c5a917c4abb86b2b5c160dacbdd4a3a33acd5c158e0d95fca565deddbe2042912079e796b5b67905254bada03057326acd332a7c52492fb6a8b8876ab3a9935d11649475de72816dd6b756f204b6d1aef5f5acbf2ac139568851644f622a945526bcb3c86581fbb2e5298ff01b2aa48fb69b5de1a901167996eb41dd8fac44c5a02c3a36ecdba25a7edb2612a5b01b5e242b1a55a9548a962f93ca3797901ed4beb510c11a90821c5c1586cb82f2f095e87c8a42b81670d342bc34fa7bcccac96b9cfc2966f3b2337fd648534449c8d8d7c6f1c12330c2631201acd5a8c8a20d7b2006507b1ce5204cdf8bcaeee8b3036f9f0b7f47d5aa28df4cc55ca9c82bb2d59aff4436ed8a09ae1d44bcfdca5d13c4d4d8b7803bfabe2f8bb88e25eec965b0dc904e48e17acf9a84f50bd98d6739b312419033087ac252287562e9e88bda07b8de3ed0e503610da09e994a81ebd0ba89467c58dda3c2e9c963190f2afc949ef97e595dc445cde87b7303cd3aba04a35b348ee2a9d8421d1fd69ce0d3bcfec9d93d243f45eff6430e75ab1fcfce14659edc3f7d81efed055f948325d28fddd90fd7efc48812f267b828ae94a9964ae4a8e764fa6463840f8a6cf078b39f12ff36db6e03451d4996226b257094ddd73a323036fbee146e1ea3865dbb6d7a3dbdf85490b04c28908d4ab713fd403d97eccd18955707683723ac946b6d90b4ee63a771dac2bc66ed08cabb29fcd96c2b55513b4e3d9815567f5f8788fd22b6364b8cc3d2a86bf9ed5fe775e131206192a85406208c402937dab551fa4e8ee4e4254546a687b212c538a779f50ff39274d8f22cb2ba5ddd74a6440246b005e7fab095eee8c47243a274e11375232478df603bbcc729ea9b6778a37f64c4f314d963301c9a1f92cc8884dd393f3a4b6d42910110183d5fe41a0b950dfe477d505ab76a31fdb5195d1854b7487cb65c378b0494b45370dc64858041654be2ea89a704a6a903d044c962e3b7e068ac0ac837357ee49ae14d612f1e3a319eca339ddb1bab1104b980aae1ae07ddb27bb6a69ed585e3e7cb2c0987d51409d1fb23c4cce7108f6819153e7c670778852a7c7fb929d1357aab51bc9f0e32006bd7167bb39ddf9ecbde2c63e492a8dae0de0574c364e851b9937820e49459b5e9591f12b16f50c47712b2729e031b4e3de4042c51bb51b0dee5b44fb9cb37e915e64cc0761b9e3a8e0793fa49812d2909e8376db7c0dd611499ad7ec5c527c153f916a020d7c23597fdfc954171cc1ac1116a13c0e182d4660ef724c852a347fe9cd07e512f0712b55eb141ea4fb931ab8915f3dc3fea2fd8deba0640a5c60a8670216ca967fb8f89437cc7acda5db202129181ace745e0357a6884eaafd08e8bb992c8d68bae86a940a4d756526f38e115dd75a2ce0486cf170951130a8344bf3ebd241ca694a84d2af21c77f77460eff8151040be2b3b0922684e5570b1097f0a419af32453da40f52676006addb2b9d9124c206ddaed4cec1dd46d08dbfeaba8fe279e0ea1ceb6ee9722f67ef2f70d9f651fe4219f1732e35b3b824d3709621d42b6472a9a9c5a4cf2bc534464169d3dd3763f8ed1d80d43d656e32790334238c1d1c61f3852eeabcd9424d1f9e12d4a08a1da9d937b35c1ada0feee310836417d241c0d7261446f836ab3e9729797ada42635ab2b86248560724242a044323a078f28321c111340423770ccb36d548b82fb2f3db2f1f7eb2e801e510412a91854b574668205aab9d4719d09568b4392131620f3af1308cd02efde135423523e6b1a243f693364df54744a809f483ad375fb792a651cb7a81ff1590bace3d81d02ef26a33305156c620c7ba256c7bdd6b6567aff0ee45d48c8a087da1e91e39c4012221e2baf5c73c8634db7797043bb106a287d2f0af1389f382a452efe0d5ed1f4eec269bb0183eb6d6c73da1647edaecad7c07760543d4869f80674ae0d2a33834b4995ec00955f954fccde46b6b3c1fb37116b74cce6084ffeb1a9c384360a95b4626cec377a964144c0731c4e74e6eab065411f3a46dd97ee0a8a4635ec2409042e8196dd7e4e254eac645e94b99636fcd084140211d9bc34d0b104f202182baa97413e3cdb139c1b4cf1d88ea229f1acc6040c448c7278fc64f835480b1e7dee06cb1ec3c4244739930ae60b208a"""),
-                    TestUtils.hexDecode("""
-14A8B812B4C9129CED02A09C8AB19443D34DBCEE85AA12528B61F84A2AA9D9DA49011C8E2C3C3856FCF761EA9C9882FB18666F3EC2C8543037E54FEC1F0F944FED3D350CACADA9428B7FB7D9DA4937DA4D1859BEF8C6177F0EC93BD67FC3D5B3D13C34D472D01372246704DA4763FA73BBCEB0F4C3658B2111A7DDC01FCEAA9059FE3DD5BDF2A9FE0D1C2384E82926EB895AA529532FB20E12F1C61BCE208E48ECED036E4F84CD60F8042475749E13D8C3ABE0AE17967D5C6D8C598A53A10231929822FB01EA976A08BCC0D18B1F9B6C7C1ABDD15121E00EE80459E6EFD61CB8D5AF950F0A8FF2807C32CFF7A56661C67348617059D7E128A72C8AF36B149DD8B46537EDE60EB5DE8A16A93349883B73F7C4FB8CAFD01E0C9D7B1EBF6D7C9725651980E0DA598A6ED5114178E47EA4C6ECF870033A03F134461146717C8AEFCB8E8DB1ED4E286C68C7358FA105641EE3ED9B4A5D4826B31706CF0946C152A365B246DC036191613655B829ED1AF8044F5707C320EFA1126B90137EB05FC220F122AA990AB476EBB0BB3AFF5B92442A857F6808E144C60F4B5190794C411C705513BC32447D83B760E907E6FEED63FC0A60C0CCD01734AD55EE178E6BD6D4B8A238ECBE8E4F8A464C381F16F11BFE62DFFC5021FABEA941D24B81CFC3D0F07F00F902FC5042F95A81BB8B795907F8D6BEDB5E5C56D4B2A4353D0188A90C01D7B2781EEAF2BC3D3D58A6F6AD63DF7FD4D32ADBC5A7A2F81EE3F5B98E8052017868EE59D8DCCC0199A006FE4FF39699EECC82DBAA846AC60B51FAB6F456DE4357F5EA43FDCE4B57AED55F2F6EAE49199AE90F6CC4AAF662ACEC2724337AD7F9CF74AC990D3083FE384685A1E616B233752E31CC4FAEB8048EF77480CC849D3376464621E2BF48CBB55E1A7CAE855A216DF4A8D1AE4E4016958F5855FC395C53C23327403720271EFFDF1A90C44E93E74D71BA29D860679E877E410ADE48ABD0EFDECA426DA792271D813116ECC894D799369EA8094C328D7694E8CA47459F31F5065858252C1EEB1AC4750AEDDD327048894F7D79A1D64737EF6E8B93ADEB938C1EF31E38DD60E8B4174AE093697DE4207C7733D82B4FE92590358515D30264A408746AC252ECC0BC28A9C98BFCD76C75845E9611909B0089B571259D1D115EE0D5DC6BD6F3697E1289C4742CD99F97B5D3A22631E33A81734A5D2BD1FF4A819CD6A22A938D3F18AA90794C120F4BE7E14324E89EAD34820070F8160B140E8CD5D68378C081DADABB41D365663AF26C606940E08B20581F4E63AC6E68FB5A7EF5DF86047BAC502223AF08F6CD82E6ACDE60116593046B5CDBFE2411A3FE89C438A1E84CE6D1CD72CFD3E5F67C331E72754F6CF2BF921FDE2C6DD5481F20F509A6852AEBF55BFB4B52D1F8B3E397C9B147433198073049638DDEA7E21C2043C786C88E45E566B6A7E8742209F5ADBCD34FF26962E87CD235CA1052AC02E4BF75DAEE60A06B19A4B0A61A15D9651473DF8AAAC6DB951EB6E669FA5F89175DC1FD4D881D688C477D16CEFE809E623B2F2A996909C3E10CFEF756ECE8E93072AF27B87715953E0C48946DA8E893160CD351E48FFCC6847975621E5C75D5DBEBBFB79297AB368D13BA95308E3D576F1C54CCC1C4D5EF2A41BE63AEA2A9F9A27822ABFF58B06AD99515B97F260843DD2304C855184EFE96BF10420184CBA2CD3ABC38D11B7A74E4A9E40FC26CAF3A84BFE8794477335EB1F4C67ACC9513BDA5D8252E608D03C69D493F8876FFF25D39DCD71442707AF2681CC6D5E117BD24315B0FB5C9E8175CD42AEABF699B7B77C9A8918AB94518B48DEE1777EAD8F18709A824F277BC06CB67915A5A2508E18094B0ADD29FC7CD554D8671CFB47EED2F850FC84B1C0F27767B3052869B653BFFBECBF6D8077697D1F440019E3381FCB917F5C06008A04C8A88B4493698C1964E25A551B03805244570D0EB6999AF2BC467EA4732B460A40F7C2EDD2CBB07A2DFA99B4E5F4663A45F2774C1ACB0C8B965E1053E3AA140E973049714DD644CB9317D9B3252150CC9A525E8729ED4A9A7900B417875391F7BDCEE646B1009CA479A1295555759C5A7597A775A1D1CD8D870A71DA7ACE7CCC7D2F38B18BD66441D80068F76AC194FADB3ED5F4201F26F670621D254264A4D2A88426FA6077895B9BD794C8C84DEF942FC43F2FA115509429A939052200196CC921454A65C4BF1A6E871970A3409FB9773F356BC17E03EDDE8CBF2F91E7D2B548380967F756D36520009DA5032F20D8C8CAFCF4B561A4C2894CA13929DF2AFC2C1C9FC41968746433FACD66309D2A7FB5D90EBCE40ED1E80C12D07BCB075FED76DE423D9EE6B1C787E1039749A0E559B86C4079CCA1CA7E4A3EAACB300C453782071725F6E2DC0652DB5EBE7D1C16B6EE0078004ED1F49DF439107AED04A2E69F70A35057C36A307C8F5BC13FCEA76AA997DFD2E2E4B835677EE961234895BE9C9E7D1486C04ECDE36AF4F7075C0CED9A33C372C33F751C953A2096815D9B6186632D3CAC31AE6D0A931258014D6F88157ABEBEBA1C11B9CB2956253D4950F5B2F64476E4125848F27D9ED4F93035FB5F5DEFE2435E67DADA015F048A90EAA9780B983748CED6056D021D21F6FBCB1A2DE0C627F2D9015B3D9D35CA17C54B0FAF85D0C45A53DC2575E2CB54B9A5681FDB66C9D5A09A3F48DFF29B24E45BE82856C6C76F0B9680F7B666B22221E14DD8B22A15FFFDA1D666F4EC6ADB5B929C2804ED36077E1A39F166C777770124253ADDE6B77083ED159CCE35894597E7BF3DEDB346571C2BBF69AAA9ED133E94AC7E31F2C30AD079EB4B4452232D83E49B43DAB60BBD92673D90F187FA6F3859EEE1630D3A232B99F3F960E8BE49CCA0F1A519156D2D861F8B6C15FEA4C4635C23F2ABEFDE8589A45947D391CD1DC3439F965C6DBB5C5C9AD14192B3D784D1C78B3DF6719D5C474E02D471B9B857611E2FED83869BFE8A2A74493C25D39C78DB019BE93E3BE331131CE85C4586C0D40D676640405FE363646C2264DE6F64365F19F87A8C54C884703DD369FF52F65CD9179B8A09EB92C38C284E06B0537EE686D7BF3BD399FBA8E1703BE3236F8BA262E2C84D55EB1E1E55DC14780DBA04BC1106D98B05593F9164F1651809E8AFA0A04BB0B51F9FFD5062B495133B509A569845CBC3003BFE23A7D7ED433B70C2EAFF5FD898009CF1ECD9E9B6F37CD7794234A098CCC39EF078E3C152017CC73A19B811FAB4A2CEF721029F6200A4D1E4F9E95A0A758A7AFCFA047B6707CE048C3BEA6BC561D152AC4F161347C098F4F44AD92006090324757D73DC074F1E1D445A500AF5A92CBE19EF631D99FFF870C60BCA8515125EEC36D004F22FFB420F5CB01330315F00CECFEE3254E54A047A7FA3C7495E6ACD579A9159F667FCAC4C4448579E7A68148D5518EFE269E97D90D67CEEDC378657A45E9DA855EC55E7BFD0AC3E52DADAF76E800ECFA61F2BF532E7365C4FBC8CE882AB327961C6A48C24CF0F0E6F2C54D732BC9B592008F2E6C80F7EFA788AA6BEEF0B6AB7B21DA3F9D92ED8A8F5F3F4B1D1BED6F66B6BF3ED52E49715C07DBAFD67F4F253DE368619A306C513E645CB5F154F7823781EB3E15F38EE482757009E42CEEEC1530A0159D25F052F4D4326412CBE6CD11C0DCC56B6556DDF806868B83602671C96F81D8210842144757A36CD187EA0900F36A0A9DB85B9609C11DE03A38A9984003EBFDD4E7C07CCA7A7DC7FB5F9F16E6C0C32CF86774B46C56BFE2840D8EC51E9FCB719DD1CAC4206372126DC8EDC9A4A2EDC8FDC8370C7589CE9FABE0DF3C8CEA90E82944B8D489C0F52F73EA3E3BF56BC3644A1BB0AF88F4B556A554851593E5FCAB03E235670638E4AD77BF012AE074F331F67222899694CB5EABBF0D6E6E6CEF75151FAFE89DB9D66DA4464353526116B3C2F382825B11CAB3CBD221DDA588F4BA13548CF627B52478F47D9B61479730CD9CB3F6622702C9A115D69EC232CBEB3FA88AEB832EB266B855A98424B2E08A699453A891C89C45FED7BBA98D6E7A2179A24D41D201C4214444BFFE6D01A15CBE640C3C54458E8DEA5DED484FF7AA78541686C60F9FEE76D1A7ED1F5686A2EC1F0AA037E6CE38FF695DE0C17895C9326415840FEDC1675E9CF30B8C45F8EACA1E65DD18290E8ED826738876FE8B69DC3432174151C051FD23CA4675A75E73F1D3DE4CE172FD657B57D5D03FBF8B29E268B3EBB8E9BEA96A4750168E8AE5AEF6B34701276DD18F1FEB01FFFA2A984D3A59D05A56552639D506BAB3021D507D56D0FBD80DC582B3C20940DF2393AF24FA5233DF073C7FF28B54C7A921949960CB2593AA4F93A06D38D896D547B28E9CAFDB479B7D1BA2EA7B4A6BAD33BA8B59DF8792B22F5FFF41EDB1FAA926FA3CF602FA63ACED78E85DD7C3094ED48D1F3381BCD084A9909613873513657879AD8599403A52ED0D16AF0B3B43C672867700167323D37FD6373C4D51B90327F4981A897CD54C8E35A6A5904F5AE0CDE36440393A59119437016E8CC88894B2A6FF661C10AAD7C7B03B7085B70A8145C305D5E66CAA265AB42B34539CFCC9A62B5D9BD09FA4D3B94BACE361B4C6BF6B550B89922EC01041CF05C0E4632274949D244B7776D6504C9803A67CECF65F750F9876109167CA77D412A7EFF06CBCF129D057143BCF03CB1C1AFAF937E55477F5B15020149D64F53887467AA16C6692FDDE61406D552660B88AADF65C03FE1B8D485C57FEBACF8B11C569622FBC56CA1056FD3600E1BF51084FDAE32876BAA1E97637F73677E8FA1462222DA72FB0936ED66C16A5E892C44093CFE7B4E3EE33F21091E04FC4A07C6CA21E93A500E5D7378EC716A9ACB27A5687BCD7F4559C32F6C82E8C06E82135ED16C35762E94BFD6BC33D5116E4FB209C98C871FA8E9230FA807CF1FD509A75DFDDFBA5CD4F131FF8B666878697B372B92CDDA15D0113E8BB91A7750843B3D14AC4E8C956B44C7A3A26720E774EC1A1F68435B122E539C8A7515A1AC94D456BC4DDD54839AAF6EEDDFF8797C9BA3A15AC70C34DAF78AF1F0C21734DA32A79C1BD3CC8B2636E12B9D2E42AD10446EA1A9FFD45430E03A78D8F38B64B64C9D308D18CDDB4D5DA13F1B4D15157063E58C36DD71677334B4D9BF09D8C765FC68B233B31105D0957F1B675798E5B9E982B1BAF1611EFED0E39E1E9E70BC790886A422DEFEF325A07D97FC603866C2C3682FC651CFFCA09B8122B636A65E2D6B8B9FBE6BB9220959038AEE11AA7003A9C4C4EC9E27F4A8350FEBF1084C292B6BA9A6E03C00979854CDFE566831B077823B025FD1B9C7127BDBBEF34186C74759E32FC222023EAC24A6A6653A7073F4033D77CF83831E8B6BC8F26AACBC3EFB2328C6EC35C3A509FA85E2E04532DB6E466BBF8071FA6020CF5585C70C29320786EBA815EECA6FB2BDF9C9F3A3DDD0F1800E93DEC3C5E6DB4EA5A695865303C48986CE26346B6CEA4A734668D5BED675EB0C2A1FFDBB9E5511EC715BB4BA3604629FA28A53CC0DBA1E819A521AF8B7BFF16B4FBC6766543C0111E232157B7BE4D561618D6ED7D13AC8817641E7AF77042E96C7209F1B65C42D115234F6C63B84D381F1820CD656C88BDEC7CD2A814D6346E90841005F66D6E36E63C5906D19904EA0D33502BDED36E7D77FF5E2592290D6F29200668A25A6B6F44FEA1D3EA00BD4BA165D122455E8F97EDB36061DCB335870F44068EE4A64FDE5695896D6A5B30D7613BD8C8B11DB330AEEB0EF239C105CE6C0B2E1BD81E867A2D823FF88E3E82FCA69923E281A2933D5FDFAC6B217D60958D18ACED57D670851D5A6A445A120F5B563070995793E618F885F149A3A3D498C69A0B9D99D92C16327B7568BA8CC35128500FF515273099B645C683EDA30092C225D01E6337AC652586C0872C9C5EBF09DFECA43697BD97B86FD5463F529CF303A105194BCC3014F4458CD3BEE8088B8B05D58A960334C73E1CEA934CA0ABB2597F703428EAC5DF6983A76A5EFBB4A20221E6EA04F67273D52D0311AB99979CB0EBCE738B0BAD72F0DA80097609F4422D962DE43D5B9E27F2FB3FD55DB5B9E98C1E74533DE23930052446A31E656E150261C6658324BB243E0C55C43BB397367D9E6EE51FF7A3F4FBB008F87FDC3448C07B88F4EC3788FB04944AE1D734E00E1CC58052AD2F908B55B39C0B1FBFB889EE2CF91CC1B3FCFEF11C14B083F8A898BB28B838662274B9974AA8E83579181944CEDA7FCD9C36D5FEE67522E828D6FD9CD28537D9FD57C8ACC7B8F888FAE4673FFDD859F6446B41609135BEEB20804F4331E31AE057171D27D1C338DD976634A460436977192E7FED668FF01B7F996F00958FEF2F89C78367507225C458A7EF81513D849081E4D22013A4A8DA7E6E9AF687918486E785E2E5D4EA5CEC4F92910E6A6F89198FF7911A16D7B46BAC5752AD5F7457E9B65AF0DB57148812FFE9F7C70F5531D11CF96ADF7A3AE1D86039FA5CFD5BD5465AA1649C40A513FAD60B54F7AF15A5A6B34F0935BAB28A1AF631816A0F5F1E53E1A7DDB5FCE521252E25910555D70AE1A309BB1BAFB7ED3856618161CB41206810AACFB9F748B06F6BB8ECA8EAE07B77934CAB2FC72FFDB061D5FEAC548CDD1BCE7CE5D04E9D2E4F38834AAD674F0D540DD6EEA85CEEE4F67B1D572597E9F2B66554F7F835894E81F4081EAB2578CEB8FA95964742436FC6741A5A9D1F2257572E7026360708EAA41D31ECCCB55811D5BB7648EF4021268C8AFF001F2D6BB3E1D4D304374E892E4384D66869CFFAC575398808D2042B2A33A874BF364B6E7A859BBCC67ACD4B5DC3494C1A6B55CE004A354C8EA8F14E9D9A4ED282AC4D78909F42BD38D044FBC1C730F921A1C678062A200CAEDB0EBD42D48C0B758F138EBD6BEEE1E45BF92157E3279C6534232AA6C361953A0AE37E81261832F29CDEE864962D44CC6C3C68C05B16915A8FE35B067EA754777725EAB0BB4E20C3BA7D6E75812C498F29A94D18D90D60F49339CF46DCEC6F0A546A90E0BD6E75B95441CEBC0B25945F2A38F3EEB1A9E20805A81E3008750588397A9A168C73C81C97FEC1BC16659DB16AD7BCE275A884EF801D53868B0DB816FDE421A9D7FE37E61B699736986325592EA93DC18B036D5B237115C35AE3862E355A1F3CBECC5BA89947E6E304A86196E0AD6A113BED701D21E07532A6D02D014C9BDEF9F9060799BB79AFFB218F3B98A4BC9488E5D2CA13531842C6651621484207723F41055274364FE30601C33663A6DA49C8187008BFDB1FFF4B7B3DE89F7FB0BF57F2E273EE84ACF8EE91A5335364BD034DB6A1F8025E6522B4F3D6212F3E75AB34179B21AA28FF6911736724FDD4F3229C6C26142BE5D6F2148C9BEDEEBE6C56B6A20746875A6F74CACCDED95179AF50E1C5E09B942B4E3C5E227C1A9DCA36F04CB89EAC24D5E87D07BB407922341590A739B825AFB80F544F2B1B70D877300B46000E660A568999EB8F54A3809D6879935492CDD67DF15A1FA902AE6ED30D5C5EC1178AAEA8E539068EA2A0132EFE51DA8A43E5D48ECD5D8BBD0FEF8F90288E3068D17EEF4204D639665BA3DB7C172E99913E97613DC4304006CCB37F1E9F62327E1C2B5D97E31822A52298BE0D6457708E0E2EF25A0C4C932F16D25A277C5BFE1AB13FD488BDA7BF30F26E89585F56D827DAFC799D7DE3BEF0B41A3EA3491514ABF11E633D7F4B8A88CB6F3ECA3D48495475A33C9107EF39157D53D447308BA03139C7A1A9AB4ECB178D818DB6F83B4489626E2EE9464D7392C80F8B4B6317095926370681D1ABC3A48D82DE7A810124099E375F39E5C6683F4972556FF258996BFB0FB81C44E3C0C1A814AFAE8CBC041D7E7EA4FD830568DE534B65926D6CB83D306A36861FA2874234E33F4EA5BB8AAE05C3DBAB96CAD63295D7BECC26F5A4E862546A166A09E059293AC85937FEB612178B8812541A929B81A090FFFBB17DFC3C774C5BCEA1398DD530C5286658D326D7BA7DA3F2E15FAEB038B8A397B68AEF622EB10B248DCC942E7BF4B4C942D33A4427B685A0DF2BEE8271E89A366708C9E48F6A3992174E8D401D821DCFE12099D3EF0BA0806E7ECD674422731B0DB2B198C495E9DBA6294FC736F41EAD9232A5E404A8E918A18D7A7846E0BB6716C4343C2FB00286049D7BD823410EE8F71347008A89DF42EFE049C61CEE782102730944DD15C0DA322F6DE4EAD8F9EA549767BF02BEDB1F091252F08B34B6728165B11D2C62805ED24ABE65A8E95441D1D5FBD361FA87B39135A75D749325F09416CD3E1ACBC04F6AC8B989716C55B06FC784B0254A884EA4CCE8ECB2EA278CD32FD1FD99C3085585201EE9492B7F7A2259479B1FF820661466022321457088B202B5F1E67709B763A3A945B19CB5A6EF0A322272D98F8921B775A37B6CF92F66CF86FFD26F84547BBA75AE82411E890A7D8F1B74D657380287606ACC8572D8522B87CF26C0247F25A7F8CA12911081224128ED444C5AED9EADBFF6EEA9FB7485884093C340CB326BD467CFC4F6E6C17D4F13C7F9F76192BF4A10F2F28F538C76BDC1F8528ED1360922E5A6DF1A38AF9FB28542357231478192219477D554507A47E9FCA585730292493A2B3EE225E0DF87C747E0CED460BA677EC691637F444D248805FA183666FA65110AD3ECAEFF59B2F8F619A275034CE415DCEC6E68A3530D17EDE27E93D87EE1EA55D22045CF436A34F907D35264116A848DF0B448E4BBE32A18BBF16A8DAC00CA6B07876ED0720591345223877E26D2DF4C0C3FD8484DF1DC40F1B7D4D49E871D8F527837F1B790CDC9FD95D698231CD090C60915C98F1CE43F7825613FCF8EC929BBAB9BF663A555210868653131556553F7A36368B0D83AED6F9A970CB2D63163C607ED896FC7342A71C6A1C90A53DA0F32141600F28F31A9340ABE97D0C6E8AA3270850B6598670DA455F8E2816EF82D3267D39A8163D34B135221D7D5D98069A8233802810C7605AF9764C6DB44FB55E29470503090CE6A720617DC9D17A5091CD3267DC4DBC1A2B7032B50CE46522A2FBFEE7BE29C3DCFA1FCDD43AE2E09DAE7330D2E6F2B15D10F53EC6D607066504AC50AA7F18D3C290296A8D9ACD1F5A3708BC035979CF03966E0081FC53F654AD68A15A3D17A65A768A4CA5F647BB21872B1ACC5BA3DDB5F69DC215735A5CDCCF50D555FE968551D507A7272FB591587383DC5930C5A572BE9FE0C2797B622DA16C6B87A03EA563845B8201168C45E7603B80E5780E493AE87584A40A09AD6718CDA3759CF1940479545789F08DE83333FACC26D28AEB54E2088934332EB7DBD5829F0ECF89D22C62636063532B4361B9C7C2B1D582E9A7DC72FF7F2DF667D9B7BAA543FFA20AF6BCA1A9CC22B7D7D177B73AAB087F868AC68EA0CA808EDE0C2F931B3B0CCB28E472CB316C0DB0367D4D7FFE0C02977CD2E5B20F28867DB1EE0DA77C5935155175B33D3275426C3CC5B73748426CEBB3ABFC50405E30EC21A53073C83A85EDB485B26AE7B633692326003004A822F261D5E20246F99B03D0AAE36"""),
-                    TestUtils.hexDecode("""
-e3204112bf82f4849550037d8b6325da7435333c716595e2f17c8a85d66bc4a612e19abd17411d3f4b7e3a8eadad39a819fe5ba968c8640243fb5d18a7674a3368099088c000a1c9906573a2957b57d5132fa2df9423c64e0f7d89a338d0d41e9300f563a82993c8e43009eef3fd91c10dc21bf4524dde27c4013756a1cf7b5c2829aa1698a5ebc4c46b80cce01384678f5c444648ed513a8e0c6e4d29b3b4721627c1c8832d736d98c17f6c00aee528abf0908b030edb381770e6d23a261731817b4ba5e632b1f77e5beb60f2e34bc2f16e6feb6fcf8605367b5d2dbec8668cf6a7b47fe5802a9eb93451f96e2ad72432726c9579cf08c4337ded15690a1906b82df1e07fa995eef43df8edb543bfc3a7403877b4bcca16aa105b625dd23e1d938d4d89293e841245472a0c38b77a6697923e213eada80659269fb642089b311e2818f8ee998b227a2130ba594a27e985aee0c6a3b34652b54581eea40f2c1e235ec06e055247cdc106164d6856fa8798e0da03c1b4a6b89778fef781dd6c5c77147db302df8ae78b819da5b8ce171f53bae732a100211cf232faff1e0588054a0ee99891a26f88b19fccb49693a844270fcb1a43f26677abdbe3c33261ebaf69f8f417ae6df03b55506c463088d49415c0e5f3d9cceea7518692649fbd2e0153b1612a84e229ca9a69eef15882d402425bad02039426358124d0603decfed2101e93876d057725f6cd131ee346f047d7e2e0398a5bbda6e1fc5029b57f78e49a49cab5febc682931f3a2b167d553e4f1b6511b8b07a8f62e4744c20a7b2731b317ebfa1e89825d4b7fec5c775243c9af25fef92f61261f2b4377593dbb3008385c92bb779ec703a7e76b785b8aa46c8c3a2bc5069d69ed865f1e5e6283f2aea3740a62226d341deb55d420eab001398596c88406387b293ebd1663c2bf94041f3c13b8579111fd7d53b66a3528d9bfbc6b97e72730a53ba95e0549473cb4141abca8c8330b1b4e0e0967b2aef589efee973c3718eef61d27b2a355be3c92f7654a6d33e5441e3a0f389911b40f6640080a752ca53ca9db239216dbc3d95eff963ab43973fd8633299d5adad7020a862a594c656e34af356066885494b1a02fd6fc5cb257cdbd56e85e74de7005f2b160f6ec6f0a61083bb046d9ca90c04478d8489cd75e176d027351a84bcb6fff940eca4fcd464dd577780473eea0a72732d435eb41d219ef7c2619400339ad2c30cb4ecd48deb40d713e148b474c4de28b91efef85e4f16750bec38224c0916892032bff8b89a4e0aff665ebc050e46cf7b7cba9fe8dc8696c5842f82e6e6bb6b58663e1669be1e4469cc8982650e468b6c9e5a1d49a44172f86676d9f4731994d74c4eabb9086eeab469a8a7de0e18845797ed73742864149d659df3118658f8cee2cec3c8a8b388432ad98d4d78f3dead445af3fd698fc01bb81d4658624312fe1da6465b7f53ecfa4e6f958b9f474711c9a2ac9fc8abdb0682b5eb282e5ec116c45c3236baba0cdf49a7478400dd8a67fa4704a8e98b29b7dc9913d15f56e613592dc60db932f374b1a0ddc46435feb7412b290587fd9e925987e80d155ff821e27d77de3141b8cf38694e3cd0e7ee0d822c213656fcb7be166767da6522cf9c1f29cf044efd1fe7f0d9e9df64c417aae894e354bad581a66432f4ba9b94226b1b577f64a931c62bcc6c97e5f20f0c53f35ae39f38d33600208a1c6986aca3bd143e920a430e9b6a311a751509316abadd632dbc82abc94ae234243edb75d362928f0d8a7ff9f7ba927780bd7bf62f3849f3fd937960ed08794f8df99dd27c241539c41d27ece05215f2e63e7305d09cc384223a3bdf8df83d0cb1f76231529faebaa18e76b35ef77d9ce6d2973ecdfde9ebb91d7fe2ff38bf0e4ba8f9c3efa3185f6ffb72a10bdab1fb829931858ca37e1d3356bb199d9e5d9d90b11339643ce9c528ff7fda54f907126fc745cffd1d9c60dcb92efc39469c70899ff3d5fdc6c18ccb0b3bf04bbd9d14b34c857467185e5f427b134c95622d34f3bb5fc4bedb7fa8e7c16abc277447ec511acb82de3d1372f63d9a30c40e6485598e707415a572a29ed1c82bf0e138bf6c6267380760f6f2d42040948e96d4a792abb2912ce8dfd5ad3c20bcd63fc84717a5b0c79bf6acf89199cca48e502661a949cb3123506318dcd0079edd930126c0e879cad817ee9faf22a49b11f44b0719554da894a7fde9e67ed576f562c787832b7cdb0ce85dd90ad391abb590cc33c83a57a1e7c088fef90937f39b423977eb5d48028af46a43d664f3ce89be3f153857210668a7f152d94aa8ce1305e5c467b3fe47306dc75cd2717b67f1bdbd77b7acf6d4bc79cdb65b291e7356201f7fc0176f826290cb70b54ee4f2442a658812274e08c0ff222750703f7127c72184fefe2cc8e6b0769c56eaada9bdc39d44e8464c3c789b8254919fccc48d692ee13e70745b790f5e89ccf04eac5708734ef847a00d4bdb4a7773d8a8e14779741b76b1a3be2b5bff279d8ea3f750c4ea5aa82203f55b332b785536e30d5448acc215c10a2e63a6104afc5d9002eb3cd9b98f76f66679766a0562a1e0ef9a69d46a453d0777046097dfe965e1b380cafbd62ba18753ade14c2a663c7ebe2fa88ec4cbdbc841bf49366dfb13162ef6d6dbaae627975d3f5d6ff47f7685c713c59dab2e0629d6a14fbaf1895526ee00a32405d2f4930ebae1d4c0ba243e0b77b0575650c1964cdaa8a09d70592a6e50f0586fa398009bd40a2666f0e9f4512fd9453e54df633b6ed72916cf87455ad6e67bfeb91e5bf15221e01bd61738f5e92d5fbb15d43df14f3355d54bfc97b061a1db68354e06d1a2fe0da4e1a6c0c0c593fff12496e42761235ec1238879a2c9797d97c833a76a3a65bbedb8012722c4c4347c30bab6d0897f9bbc0cd8b20030d7e84507cee4069192cae1437715c2179c6165d38b534c63123e9b6f07fcb4dc1c73c376d35d94fb4ff945d6b9f2e8f41a01ba5b58d7b5afac6f7f74d5aff530e3183a0b8992d2e885bc6c2d5415a572cd8cb8b5f09094998025b86eec33fee6f19e8fa5fa11cb49932508f066f38192afa3d11b033a6b635e9a32cf0dce3512a9d7af02dcca39c3c7d62861402586f8f08e0ca459e96f2767e991f70590a1303917476df719c38b8c7dbcd8f61e787131c093e2ba97cecca4d52c75e18d855c491d1bbf517542494928061f24f142fb8fff689635d57170be21f8bdb1944729eb2c48a66debf5399ca10d883c37c860921feeaa1ce240c419a987f71484762db1f6ab4cfc83c1bd9e4ca85c7730e9a58630150784fccf9faa926a28bdbce010a355ef4e8fe3bec648ee207e187fc3a8f73f80850d254cd0f9d9e92a0bf91e73d63faad0f6fe7908158ced03f396527e7b96ed2bcd521a5ac0e81fb60afbe91bb0e70fa6d5c39317158f67bffc160f0b80663267752bb5a9aa97d85d9e9f40f557a215aacc03d022341baebb7ab7eeec8425af176f3b97eb80351158095708083dd51d896bfc03d308906c31eddcb816ccb28eaac48bcce688a479dedf9417c950a7a8c95ae7b452cf83dc548b64d58b52928e2f6411d4b02466543e361de3db17d8994ef28dff206b493564876d5e274658e69b5cd70a0090d669a865e56e24150b57ea6d3c261b11c1e45d7bc387aee61add50c7f756e593de9c3057855ff761e95760813e5d30b41ad700bf544c451bc6ff51998bcf48bd6046d9bd461924121a3d8daaf3978f792d9cd23978f1c8ccd999bc79d2a10daebb3c9d065d30e970ace94a0f774d872c700949f2ff6a997c6e3193c5782c82a077c4524981e7aa6abb27b86bdc75928dc9599a1376a2a0ab53b6668292e4d34346dd2658fc9d10232b7e39ff5843c620319e530c71052952f75f2ab69fa193ee321c5702b6e3107dfb93b60cc99cc88f1fb48c0bf48c032e2ab5a3085fc9ae1f542f7e0abccc90b8dbedc9a2468da43edd62864be9f7f50149300ae6e2eba570ded34fdfbacdff6bedc092e49810a3e0e860438e3ef56f15dae6a1f3e01d1fc6624602a486d4f2494a3a81694971fad50647f1f0d2bf9e2b4580877b98917b22c55207689da27039b3e46e7f37bc785c338cd0519fffdf11c1bac606dc58f36f5a6902ae32391c7eeb9fe1251ea7575632aa86ce0bf516bc370b3b02ac8a66c2b82a5d69506211c5d3ae15d3c78d47df76babf0c7fb0a5ca3dea741dba47e67851ff66b84c8b3004f8862d6e8f6317c708ddcd6f232f78d081232ad98aeb17402a9ced35420a5e2802381912f9773d0d431544b7466f778ea3f379cd9b095fd51c2a3bb6fe7bdfef1188506047a31905a3a62ab7ddebd4c5655797b90e7fa78cc80dc7e9acb634da42540cb27720f67699e357ddcf45fb4bb9c8c555793cc885c31ffbf6674648615faf691440dc456126a5194ada986c9387e282a3e8c4efd5601f55273296dd8a351adb1e1f954a7d466e75057d8ef0f3d187cd0f8c2203967c7aa3049968ece39674260ec8ce49a25c87cb4fbdb73f1ad1981c19984c8a7fc6ec2e8dbf74889cf6ee30ad325fbaf3ce1be4d06255353742b14128c74765d32ea790b3235a3ca4a6e3adbeb39c26daf148ce4fbcb993b48f04cbbdfc88f67da205c910cc6d0c85b355689d7a5f6794990cd5a8380322d807f4282f79f2d2686deb4d598f072bfa2df4644c8f098a1c9589ee93fb48926675c7e1481de74304aadd8b104384f4df77cadf60df790a394f021889e098f960650e40b9f71193c642c2b28dc8e73934646862a9ed47763ef721c0c01be4da0de58dac976c7e52ac407eae45bf11243f741d05b90ba2a351d19f0d91d115dfb4626e2baa22a8d1a047b7a527ee81cc059756cfd529db5630068c8d5120ea7a6125d5fdc982f6dd91efa9d4f19891986140cc788285f0cc715e9b21f2175360b67dbedc68ff3b41bfbbd1d3adbade1c46083eb973876fcc9ed1e264e8213111bd18beda97fa555b1cd2f9fc8d216358fbcfe430751152c09c02a78b8437616d4326e6d9b87a71e5dc04e61ffcbad9c2dd9e2f9b28885c3b5383d968611de6be2655f24dd0cdf262e134e8cb9db1abb07d6fce167a9dd323b1b8f7232a8355d3ecb3bd4ba9a3ff17bf0d97fa29064762a6c9b7ba14b1264cbcd276d85e985926862c96e322308242ce44679502fe70654f54d41cc4ecfd6933df5eb3b3f2bc47d76e85cac79393bf6d77bba0164f6f06922474c9c1f9ab86da8051a7ceb0a29aac113b4d1430424e8e498a6dc40d46fd0c341b00a069128f37e56a25734e9e446a500e6790ddaf9acb20f5f67037b2267bae2d4003e1f6104067ce5a360e031cc604dc828c7ee79fb9aa5261e14f473d6b5f0cd365c5dbaeab2997624e705b0a09650bd386b78bb38cf7e5a3cd67aee3a985bf25fd1017d3f1870d726d4f211e0987e9251ed9dddc27f5322c68254850b4a4845f1610fe728092d34f6f9b55af7c167bd8f5939f1f5fecc9d1e375f97961a304c775c36bde5c065076245a9d6bc90c8476d958d00f5421f869c4109f6388a8c905850ef8cd80927b44eeb042adfeb13d808dc337b0d3eb738782fb4322becff76b85105e0e737dddfbfb423c11bbf3bf93aeda6af3634ad5d2d49b5d36aa2d9c72537a69fc0db81d8b033b82c8921b7d50a51546415e51e7e5a47f3c71c5da157e25ecb701cb9128400f0a7fe4ef801a306ee61c2cd975143959f7ee2df91fdd3678719597df544a1686aa9a81b81cebaf521deeab903c45659b270b5906698af28afeb37ced3362e43a0adeab50e2c9a2019f338aea7e29195ad472467cd35fc8d7bc8e5e16f86b273e5af3583718cd0967b32e39ede17770e77abc124b0879e997caf22ca684cb60ca3860f4f2525a989434b132c2ff173383c74582cba5dceea5d947263b6980eda24555a778e8d676d2570e5049d38f386d68b13ef53b035a83364d8247a6b32627756bcedf14c9dafaf82a4af23b232e37eb4b4b36f4bdfbc9ab5d1a963bbabfec682c548789b2ada1d73f283aa8b98ad214c7e509f5943daab0b54a5f9d94958a0e3887feb46afcf00bb0202794af85caff85580f7647fa3e0a9183f202487ea5ddb661416be051ca0da39769fe2f99793509acbfc3efa82318c69803f386cad629b4160a33b743594b0e379b7e9d483c2e5d2dee40489b306981aef5541a8639533f46e058b83ccc878600a43f1c97e36aa1a5b65ad3b2dde0362e35063d6ab2018e2b866ee1d13cc204a2949ec14ff98b36408392751962c889e975de56ac5bf00ae7df15768f02d9243685207c530531af5b4d838d63f418e9261fdb9204e14139e7890e290c047a795dd7aa9ed45a2ae86e0a20bb1489b2366d292b5c8cd2401c5039ff21b734600a046696d728ba8e4e9697f9ea7cddcfa1417272b61689d9fdfe5f95c626c92d6ef364447505e6188abd7e544838aaceffe14768e94a6e0ecfd4e5c6b91cfd80000000000000000000000000000070e191f292f373d""")
-            ),
-            new SigVerTestCase(
-                    TestUtils.hexDecode("""
-fe28a25123cd888c478aac1d081ea7efc0ad28c299b7cf879c70474654b0bfc8eedcc03981c72ec5378f14a215f090573a961409c287dd8bb9e17b83d8336b047bded3b424e69fb26e750f5f98a9864c906d82f1ed3f136b22048ccb9f3b35c1c184c7f2646fa81ee83701e854b42e3c6d69cf329f742155b37ee4796e5626681e1a56afa9aabfb79eedc3241423864e67e579ae2dd28927246935ae35aa191781800b4133e0e8491e134410da8b724d7b11719721a454e468eb33baa944c28547cbc9cd85b909dbda3c83671400b0de43dab70b1541c97937fcff85510a80d96cb7ecc9f57942d5416f87d0ec5bd6aa0b83ee64a57e64f88576e5560474db63c12166b62b62566dd79f3e4752af1539b09b4f71da54331b00c854e9a43199110889ad7aac60a224a58df58e997792627d4e22ef649ffd9e4853c39965c6a252330109a9148a2d257e6ae7659441abeb74e3528eede0bba8506b8c8e5be6d2d048c4163d161708b4d28175ffa2bb4d226e4510dc3da42c0d8b6b17592ed49f3948ce18ca9d0d8885c2933a3fa3857179f4ad48f6bc834ce21e4efb3a4c0c255b7f826b9525efa9ad6a1899e01c72c3ba4d78247e41b4387df8e664ca190ad641928e58cfc20b94f20b42cb2929c56f61057e85e638dbb09b8816948a95f515992a38e4d0d4419b0ee9884aebcd29df37bea8c60c59fd091453d7f816ba2b6173aa8a684e36bc79420bc640f3f6ea457dd7aa633389a536e6377ce182ab2fd62e610f51c135b549565d3c5dfd5aa83783399604faecc2c4fdfee1c383c8532a8442e004909c24bbd6dd15f2aeb8e3a2c7de11488b08f23453aa38f8689d0e2d80717f38c68128755114b151f2ac8aa2ff6d8f54770c8dc731074391ec6212140ae79c160aa2216cf183fb86f829c01bee4ca9eeb9b1a534a0e68000ebe4d25c5bda0d3e264f634ed56f1ed762bdca4577646344cd069c8947ac1050b62eb43f0ed7d276f5a1eec4a620f5f160e66b11ef24a7fab0f500c7fd1d5831c6d1994f871216c812bbd4eadaa5050dd2e59edb14b6095c51cd6715db572205a644884bc28fb1ca2e73ed5df2a668abc255032ea645c11b85ae3103119d3089875148b1ebeafba87b0560c22b6bca7f981263541fba14cc4416f20394ecaae798bdae4c15962850d49ea1b3d99ac6ae25bd803437703854f514f36b30e73fb59c97d8f542485a434b2292992e78a73d021f074a11a14c9f95e6eedf86a986afb81be2b47f17178de4f21c287f25600e39147608d8fc3d5d8cb0d6409b3a42feebe1dff95b3c588935713c2f7e8f9d3c0a0546c8da656910fda9eeb4415dfbae2f90c9805917698ebe7866b96984ef22f9db48c81deda5c17928ee0d5dd9e88acd2f5147a9d8281acac581b0a0a5028014decb33281915de058d53fc75932fc1a0d4e349c75a7d1313f9ff44bd3c1e9f057bcbf6c0f889bbb0ec75b967de1bc7246eb91c515f8ff5c2ba15ad9df662e29eedeaa1a137a4c1ae62858c583874ce7b4179372289e9331eb8ef3effdd691b8d4410977cf0962ab9f5fa882faef80a2d2334ddbcf5301770197a713625596866432e342f11f6bdb51c6d629dc0cb159c986c55906497ff751a532d922380c3f0171ce058eb25beea093df5e2a45ac8546d815ff08babdf1a0365fef8e12d59ae04f0cb6c373d4e213ab8386b7ca98891c3f5c6c6bb2f5396d131ec9a173a5c2e760cbd8840ac3be5cc21d837d44efb33412a572853782a7e3c6b8f438e4a842f7db269f7ea339ce80d2da2bcbcc8c8da5e68588e136894e4bee6985934ce772fe9250ceb70d5902a49efa797bb3fb0b7021a80daa677807332bb4cb866918892c7b497865ba4df6cc56121315f9dbbcb7d82c9b1986c5ed428cc257b4087a27f1d340bd6e22506985b8b456bd3d726113d0b190491ab8296ce2725a2c62551924b1a85aedff7c3cd0f1b3f5fd8a8b0c1fd04bb5606c3ee0b3a5c8cca67cb2da6ad7eb74be8db03e91f43c315d4fae4d93f71a8eb1be4a54c6d66d44c203fcec2debd53debd527b4d61b2bea59b74865075de444839ee09fc9f6405a0a91021bc328e7aa8cfbe77ac8b49e049c8831689f52d29a7db38ece3f04b994090c636cac358d215cd36f55f44e1f99675137e192a876571a1271e7aae73443f0b6185d918f9b1bde15d313c1eb3c71bb01b98ecd764a1cc1a7c54378be4e3df310cc0a8297283b94bd45a53f19e55c18396a902c906e2f4249b5213a76e547e10648a48498f6b6423ecb8ecdcd707889092f38c735d5b1255670d121e16091ee2571716497a72c4e851beddc42b88fe4ce51b7084a8e9eeffeebafc1bff1bc787b8b289d793e60502880e7c4625f4dfcf8d9e03cf606b0d08a36522a7707985a1dafc3e16683bf1e6c7338b9f5959d94be1e6b36b5d2fc7c5476270c8b4a38d6b8b8545a88bf34e91c765aad1f753b717ddae316df7913c6cc1d02fedded7ca47464e236fa9c627935b0df1cbb6b3f87ee6779afbda2efbecfa7c5ee324f7037e99d65175a1786547659a3d3e039d9b2dfd48b52a4b676d282701e62c895ec730df929c439cfa55831d13760291fb2e87e92fc3e3228daf16c93b3cea4da2a7b089e79d5c2698e6909fbceeadc461180784c83d5d6857e7cf50917143970e4515ad5d19a9d4836ba201e356566dd1ccf5694feafc9f6b33e734925ed69e82f4821e7359ce6c2b5d9fd2fb470fef5cb90336befedccea1a0ecc4236de6e980e584cdde0796c1118da083cf0b064e91898529c486774440b87af2cf8851b455b072f011b008fc9deafdac5d1401653a989babbb5e0aa14e7ea672951d8c87f7c41cbdbe66eb9856a54652027efc81cd20195a31106fe3dddd23671924c58cca3109611cd74e8b212058a616b4571b5f48c8b13ea3c0d69eccf41734e6cd2e4e1502741577982d6ff5b213275178b215019ed430600a6b940145031d3559a83bb9321fd89d98a3a382ac2e3479fd91ecf7dc31a7732adb04d28de1549b96d153f909eb10e024156c28842a3179aff185f008244143614f96a8297cb553141d967e675fe09873850bf28cec3eb8c519586c220be8f365aed6401beb68235d87424d9ca06806a5b3c00f7fbafb951577ce79de9dcdb7e30913815f695d1267e78f72896073f1878fedc4924f86aa6149bcf2c69e9c0df1c2aa17f95501ceb1d9f074fe9e41d474f7f6bf73d1d993975cf58946d02b9417b398464e9239bd446bc77493c9028916ac652692d80229d20172a4c6b86b4573b407ad836d0e01358216520a442dfc2b302f74c16e06a087f46fb40ef6db475754bcf778ffab7b8ef8dfad3af69fa91537c34da59e0727b13cf3d45d48a5af9586471b7db96cbd0d4fcbc5b699c1b549ad74f43ada72884816102bbb41a5063803c7aab173ef368815bb5fc4621b4ffc290602392624ed534aa52a1b51247c78e79edc30c2ba2ac3b0180693edfa1777316b6b45614aa768edee575a6b2e57b90a0137188e83b18bb53f693124c8c84ae595fb5c24841b8d1696117a5ae94b487cf3e56bac558e2c9569d71c692aaba10ce9afac91593d3a2bc9348bc26b8a8620ca43aa4d17fb28c475d3211422a0450cc0a4f0577ff9ede1368f3e2e8cac80877355"""),
-                    TestUtils.hexDecode("""
-4F4C7E0134BE5200C4512299D134770A64A76B73A82463FD8C86594939DCFD9DC55B895B32A2E96B8AFDB8CA83AB857679C372CD88754CD8A7B0A31D2ADDFD7D1BA64556AAF1CDD674F3E8F5FC0BAD2FA38326365918430AB2344CFF785D5F73F2B5D631DB29FAA0F9CCE5CB7FFE0CF4AF1C7A8950EF32F1D72080A492C7A25ABF67F409FF5D4B1E0D77268C0A1B2A32D9DEC61BB71EDAE6BFD58F274707182058F0E6AA31E6D3763732A82BD6F2C76647C7ACAAE7FB4AA51125F0D2D48351B6A3FC7FD18172FA8689AE1602C4EC0CAFA863AA98BDBB1CD8C2681C2B6C5C254E346C18E2A270CAF2606A6504D30C0E2E505C2FF9D18523BBDF21424C645AF0EFB2EA0FD21B5D0CD85C7C1EE176FCF904B481855C4CD739443F3340AE48276E7F4BDC00CD11C2B0D6B97BD00AC962EE1FCF8A73D3DA3CCBB3B72095CB33C5542D86E843641CC98E27545F99188AF064D5FE74739C54F5678F411D96A0EA043652935BFB2E37EC934327C7C841CB0CD04EC17FD06A18E88882177B51B00DB6EF1DA164245A3F2554CEDE8C84DD777F0B92CDA456D922D8B7B8B63B548CBB72CFACA540C0D69F9EF21759F243CFA03EBD6B080D23DD62945E623BC4F8323DAEC1215B251C35EA13A0F081B86E803BF37DAE6D913B7D942BD1C276ABEA3F8F74D0C8727EC21EED2AFD438BB7"""),
-                    TestUtils.hexDecode("""
-74bd615dc15e9ddf76b9f9bfe3092d48d80a2e8fe813b8b54d48297a3a3cc255927f7d8eb3bfacf8ba83c73455ef02ad7fb58606a401c0b29d8ee5c2146dee8824eed0d40dc886a5a0f4cb73a0a25c563fb78d9b347c1b0677d5b1f4fd9b01cde28958ff5ed00199921e2d72a63a4d5a3c43b9f5a47f5e80dcac8db898353bcdc754e89b0fd3279ef60fdc3114761c611f5d51a7c4ec9d4a3616376956a6b755d2e162db6df7c916d1054cc9e624a7b05fab4ae9080358497d8172b90bd2fdd8219e86663deec82ba86c2ecf63624c5d7aeee9f1ac56738c58dbc87d968fa3ee5098c51188169b188120015a00ef3a5bc03c52616cd04579604cc1affd3aa92270491673887b232eb65f3c0b2135157b6e57184b10f262605c26424cdf5c3a5694beb6a74ff252df89bd7693abc92ca4998d9c644cc737e8baa2ec6380d10154c212422c069c9d6fd38aca468ac10e08fb4e49b4d734f284c3e641182276a45be15cb2a75b78d52dc63799a5a2e4e800b30871655a507c2d0b6baeaaef0923d67057574559b87d8765a4c3f87ed76f1ab5bfd5eac40870dd7510b3bfcd84dd9ea15e5845626319e5faac3255bd9aa7686aef2410dba1221f67b3a649c5528a7f87f0ce8556e3f32d5c48622844c113454d08855d8a930b1c7d68522a9d284f1970f8944ed9882d515a877c21d3a85cc247da447d8005d72b688cd17490d88c9028c140f70052416815331fab6c073ed191288bfeebaa7325991edf0ad3520628f91d6aad43411e7ad0f8aeb6825f9b9d63b2f7d5c0f18c67d58634a9d85ef2a932cb231cac3f057656ad2c0e87a35fca332f132b68d60e39822409657c06dcc1cc92fae42a6c940c379e1fc61b6af60022a76e52c1a73033d6877fabcf9b17583aac80b5922148aa45434fcd0212634d5009aa509fb35e57905e033fe1026cfd4e227861d5be4e69838a92e070b96e61c747596e3bf27084e804dbf380aacb659ae79cc4c17f20ae64117088e297c82b8df7235974c4eade96a4567891eaaefdd7fc8ed1185a8ada618e440c4b85b698028f7ba29d46010d2f965d357a8b469281f5a2d3ad786092d5954ac780793f70ec4ce0ba58b2d755c590284c0062374d9a1453119d78b900b33d0ae9a7c2becfb014516d6b5a71da7c16c9215008cd1fa18b0e2d4b1a189c698e0ef49d230b7b284283b54cf907710730020e4c64a935ae5817803ea1f295f19464122c952de6870cef17bb4830f74e253ed99fc9d39618d1755003ce2c6434d5b4815a791df5478388dc9d6b3a72fcb326b71163922a7660304a9b9a0dc3a4df7f7d1d12fca8f3337adad6144add960229ed4b0de6eaca288ffd38a0a0ed6e0454e95527c18efbe3a3b4a18885e5f568577d903583ead64d60b82175aa2b19e100068bef823e2e8972feb348ec9f315b0a46d672d17effae1b47d60fcefef137956df1b4addad9587f6769269ba0d4e8d90090ddc2fe579dcca0980787ff8e41837e4306dda5f10d3f63762cb2f1b88558e749402b37ffa8cc75dec83fb44a6ab62260a15bc5f6e55eb7c1bec665ff4fd2a3d6e5360b3965187daff84ea0e42ebd3c33e57be120002e17e27d23cc5db3519afc91d9a6cdfb04bd7ee04a69ed087c4eab2ceeacbc0a0f4d6997f8471cebc6552bcb17e33ee72a197b5025b1499b1a19183fbca863b749758023dcca325bbf934fd1eee220e10ad10a49a3c5d861e91fcccde741b28ee26065812b371e25ade89e9a4bdb74956b9763ae2ed876b012d9c9e1278845806d9b22774b107443293848f2c510ea69fb45283ee91d08784c88f31de801244012ebb472b1a5032ec6c7404a03e6ba6c804aaa7aafacb204e3dbf5b9b7c455ad35a976706b0b217ddb0009562daa02a09e6a16484d4d85a4b5e5760b8b7e05c5310cb9eb1302447fd94b64963f64e2f182e5cac29ccb93233d43c398a7adc0d782da927a5978f7678b693d3c91988eee0c11f8614d351f48a3b35c8a5d1cd343ddd8f913e91f82f13922d84fe4a1c1599eb4574d1b1c3b0664695ad132627f8e24e0422caa6dbc0631d44244eb1025020f3018a14629eed3ebd1020b65ca21cc46480d958f67dff1926f99c7eafc6ff893dff9d804ab937dd9a5249d377eb2a9dcb8461c3a45e010690e8179343c8fdd033a2ceef78f2fb158087c93533d3b12b0d02417eb067cb63b3f961f56f7924d549e8a4ef12fbed383997e41ca1dc7ef6bc6629c947ea1a4750e3de3477c9d278d35f109f877d8af9dbf8a5be216b7a3511792efe170d79309910206de37a69877079a6d74b2a46192bee571b47e64a1458f590203789137bf3fa3a11defc15c00b976ee977e97a173502a3c13e01d1ab7c385f216ba812263096d0ef9d7c0c61dd2656771bae1edd5073e6a0e61991e4c163b5f6847231dbc2dbe261cddf6f31b614158cf41c3baa1e9b82bc2c4624f1be8322fb23f94912c2b89d82152e84f19ec84eab678fc79cb31ab6ffc25a56056066784fa5356cc4a39b33ee83f41ace4e6ba647d43e5717137c294093ba7c4d5d2f462d63b9ee0fde8b02d430179c84e79c168dec2e0a24578d067b6445972e0576cf5517284498e061ccc215898e15bfb1be5d8eadfdebe789188852a4e596474c0aaf581ada0f472ccd1a1ba6705bbbc6b938e2bf0b115557d73c3f456badae8422835bd12fd4f5a48ade113261eff298097c33dab6320603d813a198bcf6cc7fd9ccb78cdab417e6a8047e11867c91ab4072763d5e63369a58e8a3cd53258aca1c13f153c226a356b3c111a6fdb0bb51e5e6fbb400584fd4258bec8ad1b72796f0920a316564fccbd05e9bd5dd98552e04abc6a402ca47a9ed76bac30bd66df28aff95d7b86d95377349b7ff0a775b32dc5d6f726d16821c217f9deec62138e6b7b659d985dbbd57c7af7d6d0b8d234b47b122a02ea2813bfaeea52fac4100abe3567b18640f0e39828798b9788cc51f2cf987cd41602291195d4cd1fa1d1f152a2130fa6631dbf21fa1ffd933dd9137f7d1cc0c7fa133d3e4d04976ad8270ee85887b3d630576b45be5f2600a5c8159cee9154d7a0e4acb1bac445c033e57827908ae303d59564268f14abbf4b616e21b944c907ac9a30646f37d53b6d512f9c3212254d35e87aaced28d5d3bfebbb3c9e06c806a5b2ca6702e276c74d9900e08f8345001b1f720240813243c78aeaabce954018ddeda0ee6b1d7638e97b6d5b159984a901f297f10921a681ffc28834cf5b51c9fc761d327ee9585bd88c425459ab657095f793c8f07b255c84c5a0baf15c6cbf14335031347a03d11ba6ba49536d6812ec4e35dff2641bf4782f3c57d2d8e4b0d5d16b339caa4517ce6e8fe2f13f7d9837adf95500adcde6aa4191fd0cfd66f866c520ad3871f4f3bfaa5d0b8b3e1954bab44ac6b26713d2af52133c704d5237a32ed5e8ae69b897c29358c4a89ebc7431aaa97a031bf243e1a41658c8de7ba7e769e73b0b57a5b53cca25993c43f63244789e41b9be75859efb110390b8cda0aa314f96bc73b176d8cfe5f0acbbfa245ac49aeddc82e2fcfe9742c26a0f6128afbfd02ced63b67c26ed4755ccac4bb26963bf98f29c5146dbe5593d7a5b372d726d23e2947f6d98fa34454f6b9271a0fff5bb32a91b9140ef7e1751b3efe5571629784b271bac9d4b48c7fb0ac426dbd46dbf86aeb137a8c9b0d3025be5d71d7123581ddddac339535825eec433455a38ca8c6d6ddc59f12f6b4fe4e5ecb35bb3ad77a2bcdeb5315dffc072ba16565ae879e52e7652c9a45cf8ca840e913cd71dda69a81a09faaeb51a44f342812df6e88ddb34ce2e6a9a39b72d8128dd973ee94d6f86ac4b95af05940914f40ff800c3b25f3ef7f8a0261700415391ff4e9f8bca688b4ada9639da8e0ed0c754eee0e1d75f7c4e148971e7a72ab0233ee2aa77a4cfd345fa3062b921a9e49d444acafeb8c7796725dc84f2e5629b91f876fdfea92484aef3f28f9645973b47e9c607ab78877b035f64b8df0789fcab17f8d7ad2bf3a30bebd4233dd9ec3761bf23ff636ce7262974b332cbc3033c38bce5f9452dcfe3ed46aa3ae7c2c133160996e93a83ac01c4a50b0bdb0d6fe30c0d2b88122514aca33083a88b86768a46d11808beaef3412ba771eb77a17bf6328581d8213c5a7271adb13ee318f6b11624ac249857237d13c4308fa3aad7e148d0fe8b7a2c32ec48db9c2fc12fc536f5e9356dc83a8b57fc082a687a854ddb1aaace41e07845600cea04572c98a2a5482301d6c6e77be14bfb481ed5d36d9ead04ebd29e2c72f6855d4e13c58b338608923ff7ce5d366dfa8692b92c5356b6980d7ba133a979cc5f0e5fa066b575b0f7fac0e4eb0b531e404dfe328ee6ef263fc652a5ed151585d7fa47b11edba2b6ea5aca517b2bf5a38785caee5096354f4b703b8f2b6e2e7cec9b3c4fe09b0785734ef10555eca3e0fac89bc0293db20f64891f4b2773e2a2124e64ca5e5904c5d17e5d8dae7bd268c8a537d6fb7f11287a49e63e028186f9686b3bc6ba6c55a851f28804f53a0bd43098a63f5c005c4d3970cef231379a46561d41a94c18b2141843896a3644f1f19675ca47b4bceb6da613c0800c214df0c543dc6449831a7486dce0a6f9a349a4327209ffd5d240344912fe4315d9f38ed9e9995c814864de81e093517ab59e4ac5ff9d3c625c2e3db325092eeb5dacc6c3e5e3841b6df280543ab79b7edaa510dd39fdc44640b37f1cf44160c067432d32e4d83e60064e803a7c2bb5749e8cfb4c65f4fd515a15db304930279e95cbdaf3df8960f59ab547d527031d3d63d94d937a3115d3405e622a3f0a6c14c8aadb7464d5da999f16b327b61e9ed9296b0a8ffa10bf4ee900c2a3b55ac356f98076b705a8712613844aad76f961cf4829a1ba18238f2265a08c74e0f7ae875c19f70e9f73a328e48a7fd22e5657abb9b393bf766557fd834c6e81b07e1d1d92ff689ad1c794a46e6eb85f4d342caf54a0ed148ede130b7bbe1f1c2e868ffb20ea9c20b45f0311b352b85055d3e162944c91a89d00f2f9cf0e9a93743646379eacaa4ab3e54bcbce08e4ff015d0c424462c2acdf08c747fc3b7c7baee4e909af894c09395b570ae516ae687ac6d75c695b06fd8767b871ee41113b9eb7f5eb7d0d46d88369fed3148798736f31678d06b0d3402bb1577dc0f3f19a0a2f9d101a611d1b33ff99aff52937fc21d44e3f2c293d37b9a901ca71bcbe03965f2a458069c9dad2310b58a0c5662dc113d7ba619ce3e2b66b929e6770ecc3f6026e9ccfead7df2e44cd7e7fae06683a4b5c0a3a77bad76c8754133d7c548bee11be8cc084605f24668b294a6a0a633c7fcbf3822443a90477c8c501fd33c8778848f049a710971853bcbc2ae666493faa6426a96483ad0bcf8ed0c4ef0b58164b202650fce31b3ab76dc96edf271415c5a8b0414d7f60a51f01818b4e8c4df3f35f51f7738ffe534b2f9c2fe2acbf7c5e272a2d1fd4996ed30acb03abb0dee3e099b0430dcd620bbd639f3fb8b32d66c02dbdb262596c6e177d4aa7f74a959e90bd1dbfc061363870c42bd573abce58ac853b85766cd52724f158be47d62a90dfb5f0025e208c9daa5a386433ef5072da5d8938ed6683c7131dc5b0c66a4c4c2e14b04dea6fef564dac183478620e5c0ef74497974222f2788c84523ebc5391516ad6dc540095080042a5a52611cd4bc7785fef1768737ff1d9775a29a3a442f97dedf434d0fcaf2d8ec4931960e5ee03b91c6b16bb050bd9b64c9f8858958e1e6884cb916d6fe9643f05887b97f1696a7c111fc949009cad4f2ffd42f891cdb39292e9183b5eaef8c463a9226e71cf2ea4db2a6c66b7564b38aa04ab38d718aaa8ec5cceb4589e4f72e31e80910d209296e4342c65fae64b55be04a8927f0b9e7bab21f37af331218f43439087bd67d639bdeb92c3f774f7fcfb4fb33171659e00f03537983cd481895349a534395c40addddec7404c6adb90ad2a049ee457528a40821d4e57b94224d686a7ba70b5b2d35102b73de70870bafedf2b30ac3fb7f26679a2471afbe8f9c0f645e7d50d2d9b1e921ec8b84a1493e96e3463d1785b452a58077bd78708c1b54a96d8cb5b186e56cffe16f6ef668ed05cc0967305b409714679cd775168333d5042c9ca581c3ae2ef99e76fc7c42221c2ce3e138bc85e202fd3136c35613396fc259c4e223ea528bf7e0d7a48ee2ca96bb81e687813bf2c04dfde469c649a13816d3ea3e13b2f1fc1f6faf526dea7e3e39715ea1d6542e1a3b007fec2051531404040d929fa91c88a73ee9a717a93df44430598fa2d5922564a73b77651f24a4265c83ff09b25daf7c1b682da1498d5377ec73b00b408a4dcc9bfbfeba175220a6928623238412f1937228e9daf416a6c9aeafc06083d4d525c8eaf1f216299aec3d7e9ebf4193a42649fb4b9bbd7dd27367382849ae718394d86adc23270737c8fa8aebbd4001eaad3e4e700000000000000000000000000060e1822292f383e""")
-            )
-    };
-}
diff --git a/test/micro/org/openjdk/bench/java/security/MLKEMBench.java b/test/micro/org/openjdk/bench/java/security/MLKEMBench.java
deleted file mode 100644
index db87c24b48f..00000000000
--- a/test/micro/org/openjdk/bench/java/security/MLKEMBench.java
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
- * 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.
- */
-
-package org.openjdk.bench.java.security;
-
-import org.openjdk.jmh.annotations.*;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-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.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.InterruptedException;
-import java.security.NoSuchAlgorithmException;
-import java.security.KeyPair;
-import java.util.Arrays;
-import java.util.HexFormat;
-import java.util.concurrent.TimeUnit;
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MICROSECONDS)
-@State(Scope.Thread)
-@Warmup(iterations = 5, time = 1)
-@Measurement(iterations = 5, time = 1)
-@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"} )
-        private static String algorithm;
-
-        private static final int TestsPerOp = 100;
-
-    @State(Scope.Thread)
-    public static class MyState {
-        Object[] encapKey512 = new Object[encap512TestCases.length];
-        Object[] encapKey768 = new Object[encap768TestCases.length];
-        Object[] encapKey1024 = new Object[encap1024TestCases.length];
-        Object[] decapKey512 = new Object[decap512TestCases.length];
-        Object[] decapKey768 = new Object[decap768TestCases.length];
-        Object[] decapKey1024 = new Object[decap1024TestCases.length];
-        Object[] decapCiphertext512 = new Object[decap512TestCases.length];
-        Object[] decapCiphertext768 = new Object[decap768TestCases.length];
-        Object[] decapCiphertext1024 = new Object[decap1024TestCases.length];
-
-        Object ML_KEM_512;
-        Object ML_KEM_768;
-        Object ML_KEM_1024;
-
-        MethodHandle generateKemKeyPair, encapsulate, decapsulate;
-
-        @Setup(Level.Trial)
-        public void setup() throws Throwable, Exception {
-
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-            Class<?> ML_KEM = Class.forName("com.sun.crypto.provider.ML_KEM");
-            Class<?> K_PKE_CipherText = null;
-            Class<?> ML_KEM_EncapsulationKey = null;
-            Class<?> ML_KEM_DecapsulationKey = null;
-            Class<?>[] dc = ML_KEM.getDeclaredClasses();
-            for (Class<?> aClass : dc) {
-                if (aClass.getName().contains("K_PKE_CipherText")) {
-                    K_PKE_CipherText = aClass;
-                }
-                if (aClass.getName().contains("ML_KEM_EncapsulationKey")) {
-                    ML_KEM_EncapsulationKey = aClass;
-                }
-                if (aClass.getName().contains("ML_KEM_DecapsulationKey")) {
-                    ML_KEM_DecapsulationKey = aClass;
-                }
-            }
-            if (K_PKE_CipherText == null) {
-                throw new Exception("missing K_PKE_CipherText class");
-            }
-            if (ML_KEM_EncapsulationKey == null) {
-                throw new Exception("missing ML_KEM_EncapsulationKey class");
-            }
-            if (ML_KEM_DecapsulationKey == null) {
-                throw new Exception("missing ML_KEM_DecapsulationKey class");
-            }
-
-            Constructor<?> EKconstructor =
-                    ML_KEM_EncapsulationKey.getDeclaredConstructor(
-                    byte[].class);
-            EKconstructor.setAccessible(true);
-
-            Constructor<?> DKconstructor =
-                    ML_KEM_DecapsulationKey.getDeclaredConstructor(
-                    byte[].class);
-            DKconstructor.setAccessible(true);
-
-            Constructor<?> CTconstructor =
-                    K_PKE_CipherText.getDeclaredConstructor(
-                    byte[].class);
-            CTconstructor.setAccessible(true);
-
-            Constructor<?> ML_KEMconstructor = ML_KEM.getDeclaredConstructor(
-                    String.class);
-            ML_KEMconstructor.setAccessible(true);
-
-            Method m = ML_KEM.getDeclaredMethod("generateKemKeyPair",
-                    byte[].class, byte[].class);
-            m.setAccessible(true);
-            generateKemKeyPair = lookup.unreflect(m);
-
-            m = ML_KEM.getDeclaredMethod("encapsulate",
-                    ML_KEM_EncapsulationKey, byte[].class);
-            m.setAccessible(true);
-            encapsulate = lookup.unreflect(m);
-
-            m = ML_KEM.getDeclaredMethod("decapsulate",
-                    ML_KEM_DecapsulationKey, K_PKE_CipherText);
-            m.setAccessible(true);
-            decapsulate = lookup.unreflect(m);
-
-            switch (algorithm) {
-                case "ML-KEM-512" -> {
-                    ML_KEM_512 = ML_KEMconstructor.newInstance(algorithm);
-                    int i = 0;
-                    for (EncapsulateTestCase tc : encap512TestCases) {
-                        encapKey512[i] = EKconstructor.newInstance(tc.ek);
-                        i++;
-                    }
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap512TestCases) {
-                        decapKey512[i] = DKconstructor.newInstance(tc.dk);
-                        decapCiphertext512[i] = CTconstructor.newInstance(tc.c);
-                        i++;
-                    }
-                }
-                case "ML-KEM-768" -> {
-                    ML_KEM_768 = ML_KEMconstructor.newInstance(algorithm);
-                    int i = 0;
-                    for (EncapsulateTestCase tc : encap768TestCases) {
-                        encapKey768[i] = EKconstructor.newInstance(tc.ek);
-                        i++;
-                    }
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap768TestCases) {
-                        decapKey768[i] = DKconstructor.newInstance(tc.dk);
-                        decapCiphertext768[i] = CTconstructor.newInstance(tc.c);
-                        i++;
-                    }
-                }
-                case "ML-KEM-1024" -> {
-                    ML_KEM_1024 = ML_KEMconstructor.newInstance(algorithm);
-                    int i = 0;
-                    for (EncapsulateTestCase tc : encap1024TestCases) {
-                        encapKey1024[i] = EKconstructor.newInstance(tc.ek);
-                        i++;
-                    }
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap1024TestCases) {
-                        decapKey1024[i] = DKconstructor.newInstance(tc.dk);
-                        decapCiphertext1024[i] = CTconstructor.newInstance(tc.c);
-                        i++;
-                    }
-                }
-            }
-        }
-    }
-
-    @Benchmark
-    public void keygen(MyState myState) throws Throwable {
-        switch (algorithm) {
-            case "ML-KEM-512" -> {
-                int count = 0;
-                while (true) {
-                    for (KeygenTestCase tc : keygen512TestCases) {
-                        myState.generateKemKeyPair.invoke(myState.ML_KEM_512,
-                                tc.d, tc.z);
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-768" -> {
-                int count = 0;
-                while (true) {
-                    for (KeygenTestCase tc : keygen768TestCases) {
-                        myState.generateKemKeyPair.invoke(myState.ML_KEM_768,
-                                tc.d, tc.z);
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-1024" -> {
-                int count = 0;
-                while (true) {
-                    for (KeygenTestCase tc : keygen1024TestCases) {
-                        myState.generateKemKeyPair.invoke(myState.ML_KEM_1024,
-                                tc.d, tc.z);
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Benchmark
-    public void encapsulate(MyState myState) throws Throwable {
-        int i = 0;
-        switch (algorithm) {
-            case "ML-KEM-512" -> {
-                int count = 0;
-                while (true) {
-                    i = 0;
-                    for (EncapsulateTestCase tc : encap512TestCases) {
-                        myState.encapsulate.invoke(myState.ML_KEM_512,
-                                myState.encapKey512[i], tc.m);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-768" -> {
-                int count =  0;
-                while (true) {
-                    i = 0;
-                    for (EncapsulateTestCase tc : encap768TestCases) {
-                        myState.encapsulate.invoke(myState.ML_KEM_768,
-                                myState.encapKey768[i], tc.m);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-1024" -> {
-                int count = 0;
-                while (true) {
-                    i = 0;
-                    for (EncapsulateTestCase tc : encap1024TestCases) {
-                        myState.encapsulate.invoke(myState.ML_KEM_1024,
-                                myState.encapKey1024[i], tc.m);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Benchmark
-    public void decapsulate(MyState myState) throws Throwable {
-        int i = 0;
-        switch (algorithm) {
-            case "ML-KEM-512" -> {
-                int count = 0;
-                while (true) {
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap512TestCases) {
-                        myState.decapsulate.invoke(myState.ML_KEM_512,
-                                myState.decapKey512[i],
-                                myState.decapCiphertext512[i]);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-768" -> {
-                int count = 0;
-                while (true) {
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap768TestCases) {
-                        myState.decapsulate.invoke(myState.ML_KEM_768,
-                                myState.decapKey768[i],
-                                myState.decapCiphertext768[i]);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-            case "ML-KEM-1024" -> {
-                int count = 0;
-                while (true) {
-                    i = 0;
-                    for (DecapsulateTestCase tc : decap1024TestCases) {
-                        myState.decapsulate.invoke(myState.ML_KEM_1024,
-                                myState.decapKey1024[i],
-                                myState.decapCiphertext1024[i]);
-                        i++;
-                        if (count++ >= TestsPerOp) {
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    static byte[] xeh(String in) {
-        return HexFormat.of().parseHex(in);
-    }
-
-    record KeygenTestCase(
-            byte[] d,
-            byte[] z) {
-    }
-
-    record EncapsulateTestCase(
-            byte[] ek,
-            byte[] m) {
-    }
-
-    record DecapsulateTestCase(
-            byte[] dk,
-            byte[] c) {
-    }
-
-    static KeygenTestCase[] keygen512TestCases = new KeygenTestCase[] {
-
-            new KeygenTestCase(
-                    xeh("796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"),
-                    xeh("91618fe99a8f9420497b246f735b27a019078a9d3ca6b2a001aec0b9e07e680b")
-            ),
-            new KeygenTestCase(
-                    xeh("60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"),
-                    xeh("2026edec2070fd7a2aa93c55d26aa0cda5c16117ccac98cb86d9c99f5bac2cd2")
-            ),
-            new KeygenTestCase(
-                    xeh("c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"),
-                    xeh("3ead7c9457670c2bbf1a3d0f38d6c0838098def05d5589bebee67ff5c33b4374")
-            ),
-            new KeygenTestCase(
-                    xeh("ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"),
-                    xeh("f910824d75a213bc1642bcfa5a6d304e4723ce0a2ca16000e66fccf48ba0a925")
-            ),
-            new KeygenTestCase(
-                    xeh("78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"),
-                    xeh("8908c5912b74c4f5d1b3043a95ea3fc16bcb8d85414a2f4fc134f18bbcde262f")
-            ),
-            new KeygenTestCase(
-                    xeh("917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"),
-                    xeh("138e93b1f959dbb22c0fad45bcc828b4d4f07ea2fc109eff6adf423d960558eb")
-            ),
-            new KeygenTestCase(
-                    xeh("df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"),
-                    xeh("71668363f77b645c3278b07c0e97e7a3336421e624485f2ec35f34a01c9189d2")
-            ),
-            new KeygenTestCase(
-                    xeh("d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"),
-                    xeh("bdc7be9d2b2d3d8e7e616fe2f77f8bf11d4759b8247431b0e9220a7f8e5235bc")
-            ),
-            new KeygenTestCase(
-                    xeh("865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"),
-                    xeh("1878346fc47148ba7523463ff794a14438c5b5e8500bb6b92b364f90ec8c3d36")
-            ),
-            new KeygenTestCase(
-                    xeh("741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541"),
-                    xeh("6078a65f40993ee3bfce7804086962e5726025b779ca7e62912f244b4162a093")
-            )
-    };
-
-
-    static KeygenTestCase[] keygen768TestCases = new KeygenTestCase[] {
-            new KeygenTestCase(
-                    xeh("796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"),
-                    xeh("91618fe99a8f9420497b246f735b27a019078a9d3ca6b2a001aec0b9e07e680b")
-            ),
-            new KeygenTestCase(
-                    xeh("60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"),
-                    xeh("2026edec2070fd7a2aa93c55d26aa0cda5c16117ccac98cb86d9c99f5bac2cd2")
-            ),
-            new KeygenTestCase(
-                    xeh("c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"),
-                    xeh("3ead7c9457670c2bbf1a3d0f38d6c0838098def05d5589bebee67ff5c33b4374")
-            ),
-            new KeygenTestCase(
-                    xeh("ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"),
-                    xeh("f910824d75a213bc1642bcfa5a6d304e4723ce0a2ca16000e66fccf48ba0a925")
-            ),
-            new KeygenTestCase(
-                    xeh("78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"),
-                    xeh("8908c5912b74c4f5d1b3043a95ea3fc16bcb8d85414a2f4fc134f18bbcde262f")
-            ),
-            new KeygenTestCase(
-                    xeh("917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"),
-                    xeh("138e93b1f959dbb22c0fad45bcc828b4d4f07ea2fc109eff6adf423d960558eb")
-            ),
-            new KeygenTestCase(
-                    xeh("df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"),
-                    xeh("71668363f77b645c3278b07c0e97e7a3336421e624485f2ec35f34a01c9189d2")
-            ),
-            new KeygenTestCase(
-                    xeh("d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"),
-                    xeh("bdc7be9d2b2d3d8e7e616fe2f77f8bf11d4759b8247431b0e9220a7f8e5235bc")
-            ),
-            new KeygenTestCase(
-                    xeh("865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"),
-                    xeh("1878346fc47148ba7523463ff794a14438c5b5e8500bb6b92b364f90ec8c3d36")
-            ),
-            new KeygenTestCase(
-                    xeh("741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541"),
-                    xeh("6078a65f40993ee3bfce7804086962e5726025b779ca7e62912f244b4162a093")
-            )
-    };
-
-    static KeygenTestCase[] keygen1024TestCases = new KeygenTestCase[] {
-            new KeygenTestCase(
-                    xeh("796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"),
-                    xeh("91618fe99a8f9420497b246f735b27a019078a9d3ca6b2a001aec0b9e07e680b")
-            ),
-            new KeygenTestCase(
-                    xeh("60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"),
-                    xeh("2026edec2070fd7a2aa93c55d26aa0cda5c16117ccac98cb86d9c99f5bac2cd2")
-            ),
-            new KeygenTestCase(
-                    xeh("c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"),
-                    xeh("3ead7c9457670c2bbf1a3d0f38d6c0838098def05d5589bebee67ff5c33b4374")
-            ),
-            new KeygenTestCase(
-                    xeh("ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"),
-                    xeh("f910824d75a213bc1642bcfa5a6d304e4723ce0a2ca16000e66fccf48ba0a925")
-            ),
-            new KeygenTestCase(
-                    xeh("78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"),
-                    xeh("8908c5912b74c4f5d1b3043a95ea3fc16bcb8d85414a2f4fc134f18bbcde262f")
-            ),
-            new KeygenTestCase(
-                    xeh("917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"),
-                    xeh("138e93b1f959dbb22c0fad45bcc828b4d4f07ea2fc109eff6adf423d960558eb")
-            ),
-            new KeygenTestCase(
-                    xeh("df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"),
-                    xeh("71668363f77b645c3278b07c0e97e7a3336421e624485f2ec35f34a01c9189d2")
-            ),
-            new KeygenTestCase(
-                    xeh("d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"),
-                    xeh("bdc7be9d2b2d3d8e7e616fe2f77f8bf11d4759b8247431b0e9220a7f8e5235bc")
-            ),
-            new KeygenTestCase(
-                    xeh("865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"),
-                    xeh("1878346fc47148ba7523463ff794a14438c5b5e8500bb6b92b364f90ec8c3d36")
-            ),
-            new KeygenTestCase(
-                    xeh("741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541"),
-                    xeh("6078a65f40993ee3bfce7804086962e5726025b779ca7e62912f244b4162a093")
-            )
-    };
-
-    static EncapsulateTestCase[] encap512TestCases = new EncapsulateTestCase[] {
-            new EncapsulateTestCase(
-                    xeh("""
-c6e8499d78b750e516b8a67709468d3fa3b4d74c0a5f5a4b5cb94d8ca92188437040f9312aa41edcf274f0aace043862471591e84c0e05d61031d69f4fa11f4e8a0977673ab30b2bec0bccefe434b55632c6057842d977027ba616e6a7fec7340bb20c7331b4e2f1044e9692ab0136a0b285fde033ffb25543c5c9ffd83595e380f8e831701b1e16e040600c1c7924b6bc42331d987b7d63c007d76d198c0c32aa3e3663ca7606454a214821b15b8ebb018026aa1a618539c00d0a84c871c1baf016bc426b3d9be7598fd8148d63865bd6b455fb8a47562e95666e18405367d4cd581162fb878d8c0c3d627597a4811eee0963d4926861ea202d46a6a6e94e89b3cfdbf436fa2254f060ce6b80b4bdbb98da80417fb53eba8286b58644d8d84654fcae20906863fcaaf89abd992b176b05b2924bbe566728878b5e816b64a532ce2cd41f5a937ddadc15baf23023a19932b337f508c8fae504a3aa24261a9bd20701a2d3ceb3c72ebcd5807d358c2ed45d0b84092d6c93b74caa20ea4b5db66369d26fe64652270949a930bbd0103ea7d117e6160d9dfccded58476b94ae90036b68a40b9bfa61b15c889467a0a01342f843be8227ae9cfb1593c240a8735d8105a36c2b68e5ab97671b63a1cb1eb07495fd3bcb380aae66d20f3bb096b5db9944d83196b3bb3e321dc76c3b7d6828f366585f75a3c6d370f5580f22b385319483c9c19e6e81cc22690b18782c2d47be5c81cbb1c055cad84db9b06b15355697ea23a2374f027a63197b46f28a85d089a120848e94e9838cc72d1aeacf7d64ba69a93635c6a10ca5745645416e071a48056c78a50a0d4a60412966ab4961819918211a661cb839b01101798583934c9ce0aa447170b870306cfa02a16b9316f4f22d9b958a38b24960f0203cf2418495446c558a6ed8706d8c949e7b14cc168c965293d128ca16412ff7b221cad771d441ae3fc822d86645f5e266aaeb1df56a6185747e3312587d1b5f51e13e23586f9f3b1cf393bfb24173d7e27584b061f4258ff3c29d27167f58999b6b87a820b56fc7846cd3a0953aab07bcd256cd997b4e0172cfbdc0c2fef1b5fc616b03d1c3efaaeb7d48c64a0c839085160b4a5732"""),
-                    xeh("6FF02E1DC7FD911BEEE0C692C8BD100C3E5C48964D31DF92994218E80664A6CA")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-1ad51d02065cbbe01bd1025aaaf94bbb2bac27e678fcd7578ef9bf3026700d711aca31cd4a9641a25286b26c034228cd906434c3e2a56f01b54a98878c6842b9bc9c8d95640bd496c0956446a0cd88d344d552a838e29f48850bec6b4667749fc4266ef8d5c47f8b21e7e108f8a58d44394c8711470ce8cfc92b2e49ea5b8b15772e4389564ac8d568b700d11eb5f83d018514d5d3acbd7c63f667ad9340b2dcfb972a333df99ab2dff50f570a4d0001a413a98f4075acc5241b5e6a6132551b9c4c1c22551b5a008df7d5a218783c2810b79a52552afa922de76dc4b89d87761cfabc81d218cc3259457316333c21bc9b650f6383c350e6681c694496565fa7203d05b0caf5a22a4ccb1fe7f00f89297f3dd02915eaa2a881cd41599635abb85890649f1a4710142c4aa4b5e3d71188562ef5205925652ae7606e30dac7099495ec939fc5b0778477be94185c649c858e146cc6750d3a1a98424b2645786681a1b1095979f2313228f96d9daba787a257f4e27a4ed3377dfbc71ccb9ddb227151203798b58f44a280c733a8aa8a631fa303b26c33bae7b088121d917268aba41cc797b7a3336f12101d5ee8900872b3a1710c885811a2d8c4f0a188d4352f259b62da152bf2a022dbb9c913c1c254a44287546c01053bfea0bbe3d05a24f1b70d969feac7c7325ba69ea981c5e179ad564e7ceb4ff38b824f9754af15664ff7a807bc34e62222217b96f364907916be6ef0cc99b014f3527572e0a6be517d2225aa6eb41e4c2a80aef4a212092bdc186598a69b4d0037cfeabfb13b9a9bc0019c5a83ee659100bd76a1da4b30b686ace6291877ab9d834a641abed635b8f3c536bd6394684ba283da1fe7797580924fa6a65e9de87bf833bd2e67c4a9e037aae0b3eb1701bc69add69127a98a5157a6b3f8393cd104c31a24ad3e381997f28c482c5dd6ec24d7747b559a29d56c0f655838fca25c4ad49e6cab35da559b354b55357748edfbca6122601a945d8611863917c48ba20d53b71909746723b4355a620b880cbb63f260ccb10db6d3809a96740ed153dfd07ba60159a3194553fa93ca28513a65b047a7350a0c6f43f7a09f3e2771f461bbba1e3508c8f8931c16ee"""),
-                    xeh("4660985A5838041F2E50381CB4E7AC908BAC83CC1E074220C6705E3F5FBFC2EF")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-335b7558ac204e11a305d8b1526835e65a110d813499acc36a5409a15a8de46633bf587a706a7d388c5099c73adab17035a347b041cb82938da6838a11513c5756b3992ca2a40c91a450505be4cb4fd9625d209110888484033d09f8b60eeaca65330beee240f9861e768ac7218a6e41a1205f55b411e275253706c57b97ea650c6e69876f79bffed8759ce30df61465b4408a18bb003a7aa446642c90ea072f955f46044f4ed7b9a9b82749e56ad470b0d21b67b89cc7ac784f9dd016a9ca5d2b025668421c25a100dbc0328084c2e3367c022b60fc6206e40aab3a863ba8eb1f8682265af69d15aa9d173204533a1a7ad94f693310663212e4aa0e63f812f1608e1f9903f0685c9b9a797ea5939869b5421b87dfa1ce818265d5051038a9331168ce01971efc06cf02a59c9e1a03373a600f216f779aa73171be66f95d81808daf63a26cc3709ab58f22659ca9587c01029d915c7554946b217044e65a6c98258f6a0a2608a9cdb4c35a0e06c93b19988c221c96b79729cc227ad5c3d4f558062ca3179b8a0b6c0d6de0aaa466c498065ce690278b8980c7c567d308b181b06667f297ee9caa28ac2f5ab454b8045eea583d20993bf69359be500247b3a2ff0b95e243af49b6a08eb19c00f31f3611837cc64b85d8bc35da9466fc12967b158dba95782ab771c134f9945df0b02644fbc949cc633419c48643764e0679a690cdf0239b3aa49a58e171241a106c151b75197f7432cca3d6c133cca0a4902ed6c299a479224ec7baf4243152877adf3255ea114fa01a65a53ca47e3a6dff072d991730414754c831b3763a6673e9b8f4f7ca4d3891a33c542380cfbfe16a650ab749d79e08570629116ef7d50338f26834e298dec8abbcf588f37b428f211434666a1c6041a3a09918293fbff54d35c75c7dba2720a0a91592af264b446105bc5b41344067bb3e5943d62aaca4374f92933e3d4353f1898868d097e504cbb934cf727a9861169582bc4414e46c50c41693909cec50beeda69aadd6073fc1ca3e1a6a822751a404730c3c90a4ba6a9f4343988280eca4c4600b413cfacb8ce2823f2a2b96f56d9d1effc2d3292c0720e7bfe6aabcd8284abd8c3fe8aaee1bfca3"""),
-                    xeh("0D643FF311D83CEDCB3A95BA0F76216A49BCA389A225396F708EC9A51BF18517")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-ae76c67fc7215e493c8645af1c58bec08b66f66a92346b92f873cbd646aa5dc2b9b6e4c2848a4324a8318e9983932055c4f58f42346df1da07977101434a9378d1a1559819756646eef3094b5ba55e33b596b71c04d249be4b8318a4becb008ed71000ae795ed1ac873e244beb7c4071047e83a8b3c6c2be2ab025726063175c4bab391597923d030b5a9238b131383d15dc2a4bb812a8539f9b0b0876a23ae049777e6229c1068a37ab13a2406c6f7ba4591520d8816ca3894bf3c601fdf493e70c5f4b19bead520d25cb6e8439a548f35cafe81497b297341005fffa18b99754cf199ec90504f9f16f8e415cba718318437aeac50ba8413e540b963cca2202a35e356701e177ab0dbacfe6a0c02b506fdd6436982737f903b8a8204cbb07c380340c5f1a84685392a2b62620004caea2c416e61f7c7b0e6e202d92021628cb4c10d57d5b60ba4d771712d552d1f9c6f352779f8c32fed54a8eec59f4b3177c7c3e81e3ab7dc83a396bbe38ac0fa3ccb174442ce638c6a0fc1fc9c426b5eab83d0397b559a97256b2b0817ee115b1e026c445629bf7a8803ff71aad99385a1abfdb22a3be0029503cb44b7a35847bc675f17437d9246cd104bd8608da3005e14a632d69006ed4434c80594b2909fe284203571eac04a00a120c24d050f40952fd53ac0cb39bca50c28ff450a6e208fb26bcacc1ccfa89bd7e05616a395aafd2bfa59cb541975cbe429919b32cae4b1f4a4b4b97858390c164fde76bcdb32b54b3325392c385d647b265578a1c56dfe5a252144ff1c02dc2054bb53525ce4b3bc2ec190e3ba06fbba12f06707f060bb1659607971f3726b9f59191e6e7b252602f51eb281f454f1d80a60ea29eab42752df9a3ce376467f694fcd288c9fc7851c04821b53e693208867604def746f787ada2097740ec8462ac89baf84c0d50bedb539ccab33894408c5b4b91def7955923a283677867a356b78c5a8eec308bfc982c8bbdc9e40d7695b42612ac27f6c118b5379518b49e338738e830fb6a66488b7115d24895963934688d91fa9608d41582e79e5d417ab07c81d39415fdbb870a3f503f1a197bbda81d7c3204a316392fb75016f88565a73a51537728ac7011"""),
-                    xeh("AA28DCC71FA83D9997DD733D8B0D0394D84D33A3D3E1B74CB74DC6049628F861")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-59851028c33af8acbc9ff37ab19a9fbe45a0f08b9cdc2268d6e727665429f16448ed840d0a87c34c3422ed857c69f3168820b0ae998702ac6f55150ae3031a54fb80912ba94fb4bb31604492f406f654855b447b39d26bc81b0d1644c1ce2a7f347c239cecb0cf89ab14917192c12e7a694581021e96fb6868282df0a4850bf3acfde5424781c571e8857cec1f3735a464ec74d859b169142e2e7413d2a02c5e93570e3b9bd18983809129724743a1979794a2500e04a409506ecf0a975f58bb0d08b36c1733927c932e7c73afc47f81b5a87f25878d327d0c375c38d2940aaa543f46b1198345fce7b7bdecad6ad22e12155bc470448f98bac8ebb96bb34b552ab3bfe5255c6783a76425b386613a112ec1dbadbf105ae0ec3cad61c7032bbe0bcca9d3eabf03ac6f0d4c5e500348f6581876e80c531197e62071a9454947b450614761ec95bb7072ab53e81d89e47eb875263ae74ca6a28b2a2a1fd44947756c1f3eb38519c9b2d6d63197e6459bd1427f992680b1a6f1480cdb998006a25cf434346d04942732c5617245033b430b4ca726b94faee24ca54919f0842233e1c6268b4bca31be4ca7be9b52851e2ac0dee573f7959eb896b0bb18064cbb9b71585a319c74b7716de398a8111214ae3130bac5b196e6734d3cca4116bbf67ca42492be22f56b538a8532c6acf4404069a329735246e5eccc2730c2f5690c53510bb2685909015874a8125178c7fc00709b2a6720391e38a0193aa96715f13ed628068ff4bba6e74c7be095a897ba3dc50f88b2b08a353cb4c4bf382a5cd72227cb671ed74227ce245268c38874f53299604c41f15978c522e865333dd0c49cea97289813a828ca76b93dfd3987da9726f0d3492cf13ea72ab8d4e82e73a3987b336f0cd2157de0b9b4209869412b9074736867b10fa82b34e5424c5998295b6a54793e9ab119e9c68049ea2dbef55e27327080c6ae71d69374b8314ce6110369b76fa363dfc201729a700528944f2bc23c464eacf51519f0aed8160d5ceb66d10c865604b3b4ab05f1c2990bf2b5ed84898b6a891ba360af171b051b907d1245770038e379cb727784b219a3c5ce49fe6273600219bcc609c8ffcdf4acbadcb9"""),
-                    xeh("A4BAA4C603DA1368C1F2AC552A331F77BF1D598C6BCB540D43CA1E6D4B8BDE77")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-861927e1d996dacb9c04c630b694150f23aa51f26bed8c744c36a7916864b5160e94cc515ae0a03ffb445245c56a434f9351ab64f6bcbb973718ebb612657d64f844df3b85bd484c473a685a0a4a94e9995d865aa5bcafb7dcbc7e9877d63890a86252c691044df94ef7a19c68056ed6315400f8bd38f48abcd09e82f0376816c0aae53a9cc61b466466b63938dbb0b1dd963adae40802216701d094c716211718943b543cbe0888b1dc463c20804c4c402105130dd7a87a48c3c3328f76a8aef2b0c7d22688e7636b88d62897809eadf1ccf2dcb5a0011998099506925dd3b74869f931394bcae43466a49a40b31075f074bda69c0ee2f7bafbf81712969b43f0beacc246b3e71c9df2c47db405e235ae97e1a99c0365076b29e593b39c485521716967751025bba279f3aab85c6bae3800f255396d136459545f192b650d3b142c383669d2547cc2732015bc4645554638284642b918b5bd65a06fb49c5fd267a90b77ac35d12da3512f44d2556e027e6582529cea194df88584190480d9b0b5335fdfa8685894514cf95386cc1cb63131dcd1022f5b568cc621a729423c0567a51313f647918368012a83816a2caf88e062a9a6064fb52d8b31abc270a01d974459b4134be74c41b6a22e72ba1c993924bc43be6509235298431c72943bbceed41a84f9b84ce21abcea516f32280a0586069acee7627b54055515604a9ba112e620783aa76264ab8136759af9dcc75718a9bac22092a645b1b5cf32a92e377ba03a6117ee842172505793f973f84cbf0fa22d3ce116ef4c1012bc69db94c7b2b461d978c27c93044f22972588af42e28dc3748299e7a098b5566d67110a036ca9c6740dac84205109f05104f80585970a7906d7bf93067472a34442780f0fd25729745c7f85198a753836c3381f0592f818916b48278e14b61f1616c32ccb987940550316462257f1daba0574223ed6767b9c696b1c01ed75484c1738cf60afaaf9b3144899c4dc00fdab36fbd792dbd4885ab3af6ed63f8394b66d0a910041b1d606923858432f81c37f57c146db8dba6775ba1899d5904f3a69abee80050d6232d858d95a7bd86ee6af48bf9c372170c7468fc024cfdd552fb21ae23b08"""),
-                    xeh("C08584D2F5C950E371668A4FC8F527E20AF1532CC28EE6B5620729155B06389F")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-ae13099bb82ebe29ad44859860634d62f78fd6b26295d040f8a5c7ff7aa393d127e214aac9107ccc06d029da6a6b998736710c5fc3a6c9ecbdf00069a9eb2942b45b1626b7953886248caa59789f9e988fa26073bff9b703232859463a9335374506ac57a8c2936701fcfc0235d071bf9807e907734e6267d130c9d4b2406e999b6cd15adf7783db2309598c058a93ac043319194ba89857a59eb35fe4a3cd6fa1c9d7d46ba2f6c62ba85ca46cc8d450bfb0170f5ad6a2a0388ebe73a8b58627f6cc5e7477635ce32472a87b4b881ca9fc749ecba012187a5bdc6e9e12b668f32786cbb5fa4055f86590e00bc4340c04b8b0053b189a74d6bb22db2f75f6b32918c0c3ac7da62044db4a9c1c2b0b1ee81b5317b1fd734c33fa3733d7b37bfa36c16578cdb63cc6f73d661a35e6460b74396ec6a07111091071a757d962384940a1a2338a42fa68e81587fca304d8a86282230470c8988cd707437163cd46cb489b010d235fcb976e50b51e0a22c5662800e74903b403c025bc6df9d821752107b2e51874147645687fedb108c1894e0ac3801bc1398c4a187bea7d9949bc5cfb8368b296b2fbcf2b59c71321b5aa2055e5823f86113a1519c956d9c1793a5d52a906a5031e905a862fec5abfa0965fc49a2db189eb6bc69cb8882b703e0ab35e088340fc35812bc0a184956fdb448170a6b32b49ac0e2a65a1041d38d4512dea3fa111c7e428cdf52144ae0708c5c44382a0733de356ab556e0aa141d58cb1321058be25a543d7060252c9e87997c35295596c02bc7b926f5ba05675a5dfea5a3eb62b2521854f21498c428a23048fa38484935399bf07c64fb63f7ee793a63aceb6842bf05077d2b3647714332d259576182f0d9c508cf2321f0090a6c1cb0a5c106647101277a7b1248e74189df6b90c26a612b26555d433bac49a3ebd702e6d9649038233d6da01f77534a8d2038f615a502cca8526c314c5856a033ec97155ad79a2e2a32cc1e734cedbc6c0b94219d13bf985588400cc682294bf21183830b2bb51b87fd9073b9cb6237884df0cbb12b929f81448e5578928b07193ea4141d19b4eed07a956c34b6de59127c5e823bb8f6719ddeaf282650cfda0e26e57"""),
-                    xeh("1D51A0CC52E85972001B77047D97DF5F47AE11FFC6C31B4AF42FB0791A3DB40F")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-d0f903b9113e3b18442e9b125dd762cc4bc2fde8007fca65b4817ef985667bd62bd8806563846ddf61b68a837d35859344e96ac450cc24303d9f116d502135369305a8cc8549641487f88e0f24a31c87cea974547abb569f9c312dac3fab517c85a5521d41b7eac40c62b7cb8a0776d89828e937177785a23ba0599381004c253fc90aa8332172f7366e6c756e6f266f2c5c9bc70a5cf18416c00c83dbe76a8a9c52ec5929217c0d2be88c8e3374c2111c2ac46a2a454ceab38f8d368f2281749d4109e90702bf368d6ba6ce212146d7a21a9ce6767fdba3bf1708fc359fe4e974b676bb9ee04db18b93f60759a071484c134e0ae29b135c5f2546562f6a471a826aaa3568bcfc721d707ccaf9351462098fcb21b441c81f876a7782363ef84eb9c59b2eac7f637ac205f0c1ddab4bc0868f42c4c2ffd0912a0578e9b81dfdb400a6a747c9bc8c97ba3ff8074f454367a5768d48653cad01c30212997553941780b44f3b26b9b79e6bc43cd56683dc9770a1d81ec0601e66326148f8645f820737c2479533a7cc3142341a2fba851cd304423d835bba5c73c3fc617f393e673591040876e670b94585902818883608a773e736f52c496691481b908106609366513ae14b618b8611539b56b3f466f13a5f59e5179fd29ac4ec7a92b5beb004b628e7701b11681cc61fd088a031d80d8e43b36042857155b0c5f207260bbbd30146d83a9c3c17a1bd804b56c96b01e71de75152f4b4990a001a1d8c736e39097771b819e58a2bf4498f1ca346cc851efb29c1551060998a7242c7fb5b04b6c8cf2f703056f18a9df28504752be88860507b1aa517914b278b61704f2e33cb02307a7a898e58a3a87221898cb57243000249709f5e53037728bacc7027dda1b7fbeb7739375811427b3f8c3dbcc0775442323289bd89ea0b668cb458da346dd25a45d4c9d6eb6ad98645a65794a795277480382ad7a99e85ae9e279ff5d38ac9a461d4a8aa2170136e69bb70c2c7734060421388330606763158f0c04788d79ded7b52b79abdbf891c2290b561ab4a6aa02e591637cdac7353798d9e256fd0286389f7d3b079e3e9f89ec0a68010202ca26dd2ea953f551554098ebaea56f782c3"""),
-                    xeh("BC2D661E6283B835BAEE160D1448957AC2366DCD087176E252F81F1D11E28781")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-ed8034619a429573756962129b459916f158f0ecb0cae396f60c4c84670ce3fbbe119055f1a4382cf2a619c31cee5842ee8c9c6979193ba82ce9f94337306186b20a276c6d06c04f41a414c3100b31e2a2a9984067fac4a7b3c70747c55b87b2512219d62c8b51a6b628766d63d1096f63bec8806311415919336bf9d1b038022d00d1bb84387888dc10f0290b752627c2d78ca5c8475150bd925240ed94af40b43762a99a3f5b0f41d702db7cb485405d5a247ff48635ba7719aeb8a876f0986f233212c40a3645c3e4ea3b5fd02bb520b9d8aa22c4595849b8a2769b92edabb4ba1528dd067aa86b3bdb6a39985983c89c9c916b41b34018bda438e7815bdd4316f6202c0e3c73d53124ee110ee596a9e3198f24b814dfd77f0a2a7aaab3a918b64c47fa44ff018332557cd13325a8081e0002096e68a293258928896532ac5b0ef4bc28bb43f68505f8a61cde0b5ec9ca8d62c261b5290e16b22a4a978d5b141240043c9b457a89a764d9565067cba987a23d5d6b3016291fddac50c9e5581d988088a368d1c9c633bc594d39c56fc5b4a996b7c110208de1394559915138b7cd8941daccc7382b60b47770272a56f846b15c71704b8b7e08595d51658a10b348617c8b552588a20a07c6e0670416636ba0982726671d796803320e0346bea80578f7808419f14b8be67f8bbb627fe4c5c28074e1458ba909581f317e70a66320ebc5ffdab20202143f374742b77d88c80fa8b9593d74a04e2c7113101400c4afb7893f634565aeac9eb8c144a3a172a1263fbee499d7895e298b195d4caf46514927d39f430aaf13c4bc43735670e5b0350a42506621dfd737177ba3736026d314675947a1b7315844da146af84c4cfa8227bc3211895773082fa22a8c9e7c20d1257ee9577c3f36a6d3097212dc1b149421b9bab30124cb3298a6b1505bf586070f52aab80a71e17c223184b32e9a6aa4627b3b99bf089973ab53be7c461ad57317edc3b79872bc50a391a43bb18ee9bf0ca100f16409caf4abbe0239b98b16a598ce86e7c07b27646de1671e915763ec8dc3c09a20181e0525c571a18d74c74c0e798d11d22db509a0f0519c7440e6787efacb39fb35c8cab4a38302c0"""),
-                    xeh("6745F4F0730AE3F14A428A95C9CDFE82717EAA94F65B00A01566A4DCC9ED1E5E")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-e782aff3f25dfd582912a662095a71ab2b81a7b88a0a0b531d0c735e84279a39713e9b78a39679cf2aa956a0bac8a8b8d6330eafe18a20890492b42ff0eaa210a97f931c8c66a4bde05ba317aa5a7c1bc4e7ea9c8a2aafeaea6216d03dacb9b1e17c30c49a58a5d21a05f37912dc336b8739abf4cb74455078655b7d6644f3d5b91f3a97b9317676156dba77747b0cb2ca21c87e7cb0e3238d67811f4e229ccce2303d358164e85a5ba766f91212a8540e800a6e5b829bd097925a01ad99f8af2b8c7832640c0e64cacf5cb5449829ef992bed3a85b3d86fe8689de552acd1b47f58b883e718c61b810a02563484e63a951927210cb5b1e740c1bc2132d026bbb8a9b2099922ea44c2445bb078cbd0accac1c22c0065b99601c07cca67ced147645508a50ba8e7a0012394cec77880a4916c653803266c0635741fe0c98812f37265842e6826ae18d4b27a334246520607dba4452ab7284300f96a01ce809cb4011df18940c6460c7a33aa34e997b89846a287af180ba68f170653e065c1475f48b9763d6bc2643269631729a11aa33aa32a14525641e4a68a61967326698be67d0fd2612daa94dfa9a5bbd3b87bf57ef75639e3c859ba8c0a90f5ac131c94a0644eae3c32811335401ca4c0994df4711c30ca05ca812667d47a8f96beb0a270f75ace7cea1047d4abc944cf71042aa092a041fb60d60976b0ec120600c79c51ce163a6e11e1b972e703ceb5c792482b01b7c617d31922f760e7465fa427ca118431727bce77c12c59b2a7cda287bfbba68c57aef92a4775c6602c87330d693bd10a5d21724ab58bcf03220a14c4463c5226b86a1fe15477e662ca03374287da5b7aa118de1255f574220d0bcc4f68b7d36286761c9ad5d9aebe422b26e95f1f5b67bc012950572374fb8e19575b2a7b911bdc8130d737d4e34ae721c76d131baa9a2f47e208c668215fc2c56f80b16a75114363c3a04918c0072d61f19d22e55d9d1cbfc9210246e12a530ab7c8a7633ca37b20789125573f866b94d872af914007c3ccbe898ba697f63d15b57b2aaa10145c5bd71966d54bb8728b531c87892711e6c0f2f1b554cadd3cfba90def490f706c74c451248631333f0b3f2813fa"""),
-                    xeh("C3ED79224CB07A8D37DC9C789BC7AC8E278968E429087E5B2C0E878934DAA53F")
-            )
-    };
-
-    static EncapsulateTestCase[] encap768TestCases = new EncapsulateTestCase[] {
-            new EncapsulateTestCase(
-                    xeh("""
-3189cdb94a4e3048a4e18621c07578243bc5c017af25da2ffce6abc3194c510076b1d0c5b5529a80b3abaa9658de03ad1e151751f54998fb77ac52a2739b09c4f0ca0b8827c04bc280ca4e7d214231547370e98b92006270194ec3c79e96bb16550692f988627b496ea4f4cf7e9511c014c2ef89ba9620896785784fec1da3458a6f5a11d3840ba4f8714610200d3a276679a7e395488d770cd5122d17b37652a9871357594a87662aeb3befecb0e82513ab90b414d60c66fc61e4db22a2a3668c05338ec86018f154c929af387183079a59e201cb512536ea4908dbd559dbc63aae57cbc40437b0d5b54e784cf7488dffd5ae861b86e7b8a57563abf5f76c81b595a144a11c464d17e6b871011f8f82a8851321f2455644d0156ac96fcc944a0ad89d52f896a2e84f5d4a146e61bd132248572c27d823142629337e116f9635a32f4647bbf2b281d6c1058695b49b51e7f602466a107fab60edecb8cafc47bfa6c65643c662026f702ac7b7118bdc6448eb65bfdf8b9eff908f354410c77bb689d9b557439e9704c4d4107cd6559d1cb5a9a10b83f9f24d3e7418d3781eeb8b07cc8c5e38189afaf64db11b20ea072674fb42c3487d74c392f278c274da80f7518f983152101b1ec941baea92c132181a9442106be237198401ce1b652ed41e8f033c3a364519b2a1edc41ebbb36529440ed398207e600e3bd2622d4534d7f06013047b41a895444947ea252f13d40d0b82b82c0405bca2454a8823a0789468f845441089e18cb89f940519756628a8c61db794c9e86c3c4820b61413b1b88af8b20a687524ccd51fb9eb76eac8b958501342c19eb3b6210133c3848a4cc1b2cfa730cd99dc9e5635b3560b0731e202453b31474bcbabb626204ba05b251bb5c63f85a850efac7d3ffc0c8e161d014a441618be32c94d7ed2818e41acbd060cb9c5b43226c05553b5bd31b310fca52389361b8b2389c952e6a275d17408bedc24a01897ff484012e74545eb099fb0620fe7523d7b49288773224a72a01b198a299036889a5d690b994abda1066072f3566a33c944550880681f716c87a9ac546ff218ffbc8ac48a8efe2b11c8c2ae3bc0a76de2173cfc5af328929d540561a588d4337d1bf8748f71140224c2e4aa458aa2958b236a6c0c77492a307f754869d9c8385213240b7a1cf70b3f7aceccbaa50a134064d64750ab5ab35982ed596913d84c74a8c63647a2f5531247373ebe23695ba767d0eca290b94647a4c94e3949b7337fb7e77ff7668f695b9beb8ab87723a58ca62efa3b75a6584768c229f18a3c26ca1a4da72972c02a9205aa08991873b94fa1f995ea6c67b8a015bc3b7a77943435cbada7323309dc74b7a92c92127b35c32879567d4e389fd5b5a6c23b932108ce22505d815c50e8e80d9dfc6c3640b111cb9c5fdaa28d199a00e405f061b6cd601bc602a6a491cf900937fe566fe3bab921c09091152592f6bb7bd951eb960708167d08fc60c40563173c45a76188871c696ce5585dbc66c65906d1c30f1be660ee2560dd6730fa4ac1b0cacb9fc05a17fbbea5d47e1eba4999f964ad5b88f874655b59cfacd4c36b818d96822f56058abd8ca410456c7af21d99462df2a596e235708b49c595eb94eac7573ff3a49697ce2a18d1c318e2340daaeb34"""),
-                    xeh("2CE74AD291133518FE60C7DF5D251B9D82ADD48462FF505C6E547E949E6B6BF7")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-600c29817b4e10241e9fe717ba2cbab8ec2b959a255bb414a2571cdaeaba0db244af9405aa870deef7491b1c5fead4652599c1dacaa309535a073144e5273e932a1877bc2bd3b9125ba658feacc6de45092229bc84a94ba3f5c8bdb37849b5372c205f7bd2588cbb47b87779b004309a0b713cf428bd3083b0d6622b1826446925922b293db9747027b587a7677079cc1871a8a5016c6c04bc5576ccab31a2a0b4a7b1b852319c41f4b7855c2451c27454038515b9876d6fa11820c2c024408735837264148ff7d6062570732d3a4da3a27752f60dc2c93ff7d91607c70a13442fe4929184fb9cc4e33c1684660e1a1f6b575ff35b449c14527352c134a11a155cafeb214d12854753f54bb1a342ebb918acaa17d882074467b475976ea080bd23b256c477a0acf56fc3d9ba9b34297e71cdc37733a3d66f11942017bb8c16229a23c196de8b8411336742328ad6dc5d4ba77108342d6847abde81a4e1a4b9cb8023a1d442e245186d155e9fa0653fc4a6668691e146a6c729507c2589ac12702b08142b9745b2774cc0c44fba928f42381ca7a82d98c3b445bca7e343b0b1334a03485494a3b6661613009201961551ef9c38a2f7cfd46ba9f906c19c59386af69ce0003fdf03c880d482ecd206a0e96f54c28160064d6caa31e2902c7eb03d5f0979262591cf498d51175212aa482045121fb30f18c2274525205d7c746225c920e62c88570a3fe23731c49cdee65afc965883fbcdaf2306344c32d46b403ce050582345e5c0cfb2d08d0018cc33d1acfea146de85c1e93a3a015a1cd9c7580bb1583afa73c175645581c59a801952643da86001f065bfe6bc1d94d510bf3a0a0268a77babb675f74ae426934be0c64b115e3dfbbd2e98632fdc840f3336f31698453641a18b667579ad112490b452c8b7b9bc7086bb19e483453c4007dcb556b013801729ae23924298bac6f8c59e3ca971bca2474323cf636aa02b008fa08d56a500af032801e3157f29505fd93cf3791a210498405813d612858f503857a0300d672414bcb7b98868d0d156935b1921620bbe262223f43f3d906e6bec23235441da41415f050523b3617bd57184719ec9c92ee2b6bb4bf6427d7045c01176723c1283dbcd82782476fb9237f96b7d13697ab710291683b2953dcb9b8ff0cc0cd99a33b5fc54f6d07edac2462beac952848aa6ecacf71a656ef9b2506585665a0fa4b8c74701868070beca33556f12c0be64caefe6a1e2e271e8470c5867852abab93ed925f3837e9dcc04440607a34c4299a44e2a537bea16b8da07187278ae672509d53aad998b0de88a7605c99c1fc36edbbba10884ada971813e64815adac6641630635a73336c44a3e673ac24ad41e85697859f257a2781b95ad9e27c5ce39470ba246bfc3e0dda46260939647355d0024aa21b2063b19967eb7d7a65118f6cada035053374812b995977eb6cf1238e5520b6ceb67f261293dc9ab205c5c548213730585ddcb3b6a0d0b164f9546d079d3ae00079f6abb170603528991d71389f9113c08434d481808a823feb372437975b5624590c183c131507b2894b6a15ba6ac18b7d1a5ff0d16ed0ec41e214c1d055226b4b0063059a7486088fcf467cb1580a201b23912e571b6523869522bfa4dff5fb95aeb9fff2ae41b2"""),
-                    xeh("76D04F481E68B2F901ECAB58B6369A2CC31A9DCCED82A1BBD426BE0AEE266AEE")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-425144a91075cd90b31f9696fa1c326a8886765ccd67e119ddfaa185e292131128dd466206d9b4fc62250c6892be09bd6d379e88a86204226aa9449cb1f39efe58021154130e630ef70735ec57cf4f2acb93ec4434c4cd31f1a4fe798aeb50708cf90e5257991a09bdd3963f2fca8292c17f870a4f5af4cf682583ec953f1321b68f90722387136ad46d81e6a44080784b19cb975630116817e81b48051518ede43acdd9b9eab02dd481b200e3093dbb46228cc30d222c81514d1bf319bb239aa8db631f0849654285fa513b81149c19473b43caafd2115939464207076a11b7c6445a9837fcb6fea0930a321a22320658334d958a98c8921e6bea31b53b3d0912cf737c7b08022b0413bf27504eaaec33c7b8bce11427be219b945668baacb1c6e238a0a57b59d48477218db93b28860132647bcd69e8c62712a4abea8316c42e121201fb4a37e0d942464ac4e0c79805d3c61054a7e897809f37295e04ce42464d3096a388ea0b6ff5c04f3c665291012a5c4dd2cbc08d0996054a52d0a26d153aa54eb5a8ce66675bfcb657f0c952f273c5899fba9a01aef2b8934386d6695471dbac20a2b5936847da5b419ee5c34c4b100c36135ee1ca83b0990b7c405570321209a288d284e4bc7e56809591209d07050a39e629b3280574065d0f102788325b0b5b14d1fbcf2ddc0dcb6c9aa959ae2d2b7c011013814a3971d16b4d2c3480aa4c1eb135736c0d70829dea14ac862b46e9267f392ac8f1a2304b7125d7b08ed0839c61b4c02253045c2435990bc1b6d4c27244035a763d63e8ca6291390c417ee0e9beb805915dd737d68530ff27c943a39da835c49d99c0b6c50a770906aac0a5ba988e650caed744066c7a131eb050678837a3fa9b39379ef9e9283e2b0deacabf1b833b358a1a9f1c78bbf20498b9702b259ea5bb1d58844df66519c1bb0323a4b3f4866ae5ca703e6680de0253fc659b9491ae70d307f5aa4c2c888295b9122be209fda3a5a911959f6a9f0c550a3978991737a76ef408c27ccaac7443da67bfa76a79fbbc65ea72b3abb96b2b048ecd4116291852c568b59bfaaa9531524e36644112a76a809f9d0683a7d04a35cc4729017d70f5b1bb76b74b618cc9e181aadc8eb4ba5973a560c0f55dd1681ce91ca3e8e2275c8c71e5a536c7988200b5646afba80fe0c902e86d990a2ae91750409a5ea09645fa5521360051271ac6bc569b6d155fe8a379a418cfd000431cdba989872f73e2771e0b498e9698f0006050b5a06501a4b705434046aff69cc961077454795a6b3184f3ab402a22a819a24ca856c6a9e01d475c76aa7c71bfb692b182bb184b95b0fa363b76a93c7238a41661226c408218576b175e4084ca1d68b3edf79db991107bc106d103b7fa682189ba9f67c21865f2b88de32c6c757bf343b9b15b10e0a792dd3657e3d85be3dc5c3c52650425c8c62a735da286ecaa9aa15054f5245b3b514ef2c309dac712403a9d2999add6e351caacbd80a68995d67fe094a5c542994a88376397a7a15ccf1a9575e20b6a7b5c40c3c9739b02a53ed5abbc502ab66243c304b74fe27fb7ba7348b3a23cd65ad515755744839616a2e87120cb0a1e4f30ce7a6a2fa2488649dacd86c2e5fcd0162d826fb1e6adb4e0d9cd0d417b6e13a9ab1fd3fa"""),
-                    xeh("FD3C91294D8C974930B4B6135AB647D4A7885C83FCDCB30CBD38332E14094491")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-12229f38375f8f405bdd3bc19ad9180367aba6988e0276031469512a6514a43902c6d66c06a236f247b077323d5bc1342c93ad1c0638f0b31aecc4a0980a543e488a39e726eceb54d1f807ce3aa556700842f1b2033871d2036ecc567f244c988242641c2aac1e31322cd08d2f95c5d559ba2328808618c5c6d8b49ca64c45082bca908dc5a75cffb1368c82cce0ca1bdd65128e3782d306829d608c2d40cd67e6ad09e79f39dbb6d9e41db559218c8263d1f6a8d4441f465a6e05510208b00522a9a6a77cae073817d99a40f1e84f4224289700a173c415095c7d35a32554678ee8087934c79943c7afdc40141a4810e94602d16c77cb80a2af5363f4444a9c32bfb8bc11e97c0d75435db0e70608dc95d85b70746263cf8c4def024a303807bb6640bee4176142c1be417aead89dcfba17eb319add262441a0c451847dd9e93dcae7c2e9c04f67c098123699df6c39dc90278362558df092c7292364c6c34cd0be104734fb1aca5282bcadc563ac571c8394b6fdeb9372081277b2987f3a26d0a812170303ca09218e842c1d2b886095bb25700e021abf45710550c4851fab4f7968460972144c1b6496f4465a0ab28478b1662b900353ca3fec6ab2c060d64caba43548c28654e1a38da32731d551b9ed03376c01be6466c74d44ce1aba9c2cc694db99cf1b09bc785ac5f0603c0248b352a69599e6b9225c887ec045a1708d73c263fea1bcc3782fd1ba1907064293fc4aced3604fd13c9d831323900f101534454bc7ff071372eba94db771dce7ab21e367925ca77bc3825db071e0f8cf207b2ca519bae8a2625c6b7b593888427a32462c0e98f009eab7b4bc151e7b727b6ba93ed0b686854026418272987069af29712c0c002e1304fa10071147ac1c6b4bbcd3232027ae2a0381a31812fb548360aa45bbbc711a7106c600af77535c51c85aafdbadf8ca6fb2c66bf66cb8856596b292490889a9b079c27d322ecbd34dcd8c2e637a7337eaaccf9c0654f748f73a6bc2921f36e1c6e662456aa66c55642c511c8376868a1a5c829da22e92e9a9af2b6ce7207bc7f94281c46eb76ab742c8ad0374973b36157018b9ba221afa3a3fd80601e85668391b97bfb30912038867b260ffc84c7fa054c0cb1f53d337b2f680d6f627093a21f7c6a065d276279bc83b759ae035288362b63b598e1611a21ae65c62f12948554cfe23bbf282702f87b540248219548fb0c363d19b9aa387353aec231965561397c3b4a41199615f02a27d7a5a6a8a93258b4466f389cd07a5ced1e75306d774c79c0b7b591fa5eb06b544bd4b751a3262481b300d1947a256f5c1a290c4eae87d0cb4b843441ef9f02ebc1100069b696c8ccbfa0958fb4551706306cb5c4d1e417a694718cf0a1e8337067a1a3c7981b81b868c8ebb71d956967e904f82c52f8a0865c05698f0e673ebe48c332293600986967559d9851bf75540cf7704dc35559b024298986d2f612a1ec18ff7f2ce1634482bf626939812c346174134ab65cc0bb7487e87d09ff7965f35a9474416c90a978bf29a5c3150bfa6745289473b485b7650ba78699b843e40c52ab380042cb3533ba8b640295faca956b0556a30be2b624942c97068f9d55db7c2d1acf9cf002c9ea2d973d79a050ba26ae235207358d083e310ab"""),
-                    xeh("7DB18CA35A53AB3A65E4C17FA096DDECB19FC7747E657B49D1C1710DBD1D197B")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-772071873b6b97125b613002a38c5bae914cc90630d56673b824a14dd20697f800b13b17769c450a8b0dae472a2b70435643c82b329ca6440e3fd16a23dcba5d859ec8837a49d18f5c61950702846a806318752588f88590f0672fb5cf02f48fc3a8073b50c17dc8ab60c2601ef15ea514cf965a42bd771af7b917cc28a368755771ba3069036f57e1206857159394cf1b9702abfc5df3fc1dcfcbad79f2bcb3b7c9150706eb520a57b547bf217cdc902214c1b58a7c8c585b20ff1242de6525ae10cb857881897319f909870b5a5a732093f17c2172688fb585490307902e1872a4c384624b8b27539e7db3c78c272c14a988f3ab48a2e787a794b83186535970c0d19845b884c5cd427dd5ea699349363c3006656594a48bb22337877917258f0a356a58b0d5da3bd99976dde9357658b1394843c800a2cd1c608877703e3c5ca1f282d8b4b773d1623a39833f393009441c8813698957bb86ec8f4de60a92e0c2e6178e269024ff5896e2475d65854cbe4466b0671684b55490240b158657384b67db1b0b8c0c07422b460d05a1323456ca73cf749a727ad0cb81e1109388af47f321cdd836f008208978430ff1b6aad03163a412f6b93e09bcb6acdb3633b69c47aa5acb004fc7bcc8e3e2a24f949e24d1c23b9346e2c3a32c1791b67cb16f16a96ac58034daae1ca11a838ac0ddd43883976c9ddb799d53abec005b00faa3a15702ac2187d9b13b4e0a3ea8b2c9fc77a1cc23b633f9087c188291c74c9db8622dc03b78f48a35716ab5202cdde6cf3b62464cb87064b7b02a8890af2969c9275adfd28ec6c2940c717c8575a84a5cbbbd983c57183fc2eb1ac35744cda32515c2a66e3c988ed0cdb9e6778e98295f7cca7f283960275ca0222dae433c0035522ca7650606436bd767679b42b4b69912d0553e276f6b6428b7d7ca99b7ba855448e495bc51b1871a627edbf535045b037a698c8833a4696073bbe6740ff222c726c9cc636402c912dc1232b10197b7440490b92ca8e683eb4817a2b866c85a07a38885ba0284da691f99f167e1baa2caf41ad75a7931a43e21a9671bd97a65dc415c03b368d075bab0cd216b9939e4325e1c9c96251d48dc7f064339dc062b4a3777cc24bf01c272d1ca86819027cad3a491600efaf961c815940977074514a022dc40cd503ae778015d3305cd8b04d4c001d410cee5538e9331982ee52fee9857ea5c685b41bf16bc6bd7754dcab4ae99024f69336ddbc42a95079668bb8fccbc6ff66a6b05768d6b83c03c759a2bc6ad2c2205b26b41fdf022da075cf1589d88954ba502875c28ad47c31b857998acc5287da6308f800d53f95797e52d0a29ae4aeb018ee418c4f7cf72696aa286addae756e619aa8121b481ab66f25117970b66e5866b90652190d184669a4def63219c025f02149f287656e0a235cf426c7178ad99c61294a2cbc9e34fe5ea735baa8da8384daf0a13dce458433067b004bc78922c3dcc025e5688b67ab4d7fcbce06756d49772d4ebabd8b94bf07268cee346d252a9161262d38a9f04eacd7bc76a82f477334a0b3c272b4ab84aba7205a1b158319139827b3d219784101456b964929fa96d27d48ab35aa1b6f914c1465ca9548559c9a8d1f7e328029954825a12a8b4f2f4cf320831f0edb16a73"""),
-                    xeh("876B17263B409171B746C6936EC65FC94137F958DC974BF98110A1D07F6D95F9")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-05b46c32848d4c14cb6c567b994c1bfb75bf11fc3db2915f890c626ef2bfb14c1aacf9b77914bda70a37e165c65b03727e1834f2d6471f85bc705b8f63c75672336141c44e6c9b7162f0ad93a840987474b7711be7b8b7a587608604acce1b6ef5618495f365f221b5464c41d6448f87986fe8f71d27658f40a15bdd74c7ece1b8992c137e3b43b8c27e228bb9483255a7050a23755c671b4d9854a185b2707b342d051c262d7cc12439b258b30a4c14096e1c91e962944e7ccc11ca35c5d83c937aa0cedacfb89cc6c552011e31b11fc95626fa0d1c04023d8772501402187ab2af9391abe69f988a5daf8114cae6ab0010041ef4af84763e287c4368eba94e6b0bbde17585bac5a8d89e285c4569d9025b65b301374a32018366bb66f54aa4b8cc385f93a34325282f36c5bbe172ad2cb44e32aa876113d8c1000d94b7f0838acd2000a6e386e287cf77226fbc9588a5019b073a237029820bbb77f934be084318e01562eda6b4e0f01d2dc17caf290fc5b2037738a33ed181c6b4aa4d10982c38aad1143ff9530e062ab3f16a9177f145bf0a4b1a1b037682506628ab3fb127df8ccc36d0095074c0db42bf628c690665cebbd232b302802943bec761acb00065b1e07471a39d36449de0c8591de5cddcdcc3a1c43b5107ae30640fa221bc5262a86c0b0124b434da226d959ac55060cba5f32587b1892471300159c9d8045d59cb00cba04821f1a6e19a713609855e3acc0959cb2c88ac19d335b0856d19e34e306602d9c66ad1085edecac34c55443af41e76fc072741ae61950cfc174ff4f3cee652b280a39124ab7bf6f5283f2151b375a2668b71049042a421086db12e7fc7bff4d95605e8b8d5c59bdb47a71d06089e8a13e064040b1289a70b804481bd22ebca2a4340e5a498e83bb0f96c4955f516a5d125408656b72299ae73ca18a2c58342810f9c10808353acf006f93637e0254b6cc216d4c7336d5b5ce5b55fcddca0cc59a0077a6b939484eb64648281b51c3756c9c8bfae53a904f25925ecb719c25a3d378f0cc5634a4470cd839cca90701582383bf27fd2f2bce345481a2a80cfc3b6588a3c328a9d2c0105129472f5231e5b901be663016d79987812c916caa364450301b7ac0f463e87e3971f4a5f13888f66d5c78aab602e4a01a99992fa25cb303cce0624bc69063063c55c16b48deb9a5945f28c614b7e5c83243fb4500b27bbd232baee32638afa0a72f505c1ca7a286c90acba7d3783a33a2b18ceba62dc7287db9aac24a946f0bbcab94c0a2d08c72b437548b9c0d5c41f3fba3d32026bf8db12ac067cc37bc79d143e3a6c40439bc476d5b10724b643ac4d5f230e2a1c14004835963b58a231bc94b008f3f50e9b493e849cca03170a67e90f00d623c9704ee9f788514239c8105938323a78f34751c8960ed420d5821b0db6722ee07a5915110315cd00bbc4ead43719bb3e4fb63afd743c522c6dd03babfd8c9891549814ab2b7e0c66c8661acfd34db8db48feda502bb271ccc03146e7c5423a8182e84554a9349238705c250c8e579079c6c7aea73f38476f46e22c67a67b4eb20dcee2556adac841b67f65421a814c9770f84a683ac0c2db2f26222107d360c1623c9da4922b3f97e33b0bfb50623a2989ec50c6612768f42d5769fb"""),
-                    xeh("E0AAD46FDDE0B8E64361C3233263D8A751F5583DBE91AAA6E69E6318FC7A8EE0")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-246a3daffa8fecfac4cde76265e37997e53d8137c99ef4cdc8f0194f1984b7b3886ad87fb0227d569ba5783630f248add3b881d16c904f46249ebc73a6151ee2538fdc5b248971b3bbd5af462c36548b273beb06480b28b04b359c03af7df4344cfa28cd469476e3499652ad759b761697861f1479a4400bc034738ab9b674311374374ee5d73349c0a7b9dc0c158c13739a674532b62408bcb5c70ce4c54ae26c30118c8320eb05cb0c1454b7b06bcc013c7892c9b4693f40c6651925b0a3101da97d98c19ac5a5b3f7930061db8d38e37e37e3469ae6b52fb10300da5ab71a16e9d762a2d86473442c752187d33c2809272a16649f8403609e17bbf8003aff87468e8cb4e0e2b3a2fbc20fb8b172e606830666b6550a5c13ac862113b817c2c2f1415da33b9dc1a47451246b434f586a351c55b4c9b465fa1cc9578792368209655397c3761bd7329917497e3f357f0dc8418d474ec2f01af697b5fe30248de409130c3dcb079b50ccc73a1b709ffa5010f1644de0b3c2598e8580050a0b659c034ba7ab1c627cb43736b6b8a754dac647a1b94878529676426175c700896b5d123c5e125404a59507f5fac8acd5bc5de2035a33ceb680c412374c9753aebe423ab515886cbcab2554c9b28c3497b63bfbf7adb8db29b59abfcbb501f318b5c8d61c2f33336652c787348e00c4c15c911f7e2cb67f02ba5c2b8ec9c87ec1fa6d5dfbc05f7961c6c0829d7687df542b4eb42d8d373ecac1aa55d921f7319eaca181ba1c259e4118bc27615a866944a10e28e260f7ec1083229192212ccc9085c5436210a1392918567619b97be71f65c017555a4ae60a81ef0951165a191672c864f2112839596a343edb58885bc58c6406334a385512db7dadac2b7f510830f3b3b3440f73038d53e5ab143a6b53702f30407c6c824196b4bf069a812777a8b2c26e661cc083c52fd3259ae08b9181f06d8c993f14779300ba56b88647a5314066d4b771dbc76250a60fba5afee147b01396e91a0f0dd30ade7c82b6d85f8613a9354630bf669257b57dd563ab6b07c5a2a809cb16990ad98f23f34bebf6064c049f33913d54666892864627f8c4e64b20e06b43a5c5829bfab4eb774907c36ed5eb17ec3101aa8434a5318354510df87cc01a09d06806bd95939235fb635734068f1594a11a624e7b87ffb239dfdc864ba4322ac4357e499e80656db0bb68931159d759806b3c2518a319bde226a3c250ff0c2326750a0d23beb60b442ca595adac6f775cb06cc988718bcbc29c83e39646b99abbd5f7723757b9aaf63857c30e7f0337b8fc949cc0b4ced2260736298675aa8e6a1022aa1b8cfa3104387e429370689b398a317f0bc50d7841005048aa7e29a71d0b03348328c0c268e8f6a64f518ac06c4398d7b2f82abafaa1c9c37bb1e3a147bf870cd10c21cb702aed892346cc47e6928d3f16575f1254dbfcb910aa967a87323208937d1aaf7fa90f1261131ad4b04ff36e9f6696594a2ccf3a021ce852fb9043c194c4d3d704edfc5e3d2ab671b8103e8bcfc631107815790e5733eeb66fa344b9f276c531e5505303b267b6516b00b056780230847aea99cae15bb4faba0b9d461877419ca2d16ca437f0f2963e80f169e7bd65d440b7d6ed512ee105bb1690052a72bc54207b09"""),
-                    xeh("90347D478D5D964D66A54BE930FD9F7FD3C2AE1492DAC35A6CBDD02616BCE14A")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-d5e216438b4535c69165f884be521e5ccc33f22695aa122e5d918e8d27a390035a42b9c8e4abc9dfaa92f090360c9892fec554851c7e434caf9d41896741aca2f2ad64e8b1e3916827215beae96d2d190f22917ccbfbb3452914078607a0eca4199714ea8040e9c9945c71501bd1b6baa00628c62c220b5dd79846da4399536547b04811f6915045e63abb9575076150bce269c61390cd3a3fb3db7235390b63dc49d041788d25650858a062e49f4d9855cac7c7d403b172044e2234425f503f3f613a5b1a72fb32590c851d71295f0da4113705b306e6524c398a59a83ee6a9893091beaa78470b274680017387eb13b97baff06a23986251a1f1a4f73a72054640d6574b5d070582925b201b37b5a690cecab7bcf72e16e3454eca10fac9b760cc94928307c2853a15c47c6d29ab90e322b3b566a43166428c09a1b3ab3515704bc76778c38b0ed224ae727024f2008cf2b5128cb912a9bd806bad62e78e1d79cc90f3675f863df590210a18b6b629cf91738f23280e93ba04b3661cb0e040709639a5b495c7a36eca739270031c97db9ed9432a4ad86608528a7ff7034652571fc6904662116980201f8073ca003092c19df909989dfc6744274a2e01377099bd618aa443c883bf8b87a9bcc9d35c56aeb49068592d31e16e12c711cc9a1e9780329a92aafa84827e685a21a84156b29233e50f577c54fca9a3f9dc6f4707704b515d9f2492dfc22977a36dde51704ac653764b124cfa615dd5932a05b895987aa714c1bb38c3166b27cba655786c29fb733448381fa7606df0f586c3ab0f2660901ed1444512ca70108e180776078c417cda8ad2241ea9304f820a9964e455d8da350ec30469fa6ec3470ff4848da109cb1060abea4c3a4b733b97d04beda35e769a7f1f84bf98c8790e91199ef04a6ac80bcdd39ad4979c327b84c0e897a4046bcab450eb3cc4d52b83e2f3845bb6c4729b3508e064576a6a8caa9cc12c917118196000a1e478c278257da8a10d78734b44e426335c81a4e6988015a6eff43470d98becc9722d254a6df327ecc91174a3a76ab430ab40678b37cb098926823955d5d8aa8f4c2598eb8ace098da3cc43e84a4a205c00cce1962c7411646a1a4cbac0fe884db3d55cbc0531d4497e562cc0b6f9139c905a8036153ea18570c1164e8b73c15630b4d020380c63cc1847e38a938085bd74338704266a6462163a176efc248c5ea6568056be253306ad8ba7d7d6144622002daa5034cca3af106a7f2b61a0e7b8804677adec1bfe84b09b910f96eca5f090cbc4e14139f12b29b7926225689acbbcd7e4cf2921219841c68d900397a100937687a9d779efa7301c4b1d1f74acfa820445c851bcb874c3c5b6e33297c2b424737b082e31034723b05c6182ee8154f5f13d69e67b25a58f8a543e19f7c279e99eda3c53854791c20a1ed0e95a8db87bca83aa6925658cf4035ca0879d477ab8b4c104e149b550b3209b5f36e149108a1918fc29de294fdb250fc66b691c30c9d6016b36a83e73f9a31df40744b39410201049642380ca752b64a2d536b6af19365b434b326cce1bda94719bae4d418b81cbb28921c8d02b4452556a156aacac7608eb97a2a56949059a5c232a561f842f40228b99be04e4a6a52718dc4ba9689b0020bf1bcb8bef"""),
-                    xeh("119BC36B5F856C0A2F136B3EE42041B817125A600E829FF6B4B402131A26ABF1")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-cb8ccd08dca5a5e735178993710821454608015b34746800c7f8679d72b0c628757756a50a61186c553febf79c00430bd0709e3741886ee10667aa7f7e4c91d89820e66ca9bbfb029f5cba016b6240e2bfac3815afd613a13b04810a26559a60f6628308fc45238269c77428aa370418f11928d5b3c211cca7bba2de57898e132035a16a8ee780678b213917c725ba8dd1818428199c672b20ac05061a82246e3b55bfea529ba891da6320412108ef0ca184b44736dcb05990031f3496bfc96c50445040e27df4fa2c28205e1d9090034285912b199b909efd088cf4ea4241f5c3052050aff92be505a355b515e5d4ac55b859d5a3cb1a42564d398ef4cb91db1430a7da96f9e96cfa27cfb12664f9f694a36b211a7a79b46c70e0ea14219c119006bd287467c780b7e6e706dc30b230b20c3f8759f2b2326d8422b16c124ad4a8e031412efb450f881302448e26f383fe01d0b26770384638ee1aa51df773fce34a9dd00ca24c584f5512c108109bb9499922019381022a58c4494241b2b62da8ea0b784967d86c7d8fc5c6a8f6055865173854c38d6b407b3199cb44000aa90253d7790011a9d4551d66278d559808835208caf18cb31642b06164558b06fc615953bb1c5fec2600975dfab48e9123b0f3d8757f53555177766e819f9c5487c9700adfc917e5782c82c681ad8105d6427785c862201140c5919addec3f10574617201e4e35372d472f782388c707406d73b462f25e3ac846bf7274a721b1a05c36981093c3a853996552c85b4a90e0c796c790dd881fb255557e0731eaf8aa9747b0fbc64f2db3a7667a11b6c7718200367dd86f0690be472b5a2fa4b914f91622b78be310719ecb81d1eb8b6c76bc4df0116f84179654794b39832701911480601c77229bdb571c1110387a78d4510dc0705d66e189e1f80bf7e5c4952c083693c6908623be31b1d2c63eaec178c3523110ba13bdba64e6903df028a23167594a12b64de601c90b41231a29eb5c2ba2475b09091f8389363030ae56fc686d024a1f838a0fca5914941f72470ac5052b8863aee631a3206c9f79dc479c925d906c86d3e5797eb2ba45499690b3799ce39cc65a9887eb5785c1a6ed660502d85f5b169ace240aa6c492f9bba48c61c81f0722f8377263a33087814dd51070012a103a93160359c3c2a945933c081409cca0963e99883dd27cc2572683881c189861ab10e17e400b5da3d40983821b4c45aad97aadd35b6d7296cf2ba029981182f5a1b189668711d528de7c7b07a71a47056074066193936437016b5afa3fcb245c05764af1d77681325c0fc2bfd2a74f1490c704e216d18345a1e074dd440b730a0464db2bc5852caeec23c0bb0d754cadf8f050ada71d85061d18a6138d8b70f77aaf45aa25ba65c643f6103390168629bcaa10577070bad8119619320762486e9e340d43a04bbb408ab86801ef55647e43cf88a6c0772b8d5f274f1c12593b07bbad80ce3bf1903f24c6dc976cb8c08d2411bffb92221deacc5f2783b6d38078f51d42eb5ff1a6b78a5899f044ad4d57c582a72844a98e9d1bacd4c081abb44117d20a3fd3b18352a1f2943c29d0a4832a8eb4b22cf69030def765bc527aae51010c74cca53b8df382df9ec3e8d9d492fb165aa4df3ee6a45fc8a9953ae5"""),
-                    xeh("697CC7445AE2C9ECCA2569B7871F0BBB364E63E4B782F734FAFED4FE33E4AF14")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-2689044d7cb15005ad5928aed39889c195c94ab0366f91910658388798b53c6028343664f5ec4601d4acef04d0b6f2460e75bbf32405a512ab2474b8da27acf70bbfadfcc21db84ea0b73b548066d4e4618a355f9c051b8b54977c3544bc7151e4ba1710e9a00e86a46d1149620c291d3673adc5101499301296cefdc04bfd5ba5d136ccc845b4e69c629d1086e94b622054c5fd662952345b48d988e4b7198f298ef6a925fa1a3f912ccad5b46eddc861e69130424a8d952110f5820c776a0af58c7aaf14922466ceca0aac3bf1261bc73df001bb7a081a9440c80453b8ea8b06e22689127cc9b2ea3d8e5c2bf8b25eef8841a527729dbca2ab815baff343aa74b4b07c06d5158e820c1fc440a86d44826c754a7e3b05d40c1cbf32206971c133c80f8f678d3c30ab99db0656f4ae9ca12ca4fa132265232bca7569c8624730b234065196d773a290a3633605166161d86bb169981c956394aa602d5ad37cc8d800a8770bafa1667b04ab37a668acc268394705e679594445bf0a7987b86cc8c8f48e180279a193a187025648b22f53d9ac5d8b8a760978181a9755e3195754530b907ce992b939fb3740e626ad5534256bb7dd538c6bd2296d5675567c2277552c52930401fa09b581b87c18c70ac8a4076c9ed8dc001478757f01ae8ad3adf49a6ab590a61fb2c5c8645076e78c58740aad2990cf3858e27ab151f797165550b1f4a0fa9b7d47a8c4dc47bb53b359742aa486ab776b3a7582459f229b969038379099c428c53c1486cb23911f50108032796e46ea04842b28a84373332287db410390563c2271be2ff14065f22b7ea32a284cc3d0654ec6ebcbd6412d2f5c29b3720182350b82b8b65fc57de3d90c0cb55455527a469097d913331a7a0cca8692200bb9711008fe5549c945b306fc48f58b8abd835dd339797b9c508bcc8e8d76a32d560cdbf7506b1c2d32fc35170347b71a3f456163bf3116794324a46651f359bfdb4a65cfb754ea47064a2336f85bb82f2947b9fa164e11a55ca10086ec5af899bf9f7a3c5130a9c4880412946ea6ac478258a67c58131df3b7338933b77c064bc9231a49330a1a7c85e864b17c56501697b3e22b1fc468261b8eb8f4b0c6703d6a1ab764496a6eb27f804631071962c4a8062203148cba5acf2226b74b66fb305ea88040f22779a5f3486574a7a2833cecc69af95c64348288bb1925abd5be25878d9585c540134eb2046d7bfc5fe16581677421c1b59f1c69a7717744ab87902480ad1f697cb7f66286c43b73702f42720840d598c3917f25da324e5aca224a9ccd9757e91b2dda2186d56ab2191b46c950c54e7c570a3a0d7805096a4718b57bcaaca5cd6fb1a6e1272ca1ac7fd9ea9cc72440400bb0a35abed71c3ff0b9855058891555c713783386bc591a9663e61bb9bf8055283c2488e198a6e991fcbaadc7885f25295b3d531920d880213b410c1763aee1beebe665abc1ab64c6ab3cdb95555004c40148a8530c22b06341c301f301970f51479199c785a4c616813e6e41bd8fe078a019a33af92df22b207b09972a60443a39bd11c5c38de24770f3a29588abca32283650a0587434b74bcbe6a7bd6d70bfc581848c9b2ecd6184a0623c75c1768e0f3948eae08ad7e7fdfa17684a3c63b6a10dbcfd6213"""),
-                    xeh("52CEBDECF06579F4A9351F77CA95B5CEDD034D812F3FB7FB50320CA80E4118D5")
-            )
-    };
-
-    static EncapsulateTestCase[] encap1024TestCases = new EncapsulateTestCase[] {
-            new EncapsulateTestCase(
-                    xeh("""
-4f31c22cb34ef4a51478c635302525fc0abfd221ca8b3a6e224338bb0b9116ba54cd581cb7a3813c878d65317d8736881c8a6b6a7030441b44dc6663a6919c7a3574463b706105c332693d1918682d2a0f2e12b1a545a8aca6a38f0b63a216463099558d282dee3c33af3bc160d48b889a9d80e9cb6d83786dd826cf2c58c23c87f0279359026458040ae638c3eb5c5e0f7b6ff2e76ea598bac5143941d50d031a4906bcbc826a364d92641f68cd1b43973fe9b802f778963515cdd47eba329fe6b50c8bc5bf6d3aa02e69965693997afbae7e2c8f06b85435403c827a39d63c8cbc675d4fc31a5a699a0f2381918448a4471eb5aabb24c0685e6a1ce042553c360190ec470b44a7cebc153186be0d8c8996a9b3bf46383aac698758ca7c9b4a993b77e8397cd3a3bfd11b31b961c90875c900157f97e211ee6c853fea2dd83212c3f8861c0a98963820d6d73c7b3693b738519deca589639462db956bca22513b9cab7459a51296443076ff732e3eba57ca767d4374a8b2544c46c54c2f46cd7bc6461b8105f0d41ca4a532c6e4052629929c03bbd0b3c6b52c51cf3195eeea6aa9a55de0d9063bc57722a72409a59747965b4e6a5e14ec112a103bba204977d43822d20c92a2aa0f4882798216cd26a857c6a12bc78ffddab1d73a9b2f91ba4de83bfc54092d4359f03a4416230cd6616dcbd916b989856f3b0672b172e20732be0730d1a3a6a837c59a05b846ec1d600841594b306acc67cce4ab7b9715afe074a75738aed749c1494dd683ab6791522023acd8e5c403f77b23f128f16261a100497e0b1f906b7956c53c1f1a0d65d9422d7a3e234c252675446f085450446393c0c151e751ce25cc05b12a58c334ee1334d16b813c7689c6851b7662084ef05ae30bbebb5c2911859db6dc449165bf8b41626839cb37814768167ebd24300306af259941c7628997bc80156c6b87c758d6c40b55076b74b2b9942093dfc979ae59ca16a6ae33b523a7c687f3f22638f37c69c4946a26bdede88477c7b67538115cc890873ba223a953e1b79f7a902d0b20cda992a25b235f30164312111a01cc5d82d4a6e1c4961ad96bf48b797680bd0d04c83463bf92d86279c994c88b57f5a14c45645f28fc19ee835f0ba480bb04a17f5853c1e00c37f0857e88504166a230344bbd3180e6421432874fb6767d0a0c52c661bff33988d3e3132cb744df5b6c28ec4e7ba2b25c22a179914f043bb93536602d754c92cb6ebe42832f605d6dc99a8065cda1ecbdc589a93ed321c529c5f910ad86b9183b827e1e8005e0ac102a35b5abe533e31acf35e649f967c064963675421990082f4897971ee4204e3611bb3bca7af3a5507b239e9ccd49c5c4e09c14f3a3106bd961d9d649617212832c54f430140c8590dfb1bdd40785390384bc9640e2c8564c4a4f700ac1c6d1895fa40ca309aa5054b04934bfc190a45f78ac1a8811046710ded3246ef4032f3b73231913db1a58f45563e3a62413f6a0598264321b33460578f682ba40d29ce15697d6373bc6220c0931bcfe87326f019c7c746e0136a98a6bbe8c7caaea8a222e80915926c4fca60dad75a3f03a60375c09b5c5b120180b51f185157a345dbb91bb5aa6b704183ea0ac0f374a90c02206668224f975ed605ea1b01c55b9a2c159c2a096b3c4a98c2cb8b81682864188cceb3bafe825016381b8b2bb7df2ab4cf2a71f77347eb84314dda92f6d5a5c34d9cf3a123a16b892099c23dfdcb5b8e67be1087ec5b38b081289fa8c3d8d560a2d882f8b8501b4096d82602e7960a2c433abfe928e769b3e22965cf7f7350a1cb4543c52c8f3983dc84709c1909cb76084771c3a59867208c1bdf869b85548740c8b4390a2a7824d2b8a283606aa04a78b79acbeac33a2e4490a44b2995c70165aec4e37a79ee3224a8c3693056b67b1021c5c473e7fd31551a24a3383741d082366398b835389d4e4a34f7905a4c5808b27b44e86aaf02032ed07ab30452bead1907ac28a1a98a97683895ee583ec59316673213f9b1e5c2339678c0b6770459509ba5478830bba25239c311231b796c8225c9206facc138cbc2f58495f106b019041387982cbc656604e05c06e630b3d84aff82240b7a7cf6c078b9fa99fa426c197a5aaff94a93ebcb61de47f9c1c368b4f0104a0e8d4f20f98b38f6962ea4d6e053a96a8059c6e564a9ebc6c"""),
-                    xeh("59C5154C04AE43AAFF32700F081700389D54BEC4C37C088B1C53F66212B12C72")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-a696835000919f0159cdc7aedd3148ccca020f181b2e3888cb6c3c8e271449bac0da2a2042e230895818cc5bc87e38471d3abc51f6c05fd80bcb43bf65d55a0c4c867ee28163618376fa5dada52c5f4306cdd99f0d4583c1399dcff8175f465a02d61dbb98680de662b49b762a8353ae15bc76bc097b789ab1057d2595363cc043e56c5b44562971c0097188a30e488433a07e7d934b89f4bd74b98822518d2e06932403bf81e97347c203e5413bdbaba6d4107e9ab4aeb1091d77a326d7ecbc09706a98499a70f28300a0c80c3aab68980c4d1cc662091bd370575e7986c38cccae743efaaa63eeb9965ae8605a799b447b76f91a15c8f16b6a52864431a19839543d86ab02c469ed7404d0eb365b7bb643153ee2737b9107a8362c4e3b05c0136c6d1510229497bef7819fc0a30030f899c0bcc6366090d4eab165258fd1447a3b12156bb6a4b3320914d797a2eba18bdc5615c208d1328808b667ec39a283dcc331e83b9d9302e3145fc003230c8a2365a5b3bb52104e698d41662318535dd9557df8907b6161a404e946a4b00a52829c8bf911d79385f254465bdcc77a31974fa6426554a12e399b8ac57e8c94163f3727472baebd458cece806446842c48659ac6c7262304fb693befd3b67b3237fc239a782c83afc72366cf9cea621989d801fa2477d564178d5c13197482f373a9e4ed9b2c276ba88e0348c1708c93a7c54d21bbc64496ac21969b975e5f56d033c287af7ac993cb87965818d26458844103957834760aec8c1572bcb0aaa740cd23b71a1a80396e45bd5a2bd704474f3d232041ab51404a768d404fb295a18275720b205b470778226abb26b775c972505eaa461fc52be230359e736cae2299cf47b1f1c0cbddc7472439ad8033608a8994825326b9297225c8fb4c0ab6a51c74ff2059d60aecac1cb8e9b5b0de1bbe00038bc883c25d23be3198c21648271cba8559c3a451624a403a6c390cac13412b2c788d7ab93de4790e8230bf7491e39019b1feba2a551629a5a012942912d2631b5f64e2965c73205bf25fc451d8836aa944063925a221784a9b5c99f13c381b5ad71c6581f28510ce93366534e8cd137faba6c53d92e25205c9cb43d7be5ca2940997ba3c903c04ea5ea4605503354d4bd63e3070a12840e2551f15c20f6769834761bbaf8a8b11ab94b69807a1ab2dcc396fccc22e3168e35c444efe876dc4b7d22683b6ae49467d88e08b795cd556b975155f4324dde94ac7a89ce5d802a91b4745c2b6a86cab67836030005c70944864c0835f8039c23d7a999d43bdbf7428bbc83e8e65c7b81639ad41bb1f357ce9080c3cb57319c1f37db4a3efc386a40cd60bb7a06ea70c38458bee0baa58a9209682e73fc2cb7a6aa55f863b49acd9cb18186b2b64434a5b7a38a2cab3b8baa47e6da377ffa1d6a432c847c4c0e757d0847933f5962722a92b06abd6ad28adb1736c0a96ac8130caa309f2e5893b0190bd67016f04b17f38218853300a05a00fc30330cd907fa08bed95646db857f4edbaae9847af03729205691eb715c2aacaaeed21419b187c7b99b1fd83ace009abd93586a413de2d9313a854142f076ff76a9661a96bd11c2e8986dd9a7b3d9e1076cc21c0787226a66087f13591c896da8e521f6117a9d7c5028692433e86959450868272445450aa42429478a4df821653067cf61638a1c676b776b9de76c50e99084e1d71202c8a563c9c4afb6bbf49c851bb939311b79a358a5118c945f0b9f54c7a5d0c504192a94e610153041a291f450bb44995050a964264a79818e6717c89b4046f16908d7254fa4f571548b01e9eb37759c7e4544c5e5f98ea014200fe291cf40bbd4c3a61213c2ce862ef907457db3b39f82c87690451c4a872846c86ca53681030ff839b24ea655b8a868fca9188cd2afc719b99fb3020e547ba9e1c35bbb7d153508889c7d33526dc071c4e89632fb5538adc58a6a304b17610558b302efe55a0c631e4760c1be689b843633aa31bba7d9c4144a14d7ea15e8895061c025bce225eae5570dc375b6c449672ba29c9c848ed16aff85785953cdf0891aa5756166db1effc3ac58c0969edb54428588055c9fce4b05c023bd386a9c19c33d33d59044f9893bb98f3a77b35ca101ff518e6eb4b056b816afb48b7b1f4f707d29344dc3cd4fc20ddee4ea9cb19d236d7d13a7846aa22c2872f73b"""),
-                    xeh("2E2C821791D3EA49D0AF380B97AA24532F6109D85360A751BB8B4C048C48D26F")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-0799b60055b072088af992055fd18766111d70a92dcaa1881c1b5d03807e4a948d0937b9ed4385a6479a23930878102c0c9a04cd1b51bac6a7a81cbae47b15f33a331a5303695a4ab229585d27b3a7105419952bde5c659e089d38789d3a82212e03cd0ed7a6efaa913362b55f386d2e4b8d2565a5781642d8e970f6c9ca25d2acdb8a3da7f493e37331d26432c530bb401a4ce65c463d24194b2b1d708ab2a34009cdb02b1a96a921f42c90488940e7033090bffb30b17b06bf5f3b7115a24baa94a1620434247ac6c9579f42294e1f50cbba44829640bb7713c8ee957174a85b295bb1e44943db036773d91b211537fd9584954726cb83c4498658d1d2a10d2b6b1593348423aad4f6bcf1807d6599a24c4544dff617a2710e119bc17785b0a8c57428ec993e5991f76a9503fc580e4c62a0b296dc52a1a2c83846b7673ca308fc0877d5f473012c5c50a67813424792171e87a7ca555c0bb380ac351baa05074abbecb602610f1c095a4d3aca0bfa11092bb8dac09918449149960dd7d0928dfb2fc23b7b50d85012416e2d237afd47348378c024ac5b14c9ab4c5507a1355685550de7dace35cbbf20a679c9b76fef5b795e0a14c803c36984669cc88acd814d9380646edb1cfee159040c8366e7396af8977673400f5ab2c21980e2a184a472563b1c32886c58a0d68a2d39275529c3fe1a744c877a0605c5da7556dedb89ae8731e729b6911a6194d71102fb42961bbbf770873784af83c596a66c2a94a7c851d9677c779a0ec527bd761dec9bc9d1b22645eab949e31f1968c649c811884a765ae00e98f3228fb03643f47890f78fa6f0369dc37c98b593934a3937084f0664b10c091e7a1315adf4b3f34b5b20123905009c6f24c7f0c601b8f53664b6bd6d48cb487b0d22d45e00f19409a894f3ea32b2b3ad0536ac05e420a74a710dc8375aa9610d2640fc7818ed599598f60e21113670b99cc0d96447f6069e0b193ae79277cb29883506180743678b3c9b53718974210f043140d74392d9be2c08bcf796b462211d60d618faa152e461cebc3aa675ea1260f4585e810cd4ea8415687d3b2405ca72a46129c95f9bafde87061158920c4b13a3c5300918c8de4b0f840410ee91077d611971a4094f3a236230337127c5a789209f36c39b05b6618512ea7c9549aa4552d30ebb5226bf06708b4621a5cc8f58b8153ddca32748682e36363df63bc1249ce1205484048fc8798ba7929fa627404f072a2e0c02abeb48ac9475dc1c087e427309c2b701668a291a54056047def6b10618a34c550235aa6d39f05af809174041b2140640c252b604e81e56f34f2f711ce6d64e56ca0fce0133244481058aa477628022f2c2eb6c544d1045dc61aabeb0aa42127bda479160f582cb075619f810ca2ab886319bf87b12ab710db03b4a1a170be0699f7f333a46b18d71e6832c356fcef57db82430b1bb745f2215fab44571d4b0d9d568fa5cccc2919b2ff6b8d9281e07759069b9a602ba7642f570b20b15a156a1c322447323a4e9fa1219b812b03a5b2e1abe8c5b7ac26a8589733a3fd33480e18ac200362e5a0dfadb1252c0b2d8c139e4532507329ebc3910f05b480ed196bf86166bbb2f4a96a91053b511c81ffb748f420a33a6cb771dd0129cdca037e4533624aa16fc8f18a9bccbb475ef0a8b978ac9090a4539ca1fe06c5501f2b34480b025732a90a01e60ba9dfeabb4e8c61ed5c4396423af0aa79b86157e687c313e5623e6137f67a25680eb6bb841b80530362bd1425ee986b18830509bae9bd9926f020cd02713c7a83e8ca4318a044691637d03386dd28c3ba081481ca7649939bab47668fcd4291a4885317025e5250894e968168447f9f5c73702a5837802cc4593ab99242a59a39fa14935eba3e781a7f2740fbfca7141c821c8921e7c52b4ebe24732118cf57590dc919d09ea18d2ca63a605495bc2a88f9922eb356fe0343e4ac2666c49adaeea898b1c023058bb5bc4437bb6b798f59ecc8b565f811c8ffaa13cf8a4af8374c3221c3e1ab89cd94393053acceb40fd6a2c1d2c4c6316993835b9ade3a4bb396a5040574005ae9f1619c2fa66ecb363be8a7fb424927f8033ef8b2397a691d2670195590e9299375ca9b5dcfacee6eabe078b28e7aa1fa314cf3c866667cfcbbb5b57f2db74fb19e5e0ab5683efda06a93631032380727b6a80"""),
-                    xeh("5729B2AF60A4A5EE3BA6D7F255D7D2437812579942FF2C6F48611669135DD695")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-5f0436c441361e37075a75830c1b0310e763205645d482c4870336de131a6cfcb2435119341cadb7e70eb3a7b7207237c654814c9a6e04c5955e5135c9d311786802df76bf33c37a04f84ec0f9311ac371664ca11dd56218f65240b97819165d90b113e955a19834a144e1ba40f97cf815b90b4cb7b06612168c6c46e11d4d79857f04cf00bc8e11b930588216e7ea3a5c99caae7b076a4680bd76aa3e1b806f428c8301641640b938743770b5c1ded957b8b1aae1fa28e6f19a3ac59f50a59a9a346766c9ae68a5c920b0377891511cc3b3fea22a0b7216ab1c1d8d97139d985f13345a073434150083cdea7977d9a5eae98314d6898fa14e89e4cc7d417d4b060baf854840e12505fca30bdc0d60a12fd30bacbd62287533aad397c208b0bbcd50b8f19431fe727460d754668309090cc81d8b7946333cb6fb890e152069624a923476369879f04771a0db28002ab860578fe351a2a1a2a11c198dab6b656a4580caa45e45d3987c4445f312c4d14c7f70505272364aa8341b1753af08040af6501f69e96d108a48ad245ba2663aa154339cb48d4bf55acfb9534ec42c06a11e4d4b3659f65ccda82661b1700090187cc57b17b50d66ebb7a44672191193dee20e9ce21bcb36be9d312941d622062c7906f5ccbeabc861d85ecff006300ca549043dfccc4400118a18b49eadb276ac45469ad69ce16c60bb717368d6c7b2f068bed1b2fa930552731444f08a239bb65f173b7e61730c68bf39656ce5f7425601519a2773aeaa3795d98db1146912683396b6c9232b498b9bcd3adc70f0935d71e56737a422b5792f75b12457f8817d926c44f8a8e2a34573ba7228204cd5ba24c7f245dfa0c1fc50be04e36f407043a4aa7a6f62b271ebc30bd76a80d242b934cb8448535ae51dd43b7614a736d72c14a577915f9c6b62cc10d0315442614a36f32d94077e65978430597a6694410888299939784237c991262d38a540a5e84f326906a7883a6ac3b05bd6051c5a11ae47809b30ac9a31226281a39f63be3876bbb6a896857a5177a94b8193acdb441125236c9cc291f2d7bea99025b282328c571e93f2bcc943b3d1f6ca4e3784f4314e570b48d483b6b20b9dc41280610aaa3a345e2645a3afe5b4f3b507b9c1a3502c84f581617f2449035ba524ca6a454c87c57652db9535b926557a19b157fb3f3896116ac1488a000f20c5251017c34416bf6d13c178204484c83da35817d0975183170a100c0b24404645d7b551ea24569c5d92235e6df27b105c065f66b23f4b119e5aaf6eb9ad73f3ac55826faa55021ee116d9ea096c350ed1c659751bac4a57c8c70126e736ba26f276b5391096541236b3360d9b76bea1b519d141f8fc9f4e8411d02702ff366aa7e1a5629295de395eb251c63e5170c1db22af621dadab30ffac21a9b400c8a7c30beb194f027858569029b19e43929901e18fc45c1d7dd6b464b64b14984f21286ca02124beec214d354ab820b4e4aa8a26a35fded6cf0d95a26f20123a909a7fa708c74580b7984ee082a05f8b481086b109d61b26fbc171844bc29c0ed42bbad4cc167935a9d1524a4e162a4d598a6e23ce1d404cc4a5b9b80481fa3b1e416027a590880b38517ee34e768c61c93cc170c4c8a8d3abf3e79ad2b53e710cc521027d2b8366ba7583e9744d68ebc33b4b45b8f04e44b98f890bbe3bbc0209d93a9d6140e6260cf28740fa35cd68513d4b024d5d5463d664b3d11a261d5bc5c1b8ac71f247eec4c66b72812c308b3b93a633b80e2ecc502813cfb4339c24ab91129c93b56b4d87a132d835986e994bf61432dfa98477dc70f7a66b53f88843e86ab729b5f79cca14e2263dfc868e2b81432bc47fd1aeac51c3a1d49549423d40a86210317e39d9ad15019e90050bcb882ef7dc09377a961465098d357061f8549ccbc7f951639e3a73b3e7a6db109ae463ca41038fa32418ae4777372121a5470622964f514c76c108535d7913fa16954d6668e2e01b16b492dce96a932532baf3a413a3c58967a46b80c5acf276e2a86cbf499009a5685f392dbaeb4621b66d9f1a631a60b59d03a8cef18f87c9c2cfe6290130198e67b8d095019b0484e0d274e488640db473d1402929cb501e9291cc428d37c0264d1c3edaf23921b66855f3b90ee38931192e0b30d24650e4c7c62b62b0bb885e610e1a9e542c7ef8f4f03f8ec11130"""),
-                    xeh("FE8AD6E3F3EF1FD1890FB7FF75A8CD9B2A04CAFA7ACEAA99D06D116B81039DEE")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-09d4099084b07199a5cfc53573e6291a7978b848844c008f3fd45aae742d49f4af1229c49189bdfe177ee5c2c5315940f0024009eb4bafa5965a472d87767d4dbcbed6f6af41307cb48ba8f9828f229160df4581b59617d34203450b0426593947fc84d739784528081105c2c0fb9a7af8be6045c8606cb22d1324d5abbdb773c69f4bc88fa15e136509dbeb698ea0bdfed69f8ed67477e10244304f866a912d2c01bb4c428081aa46b862a6d420cbe7386596c34ec87f11084ed0493952a656939c5614e6afe7a022756621b77bc27648be0e86a763e36f8015b9e5e68684f73680773b5d5a9f37e90186fa13c11604e9f231ebe02a9c531370778579649f33c70e4be811ed668e62d28f67f7133f86695b790bfd2a39a0f22a49195ae4a40196a974a1b3424f4c574778b0036b21b356835eb2a142084aa2b736e4a810f08a2199c86c3e8a5ccf8386498592ab3570c6677ef089c0d05b06ccf4049314a8b29c9d9c18ce40933cb857941cb59abcb499ef53869f155bf2f4ae7e1c3e41889bb0682de1b4ba1ada65289669a55807d10672fce9142d1a8a7ca20c332b4064ca8a1fa5a8c4a898c76cb837b44013376fe1577b0104c95b3757c40a8c70d926216c4e9cf072ce4798b8d38776b3786f6136dec4b9c3a35ae088905df969ece6bd26572c91d78242060c54c9573a789d5110b25db9a5ad1474f2694b31553d3dc63d69913650287f6296854c46a10a54acf869757de3bb21342d26825a34704966e5239ad16b57458ad75881157988d5b0577d432b89ec573da15152e89afc7cb0c587a3db87bfe0db286c528c4b211382172064c94210f3b4c698124d860a13e12b87756bdd0002423649d7e7a1f57676c6e53c1ef6bb6152a932a110810ab80c2001aa53cab449a6d8b9a734e48de8f4777fb7c6f7408c2c8928f72482950b6497c2500af7568d514c4c34151f6749a0a6b79ddbc12e03c5563702ea733ea142035ab4149bb58ee56970378727e6215607a64fbbe7888323bb1e265dccea33d1f96b8e797532249092a202f3f9c9e7026483e78251cc57c1977c1e5a4ce4f9bb6eb4983823998101a58b0b785823b3352c6a5e2a8660fc143a5c2653e6a3920a8d75c29247a846f578abf56c2dae289e62d1a581dc561c946f00edc202222e0489b697c786ddd18f38a937c7f9b9cd0a3d85a9960ab2b470e5c57fa15991e74517fa9757a4a62a245392f3361f7601cf0040e391808235a593a88662895140e468e88ac4553908630564e61a89cfa2c2271a27c848a08b97adc0444a7b72bc0051695e197c91eb4af7ab869a4b9325ba36d3636645b23660b0a101eb0af171470dac7e4d72c53bf4070706c840f11d8514913873667f7ac5ffb6c011aa6dbc34c8bd22c597e0814feab71a99b2969b8679c4368282bd5a109781b02561b59164832b6096a13b204de5d8592b9045efa538072331f984b42f43a44d4ca6e2792bf26a4beb24089d046b13c25ec3612a73c19a8332a9fff70d5ff71851da2927a13942e8aac355582fa347920443f9a76c1d942d624c8b696bc3825675a6150cc56b0a3e5a19bd6782ce9781f4f2a4fe6b632de07047828713b23d98c91c99091571d90c3438c8b64592ffd747f29351d8ba91a2d6349da30247db82e2051cde3b0094c4aedf7556596968ae6acba7a790cba9c1de26689cbcaa4d61bec738a17f33b666764a2ffbafb488530f0c1b93617be1677a53cca42908c8c7a051ecb6a894273becd75313420b3d763a57ccb7cc73c8e94aca79ec03873c2ceea96b16d67c34c99f1f3642eb6948f4282e8d50ac30a10a47ab8859d54f86011a652913194c8b5e3139fb65039b4493a07a95b89177a4d1798d35cc1b10c9f0ea8b1afcb5ecb2841b143930c58ce8ac90b3b11f43837645a6b9f6c08b538a2b7b9272464b9707ab4faf9253012cbc985ac5594a7609a1b82c13bb886c564b577247f886382872d32102d0a31ed410942c5b1be910bc63b0212eb918eb0485e6734fc5f736aaf84467692534e0161c4258eeda24763894d0598795d48d99c56771139fcc016e516a29203774d038610bb5a57314a9ce0c677d192143d34c8b2148fc190f9514820bf8c8686a4413387cff6863fce50cc85cad03b350de7548972a4168f154337006e6873a14aabbe7a7f23ddbecee63d35e15fe156d0a508c235b058056ca"""),
-                    xeh("0AA3B1F8FFA63F89F949DA18B6D8570BC5811F85A4BFB293E9D411ACD43C3227")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-d3aa9a1476a6b477cf20196569ca9cc4202176926f2e6b76cbf4b4abb4b183847e068c585d7c65ada8c29dec27a32642647901a23c635f6751ae131c34815b362ca00618554c4a9d028a6aeb81c0014815ebfc7f7f7001edeb5890995a25b89332c466c39888b9b542d741954a27b5dfc72a65a0cd453b8ca9529701d49d3cf21922a7a365fa3f73778161534274b3244a31a192c6075f2562f04c6c819111fb1a099c114e07e813a472a802a0af3167c7d1a68583c57305099cf4e9a0a5c724eb2a318ce0582078090f35b856f773194245e6678b9e77160201cdf2fa8d4456671fc9bcca217a2625784e4052e2f339c544a5e589b24faca6e3c332891b2bbb5849c6ab2805a4b8d01199feb49250bb8d30380ac3651c7a07525556c9d925001568a73b804f0d1b0e9b9ca8453c9303669618f398b95ac2e304432256811b910ae2570009c5199a110ad8424f135b93d99c375243c37fd36100ab89b88b1997d3ab9eba0bb6b33a8774b07c33a589c236be155b2df1420e75a0962315eca254a1fb01ed63102fd62f249c79dd051addd531597cac00757014e01366b771d9e06e825082a4a310f8f72b7cf644e56c59f751affa55985e42447adc6775187170aa0093ba12e65b1b3a2aa5b3739cf2b09c3677184d6302141b8eb4985fde8a993782c256f0ce35dc5f973cc7b4987b29a333e38ac3131b63638003c600b5077b6b5b7b9a246a02f466621ed67d4d419c65ac1144054120439424f58d9f776a9a3a2596d10de267b20848c6245350e68b593ec7b49c877e5614be71a624fde99c0423216302b3106a29c85698f1b3a96895aa97c021c9b539fa66230ba8c35b068c5b2565f974b112140db6588be7016bc1b2082be9a0f5394544141643b75270752bfc6920c288468330ca4b3171a715756dcb467ba635f7d17753e0c1d3778114227d8678cf63f580adf5407e9353cbc546068207f83b4f16ac1df250a1f8d499fcc9471de920faf2a23e27055fec098f791ca19b094fd7aef23201041378cb51501ad0691a39870dbc8d6c9ca2d6003de995b2cef5957745c6d04194d067a2c1140d7c6aa3e271b4b95ca49ecb9bb94254e562905a0623cd670befa9c5fb971e2a69151d209fe4494ea753a926b4524b05793fe5c1b55036a44061d8d1668bf0094cb14004d3759f510703bcb22d730091370e09c1022141c3b35035c2a08921e7a23c5899ece95136936b68e839b021a97499bd30dcbb1341141698594225cf52740ba1b68ea20768d7a8cf3af91f7c1b1a49817c04f475014b0b6ae38a81f03260ac672c6c5a7bd2b8f07b3e5243028a0c15aee58ade16c2ac72985de1525bb34f99090d67097c11f3303b219fa68453fcc03ec6c84aab448d7c308d76253fd5078764769fde087b6c955c1399b54ae068de44c0a282a7772154b50177b56c6a6c10a317d292bdfb4d447045072857a0a67dc5b87599424705ca9d6dc18c88134ea1c746ead5018d00bad1eca2b84217b53743fb377765b674d30aca06c79ae5c2bd0cc06e4f8249d8e5acd3177747d65a8692a3db8b1ea49504de28b67fa1ca3c3bb1b1365fbbdb3d40d666ad72b286b221ddcc505388819c993652c72397fb158a175906546e1c212609dc7b00150987b408b479bba5d290e0130d4c98c33f543da186bc514ab453f13404619e841c634b4c5486c2ab80258ade6007c8895554e819b5e894b1b6933692b3eef79571b8b38493c3cebb915c6aa35c5cc543547400b81b6058a6450ac5a7a81e8adb26f9a8367da7bf8cd2496031016ac92fa7853708463911780fc536cd54f498f807a5d029a24bac5c1b300351367e09d1ce68e6af97406c74f5c7ff796f4ecc10227bcb4bbc27044c9c1e7404bc15985cfc2dc166088119989ee32789bcb95fd0103ad969fa164bb5cca5cd5c3e6fb65f989a118d6a2bed2b59121b5000f64fa9fbc723a1969b93ccb83b661ab1b25913bf2f6cb604e0218cec9c8eb2aff60c948864288ab6bf1aa1bc65b7894e1357173ab691630821d63b75380958ca91cc6a9785556e4b63b5920c0e3876646e6833e542a250399b16814236524f31a470ef05cfd2dc0e01ab2b4d5a9b70c4cc5832b72a632e2733829c9753ae5a928106267097bef54b47918aabfcf91c1a6b9ef3f1154f8a7f309babe4a75743409f7b155e6557807d6b428f720e0bf260c6bf"""),
-                    xeh("2429F93D29E48EB6A25ABBA3EE2F3423CDDDD0ECF4B2090C6CA5BF4883F4F3BA")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-5b42bbf7fa109a95c24b6a71902c2e2d806d1d2baeb0c2068ef710a989211b64636cf58bcf43a3eac1119f809a26f02a216341f4b60b3c7516a1cc40572c6855bc29d006737ce64739268d0bc59718b9aa34a82fc9834fb05b27593a708ac4756c28342a148b2173b4cd023fad458b0ec6807f421401991dae15cbd8b01181294f95e0a64446710c41671ae3b298202fc44045541ba5be8516c8e52e743c503c9cbf69d6007fe79c61255872d312e1b9843300a6b436a96403bc33f6577bd4ade56bba41ebc964028ae6684c65e0c348c7ac445bc6b3021529676d5c40a3255930f2118d2343a866a6c5f11c3a1c85a790f25c5096c816166d2d08cacb3bc503d83ca9d1ced3aa0372a3235e06ce21f3a8ce609621c954bc383c97b49f23e2329ce9b092037e661b361f9bb13a285cd77c02cbb6cba1e37cae8a6264448e07401ada6896baa3189a527071e52dca12211135b6c360158fc60ec2b692c119042565172ae9c7c5e15e1b1a0952e772d61b57e66680b8359cd4726421930562562913c0c30ee486b023c8e36926bbb00f1fcb4e89600bf7d79905794487ca1dc5d69264fc56872588faa81a755b3227d2532ef54f8b0a91b8a6ae66cb55d34197b7c71e69c7bd39f8276e35117e96775b6c6501034f81267222f54a3f7b94e4a7a3e3ca04948b4f17300b92330d43a41b3de69702c2bfb9272eff89868551beebe890cd002a86d8566ae5cf47a4ceea731ec574684533796162ae9f206dad42272e8a7f7e7c97f93334cc833396324a8654480e5193a8e0918b48015de487df1590b0f7627cea9fab8c3bc1cc31c52a7ae3e7173a7a8c420c7090cb0cfbb0b419d53af678b5db9244dc8b8645f6c093f1b14ba5b65e4c0b8a875d4d86266aba296e648670867b7af5ab2392c4193b9f83052425362c5ce4a45dfc3e5d9960ad3b392ef6348fc7a164b494f75476b78c3f2557cb898a70af6280b7053823727e18a7130fc777b7e81cb8952f23b9b27dc02447bab51dbb9c0dea135db473906987c5ba76b0424848bca4e09864db2cad5e97adbd00629219abf8978dacfb8370f2ac6057477cc7829b6c452d242299c0b314855c5a5c61ee4557555795286c904d08aebfd17edd57195f831321ea02d68493cc994dc8370e219152f5245560875a88c3b919f9ca9a745ee8b942e1316a177a9471cc84984c31b59b8190a9207e4ac1ba253093e7585621878a3004d21851f349805bd70573580f9a98c97d6a2e790c0305316040f64533a6bfdce19d9ab8658ed26dc39837fddc2be9c66012eb76bac7b8f2c05361ca1ea7e0a77ec18187565f3c4b43a6397da9a16a1987ac8c700996124a10789ac7e0932fb820f4f18a9a7675257c7cd08249f4185a1c7ab357470e8a35c688a236b4191ade41bb9271a3798380d4a2a643e302a53396fa8976d5b2096724ce85ca4cb36ba8f7bb470f534fb496a7104675a0367b05f090f4748145ca680a489fdf719612d52e610352462605c1a43d39945adbc42338424146c0707cb28b986888468b85f5347c8ccb6456dc442903baaee62f4bc1b56fb27dbb50c96d9b359894a823b812afeba2ba39b8af7227b8b58580a2603111a6fa511ba7e1c7ac4a037eb53a8caaa31eb551339212048865f4a5c8aa207ad8688c1e0626fee782fb6c0b97f5463d8830747b3eff7136a1a7a83d3c5cf5b32bc42b6bf06b4616055ba6b53fdf365b2c6209fc5239ad269263bc9458bcc2bf45cca868b4eda432d35a0caf361d9145a4200bc9a770b5571095eb18cdcdc407390099d43194fe096df8133a22753b7749c7b51c11b4b7a59427590f71091c969ea619601d494c91cacc34133e0cf75d1d34235a45b6977aa39847a01e1a5fe4e2c2a509a986249c482443cfa8cf3ff9358541757a776efbd7148383ac98289b4d68a579ac3fff02adbe7236e6d06c8416be80445de82619b065436468b0535906ecac1f563b5daa78b89c6ba5d4283b06795b4f88022be4b1b11ac075e8b571fc7af7d91f13334dc18a317ab4794ed69946c45a615c19209302cadc2f50c767840b397a9934bbc74d3d990a13e656d8a1347d4a46c6676402d563a0e860df9a5f0a911a7193be4b162428e0cb68b66b35146de6b2a57871bad3b166bf4a605bf3633912c31d0cb2e100c00ec9501d0be84468dabaf76fa2356a58155898e69a3c0e7d683c"""),
-                    xeh("B65043CD3672CF9AE2CACC94F923CEF63B5127ABC63C2A5AE6C064B8C6FE7C57")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-d4f6ab585b2b11fc091bb28a92ab2a5d061a3e4890ba687cf532201369883ff26ffaa019319b6914b8a2d76091aecb59e37a0916e5380f2143cb34176b6310771703be07305869bab8d98fd0532847446fa156446f2ab465499f7aa81f450b09df23ce66d0c0e6b82579425748da4a4cb1a13f711791300d21c0bf8a5191f3a0817ed4519931150e3161bc1b076383056db994a3775a27b61c0cec0e5c3584295b01e9855a188a184f78baff6a4ecbc5cc1b0227a5f12498d0b90ecc450d5a278d74807af78b3ae94bae64a3baec0c6b109a57800297918bf949b69c5c905f944ec8cb7e84865d67382c6e3546bb4c891da34eed09028bb3677ba624a9d5c967e94b65e24b380719517712c12aad85672f20c77b19e477490a411389b5ef63429b15a1a8d680b0082d586955cd67163ea7a7c8c26e661c52eaba8503b14b168c8c79fb7e73109b135c7ef5790afe65853509196b099aabe81a525a0d6b6b3cb2d5400a916416688d8f960d1607c777db22b3b2954cdb9e3932432e24805f02aebf672e8e6640d949221d3570d901acd9863566f439f5a4525367337b718536623b23c16950dc59c4eb9c00b76e0d11a942fa4e531a6152ababe6e54c101433b5b41c038907a548c69b1111aec34d64e084863c950c4903493b768b831a4acc04059083d6e7a25bd71b68dc1d10309f4edb246b7576acc70838034bc0e050ab40808a298ac7571d6a392bfbe57ce2570f18f35a109ac32fb9cb7e5a1da9748cfacc022b15abcdc469e79319bce47262012334478f301c1c42583ce84116a251a0e4d8aa38366561a22552eab180b1634442138a1c370d23a6acd393cdac517f59acedea7e620b4458b03585410d3edc5264f9375ceb6df9f870c8d7393dd0c2394882179c991933b8e474a85ccc6338124604727bab826553927d86541a4da61fea2581c5d15cb70b740e7b38b1787d0ea7acb6843fda6c5dff60ced980b80775501120c46f78cbc49a4ec63a98d324a9a177bbdd74ba0ee0108187ac0e245cfc7420a9294019573453763cd4b9c1bea9366d8cc7c996853c5c172f9b0d667caee2395b7a7c7fa036be9ce7b59b96663d260b69940a2a83624a62623e8906352939338c724a038337a59f59392f759c516cc417478cb7fd8c92ce868127e156ad4abcc714328ce67e2082cf2805c3df4b5be17b29a2446fbe26a50a54afbfc47bfa27855563b64e3846e934311f515f20c68860012c43195e6a45684eda2de3f9af70549d3f41c0b17519b02a7d29b076e49a3f80554c8bd7cfdf12a42d9b511c4ba187845b5b725b1a384febb470e3063312e9a05e846fe28b155dd00253a3afb9c2143ebb0683b03457c937efb1158fa93130058213176cd7888598e457d33cc6a600c2fd465b3629cfe84bc51cb3aa8bc4111626bb57858c00ab7b8b13c729a052bc222b06745b5181bf1c58341d239db92378a83b20a7e1299d407295fb94beb2c111f07c57401e522149f9c2b0a6d369b6f829b09970b660aa3dd6b0792b21797716de834286d662a3b03c38cc9ff1aa982dacc0d6892cf01492dfc506e7c37ecb8b82603c7d65843cd011172033203e294e6920b2007631f377cd003d8b9a4421614cc20e126d07f05205d0c1883910d9172aac4864ff7b7a8b1a1f5a8c773427aaea747db3191d312b4f4a82b7d9b4ba69313e6b7cb310507d03f47f8186a15d49030df21c144b639a7721357aa2fce77149507a7c5430d9611d0e7a5c93e54593314f3749ab0025603417173b13bfd7f32c6f854238e2675a948130ea2213a749da0c18001791f31755ccd829d76c5c62eb58554277f262427506cb17143557c919443922a09c1b735943c1a411e9db8a6b5c0dfc73a06d49c86e5b5fb03677f234bc97a2931af2ac804c0a9d721ac2468058a037e53346175981c879be43400a1c0760ec3096a56c0b2f11c9b97a87bf388058424faba04abf8b4d7f5069a4f26b14e39917b7858465761fd802c7c8cc2ce11cbdd04a519bbed86261f3b3b3b07174c26008b4d71311a951e0584100ea7d97881da990ca3cbc1d9f596a798cb0b1f79353413871e5a4f093b4825a47833a99994848af3378849b089b3843c7b153e4dc10896b4a6aa9848c17cfd3e0a0c491b90587cd2611908fa04bda829f0b494b045f938e08a7bcf1212fd194fac918ead125d88e6c4463a04689"""),
-                    xeh("6C8C075658F4257D42010EDFB1D7EA290D3344EE6E4C43DA799366985AD52243")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-bbf41352fb8040963385438d80125b7b78a7bb42515971c90c01323d9b3e75697ee3729f7521301d11518b92154436843987531887631819167405c36c35bc3be88d957053237bcbe1fc59fde76f1fb1c0bb4ab166ba098e6c4b58d26ba606589c568601c507a6fb149e30a9ddf126a4491812813ed0ac12854b3bde1b683cd23c588082066303931941aa5856bb94a0c932c85f9b9a4796b9152172647221d3e611b94b667e0985bac481f69ca20fa04dd57c42adb71ddb51933ff36dff38bb580b9bb0a666e80372c8e2b8c29a711f484d11c1ce58025c17d053196b50ed28342fba9b24b8093b7c286a4c1712346cf886454868ba79d53fa445733af9582113c85408c2e8473a3bc358af200cdeea56e44086e1179ed300204dd6b39815616dda5923dbbacff091970a57166b0ab5f1b25e1c1d2cc495151b97dd1aa87903204cd3b3b19830ff010d4df31ac3c7623ab64d951c9fd502ba14f4c884661d65d249c33b2f8d225c81f99f3bd88fc5a71f40722849b6b838c754a11a3b8bc8673cf900dc92b6f4f66b139c76a420abb5a2be9592ae1f3045a8da088871b45ab66610b64b163b38f641beee8a9a8f13a30996c262b2b9231241b34b5abef4830dfa922ed98a75f61cdd59666e3c728cbc8a6132a343a458beeb0702fc962439b2afe7b971ec62aa593cbe874b8a8c923f963060d1ad64bb6ad1dac893cc3ab5188e7943cf184b7b18ab26133ba4109a57207147f5e25e15302da5e82069aa721f77557c39c760d28cf37715f7a943de605193e29a6a94ae821675eb2b3f08ec4d7f0a99c5e71cb01292b327c107b61e6bf99066d74a9c8b47e99a05d8f2b9a1a5b12723c101220c57b509a42c5b28e853dd75251185661b61499ef978bd1ab9b92864ce013ce2123515ca5aad6b108660b4ff1492bb124f5bfaac592107c2678c5f04c2b658bd31cccb7a09028f48a245e638e8bcad19bbb2dfb6ba3bc10c487359b3b0421eaacdbe033b6d7a8d5d2311bcec5148226d4dec2061265c25b0746af8c63cf99f687a04c237739d648de7919cdb59973ba35d85187d20212ea537cecdd9c68de59345fa0dedd31ac6b21a7053adee561851b7be01770e07daaf903c2738dc835cccb05f5a931e2c4d2541a8328983d26b20de5bca159973bc01301d0541a8e311ef7046ee9b51a0f67d5202d0ea8c8217226a622b32b684066f2a000ae22cb1e29b47176e7973b3e9d4c18f22919a89a6573147129a43998886e8d95c804c15a01084f3d81d7f0288cfb34276536389344ed7c09eb47b9d20300abfea2a0b2878090819477a640e39cb7aa1643d4a59bc6488494a0ec3073dad9706b752c30b123fff3a1e66a8b575587e3b119d83e1b833893056b696ed49a399d11278f23f456b5192fa324fc4222dd247acb005dd50c918893819545f59b8b5550bd0a3d97ec24a5c22d4b8fb12290ce4cc96528893f772dce5c52dc0114f19c6ed026928f1092349475a020739aba5f5a45b8843157a76945dc84e7284572395345e695090b37edd895b22870b39ec07b36867b5dacff5392bede2680d74cc2272713be24ed37a22e33c36a84ca9643a46c68112a9d12aeaf67bc3160080113bea680d9b1bcfdf75be1c18c9f2e44781b18b59a090be8aa957c366a4b24a33b9b6d055674593470f37caf456b367fba266f34160d4cea1605d6140be110a93b2a57e06dc811b67572510549889002ae53dbdcc758fa1aa2e4bce4d6ba0dbd09ff3f736ce630c7b454096d6415ea32b797404f598c4b02a3dd6c98332b7440735a71124178a0622194993b442c5596bca2caaac46d77f6713a547980399c18e5685cd9dc879194cab66b99de4e2888952808b15c1bab5b712ab3e0c781b209162818cb3985b77f4e915e86779ecc5b2096104f512cbf1162b9aeba6a3546397e608d23861fa3aa5847a4cbea7229f5338ac4161b9765d74b175a4e95a68a6cebfd6ce796214163ac5b314c0deb2a3463b1f7e56b6ada724a2827f60647a92ea4f33d36d7683402fb12543f73a2804abd00371073306f06aab9705819091c9afab226514bed5c46f8c3c8046787602501d9d4561582164baf07497d09beaf06cb2a49627663e04cabf05e5bd55f9c0f75ca0a93678ffe69d7f8034b4f0898ce5ca9a26f52b3bae41398ef444b73decfdace24a6d62657cfe717bfbb904ea4bde70"""),
-                    xeh("BD990171C3252230BE21FA7F186A121686187B77C234C37CA5122A7AC77E318B")
-            ),
-            new EncapsulateTestCase(
-                    xeh("""
-b36a6f80ebac6014cff91b17321b0fa32c4d1eccc3dec3707cd34c7bc63e62d2b57ec0314b659dff4263c0f2c5fae2a37a84b0dd415275b3452894904ef146f5728a76a56c9447988767390a693ff7e91fa6e36f3e5a5b42b97f1205704218379231169340c416f4737e06364b935186e79a6bc0912938ac1ef818d57878ee872af70c7f31e8a5da0746ff4137e8f9b6bd7b4b32b47e12660b239c77115c72741c74b8dab0fcd07180c35e0adcbd2d58b726e3775d288a6312aa158620022b623bb29e141c33e0532e5dfa67da9476f49a6f4e6b001597a54371be84d70d04340c2f403db373a1afb102780b5050c841d98b10af489a39f8c2e473c23f202f05a20dfc4844cf1126c562cc9610a98b0a2d5407169db917969b1aa5c314ccc96290d2c27743b1efdc410802c78543ae40686cff6b3dca439e243c867d70bb957086abb6a91b49c7a39bc2dd107f65c7bba534c1216857d2b1a7ee99ca0556b3405b25da0a0941f403d0e34677e49d1ca84f267bc86ff0154614ce5b3526aec88f95285c316175e15b4fb92bb3d2a99d70a0259ed295eb87b90b5b2f5e2a757692262866c70a9cb8d843490e563594344e05a4051b3155fb8817ed53431d5c0318146cc31b0c524b6410d53aa0612a51f1c763941c4cd42628f212c04cae54b6ca05a5afdab8ba54f5666a13396006afe7005f612180002d1005795c468cca3d778938e187b00bc29220266047b22df76b18040160a48e6378c99fc5afa4020fb2b135ca913c78c73363d93d10677bd6764a27221ef2a2600f5b867b52c375cca78846880ac448f1086ff678220b7a238675b740c21bfec76559d573a6a84190c750cb502d9c7663d50987876b607f548ef76b764d03b704781d3b324ed2d7c1ad285a3e1ab1e5d6c7ff49495825b1b41a5ac2f524bf27c2e875aab1023c5f058f1a7881c3e60ab9fb56d15562b6fcb8c8c04a272c8ee6c807baf6227330071e6c49c8c805b89b6acb2025b13c08fd9916cf40191b9520409a6cfbac821fe8951c027f84a11dce4c54db98be7427b724331c64169aec4304cd71128448473f599eeb8239b1463cbd43c0836755170c19b3108dbe42bcc290cf23619a303230f9b0982c3b7307734e940807245bc097649d2eb9ae2b0695fb56b16cf90eecec1a50c5157d48098a063b53158855c9a1f1db9ea92b7bdc2488bdd28c095ac4e3374311c2754cc56dc8e511a5bb4cd486cce605527d594ec1dc1356b9bc938c0488b6b6d53243f2443223ba200b0c32c6f49322545ffa8a2b1bab914a72918a658b6a053d91249fe0c20360116eb3090015c161d4480d492bc7644762a48b3f6b558eb1f9b34cc39398cb266be91c414a3ba790c9c92129e5d40ddbd3150a5c002f763484546519c3a2ed327192bcc80f4710e8690a8d30a36059b12df6c107d1a73d9bc57796ba08fa01fc0c2a4f8b7a63074786729e0596615ff4b7c957959ffb1c5537508b191507e16d33d1bee9eb2148618bc8b279f0e92072b8c037565251992e87db4c0de8775d151ad13b2c375a46688518e5a2c409e32b9f314e3b177d72a908f3fa0010c87724aa2a94ba6a2728824719c6a1b0a2e07c7a364a0a62cc2730966ccdc96eed27341f77389a854fd12b9aefc0aa4c59a8aba457c57222e7065be09b593dea82279c8f67971a46878bf557b8dc095a9a0241d3b64ebe02137ab14eecd7410bc70efd3c08c1d6220f597eeabcaeb4a7b129ca73fd96872077577e44c804bb55d02607234961816b85944913dd83c5c835b1c0cc94f871a29073b8912973dd430246f84780d51ab9e163cfec5bc3472e02377bc9a2760ef5529568a4497c556e9a5f71526396aacc3e86158ea4189906b8ac277a90e383e298c8a1b98623cc909f18c894daa83338bc3f3b57152cc472889ba297a533d0554a3186229a8514c9c4826725249c61e4411963329eb99a37a4337e24c2257e5354ec5c2e4cd85bdea15c4e16cffcc628dad7c3ed9066287b587cbab64f0ab3aceb69494a333d240074c989cde4932d291f8edb065577985f68421d312e429a15cb21b31576c8d0b470c2177cf7369d45ac839c5c191acb40e62a115364c8875883ac507e5dc90a6cdbc6a540b396b422e488bc7d25c8287b79efc32085758d593b33882f218e758a3186d9cf309538fc57b81edc3ad0d228aeef39b32aef07a4054c"""),
-                    xeh("135056EAAD8A28DEB1BE77EEA30CDEBC7B3DD89D1444DBAE145F39898256ADB3")
-            )
-    };
-
-    static DecapsulateTestCase[] decap512TestCases = new DecapsulateTestCase[] {
-            new DecapsulateTestCase(
-                    xeh("""
-66c1c53cf37af5756e10648db20895447c40e147649357bc19a947f98a20908360dae890abf92f5db10deee57844b51bf15ca71743cbbbf647f07ba8f627a8e7bc12fa29c941b2809d48448147c94ae3081e772b4321a6be0ca55632af43bc7991483c1b4235be2c4e2582bec03c4531e8beadb504ce55a3d837c8357584d23bb430058833ab8d0c5912255a363d5b623bc88e70a293404c253127abdd3495b2d6cecca2582c7544280cd0c3f779e3facbda109a7b423b29a1c752a632c5e4094063c9a79abdd4947b530c3230ac7e567ca412b6217da030ff8a120e75746f26b8dc2429d76a0a5a06b029f5174c1079487a1432758f699032f2d32f218b625ca593d3d26f5d75b0c5651358ec8a1a6673aa7010af290c1bd1c6ae795d1b7318d4db125d970cff78c2810937a2680beb10b1200782d5682ed8ca1fb288212428918cd3517a7a999cb8ce4d442a9d82c8b13c5337355cc63b549c93c9c6016bfdcc498885baf837b360412e9f517e6f49baf1032620585b3d3270644c9530327382a5bd2ee0a538a03a0226cd1e6103f32b5e2b946e03839e4dd247f6957d357cbd1f1bcc889511306917a2377274c8bf31f41cd66a4bc93a8fb5718e88d88e1664b35cd91a7e324d4cd86a95f93a49d0aae96800a2a23b806542f9f02cc86c0497dc6f9933c772a7b497da3e64385f14c2c9b1624f37092d5c1a473e963b3aa6b67641112f501e7c5981745469163b8830113bc7f77a254750541c9e08b728b834b0cd39528f4a41e862ba4a0cc6d4415dc99a62a86562af7640d4487481c57009e1641376918db323c54b98ffc1a877e4b712d99d6708172fc6400da1761ff6ca603649ccc93824e7c601b75272580202c0434a199ffcec00b2c75da4ba041e766a8e9141785457a148517d58981fe031d332453553abab73ad287cbc610cabeb7822952b7e79db10a1dc4729f8cc39e3003756522de9cee0385383d54fd363613e8727c06a02dde3ab92c8926be48e6a386224daa106884eb18c7cfa1566ebc5ba6f9583c9a745bbc2c642522b0141743e6837e4d9a603fb403aca55bfe509c6e8499d78b750e516b8a67709468d3fa3b4d74c0a5f5a4b5cb94d8ca92188437040f9312aa41edcf274f0aace043862471591e84c0e05d61031d69f4fa11f4e8a0977673ab30b2bec0bccefe434b55632c6057842d977027ba616e6a7fec7340bb20c7331b4e2f1044e9692ab0136a0b285fde033ffb25543c5c9ffd83595e380f8e831701b1e16e040600c1c7924b6bc42331d987b7d63c007d76d198c0c32aa3e3663ca7606454a214821b15b8ebb018026aa1a618539c00d0a84c871c1baf016bc426b3d9be7598fd8148d63865bd6b455fb8a47562e95666e18405367d4cd581162fb878d8c0c3d627597a4811eee0963d4926861ea202d46a6a6e94e89b3cfdbf436fa2254f060ce6b80b4bdbb98da80417fb53eba8286b58644d8d84654fcae20906863fcaaf89abd992b176b05b2924bbe566728878b5e816b64a532ce2cd41f5a937ddadc15baf23023a19932b337f508c8fae504a3aa24261a9bd20701a2d3ceb3c72ebcd5807d358c2ed45d0b84092d6c93b74caa20ea4b5db66369d26fe64652270949a930bbd0103ea7d117e6160d9dfccded58476b94ae90036b68a40b9bfa61b15c889467a0a01342f843be8227ae9cfb1593c240a8735d8105a36c2b68e5ab97671b63a1cb1eb07495fd3bcb380aae66d20f3bb096b5db9944d83196b3bb3e321dc76c3b7d6828f366585f75a3c6d370f5580f22b385319483c9c19e6e81cc22690b18782c2d47be5c81cbb1c055cad84db9b06b15355697ea23a2374f027a63197b46f28a85d089a120848e94e9838cc72d1aeacf7d64ba69a93635c6a10ca5745645416e071a48056c78a50a0d4a60412966ab4961819918211a661cb839b01101798583934c9ce0aa447170b870306cfa02a16b9316f4f22d9b958a38b24960f0203cf2418495446c558a6ed8706d8c949e7b14cc168c965293d128ca16412ff7b221cad771d441ae3fc822d86645f5e266aaeb1df56a6185747e3312587d1b5f51e13e23586f9f3b1cf393bfb24173d7e27584b061f4258ff3c29d27167f58999b6b87a820b56fc7846cd3a0953aab07bcd256cd997b4e0172cfbdc0c2fef1b5fc616b03d1c3efaaeb7d48c64a0c839085160b4a5732eea1a09177c4895f1b454990da691770698b54c8cc8154c652046cff0fb30d40796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"""),
-                    xeh("""
-ea231b200f36afe0ba1bbd719812ce994d5f6f2e60403c1e4fc1a295423e38a77d66bb06645c4ebd004542d2e39655a1bcc461af8b5d1882b8405902c8c3f63082d29f263cfa9527f04d8ac9eb99b9ed322079c5bd62c8b29c8a22992eee4cd6d7152da756a405bb0565808f3ee3d592c659b6da737b7ebe5f7196b859b04dafaaa10056488d4d455a939cd640a0031dcb9b4e5dd89bd634ad9c8003b924f76702987b6914630c5da035e34ddf40af1bd6fee7eafb0c602d91ad848f45ed222ce1334bfeb6f69a01bc4e5a11d044a421adb30dcb08d86460592f2b61f67ff0f02165b1340e9f6e93f88fa8d9bf1b82da7f21fcdddae82117881416f9b48833cabf7656d138e9dbcb29e0f4d15f11f303227a8ee6d04de284d9c76e0f35103ab4303e67ed76ca2f11c2d440e6df881c39fa1f2fb435b6f8c517c6a341b1cdf45064e7b67c1cad43b2c171e5557bb78c5ddeb9af3ad756451c70f10a60157750d2f40a5ab9fae21621484b110e7232b9ea9c52ed2c1331045d555dfe87ebe3ea13c52966080fc140728a26f4438fd25b4e5559a9ecd0c3a73e23c976abf2cd38a1e2f61e6c17672b569c08f3c2ae49add14370a5c9bdd3e5e6a4c0f7b3369f95dc33c30cda832b349af1f4b8699ceb1e17d3fcf515c2358db02b9cf0ec8b0706675e5003db6cf2182e34dd9d030e90620567fb83d83df293092efe9f0e935d79bda625826d45cd4fba547005b9e416c07112286eff057429dbee4822b935b3e16f9655a5fe6f362c58c7f52c5cbc75b733911378f174f706e4bc0b37848d274a29d9de894f5dcca67f6b80185b371f3b37e43d56e374070d6831f0ae48ae96c15ca80bea4eb6f37fb528064f09eab83f95d40c4a80feba2b1860b6c4bbf44bf3e4d4a72a28755f00126f0e4cf78a81cb1d8ed56f615e043e7b4a4f219c4f0735f68589152b5e0a81241ed434313635924eaddb815d0495d5fe065bcf5c6870b76781e486643a858d972e35d9c61be9f517f28963cf836eecb05f24777f600962ece48ab25cd32b80b9e96924f7ecbc1e3f29e011b086d9627770670fb7ebdab4c5""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-9e28069ea8b958931b9241af966388e1f4c336e0a960b266896b32cf80889750ba87e53272f792a1d0bd68ca5d25035f42d092c37882ef7c627837cdf6c56aa0185facb85d03bb8c353c1d3155a94286245ea0b2476b885d7c298ee079ccc30a717b7826076a95d49f060136529855beb163265851fa256393bc590e2a7f4fa83fb3a0327fa56c3f55bbc833c3341caf82690e1596c52f00a63e49998206431b564542cc0614d7af2437ce879223f529c0db41ac2f8b8ab1449eb8078f391227dc6c62f123950720ac5c841ee96a4f80a383907c81dd6b3e2d4a040b15301fc76aa6b00029217b1d3718644672e19998a74691dc996829d7a918662cc42c43b96a1347a716f41b11c9635f4a425260a1498adc86a6a111b2997522026c6a1a0f4555bbfae0aa262282c04c1058dc9dee882b81f3c8dfea72517717f1f8b778752cef58ca93a31747f833800c632ce9072738040c0a528b7704e0266aeec4c2dd27085a702249934bfa7b47d25b8f03955c2bb42cdd107fa4359131943aa4a78f716c26d2f448eb97249688998cb80439f4124db1cfe2d41221640e82021cff731397f50ce6c9c50b181a4fc8af39680547757f481598c5ac74867b4b25fa30df83192eb57019d36b00164184792b2b1832d107d0a2d404ead54f380aba0deb8fd10a6a018c9ef1b7b7c85ca8b3811ee72730438867b6bb32a8c517175c045ce7b562f9ae7d20ce0eea053b408b5ac745851c0e735c293a7bb89d4007c0761513962816a57f44643e170008bce2a64c6295c37392f1207a9d0bcf9fb0af7c4b7956bc2e1a7cbed9e5363a4a40de2c3e2d4121ad0acf932cb5b3613e052b109038160f9c4f4d5b6daf20a6a6334a7b787a2a1754969930d2a9a8c68b67ef4a4a0aa86e22e28479db632f0c1eb0e96c00dcc309007e4edcc97da65a46227156fcbf7b43898d44c419a099cebc9248050f60fb5e4156679622bdcddb62b70a8edd86a31b766f5818afc89932578a2d0bf845da2508c6e86c08414467694ab04321cbc77fd1762e60553d098b80bdc0cc7ac2bfe3eb02f888a2141377694506ea69341ad51d02065cbbe01bd1025aaaf94bbb2bac27e678fcd7578ef9bf3026700d711aca31cd4a9641a25286b26c034228cd906434c3e2a56f01b54a98878c6842b9bc9c8d95640bd496c0956446a0cd88d344d552a838e29f48850bec6b4667749fc4266ef8d5c47f8b21e7e108f8a58d44394c8711470ce8cfc92b2e49ea5b8b15772e4389564ac8d568b700d11eb5f83d018514d5d3acbd7c63f667ad9340b2dcfb972a333df99ab2dff50f570a4d0001a413a98f4075acc5241b5e6a6132551b9c4c1c22551b5a008df7d5a218783c2810b79a52552afa922de76dc4b89d87761cfabc81d218cc3259457316333c21bc9b650f6383c350e6681c694496565fa7203d05b0caf5a22a4ccb1fe7f00f89297f3dd02915eaa2a881cd41599635abb85890649f1a4710142c4aa4b5e3d71188562ef5205925652ae7606e30dac7099495ec939fc5b0778477be94185c649c858e146cc6750d3a1a98424b2645786681a1b1095979f2313228f96d9daba787a257f4e27a4ed3377dfbc71ccb9ddb227151203798b58f44a280c733a8aa8a631fa303b26c33bae7b088121d917268aba41cc797b7a3336f12101d5ee8900872b3a1710c885811a2d8c4f0a188d4352f259b62da152bf2a022dbb9c913c1c254a44287546c01053bfea0bbe3d05a24f1b70d969feac7c7325ba69ea981c5e179ad564e7ceb4ff38b824f9754af15664ff7a807bc34e62222217b96f364907916be6ef0cc99b014f3527572e0a6be517d2225aa6eb41e4c2a80aef4a212092bdc186598a69b4d0037cfeabfb13b9a9bc0019c5a83ee659100bd76a1da4b30b686ace6291877ab9d834a641abed635b8f3c536bd6394684ba283da1fe7797580924fa6a65e9de87bf833bd2e67c4a9e037aae0b3eb1701bc69add69127a98a5157a6b3f8393cd104c31a24ad3e381997f28c482c5dd6ec24d7747b559a29d56c0f655838fca25c4ad49e6cab35da559b354b55357748edfbca6122601a945d8611863917c48ba20d53b71909746723b4355a620b880cbb63f260ccb10db6d3809a96740ed153dfd07ba60159a3194553fa93ca28513a65b047a7350a0c6f43f7a09f3e2771f461bbba1e3508c8f8931c16ee6c08e1761b10f2eee40190ab3fada5811a768b72674b1725bcf05d76c132f99a60d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"""),
-                    xeh("""
-cb7eb96dc952919624e5825a24ca80f9e2a313bbfa357af50438fa22870029c8f876cbc9cef450d124df902e93618d8dbc8d1344cc51fdfcb19788872aba1f13f673c387dd64009e1ef98ed34dd5c29d8849f503dd064424b39a8b55bcb714e6d09877fd5d7d1d721b2b32b871cb453b1b00587038f5c313b807b356bbf7fb9a50a3573a2af83f0e893c32a20cd95b9046cac886f74967e6c73e718b0cf8470312cf1a9241bf25238a3bb54e01b471bfc398b5e23ea7cce32ade3169dc472b25fc7cb68997f2bee116c86415245beb30a01841acac6bd06c82a6644aefa24601a2738fb1bfc2b08199d1574dd87d9b220d12866199c01b6c3372c204855ce8884ac7393da5479818f26dacecb32e43fc0d9affa881b4952aa4b95b8cc563e1cb4b06ac2edd783bf8cc4be2dcd0d3105f73c593f40771bba6432c654f34849f704ed007652628db269bdcc6ac14f1a15fabfbeb7529a5f3d70244fa2e7bfb4efa23199b88defc15821581f6b3ccbcf3fd75e3b41dc8a50bf21309e395d8e616d7655bb3e99e3c4cf09e192725ee5eef558f84fbaecf144c69742fdb40aee854b95c80878904773311d832cc5673ff0078c4f877d4f208a538ad243ffe87b4698af6ab0d207b338715518fd794930a8650fd5cea71f035623fd19dafcfadea4f53db42e76f5e61c46f1da934a497c3142ceaaa1d2b514b9149f34d1bff9c5f71206959b6e24a034e5be92da9713d79bd885c6500ff3dab4082d488e4932420cbd395a5d612245e81e8824d317aacefa6a4c93b82f2d99865dfd5d8a03623b463f0deadc1345d123b8ff876198cfbf945c0366a20a0bf6d5ca3814504591dfd731d033a30e2728b74f859f0b91c9a16bc310450ebd69d4da09931fdaca4b5721ef2627053a47b8a290018ad50a4c2a0e543b130402a323bd94bbae64a175790da350128e99ac8d9636ba12f5de00582a61bbca9acee2eea84be49dbbbdd730e0c078f94af4bf44ff8a8de89003867f94bbfa55bbd905d7a260c23ee448c198fc7a89787ce879c04a7a77f379bd55dd8c33c484b9dd070b116645a4a44506b8488db""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-1ff7b9950a3965da1037cc7e93959b73fb975a63af4069c76ff9b2a97c2727f4bf72aca77874771e938dbbaa1237781a7560c328b6ab6b372a93969a82d9a562043bb60aba1c6a2d35249e0d248e7105421a248ed75cccea32634c4b13d05b64be97689f46c4ed78b224a99b674a2f70a79e82a025a27165a52a3a656067de520a60858f5af6cfa39952360bbf94549e4046c2b65a6683994a5cf45eb465639f13bf7adc494b02384c28c5d321c7090777bce454aab17961cb786ed9845ea29bb8f2a322a34b921420cc800c865706be4b0de4c7c9e6f8bde4f4acb58433dd71031c23553136a25bc7c1af30030f543d3a86785a4791455cae59f8be1abb8e35a4b9ee2900e6c601f76044a3235003d963eb7383bb5a88deab5bf05a621e83c3c091c410c03f07fc8d59ca7def463f69a162c027ac38ecced39754c7a9558f3299ef41c98f779db82aaa7ce75cfecc453b801b0ca77ba505c087cc8a890a6a35d1688f46042ca7755a4804b896053da6114f6acf517136c485000237bbdf4829d966b3b6c97aa0b93046e6903c82ab552bbfdc1aa1bc7635c14c058c16581c771e9ca55115cc1627fca7ff650084c09a8ab4b8cf45a8bbe7162ad99274bc9024a96465b399c94b44af882862eaa8b98b32c7b280ac909aa8c0974116596f348aae2b4f0e533d291c6eb827b8894821595892258809dba111adeb3f184c490e49330441a57ce0b5f2045f4ab182f8764930833ad2c189ed6602e61c3815d57541a5b91beb442275939238c336a220d6f60977b0a0ccc894748abd21aa064644ae7a037c02c1246ea6443b23522886a290103f16c16b5c621aa67872fbe83603c47e6724374eb57c91c14af8265858f19161e756d927417d356a50733326e97ecf7a567736c67efb4fc18558a769cb30c756ab186d0110c10bcb7432e672394146d0e03d67794744f116aacac81ccc1bb04962ca331ce742167a654fbba262ceabcb9db5baffca3e3774898ffb6611c8698ef4af489a94d1e16ca1ec18f9d49083d712fb325f7dc016d5487eabeb33e5d996bdf5b8b45a890f099b0feb3521f82d335b7558ac204e11a305d8b1526835e65a110d813499acc36a5409a15a8de46633bf587a706a7d388c5099c73adab17035a347b041cb82938da6838a11513c5756b3992ca2a40c91a450505be4cb4fd9625d209110888484033d09f8b60eeaca65330beee240f9861e768ac7218a6e41a1205f55b411e275253706c57b97ea650c6e69876f79bffed8759ce30df61465b4408a18bb003a7aa446642c90ea072f955f46044f4ed7b9a9b82749e56ad470b0d21b67b89cc7ac784f9dd016a9ca5d2b025668421c25a100dbc0328084c2e3367c022b60fc6206e40aab3a863ba8eb1f8682265af69d15aa9d173204533a1a7ad94f693310663212e4aa0e63f812f1608e1f9903f0685c9b9a797ea5939869b5421b87dfa1ce818265d5051038a9331168ce01971efc06cf02a59c9e1a03373a600f216f779aa73171be66f95d81808daf63a26cc3709ab58f22659ca9587c01029d915c7554946b217044e65a6c98258f6a0a2608a9cdb4c35a0e06c93b19988c221c96b79729cc227ad5c3d4f558062ca3179b8a0b6c0d6de0aaa466c498065ce690278b8980c7c567d308b181b06667f297ee9caa28ac2f5ab454b8045eea583d20993bf69359be500247b3a2ff0b95e243af49b6a08eb19c00f31f3611837cc64b85d8bc35da9466fc12967b158dba95782ab771c134f9945df0b02644fbc949cc633419c48643764e0679a690cdf0239b3aa49a58e171241a106c151b75197f7432cca3d6c133cca0a4902ed6c299a479224ec7baf4243152877adf3255ea114fa01a65a53ca47e3a6dff072d991730414754c831b3763a6673e9b8f4f7ca4d3891a33c542380cfbfe16a650ab749d79e08570629116ef7d50338f26834e298dec8abbcf588f37b428f211434666a1c6041a3a09918293fbff54d35c75c7dba2720a0a91592af264b446105bc5b41344067bb3e5943d62aaca4374f92933e3d4353f1898868d097e504cbb934cf727a9861169582bc4414e46c50c41693909cec50beeda69aadd6073fc1ca3e1a6a822751a404730c3c90a4ba6a9f4343988280eca4c4600b413cfacb8ce2823f2a2b96f56d9d1effc2d3292c0720e7bfe6aabcd8284abd8c3fe8aaee1bfca30de00ed421da54add2aabcbc9c167ae2c0e8331df9e9acebb960e9169d90c036c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"""),
-                    xeh("""
-7ac45cc6b87f431f05a28b0b6f8ec44fa020f8a0f798e4463e084e58c950d643a72fbdcb2a8e442aa2a9efa2345111838129097d942773073581f8828baaafee93d3bee80ed21e13fab0585b329de6348acebdf25e09f13c1edf96789a3e6c7b7e1143e0a5f408e33699c68ba140410e738e9501e4a087390970a86e212e3ccc18c62b4233ab94f3cb7faa3a5a8839d68514d851555704ae8a601d7e1df4f3e31390905945fdd88f0eb8a39afade14b0ebbaa16077acb4e3ffa41931bb057e386297d90045add3ff509df9650d86d2709d89a5fef748b15e5fdb8aa5c2dedd84533b5ba49bbe88ad78224379fefa0b68bedd76379b5b7a06235673f83871201316d9f8f050645f6d8031fd951ffb2fbbe4a66f0010abc8752ec509ea62cbf2a59c3a927918b06ae3524b6d94765f5ad6856f5ddb2cfc036f2520368a4e15cac62089adecca6b83e8b9896b48bb4aa4f33656c7a2ac3c02539c0525ae71481aa87be9b956ef8b6558f0bd2aa62d3be2489a4c477c605220ae63ce5b67b3d517eb53085a747c0566449c06c9a54993a2ab089ceb3183d5e69173b635d52b87d6c1e0dfd4c3f8a15e0cf2d2cccfb2d12429c6c174aed9d59ded4bed6ffb964e8d97d4d10ce0f2cb9124a4f88fb864bcfb6ac358824bf0e7408e19829fe038b481a4b161ef06b584eb720884865abea18a05a00d45b27ac0175ee1667f6feae675d8a4b85c2a181a52cbafd73d5e70becd0ad0b27b08b14ec2185e902bbadbd3c7a6c1d49a3a8e65568e590b44d12d6dff7abebd9158ce588d73a387f8dca572b51c24649e2ff02bdfaa779759b93a70f8d0e302a25b528e26a038298437619e4978f1af582d19a11ea772fd0e705dbcc92129e4e9f88857b0cde3da2055427dd8565b20e1531f701361b731bb2dc093f259a01941e255a1191718098e5477e27f7a3188339a1237e742d71882376b72f55bcc4ecbf03f1b29e79a1f0b969619755fa449f1727635d9eb71b977f4acbd58e5c72e89433689d5a2c759f7feb2051eecb6e4e2d3f37e36d863b4aa86d78df37b4dfcb453cae1c7869a0e67f6af60d90f""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-06f89c5592b91a8c7141b644db94cca7c52b0f36a1bbf6b0025b0b0e994b277b77ceec519e24387b7ac33004b38afaa2d34c6f87f9287ce8bd373a322d55c5f9e79c8f72bc17971c5dc77c2d26aa1cac4de8f7c2a613454105067359cc414a689184af5d5409d1e6bc4bea7dc2a20b11f272887c8491a0c0025163bb1a048d402d2542cb10b261e2f9c446304a98336a422ccad181cb53847275899d3a0c74a167c39245623620242d87a529119727933ec9d1b717c14980fc56dcdb963a48ad13239d7048773cf5269d3a5797016bcefc0466b6b7575024aae92e0c751ba0315505944dad99b54ac516966808197a714c7379e60c7dbedc9b7fb89fcdd96808d2c63ac13130824f5034c8843420abe07c837b4f853615ddb4900cb6abf3368765d0544c67b36570598746cdc8017b2d0a778213b7a15b492f4c9f462aa9ea3a99c9bbcc9f2052c4754cd347adc22b446690908d791b9912123b67cda366bb9ab058aa5285e17018ae498f1c7a1db6846ff7b30d3ef43aaf0c6bf2ccc574e44f29f8855b787ac63ca4e1a05a6b4a972608687b18696ea18ef69a660ff335ab54646f70350e5c236bc29835046f23ca2b46206f227b4d2f1c56e9394ffd70622e22c1180bc2093092307a34b9b4c71f514b8c890205fc001ab4bfdc131f58b751ee4011a55859b000088c6740e9f2cf1639840d0b4b3ef9cb7a133d5358923124cfb7c2131352b7e1fc590e711c575484304b0975415298c7ce558662ec621f9d1548b18188737b96e308c267acca09317453b863393aba3d96c9a99485ece5ce4dbb86675c21bd5a1356ca11e5b7050bd9bdf22418e24c966c04936a39a949f00f322b051dd40fad238a773b23f2f84a63675584a04b88676e0f864fa674658a1c2d5d7990411b7b8fc21c2e08c2d3da45bf55060a3b546ceb8e58f1326c50b861b7aad69607f4580236fc4a51e03b3479c8a25cc294aaacc5b376a3916ec41739ed11bedcbc445419331be39731d6c136d40a65000cbb046e48409f194706c09c6244401877501378751352abb7d8d52fb5fb47a76788cd99a0cf217f029c77ae76c67fc7215e493c8645af1c58bec08b66f66a92346b92f873cbd646aa5dc2b9b6e4c2848a4324a8318e9983932055c4f58f42346df1da07977101434a9378d1a1559819756646eef3094b5ba55e33b596b71c04d249be4b8318a4becb008ed71000ae795ed1ac873e244beb7c4071047e83a8b3c6c2be2ab025726063175c4bab391597923d030b5a9238b131383d15dc2a4bb812a8539f9b0b0876a23ae049777e6229c1068a37ab13a2406c6f7ba4591520d8816ca3894bf3c601fdf493e70c5f4b19bead520d25cb6e8439a548f35cafe81497b297341005fffa18b99754cf199ec90504f9f16f8e415cba718318437aeac50ba8413e540b963cca2202a35e356701e177ab0dbacfe6a0c02b506fdd6436982737f903b8a8204cbb07c380340c5f1a84685392a2b62620004caea2c416e61f7c7b0e6e202d92021628cb4c10d57d5b60ba4d771712d552d1f9c6f352779f8c32fed54a8eec59f4b3177c7c3e81e3ab7dc83a396bbe38ac0fa3ccb174442ce638c6a0fc1fc9c426b5eab83d0397b559a97256b2b0817ee115b1e026c445629bf7a8803ff71aad99385a1abfdb22a3be0029503cb44b7a35847bc675f17437d9246cd104bd8608da3005e14a632d69006ed4434c80594b2909fe284203571eac04a00a120c24d050f40952fd53ac0cb39bca50c28ff450a6e208fb26bcacc1ccfa89bd7e05616a395aafd2bfa59cb541975cbe429919b32cae4b1f4a4b4b97858390c164fde76bcdb32b54b3325392c385d647b265578a1c56dfe5a252144ff1c02dc2054bb53525ce4b3bc2ec190e3ba06fbba12f06707f060bb1659607971f3726b9f59191e6e7b252602f51eb281f454f1d80a60ea29eab42752df9a3ce376467f694fcd288c9fc7851c04821b53e693208867604def746f787ada2097740ec8462ac89baf84c0d50bedb539ccab33894408c5b4b91def7955923a283677867a356b78c5a8eec308bfc982c8bbdc9e40d7695b42612ac27f6c118b5379518b49e338738e830fb6a66488b7115d24895963934688d91fa9608d41582e79e5d417ab07c81d39415fdbb870a3f503f1a197bbda81d7c3204a316392fb75016f88565a73a51537728ac70111a4771134601afa8449cb475bbf9789541ad3f7b5f85a4f54aa3dfe0bfe01174ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"""),
-                    xeh("""
-574c9a1db78f7ae6ccfcc6ef48b8246db140f1a0d94a5bfccbe8b807e08889de2b45666e78b96eb159a73916947c2ae930c389b6c858d52144ca1f5c6d66a43f6ddff5c233493592e89f196220ad4360503ace196ef8057800c2d05b5b12e98203986a45c0dccb4ce1bf84b76e3f6a84f6e8356956f0b05c02ef2552e135d90c61264c63033848651c71464108be23aa0004fa1ffac1f4e1022dc915abb7a9f66b8770386e4330d7a94722fe54411fe0388599e6ca1463c9ff6401d9b37d42a3039232b62a7f8dd7ea125a4e54feedea008d51eeda575b4ee42031c908ec52a4bdf61f1ebb051c65cb9f9c4780958f2fbc0fefd38574e7b09f48412a7990246cb64dd8da41d68f0c16468dae921d548240d14b3023c830cbdd130aa7aaa87861f58f2530f9052e84ade036b717b365c8cd897b20166859c95bd90a28ec0316a0784a9d30da3fc1a80e012ecef3d1b12f91766fde1bb4a99f4cb00a94fed0f345870881e777a6852700068f5d321be5311ac813cfb3f5acecc6ed2e0225e016856ca379bb61806e3dd5c264c31190a7f903f0691b92a55ecc40a0a683c09636842df5337b6bb1b2616ddafdf9e526b757bc33831172722d95cffb2162941ddc584e70055b1fe21eadd8ddcd04c2d574ded14fe924c0990ba81c2eb6e146e483d87655f139fc651a1070420de9d3d82e9af7591a981d1bbf650682332f3bec1ee2c291696af40d54289598327ce64c32c2c77a81a6b4818839e8a6145a9eda06570ce5a348a72e8c332015387298eed54daaef0d4950f1c94646e1bc80547209d23d51d50fc86f4fb4e32351ea2b7a6451a8caf36e211df0a7427a46d9ce462335545f133fc6864286ae2349ab61d1a993da4f81ef523b3f1ffc6141742aebf63ad97cd6b78df8d8f73b69a4d6efcfbba2c44da1f1bda3cb41e725221edcb4a7754b9d79fd8ea8bd2a11c73d39c9d10a3abd5af6c145964601a0478d9c18573907fa2d88ec51b56ffca7b51a7a604706fc035dfc12366430234a46863c2fc03f3fb599b7c99b58231c28bc571bc629192fd3f15092bbf5718e2644a76bef5af0a3""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-1e4375ab948b3505593ceb86f6d4938284c069ca2673f272b7b78479dbb923128983d882cac84076ccb047820dd6da22419aae702c6be0274273e1a5ae7badc7456dc8f0a34d8cce6608a4e5605c9bf2b5bc232afa9b32c9225ddfb87c24343104d3b14d3b86f8b72fa336344cf32315f296cb88c3e8a5352882acec72bb68470ad9170689c938f7a9110ec0bb5cc1550e1b5e26f44a99c73d3a5c3fd48b308ef854e70956b2402f1b5990070bb2f365cd057bac1f4599e85c82363ab851fa6f89e0ab188b28be11ce7e52060ad21961c26f037662319950e0f2c56793984a45560c427160315769e71f9e6b3535806bccb497aff0944d004a3f41c16285b803ecaba95789129242e5961ec48cad3a61753b631642065a378155b279874ff038db51a37f1445cd496f7bd220e5796c4bec29dbb9b982d04dc08ccb55283e041350688c9d2ac639498bc5eef46e7ee721f46932ed4c790ac18c0d11cfad286a2b647c37901b841984f7a11c0412ab8fd79ae47375476079d27728b5a01d537a1a37640a95166feba3b16ca16883a4096d511eaf1590e70c6ded992907e6bae99acaf8a55154646056815c8cebaf0fc3c789ab485ac0b8737258692b2fa8db2f69aa1577045769c92d8332906bba0e44cc79de2c69549a4605548e07104ad458c90c29a826e04e2f1442cb170cbbf4ae1bfc50a7a673d633420c56596b7b9cd966480143287b985abac15de74a5db1502da05088613712829500adc46425b54c080bb2a0bb1c9fa53f145a6ae655776df15ee60b38e014abd73579f51718b548cd418a7e7f29ce1c57912d77433aa34b00db00f3f20a00714e0da2a489b091b2e52daeb58dbeb759428c3a85219fe13995d9c0baaa468c5df3bb51c282d3e13166917487a81dcd837bbb7acc75d2c35690ad3aa412c8610a36da87c9d8669f56c68475096f853569914961e795a3795328e33f3e15c1ec940b4c5b4b5756c772d1228fe54f6e05485548675a6461f8a26ba7599f708526d57a0a67c0a20e25ab02dc03100687b8e375358b9d5c149a132a98fd29c2add61da49601d8b70749d18159851028c33af8acbc9ff37ab19a9fbe45a0f08b9cdc2268d6e727665429f16448ed840d0a87c34c3422ed857c69f3168820b0ae998702ac6f55150ae3031a54fb80912ba94fb4bb31604492f406f654855b447b39d26bc81b0d1644c1ce2a7f347c239cecb0cf89ab14917192c12e7a694581021e96fb6868282df0a4850bf3acfde5424781c571e8857cec1f3735a464ec74d859b169142e2e7413d2a02c5e93570e3b9bd18983809129724743a1979794a2500e04a409506ecf0a975f58bb0d08b36c1733927c932e7c73afc47f81b5a87f25878d327d0c375c38d2940aaa543f46b1198345fce7b7bdecad6ad22e12155bc470448f98bac8ebb96bb34b552ab3bfe5255c6783a76425b386613a112ec1dbadbf105ae0ec3cad61c7032bbe0bcca9d3eabf03ac6f0d4c5e500348f6581876e80c531197e62071a9454947b450614761ec95bb7072ab53e81d89e47eb875263ae74ca6a28b2a2a1fd44947756c1f3eb38519c9b2d6d63197e6459bd1427f992680b1a6f1480cdb998006a25cf434346d04942732c5617245033b430b4ca726b94faee24ca54919f0842233e1c6268b4bca31be4ca7be9b52851e2ac0dee573f7959eb896b0bb18064cbb9b71585a319c74b7716de398a8111214ae3130bac5b196e6734d3cca4116bbf67ca42492be22f56b538a8532c6acf4404069a329735246e5eccc2730c2f5690c53510bb2685909015874a8125178c7fc00709b2a6720391e38a0193aa96715f13ed628068ff4bba6e74c7be095a897ba3dc50f88b2b08a353cb4c4bf382a5cd72227cb671ed74227ce245268c38874f53299604c41f15978c522e865333dd0c49cea97289813a828ca76b93dfd3987da9726f0d3492cf13ea72ab8d4e82e73a3987b336f0cd2157de0b9b4209869412b9074736867b10fa82b34e5424c5998295b6a54793e9ab119e9c68049ea2dbef55e27327080c6ae71d69374b8314ce6110369b76fa363dfc201729a700528944f2bc23c464eacf51519f0aed8160d5ceb66d10c865604b3b4ab05f1c2990bf2b5ed84898b6a891ba360af171b051b907d1245770038e379cb727784b219a3c5ce49fe6273600219bcc609c8ffcdf4acbadcb9e5b333bc301e771315f8f9b17882a6ee955159ba457f9f019c41bdfd90776edd78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"""),
-                    xeh("""
-2c3f3d5b5ab52392b227104e8b9c85303e6d579df35c1e7849ebb92e80ecf200ca9d9b9c408d9f68b4f4e5b0875047edb2facbd6a100c1e5a1465df22a88dc1055a663cb2084409d33ffab500c4e20ba796115a2a3f23228542ae90ede48e05dde69197b9d8138b6359d1aaf85443cea446a4a6b0fe769d2ac9de4a6eb1a4f0d307c6277a3fb1e4022667233b90885ad45eea2f6dbaa54d737886bb504c61b53fb24772c6c7efa12a7b13ade4d6c29e410a604fc5ad87f378e703ce9f709f9a7485aa18bf7e0b4d7d1b88968e06f085ae69d49fdd22c40533b07dbd7642444dcaf8e31c5c7c15f6261799663c5b00099261b747635a091c6759e2c1562a10adfaf75d120c33ade725b7cd6fc0edb63862831dbe6e73e356b729cd001289028596900b714f72d47da69306e3e5e823198ca4b45f56e1f60aeefb0827c44e4c16acdc892319b6ff3dfe138305df6bf7c518aa48241a1927171fcd1576f3279cc727fd8c6296b919296dd165ccba9544a8aa01a54df914c7e910d2930e27f7af36ab21929799b4ed216b971a801c11bc1381c205c55a76b9efbca88ee3ed2eca5f3771cce86617b5fbc411afd6d5d2c6e2a73675dbfb26cc7dd2cdf8a1f50ff8644dd1b173e090c8a70184bd14836254b29a489375d1b1a896c3a991a0cbaf86c93c581d0bb922acdac1bda28d3520bda5e4ae8815a72f1afcfd1168c4a4f8c526b12f9cf201e3b146779b2a2ecd35c56bceff5c0986402ac5783e1bee5b044cf6fbd94cdd7dce828b2421addb9bc80cc4aa298b2a95498c165ce241dd64aac62b1f17798d439c46ba24ec1290434e45b2560e8ddb938244c6557b52ce5f2d73d2d6ba3ae46bbd4afdcdf948c27d05b4476cd4fdb879d495c8405abd5ad4691f3853fd95253a22c4e012fea078e3e967ce666a5ebd6492a9fa2019be09923437d59b4ec38dfa71664020ec591a53ab5a2d6d77b3d44da2ba20a098a445182f62171b482cd5583ee290226bb7aa3eba414fc14dd7f0bb56e7b647269d92258a4e272b68cd42eac155f000f936ee48cb625b122c7237bbadfa4359abd3e82ae9899c5""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-96527bfd017c70facf0511955eb04e1c8b6ba35116b6c7242af57a8efb7045577eb101087062518f9421cf2b3f09b681ec2b8793b973c338ac4d39505e296d027cb413981ead738e27202782095589945028b5540dfb3cf120a22cf347c3e225391750c9f93b9799a0367418017164472a762c63a8c209b44260cf9997cd5b33be79fa2dddf177de723644f094f10a95920c2b27ec31e78b0521faad545c2964513fe8839014e9862dcc18c1cb088096b82980a1dc586c44b7610a6a90b10861a081acab7381955410f74970cac1afb52403a0ba7f81177ec65b3e045816361050b4226950a7b1bc474093d9c1df124773c82300778f52e8746a54808826399bb1cb7d7026340283f34baa768b785f62b449b9681193419af289c1eb845f16af7bf709ab3c7d00507f62457d74fa048942556d3877e54332be622274ca89c298b64a46c4594030a031c795523928f11f708ccfcc2b75db1814e087842596a575b35079184b8dd61543a94e93762b5116855a423201b66fedf028e25cc9a3d2733eda6b364c30d3c358fbfc4e563a52be95592c7a1169267fde07436c31250aa22285d229b04a1cef106c15b79681a955dda7028b3c205c188a32081b780500d1cb41df8601b7fc976dd67f9810c9d7b809ec3a725739609cd573c3038095235560e9989a06aa910486da5a24ff041071675f0ac327c6b4154f892f13230b05d37ff7f1867c7908f20a461839864a677d818a81d0b7c871b64de4082ab3d472503bb21535a34145bd2fc664208328745b9a06959340f939b39b2c02239db20204964b9329c3330104bf81aa127f75cbbd1822d96c99aa75a8562aab2a2ca9b5fac442988465232ce1cab05fb9c6abdb4337201a16374b75069bc893913ee28dab8b2e56d309ac2c0d244122ff755ed68474e3c254ffb03dac4c9e73392444daa7f8e7658780a49b44b134750eec8b4780c308587287c8c8c726041e2e70cf6488735a6ca6d300956fa1c027c3679e0ca96a457a1beb8e60f139eb0869f61872fa2c130117c321aa073935131a8c9be7c800e6270e71822492c992bcd26df43478861927e1d996dacb9c04c630b694150f23aa51f26bed8c744c36a7916864b5160e94cc515ae0a03ffb445245c56a434f9351ab64f6bcbb973718ebb612657d64f844df3b85bd484c473a685a0a4a94e9995d865aa5bcafb7dcbc7e9877d63890a86252c691044df94ef7a19c68056ed6315400f8bd38f48abcd09e82f0376816c0aae53a9cc61b466466b63938dbb0b1dd963adae40802216701d094c716211718943b543cbe0888b1dc463c20804c4c402105130dd7a87a48c3c3328f76a8aef2b0c7d22688e7636b88d62897809eadf1ccf2dcb5a0011998099506925dd3b74869f931394bcae43466a49a40b31075f074bda69c0ee2f7bafbf81712969b43f0beacc246b3e71c9df2c47db405e235ae97e1a99c0365076b29e593b39c485521716967751025bba279f3aab85c6bae3800f255396d136459545f192b650d3b142c383669d2547cc2732015bc4645554638284642b918b5bd65a06fb49c5fd267a90b77ac35d12da3512f44d2556e027e6582529cea194df88584190480d9b0b5335fdfa8685894514cf95386cc1cb63131dcd1022f5b568cc621a729423c0567a51313f647918368012a83816a2caf88e062a9a6064fb52d8b31abc270a01d974459b4134be74c41b6a22e72ba1c993924bc43be6509235298431c72943bbceed41a84f9b84ce21abcea516f32280a0586069acee7627b54055515604a9ba112e620783aa76264ab8136759af9dcc75718a9bac22092a645b1b5cf32a92e377ba03a6117ee842172505793f973f84cbf0fa22d3ce116ef4c1012bc69db94c7b2b461d978c27c93044f22972588af42e28dc3748299e7a098b5566d67110a036ca9c6740dac84205109f05104f80585970a7906d7bf93067472a34442780f0fd25729745c7f85198a753836c3381f0592f818916b48278e14b61f1616c32ccb987940550316462257f1daba0574223ed6767b9c696b1c01ed75484c1738cf60afaaf9b3144899c4dc00fdab36fbd792dbd4885ab3af6ed63f8394b66d0a910041b1d606923858432f81c37f57c146db8dba6775ba1899d5904f3a69abee80050d6232d858d95a7bd86ee6af48bf9c372170c7468fc024cfdd552fb21ae23b08c1e38d8ce7232e254e153d4b2c4fa1fbf93c919bdfa47bface7a3a8708917b45917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"""),
-                    xeh("""
-ab66f3111bf51917775e0b0ddb50f0b1440256896320369968c564019c6f5236f4b951cd4370965a16f62bb2046f67584e4b3c2a6e048071d4c69835076b2bdb5f1c5323ddb937a371a418b0dd84c21ba037c2d94470a279b92e0ac53dac8de04f84ef1632fde456999bd2b596242dfca9484fde789794808c8cc5e6cb80ba87a850ecbee0262440402cd7f4ff1c6ba24879305b4f3542a7bb45c767c78af8d167a5233e42f0ac11d1c3a09aefca29eb25b3870fda30d97c53f988ed4820a7b979d3bb5aa4a3e09a962f98c58e3a2b231e6932fbf68398ee649642268950e7c3538268f02553caa443e6e3e29a32b2123603ea7e194122f0ecdf02f206c95a90c3605978b871ae70710887f46ecdcbe326368d909a062875f3beb750b366884802a0f6dae1ada16e55507ac15431c36ab1e01d54c453936d6857b78ce0384d970439aaa4e422441b1f8706eef30b6e8de22fbeaecd3204f8e9f40f1a6ea0825da1e0c967e3dcedb62ddd1befb3eb1c98d7decbafdf326268b79714b57dd7cd0f753c7619bc0f6ebbc8c4be474a6fbaf3d739c952b7f2ef8522583cea9f0a2690349422aa8b09f55cff3579546b2f3371c8592b459e3c0eabf4f871ada231c2933a6b19dd6c1267498d185f2d6971c1a73b4d61ba9eeb4797fbdaa11b87798e3caa78ad03e5edec0ce389c551855ae967849ada410e996b8cbdfba75cf9eb311220ee294585700d1cd15305a5c9a5925fcc6e46d8b94225fa01b69d70f0666466f69d58b0d3f1466d0972ef697ca0b8a40e19bb14aa83a7348338962882e05a79ae341b622ade01b19239e85ad3ea04d6d5d7d9e0d2db8ddd892b7ee6cb832b8b0911d85ea297e169f8d9623e12b9ec50d6e20a5f5f2a5607159f0ee44563851bd229d05276d87ec69aae43b8246e26d1c634fa5595e68a2c0d8c6f480f8642bb62ff80cdb0337f8f4aed0d12f773dfda04871ca37988b86f2b35c0babf83e45797e5b9edd97112bf079c470dfcd10ad989fb871cc66c696bbab7cd1c76dedb2c136192b6730d07a036fd1e3d176d69313bd3ae595f8b1ad63fb9439f0a53ab41""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-1ba960ba9a80a502090c1ab5d4f72369bb48ede1259a76c54cbb87579b0b623075ae8a1860bab4e39c460927af3e44007671c017778d160aa5f88cc292141eac1c6d417ba6defc66fe160fd64b5734c86fb5e54ae04363bd34982450279e24b4dcb2b6fd8260d385b810493f2506312c52c9486648079609ff972725392c7a0205a850a201e220f40219b3557993c2acc969708960a45e8c7f915562e6c7a42a2495dc499f1acc3c46d20b0b152de840b523c42b1251770956349fe35c8b78768798929df771469a476e997eb44380f19413d3a0a5d0c8c25ca540d6e092ff575e26543863728179b95533b36145a5324313433f7c66f78c66e664176b564babc846f454be93d9341a004bc05c2d067463a529a486fb447309298e26ca2c9105eb306c001cc3a28074af47675c40aa4cc371ba330fdc97bb03c95aab5247eee30cc8cb634d1274a4a2b4ebd6065ad3047701c930f3145b65a392d0956010c23d0c19c4968e22125b71d06087dac0af92af7fec35d008a073e99ffc9cbfcfaa7e25ebbaf0335072c083ebd81664085038121d7fb022aa1c9478254af14170b0d2009aeaa7f081b01e610d970b70e40851ce8743d020c731717bb8984884db8cfd52a79f0bbcc336bb43f27f8e5108d1f4887453126c628300f4ba10fb45b7d511909a035d65a2f6961e065a8492895699c539d7a78d4ba1912fa9c30bc43534b3c7be252f4aa27e78021e97a423e9ac6d9b57ae5262af73022eeddc4918b18a25c77032762c184c861d924c519a01bfa3618ea01d9b370c13934f2f6199487c58b5459cfe80c60daac2a364cd51d766cc90afb5796524a8320205b83bc9a6695b51e5f1ce8089beb6c403dbe50ffc557e49020d5e6586524976638b8d4ec1816e34bc373515a1bc98a21a51dab17df2971d64e63aff742a243c890ea06363bbc4994ba1b45c233e187ae78b0d44677254740e221998c6e3370446bcc21684593026b8bb2d32556137323e9ce258668c7d18c44330c59d567265ad60c317bc2d083a3a599cac8cbc87d0192907209b851638a50a32e7d76d29da291f861cc7b979ae13099bb82ebe29ad44859860634d62f78fd6b26295d040f8a5c7ff7aa393d127e214aac9107ccc06d029da6a6b998736710c5fc3a6c9ecbdf00069a9eb2942b45b1626b7953886248caa59789f9e988fa26073bff9b703232859463a9335374506ac57a8c2936701fcfc0235d071bf9807e907734e6267d130c9d4b2406e999b6cd15adf7783db2309598c058a93ac043319194ba89857a59eb35fe4a3cd6fa1c9d7d46ba2f6c62ba85ca46cc8d450bfb0170f5ad6a2a0388ebe73a8b58627f6cc5e7477635ce32472a87b4b881ca9fc749ecba012187a5bdc6e9e12b668f32786cbb5fa4055f86590e00bc4340c04b8b0053b189a74d6bb22db2f75f6b32918c0c3ac7da62044db4a9c1c2b0b1ee81b5317b1fd734c33fa3733d7b37bfa36c16578cdb63cc6f73d661a35e6460b74396ec6a07111091071a757d962384940a1a2338a42fa68e81587fca304d8a86282230470c8988cd707437163cd46cb489b010d235fcb976e50b51e0a22c5662800e74903b403c025bc6df9d821752107b2e51874147645687fedb108c1894e0ac3801bc1398c4a187bea7d9949bc5cfb8368b296b2fbcf2b59c71321b5aa2055e5823f86113a1519c956d9c1793a5d52a906a5031e905a862fec5abfa0965fc49a2db189eb6bc69cb8882b703e0ab35e088340fc35812bc0a184956fdb448170a6b32b49ac0e2a65a1041d38d4512dea3fa111c7e428cdf52144ae0708c5c44382a0733de356ab556e0aa141d58cb1321058be25a543d7060252c9e87997c35295596c02bc7b926f5ba05675a5dfea5a3eb62b2521854f21498c428a23048fa38484935399bf07c64fb63f7ee793a63aceb6842bf05077d2b3647714332d259576182f0d9c508cf2321f0090a6c1cb0a5c106647101277a7b1248e74189df6b90c26a612b26555d433bac49a3ebd702e6d9649038233d6da01f77534a8d2038f615a502cca8526c314c5856a033ec97155ad79a2e2a32cc1e734cedbc6c0b94219d13bf985588400cc682294bf21183830b2bb51b87fd9073b9cb6237884df0cbb12b929f81448e5578928b07193ea4141d19b4eed07a956c34b6de59127c5e823bb8f6719ddeaf282650cfda0e26e57a7165b1afbf3fa9fdcfd677e3b27a966fc034fb10c5f08a5c2cfe2fd02d9289fdf022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"""),
-                    xeh("""
-697f53fe475ffe22de8a70436eb11099547e47df00dbb25b9ccf2c3ba3a48f8876694671779a72d10510bd703ab015a425ae50d413e9dc5e87548d70b84cb124e4950c1d546249c8c8d60fd06513bbbf6648230538bc5e88269ca0a961b9c8186abc70286289d58b96df28c39f158c1a707f75dd20371c63ff038d0ad388a22449ec4fd8f73fc82c75f1e3e6e1c9f510f3ad8ca3124aa47edf0cf150f7a664a4bd38bc73dc94a722b878b1ea51db19260f17120fbb99916e596ced350107d43bb26beca35978db929df046400f8094391830c99cf2d5cd0e1527f97419550ad1d1c31f94cbb95d3cc5ba06bdeeb973ee20b7961feee5b4c05e08b0320ea8b3be528b52bce8750fabccd59fa7f8bc9bb8f475e25f1884ce4255d4191863e20156318276d5fa1e7d2385c2744ef31c9950ab071f031d78cf28ac07c54f997ae8f07915b16b8490f1cc028ae6b4ebbe42e5d7b5d988abecd8ac22bae7887658f7af5c488d91993c72df113a6b7f435bdc3d90cb32af64d6dd617e5d0b0f611ec2a0575b347c1cd89f92c72bfa3e7ef1e3e3be4bf68ae05fef6da532ff76c9e9d7f7d354b2e638803509ec7757c78c35dee3c1149d2b25f8d18a8b6ba7b03a519d0ec7f18f895d575fe3c557d8dba332e2454281b676a96b3eb0d38ae2de00893649e1764e2cfe0b1d08ab1d69cf65049d3a2b7ba894910c6fea7eb94e64ff8a71c64ed4c9b6b4ad71597adefcddf0904364c50084bc6687affe770ddbf0e8e9268a64e70a9481d6065d2a93072daaa9583d9b2a20db31cb7d5edd37c59e4fd607ba897dd5afbc2a6403af20deccb1d4b3abeb9502c40b5440e5e9a7f850a38633bd5fa75bacadbaa330e7a401978a7d10c9332daf141580f8317fbe7c06da656e7942ea7d5d49a5bc28ffd15d17cd0dc337f7fe2f20d37ee71b51bb536f4692588acca8a3fc498de1d23c9a1b95c7efbdbca3874e91658cdb7755f5bd51553e1747737b1ce2c44604987e3c04d819d7449b6a40fbeef7b3cf7bef8df39926830c558591de535b8c5d482101a5c6a0715ec13910a243ed0d64efc997d2d2342032b8""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-6a7863ee2a8102b695afb7842cfc7ba822bbd8526522e76f3cb9884c2454da31b967f939a09c837bf2add1c9a5b5a4c13dc7742167c74678144d05b830b6756ac963d7567dc23860c8baacd3328bb209a4720c5294a665bd731213b5cee4a5c51e58b0d19891c8ba3ba2e4c1f43b9478100067681801a386474b834a2ac3ea03961f7b34263c1ed08bb9623203e920b56054a2dd7cb9caa59ec2e25d21f1442d24847080ac45b80ad2caa4025aadf282cb23853da2221d3a5782c3e34bdc3478f0e77dd77696b97c4a0273bd9ee375085c50140ca1bcda9b14117747163923b4612318c6e6417d51ba0b94202c98575699a337ef379f2e46aa32d60c1af81edfc31c35cbaacc0726179b8be68ab1cec3457cccb0ac2888fca66b94d83216b00457a28b9dc064e59157761b4c91070a7d52a9b4337d661674c497b5dc2b5bfeaa71e362882830458f215c4e75157877aab7030a2b47c36c4176df159f8c5c9f8b726335548697d004ea03893b2ba0b54317ed45863f17b5be19b5cd712b8f833755b06e33da356d1ccef0379cf7838dddb9306bd482ecf16b52a8530ff6bce2a1ca269c318f707ee0ebc4145811ad92a21b3b009606191da83dd5857d6a4849b21713e5868da4aa78702a28b33b3dfa4c34ce4a642767517bf90550c687039787d54079f6054e5e2cae5eea711a2736d8c32d3f46b84b33c41761314e91aeff51cf10191310e1c3829c8560e0c5dcf0724dd00ee2364fc82001e1e4b4d577c9768a6ab516a643d45c4f731cb9503be1a71f6bd78987427cf253a4d54a202e3c389a0c48c386793ca79af99a1f1c70130e583fa36b2e0f1ba809bcbcb9da0c19042c3d9061873b104fa7070677159edc93e00b414906c774c6c221e187b8e7b4d5636667aa10e8e89425da282399504b48ae6c690ba216bd27aaa4eb39ab09d99b85f396e21a6afa874b8fb642bca82ddac76539f236ef349534769487d99741b1c43abb21911b27eb0abe41a453dc4876a2a26dd3b93fdfa7a1817c747a2acb62e96f013675b988547f3b8a24a008b726c971b797edf0850073a94b397804aba8d0f903b9113e3b18442e9b125dd762cc4bc2fde8007fca65b4817ef985667bd62bd8806563846ddf61b68a837d35859344e96ac450cc24303d9f116d502135369305a8cc8549641487f88e0f24a31c87cea974547abb569f9c312dac3fab517c85a5521d41b7eac40c62b7cb8a0776d89828e937177785a23ba0599381004c253fc90aa8332172f7366e6c756e6f266f2c5c9bc70a5cf18416c00c83dbe76a8a9c52ec5929217c0d2be88c8e3374c2111c2ac46a2a454ceab38f8d368f2281749d4109e90702bf368d6ba6ce212146d7a21a9ce6767fdba3bf1708fc359fe4e974b676bb9ee04db18b93f60759a071484c134e0ae29b135c5f2546562f6a471a826aaa3568bcfc721d707ccaf9351462098fcb21b441c81f876a7782363ef84eb9c59b2eac7f637ac205f0c1ddab4bc0868f42c4c2ffd0912a0578e9b81dfdb400a6a747c9bc8c97ba3ff8074f454367a5768d48653cad01c30212997553941780b44f3b26b9b79e6bc43cd56683dc9770a1d81ec0601e66326148f8645f820737c2479533a7cc3142341a2fba851cd304423d835bba5c73c3fc617f393e673591040876e670b94585902818883608a773e736f52c496691481b908106609366513ae14b618b8611539b56b3f466f13a5f59e5179fd29ac4ec7a92b5beb004b628e7701b11681cc61fd088a031d80d8e43b36042857155b0c5f207260bbbd30146d83a9c3c17a1bd804b56c96b01e71de75152f4b4990a001a1d8c736e39097771b819e58a2bf4498f1ca346cc851efb29c1551060998a7242c7fb5b04b6c8cf2f703056f18a9df28504752be88860507b1aa517914b278b61704f2e33cb02307a7a898e58a3a87221898cb57243000249709f5e53037728bacc7027dda1b7fbeb7739375811427b3f8c3dbcc0775442323289bd89ea0b668cb458da346dd25a45d4c9d6eb6ad98645a65794a795277480382ad7a99e85ae9e279ff5d38ac9a461d4a8aa2170136e69bb70c2c7734060421388330606763158f0c04788d79ded7b52b79abdbf891c2290b561ab4a6aa02e591637cdac7353798d9e256fd0286389f7d3b079e3e9f89ec0a68010202ca26dd2ea953f551554098ebaea56f782c33b11b3def6e61889bc262dd4337801b55bcf0b5eb53996785555ccca66272809d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"""),
-                    xeh("""
-e31362859b08dfcc50ad8f9dba1bfab3249b8e0b15347ae776b41dcdfaaf8596cdd6ad0eef2098b4759f8b168178d75f5a3d13c2e9af1c94d3e8598b779f14a5951928874d86a95b757816a5d74e086f81bc3313e72a1ecb637cac0212e57b3eb756056663ba1a1b066557816a8bc3c73615193bfb16543901948f7e0932eff974bd678be5002cbf91320d055e6f6245a6e3f384d88a70f0916dad162cd4b959894366032e0cc949e1e2b32a660717ef5cccb890df1357698c5f19afbe9742b87b0a077a67d2fab90488813517a8c4e35e2c58384e66d8076594ae713fcebf4c590c209c2eb015c24ade0eb37c341c922eda2220cf09a278aa4c63f97d317cf86bdb6129af96432fd53fdbf305cbd2d7ed9439760cd297d54d10cf7cb22434d51ffc04babf2b04b5acdc1aff426e9eb91e604149c8311b42ffaf14136322d8678e3fb5542423716ff4750c37c2e64fd4b772723b8c67c5876e3d99f29c8aacc118dd9998d11a0a7a18a29d593cfb1ec9a4ffa16efae2ecb4f9fed432edad543cdeb00025a734cd7f7b4c7ac96901468050ae981ac5846a6b7840ae674f97ceb5fd22efbb1ce9a003693883b84034eaaf39e87aa2ab39e782f8984b32ff7ee9cc832181da7589ffcf52562519c63ad3aadcbc04f479924b4ffff5d04fd683bc7f0c0612ae7b1d711edd39dd543efe54d87e6232005b2d9bde0ecf7ec6c0139da18161fff97055fad31f9d8952d370e25990b7322c8ee1ff5d4766e5c3ffa8b036aa0233d031787c5a6d4e788e0793f5bca432934029921014209478c6cfa5b4aa77311edb604fb3e794b61bb1a1a8e58ae4a537404df32a7ef520a8cfaed3cf45a1ed7d08059425c9bee99120d9f528c603acfadab24170c8f6cba3fd01a223324a63b5345a6def27bd5f27686deb78d0bf673f434201b9b1c24658e3f6b7f6fe2110e3cf4d8ed16c02ac9005ce57652c3307fc86f533469bd972a6d90ce8b256a9fdc42da4dee12be96954e71fc3f2a5f8192a97a7a22067bc2503cb51c5ab63e7b6f909166615b407a29b8cc8a2e9792f77836899b8f120852a53df8d4b3df6""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-6a7863ee2a8102b695afb7842cfc7ba822bbd8526522e76f3cb9884c2454da31b967f939a09c837bf2add1c9a5b5a4c13dc7742167c74678144d05b830b6756ac963d7567dc23860c8baacd3328bb209a4720c5294a665bd731213b5cee4a5c51e58b0d19891c8ba3ba2e4c1f43b9478100067681801a386474b834a2ac3ea03961f7b34263c1ed08bb9623203e920b56054a2dd7cb9caa59ec2e25d21f1442d24847080ac45b80ad2caa4025aadf282cb23853da2221d3a5782c3e34bdc3478f0e77dd77696b97c4a0273bd9ee375085c50140ca1bcda9b14117747163923b4612318c6e6417d51ba0b94202c98575699a337ef379f2e46aa32d60c1af81edfc31c35cbaacc0726179b8be68ab1cec3457cccb0ac2888fca66b94d83216b00457a28b9dc064e59157761b4c91070a7d52a9b4337d661674c497b5dc2b5bfeaa71e362882830458f215c4e75157877aab7030a2b47c36c4176df159f8c5c9f8b726335548697d004ea03893b2ba0b54317ed45863f17b5be19b5cd712b8f833755b06e33da356d1ccef0379cf7838dddb9306bd482ecf16b52a8530ff6bce2a1ca269c318f707ee0ebc4145811ad92a21b3b009606191da83dd5857d6a4849b21713e5868da4aa78702a28b33b3dfa4c34ce4a642767517bf90550c687039787d54079f6054e5e2cae5eea711a2736d8c32d3f46b84b33c41761314e91aeff51cf10191310e1c3829c8560e0c5dcf0724dd00ee2364fc82001e1e4b4d577c9768a6ab516a643d45c4f731cb9503be1a71f6bd78987427cf253a4d54a202e3c389a0c48c386793ca79af99a1f1c70130e583fa36b2e0f1ba809bcbcb9da0c19042c3d9061873b104fa7070677159edc93e00b414906c774c6c221e187b8e7b4d5636667aa10e8e89425da282399504b48ae6c690ba216bd27aaa4eb39ab09d99b85f396e21a6afa874b8fb642bca82ddac76539f236ef349534769487d99741b1c43abb21911b27eb0abe41a453dc4876a2a26dd3b93fdfa7a1817c747a2acb62e96f013675b988547f3b8a24a008b726c971b797edf0850073a94b397804aba8d0f903b9113e3b18442e9b125dd762cc4bc2fde8007fca65b4817ef985667bd62bd8806563846ddf61b68a837d35859344e96ac450cc24303d9f116d502135369305a8cc8549641487f88e0f24a31c87cea974547abb569f9c312dac3fab517c85a5521d41b7eac40c62b7cb8a0776d89828e937177785a23ba0599381004c253fc90aa8332172f7366e6c756e6f266f2c5c9bc70a5cf18416c00c83dbe76a8a9c52ec5929217c0d2be88c8e3374c2111c2ac46a2a454ceab38f8d368f2281749d4109e90702bf368d6ba6ce212146d7a21a9ce6767fdba3bf1708fc359fe4e974b676bb9ee04db18b93f60759a071484c134e0ae29b135c5f2546562f6a471a826aaa3568bcfc721d707ccaf9351462098fcb21b441c81f876a7782363ef84eb9c59b2eac7f637ac205f0c1ddab4bc0868f42c4c2ffd0912a0578e9b81dfdb400a6a747c9bc8c97ba3ff8074f454367a5768d48653cad01c30212997553941780b44f3b26b9b79e6bc43cd56683dc9770a1d81ec0601e66326148f8645f820737c2479533a7cc3142341a2fba851cd304423d835bba5c73c3fc617f393e673591040876e670b94585902818883608a773e736f52c496691481b908106609366513ae14b618b8611539b56b3f466f13a5f59e5179fd29ac4ec7a92b5beb004b628e7701b11681cc61fd088a031d80d8e43b36042857155b0c5f207260bbbd30146d83a9c3c17a1bd804b56c96b01e71de75152f4b4990a001a1d8c736e39097771b819e58a2bf4498f1ca346cc851efb29c1551060998a7242c7fb5b04b6c8cf2f703056f18a9df28504752be88860507b1aa517914b278b61704f2e33cb02307a7a898e58a3a87221898cb57243000249709f5e53037728bacc7027dda1b7fbeb7739375811427b3f8c3dbcc0775442323289bd89ea0b668cb458da346dd25a45d4c9d6eb6ad98645a65794a795277480382ad7a99e85ae9e279ff5d38ac9a461d4a8aa2170136e69bb70c2c7734060421388330606763158f0c04788d79ded7b52b79abdbf891c2290b561ab4a6aa02e591637cdac7353798d9e256fd0286389f7d3b079e3e9f89ec0a68010202ca26dd2ea953f551554098ebaea56f782c33b11b3def6e61889bc262dd4337801b55bcf0b5eb53996785555ccca66272809d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"""),
-                    xeh("""
-e31362859b08dfcc50ad8f9dba1bfab3249b8e0b15347ae776b41dcdfaaf8596cdd6ad0eef2098b4759f8b168178d75f5a3d13c2e9af1c94d3e8598b779f14a5951928874d86a95b757816a5d74e086f81bc3313e72a1ecb637cac0212e57b3eb756056663ba1a1b066557816a8bc3c73615193bfb16543901948f7e0932eff974bd678be5002cbf91320d055e6f6245a6e3f384d88a70f0916dad162cd4b959894366032e0cc949e1e2b32a660717ef5cccb890df1357698c5f19afbe9742b87b0a077a67d2fab90488813517a8c4e35e2c58384e66d8076594ae713fcebf4c590c209c2eb015c24ade0eb37c341c922eda2220cf09a278aa4c63f97d317cf86bdb6129af96432fd53fdbf305cbd2d7ed9439760cd297d54d10cf7cb22434d51ffc04babf2b04b5acdc1aff426e9eb91e604149c8311b42ffaf14136322d8678e3fb5542423716ff4750c37c2e64fd4b772723b8c67c5876e3d99f29c8aacc118dd9998d11a0a7a18a29d593cfb1ec9a4ffa16efae2ecb4f9fed432edad543cdeb00025a734cd7f7b4c7ac96901468050ae981ac5846a6b7840ae674f97ceb5fd22efbb1ce9a003693883b84034eaaf39e87aa2ab39e782f8984b32ff7ee9cc832181da7589ffcf52562519c63ad3aadcbc04f479924b4ffff5d04fd683bc7f0c0612ae7b1d711edd39dd543efe54d87e6232005b2d9bde0ecf7ec6c0139da18161fff97055fad31f9d8952d370e25990b7322c8ee1ff5d4766e5c3ffa8b036aa0233d031787c5a6d4e788e0793f5bca432934029921014209478c6cfa5b4aa77311edb604fb3e794b61bb1a1a8e58ae4a537404df32a7ef520a8cfaed3cf45a1ed7d08059425c9bee99120d9f528c603acfadab24170c8f6cba3fd01a223324a63b5345a6def27bd5f27686deb78d0bf673f434201b9b1c24658e3f6b7f6fe2110e3cf4d8ed16c02ac9005ce57652c3307fc86f533469bd972a6d90ce8b256a9fdc42da4dee12be96954e71fc3f2a5f8192a97a7a22067bc2503cb51c5ab63e7b6f909166615b407a29b8cc8a2e9792f77836899b8f120852a53df8d4b3df6""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-14b4a7b64bba73d61fe5d4cb3d890e4b67784e9a76c69c9a6cc53d16d2ca27c149e2fc0f6ad163d4b9ce51d96cc1cb2d48821fba89823a440e04d9415c675500091bfae270fa457a2432375e42c6b49879684c98cb37a82a794293a5c3b3abb1e6694a42a6924f372c79c370a60091840c752f287468fbaad7f907c444cd88f7cf4c8a56406ab7aefc4f7c90ad7eb669c36267f2c7a50a5441627990432b823d5a0a16f8a344b68cb54439dc3727b622179de14b7478ce14059966312b2d6719bc80008c689a7f4a590fe7726dcabb05e463c9d20e92c190bd1379db03acc0a90404e4c1b7dc07ce710b93f9161325815df392bb28562faa79670601b8cb2c33e8a8d384b2458cb45b8c09e7831cc2f6beae566357e0661f980ea2f32f13d23cc5ca75d461aa69b31e3e55cf6a9baf127022114a206e918675b522e11ac9a85092f381662596b56bf71f1c119a45f32f45239f82055889c3194a4555b6d68caa549487da6b2f61567a92ca9c938d25ea0b0316990274a348b75b70c100bec44c5612249c4697649635b641693a54741e471f45e579e6d343587a3cd1789dd984bab0d126f6e99a205a3077b1467e252cd4624dbc0b88c630a9604691a01c490157c928239ef1a140cc25507cb267ae897b1a030ce09b99749a3cc0119232678877951fbc33a6a0ab19730b6849447620497ce4a5605b11844d91b5c5c2490e99495b61baee6820c1eac72a544e72a168ec093e5cc44e9ac018d2b63d79d01b6f8a1b6f2273751767fa35120f43aab38876bebca28d7cba27e4590a8c05448a897cc0a963eb9eca5c31cb52815cd88be80a93356b4082c33c43db0ce94b0d1470ba2761ce6400616ae35bd992693522cf873956112449e5d4845a012422240887016d28bc73423237759384c280184775a481f6c97da1038e07b8afb0a4e5936093755aca20802438156258b5bc607d1d171246e2a1f4d7bb18e9c8095b69c36b06bea680b4e32b6fb8bfaa2269dbb9422ef686a1da9649414ae5215434c75d96f38b373ba2735a60a2505297493afc37228ad883749b558b990cb5d1911b5322ed8034619a429573756962129b459916f158f0ecb0cae396f60c4c84670ce3fbbe119055f1a4382cf2a619c31cee5842ee8c9c6979193ba82ce9f94337306186b20a276c6d06c04f41a414c3100b31e2a2a9984067fac4a7b3c70747c55b87b2512219d62c8b51a6b628766d63d1096f63bec8806311415919336bf9d1b038022d00d1bb84387888dc10f0290b752627c2d78ca5c8475150bd925240ed94af40b43762a99a3f5b0f41d702db7cb485405d5a247ff48635ba7719aeb8a876f0986f233212c40a3645c3e4ea3b5fd02bb520b9d8aa22c4595849b8a2769b92edabb4ba1528dd067aa86b3bdb6a39985983c89c9c916b41b34018bda438e7815bdd4316f6202c0e3c73d53124ee110ee596a9e3198f24b814dfd77f0a2a7aaab3a918b64c47fa44ff018332557cd13325a8081e0002096e68a293258928896532ac5b0ef4bc28bb43f68505f8a61cde0b5ec9ca8d62c261b5290e16b22a4a978d5b141240043c9b457a89a764d9565067cba987a23d5d6b3016291fddac50c9e5581d988088a368d1c9c633bc594d39c56fc5b4a996b7c110208de1394559915138b7cd8941daccc7382b60b47770272a56f846b15c71704b8b7e08595d51658a10b348617c8b552588a20a07c6e0670416636ba0982726671d796803320e0346bea80578f7808419f14b8be67f8bbb627fe4c5c28074e1458ba909581f317e70a66320ebc5ffdab20202143f374742b77d88c80fa8b9593d74a04e2c7113101400c4afb7893f634565aeac9eb8c144a3a172a1263fbee499d7895e298b195d4caf46514927d39f430aaf13c4bc43735670e5b0350a42506621dfd737177ba3736026d314675947a1b7315844da146af84c4cfa8227bc3211895773082fa22a8c9e7c20d1257ee9577c3f36a6d3097212dc1b149421b9bab30124cb3298a6b1505bf586070f52aab80a71e17c223184b32e9a6aa4627b3b99bf089973ab53be7c461ad57317edc3b79872bc50a391a43bb18ee9bf0ca100f16409caf4abbe0239b98b16a598ce86e7c07b27646de1671e915763ec8dc3c09a20181e0525c571a18d74c74c0e798d11d22db509a0f0519c7440e6787efacb39fb35c8cab4a38302c0a9e1969f65545a404ceb25db8ea6c1d0939019e0fb29d41885757f5ffc81000f865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"""),
-                    xeh("""
-a93e00395f1aa0795a82b149b5c8ad8dd0d51c577b2b394adc282b8482a3cc3a8cb8aa2bba8a40bc799074e5b30d17b567895533cb28fbb11c05e07da2c8e080ecaaed70fd5ab2c15b33b32de50b2072a04c084b4740893c7caaf5b5fd037f91b75149cd8ce00512c4fc12f5a67eca00523e00dc7d4e60908189983848e2f529ef5688ee182ab82c44e4f5e57b3a37e6599d34fe299705de154ad6ed4e5d424ac6843925d4df9b5de48688397a39dd487ab020f38d7dbfb8a021e099d9e87aea4531c3bad076c0726667b3aae460a8bad9c5597dc49105abf2d82992bc73638322f3399d86cc6dcf5a5a8646e7100426d6f587b688d8196c8df3ac141878561d144ce12a49ac8292fa309a9b0910a23781f686e8b4915b96ec71372a9f0645caa8e0fb5e4a3a67f465f000aedbf2923bc9af8cb5682fa2fbce090600f4534bd3e384829f9caa5b9ad9c100078071256bb1bc0c93267b4a1885283a4e3d9157d48d19dc97203f19a28a9454ef99536f8a669dfe4432051950fd911939ed2e4e28d46a78d1395dd2acddc031f3218ddd4441bd5be01830277d11927e5d32d7f45494e3c3319b2516b2fb1dd7945ab16cc8227b43d356a12fe6f8c5e4e36752aeb900a02109427cd384ae6aca3869b3be2a90021137deb1f1b9abbfa0ee4fb9b4da554d83b37e0d9ad6cc28d2190d2e8f24e0c26e716270b1ba0312ace2632922a2d5d5343efbd2c37b5b4e8d1463cb8c925bcf9cc90b65625eb91e723e8a9284d165392db21b1b1d2430f06632dc0a3b87182997613b94508954cc95863a1b93808ec0c384abbb3bbb829ea6ac74864b2b5e75907d3ccfe077e461981ea59b78d7d4d521ea2bc68f47bbe403d7419876486d56a28ec5f84526e45745a6fb23cd61b3558f0fcfb408ea6963b8eeeb4ba095d30fcb9fbb81235fee1b0bafafd718e602b5a2343fd6c884b3c084ce9f1cb310f8b9811dbd94778ecba5db61e3ebdae372763e64a0e5543e949d0fd6d4b5e4a165a2ce597c704bbe6c632fb312361a211242271d8a5fc2eb638ddcaaa43586388b98087221ad59a924c5fcacbfcf9176""")
-            )
-    };
-
-    static DecapsulateTestCase[] decap768TestCases = new DecapsulateTestCase[] {
-            new DecapsulateTestCase(
-                    xeh("""
-2b3a0ad58903e3700b00ba4a6658209391cb5f7685e7f780d7bb8233e4989c0b2d2f8c9d59db9bc13ab81a87acc6981e4400033129a79552132e592834ac6933228bff548938c59869faa14467068bf8c4cf0a5dbb0a8fae2866067c2e406c3b353a4c34058c0a21792ee65c8d289df275b9fb231a5aca54469455efcb6e7ca619a1664bfdc31591e3318bba2bbb61670337a63bcc477dc20abefc5d04e816802084e185886fe08bcb620cf44c810cf786d20020c5f8458e191dc5ab42ab11b930d3658907bacfd28c0dc292e9e327d7c019fb770719f28961f019ed3cb4b78abef0a05c3e548586529f0e182cfa3ba0bcd6604dfbccf26182a1c3334c56b6fe571227b106acb7358156bdb6d1604f000f5da2928d099fba809b07912e80672c0cd07919dc41ef902d01779e9fe9a9dcd64648f02b5fb16db639422f168f96ea0b2887b2ba5a9437608b3279463ec17efe729f7421b161e98ae57764b75875727a1bd0024bc44a9b56bbc159f088d78080afa62fcb6095d2da8055645a8ffcce56fa8c04203024e406c5ea21cc4045e8e1550d016514924d7fea345d7c45c25410cff51450739155231f4ba73908c62f7c0343ab4800b3bb2269840cb3e05ab759ce5c8a9d62ac7200f8bb19b63b27707454f37dcd7c7e1f685aee256bba2c00ee076dc0d26399592f5a3591a128cb01e68830e66896e13be87205b33078efc44cfa1374a43896a3397219122a0ab030d1b2126f31112ac6690e996286568082c88b35259d23419d632b3aac7120dffb24ccec217e9883de4769a8086a8152363f42cbfecc2a13ac6ad9b6a4a8aa3287f322042c8671d6624c0490b1e2a27b81342672ac651236537b63cdda77166c585cc340a3090012f647affb818ac43d4e3bc559f0acd6157d12a86ba0640b4fd2b28694b7296738dd25089d33208002177819b46132217e6194c92085940435aebc77644aab97a432b184b172ca5370144ca9d501fd7b22b9c65b4b56796d854941a478e6d23ce561894b536b86013f1328059e7804f75bb2726302daf2b278e55dccf7a28e8192f2222f1cf335efec810e8b6521764e1e6174372a61c2d3314c53afb0755bd03bb48a280f0b3142efc08ddd6a0b6e3044ee4724831b43b0c965862b9dd9d88a4944c8d649c560d796a2372b3a065fd3c2480e1c0b32bb9625b47c5fb4c0adb0557427bc523bc97ac77edb00c3f5d6ca4a492009e182a1e6349f0090bbab3bdb0054b376712f1277c93397ca737ef1d612c7443be82996d2f95e1b26af9934c67a78a84b2559afaa1b73074040b052fbf0ab6dc546f042b1ef474769b235642480ea94ad7ddb0607f39258f73363b52e21b1577c2b5f1aa1829603647b9ba1eb17a6863350ac98c5c695cd86b090d3972c32d39b0370619998a030b2cba8998fd16c58c943af8a63c0b44acf7ad02c5bb5205795668ef97cd16aa67a47cb1b36977eeb905378a88b37af1a1a8281ebb28e5a05b248c9dd57b8836041082195922aaf073a04d8b2b5bb2c5be7cba621f08078651f9ab3a385cc0ac9ca33a0024f72c1895a698109478a9e4b7d3066466d28313bbc67e9319369f355eaf268e6d785ccc576a1344e38271a3189cdb94a4e3048a4e18621c07578243bc5c017af25da2ffce6abc3194c510076b1d0c5b5529a80b3abaa9658de03ad1e151751f54998fb77ac52a2739b09c4f0ca0b8827c04bc280ca4e7d214231547370e98b92006270194ec3c79e96bb16550692f988627b496ea4f4cf7e9511c014c2ef89ba9620896785784fec1da3458a6f5a11d3840ba4f8714610200d3a276679a7e395488d770cd5122d17b37652a9871357594a87662aeb3befecb0e82513ab90b414d60c66fc61e4db22a2a3668c05338ec86018f154c929af387183079a59e201cb512536ea4908dbd559dbc63aae57cbc40437b0d5b54e784cf7488dffd5ae861b86e7b8a57563abf5f76c81b595a144a11c464d17e6b871011f8f82a8851321f2455644d0156ac96fcc944a0ad89d52f896a2e84f5d4a146e61bd132248572c27d823142629337e116f9635a32f4647bbf2b281d6c1058695b49b51e7f602466a107fab60edecb8cafc47bfa6c65643c662026f702ac7b7118bdc6448eb65bfdf8b9eff908f354410c77bb689d9b557439e9704c4d4107cd6559d1cb5a9a10b83f9f24d3e7418d3781eeb8b07cc8c5e38189afaf64db11b20ea072674fb42c3487d74c392f278c274da80f7518f983152101b1ec941baea92c132181a9442106be237198401ce1b652ed41e8f033c3a364519b2a1edc41ebbb36529440ed398207e600e3bd2622d4534d7f06013047b41a895444947ea252f13d40d0b82b82c0405bca2454a8823a0789468f845441089e18cb89f940519756628a8c61db794c9e86c3c4820b61413b1b88af8b20a687524ccd51fb9eb76eac8b958501342c19eb3b6210133c3848a4cc1b2cfa730cd99dc9e5635b3560b0731e202453b31474bcbabb626204ba05b251bb5c63f85a850efac7d3ffc0c8e161d014a441618be32c94d7ed2818e41acbd060cb9c5b43226c05553b5bd31b310fca52389361b8b2389c952e6a275d17408bedc24a01897ff484012e74545eb099fb0620fe7523d7b49288773224a72a01b198a299036889a5d690b994abda1066072f3566a33c944550880681f716c87a9ac546ff218ffbc8ac48a8efe2b11c8c2ae3bc0a76de2173cfc5af328929d540561a588d4337d1bf8748f71140224c2e4aa458aa2958b236a6c0c77492a307f754869d9c8385213240b7a1cf70b3f7aceccbaa50a134064d64750ab5ab35982ed596913d84c74a8c63647a2f5531247373ebe23695ba767d0eca290b94647a4c94e3949b7337fb7e77ff7668f695b9beb8ab87723a58ca62efa3b75a6584768c229f18a3c26ca1a4da72972c02a9205aa08991873b94fa1f995ea6c67b8a015bc3b7a77943435cbada7323309dc74b7a92c92127b35c32879567d4e389fd5b5a6c23b932108ce22505d815c50e8e80d9dfc6c3640b111cb9c5fdaa28d199a00e405f061b6cd601bc602a6a491cf900937fe566fe3bab921c09091152592f6bb7bd951eb960708167d08fc60c40563173c45a76188871c696ce5585dbc66c65906d1c30f1be660ee2560dd6730fa4ac1b0cacb9fc05a17fbbea5d47e1eba4999f964ad5b88f874655b59cfacd4c36b818d96822f56058abd8ca410456c7af21d99462df2a596e235708b49c595eb94eac7573ff3a49697ce2a18d1c318e2340daaeb3475826b896ccff7a233709656603e1fb143844f26fb42a8b3803fc87b0e870632796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"""),
-                    xeh("""
-d746c132b3940573e9dd81e355b4154e076d40bc7f84637981d39a1375b4b51f73aaa3e69bffbfe7dc06eacc4d80f96a5a89d8d682635b0ec84b2ef60f08cb6e29ec7b8c4aadd9e3f22851fafebfb22f7d6a78a85245337a9c8f64e94d73d2a20c39efe83532b96210b7439c39cfe6c5c7ea5badc2838fbaf8c31ea91484ecf476a2c46d52678e0752f9d011c38e702ec0f866e6da2acc91b4f2ad8b09a9f2cbdb7668ec16c62d584e6a5e8a6c7ab3b6e387e67649f402e706ef89f07e231eb0614339cfd389be92e2da2021613a38b6dafe4cb35c8af8462cf1b620f120ae07e7e97ccceea635f685ed28082a63591272426006107beb094ea22142e12d22f5f34ccbc72d444ccc26a3f1aa828f1de50a47f97fae14b6c77435b3127d248574a9a991b0d2311e334477a8e63d3524fa1d832b3308902cf0ec8826df24cfeed36b4dcc7c28ddfe4a1c85c13c87dbbfabbc16a36364d365c7a549ec92743f1eda2aeeb933be4179975a97ab436808d63b1f82e9cca1f7586369c23027ff45b66932798b31c1f06f0e001b47f59f6d66e182038620bbbf647b1003b3f57900dbff42fd0c9b73346a2f8d1168ff709e12c9e297315b084a60691d7846d3c881be21e9a38cd1a84454b848d4147242b0cc38562990ad4a52ba51d461090628af98fc5d3c66ed3144b420f639598261e947aced555e33dbd61433e1314145f9147b397e46dda0465a75782c40ebea2cf20afa74678cd9682568787a0dcd79318aa37da264d09af928d6c27127638c8e6b1d202cfe6f96a8f37367d5c275d6a5860ea2c2cf600d9f75c42756e36c4a32cac23c78ace15688f5f4d3fe9553b264bf29f09f2d8e5cecb1a7b775b69c10c66169435d238beff7b5efdd079a04202fe6c2ad0cf59309ee28d67591b62e763e634775f88171abeb7e607b6bf87adecb75c1306efd0c0f02307663a76b2e56b7c14ac40e6dcd180d778a0244fadd14ee68b23f13eeb6b7495edfb42529e61567b76c7fcc9fc2f8ca0b85e647481456edbef8305b6032f2afaf2863b4de0bf9f3e7279e6e4dc468291ba2ebd4be7dd0e1ede6918d9fa7e60017e88d2a982073c131da47a76b59604989854dc4663bb70bb42da22a1c15bc9dd7d0e856261195c2e726c72ae055fb4245a2702c2b63cdd3238ca040800631ff7f48ad62ef611042842d1ac379f51f6811f8d95b6f1f618962f2421d4eed7b8d42e6d942c62492adf6bc9a586ac4a3a4336490aafb115df5646bb3c69097e33a5771207eaefb5588741cc3e7bd92e123cf9e8ccc0f9db5ea2d4580a82baa36930a86865cda996dbddcb626edd51a698c352b834f0a198e0d8abec074287b0ff5516e1416590d889b61a4e1668d00ab94d5df6b57c834488a4f13b802abfe3eb507214081452ab04e528c9305752a72090673b1168ea70329749c07fc83ff1d1bd7b92ecc65212fd8c6bd972f3159c04e78e1f94ea0b70806e499dbad1915bf85311ded1df041fc0924d461d30c358d7f4819d1425afc0739f76566""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-d44c7828421af9298976b2c4cf623bb149a5bc26a2c9c451b270294ae97422277547c09eaca491ac6ab4d793747d1106b0b9a6e5e2cbac9a69e1aa6f2c2691b6db3448fb8ca79226f3c477318504302a34975c8bc8407ac9fb4bf1ab0c99370c319801b20177ca5561c2ab0000133792abb7ee81a76c0b9d870c6e96c40963ac9b2ce230f8b3b365765ea07b45b80b8b2d70624c3acd6491170e94bfaabac2f9274d4df0b1edec5bc213b3c9f3b507e14360804e51f28d2c9c6a46a6810f47ccf09956fa361fbcb5be19d3c921d707b5948a39682443401f4f13a259982f73887fce1a522d21670ba2a3e1987912319a6c32b0b2444009064c30f2bdcbb93563e135738865c30a749347c55d69357df88ccb22bdd2d004f6a730c7950aefd5039870a9dd203b1458aa39e0a4a5a4b460048861b6a189d89240c59da830a9881365fb2b800cdc01775b61d4e35dde4b0d0b4a49813796f773134004841540cd3aeb31c6f6ad0390cf57d5bde23a5117640300dc7077287c4257566ab29bc736c0201b63636568fb2cb642f64cb7eaa24ebbcbdd2a424ff2b595972af3f5cc6c6789a88154dce59787331e6fa98a1ba53c0927c9ef859ded2b6c9c5a316a7291865452735c18cb575d49b1cf0c2012f9f0ab8eb85e3428a1d59375bb740d4868c7cdd5843128815ae592cf2a329c51c819868745203547b012410a26e3d2b0ab4905317351cfb6233da8c05cb88cd353abd84820cbe25c56c504ab4ab78f9777e74051ae222dd6c56529b56515f77a48a9a069c65785339d05baa517d97c3d40737fe07d2229330d3719422a619cc189ab72b7ac496510432a6ce3ced0eb47d4b908d8fba18aa3b60de06fb23b9534ab4c07141f7cd1c440b0734de911bcb2b48d71afd9418f0a446361071eab130756f0cad5452690b5ad61b0988ce91d2c415a621061d9104cbf3a9c1ee684a2e2432fa8c49e59129be3b72d23934520ca59ea83dd11ab51c57b338408143962620c50e6499bede76d3307be180640f3648325dbba887539aaea5fc44a16073c1dc113c587e522be274ba69b80eaeaa61d69074a96ca9faa0299048add04b9bf9948b8a3be4860cc64b30b7346019fbb61f07850b5591ffad7c2b7118b0adb9ecaa00a1dea3f40bba75c5168aab405fd8b4911d11b01f3c1a997cc35f15dc0a4863e611239abc22b774a9ed81f695879519cb995e27daeb793efc5247e6b0956fc444ab8832c980857a951b139a11b444b338531cfe72b6c66ada8268680e7147a67a9293b8a91d6b1cfa0ad7b7788d17977420b09b5db6142f0997db61f33637a16394202056df3930072e30cda7a7ed60c7b362b113105be60b713c525484a482f6ea2897bb7552f473a0bba354bea3688450218f25163b32fbc7a17d8e348107305246337c6e344c131789829a110373ac83605e24666e308785fc64975b50910791b40563ed141ca2e8154dd879495a26b9de249c58100eba91398a67ed41475c43c7593a7402bb88893b919e6d147995897602c729da851ecacc6d7b67a0aa278b635453080371e302b9a131af18520b47c294a44180a0caf2db37638d4c7f8270b9940b7a452a01dc0bcb9fa4ae0c659600c29817b4e10241e9fe717ba2cbab8ec2b959a255bb414a2571cdaeaba0db244af9405aa870deef7491b1c5fead4652599c1dacaa309535a073144e5273e932a1877bc2bd3b9125ba658feacc6de45092229bc84a94ba3f5c8bdb37849b5372c205f7bd2588cbb47b87779b004309a0b713cf428bd3083b0d6622b1826446925922b293db9747027b587a7677079cc1871a8a5016c6c04bc5576ccab31a2a0b4a7b1b852319c41f4b7855c2451c27454038515b9876d6fa11820c2c024408735837264148ff7d6062570732d3a4da3a27752f60dc2c93ff7d91607c70a13442fe4929184fb9cc4e33c1684660e1a1f6b575ff35b449c14527352c134a11a155cafeb214d12854753f54bb1a342ebb918acaa17d882074467b475976ea080bd23b256c477a0acf56fc3d9ba9b34297e71cdc37733a3d66f11942017bb8c16229a23c196de8b8411336742328ad6dc5d4ba77108342d6847abde81a4e1a4b9cb8023a1d442e245186d155e9fa0653fc4a6668691e146a6c729507c2589ac12702b08142b9745b2774cc0c44fba928f42381ca7a82d98c3b445bca7e343b0b1334a03485494a3b6661613009201961551ef9c38a2f7cfd46ba9f906c19c59386af69ce0003fdf03c880d482ecd206a0e96f54c28160064d6caa31e2902c7eb03d5f0979262591cf498d51175212aa482045121fb30f18c2274525205d7c746225c920e62c88570a3fe23731c49cdee65afc965883fbcdaf2306344c32d46b403ce050582345e5c0cfb2d08d0018cc33d1acfea146de85c1e93a3a015a1cd9c7580bb1583afa73c175645581c59a801952643da86001f065bfe6bc1d94d510bf3a0a0268a77babb675f74ae426934be0c64b115e3dfbbd2e98632fdc840f3336f31698453641a18b667579ad112490b452c8b7b9bc7086bb19e483453c4007dcb556b013801729ae23924298bac6f8c59e3ca971bca2474323cf636aa02b008fa08d56a500af032801e3157f29505fd93cf3791a210498405813d612858f503857a0300d672414bcb7b98868d0d156935b1921620bbe262223f43f3d906e6bec23235441da41415f050523b3617bd57184719ec9c92ee2b6bb4bf6427d7045c01176723c1283dbcd82782476fb9237f96b7d13697ab710291683b2953dcb9b8ff0cc0cd99a33b5fc54f6d07edac2462beac952848aa6ecacf71a656ef9b2506585665a0fa4b8c74701868070beca33556f12c0be64caefe6a1e2e271e8470c5867852abab93ed925f3837e9dcc04440607a34c4299a44e2a537bea16b8da07187278ae672509d53aad998b0de88a7605c99c1fc36edbbba10884ada971813e64815adac6641630635a73336c44a3e673ac24ad41e85697859f257a2781b95ad9e27c5ce39470ba246bfc3e0dda46260939647355d0024aa21b2063b19967eb7d7a65118f6cada035053374812b995977eb6cf1238e5520b6ceb67f261293dc9ab205c5c548213730585ddcb3b6a0d0b164f9546d079d3ae00079f6abb170603528991d71389f9113c08434d481808a823feb372437975b5624590c183c131507b2894b6a15ba6ac18b7d1a5ff0d16ed0ec41e214c1d055226b4b0063059a7486088fcf467cb1580a201b23912e571b6523869522bfa4dff5fb95aeb9fff2ae41b26e9f4a0c89217af42c53174292774edf2b4d334aecad2ae1838f6b7927d8c92060d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"""),
-                    xeh("""
-086f65f0cab0b99ae1bb3c2ce201813dadc0b42886de6f834962d0b0f556ddb4e83ae7c9e85d6b2eaa9f9c630a95ecf30fb88a00e0dd473053738838980d24e3c94e751df4cf8026b38e81a72ae86bcabce780273e00f3e5b821c1758f9eeb5ddf61e4cf878faabca05fca24b8735d3ac03c1206cf9155e7ac758069f48eee8b3767b48bf22721ef43394df758066e657d2baf6797e6f489469393754b22d702fd85e4cbf635500bf3cfc448a535eff7f6a2f5d9f0cbebc1e364a4a37a11f4f209a59fe109b3b07ea354c671f1f5a5cc4ac37d18184b4e487ae59ef8dae1efd296100d0c059cbce1b2342914863cd5a86b17442c616d8110f1f6c58788ca7c74970a9aa7acbb8826a1dabb80916d7f8d0c8f1dd07cdabb898cd79c64adf7dc6475e7a1d6994364ead883d520a6bc67fdd7fbdd0a2c151586c09084c6e7cf63af35bda610fe2b393d2df26b2234d7a8bda45732632d7d705ec7d76ae77e4f3536571e587cfa029a758911aeb657aa638ccbc9ffd1ad76a4af195d483cab979c3fde5180761989fa347ea8fb9fc7cec768e5e48e74604317504f7c402e44ba4281b09a0925e7a6389ff5cac489cf0beccbb8c5d6c2a45c671320b177b465148782edd926f1596d177e0710cac012d742d5d9de53ebd5aaab0a7c66499a27ce5a896ee605547296639a067762787cdca8d2147c47e53501ca453ddbe82be5691edc94df900bca5f3ff49d7a6186bf803f91cb3006ee8dc93afd3596d71beaa477afa91c6bcd43272598c887e8fa190dc898f85309720e5381ae27a15c8dad038e388e2b45c895cb64c2b6a0547867ac33d4338cf25ab834d17d4d657066408c75e146e442cd0d4305a31bf43cc20fce7b74d0edeb820cd83dc1895e12d1c254c1a9bb6f266d069ff867c4e86181622561649601635d260e868cbdbd5cef6334cea88b692f7616b0328633fb6e7e5cf94f130d090d31b61a1b31c7411c78001ed8aa6b569e42c465a60ffd94610f61ec8edbb8f86db60b99deb2cfa8660a3129eb654d775a4cd04287e4990e48f65db3c7821aed88021734ee3393582c425c2f0299907ffdd6891b7517d16203776c0c95a6a0c4100b7c358013598467af2320a8618e0f29744f519ee6d401f0eb742ccac23d23b0c985a5472cb9a4582a325abf00b6f0c1a88f3022617b75b8a20335cd2b38da0bc8c3d85340dfc85d15623c6a8ee3cb955ec6d1b4b01bea20e85353f8daacc821a40866d5590ef1ad289ed2c8c4f4e2213b395bf9758b6ad9fb44eec1515ef73a5316093f4893177761b4d0c5e43443c5a128dc2f79d6108e1540b20228c4058a4e2180fd02eae9127294567adfad6b7a393c915be347fa293d6eb68e18557bd89c19cf80f003eaa761a94783a731926fd69df099aa0a081747ea01e91a881e07df083c1781cc2607c2ebdd867d52d8ff276802c653dcc497535c96bcb6a16425adff31fe8611c55f598575e72ca06e0229f92f57b129fbd7f6a33c4716763bca05102b74afa9082eb03492f91c""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-337a1214847b4e068928d41e57d48b75296989f7b093760518b160b21515dec6aab4ac6ead05bdb5252e84f6a1ac02528efc6b87491f881ba1233b6d4fccbdaf6691b8c1883fa7bd47b1b9f2440811cc08763345cd6433d8bac1e0975d854b9f0b219d44fa19636616788b3e104a4b7ed32b80161a57e9452f5c3257c1b31663c54df544dd47b8477374e6618670d37cad3c4820910f88e870971555ca664b63409c8da2aeb7f78e52fb5bdff17d0862bc042bc6ad2a54d6d2292b4ca0d5859510c74536c605d78755d383993981aadd947682d3c6e33c1415725dd2c3730edc040b676422a8a88e33be28323e39acb2678a561fba2594d2244e7c73ab5c181050264da26159f6ce627a9e04f53fbfa5b7e5e116189c0606b315c1293949824429f340b5826eb3674333d7c62d5a2e7a9a5d0fe7bcb7f48eb39712dd53b691f62d67179f84f2848e9b2fd140115bfb9f8df6cdf05cc2f808b50b5470e1089aca044b8074ccbde39708fb2188e8352611a298d59b44680417dc35ddc93dc5a709fdc553d3e95987c1b149251d56c11d59c845eec726da222e2966886d33969885209e8972e26113a9634ac367a3fccc74007d7061e34fc939cf7f354d3465083ee143356a664d58a4c2897c77909d0f23929a2247f36c2f0f792654167a97d75aa93b1b13543e3e8591cfd29deaf56a5974c93bf165c73873db956619d6a982285084bc7cf2c4b58681a6e6913333595a07315f15d79ba0b27d590a146dc3b55354443ed74e524c2b486984e2e06622b0a00bacb8f654a205faa67a77609d89a1c12538c2f6cf6e019d11b54db176b9cdd3382c999a61a81e16126eeaca5320c44f44e77ed20117556b0929d538759619a8b57688c685bfdb8f918b0064029047d2043f2398f9539610302463a7b7bf436f58a8112cf1bcaaebcc19e94d0c3a8a53651d08b0782eb138d9741f8891b069e0b38fb24336d8a6cd1439f53b7b259c2eef718857112d9290ae9e402e8b5150cefa7496f224dba899abea69826490bc024b0dc080e5dab3a1a767ae3a22e49961a91257b80a04fa6aa48f3428e6041d6d64507c322b866899cf26adf5c48735dbc74f667d1e836447751a0da66e29548cae37a6f7c5aab572abc4e67bd58cbb5c65c2e41acf01b82019fc6c75f2931161cbbac2916250bc5472ccf7655b45d78402973da4c01b66134687f3b51349869bccb8cf4021c560209b184da65cba0928b01c45293f0b5e937b8cb6ec4a7e7a9c54a3b26d81c0fed81f18b764e639b0cca22824d09b90089995aaa2c9584f34a76d44e1092ad6cc6e99b4a6b43d58dc28a6c276f2140bebb9065ac6ad296a47cbd20df07a3cfc58556228b2bea47b19fc4646363ce4cc6bd286b912a608603bc2ac5a43eac45ff272be155969dbc764e630c0ab83197060caad34bd22b24beb25b2e7ac688ea552e8513b6422b9825112f39779dec761b92b391782bb239c99957a127352b68d77c55c013eaedc39efea650a7a214f0a8e55dc2848f84e792310aac629f6b2473a9b42783c6f870a33a197397e95652df3b646c3a9a2569d4dd333b7c62b7c7ba9198c2ba4c1110ef182c9ac645262b23ae8760753c4b88b55425144a91075cd90b31f9696fa1c326a8886765ccd67e119ddfaa185e292131128dd466206d9b4fc62250c6892be09bd6d379e88a86204226aa9449cb1f39efe58021154130e630ef70735ec57cf4f2acb93ec4434c4cd31f1a4fe798aeb50708cf90e5257991a09bdd3963f2fca8292c17f870a4f5af4cf682583ec953f1321b68f90722387136ad46d81e6a44080784b19cb975630116817e81b48051518ede43acdd9b9eab02dd481b200e3093dbb46228cc30d222c81514d1bf319bb239aa8db631f0849654285fa513b81149c19473b43caafd2115939464207076a11b7c6445a9837fcb6fea0930a321a22320658334d958a98c8921e6bea31b53b3d0912cf737c7b08022b0413bf27504eaaec33c7b8bce11427be219b945668baacb1c6e238a0a57b59d48477218db93b28860132647bcd69e8c62712a4abea8316c42e121201fb4a37e0d942464ac4e0c79805d3c61054a7e897809f37295e04ce42464d3096a388ea0b6ff5c04f3c665291012a5c4dd2cbc08d0996054a52d0a26d153aa54eb5a8ce66675bfcb657f0c952f273c5899fba9a01aef2b8934386d6695471dbac20a2b5936847da5b419ee5c34c4b100c36135ee1ca83b0990b7c405570321209a288d284e4bc7e56809591209d07050a39e629b3280574065d0f102788325b0b5b14d1fbcf2ddc0dcb6c9aa959ae2d2b7c011013814a3971d16b4d2c3480aa4c1eb135736c0d70829dea14ac862b46e9267f392ac8f1a2304b7125d7b08ed0839c61b4c02253045c2435990bc1b6d4c27244035a763d63e8ca6291390c417ee0e9beb805915dd737d68530ff27c943a39da835c49d99c0b6c50a770906aac0a5ba988e650caed744066c7a131eb050678837a3fa9b39379ef9e9283e2b0deacabf1b833b358a1a9f1c78bbf20498b9702b259ea5bb1d58844df66519c1bb0323a4b3f4866ae5ca703e6680de0253fc659b9491ae70d307f5aa4c2c888295b9122be209fda3a5a911959f6a9f0c550a3978991737a76ef408c27ccaac7443da67bfa76a79fbbc65ea72b3abb96b2b048ecd4116291852c568b59bfaaa9531524e36644112a76a809f9d0683a7d04a35cc4729017d70f5b1bb76b74b618cc9e181aadc8eb4ba5973a560c0f55dd1681ce91ca3e8e2275c8c71e5a536c7988200b5646afba80fe0c902e86d990a2ae91750409a5ea09645fa5521360051271ac6bc569b6d155fe8a379a418cfd000431cdba989872f73e2771e0b498e9698f0006050b5a06501a4b705434046aff69cc961077454795a6b3184f3ab402a22a819a24ca856c6a9e01d475c76aa7c71bfb692b182bb184b95b0fa363b76a93c7238a41661226c408218576b175e4084ca1d68b3edf79db991107bc106d103b7fa682189ba9f67c21865f2b88de32c6c757bf343b9b15b10e0a792dd3657e3d85be3dc5c3c52650425c8c62a735da286ecaa9aa15054f5245b3b514ef2c309dac712403a9d2999add6e351caacbd80a68995d67fe094a5c542994a88376397a7a15ccf1a9575e20b6a7b5c40c3c9739b02a53ed5abbc502ab66243c304b74fe27fb7ba7348b3a23cd65ad515755744839616a2e87120cb0a1e4f30ce7a6a2fa2488649dacd86c2e5fcd0162d826fb1e6adb4e0d9cd0d417b6e13a9ab1fd3fa49ecded0d3a19da325bac1a7b566823256fd56cc6b3a3696c752c98d221b9486c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"""),
-                    xeh("""
-df7636e15fc4dc76d7e29df36ec563fc89a4698147ee234b22cc444c389126bc96d2ce9c972fc6069cd53f83e2d4990fe1974e56fb71b3a6051c4841e0b9058abd922a9991fe7ac05fc9a84bfb04487e7d6b4bbfab626a8ae016319af35d498ad76ba40ce005a4392c2900a716d16cad3fe32c80a7648de0ddacbe00f6ba77a1b7d9963772c1a08a8b1f367a48f59533a0fb64e40bb9b1eb6d855d2dfca71559eaec8105e5d8150489ad8b58774c6eea083f37fbdb6ee4c2ed4eb7042eb656e4992613cc467363571bc2462d260b793664058b723af3eba417da947b8003482665e8bc16045bf3f7f6c1f3014cc15b53053ec1bdb450df8aaaa7761eb06aba76117fe6c68dd9a138ec9d6b48551ed911e931e384d186953d180f3dd484e37dac5355fb922de719c8e2660b490f903a7d40464ce7058b322977063392415a8558d97cda6d576fafcb9df2f64b3e7b8387ee99fb39dc603a717e6411b7cbe812b4afa69bb8c096d2217d146b79dd30fe285b2426f3a44240982de43ee6383940ffbfef3323bd7a9eac6c0cfb4ef222288baa0361246888911d91b4b6b76d21ea11dd80a36b12381b31d1305842262437c97e501cb9fcab443ec26ddd18597170f2827b5b1840a94ff76f0a9c52d57d9adff6b522df25fc7797335844fa90901502878d6bb89b0beb7da8365d6127d453cbd7cffe728d477fad58633ab3ff9cda39a84cd5664662c2d4a3715c3ba00b390b8fdcc1b6ffe6d4f5a70d0191630d2e4e2ef1d499521aab477596d0c8ac3110a37b018dd616af42f39c06e862fa5804522603ac1d6beae7d68fd6b4995fc6479b5ca9a8009208775b4ff90c613a47563554cb2868e17929ddb722786251658ae59e643226fbce24178cf44f534e55ee0853bf7ae8c6d2074af6c10697ebfbc14c25b80105d32a98c88ab81545c5ff80e94564f223d72165b975b96d68986d4861fdbe94e2ad7a39cdd1de612c4426bb6e17c22cfdc9dbde43187f009f8d85bf30408731ae68afb69d08150f63d4ec4d4493e6a5f4cbb350b935101cf8d43136c7df534614272ffed99a686823cfca16758ad5349d0db3ebe3a63bec25615f5f2c0000a8f9d2150aa4478119603b151fad12c582490be381944b52670c0e10e18a4db0fb44c463e14f71f7cb7182c5d58692edd26ecf3fb40e2b42a4d4f79e3044fe11a85a87703e8b1606b7940ea0cf57067f28a1c99430f7220fb5be10833040ec9e1bffbda6e791d3c200f6a83a271ad1eb164f046a4184c9168af5ee6b5497d7372bdd1199f1d684a912c45ac70bbca360c1ed65c433dbf2cc2ef2e0a94be79c581fb6b31f6d43acc43ebd8e8e62e7b8ce5128aab3f20cba3df5e433b5b64dcbbacffc7b0858184834d42412c09cc6f68499a7792e8471501fda7eb07f3c0f7fba7bf3ff6dee1435269e20ce5da5577dbe68a0869b211c9fce3e8d456fe661e5710fa964c9ac304c28b7d84b0063e175bb4de4fb6859a2a30fa4b15e5d4bdbe6241760829584c594c201b65312011c""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-dffb727bba946a7a3a4066a2b14c31225806cec0a9f685a1d5d9a4ebbb4b98245dbd7a7303f13254302d7f428dfcc702c3b85780fb1a962529c0607461bc84269ac640f0a3741a342c960050940f06674dc4c449709a13449b190a28c8b89678df4924fe8288e7c37788e368b8c3a202db001cc56f70d7003bd6ca96c5114b28b19b13957231508ccc266ecac54f69120c76ab71bc9a1de3b9ad4c8b9c4c092845306ec68d46d077eaabac99e30d2133014d6061a507a0b1a4be09dcacfdf0cacdb24d612badd31cab6d710cd703b18b695a0d65caf440c735511cf6499288e45baa00cbbd904e629b8ffa40aad3799a5dbcaea9d3073a2b47a7502d2e53318168395576a65fd0c6639c9a513a87065c6657f822853a40ab25abb33a1fb834a14e2469c9d1a06127b4be271a09f7c70a948897729a93451ee67ac7834c05c44862bc291a89a7c27b829e7ce585cf4538d75c98c6e7975f62c3f0120a462cc93922156015b8f8615808c9ac8011c7282937ee3620e379c1227208fc2690030b46c71a6b08cb75f34347462763fb1c16ac23c7c37cc0f538584cc9b19be520f7b8186f1cba050c8da4d9576ae60c83d19563f620f50c0135a485a10425de995ec95b919443b1b7d87a27c3ad8046290a6677d3c8391be43f7ba4b46cdaa0431477ee94678f94a224ba1435b01b62444815022f9037a307054934640443207b0521ae9c9b0b4c1067da3151a30323bc5086cdc11ad549515b7b1455cacb3edcc4765b69aef4ab35094436a40b27d018b5fc77dcf951ebd214a72508fc554648679c9ee8089286635c45864ae591be1b5e8e981577a10ec7412273924a005b3219c7682e3c0671a975c463755e9941025b4b5a6cbbef5bb351a10ae38c5c19d113b13a8c11b36c40eb18a7b2ae2ad748ddc80e9ae011157c3c8c4041d0b2713156ac24a50e770b60c87a0d438a8b4570990993900d35421fa47f8283a9d4b9abbd0c5bb1ec02c0d9967ebab566e0a1a916cfa1ea52c7f9aed2152b852500a7581fe3fb4ec1b22b825c4af329abe6db87b2858d605459bf89bbe2580fb2e055387c6c33929ec0c60f269a6ca51c2323686c73e280aaa8138f8b2cea4cc27efb644c17b6cc646ba863aab91bb5dda711292a09257997f24a18b653910122965e873b09325ffee4b802da084c31a28fa6ce83da615b230cf1c11e16d9384be526e520c0e96059fc25653caa51a28657f96921f69c9f64f86805938166e03a81601b1f51a13eaaaaeaf420f83808429119fe017d9198915a6753cb35942f20b6ddac2e566b7d29b974ea96262f2a092a12592a73c383dc774cf6ae386200581a093abb9d7d5bc7d1fc694a909965c987dfd6b502fca685a6431fbaaeb85087c72a5dd4484e81b556b357b52fb76d234a24ec4991ec5863b66b7a09000e3b5804b575a5d06a0d60806e7b310e7804aaacf37d86e4c013f692d7f70912a1941ea0a7aeb5130ab43b3eb93b0e56c5cb242542b1bc3e9c9270b71fcf4028981ba7d9b60c3a6081731407acf2274021b607672528bb47afc2b39fe097f5c12f32c0c744961117212307525ab2e7a8f5f5302f2b90bceb84436a34b77cb1cae82fd6c63a44bb7312229f38375f8f405bdd3bc19ad9180367aba6988e0276031469512a6514a43902c6d66c06a236f247b077323d5bc1342c93ad1c0638f0b31aecc4a0980a543e488a39e726eceb54d1f807ce3aa556700842f1b2033871d2036ecc567f244c988242641c2aac1e31322cd08d2f95c5d559ba2328808618c5c6d8b49ca64c45082bca908dc5a75cffb1368c82cce0ca1bdd65128e3782d306829d608c2d40cd67e6ad09e79f39dbb6d9e41db559218c8263d1f6a8d4441f465a6e05510208b00522a9a6a77cae073817d99a40f1e84f4224289700a173c415095c7d35a32554678ee8087934c79943c7afdc40141a4810e94602d16c77cb80a2af5363f4444a9c32bfb8bc11e97c0d75435db0e70608dc95d85b70746263cf8c4def024a303807bb6640bee4176142c1be417aead89dcfba17eb319add262441a0c451847dd9e93dcae7c2e9c04f67c098123699df6c39dc90278362558df092c7292364c6c34cd0be104734fb1aca5282bcadc563ac571c8394b6fdeb9372081277b2987f3a26d0a812170303ca09218e842c1d2b886095bb25700e021abf45710550c4851fab4f7968460972144c1b6496f4465a0ab28478b1662b900353ca3fec6ab2c060d64caba43548c28654e1a38da32731d551b9ed03376c01be6466c74d44ce1aba9c2cc694db99cf1b09bc785ac5f0603c0248b352a69599e6b9225c887ec045a1708d73c263fea1bcc3782fd1ba1907064293fc4aced3604fd13c9d831323900f101534454bc7ff071372eba94db771dce7ab21e367925ca77bc3825db071e0f8cf207b2ca519bae8a2625c6b7b593888427a32462c0e98f009eab7b4bc151e7b727b6ba93ed0b686854026418272987069af29712c0c002e1304fa10071147ac1c6b4bbcd3232027ae2a0381a31812fb548360aa45bbbc711a7106c600af77535c51c85aafdbadf8ca6fb2c66bf66cb8856596b292490889a9b079c27d322ecbd34dcd8c2e637a7337eaaccf9c0654f748f73a6bc2921f36e1c6e662456aa66c55642c511c8376868a1a5c829da22e92e9a9af2b6ce7207bc7f94281c46eb76ab742c8ad0374973b36157018b9ba221afa3a3fd80601e85668391b97bfb30912038867b260ffc84c7fa054c0cb1f53d337b2f680d6f627093a21f7c6a065d276279bc83b759ae035288362b63b598e1611a21ae65c62f12948554cfe23bbf282702f87b540248219548fb0c363d19b9aa387353aec231965561397c3b4a41199615f02a27d7a5a6a8a93258b4466f389cd07a5ced1e75306d774c79c0b7b591fa5eb06b544bd4b751a3262481b300d1947a256f5c1a290c4eae87d0cb4b843441ef9f02ebc1100069b696c8ccbfa0958fb4551706306cb5c4d1e417a694718cf0a1e8337067a1a3c7981b81b868c8ebb71d956967e904f82c52f8a0865c05698f0e673ebe48c332293600986967559d9851bf75540cf7704dc35559b024298986d2f612a1ec18ff7f2ce1634482bf626939812c346174134ab65cc0bb7487e87d09ff7965f35a9474416c90a978bf29a5c3150bfa6745289473b485b7650ba78699b843e40c52ab380042cb3533ba8b640295faca956b0556a30be2b624942c97068f9d55db7c2d1acf9cf002c9ea2d973d79a050ba26ae235207358d083e310abc910d1bad823383a5154c8b9ceb2e525dcdc6e0a0eb8cdf10603a6185a3631d4ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"""),
-                    xeh("""
-03788c19316364d84eae260acedabd726bed19087292fa3e1a00098d0e2d83f0001d7595ed9f43af93b801d06a1902ae53dc57bb9a6876c195473092bf794e390556ac245a5b8c25ff873d98f9736c2098852fe7aecba0264c080d9a94b353827f9eb6022e184a4825d708c64b4516b43de8badb525a1c97b2a449c9f0ec09908bef2904f609cc94728b7083d0c522bfc17f8d16b223ea19f494eaa917558e8c885c3409ea091cf7abfd250f3fd4d7d5ea41cdabe560bd2499cdced93e9bafc80fe740c43d6ef8eadd853785e6f3333bf1490e72191f139a591d08b68980f7ce8bbd4ef1a89c58ca403812f6b099ca5d9e1b80e4cb3be036b724142a90038abd5a9588e4540f8f0531714a039e9eae4b20b4fd7edc391fb366a1a2171d24bd627d9af4cd0da0b49e743d521b4d9c57f4bf82d3aeb1d0d58eb32f529587534e2ab9387bedb33feeabb68fcfe34b9e24758ec825060a1271639876ee6fe3295bc6c944d43ac028b6fcee8d127a2d54661bb2c2e91e4aee79bf7a122ed32c2ef6fc20ea01168af4a3e0d1ffb14d86682a9d7b450bf0d3c36af16f488c7d5cf0c3d6a02b0e88b85d2f92e6632df585bb4d3e2a7686447949db152ddad5a1266284fc1c37767d2a4d964dd1dacebec917bf84e92e7498cec4342e180510108acbac38b8beebde7271faf0a74cbfeb66241c6b27753135989e1f4c16cb062273c21666d5b1d68e34fdc1c34354c539d52f2de1d9c8b80b16a9065479e78406e766fcecb04017c31a2a31f7649f32315bdc6ffe2832f7aba29a76066df4fe473f47489ec783e36f591b607f5d93048bf48f54908cc645ee3f727c08549db2b07200d0ab3d7b31961418ee46dc954f493efa33296e722c72e4b69ae9c224b8b4ad9117f4aaa2c29578f8c20c95b3218f6970294064f9cc03b874a8c0907e232874164d4b8d8e1a573a2a894a3f8b5844e94a731daa17ad0d4c68443ea8d7a12fc74c7d930bdc9da13b322d2c12267a245d5c86456dfbd353f244f383324533ceb6ecb67552f9a9186bad91cce2c06ef328fc16159dda99984e03e624f8557db1dea2a42257e02c820939d1ff744fa6becadf1df969495411e141eecebad74201a81dcbb9ad80fd2ee2cdd2a34656d599cad9a62a96e83d10d6dbd1f2f0d6725f0c268627c6c6df9ae95cd972ab4e75277d47dd7e97a56a61ee3c75220c733b739ae941fea7e992c4513444aa6144eaefca06e26f998a503f33ee9840a66c0b4f0f305d55875a61c30156af670dfb236c32675d8ec124ef78e668abc8bfd20793f9b4a706de79733e4af44dcc003e55981f912fe43b298c46575aade5db5501582ecfd7314d4f62f9decace0b2992b17a0ae2c0c33e51cf4c25a93fc72cca2ab17125be2a781adcc8f686455a5bb0d328808bfe3273657c59aced7a486ed08ebb1427106d47278b058773be9bca944caccbece003b812846c81464de46cf2fd495e2edba200f92397d4c42565671ea688609267355287206d341213fa544ecdd0e4a900f7""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-e9f8ce5f78cfd9f8bcc28488b4fc383bc2433228019c49827382628b9c77bfa29035cac08802594704bee56911d587b71b351e6e1c1bd9dc1b44aa876f25c7e9d4811359631993c0aa31214960adf186ad50f10b933b46197b365c631a5803c502875e00a364f60c179086a9164b3106687752b017771a2b1c702cbd457a113abcc380020b427e7ca04523965a1f797f5675721c588e17a812f1d96b1a272b290479c78612f1987ddc9818ffe53a4921c71f9325cba7c975d392dadc18f174aee598286ffa29f0412a21fb96d7e0776708ccdc615ed4d87145425992ba8c77709ca4495de1b75de367c704654c0f1b391d766101f65535ebc9a8e4795402ceaf06a0328240713565070552adf02749964cf851ab2f2b37162b52d260a556634ff26b22b3aa28745624f74139fbb1ac976b1fb54b7590632ff7150de75ba0d6507bd8f029056232a73493dcfc70582126f2c7933b919172d465ce1acbdc3c8a2a372b13b6813df686c495b915c8a7bc089abf732b7bc38f7d6a15e07022df5922a801c943364f942b43eac13930d3c827b8a5b0fbab35e62391204ca333648a21b13c01abcfe8800b4593b52a0560373059678a8d645267a9c74d98a2c2bb94940137ae68a1e441c4fa30a7cf1433774762501b588a07ae98c493e4b9003133a441acc50c4ac6b69c7eccd1c84729693d097280338c133b91c4531b812a40e5c31ba41a436a71cdd07813f5a8bf85142c4c03a6a9f338a5b1caae9422f8f30e523c34b4741937a9b0037b39bd4731d73a97cfda20bd3534db05bffe4b4ac879cd50c758035c3f912467a83c9d071184c43bb525483a4f0575da39b11c6b942479b56c413d54aa3c455aab2e5287768c7195221caa13512174a4ee7164e0eb3c0d32417470a388da4013f51c00e31d87452d7855541d2846d53a0446921412fb4a7e492e9c0637bad68f33ab424b0898645b824c996f40133dcb73a9cc95472ab067b32b20b939ba3d9265154b114a8b20fde59e7dc5b0af6092f90b93630ca416f0b648ec0c4d5711d652a2375243ee76804b3a63382a2aa260a99b11782ca88ddfa5cd8658b1f2baba58405ba2fb46ddb113373cbadb737f34f6bcae676ce1b659ad57bffe64c79b648ee44552a051296b839baeb1a20c3777420b4a8a342ad693b23db1a074605f6cb282bb8a360fc2cf5b5ac3d0541832791af9580a1f099d98f5443ab7c246a3a510a84cfbc9a06a57938f5608cdb33725b03d700abaad2c8145732f82d575de539bf66943402c8aa4f9021a144976350f37cc407ed3787079c701cca78c606f31f2bda660c7f75b6407f18b8fb81ddddb7aa013b725fbc1d3b62e2a9988cbf8c443eb8c12a0ab2cf04095c622f2b48c01641df12a940d067c6af0c0a3bc0243bbb30e477af82c18e32695867a9cf18107f0469b9b95111c2a1d3eb40921b155e0f5986e25cd036c85f176850e57289e868d27585b965b721832862e4317de0c7d6db76e657166e4b81b5f57bed27a7e097482e5260be91767a7e7a37649726a8b79b71473cd1a25aae10aa2f480bfa65f4a010595435eec287ea586070b9a5f31f05b72c743288cbfaacacbbc5792ecc6c568ca3438e812772071873b6b97125b613002a38c5bae914cc90630d56673b824a14dd20697f800b13b17769c450a8b0dae472a2b70435643c82b329ca6440e3fd16a23dcba5d859ec8837a49d18f5c61950702846a806318752588f88590f0672fb5cf02f48fc3a8073b50c17dc8ab60c2601ef15ea514cf965a42bd771af7b917cc28a368755771ba3069036f57e1206857159394cf1b9702abfc5df3fc1dcfcbad79f2bcb3b7c9150706eb520a57b547bf217cdc902214c1b58a7c8c585b20ff1242de6525ae10cb857881897319f909870b5a5a732093f17c2172688fb585490307902e1872a4c384624b8b27539e7db3c78c272c14a988f3ab48a2e787a794b83186535970c0d19845b884c5cd427dd5ea699349363c3006656594a48bb22337877917258f0a356a58b0d5da3bd99976dde9357658b1394843c800a2cd1c608877703e3c5ca1f282d8b4b773d1623a39833f393009441c8813698957bb86ec8f4de60a92e0c2e6178e269024ff5896e2475d65854cbe4466b0671684b55490240b158657384b67db1b0b8c0c07422b460d05a1323456ca73cf749a727ad0cb81e1109388af47f321cdd836f008208978430ff1b6aad03163a412f6b93e09bcb6acdb3633b69c47aa5acb004fc7bcc8e3e2a24f949e24d1c23b9346e2c3a32c1791b67cb16f16a96ac58034daae1ca11a838ac0ddd43883976c9ddb799d53abec005b00faa3a15702ac2187d9b13b4e0a3ea8b2c9fc77a1cc23b633f9087c188291c74c9db8622dc03b78f48a35716ab5202cdde6cf3b62464cb87064b7b02a8890af2969c9275adfd28ec6c2940c717c8575a84a5cbbbd983c57183fc2eb1ac35744cda32515c2a66e3c988ed0cdb9e6778e98295f7cca7f283960275ca0222dae433c0035522ca7650606436bd767679b42b4b69912d0553e276f6b6428b7d7ca99b7ba855448e495bc51b1871a627edbf535045b037a698c8833a4696073bbe6740ff222c726c9cc636402c912dc1232b10197b7440490b92ca8e683eb4817a2b866c85a07a38885ba0284da691f99f167e1baa2caf41ad75a7931a43e21a9671bd97a65dc415c03b368d075bab0cd216b9939e4325e1c9c96251d48dc7f064339dc062b4a3777cc24bf01c272d1ca86819027cad3a491600efaf961c815940977074514a022dc40cd503ae778015d3305cd8b04d4c001d410cee5538e9331982ee52fee9857ea5c685b41bf16bc6bd7754dcab4ae99024f69336ddbc42a95079668bb8fccbc6ff66a6b05768d6b83c03c759a2bc6ad2c2205b26b41fdf022da075cf1589d88954ba502875c28ad47c31b857998acc5287da6308f800d53f95797e52d0a29ae4aeb018ee418c4f7cf72696aa286addae756e619aa8121b481ab66f25117970b66e5866b90652190d184669a4def63219c025f02149f287656e0a235cf426c7178ad99c61294a2cbc9e34fe5ea735baa8da8384daf0a13dce458433067b004bc78922c3dcc025e5688b67ab4d7fcbce06756d49772d4ebabd8b94bf07268cee346d252a9161262d38a9f04eacd7bc76a82f477334a0b3c272b4ab84aba7205a1b158319139827b3d219784101456b964929fa96d27d48ab35aa1b6f914c1465ca9548559c9a8d1f7e328029954825a12a8b4f2f4cf320831f0edb16a7359738889b1cf1870ea47583387ef1a1a3f7e78a70c9da0aec4b2d1bd6f4200cc78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"""),
-                    xeh("""
-14b590d4c6aec9d35b258fac481f7fd76aab8734de44fdb50372c7d51a5c89e0eab0492d73a81289b2e144dfc808e57e4c2678d3d10a1174f11c08c67716faaf021a44538a85834cb1ba3185f03db791df8f1c0f2ba3515eaa1ff3d478f457112efee587d47ffbb0296d23153730f74923eac6a51234fa13e8ff0f849672e0e5b6fbc7c10acbbd9e422515cadcbf93709f6cb3b92f81fa4dfb44286752bf430e384058f6f5f0125a13bc7b86c3171cee73de2aeab726af76d8ad62492389fb1f29839938eddecadfcd2168bce9a954d9aa56d99cde981cbe9d33b3aa79f1751030699981ee68f4ff3dc3efa17cf8f93e3dd4b70aa8327358196fc77431f900c7741cf5d9c11bd0659920f2ca5f60e023dcfd6931f6202d9dc0fdec8b835dfef83b99d188935ecc9f4ed03b993bea634ff0fb77f9d2496a5125a3ea541b54f020442151d864ccd3231141a203496fa7a40196e9dc8618dd3a891677d48f1e694097569db4a52081ab1ff1396c3d930d3ee635500675ab1662f68f921b2ab6730de901b23121de37ef9ddd40cf62b13f8f48bd7e4ac2a38ad53f977afe961260de547be03d709e8316c7ea9b5415e48b240f5b97e2600c8d5f2172bc4d10f1a2814f650dd07373ef6da5486621f5131722add069526d3b24e97cfbb8ab5ae5cdfc16d944c524013bc71da81afe1bc9648dd7a5b0f0c509bc0251c08ed15baaf8fb9bd3db9ec006a445ceb115562f5ce1978781e1ee6cde9cd1ea2d5d32be612e7f2d9ee1a94dad192019cc031ef44fe5c1b3de9fd76062faa5f25b5a8da1342addaeaa095ff3295bd5002b7d8a2335a04f1c811d8e7c6cd7f3a43e1e4af1efffab01015256540b9c0b430ee65830fb8d1732c903520319776daccde5b9628416b422a36cfd5708ea263067a064fa753e35f08ec3b2a7a1839d1137b000e7ff2f95ab3484e9f1aee634fc08e217168450b2419955e8260dcb9b386c2e5dacdcdc1de195200e5ed96809bb89754ecff2d02be76226ca99b1be92123ae79a63e8332adfacbcd9adfc04a486b9c4defea6c2887db85e5215db4b32650199361a3fbe20ceaa0d6d578ab6125145d730e78566ff25427718d5a0fcd9c6adfa3db7f23017e5887ea5c4cec213abbf1784f548677ad209cb32c09d478c629e14944d9b4e699196ea771a4549d9b00d7acfb3cca68adddf4945dd63a6f72ba74da32113bd4f8631df7b750fc56ca49059839be96103e9f4266ae7bb7ec257136ef895dbb07ff91a63aaff2a5ea6f8fc35f345c52e0ffdb7e44b82755e80697b9a35c3f34a378c45b99ca31d009d6ebf23f923d27b3a10102e2e82cab80cd52d68f83e908c43e379f15c011e138de668eb2c74928356473cddccc209afacc181a054cdc6085af4933cf1177000abdcb405e9478e05ecf5b3f1a441d0c0069915352bd33a5613fe93eec63b6df41be11ca585b4354311569e866f2c188552bd287520b52b949ba6752e723ba887897787a53eeb114627c08621ba96aa69962abd5917ef33e7e9""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-a52bafa1cc917ba04e1db8b8e4c308863025978b8d048242a744c60b50cf651b7670cb488519815a74b6a0ca7c8b82abdd168e9be479556743e80bca927503aff16714e60962c2c9e93576cdca27336796076568e0b5bef71a7434e532274a500ba9109a8a0b7b771e5643516de322da248334f1cb70d27312242e0fba31d07113d3299b388b3be33b7941721ba36c863849a32425939dfacd4851976bb000e61cbca9c6034267cffd30872462c780785506506b87d270ee0095e88641f877a838b5837c2418a3ea005b2a5fc62c9fd1861a85c152adc63637273a8db69e4b6273f11c6a902b120b6374154b7392b0483a664e36a88e4ac5aeefc2c3f765af3ed68369d5c1c1928cad77227da1c4265062cce00f1cd03b169a782fd48d8cea5c80560af611597e71cba97ba1e163c3fd318d9c904d281a5c75b79b3d1b71f6fa9bf20915c5c148ac441150e63741177cabb720ccc72505f3890f1a2696d672012cb2a73b9d7dd05d0bd93930c77bab408078b077711b6d08176cbd227f1bd24e56603d8481939852a7bb98a72c073b622244fc4476cd633383f19784e399c24b55db12bd30f4aaee90c714c75342435b509b38fc7911aef43dfa169cda1402258c5835515907b3b11be48e4a7770ede4492c7b5cb9739e2310c3bd9a414b4678883ba7d374975a269021ac5d300b0a8a9071b2262d26b49f336a6f79e68a1e5c2203e296c960ce3ec71a5ef794838ccd79c758181b67c7988f96f858a365a9ba48290009af0bab82a4a4b18a7990d9ba0fd4e23da9d5c6e0d353b2fc4caa1a5eea00a7a0baa2ae1576fac5c6e229ba8b71b23b247072e0b3f92279e6100921895a0025b23d334098d92793fc5a50ccaf588cb2fb51c3a07c005261696985aa1e90a167a7803c588839d4c555c18f73579b3e422ff1202717d4842e48a846c9cd1d6c2f647b98a48c7e47a0204cc6b6d007b027f1c1721388d5a3ae615ca2cdec18e3f09dbdc66249d77ee6240c8240cc10021a6dfb4358d7740558517658c28f507f3504007f619fe51947b2681f3d48c1a81412fe6a09bf9cb56ff648810b5fe5686bbea352e102bb9803440367353646b300122f9b16b2631329e8563a5abc29fd477b8bcb5f0ef95987d4ae71243979b201b0cb27f07c839703bdce9a738eb4738d6457b937a2e65a011389737df46aad436689b69fd7680180ba0770c0484c085e9499adbf7026da72b48ef1cf45021f8d604f2a761d8fac10e6ba71e215712bbc73c5aa1f4b801dcf278063690d31617cd863237ac91556f492484238111a9da46ab6a1c3c1e00620b62102bcb1082ffb54f1ca840518a3a75b845a59ad45111170921f65704f2c83a8281b43facc0b2b007b0e88206bacbd3c6a78faf904f6475d328bc935d01de6033f9931b3bd5a3e10a406eb9290d1052eeb374ef71b96755446f4a98b6e4c9702f7c7acd64755478824855d3d25c9f8733f55f788e8e91913737bda97c1811b6cadd10e9e90072eb81c37611168ca0699c24d1426a1b3f6ab8b346d0a287ed4a04869d94dba7160ca32ca3b7a8ef8b896148419e3a80d217c1304394273e10d54365e83f9bd09119736f05e36218d70f9086e178c05b46c32848d4c14cb6c567b994c1bfb75bf11fc3db2915f890c626ef2bfb14c1aacf9b77914bda70a37e165c65b03727e1834f2d6471f85bc705b8f63c75672336141c44e6c9b7162f0ad93a840987474b7711be7b8b7a587608604acce1b6ef5618495f365f221b5464c41d6448f87986fe8f71d27658f40a15bdd74c7ece1b8992c137e3b43b8c27e228bb9483255a7050a23755c671b4d9854a185b2707b342d051c262d7cc12439b258b30a4c14096e1c91e962944e7ccc11ca35c5d83c937aa0cedacfb89cc6c552011e31b11fc95626fa0d1c04023d8772501402187ab2af9391abe69f988a5daf8114cae6ab0010041ef4af84763e287c4368eba94e6b0bbde17585bac5a8d89e285c4569d9025b65b301374a32018366bb66f54aa4b8cc385f93a34325282f36c5bbe172ad2cb44e32aa876113d8c1000d94b7f0838acd2000a6e386e287cf77226fbc9588a5019b073a237029820bbb77f934be084318e01562eda6b4e0f01d2dc17caf290fc5b2037738a33ed181c6b4aa4d10982c38aad1143ff9530e062ab3f16a9177f145bf0a4b1a1b037682506628ab3fb127df8ccc36d0095074c0db42bf628c690665cebbd232b302802943bec761acb00065b1e07471a39d36449de0c8591de5cddcdcc3a1c43b5107ae30640fa221bc5262a86c0b0124b434da226d959ac55060cba5f32587b1892471300159c9d8045d59cb00cba04821f1a6e19a713609855e3acc0959cb2c88ac19d335b0856d19e34e306602d9c66ad1085edecac34c55443af41e76fc072741ae61950cfc174ff4f3cee652b280a39124ab7bf6f5283f2151b375a2668b71049042a421086db12e7fc7bff4d95605e8b8d5c59bdb47a71d06089e8a13e064040b1289a70b804481bd22ebca2a4340e5a498e83bb0f96c4955f516a5d125408656b72299ae73ca18a2c58342810f9c10808353acf006f93637e0254b6cc216d4c7336d5b5ce5b55fcddca0cc59a0077a6b939484eb64648281b51c3756c9c8bfae53a904f25925ecb719c25a3d378f0cc5634a4470cd839cca90701582383bf27fd2f2bce345481a2a80cfc3b6588a3c328a9d2c0105129472f5231e5b901be663016d79987812c916caa364450301b7ac0f463e87e3971f4a5f13888f66d5c78aab602e4a01a99992fa25cb303cce0624bc69063063c55c16b48deb9a5945f28c614b7e5c83243fb4500b27bbd232baee32638afa0a72f505c1ca7a286c90acba7d3783a33a2b18ceba62dc7287db9aac24a946f0bbcab94c0a2d08c72b437548b9c0d5c41f3fba3d32026bf8db12ac067cc37bc79d143e3a6c40439bc476d5b10724b643ac4d5f230e2a1c14004835963b58a231bc94b008f3f50e9b493e849cca03170a67e90f00d623c9704ee9f788514239c8105938323a78f34751c8960ed420d5821b0db6722ee07a5915110315cd00bbc4ead43719bb3e4fb63afd743c522c6dd03babfd8c9891549814ab2b7e0c66c8661acfd34db8db48feda502bb271ccc03146e7c5423a8182e84554a9349238705c250c8e579079c6c7aea73f38476f46e22c67a67b4eb20dcee2556adac841b67f65421a814c9770f84a683ac0c2db2f26222107d360c1623c9da4922b3f97e33b0bfb50623a2989ec50c6612768f42d5769fbb7ca62b31fa837d30774f7ec8feafbcdbf5805c634c0c430d47b759eda5d1f98917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"""),
-                    xeh("""
-9059c2e3a96472cd2e7bd86c3e78574ea36e2586c919b94a386dd22c9a816b3c9e70842584959abdebc1e208ea779851efa48a70258fc3f7d76c327d536e0f253f06c33698c8af6bf3eab1c4835e5ad76bef5da6e23a6f14f5d47d047a4a2b71ce626207e1f5d6619a992ba98205c6d1e27ba4ea52d450099988ad9a2800f3a18af4d4349ed0b7c04bb4a76b7c7f339898749aa56b8a6d274931904eb1e75e1f497c1ee28abd951b34fcc0dbc5885ebf91bc6eafe79d2286e69416c128ab3915124f80b6c19159064327433105fa13d97ff255b672fa51b6ad3722967f413dbb13a02a9014f6755c89559c40a7c6e9b61f4c48559529f1f9413824a2e466ad3dc3c8086f113edd0160bcf00574087db6b7288b1ad665781412086a2847f24286a11aa37f39088ad167344d0591ef98b458b75f5d8a4410fcfaa83d613166f7fa41ed17cf17ce4673f9cfda45592242d6f36df8f658dc6825d2ccc30d24be4cc553ac655e64477ff91fc70a26a7fe53a6ec2cdacc75872a7a2e6a30387443db17c694bbd9578971f1319e636439cffce1f46aad2f34d60ce2a8d96186b48e64240d1d0a5af878e7636e15664905f7cbceea895d97610cdcb4767c9288e0f8fb0e059bea8363f5cc036347eb2ff8652c68acd16ef5e0a77724449f8a143b23533209b050d3187e5a3ef08c9c5dc11d9836b6396f15d4218c98bd5b440853ae5ab0a921d476b0b143ba87d355b5bde28f751695c9a392bd2e29cd60e15d5133f0a636bc05c014cd623ce9c1ba5ffd69470767a9b779b03bd00971ea534ba1c5bcc0f66d3db1aa731566fe3049850aac69a461f648df35d295f91438ff2ea8b74de1937e29582b9abf960c3c74d41b63955348822c31d350b03de0b50e4233f8bbb3e3acdb2eeb1a6b5c68cc89816ad7266277a8068a8633af85f7faffb9d94efdfb61360d1960393f71050fb4a1fe964377860a0877d18f6449833f02228bcaf8b4eeb2bfb79fea35a4a117b6e5cd8c68262696fc3a011a64b5c73a524221c38b42f6e8219f418044419a08f670fded4634ab006403d85e8d03ed1a0d1550dc5ca41271f63fbf2b9361b5e196f765a18e35dfabbdb2a4b4b6ae7ce176a3a88eddde4591e5ed0936ba88e5be7b05862cdeff319dc9a4ec0f3446d8fd6545c3a240689872b9e92486a1837bec167ac6bad6dacd3e114b7da845b86a4b9a92ec3d7e37327012caba3dd22b8c4c2d2fc1c69f4d6ae6913f966444de9915d3d4a0185d82999277690ce9fbb9187436d8317460428cfb8e5869b9c9a48ec7f3d7c8e16b7d3c1111a5fa6b4f5ad80e5f2cd6c0a331afe0c554c01c61057bead42283e9f115689948129065b38ef077cb246c83a6e5156bc14c134a470ea44aba6c6f6d6b38138d0ada2ea680af00ca499801470beb646f820a427512146c60a857f812f7cbd89989d5a13311851baaa0deb66e7e2bd5f03edb21a9dce53d486434538ac17ce82e7c1ca87a39e31e039159b6f9b1318b5fa4122c3a7af4aee297d2ee2f6219""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-5b6a031b4405919bcf0a292e27c28187e3a4b1541be42bc0d972c2d8580253b9658c80089d39ce86021ce1504c6838a4f2ba1e956290d7895255ca0e1a14394ab8c00a1506211b9943c98e90838dbc70c6a9c329a9589c54f81c405608935c4c5fea378dd30a4ed60a5933c512967867b283425a8e222b50128c5d4385266af316add0c4b60895970944b6378cfce8838922325d15c74d20a27e912661796cdb959da71b96a34c514e561d306903eb07b04a394bab33ce952939f5ca616f37b81fd79b7b988712a86b80c639a4815fb288689fda7c9e3017edba542f59bf1ca9a6c950b26cb5a45bc5bb20a9b9fbeace65885037519a9bb72842ccb21928105d10279a500e5036131c97cae02caed6a9725556ca31415a683b16149723d1e7be1128c177497a9d942b727c1361f65e8a186a8d612be43044f24c4f977001d43446ed6968a49312e4cb9683db08c731ab0cd17b63a7b0ee19b30bcc0ed2505bf5fb915be7410a9948ea31570574029c531675b64dd5b529ee221bf4e06ec5030b8de52d932281bac9a5c7582bc2b781c7b89517c1b0a2d8146695a694f7670b3796130c171a949aa0f4b8ab9b8c894acabc10be1eb9c879b3bbca990b74f941f2782d6df8300dec9eaf51a48f72cf0c01c1cab4c420d650bbe23eee7181a71872713006e334b968a22d9d3883a241b72aa0ab81847683b077e26731f69734c6579ff7490009f05928ebc9afd499525b09729056768b9cd713a5a1186ae1e89b7157291b8698a4e2a675014b864a4106b02317994da8d7cb9fe2960cf01c6aeb67ea2b5108c52970ba2c9062cc523c59e3725480d528f75c9d5cd19399e8352baa5bc1662eb9e62153fc044b65a4ce2681cf122324d3c69fc02f5572b3695718fad2808e1abef8157b2e3904e22c11844c1df8d639d0c6712a190da9b75a6dd62212fc6e2a52ba111280d5a801224860e54836ea650d2e25cd89eb5b65f21d206c4e8b5a3b60c1ba0663b458e805a14927a0894575e2cf7c191e92bc20f6d7b81aba73ca28155a4b3feec403523a1d671aada5a5a1863cccd060bc4fb0009082ac282a43b951c2e54a7c865636cf91a617f3863e50c9ac3c67252365ce19ca690286cf5ac7e8355b5fe5426e1031c000318b09b982b59cd7c0cff3e5927b030db1078c625aad57976f3a03a300fa796e2740178b4125d38754367707c5c9f08b8135b3ab6859575bb0c54985186eacb46bec4499d1136bd49965678d62c7c53725a0039727f51c4760751d8c418d8170c55d44c0ae02cfcff87292069728694efad712306929a71045a9736e08e6346f148a0d23316de7b839c9c4fbf35ac38b32e4a394ca61b686208af5fa3cf6e86d56b4cf008d74684c175b178a2fa6576bd7742cc5c0679425a3283361d47956565758f507afd76f3a3747f1369f89c857098040722a9901518ce2290e03375c7d29118a11527ac024a40c8cede69f54c4af2e69134a2aae6e0134f8c6cb53d6ccfb36765d137ca6e982ec85a7d4986f1744b3b6a8b352eac726c9729b571e47556521d76a2705a10eb43d9ccb35fe0ba3b6461b83425294bb6f0ab9b8aecc7fc2d9685840ba2a94167f4684b9a173d954c7246a3daffa8fecfac4cde76265e37997e53d8137c99ef4cdc8f0194f1984b7b3886ad87fb0227d569ba5783630f248add3b881d16c904f46249ebc73a6151ee2538fdc5b248971b3bbd5af462c36548b273beb06480b28b04b359c03af7df4344cfa28cd469476e3499652ad759b761697861f1479a4400bc034738ab9b674311374374ee5d73349c0a7b9dc0c158c13739a674532b62408bcb5c70ce4c54ae26c30118c8320eb05cb0c1454b7b06bcc013c7892c9b4693f40c6651925b0a3101da97d98c19ac5a5b3f7930061db8d38e37e37e3469ae6b52fb10300da5ab71a16e9d762a2d86473442c752187d33c2809272a16649f8403609e17bbf8003aff87468e8cb4e0e2b3a2fbc20fb8b172e606830666b6550a5c13ac862113b817c2c2f1415da33b9dc1a47451246b434f586a351c55b4c9b465fa1cc9578792368209655397c3761bd7329917497e3f357f0dc8418d474ec2f01af697b5fe30248de409130c3dcb079b50ccc73a1b709ffa5010f1644de0b3c2598e8580050a0b659c034ba7ab1c627cb43736b6b8a754dac647a1b94878529676426175c700896b5d123c5e125404a59507f5fac8acd5bc5de2035a33ceb680c412374c9753aebe423ab515886cbcab2554c9b28c3497b63bfbf7adb8db29b59abfcbb501f318b5c8d61c2f33336652c787348e00c4c15c911f7e2cb67f02ba5c2b8ec9c87ec1fa6d5dfbc05f7961c6c0829d7687df542b4eb42d8d373ecac1aa55d921f7319eaca181ba1c259e4118bc27615a866944a10e28e260f7ec1083229192212ccc9085c5436210a1392918567619b97be71f65c017555a4ae60a81ef0951165a191672c864f2112839596a343edb58885bc58c6406334a385512db7dadac2b7f510830f3b3b3440f73038d53e5ab143a6b53702f30407c6c824196b4bf069a812777a8b2c26e661cc083c52fd3259ae08b9181f06d8c993f14779300ba56b88647a5314066d4b771dbc76250a60fba5afee147b01396e91a0f0dd30ade7c82b6d85f8613a9354630bf669257b57dd563ab6b07c5a2a809cb16990ad98f23f34bebf6064c049f33913d54666892864627f8c4e64b20e06b43a5c5829bfab4eb774907c36ed5eb17ec3101aa8434a5318354510df87cc01a09d06806bd95939235fb635734068f1594a11a624e7b87ffb239dfdc864ba4322ac4357e499e80656db0bb68931159d759806b3c2518a319bde226a3c250ff0c2326750a0d23beb60b442ca595adac6f775cb06cc988718bcbc29c83e39646b99abbd5f7723757b9aaf63857c30e7f0337b8fc949cc0b4ced2260736298675aa8e6a1022aa1b8cfa3104387e429370689b398a317f0bc50d7841005048aa7e29a71d0b03348328c0c268e8f6a64f518ac06c4398d7b2f82abafaa1c9c37bb1e3a147bf870cd10c21cb702aed892346cc47e6928d3f16575f1254dbfcb910aa967a87323208937d1aaf7fa90f1261131ad4b04ff36e9f6696594a2ccf3a021ce852fb9043c194c4d3d704edfc5e3d2ab671b8103e8bcfc631107815790e5733eeb66fa344b9f276c531e5505303b267b6516b00b056780230847aea99cae15bb4faba0b9d461877419ca2d16ca437f0f2963e80f169e7bd65d440b7d6ed512ee105bb1690052a72bc54207b09e402819946c6be8ad1896c231bd52d35277981d8b9f8b4b3115c3316a7cdd3dddf022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"""),
-                    xeh("""
-90bd8c5e14744ddc8675a988db156ef227b724ca2e01095cb11f06a97e889db1e4f9de9ab6204f3c283e33d9de36249010686787e14282d3b7c2b074db1f0a509fcebae53c0b35dee8e46033a1f253f475eb9f09994c7d3e209cedc8d2b591739ff1a62e1f4c8cd833b8da55c8881ae07b3c84e26458384102722916451c642d19b47bfa713e815b37d63d2a9a7e4a5304ea1fab3eed37567d09ad16a4dcac45605b7ddcc65cff7aa8844c82e5999ed28f5d1109e7fd9e425b5409af85622420d21585cad96afa841584256682fbc10037a4989a55d2afa09a12bf007c569b25b937720623cb58456ad565f5b5fe9e475d00e67f7414411913b30949954d952a596985bc2786b7a6e697cdb6d82f24ffa4d1ccc6d8db78de1ac91991f22c254e3f3b5a0d3716e645af3c12c41a495e98115558013d12893c5fc8c21be7dea6d2f55befe296ecb980e3ba40267bd1aac40f378c67d64cbb0d053ad33f9949cf8c1d43b69c6e15a5aa2446681eedeee320c953a8f8aa8085d8454d9a6037dcd887c3499cc8e6e91e485fa8a5e7ce6492964dbbfaa9cc93a45b3488bcba7384787e1ec10635a092f51370421122dca671a5d670dc4a3735b04d977b1e378360282212024ad3fff86345a92f570069f8ff9f2ea5c28c44935a57e36db1caf6908cddeaf3896524c9042f3120f4a921e22b3ed73ae062b863f4fff402976fcd1e818a9069e594501d1776ea50377de97f71d9093bd7bebeb70a21154aa1c5b12d2b33540bf65e5fcd460c9a3e48386ad670c37b750fe72ac71b93b7f8c468692d95a3a4393b68b44919bd1e9e87492d9debb7fd09bc1d68cc758c82789e50027bc73a6df171de78958a112d50d50b9e32ca68c490061a4da36fe6bf7b0d1e8a8825045dbc1b5f6af55b953f9344794dde62414ee2ceda0c22301d8a84c01fdeb67cb8f3b5b3f66289d99a556985e09150ae36610f0ec8ee2d6b53ad1cd7780331f813f4397f5380ea5f1cd838e7cf58144bbe9db4366c126221ab1adce2b0a140a780495f1d8b2f41a6b5602e3fe66e449aed2e8cc141c7462c290d8f9b4b14a8705fc0cd689930f6686a102f3d90c6eeab216576d27112b6cec886241514c7341ea4d6198247d9eeb1e78af0d717a1de3b87af12536c37eef2242fe6d811126d4d587f601bdf739a0432d37597a56d518e4c5898037966a1bfe756f87ddaae26d382a04244564b90b103963a0798cb7237e4af9ac2fd1408b2b75583ecada700d9fef4b8f7fc130c3ae123a77f36c8bc3604fc9b517c7dea1bddf2fc0f820ae58fd889b68e079257b0dfaa0fd57fd2a4356b3eaedd37b1afdf48d85939a4b66466faee18f9c01c24409974f5e9e0b2caccb24c355f93a17dd899aa140191a036dce3d61a7bda069aebb7d24e1aca67751f2230e2ab9288e0a6f82489e8bf7a7409ade15e7b5c17c301e56e9e22f28c50047f2806f5f4283f42b9dc26d00783beeae516eb1f52c95a97de787d3491215b1007a3f42f80c969a926d2f56e81279f8013""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-57c70235fb2cdbdb64c2f2c8aa3933f94a9607104169371c182b7997018335aab5bbe8ba7050a5d97538a3f0a1819a56433b1870f6718b63c688860b7e55960c3b80d7a0029f973058b9bc09868b454b9d549603a5187704b904151c62d36516c0bc195d53ca93a0455eb02eb194295bb5a27b51be81b45d865ac7c76a0e81131528c54e14266c49e10bef401211438ce8d969dc240a0812297b88a4439667dd8325406b97a0f91eb9938b3ea71621cb329b24cac98311ac443373b86e7c2a7825532abb0357636ac4276655f3b2b9349054d4c6c25211876359cfce44bb61c41e40316509d6349761633c58958e2546e314ccf24139ccc48c70313fea782dd7c41cd3f9ca2cc7ae61b65aad856d122bbd4d973ac47c0389baa0f7e84fbaf7c57bd38d66127c7c1a226d396e5c363fa76515a67494a52a74fda7ccce919a027843ab5b1293d6709e60176f78887ba4b2456bc5422c49fd289260527d7497ac9ae89c10456d2d018b0b0a365d92061f9744272c92a6388a7b884ce8f722a0e999495b2322f088b7c561c2eb632c322b4898ab3df25d90e5b1677aa4ace1a0bfa91b50a4ad721943da175fc4969ee8435315acb1a923bfb30101f6080ce191c91b18b79a09561b3a7fef5879f3ab59a34177a6f0087681080e9799a4e874dcf26ca671392f5830cf384602636b5b9118916ba7c9880d0202a5f8cb38efa2608f68553dd28d1cc26eb6e06f18d8886839c342447ae4468c1800b64ab89348a8ba111c5740361fe182812a3716c1b577ec75c9f14c1ed62182fff0aacc20c2e9635c18e6a44ba541ec748059d386c91bb94901a7477b6343e6cd97cc711871084faa40887b28721176d8762e993b7831151d4287c31050491228b6af6b4913428646b66309d055e0b470d3c3584e960b17530d63c530fa352d6cec88b4e93019dacc39ccb10a04718026762c255b5e515d1e381dd6d948cca73210b184782528a5340feeecc236e6495bd7850ada82d138b3fdfc5e9aaa5310db28fdc9cd9d7ac69ca869ac376f153c0db1e97632ab7b4b1965ece9b7024c2eb280cd6962639b661c9dd719c7cc39e576450201ce3b5747d982b9fdbb728b23c30457c7e537c3cb5a0580fcb211b43fae656d9560296f1c6e7d0319e5697a3202461a0c52d8488de70ab842970c559026fa88004eeb746920402725501146b182a2696909cd7a75260f78cb1124a73cb4b22cf35aa60ab6d4a612e56a4f135391367a64003a0113cb2fc2a2a27c4bcb9e01a6d17623be3119f2795dff488c733c7f1299344fdc80f5a8cf5ad7b15ef76a72cba0abb181f9c6ca064a9e5366cb7758af1ec0400cc1380c837dfbea20b2e2b2deb9419fbac7fab5b4e33691872a8d8db27f1799500a938d309c50dd364e70b3709c9c67a6c1b721848bd3cc8b0636879c965be513a12c973b2c17b07a7901919a9ffb70b101d5314e508f9d1979fdfa36dc7790b4b034fba6ac85a015cd82684a573fd142a05a934eb647143d9070ee99bbe034530e281a075c70e5ab266858c3c57c22b9703464497b229acd7997bf6a31b08fb1cf206b569ebc7ff62108b0f404dca30dd0d51a8800503370cdd3090710d5a180d8cad5e216438b4535c69165f884be521e5ccc33f22695aa122e5d918e8d27a390035a42b9c8e4abc9dfaa92f090360c9892fec554851c7e434caf9d41896741aca2f2ad64e8b1e3916827215beae96d2d190f22917ccbfbb3452914078607a0eca4199714ea8040e9c9945c71501bd1b6baa00628c62c220b5dd79846da4399536547b04811f6915045e63abb9575076150bce269c61390cd3a3fb3db7235390b63dc49d041788d25650858a062e49f4d9855cac7c7d403b172044e2234425f503f3f613a5b1a72fb32590c851d71295f0da4113705b306e6524c398a59a83ee6a9893091beaa78470b274680017387eb13b97baff06a23986251a1f1a4f73a72054640d6574b5d070582925b201b37b5a690cecab7bcf72e16e3454eca10fac9b760cc94928307c2853a15c47c6d29ab90e322b3b566a43166428c09a1b3ab3515704bc76778c38b0ed224ae727024f2008cf2b5128cb912a9bd806bad62e78e1d79cc90f3675f863df590210a18b6b629cf91738f23280e93ba04b3661cb0e040709639a5b495c7a36eca739270031c97db9ed9432a4ad86608528a7ff7034652571fc6904662116980201f8073ca003092c19df909989dfc6744274a2e01377099bd618aa443c883bf8b87a9bcc9d35c56aeb49068592d31e16e12c711cc9a1e9780329a92aafa84827e685a21a84156b29233e50f577c54fca9a3f9dc6f4707704b515d9f2492dfc22977a36dde51704ac653764b124cfa615dd5932a05b895987aa714c1bb38c3166b27cba655786c29fb733448381fa7606df0f586c3ab0f2660901ed1444512ca70108e180776078c417cda8ad2241ea9304f820a9964e455d8da350ec30469fa6ec3470ff4848da109cb1060abea4c3a4b733b97d04beda35e769a7f1f84bf98c8790e91199ef04a6ac80bcdd39ad4979c327b84c0e897a4046bcab450eb3cc4d52b83e2f3845bb6c4729b3508e064576a6a8caa9cc12c917118196000a1e478c278257da8a10d78734b44e426335c81a4e6988015a6eff43470d98becc9722d254a6df327ecc91174a3a76ab430ab40678b37cb098926823955d5d8aa8f4c2598eb8ace098da3cc43e84a4a205c00cce1962c7411646a1a4cbac0fe884db3d55cbc0531d4497e562cc0b6f9139c905a8036153ea18570c1164e8b73c15630b4d020380c63cc1847e38a938085bd74338704266a6462163a176efc248c5ea6568056be253306ad8ba7d7d6144622002daa5034cca3af106a7f2b61a0e7b8804677adec1bfe84b09b910f96eca5f090cbc4e14139f12b29b7926225689acbbcd7e4cf2921219841c68d900397a100937687a9d779efa7301c4b1d1f74acfa820445c851bcb874c3c5b6e33297c2b424737b082e31034723b05c6182ee8154f5f13d69e67b25a58f8a543e19f7c279e99eda3c53854791c20a1ed0e95a8db87bca83aa6925658cf4035ca0879d477ab8b4c104e149b550b3209b5f36e149108a1918fc29de294fdb250fc66b691c30c9d6016b36a83e73f9a31df40744b39410201049642380ca752b64a2d536b6af19365b434b326cce1bda94719bae4d418b81cbb28921c8d02b4452556a156aacac7608eb97a2a56949059a5c232a561f842f40228b99be04e4a6a52718dc4ba9689b0020bf1bcb8bef492e4cb5232db76cf0a8602a85d8427b11ae9d75a2be6796ac7f8931f1f19668d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"""),
-                    xeh("""
-b51200c43aff424af193d24559a9be52ec5a72f4cf45eb15f8d4deef3c3d80bc9d0c433e595f4a3f796cfa7a4f23eb5f8bc60b3124be513d7e5bcbf4fe34b8a97fc1a434acd645e4306d3c2e07473e321434ce4358ae05e1efd9c6fc50b7e46cc228c782472b52493287046cf91e202fd997e67a75e50ca3843ac1790fe02d2c0ea71dcac6d65969022ad8f9d832e8a7f1b872b97be28ff9f4519e705adcd341fcb021cddab2de4ea394decb80ce66ebff3b3734482d1acbf57fe6d4f548e81e831ef1eb854a6e05e1e05863a4dbc9f69351c4b7ea3ad95bcf64521bfbf337bd9c590f0c5354638f42cfbfa2cc31a5312aa208e2056ff61204374aef66943e96e2b9585a3245ef2c7b909fc5ffaff94ce682ede6a377fd71746e5410b1e6471b8f075f848e427438ac2138f9e24b10b0a7cbea823d6ee74cddb33ea9e92f81d5dceef0700eee3ab0ff8d97cd3334523d1fb7ec8b3b594a5a0d6dabb2b003a9bf156668b8c4881c9b9d23987262957ad351b9e576ce59416b2936877823bcdeef302ee78a74e8f8fa7adeb7615dc43eec2fcb5e8f328f7a865bc036ba9ce0f8f35257a9f78969dca4efda0617403c8767b97df223a2d40bbcc378f41f7ec4fa0425c04f61b976c0822185319a924808191f6f719f006c856a4f35b97f7fe64639dd7ce5916ecc5dfdef2dacbd0c95589c51d28e93099201bffc80e146e4d5d8f6db0ca7d26814f682de0a5bd2511acda58dbec969df0cdf826b957c69f1cfe409280f63cdbe0794c7c5a0593cca1b0f85129940d553bbc2f29d09a3c6c364d396a39decb13d29e9c649eba58c67f080396dfbd21cc83bbbbcf68c87ce2819cd12b10d7511ff6f73cc58f16eb72e2d689fe9a0e24ab338b034a7d0368f4750c30b9793202180c499db4e92c34803f94d2f2c9bec1e8bd7830f16f77102781c4555f9908c4c41caf3d62b2912bce732a83dc92a70b21a3dc173ce1ef3aff1f69f415ad749affde5e97ddbf7ca79fe3f0411826505a718a237eb81af0d8c4f09548dd37830ef49c34449d29e191a4f0b98cee0dad5ceec6b87707f8cceb2b886b33f7008eaf93243ea0ac326399dce281dd275d2555861e6c5f04c7b480dd563e3684585c73e28fad560950dc111d9444bc7e2ba960cbfc914e81b7844af5c290adcdff7840bd545db2d9318f2fad141e531ee95638b507b94f7dc7c0056dc56c614b06cd3639d6edcd21567dd810c252214a7a9405aebe8a19a703a9aadf60aaa44821d2e54038f9dde2bfb580aefa1bc595619678b5a98942d8f6284fa54726fc22912efd39d58d71aa6e5671125f51a23290e3aae9f3a3edb2a37daf9aebf4b278e5c7bf70881f093b64209dbd943d76a60018445496725d40d6eb37f2ae27fd706569bd467364b7fe89a944cf08dd3091a914b0bf36e6204c798dc98ef3ef0e395bb2f855f2cd1f6be7554c9402ee190100048d69827dea7b33d5433bccf14a0f1d40866f35e2474bb9d374b526353f80711bc76d9b29ff0e2418686a40a3b19""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-966853f02206fc71828a50115622706162598f8a876df00138caa8211c4d023a22127a0d611bb3800059eb2cb9a23b6f03510ec9f064067b39418c9d806a7de70b9e9b5acaca2b9a279797ca347c9035716ea92141340672d52b19689b7f025d9493323ba034511a4bbbc78ff0fc915baa9fe01078e0b511a4127a744a7fd04c4ae3d84212146e7c529ced97660aa49dc5b0a0d9560029c2a9eeb11f4943a5f80a4f2517cef8a91a3f9a0613f99558c43870e80b23d01fd720930f616943e15d6b8458a4e51fb5d784a0b35588d19eaf088dd04aa6564a038fc8219d81adb9091bda455058276655fc3d21902ad257426d25436ea6621709bc6647949123486b642a13f51b17f5545f61c66e095b2bd938d6825ef8427e0dc13bfe2ba0e61305b477a9aac566e86411d06b4304f6a3c4092a9a845a0700b722e1af1db3cecec69879fa29db9997db1836fd6766772b93a1d713c93667a6f2495425bebaa4a91c500151f2abb1d6443e1676f294b9cb261103ca3761da75dc718c5fda2a8203c4231356fa03be4016a9d6a24a2b04418c279a94911bce16507e450c3da684941a4a1ecc2fa8f39996c185af609e0867c24bb42cb428049497012180a942f81180c3a87480524b22b6a4dc5b6c5112c3289ebc819ab6ea7302e835dfebc525531b6bc80a84a196df896106d73b63020bbe794adfd08ad6cb0429dc3ac0f11bbd3c5d9dfb6c736386842303b15246d9a57df7d2971e169a2611bf179432a6462d5c9303fae68790a4769ab58c3cf670d6847240549ceb78432f63b3c4632d18f9a15f42532648794d056a138788eba86c1f71286f06979621a41d866765a5726f5ca0976268f505c92c01aea855a32f74c4f05454ed1b232803afaa672a0f841d0fb0824a512dd98c8adfd06269c92b71880aee691fc546b2e6c0c99ee18c41db8fd3aa3108a48c4f60b2698b501b8a39629cb1b3b027ec00c9f181bf38c25767419e6bfa4a2de982f5952396ba076b0b0b0e891fe041a5d7235f8ffa573595b02c550e2df02ff6c9a78707565cb5be1d5234a45b9a9d250679d5cadad2638f9706a8dc558029a9602c6638f366333ab989817ad64860151442acc4083d991867a65915a52b74409344498bca11433cbac3a82458c0ea647d8b9a7db51023a8b6b5e3356ffa3fd6d3ca7b0466518a4f8cc78f6dab6d33a6cc3cdb8aa1acafcff9cb22b3090561179f9aa777b3b6272c9f45f1cfb848b7840a020b51a7a017be69660997ccb96096cd1a92b55a4c5d1a831e2734b11ee46c16128123480b03e714cbbb632ce487e4a906a358a6f5bc14e4e92039575a43f7b96d46711aca37207439e3531a5d877ba1d60bfb8a0d58247727e7212db9410ad6ce66ec3def428d644b15a497bb81954a53bb95d2e51f2e7559c165c61713453959a51319bdc4138aba87149341cb4b114a22150133924fd5544749141a9abc5cc3336f89834119250a1a537718301fd25888e2b78efd3b0c6f42c9ef3524780049ea4609478333c5d386550b9ffad18f24520158330eaaa7110fe649e1aca827f16cac8b73105bbefe23c48752cc1ff65f4913616bab71458122e2dc0a24e54137c5737cfc0d9aa743cb8ccd08dca5a5e735178993710821454608015b34746800c7f8679d72b0c628757756a50a61186c553febf79c00430bd0709e3741886ee10667aa7f7e4c91d89820e66ca9bbfb029f5cba016b6240e2bfac3815afd613a13b04810a26559a60f6628308fc45238269c77428aa370418f11928d5b3c211cca7bba2de57898e132035a16a8ee780678b213917c725ba8dd1818428199c672b20ac05061a82246e3b55bfea529ba891da6320412108ef0ca184b44736dcb05990031f3496bfc96c50445040e27df4fa2c28205e1d9090034285912b199b909efd088cf4ea4241f5c3052050aff92be505a355b515e5d4ac55b859d5a3cb1a42564d398ef4cb91db1430a7da96f9e96cfa27cfb12664f9f694a36b211a7a79b46c70e0ea14219c119006bd287467c780b7e6e706dc30b230b20c3f8759f2b2326d8422b16c124ad4a8e031412efb450f881302448e26f383fe01d0b26770384638ee1aa51df773fce34a9dd00ca24c584f5512c108109bb9499922019381022a58c4494241b2b62da8ea0b784967d86c7d8fc5c6a8f6055865173854c38d6b407b3199cb44000aa90253d7790011a9d4551d66278d559808835208caf18cb31642b06164558b06fc615953bb1c5fec2600975dfab48e9123b0f3d8757f53555177766e819f9c5487c9700adfc917e5782c82c681ad8105d6427785c862201140c5919addec3f10574617201e4e35372d472f782388c707406d73b462f25e3ac846bf7274a721b1a05c36981093c3a853996552c85b4a90e0c796c790dd881fb255557e0731eaf8aa9747b0fbc64f2db3a7667a11b6c7718200367dd86f0690be472b5a2fa4b914f91622b78be310719ecb81d1eb8b6c76bc4df0116f84179654794b39832701911480601c77229bdb571c1110387a78d4510dc0705d66e189e1f80bf7e5c4952c083693c6908623be31b1d2c63eaec178c3523110ba13bdba64e6903df028a23167594a12b64de601c90b41231a29eb5c2ba2475b09091f8389363030ae56fc686d024a1f838a0fca5914941f72470ac5052b8863aee631a3206c9f79dc479c925d906c86d3e5797eb2ba45499690b3799ce39cc65a9887eb5785c1a6ed660502d85f5b169ace240aa6c492f9bba48c61c81f0722f8377263a33087814dd51070012a103a93160359c3c2a945933c081409cca0963e99883dd27cc2572683881c189861ab10e17e400b5da3d40983821b4c45aad97aadd35b6d7296cf2ba029981182f5a1b189668711d528de7c7b07a71a47056074066193936437016b5afa3fcb245c05764af1d77681325c0fc2bfd2a74f1490c704e216d18345a1e074dd440b730a0464db2bc5852caeec23c0bb0d754cadf8f050ada71d85061d18a6138d8b70f77aaf45aa25ba65c643f6103390168629bcaa10577070bad8119619320762486e9e340d43a04bbb408ab86801ef55647e43cf88a6c0772b8d5f274f1c12593b07bbad80ce3bf1903f24c6dc976cb8c08d2411bffb92221deacc5f2783b6d38078f51d42eb5ff1a6b78a5899f044ad4d57c582a72844a98e9d1bacd4c081abb44117d20a3fd3b18352a1f2943c29d0a4832a8eb4b22cf69030def765bc527aae51010c74cca53b8df382df9ec3e8d9d492fb165aa4df3ee6a45fc8a9953ae56be2651a7ba8719c565e02579ec454f32be2888fd5dd95ac20b8079a1567b365865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"""),
-                    xeh("""
-ddf623ebb88ef5e69f87faaf620a10bed3440299b2c788981fd5f782671a5d2db99576baa8455f70250ded987e3e94d9822bad551c86346af95b86a4e0143da4a4ee58b66b289c37e1180b14a2594dbdb1fc468964375d466229c95182dd5d02b85b75b9eb413ba4e04a927798eaff56362d804fad7534ea1f2bfdb3c73cfe4b3c04406a425a3d94b71617100493f9ecfbfc9101a1c63b9d6cb991aee3e94983b4f162ce01a151658c49a465f01a5dd9b7a888e55480de880cefff5151086557c1665e818d9ca4e0b50859f8020a6023fb8039cdcfb1e8951c5ee63f2bb1be2076bd35462a7cd225c1c8b299ef2f394714aedb8e37c21a1ba751633fb94c745ef30f6a3a13d8023311a5602e5fe23ac7d652213a1d8ac19ea24022b2502f982f45fe0261679fea76d0ec9b988080e7dd018e7cce9c0ec7ca496daa1a11d86f9cfc9df15e2924b585fbcfeb5bc2ce2d66cd7cf2ab3aee35b26e1c17dfdb6da77cc464f454d91595fc82d53d7148333d9cf8d3bc7528108c635a960be9b5d243d4423f2692c41c441b4d0f52eb4a170707b8004fe323548bd9f4aa8aa608a5e2e39ac77495f62511223c9d5615ed888c73250a513e07f6c0867bcd84561ccfc2f7684c655a1104dd59347b6e0ae57496d45a93576b1b5e7469914eb924f5a391da1fea99f8f42343bc85957529b41bc8d12010ae1338b142fda8bcb0e6249fe47ec6217027f60b27a45b7da221038569f7ef6b8d5669e71af465f0c373695e2dc699697d07bab7a28ec7438b3ece4126f549dd3ebfc181ea6e13f31024a226d499b69f8f41f1b2c66643c0d8a3051e3ec97e52573aeead5c3fd2f762e0205af6418f2cc10086cb9aed95a413687f20683ce21b02c695dac6a079768982183beb0fbf92d65e28c6bb9ea294a2cab22497efb34a1bb8979fdb36fe968985b26f4567bbf103be28f02b1f709d3dcade83349be35d3771355f541b48745d86a3d04a9ff9e8e2742e4874861eae4efd2ffcd966855864cf212145365f003e0c95564e36476e69371ce9ac72056936ebddaa41c8ef74e341de5400988bfed7b06566980419b355d9088313d1610c4cc5872406dfd5bab0d2e6842fa7a6d9935b1b9bd4bc543689123a1cdde023a3606a79809909873175eed8580f4c5a987cda884551e90cea3ce850c689fff7fe7c43577a2b09ef4c864f83b1c52641b81625208fb47029138c6dac1af70c92a391dbb1e80996012151aee86bc7e4039941e3149d3ca3709858b18c77eeef230b5482d3399baaa7862197c0d82af8be727763583a3964dd5ca88a11804fcad1d9a6f86901ee78a7482f6bb47fa33aa21288bf27eb60d92e5e9d64bd5440dddf8b4ab9836a42e027a8d96e999661a888d08e816a5d217f4b94543868f56b3e5a9c348204277090fd4d3175d72f1ea2cb51693e6a29c808fb2d518f206a49198504d44b71285701d70ca36fa695023e6c1d79dcd761d1941996d7f7f099471b30e9f5448f7322b44977dcfcd7a56491144f57233f26e613""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-89cbb4263b87fb3abd58177936748efc870d2fdc7f1ef00a58ba3a607b5ee49cb69de049b5d88f29503afb655ba6b844bd991ef17c13277594e3082c8c7342733447530617d6e9b5c2013fb33a4b7a20618e078ebc046e841547f6093746f8b79a987c31fc341172a1b6768ded603d11f52ed9a399c9b23aa984b0f3995545196e7e0080ad6c884a5cbb120cb1db4aa729b6ab1a0849fd24b8e178124a7921ea357944d35b778b823c10cf3da46562fabc7ca28b5cb8b6f295417cecbb6ba4885e08a9032460558a0364a1c3e2a749f2da4dd7eaa76347414fa868f7819bf5d91650969fec1a4c5b01c0df820bc63cb6d391086d49741c84bc28aaaae11a29141204b025a4bf867f259749ec99043c520c1ca46e73c2aa12f9a4a6f009f5a5557c60c1fccb148e0c8080e9aa685212ce6108689618e718278b48222bc59ed4a4b541a8c0e4fa8e383303d8677156607a3281b2b2f7979fe22ba62742c8c734d17b159ce0552e713f7eab01821a0b71aa6a418a4381f572abcbce44e586431cb45f0b933d1c75299c041fd50a97f030ade1ac46e07bafebb6a98c7414e13a99467adcba6390379206441e1027012d967eaf747ebe6428f7518236e34a8c37ca0e92648b10be47bbad8c28b49cd93340e8180064b2e0362439824e332c379c3003bcc69018329e4a657b75f2b1ccf26b24207a008d04dcaca70993332808014c355013d492a52a879f1bc784bc354c30b4523a590c652d4083b532c79e8c4a554f052cb3ab43abd734f8d920de834ced2692c8310c8ac229b04aa6b533b2c3abadaaaa65e3794bacccbdd39cb2b6d47ac7aaa266a2145d054fd30c9612c451bc0a5ec7a3b10dac389005b27b6b7f99e7766f813823b36b797cad73c71f83229ad6ab46e1224d80aa0bc42b2cd0b66a3c322f4a35a6544b3132c9aaaf2311480c86d2393ee2544a329192c1f3201e082fb94b5484907600516a05b7b9a8c26d3452bcf8b1cda0331adbf713ff023af0132010ec3f810c85492a7341c0294c81773469c2da3a74f0e9ab46d45028823e83aa016d57cece757dc7461a88b688a8e97ff756afdc291b8d755ca1536a355a571e721c042472f87b4b32a31423f2c7ef896658296f1b520cd515acd01ba6f7c1b34aeac799441ed54a6232172306c3c0b51220dff0391a1526cbeb64bca256f5919eb8b7655b142e36e95b8a479e7f596d481aaddfd653ad7922dc988333ca77bfa1bbd49966c25775211332a81194b452297cc2a8c8f7b9a2d013eda34d4f5bc7d9213d7cb721fe18b532757bad4229585527ff202240ea09eca0740656b189b82a68c75a82065b40e127842059453447f4b144f002a01d69c7f7f62c8104346067ca6b899bd04c075fec6a462a0735a54d36541f3b556e4f0189ca8c8b2a366799e1a72661851635250b4317f0da80ed014283f4132896974578b4b3f2b0870bab58c3acafe84737aaa8a614533b61b471e10cf02c87b88c940f5620c4e81542041f8971ae6880a71bac55064a4a91a2347e020be3e81158997e07d32d80d8b47fc52b19cb8e84e09f08d14da2459934bb5adcbc7b6ce833e0da95ccc2266343257e124e3861b8041288b148c1aa8c5c2689044d7cb15005ad5928aed39889c195c94ab0366f91910658388798b53c6028343664f5ec4601d4acef04d0b6f2460e75bbf32405a512ab2474b8da27acf70bbfadfcc21db84ea0b73b548066d4e4618a355f9c051b8b54977c3544bc7151e4ba1710e9a00e86a46d1149620c291d3673adc5101499301296cefdc04bfd5ba5d136ccc845b4e69c629d1086e94b622054c5fd662952345b48d988e4b7198f298ef6a925fa1a3f912ccad5b46eddc861e69130424a8d952110f5820c776a0af58c7aaf14922466ceca0aac3bf1261bc73df001bb7a081a9440c80453b8ea8b06e22689127cc9b2ea3d8e5c2bf8b25eef8841a527729dbca2ab815baff343aa74b4b07c06d5158e820c1fc440a86d44826c754a7e3b05d40c1cbf32206971c133c80f8f678d3c30ab99db0656f4ae9ca12ca4fa132265232bca7569c8624730b234065196d773a290a3633605166161d86bb169981c956394aa602d5ad37cc8d800a8770bafa1667b04ab37a668acc268394705e679594445bf0a7987b86cc8c8f48e180279a193a187025648b22f53d9ac5d8b8a760978181a9755e3195754530b907ce992b939fb3740e626ad5534256bb7dd538c6bd2296d5675567c2277552c52930401fa09b581b87c18c70ac8a4076c9ed8dc001478757f01ae8ad3adf49a6ab590a61fb2c5c8645076e78c58740aad2990cf3858e27ab151f797165550b1f4a0fa9b7d47a8c4dc47bb53b359742aa486ab776b3a7582459f229b969038379099c428c53c1486cb23911f50108032796e46ea04842b28a84373332287db410390563c2271be2ff14065f22b7ea32a284cc3d0654ec6ebcbd6412d2f5c29b3720182350b82b8b65fc57de3d90c0cb55455527a469097d913331a7a0cca8692200bb9711008fe5549c945b306fc48f58b8abd835dd339797b9c508bcc8e8d76a32d560cdbf7506b1c2d32fc35170347b71a3f456163bf3116794324a46651f359bfdb4a65cfb754ea47064a2336f85bb82f2947b9fa164e11a55ca10086ec5af899bf9f7a3c5130a9c4880412946ea6ac478258a67c58131df3b7338933b77c064bc9231a49330a1a7c85e864b17c56501697b3e22b1fc468261b8eb8f4b0c6703d6a1ab764496a6eb27f804631071962c4a8062203148cba5acf2226b74b66fb305ea88040f22779a5f3486574a7a2833cecc69af95c64348288bb1925abd5be25878d9585c540134eb2046d7bfc5fe16581677421c1b59f1c69a7717744ab87902480ad1f697cb7f66286c43b73702f42720840d598c3917f25da324e5aca224a9ccd9757e91b2dda2186d56ab2191b46c950c54e7c570a3a0d7805096a4718b57bcaaca5cd6fb1a6e1272ca1ac7fd9ea9cc72440400bb0a35abed71c3ff0b9855058891555c713783386bc591a9663e61bb9bf8055283c2488e198a6e991fcbaadc7885f25295b3d531920d880213b410c1763aee1beebe665abc1ab64c6ab3cdb95555004c40148a8530c22b06341c301f301970f51479199c785a4c616813e6e41bd8fe078a019a33af92df22b207b09972a60443a39bd11c5c38de24770f3a29588abca32283650a0587434b74bcbe6a7bd6d70bfc581848c9b2ecd6184a0623c75c1768e0f3948eae08ad7e7fdfa17684a3c63b6a10dbcfd6213163b473bc3d8caf0196f53711e7354f6151a7a2235bfca5f2c1b1d6ac7b65ca6741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541"""),
-                    xeh("""
-04ca3f0c74332cf9356674d23c5a99177a03dadb1763b9cd6ab7804cd81cc84d079ef30cd3e536f0d6b119629f6c6afe1a982abf3f5738a1f686883766fd009b393c556f92e90cfe6ffa41439bffe299c162051231c6439d83d6b542204c532c4bb997247e18b85b467c3f19d6f583ecda477268ef89a9512daaa80533e19fa7fa5146a0f23d17df32afd12cbe17f93ce23d9f8d2b9a1f9b6a2f3b7413c0245df5d243b632e95d7f6d16d6324c594a989953ebd02e491e61c0b0e31f33659c57c3fbfbbce1d9fb20ad217d3236dd9418723a3799d7cd1bf119d2cf0dd2044ea2ef490a4e5d432e467cc5bf7a8340a2769184ea1782487f2fa91352b82a787955e35c156d5ab42d57aa1dcbc032634cf53dc4a64d080f057b023d453b34f179fd685d9fa6d57760d56e91b773295c10b90ddc4ff84d4228e55eb51654d8c0bffc2a4574d80a45d6d48ca8bf1825b46b16afe264dfff1d1c75c7ca83cc40df842f8c5db6aa3f92e74bd1dd5db25d8370ca1d25f5bed0c8db2223c75e43fd245be2088b3d9f25c8742f356a5abdd43328884835d135781db0393262d7e3fd859ca637ff54d833c03381d2e4b8ea9390d720b94f014f09ec691d07f77f2bb7eb792e45155548f4ac8da20540007c83ad66ccb403f9f93d7cab15a5203e4d0852c07f0c350f2da9f4477482777c14ff9f79db9d6e41a42c39631705c2307d26e54fab94aa002a5d1eb7376025133e737a93e88427fe3c3ac651cde934bd7a13f65a5af6de7e8d687c95207942af7b2c7d4a5dc1ecca1c61893f461f8744a76f45546a0ab023f7c07191be7ab9e3cb18b0e2ae1e3ab485966b2f93384ab93e331bfb7f7e65aeb7e0a6299f7b4ab81e25d95ed51502b9cb8d7ae752459d0164700cfc0f983d1a4f28b41b1e279dc71996b77b53f8e2bf67dfd7efa14886e43dc327793ce965018367973108056ced3ee94cd4aff4ee43d1b720ecf57097b0296e14433c2636c8d08c5fd37a1624d6b90309f93ef1d0b7de7e140694865b1f31c1cf4a972839a3e6462c053209498834cf5cf34d7b45b174ed86019371bbfd1a7415951d05fe7ab3bf59e25a67e5bcd72ec9206d6da4677fbbae005fa465fb0a55683b47d07bab6537c276477d0b660ab92a003d55bc8e645145e93ab0eef825475f7d53b173aa45fb6975cfe46c28c76fae8d0b70640467cef9256fb1755ae34c280f83c2898e908eb0d8680e25d982448f2e044543751daab8d7cdf2525c9d3f1fa96b7828d0ebb59785056c0b27b2f396e410df72291342e5bdf91f73b865a64a519aa0196997066e5cdc29cf2af335585fee2b6ba6eb3fc2bd57bd1cc4a2b27dd291a3f1296e7074b8f58204c0b62a4e016ebae22319f7ce4e147a4823bf70e5724c97d0b5441fca2e33831fec1cf2c34a95f2c6b78c6f714035b0f9d50e1fcb2549bb621de83581a498a79c1fe5d44288ff57c80245d5350e5af2b20d9983f4613ec85114c6c5afd3cc3272ef984ede02ba3fccf9315f8cb9f586ec036e68b8aa73""")
-            )
-    };
-
-    static DecapsulateTestCase[] decap1024TestCases = new DecapsulateTestCase[] {
-            new DecapsulateTestCase(
-                    xeh("""
-63d3868f4a29b1b1a87dfbb469d278ebbb928f612c1cfca80174a1d19396fe53cf33a8c1f1a88478c667e784567f43794aac9d135293bd754efd504f7b668f8a55bc51054573c95940a977a26255c0188456e2a1d110538939227711180dd36cad815221e47e8e8a48e61c7596b019d2b84e8995c3c7c9c690008207d78cb5640e428c36e92a67a6eab32e2164e35730eababa199743a4297f81b471961076474080ff6735c2e8cbd43138c3710e002829a7a5bc3efb9854c25d318657889940f58259b6466ec1b823a5d7aa835b76dd232f3ec9979005cc15ca84568785207963e476a93e585933129d25488c02d822093480e06b7459739fcecc65fea4b88ca58af5588ed577cbf15270003c0e02bb082dac7d84a19dc24137f7650e0a43c7ad064043e02fd73b1ac3460cba0b5948c0192d3851c36105144026d6a5a16ddb7fc963ca91800aee7b96ce04786780971359aa6862b6ecbabd74b5729510714867c77df98d3097b33c62b0dc7bccce1b10d0a518f1a2652c01609a3958ed95414c73b2a8b6307805504b6cbc5603649ca60e24672b4fe4bf88a3cf82909f13e2725094ce628ca2c0f48f91448a1db937653c4472d21107450926505dbb79742d38391d254703c2ba2279b522dc6f27523c8e6c193ab16d8c188dd5d452d5700310e22dac04bd3d98778923931758645098a71e4388cb5891b03b37f0ccb33fa75e3fac3627ec58310b4a6600c0b3c15bdc25c24ee245969264213c42efc96e09a9989515a632eb33e3692ca7fa67fb1319e7d82ba4708aaf611c6f4818a3798b7c27b828a57a4e2a49b8115be8002a420bc48d353a27411774341891021037d72a5940b8a41b5859aca1b142a80f26722d65588a1cc6e5a97be59cb116c6b8d4e88bd7d6061c6cb4f877cdba907abde86b5c2c73cd03382a50ac1debc15200a7a9d45b7f87ad046ba2d347a2ad899d51e73c48560f42b989d1d92ce9193ffb746a808145655028e392024673a8186c3e8bb63b30dcbf2302998591435bf534a19779683898a7a28d015b5aff84c229cc4f8784b198b25a47e0b1d2e3cc065b8c4a108c4bb64612da64db905e88b13e4f0b18f9f133452229bc02ad9049a8fe44b16581137684b3fd081dabdb389d663097f405eb2378112b2ef9751f8fa4ce6464220c1a8ebaf91ab5b3736cb465f9e4c9a4720ccf6338cca11d786725e7203770ba5e1111a84b75048c9399a94c014ffb8d2f5c516b4638a06067a5138265c98861ba50038804f7505b198c4a2775cdce2623100b8b92d489290b076c5a5566c62a969b4717124e8cd220ccd05d7977b2db0534a958183285cbcf1a6665cc2ce7d1193e16288ae06810640da7665cde163e20008659da76aae4c1ab787984704c6eb28d5b5078b971aebd77b20793117ca55671267c511480401a0a2285577ea36815d39a41d23537648f9eba50603a2360b2ce98952c34b2250dc876c5bbb7fed6708fa7cddcb15f732a77524001c972cb7533b9ab9c8f5a894d5a9c336b0c942249a39c039a59e789df2a6474610d9fc2bc4826cbf8812b90f5317359678ac78b6818b5b744b35773aedd3585aae724863818de706b05272459ca6ced128092d1b016fc76594461185c27a0433d2c7b36e807bec3fc527267a76d9a58edf3ccae8c251ba71517aac370902ec3f3600d5b995ca1b7b2a6ad833107b39ba6db71bf3d025a5fc81acfca9b465909740ba18df95a342a26f5437453fc0826209ce13c69b7b988f5d1a68fd484a2b1854a62ad09d96d6dd37795e29e83f9501aa21a89a31994b34a9131b65a2ab13d142c6099aff44b34d9a62905ea883102881f380c2bfb5e357040a29b7a2d1b039fe35aaad9936246cba4fc84af5066ae1c5cd7371bd1bb305d18873472b969e3727f17bb6feba5191680612822ccd96734b549f0c193c2fc0e496067ae05c75f9c39537533b07c297b463fc1e25fdec2526b30adf908bc8fe125092166939ba8257b33dee403b0d53f766b384a2a3503e9ca43f042d289bf2414b276657671a5c8c9f3a924c26286624f0e99cf413914cfeb4995994d082a6ea3020ca97a52ada836bcb28b53239724d712f690122591a7b1d7261ab798f644cf58076d75c39384f3433eb1b99e3b3a2d190492b5398bb9144f31c22cb34ef4a51478c635302525fc0abfd221ca8b3a6e224338bb0b9116ba54cd581cb7a3813c878d65317d8736881c8a6b6a7030441b44dc6663a6919c7a3574463b706105c332693d1918682d2a0f2e12b1a545a8aca6a38f0b63a216463099558d282dee3c33af3bc160d48b889a9d80e9cb6d83786dd826cf2c58c23c87f0279359026458040ae638c3eb5c5e0f7b6ff2e76ea598bac5143941d50d031a4906bcbc826a364d92641f68cd1b43973fe9b802f778963515cdd47eba329fe6b50c8bc5bf6d3aa02e69965693997afbae7e2c8f06b85435403c827a39d63c8cbc675d4fc31a5a699a0f2381918448a4471eb5aabb24c0685e6a1ce042553c360190ec470b44a7cebc153186be0d8c8996a9b3bf46383aac698758ca7c9b4a993b77e8397cd3a3bfd11b31b961c90875c900157f97e211ee6c853fea2dd83212c3f8861c0a98963820d6d73c7b3693b738519deca589639462db956bca22513b9cab7459a51296443076ff732e3eba57ca767d4374a8b2544c46c54c2f46cd7bc6461b8105f0d41ca4a532c6e4052629929c03bbd0b3c6b52c51cf3195eeea6aa9a55de0d9063bc57722a72409a59747965b4e6a5e14ec112a103bba204977d43822d20c92a2aa0f4882798216cd26a857c6a12bc78ffddab1d73a9b2f91ba4de83bfc54092d4359f03a4416230cd6616dcbd916b989856f3b0672b172e20732be0730d1a3a6a837c59a05b846ec1d600841594b306acc67cce4ab7b9715afe074a75738aed749c1494dd683ab6791522023acd8e5c403f77b23f128f16261a100497e0b1f906b7956c53c1f1a0d65d9422d7a3e234c252675446f085450446393c0c151e751ce25cc05b12a58c334ee1334d16b813c7689c6851b7662084ef05ae30bbebb5c2911859db6dc449165bf8b41626839cb37814768167ebd24300306af259941c7628997bc80156c6b87c758d6c40b55076b74b2b9942093dfc979ae59ca16a6ae33b523a7c687f3f22638f37c69c4946a26bdede88477c7b67538115cc890873ba223a953e1b79f7a902d0b20cda992a25b235f30164312111a01cc5d82d4a6e1c4961ad96bf48b797680bd0d04c83463bf92d86279c994c88b57f5a14c45645f28fc19ee835f0ba480bb04a17f5853c1e00c37f0857e88504166a230344bbd3180e6421432874fb6767d0a0c52c661bff33988d3e3132cb744df5b6c28ec4e7ba2b25c22a179914f043bb93536602d754c92cb6ebe42832f605d6dc99a8065cda1ecbdc589a93ed321c529c5f910ad86b9183b827e1e8005e0ac102a35b5abe533e31acf35e649f967c064963675421990082f4897971ee4204e3611bb3bca7af3a5507b239e9ccd49c5c4e09c14f3a3106bd961d9d649617212832c54f430140c8590dfb1bdd40785390384bc9640e2c8564c4a4f700ac1c6d1895fa40ca309aa5054b04934bfc190a45f78ac1a8811046710ded3246ef4032f3b73231913db1a58f45563e3a62413f6a0598264321b33460578f682ba40d29ce15697d6373bc6220c0931bcfe87326f019c7c746e0136a98a6bbe8c7caaea8a222e80915926c4fca60dad75a3f03a60375c09b5c5b120180b51f185157a345dbb91bb5aa6b704183ea0ac0f374a90c02206668224f975ed605ea1b01c55b9a2c159c2a096b3c4a98c2cb8b81682864188cceb3bafe825016381b8b2bb7df2ab4cf2a71f77347eb84314dda92f6d5a5c34d9cf3a123a16b892099c23dfdcb5b8e67be1087ec5b38b081289fa8c3d8d560a2d882f8b8501b4096d82602e7960a2c433abfe928e769b3e22965cf7f7350a1cb4543c52c8f3983dc84709c1909cb76084771c3a59867208c1bdf869b85548740c8b4390a2a7824d2b8a283606aa04a78b79acbeac33a2e4490a44b2995c70165aec4e37a79ee3224a8c3693056b67b1021c5c473e7fd31551a24a3383741d082366398b835389d4e4a34f7905a4c5808b27b44e86aaf02032ed07ab30452bead1907ac28a1a98a97683895ee583ec59316673213f9b1e5c2339678c0b6770459509ba5478830bba25239c311231b796c8225c9206facc138cbc2f58495f106b019041387982cbc656604e05c06e630b3d84aff82240b7a7cf6c078b9fa99fa426c197a5aaff94a93ebcb61de47f9c1c368b4f0104a0e8d4f20f98b38f6962ea4d6e053a96a8059c6e564a9ebc6cdc60c0de1d36c87ca4279906279ca2baf7abe635ebd3b63eee5bb0d48f6dae10796732acba3efdf731bf7c242aeeddf5eba5b131da90e36af23a3bce9c7aa93a"""),
-                    xeh("""
-e7264e0af8a23070a8c6e9a34aee33c43edd08518807c80517f919f0b4594b220e17825d8fbec1e0d915a64ec7c248f2337184a2c13faf74b1f7d39034daada6422850ee9fe4e631ae7cf4921aa8d2304b85af8ecd09cc8dc87970181af62ff056a03a21dc1ddb2b4624c0f4abee83a4f040b98bcc1620a037486379c4e9555242583190bb6e952467cba25a05f9440b41d8dbfa34ae84687156d44e8a08cfa4449904fd04604481e5072942d85fe0f0ba90326c8a9fcb8dfefd1a391f80fb5dc1e6ac7eff332295558a0567dfd1218e421d7442853cb777f36bb112c854859711b988a9b58e07594e3b33484cec55c2ed39d54a762dd518137e91572d9265c71cd5a039e56a9702afa2f9059a655bae01ce9c0057c9ae8302dcef0ae6063f08757d30dc8d2b32e53e88b2e80739e8c715af7221fabf57df76b960b21db21c9d85db13f5336b0ad56b7e50b888f044823c5233759f0056775d8baf2efeef1d6028c6ef27964e01ae23290c1de232c564124544e9224bf4616e5d54af0e013f41b7b3986d1a8ac822d8a842e825b3f1bce18171626caff262275cc30bb5f18eddefab0cafde8ce6e7a0feace3d3cdb47757c756b15a2df7127e0d21d232082daec8fc33a1f0606c0d18d2767ad7890d196bf0735d97ed36c994d21fa28c3c3a79c10dfdc8b83d40b93023a8ec9e44b26ffe6a959ef6e1017f77bdfac76633d4d33f7d90be2c4476e0e80e76b66054f37a08a9b75fb11895c6c2c42da00947458b151ea2901d0e407429935854b2008e25427d924b4649cb2130a5b3edf43a0a0051b431ba6f8abb0951ceceeb1dde5a29058d85bb7e40db68846fd94aa38cda27979ab1298ec80b1118f2659c5ec9e8ab2cb538a64c0b695a6902b27c00ad1be5a200b0f9b26d6934a55ce6acb44cb3a97fd3f0a68261cfdb32fd986ebcb8ef537fc2b78477ea72fa2d3c5336a62db5876d3f0451866c27f1d460c5d9a473442f908176fb1162247ff5f116849ed6b7ef943197c1d0811386942f8d8b2e88f6c780aad8a648d6dc1533dabb0d05b333cd436f7b0711fb2c4f604052f0c9ecac0e0317c893d87922b23b84ecb074d1b7d12093c802b3666ee0a9a37b33f0cc033c4218fa2a8d735252f2f3869126c949d4af918f70a3be928ecb25bccdaeb29d87a5a8995f4d33510e133027188972998f0e9efa5fa311b4193d29e25a84e25fe203120d1dd9b83d1a3d70f8131db19ed072cd2c84b95b1808e325d74b675b2de30b54f0e739a54960bf32a523a2991ff55ec23e459aba6d3f84c1effd79ceb2f821d9330e4c6dd5be2bac39e8cedbfbd731294effbd53af271422397395806644a1f7086f2ed55032fbe7840139676b79dd84c3837a4dde7f5ec6926c9223283b48d26af7c6109cc290f8aa201e5e953334304e6c49b8fabd194e0151702e50381ff8bb8391e157f072b3c31ae01a5766f5f27dccfc293a8846e279fa43deb6937f14e3208b3111dfa7530f9b53e05ecf55d61bad2a2f5776edf33e511613d2441f19994930c00b4c992dd4245171566da2f536766ca4f2f9d6fcee7afb81197abfbda64e841a14370ee08ee2a60013ca6166f825efd339459f206f1e43e3dd85cdc5053a84a8aee21764c258404318baf94ff261545933a0f6db252e24104e11d7eac64d1c6e091f66366b2c3d671e28d7d6c6b39da5e94ad94e81cd0371c44e940169c2971b384c398786a8fc1fec41e212302b421acd0a6cadf9696937abfae7ca60ce0a09c3d487fbcd100b0b34e24eee164b484f7e665bb623bd3ae914966cb42ce2d176d30eeec62f717ab6af75557df9ec572b20c59b6bcc302af8dc828a3d9ee5613325044ce0f28b6748750aa4a25813f97c168efe87dcda7135019b5a5e399dfe8b176d811e771805aef02432bec8c5b45c956b27916ddf67cfda2733e87d2d5998cabc88e08b6dc8a843a125323f66c50af9801a6e43b1b959bd14bcb497e5f6712890358d1b60d660f62980b2f1b1d158db5ba0d3db1457efdfd7f45e7cc7a2ffc3b4a85518b9403adf9a901397e761af1b653f4b9405a2a2aa07fbc517a16155d9bead37d314f22720ae353f4a600ad50e1e3fd26d27235352314be1f54f97966d0dcdac7678632d8768c00dc80b54b1220ea459111e9612ba4b0d4c693e7e32192e3b339181bf0a9f9b54ddb274a21c9bfce46846fa3a84f46b""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-1a320473966c4aa3087e3212af70b1b11ccd746a08a4c738e39b06e74685bbb4a9ca6a6e43c27cbc4bb3ef3ccb6eaa1ad714cad82a2d7adc59db821b32d747a9da182b7503f1706b6db1c2e518734f60b41d6cacd61c1451676a49d838f6e2c7e9f2ac376a312e7a7d6179a8f6b498d7f2198d2815e3517442bcc5778ba5c45642983430c5125b7760c5b523284358617f1cc5004bb237fb1ac7d938e210294033728fb69c98789c2c05cec3ea565b145f6eb2a662300a1ac877be0b73dbb01c7c0a2e3718aaf45a770f02c51d579c630332a87b6d79855651f695c77bb55676b953f749827b4f039593b04124282801bbdac214fa2d73a30e7513b919304f954349f1c9bec729970fa90538b2a7c9e85d510231b12bbf8965933ddacd221a1c7c635468180d752ca46f586c78a41c06d83f9dd553aadbcdf36b5733087891870b3b661b600458b7ca234ad604213165f265476c493c235a6d9410a43a641150a93788950e8905042840aa55d0ba5beb78e9f03cbe290875505806863ead88c660144317e1c40a2bb9c966a22e956e1eaa28e9bc10f0b7ca466828451266dc2510ae677cad9375d93261a68136a617bec3e3c2d160033e477d33223e5b0013d859b40d187d6dd50d1580632724ca3d3201dc1bc2b4f59cbe164668952e85f3152370018ccc0b686b052d2165752b40e9bc58ff6c6093a4257a824ce4338b2e366c60e313a683870739391caa98f623aebeec020a15c1f74a538f71634093a9af37ba7d9530ebc363296a60e4818e8d4a0d5fac200947842304bcc68b2eb4a797f14a9accc53375d9445625b49da5663d7659ea600f972766c9b839053a57ce30975a1b45f84b0433267d4ce2ad20e0adbdbb0aa37092e8c486f78a508882a1c7f34334785991827d4529c98c5c40e75883d35246fb5b8615567382574b1113cefdc8bf41a48c8d7585eec6bda67295d6c0ac5eb699f2f9bb9f6568aad661d638943e211106a42867b26cf0cbbc986c2437212c5f9b83b445bb21a7a056074d969182265a55d6179f50d327e6f39098cb304c6a02abbb046c9ca42420b2707056020a2c3fe973a974c1008d955941cbe2001937b7215b106396392724e305df7792834aae28003115208b2a853821ab3c4485ba7e8b2b0a715803ac25dfeb23c8ba6f46e093b3e30abdf20b4f31ca93ecacfc1509b1a9a3ef7c8dbb9aa3f9108b042b7f89232781198750e5597e78651a46217eb9b462696056262f3f4b4c7d36ba6b59b375bc8b64d8387301a00b36c2afc36c7f061b27482ddbeb55bebb3144c43a72042e3893895f823d90f3ac0c18504bb52dc2f574744a98c73183c01257b2746936f530a51ba57f6a487a007f86633796509f714420e143ca2178bb04173c941c768308804ce92b9ef05e89b36510ba2a8c8c7c8ad46fd3e614f0baaff2582d2821785814c2a7c40f6f224a08d4a732a306a53b2f03f556eb0b86f6f05c7a20b5ece842550521960301f0d3cf71460211635a5b2a699c2ac952e06fd017b811ea4a14841048c2637d3123fe3b6b67848b18ba49128a8f42db474ea455bd801603381a450504a137c82e71501cea1403a5a4ad22cb6d032c84b2c62f8552a3d02922d9491fe6673d121895b55e188219432c4a5f00922b57956bb292798c41eb2273a066a1ed06a25eb60540042fd201cdc3986345f80d28b99bc80bcdc2ea41d166a72abc9ed546207c17317858b79be46b33f7156bf511de1bc18cdc883095aa47d3cdbb3a582292b0b1c67cc722b7d3731a4f3bb63bb4009562925b4b2a68b3331328244879bd34c258d6b28e8e54a3e59c552be15e97454c083b846cf50581c373f7f73f3ea8158f92aee5bb43905c728125adba1c0d7d4110b6e04b0040a9ec365c9e8b74c4059e78950bacab2c69a5709b379323365311613dde867e6d44094961c876db6b021b203beca1cad38c2d565fea49bcf59697ffe180f3f6b6bce65ed6212c6cb60dcfa0a787280e7eec0e36e7733e246b6b1a99fe91a053338d43ec3b1808c9a782aa44bbbeecc84930e568d58705a560ba11901265885956086feab13795822c14754009b28806e5cfd6f223607525a6fc087ff4874cc6b995b9c7f2645578987b5b6c3fd485834287817dca09cb75a0c0e00fdcf30ea696835000919f0159cdc7aedd3148ccca020f181b2e3888cb6c3c8e271449bac0da2a2042e230895818cc5bc87e38471d3abc51f6c05fd80bcb43bf65d55a0c4c867ee28163618376fa5dada52c5f4306cdd99f0d4583c1399dcff8175f465a02d61dbb98680de662b49b762a8353ae15bc76bc097b789ab1057d2595363cc043e56c5b44562971c0097188a30e488433a07e7d934b89f4bd74b98822518d2e06932403bf81e97347c203e5413bdbaba6d4107e9ab4aeb1091d77a326d7ecbc09706a98499a70f28300a0c80c3aab68980c4d1cc662091bd370575e7986c38cccae743efaaa63eeb9965ae8605a799b447b76f91a15c8f16b6a52864431a19839543d86ab02c469ed7404d0eb365b7bb643153ee2737b9107a8362c4e3b05c0136c6d1510229497bef7819fc0a30030f899c0bcc6366090d4eab165258fd1447a3b12156bb6a4b3320914d797a2eba18bdc5615c208d1328808b667ec39a283dcc331e83b9d9302e3145fc003230c8a2365a5b3bb52104e698d41662318535dd9557df8907b6161a404e946a4b00a52829c8bf911d79385f254465bdcc77a31974fa6426554a12e399b8ac57e8c94163f3727472baebd458cece806446842c48659ac6c7262304fb693befd3b67b3237fc239a782c83afc72366cf9cea621989d801fa2477d564178d5c13197482f373a9e4ed9b2c276ba88e0348c1708c93a7c54d21bbc64496ac21969b975e5f56d033c287af7ac993cb87965818d26458844103957834760aec8c1572bcb0aaa740cd23b71a1a80396e45bd5a2bd704474f3d232041ab51404a768d404fb295a18275720b205b470778226abb26b775c972505eaa461fc52be230359e736cae2299cf47b1f1c0cbddc7472439ad8033608a8994825326b9297225c8fb4c0ab6a51c74ff2059d60aecac1cb8e9b5b0de1bbe00038bc883c25d23be3198c21648271cba8559c3a451624a403a6c390cac13412b2c788d7ab93de4790e8230bf7491e39019b1feba2a551629a5a012942912d2631b5f64e2965c73205bf25fc451d8836aa944063925a221784a9b5c99f13c381b5ad71c6581f28510ce93366534e8cd137faba6c53d92e25205c9cb43d7be5ca2940997ba3c903c04ea5ea4605503354d4bd63e3070a12840e2551f15c20f6769834761bbaf8a8b11ab94b69807a1ab2dcc396fccc22e3168e35c444efe876dc4b7d22683b6ae49467d88e08b795cd556b975155f4324dde94ac7a89ce5d802a91b4745c2b6a86cab67836030005c70944864c0835f8039c23d7a999d43bdbf7428bbc83e8e65c7b81639ad41bb1f357ce9080c3cb57319c1f37db4a3efc386a40cd60bb7a06ea70c38458bee0baa58a9209682e73fc2cb7a6aa55f863b49acd9cb18186b2b64434a5b7a38a2cab3b8baa47e6da377ffa1d6a432c847c4c0e757d0847933f5962722a92b06abd6ad28adb1736c0a96ac8130caa309f2e5893b0190bd67016f04b17f38218853300a05a00fc30330cd907fa08bed95646db857f4edbaae9847af03729205691eb715c2aacaaeed21419b187c7b99b1fd83ace009abd93586a413de2d9313a854142f076ff76a9661a96bd11c2e8986dd9a7b3d9e1076cc21c0787226a66087f13591c896da8e521f6117a9d7c5028692433e86959450868272445450aa42429478a4df821653067cf61638a1c676b776b9de76c50e99084e1d71202c8a563c9c4afb6bbf49c851bb939311b79a358a5118c945f0b9f54c7a5d0c504192a94e610153041a291f450bb44995050a964264a79818e6717c89b4046f16908d7254fa4f571548b01e9eb37759c7e4544c5e5f98ea014200fe291cf40bbd4c3a61213c2ce862ef907457db3b39f82c87690451c4a872846c86ca53681030ff839b24ea655b8a868fca9188cd2afc719b99fb3020e547ba9e1c35bbb7d153508889c7d33526dc071c4e89632fb5538adc58a6a304b17610558b302efe55a0c631e4760c1be689b843633aa31bba7d9c4144a14d7ea15e8895061c025bce225eae5570dc375b6c449672ba29c9c848ed16aff85785953cdf0891aa5756166db1effc3ac58c0969edb54428588055c9fce4b05c023bd386a9c19c33d33d59044f9893bb98f3a77b35ca101ff518e6eb4b056b816afb48b7b1f4f707d29344dc3cd4fc20ddee4ea9cb19d236d7d13a7846aa22c2872f73bdcef6fc0ae6bcb0db78f453b452335a651c8329fa3a35d69d60c44b61ecbb96360d235ddc4f334bfd91d6b7df1a4fed84c88c2933806f13fe06ef15aed96c9e1"""),
-                    xeh("""
-c79699b8ef9b89c2e49b1453fe7ab6858b2da61696644d42d0cdc229fc9d8ed9f38043053da70a864565598b4d4a819187e5e5e78026cae4d4f3a1e7c0775e249b364683de669993e18a50cdfcffae79a31e1aa288a4b6f8827b28cbee6345db8e91d8201b19d1d80454574f170aaef523cdc9ff92b10bbe28fb8ab5e6e7db3e68041e5a9c2e47573ad50e15805d1564837819acc59de70cdc254a283670d1b6aaf2819b225d925449e373cda59460b7609ca12d6b22deba14849de7c6eefded5b1e1b208bf788e999e6307b6ada075c6c94b7deeeaaa423084a4e8359cbb5dd15cc17c50d2bc266da206e5325e6cbe0f6f60017342cf5c1f62536934aee341f184069608fb6f012c3d01056abb74f93eb014aab9ecb011a236d3c1a06280ac2e568d77492cf890846f5cc693a1195c99505ffd7ca8c0ef8440cec1cd3f98058e30295697aafd6dc09a5094670c5d289cee2ab00d0bca1be7c11d85d0017eabf6ebede1700a5b7fee55766785ba95a082a7335c44e313efdfa61e220a288820577b01194d7a581de47c8b238bf14e0eb6d3d19f8f6c5c4c0addac509c93f2873171397f2e9acf784ff75eb9f4004699bc0dd6a44157e48a8b4ba4a43beaf34be3b1702e43f454f6984de2e62493c92fada8649364e46587f0d9218e67382f07e0b332a2096ac209c41e0e7f11be7e7fcc10d11f4875e772a23d2fa91dc9adc605bf1b430e8ffb01172ee90ca1cc99ddb896dab2143b65041c7f4c3d59ccdcb15de31ca6c58f763525ea0406b1333cdf4242db129df0d2dff792d323963d185be073fe8278a8a41ec4e2b92e2ef9c7ec455d63d957af57362d717d4fddc772158117737e5592dbdb75f577cff804adf7e33a0363a505b4cc9839b7d5af46671203e894bee7ef6f49f4158f2b0dc740d008eba3ccffa57e2adf670e71d0391b237fb0385f2dbc6e23b5d425d446e71e1455a0d42071969c08d625f1ef2b448ccc9e7811a1e2a37f645bffbdbf924ce82cb529586f2e3cbc20f27b943b21eaa9cd18019308bb48bf77f0862b92ad3cb47e7391d57f5769b064d72b77cfe21c301aaf15939bf9700b39c9f9a4540dd7a98e99770c5035dec99463d716c8419fe26f6809029ad924f69283172e65e2fb6fa468e13050a0a28245d39c5fa5e4d8914772442f7efcede8155d7eda49d443e8bae0d324f845acc04bb20b462ea33e26e96d3d7c7d7639887d2209072fa81ef756f17af18a7c309a6d24d5448c9552da0bf8d753c7e5d00a4ccec78da0e98ff7545556d014083704ba4725e24810aa3fc407b7c69f8dd40ec0c992c1f56bc66acf78c1dc8444b93ce924bba5356127b4ac3dcbddac6e50962cd4815343b4c07c1894703459fa00b39f7ac8f2476a373910573490e0c27de4252f93a0397195311ca501de3fbf2e8dc54cab6259e1005024934c056b6a84d8e27bcafe8d645ad3a30866cd3f3f85b1685718006242d5ec834afd8a310f2a1451a0f453861575bd1148230320f80f9bf32be14a7e60bb0861840c9a578eb0b1ad3307b4f3ab6e9da924ccdfeb95ce969e6756de4f50a2ef107a19eed220de2a75bd0fc29f5af6b7d45ae9f2189c311bca2b3762b85d4e118662c6790d042ce4ba139e57f4527ef413bc2d369478a2bdfbd13678efd2ee9aac0c327f38dd7d7215378df392c55d003d29a33a3ba8f5dc802008cc15948e19e927c05ab1b877f2b8b7470832d832f3becf92969e5615c16ee4889b6eab1db8d979b5920d8510213dbb7fbef97113faf3f921d250c62a1fc09f331581e38f22bb4dc0721424806741cbb1184736280828474fe39a94c8545a63797a36eeccd6a285187665c06bb78294c40c33e23619c58b8894afa386e7608c374e0f47711c8ef2ae63c18a4974d3f1026d9d32847b9d0b99f00d56f4d249c661bef930d4989e16711c0fba50762b00699802a2a4477762deffd425c4cb737597e2f3c4c4ebf04d4e6225668a95d5180f7cc983e3aad5166a713460d6db2598a220e8f979c484415f5eae35447db6df2cfec6a1fc6c891a1a41a14e7f717b0550afdc112c78111f2116b9143100f4dc03e0e07f9f1bc14387c0873bfa3664f7dd3967c912a78552837a148c9951e8b5e082f194a640baf620da0a0c591df26397ce8f4dad2a421827f65ad7a674236ecde9638a6404e9b3337debd0fc92a1cb9b8d8a49a1d9357""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-15fb53c5e0be680103b2fab23e8c1f8a7c9c06c089a1929eb4c8184030abfaea1be6ac4fd64b7b46a2ac0b84a86fac8b2da83535ec3e2b833433f047a5a62cb3f01a9467ca71907644d2832d628433f90b4d047aa6c1854eb61b085b09dfd6c2fb03b82c429f93949d55c993c94645bda692e67c2fde953960d0617ce613b0f51a0e300850bc1f233046898035a0e37b8f1064ed67caa3fa181999a9501c281b8386467835a0d3598cb98e361ac800ad4fa794943bfbaec427809739c5d21253ea721a8ad75db9f5a88baa356bfa5494081e3dd4bb5ce1444fb8258cc867eea28522da5acd855ba744572f28b0b3772a195836804a585351b1db059aa2463e21bc00ddbb177bd7848b7895727472e0730d52a058b3d9b2e8534e29062b84da503fc219729641e2a94890cbbdd8613b47c24795aa5012f813a8607b4ee3873a472167379c7feb14c661cbcf094a38473b624c9f3d1c13719b361cca2a788b914e71626032aacf02143376a331674c00121dd1e2cc27f6aa5ae7604fb224c55a56e6c6ac4e112259666a450728abea1c2ba0b215a5532407334fc823f2f538b19c41bdc769bb39016c6b80e979448c2303e5b369a0745cd2a52e09ea78a31656b5eb1b9911cdece131f012b2c1a4b58c7b5fd6935d3dd4537388aa6ffb2aec95046b93a42c98b1616c50ea3381d5a663c28c1ff5a6c539d762a2e069b79514dcdc897192b27b6704764c0e3272cfd76b06f18a52f10b843d2c245451155da8a2ae11bfa6595e686799c7a5a2e9710881008190974052d2be87f30cc7193f85364f3e7691ace93e546c4a5208bd0b18ac8da883fff99c555b4990822627904bbbe577766ba2b1865a787a2019bc7f70829a17ba325ac65b3b8ca922f2937e01179ac7184e596485fa326ff10320e68609c87560c58a281c7786a36105278789544ba33237e45b7f0f6c51d7aac94b4c4b189bcc6d01a74cb4841d1cc35475735d88a8ba650b8053693cf3680ac01a7a23024746ce36e7a86d49a9843bce16374e2fa845277207c6d949aa869ea7bc560da4872daa20e882330f6250a7cc9fe879a805974907b7bc3e0a06f1436370557a90842c0f6a5460917021e975ba21682339240db26c9a20b8b453487555aa2a1c5928b0304d4aa4d009cf290c006fdb5f64b94824ec1e2f51c3774656433b811cd33c54821800f81e5d48a5d43035d6dc36bf6466c231690fcb48d086aa5fcc69f5a70e5871b29c469e232478a684a09a4683f84933002b2196db7b37f08a2a82a494a15ab69ca901ea289985b500a40edb592628a16c4f827b3fe29a0f92718a8ac57195bf8bd5bedb9c9035c3a68300181d404be29427f02027506079fb9534e882715b388edcb05e5281674f161d739039232a57afc2ab8c3bcf03182463592ad5d0375e098c3c951e1e1284cf2b604475afc2a9af4da0ab3cc583b3991ebdb0babd1c92df9104b0c1a3abb8a95bd96a711c99b7b62ad244cb4fb243cf1c6714db4fb2a7c9a21784135a5e00b1b33857ca4a948bca6abbd212b1c06aad751b4f787b9a7169aeb8094b14f93869481c9e66a4c97c1a7fbc18fc0443679827320689b8901544eb2eca55c9450c1f5a4379907a66def76ec3f917ab7c39a791a44171a549f93ba9a5c8bbc19998bbc2bcd712b224cfe6eb3874130965972dd54ba21f5886be038f73698e3eb519578593a5444e918880c345be03e19f45b5028ce557f454b2aac808b1f98fcfb3c19c214a2db082c492ba02d9986a570b66c574d2081d80165c72f9053061c6454561d280558fa1bd7921b572c78773513560638691657b632b8110bc31a372a0ec6b3b8a3a9259c148450c8427a62fda54490ebb6acc42804721801bf83c7b656419f0801ae2a722db4037937d08064cdc3216e6216d402aaceca387bc56123954b8f724368ada1e7f01265d0682ffe847fc44565e5577125b815eca0c97f2555ff1520e2c4c5e6467ac09143bc797ac6326c68066035ca14663a335b5137544b876e9156942a3cbc9ca8734ce6f76b9f51b0a758b9b50877f925c4842828a7afa4219928173b92a3a7692477ba098c966a42001103b198b1a2094c42a9dd6cc1cf46c84945aa40bbe71e48a20913d0ea600a33164eeda16a811168fb123ef887496d20f0799b60055b072088af992055fd18766111d70a92dcaa1881c1b5d03807e4a948d0937b9ed4385a6479a23930878102c0c9a04cd1b51bac6a7a81cbae47b15f33a331a5303695a4ab229585d27b3a7105419952bde5c659e089d38789d3a82212e03cd0ed7a6efaa913362b55f386d2e4b8d2565a5781642d8e970f6c9ca25d2acdb8a3da7f493e37331d26432c530bb401a4ce65c463d24194b2b1d708ab2a34009cdb02b1a96a921f42c90488940e7033090bffb30b17b06bf5f3b7115a24baa94a1620434247ac6c9579f42294e1f50cbba44829640bb7713c8ee957174a85b295bb1e44943db036773d91b211537fd9584954726cb83c4498658d1d2a10d2b6b1593348423aad4f6bcf1807d6599a24c4544dff617a2710e119bc17785b0a8c57428ec993e5991f76a9503fc580e4c62a0b296dc52a1a2c83846b7673ca308fc0877d5f473012c5c50a67813424792171e87a7ca555c0bb380ac351baa05074abbecb602610f1c095a4d3aca0bfa11092bb8dac09918449149960dd7d0928dfb2fc23b7b50d85012416e2d237afd47348378c024ac5b14c9ab4c5507a1355685550de7dace35cbbf20a679c9b76fef5b795e0a14c803c36984669cc88acd814d9380646edb1cfee159040c8366e7396af8977673400f5ab2c21980e2a184a472563b1c32886c58a0d68a2d39275529c3fe1a744c877a0605c5da7556dedb89ae8731e729b6911a6194d71102fb42961bbbf770873784af83c596a66c2a94a7c851d9677c779a0ec527bd761dec9bc9d1b22645eab949e31f1968c649c811884a765ae00e98f3228fb03643f47890f78fa6f0369dc37c98b593934a3937084f0664b10c091e7a1315adf4b3f34b5b20123905009c6f24c7f0c601b8f53664b6bd6d48cb487b0d22d45e00f19409a894f3ea32b2b3ad0536ac05e420a74a710dc8375aa9610d2640fc7818ed599598f60e21113670b99cc0d96447f6069e0b193ae79277cb29883506180743678b3c9b53718974210f043140d74392d9be2c08bcf796b462211d60d618faa152e461cebc3aa675ea1260f4585e810cd4ea8415687d3b2405ca72a46129c95f9bafde87061158920c4b13a3c5300918c8de4b0f840410ee91077d611971a4094f3a236230337127c5a789209f36c39b05b6618512ea7c9549aa4552d30ebb5226bf06708b4621a5cc8f58b8153ddca32748682e36363df63bc1249ce1205484048fc8798ba7929fa627404f072a2e0c02abeb48ac9475dc1c087e427309c2b701668a291a54056047def6b10618a34c550235aa6d39f05af809174041b2140640c252b604e81e56f34f2f711ce6d64e56ca0fce0133244481058aa477628022f2c2eb6c544d1045dc61aabeb0aa42127bda479160f582cb075619f810ca2ab886319bf87b12ab710db03b4a1a170be0699f7f333a46b18d71e6832c356fcef57db82430b1bb745f2215fab44571d4b0d9d568fa5cccc2919b2ff6b8d9281e07759069b9a602ba7642f570b20b15a156a1c322447323a4e9fa1219b812b03a5b2e1abe8c5b7ac26a8589733a3fd33480e18ac200362e5a0dfadb1252c0b2d8c139e4532507329ebc3910f05b480ed196bf86166bbb2f4a96a91053b511c81ffb748f420a33a6cb771dd0129cdca037e4533624aa16fc8f18a9bccbb475ef0a8b978ac9090a4539ca1fe06c5501f2b34480b025732a90a01e60ba9dfeabb4e8c61ed5c4396423af0aa79b86157e687c313e5623e6137f67a25680eb6bb841b80530362bd1425ee986b18830509bae9bd9926f020cd02713c7a83e8ca4318a044691637d03386dd28c3ba081481ca7649939bab47668fcd4291a4885317025e5250894e968168447f9f5c73702a5837802cc4593ab99242a59a39fa14935eba3e781a7f2740fbfca7141c821c8921e7c52b4ebe24732118cf57590dc919d09ea18d2ca63a605495bc2a88f9922eb356fe0343e4ac2666c49adaeea898b1c023058bb5bc4437bb6b798f59ecc8b565f811c8ffaa13cf8a4af8374c3221c3e1ab89cd94393053acceb40fd6a2c1d2c4c6316993835b9ade3a4bb396a5040574005ae9f1619c2fa66ecb363be8a7fb424927f8033ef8b2397a691d2670195590e9299375ca9b5dcfacee6eabe078b28e7aa1fa314cf3c866667cfcbbb5b57f2db74fb19e5e0ab5683efda06a93631032380727b6a801b309e8e810537ee79b47e8007d436502f14e7a898d48484c4c8886f0310cba2c14612e7a22ec88bb5e9dcf865776c37cd5b1c6d1b18798be80b9562ba4752e1"""),
-                    xeh("""
-6828da82ecdc732f9f2bfc44c3d6348f43edd227f8de2c883b9be7f10b00fd82d457c2cc8c8bb275ea493eb0bab179eed34c870bfed6feb8de10c782e20182e3525bc437fe2d042807afb232cb9d93671583781bb83caa6205c4b7d800edbac31fba90c06ed3cdaaad0a876ed6b0b36baa080cb98709e2bcbed2422dcaf3dd4c43661b71996e246ae507c6abec79be6cf0569ab80e959e4efa0f1fc70ee620595ca82c77d86f23f958f7696f3d02c98b4fefb8c0605211df49d87f03284ea641f66ee2463ca442872bebb75c69d3b86f5e0fdb4c87423464362daf809a818f4a6f123c852e37e5695113f200b3a5563863942f41225d11277c456d238815a6ac53b4d0af38d7ab3109991ae2e36fdf04abffdf4b79efa8b10c52029dea1ea3119681531451fad6a51eb06ec1d162cdc4e11d842e283a7bd4be32cb8e2b086d45484710ab0d23dad66816d914f1b69ba17f9fc8c607bf8807e17f615ccc449866103ffa2c72cbb7efd44df0d62d6c2d8d801fd75e3bbfb5ec7e28498719c28a86cf1d69275f08116125f1a72f5a6c19b38da8a3561f8cfe2d4efaccf39f77e9e7a3413d6a556386a5350f62ca7c33591f94c7853bd6d4e5256a13ccf4cecfd2ba450ec6c03d7a3a48305981634ffb33533fea02d8100eb1ad574628a56f986dbb5eb9c603e52d7327490212ee4d1632ed4f5f85969b53d3549c63d73eda74479a2e9c91239b30c50aba979fb2f6209c35973822982ab252acb8138a0e574a201249fe2e0987e37705d714fe74892dc690e4c2b8dc6493b55a75d100aaaa160ba1e5e71af05400c35a04f3b76d103ddfc79435ef7e83f2db5541ea16830d00554ea942dae48b9485182634312e70c4f0de7a9a9381652f3c6732034f768a07883ed3afb5bad9fcf9fc19963db92fe4c23772e5d6859deca5359964597ec9dbc06c0b988fba9c26d03457c89cf1418b5c2552e51fbe66a5d49a39d69279edbbc01c8dba250dd2218aa0bd60bdf9ae3c22e6e4cbc2b074818614be6a9e6acefde06b7a734efe82d061e479fab45d255381098d7672007d672df5a08b0d659544340de907aa63a803f188c8ecf09b27ac79dfb10ce0ddb09b71b14d839874cad31af07f6b13e4c6aef06f79359d131db5f56653fd135b0b553bc03cf9c8c24847239247c6b29f646e56c08fa9735c218c9f3ff895738555640518fe8f3a21f5752a04708ff5b157a5f725ad3c0786240b25d8e4033028349691cf58b5a17939560ea81e8d721940405d44f6e093c46946e496f2ddc4fd77c0e059138b5527ff2809b8f415f00049d07a24c97e4162c2023859d4b1dc18e45d8553a478dc9fb93427356bd77da7e641011863db2158a75ab3664496ccb0dbda445faffcca2d841438d6988ac1f636993d833cc8d44e7ce92108d7b904a59944ff47312f117850268bbe7676dedbc5bd17a8ff5040107ff13b61c5280be9d21b9d9c9ccdbbf3031327ed1d2a639c1fab9c3688eb514be79ede525d65408c913cf936d219f0b8d46d4861e109a80489a7de53de3b55809cf5e2ee1d0e4af20416c51d3d4d5f5a94e42279fb39af570bdf558527f9df41642cad191302d3c23d5f1a819996dbbae5a29e44dd9edb8a32f703d0868ab6a8d6714948b6ceeac635539ec9baae0b365698065c5091275002b43df42cb83447a7e26fe865834070be51b75e066b00524505b01b9005c346e662b874837f53b9996effacbc37ba75d271f3af3de97d0c1f6bacd3c8394c7fbd5218e637089175b74f493f7006229231c21688721a5254498fb616ec915d7b5f04ac18520dcd8f6a025c6564e6109fe19d0a746450454f76fe192e4e90aaeb38f070a65b8bce90c956ba2c007659e2d3d729ddaa117895c8e0fb8f757604bf39eeef565ef96ddf146a7a71f0004dcfa36a504701bd3d36d1444dd95848b7a2eb796dc311dce1b83ed731684d485e1d860ed2573509c15a71dd89bb0199f92c54636222ce4ad5c034806167d925b47625b00de711455c077abec03568acc201af169d36815c78c885604151973b305ae5a80f0cf5ad11834a48b8023ae6a4f0a60f087dc96fc6fb52167f251a3308f09ff1ab754eb87356ab68f6dc88603049479a5f2d535c10184924034b51e3824b71cda2373000ce341e0199781074a869953386a6d0ae36b6f692c38913ff9a69c061042612a80bbb4f9b4d39""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-9a17699301bda8f100aeec84b6c2ca606648db979a4c7410f29c28d6c5ac1b2b86f6e8a1fe878a5a7014ebea98d9069e88705f9271422cd62f51579357f5035477ce73c2cb94d422b921b5efccc962a81f1ea74f57c8457023887b93c61d02178cb5833c2ab733b00604a84ee3a556032063685a710df1712b74aee69007f1bb23bc7b2930e7c54224b5a9f3b204c070a2fc82cc5bb16b9602c37a659dfbaa31976c44619fa2d8997a08176a4a383761c3295c114a2965b1b11ad32b4e20b32b4d39692772c173a1c0bc45a87a7a9e4cd86b537a226fb165bab458f5a46ab0aa050338a94df46d46a31e059382860bbac2ecaced47959b98213b2855553b351ae60f4a2653571772e0421cc9f78d34500cea44cbdd5934535678cf642594050babfcc176e30325a96cc0b360081bb9ce618f51d23eae86c8ff7a4bbc37cd98351530bbb8888264c46ccbe02b4a638ca614702238a240c85909ecdb3994d8b1b34ac30de4481c08944f454d95d761a8a05b024bc563f5afde38124916c5f4011a8fca0e44eb1292458f1c72bdbe15c2812b017611a09de22942112df5fa8b7b314c50aa4107828ec70380bff6750e5963581b9c26813ca81b5a4c7436b5b5962169ce0047bbe6c07f76a69cd4674721c2244a09cbac849c3dd730167233aefc6ee7b72b81896b56279d9b861a97939057cb4a2b6782ad485c597932963738abc022b5b2c463ea1dcbfa4edec34bd1595363a7800d6c32030ac6aae65ca671c896336f07666aa2f9617e924c08e93084586afe98b1ab184f951a1f485943262728e1b5c7c1209a02c247e24caf0f74445a22991fa1624010a12dab52ed45523d28c5d3902cd77b87402bb3e9d6b422ea41f033364d645cd6240e2813c8307347a0954bc3907c31770b9afb4e1d907bf9da59da9cce0e8a1396879e3706662022b67d489e7a501e46580cf7c4037573c1d597b32b92caf8b87106251e40e897c491072c358aa0723f942badd4920cb252042b330a9283b6f4859494a453d22c5d70f03d75b93495985c6aa0b0c7093b4b103d4efc4dc3d079d4d2b23ef44c5b002b41d80f0e45919c76939df63ada491ce4a4225ed87487d1931cc28b3b2658a6c46704aa327dc3870a7067c6114ba86c95ab42bab5690bbb171491136db0e50266595faf8a171fca4d9200052a668590021882904365e6195ad2bfdbc26dd518790ad447c44a28cc770094b738ac5b9bc7b0c64e4cca7161a99b2c26ab28535514a277c983c3833f726b9017e98a53a93e27652dbab4675e304bd2e798b50b27aafac6386bb70367b58e2853d71228b19b9b4a747d6c81041c16a5947a0bba44a26d761a2f87a66d4bc272ccc79f1b292827a7f1e93a7967b563f8437b859f911176849b33777a1921d73e5ca0914f137e2159cf4ce575464147f9dc66610abca6061127d126264326e4e404e5fb351caa251ec20808366ec9f447673a89d52b521b54a3d87184f4aca669f16c9e48be599060d5d82277163d6cda0a2d5805ef65043ae704d992839d28a1a49a675f843a2a063f05cb84ee234218cca032f32ea8e31b84d59506312aa668130579cda14cab0808406df9b5fd5c5679c92053d1769830c5a565b5db96522aa16f9edc1aa638073d7b875a4c5989d57be049a2c52a51406958bff911ae72b90e790f9b21ce15400ba4ab0fffd00cbcac8e4c6bba6543ab4da9488d6017d95abe7e477901ccc3ab935d67086c2ab8c576e1a1af4b9ceb31857302a91bbac2d02066681a5464eb0491b893f3611a94e8b2140ba407eb074164bacf341d4b375e143a57d149a424f00fbb5730646a6bcd1b07ab25993e29ac7f29a93c954b796830a4848b78c0c1a40a5b3bd3c329d33669c07b47154e2d2c129efa6d46600e3655438e98243b02a1ce85c73b05072652c9a68072c9b01088581fe919cbc55b859631a42b93410ea5493d8a1b1b36a1f200523bd2bb6d5993a6305610fa20de08b2302b9e64b5ccf76274bb20279a7b4a3e39a498c662cf6b095633ab7ca05977c36e55b9c20b226e5c648bddc3ca6934630b389815c38b89c8001933b4c715cab439c78fc55c81d003065054d5061d1d80afbe083ff9071ac28c47b1ea8ba836961c97ba6039325df1b79bd51b66790760e74b8315a75f0436c441361e37075a75830c1b0310e763205645d482c4870336de131a6cfcb2435119341cadb7e70eb3a7b7207237c654814c9a6e04c5955e5135c9d311786802df76bf33c37a04f84ec0f9311ac371664ca11dd56218f65240b97819165d90b113e955a19834a144e1ba40f97cf815b90b4cb7b06612168c6c46e11d4d79857f04cf00bc8e11b930588216e7ea3a5c99caae7b076a4680bd76aa3e1b806f428c8301641640b938743770b5c1ded957b8b1aae1fa28e6f19a3ac59f50a59a9a346766c9ae68a5c920b0377891511cc3b3fea22a0b7216ab1c1d8d97139d985f13345a073434150083cdea7977d9a5eae98314d6898fa14e89e4cc7d417d4b060baf854840e12505fca30bdc0d60a12fd30bacbd62287533aad397c208b0bbcd50b8f19431fe727460d754668309090cc81d8b7946333cb6fb890e152069624a923476369879f04771a0db28002ab860578fe351a2a1a2a11c198dab6b656a4580caa45e45d3987c4445f312c4d14c7f70505272364aa8341b1753af08040af6501f69e96d108a48ad245ba2663aa154339cb48d4bf55acfb9534ec42c06a11e4d4b3659f65ccda82661b1700090187cc57b17b50d66ebb7a44672191193dee20e9ce21bcb36be9d312941d622062c7906f5ccbeabc861d85ecff006300ca549043dfccc4400118a18b49eadb276ac45469ad69ce16c60bb717368d6c7b2f068bed1b2fa930552731444f08a239bb65f173b7e61730c68bf39656ce5f7425601519a2773aeaa3795d98db1146912683396b6c9232b498b9bcd3adc70f0935d71e56737a422b5792f75b12457f8817d926c44f8a8e2a34573ba7228204cd5ba24c7f245dfa0c1fc50be04e36f407043a4aa7a6f62b271ebc30bd76a80d242b934cb8448535ae51dd43b7614a736d72c14a577915f9c6b62cc10d0315442614a36f32d94077e65978430597a6694410888299939784237c991262d38a540a5e84f326906a7883a6ac3b05bd6051c5a11ae47809b30ac9a31226281a39f63be3876bbb6a896857a5177a94b8193acdb441125236c9cc291f2d7bea99025b282328c571e93f2bcc943b3d1f6ca4e3784f4314e570b48d483b6b20b9dc41280610aaa3a345e2645a3afe5b4f3b507b9c1a3502c84f581617f2449035ba524ca6a454c87c57652db9535b926557a19b157fb3f3896116ac1488a000f20c5251017c34416bf6d13c178204484c83da35817d0975183170a100c0b24404645d7b551ea24569c5d92235e6df27b105c065f66b23f4b119e5aaf6eb9ad73f3ac55826faa55021ee116d9ea096c350ed1c659751bac4a57c8c70126e736ba26f276b5391096541236b3360d9b76bea1b519d141f8fc9f4e8411d02702ff366aa7e1a5629295de395eb251c63e5170c1db22af621dadab30ffac21a9b400c8a7c30beb194f027858569029b19e43929901e18fc45c1d7dd6b464b64b14984f21286ca02124beec214d354ab820b4e4aa8a26a35fded6cf0d95a26f20123a909a7fa708c74580b7984ee082a05f8b481086b109d61b26fbc171844bc29c0ed42bbad4cc167935a9d1524a4e162a4d598a6e23ce1d404cc4a5b9b80481fa3b1e416027a590880b38517ee34e768c61c93cc170c4c8a8d3abf3e79ad2b53e710cc521027d2b8366ba7583e9744d68ebc33b4b45b8f04e44b98f890bbe3bbc0209d93a9d6140e6260cf28740fa35cd68513d4b024d5d5463d664b3d11a261d5bc5c1b8ac71f247eec4c66b72812c308b3b93a633b80e2ecc502813cfb4339c24ab91129c93b56b4d87a132d835986e994bf61432dfa98477dc70f7a66b53f88843e86ab729b5f79cca14e2263dfc868e2b81432bc47fd1aeac51c3a1d49549423d40a86210317e39d9ad15019e90050bcb882ef7dc09377a961465098d357061f8549ccbc7f951639e3a73b3e7a6db109ae463ca41038fa32418ae4777372121a5470622964f514c76c108535d7913fa16954d6668e2e01b16b492dce96a932532baf3a413a3c58967a46b80c5acf276e2a86cbf499009a5685f392dbaeb4621b66d9f1a631a60b59d03a8cef18f87c9c2cfe6290130198e67b8d095019b0484e0d274e488640db473d1402929cb501e9291cc428d37c0264d1c3edaf23921b66855f3b90ee38931192e0b30d24650e4c7c62b62b0bb885e610e1a9e542c7ef8f4f03f8ec111302c342652fbfc5c1267c0776f8f71fecf641804590c1fe43f2ff453bcb84289c9ed5bf4a40e4ce8d367598819be8ec4ed706df4d26819f69729c2acf274515c8e"""),
-                    xeh("""
-6bc2d2cab5f1a65e54cef43e6e70d79e001ef07e360312b952de8f41e1ab8b58ca8926a0e5f037ff2c7fe755b47e46a7f28d2993d22f0e538415adf94d3dcbad32584fc0706fa28bafaf0f29ae6cdc97811406ca855f7ceee962c863e0b3cc1e107a75d213a550265c5ca4ddbc573e3ea0c7fbf5f7ad15a470b71452ff4af1c0fea5b9082a210988b7374b1541c6a36111884697b9780793b1fb755623a3e2119afe55d031d751b24a8c77f5fd15f7ebec6f9bdd4debf944930afe82e0afab87a9f7629bb146d6ae4135e1a3a280479347c409fc5ee0f811a267bd959a9b476e7ec49df9e616430451c56e220d49f4271b8e8c59ec7d640fa582683e42d7b07d5cac0aa26eb98c17e7c3c94a2627d1fb3b76748856cd1a5c5e1f6b0b1fbfb396c681e809a60090dabbf2021627ca06950216cb8c5d51e689ca76ef9734b23e3afab0069982b6e033b852e7494ce6bcf3812ba88a24edf15caa59b1d2ac146b18a32ef7ab377c12a44e0809790826672610d212f675a42df93e149a18f610ee55f68a08b350a79416174a488618daf2ec8c93f1f466627dfaf870c293e4a94e38d144cf38c2ae4949384c930dfdc17c9165d78144cab97daf68143f3c40e957220521dc28f8c82f3e14091cfb78a5ebc4c481dc2717616c36ae8acc74421ef4a9d88a4bcaf42882e39cff6a0eb52a9b6571b0c2c9ac18fbee2e9a8d7c17d2008912f89801f822c28d0751397e5283b02c70b33d736bc5ef99fa41348bcb68238b47d32a915f8e0999bf9c5e9afc497d7de87fc8f78ed60aca03d5831316aece8bb1bd5ea82ee05694497d90d337ec3142ee6614971f925156cbe074e416c9e052865910f03c9057c8fd6c8cf12c2f03560403d73e3e96e9e71994f03d0b8faeda1c866ccbc77feb536eea7103031b0037e9d0c4d6ebaa3db432fd1258fe7bae3c4ebb639ffc7b7a5660efeda0483ed89a256041cfbd8aae8add367160efd72a5332c8386725ed754fa6e2057ee5cc0b3d0f87961cc2e22065aa1cb22f72888ac5a509b9f302645bbfa64eaf2825c6c30f10059935bc7a41be3471c7e8dbe0922a1d6a8beb91b21e2181c9900c93caf5640d8a886312451b7c620b0516fef8088d9ab966559be634d965df184fc581062fcead1b9675a4c620ec5c66582ff023fdef67153de6124abff36ef884ff2abdac8c1b29425616b6ff8893c2ad7cde0f2a0140baaf912a1a158df9fcd45104766ca3faf2f22279e70505e6fedd1bcdf005d33d0ec89c8f82084335e6f69396d2ad1da31a577c64c3c60afd20022067af6007f7a35e8fb410cc0e1e906a9ef77034096e8a4f32544517f75e3833210cc8e5989f440fc1d92e2106244c00ae40e566080be0b2d14544a02e950ce73dd3653168575f8ab0f6931b58cdac707574a432bdf9d4c6bf2b61ae8ae4dc54f7e48cef7639b29ec5d918a06f468c8162cd7b33a627bcab108dc94a4976f1be7a9b376f8982de227462c47cf07f7070816be5256c59eb2b4ec6268fae1b50978722558abd117f5399b071a5f7f878530dc877394e9209c7e4f4c1b5c417c402ccf0ddb247b07e203f71e7a94b7d41ce97755b983fb376e0da89afb76b5df6f166a822b15c7e614afdd9c004f1883fdc8ca12c264892e1d82ae2e675e8d5c9ba11836ea336150a8b49f29b0b7d98122cb4fbf6594723de1f1cdcb4fe0a44976a5b40b087df6c30241ab081b1313c396bfaebe92021151f8e2ff5a917458afe820f9bd709b4c8510f3801e091942c626a802179d704bcd65c1ee123fbe72a68012dd5a98c0d97908b1484c56ff7bbebcfb6d2aa1426ed7c901d61f01926d348f20a35ea40a186a1a16cd872e9bb53f0fb9f44dc5f098503f9115dbad301363ed7d60efacbeb8ff02db264b9b23baf595f273360d093a36f0276154e88d413cc6cbc9cf64d133eb4cf6ed845827263cde49c116c6e6f4c25f8ce9a611ece5aca8bcc348d57a884ab926c96251e534a5313e52aa7b46d61b85d66c5edc065c7fc6a62909257fc8b6c0b171283e25212e3a96224d7da12ffc3bf303f16f5dd96101a7b816b260774a22c449e25cfc991ca4153a093058a64ac5d3fe2113646f598315f3e1e54bedd65680c6a2614e1c8af922519fac6bfc0e589bc28e3e70b53dab591e6a8942b2bf62bbb9a18c09b20cbfa4be5d7cb0f2fbd8fe948c3f2d9411845f61cf371""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-8398ce8a287994fbb98d1515027626ad0bbc20d68e8954ac322789e8ea8264e6b060279df7eb3109f63d68d8126d336e1f0ca4dde11bdbf11378d0ac967063f8b91563ea8ec51346e3b21e886cab1d39b368f77cbcc021252299d8e5a571f74a9e2a173566194fd161bf1850b24925fa85058da68f4720626c3c96c729cbc7bc7798d3725e2411eab78843056904b6b760137e790b0595960915a4934351ae7d0b098dc9c603e1879efa3685480a1a3b3492c5bdef811bc55c28e0ec9ed2546512736552427944a1bbe21593e8b630d4dc25ca2b31310423d44223a751bc11d0b9d4f60cdda5477e6406d47b7dad2b9deca294786c41aa4047ae664c86a05128eb1916b6999c12499e3993f4c15200507b51f237703507db46a881f4630d079cbc95825f91a89579ba30004ca7478786d00126d22759487ffc192c2e77c81d40a05a33b613152a91b15f293027d8354df9754abe701c89c583858627a50c5913850288d07279865bfda15750ca82e7db9dd2ca535f882a75a6ad8c8a51d0232eda653e033ab3afc242c3e77940258b355554a1eb84657bba96ac255645373139b1c38b14ca3c773d90012503579a69c0e42c4b263c23d8dc6fcc09491ea83543028f757838fac956e3052659ec2f6c66380d9b51df627e7a80560a4728c4f583a4434eb8f38a258117f88639669ccc55a67e309c2e788319ac543966b77fb498c43ac6a2f7d02d3d88b4dc85a57aa17286947dc2d7a40088c26922cb3b0a53b02074621314f6c4c431dcc6af3549ec5158368155ffac9bc31941b8c60e2147a73f61183cb67fd144ba0090832958056a65c88eda50518a54ec637d8c934a2230a608e526b55b3b2c515fb4db3ceb528661e17b2c44c1b1e5a7763cbffcca5211321f4aa9252138cce7bbc1e234bb473a845775a2fee466195ccaf6e8c0c198c434a389cd8577cef4a800a984f6c002397c3c2706cfe96743520ab2a9257206f8c6cb387bc4b8ca913a992616296e502d4aeb8ac5b96ce5e283b6b98d289a2097b02007e17d10129a55dc0e41781b8cd292292c542a2b9e180a95aa5bbec8e6a4cda47ace3536e8b6c6ece51537551bb1d47f82f5c0962259fc4909cd85b2378a4d4416ba2536829db4c8e1f561677ab24f21b853c93bb6a54111583cc7a6721abb300964959ba667a45508b81b15b2f30e6dc2562d5131f7b7255d4cb769c47e05a9509bf2c3416212dd2a3cfa788b76f44692959019ac16f240892eda8807f93b86c6c92c2b595e55c349463db2bc453bb137d3dc94c8c15f54221df02b8dfae58e6d49b87e71cef6e48336686a1e68cd841a49ed107e91fa26e29488d98c281bf27997c173a6f9043c024676ea75965b7bf5ac221a291ddfdb2debc3b2694c36373235ab8a7e1979678c6cc9fe767b16491069f59f6cf54476770528f84222f223685307df567806c64f4d334abc3955b7772f7446059e316bdf6ccf69b6169a52724e05a050fc4c5bba010089a2e35b8313952f68a3197ff95556f29c85d5a397b54f05c9940cb655270121b3c48e6af77e7a321bc77a90286548268843942b5e80514a01dc12c1015a8e1abc83e684e97274d7866f513a12aeec103e59bf7a6b1bc49672fa5486d2eb436acc3a6d356a1b238fa3a5648dc9ca6821b902cc1167c52764426783b3a39fd5285fc142859637ece183da73c899b78b20485ee80a502c419a70db4547114ae71aa6cda695310459d67ba841963189d75d32f7a767a1603567534521cfd68511e23a1728c693ff316a1a21751162501bac2f6f97548e0c5eff67b2fcea8814b12c38d4680a54a1a28a64c159521ea08c901a0336355c8fd87b003c8e49068455c733975512e516b4a7c542f2592cdc7885e1299e1ce310eabc295dd0416e673e564c2f37ec9482f880d772643c779eeeeb0c8a06606c956b2556936c7ab0871416dfa9a9465279930621dfd4bdc4548f4715297ba30fe4d9a23f460fa4c00e61335ad50c86a9a707713b3ad32aa7f45a2a376184be72caf154b3ff93b873543c1c5c90fcf77f0be2b5f66b54ec6754c7a50ed0fbb99f720f36335e634857fc8c9e3b1cc8bfa5b53d371bd51c67ee564855c57b3a250022056868f2160cb65b758a9663438fccf2c39b866062f668d194a29dd1c809d4099084b07199a5cfc53573e6291a7978b848844c008f3fd45aae742d49f4af1229c49189bdfe177ee5c2c5315940f0024009eb4bafa5965a472d87767d4dbcbed6f6af41307cb48ba8f9828f229160df4581b59617d34203450b0426593947fc84d739784528081105c2c0fb9a7af8be6045c8606cb22d1324d5abbdb773c69f4bc88fa15e136509dbeb698ea0bdfed69f8ed67477e10244304f866a912d2c01bb4c428081aa46b862a6d420cbe7386596c34ec87f11084ed0493952a656939c5614e6afe7a022756621b77bc27648be0e86a763e36f8015b9e5e68684f73680773b5d5a9f37e90186fa13c11604e9f231ebe02a9c531370778579649f33c70e4be811ed668e62d28f67f7133f86695b790bfd2a39a0f22a49195ae4a40196a974a1b3424f4c574778b0036b21b356835eb2a142084aa2b736e4a810f08a2199c86c3e8a5ccf8386498592ab3570c6677ef089c0d05b06ccf4049314a8b29c9d9c18ce40933cb857941cb59abcb499ef53869f155bf2f4ae7e1c3e41889bb0682de1b4ba1ada65289669a55807d10672fce9142d1a8a7ca20c332b4064ca8a1fa5a8c4a898c76cb837b44013376fe1577b0104c95b3757c40a8c70d926216c4e9cf072ce4798b8d38776b3786f6136dec4b9c3a35ae088905df969ece6bd26572c91d78242060c54c9573a789d5110b25db9a5ad1474f2694b31553d3dc63d69913650287f6296854c46a10a54acf869757de3bb21342d26825a34704966e5239ad16b57458ad75881157988d5b0577d432b89ec573da15152e89afc7cb0c587a3db87bfe0db286c528c4b211382172064c94210f3b4c698124d860a13e12b87756bdd0002423649d7e7a1f57676c6e53c1ef6bb6152a932a110810ab80c2001aa53cab449a6d8b9a734e48de8f4777fb7c6f7408c2c8928f72482950b6497c2500af7568d514c4c34151f6749a0a6b79ddbc12e03c5563702ea733ea142035ab4149bb58ee56970378727e6215607a64fbbe7888323bb1e265dccea33d1f96b8e797532249092a202f3f9c9e7026483e78251cc57c1977c1e5a4ce4f9bb6eb4983823998101a58b0b785823b3352c6a5e2a8660fc143a5c2653e6a3920a8d75c29247a846f578abf56c2dae289e62d1a581dc561c946f00edc202222e0489b697c786ddd18f38a937c7f9b9cd0a3d85a9960ab2b470e5c57fa15991e74517fa9757a4a62a245392f3361f7601cf0040e391808235a593a88662895140e468e88ac4553908630564e61a89cfa2c2271a27c848a08b97adc0444a7b72bc0051695e197c91eb4af7ab869a4b9325ba36d3636645b23660b0a101eb0af171470dac7e4d72c53bf4070706c840f11d8514913873667f7ac5ffb6c011aa6dbc34c8bd22c597e0814feab71a99b2969b8679c4368282bd5a109781b02561b59164832b6096a13b204de5d8592b9045efa538072331f984b42f43a44d4ca6e2792bf26a4beb24089d046b13c25ec3612a73c19a8332a9fff70d5ff71851da2927a13942e8aac355582fa347920443f9a76c1d942d624c8b696bc3825675a6150cc56b0a3e5a19bd6782ce9781f4f2a4fe6b632de07047828713b23d98c91c99091571d90c3438c8b64592ffd747f29351d8ba91a2d6349da30247db82e2051cde3b0094c4aedf7556596968ae6acba7a790cba9c1de26689cbcaa4d61bec738a17f33b666764a2ffbafb488530f0c1b93617be1677a53cca42908c8c7a051ecb6a894273becd75313420b3d763a57ccb7cc73c8e94aca79ec03873c2ceea96b16d67c34c99f1f3642eb6948f4282e8d50ac30a10a47ab8859d54f86011a652913194c8b5e3139fb65039b4493a07a95b89177a4d1798d35cc1b10c9f0ea8b1afcb5ecb2841b143930c58ce8ac90b3b11f43837645a6b9f6c08b538a2b7b9272464b9707ab4faf9253012cbc985ac5594a7609a1b82c13bb886c564b577247f886382872d32102d0a31ed410942c5b1be910bc63b0212eb918eb0485e6734fc5f736aaf84467692534e0161c4258eeda24763894d0598795d48d99c56771139fcc016e516a29203774d038610bb5a57314a9ce0c677d192143d34c8b2148fc190f9514820bf8c8686a4413387cff6863fce50cc85cad03b350de7548972a4168f154337006e6873a14aabbe7a7f23ddbecee63d35e15fe156d0a508c235b058056ca100bdf10442a08ad6ba0238be525e8f98c76ffde6e11557835660824ccc66d3e78981182b43d78c40b828554c36d70b960a02c66490c15a4caa6a7d5f1e9ce34"""),
-                    xeh("""
-7f0a07ea9e9359fa3b7aceb9b0ab5c41ccb755a103f6becbcb4d4a5a1b288add3448e1376688839a711536f82b6b1fd4b24294a074f0ffda82d2f8d4f7f5ef11068736efc9b9206c032b942de82f4abde3fcbce845ba7a32b4eb943b0f5051fe5cd99040ba07bf75fc6347968666c2afb8af6ffd55cecc84ec7858e5621d0db6918077aa12a475840c4258559ccfd14fd8afc65011c8862a50393755eb9ab5d297069627df3a673318b1582e2200b14fcd61b1ffc814080515c2b4fe189acf5d194b69a402b93963ef951d86f80897cf85c4e09e054620fc7e2581bc54949b58cdbcde49da1997cb4085d32609d71ca1a210f1e47c06d407539bc6fc2e58b6f42d96bdbb40e1a338299886e1eb57ada636334f8936b0432a6853df768f33b0ac4b4e393f3004aeeb993f9f9e230dcd99cd6d34f9131de3dff2789f2a1d55d57c2181ef8531d56201fdd1743abaef92ba6ccf2b38b66d330d5011ca0733ff24cd806d9ef90c60306234f34053ebc8bcb79e4878259871a0be9222bed289daa932556ba1b3cd11242f2e3ffe56b0223e8c62285dc000e206eab3c3a271b4638c4d3af6b738791bb1988b32e57af74f1009ef5352bd48419934c8ba18074c8de0e61695e2ce0d0ab6a0924e39d69e8ab93d135b5e142cd1593eaad8d130920e74fbb063a66c21999e421d74898f031d98e0947e4a91954e7b9fdea147e840a931fe0ab5e59324d18280df15e1736e03b0644cc0a84d87c52a348f5c82953a3c86a63d456f83a772b7f83fae2c2b21ab5a9fec90a3947616754028be3592cc094016e1cb6079910773d9ac5957c2c6fbb11693c9c3e49fad6d14718608287af29b743f68d5cd5080b838a50d292ff62fc67fa898a4cab37c547e25146ca7362a54c8ea1362c03992101da3e84f1b4839b092603a32e21f99239f98bf1d01cde96a550b70264eac372cb1b9dbb034a0dfa3737b82588fff82cb80bc6c8f38c15ce4d3dd7aca813f12996f903a0f4ce0023f33653a9328d5885ef2752c14e58dd8d6e95ee95e74edba1487bbb46974bccb3108223cb685b0b8518e8320b36f4664f2d45d6d0f9d4035de9ddcd09e567efa1d8905295130026bd2d05cc6b40615572428b4ee33a57a993faa3a0eebd0dfe8be4ec4672dc824a22bedd8a8f956f6dd3842e1e5143cd64dcaa728805ddbaa09632d8d2a1b4a8198da00d0e0fe275e83cf1d1127d249d4539b34a704a1ab78c4e2bf1dcd716ec5aaadedbdccde9c08ec394d17500a49d08772257fac9d354adf15e3b3f1a5623bbcc393c0d3769101c9e9345f2a15cb5d664fb22b12009d72f9ce0132d9b04a8b7fd1e7d87e42795521a9dc20f54ad9c7150a29df970717b0e37bd746163c5048ca029e2e9355923ec9ce36ee5a6d0c5bca5dcdd2e3050eaf2dc8f010bbf22fefa270427b090fcf3b4d3823c1c335c6a0794ab7119224a5f7b6cc7af188b97567d47969401f62eed6e1e4ffca075a7fdff17e12923a03d4f70165d9202d6e0816d97ed71943c54a0c5137a3f7e723b3fa178a7680845d56460cc9d05e87e92df648443a9430b91994d9cc55caf0fb56976bf75a1fbdf90a7e6655de4d2d37ae2b785ed31a1058c7f80fe89c042fb940c4c11e91d3eb18e0be27b8321c6c999953fbdd428f57b0f52b254def8e4620c07f5fffbb373eca6b57b6a8f6f6189bc6f9770ed1015ad089e9759c70163d1b9f2d4756c75f82693a13676e752db4b09d855b60e38337000c2d126665f794430fc261c0032886a4a76e6693f17cfdf2261a052f33aea417e7ef8a9675d851b8545d65d19f458623d7b94dd1e4a587b416385dd8b2b9528e0f827e66f4b5fc350fcf7366f17135321b6c998b203019b21e0e62e11851273441d4d6d0830a16cd0951b0d5b69adc27de6818229057f9f96c89911a64a9caa6b50ba5ae2265b8a6c63bd844dcba7977ea0bf1b8304c1412239056602e80889a26ab42f73d7444954b9ecbe9b329998bd15f8fbc4fca07ae0be6381c044dc30d7947da3efbc552189bca550580ce843f946f783e06169167c068f0b844a7c807e28ea93b31cc1056781bd076ab4496e4cfc1fa582016f080a80e86b8b7b4ed0b6e7f44ffcf9288ffbb75a0c7d719952c463c92fb19386649db9afd7855e9b18e235b46208fc3d39108fe6e33f0c4e446021a5ad0114a3ce7b1967c191f415e9f7db613a2d9""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-d6424525c08d11e26c59b4cf74c0b97165a85cd9c4aab72ca566240c3a8d248012e8ca8c75927021936901682a9fb98124e6b00ad2aa6afc20c9d15501d127186042c6e0b13a073e7bd100a2882759e487f8b70dbb391711ac6ccd77b07ba72c9d8c1bde14ae224ac302aa4609d77bfb176062616ba7589eb597475f1732acb5a3392582af7064a6d23bc1820be326572b403573378586d4cae5db40c1d91285dc4a3a9ac43c07362761a5925043d7b63030113a9775513160042ff79fc3b1155b9c2df8c75338817d174774fce4cc0508958c49412675845ceab7fd9b0b9d1abd0a6057a1e5079b266162f281d9f399062b672c6754a21b79e5423069117fe785985ae7cd5eb43fc92268140747b20983b85205ae063cb9e18a59a2577b4c7e889b16d189894e5788d459070f498eab465d1250812a155d33dc4b97b45889c11a98e6183232993b56007aa6544d8527244ba9ab55c3d2b39a839a1fb6988244e6c96648a2872202c37a35f2204386ec414686a52c8a0b9f976237070ff4762c21875508384c626262c38aa248090a7d523e429c8ab417a3097b230990c9c3810b0ef01cc9c29d8549cd4dd3caab37c5ed650d41158e34443492082e91ca574e96938cd05e3fd1bcd6c57ceaa2b3b657cf35707cd12485b4605e06100a5de0b8d0abbb6fd74d2a93042f8c68f88502953a66d3d11ebd06bb981c1250d0abcb86824358c77fcb5f1df96b93c2c833d51aaa36cb9a5508eee473ac6b8768b49fec81690242006391a3ff6a7b968802275c6274fa965c3958c3d7b9009910a7785801988c5239882bb2c4a79a8db3d09d25208a9e585e379c108a925716ab107379a3fb8404ba1393213166e9a5c58a8a9a90a41f4b530e67604ee8f249e8448c63e52841a8b1d35c8b91d4344bb1262a8b2fc513b7b20636b46708bfb347394cb5a257ce738c72aa4c53726a3c931777d1a02e68b49d18b2a81c89206847342f22c1330b883fecc1f8db292ebb51cb021329c38520a0a232ac1dde91552a64752a2a4246e877ee9a7028737e9f2bce4c7bb37f4848a14a5885aacabea49e6146ad9bc255e02b8f38375800912b23b2659f94a3935307f9932c0d8b1a9360b133b6528ed8732e48b44af7733f1416c98202a6aa127e6c8b110c879ca17039746b3832c9b916aa99e668a9b7ce78bc44b8000213e2ac5ba752fe3704d94b61fb0985510200b4f1a4bdb9aaed09704c9cbec39b09d468c5eed73a4947a48d57519be1afd4aabaa406542ec819acebc4b7d9b8b99133a6337c48ca1d2e5520089512b8daadbc3ba0de3941d1fa0e261bcd6f3825f29166852227f2283666019596941be6a807e39cc1dc23a7d472b56c71a2791a316ada15753a102911a32d843c51a2c6a8b947f65152b2941a5794548acb64e30961faf40e89d5354e658b858b1263911092c43d6ee8230512423d69ba49d865a1228402ab954b839c45bca4d83162ca083e910c05e88247809bb7aa7055ec8b7d4f996cd9ac59e2f982efb015d822c388eb4acc13870b9527ac70794f109fe58caa71817469b97debf66996c551284aa6a2505500927b3ad2595ca152f19825a90733b4f838019a754873a8bc15b160c5621759344fd31f96b4b648622f709c6541c09a4c949a34f82530f65b39285ab721ae74d83eb8ca5d12a01aa734bad0b15c2633addf7a92dc598adb817575926f9d021e4130b246e202bef3460ac7454a54cf66110ea87734f0c90f45374872950a3ec7b436c60c06b9bd25fb44d1f96b0383bf7736cd2f21b5f2306fbe88718b26cf45b31b32e8059fd87f17e70ecc74222642a54cc99a849012ccd818bc8006218b3deb12bbc92038735288195c5789fc932e0174f35b1975b611cb56a1eac5638492caf349abba8c526fb7280ef556c3b69ae2d15e9e108613466de9fb45d620b676f81c79598954e11091d2904a63749eb414987a2a44997d5ab40e7fd98d4ca276f892bfe4a35509fca06364444c7770a0c13570826c7ceb3f65b6b77637bf0d28a3a227bce187810386b40c0418b2e27a3ab183e8a28db4ea7ff8278c64a3164fcbc7df682ed98862aa965ff5d107b230b73e745339122b99897264ba067c186bfb95be4ce1435ecb23c1cbc67c181066e3c408da9a2ce36a32f1bbd3aa9a1476a6b477cf20196569ca9cc4202176926f2e6b76cbf4b4abb4b183847e068c585d7c65ada8c29dec27a32642647901a23c635f6751ae131c34815b362ca00618554c4a9d028a6aeb81c0014815ebfc7f7f7001edeb5890995a25b89332c466c39888b9b542d741954a27b5dfc72a65a0cd453b8ca9529701d49d3cf21922a7a365fa3f73778161534274b3244a31a192c6075f2562f04c6c819111fb1a099c114e07e813a472a802a0af3167c7d1a68583c57305099cf4e9a0a5c724eb2a318ce0582078090f35b856f773194245e6678b9e77160201cdf2fa8d4456671fc9bcca217a2625784e4052e2f339c544a5e589b24faca6e3c332891b2bbb5849c6ab2805a4b8d01199feb49250bb8d30380ac3651c7a07525556c9d925001568a73b804f0d1b0e9b9ca8453c9303669618f398b95ac2e304432256811b910ae2570009c5199a110ad8424f135b93d99c375243c37fd36100ab89b88b1997d3ab9eba0bb6b33a8774b07c33a589c236be155b2df1420e75a0962315eca254a1fb01ed63102fd62f249c79dd051addd531597cac00757014e01366b771d9e06e825082a4a310f8f72b7cf644e56c59f751affa55985e42447adc6775187170aa0093ba12e65b1b3a2aa5b3739cf2b09c3677184d6302141b8eb4985fde8a993782c256f0ce35dc5f973cc7b4987b29a333e38ac3131b63638003c600b5077b6b5b7b9a246a02f466621ed67d4d419c65ac1144054120439424f58d9f776a9a3a2596d10de267b20848c6245350e68b593ec7b49c877e5614be71a624fde99c0423216302b3106a29c85698f1b3a96895aa97c021c9b539fa66230ba8c35b068c5b2565f974b112140db6588be7016bc1b2082be9a0f5394544141643b75270752bfc6920c288468330ca4b3171a715756dcb467ba635f7d17753e0c1d3778114227d8678cf63f580adf5407e9353cbc546068207f83b4f16ac1df250a1f8d499fcc9471de920faf2a23e27055fec098f791ca19b094fd7aef23201041378cb51501ad0691a39870dbc8d6c9ca2d6003de995b2cef5957745c6d04194d067a2c1140d7c6aa3e271b4b95ca49ecb9bb94254e562905a0623cd670befa9c5fb971e2a69151d209fe4494ea753a926b4524b05793fe5c1b55036a44061d8d1668bf0094cb14004d3759f510703bcb22d730091370e09c1022141c3b35035c2a08921e7a23c5899ece95136936b68e839b021a97499bd30dcbb1341141698594225cf52740ba1b68ea20768d7a8cf3af91f7c1b1a49817c04f475014b0b6ae38a81f03260ac672c6c5a7bd2b8f07b3e5243028a0c15aee58ade16c2ac72985de1525bb34f99090d67097c11f3303b219fa68453fcc03ec6c84aab448d7c308d76253fd5078764769fde087b6c955c1399b54ae068de44c0a282a7772154b50177b56c6a6c10a317d292bdfb4d447045072857a0a67dc5b87599424705ca9d6dc18c88134ea1c746ead5018d00bad1eca2b84217b53743fb377765b674d30aca06c79ae5c2bd0cc06e4f8249d8e5acd3177747d65a8692a3db8b1ea49504de28b67fa1ca3c3bb1b1365fbbdb3d40d666ad72b286b221ddcc505388819c993652c72397fb158a175906546e1c212609dc7b00150987b408b479bba5d290e0130d4c98c33f543da186bc514ab453f13404619e841c634b4c5486c2ab80258ade6007c8895554e819b5e894b1b6933692b3eef79571b8b38493c3cebb915c6aa35c5cc543547400b81b6058a6450ac5a7a81e8adb26f9a8367da7bf8cd2496031016ac92fa7853708463911780fc536cd54f498f807a5d029a24bac5c1b300351367e09d1ce68e6af97406c74f5c7ff796f4ecc10227bcb4bbc27044c9c1e7404bc15985cfc2dc166088119989ee32789bcb95fd0103ad969fa164bb5cca5cd5c3e6fb65f989a118d6a2bed2b59121b5000f64fa9fbc723a1969b93ccb83b661ab1b25913bf2f6cb604e0218cec9c8eb2aff60c948864288ab6bf1aa1bc65b7894e1357173ab691630821d63b75380958ca91cc6a9785556e4b63b5920c0e3876646e6833e542a250399b16814236524f31a470ef05cfd2dc0e01ab2b4d5a9b70c4cc5832b72a632e2733829c9753ae5a928106267097bef54b47918aabfcf91c1a6b9ef3f1154f8a7f309babe4a75743409f7b155e6557807d6b428f720e0bf260c6bf3de22d70d55541a6240ba4023d046d7bf1c7158a3cbfb7b8bd2a552495311db5917a2234587c5969cc1ed10d51b0dcf8b3017143ebf31687930f3e2c610a4850"""),
-                    xeh("""
-645008486a43ea6c461d7f98a471fd6227b43772ee680a0a0becaf2d2115b94b33ad85482d86bd3b2217f17b94bf38f229f4ebb984609a000a02eac5b2220aeffbb7c771672db10fb779f1823246961702d4e314c98f98b38055ca88090b51deeac33d4c899d57499863f9b1e02dfdc96750f923ce68fccdb9bc01631b3a5444fe45d6b6d347b4097f657a2e3bb7fbf48e9fa687291da77da8998d292776409912d8e44c6623a50be758c677404aabed063de84b4f96e641690dcc9184e6d1e13372eceea41873039bc8b7cc2aaf6eb00908967f8d6ed8a1e4aa087f3a81af329ced0eb5dbf8191994fcde14636c307992bc859cbef1f1807b8c1df4422f0a1863c4b47715149f466fecf32d4060c648d5bf90d3806e253df269d4c19be5e3b3455a7162c197f1ba307fa2969f5797a04ebe6412dec4ebaa507542f86eb2d28fc704bf5ac58965cfad57ac8f019de27f82c79cc2c232f0b3389917c3777722ddfa6801c14b3240e73c24a68a1d22e374241ecb8ebabde5c3c638f678227d34870facacd1696d011d2e387ee8fbf61f121a7cbebada4138c48309d8f0a9b0f5e0b71aba21c538e91f3f0dcb49ad2747ce9f9a99cd810d3a264e468082c000d4d3cf1136fe900e73eec013323ea8998fbef7d5ad3f62286571bc24f9b45f4c07a19037038045b5de6e69002f3c6361bf34fcde13ab18937ee0a7827ad14b705d6c6f4d2bd0a3aba60749f0f9212e64717d2a03cd0b1bc621202d91e46e44afc5db28559e2e37f13be40681694d5b431ec4430f4f737734c36d683f22b12240e727eae9f70955cb958b2dfb9e1b702040c1af17dd23db44bf71ea0f1a52313b3cc1c75036f668b7c19d7a9678fad74758b50942e85735b218491b85b1ed4d142d1a2081557f18753d6fb0d1807324fb4c7125b46b9bdaaeb414e302b347251a35fa6236e15fe1996cfc9827afc1d7a153c1f8a3f9a0ed306e5f3b2d0909f7316980572ca4cd2f304150c4150b5b14de007e9ec913a0ceb71c4dfe8d91d3fb211bce71aa501d469ef70649013650da608373f19753692418256879e6063c40a0d16139574ea818d49ae4d1174596bd33d71fb052fa08ce51483169974f8c298e5ec9fe87042927e899f22ce51ac22bded7a685dc8a1181a4f7b4a43c1df697577d73736306596ad7d475b484358251718dca8f3b4fb264ef960f14f0c25a2129c40aaa54bfe51018ba6df19024b7642641129b6b6d0486f8722803045fcf2447c0852e4476d93d3301da71b5f1ab1bb8b7e613d50e081198249bba6d8cc30cb70991163d3d4870285f949fbaa6152e356c0acf3212fce4d8524b97b1638938cc9cc63780b63766245402ba09f8f0fba311016dab14375d023178b42a7b59e72d7141a89c98f37cfb1e4868550d16c8c8fb3351ff6c12e5fcd8364330b8e0f049d8990bf2df53dc3b08d3db78f8d2885004a5e05a7ce25dd34ada644669937ce7b426a5f432c95fda3b004d453ea51806add6267f9cd1c1a645282dc5a069b9721166962004ada462a588c84f54d6bde421ed35d81b0ed6b864a9442876b5a71f4cb12d2c3af3e5523e08e1b2ac8a1bfd9174a708f106106384fd644beb561d6e4a544e14cec57c897af99ba7925c25bb256a092314c5081c156154d3a7bf4bf8209246919cbe90ca4471cd65b93d4ae28595aab093c788d4feac9844287dd1307775ed3a86a27febcdbde0581a4a90b53ac8f9d6e680727973b3ae8a2b3bfe261536a878c7ed9922a3daba30c826c6e2790c88c07dc7bc4e9e716bfe509c4b8b98330b9ad6952d542b8a512f7eeb6dfba79237262babd8226c64e76c8ae04783bc4b494ec5c8f82b30e2ca87147fa4c2b32beb2214d80de46add116748027533cc7fa4ad0448c3b482c80807514a4b1f9252798dc53b83fef7cf9561532435ae15dc19abc799f43729ac98a11c786556e3bfede9220a4966356815bb16f887bd462bab989527b02beb9f9e8a9fc548eb9022d187b66835df6b22edc93829306ff84977303505c3c13336c8d558651a5b2bd0e1653effff06bf7bfdf78f9abdecc6c66c232fb9ab6e8b7a89bfbfe55795c27fa596866d308ada3856adf93a9661cbdf61486e9c2b255e689de3cd28f327f059c353b30441197ed3f04bacb6a27710c231e2cd0e159642518a5a50df24f1191faa68c570abfa808616911e0058f7ac1d""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-19a1c59df3428e937d18d8571a5b12540a27073275dc343dd0c862a9e150f57b768a4059a3441716d0401e6a92499948ca2b84d2fc687b08a929476fd3905fb1a207dd357275b03307a2295ee619ed04acde08722da7a4dc86be267400b5f7103b6a613a067dfc406b311b42dd699acb022decdb3b6d37793275c945dac6387323d0b6a3d06044969770b2a7ab47165c983267f5d515d3758f6097a2e6a8405a4222b2f92cef4b0d28316c69ac4f4e275812e6caa1284dbfa490a1ba0bdd1b2b9cf9aa8641a34de7816690b3d4317d5c899ea95b61570139bddc86eb83863c0a88e59b3fcce28084c3b8decb9050a657c7e7637acb49d9ecb7542224f82a9938880744652f361a9b39ecc5bffa6193e79db43ab89b681a10d69e1ab26bf2ca7e665193da9c6a6a558654314f7bb8c8a555b133235f50965026c080725391c2e75870fb3ad5668e2274690b076cce04a657eb7bd763c40cc418dab5c278032a7d1225eee448fbb849e847096a58064cfab6f3830f7f286b2fcb0e82902a9a0b052fd49afd3134557510686123e7c5ac88605910b94131a61c39008c3181cecfb2679a187ae809c03f9a02c856709a24a4355c7f0dfc3465401c15332fa0a7073c05bc4a23b7666b83881556445caae0d2be25672fb6134385c41d4e187630b67a96e35658760d261a4ea71bb5485b4fdcf74c0e739258441f2f50a08762b13d965f4fd12252123901e4cbde1a2ad47601b1a685eed55efbc78bac0b06bf803e6dd585f11259ab3b4c17286c1502c47419979b37852ec2661cd827dc97629b4104a59ac162e24f0e4c1dda2923af8c624c0653e479a46fa80418bbb9f1f29ab0faa0135c57cbdc09e4955a4df04f540845012056951315c3854a16ba69ba092cd2b6016b74a3dfaa94d43767ef2050166b146ab1bf48d0a61bf39ace177d1f061732fc4341637f60317a0a736fff931618a0733ec8115a3b5c0bea4b8f8b47906988543164bf0a1135901a057691829234db396b2d543b78fb5eed054791d29d0514170fbb9acad0670a058dcf264c0525c13f883bc69960ccc6888a2a7796753297e33799ca223f54400634b8eabac16c70b9757b91a03046378a6295203af5d787fda68323b11311bb8720ea21130b9684a0510973bf27304dbb86818b3c8952865f34d6288f64b2525358c77a503f95b2dd599d86c02794d1cd5d40285e587ee4a7880ed515c031a6296b7d3cb92cf0a1519fc14657f7c1290bc2e7148502822fed447cb1078b40118f257554ff4304da892bda891baca5a47536796bc55856c48982e7b02a719837ea43242ac246f04d69e06692565f97596d35ca49633abc0cd941ce84aae080934d671760b41d7c93972a9854e81372c4c979e2f4332a19b19606743c61a5ca456cb4baae8f2bbd35161f44ca4ea58c5c3d7cc395933e6584582a8994d6470848a9c127bb35ba3323053678f7909a95ac06e87c52cfdb84c8ec97b244a51f47c3255bc80469c85660510c2093c15bb138e0ba93f3a816d22ec6680a61257ebffc8a5f1a7b78e36c8ad46d34708a4ac730ba61878a357fc0079eca75c0e1f225d878b852a3a0e3cc06f0b7c5b553547b133ec5f1a26cb85203a94e53a24b91b89fb3027da3a7788eb0751e45be61ab03c234117e20c30bd3b064aa6134b59c2d6cb6d347640d715c92056e901984ead919e93a3630700e60830583191449734305293cdab0b69c266eb0b9b6c742a342472335b29adba00225678dbb6a3383c57be74c2c0832c003f3125785b7720c3ecd804aea15173b19b9825b5d7ec6a63d4447398549639a86ab241d1d400a608730d771abeba84d6a8894440585cf16a02e856ef13a8197b343922b40986b9f3a2873ff29816a682ed6e9753f392c3ffba79a116382197d71e39ec79c7aa9da19cba825f527c9eef3272c0129b9f281a0c574aac0b938776e6adb3bdd88ab3fb1a4f0913a2e4c53e76a7c03294b97b1bcc4276254c5ba27c7acd53c212a118801450fcd160e11c41364a5803bdcb277452a5c5193d0114f0e9247fc3abaa98acd43c9784a7c5eb3a508162c602091271926a52b01951dc4a5862767c863c7af6397c5a2b8953b4aead8480d520f111b85938b4de50a6a5724354844b3ffc12b2b420287a6798220905b42bbf7fa109a95c24b6a71902c2e2d806d1d2baeb0c2068ef710a989211b64636cf58bcf43a3eac1119f809a26f02a216341f4b60b3c7516a1cc40572c6855bc29d006737ce64739268d0bc59718b9aa34a82fc9834fb05b27593a708ac4756c28342a148b2173b4cd023fad458b0ec6807f421401991dae15cbd8b01181294f95e0a64446710c41671ae3b298202fc44045541ba5be8516c8e52e743c503c9cbf69d6007fe79c61255872d312e1b9843300a6b436a96403bc33f6577bd4ade56bba41ebc964028ae6684c65e0c348c7ac445bc6b3021529676d5c40a3255930f2118d2343a866a6c5f11c3a1c85a790f25c5096c816166d2d08cacb3bc503d83ca9d1ced3aa0372a3235e06ce21f3a8ce609621c954bc383c97b49f23e2329ce9b092037e661b361f9bb13a285cd77c02cbb6cba1e37cae8a6264448e07401ada6896baa3189a527071e52dca12211135b6c360158fc60ec2b692c119042565172ae9c7c5e15e1b1a0952e772d61b57e66680b8359cd4726421930562562913c0c30ee486b023c8e36926bbb00f1fcb4e89600bf7d79905794487ca1dc5d69264fc56872588faa81a755b3227d2532ef54f8b0a91b8a6ae66cb55d34197b7c71e69c7bd39f8276e35117e96775b6c6501034f81267222f54a3f7b94e4a7a3e3ca04948b4f17300b92330d43a41b3de69702c2bfb9272eff89868551beebe890cd002a86d8566ae5cf47a4ceea731ec574684533796162ae9f206dad42272e8a7f7e7c97f93334cc833396324a8654480e5193a8e0918b48015de487df1590b0f7627cea9fab8c3bc1cc31c52a7ae3e7173a7a8c420c7090cb0cfbb0b419d53af678b5db9244dc8b8645f6c093f1b14ba5b65e4c0b8a875d4d86266aba296e648670867b7af5ab2392c4193b9f83052425362c5ce4a45dfc3e5d9960ad3b392ef6348fc7a164b494f75476b78c3f2557cb898a70af6280b7053823727e18a7130fc777b7e81cb8952f23b9b27dc02447bab51dbb9c0dea135db473906987c5ba76b0424848bca4e09864db2cad5e97adbd00629219abf8978dacfb8370f2ac6057477cc7829b6c452d242299c0b314855c5a5c61ee4557555795286c904d08aebfd17edd57195f831321ea02d68493cc994dc8370e219152f5245560875a88c3b919f9ca9a745ee8b942e1316a177a9471cc84984c31b59b8190a9207e4ac1ba253093e7585621878a3004d21851f349805bd70573580f9a98c97d6a2e790c0305316040f64533a6bfdce19d9ab8658ed26dc39837fddc2be9c66012eb76bac7b8f2c05361ca1ea7e0a77ec18187565f3c4b43a6397da9a16a1987ac8c700996124a10789ac7e0932fb820f4f18a9a7675257c7cd08249f4185a1c7ab357470e8a35c688a236b4191ade41bb9271a3798380d4a2a643e302a53396fa8976d5b2096724ce85ca4cb36ba8f7bb470f534fb496a7104675a0367b05f090f4748145ca680a489fdf719612d52e610352462605c1a43d39945adbc42338424146c0707cb28b986888468b85f5347c8ccb6456dc442903baaee62f4bc1b56fb27dbb50c96d9b359894a823b812afeba2ba39b8af7227b8b58580a2603111a6fa511ba7e1c7ac4a037eb53a8caaa31eb551339212048865f4a5c8aa207ad8688c1e0626fee782fb6c0b97f5463d8830747b3eff7136a1a7a83d3c5cf5b32bc42b6bf06b4616055ba6b53fdf365b2c6209fc5239ad269263bc9458bcc2bf45cca868b4eda432d35a0caf361d9145a4200bc9a770b5571095eb18cdcdc407390099d43194fe096df8133a22753b7749c7b51c11b4b7a59427590f71091c969ea619601d494c91cacc34133e0cf75d1d34235a45b6977aa39847a01e1a5fe4e2c2a509a986249c482443cfa8cf3ff9358541757a776efbd7148383ac98289b4d68a579ac3fff02adbe7236e6d06c8416be80445de82619b065436468b0535906ecac1f563b5daa78b89c6ba5d4283b06795b4f88022be4b1b11ac075e8b571fc7af7d91f13334dc18a317ab4794ed69946c45a615c19209302cadc2f50c767840b397a9934bbc74d3d990a13e656d8a1347d4a46c6676402d563a0e860df9a5f0a911a7193be4b162428e0cb68b66b35146de6b2a57871bad3b166bf4a605bf3633912c31d0cb2e100c00ec9501d0be84468dabaf76fa2356a58155898e69a3c0e7d683cbecf451f22d5fbfe5c268257c663f42d4b0855590a07919c4363de5890b4d5b3df022c3c86b725c5f2b54196b7d68684b9fde93be78e38beaeef18195321f4e2"""),
-                    xeh("""
-f1c15b3bf410c7218777a21f73ea71a361f62f85b7c47b2fc9c6f3c197cde8d13933da55d11496e10946e0e8a4dd59ec816afb6b28222cadb9f4a50591a4c3a9a8c8c4fe5819e1803f7190861d624757322be0fa7c8ce617d581136a4f939e0a5f4f1707fe493bf47a4b099f073fe10021f3690332f9cf77939e955a38f84271f4b260d90dc9195288d932e41edda41694b7772fc1f61bd5bb93ea9fe413b676b737dec76d94193982cd5fbcdc8986b107046755f1936b283768638b16a4dc16daa7f6c0b05fd11da8040cd0a25058fea49c576f6336a456584b0b5d9a38971d0e686b12a901c7daac4e2faa85160832582732b044f9360a8754c2d0a1dd5871b3d5048a3cd6e8eb5cef0739f1f6dadb83d3e65dcd3462b29c12abb026f5cc762466c25016129d0b92e0c10afbc70ddc6fcf33f434091798cd2ffabb10b8923dbcf890eba3faff2b2ec8e1dbf170c58768f8e37559e228660408be1ed5a93d7328a2ab1f48f9387056c5a51ee52f34178e2212bc85caa9312f50513878dbcb2ebb9e4479a8e9ac2abc42591c98e1b35ad5dd24da6d8c6c2fc0d7b964385f5b9596f6c76f5f681974ef8e5363f58cbf507fda58ceea9e3dced21dc95c75ba63c459b23cfb66bed7890c0b0aa078d77c7180ff9101d5762628e8140071ce861da0359db6b349c14a5399002486f54a77a6ccbaa01c1fef5c172e0737d19f9f68e7d20ec7ac9d211d81cae09a0a2f7086a4a8952e81dfc0c2ada2c9ee06d47421602fa9009bd221e02e33ccc0c47f670b5e05973236f3e74e768a0a84d890bbf908e835aa1644b418dd228bc3a9b06afc0e292f9d71fbfd5955b2765ce90df64ba9baac0cb5d5802b919cc0955c20bbbfdd624d5f6e0b0db3bdc01fc1dad5baa6482b71c247cc103f08db1064ca5144276b8062f31ad4e8adeb6543f85074a7aea53cfe360f71cdae05b99ab8d5acbb9312fd136920ca09a654d962e5623b7ffed22ee0773f3e4814bb232b112736b9a9fc66ba6e00b898a8b9258d2823022766c595ca5183be62be21c27b5abb0808eb0978d0541a66c294646ffea3ac2a480e8f9d3f0c58eee4d0bebd002c435d1f8802b854d953c3e9242495805ac0874d74837febffa135af5916702cbdec1d7b6f60880f85d6482302ef8c2fcdaea831d70e821055be0b5db3ec0797fcee74f652bcfb559416586bf09960662c408cadb7c41d36ce7ce803b9c9fc5ddb2d7274867eac6ae12ac08cd318735f2645c752c02dd74f2eb45293ef165d2bddfde7e5d235ca7480139554fe134577a430a5644a9704cb162cccff0550e738d79f8d01ac56edf07ce9561afa24294c7ea61f6e90ca071df601e83288acfb0bf69be559a2e788f7c18f25138584739dee13a307135d60df207ac6784f201826de1c7d48467cbeb721e711c7edae6443471f862b2867a8af1687aa2afde61a8c7d8431b2080b2a119b5d5c43e6743d1ada10027870d4ca0803646cfcb0712c692a6ea22a94b7fb5a455b6fb121c0afe8c176c8db060e200be7f59f9c075327a6f2e1e1b3a06df1684956a60332e86282872b18013898e004fe6dda04ecdd243fd45552cb2a705682f049383284ff382d6c68673987d6e880f0ede4c85b6f01ba89fee8b1fc2e9e091289438221079edaadca58b845da049475fff9dc5283f7db3c34c5816b87f83804f2acca031e06463cba06f97fbdba8e4d17040807b380ef7e87712f1124b43570b8f36be0818ffa1ae107964befe8f0568ee037d185cc6f6df9abb0f8547be4205d0778441ae56983272f4051165c9710c7bc2dce963717b3a9487a02bba79042ba5f255430202520134ca0f5276be9580174760b3aa4a7befc6efdac17f9d70f420a4c9106db961af42853c07c92f4ff6dc65a19b75228e34c43d70a44b61f6897fd6ad59817c919293af8c51b869666ce236e018edb3703452ce0c021aa1007d68fc575046eedb9e43c14e1d6202d0fb49cb40e7f6d78a062ec8cfe12e8936c928a8bf501c2362b62fd7a7d313c1343806736931d5dafff16471dfb637285286db906e3747ec089e29b0b4e15e3ef7a1ddce3996ecf7e7f834afbb004e59ec0fa83d6a0862b2838feb896cd83b5c4dc69077ec8641e9d5406aa683c68de2ee59ee254419b3a38719b40637349b6adf63a28a0b3893d661ff2589b5365e8ec9059081783cf3b4fa5abfb4d48be""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-fcc4a70fd4395ea9728287b502e92bf9d77d3da38e0685858de5cbc8f286530cca0c683d13328aea540b77d41b806627139592d2672323c0b94be3cb9320454e334c4ffb6a12e12e63a96d1273cc8d4a6359263e91963ad472aa8cf2a96b3a62a079835535444541ca9e434348f3c6ed4a981ed70c59c33c27f25be9e407e6e7cb52a0274f1b7403f3bd3dc32de1f807b3317e7b5ca5e3864ea4739be575605f023273b17e2b9135f5b13bd09a00fec6283e0a744b784cf4595060c657abd8ab38270979606f7c0b1ee85b5cf1b2696db43e5eb21ac523bba172bab8223917508018d85b4afa10435bcdbd6405b9ac64f423adca6b7b9326adb5110809f12daea8270e48419d463c7bc264ed5b208880b8a515422ec9319b245f1331ae9ef80f46da776b4c83dc351622ec349b0b2e7be0c101b36c8bdca3573087d0960e7837579d451be25101cd45313b6b24c3630e18bc88407a75a16cacdf1664d19b56d9593fd2bc7bacd1cad8d96ad29c7c4d29c898220ec610479fe984da083863062b57b83b1a2b97c6789429a87b575365995223470c4d43c401cf27a910c31464f200b362434a8492b8126b965689b722c663342bee757f23112092a3486181047296328772b3a02b398d617cc69ba5bd252bb1879a7fe48ce8d47404f3414c79935c109e22d18790c9c07f606de7b69bca824ccba0a111059faaa36363052f811ac12fec42062820d88c4ccc787410d884d8e06812eb3fe676860ab0b069ac312ed332eae3059320956385ad2d502e11510cffec2fcf514180d46caff1044878ab667a56aba86be9e93957d929a15950fbf2a1333665a4525e6f592b1f9ba45df02843aa2541e233437522ad16383b991e0093c87c061df7127bca8275ab0234ee9bbf4986447c72cd65d657422a2b095c0703265bd129a019ea398152ba09ab9665e62163d862fc334c60d09894eb106be946fbd08f726a4fe01203ac34b560a1218543460d687c3b64929352456c65c55f52828677b99b412d07e250a969800ea7b5ec3053c99ab169cc913387933e29b52138a57214c99bb87be8c4ccf3337398c6cf3cd5c37df09bef147fcbc71829da53021c8b7ff04bace1c24b862e1b233b52985d11370842a89f9f33829c534f62828dcd91304966b045499c43046e822997d34105e1b31b49613682215a17ba2284d162b77996aee868ff3b25a7d5c5a740bc79771592f83570e682fedaab2528c3c427a04ac109576634e2846c1f43bbeb4226105713470b9b2556cd65b7c178f918d47b4307126578a81d02d99feaa5065bc0b492b4a9d08783af447827075b83890c6630619d9cc97daaae2bf91f7f021040858c99404dc6dc2e3c7a18a9345bc3308662f78032fa3a0328400a84982e86bb1cb08359f7455929863515343731c42c8a58ea3b0a5abc23cd7a8e8e029807fac289e3b9fa1a54e0f652b371c5e20839e84c9faf0685b4053b4e54741a916b76d398c76a26d572ccf2a4c83546c4ed8a6b88458db9523e65f676eaa1a74f731f74758c86a82662987fec79b287e02444dbc4a032a18c1ba4bd5a8c45dbac2f58a379649992056172c986361c0ea21935782756c4d00aeab17ac6ca938b063a27c00a4aea7e7e307145138fb68a697be49bb026a8b5c31700026d1026475ac98672554b0d8b2e9eec61ab891cb4911c19381b053b4a49b8559aac9791575c3b71154997ae5a65770e1b28ea601c2ed76a72974fea67a2e7f610442b749f8b3dbc725ba2528602978b05cc846ea634f625807b15a9100a1b743b6daef06d37479f9ce65accfb1de08c3d432a6403f06ebd423e6e357821150f448c6078d565068c8b343a2a5c609cad649945934bff443f19442e3eba04ed1227dc112e4ae670e2e20777f89c124cb3716a4465e84f0b86a78fa68ed83ab67841a76aa9b909f5a242d7c0ad499c81f5811ba94ee3a5c44d8818a0808522544f540106c89884da8890c6fb3b03887a62aa218537a18240789ed98acf313108884eefa00017fa4eab371d94e5410b118b095b2489448c55f45b511906d0c4caa9aa4ae20861ee3586a2da74e5098a50d543f1d16db01577f1525f649074adcacfb6283c69b41a73ca1ed97412c2002ee54192e34b71f95b0603d1858cf808b55584625ba1d4f6ab585b2b11fc091bb28a92ab2a5d061a3e4890ba687cf532201369883ff26ffaa019319b6914b8a2d76091aecb59e37a0916e5380f2143cb34176b6310771703be07305869bab8d98fd0532847446fa156446f2ab465499f7aa81f450b09df23ce66d0c0e6b82579425748da4a4cb1a13f711791300d21c0bf8a5191f3a0817ed4519931150e3161bc1b076383056db994a3775a27b61c0cec0e5c3584295b01e9855a188a184f78baff6a4ecbc5cc1b0227a5f12498d0b90ecc450d5a278d74807af78b3ae94bae64a3baec0c6b109a57800297918bf949b69c5c905f944ec8cb7e84865d67382c6e3546bb4c891da34eed09028bb3677ba624a9d5c967e94b65e24b380719517712c12aad85672f20c77b19e477490a411389b5ef63429b15a1a8d680b0082d586955cd67163ea7a7c8c26e661c52eaba8503b14b168c8c79fb7e73109b135c7ef5790afe65853509196b099aabe81a525a0d6b6b3cb2d5400a916416688d8f960d1607c777db22b3b2954cdb9e3932432e24805f02aebf672e8e6640d949221d3570d901acd9863566f439f5a4525367337b718536623b23c16950dc59c4eb9c00b76e0d11a942fa4e531a6152ababe6e54c101433b5b41c038907a548c69b1111aec34d64e084863c950c4903493b768b831a4acc04059083d6e7a25bd71b68dc1d10309f4edb246b7576acc70838034bc0e050ab40808a298ac7571d6a392bfbe57ce2570f18f35a109ac32fb9cb7e5a1da9748cfacc022b15abcdc469e79319bce47262012334478f301c1c42583ce84116a251a0e4d8aa38366561a22552eab180b1634442138a1c370d23a6acd393cdac517f59acedea7e620b4458b03585410d3edc5264f9375ceb6df9f870c8d7393dd0c2394882179c991933b8e474a85ccc6338124604727bab826553927d86541a4da61fea2581c5d15cb70b740e7b38b1787d0ea7acb6843fda6c5dff60ced980b80775501120c46f78cbc49a4ec63a98d324a9a177bbdd74ba0ee0108187ac0e245cfc7420a9294019573453763cd4b9c1bea9366d8cc7c996853c5c172f9b0d667caee2395b7a7c7fa036be9ce7b59b96663d260b69940a2a83624a62623e8906352939338c724a038337a59f59392f759c516cc417478cb7fd8c92ce868127e156ad4abcc714328ce67e2082cf2805c3df4b5be17b29a2446fbe26a50a54afbfc47bfa27855563b64e3846e934311f515f20c68860012c43195e6a45684eda2de3f9af70549d3f41c0b17519b02a7d29b076e49a3f80554c8bd7cfdf12a42d9b511c4ba187845b5b725b1a384febb470e3063312e9a05e846fe28b155dd00253a3afb9c2143ebb0683b03457c937efb1158fa93130058213176cd7888598e457d33cc6a600c2fd465b3629cfe84bc51cb3aa8bc4111626bb57858c00ab7b8b13c729a052bc222b06745b5181bf1c58341d239db92378a83b20a7e1299d407295fb94beb2c111f07c57401e522149f9c2b0a6d369b6f829b09970b660aa3dd6b0792b21797716de834286d662a3b03c38cc9ff1aa982dacc0d6892cf01492dfc506e7c37ecb8b82603c7d65843cd011172033203e294e6920b2007631f377cd003d8b9a4421614cc20e126d07f05205d0c1883910d9172aac4864ff7b7a8b1a1f5a8c773427aaea747db3191d312b4f4a82b7d9b4ba69313e6b7cb310507d03f47f8186a15d49030df21c144b639a7721357aa2fce77149507a7c5430d9611d0e7a5c93e54593314f3749ab0025603417173b13bfd7f32c6f854238e2675a948130ea2213a749da0c18001791f31755ccd829d76c5c62eb58554277f262427506cb17143557c919443922a09c1b735943c1a411e9db8a6b5c0dfc73a06d49c86e5b5fb03677f234bc97a2931af2ac804c0a9d721ac2468058a037e53346175981c879be43400a1c0760ec3096a56c0b2f11c9b97a87bf388058424faba04abf8b4d7f5069a4f26b14e39917b7858465761fd802c7c8cc2ce11cbdd04a519bbed86261f3b3b3b07174c26008b4d71311a951e0584100ea7d97881da990ca3cbc1d9f596a798cb0b1f79353413871e5a4f093b4825a47833a99994848af3378849b089b3843c7b153e4dc10896b4a6aa9848c17cfd3e0a0c491b90587cd2611908fa04bda829f0b494b045f938e08a7bcf1212fd194fac918ead125d88e6c4463a046899d659644d8f67504e278e1ecc03c50e807ee0dfa346aedb596d90d0dbaf82f24d69702e666f4086d18d3da173a6d0b44bbebfac8edad421aab72b823fc63d600"""),
-                    xeh("""
-683607bb0aaaefc605290b064fb9b57f641f6303e7f36b8af42a63985f1c3b202fb40733ef308bc517dace0777b0c5ca164a8a1adac8dc44a320a4d81f924cea669ac48fb2d8ed8fd357e86e8c1c8dbd1fd3087f5287d24a78dbb9dfaac25abde3144d7c5f686afb07d4e407007363d2bd1e5477df4a49c4f6334a687f8a16964df2bc6e368de4b979d7491bc070292335dcbe09af01a54a759679f019d97b73eebba8aac0e8d10efe4855b54d5a74afbc70650ebb26370ae701c7647e4d5efb29697e31be934f4713bcfaa7969d9aac9bb021e73d5894819379bd03f05e8a724049a3e66fd5a0daea65448778121c41dda31d8dc805674bb44538970b2348858b2a0e323a1801d16eef04d97b4cdc8736b645fa242d333ebfb0b61c279d0efc19fb7f928e63c36a1c05746a3d29ec7d7abf8f3f5d3dc394bdda5708ad7757d79c29a40569e79791612a3cfa514b05b355051d7fddf24a0bde67e76dbd0884ceb3226fb61d48219f032909f979365cd2d33452dabac242fa9474bcd86d41738a1e23b373e85f1eaa6470c9ad08e84f212c71d49381bc6f29e813882cc5ed33148a40f9044f5b713460c21896c4ec5fc5edb5eb19da83212e01469f560d468817b5d4fd4af0665d2a47aa2faa618dc43abea75d0051a087b4ac513d8327e5a747a8c8ca0c6baa5cd6e8f0179bca470764795f42c48b5027e9506685c030c1ed45a197b566eb658fc1d3cbf27f585ac28f70fe942e2074403ebcf5d06065c6ba22b16e11bc2fef932c32ff316c95989054926ca812967e0447980a24ed6496e3930ec307de1785a72feb21664ed88bac3993f5e0845f53514963409e5ea751757b2c91b8d797fb7e2be34ba545ffcfc2191ea909265f2f056383b8f974096fb60eb01535718e60af1db55a8ac8cf8d2b753e9366521bc78cf6e9857391dde51021c7eab027e05999f570a68c851b8bbf3fa1e9ad605c07f9287506d456f2e8f25c8d391c3d6db6b12a8a306a1e642ebbb1a6ac481a5f844ac4aa3bf797b784e8d21d105fbaf699b342d37bf713e06384fe473a46f2eca96b09a64e3a05b46b24d0c795cbf2dad7e5ea935d414d162a8b74a3c47447a4c39bbce215fe864547dc4f647e0a8f29cbc6d29a2319ac497dbdda3a7b1b9f6154edb773cea671c353fe76ca6f4a5e160e01a2c82e2d5788628d17c077be6bd131c07a2011b5d40bd8caf784f456960de5d757cce1f0fd7cd3e1e1bbe08f00e20b4bbbb8b09c717036009b749bb8881938c3e0c49eed2949a93d3025e350a2aa2b2ba1cc55a60c13e63f614eb2e7861ea1afb2ca493ab36a6fa62ba85c7b737b061a465d8a719a16c68471c66fad823652b676d8a86350bfe4798f948dd794156d0461552b2e9726e3dc01ccbf1d805249c0eb46af62c2456109b57bbd75289062251b760ed80f1d5ffbb8a2b93923bda87bf5619fb8025c4128e7b3a4e4c2c5643b149fa9b1d0a4c06b7575f893d5f144104d313c47fe8e4275c4cd9caff44e0f234f970834f168bc7dd9a82f173d2a65c3f4ddbb1058ce70b37af74c7ee763d4398c777c38e111770de22bf654f44de171c6a49b405400b280e639f66b6376bf3b18dd9818302cad3d22fc2911246d89b82dca8a155790d3da8a6b12d65b3158494c8a84deeffccf53bba29d9fb83a62fd0666fcec097a75aaa7f6aca01a909b2f0865ad37652c90e339207bcd6a1ac7c7676fa26c7cd809cb4d1606172d40d2508ec259050ac3cf23210c6f977c52d121a5a1b4c26c597f8e6ba7fdaf9d4d83a2f605b1548bf58ba62c8e57f6e93629d01c3dc8420cfc5b2f8c5c193edfcdd3e3cb696aefbe19de337176994c6a7c4926d4579f9bb228b28f1b5ce23def5c67232d79023b91ac2a6f46fb6eeb47894c2b7cc46c8c14e3b3800a20760724004e20b9d5e17dba258528572bd2ba5013fda9ad0c5368d38252327fbd1340f0475382cd4cbb608605deebc5df36483a37e71a7544eb4bf861641b1704eb976fbeceeb295bb955e11cafa9b781eaa8dee2eaa9cec3643088d6e15b7dda593550f1197a1d08fc1084c30465a95701fb59b39aba26252131c2725788eae129c553789112108c433dc5cce3a5067ccf7802acf4c98b2951bf3e41f24abb2d840295fda825b1cea22248a71950411389ead7e2d55282d90491d9669519f4c0a8955826cc1351de731b2c4a8d2bd8""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-dcfa84201ba9bf3915847c6755f8868b513fb5abc116920451f113e2c481d599129c1439e36bb5f0470e44f09a581c46cfb63d935ccfbdb26da9977ed53c6c56717805caca6056b007db45c261932b62a7d0c09ad99317b5ec82d7c61b2d3b13f0480d65abc07376a2552c21317a4426e868925829bdb661cae4ad4dd111f8080f05018f7dd976725941d5aac3ae00c9e0f15681e8bfa3db983a29390c108059d2696c3118c3a4ca0d970c5c603bad8c109563b58e0a1291868e2283447017938a3acd4442008f7b13536c75b3353918469933588602ba5b856aab04e2a7735786f5bc0f30a616369cb405c35250644ec9687488c781179b42dc9801793b80af048ee1e9488b7c755a985b27b55b71761cb5c101692362c1dcc1f86b147e1c708df38acf9179248551927a49dd0a333237b0705b0311a632acb5990b674ef55427bf64c86ed90089c5b6ccb12dea12565979c6492a0ac8106cef2b432ba6654c65c9fb40913727ba261c82aedcce19369d479aac4c403f45584fa71a238207a332b8b9b7685ded0661844911bb4a052678810ab6c879279e3442cf92f26b1041cc2f6c30c1f1b8c394271f19309c26270d9bc59d81628998575788ca4fd59a09a54c1c78cfc4260e1b149c9c7a00953029fd62064f74cc56765ef9c01596692b12b144d20b97ae050c7a2b51aa16a1a037939e91a8253acf29218b1a760dca0ba5143bc59154bbb86c36bf161794966f42c8b50a4a51f9b6939970c16a846fc728aa8d6064e9e8a57ce5647288cba6339eaacba7d1e56073aa17b629344dd87799e28e97245d92235abccbbe490a55b0f02b4c95642dfa0c674118031c457027cf37435c586918e5480cc20542af3a47adc66f216b5f2fb29d63d874967814f85738e76b7a2fb04bfbfb3ade632d4aba4b435102f4b07def648351bab8c329c957eb7d423964ee61cc8245c963ca666331c10c1ca922a4595d962647271c34753434b06ac9bb2e0a3c84b89604e90b24fd366d65616be48b953a657fde9a87e0e0a59e770194644af2018a3cec7a3cf902261538ba8b6f96545112331b335926dbc1b9d89007c2ca32f21955a739995db6a7ec2300fea40317905eec95ad690592d8c8c2d4012703b0c99c571c9ed859e9a040787c00a1b055ef8cb5ab7a15b10064d550b27e076752ea8fea36496afb6951827d2ec90e07875fe0bbb2e1ac4498619272705db8232423473e90d9a61e23ac5aba208b984fc5f5779052a7f14a39106cc718c9178fe2159c824e59045b4246c9309318456735f1434c6c78c41ba09d04833a37540afc77a55bb39e6450aa65c3305160a18e7c84f095b2a34699a8303cdcf75394032e0e8474268602f56a8ce12026f4d73d4d02bdbf1699acc65ff289cd45b0c3e958ad85327869385b58c9a19a1a119755480c0a72f12c6587bc00ed8a9c0224773a0a892053722a58509e746422f6a3f21a5d6c199c583c302ef2a07096b90f10821ee036cd26b45445afce6c12ff935615ba1c77921457f119645021f880806969533e06a044695feb4857e94016010b4b7724849303c48ba2ba64e17d2738cac6711fe79b049c740869993d8b158295f42fa2a37f808022e698764b476d81aaa63971586f84a5ebcb0b578caf2f6a80dd384050cba2663c90b9a713fce515d7058494d5a82a160750f5825e5a907b1c523131a6494bc03954886c10c520fccf48e97f90f04346f7c3890338dc30688d93a350db4bf9a31244ba7d4ed1510a381f13180856a188036526f7c10bafb11284e87656f736a9764a67b963db67ba284cc13b734a6eb1a9094c2a5d342c2e504d87781f87c8320f21057dd21f884186c014ced432242d618b09c4237bf50b720a97b2d86934213bf5d044d25673c26068150228b19219f4f6a6de8729d10c04a7055d7bd3a5b3716f702c6db5f8c93b1536739535e8c83da1d03eb01c514b330592656a81077fc64b9682a5877006b5d7464867ec27c7238e0ee7761c8183a6fc468098917a620161ca01ad34c54da2bf82ac01bf32c14589b188cb338b7294527a34c971826111a6160793fab4772e264779f29ee2bbc6cf822dcdd5cc0b76c8c2fa8234724856f89108e79bd23a1a2ba163d1c988ff98c4980842126889b92681c523358d22adbbf41352fb8040963385438d80125b7b78a7bb42515971c90c01323d9b3e75697ee3729f7521301d11518b92154436843987531887631819167405c36c35bc3be88d957053237bcbe1fc59fde76f1fb1c0bb4ab166ba098e6c4b58d26ba606589c568601c507a6fb149e30a9ddf126a4491812813ed0ac12854b3bde1b683cd23c588082066303931941aa5856bb94a0c932c85f9b9a4796b9152172647221d3e611b94b667e0985bac481f69ca20fa04dd57c42adb71ddb51933ff36dff38bb580b9bb0a666e80372c8e2b8c29a711f484d11c1ce58025c17d053196b50ed28342fba9b24b8093b7c286a4c1712346cf886454868ba79d53fa445733af9582113c85408c2e8473a3bc358af200cdeea56e44086e1179ed300204dd6b39815616dda5923dbbacff091970a57166b0ab5f1b25e1c1d2cc495151b97dd1aa87903204cd3b3b19830ff010d4df31ac3c7623ab64d951c9fd502ba14f4c884661d65d249c33b2f8d225c81f99f3bd88fc5a71f40722849b6b838c754a11a3b8bc8673cf900dc92b6f4f66b139c76a420abb5a2be9592ae1f3045a8da088871b45ab66610b64b163b38f641beee8a9a8f13a30996c262b2b9231241b34b5abef4830dfa922ed98a75f61cdd59666e3c728cbc8a6132a343a458beeb0702fc962439b2afe7b971ec62aa593cbe874b8a8c923f963060d1ad64bb6ad1dac893cc3ab5188e7943cf184b7b18ab26133ba4109a57207147f5e25e15302da5e82069aa721f77557c39c760d28cf37715f7a943de605193e29a6a94ae821675eb2b3f08ec4d7f0a99c5e71cb01292b327c107b61e6bf99066d74a9c8b47e99a05d8f2b9a1a5b12723c101220c57b509a42c5b28e853dd75251185661b61499ef978bd1ab9b92864ce013ce2123515ca5aad6b108660b4ff1492bb124f5bfaac592107c2678c5f04c2b658bd31cccb7a09028f48a245e638e8bcad19bbb2dfb6ba3bc10c487359b3b0421eaacdbe033b6d7a8d5d2311bcec5148226d4dec2061265c25b0746af8c63cf99f687a04c237739d648de7919cdb59973ba35d85187d20212ea537cecdd9c68de59345fa0dedd31ac6b21a7053adee561851b7be01770e07daaf903c2738dc835cccb05f5a931e2c4d2541a8328983d26b20de5bca159973bc01301d0541a8e311ef7046ee9b51a0f67d5202d0ea8c8217226a622b32b684066f2a000ae22cb1e29b47176e7973b3e9d4c18f22919a89a6573147129a43998886e8d95c804c15a01084f3d81d7f0288cfb34276536389344ed7c09eb47b9d20300abfea2a0b2878090819477a640e39cb7aa1643d4a59bc6488494a0ec3073dad9706b752c30b123fff3a1e66a8b575587e3b119d83e1b833893056b696ed49a399d11278f23f456b5192fa324fc4222dd247acb005dd50c918893819545f59b8b5550bd0a3d97ec24a5c22d4b8fb12290ce4cc96528893f772dce5c52dc0114f19c6ed026928f1092349475a020739aba5f5a45b8843157a76945dc84e7284572395345e695090b37edd895b22870b39ec07b36867b5dacff5392bede2680d74cc2272713be24ed37a22e33c36a84ca9643a46c68112a9d12aeaf67bc3160080113bea680d9b1bcfdf75be1c18c9f2e44781b18b59a090be8aa957c366a4b24a33b9b6d055674593470f37caf456b367fba266f34160d4cea1605d6140be110a93b2a57e06dc811b67572510549889002ae53dbdcc758fa1aa2e4bce4d6ba0dbd09ff3f736ce630c7b454096d6415ea32b797404f598c4b02a3dd6c98332b7440735a71124178a0622194993b442c5596bca2caaac46d77f6713a547980399c18e5685cd9dc879194cab66b99de4e2888952808b15c1bab5b712ab3e0c781b209162818cb3985b77f4e915e86779ecc5b2096104f512cbf1162b9aeba6a3546397e608d23861fa3aa5847a4cbea7229f5338ac4161b9765d74b175a4e95a68a6cebfd6ce796214163ac5b314c0deb2a3463b1f7e56b6ada724a2827f60647a92ea4f33d36d7683402fb12543f73a2804abd00371073306f06aab9705819091c9afab226514bed5c46f8c3c8046787602501d9d4561582164baf07497d09beaf06cb2a49627663e04cabf05e5bd55f9c0f75ca0a93678ffe69d7f8034b4f0898ce5ca9a26f52b3bae41398ef444b73decfdace24a6d62657cfe717bfbb904ea4bde70180c895d3559ae762a856ae7a8fb57e1ea35ba8d4386aac7d50bee0032580858865f638c38f0852d2d712a708ffbd7d96f0df21071d8bfec74c2302ea4c5adba"""),
-                    xeh("""
-744266fc2795dae658efa879de343d6831d4d4d778afb0f064fda23d22d976434ad41868ba11ac4e73588ff2398b2985150eed716b430f34daff5d1f7365d3f28777e2cba704d43963e2a906a197af491e192d8308401b5cbe38a6b48053a62308e54593935665e78e70636146fb726096e90c796e88c0462827cfee8462b9e6e0762b061aa685261aa38bb6364ca84e14e07c81d0d02cc65a14e49683095573e628d54938bfb4997381461a3801306a2fcffcfc54cb834a98efd328fb516d04c6f8334b839a7f0fcf340874cd94060cd926c24a201e98901890c4fcdf8e55c8a485e245a37a618ca074097dffd436b1caa2b900538a8b35096a9fda5c98ed5031bb25d8ba86f5285a003a7aad4470bdf7dceafbdb46450020723bcbe8a44babd45faaf3ab416acdcf0564c0b513203c8b3bdae283145063b8de3bb045e2595d2e72eb324fa2c4ee7d7bf5685684dbd69ab1ff5aa2a91f22a9177c053e5a9b30aaf7334425fa01f223b8dd846435615dd7434053397cf0b9e4ad650365b847298672b80950a9cb89b4258a10b9e44248f2d06a6921c7b87441f72caa127e741958fbe42565770eae9b2198370c2d422e7c3baffa8fc1139d2da25e3693648da40dfb8f18eeb84c70276c198a31a0ad3372285d50aad40d7355985c574694abd8452231ad2b862545bb3a620e477ec23dd592ab6ab2e91d1ad0b185f8c918484a4b44b2351d8292f00a025c23f758fec9be75398e83df275f52b8be0d9dacf3d2aa57e0055e67cfa0f872d60bab9b6c3904906547d5a610e7b0f1be8f6d081b608edd81ec0b0c6c45f625c9da548a4a1a119f3d9b2793112a4d7f77c9c7ae4ae7e48678a1e536658ef5584bcf8a7ae9f9af9629f697fcc932d365c7d238834c633a703c5b29e9a8e4fbe1ec1c42ff5ecbb9eaaa70903c92b9f66dc6660eeff2b4e8a563d5b39cb355e8df23b017eb7d38e422288c11e4a03803b0ed6526148b25c847968f554ede044c91ee8bdb9a1717fa253e65f2e5387eb19e84a6ccc5929e1366b4bf1e1af72a60ed2e674e54d256da46772b474dc8858967edbaf79c6780a839b2a20e44a02f06d1981b03229af586ed809da1b34d154e2ca64a1460f3d14bad117c39438922fb300398cb9a17dc266ccfde46da47f4dcc6cf54ed01374d3d16284eec4f5ceffad0ddd92b4b7cc0cabe0992b076e1f06ad2d746917ec8c0915c73121a57217a425dbb672de08414c22a38753d6a0738f9609bd15f26be584290829650025e2bd61a121dce852ed9ba96ef487b1cfe28d682e01e375753059a78e6dfdc3f9a703c02e8ce4565cc9cc3086ce2f0a692b4a791c622f73a8dac791440a1dd625f64f7ee8af1e4a9cd8aca89bb697d0295c40489be97453e46e1648998aea2bc2a53c053b6f89e33c9dbee8d5ee607b3d9b212322c5d6c1573612179964f316131b0a1f3cc7f107a03ace199b1033b64b6a36b456f17028a53699b729a663ca99e30c72d35dd277509adb62646647c2e4f2b4d31a7ae3e83b9d82ab3c0785ece85c765a2a1473af5bac7cffb1a790c73161221b45acc0b1dac261959b1e2ae2a18dc4bab57ac5e793c4d58661ef836fdcde7d8a187345cdb357e5cc9d32fa16a194873fe32a03fa31c8c194f7b63cd9640398518a1b12ca69ec6ef28c4a1547883277a94ffba92416aab83b240b034ea3597c8dab9fc0859f8c5fcef50eb00705a5b21a015939a9319929729bc43b43f36032b17781cc062b46b23a1533c981e4bbefa2ab32a81b30a4ff5655070f765af27022b4a7352189e52ba9e7e7a2c1f5eb1d5238814677802356a8f7ca849402430bc2a5e6c7323a9a2b23401876f4c5e4cfe56214fd667622a2b5e1eb054552fe10fb96788be387a68564e1516d9be5b99a76cd0431f65cdf85de40a45491d5b25071efbafc7c385902b913105b9ae0ef20c67006d72dacd4097df75e5d378fc174099079cd126729e6981c0f9a82314debdd86bf5041eae98aeb754999db6e426dc8e3a6fc5b17cede84d4b1b65ac1ef519a325dc5abe2f4ccb32b5cbfe457c7441b156f39dd4181743a4378361681fbbd186479b7e958472fcef7a0f6ab47afc8a858a5fc2e5c64d55a916c9484978b5e747cf885bfc9d2426443e38cd3cf13d57bd18e0d0c5478a86e20b1db35856388c4963fa1586175765cc8293fe5379cc7193d19e97e6bd34""")
-            ),
-            new DecapsulateTestCase(
-                    xeh("""
-c58540ef1a9e5dc496f0a413f8001e0731abc1b169a1f0ab030564ce03bb10d75a621bb8410b2a6186c6ca081944463aeeba6a45494fe1f1c9db2c48cf089cfb928d3de1cc6d02556ac7607af731cce7cceb00627e9a55a85c6eaa430dcdc068d79a8bcc8b4820f61cdc7214c64caae4a096d71390b95ca1bf243f4b3598b800a38804ac2ba7c2484b0a9d2790c3b91df06a40f5eccd52a36dd524b1a2831e915643063103961a01192a1fafa56c48e90828c359944857226a62f93b053bf550d5247077643171100b01309a3d344995b85fd1238fb14a73f2f03b4e201cd736c4f73c5ff3206c6c89a878178d4010a94963c025f090f2d32db71252a06acc88d7657d1a811b5052240ace860a217597a29d5041868a6bc5b278f0b04726414383807617b81bf7623186e44ef0695b97291827e0bc9fd92acb014714e151162a7b4e1ba04d5221bda5b2faf2ab4657853daa21f2b726f54a9bc35ba271d917a2bc1ec357957c094dbc683f03a5710344bba6242fc678809cc71d9a2a76a2a64bb0b8c5f66212a5a35c5e309b61c264cdf418bc27635d7751771cc875318c9f1b0df70073019a89a6e124c349a279f431f14b431ff11b0cb17ec3eab1a2a4a5bac45415825c4ec76016ca5f25581c89083f43a863c08092a8849d45f512be71870be0c25416be17c02e20e75cd519a3c43a419a3ab6d0c55752702612e298489559effc83f244510c987b247009b7d74e43fa56ee0179e5949a050b2a961c6a74819451058f1a624e9dcb47bee04411cc3bef260efd21acc3485d99d87f48a04512e9642eb37ab5d21cdbb21cfbb15df320cf887a9befc60a366a331e3b3be06a96ce46cf0fe559a6205677c62e30b964c53b669ac82a1e900c13364552c50c9da3a8355a0bfb97ac13695dfea28abec17016d381ccfa785e070a2f5568d1fabae0b6128d820cee749300bc482988b735e10a6629408f4242796925fe5a64d2d47b46db6e7c078c294aa6b0f87271a80f2b4015967564f30378768553f290b3df99a0c7008e99f1c026f7796ffbbd43b092c009821b58cbdee8670a1894f47192b4587429d3a99efa95bc176af901558db0280e0c62fea04474ac084ee960fb6604327b391c2ab2fce53eb5345966d8bdda98a107a210cde574b91012ea51b5860bb86c136b2389cb0565ba0e29871ba1b8b733755a3aae23e330a2a3b98af8204537aaae670fbb087e38767961641718c469eb7ab99616c402c8abc8544c47f733374661eaf0b6025084b2407fd4680a1fb57b17681d65ea7bab457eb2858e41fb9863646f30c2aca073b894f4723f727ff2b52c59e33987c4508696caac603f37dc854c3c6c98da6b69e5b20f917537a7ac2f37bc941303d9b4c38662174ea7c4af651d751684fdaa12cc6b6e0deabbbcb868165a28584410dcc33db62b446d23917a503daa2b633dda7eea324926c773140355a0571cb24117ec433aa1f2425d90081c45a47dba89106ba82d1060661a681b26c899766b13a000e6d9c0fcb588ceea0cdcd703b9600adf105819608cf4b81bc8c8c14ad38ec3b0b7def92f67f5adcfea5dd85a058a87151573075fc5916dba1208724202316ea14104570aba447339280c5d6a580137378390ec4439251f93326c423c1b84c4abefb78ccfc0783856b3793c23ee401da23c5eaed04302395b672316719429d8b66b7b33198792af7257b3d8ab9077d13a055c40fcd1874b8a8aa8201dfb76a396b534a1b2aef9824107f04a81dbb87984433b4c8e1e7799e2f7c8a284b02780704ca3218333894c1571c96671e2e0195d3a01aab22739c8917409c794072c83ec90ca1a78b7b1c6ccf48340dac772f46c33c524dd6a58e9e281249111fa772b1781cbeb1653876122f0146448d81c63f1279510a7ec528f78328605a21a7f8a0844d30b96a118c775832cb6b281cc3e965924cc4c6847651d3dfb434f100b509c0c3d66537d47219a77ba9922a15e5c97550bd0fe561b9109bbf89c555c4637daabc2a9620fac81ab69dab4de54529a957b8f0184c790403a379793704135b357cd8155517254255c254c982dcab7a05647ad73e1184e1aba78fa5c8ee24ef5183e873105a89c54b085c7f8404278697f212678fd3948d423707f957880b54611d04e05965db36a6f80ebac6014cff91b17321b0fa32c4d1eccc3dec3707cd34c7bc63e62d2b57ec0314b659dff4263c0f2c5fae2a37a84b0dd415275b3452894904ef146f5728a76a56c9447988767390a693ff7e91fa6e36f3e5a5b42b97f1205704218379231169340c416f4737e06364b935186e79a6bc0912938ac1ef818d57878ee872af70c7f31e8a5da0746ff4137e8f9b6bd7b4b32b47e12660b239c77115c72741c74b8dab0fcd07180c35e0adcbd2d58b726e3775d288a6312aa158620022b623bb29e141c33e0532e5dfa67da9476f49a6f4e6b001597a54371be84d70d04340c2f403db373a1afb102780b5050c841d98b10af489a39f8c2e473c23f202f05a20dfc4844cf1126c562cc9610a98b0a2d5407169db917969b1aa5c314ccc96290d2c27743b1efdc410802c78543ae40686cff6b3dca439e243c867d70bb957086abb6a91b49c7a39bc2dd107f65c7bba534c1216857d2b1a7ee99ca0556b3405b25da0a0941f403d0e34677e49d1ca84f267bc86ff0154614ce5b3526aec88f95285c316175e15b4fb92bb3d2a99d70a0259ed295eb87b90b5b2f5e2a757692262866c70a9cb8d843490e563594344e05a4051b3155fb8817ed53431d5c0318146cc31b0c524b6410d53aa0612a51f1c763941c4cd42628f212c04cae54b6ca05a5afdab8ba54f5666a13396006afe7005f612180002d1005795c468cca3d778938e187b00bc29220266047b22df76b18040160a48e6378c99fc5afa4020fb2b135ca913c78c73363d93d10677bd6764a27221ef2a2600f5b867b52c375cca78846880ac448f1086ff678220b7a238675b740c21bfec76559d573a6a84190c750cb502d9c7663d50987876b607f548ef76b764d03b704781d3b324ed2d7c1ad285a3e1ab1e5d6c7ff49495825b1b41a5ac2f524bf27c2e875aab1023c5f058f1a7881c3e60ab9fb56d15562b6fcb8c8c04a272c8ee6c807baf6227330071e6c49c8c805b89b6acb2025b13c08fd9916cf40191b9520409a6cfbac821fe8951c027f84a11dce4c54db98be7427b724331c64169aec4304cd71128448473f599eeb8239b1463cbd43c0836755170c19b3108dbe42bcc290cf23619a303230f9b0982c3b7307734e940807245bc097649d2eb9ae2b0695fb56b16cf90eecec1a50c5157d48098a063b53158855c9a1f1db9ea92b7bdc2488bdd28c095ac4e3374311c2754cc56dc8e511a5bb4cd486cce605527d594ec1dc1356b9bc938c0488b6b6d53243f2443223ba200b0c32c6f49322545ffa8a2b1bab914a72918a658b6a053d91249fe0c20360116eb3090015c161d4480d492bc7644762a48b3f6b558eb1f9b34cc39398cb266be91c414a3ba790c9c92129e5d40ddbd3150a5c002f763484546519c3a2ed327192bcc80f4710e8690a8d30a36059b12df6c107d1a73d9bc57796ba08fa01fc0c2a4f8b7a63074786729e0596615ff4b7c957959ffb1c5537508b191507e16d33d1bee9eb2148618bc8b279f0e92072b8c037565251992e87db4c0de8775d151ad13b2c375a46688518e5a2c409e32b9f314e3b177d72a908f3fa0010c87724aa2a94ba6a2728824719c6a1b0a2e07c7a364a0a62cc2730966ccdc96eed27341f77389a854fd12b9aefc0aa4c59a8aba457c57222e7065be09b593dea82279c8f67971a46878bf557b8dc095a9a0241d3b64ebe02137ab14eecd7410bc70efd3c08c1d6220f597eeabcaeb4a7b129ca73fd96872077577e44c804bb55d02607234961816b85944913dd83c5c835b1c0cc94f871a29073b8912973dd430246f84780d51ab9e163cfec5bc3472e02377bc9a2760ef5529568a4497c556e9a5f71526396aacc3e86158ea4189906b8ac277a90e383e298c8a1b98623cc909f18c894daa83338bc3f3b57152cc472889ba297a533d0554a3186229a8514c9c4826725249c61e4411963329eb99a37a4337e24c2257e5354ec5c2e4cd85bdea15c4e16cffcc628dad7c3ed9066287b587cbab64f0ab3aceb69494a333d240074c989cde4932d291f8edb065577985f68421d312e429a15cb21b31576c8d0b470c2177cf7369d45ac839c5c191acb40e62a115364c8875883ac507e5dc90a6cdbc6a540b396b422e488bc7d25c8287b79efc32085758d593b33882f218e758a3186d9cf309538fc57b81edc3ad0d228aeef39b32aef07a4054c55a1b8e412d907ce76b043fc9b10de7a9d3005a20d9c70d011dbad1e53a7637a741a60c9f1715c42a5a9e67b4e69e5f128372002a6c4f54ae5869500171e2541"""),
-                    xeh("""
-0ddcfac2dca44756fc1b11c740a2d9f197a04eb49fb236e8a72761c343e2cf6c0a15ece304fbceba5619f1eebf2ec4285dca695fdf201ec2e89ff040a0983603abc1ca303ffd8ffea696953ecba82d866e9299cf793de3be15122de05aad7f939c382305d89c25dfe2f056f788c7911d44926d15b80052249e76de754d408cd05f5a8e067a38ce8d37174a7b90c393d1f72cad0834a97659b08917d07c363fe2efbd2fe95b1f717b7283aa8963bb3bfc22d2de515494882d9e1b76ef5d29ac625e2f0c0f67be70fc406302c0002ca7ba7cfbe08c308a11a6543df01235697fd05f94feb7c9f9f7bca1fc216214bb4e96f4e9f265cc2b4f411a4393607c39b6e6113a354b3c3b93090d13824c05813c8b4b353f5accac0062d9927a3dc3ded66c35567bf0b21fa0933af66369beed10f17c08f1bf96dd65da973608ce1ceff65a8e6e6b65f7f335b9593752bc4bac179b8d6594a93cdcfedb26c010769d75744d4c8e422dde126c698df3d791b51ec526cd2e4e58a0d6727e0df79db80c876ca598d5e3ae73313b91764bae84e76556883e6f4f82206f367b041e5b53753316cc54dccb87189bda18a31e76b6c1579a90fa2d54bb901c82257b608ed3b79eadb9aa2cc6a96e107cfed0fd1cf906cef7abc6519bb674f5a0eabfd10efa47cbd6c13b21185085ea8efa498732e1a19c1d3fa85856f4f4704f65a920889cf96a7b52fefc3e2d926c5eeb9139ac247a8c0b73667e3b0e438da939ffe8bbf849c112aead11d8354d04201d34319f4c65c3e4a1125b018a22e2e246c1aba3943dbf5db4797b97daf73451a6067a669941c06d19531ad8b74d523e2bc7ee512cc9bb749ad4d2ed87357d0dba42098b5533d95419aa18ac3965b87ef2b41dcec80e9661a10ff077a098cb55a604d1f9059c8260b6b1a388d8ca3a83288cb956d2ebb0a5076132fefad9c8eba00eeed61a8a8b7d59bc342f56f6df694b5d85dc28ef87da73e8d5e9a29af336cb5996c9b1485c93a1f8a1a3cfcd17842d17635a15fc5b63cca2ad560824210aaa27ad7bb8aa3e16cad96be489fdc43d8245cfc3fa439d4b473992dbd1d3b913282756e2c60ee2fb125663f5837c4e12da4232ea51b75710da1436fce145ff43637f166b3227c1ed590d2bca27bf14a028940c81de99487a6b501a9106255eb81ee939ce7f9e2bbd6be754aad73bc287ad27430625e171bc3239575353f3782be69cf21d829c0ddafb8bd96614aaa1f9fd5ba1b0429e379d32cb76119da0b3f9fd76dc1b92b25057fa695be31fa5fdb50464d6ba4a71d6726be84382b84bbf63f538b5a2cc9d91eb449841afb18ab8279b4eb9e80155cf1eaa11a2d4a421d880c85d037995cb9303a3f5d071a226ca55031334fc1c4a1f2be30f7a4268441a987cee3233651e988abd40e3b1306f492cf412a207d644fb66243efbac5eaa2e6ac045283889888a59ad47bde45a7262c0b9470d427ae8aab1a1c589653bfc20c17dbe7e6306ef97c0f6c925f1a38b146cde1f6216deeba31ffd5cf6276e82a5c69f5c6e4b69899505e03a528f23483d0bf414ac0031fc329cb9971b33ce94bd2dcdf42b88a084725a98eb9565bc90f34fde114514d5b81f7916294745b42c2c81b8cfede599200ecf50c2a8f369713cf2a3ab69e8c8a1f0c967112500790e905d958457a04e046bae97b5f14ef782eeebd4454a4a4114ed46debc56e4c3d4beccda4a9e5ed3127a9e53f2906e3755e4a75ad6c387aba579a19493a089b0e75c7bbf906f73fc017272e3f739b6ddd46e027ada7b86b91ebdd70a5ebfdec11d1ef9434d305be66e2a6889028382e39536405137dee759636f437f5a2da8bc5f883ffeacc1d8ff9bde31010906add2a5d06bfae7c9921cba9e67725c17870998257afc64409481f562a04d4f3acac8d6b65d6c7db7422792207ae376e6b6a5f80d417c4cf08ac90a0518b8d852a8f4e6c6cc28c975e0080d911d24b06cb05952035f7ce53cf1a14c7079b52bfdca9bae9accd71175031cc28d359d89067ebc2ff1b5d6ee6249e64a42227599f54f36a278a73bb416f5d136cd370b77b432b57c7ed9b69f34d5e14b2f0f8b008e0ef5d9afab188a532a5b63ded634e8821adcae833ef5c5ebbb166bf0d0db45612f6bb5fc498b9478f903e305479c878cd8bef22c248336cb457601d5129d818e9a06074577c9c151087aacaa1f24""")
-            )
-    };
-}
diff --git a/test/micro/org/openjdk/bench/java/security/HSS.java b/test/micro/org/openjdk/bench/javax/crypto/full/HSSBench.java
similarity index 92%
rename from test/micro/org/openjdk/bench/java/security/HSS.java
rename to test/micro/org/openjdk/bench/javax/crypto/full/HSSBench.java
index 6d0cf694f4a..13cc9a25113 100644
--- a/test/micro/org/openjdk/bench/java/security/HSS.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/HSSBench.java
@@ -21,12 +21,11 @@
  * questions.
  */
 
-package org.openjdk.bench.java.security;
+package org.openjdk.bench.javax.crypto.full;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 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;
@@ -35,29 +34,27 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.Warmup;
+import sun.security.util.RawKeySpec;
 
-import java.io.IOException;
-import java.util.HexFormat;
-import java.security.ProviderException;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.Provider;
 import java.security.KeyFactory;
+import java.security.Security;
 import java.security.Signature;
+import java.util.HexFormat;
 import java.util.concurrent.TimeUnit;
 
-import sun.security.util.RawKeySpec;
-
 /**
  * Benchmark measuring HSS/LMS
  */
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.MICROSECONDS)
-@Warmup(iterations = 5, time = 1)
-@Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgs = {"--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
+@Warmup(iterations = 3, time = 3)
+@Measurement(iterations = 8, time = 2)
+@Fork(value = 5, jvmArgs = {"-XX:+AlwaysPreTouch", "--add-exports", "java.base/sun.security.util=ALL-UNNAMED"})
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Thread)
+@BenchmarkMode(Mode.Throughput)
+public class HSSBench {
 
-public class HSS {
+    @Param({"HSS/LMS"})
+    private String algorithm;  // do not change. Added for visibility
 
     static byte[] decode(String s) {
         return HexFormat.of().parseHex(s
@@ -74,7 +71,7 @@ public static Signature getVerifier(byte[] pk) throws Exception {
         return vv;
     }
 
-    public static void verify(Signature v, byte[] pk, byte[] msg, byte[] sig)
+    public static void verify(Signature v, byte[] msg, byte[] sig)
             throws Exception {
         v.update(msg);
         if (!v.verify(sig)) {
@@ -82,30 +79,20 @@ public static void verify(Signature v, byte[] pk, byte[] msg, byte[] sig)
         }
     }
 
-    @State(Scope.Benchmark)
-    public static class test01 {
-        byte[] pk;
-        byte[] msg;
-        byte[] sig;
-
-        @Param({"Test 1"})
-        private String test;
-
-        @Setup
-        public void setup() throws Exception {
-            pk = decode("""
+    public static class TestData01 {
+        static final byte[] pk = decode("""
                 00000002
                 00000005
                 00000004
                 0e975b10a6b33473d01baa138c155e81d7b7156b389b2a6a09d49f42c1ac4984
                 2d977e65fceb6bc80e06eace38ce0116
                 """);
-            msg = decode("""
+        static final byte[] msg = decode("""
                 312e20546869732069732061207465737420666f72204853532f4c4d53207768
                 6963682069732076657279206c6f6e6720616e64206e6f74206d65616e742074
                 6f207265616420627920612068756d616e206265696e672e
                 """);
-            sig = decode("""
+        static final byte[] sig = decode("""
                 00000001
                 00000005
                 00000004
@@ -198,33 +185,22 @@ public void setup() throws Exception {
                 85f294d491c47fb90d3ce9046d2f05da6a723ac342a32154d1c18b465b49308f
                 41ca2f0475adf5ed46413766a6057bc810aeb6dd593691b84752b883c8a1a422
                 """);
-        }
     }
 
-    @State(Scope.Benchmark)
-    public static class test02 {
-        byte[] pk;
-        byte[] msg;
-        byte[] sig;
-
-        @Param({"Test 2"})
-        private String test;
-
-        @Setup
-        public void setup() throws Exception {
-            pk = decode("""
+    public static class TestData02 {
+        static final byte[] pk = decode("""
                 00000002
                 00000006
                 00000003
                 ff466afe664c2581845b2c6af92aeb6e5c4dd15affc86c82ef4e807ad3c648a6
                 4561666c975fd9cb150d6c7acd6e577f
                 """);
-            msg = decode("""
+        static final byte[] msg = decode("""
                 322e20546869732069732061207465737420666f72204853532f4c4d53207768
                 6963682069732076657279206c6f6e6720616e64206e6f74206d65616e742074
                 6f207265616420627920612068756d616e206265696e672e
                 """);
-            sig = decode("""
+        static final byte[] sig = decode("""
                 00000001
                 00000003
                 00000003
@@ -355,34 +331,33 @@ public void setup() throws Exception {
                 b4a0bb3b72197d2d5b2111da8647be1675983e8ed1c0d8ec7cada282dc698656
                 95f1e8806c7892b65fc17103ee3b5366b3fe31e57e653336be283962f488eaa5
                 """);
-        }
     }
 
     @State(Scope.Thread)
-    public static class verifier01 {
+    public static class Verifier01 {
         Signature v;
 
         @Setup
-        public void setup(test01 test) throws Exception {
-            v = getVerifier(test.pk);
+        public void setup() throws Exception {
+            v = getVerifier(TestData01.pk);
         }
     }
     @State(Scope.Thread)
-    public static class verifier02 {
+    public static class Verifier02 {
         Signature v;
 
         @Setup
-        public void setup(test02 test) throws Exception {
-            v = getVerifier(test.pk);
+        public void setup() throws Exception {
+            v = getVerifier(TestData02.pk);
         }
     }
 
     @Benchmark
-    public void verify01(test01 test, verifier01 v) throws Exception {
-        HSS.verify(v.v, test.pk, test.msg, test.sig);
+    public void verify01(Verifier01 v) throws Exception {
+        verify(v.v, TestData01.msg, TestData01.sig);
     }
     @Benchmark
-    public void verify02(test02 test, verifier02 v) throws Exception {
-        HSS.verify(v.v, test.pk, test.msg, test.sig);
+    public void verify02(Verifier02 v) throws Exception {
+        verify(v.v, TestData02.msg, TestData02.sig);
     }
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
new file mode 100644
index 00000000000..3386039c62e
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
@@ -0,0 +1,82 @@
+/*
+ * 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.javax.crypto.full;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import javax.crypto.DecapsulateException;
+import javax.crypto.KEM;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+
+public class KEMBench extends CryptoBase {
+
+    public static final int SET_SIZE = 128;
+
+    @Param({"ML-KEM-512", "ML-KEM-768", "ML-KEM-1024" })
+    private String algorithm;
+
+    private KeyPair[] keys;
+    private byte[][] messages;
+
+    private KEM kem;
+
+    @Setup
+    public void setup() throws NoSuchAlgorithmException, InvalidKeyException {
+        kem = (prov == null) ? KEM.getInstance(algorithm) : KEM.getInstance(algorithm, prov);
+        KeyPairGenerator generator = (prov == null) ? KeyPairGenerator.getInstance(algorithm) : KeyPairGenerator.getInstance(algorithm, prov);
+        keys = new KeyPair[SET_SIZE];
+        for (int i = 0; i < keys.length; i++) {
+            keys[i] = generator.generateKeyPair();
+        }
+        messages = new byte[SET_SIZE][];
+        for (int i = 0; i < messages.length; i++) {
+            KEM.Encapsulator enc = kem.newEncapsulator(keys[i].getPublic());
+            KEM.Encapsulated encap = enc.encapsulate();
+            messages[i] = encap.encapsulation();
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(SET_SIZE)
+    public void encapsulate(Blackhole bh) throws InvalidKeyException {
+        for (KeyPair kp : keys) {
+            bh.consume(kem.newEncapsulator(kp.getPublic()).encapsulate().encapsulation());
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(SET_SIZE)
+    public void decapsulate(Blackhole bh) throws InvalidKeyException, DecapsulateException {
+        for (int i = 0; i < messages.length; i++) {
+            bh.consume(kem.newDecapsulator(keys[i].getPrivate()).decapsulate(messages[i]));
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java
index 6d681604de3..58daff28d88 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.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
@@ -45,7 +45,9 @@ public void setup() throws NoSuchAlgorithmException {
         setupProvider();
         generator = (prov == null) ? KeyPairGenerator.getInstance(algorithm)
                                 : KeyPairGenerator.getInstance(algorithm, prov);
-        generator.initialize(keyLength);
+        if (keyLength > 0) { // not all key pair generators allow the use of key length
+            generator.initialize(keyLength);
+        }
     }
 
     @Benchmark
@@ -97,4 +99,23 @@ public static class XDH extends KeyPairGeneratorBench {
         @Param({"255", "448"})
         private int keyLength;
     }
+
+    public static class MLDSA extends KeyPairGeneratorBench {
+
+        @Param({"ML-DSA-44", "ML-DSA-65", "ML-DSA-87" })
+        private String algorithm;
+
+        @Param({"0"}) // ML-DSA key length is not supported
+        private int keyLength;
+    }
+
+    public static class MLKEM extends KeyPairGeneratorBench {
+
+        @Param({"ML-KEM-512", "ML-KEM-768", "ML-KEM-1024" })
+        private String algorithm;
+
+        @Param({"0"}) // ML-KEM key length is not supported
+        private int keyLength;
+    }
+
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/SignatureBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/SignatureBench.java
index b94ebbfe6be..f47ce4e4814 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/SignatureBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/SignatureBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, 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
@@ -69,7 +69,9 @@ private String getKeyPairGeneratorName() {
     public void setup() throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
         setupProvider();
         KeyPairGenerator kpg = KeyPairGenerator.getInstance(getKeyPairGeneratorName());
-        kpg.initialize(keyLength);
+        if (keyLength > 0) { // not all key pair generators allow the use of key length
+            kpg.initialize(keyLength);
+        }
         KeyPair keys = kpg.generateKeyPair();
         this.privateKey = keys.getPrivate();
         this.publicKey = keys.getPublic();
@@ -136,4 +138,13 @@ public static class EdDSA extends SignatureBench {
 
     }
 
+    public static class MLDSA extends SignatureBench {
+
+        @Param({"ML-DSA-44", "ML-DSA-65", "ML-DSA-87" })
+        private String algorithm;
+
+        @Param({"0"}) // ML-DSA key length is not supported
+        private int keyLength;
+    }
+
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/small/HSSBench.java b/test/micro/org/openjdk/bench/javax/crypto/small/HSSBench.java
new file mode 100644
index 00000000000..581f009591c
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/crypto/small/HSSBench.java
@@ -0,0 +1,27 @@
+/*
+ * 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.javax.crypto.small;
+
+public class HSSBench extends org.openjdk.bench.javax.crypto.full.HSSBench {
+
+}
diff --git a/test/micro/org/openjdk/bench/javax/crypto/small/KEMBench.java b/test/micro/org/openjdk/bench/javax/crypto/small/KEMBench.java
new file mode 100644
index 00000000000..98796aabf2a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/crypto/small/KEMBench.java
@@ -0,0 +1,32 @@
+/*
+ * 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.javax.crypto.small;
+
+import org.openjdk.jmh.annotations.Param;
+
+public class KEMBench extends org.openjdk.bench.javax.crypto.full.KEMBench {
+
+    @Param({"ML-KEM-768"})
+    private String algorithm;
+
+}
diff --git a/test/micro/org/openjdk/bench/javax/crypto/small/KeyPairGeneratorBench.java b/test/micro/org/openjdk/bench/javax/crypto/small/KeyPairGeneratorBench.java
index 20313b2da97..5ac511637e6 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/small/KeyPairGeneratorBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/small/KeyPairGeneratorBench.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
@@ -32,4 +32,22 @@ public class KeyPairGeneratorBench extends org.openjdk.bench.javax.crypto.full.K
     @Param({"2048"})
     private int keyLength;
 
+    public static class MLDSA extends KeyPairGeneratorBench {
+
+        @Param({"ML-DSA-65"})
+        private String algorithm;
+
+        @Param({"0"}) // ML_DSA key length is not supported
+        private int keyLength;
+    }
+
+    public static class MLKEM extends KeyPairGeneratorBench {
+
+        @Param({"ML-KEM-768"})
+        private String algorithm;
+
+        @Param({"0"}) // ML-KEM key length is not supported
+        private int keyLength;
+    }
+
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/small/SignatureBench.java b/test/micro/org/openjdk/bench/javax/crypto/small/SignatureBench.java
index 3b49410d4d4..51e9d990573 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/small/SignatureBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/small/SignatureBench.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
@@ -52,4 +52,17 @@ public static class DSA extends SignatureBench {
 
     }
 
+    public static class MLDSA extends SignatureBench {
+
+        @Param({"ML-DSA-65" })
+        private String algorithm;
+
+        @Param({"1024"})
+        int dataSize;
+
+        @Param({"0"}) // ML-DSA key length is not supported
+        private int keyLength;
+    }
+
+
 }

From bf8a881f02da14a3d47b30eaf414dea76a1c231f Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Wed, 23 Apr 2025 18:47:11 +0000
Subject: [PATCH 091/901] 8352733: Improve RotFontBoundsTest test

Use PassFailJFrame framework for creating manual test UI.

Provide check boxes for each degree of rotation which allow
hiding and showing the specified rotation.
Provide 'Select All' and 'Clear All' buttons.
Display Java version at the bottom of the test.

Reviewed-by: prr, azvegint, abhiscxk, honkar
---
 .../font/TextLayout/RotFontBoundsTest.java    | 257 ++++++++++++++++++
 1 file changed, 257 insertions(+)
 create mode 100644 test/jdk/java/awt/font/TextLayout/RotFontBoundsTest.java

diff --git a/test/jdk/java/awt/font/TextLayout/RotFontBoundsTest.java b/test/jdk/java/awt/font/TextLayout/RotFontBoundsTest.java
new file mode 100644
index 00000000000..c0d4e7e7ef3
--- /dev/null
+++ b/test/jdk/java/awt/font/TextLayout/RotFontBoundsTest.java
@@ -0,0 +1,257 @@
+/*
+ * 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.
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.event.ActionEvent;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+
+import javax.swing.AbstractAction;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+
+import static javax.swing.BorderFactory.createEmptyBorder;
+
+/*
+ * @test
+ * @bug 4650997
+ * @summary rotate a TextLayout and verify that the bounds are correct
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RotFontBoundsTest
+ */
+public final class RotFontBoundsTest {
+    private static final String TEXT = ".This is a STRINg.";
+
+    private static final String INSTRUCTIONS =
+            "A string \u201C" + TEXT + "\u201D is drawn at eight different "
+            + "angles, and eight boxes that surround the bounds of the text "
+            + "layouts (give or take a pixel) are drawn in red. The boxes "
+            + "are always composed of horizontal and vertical lines \u2014 "
+            + "they are not rotated.\n"
+            + "\n"
+            + "By default, all the rotations are displayed. Select or clear "
+            + "a check box with an angle to show or hide a particular "
+            + "rotation. Click \"Select All\" or \"Clear All\" to show all "
+            + "the rotations or to hide them.\n"
+            + "\n"
+            + "Click the Pass button if each box encloses its corresponding "
+            + "text layout.\n"
+            + "Otherwise, click Screenshot to save a screenshot for failure "
+            + "analysis and then click Fail.";
+
+    private static boolean verbose;
+
+    public static void main(String[] args) throws Exception {
+        verbose = (args.length > 0 && args[0].equalsIgnoreCase("verbose"));
+
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+
+        PassFailJFrame.builder()
+                      .instructions(INSTRUCTIONS)
+                      .rows(20)
+                      .columns(50)
+                      .testTimeOut(15)
+                      .screenCapture()
+                      .testUI(RotFontBoundsTest::createUI)
+                      .build()
+                      .awaitAndCheck();
+    }
+
+    private static final int ROTATIONS = 8;
+
+    private static JComponent createUI() {
+        final RotatedTextBounds rotatedText = new RotatedTextBounds();
+
+        final JPanel checkBoxes = new JPanel(new FlowLayout(FlowLayout.CENTER,
+                                                            4, 4));
+        checkBoxes.setBorder(createEmptyBorder(0, 8, 8, 8));
+        for (int i = 0; i < ROTATIONS; i++) {
+            checkBoxes.add(new JCheckBox(new SelectRotationAction(i, rotatedText)));
+        }
+
+        JButton selectAll = new JButton("Select All");
+        selectAll.addActionListener(
+                e -> selectAllCheckBoxes(checkBoxes.getComponents(), true));
+        selectAll.setMnemonic('S');
+
+        JButton clearAll = new JButton("Clear All");
+        clearAll.addActionListener(
+                e -> selectAllCheckBoxes(checkBoxes.getComponents(), false));
+        clearAll.setMnemonic('C');
+
+        Box controls = Box.createHorizontalBox();
+        controls.add(new JLabel("Visible Rotations:"));
+        controls.add(Box.createHorizontalGlue());
+        controls.add(selectAll);
+        controls.add(Box.createHorizontalStrut(4));
+        controls.add(clearAll);
+        controls.setBorder(createEmptyBorder(8, 8, 0, 8));
+
+        Box controlPanel = Box.createVerticalBox();
+        controlPanel.add(controls);
+        controlPanel.add(checkBoxes);
+
+        Box javaVersion = Box.createHorizontalBox();
+        javaVersion.setBorder(createEmptyBorder(8, 8, 8, 8));
+        javaVersion.add(new JLabel("Java version: "
+                                        + System.getProperty("java.runtime.version")));
+        javaVersion.add(Box.createHorizontalGlue());
+
+        Box main = Box.createVerticalBox();
+        main.setName("Rotated TextLayout Test");
+        main.add(controlPanel);
+        main.add(rotatedText);
+        main.add(javaVersion);
+
+        return main;
+    }
+
+    private static final class RotatedTextBounds extends JComponent {
+        private final Font font = new Font(Font.DIALOG, Font.PLAIN, 24);
+
+        private final boolean[] rotationVisible = new boolean[ROTATIONS];
+
+        private RotatedTextBounds() {
+            setBackground(Color.WHITE);
+            setPreferredSize(new Dimension(400, 400));
+            Arrays.fill(rotationVisible, true);
+        }
+
+        public void setRotationVisible(int rotation, boolean visible) {
+            rotationVisible[rotation] = visible;
+            repaint();
+        }
+
+        // Counts the number of paints
+        private int counter = 0;
+
+        @Override
+        public void paintComponent(Graphics _g) {
+            Graphics2D g = (Graphics2D) _g;
+            Dimension d = getSize();
+
+            g.setColor(getBackground());
+            g.fillRect(0, 0, d.width, d.height);
+
+            counter++;
+            int x = d.width / 2;
+            int y = d.height / 2;
+            FontRenderContext frc = g.getFontRenderContext();
+
+            for (int i = 0; i < ROTATIONS; i++) {
+                if (!rotationVisible[i]) {
+                    continue;
+                }
+
+                double angle = -Math.PI / 4.0 * i;
+                AffineTransform flip = AffineTransform.getRotateInstance(angle);
+                Font flippedFont = font.deriveFont(flip);
+                TextLayout tl = new TextLayout(TEXT, flippedFont, frc);
+                Rectangle2D bb = tl.getBounds();
+                g.setPaint(Color.BLACK);
+                tl.draw(g, x, y);
+                g.setPaint(Color.RED);
+                g.drawRect(x + (int) bb.getX(), y + (int) bb.getY(),
+                           (int) bb.getWidth(), (int) bb.getHeight());
+
+                if (verbose) {
+                    if (counter == 1) {
+                        printDetails(angle, tl);
+                    } else if (i == 0) {
+                        System.out.println("Paint, counter=" + counter);
+                    }
+                }
+            }
+        }
+
+        private static void printDetails(double angle, TextLayout tl) {
+            System.out.println("Angle: " + angle);
+            System.out.println("getAscent: " + tl.getAscent());
+            System.out.println("getAdvance: " + tl.getAdvance());
+            System.out.println("getBaseline: " + tl.getBaseline());
+            System.out.println("getBounds: " + tl.getBounds());
+            System.out.println("getDescent: " + tl.getDescent());
+            System.out.println("getLeading: " + tl.getLeading());
+            System.out.println("getVisibleAdvance: " + tl.getVisibleAdvance());
+            System.out.println(".");
+        }
+    }
+
+    private static final class SelectRotationAction
+            extends AbstractAction
+            implements PropertyChangeListener {
+        private final int rotation;
+        private final RotatedTextBounds rotatedText;
+
+        private SelectRotationAction(int rotation,
+                                     RotatedTextBounds rotatedText) {
+            super(rotation * (360 / ROTATIONS) + "\u00B0");
+            this.rotation = rotation;
+            this.rotatedText = rotatedText;
+
+            putValue(SELECTED_KEY, true);
+
+            addPropertyChangeListener(this);
+        }
+
+        private void updateRotationVisible() {
+            rotatedText.setRotationVisible(rotation,
+                                           (Boolean) getValue(SELECTED_KEY));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            updateRotationVisible();
+        }
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            if (evt.getPropertyName().equals(SELECTED_KEY)) {
+                updateRotationVisible();
+            }
+        }
+    }
+
+    private static void selectAllCheckBoxes(Component[] checkBoxes,
+                                            boolean visible) {
+        Arrays.stream(checkBoxes)
+              .forEach(c -> ((JCheckBox) c).setSelected(visible));
+    }
+}

From adcaf01b4feb72f7205796873fd16b77907b2ef1 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 23 Apr 2025 20:19:02 +0000
Subject: [PATCH 092/901] 8355237: Upstream AOT test cases from Leyden repo to
 mainline

Reviewed-by: ccheung, kvn, lmesnik, shade
---
 test/hotspot/jtreg/TEST.groups                |    7 +-
 .../cds/appcds/aotCache/HelloAOTCache.java    |   59 +
 .../aotClassLinking/StringConcatStress.java   | 3161 +++++++++++++++++
 3 files changed, 3224 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/HelloAOTCache.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/StringConcatStress.java

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 4624d74f557..3e3e9e5dd84 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -408,6 +408,7 @@ hotspot_cds_only = \
 
 hotspot_appcds_dynamic = \
   runtime/cds/appcds/ \
+ -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
  -runtime/cds/appcds/applications \
  -runtime/cds/appcds/cacheObject \
@@ -507,6 +508,7 @@ hotspot_cds_epsilongc = \
 # those that rely on redefining classes that are already archived.
 hotspot_aot_classlinking = \
   runtime/cds \
+ -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
  -runtime/cds/appcds/BadBSM.java \
  -runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java \
@@ -585,9 +587,8 @@ hotspot_metaspace = \
 
 # A subset of AppCDS tests to be run in tier1
 tier1_runtime_appcds = \
-  runtime/cds/appcds/HelloTest.java \
-  runtime/cds/appcds/sharedStrings/SharedStringsBasic.java \
-  runtime/cds/appcds/ClassLoaderTest.java
+  runtime/cds/appcds/aotCache/HelloAOTCache.java \
+  runtime/cds/appcds/HelloTest.java
 
 tier1_runtime_appcds_exclude = \
   runtime/cds/appcds/ \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HelloAOTCache.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HelloAOTCache.java
new file mode 100644
index 00000000000..007e51004ec
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/HelloAOTCache.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 AOTCache
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build HelloAOTCache
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar HelloAOTCacheApp
+ * @run driver HelloAOTCache
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class HelloAOTCache {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("HelloAOTCache")
+            .addVmArgs("-Xlog:class+load")
+            .classpath("app.jar")
+            .appCommandLine("HelloAOTCacheApp")
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldMatch("class,load.*HelloAOTCacheApp.*shared objects");
+                    out.shouldContain("HelloWorld");
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class HelloAOTCacheApp {
+    public static void main(String[] args) {
+        System.out.println("HelloWorld");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/StringConcatStress.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/StringConcatStress.java
new file mode 100644
index 00000000000..3786c294791
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/StringConcatStress.java
@@ -0,0 +1,3161 @@
+/*
+ * 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
+ * @requires vm.cds.write.archived.java.heap
+ * @library /test/lib
+ * @build StringConcatStress
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar StringConcatStressApp
+ * @run driver StringConcatStress STATIC
+ */
+
+/*
+ * @test id=aot
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build StringConcatStress
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar StringConcatStressApp
+ * @run driver StringConcatStress AOT
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class StringConcatStress {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "StringConcatStressApp";
+
+    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;
+        }
+
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+                "-XX:+AOTClassLinking", // by default enables AOTInvokeDynamicLinking
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (runMode.isApplicationExecuted()) {
+                out.shouldContain("Result = 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1END");
+            }
+        }
+    }
+}
+
+class StringConcatStressApp {
+    public static void main(String args[]) {
+        System.out.println("Result = " + concat23String() + "END");
+        lotsOfConcats();
+    }
+
+    // Test the handling of java.lang.invoke.StringConcat.highArityThreshold (default value is 20)
+    // in java.lang.invoke.StringConcatFactory. If we have more than this number of concats, a
+    // different form of CallSite is generated by StringConcatFactory that will uses
+    // different kinds of hidden classes than usual.
+    static String concat23String() {
+        return f0 + ","+ f1 + ","+ f2 + ","+ f3 + ","+ f4 + ","+ f5 + ","+ f6 + ","+ f7 + ","+ f8 + ","+ f9 + ","
+                + f10 + ","+ f11 + ","+ f12 + ","+ f13 + ","+ f14 + ","+ f15 + ","+ f16 + ","+ f17 + ","+ f18 + ","+ f19 + ","
+                + f20 + ","+ f21 + ","+ f22;
+    }
+
+    private static String
+            f0="1", f1="1", f2="1", f3="1", f4="1", f5="1", f6="1", f7="1", f8="1", f9="1",
+            f10="1", f11="1", f12="1", f13="1", f14="1", f15="1", f16="1", f17="1", f18="1", f19="1",
+            f20="1", f21="1", f22="1", f23="1", f24="1", f25="1", f26="1", f27="1", f28="1", f29="1",
+            f30="1", f31="1", f32="1", f33="1", f34="1", f35="1", f36="1", f37="1", f38="1", f39="1",
+            f40="1", f41="1", f42="1", f43="1", f44="1", f45="1", f46="1", f47="1", f48="1", f49="1",
+            f50="1", f51="1", f52="1", f53="1", f54="1", f55="1", f56="1", f57="1", f58="1", f59="1",
+            f60="1", f61="1", f62="1", f63="1", f64="1", f65="1", f66="1", f67="1", f68="1", f69="1",
+            f70="1", f71="1", f72="1", f73="1", f74="1", f75="1", f76="1", f77="1", f78="1", f79="1",
+            f80="1", f81="1", f82="1", f83="1", f84="1", f85="1", f86="1", f87="1", f88="1", f89="1",
+            f90="1", f91="1", f92="1", f93="1", f94="1", f95="1", f96="1", f97="1", f98="1", f99="1",
+            f100="1",f101="1",f102="1",f103="1",f104="1",f105="1",f106="1",f107="1",f108="1",f109="1",
+            f110="1",f111="1",f112="1",f113="1",f114="1",f115="1",f116="1",f117="1",f118="1",f119="1",
+            f120="1",f121="1",f122="1";
+
+
+    static String result;
+    static void lotsOfConcats() {
+        long maxElapseMs = 2000;
+        // Run this test case for no more than maxElapseMs milliseconds
+        String s = System.getProperty("StringConcatStress.max.ms");
+        if (s != null) {
+            maxElapseMs = Long.parseLong(s);
+        }
+
+        long start = System.currentTimeMillis();
+        int count = 0;
+        long end;
+
+        do {
+            count ++;
+            lotsOfConcatsInner();
+            end = System.currentTimeMillis();;
+        } while ((end - start) < maxElapseMs);
+
+        System.out.println("Result  = " + result);
+        System.out.println("Elapsed = " + (end - start) + " ms");
+        System.out.println("Count   = " + count);
+    }
+
+    static void lotsOfConcatsInner() {
+        int i = 17;
+        byte b = (byte)127;
+        char c = 'c';
+        long l = 4711;
+        boolean z = true;
+        short s = 5;
+        float f = 1.0f;
+        double d = 2.5;
+        String S = "S";
+        String concat;
+        concat = "" + i + l + i + b + d + d + d + b;
+        concat = "" + S + S + f + f + S + l + "S" + f;
+        concat = "" + c + f + s + s + "S" + d + s + b;
+        concat = "" + f + z + z + s + l + d + c + S;
+        concat = "" + f + "S" + c + b + f + c + "S" + s;
+        concat = "" + "S" + d + l + s + s + z + i + b;
+        concat = "" + S + b + "S" + s + S + l + d + s;
+        concat = "" + d + b + s + z + i + l + z + S;
+        concat = "" + z + z + d + i + c + c + d + "S";
+        concat = "" + l + "S" + z + l + z + z + "S" + b;
+        concat = "" + f + d + b + S + "S" + "S" + l + l;
+        concat = "" + f + b + l + c + f + f + s + S;
+        concat = "" + "S" + z + i + d + i + b + l + "S";
+        concat = "" + "S" + S + S + z + i + S + z + c;
+        concat = "" + f + i + i + b + z + c + i + S;
+        concat = "" + d + f + d + f + s + i + d + "S";
+        concat = "" + s + i + b + z + s + b + "S" + f;
+        concat = "" + z + z + i + "S" + d + "S" + "S" + l;
+        concat = "" + i + c + d + i + s + "S" + "S" + d;
+        concat = "" + z + i + z + z + S + d + b + f;
+        concat = "" + b + S + b + s + z + z + S + f;
+        concat = "" + S + b + i + l + S + d + s + S;
+        concat = "" + c + S + c + f + l + "S" + S + "S";
+        concat = "" + b + l + b + b + s + l + l + z;
+        concat = "" + "S" + b + c + d + f + l + l + b;
+        concat = "" + c + S + S + i + c + z + d + z;
+        concat = "" + z + d + b + S + "S" + i + l + b;
+        concat = "" + z + l + S + f + b + d + l + i;
+        concat = "" + i + b + l + b + l + "S" + d + d;
+        concat = "" + c + s + c + z + i + i + c + c;
+        concat = "" + l + i + z + "S" + d + "S" + "S" + l;
+        concat = "" + "S" + "S" + b + c + i + S + z + f;
+        concat = "" + d + l + d + i + d + c + z + f;
+        concat = "" + b + "S" + c + c + f + z + b + f;
+        concat = "" + s + c + d + c + "S" + b + "S" + b;
+        concat = "" + i + i + S + i + s + d + f + d;
+        concat = "" + S + c + s + i + "S" + c + s + b;
+        concat = "" + b + s + l + S + S + s + c + i;
+        concat = "" + s + S + d + f + S + S + s + z;
+        concat = "" + S + S + c + "S" + z + f + l + s;
+        concat = "" + c + d + z + f + s + f + c + S;
+        concat = "" + z + b + c + c + S + c + z + l;
+        concat = "" + l + "S" + "S" + c + i + S + c + l;
+        concat = "" + d + d + i + z + "S" + z + i + d;
+        concat = "" + d + d + f + i + "S" + b + d + b;
+        concat = "" + c + l + f + d + d + b + d + c;
+        concat = "" + "S" + "S" + i + i + f + c + f + S;
+        concat = "" + l + z + S + b + d + f + d + b;
+        concat = "" + l + S + z + f + "S" + l + f + "S";
+        concat = "" + c + b + i + S + s + f + d + b;
+        concat = "" + s + l + S + b + i + l + z + f;
+        concat = "" + c + b + c + c + c + c + b + "S";
+        concat = "" + s + s + l + S + "S" + z + l + f;
+        concat = "" + i + d + d + z + z + b + b + s;
+        concat = "" + "S" + "S" + b + d + z + f + s + s;
+        concat = "" + b + "S" + c + b + z + d + "S" + l;
+        concat = "" + c + f + S + s + z + s + S + i;
+        concat = "" + d + b + i + i + z + S + c + z;
+        concat = "" + s + l + l + f + "S" + f + s + S;
+        concat = "" + i + c + l + "S" + S + s + f + f;
+        concat = "" + d + d + s + "S" + l + z + f + b;
+        concat = "" + f + l + c + "S" + f + f + "S" + S;
+        concat = "" + f + l + d + S + c + i + f + c;
+        concat = "" + c + "S" + z + z + i + s + i + S;
+        concat = "" + f + "S" + l + d + c + s + s + b;
+        concat = "" + i + i + "S" + l + c + S + d + b;
+        concat = "" + "S" + z + s + f + "S" + d + z + z;
+        concat = "" + "S" + S + l + "S" + l + "S" + d + f;
+        concat = "" + l + f + S + f + "S" + f + i + b;
+        concat = "" + l + c + b + f + s + S + d + c;
+        concat = "" + s + c + l + "S" + l + b + l + S;
+        concat = "" + z + "S" + s + "S" + z + s + i + c;
+        concat = "" + i + z + "S" + z + f + i + S + S;
+        concat = "" + S + b + f + "S" + f + i + b + S;
+        concat = "" + s + S + b + S + c + c + f + b;
+        concat = "" + "S" + d + b + d + i + c + S + c;
+        concat = "" + b + "S" + f + c + s + b + z + "S";
+        concat = "" + b + z + l + l + s + l + l + S;
+        concat = "" + "S" + "S" + S + S + "S" + c + i + S;
+        concat = "" + l + S + s + f + l + s + s + "S";
+        concat = "" + z + d + S + z + b + l + l + b;
+        concat = "" + S + f + b + "S" + c + d + f + d;
+        concat = "" + i + l + S + c + S + d + "S" + c;
+        concat = "" + c + b + "S" + s + s + i + z + "S";
+        concat = "" + f + S + c + i + i + l + z + d;
+        concat = "" + z + z + z + l + f + S + f + b;
+        concat = "" + i + f + z + l + s + S + b + l;
+        concat = "" + z + c + b + S + l + S + s + s;
+        concat = "" + "S" + b + i + l + b + f + c + l;
+        concat = "" + b + c + s + S + f + l + S + i;
+        concat = "" + d + c + l + i + b + "S" + f + f;
+        concat = "" + c + c + "S" + c + s + S + i + c;
+        concat = "" + l + "S" + d + b + c + s + b + d;
+        concat = "" + f + z + f + l + "S" + f + l + f;
+        concat = "" + z + l + "S" + b + f + c + z + b;
+        concat = "" + z + "S" + c + i + b + b + "S" + S;
+        concat = "" + f + "S" + f + s + "S" + f + b + "S";
+        concat = "" + f + i + c + S + b + "S" + d + d;
+        concat = "" + f + f + d + i + f + d + d + i;
+        concat = "" + f + d + f + z + f + c + s + b;
+        concat = "" + f + b + f + s + f + f + c + S;
+        concat = "" + i + S + l + c + s + d + d + f;
+        concat = "" + S + b + c + d + c + s + b + z;
+        concat = "" + f + b + "S" + z + l + f + s + b;
+        concat = "" + d + S + f + "S" + f + s + f + c;
+        concat = "" + c + d + "S" + i + d + z + i + c;
+        concat = "" + S + "S" + c + S + c + l + c + i;
+        concat = "" + d + c + f + "S" + b + S + s + d;
+        concat = "" + i + S + z + i + z + l + i + c;
+        concat = "" + S + f + s + f + z + i + "S" + f;
+        concat = "" + b + d + s + d + d + i + S + z;
+        concat = "" + z + z + b + i + d + z + s + c;
+        concat = "" + c + i + b + z + s + c + l + c;
+        concat = "" + S + f + s + c + s + z + i + "S";
+        concat = "" + z + "S" + l + c + b + S + S + S;
+        concat = "" + f + S + b + l + c + s + c + i;
+        concat = "" + d + s + S + "S" + "S" + z + b + c;
+        concat = "" + d + c + l + i + d + "S" + z + l;
+        concat = "" + "S" + S + z + s + d + i + z + "S";
+        concat = "" + c + z + f + "S" + l + i + c + i;
+        concat = "" + c + i + c + S + s + s + S + z;
+        concat = "" + c + f + f + l + l + i + z + d;
+        concat = "" + s + S + "S" + z + l + "S" + S + c;
+        concat = "" + f + l + z + f + c + i + c + z;
+        concat = "" + z + s + f + l + i + i + "S" + i;
+        concat = "" + S + i + i + b + S + s + z + z;
+        concat = "" + z + "S" + "S" + z + f + "S" + i + f;
+        concat = "" + f + "S" + c + c + i + z + l + f;
+        concat = "" + b + f + f + S + f + z + S + s;
+        concat = "" + i + d + f + z + d + i + i + f;
+        concat = "" + b + d + d + l + "S" + d + b + i;
+        concat = "" + i + "S" + b + i + S + l + z + f;
+        concat = "" + z + f + s + s + "S" + s + l + "S";
+        concat = "" + l + c + s + z + s + b + c + s;
+        concat = "" + s + f + s + b + z + "S" + z + f;
+        concat = "" + b + i + z + i + l + "S" + i + S;
+        concat = "" + z + f + S + d + d + b + f + i;
+        concat = "" + l + i + S + i + z + s + i + S;
+        concat = "" + c + f + f + c + S + "S" + d + c;
+        concat = "" + c + f + d + "S" + l + c + c + s;
+        concat = "" + s + c + c + f + b + f + i + "S";
+        concat = "" + i + "S" + S + l + i + "S" + i + l;
+        concat = "" + b + l + z + "S" + s + c + z + i;
+        concat = "" + d + "S" + "S" + "S" + b + S + c + l;
+        concat = "" + l + l + z + "S" + z + d + S + b;
+        concat = "" + S + b + s + b + b + i + d + s;
+        concat = "" + "S" + c + S + z + s + i + z + b;
+        concat = "" + f + "S" + c + "S" + s + l + c + b;
+        concat = "" + l + s + c + S + z + z + d + s;
+        concat = "" + z + b + s + s + l + d + f + i;
+        concat = "" + c + c + i + c + b + c + S + s;
+        concat = "" + z + f + s + i + c + f + b + i;
+        concat = "" + "S" + f + f + f + z + l + l + l;
+        concat = "" + c + i + z + S + d + l + S + z;
+        concat = "" + c + d + "S" + l + f + c + l + "S";
+        concat = "" + "S" + c + b + z + c + c + c + "S";
+        concat = "" + z + d + S + d + l + d + c + z;
+        concat = "" + c + d + l + s + z + s + b + f;
+        concat = "" + l + s + d + z + l + b + i + i;
+        concat = "" + f + l + b + i + l + b + z + "S";
+        concat = "" + c + b + c + l + S + i + d + c;
+        concat = "" + d + s + s + b + b + s + s + i;
+        concat = "" + d + i + S + z + l + b + b + d;
+        concat = "" + "S" + "S" + c + "S" + f + b + z + f;
+        concat = "" + z + d + "S" + z + "S" + S + d + b;
+        concat = "" + b + i + z + b + S + s + c + l;
+        concat = "" + S + z + c + z + b + d + s + i;
+        concat = "" + S + "S" + z + s + l + z + s + s;
+        concat = "" + f + l + f + f + b + f + z + d;
+        concat = "" + z + z + z + f + i + l + f + b;
+        concat = "" + i + l + z + i + s + d + f + l;
+        concat = "" + "S" + "S" + f + l + "S" + i + "S" + l;
+        concat = "" + S + b + z + f + "S" + l + i + i;
+        concat = "" + z + c + d + z + l + d + z + z;
+        concat = "" + l + z + d + S + l + f + S + d;
+        concat = "" + S + i + d + b + "S" + f + z + z;
+        concat = "" + f + d + "S" + b + l + f + b + b;
+        concat = "" + b + S + "S" + d + "S" + s + s + f;
+        concat = "" + z + c + b + b + z + S + s + b;
+        concat = "" + l + f + S + S + c + f + c + z;
+        concat = "" + i + S + l + d + f + "S" + S + s;
+        concat = "" + i + c + d + z + i + c + d + l;
+        concat = "" + l + d + d + S + l + b + S + i;
+        concat = "" + c + "S" + b + z + l + i + z + S;
+        concat = "" + z + i + z + s + d + S + i + S;
+        concat = "" + z + f + l + "S" + s + b + z + i;
+        concat = "" + z + l + z + f + b + c + d + "S";
+        concat = "" + l + s + i + "S" + S + c + f + i;
+        concat = "" + S + s + b + f + f + "S" + s + i;
+        concat = "" + i + s + c + "S" + z + f + "S" + d;
+        concat = "" + f + s + c + f + d + s + b + c;
+        concat = "" + c + s + d + d + "S" + s + f + "S";
+        concat = "" + "S" + c + z + c + s + s + S + S;
+        concat = "" + S + S + d + s + d + l + s + b;
+        concat = "" + i + s + b + S + S + b + l + i;
+        concat = "" + c + b + b + b + f + s + f + z;
+        concat = "" + z + "S" + s + d + f + i + i + z;
+        concat = "" + S + S + c + i + z + f + i + s;
+        concat = "" + "S" + "S" + S + z + z + "S" + s + f;
+        concat = "" + b + "S" + S + l + i + d + S + z;
+        concat = "" + s + c + "S" + S + b + i + i + i;
+        concat = "" + s + z + i + c + s + l + S + f;
+        concat = "" + d + f + S + S + b + z + c + "S";
+        concat = "" + z + "S" + c + "S" + b + s + f + "S";
+        concat = "" + S + z + s + "S" + b + f + d + S;
+        concat = "" + l + i + b + b + "S" + "S" + l + z;
+        concat = "" + S + l + f + i + i + f + z + f;
+        concat = "" + S + "S" + s + l + b + d + d + s;
+        concat = "" + d + "S" + s + z + c + "S" + i + l;
+        concat = "" + b + s + f + f + z + "S" + d + d;
+        concat = "" + z + f + c + b + f + c + "S" + "S";
+        concat = "" + S + S + z + b + s + f + l + i;
+        concat = "" + l + i + c + z + b + b + S + b;
+        concat = "" + z + c + i + "S" + s + s + "S" + S;
+        concat = "" + S + d + c + z + b + s + i + i;
+        concat = "" + s + z + d + s + i + d + d + S;
+        concat = "" + s + z + s + l + s + l + s + z;
+        concat = "" + f + d + c + f + l + f + i + z;
+        concat = "" + l + d + d + z + d + "S" + z + z;
+        concat = "" + "S" + d + c + "S" + l + s + "S" + c;
+        concat = "" + c + S + z + i + "S" + i + i + z;
+        concat = "" + d + "S" + S + d + z + "S" + f + c;
+        concat = "" + z + d + S + l + i + z + i + l;
+        concat = "" + d + l + c + d + f + s + f + "S";
+        concat = "" + f + c + d + d + l + l + f + d;
+        concat = "" + "S" + z + f + b + d + c + "S" + s;
+        concat = "" + l + S + "S" + d + S + i + l + z;
+        concat = "" + i + S + l + i + l + z + d + f;
+        concat = "" + d + i + s + S + l + d + S + S;
+        concat = "" + l + d + l + b + b + i + z + S;
+        concat = "" + f + s + z + f + i + l + d + b;
+        concat = "" + s + d + l + z + b + b + c + i;
+        concat = "" + f + z + s + d + f + f + d + f;
+        concat = "" + d + z + d + f + "S" + "S" + s + z;
+        concat = "" + c + f + "S" + "S" + b + s + s + i;
+        concat = "" + "S" + "S" + d + b + d + "S" + i + b;
+        concat = "" + d + S + l + f + d + d + b + b;
+        concat = "" + d + l + d + S + b + "S" + f + d;
+        concat = "" + l + c + s + l + "S" + l + S + f;
+        concat = "" + i + b + i + d + s + s + f + c;
+        concat = "" + i + z + z + S + d + z + c + l;
+        concat = "" + S + i + l + "S" + f + f + c + b;
+        concat = "" + "S" + S + d + b + d + f + z + d;
+        concat = "" + d + d + "S" + d + c + S + "S" + b;
+        concat = "" + l + i + c + f + S + s + z + z;
+        concat = "" + c + l + S + i + S + s + z + i;
+        concat = "" + i + "S" + i + "S" + "S" + "S" + b + c;
+        concat = "" + f + z + S + f + c + l + b + i;
+        concat = "" + d + l + b + z + d + s + s + S;
+        concat = "" + s + S + d + s + z + l + S + z;
+        concat = "" + i + s + z + b + l + l + b + d;
+        concat = "" + i + z + b + z + d + S + f + l;
+        concat = "" + S + z + l + b + i + f + l + i;
+        concat = "" + s + s + b + c + s + f + c + f;
+        concat = "" + f + i + s + f + c + S + c + s;
+        concat = "" + s + "S" + z + d + f + S + b + S;
+        concat = "" + i + z + S + d + l + b + i + z;
+        concat = "" + i + c + i + b + i + l + d + f;
+        concat = "" + S + b + s + s + s + c + S + l;
+        concat = "" + S + f + s + "S" + l + l + s + c;
+        concat = "" + z + l + S + S + s + d + S + f;
+        concat = "" + z + f + S + i + d + d + S + b;
+        concat = "" + S + d + "S" + l + l + i + l + i;
+        concat = "" + b + b + i + i + d + i + "S" + s;
+        concat = "" + l + c + "S" + l + s + b + l + l;
+        concat = "" + "S" + s + l + c + b + c + s + S;
+        concat = "" + z + S + b + d + l + d + i + b;
+        concat = "" + b + i + S + i + l + i + f + b;
+        concat = "" + d + S + s + S + "S" + b + c + l;
+        concat = "" + b + c + c + f + S + b + c + d;
+        concat = "" + i + i + b + S + f + f + b + c;
+        concat = "" + i + S + l + "S" + f + f + S + f;
+        concat = "" + f + l + f + c + "S" + c + b + "S";
+        concat = "" + S + S + z + z + "S" + d + s + "S";
+        concat = "" + b + z + i + i + f + c + s + l;
+        concat = "" + i + d + S + b + l + "S" + l + f;
+        concat = "" + b + c + s + s + z + f + z + l;
+        concat = "" + f + f + S + s + z + d + f + s;
+        concat = "" + S + "S" + d + f + c + S + z + i;
+        concat = "" + s + "S" + S + d + s + i + i + "S";
+        concat = "" + l + z + f + d + z + l + c + i;
+        concat = "" + f + i + S + S + c + i + i + d;
+        concat = "" + f + d + z + "S" + s + s + z + l;
+        concat = "" + c + s + s + S + z + z + b + d;
+        concat = "" + f + b + d + S + c + f + l + d;
+        concat = "" + "S" + d + s + f + "S" + s + c + b;
+        concat = "" + S + d + b + d + z + d + z + b;
+        concat = "" + s + l + c + z + s + c + c + "S";
+        concat = "" + z + b + s + f + b + i + l + S;
+        concat = "" + s + b + "S" + S + b + d + d + i;
+        concat = "" + "S" + c + i + z + f + l + s + f;
+        concat = "" + c + z + S + i + "S" + z + b + s;
+        concat = "" + l + i + z + z + z + s + b + d;
+        concat = "" + S + c + d + d + z + s + l + c;
+        concat = "" + l + f + i + f + S + "S" + "S" + f;
+        concat = "" + f + S + s + S + c + i + i + s;
+        concat = "" + f + l + l + z + f + s + "S" + s;
+        concat = "" + f + l + S + S + c + i + l + i;
+        concat = "" + c + s + S + c + f + c + i + i;
+        concat = "" + c + b + c + i + s + d + S + d;
+        concat = "" + z + c + b + s + "S" + z + z + c;
+        concat = "" + f + d + c + "S" + s + "S" + c + "S";
+        concat = "" + d + s + i + i + z + l + l + c;
+        concat = "" + l + z + c + c + b + z + i + d;
+        concat = "" + b + f + f + d + b + "S" + c + f;
+        concat = "" + "S" + "S" + i + z + i + z + b + l;
+        concat = "" + c + z + S + c + b + S + i + i;
+        concat = "" + z + z + z + s + i + s + S + s;
+        concat = "" + l + b + c + d + l + i + c + l;
+        concat = "" + l + l + z + d + "S" + z + b + b;
+        concat = "" + d + f + c + z + b + z + l + z;
+        concat = "" + f + S + s + d + z + S + i + s;
+        concat = "" + d + d + b + i + s + l + "S" + i;
+        concat = "" + f + "S" + b + c + "S" + s + S + d;
+        concat = "" + z + s + "S" + l + c + c + b + z;
+        concat = "" + z + b + s + i + f + d + b + i;
+        concat = "" + i + S + z + c + s + i + z + i;
+        concat = "" + c + b + c + i + i + s + f + z;
+        concat = "" + b + d + c + d + S + c + b + s;
+        concat = "" + c + S + b + z + b + i + "S" + l;
+/*
+        concat = "" + z + "S" + c + l + z + "S" + z + b;
+        concat = "" + "S" + "S" + f + c + c + b + d + c;
+        concat = "" + b + s + f + f + S + "S" + d + s;
+        concat = "" + z + "S" + b + s + l + S + s + f;
+        concat = "" + s + i + i + i + b + l + f + c;
+        concat = "" + z + s + z + z + d + S + S + c;
+        concat = "" + c + l + S + "S" + l + s + b + i;
+        concat = "" + c + s + S + f + S + b + f + s;
+        concat = "" + s + S + c + s + b + b + f + z;
+        concat = "" + c + f + f + b + z + z + b + s;
+        concat = "" + f + s + z + f + b + l + f + f;
+        concat = "" + S + d + f + c + c + s + z + S;
+        concat = "" + c + b + z + f + b + d + b + S;
+        concat = "" + b + "S" + d + b + c + d + S + f;
+        concat = "" + "S" + d + S + "S" + S + S + S + i;
+        concat = "" + f + l + l + "S" + "S" + i + c + "S";
+        concat = "" + b + i + z + "S" + l + l + d + s;
+        concat = "" + c + c + z + z + l + d + "S" + b;
+        concat = "" + S + l + s + d + s + c + d + l;
+        concat = "" + c + b + "S" + s + "S" + s + S + l;
+        concat = "" + c + c + "S" + s + z + "S" + S + c;
+        concat = "" + s + S + z + i + i + l + S + f;
+        concat = "" + s + i + i + f + f + z + "S" + c;
+        concat = "" + S + d + d + S + S + c + d + b;
+        concat = "" + b + S + S + d + c + l + "S" + "S";
+        concat = "" + S + l + i + i + b + c + f + c;
+        concat = "" + s + c + S + d + i + c + s + z;
+        concat = "" + i + f + s + b + S + z + f + "S";
+        concat = "" + "S" + s + "S" + f + "S" + "S" + l + d;
+        concat = "" + b + l + S + z + c + S + S + S;
+        concat = "" + i + d + s + i + s + S + i + f;
+        concat = "" + c + "S" + i + c + c + b + c + "S";
+        concat = "" + "S" + S + c + f + z + f + l + l;
+        concat = "" + i + S + d + d + "S" + s + i + "S";
+        concat = "" + i + l + d + d + S + l + z + S;
+        concat = "" + s + b + z + l + l + i + s + z;
+        concat = "" + f + f + i + d + d + S + "S" + s;
+        concat = "" + l + z + S + b + b + b + s + b;
+        concat = "" + d + c + c + s + "S" + i + z + "S";
+        concat = "" + "S" + b + c + b + s + f + d + i;
+        concat = "" + s + "S" + z + d + d + l + b + c;
+        concat = "" + S + S + d + i + S + z + z + c;
+        concat = "" + l + "S" + i + s + z + s + i + s;
+        concat = "" + c + z + c + z + l + d + S + l;
+        concat = "" + f + f + f + s + "S" + i + d + d;
+        concat = "" + d + f + b + i + f + f + s + f;
+        concat = "" + f + f + s + b + i + c + z + "S";
+        concat = "" + d + c + d + i + i + S + d + S;
+        concat = "" + "S" + f + f + d + c + c + f + d;
+        concat = "" + z + l + b + f + i + d + "S" + d;
+        concat = "" + b + s + f + z + c + i + l + d;
+        concat = "" + l + l + l + "S" + i + l + s + l;
+        concat = "" + "S" + z + b + S + l + z + "S" + c;
+        concat = "" + S + S + b + "S" + f + "S" + c + z;
+        concat = "" + d + c + c + d + d + f + c + b;
+        concat = "" + S + c + b + f + l + s + b + c;
+        concat = "" + s + b + l + z + i + f + b + c;
+        concat = "" + S + c + "S" + d + d + f + b + z;
+        concat = "" + l + "S" + l + z + "S" + s + S + s;
+        concat = "" + f + l + S + s + f + S + l + c;
+        concat = "" + l + d + z + z + "S" + z + i + b;
+        concat = "" + b + s + c + "S" + z + "S" + c + z;
+        concat = "" + s + l + "S" + b + s + d + b + i;
+        concat = "" + S + "S" + z + z + z + s + i + l;
+        concat = "" + "S" + "S" + z + d + c + z + c + S;
+        concat = "" + c + S + f + "S" + l + z + s + "S";
+        concat = "" + d + z + z + s + s + l + i + f;
+        concat = "" + b + b + z + b + S + l + i + S;
+        concat = "" + "S" + z + i + l + c + "S" + z + S;
+        concat = "" + c + l + d + i + d + l + S + i;
+        concat = "" + i + f + "S" + d + s + S + l + c;
+        concat = "" + c + i + d + i + l + "S" + l + d;
+        concat = "" + l + c + b + d + c + b + b + c;
+        concat = "" + i + "S" + b + s + f + d + c + l;
+        concat = "" + "S" + l + l + z + S + d + s + "S";
+        concat = "" + f + f + f + s + S + c + S + l;
+        concat = "" + "S" + f + s + S + "S" + S + "S" + s;
+        concat = "" + f + z + c + s + f + c + i + d;
+        concat = "" + c + z + d + d + c + i + l + l;
+        concat = "" + c + "S" + S + S + c + b + l + z;
+        concat = "" + f + z + S + i + S + b + l + c;
+        concat = "" + i + s + c + S + f + l + z + f;
+        concat = "" + i + S + "S" + c + z + s + i + "S";
+        concat = "" + S + "S" + d + l + "S" + l + i + "S";
+        concat = "" + l + d + f + c + S + i + b + s;
+        concat = "" + l + l + l + z + d + s + l + z;
+        concat = "" + "S" + i + d + l + f + S + c + z;
+        concat = "" + l + S + "S" + d + d + l + z + s;
+        concat = "" + c + i + b + d + "S" + "S" + s + f;
+        concat = "" + "S" + f + d + c + l + S + s + i;
+        concat = "" + d + d + f + f + l + l + f + b;
+        concat = "" + s + c + f + d + b + s + l + b;
+        concat = "" + b + f + d + s + c + z + "S" + z;
+        concat = "" + l + S + s + "S" + S + S + c + i;
+        concat = "" + f + s + i + f + b + S + i + z;
+        concat = "" + S + f + d + z + z + s + f + s;
+        concat = "" + d + "S" + s + i + b + d + c + i;
+        concat = "" + l + z + d + d + f + d + s + i;
+        concat = "" + f + s + S + i + "S" + "S" + S + S;
+        concat = "" + l + "S" + z + f + s + l + S + z;
+        concat = "" + s + "S" + b + "S" + d + z + i + d;
+        concat = "" + s + c + d + f + "S" + s + l + f;
+        concat = "" + i + s + i + i + b + l + S + f;
+        concat = "" + S + "S" + S + l + s + l + c + "S";
+        concat = "" + f + c + i + s + d + f + c + z;
+        concat = "" + f + l + c + b + z + "S" + z + z;
+        concat = "" + S + l + b + b + "S" + f + f + d;
+        concat = "" + l + S + "S" + f + b + l + z + z;
+        concat = "" + "S" + s + S + f + z + f + S + z;
+        concat = "" + S + l + z + s + d + l + z + z;
+        concat = "" + d + z + d + f + "S" + c + d + f;
+        concat = "" + S + z + d + z + f + i + "S" + l;
+        concat = "" + z + f + i + "S" + l + f + S + c;
+        concat = "" + S + d + "S" + f + b + l + s + l;
+        concat = "" + s + d + d + z + f + z + i + S;
+        concat = "" + "S" + s + f + z + b + l + z + f;
+        concat = "" + i + d + d + b + d + l + z + f;
+        concat = "" + s + S + "S" + l + S + d + c + s;
+        concat = "" + i + c + c + S + z + l + s + f;
+        concat = "" + "S" + f + "S" + z + "S" + d + l + s;
+        concat = "" + f + s + f + s + d + S + s + l;
+        concat = "" + "S" + c + b + z + d + z + z + b;
+        concat = "" + l + S + z + s + z + l + f + b;
+        concat = "" + l + S + s + s + c + z + z + S;
+        concat = "" + S + l + S + b + c + s + b + d;
+        concat = "" + l + z + b + z + "S" + l + f + S;
+        concat = "" + b + f + i + "S" + i + z + z + s;
+        concat = "" + b + S + f + c + S + S + l + f;
+        concat = "" + d + "S" + f + i + c + i + l + "S";
+        concat = "" + z + i + S + z + S + "S" + s + l;
+        concat = "" + "S" + S + b + l + "S" + "S" + s + "S";
+        concat = "" + l + d + "S" + f + s + z + b + f;
+        concat = "" + d + i + c + b + i + i + f + c;
+        concat = "" + f + i + s + "S" + l + b + "S" + S;
+        concat = "" + z + c + "S" + z + b + i + i + b;
+        concat = "" + z + S + f + S + b + s + S + S;
+        concat = "" + "S" + d + i + i + S + d + S + s;
+        concat = "" + b + S + f + S + i + s + S + f;
+        concat = "" + s + "S" + s + s + S + "S" + c + c;
+        concat = "" + c + f + c + l + i + s + l + i;
+        concat = "" + z + b + d + "S" + z + l + f + S;
+        concat = "" + b + "S" + z + s + f + c + l + c;
+        concat = "" + c + S + "S" + b + z + d + S + d;
+        concat = "" + s + l + l + f + b + s + z + d;
+        concat = "" + z + l + b + d + i + i + l + b;
+        concat = "" + f + i + s + z + "S" + l + s + f;
+        concat = "" + i + d + i + d + d + l + f + i;
+        concat = "" + S + s + s + i + d + S + z + i;
+        concat = "" + "S" + b + s + f + S + z + l + z;
+        concat = "" + l + s + b + b + "S" + c + S + i;
+        concat = "" + s + s + i + i + z + b + f + s;
+        concat = "" + S + d + i + S + s + s + l + i;
+        concat = "" + z + c + b + l + c + f + z + z;
+        concat = "" + l + s + l + c + z + s + S + z;
+        concat = "" + z + i + c + b + f + c + c + s;
+        concat = "" + S + i + c + b + S + d + c + c;
+        concat = "" + "S" + c + l + S + S + d + s + b;
+        concat = "" + "S" + b + s + f + f + "S" + S + z;
+        concat = "" + s + S + f + s + z + s + d + i;
+        concat = "" + d + s + l + c + S + z + d + z;
+        concat = "" + f + "S" + f + l + l + s + z + c;
+        concat = "" + b + i + f + s + S + c + s + s;
+        concat = "" + l + b + S + c + s + f + S + d;
+        concat = "" + d + S + s + z + "S" + "S" + "S" + z;
+        concat = "" + b + S + b + c + c + i + c + s;
+        concat = "" + b + S + S + "S" + s + c + f + f;
+        concat = "" + z + s + d + z + i + s + z + S;
+        concat = "" + f + d + c + z + d + S + d + z;
+        concat = "" + l + f + z + s + f + f + s + s;
+        concat = "" + "S" + l + S + d + b + s + s + c;
+        concat = "" + S + S + S + z + i + i + f + l;
+        concat = "" + S + s + S + "S" + "S" + b + l + c;
+        concat = "" + z + c + z + f + l + f + S + d;
+        concat = "" + s + b + c + z + S + S + s + "S";
+        concat = "" + f + z + S + d + z + i + b + z;
+        concat = "" + z + b + z + d + f + d + c + S;
+        concat = "" + S + i + "S" + i + l + c + "S" + "S";
+        concat = "" + i + s + f + c + c + z + c + c;
+        concat = "" + d + l + c + i + l + z + d + s;
+        concat = "" + b + z + b + b + "S" + z + i + z;
+        concat = "" + d + c + "S" + c + i + b + S + b;
+        concat = "" + z + i + b + "S" + i + "S" + i + "S";
+        concat = "" + d + S + i + "S" + S + d + c + f;
+        concat = "" + f + i + d + l + c + i + "S" + d;
+        concat = "" + "S" + d + S + "S" + "S" + "S" + S + S;
+        concat = "" + c + d + b + s + l + i + l + l;
+        concat = "" + s + d + b + b + f + i + z + z;
+        concat = "" + z + b + z + c + f + f + b + d;
+        concat = "" + c + b + i + z + S + l + d + d;
+        concat = "" + z + "S" + z + S + i + l + z + b;
+        concat = "" + S + "S" + "S" + b + s + i + d + c;
+        concat = "" + l + f + "S" + z + S + c + S + c;
+        concat = "" + s + d + i + s + l + "S" + l + i;
+        concat = "" + S + S + c + i + "S" + f + z + d;
+        concat = "" + c + i + S + "S" + l + l + s + c;
+        concat = "" + l + f + "S" + S + S + i + i + d;
+        concat = "" + d + b + i + b + c + z + c + f;
+        concat = "" + l + d + z + l + l + l + f + "S";
+        concat = "" + c + b + s + d + b + l + l + l;
+        concat = "" + i + z + b + d + z + S + c + i;
+        concat = "" + s + "S" + i + d + S + b + "S" + f;
+        concat = "" + z + c + "S" + S + f + f + s + f;
+        concat = "" + d + l + c + c + d + i + b + S;
+        concat = "" + b + z + b + i + l + S + c + "S";
+        concat = "" + d + f + b + d + f + c + l + l;
+        concat = "" + "S" + "S" + b + i + z + z + i + f;
+        concat = "" + l + f + b + s + f + d + l + S;
+        concat = "" + d + l + f + S + b + c + b + i;
+        concat = "" + S + l + c + s + i + "S" + l + s;
+        concat = "" + c + c + l + z + l + i + S + z;
+        concat = "" + "S" + "S" + i + d + z + l + f + b;
+        concat = "" + i + c + s + i + i + z + i + b;
+        concat = "" + f + c + b + d + "S" + f + "S" + s;
+        concat = "" + i + c + S + d + "S" + "S" + S + c;
+        concat = "" + l + s + i + c + z + b + i + l;
+        concat = "" + s + l + i + b + f + "S" + l + "S";
+        concat = "" + d + l + b + l + c + f + f + i;
+        concat = "" + d + s + d + f + f + i + i + f;
+        concat = "" + i + S + b + d + z + "S" + b + d;
+        concat = "" + z + "S" + b + l + c + S + S + "S";
+        concat = "" + s + "S" + "S" + f + d + b + l + d;
+        concat = "" + b + "S" + "S" + d + d + l + d + "S";
+        concat = "" + c + z + i + d + "S" + d + c + S;
+        concat = "" + s + l + s + d + f + b + l + c;
+        concat = "" + c + i + z + l + f + c + i + f;
+        concat = "" + b + "S" + s + c + l + s + d + c;
+        concat = "" + i + s + d + d + "S" + f + d + z;
+        concat = "" + d + z + d + c + f + l + s + S;
+        concat = "" + b + l + f + s + d + "S" + s + i;
+        concat = "" + d + "S" + c + "S" + f + l + "S" + "S";
+        concat = "" + c + c + c + "S" + d + d + "S" + z;
+        concat = "" + "S" + S + l + "S" + c + z + s + c;
+        concat = "" + "S" + s + "S" + "S" + d + s + i + "S";
+        concat = "" + s + i + S + c + l + "S" + s + c;
+        concat = "" + z + S + f + l + "S" + f + S + s;
+        concat = "" + i + c + S + z + b + "S" + d + s;
+        concat = "" + c + S + S + i + i + i + s + c;
+        concat = "" + z + s + b + f + l + "S" + b + S;
+        concat = "" + d + d + c + i + z + i + b + S;
+        concat = "" + s + i + d + z + d + l + l + S;
+        concat = "" + z + z + b + z + S + S + f + "S";
+        concat = "" + c + z + l + S + b + c + c + "S";
+        concat = "" + b + i + S + b + s + i + f + S;
+        concat = "" + z + z + "S" + s + l + i + d + c;
+        concat = "" + s + b + s + s + b + c + b + s;
+        concat = "" + b + b + f + l + d + b + c + i;
+        concat = "" + d + z + z + c + S + f + s + l;
+        concat = "" + l + f + s + c + c + i + s + b;
+        concat = "" + l + i + l + S + i + f + b + c;
+        concat = "" + b + S + "S" + s + b + S + l + S;
+        concat = "" + d + d + l + S + c + l + c + "S";
+        concat = "" + b + i + i + d + z + f + l + b;
+        concat = "" + z + f + "S" + z + b + z + z + b;
+        concat = "" + d + "S" + f + z + b + S + l + i;
+        concat = "" + b + c + d + c + l + l + d + b;
+        concat = "" + b + l + S + b + b + s + b + b;
+        concat = "" + c + c + "S" + i + S + b + f + c;
+        concat = "" + c + b + c + f + l + i + d + f;
+        concat = "" + b + l + f + S + z + l + d + z;
+        concat = "" + z + s + i + i + "S" + b + s + b;
+        concat = "" + c + i + s + S + c + "S" + s + c;
+        concat = "" + "S" + z + f + l + s + c + "S" + S;
+        concat = "" + z + "S" + S + s + "S" + b + b + l;
+        concat = "" + c + S + b + s + "S" + c + z + l;
+        concat = "" + f + c + s + l + b + c + b + i;
+        concat = "" + s + i + i + c + s + z + f + s;
+        concat = "" + d + f + i + s + s + c + s + b;
+        concat = "" + "S" + i + f + b + d + b + S + s;
+        concat = "" + l + z + "S" + c + f + d + f + l;
+        concat = "" + s + c + z + "S" + l + c + d + c;
+        concat = "" + z + d + S + s + c + "S" + s + "S";
+        concat = "" + f + s + c + s + s + c + f + c;
+        concat = "" + z + S + s + i + d + c + z + s;
+        concat = "" + l + f + l + S + z + c + c + l;
+        concat = "" + b + d + s + b + z + "S" + i + i;
+        concat = "" + s + s + i + l + d + c + c + d;
+        concat = "" + b + c + d + f + l + l + z + c;
+        concat = "" + i + i + d + z + f + c + S + l;
+        concat = "" + s + d + i + S + z + f + s + s;
+        concat = "" + f + c + "S" + "S" + z + d + "S" + z;
+        concat = "" + z + f + b + s + "S" + s + d + l;
+        concat = "" + d + i + d + l + f + i + b + S;
+        concat = "" + f + l + l + S + l + "S" + z + "S";
+        concat = "" + z + s + b + "S" + l + b + S + z;
+        concat = "" + z + z + c + d + b + l + f + b;
+        concat = "" + S + d + b + S + s + S + i + l;
+        concat = "" + f + c + f + z + f + c + d + c;
+        concat = "" + b + s + f + z + i + s + d + z;
+        concat = "" + f + z + "S" + i + "S" + l + b + "S";
+        concat = "" + "S" + i + f + d + l + f + s + f;
+        concat = "" + S + c + d + i + d + c + c + b;
+        concat = "" + l + z + c + l + f + "S" + z + s;
+        concat = "" + l + s + s + d + d + l + b + S;
+        concat = "" + b + l + c + S + s + b + l + i;
+        concat = "" + z + z + c + S + f + f + i + d;
+        concat = "" + l + i + z + c + "S" + b + f + s;
+        concat = "" + "S" + d + f + z + b + s + i + i;
+        concat = "" + b + i + d + f + b + d + c + c;
+        concat = "" + z + S + d + z + d + i + d + b;
+        concat = "" + i + b + c + z + l + c + c + f;
+        concat = "" + "S" + b + d + d + S + z + f + b;
+        concat = "" + "S" + i + d + s + c + "S" + l + b;
+        concat = "" + f + l + s + f + l + s + d + z;
+        concat = "" + z + i + f + i + d + i + z + l;
+        concat = "" + "S" + c + z + S + c + c + d + d;
+        concat = "" + l + c + i + f + "S" + f + l + c;
+        concat = "" + l + "S" + S + d + S + b + "S" + "S";
+        concat = "" + s + f + "S" + s + S + i + "S" + f;
+        concat = "" + "S" + d + "S" + b + b + S + s + b;
+        concat = "" + i + i + b + f + z + f + i + d;
+        concat = "" + S + d + c + d + d + "S" + d + S;
+        concat = "" + f + i + d + S + f + s + s + s;
+        concat = "" + l + f + i + i + i + s + "S" + z;
+        concat = "" + d + f + l + l + "S" + f + c + S;
+        concat = "" + z + i + S + i + l + z + f + i;
+        concat = "" + b + f + "S" + S + S + d + z + S;
+        concat = "" + S + l + "S" + l + f + b + f + i;
+        concat = "" + S + z + f + b + "S" + "S" + i + l;
+        concat = "" + s + d + l + S + i + s + b + l;
+        concat = "" + "S" + f + f + c + b + s + l + b;
+        concat = "" + s + i + "S" + z + S + "S" + z + f;
+        concat = "" + l + d + S + c + z + S + S + b;
+        concat = "" + f + z + d + "S" + z + z + l + c;
+        concat = "" + c + b + s + c + S + b + s + d;
+        concat = "" + l + b + S + d + c + c + d + f;
+        concat = "" + s + b + z + f + b + "S" + s + c;
+        concat = "" + c + d + s + S + l + i + "S" + S;
+        concat = "" + z + d + f + "S" + l + d + i + i;
+        concat = "" + S + b + f + "S" + s + b + "S" + c;
+        concat = "" + f + c + i + z + c + i + d + z;
+        concat = "" + b + d + f + i + z + "S" + s + b;
+        concat = "" + f + b + s + c + S + s + i + d;
+        concat = "" + s + i + d + c + z + z + f + S;
+        concat = "" + z + f + b + z + i + b + S + i;
+        concat = "" + S + c + z + z + z + S + "S" + z;
+        concat = "" + i + l + c + "S" + S + "S" + d + c;
+        concat = "" + b + z + c + z + f + s + c + b;
+        concat = "" + b + i + z + c + c + l + d + z;
+        concat = "" + d + l + S + i + i + l + d + b;
+        concat = "" + "S" + f + "S" + d + i + b + l + S;
+        concat = "" + z + s + d + s + s + z + S + f;
+        concat = "" + i + b + z + s + S + l + "S" + l;
+        concat = "" + c + l + i + f + l + b + z + s;
+        concat = "" + f + s + c + "S" + i + b + f + "S";
+        concat = "" + z + i + S + b + c + l + i + "S";
+        concat = "" + z + z + f + "S" + d + b + f + "S";
+        concat = "" + f + "S" + l + z + z + d + S + s;
+        concat = "" + "S" + b + l + d + i + l + i + b;
+        concat = "" + z + f + f + z + f + l + b + c;
+        concat = "" + d + z + z + c + "S" + "S" + S + z;
+        concat = "" + z + d + i + S + d + i + d + "S";
+        concat = "" + f + s + l + z + b + b + b + z;
+        concat = "" + S + d + d + s + d + d + l + b;
+        concat = "" + z + s + d + S + d + c + "S" + d;
+        concat = "" + s + "S" + l + f + c + i + l + z;
+        concat = "" + "S" + "S" + s + l + "S" + S + c + c;
+        concat = "" + S + S + l + b + z + b + f + z;
+        concat = "" + S + f + s + S + d + l + l + d;
+        concat = "" + d + f + i + i + l + z + "S" + d;
+        concat = "" + l + f + "S" + l + b + z + f + c;
+        concat = "" + s + S + "S" + b + "S" + "S" + l + c;
+        concat = "" + d + z + s + f + S + c + z + f;
+        concat = "" + c + z + c + s + l + S + i + l;
+        concat = "" + "S" + S + z + l + c + f + S + b;
+        concat = "" + d + S + c + b + z + f + f + c;
+        concat = "" + l + z + c + z + "S" + f + b + c;
+        concat = "" + l + S + c + l + s + "S" + i + S;
+        concat = "" + "S" + d + l + z + S + b + b + f;
+        concat = "" + c + l + f + b + z + S + d + b;
+        concat = "" + z + "S" + i + d + f + l + b + f;
+        concat = "" + d + "S" + z + z + "S" + S + z + c;
+        concat = "" + "S" + S + d + c + "S" + i + S + S;
+        concat = "" + "S" + "S" + s + f + d + s + S + f;
+        concat = "" + z + i + l + i + "S" + c + z + b;
+        concat = "" + S + S + z + z + i + b + "S" + l;
+        concat = "" + l + "S" + l + i + s + s + s + d;
+        concat = "" + l + "S" + z + b + l + f + c + f;
+        concat = "" + b + S + z + l + i + i + z + s;
+        concat = "" + z + b + d + S + i + "S" + f + l;
+        concat = "" + l + f + l + f + d + S + d + i;
+        concat = "" + b + c + b + f + z + s + S + d;
+        concat = "" + z + S + s + f + d + l + "S" + s;
+        concat = "" + s + f + c + l + z + S + i + c;
+        concat = "" + d + "S" + s + c + i + d + d + d;
+        concat = "" + z + l + d + s + i + b + c + l;
+        concat = "" + f + f + S + z + b + l + "S" + l;
+        concat = "" + z + b + b + d + b + c + f + z;
+        concat = "" + l + c + l + f + S + b + f + "S";
+        concat = "" + f + c + f + "S" + f + c + d + i;
+        concat = "" + d + S + l + s + b + d + S + z;
+        concat = "" + z + i + "S" + c + s + l + d + s;
+        concat = "" + d + "S" + i + d + i + b + z + s;
+        concat = "" + "S" + f + f + f + S + S + f + s;
+        concat = "" + "S" + c + "S" + b + S + z + i + z;
+        concat = "" + "S" + c + s + l + S + b + S + s;
+        concat = "" + i + f + S + s + z + c + i + b;
+        concat = "" + b + f + "S" + c + S + "S" + f + f;
+        concat = "" + S + z + s + f + c + d + c + S;
+        concat = "" + i + z + S + "S" + l + s + l + l;
+        concat = "" + l + l + c + f + i + b + l + c;
+        concat = "" + s + b + l + f + s + b + b + i;
+        concat = "" + c + c + z + b + i + b + f + l;
+        concat = "" + S + c + c + b + d + c + l + S;
+        concat = "" + d + z + "S" + z + i + d + S + l;
+        concat = "" + "S" + s + z + d + s + d + b + d;
+        concat = "" + S + c + "S" + s + b + d + s + c;
+        concat = "" + c + "S" + i + b + l + c + S + d;
+        concat = "" + l + z + s + b + l + b + f + b;
+        concat = "" + z + S + s + i + b + S + s + z;
+        concat = "" + z + d + f + c + S + f + f + f;
+        concat = "" + c + s + c + l + "S" + S + s + i;
+        concat = "" + s + d + S + d + "S" + l + s + f;
+        concat = "" + "S" + i + i + d + b + b + b + b;
+        concat = "" + c + l + i + "S" + c + s + c + f;
+        concat = "" + "S" + "S" + "S" + i + l + c + d + s;
+        concat = "" + d + "S" + l + s + f + z + "S" + c;
+        concat = "" + d + f + z + s + b + l + f + z;
+        concat = "" + l + l + c + i + i + d + z + z;
+        concat = "" + z + z + s + s + b + c + f + S;
+        concat = "" + b + "S" + i + z + "S" + "S" + b + d;
+        concat = "" + S + "S" + s + S + S + i + b + S;
+        concat = "" + l + d + z + d + c + c + "S" + c;
+        concat = "" + l + c + d + b + b + d + d + b;
+        concat = "" + s + z + c + i + c + "S" + "S" + "S";
+        concat = "" + s + s + "S" + b + z + c + d + S;
+        concat = "" + c + S + f + f + S + l + f + "S";
+        concat = "" + "S" + b + f + c + b + f + f + "S";
+        concat = "" + s + S + d + "S" + S + l + b + f;
+        concat = "" + b + c + l + b + f + l + b + z;
+        concat = "" + i + s + s + S + c + l + l + S;
+        concat = "" + i + b + f + z + z + S + z + l;
+        concat = "" + c + d + f + d + S + "S" + l + s;
+        concat = "" + s + S + b + c + z + z + i + s;
+        concat = "" + S + z + d + S + s + c + b + s;
+        concat = "" + b + d + c + z + l + S + z + b;
+        concat = "" + b + i + f + i + "S" + b + s + f;
+        concat = "" + b + S + z + c + z + z + b + z;
+        concat = "" + l + d + d + c + "S" + "S" + c + f;
+        concat = "" + l + s + c + l + f + f + "S" + i;
+        concat = "" + S + z + z + S + c + S + f + S;
+        concat = "" + S + c + c + b + c + S + z + f;
+        concat = "" + d + s + s + i + z + c + d + s;
+        concat = "" + s + c + b + z + f + S + z + S;
+        concat = "" + S + z + l + i + s + c + s + z;
+        concat = "" + i + l + "S" + s + b + f + l + z;
+        concat = "" + f + i + l + c + l + l + i + z;
+        concat = "" + b + "S" + l + d + l + i + c + S;
+        concat = "" + s + S + S + f + s + S + l + d;
+        concat = "" + l + l + f + d + c + s + d + c;
+        concat = "" + b + d + S + l + z + c + i + z;
+        concat = "" + z + f + "S" + z + d + z + z + f;
+        concat = "" + s + s + d + l + S + z + d + "S";
+        concat = "" + z + "S" + S + b + S + f + s + "S";
+        concat = "" + c + "S" + c + z + b + l + l + f;
+        concat = "" + S + S + S + d + i + z + s + d;
+        concat = "" + c + c + l + f + c + f + i + f;
+        concat = "" + l + c + f + i + b + f + i + f;
+        concat = "" + l + s + b + "S" + z + f + f + z;
+        concat = "" + s + z + z + i + d + s + b + z;
+        concat = "" + c + "S" + i + "S" + "S" + f + S + l;
+        concat = "" + s + c + s + d + c + S + i + s;
+        concat = "" + z + S + f + f + s + z + s + s;
+        concat = "" + "S" + S + d + l + "S" + f + s + z;
+        concat = "" + i + l + b + l + d + i + i + b;
+        concat = "" + z + d + S + c + f + S + "S" + S;
+        concat = "" + S + l + f + l + d + i + "S" + z;
+        concat = "" + d + "S" + z + z + b + z + i + l;
+        concat = "" + z + c + d + s + c + b + "S" + S;
+        concat = "" + f + S + l + f + b + f + "S" + S;
+        concat = "" + s + S + c + l + d + S + l + z;
+        concat = "" + d + i + i + i + b + l + d + d;
+        concat = "" + l + S + b + s + l + s + d + d;
+        concat = "" + b + S + l + z + f + S + c + i;
+        concat = "" + f + "S" + z + d + z + s + d + f;
+        concat = "" + b + s + d + c + c + d + z + "S";
+        concat = "" + z + "S" + i + f + b + c + "S" + l;
+        concat = "" + "S" + S + z + c + f + i + b + c;
+        concat = "" + "S" + z + d + s + f + f + "S" + s;
+        concat = "" + d + "S" + c + c + s + S + z + d;
+        concat = "" + S + s + f + "S" + f + "S" + d + i;
+        concat = "" + S + s + s + i + z + c + f + s;
+        concat = "" + c + c + i + f + z + f + c + f;
+        concat = "" + f + s + d + S + i + b + d + s;
+        concat = "" + d + z + d + "S" + l + z + f + d;
+        concat = "" + z + b + s + d + "S" + f + f + c;
+        concat = "" + S + i + l + d + z + i + f + "S";
+        concat = "" + "S" + c + i + d + z + S + i + S;
+        concat = "" + S + "S" + b + "S" + s + S + f + d;
+        concat = "" + S + z + b + "S" + i + c + i + "S";
+        concat = "" + i + l + c + d + d + f + s + S;
+        concat = "" + l + i + f + s + d + b + S + b;
+        concat = "" + b + d + S + z + b + c + d + l;
+        concat = "" + f + s + i + d + f + i + z + c;
+        concat = "" + s + c + l + c + c + l + d + z;
+        concat = "" + S + i + z + b + S + d + b + i;
+        concat = "" + f + z + l + i + z + d + c + l;
+        concat = "" + c + b + S + "S" + "S" + s + S + f;
+        concat = "" + i + "S" + f + "S" + l + z + S + b;
+        concat = "" + s + S + l + i + S + "S" + f + i;
+        concat = "" + i + c + l + "S" + l + c + c + z;
+        concat = "" + i + s + z + S + S + i + S + l;
+        concat = "" + "S" + f + S + c + f + S + d + s;
+        concat = "" + "S" + z + c + S + "S" + "S" + d + b;
+        concat = "" + s + l + z + b + z + d + i + b;
+        concat = "" + "S" + f + z + s + d + S + s + i;
+        concat = "" + f + c + f + d + S + d + S + "S";
+        concat = "" + l + z + S + "S" + S + i + z + c;
+        concat = "" + i + z + z + i + i + f + d + "S";
+        concat = "" + S + b + c + "S" + S + f + s + b;
+        concat = "" + S + c + s + s + f + b + "S" + s;
+        concat = "" + S + s + d + c + "S" + d + d + l;
+        concat = "" + i + S + "S" + l + l + l + S + d;
+        concat = "" + z + l + z + c + c + i + l + b;
+        concat = "" + s + S + b + c + z + c + "S" + s;
+        concat = "" + l + d + f + d + b + i + c + l;
+        concat = "" + i + l + "S" + c + l + "S" + c + l;
+        concat = "" + i + S + z + "S" + f + l + c + z;
+        concat = "" + c + S + l + z + b + d + s + s;
+        concat = "" + l + "S" + S + l + b + b + c + z;
+        concat = "" + b + "S" + c + c + s + f + i + z;
+        concat = "" + z + b + d + b + "S" + l + S + z;
+        concat = "" + s + f + i + S + l + S + "S" + b;
+        concat = "" + "S" + c + b + S + s + b + z + s;
+        concat = "" + l + c + z + d + z + z + c + z;
+        concat = "" + l + "S" + z + c + l + z + b + l;
+        concat = "" + d + "S" + S + c + b + d + c + d;
+        concat = "" + d + s + "S" + d + z + c + l + i;
+        concat = "" + s + l + c + f + f + "S" + d + "S";
+        concat = "" + f + s + d + z + z + d + "S" + s;
+        concat = "" + z + d + s + i + d + s + d + s;
+        concat = "" + c + z + f + i + i + i + d + f;
+        concat = "" + l + l + i + S + d + c + z + z;
+        concat = "" + "S" + l + l + b + z + z + S + c;
+        concat = "" + l + S + l + S + b + c + S + b;
+        concat = "" + b + b + b + c + b + c + f + c;
+        concat = "" + l + d + "S" + b + d + "S" + b + S;
+        concat = "" + b + c + f + S + z + l + i + "S";
+        concat = "" + l + S + s + b + l + b + b + l;
+        concat = "" + d + l + l + s + S + S + d + d;
+        concat = "" + i + s + c + S + l + "S" + i + c;
+        concat = "" + b + l + f + b + c + f + b + c;
+        concat = "" + b + l + b + z + i + b + d + i;
+        concat = "" + d + b + l + "S" + c + S + d + s;
+        concat = "" + z + l + s + l + d + d + s + z;
+        concat = "" + i + z + c + l + f + "S" + d + "S";
+        concat = "" + c + s + f + s + z + b + S + z;
+        concat = "" + "S" + d + c + l + d + z + S + f;
+        concat = "" + "S" + i + S + s + s + z + f + l;
+        concat = "" + z + d + z + S + S + l + S + f;
+        concat = "" + S + b + b + d + l + l + S + S;
+        concat = "" + S + s + z + "S" + c + i + S + s;
+        concat = "" + l + d + S + c + "S" + l + c + f;
+        concat = "" + c + d + c + s + f + c + l + i;
+        concat = "" + "S" + "S" + f + d + l + l + S + S;
+        concat = "" + z + b + z + z + "S" + l + i + s;
+        concat = "" + z + z + "S" + z + f + "S" + s + b;
+        concat = "" + s + l + f + s + b + b + c + d;
+        concat = "" + z + "S" + f + S + s + s + S + b;
+        concat = "" + z + i + l + S + s + b + b + "S";
+        concat = "" + c + c + s + z + b + i + l + z;
+        concat = "" + s + i + s + c + l + d + f + b;
+        concat = "" + i + f + s + c + i + s + S + s;
+        concat = "" + z + c + "S" + s + S + f + f + b;
+        concat = "" + l + f + z + "S" + s + S + i + i;
+        concat = "" + "S" + s + d + S + s + s + b + b;
+        concat = "" + "S" + S + "S" + d + "S" + d + z + i;
+        concat = "" + f + "S" + d + i + s + d + s + d;
+        concat = "" + f + b + S + "S" + s + b + z + "S";
+        concat = "" + S + s + S + "S" + "S" + S + d + i;
+        concat = "" + "S" + i + i + b + d + l + S + S;
+        concat = "" + S + d + f + b + d + S + b + s;
+        concat = "" + b + s + c + z + "S" + d + i + f;
+        concat = "" + S + f + z + "S" + c + d + "S" + b;
+        concat = "" + z + l + s + z + d + i + c + S;
+        concat = "" + d + z + S + "S" + b + d + z + z;
+        concat = "" + l + "S" + f + "S" + d + c + z + b;
+        concat = "" + l + b + z + f + S + s + s + "S";
+        concat = "" + i + S + b + s + d + "S" + S + z;
+        concat = "" + c + S + f + z + b + s + S + "S";
+        concat = "" + i + z + "S" + d + s + "S" + z + i;
+        concat = "" + z + s + d + s + S + z + s + "S";
+        concat = "" + "S" + s + S + d + S + S + l + S;
+        concat = "" + s + i + s + s + f + S + s + d;
+        concat = "" + c + z + s + S + f + l + S + f;
+        concat = "" + b + "S" + d + b + "S" + f + d + z;
+        concat = "" + i + f + "S" + l + "S" + i + b + c;
+        concat = "" + z + i + s + z + d + b + l + l;
+        concat = "" + l + b + b + b + S + d + b + d;
+        concat = "" + z + i + S + "S" + b + i + c + s;
+        concat = "" + S + d + f + S + i + b + "S" + f;
+        concat = "" + z + b + c + i + d + b + "S" + S;
+        concat = "" + i + S + b + S + S + d + S + s;
+        concat = "" + i + s + "S" + "S" + c + f + "S" + z;
+        concat = "" + s + l + f + l + "S" + "S" + d + d;
+        concat = "" + l + s + "S" + f + d + b + l + i;
+        concat = "" + l + f + l + i + c + s + i + b;
+        concat = "" + b + S + s + s + i + d + b + "S";
+        concat = "" + S + s + b + l + "S" + l + s + l;
+        concat = "" + b + f + b + l + "S" + l + c + b;
+        concat = "" + l + l + z + S + z + S + c + b;
+        concat = "" + z + f + c + f + b + s + S + "S";
+        concat = "" + f + S + S + i + l + b + s + f;
+        concat = "" + l + f + l + z + b + "S" + f + d;
+        concat = "" + s + d + c + z + d + d + S + l;
+        concat = "" + S + b + i + i + S + s + d + c;
+        concat = "" + b + c + d + "S" + d + i + "S" + c;
+        concat = "" + s + c + i + "S" + c + f + b + d;
+        concat = "" + l + s + l + S + d + z + b + d;
+        concat = "" + "S" + b + s + z + "S" + i + c + b;
+        concat = "" + f + c + f + z + c + i + S + f;
+        concat = "" + c + "S" + f + s + i + f + l + s;
+        concat = "" + b + s + b + b + f + b + f + s;
+        concat = "" + f + i + c + d + S + d + b + z;
+        concat = "" + b + d + l + b + S + b + l + b;
+        concat = "" + "S" + s + i + "S" + s + d + c + S;
+        concat = "" + f + "S" + i + l + z + c + b + i;
+        concat = "" + c + s + z + "S" + i + b + d + i;
+        concat = "" + "S" + f + s + b + c + i + i + S;
+        concat = "" + c + c + z + s + i + c + c + i;
+        concat = "" + d + l + c + i + b + z + c + s;
+        concat = "" + i + b + f + f + l + f + i + b;
+        concat = "" + z + S + s + S + d + l + d + s;
+        concat = "" + l + s + i + b + z + i + b + c;
+        concat = "" + l + z + l + b + z + "S" + d + d;
+        concat = "" + s + z + z + z + l + "S" + l + b;
+        concat = "" + "S" + c + i + l + c + c + d + d;
+        concat = "" + z + "S" + z + "S" + f + S + c + l;
+        concat = "" + f + f + z + b + f + l + d + c;
+        concat = "" + f + "S" + d + i + "S" + s + s + s;
+        concat = "" + c + s + c + z + b + S + d + i;
+        concat = "" + S + s + z + d + d + S + i + d;
+        concat = "" + l + s + c + b + d + z + b + i;
+        concat = "" + s + i + S + S + c + "S" + d + f;
+        concat = "" + S + c + S + "S" + S + "S" + z + l;
+        concat = "" + d + i + i + i + s + c + l + b;
+        concat = "" + S + s + b + S + b + c + l + d;
+        concat = "" + c + c + s + d + l + b + s + d;
+        concat = "" + "S" + b + S + d + l + z + S + z;
+        concat = "" + "S" + z + c + z + S + b + c + S;
+        concat = "" + s + "S" + c + "S" + z + l + l + s;
+        concat = "" + "S" + c + l + b + "S" + c + f + l;
+        concat = "" + "S" + c + b + f + "S" + b + i + f;
+        concat = "" + c + z + d + i + z + s + l + f;
+        concat = "" + S + z + z + S + l + S + S + b;
+        concat = "" + S + s + d + c + s + b + c + d;
+        concat = "" + l + S + i + i + s + d + S + i;
+        concat = "" + "S" + s + s + s + f + c + d + c;
+        concat = "" + i + S + c + d + c + c + S + i;
+        concat = "" + b + S + z + S + b + s + c + l;
+        concat = "" + d + z + s + s + i + c + d + c;
+        concat = "" + c + d + i + z + S + s + l + d;
+        concat = "" + b + f + s + "S" + b + S + S + S;
+        concat = "" + d + f + d + s + z + f + c + s;
+        concat = "" + c + l + "S" + z + l + i + d + l;
+        concat = "" + "S" + b + "S" + s + "S" + c + "S" + c;
+        concat = "" + b + f + c + "S" + d + d + d + f;
+        concat = "" + S + f + z + z + z + b + b + c;
+        concat = "" + f + s + i + s + S + z + l + s;
+        concat = "" + b + b + d + S + z + s + l + c;
+        concat = "" + d + i + d + b + i + "S" + c + "S";
+        concat = "" + c + s + "S" + i + z + s + S + i;
+        concat = "" + b + f + f + b + S + c + f + s;
+        concat = "" + b + c + i + l + S + S + l + f;
+        concat = "" + f + c + f + c + "S" + b + i + l;
+        concat = "" + f + l + i + l + l + l + i + d;
+        concat = "" + "S" + s + i + s + i + b + f + f;
+        concat = "" + f + "S" + z + "S" + "S" + c + s + s;
+        concat = "" + f + i + l + b + "S" + S + s + s;
+        concat = "" + s + f + f + f + l + c + S + b;
+        concat = "" + S + d + i + i + "S" + z + d + f;
+        concat = "" + z + c + S + c + S + c + i + z;
+        concat = "" + d + S + i + s + f + "S" + l + s;
+        concat = "" + c + b + f + z + s + l + z + c;
+        concat = "" + b + c + c + "S" + S + S + d + b;
+        concat = "" + s + f + "S" + "S" + z + l + d + d;
+        concat = "" + z + i + i + z + s + c + c + f;
+        concat = "" + s + d + d + "S" + "S" + f + f + "S";
+        concat = "" + i + S + i + i + l + l + "S" + z;
+        concat = "" + l + d + b + d + S + S + l + f;
+        concat = "" + f + i + "S" + b + i + i + c + d;
+        concat = "" + z + z + i + i + c + d + l + "S";
+        concat = "" + s + d + b + l + f + d + z + f;
+        concat = "" + d + c + "S" + d + "S" + l + d + i;
+        concat = "" + l + s + c + "S" + l + l + i + f;
+        concat = "" + s + s + i + "S" + i + s + b + i;
+        concat = "" + "S" + c + s + d + i + s + S + d;
+        concat = "" + b + l + S + b + b + i + d + b;
+        concat = "" + c + b + S + b + "S" + b + b + c;
+        concat = "" + d + "S" + S + s + c + i + z + "S";
+        concat = "" + d + S + z + c + c + c + z + f;
+        concat = "" + s + z + d + f + f + i + f + f;
+        concat = "" + d + c + l + S + s + S + i + "S";
+        concat = "" + S + f + s + s + l + b + s + z;
+        concat = "" + c + l + f + S + i + b + i + i;
+        concat = "" + l + b + b + s + c + z + f + f;
+        concat = "" + f + c + s + S + z + "S" + d + b;
+        concat = "" + i + S + l + s + z + s + s + l;
+        concat = "" + S + z + f + s + c + b + c + s;
+        concat = "" + c + b + z + s + c + l + s + i;
+        concat = "" + f + l + s + s + S + s + i + S;
+        concat = "" + s + s + b + i + d + l + d + b;
+        concat = "" + S + "S" + s + s + s + d + d + b;
+        concat = "" + b + "S" + "S" + b + S + "S" + c + b;
+        concat = "" + d + S + c + f + "S" + "S" + z + s;
+        concat = "" + i + d + i + l + c + l + d + S;
+        concat = "" + l + "S" + S + d + S + b + c + f;
+        concat = "" + l + f + c + d + d + s + d + c;
+        concat = "" + l + l + z + l + f + l + "S" + S;
+        concat = "" + s + "S" + d + f + s + l + c + f;
+        concat = "" + "S" + d + s + i + s + "S" + s + c;
+        concat = "" + "S" + S + "S" + z + d + f + S + d;
+        concat = "" + d + "S" + i + f + z + c + l + "S";
+        concat = "" + z + b + z + "S" + S + f + "S" + s;
+        concat = "" + d + z + c + c + "S" + "S" + s + c;
+        concat = "" + i + i + d + f + c + z + c + "S";
+        concat = "" + b + S + S + f + s + b + d + b;
+        concat = "" + f + i + d + "S" + l + s + c + f;
+        concat = "" + i + c + f + s + z + S + f + z;
+        concat = "" + z + b + c + S + b + "S" + s + s;
+        concat = "" + "S" + s + d + i + i + "S" + S + l;
+        concat = "" + b + b + b + c + "S" + S + i + f;
+        concat = "" + b + b + b + d + S + z + z + f;
+        concat = "" + c + z + d + s + z + l + b + b;
+        concat = "" + b + d + z + s + b + l + l + s;
+        concat = "" + "S" + s + z + b + z + S + b + s;
+        concat = "" + z + l + d + d + f + f + s + z;
+        concat = "" + f + b + b + z + s + i + z + l;
+        concat = "" + f + i + "S" + l + S + d + c + i;
+        concat = "" + "S" + i + b + c + d + S + b + "S";
+        concat = "" + s + z + l + S + S + f + S + d;
+        concat = "" + "S" + s + d + i + c + "S" + S + z;
+        concat = "" + d + l + S + s + z + c + i + c;
+        concat = "" + i + i + f + l + i + b + S + d;
+        concat = "" + d + s + b + l + z + c + "S" + z;
+        concat = "" + f + s + c + i + c + z + f + l;
+        concat = "" + S + l + i + s + f + i + S + f;
+        concat = "" + s + f + d + s + c + b + f + l;
+        concat = "" + f + l + b + "S" + S + "S" + c + "S";
+        concat = "" + l + i + d + l + z + "S" + b + b;
+        concat = "" + "S" + i + s + s + s + b + z + c;
+        concat = "" + l + i + b + s + l + "S" + c + c;
+        concat = "" + d + s + f + "S" + f + i + S + b;
+        concat = "" + S + "S" + d + b + b + d + z + z;
+        concat = "" + f + s + i + l + f + d + b + s;
+        concat = "" + c + b + s + z + "S" + i + s + f;
+        concat = "" + f + i + z + S + s + S + s + l;
+        concat = "" + l + z + "S" + l + c + l + l + "S";
+        concat = "" + f + c + z + S + c + z + s + i;
+        concat = "" + f + c + l + s + l + s + f + b;
+        concat = "" + d + l + f + "S" + "S" + d + i + i;
+        concat = "" + z + c + b + s + l + "S" + c + s;
+        concat = "" + l + b + d + s + S + z + s + i;
+        concat = "" + f + f + z + b + i + S + d + l;
+        concat = "" + l + S + c + d + z + s + S + d;
+        concat = "" + d + S + S + S + l + d + "S" + s;
+        concat = "" + d + c + d + f + f + l + S + s;
+        concat = "" + d + f + S + b + f + i + z + "S";
+        concat = "" + i + c + z + S + z + s + f + s;
+        concat = "" + d + l + c + "S" + "S" + c + b + "S";
+        concat = "" + f + f + c + c + s + l + c + S;
+        concat = "" + c + f + f + z + s + z + b + z;
+        concat = "" + d + S + b + f + c + d + S + d;
+        concat = "" + z + z + S + d + S + "S" + c + l;
+        concat = "" + z + c + S + b + c + i + c + "S";
+        concat = "" + l + s + s + z + f + f + d + c;
+        concat = "" + c + "S" + S + b + b + i + l + f;
+        concat = "" + b + "S" + c + s + b + "S" + l + s;
+        concat = "" + f + l + c + f + l + z + "S" + S;
+        concat = "" + S + S + l + s + z + b + c + i;
+        concat = "" + d + l + f + f + S + "S" + S + d;
+        concat = "" + l + c + S + i + b + s + f + c;
+        concat = "" + d + f + f + b + f + s + f + S;
+        concat = "" + d + l + l + b + d + f + "S" + d;
+        concat = "" + f + c + b + s + z + i + l + l;
+        concat = "" + "S" + z + l + c + z + f + i + "S";
+        concat = "" + i + z + f + i + S + c + "S" + i;
+        concat = "" + z + f + "S" + S + s + f + d + d;
+        concat = "" + b + d + s + i + z + s + s + c;
+        concat = "" + "S" + d + s + c + "S" + l + i + c;
+        concat = "" + s + d + b + c + b + s + d + z;
+        concat = "" + c + d + s + l + b + b + S + S;
+        concat = "" + "S" + z + s + l + f + s + c + i;
+        concat = "" + l + l + S + z + d + l + S + S;
+        concat = "" + b + f + l + b + s + z + c + f;
+        concat = "" + "S" + b + s + s + f + z + d + f;
+        concat = "" + f + s + z + S + s + "S" + z + c;
+        concat = "" + "S" + s + "S" + s + b + S + b + b;
+        concat = "" + S + S + S + f + c + f + s + s;
+        concat = "" + f + i + i + l + c + i + s + z;
+        concat = "" + c + i + S + b + s + b + b + z;
+        concat = "" + s + S + c + b + b + l + S + f;
+        concat = "" + "S" + s + d + i + i + i + "S" + s;
+        concat = "" + S + l + d + i + i + i + s + "S";
+        concat = "" + b + z + S + "S" + i + l + c + i;
+        concat = "" + c + z + S + f + f + c + z + z;
+        concat = "" + i + "S" + S + "S" + l + b + "S" + l;
+        concat = "" + i + s + z + l + "S" + S + "S" + z;
+        concat = "" + l + d + s + l + z + c + c + c;
+        concat = "" + c + l + l + "S" + b + c + l + b;
+        concat = "" + i + f + b + l + s + z + i + "S";
+        concat = "" + c + s + S + c + i + f + S + s;
+        concat = "" + "S" + i + d + z + S + i + s + b;
+        concat = "" + i + "S" + i + f + b + l + l + i;
+        concat = "" + "S" + "S" + s + l + f + d + z + c;
+        concat = "" + d + i + s + i + z + d + S + s;
+        concat = "" + S + f + z + l + c + S + l + s;
+        concat = "" + "S" + "S" + i + l + d + l + "S" + c;
+        concat = "" + f + z + f + z + S + s + d + i;
+        concat = "" + b + f + f + b + z + b + d + d;
+        concat = "" + S + z + s + S + b + S + S + "S";
+        concat = "" + S + d + i + i + s + i + l + b;
+        concat = "" + c + d + "S" + d + S + b + d + l;
+        concat = "" + b + f + d + l + i + d + l + z;
+        concat = "" + l + c + l + b + c + z + c + l;
+        concat = "" + s + z + S + S + b + S + c + b;
+        concat = "" + c + c + d + f + d + "S" + d + i;
+        concat = "" + z + s + d + i + b + z + d + d;
+        concat = "" + "S" + i + "S" + f + d + S + "S" + f;
+        concat = "" + i + z + s + S + c + d + d + f;
+        concat = "" + l + s + c + b + s + "S" + "S" + "S";
+        concat = "" + i + d + f + l + s + S + f + b;
+        concat = "" + i + d + "S" + f + s + d + s + f;
+        concat = "" + z + f + i + "S" + l + S + "S" + f;
+        concat = "" + l + d + S + s + s + s + s + d;
+        concat = "" + z + b + b + i + i + c + z + z;
+        concat = "" + c + l + c + i + S + c + s + c;
+        concat = "" + S + "S" + s + s + c + b + d + i;
+        concat = "" + i + b + d + z + l + s + l + i;
+        concat = "" + i + b + b + b + i + b + b + d;
+        concat = "" + f + i + d + l + l + b + s + z;
+        concat = "" + S + f + S + "S" + c + s + f + "S";
+        concat = "" + c + "S" + d + "S" + c + S + c + "S";
+        concat = "" + z + "S" + f + b + i + l + c + i;
+        concat = "" + l + c + b + l + f + s + S + l;
+        concat = "" + c + S + S + d + z + S + "S" + z;
+        concat = "" + d + i + d + "S" + "S" + s + s + S;
+        concat = "" + z + s + S + f + d + z + b + l;
+        concat = "" + d + z + l + "S" + d + i + s + s;
+        concat = "" + i + s + l + l + z + c + S + S;
+        concat = "" + i + S + c + S + d + S + l + s;
+        concat = "" + i + s + f + f + z + s + c + z;
+        concat = "" + f + z + S + i + s + f + "S" + b;
+        concat = "" + S + d + f + s + S + i + z + i;
+        concat = "" + f + i + d + b + s + d + "S" + l;
+        concat = "" + b + s + c + S + S + d + "S" + "S";
+        concat = "" + z + "S" + S + c + s + s + S + l;
+        concat = "" + b + S + i + s + f + s + S + z;
+        concat = "" + l + f + "S" + c + s + b + z + f;
+        concat = "" + i + i + b + i + d + "S" + i + i;
+        concat = "" + d + d + l + "S" + d + i + "S" + l;
+        concat = "" + c + i + l + S + "S" + "S" + f + "S";
+        concat = "" + s + "S" + c + i + b + S + S + b;
+        concat = "" + l + d + d + z + c + z + b + s;
+        concat = "" + d + i + S + c + d + i + c + c;
+        concat = "" + s + S + i + "S" + b + S + c + "S";
+        concat = "" + S + d + "S" + S + d + f + s + c;
+        concat = "" + s + s + l + b + s + c + c + i;
+        concat = "" + b + d + c + d + z + z + z + d;
+        concat = "" + c + c + "S" + z + l + s + c + f;
+        concat = "" + d + b + c + s + b + S + d + f;
+        concat = "" + s + b + s + f + d + "S" + f + d;
+        concat = "" + S + "S" + f + z + S + c + s + s;
+        concat = "" + S + b + d + c + l + l + s + l;
+        concat = "" + l + S + i + l + d + f + f + "S";
+        concat = "" + s + s + c + i + i + l + f + z;
+        concat = "" + i + l + "S" + s + S + s + i + S;
+        concat = "" + i + d + s + "S" + b + f + "S" + c;
+        concat = "" + c + "S" + z + b + l + s + S + i;
+        concat = "" + i + z + "S" + s + b + c + s + i;
+        concat = "" + l + f + b + f + i + d + "S" + l;
+        concat = "" + c + c + b + s + "S" + S + d + d;
+        concat = "" + S + "S" + i + f + d + s + l + S;
+        concat = "" + b + d + "S" + S + c + b + "S" + z;
+        concat = "" + c + d + i + S + f + b + b + i;
+        concat = "" + f + i + i + l + z + "S" + z + f;
+        concat = "" + z + f + "S" + c + z + l + c + f;
+        concat = "" + c + c + d + s + d + b + l + d;
+        concat = "" + "S" + s + l + l + "S" + d + l + l;
+        concat = "" + b + i + c + c + b + S + d + S;
+        concat = "" + f + d + i + s + c + b + l + b;
+        concat = "" + s + b + S + f + S + b + l + i;
+        concat = "" + z + "S" + s + i + S + i + b + c;
+        concat = "" + s + S + d + S + z + b + b + d;
+        concat = "" + i + s + "S" + z + s + S + "S" + z;
+        concat = "" + l + z + S + S + b + z + d + "S";
+        concat = "" + S + b + z + S + s + l + "S" + b;
+        concat = "" + d + b + d + z + s + i + z + f;
+        concat = "" + "S" + "S" + b + b + c + z + S + f;
+        concat = "" + d + s + i + i + b + z + "S" + s;
+        concat = "" + i + f + "S" + z + i + s + s + z;
+        concat = "" + S + f + c + z + "S" + l + "S" + "S";
+        concat = "" + "S" + f + z + S + c + d + c + s;
+        concat = "" + d + l + c + c + b + z + d + d;
+        concat = "" + b + s + d + d + b + d + b + d;
+        concat = "" + b + b + d + i + "S" + d + "S" + d;
+        concat = "" + s + c + d + "S" + z + f + z + s;
+        concat = "" + l + "S" + c + s + s + i + b + "S";
+        concat = "" + b + l + d + z + S + c + c + c;
+        concat = "" + S + b + c + b + z + z + c + f;
+        concat = "" + s + b + z + "S" + "S" + i + i + c;
+        concat = "" + z + i + f + "S" + i + c + "S" + z;
+        concat = "" + d + b + i + S + z + f + l + f;
+        concat = "" + c + f + s + "S" + s + s + b + "S";
+        concat = "" + i + c + S + d + i + "S" + d + S;
+        concat = "" + d + b + s + z + S + S + "S" + "S";
+        concat = "" + "S" + s + d + f + s + i + i + "S";
+        concat = "" + f + z + c + z + b + b + s + "S";
+        concat = "" + c + s + d + l + c + l + c + i;
+        concat = "" + f + z + S + i + z + "S" + l + S;
+        concat = "" + S + c + c + s + c + s + d + c;
+        concat = "" + l + i + l + S + l + S + "S" + l;
+        concat = "" + c + f + f + z + d + s + S + s;
+        concat = "" + f + S + d + b + i + d + f + d;
+        concat = "" + l + i + l + d + i + b + l + d;
+        concat = "" + b + "S" + d + "S" + s + f + d + S;
+        concat = "" + i + c + i + c + i + s + d + b;
+        concat = "" + d + i + z + f + "S" + "S" + d + c;
+        concat = "" + s + c + i + d + c + f + d + f;
+        concat = "" + "S" + b + i + s + "S" + d + d + S;
+        concat = "" + s + S + b + d + f + S + S + b;
+        concat = "" + f + i + s + s + c + z + b + d;
+        concat = "" + b + i + z + c + f + d + f + d;
+        concat = "" + d + i + b + f + d + "S" + s + c;
+        concat = "" + l + z + b + b + l + z + b + b;
+        concat = "" + z + S + c + "S" + "S" + S + f + z;
+        concat = "" + d + S + "S" + s + b + c + c + c;
+        concat = "" + b + b + "S" + d + l + s + f + "S";
+        concat = "" + b + d + c + "S" + b + i + c + l;
+        concat = "" + i + b + z + S + s + i + b + z;
+        concat = "" + l + s + f + f + z + l + c + b;
+        concat = "" + s + S + l + f + i + c + i + s;
+        concat = "" + d + i + S + b + s + S + S + "S";
+        concat = "" + l + s + s + z + d + S + d + l;
+        concat = "" + S + S + s + f + b + f + f + c;
+        concat = "" + i + z + b + S + S + b + f + i;
+        concat = "" + l + z + S + b + d + S + f + i;
+        concat = "" + b + i + S + l + l + b + f + l;
+        concat = "" + i + s + i + z + i + c + c + c;
+        concat = "" + i + S + l + c + l + b + d + s;
+        concat = "" + l + s + f + "S" + s + b + S + d;
+        concat = "" + f + l + f + c + s + s + S + i;
+        concat = "" + i + f + i + "S" + S + z + b + d;
+        concat = "" + S + l + S + l + S + c + c + l;
+        concat = "" + d + d + z + l + "S" + c + d + d;
+        concat = "" + b + d + c + b + l + l + f + S;
+        concat = "" + S + z + l + i + s + "S" + S + s;
+        concat = "" + i + z + b + "S" + i + b + s + c;
+        concat = "" + z + b + c + l + S + d + i + z;
+        concat = "" + "S" + c + b + i + d + z + S + i;
+        concat = "" + l + z + s + s + s + b + "S" + c;
+        concat = "" + c + z + d + b + d + z + s + b;
+        concat = "" + l + i + f + c + b + d + "S" + i;
+        concat = "" + i + S + i + f + "S" + z + d + S;
+        concat = "" + z + c + b + b + S + "S" + c + d;
+        concat = "" + s + f + c + s + b + z + "S" + S;
+        concat = "" + l + l + b + S + "S" + "S" + f + S;
+        concat = "" + S + i + f + c + l + l + c + z;
+        concat = "" + z + i + z + b + b + d + s + S;
+        concat = "" + l + z + f + i + z + i + S + "S";
+        concat = "" + i + z + i + s + "S" + c + S + l;
+        concat = "" + i + z + S + l + S + s + "S" + f;
+        concat = "" + b + d + d + l + i + z + i + l;
+        concat = "" + S + f + c + b + c + i + d + l;
+        concat = "" + f + f + S + i + l + b + b + d;
+        concat = "" + "S" + i + "S" + c + z + f + c + "S";
+        concat = "" + i + s + l + l + d + c + f + i;
+        concat = "" + c + c + "S" + z + S + f + i + f;
+        concat = "" + c + "S" + b + "S" + l + l + z + c;
+        concat = "" + d + S + s + c + s + S + c + s;
+        concat = "" + "S" + S + l + S + c + d + z + s;
+        concat = "" + b + s + c + f + l + S + s + b;
+        concat = "" + b + "S" + "S" + f + c + "S" + c + i;
+        concat = "" + l + f + S + i + s + S + l + S;
+        concat = "" + f + S + i + d + l + l + l + i;
+        concat = "" + S + i + d + i + b + d + d + c;
+        concat = "" + l + S + "S" + b + d + z + z + i;
+        concat = "" + s + l + f + "S" + z + f + f + f;
+        concat = "" + l + l + i + f + b + s + c + f;
+        concat = "" + s + i + c + S + "S" + c + c + s;
+        concat = "" + i + b + f + S + c + b + c + c;
+        concat = "" + i + b + s + z + l + f + s + "S";
+        concat = "" + S + c + f + l + c + c + i + S;
+        concat = "" + S + s + z + f + l + s + f + d;
+        concat = "" + S + z + S + S + f + S + s + S;
+        concat = "" + l + s + s + s + i + i + "S" + l;
+        concat = "" + i + f + s + c + c + f + S + d;
+        concat = "" + S + d + d + d + S + c + S + s;
+        concat = "" + S + f + z + i + S + l + S + s;
+        concat = "" + b + S + d + S + i + b + s + z;
+        concat = "" + f + d + "S" + c + "S" + c + S + b;
+        concat = "" + c + i + z + f + d + f + "S" + c;
+        concat = "" + s + c + c + S + s + z + l + s;
+        concat = "" + i + d + f + z + S + s + d + s;
+        concat = "" + z + b + s + d + d + i + f + i;
+        concat = "" + c + i + b + l + S + d + f + f;
+        concat = "" + f + d + S + l + "S" + f + s + l;
+        concat = "" + s + l + l + s + z + s + "S" + z;
+        concat = "" + S + z + d + l + l + i + s + b;
+        concat = "" + z + "S" + z + i + S + "S" + b + S;
+        concat = "" + f + S + s + z + "S" + b + "S" + S;
+        concat = "" + i + s + b + l + b + i + d + l;
+        concat = "" + i + "S" + s + b + l + i + f + d;
+        concat = "" + c + f + S + S + z + s + "S" + c;
+        concat = "" + s + c + z + l + z + S + c + z;
+        concat = "" + d + "S" + i + b + d + S + f + c;
+        concat = "" + s + z + d + c + c + c + l + S;
+        concat = "" + z + S + z + s + l + d + l + b;
+        concat = "" + S + b + i + s + "S" + l + i + "S";
+        concat = "" + "S" + z + "S" + i + S + i + l + "S";
+        concat = "" + z + c + d + l + s + l + l + s;
+        concat = "" + b + i + s + S + z + l + f + d;
+        concat = "" + s + d + d + f + l + i + i + S;
+        concat = "" + "S" + i + d + l + b + S + d + "S";
+        concat = "" + l + s + b + z + s + l + s + c;
+        concat = "" + z + l + b + S + d + s + b + d;
+        concat = "" + "S" + S + S + f + l + i + "S" + s;
+        concat = "" + i + i + i + l + d + c + z + i;
+        concat = "" + d + z + b + b + l + b + z + i;
+        concat = "" + d + S + S + c + s + s + f + c;
+        concat = "" + b + z + f + i + d + l + l + c;
+        concat = "" + i + S + d + "S" + c + l + s + c;
+        concat = "" + l + f + d + f + S + c + i + f;
+        concat = "" + i + f + c + S + d + z + f + z;
+        concat = "" + l + z + b + S + "S" + S + c + "S";
+        concat = "" + S + z + d + c + f + z + l + b;
+        concat = "" + l + b + f + f + c + f + S + z;
+        concat = "" + z + "S" + s + d + s + z + "S" + f;
+        concat = "" + d + "S" + c + z + S + d + i + c;
+        concat = "" + "S" + z + c + S + b + f + s + i;
+        concat = "" + z + "S" + d + s + f + f + d + d;
+        concat = "" + b + d + s + i + d + d + "S" + z;
+        concat = "" + c + z + l + c + l + d + z + s;
+        concat = "" + i + f + b + b + c + l + c + c;
+        concat = "" + S + s + s + l + l + "S" + "S" + f;
+        concat = "" + d + f + f + d + b + b + d + b;
+        concat = "" + S + c + "S" + S + s + d + s + s;
+        concat = "" + z + b + b + b + l + c + l + S;
+        concat = "" + z + l + z + f + S + s + d + S;
+        concat = "" + z + i + s + d + l + z + c + S;
+        concat = "" + d + f + "S" + z + b + i + S + c;
+        concat = "" + c + c + i + d + f + d + f + f;
+        concat = "" + b + d + d + S + z + f + i + b;
+        concat = "" + b + s + l + s + s + c + l + l;
+        concat = "" + S + S + S + i + b + c + b + S;
+        concat = "" + s + i + l + S + f + z + b + b;
+        concat = "" + s + f + i + l + l + s + c + S;
+        concat = "" + s + "S" + b + z + s + S + i + i;
+        concat = "" + l + s + d + d + b + i + s + c;
+        concat = "" + S + s + f + "S" + f + c + d + l;
+        concat = "" + S + S + z + f + S + s + i + b;
+        concat = "" + s + d + l + z + c + S + d + f;
+        concat = "" + i + f + S + f + d + z + b + "S";
+        concat = "" + l + d + f + d + d + b + i + z;
+        concat = "" + s + f + S + l + "S" + d + i + S;
+        concat = "" + S + S + "S" + S + c + "S" + f + s;
+        concat = "" + z + z + c + "S" + "S" + "S" + "S" + s;
+        concat = "" + l + c + z + c + f + d + i + "S";
+        concat = "" + "S" + l + z + "S" + c + c + s + S;
+        concat = "" + d + s + d + s + l + b + S + s;
+        concat = "" + l + "S" + c + f + "S" + f + d + z;
+        concat = "" + "S" + S + c + z + d + d + b + l;
+        concat = "" + d + c + s + i + "S" + S + i + d;
+        concat = "" + d + b + b + b + z + l + s + s;
+        concat = "" + f + d + b + s + l + b + S + d;
+        concat = "" + d + c + d + z + c + i + l + b;
+        concat = "" + z + S + d + b + S + f + S + c;
+        concat = "" + z + S + c + s + S + "S" + s + "S";
+        concat = "" + z + b + d + i + S + b + l + s;
+        concat = "" + i + c + s + i + f + d + "S" + b;
+        concat = "" + s + s + b + l + S + b + z + f;
+        concat = "" + S + i + f + d + z + z + s + s;
+        concat = "" + z + z + d + l + b + c + S + f;
+        concat = "" + d + l + f + l + b + l + c + i;
+        concat = "" + "S" + f + i + c + l + c + b + z;
+        concat = "" + l + l + "S" + S + c + l + z + i;
+        concat = "" + s + f + s + z + "S" + z + c + S;
+        concat = "" + d + z + i + z + b + "S" + b + b;
+        concat = "" + "S" + "S" + c + i + b + c + f + l;
+        concat = "" + d + z + i + S + s + z + s + c;
+        concat = "" + l + i + d + c + l + s + f + b;
+        concat = "" + i + s + l + l + z + c + S + b;
+        concat = "" + S + c + l + S + d + b + "S" + b;
+        concat = "" + b + s + "S" + f + b + S + i + s;
+        concat = "" + d + z + "S" + c + s + b + z + s;
+        concat = "" + b + c + s + "S" + S + b + s + z;
+        concat = "" + b + f + z + c + b + d + S + c;
+        concat = "" + f + "S" + s + c + l + f + l + c;
+        concat = "" + b + b + z + "S" + b + l + f + s;
+        concat = "" + i + f + c + f + c + f + l + i;
+        concat = "" + z + S + "S" + c + i + d + z + f;
+        concat = "" + f + c + l + b + f + b + "S" + "S";
+        concat = "" + f + i + c + S + "S" + b + f + f;
+        concat = "" + b + z + d + z + c + c + "S" + s;
+        concat = "" + s + S + b + d + f + d + c + f;
+        concat = "" + z + f + s + i + d + f + b + z;
+        concat = "" + b + f + z + l + d + c + d + z;
+        concat = "" + i + i + b + s + f + s + S + i;
+        concat = "" + s + f + c + d + z + l + l + S;
+        concat = "" + i + "S" + S + s + l + f + z + f;
+        concat = "" + "S" + i + l + d + i + S + b + l;
+        concat = "" + S + l + f + d + z + i + b + S;
+        concat = "" + f + i + c + S + d + f + "S" + b;
+        concat = "" + s + l + z + f + s + c + d + l;
+        concat = "" + f + S + s + i + f + s + b + d;
+        concat = "" + f + c + s + i + l + f + d + d;
+        concat = "" + l + l + c + c + b + d + "S" + l;
+        concat = "" + c + i + f + f + s + i + "S" + i;
+        concat = "" + l + s + c + d + d + b + d + f;
+        concat = "" + "S" + i + f + s + f + c + "S" + "S";
+        concat = "" + i + "S" + f + f + s + c + c + z;
+        concat = "" + s + b + c + i + i + b + "S" + c;
+        concat = "" + "S" + b + f + l + s + z + z + f;
+        concat = "" + s + c + i + b + z + b + i + d;
+        concat = "" + l + S + c + l + z + s + b + c;
+        concat = "" + "S" + b + s + l + f + b + z + z;
+        concat = "" + z + c + f + S + f + l + i + i;
+        concat = "" + S + f + b + b + l + f + b + c;
+        concat = "" + b + b + "S" + S + d + i + S + s;
+        concat = "" + b + "S" + b + b + l + d + f + d;
+        concat = "" + f + b + l + l + c + b + z + b;
+        concat = "" + z + S + S + s + i + s + l + z;
+        concat = "" + S + l + c + d + z + "S" + d + c;
+        concat = "" + S + i + l + l + "S" + i + z + l;
+        concat = "" + d + l + l + i + s + s + c + i;
+        concat = "" + d + S + z + i + b + i + l + b;
+        concat = "" + c + b + d + z + l + c + z + s;
+        concat = "" + z + i + c + S + d + d + b + f;
+        concat = "" + "S" + s + l + d + i + i + s + c;
+        concat = "" + c + b + i + d + l + z + s + i;
+        concat = "" + s + b + d + s + i + f + s + c;
+        concat = "" + "S" + f + d + z + z + i + f + b;
+        concat = "" + b + c + "S" + d + d + f + f + b;
+        concat = "" + f + l + l + b + d + i + z + c;
+        concat = "" + b + z + z + z + f + i + "S" + c;
+        concat = "" + c + i + i + d + d + b + f + d;
+        concat = "" + "S" + d + c + s + z + z + c + S;
+        concat = "" + f + "S" + c + c + c + z + d + z;
+        concat = "" + s + z + f + i + b + d + b + "S";
+        concat = "" + l + i + d + "S" + z + l + s + "S";
+        concat = "" + i + z + s + z + s + z + S + l;
+        concat = "" + c + b + b + "S" + c + b + s + s;
+        concat = "" + c + l + s + d + b + "S" + f + "S";
+        concat = "" + S + c + c + d + l + "S" + b + z;
+        concat = "" + S + S + s + f + d + s + b + z;
+        concat = "" + z + "S" + l + c + "S" + c + b + l;
+        concat = "" + l + b + b + s + S + S + S + z;
+        concat = "" + b + s + d + i + l + z + c + b;
+        concat = "" + f + s + "S" + d + d + s + "S" + f;
+        concat = "" + f + f + "S" + s + z + d + l + z;
+        concat = "" + "S" + z + b + f + d + d + d + S;
+        concat = "" + i + l + z + d + f + s + s + "S";
+        concat = "" + f + c + l + S + b + b + z + z;
+        concat = "" + f + f + f + S + d + c + b + S;
+        concat = "" + "S" + c + S + "S" + b + i + z + z;
+        concat = "" + s + "S" + b + c + s + d + b + b;
+        concat = "" + S + c + "S" + S + "S" + c + "S" + S;
+        concat = "" + d + z + b + l + b + "S" + i + c;
+        concat = "" + f + "S" + l + i + l + S + d + S;
+        concat = "" + d + c + s + S + c + f + "S" + d;
+        concat = "" + z + d + s + z + i + b + d + "S";
+        concat = "" + "S" + f + c + "S" + f + s + c + "S";
+        concat = "" + i + i + c + b + d + l + i + f;
+        concat = "" + "S" + "S" + z + z + b + c + "S" + i;
+        concat = "" + l + s + i + b + f + b + l + b;
+        concat = "" + S + d + z + i + "S" + c + i + l;
+        concat = "" + l + S + d + c + s + l + i + z;
+        concat = "" + b + S + l + z + i + f + z + i;
+        concat = "" + i + S + S + d + S + d + f + b;
+        concat = "" + d + z + "S" + "S" + l + c + d + c;
+        concat = "" + i + s + S + f + l + s + z + c;
+        concat = "" + S + S + z + S + s + c + d + i;
+        concat = "" + z + d + l + f + d + i + f + S;
+        concat = "" + S + z + s + b + s + S + d + b;
+        concat = "" + b + s + b + l + S + S + c + b;
+        concat = "" + i + c + b + "S" + i + s + d + b;
+        concat = "" + f + l + i + i + S + z + z + d;
+        concat = "" + S + "S" + c + b + b + z + S + i;
+        concat = "" + S + l + l + S + z + c + c + b;
+        concat = "" + i + b + b + i + b + b + l + l;
+        concat = "" + f + c + z + c + z + s + S + i;
+        concat = "" + c + c + l + b + c + s + d + d;
+        concat = "" + l + z + "S" + d + s + c + i + d;
+        concat = "" + f + b + l + d + b + z + s + c;
+        concat = "" + i + d + l + f + c + z + "S" + i;
+        concat = "" + s + s + "S" + b + b + c + f + z;
+        concat = "" + z + d + f + d + c + f + i + S;
+        concat = "" + b + "S" + f + l + S + i + z + b;
+        concat = "" + i + z + "S" + s + S + S + c + d;
+        concat = "" + i + l + d + "S" + f + f + d + f;
+        concat = "" + i + z + s + d + l + f + i + "S";
+        concat = "" + z + S + z + s + l + S + f + "S";
+        concat = "" + "S" + i + c + f + i + l + S + f;
+        concat = "" + s + f + b + c + b + b + c + S;
+        concat = "" + S + d + "S" + s + l + i + c + d;
+        concat = "" + f + s + "S" + S + d + l + z + z;
+        concat = "" + f + S + f + "S" + S + S + d + i;
+        concat = "" + s + b + z + i + "S" + S + d + i;
+        concat = "" + s + d + c + l + z + c + d + i;
+        concat = "" + c + z + l + "S" + s + "S" + s + b;
+        concat = "" + i + z + c + s + S + s + s + "S";
+        concat = "" + c + S + S + "S" + d + f + d + f;
+        concat = "" + d + s + l + f + d + s + "S" + c;
+        concat = "" + z + f + d + "S" + c + f + "S" + S;
+        concat = "" + c + z + i + l + l + z + S + z;
+        concat = "" + "S" + s + S + d + d + z + b + d;
+        concat = "" + i + "S" + i + c + d + z + s + "S";
+        concat = "" + l + f + z + d + s + f + S + S;
+        concat = "" + l + z + d + i + i + l + b + l;
+        concat = "" + i + b + S + z + d + z + i + "S";
+        concat = "" + S + S + b + "S" + b + S + i + i;
+        concat = "" + l + "S" + c + s + l + S + S + b;
+        concat = "" + s + l + c + f + "S" + b + S + b;
+        concat = "" + s + f + b + S + s + "S" + "S" + d;
+        concat = "" + s + s + c + c + l + d + "S" + f;
+        concat = "" + b + b + "S" + S + z + s + "S" + i;
+        concat = "" + b + d + "S" + f + f + l + c + i;
+        concat = "" + i + "S" + z + d + b + S + i + f;
+        concat = "" + d + l + z + c + S + "S" + S + S;
+        concat = "" + d + c + d + S + "S" + f + f + b;
+        concat = "" + i + f + s + b + s + z + s + f;
+        concat = "" + "S" + d + c + b + S + f + S + S;
+        concat = "" + S + z + i + b + i + c + z + S;
+        concat = "" + z + i + "S" + S + S + i + z + i;
+        concat = "" + i + f + "S" + "S" + s + "S" + "S" + b;
+        concat = "" + "S" + S + c + S + i + f + b + "S";
+        concat = "" + i + d + f + z + s + z + i + s;
+        concat = "" + s + f + z + l + S + b + "S" + l;
+        concat = "" + c + "S" + b + S + z + S + l + s;
+        concat = "" + c + b + c + d + c + l + b + "S";
+        concat = "" + i + i + b + "S" + d + s + S + S;
+        concat = "" + l + b + c + c + b + f + z + s;
+        concat = "" + "S" + S + s + z + z + i + l + c;
+        concat = "" + S + f + c + i + b + "S" + b + s;
+        concat = "" + c + b + "S" + f + s + s + z + l;
+        concat = "" + l + z + c + "S" + l + c + c + c;
+        concat = "" + c + z + s + s + c + z + s + b;
+        concat = "" + i + "S" + d + s + f + c + b + s;
+        concat = "" + d + l + "S" + f + l + d + d + "S";
+        concat = "" + b + s + d + s + l + c + l + f;
+        concat = "" + S + i + c + f + i + "S" + i + s;
+        concat = "" + "S" + "S" + b + i + f + b + z + s;
+        concat = "" + S + c + "S" + f + "S" + i + s + c;
+        concat = "" + c + b + b + s + S + S + "S" + b;
+        concat = "" + s + S + i + z + s + d + i + s;
+        concat = "" + "S" + "S" + "S" + z + f + c + i + i;
+        concat = "" + z + "S" + s + l + S + i + f + f;
+        concat = "" + z + b + c + l + i + b + l + S;
+        concat = "" + s + c + f + s + l + S + d + d;
+        concat = "" + z + s + b + b + z + "S" + s + S;
+        concat = "" + "S" + l + f + l + l + b + f + i;
+        concat = "" + i + z + i + d + S + s + l + d;
+        concat = "" + f + i + b + "S" + "S" + c + b + s;
+        concat = "" + "S" + S + i + c + "S" + l + z + S;
+        concat = "" + d + l + d + b + c + l + d + s;
+        concat = "" + f + s + c + i + l + i + c + f;
+        concat = "" + l + "S" + l + d + s + "S" + i + d;
+        concat = "" + f + z + "S" + "S" + b + z + "S" + S;
+        concat = "" + l + z + l + "S" + z + c + z + c;
+        concat = "" + l + "S" + S + z + S + z + b + "S";
+        concat = "" + s + s + f + s + i + c + l + l;
+        concat = "" + b + l + S + z + l + l + c + i;
+        concat = "" + d + S + b + S + "S" + z + "S" + f;
+        concat = "" + s + S + z + s + c + S + l + s;
+        concat = "" + "S" + d + S + l + f + b + z + "S";
+        concat = "" + "S" + d + c + l + "S" + b + f + S;
+        concat = "" + "S" + S + s + z + i + S + l + f;
+        concat = "" + s + i + f + f + i + l + d + f;
+        concat = "" + "S" + s + "S" + i + s + c + "S" + d;
+        concat = "" + s + f + f + i + f + l + l + c;
+        concat = "" + i + f + "S" + d + f + d + l + z;
+        concat = "" + "S" + S + i + d + c + b + i + l;
+        concat = "" + f + l + "S" + l + s + z + b + b;
+        concat = "" + z + z + f + b + b + b + l + i;
+        concat = "" + s + "S" + S + c + "S" + "S" + b + b;
+        concat = "" + S + l + s + c + c + i + S + f;
+        concat = "" + b + z + b + f + z + S + i + b;
+        concat = "" + i + d + f + l + s + "S" + s + b;
+        concat = "" + d + d + d + z + i + f + i + i;
+        concat = "" + S + d + z + s + "S" + f + l + S;
+        concat = "" + "S" + i + s + f + S + l + s + c;
+        concat = "" + i + z + S + "S" + l + z + d + z;
+        concat = "" + b + f + b + b + S + "S" + l + s;
+        concat = "" + "S" + l + s + "S" + f + "S" + l + z;
+        concat = "" + c + s + d + z + s + "S" + z + i;
+        concat = "" + s + z + S + z + "S" + i + z + b;
+        concat = "" + c + i + S + z + d + S + i + d;
+        concat = "" + s + f + l + i + S + f + l + s;
+        concat = "" + b + i + b + d + f + f + "S" + "S";
+        concat = "" + "S" + d + l + i + s + S + l + c;
+        concat = "" + i + i + b + i + z + c + l + S;
+        concat = "" + z + S + s + d + b + s + z + s;
+        concat = "" + b + c + S + "S" + "S" + b + i + l;
+        concat = "" + z + l + "S" + l + l + f + c + s;
+        concat = "" + s + "S" + b + i + b + s + z + f;
+        concat = "" + i + b + S + s + f + "S" + c + c;
+        concat = "" + z + "S" + c + c + d + "S" + z + d;
+        concat = "" + b + s + s + S + b + i + s + s;
+        concat = "" + s + "S" + c + b + S + c + s + S;
+        concat = "" + i + d + l + s + f + "S" + S + i;
+        concat = "" + S + f + b + i + z + c + f + b;
+        concat = "" + i + S + d + d + c + b + "S" + c;
+        concat = "" + d + z + i + z + c + s + d + s;
+        concat = "" + b + z + c + i + f + i + c + "S";
+        concat = "" + f + "S" + S + d + b + f + d + b;
+        concat = "" + "S" + c + l + S + z + c + z + l;
+        concat = "" + S + c + d + b + d + s + "S" + f;
+        concat = "" + z + b + "S" + d + c + i + "S" + d;
+        concat = "" + b + "S" + c + S + z + s + i + i;
+        concat = "" + s + z + i + c + i + i + i + b;
+        concat = "" + c + z + z + d + b + s + b + s;
+        concat = "" + "S" + z + l + i + S + s + l + b;
+        concat = "" + z + b + s + f + "S" + c + f + b;
+        concat = "" + "S" + b + s + S + "S" + d + i + "S";
+        concat = "" + c + c + s + b + S + l + i + f;
+        concat = "" + "S" + i + d + d + l + "S" + "S" + b;
+        concat = "" + S + l + b + c + S + c + S + S;
+        concat = "" + l + b + "S" + l + l + z + s + i;
+        concat = "" + "S" + s + f + b + b + d + b + i;
+        concat = "" + S + b + b + b + l + c + l + b;
+        concat = "" + l + c + z + s + c + s + b + s;
+        concat = "" + l + c + S + s + "S" + b + f + d;
+        concat = "" + s + d + d + i + b + i + "S" + b;
+        concat = "" + d + l + z + l + d + l + l + b;
+        concat = "" + c + i + c + "S" + f + "S" + "S" + b;
+        concat = "" + "S" + d + z + S + z + d + i + b;
+        concat = "" + c + z + b + c + d + c + c + z;
+        concat = "" + b + s + S + d + z + f + l + z;
+        concat = "" + d + z + f + "S" + z + d + f + f;
+        concat = "" + s + z + d + c + s + s + "S" + i;
+        concat = "" + i + c + z + S + b + b + z + z;
+        concat = "" + l + "S" + f + s + z + i + d + b;
+        concat = "" + s + S + l + c + S + f + z + i;
+        concat = "" + f + l + s + "S" + l + s + d + S;
+        concat = "" + l + c + b + f + f + s + S + c;
+        concat = "" + s + i + i + S + c + s + s + s;
+        concat = "" + f + c + b + c + "S" + c + i + s;
+        concat = "" + S + S + d + f + "S" + i + i + c;
+        concat = "" + d + f + s + z + S + b + s + s;
+        concat = "" + z + f + f + l + l + i + z + z;
+        concat = "" + i + c + f + b + f + d + "S" + s;
+        concat = "" + "S" + f + z + S + z + f + l + c;
+        concat = "" + S + b + s + "S" + "S" + l + l + f;
+        concat = "" + i + l + S + c + l + c + "S" + s;
+        concat = "" + c + z + S + f + l + d + c + b;
+        concat = "" + l + b + s + s + l + S + f + d;
+        concat = "" + f + c + s + "S" + "S" + d + b + b;
+        concat = "" + "S" + c + "S" + S + f + "S" + z + b;
+        concat = "" + l + i + l + "S" + s + f + i + c;
+        concat = "" + f + s + "S" + S + f + d + l + s;
+        concat = "" + i + c + b + i + b + i + i + b;
+        concat = "" + s + s + S + d + z + d + d + l;
+        concat = "" + z + s + S + s + c + "S" + f + i;
+        concat = "" + S + l + "S" + i + f + f + d + b;
+        concat = "" + d + c + d + f + f + f + S + "S";
+        concat = "" + c + f + S + f + "S" + i + z + i;
+        concat = "" + s + b + s + b + b + i + S + z;
+        concat = "" + f + b + i + S + b + i + z + l;
+        concat = "" + c + s + b + S + s + s + z + c;
+        concat = "" + S + b + b + l + d + z + i + i;
+        concat = "" + l + S + c + d + S + b + l + i;
+        concat = "" + f + f + z + "S" + z + f + S + d;
+        concat = "" + c + l + b + "S" + s + d + "S" + c;
+        concat = "" + s + "S" + l + s + S + l + c + f;
+        concat = "" + s + S + "S" + b + i + s + i + i;
+        concat = "" + s + l + z + f + b + l + i + s;
+        concat = "" + S + c + i + b + c + z + i + "S";
+        concat = "" + z + z + d + i + l + s + "S" + S;
+        concat = "" + f + d + i + "S" + "S" + l + d + z;
+        concat = "" + c + z + s + "S" + b + c + l + c;
+        concat = "" + b + d + f + b + "S" + s + d + "S";
+        concat = "" + S + d + S + s + S + S + c + f;
+        concat = "" + z + b + S + "S" + l + z + s + z;
+        concat = "" + c + f + S + "S" + f + f + f + c;
+        concat = "" + l + "S" + d + l + l + f + b + c;
+        concat = "" + z + S + d + i + S + s + S + "S";
+        concat = "" + S + d + s + f + z + z + l + d;
+        concat = "" + z + c + c + z + s + s + z + i;
+        concat = "" + c + c + i + b + l + "S" + i + d;
+        concat = "" + i + l + "S" + b + "S" + l + z + b;
+        concat = "" + c + f + "S" + c + f + d + S + "S";
+        concat = "" + i + i + "S" + c + f + z + i + "S";
+        concat = "" + f + "S" + l + f + c + s + b + i;
+        concat = "" + f + "S" + d + b + c + "S" + i + b;
+        concat = "" + S + l + l + i + b + b + z + b;
+        concat = "" + f + "S" + l + S + c + z + c + f;
+        concat = "" + l + S + l + b + "S" + s + f + d;
+        concat = "" + c + S + z + c + s + s + s + f;
+        concat = "" + d + b + d + b + c + c + d + i;
+        concat = "" + "S" + "S" + b + f + f + c + i + b;
+        concat = "" + S + S + c + s + i + z + f + b;
+        concat = "" + l + c + c + S + "S" + b + l + "S";
+        concat = "" + f + d + S + f + b + f + "S" + f;
+        concat = "" + z + z + S + s + S + b + "S" + c;
+        concat = "" + b + s + c + f + z + s + z + S;
+        concat = "" + c + c + d + "S" + i + z + l + z;
+        concat = "" + b + d + z + S + l + S + b + S;
+        concat = "" + c + S + "S" + b + "S" + i + i + c;
+        concat = "" + "S" + i + "S" + S + "S" + i + l + f;
+        concat = "" + s + l + c + l + f + f + l + S;
+        concat = "" + l + "S" + "S" + l + c + c + d + d;
+        concat = "" + l + d + z + f + d + b + c + "S";
+        concat = "" + z + S + z + b + z + z + S + f;
+        concat = "" + d + z + c + b + i + f + z + d;
+        concat = "" + d + f + l + c + d + c + S + z;
+        concat = "" + "S" + b + d + c + l + d + d + b;
+        concat = "" + "S" + S + f + d + s + S + c + f;
+        concat = "" + f + S + b + z + i + i + s + i;
+        concat = "" + f + d + "S" + l + b + f + "S" + i;
+        concat = "" + i + i + i + b + l + d + s + f;
+        concat = "" + b + l + f + z + l + b + b + l;
+        concat = "" + i + l + c + S + S + f + b + f;
+        concat = "" + l + b + f + c + f + s + z + f;
+        concat = "" + d + S + f + i + "S" + f + f + z;
+        concat = "" + d + i + "S" + S + b + "S" + c + z;
+        concat = "" + "S" + c + "S" + l + d + b + f + s;
+        concat = "" + c + z + z + d + z + b + "S" + z;
+        concat = "" + s + s + S + z + d + f + c + f;
+        concat = "" + S + S + s + l + c + "S" + f + S;
+        concat = "" + d + l + z + d + d + l + i + f;
+        concat = "" + S + s + "S" + z + S + l + f + f;
+        concat = "" + b + s + l + "S" + "S" + c + i + f;
+        concat = "" + i + b + i + "S" + z + "S" + l + "S";
+        concat = "" + "S" + s + l + z + i + d + z + "S";
+        concat = "" + z + s + z + b + "S" + i + c + d;
+        concat = "" + b + i + i + d + S + d + l + b;
+        concat = "" + S + z + d + i + "S" + s + d + f;
+        concat = "" + l + d + z + z + S + f + c + s;
+        concat = "" + z + d + f + s + d + f + i + s;
+        concat = "" + s + "S" + c + c + z + S + "S" + i;
+        concat = "" + "S" + i + f + i + b + "S" + d + z;
+        concat = "" + i + s + d + i + d + d + b + f;
+        concat = "" + s + "S" + "S" + b + l + d + c + "S";
+        concat = "" + i + "S" + f + l + s + d + d + c;
+        concat = "" + d + "S" + s + i + i + "S" + b + S;
+        concat = "" + l + S + c + i + d + b + i + i;
+        concat = "" + s + z + s + s + c + "S" + i + f;
+        concat = "" + b + f + b + "S" + s + f + S + i;
+        concat = "" + b + b + i + f + c + "S" + s + z;
+        concat = "" + i + "S" + f + s + d + f + "S" + z;
+        concat = "" + i + z + f + S + i + l + z + z;
+        concat = "" + l + s + i + i + l + z + d + d;
+        concat = "" + s + S + d + s + f + d + l + "S";
+        concat = "" + i + z + "S" + b + "S" + S + "S" + S;
+        concat = "" + i + i + d + s + l + b + f + b;
+        concat = "" + c + b + f + i + s + "S" + l + d;
+        concat = "" + f + "S" + b + s + "S" + z + c + l;
+        concat = "" + S + f + c + f + c + b + b + z;
+        concat = "" + s + d + i + S + f + b + z + f;
+        concat = "" + "S" + b + l + d + i + b + "S" + f;
+        concat = "" + c + f + l + d + c + S + i + s;
+        concat = "" + z + s + s + "S" + i + i + c + S;
+        concat = "" + l + l + z + c + "S" + s + S + f;
+        concat = "" + c + l + l + S + z + b + f + d;
+        concat = "" + b + "S" + l + z + S + i + i + s;
+        concat = "" + d + b + l + s + S + b + S + S;
+        concat = "" + z + b + l + "S" + "S" + z + d + c;
+        concat = "" + l + S + d + "S" + c + S + l + b;
+        concat = "" + S + b + i + d + s + s + f + z;
+        concat = "" + l + "S" + b + c + z + b + "S" + d;
+        concat = "" + i + d + "S" + S + S + l + z + S;
+        concat = "" + b + S + l + "S" + S + z + S + S;
+        concat = "" + "S" + c + i + l + s + l + S + s;
+        concat = "" + s + f + c + c + S + i + z + b;
+        concat = "" + S + i + f + c + d + f + l + "S";
+        concat = "" + s + z + d + S + b + d + "S" + "S";
+        concat = "" + b + c + "S" + s + l + l + l + s;
+        concat = "" + b + c + d + i + S + b + b + S;
+        concat = "" + S + S + l + "S" + f + l + z + d;
+        concat = "" + z + S + s + b + z + d + d + c;
+        concat = "" + i + i + s + f + d + S + "S" + z;
+        concat = "" + c + s + f + s + z + i + l + "S";
+        concat = "" + z + i + "S" + s + d + l + c + i;
+        concat = "" + s + f + "S" + "S" + i + l + s + S;
+        concat = "" + "S" + f + s + d + f + s + f + z;
+        concat = "" + f + i + i + l + "S" + S + f + l;
+        concat = "" + b + S + i + z + s + f + "S" + l;
+        concat = "" + z + s + l + s + l + f + i + S;
+        concat = "" + c + i + c + f + f + z + d + s;
+        concat = "" + S + f + f + S + z + S + z + s;
+        concat = "" + c + S + S + f + "S" + z + "S" + S;
+        concat = "" + S + d + S + s + s + f + l + s;
+        concat = "" + f + S + c + l + z + d + d + b;
+        concat = "" + f + s + d + z + l + i + f + b;
+        concat = "" + b + S + d + s + c + d + b + s;
+        concat = "" + b + i + S + "S" + "S" + S + f + "S";
+        concat = "" + S + f + s + d + z + c + b + S;
+        concat = "" + b + S + d + b + S + b + c + i;
+        concat = "" + f + "S" + d + b + z + S + s + l;
+        concat = "" + s + z + s + S + S + f + b + l;
+        concat = "" + b + S + l + d + d + S + z + i;
+        concat = "" + b + s + z + i + S + s + S + "S";
+        concat = "" + s + z + i + S + i + f + c + "S";
+        concat = "" + "S" + S + f + b + c + i + c + "S";
+        concat = "" + "S" + d + b + d + S + i + c + z;
+        concat = "" + z + "S" + c + f + z + d + S + c;
+        concat = "" + f + b + c + S + z + c + f + i;
+        concat = "" + d + c + "S" + i + i + d + S + S;
+        concat = "" + d + f + c + S + i + c + s + "S";
+        concat = "" + S + f + z + f + "S" + d + f + l;
+        concat = "" + s + c + f + z + "S" + b + i + d;
+        concat = "" + "S" + d + b + S + c + b + S + z;
+        concat = "" + l + c + i + d + c + s + d + s;
+        concat = "" + s + z + i + S + s + l + s + c;
+        concat = "" + S + z + S + s + s + z + S + b;
+        concat = "" + d + "S" + s + S + z + "S" + i + s;
+        concat = "" + i + d + S + b + "S" + z + l + d;
+        concat = "" + s + "S" + z + d + "S" + c + f + s;
+        concat = "" + S + z + b + f + d + c + c + z;
+        concat = "" + d + z + S + "S" + f + d + i + "S";
+        concat = "" + b + c + f + f + l + f + b + s;
+        concat = "" + "S" + i + c + f + f + i + "S" + i;
+        concat = "" + s + S + i + c + f + i + c + d;
+        concat = "" + l + d + z + d + "S" + z + "S" + c;
+        concat = "" + i + s + c + l + S + c + c + "S";
+        concat = "" + "S" + f + S + c + "S" + s + c + c;
+        concat = "" + "S" + "S" + "S" + "S" + b + z + l + z;
+        concat = "" + z + c + d + S + S + f + f + i;
+        concat = "" + i + i + S + s + b + "S" + "S" + "S";
+        concat = "" + l + b + d + b + d + i + "S" + c;
+        concat = "" + s + z + S + s + f + z + f + c;
+        concat = "" + b + f + "S" + b + c + b + d + "S";
+        concat = "" + c + c + "S" + s + l + b + z + l;
+        concat = "" + l + b + s + z + S + c + b + c;
+        concat = "" + l + f + S + b + "S" + s + c + "S";
+        concat = "" + "S" + "S" + c + c + l + S + z + d;
+        concat = "" + s + z + S + f + i + c + l + s;
+        concat = "" + l + c + d + z + S + S + l + b;
+        concat = "" + s + f + d + S + s + f + l + b;
+        concat = "" + s + f + c + i + f + c + d + z;
+        concat = "" + d + z + s + l + d + "S" + i + S;
+        concat = "" + s + i + l + s + d + l + s + c;
+        concat = "" + l + b + z + s + d + c + S + "S";
+        concat = "" + b + c + z + z + l + l + i + d;
+        concat = "" + f + f + f + b + l + l + d + z;
+        concat = "" + s + d + z + z + f + s + f + i;
+        concat = "" + S + c + l + s + s + b + i + i;
+        concat = "" + z + f + c + l + c + b + b + b;
+        concat = "" + S + z + d + "S" + b + i + f + l;
+        concat = "" + s + l + f + S + f + z + "S" + "S";
+        concat = "" + b + c + s + S + i + s + l + f;
+        concat = "" + S + "S" + d + b + f + z + s + d;
+        concat = "" + "S" + l + f + "S" + l + f + b + S;
+        concat = "" + l + l + S + s + s + z + S + b;
+        concat = "" + c + i + d + z + l + c + c + b;
+        concat = "" + l + b + b + s + s + S + z + b;
+        concat = "" + f + l + d + i + s + c + i + z;
+        concat = "" + "S" + d + "S" + S + f + i + S + z;
+        concat = "" + b + b + c + s + f + f + f + d;
+        concat = "" + f + "S" + d + f + z + "S" + "S" + "S";
+        concat = "" + z + c + "S" + S + f + b + l + d;
+        concat = "" + "S" + d + l + S + l + d + i + l;
+        concat = "" + i + "S" + d + i + c + i + S + f;
+        concat = "" + c + c + b + S + "S" + d + c + f;
+        concat = "" + c + d + f + l + c + c + s + f;
+        concat = "" + S + i + "S" + i + c + S + S + "S";
+        concat = "" + f + "S" + "S" + b + z + s + S + d;
+        concat = "" + c + l + l + "S" + b + b + c + c;
+        concat = "" + b + i + "S" + c + s + S + b + l;
+        concat = "" + z + i + z + S + S + s + b + c;
+        concat = "" + l + l + s + i + i + z + l + "S";
+        concat = "" + d + b + z + b + b + c + s + l;
+        concat = "" + z + S + s + f + s + d + S + "S";
+        concat = "" + d + "S" + s + b + f + "S" + S + f;
+        concat = "" + b + S + z + z + z + i + f + b;
+        concat = "" + b + S + S + f + "S" + c + "S" + c;
+        concat = "" + s + l + d + "S" + S + s + "S" + z;
+        concat = "" + i + d + S + b + s + z + S + l;
+        concat = "" + b + i + "S" + l + l + c + d + f;
+        concat = "" + f + "S" + b + b + c + d + f + "S";
+        concat = "" + f + f + l + d + z + f + b + z;
+        concat = "" + b + d + b + b + s + z + z + s;
+        concat = "" + "S" + "S" + S + i + z + i + b + b;
+        concat = "" + s + c + c + d + i + z + i + b;
+        concat = "" + i + i + d + S + l + b + z + "S";
+        concat = "" + "S" + b + b + c + S + S + d + f;
+        concat = "" + s + z + f + S + d + S + s + S;
+        concat = "" + l + f + b + d + d + d + b + i;
+        concat = "" + i + l + z + S + b + d + d + f;
+        concat = "" + l + b + b + f + i + b + d + S;
+        concat = "" + d + b + "S" + l + "S" + d + c + z;
+        concat = "" + l + "S" + s + "S" + d + l + f + b;
+        concat = "" + s + s + l + f + c + "S" + c + c;
+        concat = "" + i + S + S + b + S + s + l + l;
+        concat = "" + b + z + f + f + s + S + z + c;
+        concat = "" + "S" + z + "S" + l + c + f + z + "S";
+        concat = "" + "S" + S + f + l + l + z + d + S;
+        concat = "" + d + i + s + b + l + f + "S" + S;
+        concat = "" + l + "S" + c + c + l + "S" + S + z;
+        concat = "" + s + f + i + S + l + s + S + S;
+        concat = "" + d + "S" + b + l + d + "S" + S + d;
+        concat = "" + i + i + c + c + d + S + d + c;
+        concat = "" + s + b + l + i + c + l + s + c;
+        concat = "" + l + i + f + d + z + b + f + c;
+        concat = "" + d + d + c + S + S + c + z + l;
+        concat = "" + l + d + s + d + "S" + i + "S" + s;
+        concat = "" + i + d + d + i + S + f + "S" + i;
+        concat = "" + S + f + f + b + d + s + c + c;
+        concat = "" + d + "S" + S + d + "S" + s + "S" + s;
+        concat = "" + l + z + l + d + S + S + f + c;
+        concat = "" + c + i + l + f + l + f + S + f;
+        concat = "" + l + S + z + d + z + z + i + c;
+        concat = "" + c + "S" + c + c + i + z + b + i;
+        concat = "" + i + "S" + l + "S" + l + z + b + s;
+        concat = "" + f + d + f + s + d + s + "S" + i;
+        concat = "" + s + s + i + f + i + i + i + S;
+        concat = "" + l + S + "S" + f + S + z + c + b;
+        concat = "" + s + z + f + z + "S" + i + i + i;
+        concat = "" + b + s + S + c + i + s + i + l;
+        concat = "" + l + "S" + z + "S" + c + f + i + b;
+        concat = "" + f + c + l + d + d + b + f + b;
+        concat = "" + s + i + f + c + d + s + b + l;
+        concat = "" + "S" + d + c + f + b + b + S + f;
+        concat = "" + l + i + S + "S" + s + c + f + s;
+        concat = "" + l + b + f + b + d + b + z + c;
+        concat = "" + c + i + i + z + i + S + i + "S";
+        concat = "" + "S" + "S" + b + b + s + z + d + "S";
+        concat = "" + i + s + s + b + i + c + d + c;
+        concat = "" + l + d + l + i + d + "S" + S + i;
+        concat = "" + l + s + f + z + i + z + c + d;
+        concat = "" + c + s + S + s + d + l + l + c;
+        concat = "" + c + "S" + s + b + i + s + s + S;
+        concat = "" + b + s + i + f + "S" + "S" + d + "S";
+        concat = "" + f + s + b + d + S + d + f + i;
+        concat = "" + S + c + d + z + f + s + s + c;
+        concat = "" + c + s + d + c + l + i + z + c;
+        concat = "" + f + "S" + f + f + b + "S" + c + "S";
+        concat = "" + z + "S" + s + f + i + c + c + d;
+        concat = "" + d + f + c + "S" + l + f + b + S;
+        concat = "" + z + z + d + "S" + i + c + S + b;
+        concat = "" + b + d + d + z + b + S + z + b;
+        concat = "" + S + d + d + i + i + c + f + b;
+        concat = "" + l + i + d + "S" + c + S + "S" + S;
+        concat = "" + s + z + l + b + z + s + s + i;
+        concat = "" + z + s + S + f + z + b + d + s;
+        concat = "" + z + s + S + d + S + z + i + d;
+        concat = "" + c + f + i + i + z + l + b + "S";
+        concat = "" + S + i + d + l + b + "S" + s + "S";
+        concat = "" + b + i + l + f + S + "S" + d + c;
+        concat = "" + s + l + i + d + f + b + f + S;
+        concat = "" + b + S + c + i + z + s + s + S;
+        concat = "" + s + l + c + S + d + d + s + s;
+        concat = "" + d + d + S + s + d + l + f + S;
+        concat = "" + S + c + b + i + f + b + S + c;
+        concat = "" + c + z + b + z + c + l + "S" + l;
+        concat = "" + d + d + l + b + i + b + S + c;
+        concat = "" + d + i + s + d + f + "S" + l + S;
+        concat = "" + z + l + b + s + S + s + s + d;
+        concat = "" + f + c + "S" + "S" + d + z + f + b;
+        concat = "" + b + d + i + f + s + i + b + b;
+        concat = "" + d + c + c + i + "S" + s + S + c;
+        concat = "" + f + s + z + z + s + "S" + s + "S";
+        concat = "" + b + c + c + f + S + l + S + i;
+        concat = "" + s + d + i + l + s + b + b + i;
+        concat = "" + z + "S" + z + z + b + c + s + z;
+        concat = "" + i + f + b + s + i + d + S + d;
+        concat = "" + "S" + s + i + "S" + c + b + "S" + "S";
+        concat = "" + f + b + S + c + i + b + S + f;
+        concat = "" + "S" + S + l + s + l + d + "S" + s;
+        concat = "" + f + b + i + "S" + i + z + c + "S";
+        concat = "" + c + l + d + c + b + c + i + b;
+        concat = "" + i + "S" + f + c + c + c + i + c;
+        concat = "" + b + b + s + "S" + c + l + z + b;
+        concat = "" + z + b + i + f + d + "S" + s + S;
+        concat = "" + "S" + d + d + d + z + S + d + f;
+        concat = "" + z + d + s + f + l + "S" + i + f;
+        concat = "" + "S" + i + i + d + i + S + l + f;
+        concat = "" + "S" + b + d + S + l + d + b + c;
+        concat = "" + l + "S" + z + d + b + c + S + d;
+        concat = "" + f + f + z + "S" + z + f + f + z;
+        concat = "" + s + "S" + d + S + b + b + i + b;
+        concat = "" + z + d + S + c + b + l + l + b;
+        concat = "" + f + i + i + l + i + "S" + i + b;
+        concat = "" + l + c + b + z + f + "S" + s + "S";
+        concat = "" + s + z + "S" + d + f + f + "S" + d;
+        concat = "" + c + i + z + l + S + d + i + d;
+        concat = "" + f + l + "S" + z + "S" + "S" + i + "S";
+        concat = "" + z + i + b + z + d + i + "S" + l;
+        concat = "" + "S" + f + S + S + l + c + S + s;
+        concat = "" + s + i + l + d + b + l + d + b;
+        concat = "" + c + S + d + b + s + f + S + "S";
+        concat = "" + "S" + s + S + l + b + s + f + c;
+        concat = "" + c + S + z + b + z + l + c + s;
+        concat = "" + c + z + c + b + d + b + c + z;
+        concat = "" + c + b + z + S + d + S + "S" + c;
+        concat = "" + s + d + f + "S" + S + "S" + i + d;
+        concat = "" + c + l + "S" + f + "S" + b + b + "S";
+        concat = "" + "S" + l + b + b + c + S + z + c;
+        concat = "" + "S" + l + l + s + s + S + S + s;
+        concat = "" + z + d + b + "S" + d + b + l + c;
+        concat = "" + l + b + d + c + s + f + i + "S";
+        concat = "" + d + s + i + i + l + s + d + s;
+        concat = "" + "S" + b + "S" + s + d + i + S + b;
+        concat = "" + "S" + s + S + "S" + f + S + "S" + d;
+        concat = "" + "S" + f + b + l + d + f + S + l;
+        concat = "" + z + S + l + l + b + c + z + "S";
+        concat = "" + c + b + d + i + c + i + s + s;
+        concat = "" + z + z + s + f + "S" + z + l + d;
+        concat = "" + z + c + b + c + z + c + f + z;
+        concat = "" + s + i + S + d + i + i + l + i;
+        concat = "" + l + c + z + l + z + "S" + s + l;
+        concat = "" + c + b + i + c + z + S + d + b;
+        concat = "" + b + d + b + z + b + z + c + d;
+        concat = "" + b + b + z + z + z + d + i + s;
+        concat = "" + z + d + s + s + f + f + f + b;
+        concat = "" + "S" + b + z + S + S + i + s + S;
+        concat = "" + "S" + i + b + f + S + f + l + S;
+        concat = "" + d + d + f + l + d + s + f + i;
+        concat = "" + d + s + c + b + s + d + f + "S";
+        concat = "" + d + "S" + z + z + s + c + "S" + i;
+        concat = "" + s + "S" + f + "S" + z + s + b + f;
+        concat = "" + s + i + l + "S" + z + l + S + l;
+        concat = "" + i + f + S + s + c + c + f + c;
+        concat = "" + l + b + "S" + i + S + l + l + i;
+        concat = "" + z + i + d + s + "S" + z + "S" + "S";
+        concat = "" + f + c + z + b + l + f + b + l;
+        concat = "" + i + c + S + f + S + z + S + c;
+        concat = "" + i + d + d + z + d + f + f + "S";
+        concat = "" + c + s + l + c + s + "S" + f + l;
+        concat = "" + c + i + z + f + "S" + s + d + b;
+        concat = "" + S + i + S + z + S + z + f + d;
+        concat = "" + l + "S" + s + l + "S" + b + b + s;
+        concat = "" + f + f + f + z + i + b + "S" + "S";
+        concat = "" + c + b + z + b + f + s + b + i;
+        concat = "" + S + "S" + f + c + S + i + s + "S";
+        concat = "" + z + z + z + b + l + i + l + z;
+        concat = "" + f + f + "S" + c + l + f + f + b;
+        concat = "" + "S" + "S" + S + l + S + "S" + z + i;
+        concat = "" + b + c + z + i + d + b + S + l;
+        concat = "" + l + z + i + s + s + c + "S" + l;
+        concat = "" + i + b + "S" + s + c + l + s + z;
+        concat = "" + s + s + i + S + b + z + f + c;
+        concat = "" + b + "S" + "S" + i + d + i + b + b;
+        concat = "" + i + f + d + z + d + "S" + S + l;
+        concat = "" + c + "S" + l + d + c + s + d + i;
+        concat = "" + i + "S" + s + S + z + d + d + b;
+        concat = "" + l + S + b + z + s + "S" + i + s;
+        concat = "" + l + c + b + d + s + s + z + f;
+        concat = "" + d + c + i + "S" + c + l + i + d;
+        concat = "" + b + i + i + z + b + l + s + "S";
+        concat = "" + c + "S" + S + c + z + l + l + i;
+        concat = "" + f + S + c + c + f + S + f + "S";
+        concat = "" + i + z + f + f + l + i + b + d;
+        concat = "" + z + f + z + "S" + s + S + d + l;
+        concat = "" + s + d + s + z + i + c + z + f;
+        concat = "" + d + l + z + f + b + z + f + "S";
+        concat = "" + s + b + z + S + "S" + z + S + i;
+        concat = "" + S + S + i + i + b + d + s + d;
+        concat = "" + S + c + c + b + c + z + i + "S";
+        concat = "" + f + i + c + c + s + c + s + l;
+        concat = "" + d + s + d + l + d + s + d + b;
+        concat = "" + f + z + c + s + b + l + "S" + l;
+        concat = "" + l + d + f + b + d + S + "S" + c;
+        concat = "" + i + i + b + f + c + c + s + "S";
+        concat = "" + "S" + i + c + d + s + c + c + f;
+        concat = "" + s + f + c + s + z + d + c + i;
+        concat = "" + l + c + S + d + "S" + S + f + i;
+        concat = "" + f + z + "S" + b + i + f + z + z;
+        concat = "" + l + l + b + f + "S" + S + z + c;
+        concat = "" + f + s + z + b + S + f + b + l;
+        concat = "" + s + z + z + c + d + z + b + S;
+        concat = "" + f + b + i + b + f + s + z + "S";
+        concat = "" + S + "S" + i + "S" + c + s + "S" + S;
+        concat = "" + b + "S" + d + c + i + b + "S" + c;
+        concat = "" + s + i + f + b + i + S + s + c;
+        concat = "" + z + S + z + l + b + d + l + "S";
+        concat = "" + l + c + "S" + c + i + "S" + c + s;
+        concat = "" + b + b + b + S + d + f + l + f;
+        concat = "" + b + S + d + c + s + i + S + l;
+        concat = "" + f + S + S + l + c + i + d + z;
+        concat = "" + l + b + z + d + b + l + z + f;
+        concat = "" + b + d + f + b + "S" + c + c + "S";
+        concat = "" + l + s + z + "S" + z + "S" + z + d;
+        concat = "" + l + b + S + z + b + l + s + z;
+        concat = "" + S + l + S + b + "S" + s + "S" + c;
+        concat = "" + c + i + z + z + b + f + s + "S";
+        concat = "" + f + S + z + l + f + l + b + b;
+        concat = "" + z + S + d + f + l + i + f + f;
+        concat = "" + f + S + z + s + z + c + z + b;
+        concat = "" + d + s + l + i + "S" + S + z + "S";
+        concat = "" + S + f + d + z + l + b + c + f;
+        concat = "" + d + c + "S" + l + d + s + S + c;
+        concat = "" + z + l + b + c + "S" + i + S + "S";
+        concat = "" + z + b + i + z + l + d + S + s;
+        concat = "" + f + "S" + b + s + s + i + z + l;
+        concat = "" + S + c + s + s + z + d + s + z;
+        concat = "" + f + "S" + i + c + S + f + c + S;
+        concat = "" + i + c + S + l + d + z + f + "S";
+        concat = "" + s + d + "S" + "S" + d + f + d + z;
+        concat = "" + "S" + l + S + "S" + c + s + s + d;
+        concat = "" + b + z + s + S + d + f + b + l;
+        concat = "" + c + "S" + z + d + l + i + b + f;
+        concat = "" + s + d + z + z + "S" + l + i + "S";
+        concat = "" + c + i + b + z + "S" + l + "S" + i;
+        concat = "" + f + f + s + z + i + b + i + f;
+        concat = "" + b + z + f + s + z + c + b + z;
+        concat = "" + z + z + s + s + b + z + z + s;
+        concat = "" + d + b + f + "S" + b + c + i + b;
+        concat = "" + i + d + c + i + d + d + z + f;
+        concat = "" + d + i + l + l + i + "S" + S + S;
+        concat = "" + "S" + z + f + "S" + d + b + d + i;
+        concat = "" + "S" + s + s + d + b + "S" + S + d;
+        concat = "" + i + b + s + S + d + c + c + z;
+        concat = "" + i + b + l + l + "S" + l + l + s;
+        concat = "" + i + z + s + "S" + l + c + f + i;
+        concat = "" + l + i + S + b + c + S + z + S;
+        concat = "" + "S" + l + s + z + d + d + s + i;
+        concat = "" + b + "S" + s + s + c + c + i + c;
+        concat = "" + z + i + f + z + b + c + "S" + f;
+        concat = "" + f + d + s + d + s + f + f + S;
+        concat = "" + "S" + f + f + d + S + c + l + f;
+        concat = "" + f + i + l + b + c + c + b + b;
+        concat = "" + s + l + f + i + c + i + b + S;
+        concat = "" + "S" + d + b + c + f + i + i + d;
+        concat = "" + "S" + s + s + f + z + c + b + z;
+        concat = "" + "S" + l + c + f + b + z + c + l;
+        concat = "" + s + f + d + f + c + c + b + f;
+        concat = "" + c + l + S + l + l + z + i + s;
+        concat = "" + f + d + l + i + c + z + S + l;
+        concat = "" + "S" + s + "S" + c + f + b + s + b;
+        concat = "" + c + l + S + d + b + i + c + S;
+        concat = "" + c + "S" + z + d + s + c + b + i;
+        concat = "" + z + i + b + i + i + "S" + "S" + c;
+        concat = "" + s + S + "S" + b + b + s + i + i;
+        concat = "" + S + z + c + i + "S" + f + "S" + f;
+        concat = "" + z + S + S + z + S + d + i + s;
+        concat = "" + z + f + c + l + S + l + z + i;
+        concat = "" + z + i + b + d + i + l + d + i;
+        concat = "" + z + l + l + b + z + S + l + z;
+        concat = "" + b + s + f + l + b + b + i + d;
+        concat = "" + S + S + i + z + c + z + b + s;
+        concat = "" + c + "S" + i + l + l + i + i + i;
+        concat = "" + d + b + l + S + c + b + s + z;
+        concat = "" + d + "S" + l + b + b + i + s + c;
+        concat = "" + f + z + f + b + S + z + d + S;
+        concat = "" + b + b + z + l + b + l + i + i;
+        concat = "" + "S" + b + l + f + c + i + s + "S";
+        concat = "" + s + l + d + c + l + f + d + d;
+        concat = "" + c + z + f + "S" + "S" + l + c + "S";
+        concat = "" + S + d + l + S + S + z + s + c;
+        concat = "" + S + "S" + z + S + s + c + S + z;
+        concat = "" + f + "S" + c + s + i + "S" + "S" + "S";
+        concat = "" + c + z + S + z + c + l + d + "S";
+        concat = "" + f + z + f + b + l + "S" + s + i;
+        concat = "" + l + l + i + c + f + b + z + "S";
+        concat = "" + f + b + l + b + i + c + c + S;
+        concat = "" + S + z + l + i + f + "S" + c + "S";
+        concat = "" + d + f + c + i + i + c + z + s;
+        concat = "" + S + d + s + z + z + f + b + b;
+        concat = "" + l + i + d + l + c + c + l + z;
+        concat = "" + s + l + c + b + c + "S" + z + l;
+        concat = "" + z + z + S + b + s + s + "S" + z;
+        concat = "" + c + c + f + l + i + b + b + c;
+        concat = "" + "S" + i + z + S + f + s + l + b;
+        concat = "" + s + l + b + i + c + S + S + s;
+        concat = "" + s + b + "S" + b + c + b + b + l;
+        concat = "" + c + z + z + d + "S" + "S" + d + "S";
+        concat = "" + s + S + s + s + b + i + "S" + z;
+        concat = "" + "S" + i + z + s + S + f + i + S;
+        concat = "" + S + s + S + l + z + S + d + z;
+        concat = "" + S + d + b + l + b + c + c + "S";
+        concat = "" + S + z + f + d + c + f + "S" + S;
+        concat = "" + c + c + S + i + i + s + b + S;
+        concat = "" + c + b + "S" + z + S + s + b + f;
+        concat = "" + f + "S" + d + d + c + b + f + c;
+        concat = "" + b + d + f + "S" + s + z + f + i;
+        concat = "" + b + S + "S" + S + f + z + d + z;
+        concat = "" + f + i + S + c + i + d + f + d;
+        concat = "" + l + i + z + S + z + l + z + "S";
+        concat = "" + z + "S" + d + i + z + f + i + f;
+        concat = "" + s + s + S + l + l + b + d + l;
+        concat = "" + l + i + d + z + i + c + c + z;
+        concat = "" + S + i + S + c + l + S + l + S;
+        concat = "" + d + d + d + f + s + d + i + d;
+        concat = "" + z + s + S + d + S + s + d + S;
+        concat = "" + b + l + "S" + i + z + i + d + l;
+        concat = "" + d + d + d + "S" + c + d + b + l;
+        concat = "" + i + z + i + S + s + l + s + f;
+        concat = "" + S + b + l + f + b + "S" + s + l;
+        concat = "" + "S" + s + i + f + l + f + i + S;
+        concat = "" + "S" + d + "S" + b + s + d + z + s;
+        concat = "" + i + b + s + s + b + z + S + i;
+        concat = "" + s + i + c + i + f + c + l + c;
+        concat = "" + l + S + "S" + s + c + "S" + "S" + S;
+        concat = "" + d + f + b + s + s + f + S + f;
+        concat = "" + f + s + "S" + z + f + b + z + b;
+        concat = "" + l + f + f + l + S + l + b + "S";
+        concat = "" + i + d + z + s + b + S + c + S;
+        concat = "" + c + b + d + c + "S" + i + b + l;
+        concat = "" + S + "S" + c + f + z + "S" + b + b;
+        concat = "" + S + b + S + i + "S" + b + l + S;
+        concat = "" + S + b + s + b + d + f + i + "S";
+        concat = "" + c + S + b + S + c + s + d + d;
+        concat = "" + S + "S" + l + c + c + S + "S" + s;
+        concat = "" + S + s + i + i + s + s + i + s;
+        concat = "" + b + d + b + z + l + "S" + "S" + c;
+        concat = "" + z + S + b + d + b + i + b + "S";
+        concat = "" + b + b + f + b + l + f + c + f;
+        concat = "" + l + "S" + b + i + c + b + f + l;
+        concat = "" + "S" + z + b + "S" + f + c + l + b;
+        concat = "" + c + c + S + S + "S" + f + d + l;
+        concat = "" + z + f + d + z + z + i + i + i;
+        concat = "" + s + "S" + l + l + d + S + c + f;
+        concat = "" + b + s + i + l + c + c + S + S;
+        concat = "" + b + s + i + "S" + b + b + b + d;
+        concat = "" + z + "S" + S + z + i + z + d + d;
+        concat = "" + s + S + f + "S" + b + S + "S" + z;
+        concat = "" + f + S + d + c + S + d + l + c;
+        concat = "" + i + z + f + S + "S" + b + d + c;
+        concat = "" + f + c + l + "S" + i + i + f + d;
+        concat = "" + s + i + i + i + S + i + c + d;
+        concat = "" + d + l + d + l + i + s + S + f;
+        concat = "" + f + s + c + S + b + "S" + d + f;
+        concat = "" + s + l + c + b + s + b + b + s;
+        concat = "" + b + c + l + f + i + c + s + z;
+        concat = "" + "S" + i + i + "S" + l + d + c + i;
+        concat = "" + b + l + b + i + S + f + s + l;
+        concat = "" + c + s + b + s + d + c + l + i;
+        concat = "" + f + "S" + i + c + "S" + f + s + b;
+        concat = "" + z + d + c + f + c + c + d + b;
+        concat = "" + l + b + z + z + c + c + f + S;
+        concat = "" + z + S + d + l + d + "S" + b + l;
+        concat = "" + b + "S" + b + S + l + "S" + f + z;
+        concat = "" + S + z + i + l + d + l + l + l;
+        concat = "" + f + l + d + z + b + i + "S" + "S";
+        concat = "" + S + c + l + s + b + l + b + d;
+        concat = "" + z + i + z + d + l + d + b + i;
+        concat = "" + z + s + f + c + s + b + b + f;
+        concat = "" + "S" + b + l + S + s + d + s + l;
+        concat = "" + c + i + l + "S" + f + c + c + s;
+        concat = "" + c + l + z + S + c + c + S + b;
+        concat = "" + f + d + i + f + "S" + S + b + f;
+        concat = "" + f + c + d + c + f + i + s + d;
+        concat = "" + c + z + S + i + S + c + d + f;
+        concat = "" + b + d + S + c + "S" + d + l + "S";
+        concat = "" + z + c + l + b + s + z + f + f;
+        concat = "" + b + b + s + d + l + b + z + b;
+        concat = "" + l + f + c + f + S + s + b + c;
+        concat = "" + f + c + s + f + "S" + b + c + c;
+        concat = "" + "S" + "S" + b + d + d + "S" + s + l;
+        concat = "" + c + i + d + s + b + i + s + c;
+        concat = "" + c + c + z + z + l + s + S + i;
+        concat = "" + s + b + d + z + l + b + "S" + f;
+        concat = "" + f + c + c + c + s + s + s + S;
+        concat = "" + "S" + "S" + c + S + b + b + b + i;
+        concat = "" + d + i + "S" + b + d + c + f + z;
+        concat = "" + b + S + z + s + d + S + z + z;
+        concat = "" + i + l + i + s + s + b + i + z;
+        concat = "" + s + d + c + l + b + f + S + z;
+        concat = "" + f + c + z + b + b + f + b + c;
+        concat = "" + b + d + s + b + s + s + l + "S";
+        concat = "" + "S" + d + s + s + l + s + i + d;
+        concat = "" + S + c + b + c + b + d + "S" + S;
+        concat = "" + c + "S" + c + c + c + z + s + d;
+        concat = "" + s + "S" + s + l + S + b + l + c;
+        concat = "" + i + S + S + b + z + S + s + l;
+        concat = "" + l + i + "S" + s + i + S + i + S;
+        concat = "" + S + f + f + f + b + "S" + f + z;
+        concat = "" + d + S + S + d + f + i + b + b;
+        concat = "" + z + i + i + b + l + f + z + d;
+        concat = "" + c + c + i + f + f + l + i + c;
+        concat = "" + z + f + S + c + b + S + z + s;
+        concat = "" + "S" + S + z + s + b + f + S + "S";
+        concat = "" + l + z + S + z + "S" + b + S + "S";
+        concat = "" + d + s + s + i + d + s + z + z;
+        concat = "" + f + i + f + z + S + z + z + i;
+        concat = "" + b + d + s + b + l + s + "S" + d;
+        concat = "" + l + f + f + i + c + z + z + c;
+        concat = "" + S + s + z + d + c + l + l + "S";
+        concat = "" + z + d + c + f + i + "S" + d + c;
+        concat = "" + S + "S" + z + d + c + b + l + "S";
+        concat = "" + b + c + d + d + f + i + i + b;
+        concat = "" + s + c + i + c + d + z + S + d;
+        concat = "" + f + c + "S" + d + c + S + z + "S";
+        concat = "" + "S" + b + l + "S" + i + l + b + d;
+        concat = "" + c + d + c + "S" + c + d + b + l;
+        concat = "" + l + c + b + z + s + S + d + d;
+        concat = "" + d + d + c + c + d + b + s + l;
+        concat = "" + d + c + c + S + "S" + c + s + b;
+        concat = "" + s + i + i + i + d + z + c + f;
+        concat = "" + s + S + z + d + d + c + d + f;
+        concat = "" + l + b + f + s + f + c + f + b;
+        concat = "" + d + b + z + S + b + s + d + l;
+        concat = "" + s + z + f + b + S + s + z + "S";
+        concat = "" + z + i + z + d + i + S + i + s;
+        concat = "" + b + b + f + i + c + i + i + s;
+        concat = "" + f + S + b + b + S + d + "S" + s;
+        concat = "" + i + S + i + "S" + i + S + S + f;
+        concat = "" + b + s + s + z + z + s + "S" + i;
+        concat = "" + s + b + S + "S" + l + i + s + s;
+        concat = "" + f + z + s + z + s + f + d + i;
+        concat = "" + z + l + s + c + i + l + S + l;
+        concat = "" + S + S + b + i + S + S + l + z;
+        concat = "" + z + S + l + "S" + z + z + f + "S";
+        concat = "" + l + S + f + c + f + f + s + S;
+        concat = "" + S + i + d + i + z + b + i + b;
+        concat = "" + c + l + f + d + i + f + b + d;
+        concat = "" + S + s + c + d + d + c + i + "S";
+        concat = "" + "S" + S + c + s + c + b + z + d;
+        concat = "" + l + i + c + s + "S" + d + S + b;
+        concat = "" + "S" + c + f + l + S + i + s + i;
+        concat = "" + b + s + "S" + i + d + c + b + s;
+        concat = "" + d + "S" + z + b + f + z + s + f;
+        concat = "" + s + b + b + d + i + "S" + l + S;
+        concat = "" + "S" + f + l + d + f + i + l + b;
+        concat = "" + s + i + S + S + s + b + i + l;
+        concat = "" + "S" + i + s + i + f + f + l + f;
+        concat = "" + b + c + b + i + i + i + d + i;
+        concat = "" + l + c + l + c + c + S + i + S;
+        concat = "" + "S" + S + "S" + b + s + b + i + s;
+        concat = "" + i + s + "S" + s + "S" + "S" + z + d;
+        concat = "" + d + z + c + b + c + S + z + S;
+        concat = "" + l + c + b + b + l + c + z + l;
+        concat = "" + b + "S" + i + c + l + S + c + z;
+        concat = "" + c + c + f + l + i + "S" + i + z;
+        concat = "" + z + "S" + z + z + s + i + d + c;
+        concat = "" + z + d + c + z + i + S + "S" + S;
+        concat = "" + "S" + d + "S" + b + z + f + S + d;
+        concat = "" + c + z + z + l + l + S + b + l;
+        concat = "" + d + c + i + i + i + s + b + f;
+        concat = "" + "S" + d + f + z + c + b + c + s;
+        concat = "" + b + s + "S" + d + f + i + i + s;
+        concat = "" + i + "S" + i + "S" + l + z + z + z;
+        concat = "" + i + S + i + "S" + z + i + S + z;
+        concat = "" + z + "S" + S + c + s + s + c + s;
+        concat = "" + b + f + z + c + c + l + f + d;
+        concat = "" + z + l + s + f + s + l + c + d;
+        concat = "" + c + z + s + S + c + S + c + d;
+        concat = "" + s + s + z + d + "S" + i + S + "S";
+        concat = "" + "S" + f + d + "S" + d + f + c + b;
+        concat = "" + b + z + b + s + S + "S" + b + b;
+        concat = "" + l + d + d + d + l + "S" + i + d;
+        concat = "" + d + "S" + d + b + s + c + S + f;
+        concat = "" + f + d + l + S + s + i + b + S;
+        concat = "" + z + c + b + b + f + b + i + z;
+        concat = "" + s + f + l + c + l + z + d + z;
+        concat = "" + l + S + i + d + z + z + s + d;
+        concat = "" + i + c + i + d + z + S + "S" + i;
+        concat = "" + d + c + z + "S" + z + l + z + z;
+        concat = "" + s + s + d + S + s + c + f + z;
+        concat = "" + l + "S" + l + l + "S" + z + z + S;
+        concat = "" + b + b + d + z + i + b + s + d;
+        concat = "" + d + d + d + S + i + c + "S" + z;
+        concat = "" + l + "S" + l + S + f + "S" + b + c;
+        concat = "" + s + z + "S" + S + f + S + d + b;
+        concat = "" + l + s + d + "S" + f + b + s + b;
+        concat = "" + f + S + i + z + z + l + l + f;
+        concat = "" + "S" + S + b + b + i + f + d + b;
+        concat = "" + s + b + i + c + S + S + l + d;
+        concat = "" + l + z + "S" + f + "S" + "S" + b + z;
+        concat = "" + b + z + f + S + s + d + d + c;
+        concat = "" + f + d + l + S + b + l + c + S;
+        concat = "" + c + z + b + s + z + s + S + b;
+        concat = "" + i + i + b + b + S + z + b + i;
+        concat = "" + f + s + i + s + l + d + i + z;
+        concat = "" + z + c + S + s + b + f + b + l;
+        concat = "" + s + c + "S" + "S" + b + "S" + S + f;
+        concat = "" + b + b + i + z + l + z + "S" + i;
+        concat = "" + f + s + s + z + f + f + d + "S";
+        concat = "" + z + b + "S" + s + f + S + f + b;
+        concat = "" + b + S + f + l + S + i + c + s;
+        concat = "" + i + "S" + i + S + s + l + b + s;
+        concat = "" + i + c + b + f + S + i + s + s;
+        concat = "" + z + S + s + d + b + l + l + S;
+        concat = "" + z + i + s + l + b + s + d + c;
+        concat = "" + s + s + c + f + z + S + b + S;
+        concat = "" + "S" + S + b + s + i + f + S + c;
+        concat = "" + i + "S" + l + z + d + f + b + i;
+        concat = "" + f + "S" + i + z + f + c + S + z;
+        concat = "" + "S" + z + f + i + c + S + s + z;
+        concat = "" + z + z + b + b + S + c + s + b;
+        concat = "" + c + s + d + S + i + S + S + i;
+        concat = "" + l + s + z + l + S + s + z + i;
+        concat = "" + l + z + b + z + b + b + "S" + s;
+        concat = "" + d + S + d + S + s + b + l + d;
+        concat = "" + s + z + "S" + s + l + d + "S" + S;
+        concat = "" + f + "S" + S + c + c + l + s + S;
+        concat = "" + b + i + s + d + d + d + "S" + i;
+        concat = "" + S + "S" + S + S + "S" + z + S + S;
+        concat = "" + s + l + S + b + d + i + c + s;
+        concat = "" + "S" + z + d + d + f + z + b + c;
+        concat = "" + c + b + d + s + S + c + S + S;
+        concat = "" + f + b + z + c + s + c + i + b;
+        concat = "" + f + "S" + d + f + i + "S" + z + f;
+        concat = "" + z + f + b + z + z + i + z + l;
+        concat = "" + d + s + c + s + "S" + i + s + z;
+        concat = "" + i + z + f + s + f + s + i + S;
+        concat = "" + "S" + s + z + "S" + d + "S" + c + S;
+        concat = "" + d + d + i + l + b + l + b + S;
+        concat = "" + z + i + d + S + s + s + i + z;
+        concat = "" + d + b + S + S + c + d + d + i;
+        concat = "" + c + d + z + c + l + z + z + f;
+        concat = "" + s + i + z + s + d + "S" + d + "S";
+        concat = "" + d + i + S + l + z + l + i + d;
+        concat = "" + s + l + i + i + z + S + f + f;
+        concat = "" + c + c + l + S + l + S + i + l;
+        concat = "" + "S" + f + c + c + s + b + d + l;
+        concat = "" + c + c + S + c + s + f + f + S;
+        concat = "" + s + l + i + s + f + S + s + f;
+        concat = "" + f + c + f + i + S + i + s + s;
+        concat = "" + c + f + S + f + c + "S" + S + f;
+        concat = "" + i + f + z + "S" + "S" + z + f + s;
+        concat = "" + z + d + "S" + l + i + d + z + f;
+        concat = "" + S + S + d + c + s + "S" + c + c;
+        concat = "" + l + z + d + d + b + z + c + S;
+        concat = "" + d + l + "S" + l + S + d + c + l;
+        concat = "" + b + z + S + d + f + "S" + i + c;
+        concat = "" + z + "S" + S + d + d + c + "S" + "S";
+        concat = "" + c + z + l + l + b + f + f + l;
+        concat = "" + d + s + S + c + i + s + z + d;
+        concat = "" + s + z + z + f + l + b + i + z;
+        concat = "" + i + l + f + s + d + S + b + S;
+        concat = "" + z + b + l + c + "S" + c + d + c;
+        concat = "" + z + z + c + l + S + d + i + z;
+        concat = "" + b + l + l + S + b + "S" + c + l;
+        concat = "" + "S" + s + S + b + d + f + b + s;
+        concat = "" + "S" + z + z + b + c + f + d + f;
+        concat = "" + b + c + b + s + S + "S" + c + f;
+        concat = "" + "S" + s + S + l + d + "S" + "S" + l;
+        concat = "" + l + S + l + l + f + c + s + d;
+        concat = "" + s + S + c + d + c + s + l + d;
+        concat = "" + z + i + d + b + S + c + d + d;
+        concat = "" + S + d + z + b + z + z + b + l;
+        concat = "" + z + d + "S" + i + i + s + l + "S";
+        concat = "" + S + b + S + l + d + i + l + i;
+        concat = "" + d + z + "S" + l + b + "S" + i + f;
+        concat = "" + d + s + b + d + i + b + z + l;
+        concat = "" + l + s + i + i + f + f + "S" + f;
+        concat = "" + s + i + "S" + "S" + c + i + f + b;
+        concat = "" + i + b + l + S + i + c + s + c;
+        concat = "" + s + c + i + "S" + i + f + c + S;
+        concat = "" + "S" + c + l + b + i + f + c + b;
+        concat = "" + z + c + i + "S" + l + S + S + S;
+        concat = "" + S + "S" + s + s + i + f + z + S;
+        concat = "" + c + S + S + c + f + l + f + d;
+        concat = "" + c + i + i + l + d + f + d + i;
+        concat = "" + f + d + f + z + f + "S" + "S" + f;
+        concat = "" + S + z + z + s + z + i + "S" + b;
+        concat = "" + z + c + i + i + d + z + l + i;
+        concat = "" + f + b + s + z + i + i + "S" + d;
+        concat = "" + d + s + l + z + S + c + S + i;
+        concat = "" + s + f + b + S + s + c + f + z;
+        concat = "" + z + b + f + d + "S" + z + b + s;
+        concat = "" + b + l + z + S + S + z + i + b;
+        concat = "" + i + d + f + c + "S" + b + s + d;
+        concat = "" + l + d + f + c + f + l + z + f;
+        concat = "" + i + l + c + l + c + i + S + z;
+        concat = "" + d + i + l + f + z + b + l + c;
+        concat = "" + d + "S" + S + f + c + c + f + i;
+        concat = "" + b + "S" + d + z + l + f + c + f;
+        concat = "" + d + c + i + "S" + z + b + l + "S";
+        concat = "" + l + d + c + s + f + "S" + s + s;
+        concat = "" + i + S + l + i + s + b + d + i;
+        concat = "" + c + S + b + s + d + l + i + l;
+        concat = "" + d + d + z + c + l + i + z + b;
+        concat = "" + i + l + z + S + b + "S" + i + s;
+        concat = "" + z + b + f + "S" + "S" + z + z + b;
+        concat = "" + c + l + l + s + S + c + f + c;
+        concat = "" + d + c + z + l + "S" + f + d + d;
+        concat = "" + "S" + i + b + l + c + s + i + c;
+        concat = "" + b + s + b + i + b + f + S + l;
+        concat = "" + l + S + z + s + f + z + s + d;
+        concat = "" + c + b + S + b + f + z + s + "S";
+        concat = "" + i + s + d + z + "S" + b + z + l;
+        concat = "" + c + d + i + f + i + l + d + f;
+        concat = "" + "S" + "S" + z + z + f + d + d + c;
+        concat = "" + z + s + S + f + S + S + i + "S";
+        concat = "" + l + d + z + b + i + d + "S" + c;
+        concat = "" + "S" + f + s + f + b + d + f + i;
+        concat = "" + i + z + f + l + z + d + "S" + S;
+        concat = "" + b + l + S + i + i + s + d + i;
+        concat = "" + i + f + d + "S" + f + s + s + s;
+        concat = "" + i + s + "S" + i + S + d + c + s;
+        concat = "" + i + b + "S" + d + s + "S" + i + i;
+        concat = "" + d + i + d + b + i + i + S + s;
+        concat = "" + "S" + z + c + S + S + b + i + l;
+        concat = "" + S + i + "S" + c + f + S + s + c;
+        concat = "" + "S" + l + l + b + S + s + "S" + l;
+        concat = "" + s + S + "S" + b + d + "S" + "S" + d;
+        concat = "" + i + i + z + z + d + i + s + i;
+        concat = "" + f + S + s + c + z + "S" + i + l;
+        concat = "" + S + i + z + z + S + f + f + c;
+        concat = "" + l + S + l + l + c + z + S + s;
+        concat = "" + f + s + f + c + f + s + z + z;
+        concat = "" + s + c + s + s + S + d + f + s;
+        concat = "" + c + "S" + d + z + i + b + "S" + "S";
+        concat = "" + S + b + i + f + l + d + s + s;
+        concat = "" + c + S + b + f + s + d + i + i;
+        concat = "" + l + d + i + f + s + s + b + d;
+        concat = "" + f + "S" + i + S + f + c + "S" + s;
+        concat = "" + s + "S" + i + f + z + i + l + c;
+        concat = "" + b + i + s + "S" + l + l + "S" + b;
+        concat = "" + b + d + S + "S" + S + b + s + c;
+        concat = "" + "S" + d + s + b + s + f + S + c;
+        concat = "" + i + l + S + i + d + d + d + b;
+        concat = "" + S + f + c + b + b + f + s + b;
+        concat = "" + d + i + S + z + f + l + z + s;
+        concat = "" + z + S + "S" + f + b + c + s + d;
+        concat = "" + c + f + b + z + b + c + "S" + d;
+        concat = "" + i + d + z + i + "S" + b + S + c;
+        concat = "" + s + l + s + S + c + b + l + z;
+        concat = "" + f + l + z + l + "S" + b + b + i;
+        concat = "" + s + d + "S" + i + S + b + z + c;
+        concat = "" + "S" + d + b + l + l + s + S + l;
+        concat = "" + b + z + c + s + c + l + i + l;
+        concat = "" + z + d + s + S + c + f + S + c;
+        concat = "" + z + s + f + S + b + b + s + b;
+        concat = "" + S + d + l + b + "S" + "S" + c + S;
+        concat = "" + S + z + s + z + d + "S" + i + z;
+        concat = "" + c + l + f + c + f + b + d + b;
+        concat = "" + f + c + s + l + i + l + s + S;
+        concat = "" + b + S + "S" + f + i + c + "S" + c;
+        concat = "" + s + c + l + f + z + b + f + z;
+        concat = "" + s + z + b + c + l + d + l + b;
+        concat = "" + s + d + f + l + i + s + S + S;
+        concat = "" + l + "S" + d + z + "S" + i + c + l;
+        concat = "" + i + c + z + d + s + b + S + s;
+        concat = "" + z + l + b + S + b + s + l + f;
+        concat = "" + i + z + f + d + f + b + s + z;
+        concat = "" + f + s + S + i + S + i + S + z;
+        concat = "" + d + s + l + i + c + "S" + "S" + f;
+        concat = "" + f + d + z + s + d + c + s + d;
+        concat = "" + b + S + b + l + c + "S" + l + b;
+        concat = "" + b + "S" + s + d + b + S + c + S;
+        concat = "" + l + l + i + b + d + z + z + l;
+        concat = "" + z + "S" + l + S + c + l + l + c;
+        concat = "" + S + z + "S" + z + S + c + c + b;
+        concat = "" + f + l + c + d + d + s + d + S;
+        concat = "" + f + z + z + d + z + l + d + S;
+        concat = "" + s + l + c + l + S + f + S + l;
+        concat = "" + c + f + d + l + "S" + b + b + b;
+        concat = "" + S + b + i + S + i + s + z + c;
+        concat = "" + z + c + z + S + s + f + f + f;
+        concat = "" + d + d + f + l + z + "S" + "S" + i;
+        concat = "" + f + f + b + c + b + c + f + z;
+        concat = "" + z + f + z + d + i + b + i + b;
+        concat = "" + S + "S" + i + c + b + s + i + z;
+        concat = "" + f + "S" + c + c + b + z + i + i;
+        concat = "" + "S" + "S" + d + i + "S" + d + i + "S";
+        concat = "" + b + i + S + i + S + z + d + d;
+        concat = "" + z + z + "S" + i + b + s + S + b;
+        concat = "" + z + "S" + z + "S" + i + c + S + s;
+        concat = "" + c + c + b + S + b + c + i + f;
+        concat = "" + b + i + i + i + i + d + b + b;
+        concat = "" + d + s + d + "S" + z + l + z + S;
+        concat = "" + "S" + s + d + l + f + c + d + "S";
+        concat = "" + i + S + b + s + d + l + l + "S";
+        concat = "" + "S" + d + s + b + S + s + S + z;
+        concat = "" + l + "S" + "S" + d + "S" + z + c + z;
+        concat = "" + i + d + i + f + f + c + "S" + "S";
+        concat = "" + l + d + l + "S" + c + l + S + "S";
+        concat = "" + "S" + l + i + d + c + l + d + S;
+        concat = "" + b + f + i + c + z + d + i + f;
+        concat = "" + S + b + s + f + s + b + "S" + "S";
+        concat = "" + z + d + b + z + l + s + z + S;
+        concat = "" + b + c + z + "S" + d + d + l + l;
+        concat = "" + "S" + i + i + "S" + f + s + c + c;
+        concat = "" + s + i + i + s + S + z + "S" + l;
+        concat = "" + s + i + f + s + z + c + l + f;
+        concat = "" + i + z + z + d + s + z + f + b;
+        concat = "" + "S" + l + s + d + f + "S" + i + c;
+        concat = "" + i + "S" + z + z + z + b + f + l;
+        concat = "" + l + S + S + "S" + c + l + f + "S";
+        concat = "" + b + f + c + c + "S" + S + b + c;
+        concat = "" + c + i + b + c + b + z + s + "S";
+        concat = "" + f + S + d + f + i + S + S + S;
+        concat = "" + f + d + S + c + b + s + i + b;
+        concat = "" + b + c + z + i + f + d + d + s;
+        concat = "" + "S" + c + z + l + "S" + i + s + l;
+        concat = "" + c + f + "S" + s + c + "S" + "S" + d;
+        concat = "" + f + c + "S" + d + f + i + z + i;
+        concat = "" + l + c + z + b + d + l + i + s;
+        concat = "" + c + d + l + d + i + b + S + b;
+        concat = "" + d + S + z + l + c + l + b + z;
+        concat = "" + "S" + l + f + i + c + S + i + c;
+        concat = "" + f + c + i + "S" + z + c + c + z;
+        concat = "" + "S" + S + i + i + d + b + "S" + z;
+        concat = "" + l + c + c + S + l + c + s + S;
+        concat = "" + s + z + z + s + d + z + S + i;
+        concat = "" + l + S + d + c + i + f + "S" + "S";
+        concat = "" + z + s + S + s + d + z + l + d;
+        concat = "" + d + c + l + i + "S" + f + b + c;
+        concat = "" + f + i + f + c + b + f + f + i;
+        concat = "" + "S" + S + S + "S" + z + d + l + l;
+        concat = "" + s + S + s + z + "S" + i + d + f;
+        concat = "" + d + c + l + S + f + i + S + S;
+        concat = "" + "S" + f + d + c + i + i + d + f;
+        concat = "" + l + f + z + f + S + c + d + S;
+        concat = "" + i + f + "S" + b + s + b + f + "S";
+        concat = "" + l + "S" + z + i + b + c + b + l;
+        concat = "" + l + S + s + "S" + f + f + z + l;
+        concat = "" + "S" + c + "S" + f + i + s + "S" + f;
+        concat = "" + f + s + s + i + b + S + d + b;
+        concat = "" + s + f + "S" + b + f + f + i + z;
+        concat = "" + s + s + S + b + "S" + s + z + z;
+        concat = "" + S + f + b + l + z + s + f + S;
+        concat = "" + c + s + s + c + S + s + f + c;
+        concat = "" + i + f + l + d + "S" + f + i + d;
+        concat = "" + l + "S" + S + c + f + b + l + d;
+        concat = "" + S + s + S + S + f + c + d + S;
+        concat = "" + s + l + c + l + S + c + "S" + S;
+        concat = "" + i + i + l + z + "S" + i + b + b;
+        concat = "" + c + i + c + S + "S" + i + s + b;
+        concat = "" + l + i + c + i + z + c + d + f;
+        concat = "" + f + z + S + i + i + z + z + d;
+        concat = "" + l + f + z + f + c + S + l + c;
+        concat = "" + "S" + s + d + l + c + s + z + d;
+        concat = "" + S + s + s + z + c + b + z + i;
+        concat = "" + f + b + z + f + z + "S" + s + z;
+        concat = "" + "S" + S + i + d + f + d + f + d;
+        concat = "" + i + l + s + l + b + z + f + i;
+        concat = "" + f + z + l + f + z + z + b + d;
+        concat = "" + S + i + z + l + b + i + z + d;
+        concat = "" + i + i + f + f + l + d + b + b;
+        concat = "" + d + S + i + f + S + S + c + l;
+        concat = "" + "S" + l + "S" + S + i + b + z + l;
+        concat = "" + d + l + c + b + s + "S" + s + b;
+        concat = "" + c + s + l + f + c + l + "S" + b;
+        concat = "" + i + "S" + z + l + z + s + s + "S";
+        concat = "" + f + b + f + b + c + c + "S" + z;
+        concat = "" + z + z + i + s + i + b + "S" + z;
+        concat = "" + c + l + l + s + s + "S" + z + "S";
+        concat = "" + i + i + d + s + z + l + b + c;
+        concat = "" + f + l + l + S + "S" + i + z + "S";
+        concat = "" + s + s + i + f + "S" + s + z + c;
+        concat = "" + l + f + i + s + d + l + b + b;
+        concat = "" + "S" + s + b + l + z + i + f + s;
+        concat = "" + z + l + b + b + d + z + "S" + "S";
+        concat = "" + d + s + s + l + f + z + "S" + s;
+        concat = "" + l + i + "S" + z + d + f + "S" + s;
+        concat = "" + f + d + i + "S" + s + S + i + i;
+        concat = "" + i + b + s + S + i + s + i + i;
+        concat = "" + S + "S" + d + b + z + i + S + c;
+        concat = "" + f + S + i + s + s + z + f + c;
+        concat = "" + c + z + l + S + d + b + f + "S";
+        concat = "" + d + l + S + f + z + S + c + c;
+        concat = "" + "S" + b + S + i + l + d + c + c;
+        concat = "" + "S" + S + S + d + i + f + S + l;
+        concat = "" + c + "S" + f + "S" + z + d + d + l;
+        concat = "" + S + l + b + S + c + b + z + b;
+        concat = "" + i + l + z + l + b + d + d + l;
+        concat = "" + c + c + f + b + S + s + z + i;
+        concat = "" + l + l + "S" + i + "S" + s + "S" + c;
+        concat = "" + "S" + c + i + s + i + d + b + d;
+        concat = "" + z + l + i + i + b + l + f + S;
+        concat = "" + d + S + "S" + b + b + l + c + c;
+        concat = "" + S + "S" + z + z + s + f + c + b;
+        concat = "" + l + s + d + c + s + S + c + z;
+        concat = "" + f + i + b + f + i + b + c + i;
+        concat = "" + d + f + d + S + d + "S" + s + f;
+        concat = "" + c + i + b + S + "S" + z + s + s;
+        concat = "" + b + s + "S" + S + c + d + b + d;
+        concat = "" + s + s + f + i + l + S + S + S;
+        concat = "" + d + b + d + l + S + z + b + S;
+        concat = "" + d + d + i + b + z + "S" + S + c;
+        concat = "" + z + f + s + "S" + d + S + f + b;
+        concat = "" + d + "S" + f + f + z + f + S + z;
+        concat = "" + i + "S" + S + i + "S" + d + "S" + "S";
+        concat = "" + "S" + S + c + z + l + c + z + d;
+        concat = "" + l + z + c + i + s + i + l + S;
+        concat = "" + b + s + z + "S" + b + l + s + l;
+        concat = "" + d + f + i + b + c + f + s + f;
+        concat = "" + S + f + l + s + d + S + i + c;
+        concat = "" + "S" + s + "S" + S + z + "S" + f + d;
+        concat = "" + c + z + i + S + c + "S" + d + l;
+        concat = "" + c + "S" + c + c + c + "S" + i + b;
+        concat = "" + c + l + f + d + d + c + i + i;
+        concat = "" + i + S + s + S + f + c + d + b;
+        concat = "" + i + i + S + b + l + l + "S" + c;
+        concat = "" + d + z + "S" + d + i + c + b + b;
+        concat = "" + c + b + S + b + b + "S" + "S" + S;
+        concat = "" + c + i + l + i + d + z + "S" + l;
+        concat = "" + S + d + "S" + d + b + d + s + i;
+        concat = "" + z + f + S + c + c + "S" + d + "S";
+        concat = "" + c + z + c + b + l + s + "S" + b;
+        concat = "" + S + s + "S" + "S" + c + l + s + f;
+        concat = "" + S + "S" + l + c + c + f + b + S;
+        concat = "" + c + f + S + f + z + z + f + z;
+        concat = "" + d + l + z + i + f + f + b + l;
+        concat = "" + "S" + S + f + "S" + s + s + s + z;
+        concat = "" + d + b + l + f + b + z + z + b;
+        concat = "" + S + z + i + d + l + l + l + b;
+        concat = "" + l + b + i + S + c + f + i + i;
+        concat = "" + c + l + z + d + "S" + d + s + S;
+        concat = "" + l + i + i + l + b + z + d + f;
+        concat = "" + S + s + c + i + z + d + d + i;
+        concat = "" + z + s + b + z + l + z + d + d;
+        concat = "" + s + d + S + S + s + c + S + "S";
+        concat = "" + b + b + s + s + S + l + f + z;
+        concat = "" + l + "S" + i + c + i + s + "S" + "S";
+        concat = "" + s + l + "S" + S + "S" + S + S + c;
+        concat = "" + i + z + b + l + z + c + c + s;
+        concat = "" + d + d + i + b + l + "S" + S + i;
+        concat = "" + "S" + l + f + c + l + "S" + z + i;
+        concat = "" + "S" + "S" + "S" + l + S + b + s + z;
+        concat = "" + c + d + S + d + S + z + f + "S";
+        concat = "" + c + s + S + b + s + S + c + l;
+        concat = "" + "S" + b + S + S + d + c + f + b;
+        concat = "" + f + l + c + S + z + b + i + c;
+        concat = "" + "S" + f + i + l + S + d + i + f;
+        concat = "" + d + z + s + d + S + s + z + c;
+        concat = "" + b + b + z + z + S + d + S + S;
+        concat = "" + s + d + b + c + z + s + f + c;
+        concat = "" + c + z + S + l + "S" + z + l + S;
+        concat = "" + c + i + "S" + "S" + z + s + i + "S";
+        concat = "" + b + c + s + s + b + "S" + "S" + "S";
+        concat = "" + "S" + S + l + z + f + i + l + i;
+        concat = "" + S + c + c + S + c + i + b + i;
+        concat = "" + d + b + f + S + l + l + "S" + b;
+        concat = "" + d + "S" + s + d + c + s + f + l;
+        concat = "" + l + s + S + s + z + d + i + z;
+        concat = "" + b + "S" + i + f + b + d + i + i;
+        concat = "" + c + i + b + s + "S" + f + l + d;
+        concat = "" + "S" + b + d + i + f + f + S + l;
+        concat = "" + f + s + b + c + b + i + c + i;
+        concat = "" + s + d + z + d + b + d + c + S;
+        concat = "" + c + "S" + f + c + S + b + b + d;
+        concat = "" + f + d + l + f + f + S + c + i;
+        concat = "" + l + b + i + i + c + b + l + "S";
+        concat = "" + f + d + b + "S" + c + s + z + c;
+        concat = "" + i + b + d + s + c + f + s + c;
+        concat = "" + d + f + S + "S" + S + s + d + i;
+        concat = "" + s + b + l + z + i + s + i + l;
+        concat = "" + b + b + z + c + l + f + z + f;
+        concat = "" + i + d + "S" + z + "S" + i + s + i;
+        concat = "" + i + b + c + d + c + "S" + s + l;
+        concat = "" + f + c + d + f + f + f + z + l;
+        concat = "" + f + s + b + z + l + c + s + c;
+        concat = "" + b + i + "S" + "S" + "S" + c + d + d;
+        concat = "" + s + i + z + z + s + S + S + c;
+        concat = "" + f + S + f + S + S + z + "S" + f;
+        concat = "" + i + "S" + d + i + S + f + z + d;
+        concat = "" + f + c + s + d + S + f + b + b;
+        concat = "" + s + d + b + s + s + S + b + f;
+        concat = "" + c + d + s + "S" + f + i + l + "S";
+        concat = "" + i + s + b + z + S + s + f + "S";
+        concat = "" + i + S + "S" + i + b + z + S + b;
+        concat = "" + c + S + s + s + z + S + z + i;
+        concat = "" + s + d + S + c + "S" + f + S + "S";
+        concat = "" + "S" + c + "S" + l + s + b + z + S;
+        concat = "" + s + d + d + f + f + s + z + z;
+        concat = "" + d + d + "S" + c + s + b + "S" + l;
+        concat = "" + i + f + S + c + d + d + d + f;
+        concat = "" + i + l + d + i + b + f + l + f;
+        concat = "" + s + i + s + l + l + S + d + f;
+        concat = "" + l + "S" + f + d + c + b + l + c;
+        concat = "" + i + b + c + i + l + "S" + c + b;
+        concat = "" + s + s + f + l + c + "S" + s + s;
+        concat = "" + d + c + d + S + S + S + s + l;
+        concat = "" + i + "S" + b + s + c + f + c + z;
+        concat = "" + S + d + d + s + S + d + l + f;
+        concat = "" + c + l + c + f + l + d + "S" + f;
+        concat = "" + i + d + "S" + i + S + S + f + S;
+        concat = "" + "S" + s + z + s + b + d + d + c;
+        concat = "" + l + z + s + f + "S" + f + f + d;
+        concat = "" + "S" + l + i + "S" + d + s + S + s;
+        concat = "" + d + "S" + l + S + i + "S" + b + "S";
+        concat = "" + S + S + l + d + z + s + S + b;
+        concat = "" + s + s + f + s + i + b + s + l;
+        concat = "" + "S" + b + i + "S" + z + z + S + b;
+        concat = "" + i + c + l + s + b + d + s + S;
+        concat = "" + d + l + b + z + f + d + c + i;
+        concat = "" + s + b + i + i + s + b + z + c;
+        concat = "" + i + "S" + s + c + l + i + c + d;
+        concat = "" + f + c + "S" + b + d + i + l + b;
+        concat = "" + "S" + z + d + s + f + s + s + d;
+        concat = "" + i + l + z + d + S + "S" + d + f;
+        concat = "" + s + f + "S" + l + s + f + b + "S";
+        concat = "" + S + b + z + i + i + l + i + b;
+        concat = "" + d + b + f + d + d + c + b + z;
+        concat = "" + d + S + d + c + l + f + S + S;
+        concat = "" + S + s + z + b + s + "S" + s + z;
+        concat = "" + c + S + S + d + l + S + S + f;
+        concat = "" + f + d + f + "S" + f + "S" + b + s;
+        concat = "" + s + S + "S" + s + f + b + S + c;
+        concat = "" + i + s + S + d + S + s + f + s;
+        concat = "" + i + S + b + d + d + d + c + s;
+        concat = "" + S + S + f + b + S + c + f + "S";
+        concat = "" + l + b + z + f + i + c + l + f;
+        concat = "" + "S" + c + S + c + l + f + z + z;
+        concat = "" + S + "S" + l + i + b + z + l + z;
+        concat = "" + z + "S" + i + c + f + z + "S" + z;
+        concat = "" + c + f + f + l + i + i + i + d;
+        concat = "" + S + s + d + "S" + i + l + b + c;
+        concat = "" + l + d + s + c + c + d + f + S;
+        concat = "" + f + "S" + S + c + c + l + z + S;
+        concat = "" + z + d + c + c + i + c + d + "S";
+        concat = "" + b + S + z + b + i + "S" + "S" + "S";
+        concat = "" + d + f + "S" + l + s + z + d + S;
+        concat = "" + d + S + b + f + s + l + i + i;
+        concat = "" + b + z + S + l + i + l + S + S;
+        concat = "" + i + l + d + s + z + l + s + "S";
+        concat = "" + S + S + s + b + b + z + s + "S";
+        concat = "" + "S" + S + S + l + l + z + "S" + i;
+        concat = "" + d + b + l + b + l + d + c + z;
+        concat = "" + "S" + i + s + d + c + S + c + s;
+        concat = "" + z + c + S + d + c + c + l + i;
+        concat = "" + d + d + l + f + S + z + d + "S";
+        concat = "" + s + f + S + z + "S" + b + c + z;
+        concat = "" + "S" + c + c + d + "S" + S + d + S;
+        concat = "" + c + S + i + f + c + i + s + S;
+        concat = "" + "S" + S + S + c + c + i + s + l;
+        concat = "" + S + d + d + b + f + c + "S" + s;
+        concat = "" + f + z + f + i + "S" + i + "S" + s;
+        concat = "" + "S" + f + S + c + l + S + d + s;
+        concat = "" + S + i + c + c + "S" + c + i + l;
+        concat = "" + i + "S" + c + d + f + z + S + S;
+        concat = "" + b + f + c + l + s + d + c + S;
+        concat = "" + l + S + i + i + z + l + "S" + f;
+        concat = "" + z + "S" + d + i + f + i + b + b;
+        concat = "" + "S" + l + f + "S" + b + f + "S" + s;
+        concat = "" + i + s + b + b + i + f + s + b;
+        concat = "" + l + d + i + f + l + i + S + "S";
+        concat = "" + f + b + S + S + c + b + s + l;
+        concat = "" + i + s + f + S + s + S + s + b;
+        concat = "" + f + "S" + z + "S" + s + f + c + s;
+        concat = "" + "S" + S + b + z + f + i + s + s;
+        concat = "" + b + s + l + z + "S" + i + s + S;
+        concat = "" + i + c + z + s + S + d + l + z;
+        concat = "" + s + "S" + b + c + "S" + c + d + l;
+        concat = "" + c + b + b + i + c + S + b + z;
+        concat = "" + S + c + "S" + S + z + s + "S" + s;
+        concat = "" + b + f + d + "S" + s + S + d + S;
+        concat = "" + f + d + b + i + S + f + d + d;
+        concat = "" + s + c + "S" + s + s + l + s + z;
+        concat = "" + f + d + z + c + i + s + z + d;
+        concat = "" + i + s + c + f + b + z + S + f;
+        concat = "" + S + d + z + i + i + b + i + z;
+        concat = "" + d + b + S + d + d + i + b + s;
+        concat = "" + d + "S" + f + c + l + c + c + d;
+        concat = "" + z + z + S + S + f + d + i + c;
+        concat = "" + "S" + l + z + f + "S" + l + d + l;
+        concat = "" + f + l + d + b + b + "S" + l + i;
+        concat = "" + s + i + S + b + c + z + l + l;
+        concat = "" + z + f + S + i + l + z + l + S;
+        concat = "" + d + z + b + z + s + b + z + z;
+        concat = "" + d + b + d + f + d + i + d + s;
+        concat = "" + S + d + d + "S" + i + "S" + c + d;
+        concat = "" + f + f + c + l + f + d + s + d;
+        concat = "" + b + S + f + l + c + c + s + d;
+        concat = "" + S + s + s + d + f + "S" + i + i;
+        concat = "" + i + z + i + d + b + d + c + l;
+        concat = "" + i + S + f + S + f + d + d + "S";
+        concat = "" + i + "S" + i + l + s + l + i + b;
+        concat = "" + d + "S" + "S" + c + z + S + c + c;
+        concat = "" + s + l + f + l + d + "S" + l + s;
+        concat = "" + b + z + S + c + c + f + l + S;
+        concat = "" + z + i + f + s + d + i + S + c;
+        concat = "" + "S" + S + l + l + b + z + s + s;
+        concat = "" + f + z + z + l + d + c + l + d;
+        concat = "" + b + c + s + b + d + l + z + b;
+        concat = "" + z + f + c + s + z + b + c + c;
+        concat = "" + i + b + b + c + c + d + b + f;
+        concat = "" + d + f + d + f + "S" + S + "S" + d;
+        concat = "" + z + z + f + i + d + i + f + "S";
+        concat = "" + i + s + "S" + d + l + d + z + b;
+        concat = "" + "S" + "S" + c + i + S + f + b + S;
+        concat = "" + z + s + b + S + c + c + s + b;
+        concat = "" + z + "S" + f + c + c + i + f + z;
+        concat = "" + b + d + d + f + i + s + i + d;
+        concat = "" + f + i + s + c + z + s + "S" + f;
+        concat = "" + S + s + l + b + s + "S" + "S" + b;
+        concat = "" + c + b + b + i + "S" + S + b + S;
+        concat = "" + d + s + S + i + f + f + c + S;
+        concat = "" + f + z + "S" + f + c + b + d + S;
+        concat = "" + l + "S" + l + s + c + s + c + i;
+        concat = "" + S + b + S + c + c + l + l + S;
+        concat = "" + i + "S" + l + b + f + s + i + s;
+        concat = "" + S + z + b + S + c + c + l + c;
+        concat = "" + S + s + i + b + z + d + l + c;
+        concat = "" + f + c + i + i + z + f + S + b;
+        concat = "" + z + l + "S" + z + i + "S" + i + b;
+        concat = "" + i + S + z + b + l + i + i + d;
+        concat = "" + d + z + d + b + b + c + d + z;
+        concat = "" + l + i + "S" + i + "S" + l + b + i;
+        concat = "" + f + c + l + z + S + f + s + "S";
+        concat = "" + b + i + z + "S" + d + b + d + l;
+        concat = "" + c + z + c + z + "S" + S + l + s;
+        concat = "" + f + f + s + b + s + l + c + s;
+        concat = "" + "S" + c + S + l + f + S + z + c;
+        concat = "" + i + l + f + f + f + c + b + l;
+        concat = "" + d + d + "S" + c + S + l + c + z;
+        concat = "" + i + d + f + i + S + S + "S" + s;
+        concat = "" + f + i + z + i + s + b + S + c;
+        concat = "" + z + l + s + "S" + s + i + b + f;
+        concat = "" + f + s + c + "S" + f + l + z + f;
+        concat = "" + z + l + S + c + c + "S" + d + f;
+        concat = "" + l + z + l + s + d + b + i + "S";
+        concat = "" + l + f + d + z + z + b + b + d;
+        concat = "" + l + S + f + z + f + l + c + z;
+        concat = "" + s + "S" + z + b + z + c + b + z;
+        concat = "" + d + c + S + s + l + i + b + s;
+        concat = "" + "S" + b + s + z + f + S + l + "S";
+        concat = "" + l + f + b + i + z + f + i + s;
+        concat = "" + f + i + S + d + f + z + S + S;
+        concat = "" + d + i + c + f + s + "S" + f + s;
+        concat = "" + z + l + s + s + z + f + l + i;
+        concat = "" + l + z + b + l + i + f + i + c;
+        concat = "" + d + s + b + d + c + l + l + b;
+        concat = "" + i + b + d + d + d + c + s + i;
+        concat = "" + z + "S" + f + b + i + z + i + b;
+        concat = "" + s + S + c + S + c + S + "S" + b;
+        concat = "" + i + b + b + d + i + l + d + s;
+        concat = "" + l + S + c + z + s + z + S + "S";
+        concat = "" + S + c + l + b + b + d + f + b;
+        concat = "" + "S" + s + l + z + l + f + z + s;
+        concat = "" + S + s + s + z + d + d + S + d;
+        concat = "" + f + "S" + l + s + i + s + b + S;
+        concat = "" + f + f + "S" + i + l + c + f + c;
+        concat = "" + s + "S" + "S" + "S" + z + b + f + f;
+        concat = "" + f + s + l + f + b + c + s + i;
+        concat = "" + i + f + S + "S" + z + z + i + s;
+        concat = "" + d + "S" + c + "S" + z + z + c + z;
+        concat = "" + d + b + d + b + d + c + z + l;
+        concat = "" + b + z + z + S + S + b + b + i;
+        concat = "" + b + c + d + s + b + f + S + c;
+        concat = "" + i + S + l + f + c + "S" + c + z;
+        concat = "" + d + z + f + S + i + S + l + s;
+        concat = "" + z + l + i + z + l + i + l + f;
+        concat = "" + b + d + s + "S" + f + c + d + s;
+        concat = "" + "S" + b + c + l + d + b + S + c;
+        concat = "" + S + d + "S" + "S" + f + S + f + b;
+        concat = "" + f + z + s + f + "S" + c + d + S;
+        concat = "" + S + d + S + S + S + i + i + f;
+        concat = "" + b + i + c + z + s + l + d + S;
+        concat = "" + "S" + s + z + "S" + i + i + S + z;
+        concat = "" + "S" + l + z + f + "S" + d + S + i;
+        concat = "" + b + i + f + z + "S" + s + "S" + z;
+        concat = "" + f + i + f + i + b + c + d + "S";
+        concat = "" + s + s + c + d + b + s + S + l;
+        concat = "" + l + S + d + d + i + z + f + d;
+        concat = "" + z + f + "S" + S + c + i + s + i;
+        concat = "" + l + s + f + i + s + b + s + s;
+        concat = "" + "S" + l + c + S + l + c + f + z;
+        concat = "" + S + c + s + s + f + l + b + b;
+        concat = "" + f + "S" + S + s + S + i + s + "S";
+        concat = "" + d + d + z + f + i + s + b + f;
+        concat = "" + "S" + l + f + z + i + s + b + d;
+        concat = "" + z + "S" + s + f + l + "S" + "S" + b;
+        concat = "" + S + z + z + s + f + "S" + l + b;
+        concat = "" + "S" + z + i + s + d + f + f + l;
+        concat = "" + S + c + s + s + S + d + s + i;
+        concat = "" + d + b + "S" + s + c + z + c + b;
+        concat = "" + z + l + f + S + "S" + "S" + l + b;
+        concat = "" + d + d + f + "S" + "S" + b + c + i;
+        concat = "" + f + d + s + S + "S" + l + i + l;
+        concat = "" + b + c + b + b + b + c + s + "S";
+        concat = "" + f + c + d + "S" + z + s + b + b;
+        concat = "" + d + d + i + z + "S" + b + i + c;
+        concat = "" + d + s + c + s + "S" + s + f + b;
+        concat = "" + z + i + l + c + b + "S" + f + s;
+        concat = "" + b + S + c + b + l + s + i + i;
+        concat = "" + d + f + c + z + S + S + S + s;
+        concat = "" + z + z + z + c + S + c + i + i;
+        concat = "" + b + i + b + f + S + i + f + d;
+        concat = "" + c + f + b + i + "S" + s + "S" + c;
+        concat = "" + b + i + d + b + "S" + d + z + "S";
+        concat = "" + z + s + s + "S" + b + d + z + "S";
+        concat = "" + z + l + S + z + S + "S" + S + d;
+        concat = "" + l + f + l + S + l + "S" + f + d;
+        concat = "" + z + i + c + l + d + f + s + s;
+        concat = "" + i + S + c + b + c + "S" + c + "S";
+        concat = "" + "S" + b + s + l + d + z + "S" + d;
+        concat = "" + i + l + i + S + d + "S" + c + f;
+        concat = "" + b + b + b + "S" + s + d + b + s;
+        concat = "" + "S" + b + d + i + S + "S" + c + S;
+        concat = "" + z + z + "S" + i + l + S + b + S;
+        concat = "" + "S" + s + c + f + f + s + d + s;
+        concat = "" + i + i + f + "S" + s + f + c + f;
+        concat = "" + l + c + s + i + d + "S" + z + l;
+        concat = "" + f + d + l + l + "S" + i + i + f;
+        concat = "" + z + l + d + c + f + i + z + i;
+        concat = "" + i + s + l + b + f + d + b + d;
+        concat = "" + z + b + d + z + b + S + l + i;
+        concat = "" + b + f + d + "S" + "S" + c + d + i;
+        concat = "" + s + c + "S" + "S" + b + d + d + S;
+        concat = "" + d + b + s + b + c + d + z + z;
+        concat = "" + b + c + z + S + d + S + S + i;
+        concat = "" + d + c + z + f + l + l + d + c;
+        concat = "" + i + l + b + b + l + S + b + b;
+        concat = "" + i + b + i + b + S + "S" + z + "S";
+        /* Keep this comment here so you can add a /* comment above to reduce the number of shapes in this file */
+        result = concat;
+    }
+}

From 88e0b00a46301ac14fb0b1c0d2717e80ba4b1dc0 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 23 Apr 2025 21:25:30 +0000
Subject: [PATCH 093/901] 8353298: AOT cache creation asserts with
 _array_klasses in an unregistered InstanceKlass

Reviewed-by: ccheung, kvn
---
 src/hotspot/share/oops/klass.cpp              |  10 +-
 .../AOTCacheSupportForCustomLoaders.java      | 108 ++++++++++++++++++
 2 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java

diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 71da5e1da09..ac0e125ab4c 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -830,8 +830,14 @@ void Klass::remove_java_mirror() {
     oop orig_mirror = src_k->java_mirror();
     if (orig_mirror == nullptr) {
       assert(CDSConfig::is_dumping_final_static_archive(), "sanity");
-      assert(is_instance_klass(), "sanity");
-      assert(InstanceKlass::cast(this)->is_shared_unregistered_class(), "sanity");
+      if (is_instance_klass()) {
+        assert(InstanceKlass::cast(this)->is_shared_unregistered_class(), "sanity");
+      } else {
+        precond(is_objArray_klass());
+        Klass *k = ObjArrayKlass::cast(this)->bottom_klass();
+        precond(k->is_instance_klass());
+        assert(InstanceKlass::cast(k)->is_shared_unregistered_class(), "sanity");
+      }
     } else {
       oop scratch_mirror = HeapShared::scratch_java_mirror(orig_mirror);
       if (scratch_mirror != nullptr) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
new file mode 100644
index 00000000000..dabc35a4604
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
@@ -0,0 +1,108 @@
+/*
+ * 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 AOT cache support for array classes in custom class loaders.
+ * @bug 8353298
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build AOTCacheSupportForCustomLoaders
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar AppWithCustomLoaders AppWithCustomLoaders$MyLoader
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar cust.jar AppWithCustomLoaders$MyLoadeeA AppWithCustomLoaders$MyLoadeeB
+ * @run driver AOTCacheSupportForCustomLoaders AOT
+ */
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.io.File;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AOTCacheSupportForCustomLoaders {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("AOTCacheSupportForCustomLoaders")
+            .classpath("app.jar")
+            .addVmArgs("-Xlog:cds+class=debug", "-Xlog:cds")
+            .appCommandLine("AppWithCustomLoaders")
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    out.shouldMatch("cds,class.*unreg AppWithCustomLoaders[$]MyLoadeeA")
+                       .shouldMatch("cds,class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;");
+                })
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Using AOT-linked classes: true");
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class AppWithCustomLoaders {
+    public static void main(String args[]) throws Exception {
+        File custJar = new File("cust.jar");
+        URL[] urls = new URL[] {custJar.toURI().toURL()};
+        MyLoader loader = new MyLoader(urls, AppWithCustomLoaders.class.getClassLoader());
+
+        // Test 1: array class of MyLoadeeA (JDK-8353298)
+        Class klass = loader.loadClass("AppWithCustomLoaders$MyLoadeeA");
+        klass.newInstance();
+
+        // TODO: more test cases JDK-8354557
+    }
+
+    public static class MyLoader extends URLClassLoader {
+        public MyLoader(URL[] urls, ClassLoader parent) {
+            super(urls, parent);
+        }
+    }
+
+    public static class MyLoadeeA {
+        static Object[] array1;
+
+        public MyLoadeeA() {
+            if (array1 == null) {
+                test();
+                Object o = array1[0];
+                System.out.println("array1[0] is of class: " + o.getClass());
+                if (!(o instanceof MyLoadeeA)) {
+                    throw new RuntimeException("array1[0] should be an instanceof MyLoadeeA");
+                }
+            }
+        }
+
+        static void test() {
+            array1 = new MyLoadeeA[10];
+            for (int i = 0; i < 10; i++) {
+                if ((i % 2) == 0) {
+                    array1[i] = new MyLoadeeB();
+                } else {
+                    array1[i] = new MyLoadeeA();
+                }
+            }
+        }
+    }
+
+    public static class MyLoadeeB extends MyLoadeeA {}
+}

From ffe6a4f9e1449ce9a78372f11bfc0ef6cd7d6842 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 23 Apr 2025 21:39:55 +0000
Subject: [PATCH 094/901] 8355335: Avoid pattern matching switches in core
 ClassFile API

Reviewed-by: asotona
---
 .../classfile/impl/BlockCodeBuilderImpl.java         | 11 +++++------
 .../internal/classfile/impl/ChainedClassBuilder.java |  8 +++-----
 .../internal/classfile/impl/ChainedFieldBuilder.java |  8 +++-----
 .../classfile/impl/ChainedMethodBuilder.java         |  8 +++-----
 .../jdk/internal/classfile/impl/CodeImpl.java        | 12 +++++++-----
 .../classfile/impl/NonterminalCodeBuilder.java       | 12 +++++++-----
 6 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
index 62d812ce8d4..56682214566 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.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
@@ -72,11 +72,10 @@ public boolean isEmpty() {
     }
 
     private int topLocal(CodeBuilder parent) {
-        return switch (parent) {
-            case BlockCodeBuilderImpl b -> b.topLocal;
-            case ChainedCodeBuilder b -> b.terminal.curTopLocal();
-            case TerminalCodeBuilder b -> b.curTopLocal();
-        };
+        if (parent instanceof BlockCodeBuilderImpl bcb) {
+            return bcb.topLocal;
+        }
+        return findTerminal(parent).curTopLocal();
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
index 48d5ceb72d6..b4c8ad58705 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.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
@@ -39,10 +39,8 @@ public final class ChainedClassBuilder
     public ChainedClassBuilder(ClassBuilder downstream,
                                Consumer<ClassElement> consumer) {
         this.consumer = consumer;
-        this.terminal = switch (downstream) {
-            case ChainedClassBuilder cb -> cb.terminal;
-            case DirectClassBuilder db -> db;
-        };
+        this.terminal = downstream instanceof ChainedClassBuilder ccb ?
+                ccb.terminal : (DirectClassBuilder) downstream;
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java
index 13ca52f18de..9eac25d567c 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.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
@@ -38,10 +38,8 @@ public final class ChainedFieldBuilder implements FieldBuilder {
     public ChainedFieldBuilder(FieldBuilder downstream,
                                Consumer<FieldElement> consumer) {
         this.consumer = consumer;
-        this.terminal = switch (downstream) {
-            case ChainedFieldBuilder cb -> cb.terminal;
-            case TerminalFieldBuilder tb -> tb;
-        };
+        this.terminal = downstream instanceof ChainedFieldBuilder cfb ?
+                cfb.terminal : (TerminalFieldBuilder) downstream;
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
index 7bd0fc2ca1b..e96351b8856 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.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
@@ -41,10 +41,8 @@ public final class ChainedMethodBuilder implements MethodBuilder {
     public ChainedMethodBuilder(MethodBuilder downstream,
                                 Consumer<MethodElement> consumer) {
         this.consumer = consumer;
-        this.terminal = switch (downstream) {
-            case ChainedMethodBuilder cb -> cb.terminal;
-            case TerminalMethodBuilder tb -> tb;
-        };
+        this.terminal = downstream instanceof ChainedMethodBuilder cmb ?
+                cmb.terminal : (TerminalMethodBuilder) downstream;
     }
 
     @Override
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 286d29029ad..c8c6d254650 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
@@ -264,14 +264,16 @@ private void inflateJumpTargets() {
                 //fallback to jump targets inflation without StackMapTableAttribute
                 for (int pos=codeStart; pos<codeEnd; ) {
                     var i = bcToInstruction(classReader.readU1(pos), pos);
-                    switch (i) {
-                        case BranchInstruction br -> br.target();
-                        case DiscontinuedInstruction.JsrInstruction jsr -> jsr.target();
-                        case LookupSwitchInstruction ls -> {
+                    switch (i.opcode().kind()) {
+                        case BRANCH -> ((BranchInstruction) i).target();
+                        case DISCONTINUED_JSR -> ((DiscontinuedInstruction.JsrInstruction) i).target();
+                        case LOOKUP_SWITCH -> {
+                            var ls = (LookupSwitchInstruction) i;
                             ls.defaultTarget();
                             ls.cases();
                         }
-                        case TableSwitchInstruction ts -> {
+                        case TABLE_SWITCH -> {
+                            var ts = (TableSwitchInstruction) i;
                             ts.defaultTarget();
                             ts.cases();
                         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java
index f40da3a2bea..d7eaffb3250 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.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
@@ -35,10 +35,12 @@ public abstract sealed class NonterminalCodeBuilder implements CodeBuilder
 
     public NonterminalCodeBuilder(CodeBuilder parent) {
         this.parent = parent;
-        this.terminal = switch (parent) {
-            case NonterminalCodeBuilder cb -> cb.terminal;
-            case TerminalCodeBuilder cb -> cb;
-        };
+        this.terminal = findTerminal(parent);
+    }
+
+    static TerminalCodeBuilder findTerminal(CodeBuilder cob) {
+        return cob instanceof NonterminalCodeBuilder ncb ?
+                ncb.terminal : (TerminalCodeBuilder) cob;
     }
 
     @Override

From bd1c53e96038994788ca5c11602aa2ce4fa4c840 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 23 Apr 2025 21:40:50 +0000
Subject: [PATCH 095/901] 8354899: Reduce overhead associated with type
 switches

Reviewed-by: asotona
---
 .../java/lang/runtime/SwitchBootstraps.java   | 45 ++++++++++++++-----
 .../classfile/impl/DirectCodeBuilder.java     | 13 +++++-
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index 2c31b1d0606..f724d7355b0 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -27,6 +27,8 @@
 
 import java.lang.Enum.EnumDesc;
 import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.attribute.StackMapFrameInfo;
+import java.lang.classfile.attribute.StackMapTableAttribute;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDesc;
 import java.lang.constant.MethodTypeDesc;
@@ -48,6 +50,7 @@
 import java.lang.classfile.Label;
 import java.lang.classfile.instruction.SwitchCase;
 
+import jdk.internal.classfile.impl.DirectCodeBuilder;
 import jdk.internal.constant.ClassOrInterfaceDescImpl;
 import jdk.internal.constant.ConstantUtils;
 import jdk.internal.constant.MethodTypeDescImpl;
@@ -103,6 +106,13 @@ private SwitchBootstraps() {}
     private static final MethodType MT_TYPE_SWITCH = MethodType.methodType(int.class,
             Object.class,
             int.class);
+    private static final List<StackMapFrameInfo.VerificationTypeInfo> TYPE_SWITCH_LOCALS = List.of(
+            StackMapFrameInfo.ObjectVerificationTypeInfo.of(CD_Object), StackMapFrameInfo.SimpleVerificationTypeInfo.INTEGER
+    );
+    private static final List<StackMapFrameInfo.VerificationTypeInfo> TYPE_SWITCH_EXTRA_LOCALS = List.of(
+            StackMapFrameInfo.ObjectVerificationTypeInfo.of(CD_Object), StackMapFrameInfo.SimpleVerificationTypeInfo.INTEGER,
+            StackMapFrameInfo.ObjectVerificationTypeInfo.of(CD_BiPredicate), StackMapFrameInfo.ObjectVerificationTypeInfo.of(CD_List)
+    );
 
     private static class StaticHolders {
         private static final MethodHandle MAPPED_ENUM_SWITCH;
@@ -482,8 +492,11 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
         int ENUM_CACHE          = 2;
         int EXTRA_CLASS_LABELS  = 3;
 
+        var locals = enumDescs == null && extraClassLabels == null ? TYPE_SWITCH_LOCALS : TYPE_SWITCH_EXTRA_LOCALS;
+
         return cb -> {
             // Objects.checkIndex(RESTART_IDX, labelConstants + 1)
+            var stackMapFrames = new ArrayList<StackMapFrameInfo>(labelConstants.length * 2);
             cb.iload(RESTART_IDX)
               .loadConstant(labelConstants.length + 1)
               .invokestatic(CD_Objects, "checkIndex", CHECK_INDEX_DESCRIPTOR)
@@ -494,9 +507,12 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
               .iconst_m1()
               .ireturn()
               .labelBinding(nonNullLabel);
+            stackMapFrames.add(StackMapFrameInfo.of(nonNullLabel, locals, List.of()));
             if (labelConstants.length == 0) {
                 cb.loadConstant(0)
-                  .ireturn();
+                  .ireturn()
+                  .with(StackMapTableAttribute.of(stackMapFrames));
+                DirectCodeBuilder.withMaxs(cb, 2, locals.size()); // checkIndex uses 2
                 return;
             }
             cb.iload(RESTART_IDX);
@@ -509,6 +525,7 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
             for (int idx = labelConstants.length - 1; idx >= 0; idx--) {
                 Object currentLabel = labelConstants[idx];
                 Label target = cb.newLabel();
+                stackMapFrames.add(StackMapFrameInfo.of(target, locals, List.of()));
                 Label next;
                 if (lastLabel == null) {
                     next = dflt;
@@ -541,7 +558,7 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                         } else if (!unconditionalExactnessCheck(Wrapper.asPrimitiveType(selectorType), classLabel)) {
                             // Integer i = ... or int i = ...
                             // o instanceof float
-                            Label notNumber = cb.newLabel();
+                            Label notNumber = cb.newLabel(); // this label may end up unbound
                             cb.aload(SELECTOR_OBJ)
                               .instanceOf(CD_Number);
                             if (selectorType == long.class || selectorType == float.class || selectorType == double.class ||
@@ -570,8 +587,9 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                                         "intValue",
                                         MethodTypeDesc.of(CD_int))
                                   .goto_(compare)
-                                  .labelBinding(notNumber)
-                                  .aload(SELECTOR_OBJ)
+                                  .labelBinding(notNumber);
+                                stackMapFrames.add(StackMapFrameInfo.of(notNumber, locals, List.of()));
+                                cb.aload(SELECTOR_OBJ)
                                   .instanceOf(CD_Character)
                                   .ifeq(next)
                                   .aload(SELECTOR_OBJ)
@@ -580,6 +598,7 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                                         "charValue",
                                         MethodTypeDesc.of(CD_char))
                                   .labelBinding(compare);
+                                stackMapFrames.add(StackMapFrameInfo.of(compare, locals, List.of(StackMapFrameInfo.SimpleVerificationTypeInfo.INTEGER)));
                             }
 
                             TypePairs typePair = TypePairs.of(Wrapper.asPrimitiveType(selectorType), classLabel);
@@ -648,8 +667,9 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                             "intValue",
                             MethodTypeDesc.of(CD_int))
                       .goto_(compare)
-                      .labelBinding(notNumber)
-                      .aload(SELECTOR_OBJ)
+                      .labelBinding(notNumber);
+                    stackMapFrames.add(StackMapFrameInfo.of(notNumber, locals, List.of()));
+                    cb.aload(SELECTOR_OBJ)
                       .instanceOf(CD_Character)
                       .ifeq(next)
                       .aload(SELECTOR_OBJ)
@@ -657,9 +677,9 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                       .invokevirtual(CD_Character,
                             "charValue",
                             MethodTypeDesc.of(CD_char))
-                      .labelBinding(compare)
-
-                      .loadConstant(integerLabel)
+                      .labelBinding(compare);
+                    stackMapFrames.add(StackMapFrameInfo.of(compare, locals, List.of(StackMapFrameInfo.SimpleVerificationTypeInfo.INTEGER)));
+                    cb.loadConstant(integerLabel)
                       .if_icmpne(next);
                 } else if ((caseLabel instanceof Long ||
                         caseLabel instanceof Float ||
@@ -688,9 +708,12 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                 cb.loadConstant(idx)
                   .ireturn();
             }
+            stackMapFrames.add(StackMapFrameInfo.of(dflt, locals, List.of()));
             cb.labelBinding(dflt)
               .loadConstant(labelConstants.length)
-              .ireturn();
+              .ireturn()
+              .with(StackMapTableAttribute.of(stackMapFrames));
+            DirectCodeBuilder.withMaxs(cb, 3, locals.size()); // enum labels use 3 stack, others use 2
         };
     }
 
@@ -702,7 +725,7 @@ private static MethodHandle generateTypeSwitch(MethodHandles.Lookup caller, Clas
         List<EnumDesc<?>> enumDescs = addExtraInfo ? new ArrayList<>() : null;
         List<Class<?>> extraClassLabels = addExtraInfo ? new ArrayList<>() : null;
 
-        byte[] classBytes = ClassFile.of().build(ConstantUtils.binaryNameToDesc(typeSwitchClassName(caller.lookupClass())),
+        byte[] classBytes = ClassFile.of(ClassFile.StackMapsOption.DROP_STACK_MAPS).build(ConstantUtils.binaryNameToDesc(typeSwitchClassName(caller.lookupClass())),
                 clb -> {
                     clb.withFlags(AccessFlag.FINAL, AccessFlag.SUPER, AccessFlag.SYNTHETIC)
                        .withMethodBody("typeSwitch",
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
index 2741d1918ca..bc563482f79 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
@@ -48,10 +48,8 @@ public final class DirectCodeBuilder
         extends AbstractDirectBuilder<CodeModel>
         implements TerminalCodeBuilder {
     private static final CharacterRange[] EMPTY_CHARACTER_RANGE = {};
-    private static final DeferredLabel[] EMPTY_LABEL_ARRAY = {};
     private static final LocalVariable[] EMPTY_LOCAL_VARIABLE_ARRAY = {};
     private static final LocalVariableType[] EMPTY_LOCAL_VARIABLE_TYPE_ARRAY = {};
-    private static final AbstractPseudoInstruction.ExceptionCatchImpl[] EMPTY_HANDLER_ARRAY = {};
     private static final DeferredLabel[] EMPTY_DEFERRED_LABEL_ARRAY = {};
 
     final List<AbstractPseudoInstruction.ExceptionCatchImpl> handlers = new ArrayList<>();
@@ -74,6 +72,9 @@ public final class DirectCodeBuilder
     private DeferredLabel[] deferredLabels = EMPTY_DEFERRED_LABEL_ARRAY;
     private int deferredLabelsCount = 0;
 
+    private int maxStackHint = -1;
+    private int maxLocalsHint = -1;
+
     /* Locals management
        lazily computed maxLocal = -1
        first time: derive count from methodType descriptor (for new methods) & ACC_STATIC,
@@ -173,6 +174,12 @@ public MethodInfo methodInfo() {
         return methodInfo;
     }
 
+    public static void withMaxs(CodeBuilder cob, int stacks, int locals) {
+        var dcb = (DirectCodeBuilder) cob;
+        dcb.maxStackHint = stacks;
+        dcb.maxLocalsHint = locals;
+    }
+
     private UnboundAttribute<CodeAttribute> content = null;
 
     private void writeExceptionHandlers(BufWriterImpl buf) {
@@ -319,6 +326,8 @@ private void writeCounters(boolean codeMatch, BufWriterImpl buf) {
                 if (codeMatch) {
                     var originalAttribute = (CodeImpl) original;
                     buf.writeU2U2(originalAttribute.maxStack(), originalAttribute.maxLocals());
+                } else if (maxLocalsHint >= 0 && maxStackHint >= 0) {
+                    buf.writeU2U2(maxStackHint, maxLocalsHint);
                 } else {
                     StackCounter cntr = StackCounter.of(DirectCodeBuilder.this, buf);
                     buf.writeU2U2(cntr.maxStack(), cntr.maxLocals());

From 669d4d6bfa50ab6ae73d05c6a0b069f4507d298e Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 23 Apr 2025 22:29:59 +0000
Subject: [PATCH 096/901] 8355328: Improve negative tests coverage for jpackage
 signing

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/AdditionalLauncher.java |   2 +-
 .../jdk/jpackage/test/JPackageCommand.java    |  11 +-
 .../test/LauncherAsServiceVerifier.java       |   2 +-
 .../jdk/jpackage/test/LinuxHelper.java        |   2 +-
 .../jdk/jpackage/test/MacSignVerify.java      |   9 +-
 .../helpers/jdk/jpackage/test/TKit.java       | 106 +++++++++++++-----
 .../jpackage/linux/ShortcutHintTest.java      |   2 +-
 .../jpackage/share/AppLauncherEnvTest.java    |   2 +-
 test/jdk/tools/jpackage/share/BasicTest.java  |   8 +-
 test/jdk/tools/jpackage/share/ErrorTest.java  |  41 ++++++-
 test/jdk/tools/jpackage/share/IconTest.java   |   4 +-
 .../jpackage/share/JLinkOptionsTest.java      |   4 +-
 .../jpackage/share/JavaOptionsEqualsTest.java |   4 +-
 .../tools/jpackage/share/JavaOptionsTest.java |   2 +-
 .../tools/jpackage/share/MainClassTest.java   |   2 +-
 .../tools/jpackage/windows/WinL10nTest.java   |  24 ++--
 .../jpackage/windows/WinOSConditionTest.java  |   6 +-
 .../jpackage/windows/WinResourceTest.java     |   4 +-
 .../tools/jpackage/windows/WinScriptTest.java |   6 +-
 19 files changed, 170 insertions(+), 71 deletions(-)

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 f10939555e5..5c89ffdf1f2 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -320,7 +320,7 @@ private void verifyDescription(JPackageCommand cmd) throws IOException {
                 TKit.assertTextStream("Comment=" + expectedDescription)
                         .label(String.format("[%s] file", desktopFile))
                         .predicate(String::equals)
-                        .apply(Files.readAllLines(desktopFile).stream());
+                        .apply(Files.readAllLines(desktopFile));
             }
         }
     }
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 cb9e3a687c7..722515887b8 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -720,7 +721,7 @@ public JPackageCommand validateOutput(TKit.TextStreamVerifier validator) {
         return validateOutput(validator::apply);
     }
 
-    public JPackageCommand validateOutput(Consumer<Stream<String>> validator) {
+    public JPackageCommand validateOutput(Consumer<Iterator<String>> validator) {
         Objects.requireNonNull(validator);
         saveConsoleOutput(true);
         outputValidators.add(validator);
@@ -762,7 +763,9 @@ public JPackageCommand validateOutput(CannedFormattedString... str) {
         // Will look up the given errors in the order they are specified.
         Stream.of(str).map(this::getValue)
                 .map(TKit::assertTextStream)
-                .reduce(TKit.TextStreamVerifier::andThen).ifPresent(this::validateOutput);
+                .reduce(TKit.TextStreamVerifier.group(),
+                        TKit.TextStreamVerifier.Group::add,
+                        TKit.TextStreamVerifier.Group::add).tryCreate().ifPresent(this::validateOutput);
         return this;
     }
 
@@ -846,7 +849,7 @@ public Executor.Result execute(int expectedExitCode) {
                 .execute(expectedExitCode);
 
         for (final var outputValidator: outputValidators) {
-            outputValidator.accept(result.getOutput().stream());
+            outputValidator.accept(result.getOutput().iterator());
         }
 
         if (result.exitCode() == 0) {
@@ -1299,7 +1302,7 @@ public void run() {
     private Path executeInDirectory;
     private Path winMsiLogFile;
     private Set<AppLayoutAssert> appLayoutAsserts = Set.of(AppLayoutAssert.values());
-    private List<Consumer<Stream<String>>> outputValidators = new ArrayList<>();
+    private List<Consumer<Iterator<String>>> outputValidators = new ArrayList<>();
     private static boolean defaultWithToolProvider;
 
     private static final Map<String, PackageType> PACKAGE_TYPES = Functional.identity(
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
index d73029ab153..fd8b4011341 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
@@ -316,7 +316,7 @@ private static void verifyLinuxUnitFile(JPackageCommand cmd,
         TKit.assertTextStream("ExecStart=" + execStartValue)
                 .label("unit file")
                 .predicate(String::equals)
-                .apply(Files.readAllLines(serviceUnitFile).stream());
+                .apply(Files.readAllLines(serviceUnitFile));
     }
 
     private static void verifyMacDaemonPlistFile(JPackageCommand cmd,
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 d94b8aee8ac..8eaec2f0e72 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -427,7 +427,7 @@ private static void verifyDesktopFile(JPackageCommand cmd, Path desktopFile)
 
         Map<String, String> data = lines.stream()
         .skip(1)
-        .peek(str -> TKit.assertTextStream("=").predicate(String::contains).apply(Stream.of(str)))
+        .peek(str -> TKit.assertTextStream("=").predicate(String::contains).apply(List.of(str)))
         .map(str -> {
             String components[] = str.split("=(?=.+)");
             if (components.length == 1) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
index 9fcd54d1566..88b41c2e469 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
@@ -133,9 +133,12 @@ public static Optional<String> findCodesignSignOrigin(Path path) {
     }
 
     public static void assertSigned(Path path) {
-        final var verifier = TKit.assertTextStream(": valid on disk").predicate(String::endsWith).andThen(TKit.assertTextStream(": satisfies its Designated Requirement").predicate(String::endsWith));
-        verifier.apply(Executor.of("/usr/bin/codesign", "--verify", "--deep",
-                "--strict", "--verbose=2", path.toString()).executeAndGetOutput().stream());
+        final var verifier = TKit.TextStreamVerifier.group()
+                .add(TKit.assertTextStream(": valid on disk").predicate(String::endsWith))
+                .add(TKit.assertTextStream(": satisfies its Designated Requirement").predicate(String::endsWith))
+                .create();
+        verifier.accept(Executor.of("/usr/bin/codesign", "--verify", "--deep",
+                "--strict", "--verbose=2", path.toString()).executeAndGetOutput().iterator());
     }
 
     public static List<SignIdentity> getPkgCertificateChain(Path path) {
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 c8972a9791e..7d0aaca8a95 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -969,17 +969,26 @@ public void close() throws IOException {
 
     public static final class TextStreamVerifier {
         TextStreamVerifier(String value) {
-            this.value = value;
+            this.value = Objects.requireNonNull(value);
             predicate(String::contains);
         }
 
+        TextStreamVerifier(TextStreamVerifier other) {
+            predicate = other.predicate;
+            label = other.label;
+            negate = other.negate;
+            createException = other.createException;
+            anotherVerifier = other.anotherVerifier;
+            value = other.value;
+        }
+
         public TextStreamVerifier label(String v) {
             label = v;
             return this;
         }
 
         public TextStreamVerifier predicate(BiPredicate<String, String> v) {
-            predicate = v;
+            predicate = Objects.requireNonNull(v);
             return this;
         }
 
@@ -988,17 +997,8 @@ public TextStreamVerifier negate() {
             return this;
         }
 
-        public TextStreamVerifier andThen(Consumer<? super Stream<String>> anotherVerifier) {
-            this.anotherVerifier = anotherVerifier;
-            return this;
-        }
-
-        public TextStreamVerifier andThen(TextStreamVerifier anotherVerifier) {
-            this.anotherVerifier = anotherVerifier::apply;
-            return this;
-        }
-
         public TextStreamVerifier orElseThrow(RuntimeException v) {
+            Objects.requireNonNull(v);
             return orElseThrow(() -> v);
         }
 
@@ -1007,22 +1007,22 @@ public TextStreamVerifier orElseThrow(Supplier<RuntimeException> v) {
             return this;
         }
 
-        public void apply(Stream<String> lines) {
-            final String matchedStr;
-
-            lines = lines.dropWhile(line -> !predicate.test(line, value));
-            if (anotherVerifier == null) {
-                matchedStr = lines.findFirst().orElse(null);
-            } else {
-                var tail = lines.toList();
-                if (tail.isEmpty()) {
-                    matchedStr = null;
-                } else {
-                    matchedStr = tail.get(0);
+        private String findMatch(Iterator<String> lineIt) {
+            while (lineIt.hasNext()) {
+                final var line = lineIt.next();
+                if (predicate.test(line, value)) {
+                    return line;
                 }
-                lines = tail.stream().skip(1);
             }
+            return null;
+        }
+
+        public void apply(List<String> lines) {
+            apply(lines.iterator());
+        }
 
+        public void apply(Iterator<String> lineIt) {
+            final String matchedStr = findMatch(lineIt);
             final String labelStr = Optional.ofNullable(label).orElse("output");
             if (negate) {
                 String msg = String.format(
@@ -1049,15 +1049,67 @@ public void apply(Stream<String> lines) {
             }
 
             if (anotherVerifier != null) {
-                anotherVerifier.accept(lines);
+                anotherVerifier.accept(lineIt);
             }
         }
 
+        public static TextStreamVerifier.Group group() {
+            return new TextStreamVerifier.Group();
+        }
+
+        public static final class Group {
+            public Group add(TextStreamVerifier verifier) {
+                if (verifier.anotherVerifier != null) {
+                    throw new IllegalArgumentException();
+                }
+                verifiers.add(verifier);
+                return this;
+            }
+
+            public Group add(Group other) {
+                verifiers.addAll(other.verifiers);
+                return this;
+            }
+
+            public boolean isEmpty() {
+                return verifiers.isEmpty();
+            }
+
+            public Optional<Consumer<Iterator<String>>> tryCreate() {
+                if (isEmpty()) {
+                    return Optional.empty();
+                } else {
+                    return Optional.of(create());
+                }
+            }
+
+            public Consumer<Iterator<String>> create() {
+                if (verifiers.isEmpty()) {
+                    throw new IllegalStateException();
+                }
+
+                if (verifiers.size() == 1) {
+                    return verifiers.getFirst()::apply;
+                }
+
+                final var head = new TextStreamVerifier(verifiers.getFirst());
+                var prev = head;
+                for (var verifier : verifiers.subList(1, verifiers.size())) {
+                    verifier = new TextStreamVerifier(verifier);
+                    prev.anotherVerifier = verifier::apply;
+                    prev = verifier;
+                }
+                return head::apply;
+            }
+
+            private final List<TextStreamVerifier> verifiers = new ArrayList<>();
+        }
+
         private BiPredicate<String, String> predicate;
         private String label;
         private boolean negate;
         private Supplier<RuntimeException> createException;
-        private Consumer<? super Stream<String>> anotherVerifier;
+        private Consumer<? super Iterator<String>> anotherVerifier;
         private final String value;
     }
 
diff --git a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
index fc34d024a98..4d3b33bcd6b 100644
--- a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
+++ b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java
@@ -176,7 +176,7 @@ public static void testDesktopFileFromResourceDir() throws IOException {
             TKit.assertTextStream(expectedVersionString)
                     .label(String.format("[%s] file", desktopFile))
                     .predicate(String::equals)
-                    .apply(Files.readAllLines(desktopFile).stream());
+                    .apply(Files.readAllLines(desktopFile));
         }).run();
     }
 }
diff --git a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java
index 772370b0f8c..9a6468e0771 100644
--- a/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java
+++ b/test/jdk/tools/jpackage/share/AppLauncherEnvTest.java
@@ -82,7 +82,7 @@ public static void test() throws Exception {
         TKit.assertTextStream(expectedEnvVarValue)
             .predicate(TKit.isLinux() ? String::endsWith : String::equals)
             .label(String.format("value of %s env variable", envVarName))
-            .apply(Stream.of(actualEnvVarValue));
+            .apply(List.of(actualEnvVarValue));
 
         final String javaLibraryPath = getValue.apply(2, "java.library.path");
         TKit.assertTrue(
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index bfcfe7587d4..2b164baa359 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -114,8 +114,8 @@ public void testJpackageProps() {
 
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
 
-        TKit.assertTextStream("jpackage.app-version=" + appVersion).apply(output.stream());
-        TKit.assertTextStream("jpackage.app-path=").apply(output.stream());
+        TKit.assertTextStream("jpackage.app-version=" + appVersion).apply(output);
+        TKit.assertTextStream("jpackage.app-path=").apply(output);
     }
 
     @Test
@@ -221,12 +221,12 @@ public void testVerbose() {
         expectedVerboseOutputStrings.forEach(str -> {
             TKit.assertTextStream(str).label("regular output")
                     .predicate(String::contains).negate()
-                    .apply(nonVerboseOutput.stream());
+                    .apply(nonVerboseOutput);
         });
 
         expectedVerboseOutputStrings.forEach(str -> {
             TKit.assertTextStream(str).label("verbose output")
-                    .apply(verboseOutput[0].stream());
+                    .apply(verboseOutput[0]);
         });
     }
 
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index cb302734a43..c352decc0f3 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -41,6 +41,7 @@
 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;
@@ -644,6 +645,44 @@ public static Collection<Object[]> testLinux() {
         return toTestArgs(testCases.stream());
     }
 
+    @Test(ifOS = MACOS)
+    @Parameter({"MAC_PKG", "--mac-signing-key-user-name", "false"})
+    @Parameter({"MAC_DMG", "--mac-signing-key-user-name", "false"})
+    @Parameter({"IMAGE", "--mac-signing-key-user-name", "false"})
+    @Parameter({"MAC_PKG", "--mac-app-image-sign-identity", "true"})
+    @Parameter({"MAC_DMG", "--mac-app-image-sign-identity", "true"})
+    @Parameter({"IMAGE", "--mac-app-image-sign-identity", "true"})
+    @Parameter({"MAC_PKG", "--mac-installer-sign-identity", "true"})
+    public static void testMacSigningIdentityValidation(PackageType type, String option, boolean passThroughOption) {
+
+        final var signingId = "foo";
+
+        final List<CannedFormattedString> errorMessages = new ArrayList<>();
+        errorMessages.add(JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.cert.not.found", "Developer ID Application: " + signingId, ""));
+        errorMessages.addAll(Stream.of(
+                "error.explicit-sign-no-cert",
+                "error.explicit-sign-no-cert.advice"
+        ).map(JPackageStringBundle.MAIN::cannedFormattedString).toList());
+
+        final var cmd = JPackageCommand.helloAppImage()
+                .ignoreDefaultVerbose(true)
+                .addArguments("--mac-sign")
+                .addArguments(option, signingId)
+                .setPackageType(type);
+
+        if (passThroughOption) {
+            errorMessages.stream()
+                    .map(CannedFormattedString::getValue)
+                    .map(TKit::assertTextStream)
+                    .map(TKit.TextStreamVerifier::negate).forEach(cmd::validateOutput);
+        } else {
+            cmd.validateOutput(errorMessages.toArray(CannedFormattedString[]::new));
+        }
+
+        cmd.execute(1);
+    }
+
     private static void duplicate(TestSpec.Builder builder, Consumer<TestSpec> accumulator, Consumer<TestSpec.Builder> mutator) {
         accumulator.accept(builder.create());
         mutator.accept(builder);
@@ -732,7 +771,7 @@ private static void defaultInit(JPackageCommand cmd, List<CannedFormattedString>
         // It will affect jpackage error messages if the command line is malformed.
         cmd.ignoreDefaultVerbose(true);
 
-        // Ignore external runtime as it will interfer
+        // Ignore external runtime as it will interfere
         // with jpackage arguments in this test.
         cmd.ignoreDefaultRuntime(true);
 
diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java
index 6d84714f28b..df207d1c30a 100644
--- a/test/jdk/tools/jpackage/share/IconTest.java
+++ b/test/jdk/tools/jpackage/share/IconTest.java
@@ -191,7 +191,7 @@ private ThrowingBiConsumer<JPackageCommand, Executor.Result> createBundleVerifie
             var verifier = createConsoleOutputVerifier(cmd.name(), config.get(
                     Launcher.Main), null);
             if (verifier != null) {
-                verifier.apply(result.getOutput().stream());
+                verifier.apply(result.getOutput());
             }
 
             if (config.containsKey(Launcher.Additional)) {
@@ -199,7 +199,7 @@ private ThrowingBiConsumer<JPackageCommand, Executor.Result> createBundleVerifie
                         Launcher.Additional.launcherName, config.get(
                                 Launcher.Additional), config.get(Launcher.Main));
                 if (verifier != null) {
-                    verifier.apply(result.getOutput().stream());
+                    verifier.apply(result.getOutput());
                 }
             }
         };
diff --git a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
index a882fd15f18..4c4d7d3e5a3 100644
--- a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
+++ b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
@@ -129,12 +129,12 @@ public void test(String javaAppDesc, String[] jpackageArgs, String[] required, S
         List<String> mods = List.of(release.get(1));
         if (required != null) {
             for (String s : required) {
-                TKit.assertTextStream(s).label("mods").apply(mods.stream());
+                TKit.assertTextStream(s).label("mods").apply(mods);
             }
         }
         if (prohibited != null) {
             for (String s : prohibited) {
-                TKit.assertTextStream(s).label("mods").negate().apply(mods.stream());
+                TKit.assertTextStream(s).label("mods").negate().apply(mods);
             }
         }
     }
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
index 220c55b5e50..5a75529cb7b 100644
--- a/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
+++ b/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
@@ -82,7 +82,7 @@ public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {
     public void test() {
         cmd.executeAndAssertHelloAppImageCreated();
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
-        TKit.assertTextStream(WARNING1).apply(output.stream());
-        TKit.assertTextStream(WARNING2).apply(output.stream());
+        TKit.assertTextStream(WARNING1).apply(output);
+        TKit.assertTextStream(WARNING2).apply(output);
     }
 }
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsTest.java
index 014a9434cad..cb720dfb2a3 100644
--- a/test/jdk/tools/jpackage/share/JavaOptionsTest.java
+++ b/test/jdk/tools/jpackage/share/JavaOptionsTest.java
@@ -91,7 +91,7 @@ public void test() {
         // 2.) run the launcher it generated
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
         for (String expect : expected) {
-            TKit.assertTextStream(expect).apply(output.stream());
+            TKit.assertTextStream(expect).apply(output);
         }
     }
 
diff --git a/test/jdk/tools/jpackage/share/MainClassTest.java b/test/jdk/tools/jpackage/share/MainClassTest.java
index 15d4e0999c5..dd89d84e46d 100644
--- a/test/jdk/tools/jpackage/share/MainClassTest.java
+++ b/test/jdk/tools/jpackage/share/MainClassTest.java
@@ -248,7 +248,7 @@ public void test() throws IOException {
                         .execute().getOutput();
                 TKit.assertTextStream(String.format(
                         "Error: Could not find or load main class %s",
-                        nonExistingMainClass)).apply(output.stream());
+                        nonExistingMainClass)).apply(output);
             }
         }
 
diff --git a/test/jdk/tools/jpackage/windows/WinL10nTest.java b/test/jdk/tools/jpackage/windows/WinL10nTest.java
index 4f5a27f9ff0..14139013318 100644
--- a/test/jdk/tools/jpackage/windows/WinL10nTest.java
+++ b/test/jdk/tools/jpackage/windows/WinL10nTest.java
@@ -120,7 +120,7 @@ private static boolean isWix3(Executor.Result result) {
         return getWixTypeFromVerboseJPackageOutput(result) == WIX3;
     }
 
-    private final static Predicate<String> createToolCommandLinePredicate(String wixToolName) {
+    private static final Predicate<String> createToolCommandLinePredicate(String wixToolName) {
         var toolFileName = wixToolName + ".exe";
         return (s) -> {
             s = s.trim();
@@ -198,12 +198,12 @@ public void test() throws IOException {
                         return String.join(" ", "-culture", culture);
                     }).collect(Collectors.joining(" "));
                 }
-                TKit.assertTextStream(expected).apply(wixCmdline.stream());
+                TKit.assertTextStream(expected).apply(wixCmdline);
             }
 
             if (expectedErrorMessage != null) {
                 TKit.assertTextStream(expectedErrorMessage)
-                        .apply(result.getOutput().stream());
+                        .apply(result.getOutput());
             }
 
             if (wxlFileInitializers != null) {
@@ -213,18 +213,18 @@ public void test() throws IOException {
                 if (allWxlFilesValid) {
                     for (var v : wxlFileInitializers) {
                         if (!v.name.startsWith("MsiInstallerStrings_")) {
-                            v.createCmdOutputVerifier(wixSrcDir).apply(wixCmdline.stream());
+                            v.createCmdOutputVerifier(wixSrcDir).apply(wixCmdline);
                         }
                     }
 
                     for (var v : createDefaultL10nFilesLocVerifiers(wixSrcDir)) {
-                        v.apply(wixCmdline.stream());
+                        v.apply(wixCmdline);
                     }
                 } else {
                     Stream.of(wxlFileInitializers)
                             .filter(Predicate.not(WixFileInitializer::isValid))
                             .forEach(v -> v.createCmdOutputVerifier(
-                                    wixSrcDir).apply(result.getOutput().stream()));
+                                    wixSrcDir).apply(result.getOutput()));
                     TKit.assertTrue(wixCmdline.stream().findAny().isEmpty(),
                             String.format("Check %s.exe was not invoked",
                                     isWix3 ? "light" : "wix"));
@@ -251,12 +251,12 @@ public void test() throws IOException {
         test.run();
     }
 
-    final private WixFileInitializer[] wxlFileInitializers;
-    final private String[] expectedCultures;
-    final private String expectedErrorMessage;
-    final private String userLanguage;
-    final private String userCountry;
-    final private boolean enableWixUIExtension;
+    private final WixFileInitializer[] wxlFileInitializers;
+    private final String[] expectedCultures;
+    private final String expectedErrorMessage;
+    private final String userLanguage;
+    private final String userCountry;
+    private final boolean enableWixUIExtension;
     private Path resourceDir;
 
     private static class WixFileInitializer {
diff --git a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
index 3cf4fdd541c..c92ad7701b5 100644
--- a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
+++ b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
@@ -65,8 +65,10 @@ public static void test() throws IOException {
             // 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);
+                TKit.TextStreamVerifier.group()
+                        .add(TKit.assertTextStream("Doing action: LaunchConditions").predicate(String::endsWith))
+                        .add(TKit.assertTextStream("Not supported on this version of Windows").predicate(String::endsWith))
+                        .create().accept(lines.iterator());
             }
         })
         .createMsiLog(true)
diff --git a/test/jdk/tools/jpackage/windows/WinResourceTest.java b/test/jdk/tools/jpackage/windows/WinResourceTest.java
index b34521403f3..b22501ac6cc 100644
--- a/test/jdk/tools/jpackage/windows/WinResourceTest.java
+++ b/test/jdk/tools/jpackage/windows/WinResourceTest.java
@@ -95,9 +95,9 @@ public void test() throws IOException {
             TKit.assertTextStream(expectedLogMessage)
                     .predicate(String::startsWith)
                     .apply(JPackageCommand.stripTimestamps(
-                            result.getOutput().stream()));
+                            result.getOutput().stream()).iterator());
             TKit.assertTextStream(expectedWixErrorMsg)
-                    .apply(result.getOutput().stream());
+                    .apply(result.getOutput());
         })
         .setExpectedExitCode(1)
         .run();
diff --git a/test/jdk/tools/jpackage/windows/WinScriptTest.java b/test/jdk/tools/jpackage/windows/WinScriptTest.java
index 45068ffd395..dc1483c8c57 100644
--- a/test/jdk/tools/jpackage/windows/WinScriptTest.java
+++ b/test/jdk/tools/jpackage/windows/WinScriptTest.java
@@ -127,19 +127,19 @@ private static class ScriptData {
         void assertJPackageOutput(List<String> output) {
             TKit.assertTextStream(String.format("    jp: %s", echoText))
                     .predicate(String::equals)
-                    .apply(output.stream());
+                    .apply(output);
 
             String cwdPattern = String.format("    jp: CWD(%s)=", envVarName);
             TKit.assertTextStream(cwdPattern)
                     .predicate(String::startsWith)
-                    .apply(output.stream());
+                    .apply(output);
             String cwd = output.stream().filter(line -> line.startsWith(
                     cwdPattern)).findFirst().get().substring(cwdPattern.length());
 
             String envVarPattern = String.format("    jp: %s=", envVarName);
             TKit.assertTextStream(envVarPattern)
                     .predicate(String::startsWith)
-                    .apply(output.stream());
+                    .apply(output);
             String envVar = output.stream().filter(line -> line.startsWith(
                     envVarPattern)).findFirst().get().substring(envVarPattern.length());
 

From 3b7f43f95e061274020deaa1eecdb8182a6b64e1 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Wed, 23 Apr 2025 22:41:31 +0000
Subject: [PATCH 097/901] 8355429: Open source ProgressMonitor test

Reviewed-by: azvegint
---
 .../swing/ProgressMonitor/bug4401480.java     | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 test/jdk/javax/swing/ProgressMonitor/bug4401480.java

diff --git a/test/jdk/javax/swing/ProgressMonitor/bug4401480.java b/test/jdk/javax/swing/ProgressMonitor/bug4401480.java
new file mode 100644
index 00000000000..74b47107e77
--- /dev/null
+++ b/test/jdk/javax/swing/ProgressMonitor/bug4401480.java
@@ -0,0 +1,105 @@
+/*
+ * 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 4401480
+ * @summary Tests that closing ProgressMonitor dialog cancels it
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4401480
+ */
+
+import java.lang.reflect.InvocationTargetException;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.ProgressMonitor;
+import javax.swing.SwingUtilities;
+
+public class bug4401480 {
+    private static ProgressMonitor monitor;
+    private static volatile boolean cancelled = false;
+
+    private static final String INSTRUCTIONS = """
+            This is a semi-automated test which automatically
+            passes if closing the JProgressBar dialog cancels it.
+            Read the following test instructions and when ready
+            click on the Start button below.
+
+            After clicking on Start button wait for few seconds for
+            progress monitor (a dialog with progress bar) to appear.
+            Close it by clicking on the window close button.
+            DO NOT click on Cancel button.
+
+            NOTE:
+            Ensure to click on the window close button before
+            progress bar reaches its max limit.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("JProgress Monitor Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .splitUIBottom(bug4401480::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JPanel createTestUI() {
+        JPanel panel = new JPanel();
+        JButton startButton = new JButton("Start");
+        startButton.addActionListener(e -> {
+            monitor = new ProgressMonitor(null, "Progress", "Running ...", 0, 10);
+            monitor.setProgress(0);
+
+            new Thread(() -> {
+                for (int i = 0; i < 10; i++) {
+                    int count = i;
+                    try {
+                        SwingUtilities.invokeAndWait(() ->
+                                        monitor.setProgress(count));
+                        Thread.sleep(2000);
+                        SwingUtilities.invokeAndWait(() ->
+                                        cancelled = monitor.isCanceled());
+                    } catch (InterruptedException
+                             | InvocationTargetException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                    if (cancelled) {
+                        break;
+                    }
+                }
+
+                if (cancelled) {
+                    PassFailJFrame.forcePass();
+                } else {
+                    PassFailJFrame.forceFail("Test Failed! JProgress Monitor"
+                                             + " was not cancelled");
+                }
+            }).start();
+        });
+        panel.add(startButton);
+        return panel;
+    }
+}

From 4873eec06f25227fe221a86b07c6072e676f7d5d Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 23 Apr 2025 22:57:42 +0000
Subject: [PATCH 098/901] 8354554: Open source several clipboard tests batch1

Reviewed-by: serb, prr
---
 test/jdk/ProblemList.txt                      |   3 +
 test/jdk/java/awt/Clipboard/ClipRWTest.java   | 104 ++++++++
 .../SystemClipboard2ProcTest.java             | 171 +++++++++++++
 .../awt/Clipboard/NoOwnerNoTargetsTest.java   | 131 ++++++++++
 .../PasteNullToTextComponentsTest.java        | 228 ++++++++++++++++++
 5 files changed, 637 insertions(+)
 create mode 100644 test/jdk/java/awt/Clipboard/ClipRWTest.java
 create mode 100644 test/jdk/java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java
 create mode 100644 test/jdk/java/awt/Clipboard/NoOwnerNoTargetsTest.java
 create mode 100644 test/jdk/java/awt/Clipboard/PasteNullToTextComponentsTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index c7168e9800e..74880fa728c 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -257,6 +257,9 @@ java/awt/print/PrinterJob/GlyphPositions.java 7003378 generic-all
 java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 6849371 macosx-all,linux-all
 java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all
 java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java 8165863 macosx-all
+java/awt/Clipboard/PasteNullToTextComponentsTest.java 8234140 macosx-all,windows-all
+java/awt/Clipboard/NoOwnerNoTargetsTest.java 8234140 macosx-all
+java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java 8234140 macosx-all
 java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java 8266244 macosx-aarch64
 java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009 macosx-all
diff --git a/test/jdk/java/awt/Clipboard/ClipRWTest.java b/test/jdk/java/awt/Clipboard/ClipRWTest.java
new file mode 100644
index 00000000000..c173dd17f0d
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/ClipRWTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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 4177171 4180145 4180148
+ * @summary Can't copy to clipboard
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual ClipRWTest
+ */
+
+import java.awt.Button;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+
+public class ClipRWTest {
+    private static final String INSTRUCTIONS = """
+            1. Type some text in the text field and press Copy Text.
+            2. Switch to a _native_ application (e.g. Notepad) and paste the text in
+            3. Verify the text that is pasted matches what you typed in the Java window
+            4. In the native app, type some new text and copy it
+            5. Switch back to the test frame and press Paste Text
+            6. Verify the text that is pasted matches what you typed in the native app
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("ClipRWTest Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(ClipFrame::new)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static class ClipFrame extends Frame {
+        TextField   field =new TextField(50);
+        Button      copyText = new Button("Copy Text");
+        Button      pasteText = new Button("Paste Text");
+        Clipboard   clipboard;
+
+        public ClipFrame() {
+            super("ClipRWTest 4177171");
+            setLayout(new FlowLayout());
+
+            clipboard = getToolkit().getSystemClipboard();
+
+            add(field);
+            add(copyText);
+            add(pasteText);
+
+            copyText.addActionListener(
+                    ev -> {
+                        String text = field.getText();
+                        try {
+                            clipboard.setContents(new StringSelection(text), null);
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                        }
+                    }
+            );
+
+            pasteText.addActionListener(
+                    ev -> {
+                        String text = "";
+                        try {
+                            text = (String) clipboard.getContents(null)
+                                    .getTransferData(DataFlavor.stringFlavor);
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
+                        }
+                        field.setText(text);
+                    }
+            );
+
+            pack();
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java b/test/jdk/java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java
new file mode 100644
index 00000000000..9bd76ad0962
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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 4683804
+ * @summary Tests that in ClipboardOwner.lostOwnership() Clipboard.getContents()
+ *          returns actual contents of the clipboard and Clipboard.setContents()
+ *          can set contents of the clipboard and its owner. The clipboard is
+ *          the system clipboard and the owners of the clipboard are in
+ *          2 different processes.
+ * @key headful
+ * @library /test/lib
+ * @run main SystemClipboard2ProcTest
+*/
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class SystemClipboard2ProcTest {
+
+    public static void main(String[] args) throws Exception {
+        SystemClipboardOwner.run();
+
+        if (SystemClipboardOwner.failed) {
+            throw new RuntimeException("test failed: can not get actual " +
+                    "contents of the clipboard or set owner of the clipboard");
+        } else {
+            System.err.println("test passed");
+        }
+    }
+}
+
+class SystemClipboardOwner implements ClipboardOwner {
+    static volatile boolean failed;
+
+    private static final Object LOCK = new Object();
+
+    private static final int CHAIN_LENGTH = 5;
+    private final static Clipboard clipboard =
+        Toolkit.getDefaultToolkit().getSystemClipboard();
+
+    private int m, id;
+
+    public SystemClipboardOwner(int m) { this.m = m; id = m; }
+
+    public void lostOwnership(Clipboard cb, Transferable contents) {
+        System.err.println(id + " lost clipboard ownership");
+
+        Transferable t = getClipboardContents(cb, null);
+        // for test passing if t.getTransferData() will throw an exception
+        String msg = "" + (m + 1);
+        try {
+            msg = (String)t.getTransferData(DataFlavor.stringFlavor);
+        } catch (Exception e) {
+            System.err.println(id + " can't getTransferData: " + e);
+        }
+        System.err.println(id + " Clipboard.getContents(): " + msg);
+        if (!msg.equals("" + (m + 1))) {
+            failed = true;
+            System.err.println("Clipboard.getContents() returned incorrect contents!");
+        }
+
+        m += 2;
+        if (m <= CHAIN_LENGTH) {
+            System.err.println(id + " Clipboard.setContents(): " + m);
+            setClipboardContents(cb, new StringSelection(m + ""), this);
+        }
+        if (m >= CHAIN_LENGTH) {
+            synchronized (LOCK) {
+                LOCK.notifyAll();
+            }
+        }
+    }
+
+    public static void run() throws Exception {
+        SystemClipboardOwner cbo1 = new SystemClipboardOwner(0);
+        System.err.println(cbo1.m + " Clipboard.setContents(): " + cbo1.m);
+        setClipboardContents(clipboard, new StringSelection(cbo1.m + ""),
+                             cbo1);
+
+        ProcessBuilder pb = ProcessTools
+                .createTestJavaProcessBuilder(SystemClipboardOwner.class.getName());
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+
+        if (cbo1.m < CHAIN_LENGTH) {
+            failed = true;
+            System.err.println("chain of calls of lostOwnership() broken!");
+        }
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        SystemClipboardOwner cbo2 = new SystemClipboardOwner(1);
+        System.err.println(cbo2.m + " Clipboard.setContents(): " + cbo2.m);
+        synchronized (LOCK) {
+            setClipboardContents(clipboard, new StringSelection(cbo2.m + ""),
+                                 cbo2);
+            LOCK.wait();
+        }
+    }
+
+    private static void setClipboardContents(Clipboard cb,
+                                             Transferable contents,
+                                             ClipboardOwner owner) {
+        synchronized (cb) {
+            boolean set = false;
+            while (!set) {
+                try {
+                    cb.setContents(contents, owner);
+                    set = true;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+
+    private static Transferable getClipboardContents(Clipboard cb,
+                                                     Object requestor) {
+        synchronized (cb) {
+            while (true) {
+                try {
+                    Transferable t = cb.getContents(requestor);
+                    return t;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/NoOwnerNoTargetsTest.java b/test/jdk/java/awt/Clipboard/NoOwnerNoTargetsTest.java
new file mode 100644
index 00000000000..178fe9b7074
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/NoOwnerNoTargetsTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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 4655996
+ * @summary tests that getting the system clipboard contents doesn't cause
+ *          IOException if there is no clipboard owner or the owner doesn't
+ *          export any target types
+ * @key headful
+ * @library /test/lib
+ * @run main NoOwnerNoTargetsTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class NoOwnerNoTargetsTest implements ClipboardOwner {
+
+    final Clipboard clipboard =
+        Toolkit.getDefaultToolkit().getSystemClipboard();
+    public static final int CLIPBOARD_DELAY = 1000;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0) {
+            NoOwnerNoTargetsTest test = new NoOwnerNoTargetsTest();
+            test.execute();
+            return;
+        }
+
+        new NoOwnerNoTargetsTest().start();
+    }
+
+    public void execute() {
+        final ClipboardOwner clipboardOwner = new ClipboardOwner() {
+                public void lostOwnership(Clipboard clip,
+                                          Transferable contents) {
+                    System.exit(0);
+                }
+            };
+        final Transferable emptyTransferable = new Transferable() {
+                public DataFlavor[] getTransferDataFlavors() {
+                    return new DataFlavor[0];
+                }
+                public boolean isDataFlavorSupported(DataFlavor df) {
+                    return false;
+                }
+                public Object getTransferData(DataFlavor df)
+                  throws UnsupportedFlavorException {
+                    throw new UnsupportedFlavorException(df);
+                }
+            };
+
+        clipboard.setContents(emptyTransferable, clipboardOwner);
+        final Object o = new Object();
+        synchronized (o) {
+            try {
+                o.wait();
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+            }
+        }
+    }
+
+    public void start() throws Exception {
+        clipboard.getContents(null);
+
+        Transferable transferable = new StringSelection("TEXT");
+        clipboard.setContents(transferable, this);
+
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                NoOwnerNoTargetsTest.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+
+    public void lostOwnership(Clipboard clip, Transferable contents) {
+        final Transferable transferable = new StringSelection("TEXT");
+        final Runnable r = () -> {
+            try {
+                Thread.sleep(CLIPBOARD_DELAY);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            clipboard.getContents(null);
+            clipboard.setContents(transferable, null);
+        };
+        final Thread t = new Thread(r);
+        t.start();
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/PasteNullToTextComponentsTest.java b/test/jdk/java/awt/Clipboard/PasteNullToTextComponentsTest.java
new file mode 100644
index 00000000000..191ba2288b7
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/PasteNullToTextComponentsTest.java
@@ -0,0 +1,228 @@
+/*
+ * 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 4401853
+ * @summary Tests that pasting null to TextArea and TextField on Solaris/Linux
+ *          removes selected text; doing it on Windows to TextArea does nothing,
+ *          to TextField removes selected text.
+ * @key headful
+ * @run main PasteNullToTextComponentsTest
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.TextArea;
+import java.awt.TextComponent;
+import java.awt.TextField;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+public class PasteNullToTextComponentsTest {
+
+    private static final int NATIVE_EVENT_PROCESSING_TIMEOUT = 500;
+    private static final int WAIT_TIMEOUT = 3000;
+
+    private boolean failed;
+
+    private static final boolean isOSWindows =
+            System.getProperty("os.name").startsWith("Windows");
+
+    private final Object LOCK = new Object();
+
+    private Robot robot;
+
+    private Frame frame;
+    private TextArea ta;
+    private TextField tf;
+    private Component initialFocusComp;
+
+    private final String beg = "a";
+    private final String sel = "b";
+    private final String end = "c";
+    private final String text = beg + sel + end;
+    private final String begEnd = beg + end;
+
+    private boolean initialFocusGained;
+
+    public void init() {
+        ta = new TextArea(text, 3, text.length() + 3);
+        tf = new TextField(text, text.length() + 3);
+        initialFocusComp = new Button("Initially focused button");
+
+        frame = new Frame();
+        frame.add(initialFocusComp, BorderLayout.NORTH);
+        frame.add(ta, BorderLayout.CENTER);
+        frame.add(tf, BorderLayout.SOUTH);
+        frame.setSize(200, 200);
+
+        FocusListener fl = new FocusAdapter() {
+            public void focusGained(FocusEvent e) {
+                System.out.println(e + "; source class=" + e.getSource().getClass());
+                synchronized (LOCK) {
+                    TextComponent tc = (TextComponent) e.getComponent();
+                    tc.select(1, 2);
+                    robot.keyPress(KeyEvent.VK_CONTROL);
+                    robot.keyPress(KeyEvent.VK_V);
+                    robot.keyRelease(KeyEvent.VK_V);
+                    robot.keyRelease(KeyEvent.VK_CONTROL);
+                    tc.removeFocusListener(this);
+                    LOCK.notifyAll();
+                }
+            }
+        };
+        ta.addFocusListener(fl);
+        tf.addFocusListener(fl);
+
+        initialFocusComp.addFocusListener(new FocusAdapter() {
+            public void focusGained(FocusEvent e) {
+                System.out.println(e + "; source class=" + e.getSource().getClass());
+                synchronized (LOCK) {
+                    initialFocusGained = true;
+                    LOCK.notifyAll();
+                }
+            }
+        });
+
+        setClipboardContents(Toolkit.getDefaultToolkit().getSystemClipboard(),
+                new StringSelection(null), null);
+
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    public void start() throws Exception {
+        robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(500);
+
+        Point iniFocusPoint = initialFocusComp.getLocationOnScreen();
+        synchronized (LOCK) {
+            if (!initialFocusGained) {
+                robot.mouseMove(iniFocusPoint.x + 3, iniFocusPoint.y + 3);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+                LOCK.wait(WAIT_TIMEOUT);
+            }
+        }
+
+        initialFocusComp.requestFocusInWindow();
+        robot.waitForIdle();
+
+        synchronized (LOCK) {
+            ta.requestFocusInWindow();
+            LOCK.wait(WAIT_TIMEOUT);
+        }
+
+        // wait until native control process key event (C^V)
+        robot.waitForIdle();
+        robot.delay(NATIVE_EVENT_PROCESSING_TIMEOUT);
+
+        synchronized (LOCK) {
+            tf.requestFocusInWindow();
+            LOCK.wait(WAIT_TIMEOUT);
+        }
+
+        // wait until native control process key event (C^V)
+        robot.waitForIdle();
+        robot.delay(NATIVE_EVENT_PROCESSING_TIMEOUT);
+
+        String taText = ta.getText();
+        String tfText = tf.getText();
+
+        System.err.println("TextArea text=" + taText +
+                " TextField text=" + tfText);
+
+        boolean taSelDeleted = begEnd.equals(taText);
+        boolean taSelRemained = text.equals(taText);
+        boolean tfSelDeleted = begEnd.equals(tfText);
+
+        System.out.println("taSelDeleted = " + taSelDeleted);
+        System.out.println("taSelRemained = " + taSelRemained);
+        System.out.println("tfSelDeleted = " + tfSelDeleted);
+
+        if (isOSWindows
+                ? !(taSelRemained && tfSelDeleted)
+                : !(taSelDeleted && tfSelDeleted)) {
+            failed = true;
+        }
+
+        if (!initialFocusGained) {
+            System.err.println("Initial component did not gain focus");
+            failed = false;
+        }
+
+        if (failed) {
+            throw new RuntimeException("test failed: wrong behavior of text " +
+                    "component on pasting null");
+        } else {
+            System.err.println("test passed");
+        }
+    }
+
+
+    private static void setClipboardContents(Clipboard cb,
+                                             Transferable contents,
+                                             ClipboardOwner owner) {
+        synchronized (cb) {
+            boolean set = false;
+            while (!set) {
+                try {
+                    cb.setContents(contents, owner);
+                    set = true;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        PasteNullToTextComponentsTest app = new PasteNullToTextComponentsTest();
+        try {
+            EventQueue.invokeAndWait(app::init);
+            app.start();
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (app.frame != null) {
+                    app.frame.dispose();
+                }
+            });
+        }
+    }
+}

From ac17449bdb946d98cb65c8eae9c9671f527a79cb Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 23 Apr 2025 22:58:47 +0000
Subject: [PATCH 099/901] 8353596: GenShen: Test
 TestClone.java#generational-no-coops intermittent timed out

Reviewed-by: kdnilsen, ysr
---
 .../gc/shenandoah/shenandoahGenerationalControlThread.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index 2f2f13ca87b..fe4679bbf05 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -273,13 +273,9 @@ void ShenandoahGenerationalControlThread::run_gc_cycle(const ShenandoahGCRequest
     }
   }
 
-  // If this was the requested GC cycle, notify waiters about it
-  if (ShenandoahCollectorPolicy::is_explicit_gc(request.cause)) {
-    notify_gc_waiters();
-  }
-
-  // If this cycle completed successfully, notify threads waiting to retry allocation
+  // If this cycle completed successfully, notify threads waiting for gc
   if (!_heap->cancelled_gc()) {
+    notify_gc_waiters();
     notify_alloc_failure_waiters();
   }
 

From b10a304b2bdec5fdd3d689ae8fcd341e68e80b72 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 23 Apr 2025 23:03:22 +0000
Subject: [PATCH 100/901] 8354553: Open source several clipboard tests batch0

Reviewed-by: serb, prr
---
 test/jdk/ProblemList.txt                      |   4 +
 .../java/awt/Clipboard/ClipboardSecurity.java | 156 ++++++
 .../SystemClipboardTest.java                  | 227 ++++++++
 .../java/awt/Clipboard/ImageTransferTest.java | 519 ++++++++++++++++++
 .../NoDataConversionFailureTest.java          | 173 ++++++
 5 files changed, 1079 insertions(+)
 create mode 100644 test/jdk/java/awt/Clipboard/ClipboardSecurity.java
 create mode 100644 test/jdk/java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java
 create mode 100644 test/jdk/java/awt/Clipboard/ImageTransferTest.java
 create mode 100644 test/jdk/java/awt/Clipboard/NoDataConversionFailureTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 74880fa728c..2906cc8da19 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -261,6 +261,10 @@ java/awt/Clipboard/PasteNullToTextComponentsTest.java 8234140 macosx-all,windows
 java/awt/Clipboard/NoOwnerNoTargetsTest.java 8234140 macosx-all
 java/awt/Clipboard/LostOwnershipChainTest/SystemClipboard2ProcTest.java 8234140 macosx-all
 java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java 8017454 macosx-all
+java/awt/Clipboard/ClipboardSecurity.java 8054809 macosx-all
+java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java 8234140 macosx-all
+java/awt/Clipboard/ImageTransferTest.java 8030710 generic-all
+java/awt/Clipboard/NoDataConversionFailureTest.java 8234140 macosx-all
 java/awt/Frame/MiscUndecorated/RepaintTest.java 8266244 macosx-aarch64
 java/awt/Modal/FileDialog/FileDialogAppModal1Test.java 7186009 macosx-all
 java/awt/Modal/FileDialog/FileDialogAppModal2Test.java 7186009 macosx-all
diff --git a/test/jdk/java/awt/Clipboard/ClipboardSecurity.java b/test/jdk/java/awt/Clipboard/ClipboardSecurity.java
new file mode 100644
index 00000000000..d33cc4fca42
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/ClipboardSecurity.java
@@ -0,0 +1,156 @@
+/*
+ * 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 4274061
+ * @summary Tests that Transferable.getTransferData() and
+ *          SelectionOwner.lostOwnership is not called on Toolkit thread.
+ * @key headful
+ * @library /test/lib
+ * @run main ClipboardSecurity
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ClipboardSecurity {
+    static Clipboard clip = null;
+    public static final CountDownLatch latch = new CountDownLatch(1);
+    public static volatile boolean hasError = false;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            ClipboardSecurity clipboardSecurity = new ClipboardSecurity();
+            clipboardSecurity.start();
+            return;
+        }
+
+        try {
+            clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+            if ( clip == null ) {
+                throw (new RuntimeException("Clipboard is null"));
+            }
+            Transferable data = clip.getContents(null);
+            if ( data == null ) {
+                throw (new RuntimeException("Data is null"));
+            }
+            System.out.println("Clipboard contents: " + data);
+            // First check - getTransferData
+            try {
+                String contData =
+                        (String) data.getTransferData(DataFlavor.stringFlavor);
+            } catch (UnsupportedFlavorException | IOException exc) {
+                throw(new RuntimeException("Couldn't get transfer data - "
+                        + exc.getMessage()));
+            }
+            // Second check - lostOwnership
+            MyClass clipData = new MyClass("clipbard test data");
+            clip.setContents(clipData, clipData);
+            System.out.println("exit 0");
+            System.exit(0);
+        } catch (RuntimeException exc) {
+            System.err.println(exc.getMessage());
+            System.out.println("exit 2");
+            System.exit(2);
+        }
+    }
+
+    public void start() throws Exception {
+        clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+        if (clip == null) {
+            throw (new RuntimeException("Clipboard is null"));
+        }
+        MyClass clipData = new MyClass("clipboard test data");
+        clip.setContents(clipData, clipData);
+
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                ClipboardSecurity.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+        System.out.println("WAIT COMPLETE");
+
+        outputAnalyzer.shouldHaveExitValue(0);
+
+        if (!latch.await(10, TimeUnit.SECONDS)) {
+            throw new RuntimeException("timed out");
+        }
+
+        if (hasError) {
+            throw new RuntimeException("Detected call on Toolkit thread");
+        }
+
+        System.out.println("Passed.");
+    }
+}
+
+class MyClass extends StringSelection implements ClipboardOwner {
+    MyClass(String title) {
+        super(title);
+    }
+
+    private void checkIsCorrectThread(String reason) {
+        System.out.println("Checking " + reason + " for thread "
+                + Thread.currentThread().getName());
+        String name = Thread.currentThread().getName();
+        if (name.equals("AWT-Windows") || name.equals("AWT-Motif")) {
+            ClipboardSecurity.hasError = true;
+            System.err.println(reason + " is called on Toolkit thread!");
+        }
+    }
+
+    public void lostOwnership(Clipboard clip, Transferable cont) {
+        checkIsCorrectThread("lostOwnership");
+        ClipboardSecurity.latch.countDown();
+        System.out.println("lost ownership on "
+                + Thread.currentThread().getName() + " thread");
+    }
+
+    public Object getTransferData(DataFlavor flav)
+            throws UnsupportedFlavorException, IOException {
+        System.out.println("getTransferData on "
+                + Thread.currentThread().getName() + " thread");
+        checkIsCorrectThread("getTransferData");
+        return super.getTransferData(flav);
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java b/test/jdk/java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java
new file mode 100644
index 00000000000..6aaa431fb3b
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/GetAltContentsTest/SystemClipboardTest.java
@@ -0,0 +1,227 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4287795 4790833
+ * @summary tests new Clipboard methods: getAvailableDataFlavors,
+ *          isDataFlavorAvailable, getData
+ * @key headful
+ * @library /test/lib
+ * @run main SystemClipboardTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+
+public class SystemClipboardTest {
+
+    private static final Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+
+    private static final String contentsText = "contents text";
+
+    public void start() throws Exception {
+        Util.setClipboardContents(clipboard, new StringSelection(contentsText), new ClipboardOwner() {
+                public void lostOwnership(Clipboard clpbrd, Transferable cntnts) {
+                    check(); // clipboard data retrieved from the system clipboard
+                    Util.setClipboardContents(clipboard, new StringSelection(contentsText), null);
+                }
+            });
+
+        check(); // JVM-local clipboard data
+
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                SystemClipboardTest.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+
+    private void check() {
+        boolean failed = false;
+
+        Transferable contents = Util.getClipboardContents(clipboard, null);
+        Set<DataFlavor> flavorsT = new HashSet<>(Arrays.asList(contents.getTransferDataFlavors()));
+        Set<DataFlavor> flavorsA = new HashSet<>(Arrays.asList(Util.getClipboardAvailableDataFlavors(clipboard)));
+        System.err.println("getAvailableDataFlavors(): " + flavorsA);
+        if (!flavorsA.equals(flavorsT)) {
+            failed = true;
+            System.err.println("FAILURE: getAvailableDataFlavors() returns incorrect " +
+                    "DataFlavors: " + flavorsA + "\nwhile getContents()." +
+                    "getTransferDataFlavors() return: " + flavorsT);
+        }
+
+        if (!Util.isClipboardDataFlavorAvailable(clipboard, DataFlavor.stringFlavor)) {
+            failed = true;
+            System.err.println("FAILURE: isDataFlavorAvailable(DataFlavor.stringFlavor) " +
+                               "returns false");
+        }
+
+        Object data = null;
+        try {
+            data = Util.getClipboardData(clipboard, DataFlavor.stringFlavor);
+        } catch (UnsupportedFlavorException exc) {
+            failed = true;
+            exc.printStackTrace();
+        } catch (IOException exc) {
+            failed = true;
+            exc.printStackTrace();
+        }
+        System.err.println("getData(): " + data);
+        if (!contentsText.equals(data)) {
+            failed = true;
+            System.err.println("FAILURE: getData() returns: " + data +
+                               ", that is not equal to: \"" + contentsText + "\"");
+
+        }
+
+        if (failed) {
+            throw new RuntimeException("test failed, for details see output above");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            SystemClipboardTest systemClipboardTest = new SystemClipboardTest();
+            systemClipboardTest.start();
+            return;
+        }
+
+        System.err.println("child VM: setting clipboard contents");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        Util.setClipboardContents(clipboard, new StringSelection(contentsText),
+                (clpbrd, cntnts) -> {
+                    System.err.println("child VM: success");
+                    latch.countDown();
+                });
+
+        if (!latch.await(15, TimeUnit.SECONDS)) {
+            throw new RuntimeException("child VM failed");
+        }
+    }
+}
+
+class Util {
+    public static void setClipboardContents(Clipboard cb,
+                                            Transferable contents,
+                                            ClipboardOwner owner) {
+        while (true) {
+            try {
+                cb.setContents(contents, owner);
+                return;
+            } catch (IllegalStateException ise) {
+                ise.printStackTrace();
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static Transferable getClipboardContents(Clipboard cb,
+                                                    Object requestor) {
+        while (true) {
+            try {
+                return cb.getContents(requestor);
+            } catch (IllegalStateException ise) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static Object getClipboardData(Clipboard cb, DataFlavor flavor)
+            throws IOException, UnsupportedFlavorException {
+        while (true) {
+            try {
+                return cb.getData(flavor);
+            } catch (IllegalStateException ise) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static DataFlavor[] getClipboardAvailableDataFlavors(Clipboard cb) {
+        while (true) {
+            try {
+                return cb.getAvailableDataFlavors();
+            } catch (IllegalStateException ise) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static boolean isClipboardDataFlavorAvailable(Clipboard cb,
+                                                         DataFlavor flavor) {
+        while (true) {
+            try {
+                return cb.isDataFlavorAvailable(flavor);
+            } catch (IllegalStateException ise) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException ie) {
+                    ie.printStackTrace();
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/ImageTransferTest.java b/test/jdk/java/awt/Clipboard/ImageTransferTest.java
new file mode 100644
index 00000000000..0c407152009
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/ImageTransferTest.java
@@ -0,0 +1,519 @@
+/*
+ * 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 4397404 4720930
+ * @summary tests that images of all supported native image formats
+ *          are transferred properly
+ * @key headful
+ * @library /test/lib
+ * @run main ImageTransferTest
+ */
+
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.SystemFlavorMap;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.image.BufferedImage;
+import java.awt.image.MemoryImageSource;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ImageTransferTest {
+    public static final int CODE_NOT_RETURNED = 100;
+    public static final int CODE_CONSUMER_TEST_FAILED = 101;
+    public static final int CODE_FAILURE = 102;
+
+    private TImageProducer imPr;
+    private int returnCode = CODE_NOT_RETURNED;
+
+    public static void main(String[] args) throws Exception {
+        ImageTransferTest imageTransferTest = new ImageTransferTest();
+        imageTransferTest.init();
+        imageTransferTest.start();
+    }
+
+    public void init() {
+        imPr = new TImageProducer();
+        imPr.begin();
+    }
+
+    public void start() throws Exception {
+        String formats = "";
+
+        String iniMsg = "Testing all native image formats from \n" +
+            "SystemFlavorMap.getNativesForFlavor(DataFlavor.imageFlavor) \n";
+
+        for (int i = 0; i < imPr.formats.length; i++) {
+            formats += (imPr.formats[i] + " ");
+        }
+        System.out.println(iniMsg + formats);
+
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                TImageConsumer.class.getName(), formats
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            returnCode = CODE_NOT_RETURNED;
+        } else {
+            returnCode = outputAnalyzer.getExitValue();
+        }
+
+        switch (returnCode) {
+            case CODE_NOT_RETURNED:
+                throw new RuntimeException("Child VM: failed to start");
+            case CODE_FAILURE:
+                throw new RuntimeException("Child VM: abnormal termination");
+            case CODE_CONSUMER_TEST_FAILED:
+                throw new RuntimeException("test failed: images in some " +
+                    "native formats are not transferred properly: " +
+                    "see output of child VM");
+            default:
+                boolean failed = false;
+                String passedFormats = "";
+                String failedFormats = "";
+
+                for (int i = 0; i < imPr.passedArray.length; i++) {
+                   if (imPr.passedArray[i]) passedFormats += imPr.formats[i] + " ";
+                   else {
+                       failed = true;
+                       failedFormats += imPr.formats[i] + " ";
+                   }
+                }
+                if (failed) {
+                    throw new RuntimeException("test failed: images in following " +
+                        "native formats are not transferred properly: " +
+                        failedFormats);
+                } else {
+                    System.err.println("images in following native formats are " +
+                        "transferred properly: " + passedFormats);
+                }
+        }
+    }
+}
+
+abstract class ImageTransferer implements ClipboardOwner {
+
+    static final String S_PASSED = "Y";
+    static final String S_FAILED = "N";
+    static final String S_BEGIN = "B";
+    static final String S_BEGIN_ANSWER = "BA";
+    static final String S_END = "E";
+
+    Image image;
+
+    Clipboard clipboard;
+
+    String[] formats;
+    int fi; // next format index
+
+
+    ImageTransferer() {
+        clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+        image = createImage();
+    }
+
+    abstract void notifyTransferSuccess(boolean status);
+
+    private static Image createImage() {
+        int w = 100;
+        int h = 100;
+        int[] pix = new int[w * h];
+
+        int index = 0;
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                int red = 127;
+                int green = 127;
+                int blue = y > h / 2 ? 127 : 0;
+                int alpha = 255;
+                if (x < w / 4 && y < h / 4) {
+                    alpha = 0;
+                    red = 0;
+                }
+                pix[index++] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+            }
+        }
+
+        return Toolkit.getDefaultToolkit().
+                   createImage(new MemoryImageSource(w, h, pix, 0, w));
+    }
+
+    static String[] retrieveFormatsToTest() {
+        SystemFlavorMap sfm = (SystemFlavorMap)SystemFlavorMap.getDefaultFlavorMap();
+        java.util.List ln = sfm.getNativesForFlavor(DataFlavor.imageFlavor);
+
+        String osName = System.getProperty("os.name").toLowerCase();
+        String sMETAFILEPICT = "METAFILEPICT";
+        if (osName.indexOf("win") >= 0 && !ln.contains(sMETAFILEPICT)) {
+            // for test failing on JDK without this fix
+            ln.add(sMETAFILEPICT);
+        }
+        return (String[])ln.toArray(new String[ln.size()]);
+    }
+
+    static void leaveFormat(String format) {
+        SystemFlavorMap sfm = (SystemFlavorMap)SystemFlavorMap.getDefaultFlavorMap();
+        sfm.setFlavorsForNative(format,
+                                new DataFlavor[] { DataFlavor.imageFlavor });
+        sfm.setNativesForFlavor(DataFlavor.imageFlavor,
+                                new String[] { format });
+    }
+
+    boolean areImagesIdentical(Image im1, Image im2) {
+        if (formats[fi].equals("JFIF") || formats[fi].equals("image/jpeg") ||
+                formats[fi].equals("GIF") || formats[fi].equals("image/gif")) {
+            // JFIF and GIF are lossy formats
+            return true;
+        }
+        int[] ib1 = getImageData(im1);
+        int[] ib2 = getImageData(im2);
+
+        if (ib1.length != ib2.length) {
+            return false;
+        }
+
+        if (formats[fi].equals("PNG") ||
+            formats[fi].equals("image/png") ||
+            formats[fi].equals("image/x-png")) {
+            // check alpha as well
+            for (int i = 0; i < ib1.length; i++) {
+               if (ib1[i] != ib2[i]) {
+                   System.err.println("different pixels: " +
+                       Integer.toHexString(ib1[i]) + " " +
+                       Integer.toHexString(ib2[i]));
+                   return false;
+               }
+            }
+        } else {
+            for (int i = 0; i < ib1.length; i++) {
+               if ((ib1[i] & 0x00FFFFFF) != (ib2[i] & 0x00FFFFFF)) {
+                   System.err.println("different pixels: " +
+                       Integer.toHexString(ib1[i]) + " " +
+                       Integer.toHexString(ib2[i]));
+                   return false;
+               }
+            }
+        }
+        return true;
+    }
+
+    private static int[] getImageData(Image image) {
+        int width = image.getWidth(null);
+        int height = image.getHeight(null);
+        BufferedImage bimage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2d = bimage.createGraphics();
+        try {
+            g2d.drawImage(image, 0, 0, width, height, null);
+        } finally {
+            g2d.dispose();
+        }
+        return bimage.getRGB(0, 0, width, height, null, 0, width);
+    }
+
+    static void setClipboardContents(Clipboard cb,
+                                     Transferable contents,
+                                     ClipboardOwner owner) {
+        synchronized (cb) {
+            boolean set = false;
+            while (!set) {
+                try {
+                    cb.setContents(contents, owner);
+                    set = true;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+
+    static Transferable getClipboardContents(Clipboard cb,
+                                             Object requestor) {
+        synchronized (cb) {
+            while (true) {
+                try {
+                    Transferable t = cb.getContents(requestor);
+                    return t;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+}
+
+class TImageProducer extends ImageTransferer {
+
+    boolean[] passedArray;
+
+    private boolean isFirstCallOfLostOwnership = true;
+
+    TImageProducer() {
+        formats = retrieveFormatsToTest();
+        passedArray = new boolean[formats.length];
+    }
+
+    void begin() {
+        setClipboardContents(clipboard, new StringSelection(S_BEGIN), this);
+    }
+
+    public void lostOwnership(Clipboard cb, Transferable contents) {
+        System.err.println("PRODUCER: lost clipboard ownership");
+
+        Transferable t = getClipboardContents(cb, null);
+
+        if (t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+            String msg = null;
+            // for test going on if t.getTransferData() will throw an exception
+            if (isFirstCallOfLostOwnership) {
+                isFirstCallOfLostOwnership = false;
+                msg = S_BEGIN_ANSWER;
+            } else {
+                msg = S_PASSED;
+            }
+
+            try {
+                msg = (String)t.getTransferData(DataFlavor.stringFlavor);
+                System.err.println("received message: " + msg);
+            } catch (Exception e) {
+                System.err.println("Can't getTransferData-message: " + e);
+            }
+
+            if (msg.equals(S_PASSED)) {
+                notifyTransferSuccess(true);
+            } else if (msg.equals(S_FAILED)) {
+                notifyTransferSuccess(false);
+            } else if (!msg.equals(S_BEGIN_ANSWER)) {
+                throw new RuntimeException("wrong message in " +
+                    "TImageProducer.lostOwnership(): " + msg +
+                    "  (possibly due to bug 4683804)");
+            }
+        } else {
+            throw new RuntimeException("DataFlavor.stringFlavor is not " +
+                "supported by transferable in " +
+                "TImageProducer.lostOwnership()");
+        }
+
+        if (fi < formats.length) {
+            System.err.println("testing native image format " + formats[fi] +
+                               "...");
+            leaveFormat(formats[fi]);
+            setClipboardContents(cb, new ImageSelection(image), this);
+        } else {
+            setClipboardContents(cb, new StringSelection(S_END), null);
+        }
+    }
+
+    void notifyTransferSuccess(boolean status) {
+        passedArray[fi] = status;
+        fi++;
+    }
+}
+
+class TImageConsumer extends ImageTransferer {
+
+    private static final Object LOCK = new Object();
+
+    private static boolean failed;
+
+    public void lostOwnership(Clipboard cb, Transferable contents) {
+        System.err.println("CONSUMER: lost clipboard ownership");
+
+        Transferable t = getClipboardContents(cb, null);
+
+        if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) {
+            Image im = null; //? image;
+            try {
+                im = (Image) t.getTransferData(DataFlavor.imageFlavor);
+            } catch (Exception e) {
+                System.err.println("Can't getTransferData-image: " + e);
+                notifyTransferSuccess(false);
+            }
+
+            if (im == null) {
+                System.err.println("getTransferData returned null");
+                notifyTransferSuccess(false);
+            } else if (areImagesIdentical(image, im)) {
+                notifyTransferSuccess(true);
+            } else {
+                System.err.println("transferred image is different from " +
+                                   "initial image");
+                notifyTransferSuccess(false);
+            }
+        } else if (t.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+            // all image formats have been processed
+            try {
+                String msg = (String) t.getTransferData(DataFlavor.stringFlavor);
+                System.err.println("received message: " + msg);
+            } catch (Exception e) {
+                System.err.println("Can't getTransferData-message: " + e);
+            }
+            synchronized (LOCK) {
+                LOCK.notifyAll();
+            }
+        } else {
+            System.err.println("imageFlavor is not supported by transferable");
+            notifyTransferSuccess(false);
+        }
+    }
+
+    void notifyTransferSuccess(boolean status) {
+        if (status) {
+            System.err.println("format passed: " + formats[fi]);
+            setClipboardContents(clipboard, new StringSelection(S_PASSED), this);
+        } else {
+            failed = true;
+            System.err.println("format failed: " + formats[fi]);
+            setClipboardContents(clipboard, new StringSelection(S_FAILED), this);
+        }
+
+        if (fi < formats.length - 1) {
+            leaveFormat(formats[++fi]);
+        }
+    }
+
+    public static void main(String[] args) {
+        try {
+            TImageConsumer ic = new TImageConsumer();
+
+            ic.formats = args;
+
+            leaveFormat(ic.formats[0]);
+            synchronized (LOCK) {
+                ic.setClipboardContents(ic.clipboard,
+                    new StringSelection(S_BEGIN_ANSWER), ic);
+                LOCK.wait();
+            }
+            if (failed) System.exit(ImageTransferTest.CODE_CONSUMER_TEST_FAILED);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            System.exit(ImageTransferTest.CODE_FAILURE);
+        }
+    }
+}
+
+/**
+ * A <code>Transferable</code> which implements the capability required
+ * to transfer an <code>Image</code>.
+ *
+ * This <code>Transferable</code> properly supports
+ * <code>DataFlavor.imageFlavor</code>.
+ * and all equivalent flavors.
+ * No other <code>DataFlavor</code>s are supported.
+ *
+ * @see java.awt.datatransfer.DataFlavor.imageFlavor
+ */
+class ImageSelection implements Transferable {
+
+    private static final int IMAGE = 0;
+
+    private static final DataFlavor[] flavors = { DataFlavor.imageFlavor };
+
+    private Image data;
+
+    /**
+     * Creates a <code>Transferable</code> capable of transferring
+     * the specified <code>String</code>.
+     */
+    public ImageSelection(Image data) {
+        this.data = data;
+    }
+
+    /**
+     * Returns an array of flavors in which this <code>Transferable</code>
+     * can provide the data. <code>DataFlavor.stringFlavor</code>
+     * is properly supported.
+     * Support for <code>DataFlavor.plainTextFlavor</code> is
+     * <b>deprecated</b>.
+     *
+     * @return an array of length one, whose element is <code>DataFlavor.
+     *         imageFlavor</code>
+     */
+    public DataFlavor[] getTransferDataFlavors() {
+        // returning flavors itself would allow client code to modify
+        // our internal behavior
+        return (DataFlavor[])flavors.clone();
+    }
+
+    /**
+     * Returns whether the requested flavor is supported by this
+     * <code>Transferable</code>.
+     *
+     * @param flavor the requested flavor for the data
+     * @return true if <code>flavor</code> is equal to
+     *   <code>DataFlavor.imageFlavor</code>;
+     *   false if <code>flavor</code>
+     *   is not one of the above flavors
+     * @throws NullPointerException if flavor is <code>null</code>
+     */
+    public boolean isDataFlavorSupported(DataFlavor flavor) {
+        for (int i = 0; i < flavors.length; i++) {
+            if (flavor.equals(flavors[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the <code>Transferable</code>'s data in the requested
+     * <code>DataFlavor</code> if possible. If the desired flavor is
+     * <code>DataFlavor.imageFlavor</code>, or an equivalent flavor,
+     * the <code>Image</code> representing the selection is
+     * returned.
+     *
+     * @param flavor the requested flavor for the data
+     * @return the data in the requested flavor, as outlined above
+     * @throws UnsupportedFlavorException if the requested data flavor is
+     *         not equivalent to <code>DataFlavor.imageFlavor</code>
+     * @throws IOException if an IOException occurs while retrieving the data.
+     *         By default, <code>ImageSelection</code> never throws
+     *         this exception, but a subclass may.
+     * @throws NullPointerException if flavor is <code>null</code>
+     */
+    public Object getTransferData(DataFlavor flavor)
+        throws UnsupportedFlavorException, java.io.IOException
+    {
+        if (flavor.equals(flavors[IMAGE])) {
+            return (Object)data;
+        } else {
+            throw new UnsupportedFlavorException(flavor);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Clipboard/NoDataConversionFailureTest.java b/test/jdk/java/awt/Clipboard/NoDataConversionFailureTest.java
new file mode 100644
index 00000000000..9ad108a5da2
--- /dev/null
+++ b/test/jdk/java/awt/Clipboard/NoDataConversionFailureTest.java
@@ -0,0 +1,173 @@
+/*
+ * 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 4558797
+ * @summary Tests that there is no data conversion failure when two applications
+ *          exchange data via system clipboard
+ * @key headful
+ * @library /test/lib
+ * @run main NoDataConversionFailureTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class NoDataConversionFailureTest {
+
+    public static void main(String[] args) throws Exception {
+        SystemClipboardOwner.run();
+
+        if (SystemClipboardOwner.failed) {
+            throw new RuntimeException("test failed: can not get transfer data");
+        } else {
+            System.err.println("test passed");
+        }
+    }
+}
+
+class SystemClipboardOwner implements ClipboardOwner {
+    static volatile boolean failed;
+
+    private static final Object LOCK = new Object();
+
+    private static final int CHAIN_LENGTH = 15;
+    private final static Clipboard clipboard =
+            Toolkit.getDefaultToolkit().getSystemClipboard();
+
+    private int m;
+    private final int id;
+
+    public SystemClipboardOwner(int m) { this.m = m; id = m; }
+
+    public void lostOwnership(Clipboard cb, Transferable contents) {
+        System.err.println(id + " lost clipboard ownership");
+
+        Transferable t = getClipboardContents(cb, null);
+        // for test passing if t.getTransferData() will throw an exception
+        String msg = String.valueOf(m + 1);
+        try {
+            msg = (String) t.getTransferData(DataFlavor.stringFlavor);
+        } catch (IOException e) {
+            failed = true;
+            System.err.println(id + " can't getTransferData: " + e);
+        } catch (Exception e) {
+            System.err.println(id + " can't getTransferData: " + e);
+        }
+
+        System.err.println(id + " Clipboard.getContents(): " + msg);
+        if (!msg.equals(String.valueOf(m + 1))) {
+            System.err.println("Clipboard.getContents() returned incorrect contents!");
+        }
+
+        m += 2;
+        if (m <= CHAIN_LENGTH) {
+            System.err.println(id + " Clipboard.setContents(): " + m);
+            setClipboardContents(cb, new StringSelection(m + ""), this);
+        }
+        if (m >= CHAIN_LENGTH) {
+            synchronized (LOCK) {
+                LOCK.notifyAll();
+            }
+        }
+    }
+
+    public static void run() throws Exception {
+        SystemClipboardOwner cbo1 = new SystemClipboardOwner(0);
+        System.err.println(cbo1.m + " Clipboard.setContents(): " + cbo1.m);
+        setClipboardContents(clipboard, new StringSelection(cbo1.m + ""),
+                cbo1);
+
+        ProcessBuilder pb = ProcessTools
+                .createTestJavaProcessBuilder(SystemClipboardOwner.class.getName());
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        if (cbo1.m < CHAIN_LENGTH) {
+            System.err.println("chain of calls of lostOwnership() broken!");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        SystemClipboardOwner cbo2 = new SystemClipboardOwner(1);
+        System.err.println(cbo2.m + " Clipboard.setContents(): " + cbo2.m);
+
+        synchronized (LOCK) {
+            setClipboardContents(clipboard, new StringSelection(cbo2.m + ""),
+                cbo2);
+            LOCK.wait();
+        }
+    }
+
+
+    private static void setClipboardContents(Clipboard cb,
+                                             Transferable contents,
+                                             ClipboardOwner owner) {
+        synchronized (cb) {
+            boolean set = false;
+            while (!set) {
+                try {
+                    cb.setContents(contents, owner);
+                    set = true;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+
+    private static Transferable getClipboardContents(Clipboard cb,
+                                                     Object requestor) {
+        synchronized (cb) {
+            while (true) {
+                try {
+                    Transferable t = cb.getContents(requestor);
+                    return t;
+                } catch (IllegalStateException ise) {
+                    try { Thread.sleep(100); }
+                    catch (InterruptedException e) { e.printStackTrace(); }
+                }
+            }
+        }
+    }
+}

From bbec3c0730df4578cee5cbc9dab40810ff093966 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 24 Apr 2025 00:00:36 +0000
Subject: [PATCH 101/901] 8354558: -XX:AOTMode=record crashes with boot loader
 package-info class

Reviewed-by: ccheung, matsaave
---
 src/hotspot/share/classfile/classLoader.cpp   | 20 +++--
 .../cds/appcds/aotCache/PackageInfoClass.java | 73 +++++++++++++++++++
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |  2 +-
 .../jdk/test/lib/cds/SimpleCDSAppTester.java  | 33 +++++++--
 4 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/PackageInfoClass.java

diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index a7d6cc39614..d7660647fb2 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1219,6 +1219,7 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
     // must be valid since the class has been successfully parsed.
     const char* path = ClassLoader::uri_to_path(src);
     assert(path != nullptr, "sanity");
+    bool found_invalid = false;
     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.
@@ -1242,10 +1243,15 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
             classpath_index = i;
           } else {
             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;
+              if (loader != nullptr) {
+                // Probably loaded by jdk/internal/loader/ClassLoaders$BootClassLoader. Don't archive
+                // such classes.
+                ik->set_shared_classpath_index(-1);
+                ik->set_shared_class_loader_type(ClassLoader::BOOT_LOADER);
+                found_invalid = true;
+              } else {
+                classpath_index = i;
+              }
             }
           }
         } else {
@@ -1256,13 +1262,17 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
           }
         }
       }
-      if (classpath_index >= 0) {
+      if (classpath_index >= 0 || found_invalid) {
         return false; // quit iterating
       } else {
         return true; // Keep iterating
       }
     });
 
+    if (found_invalid) {
+      return;
+    }
+
     // No path entry found for this class: most likely a shared class loaded by the
     // user defined classloader.
     if (classpath_index < 0 && !SystemDictionaryShared::is_builtin_loader(ik->class_loader_data())) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/PackageInfoClass.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/PackageInfoClass.java
new file mode 100644
index 00000000000..0fff74236f1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/PackageInfoClass.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.
+ *
+ */
+
+/*
+ * @test
+ * @summary AOT cache handling for package-info class loaded by jdk/internal/loader/ClassLoaders$BootClassLoader
+ * @bug 8354558
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/jdk/java/lang/Package/bootclasspath/boot
+ * @build PackageInfoClass foo.Foo foo.MyAnnotation foo.package-info
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar foo.Foo foo.package-info foo.MyAnnotation
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar PackageInfoClassApp
+ * @run driver PackageInfoClass AOT
+ */
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import jdk.test.lib.cds.CDSAppTester.RunMode;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class PackageInfoClass {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("PackageInfoClass")
+            .classpath("app.jar")
+            .addVmArgs("-Xbootclasspath/a:boot.jar")
+            .appCommandLine("PackageInfoClassApp")
+            .setAssemblyChecker((OutputAnalyzer out, RunMode runMode) -> {
+                    if (runMode == RunMode.TRAINING) {
+                        out.shouldContain("Skipping foo/package-info: Unsupported location");
+                    }
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class PackageInfoClassApp {
+    public static void main(String[] args) throws Exception {
+        // This code is taken from test/jdk/java/lang/Package/bootclasspath/GetPackageFromBootClassPath.java
+        Class<?> c = Class.forName("foo.Foo", false, null);
+        Package p = c.getPackage();
+        Annotation[] annotations = p.getAnnotations();
+        Class<?> annType = Class.forName("foo.MyAnnotation", false, null);
+        if (annotations.length != 1 ||
+            annotations[0].annotationType() != annType) {
+            throw new RuntimeException("Expected foo.MyAnnotation but got " +
+                Arrays.toString(annotations));
+        }
+    }
+}
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index f08cbf0e7e2..6ebf73f5f08 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -86,7 +86,7 @@ private enum Workflow {
     }
 
     public enum RunMode {
-        TRAINING,       // -XX:DumpLoadedClassList OR {-XX:AOTMode=create -XX:AOTConfiguration}
+        TRAINING,       // -XX:DumpLoadedClassList OR {-XX:AOTMode=record -XX:AOTConfiguration}
         DUMP_STATIC,    // -Xshare:dump
         DUMP_DYNAMIC,   // -XX:ArchiveClassesArExit
         ASSEMBLY,       // JEP 483 (assembly phase, app logic not executed)
diff --git a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
index 33d984ed505..16666676a2f 100644
--- a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
@@ -24,11 +24,13 @@
 package jdk.test.lib.cds;
 
 import java.io.File;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+import jdk.test.lib.cds.CDSAppTester.RunMode;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.StringArrayUtils;
 
-import java.util.function.Consumer;
-
 /*
  * A simpler way to use CDSAppTester. Example:
  *
@@ -49,8 +51,8 @@
  */
 public class SimpleCDSAppTester {
     private String name;
-    private Consumer<OutputAnalyzer> assemblyChecker;
-    private Consumer<OutputAnalyzer> productionChecker;
+    private BiConsumer<OutputAnalyzer, RunMode> assemblyChecker;
+    private BiConsumer<OutputAnalyzer, RunMode> productionChecker;
     private String classpath;
     private String modulepath;
     private String[] appCommandLine;
@@ -98,16 +100,31 @@ public SimpleCDSAppTester appCommandLine(String... args) {
         return this;
     }
 
-    public SimpleCDSAppTester setAssemblyChecker(Consumer<OutputAnalyzer> checker) {
+    public SimpleCDSAppTester setAssemblyChecker(BiConsumer<OutputAnalyzer, RunMode> checker) {
         this.assemblyChecker = checker;
         return this;
     }
 
-    public SimpleCDSAppTester setProductionChecker(Consumer<OutputAnalyzer> checker) {
+    public SimpleCDSAppTester setProductionChecker(BiConsumer<OutputAnalyzer, RunMode> checker) {
         this.productionChecker = checker;
         return this;
     }
 
+
+    public SimpleCDSAppTester setAssemblyChecker(Consumer<OutputAnalyzer> checker) {
+        this.assemblyChecker = (OutputAnalyzer out, RunMode runMode) -> {
+            checker.accept(out);
+        };
+        return this;
+    }
+
+    public SimpleCDSAppTester setProductionChecker(Consumer<OutputAnalyzer> checker) {
+        this.productionChecker = (OutputAnalyzer out, RunMode runMode) -> {
+            checker.accept(out);
+        };
+        return this;
+    }
+
     class Tester extends CDSAppTester {
         public Tester(String name) {
             super(name);
@@ -137,11 +154,11 @@ public String[] appCommandLine(RunMode runMode) {
         public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
             if (isDumping(runMode) && runMode != RunMode.TRAINING) {
                 if (assemblyChecker != null) {
-                    assemblyChecker.accept(out);
+                    assemblyChecker.accept(out, runMode);
                 }
             } else if (runMode.isProductionRun()) {
                 if (productionChecker != null) {
-                    productionChecker.accept(out);
+                    productionChecker.accept(out, runMode);
                 }
             }
         }

From 428334b616e1c436fbc2b8d71e41a0b154e9da12 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Thu, 24 Apr 2025 01:09:17 +0000
Subject: [PATCH 102/901] 8353216: Improve VerifyMethodHandles for method
 handle linkers

Reviewed-by: dlong
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  2 +-
 .../cpu/aarch64/methodHandles_aarch64.cpp     | 55 ++++++++++++++++--
 .../cpu/aarch64/methodHandles_aarch64.hpp     |  4 +-
 src/hotspot/cpu/x86/methodHandles_x86.cpp     | 58 +++++++++++++++++--
 src/hotspot/cpu/x86/methodHandles_x86.hpp     |  4 +-
 5 files changed, 109 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 9a4b8e243a9..f231caeba9f 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -2041,7 +2041,7 @@ void MacroAssembler::clinit_barrier(Register klass, Register scratch, Label* L_f
   // Fast path check: class is fully initialized
   lea(scratch, Address(klass, InstanceKlass::init_state_offset()));
   ldarb(scratch, scratch);
-  subs(zr, scratch, InstanceKlass::fully_initialized);
+  cmp(scratch, InstanceKlass::fully_initialized);
   br(Assembler::EQ, *L_fast_path);
 
   // Fast path check: current thread is initializer thread
diff --git a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
index 588b8898d2d..cdf67e3423f 100644
--- a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
@@ -93,14 +93,60 @@ void MethodHandles::verify_klass(MacroAssembler* _masm,
 
 void MethodHandles::verify_ref_kind(MacroAssembler* _masm, int ref_kind, Register member_reg, Register temp) {  }
 
+void MethodHandles::verify_method(MacroAssembler* _masm, Register method, vmIntrinsics::ID iid) {
+  BLOCK_COMMENT("verify_method {");
+  __ verify_method_ptr(method);
+  if (VerifyMethodHandles) {
+    Label L_ok;
+    assert_different_registers(method, rscratch1, rscratch2);
+    const Register method_holder = rscratch1;
+    __ load_method_holder(method_holder, method);
+
+    switch (iid) {
+      case vmIntrinsicID::_invokeBasic:
+        // Require compiled LambdaForm class to be fully initialized.
+        __ lea(rscratch2, Address(method_holder, InstanceKlass::init_state_offset()));
+        __ ldarb(rscratch2, rscratch2);
+        __ cmp(rscratch2, InstanceKlass::fully_initialized);
+        __ br(Assembler::EQ, L_ok);
+        break;
+
+      case vmIntrinsicID::_linkToStatic:
+        __ clinit_barrier(method_holder, rscratch2, &L_ok);
+        break;
+
+      case vmIntrinsicID::_linkToVirtual:
+      case vmIntrinsicID::_linkToSpecial:
+      case vmIntrinsicID::_linkToInterface:
+        // Class initialization check is too strong here. Just ensure that class initialization has been initiated.
+        __ lea(rscratch2, Address(method_holder, InstanceKlass::init_state_offset()));
+        __ ldarb(rscratch2, rscratch2);
+        __ cmp(rscratch2, InstanceKlass::being_initialized);
+        __ br(Assembler::GE, L_ok);
+
+        // init_state check failed, but it may be an abstract interface method
+        __ ldrh(rscratch2, Address(method, Method::access_flags_offset()));
+        __ tbnz(rscratch2, exact_log2(JVM_ACC_ABSTRACT), L_ok);
+        break;
+
+      default:
+        fatal("unexpected intrinsic %d: %s", vmIntrinsics::as_int(iid), vmIntrinsics::name_at(iid));
+    }
+
+    // Method holder init state check failed for a concrete method.
+    __ stop("Method holder klass is not initialized");
+    __ bind(L_ok);
+  }
+  BLOCK_COMMENT("} verify_method");
+}
 #endif //ASSERT
 
 void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
-                                            bool for_compiler_entry) {
+                                            bool for_compiler_entry, vmIntrinsics::ID iid) {
   assert(method == rmethod, "interpreter calling convention");
   Label L_no_such_method;
   __ cbz(rmethod, L_no_such_method);
-  __ verify_method_ptr(method);
+  verify_method(_masm, method, iid);
 
   if (!for_compiler_entry && JvmtiExport::can_post_interpreter_events()) {
     Label run_compiled_code;
@@ -160,7 +206,7 @@ void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
     __ BIND(L);
   }
 
-  jump_from_method_handle(_masm, method_temp, temp2, for_compiler_entry);
+  jump_from_method_handle(_masm, method_temp, temp2, for_compiler_entry, vmIntrinsics::_invokeBasic);
   BLOCK_COMMENT("} jump_to_lambda_form");
 }
 
@@ -447,8 +493,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
     // After figuring out which concrete method to call, jump into it.
     // Note that this works in the interpreter with no data motion.
     // But the compiled version will require that r2_recv be shifted out.
-    __ verify_method_ptr(rmethod);
-    jump_from_method_handle(_masm, rmethod, temp1, for_compiler_entry);
+    jump_from_method_handle(_masm, rmethod, temp1, for_compiler_entry, iid);
     if (iid == vmIntrinsics::_linkToInterface) {
       __ bind(L_incompatible_class_change_error);
       __ far_jump(RuntimeAddress(SharedRuntime::throw_IncompatibleClassChangeError_entry()));
diff --git a/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
index bd36f3e84c2..e82f4d6237e 100644
--- a/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/methodHandles_aarch64.hpp
@@ -39,6 +39,8 @@ enum /* platform_dependent_constants */ {
                            Register obj, vmClassID klass_id,
                            const char* error_message = "wrong klass") NOT_DEBUG_RETURN;
 
+  static void verify_method(MacroAssembler* _masm, Register method, vmIntrinsics::ID iid) NOT_DEBUG_RETURN;
+
   static void verify_method_handle(MacroAssembler* _masm, Register mh_reg) {
     verify_klass(_masm, mh_reg, VM_CLASS_ID(java_lang_invoke_MethodHandle),
                  "reference is a MH");
@@ -49,7 +51,7 @@ enum /* platform_dependent_constants */ {
   // Similar to InterpreterMacroAssembler::jump_from_interpreted.
   // Takes care of special dispatch from single stepping too.
   static void jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
-                                      bool for_compiler_entry);
+                                      bool for_compiler_entry, vmIntrinsics::ID iid);
 
   static void jump_to_lambda_form(MacroAssembler* _masm,
                                   Register recv, Register method_temp,
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.cpp b/src/hotspot/cpu/x86/methodHandles_x86.cpp
index ee4dc26ae40..f3683e7d09c 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.cpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.cpp
@@ -122,17 +122,64 @@ void MethodHandles::verify_ref_kind(MacroAssembler* _masm, int ref_kind, Registe
   __ bind(L);
 }
 
-#endif //ASSERT
+void MethodHandles::verify_method(MacroAssembler* _masm, Register method, Register temp, vmIntrinsics::ID iid) {
+  BLOCK_COMMENT("verify_method {");
+  __ verify_method_ptr(method);
+  if (VerifyMethodHandles) {
+    Label L_ok;
+    assert_different_registers(method, temp);
+
+    const Register method_holder = temp;
+    __ load_method_holder(method_holder, method);
+    __ push(method_holder); // keep holder around for diagnostic purposes
+
+    switch (iid) {
+      case vmIntrinsicID::_invokeBasic:
+        // Require compiled LambdaForm class to be fully initialized.
+        __ cmpb(Address(method_holder, InstanceKlass::init_state_offset()), InstanceKlass::fully_initialized);
+        __ jccb(Assembler::equal, L_ok);
+        break;
+
+      case vmIntrinsicID::_linkToStatic:
+        __ clinit_barrier(method_holder, &L_ok);
+        break;
+
+      case vmIntrinsicID::_linkToVirtual:
+      case vmIntrinsicID::_linkToSpecial:
+      case vmIntrinsicID::_linkToInterface:
+        // Class initialization check is too strong here. Just ensure that initialization has been initiated.
+        __ cmpb(Address(method_holder, InstanceKlass::init_state_offset()), InstanceKlass::being_initialized);
+        __ jcc(Assembler::greaterEqual, L_ok);
+
+        // init_state check failed, but it may be an abstract interface method
+        __ load_unsigned_short(temp, Address(method, Method::access_flags_offset()));
+        __ testl(temp, JVM_ACC_ABSTRACT);
+        __ jccb(Assembler::notZero, L_ok);
+        break;
+
+      default:
+        fatal("unexpected intrinsic %d: %s", vmIntrinsics::as_int(iid), vmIntrinsics::name_at(iid));
+    }
+
+    // clinit check failed for a concrete method
+    __ STOP("Method holder klass is not initialized");
+
+    __ BIND(L_ok);
+    __ pop(method_holder); // restore stack layout
+  }
+  BLOCK_COMMENT("} verify_method");
+}
+#endif // ASSERT
 
 void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
-                                            bool for_compiler_entry) {
+                                            bool for_compiler_entry, vmIntrinsics::ID iid) {
   assert(method == rbx, "interpreter calling convention");
 
    Label L_no_such_method;
    __ testptr(rbx, rbx);
    __ jcc(Assembler::zero, L_no_such_method);
 
-  __ verify_method_ptr(method);
+  verify_method(_masm, method, temp, iid);
 
   if (!for_compiler_entry && JvmtiExport::can_post_interpreter_events()) {
     Label run_compiled_code;
@@ -193,7 +240,7 @@ void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm,
     __ BIND(L);
   }
 
-  jump_from_method_handle(_masm, method_temp, temp2, for_compiler_entry);
+  jump_from_method_handle(_masm, method_temp, temp2, for_compiler_entry, vmIntrinsics::_invokeBasic);
   BLOCK_COMMENT("} jump_to_lambda_form");
 }
 
@@ -485,8 +532,7 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
     // After figuring out which concrete method to call, jump into it.
     // Note that this works in the interpreter with no data motion.
     // But the compiled version will require that rcx_recv be shifted out.
-    __ verify_method_ptr(rbx_method);
-    jump_from_method_handle(_masm, rbx_method, temp1, for_compiler_entry);
+    jump_from_method_handle(_masm, rbx_method, temp1, for_compiler_entry, iid);
 
     if (iid == vmIntrinsics::_linkToInterface) {
       __ bind(L_incompatible_class_change_error);
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.hpp b/src/hotspot/cpu/x86/methodHandles_x86.hpp
index 9ffe5e198ac..6ba9b5f6a4f 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.hpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.hpp
@@ -38,6 +38,8 @@ enum /* platform_dependent_constants */ {
                            Register obj, vmClassID klass_id,
                            const char* error_message = "wrong klass") NOT_DEBUG_RETURN;
 
+  static void verify_method(MacroAssembler* _masm, Register method, Register temp, vmIntrinsics::ID iid) NOT_DEBUG_RETURN;
+
   static void verify_method_handle(MacroAssembler* _masm, Register mh_reg) {
     verify_klass(_masm, mh_reg, VM_CLASS_ID(MethodHandle_klass),
                  "reference is a MH");
@@ -48,7 +50,7 @@ enum /* platform_dependent_constants */ {
   // Similar to InterpreterMacroAssembler::jump_from_interpreted.
   // Takes care of special dispatch from single stepping too.
   static void jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp,
-                                      bool for_compiler_entry);
+                                      bool for_compiler_entry, vmIntrinsics::ID iid);
 
   static void jump_to_lambda_form(MacroAssembler* _masm,
                                   Register recv, Register method_temp,

From 188c236071fd573a9ef35c34126443c6982a4f53 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 24 Apr 2025 06:58:21 +0000
Subject: [PATCH 103/901] 8353558: x86: Use better instructions for ICache sync
 when available

Reviewed-by: kvn, adinn
---
 src/hotspot/cpu/aarch64/icache_aarch64.cpp    |  2 +-
 src/hotspot/cpu/x86/assembler_x86.cpp         |  5 +
 src/hotspot/cpu/x86/assembler_x86.hpp         |  3 +
 src/hotspot/cpu/x86/globals_x86.hpp           |  9 ++
 src/hotspot/cpu/x86/icache_x86.cpp            | 94 +++++++++++++++----
 src/hotspot/cpu/x86/icache_x86.hpp            | 10 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp        | 24 +++++
 src/hotspot/cpu/zero/icache_zero.hpp          |  2 +-
 .../os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp |  2 +-
 .../linux_aarch64/icache_linux_aarch64.hpp    |  2 +-
 .../icache_windows_aarch64.hpp                |  2 +-
 .../share/runtime/flags/flagSetting.hpp       |  1 +
 src/hotspot/share/runtime/icache.cpp          | 27 +++++-
 src/hotspot/share/runtime/icache.hpp          | 13 ++-
 src/hotspot/share/runtime/init.cpp            |  2 +
 test/hotspot/gtest/runtime/test_icache.cpp    | 71 ++++++++++++++
 16 files changed, 232 insertions(+), 37 deletions(-)
 create mode 100644 test/hotspot/gtest/runtime/test_icache.cpp

diff --git a/src/hotspot/cpu/aarch64/icache_aarch64.cpp b/src/hotspot/cpu/aarch64/icache_aarch64.cpp
index 311f3a7de1f..a942406f45e 100644
--- a/src/hotspot/cpu/aarch64/icache_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/icache_aarch64.cpp
@@ -31,4 +31,4 @@ void ICacheStubGenerator::generate_icache_flush(
   *flush_icache_stub = nullptr;
 }
 
-void ICache::initialize() {}
+void ICache::initialize(int phase) {}
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 6853af9e746..3ea00681ada 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -2010,6 +2010,11 @@ void Assembler::cpuid() {
   emit_int16(0x0F, (unsigned char)0xA2);
 }
 
+void Assembler::serialize() {
+  assert(VM_Version::supports_serialize(), "");
+  emit_int24(0x0F, 0x01, 0xE8);
+}
+
 // Opcode / Instruction                      Op /  En  64 - Bit Mode     Compat / Leg Mode Description                  Implemented
 // F2 0F 38 F0 / r       CRC32 r32, r / m8   RM        Valid             Valid             Accumulate CRC32 on r / m8.  v
 // F2 REX 0F 38 F0 / r   CRC32 r32, r / m8*  RM        Valid             N.E.              Accumulate CRC32 on r / m8.  -
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 6395be02f27..719334701a5 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1232,6 +1232,9 @@ class Assembler : public AbstractAssembler  {
   // Identify processor type and features
   void cpuid();
 
+  // Serialize instruction stream
+  void serialize();
+
   // CRC32C
   void crc32(Register crc, Register v, int8_t sizeInBytes);
   void crc32(Register crc, Address adr, int8_t sizeInBytes);
diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
index 54888a9f849..5b5f5683961 100644
--- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -191,6 +191,15 @@ define_pd_global(intx, InitArrayShortSize, 8*BytesPerLong);
   product(bool, IntelJccErratumMitigation, true, DIAGNOSTIC,                \
              "Turn off JVM mitigations related to Intel micro code "        \
              "mitigations for the Intel JCC erratum")                       \
+                                                                            \
+  product(int, X86ICacheSync, -1, DIAGNOSTIC,                               \
+             "Select the X86 ICache sync mechanism: -1 = auto-select; "     \
+             "0 = none (dangerous); 1 = CLFLUSH loop; 2 = CLFLUSHOPT loop; "\
+             "3 = CLWB loop; 4 = single CPUID; 5 = single SERIALIZE. "      \
+             "Explicitly selected mechanism will fail at startup if "       \
+             "hardware does not support it.")                               \
+             range(-1, 5)                                                   \
+                                                                            \
 // end of ARCH_FLAGS
 
 #endif // CPU_X86_GLOBALS_X86_HPP
diff --git a/src/hotspot/cpu/x86/icache_x86.cpp b/src/hotspot/cpu/x86/icache_x86.cpp
index 45679332eca..889cfb32931 100644
--- a/src/hotspot/cpu/x86/icache_x86.cpp
+++ b/src/hotspot/cpu/x86/icache_x86.cpp
@@ -23,15 +23,63 @@
  */
 
 #include "asm/macroAssembler.hpp"
+#include "runtime/flags/flagSetting.hpp"
+#include "runtime/globals_extension.hpp"
 #include "runtime/icache.hpp"
 
 #define __ _masm->
 
+void x86_generate_icache_fence(MacroAssembler* _masm) {
+  switch (X86ICacheSync) {
+    case 0:
+      break;
+    case 1:
+      __ mfence();
+      break;
+    case 2:
+    case 3:
+      __ sfence();
+      break;
+    case 4:
+      __ push(rax);
+      __ push(rbx);
+      __ push(rcx);
+      __ push(rdx);
+      __ xorptr(rax, rax);
+      __ cpuid();
+      __ pop(rdx);
+      __ pop(rcx);
+      __ pop(rbx);
+      __ pop(rax);
+      break;
+    case 5:
+      __ serialize();
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+void x86_generate_icache_flush_insn(MacroAssembler* _masm, Register addr) {
+  switch (X86ICacheSync) {
+    case 1:
+      __ clflush(Address(addr, 0));
+      break;
+    case 2:
+      __ clflushopt(Address(addr, 0));
+      break;
+    case 3:
+      __ clwb(Address(addr, 0));
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
 void ICacheStubGenerator::generate_icache_flush(ICache::flush_icache_stub_t* flush_icache_stub) {
-  StubCodeMark mark(this, "ICache", "flush_icache_stub");
+  StubCodeMark mark(this, "ICache", _stub_name);
 
   address start = __ pc();
-#ifdef AMD64
 
   const Register addr  = c_rarg0;
   const Register lines = c_rarg1;
@@ -40,26 +88,22 @@ void ICacheStubGenerator::generate_icache_flush(ICache::flush_icache_stub_t* flu
   Label flush_line, done;
 
   __ testl(lines, lines);
-  __ jcc(Assembler::zero, done);
+  __ jccb(Assembler::zero, done);
 
-  // Force ordering wrt cflush.
-  // Other fence and sync instructions won't do the job.
-  __ mfence();
+  x86_generate_icache_fence(_masm);
 
-  __ bind(flush_line);
-  __ clflush(Address(addr, 0));
-  __ addptr(addr, ICache::line_size);
-  __ decrementl(lines);
-  __ jcc(Assembler::notZero, flush_line);
+  if (1 <= X86ICacheSync && X86ICacheSync <= 3) {
+    __ bind(flush_line);
+    x86_generate_icache_flush_insn(_masm, addr);
+    __ addptr(addr, ICache::line_size);
+    __ decrementl(lines);
+    __ jccb(Assembler::notZero, flush_line);
 
-  __ mfence();
+    x86_generate_icache_fence(_masm);
+  }
 
   __ bind(done);
 
-#else
-  const Address magic(rsp, 3*wordSize);
-  __ lock(); __ addl(Address(rsp, 0), 0);
-#endif // AMD64
   __ movptr(rax, magic); // Handshake with caller to make sure it happened!
   __ ret(0);
 
@@ -67,4 +111,22 @@ void ICacheStubGenerator::generate_icache_flush(ICache::flush_icache_stub_t* flu
   *flush_icache_stub = (ICache::flush_icache_stub_t)start;
 }
 
+void ICache::initialize(int phase) {
+  switch (phase) {
+    case 1: {
+      // Initial phase, we assume only CLFLUSH is available.
+      IntFlagSetting fs(X86ICacheSync, 1);
+      AbstractICache::initialize(phase);
+      break;
+    }
+    case 2: {
+      // Final phase, generate the stub again.
+      AbstractICache::initialize(phase);
+      break;
+    }
+    default:
+      ShouldNotReachHere();
+  }
+}
+
 #undef __
diff --git a/src/hotspot/cpu/x86/icache_x86.hpp b/src/hotspot/cpu/x86/icache_x86.hpp
index 48286a7e3b3..805022fbb32 100644
--- a/src/hotspot/cpu/x86/icache_x86.hpp
+++ b/src/hotspot/cpu/x86/icache_x86.hpp
@@ -40,21 +40,13 @@
 
 class ICache : public AbstractICache {
  public:
-#ifdef AMD64
   enum {
     stub_size      = 64, // Size of the icache flush stub in bytes
     line_size      = 64, // Icache line size in bytes
     log2_line_size = 6   // log2(line_size)
   };
 
-  // Use default implementation
-#else
-  enum {
-    stub_size      = 16,                 // Size of the icache flush stub in bytes
-    line_size      = BytesPerWord,      // conservative
-    log2_line_size = LogBytesPerWord    // log2(line_size)
-  };
-#endif // AMD64
+  static void initialize(int phase);
 };
 
 #endif // CPU_X86_ICACHE_X86_HPP
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 32e6e33d133..19ae2dc8d2b 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1089,6 +1089,30 @@ void VM_Version::get_processor_features() {
     _has_intel_jcc_erratum = IntelJccErratumMitigation;
   }
 
+  assert(supports_cpuid(), "Always present");
+  assert(supports_clflush(), "Always present");
+  if (X86ICacheSync == -1) {
+    // Auto-detect, choosing the best performant one that still flushes
+    // the cache. We could switch to CPUID/SERIALIZE ("4"/"5") going forward.
+    if (supports_clwb()) {
+      FLAG_SET_ERGO(X86ICacheSync, 3);
+    } else if (supports_clflushopt()) {
+      FLAG_SET_ERGO(X86ICacheSync, 2);
+    } else {
+      FLAG_SET_ERGO(X86ICacheSync, 1);
+    }
+  } else {
+    if ((X86ICacheSync == 2) && !supports_clflushopt()) {
+      vm_exit_during_initialization("CPU does not support CLFLUSHOPT, unable to use X86ICacheSync=2");
+    }
+    if ((X86ICacheSync == 3) && !supports_clwb()) {
+      vm_exit_during_initialization("CPU does not support CLWB, unable to use X86ICacheSync=3");
+    }
+    if ((X86ICacheSync == 5) && !supports_serialize()) {
+      vm_exit_during_initialization("CPU does not support SERIALIZE, unable to use X86ICacheSync=5");
+    }
+  }
+
   char buf[1024];
   int res = jio_snprintf(
               buf, sizeof(buf),
diff --git a/src/hotspot/cpu/zero/icache_zero.hpp b/src/hotspot/cpu/zero/icache_zero.hpp
index b40e07d5e3b..781021a2b20 100644
--- a/src/hotspot/cpu/zero/icache_zero.hpp
+++ b/src/hotspot/cpu/zero/icache_zero.hpp
@@ -33,7 +33,7 @@
 
 class ICache : public AbstractICache {
  public:
-  static void initialize() {}
+  static void initialize(int phase) {}
   static void invalidate_word(address addr) {}
   static void invalidate_range(address start, int nbytes) {}
 };
diff --git a/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
index 7e9ca43efcf..8b942730ae2 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/icache_bsd_aarch64.hpp
@@ -33,7 +33,7 @@
 
 class ICache : public AbstractICache {
  public:
-  static void initialize();
+  static void initialize(int phase);
   static void invalidate_word(address addr) {
     __clear_cache((char *)addr, (char *)(addr + 4));
   }
diff --git a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
index 75ca68e43fb..957be266702 100644
--- a/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/icache_linux_aarch64.hpp
@@ -32,7 +32,7 @@
 
 class ICache : public AbstractICache {
  public:
-  static void initialize();
+  static void initialize(int phase);
   static void invalidate_word(address addr) {
     __builtin___clear_cache((char *)addr, (char *)(addr + 4));
   }
diff --git a/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
index bf36b77d98e..e12caebf0e2 100644
--- a/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/icache_windows_aarch64.hpp
@@ -32,7 +32,7 @@
 
 class ICache : public AbstractICache {
  public:
-  static void initialize();
+  static void initialize(int phase);
   static void invalidate_word(address addr) {
     invalidate_range(addr, 4);
   }
diff --git a/src/hotspot/share/runtime/flags/flagSetting.hpp b/src/hotspot/share/runtime/flags/flagSetting.hpp
index 6611081235e..0f75636621a 100644
--- a/src/hotspot/share/runtime/flags/flagSetting.hpp
+++ b/src/hotspot/share/runtime/flags/flagSetting.hpp
@@ -40,6 +40,7 @@
 
 typedef AutoModifyRestore<bool> FlagSetting;
 typedef AutoModifyRestore<uint> UIntFlagSetting;
+typedef AutoModifyRestore<int>  IntFlagSetting;
 
 // Legacy use of FLAG_GUARD. Retained in the code to help identify use-cases
 // that should be addressed when this file is removed.
diff --git a/src/hotspot/share/runtime/icache.cpp b/src/hotspot/share/runtime/icache.cpp
index 4f5006963ab..34d5a7e055b 100644
--- a/src/hotspot/share/runtime/icache.cpp
+++ b/src/hotspot/share/runtime/icache.cpp
@@ -25,22 +25,35 @@
 #include "code/codeBlob.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/icache.hpp"
+#include "runtime/java.hpp"
 #include "utilities/align.hpp"
 
 // The flush stub function address
 AbstractICache::flush_icache_stub_t AbstractICache::_flush_icache_stub = nullptr;
 
-void AbstractICache::initialize() {
+void AbstractICache::initialize(int phase) {
   // Making this stub must be FIRST use of assembler
   ResourceMark rm;
 
-  BufferBlob* b = BufferBlob::create("flush_icache_stub", ICache::stub_size);
+  const char* stub_name = nullptr;
+  switch (phase) {
+    case 1:
+      stub_name = "flush_icache_initial_stub";
+      break;
+    case 2:
+      stub_name = "flush_icache_final_stub";
+      break;
+    default:
+      ShouldNotReachHere();
+  }
+
+  BufferBlob* b = BufferBlob::create(stub_name, ICache::stub_size);
   if (b == nullptr) {
-    vm_exit_out_of_memory(ICache::stub_size, OOM_MALLOC_ERROR, "CodeCache: no space for flush_icache_stub");
+    vm_exit_out_of_memory(ICache::stub_size, OOM_MALLOC_ERROR, "CodeCache: no space for %s", stub_name);
   }
   CodeBuffer c(b);
 
-  ICacheStubGenerator g(&c);
+  ICacheStubGenerator g(stub_name, &c);
   g.generate_icache_flush(&_flush_icache_stub);
 
   // The first use of flush_icache_stub must apply it to itself.
@@ -106,5 +119,9 @@ void AbstractICache::invalidate_range(address start, int nbytes) {
 
 // For init.cpp
 void icache_init() {
-  ICache::initialize();
+  ICache::initialize(1);
+}
+
+void icache_init2() {
+  ICache::initialize(2);
 }
diff --git a/src/hotspot/share/runtime/icache.hpp b/src/hotspot/share/runtime/icache.hpp
index d273372a877..e442c4d88e0 100644
--- a/src/hotspot/share/runtime/icache.hpp
+++ b/src/hotspot/share/runtime/icache.hpp
@@ -60,7 +60,13 @@ class AbstractICache : AllStatic {
     log2_line_size = 0  // log2(line_size)
   };
 
-  static void initialize();
+  // Initialization phases:
+  //  1 = Initial phase, nothing is known about the machine features.
+  //      The stub generated at this phase must use the most basic mechanism,
+  //      until optimized final stub is generated.
+  //  2 = Final stub that uses the optimized flush mechanism. Happens after
+  //      CPU feature detection determines which mechanism is usable.
+  static void initialize(int phase);
   static void invalidate_word(address addr);
   static void invalidate_range(address start, int nbytes);
 };
@@ -72,8 +78,11 @@ class AbstractICache : AllStatic {
 #include CPU_HEADER(icache)
 
 class ICacheStubGenerator : public StubCodeGenerator {
+ private:
+   const char* _stub_name;
+
  public:
-  ICacheStubGenerator(CodeBuffer *c) : StubCodeGenerator(c) {}
+  ICacheStubGenerator(const char* stub_name, CodeBuffer *c) : StubCodeGenerator(c), _stub_name(stub_name) {}
 
   // Generate the icache flush stub.
   //
diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp
index 417bba6c3fa..3756cdd4fd2 100644
--- a/src/hotspot/share/runtime/init.cpp
+++ b/src/hotspot/share/runtime/init.cpp
@@ -65,6 +65,7 @@ void classLoader_init1();
 void compilationPolicy_init();
 void codeCache_init();
 void VM_Version_init();
+void icache_init2();
 void initial_stubs_init();
 
 jint universe_init();           // depends on codeCache_init and initial_stubs_init
@@ -125,6 +126,7 @@ jint init_globals() {
   compilationPolicy_init();
   codeCache_init();
   VM_Version_init();              // depends on codeCache_init for emitting code
+  icache_init2();                 // depends on VM_Version for choosing the mechanism
   // stub routines in initial blob are referenced by later generated code
   initial_stubs_init();
   // stack overflow exception blob is referenced by the interpreter
diff --git a/test/hotspot/gtest/runtime/test_icache.cpp b/test/hotspot/gtest/runtime/test_icache.cpp
new file mode 100644
index 00000000000..cfc5d6c8c2c
--- /dev/null
+++ b/test/hotspot/gtest/runtime/test_icache.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "runtime/icache.hpp"
+#include "runtime/os.hpp"
+#include "testutils.hpp"
+#include "unittest.hpp"
+
+TEST_VM(ICacheTest, flush_perf) {
+  // Warmup infra a little.
+  {
+    address p = (address)os::malloc(1024, mtTest);
+    ICache::invalidate_range(p, 1024);
+    os::free(p);
+  }
+
+  const int ITERS = 1000;
+
+  for (int size = 256; size <= 256*1024; size *= 2) {
+    address p = (address)os::malloc(size, mtTest);
+    EXPECT_NOT_NULL(p);
+
+    jlong total_flush = 0;
+    jlong total_readback = 0;
+    for (int t = 0; t < ITERS; t++) {
+      // Force writes to mark cache lines modified.
+      memset(p, 1, size);
+
+      jlong time1 = os::javaTimeNanos();
+
+      // Flush the cache under the memory.
+      ICache::invalidate_range(p, size);
+
+      jlong time2 = os::javaTimeNanos();
+
+      // Read memory back.
+      EXPECT_NULL(memchr(p, 0, size));
+
+      jlong time3 = os::javaTimeNanos();
+
+      total_flush += time2 - time1;
+      total_readback += time3 - time2;
+    }
+
+    tty->print_cr("%10d bytes flushed in " JLONG_FORMAT_W(10) " ns, read back in " JLONG_FORMAT_W(10) " ns",
+                  size, total_flush / ITERS, total_readback / ITERS);
+
+    os::free(p);
+  }
+}

From 7bfbb9a51533f30613cacd47433ba709353ce3d5 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 24 Apr 2025 06:58:37 +0000
Subject: [PATCH 104/901] 8348928: Check for case label validity are
 misbehaving when binding patterns with unnamed bindings are present

Reviewed-by: asotona, abimpoudis, vromero
---
 .../com/sun/tools/javac/comp/Check.java       |  2 +-
 .../tools/javac/patterns/SwitchErrors.java    | 20 ++++++++++++++++++-
 .../tools/javac/patterns/SwitchErrors.out     |  4 +++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 10f0b222684..1faa77e88fd 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
@@ -4777,7 +4777,7 @@ boolean hasBindings(JCTree p) {
         new TreeScanner() {
             @Override
             public void visitBindingPattern(JCBindingPattern tree) {
-                bindings[0] = !tree.var.sym.isUnnamedVariable();
+                bindings[0] |= !tree.var.sym.isUnnamedVariable();
                 super.visitBindingPattern(tree);
             }
         }.scan(p);
diff --git a/test/langtools/tools/javac/patterns/SwitchErrors.java b/test/langtools/tools/javac/patterns/SwitchErrors.java
index 6f93dbb192a..607052be583 100644
--- a/test/langtools/tools/javac/patterns/SwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/SwitchErrors.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8262891 8269146 8269113
+ * @bug 8262891 8269146 8269113 8348928
  * @summary Verify errors related to pattern switches.
  * @compile/fail/ref=SwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW SwitchErrors.java
  */
@@ -307,4 +307,22 @@ void test8269301bb(Integer i) {
                 break;
         }
     }
+
+    void testPatternWithoutBindingCantOverridePatternWithBinding8348928a(Object o) {
+        record R(int i, String s) {}
+        switch (o) {
+            case Integer _, R(int x, String _) -> {}
+            default -> {}
+        }
+    }
+
+    void testPatternWithoutBindingCantOverridePatternWithBinding8348928b(Object o) {
+        record R(int i, String s) {}
+        switch (o) {
+            case Integer _:
+            case R(int x, String _):
+                break;
+            default:
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/patterns/SwitchErrors.out b/test/langtools/tools/javac/patterns/SwitchErrors.out
index 9eea96ee272..fa2038b29b6 100644
--- a/test/langtools/tools/javac/patterns/SwitchErrors.out
+++ b/test/langtools/tools/javac/patterns/SwitchErrors.out
@@ -57,6 +57,8 @@ SwitchErrors.java:276:49: compiler.err.cant.resolve.location.args: kindname.meth
 SwitchErrors.java:278:55: compiler.err.cant.resolve.location.args: kindname.method, length, , , (compiler.misc.location: kindname.class, java.lang.Object, null)
 SwitchErrors.java:284:26: compiler.err.pattern.type.cannot.infer
 SwitchErrors.java:299:21: compiler.err.invalid.case.label.combination
+SwitchErrors.java:314:29: compiler.err.flows.through.from.pattern
+SwitchErrors.java:323:18: compiler.err.flows.through.to.pattern
 SwitchErrors.java:10:9: compiler.err.not.exhaustive.statement
 SwitchErrors.java:16:9: compiler.err.not.exhaustive.statement
 SwitchErrors.java:22:9: compiler.err.not.exhaustive.statement
@@ -69,4 +71,4 @@ SwitchErrors.java:98:9: compiler.err.not.exhaustive.statement
 SwitchErrors.java:105:9: compiler.err.not.exhaustive.statement
 SwitchErrors.java:153:9: compiler.err.not.exhaustive.statement
 SwitchErrors.java:226:9: compiler.err.not.exhaustive.statement
-71 errors
+73 errors

From 953eef4f113408ab4ae432308f9848f7d226c619 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 24 Apr 2025 07:20:25 +0000
Subject: [PATCH 105/901] 8347337: ZGC: String dedups short-lived strings

Reviewed-by: kbarrett, aboldtch, eosterlund
---
 src/hotspot/share/gc/z/zForwarding.hpp        |  4 +-
 src/hotspot/share/gc/z/zMark.cpp              | 28 +---------
 src/hotspot/share/gc/z/zMarkContext.hpp       |  3 --
 .../share/gc/z/zMarkContext.inline.hpp        |  7 +--
 src/hotspot/share/gc/z/zRelocate.cpp          | 29 ++++++++---
 src/hotspot/share/gc/z/zStringDedup.hpp       | 39 ++++++++++++++
 .../share/gc/z/zStringDedup.inline.hpp        | 52 +++++++++++++++++++
 7 files changed, 118 insertions(+), 44 deletions(-)
 create mode 100644 src/hotspot/share/gc/z/zStringDedup.hpp
 create mode 100644 src/hotspot/share/gc/z/zStringDedup.inline.hpp

diff --git a/src/hotspot/share/gc/z/zForwarding.hpp b/src/hotspot/share/gc/z/zForwarding.hpp
index ee37508903f..c58c479984f 100644
--- a/src/hotspot/share/gc/z/zForwarding.hpp
+++ b/src/hotspot/share/gc/z/zForwarding.hpp
@@ -59,8 +59,8 @@ class ZForwarding {
   const size_t           _object_alignment_shift;
   const AttachedArray    _entries;
   ZPage* const           _page;
-  ZPageAge               _from_age;
-  ZPageAge               _to_age;
+  const ZPageAge         _from_age;
+  const ZPageAge         _to_age;
   volatile bool          _claimed;
   mutable ZConditionLock _ref_lock;
   volatile int32_t       _ref_count;
diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp
index e0c68213ca3..9846f1244ec 100644
--- a/src/hotspot/share/gc/z/zMark.cpp
+++ b/src/hotspot/share/gc/z/zMark.cpp
@@ -27,7 +27,6 @@
 #include "code/nmethod.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
-#include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/z/zAbort.inline.hpp"
@@ -389,25 +388,6 @@ void ZMark::follow_object(oop obj, bool finalizable) {
   }
 }
 
-static void try_deduplicate(ZMarkContext* context, oop obj) {
-  if (!StringDedup::is_enabled()) {
-    // Not enabled
-    return;
-  }
-
-  if (!java_lang_String::is_instance(obj)) {
-    // Not a String object
-    return;
-  }
-
-  if (java_lang_String::test_and_set_deduplication_requested(obj)) {
-    // Already requested deduplication
-    return;
-  }
-
-  // Request deduplication
-  context->string_dedup_requests()->add(obj);
-}
 
 void ZMark::mark_and_follow(ZMarkContext* context, ZMarkStackEntry entry) {
   // Decode flags
@@ -449,13 +429,7 @@ void ZMark::mark_and_follow(ZMarkContext* context, ZMarkStackEntry entry) {
     if (is_array(addr)) {
       follow_array_object(objArrayOop(to_oop(addr)), finalizable);
     } else {
-      const oop obj = to_oop(addr);
-      follow_object(obj, finalizable);
-
-      if (!finalizable) {
-        // Try deduplicate
-        try_deduplicate(context, obj);
-      }
+      follow_object(to_oop(addr), finalizable);
     }
   }
 }
diff --git a/src/hotspot/share/gc/z/zMarkContext.hpp b/src/hotspot/share/gc/z/zMarkContext.hpp
index 788e17cae8f..12f56c2f7a5 100644
--- a/src/hotspot/share/gc/z/zMarkContext.hpp
+++ b/src/hotspot/share/gc/z/zMarkContext.hpp
@@ -24,7 +24,6 @@
 #ifndef SHARE_GC_Z_ZMARKCONTEXT_HPP
 #define SHARE_GC_Z_ZMARKCONTEXT_HPP
 
-#include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/z/zMarkCache.hpp"
 #include "memory/allocation.hpp"
 
@@ -37,7 +36,6 @@ class ZMarkContext : public StackObj {
   ZMarkStripe*                  _stripe;
   ZMarkThreadLocalStacks* const _stacks;
   size_t                        _nstripes;
-  StringDedup::Requests         _string_dedup_requests;
 
 public:
   ZMarkContext(size_t nstripes,
@@ -48,7 +46,6 @@ class ZMarkContext : public StackObj {
   ZMarkStripe* stripe();
   void set_stripe(ZMarkStripe* stripe);
   ZMarkThreadLocalStacks* stacks();
-  StringDedup::Requests* string_dedup_requests();
 
   size_t nstripes();
   void set_nstripes(size_t nstripes);
diff --git a/src/hotspot/share/gc/z/zMarkContext.inline.hpp b/src/hotspot/share/gc/z/zMarkContext.inline.hpp
index fe1d4bbbcb6..7273a87a8c6 100644
--- a/src/hotspot/share/gc/z/zMarkContext.inline.hpp
+++ b/src/hotspot/share/gc/z/zMarkContext.inline.hpp
@@ -32,8 +32,7 @@ inline ZMarkContext::ZMarkContext(size_t nstripes,
   : _cache(nstripes),
     _stripe(stripe),
     _stacks(stacks),
-    _nstripes(nstripes),
-    _string_dedup_requests() {}
+    _nstripes(nstripes) {}
 
 inline ZMarkCache* ZMarkContext::cache() {
   return &_cache;
@@ -51,10 +50,6 @@ inline ZMarkThreadLocalStacks* ZMarkContext::stacks() {
   return _stacks;
 }
 
-inline StringDedup::Requests* ZMarkContext::string_dedup_requests() {
-  return &_string_dedup_requests;
-}
-
 inline size_t ZMarkContext::nstripes() {
   return _nstripes;
 }
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index b4ae78bc8d9..df2dd8a01cb 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -40,6 +40,7 @@
 #include "gc/z/zRootsIterator.hpp"
 #include "gc/z/zStackWatermark.hpp"
 #include "gc/z/zStat.hpp"
+#include "gc/z/zStringDedup.inline.hpp"
 #include "gc/z/zTask.hpp"
 #include "gc/z/zUncoloredRoot.inline.hpp"
 #include "gc/z/zVerify.hpp"
@@ -559,12 +560,14 @@ class ZRelocateMediumAllocator {
 template <typename Allocator>
 class ZRelocateWork : public StackObj {
 private:
-  Allocator* const   _allocator;
-  ZForwarding*       _forwarding;
-  ZPage*             _target[ZAllocator::_relocation_allocators];
-  ZGeneration* const _generation;
-  size_t             _other_promoted;
-  size_t             _other_compacted;
+  Allocator* const    _allocator;
+  ZForwarding*        _forwarding;
+  ZPage*              _target[ZAllocator::_relocation_allocators];
+  ZGeneration* const  _generation;
+  size_t              _other_promoted;
+  size_t              _other_compacted;
+  ZStringDedupContext _string_dedup_context;
+
 
   ZPage* target(ZPageAge age) {
     return _target[static_cast<uint>(age) - 1];
@@ -795,6 +798,13 @@ class ZRelocateWork : public StackObj {
     update_remset_promoted(to_addr);
   }
 
+  void maybe_string_dedup(zaddress to_addr) {
+    if (_forwarding->is_promotion()) {
+      // Only deduplicate promoted objects, and let short-lived strings simply die instead.
+      _string_dedup_context.request(to_oop(to_addr));
+    }
+  }
+
   bool try_relocate_object(zaddress from_addr) {
     const zaddress to_addr = try_relocate_object_inner(from_addr);
 
@@ -804,6 +814,8 @@ class ZRelocateWork : public StackObj {
 
     update_remset_for_fields(from_addr, to_addr);
 
+    maybe_string_dedup(to_addr);
+
     return true;
   }
 
@@ -1176,10 +1188,15 @@ class ZRelocateAddRemsetForFlipPromoted : public ZRestartableTask {
 
   virtual void work() {
     SuspendibleThreadSetJoiner sts_joiner;
+    ZStringDedupContext        string_dedup_context;
 
     for (ZPage* page; _iter.next(&page);) {
       page->object_iterate([&](oop obj) {
+        // Remap oops and add remset if needed
         ZIterator::basic_oop_iterate_safe(obj, remap_and_maybe_add_remset);
+
+        // String dedup
+        string_dedup_context.request(obj);
       });
 
       SuspendibleThreadSet::yield();
diff --git a/src/hotspot/share/gc/z/zStringDedup.hpp b/src/hotspot/share/gc/z/zStringDedup.hpp
new file mode 100644
index 00000000000..68471fa6075
--- /dev/null
+++ b/src/hotspot/share/gc/z/zStringDedup.hpp
@@ -0,0 +1,39 @@
+/*
+ * 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_GC_Z_ZSTRINGDEDUP_HPP
+#define SHARE_GC_Z_ZSTRINGDEDUP_HPP
+
+#include "gc/shared/stringdedup/stringDedup.hpp"
+#include "gc/z/zAddress.hpp"
+#include "oops/oopsHierarchy.hpp"
+
+class ZStringDedupContext {
+private:
+  StringDedup::Requests _requests;
+
+public:
+  void request(oop obj);
+};
+
+#endif // SHARE_GC_Z_ZSTRINGDEDUP_HPP
diff --git a/src/hotspot/share/gc/z/zStringDedup.inline.hpp b/src/hotspot/share/gc/z/zStringDedup.inline.hpp
new file mode 100644
index 00000000000..2df617f0ce7
--- /dev/null
+++ b/src/hotspot/share/gc/z/zStringDedup.inline.hpp
@@ -0,0 +1,52 @@
+/*
+ * 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_GC_Z_ZSTRINGDEDUP_INLINE_HPP
+#define SHARE_GC_Z_ZSTRINGDEDUP_INLINE_HPP
+
+#include "gc/z/zStringDedup.hpp"
+
+#include "classfile/javaClasses.inline.hpp"
+#include "gc/shared/gc_globals.hpp"
+
+inline void ZStringDedupContext::request(oop obj) {
+  if (!StringDedup::is_enabled()) {
+    // Not enabled
+    return;
+  }
+
+  if (!java_lang_String::is_instance(obj)) {
+    // Not a String object
+    return;
+  }
+
+  if (java_lang_String::test_and_set_deduplication_requested(obj)) {
+    // Already requested deduplication
+    return;
+  }
+
+  // Request deduplication
+  _requests.add(obj);
+}
+
+#endif // SHARE_GC_Z_ZSTRINGDEDUP_INLINE_HPP

From 84e9264e76ca6e5d984c8eecbf5c5d11128fc174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Thu, 24 Apr 2025 08:29:08 +0000
Subject: [PATCH 106/901] 8346552: C2: Add IR tests to check that Predicate
 cloning in Loop Unswitching works as expected

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/ifnode.cpp             |   4 +-
 src/hotspot/share/opto/predicates.cpp         |  13 +-
 src/hotspot/share/opto/predicates.hpp         |   1 +
 .../compiler/lib/ir_framework/IRNode.java     |  28 ++-
 .../TestUnswitchPredicateCloning.java         | 183 ++++++++++++++++++
 5 files changed, 221 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestUnswitchPredicateCloning.java

diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 5d349caf103..8d810e4202f 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -2219,13 +2219,13 @@ void ParsePredicateNode::dump_spec(outputStream* st) const {
       st->print("Loop ");
       break;
     case Deoptimization::DeoptReason::Reason_profile_predicate:
-      st->print("Profiled Loop ");
+      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 ");
+      st->print("Loop_Limit_Check ");
       break;
     default:
       fatal("unknown kind");
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 90df1ff05b4..78061801e6a 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -29,6 +29,7 @@
 #include "opto/node.hpp"
 #include "opto/predicates.hpp"
 #include "opto/rootnode.hpp"
+#include "runtime/deoptimization.hpp"
 
 // Walk over all Initialized Assertion Predicates and return the entry into the first Initialized Assertion Predicate
 // (i.e. not belonging to an Initialized Assertion Predicate anymore)
@@ -1093,11 +1094,19 @@ 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) {}
+      _phase(phase),
+      _is_counted_loop(true_path_loop_head->is_CountedLoop()) {}
 
-// 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.
+// Does not clone a Loop Limit Check Parse Predicate if a counted loop is unswitched, because it most likely will not be
+// used anymore (it could only be used when both unswitched loop versions die and the Loop Limit Check Parse Predicate
+// ends up at a LoopNode without Loop Limit Check Parse Predicate directly following the unswitched loop that can then
+// be speculatively converted to a counted loop - this is rather rare).
 void CloneUnswitchedLoopPredicatesVisitor::visit(const ParsePredicate& parse_predicate) {
+  Deoptimization::DeoptReason deopt_reason = parse_predicate.head()->deopt_reason();
+  if (_is_counted_loop && deopt_reason == Deoptimization::Reason_loop_limit_check) {
+    return;
+  }
   _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 5cea5598392..f19b2d73c56 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -1176,6 +1176,7 @@ class CloneUnswitchedLoopPredicatesVisitor : public PredicateVisitor {
   ClonePredicateToTargetLoop _clone_predicate_to_false_path_loop;
 
   PhaseIdealLoop* const _phase;
+  const bool _is_counted_loop;
 
  public:
   CloneUnswitchedLoopPredicatesVisitor(LoopNode* true_path_loop_head,
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index e7340dd0d8f..0b224523561 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1470,6 +1470,11 @@ public class IRNode {
         optoOnly(OOPMAP_WITH, regex);
     }
 
+    public static final String OPAQUE_TEMPLATE_ASSERTION_PREDICATE = PREFIX + "OPAQUE_TEMPLATE_ASSERTION_PREDICATE" + POSTFIX;
+    static {
+        duringLoopOpts(OPAQUE_TEMPLATE_ASSERTION_PREDICATE, "OpaqueTemplateAssertionPredicate");
+    }
+
     public static final String OR_I = PREFIX + "OR_I" + POSTFIX;
     static {
         beforeMatchingNameRegex(OR_I, "OrI");
@@ -1576,12 +1581,17 @@ public class IRNode {
 
     public static final String LOOP_LIMIT_CHECK_PARSE_PREDICATE = PREFIX + "LOOP_LIMIT_CHECK_PARSE_PREDICATE" + POSTFIX;
     static {
-        parsePredicateNodes(LOOP_LIMIT_CHECK_PARSE_PREDICATE, "Loop Limit Check");
+        parsePredicateNodes(LOOP_LIMIT_CHECK_PARSE_PREDICATE, "Loop_Limit_Check");
     }
 
     public static final String PROFILED_LOOP_PARSE_PREDICATE = PREFIX + "PROFILED_LOOP_PARSE_PREDICATE" + POSTFIX;
     static {
-        parsePredicateNodes(PROFILED_LOOP_PARSE_PREDICATE, "Profiled Loop");
+        parsePredicateNodes(PROFILED_LOOP_PARSE_PREDICATE, "Profiled_Loop");
+    }
+
+    public static final String AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE = PREFIX + "AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE" + POSTFIX;
+    static {
+        parsePredicateNodes(AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "Auto_Vectorization_Check");
     }
 
     public static final String PREDICATE_TRAP = PREFIX + "PREDICATE_TRAP" + POSTFIX;
@@ -2826,16 +2836,26 @@ private static void afterBarrierExpansionToBeforeMatching(String irNodePlacehold
                                                                           CompilePhase.BEFORE_MATCHING));
     }
 
+    /**
+     * Apply {@code regex} on all ideal graph phases starting from {@link CompilePhase#BEFORE_LOOP_OPTS}
+     * up to and including {@link CompilePhase#AFTER_LOOP_OPTS}.
+     */
+    private static void duringLoopOpts(String irNodePlaceholder, String regex) {
+        IR_NODE_MAPPINGS.put(irNodePlaceholder, new SinglePhaseRangeEntry(CompilePhase.AFTER_LOOP_OPTS, regex,
+                                                                          CompilePhase.BEFORE_LOOP_OPTS,
+                                                                          CompilePhase.AFTER_LOOP_OPTS));
+    }
+
     private static void trapNodes(String irNodePlaceholder, String trapReason) {
         String regex = START + "CallStaticJava" + MID + "uncommon_trap.*" + trapReason + END;
         beforeMatching(irNodePlaceholder, regex);
     }
 
     private static void parsePredicateNodes(String irNodePlaceholder, String label) {
-        String regex = START + "ParsePredicate" + MID + "#" + label + "[ ]*!jvms:" + END;
+        String regex = START + "ParsePredicate" + MID + "#" + label + " " + END;
         IR_NODE_MAPPINGS.put(irNodePlaceholder, new SinglePhaseRangeEntry(CompilePhase.AFTER_PARSING, regex,
                                                                           CompilePhase.AFTER_PARSING,
-                                                                          CompilePhase.PHASEIDEALLOOP_ITERATIONS));
+                                                                          CompilePhase.AFTER_LOOP_OPTS));
     }
 
     private static void loadOfNodes(String irNodePlaceholder, String irNodeRegex) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestUnswitchPredicateCloning.java b/test/hotspot/jtreg/compiler/loopopts/TestUnswitchPredicateCloning.java
new file mode 100644
index 00000000000..01a438595de
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestUnswitchPredicateCloning.java
@@ -0,0 +1,183 @@
+/*
+ * 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 compiler.lib.ir_framework.*;
+import java.util.Random;
+import jdk.test.lib.Utils;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8346552
+ * @summary Test that all parse predicates are cloned after loop unswitching.
+ * @key randomness
+ * @library /test/lib /
+ * @run driver compiler.loopopts.TestUnswitchPredicateCloning
+ */
+
+public class TestUnswitchPredicateCloning {
+    static final int SIZE = 100;
+
+    private static final Random random = Utils.getRandomInstance();
+
+    public static void main(String[] strArr) {
+        TestFramework.run();
+    }
+
+    @Run(test = {"testUnswitchingBeforePredication", "testPredicationBeforeUnswitching", "testUnswitchingUncounted"})
+    @Warmup(0)
+    private static void runNoWarmup() {
+        final int idx = random.nextInt(SIZE);
+        final boolean cond = random.nextBoolean();
+        int res = testUnswitchingBeforePredication(idx);
+        Asserts.assertEQ(SIZE * idx, res);
+        res = testPredicationBeforeUnswitching(idx, cond);
+        Asserts.assertEQ((SIZE * (SIZE - 1)) / 2 + (cond ? SIZE * idx : 0), res);
+        res = testUnswitchingUncounted(cond);
+        Asserts.assertEQ((SIZE * (SIZE - 1)) / 2 + (cond ? SIZE : 0), res);
+    }
+
+    @DontInline
+    private static int[] getArr() {
+        int[] arr = new int[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            arr[i] = i;
+        }
+        return arr;
+    }
+
+    @Test
+    // Check that Loop Unswitching doubled the number of Parse Predicates: We have
+    // them at the true- and false-path-loop. Note that the Loop Limit Check Parse
+    // Predicate is not cloned when we already have a counted loop.
+    @IR(counts = { IRNode.LOOP_PARSE_PREDICATE, "3",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "3",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "3",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "3" },
+        phase = CompilePhase.BEFORE_LOOP_UNSWITCHING)
+    // Since we know that Loop Predication happens after Loop Unswitching, we can test the
+    // have already been removed in the beautify loop phase.
+    @IR(counts = { IRNode.LOOP_PARSE_PREDICATE, "4",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "4",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "3",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "4" },
+        phase = CompilePhase.BEFORE_LOOP_PREDICATION_RC)
+    // Check that Opaque Template Assertion Predicates are added in Loop Predication
+    // even if Loop Predication only happens after Loop Unswitching.
+    @IR(failOn = { IRNode.OPAQUE_TEMPLATE_ASSERTION_PREDICATE },
+        phase = CompilePhase.AFTER_LOOP_UNSWITCHING)
+    @IR(counts = { IRNode.OPAQUE_TEMPLATE_ASSERTION_PREDICATE, "2" },
+        phase = CompilePhase.AFTER_LOOP_PREDICATION_RC)
+    static int testUnswitchingBeforePredication(int j) {
+        int zero = 34;
+        int limit = 2;
+
+        // Ensure zero == 0 is only known after CCP
+        for (; limit < 4; limit *= 2) {
+        }
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        int[] arr = getArr();
+        int res = 0;
+        for (int i = 0; i < arr.length; i++) {
+            // Trigger unswitching only after CCP
+            if (zero == 0) {
+                // Trigger range check after loop unswitching
+                res += arr[j];
+            } else {
+                res += arr[i];
+            }
+        }
+
+        return res;
+    }
+
+    @Test
+    // Check that Loop Unswitching doubled the number of Parse and Template
+    // Assertion Predicates. Again, the Loop Limit Check Parse Predicate
+    // remains at the Loop Selector since this is a counted loop.
+    @IR(failOn = { IRNode.OPAQUE_TEMPLATE_ASSERTION_PREDICATE },
+        phase = CompilePhase.BEFORE_LOOP_PREDICATION_RC)
+    @IR(counts = { IRNode.OPAQUE_TEMPLATE_ASSERTION_PREDICATE, "2",
+                   IRNode.LOOP_PARSE_PREDICATE, "1",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "1",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "1",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "1" },
+        phase = CompilePhase.BEFORE_LOOP_UNSWITCHING)
+    // After Loop Unswitching and after removing the killed predicates.
+    @IR(counts = { IRNode.OPAQUE_TEMPLATE_ASSERTION_PREDICATE, "4",
+                   IRNode.LOOP_PARSE_PREDICATE, "2",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "2",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "1",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "2" },
+        phase = CompilePhase.PHASEIDEALLOOP2)
+    static int testPredicationBeforeUnswitching(int j, boolean cond) {
+        int[] arr = getArr();
+        int res = 0;
+        for (int i = 0; i < arr.length; i++) {
+            if (cond) {
+                res += arr[j];
+            }
+            res += arr[i];
+        }
+        return res;
+    }
+
+    @Test
+    // Check that Loop Unswitching doubled the number of all Parse Predicates.
+    // Since this is not counted loop, the Loop Limit Check Parse Predicate
+    // has to be cloned to both unswitched loops.
+    @IR(counts = { IRNode.LOOP_PARSE_PREDICATE, "1",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "1",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "1",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "1" },
+        phase = CompilePhase.BEFORE_LOOP_UNSWITCHING)
+    // After Loop Unswitching and after removing the killed predicates all
+    // Parse Predicates are doubled.
+    @IR(counts = { IRNode.LOOP_PARSE_PREDICATE, "2",
+                   IRNode.PROFILED_LOOP_PARSE_PREDICATE, "2",
+                   IRNode.LOOP_LIMIT_CHECK_PARSE_PREDICATE, "2",
+                   IRNode.AUTO_VECTORIZATION_CHECK_PARSE_PREDICATE, "2" },
+        failOn = { IRNode.COUNTED_LOOP },
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(failOn = { IRNode.COUNTED_LOOP })
+    static int testUnswitchingUncounted(boolean cond) {
+        int[] arr = getArr();
+        int res = 0;
+        int i = 0;
+        while (i < arr.length) {
+            if (cond) {
+                res += 1;
+            }
+            res += arr[i];
+
+            i = arr[i] + 1; // effectively i += 1, but don't tell the compiler!
+        }
+
+        return res;
+    }
+}
\ No newline at end of file

From 290d24d16adcef6b9f0f5ac789b125fd7bac66a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Thu, 24 Apr 2025 08:36:35 +0000
Subject: [PATCH 107/901] 8355400: Better git detection in
 update_copyright_year.sh

Reviewed-by: erikj, chagedorn
---
 make/scripts/update_copyright_year.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh
index bb61d48c91c..578ab4cbc99 100644
--- a/make/scripts/update_copyright_year.sh
+++ b/make/scripts/update_copyright_year.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -f
 
 #
-# 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
@@ -41,10 +41,6 @@ set -e
 # To allow total changes counting
 shopt -s lastpipe
 
-# Get an absolute path to this script, since that determines the top-level directory.
-this_script_dir=`dirname $0`
-this_script_dir=`cd $this_script_dir > /dev/null && pwd`
-
 # Temp area
 tmp=/tmp/`basename $0`.${USER}.$$
 rm -f -r ${tmp}
@@ -98,10 +94,16 @@ while getopts "c:fhy:" option; do
 done
 
 # VCS check
+git_installed=false
+which git > /dev/null && git_installed=true
+if [ "$git_installed" != "true" ]; then
+  echo "Error: This script requires git. Please install it."
+  exit 1
+fi
 git_found=false
-[ -d "${this_script_dir}/../../.git" ] && git_found=true
+git status &> /dev/null && git_found=true
 if [ "$git_found" != "true" ]; then
-  echo "Error: Please execute script from within make/scripts."
+  echo "Error: Please execute script from within a JDK git repository."
   exit 1
 else
   echo "Using Git version control system"

From be6e4406d8c9024bb368ed9dc22d4a6df2a0846a Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 24 Apr 2025 09:10:43 +0000
Subject: [PATCH 108/901] 8349139: C2: Div looses dependency on condition that
 guarantees divisor not zero in counted loop

Reviewed-by: chagedorn, epeter, qamai
---
 src/hotspot/share/opto/loopTransform.cpp      | 29 +++++++-
 src/hotspot/share/opto/loopnode.cpp           | 18 +++++
 src/hotspot/share/opto/loopnode.hpp           | 10 ++-
 src/hotspot/share/opto/loopopts.cpp           | 23 ------
 src/hotspot/share/opto/predicates.cpp         |  2 +-
 .../TestDivDependentOnMainLoopGuard.java      | 73 +++++++++++++++++++
 .../TestMainLoopNoBackedgeFloatingDiv.java    | 58 +++++++++++++++
 7 files changed, 181 insertions(+), 32 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
 create mode 100644 test/hotspot/jtreg/compiler/controldependency/TestMainLoopNoBackedgeFloatingDiv.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 7de53466e21..f7783e19c9c 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1299,6 +1299,22 @@ Node *PhaseIdealLoop::clone_up_backedge_goo(Node *back_ctrl, Node *preheader_ctr
   return n;
 }
 
+// When a counted loop is created, the loop phi type may be narrowed down. As a consequence, the control input of some
+// nodes may be cleared: in particular in the case of a division by the loop iv, the Div node would lose its control
+// dependency if the loop phi is never zero. After pre/main/post loops are created (and possibly unrolling), the
+// loop phi type is only correct if the loop is indeed reachable: there's an implicit dependency between the loop phi
+// type and the zero trip guard for the main or post loop and as a consequence a dependency between the Div node and the
+// zero trip guard. This makes the dependency explicit by adding a CastII for the loop entry input of the loop phi. If
+// the backedge of the main or post loop is removed, a Div node won't be able to float above the zero trip guard of the
+// loop and can't execute even if the loop is not reached.
+void PhaseIdealLoop::cast_incr_before_loop(Node* incr, Node* ctrl, CountedLoopNode* loop) {
+  Node* castii = new CastIINode(ctrl, incr, TypeInt::INT, ConstraintCastNode::UnconditionalDependency);
+  register_new_node(castii, ctrl);
+  Node* phi = loop->phi();
+  assert(phi->in(LoopNode::EntryControl) == incr, "replacing wrong input?");
+  _igvn.replace_input_of(phi, LoopNode::EntryControl, castii);
+}
+
 #ifdef ASSERT
 void PhaseIdealLoop::ensure_zero_trip_guard_proj(Node* node, bool is_main_loop) {
   assert(node->is_IfProj(), "must be the zero trip guard If node");
@@ -1453,6 +1469,8 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
   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);
+  // CastII for the main loop:
+  cast_incr_before_loop(pre_incr, min_taken, main_head);
 
   // Step B4: Shorten the pre-loop to run only 1 iteration (for now).
   // RCE and alignment may change this later.
@@ -1593,7 +1611,7 @@ void PhaseIdealLoop::insert_vector_post_loop(IdealLoopTree *loop, Node_List &old
 // Insert post loops.  Add a post loop to the given loop passed.
 Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
                                        CountedLoopNode* main_head, CountedLoopEndNode* main_end,
-                                       Node*& incr, Node* limit, CountedLoopNode*& post_head) {
+                                       Node* incr, Node* limit, CountedLoopNode*& post_head) {
   IfNode* outer_main_end = main_end;
   IdealLoopTree* outer_loop = loop;
   if (main_head->is_strip_mined()) {
@@ -1682,6 +1700,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);)
   initialize_assertion_predicates_for_post_loop(main_head, post_head, first_node_index_in_cloned_loop_body);
+  cast_incr_before_loop(zer_opaq->in(1), zer_taken, post_head);
   return new_main_exit;
 }
 
@@ -1777,8 +1796,8 @@ void PhaseIdealLoop::create_assertion_predicates_at_main_or_post_loop(CountedLoo
 // to do because these control dependent nodes on the old target loop entry created by clone_up_backedge_goo() were
 // pinned on the loop backedge before. The Assertion Predicates are not control dependent on these nodes in any way.
 void PhaseIdealLoop::rewire_old_target_loop_entry_dependency_to_new_entry(
-    LoopNode* target_loop_head, const Node* old_target_loop_entry,
-    const uint node_index_before_new_assertion_predicate_nodes) {
+  CountedLoopNode* target_loop_head, const Node* old_target_loop_entry,
+  const uint node_index_before_new_assertion_predicate_nodes) {
   Node* new_main_loop_entry = target_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
   if (new_main_loop_entry == old_target_loop_entry) {
     // No Assertion Predicates added.
@@ -1788,6 +1807,7 @@ void PhaseIdealLoop::rewire_old_target_loop_entry_dependency_to_new_entry(
   for (DUIterator_Fast imax, i = old_target_loop_entry->fast_outs(imax); i < imax; i++) {
     Node* out = old_target_loop_entry->fast_out(i);
     if (!out->is_CFG() && out->_idx < node_index_before_new_assertion_predicate_nodes) {
+      assert(out != target_loop_head->init_trip(), "CastII on loop entry?");
       _igvn.replace_input_of(out, 0, new_main_loop_entry);
       set_ctrl(out, new_main_loop_entry);
       --i;
@@ -2677,7 +2697,8 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree* loop) {
         if (b_test._test == BoolTest::lt) { // Range checks always use lt
           // The underflow and overflow limits: 0 <= scale*I+offset < limit
           add_constraint(stride_con, lscale_con, offset, zero, limit, next_limit_ctrl, &pre_limit, &main_limit);
-          Node* init = cl->init_trip();
+          Node* init = cl->uncasted_init_trip(true);
+
           Node* opaque_init = new OpaqueLoopInitNode(C, init);
           register_new_node(opaque_init, loop_entry);
 
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index b0ed29d8567..c3f411eea94 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -6058,6 +6058,24 @@ CountedLoopEndNode* CountedLoopNode::find_pre_loop_end() {
   return pre_end;
 }
 
+Node* CountedLoopNode::uncasted_init_trip(bool uncast) {
+  Node* init = init_trip();
+  if (uncast && init->is_CastII()) {
+    // skip over the cast added by PhaseIdealLoop::cast_incr_before_loop() when pre/post/main loops are created because
+    // it can get in the way of type propagation. For instance, the index tested by an Assertion Predicate, if the cast
+    // is not skipped over, could be (1):
+    // (AddI (CastII (AddI pre_loop_iv -2) int) 1)
+    // while without the cast, it is (2):
+    // (AddI (AddI pre_loop_iv -2) 1)
+    // which is be transformed to (3):
+    // (AddI pre_loop_iv -1)
+    // The compiler may be able to constant fold the Assertion Predicate condition for (3) but not (1)
+    assert(init->as_CastII()->carry_dependency() && skip_assertion_predicates_with_halt() == init->in(0), "casted iv phi from pre loop expected");
+    init = init->in(1);
+  }
+  return init;
+}
+
 //------------------------------get_late_ctrl----------------------------------
 // Compute latest legal control.
 Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index ef958ced8c3..5a1fceacf9e 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -365,6 +365,8 @@ class CountedLoopNode : public BaseCountedLoopNode {
   Node* is_canonical_loop_entry();
   CountedLoopEndNode* find_pre_loop_end();
 
+  Node* uncasted_init_trip(bool uncasted);
+
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
@@ -973,6 +975,8 @@ class PhaseIdealLoop : public PhaseTransform {
     return ctrl;
   }
 
+  void cast_incr_before_loop(Node* incr, Node* ctrl, CountedLoopNode* loop);
+
 #ifdef ASSERT
   static void ensure_zero_trip_guard_proj(Node* node, bool is_main_loop);
 #endif
@@ -998,7 +1002,7 @@ class PhaseIdealLoop : public PhaseTransform {
                                                         CountedLoopNode* target_loop_head,
                                                         const NodeInLoopBody& _node_in_loop_body,
                                                         bool kill_old_template);
-  void rewire_old_target_loop_entry_dependency_to_new_entry(LoopNode* target_loop_head,
+  void rewire_old_target_loop_entry_dependency_to_new_entry(CountedLoopNode* target_loop_head,
                                                             const Node* old_target_loop_entry,
                                                             uint node_index_before_new_assertion_predicate_nodes);
   void insert_loop_limit_check_predicate(ParsePredicateSuccessProj* loop_limit_check_parse_proj, Node* cmp_limit,
@@ -1352,7 +1356,7 @@ class PhaseIdealLoop : public PhaseTransform {
   // Add post loop after the given loop.
   Node *insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
                          CountedLoopNode* main_head, CountedLoopEndNode* main_end,
-                         Node*& incr, Node* limit, CountedLoopNode*& post_head);
+                         Node* incr, Node* limit, CountedLoopNode*& post_head);
 
   // Add a vector post loop between a vector main loop and the current post loop
   void insert_vector_post_loop(IdealLoopTree *loop, Node_List &old_new);
@@ -1580,8 +1584,6 @@ class PhaseIdealLoop : public PhaseTransform {
   // Attempt to use a conditional move instead of a phi/branch
   Node *conditional_move( Node *n );
 
-  bool split_thru_phi_could_prevent_vectorization(Node* n, Node* n_blk);
-
   // Check for aggressive application of 'split-if' optimization,
   // using basic block level info.
   void  split_if_with_blocks     ( VectorSet &visited, Node_Stack &nstack);
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index e896196c6cf..b8bbaa964e8 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -1089,25 +1089,6 @@ void PhaseIdealLoop::try_move_store_after_loop(Node* n) {
   }
 }
 
-// Split some nodes that take a counted loop phi as input at a counted
-// loop can cause vectorization of some expressions to fail
-bool PhaseIdealLoop::split_thru_phi_could_prevent_vectorization(Node* n, Node* n_blk) {
-  if (!n_blk->is_CountedLoop()) {
-    return false;
-  }
-
-  int opcode = n->Opcode();
-
-  if (opcode != Op_AndI &&
-      opcode != Op_MulI &&
-      opcode != Op_RotateRight &&
-      opcode != Op_RShiftI) {
-    return false;
-  }
-
-  return n->in(1) == n_blk->as_BaseCountedLoop()->phi();
-}
-
 //------------------------------split_if_with_blocks_pre-----------------------
 // Do the real work in a non-recursive function.  Data nodes want to be
 // cloned in the pre-order so they can feed each other nicely.
@@ -1194,10 +1175,6 @@ Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
     return n;
   }
 
-  if (split_thru_phi_could_prevent_vectorization(n, n_blk)) {
-    return n;
-  }
-
   // Check for having no control input; not pinned.  Allow
   // dominating control.
   if (n->in(0)) {
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 78061801e6a..d6078e50d69 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -758,7 +758,7 @@ void AssertionPredicateIfCreator::create_halt_node(IfFalseNode* fail_proj, Ideal
 }
 
 OpaqueLoopInitNode* TemplateAssertionPredicateCreator::create_opaque_init(Node* new_control) const {
-  OpaqueLoopInitNode* opaque_init = new OpaqueLoopInitNode(_phase->C, _loop_head->init_trip());
+  OpaqueLoopInitNode* opaque_init = new OpaqueLoopInitNode(_phase->C, _loop_head->uncasted_init_trip(_loop_head->is_main_loop()));
   _phase->register_new_node(opaque_init, new_control);
   return opaque_init;
 }
diff --git a/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java b/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
new file mode 100644
index 00000000000..a6b7a462743
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/controldependency/TestDivDependentOnMainLoopGuard.java
@@ -0,0 +1,73 @@
+/*
+ * 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 8349139
+ * @summary C2: Div looses dependency on condition that guarantees divisor not null in counted loop
+ * @library /test/lib /
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=TestDivDependentOnMainLoopGuard::*
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=35878193 TestDivDependentOnMainLoopGuard
+ * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:CompileOnly=TestDivDependentOnMainLoopGuard::*
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestDivDependentOnMainLoopGuard
+ * @run main/othervm -Xcomp -XX:CompileOnly=TestDivDependentOnMainLoopGuard::* TestDivDependentOnMainLoopGuard
+ */
+
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+public class TestDivDependentOnMainLoopGuard {
+
+    public static final int N = 400;
+    private static final Random RANDOM = Utils.getRandomInstance();
+    public static final int stop = RANDOM.nextInt(0, 68);
+
+    public int iArrFld[]=new int[N];
+
+    public void mainTest(String[] strArr1, int otherPhi) {
+
+        int i=57657, i1=577, i2=6, i3=157, i4=12, i23=61271;
+        boolean bArr[]=new boolean[N];
+
+        for (i = 9; 379 > i; i++) {
+            i2 = 1;
+            do {
+                i1 <<= i3;
+            } while (++i2 < 68);
+            for (i23 = 68; i23 > stop; otherPhi=i23-1, i23--) {
+                bArr[i23 + 1] = true;
+                try {
+                    i1 = (-42360 / i23);
+                    iArrFld[i + 1] = otherPhi;
+                } catch (ArithmeticException a_e) {}
+            }
+        }
+    }
+
+    public static void main(String[] strArr) {
+        TestDivDependentOnMainLoopGuard _instance = new TestDivDependentOnMainLoopGuard();
+        for (int i = 0; i < 10; i++ ) {
+            _instance.mainTest(strArr, 0);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/controldependency/TestMainLoopNoBackedgeFloatingDiv.java b/test/hotspot/jtreg/compiler/controldependency/TestMainLoopNoBackedgeFloatingDiv.java
new file mode 100644
index 00000000000..29da59da6d3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/controldependency/TestMainLoopNoBackedgeFloatingDiv.java
@@ -0,0 +1,58 @@
+/*
+ * 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 8349139
+ * @summary C2: Div looses dependency on condition that guarantees divisor not null in counted loop
+ * @run main/othervm -XX:-BackgroundCompilation TestMainLoopNoBackedgeFloatingDiv
+ */
+
+public class TestMainLoopNoBackedgeFloatingDiv {
+    private static int field;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+           test1(1000, 0, false);
+           test1Helper(1000, 0, false, false);
+        }
+       test1(1, 0, false);
+    }
+
+    private static int test1(int stop, int res, boolean alwaysTrueInMain) {
+        stop = Integer.max(stop, 1);
+        res = test1Helper(stop, res, alwaysTrueInMain, true);
+        return res;
+    }
+
+    private static int test1Helper(int stop, int res, boolean alwaysTrueInMain, boolean flag) {
+        for (int i = stop; i >= 1; i--) {
+            res = res / i;
+            if (alwaysTrueInMain) {
+                break;
+            }
+            alwaysTrueInMain = flag;
+        }
+        return res;
+    }
+}

From 74a2c831a2af55c66317ca8aead53fde2a2a6900 Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Thu, 24 Apr 2025 09:33:15 +0000
Subject: [PATCH 109/901] 8352620: C2: rename MemNode::memory_type() to
 MemNode::value_basic_type()

Reviewed-by: rcastanedalo, thartmann
---
 src/hotspot/share/opto/escape.cpp     |  4 +--
 src/hotspot/share/opto/memnode.cpp    |  8 ++---
 src/hotspot/share/opto/memnode.hpp    | 50 +++++++++++++++------------
 src/hotspot/share/opto/superword.cpp  | 12 +++----
 src/hotspot/share/opto/vectornode.hpp |  4 +--
 5 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index decc43a212a..1fb34e799b2 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -2826,14 +2826,14 @@ int ConnectionGraph::find_init_values_null(JavaObjectNode* pta, PhaseValues* pha
         offsets_worklist.append(offset);
         Node* value = nullptr;
         if (ini != nullptr) {
-          // StoreP::memory_type() == T_ADDRESS
+          // StoreP::value_basic_type() == T_ADDRESS
           BasicType ft = UseCompressedOops ? T_NARROWOOP : T_ADDRESS;
           Node* store = ini->find_captured_store(offset, type2aelembytes(ft, true), phase);
           // Make sure initializing store has the same type as this AddP.
           // This AddP may reference non existing field because it is on a
           // dead branch of bimorphic call which is not eliminated yet.
           if (store != nullptr && store->is_Store() &&
-              store->as_Store()->memory_type() == ft) {
+              store->as_Store()->value_basic_type() == ft) {
             value = store->in(MemNode::ValueIn);
 #ifdef ASSERT
             if (VerifyConnectionGraph) {
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 9cd3dcfee41..24b81b894cb 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -1213,12 +1213,12 @@ Node* MemNode::can_see_stored_value(Node* st, PhaseValues* phase) const {
       // (This is one of the few places where a generic PhaseTransform
       // can create new nodes.  Think of it as lazily manifesting
       // virtually pre-existing constants.)
-      if (memory_type() != T_VOID) {
+      if (value_basic_type() != T_VOID) {
         if (ReduceBulkZeroing || find_array_copy_clone(ld_alloc, in(MemNode::Memory)) == nullptr) {
           // If ReduceBulkZeroing is disabled, we need to check if the allocation does not belong to an
           // ArrayCopyNode clone. If it does, then we cannot assume zero since the initialization is done
           // by the ArrayCopyNode.
-          return phase->zerocon(memory_type());
+          return phase->zerocon(value_basic_type());
         }
       } else {
         // TODO: materialize all-zero vector constant
@@ -2047,7 +2047,7 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
         int stable_dimension = (ary->stable_dimension() > 0 ? ary->stable_dimension() - 1 : 0);
         const Type* con_type = Type::make_constant_from_array_element(aobj->as_array(), off,
                                                                       stable_dimension,
-                                                                      memory_type(), is_unsigned());
+                                                                      value_basic_type(), is_unsigned());
         if (con_type != nullptr) {
           return con_type;
         }
@@ -2115,7 +2115,7 @@ const Type* LoadNode::Value(PhaseGVN* phase) const {
     const TypeInstPtr* tinst = tp->is_instptr();
     ciObject* const_oop = tinst->const_oop();
     if (!is_mismatched_access() && off != Type::OffsetBot && const_oop != nullptr && const_oop->is_instance()) {
-      const Type* con_type = Type::make_constant_from_field(const_oop->as_instance(), off, is_unsigned(), memory_type());
+      const Type* con_type = Type::make_constant_from_field(const_oop->as_instance(), off, is_unsigned(), value_basic_type());
       if (con_type != nullptr) {
         return con_type;
       }
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index f17db05e683..157cc1866a0 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -134,12 +134,16 @@ class MemNode : public Node {
   virtual int store_Opcode() const { return -1; }
 
   // What is the type of the value in memory?  (T_VOID mean "unspecified".)
-  virtual BasicType memory_type() const = 0;
+  // The returned type is a property of the value that is loaded/stored and
+  // not the memory that is accessed. For mismatched memory accesses
+  // they might differ. For instance, a value of type 'short' may be stored
+  // into an array of elements of type 'long'.
+  virtual BasicType value_basic_type() const = 0;
   virtual int memory_size() const {
 #ifdef ASSERT
-    return type2aelembytes(memory_type(), true);
+    return type2aelembytes(value_basic_type(), true);
 #else
-    return type2aelembytes(memory_type());
+    return type2aelembytes(value_basic_type());
 #endif
   }
 
@@ -337,7 +341,7 @@ class LoadBNode : public LoadNode {
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual int store_Opcode() const { return Op_StoreB; }
-  virtual BasicType memory_type() const { return T_BYTE; }
+  virtual BasicType value_basic_type() const { return T_BYTE; }
 };
 
 //------------------------------LoadUBNode-------------------------------------
@@ -351,7 +355,7 @@ class LoadUBNode : public LoadNode {
   virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual int store_Opcode() const { return Op_StoreB; }
-  virtual BasicType memory_type() const { return T_BYTE; }
+  virtual BasicType value_basic_type() const { return T_BYTE; }
 };
 
 //------------------------------LoadUSNode-------------------------------------
@@ -365,7 +369,7 @@ class LoadUSNode : public LoadNode {
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual int store_Opcode() const { return Op_StoreC; }
-  virtual BasicType memory_type() const { return T_CHAR; }
+  virtual BasicType value_basic_type() const { return T_CHAR; }
 };
 
 //------------------------------LoadSNode--------------------------------------
@@ -379,7 +383,7 @@ class LoadSNode : public LoadNode {
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual int store_Opcode() const { return Op_StoreC; }
-  virtual BasicType memory_type() const { return T_SHORT; }
+  virtual BasicType value_basic_type() const { return T_SHORT; }
 };
 
 //------------------------------LoadINode--------------------------------------
@@ -391,7 +395,7 @@ class LoadINode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual int store_Opcode() const { return Op_StoreI; }
-  virtual BasicType memory_type() const { return T_INT; }
+  virtual BasicType value_basic_type() const { return T_INT; }
 };
 
 //------------------------------LoadRangeNode----------------------------------
@@ -424,7 +428,7 @@ class LoadLNode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegL; }
   virtual int store_Opcode() const { return Op_StoreL; }
-  virtual BasicType memory_type() const { return T_LONG; }
+  virtual BasicType value_basic_type() const { return T_LONG; }
   bool require_atomic_access() const { return _require_atomic_access; }
 
 #ifndef PRODUCT
@@ -453,7 +457,7 @@ class LoadFNode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegF; }
   virtual int store_Opcode() const { return Op_StoreF; }
-  virtual BasicType memory_type() const { return T_FLOAT; }
+  virtual BasicType value_basic_type() const { return T_FLOAT; }
 };
 
 //------------------------------LoadDNode--------------------------------------
@@ -474,7 +478,7 @@ class LoadDNode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegD; }
   virtual int store_Opcode() const { return Op_StoreD; }
-  virtual BasicType memory_type() const { return T_DOUBLE; }
+  virtual BasicType value_basic_type() const { return T_DOUBLE; }
   bool require_atomic_access() const { return _require_atomic_access; }
 
 #ifndef PRODUCT
@@ -503,7 +507,7 @@ class LoadPNode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegP; }
   virtual int store_Opcode() const { return Op_StoreP; }
-  virtual BasicType memory_type() const { return T_ADDRESS; }
+  virtual BasicType value_basic_type() const { return T_ADDRESS; }
 };
 
 
@@ -516,7 +520,7 @@ class LoadNNode : public LoadNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegN; }
   virtual int store_Opcode() const { return Op_StoreN; }
-  virtual BasicType memory_type() const { return T_NARROWOOP; }
+  virtual BasicType value_basic_type() const { return T_NARROWOOP; }
 };
 
 //------------------------------LoadKlassNode----------------------------------
@@ -555,7 +559,7 @@ class LoadNKlassNode : public LoadNNode {
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return Op_RegN; }
   virtual int store_Opcode() const { return Op_StoreNKlass; }
-  virtual BasicType memory_type() const { return T_NARROWKLASS; }
+  virtual BasicType value_basic_type() const { return T_NARROWKLASS; }
 
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
@@ -666,7 +670,7 @@ class StoreBNode : public StoreNode {
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
-  virtual BasicType memory_type() const { return T_BYTE; }
+  virtual BasicType value_basic_type() const { return T_BYTE; }
 };
 
 //------------------------------StoreCNode-------------------------------------
@@ -677,7 +681,7 @@ class StoreCNode : public StoreNode {
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
-  virtual BasicType memory_type() const { return T_CHAR; }
+  virtual BasicType value_basic_type() const { return T_CHAR; }
 };
 
 //------------------------------StoreINode-------------------------------------
@@ -687,7 +691,7 @@ class StoreINode : public StoreNode {
   StoreINode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo)
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_INT; }
+  virtual BasicType value_basic_type() const { return T_INT; }
 };
 
 //------------------------------StoreLNode-------------------------------------
@@ -705,7 +709,7 @@ class StoreLNode : public StoreNode {
   StoreLNode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo, bool require_atomic_access = false)
     : StoreNode(c, mem, adr, at, val, mo), _require_atomic_access(require_atomic_access) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_LONG; }
+  virtual BasicType value_basic_type() const { return T_LONG; }
   bool require_atomic_access() const { return _require_atomic_access; }
 
 #ifndef PRODUCT
@@ -723,7 +727,7 @@ class StoreFNode : public StoreNode {
   StoreFNode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo)
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_FLOAT; }
+  virtual BasicType value_basic_type() const { return T_FLOAT; }
 };
 
 //------------------------------StoreDNode-------------------------------------
@@ -741,7 +745,7 @@ class StoreDNode : public StoreNode {
              MemOrd mo, bool require_atomic_access = false)
     : StoreNode(c, mem, adr, at, val, mo), _require_atomic_access(require_atomic_access) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_DOUBLE; }
+  virtual BasicType value_basic_type() const { return T_DOUBLE; }
   bool require_atomic_access() const { return _require_atomic_access; }
 
 #ifndef PRODUCT
@@ -760,7 +764,7 @@ class StorePNode : public StoreNode {
   StorePNode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo)
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_ADDRESS; }
+  virtual BasicType value_basic_type() const { return T_ADDRESS; }
 };
 
 //------------------------------StoreNNode-------------------------------------
@@ -770,7 +774,7 @@ class StoreNNode : public StoreNode {
   StoreNNode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo)
     : StoreNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_NARROWOOP; }
+  virtual BasicType value_basic_type() const { return T_NARROWOOP; }
 };
 
 //------------------------------StoreNKlassNode--------------------------------------
@@ -780,7 +784,7 @@ class StoreNKlassNode : public StoreNNode {
   StoreNKlassNode(Node *c, Node *mem, Node *adr, const TypePtr* at, Node *val, MemOrd mo)
     : StoreNNode(c, mem, adr, at, val, mo) {}
   virtual int Opcode() const;
-  virtual BasicType memory_type() const { return T_NARROWKLASS; }
+  virtual BasicType value_basic_type() const { return T_NARROWKLASS; }
 };
 
 //------------------------------SCMemProjNode---------------------------------------
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 0746715f065..5e34249aee8 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -158,7 +158,7 @@ void SuperWord::unrolling_analysis(const VLoop &vloop, int &local_loop_unroll_fa
     // Ignore nodes with non-primitive type.
     BasicType bt;
     if (n->is_Mem()) {
-      bt = n->as_Mem()->memory_type();
+      bt = n->as_Mem()->value_basic_type();
     } else {
       bt = n->bottom_type()->basic_type();
     }
@@ -191,7 +191,7 @@ void SuperWord::unrolling_analysis(const VLoop &vloop, int &local_loop_unroll_fa
       BasicType bt;
       Node* n = lpt->_body.at(i);
       if (n->is_Mem()) {
-        bt = n->as_Mem()->memory_type();
+        bt = n->as_Mem()->value_basic_type();
       } else {
         bt = n->bottom_type()->basic_type();
       }
@@ -564,7 +564,7 @@ void SuperWord::collect_valid_memops(GrowableArray<MemOp>& memops) const {
     const VPointer& p = vpointer(mem);
     if (p.is_valid() &&
         !mem->is_LoadStore() &&
-        is_java_primitive(mem->memory_type())) {
+        is_java_primitive(mem->value_basic_type())) {
       memops.append(MemOp(mem, &p, original_index++));
     }
   });
@@ -764,8 +764,8 @@ bool SuperWord::are_adjacent_refs(Node* s1, Node* s2) const {
   if (!in_bb(s1)    || !in_bb(s2))    return false;
 
   // Do not use superword for non-primitives
-  if (!is_java_primitive(s1->as_Mem()->memory_type()) ||
-      !is_java_primitive(s2->as_Mem()->memory_type())) {
+  if (!is_java_primitive(s1->as_Mem()->value_basic_type()) ||
+      !is_java_primitive(s2->as_Mem()->value_basic_type())) {
     return false;
   }
 
@@ -2593,7 +2593,7 @@ void VLoopTypes::compute_vector_element_type() {
 const Type* VLoopTypes::container_type(Node* n) const {
   int opc = n->Opcode();
   if (n->is_Mem()) {
-    BasicType bt = n->as_Mem()->memory_type();
+    BasicType bt = n->as_Mem()->value_basic_type();
     if (n->is_Store() && (bt == T_CHAR)) {
       // Use T_SHORT type instead of T_CHAR for stored values because any
       // preceding arithmetic operation extends values to signed Int.
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 36706a7b7a1..ae817598d39 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1084,7 +1084,7 @@ class LoadVectorNode : public LoadNode {
   virtual int Opcode() const;
 
   virtual uint ideal_reg() const  { return Matcher::vector_ideal_reg(memory_size()); }
-  virtual BasicType memory_type() const { return T_VOID; }
+  virtual BasicType value_basic_type() const { return T_VOID; }
   virtual int memory_size() const { return vect_type()->length_in_bytes(); }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 
@@ -1157,7 +1157,7 @@ class StoreVectorNode : public StoreNode {
   virtual int Opcode() const;
 
   virtual uint ideal_reg() const  { return Matcher::vector_ideal_reg(memory_size()); }
-  virtual BasicType memory_type() const { return T_VOID; }
+  virtual BasicType value_basic_type() const { return T_VOID; }
   virtual int memory_size() const { return vect_type()->length_in_bytes(); }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 

From 6254046f508049a4e568f0f2eae51dc10da392c1 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Thu, 24 Apr 2025 10:27:50 +0000
Subject: [PATCH 110/901] 8320909: C2: Adapt IGVN's enqueuing logic to match
 idealization of AndNode with LShift operand

Reviewed-by: epeter, thartmann
---
 src/hotspot/share/opto/phaseX.cpp             | 28 +++++++
 .../compiler/c2/gvn/MissedOptCastII.java      | 68 +++++++++++++++++
 .../c2/gvn/MissedOptWithShiftConvAnd.java     | 72 ++++++++++++++++++
 .../c2/gvn/MissedOptWithShiftConvCastAnd.java | 76 +++++++++++++++++++
 4 files changed, 244 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
 create mode 100644 test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvAnd.java
 create mode 100644 test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvCastAnd.java

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index f0c8f9d7649..9be15b153b3 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1728,6 +1728,34 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
+
+  /* AndNode has a special handling when one of the operands is a LShiftNode:
+   * (LHS << s) & RHS
+   * if RHS fits in less than s bits, the value of this expression is 0.
+   * The difficulty is that there might be a conversion node (ConvI2L) between
+   * the LShiftINode and the AndLNode, like so:
+   * AndLNode(ConvI2L(LShiftI(LHS, s)), RHS)
+   * This case is handled by And[IL]Node::Value(PhaseGVN*)
+   * (see `AndIL_min_trailing_zeros`).
+   *
+   * But, when the shift is updated during IGVN, pushing the user (ConvI2L)
+   * is not enough: there might be no update happening there. We need to
+   * directly push the And[IL]Node on the worklist, jumping over ConvI2L.
+   *
+   * Moreover we can have ConstraintCasts in between. It may look like
+   * ConstraintCast+ -> ConvI2L -> ConstraintCast+ -> And
+   * and And[IL]Node::Value(PhaseGVN*) still handles that by looking through casts.
+   * So we must deal with that as well.
+   */
+  if (use->is_ConstraintCast() || use_op == Op_ConvI2L) {
+    auto is_boundary = [](Node* n){ return !n->is_ConstraintCast() && n->Opcode() != Op_ConvI2L; };
+    auto push_and_to_worklist = [&worklist](Node* n){
+      if (n->Opcode() == Op_AndL || n->Opcode() == Op_AndI) {
+        worklist.push(n);
+      }
+    };
+    use->visit_uses(push_and_to_worklist, is_boundary);
+  }
 }
 
 /**
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
new file mode 100644
index 00000000000..a32fa020065
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
@@ -0,0 +1,68 @@
+/*
+ * 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 8319372 8320909
+ * @summary Missed optimization in IGVN because `CastIINode::Value` used to
+ *          look for deep structures. Reported in 8320909. Fixed in 8319372.
+ *
+ * @run main/othervm
+ *           -XX:CompileCommand=quiet
+ *           -XX:CompileCommand=compileonly,MissedOptCastII::*
+ *           -XX:-TieredCompilation -Xcomp
+ *           -XX:+IgnoreUnrecognizedVMOptions
+ *           -XX:+StressIGVN -XX:VerifyIterativeGVN=10
+ *           MissedOptCastII
+ */
+
+/*
+ * @test
+ * @bug 8319372 8320909
+ *
+ * @run main/othervm MissedOptCastII
+ */
+
+public class MissedOptCastII {
+    static long res = 0;
+
+    static void test() {
+        int i, i1 = 0, k, l = -4;
+        for (i = 0; i < 100; i++) {
+            for (int j = 0; j < 10; j++) {
+                for (k = 1; k < 2; k++) {
+                    i1 = l;
+                    l += k * k;
+                    if (l != 0) {
+                        res = i + i1 + Float.floatToIntBits(2);
+                    }
+                }
+            }
+        }
+        res = i + i1;
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvAnd.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvAnd.java
new file mode 100644
index 00000000000..1b81b81aca5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvAnd.java
@@ -0,0 +1,72 @@
+/*
+ * 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 8320909
+ * @summary AndNode has a special handling when one of the operands is a LShiftNode:
+ *          (LHS << s) & RHS
+ *          if RHS fits in less than s bits, the value of this expression is 0.
+ *          The case where there is a conversion node between the Shift and the And as in:
+ *          AndLNode(ConvI2L(LShiftI(LHS, s)), RHS)
+ *          is also handled, but the AndL must be pushed directly in IGVN's worklist because
+ *          ConvI2L might not have an update when its input change. In this example, the
+ *          input was a Phi with a dead branch and becomes a LShiftI with the same type.
+ *
+ * @run main/othervm
+ *          -XX:CompileOnly=MissedOptWithShiftConvAnd::test
+ *          -XX:-TieredCompilation -Xbatch
+ *          -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=10
+ *          MissedOptWithShiftConvAnd
+ */
+
+/*
+ * @test
+ * @bug 8320909
+ *
+ * @run main/othervm MissedOptWithShiftConvAnd
+ */
+
+public class MissedOptWithShiftConvAnd {
+    static long lFld;
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 100; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        long l3 = 0;
+        int i13 = 1;
+        for (l3 = 8; l3 < 200; ++l3) {
+            for (int i12 = 1; i12 < 2; i12++) {
+                i13 <<= 73;
+            }
+        }
+        for (int i14 = 1; 2 > i14; ++i14) {
+            i13 &= l3;
+            lFld = i13;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvCastAnd.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvCastAnd.java
new file mode 100644
index 00000000000..f354464fa50
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptWithShiftConvCastAnd.java
@@ -0,0 +1,76 @@
+/*
+ * 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 8320909
+ * @summary Similar to MissedOptWithShiftConvAnd, but with CastII on the way.
+ * @library /test/lib
+ *
+ * @run main/othervm
+ *          -XX:CompileOnly=MissedOptWithShiftConvCastAnd::test
+ *          -XX:-TieredCompilation -Xbatch
+ *          -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=10
+ *          MissedOptWithShiftConvCastAnd
+ */
+
+/*
+ * @test
+ * @bug 8320909
+ * @library /test/lib
+ *
+ * @run main/othervm MissedOptWithShiftConvCastAnd
+ */
+
+import jdk.test.lib.Utils;
+
+public class MissedOptWithShiftConvCastAnd {
+    static long instanceCount;
+
+    public static void main(String[] args) throws Exception {
+        Thread thread = new Thread() {
+            public void run() {
+                test(0);
+            }
+        };
+        // Give thread some time to trigger compilation
+        thread.setDaemon(true);
+        thread.start();
+        Thread.sleep(Utils.adjustTimeout(500));
+    }
+
+    static void test(int x) {
+        for (int i = 3; ; ++i) {
+            for (int j = 5; j > 1; --j) {
+                instanceCount >>= x <<= 16;
+            }
+            x >>>= 16;
+            for (int j = 1; j < 5; j++) {
+                try {
+                    x = 1;
+                } catch (ArithmeticException a_e) {
+                }
+            }
+        }
+    }
+}

From d3f31b0d8e9c90f3dc8e97a299c9e0b7f5b05284 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 24 Apr 2025 11:43:53 +0000
Subject: [PATCH 111/901] 8347719: [REDO] Portable implementation of
 FORBID_C_FUNCTION and ALLOW_C_FUNCTION

Reviewed-by: tschatzl, jsjolen
---
 src/hotspot/os/aix/libodm_aix.cpp             |  3 +-
 src/hotspot/os/aix/loadlib_aix.cpp            | 17 ++--
 src/hotspot/os/aix/os_aix.cpp                 |  9 +-
 src/hotspot/os/aix/porting_aix.cpp            |  5 +-
 src/hotspot/os/bsd/decoder_machO.cpp          |  8 +-
 src/hotspot/os/linux/decoder_linux.cpp        |  9 +-
 .../os/linux/gc/z/zMountPoint_linux.cpp       |  9 +-
 src/hotspot/os/linux/mallocInfoDcmd.cpp       |  9 +-
 .../os/posix/forbiddenFunctions_posix.hpp     | 64 +++++++++++++
 src/hotspot/os/posix/os_posix.cpp             | 11 +--
 .../posix/permitForbiddenFunctions_posix.hpp  | 45 ++++++++++
 .../os/windows/forbiddenFunctions_windows.hpp | 38 ++++++++
 src/hotspot/os/windows/os_windows.cpp         |  9 +-
 .../permitForbiddenFunctions_windows.hpp      | 45 ++++++++++
 src/hotspot/os/windows/symbolengine.cpp       |  5 +-
 src/hotspot/share/jvmci/jvmciEnv.cpp          |  3 +-
 src/hotspot/share/logging/logTagSet.cpp       |  5 +-
 src/hotspot/share/nmt/mallocSiteTable.cpp     |  6 +-
 src/hotspot/share/nmt/memMapPrinter.cpp       |  9 +-
 src/hotspot/share/nmt/nmtPreInit.cpp          |  7 +-
 src/hotspot/share/runtime/os.cpp              | 12 +--
 .../share/utilities/compilerWarnings.hpp      | 64 ++++++++++---
 .../share/utilities/compilerWarnings_gcc.hpp  | 89 +++++++++++++------
 .../utilities/compilerWarnings_visCPP.hpp     | 44 +++------
 .../share/utilities/forbiddenFunctions.hpp    | 79 ++++++++++++++++
 .../share/utilities/globalDefinitions.hpp     | 30 +------
 .../utilities/permitForbiddenFunctions.hpp    | 73 +++++++++++++++
 test/hotspot/gtest/code/test_codestrings.cpp  |  3 +
 .../shenandoah/test_shenandoahNumberSeq.cpp   |  2 +
 .../test_shenandoahSimpleBitMap.cpp           |  6 +-
 test/hotspot/gtest/gtestMain.cpp              |  5 +-
 test/hotspot/gtest/unittest.hpp               |  4 +
 32 files changed, 564 insertions(+), 163 deletions(-)
 create mode 100644 src/hotspot/os/posix/forbiddenFunctions_posix.hpp
 create mode 100644 src/hotspot/os/posix/permitForbiddenFunctions_posix.hpp
 create mode 100644 src/hotspot/os/windows/forbiddenFunctions_windows.hpp
 create mode 100644 src/hotspot/os/windows/permitForbiddenFunctions_windows.hpp
 create mode 100644 src/hotspot/share/utilities/forbiddenFunctions.hpp
 create mode 100644 src/hotspot/share/utilities/permitForbiddenFunctions.hpp

diff --git a/src/hotspot/os/aix/libodm_aix.cpp b/src/hotspot/os/aix/libodm_aix.cpp
index 9fe0fb7abd8..854fd5e2b79 100644
--- a/src/hotspot/os/aix/libodm_aix.cpp
+++ b/src/hotspot/os/aix/libodm_aix.cpp
@@ -30,6 +30,7 @@
 #include <string.h>
 #include "runtime/arguments.hpp"
 #include "runtime/os.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 
 dynamicOdm::dynamicOdm() {
@@ -59,7 +60,7 @@ dynamicOdm::~dynamicOdm() {
 }
 
 
-void odmWrapper::clean_data() { if (_data) { free(_data); _data = nullptr; } }
+void odmWrapper::clean_data() { if (_data) { permit_forbidden_function::free(_data); _data = nullptr; } }
 
 
 int odmWrapper::class_offset(const char *field, bool is_aix_5)
diff --git a/src/hotspot/os/aix/loadlib_aix.cpp b/src/hotspot/os/aix/loadlib_aix.cpp
index 90a7271ad6d..e7dbd775e37 100644
--- a/src/hotspot/os/aix/loadlib_aix.cpp
+++ b/src/hotspot/os/aix/loadlib_aix.cpp
@@ -38,6 +38,7 @@
 #include "logging/log.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 // For loadquery()
 #include <sys/ldr.h>
@@ -58,7 +59,7 @@ class StringList {
   // Enlarge list. If oom, leave old list intact and return false.
   bool enlarge() {
     int cap2 = _cap + 64;
-    char** l2 = (char**) ::realloc(_list, sizeof(char*) * cap2);
+    char** l2 = (char**) permit_forbidden_function::realloc(_list, sizeof(char*) * cap2);
     if (!l2) {
       return false;
     }
@@ -76,7 +77,7 @@ class StringList {
       }
     }
     assert0(_cap > _num);
-    char* s2 = ::strdup(s);
+    char* s2 = permit_forbidden_function::strdup(s);
     if (!s2) {
       return nullptr;
     }
@@ -170,7 +171,7 @@ static void free_entry_list(loaded_module_t** start) {
   loaded_module_t* lm = *start;
   while (lm) {
     loaded_module_t* const lm2 = lm->next;
-    ::free(lm);
+    permit_forbidden_function::free(lm);
     lm = lm2;
   }
   *start = nullptr;
@@ -193,7 +194,7 @@ static bool reload_table() {
   uint8_t* buffer = nullptr;
   size_t buflen = 1024;
   for (;;) {
-    buffer = (uint8_t*) ::realloc(buffer, buflen);
+    buffer = (uint8_t*) permit_forbidden_function::realloc(buffer, buflen);
     if (loadquery(L_GETINFO, buffer, buflen) == -1) {
       if (errno == ENOMEM) {
         buflen *= 2;
@@ -229,7 +230,7 @@ static bool reload_table() {
 
   for (;;) {
 
-    loaded_module_t* lm = (loaded_module_t*) ::malloc(sizeof(loaded_module_t));
+    loaded_module_t* lm = (loaded_module_t*) permit_forbidden_function::malloc(sizeof(loaded_module_t));
     if (!lm) {
       log_warning(os)("OOM.");
       goto cleanup;
@@ -250,7 +251,7 @@ static bool reload_table() {
 
     if (!lm->path) {
       log_warning(os)("OOM.");
-      free(lm);
+      permit_forbidden_function::free(lm);
       goto cleanup;
     }
 
@@ -272,7 +273,7 @@ static bool reload_table() {
       lm->member = g_stringlist.add(p_mbr_name);
       if (!lm->member) {
         log_warning(os)("OOM.");
-        free(lm);
+        permit_forbidden_function::free(lm);
         goto cleanup;
       }
     } else {
@@ -320,7 +321,7 @@ static bool reload_table() {
     free_entry_list(&new_list);
   }
 
-  ::free(buffer);
+  permit_forbidden_function::free(buffer);
 
   return rc;
 
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index d913139ffdf..49dcebd0083 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -73,6 +73,7 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "utilities/vmError.hpp"
 #if INCLUDE_JFR
 #include "jfr/support/jfrNativeLibraryLoadEvent.hpp"
@@ -369,9 +370,9 @@ static void query_multipage_support() {
   // or by environment variable LDR_CNTRL (suboption DATAPSIZE). If none is given,
   // default should be 4K.
   {
-    void* p = ::malloc(16*M);
+    void* p = permit_forbidden_function::malloc(16*M);
     g_multipage_support.datapsize = os::Aix::query_pagesize(p);
-    ::free(p);
+    permit_forbidden_function::free(p);
   }
 
   // Query default shm page size (LDR_CNTRL SHMPSIZE).
@@ -1398,7 +1399,7 @@ static struct {
 } vmem;
 
 static void vmembk_add(char* addr, size_t size, size_t pagesize, int type) {
-  vmembk_t* p = (vmembk_t*) ::malloc(sizeof(vmembk_t));
+  vmembk_t* p = (vmembk_t*) permit_forbidden_function::malloc(sizeof(vmembk_t));
   assert0(p);
   if (p) {
     MiscUtils::AutoCritSect lck(&vmem.cs);
@@ -1427,7 +1428,7 @@ static void vmembk_remove(vmembk_t* p0) {
   for (vmembk_t** pp = &(vmem.first); *pp; pp = &((*pp)->next)) {
     if (*pp == p0) {
       *pp = p0->next;
-      ::free(p0);
+      permit_forbidden_function::free(p0);
       return;
     }
   }
diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp
index cbc45d3e122..2235d3da686 100644
--- a/src/hotspot/os/aix/porting_aix.cpp
+++ b/src/hotspot/os/aix/porting_aix.cpp
@@ -39,6 +39,7 @@
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include <cxxabi.h>
 #include <sys/debug.h>
 #include <pthread.h>
@@ -250,7 +251,7 @@ bool AixSymbols::get_function_name (
           p_name[namelen-1] = '\0';
         }
         if (demangled_name != nullptr) {
-          ALLOW_C_FUNCTION(::free, ::free(demangled_name));
+          permit_forbidden_function::free(demangled_name);
         }
       }
     } else {
@@ -1081,7 +1082,7 @@ void* Aix_dlopen(const char* filename, int Flags, int *eno, const char** error_r
       if (g_handletable_used == max_handletable) {
         // No place in array anymore; increase array.
         unsigned new_max = MAX2(max_handletable * 2, init_num_handles);
-        struct handletableentry* new_tab = (struct handletableentry*)::realloc(p_handletable, new_max * sizeof(struct handletableentry));
+        struct handletableentry* new_tab = (struct handletableentry*) permit_forbidden_function::realloc(p_handletable, new_max * sizeof(struct handletableentry));
         assert(new_tab != nullptr, "no more memory for handletable");
         if (new_tab == nullptr) {
           *error_report = "dlopen: no more memory for handletable";
diff --git a/src/hotspot/os/bsd/decoder_machO.cpp b/src/hotspot/os/bsd/decoder_machO.cpp
index 173e030a7b5..15592d172fe 100644
--- a/src/hotspot/os/bsd/decoder_machO.cpp
+++ b/src/hotspot/os/bsd/decoder_machO.cpp
@@ -27,6 +27,8 @@
 #include "decoder_machO.hpp"
 #include "jvm.h"
 #include "memory/allocation.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 #include <cxxabi.h>
 #include <mach-o/loader.h>
@@ -42,9 +44,9 @@ bool MachODecoder::demangle(const char* symbol, char *buf, int buflen) {
   // may use different malloc/realloc mechanism that allocates 'buf'.
   if ((result = abi::__cxa_demangle(symbol, nullptr, nullptr, &status)) != nullptr) {
     jio_snprintf(buf, buflen, "%s", result);
-      // call c library's free
-      ::free(result);
-      return true;
+    // call c library's free
+    permit_forbidden_function::free(result);
+    return true;
   }
   return false;
 }
diff --git a/src/hotspot/os/linux/decoder_linux.cpp b/src/hotspot/os/linux/decoder_linux.cpp
index 26b435f69e1..bfe5c537864 100644
--- a/src/hotspot/os/linux/decoder_linux.cpp
+++ b/src/hotspot/os/linux/decoder_linux.cpp
@@ -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
@@ -27,6 +27,7 @@
 #include "utilities/decoder_elf.hpp"
 #include "utilities/elfFile.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 #include <cxxabi.h>
 
@@ -46,9 +47,9 @@ bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) {
   // may use different malloc/realloc mechanism that allocates 'buf'.
   if ((result = abi::__cxa_demangle(symbol, nullptr, nullptr, &status)) != nullptr) {
     jio_snprintf(buf, buflen, "%s", result);
-      // call c library's free
-      ALLOW_C_FUNCTION(::free, ::free(result);)
-      return true;
+    // call c library's free
+    permit_forbidden_function::free(result);
+    return true;
   }
   return false;
 }
diff --git a/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp b/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp
index 60ce39179ff..92c5cb713ac 100644
--- a/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp
+++ b/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp
@@ -28,6 +28,7 @@
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -62,11 +63,11 @@ char* ZMountPoint::get_mountpoint(const char* line, const char* filesystem) cons
       strcmp(line_filesystem, filesystem) != 0 ||
       access(line_mountpoint, R_OK|W_OK|X_OK) != 0) {
     // Not a matching or accessible filesystem
-    ALLOW_C_FUNCTION(::free, ::free(line_mountpoint);)
+    permit_forbidden_function::free(line_mountpoint);
     line_mountpoint = nullptr;
   }
 
-  ALLOW_C_FUNCTION(::free, ::free(line_filesystem);)
+  permit_forbidden_function::free(line_filesystem);
 
   return line_mountpoint;
 }
@@ -90,14 +91,14 @@ void ZMountPoint::get_mountpoints(const char* filesystem, ZArray<char*>* mountpo
   }
 
   // readline will return malloced memory. Need raw ::free, not os::free.
-  ALLOW_C_FUNCTION(::free, ::free(line);)
+  permit_forbidden_function::free(line);
   fclose(fd);
 }
 
 void ZMountPoint::free_mountpoints(ZArray<char*>* mountpoints) const {
   ZArrayIterator<char*> iter(mountpoints);
   for (char* mountpoint; iter.next(&mountpoint);) {
-    ALLOW_C_FUNCTION(::free, ::free(mountpoint);) // *not* os::free
+    permit_forbidden_function::free(mountpoint); // *not* os::free
   }
   mountpoints->clear();
 }
diff --git a/src/hotspot/os/linux/mallocInfoDcmd.cpp b/src/hotspot/os/linux/mallocInfoDcmd.cpp
index ad98d5edece..1a2368b1e50 100644
--- a/src/hotspot/os/linux/mallocInfoDcmd.cpp
+++ b/src/hotspot/os/linux/mallocInfoDcmd.cpp
@@ -26,6 +26,7 @@
 #include "os_linux.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 #include <malloc.h>
 
@@ -35,7 +36,7 @@ void MallocInfoDcmd::execute(DCmdSource source, TRAPS) {
 #ifdef __GLIBC__
   char* buf;
   size_t size;
-  ALLOW_C_FUNCTION(::open_memstream, FILE* stream = ::open_memstream(&buf, &size);)
+  FILE* stream = ::open_memstream(&buf, &size);
   if (stream == nullptr) {
     _output->print_cr("Error: Could not call malloc_info(3)");
     return;
@@ -43,7 +44,7 @@ void MallocInfoDcmd::execute(DCmdSource source, TRAPS) {
 
   int err = os::Linux::malloc_info(stream);
   if (err == 0) {
-    ALLOW_C_FUNCTION(::fflush, fflush(stream);)
+    fflush(stream);
     _output->print_raw(buf);
     _output->cr();
   } else if (err == -1) {
@@ -53,8 +54,8 @@ void MallocInfoDcmd::execute(DCmdSource source, TRAPS) {
   } else {
     ShouldNotReachHere();
   }
-  ALLOW_C_FUNCTION(::fclose, ::fclose(stream);)
-  ALLOW_C_FUNCTION(::free, ::free(buf);)
+  ::fclose(stream);
+  permit_forbidden_function::free(buf);
 #else
   _output->print_cr(malloc_info_unavailable);
 #endif // __GLIBC__
diff --git a/src/hotspot/os/posix/forbiddenFunctions_posix.hpp b/src/hotspot/os/posix/forbiddenFunctions_posix.hpp
new file mode 100644
index 00000000000..9f9881202c7
--- /dev/null
+++ b/src/hotspot/os/posix/forbiddenFunctions_posix.hpp
@@ -0,0 +1,64 @@
+/*
+ * 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 OS_POSIX_FORBIDDENFUNCTIONS_POSIX_HPP
+#define OS_POSIX_FORBIDDENFUNCTIONS_POSIX_HPP
+
+#include "utilities/compilerWarnings.hpp"
+
+// For types used in the signatures.
+#include <stddef.h>
+
+// Workaround for noreturn functions: _exit - see the clang
+// definition of FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE.
+#ifdef __clang__
+#include <unistd.h>
+#endif
+
+// If needed, add os::strndup and use that instead.
+FORBID_C_FUNCTION(char* strndup(const char*, size_t), "don't use");
+
+// These are unimplementable for Windows, and they aren't useful for a
+// POSIX implementation of NMT either.
+// https://stackoverflow.com/questions/62962839/stdaligned-alloc-missing-from-visual-studio-2019
+FORBID_C_FUNCTION(int posix_memalign(void**, size_t, size_t), "don't use");
+FORBID_C_FUNCTION(void* aligned_alloc(size_t, size_t), "don't use");
+
+// realpath with a null second argument mallocs a string for the result.
+// With a non-null second argument, there is a risk of buffer overrun.
+PRAGMA_DIAG_PUSH
+FORBIDDEN_FUNCTION_IGNORE_CLANG_FORTIFY_WARNING
+FORBID_C_FUNCTION(char* realpath(const char*, char*), "use os::realpath");
+PRAGMA_DIAG_POP
+
+// Returns a malloc'ed string.
+FORBID_C_FUNCTION(char* get_current_dir_name(), "use os::get_current_directory");
+
+// Problematic API that should never be used.
+FORBID_C_FUNCTION(char* getwd(char*), "use os::get_current_directory");
+
+// BSD utility that is subtly different from realloc.
+FORBID_C_FUNCTION(void* reallocf(void*, size_t), "use os::realloc");
+
+#endif // OS_POSIX_FORBIDDENFUNCTIONS_POSIX_HPP
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index a36d6b87641..df084ae6898 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -49,6 +49,7 @@
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "utilities/vmError.hpp"
 #if INCLUDE_JFR
 #include "jfr/support/jfrNativeLibraryLoadEvent.hpp"
@@ -930,11 +931,11 @@ ssize_t os::connect(int fd, struct sockaddr* him, socklen_t len) {
 }
 
 void os::exit(int num) {
-  ALLOW_C_FUNCTION(::exit, ::exit(num);)
+  permit_forbidden_function::exit(num);
 }
 
 void os::_exit(int num) {
-  ALLOW_C_FUNCTION(::_exit, ::_exit(num);)
+  permit_forbidden_function::_exit(num);
 }
 
 void os::naked_yield() {
@@ -991,7 +992,7 @@ char* os::realpath(const char* filename, char* outbuf, size_t outbuflen) {
   // This assumes platform realpath() is implemented according to POSIX.1-2008.
   // POSIX.1-2008 allows to specify null for the output buffer, in which case
   // output buffer is dynamically allocated and must be ::free()'d by the caller.
-  ALLOW_C_FUNCTION(::realpath, char* p = ::realpath(filename, nullptr);)
+  char* p = permit_forbidden_function::realpath(filename, nullptr);
   if (p != nullptr) {
     if (strlen(p) < outbuflen) {
       strcpy(outbuf, p);
@@ -999,7 +1000,7 @@ char* os::realpath(const char* filename, char* outbuf, size_t outbuflen) {
     } else {
       errno = ENAMETOOLONG;
     }
-    ALLOW_C_FUNCTION(::free, ::free(p);) // *not* os::free
+    permit_forbidden_function::free(p); // *not* os::free
   } else {
     // Fallback for platforms struggling with modern Posix standards (AIX 5.3, 6.1). If realpath
     // returns EINVAL, this may indicate that realpath is not POSIX.1-2008 compatible and
@@ -1008,7 +1009,7 @@ char* os::realpath(const char* filename, char* outbuf, size_t outbuflen) {
     // a memory overwrite.
     if (errno == EINVAL) {
       outbuf[outbuflen - 1] = '\0';
-      ALLOW_C_FUNCTION(::realpath, p = ::realpath(filename, outbuf);)
+      p = permit_forbidden_function::realpath(filename, outbuf);
       if (p != nullptr) {
         guarantee(outbuf[outbuflen - 1] == '\0', "realpath buffer overwrite detected.");
         result = p;
diff --git a/src/hotspot/os/posix/permitForbiddenFunctions_posix.hpp b/src/hotspot/os/posix/permitForbiddenFunctions_posix.hpp
new file mode 100644
index 00000000000..3ff8c383a31
--- /dev/null
+++ b/src/hotspot/os/posix/permitForbiddenFunctions_posix.hpp
@@ -0,0 +1,45 @@
+/*
+ * 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 OS_POSIX_PERMITFORBIDDENFUNCTIONS_POSIX_HPP
+#define OS_POSIX_PERMITFORBIDDENFUNCTIONS_POSIX_HPP
+
+#include "utilities/compilerWarnings.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// Provide wrappers for some functions otherwise forbidden from use in HotSpot.
+// See forbiddenFunctions.hpp for details.
+
+namespace permit_forbidden_function {
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+
+// Used by the POSIX implementation of os::realpath.
+inline char* realpath(const char* path, char* resolved_path) {
+  return ::realpath(path, resolved_path);
+}
+
+END_ALLOW_FORBIDDEN_FUNCTIONS
+} // namespace permit_forbidden_function
+
+#endif // OS_POSIX_PERMITFORBIDDENFUNCTIONS_POSIX_HPP
diff --git a/src/hotspot/os/windows/forbiddenFunctions_windows.hpp b/src/hotspot/os/windows/forbiddenFunctions_windows.hpp
new file mode 100644
index 00000000000..81599522ed4
--- /dev/null
+++ b/src/hotspot/os/windows/forbiddenFunctions_windows.hpp
@@ -0,0 +1,38 @@
+/*
+ * 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 OS_WINDOWS_FORBIDDENFUNCTIONS_WINDOWS_HPP
+#define OS_WINDOWS_FORBIDDENFUNCTIONS_WINDOWS_HPP
+
+#include "utilities/compilerWarnings.hpp"
+
+#include <stddef.h> // for size_t
+
+// _fullpath with a null first argument mallocs a string for the result.
+FORBID_IMPORTED_C_FUNCTION(char* _fullpath(char*, const char*, size_t), "use os::realpath");
+
+// _snprintf does NOT null terminate if the output would exceed the buffer size.
+FORBID_C_FUNCTION(int _snprintf(char*, size_t, const char*, ...), "use os::snprintf");
+
+#endif // OS_WINDOWS_FORBIDDENFUNCTIONS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 84e89334feb..959a0616834 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -76,6 +76,7 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "utilities/population_count.hpp"
 #include "utilities/vmError.hpp"
 #include "windbghelp.hpp"
@@ -4358,9 +4359,9 @@ static void exit_process_or_thread(Ept what, int exit_code) {
   if (what == EPT_THREAD) {
     _endthreadex((unsigned)exit_code);
   } else if (what == EPT_PROCESS) {
-    ALLOW_C_FUNCTION(::exit, ::exit(exit_code);)
+    permit_forbidden_function::exit(exit_code);
   } else { // EPT_PROCESS_DIE
-    ALLOW_C_FUNCTION(::_exit, ::_exit(exit_code);)
+    permit_forbidden_function::_exit(exit_code);
   }
 
   // Should not reach here
@@ -5131,7 +5132,7 @@ char* os::realpath(const char* filename, char* outbuf, size_t outbuflen) {
   }
 
   char* result = nullptr;
-  ALLOW_C_FUNCTION(::_fullpath, char* p = ::_fullpath(nullptr, filename, 0);)
+  char* p = permit_forbidden_function::_fullpath(nullptr, filename, 0);
   if (p != nullptr) {
     if (strlen(p) < outbuflen) {
       strcpy(outbuf, p);
@@ -5139,7 +5140,7 @@ char* os::realpath(const char* filename, char* outbuf, size_t outbuflen) {
     } else {
       errno = ENAMETOOLONG;
     }
-    ALLOW_C_FUNCTION(::free, ::free(p);) // *not* os::free
+    permit_forbidden_function::free(p); // *not* os::free
   }
   return result;
 }
diff --git a/src/hotspot/os/windows/permitForbiddenFunctions_windows.hpp b/src/hotspot/os/windows/permitForbiddenFunctions_windows.hpp
new file mode 100644
index 00000000000..99e77464fbd
--- /dev/null
+++ b/src/hotspot/os/windows/permitForbiddenFunctions_windows.hpp
@@ -0,0 +1,45 @@
+/*
+ * 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 OS_WINDOWS_PERMITFORBIDDENFUNCTIONS_WINDOWS_HPP
+#define OS_WINDOWS_PERMITFORBIDDENFUNCTIONS_WINDOWS_HPP
+
+#include "utilities/compilerWarnings.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// Provide wrappers for some functions otherwise forbidden from use in HotSpot.
+// See forbiddenFunctions.hpp for details.
+
+namespace permit_forbidden_function {
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+
+// Used by the Windows implementation of os::realpath.
+inline char* _fullpath(char* absPath, const char* relPath, size_t maxLength) {
+  return ::_fullpath(absPath, relPath, maxLength);
+}
+
+END_ALLOW_FORBIDDEN_FUNCTIONS
+} // namespace permit_forbidden_function
+
+#endif // OS_WINDOWS_PERMITFORBIDDENFUNCTIONS_WINDOWS_HPP
diff --git a/src/hotspot/os/windows/symbolengine.cpp b/src/hotspot/os/windows/symbolengine.cpp
index 83cb930f7bf..8f6f6cf09c6 100644
--- a/src/hotspot/os/windows/symbolengine.cpp
+++ b/src/hotspot/os/windows/symbolengine.cpp
@@ -26,6 +26,7 @@
 #include "symbolengine.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "windbghelp.hpp"
 
 #include <windows.h>
@@ -102,7 +103,7 @@ class SimpleBufferWithFallback {
   virtual void initialize () {
     assert(_p == nullptr && _capacity == 0, "Only call once.");
     const size_t bytes = OPTIMAL_CAPACITY * sizeof(T);
-    T* q = (T*) ::malloc(bytes);
+    T* q = (T*) permit_forbidden_function::malloc(bytes);
     if (q != nullptr) {
       _p = q;
       _capacity = OPTIMAL_CAPACITY;
@@ -118,7 +119,7 @@ class SimpleBufferWithFallback {
   // case, where two buffers need to be of identical capacity.
   void reset_to_fallback_capacity() {
     if (_p != _fallback_buffer) {
-      ::free(_p);
+      permit_forbidden_function::free(_p);
     }
     _p = _fallback_buffer;
     _capacity = (int)(sizeof(_fallback_buffer) / sizeof(T));
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index a23b09c3c1e..5a0efef0bd3 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -46,6 +46,7 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/os.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 JVMCICompileState::JVMCICompileState(CompileTask* task, JVMCICompiler* compiler):
   _task(task),
@@ -612,7 +613,7 @@ JVMCIEnv::~JVMCIEnv() {
   if (_init_error_msg != nullptr) {
     // The memory allocated in libjvmci was not allocated with os::malloc
     // so must not be freed with os::free.
-    ALLOW_C_FUNCTION(::free, ::free((void*) _init_error_msg);)
+    permit_forbidden_function::free((void*)_init_error_msg);
   }
   if (_init_error != JNI_OK) {
     return;
diff --git a/src/hotspot/share/logging/logTagSet.cpp b/src/hotspot/share/logging/logTagSet.cpp
index f7b0e01331c..4719d0a926e 100644
--- a/src/hotspot/share/logging/logTagSet.cpp
+++ b/src/hotspot/share/logging/logTagSet.cpp
@@ -34,6 +34,7 @@
 #include "memory/allocation.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 LogTagSet*  LogTagSet::_list      = nullptr;
 size_t      LogTagSet::_ntagsets  = 0;
@@ -149,7 +150,7 @@ void LogTagSet::vwrite(LogLevelType level, const char* fmt, va_list args) {
   } else {
     // Buffer too small, allocate a large enough buffer using malloc/free to avoid circularity.
     // Since logging is a very basic function, conceivably used within NMT itself, avoid os::malloc/free
-    ALLOW_C_FUNCTION(::malloc, char* newbuf = (char*)::malloc(newbuf_len * sizeof(char));)
+    char* newbuf = (char*)permit_forbidden_function::malloc(newbuf_len * sizeof(char));
     if (newbuf != nullptr) {
       prefix_len = _write_prefix(newbuf, newbuf_len);
       ret = os::vsnprintf(newbuf + prefix_len, newbuf_len - prefix_len, fmt, saved_args);
@@ -159,7 +160,7 @@ void LogTagSet::vwrite(LogLevelType level, const char* fmt, va_list args) {
       if (ret < 0) {
         log(level, "Log message newbuf issue");
       }
-      ALLOW_C_FUNCTION(::free, ::free(newbuf);)
+      permit_forbidden_function::free(newbuf);
     } else {
       // Native OOM, use buf to output the least message. At this moment buf is full of either
       // truncated prefix or truncated prefix + string. Put trunc_msg at the end of buf.
diff --git a/src/hotspot/share/nmt/mallocSiteTable.cpp b/src/hotspot/share/nmt/mallocSiteTable.cpp
index 71e75551e2f..55fa5f0b173 100644
--- a/src/hotspot/share/nmt/mallocSiteTable.cpp
+++ b/src/hotspot/share/nmt/mallocSiteTable.cpp
@@ -25,6 +25,8 @@
 #include "memory/allocation.inline.hpp"
 #include "nmt/mallocSiteTable.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 // Malloc site hashtable buckets
 MallocSiteHashtableEntry**  MallocSiteTable::_table = nullptr;
@@ -40,9 +42,7 @@ const MallocSiteHashtableEntry* MallocSiteTable::_hash_entry_allocation_site = n
  * time, it is in single-threaded mode from JVM perspective.
  */
 bool MallocSiteTable::initialize() {
-
-  ALLOW_C_FUNCTION(::calloc,
-                   _table = (MallocSiteHashtableEntry**)::calloc(table_size, sizeof(MallocSiteHashtableEntry*));)
+  _table = (MallocSiteHashtableEntry**)permit_forbidden_function::calloc(table_size, sizeof(MallocSiteHashtableEntry*));
   if (_table == nullptr) {
     return false;
   }
diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index db67321fb1d..804a03f45e5 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -42,6 +42,7 @@
 #include "runtime/vmThread.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 // Note: throughout this code we will use the term "VMA" for OS system level memory mapping
 
@@ -95,8 +96,8 @@ class CachedNMTInformation : public VirtualMemoryWalker {
                            _count(0), _capacity(0), _last(0) {}
 
   ~CachedNMTInformation() {
-    ALLOW_C_FUNCTION(free, ::free(_ranges);)
-    ALLOW_C_FUNCTION(free, ::free(_mem_tags);)
+    permit_forbidden_function::free(_ranges);
+    permit_forbidden_function::free(_mem_tags);
   }
 
   bool add(const void* from, const void* to, MemTag mem_tag) {
@@ -111,8 +112,8 @@ class CachedNMTInformation : public VirtualMemoryWalker {
       // Enlarge if needed
       const size_t new_capacity = MAX2((size_t)4096, 2 * _capacity);
       // Unfortunately, we need to allocate manually, raw, since we must prevent NMT deadlocks (ThreadCritical).
-      ALLOW_C_FUNCTION(realloc, _ranges = (Range*)::realloc(_ranges, new_capacity * sizeof(Range));)
-      ALLOW_C_FUNCTION(realloc, _mem_tags = (MemTag*)::realloc(_mem_tags, new_capacity * sizeof(MemTag));)
+      _ranges = (Range*)permit_forbidden_function::realloc(_ranges, new_capacity * sizeof(Range));
+      _mem_tags = (MemTag*)permit_forbidden_function::realloc(_mem_tags, new_capacity * sizeof(MemTag));
       if (_ranges == nullptr || _mem_tags == nullptr) {
         // In case of OOM lets make no fuss. Just return.
         return false;
diff --git a/src/hotspot/share/nmt/nmtPreInit.cpp b/src/hotspot/share/nmt/nmtPreInit.cpp
index 34a2d8dd7d2..3b9150366dc 100644
--- a/src/hotspot/share/nmt/nmtPreInit.cpp
+++ b/src/hotspot/share/nmt/nmtPreInit.cpp
@@ -29,12 +29,13 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
 // Obviously we cannot use os::malloc for any dynamic allocation during pre-NMT-init, so we must use
 // raw malloc; to make this very clear, wrap them.
-static void* raw_malloc(size_t s)               { ALLOW_C_FUNCTION(::malloc, return ::malloc(s);) }
-static void* raw_realloc(void* old, size_t s)   { ALLOW_C_FUNCTION(::realloc, return ::realloc(old, s);) }
-static void  raw_free(void* p)                  { ALLOW_C_FUNCTION(::free, ::free(p);) }
+static void* raw_malloc(size_t s)               { return permit_forbidden_function::malloc(s); }
+static void* raw_realloc(void* old, size_t s)   { return permit_forbidden_function::realloc(old, s); }
+static void  raw_free(void* p)                  { permit_forbidden_function::free(p); }
 
 // To keep matters simple we just raise a fatal error on OOM. Since preinit allocation
 // is just used for pre-VM-initialization mallocs, none of which are optional, we don't
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 943f81d752c..67b25be8eb9 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -76,7 +76,9 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/fastrand.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 #ifdef LINUX
@@ -117,7 +119,7 @@ int os::snprintf_checked(char* buf, size_t len, const char* fmt, ...) {
 }
 
 int os::vsnprintf(char* buf, size_t len, const char* fmt, va_list args) {
-  ALLOW_C_FUNCTION(::vsnprintf, int result = ::vsnprintf(buf, len, fmt, args);)
+  int result = permit_forbidden_function::vsnprintf(buf, len, fmt, args);
   // If an encoding error occurred (result < 0) then it's not clear
   // whether the buffer is NUL terminated, so ensure it is.
   if ((result < 0) && (len > 0)) {
@@ -654,7 +656,7 @@ void* os::malloc(size_t size, MemTag mem_tag, const NativeCallStack& stack) {
     return nullptr;
   }
 
-  ALLOW_C_FUNCTION(::malloc, void* const outer_ptr = ::malloc(outer_size);)
+  void* const outer_ptr = permit_forbidden_function::malloc(outer_size);
   if (outer_ptr == nullptr) {
     return nullptr;
   }
@@ -721,7 +723,7 @@ void* os::realloc(void *memblock, size_t size, MemTag mem_tag, const NativeCallS
     header->mark_block_as_dead();
 
     // the real realloc
-    ALLOW_C_FUNCTION(::realloc, void* const new_outer_ptr = ::realloc(header, new_outer_size);)
+    void* const new_outer_ptr = permit_forbidden_function::realloc(header, new_outer_size);
 
     if (new_outer_ptr == nullptr) {
       // realloc(3) failed and the block still exists.
@@ -749,7 +751,7 @@ void* os::realloc(void *memblock, size_t size, MemTag mem_tag, const NativeCallS
   } else {
 
     // NMT disabled.
-    ALLOW_C_FUNCTION(::realloc, rc = ::realloc(memblock, size);)
+    rc = permit_forbidden_function::realloc(memblock, size);
     if (rc == nullptr) {
       return nullptr;
     }
@@ -777,7 +779,7 @@ void  os::free(void *memblock) {
   // When NMT is enabled this checks for heap overwrites, then deaccounts the old block.
   void* const old_outer_ptr = MemTracker::record_free(memblock);
 
-  ALLOW_C_FUNCTION(::free, ::free(old_outer_ptr);)
+  permit_forbidden_function::free(old_outer_ptr);
 }
 
 void os::init_random(unsigned int initval) {
diff --git a/src/hotspot/share/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp
index ddcaf022fa6..e2c9fc289f6 100644
--- a/src/hotspot/share/utilities/compilerWarnings.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings.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
@@ -88,23 +88,61 @@
 
 // Support warnings for use of certain C functions, except where explicitly
 // permitted.
+
+// FORBID_C_FUNCTION(Signature, Alternative)
+// - Signature: the function that should not normally be used.
+// - Alternative: a string literal that may be used in a warning about a use,
+//   often suggesting an alternative.
+// Declares the C-linkage function designated by Signature to be deprecated,
+// using the `deprecated` attribute with Alternative as an argument.
 //
-// FORBID_C_FUNCTION(signature, alternative)
-// - signature: the function that should not normally be used.
-// - alternative: a string that may be used in a warning about a use, typically
-//   suggesting an alternative.
+// The variants with IMPORTED in the name are to deal with Windows
+// requirements, using FORBIDDEN_FUNCTION_IMPORT_SPEC.  See the Visual
+// Studio definition of that macro for more details.  The default has
+// an empty expansion.  The potentially added spec must precede the
+// base signature but follow all attributes.
 //
-// ALLOW_C_FUNCTION(name, ... using statement ...)
-// - name: the name of a forbidden function whose use is permitted in statement.
-// - statement: a use of the otherwise forbidden function.  Using a variadic
-//   tail allows the statement to contain non-nested commas.
+// FORBID_NORETURN_C_FUNCTION deals with a clang issue.  See the clang
+// definition of FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE for more
+// details.  The default expands to `[[noreturn]]`.
+#define FORBID_C_FUNCTION(Signature, Alternative) \
+  extern "C" { [[deprecated(Alternative)]] Signature; }
+
+#ifndef FORBIDDEN_FUNCTION_IMPORT_SPEC
+#define FORBIDDEN_FUNCTION_IMPORT_SPEC
+#endif
 
-#ifndef FORBID_C_FUNCTION
-#define FORBID_C_FUNCTION(signature, alternative)
+#ifndef FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE
+#define FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE [[noreturn]]
 #endif
 
-#ifndef ALLOW_C_FUNCTION
-#define ALLOW_C_FUNCTION(name, ...) __VA_ARGS__
+#ifndef FORBIDDEN_FUNCTION_IGNORE_CLANG_FORTIFY_WARNING
+#define FORBIDDEN_FUNCTION_IGNORE_CLANG_FORTIFY_WARNING
 #endif
 
+#define FORBID_IMPORTED_C_FUNCTION(Signature, Alternative) \
+  FORBID_C_FUNCTION(FORBIDDEN_FUNCTION_IMPORT_SPEC Signature, Alternative)
+
+#define FORBID_NORETURN_C_FUNCTION(Signature, Alternative) \
+  FORBID_C_FUNCTION(FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE Signature, Alternative)
+
+#define FORBID_IMPORTED_NORETURN_C_FUNCTION(Signature, Alternative) \
+  FORBID_NORETURN_C_FUNCTION(FORBIDDEN_FUNCTION_IMPORT_SPEC Signature, Alternative)
+
+// A BEGIN/END_ALLOW_FORBIDDEN_FUNCTIONS pair establishes a scope in which the
+// deprecation warnings used to forbid the use of certain functions are
+// suppressed.  These macros are not intended for warning suppression at
+// individual call sites; see permitForbiddenFunctions.hpp for the approach
+// taken for that where needed.  Rather, these are used to suppress warnings
+// from 3rd-party code included by HotSpot, such as the gtest framework and
+// C++ Standard Library headers, which may refer to functions that are
+// disallowed in other parts of HotSpot.  They are also used in the
+// implementation of the "permit" mechanism.
+#define BEGIN_ALLOW_FORBIDDEN_FUNCTIONS         \
+  PRAGMA_DIAG_PUSH                              \
+  PRAGMA_DEPRECATED_IGNORED
+
+#define END_ALLOW_FORBIDDEN_FUNCTIONS           \
+  PRAGMA_DIAG_POP
+
 #endif // SHARE_UTILITIES_COMPILERWARNINGS_HPP
diff --git a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
index 1dd5892e4c3..863cc512cca 100644
--- a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings_gcc.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
@@ -70,32 +70,71 @@
 #define PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED \
   PRAGMA_DISABLE_GCC_WARNING("-Wzero-as-null-pointer-constant")
 
-#if (__GNUC__ >= 10)
-// TODO: Re-enable warning attribute for Clang once
-// https://github.com/llvm/llvm-project/issues/56519 is fixed and released.
-// || (defined(__clang_major__) && (__clang_major__ >= 14))
+#define PRAGMA_DEPRECATED_IGNORED \
+  PRAGMA_DISABLE_GCC_WARNING("-Wdeprecated-declarations")
 
-// Use "warning" attribute to detect uses of "forbidden" functions.
+// This macro is used by the NORETURN variants of FORBID_C_FUNCTION.
 //
-// Note: The warning attribute is available since GCC 9, but disabling pragmas
-// does not work reliably in ALLOW_C_FUNCTION. GCC 10+ and up work fine.
+// The [[noreturn]] attribute requires that the first declaration of a
+// function has it if any have it.
 //
-// Note: _FORTIFY_SOURCE transforms calls to certain functions into calls to
-// associated "checking" functions, and that transformation seems to occur
-// *before* the attribute check.  We use fortification in fastdebug builds,
-// so uses of functions that are both forbidden and fortified won't cause
-// forbidden warnings in such builds.
-#define FORBID_C_FUNCTION(signature, alternative) \
-  extern "C" __attribute__((__warning__(alternative))) signature;
-
-// Disable warning attribute over the scope of the affected statement.
-// The name serves only to document the intended function.
-#define ALLOW_C_FUNCTION(name, ...)                     \
-  PRAGMA_DIAG_PUSH                                      \
-  PRAGMA_DISABLE_GCC_WARNING("-Wattribute-warning")     \
-  __VA_ARGS__                                           \
-  PRAGMA_DIAG_POP
-
-#endif // gcc10+
+// gcc, clang, and MSVC all provide compiler-specific alternatives to that
+// attribute: __attribute__((noreturn)) for gcc and clang,
+// __declspec(noreturn) for MSVC and clang. gcc and MSVC treat their
+// respective compiler-specific alternatives as satisfying that requirement.
+// clang does not.
+//
+// So clang warns if we use [[noreturn]] in the forbidding declaration and the
+// library header has already been included and uses the compiler-specific
+// attribute. Similarly, clang warns if we use the compiler-specific attribute
+// while the library uses [[noreturn]] and the library header is included
+// after the forbidding declaration.
+//
+// For now, we're only going to worry about the standard library, and not
+// noreturn functions in some other library that we might want to forbid in
+// the future.  If there's more than one library to be accounted for, then
+// things may get more complicated.
+//
+// There are several ways we could deal with this.
+//
+// Probably the most robust is to use the same style of noreturn attribute as
+// is used by the library providing the function.  That way it doesn't matter
+// in which order the inclusion of the library header and the forbidding are
+// performed.  We could use configure to determine which to use and provide a
+// macro to select on here.
+//
+// Another approach is to always use __attribute__ noreturn in the forbidding
+// declaration, but ensure the relevant library header has been included
+// before the forbidding declaration.  Since there are currently only a couple
+// of affected functions, this is easier to implement.  So this is the
+// approach being taken for now.
+//
+// clang's failure to treat the compiler-specific form as counting toward the
+// [[noreturn]] requirement is arguably a clang bug.
+// https://github.com/llvm/llvm-project/issues/131700
+
+#ifdef __clang__
+#define FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE __attribute__((__noreturn__))
+#endif
+
+// This macro is used to suppress a warning for some uses of FORBID_C_FUNCTION.
+//
+// libstdc++ provides inline definitions of some functions to support
+// _FORTIFY_SOURCE.  clang warns about our forbidding declaration adding the
+// [[deprecated]] attribute following such a definition:
+// "warning: attribute declaration must precede definition [-Wignored-attributes]"
+// Use this macro to suppress the warning, not getting protection when using
+// that combination.  Other build combinations should provide sufficient
+// coverage.
+//
+// clang's warning in this case is arguably a clang bug.
+// https://github.com/llvm/llvm-project/issues/135481
+// This issue has been fixed, with the fix probably appearing in clang 21.
+#if defined(__clang__) && defined(_FORTIFY_SOURCE)
+#if _FORTIFY_SOURCE > 0
+#define FORBIDDEN_FUNCTION_IGNORE_CLANG_FORTIFY_WARNING \
+  PRAGMA_DISABLE_GCC_WARNING("-Wignored-attributes")
+#endif
+#endif
 
 #endif // SHARE_UTILITIES_COMPILERWARNINGS_GCC_HPP
diff --git a/src/hotspot/share/utilities/compilerWarnings_visCPP.hpp b/src/hotspot/share/utilities/compilerWarnings_visCPP.hpp
index de76b522c7b..6321388c48a 100644
--- a/src/hotspot/share/utilities/compilerWarnings_visCPP.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings_visCPP.hpp
@@ -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
@@ -30,39 +30,17 @@
 #define PRAGMA_DIAG_PUSH _Pragma("warning(push)")
 #define PRAGMA_DIAG_POP  _Pragma("warning(pop)")
 
-// The Visual Studio implementation of FORBID_C_FUNCTION explicitly does
-// nothing, because there doesn't seem to be a way to implement it for Visual
-// Studio.  What seems the most likely approach is to use deprecation warnings,
-// but that runs into problems.
-//
-// (1) Declaring the function deprecated (using either __declspec(deprecated)
-// or the C++14 [[deprecated]] attribute) fails with warnings like this:
-//   warning C4273: 'exit': inconsistent dll linkage
-// It seems attributes are not simply additive with this compiler.
-//
-// (2) Additionally adding __declspec(dllimport) to deal with (1) fails with
-// warnings like this:
-//   error C2375: 'vsnprintf': redefinition; different linkage
-// It seems some functions in the set of interest have different linkage than
-// others ("exit" is marked imported while "vsnprintf" is not, for example).
-// That makes it difficult to provide a generic macro.
-//
-// (3) Using __pragma(deprecated(name)) fails with
-//   warning C4995: 'frobnicate': name was marked as #pragma deprecated
-// for a *declaration* (not a use) of a 'frobnicate' function.
-//
-// ALLOW_C_FUNCTIONS disables deprecation warnings over the statement scope.
-// Some of the functions we're interested in allowing are conditionally
-// deprecated on Windows, under the control of various preprocessor defines
-// such as _CRT_SECURE_NO_WARNINGS.  Annotating vetted uses allows those
-// warnings to catch unchecked uses.
+#define PRAGMA_DEPRECATED_IGNORED PRAGMA_DISABLE_MSVC_WARNING(4996)
 
-#define FORBID_C_FUNCTION(signature, alternative)
+// This macro is used by the IMPORTED variants of FORBID_C_FUNCTION.
+//
+// Some, but not all, functions we want to forbid using must include a
+// `__declspec(dllimport)` in the declaration.  Failure to do so where needed
+// leads to "redefinition; different linkage" errors for the forbidding
+// declaration. But including a dllimport specifier if not present in the
+// compiler's header leads to the same errors.  It seems one must just know
+// which are imported and which are not, and use the specifier accordingly.
 
-#define ALLOW_C_FUNCTION(name, ...)             \
-  PRAGMA_DIAG_PUSH                              \
-  PRAGMA_DISABLE_MSVC_WARNING(4996)             \
-  __VA_ARGS__                                   \
-  PRAGMA_DIAG_POP
+#define FORBIDDEN_FUNCTION_IMPORT_SPEC __declspec(dllimport)
 
 #endif // SHARE_UTILITIES_COMPILERWARNINGS_VISCPP_HPP
diff --git a/src/hotspot/share/utilities/forbiddenFunctions.hpp b/src/hotspot/share/utilities/forbiddenFunctions.hpp
new file mode 100644
index 00000000000..0bc34adf213
--- /dev/null
+++ b/src/hotspot/share/utilities/forbiddenFunctions.hpp
@@ -0,0 +1,79 @@
+/*
+ * 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_UTILITIES_FORBIDDENFUNCTIONS_HPP
+#define SHARE_UTILITIES_FORBIDDENFUNCTIONS_HPP
+
+#include "utilities/compilerWarnings.hpp"
+#include "utilities/macros.hpp"
+
+// For types used in the signatures.
+#include <stdarg.h>
+#include <stddef.h>
+
+// Workaround for noreturn functions: exit, _exit, _Exit - see the clang
+// definition of FORBIDDEN_FUNCTION_NORETURN_ATTRIBUTE.
+#ifdef __clang__
+#include <stdlib.h>
+#endif
+
+#ifdef _WINDOWS
+#include "forbiddenFunctions_windows.hpp"
+#else
+#include "forbiddenFunctions_posix.hpp"
+#endif
+
+// Forbid the use of various C library functions.  Some of these have os::
+// replacements that should be used instead.  Others are considered obsolete
+// or have security concerns, either with preferred alternatives, or to be
+// avoided entirely.
+
+FORBID_IMPORTED_NORETURN_C_FUNCTION(void exit(int), "use os::exit")
+FORBID_IMPORTED_NORETURN_C_FUNCTION(void _Exit(int), "use os::exit")
+
+// Windows puts _exit in <stdlib.h>, POSIX in <unistd.h>.
+FORBID_IMPORTED_NORETURN_C_FUNCTION(void _exit(int), "use os::exit")
+
+FORBID_IMPORTED_C_FUNCTION(char* strerror(int), "use os::strerror");
+FORBID_IMPORTED_C_FUNCTION(char* strtok(char*, const char*), "use strtok_r");
+
+FORBID_C_FUNCTION(int sprintf(char*, const char*, ...), "use os::snprintf");
+
+PRAGMA_DIAG_PUSH
+FORBIDDEN_FUNCTION_IGNORE_CLANG_FORTIFY_WARNING
+FORBID_C_FUNCTION(int vsprintf(char*, const char*, va_list), "use os::vsnprintf");
+FORBID_C_FUNCTION(int vsnprintf(char*, size_t, const char*, va_list), "use os::vsnprintf");
+PRAGMA_DIAG_POP
+
+// All of the following functions return raw C-heap pointers (sometimes as an
+// option, e.g. realpath or getwd) or, in case of free(), take raw C-heap
+// pointers.  We generally want allocation to be done through NMT.
+FORBID_IMPORTED_C_FUNCTION(void* malloc(size_t size), "use os::malloc");
+FORBID_IMPORTED_C_FUNCTION(void free(void *ptr), "use os::free");
+FORBID_IMPORTED_C_FUNCTION(void* calloc(size_t nmemb, size_t size), "use os::malloc and zero out manually");
+FORBID_IMPORTED_C_FUNCTION(void* realloc(void *ptr, size_t size), "use os::realloc");
+FORBID_IMPORTED_C_FUNCTION(char* strdup(const char *s), "use os::strdup");
+FORBID_IMPORTED_C_FUNCTION(wchar_t* wcsdup(const wchar_t *s), "don't use");
+
+#endif // SHARE_UTILITIES_FORBIDDENFUNCTIONS_HPP
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 95971f16ed9..085939b0131 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -27,6 +27,7 @@
 
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/forbiddenFunctions.hpp"
 #include "utilities/macros.hpp"
 
 // Get constants like JVM_T_CHAR and JVM_SIGNATURE_INT, before pulling in <jvm.h>.
@@ -173,35 +174,6 @@ inline uintptr_t p2u(const volatile void* p) {
 
 #define BOOL_TO_STR(_b_) ((_b_) ? "true" : "false")
 
-//----------------------------------------------------------------------------------------------------
-// Forbid the use of various C library functions.
-// Some of these have os:: replacements that should normally be used instead.
-// Others are considered security concerns, with preferred alternatives.
-
-FORBID_C_FUNCTION(void exit(int), "use os::exit");
-FORBID_C_FUNCTION(void _exit(int), "use os::exit");
-FORBID_C_FUNCTION(char* strerror(int), "use os::strerror");
-FORBID_C_FUNCTION(char* strtok(char*, const char*), "use strtok_r");
-FORBID_C_FUNCTION(int sprintf(char*, const char*, ...), "use os::snprintf");
-FORBID_C_FUNCTION(int vsprintf(char*, const char*, va_list), "use os::vsnprintf");
-FORBID_C_FUNCTION(int vsnprintf(char*, size_t, const char*, va_list), "use os::vsnprintf");
-
-// All of the following functions return raw C-heap pointers (sometimes as an option, e.g. realpath or getwd)
-// or, in case of free(), take raw C-heap pointers. Don't use them unless you are really sure you must.
-FORBID_C_FUNCTION(void* malloc(size_t size), "use os::malloc");
-FORBID_C_FUNCTION(void* calloc(size_t nmemb, size_t size), "use os::malloc and zero out manually");
-FORBID_C_FUNCTION(void free(void *ptr), "use os::free");
-FORBID_C_FUNCTION(void* realloc(void *ptr, size_t size), "use os::realloc");
-FORBID_C_FUNCTION(char* strdup(const char *s), "use os::strdup");
-FORBID_C_FUNCTION(char* strndup(const char *s, size_t n), "don't use");
-FORBID_C_FUNCTION(int posix_memalign(void **memptr, size_t alignment, size_t size), "don't use");
-FORBID_C_FUNCTION(void* aligned_alloc(size_t alignment, size_t size), "don't use");
-FORBID_C_FUNCTION(char* realpath(const char* path, char* resolved_path), "use os::realpath");
-FORBID_C_FUNCTION(char* get_current_dir_name(void), "use os::get_current_directory()");
-FORBID_C_FUNCTION(char* getwd(char *buf), "use os::get_current_directory()");
-FORBID_C_FUNCTION(wchar_t* wcsdup(const wchar_t *s), "don't use");
-FORBID_C_FUNCTION(void* reallocf(void *ptr, size_t size), "don't use");
-
 //----------------------------------------------------------------------------------------------------
 // Constants
 
diff --git a/src/hotspot/share/utilities/permitForbiddenFunctions.hpp b/src/hotspot/share/utilities/permitForbiddenFunctions.hpp
new file mode 100644
index 00000000000..1ba42f8e386
--- /dev/null
+++ b/src/hotspot/share/utilities/permitForbiddenFunctions.hpp
@@ -0,0 +1,73 @@
+/*
+ * 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_UTILITIES_PERMITFORBIDDENFUNCTIONS_HPP
+#define SHARE_UTILITIES_PERMITFORBIDDENFUNCTIONS_HPP
+
+#include "utilities/compilerWarnings.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+#ifdef _WINDOWS
+#include "permitForbiddenFunctions_windows.hpp"
+#else
+#include "permitForbiddenFunctions_posix.hpp"
+#endif
+
+// Provide wrappers for some functions otherwise forbidden from use in HotSpot.
+//
+// There may be special circumstances where an otherwise forbidden function
+// really does need to be used.  One example is in the implementation of a
+// corresponding os:: function.
+//
+// Wrapper functions are provided for such forbidden functions.  These
+// wrappers are defined in a context where the forbidding warnings are
+// suppressed.  They are defined in a special namespace, to highlight uses as
+// unusual and requiring increased scrutiny.
+//
+// Note that there are several seemingly plausible shorter alternatives to
+// these written-out wrapper functions.  All that have been tried don't work
+// for one reason or another.
+
+namespace permit_forbidden_function {
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+
+[[noreturn]] inline void exit(int status) { ::exit(status); }
+[[noreturn]] inline void _exit(int status) { ::_exit(status); }
+
+ATTRIBUTE_PRINTF(3, 0)
+inline int vsnprintf(char* str, size_t size, const char* format, va_list ap) {
+  return ::vsnprintf(str, size, format, ap);
+}
+
+inline void* malloc(size_t size) { return ::malloc(size); }
+inline void free(void* ptr) { return ::free(ptr); }
+inline void* calloc(size_t nmemb, size_t size) { return ::calloc(nmemb, size); }
+inline void* realloc(void* ptr, size_t size) { return ::realloc(ptr, size); }
+
+inline char* strdup(const char* s) { return ::strdup(s); }
+
+END_ALLOW_FORBIDDEN_FUNCTIONS
+} // namespace permit_forbidden_function
+
+#endif // SHARE_UTILITIES_PERMITFORBIDDENFUNCTIONS_HPP
diff --git a/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp
index 27f4fdd54e3..46a8ff12f08 100644
--- a/test/hotspot/gtest/code/test_codestrings.cpp
+++ b/test/hotspot/gtest/code/test_codestrings.cpp
@@ -28,9 +28,12 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "compiler/disassembler.hpp"
 #include "memory/resourceArea.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 #include "utilities/vmassert_uninstall.hpp"
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
 #include <regex>
+END_ALLOW_FORBIDDEN_FUNCTIONS
 #include "utilities/vmassert_reinstall.hpp"
 
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
index 755e40cfcef..c7077271b5c 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahNumberSeq.cpp
@@ -26,7 +26,9 @@
 #include "utilities/ostream.hpp"
 
 #include "utilities/vmassert_uninstall.hpp"
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
 #include <iostream>
+END_ALLOW_FORBIDDEN_FUNCTIONS
 #include "utilities/vmassert_reinstall.hpp"
 
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
index cf43692ffbb..45d6cf47fe0 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahSimpleBitMap.cpp
@@ -23,10 +23,12 @@
 
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.inline.hpp"
-
-#include <iostream>
 #include "utilities/ostream.hpp"
+
 #include "utilities/vmassert_uninstall.hpp"
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
+#include <iostream>
+END_ALLOW_FORBIDDEN_FUNCTIONS
 #include "utilities/vmassert_reinstall.hpp"
 #include "unittest.hpp"
 
diff --git a/test/hotspot/gtest/gtestMain.cpp b/test/hotspot/gtest/gtestMain.cpp
index 87531d41164..c593f8dbb19 100644
--- a/test/hotspot/gtest/gtestMain.cpp
+++ b/test/hotspot/gtest/gtestMain.cpp
@@ -26,6 +26,7 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 #include "unittest.hpp"
 
 #include <stdio.h>
@@ -192,7 +193,7 @@ static int num_args_to_skip(char* arg) {
 
 static char** remove_test_runner_arguments(int* argcp, char **argv) {
   int argc = *argcp;
-  ALLOW_C_FUNCTION(::malloc, char** new_argv = (char**) malloc(sizeof(char*) * argc);)
+  char** new_argv = (char**)permit_forbidden_function::malloc(sizeof(char*) * argc);
   int new_argc = 0;
 
   int i = 0;
@@ -288,7 +289,7 @@ static void runUnitTestsInner(int argc, char** argv) {
 
   int result = RUN_ALL_TESTS();
 
-  ALLOW_C_FUNCTION(::free, ::free(argv);)
+  permit_forbidden_function::free(argv);
 
   // vm_assert and other_vm tests never reach this point as they either abort, or call
   // exit() - see TEST_OTHER_VM macro. We will reach here when all same_vm tests have
diff --git a/test/hotspot/gtest/unittest.hpp b/test/hotspot/gtest/unittest.hpp
index c6ec593733c..336a2f0766e 100644
--- a/test/hotspot/gtest/unittest.hpp
+++ b/test/hotspot/gtest/unittest.hpp
@@ -24,6 +24,8 @@
 #ifndef UNITTEST_HPP
 #define UNITTEST_HPP
 
+#include "utilities/globalDefinitions.hpp"
+
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -49,8 +51,10 @@
 #undef F2
 
 #include "utilities/vmassert_uninstall.hpp"
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+END_ALLOW_FORBIDDEN_FUNCTIONS
 #include "utilities/vmassert_reinstall.hpp"
 
 #ifdef UNDEFINED_Log

From 1ec64811a365442c902e334b56f4cf926c316a4a Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Thu, 24 Apr 2025 12:01:34 +0000
Subject: [PATCH 112/901] 8350582: Correct the parsing of the ssl value in
 javax.net.debug

Reviewed-by: wetmore, hchao
---
 .../classes/sun/security/ssl/SSLLogger.java   |   8 +-
 .../SSLLogger/DebugPropertyValuesTest.java    | 185 ++++++++++++++++++
 2 files changed, 190 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java

diff --git a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java b/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
index 9736bfaba0d..ec5dee26cfc 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLLogger.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
@@ -142,8 +142,10 @@ private static boolean hasOption(String option) {
         if (property.contains("all")) {
             return true;
         } else {
-            int offset = property.indexOf("ssl");
-            if (offset != -1 && property.indexOf("sslctx", offset) != -1) {
+            // remove first occurrence of "sslctx" since
+            // it interferes with search for "ssl"
+            String modified = property.replaceFirst("sslctx", "");
+            if (modified.contains("ssl")) {
                 // don't enable data and plaintext options by default
                 if (!(option.equals("data")
                         || option.equals("packet")
diff --git a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
new file mode 100644
index 00000000000..c9ad335a45e
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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 8350582
+ * @library /test/lib /javax/net/ssl/templates
+ * @summary Correct the parsing of the ssl value in javax.net.debug
+ * @run junit DebugPropertyValuesTest
+ */
+
+// A test to verify debug output for different javax.net.debug scenarios
+
+import jdk.test.lib.process.ProcessTools;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Stream;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class DebugPropertyValuesTest extends SSLSocketTemplate {
+
+    private static final Path LOG_FILE = Path.of("logging.conf");
+    private static final HashMap<String, List<String>> debugMessages = new HashMap<>();
+
+    static {
+        debugMessages.put("handshake",
+                List.of("Produced ClientHello handshake message",
+                        "supported_versions"));
+        debugMessages.put("keymanager", List.of("choosing key:"));
+        debugMessages.put("packet", List.of("Raw write"));
+        debugMessages.put("plaintext", List.of("Plaintext before ENCRYPTION"));
+        debugMessages.put("record", List.of("handshake, length =", "WRITE:"));
+        debugMessages.put("session", List.of("Session initialized:"));
+        debugMessages.put("sslctx", List.of("trigger seeding of SecureRandom"));
+        debugMessages.put("ssl", List.of("jdk.tls.keyLimits:"));
+        debugMessages.put("trustmanager", List.of("adding as trusted certificates"));
+        debugMessages.put("verbose", List.of("Ignore unsupported cipher suite:"));
+        debugMessages.put("handshake-expand",
+                List.of("\"logger\".*: \"javax.net.ssl\",",
+                        "\"message\".*: \"Produced ClientHello handshake message"));
+        debugMessages.put("record-expand",
+                List.of("\"logger\".*: \"javax.net.ssl\",",
+                        "\"message\".*: \"READ: TLSv1.2 application_data"));
+        debugMessages.put("help",
+                List.of("print the help messages",
+                        "debugging can be widened with:"));
+        debugMessages.put("javax.net.debug",
+                List.of("properties: Initial security property:",
+                        "certpath: Cert path validation succeeded"));
+        debugMessages.put("logger",
+                List.of("FINE: adding as trusted certificates",
+                        "FINE: WRITE: TLSv1.3 application_data"));
+    }
+
+    @BeforeAll
+    static void setup() throws Exception {
+        Files.writeString(LOG_FILE, ".level = ALL\n" +
+                "handlers= java.util.logging.ConsoleHandler\n" +
+                "java.util.logging.ConsoleHandler.level = ALL\n");
+    }
+
+    private static Stream<Arguments> patternMatches() {
+        return Stream.of(
+                // all should print everything
+                Arguments.of(List.of("-Djavax.net.debug=all"),
+                        List.of("handshake", "keymanager", "packet",
+                                "plaintext", "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // ssl should print most details except verbose details
+                Arguments.of(List.of("-Djavax.net.debug=ssl"),
+                        List.of("handshake", "keymanager",
+                                "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // allow expand option for more verbose output
+                Arguments.of(List.of("-Djavax.net.debug=ssl,handshake,expand"),
+                        List.of("handshake", "handshake-expand", "keymanager",
+                                "record", "session", "record-expand", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // filtering on record option, with expand
+                Arguments.of(List.of("-Djavax.net.debug=ssl:record,expand"),
+                        List.of("handshake", "handshake-expand", "keymanager",
+                                "record", "record-expand", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // this test is equivalent to ssl:record mode
+                Arguments.of(List.of("-Djavax.net.debug=ssl,record"),
+                        List.of("handshake", "keymanager", "record",
+                                "session", "ssl", "sslctx",
+                                "trustmanager", "verbose")),
+                // example of test where no "ssl" value is passed
+                // handshake debugging with verbose mode
+                // only verbose gets printed. Needs fixing (JDK-8044609)
+                Arguments.of(List.of("-Djavax.net.debug=handshake:verbose"),
+                        List.of("verbose")),
+                // another example of test where no "ssl" value is passed
+                Arguments.of(List.of("-Djavax.net.debug=record"),
+                        List.of("record")),
+                // ignore bad sub-option. treat like "ssl"
+                Arguments.of(List.of("-Djavax.net.debug=ssl,typo"),
+                        List.of("handshake", "keymanager",
+                                "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // ssltypo contains "ssl". Treat like "ssl"
+                Arguments.of(List.of("-Djavax.net.debug=ssltypo"),
+                        List.of("handshake", "keymanager",
+                                "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                // plaintext is valid for record option
+                Arguments.of(List.of("-Djavax.net.debug=ssl:record:plaintext"),
+                        List.of("handshake", "keymanager", "plaintext",
+                                "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose")),
+                Arguments.of(List.of("-Djavax.net.debug=ssl:trustmanager"),
+                        List.of("handshake", "keymanager", "record", "session",
+                                "ssl", "sslctx", "trustmanager", "verbose")),
+                Arguments.of(List.of("-Djavax.net.debug=ssl:sslctx"),
+                        List.of("handshake", "keymanager", "record", "session",
+                                "ssl", "sslctx", "trustmanager", "verbose")),
+                // help message test. Should exit without running test
+                Arguments.of(List.of("-Djavax.net.debug=help"),
+                        List.of("help")),
+                // add in javax.net.debug sanity test
+                Arguments.of(List.of("-Djavax.net.debug=ssl:trustmanager",
+                                "-Djava.security.debug=all"),
+                        List.of("handshake", "javax.net.debug", "keymanager",
+                                "record", "session", "ssl", "sslctx",
+                                "trustmanager", "verbose")),
+                // empty invokes System.Logger use
+                Arguments.of(List.of("-Djavax.net.debug",
+                        "-Djava.util.logging.config.file=" + LOG_FILE),
+                        List.of("handshake", "keymanager", "logger", "packet",
+                                "plaintext", "record", "session", "ssl",
+                                "sslctx", "trustmanager", "verbose"))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("patternMatches")
+    public void checkDebugOutput(List<String> params,
+                                 List<String> expected) throws Exception {
+
+        List<String> args = new ArrayList<>(params);
+        args.add("DebugPropertyValuesTest");
+        OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(args);
+        outputAnalyzer.shouldHaveExitValue(0);
+        for (String s : debugMessages.keySet()) {
+            for (String output : debugMessages.get(s)) {
+                if (expected.contains(s)) {
+                    outputAnalyzer.shouldMatch(output);
+                } else {
+                    outputAnalyzer.shouldNotMatch(output);
+                }
+            }
+        }
+    }
+}

From 34c4d895ca321508c24b13338900d617679aadae Mon Sep 17 00:00:00 2001
From: Oleksii Sylichenko <a.silichenko@gmail.com>
Date: Thu, 24 Apr 2025 12:50:03 +0000
Subject: [PATCH 113/901] 8353190: Use "/native" Run Option for
 TestAvailableProcessors Execution

Reviewed-by: dholmes
---
 .../os/windows/TestAvailableProcessors.java      | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/os/windows/TestAvailableProcessors.java b/test/hotspot/jtreg/runtime/os/windows/TestAvailableProcessors.java
index f7dc237d07d..795b3d76e54 100644
--- a/test/hotspot/jtreg/runtime/os/windows/TestAvailableProcessors.java
+++ b/test/hotspot/jtreg/runtime/os/windows/TestAvailableProcessors.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,18 +31,14 @@
  * @requires vm.flagless
  * @library /test/lib
  * @compile GetAvailableProcessors.java
- * @run testng TestAvailableProcessors
+ * @run testng/othervm/native TestAvailableProcessors
  */
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -172,12 +168,8 @@ private static void verifyAvailableProcessorsWithEnabledProductFlag(boolean sche
 
     @Test
     private static void testProcessorAvailability() throws IOException {
-        // Launch GetProcessorInfo.exe to gather processor counts
-        Path nativeGetProcessorInfo = Paths.get(Utils.TEST_NATIVE_PATH)
-            .resolve("GetProcessorInfo.exe")
-            .toAbsolutePath();
-
-        var processBuilder = new ProcessBuilder(nativeGetProcessorInfo.toString());
+        // Launch "<nativepath>/GetProcessorInfo.exe" to gather processor counts
+        var processBuilder = new ProcessBuilder("GetProcessorInfo.exe");
         var outputAnalyzer= new OutputAnalyzer(processBuilder.start());
         outputAnalyzer.shouldHaveExitValue(0);
         outputAnalyzer.shouldContain(totalProcessorCountMessage);

From 0537c6927d4f617624672cfae06928f9738175ca Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Thu, 24 Apr 2025 13:39:43 +0000
Subject: [PATCH 114/901] 8355492: MissedOptCastII is missing
 UnlockDiagnosticVMOptions flag

Reviewed-by: rcastanedalo, chagedorn, thartmann
---
 test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
index a32fa020065..5cd83cbe09a 100644
--- a/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedOptCastII.java
@@ -32,6 +32,7 @@
  *           -XX:CompileCommand=compileonly,MissedOptCastII::*
  *           -XX:-TieredCompilation -Xcomp
  *           -XX:+IgnoreUnrecognizedVMOptions
+ *           -XX:+UnlockDiagnosticVMOptions
  *           -XX:+StressIGVN -XX:VerifyIterativeGVN=10
  *           MissedOptCastII
  */

From cf96b107d57182ad6ab47125939423dd5286aa88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 24 Apr 2025 14:14:10 +0000
Subject: [PATCH 115/901] 8354362: Use automatic indentation in CollectedHeap
 printing

Reviewed-by: stefank, lkorinth, stuefe
---
 src/hotspot/share/gc/epsilon/epsilonHeap.cpp  | 19 ++---
 src/hotspot/share/gc/epsilon/epsilonHeap.hpp  |  4 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 20 +++--
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  4 +-
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  4 +-
 src/hotspot/share/gc/g1/g1ConcurrentMark.hpp  |  4 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    | 13 +--
 .../share/gc/parallel/mutableNUMASpace.hpp    |  4 +-
 .../share/gc/parallel/mutableSpace.cpp        |  7 +-
 .../share/gc/parallel/mutableSpace.hpp        |  4 +-
 .../share/gc/parallel/parMarkBitMap.hpp       |  8 +-
 .../gc/parallel/parallelScavengeHeap.cpp      | 12 +--
 .../gc/parallel/parallelScavengeHeap.hpp      |  6 +-
 src/hotspot/share/gc/parallel/psOldGen.cpp    | 15 ++--
 .../share/gc/parallel/psParallelCompact.cpp   |  4 +-
 .../share/gc/parallel/psParallelCompact.hpp   |  4 +-
 .../share/gc/parallel/psVirtualspace.cpp      |  2 +-
 src/hotspot/share/gc/parallel/psYoungGen.cpp  | 13 +--
 .../share/gc/serial/defNewGeneration.cpp      | 24 ++----
 src/hotspot/share/gc/serial/serialHeap.cpp    |  9 +-
 src/hotspot/share/gc/serial/serialHeap.hpp    |  4 +-
 .../share/gc/serial/tenuredGeneration.cpp     | 13 ++-
 src/hotspot/share/gc/shared/collectedHeap.cpp | 26 ++++--
 src/hotspot/share/gc/shared/collectedHeap.hpp | 12 +--
 src/hotspot/share/gc/shared/markBitMap.cpp    |  4 +-
 src/hotspot/share/gc/shared/markBitMap.hpp    |  4 +-
 src/hotspot/share/gc/shared/space.cpp         |  7 +-
 src/hotspot/share/gc/shared/space.hpp         |  4 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  7 +-
 .../share/gc/shenandoah/shenandoahHeap.hpp    |  4 +-
 src/hotspot/share/gc/z/zCollectedHeap.cpp     | 12 +--
 src/hotspot/share/gc/z/zCollectedHeap.hpp     |  4 +-
 src/hotspot/share/gc/z/zHeap.cpp              | 35 +++-----
 src/hotspot/share/gc/z/zHeap.hpp              |  4 +-
 src/hotspot/share/gc/z/zMappedCache.cpp       |  7 +-
 src/hotspot/share/gc/z/zPageAllocator.cpp     | 85 +++++++++----------
 src/hotspot/share/gc/z/zPageAllocator.hpp     | 11 ++-
 src/hotspot/share/memory/metaspace.cpp        | 14 +--
 src/hotspot/share/memory/universe.cpp         |  5 +-
 src/hotspot/share/memory/virtualspace.cpp     | 19 +++--
 src/hotspot/share/memory/virtualspace.hpp     |  4 +-
 .../share/services/diagnosticCommand.cpp      |  4 +-
 src/hotspot/share/utilities/bitMap.cpp        |  2 +-
 src/hotspot/share/utilities/bitMap.hpp        |  2 +-
 src/hotspot/share/utilities/ostream.hpp       | 12 +--
 src/hotspot/share/utilities/vmError.cpp       | 44 +++++++---
 46 files changed, 270 insertions(+), 259 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index d5ee7835fea..c3d3af26528 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -37,6 +37,7 @@
 #include "memory/universe.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
+#include "utilities/ostream.hpp"
 
 jint EpsilonHeap::initialize() {
   size_t align = HeapAlignment;
@@ -297,26 +298,18 @@ void EpsilonHeap::object_iterate(ObjectClosure *cl) {
   _space->object_iterate(cl);
 }
 
-void EpsilonHeap::print_on(outputStream *st) const {
+void EpsilonHeap::print_heap_on(outputStream *st) const {
   st->print_cr("Epsilon Heap");
 
+  StreamAutoIndentor indentor(st, 1);
+
   _virtual_space.print_on(st);
 
   if (_space != nullptr) {
     st->print_cr("Allocation space:");
-    _space->print_on(st);
-  }
-
-  MetaspaceUtils::print_on(st);
-}
-
-void EpsilonHeap::print_on_error(outputStream *st) const {
-  print_on(st);
-  st->cr();
 
-  BarrierSet* bs = BarrierSet::barrier_set();
-  if (bs != nullptr) {
-    bs->print_on(st);
+    StreamAutoIndentor indentor(st, 1);
+    _space->print_on(st, "");
   }
 }
 
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index 81bcd61916f..129e81c1c34 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -131,8 +131,8 @@ class EpsilonHeap : public CollectedHeap {
   bool can_load_archived_objects() const override { return true; }
   HeapWord* allocate_loaded_archive_space(size_t size) override;
 
-  void print_on(outputStream* st) const override;
-  void print_on_error(outputStream* st) const override;
+  void print_heap_on(outputStream* st) const override;
+  void print_gc_on(outputStream* st) const override {}
   void print_tracing_info() const override;
   bool print_location(outputStream* st, void* addr) const override;
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 8b36bf124f2..4ce45d06d1d 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2112,16 +2112,18 @@ void G1CollectedHeap::print_heap_regions() const {
   }
 }
 
-void G1CollectedHeap::print_on(outputStream* st) const {
+void G1CollectedHeap::print_heap_on(outputStream* st) const {
   size_t heap_used = Heap_lock->owned_by_self() ? used() : used_unlocked();
-  st->print(" %-20s", "garbage-first heap");
+  st->print("%-20s", "garbage-first heap");
   st->print(" total reserved %zuK, committed %zuK, used %zuK",
             _hrm.reserved().byte_size()/K, capacity()/K, heap_used/K);
   st->print(" [" PTR_FORMAT ", " PTR_FORMAT ")",
             p2i(_hrm.reserved().start()),
             p2i(_hrm.reserved().end()));
   st->cr();
-  st->print("  region size %zuK, ", G1HeapRegion::GrainBytes / K);
+
+  StreamAutoIndentor indentor(st, 1);
+  st->print("region size %zuK, ", G1HeapRegion::GrainBytes / K);
   uint young_regions = young_regions_count();
   st->print("%u young (%zuK), ", young_regions,
             (size_t) young_regions * G1HeapRegion::GrainBytes / K);
@@ -2131,7 +2133,7 @@ void G1CollectedHeap::print_on(outputStream* st) const {
   st->cr();
   if (_numa->is_enabled()) {
     uint num_nodes = _numa->num_active_nodes();
-    st->print("  remaining free region(s) on each NUMA node: ");
+    st->print("remaining free region(s) on each NUMA node: ");
     const uint* node_ids = _numa->node_ids();
     for (uint node_index = 0; node_index < num_nodes; node_index++) {
       uint num_free_regions = _hrm.num_free_regions(node_index);
@@ -2139,7 +2141,6 @@ void G1CollectedHeap::print_on(outputStream* st) const {
     }
     st->cr();
   }
-  MetaspaceUtils::print_on(st);
 }
 
 void G1CollectedHeap::print_regions_on(outputStream* st) const {
@@ -2153,15 +2154,16 @@ void G1CollectedHeap::print_regions_on(outputStream* st) const {
 }
 
 void G1CollectedHeap::print_extended_on(outputStream* st) const {
-  print_on(st);
+  print_heap_on(st);
 
   // Print the per-region information.
   st->cr();
   print_regions_on(st);
 }
 
-void G1CollectedHeap::print_on_error(outputStream* st) const {
-  print_extended_on(st);
+void G1CollectedHeap::print_gc_on(outputStream* st) const {
+  // Print the per-region information.
+  print_regions_on(st);
   st->cr();
 
   BarrierSet* bs = BarrierSet::barrier_set();
@@ -2171,7 +2173,7 @@ void G1CollectedHeap::print_on_error(outputStream* st) const {
 
   if (_cm != nullptr) {
     st->cr();
-    _cm->print_on_error(st);
+    _cm->print_on(st);
   }
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 0f583e8dcbf..92e08e6fc61 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1312,9 +1312,9 @@ class G1CollectedHeap : public CollectedHeap {
   void print_regions_on(outputStream* st) const;
 
 public:
-  void print_on(outputStream* st) const override;
+  void print_heap_on(outputStream* st) const override;
   void print_extended_on(outputStream* st) const;
-  void print_on_error(outputStream* st) const override;
+  void print_gc_on(outputStream* st) const override;
 
   void gc_threads_do(ThreadClosure* tc) const override;
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index ef62587d868..07b5afcf987 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -2126,9 +2126,9 @@ void G1ConcurrentMark::threads_do(ThreadClosure* tc) const {
   _concurrent_workers->threads_do(tc);
 }
 
-void G1ConcurrentMark::print_on_error(outputStream* st) const {
+void G1ConcurrentMark::print_on(outputStream* st) const {
   st->print_cr("Marking Bits: (CMBitMap*) " PTR_FORMAT, p2i(mark_bitmap()));
-  _mark_bitmap.print_on_error(st, " Bits: ");
+  _mark_bitmap.print_on(st, " Bits: ");
 }
 
 static ReferenceProcessor* get_cm_oop_closure_ref_processor(G1CollectedHeap* g1h) {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
index 2fb9732b88e..a4c2e94b2b1 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
@@ -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
@@ -707,7 +707,7 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
 
   void threads_do(ThreadClosure* tc) const;
 
-  void print_on_error(outputStream* st) const;
+  void print_on(outputStream* st) const;
 
   // Mark the given object on the marking bitmap if it is below TAMS.
   inline bool mark_in_bitmap(uint worker_id, oop const obj);
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index 874d3974ead..abc0d7baa64 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -608,17 +608,20 @@ void MutableNUMASpace::print_short_on(outputStream* st) const {
   st->print(")");
 }
 
-void MutableNUMASpace::print_on(outputStream* st) const {
-  MutableSpace::print_on(st);
+void MutableNUMASpace::print_on(outputStream* st, const char* prefix) const {
+  MutableSpace::print_on(st, prefix);
+
+  StreamAutoIndentor indentor(st, 1);
   for (int i = 0; i < lgrp_spaces()->length(); i++) {
     LGRPSpace *ls = lgrp_spaces()->at(i);
-    st->print("    lgrp %u", ls->lgrp_id());
-    ls->space()->print_on(st);
+    FormatBuffer<128> lgrp_message("lgrp %u ", ls->lgrp_id());
+    ls->space()->print_on(st, lgrp_message);
     if (NUMAStats) {
+      StreamAutoIndentor indentor_numa(st, 1);
       for (int i = 0; i < lgrp_spaces()->length(); i++) {
         lgrp_spaces()->at(i)->accumulate_statistics(page_size());
       }
-      st->print("    local/remote/unbiased/uncommitted: %zuK/"
+      st->print("local/remote/unbiased/uncommitted: %zuK/"
                 "%zuK/%zuK/%zuK\n",
                 ls->space_stats()->_local_space / K,
                 ls->space_stats()->_remote_space / K,
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
index 10ca66e3549..abb4c77952a 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, 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
@@ -186,7 +186,7 @@ class MutableNUMASpace : public MutableSpace {
   virtual HeapWord* cas_allocate(size_t word_size);
 
   // Debugging
-  virtual void print_on(outputStream* st) const;
+  virtual void print_on(outputStream* st, const char* prefix) const;
   virtual void print_short_on(outputStream* st) const;
   virtual void verify();
 
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 19ec0fcf839..498fb12511c 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -232,12 +232,13 @@ void MutableSpace::object_iterate(ObjectClosure* cl) {
 
 void MutableSpace::print_short() const { print_short_on(tty); }
 void MutableSpace::print_short_on( outputStream* st) const {
-  st->print(" space %zuK, %d%% used", capacity_in_bytes() / K,
+  st->print("space %zuK, %d%% used", capacity_in_bytes() / K,
             (int) ((double) used_in_bytes() * 100 / capacity_in_bytes()));
 }
 
-void MutableSpace::print() const { print_on(tty); }
-void MutableSpace::print_on(outputStream* st) const {
+void MutableSpace::print() const { print_on(tty, ""); }
+void MutableSpace::print_on(outputStream* st, const char* prefix) const {
+  st->print("%s", prefix);
   MutableSpace::print_short_on(st);
   st->print_cr(" [" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT ")",
                  p2i(bottom()), p2i(top()), p2i(end()));
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 4583be0e1ea..d09a2b2df89 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -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
@@ -138,7 +138,7 @@ class MutableSpace: public CHeapObj<mtGC> {
 
   // Debugging
   virtual void print() const;
-  virtual void print_on(outputStream* st) const;
+  virtual void print_on(outputStream* st, const char* prefix) const;
   virtual void print_short() const;
   virtual void print_short_on(outputStream* st) const;
   virtual void verify();
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
index 4c3cc39edec..aa788ff7be0 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.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
@@ -58,9 +58,11 @@ class ParMarkBitMap: public CHeapObj<mtGC> {
   // Clear a range of bits corresponding to heap address range [beg, end).
   inline void clear_range(HeapWord* beg, HeapWord* end);
 
-  void print_on_error(outputStream* st) const {
+  void print_on(outputStream* st) const {
     st->print_cr("Marking Bits: (ParMarkBitMap*) " PTR_FORMAT, p2i(this));
-    _beg_bits.print_on_error(st, " Begin Bits: ");
+
+    StreamAutoIndentor indentor(st, 1);
+    _beg_bits.print_range_on(st, "Begin Bits: ");
   }
 
 #ifdef  ASSERT
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 244094f1acc..0e63d760f48 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -662,27 +662,23 @@ bool ParallelScavengeHeap::print_location(outputStream* st, void* addr) const {
   return BlockLocationPrinter<ParallelScavengeHeap>::print_location(st, addr);
 }
 
-void ParallelScavengeHeap::print_on(outputStream* st) const {
+void ParallelScavengeHeap::print_heap_on(outputStream* st) const {
   if (young_gen() != nullptr) {
     young_gen()->print_on(st);
   }
   if (old_gen() != nullptr) {
     old_gen()->print_on(st);
   }
-  MetaspaceUtils::print_on(st);
 }
 
-void ParallelScavengeHeap::print_on_error(outputStream* st) const {
-  print_on(st);
-  st->cr();
-
+void ParallelScavengeHeap::print_gc_on(outputStream* st) const {
   BarrierSet* bs = BarrierSet::barrier_set();
   if (bs != nullptr) {
     bs->print_on(st);
   }
-
   st->cr();
-  PSParallelCompact::print_on_error(st);
+
+  PSParallelCompact::print_on(st);
 }
 
 void ParallelScavengeHeap::gc_threads_do(ThreadClosure* tc) const {
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index ef9a4b4d5a1..887b78758cf 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -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
@@ -214,8 +214,8 @@ class ParallelScavengeHeap : public CollectedHeap {
 
   void prepare_for_verify() override;
   PSHeapSummary create_ps_heap_summary();
-  void print_on(outputStream* st) const override;
-  void print_on_error(outputStream* st) const override;
+  void print_heap_on(outputStream* st) const override;
+  void print_gc_on(outputStream* st) const override;
   void gc_threads_do(ThreadClosure* tc) const override;
   void print_tracing_info() const override;
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index fc3f7df926f..3bf125bc295 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -358,15 +358,12 @@ void PSOldGen::post_resize() {
 
 void PSOldGen::print() const { print_on(tty);}
 void PSOldGen::print_on(outputStream* st) const {
-  st->print(" %-15s", name());
-  st->print(" total %zuK, used %zuK",
-              capacity_in_bytes()/K, used_in_bytes()/K);
-  st->print_cr(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
-                p2i(virtual_space()->low_boundary()),
-                p2i(virtual_space()->high()),
-                p2i(virtual_space()->high_boundary()));
-
-  st->print("  object"); object_space()->print_on(st);
+  st->print("%-15s", name());
+  st->print(" total %zuK, used %zuK ", capacity_in_bytes() / K, used_in_bytes() / K);
+  virtual_space()->print_space_boundaries_on(st);
+
+  StreamAutoIndentor indentor(st, 1);
+  object_space()->print_on(st, "object ");
 }
 
 void PSOldGen::update_counters() {
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 99b975c282a..e63ff686312 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -210,8 +210,8 @@ void SplitInfo::verify_clear()
 #endif  // #ifdef ASSERT
 
 
-void PSParallelCompact::print_on_error(outputStream* st) {
-  _mark_bitmap.print_on_error(st);
+void PSParallelCompact::print_on(outputStream* st) {
+  _mark_bitmap.print_on(st);
 }
 
 ParallelCompactData::ParallelCompactData() :
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 878a09e283b..290dd809ddd 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.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
@@ -846,7 +846,7 @@ class PSParallelCompact : AllStatic {
   // Return the SpaceId for the given address.
   static SpaceId space_id(HeapWord* addr);
 
-  static void print_on_error(outputStream* st);
+  static void print_on(outputStream* st);
 
 #ifdef  ASSERT
   // Sanity check the new location of a word in the heap.
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
index ce4cd4ad977..b15264f5fca 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
@@ -124,6 +124,6 @@ void PSVirtualSpace::verify() const {
 #endif // #ifndef PRODUCT
 
 void PSVirtualSpace::print_space_boundaries_on(outputStream* st) const {
-  st->print_cr(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+  st->print_cr("[" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
                p2i(low_boundary()), p2i(high()), p2i(high_boundary()));
 }
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp
index 309b293e5ac..cf21e45da9e 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp
@@ -700,13 +700,14 @@ void PSYoungGen::object_iterate(ObjectClosure* blk) {
 
 void PSYoungGen::print() const { print_on(tty); }
 void PSYoungGen::print_on(outputStream* st) const {
-  st->print(" %-15s", "PSYoungGen");
-  st->print(" total %zuK, used %zuK",
-             capacity_in_bytes()/K, used_in_bytes()/K);
+  st->print("%-15s", name());
+  st->print(" total %zuK, used %zuK ", capacity_in_bytes() / K, used_in_bytes() / K);
   virtual_space()->print_space_boundaries_on(st);
-  st->print("  eden"); eden_space()->print_on(st);
-  st->print("  from"); from_space()->print_on(st);
-  st->print("  to  "); to_space()->print_on(st);
+
+  StreamAutoIndentor indentor(st, 1);
+  eden_space()->print_on(st, "eden ");
+  from_space()->print_on(st, "from ");
+  to_space()->print_on(st, "to   ");
 }
 
 size_t PSYoungGen::available_to_min_gen() {
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 8ad42bc702d..cebfa743eac 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -825,21 +825,15 @@ void DefNewGeneration::verify() {
 }
 
 void DefNewGeneration::print_on(outputStream* st) const {
-  st->print(" %-10s", name());
-
-  st->print(" total %zuK, used %zuK",
-            capacity()/K, used()/K);
-  st->print_cr(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
-               p2i(_virtual_space.low_boundary()),
-               p2i(_virtual_space.high()),
-               p2i(_virtual_space.high_boundary()));
-
-  st->print("  eden");
-  eden()->print_on(st);
-  st->print("  from");
-  from()->print_on(st);
-  st->print("  to  ");
-  to()->print_on(st);
+  st->print("%-10s", name());
+
+  st->print(" total %zuK, used %zuK ", capacity() / K, used() / K);
+  _virtual_space.print_space_boundaries_on(st);
+
+  StreamAutoIndentor indentor(st, 1);
+  eden()->print_on(st, "eden ");
+  from()->print_on(st, "from ");
+  to()->print_on(st, "to   ");
 }
 
 HeapWord* DefNewGeneration::allocate(size_t word_size) {
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index ea2b656d4bd..8d922692e59 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -800,20 +800,15 @@ void SerialHeap::verify(VerifyOption option /* ignored */) {
   rem_set()->verify();
 }
 
-void SerialHeap::print_on(outputStream* st) const {
+void SerialHeap::print_heap_on(outputStream* st) const {
   assert(_young_gen != nullptr, "precondition");
   assert(_old_gen   != nullptr, "precondition");
 
   _young_gen->print_on(st);
   _old_gen->print_on(st);
-
-  MetaspaceUtils::print_on(st);
 }
 
-void SerialHeap::print_on_error(outputStream* st) const {
-  print_on(st);
-  st->cr();
-
+void SerialHeap::print_gc_on(outputStream* st) const {
   BarrierSet* bs = BarrierSet::barrier_set();
   if (bs != nullptr) {
     bs->print_on(st);
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 2ec50814daf..30b7b9a0085 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -206,8 +206,8 @@ class SerialHeap : public CollectedHeap {
   void prepare_for_verify() override;
   void verify(VerifyOption option) override;
 
-  void print_on(outputStream* st) const override;
-  void print_on_error(outputStream* st) const override;
+  void print_heap_on(outputStream* st) const override;
+  void print_gc_on(outputStream* st) const override;
   void gc_threads_do(ThreadClosure* tc) const override;
   void print_tracing_info() const override;
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 22c4808a0bd..975b0b5f98a 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -439,15 +439,12 @@ void TenuredGeneration::verify() {
 }
 
 void TenuredGeneration::print_on(outputStream* st)  const {
-  st->print(" %-10s", name());
+  st->print("%-10s", name());
 
-  st->print(" total %zuK, used %zuK",
+  st->print(" total %zuK, used %zuK ",
             capacity()/K, used()/K);
-  st->print_cr(" [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
-               p2i(_virtual_space.low_boundary()),
-               p2i(_virtual_space.high()),
-               p2i(_virtual_space.high_boundary()));
+  _virtual_space.print_space_boundaries_on(st);
 
-  st->print("   the");
-  _the_space->print_on(st);
+  StreamAutoIndentor indentor(st, 1);
+  _the_space->print_on(st, "the  ");
 }
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index ec9872bf402..f0b90edeb79 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -45,7 +45,6 @@
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/reservedSpace.hpp"
-#include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/oop.inline.hpp"
@@ -59,6 +58,7 @@
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
+#include "utilities/ostream.hpp"
 
 class ClassLoaderData;
 
@@ -111,7 +111,12 @@ void GCHeapLog::log_heap(CollectedHeap* heap, bool before) {
                  heap->total_collections(),
                  heap->total_full_collections());
 
-  heap->print_on(&st);
+  {
+    StreamAutoIndentor indentor(&st, 1);
+    heap->print_heap_on(&st);
+    MetaspaceUtils::print_on(&st);
+  }
+
   st.print_cr("}");
 }
 
@@ -163,8 +168,10 @@ void CollectedHeap::print_heap_before_gc() {
   if (lt.is_enabled()) {
     LogStream ls(lt);
     ls.print_cr("Heap before GC invocations=%u (full %u):", total_collections(), total_full_collections());
-    ResourceMark rm;
-    print_on(&ls);
+
+    StreamAutoIndentor indentor(&ls, 1);
+    print_heap_on(&ls);
+    MetaspaceUtils::print_on(&ls);
   }
 
   if (_gc_heap_log != nullptr) {
@@ -177,8 +184,10 @@ void CollectedHeap::print_heap_after_gc() {
   if (lt.is_enabled()) {
     LogStream ls(lt);
     ls.print_cr("Heap after GC invocations=%u (full %u):", total_collections(), total_full_collections());
-    ResourceMark rm;
-    print_on(&ls);
+
+    StreamAutoIndentor indentor(&ls, 1);
+    print_heap_on(&ls);
+    MetaspaceUtils::print_on(&ls);
   }
 
   if (_gc_heap_log != nullptr) {
@@ -186,7 +195,10 @@ void CollectedHeap::print_heap_after_gc() {
   }
 }
 
-void CollectedHeap::print() const { print_on(tty); }
+void CollectedHeap::print() const {
+  print_heap_on(tty);
+  print_gc_on(tty);
+}
 
 void CollectedHeap::trace_heap(GCWhen::Type when, const GCTracer* gc_tracer) {
   const GCHeapSummary& heap_summary = create_heap_summary();
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 7b3fbd1a1c4..439563a4b62 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -435,12 +435,14 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // explicitly checks if the given memory location contains a null value.
   virtual bool contains_null(const oop* p) const;
 
-  // Print heap information on the given outputStream.
-  virtual void print_on(outputStream* st) const = 0;
-  // The default behavior is to call print_on() on tty.
-  virtual void print() const;
+  // Print heap information.
+  virtual void print_heap_on(outputStream* st) const = 0;
+
+  // Print additional information about the GC that is not included in print_heap_on().
+  virtual void print_gc_on(outputStream* st) const = 0;
 
-  virtual void print_on_error(outputStream* st) const = 0;
+  // The default behavior is to call print_heap_on() and print_gc_on() on tty.
+  virtual void print() const;
 
   // Used to print information about locations in the hs_err file.
   virtual bool print_location(outputStream* st, void* addr) const = 0;
diff --git a/src/hotspot/share/gc/shared/markBitMap.cpp b/src/hotspot/share/gc/shared/markBitMap.cpp
index b2b1e802462..193cc0af4f7 100644
--- a/src/hotspot/share/gc/shared/markBitMap.cpp
+++ b/src/hotspot/share/gc/shared/markBitMap.cpp
@@ -25,8 +25,8 @@
 #include "gc/shared/markBitMap.inline.hpp"
 #include "memory/universe.hpp"
 
-void MarkBitMap::print_on_error(outputStream* st, const char* prefix) const {
-  _bm.print_on_error(st, prefix);
+void MarkBitMap::print_on(outputStream* st, const char* prefix) const {
+  _bm.print_range_on(st, prefix);
 }
 
 size_t MarkBitMap::compute_size(size_t heap_size) {
diff --git a/src/hotspot/share/gc/shared/markBitMap.hpp b/src/hotspot/share/gc/shared/markBitMap.hpp
index adfd9307813..a55a8220910 100644
--- a/src/hotspot/share/gc/shared/markBitMap.hpp
+++ b/src/hotspot/share/gc/shared/markBitMap.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
@@ -84,7 +84,7 @@ class MarkBitMap {
   inline HeapWord* get_next_marked_addr(const HeapWord* addr,
                                         HeapWord* limit) const;
 
-  void print_on_error(outputStream* st, const char* prefix) const;
+  void print_on(outputStream* st, const char* prefix) const;
 
   // Write marks.
   inline void mark(HeapWord* addr);
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index 6a9b2b90f44..9256a70adbc 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -76,10 +76,11 @@ void ContiguousSpace::mangle_unused_area(MemRegion mr) {
 
 #endif  // NOT_PRODUCT
 
-void ContiguousSpace::print() const { print_on(tty); }
+void ContiguousSpace::print() const { print_on(tty, ""); }
 
-void ContiguousSpace::print_on(outputStream* st) const {
-  st->print_cr(" space %zuK, %3d%% used [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+void ContiguousSpace::print_on(outputStream* st, const char* prefix) const {
+  st->print_cr("%sspace %zuK, %3d%% used [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+               prefix,
                capacity() / K, (int) ((double) used() * 100 / capacity()),
                p2i(bottom()), p2i(top()), p2i(end()));
 }
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 5d361ce8e50..75dd3f998d6 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.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
@@ -94,7 +94,7 @@ class ContiguousSpace: public CHeapObj<mtGC> {
   size_t free()     const { return byte_size(top(),    end()); }
 
   void print() const;
-  void print_on(outputStream* st) const;
+  void print_on(outputStream* st, const char* prefix) const;
 
   // Initialization.
   // "initialize" should be called once on a space, before it is used for
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 82c6cdb8971..b5b8e4b9e1a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -583,7 +583,7 @@ ShenandoahHeap::ShenandoahHeap(ShenandoahCollectorPolicy* policy) :
 #pragma warning( pop )
 #endif
 
-void ShenandoahHeap::print_on(outputStream* st) const {
+void ShenandoahHeap::print_heap_on(outputStream* st) const {
   st->print_cr("Shenandoah Heap");
   st->print_cr(" %zu%s max, %zu%s soft max, %zu%s committed, %zu%s used",
                byte_size_in_proper_unit(max_capacity()), proper_unit_for_byte_size(max_capacity()),
@@ -634,7 +634,6 @@ void ShenandoahHeap::print_on(outputStream* st) const {
   }
 
   st->cr();
-  MetaspaceUtils::print_on(st);
 
   if (Verbose) {
     st->cr();
@@ -642,9 +641,7 @@ void ShenandoahHeap::print_on(outputStream* st) const {
   }
 }
 
-void ShenandoahHeap::print_on_error(outputStream* st) const {
-  print_on(st);
-  st->cr();
+void ShenandoahHeap::print_gc_on(outputStream* st) const {
   print_heap_regions_on(st);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 4f24b9e1abd..78d507c0f7d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -202,8 +202,8 @@ class ShenandoahHeap : public CollectedHeap {
   virtual void print_init_logger() const;
   void initialize_serviceability() override;
 
-  void print_on(outputStream* st)              const override;
-  void print_on_error(outputStream *st)        const override;
+  void print_heap_on(outputStream* st)         const override;
+  void print_gc_on(outputStream *st)           const override;
   void print_tracing_info()                    const override;
   void print_heap_regions_on(outputStream* st) const;
 
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index 642ad42a1d7..a94e50e2a52 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -355,16 +355,12 @@ void ZCollectedHeap::prepare_for_verify() {
   // Does nothing
 }
 
-void ZCollectedHeap::print_on(outputStream* st) const {
-  StreamAutoIndentor auto_indentor(st);
-
-  _heap.print_on(st);
+void ZCollectedHeap::print_heap_on(outputStream* st) const {
+  _heap.print_usage_on(st);
 }
 
-void ZCollectedHeap::print_on_error(outputStream* st) const {
-  StreamAutoIndentor auto_indentor(st);
-
-  _heap.print_on_error(st);
+void ZCollectedHeap::print_gc_on(outputStream* st) const {
+  _heap.print_gc_on(st);
 }
 
 void ZCollectedHeap::print_tracing_info() const {
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
index 08aa7d40a3f..9ae3da39dd9 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -115,8 +115,8 @@ class ZCollectedHeap : public CollectedHeap {
   void pin_object(JavaThread* thread, oop obj) override;
   void unpin_object(JavaThread* thread, oop obj) override;
 
-  void print_on(outputStream* st) const override;
-  void print_on_error(outputStream* st) const override;
+  void print_heap_on(outputStream* st) const override;
+  void print_gc_on(outputStream* st) const override;
   void print_tracing_info() const override;
   bool print_location(outputStream* st, void* addr) const override;
 
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 90f8a867135..ddfa5775fb2 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -314,33 +314,18 @@ ZServiceabilityCounters* ZHeap::serviceability_counters() {
   return _serviceability.counters();
 }
 
-void ZHeap::print_on(outputStream* st) const {
-  streamIndentor indentor(st, 1);
-  _page_allocator.print_on(st);
-
-  // Metaspace printing prepends spaces instead of using outputStream indentation
-  streamIndentor indentor_back(st, -1);
-  MetaspaceUtils::print_on(st);
+void ZHeap::print_usage_on(outputStream* st) const {
+  _page_allocator.print_usage_on(st);
 }
 
-void ZHeap::print_on_error(outputStream* st) const {
-  {
-    streamIndentor indentor(st, 1);
-    _page_allocator.print_on_error(st);
-
-    // Metaspace printing prepends spaces instead of using outputStream indentation
-    streamIndentor indentor_back(st, -1);
-    MetaspaceUtils::print_on(st);
-  }
-  st->cr();
-
+void ZHeap::print_gc_on(outputStream* st) const {
   print_globals_on(st);
   st->cr();
 
   print_page_table_on(st);
   st->cr();
 
-  _page_allocator.print_extended_on_error(st);
+  _page_allocator.print_cache_extended_on(st);
 }
 
 void ZHeap::print_globals_on(outputStream* st) const {
@@ -373,12 +358,12 @@ void ZHeap::print_page_table_on(outputStream* st) const {
 
   // Print all pages
   st->print_cr("ZGC Page Table:");
-  {
-    streamIndentor indentor(st, 1);
-    ZPageTableIterator iter(&_page_table);
-    for (ZPage* page; iter.next(&page);) {
-      page->print_on(st);
-    }
+
+  StreamAutoIndentor indentor(st, 1);
+
+  ZPageTableIterator iter(&_page_table);
+  for (ZPage* page; iter.next(&page);) {
+    page->print_on(st);
   }
 
   // Allow pages to be deleted
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index 823fc009b2c..64be61cc873 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -130,8 +130,8 @@ class ZHeap {
   ZServiceabilityCounters* serviceability_counters();
 
   // Printing
-  void print_on(outputStream* st) const;
-  void print_on_error(outputStream* st) const;
+  void print_usage_on(outputStream* st) const;
+  void print_gc_on(outputStream* st) const;
   void print_globals_on(outputStream* st) const;
   void print_page_table_on(outputStream* st) const;
   bool print_location(outputStream* st, uintptr_t addr) const;
diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index c1c6e9edee9..f2bea439df2 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -30,6 +30,7 @@
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 class ZMappedCacheEntry {
@@ -575,7 +576,7 @@ void ZMappedCache::print_on(outputStream* st) const {
   // class lists.
   const size_t entry_count = Atomic::load(&_entry_count);
 
-  st->print("Cache");
+  st->print("Cache ");
   st->fill_to(17);
   st->print_cr("%zuM (%zu)", _size / M, entry_count);
 
@@ -591,9 +592,9 @@ void ZMappedCache::print_on(outputStream* st) const {
   }
 
   // Print information on size classes
-  streamIndentor indentor(st, 1);
+  StreamAutoIndentor indentor(st, 1);
 
-  st->print("size classes");
+  st->print("size classes ");
   st->fill_to(17);
 
   // Print the number of entries smaller than the min size class's size
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index 7bb1dcdcf81..ef4ea76f22f 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -1155,12 +1155,12 @@ void ZPartition::threads_do(ThreadClosure* tc) const {
 }
 
 void ZPartition::print_on(outputStream* st) const {
-  st->print("Partition %u", _numa_id);
+  st->print("Partition %u ", _numa_id);
   st->fill_to(17);
   st->print_cr("used %zuM, capacity %zuM, max capacity %zuM",
                _used / M, _capacity / M, _max_capacity / M);
 
-  streamIndentor indentor(st, 1);
+  StreamAutoIndentor indentor(st, 1);
   print_cache_on(st);
 }
 
@@ -1168,11 +1168,10 @@ void ZPartition::print_cache_on(outputStream* st) const {
   _cache.print_on(st);
 }
 
-void ZPartition::print_extended_on_error(outputStream* st) const {
+void ZPartition::print_cache_extended_on(outputStream* st) const {
   st->print_cr("Partition %u", _numa_id);
 
-  streamIndentor indentor(st, 1);
-
+  StreamAutoIndentor indentor(st, 1);
   _cache.print_extended_on(st);
 }
 
@@ -2394,11 +2393,6 @@ void ZPageAllocator::threads_do(ThreadClosure* tc) const {
   }
 }
 
-void ZPageAllocator::print_on(outputStream* st) const {
-  ZLocker<ZLock> lock(&_lock);
-  print_on_inner(st);
-}
-
 static bool try_lock_on_error(ZLock* lock) {
   if (VMError::is_error_reported() && VMError::is_error_reported_in_current_thread()) {
     return lock->try_lock();
@@ -2409,64 +2403,67 @@ static bool try_lock_on_error(ZLock* lock) {
   return true;
 }
 
-void ZPageAllocator::print_extended_on_error(outputStream* st) const {
-  st->print_cr("ZMappedCache:");
-
-  streamIndentor indentor(st, 1);
-
-  if (!try_lock_on_error(&_lock)) {
-    // We can't print without taking the lock since printing the contents of
-    // the cache requires iterating over the nodes in the cache's tree, which
-    // is not thread-safe.
-    st->print_cr("<Skipped>");
-
-    return;
-  }
-
-  // Print each partition's cache content
-  ZPartitionConstIterator iter = partition_iterator();
-  for (const ZPartition* partition; iter.next(&partition);) {
-    partition->print_extended_on_error(st);
-  }
-
-  _lock.unlock();
-}
-
-void ZPageAllocator::print_on_error(outputStream* st) const {
+void ZPageAllocator::print_usage_on(outputStream* st) const {
   const bool locked = try_lock_on_error(&_lock);
 
   if (!locked) {
     st->print_cr("<Without lock>");
   }
 
-  // Print information even though we have not successfully taken the lock.
+  // Print information even though we may not have successfully taken the lock.
   // This is thread-safe, but may produce inconsistent results.
-  print_on_inner(st);
+
+  print_total_usage_on(st);
+
+  StreamAutoIndentor indentor(st, 1);
+  print_partition_usage_on(st);
 
   if (locked) {
     _lock.unlock();
   }
 }
 
-void ZPageAllocator::print_on_inner(outputStream* st) const {
-  // Print total usage
-  st->print("ZHeap");
+void ZPageAllocator::print_total_usage_on(outputStream* st) const {
+  st->print("ZHeap ");
   st->fill_to(17);
   st->print_cr("used %zuM, capacity %zuM, max capacity %zuM",
                used() / M, capacity() / M, max_capacity() / M);
+}
 
-  // Print per-partition
-
-  streamIndentor indentor(st, 1);
-
+void ZPageAllocator::print_partition_usage_on(outputStream* st) const {
   if (_partitions.count() == 1) {
-    // The summary printing is redundant if we only have one partition
+    // Partition usage is redundant if we only have one partition. Only
+    // print the cache.
     _partitions.get(0).print_cache_on(st);
     return;
   }
 
+  // Print all partitions
   ZPartitionConstIterator iter = partition_iterator();
   for (const ZPartition* partition; iter.next(&partition);) {
     partition->print_on(st);
   }
 }
+
+void ZPageAllocator::print_cache_extended_on(outputStream* st) const {
+  st->print_cr("ZMappedCache:");
+
+  StreamAutoIndentor indentor(st, 1);
+
+  if (!try_lock_on_error(&_lock)) {
+    // We can't print without taking the lock since printing the contents of
+    // the cache requires iterating over the nodes in the cache's tree, which
+    // is not thread-safe.
+    st->print_cr("<Skipped>");
+
+    return;
+  }
+
+  // Print each partition's cache content
+  ZPartitionConstIterator iter = partition_iterator();
+  for (const ZPartition* partition; iter.next(&partition);) {
+    partition->print_cache_extended_on(st);
+  }
+
+  _lock.unlock();
+}
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index 5cd08aee94c..ba83686a87d 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -140,7 +140,7 @@ class ZPartition {
 
   void print_on(outputStream* st) const;
   void print_cache_on(outputStream* st) const;
-  void print_extended_on_error(outputStream* st) const;
+  void print_cache_extended_on(outputStream* st) const;
 };
 
 using ZPartitionIterator = ZPerNUMAIterator<ZPartition>;
@@ -238,8 +238,6 @@ class ZPageAllocator {
   void update_collection_stats(ZGenerationId id);
   ZPageAllocatorStats stats_inner(ZGeneration* generation) const;
 
-  void print_on_inner(outputStream* st) const;
-
 public:
   ZPageAllocator(size_t min_capacity,
                  size_t initial_capacity,
@@ -285,9 +283,10 @@ class ZPageAllocator {
 
   void threads_do(ThreadClosure* tc) const;
 
-  void print_on(outputStream* st) const;
-  void print_extended_on_error(outputStream* st) const;
-  void print_on_error(outputStream* st) const;
+  void print_usage_on(outputStream* st) const;
+  void print_total_usage_on(outputStream* st) const;
+  void print_partition_usage_on(outputStream* st) const;
+  void print_cache_extended_on(outputStream* st) const;
 };
 
 class ZPageAllocatorStats {
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 04e5d807f32..ab7202d046a 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -63,6 +63,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 
 using metaspace::ChunkManager;
 using metaspace::CommitLimiter;
@@ -214,10 +215,11 @@ void MetaspaceUtils::print_report(outputStream* out, size_t scale) {
 
 void MetaspaceUtils::print_on(outputStream* out) {
 
-  // Used from all GCs. It first prints out totals, then, separately, the class space portion.
+  // First prints out totals, then, separately, the class space portion.
   MetaspaceCombinedStats stats = get_combined_statistics();
-  out->print_cr(" Metaspace       "
-                "used %zuK, "
+  out->print("Metaspace ");
+  out->fill_to(17);
+  out->print_cr("used %zuK, "
                 "committed %zuK, "
                 "reserved %zuK",
                 stats.used()/K,
@@ -225,8 +227,10 @@ void MetaspaceUtils::print_on(outputStream* out) {
                 stats.reserved()/K);
 
   if (Metaspace::using_class_space()) {
-    out->print_cr("  class space    "
-                  "used %zuK, "
+    StreamAutoIndentor indentor(out, 1);
+    out->print("class space ");
+    out->fill_to(17);
+    out->print_cr("used %zuK, "
                   "committed %zuK, "
                   "reserved %zuK",
                   stats.class_space_stats().used()/K,
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 6f415ab93a4..e846eb3ddde 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1159,7 +1159,10 @@ void Universe::compute_base_vtable_size() {
 void Universe::print_on(outputStream* st) {
   GCMutexLocker hl(Heap_lock); // Heap_lock might be locked by caller thread.
   st->print_cr("Heap");
-  heap()->print_on(st);
+
+  StreamAutoIndentor indentor(st, 1);
+  heap()->print_heap_on(st);
+  MetaspaceUtils::print_on(st);
 }
 
 void Universe::print_heap_at_SIGBREAK() {
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 2ea90a6c9dd..fa1de208804 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -422,13 +422,13 @@ void VirtualSpace::check_for_contiguity() {
 }
 
 void VirtualSpace::print_on(outputStream* out) const {
-  out->print   ("Virtual space:");
-  if (special()) out->print(" (pinned in memory)");
-  out->cr();
-  out->print_cr(" - committed: %zu", committed_size());
-  out->print_cr(" - reserved:  %zu", reserved_size());
-  out->print_cr(" - [low, high]:     [" PTR_FORMAT ", " PTR_FORMAT "]",  p2i(low()), p2i(high()));
-  out->print_cr(" - [low_b, high_b]: [" PTR_FORMAT ", " PTR_FORMAT "]",  p2i(low_boundary()), p2i(high_boundary()));
+  out->print_cr("Virtual space:%s", special() ? " (pinned in memory)" : "");
+
+  StreamAutoIndentor indentor(out, 1);
+  out->print_cr("- committed: %zu", committed_size());
+  out->print_cr("- reserved:  %zu", reserved_size());
+  out->print_cr("- [low, high]:     [" PTR_FORMAT ", " PTR_FORMAT "]",  p2i(low()), p2i(high()));
+  out->print_cr("- [low_b, high_b]: [" PTR_FORMAT ", " PTR_FORMAT "]",  p2i(low_boundary()), p2i(high_boundary()));
 }
 
 void VirtualSpace::print() const {
@@ -436,3 +436,8 @@ void VirtualSpace::print() const {
 }
 
 #endif
+
+void VirtualSpace::print_space_boundaries_on(outputStream* out) const {
+  out->print_cr("[" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ")",
+                p2i(low_boundary()), p2i(high()), p2i(high_boundary()));
+}
diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp
index d5abf13b720..abc760ffeb3 100644
--- a/src/hotspot/share/memory/virtualspace.hpp
+++ b/src/hotspot/share/memory/virtualspace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,6 +124,8 @@ class VirtualSpace {
   // Debugging
   void print_on(outputStream* out) const PRODUCT_RETURN;
   void print() const;
+
+  void print_space_boundaries_on(outputStream* out) const;
 };
 
 #endif // SHARE_MEMORY_VIRTUALSPACE_HPP
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index d257ef61be6..17906520f5c 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -37,6 +37,7 @@
 #include "compiler/directivesParser.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "jvm.h"
+#include "memory/metaspaceUtils.hpp"
 #include "memory/metaspace/metaspaceDCmd.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -411,7 +412,8 @@ void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
 
 void HeapInfoDCmd::execute(DCmdSource source, TRAPS) {
   MutexLocker hl(THREAD, Heap_lock);
-  Universe::heap()->print_on(output());
+  Universe::heap()->print_heap_on(output());
+  MetaspaceUtils::print_on(output());
 }
 
 void FinalizerInfoDCmd::execute(DCmdSource source, TRAPS) {
diff --git a/src/hotspot/share/utilities/bitMap.cpp b/src/hotspot/share/utilities/bitMap.cpp
index 03eb1620cf1..14b1dc8d10f 100644
--- a/src/hotspot/share/utilities/bitMap.cpp
+++ b/src/hotspot/share/utilities/bitMap.cpp
@@ -688,7 +688,7 @@ BitMap::idx_t BitMap::count_one_bits(idx_t beg, idx_t end) const {
 
 }
 
-void BitMap::print_on_error(outputStream* st, const char* prefix) const {
+void BitMap::print_range_on(outputStream* st, const char* prefix) const {
   st->print_cr("%s[" PTR_FORMAT ", " PTR_FORMAT ")",
       prefix, p2i(map()), p2i((char*)map() + (size() >> LogBitsPerByte)));
 }
diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp
index 434993d45b9..af547eb539a 100644
--- a/src/hotspot/share/utilities/bitMap.hpp
+++ b/src/hotspot/share/utilities/bitMap.hpp
@@ -393,7 +393,7 @@ class BitMap {
   void write_to(bm_word_t* buffer, size_t buffer_size_in_bytes) const;
 
   // Printing
-  void print_on_error(outputStream* st, const char* prefix) const;
+  void print_range_on(outputStream* st, const char* prefix) const;
   void print_on(outputStream* st) const;
 };
 
diff --git a/src/hotspot/share/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp
index 46bd0b673c1..0a99ee886ad 100644
--- a/src/hotspot/share/utilities/ostream.hpp
+++ b/src/hotspot/share/utilities/ostream.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
@@ -176,6 +176,7 @@ class outputStream : public CHeapObjBase {
 extern outputStream* tty;           // tty output
 
 class streamIndentor : public StackObj {
+protected:
   outputStream* const _str;
   const int _amount;
   NONCOPYABLE(streamIndentor);
@@ -186,14 +187,13 @@ class streamIndentor : public StackObj {
   ~streamIndentor() { _str->dec(_amount); }
 };
 
-class StreamAutoIndentor : public StackObj {
-  outputStream* const _os;
+class StreamAutoIndentor : public streamIndentor {
   const bool _old;
   NONCOPYABLE(StreamAutoIndentor);
  public:
-  StreamAutoIndentor(outputStream* os) :
-    _os(os), _old(os->set_autoindent(true)) {}
-  ~StreamAutoIndentor() { _os->set_autoindent(_old); }
+  StreamAutoIndentor(outputStream* os, int indentation = 0) :
+    streamIndentor(os, indentation), _old(os->set_autoindent(true)) {}
+  ~StreamAutoIndentor() { _str->set_autoindent(_old); }
 };
 
 // advisory locking for the shared tty stream:
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index e1940123d67..ee402b8b894 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -1200,7 +1200,15 @@ void VMError::report(outputStream* st, bool _verbose) {
 
     if (Universe::heap() != nullptr) {
       st->print_cr("Heap:");
-      Universe::heap()->print_on_error(st);
+      StreamAutoIndentor indentor(st, 1);
+      Universe::heap()->print_heap_on(st);
+      MetaspaceUtils::print_on(st);
+      st->cr();
+    }
+
+  STEP_IF("printing GC information", _verbose)
+    if (Universe::heap() != nullptr) {
+      Universe::heap()->print_gc_on(st);
       st->cr();
     }
 
@@ -1382,16 +1390,32 @@ void VMError::print_vm_info(outputStream* st) {
   }
 #endif
 
-  // STEP("printing heap information")
+  // Take heap lock over both heap and GC printing so that information is
+  // consistent.
+  {
+    MutexLocker ml(Heap_lock);
 
-  if (Universe::is_fully_initialized()) {
-    MutexLocker hl(Heap_lock);
-    GCLogPrecious::print_on_error(st);
-    st->print_cr("Heap:");
-    Universe::heap()->print_on_error(st);
-    st->cr();
-    st->print_cr("Polling page: " PTR_FORMAT, p2i(SafepointMechanism::get_polling_page()));
-    st->cr();
+    // STEP("printing heap information")
+
+    if (Universe::is_fully_initialized()) {
+      GCLogPrecious::print_on_error(st);
+
+      st->print_cr("Heap:");
+      StreamAutoIndentor indentor(st, 1);
+      Universe::heap()->print_heap_on(st);
+      MetaspaceUtils::print_on(st);
+      st->cr();
+    }
+
+    // STEP("printing GC information")
+
+    if (Universe::is_fully_initialized()) {
+      Universe::heap()->print_gc_on(st);
+      st->cr();
+
+      st->print_cr("Polling page: " PTR_FORMAT, p2i(SafepointMechanism::get_polling_page()));
+      st->cr();
+    }
   }
 
   // STEP("printing metaspace information")

From 356c4d9ca93c8a37231e86d583ce9628d693c733 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Thu, 24 Apr 2025 14:14:24 +0000
Subject: [PATCH 116/901] 8355369: Remove setAccessible usage for setting final
 fields in java.util.concurrent

Reviewed-by: pminborg, dl, rgiulietti, alanb
---
 .../concurrent/ConcurrentSkipListSet.java     | 19 +++++++++++--------
 .../util/concurrent/CopyOnWriteArrayList.java | 15 +++++++--------
 .../atomic/AtomicReferenceArray.java          | 17 ++++++++---------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
index 649eaa563c7..0b0db4e8120 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
@@ -35,7 +35,9 @@
 
 package java.util.concurrent;
 
-import java.lang.reflect.Field;
+import jdk.internal.misc.Unsafe;
+
+import java.lang.invoke.VarHandle;
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.Collections;
@@ -176,6 +178,8 @@ public ConcurrentSkipListSet<E> clone() {
             ConcurrentSkipListSet<E> clone =
                 (ConcurrentSkipListSet<E>) super.clone();
             clone.setMap(new ConcurrentSkipListMap<E,Object>(m));
+            // Needed to ensure safe publication of setMap()
+            VarHandle.releaseFence();
             return clone;
         } catch (CloneNotSupportedException e) {
             throw new InternalError();
@@ -527,12 +531,11 @@ public Spliterator<E> spliterator() {
 
     /** Initializes map field; for use in clone. */
     private void setMap(ConcurrentNavigableMap<E,Object> map) {
-        try {
-            Field mapField = ConcurrentSkipListSet.class.getDeclaredField("m");
-            mapField.setAccessible(true);
-            mapField.set(this, map);
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            throw new Error(e);
-        }
+        final Unsafe U = Unsafe.getUnsafe();
+        U.putReference(
+            this,
+            U.objectFieldOffset(ConcurrentSkipListSet.class, "m"),
+            map
+        );
     }
 }
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 2d3bdb429e9..9024fca8024 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -35,7 +35,6 @@
 package java.util.concurrent;
 
 import java.lang.invoke.VarHandle;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -57,6 +56,7 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.misc.Unsafe;
 import jdk.internal.util.ArraysSupport;
 
 /**
@@ -2095,12 +2095,11 @@ public List<E> reversed() {
 
     /** Initializes the lock; for use when deserializing or cloning. */
     private void resetLock() {
-        try {
-            Field lockField = CopyOnWriteArrayList.class.getDeclaredField("lock");
-            lockField.setAccessible(true);
-            lockField.set(this, new Object());
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            throw new Error(e);
-        }
+        final Unsafe U = Unsafe.getUnsafe();
+        U.putReference(
+            this,
+            U.objectFieldOffset(CopyOnWriteArrayList.class, "lock"),
+            new Object()
+        );
     }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
index ff4e9fa7355..67315296a8d 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -35,10 +35,11 @@
 
 package java.util.concurrent.atomic;
 
+import jdk.internal.misc.Unsafe;
+
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.lang.reflect.Array;
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.function.BinaryOperator;
 import java.util.function.UnaryOperator;
@@ -330,14 +331,13 @@ private void readObject(java.io.ObjectInputStream s)
             throw new java.io.InvalidObjectException("Not array type");
         if (a.getClass() != Object[].class)
             a = Arrays.copyOf((Object[])a, Array.getLength(a), Object[].class);
-        try {
 
-            Field arrayField = AtomicReferenceArray.class.getDeclaredField("array");
-            arrayField.setAccessible(true);
-            arrayField.set(this, a);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new Error(e);
-        }
+        final Unsafe U = Unsafe.getUnsafe();
+        U.putReference(
+            this,
+            U.objectFieldOffset(AtomicReferenceArray.class, "array"),
+            a
+        );
     }
 
     // jdk9
@@ -523,5 +523,4 @@ public final boolean weakCompareAndSetAcquire(int i, E expectedValue, E newValue
     public final boolean weakCompareAndSetRelease(int i, E expectedValue, E newValue) {
         return AA.weakCompareAndSetRelease(array, i, expectedValue, newValue);
     }
-
 }

From 0edd018a48c202a6da4afe80e245799b47000885 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 24 Apr 2025 14:48:00 +0000
Subject: [PATCH 117/901] 8355432: Remove CompileTask from SA

Reviewed-by: cjplummer, lmesnik
---
 .../sun/jvm/hotspot/compiler/CompileTask.java | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java

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
deleted file mode 100644
index e54facaeb72..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
+++ /dev/null
@@ -1,73 +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.compiler;
-
-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.prims.JvmtiExport;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CompileTask 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("CompileTask");
-    methodField = type.getAddressField("_method");
-    osrBciField = new CIntField(type.getCIntegerField("_osr_bci"), 0);
-    compLevelField = new CIntField(type.getCIntegerField("_comp_level"), 0);
-  }
-
-  private static AddressField methodField;
-  private static CIntField osrBciField;
-  private static CIntField compLevelField;
-
-  public CompileTask(Address addr) {
-    super(addr);
-  }
-
-  public Method method() {
-    Address oh =  methodField.getValue(getAddress());
-    return (Method)Metadata.instantiateWrapperFor(oh);
-  }
-
-  public int osrBci() {
-    return (int)osrBciField.getValue(getAddress());
-  }
-
-  public int compLevel() {
-      return (int)compLevelField.getValue(getAddress());
-  }
-}

From 751e0392bcad0e608a7a041b658c1d263383f15a Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Thu, 24 Apr 2025 15:55:05 +0000
Subject: [PATCH 118/901] 8355235: Clean out old versions from Tools.gmk

Reviewed-by: erikj
---
 make/devkit/Tools.gmk | 134 +++++++++---------------------------------
 1 file changed, 27 insertions(+), 107 deletions(-)

diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
index f4323f58638..1b9240df49c 100644
--- a/make/devkit/Tools.gmk
+++ b/make/devkit/Tools.gmk
@@ -39,6 +39,8 @@
 # Fix this...
 #
 
+uppercase = $(shell echo $1 | tr a-z A-Z)
+
 $(info TARGET=$(TARGET))
 $(info HOST=$(HOST))
 $(info BUILD=$(BUILD))
@@ -91,99 +93,28 @@ endif
 ################################################################################
 # Define external dependencies
 
-# Latest that could be made to work.
-GCC_VER := 14.2.0
-ifeq ($(GCC_VER), 14.2.0)
-  gcc_ver := gcc-14.2.0
-  binutils_ver := binutils-2.43
-  ccache_ver := ccache-4.10.2
-  CCACHE_CMAKE_BASED := 1
-  mpfr_ver := mpfr-4.2.1
-  gmp_ver := gmp-6.3.0
-  mpc_ver := mpc-1.3.1
-  gdb_ver := gdb-15.2
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 13.2.0)
-  gcc_ver := gcc-13.2.0
-  binutils_ver := binutils-2.41
-  ccache_ver := ccache-3.7.12
-  mpfr_ver := mpfr-4.2.0
-  gmp_ver := gmp-6.3.0
-  mpc_ver := mpc-1.3.1
-  gdb_ver := gdb-13.2
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 11.3.0)
-  gcc_ver := gcc-11.3.0
-  binutils_ver := binutils-2.39
-  ccache_ver := ccache-3.7.12
-  mpfr_ver := mpfr-4.1.1
-  gmp_ver := gmp-6.2.1
-  mpc_ver := mpc-1.2.1
-  gdb_ver := gdb-11.2
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 11.2.0)
-  gcc_ver := gcc-11.2.0
-  binutils_ver := binutils-2.37
-  ccache_ver := ccache-3.7.12
-  mpfr_ver := mpfr-4.1.0
-  gmp_ver := gmp-6.2.1
-  mpc_ver := mpc-1.2.1
-  gdb_ver := gdb-11.1
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 10.3.0)
-  gcc_ver := gcc-10.3.0
-  binutils_ver := binutils-2.36.1
-  ccache_ver := ccache-3.7.11
-  mpfr_ver := mpfr-4.1.0
-  gmp_ver := gmp-6.2.0
-  mpc_ver := mpc-1.1.0
-  gdb_ver := gdb-10.1
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 10.2.0)
-  gcc_ver := gcc-10.2.0
-  binutils_ver := binutils-2.35
-  ccache_ver := ccache-3.7.11
-  mpfr_ver := mpfr-4.1.0
-  gmp_ver := gmp-6.2.0
-  mpc_ver := mpc-1.1.0
-  gdb_ver := gdb-9.2
-  REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
-else ifeq ($(GCC_VER), 9.2.0)
-  gcc_ver := gcc-9.2.0
-  binutils_ver := binutils-2.34
-  ccache_ver := ccache-3.7.3
-  mpfr_ver := mpfr-3.1.5
-  gmp_ver := gmp-6.1.2
-  mpc_ver := mpc-1.0.3
-  gdb_ver := gdb-8.3
-else ifeq ($(GCC_VER), 8.3.0)
-  gcc_ver := gcc-8.3.0
-  binutils_ver := binutils-2.32
-  ccache_ver := ccache-3.7.3
-  mpfr_ver := mpfr-3.1.5
-  gmp_ver := gmp-6.1.2
-  mpc_ver := mpc-1.0.3
-  gdb_ver := gdb-8.3
-else ifeq ($(GCC_VER), 7.3.0)
-  gcc_ver := gcc-7.3.0
-  binutils_ver := binutils-2.30
-  ccache_ver := ccache-3.3.6
-  mpfr_ver := mpfr-3.1.5
-  gmp_ver := gmp-6.1.2
-  mpc_ver := mpc-1.0.3
-  gdb_ver := gdb-8.1
-else ifeq ($(GCC_VER), 4.9.2)
-  gcc_ver := gcc-4.9.2
-  binutils_ver := binutils-2.25
-  ccache_ver := ccache-3.2.1
-  mpfr_ver := mpfr-3.0.1
-  gmp_ver := gmp-4.3.2
-  mpc_ver := mpc-1.0.1
-  gdb_ver := gdb-7.12.1
-else
-  $(error Unsupported GCC version)
-endif
+gcc_ver_only := 14.2.0
+binutils_ver_only := 2.43
+ccache_ver_only := 4.10.2
+CCACHE_CMAKE_BASED := 1
+mpfr_ver_only := 4.2.1
+gmp_ver_only := 6.3.0
+mpc_ver_only := 1.3.1
+gdb_ver_only := 15.2
+
+dependencies := gcc binutils ccache mpfr gmp mpc gdb
 
+$(foreach dep,$(dependencies),$(eval $(dep)_ver := $(dep)-$($(dep)_ver_only)))
+
+GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
+BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.gz
+CCACHE := https://github.com/ccache/ccache/releases/download/v$(ccache_ver_only)/$(ccache_ver).tar.xz
+MPFR := https://www.mpfr.org/$(mpfr_ver)/$(mpfr_ver).tar.bz2
+GMP := http://ftp.gnu.org/pub/gnu/gmp/$(gmp_ver).tar.bz2
+MPC := http://ftp.gnu.org/pub/gnu/mpc/$(mpc_ver).tar.gz
+GDB := http://ftp.gnu.org/gnu/gdb/$(gdb_ver).tar.xz
+
+REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
 ifneq ($(REQUIRED_MIN_MAKE_MAJOR_VERSION),)
   MAKE_MAJOR_VERSION := $(word 1,$(subst ., ,$(MAKE_VERSION)))
   SUPPORTED_MAKE_VERSION := $(shell [ $(MAKE_MAJOR_VERSION) -ge $(REQUIRED_MIN_MAKE_MAJOR_VERSION) ] && echo true)
@@ -192,17 +123,6 @@ ifneq ($(REQUIRED_MIN_MAKE_MAJOR_VERSION),)
   endif
 endif
 
-ccache_ver_only := $(patsubst ccache-%,%,$(ccache_ver))
-
-
-GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
-BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.gz
-CCACHE := https://github.com/ccache/ccache/releases/download/v$(ccache_ver_only)/$(ccache_ver).tar.xz
-MPFR := https://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
-GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
-MPC := http://ftp.gnu.org/pub/gnu/mpc/${mpc_ver}.tar.gz
-GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
-
 # RPMs used by all BASE_OS
 RPM_LIST := \
     $(KERNEL_HEADERS_RPM) \
@@ -297,7 +217,7 @@ define Download
 endef
 
 # Download and unpack all source packages
-$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p))))
+$(foreach dep,$(dependencies),$(eval $(call Download,$(call uppercase,$(dep)))))
 
 ################################################################################
 # Unpack RPMS
@@ -374,7 +294,7 @@ endif
 ################################################################################
 
 # Define marker files for each source package to be compiled
-$(foreach t,binutils mpfr gmp mpc gcc ccache gdb,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
+$(foreach dep,$(dependencies),$(eval $(dep) = $(TARGETDIR)/$($(dep)_ver).done))
 
 ################################################################################
 
@@ -721,12 +641,12 @@ ifeq ($(TARGET), $(HOST))
 	ln -s $(TARGET)-$* $@
 
   missing-links := $(addprefix $(PREFIX)/bin/, \
-      addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(GCC_VER) gprof ld ld.bfd \
+      addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(gcc_ver_only) gprof ld ld.bfd \
       ld.gold nm objcopy objdump ranlib readelf size strings strip)
 endif
 
 # Add link to work around "plugin needed to handle lto object" (JDK-8344272)
-$(PREFIX)/lib/bfd-plugins/liblto_plugin.so: $(PREFIX)/libexec/gcc/$(TARGET)/$(GCC_VER)/liblto_plugin.so
+$(PREFIX)/lib/bfd-plugins/liblto_plugin.so: $(PREFIX)/libexec/gcc/$(TARGET)/$(gcc_ver_only)/liblto_plugin.so
 	@echo 'Creating missing $(@F) soft link'
 	@mkdir -p $(@D)
 	ln -s $$(realpath -s --relative-to=$(@D) $<) $@

From 8e51ff70d896aeb5b35e6bb6b00f1818d67c99e7 Mon Sep 17 00:00:00 2001
From: Gennadiy Krivoshein <gennadiy.krivoshein@bell-sw.com>
Date: Thu, 24 Apr 2025 16:06:29 +0000
Subject: [PATCH 119/901] 8315113: Print request Chromaticity.MONOCHROME
 attribute does not work on macOS

Reviewed-by: prr, psadhukhan
---
 .../classes/sun/lwawt/macosx/CPrinterJob.java |  13 +-
 .../sun/print/GrayscaleProxyGraphics2D.java   | 211 ++++++++++++++
 .../classes/sun/print/IPPPrintService.java    |  13 +-
 .../print/attribute/MonochromePrintTest.java  | 272 ++++++++++++++++++
 4 files changed, 505 insertions(+), 4 deletions(-)
 create mode 100644 src/java.desktop/share/classes/sun/print/GrayscaleProxyGraphics2D.java
 create mode 100644 test/jdk/javax/print/attribute/MonochromePrintTest.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
index cb7333c79d6..1ca94eb3f51 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.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
@@ -36,6 +36,7 @@
 import javax.print.*;
 import javax.print.attribute.PrintRequestAttributeSet;
 import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.standard.Chromaticity;
 import javax.print.attribute.standard.Copies;
 import javax.print.attribute.standard.Destination;
 import javax.print.attribute.standard.Media;
@@ -73,6 +74,8 @@ public final class CPrinterJob extends RasterPrinterJob {
 
     private Throwable printerAbortExcpn;
 
+    private boolean monochrome = false;
+
     // This is the NSPrintInfo for this PrinterJob. Protect multi thread
     //  access to it. It is used by the pageDialog, jobDialog, and printLoop.
     //  This way the state of these items is shared across these calls.
@@ -212,6 +215,11 @@ protected void setAttributes(PrintRequestAttributeSet attributes) throws Printer
                 setPageRange(-1, -1);
             }
         }
+
+        PrintService service = getPrintService();
+        Chromaticity chromaticity = (Chromaticity)attributes.get(Chromaticity.class);
+        monochrome = chromaticity == Chromaticity.MONOCHROME && service != null &&
+                service.isAttributeCategorySupported(Chromaticity.class);
     }
 
     private void setPageRangeAttribute(int from, int to, boolean isRangeSet) {
@@ -788,6 +796,9 @@ private void printToPathGraphics(    final PeekGraphics graphics, // Always an a
                 Graphics2D pathGraphics = new CPrinterGraphics(delegate, printerJob); // Just stores delegate into an ivar
                 Rectangle2D pageFormatArea = getPageFormatArea(page);
                 initPrinterGraphics(pathGraphics, pageFormatArea);
+                if (monochrome) {
+                    pathGraphics = new GrayscaleProxyGraphics2D(pathGraphics, printerJob);
+                }
                 painter.print(pathGraphics, FlipPageFormat.getOriginal(page), pageIndex);
                 delegate.dispose();
                 delegate = null;
diff --git a/src/java.desktop/share/classes/sun/print/GrayscaleProxyGraphics2D.java b/src/java.desktop/share/classes/sun/print/GrayscaleProxyGraphics2D.java
new file mode 100644
index 00000000000..25f32181b71
--- /dev/null
+++ b/src/java.desktop/share/classes/sun/print/GrayscaleProxyGraphics2D.java
@@ -0,0 +1,211 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.print;
+
+
+import java.awt.Color;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.LinearGradientPaint;
+import java.awt.Paint;
+import java.awt.RadialGradientPaint;
+import java.awt.TexturePaint;
+import java.awt.color.ColorSpace;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
+import java.awt.print.PrinterJob;
+
+/**
+ * Proxy class to print with grayscale.
+ * Convert Colors, Paints and Images to the grayscale.
+ *
+ */
+public class GrayscaleProxyGraphics2D extends ProxyGraphics2D {
+
+    /**
+     * The new ProxyGraphics2D will forward all graphics
+     * calls to 'graphics'.
+     *
+     * @param graphics
+     * @param printerJob
+     */
+    public GrayscaleProxyGraphics2D(Graphics2D graphics, PrinterJob printerJob) {
+        super(graphics, printerJob);
+    }
+
+    @Override
+    public void setBackground(Color color) {
+        Color gcolor = getGrayscaleColor(color);
+        super.setBackground(gcolor);
+    }
+
+    @Override
+    public void setColor(Color c) {
+        Color gcolor = getGrayscaleColor(c);
+        super.setColor(gcolor);
+    }
+
+    @Override
+    public void setPaint(Paint paint) {
+        if (paint instanceof Color color) {
+            super.setPaint(getGrayscaleColor(color));
+        } else if (paint instanceof TexturePaint texturePaint) {
+            super.setPaint(new TexturePaint(getGrayscaleImage(texturePaint.getImage()), texturePaint.getAnchorRect()));
+        } else if (paint instanceof GradientPaint gradientPaint) {
+            super.setPaint(new GradientPaint(gradientPaint.getPoint1(),
+                    getGrayscaleColor(gradientPaint.getColor1()),
+                    gradientPaint.getPoint2(),
+                    getGrayscaleColor(gradientPaint.getColor2()),
+                    gradientPaint.isCyclic()));
+        } else if (paint instanceof LinearGradientPaint linearGradientPaint) {
+            Color[] colors = new Color[linearGradientPaint.getColors().length];
+            Color[] oldColors = linearGradientPaint.getColors();
+            for (int i = 0; i < colors.length; i++) {
+                colors[i] = getGrayscaleColor(oldColors[i]);
+            }
+            super.setPaint(new LinearGradientPaint(linearGradientPaint.getStartPoint(),
+                    linearGradientPaint.getEndPoint(),
+                    linearGradientPaint.getFractions(),
+                    colors,
+                    linearGradientPaint.getCycleMethod(),
+                    linearGradientPaint.getColorSpace(),
+                    linearGradientPaint.getTransform()
+            ));
+        } else if (paint instanceof RadialGradientPaint radialGradientPaint) {
+            Color[] colors = new Color[radialGradientPaint.getColors().length];
+            Color[] oldColors = radialGradientPaint.getColors();
+            for (int i = 0; i < colors.length; i++) {
+                colors[i] = getGrayscaleColor(oldColors[i]);
+            }
+            super.setPaint(new RadialGradientPaint(radialGradientPaint.getCenterPoint(),
+                    radialGradientPaint.getRadius(),
+                    radialGradientPaint.getFocusPoint(),
+                    radialGradientPaint.getFractions(),
+                    colors,
+                    radialGradientPaint.getCycleMethod(),
+                    radialGradientPaint.getColorSpace(),
+                    radialGradientPaint.getTransform()));
+        } else if (paint == null) {
+            super.setPaint(paint);
+        } else {
+            throw new IllegalArgumentException("Unsupported Paint");
+        }
+    }
+
+    @Override
+    public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
+        BufferedImage grayImage = new BufferedImage(img.getWidth() + img.getTileWidth(),
+                img.getHeight() + img.getTileHeight(), BufferedImage.TYPE_BYTE_GRAY);
+        Graphics2D g2 = grayImage.createGraphics();
+        g2.drawRenderedImage(img, new AffineTransform());
+        g2.dispose();
+        super.drawRenderedImage(getGrayscaleImage(grayImage), xform);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+                             Color bgcolor, ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+                             ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), x, y, width, height, bgcolor, observer);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), x, y, bgcolor, observer);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), x, y, width, height, observer);
+    }
+
+    @Override
+    public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
+        return super.drawImage(getGrayscaleImage(img), x, y, observer);
+    }
+
+    @Override
+    public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
+        super.drawImage(getGrayscaleImage(img), op, x, y);
+    }
+
+    @Override
+    public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
+        return super.drawImage(getGrayscaleImage(img), xform, obs);
+    }
+
+    /**
+     * Returns grayscale variant of the input Color
+     * @param color color to transform to grayscale
+     * @return grayscale color
+     */
+    private Color getGrayscaleColor(Color color) {
+        if (color == null) {
+            return null;
+        }
+        float[] gcolor = color.getComponents(ColorSpace.getInstance(ColorSpace.CS_GRAY), null);
+        return switch (gcolor.length) {
+            case 1 -> new Color(gcolor[0], gcolor[0], gcolor[0]);
+            case 2 -> new Color(gcolor[0], gcolor[0], gcolor[0], gcolor[1]);
+            default -> throw new IllegalArgumentException("Unknown grayscale color. " +
+                    "Expected 1 or 2 components, received " + gcolor.length + " components.");
+        };
+    }
+
+    /**
+     * Converts Image to a grayscale
+     * @param img colored image
+     * @return grayscale BufferedImage
+     */
+    private BufferedImage getGrayscaleImage(Image img) {
+        if (img == null) {
+            return null;
+        }
+        BufferedImage grayImage = new BufferedImage(img.getWidth(null), img.getHeight(null),
+                BufferedImage.TYPE_BYTE_GRAY);
+        Graphics grayGraphics = grayImage.getGraphics();
+        grayGraphics.drawImage(img, 0, 0, null);
+        grayGraphics.dispose();
+        return grayImage;
+    }
+
+}
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index 53089401e33..96fcdef3a52 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -572,8 +572,15 @@ public DocPrintJob createPrintJob() {
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
                 !isIPPSupportedImages(flavor.getMimeType())) {
-                Chromaticity[]arr = new Chromaticity[1];
-                arr[0] = Chromaticity.COLOR;
+                Chromaticity[] arr;
+                if (PrintServiceLookupProvider.isMac()) {
+                    arr = new Chromaticity[2];
+                    arr[0] = Chromaticity.COLOR;
+                    arr[1] = Chromaticity.MONOCHROME;
+                } else {
+                    arr = new Chromaticity[1];
+                    arr[0] = Chromaticity.COLOR;
+                }
                 return (arr);
             } else {
                 return null;
@@ -1400,7 +1407,7 @@ public boolean isAttributeValueSupported(Attribute attr,
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
                 !isIPPSupportedImages(flavor.getMimeType())) {
-                return attr == Chromaticity.COLOR;
+                return PrintServiceLookupProvider.isMac() || attr == Chromaticity.COLOR;
             } else {
                 return false;
             }
diff --git a/test/jdk/javax/print/attribute/MonochromePrintTest.java b/test/jdk/javax/print/attribute/MonochromePrintTest.java
new file mode 100644
index 00000000000..841183f04bb
--- /dev/null
+++ b/test/jdk/javax/print/attribute/MonochromePrintTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.Size2DSyntax;
+import javax.print.attribute.standard.Chromaticity;
+import javax.print.attribute.standard.MediaSize;
+import javax.print.attribute.standard.MediaSizeName;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+import javax.swing.border.EmptyBorder;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.LinearGradientPaint;
+import java.awt.MultipleGradientPaint;
+import java.awt.Paint;
+import java.awt.RadialGradientPaint;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @bug 8315113
+ * @key printer
+ * @requires (os.family == "mac")
+ * @summary javax.print: Support monochrome printing
+ * @run main/manual MonochromePrintTest
+ */
+
+public class MonochromePrintTest {
+
+    private static final String INSTRUCTIONS = """
+           This test checks availability of the monochrome printing
+           on color printers.
+           To be able to run this test it is required to have a color
+           printer configured in your user environment.
+           Test's steps:
+             - Choose a printer.
+             - Press 'Print' button.
+           Visual inspection of the printed pages is needed.
+           A passing test will print two pages with
+           color and grayscale appearances
+           """;
+
+    public static void main(String[] args) throws Exception {
+        PrintService[] availablePrintServices = getTestablePrintServices();
+        if (availablePrintServices.length == 0) {
+            System.out.println("Available print services not found");
+            return;
+        }
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .testTimeOut(300)
+                .title("Monochrome printing")
+                .testUI(createTestWindow(availablePrintServices))
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static Window createTestWindow(final PrintService[] availablePrintServices) {
+        Window frame = new JFrame("Choose service to test");
+        JPanel pnlMain = new JPanel();
+        pnlMain.setBorder(new EmptyBorder(5,5,5,5));
+        pnlMain.setLayout(new GridLayout(3, 1, 5, 5));
+        JLabel lblServices = new JLabel("Available services");
+        JComboBox<PrintService> cbServices = new JComboBox<>();
+        JButton btnPrint = new JButton("Print");
+        btnPrint.setEnabled(false);
+        cbServices.setRenderer(new ListCellRenderer<PrintService>() {
+            @Override
+            public Component getListCellRendererComponent(JList<? extends PrintService> list, PrintService value,
+                                                          int index, boolean isSelected, boolean cellHasFocus) {
+                return new JLabel(value == null ? "" : value.getName());
+            }
+        });
+        cbServices.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                btnPrint.setEnabled(cbServices.getSelectedItem() != null);
+            }
+        });
+        for (PrintService ps : availablePrintServices) {
+            cbServices.addItem(ps);
+        }
+        lblServices.setLabelFor(cbServices);
+        btnPrint.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                PrintService printService = (PrintService) cbServices.getSelectedItem();
+                if (printService != null) {
+                    cbServices.setEnabled(false);
+                    btnPrint.setEnabled(false);
+                    test(printService);
+                }
+            }
+        });
+        pnlMain.add(lblServices);
+        pnlMain.add(cbServices);
+        pnlMain.add(btnPrint);
+        frame.add(pnlMain);
+        frame.pack();
+        return frame;
+    }
+
+    private static PrintService[] getTestablePrintServices() {
+        List<PrintService> testablePrintServices = new ArrayList<>();
+        for (PrintService ps : PrintServiceLookup.lookupPrintServices(null,null)) {
+            if (ps.isAttributeValueSupported(Chromaticity.MONOCHROME, null, null) &&
+                    ps.isAttributeValueSupported(Chromaticity.COLOR, null, null)) {
+                testablePrintServices.add(ps);
+            }
+        }
+        return testablePrintServices.toArray(new PrintService[0]);
+    }
+
+    private static void test(PrintService printService) {
+        try {
+            print(printService, Chromaticity.COLOR);
+            print(printService, Chromaticity.MONOCHROME);
+        } catch (PrinterException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static void print(PrintService printService, Chromaticity chromaticity)
+            throws PrinterException {
+        PrintRequestAttributeSet attr = new HashPrintRequestAttributeSet();
+        attr.add(chromaticity);
+        PrinterJob job = PrinterJob.getPrinterJob();
+        job.setPrintService(printService);
+        job.setJobName("Print with " + chromaticity);
+        job.setPrintable(new ChromaticityAttributePrintable(chromaticity));
+        job.print(attr);
+    }
+
+    private static class ChromaticityAttributePrintable implements Printable {
+
+        private final Chromaticity chromaticity;
+
+        public ChromaticityAttributePrintable(Chromaticity chromaticity) {
+            this.chromaticity = chromaticity;
+        }
+
+        @Override
+        public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) {
+
+            if (pageIndex != 0) {
+                return NO_SUCH_PAGE;
+            }
+
+            final int sx = (int) Math.ceil(pageFormat.getImageableX());
+            final int sy = (int) Math.ceil(pageFormat.getImageableY());
+
+            Graphics2D g = (Graphics2D) graphics;
+
+            BufferedImage bufferdImage = getBufferedImage((int) Math.ceil(pageFormat.getImageableWidth() / 3),
+                    (int) Math.ceil(pageFormat.getImageableHeight() / 7));
+            g.drawImage(bufferdImage, null, sx, sy);
+
+            double defaultMediaSizeWidth = MediaSize.getMediaSizeForName(MediaSizeName.ISO_A4)
+                    .getX(Size2DSyntax.INCH) * 72;
+            double scale = pageFormat.getWidth() / defaultMediaSizeWidth;
+
+            final int squareSideLenngth = (int)(50 * scale);
+            final int offset = (int)(10 * scale);
+            int imh = sy + (int) Math.ceil(pageFormat.getImageableHeight() / 7) + offset;
+
+            g.setColor(Color.ORANGE);
+            g.drawRect(sx, imh, squareSideLenngth, squareSideLenngth);
+            imh = imh + squareSideLenngth + offset;
+
+            g.setColor(Color.BLUE);
+            g.fillOval(sx, imh, squareSideLenngth, squareSideLenngth);
+            imh = imh + squareSideLenngth + offset;
+
+            Paint paint = new LinearGradientPaint(0, 0,
+                    squareSideLenngth>>1, offset>>1, new float[]{0.0f, 0.2f, 1.0f},
+                    new Color[]{Color.RED, Color.GREEN, Color.CYAN}, MultipleGradientPaint.CycleMethod.REPEAT);
+            g.setPaint(paint);
+            g.setStroke(new BasicStroke(squareSideLenngth));
+            g.fillRect(sx, imh + offset, squareSideLenngth, squareSideLenngth);
+            imh = imh + squareSideLenngth + offset;
+
+            paint = new RadialGradientPaint(offset, offset, offset>>1, new float[]{0.0f, 0.5f, 1.0f},
+                    new Color[]{Color.RED, Color.GREEN, Color.CYAN}, MultipleGradientPaint.CycleMethod.REPEAT);
+            g.setPaint(paint);
+            g.fillRect(sx, imh + offset, squareSideLenngth, squareSideLenngth);
+            imh = imh + squareSideLenngth + offset;
+
+            g.setStroke(new BasicStroke(offset>>1));
+            g.setColor(Color.PINK);
+            g.drawString("This page should be " + chromaticity, sx, imh + squareSideLenngth);
+
+            return PAGE_EXISTS;
+        }
+
+        private BufferedImage getBufferedImage(int width, int height) {
+            Color[] colors = new Color[]{
+                    Color.RED, Color.ORANGE, Color.BLUE,
+                    Color.CYAN, Color.MAGENTA, Color.GREEN
+            };
+            BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            final int secondSquareOffset = width / 3;
+            final int thirdSquareOffset = secondSquareOffset * 2;
+            final int squareHeight = height / 2;
+
+            int offset = 0;
+            Color color;
+            for (int y = 0; y < height; y++) {
+                if (y > squareHeight) {
+                    offset = 3;
+                }
+                for (int x = 0; x < width; x++) {
+                    if (x >= thirdSquareOffset) {
+                        color = colors[offset + 2];
+                    } else if (x >= secondSquareOffset) {
+                        color = colors[offset + 1];
+                    } else {
+                        color = colors[offset];
+                    }
+                    bufferedImage.setRGB(x, y, color.getRGB());
+                }
+            }
+            return bufferedImage;
+        }
+    }
+
+}
\ No newline at end of file

From 3270a7d3591eac44705ff5d76c6f59cfb14f5ac0 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 24 Apr 2025 16:21:44 +0000
Subject: [PATCH 120/901] 8355476: RISC-V: using zext_w directly in
 vector_update_crc32 could trigger assert

Reviewed-by: fyang, fjiang
---
 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 218da7cde03..825722ad29b 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -1806,7 +1806,7 @@ void MacroAssembler::vector_update_crc32(Register crc, Register buf, Register le
       for (int i = 0; i < N; i++) {
         vmv_x_s(tmp2, vcrc);
         // in vmv_x_s, the value is sign-extended to SEW bits, but we need zero-extended here.
-        zext_w(tmp2, tmp2);
+        zext(tmp2, tmp2, 32);
         vslidedown_vi(vcrc, vcrc, 1);
         xorr(crc, crc, tmp2);
         for (int j = 0; j < W; j++) {

From 862797f0c16ed0459cda4931824b6b17120a2abe Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 24 Apr 2025 16:23:12 +0000
Subject: [PATCH 121/901] 8355293: [TEST] RISC-V: enable more ir tests

Reviewed-by: fyang, luhenry
---
 .../loopopts/superword/ProdRed_Double.java    |  8 +++++++
 .../loopopts/superword/ProdRed_Float.java     |  4 ++++
 .../loopopts/superword/ProdRed_Int.java       |  3 +--
 .../TestRangeCheckHoistingScaledIV.java       |  3 ++-
 .../runner/ArrayShiftOpTest.java              | 23 +++++++-----------
 .../vectorization/runner/BasicIntOpTest.java  | 24 +++++++++----------
 6 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
index ea6939aa694..41284c0d61e 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Double.java
@@ -88,6 +88,10 @@ public static void prodReductionInit(double[] a, double[] b) {
     @IR(applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         applyIfCPUFeature = {"sse2", "true"},
         counts = {IRNode.MUL_REDUCTION_VD, ">= 1"})
+    // There is no efficient way to implement strict-ordered version on riscv64.
+    @IR(applyIf = {"SuperWordReductions", "true"},
+        applyIfCPUFeature = {"rvv", "true"},
+        failOn = {IRNode.MUL_REDUCTION_VD})
     public static double prodReductionImplement(double[] a, double[] b, double total) {
         for (int i = 0; i < a.length; i++) {
             total *= a[i] - b[i];
@@ -101,6 +105,10 @@ public static double prodReductionImplement(double[] a, double[] b, double total
     @IR(applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         applyIfCPUFeature = {"sse2", "true"},
         counts = {IRNode.MUL_REDUCTION_VD, ">= 1"})
+    // There is no efficient way to implement strict-ordered version on riscv64.
+    @IR(applyIf = {"SuperWordReductions", "true"},
+        applyIfCPUFeature = {"rvv", "true"},
+        failOn = {IRNode.MUL_REDUCTION_VD})
     public static double prodReductionWithStoreImplement(double[] a, double[] b, double[] c, double total) {
         for (int i = 0; i < a.length; i++) {
             c[i] = a[i] - b[i];
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
index c18aad33fb1..603530f7fb2 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Float.java
@@ -86,6 +86,10 @@ public static void prodReductionInit(float[] a, float[] b) {
     @IR(applyIfCPUFeature = {"sse4.1", "true"},
         applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         counts = {IRNode.MUL_REDUCTION_VF, ">= 1"})
+    // There is no efficient way to implement strict-ordered version on riscv64.
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        applyIf = {"SuperWordReductions", "true"},
+        failOn = {IRNode.MUL_REDUCTION_VF})
     public static float prodReductionImplement(float[] a, float[] b, float total) {
         for (int i = 0; i < a.length; i++) {
             total *= a[i] - b[i];
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
index ebc8251e025..9ca670117cf 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
@@ -85,8 +85,7 @@ public static void prodReductionInit(int[] a, int[] b) {
     @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"},
+    @IR(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) {
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.java b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
index b9a3028978f..4b4026c452a 100644
--- a/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestRangeCheckHoistingScaledIV.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. 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
@@ -27,7 +28,7 @@
  * @summary Test range check hoisting for some scaled iv at array index
  * @library /test/lib /
  * @requires vm.flagless
- * @requires vm.debug & vm.compiler2.enabled & (os.simpleArch == "x64" | os.arch == "aarch64")
+ * @requires vm.debug & vm.compiler2.enabled & (os.simpleArch == "x64" | os.arch == "aarch64" | os.arch == "riscv64")
  * @modules jdk.incubator.vector
  * @run main/othervm compiler.rangechecks.TestRangeCheckHoistingScaledIV
  */
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
index ec1e3f998ca..bcf5196d694 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
  * Copyright (c) 2024, 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
@@ -75,12 +76,9 @@ public ArrayShiftOpTest() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
-    @IR(applyIfCPUFeature = {"avx512f", "true"},
-        counts = {IRNode.ROTATE_RIGHT_V, ">0"})
-    @IR(applyIfPlatform = {"riscv64", "true"},
-        applyIfCPUFeature = {"zvbb", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx512f", "true", "zvbb", "true"},
         counts = {IRNode.ROTATE_RIGHT_V, ">0"})
     public int[] intCombinedRotateShift() {
         int[] res = new int[SIZE];
@@ -91,9 +89,9 @@ public int[] intCombinedRotateShift() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
-    @IR(applyIfCPUFeature = {"avx512f", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx512f", "true", "zvbb", "true"},
         counts = {IRNode.ROTATE_RIGHT_V, ">0"})
     // Requires size to not be known at compile time, otherwise the shift
     // can get constant folded with the (iv + const) pattern from the
@@ -107,12 +105,9 @@ public int[] intCombinedRotateShiftWithPopulateIndex() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
-    @IR(applyIfCPUFeature = {"avx512f", "true"},
-        counts = {IRNode.ROTATE_RIGHT_V, ">0"})
-    @IR(applyIfPlatform = {"riscv64", "true"},
-        applyIfCPUFeature = {"zvbb", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx512f", "true", "zvbb", "true"},
         counts = {IRNode.ROTATE_RIGHT_V, ">0"})
     public long[] longCombinedRotateShift() {
         long[] res = new long[SIZE];
@@ -135,9 +130,9 @@ public long[] longExplicitRotateWithPopulateIndex() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
-    @IR(applyIfCPUFeature = {"avx512f", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx512f", "true", "zvbb", "true"},
         counts = {IRNode.ROTATE_RIGHT_V, ">0"})
     @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
index 54f7f9a7261..9f1e5789056 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicIntOpTest.java
@@ -64,7 +64,7 @@ public BasicIntOpTest() {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VI, ">0"})
     public int[] vectorNeg() {
         int[] res = new int[SIZE];
@@ -75,7 +75,7 @@ public int[] vectorNeg() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true", "rvv", "true"},
         counts = {IRNode.ABS_VI, ">0"})
     public int[] vectorAbs() {
         int[] res = new int[SIZE];
@@ -86,7 +86,7 @@ public int[] vectorAbs() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VI, ">0"})
     public int[] vectorAdd() {
         int[] res = new int[SIZE];
@@ -97,7 +97,7 @@ public int[] vectorAdd() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VI, ">0"})
     public int[] vectorSub() {
         int[] res = new int[SIZE];
@@ -108,7 +108,7 @@ public int[] vectorSub() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VI, ">0"})
     public int[] vectorMul() {
         int[] res = new int[SIZE];
@@ -119,7 +119,7 @@ public int[] vectorMul() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VI, ">0", IRNode.ADD_VI, ">0"})
     public int[] vectorMulAdd() {
         int[] res = new int[SIZE];
@@ -130,7 +130,7 @@ public int[] vectorMulAdd() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VI, ">0", IRNode.SUB_VI, ">0"})
     public int[] vectorMulSub() {
         int[] res = new int[SIZE];
@@ -141,7 +141,7 @@ public int[] vectorMulSub() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPCOUNT_VI, ">0"})
     public int[] vectorPopCount() {
         int[] res = new int[SIZE];
@@ -153,7 +153,7 @@ public int[] vectorPopCount() {
 
     // ---------------- Logic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VI, ">0"})
     public int[] vectorNot() {
         int[] res = new int[SIZE];
@@ -164,7 +164,7 @@ public int[] vectorNot() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.AND_VI, ">0"})
     public int[] vectorAnd() {
         int[] res = new int[SIZE];
@@ -175,7 +175,7 @@ public int[] vectorAnd() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VI, ">0"})
     public int[] vectorOr() {
         int[] res = new int[SIZE];
@@ -186,7 +186,7 @@ public int[] vectorOr() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VI, ">0"})
     public int[] vectorXor() {
         int[] res = new int[SIZE];

From 29f10700e7c76d94db00e48b98a9c6dfedffac0d Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 24 Apr 2025 17:17:54 +0000
Subject: [PATCH 122/901] 8355211: nsk/jdi/EventRequest/disable/disable001.java
 should use JDIBase superclass

Reviewed-by: lmesnik, amenkov
---
 .../jdi/EventRequest/disable/disable001.java  | 163 +-----------------
 1 file changed, 9 insertions(+), 154 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
index 92e8b14db91..75e9f40790c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.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
@@ -76,20 +76,7 @@
  * <BR>
  */
 
-public class disable001 {
-
-    //----------------------------------------------------- templete section
-    static final int PASSED = 0;
-    static final int FAILED = 2;
-    static final int PASS_BASE = 95;
-
-    //----------------------------------------------------- templete parameters
-    static final String
-    sHeader1 = "\n==> nsk/jdi/EventRequest/disable/disable001 ",
-    sHeader2 = "--> debugger: ",
-    sHeader3 = "##> debugger: ";
-
-    //----------------------------------------------------- main method
+public class disable001 extends JDIBase {
 
     public static void main (String argv[]) {
 
@@ -110,20 +97,6 @@ public static int run (String argv[], PrintStream out) {
         return exitCode;
     }
 
-    //--------------------------------------------------   log procedures
-
-    private static Log  logHandler;
-
-    private static void log1(String message) {
-        logHandler.display(sHeader1 + message);
-    }
-    private static void log2(String message) {
-        logHandler.display(sHeader2 + message);
-    }
-    private static void log3(String message) {
-        logHandler.complain(sHeader3 + message);
-    }
-
     //  ************************************************    test parameters
 
     private String debuggeeName =
@@ -132,28 +105,7 @@ private static void log3(String message) {
     private String testedClassName =
        "nsk.jdi.EventRequest.disable.disable001aTestClass11";
 
-    Location location = null;               // !!!!!!!!!!!!! see settingBreakpoint
-
     //====================================================== test program
-    //------------------------------------------------------ common section
-
-    static Debugee          debuggee;
-    static ArgumentHandler  argsHandler;
-
-    static int waitTime;
-
-    static VirtualMachine      vm            = null;
-    static EventRequestManager eventRManager = null;
-    static EventQueue          eventQueue    = null;
-    static EventSet            eventSet      = null;
-    static EventIterator       eventIterator = null;
-
-    static ReferenceType       debuggeeClass = null;
-
-    static int  testExitCode = PASSED;
-
-
-    //------------------------------------------------------ methods
 
     private int runThis (String argv[], PrintStream out) {
 
@@ -292,14 +244,12 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-
-        ThreadReference   mainThread = debuggee.threadByNameOrThrow("main");
-
-        BreakpointRequest bpRequest = settingBreakpoint(mainThread,
-                                             debuggeeClass,
-                                            bPointMethod, lineForComm, "zero");
+        BreakpointRequest bpRequest =
+            setupBreakpointForCommunication(debuggeeClass);
+        // setupBreakpointForCommunication() defaults to SUSPEND_EVENT_THREAD. We need
+        // to change this to SUSPEND_ALL.
+        bpRequest.disable();
+        bpRequest.setSuspendPolicy(EventRequest.SUSPEND_ALL);
         bpRequest.enable();
 
     //------------------------------------------------------  testing section
@@ -405,7 +355,7 @@ private void testRun()
 
               case 11:
                      log2(".....setting up BreakpointRequest");
-                     eventRequest1 = eventRManager.createBreakpointRequest(location);
+                     eventRequest1 = eventRManager.createBreakpointRequest(breakpLocation);
                      break;
 
 
@@ -434,99 +384,4 @@ private void testRun()
         return;
     }
 
-   /*
-    * private BreakpointRequest settingBreakpoint(ThreadReference, ReferenceType,
-    *                                             String, String, String)
-    *
-    * It sets up a breakpoint at given line number within a given method in a given class
-    * for a given thread.
-    *
-    * Return value: BreakpointRequest object  in case of success
-    *
-    * JDITestRuntimeException   in case of an Exception thrown within the method
-    */
-
-    private BreakpointRequest settingBreakpoint ( ThreadReference thread,
-                                                  ReferenceType testedClass,
-                                                  String methodName,
-                                                  String bpLine,
-                                                  String property)
-            throws JDITestRuntimeException {
-
-        log2("......setting up a breakpoint:");
-        log2("       thread: " + thread + "; class: " + testedClass +
-                        "; method: " + methodName + "; line: " + bpLine);
-
-        List              alllineLocations = null;
-        Location          lineLocation     = null;
-        BreakpointRequest breakpRequest    = null;
-
-        try {
-            Method  method  = (Method) testedClass.methodsByName(methodName).get(0);
-
-            alllineLocations = method.allLineLocations();
-
-            int n =
-                ( (IntegerValue) testedClass.getValue(testedClass.fieldByName(bpLine) ) ).value();
-            if (n > alllineLocations.size()) {
-                log3("ERROR:  TEST_ERROR_IN_settingBreakpoint(): number is out of bound of method's lines");
-            } else {
-                lineLocation = (Location) alllineLocations.get(n);
-
-// this is only for this test to get Location object
-location = lineLocation;
-
-                try {
-                    breakpRequest = eventRManager.createBreakpointRequest(lineLocation);
-                    breakpRequest.putProperty("number", property);
-                    breakpRequest.addThreadFilter(thread);
-                    breakpRequest.setSuspendPolicy( EventRequest.SUSPEND_ALL);
-                } catch ( Exception e1 ) {
-                    log3("ERROR: inner Exception within settingBreakpoint() : " + e1);
-                    breakpRequest    = null;
-                }
-            }
-        } catch ( Exception e2 ) {
-            log3("ERROR: ATTENTION:  outer Exception within settingBreakpoint() : " + e2);
-            breakpRequest    = null;
-        }
-
-        if (breakpRequest == null) {
-            log2("      A BREAKPOINT HAS NOT BEEN SET UP");
-            throw new JDITestRuntimeException("**FAILURE to set up a breakpoint**");
-        }
-
-        log2("      a breakpoint has been set up");
-        return breakpRequest;
-    }
-
-
-    private void getEventSet()
-                 throws JDITestRuntimeException {
-        try {
-//            log2("       eventSet = eventQueue.remove(waitTime);");
-            eventSet = eventQueue.remove(waitTime);
-            if (eventSet == null) {
-                throw new JDITestRuntimeException("** TIMEOUT while waiting for event **");
-            }
-//            log2("       eventIterator = eventSet.eventIterator;");
-            eventIterator = eventSet.eventIterator();
-        } catch ( Exception e ) {
-            throw new JDITestRuntimeException("** EXCEPTION while waiting for event ** : " + e);
-        }
-    }
-
-
-    private void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-
-        log2("breakpointForCommunication");
-        getEventSet();
-
-        if (eventIterator.nextEvent() instanceof BreakpointEvent)
-            return;
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
 }

From 370e6113de30fd1bc596b5fbf7bd00f97e689f4f Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 24 Apr 2025 17:19:15 +0000
Subject: [PATCH 123/901] 8355221: Get rid of unnecessary override of
 JDIBase.breakpointForCommunication in nsk/jdi tests

Reviewed-by: lmesnik, amenkov
---
 .../addClassExclusionFilter/filter003.java    | 26 +----------------
 .../addClassFilter_rt/filter_rt002.java       | 26 +----------------
 .../addClassFilter_s/filter_s002.java         | 25 +----------------
 .../classPrepareRequests/clsprepreq002.java   | 26 +----------------
 .../methodExitRequests/methexitreq002.java    | 26 +----------------
 .../addClassExclusionFilter/filter002.java    | 28 +------------------
 .../addClassExclusionFilter/filter002.java    | 26 +----------------
 7 files changed, 7 insertions(+), 176 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
index c0bfe91a750..b3c364a8dfe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003.java
@@ -311,7 +311,7 @@ private void testRun()
 
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -327,30 +327,6 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private ClassPrepareRequest setting22ClassPrepareRequest ( String testedClass,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
index 9be0d89a4b9..0ab2c332e22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002.java
@@ -264,7 +264,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -334,30 +334,6 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private ClassPrepareRequest setting21ClassPrepareRequest ( ReferenceType  testedClass,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
index 1cc0dff5c99..20dd7839953 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002.java
@@ -267,7 +267,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -332,29 +332,6 @@ private void testRun()
         log1("    TESTING ENDS");
         return;
     }
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
 
     // ============================== test's additional methods
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
index b2905b6527e..bbf36fbd319 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002.java
@@ -260,7 +260,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -366,28 +366,4 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-            throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
index f975441a9ba..a36534fc483 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/methodExitRequests/methexitreq002.java
@@ -259,7 +259,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -360,28 +360,4 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
index 6e293a98670..8996798d44c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002.java
@@ -263,7 +263,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -331,32 +331,6 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
-
-
     // ============================== test's additional methods
 
     private MethodEntryRequest setting23MethodEntryRequest ( ThreadReference thread,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
index 3fd039e10d1..4b779448b60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitRequest/addClassExclusionFilter/filter002.java
@@ -263,7 +263,7 @@ private void testRun()
         for (int i = 0; ; i++) {
 
             vm.resume();
-            breakpointForCommunication();
+            breakpointForCommunication(debuggeeName);
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -331,30 +331,6 @@ private void testRun()
         return;
     }
 
-    protected void breakpointForCommunication()
-                   throws JDITestRuntimeException {
-        log2("breakpointForCommunication");
-
-        do {
-            getEventSet();
-
-            Event event = eventIterator.nextEvent();
-            if (event instanceof BreakpointEvent)
-                return;
-
-            log2("      received: " + event);
-
-            if (EventFilters.filtered(event, debuggeeName)) {
-                eventSet.resume();
-            }
-            else {
-                break;
-            }
-        } while (true);
-
-        throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
-    }
-
     // ============================== test's additional methods
 
     private MethodExitRequest setting23MethodExitRequest ( ThreadReference thread,

From e01e33d19b94ee85f7cb7cd6baec857a50086c76 Mon Sep 17 00:00:00 2001
From: David Beaumont <david.beaumont@oracle.com>
Date: Thu, 24 Apr 2025 19:18:13 +0000
Subject: [PATCH 124/901] 8354424: java/util/logging/LoggingDeadlock5.java
 fails intermittently in tier6

Reviewed-by: dfuchs, smarks
---
 test/jdk/ProblemList.txt                         |  1 -
 test/jdk/java/util/logging/LoggingDeadlock5.java | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 2906cc8da19..b6307d1ed00 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -737,7 +737,6 @@ com/sun/jdi/InvokeHangTest.java                                 8218463 linux-al
 
 # jdk_util
 java/util/zip/CloseInflaterDeflaterTest.java  8339216 linux-s390x
-java/util/logging/LoggingDeadlock5.java       8354424 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/java/util/logging/LoggingDeadlock5.java b/test/jdk/java/util/logging/LoggingDeadlock5.java
index fc4639812b7..bff53d1924f 100644
--- a/test/jdk/java/util/logging/LoggingDeadlock5.java
+++ b/test/jdk/java/util/logging/LoggingDeadlock5.java
@@ -25,11 +25,14 @@
  * @test
  * @bug     8349206
  * @summary j.u.l.Handler classes create deadlock risk via synchronized publish() method.
+ * @library /test/lib
  * @modules java.base/sun.util.logging
  *          java.logging
  * @run main/othervm LoggingDeadlock5
  */
 
+import jdk.test.lib.Utils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -115,7 +118,13 @@ static void assertNoDeadlock(Handler handler) throws InterruptedException, Unsup
     }
 
     private static class DeadLocker {
-        private final static Duration JOIN_WAIT = Duration.ofMillis(500);
+        // Since this is used to self-test for an expected deadlock, it will
+        // delay the test by at least this duration (so being overly large is
+        // a potential issue). The deadlock is set up so it should occur almost
+        // immediately (if it occurs), but tests are run under very high loads
+        // in higher tiers, so it's necessary to be a bit pessimistic here.
+        private final static Duration JOIN_WAIT =
+                Duration.ofMillis(Utils.adjustTimeout(2000));
 
         private final Semaphore readyToDeadlock = new Semaphore(0);
         private final Semaphore userLockIsHeld = new Semaphore(0);

From 8a39f07d07f8c4e30dc29b14f28e33c9d8e2e65f Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Thu, 24 Apr 2025 23:23:58 +0000
Subject: [PATCH 125/901] 8354431: gc/logging/TestGCId fails on Shenandoah

Reviewed-by: wkemper, phh
---
 src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 6975bd9f350..d8eb8e0a4e1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -299,7 +299,10 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
   //                                      Full GC  --------------------------/
   //
   ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle)) return;
+  if (check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle)) {
+    log_info(gc)("Cancelled");
+    return;
+  }
 
   ShenandoahGCSession session(cause, heap->global_generation());
 

From ed604038ffc4ca64113984324dde71c07f046b52 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <qamai@openjdk.org>
Date: Fri, 25 Apr 2025 02:09:58 +0000
Subject: [PATCH 126/901] 8346836: C2: Verify CastII/CastLL bounds at runtime

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: vlivanov, epeter
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  28 +++++
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp | 104 ++++++++++++++++
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |   5 +
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 113 ++++++++++++++++++
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |   6 +
 src/hotspot/cpu/x86/x86_64.ad                 |  53 ++++++++
 src/hotspot/share/opto/c2_MacroAssembler.hpp  |   4 +-
 src/hotspot/share/opto/c2_globals.hpp         |  10 ++
 src/hotspot/share/opto/castnode.cpp           |  12 ++
 .../c2/TestVerifyConstraintCasts.java         |  38 ++++++
 10 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestVerifyConstraintCasts.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 76e3c92ddc2..3d25e97c0c5 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -8144,6 +8144,7 @@ instruct castPP(iRegPNoSp dst)
 
 instruct castII(iRegI dst)
 %{
+  predicate(VerifyConstraintCasts == 0);
   match(Set dst (CastII dst));
 
   size(0);
@@ -8153,8 +8154,22 @@ instruct castII(iRegI dst)
   ins_pipe(pipe_class_empty);
 %}
 
+instruct castII_checked(iRegI dst, rFlagsReg cr)
+%{
+  predicate(VerifyConstraintCasts > 0);
+  match(Set dst (CastII dst));
+  effect(KILL cr);
+
+  format %{ "# castII_checked of $dst" %}
+  ins_encode %{
+    __ verify_int_in_range(_idx, bottom_type()->is_int(), $dst$$Register, rscratch1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct castLL(iRegL dst)
 %{
+  predicate(VerifyConstraintCasts == 0);
   match(Set dst (CastLL dst));
 
   size(0);
@@ -8164,6 +8179,19 @@ instruct castLL(iRegL dst)
   ins_pipe(pipe_class_empty);
 %}
 
+instruct castLL_checked(iRegL dst, rFlagsReg cr)
+%{
+  predicate(VerifyConstraintCasts > 0);
+  match(Set dst (CastLL dst));
+  effect(KILL cr);
+
+  format %{ "# castLL_checked of $dst" %}
+  ins_encode %{
+    __ verify_long_in_range(_idx, bottom_type()->is_long(), $dst$$Register, rscratch1);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct castFF(vRegF dst)
 %{
   match(Set dst (CastFF dst));
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 56a91310dcd..585812a99ee 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -2743,3 +2743,107 @@ bool C2_MacroAssembler::in_scratch_emit_size() {
   }
   return MacroAssembler::in_scratch_emit_size();
 }
+
+static void abort_verify_int_in_range(uint idx, jint val, jint lo, jint hi) {
+  fatal("Invalid CastII, idx: %u, val: %d, lo: %d, hi: %d", idx, val, lo, hi);
+}
+
+void C2_MacroAssembler::verify_int_in_range(uint idx, const TypeInt* t, Register rval, Register rtmp) {
+  assert(!t->empty() && !t->singleton(), "%s", Type::str(t));
+  if (t == TypeInt::INT) {
+    return;
+  }
+  BLOCK_COMMENT("verify_int_in_range {");
+  Label L_success, L_failure;
+
+  jint lo = t->_lo;
+  jint hi = t->_hi;
+
+  if (lo != min_jint && hi != max_jint) {
+    subsw(rtmp, rval, lo);
+    br(Assembler::LT, L_failure);
+    subsw(rtmp, rval, hi);
+    br(Assembler::LE, L_success);
+  } else if (lo != min_jint) {
+    subsw(rtmp, rval, lo);
+    br(Assembler::GE, L_success);
+  } else if (hi != max_jint) {
+    subsw(rtmp, rval, hi);
+    br(Assembler::LE, L_success);
+  } else {
+    ShouldNotReachHere();
+  }
+
+  bind(L_failure);
+  movw(c_rarg0, idx);
+  mov(c_rarg1, rval);
+  movw(c_rarg2, lo);
+  movw(c_rarg3, hi);
+  reconstruct_frame_pointer(rtmp);
+  rt_call(CAST_FROM_FN_PTR(address, abort_verify_int_in_range), rtmp);
+  hlt(0);
+
+  bind(L_success);
+  BLOCK_COMMENT("} verify_int_in_range");
+}
+
+static void abort_verify_long_in_range(uint idx, jlong val, jlong lo, jlong hi) {
+  fatal("Invalid CastLL, idx: %u, val: " JLONG_FORMAT ", lo: " JLONG_FORMAT ", hi: " JLONG_FORMAT, idx, val, lo, hi);
+}
+
+void C2_MacroAssembler::verify_long_in_range(uint idx, const TypeLong* t, Register rval, Register rtmp) {
+  assert(!t->empty() && !t->singleton(), "%s", Type::str(t));
+  if (t == TypeLong::LONG) {
+    return;
+  }
+  BLOCK_COMMENT("verify_long_in_range {");
+  Label L_success, L_failure;
+
+  jlong lo = t->_lo;
+  jlong hi = t->_hi;
+
+  if (lo != min_jlong && hi != max_jlong) {
+    subs(rtmp, rval, lo);
+    br(Assembler::LT, L_failure);
+    subs(rtmp, rval, hi);
+    br(Assembler::LE, L_success);
+  } else if (lo != min_jlong) {
+    subs(rtmp, rval, lo);
+    br(Assembler::GE, L_success);
+  } else if (hi != max_jlong) {
+    subs(rtmp, rval, hi);
+    br(Assembler::LE, L_success);
+  } else {
+    ShouldNotReachHere();
+  }
+
+  bind(L_failure);
+  movw(c_rarg0, idx);
+  mov(c_rarg1, rval);
+  mov(c_rarg2, lo);
+  mov(c_rarg3, hi);
+  reconstruct_frame_pointer(rtmp);
+  rt_call(CAST_FROM_FN_PTR(address, abort_verify_long_in_range), rtmp);
+  hlt(0);
+
+  bind(L_success);
+  BLOCK_COMMENT("} verify_long_in_range");
+}
+
+void C2_MacroAssembler::reconstruct_frame_pointer(Register rtmp) {
+  const int framesize = Compile::current()->output()->frame_size_in_bytes();
+  if (PreserveFramePointer) {
+    // frame pointer is valid
+#ifdef ASSERT
+    // Verify frame pointer value in rfp.
+    add(rtmp, sp, framesize - 2 * wordSize);
+    Label L_success;
+    cmp(rfp, rtmp);
+    br(Assembler::EQ, L_success);
+    stop("frame pointer mismatch");
+    bind(L_success);
+#endif // ASSERT
+  } else {
+    add(rfp, sp, framesize - 2 * wordSize);
+  }
+}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index e0eaa0b76e6..70e4265c7cc 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -188,4 +188,9 @@
   void vector_signum_sve(FloatRegister dst, FloatRegister src, FloatRegister zero,
                          FloatRegister one, FloatRegister vtmp, PRegister pgtmp, SIMD_RegVariant T);
 
+  void verify_int_in_range(uint idx, const TypeInt* t, Register val, Register tmp);
+  void verify_long_in_range(uint idx, const TypeLong* t, Register val, Register tmp);
+
+  void reconstruct_frame_pointer(Register rtmp);
+
 #endif // CPU_AARCH64_C2_MACROASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 574bc081fce..19e25cde2ec 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -787,6 +787,119 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
   // C2 uses the value of ZF to determine the continuation.
 }
 
+static void abort_verify_int_in_range(uint idx, jint val, jint lo, jint hi) {
+  fatal("Invalid CastII, idx: %u, val: %d, lo: %d, hi: %d", idx, val, lo, hi);
+}
+
+static void reconstruct_frame_pointer_helper(MacroAssembler* masm, Register dst) {
+  const int framesize = Compile::current()->output()->frame_size_in_bytes();
+  masm->movptr(dst, rsp);
+  if (framesize > 2 * wordSize) {
+    masm->addptr(dst, framesize - 2 * wordSize);
+  }
+}
+
+void C2_MacroAssembler::reconstruct_frame_pointer(Register rtmp) {
+  if (PreserveFramePointer) {
+    // frame pointer is valid
+#ifdef ASSERT
+    // Verify frame pointer value in rbp.
+    reconstruct_frame_pointer_helper(this, rtmp);
+    Label L_success;
+    cmpq(rbp, rtmp);
+    jccb(Assembler::equal, L_success);
+    STOP("frame pointer mismatch");
+    bind(L_success);
+#endif // ASSERT
+  } else {
+    reconstruct_frame_pointer_helper(this, rbp);
+  }
+}
+
+void C2_MacroAssembler::verify_int_in_range(uint idx, const TypeInt* t, Register val) {
+  jint lo = t->_lo;
+  jint hi = t->_hi;
+  assert(lo < hi, "type should not be empty or constant, idx: %u, lo: %d, hi: %d", idx, lo, hi);
+  if (t == TypeInt::INT) {
+    return;
+  }
+
+  BLOCK_COMMENT("CastII {");
+  Label fail;
+  Label succeed;
+  if (hi == max_jint) {
+    cmpl(val, lo);
+    jccb(Assembler::greaterEqual, succeed);
+  } else {
+    if (lo != min_jint) {
+      cmpl(val, lo);
+      jccb(Assembler::less, fail);
+    }
+    cmpl(val, hi);
+    jccb(Assembler::lessEqual, succeed);
+  }
+
+  bind(fail);
+  movl(c_rarg0, idx);
+  movl(c_rarg1, val);
+  movl(c_rarg2, lo);
+  movl(c_rarg3, hi);
+  reconstruct_frame_pointer(rscratch1);
+  call(RuntimeAddress(CAST_FROM_FN_PTR(address, abort_verify_int_in_range)));
+  hlt();
+  bind(succeed);
+  BLOCK_COMMENT("} // CastII");
+}
+
+static void abort_verify_long_in_range(uint idx, jlong val, jlong lo, jlong hi) {
+  fatal("Invalid CastLL, idx: %u, val: " JLONG_FORMAT ", lo: " JLONG_FORMAT ", hi: " JLONG_FORMAT, idx, val, lo, hi);
+}
+
+void C2_MacroAssembler::verify_long_in_range(uint idx, const TypeLong* t, Register val, Register tmp) {
+  jlong lo = t->_lo;
+  jlong hi = t->_hi;
+  assert(lo < hi, "type should not be empty or constant, idx: %u, lo: " JLONG_FORMAT ", hi: " JLONG_FORMAT, idx, lo, hi);
+  if (t == TypeLong::LONG) {
+    return;
+  }
+
+  BLOCK_COMMENT("CastLL {");
+  Label fail;
+  Label succeed;
+
+  auto cmp_val = [&](jlong bound) {
+    if (is_simm32(bound)) {
+      cmpq(val, checked_cast<int>(bound));
+    } else {
+      mov64(tmp, bound);
+      cmpq(val, tmp);
+    }
+  };
+
+  if (hi == max_jlong) {
+    cmp_val(lo);
+    jccb(Assembler::greaterEqual, succeed);
+  } else {
+    if (lo != min_jlong) {
+      cmp_val(lo);
+      jccb(Assembler::less, fail);
+    }
+    cmp_val(hi);
+    jccb(Assembler::lessEqual, succeed);
+  }
+
+  bind(fail);
+  movl(c_rarg0, idx);
+  movq(c_rarg1, val);
+  mov64(c_rarg2, lo);
+  mov64(c_rarg3, hi);
+  reconstruct_frame_pointer(rscratch1);
+  call(RuntimeAddress(CAST_FROM_FN_PTR(address, abort_verify_long_in_range)));
+  hlt();
+  bind(succeed);
+  BLOCK_COMMENT("} // CastLL");
+}
+
 //-------------------------------------------------------------------------------------------
 // Generic instructions support for use in .ad files C2 code generation
 
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index dd2880d88c3..713eb73d68f 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -44,6 +44,9 @@
                              Register t, Register thread);
   void fast_unlock_lightweight(Register obj, Register reg_rax, Register t, Register thread);
 
+  void verify_int_in_range(uint idx, const TypeInt* t, Register val);
+  void verify_long_in_range(uint idx, const TypeLong* t, Register val, Register tmp);
+
   // Generic instructions support for use in .ad files C2 code generation
   void vabsnegd(int opcode, XMMRegister dst, XMMRegister src);
   void vabsnegd(int opcode, XMMRegister dst, XMMRegister src, int vector_len);
@@ -574,4 +577,7 @@
 
   void scalar_max_min_fp16(int opcode, XMMRegister dst, XMMRegister src1, XMMRegister src2,
                           KRegister ktmp, XMMRegister xtmp1, XMMRegister xtmp2);
+
+  void reconstruct_frame_pointer(Register rtmp);
+
 #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 078150c61fb..dc79108c6f8 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -422,6 +422,18 @@ source_hpp %{
 
 #include "peephole_x86_64.hpp"
 
+bool castLL_is_imm32(const Node* n);
+
+%}
+
+source %{
+
+bool castLL_is_imm32(const Node* n) {
+  assert(n->is_CastLL(), "must be a CastLL");
+  const TypeLong* t = n->bottom_type()->is_long();
+  return (t->_lo == min_jlong || Assembler::is_simm32(t->_lo)) && (t->_hi == max_jlong || Assembler::is_simm32(t->_hi));
+}
+
 %}
 
 // Register masks
@@ -7605,6 +7617,7 @@ instruct castPP(rRegP dst)
 
 instruct castII(rRegI dst)
 %{
+  predicate(VerifyConstraintCasts == 0);
   match(Set dst (CastII dst));
 
   size(0);
@@ -7614,8 +7627,22 @@ instruct castII(rRegI dst)
   ins_pipe(empty);
 %}
 
+instruct castII_checked(rRegI dst, rFlagsReg cr)
+%{
+  predicate(VerifyConstraintCasts > 0);
+  match(Set dst (CastII dst));
+
+  effect(KILL cr);
+  format %{ "# cast_checked_II $dst" %}
+  ins_encode %{
+    __ verify_int_in_range(_idx, bottom_type()->is_int(), $dst$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct castLL(rRegL dst)
 %{
+  predicate(VerifyConstraintCasts == 0);
   match(Set dst (CastLL dst));
 
   size(0);
@@ -7625,6 +7652,32 @@ instruct castLL(rRegL dst)
   ins_pipe(empty);
 %}
 
+instruct castLL_checked_L32(rRegL dst, rFlagsReg cr)
+%{
+  predicate(VerifyConstraintCasts > 0 && castLL_is_imm32(n));
+  match(Set dst (CastLL dst));
+
+  effect(KILL cr);
+  format %{ "# cast_checked_LL $dst" %}
+  ins_encode %{
+    __ verify_long_in_range(_idx, bottom_type()->is_long(), $dst$$Register, noreg);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct castLL_checked(rRegL dst, rRegL tmp, rFlagsReg cr)
+%{
+  predicate(VerifyConstraintCasts > 0 && !castLL_is_imm32(n));
+  match(Set dst (CastLL dst));
+
+  effect(KILL cr, TEMP tmp);
+  format %{ "# cast_checked_LL $dst\tusing $tmp as TEMP" %}
+  ins_encode %{
+    __ verify_long_in_range(_idx, bottom_type()->is_long(), $dst$$Register, $tmp$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct castFF(regF dst)
 %{
   match(Set dst (CastFF dst));
diff --git a/src/hotspot/share/opto/c2_MacroAssembler.hpp b/src/hotspot/share/opto/c2_MacroAssembler.hpp
index 41347313a8c..1fb7714153d 100644
--- a/src/hotspot/share/opto/c2_MacroAssembler.hpp
+++ b/src/hotspot/share/opto/c2_MacroAssembler.hpp
@@ -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
@@ -31,6 +31,8 @@
 #include "utilities/macros.hpp"
 
 class C2EntryBarrierStub;
+class TypeInt;
+class TypeLong;
 
 class C2_MacroAssembler: public MacroAssembler {
  public:
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 41b08161097..662f2e07965 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -669,6 +669,16 @@
   develop(bool, VerifyAliases, false,                                       \
           "perform extra checks on the results of alias analysis")          \
                                                                             \
+  product(uint, VerifyConstraintCasts, 0, DIAGNOSTIC,                       \
+          "Perform runtime checks to verify the value of a "                \
+          "ConstraintCast lies inside its type"                             \
+          "0 = does not perform any verification, "                         \
+          "1 = perform verification on ConstraintCastNodes that are "       \
+              "present during code emission, "                              \
+          "2 = Do not do widening of ConstraintCastNodes so that we can "   \
+              "have more verification coverage")                            \
+          range(0, 2)                                                       \
+                                                                            \
   product(intx, MaxInlineLevel, 15,                                         \
           "maximum number of nested calls that are inlined by high tier "   \
           "compiler")                                                       \
diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index 198634af71b..6b3058d94f6 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -531,6 +531,18 @@ const Type* ConstraintCastNode::widen_type(const PhaseGVN* phase, const Type* re
   if (!phase->C->post_loop_opts_phase()) {
     return res;
   }
+
+  // At VerifyConstraintCasts == 1, we verify the ConstraintCastNodes that are present during code
+  // emission. This allows us detecting possible mis-scheduling due to these nodes being pinned at
+  // the wrong control nodes.
+  // At VerifyConstraintCasts == 2, we do not perform widening so that we can verify the
+  // correctness of more ConstraintCastNodes. This further helps us detect possible
+  // mis-transformations that may happen due to these nodes being pinned at the wrong control
+  // nodes.
+  if (VerifyConstraintCasts > 1) {
+    return res;
+  }
+
   const TypeInteger* this_type = res->is_integer(bt);
   const TypeInteger* in_type = phase->type(in(1))->isa_integer(bt);
   if (in_type != nullptr &&
diff --git a/test/hotspot/jtreg/compiler/c2/TestVerifyConstraintCasts.java b/test/hotspot/jtreg/compiler/c2/TestVerifyConstraintCasts.java
new file mode 100644
index 00000000000..5c8a367c97c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestVerifyConstraintCasts.java
@@ -0,0 +1,38 @@
+/*
+ * 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 8346836
+ * @requires vm.debug == true & vm.flavor == "server"
+ * @summary Empty main program to run with flag VerifyConstraintCasts.
+ *
+ * @run main/othervm/timeout=300 -Xbatch -Xcomp -XX:+StressGCM -XX:VerifyConstraintCasts=1 compiler.c2.TestVerifyConstraintCasts
+ * @run main/othervm/timeout=300 -Xbatch -Xcomp -XX:+StressGCM -XX:VerifyConstraintCasts=2 compiler.c2.TestVerifyConstraintCasts
+ */
+package compiler.c2;
+
+public class TestVerifyConstraintCasts {
+    public static void main(String[] args) {
+    }
+}

From f27fc010f699c01bd3c633b2926966578b5da270 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 25 Apr 2025 07:09:10 +0000
Subject: [PATCH 127/901] 8355576: Problem list
 compiler/c2/TestVerifyConstraintCasts.java until JDK-8355574 is fixed

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

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index d76f4b2d95b..d4276946360 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -76,6 +76,8 @@ compiler/interpreter/Test6833129.java 8335266 generic-i586
 compiler/ciReplay/TestInliningProtectionDomain.java 8349191 generic-all
 compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
 
+compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all
+
 #############################################################################
 
 # :hotspot_gc

From 70030bac04b99454af7577553e4a6bbaf5d39210 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 25 Apr 2025 07:09:37 +0000
Subject: [PATCH 128/901] 8354803: ALL_64_BITS is the same across platforms

Reviewed-by: stefank, lucy
---
 src/hotspot/os/aix/os_aix.cpp                     |  8 +++-----
 src/hotspot/os/bsd/os_bsd.cpp                     |  9 +++------
 src/hotspot/os/linux/os_linux.cpp                 |  7 ++-----
 src/hotspot/os/posix/os_posix.cpp                 |  5 +----
 src/hotspot/os/windows/os_windows.cpp             | 13 +++++--------
 src/hotspot/share/utilities/globalDefinitions.hpp |  3 +++
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 49dcebd0083..1bbaf29125d 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -132,8 +132,6 @@ extern "C" int getargs(procsinfo*, int, char*, int);
 
 #define MAX_PATH (2 * K)
 
-// for timer info max values which include all bits
-#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
 // for multipage initialization error analysis (in 'g_multipage_error')
 #define ERROR_MP_OS_TOO_OLD                          100
 #define ERROR_MP_EXTSHM_ACTIVE                       101
@@ -906,7 +904,7 @@ jlong os::javaTimeNanos() {
 }
 
 void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;
+  info_ptr->max_value = all_bits_jlong;
   // mread_real_time() is monotonic (see 'os::javaTimeNanos()')
   info_ptr->may_skip_backward = false;
   info_ptr->may_skip_forward = false;
@@ -2571,14 +2569,14 @@ jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
 }
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
 }
 
 void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 193c7cb0689..9a9954b3eb9 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -114,9 +114,6 @@
 
 #define MAX_PATH    (2 * K)
 
-// for timer info max values which include all bits
-#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
-
 ////////////////////////////////////////////////////////////////////////////////
 // global variables
 julong os::Bsd::_physical_memory = 0;
@@ -815,7 +812,7 @@ jlong os::javaTimeNanos() {
 }
 
 void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;
+  info_ptr->max_value = all_bits_jlong;
   info_ptr->may_skip_backward = false;      // not subject to resetting or drifting
   info_ptr->may_skip_forward = false;       // not subject to resetting or drifting
   info_ptr->kind = JVMTI_TIMER_ELAPSED;     // elapsed not CPU time
@@ -2423,14 +2420,14 @@ jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
 
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
 }
 
 void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 1afece719cb..029d523edc6 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -139,9 +139,6 @@
 
 #define MAX_PATH    (2 * K)
 
-// for timer info max values which include all bits
-#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
-
 #ifdef MUSL_LIBC
 // dlvsym is not a part of POSIX
 // and musl libc doesn't implement it.
@@ -5142,14 +5139,14 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
 }
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
 }
 
 void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
+  info_ptr->max_value = all_bits_jlong;    // will not wrap in less than 64 bits
   info_ptr->may_skip_backward = false;     // elapsed time not wall time
   info_ptr->may_skip_forward = false;      // elapsed time not wall time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;  // user+system time is returned
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index df084ae6898..b399ce4bcbf 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -1473,12 +1473,9 @@ jlong os::javaTimeNanos() {
   return result;
 }
 
-// for timer info max values which include all bits
-#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
-
 void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
   // CLOCK_MONOTONIC - amount of time since some arbitrary point in the past
-  info_ptr->max_value = ALL_64_BITS;
+  info_ptr->max_value = all_bits_jlong;
   info_ptr->may_skip_backward = false;      // not subject to resetting or drifting
   info_ptr->may_skip_forward = false;       // not subject to resetting or drifting
   info_ptr->kind = JVMTI_TIMER_ELAPSED;     // elapsed not CPU time
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 959a0616834..55ad3bf840d 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -112,9 +112,6 @@
 #include <winsock2.h>
 #include <versionhelpers.h>
 
-// for timer info max values which include all bits
-#define ALL_64_BITS CONST64(-1)
-
 // For DLL loading/load error detection
 // Values of PE COFF
 #define IMAGE_FILE_PTR_TO_SIGNATURE 0x3c
@@ -1225,16 +1222,16 @@ void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
   if (freq < NANOSECS_PER_SEC) {
     // the performance counter is 64 bits and we will
     // be multiplying it -- so no wrap in 64 bits
-    info_ptr->max_value = ALL_64_BITS;
+    info_ptr->max_value = all_bits_jlong;
   } else if (freq > NANOSECS_PER_SEC) {
     // use the max value the counter can reach to
     // determine the max value which could be returned
-    julong max_counter = (julong)ALL_64_BITS;
+    julong max_counter = (julong)all_bits_jlong;
     info_ptr->max_value = (jlong)(max_counter / (freq / NANOSECS_PER_SEC));
   } else {
     // the performance counter is 64 bits and we will
     // be using it directly -- so no wrap in 64 bits
-    info_ptr->max_value = ALL_64_BITS;
+    info_ptr->max_value = all_bits_jlong;
   }
 
   // using a counter, so no skipping
@@ -4813,14 +4810,14 @@ jlong os::thread_cpu_time(Thread* thread, bool user_sys_cpu_time) {
 }
 
 void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;        // the max value -- all 64 bits
+  info_ptr->max_value = all_bits_jlong;     // the max value -- all 64 bits
   info_ptr->may_skip_backward = false;      // GetThreadTimes returns absolute time
   info_ptr->may_skip_forward = false;       // GetThreadTimes returns absolute time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;   // user+system time is returned
 }
 
 void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
-  info_ptr->max_value = ALL_64_BITS;        // the max value -- all 64 bits
+  info_ptr->max_value = all_bits_jlong;     // the max value -- all 64 bits
   info_ptr->may_skip_backward = false;      // GetThreadTimes returns absolute time
   info_ptr->may_skip_forward = false;       // GetThreadTimes returns absolute time
   info_ptr->kind = JVMTI_TIMER_TOTAL_CPU;   // user+system time is returned
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 085939b0131..cc5f3ebb291 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -269,6 +269,9 @@ inline jdouble jdouble_cast(jlong x);
 const jlong min_jlong = CONST64(0x8000000000000000);
 const jlong max_jlong = CONST64(0x7fffffffffffffff);
 
+// for timer info max values which include all bits, 0xffffffffffffffff
+const jlong all_bits_jlong = ~jlong(0);
+
 //-------------------------------------------
 // Constant for jdouble
 const jlong min_jlongDouble = CONST64(0x0000000000000001);

From dbd2fb0e5a06df2760a6c4ac128a9172b13647d9 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 25 Apr 2025 07:11:24 +0000
Subject: [PATCH 129/901] 8355473: Clean up x86 globals/VM_Version after 32-bit
 x86 removal

Reviewed-by: chagedorn, coleenp, jwaters
---
 src/hotspot/cpu/x86/globalDefinitions_x86.hpp |   6 -
 src/hotspot/cpu/x86/globals_x86.hpp           |  12 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp        | 156 ++----------------
 src/hotspot/cpu/x86/vm_version_x86.hpp        |  10 +-
 4 files changed, 17 insertions(+), 167 deletions(-)

diff --git a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
index 873cfbdcea0..3c1474ae861 100644
--- a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
+++ b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp
@@ -34,9 +34,7 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define SUPPORTS_NATIVE_CX8
 
-#ifdef _LP64
 #define SUPPORT_MONITOR_COUNT
-#endif
 
 #define CPU_MULTI_COPY_ATOMIC
 
@@ -44,15 +42,11 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 #define DEFAULT_CACHE_LINE_SIZE 64
 
 // The default padding size for data structures to avoid false sharing.
-#ifdef _LP64
 // The common wisdom is that adjacent cache line prefetchers on some hardware
 // may pull two cache lines on access, so we have to pessimistically assume twice
 // the cache line size for padding. TODO: Check if this is still true for modern
 // hardware. If not, DEFAULT_CACHE_LINE_SIZE might as well suffice.
 #define DEFAULT_PADDING_SIZE (DEFAULT_CACHE_LINE_SIZE*2)
-#else
-#define DEFAULT_PADDING_SIZE DEFAULT_CACHE_LINE_SIZE
-#endif
 
 #if defined(LINUX) || defined(__APPLE__)
 #define SUPPORT_RESERVED_STACK_AREA
diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
index 5b5f5683961..a1d4a71874f 100644
--- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -61,29 +61,19 @@ define_pd_global(intx, InlineSmallCode,          1000);
 #define MIN_STACK_RED_PAGES DEFAULT_STACK_RED_PAGES
 #define MIN_STACK_RESERVED_PAGES (0)
 
-#ifdef _LP64
 // Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
-// stack if compiled for unix and LP64. To pass stack overflow tests we need
-// 20 shadow pages.
+// stack if compiled for unix. To pass stack overflow tests we need 20 shadow pages.
 #define DEFAULT_STACK_SHADOW_PAGES (NOT_WIN64(20) WIN64_ONLY(8) DEBUG_ONLY(+4))
 // For those clients that do not use write socket, we allow
 // the min range value to be below that of the default
 #define MIN_STACK_SHADOW_PAGES (NOT_WIN64(10) WIN64_ONLY(8) DEBUG_ONLY(+4))
-#else
-#define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
-#define MIN_STACK_SHADOW_PAGES DEFAULT_STACK_SHADOW_PAGES
-#endif // _LP64
 
 define_pd_global(intx, StackYellowPages, DEFAULT_STACK_YELLOW_PAGES);
 define_pd_global(intx, StackRedPages, DEFAULT_STACK_RED_PAGES);
 define_pd_global(intx, StackShadowPages, DEFAULT_STACK_SHADOW_PAGES);
 define_pd_global(intx, StackReservedPages, DEFAULT_STACK_RESERVED_PAGES);
 
-#ifdef _LP64
 define_pd_global(bool, VMContinuations, true);
-#else
-define_pd_global(bool, VMContinuations, false);
-#endif
 
 define_pd_global(bool, RewriteBytecodes,     true);
 define_pd_global(bool, RewriteFrequentPairs, true);
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 19ae2dc8d2b..4687edb13a3 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -72,8 +72,6 @@ static get_cpu_info_stub_t get_cpu_info_stub = nullptr;
 static detect_virt_stub_t detect_virt_stub = nullptr;
 static clear_apx_test_state_t clear_apx_test_state_stub = nullptr;
 
-#ifdef _LP64
-
 bool VM_Version::supports_clflush() {
   // clflush should always be available on x86_64
   // if not we are in real trouble because we rely on it
@@ -87,7 +85,6 @@ bool VM_Version::supports_clflush() {
   assert ((!Universe::is_fully_initialized() || (_features & CPU_FLUSH) != 0), "clflush should be available");
   return true;
 }
-#endif
 
 #define CPUID_STANDARD_FN   0x0
 #define CPUID_STANDARD_FN_1 0x1
@@ -107,7 +104,6 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
 
   VM_Version_StubGenerator(CodeBuffer *c) : StubCodeGenerator(c) {}
 
-#if defined(_LP64)
   address clear_apx_test_state() {
 #   define __ _masm->
     address start = __ pc();
@@ -126,7 +122,6 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ ret(0);
     return start;
   }
-#endif
 
   address generate_get_cpu_info() {
     // Flags to test CPU type.
@@ -151,14 +146,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     //
     // void get_cpu_info(VM_Version::CpuidInfo* cpuid_info);
     //
-    // LP64: rcx and rdx are first and second argument registers on windows
+    // rcx and rdx are first and second argument registers on windows
 
     __ push(rbp);
-#ifdef _LP64
     __ mov(rbp, c_rarg0); // cpuid_info address
-#else
-    __ movptr(rbp, Address(rsp, 8)); // cpuid_info address
-#endif
     __ push(rbx);
     __ push(rsi);
     __ pushf();          // preserve rbx, and flags
@@ -418,7 +409,6 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ movl(Address(rsi, 8), rcx);
     __ movl(Address(rsi,12), rdx);
 
-#if defined(_LP64)
     //
     // Check if OS has enabled XGETBV instruction to access XCR0
     // (OSXSAVE feature flag) and CPU supports APX
@@ -453,7 +443,6 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ movq(Address(rsi, 8), r31);
 
     UseAPX = save_apx;
-#endif
 #endif
     __ bind(vector_save_restore);
     //
@@ -527,10 +516,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
       __ movdl(xmm0, rcx);
       __ vpbroadcastd(xmm0, xmm0, Assembler::AVX_512bit);
       __ evmovdqul(xmm7, xmm0, Assembler::AVX_512bit);
-#ifdef _LP64
       __ evmovdqul(xmm8, xmm0, Assembler::AVX_512bit);
       __ evmovdqul(xmm31, xmm0, Assembler::AVX_512bit);
-#endif
       VM_Version::clean_cpuFeatures();
       __ jmp(save_restore_except);
     }
@@ -556,10 +543,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ pshufd(xmm0, xmm0, 0x00);
     __ vinsertf128_high(xmm0, xmm0);
     __ vmovdqu(xmm7, xmm0);
-#ifdef _LP64
     __ vmovdqu(xmm8, xmm0);
     __ vmovdqu(xmm15, xmm0);
-#endif
     VM_Version::clean_cpuFeatures();
 
     __ bind(save_restore_except);
@@ -600,10 +585,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
       __ lea(rsi, Address(rbp, in_bytes(VM_Version::zmm_save_offset())));
       __ evmovdqul(Address(rsi, 0), xmm0, Assembler::AVX_512bit);
       __ evmovdqul(Address(rsi, 64), xmm7, Assembler::AVX_512bit);
-#ifdef _LP64
       __ evmovdqul(Address(rsi, 128), xmm8, Assembler::AVX_512bit);
       __ evmovdqul(Address(rsi, 192), xmm31, Assembler::AVX_512bit);
-#endif
 
 #ifdef _WINDOWS
       __ evmovdqul(xmm31, Address(rsp, 0), Assembler::AVX_512bit);
@@ -628,10 +611,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ lea(rsi, Address(rbp, in_bytes(VM_Version::ymm_save_offset())));
     __ vmovdqu(Address(rsi, 0), xmm0);
     __ vmovdqu(Address(rsi, 32), xmm7);
-#ifdef _LP64
     __ vmovdqu(Address(rsi, 64), xmm8);
     __ vmovdqu(Address(rsi, 96), xmm15);
-#endif
 
 #ifdef _WINDOWS
     __ vmovdqu(xmm15, Address(rsp, 0));
@@ -687,13 +668,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ push(rbx);
     __ push(rsi); // for Windows
 
-#ifdef _LP64
     __ mov(rax, c_rarg0); // CPUID leaf
     __ mov(rsi, c_rarg1); // register array address (eax, ebx, ecx, edx)
-#else
-    __ movptr(rax, Address(rsp, 16)); // CPUID leaf
-    __ movptr(rsi, Address(rsp, 20)); // register array address
-#endif
 
     __ cpuid();
 
@@ -734,14 +710,10 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     //
     // void getCPUIDBrandString(VM_Version::CpuidInfo* cpuid_info);
     //
-    // LP64: rcx and rdx are first and second argument registers on windows
+    // rcx and rdx are first and second argument registers on windows
 
     __ push(rbp);
-#ifdef _LP64
     __ mov(rbp, c_rarg0); // cpuid_info address
-#else
-    __ movptr(rbp, Address(rsp, 8)); // cpuid_info address
-#endif
     __ push(rbx);
     __ push(rsi);
     __ pushf();          // preserve rbx, and flags
@@ -889,19 +861,16 @@ void VM_Version::get_processor_features() {
   // xchg and xadd instructions
   _supports_atomic_getset4 = true;
   _supports_atomic_getadd4 = true;
-  LP64_ONLY(_supports_atomic_getset8 = true);
-  LP64_ONLY(_supports_atomic_getadd8 = true);
+  _supports_atomic_getset8 = true;
+  _supports_atomic_getadd8 = true;
 
-#ifdef _LP64
   // OS should support SSE for x64 and hardware should support at least SSE2.
   if (!VM_Version::supports_sse2()) {
     vm_exit_during_initialization("Unknown x64 processor: SSE2 not supported");
   }
   // in 64 bit the use of SSE2 is the minimum
   if (UseSSE < 2) UseSSE = 2;
-#endif
 
-#ifdef AMD64
   // flush_icache_stub have to be generated first.
   // That is why Icache line size is hard coded in ICache class,
   // see icache_x86.hpp. It is also the reason why we can't use
@@ -913,9 +882,7 @@ void VM_Version::get_processor_features() {
   guarantee(_cpuid_info.std_cpuid1_edx.bits.clflush != 0, "clflush is not supported");
   // clflush_size is size in quadwords (8 bytes).
   guarantee(_cpuid_info.std_cpuid1_ebx.bits.clflush_size == 8, "such clflush size is not supported");
-#endif
 
-#ifdef _LP64
   // assigning this field effectively enables Unsafe.writebackMemory()
   // by initing UnsafeConstant.DATA_CACHE_LINE_FLUSH_SIZE to non-zero
   // that is only implemented on x86_64 and only if the OS plays ball
@@ -924,7 +891,6 @@ void VM_Version::get_processor_features() {
     // let if default to zero thereby disabling writeback
     _data_cache_line_flush_size = _cpuid_info.std_cpuid1_ebx.bits.clflush_size * 8;
   }
-#endif
 
   // Check if processor has Intel Ecore
   if (FLAG_IS_DEFAULT(EnableX86ECoreOpts) && is_intel() && cpu_family() == 6 &&
@@ -1206,7 +1172,6 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
   }
 
-#ifdef _LP64
   if (supports_avx2()) {
     if (FLAG_IS_DEFAULT(UseAdler32Intrinsics)) {
       UseAdler32Intrinsics = true;
@@ -1217,12 +1182,6 @@ void VM_Version::get_processor_features() {
     }
     FLAG_SET_DEFAULT(UseAdler32Intrinsics, false);
   }
-#else
-  if (UseAdler32Intrinsics) {
-    warning("Adler32Intrinsics not available on this CPU.");
-    FLAG_SET_DEFAULT(UseAdler32Intrinsics, false);
-  }
-#endif
 
   if (supports_sse4_2() && supports_clmul()) {
     if (FLAG_IS_DEFAULT(UseCRC32CIntrinsics)) {
@@ -1246,7 +1205,6 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
 
-#ifdef _LP64
   // ChaCha20 Intrinsics
   // As long as the system supports AVX as a baseline we can do a
   // SIMD-enabled block function.  StubGenerator makes the determination
@@ -1262,24 +1220,14 @@ void VM_Version::get_processor_features() {
       }
       FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
-#else
-  // No support currently for ChaCha20 intrinsics on 32-bit platforms
-  if (UseChaCha20Intrinsics) {
-      warning("ChaCha20 intrinsics are not available on this CPU.");
-      FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
-  }
-#endif // _LP64
 
   // Dilithium Intrinsics
   // Currently we only have them for AVX512
-#ifdef _LP64
   if (supports_evex() && supports_avx512bw()) {
       if (FLAG_IS_DEFAULT(UseDilithiumIntrinsics)) {
           UseDilithiumIntrinsics = true;
       }
-  } else
-#endif
-   if (UseDilithiumIntrinsics) {
+  } else if (UseDilithiumIntrinsics) {
       warning("Intrinsics for ML-DSA are not available on this CPU.");
       FLAG_SET_DEFAULT(UseDilithiumIntrinsics, false);
   }
@@ -1308,7 +1256,7 @@ void VM_Version::get_processor_features() {
     UseMD5Intrinsics = true;
   }
 
-  if (supports_sha() LP64_ONLY(|| (supports_avx2() && supports_bmi2()))) {
+  if (supports_sha() || (supports_avx2() && supports_bmi2())) {
     if (FLAG_IS_DEFAULT(UseSHA)) {
       UseSHA = true;
     }
@@ -1335,27 +1283,20 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
   }
 
-#ifdef _LP64
-  // These are only supported on 64-bit
   if (UseSHA && supports_avx2() && (supports_bmi2() || supports_sha512())) {
     if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
     }
-  } else
-#endif
-  if (UseSHA512Intrinsics) {
+  } else if (UseSHA512Intrinsics) {
     warning("Intrinsics for SHA-384 and SHA-512 crypto hash functions not available on this CPU.");
     FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
   }
 
-#ifdef _LP64
   if (supports_evex() && supports_avx512bw()) {
       if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
           UseSHA3Intrinsics = true;
       }
-  } else
-#endif
-   if (UseSHA3Intrinsics) {
+  } else if (UseSHA3Intrinsics) {
       warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
       FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
   }
@@ -1377,11 +1318,7 @@ void VM_Version::get_processor_features() {
     max_vector_size = 64;
   }
 
-#ifdef _LP64
   int min_vector_size = 4; // We require MaxVectorSize to be at least 4 on 64bit
-#else
-  int min_vector_size = 0;
-#endif
 
   if (!FLAG_IS_DEFAULT(MaxVectorSize)) {
     if (MaxVectorSize < min_vector_size) {
@@ -1405,7 +1342,7 @@ void VM_Version::get_processor_features() {
   if (MaxVectorSize > 0) {
     if (supports_avx() && PrintMiscellaneous && Verbose && TraceNewVectors) {
       tty->print_cr("State of YMM registers after signal handle:");
-      int nreg = 2 LP64_ONLY(+2);
+      int nreg = 4;
       const char* ymm_name[4] = {"0", "7", "8", "15"};
       for (int i = 0; i < nreg; i++) {
         tty->print("YMM%s:", ymm_name[i]);
@@ -1418,31 +1355,24 @@ void VM_Version::get_processor_features() {
   }
 #endif // COMPILER2 && ASSERT
 
-#ifdef _LP64
   if ((supports_avx512ifma() && supports_avx512vlbw()) || supports_avxifma())  {
     if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
       FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
     }
-  } else
-#endif
-  if (UsePoly1305Intrinsics) {
+  } else if (UsePoly1305Intrinsics) {
     warning("Intrinsics for Poly1305 crypto hash functions not available on this CPU.");
     FLAG_SET_DEFAULT(UsePoly1305Intrinsics, false);
   }
 
-#ifdef _LP64
   if ((supports_avx512ifma() && supports_avx512vlbw()) || supports_avxifma()) {
     if (FLAG_IS_DEFAULT(UseIntPolyIntrinsics)) {
       FLAG_SET_DEFAULT(UseIntPolyIntrinsics, true);
     }
-  } else
-#endif
-  if (UseIntPolyIntrinsics) {
+  } else if (UseIntPolyIntrinsics) {
     warning("Intrinsics for Polynomial crypto functions not available on this CPU.");
     FLAG_SET_DEFAULT(UseIntPolyIntrinsics, false);
   }
 
-#ifdef _LP64
   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
     UseMultiplyToLenIntrinsic = true;
   }
@@ -1458,38 +1388,6 @@ void VM_Version::get_processor_features() {
   if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
     UseMontgomerySquareIntrinsic = true;
   }
-#else
-  if (UseMultiplyToLenIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
-      warning("multiplyToLen intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, false);
-  }
-  if (UseMontgomeryMultiplyIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
-      warning("montgomeryMultiply intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseMontgomeryMultiplyIntrinsic, false);
-  }
-  if (UseMontgomerySquareIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
-      warning("montgomerySquare intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, false);
-  }
-  if (UseSquareToLenIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
-      warning("squareToLen intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseSquareToLenIntrinsic, false);
-  }
-  if (UseMulAddIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
-      warning("mulAdd intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseMulAddIntrinsic, false);
-  }
-#endif // _LP64
 #endif // COMPILER2_OR_JVMCI
 
   // On new cpus instructions which update whole XMM register should be used
@@ -1766,7 +1664,6 @@ void VM_Version::get_processor_features() {
   }
 #endif
 
-#ifdef _LP64
   if (UseSSE42Intrinsics) {
     if (FLAG_IS_DEFAULT(UseVectorizedMismatchIntrinsic)) {
       UseVectorizedMismatchIntrinsic = true;
@@ -1783,20 +1680,6 @@ void VM_Version::get_processor_features() {
       warning("vectorizedHashCode intrinsics are not available on this CPU");
     FLAG_SET_DEFAULT(UseVectorizedHashCodeIntrinsic, false);
   }
-#else
-  if (UseVectorizedMismatchIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseVectorizedMismatchIntrinsic)) {
-      warning("vectorizedMismatch intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseVectorizedMismatchIntrinsic, false);
-  }
-  if (UseVectorizedHashCodeIntrinsic) {
-    if (!FLAG_IS_DEFAULT(UseVectorizedHashCodeIntrinsic)) {
-      warning("vectorizedHashCode intrinsic is not available in 32-bit VM");
-    }
-    FLAG_SET_DEFAULT(UseVectorizedHashCodeIntrinsic, false);
-  }
-#endif // _LP64
 
   // Use count leading zeros count instruction if available.
   if (supports_lzcnt()) {
@@ -1945,7 +1828,6 @@ void VM_Version::get_processor_features() {
 #endif
   }
 
-#ifdef _LP64
   // Prefetch settings
 
   // Prefetch interval for gc copy/scan == 9 dcache lines.  Derived from
@@ -1964,7 +1846,6 @@ void VM_Version::get_processor_features() {
   if (FLAG_IS_DEFAULT(PrefetchScanIntervalInBytes)) {
     FLAG_SET_DEFAULT(PrefetchScanIntervalInBytes, 576);
   }
-#endif
 
   if (FLAG_IS_DEFAULT(ContendedPaddingWidth) &&
      (cache_line_size > ContendedPaddingWidth))
@@ -2195,11 +2076,9 @@ int VM_Version::avx3_threshold() {
           FLAG_IS_DEFAULT(AVX3Threshold)) ? 0 : AVX3Threshold;
 }
 
-#if defined(_LP64)
 void VM_Version::clear_apx_test_state() {
   clear_apx_test_state_stub();
 }
-#endif
 
 static bool _vm_version_initialized = false;
 
@@ -2217,14 +2096,11 @@ void VM_Version::initialize() {
                                      g.generate_get_cpu_info());
   detect_virt_stub = CAST_TO_FN_PTR(detect_virt_stub_t,
                                      g.generate_detect_virt());
-
-#if defined(_LP64)
   clear_apx_test_state_stub = CAST_TO_FN_PTR(clear_apx_test_state_t,
                                      g.clear_apx_test_state());
-#endif
   get_processor_features();
 
-  LP64_ONLY(Assembler::precompute_instructions();)
+  Assembler::precompute_instructions();
 
   if (VM_Version::supports_hv()) { // Supports hypervisor
     check_virtualizations();
@@ -2991,12 +2867,10 @@ uint64_t VM_Version::CpuidInfo::feature_flags() const {
     result |= CPU_CMOV;
   if (std_cpuid1_edx.bits.clflush != 0)
     result |= CPU_FLUSH;
-#ifdef _LP64
   // clflush should always be available on x86_64
   // if not we are in real trouble because we rely on it
   // to flush the code cache.
   assert ((result & CPU_FLUSH) != 0, "clflush should be available");
-#endif
   if (std_cpuid1_edx.bits.fxsr != 0 || (is_amd_family() &&
       ext_cpuid1_edx.bits.fxsr != 0))
     result |= CPU_FXSR;
@@ -3168,7 +3042,7 @@ uint64_t VM_Version::CpuidInfo::feature_flags() const {
 
 bool VM_Version::os_supports_avx_vectors() {
   bool retVal = false;
-  int nreg = 2 LP64_ONLY(+2);
+  int nreg = 4;
   if (supports_evex()) {
     // Verify that OS save/restore all bits of EVEX registers
     // during signal processing.
@@ -3324,11 +3198,7 @@ int VM_Version::allocate_prefetch_distance(bool use_watermark_prefetch) {
       if (supports_sse4_2() && supports_ht()) { // Nehalem based cpus
         return 192;
       } else if (use_watermark_prefetch) { // watermark prefetching on Core
-#ifdef _LP64
         return 384;
-#else
-        return 320;
-#endif
       }
     }
     if (supports_sse2()) {
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index cc5c6c1c639..7eb627c8714 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -642,7 +642,7 @@ class VM_Version : public Abstract_VM_Version {
   static void set_cpuinfo_cont_addr_apx(address pc) { _cpuinfo_cont_addr_apx = pc; }
   static address  cpuinfo_cont_addr_apx()           { return _cpuinfo_cont_addr_apx; }
 
-  LP64_ONLY(static void clear_apx_test_state());
+  static void clear_apx_test_state();
 
   static void clean_cpuFeatures()   { _features = 0; }
   static void set_avx_cpuFeatures() { _features |= (CPU_SSE | CPU_SSE2 | CPU_AVX | CPU_VZEROUPPER ); }
@@ -839,12 +839,12 @@ class VM_Version : public Abstract_VM_Version {
 
   // x86_64 supports fast class initialization checks
   static bool supports_fast_class_init_checks() {
-    return LP64_ONLY(true) NOT_LP64(false); // not implemented on x86_32
+    return true;
   }
 
   // x86_64 supports secondary supers table
   constexpr static bool supports_secondary_supers_table() {
-    return LP64_ONLY(true) NOT_LP64(false); // not implemented on x86_32
+    return true;
   }
 
   constexpr static bool supports_stack_watermark_barrier() {
@@ -879,11 +879,7 @@ class VM_Version : public Abstract_VM_Version {
   // synchronize with other memory ops. so, it needs preceding
   // and trailing StoreStore fences.
 
-#ifdef _LP64
   static bool supports_clflush(); // Can't inline due to header file conflict
-#else
-  static bool supports_clflush() { return  ((_features & CPU_FLUSH) != 0); }
-#endif // _LP64
 
   // Note: CPU_FLUSHOPT and CPU_CLWB bits should always be zero for 32-bit
   static bool supports_clflushopt() { return ((_features & CPU_FLUSHOPT) != 0); }

From b41e0b17490b203b19787a0d0742318fc0d03b33 Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Fri, 25 Apr 2025 07:20:25 +0000
Subject: [PATCH 130/901] 8355387: [jittester] Disable downcasts by default

Reviewed-by: thartmann, chagedorn
---
 .../src/jdk/test/lib/jittester/ProductionParams.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java
index afc526e81c7..87b5f23f58c 100644
--- a/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.java
+++ b/test/hotspot/jtreg/testlibrary/jittester/src/jdk/test/lib/jittester/ProductionParams.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
@@ -121,7 +121,7 @@ public static void register(OptionResolver optionResolver) {
         disableExternalSymbols = optionResolver.addBooleanOption("disable-external-symbols", "Don\'t use external symbols");
         addExternalSymbols = optionResolver.addStringOption("add-external-symbols", "all", "Add symbols for listed classes (comma-separated list)");
         disableInheritance = optionResolver.addBooleanOption("disable-inheritance", "Disable inheritance");
-        disableDowncasts = optionResolver.addBooleanOption("disable-downcasts", "Disable downcasting of objects");
+        disableDowncasts = optionResolver.addBooleanOption(null, "disable-downcasts", true, "Disable downcasting of objects");
         disableStatic = optionResolver.addBooleanOption("disable-static", "Disable generation of static objects and functions");
         disableInterfaces = optionResolver.addBooleanOption("disable-interfaces", "Disable generation of interfaces");
         disableClasses = optionResolver.addBooleanOption("disable-classes", "Disable generation of classes");

From 89f9268ed7c2cb86891f23a10482cd459454bd32 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Fri, 25 Apr 2025 08:20:51 +0000
Subject: [PATCH 131/901] 8355524: Only every second line in upgradeable files
 is being used

Reviewed-by: shade, alanb
---
 .../classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java  | 2 +-
 .../jlink/internal/runtimelink/upgrade_files_java.base.conf     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
index d564ed0bad8..30c37961829 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
@@ -93,7 +93,7 @@ private static Set<String> upgradeableFiles(String module) {
                     // Skip comments
                     continue;
                 }
-                upgradeableFiles.add(scanner.nextLine());
+                upgradeableFiles.add(line);
             }
         } catch (IOException e) {
             throw new AssertionError("Failure to retrieve upgradeable files for " +
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
index df2ca809f08..fc5e7b4f328 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
@@ -1,4 +1,4 @@
 # Configuration for resource paths of files allowed to be
 # upgraded (in java.base)
-lib/tzdb.dat
 lib/security/cacerts
+lib/tzdb.dat

From f66b9ba7bc1f426c430c5a99842685008c5a9dda Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Fri, 25 Apr 2025 10:08:37 +0000
Subject: [PATCH 132/901] 8346785: Potential infinite loop in
 JavadocTokenizer.ensures

Reviewed-by: liach, hannesw
---
 .../com/sun/tools/javac/parser/JavadocTokenizer.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 5dcb4cc36d4..a2925c69d94 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
@@ -307,12 +307,13 @@ private void ensure(int need) {
 
             while (need > grow) {
                 grow <<= 1;
+                // Handle overflow.
+                if (grow <= 0) {
+                    throw new IndexOutOfBoundsException();
+                }
             }
 
-            // Handle overflow.
-            if (grow < map.length) {
-                throw new IndexOutOfBoundsException();
-            } else if (grow != map.length) {
+            if (grow != map.length) {
                 map = Arrays.copyOf(map, grow);
             }
         }

From e6cea4025b6743538da76f056fa831b02705f423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= <eirbjo@openjdk.org>
Date: Fri, 25 Apr 2025 11:17:15 +0000
Subject: [PATCH 133/901] 8355475: UNCTest should use an existing UNC path

Reviewed-by: dfuchs
---
 test/jdk/java/net/URLConnection/UNCTest.java | 37 +++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/net/URLConnection/UNCTest.java b/test/jdk/java/net/URLConnection/UNCTest.java
index 653b4c96699..2fe88dde65b 100644
--- a/test/jdk/java/net/URLConnection/UNCTest.java
+++ b/test/jdk/java/net/URLConnection/UNCTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, 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
@@ -25,17 +25,46 @@
  * @test
  * @bug 4401485
  * @requires (os.family == "windows")
+ * @modules java.base/sun.net.www.protocol.file
+ * @library /test/lib
  * @summary  Check that URL.openConnection() doesn't open connection to UNC
- * @run main UNCTest file://jdk/LOCAL-JAVA/jdk1.4/win/README.txt
  */
 
+import jtreg.SkippedException;
+import sun.net.www.protocol.file.FileURLConnection;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 
 public class UNCTest {
-    public static void main(String args[]) throws Exception {
-        URL url = new URL( args[0] );
+    public static void main(String[] args) throws Exception {
+        // Get the "computer name" for this host
+        String hostName = InetAddress.getLocalHost().getHostName();
+
+        // UNC path which always exists with Administrative Shares enabled
+        String path = "\\\\" + hostName + "\\C$\\Windows";
+
+        // Skip test if Administrative Shares is disabled
+        if (! new File(path).exists()) {
+            throw new SkippedException("Administrative Shares not enabled");
+        }
+
+        // File URL for the UNC path
+        URL url = new URI("file://" + hostName + "/C$/Windows").toURL();
+
+        // Should open a FileURLConnection for the UNC path
         URLConnection conn = url.openConnection();
+
+        // Sanity check that the connection is a FileURLConnection
+        if (! (conn instanceof FileURLConnection)) {
+            throw new Exception("Expected FileURLConnection, instead got "
+                    + conn.getClass().getName());
+        }
+
+        // Verify that the connection is not in an already connected state
         conn.setRequestProperty( "User-Agent", "Java" );
     }
 }

From a2f9c248447d2840d191366cead1ba474ed9a15a Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Fri, 25 Apr 2025 11:31:10 +0000
Subject: [PATCH 134/901] 8354327: Rewrite
 runtime/LoadClass/LoadClassNegative.java

Reviewed-by: coleenp, lmesnik
---
 .../jtreg/runtime/LoadClass/LoadClassNegative.java  | 13 ++++++++++---
 test/hotspot/jtreg/runtime/LoadClass/dummy.jar      |  0
 2 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/LoadClass/dummy.jar

diff --git a/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java b/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java
index 94c2bde6e76..a9ddd5268c5 100644
--- a/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java
+++ b/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.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
@@ -40,8 +40,15 @@
 public class LoadClassNegative {
 
   public static void main(String args[]) throws Exception {
-    String bootCP = "-Xbootclasspath/a:" + System.getProperty("test.src")
-                       + File.separator + "dummy.jar";
+
+    // Create an empty file in the scratch directory
+    final String filename = "empty.jar";
+    File emptyJar = new File(filename);
+    emptyJar.createNewFile();
+
+    // Explicitly tell to use it for class loading
+    String bootCP = "-Xbootclasspath/a:" + emptyJar.getAbsolutePath();
+
     ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
         bootCP,
         "TestForName");
diff --git a/test/hotspot/jtreg/runtime/LoadClass/dummy.jar b/test/hotspot/jtreg/runtime/LoadClass/dummy.jar
deleted file mode 100644
index e69de29bb2d..00000000000

From 5c067232bf21aaca2b7addd2a862e15a8696ffb8 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Fri, 25 Apr 2025 12:50:12 +0000
Subject: [PATCH 135/901] 8355074: RISC-V: C2: Support Vector-Scalar version of
 Zvbb Vector And-Not instruction

Reviewed-by: fjiang, fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  1 +
 src/hotspot/cpu/riscv/riscv_v.ad              | 64 +++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     | 20 ++++++
 .../AllBitsSetVectorMatchRuleTest.java        | 62 ++++++++++++++++++
 4 files changed, 147 insertions(+)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index e036cb6b1ec..4773043e1ba 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -2323,6 +2323,7 @@ enum Nf {
   }
 
   // Vector Bit-manipulation used in Cryptography (Zvbb) Extension
+  INSN(vandn_vx,   0b1010111, 0b100, 0b000001);
   INSN(vrol_vx,    0b1010111, 0b100, 0b010101);
   INSN(vror_vx,    0b1010111, 0b100, 0b010100);
 
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 6fea439954c..7df3c857a4d 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -1187,6 +1187,70 @@ instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, vRegMask_V0 v0)
   ins_pipe(pipe_slow);
 %}
 
+instruct vand_notI_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
+  predicate(UseZvbb);
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
+  format %{ "vand_notI_vx $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_Register($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notL_vx(vReg dst, vReg src1, iRegL src2, immL_M1 m1) %{
+  predicate(UseZvbb);
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (AndV src1 (Replicate (XorL src2 m1))));
+  format %{ "vand_notL_vx $dst, $src1, $src2" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_Register($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notI_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb);
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
+  format %{ "vand_notI_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_Register($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notL_vx_masked(vReg dst_src1, iRegL src2, immL_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb);
+  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorL src2 m1))) v0));
+  format %{ "vand_notL_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_Register($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector not -----------------------------------
 
 // vector not
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 0b224523561..5dabcf0f828 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2136,6 +2136,26 @@ public class IRNode {
         machOnlyNameRegex(VAND_NOT_L_MASKED, "vand_notL_masked");
     }
 
+    public static final String RISCV_VAND_NOTI_VX = PREFIX + "RISCV_VAND_NOTI_VX" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOTI_VX, "vand_notI_vx");
+    }
+
+    public static final String RISCV_VAND_NOTL_VX = PREFIX + "RISCV_VAND_NOTL_VX" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOTL_VX, "vand_notL_vx");
+    }
+
+    public static final String RISCV_VAND_NOTI_VX_MASKED = PREFIX + "RISCV_VAND_NOTI_VX_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOTI_VX_MASKED, "vand_notI_vx_masked");
+    }
+
+    public static final String RISCV_VAND_NOTL_VX_MASKED = PREFIX + "RISCV_VAND_NOTL_VX_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOTL_VX_MASKED, "vand_notL_vx_masked");
+    }
+
     public static final String VECTOR_BLEND_B = VECTOR_PREFIX + "VECTOR_BLEND_B" + POSTFIX;
     static {
         vectorNode(VECTOR_BLEND_B, "VectorBlend", TYPE_BYTE);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java b/test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java
index f33dd24e726..bb88f60dd21 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java
@@ -154,6 +154,68 @@ public static void testVectorVAndNotLMasked() {
         }
     }
 
+    @Test
+    @Warmup(10000)
+    @IR(counts = { IRNode.RISCV_VAND_NOTI_VX, " >= 1" }, applyIfPlatform = {"riscv64", "true"})
+    public static void testAllBitsSetVectorRegI() {
+        IntVector av = IntVector.fromArray(I_SPECIES, ia, 0);
+        int bs = ib[0];
+        av.not().lanewise(VectorOperators.AND_NOT, bs).intoArray(ir, 0);
+
+        // Verify results
+        for (int i = 0; i < I_SPECIES.length(); i++) {
+            Asserts.assertEquals((~ia[i]) & (~bs), ir[i]);
+        }
+    }
+
+    @Test
+    @Warmup(10000)
+    @IR(counts = { IRNode.RISCV_VAND_NOTL_VX, " >= 1" }, applyIfPlatform = {"riscv64", "true"})
+    public static void testAllBitsSetVectorRegL() {
+        LongVector av = LongVector.fromArray(L_SPECIES, la, 0);
+        long bs = lb[0];
+        av.not().lanewise(VectorOperators.AND_NOT, bs).intoArray(lr, 0);
+
+        // Verify results
+        for (int i = 0; i < L_SPECIES.length(); i++) {
+            Asserts.assertEquals((~la[i]) & (~bs), lr[i]);
+        }
+    }
+
+    @Test
+    @Warmup(10000)
+    @IR(counts = { IRNode.RISCV_VAND_NOTI_VX_MASKED, " >= 1" }, applyIfPlatform = {"riscv64", "true"})
+    public static void testAllBitsSetVectorRegIMask() {
+        VectorMask<Integer> avm = VectorMask.fromArray(I_SPECIES, ma, 0);
+        IntVector av = IntVector.fromArray(I_SPECIES, ia, 0);
+        int bs = ib[0];
+        av.not().lanewise(VectorOperators.AND_NOT, bs, avm).intoArray(ir, 0);
+
+        // Verify results
+        for (int i = 0; i < I_SPECIES.length(); i++) {
+            if (ma[i] == true) {
+                Asserts.assertEquals((~ia[i]) & (~bs), ir[i]);
+            }
+        }
+    }
+
+    @Test
+    @Warmup(10000)
+    @IR(counts = { IRNode.RISCV_VAND_NOTL_VX_MASKED, " >= 1" }, applyIfPlatform = {"riscv64", "true"})
+    public static void testAllBitsSetVectorRegLMask() {
+        VectorMask<Long> avm = VectorMask.fromArray(L_SPECIES, ma, 0);
+        LongVector av = LongVector.fromArray(L_SPECIES, la, 0);
+        long bs = lb[0];
+        av.not().lanewise(VectorOperators.AND_NOT, bs, avm).intoArray(lr, 0);
+
+        // Verify results
+        for (int i = 0; i < L_SPECIES.length(); i++) {
+            if (ma[i] == true) {
+                Asserts.assertEquals((~la[i]) & (~bs), lr[i]);
+            }
+        }
+    }
+
     @Test
     @Warmup(10000)
     @IR(counts = { IRNode.VAND_NOT_L, " >= 1" }, applyIfPlatform = {"aarch64", "true"}, applyIf = {"UseSVE", "0"})

From 597bcc695347544b9feffc5280741b1e9e1715f7 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 25 Apr 2025 16:12:35 +0000
Subject: [PATCH 136/901] 8352003: Support --add-opens with
 -XX:+AOTClassLinking

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Reviewed-by: iklam, alanb, matsaave
---
 src/hotspot/share/classfile/modules.cpp       |   5 +-
 src/hotspot/share/runtime/arguments.cpp       |   2 +-
 .../share/classes/java/lang/Module.java       |  90 +++++-----
 .../share/classes/java/lang/System.java       |   3 -
 .../jdk/internal/access/JavaLangAccess.java   |   5 -
 .../jdk/internal/module/ModuleBootstrap.java  |  11 +-
 .../cds/appcds/jigsaw/ExactOptionMatch.java   |   4 +
 .../jigsaw/addopens/AddopensOption.java       | 156 ++++++++++++++++++
 .../appcds/jigsaw/modulepath/AddOpens.java    |  64 ++++---
 9 files changed, 250 insertions(+), 90 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java

diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 3f2ff90ccab..05be2df52af 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -580,13 +580,14 @@ class Modules::ArchivedProperty {
 };
 
 Modules::ArchivedProperty Modules::_archived_props[] = {
-  // numbered
+  // non-numbered
   {"jdk.module.main", false},
 
-  // non-numbered
+  // numbered
   {"jdk.module.addexports", true},             // --add-exports
   {"jdk.module.addmods", true},                // --add-modules
   {"jdk.module.enable.native.access", true},   // --enable-native-access
+  {"jdk.module.addopens", true},               // --add-opens
 };
 
 constexpr size_t Modules::num_archived_props() {
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index b3e0600df34..d0bba58b508 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -332,7 +332,6 @@ bool Arguments::internal_module_property_helper(const char* property, bool check
   if (strncmp(property, MODULE_PROPERTY_PREFIX, MODULE_PROPERTY_PREFIX_LEN) == 0) {
     const char* property_suffix = property + MODULE_PROPERTY_PREFIX_LEN;
     if (matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) ||
-        matches_property_suffix(property_suffix, ADDOPENS, ADDOPENS_LEN) ||
         matches_property_suffix(property_suffix, PATCH, PATCH_LEN) ||
         matches_property_suffix(property_suffix, LIMITMODS, LIMITMODS_LEN) ||
         matches_property_suffix(property_suffix, UPGRADE_PATH, UPGRADE_PATH_LEN) ||
@@ -343,6 +342,7 @@ bool Arguments::internal_module_property_helper(const char* property, bool check
     if (!check_for_cds) {
       // CDS notes: these properties are supported by CDS archived full module graph.
       if (matches_property_suffix(property_suffix, ADDEXPORTS, ADDEXPORTS_LEN) ||
+          matches_property_suffix(property_suffix, ADDOPENS, ADDOPENS_LEN) ||
           matches_property_suffix(property_suffix, PATH, PATH_LEN) ||
           matches_property_suffix(property_suffix, ADDMODS, ADDMODS_LEN) ||
           matches_property_suffix(property_suffix, ENABLE_NATIVE_ACCESS, ENABLE_NATIVE_ACCESS_LEN)) {
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
index dcc92d012de..065e1ac4620 100644
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.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
@@ -40,7 +40,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.security.CodeSource;
-import java.security.ProtectionDomain;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -688,7 +687,6 @@ public boolean isOpen(String pn) {
         return implIsExportedOrOpen(pn, EVERYONE_MODULE, /*open*/true);
     }
 
-
     /**
      * Returns {@code true} if this module exports or opens the given package
      * to the given module. If the other module is {@code EVERYONE_MODULE} then
@@ -707,12 +705,12 @@ private boolean implIsExportedOrOpen(String pn, Module other, boolean open) {
         if (descriptor.isOpen() || descriptor.isAutomatic())
             return descriptor.packages().contains(pn);
 
-        // exported/opened via module declaration/descriptor
-        if (isStaticallyExportedOrOpen(pn, other, open))
+        // exported/opened via module declaration/descriptor or CLI options
+        if (isExplicitlyExportedOrOpened(pn, other, open))
             return true;
 
         // exported via addExports/addOpens
-        if (isReflectivelyExportedOrOpen(pn, other, open))
+        if (isReflectivelyExportedOrOpened(pn, other, open))
             return true;
 
         // not exported or open to other
@@ -723,7 +721,7 @@ private boolean implIsExportedOrOpen(String pn, Module other, boolean open) {
      * Returns {@code true} if this module exports or opens a package to
      * the given module via its module declaration or CLI options.
      */
-    private boolean isStaticallyExportedOrOpen(String pn, Module other, boolean open) {
+    private boolean isExplicitlyExportedOrOpened(String pn, Module other, boolean open) {
         // test if package is open to everyone or <other>
         Map<String, Set<Module>> openPackages = this.openPackages;
         if (openPackages != null && allows(openPackages.get(pn), other)) {
@@ -764,7 +762,7 @@ private boolean allows(Set<Module> targets, Module module) {
      * Returns {@code true} if this module reflectively exports or opens the
      * given package to the given module.
      */
-    private boolean isReflectivelyExportedOrOpen(String pn, Module other, boolean open) {
+    private boolean isReflectivelyExportedOrOpened(String pn, Module other, boolean open) {
         // exported or open to all modules
         Map<String, Boolean> exports = ReflectionData.exports.get(this, EVERYONE_MODULE);
         if (exports != null) {
@@ -809,7 +807,7 @@ private boolean isReflectivelyExportedOrOpen(String pn, Module other, boolean op
      * given package to the given module.
      */
     boolean isReflectivelyExported(String pn, Module other) {
-        return isReflectivelyExportedOrOpen(pn, other, false);
+        return isReflectivelyExportedOrOpened(pn, other, false);
     }
 
     /**
@@ -817,7 +815,7 @@ boolean isReflectivelyExported(String pn, Module other) {
      * given package to the given module.
      */
     boolean isReflectivelyOpened(String pn, Module other) {
-        return isReflectivelyExportedOrOpen(pn, other, true);
+        return isReflectivelyExportedOrOpened(pn, other, true);
     }
 
 
@@ -1033,50 +1031,38 @@ private void implAddExportsOrOpens(String pn,
             }
         }
 
-        // add package name to exports if absent
-        Map<String, Boolean> map = ReflectionData.exports
-            .computeIfAbsent(this, other,
-                             (m1, m2) -> new ConcurrentHashMap<>());
-        if (open) {
-            map.put(pn, Boolean.TRUE);  // may need to promote from FALSE to TRUE
-        } else {
-            map.putIfAbsent(pn, Boolean.FALSE);
-        }
-    }
-
-    /**
-     * Updates a module to open all packages in the given sets to all unnamed
-     * modules.
-     *
-     * @apiNote Used during startup to open packages for illegal access.
-     */
-    void implAddOpensToAllUnnamed(Set<String> concealedPkgs, Set<String> exportedPkgs) {
-        if (jdk.internal.misc.VM.isModuleSystemInited()) {
-            throw new IllegalStateException("Module system already initialized");
-        }
-
-        // replace this module's openPackages map with a new map that opens
-        // the packages to all unnamed modules.
-        Map<String, Set<Module>> openPackages = this.openPackages;
-        if (openPackages == null) {
-            openPackages = HashMap.newHashMap(concealedPkgs.size() + exportedPkgs.size());
+        if (VM.isBooted()) {
+            // add package name to ReflectionData.exports if absent
+            Map<String, Boolean> map = ReflectionData.exports
+                .computeIfAbsent(this, other,
+                                 (m1, m2) -> new ConcurrentHashMap<>());
+            if (open) {
+                map.put(pn, Boolean.TRUE);  // may need to promote from FALSE to TRUE
+            } else {
+                map.putIfAbsent(pn, Boolean.FALSE);
+            }
         } else {
-            openPackages = new HashMap<>(openPackages);
-        }
-        implAddOpensToAllUnnamed(concealedPkgs, openPackages);
-        implAddOpensToAllUnnamed(exportedPkgs, openPackages);
-        this.openPackages = openPackages;
-    }
-
-    private void implAddOpensToAllUnnamed(Set<String> pkgs, Map<String, Set<Module>> openPackages) {
-        for (String pn : pkgs) {
-            Set<Module> prev = openPackages.putIfAbsent(pn, ALL_UNNAMED_MODULE_SET);
-            if (prev != null) {
-                prev.add(ALL_UNNAMED_MODULE);
+            // export/open packages during startup (--add-exports and --add-opens)
+            Map<String, Set<Module>> packageToTargets = (open) ? openPackages : exportedPackages;
+            if (packageToTargets != null) {
+                // copy existing map
+                packageToTargets = new HashMap<>(packageToTargets);
+                packageToTargets.compute(pn, (_, values) -> {
+                    var targets = new HashSet<Module>();
+                    if (values != null) {
+                        targets.addAll(values);
+                    }
+                    targets.add(other);
+                    return targets;
+                });
+            } else {
+                packageToTargets = Map.of(pn, Set.of(other));
+            }
+            if (open) {
+                this.openPackages = packageToTargets;
+            } else {
+                this.exportedPackages = packageToTargets;
             }
-
-            // update VM to export the package
-            addExportsToAllUnnamed0(this, pn);
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 903f6e34e2e..f9b4698854d 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2059,9 +2059,6 @@ public void addOpens(Module m, String pn, Module other) {
             public void addOpensToAllUnnamed(Module m, String pn) {
                 m.implAddOpensToAllUnnamed(pn);
             }
-            public void addOpensToAllUnnamed(Module m, Set<String> concealedPackages, Set<String> exportedPackages) {
-                m.implAddOpensToAllUnnamed(concealedPackages, exportedPackages);
-            }
             public void addUses(Module m, Class<?> service) {
                 m.implAddUses(service);
             }
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 8edeb731cee..9e11bd7586f 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -230,11 +230,6 @@ public interface JavaLangAccess {
      */
     void addOpensToAllUnnamed(Module m, String pkg);
 
-    /**
-     * Updates module m to open all packages in the given sets.
-     */
-    void addOpensToAllUnnamed(Module m, Set<String> concealedPkgs, Set<String> exportedPkgs);
-
     /**
      * Updates module m to use a service.
      */
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 0a9044178a4..39c52f25514 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -142,8 +142,7 @@ private static boolean canUseArchivedBootLayer() {
         return getProperty("jdk.module.upgrade.path") == null &&
                getProperty("jdk.module.patch.0") == null &&       // --patch-module
                getProperty("jdk.module.limitmods") == null &&     // --limit-modules
-               getProperty("jdk.module.addreads.0") == null &&    // --add-reads
-               getProperty("jdk.module.addopens.0") == null;      // --add-opens
+               getProperty("jdk.module.addreads.0") == null;      // --add-reads
     }
 
     /**
@@ -452,7 +451,7 @@ private static ModuleLayer boot2() {
 
         // --add-reads, --add-exports/--add-opens
         addExtraReads(bootLayer);
-        boolean extraExportsOrOpens = addExtraExportsAndOpens(bootLayer);
+        addExtraExportsAndOpens(bootLayer);
 
         // add enable native access
         addEnableNativeAccess(bootLayer);
@@ -722,15 +721,13 @@ private static void addExtraReads(ModuleLayer bootLayer) {
      * Process the --add-exports and --add-opens options to export/open
      * additional packages specified on the command-line.
      */
-    private static boolean addExtraExportsAndOpens(ModuleLayer bootLayer) {
-        boolean extraExportsOrOpens = false;
+    private static void addExtraExportsAndOpens(ModuleLayer bootLayer) {
 
         // --add-exports
         String prefix = "jdk.module.addexports.";
         Map<String, List<String>> extraExports = decode(prefix);
         if (!extraExports.isEmpty()) {
             addExtraExportsOrOpens(bootLayer, extraExports, false);
-            extraExportsOrOpens = true;
         }
 
 
@@ -739,10 +736,8 @@ private static boolean addExtraExportsAndOpens(ModuleLayer bootLayer) {
         Map<String, List<String>> extraOpens = decode(prefix);
         if (!extraOpens.isEmpty()) {
             addExtraExportsOrOpens(bootLayer, extraOpens, true);
-            extraExportsOrOpens = true;
         }
 
-        return extraExportsOrOpens;
     }
 
     private static void addExtraExportsOrOpens(ModuleLayer bootLayer,
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
index e3fb6094c1d..dd8f186af80 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
@@ -39,6 +39,10 @@ public class ExactOptionMatch {
     record Option(String cmdLine, String property, String valueA, String valueB) {}
 
     static Option[] allOptions = new Option[] {
+        new Option("--add-opens",
+                   "jdk.module.addopens",
+                   "java.base/java.util.concurrent.regex=ALL-UNNAMED",
+                   "java.base/sun.security.x509=ALL-UNNAMED"),
         new Option("--add-exports",
                    "jdk.module.addexports",
                    "java.base/jdk.internal.misc=ALL-UNNAMED",
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
new file mode 100644
index 00000000000..81b24d15f9e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
@@ -0,0 +1,156 @@
+/*
+ * 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 8352003
+ * @summary Test handling of the --add-opens option.
+ * @requires vm.cds.write.archived.java.heap
+ * @requires vm.flagless
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @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 AddopensOption
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AddopensOption {
+
+    public static void main(String[] args) throws Exception {
+        final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
+        final String addOpensNio = "java.base/java.nio=ALL-UNNAMED";
+        final String addOpensTimeFormat = "java.base/java.time.format=ALL-UNNAMED";
+        final String loggingOption = "-Xlog:cds=debug,cds+module=debug,cds+heap=info,module=trace";
+        final String versionPattern = "java.[0-9][0-9].*";
+        final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled";
+        final String warningIncubator = "WARNING: Using incubator modules: jdk.incubator.vector";
+        String archiveName = TestCommon.getNewArchiveName("addopens-option");
+        TestCommon.setCurrentArchiveName(archiveName);
+
+        // dump a base archive with --add-opens jdk.java.base/java.time.format -m jdk.httpserver
+        OutputAnalyzer oa = TestCommon.dumpBaseArchive(
+            archiveName,
+            loggingOption,
+            "--add-opens", addOpensTimeFormat,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0);
+
+        // same modules specified during runtime
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "--add-opens", addOpensTimeFormat,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          // version of the jdk.httpserver module, e.g. java 22-ea
+          .shouldMatch(versionPattern)
+          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+
+        // different --add-opens specified during runtime
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "--add-opens", addOpensNio,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          .shouldContain("Mismatched values for property jdk.module.addopens")
+          .shouldContain("runtime java.base/java.nio=ALL-UNNAMED dump time java.base/java.time.format=ALL-UNNAMED")
+          .shouldContain(subgraphCannotBeUsed);
+
+        // no module specified during runtime
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          .shouldContain("jdk.httpserver specified during dump time but not during runtime")
+          .shouldContain(subgraphCannotBeUsed);
+
+        // dump an archive without the --add-opens option
+        archiveName = TestCommon.getNewArchiveName("no-addopens-option");
+        TestCommon.setCurrentArchiveName(archiveName);
+        oa = TestCommon.dumpBaseArchive(
+            archiveName,
+            loggingOption,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0);
+
+        // run with --add-opens option
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "--add-opens", addOpensTimeFormat,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          .shouldContain("java.base/java.time.format=ALL-UNNAMED specified during runtime but not during dump time")
+          // version of the jdk.httpserver module, e.g. java 22-ea
+          .shouldMatch(versionPattern)
+          .shouldContain(subgraphCannotBeUsed);
+
+        // dump an archive with -add-opens java.base/java.nio=ALL-UNNAMED
+        archiveName = TestCommon.getNewArchiveName("addopens-java-nio");
+        TestCommon.setCurrentArchiveName(archiveName);
+        oa = TestCommon.dumpBaseArchive(
+            archiveName,
+            loggingOption,
+            "--add-opens", addOpensNio,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          .shouldContain("Full module graph = enabled");
+
+        // run with the same --add-opens
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "--add-opens", addOpensNio,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldContain("optimized module handling: enabled")
+          .shouldHaveExitValue(0);
+
+        // dump an archive with multiple --add-modules args
+        archiveName = TestCommon.getNewArchiveName("muti-addopens");
+        TestCommon.setCurrentArchiveName(archiveName);
+        oa = TestCommon.dumpBaseArchive(
+            archiveName,
+            loggingOption,
+            "--add-opens", addOpensNio,
+            "--add-opens", addOpensTimeFormat,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0);
+
+        // run with the same multiple --add-modules args with a duplicate --add-opens entry
+        oa = TestCommon.execCommon(
+            loggingOption,
+            "--add-opens", addOpensTimeFormat,
+            "--add-opens", addOpensNio,
+            "--add-opens", addOpensTimeFormat,
+            "-m", moduleOption,
+            "-version");
+        oa.shouldHaveExitValue(0)
+          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
index fbb9b723a90..b181d23f64c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.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
@@ -57,6 +57,15 @@ public class AddOpens {
     private static Path moduleDir2 = null;
     private static Path destJar = null;
 
+    private static String addOpensArg = "java.base/java.lang=" + TEST_MODULE1;
+    private static String addOpensAllUnnamed = "java.base/java.lang=ALL-UNNAMED";
+    private static String extraOpts[][] =
+        {{"-Xlog:cds", "-Xlog:cds"},
+         {"--add-opens", addOpensArg}};
+    private static String expectedOutput[] =
+        { "[class,load] com.simple.Main source: shared objects file",
+          "method.setAccessible succeeded!"};
+
     public static void buildTestModule() throws Exception {
 
         // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
@@ -79,28 +88,45 @@ public static void main(String... args) throws Exception {
         // compile the modules and create the modular jar files
         buildTestModule();
         String appClasses[] = {MAIN_CLASS};
-        // create an archive with both -cp and --module-path in the command line.
-        // Only the class in the modular jar in the --module-path will be archived;
-        // the class in the modular jar in the -cp won't be archived.
-        OutputAnalyzer output = TestCommon.createArchive(
-                                        destJar.toString(), appClasses,
-                                        "--module-path", moduleDir.toString(),
-                                        "-m", TEST_MODULE1);
+        OutputAnalyzer output;
+
+        for (int i = 0; i < 2; i++) {
+            // create an archive with both -cp and --module-path, and with the
+            // --add-opens option if i == 1, in the command line.
+            // Only the class in the modular jar in the --module-path will be archived;
+            // the class in the modular jar in the -cp won't be archived.
+            output = TestCommon.createArchive(
+                             destJar.toString(), appClasses,
+                             extraOpts[i][0], extraOpts[i][1],
+                             "--module-path", moduleDir.toString(),
+                             "-m", TEST_MODULE1);
+            TestCommon.checkDump(output);
+
+            // run with the archive using the same command line as in dump time
+            // plus the "--add-opens java.base/java.lang=com.simple" option.
+            // The main class should be loaded from the archive.
+            // The setaccessible(true) on the ClassLoader.defineClass method should
+            // be successful.
+            TestCommon.run( "-Xlog:class+load=trace",
+                            "-cp", destJar.toString(),
+                            "--add-opens", addOpensArg,
+                            "--module-path", moduleDir.toString(),
+                            "-m", TEST_MODULE1, "with_add_opens")
+                    .assertNormalExit(expectedOutput[0], expectedOutput[1]);
+        }
+
+        // Test --add-opens to ALL-UNNAMED modules
+        output = TestCommon.createArchive(
+                         destJar.toString(), appClasses,
+                         "--add-opens", addOpensAllUnnamed,
+                         MAIN_CLASS);
         TestCommon.checkDump(output);
 
-        // run with the archive using the same command line as in dump time
-        // plus the "--add-opens java.base/java.lang=com.simple" option.
-        // The main class should be loaded from the archive.
-        // The setaccessible(true) on the ClassLoader.defineClass method should
-        // be successful.
         TestCommon.run( "-Xlog:class+load=trace",
                         "-cp", destJar.toString(),
-                        "--add-opens", "java.base/java.lang=" + TEST_MODULE1,
-                        "--module-path", moduleDir.toString(),
-                        "-m", TEST_MODULE1, "with_add_opens")
-            .assertNormalExit(
-                "[class,load] com.simple.Main source: shared objects file",
-                "method.setAccessible succeeded!");
+                        "--add-opens", addOpensAllUnnamed,
+                        MAIN_CLASS, "with_add_opens")
+                .assertNormalExit(expectedOutput[0], expectedOutput[1]);
 
     }
 }

From 77f5a24648758cb1adc74056ca58f880af4a8e84 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 25 Apr 2025 16:30:26 +0000
Subject: [PATCH 137/901] 8355214:
 nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter001.java should use
 JDIBase superclass

Reviewed-by: lmesnik, sspitsyn
---
 .../addThreadFilter/addthreadfilter002.java   | 164 +-----------------
 .../nsk/share/jdi/EventFilters.java           |   5 +-
 .../vmTestbase/nsk/share/jdi/JDIBase.java     |   3 +
 3 files changed, 10 insertions(+), 162 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java
index 9b040a17eb1..bc0d7ac70c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002.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
@@ -75,20 +75,7 @@
  * <BR>
  */
 
-public class addthreadfilter002 {
-
-    //----------------------------------------------------- templete section
-    static final int PASSED = 0;
-    static final int FAILED = 2;
-    static final int PASS_BASE = 95;
-
-    //----------------------------------------------------- templete parameters
-    static final String
-    sHeader1 = "\n==> nsk/jdi/ThreadStartRequest/addThreadFilter/addthreadfilter002 ",
-    sHeader2 = "--> debugger: ",
-    sHeader3 = "##> debugger: ";
-
-    //----------------------------------------------------- main method
+public class addthreadfilter002 extends JDIBase {
 
     public static void main (String argv[]) {
 
@@ -109,43 +96,12 @@ public static int run (String argv[], PrintStream out) {
         return exitCode;
     }
 
-    //--------------------------------------------------   log procedures
-
-    private static Log  logHandler;
-
-    private static void log1(String message) {
-        logHandler.display(sHeader1 + message);
-    }
-    private static void log2(String message) {
-        logHandler.display(sHeader2 + message);
-    }
-    private static void log3(String message) {
-        logHandler.complain(sHeader3 + message);
-    }
-
     //  ************************************************    test parameters
 
     private String debuggeeName =
         "nsk.jdi.ThreadStartRequest.addThreadFilter.addthreadfilter002a";
 
     //====================================================== test program
-    //------------------------------------------------------ common section
-
-    static Debugee          debuggee;
-    static ArgumentHandler  argsHandler;
-
-    static int waitTime;
-
-    static VirtualMachine      vm            = null;
-    static EventRequestManager eventRManager = null;
-    static EventQueue          eventQueue    = null;
-    static EventSet            eventSet      = null;
-    static EventIterator       eventIterator = null;
-
-    static ReferenceType       debuggeeClass = null;
-
-    static int  testExitCode = PASSED;
-
 
     //------------------------------------------------------ methods
 
@@ -287,16 +243,7 @@ private void testRun()
 
         log2("      received: ClassPrepareEvent for debuggeeClass");
 
-        String bPointMethod = "methodForCommunication";
-        String lineForComm  = "lineForComm";
-        BreakpointRequest bpRequest;
-
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
-
-        bpRequest = settingBreakpoint(mainThread,
-                                      debuggeeClass,
-                                      bPointMethod, lineForComm, "zero");
-        bpRequest.enable();
+        setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
 
@@ -307,6 +254,7 @@ private void testRun()
 
             vm.resume();
             breakpointForCommunication();
+            ThreadReference mainThread = bpEvent.thread(); // bpEvent saved by breakpointForCommunication()
 
             int instruction = ((IntegerValue)
                                (debuggeeClass.getValue(debuggeeClass.fieldByName("instruction")))).value();
@@ -378,108 +326,4 @@ private void testRun()
         return;
     }
 
-   /*
-    * private BreakpointRequest settingBreakpoint(ThreadReference, ReferenceType,
-    *                                             String, String, String)
-    *
-    * It sets up a breakpoint at given line number within a given method in a given class
-    * for a given thread.
-    *
-    * Return value: BreakpointRequest object  in case of success
-    *
-    * JDITestRuntimeException   in case of an Exception thrown within the method
-    */
-
-    private BreakpointRequest settingBreakpoint ( ThreadReference thread,
-                                                  ReferenceType testedClass,
-                                                  String methodName,
-                                                  String bpLine,
-                                                  String property)
-            throws JDITestRuntimeException {
-
-        log2("......setting up a breakpoint:");
-        log2("       thread: " + thread + "; class: " + testedClass +
-                        "; method: " + methodName + "; line: " + bpLine);
-
-        List              alllineLocations = null;
-        Location          lineLocation     = null;
-        BreakpointRequest breakpRequest    = null;
-
-        try {
-            Method  method  = (Method) testedClass.methodsByName(methodName).get(0);
-
-            alllineLocations = method.allLineLocations();
-
-            int n =
-                ( (IntegerValue) testedClass.getValue(testedClass.fieldByName(bpLine) ) ).value();
-            if (n > alllineLocations.size()) {
-                log3("ERROR:  TEST_ERROR_IN_settingBreakpoint(): number is out of bound of method's lines");
-            } else {
-                lineLocation = (Location) alllineLocations.get(n);
-                try {
-                    breakpRequest = eventRManager.createBreakpointRequest(lineLocation);
-                    breakpRequest.putProperty("number", property);
-                    breakpRequest.addThreadFilter(thread);
-                    breakpRequest.setSuspendPolicy( EventRequest.SUSPEND_EVENT_THREAD);
-                } catch ( Exception e1 ) {
-                    log3("ERROR: inner Exception within settingBreakpoint() : " + e1);
-                    breakpRequest    = null;
-                }
-            }
-        } catch ( Exception e2 ) {
-            log3("ERROR: ATTENTION:  outer Exception within settingBreakpoint() : " + e2);
-            breakpRequest    = null;
-        }
-
-        if (breakpRequest == null) {
-            log2("      A BREAKPOINT HAS NOT BEEN SET UP");
-            throw new JDITestRuntimeException("**FAILURE to set up a breakpoint**");
-        }
-
-        log2("      a breakpoint has been set up");
-        return breakpRequest;
-    }
-
-
-    private void getEventSet()
-                 throws JDITestRuntimeException {
-        try {
-//            log2("       eventSet = eventQueue.remove(waitTime);");
-            eventSet = eventQueue.remove(waitTime);
-            if (eventSet == null) {
-                throw new JDITestRuntimeException("** TIMEOUT while waiting for event **");
-            }
-//            log2("       eventIterator = eventSet.eventIterator;");
-            eventIterator = eventSet.eventIterator();
-        } catch ( Exception e ) {
-            throw new JDITestRuntimeException("** EXCEPTION while waiting for event ** : " + e);
-        }
-    }
-
-
-    private void breakpointForCommunication()
-                 throws JDITestRuntimeException {
-
-        log2("breakpointForCommunication");
-        while (true) {
-            getEventSet();
-            while (eventIterator.hasNext()) {
-                Event event = eventIterator.nextEvent();
-                if (event instanceof BreakpointEvent) {
-                    return;
-                } else if (event instanceof ThreadStartEvent) {
-                    // It might be the case that while the thread start request was enabled
-                    // some threads not related to the test ( e.g. JVMCI threads) were started
-                    // and generated thread start events. We ignore these thread start events
-                    // and keep waiting for a breakpoint event.
-                    ThreadStartEvent tse = (ThreadStartEvent) event;
-                    log2("ThreadStartEvent is received while waiting for a breakpoint" +
-                            " event, thread: : " + tse.thread().name());
-                    continue;
-                }
-                throw new JDITestRuntimeException("** event IS NOT a breakpoint or a thread start **");
-            }
-        }
-    }
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/EventFilters.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/EventFilters.java
index be4157f394f..c3d3ae5ad9f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/EventFilters.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/EventFilters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, 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
@@ -341,11 +341,12 @@ public static boolean filtered(Event event) {
                 "VirtualThread-unparker",
                 "Cleaner-",
                 "Common-Cleaner",
+                "CompilerThread",
                 "FinalizerThread",
                 "ForkJoinPool"
             };
             for (String s : knownThreads) {
-                if (tname.startsWith(s)) {
+                if (tname.indexOf(s) != -1) {
                     return true;
                 }
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
index ac99b121651..88b1de413dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
@@ -239,6 +239,9 @@ protected void breakpointForCommunication() throws JDITestRuntimeException {
 
             if (EventFilters.filtered(event)) {
                 // We filter out spurious ThreadStartEvents
+                ThreadStartEvent tse = (ThreadStartEvent) event;
+                log2("ThreadStartEvent is received while waiting for a breakpoint" +
+                     " event, thread: : " + tse.thread().name());
                 continue;
             }
 

From 15f42e348d4068bd90dd75b270a372353fe0ed07 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Fri, 25 Apr 2025 16:32:42 +0000
Subject: [PATCH 138/901] 8350703: Add standard system property stdin.encoding

Reviewed-by: naoto, alanb
---
 .../share/classes/java/lang/System.java       | 41 ++++++++++++-------
 .../jdk/internal/util/SystemProps.java        | 12 ++++--
 src/java.base/share/native/libjava/System.c   |  1 +
 .../share/native/libjava/java_props.h         |  1 +
 .../unix/native/libjava/java_props_md.c       |  3 ++
 .../windows/native/libjava/java_props_md.c    | 19 +++++----
 test/jdk/java/lang/System/PropertyTest.java   |  1 +
 7 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index f9b4698854d..dc969c72536 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -116,15 +116,23 @@ private System() {
 
     /**
      * The "standard" input stream. This stream is already
-     * open and ready to supply input data. Typically this stream
+     * open and ready to supply input data. This stream
      * corresponds to keyboard input or another input source specified by
-     * the host environment or user. In case this stream is wrapped
-     * in a {@link java.io.InputStreamReader}, {@link Console#charset()}
-     * should be used for the charset, or consider using
-     * {@link Console#reader()}.
+     * the host environment or user. Applications should use the encoding
+     * specified by the {@link ##stdin.encoding stdin.encoding} property
+     * to convert input bytes to character data.
      *
-     * @see Console#charset()
-     * @see Console#reader()
+     * @apiNote
+     * The typical approach to read character data is to wrap {@code System.in}
+     * within an {@link java.io.InputStreamReader InputStreamReader} or other object
+     * that handles character encoding. After this is done, subsequent reading should
+     * use only the wrapper object; operating directly on {@code System.in} results
+     * in unspecified behavior.
+     * <p>
+     * For handling interactive input, consider using {@link Console}.
+     *
+     * @see Console
+     * @see ##stdin.encoding stdin.encoding
      */
     public static final InputStream in = null;
 
@@ -575,17 +583,22 @@ public static native void arraycopy(Object src,  int  srcPos,
      * <tr><th scope="row">{@systemProperty user.dir}</th>
      *     <td>User's current working directory</td></tr>
      * <tr><th scope="row">{@systemProperty native.encoding}</th>
-     *     <td>Character encoding name derived from the host environment and/or
-     *     the user's settings. Setting this system property has no effect.</td></tr>
+     *     <td>Character encoding name derived from the host environment and
+     *     the user's settings. Setting this system property on the command line
+     *     has no effect.</td></tr>
+     * <tr><th scope="row">{@systemProperty stdin.encoding}</th>
+     *     <td>Character encoding name for {@link System#in System.in}.
+     *     The Java runtime can be started with the system property set to {@code UTF-8}.
+     *     Starting it with the property set to another value results in unspecified behavior.
      * <tr><th scope="row">{@systemProperty stdout.encoding}</th>
      *     <td>Character encoding name for {@link System#out System.out} and
      *     {@link System#console() System.console()}.
-     *     The Java runtime can be started with the system property set to {@code UTF-8},
-     *     starting it with the property set to another value leads to undefined behavior.
+     *     The Java runtime can be started with the system property set to {@code UTF-8}.
+     *     Starting it with the property set to another value results in unspecified behavior.
      * <tr><th scope="row">{@systemProperty stderr.encoding}</th>
      *     <td>Character encoding name for {@link System#err System.err}.
-     *     The Java runtime can be started with the system property set to {@code UTF-8},
-     *     starting it with the property set to another value leads to undefined behavior.
+     *     The Java runtime can be started with the system property set to {@code UTF-8}.
+     *     Starting it with the property set to another value results in unspecified behavior.
      * </tbody>
      * </table>
      * <p>
@@ -639,7 +652,7 @@ public static native void arraycopy(Object src,  int  srcPos,
      *     the value {@code COMPAT} then the value is replaced with the
      *     value of the {@code native.encoding} property during startup.
      *     Setting the property to a value other than {@code UTF-8} or
-     *     {@code COMPAT} leads to unspecified behavior.
+     *     {@code COMPAT} results in unspecified behavior.
      *     </td></tr>
      * </tbody>
      * </table>
diff --git a/src/java.base/share/classes/jdk/internal/util/SystemProps.java b/src/java.base/share/classes/jdk/internal/util/SystemProps.java
index 26110a1dab3..5760f04831e 100644
--- a/src/java.base/share/classes/jdk/internal/util/SystemProps.java
+++ b/src/java.base/share/classes/jdk/internal/util/SystemProps.java
@@ -88,9 +88,12 @@ public static Map<String, String> initProperties() {
             put(props, "file.encoding", nativeEncoding);
         }
 
-        // "stdout/err.encoding", prepared for System.out/err. For compatibility
-        // purposes, substitute them with "sun.*" if they don't exist. If "sun.*" aren't
-        // available either, fall back to "native.encoding".
+        // Encoding properties for stdin, stdout, and stderr. For stdout and stderr,
+        // check "sun.stdout.encoding" and "sun.stderr.encoding" properties for backward
+        // compatibility reasons before falling back to the "native.encoding" property.
+        putIfAbsent(props, "stdin.encoding",
+                raw.propDefault(Raw._stdin_encoding_NDX));
+        putIfAbsent(props, "stdin.encoding", nativeEncoding);
         putIfAbsent(props, "stdout.encoding", props.getOrDefault("sun.stdout.encoding",
                 raw.propDefault(Raw._stdout_encoding_NDX)));
         putIfAbsent(props, "stdout.encoding", nativeEncoding);
@@ -241,7 +244,8 @@ public static class Raw {
         @Native private static final int _socksProxyHost_NDX = 1 + _socksNonProxyHosts_NDX;
         @Native private static final int _socksProxyPort_NDX = 1 + _socksProxyHost_NDX;
         @Native private static final int _stderr_encoding_NDX = 1 + _socksProxyPort_NDX;
-        @Native private static final int _stdout_encoding_NDX = 1 + _stderr_encoding_NDX;
+        @Native private static final int _stdin_encoding_NDX = 1 + _stderr_encoding_NDX;
+        @Native private static final int _stdout_encoding_NDX = 1 + _stdin_encoding_NDX;
         @Native private static final int _sun_arch_abi_NDX = 1 + _stdout_encoding_NDX;
         @Native private static final int _sun_arch_data_model_NDX = 1 + _sun_arch_abi_NDX;
         @Native private static final int _sun_cpu_endian_NDX = 1 + _sun_arch_data_model_NDX;
diff --git a/src/java.base/share/native/libjava/System.c b/src/java.base/share/native/libjava/System.c
index b1feaf3dff7..725c1e30227 100644
--- a/src/java.base/share/native/libjava/System.c
+++ b/src/java.base/share/native/libjava/System.c
@@ -154,6 +154,7 @@ Java_jdk_internal_util_SystemProps_00024Raw_platformProperties(JNIEnv *env, jcla
     PUTPROP(propArray, _sun_jnu_encoding_NDX, sprops->sun_jnu_encoding);
 
     /* encodings for standard streams, may be NULL */
+    PUTPROP(propArray, _stdin_encoding_NDX, sprops->stdin_encoding);
     PUTPROP(propArray, _stdout_encoding_NDX, sprops->stdout_encoding);
     PUTPROP(propArray, _stderr_encoding_NDX, sprops->stderr_encoding);
 
diff --git a/src/java.base/share/native/libjava/java_props.h b/src/java.base/share/native/libjava/java_props.h
index 95fb6d9e7f9..774a7435e54 100644
--- a/src/java.base/share/native/libjava/java_props.h
+++ b/src/java.base/share/native/libjava/java_props.h
@@ -65,6 +65,7 @@ typedef struct {
     char *display_variant;
     char *encoding;             /* always set non-NULL by platform code */
     char *sun_jnu_encoding;     /* always set non-NULL by platform code */
+    char *stdin_encoding;
     char *stdout_encoding;
     char *stderr_encoding;
 
diff --git a/src/java.base/unix/native/libjava/java_props_md.c b/src/java.base/unix/native/libjava/java_props_md.c
index 6db307088b0..1d5435d5229 100644
--- a/src/java.base/unix/native/libjava/java_props_md.c
+++ b/src/java.base/unix/native/libjava/java_props_md.c
@@ -464,6 +464,9 @@ GetJavaProperties(JNIEnv *env)
     sprops.sun_jnu_encoding = sprops.encoding;
 #endif
 
+    if (isatty(STDIN_FILENO) == 1) {
+        sprops.stdin_encoding = sprops.encoding;
+    }
     if (isatty(STDOUT_FILENO) == 1) {
         sprops.stdout_encoding = sprops.encoding;
     }
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 275dd3795c5..9495faf81e5 100644
--- a/src/java.base/windows/native/libjava/java_props_md.c
+++ b/src/java.base/windows/native/libjava/java_props_md.c
@@ -634,7 +634,7 @@ GetJavaProperties(JNIEnv* env)
         LCID userDefaultUILCID = MAKELCID(userDefaultUILang, SORTIDFROMLCID(userDefaultLCID));
 
         {
-            HANDLE hStdOutErr;
+            HANDLE hStdHandle;
 
             // Windows UI Language selection list only cares "language"
             // information of the UI Language. For example, the list
@@ -677,14 +677,19 @@ GetJavaProperties(JNIEnv* env)
                 sprops.sun_jnu_encoding = "MS950_HKSCS";
             }
 
-            hStdOutErr = GetStdHandle(STD_OUTPUT_HANDLE);
-            if (hStdOutErr != INVALID_HANDLE_VALUE &&
-                GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
+            hStdHandle = GetStdHandle(STD_INPUT_HANDLE);
+            if (hStdHandle != INVALID_HANDLE_VALUE &&
+                GetFileType(hStdHandle) == FILE_TYPE_CHAR) {
+                sprops.stdin_encoding = getConsoleEncoding(FALSE);
+            }
+            hStdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
+            if (hStdHandle != INVALID_HANDLE_VALUE &&
+                GetFileType(hStdHandle) == FILE_TYPE_CHAR) {
                 sprops.stdout_encoding = getConsoleEncoding(TRUE);
             }
-            hStdOutErr = GetStdHandle(STD_ERROR_HANDLE);
-            if (hStdOutErr != INVALID_HANDLE_VALUE &&
-                GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
+            hStdHandle = GetStdHandle(STD_ERROR_HANDLE);
+            if (hStdHandle != INVALID_HANDLE_VALUE &&
+                GetFileType(hStdHandle) == FILE_TYPE_CHAR) {
                 if (sprops.stdout_encoding != NULL)
                     sprops.stderr_encoding = sprops.stdout_encoding;
                 else
diff --git a/test/jdk/java/lang/System/PropertyTest.java b/test/jdk/java/lang/System/PropertyTest.java
index ed89e36a8cd..09b0835fb6e 100644
--- a/test/jdk/java/lang/System/PropertyTest.java
+++ b/test/jdk/java/lang/System/PropertyTest.java
@@ -81,6 +81,7 @@ static Object[][] requiredProperties() {
                 {"java.runtime.version"},
                 {"java.runtime.name"},
                 {"native.encoding"},
+                {"stdin.encoding"},
                 {"stdout.encoding"},
                 {"stderr.encoding"},
         };

From ac05002cbeb014036ffbbcb17bb12d8d2102c7cd Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 25 Apr 2025 16:34:52 +0000
Subject: [PATCH 139/901] 8354877: DirectClassBuilder default flags should
 include ACC_SUPER

Reviewed-by: asotona
---
 .../jdk/internal/classfile/impl/DirectClassBuilder.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
index 6dc62511639..1e12969f204 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -42,7 +42,7 @@ public final class DirectClassBuilder
         implements ClassBuilder {
 
     /** The value of default class access flags */
-    static final int DEFAULT_CLASS_FLAGS = ClassFile.ACC_PUBLIC;
+    static final int DEFAULT_CLASS_FLAGS = ClassFile.ACC_PUBLIC | ClassFile.ACC_SUPER;
     static final Util.Writable[] EMPTY_WRITABLE_ARRAY = {};
     static final ClassEntry[] EMPTY_CLASS_ENTRY_ARRAY = {};
     final ClassEntry thisClassEntry;

From d8f012ea2a0514020434d5db6047e36941e9349b Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Fri, 25 Apr 2025 17:06:26 +0000
Subject: [PATCH 140/901] 8305186: Reference.waitForReferenceProcessing should
 be more accessible to tests

Reviewed-by: kbarrett
---
 test/lib/jdk/test/whitebox/WhiteBox.java | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index f0e164d94b5..bd68cf72cc3 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -24,7 +24,11 @@
 package jdk.test.whitebox;
 
 import java.lang.management.MemoryUsage;
+import java.lang.ref.Reference;
 import java.lang.reflect.Executable;
+import java.lang.reflect.InaccessibleObjectException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.BiFunction;
@@ -556,6 +560,53 @@ public void clearInlineCaches(boolean preserve_static_stubs) {
   // Force Full GC
   public native void fullGC();
 
+  // Infrastructure for waitForReferenceProcessing()
+  private static volatile Method waitForReferenceProcessingMethod = null;
+
+  private static Method getWaitForReferenceProcessingMethod() {
+    Method wfrp = waitForReferenceProcessingMethod;
+    if (wfrp == null) {
+      try {
+        wfrp = Reference.class.getDeclaredMethod("waitForReferenceProcessing");
+        wfrp.setAccessible(true);
+        assert wfrp.getReturnType() == Boolean.class;
+        Class<?>[] ev = wfrp.getExceptionTypes();
+        assert ev.length == 1;
+        assert ev[0] == InterruptedException.class;
+        waitForReferenceProcessingMethod = wfrp;
+      } catch (InaccessibleObjectException e) {
+        throw new RuntimeException("Need to add @modules java.base/java.lang.ref:open to test?", e);
+      } catch (NoSuchMethodException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    return wfrp;
+  }
+
+  /**
+   * Wait for reference processing, via Reference.waitForReferenceProcessing().
+   * Callers of this method will need the
+   * @modules java.base/java.lang.ref:open
+   * jtreg tag.
+   *
+   * This method should usually be called after a call to WhiteBox.fullGC().
+   */
+  public boolean waitForReferenceProcessing() throws InterruptedException {
+    try {
+      Method wfrp = getWaitForReferenceProcessingMethod();
+      return (Boolean) wfrp.invoke(null);
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException("Shouldn't happen, we call setAccessible()", e);
+    } catch (InvocationTargetException e) {
+      Throwable cause = e.getCause();
+      if (cause instanceof InterruptedException) {
+        throw (InterruptedException) cause;
+      } else {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
   // Returns true if the current GC supports concurrent collection control.
   public native boolean supportsConcurrentGCBreakpoints();
 

From 4b880299881c9413038d647123e3b658999c6f8f Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Fri, 25 Apr 2025 17:11:54 +0000
Subject: [PATCH 141/901] 8355439: Some hotspot/jtreg/serviceability/sa/* tests
 fail on static JDK due to explicit checks for shared libraries in process
 memory map

Reviewed-by: sspitsyn, cjplummer
---
 test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java   |  8 ++++++--
 .../serviceability/sa/sadebugd/PmapOnDebugdTest.java   | 10 ++++++++--
 .../sa/sadebugd/RunCommandOnServerTest.java            | 10 ++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
index 38e572329de..9999f08208e 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.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
@@ -74,7 +74,11 @@ public static void main(String[] args) throws Exception {
             if (!withCore && Platform.isOSX()) {
                 expStrMap.put("pmap", List.of("Not available for Mac OS X processes"));
             } else {
-                expStrMap.put("pmap", List.of("jvm", "java", "jli", "jimage"));
+                if (Platform.isStatic()) {
+                    expStrMap.put("pmap", List.of("java"));
+                } else {
+                    expStrMap.put("pmap", List.of("jvm", "java", "jli", "jimage"));
+                }
             }
 
             if (withCore) {
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java
index 82c874671f9..6c14e7823e4 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.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.
  * Copyright (c) 2021 NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,6 +23,7 @@
  */
 
 import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
 import jdk.test.lib.apps.LingeredApp;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.SA.SATestUtils;
@@ -65,7 +66,12 @@ public static void main(String[] args) throws Exception {
             System.err.println(out.getStderr());
 
             out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
-            out.shouldMatch("^0x[0-9a-f]+.+libjvm\\.so$"); // Find libjvm from output
+            if (Platform.isStatic()) {
+                out.shouldMatch("java"); // Find launcher
+                out.shouldNotMatch("^0x[0-9a-f]+.+libjvm\\.so$"); // No libjvm from output
+            } else {
+                out.shouldMatch("^0x[0-9a-f]+.+libjvm\\.so$"); // Find libjvm from output
+            }
             out.shouldHaveExitValue(0);
 
             // This will detect most SA failures, including during the attach.
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java
index 990a9667f3f..4ac5c452770 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.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.
  * Copyright (c) 2021 NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,6 +25,7 @@
 import java.io.PrintStream;
 
 import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
 import jdk.test.lib.apps.LingeredApp;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.SA.SATestUtils;
@@ -75,7 +76,12 @@ public static void main(String[] args) throws Exception {
             System.err.println(out.getStderr());
 
             out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
-            out.shouldMatch("^0x[0-9a-f]+: .+/libjvm\\.(so|dylib) \\+ 0x[0-9a-f]+$");
+            if (Platform.isStatic()) {
+                out.shouldMatch("java");
+                out.shouldNotMatch("^0x[0-9a-f]+: .+/libjvm\\.(so|dylib) \\+ 0x[0-9a-f]+$");
+            } else {
+                out.shouldMatch("^0x[0-9a-f]+: .+/libjvm\\.(so|dylib) \\+ 0x[0-9a-f]+$");
+            }
             out.shouldHaveExitValue(0);
 
             // This will detect most SA failures, including during the attach.

From 2785570f5620db08c0d31cd29839f92ffabd58b2 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Fri, 25 Apr 2025 20:12:45 +0000
Subject: [PATCH 142/901] 8355366: Fix the wrong usage of
 PassFailJFrame.forcePass() in some manual tests

Reviewed-by: honkar, aivanov, prr
---
 test/jdk/java/awt/Desktop/BrowseTest.java     | 19 +++++-----
 .../EditAndPrintTest/EditAndPrintTest.java    | 35 ++++++++++---------
 test/jdk/java/awt/Desktop/OpenTest.java       | 21 +++++------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/test/jdk/java/awt/Desktop/BrowseTest.java b/test/jdk/java/awt/Desktop/BrowseTest.java
index 1bdccace3fc..33de1ecdca7 100644
--- a/test/jdk/java/awt/Desktop/BrowseTest.java
+++ b/test/jdk/java/awt/Desktop/BrowseTest.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
@@ -25,8 +25,8 @@
  * @test
  * @bug 6255196
  * @summary  Verifies the function of method browse(java.net.URI uri).
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual BrowseTest
  */
 
@@ -36,6 +36,8 @@
 import java.net.URI;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class BrowseTest extends JPanel {
     static final String INSTRUCTIONS = """
             This test could launch default file manager to open user's home
@@ -47,12 +49,6 @@ public class BrowseTest extends JPanel {
             """;
 
     public BrowseTest() {
-        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();
 
         URI dirURI = new File(System.getProperty("user.home")).toURI();
@@ -77,6 +73,11 @@ public BrowseTest() {
 
     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");
+        }
+
         PassFailJFrame.builder()
                 .title("Browser Test")
                 .splitUI(BrowseTest::new)
diff --git a/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java b/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java
index 3f161f7fcaf..b2d7ef28df1 100644
--- a/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java
+++ b/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.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
@@ -27,8 +27,8 @@
  * @bug 6255196
  * @summary  Verifies the function of methods edit(java.io.File file) and
  *           print(java.io.File file)
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual EditAndPrintTest
  */
 
@@ -40,6 +40,8 @@
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class EditAndPrintTest extends JPanel {
 
     static final String INSTRUCTIONS = """
@@ -49,20 +51,9 @@ public class EditAndPrintTest extends JPanel {
             If you see any EXCEPTION messages in the output press FAIL.
             """;
 
-    public EditAndPrintTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Further testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
-        Desktop desktop = Desktop.getDesktop();
-
-        if (!desktop.isSupported(Action.PRINT) && !desktop.isSupported(Action.EDIT)) {
-            PassFailJFrame.log("Neither EDIT nor PRINT actions are supported. Nothing to test.");
-            PassFailJFrame.forcePass();
-        }
+    static Desktop desktop;
 
+    public EditAndPrintTest() {
         /*
          * Part 1: print or edit a directory, which should throw an IOException.
          */
@@ -111,7 +102,7 @@ public EditAndPrintTest() {
             writer.write("This is a temp file used to test print() method of Desktop.");
             writer.flush();
             writer.close();
-        } catch (java.io.IOException ioe){
+        } catch (IOException ioe){
             PassFailJFrame.log("EXCEPTION: " + ioe.getMessage());
             PassFailJFrame.forceFail("Failed to create temp file for testing.");
         }
@@ -139,6 +130,16 @@ public EditAndPrintTest() {
 
     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");
+        }
+
+        desktop = Desktop.getDesktop();
+        if (!desktop.isSupported(Action.PRINT) && !desktop.isSupported(Action.EDIT)) {
+            throw new SkippedException("Neither EDIT nor PRINT actions are supported. Nothing to test.");
+        }
+
         PassFailJFrame.builder()
                 .title("Edit and Print test")
                 .splitUI(EditAndPrintTest::new)
diff --git a/test/jdk/java/awt/Desktop/OpenTest.java b/test/jdk/java/awt/Desktop/OpenTest.java
index 1ed29067d50..c5f2a6939e4 100644
--- a/test/jdk/java/awt/Desktop/OpenTest.java
+++ b/test/jdk/java/awt/Desktop/OpenTest.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
@@ -25,8 +25,8 @@
  * @test
  * @bug 6255196
  * @summary Verifies the function of method open(java.io.File file).
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual/othervm OpenTest
  */
 
@@ -36,6 +36,8 @@
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class OpenTest extends JPanel {
 
     static final String INSTRUCTIONS = """
@@ -48,12 +50,6 @@ public class OpenTest extends JPanel {
             """;
 
     public OpenTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Further testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
         Desktop desktop = Desktop.getDesktop();
 
         /*
@@ -85,7 +81,7 @@ public OpenTest() {
             testFile = File.createTempFile("JDIC-test", ".txt",
                     new File(System.getProperty("java.io.tmpdir")));
             testFile.deleteOnExit();
-        } catch (java.io.IOException ioe) {
+        } catch (IOException ioe) {
             PassFailJFrame.log("EXCEPTION: " + ioe.getMessage());
             PassFailJFrame.log("Failed to create test file");
         }
@@ -101,6 +97,11 @@ public OpenTest() {
 
     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");
+        }
+
         PassFailJFrame.builder()
                 .title("Mail Test")
                 .splitUI(OpenTest::new)

From 5db62abb4216a0618d6ea59d292828907572d542 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 25 Apr 2025 20:58:40 +0000
Subject: [PATCH 143/901] 8315719: Adapt AOTClassLinking test case for dynamic
 CDS archive

Reviewed-by: ccheung
---
 .../resolvedConstants/ResolvedConstants.java  | 90 ++++++++++++-------
 .../jdk/test/lib/cds/SimpleCDSAppTester.java  |  5 ++
 2 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java
index 7d3335b9db6..8fa86c3f56e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.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,8 +23,8 @@
  */
 
 /*
- * @test
- * @summary Dump time resolution of constant pool entries.
+ * @test id=static
+ * @summary Dump time resolution of constant pool entries (Static CDS archive).
  * @requires vm.cds
  * @requires vm.cds.supports.aot.class.linking
  * @requires vm.compMode != "Xcomp"
@@ -36,12 +36,32 @@
  *                 MyInterface InterfaceWithClinit NormalClass
  *                 OldProvider OldClass OldConsumer SubOfOldClass
  *                 StringConcatTest StringConcatTestOld
- * @run driver ResolvedConstants
+ * @run driver ResolvedConstants STATIC
+ */
+
+/*
+ * @test id=dynamic
+ * @summary Dump time resolution of constant pool entries (Dynamic CDS archive)
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.compMode != "Xcomp"
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes/
+ * @build OldProvider OldClass OldConsumer StringConcatTestOld
+ * @build ResolvedConstants
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 ResolvedConstantsApp ResolvedConstantsFoo ResolvedConstantsBar
+ *                 MyInterface InterfaceWithClinit NormalClass
+ *                 OldProvider OldClass OldConsumer SubOfOldClass
+ *                 StringConcatTest StringConcatTestOld
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Dcds.app.tester.workflow=DYNAMIC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. ResolvedConstants DYNAMIC
  */
 
 import java.util.function.Consumer;
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.cds.SimpleCDSAppTester;
 import jdk.test.lib.helpers.ClassFileInstaller;
 import jdk.test.lib.process.OutputAnalyzer;
 
@@ -52,33 +72,32 @@ public class ResolvedConstants {
 
     static boolean aotClassLinking;
     public static void main(String[] args) throws Exception {
-        test(false);
-        test(true);
+        test(args, false);
+        test(args, true);
     }
 
-    static void test(boolean testMode) throws Exception {
+    static void test(String[] args, boolean testMode) throws Exception {
         aotClassLinking = testMode;
-        CDSTestUtils.dumpClassList(classList, "-cp", appJar, mainClass)
-            .assertNormalExit(output -> {
-                output.shouldContain("Hello ResolvedConstantsApp");
-            });
-
-        CDSOptions opts = (new CDSOptions())
-            .addPrefix("-XX:ExtraSharedClassListFile=" + classList,
-                       "-cp", appJar,
-                       "-Xlog:cds+resolve=trace",
-                       "-Xlog:cds+class=debug");
-        if (aotClassLinking) {
-            opts.addPrefix("-XX:+AOTClassLinking");
-        } else {
-            opts.addPrefix("-XX:-AOTClassLinking");
-        }
 
-        OutputAnalyzer out = CDSTestUtils.createArchiveAndCheck(opts);
-          // Class References ---
+        SimpleCDSAppTester.of("ResolvedConstantsApp" + (aotClassLinking ? "1" : "0"))
+            .addVmArgs(aotClassLinking ? "-XX:+AOTClassLinking" : "-XX:-AOTClassLinking",
+                       "-Xlog:cds+resolve=trace",
+                       "-Xlog:cds+class=debug")
+            .classpath(appJar)
+            .appCommandLine(mainClass)
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    checkAssemblyOutput(args, out);
+                })
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Hello ResolvedConstantsApp");
+                })
+            .run(args);
+    }
 
+    static void checkAssemblyOutput(String args[], OutputAnalyzer out) {
+        testGroup("Class References", out)
             // Always resolve reference when a class references itself
-        out.shouldMatch(ALWAYS("klass.* ResolvedConstantsApp app => ResolvedConstantsApp app"))
+            .shouldMatch(ALWAYS("klass.* ResolvedConstantsApp app => ResolvedConstantsApp app"))
 
             // Always resolve reference when a class references a super class
             .shouldMatch(ALWAYS("klass.* ResolvedConstantsApp app => java/lang/Object boot"))
@@ -92,10 +111,9 @@ static void test(boolean testMode) throws Exception {
             //   Even though System is in the vmClasses list, when ResolvedConstantsApp looks up
             //   "java/lang/System" in its ConstantPool, the app loader may not have resolved the System
             //   class yet (i.e., there's no initiaited class entry for System in the app loader's dictionary)
-            .shouldMatch(AOTLINK_ONLY("klass.* ResolvedConstantsApp .*java/lang/System"))
-
-          // Field References ---
+            .shouldMatch(AOTLINK_ONLY("klass.* ResolvedConstantsApp .*java/lang/System"));
 
+        testGroup("Field References", out)
             // Always resolve references to fields in the current class or super class(es)
             .shouldMatch(ALWAYS("field.* ResolvedConstantsBar => ResolvedConstantsBar.b:I"))
             .shouldMatch(ALWAYS("field.* ResolvedConstantsBar => ResolvedConstantsBar.a:I"))
@@ -108,10 +126,14 @@ static void test(boolean testMode) throws Exception {
 
             // Resolve field references to unrelated classes ONLY when using -XX:+AOTClassLinking
             .shouldMatch(AOTLINK_ONLY("field.* ResolvedConstantsApp => ResolvedConstantsBar.a:I"))
-            .shouldMatch(AOTLINK_ONLY("field.* ResolvedConstantsApp => ResolvedConstantsBar.b:I"))
+            .shouldMatch(AOTLINK_ONLY("field.* ResolvedConstantsApp => ResolvedConstantsBar.b:I"));
 
-          // Method References ---
+        if (args[0].equals("DYNAMIC")) {
+            // AOT resolution of CP methods/indy references is not implemeted
+            return;
+        }
 
+        testGroup("Method References", out)
             // Should resolve references to own constructor
             .shouldMatch(ALWAYS("method.* ResolvedConstantsApp ResolvedConstantsApp.<init>:"))
             // Should resolve references to super constructor
@@ -148,7 +170,8 @@ static void test(boolean testMode) throws Exception {
 
         // Indy References ---
         if (aotClassLinking) {
-            out.shouldContain("Cannot aot-resolve Lambda proxy because OldConsumer is excluded")
+            testGroup("Indy References", out)
+               .shouldContain("Cannot aot-resolve Lambda proxy because OldConsumer is excluded")
                .shouldContain("Cannot aot-resolve Lambda proxy because OldProvider is excluded")
                .shouldContain("Cannot aot-resolve Lambda proxy because OldClass is excluded")
                .shouldContain("Cannot aot-resolve Lambda proxy of interface type InterfaceWithClinit")
@@ -170,6 +193,11 @@ static String AOTLINK_ONLY(String s) {
             return "cds,resolve.*reverted " + s;
         }
     }
+
+    static OutputAnalyzer testGroup(String name, OutputAnalyzer out) {
+        System.out.println("Checking for: " + name);
+        return out;
+    }
 }
 
 class ResolvedConstantsApp implements Runnable {
diff --git a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
index 16666676a2f..7ab28ebb369 100644
--- a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
@@ -173,4 +173,9 @@ public SimpleCDSAppTester runAOTWorkflow() throws Exception {
         (new Tester(name)).runAOTWorkflow();
         return this;
     }
+
+    public SimpleCDSAppTester run(String args[])  throws Exception {
+        (new Tester(name)).run(args);
+        return this;
+    }
 }

From e57fd710496b2ac8aa93eb3d4ff2234170fa2e37 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 25 Apr 2025 21:22:37 +0000
Subject: [PATCH 144/901] 8353786: Migrate Vector API math library support to
 FFM API

Reviewed-by: jbhateja, kvn, psandoz, xgong, jvernee, mli
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   4 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  75 ----
 .../cpu/aarch64/vm_version_aarch64.cpp        |   9 +-
 src/hotspot/cpu/arm/vm_version_arm_32.cpp     |   4 +-
 src/hotspot/cpu/ppc/vm_version_ppc.cpp        |   6 +-
 src/hotspot/cpu/riscv/riscv.ad                |   4 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  54 ---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |   2 +-
 src/hotspot/cpu/s390/vm_version_s390.cpp      |  32 +-
 src/hotspot/cpu/s390/vm_version_s390.hpp      |   2 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  64 ----
 src/hotspot/cpu/x86/vm_version_x86.cpp        |  12 +-
 src/hotspot/cpu/x86/x86_64.ad                 |   7 +-
 src/hotspot/cpu/zero/vm_version_zero.cpp      |   2 +-
 .../linux_riscv/vm_version_linux_riscv.cpp    |   7 +-
 src/hotspot/share/ci/ciInstance.cpp           |   6 +
 src/hotspot/share/ci/ciInstance.hpp           |   1 +
 src/hotspot/share/classfile/modules.cpp       |   4 -
 src/hotspot/share/classfile/vmIntrinsics.hpp  |  26 +-
 src/hotspot/share/jvmci/jvmci_globals.cpp     |   3 +-
 src/hotspot/share/jvmci/jvmci_globals.hpp     |   4 +-
 src/hotspot/share/opto/c2_globals.hpp         |   3 -
 src/hotspot/share/opto/c2compiler.cpp         |   3 +
 src/hotspot/share/opto/library_call.cpp       |   4 +
 src/hotspot/share/opto/library_call.hpp       |   1 +
 src/hotspot/share/opto/vectorIntrinsics.cpp   | 233 +++++++------
 src/hotspot/share/prims/vectorSupport.cpp     |  56 +--
 src/hotspot/share/prims/vectorSupport.hpp     |  26 --
 src/hotspot/share/prims/whitebox.cpp          |   2 +-
 .../share/runtime/abstract_vm_version.cpp     |  14 +
 .../share/runtime/abstract_vm_version.hpp     |   6 +
 src/hotspot/share/runtime/arguments.cpp       |   5 -
 src/hotspot/share/runtime/os.cpp              |   2 +-
 src/hotspot/share/runtime/stubRoutines.cpp    |   2 -
 src/hotspot/share/runtime/stubRoutines.hpp    |   4 -
 src/hotspot/share/runtime/vmStructs.cpp       |   1 +
 .../classes/jdk/internal/vm/vector/Utils.java |  49 +++
 .../jdk/internal/vm/vector/VectorSupport.java |  50 ++-
 src/java.base/share/classes/module-info.java  |   1 +
 .../jdk/incubator/vector/ByteVector.java      |   7 +-
 .../jdk/incubator/vector/CPUFeatures.java     |  83 +++++
 .../jdk/incubator/vector/DoubleVector.java    |  27 ++
 .../jdk/incubator/vector/FloatVector.java     |  27 ++
 .../jdk/incubator/vector/IntVector.java       |   7 +-
 .../jdk/incubator/vector/LongVector.java      |   7 +-
 .../jdk/incubator/vector/ShortVector.java     |   7 +-
 .../classes/jdk/incubator/vector/Util.java    |  33 ++
 .../incubator/vector/VectorMathLibrary.java   | 323 ++++++++++++++++++
 .../jdk/incubator/vector/VectorOperators.java |  41 +--
 .../incubator/vector/X-Vector.java.template   |  43 ++-
 50 files changed, 920 insertions(+), 475 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/vm/vector/Utils.java
 create mode 100644 src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
 create mode 100644 src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Util.java
 create mode 100644 src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 3d25e97c0c5..c11c960911f 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -2306,11 +2306,11 @@ const RegMask* Matcher::predicate_reg_mask(void) {
 }
 
 bool Matcher::supports_vector_calling_convention(void) {
-  return EnableVectorSupport && UseVectorStubs;
+  return EnableVectorSupport;
 }
 
 OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
-  assert(EnableVectorSupport && UseVectorStubs, "sanity");
+  assert(EnableVectorSupport, "sanity");
   int lo = V0_num;
   int hi = V0_H_num;
   if (ideal_reg == Op_VecX || ideal_reg == Op_VecA) {
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index a6cc757f6a0..f5567dcc03a 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -11166,79 +11166,6 @@ class StubGenerator: public StubCodeGenerator {
     // }
   };
 
-  void generate_vector_math_stubs() {
-    // Get native vector math stub routine addresses
-    void* libsleef = nullptr;
-    char ebuf[1024];
-    char dll_name[JVM_MAXPATHLEN];
-    if (os::dll_locate_lib(dll_name, sizeof(dll_name), Arguments::get_dll_dir(), "sleef")) {
-      libsleef = os::dll_load(dll_name, ebuf, sizeof ebuf);
-    }
-    if (libsleef == nullptr) {
-      log_info(library)("Failed to load native vector math library, %s!", ebuf);
-      return;
-    }
-    // Method naming convention
-    //   All the methods are named as <OP><T><N>_<U><suffix>
-    //   Where:
-    //     <OP>     is the operation name, e.g. sin
-    //     <T>      is optional to indicate float/double
-    //              "f/d" for vector float/double operation
-    //     <N>      is the number of elements in the vector
-    //              "2/4" for neon, and "x" for sve
-    //     <U>      is the precision level
-    //              "u10/u05" represents 1.0/0.5 ULP error bounds
-    //               We use "u10" for all operations by default
-    //               But for those functions do not have u10 support, we use "u05" instead
-    //     <suffix> indicates neon/sve
-    //              "sve/advsimd" for sve/neon implementations
-    //     e.g. sinfx_u10sve is the method for computing vector float sin using SVE instructions
-    //          cosd2_u10advsimd is the method for computing 2 elements vector double cos using NEON instructions
-    //
-    log_info(library)("Loaded library %s, handle " INTPTR_FORMAT, JNI_LIB_PREFIX "sleef" JNI_LIB_SUFFIX, p2i(libsleef));
-
-    // Math vector stubs implemented with SVE for scalable vector size.
-    if (UseSVE > 0) {
-      for (int op = 0; op < VectorSupport::NUM_VECTOR_OP_MATH; op++) {
-        int vop = VectorSupport::VECTOR_OP_MATH_START + op;
-        // Skip "tanh" because there is performance regression
-        if (vop == VectorSupport::VECTOR_OP_TANH) {
-          continue;
-        }
-
-        // The native library does not support u10 level of "hypot".
-        const char* ulf = (vop == VectorSupport::VECTOR_OP_HYPOT) ? "u05" : "u10";
-
-        snprintf(ebuf, sizeof(ebuf), "%sfx_%ssve", VectorSupport::mathname[op], ulf);
-        StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_SCALABLE][op] = (address)os::dll_lookup(libsleef, ebuf);
-
-        snprintf(ebuf, sizeof(ebuf), "%sdx_%ssve", VectorSupport::mathname[op], ulf);
-        StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_SCALABLE][op] = (address)os::dll_lookup(libsleef, ebuf);
-      }
-    }
-
-    // Math vector stubs implemented with NEON for 64/128 bits vector size.
-    for (int op = 0; op < VectorSupport::NUM_VECTOR_OP_MATH; op++) {
-      int vop = VectorSupport::VECTOR_OP_MATH_START + op;
-      // Skip "tanh" because there is performance regression
-      if (vop == VectorSupport::VECTOR_OP_TANH) {
-        continue;
-      }
-
-      // The native library does not support u10 level of "hypot".
-      const char* ulf = (vop == VectorSupport::VECTOR_OP_HYPOT) ? "u05" : "u10";
-
-      snprintf(ebuf, sizeof(ebuf), "%sf4_%sadvsimd", VectorSupport::mathname[op], ulf);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_64][op] = (address)os::dll_lookup(libsleef, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "%sf4_%sadvsimd", VectorSupport::mathname[op], ulf);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_128][op] = (address)os::dll_lookup(libsleef, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "%sd2_%sadvsimd", VectorSupport::mathname[op], ulf);
-      StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_128][op] = (address)os::dll_lookup(libsleef, ebuf);
-    }
-  }
-
   // Initialization
   void generate_initial_stubs() {
     // Generate initial stubs and initializes the entry points
@@ -11392,8 +11319,6 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_montgomerySquare = g.generate_multiply();
     }
 
-    generate_vector_math_stubs();
-
 #endif // COMPILER2
 
     if (UseChaCha20Intrinsics) {
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index b2d34553487..6ed7a6be585 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -642,6 +642,7 @@ void VM_Version::initialize() {
   if (_model2) {
     os::snprintf_checked(buf + buf_used_len, sizeof(buf) - buf_used_len, "(0x%03x)", _model2);
   }
+  size_t features_offset = strnlen(buf, sizeof(buf));
 #define ADD_FEATURE_IF_SUPPORTED(id, name, bit)                 \
   do {                                                          \
     if (VM_Version::supports_##name()) strcat(buf, ", " #name); \
@@ -649,7 +650,11 @@ void VM_Version::initialize() {
   CPU_FEATURE_FLAGS(ADD_FEATURE_IF_SUPPORTED)
 #undef ADD_FEATURE_IF_SUPPORTED
 
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
+
+  _features_string = extract_features_string(_cpu_info_string,
+                                             strnlen(_cpu_info_string, sizeof(buf)),
+                                             features_offset);
 }
 
 #if defined(LINUX)
@@ -716,7 +721,7 @@ void VM_Version::initialize_cpu_information(void) {
   int desc_len = snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "AArch64 ");
   get_compatible_board(_cpu_desc + desc_len, CPU_DETAILED_DESC_BUF_SIZE - desc_len);
   desc_len = (int)strlen(_cpu_desc);
-  snprintf(_cpu_desc + desc_len, CPU_DETAILED_DESC_BUF_SIZE - desc_len, " %s", _features_string);
+  snprintf(_cpu_desc + desc_len, CPU_DETAILED_DESC_BUF_SIZE - desc_len, " %s", _cpu_info_string);
 
   _initialized = true;
 }
diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
index 148786a55da..d0941936035 100644
--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp
+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
@@ -295,7 +295,7 @@ void VM_Version::initialize() {
                (has_multiprocessing_extensions() ? ", mp_ext" : ""));
 
   // buf is started with ", " or is empty
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
 
   if (has_simd()) {
     if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
@@ -363,6 +363,6 @@ void VM_Version::initialize_cpu_information(void) {
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "ARM%d", _arm_arch);
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _features_string);
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _cpu_info_string);
   _initialized = true;
 }
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 8ec69bffe15..3cb0bf9bf72 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -219,7 +219,7 @@ void VM_Version::initialize() {
                (has_brw()     ? " brw"     : "")
                // Make sure number of %s matches num_features!
               );
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
   if (Verbose) {
     print_features();
   }
@@ -519,7 +519,7 @@ void VM_Version::print_platform_virtualization_info(outputStream* st) {
 }
 
 void VM_Version::print_features() {
-  tty->print_cr("Version: %s L1_data_cache_line_size=%d", features_string(), L1_data_cache_line_size());
+  tty->print_cr("Version: %s L1_data_cache_line_size=%d", cpu_info_string(), L1_data_cache_line_size());
 
   if (Verbose) {
     if (ContendedPaddingWidth > 0) {
@@ -726,6 +726,6 @@ void VM_Version::initialize_cpu_information(void) {
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE, "PowerPC POWER%lu", PowerArchitecturePPC64);
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "PPC %s", features_string());
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "PPC %s", cpu_info_string());
   _initialized = true;
 }
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 2e9d25c8156..83c16ce5d82 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1950,11 +1950,11 @@ const RegMask* Matcher::predicate_reg_mask(void) {
 
 // Vector calling convention not yet implemented.
 bool Matcher::supports_vector_calling_convention(void) {
-  return EnableVectorSupport && UseVectorStubs;
+  return EnableVectorSupport;
 }
 
 OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
-  assert(EnableVectorSupport && UseVectorStubs, "sanity");
+  assert(EnableVectorSupport, "sanity");
   assert(ideal_reg == Op_VecA, "sanity");
   // check more info at https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/master/riscv-cc.adoc
   int lo = V8_num;
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 4527a32926f..fb4539267ae 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -6458,58 +6458,6 @@ static const int64_t right_3_bits = right_n_bits(3);
     return start;
   }
 
-  void generate_vector_math_stubs() {
-    if (!UseRVV) {
-      log_info(library)("vector is not supported, skip loading vector math (sleef) library!");
-      return;
-    }
-
-    // Get native vector math stub routine addresses
-    void* libsleef = nullptr;
-    char ebuf[1024];
-    char dll_name[JVM_MAXPATHLEN];
-    if (os::dll_locate_lib(dll_name, sizeof(dll_name), Arguments::get_dll_dir(), "sleef")) {
-      libsleef = os::dll_load(dll_name, ebuf, sizeof ebuf);
-    }
-    if (libsleef == nullptr) {
-      log_info(library)("Failed to load native vector math (sleef) library, %s!", ebuf);
-      return;
-    }
-
-    // Method naming convention
-    //   All the methods are named as <OP><T>_<U><suffix>
-    //
-    //   Where:
-    //     <OP>     is the operation name, e.g. sin, cos
-    //     <T>      is to indicate float/double
-    //              "fx/dx" for vector float/double operation
-    //     <U>      is the precision level
-    //              "u10/u05" represents 1.0/0.5 ULP error bounds
-    //               We use "u10" for all operations by default
-    //               But for those functions do not have u10 support, we use "u05" instead
-    //     <suffix> rvv, indicates riscv vector extension
-    //
-    //   e.g. sinfx_u10rvv is the method for computing vector float sin using rvv instructions
-    //
-    log_info(library)("Loaded library %s, handle " INTPTR_FORMAT, JNI_LIB_PREFIX "sleef" JNI_LIB_SUFFIX, p2i(libsleef));
-
-    for (int op = 0; op < VectorSupport::NUM_VECTOR_OP_MATH; op++) {
-      int vop = VectorSupport::VECTOR_OP_MATH_START + op;
-      if (vop == VectorSupport::VECTOR_OP_TANH) { // skip tanh because of performance regression
-        continue;
-      }
-
-      // The native library does not support u10 level of "hypot".
-      const char* ulf = (vop == VectorSupport::VECTOR_OP_HYPOT) ? "u05" : "u10";
-
-      snprintf(ebuf, sizeof(ebuf), "%sfx_%srvv", VectorSupport::mathname[op], ulf);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_SCALABLE][op] = (address)os::dll_lookup(libsleef, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "%sdx_%srvv", VectorSupport::mathname[op], ulf);
-      StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_SCALABLE][op] = (address)os::dll_lookup(libsleef, ebuf);
-    }
-  }
-
 #endif // COMPILER2
 
   /**
@@ -6741,8 +6689,6 @@ static const int64_t right_3_bits = right_n_bits(3);
 
     generate_string_indexof_stubs();
 
-    generate_vector_math_stubs();
-
 #endif // COMPILER2
   }
 
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 8dcffc9c646..28c32ed33c8 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -468,7 +468,7 @@ void VM_Version::initialize_cpu_information(void) {
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "RISCV64");
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "RISCV64 %s", features_string());
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "RISCV64 %s", cpu_info_string());
   _initialized = true;
 }
 
diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index 157b945e6e1..8261fbd083a 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -90,7 +90,7 @@ static const char* z_features[] = {"  ",
 
 void VM_Version::initialize() {
   determine_features();      // Get processor capabilities.
-  set_features_string();     // Set a descriptive feature indication.
+  set_cpu_info_string();     // Set a descriptive feature indication.
 
   if (Verbose || PrintAssembly || PrintStubCode) {
     print_features_internal("CPU Version as detected internally:", PrintAssembly || PrintStubCode);
@@ -388,9 +388,9 @@ int VM_Version::get_model_index() {
 }
 
 
-void VM_Version::set_features_string() {
-  // A note on the _features_string format:
-  //   There are jtreg tests checking the _features_string for various properties.
+void VM_Version::set_cpu_info_string() {
+  // A note on the _cpu_info_string format:
+  //   There are jtreg tests checking the _cpu_info_string for various properties.
   //   For some strange reason, these tests require the string to contain
   //   only _lowercase_ characters. Keep that in mind when being surprised
   //   about the unusual notation of features - and when adding new ones.
@@ -412,29 +412,29 @@ void VM_Version::set_features_string() {
     _model_string = "unknown model";
     strcpy(buf, "z/Architecture (ambiguous detection)");
   }
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
 
   if (has_Crypto_AES()) {
-    assert(strlen(_features_string) + 3*8 < sizeof(buf), "increase buffer size");
+    assert(strlen(_cpu_info_string) + 3*8 < sizeof(buf), "increase buffer size");
     jio_snprintf(buf, sizeof(buf), "%s%s%s%s",
-                 _features_string,
+                 _cpu_info_string,
                  has_Crypto_AES128() ? ", aes128" : "",
                  has_Crypto_AES192() ? ", aes192" : "",
                  has_Crypto_AES256() ? ", aes256" : "");
-    os::free((void *)_features_string);
-    _features_string = os::strdup(buf);
+    os::free((void *)_cpu_info_string);
+    _cpu_info_string = os::strdup(buf);
   }
 
   if (has_Crypto_SHA()) {
-    assert(strlen(_features_string) + 6 + 2*8 + 7 < sizeof(buf), "increase buffer size");
+    assert(strlen(_cpu_info_string) + 6 + 2*8 + 7 < sizeof(buf), "increase buffer size");
     jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s",
-                 _features_string,
+                 _cpu_info_string,
                  has_Crypto_SHA1()   ? ", sha1"   : "",
                  has_Crypto_SHA256() ? ", sha256" : "",
                  has_Crypto_SHA512() ? ", sha512" : "",
                  has_Crypto_GHASH()  ? ", ghash"  : "");
-    os::free((void *)_features_string);
-    _features_string = os::strdup(buf);
+    os::free((void *)_cpu_info_string);
+    _cpu_info_string = os::strdup(buf);
   }
 }
 
@@ -464,7 +464,7 @@ bool VM_Version::test_feature_bit(unsigned long* featureBuffer, int featureNum,
 }
 
 void VM_Version::print_features_internal(const char* text, bool print_anyway) {
-  tty->print_cr("%s %s", text, features_string());
+  tty->print_cr("%s %s", text, cpu_info_string());
   tty->cr();
 
   if (Verbose || print_anyway) {
@@ -906,7 +906,7 @@ void VM_Version::set_features_from(const char* march) {
       err = true;
     }
     if (!err) {
-      set_features_string();
+      set_cpu_info_string();
       if (prt || PrintAssembly) {
         print_features_internal("CPU Version as set by cmdline option:", prt);
       }
@@ -1542,6 +1542,6 @@ void VM_Version::initialize_cpu_information(void) {
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE, "s390 %s", VM_Version::get_model_string());
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "s390 %s", features_string());
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "s390 %s", cpu_info_string());
   _initialized = true;
 }
diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp
index 49e6f5686f6..6c6eb76bf7b 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp
@@ -148,7 +148,7 @@ class VM_Version: public Abstract_VM_Version {
 
   static bool test_feature_bit(unsigned long* featureBuffer, int featureNum, unsigned int bufLen);
   static int  get_model_index();
-  static void set_features_string();
+  static void set_cpu_info_string();
   static void print_features_internal(const char* text, bool print_anyway=false);
   static void determine_features();
   static long call_getFeatures(unsigned long* buffer, int buflen, int functionCode);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index b88a2bd1f8e..1a16416787d 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4333,70 +4333,6 @@ void StubGenerator::generate_compiler_stubs() {
     }
   }
 
-  // Get svml stub routine addresses
-  void *libjsvml = nullptr;
-  char ebuf[1024];
-  char dll_name[JVM_MAXPATHLEN];
-  if (os::dll_locate_lib(dll_name, sizeof(dll_name), Arguments::get_dll_dir(), "jsvml")) {
-    libjsvml = os::dll_load(dll_name, ebuf, sizeof ebuf);
-  }
-  if (libjsvml != nullptr) {
-    // SVML method naming convention
-    //   All the methods are named as __jsvml_op<T><N>_ha_<VV>
-    //   Where:
-    //      ha stands for high accuracy
-    //      <T> is optional to indicate float/double
-    //              Set to f for vector float operation
-    //              Omitted for vector double operation
-    //      <N> is the number of elements in the vector
-    //              1, 2, 4, 8, 16
-    //              e.g. 128 bit float vector has 4 float elements
-    //      <VV> indicates the avx/sse level:
-    //              z0 is AVX512, l9 is AVX2, e9 is AVX1 and ex is for SSE2
-    //      e.g. __jsvml_expf16_ha_z0 is the method for computing 16 element vector float exp using AVX 512 insns
-    //           __jsvml_exp8_ha_z0 is the method for computing 8 element vector double exp using AVX 512 insns
-
-    log_info(library)("Loaded library %s, handle " INTPTR_FORMAT, JNI_LIB_PREFIX "jsvml" JNI_LIB_SUFFIX, p2i(libjsvml));
-    if (UseAVX > 2) {
-      for (int op = 0; op < VectorSupport::NUM_VECTOR_OP_MATH; op++) {
-        int vop = VectorSupport::VECTOR_OP_MATH_START + op;
-        if ((!VM_Version::supports_avx512dq()) &&
-            (vop == VectorSupport::VECTOR_OP_LOG || vop == VectorSupport::VECTOR_OP_LOG10 || vop == VectorSupport::VECTOR_OP_POW)) {
-          continue;
-        }
-        snprintf(ebuf, sizeof(ebuf), "__jsvml_%sf16_ha_z0", VectorSupport::mathname[op]);
-        StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_512][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-        snprintf(ebuf, sizeof(ebuf), "__jsvml_%s8_ha_z0", VectorSupport::mathname[op]);
-        StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_512][op] = (address)os::dll_lookup(libjsvml, ebuf);
-      }
-    }
-    const char* avx_sse_str = (UseAVX >= 2) ? "l9" : ((UseAVX == 1) ? "e9" : "ex");
-    for (int op = 0; op < VectorSupport::NUM_VECTOR_OP_MATH; op++) {
-      int vop = VectorSupport::VECTOR_OP_MATH_START + op;
-      if (vop == VectorSupport::VECTOR_OP_POW) {
-        continue;
-      }
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%sf4_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_64][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%sf4_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_128][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%sf8_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_256][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%s1_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_64][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%s2_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_128][op] = (address)os::dll_lookup(libjsvml, ebuf);
-
-      snprintf(ebuf, sizeof(ebuf), "__jsvml_%s4_ha_%s", VectorSupport::mathname[op], avx_sse_str);
-      StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_256][op] = (address)os::dll_lookup(libjsvml, ebuf);
-    }
-  }
-
 #endif // COMPILER2
 #endif // COMPILER2_OR_JVMCI
 }
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 4687edb13a3..5306f0becef 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1080,15 +1080,19 @@ void VM_Version::get_processor_features() {
   }
 
   char buf[1024];
-  int res = jio_snprintf(
+  int cpu_info_size = jio_snprintf(
               buf, sizeof(buf),
               "(%u cores per cpu, %u threads per core) family %d model %d stepping %d microcode 0x%x",
               cores_per_cpu(), threads_per_core(),
               cpu_family(), _model, _stepping, os::cpu_microcode_revision());
-  assert(res > 0, "not enough temporary space allocated");
-  insert_features_names(buf + res, sizeof(buf) - res, _features_names);
+  assert(cpu_info_size > 0, "not enough temporary space allocated");
+  insert_features_names(buf + cpu_info_size, sizeof(buf) - cpu_info_size, _features_names);
 
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
+
+  _features_string = extract_features_string(_cpu_info_string,
+                                             strnlen(_cpu_info_string, sizeof(buf)),
+                                             cpu_info_size);
 
   // Use AES instructions if available.
   if (supports_aes()) {
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index dc79108c6f8..954a53307c2 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1596,14 +1596,11 @@ uint MachUEPNode::size(PhaseRegAlloc* ra_) const
 //=============================================================================
 
 bool Matcher::supports_vector_calling_convention(void) {
-  if (EnableVectorSupport && UseVectorStubs) {
-    return true;
-  }
-  return false;
+  return EnableVectorSupport;
 }
 
 OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
-  assert(EnableVectorSupport && UseVectorStubs, "sanity");
+  assert(EnableVectorSupport, "sanity");
   int lo = XMM0_num;
   int hi = XMM0b_num;
   if (ideal_reg == Op_VecX) hi = XMM0d_num;
diff --git a/src/hotspot/cpu/zero/vm_version_zero.cpp b/src/hotspot/cpu/zero/vm_version_zero.cpp
index e38561e19c5..3ce9227c193 100644
--- a/src/hotspot/cpu/zero/vm_version_zero.cpp
+++ b/src/hotspot/cpu/zero/vm_version_zero.cpp
@@ -151,6 +151,6 @@ void VM_Version::initialize_cpu_information(void) {
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "Zero VM");
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _features_string);
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _cpu_info_string);
   _initialized = true;
 }
diff --git a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
index b6095c279cb..506c78cacca 100644
--- a/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/vm_version_linux_riscv.cpp
@@ -129,6 +129,9 @@ void VM_Version::setup_cpu_available_features() {
     snprintf(buf, sizeof(buf)/2, "%s ", uarch);
   }
   os::free((void*) uarch);
+
+  int features_offset = strnlen(buf, sizeof(buf));
+
   strcat(buf, "rv64");
   int i = 0;
   while (_feature_list[i] != nullptr) {
@@ -191,7 +194,9 @@ void VM_Version::setup_cpu_available_features() {
     }
   }
 
-  _features_string = os::strdup(buf);
+  _cpu_info_string = os::strdup(buf);
+
+  _features_string = _cpu_info_string + features_offset;
 }
 
 void VM_Version::os_aux_features() {
diff --git a/src/hotspot/share/ci/ciInstance.cpp b/src/hotspot/share/ci/ciInstance.cpp
index ad456ba6726..9591298e3ab 100644
--- a/src/hotspot/share/ci/ciInstance.cpp
+++ b/src/hotspot/share/ci/ciInstance.cpp
@@ -138,3 +138,9 @@ ciKlass* ciInstance::java_lang_Class_klass() {
   assert(java_lang_Class::as_Klass(get_oop()) != nullptr, "klass is null");
   return CURRENT_ENV->get_metadata(java_lang_Class::as_Klass(get_oop()))->as_klass();
 }
+
+char* ciInstance::java_lang_String_str(char* buf, size_t buflen) {
+  VM_ENTRY_MARK;
+  assert(get_oop()->is_a(vmClasses::String_klass()), "not a String");
+  return java_lang_String::as_utf8_string(get_oop(), buf, buflen);
+}
diff --git a/src/hotspot/share/ci/ciInstance.hpp b/src/hotspot/share/ci/ciInstance.hpp
index 3af07edcd9e..1fb09985930 100644
--- a/src/hotspot/share/ci/ciInstance.hpp
+++ b/src/hotspot/share/ci/ciInstance.hpp
@@ -67,6 +67,7 @@ class ciInstance : public ciObject {
   ciConstant field_value_by_offset(int field_offset);
 
   ciKlass* java_lang_Class_klass();
+  char* java_lang_String_str(char* buf, size_t buflen);
 };
 
 #endif // SHARE_CI_CIINSTANCE_HPP
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 05be2df52af..a506c4502a4 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -466,13 +466,9 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
     if (EnableVectorSupport && EnableVectorReboxing && FLAG_IS_DEFAULT(EnableVectorAggressiveReboxing)) {
       FLAG_SET_DEFAULT(EnableVectorAggressiveReboxing, true);
     }
-    if (EnableVectorSupport && FLAG_IS_DEFAULT(UseVectorStubs)) {
-      FLAG_SET_DEFAULT(UseVectorStubs, true);
-    }
     log_info(compilation)("EnableVectorSupport=%s",            (EnableVectorSupport            ? "true" : "false"));
     log_info(compilation)("EnableVectorReboxing=%s",           (EnableVectorReboxing           ? "true" : "false"));
     log_info(compilation)("EnableVectorAggressiveReboxing=%s", (EnableVectorAggressiveReboxing ? "true" : "false"));
-    log_info(compilation)("UseVectorStubs=%s",                 (UseVectorStubs                 ? "true" : "false"));
   }
 #endif // COMPILER2_OR_JVMCI
 }
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 68de40f1788..2959f35ef2c 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -1001,7 +1001,8 @@ class methodHandle;
   do_intrinsic(_VectorUnaryOp, jdk_internal_vm_vector_VectorSupport, vector_unary_op_name, vector_unary_op_sig, F_S)                           \
    do_signature(vector_unary_op_sig, "(I"                                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
-                                      "Ljava/lang/Class;Ljava/lang/Class;"                                                                     \
+                                      "Ljava/lang/Class;"                                                                                      \
+                                      "Ljava/lang/Class;"                                                                                      \
                                       "I"                                                                                                      \
                                       "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                          \
                                       "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                      \
@@ -1022,6 +1023,29 @@ class methodHandle;
                                        "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;")                                                 \
    do_name(vector_binary_op_name,     "binaryOp")                                                                                              \
                                                                                                                                                \
+  do_intrinsic(_VectorUnaryLibOp, jdk_internal_vm_vector_VectorSupport, vector_unary_lib_op_name, vector_unary_lib_op_sig, F_S)                \
+   do_signature(vector_unary_lib_op_sig,"(J"                                                                                                   \
+                                         "Ljava/lang/Class;"                                                                                   \
+                                         "Ljava/lang/Class;"                                                                                   \
+                                         "I"                                                                                                   \
+                                         "Ljava/lang/String;"                                                                                  \
+                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                       \
+                                         "Ljdk/internal/vm/vector/VectorSupport$UnaryOperation;)"                                              \
+                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;")                                                      \
+   do_name(vector_unary_lib_op_name, "libraryUnaryOp")                                                                                         \
+                                                                                                                                               \
+  do_intrinsic(_VectorBinaryLibOp, jdk_internal_vm_vector_VectorSupport, vector_binary_lib_op_name, vector_binary_lib_op_sig, F_S)             \
+   do_signature(vector_binary_lib_op_sig,"(J"                                                                                                  \
+                                          "Ljava/lang/Class;"                                                                                  \
+                                          "Ljava/lang/Class;"                                                                                  \
+                                          "I"                                                                                                  \
+                                          "Ljava/lang/String;"                                                                                 \
+                                          "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                               \
+                                          "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                               \
+                                          "Ljdk/internal/vm/vector/VectorSupport$BinaryOperation;)"                                            \
+                                          "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;")                                              \
+   do_name(vector_binary_lib_op_name, "libraryBinaryOp")                                                                                       \
+                                                                                                                                               \
   do_intrinsic(_VectorTernaryOp, jdk_internal_vm_vector_VectorSupport, vector_ternary_op_name, vector_ternary_op_sig, F_S)                     \
    do_signature(vector_ternary_op_sig, "(I"                                                                                                    \
                                         "Ljava/lang/Class;"                                                                                    \
diff --git a/src/hotspot/share/jvmci/jvmci_globals.cpp b/src/hotspot/share/jvmci/jvmci_globals.cpp
index dfc7e6b5970..a41351218f8 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.cpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.cpp
@@ -144,8 +144,9 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
   JVMCI_FLAG_CHECKED(UseMulAddIntrinsic)
   JVMCI_FLAG_CHECKED(UseMontgomeryMultiplyIntrinsic)
   JVMCI_FLAG_CHECKED(UseMontgomerySquareIntrinsic)
-  JVMCI_FLAG_CHECKED(UseVectorStubs)
 #endif // !COMPILER2
+       //
+  JVMCI_FLAG_CHECKED(UseVectorStubs)
 
 #ifndef PRODUCT
 #define JVMCI_CHECK4(type, name, value, ...) assert(name##checked, #name " flag not checked");
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index 4da49b24e6e..5bcead9ff7b 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -184,8 +184,8 @@ class fileStream;
   NOT_COMPILER2(product(bool, EnableVectorAggressiveReboxing, false, EXPERIMENTAL, \
           "Enables aggressive reboxing of vectors"))                        \
                                                                             \
-  NOT_COMPILER2(product(bool, UseVectorStubs, false, EXPERIMENTAL,          \
-          "Use stubs for vector transcendental operations"))                \
+  product(bool, UseVectorStubs, false, EXPERIMENTAL,                        \
+          "Use stubs for vector transcendental operations")                 \
 
 // end of JVMCI_FLAGS
 
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 662f2e07965..2246bd62f4e 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -760,9 +760,6 @@
   product(bool, EnableVectorAggressiveReboxing, false, EXPERIMENTAL,        \
           "Enables aggressive reboxing of vectors")                         \
                                                                             \
-  product(bool, UseVectorStubs, false, EXPERIMENTAL,                        \
-          "Use stubs for vector transcendental operations")                 \
-                                                                            \
   product(bool, UseTypeSpeculation, true,                                   \
           "Speculatively propagate types from profiles")                    \
                                                                             \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index f39937b9cdd..272692446ae 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -848,6 +848,9 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_IndexVector:
   case vmIntrinsics::_IndexPartiallyInUpperRange:
     return EnableVectorSupport;
+  case vmIntrinsics::_VectorUnaryLibOp:
+  case vmIntrinsics::_VectorBinaryLibOp:
+    return EnableVectorSupport && Matcher::supports_vector_calling_convention();
   case vmIntrinsics::_blackhole:
 #if INCLUDE_JVMTI
   case vmIntrinsics::_notifyJvmtiVThreadStart:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 017564173a8..65635001e13 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -721,6 +721,10 @@ bool LibraryCallKit::try_to_inline(int predicate) {
     return inline_vector_nary_operation(1);
   case vmIntrinsics::_VectorBinaryOp:
     return inline_vector_nary_operation(2);
+  case vmIntrinsics::_VectorUnaryLibOp:
+    return inline_vector_call(1);
+  case vmIntrinsics::_VectorBinaryLibOp:
+    return inline_vector_call(2);
   case vmIntrinsics::_VectorTernaryOp:
     return inline_vector_nary_operation(3);
   case vmIntrinsics::_VectorFromBitsCoerced:
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index cb755267ec5..1be08df32ae 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -369,6 +369,7 @@ class LibraryCallKit : public GraphKit {
 
   // Vector API support
   bool inline_vector_nary_operation(int n);
+  bool inline_vector_call(int arity);
   bool inline_vector_frombits_coerced();
   bool inline_vector_mask_operation();
   bool inline_vector_mem_operation(bool is_store);
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index e33d7b19686..13acc0469eb 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -366,17 +366,11 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   int num_elem = vlen->get_con();
   int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
   int sopc = has_scalar_op ? VectorNode::opcode(opc, elem_bt) : opc;
-  if ((opc != Op_CallLeafVector) && (sopc == 0)) {
-    log_if_needed("  ** operation not supported: opc=%s bt=%s", NodeClassNames[opc], type2name(elem_bt));
+  if (sopc == 0 || num_elem == 1) {
+    log_if_needed("  ** operation not supported: arity=%d opc=%s[%d] vlen=%d etype=%s",
+                    n, NodeClassNames[opc], opc, num_elem, type2name(elem_bt));
     return false; // operation not supported
   }
-  if (num_elem == 1) {
-    if (opc != Op_CallLeafVector || elem_bt != T_DOUBLE) {
-      log_if_needed("  ** not a svml call: arity=%d opc=%d vlen=%d etype=%s",
-                      n, opc, num_elem, type2name(elem_bt));
-      return false;
-    }
-  }
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
 
@@ -384,22 +378,6 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     assert(!is_masked_op, "mask operations do not need mask to control");
   }
 
-  if (opc == Op_CallLeafVector) {
-    if (!UseVectorStubs) {
-      log_if_needed("  ** vector stubs support is disabled");
-      return false;
-    }
-    if (!Matcher::supports_vector_calling_convention()) {
-      log_if_needed("  ** no vector calling conventions supported");
-      return false;
-    }
-    if (!Matcher::vector_size_supported(elem_bt, num_elem)) {
-      log_if_needed("  ** vector size (vlen=%d, etype=%s) is not supported",
-                      num_elem, type2name(elem_bt));
-      return false;
-    }
-  }
-
   // When using mask, mask use type needs to be VecMaskUseLoad.
   VectorMaskUseType mask_use_type = is_vector_mask(vbox_klass) ? VecMaskUseAll
                                       : is_masked_op ? VecMaskUseLoad : VecMaskNotUsed;
@@ -464,30 +442,18 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   }
 
   Node* operation = nullptr;
-  if (opc == Op_CallLeafVector) {
-    assert(UseVectorStubs, "sanity");
-    operation = gen_call_to_vector_math(opr->get_con(), elem_bt, num_elem, opd1, opd2);
-    if (operation == nullptr) {
-      log_if_needed("  ** Vector math call failed for %s_%s_%d",
-                         (elem_bt == T_FLOAT) ? "float" : "double",
-                         VectorSupport::mathname[opr->get_con() - VectorSupport::VECTOR_OP_MATH_START],
-                         num_elem * type2aelembytes(elem_bt));
-      return false;
-     }
-  } else {
-    const TypeVect* vt = TypeVect::make(elem_bt, num_elem, is_vector_mask(vbox_klass));
-    switch (n) {
-      case 1:
-      case 2: {
-        operation = VectorNode::make(sopc, opd1, opd2, vt, is_vector_mask(vbox_klass), VectorNode::is_shift_opcode(opc), is_unsigned);
-        break;
-      }
-      case 3: {
-        operation = VectorNode::make(sopc, opd1, opd2, opd3, vt);
-        break;
-      }
-      default: fatal("unsupported arity: %d", n);
+  const TypeVect* vt = TypeVect::make(elem_bt, num_elem, is_vector_mask(vbox_klass));
+  switch (n) {
+    case 1:
+    case 2: {
+      operation = VectorNode::make(sopc, opd1, opd2, vt, is_vector_mask(vbox_klass), VectorNode::is_shift_opcode(opc), is_unsigned);
+      break;
+    }
+    case 3: {
+      operation = VectorNode::make(sopc, opd1, opd2, opd3, vt);
+      break;
     }
+    default: fatal("unsupported arity: %d", n);
   }
 
   if (is_masked_op && mask != nullptr) {
@@ -510,6 +476,107 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
 }
 
 // public static
+// <V extends Vector<E>, E>
+// V libraryUnaryOp(long address, Class<? extends V> vClass, Class<E> elementType, int length, String debugName,
+//                  V v,
+//                  UnaryOperation<V, ?> defaultImpl)
+//
+// public static
+// <V extends VectorPayload, E>
+// V libraryBinaryOp(long address, Class<? extends V> vClass, Class<E> elementType, int length, String debugName,
+//            V v1, V v2,
+//            BinaryOperation<V, ?> defaultImpl)
+bool LibraryCallKit::inline_vector_call(int arity) {
+  assert(Matcher::supports_vector_calling_convention(), "required");
+
+  const TypeLong*    entry          = gvn().type(argument(0))->isa_long();
+  const TypeInstPtr* vector_klass   = gvn().type(argument(2))->isa_instptr();
+  const TypeInstPtr* elem_klass     = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     vlen           = gvn().type(argument(4))->isa_int();
+  const TypeInstPtr* debug_name_oop = gvn().type(argument(5))->isa_instptr();
+
+  if (entry        == nullptr   || !entry->is_con() ||
+      vector_klass == nullptr   || vector_klass->const_oop() == nullptr ||
+      elem_klass   == nullptr   || elem_klass->const_oop() == nullptr ||
+      vlen         == nullptr   || !vlen->is_con() ||
+      debug_name_oop == nullptr || debug_name_oop->const_oop() == nullptr) {
+    log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s debug_name=%s",
+                  NodeClassNames[argument(0)->Opcode()],
+                  NodeClassNames[argument(2)->Opcode()],
+                  NodeClassNames[argument(3)->Opcode()],
+                  NodeClassNames[argument(4)->Opcode()],
+                  NodeClassNames[argument(5)->Opcode()]);
+    return false; // not enough info for intrinsification
+  }
+
+  if (entry->get_con() == 0) {
+    log_if_needed("  ** missing entry point");
+    return false;
+  }
+
+  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
+  if (!elem_type->is_primitive_type()) {
+    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
+    return false; // should be primitive type
+  }
+  if (!is_klass_initialized(vector_klass)) {
+    log_if_needed("  ** klass argument not initialized");
+    return false;
+  }
+
+  BasicType elem_bt = elem_type->basic_type();
+  int num_elem = vlen->get_con();
+  if (!Matcher::vector_size_supported(elem_bt, num_elem)) {
+    log_if_needed("  ** vector size (vlen=%d, etype=%s) is not supported",
+                  num_elem, type2name(elem_bt));
+    return false;
+  }
+
+  ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
+  const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
+
+  Node* opd1 = unbox_vector(argument(6), vbox_type, elem_bt, num_elem);
+  if (opd1 == nullptr) {
+    log_if_needed("  ** unbox failed v1=%s", NodeClassNames[argument(6)->Opcode()]);
+    return false;
+  }
+
+  Node* opd2 = nullptr;
+  if (arity > 1) {
+    opd2 = unbox_vector(argument(7), vbox_type, elem_bt, num_elem);
+    if (opd2 == nullptr) {
+      log_if_needed("  ** unbox failed v2=%s", NodeClassNames[argument(7)->Opcode()]);
+      return false;
+    }
+  }
+  assert(arity == 1 || arity == 2, "arity %d not supported", arity);
+  const TypeVect* vt = TypeVect::make(elem_bt, num_elem);
+  const TypeFunc* call_type = OptoRuntime::Math_Vector_Vector_Type(arity, vt, vt);
+  address entry_addr = (address)entry->get_con();
+
+  const char* debug_name = "<unknown>";
+  if (!debug_name_oop->const_oop()->is_null_object()) {
+    size_t buflen = 100;
+    char* buf = NEW_ARENA_ARRAY(C->comp_arena(), char, buflen);
+    debug_name = debug_name_oop->const_oop()->as_instance()->java_lang_String_str(buf, buflen);
+  }
+  Node* vcall = make_runtime_call(RC_VECTOR,
+                                  call_type,
+                                  entry_addr,
+                                  debug_name,
+                                  TypePtr::BOTTOM,
+                                  opd1,
+                                  opd2);
+
+  vcall = gvn().transform(new ProjNode(gvn().transform(vcall), TypeFunc::Parms));
+
+  // Wrap it up in VectorBox to keep object type information.
+  Node* vbox = box_vector(vcall, vbox_type, elem_bt, num_elem);
+  set_result(vbox);
+  C->set_max_vector_size(MAX2(C->max_vector_size(), (uint)(num_elem * type2aelembytes(elem_bt))));
+  return true;
+}
+
 // <E, M>
 // long maskReductionCoerced(int oper, Class<? extends M> maskClass, Class<?> elemClass,
 //                          int length, M m, VectorMaskOp<M> defaultImpl)
@@ -1844,50 +1911,6 @@ bool LibraryCallKit::inline_vector_rearrange() {
   return true;
 }
 
-static address get_vector_math_address(int vop, int bits, BasicType bt, char* name_ptr, int name_len) {
-  address addr = nullptr;
-  assert(UseVectorStubs, "sanity");
-  assert(name_ptr != nullptr, "unexpected");
-  assert((vop >= VectorSupport::VECTOR_OP_MATH_START) && (vop <= VectorSupport::VECTOR_OP_MATH_END), "unexpected");
-  int op = vop - VectorSupport::VECTOR_OP_MATH_START;
-
-  switch(bits) {
-    case 64:  //fallthough
-    case 128: //fallthough
-    case 256: //fallthough
-    case 512:
-      if (bt == T_FLOAT) {
-        snprintf(name_ptr, name_len, "vector_%s_float_%dbits_fixed", VectorSupport::mathname[op], bits);
-        addr = StubRoutines::_vector_f_math[exact_log2(bits/64)][op];
-      } else {
-        assert(bt == T_DOUBLE, "must be FP type only");
-        snprintf(name_ptr, name_len, "vector_%s_double_%dbits_fixed", VectorSupport::mathname[op], bits);
-        addr = StubRoutines::_vector_d_math[exact_log2(bits/64)][op];
-      }
-      break;
-    default:
-      if (!Matcher::supports_scalable_vector() || !Matcher::vector_size_supported(bt, bits/type2aelembytes(bt)) ) {
-        snprintf(name_ptr, name_len, "invalid");
-        addr = nullptr;
-        Unimplemented();
-      }
-      break;
-  }
-
-  if (addr == nullptr && Matcher::supports_scalable_vector()) {
-    if (bt == T_FLOAT) {
-      snprintf(name_ptr, name_len, "vector_%s_float_%dbits_scalable", VectorSupport::mathname[op], bits);
-      addr = StubRoutines::_vector_f_math[VectorSupport::VEC_SIZE_SCALABLE][op];
-    } else {
-      assert(bt == T_DOUBLE, "must be FP type only");
-      snprintf(name_ptr, name_len, "vector_%s_double_%dbits_scalable", VectorSupport::mathname[op], bits);
-      addr = StubRoutines::_vector_d_math[VectorSupport::VEC_SIZE_SCALABLE][op];
-    }
-  }
-
-  return addr;
-}
-
 //    public static
 //    <V extends Vector<E>,
 //     M  extends VectorMask<E>,
@@ -2044,32 +2067,6 @@ bool LibraryCallKit::inline_vector_select_from() {
   return true;
 }
 
-Node* LibraryCallKit::gen_call_to_vector_math(int vector_api_op_id, BasicType bt, int num_elem, Node* opd1, Node* opd2) {
-  assert(UseVectorStubs, "sanity");
-  assert(vector_api_op_id >= VectorSupport::VECTOR_OP_MATH_START && vector_api_op_id <= VectorSupport::VECTOR_OP_MATH_END, "need valid op id");
-  assert(opd1 != nullptr, "must not be null");
-  const TypeVect* vt = TypeVect::make(bt, num_elem);
-  const TypeFunc* call_type = OptoRuntime::Math_Vector_Vector_Type(opd2 != nullptr ? 2 : 1, vt, vt);
-  char name[100] = "";
-
-  // Get address for vector math method.
-  address addr = get_vector_math_address(vector_api_op_id, vt->length_in_bytes() * BitsPerByte, bt, name, 100);
-
-  if (addr == nullptr) {
-    return nullptr;
-  }
-
-  assert(name[0] != '\0', "name must not be null");
-  Node* operation = make_runtime_call(RC_VECTOR,
-                                      call_type,
-                                      addr,
-                                      name,
-                                      TypePtr::BOTTOM,
-                                      opd1,
-                                      opd2);
-  return gvn().transform(new ProjNode(gvn().transform(operation), TypeFunc::Parms));
-}
-
 //  public static
 //  <V extends Vector<E>,
 //   M extends VectorMask<E>,
diff --git a/src/hotspot/share/prims/vectorSupport.cpp b/src/hotspot/share/prims/vectorSupport.cpp
index a00656f30ee..c907ddb4885 100644
--- a/src/hotspot/share/prims/vectorSupport.cpp
+++ b/src/hotspot/share/prims/vectorSupport.cpp
@@ -39,31 +39,9 @@
 #include "runtime/stackValue.hpp"
 #ifdef COMPILER2
 #include "opto/matcher.hpp"
+#include "opto/vectornode.hpp"
 #endif // COMPILER2
 
-#ifdef COMPILER2
-const char* VectorSupport::mathname[VectorSupport::NUM_VECTOR_OP_MATH] = {
-    "tan",
-    "tanh",
-    "sin",
-    "sinh",
-    "cos",
-    "cosh",
-    "asin",
-    "acos",
-    "atan",
-    "atan2",
-    "cbrt",
-    "log",
-    "log10",
-    "log1p",
-    "pow",
-    "exp",
-    "expm1",
-    "hypot",
-};
-#endif
-
 bool VectorSupport::is_vector(Klass* klass) {
   return klass->is_subclass_of(vmClasses::vector_VectorPayload_klass());
 }
@@ -615,25 +593,6 @@ int VectorSupport::vop2ideal(jint id, BasicType bt) {
       break;
     }
 
-    case VECTOR_OP_TAN:
-    case VECTOR_OP_TANH:
-    case VECTOR_OP_SIN:
-    case VECTOR_OP_SINH:
-    case VECTOR_OP_COS:
-    case VECTOR_OP_COSH:
-    case VECTOR_OP_ASIN:
-    case VECTOR_OP_ACOS:
-    case VECTOR_OP_ATAN:
-    case VECTOR_OP_ATAN2:
-    case VECTOR_OP_CBRT:
-    case VECTOR_OP_LOG:
-    case VECTOR_OP_LOG10:
-    case VECTOR_OP_LOG1P:
-    case VECTOR_OP_POW:
-    case VECTOR_OP_EXP:
-    case VECTOR_OP_EXPM1:
-    case VECTOR_OP_HYPOT:
-      return Op_CallLeafVector;
     default: fatal("unknown op: %d", vop);
   }
   return 0; // Unimplemented
@@ -655,16 +614,26 @@ JVM_ENTRY(jint, VectorSupport_GetMaxLaneCount(JNIEnv *env, jclass vsclazz, jobje
   return -1;
 } JVM_END
 
+JVM_ENTRY(jstring, VectorSupport_GetCPUFeatures(JNIEnv* env, jclass ignored))
+  const char* features_string = VM_Version::features_string();
+  assert(features_string != nullptr, "missing cpu features info");
+
+  oop result = java_lang_String::create_oop_from_str(features_string, CHECK_NULL);
+  return (jstring) JNIHandles::make_local(THREAD, result);
+JVM_END
+
 // JVM_RegisterVectorSupportMethods
 
 #define LANG "Ljava/lang/"
 #define CLS LANG "Class;"
+#define LSTR LANG "String;"
 
 #define CC (char*)  /*cast a literal from (const char*)*/
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
 
 static JNINativeMethod jdk_internal_vm_vector_VectorSupport_methods[] = {
-    {CC "getMaxLaneCount",   CC "(" CLS ")I", FN_PTR(VectorSupport_GetMaxLaneCount)}
+    {CC "getMaxLaneCount", CC "(" CLS ")I", FN_PTR(VectorSupport_GetMaxLaneCount)},
+    {CC "getCPUFeatures",  CC "()" LSTR,    FN_PTR(VectorSupport_GetCPUFeatures)}
 };
 
 #undef CC
@@ -672,6 +641,7 @@ static JNINativeMethod jdk_internal_vm_vector_VectorSupport_methods[] = {
 
 #undef LANG
 #undef CLS
+#undef LSTR
 
 // This function is exported, used by NativeLookup.
 
diff --git a/src/hotspot/share/prims/vectorSupport.hpp b/src/hotspot/share/prims/vectorSupport.hpp
index 688fb595099..5ba18cdfaa8 100644
--- a/src/hotspot/share/prims/vectorSupport.hpp
+++ b/src/hotspot/share/prims/vectorSupport.hpp
@@ -101,36 +101,12 @@ class VectorSupport : AllStatic {
     VECTOR_OP_COMPRESS_BITS = 33,
     VECTOR_OP_EXPAND_BITS = 34,
 
-    // Vector Math Library
-    VECTOR_OP_TAN   = 101,
-    VECTOR_OP_TANH  = 102,
-    VECTOR_OP_SIN   = 103,
-    VECTOR_OP_SINH  = 104,
-    VECTOR_OP_COS   = 105,
-    VECTOR_OP_COSH  = 106,
-    VECTOR_OP_ASIN  = 107,
-    VECTOR_OP_ACOS  = 108,
-    VECTOR_OP_ATAN  = 109,
-    VECTOR_OP_ATAN2 = 110,
-    VECTOR_OP_CBRT  = 111,
-    VECTOR_OP_LOG   = 112,
-    VECTOR_OP_LOG10 = 113,
-    VECTOR_OP_LOG1P = 114,
-    VECTOR_OP_POW   = 115,
-    VECTOR_OP_EXP   = 116,
-    VECTOR_OP_EXPM1 = 117,
-    VECTOR_OP_HYPOT = 118,
-
     VECTOR_OP_SADD  = 119,
     VECTOR_OP_SSUB  = 120,
     VECTOR_OP_SUADD = 121,
     VECTOR_OP_SUSUB = 122,
     VECTOR_OP_UMIN  = 123,
     VECTOR_OP_UMAX  = 124,
-
-    VECTOR_OP_MATH_START = VECTOR_OP_TAN,
-    VECTOR_OP_MATH_END   = VECTOR_OP_HYPOT,
-    NUM_VECTOR_OP_MATH   = VECTOR_OP_MATH_END - VECTOR_OP_MATH_START + 1
   };
 
   enum {
@@ -147,8 +123,6 @@ class VectorSupport : AllStatic {
     MODE_BITS_COERCED_LONG_TO_MASK = 1
   };
 
-  static const char* mathname[VectorSupport::NUM_VECTOR_OP_MATH];
-
   static int vop2ideal(jint vop, BasicType bt);
   static bool has_scalar_op(jint id);
   static bool is_unsigned_op(jint id);
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index e08a5ba5ebd..41f32729cd4 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1533,7 +1533,7 @@ WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
 WB_END
 
 WB_ENTRY(jstring, WB_GetCPUFeatures(JNIEnv* env, jobject o))
-  const char* features = VM_Version::features_string();
+  const char* features = VM_Version::cpu_info_string();
   ThreadToNativeFromVM ttn(thread);
   jstring features_string = env->NewStringUTF(features);
 
diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index e95c96b4e9c..c0667d739ce 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -34,6 +34,7 @@ const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Versio
 
 uint64_t Abstract_VM_Version::_features = 0;
 const char* Abstract_VM_Version::_features_string = "";
+const char* Abstract_VM_Version::_cpu_info_string = "";
 uint64_t Abstract_VM_Version::_cpu_features = 0;
 
 #ifndef SUPPORTS_NATIVE_CX8
@@ -340,6 +341,19 @@ void Abstract_VM_Version::insert_features_names(char* buf, size_t buflen, const
   }
 }
 
+const char* Abstract_VM_Version::extract_features_string(const char* cpu_info_string,
+                                                         size_t cpu_info_string_len,
+                                                         size_t features_offset) {
+  assert(features_offset <= cpu_info_string_len, "");
+  if (features_offset < cpu_info_string_len) {
+    assert(cpu_info_string[features_offset + 0] == ',', "");
+    assert(cpu_info_string[features_offset + 1] == ' ', "");
+    return cpu_info_string + features_offset + 2; // skip initial ", "
+  } else {
+    return ""; // empty
+  }
+}
+
 bool Abstract_VM_Version::print_matching_lines_from_file(const char* filename, outputStream* st, const char* keywords_to_match[]) {
   char line[500];
   FILE* fp = os::fopen(filename, "r");
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index 8cfc7031f97..6f1b886bc98 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -58,6 +58,8 @@ class Abstract_VM_Version: AllStatic {
   static uint64_t _features;
   static const char* _features_string;
 
+  static const char* _cpu_info_string;
+
   // Original CPU feature flags, not affected by VM settings.
   static uint64_t _cpu_features;
 
@@ -128,7 +130,11 @@ class Abstract_VM_Version: AllStatic {
 
   static uint64_t features()           { return _features; }
   static const char* features_string() { return _features_string; }
+  static const char* cpu_info_string() { return _cpu_info_string; }
   static void insert_features_names(char* buf, size_t buflen, const char* features_names[]);
+  static const char* extract_features_string(const char* cpu_info_string,
+                                             size_t cpu_info_string_len,
+                                             size_t features_offset);
 
   static VirtualizationType get_detected_virtualization() {
     return _detected_virtualization;
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index d0bba58b508..69d37a11e45 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -3786,11 +3786,6 @@ jint Arguments::apply_ergo() {
       }
     }
     FLAG_SET_DEFAULT(EnableVectorAggressiveReboxing, false);
-
-    if (!FLAG_IS_DEFAULT(UseVectorStubs) && UseVectorStubs) {
-      warning("Disabling UseVectorStubs since EnableVectorSupport is turned off.");
-    }
-    FLAG_SET_DEFAULT(UseVectorStubs, false);
   }
 #endif // COMPILER2_OR_JVMCI
 
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 67b25be8eb9..a58be403827 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1168,7 +1168,7 @@ void os::print_cpu_info(outputStream* st, char* buf, size_t buflen) {
   // We access the raw value here because the assert in the accessor will
   // fail if the crash occurs before initialization of this value.
   st->print(" (initial active %d)", _initial_active_processor_count);
-  st->print(" %s", VM_Version::features_string());
+  st->print(" %s", VM_Version::cpu_info_string());
   st->cr();
   pd_print_cpu_info(st, buf, buflen);
 }
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index b1b1f1d6056..358434938f2 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -101,8 +101,6 @@ 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}};
 
 const char* StubRoutines::get_blob_name(StubGenBlobId id) {
   assert(0 <= id && id < StubGenBlobId::NUM_BLOBIDS, "invalid blob id");
diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp
index 3189415a6c5..7548a97ced8 100644
--- a/src/hotspot/share/runtime/stubRoutines.hpp
+++ b/src/hotspot/share/runtime/stubRoutines.hpp
@@ -305,10 +305,6 @@ class StubRoutines: AllStatic {
 
   /* special case: stub employs array of entries */
 
-  // Vector Math Routines
-  static address _vector_f_math[VectorSupport::NUM_VEC_SIZES][VectorSupport::NUM_VECTOR_OP_MATH];
-  static address _vector_d_math[VectorSupport::NUM_VEC_SIZES][VectorSupport::NUM_VECTOR_OP_MATH];
-
   static bool is_stub_code(address addr)                   { return contains(addr); }
 
   // generate code to implement method contains
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index f865380fdb7..77fae3becb5 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -702,6 +702,7 @@
      static_field(Abstract_VM_Version,         _s_internal_vm_info_string,                    const char*)                           \
      static_field(Abstract_VM_Version,         _features,                                     uint64_t)                              \
      static_field(Abstract_VM_Version,         _features_string,                              const char*)                           \
+     static_field(Abstract_VM_Version,         _cpu_info_string,                              const char*)                           \
      static_field(Abstract_VM_Version,         _vm_major_version,                             int)                                   \
      static_field(Abstract_VM_Version,         _vm_minor_version,                             int)                                   \
      static_field(Abstract_VM_Version,         _vm_security_version,                          int)                                   \
diff --git a/src/java.base/share/classes/jdk/internal/vm/vector/Utils.java b/src/java.base/share/classes/jdk/internal/vm/vector/Utils.java
new file mode 100644
index 00000000000..de0bb83d39d
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/vm/vector/Utils.java
@@ -0,0 +1,49 @@
+/*
+ * 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.internal.vm.vector;
+
+import jdk.internal.reflect.CallerSensitive;
+import jdk.internal.reflect.Reflection;
+
+/**
+ * Miscellaneous utility methods.
+ */
+public class Utils {
+    public static final boolean DEBUG = Boolean.getBoolean("jdk.incubator.vector.DEBUG");
+
+    public static boolean isNonCapturingLambda(Object o) {
+        return o.getClass().getDeclaredFields().length == 0;
+    }
+
+    @CallerSensitive
+    public static void debug(String format, Object... args) {
+        if (DEBUG) {
+            Class<?> caller = Reflection.getCallerClass();
+            System.out.printf("DEBUG: %s: ", caller.getSimpleName());
+            System.out.printf(format, args);
+            System.out.println();
+        }
+    }
+}
diff --git a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
index cbf30da2289..4a8ad79b50c 100644
--- a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
@@ -30,6 +30,8 @@
 
 import java.util.function.*;
 
+import static jdk.internal.vm.vector.Utils.isNonCapturingLambda;
+
 public class VectorSupport {
     static {
         registerNatives();
@@ -114,6 +116,9 @@ public class VectorSupport {
     public static final int VECTOR_OP_EXPM1 = 117;
     public static final int VECTOR_OP_HYPOT = 118;
 
+    public static final int VECTOR_OP_MATHLIB_FIRST = VECTOR_OP_TAN;
+    public static final int VECTOR_OP_MATHLIB_LAST  = VECTOR_OP_HYPOT;
+
     public static final int VECTOR_OP_SADD  = 119;
     public static final int VECTOR_OP_SSUB  = 120;
     public static final int VECTOR_OP_SUADD = 121;
@@ -323,6 +328,23 @@ V unaryOp(int oprId,
 
     /* ============================================================================ */
 
+//    public interface LibraryUnaryOperation<V extends Vector<?>,
+//            M extends VectorMask<?>> {
+//        V apply(MemorySegment entry, V v, M m);
+//    }
+
+    @IntrinsicCandidate
+    public static
+    <V extends Vector<E>, E>
+    V libraryUnaryOp(long addr, Class<? extends V> vClass, Class<E> eClass, int length, String debugName,
+                     V v,
+                     UnaryOperation<V,?> defaultImpl) {
+        assert isNonCapturingLambda(defaultImpl) : defaultImpl;
+        return defaultImpl.apply(v, null);
+    }
+
+    /* ============================================================================ */
+
     public interface BinaryOperation<VM extends VectorPayload,
                                      M extends VectorMask<?>> {
         VM apply(VM v1, VM v2, M m);
@@ -341,6 +363,24 @@ VM binaryOp(int oprId,
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
         return defaultImpl.apply(v1, v2, m);
     }
+
+    /* ============================================================================ */
+
+//    public interface LibraryBinaryOperation<V extends VectorPayload,
+//            M extends VectorMask<?>> {
+//        V apply(MemorySegment entry, V v1, V v2, M m);
+//    }
+
+    @IntrinsicCandidate
+    public static
+    <V extends VectorPayload, E>
+    V libraryBinaryOp(long addr, Class<? extends V> vClass, Class<E> eClass, int length, String debugName,
+                      V v1, V v2,
+                      BinaryOperation<V,?> defaultImpl) {
+        assert isNonCapturingLambda(defaultImpl) : defaultImpl;
+        return defaultImpl.apply(v1, v2, null);
+    }
+
     /* ============================================================================ */
 
     public interface SelectFromTwoVector<V extends Vector<?>> {
@@ -718,13 +758,19 @@ long maskReductionCoerced(int oper,
 
     /* ============================================================================ */
 
+    // Returns a string containing a list of CPU features VM detected.
+    public static native String getCPUFeatures();
+
+    /* ============================================================================ */
+
     // query the JVM's supported vector sizes and types
     public static native int getMaxLaneCount(Class<?> etype);
 
     /* ============================================================================ */
 
-    public static boolean isNonCapturingLambda(Object o) {
-        return o.getClass().getDeclaredFields().length == 0;
+    @SuppressWarnings({"restricted"})
+    public static void loadNativeLibrary(String name) {
+        System.loadLibrary(name);
     }
 
     /* ============================================================================ */
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 22f40d9cead..6775dda269a 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -272,6 +272,7 @@
         java.security.jgss,
         java.smartcardio,
         jdk.charsets,
+        jdk.incubator.vector,
         jdk.internal.vm.ci,
         jdk.jlink,
         jdk.jpackage,
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 ed8d273ff37..2b1cc879e66 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
@@ -689,7 +689,7 @@ ByteVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
             }
         }
@@ -717,7 +717,7 @@ ByteVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
             }
         }
@@ -728,6 +728,7 @@ opc, getClass(), maskClass, byte.class, length(),
             UN_IMPL.find(op, opc, ByteVector::unaryOperations));
     }
 
+
     private static final
     ImplCache<Unary, UnaryOperation<ByteVector, VectorMask<Byte>>>
         UN_IMPL = new ImplCache<>(Unary.class, ByteVector.class);
@@ -824,6 +825,7 @@ ByteVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.compare(EQ, (byte) 0, m);
                 return this.blend(that, mask);
             }
+
             if (opKind(op, VO_SHIFT)) {
                 // As per shift specification for Java, mask the shift count.
                 // This allows the JIT to ignore some ISA details.
@@ -850,6 +852,7 @@ opc, getClass(), maskClass, byte.class, length(),
             BIN_IMPL.find(op, opc, ByteVector::binaryOperations));
     }
 
+
     private static final
     ImplCache<Binary, BinaryOperation<ByteVector, VectorMask<Byte>>>
         BIN_IMPL = new ImplCache<>(Binary.class, ByteVector.class);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
new file mode 100644
index 00000000000..1d44860ab86
--- /dev/null
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.incubator.vector;
+
+import jdk.internal.vm.vector.VectorSupport;
+
+import java.util.Locale;
+import java.util.Set;
+
+import static jdk.incubator.vector.Util.requires;
+import static jdk.internal.util.Architecture.isX64;
+import static jdk.internal.vm.vector.Utils.debug;
+
+/**
+ * Enumerates CPU ISA extensions supported by the JVM on the current hardware.
+ */
+/*package-private*/ class CPUFeatures {
+    private static final Set<String> features = getCPUFeatures();
+
+    private static Set<String> getCPUFeatures() {
+        String featuresString = VectorSupport.getCPUFeatures();
+        debug(featuresString);
+        String[] features = featuresString.toLowerCase(Locale.ROOT)
+                                          .split(",? "); // " " or ", " are used as a delimiter by JVM
+        assert validateFeatures(features);
+        return Set.of(features);
+    }
+
+    private static boolean validateFeatures(String[] features) {
+        for (String s : features) {
+            assert s != null && s.matches("[a-z0-9._]+") : String.format("Invalid CPU feature name: '%s'", s);
+        }
+        return true;
+    }
+
+    private static boolean hasFeature(String feature) {
+        return features.contains(feature.toLowerCase(Locale.ROOT));
+    }
+
+    public static class X64 {
+        public static boolean SUPPORTS_AVX      = hasFeature("avx");
+        public static boolean SUPPORTS_AVX2     = hasFeature("avx2");
+        public static boolean SUPPORTS_AVX512F  = hasFeature("avx512f");
+        public static boolean SUPPORTS_AVX512DQ = hasFeature("avx512dq");
+
+        static {
+            requires(isX64(), "unsupported platform");
+
+            debug("AVX=%b; AVX2=%b; AVX512F=%b; AVX512DQ=%b",
+                  SUPPORTS_AVX, SUPPORTS_AVX2, SUPPORTS_AVX512F, SUPPORTS_AVX512DQ);
+
+            assert SUPPORTS_AVX512F == (VectorShape.getMaxVectorBitSize(int.class)   == 512);
+            assert SUPPORTS_AVX2    == (VectorShape.getMaxVectorBitSize(byte.class)  >= 256);
+            assert SUPPORTS_AVX     == (VectorShape.getMaxVectorBitSize(float.class) >= 256);
+        }
+    }
+
+    public static Set<String> features() {
+        return features;
+    }
+}
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 5fbf02f87bd..48446c6fa01 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
@@ -678,6 +678,9 @@ DoubleVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return unaryMathOp(op);
+            }
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -703,6 +706,9 @@ DoubleVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return blend(unaryMathOp(op), m);
+            }
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -711,6 +717,13 @@ opc, getClass(), maskClass, double.class, length(),
             UN_IMPL.find(op, opc, DoubleVector::unaryOperations));
     }
 
+    @ForceInline
+    final
+    DoubleVector unaryMathOp(VectorOperators.Unary op) {
+        return VectorMathLibrary.unaryMathOp(op, opCode(op), species(), DoubleVector::unaryOperations,
+                                             this);
+    }
+
     private static final
     ImplCache<Unary, UnaryOperation<DoubleVector, VectorMask<Double>>>
         UN_IMPL = new ImplCache<>(Unary.class, DoubleVector.class);
@@ -781,6 +794,9 @@ DoubleVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.viewAsIntegralLanes().compare(EQ, (long) 0);
                 return this.blend(that, mask.cast(vspecies()));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return binaryMathOp(op, that);
+            }
         }
 
         int opc = opCode(op);
@@ -815,6 +831,10 @@ DoubleVector lanewiseTemplate(VectorOperators.Binary op,
                     = bits.compare(EQ, (long) 0, m.cast(bits.vspecies()));
                 return this.blend(that, mask.cast(vspecies()));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return this.blend(binaryMathOp(op, that), m);
+            }
+
         }
 
         int opc = opCode(op);
@@ -824,6 +844,13 @@ opc, getClass(), maskClass, double.class, length(),
             BIN_IMPL.find(op, opc, DoubleVector::binaryOperations));
     }
 
+    @ForceInline
+    final
+    DoubleVector binaryMathOp(VectorOperators.Binary op, DoubleVector that) {
+        return VectorMathLibrary.binaryMathOp(op, opCode(op), species(), DoubleVector::binaryOperations,
+                                              this, that);
+    }
+
     private static final
     ImplCache<Binary, BinaryOperation<DoubleVector, VectorMask<Double>>>
         BIN_IMPL = new ImplCache<>(Binary.class, DoubleVector.class);
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 26fbe64742d..1e0829a3b1c 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
@@ -678,6 +678,9 @@ FloatVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return unaryMathOp(op);
+            }
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -703,6 +706,9 @@ FloatVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return blend(unaryMathOp(op), m);
+            }
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -711,6 +717,13 @@ opc, getClass(), maskClass, float.class, length(),
             UN_IMPL.find(op, opc, FloatVector::unaryOperations));
     }
 
+    @ForceInline
+    final
+    FloatVector unaryMathOp(VectorOperators.Unary op) {
+        return VectorMathLibrary.unaryMathOp(op, opCode(op), species(), FloatVector::unaryOperations,
+                                             this);
+    }
+
     private static final
     ImplCache<Unary, UnaryOperation<FloatVector, VectorMask<Float>>>
         UN_IMPL = new ImplCache<>(Unary.class, FloatVector.class);
@@ -781,6 +794,9 @@ FloatVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.viewAsIntegralLanes().compare(EQ, (int) 0);
                 return this.blend(that, mask.cast(vspecies()));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return binaryMathOp(op, that);
+            }
         }
 
         int opc = opCode(op);
@@ -815,6 +831,10 @@ FloatVector lanewiseTemplate(VectorOperators.Binary op,
                     = bits.compare(EQ, (int) 0, m.cast(bits.vspecies()));
                 return this.blend(that, mask.cast(vspecies()));
             }
+            else if (opKind(op, VO_MATHLIB)) {
+                return this.blend(binaryMathOp(op, that), m);
+            }
+
         }
 
         int opc = opCode(op);
@@ -824,6 +844,13 @@ opc, getClass(), maskClass, float.class, length(),
             BIN_IMPL.find(op, opc, FloatVector::binaryOperations));
     }
 
+    @ForceInline
+    final
+    FloatVector binaryMathOp(VectorOperators.Binary op, FloatVector that) {
+        return VectorMathLibrary.binaryMathOp(op, opCode(op), species(), FloatVector::binaryOperations,
+                                              this, that);
+    }
+
     private static final
     ImplCache<Binary, BinaryOperation<FloatVector, VectorMask<Float>>>
         BIN_IMPL = new ImplCache<>(Binary.class, FloatVector.class);
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 076a66ed6a5..b691527bec6 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
@@ -689,7 +689,7 @@ IntVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
             }
         }
@@ -717,7 +717,7 @@ IntVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
             }
         }
@@ -728,6 +728,7 @@ opc, getClass(), maskClass, int.class, length(),
             UN_IMPL.find(op, opc, IntVector::unaryOperations));
     }
 
+
     private static final
     ImplCache<Unary, UnaryOperation<IntVector, VectorMask<Integer>>>
         UN_IMPL = new ImplCache<>(Unary.class, IntVector.class);
@@ -824,6 +825,7 @@ IntVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.compare(EQ, (int) 0, m);
                 return this.blend(that, mask);
             }
+
             if (opKind(op, VO_SHIFT)) {
                 // As per shift specification for Java, mask the shift count.
                 // This allows the JIT to ignore some ISA details.
@@ -850,6 +852,7 @@ opc, getClass(), maskClass, int.class, length(),
             BIN_IMPL.find(op, opc, IntVector::binaryOperations));
     }
 
+
     private static final
     ImplCache<Binary, BinaryOperation<IntVector, VectorMask<Integer>>>
         BIN_IMPL = new ImplCache<>(Binary.class, IntVector.class);
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 21903aa6794..9e4dcd23d67 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
@@ -647,7 +647,7 @@ LongVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
             }
         }
@@ -675,7 +675,7 @@ LongVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
             }
         }
@@ -686,6 +686,7 @@ opc, getClass(), maskClass, long.class, length(),
             UN_IMPL.find(op, opc, LongVector::unaryOperations));
     }
 
+
     private static final
     ImplCache<Unary, UnaryOperation<LongVector, VectorMask<Long>>>
         UN_IMPL = new ImplCache<>(Unary.class, LongVector.class);
@@ -782,6 +783,7 @@ LongVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.compare(EQ, (long) 0, m);
                 return this.blend(that, mask);
             }
+
             if (opKind(op, VO_SHIFT)) {
                 // As per shift specification for Java, mask the shift count.
                 // This allows the JIT to ignore some ISA details.
@@ -808,6 +810,7 @@ opc, getClass(), maskClass, long.class, length(),
             BIN_IMPL.find(op, opc, LongVector::binaryOperations));
     }
 
+
     private static final
     ImplCache<Binary, BinaryOperation<LongVector, VectorMask<Long>>>
         BIN_IMPL = new ImplCache<>(Binary.class, LongVector.class);
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 0bb97da8244..46df27309ae 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
@@ -689,7 +689,7 @@ ShortVector lanewiseTemplate(VectorOperators.Unary op) {
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
             }
         }
@@ -717,7 +717,7 @@ ShortVector lanewiseTemplate(VectorOperators.Unary op,
             if (op == ZOMO) {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
-            if (op == NOT) {
+            else if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
             }
         }
@@ -728,6 +728,7 @@ opc, getClass(), maskClass, short.class, length(),
             UN_IMPL.find(op, opc, ShortVector::unaryOperations));
     }
 
+
     private static final
     ImplCache<Unary, UnaryOperation<ShortVector, VectorMask<Short>>>
         UN_IMPL = new ImplCache<>(Unary.class, ShortVector.class);
@@ -824,6 +825,7 @@ ShortVector lanewiseTemplate(VectorOperators.Binary op,
                     = this.compare(EQ, (short) 0, m);
                 return this.blend(that, mask);
             }
+
             if (opKind(op, VO_SHIFT)) {
                 // As per shift specification for Java, mask the shift count.
                 // This allows the JIT to ignore some ISA details.
@@ -850,6 +852,7 @@ opc, getClass(), maskClass, short.class, length(),
             BIN_IMPL.find(op, opc, ShortVector::binaryOperations));
     }
 
+
     private static final
     ImplCache<Binary, BinaryOperation<ShortVector, VectorMask<Short>>>
         BIN_IMPL = new ImplCache<>(Binary.class, ShortVector.class);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Util.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Util.java
new file mode 100644
index 00000000000..8562d4b5d7a
--- /dev/null
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Util.java
@@ -0,0 +1,33 @@
+/*
+ * 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.incubator.vector;
+
+/*package-private*/ class Util {
+    public static void requires(boolean cond, String message) {
+        if (!cond) {
+            throw new InternalError(message);
+        }
+    }
+}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
new file mode 100644
index 00000000000..1dfd6f131d2
--- /dev/null
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
@@ -0,0 +1,323 @@
+/*
+ * 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.incubator.vector;
+
+import jdk.internal.util.StaticProperty;
+import jdk.internal.vm.annotation.DontInline;
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+import jdk.internal.vm.vector.VectorSupport;
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SymbolLookup;
+import java.util.function.IntFunction;
+
+import static jdk.incubator.vector.Util.requires;
+import static jdk.incubator.vector.VectorOperators.*;
+import static jdk.internal.util.Architecture.*;
+import static jdk.internal.vm.vector.Utils.debug;
+
+/**
+ * A wrapper for native vector math libraries bundled with the JDK (SVML and SLEEF).
+ * Binds vector operations to native implementations provided by the libraries.
+ */
+/*package-private*/ class VectorMathLibrary {
+    private static final SymbolLookup LOOKUP = SymbolLookup.loaderLookup();
+
+    interface Library {
+        String symbolName(Operator op, VectorSpecies<?> vspecies);
+        boolean isSupported(Operator op, VectorSpecies<?> vspecies);
+
+        String SVML  = "svml";
+        String SLEEF = "sleef";
+        String JAVA  = "java";
+
+        static Library getInstance() {
+            String libraryName = System.getProperty("jdk.incubator.vector.VectorMathLibrary", getDefaultName());
+            try {
+                return switch (libraryName) {
+                    case SVML  -> new SVML();
+                    case SLEEF -> new SLEEF();
+                    case JAVA  -> new Java();
+                    default    -> throw new IllegalArgumentException("Unsupported vector math library: " + libraryName);
+                };
+            } catch (Throwable e) {
+                debug("Error during initialization of %s library: %s", libraryName, e);
+                return new Java(); // fallback
+            }
+        }
+
+        static String getDefaultName() {
+            return switch (StaticProperty.osArch()) {
+                case "amd64", "x86_64" -> SVML;
+                case "aarch64", "riscv64" -> SLEEF;
+                default -> JAVA;
+            };
+        }
+    }
+
+    private static final Library LIBRARY = Library.getInstance();
+
+    static {
+        debug("%s library is used (cpu features: %s)", LIBRARY.getClass().getSimpleName(), CPUFeatures.features());
+    }
+
+    private static class Java implements Library {
+        @Override
+        public String symbolName(Operator op, VectorSpecies<?> vspecies) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isSupported(Operator op, VectorSpecies<?> vspecies) {
+            return false; // always use default implementation
+        }
+    }
+
+    /**
+     * Naming convention in SVML vector math library.
+     * All the methods are named as __jsvml_<op><T><N>_ha_<VV> where:
+     *      ha stands for high accuracy
+     *      <T> is optional to indicate float/double
+     *              Set to f for vector float operation
+     *              Omitted for vector double operation
+     *      <N> is the number of elements in the vector
+     *              1, 2, 4, 8, 16
+     *              e.g. 128 bit float vector has 4 float elements
+     *      <VV> indicates the avx/sse level:
+     *              z0 is AVX512, l9 is AVX2, e9 is AVX1 and ex is for SSE2
+     *      e.g. __jsvml_expf16_ha_z0 is the method for computing 16 element vector float exp using AVX 512 insns
+     *           __jsvml_exp8_ha_z0 is the method for computing 8 element vector double exp using AVX 512 insns
+     */
+    private static class SVML implements Library {
+        static {
+            loadNativeLibrary();
+        }
+
+        private static void loadNativeLibrary() {
+            requires(isX64(), "SVML library is x64-specific");
+            VectorSupport.loadNativeLibrary("jsvml");
+        }
+
+        private static String suffix(VectorSpecies<?> vspecies) {
+            assert vspecies.vectorBitSize() <= VectorShape.getMaxVectorBitSize(vspecies.elementType());
+
+            if (vspecies.vectorBitSize() == 512) {
+                assert CPUFeatures.X64.SUPPORTS_AVX512F;
+                return "z0";
+            } else if (CPUFeatures.X64.SUPPORTS_AVX2) {
+                return "l9";
+            } else if (CPUFeatures.X64.SUPPORTS_AVX) {
+                return "e9";
+            } else {
+                return "ex";
+            }
+        }
+
+        @Override
+        public String symbolName(Operator op, VectorSpecies<?> vspecies) {
+            String suffix = suffix(vspecies);
+            String elemType = (vspecies.elementType() == float.class ? "f" : "");
+            int vlen = (vspecies == FloatVector.SPECIES_64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            return String.format("__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
+        }
+
+        @Override
+        public boolean isSupported(Operator op, VectorSpecies<?> vspecies) {
+            Class<?> etype = vspecies.elementType();
+            if (etype != float.class && etype != double.class) {
+                return false; // only FP types are supported
+            }
+            int maxLaneCount = VectorSupport.getMaxLaneCount(vspecies.elementType());
+            if (vspecies.length() > maxLaneCount) {
+                return false; // lacking vector support (either hardware or disabled on JVM side)
+            }
+            if (vspecies == DoubleVector.SPECIES_64) {
+                return false; // 64-bit double vectors are not supported
+            }
+            if (vspecies.vectorBitSize() == 512) {
+                if (op == LOG || op == LOG10 || op == POW) {
+                    return CPUFeatures.X64.SUPPORTS_AVX512DQ; // requires AVX512DQ CPU support
+                }
+            } else if (op == POW) {
+                return false; // not supported
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Naming convention in SLEEF-based vector math library .
+     * All the methods are named as <OP><T><N>_<U><suffix> where:
+     *     <OP>     is the operation name, e.g. sin
+     *     <T>      is optional to indicate float/double
+     *              "f/d" for vector float/double operation
+     *     <N>      is the number of elements in the vector
+     *              "2/4" for neon, and "x" for sve/rvv
+     *     <U>      is the precision level
+     *              "u10/u05" represents 1.0/0.5 ULP error bounds
+     *               We use "u10" for all operations by default
+     *               But for those functions do not have u10 support, we use "u05" instead
+     *     <suffix> indicates neon/sve/rvv
+     *              "sve/advsimd/rvv" for sve/neon/rvv implementations
+     *     e.g. sinfx_u10sve is the method for computing vector float sin using SVE instructions
+     *          cosd2_u10advsimd is the method for computing 2 elements vector double cos using NEON instructions
+     */
+    private static class SLEEF implements Library {
+        static {
+            VectorSupport.loadNativeLibrary("sleef");
+        }
+
+        private static String suffix(VectorShape vshape, boolean isShapeAgnostic) {
+            if (isAARCH64()) {
+                if (isShapeAgnostic) {
+                    return "sve";
+                } else {
+                    return "advsimd";
+                }
+            } else if (isRISCV64()) {
+                assert isShapeAgnostic : "not supported";
+                return "rvv";
+            } else {
+                throw new InternalError("unsupported platform");
+            }
+        }
+
+        private static String precisionLevel(Operator op) {
+            return (op == HYPOT ? "u05" : "u10");
+        }
+
+        @Override
+        public String symbolName(Operator op, VectorSpecies<?> vspecies) {
+            int vlen = (vspecies == FloatVector.SPECIES_64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            boolean isShapeAgnostic = isRISCV64() || (isAARCH64() && vspecies.vectorBitSize() > 128);
+            return String.format("%s%s%s_%s%s", op.operatorName(),
+                                 (vspecies.elementType() == float.class ? "f" : "d"),
+                                 (isShapeAgnostic ? "x" : Integer.toString(vlen)),
+                                 precisionLevel(op),
+                                 suffix(vspecies.vectorShape(), isShapeAgnostic));
+        }
+
+        @Override
+        public boolean isSupported(Operator op, VectorSpecies<?> vspecies) {
+            Class<?> etype = vspecies.elementType();
+            if (etype != float.class && etype != double.class) {
+                return false; // only FP element types are supported
+            }
+            int maxLaneCount = VectorSupport.getMaxLaneCount(vspecies.elementType());
+            if (vspecies.length() > maxLaneCount) {
+                return false; // lacking vector support (either hardware or disabled on JVM side)
+            }
+            if (vspecies == DoubleVector.SPECIES_64) {
+                return false; // 64-bit double vectors are not supported
+            }
+            if (op == TANH) {
+                return false; // skip due to performance considerations
+            }
+            return true;
+        }
+    }
+
+    private static final int SIZE = VectorSupport.VECTOR_OP_MATHLIB_LAST - VectorSupport.VECTOR_OP_MATHLIB_FIRST + 1;
+
+    private record Entry<T> (String name, MemorySegment entry, T impl) {}
+
+    private static final @Stable Entry<?>[][][] LIBRARY_ENTRIES = new Entry<?>[SIZE][LaneType.SK_LIMIT][VectorShape.SK_LIMIT]; // OP x SHAPE x TYPE
+
+    @ForceInline
+    private static <T> Entry<T> lookup(Operator op, int opc, VectorSpecies<?> vspecies, IntFunction<T> implSupplier) {
+        int idx = opc - VectorSupport.VECTOR_OP_MATHLIB_FIRST;
+        int elem_idx = ((AbstractSpecies<?>)vspecies).laneType.switchKey;
+        int shape_idx = vspecies.vectorShape().switchKey;
+        @SuppressWarnings({"unchecked"})
+        Entry<T> entry = (Entry<T>)LIBRARY_ENTRIES[idx][elem_idx][shape_idx];
+        if (entry == null) {
+            entry = constructEntry(op, opc, vspecies, implSupplier);
+            LIBRARY_ENTRIES[idx][elem_idx][shape_idx] = entry;
+        }
+        return entry;
+    }
+
+    @DontInline
+    private static
+    <E,T>
+    Entry<T> constructEntry(Operator op, int opc, VectorSpecies<E> vspecies, IntFunction<T> implSupplier) {
+        if (LIBRARY.isSupported(op, vspecies)) {
+            String symbol = LIBRARY.symbolName(op, vspecies);
+            try {
+                MemorySegment addr = LOOKUP.findOrThrow(symbol);
+                debug("%s %s => 0x%016x\n", op, symbol, addr.address());
+                T impl = implSupplier.apply(opc); // TODO: should call the very same native implementation eventually (once FFM API supports vectors)
+                return new Entry<>(symbol, addr, impl);
+            } catch (RuntimeException e) {
+              throw new InternalError("not supported: " + op + " " + vspecies + " " + symbol, e);
+            }
+        } else {
+            return new Entry<>(null, MemorySegment.NULL, implSupplier.apply(opc));
+        }
+    }
+
+    @ForceInline
+    /*package-private*/ static
+    <E, V extends Vector<E>>
+    V unaryMathOp(Unary op, int opc, VectorSpecies<E> vspecies,
+                  IntFunction<VectorSupport.UnaryOperation<V,?>> implSupplier,
+                  V v) {
+        var entry = lookup(op, opc, vspecies, implSupplier);
+
+        long entryAddress = entry.entry.address();
+        if (entryAddress != 0) {
+            @SuppressWarnings({"unchecked"})
+            Class<V> vt = (Class<V>)vspecies.vectorType();
+            return VectorSupport.libraryUnaryOp(
+                    entry.entry.address(), vt, vspecies.elementType(), vspecies.length(), entry.name,
+                    v,
+                    entry.impl);
+        } else {
+            return entry.impl.apply(v, null);
+        }
+    }
+
+    @ForceInline
+    /*package-private*/ static
+    <E, V extends Vector<E>>
+    V binaryMathOp(Binary op, int opc, VectorSpecies<E> vspecies,
+                   IntFunction<VectorSupport.BinaryOperation<V,?>> implSupplier,
+                   V v1, V v2) {
+        var entry = lookup(op, opc, vspecies, implSupplier);
+
+        long entryAddress = entry.entry.address();
+        if (entryAddress != 0) {
+            @SuppressWarnings({"unchecked"})
+            Class<V> vt = (Class<V>)vspecies.vectorType();
+            return VectorSupport.libraryBinaryOp(
+                    entry.entry.address(), vt, vspecies.elementType(), vspecies.length(), entry.name,
+                    v1, v2,
+                    entry.impl);
+        } else {
+            return entry.impl.apply(v1, v2, null);
+        }
+    }
+}
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 c5fe6dd4441..0e231bd5174 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
@@ -33,6 +33,8 @@
 
 import jdk.internal.vm.vector.VectorSupport;
 
+import static jdk.internal.vm.vector.Utils.isNonCapturingLambda;
+
 /**
  * This class consists solely of static constants
  * that describe lane-wise vector operations, plus nested interfaces
@@ -426,6 +428,7 @@ static boolean opKind(Operator op, int bit) {
         VO_SPECIAL                 = 0x080, // random special handling
         VO_NOFP                    = 0x100,
         VO_ONLYFP                  = 0x200,
+        VO_MATHLIB                 = 0x400,
         VO_OPCODE_VALID            = 0x800,
         VO_OPCODE_SHIFT            = 12,
         VO_OPCODE_LIMIT            = 0x400,
@@ -476,67 +479,67 @@ static boolean opKind(Operator op, int bit) {
     /** Produce {@code sin(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary SIN = unary("SIN", "sin", VectorSupport.VECTOR_OP_SIN, VO_ONLYFP);
+    public static final /*float*/ Unary SIN = unary("SIN", "sin", VectorSupport.VECTOR_OP_SIN, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code cos(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary COS = unary("COS", "cos", VectorSupport.VECTOR_OP_COS, VO_ONLYFP);
+    public static final /*float*/ Unary COS = unary("COS", "cos", VectorSupport.VECTOR_OP_COS, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code tan(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary TAN = unary("TAN", "tan", VectorSupport.VECTOR_OP_TAN, VO_ONLYFP);
+    public static final /*float*/ Unary TAN = unary("TAN", "tan", VectorSupport.VECTOR_OP_TAN, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code asin(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary ASIN = unary("ASIN", "asin", VectorSupport.VECTOR_OP_ASIN, VO_ONLYFP);
+    public static final /*float*/ Unary ASIN = unary("ASIN", "asin", VectorSupport.VECTOR_OP_ASIN, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code acos(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary ACOS = unary("ACOS", "acos", VectorSupport.VECTOR_OP_ACOS, VO_ONLYFP);
+    public static final /*float*/ Unary ACOS = unary("ACOS", "acos", VectorSupport.VECTOR_OP_ACOS, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code atan(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary ATAN = unary("ATAN", "atan", VectorSupport.VECTOR_OP_ATAN, VO_ONLYFP);
+    public static final /*float*/ Unary ATAN = unary("ATAN", "atan", VectorSupport.VECTOR_OP_ATAN, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
 
     /** Produce {@code exp(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary EXP = unary("EXP", "exp", VectorSupport.VECTOR_OP_EXP, VO_ONLYFP);
+    public static final /*float*/ Unary EXP = unary("EXP", "exp", VectorSupport.VECTOR_OP_EXP, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code log(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary LOG = unary("LOG", "log", VectorSupport.VECTOR_OP_LOG, VO_ONLYFP);
+    public static final /*float*/ Unary LOG = unary("LOG", "log", VectorSupport.VECTOR_OP_LOG, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code log10(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary LOG10 = unary("LOG10", "log10", VectorSupport.VECTOR_OP_LOG10, VO_ONLYFP);
+    public static final /*float*/ Unary LOG10 = unary("LOG10", "log10", VectorSupport.VECTOR_OP_LOG10, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code sqrt(a)}.  Floating only.  See section "Operations on floating point vectors" above */
     public static final /*float*/ Unary SQRT = unary("SQRT", "sqrt", VectorSupport.VECTOR_OP_SQRT, VO_ONLYFP);
     /** Produce {@code cbrt(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary CBRT = unary("CBRT", "cbrt", VectorSupport.VECTOR_OP_CBRT, VO_ONLYFP);
+    public static final /*float*/ Unary CBRT = unary("CBRT", "cbrt", VectorSupport.VECTOR_OP_CBRT, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
 
     /** Produce {@code sinh(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary SINH = unary("SINH", "sinh", VectorSupport.VECTOR_OP_SINH, VO_ONLYFP);
+    public static final /*float*/ Unary SINH = unary("SINH", "sinh", VectorSupport.VECTOR_OP_SINH, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code cosh(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary COSH = unary("COSH", "cosh", VectorSupport.VECTOR_OP_COSH, VO_ONLYFP);
+    public static final /*float*/ Unary COSH = unary("COSH", "cosh", VectorSupport.VECTOR_OP_COSH, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code tanh(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary TANH = unary("TANH", "tanh", VectorSupport.VECTOR_OP_TANH, VO_ONLYFP);
+    public static final /*float*/ Unary TANH = unary("TANH", "tanh", VectorSupport.VECTOR_OP_TANH, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code expm1(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary EXPM1 = unary("EXPM1", "expm1", VectorSupport.VECTOR_OP_EXPM1, VO_ONLYFP);
+    public static final /*float*/ Unary EXPM1 = unary("EXPM1", "expm1", VectorSupport.VECTOR_OP_EXPM1, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code log1p(a)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Unary LOG1P = unary("LOG1P", "log1p", VectorSupport.VECTOR_OP_LOG1P, VO_ONLYFP);
+    public static final /*float*/ Unary LOG1P = unary("LOG1P", "log1p", VectorSupport.VECTOR_OP_LOG1P, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
 
     // Binary operators
 
@@ -615,15 +618,15 @@ static boolean opKind(Operator op, int bit) {
     /** Produce {@code atan2(a,b)}. See  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Binary ATAN2 = binary("ATAN2", "atan2", VectorSupport.VECTOR_OP_ATAN2, VO_ONLYFP);
+    public static final /*float*/ Binary ATAN2 = binary("ATAN2", "atan2", VectorSupport.VECTOR_OP_ATAN2, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code pow(a,b)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Binary POW = binary("POW", "pow", VectorSupport.VECTOR_OP_POW, VO_ONLYFP);
+    public static final /*float*/ Binary POW = binary("POW", "pow", VectorSupport.VECTOR_OP_POW, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
     /** Produce {@code hypot(a,b)}.  Floating only.
      *  Not guaranteed to be semi-monotonic. See section "Operations on floating point vectors" above
      */
-    public static final /*float*/ Binary HYPOT = binary("HYPOT", "hypot", VectorSupport.VECTOR_OP_HYPOT, VO_ONLYFP);
+    public static final /*float*/ Binary HYPOT = binary("HYPOT", "hypot", VectorSupport.VECTOR_OP_HYPOT, VO_ONLYFP | VO_SPECIAL | VO_MATHLIB);
 
     // Ternary operators
 
@@ -1373,7 +1376,7 @@ public T find(OP op, int opc, IntFunction<T> supplier) {
             if (fn != null)  return fn;
             fn = supplier.apply(opc);
             if (fn == null)  throw badOp(op);
-            assert(VectorSupport.isNonCapturingLambda(fn)) : fn;
+            assert(isNonCapturingLambda(fn)) : fn;
             // The JIT can see into this cache:
             cache[opc] = fn;
             return fn;
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 8084cc307e8..6d9db65a1ba 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
@@ -712,10 +712,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                 return blend(broadcast(-1), compare(NE, 0));
             }
 #if[BITWISE]
-            if (op == NOT) {
+            else if (op == NOT) {
                 return broadcast(-1).lanewise(XOR, this);
             }
 #end[BITWISE]
+#if[FP]
+            else if (opKind(op, VO_MATHLIB)) {
+                return unaryMathOp(op);
+            }
+#end[FP]
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -742,10 +747,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                 return blend(broadcast(-1), compare(NE, 0, m));
             }
 #if[BITWISE]
-            if (op == NOT) {
+            else if (op == NOT) {
                 return lanewise(XOR, broadcast(-1), m);
             }
 #end[BITWISE]
+#if[FP]
+            else if (opKind(op, VO_MATHLIB)) {
+                return blend(unaryMathOp(op), m);
+            }
+#end[FP]
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
@@ -754,6 +764,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             UN_IMPL.find(op, opc, $abstractvectortype$::unaryOperations));
     }
 
+#if[FP]
+    @ForceInline
+    final
+    $abstractvectortype$ unaryMathOp(VectorOperators.Unary op) {
+        return VectorMathLibrary.unaryMathOp(op, opCode(op), species(), $abstractvectortype$::unaryOperations,
+                                             this);
+    }
+#end[FP]
+
     private static final
     ImplCache<Unary, UnaryOperation<$abstractvectortype$, VectorMask<$Boxtype$>>>
         UN_IMPL = new ImplCache<>(Unary.class, $Type$Vector.class);
@@ -856,6 +875,11 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                     = this{#if[FP]?.viewAsIntegralLanes()}.compare(EQ, ($bitstype$) 0);
                 return this.blend(that, mask{#if[FP]?.cast(vspecies())});
             }
+#if[FP]
+            else if (opKind(op, VO_MATHLIB)) {
+                return binaryMathOp(op, that);
+            }
+#end[FP]
 #if[BITWISE]
 #if[!FP]
             if (opKind(op, VO_SHIFT)) {
@@ -915,6 +939,12 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                 return this.blend(that, mask);
 #end[FP]
             }
+#if[FP]
+            else if (opKind(op, VO_MATHLIB)) {
+                return this.blend(binaryMathOp(op, that), m);
+            }
+#end[FP]
+
 #if[BITWISE]
 #if[!FP]
             if (opKind(op, VO_SHIFT)) {
@@ -945,6 +975,15 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             BIN_IMPL.find(op, opc, $abstractvectortype$::binaryOperations));
     }
 
+#if[FP]
+    @ForceInline
+    final
+    $abstractvectortype$ binaryMathOp(VectorOperators.Binary op, $abstractvectortype$ that) {
+        return VectorMathLibrary.binaryMathOp(op, opCode(op), species(), $abstractvectortype$::binaryOperations,
+                                              this, that);
+    }
+#end[FP]
+
     private static final
     ImplCache<Binary, BinaryOperation<$abstractvectortype$, VectorMask<$Boxtype$>>>
         BIN_IMPL = new ImplCache<>(Binary.class, $Type$Vector.class);

From 91a9043f9df0e345719df3bfd0a7d0f2a96e6109 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Sat, 26 Apr 2025 02:58:51 +0000
Subject: [PATCH 145/901] 8355562: RISC-V: Cleanup names of vector-scalar
 instructions in riscv_v.ad

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 292 +++++++++++++++----------------
 1 file changed, 146 insertions(+), 146 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 7df3c857a4d..d0f31a82069 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -415,11 +415,11 @@ instruct vadd_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate add (unpredicated)
 
-instruct vadd_immI(vReg dst, vReg src1, immI5 con) %{
+instruct vaddI_vi(vReg dst, vReg src1, immI5 con) %{
   match(Set dst (AddVB src1 (Replicate con)));
   match(Set dst (AddVS src1 (Replicate con)));
   match(Set dst (AddVI src1 (Replicate con)));
-  format %{ "vadd_immI $dst, $src1, $con" %}
+  format %{ "vaddI_vi $dst, $src1, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -430,9 +430,9 @@ instruct vadd_immI(vReg dst, vReg src1, immI5 con) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vadd_immL(vReg dst, vReg src1, immL5 con) %{
+instruct vaddL_vi(vReg dst, vReg src1, immL5 con) %{
   match(Set dst (AddVL src1 (Replicate con)));
-  format %{ "vadd_immL $dst, $src1, $con" %}
+  format %{ "vaddL_vi $dst, $src1, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vadd_vi(as_VectorRegister($dst$$reg),
@@ -444,11 +444,11 @@ instruct vadd_immL(vReg dst, vReg src1, immL5 con) %{
 
 // vector-scalar add (unpredicated)
 
-instruct vadd_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vaddI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (AddVB src1 (Replicate src2)));
   match(Set dst (AddVS src1 (Replicate src2)));
   match(Set dst (AddVI src1 (Replicate src2)));
-  format %{ "vadd_regI $dst, $src1, $src2" %}
+  format %{ "vaddI_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -459,9 +459,9 @@ instruct vadd_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vadd_regL(vReg dst, vReg src1, iRegL src2) %{
+instruct vaddL_vx(vReg dst, vReg src1, iRegL src2) %{
   match(Set dst (AddVL src1 (Replicate src2)));
-  format %{ "vadd_regL $dst, $src1, $src2" %}
+  format %{ "vaddL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vadd_vx(as_VectorRegister($dst$$reg),
@@ -473,11 +473,11 @@ instruct vadd_regL(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-immediate add (predicated)
 
-instruct vadd_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vaddI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   match(Set dst_src (AddVB (Binary dst_src (Replicate con)) v0));
   match(Set dst_src (AddVS (Binary dst_src (Replicate con)) v0));
   match(Set dst_src (AddVI (Binary dst_src (Replicate con)) v0));
-  format %{ "vadd_immI_masked $dst_src, $dst_src, $con" %}
+  format %{ "vaddI_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -488,9 +488,9 @@ instruct vadd_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vadd_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+instruct vaddL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
   match(Set dst_src (AddVL (Binary dst_src (Replicate con)) v0));
-  format %{ "vadd_immL_masked $dst_src, $dst_src, $con" %}
+  format %{ "vaddL_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vadd_vi(as_VectorRegister($dst_src$$reg),
@@ -502,11 +502,11 @@ instruct vadd_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar add (predicated)
 
-instruct vadd_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vaddI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (AddVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (AddVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (AddVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vadd_regI_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vaddI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -517,9 +517,9 @@ instruct vadd_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vadd_regL_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
+instruct vaddL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
   match(Set dst_src (AddVL (Binary dst_src (Replicate src2)) v0));
-  format %{ "vadd_regL_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vaddL_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vadd_vx(as_VectorRegister($dst_src$$reg),
@@ -595,11 +595,11 @@ instruct vsub_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-scalar sub (unpredicated)
 
-instruct vsub_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vsubI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (SubVB src1 (Replicate src2)));
   match(Set dst (SubVS src1 (Replicate src2)));
   match(Set dst (SubVI src1 (Replicate src2)));
-  format %{ "vsub_regI $dst, $src1, $src2" %}
+  format %{ "vsubI_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -610,9 +610,9 @@ instruct vsub_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vsub_regL(vReg dst, vReg src1, iRegL src2) %{
+instruct vsubL_vx(vReg dst, vReg src1, iRegL src2) %{
   match(Set dst (SubVL src1 (Replicate src2)));
-  format %{ "vsub_regL $dst, $src1, $src2" %}
+  format %{ "vsubL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vsub_vx(as_VectorRegister($dst$$reg),
@@ -624,11 +624,11 @@ instruct vsub_regL(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-scalar sub (predicated)
 
-instruct vsub_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vsubI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (SubVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (SubVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (SubVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vsub_regI_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vsubI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -639,9 +639,9 @@ instruct vsub_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vsub_regL_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
+instruct vsubL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
   match(Set dst_src (SubVL (Binary dst_src (Replicate src2)) v0));
-  format %{ "vsub_regL_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vsub_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vsub_vx(as_VectorRegister($dst_src$$reg),
@@ -685,12 +685,12 @@ instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate and (unpredicated)
 
-instruct vand_immI(vReg dst_src, immI5 con) %{
+instruct vandI_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV dst_src (Replicate con)));
-  format %{ "vand_immI $dst_src, $dst_src, $con" %}
+  format %{ "vandI_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -701,10 +701,10 @@ instruct vand_immI(vReg dst_src, immI5 con) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_immL(vReg dst_src, immL5 con) %{
+instruct vandL_vi(vReg dst_src, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (AndV dst_src (Replicate con)));
-  format %{ "vand_immL $dst_src, $dst_src, $con" %}
+  format %{ "vandL_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vand_vi(as_VectorRegister($dst_src$$reg),
@@ -716,12 +716,12 @@ instruct vand_immL(vReg dst_src, immL5 con) %{
 
 // vector-scalar and (unpredicated)
 
-instruct vand_regI(vReg dst_src, iRegIorL2I src) %{
+instruct vandI_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV dst_src (Replicate src)));
-  format %{ "vand_regI $dst_src, $dst_src, $src" %}
+  format %{ "vandI_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -732,10 +732,10 @@ instruct vand_regI(vReg dst_src, iRegIorL2I src) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_regL(vReg dst_src, iRegL src) %{
+instruct vandL_vx(vReg dst_src, iRegL src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (AndV dst_src (Replicate src)));
-  format %{ "vand_regL $dst_src, $dst_src, $src" %}
+  format %{ "vandL_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vand_vx(as_VectorRegister($dst_src$$reg),
@@ -747,12 +747,12 @@ instruct vand_regL(vReg dst_src, iRegL src) %{
 
 // vector-immediate and (predicated)
 
-instruct vand_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vandI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
-  format %{ "vand_immI_masked $dst_src, $dst_src, $con" %}
+  format %{ "vandI_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -763,10 +763,10 @@ instruct vand_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+instruct vandL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
-  format %{ "vand_immL_masked $dst_src, $dst_src, $con" %}
+  format %{ "vandL_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vand_vi(as_VectorRegister($dst_src$$reg),
@@ -778,12 +778,12 @@ instruct vand_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar and (predicated)
 
-instruct vand_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vandI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
-  format %{ "vand_regI_masked $dst_src, $dst_src, $src" %}
+  format %{ "vandI_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -794,10 +794,10 @@ instruct vand_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+instruct vandL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
-  format %{ "vand_regL_masked $dst_src, $dst_src, $src" %}
+  format %{ "vandL_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vand_vx(as_VectorRegister($dst_src$$reg),
@@ -841,12 +841,12 @@ instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate or (unpredicated)
 
-instruct vor_immI(vReg dst_src, immI5 con) %{
+instruct vorI_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV dst_src (Replicate con)));
-  format %{ "vor_immI $dst_src, $dst_src, $con" %}
+  format %{ "vorI_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -857,10 +857,10 @@ instruct vor_immI(vReg dst_src, immI5 con) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vor_immL(vReg dst_src, immL5 con) %{
+instruct vorL_vi(vReg dst_src, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (OrV dst_src (Replicate con)));
-  format %{ "vor_immL $dst_src, $dst_src, $con" %}
+  format %{ "vorL_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vor_vi(as_VectorRegister($dst_src$$reg),
@@ -872,12 +872,12 @@ instruct vor_immL(vReg dst_src, immL5 con) %{
 
 // vector-scalar or (unpredicated)
 
-instruct vor_regI(vReg dst_src, iRegIorL2I src) %{
+instruct vorI_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV dst_src (Replicate src)));
-  format %{ "vor_regI $dst_src, $dst_src, $src" %}
+  format %{ "vorI_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -888,10 +888,10 @@ instruct vor_regI(vReg dst_src, iRegIorL2I src) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vor_regL(vReg dst_src, iRegL src) %{
+instruct vorL_vx(vReg dst_src, iRegL src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (OrV dst_src (Replicate src)));
-  format %{ "vor_regL $dst_src, $dst_src, $src" %}
+  format %{ "vorL_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vor_vx(as_VectorRegister($dst_src$$reg),
@@ -903,12 +903,12 @@ instruct vor_regL(vReg dst_src, iRegL src) %{
 
 // vector-immediate or (predicated)
 
-instruct vor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vorI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
-  format %{ "vor_immI_masked $dst_src, $dst_src, $con" %}
+  format %{ "vorI_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -919,10 +919,10 @@ instruct vor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+instruct vorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
-  format %{ "vor_immL_masked $dst_src, $dst_src, $con" %}
+  format %{ "vorL_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vor_vi(as_VectorRegister($dst_src$$reg),
@@ -934,12 +934,12 @@ instruct vor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar or (predicated)
 
-instruct vor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vorI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
-  format %{ "vor_regI_masked $dst_src, $dst_src, $src" %}
+  format %{ "vorI_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -950,10 +950,10 @@ instruct vor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+instruct vorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
-  format %{ "vor_regL_masked $dst_src, $dst_src, $src" %}
+  format %{ "vorL_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vor_vx(as_VectorRegister($dst_src$$reg),
@@ -997,12 +997,12 @@ instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate xor (unpredicated)
 
-instruct vxor_immI(vReg dst_src, immI5 con) %{
+instruct vxorI_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV dst_src (Replicate con)));
-  format %{ "vxor_immI $dst_src, $dst_src, $con" %}
+  format %{ "vxorI_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1013,10 +1013,10 @@ instruct vxor_immI(vReg dst_src, immI5 con) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vxor_immL(vReg dst_src, immL5 con) %{
+instruct vxorL_vi(vReg dst_src, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (XorV dst_src (Replicate con)));
-  format %{ "vxor_immL $dst_src, $dst_src, $con" %}
+  format %{ "vxorL_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vxor_vi(as_VectorRegister($dst_src$$reg),
@@ -1028,12 +1028,12 @@ instruct vxor_immL(vReg dst_src, immL5 con) %{
 
 // vector-scalar xor (unpredicated)
 
-instruct vxor_regI(vReg dst_src, iRegIorL2I src) %{
+instruct vxorI_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV dst_src (Replicate src)));
-  format %{ "vxor_regI $dst_src, $dst_src, $src" %}
+  format %{ "vxorI_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1044,10 +1044,10 @@ instruct vxor_regI(vReg dst_src, iRegIorL2I src) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vxor_regL(vReg dst_src, iRegL src) %{
+instruct vxorL_vx(vReg dst_src, iRegL src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (XorV dst_src (Replicate src)));
-  format %{ "vxor_regL $dst_src, $dst_src, $src" %}
+  format %{ "vxorL_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vxor_vx(as_VectorRegister($dst_src$$reg),
@@ -1059,12 +1059,12 @@ instruct vxor_regL(vReg dst_src, iRegL src) %{
 
 // vector-immediate xor (predicated)
 
-instruct vxor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vxorI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
-  format %{ "vxor_immI_masked $dst_src, $dst_src, $con" %}
+  format %{ "vxorI_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1075,10 +1075,10 @@ instruct vxor_immI_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vxor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
+instruct vxorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
-  format %{ "vxor_immL_masked $dst_src, $dst_src, $con" %}
+  format %{ "vxorL_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vxor_vi(as_VectorRegister($dst_src$$reg),
@@ -1090,12 +1090,12 @@ instruct vxor_immL_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar xor (predicated)
 
-instruct vxor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vxorI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
-  format %{ "vxor_regI_masked $dst_src, $dst_src, $src" %}
+  format %{ "vxorI_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1106,10 +1106,10 @@ instruct vxor_regI_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vxor_regL_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
+instruct vxorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
-  format %{ "vxor_regL_masked $dst_src, $dst_src, $src" %}
+  format %{ "vxorL_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vxor_vx(as_VectorRegister($dst_src$$reg),
@@ -1801,11 +1801,11 @@ instruct vmul_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-scalar mul (unpredicated)
 
-instruct vmul_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vmulI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (MulVB src1 (Replicate src2)));
   match(Set dst (MulVS src1 (Replicate src2)));
   match(Set dst (MulVI src1 (Replicate src2)));
-  format %{ "vmul_regI $dst, $src1, $src2" %}
+  format %{ "vmulI_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1816,9 +1816,9 @@ instruct vmul_regI(vReg dst, vReg src1, iRegIorL2I src2) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vmul_regL(vReg dst, vReg src1, iRegL src2) %{
+instruct vmulL_vx(vReg dst, vReg src1, iRegL src2) %{
   match(Set dst (MulVL src1 (Replicate src2)));
-  format %{ "vmul_regL $dst, $src1, $src2" %}
+  format %{ "vmulL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vmul_vx(as_VectorRegister($dst$$reg),
@@ -1830,11 +1830,11 @@ instruct vmul_regL(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-scalar mul (predicated)
 
-instruct vmul_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vmulI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (MulVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (MulVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (MulVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vmul_regI_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vmulI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1845,9 +1845,9 @@ instruct vmul_regI_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vmul_regL_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
+instruct vmulL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
   match(Set dst_src (MulVL (Binary dst_src (Replicate src2)) v0));
-  format %{ "vmul_regL_masked $dst_src, $dst_src, $src2" %}
+  format %{ "vmulL_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vmul_vx(as_VectorRegister($dst_src$$reg),
@@ -3122,10 +3122,10 @@ instruct vlsrL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrB_imm(vReg dst, vReg src, immI shift) %{
+instruct vasrB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVB src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vasrB_imm $dst, $src, $shift" %}
+  format %{ "vasrB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
@@ -3140,10 +3140,10 @@ instruct vasrB_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrS_imm(vReg dst, vReg src, immI shift) %{
+instruct vasrS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVS src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vasrS_imm $dst, $src, $shift" %}
+  format %{ "vasrS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
@@ -3158,10 +3158,10 @@ instruct vasrS_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrI_imm(vReg dst, vReg src, immI shift) %{
+instruct vasrI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVI src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vasrI_imm $dst, $src, $shift" %}
+  format %{ "vasrI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3175,11 +3175,11 @@ instruct vasrI_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrL_imm(vReg dst, vReg src, immI shift) %{
+instruct vasrL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (RShiftVL src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vasrL_imm $dst, $src, $shift" %}
+  format %{ "vasrL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3193,10 +3193,10 @@ instruct vasrL_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vasrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVB (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vasrB_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vasrB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3210,10 +3210,10 @@ instruct vasrB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vasrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVS (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vasrS_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vasrS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3227,10 +3227,10 @@ instruct vasrS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vasrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVI (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vasrI_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vasrI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3243,11 +3243,11 @@ instruct vasrI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vasrL_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vasrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (RShiftVL (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vasrL_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vasrL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3260,10 +3260,10 @@ instruct vasrL_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrB_imm(vReg dst, vReg src, immI shift) %{
+instruct vlsrB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVB src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlsrB_imm $dst, $src, $shift" %}
+  format %{ "vlsrB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
@@ -3282,10 +3282,10 @@ instruct vlsrB_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrS_imm(vReg dst, vReg src, immI shift) %{
+instruct vlsrS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVS src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlsrS_imm $dst, $src, $shift" %}
+  format %{ "vlsrS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
@@ -3304,10 +3304,10 @@ instruct vlsrS_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrI_imm(vReg dst, vReg src, immI shift) %{
+instruct vlsrI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVI src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlsrI_imm $dst, $src, $shift" %}
+  format %{ "vlsrI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3321,11 +3321,11 @@ instruct vlsrI_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrL_imm(vReg dst, vReg src, immI shift) %{
+instruct vlsrL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (URShiftVL src (RShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlsrL_imm $dst, $src, $shift" %}
+  format %{ "vlsrL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3339,10 +3339,10 @@ instruct vlsrL_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlsrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVB (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlsrB_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlsrB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3360,10 +3360,10 @@ instruct vlsrB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlsrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVS (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlsrS_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlsrS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3381,10 +3381,10 @@ instruct vlsrS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlsrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVI (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlsrI_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlsrI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3397,11 +3397,11 @@ instruct vlsrI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlsrL_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlsrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (URShiftVL (Binary dst_src (RShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlsrL_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlsrL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     if (con == 0) {
@@ -3414,10 +3414,10 @@ instruct vlsrL_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslB_imm(vReg dst, vReg src, immI shift) %{
+instruct vlslB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVB src (LShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlslB_imm $dst, $src, $shift" %}
+  format %{ "vlslB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
@@ -3431,10 +3431,10 @@ instruct vlslB_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslS_imm(vReg dst, vReg src, immI shift) %{
+instruct vlslS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVS src (LShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlslS_imm $dst, $src, $shift" %}
+  format %{ "vlslS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
@@ -3448,10 +3448,10 @@ instruct vlslS_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslI_imm(vReg dst, vReg src, immI shift) %{
+instruct vlslI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVI src (LShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlslI_imm $dst, $src, $shift" %}
+  format %{ "vlslI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3460,11 +3460,11 @@ instruct vlslI_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslL_imm(vReg dst, vReg src, immI shift) %{
+instruct vlslL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (LShiftVL src (LShiftCntV shift)));
   ins_cost(VEC_COST);
-  format %{ "vlslL_imm $dst, $src, $shift" %}
+  format %{ "vlslL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3473,10 +3473,10 @@ instruct vlslL_imm(vReg dst, vReg src, immI shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlslB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVB (Binary dst_src (LShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlslB_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlslB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
@@ -3491,10 +3491,10 @@ instruct vlslB_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlslS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVS (Binary dst_src (LShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlslS_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlslS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
@@ -3509,10 +3509,10 @@ instruct vlslS_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlslI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVI (Binary dst_src (LShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlslI_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlslI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3522,11 +3522,11 @@ instruct vlslI_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vlslL_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vlslL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (LShiftVL (Binary dst_src (LShiftCntV shift)) v0));
   ins_cost(VEC_COST);
-  format %{ "vlslL_imm_masked $dst_src, $dst_src, $shift, $v0" %}
+  format %{ "vlslL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3566,9 +3566,9 @@ instruct vrotate_right(vReg dst, vReg src, vReg shift) %{
 %}
 
 // Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
-instruct vrotate_right_reg(vReg dst, vReg src, iRegIorL2I shift) %{
+instruct vrotate_right_vx(vReg dst, vReg src, iRegIorL2I shift) %{
   match(Set dst (RotateRightV src (Replicate shift)));
-  format %{ "vrotate_right_reg $dst, $src, $shift\t" %}
+  format %{ "vrotate_right_vx $dst, $src, $shift\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3578,9 +3578,9 @@ instruct vrotate_right_reg(vReg dst, vReg src, iRegIorL2I shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vrotate_right_imm(vReg dst, vReg src, immI shift) %{
+instruct vrotate_right_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RotateRightV src shift));
-  format %{ "vrotate_right_imm $dst, $src, $shift\t" %}
+  format %{ "vrotate_right_vi $dst, $src, $shift\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint32_t bits = type2aelembytes(bt) * 8;
@@ -3598,7 +3598,7 @@ instruct vrotate_right_imm(vReg dst, vReg src, immI shift) %{
 
 instruct vrotate_right_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateRightV (Binary dst_src shift) v0));
-  format %{ "vrotate_right_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_right_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3609,9 +3609,9 @@ instruct vrotate_right_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 %}
 
 // Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
-instruct vrotate_right_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
+instruct vrotate_right_vx_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateRightV (Binary dst_src (Replicate shift)) v0));
-  format %{ "vrotate_right_reg_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_right_vx_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3621,9 +3621,9 @@ instruct vrotate_right_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0
   ins_pipe(pipe_slow);
 %}
 
-instruct vrotate_right_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vrotate_right_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateRightV (Binary dst_src shift) v0));
-  format %{ "vrotate_right_imm_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_right_vi_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint32_t bits = type2aelembytes(bt) * 8;
@@ -3653,9 +3653,9 @@ instruct vrotate_left(vReg dst, vReg src, vReg shift) %{
 %}
 
 // Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
-instruct vrotate_left_reg(vReg dst, vReg src, iRegIorL2I shift) %{
+instruct vrotate_left_vx(vReg dst, vReg src, iRegIorL2I shift) %{
   match(Set dst (RotateLeftV src (Replicate shift)));
-  format %{ "vrotate_left_reg $dst, $src, $shift\t" %}
+  format %{ "vrotate_left_vx $dst, $src, $shift\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3665,9 +3665,9 @@ instruct vrotate_left_reg(vReg dst, vReg src, iRegIorL2I shift) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vrotate_left_imm(vReg dst, vReg src, immI shift) %{
+instruct vrotate_left_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RotateLeftV src shift));
-  format %{ "vrotate_left_imm $dst, $src, $shift\t" %}
+  format %{ "vrotate_left_vi $dst, $src, $shift\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint32_t bits = type2aelembytes(bt) * 8;
@@ -3686,7 +3686,7 @@ instruct vrotate_left_imm(vReg dst, vReg src, immI shift) %{
 
 instruct vrotate_left_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateLeftV (Binary dst_src shift) v0));
-  format %{ "vrotate_left_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_left_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3697,9 +3697,9 @@ instruct vrotate_left_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 %}
 
 // Only the low log2(SEW) bits of shift value are used, all other bits are ignored.
-instruct vrotate_left_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
+instruct vrotate_left_vx_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateLeftV (Binary dst_src (Replicate shift)) v0));
-  format %{ "vrotate_left_reg_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_left_vx_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -3709,9 +3709,9 @@ instruct vrotate_left_reg_masked(vReg dst_src, iRegIorL2I shift, vRegMask_V0 v0)
   ins_pipe(pipe_slow);
 %}
 
-instruct vrotate_left_imm_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
+instruct vrotate_left_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RotateLeftV (Binary dst_src shift) v0));
-  format %{ "vrotate_left_imm_masked $dst_src, $dst_src, $shift, v0.t\t" %}
+  format %{ "vrotate_left_vi_masked $dst_src, $dst_src, $shift, $v0\t" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     uint32_t bits = type2aelembytes(bt) * 8;

From 3b3a055d7605338e93814ccfe2a4a18a7786f43f Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Sat, 26 Apr 2025 03:31:21 +0000
Subject: [PATCH 146/901] 8342676: Unsigned Vector Min / Max transforms

Reviewed-by: sviswanathan, epeter
---
 src/hotspot/share/opto/vectornode.cpp         |  66 +++
 src/hotspot/share/opto/vectornode.hpp         |   5 +
 .../compiler/lib/ir_framework/IRNode.java     |  40 ++
 .../VectorCommutativeOperSharingTest.java     |  50 ++
 .../VectorUnsignedMinMaxOperationsTest.java   | 472 ++++++++++++++++++
 5 files changed, 633 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 084b70a6906..05ef64af704 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -2237,6 +2237,72 @@ bool MulVLNode::has_uint_inputs() const {
          has_vector_elements_fit_uint(in(2));
 }
 
+static Node* UMinMaxV_Ideal(Node* n, PhaseGVN* phase, bool can_reshape) {
+  int vopc = n->Opcode();
+  assert(vopc == Op_UMinV || vopc == Op_UMaxV, "Unexpected opcode");
+
+  Node* umin = nullptr;
+  Node* umax = nullptr;
+  int lopc = n->in(1)->Opcode();
+  int ropc = n->in(2)->Opcode();
+
+  if (lopc == Op_UMinV && ropc == Op_UMaxV) {
+    umin = n->in(1);
+    umax = n->in(2);
+  } else if (lopc == Op_UMaxV && ropc == Op_UMinV) {
+    umin = n->in(2);
+    umax = n->in(1);
+  } else {
+    return nullptr;
+  }
+
+  // UMin (UMin(a, b), UMax(a, b))  => UMin(a, b)
+  // UMin (UMax(a, b), UMin(b, a))  => UMin(a, b)
+  // UMax (UMin(a, b), UMax(a, b))  => UMax(a, b)
+  // UMax (UMax(a, b), UMin(b, a))  => UMax(a, b)
+  if (umin != nullptr && umax != nullptr) {
+    if ((umin->in(1) == umax->in(1) && umin->in(2) == umax->in(2)) ||
+        (umin->in(2) == umax->in(1) && umin->in(1) == umax->in(2))) {
+      if (vopc == Op_UMinV) {
+        return new UMinVNode(umax->in(1), umax->in(2), n->bottom_type()->is_vect());
+      } else {
+        return new UMaxVNode(umax->in(1), umax->in(2), n->bottom_type()->is_vect());
+      }
+    }
+  }
+
+  return nullptr;
+}
+
+Node* UMinVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
+  Node* progress = UMinMaxV_Ideal(this, phase, can_reshape);
+  if (progress != nullptr) return progress;
+
+  return VectorNode::Ideal(phase, can_reshape);
+}
+
+Node* UMinVNode::Identity(PhaseGVN* phase) {
+  // UMin (a, a) => a
+  if (in(1) == in(2)) {
+    return in(1);
+  }
+  return this;
+}
+
+Node* UMaxVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
+  Node* progress = UMinMaxV_Ideal(this, phase, can_reshape);
+  if (progress != nullptr) return progress;
+
+  return VectorNode::Ideal(phase, can_reshape);
+}
+
+Node* UMaxVNode::Identity(PhaseGVN* phase) {
+  // UMax (a, a) => a
+  if (in(1) == in(2)) {
+    return in(1);
+  }
+  return this;
+}
 #ifndef PRODUCT
 void VectorBoxAllocateNode::dump_spec(outputStream *st) const {
   CallStaticJavaNode::dump_spec(st);
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index ae817598d39..e72c3880c79 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -675,9 +675,12 @@ class UMinVNode : public VectorNode {
   UMinVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2 ,vt) {
     assert(is_integral_type(vt->element_basic_type()), "");
   }
+  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
+  virtual Node* Identity(PhaseGVN* phase);
   virtual int Opcode() const;
 };
 
+
 //------------------------------MaxVNode--------------------------------------
 // Vector Max
 class MaxVNode : public VectorNode {
@@ -691,6 +694,8 @@ class UMaxVNode : public VectorNode {
   UMaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {
     assert(is_integral_type(vt->element_basic_type()), "");
   }
+  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
+  virtual Node* Identity(PhaseGVN* phase);
   virtual int Opcode() const;
 };
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 5dabcf0f828..ebcbd9fbbc7 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1333,6 +1333,46 @@ public class IRNode {
         vectorNode(MUL_ADD_VS2VI, "MulAddVS2VI", TYPE_INT);
     }
 
+    public static final String UMIN_VB = VECTOR_PREFIX + "UMIN_VB" + POSTFIX;
+    static {
+        vectorNode(UMIN_VB, "UMinV", TYPE_BYTE);
+    }
+
+    public static final String UMIN_VS = VECTOR_PREFIX + "UMIN_VS" + POSTFIX;
+    static {
+        vectorNode(UMIN_VS, "UMinV", TYPE_SHORT);
+    }
+
+    public static final String UMIN_VI = VECTOR_PREFIX + "UMIN_VI" + POSTFIX;
+    static {
+        vectorNode(UMIN_VI, "UMinV", TYPE_INT);
+    }
+
+    public static final String UMIN_VL = VECTOR_PREFIX + "UMIN_VL" + POSTFIX;
+    static {
+        vectorNode(UMIN_VL, "UMinV", TYPE_LONG);
+    }
+
+    public static final String UMAX_VB = VECTOR_PREFIX + "UMAX_VB" + POSTFIX;
+    static {
+        vectorNode(UMAX_VB, "UMaxV", TYPE_BYTE);
+    }
+
+    public static final String UMAX_VS = VECTOR_PREFIX + "UMAX_VS" + POSTFIX;
+    static {
+        vectorNode(UMAX_VS, "UMaxV", TYPE_SHORT);
+    }
+
+    public static final String UMAX_VI = VECTOR_PREFIX + "UMAX_VI" + POSTFIX;
+    static {
+        vectorNode(UMAX_VI, "UMaxV", TYPE_INT);
+    }
+
+    public static final String UMAX_VL = VECTOR_PREFIX + "UMAX_VL" + POSTFIX;
+    static {
+        vectorNode(UMAX_VL, "UMaxV", TYPE_LONG);
+    }
+
     // Can only be used if avx512_vnni is available.
     public static final String MUL_ADD_VS2VI_VNNI = PREFIX + "MUL_ADD_VS2VI_VNNI" + POSTFIX;
     static {
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
index c2237000e6f..73718193109 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
@@ -573,4 +573,54 @@ public void checkVectorIRSharing19() {
             Verify.checkEQ(ir1[i], (mask ? ia[i] + ib[i] : ia[i]) + (mask ? ib[i] + ia[i] : ib[i]));
         }
     }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true"})
+    public void testVectorIRSharing20(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // UMax ((UMax vec1, vec2), (UMax vec2, vec1))
+        vec1.lanewise(VectorOperators.UMAX, vec2)
+            .lanewise(VectorOperators.UMAX, vec2.lanewise(VectorOperators.UMAX, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing20")
+    public void testVectorIRSharingDriver20() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing20(i);
+        }
+        checkVectorIRSharing20();
+    }
+
+    public void checkVectorIRSharing20() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], VectorMath.maxUnsigned(ia[i], ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true"})
+    public void testVectorIRSharing21(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // UMin ((UMin vec1, vec2), (UMin vec2, vec1))
+        vec1.lanewise(VectorOperators.UMIN, vec2)
+            .lanewise(VectorOperators.UMIN, vec2.lanewise(VectorOperators.UMIN, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing21")
+    public void testVectorIRSharingDriver21() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing21(i);
+        }
+        checkVectorIRSharing21();
+    }
+
+    public void checkVectorIRSharing21() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], VectorMath.minUnsigned(ia[i], ib[i]));
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java
new file mode 100644
index 00000000000..d94d65c5143
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java
@@ -0,0 +1,472 @@
+/*
+ * 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 8342676
+* @summary Unsigned Vector Min / Max transforms
+* @modules jdk.incubator.vector
+* @library /test/lib /
+* @run driver compiler.vectorapi.VectorUnsignedMinMaxOperationsTest
+*/
+
+package compiler.vectorapi;
+
+import jdk.incubator.vector.*;
+import compiler.lib.ir_framework.*;
+import java.util.stream.IntStream;
+
+public class VectorUnsignedMinMaxOperationsTest {
+    private static final int COUNT = 2048;
+    private static final VectorSpecies<Long> lspec    = LongVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Integer> ispec = IntVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Short> sspec   = ShortVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Byte> bspec    = ByteVector.SPECIES_PREFERRED;
+
+    private long[]  long_in1;
+    private int[]   int_in1;
+    private short[] short_in1;
+    private byte[]  byte_in1;
+
+    private long[]  long_in2;
+    private int[]   int_in2;
+    private short[] short_in2;
+    private byte[]  byte_in2;
+
+    private long[]  long_out;
+    private int[]   int_out;
+    private short[] short_out;
+    private byte[]  byte_out;
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(5000)
+                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+
+    public VectorUnsignedMinMaxOperationsTest() {
+        byte_in1  = new byte[COUNT];
+        short_in1 = new short[COUNT];
+        int_in1   = new int[COUNT];
+        long_in1  = new long[COUNT];
+
+        byte_in2  = new byte[COUNT];
+        short_in2 = new short[COUNT];
+        int_in2   = new int[COUNT];
+        long_in2  = new long[COUNT];
+        IntStream.range(0, COUNT).forEach(
+            i -> {
+                if ((i & 1) == 0) {
+                    long_in1[i] = Long.MAX_VALUE;
+                    long_in2[i] = i;
+                    int_in1[i]  = Integer.MAX_VALUE;
+                    int_in2[i]  = i;
+                    short_in1[i] = Short.MAX_VALUE;
+                    short_in2[i] = (short)i;
+                    byte_in1[i]  = Byte.MAX_VALUE;
+                    byte_in2[i]  = (byte)i;
+                } else {
+                    long_in1[i] = Long.MIN_VALUE;
+                    long_in2[i] = -i;
+                    int_in1[i]  = Integer.MIN_VALUE;
+                    int_in2[i]  = -i;
+                    short_in1[i] = Short.MIN_VALUE;
+                    short_in2[i] = (short)-i;
+                    byte_in1[i]  = Byte.MIN_VALUE;
+                    byte_in2[i]  = (byte)-i;
+                }
+            }
+        );
+        long_out  = new long[COUNT];
+        int_out   = new int[COUNT];
+        short_out = new short[COUNT];
+        byte_out  = new byte[COUNT];
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umax_byte() {
+        for (int i = 0; i < COUNT; i += bspec.length()) {
+            ByteVector.fromArray(bspec, byte_in1, i)
+                      .lanewise(VectorOperators.UMAX,
+                                ByteVector.fromArray(bspec, byte_in2, i))
+                      .intoArray(byte_out, i);
+        }
+    }
+
+    @Check(test = "umax_byte", when = CheckAt.COMPILED)
+    public void umax_byte_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            byte actual = byte_out[i];
+            byte expected = VectorMath.maxUnsigned(byte_in1[i], byte_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umax_short() {
+        for (int i = 0; i < COUNT; i += sspec.length()) {
+            ShortVector.fromArray(sspec, short_in1, i)
+                       .lanewise(VectorOperators.UMAX,
+                                 ShortVector.fromArray(sspec, short_in2, i))
+                       .intoArray(short_out, i);
+        }
+    }
+
+    @Check(test = "umax_short", when = CheckAt.COMPILED)
+    public void umax_short_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            short actual = short_out[i];
+            short expected = VectorMath.maxUnsigned(short_in1[i], short_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umax_int() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector.fromArray(ispec, int_in1, i)
+                     .lanewise(VectorOperators.UMAX,
+                               IntVector.fromArray(ispec, int_in2, i))
+                     .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umax_int", when = CheckAt.COMPILED)
+    public void umax_int_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.maxUnsigned(int_in1[i], int_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umax_long() {
+        for (int i = 0; i < COUNT; i += lspec.length()) {
+            LongVector.fromArray(lspec, long_in1, i)
+                      .lanewise(VectorOperators.UMAX,
+                                LongVector.fromArray(lspec, long_in2, i))
+                      .intoArray(long_out, i);
+        }
+    }
+
+    @Check(test = "umax_long", when = CheckAt.COMPILED)
+    public void umax_long_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            long actual = long_out[i];
+            long expected = VectorMath.maxUnsigned(long_in1[i], long_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_byte() {
+        for (int i = 0; i < COUNT; i += bspec.length()) {
+            ByteVector.fromArray(bspec, byte_in1, i)
+                      .lanewise(VectorOperators.UMIN,
+                                ByteVector.fromArray(bspec, byte_in2, i))
+                      .intoArray(byte_out, i);
+        }
+    }
+
+    @Check(test = "umin_byte", when = CheckAt.COMPILED)
+    public void umin_byte_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            byte actual = byte_out[i];
+            byte expected = VectorMath.minUnsigned(byte_in1[i], byte_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_short() {
+        for (int i = 0; i < COUNT; i += sspec.length()) {
+            ShortVector.fromArray(sspec, short_in1, i)
+                       .lanewise(VectorOperators.UMIN,
+                                 ShortVector.fromArray(sspec, short_in2, i))
+                       .intoArray(short_out, i);
+        }
+    }
+
+    @Check(test = "umin_short", when = CheckAt.COMPILED)
+    public void umin_short_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            short actual = short_out[i];
+            short expected = VectorMath.minUnsigned(short_in1[i], short_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_int() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector.fromArray(ispec, int_in1, i)
+                     .lanewise(VectorOperators.UMIN,
+                               IntVector.fromArray(ispec, int_in2, i))
+                     .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_int", when = CheckAt.COMPILED)
+    public void umin_int_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.minUnsigned(int_in1[i], int_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_long() {
+        for (int i = 0; i < COUNT; i += lspec.length()) {
+            LongVector.fromArray(lspec, long_in1, i)
+                      .lanewise(VectorOperators.UMIN,
+                                LongVector.fromArray(lspec, long_in2, i))
+                      .intoArray(long_out, i);
+        }
+    }
+
+    @Check(test = "umin_long")
+    public void umin_long_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            long actual = long_out[i];
+            long expected = VectorMath.minUnsigned(long_in1[i], long_in2[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, " 0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_ir_transform1() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector.fromArray(ispec, int_in1, i)
+                     .lanewise(VectorOperators.UMIN,
+                               IntVector.fromArray(ispec, int_in1, i))
+                     .intoArray(int_out, i);
+       }
+    }
+
+    @Check(test = "umin_ir_transform1", when = CheckAt.COMPILED)
+    public void umin_ir_transform1_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.minUnsigned(int_in1[i], int_in1[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VI, " 0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umax_ir_transform1() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector.fromArray(ispec, int_in1, i)
+                     .lanewise(VectorOperators.UMAX,
+                               IntVector.fromArray(ispec, int_in1, i))
+                     .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umax_ir_transform1", when = CheckAt.COMPILED)
+    public void umax_ir_transform1_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.maxUnsigned(int_in1[i], int_in1[i]);
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_max_ir_transform1() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector vec1 = IntVector.fromArray(ispec, int_in1, i);
+            IntVector vec2 = IntVector.fromArray(ispec, int_in2, i);
+            // UMinV (UMinV vec1, vec2) (UMaxV vec1, vec2) => UMinV vec1 vec2
+            vec1.lanewise(VectorOperators.UMIN, vec2)
+                .lanewise(VectorOperators.UMIN,
+                          vec1.lanewise(VectorOperators.UMAX, vec2))
+                .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_max_ir_transform1", when = CheckAt.COMPILED)
+    public void umin_max_ir_transform1_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.minUnsigned(VectorMath.minUnsigned(int_in1[i], int_in2[i]),
+                                                  VectorMath.maxUnsigned(int_in1[i], int_in2[i]));
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_max_ir_transform2() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector vec1 = IntVector.fromArray(ispec, int_in1, i);
+            IntVector vec2 = IntVector.fromArray(ispec, int_in2, i);
+            // UMaxV (UMinV vec2, vec1) (UMaxV vec1, vec2) => UMaxV vec1 vec2
+            vec2.lanewise(VectorOperators.UMIN, vec1)
+                .lanewise(VectorOperators.UMAX,
+                          vec1.lanewise(VectorOperators.UMAX, vec2))
+                .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_max_ir_transform2", when = CheckAt.COMPILED)
+    public void umin_max_ir_transform2_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.maxUnsigned(VectorMath.minUnsigned(int_in2[i], int_in1[i]),
+                                                  VectorMath.maxUnsigned(int_in1[i], int_in2[i]));
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_max_ir_transform3() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector vec1 = IntVector.fromArray(ispec, int_in1, i);
+            IntVector vec2 = IntVector.fromArray(ispec, int_in2, i);
+            // UMaxV (UMinV vec1, vec2) (UMinV vec1, vec2) => UMinV vec1 vec2
+            vec1.lanewise(VectorOperators.UMIN, vec2)
+                .lanewise(VectorOperators.UMAX,
+                          vec1.lanewise(VectorOperators.UMIN, vec2))
+                .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_max_ir_transform3", when = CheckAt.COMPILED)
+    public void umin_max_ir_transform3_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.maxUnsigned(VectorMath.minUnsigned(int_in1[i], int_in2[i]),
+                                                  VectorMath.minUnsigned(int_in1[i], int_in2[i]));
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_max_ir_transform4() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector vec1 = IntVector.fromArray(ispec, int_in1, i);
+            IntVector vec2 = IntVector.fromArray(ispec, int_in2, i);
+            // UMinV (UMaxV vec2, vec1) (UMaxV vec1, vec2) => UMaxV vec1 vec2
+            vec2.lanewise(VectorOperators.UMAX, vec1)
+                .lanewise(VectorOperators.UMIN,
+                          vec1.lanewise(VectorOperators.UMAX, vec2))
+                .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_max_ir_transform4", when = CheckAt.COMPILED)
+    public void umin_max_ir_transform4_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.minUnsigned(VectorMath.maxUnsigned(int_in2[i], int_in1[i]),
+                                                  VectorMath.maxUnsigned(int_in1[i], int_in2[i]));
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @Warmup(value = 10000)
+    public void umin_max_ir_transform5() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            IntVector vec1 = IntVector.fromArray(ispec, int_in1, i);
+            IntVector vec2 = IntVector.fromArray(ispec, int_in2, i);
+            // UMaxV (UMinV vec1, vec2) (UMaxV vec2, vec1) => UMaxV vec1 vec2
+            vec1.lanewise(VectorOperators.UMIN, vec2)
+                .lanewise(VectorOperators.UMAX,
+                          vec2.lanewise(VectorOperators.UMAX, vec1))
+                .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "umin_max_ir_transform5", when = CheckAt.COMPILED)
+    public void umin_max_ir_transform5_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = VectorMath.maxUnsigned(VectorMath.minUnsigned(int_in1[i], int_in2[i]),
+                                                  VectorMath.maxUnsigned(int_in2[i], int_in1[i]));
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+}
+

From 21b0f5ea153c633de7f09bdb0399308c890f7e43 Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Sat, 26 Apr 2025 05:46:05 +0000
Subject: [PATCH 147/901] 8355637: SSLSessionImpl's "serialization" list
 documentation is incorrectly ordered

Reviewed-by: ascarpino
---
 .../classes/sun/security/ssl/SSLSessionImpl.java      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 2e7d99ee293..566415e23c7 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -27,7 +27,6 @@
 import sun.security.provider.X509Factory;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.security.Principal;
@@ -279,6 +278,8 @@ final class SSLSessionImpl extends ExtendedSSLSession {
      * < 1 byte > Number of requestedServerNames entries
      *   < 1 byte > ServerName length
      *   < length in bytes > ServerName
+     * < 4 bytes > maximumPacketSize
+     * < 4 bytes > negotiatedMaxFragSize
      * < 4 bytes > creationTime
      * < 2 byte > status response length
      *   < 2 byte > status response entry length
@@ -304,8 +305,6 @@ final class SSLSessionImpl extends ExtendedSSLSession {
      *       < length in bytes> PSK identity
      *   Anonymous
      *     < 1 byte >
-     * < 4 bytes > maximumPacketSize
-     * < 4 bytes > negotiatedMaxFragSize
      */
 
     SSLSessionImpl(HandshakeContext hc, ByteBuffer buf) throws IOException {
@@ -1300,12 +1299,12 @@ public String[] getValueNames() {
     /**
      * Use large packet sizes now or follow RFC 2246 packet sizes (2^14)
      * until changed.
-     *
+     * <P>
      * In the TLS specification (section 6.2.1, RFC2246), it is not
      * recommended that the plaintext has more than 2^14 bytes.
      * However, some TLS implementations violate the specification.
      * This is a workaround for interoperability with these stacks.
-     *
+     * <P>
      * Application could accept large fragments up to 2^15 bytes by
      * setting the system property jsse.SSLEngine.acceptLargeFragments
      * to "true".
@@ -1318,7 +1317,7 @@ public String[] getValueNames() {
      * Expand the buffer size of both SSL/TLS network packet and
      * application data.
      */
-    protected void expandBufferSizes() {
+    void expandBufferSizes() {
         sessionLock.lock();
         try {
             acceptLargeFragments = true;

From 898d4798003d7b9cd54ef3a149eb037998a39887 Mon Sep 17 00:00:00 2001
From: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Sun, 27 Apr 2025 02:29:44 +0000
Subject: [PATCH 148/901] 8355077: Compiler error at splashscreen_gif.c due to
 unterminated string initialization

Reviewed-by: prr
---
 .../share/native/libsplashscreen/splashscreen_gif.c         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c b/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
index 3654c677493..cbdad61f78e 100644
--- a/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
+++ b/src/java.desktop/share/native/libsplashscreen/splashscreen_gif.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, 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
@@ -48,7 +48,7 @@
                                 // restore the area overwritten by the graphic with
                                 // what was there prior to rendering the graphic.
 
-static const char szNetscape20ext[11] = "NETSCAPE2.0";
+static const char szNetscape20ext[] = "NETSCAPE2.0";
 
 #define NSEXT_LOOP      0x01    // Loop Count field code
 
@@ -181,7 +181,7 @@ SplashDecodeGif(Splash * splash, GifFileType * gif)
                 }
             case APPLICATION_EXT_FUNC_CODE:
                 {
-                    if (size == sizeof(szNetscape20ext)
+                    if (size == strlen(szNetscape20ext)
                         && memcmp(pExtension, szNetscape20ext, size) == 0) {
                         int iSubCode;
 

From 4e7b5133721f455f84cddecf7dd18ced0d2c8243 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Sun, 27 Apr 2025 06:05:50 +0000
Subject: [PATCH 149/901] 8351333: [ubsan] CDSMapLogger::log_region applying
 non-zero offset to null pointer

Reviewed-by: ccheung
---
 src/hotspot/share/cds/archiveBuilder.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index c309de17b4c..c1ffd60370b 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -1201,7 +1201,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 #undef _LOG_PREFIX
 
   // Log information about a region, whose address at dump time is [base .. top). At
-  // runtime, this region will be mapped to requested_base. requested_base is 0 if this
+  // runtime, this region will be mapped to requested_base. requested_base is nullptr if this
   // region will be mapped at os-selected addresses (such as the bitmap region), or will
   // be accessed with os::read (the header).
   //
@@ -1210,7 +1210,11 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   static void log_region(const char* name, address base, address top, address requested_base) {
     size_t size = top - base;
     base = requested_base;
-    top = requested_base + size;
+    if (requested_base == nullptr) {
+      top = (address)size;
+    } else {
+      top = requested_base + size;
+    }
     log_info(cds, map)("[%-18s " PTR_FORMAT " - " PTR_FORMAT " %9zu bytes]",
                        name, p2i(base), p2i(top), size);
   }

From 04bb5dcf5759509e0239a6049db9ae2b97880aa9 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy.wood@mac.com>
Date: Sun, 27 Apr 2025 11:24:29 +0000
Subject: [PATCH 150/901] 8355203: [macos] AquaButtonUI and AquaRootPaneUI
 repaint default button unnecessarily

Reviewed-by: serb, prr
---
 .../classes/apple/laf/JRSUIConstants.java     |  10 +-
 .../com/apple/laf/AquaButtonBorder.java       |   8 +-
 .../classes/com/apple/laf/AquaButtonUI.java   |  34 +--
 .../classes/com/apple/laf/AquaRootPaneUI.java |  93 +------
 .../RootPane/RootPaneDefaultButtonTest.java   | 249 ++++++++++++++++++
 5 files changed, 262 insertions(+), 132 deletions(-)
 create mode 100644 test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java

diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java
index 1e98cb19ba4..9da55002b72 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, 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
@@ -194,6 +194,14 @@ public static class State extends Property {
         @Native private static final byte _pressed = 4;
         public static final State PRESSED = new State(_pressed);
         @Native private static final byte _pulsed = 5;
+        /**
+         * This identifies the default button in a window/dialog.
+         * The name PULSED has become misleading over time.
+         * The default button used to continually pulse up until
+         * Mac OS 10.9, but now there is no pulsing animation.
+         * We still need this State constant to render default
+         * buttons correctly, though.
+         */
         public static final State PULSED = new State(_pulsed);
         @Native private static final byte _rollover = 6;
         public static final State ROLLOVER = new State(_rollover);
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
index 1d11a0a8d96..60ceb4893a8 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonBorder.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
@@ -202,12 +202,6 @@ public Dynamic(final Dynamic other) {
             super(other);
         }
 
-        protected State getButtonState(final AbstractButton b, final ButtonModel model) {
-            final State state = super.getButtonState(b, model);
-            painter.state.set(state == State.PULSED ? Animating.YES : Animating.NO);
-            return state;
-        }
-
         public Insets getContentInsets(final AbstractButton b, final int width, final int height) {
             final Size size = AquaUtilControlSize.getUserSizeFrom(b);
             final Widget style = getStyleForSize(b, size, width, height);
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
index 063923ff807..17818d09121 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.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
@@ -58,8 +58,6 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
-import javax.swing.event.AncestorEvent;
-import javax.swing.event.AncestorListener;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.RootPaneUI;
@@ -225,8 +223,6 @@ protected void installListeners(final AbstractButton b) {
             // put the listener in the button's client properties so that
             // we can get at it later
             b.putClientProperty(this, listener);
-
-            b.addAncestorListener(listener);
         }
         installHierListener(b);
         AquaUtilControlSize.addSizePropertyListener(b);
@@ -252,11 +248,7 @@ protected void uninstallKeyboardActions(final AbstractButton b) {
 
     protected void uninstallListeners(final AbstractButton b) {
         super.uninstallListeners(b);
-        final AquaButtonListener listener = (AquaButtonListener)b.getClientProperty(this);
         b.putClientProperty(this, null);
-        if (listener != null) {
-            b.removeAncestorListener(listener);
-        }
         uninstallHierListener(b);
         AquaUtilControlSize.removeSizePropertyListener(b);
     }
@@ -591,7 +583,7 @@ public void hierarchyChanged(final HierarchyEvent e) {
         }
     }
 
-    class AquaButtonListener extends BasicButtonListener implements AncestorListener {
+    class AquaButtonListener extends BasicButtonListener {
         protected final AbstractButton b;
 
         public AquaButtonListener(final AbstractButton b) {
@@ -658,27 +650,5 @@ public void propertyChange(final PropertyChangeEvent e) {
                 }
             }
         }
-
-        public void ancestorMoved(final AncestorEvent e) {}
-
-        public void ancestorAdded(final AncestorEvent e) {
-            updateDefaultButton();
-        }
-
-        public void ancestorRemoved(final AncestorEvent e) {
-            updateDefaultButton();
-        }
-
-        protected void updateDefaultButton() {
-            if (!(b instanceof JButton)) return;
-            if (!((JButton)b).isDefaultButton()) return;
-
-            final JRootPane rootPane = b.getRootPane();
-            if (rootPane == null) return;
-
-            final RootPaneUI ui = rootPane.getUI();
-            if (!(ui instanceof AquaRootPaneUI)) return;
-            ((AquaRootPaneUI)ui).updateDefaultButton(rootPane);
-        }
     }
 }
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
index 2b4e1bb0867..6bd472b7605 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaRootPaneUI.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
@@ -40,17 +40,10 @@
 /**
  * From AquaRootPaneUI.java
  *
- * The JRootPane manages the default button.  There can be only one active rootpane,
- * and one default button, so we need only one timer
- *
  * AquaRootPaneUI is a singleton object
  */
 public class AquaRootPaneUI extends BasicRootPaneUI implements AncestorListener, WindowListener, ContainerListener {
     private static final RecyclableSingleton<AquaRootPaneUI> sRootPaneUI = new RecyclableSingletonFromDefaultConstructor<AquaRootPaneUI>(AquaRootPaneUI.class);
-
-    static final int kDefaultButtonPaintDelayBetweenFrames = 50;
-    JButton fCurrentDefaultButton = null;
-    Timer fTimer = null;
     static final boolean sUseScreenMenuBar = AquaMenuBarUI.getScreenMenuBarProperty();
 
     public static ComponentUI createUI(final JComponent c) {
@@ -61,10 +54,6 @@ public void installUI(final JComponent c) {
         super.installUI(c);
         c.addAncestorListener(this);
 
-        if (c.isShowing() && c.isEnabled()) {
-            updateDefaultButton((JRootPane)c);
-        }
-
         // for <rdar://problem/3689020> REGR: Realtime LAF updates no longer work
         //
         // because the JFrame parent has a LAF background set (why without a UI element I don't know!)
@@ -92,7 +81,6 @@ public void installUI(final JComponent c) {
     }
 
     public void uninstallUI(final JComponent c) {
-        stopTimer();
         c.removeAncestorListener(this);
 
         if (sUseScreenMenuBar) {
@@ -161,73 +149,6 @@ public void componentRemoved(final ContainerEvent e) {
         }
     }
 
-    /**
-     * Invoked when a property changes on the root pane. If the event
-     * indicates the {@code defaultButton} has changed, this will
-     * update the animation.
-     * If the enabled state changed, it will start or stop the animation
-     */
-    public void propertyChange(final PropertyChangeEvent e) {
-        super.propertyChange(e);
-
-        final String prop = e.getPropertyName();
-        if ("defaultButton".equals(prop) || "temporaryDefaultButton".equals(prop)) {
-            // Change the animating button if this root is showing and enabled
-            // otherwise do nothing - someone else may be active
-            final JRootPane root = (JRootPane)e.getSource();
-
-            if (root.isShowing() && root.isEnabled()) {
-                updateDefaultButton(root);
-            }
-        } else if ("enabled".equals(prop) || AquaFocusHandler.FRAME_ACTIVE_PROPERTY.equals(prop)) {
-            final JRootPane root = (JRootPane)e.getSource();
-            if (root.isShowing()) {
-                if (((Boolean)e.getNewValue()).booleanValue()) {
-                    updateDefaultButton((JRootPane)e.getSource());
-                } else {
-                    stopTimer();
-                }
-            }
-        }
-    }
-
-    synchronized void stopTimer() {
-        if (fTimer != null) {
-            fTimer.stop();
-            fTimer = null;
-        }
-    }
-
-    synchronized void updateDefaultButton(final JRootPane root) {
-        final JButton button = root.getDefaultButton();
-        //System.err.println("in updateDefaultButton button = " + button);
-        fCurrentDefaultButton = button;
-        stopTimer();
-        if (button != null) {
-            fTimer = new Timer(kDefaultButtonPaintDelayBetweenFrames, new DefaultButtonPainter(root));
-            fTimer.start();
-        }
-    }
-
-    class DefaultButtonPainter implements ActionListener {
-        JRootPane root;
-
-        public DefaultButtonPainter(final JRootPane root) {
-            this.root = root;
-        }
-
-        public void actionPerformed(final ActionEvent e) {
-            final JButton defaultButton = root.getDefaultButton();
-            if ((defaultButton != null) && defaultButton.isShowing()) {
-                if (defaultButton.isEnabled()) {
-                    defaultButton.repaint();
-                }
-            } else {
-                stopTimer();
-            }
-        }
-    }
-
     /**
      * This is sort of like viewDidMoveToWindow:.  When the root pane is put into a window
      * this method gets called for the notification.
@@ -249,18 +170,6 @@ public void ancestorAdded(final AncestorEvent event) {
             owningWindow.removeWindowListener(this);
             owningWindow.addWindowListener(this);
         }
-
-        // The root pane has been added to the hierarchy.  If it's enabled update the default
-        // button to start the throbbing.  Since the UI is a singleton make sure the root pane
-        // we are checking has a default button before calling update otherwise we will stop
-        // throbbing the current default button.
-        final JComponent comp = event.getComponent();
-        if (comp instanceof JRootPane) {
-            final JRootPane rp = (JRootPane)comp;
-            if (rp.isEnabled() && rp.getDefaultButton() != null) {
-                updateDefaultButton((JRootPane)comp);
-            }
-        }
     }
 
     /**
diff --git a/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java b/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
new file mode 100644
index 00000000000..f314d48841c
--- /dev/null
+++ b/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
@@ -0,0 +1,249 @@
+/*
+ * 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 headful
+ * @bug 8344697
+ * @summary Default button in AquaRootPaneUI should paint special background color
+ * @requires (os.family == "mac")
+ * @run main RootPaneDefaultButtonTest
+ */
+
+import javax.swing.*;
+import javax.swing.border.*;
+import java.awt.*;
+import java.awt.event.*;
+
+/**
+ * This presents two dialogs, each with two possible default buttons. The
+ * background color of the default button should change based on which radio
+ * button is selected.
+ * <p>
+ * Note we've never expected this test to fail. This test was introduced
+ * because the resolution to JDK-8344697 involved removing code, and we wanted
+ * to double-check that the removed code didn't negatively affect how default
+ * buttons are repainted.
+ */
+public class RootPaneDefaultButtonTest extends JDialog {
+
+    record ButtonRenderingExpectation(JButton button,
+                                      boolean appearAsDefault) {}
+
+    public static void main(String[] args) throws Exception {
+        if (!System.getProperty("os.name").contains("OS X")) {
+            System.out.println("This test is for MacOS only.");
+            return;
+        }
+
+        RootPaneDefaultButtonTest window1 = new RootPaneDefaultButtonTest();
+        RootPaneDefaultButtonTest window2 = new RootPaneDefaultButtonTest();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                Rectangle r1 = new Rectangle(0, 20,
+                        window1.getWidth(), window1.getHeight());
+                window1.setBounds(r1);
+
+                Rectangle r2 = new Rectangle((int) (r1.getMaxX() + 10), 20,
+                        window2.getWidth(), window2.getHeight());
+                window2.setBounds(r2);
+
+                window1.setVisible(true);
+                window2.setVisible(true);
+            }
+        });
+
+        Robot robot = new Robot();
+
+        test(robot, window1.radioButton1,
+                new ButtonRenderingExpectation(window1.button1, true),
+                new ButtonRenderingExpectation(window1.button2, false),
+                new ButtonRenderingExpectation(window2.button1, false),
+                new ButtonRenderingExpectation(window2.button2, false));
+
+        test(robot, window1.radioButton2,
+                new ButtonRenderingExpectation(window1.button1, false),
+                new ButtonRenderingExpectation(window1.button2, true),
+                new ButtonRenderingExpectation(window2.button1, false),
+                new ButtonRenderingExpectation(window2.button2, false));
+
+        test(robot, window1.radioButton3,
+                new ButtonRenderingExpectation(window1.button1, false),
+                new ButtonRenderingExpectation(window1.button2, false),
+                new ButtonRenderingExpectation(window2.button1, false),
+                new ButtonRenderingExpectation(window2.button2, false));
+
+        test(robot, window2.radioButton1,
+                new ButtonRenderingExpectation(window1.button1, false),
+                new ButtonRenderingExpectation(window1.button2, false),
+                new ButtonRenderingExpectation(window2.button1, true),
+                new ButtonRenderingExpectation(window2.button2, false));
+
+        test(robot, window2.radioButton2,
+                new ButtonRenderingExpectation(window1.button1, false),
+                new ButtonRenderingExpectation(window1.button2, false),
+                new ButtonRenderingExpectation(window2.button1, false),
+                new ButtonRenderingExpectation(window2.button2, true));
+
+        test(robot, window2.radioButton3,
+                new ButtonRenderingExpectation(window1.button1, false),
+                new ButtonRenderingExpectation(window1.button2, false),
+                new ButtonRenderingExpectation(window2.button1, false),
+                new ButtonRenderingExpectation(window2.button2, false));
+
+        System.out.println("Test passed successfully");
+    }
+
+    private static void test(Robot robot, AbstractButton buttonToClick,
+                             ButtonRenderingExpectation... expectations)
+            throws Exception {
+        robot.delay(100);
+
+        Point mouseLoc = buttonToClick.getLocationOnScreen();
+        robot.mouseMove(mouseLoc.x + buttonToClick.getSize().width / 2,
+                mouseLoc.y + buttonToClick.getSize().height / 2);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.delay(20);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        robot.delay(100);
+
+        // the colors may change depending on your system's appearance.
+        // Depending on how you've configured "Appearance" in the
+        // System Settings app: the default button may be blue (the default),
+        // red, purple, etc. So instead of checking for a specific color: we'll
+        // make sure 3-4 are the same color, and one is significantly
+        // different.
+        Color defaultColor = null;
+        Color nonDefaultColor = null;
+
+        for (ButtonRenderingExpectation expectation : expectations) {
+            int x = expectation.button.getLocationOnScreen().x + 20;
+            int y = expectation.button.getLocationOnScreen().y + 10;
+
+            // this mouseMove is optional, but it helps debug this test to see
+            // where we're sampling the pixel color from:
+            robot.mouseMove(x, y);
+
+            Color c = robot.getPixelColor(x, y);
+            if (expectation.appearAsDefault) {
+                if (defaultColor == null) {
+                    defaultColor = c;
+                } else {
+                    throw new IllegalStateException(
+                            "there should only be at most 1 default button");
+                }
+            } else {
+                if (nonDefaultColor == null) {
+                    nonDefaultColor = c;
+                } else if (!isSimilar(nonDefaultColor, c)) {
+                    throw new IllegalStateException(
+                            "these two colors should match: " + c + ", " +
+                                    nonDefaultColor);
+                }
+            }
+        }
+
+        if (defaultColor != null && isSimilar(defaultColor, nonDefaultColor)) {
+            throw new IllegalStateException(
+                    "The default button and non-default buttons should " +
+                            "look different: " + defaultColor + " matches " +
+                            nonDefaultColor);
+        }
+    }
+
+    private static boolean isSimilar(Color c1, Color c2) {
+        if (Math.abs(c1.getRed() - c2.getRed()) > 15) {
+            return false;
+        }
+        if (Math.abs(c1.getGreen() - c2.getGreen()) > 15) {
+            return false;
+        }
+        if (Math.abs(c1.getBlue() - c2.getBlue()) > 15) {
+            return false;
+        }
+        return true;
+    }
+
+    JRadioButton radioButton1 = new JRadioButton(
+            "\"Button 1\" is the default button");
+    JRadioButton radioButton2 = new JRadioButton(
+            "\"Button 2\" is the default button");
+    JRadioButton radioButton3 = new JRadioButton("No default button");
+
+    JButton button1 = new JButton("Button 1");
+    JButton button2 = new JButton("Button 2");
+
+    public RootPaneDefaultButtonTest() {
+        getContentPane().setLayout(new BorderLayout());
+        getContentPane().add(createRadioButtonPanel(), BorderLayout.NORTH);
+        getContentPane().add(createPushButtonRow(), BorderLayout.SOUTH);
+        pack();
+
+        radioButton1.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                getRootPane().setDefaultButton(button1);
+            }
+        });
+
+        radioButton2.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                getRootPane().setDefaultButton(button2);
+            }
+        });
+
+        radioButton3.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                getRootPane().setDefaultButton(null);
+            }
+        });
+
+        ButtonGroup g = new ButtonGroup();
+        g.add(radioButton1);
+        g.add(radioButton2);
+        g.add(radioButton3);
+        radioButton1.doClick();
+    }
+
+    private JPanel createPushButtonRow() {
+        JPanel p = new JPanel(new GridLayout(1, 2));
+        p.add(button1);
+        p.add(button2);
+        p.setBorder(new EmptyBorder(5,5,5,5));
+        return p;
+    }
+
+    private JPanel createRadioButtonPanel() {
+        JPanel p = new JPanel(new GridLayout(3, 1));
+        p.add(radioButton1);
+        p.add(radioButton2);
+        p.add(radioButton3);
+        p.setBorder(new EmptyBorder(5,5,5,5));
+        return p;
+    }
+}

From 9c86ac27236a67ff7d84447821d89772b993f7e1 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Sun, 27 Apr 2025 11:44:40 +0000
Subject: [PATCH 151/901] 8354495: Open source several AWT DataTransfer tests

Reviewed-by: azvegint
---
 test/jdk/ProblemList.txt                      |   3 +
 .../ClipboardPerformanceTest.java             | 133 +++++++++++++
 .../HTMLTransferConsoleOutputTest.java        | 182 ++++++++++++++++++
 .../datatransfer/ImageTransferCrashTest.java  | 147 ++++++++++++++
 4 files changed, 465 insertions(+)
 create mode 100644 test/jdk/java/awt/datatransfer/ClipboardPerformanceTest.java
 create mode 100644 test/jdk/java/awt/datatransfer/HTMLTransferConsoleOutputTest.java
 create mode 100644 test/jdk/java/awt/datatransfer/ImageTransferCrashTest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index b6307d1ed00..c17d8dbe559 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -189,6 +189,9 @@ java/awt/Mouse/EnterExitEvents/DragWindowTest.java 8298823 macosx-all
 java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java 6829264 generic-all
 java/awt/datatransfer/DragImage/MultiResolutionDragImageTest.java 8080982 generic-all
 java/awt/datatransfer/SystemFlavorMap/AddFlavorTest.java 8079268 linux-all
+java/awt/datatransfer/ClipboardPerformanceTest.java 8029022 windows-all
+java/awt/datatransfer/HTMLTransferConsoleOutputTest.java 8237254 macosx-all
+java/awt/datatransfer/ImageTransferCrashTest.java 8237253 macosx-all
 java/awt/Toolkit/RealSync/Test.java 6849383 linux-all
 java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252 windows-all
 java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java 8072110 macosx-all
diff --git a/test/jdk/java/awt/datatransfer/ClipboardPerformanceTest.java b/test/jdk/java/awt/datatransfer/ClipboardPerformanceTest.java
new file mode 100644
index 00000000000..3bad044b949
--- /dev/null
+++ b/test/jdk/java/awt/datatransfer/ClipboardPerformanceTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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 4463560
+ * @requires (os.family == "windows")
+ * @summary Tests that datatransfer doesn't take too much time to complete
+ * @key headful
+ * @library /test/lib
+ * @run main/timeout=300 ClipboardPerformanceTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ClipboardPerformanceTest {
+    public static final int CODE_FAILURE = 1;
+    public static final int CODE_OTHER_FAILURE = 2;
+    static String eoln;
+    static char[] text;
+    public static final int ARRAY_SIZE = 100000;
+    public static final int RATIO_THRESHOLD = 10;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            ClipboardPerformanceTest clipboardPerformanceTest = new ClipboardPerformanceTest();
+            clipboardPerformanceTest.initialize();
+            return;
+        }
+
+        long before, after, oldTime, newTime;
+        float ratio;
+
+        try {
+            Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
+            before = System.currentTimeMillis();
+            String ss = (String) t.getTransferData(new DataFlavor("text/plain; class=java.lang.String"));
+            after = System.currentTimeMillis();
+
+            System.err.println("Size: " + ss.length());
+            newTime = after - before;
+            System.err.println("Time consumed: " + newTime);
+
+            initArray();
+
+            StringBuffer buf = new StringBuffer(new String(text));
+            int eoln_len = eoln.length();
+            before = System.currentTimeMillis();
+
+            for (int i = 0; i + eoln_len <= buf.length(); i++) {
+                if (eoln.equals(buf.substring(i, i + eoln_len))) {
+                    buf.replace(i, i + eoln_len, "\n");
+                }
+            }
+
+            after = System.currentTimeMillis();
+            oldTime = after - before;
+            System.err.println("Old algorithm: " + oldTime);
+            ratio = oldTime / newTime;
+            System.err.println("Ratio: " + ratio);
+
+            if (ratio < RATIO_THRESHOLD) {
+                System.out.println("Time ratio failure!!");
+                System.exit(CODE_FAILURE);
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+            System.exit(CODE_OTHER_FAILURE);
+        }
+        System.out.println("Test Pass!");
+    }
+
+    public static void initArray() {
+        text = new char[ARRAY_SIZE + 2];
+
+        for (int i = 0; i < ARRAY_SIZE; i += 3) {
+            text[i] = '\r';
+            text[i + 1] = '\n';
+            text[i + 2] = 'a';
+        }
+        eoln = "\r\n";
+    }
+
+    public void initialize() throws Exception {
+        initArray();
+        Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
+        cb.setContents(new StringSelection(new String(text)), null);
+
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                ClipboardPerformanceTest.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+}
diff --git a/test/jdk/java/awt/datatransfer/HTMLTransferConsoleOutputTest.java b/test/jdk/java/awt/datatransfer/HTMLTransferConsoleOutputTest.java
new file mode 100644
index 00000000000..6a18a11270f
--- /dev/null
+++ b/test/jdk/java/awt/datatransfer/HTMLTransferConsoleOutputTest.java
@@ -0,0 +1,182 @@
+/*
+ * 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 4638351
+ * @summary tests that HTML transfer doesn't cause console output
+ * @key headful
+ * @library /test/lib
+ * @run main HTMLTransferConsoleOutputTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class HTMLTransferConsoleOutputTest implements ClipboardOwner {
+    static final Clipboard clipboard =
+            Toolkit.getDefaultToolkit().getSystemClipboard();
+    static final DataFlavor dataFlavor =
+            new DataFlavor("text/html; class=java.lang.String", null);
+    static final String magic = "TESTMAGICSTRING";
+    static final Transferable transferable = new Transferable() {
+        final DataFlavor[] flavors = new DataFlavor[]{dataFlavor};
+        final String data = "<html><body>" + magic + "</html></body>";
+
+        public DataFlavor[] getTransferDataFlavors() {
+            return flavors;
+        }
+
+        public boolean isDataFlavorSupported(DataFlavor df) {
+            return dataFlavor.equals(df);
+        }
+
+        public Object getTransferData(DataFlavor df)
+                throws UnsupportedFlavorException {
+            if (!isDataFlavorSupported(df)) {
+                throw new UnsupportedFlavorException(df);
+            }
+            return data;
+        }
+    };
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    public static final int CLIPBOARD_DELAY = 1000;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            HTMLTransferConsoleOutputTest htmlTransferConsoleOutputTest = new HTMLTransferConsoleOutputTest();
+            htmlTransferConsoleOutputTest.initialize();
+            return;
+        }
+        final ClipboardOwner clipboardOwner = new ClipboardOwner() {
+            public void lostOwnership(Clipboard clip,
+                                      Transferable contents) {
+                System.exit(0);
+            }
+        };
+        clipboard.setContents(transferable, clipboardOwner);
+        final Object o = new Object();
+        synchronized (o) {
+            try {
+                o.wait();
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+            }
+        }
+        System.out.println("Test Pass!");
+    }
+
+    public void initialize() throws Exception {
+        clipboard.setContents(transferable, this);
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                HTMLTransferConsoleOutputTest.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        byte[] bytes = baos.toByteArray();
+        String string = null;
+        try {
+            string = new String(bytes, "ASCII");
+        } catch (UnsupportedEncodingException uee) {
+            uee.printStackTrace();
+        }
+        if (string.lastIndexOf(magic) != -1) {
+            throw new RuntimeException("Test failed. Output contains:" +
+                    string);
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+
+
+    static class ForkOutputStream extends OutputStream {
+        final OutputStream outputStream1;
+        final OutputStream outputStream2;
+
+        public ForkOutputStream(OutputStream os1, OutputStream os2) {
+            outputStream1 = os1;
+            outputStream2 = os2;
+        }
+
+        public void write(int b) throws IOException {
+            outputStream1.write(b);
+            outputStream2.write(b);
+        }
+
+        public void flush() throws IOException {
+            outputStream1.flush();
+            outputStream2.flush();
+        }
+
+        public void close() throws IOException {
+            outputStream1.close();
+            outputStream2.close();
+        }
+    }
+
+    public void lostOwnership(Clipboard clip, Transferable contents) {
+        final Runnable r = () -> {
+            try {
+                Thread.sleep(CLIPBOARD_DELAY);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            final PrintStream oldOut = System.out;
+            final PrintStream newOut =
+                    new PrintStream(new ForkOutputStream(oldOut, baos));
+            Transferable t = clipboard.getContents(null);
+            try {
+                System.setOut(newOut);
+                t.getTransferData(dataFlavor);
+                System.setOut(oldOut);
+            } catch (IOException | UnsupportedFlavorException ioe) {
+                ioe.printStackTrace();
+            }
+            clipboard.setContents(transferable, null);
+        };
+        final Thread t = new Thread(r);
+        t.start();
+    }
+}
diff --git a/test/jdk/java/awt/datatransfer/ImageTransferCrashTest.java b/test/jdk/java/awt/datatransfer/ImageTransferCrashTest.java
new file mode 100644
index 00000000000..76e484b3ce2
--- /dev/null
+++ b/test/jdk/java/awt/datatransfer/ImageTransferCrashTest.java
@@ -0,0 +1,147 @@
+/*
+ * 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 4513976
+ * @summary tests that inter-JVM image transfer doesn't cause crash
+ * @key headful
+ * @library /test/lib
+ * @run main ImageTransferCrashTest
+ */
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ImageTransferCrashTest implements ClipboardOwner {
+    static final Clipboard clipboard =
+            Toolkit.getDefaultToolkit().getSystemClipboard();
+    final Transferable textTransferable = new StringSelection("TEXT");
+    public static final int CLIPBOARD_DELAY = 10;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            ImageTransferCrashTest imageTransferCrashTest = new ImageTransferCrashTest();
+            imageTransferCrashTest.initialize();
+            return;
+        }
+        final ClipboardOwner clipboardOwner = (clip, contents) -> System.exit(0);
+        final int width = 100;
+        final int height = 100;
+        final BufferedImage bufferedImage =
+                new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        final WritableRaster writableRaster =
+                bufferedImage.getWritableTile(0, 0);
+        final int[] color = new int[]{0x80, 0x80, 0x80};
+        for (int i = 0; i < width; i++) {
+            for (int j = 0; j < height; j++) {
+                writableRaster.setPixel(i, j, color);
+            }
+        }
+        bufferedImage.releaseWritableTile(0, 0);
+
+        final Transferable imageTransferable = new Transferable() {
+            final DataFlavor[] flavors = new DataFlavor[]{
+                    DataFlavor.imageFlavor};
+
+            public DataFlavor[] getTransferDataFlavors() {
+                return flavors;
+            }
+
+            public boolean isDataFlavorSupported(DataFlavor df) {
+                return DataFlavor.imageFlavor.equals(df);
+            }
+
+            public Object getTransferData(DataFlavor df)
+                    throws UnsupportedFlavorException {
+                if (!isDataFlavorSupported(df)) {
+                    throw new UnsupportedFlavorException(df);
+                }
+                return bufferedImage;
+            }
+        };
+        clipboard.setContents(imageTransferable, clipboardOwner);
+        final Object o = new Object();
+        synchronized (o) {
+            try {
+                o.wait();
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+            }
+        }
+        System.out.println("Test Pass!");
+    }
+
+    public void initialize() throws Exception {
+        clipboard.setContents(textTransferable, this);
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+                ImageTransferCrashTest.class.getName(),
+                "child"
+        );
+
+        Process process = ProcessTools.startProcess("Child", pb);
+        OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+        if (!process.waitFor(15, TimeUnit.SECONDS)) {
+            process.destroyForcibly();
+            throw new TimeoutException("Timed out waiting for Child");
+        }
+
+        outputAnalyzer.shouldHaveExitValue(0);
+    }
+
+    public void lostOwnership(Clipboard clip, Transferable contents) {
+        final Runnable r = () -> {
+            while (true) {
+                try {
+                    Thread.sleep(CLIPBOARD_DELAY);
+                    Transferable t = clipboard.getContents(null);
+                    t.getTransferData(DataFlavor.imageFlavor);
+                } catch (IllegalStateException e) {
+                    e.printStackTrace();
+                    System.err.println("clipboard is not prepared yet");
+                    continue;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            }
+            clipboard.setContents(textTransferable, null);
+        };
+        final Thread t = new Thread(r);
+        t.start();
+    }
+}

From cd6f0d19d5da03eafde68142528c0f85d783cbea Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Sun, 27 Apr 2025 20:10:20 +0000
Subject: [PATCH 152/901] 8355336: GenShen: Resume Old GC even with
 back-to-back Young GC triggers

Reviewed-by: wkemper
---
 .../heuristics/shenandoahOldHeuristics.cpp    |  9 +++------
 .../heuristics/shenandoahYoungHeuristics.cpp  |  1 +
 .../shenandoah/shenandoahRegulatorThread.cpp  | 20 ++++++++-----------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
index cf1a76ff4ff..2d0bbfd5e4a 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
@@ -639,12 +639,9 @@ bool ShenandoahOldHeuristics::should_resume_old_cycle() {
 bool ShenandoahOldHeuristics::should_start_gc() {
 
   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");
+  if (!_old_generation->is_idle()) {
+    // Do not try to start an old cycle if old-gen is marking, doing mixed evacuations, or coalescing and filling.
+    log_debug(gc)("Not starting an old cycle because old gen is busy");
     return false;
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
index ba09eeb8794..3aca436104b 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
@@ -120,6 +120,7 @@ bool ShenandoahYoungHeuristics::should_start_gc() {
       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.
+        log_debug(gc)("Young heuristics declines to trigger because old_time_elapsed < ShenandoahMinimumOldTimeMs");
         return false;
       }
     }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
index bf309af9743..774c4f7d941 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
@@ -67,22 +67,18 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
           _global_heuristics->cancel_trigger_request();
         }
       } else {
-        if (_young_heuristics->should_start_gc()) {
-          // Give the old generation a chance to run. The old generation cycle
-          // 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();
-            _old_heuristics->cancel_trigger_request();
-          } 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 (_old_heuristics->should_resume_old_cycle()) {
           if (request_concurrent_gc(_heap->old_generation())) {
             _old_heuristics->cancel_trigger_request();
             log_debug(gc)("Heuristics request to resume old collection accepted");
           }
+        } else 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 (start_young_cycle()) {
+          log_debug(gc)("Heuristics request for young collection accepted");
+          _young_heuristics->cancel_trigger_request();
         }
       }
     } else if (mode == ShenandoahGenerationalControlThread::servicing_old) {

From 1f228e5539a5faa3b28e12548f8ad97eeacf3298 Mon Sep 17 00:00:00 2001
From: Damon Fenacci <dfenacci@openjdk.org>
Date: Mon, 28 Apr 2025 06:18:53 +0000
Subject: [PATCH 153/901] 8354119: Missing C2 proper allocation failure
 handling during initialization (during generate_uncommon_trap_blob)

Reviewed-by: kvn, chagedorn, mdoerr, amitkumar, fyang, bulasevich
---
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp | 6 ++++++
 src/hotspot/cpu/arm/runtime_arm.cpp         | 6 ++++++
 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_64.cpp      | 6 ++++++
 8 files changed, 36 insertions(+)

diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index 83e43c3ebd2..2361d584f42 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -65,6 +65,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -285,6 +288,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 20c1bc199d3..615a63eac19 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -54,6 +54,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Measured 8/7/03 at 660 in 32bit debug build
   CodeBuffer buffer(name, 2000, 512);
 #endif
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   // bypassed when code generation useless
   MacroAssembler* masm               = new MacroAssembler(&buffer);
   const Register Rublock = R6;
@@ -209,6 +212,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Measured 8/7/03 at 256 in 32bit debug build
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 600, 512);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 94e8c08ebf5..6d9a1dfcb1e 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -73,6 +73,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Setup code generation tools.
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 5a94d469434..1c9c88b3c30 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -3106,6 +3106,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Setup code generation tools.
   const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 44a8e35e285..7c8ca853bc4 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -63,6 +63,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   MacroAssembler* masm = new MacroAssembler(&buffer);
   assert_cond(masm != nullptr);
 
@@ -282,6 +285,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 4eedb3877d2..8f96ff55ccb 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -72,6 +72,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   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 f4487ccabec..099e28a3adc 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2768,6 +2768,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
 
   Register unroll_block_reg = Z_tmp_1;
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index a063c7aeb37..027a523b33d 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -61,6 +61,9 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -267,6 +270,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Setup code generation tools
   const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
+  if (buffer.blob() == nullptr) {
+    return nullptr;
+  }
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
 

From 40e7986c412797323f721212d5f375ffe15accb3 Mon Sep 17 00:00:00 2001
From: Nikita Gubarkov <ngubarkov@openjdk.org>
Date: Mon, 28 Apr 2025 06:44:16 +0000
Subject: [PATCH 154/901] 8355611: Get rid of SurfaceManagerFactory

Reviewed-by: serb, prr
---
 .../classes/sun/awt/CGraphicsConfig.java      |  3 +-
 .../classes/sun/awt/CGraphicsEnvironment.java |  4 -
 .../java2d/MacosxSurfaceManagerFactory.java   | 57 ------------
 .../sun/java2d/metal/MTLGraphicsConfig.java   | 10 +-
 .../sun/java2d/opengl/CGLGraphicsConfig.java  |  8 ++
 .../sun/awt/image/SunVolatileImage.java       | 33 +++----
 .../classes/sun/awt/image/SurfaceManager.java | 23 ++++-
 .../sun/java2d/SurfaceManagerFactory.java     | 91 -------------------
 .../sun/java2d/opengl/OGLGraphicsConfig.java  |  2 +-
 .../classes/sun/awt/X11GraphicsConfig.java    | 10 +-
 .../classes/sun/awt/X11GraphicsDevice.java    |  6 +-
 .../sun/awt/X11GraphicsEnvironment.java       |  6 --
 .../sun/java2d/UnixSurfaceManagerFactory.java | 68 --------------
 .../sun/java2d/opengl/GLXGraphicsConfig.java  | 10 +-
 .../sun/java2d/xr/XRGraphicsConfig.java       | 11 ++-
 .../classes/sun/awt/Win32GraphicsDevice.java  |  3 +-
 .../sun/awt/Win32GraphicsEnvironment.java     |  5 -
 .../java2d/WindowsSurfaceManagerFactory.java  | 66 --------------
 .../sun/java2d/d3d/D3DGraphicsConfig.java     |  9 +-
 .../sun/java2d/opengl/WGLGraphicsConfig.java  | 10 +-
 20 files changed, 103 insertions(+), 332 deletions(-)
 delete mode 100644 src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
 delete mode 100644 src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
 delete mode 100644 src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java
 delete mode 100644 src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java

diff --git a/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
index 3c09758e87f..0ca85104817 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsConfig.java
@@ -41,7 +41,8 @@ public abstract class CGraphicsConfig extends GraphicsConfiguration
 
     private final CGraphicsDevice device;
     private ColorModel colorModel;
-    private final SurfaceManager.ProxyCache surfaceDataProxyCache = new SurfaceManager.ProxyCache();
+    private final SurfaceManager.ProxyCache surfaceDataProxyCache =
+            new SurfaceManager.ProxyCache();
 
     protected CGraphicsConfig(CGraphicsDevice device) {
         this.device = device;
diff --git a/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java b/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
index fe4431e3091..e11dabc7a10 100644
--- a/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
+++ b/src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
@@ -37,9 +37,7 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import sun.java2d.MacosxSurfaceManagerFactory;
 import sun.java2d.SunGraphicsEnvironment;
-import sun.java2d.SurfaceManagerFactory;
 
 /**
  * This is an implementation of a GraphicsEnvironment object for the default
@@ -70,8 +68,6 @@ public static void init() { }
     static {
         // Load libraries and initialize the Toolkit.
         Toolkit.getDefaultToolkit();
-        // Install the correct surface manager factory.
-        SurfaceManagerFactory.setInstance(new MacosxSurfaceManagerFactory());
     }
 
     /**
diff --git a/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java b/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
deleted file mode 100644
index 93fac3fb22a..00000000000
--- a/src/java.desktop/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java
+++ /dev/null
@@ -1,57 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.java2d;
-
-import sun.awt.image.SunVolatileImage;
-import sun.awt.image.VolatileSurfaceManager;
-import sun.awt.CGraphicsDevice;
-import sun.java2d.metal.MTLVolatileSurfaceManager;
-import sun.java2d.opengl.CGLVolatileSurfaceManager;
-
-/**
- * This is a factory class with static methods for creating a
- * platform-specific instance of a particular SurfaceManager.  Each platform
- * (Windows, Unix, etc.) has its own specialized SurfaceManagerFactory.
- */
-public class MacosxSurfaceManagerFactory extends SurfaceManagerFactory {
-
-    /**
-     * Creates a new instance of a VolatileSurfaceManager given any
-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
-     * as a way for the caller to pass pipeline-specific context data to
-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
-     *
-     * For Mac OS X, this method returns either an CGL/MTL-specific
-     * VolatileSurfaceManager based on the GraphicsConfiguration
-     * under which the SunVolatileImage was created.
-     */
-    public VolatileSurfaceManager createVolatileManager(SunVolatileImage vImg,
-                                                        Object context)
-    {
-        return CGraphicsDevice.usingMetalPipeline() ? new MTLVolatileSurfaceManager(vImg, context) :
-                new CGLVolatileSurfaceManager(vImg, context);
-    }
-}
diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
index 82adac72c03..e4afec42482 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLGraphicsConfig.java
@@ -29,6 +29,8 @@
 import sun.awt.CGraphicsDevice;
 import sun.awt.image.OffScreenImage;
 import sun.awt.image.SunVolatileImage;
+import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.Disposer;
 import sun.java2d.DisposerRecord;
 import sun.java2d.Surface;
@@ -67,7 +69,7 @@
 import static sun.java2d.metal.MTLContext.MTLContextCaps.CAPS_EXT_BIOP_SHADER;
 
 public final class MTLGraphicsConfig extends CGraphicsConfig
-        implements AccelGraphicsConfig
+        implements AccelGraphicsConfig, SurfaceManager.Factory
 {
     private static ImageCapabilities imageCaps = new MTLImageCaps();
 
@@ -372,4 +374,10 @@ public int getMaxTextureHeight() {
         return Math.max(maxTextureSize / getDevice().getScaleFactor(),
                 getBounds().height);
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new MTLVolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
index ee9b0aec3a0..6022d516bf9 100644
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
@@ -46,6 +46,8 @@
 import sun.awt.CGraphicsDevice;
 import sun.awt.image.OffScreenImage;
 import sun.awt.image.SunVolatileImage;
+import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.Disposer;
 import sun.java2d.DisposerRecord;
 import sun.java2d.Surface;
@@ -386,4 +388,10 @@ public int getMaxTextureHeight() {
         return Math.max(maxTextureSize / getDevice().getScaleFactor(),
                         getBounds().height);
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new CGLVolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java b/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
index 55dfc8db766..4bcd5f6b443 100644
--- a/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
+++ b/src/java.desktop/share/classes/sun/awt/image/SunVolatileImage.java
@@ -37,7 +37,6 @@
 import java.awt.image.ImageObserver;
 import java.awt.image.VolatileImage;
 import sun.java2d.SunGraphics2D;
-import sun.java2d.SurfaceManagerFactory;
 import sun.java2d.DestSurfaceProvider;
 import sun.java2d.Surface;
 import sun.java2d.pipe.Region;
@@ -158,29 +157,19 @@ public int getForcedAccelSurfaceType() {
         return forcedAccelSurfaceType;
     }
 
-    protected VolatileSurfaceManager createSurfaceManager(Object context,
-                                                          ImageCapabilities caps)
-    {
-        /**
-         * Platform-specific SurfaceManagerFactories will return a
-         * manager suited to acceleration on each platform.  But if
-         * the user is asking for a VolatileImage from a BufferedImageGC,
-         * then we need to return the appropriate unaccelerated manager.
-         * Note: this could change in the future; if some platform would
-         * like to accelerate BIGC volatile images, then this special-casing
-         * of the BIGC graphicsConfig should live in platform-specific
-         * code instead.
-         * We do the same for a Printer Device, and if user requested an
-         * unaccelerated VolatileImage by passing the capabilities object.
-         */
-        if (graphicsConfig instanceof BufferedImageGraphicsConfig ||
-            graphicsConfig instanceof sun.print.PrinterGraphicsConfig ||
-            (caps != null && !caps.isAccelerated()))
-        {
+    private VolatileSurfaceManager createSurfaceManager(
+            Object context, ImageCapabilities caps) {
+        // GraphicsConfig may provide some specific surface manager
+        // implementation.
+        // In case it doesn't, or we were specifically requested to use
+        // an unaccelerated surface, fall back to the buffered image
+        // surface manager.
+        if ((caps == null || caps.isAccelerated()) &&
+            graphicsConfig instanceof SurfaceManager.Factory factory) {
+            return factory.createVolatileManager(this, context);
+        } else {
             return new BufImgVolatileSurfaceManager(this, context);
         }
-        SurfaceManagerFactory smf = SurfaceManagerFactory.getInstance();
-        return smf.createVolatileManager(this, context);
     }
 
     private Color getForeground() {
diff --git a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
index 9f605eed4e3..9b86d469d98 100644
--- a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
+++ b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
@@ -183,6 +183,23 @@ public boolean isAccelerated() {
         }
     }
 
+    /**
+     * An interface for GraphicsConfiguration objects to implement if
+     * they create their own VolatileSurfaceManager implementations.
+     */
+    public interface Factory {
+
+        /**
+         * Creates a new instance of a VolatileSurfaceManager given a
+         * compatible SunVolatileImage.
+         * An optional context Object can be supplied as a way for the caller
+         * to pass pipeline-specific context data to the VolatileSurfaceManager
+         * (such as a backbuffer handle, for example).
+         */
+        VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                     Object context);
+    }
+
     /**
      * An interface for GraphicsConfiguration objects to implement if
      * their surfaces accelerate images using SurfaceDataProxy objects.
@@ -201,7 +218,8 @@ public interface ProxiedGraphicsConfig {
     }
 
     public static class ProxyCache {
-        private final Map<SurfaceManager, SurfaceDataProxy> map = Collections.synchronizedMap(new WeakHashMap<>());
+        private final Map<SurfaceManager, SurfaceDataProxy> map =
+                Collections.synchronizedMap(new WeakHashMap<>());
 
         /**
          * Return a cached SurfaceDataProxy object for a given SurfaceManager.
@@ -252,7 +270,8 @@ public synchronized void flush() {
 
     void flush(boolean deaccelerate) {
         synchronized (weakCache) {
-            Iterator<WeakReference<SurfaceDataProxy>> i = weakCache.values().iterator();
+            Iterator<WeakReference<SurfaceDataProxy>> i =
+                    weakCache.values().iterator();
             while (i.hasNext()) {
                 SurfaceDataProxy sdp = i.next().get();
                 if (sdp == null || sdp.flush(deaccelerate)) {
diff --git a/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java b/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
deleted file mode 100644
index 39b6d2e33cf..00000000000
--- a/src/java.desktop/share/classes/sun/java2d/SurfaceManagerFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.java2d;
-
-import sun.awt.image.SunVolatileImage;
-import sun.awt.image.VolatileSurfaceManager;
-
-/**
- * This factory creates platform specific VolatileSurfaceManager
- * implementations.
- *
- * There are two platform specific SurfaceManagerFactories in OpenJDK,
- * UnixSurfaceManagerFactory and WindowsSurfaceManagerFactory.
- * The actually used SurfaceManagerFactory is set by the respective platform
- * GraphicsEnvironment implementations in the static initializer.
- */
-public abstract class SurfaceManagerFactory {
-
-    /**
-     * The single shared instance.
-     */
-    private static SurfaceManagerFactory instance;
-
-    /**
-     * Returns the surface manager factory instance. This returns a factory
-     * that has been set by {@link #setInstance(SurfaceManagerFactory)}.
-     *
-     * @return the surface manager factory
-     */
-    public static synchronized SurfaceManagerFactory getInstance() {
-
-        if (instance == null) {
-            throw new IllegalStateException("No SurfaceManagerFactory set.");
-        }
-        return instance;
-    }
-
-    /**
-     * Sets the surface manager factory. This may only be called once, and it
-     * may not be set back to {@code null} when the factory is already
-     * instantiated.
-     *
-     * @param factory the factory to set
-     */
-    public static synchronized void setInstance(SurfaceManagerFactory factory) {
-
-        if (factory == null) {
-            // We don't want to allow setting this to null at any time.
-            throw new IllegalArgumentException("factory must be non-null");
-        }
-
-        if (instance != null) {
-            // We don't want to re-set the instance at any time.
-            throw new IllegalStateException("The surface manager factory is already initialized");
-        }
-
-        instance = factory;
-    }
-
-    /**
-     * Creates a new instance of a VolatileSurfaceManager given any
-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
-     * as a way for the caller to pass pipeline-specific context data to
-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
-     */
-     public abstract VolatileSurfaceManager
-         createVolatileManager(SunVolatileImage image, Object context);
-}
diff --git a/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java b/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
index 252644b7e49..a0904588019 100644
--- a/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
+++ b/src/java.desktop/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java
@@ -35,7 +35,7 @@
  * methods directly from OGLSurfaceData.
  */
 interface OGLGraphicsConfig extends
-    AccelGraphicsConfig, SurfaceManager.ProxiedGraphicsConfig
+    AccelGraphicsConfig, SurfaceManager.ProxiedGraphicsConfig, SurfaceManager.Factory
 {
     OGLContext getContext();
     long getNativeConfigInfo();
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
index ba06574cdd7..9c7a7d5c376 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
@@ -47,6 +47,7 @@
 import sun.awt.image.OffScreenImage;
 import sun.awt.image.SunVolatileImage;
 import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.Disposer;
 import sun.java2d.DisposerRecord;
 import sun.java2d.SurfaceData;
@@ -55,6 +56,7 @@
 import sun.java2d.loops.SurfaceType;
 import sun.java2d.pipe.Region;
 import sun.java2d.x11.X11SurfaceData;
+import sun.java2d.x11.X11VolatileSurfaceManager;
 
 /**
  * This is an implementation of a GraphicsConfiguration object for a
@@ -64,7 +66,7 @@
  * @see GraphicsDevice
  */
 public class X11GraphicsConfig extends GraphicsConfiguration
-    implements SurfaceManager.ProxiedGraphicsConfig
+    implements SurfaceManager.ProxiedGraphicsConfig, SurfaceManager.Factory
 {
     private final X11GraphicsDevice device;
     protected int visual;
@@ -500,4 +502,10 @@ public boolean isTranslucencyCapable() {
     }
 
     private native boolean isTranslucencyCapable(long x11ConfigData);
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new X11VolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index 39ecb13c6a4..a7ec9ccc9fd 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -62,7 +62,8 @@ public final class X11GraphicsDevice extends GraphicsDevice
      * therefore methods, which is using this id should be ready to it.
      */
     private volatile int screen;
-    Map<SurfaceType, SurfaceManager.ProxyCache> x11ProxyCacheMap = Collections.synchronizedMap(new HashMap<>());
+    Map<SurfaceType, SurfaceManager.ProxyCache> x11ProxyCacheMap =
+            Collections.synchronizedMap(new HashMap<>());
 
     private static Boolean xrandrExtSupported;
     private SunDisplayChanger topLevels = new SunDisplayChanger();
@@ -95,7 +96,8 @@ public int getScreen() {
     }
 
     public SurfaceManager.ProxyCache getProxyCacheFor(SurfaceType st) {
-        return x11ProxyCacheMap.computeIfAbsent(st, unused -> new SurfaceManager.ProxyCache());
+        return x11ProxyCacheMap.computeIfAbsent(st,
+                unused -> new SurfaceManager.ProxyCache());
     }
 
     /**
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
index 82490e88a99..c24e311017e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
@@ -41,8 +41,6 @@
 
 import sun.awt.X11.XToolkit;
 import sun.java2d.SunGraphicsEnvironment;
-import sun.java2d.SurfaceManagerFactory;
-import sun.java2d.UnixSurfaceManagerFactory;
 import sun.java2d.xr.XRSurfaceData;
 
 /**
@@ -124,10 +122,6 @@ private static void initStatic() {
                 XRSurfaceData.initXRSurfaceData();
             }
         }
-
-        // Install the correct surface manager factory.
-        SurfaceManagerFactory.setInstance(new UnixSurfaceManagerFactory());
-
     }
 
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java b/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java
deleted file mode 100644
index 5ab78ee39ee..00000000000
--- a/src/java.desktop/unix/classes/sun/java2d/UnixSurfaceManagerFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.java2d;
-
-import java.awt.GraphicsConfiguration;
-
-import sun.awt.image.SunVolatileImage;
-import sun.awt.image.VolatileSurfaceManager;
-import sun.java2d.opengl.GLXGraphicsConfig;
-import sun.java2d.opengl.GLXVolatileSurfaceManager;
-import sun.java2d.x11.X11VolatileSurfaceManager;
-import sun.java2d.xr.*;
-
-/**
- * The SurfaceManagerFactory that creates VolatileSurfaceManager
- * implementations for the Unix volatile images.
- */
-public class UnixSurfaceManagerFactory extends SurfaceManagerFactory {
-
-    /**
-     * Creates a new instance of a VolatileSurfaceManager given any
-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
-     * as a way for the caller to pass pipeline-specific context data to
-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
-     *
-     * For Unix platforms, this method returns either an X11- or a GLX-
-     * specific VolatileSurfaceManager based on the GraphicsConfiguration
-     * under which the SunVolatileImage was created.
-     */
-    public VolatileSurfaceManager createVolatileManager(SunVolatileImage vImg,
-                                                        Object context)
-    {
-        GraphicsConfiguration gc = vImg.getGraphicsConfig();
-
-        if (gc instanceof GLXGraphicsConfig) {
-            return new GLXVolatileSurfaceManager(vImg, context);
-        } else if(gc instanceof XRGraphicsConfig) {
-            return new XRVolatileSurfaceManager(vImg, context);
-        }else {
-            return new X11VolatileSurfaceManager(vImg, context);
-        }
-    }
-
-}
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
index 96b0dc49183..2ea076f8051 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
@@ -49,6 +49,7 @@
 import sun.awt.image.OffScreenImage;
 import sun.awt.image.SunVolatileImage;
 import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.Surface;
 import sun.java2d.SurfaceData;
@@ -72,7 +73,8 @@ public final class GLXGraphicsConfig
     private long pConfigInfo;
     private ContextCapabilities oglCaps;
     private final OGLContext context;
-    private final SurfaceManager.ProxyCache surfaceDataProxyCache = new SurfaceManager.ProxyCache();
+    private final SurfaceManager.ProxyCache surfaceDataProxyCache =
+            new SurfaceManager.ProxyCache();
 
     private static native long getGLXConfigInfo(int screennum, int visualnum);
     private static native int getOGLCapabilities(long configInfo);
@@ -413,4 +415,10 @@ public ImageCapabilities getImageCapabilities() {
     public ContextCapabilities getContextCapabilities() {
         return oglCaps;
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new GLXVolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
index fb2c8ad4801..43f17e11ae1 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
@@ -30,11 +30,14 @@
 import sun.awt.X11GraphicsDevice;
 import sun.awt.X11GraphicsEnvironment;
 import sun.awt.image.SurfaceManager;
+import sun.awt.image.SunVolatileImage;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.SurfaceData;
 
 public class XRGraphicsConfig extends X11GraphicsConfig implements
         SurfaceManager.ProxiedGraphicsConfig {
-    private final SurfaceManager.ProxyCache surfaceDataProxyCache = new SurfaceManager.ProxyCache();
+    private final SurfaceManager.ProxyCache surfaceDataProxyCache =
+            new SurfaceManager.ProxyCache();
 
     private XRGraphicsConfig(X11GraphicsDevice device, int visualnum,
             int depth, int colormap, boolean doubleBuffer) {
@@ -59,4 +62,10 @@ public static XRGraphicsConfig getConfig(X11GraphicsDevice device,
     public SurfaceManager.ProxyCache getSurfaceDataProxyCache() {
         return surfaceDataProxyCache;
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new XRVolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
index 865fe480853..fedc7f38980 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java
@@ -89,7 +89,8 @@ public class Win32GraphicsDevice extends GraphicsDevice implements
     private float scaleX;
     private float scaleY;
 
-    final SurfaceManager.ProxyCache surfaceDataProxyCache = new SurfaceManager.ProxyCache();
+    final SurfaceManager.ProxyCache surfaceDataProxyCache =
+            new SurfaceManager.ProxyCache();
 
     static {
 
diff --git a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
index 09768148f3d..2e11d551059 100644
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java
@@ -35,8 +35,6 @@
 
 import sun.awt.windows.WToolkit;
 import sun.java2d.SunGraphicsEnvironment;
-import sun.java2d.SurfaceManagerFactory;
-import sun.java2d.WindowsSurfaceManagerFactory;
 import sun.java2d.d3d.D3DGraphicsDevice;
 import sun.java2d.windows.WindowsFlags;
 
@@ -63,9 +61,6 @@ public final class Win32GraphicsEnvironment extends SunGraphicsEnvironment {
 
         initDisplay();
 
-        // Install correct surface manager factory.
-        SurfaceManagerFactory.setInstance(new WindowsSurfaceManagerFactory());
-
         double sx = -1;
         double sy = -1;
         if (isUIScaleEnabled()) {
diff --git a/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java b/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
deleted file mode 100644
index 4abb8c823f6..00000000000
--- a/src/java.desktop/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.java2d;
-
-import java.awt.GraphicsConfiguration;
-import sun.awt.image.BufImgVolatileSurfaceManager;
-import sun.awt.image.SunVolatileImage;
-import sun.awt.image.VolatileSurfaceManager;
-import sun.java2d.d3d.D3DGraphicsConfig;
-import sun.java2d.d3d.D3DVolatileSurfaceManager;
-import sun.java2d.opengl.WGLGraphicsConfig;
-import sun.java2d.opengl.WGLVolatileSurfaceManager;
-
-/**
- * The SurfaceManagerFactory that creates VolatileSurfaceManager
- * implementations for the Windows volatile images.
- */
-public final class WindowsSurfaceManagerFactory extends SurfaceManagerFactory {
-
-    /**
-     * Creates a new instance of a VolatileSurfaceManager given any
-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
-     * as a way for the caller to pass pipeline-specific context data to
-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
-     *
-     * For Windows platforms, this method returns a Windows-specific
-     * VolatileSurfaceManager.
-     */
-    @Override
-    public VolatileSurfaceManager createVolatileManager(SunVolatileImage vImg,
-                                                        Object context)
-    {
-        GraphicsConfiguration gc = vImg.getGraphicsConfig();
-        if (gc instanceof D3DGraphicsConfig) {
-            return new D3DVolatileSurfaceManager(vImg, context);
-        } else if (gc instanceof WGLGraphicsConfig) {
-            return new WGLVolatileSurfaceManager(vImg, context);
-        } else {
-            return new BufImgVolatileSurfaceManager(vImg, context);
-        }
-    }
-
-}
diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
index aab6b720d6a..8b001317dca 100644
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java
@@ -39,6 +39,7 @@
 import sun.awt.Win32GraphicsConfig;
 import sun.awt.image.SunVolatileImage;
 import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.awt.windows.WComponentPeer;
 import sun.java2d.Surface;
 import sun.java2d.SurfaceData;
@@ -51,7 +52,7 @@
 
 public final class D3DGraphicsConfig
     extends Win32GraphicsConfig
-    implements AccelGraphicsConfig
+    implements AccelGraphicsConfig, SurfaceManager.Factory
 {
     private static ImageCapabilities imageCaps = new D3DImageCaps();
 
@@ -307,4 +308,10 @@ public D3DContext getContext() {
     public ContextCapabilities getContextCapabilities() {
         return device.getContextCapabilities();
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new D3DVolatileSurfaceManager(image, context);
+    }
 }
diff --git a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
index c6658bf2914..40d2af5c12a 100644
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java
@@ -43,6 +43,7 @@
 import sun.awt.Win32GraphicsDevice;
 import sun.awt.image.SunVolatileImage;
 import sun.awt.image.SurfaceManager;
+import sun.awt.image.VolatileSurfaceManager;
 import sun.awt.windows.WComponentPeer;
 import sun.java2d.Disposer;
 import sun.java2d.DisposerRecord;
@@ -73,7 +74,8 @@ public final class WGLGraphicsConfig
     private ContextCapabilities oglCaps;
     private final OGLContext context;
     private Object disposerReferent = new Object();
-    private final SurfaceManager.ProxyCache surfaceDataProxyCache = new SurfaceManager.ProxyCache();
+    private final SurfaceManager.ProxyCache surfaceDataProxyCache =
+            new SurfaceManager.ProxyCache();
 
     public static native int getDefaultPixFmt(int screennum);
     private static native boolean initWGL();
@@ -432,4 +434,10 @@ public ImageCapabilities getImageCapabilities() {
     public ContextCapabilities getContextCapabilities() {
         return oglCaps;
     }
+
+    @Override
+    public VolatileSurfaceManager createVolatileManager(SunVolatileImage image,
+                                                        Object context) {
+        return new WGLVolatileSurfaceManager(image, context);
+    }
 }

From 7df1bfe27b0486e834f07d9aec43b0dae020731f Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 28 Apr 2025 06:56:09 +0000
Subject: [PATCH 155/901] 8354811: clock_tics_per_sec code duplication between
 os_linux and os_posix

Reviewed-by: lucy, clanger, asteiner
---
 src/hotspot/os/aix/os_perf_aix.cpp | 5 +----
 src/hotspot/os/linux/os_linux.cpp  | 8 ++------
 src/hotspot/os/posix/os_posix.cpp  | 4 ++++
 src/hotspot/os/posix/os_posix.hpp  | 5 ++++-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/os/aix/os_perf_aix.cpp b/src/hotspot/os/aix/os_perf_aix.cpp
index 0b008a197de..e9feb3fe47d 100644
--- a/src/hotspot/os/aix/os_perf_aix.cpp
+++ b/src/hotspot/os/aix/os_perf_aix.cpp
@@ -118,7 +118,6 @@ static OSReturn get_lcpu_ticks(perfstat_id_t* lcpu_name, cpu_tick_store_t* ptick
  * Return CPU load caused by the currently executing process (the jvm).
  */
 static OSReturn get_jvm_load(double* jvm_uload, double* jvm_sload) {
-  static clock_t ticks_per_sec = sysconf(_SC_CLK_TCK);
   static u_longlong_t last_timebase = 0;
 
   perfstat_process_t jvm_stats;
@@ -204,8 +203,6 @@ static bool populate_lcpu_names(int ncpus, perfstat_id_t* lcpu_names) {
  * (Context Switches / Tick) * (Tick / s) = Context Switches per second
  */
 static OSReturn perf_context_switch_rate(double* rate) {
-  static clock_t ticks_per_sec = sysconf(_SC_CLK_TCK);
-
   u_longlong_t ticks;
   perfstat_cpu_total_t cpu_stats;
 
@@ -214,7 +211,7 @@ static OSReturn perf_context_switch_rate(double* rate) {
    }
 
    ticks = cpu_stats.user + cpu_stats.sys + cpu_stats.idle + cpu_stats.wait;
-   *rate = (cpu_stats.pswitch / ticks) * ticks_per_sec;
+   *rate = (cpu_stats.pswitch / ticks) * os::Posix::clock_tics_per_second();
 
    return OS_OK;
 }
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 029d523edc6..22d3e1862b5 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -210,8 +210,6 @@ typedef int (*malloc_info_func_t)(int options, FILE *stream);
 static malloc_info_func_t g_malloc_info = nullptr;
 #endif // __GLIBC__
 
-static int clock_tics_per_sec = 100;
-
 // If the VM might have been created on the primordial thread, we need to resolve the
 // primordial thread stack bounds and check if the current thread might be the
 // primordial thread in places. If we know that the primordial thread is never used,
@@ -4378,8 +4376,6 @@ static void check_pax(void) {
 // this is called _before_ most of the global arguments have been parsed
 void os::init(void) {
   char dummy;   // used to get a guess on initial stack address
-
-  clock_tics_per_sec = checked_cast<int>(sysconf(_SC_CLK_TCK));
   int sys_pg_size = checked_cast<int>(sysconf(_SC_PAGESIZE));
   if (sys_pg_size < 0) {
     fatal("os_linux.cpp: os::init: sysconf failed (%s)",
@@ -5132,9 +5128,9 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
                  &user_time, &sys_time);
   if (count != 13) return -1;
   if (user_sys_cpu_time) {
-    return ((jlong)sys_time + (jlong)user_time) * (1000000000 / clock_tics_per_sec);
+    return ((jlong)sys_time + (jlong)user_time) * (1000000000 / os::Posix::clock_tics_per_second());
   } else {
-    return (jlong)user_time * (1000000000 / clock_tics_per_sec);
+    return (jlong)user_time * (1000000000 / os::Posix::clock_tics_per_second());
   }
 }
 
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index b399ce4bcbf..a331e303913 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -1326,6 +1326,10 @@ void os::Posix::init_2(void) {
                _use_clock_monotonic_condattr ? "CLOCK_MONOTONIC" : "the default clock");
 }
 
+int os::Posix::clock_tics_per_second() {
+  return clock_tics_per_sec;
+}
+
 // Utility to convert the given timeout to an absolute timespec
 // (based on the appropriate clock) to use with pthread_cond_timewait,
 // and sem_timedwait().
diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index 248a30d04ad..5c3b1f35bd1 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.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
@@ -91,6 +91,9 @@ class os::Posix {
 
   static void to_RTC_abstime(timespec* abstime, int64_t millis);
 
+  // clock ticks per second of the system
+  static int clock_tics_per_second();
+
   static bool handle_stack_overflow(JavaThread* thread, address addr, address pc,
                                     const void* ucVoid,
                                     address* stub);

From a05ff55be4e4e1ab11d756b88a9dfa1f0adb4592 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Mon, 28 Apr 2025 07:15:41 +0000
Subject: [PATCH 156/901] 8355657: RISC-V: Improve PrintOptoAssembly output of
 vector-scalar instructions

Reviewed-by: fyang, gcao
---
 src/hotspot/cpu/riscv/riscv_v.ad | 162 +++++++++++++++----------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index d0f31a82069..4e7b36a9fcb 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -415,11 +415,11 @@ instruct vadd_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate add (unpredicated)
 
-instruct vaddI_vi(vReg dst, vReg src1, immI5 con) %{
+instruct vadd_vi(vReg dst, vReg src1, immI5 con) %{
   match(Set dst (AddVB src1 (Replicate con)));
   match(Set dst (AddVS src1 (Replicate con)));
   match(Set dst (AddVI src1 (Replicate con)));
-  format %{ "vaddI_vi $dst, $src1, $con" %}
+  format %{ "vadd_vi $dst, $src1, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -444,11 +444,11 @@ instruct vaddL_vi(vReg dst, vReg src1, immL5 con) %{
 
 // vector-scalar add (unpredicated)
 
-instruct vaddI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vadd_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (AddVB src1 (Replicate src2)));
   match(Set dst (AddVS src1 (Replicate src2)));
   match(Set dst (AddVI src1 (Replicate src2)));
-  format %{ "vaddI_vx $dst, $src1, $src2" %}
+  format %{ "vadd_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -473,11 +473,11 @@ instruct vaddL_vx(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-immediate add (predicated)
 
-instruct vaddI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vadd_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   match(Set dst_src (AddVB (Binary dst_src (Replicate con)) v0));
   match(Set dst_src (AddVS (Binary dst_src (Replicate con)) v0));
   match(Set dst_src (AddVI (Binary dst_src (Replicate con)) v0));
-  format %{ "vaddI_vi_masked $dst_src, $dst_src, $con, $v0" %}
+  format %{ "vadd_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -502,11 +502,11 @@ instruct vaddL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar add (predicated)
 
-instruct vaddI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vadd_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (AddVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (AddVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (AddVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vaddI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
+  format %{ "vadd_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -595,11 +595,11 @@ instruct vsub_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-scalar sub (unpredicated)
 
-instruct vsubI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vsub_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (SubVB src1 (Replicate src2)));
   match(Set dst (SubVS src1 (Replicate src2)));
   match(Set dst (SubVI src1 (Replicate src2)));
-  format %{ "vsubI_vx $dst, $src1, $src2" %}
+  format %{ "vsub_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -624,11 +624,11 @@ instruct vsubL_vx(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-scalar sub (predicated)
 
-instruct vsubI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vsub_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (SubVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (SubVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (SubVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vsubI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
+  format %{ "vsub_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -641,7 +641,7 @@ instruct vsubI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
 
 instruct vsubL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
   match(Set dst_src (SubVL (Binary dst_src (Replicate src2)) v0));
-  format %{ "vsub_vx_masked $dst_src, $dst_src, $src2, $v0" %}
+  format %{ "vsubL_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
     __ vsub_vx(as_VectorRegister($dst_src$$reg),
@@ -685,12 +685,12 @@ instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate and (unpredicated)
 
-instruct vandI_vi(vReg dst_src, immI5 con) %{
+instruct vand_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV dst_src (Replicate con)));
-  format %{ "vandI_vi $dst_src, $dst_src, $con" %}
+  format %{ "vand_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -716,12 +716,12 @@ instruct vandL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar and (unpredicated)
 
-instruct vandI_vx(vReg dst_src, iRegIorL2I src) %{
+instruct vand_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV dst_src (Replicate src)));
-  format %{ "vandI_vx $dst_src, $dst_src, $src" %}
+  format %{ "vand_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -747,12 +747,12 @@ instruct vandL_vx(vReg dst_src, iRegL src) %{
 
 // vector-immediate and (predicated)
 
-instruct vandI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vand_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
-  format %{ "vandI_vi_masked $dst_src, $dst_src, $con, $v0" %}
+  format %{ "vand_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -778,12 +778,12 @@ instruct vandL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar and (predicated)
 
-instruct vandI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vand_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
-  format %{ "vandI_vx_masked $dst_src, $dst_src, $src, $v0" %}
+  format %{ "vand_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -841,12 +841,12 @@ instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate or (unpredicated)
 
-instruct vorI_vi(vReg dst_src, immI5 con) %{
+instruct vor_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV dst_src (Replicate con)));
-  format %{ "vorI_vi $dst_src, $dst_src, $con" %}
+  format %{ "vor_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -872,12 +872,12 @@ instruct vorL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar or (unpredicated)
 
-instruct vorI_vx(vReg dst_src, iRegIorL2I src) %{
+instruct vor_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV dst_src (Replicate src)));
-  format %{ "vorI_vx $dst_src, $dst_src, $src" %}
+  format %{ "vor_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -903,12 +903,12 @@ instruct vorL_vx(vReg dst_src, iRegL src) %{
 
 // vector-immediate or (predicated)
 
-instruct vorI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vor_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
-  format %{ "vorI_vi_masked $dst_src, $dst_src, $con, $v0" %}
+  format %{ "vor_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -934,12 +934,12 @@ instruct vorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar or (predicated)
 
-instruct vorI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vor_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
-  format %{ "vorI_vx_masked $dst_src, $dst_src, $src, $v0" %}
+  format %{ "vor_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -997,12 +997,12 @@ instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate xor (unpredicated)
 
-instruct vxorI_vi(vReg dst_src, immI5 con) %{
+instruct vxor_vi(vReg dst_src, immI5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV dst_src (Replicate con)));
-  format %{ "vxorI_vi $dst_src, $dst_src, $con" %}
+  format %{ "vxor_vi $dst_src, $dst_src, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1028,12 +1028,12 @@ instruct vxorL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar xor (unpredicated)
 
-instruct vxorI_vx(vReg dst_src, iRegIorL2I src) %{
+instruct vxor_vx(vReg dst_src, iRegIorL2I src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV dst_src (Replicate src)));
-  format %{ "vxorI_vx $dst_src, $dst_src, $src" %}
+  format %{ "vxor_vx $dst_src, $dst_src, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1059,12 +1059,12 @@ instruct vxorL_vx(vReg dst_src, iRegL src) %{
 
 // vector-immediate xor (predicated)
 
-instruct vxorI_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
+instruct vxor_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
-  format %{ "vxorI_vi_masked $dst_src, $dst_src, $con, $v0" %}
+  format %{ "vxor_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1090,12 +1090,12 @@ instruct vxorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 
 // vector-scalar xor (predicated)
 
-instruct vxorI_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
+instruct vxor_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
-  format %{ "vxorI_vx_masked $dst_src, $dst_src, $src, $v0" %}
+  format %{ "vxor_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1123,13 +1123,13 @@ instruct vxorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
 
 // vector and not
 
-instruct vand_notI(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
+instruct vand_not(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
   predicate(UseZvbb);
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
-  format %{ "vand_notI $dst, $src1, $src2" %}
+  format %{ "vand_not $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1154,13 +1154,13 @@ instruct vand_notL(vReg dst, vReg src1, vReg src2, immL_M1 m1) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_notI_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
+instruct vand_not_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
   predicate(UseZvbb);
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
-  format %{ "vand_notI_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  format %{ "vand_not_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1187,13 +1187,13 @@ instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, vRegMask_V0 v0)
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_notI_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
+instruct vand_not_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
   predicate(UseZvbb);
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
-  format %{ "vand_notI_vx $dst, $src1, $src2" %}
+  format %{ "vand_not_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1218,13 +1218,13 @@ instruct vand_notL_vx(vReg dst, vReg src1, iRegL src2, immL_M1 m1) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_notI_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
+instruct vand_not_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
   predicate(UseZvbb);
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
-  format %{ "vand_notI_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  format %{ "vand_not_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1255,12 +1255,12 @@ instruct vand_notL_vx_masked(vReg dst_src1, iRegL src2, immL_M1 m1, vRegMask_V0
 
 // vector not
 
-instruct vnotI(vReg dst, vReg src, immI_M1 m1) %{
+instruct vnot(vReg dst, vReg src, immI_M1 m1) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst (XorV src (Replicate m1)));
-  format %{ "vnotI $dst, $src" %}
+  format %{ "vnot $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1286,12 +1286,12 @@ instruct vnotL(vReg dst, vReg src, immL_M1 m1) %{
 
 // vector not - predicated
 
-instruct vnotI_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
+instruct vnot_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) == T_INT ||
             Matcher::vector_element_basic_type(n) == T_BYTE ||
             Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
-  format %{ "vnotI_masked $dst_src, $dst_src, $v0" %}
+  format %{ "vnot_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1801,11 +1801,11 @@ instruct vmul_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-scalar mul (unpredicated)
 
-instruct vmulI_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+instruct vmul_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
   match(Set dst (MulVB src1 (Replicate src2)));
   match(Set dst (MulVS src1 (Replicate src2)));
   match(Set dst (MulVI src1 (Replicate src2)));
-  format %{ "vmulI_vx $dst, $src1, $src2" %}
+  format %{ "vmul_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1830,11 +1830,11 @@ instruct vmulL_vx(vReg dst, vReg src1, iRegL src2) %{
 
 // vector-scalar mul (predicated)
 
-instruct vmulI_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
+instruct vmul_vx_masked(vReg dst_src, iRegIorL2I src2, vRegMask_V0 v0) %{
   match(Set dst_src (MulVB (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (MulVS (Binary dst_src (Replicate src2)) v0));
   match(Set dst_src (MulVI (Binary dst_src (Replicate src2)) v0));
-  format %{ "vmulI_vx_masked $dst_src, $dst_src, $src2, $v0" %}
+  format %{ "vmul_vx_masked $dst_src, $dst_src, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -1921,14 +1921,14 @@ instruct vfneg_masked(vReg dst_src, vRegMask_V0 v0) %{
 
 // vector and reduction
 
-instruct reduce_andI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct reduce_and(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AndReductionV src1 src2));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_andI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "reduce_and $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -1955,14 +1955,14 @@ instruct reduce_andL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
 
 // vector and reduction - predicated
 
-instruct reduce_andI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct reduce_and_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AndReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_andI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "reduce_and_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -1991,14 +1991,14 @@ instruct reduce_andL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
 
 // vector or reduction
 
-instruct reduce_orI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct reduce_or(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (OrReductionV src1 src2));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_orI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "reduce_or $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2025,14 +2025,14 @@ instruct reduce_orL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
 
 // vector or reduction - predicated
 
-instruct reduce_orI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct reduce_or_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (OrReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_orI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "reduce_or_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2061,14 +2061,14 @@ instruct reduce_orL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0,
 
 // vector xor reduction
 
-instruct reduce_xorI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct reduce_xor(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (XorReductionV src1 src2));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_xorI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "reduce_xor $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2095,14 +2095,14 @@ instruct reduce_xorL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
 
 // vector xor reduction - predicated
 
-instruct reduce_xorI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct reduce_xor_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (XorReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_xorI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "reduce_xor_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2131,14 +2131,14 @@ instruct reduce_xorL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
 
 // vector add reduction
 
-instruct reduce_addI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct reduce_add(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AddReductionVI src1 src2));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_addI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "reduce_add $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2237,14 +2237,14 @@ instruct reduce_addD_unordered(fRegD dst, fRegD src1, vReg src2, vReg tmp) %{
 
 // vector add reduction - predicated
 
-instruct reduce_addI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct reduce_add_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AddReductionVI (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "reduce_addI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "reduce_add_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2303,14 +2303,14 @@ instruct reduce_addD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, vR
 
 // vector integer max reduction
 
-instruct vreduce_maxI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct vreduce_max(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MaxReductionV src1 src2));
   ins_cost(VEC_COST);
   effect(TEMP tmp);
-  format %{ "vreduce_maxI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "vreduce_max $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2337,14 +2337,14 @@ instruct vreduce_maxL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
 
 // vector integer max reduction - predicated
 
-instruct vreduce_maxI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct vreduce_max_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MaxReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "vreduce_maxI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "vreduce_max_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2373,14 +2373,14 @@ instruct vreduce_maxL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v
 
 // vector integer min reduction
 
-instruct vreduce_minI(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
+instruct vreduce_min(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MinReductionV src1 src2));
   ins_cost(VEC_COST);
   effect(TEMP tmp);
-  format %{ "vreduce_minI $dst, $src1, $src2\t# KILL $tmp" %}
+  format %{ "vreduce_min $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -2407,14 +2407,14 @@ instruct vreduce_minL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
 
 // vector integer min reduction - predicated
 
-instruct vreduce_minI_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
+instruct vreduce_min_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MinReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
   ins_cost(VEC_COST);
-  format %{ "vreduce_minI_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
+  format %{ "vreduce_min_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
     __ reduce_integral_v($dst$$Register, $src1$$Register,
@@ -5157,14 +5157,14 @@ instruct populateindex(vReg dst, iRegIorL2I src1, iRegIorL2I src2, vReg tmp) %{
 
 // BYTE, SHORT, INT
 
-instruct insertI_index_lt32(vReg dst, vReg src, iRegIorL2I val, immI idx, vRegMask_V0 v0) %{
+instruct insert_index_lt32(vReg dst, vReg src, iRegIorL2I val, immI idx, vRegMask_V0 v0) %{
   predicate(n->in(2)->get_int() < 32 &&
             (Matcher::vector_element_basic_type(n) == T_BYTE ||
              Matcher::vector_element_basic_type(n) == T_SHORT ||
              Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst (VectorInsert (Binary src val) idx));
   effect(TEMP v0);
-  format %{ "insertI_index_lt32 $dst, $src, $val, $idx" %}
+  format %{ "insert_index_lt32 $dst, $src, $val, $idx" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
@@ -5176,14 +5176,14 @@ instruct insertI_index_lt32(vReg dst, vReg src, iRegIorL2I val, immI idx, vRegMa
   ins_pipe(pipe_slow);
 %}
 
-instruct insertI_index(vReg dst, vReg src, iRegIorL2I val, iRegIorL2I idx, vReg tmp, vRegMask_V0 v0) %{
+instruct insert_index(vReg dst, vReg src, iRegIorL2I val, iRegIorL2I idx, vReg tmp, vRegMask_V0 v0) %{
   predicate(n->in(2)->get_int() >= 32 &&
             (Matcher::vector_element_basic_type(n) == T_BYTE ||
              Matcher::vector_element_basic_type(n) == T_SHORT ||
              Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst (VectorInsert (Binary src val) idx));
   effect(TEMP tmp, TEMP v0);
-  format %{ "insertI_index $dst, $src, $val, $idx\t# KILL $tmp" %}
+  format %{ "insert_index $dst, $src, $val, $idx\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));

From 3140de411bb55604f8a9e2484798098d9d141002 Mon Sep 17 00:00:00 2001
From: Bhavana Kilambi <bkilambi@openjdk.org>
Date: Mon, 28 Apr 2025 08:08:42 +0000
Subject: [PATCH 157/901] 8345125: Aarch64: Add aarch64 backend for Float16
 scalar operations

Reviewed-by: aph, haosun
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  194 ++-
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |   80 +-
 src/hotspot/cpu/aarch64/matcher_aarch64.hpp   |    6 +-
 .../cpu/aarch64/vm_version_aarch64.hpp        |    4 +-
 .../vm_version_linux_aarch64.cpp              |   14 +-
 .../classes/jdk/vm/ci/aarch64/AArch64.java    |    4 +-
 test/hotspot/gtest/aarch64/aarch64-asmtest.py |   22 +-
 test/hotspot/gtest/aarch64/asmtest.out.h      | 1452 +++++++++--------
 .../c2/irTests/ConvF2HFIdealizationTests.java |    3 +
 .../irTests/MulHFNodeIdealizationTests.java   |    4 +
 .../irTests/TestFloat16ScalarOperations.java  |   66 +
 .../TestSubNodeFloatDoubleNegation.java       |    5 +-
 .../ir_framework/test/IREncodingPrinter.java  |    2 +
 .../TestFloat16VectorConvChain.java           |    2 +
 14 files changed, 1102 insertions(+), 756 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index c11c960911f..1b128f2a0ce 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -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, 2024, Red Hat, Inc. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -2296,6 +2296,26 @@ bool Matcher::match_rule_supported(int opcode) {
         return false;
       }
       break;
+    case Op_FmaHF:
+      // UseFMA flag also needs to be checked along with FEAT_FP16
+      if (!UseFMA || !is_feat_fp16_supported()) {
+        return false;
+      }
+      break;
+    case Op_AddHF:
+    case Op_SubHF:
+    case Op_MulHF:
+    case Op_DivHF:
+    case Op_MinHF:
+    case Op_MaxHF:
+    case Op_SqrtHF:
+      // Half-precision floating point scalar operations require FEAT_FP16
+      // to be available. FEAT_FP16 is enabled if both "fphp" and "asimdhp"
+      // features are supported.
+      if (!is_feat_fp16_supported()) {
+        return false;
+      }
+      break;
   }
 
   return true; // Per default match rules are supported.
@@ -4599,6 +4619,15 @@ operand immF0()
   interface(CONST_INTER);
 %}
 
+// Half Float (FP16) Immediate
+operand immH()
+%{
+  match(ConH);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
 //
 operand immFPacked()
 %{
@@ -6942,6 +6971,21 @@ instruct loadConD(vRegD dst, immD con) %{
   ins_pipe(fp_load_constant_d);
 %}
 
+// Load Half Float Constant
+// The "ldr" instruction loads a 32-bit word from the constant pool into a
+// 32-bit register but only the bottom half will be populated and the top
+// 16 bits are zero.
+instruct loadConH(vRegF dst, immH con) %{
+  match(Set dst con);
+  format %{
+    "ldrs $dst, [$constantaddress]\t# load from constant table: half float=$con\n\t"
+  %}
+  ins_encode %{
+    __ ldrs(as_FloatRegister($dst$$reg), $constantaddress($con));
+  %}
+  ins_pipe(fp_load_constant_s);
+%}
+
 // Store Instructions
 
 // Store Byte
@@ -13634,6 +13678,17 @@ instruct bits_reverse_L(iRegLNoSp dst, iRegL src)
 // ============================================================================
 // Floating Point Arithmetic Instructions
 
+instruct addHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (AddHF src1 src2));
+  format %{ "faddh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ faddh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
 instruct addF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
   match(Set dst (AddF src1 src2));
 
@@ -13664,6 +13719,17 @@ instruct addD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
   ins_pipe(fp_dop_reg_reg_d);
 %}
 
+instruct subHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (SubHF src1 src2));
+  format %{ "fsubh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fsubh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
 instruct subF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
   match(Set dst (SubF src1 src2));
 
@@ -13694,6 +13760,17 @@ instruct subD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
   ins_pipe(fp_dop_reg_reg_d);
 %}
 
+instruct mulHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (MulHF src1 src2));
+  format %{ "fmulh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fmulh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
 instruct mulF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
   match(Set dst (MulF src1 src2));
 
@@ -13724,6 +13801,20 @@ instruct mulD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
   ins_pipe(fp_dop_reg_reg_d);
 %}
 
+// src1 * src2 + src3 (half-precision float)
+instruct maddHF_reg_reg(vRegF dst, vRegF src1, vRegF src2, vRegF src3) %{
+  match(Set dst (FmaHF src3 (Binary src1 src2)));
+  format %{ "fmaddh $dst, $src1, $src2, $src3" %}
+  ins_encode %{
+    assert(UseFMA, "Needs FMA instructions support.");
+    __ fmaddh($dst$$FloatRegister,
+              $src1$$FloatRegister,
+              $src2$$FloatRegister,
+              $src3$$FloatRegister);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // src1 * src2 + src3
 instruct maddF_reg_reg(vRegF dst, vRegF src1, vRegF src2, vRegF src3) %{
   match(Set dst (FmaF src3 (Binary src1 src2)));
@@ -13865,6 +13956,29 @@ instruct mnsubD_reg_reg(vRegD dst, vRegD src1, vRegD src2, vRegD src3, immD0 zer
   ins_pipe(pipe_class_default);
 %}
 
+// Math.max(HH)H (half-precision float)
+instruct maxHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (MaxHF src1 src2));
+  format %{ "fmaxh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fmaxh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+// Math.min(HH)H (half-precision float)
+instruct minHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (MinHF src1 src2));
+  format %{ "fminh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fminh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
 
 // Math.max(FF)F
 instruct maxF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
@@ -13922,6 +14036,16 @@ instruct minD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
   ins_pipe(fp_dop_reg_reg_d);
 %}
 
+instruct divHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
+  match(Set dst (DivHF src1  src2));
+  format %{ "fdivh $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fdivh($dst$$FloatRegister,
+             $src1$$FloatRegister,
+             $src2$$FloatRegister);
+  %}
+  ins_pipe(fp_div_s);
+%}
 
 instruct divF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
   match(Set dst (DivF src1  src2));
@@ -14095,6 +14219,16 @@ instruct sqrtF_reg(vRegF dst, vRegF src) %{
   ins_pipe(fp_div_d);
 %}
 
+instruct sqrtHF_reg(vRegF dst, vRegF src) %{
+  match(Set dst (SqrtHF src));
+  format %{ "fsqrth $dst, $src" %}
+  ins_encode %{
+    __ fsqrth($dst$$FloatRegister,
+              $src$$FloatRegister);
+  %}
+  ins_pipe(fp_div_s);
+%}
+
 // Math.rint, floor, ceil
 instruct roundD_reg(vRegD dst, vRegD src, immI rmode) %{
   match(Set dst (RoundDoubleMode src rmode));
@@ -17144,6 +17278,64 @@ instruct expandBitsL_memcon(iRegINoSp dst, memory8 mem, immL mask,
   ins_pipe(pipe_slow);
 %}
 
+//----------------------------- Reinterpret ----------------------------------
+// Reinterpret a half-precision float value in a floating point register to a general purpose register
+instruct reinterpretHF2S(iRegINoSp dst, vRegF src) %{
+  match(Set dst (ReinterpretHF2S src));
+  format %{ "reinterpretHF2S $dst, $src" %}
+  ins_encode %{
+    __ smov($dst$$Register, $src$$FloatRegister, __ H, 0);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// Reinterpret a half-precision float value in a general purpose register to a floating point register
+instruct reinterpretS2HF(vRegF dst, iRegINoSp src) %{
+  match(Set dst (ReinterpretS2HF src));
+  format %{ "reinterpretS2HF $dst, $src" %}
+  ins_encode %{
+    __ mov($dst$$FloatRegister, __ H, 0, $src$$Register);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// Without this optimization, ReinterpretS2HF (ConvF2HF src) would result in the following
+// instructions (the first two are for ConvF2HF and the last instruction is for ReinterpretS2HF) -
+// fcvt $tmp1_fpr, $src_fpr    // Convert float to half-precision float
+// mov  $tmp2_gpr, $tmp1_fpr   // Move half-precision float in FPR to a GPR
+// mov  $dst_fpr,  $tmp2_gpr   // Move the result from a GPR to an FPR
+// The move from FPR to GPR in ConvF2HF and the move from GPR to FPR in ReinterpretS2HF
+// can be omitted in this pattern, resulting in -
+// fcvt $dst, $src  // Convert float to half-precision float
+instruct convF2HFAndS2HF(vRegF dst, vRegF src)
+%{
+  match(Set dst (ReinterpretS2HF (ConvF2HF src)));
+  format %{ "convF2HFAndS2HF $dst, $src" %}
+  ins_encode %{
+    __ fcvtsh($dst$$FloatRegister, $src$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// Without this optimization, ConvHF2F (ReinterpretHF2S src) would result in the following
+// instructions (the first one is for ReinterpretHF2S and the last two are for ConvHF2F) -
+// mov  $tmp1_gpr, $src_fpr  // Move the half-precision float from an FPR to a GPR
+// mov  $tmp2_fpr, $tmp1_gpr // Move the same value from GPR to an FPR
+// fcvt $dst_fpr,  $tmp2_fpr // Convert the half-precision float to 32-bit float
+// The move from FPR to GPR in ReinterpretHF2S and the move from GPR to FPR in ConvHF2F
+// can be omitted as the input (src) is already in an FPR required for the fcvths instruction
+// resulting in -
+// fcvt $dst, $src  // Convert half-precision float to a 32-bit float
+instruct convHF2SAndHF2F(vRegF dst, vRegF src)
+%{
+  match(Set dst (ConvHF2F (ReinterpretHF2S src)));
+  format %{ "convHF2SAndHF2F $dst, $src" %}
+  ins_encode %{
+    __ fcvths($dst$$FloatRegister, $src$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ============================================================================
 // This name is KNOWN by the ADLC and cannot be changed.
 // The ADLC forces a 'TypeRawPtr::BOTTOM' output type
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 3db7d308844..5c02e30963e 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -2032,6 +2032,8 @@ void mvnw(Register Rd, Register Rm,
   INSN(fsqrtd, 0b01, 0b000011);
   INSN(fcvtd,  0b01, 0b000100);   // Double-precision to single-precision
 
+  INSN(fsqrth, 0b11, 0b000011);   // Half-precision sqrt
+
 private:
   void _fcvt_narrow_extend(FloatRegister Vd, SIMD_Arrangement Ta,
                            FloatRegister Vn, SIMD_Arrangement Tb, bool do_extend) {
@@ -2059,37 +2061,68 @@ void mvnw(Register Rd, Register Rm,
 #undef INSN
 
   // Floating-point data-processing (2 source)
-  void data_processing(unsigned op31, unsigned type, unsigned opcode,
+  void data_processing(unsigned op31, unsigned type, unsigned opcode, unsigned op21,
                        FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {
     starti;
     f(op31, 31, 29);
     f(0b11110, 28, 24);
-    f(type, 23, 22), f(1, 21), f(opcode, 15, 10);
+    f(type, 23, 22), f(op21, 21), f(opcode, 15, 10);
     rf(Vm, 16), rf(Vn, 5), rf(Vd, 0);
   }
 
-#define INSN(NAME, op31, type, opcode)                  \
+#define INSN(NAME, op31, type, opcode, op21)                            \
   void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {     \
-    data_processing(op31, type, opcode, Vd, Vn, Vm);    \
-  }
-
-  INSN(fabds,  0b011, 0b10, 0b110101);
-  INSN(fmuls,  0b000, 0b00, 0b000010);
-  INSN(fdivs,  0b000, 0b00, 0b000110);
-  INSN(fadds,  0b000, 0b00, 0b001010);
-  INSN(fsubs,  0b000, 0b00, 0b001110);
-  INSN(fmaxs,  0b000, 0b00, 0b010010);
-  INSN(fmins,  0b000, 0b00, 0b010110);
-  INSN(fnmuls, 0b000, 0b00, 0b100010);
-
-  INSN(fabdd,  0b011, 0b11, 0b110101);
-  INSN(fmuld,  0b000, 0b01, 0b000010);
-  INSN(fdivd,  0b000, 0b01, 0b000110);
-  INSN(faddd,  0b000, 0b01, 0b001010);
-  INSN(fsubd,  0b000, 0b01, 0b001110);
-  INSN(fmaxd,  0b000, 0b01, 0b010010);
-  INSN(fmind,  0b000, 0b01, 0b010110);
-  INSN(fnmuld, 0b000, 0b01, 0b100010);
+    data_processing(op31, type, opcode, op21, Vd, Vn, Vm);              \
+  }
+
+  INSN(fmuls,  0b000, 0b00, 0b000010, 0b1);
+  INSN(fdivs,  0b000, 0b00, 0b000110, 0b1);
+  INSN(fadds,  0b000, 0b00, 0b001010, 0b1);
+  INSN(fsubs,  0b000, 0b00, 0b001110, 0b1);
+  INSN(fmaxs,  0b000, 0b00, 0b010010, 0b1);
+  INSN(fmins,  0b000, 0b00, 0b010110, 0b1);
+  INSN(fnmuls, 0b000, 0b00, 0b100010, 0b1);
+
+  INSN(fmuld,  0b000, 0b01, 0b000010, 0b1);
+  INSN(fdivd,  0b000, 0b01, 0b000110, 0b1);
+  INSN(faddd,  0b000, 0b01, 0b001010, 0b1);
+  INSN(fsubd,  0b000, 0b01, 0b001110, 0b1);
+  INSN(fmaxd,  0b000, 0b01, 0b010010, 0b1);
+  INSN(fmind,  0b000, 0b01, 0b010110, 0b1);
+  INSN(fnmuld, 0b000, 0b01, 0b100010, 0b1);
+
+  // Half-precision floating-point instructions
+  INSN(fmulh,  0b000, 0b11, 0b000010, 0b1);
+  INSN(fdivh,  0b000, 0b11, 0b000110, 0b1);
+  INSN(faddh,  0b000, 0b11, 0b001010, 0b1);
+  INSN(fsubh,  0b000, 0b11, 0b001110, 0b1);
+  INSN(fmaxh,  0b000, 0b11, 0b010010, 0b1);
+  INSN(fminh,  0b000, 0b11, 0b010110, 0b1);
+  INSN(fnmulh, 0b000, 0b11, 0b100010, 0b1);
+#undef INSN
+
+// Advanced SIMD scalar three same
+#define INSN(NAME, U, size, opcode)                                                     \
+  void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {                     \
+    starti;                                                                             \
+    f(0b01, 31, 30), f(U, 29), f(0b11110, 28, 24), f(size, 23, 22), f(1, 21);           \
+    rf(Vm, 16), f(opcode, 15, 11), f(1, 10), rf(Vn, 5), rf(Vd, 0);                      \
+  }
+
+  INSN(fabds, 0b1, 0b10, 0b11010); // Floating-point Absolute Difference (single-precision)
+  INSN(fabdd, 0b1, 0b11, 0b11010); // Floating-point Absolute Difference (double-precision)
+
+#undef INSN
+
+// Advanced SIMD scalar three same FP16
+#define INSN(NAME, U, a, opcode)                                                       \
+  void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {                    \
+    starti;                                                                            \
+    f(0b01, 31, 30), f(U, 29), f(0b11110, 28, 24), f(a, 23), f(0b10, 22, 21);          \
+    rf(Vm, 16), f(0b00, 15, 14), f(opcode, 13, 11), f(1, 10), rf(Vn, 5), rf(Vd, 0);    \
+  }
+
+  INSN(fabdh, 0b1, 0b1, 0b010); // Floating-point Absolute Difference (half-precision float)
 
 #undef INSN
 
@@ -2120,6 +2153,7 @@ void mvnw(Register Rd, Register Rm,
   INSN(fnmaddd, 0b000, 0b01, 1, 0);
   INSN(fnmsub,  0b000, 0b01, 1, 1);
 
+  INSN(fmaddh,  0b000, 0b11, 0, 0);  // half-precision fused multiply-add (scalar)
 #undef INSN
 
    // Floating-point conditional select
diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
index a6cd0557758..0fbc2ef141e 100644
--- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/matcher_aarch64.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
@@ -200,4 +200,8 @@
     return false;
   }
 
+  // Is FEAT_FP16 supported for this CPU?
+  static bool is_feat_fp16_supported() {
+    return (VM_Version::supports_fphp() && VM_Version::supports_asimdhp());
+  }
 #endif // CPU_AARCH64_MATCHER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 04cf9c9c2a0..373f8da5405 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_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, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -125,6 +125,8 @@ enum Ampere_CPU_Model {
     decl(SHA2,          sha256,        6)     \
     decl(CRC32,         crc32,         7)     \
     decl(LSE,           lse,           8)     \
+    decl(FPHP,          fphp,          9)     \
+    decl(ASIMDHP,       asimdhp,       10)    \
     decl(DCPOP,         dcpop,         16)    \
     decl(SHA3,          sha3,          17)    \
     decl(SHA512,        sha512,        21)    \
diff --git a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp
index dabc69403f3..9725c6cd6c0 100644
--- a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp
@@ -75,6 +75,14 @@
 #define HWCAP_PACA (1 << 30)
 #endif
 
+#ifndef HWCAP_FPHP
+#define HWCAP_FPHP (1<<9)
+#endif
+
+#ifndef HWCAP_ASIMDHP
+#define HWCAP_ASIMDHP (1<<10)
+#endif
+
 #ifndef HWCAP2_SVE2
 #define HWCAP2_SVE2 (1 << 1)
 #endif
@@ -119,6 +127,8 @@ void VM_Version::get_os_cpu_info() {
   static_assert(CPU_SHA512  == HWCAP_SHA512,  "Flag CPU_SHA512 must follow Linux HWCAP");
   static_assert(CPU_SVE     == HWCAP_SVE,     "Flag CPU_SVE must follow Linux HWCAP");
   static_assert(CPU_PACA    == HWCAP_PACA,    "Flag CPU_PACA must follow Linux HWCAP");
+  static_assert(CPU_FPHP    == HWCAP_FPHP,    "Flag CPU_FPHP must follow Linux HWCAP");
+  static_assert(CPU_ASIMDHP == HWCAP_ASIMDHP, "Flag CPU_ASIMDHP must follow Linux HWCAP");
   _features = auxv & (
       HWCAP_FP      |
       HWCAP_ASIMD   |
@@ -133,7 +143,9 @@ void VM_Version::get_os_cpu_info() {
       HWCAP_SHA3    |
       HWCAP_SHA512  |
       HWCAP_SVE     |
-      HWCAP_PACA);
+      HWCAP_PACA    |
+      HWCAP_FPHP    |
+      HWCAP_ASIMDHP);
 
   if (auxv2 & HWCAP2_SVE2) _features |= CPU_SVE2;
   if (auxv2 & HWCAP2_SVEBITPERM) _features |= CPU_SVEBITPERM;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
index 2a8959e5d7f..dbd83b314c9 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.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
@@ -183,6 +183,8 @@ public enum CPUFeature implements CPUFeatureName {
         SVEBITPERM,
         SVE2,
         A53MAC,
+        FPHP,
+        ASIMDHP,
     }
 
     private final EnumSet<CPUFeature> features;
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 92868e783dc..866fb7f3e58 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -14,10 +14,9 @@
 
 immediates16 \
      = [0x1, 0x38, 0x7e, 0xff, 0x1fc, 0x1ff, 0x3f0,
-        0x7e0, 0xfc0, 0x1f80, 0x3ff0, 0x7e00, 0x7e00,
-        0x8000, 0x81ff, 0xc1ff, 0xc003, 0xc7ff, 0xdfff,
-        0xe03f, 0xe10f, 0xe1ff, 0xf801, 0xfc00, 0xfc07,
-        0xff03, 0xfffe]
+        0x7e0, 0xfc0, 0x1f80, 0x3ff0, 0x7e00, 0x8000,
+        0x81ff, 0xc1ff, 0xc003, 0xc7ff, 0xdfff, 0xe03f,
+        0xe1ff, 0xf801, 0xfc00, 0xfc07, 0xff03, 0xfffe]
 
 immediates32 \
      = [0x1, 0x3f, 0x1f0, 0x7e0,
@@ -1065,7 +1064,7 @@ class FloatInstruction(Instruction):
     def aname(self):
         if (self._name in ["fcvtsh", "fcvths"]):
             return self._name[:len(self._name)-2]
-        elif (self._name.endswith("s") | self._name.endswith("d")):
+        elif (self._name.endswith("h") | self._name.endswith("s") | self._name.endswith("d")):
             return self._name[:len(self._name)-1]
         else:
             return self._name
@@ -1684,19 +1683,24 @@ def generate(kind, names):
          ["maddw", "msubw", "madd", "msub", "smaddl", "smsubl", "umaddl", "umsubl"])
 
 generate(ThreeRegFloatOp,
-         [["fabds", "sss"], ["fmuls", "sss"], ["fdivs", "sss"], ["fadds", "sss"], ["fsubs", "sss"],
+         [["fabdh", "hhh"], ["fmulh", "hhh"], ["fdivh", "hhh"], ["faddh", "hhh"], ["fsubh", "hhh"],
+          ["fmaxh", "hhh"], ["fminh", "hhh"], ["fnmulh", "hhh"],
+          ["fabds", "sss"], ["fmuls", "sss"], ["fdivs", "sss"], ["fadds", "sss"], ["fsubs", "sss"],
+          ["fmaxs", "sss"], ["fmins", "sss"], ["fnmuls", "sss"],
           ["fabdd", "ddd"], ["fmuld", "ddd"], ["fdivd", "ddd"], ["faddd", "ddd"], ["fsubd", "ddd"],
+          ["fmaxd", "ddd"], ["fmind", "ddd"], ["fnmuld", "ddd"]
           ])
 
 generate(FourRegFloatOp,
-         [["fmadds", "ssss"], ["fmsubs", "ssss"], ["fnmadds", "ssss"], ["fnmadds", "ssss"],
-          ["fmaddd", "dddd"], ["fmsubd", "dddd"], ["fnmaddd", "dddd"], ["fnmaddd", "dddd"],])
+         [["fmaddh", "hhhh"], ["fmadds", "ssss"], ["fmsubs", "ssss"], ["fnmadds", "ssss"],
+          ["fnmadds", "ssss"], ["fmaddd", "dddd"], ["fmsubd", "dddd"], ["fnmaddd", "dddd"],
+          ["fnmaddd", "dddd"],])
 
 generate(TwoRegFloatOp,
          [["fmovs", "ss"], ["fabss", "ss"], ["fnegs", "ss"], ["fsqrts", "ss"],
           ["fcvts", "ds"], ["fcvtsh", "hs"], ["fcvths", "sh"],
           ["fmovd", "dd"], ["fabsd", "dd"], ["fnegd", "dd"], ["fsqrtd", "dd"],
-          ["fcvtd", "sd"],
+          ["fcvtd", "sd"], ["fsqrth", "hh"]
           ])
 
 generate(FloatConvertOp, [["fcvtzsw", "fcvtzs", "ws"], ["fcvtzs", "fcvtzs", "xs"],
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index 0c2011592b6..c2e8046213b 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -484,404 +484,420 @@
     __ umsubl(r13, r10, r7, r5);                       //       umsubl  x13, w10, w7, x5
 
 // ThreeRegFloatOp
-    __ fabds(v30, v15, v3);                            //       fabd    s30, s15, s3
-    __ fmuls(v12, v12, v16);                           //       fmul    s12, s12, s16
-    __ fdivs(v31, v31, v18);                           //       fdiv    s31, s31, s18
-    __ fadds(v19, v21, v16);                           //       fadd    s19, s21, s16
-    __ fsubs(v15, v10, v21);                           //       fsub    s15, s10, s21
-    __ fabdd(v2, v10, v28);                            //       fabd    d2, d10, d28
-    __ fmuld(v7, v30, v31);                            //       fmul    d7, d30, d31
-    __ fdivd(v18, v1, v2);                             //       fdiv    d18, d1, d2
-    __ faddd(v6, v10, v3);                             //       fadd    d6, d10, d3
-    __ fsubd(v25, v11, v7);                            //       fsub    d25, d11, d7
+    __ fabdh(v30, v15, v3);                            //       fabd    h30, h15, h3
+    __ fmulh(v12, v12, v16);                           //       fmul    h12, h12, h16
+    __ fdivh(v31, v31, v18);                           //       fdiv    h31, h31, h18
+    __ faddh(v19, v21, v16);                           //       fadd    h19, h21, h16
+    __ fsubh(v15, v10, v21);                           //       fsub    h15, h10, h21
+    __ fmaxh(v2, v10, v28);                            //       fmax    h2, h10, h28
+    __ fminh(v7, v30, v31);                            //       fmin    h7, h30, h31
+    __ fnmulh(v18, v1, v2);                            //       fnmul   h18, h1, h2
+    __ fabds(v6, v10, v3);                             //       fabd    s6, s10, s3
+    __ fmuls(v25, v11, v7);                            //       fmul    s25, s11, s7
+    __ fdivs(v1, v12, v0);                             //       fdiv    s1, s12, s0
+    __ fadds(v3, v19, v29);                            //       fadd    s3, s19, s29
+    __ fsubs(v6, v23, v6);                             //       fsub    s6, s23, s6
+    __ fmaxs(v0, v28, v27);                            //       fmax    s0, s28, s27
+    __ fmins(v2, v5, v7);                              //       fmin    s2, s5, s7
+    __ fnmuls(v29, v12, v25);                          //       fnmul   s29, s12, s25
+    __ fabdd(v13, v12, v24);                           //       fabd    d13, d12, d24
+    __ fmuld(v19, v8, v18);                            //       fmul    d19, d8, d18
+    __ fdivd(v22, v26, v21);                           //       fdiv    d22, d26, d21
+    __ faddd(v20, v19, v2);                            //       fadd    d20, d19, d2
+    __ fsubd(v30, v22, v8);                            //       fsub    d30, d22, d8
+    __ fmaxd(v22, v19, v21);                           //       fmax    d22, d19, d21
+    __ fmind(v12, v18, v21);                           //       fmin    d12, d18, d21
+    __ fnmuld(v6, v16, v3);                            //       fnmul   d6, d16, d3
 
 // FourRegFloatOp
-    __ fmadds(v1, v12, v0, v3);                        //       fmadd   s1, s12, s0, s3
-    __ fmsubs(v19, v29, v6, v23);                      //       fmsub   s19, s29, s6, s23
-    __ fnmadds(v6, v0, v28, v27);                      //       fnmadd  s6, s0, s28, s27
-    __ fnmadds(v2, v5, v7, v29);                       //       fnmadd  s2, s5, s7, s29
-    __ fmaddd(v12, v25, v13, v12);                     //       fmadd   d12, d25, d13, d12
-    __ fmsubd(v24, v19, v8, v18);                      //       fmsub   d24, d19, d8, d18
-    __ fnmaddd(v22, v26, v21, v20);                    //       fnmadd  d22, d26, d21, d20
-    __ fnmaddd(v19, v2, v30, v22);                     //       fnmadd  d19, d2, d30, d22
+    __ fmaddh(v3, v29, v3, v28);                       //       fmadd   h3, h29, h3, h28
+    __ fmadds(v15, v14, v10, v13);                     //       fmadd   s15, s14, s10, s13
+    __ fmsubs(v12, v18, v10, v26);                     //       fmsub   s12, s18, s10, s26
+    __ fnmadds(v7, v7, v15, v29);                      //       fnmadd  s7, s7, s15, s29
+    __ fnmadds(v0, v23, v0, v12);                      //       fnmadd  s0, s23, s0, s12
+    __ fmaddd(v24, v14, v13, v8);                      //       fmadd   d24, d14, d13, d8
+    __ fmsubd(v15, v7, v9, v20);                       //       fmsub   d15, d7, d9, d20
+    __ fnmaddd(v19, v29, v31, v16);                    //       fnmadd  d19, d29, d31, d16
+    __ fnmaddd(v2, v9, v16, v21);                      //       fnmadd  d2, d9, d16, d21
 
 // TwoRegFloatOp
-    __ fmovs(v8, v22);                                 //       fmov    s8, s22
-    __ fabss(v19, v21);                                //       fabs    s19, s21
-    __ fnegs(v12, v18);                                //       fneg    s12, s18
-    __ fsqrts(v21, v6);                                //       fsqrt   s21, s6
-    __ fcvts(v16, v3);                                 //       fcvt    d16, s3
-    __ fcvtsh(v3, v29);                                //       fcvt    h3, s29
-    __ fcvths(v3, v28);                                //       fcvt    s3, h28
-    __ fmovd(v15, v14);                                //       fmov    d15, d14
-    __ fabsd(v10, v13);                                //       fabs    d10, d13
-    __ fnegd(v12, v18);                                //       fneg    d12, d18
-    __ fsqrtd(v10, v26);                               //       fsqrt   d10, d26
-    __ fcvtd(v7, v7);                                  //       fcvt    s7, d7
+    __ fmovs(v30, v4);                                 //       fmov    s30, s4
+    __ fabss(v1, v27);                                 //       fabs    s1, s27
+    __ fnegs(v25, v24);                                //       fneg    s25, s24
+    __ fsqrts(v14, v21);                               //       fsqrt   s14, s21
+    __ fcvts(v13, v6);                                 //       fcvt    d13, s6
+    __ fcvtsh(v12, v25);                               //       fcvt    h12, s25
+    __ fcvths(v25, v30);                               //       fcvt    s25, h30
+    __ fmovd(v28, v21);                                //       fmov    d28, d21
+    __ fabsd(v16, v23);                                //       fabs    d16, d23
+    __ fnegd(v5, v29);                                 //       fneg    d5, d29
+    __ fsqrtd(v22, v19);                               //       fsqrt   d22, d19
+    __ fcvtd(v13, v20);                                //       fcvt    s13, d20
+    __ fsqrth(v19, v28);                               //       fsqrt   h19, h28
 
 // FloatConvertOp
-    __ fcvtzsw(r14, v29);                              //       fcvtzs  w14, s29
-    __ fcvtzs(r0, v23);                                //       fcvtzs  x0, s23
-    __ fcvtzdw(r0, v12);                               //       fcvtzs  w0, d12
-    __ fcvtzd(r23, v14);                               //       fcvtzs  x23, d14
-    __ scvtfws(v13, r7);                               //       scvtf   s13, w7
-    __ scvtfs(v15, r7);                                //       scvtf   s15, x7
-    __ scvtfwd(v9, r20);                               //       scvtf   d9, w20
-    __ scvtfd(v19, r28);                               //       scvtf   d19, x28
-    __ fcvtassw(r30, v16);                             //       fcvtas  w30, s16
-    __ fcvtasd(r2, v9);                                //       fcvtas  x2, d9
-    __ fcvtmssw(r16, v21);                             //       fcvtms  w16, s21
-    __ fcvtmsd(r29, v4);                               //       fcvtms  x29, d4
-    __ fmovs(r1, v27);                                 //       fmov    w1, s27
-    __ fmovd(r24, v24);                                //       fmov    x24, d24
-    __ fmovs(v14, r21);                                //       fmov    s14, w21
-    __ fmovd(v13, r5);                                 //       fmov    d13, x5
+    __ fcvtzsw(r17, v6);                               //       fcvtzs  w17, s6
+    __ fcvtzs(r13, v7);                                //       fcvtzs  x13, s7
+    __ fcvtzdw(r28, v26);                              //       fcvtzs  w28, d26
+    __ fcvtzd(r17, v6);                                //       fcvtzs  x17, d6
+    __ scvtfws(v1, r4);                                //       scvtf   s1, w4
+    __ scvtfs(v14, r20);                               //       scvtf   s14, x20
+    __ scvtfwd(v7, r21);                               //       scvtf   d7, w21
+    __ scvtfd(v27, r23);                               //       scvtf   d27, x23
+    __ fcvtassw(r13, v20);                             //       fcvtas  w13, s20
+    __ fcvtasd(r30, v28);                              //       fcvtas  x30, d28
+    __ fcvtmssw(r10, v21);                             //       fcvtms  w10, s21
+    __ fcvtmsd(r5, v17);                               //       fcvtms  x5, d17
+    __ fmovs(r11, v14);                                //       fmov    w11, s14
+    __ fmovd(r13, v21);                                //       fmov    x13, d21
+    __ fmovs(v27, r14);                                //       fmov    s27, w14
+    __ fmovd(v4, r23);                                 //       fmov    d4, x23
 
 // TwoRegFloatOp
-    __ fcmps(v12, v25);                                //       fcmp    s12, s25
-    __ fcmpd(v25, v30);                                //       fcmp    d25, d30
-    __ fcmps(v28, 0.0);                                //       fcmp    s28, #0.0
-    __ fcmpd(v21, 0.0);                                //       fcmp    d21, #0.0
+    __ fcmps(v24, v30);                                //       fcmp    s24, s30
+    __ fcmpd(v12, v14);                                //       fcmp    d12, d14
+    __ fcmps(v17, 0.0);                                //       fcmp    s17, #0.0
+    __ fcmpd(v28, 0.0);                                //       fcmp    d28, #0.0
 
 // LoadStorePairOp
-    __ stpw(r22, r5, Address(r28, -48));               //       stp     w22, w5, [x28, #-48]
-    __ ldpw(r19, r27, Address(r19, 16));               //       ldp     w19, w27, [x19, #16]
-    __ ldpsw(r28, r26, Address(r7, -32));              //       ldpsw   x28, x26, [x7, #-32]
-    __ stp(r6, r1, Address(r4, -48));                  //       stp     x6, x1, [x4, #-48]
-    __ ldp(r26, r23, Address(r21, -80));               //       ldp     x26, x23, [x21, #-80]
+    __ stpw(r0, r6, Address(r26, 16));                 //       stp     w0, w6, [x26, #16]
+    __ ldpw(r0, r30, Address(r6, -32));                //       ldp     w0, w30, [x6, #-32]
+    __ ldpsw(r16, r2, Address(r11, -208));             //       ldpsw   x16, x2, [x11, #-208]
+    __ stp(r15, r0, Address(r12, 128));                //       stp     x15, x0, [x12, #128]
+    __ ldp(r7, r30, Address(r23, 32));                 //       ldp     x7, x30, [x23, #32]
 
 // LoadStorePairOp
-    __ stpw(r20, r30, Address(__ pre(r9, -96)));       //       stp     w20, w30, [x9, #-96]!
-    __ ldpw(r13, r20, Address(__ pre(r26, 16)));       //       ldp     w13, w20, [x26, #16]!
-    __ ldpsw(r29, r11, Address(__ pre(r13, -80)));     //       ldpsw   x29, x11, [x13, #-80]!
-    __ stp(r27, r21, Address(__ pre(r5, -48)));        //       stp     x27, x21, [x5, #-48]!
-    __ ldp(r6, r0, Address(__ pre(r30, 80)));          //       ldp     x6, x0, [x30, #80]!
+    __ stpw(r26, r15, Address(__ pre(r7, -256)));      //       stp     w26, w15, [x7, #-256]!
+    __ ldpw(r11, r15, Address(__ pre(r10, -32)));      //       ldp     w11, w15, [x10, #-32]!
+    __ ldpsw(r19, r16, Address(__ pre(r1, 64)));       //       ldpsw   x19, x16, [x1, #64]!
+    __ stp(r14, r9, Address(__ pre(r0, 128)));         //       stp     x14, x9, [x0, #128]!
+    __ ldp(r27, r3, Address(__ pre(r12, -96)));        //       ldp     x27, x3, [x12, #-96]!
 
 // LoadStorePairOp
-    __ stpw(r19, r15, Address(__ post(r16, -208)));    //       stp     w19, w15, [x16], #-208
-    __ ldpw(r12, r23, Address(__ post(r9, -240)));     //       ldp     w12, w23, [x9], #-240
-    __ ldpsw(r0, r26, Address(__ post(r15, 32)));      //       ldpsw   x0, x26, [x15], #32
-    __ stp(r8, r17, Address(__ post(r26, -208)));      //       stp     x8, x17, [x26], #-208
-    __ ldp(r25, r7, Address(__ post(r2, -176)));       //       ldp     x25, x7, [x2], #-176
+    __ stpw(r8, r11, Address(__ post(r12, -256)));     //       stp     w8, w11, [x12], #-256
+    __ ldpw(r10, r16, Address(__ post(r4, 64)));       //       ldp     w10, w16, [x4], #64
+    __ ldpsw(r10, r30, Address(__ post(r19, -64)));    //       ldpsw   x10, x30, [x19], #-64
+    __ stp(r24, r2, Address(__ post(r15, -96)));       //       stp     x24, x2, [x15], #-96
+    __ ldp(r24, r10, Address(__ post(r16, 80)));       //       ldp     x24, x10, [x16], #80
 
 // LoadStorePairOp
-    __ stnpw(r19, r17, Address(r1, -208));             //       stnp    w19, w17, [x1, #-208]
-    __ ldnpw(r0, r13, Address(r22, 128));              //       ldnp    w0, w13, [x22, #128]
-    __ stnp(r29, r23, Address(r27, 0));                //       stnp    x29, x23, [x27, #0]
-    __ ldnp(r11, r10, Address(r8, -224));              //       ldnp    x11, x10, [x8, #-224]
+    __ stnpw(r30, r21, Address(r29, 16));              //       stnp    w30, w21, [x29, #16]
+    __ ldnpw(r8, r30, Address(r10, -112));             //       ldnp    w8, w30, [x10, #-112]
+    __ stnp(r30, r26, Address(r6, -128));              //       stnp    x30, x26, [x6, #-128]
+    __ ldnp(r24, r2, Address(r20, 64));                //       ldnp    x24, x2, [x20, #64]
 
 // LdStNEONOp
-    __ ld1(v0, __ T8B, Address(r11));                  //       ld1     {v0.8B}, [x11]
-    __ ld1(v16, v17, __ T16B, Address(__ post(r26, 32))); //    ld1     {v16.16B, v17.16B}, [x26], 32
-    __ ld1(v22, v23, v24, __ T1D, Address(__ post(r26, r17))); //       ld1     {v22.1D, v23.1D, v24.1D}, [x26], x17
-    __ ld1(v27, v28, v29, v30, __ T8H, Address(__ post(r29, 64))); //   ld1     {v27.8H, v28.8H, v29.8H, v30.8H}, [x29], 64
-    __ ld1r(v22, __ T8B, Address(r6));                 //       ld1r    {v22.8B}, [x6]
-    __ ld1r(v14, __ T4S, Address(__ post(r29, 4)));    //       ld1r    {v14.4S}, [x29], 4
-    __ ld1r(v22, __ T1D, Address(__ post(r12, r16)));  //       ld1r    {v22.1D}, [x12], x16
-    __ ld2(v1, v2, __ T2D, Address(r0));               //       ld2     {v1.2D, v2.2D}, [x0]
-    __ ld2(v10, v11, __ T4H, Address(__ post(r21, 16))); //     ld2     {v10.4H, v11.4H}, [x21], 16
-    __ ld2r(v7, v8, __ T16B, Address(r25));            //       ld2r    {v7.16B, v8.16B}, [x25]
-    __ ld2r(v9, v10, __ T2S, Address(__ post(r9, 8))); //       ld2r    {v9.2S, v10.2S}, [x9], 8
-    __ ld2r(v9, v10, __ T2D, Address(__ post(r12, r14))); //    ld2r    {v9.2D, v10.2D}, [x12], x14
-    __ ld3(v7, v8, v9, __ T4S, Address(__ post(r4, r17))); //   ld3     {v7.4S, v8.4S, v9.4S}, [x4], x17
-    __ ld3(v23, v24, v25, __ T2S, Address(r17));       //       ld3     {v23.2S, v24.2S, v25.2S}, [x17]
-    __ ld3r(v4, v5, v6, __ T8H, Address(r22));         //       ld3r    {v4.8H, v5.8H, v6.8H}, [x22]
-    __ ld3r(v13, v14, v15, __ T4S, Address(__ post(r2, 12))); //        ld3r    {v13.4S, v14.4S, v15.4S}, [x2], 12
-    __ ld3r(v16, v17, v18, __ T1D, Address(__ post(r10, r12))); //      ld3r    {v16.1D, v17.1D, v18.1D}, [x10], x12
-    __ ld4(v4, v5, v6, v7, __ T8H, Address(__ post(r2, 64))); //        ld4     {v4.8H, v5.8H, v6.8H, v7.8H}, [x2], 64
-    __ ld4(v6, v7, v8, v9, __ T8B, Address(__ post(r20, r11))); //      ld4     {v6.8B, v7.8B, v8.8B, v9.8B}, [x20], x11
-    __ ld4r(v12, v13, v14, v15, __ T8B, Address(r12)); //       ld4r    {v12.8B, v13.8B, v14.8B, v15.8B}, [x12]
-    __ ld4r(v16, v17, v18, v19, __ T4H, Address(__ post(r17, 8))); //   ld4r    {v16.4H, v17.4H, v18.4H, v19.4H}, [x17], 8
-    __ ld4r(v14, v15, v16, v17, __ T2S, Address(__ post(r25, r16))); // ld4r    {v14.2S, v15.2S, v16.2S, v17.2S}, [x25], x16
+    __ ld1(v31, __ T8B, Address(r25));                 //       ld1     {v31.8B}, [x25]
+    __ ld1(v5, v6, __ T16B, Address(__ post(r15, 32))); //      ld1     {v5.16B, v6.16B}, [x15], 32
+    __ ld1(v10, v11, v12, __ T1D, Address(__ post(r7, r13))); //        ld1     {v10.1D, v11.1D, v12.1D}, [x7], x13
+    __ ld1(v13, v14, v15, v16, __ T8H, Address(__ post(r16, 64))); //   ld1     {v13.8H, v14.8H, v15.8H, v16.8H}, [x16], 64
+    __ ld1r(v7, __ T8B, Address(r17));                 //       ld1r    {v7.8B}, [x17]
+    __ ld1r(v16, __ T4S, Address(__ post(r25, 4)));    //       ld1r    {v16.4S}, [x25], 4
+    __ ld1r(v11, __ T1D, Address(__ post(r3, r7)));    //       ld1r    {v11.1D}, [x3], x7
+    __ ld2(v13, v14, __ T2D, Address(r7));             //       ld2     {v13.2D, v14.2D}, [x7]
+    __ ld2(v9, v10, __ T4H, Address(__ post(r27, 16))); //      ld2     {v9.4H, v10.4H}, [x27], 16
+    __ ld2r(v6, v7, __ T16B, Address(r26));            //       ld2r    {v6.16B, v7.16B}, [x26]
+    __ ld2r(v23, v24, __ T2S, Address(__ post(r16, 8))); //     ld2r    {v23.2S, v24.2S}, [x16], 8
+    __ ld2r(v6, v7, __ T2D, Address(__ post(r13, r8))); //      ld2r    {v6.2D, v7.2D}, [x13], x8
+    __ ld3(v20, v21, v22, __ T4S, Address(__ post(r1, r26))); //        ld3     {v20.4S, v21.4S, v22.4S}, [x1], x26
+    __ ld3(v15, v16, v17, __ T2S, Address(r15));       //       ld3     {v15.2S, v16.2S, v17.2S}, [x15]
+    __ ld3r(v29, v30, v31, __ T8H, Address(r22));      //       ld3r    {v29.8H, v30.8H, v31.8H}, [x22]
+    __ ld3r(v6, v7, v8, __ T4S, Address(__ post(r10, 12))); //  ld3r    {v6.4S, v7.4S, v8.4S}, [x10], 12
+    __ ld3r(v15, v16, v17, __ T1D, Address(__ post(r6, r15))); //       ld3r    {v15.1D, v16.1D, v17.1D}, [x6], x15
+    __ ld4(v6, v7, v8, v9, __ T8H, Address(__ post(r10, 64))); //       ld4     {v6.8H, v7.8H, v8.8H, v9.8H}, [x10], 64
+    __ ld4(v11, v12, v13, v14, __ T8B, Address(__ post(r3, r7))); //    ld4     {v11.8B, v12.8B, v13.8B, v14.8B}, [x3], x7
+    __ ld4r(v12, v13, v14, v15, __ T8B, Address(r25)); //       ld4r    {v12.8B, v13.8B, v14.8B, v15.8B}, [x25]
+    __ ld4r(v11, v12, v13, v14, __ T4H, Address(__ post(r15, 8))); //   ld4r    {v11.4H, v12.4H, v13.4H, v14.4H}, [x15], 8
+    __ ld4r(v30, v31, v0, v1, __ T2S, Address(__ post(r6, r28))); //    ld4r    {v30.2S, v31.2S, v0.2S, v1.2S}, [x6], x28
 
 // NEONReduceInstruction
-    __ addv(v20, __ T8B, v21);                         //       addv    b20, v21.8B
-    __ addv(v1, __ T16B, v2);                          //       addv    b1, v2.16B
-    __ addv(v23, __ T4H, v24);                         //       addv    h23, v24.4H
-    __ addv(v30, __ T8H, v31);                         //       addv    h30, v31.8H
-    __ addv(v14, __ T4S, v15);                         //       addv    s14, v15.4S
-    __ smaxv(v2, __ T8B, v3);                          //       smaxv   b2, v3.8B
-    __ smaxv(v6, __ T16B, v7);                         //       smaxv   b6, v7.16B
-    __ smaxv(v3, __ T4H, v4);                          //       smaxv   h3, v4.4H
-    __ smaxv(v8, __ T8H, v9);                          //       smaxv   h8, v9.8H
-    __ smaxv(v25, __ T4S, v26);                        //       smaxv   s25, v26.4S
-    __ fmaxv(v0, __ T4S, v1);                          //       fmaxv   s0, v1.4S
-    __ sminv(v27, __ T8B, v28);                        //       sminv   b27, v28.8B
-    __ uminv(v30, __ T8B, v31);                        //       uminv   b30, v31.8B
-    __ sminv(v5, __ T16B, v6);                         //       sminv   b5, v6.16B
-    __ uminv(v5, __ T16B, v6);                         //       uminv   b5, v6.16B
-    __ sminv(v30, __ T4H, v31);                        //       sminv   h30, v31.4H
-    __ uminv(v11, __ T4H, v12);                        //       uminv   h11, v12.4H
-    __ sminv(v25, __ T8H, v26);                        //       sminv   h25, v26.8H
-    __ uminv(v0, __ T8H, v1);                          //       uminv   h0, v1.8H
+    __ addv(v27, __ T8B, v28);                         //       addv    b27, v28.8B
+    __ addv(v28, __ T16B, v29);                        //       addv    b28, v29.16B
+    __ addv(v1, __ T4H, v2);                           //       addv    h1, v2.4H
+    __ addv(v28, __ T8H, v29);                         //       addv    h28, v29.8H
+    __ addv(v1, __ T4S, v2);                           //       addv    s1, v2.4S
+    __ smaxv(v20, __ T8B, v21);                        //       smaxv   b20, v21.8B
+    __ smaxv(v29, __ T16B, v30);                       //       smaxv   b29, v30.16B
+    __ smaxv(v16, __ T4H, v17);                        //       smaxv   h16, v17.4H
+    __ smaxv(v13, __ T8H, v14);                        //       smaxv   h13, v14.8H
+    __ smaxv(v10, __ T4S, v11);                        //       smaxv   s10, v11.4S
+    __ fmaxv(v29, __ T4S, v30);                        //       fmaxv   s29, v30.4S
+    __ sminv(v29, __ T8B, v30);                        //       sminv   b29, v30.8B
+    __ uminv(v19, __ T8B, v20);                        //       uminv   b19, v20.8B
+    __ sminv(v22, __ T16B, v23);                       //       sminv   b22, v23.16B
+    __ uminv(v10, __ T16B, v11);                       //       uminv   b10, v11.16B
+    __ sminv(v4, __ T4H, v5);                          //       sminv   h4, v5.4H
+    __ uminv(v31, __ T4H, v0);                         //       uminv   h31, v0.4H
+    __ sminv(v21, __ T8H, v22);                        //       sminv   h21, v22.8H
+    __ uminv(v8, __ T8H, v9);                          //       uminv   h8, v9.8H
     __ sminv(v31, __ T4S, v0);                         //       sminv   s31, v0.4S
-    __ uminv(v0, __ T4S, v1);                          //       uminv   s0, v1.4S
-    __ fminv(v19, __ T4S, v20);                        //       fminv   s19, v20.4S
-    __ fmaxp(v29, v30, __ S);                          //       fmaxp   s29, v30.2S
-    __ fmaxp(v26, v27, __ D);                          //       fmaxp   d26, v27.2D
-    __ fminp(v9, v10, __ S);                           //       fminp   s9, v10.2S
-    __ fminp(v26, v27, __ D);                          //       fminp   d26, v27.2D
+    __ uminv(v19, __ T4S, v20);                        //       uminv   s19, v20.4S
+    __ fminv(v10, __ T4S, v11);                        //       fminv   s10, v11.4S
+    __ fmaxp(v28, v29, __ S);                          //       fmaxp   s28, v29.2S
+    __ fmaxp(v2, v3, __ D);                            //       fmaxp   d2, v3.2D
+    __ fminp(v25, v26, __ S);                          //       fminp   s25, v26.2S
+    __ fminp(v5, v6, __ D);                            //       fminp   d5, v6.2D
 
 // NEONFloatCompareWithZero
-    __ fcm(Assembler::GT, v12, __ T2S, v13);           //       fcmgt   v12.2S, v13.2S, #0.0
-    __ fcm(Assembler::GT, v15, __ T4S, v16);           //       fcmgt   v15.4S, v16.4S, #0.0
-    __ fcm(Assembler::GT, v11, __ T2D, v12);           //       fcmgt   v11.2D, v12.2D, #0.0
-    __ fcm(Assembler::GE, v11, __ T2S, v12);           //       fcmge   v11.2S, v12.2S, #0.0
-    __ fcm(Assembler::GE, v18, __ T4S, v19);           //       fcmge   v18.4S, v19.4S, #0.0
-    __ fcm(Assembler::GE, v25, __ T2D, v26);           //       fcmge   v25.2D, v26.2D, #0.0
-    __ fcm(Assembler::EQ, v22, __ T2S, v23);           //       fcmeq   v22.2S, v23.2S, #0.0
+    __ fcm(Assembler::GT, v3, __ T2S, v4);             //       fcmgt   v3.2S, v4.2S, #0.0
+    __ fcm(Assembler::GT, v8, __ T4S, v9);             //       fcmgt   v8.4S, v9.4S, #0.0
+    __ fcm(Assembler::GT, v22, __ T2D, v23);           //       fcmgt   v22.2D, v23.2D, #0.0
+    __ fcm(Assembler::GE, v19, __ T2S, v20);           //       fcmge   v19.2S, v20.2S, #0.0
+    __ fcm(Assembler::GE, v13, __ T4S, v14);           //       fcmge   v13.4S, v14.4S, #0.0
+    __ fcm(Assembler::GE, v5, __ T2D, v6);             //       fcmge   v5.2D, v6.2D, #0.0
+    __ fcm(Assembler::EQ, v29, __ T2S, v30);           //       fcmeq   v29.2S, v30.2S, #0.0
     __ fcm(Assembler::EQ, v24, __ T4S, v25);           //       fcmeq   v24.4S, v25.4S, #0.0
-    __ fcm(Assembler::EQ, v0, __ T2D, v1);             //       fcmeq   v0.2D, v1.2D, #0.0
-    __ fcm(Assembler::LT, v17, __ T2S, v18);           //       fcmlt   v17.2S, v18.2S, #0.0
-    __ fcm(Assembler::LT, v11, __ T4S, v12);           //       fcmlt   v11.4S, v12.4S, #0.0
-    __ fcm(Assembler::LT, v6, __ T2D, v7);             //       fcmlt   v6.2D, v7.2D, #0.0
-    __ fcm(Assembler::LE, v29, __ T2S, v30);           //       fcmle   v29.2S, v30.2S, #0.0
-    __ fcm(Assembler::LE, v6, __ T4S, v7);             //       fcmle   v6.4S, v7.4S, #0.0
-    __ fcm(Assembler::LE, v5, __ T2D, v6);             //       fcmle   v5.2D, v6.2D, #0.0
+    __ fcm(Assembler::EQ, v21, __ T2D, v22);           //       fcmeq   v21.2D, v22.2D, #0.0
+    __ fcm(Assembler::LT, v26, __ T2S, v27);           //       fcmlt   v26.2S, v27.2S, #0.0
+    __ fcm(Assembler::LT, v24, __ T4S, v25);           //       fcmlt   v24.4S, v25.4S, #0.0
+    __ fcm(Assembler::LT, v3, __ T2D, v4);             //       fcmlt   v3.2D, v4.2D, #0.0
+    __ fcm(Assembler::LE, v24, __ T2S, v25);           //       fcmle   v24.2S, v25.2S, #0.0
+    __ fcm(Assembler::LE, v26, __ T4S, v27);           //       fcmle   v26.4S, v27.4S, #0.0
+    __ fcm(Assembler::LE, v23, __ T2D, v24);           //       fcmle   v23.2D, v24.2D, #0.0
 
 // TwoRegNEONOp
-    __ absr(v5, __ T8B, v6);                           //       abs     v5.8B, v6.8B
+    __ absr(v15, __ T8B, v16);                         //       abs     v15.8B, v16.8B
     __ absr(v21, __ T16B, v22);                        //       abs     v21.16B, v22.16B
-    __ absr(v19, __ T4H, v20);                         //       abs     v19.4H, v20.4H
-    __ absr(v16, __ T8H, v17);                         //       abs     v16.8H, v17.8H
-    __ absr(v18, __ T2S, v19);                         //       abs     v18.2S, v19.2S
-    __ absr(v30, __ T4S, v31);                         //       abs     v30.4S, v31.4S
-    __ absr(v27, __ T2D, v28);                         //       abs     v27.2D, v28.2D
-    __ fabs(v28, __ T2S, v29);                         //       fabs    v28.2S, v29.2S
-    __ fabs(v1, __ T4S, v2);                           //       fabs    v1.4S, v2.4S
-    __ fabs(v28, __ T2D, v29);                         //       fabs    v28.2D, v29.2D
+    __ absr(v3, __ T4H, v4);                           //       abs     v3.4H, v4.4H
+    __ absr(v24, __ T8H, v25);                         //       abs     v24.8H, v25.8H
+    __ absr(v8, __ T2S, v9);                           //       abs     v8.2S, v9.2S
+    __ absr(v25, __ T4S, v26);                         //       abs     v25.4S, v26.4S
+    __ absr(v20, __ T2D, v21);                         //       abs     v20.2D, v21.2D
+    __ fabs(v16, __ T2S, v17);                         //       fabs    v16.2S, v17.2S
+    __ fabs(v17, __ T4S, v18);                         //       fabs    v17.4S, v18.4S
+    __ fabs(v2, __ T2D, v3);                           //       fabs    v2.2D, v3.2D
     __ fneg(v1, __ T2S, v2);                           //       fneg    v1.2S, v2.2S
-    __ fneg(v20, __ T4S, v21);                         //       fneg    v20.4S, v21.4S
-    __ fneg(v29, __ T2D, v30);                         //       fneg    v29.2D, v30.2D
-    __ fsqrt(v16, __ T2S, v17);                        //       fsqrt   v16.2S, v17.2S
-    __ fsqrt(v13, __ T4S, v14);                        //       fsqrt   v13.4S, v14.4S
-    __ fsqrt(v10, __ T2D, v11);                        //       fsqrt   v10.2D, v11.2D
-    __ notr(v29, __ T8B, v30);                         //       not     v29.8B, v30.8B
-    __ notr(v29, __ T16B, v30);                        //       not     v29.16B, v30.16B
+    __ fneg(v0, __ T4S, v1);                           //       fneg    v0.4S, v1.4S
+    __ fneg(v24, __ T2D, v25);                         //       fneg    v24.2D, v25.2D
+    __ fsqrt(v4, __ T2S, v5);                          //       fsqrt   v4.2S, v5.2S
+    __ fsqrt(v3, __ T4S, v4);                          //       fsqrt   v3.4S, v4.4S
+    __ fsqrt(v12, __ T2D, v13);                        //       fsqrt   v12.2D, v13.2D
+    __ notr(v31, __ T8B, v0);                          //       not     v31.8B, v0.8B
+    __ notr(v28, __ T16B, v29);                        //       not     v28.16B, v29.16B
 
 // ThreeRegNEONOp
-    __ andr(v19, __ T8B, v20, v21);                    //       and     v19.8B, v20.8B, v21.8B
-    __ andr(v22, __ T16B, v23, v24);                   //       and     v22.16B, v23.16B, v24.16B
-    __ orr(v10, __ T8B, v11, v12);                     //       orr     v10.8B, v11.8B, v12.8B
-    __ orr(v4, __ T16B, v5, v6);                       //       orr     v4.16B, v5.16B, v6.16B
-    __ eor(v31, __ T8B, v0, v1);                       //       eor     v31.8B, v0.8B, v1.8B
-    __ eor(v21, __ T16B, v22, v23);                    //       eor     v21.16B, v22.16B, v23.16B
-    __ addv(v8, __ T8B, v9, v10);                      //       add     v8.8B, v9.8B, v10.8B
-    __ addv(v31, __ T16B, v0, v1);                     //       add     v31.16B, v0.16B, v1.16B
-    __ addv(v19, __ T4H, v20, v21);                    //       add     v19.4H, v20.4H, v21.4H
-    __ addv(v10, __ T8H, v11, v12);                    //       add     v10.8H, v11.8H, v12.8H
-    __ 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
-    __ 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(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
+    __ andr(v10, __ T8B, v11, v12);                    //       and     v10.8B, v11.8B, v12.8B
+    __ andr(v26, __ T16B, v27, v28);                   //       and     v26.16B, v27.16B, v28.16B
+    __ orr(v2, __ T8B, v3, v4);                        //       orr     v2.8B, v3.8B, v4.8B
+    __ orr(v12, __ T16B, v13, v14);                    //       orr     v12.16B, v13.16B, v14.16B
+    __ eor(v18, __ T8B, v19, v20);                     //       eor     v18.8B, v19.8B, v20.8B
+    __ eor(v31, __ T16B, v0, v1);                      //       eor     v31.16B, v0.16B, v1.16B
+    __ addv(v1, __ T8B, v2, v3);                       //       add     v1.8B, v2.8B, v3.8B
+    __ addv(v13, __ T16B, v14, v15);                   //       add     v13.16B, v14.16B, v15.16B
+    __ addv(v29, __ T4H, v30, v31);                    //       add     v29.4H, v30.4H, v31.4H
+    __ addv(v0, __ T8H, v1, v2);                       //       add     v0.8H, v1.8H, v2.8H
+    __ addv(v19, __ T2S, v20, v21);                    //       add     v19.2S, v20.2S, v21.2S
+    __ addv(v12, __ T4S, v13, v14);                    //       add     v12.4S, v13.4S, v14.4S
+    __ addv(v17, __ T2D, v18, v19);                    //       add     v17.2D, v18.2D, v19.2D
+    __ sqaddv(v22, __ T8B, v23, v24);                  //       sqadd   v22.8B, v23.8B, v24.8B
+    __ sqaddv(v13, __ T16B, v14, v15);                 //       sqadd   v13.16B, v14.16B, v15.16B
+    __ sqaddv(v28, __ T4H, v29, v30);                  //       sqadd   v28.4H, v29.4H, v30.4H
+    __ sqaddv(v30, __ T8H, v31, v0);                   //       sqadd   v30.8H, v31.8H, v0.8H
+    __ sqaddv(v31, __ T2S, v0, v1);                    //       sqadd   v31.2S, v0.2S, v1.2S
+    __ sqaddv(v1, __ T4S, v2, v3);                     //       sqadd   v1.4S, v2.4S, v3.4S
+    __ sqaddv(v26, __ T2D, v27, v28);                  //       sqadd   v26.2D, v27.2D, v28.2D
+    __ uqaddv(v28, __ T8B, v29, v30);                  //       uqadd   v28.8B, v29.8B, v30.8B
+    __ uqaddv(v4, __ T16B, v5, v6);                    //       uqadd   v4.16B, v5.16B, v6.16B
+    __ uqaddv(v30, __ T4H, v31, v0);                   //       uqadd   v30.4H, v31.4H, v0.4H
+    __ uqaddv(v4, __ T8H, v5, v6);                     //       uqadd   v4.8H, v5.8H, v6.8H
+    __ uqaddv(v6, __ T2S, v7, v8);                     //       uqadd   v6.2S, v7.2S, v8.2S
+    __ uqaddv(v30, __ T4S, v31, v0);                   //       uqadd   v30.4S, v31.4S, v0.4S
+    __ uqaddv(v26, __ T2D, v27, v28);                  //       uqadd   v26.2D, v27.2D, v28.2D
+    __ fadd(v18, __ T2S, v19, v20);                    //       fadd    v18.2S, v19.2S, v20.2S
+    __ fadd(v9, __ T4S, v10, v11);                     //       fadd    v9.4S, v10.4S, v11.4S
+    __ fadd(v8, __ T2D, v9, v10);                      //       fadd    v8.2D, v9.2D, v10.2D
+    __ subv(v12, __ T8B, v13, v14);                    //       sub     v12.8B, v13.8B, v14.8B
+    __ subv(v0, __ T16B, v1, v2);                      //       sub     v0.16B, v1.16B, v2.16B
+    __ subv(v20, __ T4H, v21, v22);                    //       sub     v20.4H, v21.4H, v22.4H
+    __ subv(v1, __ T8H, v2, v3);                       //       sub     v1.8H, v2.8H, v3.8H
+    __ subv(v24, __ T2S, v25, v26);                    //       sub     v24.2S, v25.2S, v26.2S
+    __ subv(v2, __ T4S, v3, v4);                       //       sub     v2.4S, v3.4S, v4.4S
+    __ subv(v0, __ T2D, v1, v2);                       //       sub     v0.2D, v1.2D, v2.2D
+    __ sqsubv(v9, __ T8B, v10, v11);                   //       sqsub   v9.8B, v10.8B, v11.8B
+    __ sqsubv(v24, __ T16B, v25, v26);                 //       sqsub   v24.16B, v25.16B, v26.16B
+    __ sqsubv(v26, __ T4H, v27, v28);                  //       sqsub   v26.4H, v27.4H, v28.4H
+    __ sqsubv(v16, __ T8H, v17, v18);                  //       sqsub   v16.8H, v17.8H, v18.8H
+    __ sqsubv(v30, __ T2S, v31, v0);                   //       sqsub   v30.2S, v31.2S, v0.2S
+    __ sqsubv(v3, __ T4S, v4, v5);                     //       sqsub   v3.4S, v4.4S, v5.4S
+    __ sqsubv(v10, __ T2D, v11, v12);                  //       sqsub   v10.2D, v11.2D, v12.2D
+    __ uqsubv(v23, __ T8B, v24, v25);                  //       uqsub   v23.8B, v24.8B, v25.8B
+    __ uqsubv(v10, __ T16B, v11, v12);                 //       uqsub   v10.16B, v11.16B, v12.16B
+    __ uqsubv(v4, __ T4H, v5, v6);                     //       uqsub   v4.4H, v5.4H, v6.4H
+    __ uqsubv(v18, __ T8H, v19, v20);                  //       uqsub   v18.8H, v19.8H, v20.8H
+    __ uqsubv(v2, __ T2S, v3, v4);                     //       uqsub   v2.2S, v3.2S, v4.2S
+    __ uqsubv(v11, __ T4S, v12, v13);                  //       uqsub   v11.4S, v12.4S, v13.4S
+    __ uqsubv(v8, __ T2D, v9, v10);                    //       uqsub   v8.2D, v9.2D, v10.2D
+    __ fsub(v10, __ T2S, v11, v12);                    //       fsub    v10.2S, v11.2S, v12.2S
+    __ fsub(v15, __ T4S, v16, v17);                    //       fsub    v15.4S, v16.4S, v17.4S
+    __ fsub(v17, __ T2D, v18, v19);                    //       fsub    v17.2D, v18.2D, v19.2D
+    __ mulv(v2, __ T8B, v3, v4);                       //       mul     v2.8B, v3.8B, v4.8B
+    __ mulv(v10, __ T16B, v11, v12);                   //       mul     v10.16B, v11.16B, v12.16B
+    __ mulv(v12, __ T4H, v13, v14);                    //       mul     v12.4H, v13.4H, v14.4H
+    __ mulv(v12, __ T8H, v13, v14);                    //       mul     v12.8H, v13.8H, v14.8H
+    __ mulv(v15, __ T2S, v16, v17);                    //       mul     v15.2S, v16.2S, v17.2S
+    __ mulv(v13, __ T4S, v14, v15);                    //       mul     v13.4S, v14.4S, v15.4S
+    __ fabd(v2, __ T2S, v3, v4);                       //       fabd    v2.2S, v3.2S, v4.2S
+    __ fabd(v7, __ T4S, v8, v9);                       //       fabd    v7.4S, v8.4S, v9.4S
+    __ fabd(v20, __ T2D, v21, v22);                    //       fabd    v20.2D, v21.2D, v22.2D
+    __ faddp(v26, __ T2S, v27, v28);                   //       faddp   v26.2S, v27.2S, v28.2S
+    __ faddp(v16, __ T4S, v17, v18);                   //       faddp   v16.4S, v17.4S, v18.4S
+    __ faddp(v4, __ T2D, v5, v6);                      //       faddp   v4.2D, v5.2D, v6.2D
+    __ fmul(v2, __ T2S, v3, v4);                       //       fmul    v2.2S, v3.2S, v4.2S
+    __ fmul(v4, __ T4S, v5, v6);                       //       fmul    v4.4S, v5.4S, v6.4S
+    __ fmul(v12, __ T2D, v13, v14);                    //       fmul    v12.2D, v13.2D, v14.2D
+    __ mlav(v18, __ T4H, v19, v20);                    //       mla     v18.4H, v19.4H, v20.4H
+    __ mlav(v21, __ T8H, v22, v23);                    //       mla     v21.8H, v22.8H, v23.8H
+    __ mlav(v16, __ T2S, v17, v18);                    //       mla     v16.2S, v17.2S, v18.2S
+    __ mlav(v18, __ T4S, v19, v20);                    //       mla     v18.4S, v19.4S, v20.4S
+    __ fmla(v11, __ T2S, v12, v13);                    //       fmla    v11.2S, v12.2S, v13.2S
+    __ fmla(v21, __ T4S, v22, v23);                    //       fmla    v21.4S, v22.4S, v23.4S
+    __ fmla(v23, __ T2D, v24, v25);                    //       fmla    v23.2D, v24.2D, v25.2D
+    __ mlsv(v12, __ T4H, v13, v14);                    //       mls     v12.4H, v13.4H, v14.4H
+    __ mlsv(v26, __ T8H, v27, v28);                    //       mls     v26.8H, v27.8H, v28.8H
+    __ mlsv(v23, __ T2S, v24, v25);                    //       mls     v23.2S, v24.2S, v25.2S
+    __ mlsv(v28, __ T4S, v29, v30);                    //       mls     v28.4S, v29.4S, v30.4S
+    __ fmls(v14, __ T2S, v15, v16);                    //       fmls    v14.2S, v15.2S, v16.2S
+    __ fmls(v11, __ T4S, v12, v13);                    //       fmls    v11.4S, v12.4S, v13.4S
+    __ fmls(v24, __ T2D, v25, v26);                    //       fmls    v24.2D, v25.2D, v26.2D
+    __ fdiv(v1, __ T2S, v2, v3);                       //       fdiv    v1.2S, v2.2S, v3.2S
+    __ fdiv(v12, __ T4S, v13, v14);                    //       fdiv    v12.4S, v13.4S, v14.4S
+    __ fdiv(v31, __ T2D, v0, v1);                      //       fdiv    v31.2D, v0.2D, v1.2D
+    __ maxv(v10, __ T8B, v11, v12);                    //       smax    v10.8B, v11.8B, v12.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
+    __ maxv(v7, __ T4H, v8, v9);                       //       smax    v7.4H, v8.4H, v9.4H
+    __ maxv(v2, __ T8H, v3, v4);                       //       smax    v2.8H, v3.8H, v4.8H
+    __ maxv(v3, __ T2S, v4, v5);                       //       smax    v3.2S, v4.2S, v5.2S
+    __ maxv(v13, __ T4S, v14, v15);                    //       smax    v13.4S, v14.4S, v15.4S
+    __ umaxv(v19, __ T8B, v20, v21);                   //       umax    v19.8B, v20.8B, v21.8B
+    __ umaxv(v17, __ T16B, v18, v19);                  //       umax    v17.16B, v18.16B, v19.16B
+    __ umaxv(v16, __ T4H, v17, v18);                   //       umax    v16.4H, v17.4H, v18.4H
+    __ umaxv(v3, __ T8H, v4, v5);                      //       umax    v3.8H, v4.8H, v5.8H
+    __ umaxv(v1, __ T2S, v2, v3);                      //       umax    v1.2S, v2.2S, v3.2S
+    __ umaxv(v11, __ T4S, v12, v13);                   //       umax    v11.4S, v12.4S, v13.4S
+    __ smaxp(v30, __ T8B, v31, v0);                    //       smaxp   v30.8B, v31.8B, v0.8B
+    __ smaxp(v5, __ T16B, v6, v7);                     //       smaxp   v5.16B, v6.16B, v7.16B
+    __ smaxp(v8, __ T4H, v9, v10);                     //       smaxp   v8.4H, v9.4H, v10.4H
+    __ smaxp(v15, __ T8H, v16, v17);                   //       smaxp   v15.8H, v16.8H, v17.8H
+    __ smaxp(v29, __ T2S, v30, v31);                   //       smaxp   v29.2S, v30.2S, v31.2S
+    __ smaxp(v30, __ T4S, v31, v0);                    //       smaxp   v30.4S, v31.4S, v0.4S
+    __ fmax(v0, __ T2S, v1, v2);                       //       fmax    v0.2S, v1.2S, v2.2S
+    __ fmax(v20, __ T4S, v21, v22);                    //       fmax    v20.4S, v21.4S, v22.4S
+    __ fmax(v7, __ T2D, v8, v9);                       //       fmax    v7.2D, v8.2D, v9.2D
+    __ minv(v20, __ T8B, v21, v22);                    //       smin    v20.8B, v21.8B, v22.8B
+    __ minv(v23, __ T16B, v24, v25);                   //       smin    v23.16B, v24.16B, v25.16B
+    __ minv(v28, __ T4H, v29, v30);                    //       smin    v28.4H, v29.4H, v30.4H
+    __ minv(v21, __ T8H, v22, v23);                    //       smin    v21.8H, v22.8H, v23.8H
+    __ minv(v27, __ T2S, v28, v29);                    //       smin    v27.2S, v28.2S, v29.2S
+    __ minv(v25, __ T4S, v26, v27);                    //       smin    v25.4S, v26.4S, v27.4S
+    __ uminv(v5, __ T8B, v6, v7);                      //       umin    v5.8B, v6.8B, v7.8B
+    __ uminv(v1, __ T16B, v2, v3);                     //       umin    v1.16B, v2.16B, v3.16B
+    __ uminv(v23, __ T4H, v24, v25);                   //       umin    v23.4H, v24.4H, v25.4H
+    __ uminv(v16, __ T8H, v17, v18);                   //       umin    v16.8H, v17.8H, v18.8H
+    __ uminv(v31, __ T2S, v0, v1);                     //       umin    v31.2S, v0.2S, v1.2S
+    __ uminv(v5, __ T4S, v6, v7);                      //       umin    v5.4S, v6.4S, v7.4S
+    __ sminp(v12, __ T8B, v13, v14);                   //       sminp   v12.8B, v13.8B, v14.8B
+    __ sminp(v9, __ T16B, v10, v11);                   //       sminp   v9.16B, v10.16B, v11.16B
+    __ sminp(v28, __ T4H, v29, v30);                   //       sminp   v28.4H, v29.4H, v30.4H
+    __ sminp(v15, __ T8H, v16, v17);                   //       sminp   v15.8H, v16.8H, v17.8H
+    __ sminp(v29, __ T2S, v30, v31);                   //       sminp   v29.2S, v30.2S, v31.2S
+    __ sminp(v22, __ T4S, v23, v24);                   //       sminp   v22.4S, v23.4S, v24.4S
+    __ sqdmulh(v31, __ T4H, v0, v1);                   //       sqdmulh v31.4H, v0.4H, v1.4H
+    __ sqdmulh(v19, __ T8H, v20, v21);                 //       sqdmulh v19.8H, v20.8H, v21.8H
+    __ sqdmulh(v31, __ T2S, v0, v1);                   //       sqdmulh v31.2S, v0.2S, v1.2S
+    __ sqdmulh(v5, __ T4S, v6, v7);                    //       sqdmulh v5.4S, v6.4S, v7.4S
+    __ shsubv(v14, __ T8B, v15, v16);                  //       shsub   v14.8B, v15.8B, v16.8B
+    __ shsubv(v18, __ T16B, v19, v20);                 //       shsub   v18.16B, v19.16B, v20.16B
+    __ shsubv(v31, __ T4H, v0, v1);                    //       shsub   v31.4H, v0.4H, v1.4H
+    __ shsubv(v18, __ T8H, v19, v20);                  //       shsub   v18.8H, v19.8H, v20.8H
+    __ shsubv(v27, __ T2S, v28, v29);                  //       shsub   v27.2S, v28.2S, v29.2S
+    __ shsubv(v20, __ T4S, v21, v22);                  //       shsub   v20.4S, v21.4S, v22.4S
+    __ fmin(v16, __ T2S, v17, v18);                    //       fmin    v16.2S, v17.2S, v18.2S
+    __ fmin(v12, __ T4S, v13, v14);                    //       fmin    v12.4S, v13.4S, v14.4S
+    __ fmin(v11, __ T2D, v12, v13);                    //       fmin    v11.2D, v12.2D, v13.2D
+    __ facgt(v9, __ T2S, v10, v11);                    //       facgt   v9.2S, v10.2S, v11.2S
+    __ facgt(v6, __ T4S, v7, v8);                      //       facgt   v6.4S, v7.4S, v8.4S
+    __ facgt(v30, __ T2D, v31, v0);                    //       facgt   v30.2D, v31.2D, v0.2D
 
 // VectorScalarNEONInstruction
-    __ 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]
+    __ fmlavs(v13, __ T2S, v14, v15, 1);               //       fmla    v13.2S, v14.2S, v15.S[1]
     __ 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]
+    __ fmlavs(v5, __ T2D, v6, v7, 0);                  //       fmla    v5.2D, v6.2D, v7.D[0]
+    __ fmlsvs(v5, __ T2S, v6, v7, 1);                  //       fmls    v5.2S, v6.2S, v7.S[1]
+    __ mulvs(v12, __ T4S, v13, v14, 0);                //       mul     v12.4S, v13.4S, v14.S[0]
+    __ fmlsvs(v8, __ T2D, v9, v10, 1);                 //       fmls    v8.2D, v9.2D, v10.D[1]
+    __ fmulxvs(v1, __ T2S, v2, v3, 1);                 //       fmulx   v1.2S, v2.2S, v3.S[1]
+    __ mulvs(v7, __ T4S, v8, v9, 3);                   //       mul     v7.4S, v8.4S, v9.S[3]
+    __ fmulxvs(v9, __ T2D, v10, v11, 1);               //       fmulx   v9.2D, v10.2D, v11.D[1]
+    __ mulvs(v11, __ T4H, v12, v13, 2);                //       mul     v11.4H, v12.4H, v13.H[2]
+    __ mulvs(v7, __ T8H, v8, v9, 0);                   //       mul     v7.8H, v8.8H, v9.H[0]
+    __ mulvs(v6, __ T2S, v7, v8, 0);                   //       mul     v6.2S, v7.2S, v8.S[0]
+    __ mulvs(v5, __ T4S, v6, v7, 2);                   //       mul     v5.4S, v6.4S, v7.S[2]
 
 // NEONVectorCompare
-    __ 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, 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, 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, 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
+    __ cm(Assembler::GT, v13, __ T8B, v14, v15);       //       cmgt    v13.8B, v14.8B, v15.8B
+    __ cm(Assembler::GT, v23, __ T16B, v24, v25);      //       cmgt    v23.16B, v24.16B, v25.16B
+    __ cm(Assembler::GT, v1, __ T4H, v2, v3);          //       cmgt    v1.4H, v2.4H, v3.4H
+    __ cm(Assembler::GT, v30, __ T8H, v31, v0);        //       cmgt    v30.8H, v31.8H, v0.8H
+    __ cm(Assembler::GT, v19, __ T2S, v20, v21);       //       cmgt    v19.2S, v20.2S, v21.2S
+    __ cm(Assembler::GT, v5, __ T4S, v6, v7);          //       cmgt    v5.4S, v6.4S, v7.4S
+    __ cm(Assembler::GT, v17, __ T2D, v18, v19);       //       cmgt    v17.2D, v18.2D, v19.2D
+    __ cm(Assembler::GE, v2, __ T8B, v3, v4);          //       cmge    v2.8B, v3.8B, v4.8B
+    __ cm(Assembler::GE, v16, __ T16B, v17, v18);      //       cmge    v16.16B, v17.16B, v18.16B
+    __ cm(Assembler::GE, v22, __ T4H, v23, v24);       //       cmge    v22.4H, v23.4H, v24.4H
+    __ cm(Assembler::GE, v13, __ T8H, v14, v15);       //       cmge    v13.8H, v14.8H, v15.8H
+    __ cm(Assembler::GE, v10, __ T2S, v11, v12);       //       cmge    v10.2S, v11.2S, v12.2S
+    __ cm(Assembler::GE, v21, __ T4S, v22, v23);       //       cmge    v21.4S, v22.4S, v23.4S
+    __ cm(Assembler::GE, v29, __ T2D, v30, v31);       //       cmge    v29.2D, v30.2D, v31.2D
+    __ cm(Assembler::EQ, v27, __ T8B, v28, v29);       //       cmeq    v27.8B, v28.8B, v29.8B
+    __ cm(Assembler::EQ, v12, __ T16B, v13, v14);      //       cmeq    v12.16B, v13.16B, v14.16B
+    __ cm(Assembler::EQ, v27, __ T4H, v28, v29);       //       cmeq    v27.4H, v28.4H, v29.4H
+    __ cm(Assembler::EQ, v3, __ T8H, v4, v5);          //       cmeq    v3.8H, v4.8H, v5.8H
+    __ cm(Assembler::EQ, v1, __ T2S, v2, v3);          //       cmeq    v1.2S, v2.2S, v3.2S
+    __ cm(Assembler::EQ, v31, __ T4S, v0, v1);         //       cmeq    v31.4S, v0.4S, v1.4S
+    __ cm(Assembler::EQ, v24, __ T2D, v25, v26);       //       cmeq    v24.2D, v25.2D, v26.2D
+    __ cm(Assembler::HI, v19, __ T8B, v20, v21);       //       cmhi    v19.8B, v20.8B, v21.8B
+    __ cm(Assembler::HI, v17, __ T16B, v18, v19);      //       cmhi    v17.16B, v18.16B, v19.16B
+    __ cm(Assembler::HI, v9, __ T4H, v10, v11);        //       cmhi    v9.4H, v10.4H, v11.4H
+    __ cm(Assembler::HI, v28, __ T8H, v29, v30);       //       cmhi    v28.8H, v29.8H, v30.8H
+    __ cm(Assembler::HI, v27, __ T2S, v28, v29);       //       cmhi    v27.2S, v28.2S, v29.2S
+    __ cm(Assembler::HI, v15, __ T4S, v16, v17);       //       cmhi    v15.4S, v16.4S, v17.4S
+    __ cm(Assembler::HI, v7, __ T2D, v8, v9);          //       cmhi    v7.2D, v8.2D, v9.2D
+    __ cm(Assembler::HS, v21, __ T8B, v22, v23);       //       cmhs    v21.8B, v22.8B, v23.8B
+    __ cm(Assembler::HS, v23, __ T16B, v24, v25);      //       cmhs    v23.16B, v24.16B, v25.16B
+    __ cm(Assembler::HS, v31, __ T4H, v0, v1);         //       cmhs    v31.4H, v0.4H, v1.4H
+    __ cm(Assembler::HS, v25, __ T8H, v26, v27);       //       cmhs    v25.8H, v26.8H, v27.8H
+    __ cm(Assembler::HS, v2, __ T2S, v3, v4);          //       cmhs    v2.2S, v3.2S, v4.2S
+    __ cm(Assembler::HS, v31, __ T4S, v0, v1);         //       cmhs    v31.4S, v0.4S, v1.4S
+    __ cm(Assembler::HS, v27, __ T2D, v28, v29);       //       cmhs    v27.2D, v28.2D, v29.2D
+    __ fcm(Assembler::EQ, v18, __ T2S, v19, v20);      //       fcmeq   v18.2S, v19.2S, v20.2S
+    __ fcm(Assembler::EQ, v10, __ T4S, v11, v12);      //       fcmeq   v10.4S, v11.4S, v12.4S
+    __ fcm(Assembler::EQ, v23, __ T2D, v24, v25);      //       fcmeq   v23.2D, v24.2D, v25.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, v6, __ T2D, v7, v8);         //       fcmge   v6.2D, v7.2D, v8.2D
+    __ fcm(Assembler::GT, v3, __ T4S, v4, v5);         //       fcmgt   v3.4S, v4.4S, v5.4S
+    __ fcm(Assembler::GT, v18, __ T2D, v19, v20);      //       fcmgt   v18.2D, v19.2D, v20.2D
+    __ fcm(Assembler::GE, v0, __ T2S, v1, v2);         //       fcmge   v0.2S, v1.2S, v2.2S
+    __ fcm(Assembler::GE, v25, __ T4S, v26, v27);      //       fcmge   v25.4S, v26.4S, v27.4S
+    __ fcm(Assembler::GE, v26, __ T2D, v27, v28);      //       fcmge   v26.2D, v27.2D, v28.2D
 
 // SVEComparisonWithZero
-    __ 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
+    __ sve_fcm(Assembler::EQ, p11, __ D, p3, z2, 0.0); //       fcmeq   p11.d, p3/z, z2.d, #0.0
+    __ sve_fcm(Assembler::GT, p2, __ D, p7, z28, 0.0); //       fcmgt   p2.d, p7/z, z28.d, #0.0
+    __ sve_fcm(Assembler::GE, p8, __ S, p2, z27, 0.0); //       fcmge   p8.s, p2/z, z27.s, #0.0
+    __ sve_fcm(Assembler::LT, p14, __ S, p1, z18, 0.0); //      fcmlt   p14.s, p1/z, z18.s, #0.0
+    __ sve_fcm(Assembler::LE, p3, __ S, p5, z15, 0.0); //       fcmle   p3.s, p5/z, z15.s, #0.0
+    __ sve_fcm(Assembler::NE, p4, __ D, p5, z2, 0.0);  //       fcmne   p4.d, p5/z, z2.d, #0.0
 
 // SVEComparisonWithImm
-    __ 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
+    __ sve_cmp(Assembler::EQ, p15, __ D, p0, z5, 1);   //       cmpeq   p15.d, p0/z, z5.d, #1
+    __ sve_cmp(Assembler::GT, p7, __ D, p2, z4, 12);   //       cmpgt   p7.d, p2/z, z4.d, #12
+    __ sve_cmp(Assembler::GE, p11, __ D, p6, z27, 7);  //       cmpge   p11.d, p6/z, z27.d, #7
+    __ sve_cmp(Assembler::LT, p0, __ B, p4, z4, -16);  //       cmplt   p0.b, p4/z, z4.b, #-16
+    __ sve_cmp(Assembler::LE, p2, __ B, p2, z15, -9);  //       cmple   p2.b, p2/z, z15.b, #-9
+    __ sve_cmp(Assembler::NE, p2, __ D, p1, z10, 4);   //       cmpne   p2.d, p1/z, z10.d, #4
+    __ sve_cmp(Assembler::HS, p11, __ B, p2, z21, 34); //       cmphs   p11.b, p2/z, z21.b, #34
+    __ sve_cmp(Assembler::HI, p8, __ B, p4, z31, 8);   //       cmphi   p8.b, p4/z, z31.b, #8
+    __ sve_cmp(Assembler::LS, p6, __ D, p0, z30, 109); //       cmpls   p6.d, p0/z, z30.d, #109
+    __ sve_cmp(Assembler::LO, p11, __ H, p3, z29, 114); //      cmplo   p11.h, p3/z, z29.h, #114
 
 // SpecialCases
     __ ccmn(zr, zr, 3u, Assembler::LE);                //       ccmn    xzr, xzr, #3, LE
@@ -1136,239 +1152,239 @@
     __ fmovd(v0, -1.0625);                             //       fmov d0, #-1.0625
 
 // LSEOp
-    __ 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]
+    __ swp(Assembler::xword, r17, r24, r5);            //       swp     x17, x24, [x5]
+    __ ldadd(Assembler::xword, r2, r14, r10);          //       ldadd   x2, x14, [x10]
+    __ ldbic(Assembler::xword, r16, r11, r27);         //       ldclr   x16, x11, [x27]
+    __ ldeor(Assembler::xword, r23, r12, r4);          //       ldeor   x23, x12, [x4]
+    __ ldorr(Assembler::xword, r22, r17, r4);          //       ldset   x22, x17, [x4]
+    __ ldsmin(Assembler::xword, r1, r19, r16);         //       ldsmin  x1, x19, [x16]
+    __ ldsmax(Assembler::xword, r16, r13, r14);        //       ldsmax  x16, x13, [x14]
+    __ ldumin(Assembler::xword, r12, r2, r17);         //       ldumin  x12, x2, [x17]
+    __ ldumax(Assembler::xword, r3, r21, r23);         //       ldumax  x3, x21, [x23]
 
 // LSEOp
-    __ 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]
+    __ swpa(Assembler::xword, r5, r6, r7);             //       swpa    x5, x6, [x7]
+    __ ldadda(Assembler::xword, r19, r13, r28);        //       ldadda  x19, x13, [x28]
+    __ ldbica(Assembler::xword, r17, r16, r6);         //       ldclra  x17, x16, [x6]
+    __ ldeora(Assembler::xword, r2, r29, r3);          //       ldeora  x2, x29, [x3]
+    __ ldorra(Assembler::xword, r4, r6, r15);          //       ldseta  x4, x6, [x15]
+    __ ldsmina(Assembler::xword, r20, r13, r12);       //       ldsmina x20, x13, [x12]
+    __ ldsmaxa(Assembler::xword, r20, r8, r25);        //       ldsmaxa x20, x8, [x25]
+    __ ldumina(Assembler::xword, r20, r19, r0);        //       ldumina x20, x19, [x0]
+    __ ldumaxa(Assembler::xword, r11, r24, r6);        //       ldumaxa x11, x24, [x6]
 
 // LSEOp
-    __ 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]
+    __ swpal(Assembler::xword, r20, zr, r14);          //       swpal   x20, xzr, [x14]
+    __ ldaddal(Assembler::xword, r16, r6, r0);         //       ldaddal x16, x6, [x0]
+    __ ldbical(Assembler::xword, r7, r15, r19);        //       ldclral x7, x15, [x19]
+    __ ldeoral(Assembler::xword, r26, r9, r10);        //       ldeoral x26, x9, [x10]
+    __ ldorral(Assembler::xword, r23, r21, r22);       //       ldsetal x23, x21, [x22]
+    __ ldsminal(Assembler::xword, r28, r2, r3);        //       ldsminal        x28, x2, [x3]
+    __ ldsmaxal(Assembler::xword, r15, r19, r20);      //       ldsmaxal        x15, x19, [x20]
+    __ lduminal(Assembler::xword, r7, r4, r29);        //       lduminal        x7, x4, [x29]
+    __ ldumaxal(Assembler::xword, r7, r0, r9);         //       ldumaxal        x7, x0, [x9]
 
 // LSEOp
-    __ 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]
+    __ swpl(Assembler::xword, r16, r20, r23);          //       swpl    x16, x20, [x23]
+    __ ldaddl(Assembler::xword, r4, r16, r10);         //       ldaddl  x4, x16, [x10]
+    __ ldbicl(Assembler::xword, r23, r11, r25);        //       ldclrl  x23, x11, [x25]
+    __ ldeorl(Assembler::xword, r6, zr, r16);          //       ldeorl  x6, xzr, [x16]
+    __ ldorrl(Assembler::xword, r13, r23, r12);        //       ldsetl  x13, x23, [x12]
+    __ ldsminl(Assembler::xword, r1, r14, r9);         //       ldsminl x1, x14, [x9]
+    __ ldsmaxl(Assembler::xword, r21, r16, r26);       //       ldsmaxl x21, x16, [x26]
+    __ lduminl(Assembler::xword, r15, r4, r4);         //       lduminl x15, x4, [x4]
+    __ ldumaxl(Assembler::xword, r16, r8, r6);         //       ldumaxl x16, x8, [x6]
 
 // LSEOp
-    __ 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]
+    __ swp(Assembler::word, r30, r4, r29);             //       swp     w30, w4, [x29]
+    __ ldadd(Assembler::word, r17, r29, r26);          //       ldadd   w17, w29, [x26]
+    __ ldbic(Assembler::word, r9, r15, r2);            //       ldclr   w9, w15, [x2]
+    __ ldeor(Assembler::word, r11, r29, r3);           //       ldeor   w11, w29, [x3]
+    __ ldorr(Assembler::word, r7, r1, r27);            //       ldset   w7, w1, [x27]
+    __ ldsmin(Assembler::word, r21, r16, r14);         //       ldsmin  w21, w16, [x14]
+    __ ldsmax(Assembler::word, r8, r16, r22);          //       ldsmax  w8, w16, [x22]
+    __ ldumin(Assembler::word, r25, r5, r20);          //       ldumin  w25, w5, [x20]
+    __ ldumax(Assembler::word, r21, r16, r23);         //       ldumax  w21, w16, [x23]
 
 // LSEOp
-    __ 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]
+    __ swpa(Assembler::word, r16, r30, r20);           //       swpa    w16, w30, [x20]
+    __ ldadda(Assembler::word, r20, r0, r4);           //       ldadda  w20, w0, [x4]
+    __ ldbica(Assembler::word, r19, r24, r4);          //       ldclra  w19, w24, [x4]
+    __ ldeora(Assembler::word, r20, r4, r24);          //       ldeora  w20, w4, [x24]
+    __ ldorra(Assembler::word, r26, r19, r2);          //       ldseta  w26, w19, [x2]
+    __ ldsmina(Assembler::word, r8, r8, r14);          //       ldsmina w8, w8, [x14]
+    __ ldsmaxa(Assembler::word, r24, r16, sp);         //       ldsmaxa w24, w16, [sp]
+    __ ldumina(Assembler::word, r22, r4, sp);          //       ldumina w22, w4, [sp]
+    __ ldumaxa(Assembler::word, r1, r10, r20);         //       ldumaxa w1, w10, [x20]
 
 // LSEOp
-    __ 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]
+    __ swpal(Assembler::word, r12, r0, r9);            //       swpal   w12, w0, [x9]
+    __ ldaddal(Assembler::word, r7, r24, r15);         //       ldaddal w7, w24, [x15]
+    __ ldbical(Assembler::word, r4, r27, r6);          //       ldclral w4, w27, [x6]
+    __ ldeoral(Assembler::word, r10, r27, r24);        //       ldeoral w10, w27, [x24]
+    __ ldorral(Assembler::word, r13, r16, sp);         //       ldsetal w13, w16, [sp]
+    __ ldsminal(Assembler::word, r22, r22, r20);       //       ldsminal        w22, w22, [x20]
+    __ ldsmaxal(Assembler::word, zr, r29, r9);         //       ldsmaxal        wzr, w29, [x9]
+    __ lduminal(Assembler::word, r14, r20, r7);        //       lduminal        w14, w20, [x7]
+    __ ldumaxal(Assembler::word, r20, r28, r9);        //       ldumaxal        w20, w28, [x9]
 
 // LSEOp
-    __ 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]
+    __ swpl(Assembler::word, r11, r14, r12);           //       swpl    w11, w14, [x12]
+    __ ldaddl(Assembler::word, r20, r1, r24);          //       ldaddl  w20, w1, [x24]
+    __ ldbicl(Assembler::word, r9, r19, r13);          //       ldclrl  w9, w19, [x13]
+    __ ldeorl(Assembler::word, r19, r16, r16);         //       ldeorl  w19, w16, [x16]
+    __ ldorrl(Assembler::word, r5, r0, r3);            //       ldsetl  w5, w0, [x3]
+    __ ldsminl(Assembler::word, r12, r8, r15);         //       ldsminl w12, w8, [x15]
+    __ ldsmaxl(Assembler::word, r15, r16, r4);         //       ldsmaxl w15, w16, [x4]
+    __ lduminl(Assembler::word, r15, r30, r5);         //       lduminl w15, w30, [x5]
+    __ ldumaxl(Assembler::word, r0, r10, r22);         //       ldumaxl w0, w10, [x22]
 
 // SHA3SIMDOp
-    __ 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
+    __ bcax(v27, __ T16B, v3, v0, v9);                 //       bcax            v27.16B, v3.16B, v0.16B, v9.16B
+    __ eor3(v19, __ T16B, v29, v10, v24);              //       eor3            v19.16B, v29.16B, v10.16B, v24.16B
+    __ rax1(v4, __ T2D, v20, v7);                      //       rax1            v4.2D, v20.2D, v7.2D
+    __ xar(v24, __ T2D, v29, v14, 43);                 //       xar             v24.2D, v29.2D, v14.2D, #43
 
 // SHA512SIMDOp
-    __ 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
+    __ sha512h(v11, __ T2D, v27, v13);                 //       sha512h         q11, q27, v13.2D
+    __ sha512h2(v18, __ T2D, v31, v17);                //       sha512h2                q18, q31, v17.2D
+    __ sha512su0(v14, __ T2D, v3);                     //       sha512su0               v14.2D, v3.2D
+    __ sha512su1(v30, __ T2D, v16, v22);               //       sha512su1               v30.2D, v16.2D, v22.2D
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z20, __ B, 163u);                       //       add     z20.b, z20.b, #0xa3
+    __ sve_sub(z3, __ B, 215u);                        //       sub     z3.b, z3.b, #0xd7
+    __ sve_and(z19, __ H, 33279u);                     //       and     z19.h, z19.h, #0x81ff
+    __ sve_eor(z21, __ B, 12u);                        //       eor     z21.b, z21.b, #0xc
+    __ sve_orr(z24, __ H, 8064u);                      //       orr     z24.h, z24.h, #0x1f80
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z21, __ H, 139u);                       //       add     z21.h, z21.h, #0x8b
+    __ sve_sub(z30, __ H, 26u);                        //       sub     z30.h, z30.h, #0x1a
+    __ sve_and(z3, __ S, 122880u);                     //       and     z3.s, z3.s, #0x1e000
+    __ sve_eor(z24, __ D, 18158513714670600195u);      //       eor     z24.d, z24.d, #0xfc000003fc000003
+    __ sve_orr(z23, __ B, 191u);                       //       orr     z23.b, z23.b, #0xbf
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z14, __ B, 66u);                        //       add     z14.b, z14.b, #0x42
+    __ sve_sub(z26, __ B, 180u);                       //       sub     z26.b, z26.b, #0xb4
+    __ sve_and(z18, __ S, 253952u);                    //       and     z18.s, z18.s, #0x3e000
+    __ sve_eor(z9, __ S, 16744448u);                   //       eor     z9.s, z9.s, #0xff8000
+    __ sve_orr(z12, __ H, 33279u);                     //       orr     z12.h, z12.h, #0x81ff
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z11, __ H, 206u);                       //       add     z11.h, z11.h, #0xce
+    __ sve_sub(z18, __ D, 154u);                       //       sub     z18.d, z18.d, #0x9a
+    __ sve_and(z9, __ S, 4294459391u);                 //       and     z9.s, z9.s, #0xfff83fff
+    __ sve_eor(z23, __ D, 562675075514368u);           //       eor     z23.d, z23.d, #0x1ffc000000000
+    __ sve_orr(z8, __ B, 243u);                        //       orr     z8.b, z8.b, #0xf3
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z10, __ B, 121u);                       //       add     z10.b, z10.b, #0x79
+    __ sve_sub(z25, __ S, 172u);                       //       sub     z25.s, z25.s, #0xac
+    __ sve_and(z0, __ B, 239u);                        //       and     z0.b, z0.b, #0xef
+    __ sve_eor(z5, __ D, 17870287719452639231u);       //       eor     z5.d, z5.d, #0xf80003ffffffffff
+    __ sve_orr(z17, __ B, 128u);                       //       orr     z17.b, z17.b, #0x80
 
 // SVEBinaryImmOp
-    __ 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
+    __ sve_add(z30, __ H, 3u);                         //       add     z30.h, z30.h, #0x3
+    __ sve_sub(z18, __ B, 253u);                       //       sub     z18.b, z18.b, #0xfd
+    __ sve_and(z21, __ S, 4294965263u);                //       and     z21.s, z21.s, #0xfffff80f
+    __ sve_eor(z12, __ H, 1u);                         //       eor     z12.h, z12.h, #0x1
+    __ sve_orr(z15, __ S, 1u);                         //       orr     z15.s, z15.s, #0x1
 
 // SVEVectorOp
-    __ 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
+    __ sve_add(z19, __ D, z26, z27);                   //       add     z19.d, z26.d, z27.d
+    __ sve_sub(z13, __ B, z22, z22);                   //       sub     z13.b, z22.b, z22.b
+    __ sve_fadd(z1, __ S, z11, z20);                   //       fadd    z1.s, z11.s, z20.s
+    __ sve_fmul(z20, __ S, z24, z24);                  //       fmul    z20.s, z24.s, z24.s
+    __ sve_fsub(z31, __ D, z17, z20);                  //       fsub    z31.d, z17.d, z20.d
+    __ sve_sqadd(z21, __ H, z4, z21);                  //       sqadd   z21.h, z4.h, z21.h
+    __ sve_sqsub(z30, __ D, z22, z31);                 //       sqsub   z30.d, z22.d, z31.d
+    __ sve_uqadd(z26, __ H, z18, z19);                 //       uqadd   z26.h, z18.h, z19.h
+    __ sve_uqsub(z11, __ S, z13, z29);                 //       uqsub   z11.s, z13.s, z29.s
+    __ sve_abs(z5, __ H, p0, z14);                     //       abs     z5.h, p0/m, z14.h
+    __ sve_add(z2, __ H, p1, z10);                     //       add     z2.h, p1/m, z2.h, z10.h
+    __ sve_and(z19, __ H, p1, z26);                    //       and     z19.h, p1/m, z19.h, z26.h
+    __ sve_asr(z2, __ B, p0, z30);                     //       asr     z2.b, p0/m, z2.b, z30.b
+    __ sve_bic(z20, __ D, p1, z20);                    //       bic     z20.d, p1/m, z20.d, z20.d
+    __ sve_clz(z29, __ H, p3, z13);                    //       clz     z29.h, p3/m, z13.h
+    __ sve_cnt(z14, __ H, p7, z1);                     //       cnt     z14.h, p7/m, z1.h
+    __ sve_eor(z28, __ D, p0, z3);                     //       eor     z28.d, p0/m, z28.d, z3.d
+    __ sve_lsl(z9, __ B, p6, z9);                      //       lsl     z9.b, p6/m, z9.b, z9.b
+    __ sve_lsr(z26, __ B, p2, z14);                    //       lsr     z26.b, p2/m, z26.b, z14.b
+    __ sve_mul(z20, __ D, p6, z7);                     //       mul     z20.d, p6/m, z20.d, z7.d
+    __ sve_neg(z20, __ D, p4, z6);                     //       neg     z20.d, p4/m, z6.d
+    __ sve_not(z13, __ H, p0, z29);                    //       not     z13.h, p0/m, z29.h
+    __ sve_orr(z9, __ B, p0, z1);                      //       orr     z9.b, p0/m, z9.b, z1.b
+    __ sve_rbit(z27, __ B, p6, z15);                   //       rbit    z27.b, p6/m, z15.b
+    __ sve_revb(z4, __ D, p7, z17);                    //       revb    z4.d, p7/m, z17.d
+    __ sve_smax(z2, __ B, p0, z24);                    //       smax    z2.b, p0/m, z2.b, z24.b
+    __ sve_smin(z26, __ B, p7, z13);                   //       smin    z26.b, p7/m, z26.b, z13.b
+    __ sve_umax(z22, __ D, p3, z16);                   //       umax    z22.d, p3/m, z22.d, z16.d
+    __ sve_umin(z17, __ D, p1, z11);                   //       umin    z17.d, p1/m, z17.d, z11.d
+    __ sve_sub(z16, __ B, p0, z16);                    //       sub     z16.b, p0/m, z16.b, z16.b
+    __ sve_fabs(z28, __ D, p1, z23);                   //       fabs    z28.d, p1/m, z23.d
+    __ sve_fadd(z28, __ D, p4, z10);                   //       fadd    z28.d, p4/m, z28.d, z10.d
+    __ sve_fdiv(z17, __ D, p7, z7);                    //       fdiv    z17.d, p7/m, z17.d, z7.d
+    __ sve_fmax(z4, __ S, p3, z24);                    //       fmax    z4.s, p3/m, z4.s, z24.s
+    __ sve_fmin(z9, __ S, p2, z11);                    //       fmin    z9.s, p2/m, z9.s, z11.s
+    __ sve_fmul(z4, __ D, p5, z22);                    //       fmul    z4.d, p5/m, z4.d, z22.d
+    __ sve_fneg(z4, __ S, p0, z15);                    //       fneg    z4.s, p0/m, z15.s
+    __ sve_frintm(z4, __ D, p7, z26);                  //       frintm  z4.d, p7/m, z26.d
+    __ sve_frintn(z5, __ S, p5, z26);                  //       frintn  z5.s, p5/m, z26.s
+    __ sve_frintp(z31, __ S, p0, z25);                 //       frintp  z31.s, p0/m, z25.s
+    __ sve_fsqrt(z8, __ D, p1, z3);                    //       fsqrt   z8.d, p1/m, z3.d
+    __ sve_fsub(z7, __ D, p6, z24);                    //       fsub    z7.d, p6/m, z7.d, z24.d
+    __ sve_fmad(z24, __ S, p7, z17, z1);               //       fmad    z24.s, p7/m, z17.s, z1.s
+    __ sve_fmla(z12, __ D, p7, z13, z8);               //       fmla    z12.d, p7/m, z13.d, z8.d
+    __ sve_fmls(z29, __ D, p0, z31, z23);              //       fmls    z29.d, p0/m, z31.d, z23.d
+    __ sve_fmsb(z20, __ D, p0, z21, z7);               //       fmsb    z20.d, p0/m, z21.d, z7.d
+    __ sve_fnmad(z29, __ D, p6, z22, z8);              //       fnmad   z29.d, p6/m, z22.d, z8.d
+    __ sve_fnmsb(z26, __ D, p5, z5, z6);               //       fnmsb   z26.d, p5/m, z5.d, z6.d
+    __ sve_fnmla(z18, __ S, p3, z26, z21);             //       fnmla   z18.s, p3/m, z26.s, z21.s
+    __ sve_fnmls(z0, __ S, p4, z10, z28);              //       fnmls   z0.s, p4/m, z10.s, z28.s
+    __ sve_mla(z17, __ D, p1, z30, z20);               //       mla     z17.d, p1/m, z30.d, z20.d
+    __ sve_mls(z28, __ S, p3, z17, z14);               //       mls     z28.s, p3/m, z17.s, z14.s
+    __ sve_and(z10, z26, z11);                         //       and     z10.d, z26.d, z11.d
+    __ sve_eor(z0, z11, z15);                          //       eor     z0.d, z11.d, z15.d
+    __ sve_orr(z23, z23, z20);                         //       orr     z23.d, z23.d, z20.d
+    __ sve_bic(z23, z20, z29);                         //       bic     z23.d, z20.d, z29.d
+    __ sve_uzp1(z0, __ S, z27, z6);                    //       uzp1    z0.s, z27.s, z6.s
+    __ sve_uzp2(z13, __ H, z12, z4);                   //       uzp2    z13.h, z12.h, z4.h
+    __ sve_fabd(z31, __ D, p6, z23);                   //       fabd    z31.d, p6/m, z31.d, z23.d
+    __ sve_bext(z6, __ D, z2, z29);                    //       bext    z6.d, z2.d, z29.d
+    __ sve_bdep(z0, __ B, z29, z23);                   //       bdep    z0.b, z29.b, z23.b
+    __ sve_eor3(z4, z5, z8);                           //       eor3    z4.d, z4.d, z5.d, z8.d
+    __ sve_sqadd(z13, __ H, p4, z13);                  //       sqadd   z13.h, p4/m, z13.h, z13.h
+    __ sve_sqsub(z8, __ H, p2, z8);                    //       sqsub   z8.h, p2/m, z8.h, z8.h
+    __ sve_uqadd(z19, __ S, p0, z29);                  //       uqadd   z19.s, p0/m, z19.s, z29.s
+    __ sve_uqsub(z16, __ D, p3, z23);                  //       uqsub   z16.d, p3/m, z16.d, z23.d
 
 // SVEReductionOp
-    __ 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
+    __ sve_andv(v23, __ B, p7, z13);                   //       andv b23, p7, z13.b
+    __ sve_orv(v25, __ H, p5, z0);                     //       orv h25, p5, z0.h
+    __ sve_eorv(v25, __ H, p7, z11);                   //       eorv h25, p7, z11.h
+    __ sve_smaxv(v14, __ H, p5, z22);                  //       smaxv h14, p5, z22.h
+    __ sve_sminv(v5, __ H, p4, z0);                    //       sminv h5, p4, z0.h
+    __ sve_fminv(v9, __ D, p0, z3);                    //       fminv d9, p0, z3.d
+    __ sve_fmaxv(v14, __ S, p1, z29);                  //       fmaxv s14, p1, z29.s
+    __ sve_fadda(v14, __ D, p5, z4);                   //       fadda d14, p5, d14, z4.d
+    __ sve_uaddv(v27, __ S, p3, z22);                  //       uaddv d27, p3, z22.s
 
 // AddWideNEONOp
-    __ 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(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
+    __ saddwv(v31, v0, __ T8H, v1, __ T8B);            //       saddw   v31.8H, v0.8H, v1.8B
+    __ saddwv2(v24, v25, __ T8H, v26, __ T16B);        //       saddw2  v24.8H, v25.8H, v26.16B
+    __ saddwv(v11, v12, __ T4S, v13, __ T4H);          //       saddw   v11.4S, v12.4S, v13.4H
+    __ saddwv2(v16, v17, __ T4S, v18, __ T8H);         //       saddw2  v16.4S, v17.4S, v18.8H
+    __ saddwv(v12, v13, __ T2D, v14, __ T2S);          //       saddw   v12.2D, v13.2D, v14.2S
+    __ saddwv2(v17, v18, __ T2D, v19, __ T4S);         //       saddw2  v17.2D, v18.2D, v19.4S
+    __ uaddwv(v28, v29, __ T8H, v30, __ T8B);          //       uaddw   v28.8H, v29.8H, v30.8B
+    __ uaddwv2(v3, v4, __ T8H, v5, __ T16B);           //       uaddw2  v3.8H, v4.8H, v5.16B
+    __ uaddwv(v28, v29, __ T4S, v30, __ T4H);          //       uaddw   v28.4S, v29.4S, v30.4H
+    __ uaddwv2(v16, v17, __ T4S, v18, __ T8H);         //       uaddw2  v16.4S, v17.4S, v18.8H
+    __ uaddwv(v4, v5, __ T2D, v6, __ T2S);             //       uaddw   v4.2D, v5.2D, v6.2S
+    __ uaddwv2(v29, v30, __ T2D, v31, __ T4S);         //       uaddw2  v29.2D, v30.2D, v31.4S
 
     __ bind(forth);
 
@@ -1387,30 +1403,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    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,
+    0x14000000,     0x17ffffd7,     0x1400048d,     0x94000000,
+    0x97ffffd4,     0x9400048a,     0x3400000a,     0x34fffa2a,
+    0x340090ea,     0x35000008,     0x35fff9c8,     0x35009088,
+    0xb400000b,     0xb4fff96b,     0xb400902b,     0xb500001d,
+    0xb5fff91d,     0xb5008fdd,     0x10000013,     0x10fff8b3,
+    0x10008f73,     0x90000013,     0x36300016,     0x3637f836,
+    0x36308ef6,     0x3758000c,     0x375ff7cc,     0x37588e8c,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    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,
+    0x54008c60,     0x54000001,     0x54fff541,     0x54008c01,
+    0x54000002,     0x54fff4e2,     0x54008ba2,     0x54000002,
+    0x54fff482,     0x54008b42,     0x54000003,     0x54fff423,
+    0x54008ae3,     0x54000003,     0x54fff3c3,     0x54008a83,
+    0x54000004,     0x54fff364,     0x54008a24,     0x54000005,
+    0x54fff305,     0x540089c5,     0x54000006,     0x54fff2a6,
+    0x54008966,     0x54000007,     0x54fff247,     0x54008907,
+    0x54000008,     0x54fff1e8,     0x540088a8,     0x54000009,
+    0x54fff189,     0x54008849,     0x5400000a,     0x54fff12a,
+    0x540087ea,     0x5400000b,     0x54fff0cb,     0x5400878b,
+    0x5400000c,     0x54fff06c,     0x5400872c,     0x5400000d,
+    0x54fff00d,     0x540086cd,     0x5400000e,     0x54ffefae,
+    0x5400866e,     0x5400000f,     0x54ffef4f,     0x5400860f,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1472,98 +1488,102 @@
     0x9ad521f7,     0x9adb263c,     0x9ac0286a,     0x9ac92f27,
     0x9bdd7de6,     0x9b427d4f,     0x1b0b2cf1,     0x1b1ddcf7,
     0x9b0b2f6e,     0x9b0cbf04,     0x9b2b728e,     0x9b2cdd6d,
-    0x9bae275e,     0x9ba7954d,     0x7ea3d5fe,     0x1e30098c,
-    0x1e321bff,     0x1e302ab3,     0x1e35394f,     0x7efcd542,
-    0x1e7f0bc7,     0x1e621832,     0x1e632946,     0x1e673979,
-    0x1f000d81,     0x1f06dfb3,     0x1f3c6c06,     0x1f2774a2,
-    0x1f4d332c,     0x1f48ca78,     0x1f755356,     0x1f7e5853,
-    0x1e2042c8,     0x1e20c2b3,     0x1e21424c,     0x1e21c0d5,
-    0x1e22c070,     0x1e23c3a3,     0x1ee24383,     0x1e6041cf,
-    0x1e60c1aa,     0x1e61424c,     0x1e61c34a,     0x1e6240e7,
-    0x1e3803ae,     0x9e3802e0,     0x1e780180,     0x9e7801d7,
-    0x1e2200ed,     0x9e2200ef,     0x1e620289,     0x9e620393,
-    0x1e24021e,     0x9e640122,     0x1e3002b0,     0x9e70009d,
-    0x1e260361,     0x9e660318,     0x1e2702ae,     0x9e6700ad,
-    0x1e392180,     0x1e7e2320,     0x1e202388,     0x1e6022a8,
-    0x293a1796,     0x29426e73,     0x697c68fc,     0xa93d0486,
-    0xa97b5eba,     0x29b47934,     0x29c2534d,     0x69f62dbd,
-    0xa9bd54bb,     0xa9c503c6,     0x28a63e13,     0x28e25d2c,
-    0x68c469e0,     0xa8b34748,     0xa8f51c59,     0x28264433,
-    0x285036c0,     0xa8005f7d,     0xa872290b,     0x0c407160,
-    0x4cdfa350,     0x0cd16f56,     0x4cdf27bb,     0x0d40c0d6,
-    0x4ddfcbae,     0x0dd0cd96,     0x4c408c01,     0x0cdf86aa,
-    0x4d60c327,     0x0dffc929,     0x4deecd89,     0x4cd14887,
-    0x0c404a37,     0x4d40e6c4,     0x4ddfe84d,     0x0dcced50,
-    0x4cdf0444,     0x0ccb0286,     0x0d60e18c,     0x0dffe630,
-    0x0df0eb2e,     0x0e31bab4,     0x4e31b841,     0x0e71bb17,
-    0x4e71bbfe,     0x4eb1b9ee,     0x0e30a862,     0x4e30a8e6,
-    0x0e70a883,     0x4e70a928,     0x4eb0ab59,     0x6e30f820,
-    0x0e31ab9b,     0x2e31abfe,     0x4e31a8c5,     0x6e31a8c5,
-    0x0e71abfe,     0x2e71a98b,     0x4e71ab59,     0x6e71a820,
-    0x4eb1a81f,     0x6eb1a820,     0x6eb0fa93,     0x7e30fbdd,
-    0x7e70fb7a,     0x7eb0f949,     0x7ef0fb7a,     0x0ea0c9ac,
-    0x4ea0ca0f,     0x4ee0c98b,     0x2ea0c98b,     0x6ea0ca72,
-    0x6ee0cb59,     0x0ea0daf6,     0x4ea0db38,     0x4ee0d820,
-    0x0ea0ea51,     0x4ea0e98b,     0x4ee0e8e6,     0x2ea0dbdd,
-    0x6ea0d8e6,     0x6ee0d8c5,     0x0e20b8c5,     0x4e20bad5,
-    0x0e60ba93,     0x4e60ba30,     0x0ea0ba72,     0x4ea0bbfe,
-    0x4ee0bb9b,     0x0ea0fbbc,     0x4ea0f841,     0x4ee0fbbc,
-    0x2ea0f841,     0x6ea0fab4,     0x6ee0fbdd,     0x2ea1fa30,
-    0x6ea1f9cd,     0x6ee1f96a,     0x2e205bdd,     0x6e205bdd,
-    0x0e351e93,     0x4e381ef6,     0x0eac1d6a,     0x4ea61ca4,
-    0x2e211c1f,     0x6e371ed5,     0x0e2a8528,     0x4e21841f,
-    0x0e758693,     0x4e6c856a,     0x0ebe87bc,     0x4ea48462,
-    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,
+    0x9bae275e,     0x9ba7954d,     0x7ec315fe,     0x1ef0098c,
+    0x1ef21bff,     0x1ef02ab3,     0x1ef5394f,     0x1efc4942,
+    0x1eff5bc7,     0x1ee28832,     0x7ea3d546,     0x1e270979,
+    0x1e201981,     0x1e3d2a63,     0x1e263ae6,     0x1e3b4b80,
+    0x1e2758a2,     0x1e39899d,     0x7ef8d58d,     0x1e720913,
+    0x1e751b56,     0x1e622a74,     0x1e683ade,     0x1e754a76,
+    0x1e755a4c,     0x1e638a06,     0x1fc373a3,     0x1f0a35cf,
+    0x1f0aea4c,     0x1f2f74e7,     0x1f2032e0,     0x1f4d21d8,
+    0x1f49d0ef,     0x1f7f43b3,     0x1f705522,     0x1e20409e,
+    0x1e20c361,     0x1e214319,     0x1e21c2ae,     0x1e22c0cd,
+    0x1e23c32c,     0x1ee243d9,     0x1e6042bc,     0x1e60c2f0,
+    0x1e6143a5,     0x1e61c276,     0x1e62428d,     0x1ee1c393,
+    0x1e3800d1,     0x9e3800ed,     0x1e78035c,     0x9e7800d1,
+    0x1e220081,     0x9e22028e,     0x1e6202a7,     0x9e6202fb,
+    0x1e24028d,     0x9e64039e,     0x1e3002aa,     0x9e700225,
+    0x1e2601cb,     0x9e6602ad,     0x1e2701db,     0x9e6702e4,
+    0x1e3e2300,     0x1e6e2180,     0x1e202228,     0x1e602388,
+    0x29021b40,     0x297c78c0,     0x69660970,     0xa908018f,
+    0xa9427ae7,     0x29a03cfa,     0x29fc3d4b,     0x69c84033,
+    0xa988240e,     0xa9fa0d9b,     0x28a02d88,     0x28c8408a,
+    0x68f87a6a,     0xa8ba09f8,     0xa8c52a18,     0x280257be,
+    0x28727948,     0xa83868de,     0xa8440a98,     0x0c40733f,
+    0x4cdfa1e5,     0x0ccd6cea,     0x4cdf260d,     0x0d40c227,
+    0x4ddfcb30,     0x0dc7cc6b,     0x4c408ced,     0x0cdf8769,
+    0x4d60c346,     0x0dffca17,     0x4de8cda6,     0x4cda4834,
+    0x0c4049ef,     0x4d40e6dd,     0x4ddfe946,     0x0dcfeccf,
+    0x4cdf0546,     0x0cc7006b,     0x0d60e32c,     0x0dffe5eb,
+    0x0dfce8de,     0x0e31bb9b,     0x4e31bbbc,     0x0e71b841,
+    0x4e71bbbc,     0x4eb1b841,     0x0e30aab4,     0x4e30abdd,
+    0x0e70aa30,     0x4e70a9cd,     0x4eb0a96a,     0x6e30fbdd,
+    0x0e31abdd,     0x2e31aa93,     0x4e31aaf6,     0x6e31a96a,
+    0x0e71a8a4,     0x2e71a81f,     0x4e71aad5,     0x6e71a928,
+    0x4eb1a81f,     0x6eb1aa93,     0x6eb0f96a,     0x7e30fbbc,
+    0x7e70f862,     0x7eb0fb59,     0x7ef0f8c5,     0x0ea0c883,
+    0x4ea0c928,     0x4ee0caf6,     0x2ea0ca93,     0x6ea0c9cd,
+    0x6ee0c8c5,     0x0ea0dbdd,     0x4ea0db38,     0x4ee0dad5,
+    0x0ea0eb7a,     0x4ea0eb38,     0x4ee0e883,     0x2ea0db38,
+    0x6ea0db7a,     0x6ee0db17,     0x0e20ba0f,     0x4e20bad5,
+    0x0e60b883,     0x4e60bb38,     0x0ea0b928,     0x4ea0bb59,
+    0x4ee0bab4,     0x0ea0fa30,     0x4ea0fa51,     0x4ee0f862,
+    0x2ea0f841,     0x6ea0f820,     0x6ee0fb38,     0x2ea1f8a4,
+    0x6ea1f883,     0x6ee1f9ac,     0x2e20581f,     0x6e205bbc,
+    0x0e2c1d6a,     0x4e3c1f7a,     0x0ea41c62,     0x4eae1dac,
+    0x2e341e72,     0x6e211c1f,     0x0e238441,     0x4e2f85cd,
+    0x0e7f87dd,     0x4e628420,     0x0eb58693,     0x4eae85ac,
+    0x4ef38651,     0x0e380ef6,     0x4e2f0dcd,     0x0e7e0fbc,
+    0x4e600ffe,     0x0ea10c1f,     0x4ea30c41,     0x4efc0f7a,
+    0x2e3e0fbc,     0x6e260ca4,     0x2e600ffe,     0x6e660ca4,
+    0x2ea80ce6,     0x6ea00ffe,     0x6efc0f7a,     0x0e34d672,
+    0x4e2bd549,     0x4e6ad528,     0x2e2e85ac,     0x6e228420,
+    0x2e7686b4,     0x6e638441,     0x2eba8738,     0x6ea48462,
+    0x6ee28420,     0x0e2b2d49,     0x4e3a2f38,     0x0e7c2f7a,
+    0x4e722e30,     0x0ea02ffe,     0x4ea52c83,     0x4eec2d6a,
+    0x2e392f17,     0x6e2c2d6a,     0x2e662ca4,     0x6e742e72,
+    0x2ea42c62,     0x6ead2d8b,     0x6eea2d28,     0x0eacd56a,
+    0x4eb1d60f,     0x4ef3d651,     0x0e249c62,     0x4e2c9d6a,
+    0x0e6e9dac,     0x4e6e9dac,     0x0eb19e0f,     0x4eaf9dcd,
+    0x2ea4d462,     0x6ea9d507,     0x6ef6d6b4,     0x2e3cd77a,
+    0x6e32d630,     0x6e66d4a4,     0x2e24dc62,     0x6e26dca4,
+    0x6e6eddac,     0x0e749672,     0x4e7796d5,     0x0eb29630,
+    0x4eb49672,     0x0e2dcd8b,     0x4e37ced5,     0x4e79cf17,
+    0x2e6e95ac,     0x6e7c977a,     0x2eb99717,     0x6ebe97bc,
+    0x0eb0cdee,     0x4eadcd8b,     0x4efacf38,     0x2e23fc41,
+    0x6e2efdac,     0x6e61fc1f,     0x0e2c656a,     0x4e326630,
+    0x0e696507,     0x4e646462,     0x0ea56483,     0x4eaf65cd,
+    0x2e356693,     0x6e336651,     0x2e726630,     0x6e656483,
+    0x2ea36441,     0x6ead658b,     0x0e20a7fe,     0x4e27a4c5,
+    0x0e6aa528,     0x4e71a60f,     0x0ebfa7dd,     0x4ea0a7fe,
+    0x0e22f420,     0x4e36f6b4,     0x4e69f507,     0x0e366eb4,
+    0x4e396f17,     0x0e7e6fbc,     0x4e776ed5,     0x0ebd6f9b,
+    0x4ebb6f59,     0x2e276cc5,     0x6e236c41,     0x2e796f17,
+    0x6e726e30,     0x2ea16c1f,     0x6ea76cc5,     0x0e2eadac,
+    0x4e2bad49,     0x0e7eafbc,     0x4e71ae0f,     0x0ebfafdd,
+    0x4eb8aef6,     0x0e61b41f,     0x4e75b693,     0x0ea1b41f,
+    0x4ea7b4c5,     0x0e3025ee,     0x4e342672,     0x0e61241f,
+    0x4e742672,     0x0ebd279b,     0x4eb626b4,     0x0eb2f630,
+    0x4eaef5ac,     0x4eedf58b,     0x2eabed49,     0x6ea8ece6,
+    0x6ee0effe,     0x0faf11cd,     0x4fa1880f,     0x4fc710c5,
+    0x0fa750c5,     0x4f8e81ac,     0x4fca5928,     0x2fa39041,
+    0x4fa98907,     0x6fcb9949,     0x0f6d818b,     0x4f498107,
+    0x0f8880e6,     0x4f8788c5,     0x0e2f35cd,     0x4e393717,
+    0x0e633441,     0x4e6037fe,     0x0eb53693,     0x4ea734c5,
+    0x4ef33651,     0x0e243c62,     0x4e323e30,     0x0e783ef6,
+    0x4e6f3dcd,     0x0eac3d6a,     0x4eb73ed5,     0x4eff3fdd,
+    0x2e3d8f9b,     0x6e2e8dac,     0x2e7d8f9b,     0x6e658c83,
+    0x2ea38c41,     0x6ea18c1f,     0x6efa8f38,     0x2e353693,
+    0x6e333651,     0x2e6b3549,     0x6e7e37bc,     0x2ebd379b,
+    0x6eb1360f,     0x6ee93507,     0x2e373ed5,     0x6e393f17,
+    0x2e613c1f,     0x6e7b3f59,     0x2ea43c62,     0x6ea13c1f,
+    0x6efd3f9b,     0x0e34e672,     0x4e2ce56a,     0x4e79e717,
+    0x2eb5e693,     0x6ea5e483,     0x6ef4e672,     0x2e22e420,
+    0x6e3be759,     0x6e7ce77a,     0x65d22c4b,     0x65d03f92,
+    0x65902b68,     0x6591264e,     0x659135f3,     0x65d33444,
+    0x25c180af,     0x25cc0897,     0x25c71b6b,     0x25103080,
+    0x251729f2,     0x25c48552,     0x24288aab,     0x242213f8,
+    0x24fb63d6,     0x247cafab,     0xba5fd3e3,     0x3a5f03e5,
     0xfa411be4,     0x7a42cbe2,     0x93df03ff,     0xc820ffff,
     0x8822fc7f,     0xc8247cbf,     0x88267fff,     0x4e010fe0,
     0x5e040420,     0x4e081fe1,     0x4e0c1fe1,     0x4e0a1fe1,
@@ -1625,55 +1645,55 @@
     0x1e721000,     0x1e723000,     0x1e741000,     0x1e743000,
     0x1e761000,     0x1e763000,     0x1e781000,     0x1e783000,
     0x1e7a1000,     0x1e7a3000,     0x1e7c1000,     0x1e7c3000,
-    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,
+    0x1e7e1000,     0x1e7e3000,     0xf83180b8,     0xf822014e,
+    0xf830136b,     0xf837208c,     0xf8363091,     0xf8215213,
+    0xf83041cd,     0xf82c7222,     0xf82362f5,     0xf8a580e6,
+    0xf8b3038d,     0xf8b110d0,     0xf8a2207d,     0xf8a431e6,
+    0xf8b4518d,     0xf8b44328,     0xf8b47013,     0xf8ab60d8,
+    0xf8f481df,     0xf8f00006,     0xf8e7126f,     0xf8fa2149,
+    0xf8f732d5,     0xf8fc5062,     0xf8ef4293,     0xf8e773a4,
+    0xf8e76120,     0xf87082f4,     0xf8640150,     0xf877132b,
+    0xf866221f,     0xf86d3197,     0xf861512e,     0xf8754350,
+    0xf86f7084,     0xf87060c8,     0xb83e83a4,     0xb831035d,
+    0xb829104f,     0xb82b207d,     0xb8273361,     0xb83551d0,
+    0xb82842d0,     0xb8397285,     0xb83562f0,     0xb8b0829e,
+    0xb8b40080,     0xb8b31098,     0xb8b42304,     0xb8ba3053,
+    0xb8a851c8,     0xb8b843f0,     0xb8b673e4,     0xb8a1628a,
+    0xb8ec8120,     0xb8e701f8,     0xb8e410db,     0xb8ea231b,
+    0xb8ed33f0,     0xb8f65296,     0xb8ff413d,     0xb8ee70f4,
+    0xb8f4613c,     0xb86b818e,     0xb8740301,     0xb86911b3,
+    0xb8732210,     0xb8653060,     0xb86c51e8,     0xb86f4090,
+    0xb86f70be,     0xb86062ca,     0xce20247b,     0xce0a63b3,
+    0xce678e84,     0xce8eafb8,     0xce6d836b,     0xce7187f2,
+    0xcec0806e,     0xce768a1e,     0x2520d474,     0x2521dae3,
+    0x05800d33,     0x05403635,     0x05004cb8,     0x2560d175,
+    0x2561c35e,     0x05809863,     0x054030f8,     0x05000ed7,
+    0x2520c84e,     0x2521d69a,     0x05809892,     0x05408909,
+    0x05000d2c,     0x2560d9cb,     0x25e1d352,     0x05806b49,
+    0x0542d157,     0x050026a8,     0x2520cf2a,     0x25a1d599,
+    0x05801ec0,     0x05422dc5,     0x05000e11,     0x2560c07e,
+    0x2521dfb2,     0x0580ab15,     0x0540040c,     0x0500000f,
+    0x04fb0353,     0x043606cd,     0x65940161,     0x65980b14,
+    0x65d4063f,     0x04751095,     0x04ff1ade,     0x0473165a,
+    0x04bd1dab,     0x0456a1c5,     0x04400542,     0x045a0753,
+    0x041083c2,     0x04db0694,     0x0459adbd,     0x045abc2e,
+    0x04d9007c,     0x04139929,     0x041189da,     0x04d018f4,
+    0x04d7b0d4,     0x045ea3ad,     0x04180029,     0x052799fb,
+    0x05e49e24,     0x04080302,     0x040a1dba,     0x04c90e16,
+    0x04cb0571,     0x04010210,     0x04dca6fc,     0x65c0915c,
+    0x65cd9cf1,     0x65868f04,     0x65878969,     0x65c296c4,
+    0x049da1e4,     0x65c2bf44,     0x6580b745,     0x6581a33f,
+    0x65cda468,     0x65c19b07,     0x65a19e38,     0x65e81dac,
+    0x65f723fd,     0x65e7a2b4,     0x65e8dadd,     0x65e6f4ba,
+    0x65b54f52,     0x65bc7140,     0x04d447d1,     0x048e6e3c,
+    0x042b334a,     0x04af3160,     0x047432f7,     0x04fd3297,
+    0x05a66b60,     0x05646d8d,     0x65c89aff,     0x45ddb046,
+    0x4517b7a0,     0x04253904,     0x445891ad,     0x445a8908,
+    0x449983b3,     0x44db8ef0,     0x041a3db7,     0x04583419,
+    0x04593d79,     0x044836ce,     0x044a3005,     0x65c72069,
+    0x658627ae,     0x65d8348e,     0x04812edb,     0x0e21101f,
+    0x4e3a1338,     0x0e6d118b,     0x4e721230,     0x0eae11ac,
+    0x4eb31251,     0x2e3e13bc,     0x6e251083,     0x2e7e13bc,
+    0x6e721230,     0x2ea610a4,     0x6ebf13dd,
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
index d7b927778df..6796dc68e52 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
@@ -55,6 +55,9 @@ public static void main(String[] args) {
     @IR(counts = {IRNode.REINTERPRET_S2HF, ">=1", IRNode.REINTERPRET_HF2S, ">=1", IRNode.ADD_HF, ">=1" },
         failOn = {IRNode.ADD_F, IRNode.CONV_HF2F, IRNode.CONV_F2HF},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.REINTERPRET_S2HF, ">=1", IRNode.REINTERPRET_HF2S, ">=1", IRNode.ADD_HF, ">=1" },
+        failOn = {IRNode.ADD_F, IRNode.CONV_HF2F, IRNode.CONV_F2HF},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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 eab220dc196..82f43a9a097 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
@@ -56,6 +56,10 @@ public MulHFNodeIdealizationTests() {
     @IR(counts = {IRNode.ADD_HF, "1"},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"},
         failOn = {IRNode.MUL_HF})
+    @IR(counts = {IRNode.ADD_HF, "1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"},
+        failOn = {IRNode.MUL_HF})
+    // Test if x * 2 is optimized to x + x
     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 014c660dfb2..0acefad5d1d 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
@@ -43,6 +43,8 @@ public class TestFloat16ScalarOperations {
     private short[] dst;
     private short res;
 
+    private float[] fl;
+
     private static final Float16 ONE = valueOf(1.0f);
     private static final Float16 MONE = valueOf(-1.0f);
     private static final Float16 POSITIVE_ZERO = valueOf(0.0f);
@@ -76,8 +78,10 @@ public static void main(String args[]) {
     public TestFloat16ScalarOperations() {
         src = new short[count];
         dst = new short[count];
+        fl = new float[count];
         for (int i = 0; i < count; i++) {
             src[i] = Float.floatToFloat16(r.nextFloat() * MAX_VALUE.floatValue());
+            fl[i] = r.nextFloat();
         }
     }
 
@@ -99,14 +103,31 @@ static void assertResult(float actual, float expected, String msg, int iter) {
         }
     }
 
+    @Test
+    @IR(counts = {"convF2HFAndS2HF", " >0 "}, phase = {CompilePhase.FINAL_CODE},
+        applyIfCPUFeature = {"avx512_fp16", "true"})
+    @IR(counts = {"convF2HFAndS2HF", " >0 "}, phase = {CompilePhase.FINAL_CODE},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
+    public void testconvF2HFAndS2HF() {
+        for (int i = 0; i < count; i++) {
+            // Transform the pattern (S2HF ConvF2HF) in this IR -
+            // HF2S (AddHF (S2HF (ConvF2HF fl[i])), (S2HF (ConvF2HF fl[i])))
+            // to a single convert operation after matching and eliminate redundant moves
+            dst[i] = float16ToRawShortBits(add(valueOf(fl[i]), valueOf(fl[i])));
+        }
+    }
+
     @Test
     @IR(counts = {"convHF2SAndHF2F", " >0 "}, phase = {CompilePhase.FINAL_CODE},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {"convHF2SAndHF2F", " >0 "}, phase = {CompilePhase.FINAL_CODE},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testEliminateIntermediateHF2S() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
             // Intermediate HF2S + S2HF is eliminated in following transformation
             // AddHF S2HF(HF2S (AddHF S2HF(src[i]), S2HF(0))), S2HF(src[i]) => AddHF (AddHF S2HF(src[i]), S2HF(0)), S2HF(src[i])
+            // Also, the backend optimizes away the extra move while converting res to a float - ConvHF2F (S2HF (AddHF ..))
             res = add(add(res, shortBitsToFloat16(src[i])), shortBitsToFloat16(src[i]));
             dst[i] = (short)res.floatValue();
         }
@@ -115,6 +136,8 @@ public void testEliminateIntermediateHF2S() {
     @Test
     @IR(counts = {IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testAdd1() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -126,6 +149,8 @@ public void testAdd1() {
     @Test
     @IR(failOn = {IRNode.ADD_HF, IRNode.REINTERPRET_S2HF, IRNode.REINTERPRET_HF2S},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(failOn = {IRNode.ADD_HF, IRNode.REINTERPRET_S2HF, IRNode.REINTERPRET_HF2S},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testAdd2() {
         Float16 hf0 = shortBitsToFloat16((short)0);
         Float16 hf1 = shortBitsToFloat16((short)15360);
@@ -138,6 +163,8 @@ public void testAdd2() {
     @Test
     @IR(counts = {IRNode.SUB_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.SUB_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testSub() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -149,6 +176,8 @@ public void testSub() {
     @Test
     @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testMul() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -160,6 +189,8 @@ public void testMul() {
     @Test
     @IR(counts = {IRNode.DIV_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.DIV_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testDiv() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -171,6 +202,8 @@ public void testDiv() {
     @Test
     @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testDivByOne() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -182,6 +215,8 @@ public void testDivByOne() {
     @Test
     @IR(counts = {IRNode.MAX_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MAX_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testMax() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -193,6 +228,8 @@ public void testMax() {
     @Test
     @IR(counts = {IRNode.MIN_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MIN_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testMin() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -204,6 +241,8 @@ public void testMin() {
     @Test
     @IR(counts = {IRNode.SQRT_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.SQRT_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testSqrt() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -215,6 +254,8 @@ public void testSqrt() {
     @Test
     @IR(counts = {IRNode.FMA_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.FMA_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testFma() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -227,6 +268,8 @@ public void testFma() {
     @Test
     @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testDivByPOT() {
         Float16 res = valueOf(0.0f);
         for (int i = 0; i < 50; i++) {
@@ -244,6 +287,8 @@ public void testDivByPOT() {
     @Test
     @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testMulByTWO() {
         Float16 res = valueOf(0.0f);
         Float16 multiplier = valueOf(2.0f);
@@ -281,6 +326,8 @@ public void testMulByTWO() {
     @Test
     @IR(counts = {IRNode.ADD_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.ADD_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -324,6 +371,8 @@ public void testAddConstantFolding() {
     @Test
     @IR(counts = {IRNode.SUB_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.SUB_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -357,6 +406,8 @@ public void testSubConstantFolding() {
     @Warmup(value = 10000)
     @IR(counts = {IRNode.MAX_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MAX_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -375,6 +426,8 @@ public void testMaxConstantFolding() {
     @Test
     @IR(counts = {IRNode.MIN_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MIN_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -392,6 +445,8 @@ public void testMinConstantFolding() {
     @Test
     @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testDivConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(divide(Float16.NaN, POSITIVE_ZERO).floatValue(), Float.NaN, "testDivConstantFolding");
@@ -432,6 +487,8 @@ public void testDivConstantFolding() {
     @Test
     @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testMulConstantFolding() {
         // If any operand is NaN, the result is NaN.
         assertResult(multiply(Float16.NaN, valueOf(4.0f)).floatValue(), Float.NaN, "testMulConstantFolding");
@@ -455,6 +512,8 @@ public void testMulConstantFolding() {
     @Test
     @IR(counts = {IRNode.SQRT_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.SQRT_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -474,6 +533,8 @@ public void testSqrtConstantFolding() {
     @Test
     @IR(counts = {IRNode.FMA_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(counts = {IRNode.FMA_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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");
@@ -509,6 +570,8 @@ public void testFMAConstantFolding() {
     @Test
     @IR(failOn = {IRNode.ADD_HF, IRNode.SUB_HF, IRNode.MUL_HF, IRNode.DIV_HF, IRNode.SQRT_HF, IRNode.FMA_HF},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @IR(failOn = {IRNode.ADD_HF, IRNode.SUB_HF, IRNode.MUL_HF, IRNode.DIV_HF, IRNode.SQRT_HF, IRNode.FMA_HF},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void testRounding1() {
         dst[0] = float16ToRawShortBits(add(RANDOM1, RANDOM2));
         dst[1] = float16ToRawShortBits(subtract(RANDOM2, RANDOM3));
@@ -548,6 +611,9 @@ public void checkRounding1() {
     @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 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+    @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 "},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "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/floatingpoint/TestSubNodeFloatDoubleNegation.java b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
index 87aeb4489ba..4c7092ec654 100644
--- a/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
+++ b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
@@ -55,9 +55,8 @@ public static void assertResults() {
     @Test
     @IR(counts = { IRNode.SUB, "2" }, applyIfPlatform = {"x64", "true"}, applyIfCPUFeature = {"avx512_fp16", "false"})
     @IR(counts = { IRNode.SUB_HF, "2" }, applyIfPlatform = {"x64", "true"}, applyIfCPUFeature = {"avx512_fp16", "true"})
-    // TODO: uncomment once Float16 support lands in aarch64 with JDK-8345125
-    //@IR(counts = { IRNode.SUB, "2" }, applyIfPlatform = {"aarch64", "true"}, applyIfCPUFeatureAnd = {"fphp", "false", "asimdhp", "false"})
-    //@IR(counts = { IRNode.SUB_HF, "2" }, applyIfPlatform = {"aarch64", "true"}, applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
+    @IR(counts = { IRNode.SUB, "2" }, applyIfPlatform = {"aarch64", "true"}, applyIfCPUFeatureAnd = {"fphp", "false", "asimdhp", "false"})
+    @IR(counts = { IRNode.SUB_HF, "2" }, applyIfPlatform = {"aarch64", "true"}, applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     @IR(counts = { IRNode.SUB, "2" }, applyIfPlatform = {"riscv64", "true"}, applyIfCPUFeature = {"zfh", "false"})
     @IR(counts = { IRNode.SUB_HF, "2" }, applyIfPlatform = {"riscv64", "true"}, applyIfCPUFeature = {"zfh", "true"})
     @IR(counts = { IRNode.SUB, "2" }, applyIfPlatformAnd = {"x64", "false", "aarch64", "false", "riscv64", "false"})
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 7d229cae152..4ad95ab786f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -109,6 +109,8 @@ public class IREncodingPrinter {
         "asimd",
         "sve",
         "sve2",
+        "fphp",
+        "asimdhp",
         // RISCV64
         "rvv",
         "zbkb",
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
index 2cb04c3889b..f061161e93a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
@@ -45,6 +45,8 @@ 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(applyIfCPUFeatureAnd = {"asimd", "true", "fphp", "false", "asimdhp", "false"},
+        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 db6fa5923cd0394dfb44c7e46c3e7ccc102a933a Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 28 Apr 2025 08:43:14 +0000
Subject: [PATCH 158/901] 8355617: Remove historical debug_only macro in favor
 of DEBUG_ONLY

Reviewed-by: stefank, kbarrett, jwaters
---
 .../cpu/aarch64/c1_CodeStubs_aarch64.cpp      | 10 ++---
 src/hotspot/cpu/arm/arm.ad                    |  8 ++--
 src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp      |  4 +-
 .../arm/gc/shared/barrierSetNMethod_arm.cpp   |  2 +-
 src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp      | 14 +++----
 src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp       |  2 +-
 .../ppc/gc/shared/barrierSetNMethod_ppc.cpp   |  2 +-
 src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp  | 10 ++---
 src/hotspot/cpu/riscv/nativeInst_riscv.hpp    |  2 +-
 src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp    | 12 +++---
 src/hotspot/cpu/s390/c1_FrameMap_s390.cpp     |  6 +--
 src/hotspot/cpu/s390/c1_FrameMap_s390.hpp     |  2 +-
 .../s390/gc/shared/barrierSetNMethod_s390.cpp |  4 +-
 src/hotspot/cpu/s390/interp_masm_s390.cpp     | 20 +++++-----
 src/hotspot/cpu/x86/assembler_x86.cpp         | 40 +++++++++----------
 src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp      | 12 +++---
 src/hotspot/cpu/x86/nativeInst_x86.cpp        |  2 +-
 src/hotspot/cpu/x86/nativeInst_x86.hpp        |  2 +-
 src/hotspot/cpu/x86/x86_64.ad                 |  4 +-
 src/hotspot/os/linux/os_linux.cpp             |  2 +-
 src/hotspot/os/posix/signals_posix.cpp        |  4 +-
 src/hotspot/share/asm/assembler.hpp           |  2 +-
 src/hotspot/share/asm/codeBuffer.cpp          | 12 +++---
 src/hotspot/share/asm/codeBuffer.hpp          |  6 +--
 src/hotspot/share/c1/c1_FrameMap.hpp          |  8 ++--
 src/hotspot/share/c1/c1_Runtime1.cpp          |  6 +--
 src/hotspot/share/ci/ciTypeFlow.cpp           |  2 +-
 src/hotspot/share/ci/ciTypeFlow.hpp           |  2 +-
 src/hotspot/share/ci/ciUtilities.inline.hpp   |  6 +--
 .../share/classfile/classFileParser.cpp       |  4 +-
 src/hotspot/share/classfile/javaClasses.cpp   |  2 +-
 src/hotspot/share/code/debugInfoRec.cpp       | 12 +++---
 src/hotspot/share/code/nmethod.cpp            | 10 ++---
 src/hotspot/share/code/nmethod.hpp            |  2 +-
 src/hotspot/share/code/oopRecorder.cpp        |  6 +--
 src/hotspot/share/code/relocInfo.cpp          |  4 +-
 src/hotspot/share/code/relocInfo.hpp          |  2 +-
 src/hotspot/share/code/stubs.cpp              |  6 +--
 src/hotspot/share/compiler/oopMap.cpp         |  4 +-
 src/hotspot/share/compiler/oopMap.hpp         |  2 +-
 .../share/gc/parallel/objectStartArray.cpp    |  2 +-
 .../share/gc/parallel/psParallelCompact.cpp   |  2 +-
 .../share/gc/parallel/psPromotionLAB.cpp      |  2 +-
 .../share/gc/parallel/psPromotionLAB.hpp      |  6 +--
 .../gc/serial/serialBlockOffsetTable.cpp      |  2 +-
 src/hotspot/share/gc/shared/collectedHeap.hpp |  2 +-
 .../share/gc/shared/hSpaceCounters.cpp        |  2 +-
 .../share/gc/shared/hSpaceCounters.hpp        |  2 +-
 src/hotspot/share/gc/shared/memAllocator.cpp  |  4 +-
 .../share/gc/shared/scavengableNMethods.cpp   | 12 +++---
 .../shenandoah/c2/shenandoahBarrierSetC2.cpp  |  2 +-
 .../gc/shenandoah/shenandoahCollectionSet.cpp |  4 +-
 .../gc/shenandoah/shenandoahTaskqueue.hpp     |  8 ++--
 src/hotspot/share/interpreter/oopMapCache.cpp |  2 +-
 .../checkpoint/jfrCheckpointManager.cpp       |  2 +-
 .../share/jfr/recorder/storage/jfrStorage.cpp |  8 ++--
 .../share/jfr/utilities/jfrAllocation.cpp     |  8 ++--
 .../jfr/utilities/jfrDoublyLinkedList.hpp     |  2 +-
 .../share/jfr/writers/jfrMemoryWriterHost.hpp |  4 +-
 .../writers/jfrMemoryWriterHost.inline.hpp    |  8 ++--
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  2 +-
 .../share/logging/logConfiguration.cpp        |  8 ++--
 src/hotspot/share/memory/universe.cpp         |  4 +-
 src/hotspot/share/memory/universe.hpp         |  6 +--
 src/hotspot/share/memory/virtualspace.cpp     |  8 ++--
 src/hotspot/share/oops/cpCache.hpp            |  2 +-
 src/hotspot/share/oops/generateOopMap.cpp     |  2 +-
 src/hotspot/share/oops/instanceKlass.cpp      |  4 +-
 src/hotspot/share/oops/instanceRefKlass.cpp   |  4 +-
 src/hotspot/share/oops/klass.cpp              |  4 +-
 src/hotspot/share/oops/method.cpp             |  2 +-
 src/hotspot/share/opto/block.cpp              |  2 +-
 src/hotspot/share/opto/block.hpp              |  6 +--
 src/hotspot/share/opto/buildOopMap.cpp        |  6 +--
 src/hotspot/share/opto/callnode.cpp           | 12 +++---
 src/hotspot/share/opto/cfgnode.cpp            |  2 +-
 src/hotspot/share/opto/chaitin.cpp            | 10 ++---
 src/hotspot/share/opto/chaitin.hpp            | 22 +++++-----
 src/hotspot/share/opto/compile.cpp            |  2 +-
 src/hotspot/share/opto/escape.cpp             |  2 +-
 src/hotspot/share/opto/graphKit.cpp           | 18 ++++-----
 src/hotspot/share/opto/graphKit.hpp           |  6 +--
 src/hotspot/share/opto/idealKit.cpp           |  4 +-
 src/hotspot/share/opto/indexSet.cpp           |  2 +-
 src/hotspot/share/opto/loopnode.cpp           |  2 +-
 src/hotspot/share/opto/macro.cpp              |  4 +-
 src/hotspot/share/opto/matcher.cpp            | 22 +++++-----
 src/hotspot/share/opto/memnode.hpp            | 10 ++---
 src/hotspot/share/opto/multnode.hpp           |  2 +-
 src/hotspot/share/opto/node.cpp               | 24 +++++------
 src/hotspot/share/opto/node.hpp               | 34 ++++++++--------
 src/hotspot/share/opto/output.cpp             |  2 +-
 src/hotspot/share/opto/parse1.cpp             |  6 +--
 src/hotspot/share/opto/phaseX.cpp             | 16 ++++----
 src/hotspot/share/opto/regalloc.hpp           |  4 +-
 src/hotspot/share/opto/runtime.cpp            |  2 +-
 src/hotspot/share/opto/type.cpp               |  2 +-
 src/hotspot/share/prims/jni.cpp               | 14 +++----
 src/hotspot/share/prims/jniCheck.cpp          |  2 +-
 src/hotspot/share/prims/jvmtiEnter.xsl        |  2 +-
 src/hotspot/share/prims/jvmtiEnv.cpp          |  2 +-
 src/hotspot/share/prims/jvmtiExport.cpp       |  2 +-
 src/hotspot/share/prims/jvmtiThreadState.cpp  |  6 +--
 src/hotspot/share/prims/perf.cpp              |  8 ++--
 src/hotspot/share/prims/upcallLinker.cpp      |  4 +-
 src/hotspot/share/runtime/handles.cpp         |  2 +-
 src/hotspot/share/runtime/handles.hpp         |  6 +--
 src/hotspot/share/runtime/handles.inline.hpp  |  4 +-
 .../share/runtime/interfaceSupport.inline.hpp | 20 +++++-----
 src/hotspot/share/runtime/javaCalls.cpp       |  4 +-
 src/hotspot/share/runtime/javaThread.cpp      |  4 +-
 .../share/runtime/jfieldIDWorkaround.hpp      |  2 +-
 src/hotspot/share/runtime/jniHandles.cpp      |  6 +--
 src/hotspot/share/runtime/os.cpp              |  2 +-
 src/hotspot/share/runtime/thread.cpp          |  6 +--
 src/hotspot/share/services/heapDumper.cpp     | 10 ++---
 src/hotspot/share/services/threadService.cpp  |  2 +-
 src/hotspot/share/utilities/growableArray.hpp | 14 +++----
 src/hotspot/share/utilities/macros.hpp        |  3 --
 119 files changed, 369 insertions(+), 372 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
index 2334cbdff24..2e53ecb8058 100644
--- a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
@@ -69,7 +69,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     __ far_call(RuntimeAddress(a));
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
+    DEBUG_ONLY(__ should_not_reach_here());
     return;
   }
 
@@ -90,7 +90,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ blr(lr);
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -103,7 +103,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   __ far_call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -274,7 +274,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
   __ far_call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 
@@ -289,7 +289,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
   }
   __ far_call(RuntimeAddress(Runtime1::entry_for(_stub)), rscratch2);
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index f3b97d23ad3..4a0b557968c 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -1238,11 +1238,11 @@ encode %{
   enc_class save_last_PC %{
     // preserve mark
     address mark = __ inst_mark();
-    debug_only(int off0 = __ offset());
+    DEBUG_ONLY(int off0 = __ offset());
     int ret_addr_offset = as_MachCall()->ret_addr_offset();
     __ adr(LR, mark + ret_addr_offset);
     __ str(LR, Address(Rthread, JavaThread::last_Java_pc_offset()));
-    debug_only(int off1 = __ offset());
+    DEBUG_ONLY(int off1 = __ offset());
     assert(off1 - off0 == 2 * Assembler::InstructionSize, "correct size prediction");
     // restore mark
     __ set_inst_mark(mark);
@@ -1251,11 +1251,11 @@ encode %{
   enc_class preserve_SP %{
     // preserve mark
     address mark = __ inst_mark();
-    debug_only(int off0 = __ offset());
+    DEBUG_ONLY(int off0 = __ offset());
     // FP is preserved across all calls, even compiled calls.
     // Use it to preserve SP in places where the callee might change the SP.
     __ mov(Rmh_SP_save, SP);
-    debug_only(int off1 = __ offset());
+    DEBUG_ONLY(int off1 = __ offset());
     assert(off1 - off0 == 4, "correct size prediction");
     // restore mark
     __ set_inst_mark(mark);
diff --git a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
index bca6c7ca30c..5683bc59d5c 100644
--- a/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_CodeStubs_arm.cpp
@@ -59,7 +59,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     __ call(Runtime1::entry_for(C1StubId::predicate_failed_trap_id), relocInfo::runtime_call_type);
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
+    DEBUG_ONLY(__ should_not_reach_here());
     return;
   }
   // Pass the array index on stack because all registers must be preserved
@@ -91,7 +91,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   __ call(Runtime1::entry_for(C1StubId::predicate_failed_trap_id), relocInfo::runtime_call_type);
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void DivByZeroStub::emit_code(LIR_Assembler* ce) {
diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
index c6cc0ce406e..52d71ca65c2 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetNMethod_arm.cpp
@@ -72,7 +72,7 @@ void NativeNMethodBarrier::verify() const {
 static NativeNMethodBarrier* native_nmethod_barrier(nmethod* nm) {
   address barrier_address = nm->code_begin() + nm->frame_complete_offset() - entry_barrier_bytes;
   NativeNMethodBarrier* barrier = reinterpret_cast<NativeNMethodBarrier*>(barrier_address);
-  debug_only(barrier->verify());
+  DEBUG_ONLY(barrier->verify());
   return barrier;
 }
 
diff --git a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
index d4f5faa29a8..a390a6eeed4 100644
--- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
@@ -74,7 +74,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     __ bctrl();
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ illtrap());
+    DEBUG_ONLY(__ illtrap());
     return;
   }
 
@@ -98,7 +98,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ bctrl();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ illtrap());
+  DEBUG_ONLY(__ illtrap());
 }
 
 
@@ -115,7 +115,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   __ bctrl();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ illtrap());
+  DEBUG_ONLY(__ illtrap());
 }
 
 
@@ -156,7 +156,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
   __ bctrl();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ illtrap());
+  DEBUG_ONLY(__ illtrap());
 }
 
 
@@ -179,7 +179,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
   __ bctrl();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ illtrap());
+  DEBUG_ONLY(__ illtrap());
 }
 
 
@@ -193,7 +193,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
   __ mtctr(R0);
   __ bctrl();
   ce->add_call_info_here(_info);
-  debug_only( __ illtrap(); )
+  DEBUG_ONLY( __ illtrap(); )
 }
 
 
@@ -441,7 +441,7 @@ void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
   __ load_const_optimized(R0, _trap_request); // Pass trap request in R0.
   __ bctrl();
   ce->add_call_info_here(_info);
-  debug_only(__ illtrap());
+  DEBUG_ONLY(__ illtrap());
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp
index e4684613e25..8ce324a570b 100644
--- a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.cpp
@@ -189,7 +189,7 @@ LIR_Opr FrameMap::_caller_save_fpu_regs[] = {};
 
 FloatRegister FrameMap::nr2floatreg (int rnr) {
   assert(_init_done, "tables not initialized");
-  debug_only(fpu_range_check(rnr);)
+  DEBUG_ONLY(fpu_range_check(rnr);)
   return _fpu_regs[rnr];
 }
 
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
index 1b44a169e67..d3bb9cc3c04 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetNMethod_ppc.cpp
@@ -108,7 +108,7 @@ static NativeNMethodBarrier* get_nmethod_barrier(nmethod* nm) {
   }
 
   auto barrier = reinterpret_cast<NativeNMethodBarrier*>(barrier_address);
-  debug_only(barrier->verify());
+  DEBUG_ONLY(barrier->verify());
   return barrier;
 }
 
diff --git a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
index d55521823ec..ea299181ca7 100644
--- a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
@@ -70,7 +70,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     __ far_call(RuntimeAddress(a));
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
+    DEBUG_ONLY(__ should_not_reach_here());
     return;
   }
 
@@ -92,7 +92,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ rt_call(Runtime1::entry_for(stub_id), ra);
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -105,7 +105,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   __ far_call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -258,7 +258,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
   __ far_call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
@@ -272,7 +272,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
   }
   __ far_call(RuntimeAddress(Runtime1::entry_for(_stub)));
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
index 295e92bbc1b..d8f5fa57816 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -300,7 +300,7 @@ class NativeGeneralJump: public NativeJump {
 inline NativeGeneralJump* nativeGeneralJump_at(address addr) {
   assert_cond(addr != nullptr);
   NativeGeneralJump* jump = (NativeGeneralJump*)(addr);
-  debug_only(jump->verify();)
+  DEBUG_ONLY(jump->verify();)
   return jump;
 }
 
diff --git a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
index c858a4b8cb1..430928a66ed 100644
--- a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
@@ -52,7 +52,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     CHECK_BAILOUT();
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
+    DEBUG_ONLY(__ should_not_reach_here());
     return;
   }
 
@@ -74,7 +74,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   CHECK_BAILOUT();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -88,7 +88,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   CHECK_BAILOUT();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
@@ -116,7 +116,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
   ce->emit_call_c(Runtime1::entry_for (C1StubId::throw_div0_exception_id));
   CHECK_BAILOUT();
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
@@ -134,7 +134,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
   CHECK_BAILOUT();
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 // Note: pass object in Z_R1_scratch
@@ -147,7 +147,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
   ce->emit_call_c(a);
   CHECK_BAILOUT();
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, C1StubId stub_id) {
diff --git a/src/hotspot/cpu/s390/c1_FrameMap_s390.cpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.cpp
index 9fa6da8341f..ddba445154a 100644
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.cpp
@@ -144,13 +144,13 @@ LIR_Opr FrameMap::_caller_save_fpu_regs[] = {};
 // c1 rnr -> FloatRegister
 FloatRegister FrameMap::nr2floatreg (int rnr) {
   assert(_init_done, "tables not initialized");
-  debug_only(fpu_range_check(rnr);)
+  DEBUG_ONLY(fpu_range_check(rnr);)
   return _fpu_rnr2reg[rnr];
 }
 
 void FrameMap::map_float_register(int rnr, FloatRegister reg) {
-  debug_only(fpu_range_check(rnr);)
-  debug_only(fpu_range_check(reg->encoding());)
+  DEBUG_ONLY(fpu_range_check(rnr);)
+  DEBUG_ONLY(fpu_range_check(reg->encoding());)
   _fpu_rnr2reg[rnr] = reg;              // mapping c1 regnr. -> FloatRegister
   _fpu_reg2rnr[reg->encoding()] = rnr;  // mapping assembler encoding -> c1 regnr.
 }
diff --git a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
index 66ccc8de876..721995f41fe 100644
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
@@ -107,7 +107,7 @@
   static int fpu_reg2rnr (FloatRegister reg) {
     assert(_init_done, "tables not initialized");
     int c1rnr = _fpu_reg2rnr[reg->encoding()];
-    debug_only(fpu_range_check(c1rnr);)
+    DEBUG_ONLY(fpu_range_check(c1rnr);)
     return c1rnr;
   }
 
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetNMethod_s390.cpp b/src/hotspot/cpu/s390/gc/shared/barrierSetNMethod_s390.cpp
index 85dcc0a4e73..88b3199e4e1 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetNMethod_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetNMethod_s390.cpp
@@ -40,7 +40,7 @@ class NativeMethodBarrier: public NativeInstruction {
     address get_patchable_data_address() const {
       address inst_addr = get_barrier_start_address() + PATCHABLE_INSTRUCTION_OFFSET;
 
-      debug_only(Assembler::is_z_cfi(*((long*)inst_addr)));
+      DEBUG_ONLY(Assembler::is_z_cfi(*((long*)inst_addr)));
       return inst_addr + 2;
     }
 
@@ -91,7 +91,7 @@ static NativeMethodBarrier* get_nmethod_barrier(nmethod* nm) {
   address barrier_address = nm->code_begin() + nm->frame_complete_offset() - NativeMethodBarrier::BARRIER_TOTAL_LENGTH;
   auto barrier = reinterpret_cast<NativeMethodBarrier*>(barrier_address);
 
-  debug_only(barrier->verify());
+  DEBUG_ONLY(barrier->verify());
   return barrier;
 }
 
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index 4ba99eb9e88..09995334330 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -444,7 +444,7 @@ void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
 // Useful if consumed previously by access via stackTop().
 void InterpreterMacroAssembler::popx(int len) {
   add2reg(Z_esp, len*Interpreter::stackElementSize);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 // Get Address object of stack top. No checks. No pop.
@@ -458,38 +458,38 @@ void InterpreterMacroAssembler::pop_i(Register r) {
   z_l(r, Interpreter::expr_offset_in_bytes(0), Z_esp);
   add2reg(Z_esp, Interpreter::stackElementSize);
   assert_different_registers(r, Z_R1_scratch);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 void InterpreterMacroAssembler::pop_ptr(Register r) {
   z_lg(r, Interpreter::expr_offset_in_bytes(0), Z_esp);
   add2reg(Z_esp, Interpreter::stackElementSize);
   assert_different_registers(r, Z_R1_scratch);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 void InterpreterMacroAssembler::pop_l(Register r) {
   z_lg(r, Interpreter::expr_offset_in_bytes(0), Z_esp);
   add2reg(Z_esp, 2*Interpreter::stackElementSize);
   assert_different_registers(r, Z_R1_scratch);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 void InterpreterMacroAssembler::pop_f(FloatRegister f) {
   mem2freg_opt(f, Address(Z_esp, Interpreter::expr_offset_in_bytes(0)), false);
   add2reg(Z_esp, Interpreter::stackElementSize);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 void InterpreterMacroAssembler::pop_d(FloatRegister f) {
   mem2freg_opt(f, Address(Z_esp, Interpreter::expr_offset_in_bytes(0)), true);
   add2reg(Z_esp, 2*Interpreter::stackElementSize);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
 }
 
 void InterpreterMacroAssembler::push_i(Register r) {
   assert_different_registers(r, Z_R1_scratch);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
   z_st(r, Address(Z_esp));
   add2reg(Z_esp, -Interpreter::stackElementSize);
 }
@@ -501,7 +501,7 @@ void InterpreterMacroAssembler::push_ptr(Register r) {
 
 void InterpreterMacroAssembler::push_l(Register r) {
   assert_different_registers(r, Z_R1_scratch);
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
   int offset = -Interpreter::stackElementSize;
   z_stg(r, Address(Z_esp, offset));
   clear_mem(Address(Z_esp), Interpreter::stackElementSize);
@@ -509,13 +509,13 @@ void InterpreterMacroAssembler::push_l(Register r) {
 }
 
 void InterpreterMacroAssembler::push_f(FloatRegister f) {
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
   freg2mem_opt(f, Address(Z_esp), false);
   add2reg(Z_esp, -Interpreter::stackElementSize);
 }
 
 void InterpreterMacroAssembler::push_d(FloatRegister d) {
-  debug_only(verify_esp(Z_esp, Z_R1_scratch));
+  DEBUG_ONLY(verify_esp(Z_esp, Z_R1_scratch));
   int offset = -Interpreter::stackElementSize;
   freg2mem_opt(d, Address(Z_esp, offset));
   add2reg(Z_esp, 2 * offset);
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 3ea00681ada..7a4d7c6d6f3 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -801,7 +801,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   address ip = inst;
   bool is_64bit = false;
 
-  debug_only(bool has_disp32 = false);
+  DEBUG_ONLY(bool has_disp32 = false);
   int tail_size = 0; // other random bytes (#32, #16, etc.) at end of insn
 
   again_after_prefix:
@@ -859,7 +859,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0x8A: // movb r, a
   case 0x8B: // movl r, a
   case 0x8F: // popl a
-    debug_only(has_disp32 = true);
+    DEBUG_ONLY(has_disp32 = true);
     break;
 
   case 0x68: // pushq #32
@@ -898,10 +898,10 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
 
     case 0x8B: // movw r, a
     case 0x89: // movw a, r
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       break;
     case 0xC7: // movw a, #16
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       tail_size = 2;  // the imm16
       break;
     case 0x0F: // several SSE/SSE2 variants
@@ -923,7 +923,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0x69: // imul r, a, #32
   case 0xC7: // movl a, #32(oop?)
     tail_size = 4;
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   case 0x0F: // movx..., etc.
@@ -932,11 +932,11 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
       tail_size = 1;
     case 0x38: // ptest, pmovzxbw
       ip++; // skip opcode
-      debug_only(has_disp32 = true); // has both kinds of operands!
+      DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
       break;
 
     case 0x70: // pshufd r, r/a, #8
-      debug_only(has_disp32 = true); // has both kinds of operands!
+      DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     case 0x73: // psrldq r, #8
       tail_size = 1;
       break;
@@ -961,7 +961,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     case 0xAE: // ldmxcsr, stmxcsr, fxrstor, fxsave, clflush
     case 0xD6: // movq
     case 0xFE: // paddd
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       break;
 
     case 0xAD: // shrd r, a, %cl
@@ -976,18 +976,18 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     case 0xC1: // xaddl
     case 0xC7: // cmpxchg8
     case REP16(0x90): // setcc a
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       // fall out of the switch to decode the address
       break;
 
     case 0xC4: // pinsrw r, a, #8
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
     case 0xC5: // pextrw r, r, #8
       tail_size = 1;  // the imm8
       break;
 
     case 0xAC: // shrd r, a, #8
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       tail_size = 1;  // the imm8
       break;
 
@@ -1004,12 +1004,12 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     // also: orl, adcl, sbbl, andl, subl, xorl, cmpl
     // on 32bit in the case of cmpl, the imm might be an oop
     tail_size = 4;
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   case 0x83: // addl a, #8; addl r, #8
     // also: orl, adcl, sbbl, andl, subl, xorl, cmpl
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     tail_size = 1;
     break;
 
@@ -1026,7 +1026,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0x9B:
     switch (0xFF & *ip++) {
     case 0xD9: // fnstcw a
-      debug_only(has_disp32 = true);
+      DEBUG_ONLY(has_disp32 = true);
       break;
     default:
       ShouldNotReachHere();
@@ -1045,7 +1045,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0x87: // xchg r, a
   case REP4(0x38): // cmp...
   case 0x85: // test r, a
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   case 0xA8: // testb rax, #8
@@ -1057,7 +1057,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0xC6: // movb a, #8
   case 0x80: // cmpb a, #8
   case 0x6B: // imul r, a, #8
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     tail_size = 1; // the imm8
     break;
 
@@ -1109,7 +1109,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
         break;
     }
     ip++; // skip opcode
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   case 0x62: // EVEX_4bytes
@@ -1135,7 +1135,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
       break;
     }
     ip++; // skip opcode
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   case 0xD1: // sal a, 1; sar a, 1; shl a, 1; shr a, 1
@@ -1147,7 +1147,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
   case 0xD8: // fadd_s a; fsubr_s a; fmul_s a; fdivr_s a; fcomp_s a
   case 0xDC: // fadd_d a; fsubr_d a; fmul_d a; fdivr_d a; fcomp_d a
   case 0xDE: // faddp_d a; fsubrp_d a; fmulp_d a; fdivrp_d a; fcompp_d a
-    debug_only(has_disp32 = true);
+    DEBUG_ONLY(has_disp32 = true);
     break;
 
   case 0xE8: // call rdisp32
@@ -1184,7 +1184,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
     default:
       ip++;
     }
-    debug_only(has_disp32 = true); // has both kinds of operands!
+    DEBUG_ONLY(has_disp32 = true); // has both kinds of operands!
     break;
 
   default:
diff --git a/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp b/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
index 73262b21365..7c0d3ff624d 100644
--- a/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
@@ -68,7 +68,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
     __ call(RuntimeAddress(a));
     ce->add_call_info_here(_info);
     ce->verify_oop_map(_info);
-    debug_only(__ should_not_reach_here());
+    DEBUG_ONLY(__ should_not_reach_here());
     return;
   }
 
@@ -88,7 +88,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
   __ call(RuntimeAddress(Runtime1::entry_for(stub_id)));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -101,7 +101,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
   __ call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -111,7 +111,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
   __ bind(_entry);
   __ call(RuntimeAddress(Runtime1::entry_for(C1StubId::throw_div0_exception_id)));
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 
@@ -399,7 +399,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
   __ call(RuntimeAddress(a));
   ce->add_call_info_here(_info);
   ce->verify_oop_map(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 
@@ -413,7 +413,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
   }
   __ call(RuntimeAddress(Runtime1::entry_for(_stub)));
   ce->add_call_info_here(_info);
-  debug_only(__ should_not_reach_here());
+  DEBUG_ONLY(__ should_not_reach_here());
 }
 
 
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.cpp b/src/hotspot/cpu/x86/nativeInst_x86.cpp
index 4ee741077dc..6e0e078b36e 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.cpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.cpp
@@ -140,7 +140,7 @@ bool NativeCall::is_displacement_aligned() {
 // Used in the runtime linkage of calls; see class CompiledIC.
 // (Cf. 4506997 and 4479829, where threads witnessed garbage displacements.)
 void NativeCall::set_destination_mt_safe(address dest) {
-  debug_only(verify());
+  DEBUG_ONLY(verify());
   // Make sure patching code is locked.  No two threads can patch at the same
   // time but one may be executing this code.
   assert(CodeCache_lock->is_locked() || SafepointSynchronize::is_at_safepoint() ||
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp
index d02387aa9ff..f6abadbeb5c 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp
@@ -503,7 +503,7 @@ class NativeGeneralJump: public NativeInstruction {
 
 inline NativeGeneralJump* nativeGeneralJump_at(address address) {
   NativeGeneralJump* jump = (NativeGeneralJump*)(address);
-  debug_only(jump->verify();)
+  DEBUG_ONLY(jump->verify();)
   return jump;
 }
 
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 954a53307c2..25cee7a3094 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1847,14 +1847,14 @@ encode %{
   %}
 
   enc_class clear_avx %{
-    debug_only(int off0 = __ offset());
+    DEBUG_ONLY(int off0 = __ offset());
     if (generate_vzeroupper(Compile::current())) {
       // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
       // Clear upper bits of YMM registers when current compiled code uses
       // wide vectors to avoid AVX <-> SSE transition penalty during call.
       __ vzeroupper();
     }
-    debug_only(int off1 = __ offset());
+    DEBUG_ONLY(int off1 = __ offset());
     assert(off1 - off0 == clear_avx_size(), "correct size prediction");
   %}
 
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 22d3e1862b5..7061e5ac9d8 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1662,7 +1662,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
           }
 
           ThreadInVMfromNative tiv(jt);
-          debug_only(VMNativeEntryWrapper vew;)
+          DEBUG_ONLY(VMNativeEntryWrapper vew;)
 
           VM_LinuxDllLoad op(filename, ebuf, ebuflen);
           VMThread::execute(&op);
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 555ac832aae..e900d5695ae 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -147,7 +147,7 @@ class SavedSignalHandlers {
 };
 
 
-debug_only(static bool signal_sets_initialized = false);
+DEBUG_ONLY(static bool signal_sets_initialized = false);
 static sigset_t unblocked_sigs, vm_sigs, preinstalled_sigs;
 
 // Our own signal handlers should never ever get replaced by a third party one.
@@ -1547,7 +1547,7 @@ static void signal_sets_init() {
   if (!ReduceSignalUsage) {
     sigaddset(&vm_sigs, BREAK_SIGNAL);
   }
-  debug_only(signal_sets_initialized = true);
+  DEBUG_ONLY(signal_sets_initialized = true);
 }
 
 // These are signals that are unblocked while a thread is running Java.
diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index 9abd3eb7171..961b5fab700 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -73,7 +73,7 @@ class Label;
  */
 class Label {
  private:
-  enum { PatchCacheSize = 4 debug_only( +4 ) };
+  enum { PatchCacheSize = 4 DEBUG_ONLY( +4 ) };
 
   // _loc encodes both the binding state (via its sign)
   // and the binding locator (via its value) of a label.
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 917569e2be6..2a9b6215614 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -92,7 +92,7 @@ CodeBuffer::CodeBuffer(CodeBlob* blob) DEBUG_ONLY(: Scrubber(this, sizeof(*this)
   // Provide code buffer with meaningful name
   initialize_misc(blob->name());
   initialize(blob->content_begin(), blob->content_size());
-  debug_only(verify_section_allocation();)
+  DEBUG_ONLY(verify_section_allocation();)
 }
 
 void CodeBuffer::initialize(csize_t code_size, csize_t locs_size) {
@@ -120,7 +120,7 @@ void CodeBuffer::initialize(csize_t code_size, csize_t locs_size) {
     _insts.initialize_locs(locs_size / sizeof(relocInfo));
   }
 
-  debug_only(verify_section_allocation();)
+  DEBUG_ONLY(verify_section_allocation();)
 }
 
 
@@ -494,7 +494,7 @@ void CodeBuffer::compute_final_layout(CodeBuffer* dest) const {
       prev_cs      = cs;
     }
 
-    debug_only(dest_cs->_start = nullptr);  // defeat double-initialization assert
+    DEBUG_ONLY(dest_cs->_start = nullptr);  // defeat double-initialization assert
     dest_cs->initialize(buf+buf_offset, csize);
     dest_cs->set_end(buf+buf_offset+csize);
     assert(dest_cs->is_allocated(), "must always be allocated");
@@ -505,7 +505,7 @@ void CodeBuffer::compute_final_layout(CodeBuffer* dest) const {
 
   // Done calculating sections; did it come out to the right end?
   assert(buf_offset == total_content_size(), "sanity");
-  debug_only(dest->verify_section_allocation();)
+  DEBUG_ONLY(dest->verify_section_allocation();)
 }
 
 // Append an oop reference that keeps the class alive.
@@ -939,11 +939,11 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
   cb.set_blob(nullptr);
 
   // Zap the old code buffer contents, to avoid mistakenly using them.
-  debug_only(Copy::fill_to_bytes(bxp->_total_start, bxp->_total_size,
+  DEBUG_ONLY(Copy::fill_to_bytes(bxp->_total_start, bxp->_total_size,
                                  badCodeHeapFreeVal);)
 
   // Make certain that the new sections are all snugly inside the new blob.
-  debug_only(verify_section_allocation();)
+  DEBUG_ONLY(verify_section_allocation();)
 
 #ifndef PRODUCT
   _decode_begin = nullptr;  // sanity
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index f855d41b181..b38cc74cc3b 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -121,8 +121,8 @@ class CodeSection {
     _locs_own      = false;
     _scratch_emit  = false;
     _skipped_instructions_size = 0;
-    debug_only(_index = -1);
-    debug_only(_outer = (CodeBuffer*)badAddress);
+    DEBUG_ONLY(_index = -1);
+    DEBUG_ONLY(_outer = (CodeBuffer*)badAddress);
   }
 
   void initialize_outer(CodeBuffer* outer, int8_t index) {
@@ -535,7 +535,7 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
     assert(code_start != nullptr, "sanity");
     initialize_misc("static buffer");
     initialize(code_start, code_size);
-    debug_only(verify_section_allocation();)
+    DEBUG_ONLY(verify_section_allocation();)
   }
 
   // (2) CodeBuffer referring to pre-allocated CodeBlob.
diff --git a/src/hotspot/share/c1/c1_FrameMap.hpp b/src/hotspot/share/c1/c1_FrameMap.hpp
index 4e4fde0cb4a..f10c4d3f226 100644
--- a/src/hotspot/share/c1/c1_FrameMap.hpp
+++ b/src/hotspot/share/c1/c1_FrameMap.hpp
@@ -109,19 +109,19 @@ class FrameMap : public CompilationResourceObj {
 
   static Register cpu_rnr2reg (int rnr) {
     assert(_init_done, "tables not initialized");
-    debug_only(cpu_range_check(rnr);)
+    DEBUG_ONLY(cpu_range_check(rnr);)
     return _cpu_rnr2reg[rnr];
   }
 
   static int cpu_reg2rnr (Register reg) {
     assert(_init_done, "tables not initialized");
-    debug_only(cpu_range_check(reg->encoding());)
+    DEBUG_ONLY(cpu_range_check(reg->encoding());)
     return _cpu_reg2rnr[reg->encoding()];
   }
 
   static void map_register(int rnr, Register reg) {
-    debug_only(cpu_range_check(rnr);)
-    debug_only(cpu_range_check(reg->encoding());)
+    DEBUG_ONLY(cpu_range_check(rnr);)
+    DEBUG_ONLY(cpu_range_check(reg->encoding());)
     _cpu_rnr2reg[rnr] = reg;
     _cpu_reg2rnr[reg->encoding()] = rnr;
   }
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 9d4b35024ed..0f87a90a417 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -1363,7 +1363,7 @@ int Runtime1::move_klass_patching(JavaThread* current) {
 //
 // NOTE: we are still in Java
 //
-  debug_only(NoHandleMark nhm;)
+  DEBUG_ONLY(NoHandleMark nhm;)
   {
     // Enter VM mode
     ResetNoHandleMark rnhm;
@@ -1380,7 +1380,7 @@ int Runtime1::move_mirror_patching(JavaThread* current) {
 //
 // NOTE: we are still in Java
 //
-  debug_only(NoHandleMark nhm;)
+  DEBUG_ONLY(NoHandleMark nhm;)
   {
     // Enter VM mode
     ResetNoHandleMark rnhm;
@@ -1397,7 +1397,7 @@ int Runtime1::move_appendix_patching(JavaThread* current) {
 //
 // NOTE: we are still in Java
 //
-  debug_only(NoHandleMark nhm;)
+  DEBUG_ONLY(NoHandleMark nhm;)
   {
     // Enter VM mode
     ResetNoHandleMark rnhm;
diff --git a/src/hotspot/share/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp
index 234b4611ea1..6df090a7ce5 100644
--- a/src/hotspot/share/ci/ciTypeFlow.cpp
+++ b/src/hotspot/share/ci/ciTypeFlow.cpp
@@ -2924,7 +2924,7 @@ void ciTypeFlow::flow_types() {
 
   // Continue flow analysis until fixed point reached
 
-  debug_only(int max_block = _next_pre_order;)
+  DEBUG_ONLY(int max_block = _next_pre_order;)
 
   while (!work_list_empty()) {
     Block* blk = work_list_next();
diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp
index 92db6253aa0..adfb85dc17f 100644
--- a/src/hotspot/share/ci/ciTypeFlow.hpp
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp
@@ -253,7 +253,7 @@ class ciTypeFlow : public ArenaObj {
       set_type_at_tos(type);
     }
     void      pop() {
-      debug_only(set_type_at_tos(bottom_type()));
+      DEBUG_ONLY(set_type_at_tos(bottom_type()));
       _stack_size--;
     }
     ciType*   pop_value() {
diff --git a/src/hotspot/share/ci/ciUtilities.inline.hpp b/src/hotspot/share/ci/ciUtilities.inline.hpp
index 05e73d8ca64..91f848368ac 100644
--- a/src/hotspot/share/ci/ciUtilities.inline.hpp
+++ b/src/hotspot/share/ci/ciUtilities.inline.hpp
@@ -37,7 +37,7 @@
   ThreadInVMfromNative __tiv(thread);       \
   HandleMarkCleaner __hm(thread);           \
   JavaThread* THREAD = thread; /* For exception macros. */ \
-  debug_only(VMNativeEntryWrapper __vew;)
+  DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
 
 
@@ -49,10 +49,10 @@
  * [TODO] The NoHandleMark line does nothing but declare a function prototype \
  * The NoHandkeMark constructor is NOT executed. If the ()'s are   \
  * removed, causes the NoHandleMark assert to trigger. \
- * debug_only(NoHandleMark __hm();)         \
+ * DEBUG_ONLY(NoHandleMark __hm();)         \
  */                                         \
   JavaThread* THREAD = thread; /* For exception macros. */ \
-  debug_only(VMNativeEntryWrapper __vew;)
+  DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
 
 #define EXCEPTION_CONTEXT \
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 3e6246d4aee..757f0e72c8c 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -176,7 +176,7 @@ void ClassFileParser::parse_constant_pool_entries(const ClassFileStream* const s
   const ClassFileStream cfs1 = *stream;
   const ClassFileStream* const cfs = &cfs1;
 
-  debug_only(const u1* const old_current = stream->current();)
+  DEBUG_ONLY(const u1* const old_current = stream->current();)
 
   // Used for batching symbol allocations.
   const char* names[SymbolTable::symbol_alloc_batch_size];
@@ -5243,7 +5243,7 @@ void ClassFileParser::fill_instance_klass(InstanceKlass* ik,
   // it's official
   set_klass(ik);
 
-  debug_only(ik->verify();)
+  DEBUG_ONLY(ik->verify();)
 }
 
 void ClassFileParser::update_class_name(Symbol* new_class_name) {
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index a2ad1dce5e4..a39164232ae 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -4821,7 +4821,7 @@ bool java_lang_ClassLoader::isAncestor(oop loader, oop cl) {
   assert(is_instance(loader), "loader must be oop");
   assert(cl == nullptr || is_instance(cl), "cl argument must be oop");
   oop acl = loader;
-  debug_only(jint loop_count = 0);
+  DEBUG_ONLY(jint loop_count = 0);
   // This loop taken verbatim from ClassLoader.java:
   do {
     acl = parent(acl);
diff --git a/src/hotspot/share/code/debugInfoRec.cpp b/src/hotspot/share/code/debugInfoRec.cpp
index 02cd23407bf..8449f5d6929 100644
--- a/src/hotspot/share/code/debugInfoRec.cpp
+++ b/src/hotspot/share/code/debugInfoRec.cpp
@@ -140,7 +140,7 @@ DebugInformationRecorder::DebugInformationRecorder(OopRecorder* oop_recorder)
 
   add_new_pc_offset(PcDesc::lower_offset_limit);  // sentinel record
 
-  debug_only(_recording_state = rs_null);
+  DEBUG_ONLY(_recording_state = rs_null);
 }
 
 
@@ -159,7 +159,7 @@ void DebugInformationRecorder::add_safepoint(int pc_offset, OopMap* map) {
   add_new_pc_offset(pc_offset);
 
   assert(_recording_state == rs_null, "nesting of recording calls");
-  debug_only(_recording_state = rs_safepoint);
+  DEBUG_ONLY(_recording_state = rs_safepoint);
 }
 
 void DebugInformationRecorder::add_non_safepoint(int pc_offset) {
@@ -169,7 +169,7 @@ void DebugInformationRecorder::add_non_safepoint(int pc_offset) {
   add_new_pc_offset(pc_offset);
 
   assert(_recording_state == rs_null, "nesting of recording calls");
-  debug_only(_recording_state = rs_non_safepoint);
+  DEBUG_ONLY(_recording_state = rs_non_safepoint);
 }
 
 void DebugInformationRecorder::add_new_pc_offset(int pc_offset) {
@@ -360,7 +360,7 @@ void DebugInformationRecorder::dump_object_pool(GrowableArray<ScopeValue*>* obje
 void DebugInformationRecorder::end_scopes(int pc_offset, bool is_safepoint) {
   assert(_recording_state == (is_safepoint? rs_safepoint: rs_non_safepoint),
          "nesting of recording calls");
-  debug_only(_recording_state = rs_null);
+  DEBUG_ONLY(_recording_state = rs_null);
 
   // Try to compress away an equivalent non-safepoint predecessor.
   // (This only works because we have previously recognized redundant
@@ -413,13 +413,13 @@ DebugToken* DebugInformationRecorder::create_monitor_values(GrowableArray<Monito
 
 
 int DebugInformationRecorder::data_size() {
-  debug_only(mark_recorders_frozen());  // mark it "frozen" for asserts
+  DEBUG_ONLY(mark_recorders_frozen());  // mark it "frozen" for asserts
   return _stream->position();
 }
 
 
 int DebugInformationRecorder::pcs_size() {
-  debug_only(mark_recorders_frozen());  // mark it "frozen" for asserts
+  DEBUG_ONLY(mark_recorders_frozen());  // mark it "frozen" for asserts
   if (last_pc()->pc_offset() != PcDesc::upper_offset_limit)
     add_new_pc_offset(PcDesc::upper_offset_limit);
   return _pcs_length * sizeof(PcDesc);
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 56ba76a806e..4576a348a4f 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1122,7 +1122,7 @@ nmethod* nmethod::new_native_nmethod(const methodHandle& method,
 
   if (nm != nullptr) {
     // verify nmethod
-    debug_only(nm->verify();) // might block
+    DEBUG_ONLY(nm->verify();) // might block
 
     nm->log_new_nmethod();
   }
@@ -1269,7 +1269,7 @@ void nmethod::post_init() {
   finalize_relocations();
 
   Universe::heap()->register_nmethod(this);
-  debug_only(Universe::heap()->verify_nmethod(this));
+  DEBUG_ONLY(Universe::heap()->verify_nmethod(this));
 
   CodeCache::commit(this);
 }
@@ -1296,7 +1296,7 @@ nmethod::nmethod(
   _native_basic_lock_sp_offset(basic_lock_sp_offset)
 {
   {
-    debug_only(NoSafepointVerifier nsv;)
+    DEBUG_ONLY(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
     init_defaults(code_buffer, offsets);
@@ -1437,7 +1437,7 @@ nmethod::nmethod(
 {
   assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR");
   {
-    debug_only(NoSafepointVerifier nsv;)
+    DEBUG_ONLY(NoSafepointVerifier nsv;)
     assert_locked_or_safepoint(CodeCache_lock);
 
     init_defaults(code_buffer, offsets);
@@ -2802,7 +2802,7 @@ PcDesc* PcDescContainer::find_pc_desc_internal(address pc, bool approximate, add
   }
 
   // Take giant steps at first (4096, then 256, then 16, then 1)
-  const int LOG2_RADIX = 4 /*smaller steps in debug mode:*/ debug_only(-1);
+  const int LOG2_RADIX = 4 /*smaller steps in debug mode:*/ DEBUG_ONLY(-1);
   const int RADIX = (1 << LOG2_RADIX);
   for (int step = (1 << (LOG2_RADIX*3)); step > 1; step >>= LOG2_RADIX) {
     while ((mid = lower + step) < upper) {
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 7b19cf75a76..1c536a5d7e1 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -100,7 +100,7 @@ class PcDescCache {
   typedef PcDesc* PcDescPtr;
   volatile PcDescPtr _pc_descs[cache_size]; // last cache_size pc_descs found
  public:
-  PcDescCache() { debug_only(_pc_descs[0] = nullptr); }
+  PcDescCache() { DEBUG_ONLY(_pc_descs[0] = nullptr); }
   void    init_to(PcDesc* initial_pc_desc);
   PcDesc* find_pc_desc(int pc_offset, bool approximate);
   void    add_pc_desc(PcDesc* pc_desc);
diff --git a/src/hotspot/share/code/oopRecorder.cpp b/src/hotspot/share/code/oopRecorder.cpp
index af23bf12b43..c37651892cc 100644
--- a/src/hotspot/share/code/oopRecorder.cpp
+++ b/src/hotspot/share/code/oopRecorder.cpp
@@ -122,7 +122,7 @@ template <class T> int ValueRecorder<T>::add_handle(T h, bool make_findable) {
 
 
 template <class T> int ValueRecorder<T>::maybe_find_index(T h) {
-  debug_only(_find_index_calls++);
+  DEBUG_ONLY(_find_index_calls++);
   assert(!_complete, "cannot allocate more elements after size query");
   maybe_initialize();
   if (h == nullptr)  return null_index;
@@ -134,7 +134,7 @@ template <class T> int ValueRecorder<T>::maybe_find_index(T h) {
       return -1;   // We know this handle is completely new.
     }
     if (cindex >= first_index && _handles->at(cindex - first_index) == h) {
-      debug_only(_hit_indexes++);
+      DEBUG_ONLY(_hit_indexes++);
       return cindex;
     }
     if (!_indexes->cache_location_collision(cloc)) {
@@ -151,7 +151,7 @@ template <class T> int ValueRecorder<T>::maybe_find_index(T h) {
       if (cloc != nullptr) {
         _indexes->set_cache_location_index(cloc, findex);
       }
-      debug_only(_missed_indexes++);
+      DEBUG_ONLY(_missed_indexes++);
       return findex;
     }
   }
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index ad194c71bb2..a828a8356aa 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -78,7 +78,7 @@ relocInfo* relocInfo::finish_prefix(short* prefix_limit) {
   assert(prefix_limit >= p, "must be a valid span of data");
   int plen = checked_cast<int>(prefix_limit - p);
   if (plen == 0) {
-    debug_only(_value = 0xFFFF);
+    DEBUG_ONLY(_value = 0xFFFF);
     return this;                         // no data: remove self completely
   }
   if (plen == 1 && fits_into_immediate(p[0])) {
@@ -342,7 +342,7 @@ address Relocation::old_addr_for(address newa,
 
 address Relocation::new_addr_for(address olda,
                                  const CodeBuffer* src, CodeBuffer* dest) {
-  debug_only(const CodeBuffer* src0 = src);
+  DEBUG_ONLY(const CodeBuffer* src0 = src);
   int sect = CodeBuffer::SECT_NONE;
   // Look for olda in the source buffer, and all previous incarnations
   // if the source buffer has been expanded.
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index 25cca49e50b..a10f653bbb1 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -574,7 +574,7 @@ class RelocIterator : public StackObj {
 
   void set_has_current(bool b) {
     _datalen = !b ? -1 : 0;
-    debug_only(_data = nullptr);
+    DEBUG_ONLY(_data = nullptr);
   }
   void set_current(relocInfo& ri) {
     _current = &ri;
diff --git a/src/hotspot/share/code/stubs.cpp b/src/hotspot/share/code/stubs.cpp
index 074241ff611..6ae71f93709 100644
--- a/src/hotspot/share/code/stubs.cpp
+++ b/src/hotspot/share/code/stubs.cpp
@@ -176,14 +176,14 @@ void StubQueue::commit(int committed_code_size) {
   _queue_end += committed_size;
   _number_of_stubs++;
   if (_mutex != nullptr) _mutex->unlock();
-  debug_only(stub_verify(s);)
+  DEBUG_ONLY(stub_verify(s);)
 }
 
 
 void StubQueue::remove_first() {
   if (number_of_stubs() == 0) return;
   Stub* s = first();
-  debug_only(stub_verify(s);)
+  DEBUG_ONLY(stub_verify(s);)
   stub_finalize(s);
   _queue_begin += stub_size(s);
   assert(_queue_begin <= _buffer_limit, "sanity check");
@@ -210,7 +210,7 @@ void StubQueue::remove_first(int n) {
 
 
 void StubQueue::remove_all(){
-  debug_only(verify();)
+  DEBUG_ONLY(verify();)
   remove_first(number_of_stubs());
   assert(number_of_stubs() == 0, "sanity check");
 }
diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index ea2c770d66f..88249fc8555 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -326,7 +326,7 @@ void OopMap::set_xxx(VMReg reg, OopMapValue::oop_types x, VMReg optional) {
 
   assert(reg->value() < _locs_length, "too big reg value for stack size");
   assert( _locs_used[reg->value()] == OopMapValue::unused_value, "cannot insert twice" );
-  debug_only( _locs_used[reg->value()] = x; )
+  DEBUG_ONLY( _locs_used[reg->value()] = x; )
 
   OopMapValue o(reg, x, optional);
   o.write_on(write_stream());
@@ -511,7 +511,7 @@ void ImmutableOopMap::update_register_map(const frame *fr, RegisterMap *reg_map)
   // Any reg might be saved by a safepoint handler (see generate_handler_blob).
   assert( reg_map->_update_for_id == nullptr || fr->is_older(reg_map->_update_for_id),
          "already updated this map; do not 'update' it twice!" );
-  debug_only(reg_map->_update_for_id = fr->id());
+  DEBUG_ONLY(reg_map->_update_for_id = fr->id());
 
   // Check if caller must update oop argument
   assert((reg_map->include_argument_oops() ||
diff --git a/src/hotspot/share/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp
index 634fb8b0bfa..191996f0f05 100644
--- a/src/hotspot/share/compiler/oopMap.hpp
+++ b/src/hotspot/share/compiler/oopMap.hpp
@@ -162,7 +162,7 @@ class OopMap: public ResourceObj {
   bool _has_derived_oops;
   CompressedWriteStream* _write_stream;
 
-  debug_only( OopMapValue::oop_types* _locs_used; int _locs_length;)
+  DEBUG_ONLY( OopMapValue::oop_types* _locs_used; int _locs_length;)
 
   // Accessors
   int omv_count() const                       { return _omv_count; }
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp
index e8d94b28d18..d2c91b302b5 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.cpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp
@@ -121,7 +121,7 @@ void ObjectStartArray::update_for_block_work(HeapWord* blk_start,
     assert(start_entry_for_region > end_entry, "Sanity check");
   }
 
-  debug_only(verify_for_block(blk_start, blk_end);)
+  DEBUG_ONLY(verify_for_block(blk_start, blk_end);)
 }
 
 void ObjectStartArray::verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const {
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index e63ff686312..911384c23bf 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1629,7 +1629,7 @@ void PSParallelCompact::forward_to_new_addr() {
   } task(nworkers);
 
   ParallelScavengeHeap::heap()->workers().run_task(&task);
-  debug_only(verify_forward();)
+  DEBUG_ONLY(verify_forward();)
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.cpp b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
index e3ed819ceb1..a6612d5cd2d 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.cpp
@@ -45,7 +45,7 @@ void PSPromotionLAB::initialize(MemRegion lab) {
   // We can be initialized to a zero size!
   if (free() > 0) {
     if (ZapUnusedHeapArea) {
-      debug_only(Copy::fill_to_words(top(), free()/HeapWordSize, badHeapWord));
+      DEBUG_ONLY(Copy::fill_to_words(top(), free()/HeapWordSize, badHeapWord));
     }
 
     // NOTE! We need to allow space for a filler object.
diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
index e8e42d3754b..60bd4ec250a 100644
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp
@@ -55,7 +55,7 @@ class PSPromotionLAB : public CHeapObj<mtGC> {
   void set_end(HeapWord* value)    { _end = value; }
 
   // The shared initialize code invokes this.
-  debug_only(virtual bool lab_is_valid(MemRegion lab) { return false; });
+  DEBUG_ONLY(virtual bool lab_is_valid(MemRegion lab) { return false; });
 
   PSPromotionLAB() : _top(nullptr), _bottom(nullptr), _end(nullptr), _state(zero_size) { }
 
@@ -95,7 +95,7 @@ class PSYoungPromotionLAB : public PSPromotionLAB {
   // Not MT safe
   inline HeapWord* allocate(size_t size);
 
-  debug_only(virtual bool lab_is_valid(MemRegion lab);)
+  DEBUG_ONLY(virtual bool lab_is_valid(MemRegion lab);)
 };
 
 class PSOldPromotionLAB : public PSPromotionLAB {
@@ -127,7 +127,7 @@ class PSOldPromotionLAB : public PSPromotionLAB {
     return nullptr;
   }
 
-  debug_only(virtual bool lab_is_valid(MemRegion lab));
+  DEBUG_ONLY(virtual bool lab_is_valid(MemRegion lab));
 };
 
 #endif // SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
index 5baad7f995a..afaf1aba538 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
@@ -155,7 +155,7 @@ void SerialBlockOffsetTable::update_for_block_work(HeapWord* blk_start,
     assert(start_card_for_region > end_card, "Sanity check");
   }
 
-  debug_only(verify_for_block(blk_start, blk_end);)
+  DEBUG_ONLY(verify_for_block(blk_start, blk_end);)
 }
 
 HeapWord* SerialBlockOffsetTable::block_start_reaching_into_card(const void* addr) const {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 439563a4b62..8bf47d6b0bb 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -179,7 +179,7 @@ class CollectedHeap : public CHeapObj<mtGC> {
   virtual void trace_heap(GCWhen::Type when, const GCTracer* tracer);
 
   // Verification functions
-  debug_only(static void check_for_valid_allocation_state();)
+  DEBUG_ONLY(static void check_for_valid_allocation_state();)
 
  public:
   enum Name {
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.cpp b/src/hotspot/share/gc/shared/hSpaceCounters.cpp
index de5dd2912a5..818d7422fba 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.cpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.cpp
@@ -82,7 +82,7 @@ void HSpaceCounters::update_all(size_t capacity, size_t used) {
   update_used(used);
 }
 
-debug_only(
+DEBUG_ONLY(
   // for security reasons, we do not allow arbitrary reads from
   // the counters as they may live in shared memory.
   jlong HSpaceCounters::used() {
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.hpp b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
index 63aabf1479b..01310e456f6 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
@@ -56,7 +56,7 @@ class HSpaceCounters: public CHeapObj<mtGC> {
 
   void update_all(size_t capacity, size_t used);
 
-  debug_only(
+  DEBUG_ONLY(
     // for security reasons, we do not allow arbitrary reads from
     // the counters as they may live in shared memory.
     jlong used();
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 74ef1f66184..09ac5d25f86 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -145,7 +145,7 @@ void MemAllocator::Allocation::verify_before() {
   // not take out a lock if from tlab, so clear here.
   JavaThread* THREAD = _thread; // For exception macros.
   assert(!HAS_PENDING_EXCEPTION, "Should not allocate with exception pending");
-  debug_only(check_for_valid_allocation_state());
+  DEBUG_ONLY(check_for_valid_allocation_state());
   assert(!Universe::heap()->is_stw_gc_active(), "Allocation during GC pause not allowed");
 }
 
@@ -327,7 +327,7 @@ HeapWord* MemAllocator::mem_allocate(Allocation& allocation) const {
   }
 
   // Allocation of an oop can always invoke a safepoint.
-  debug_only(allocation._thread->check_for_valid_safepoint_state());
+  DEBUG_ONLY(allocation._thread->check_for_valid_safepoint_state());
 
   if (UseTLAB) {
     // Try refilling the TLAB and allocating the object in it.
diff --git a/src/hotspot/share/gc/shared/scavengableNMethods.cpp b/src/hotspot/share/gc/shared/scavengableNMethods.cpp
index 0dff5526911..887ac5f43a2 100644
--- a/src/hotspot/share/gc/shared/scavengableNMethods.cpp
+++ b/src/hotspot/share/gc/shared/scavengableNMethods.cpp
@@ -131,13 +131,13 @@ bool ScavengableNMethods::has_scavengable_oops(nmethod* nm) {
 void ScavengableNMethods::nmethods_do_and_prune(NMethodToOopClosure* cl) {
   assert_locked_or_safepoint(CodeCache_lock);
 
-  debug_only(mark_on_list_nmethods());
+  DEBUG_ONLY(mark_on_list_nmethods());
 
   nmethod* prev = nullptr;
   nmethod* cur = _head;
   while (cur != nullptr) {
     ScavengableNMethodsData data = gc_data(cur);
-    debug_only(data.clear_marked());
+    DEBUG_ONLY(data.clear_marked());
     assert(data.on_list(), "else shouldn't be on this list");
 
     if (cl != nullptr) {
@@ -156,7 +156,7 @@ void ScavengableNMethods::nmethods_do_and_prune(NMethodToOopClosure* cl) {
   }
 
   // Check for stray marks.
-  debug_only(verify_nmethods());
+  DEBUG_ONLY(verify_nmethods());
 }
 
 void ScavengableNMethods::prune_nmethods_not_into_young() {
@@ -166,13 +166,13 @@ void ScavengableNMethods::prune_nmethods_not_into_young() {
 void ScavengableNMethods::prune_unlinked_nmethods() {
   assert_locked_or_safepoint(CodeCache_lock);
 
-  debug_only(mark_on_list_nmethods());
+  DEBUG_ONLY(mark_on_list_nmethods());
 
   nmethod* prev = nullptr;
   nmethod* cur = _head;
   while (cur != nullptr) {
     ScavengableNMethodsData data = gc_data(cur);
-    debug_only(data.clear_marked());
+    DEBUG_ONLY(data.clear_marked());
     assert(data.on_list(), "else shouldn't be on this list");
 
     nmethod* const next = data.next();
@@ -187,7 +187,7 @@ void ScavengableNMethods::prune_unlinked_nmethods() {
   }
 
   // Check for stray marks.
-  debug_only(verify_nmethods());
+  DEBUG_ONLY(verify_nmethods());
 }
 
 // Walk the list of methods which might contain oops to the java heap.
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index d71e84d33b0..f12b3dc5fa8 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -896,7 +896,7 @@ void ShenandoahBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCo
 
     uint gc_state_idx = Compile::AliasIdxRaw;
     const TypePtr* gc_state_adr_type = nullptr; // debug-mode-only argument
-    debug_only(gc_state_adr_type = phase->C->get_adr_type(gc_state_idx));
+    DEBUG_ONLY(gc_state_adr_type = phase->C->get_adr_type(gc_state_idx));
 
     Node* gc_state    = phase->transform_later(new LoadBNode(ctrl, mem, gc_state_addr, gc_state_adr_type, TypeInt::BYTE, MemNode::unordered));
     Node* stable_and  = phase->transform_later(new AndINode(gc_state, phase->igvn().intcon(ShenandoahHeap::HAS_FORWARDED)));
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index 1d353163463..25b900f8d77 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -190,11 +190,11 @@ void ShenandoahCollectionSet::print_on(outputStream* out) const {
                 byte_size_in_proper_unit(live()),    proper_unit_for_byte_size(live()),
                 byte_size_in_proper_unit(used()),    proper_unit_for_byte_size(used()));
 
-  debug_only(size_t regions = 0;)
+  DEBUG_ONLY(size_t regions = 0;)
   for (size_t index = 0; index < _heap->num_regions(); index ++) {
     if (is_in(index)) {
       _heap->get_region(index)->print_on(out);
-      debug_only(regions ++;)
+      DEBUG_ONLY(regions ++;)
     }
   }
   assert(regions == count(), "Must match");
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
index 342b599caf5..af661fd1dc4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
@@ -309,14 +309,14 @@ class ParallelClaimableQueueSet: public GenericTaskQueueSet<T, MT> {
   volatile jint     _claimed_index;
   shenandoah_padding(1);
 
-  debug_only(uint   _reserved;  )
+  DEBUG_ONLY(uint   _reserved;  )
 
 public:
   using GenericTaskQueueSet<T, MT>::size;
 
 public:
   ParallelClaimableQueueSet(int n) : GenericTaskQueueSet<T, MT>(n), _claimed_index(0) {
-    debug_only(_reserved = 0; )
+    DEBUG_ONLY(_reserved = 0; )
   }
 
   void clear_claimed() { _claimed_index = 0; }
@@ -326,10 +326,10 @@ class ParallelClaimableQueueSet: public GenericTaskQueueSet<T, MT> {
   void reserve(uint n) {
     assert(n <= size(), "Sanity");
     _claimed_index = (jint)n;
-    debug_only(_reserved = n;)
+    DEBUG_ONLY(_reserved = n;)
   }
 
-  debug_only(uint get_reserved() const { return (uint)_reserved; })
+  DEBUG_ONLY(uint get_reserved() const { return (uint)_reserved; })
 };
 
 template <class T, MemTag MT>
diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index 62ce860594b..e577ce42c1e 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -311,7 +311,7 @@ void OopMapCacheEntry::deallocate_bit_mask() {
     assert(!Thread::current()->resource_area()->contains((void*)_bit_mask[0]),
       "This bit mask should not be in the resource area");
     FREE_C_HEAP_ARRAY(uintptr_t, _bit_mask[0]);
-    debug_only(_bit_mask[0] = 0;)
+    DEBUG_ONLY(_bit_mask[0] = 0;)
   }
 }
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index 8dbc3d4fcea..7736d3f4565 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -504,7 +504,7 @@ void JfrCheckpointManager::begin_epoch_shift() {
 
 void JfrCheckpointManager::end_epoch_shift() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  debug_only(const u1 current_epoch = JfrTraceIdEpoch::current();)
+  DEBUG_ONLY(const u1 current_epoch = JfrTraceIdEpoch::current();)
   JfrTraceIdEpoch::end_epoch_shift();
   assert(current_epoch != JfrTraceIdEpoch::current(), "invariant");
   JfrStringPool::on_epoch_shift();
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
index a7a21f65944..ca54b297b38 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp
@@ -398,7 +398,7 @@ static void assert_flush_large_precondition(ConstBufferPtr cur, const u1* const
 #endif // ASSERT
 
 BufferPtr JfrStorage::flush(BufferPtr cur, size_t used, size_t req, bool native, Thread* t) {
-  debug_only(assert_flush_precondition(cur, used, native, t);)
+  DEBUG_ONLY(assert_flush_precondition(cur, used, native, t);)
   const u1* const cur_pos = cur->pos();
   req += used;
   // requested size now encompass the outstanding used size
@@ -407,7 +407,7 @@ BufferPtr JfrStorage::flush(BufferPtr cur, size_t used, size_t req, bool native,
 }
 
 BufferPtr JfrStorage::flush_regular(BufferPtr cur, const u1* const cur_pos, size_t used, size_t req, bool native, Thread* t) {
-  debug_only(assert_flush_regular_precondition(cur, cur_pos, used, req, t);)
+  DEBUG_ONLY(assert_flush_regular_precondition(cur, cur_pos, used, req, t);)
   // A flush is needed before memmove since a non-large buffer is thread stable
   // (thread local). The flush will not modify memory in addresses above pos()
   // which is where the "used / uncommitted" data resides. It is therefore both
@@ -450,7 +450,7 @@ static BufferPtr restore_shelved_buffer(bool native, Thread* t) {
 }
 
 BufferPtr JfrStorage::flush_large(BufferPtr cur, const u1* const cur_pos, size_t used, size_t req, bool native, Thread* t) {
-  debug_only(assert_flush_large_precondition(cur, cur_pos, used, req, native, t);)
+  DEBUG_ONLY(assert_flush_large_precondition(cur, cur_pos, used, req, native, t);)
   // Can the "regular" buffer (now shelved) accommodate the requested size?
   BufferPtr shelved = t->jfr_thread_local()->shelved_buffer();
   assert(shelved != nullptr, "invariant");
@@ -480,7 +480,7 @@ static BufferPtr large_fail(BufferPtr cur, bool native, JfrStorage& storage_inst
 // even though it might be smaller than the requested size.
 // Caller needs to ensure if the size was successfully accommodated.
 BufferPtr JfrStorage::provision_large(BufferPtr cur, const u1* const cur_pos, size_t used, size_t req, bool native, Thread* t) {
-  debug_only(assert_provision_large_precondition(cur, used, req, t);)
+  DEBUG_ONLY(assert_provision_large_precondition(cur, used, req, t);)
   assert(t->jfr_thread_local()->shelved_buffer() != nullptr, "invariant");
   BufferPtr const buffer = acquire_large(req, t);
   if (buffer == nullptr) {
diff --git a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
index f97838c7869..faf0baf2bcb 100644
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
@@ -83,7 +83,7 @@ static void hook_memory_allocation(const char* allocation, size_t alloc_size) {
       vm_exit_out_of_memory(alloc_size, OOM_MALLOC_ERROR, "AllocateHeap");
     }
   }
-  debug_only(add(alloc_size));
+  DEBUG_ONLY(add(alloc_size));
 }
 
 void JfrCHeapObj::on_memory_allocation(const void* allocation, size_t size) {
@@ -111,12 +111,12 @@ void* JfrCHeapObj::operator new [](size_t size, const std::nothrow_t&  nothrow_c
 }
 
 void JfrCHeapObj::operator delete(void* p, size_t size) {
-  debug_only(hook_memory_deallocation(size);)
+  DEBUG_ONLY(hook_memory_deallocation(size);)
   CHeapObj<mtTracing>::operator delete(p);
 }
 
 void JfrCHeapObj::operator delete[](void* p, size_t size) {
-  debug_only(hook_memory_deallocation(size);)
+  DEBUG_ONLY(hook_memory_deallocation(size);)
   CHeapObj<mtTracing>::operator delete[](p);
 }
 
@@ -127,7 +127,7 @@ char* JfrCHeapObj::realloc_array(char* old, size_t size) {
 }
 
 void JfrCHeapObj::free(void* p, size_t size) {
-  debug_only(hook_memory_deallocation(size);)
+  DEBUG_ONLY(hook_memory_deallocation(size);)
   FreeHeap(p);
 }
 
diff --git a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
index 4e66af7f478..814f15017e0 100644
--- a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
@@ -205,7 +205,7 @@ void JfrDoublyLinkedList<T>::append_list(T* const head_node, T* const tail_node,
   }
   *lt = tail_node;
   const T* node = head_node;
-  debug_only(validate_count_param(node, count);)
+  DEBUG_ONLY(validate_count_param(node, count);)
     _count += count;
   assert(tail() == tail_node, "invariant");
   assert(in_list(tail_node), "not in list error");
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
index ad47c954fd7..af87f2bc5fb 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
@@ -45,7 +45,7 @@ class ExclusiveAccessAssert {
 
 template <typename Adapter, typename AP, typename AccessAssert = ExclusiveAccessAssert>
 class MemoryWriterHost : public StorageHost<Adapter, AP> {
-  debug_only(AccessAssert _access;)
+  DEBUG_ONLY(AccessAssert _access;)
  public:
   typedef typename Adapter::StorageType StorageType;
  protected:
@@ -53,7 +53,7 @@ class MemoryWriterHost : public StorageHost<Adapter, AP> {
   MemoryWriterHost(StorageType* storage, Thread* thread);
   MemoryWriterHost(StorageType* storage, size_t size);
   MemoryWriterHost(Thread* thread);
-  debug_only(bool is_acquired() const;)
+  DEBUG_ONLY(bool is_acquired() const;)
  public:
   void acquire();
   void release();
diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
index 55229e5d732..ad16b7abde3 100644
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
@@ -52,18 +52,18 @@ inline MemoryWriterHost<Adapter, AP, AccessAssert>::MemoryWriterHost(Thread* thr
 
 template <typename Adapter, typename AP, typename AccessAssert>
 inline void MemoryWriterHost<Adapter, AP, AccessAssert>::acquire() {
-  debug_only(_access.acquire();)
+  DEBUG_ONLY(_access.acquire();)
   if (!this->is_valid()) {
     this->flush();
   }
-  debug_only(is_acquired();)
+  DEBUG_ONLY(is_acquired();)
 }
 
 template <typename Adapter, typename AP, typename AccessAssert>
 inline void MemoryWriterHost<Adapter, AP, AccessAssert>::release() {
-  debug_only(is_acquired();)
+  DEBUG_ONLY(is_acquired();)
   StorageHost<Adapter, AP>::release();
-  debug_only(_access.release();)
+  DEBUG_ONLY(_access.release();)
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index cffac62c1c8..a4a8f3bb1d0 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -173,7 +173,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
   ThreadInVMfromNative __tiv(thread);                             \
   HandleMarkCleaner __hm(thread);                                 \
   JavaThread* THREAD = thread;                                    \
-  debug_only(VMNativeEntryWrapper __vew;)
+  DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
 // Native method block that transitions current thread to '_thread_in_vm'.
 // Note: CompilerThreadCanCallJava must precede JVMCIENV_FROM_JNI so that
diff --git a/src/hotspot/share/logging/logConfiguration.cpp b/src/hotspot/share/logging/logConfiguration.cpp
index 662c1f1c2bb..b883dbccacf 100644
--- a/src/hotspot/share/logging/logConfiguration.cpp
+++ b/src/hotspot/share/logging/logConfiguration.cpp
@@ -59,17 +59,17 @@ class ConfigurationLock : public StackObj {
  private:
   // Semaphore used as lock
   static Semaphore _semaphore;
-  debug_only(static intx _locking_thread_id;)
+  DEBUG_ONLY(static intx _locking_thread_id;)
  public:
   ConfigurationLock() {
     _semaphore.wait();
-    debug_only(_locking_thread_id = os::current_thread_id());
+    DEBUG_ONLY(_locking_thread_id = os::current_thread_id());
   }
   ~ConfigurationLock() {
-    debug_only(_locking_thread_id = -1);
+    DEBUG_ONLY(_locking_thread_id = -1);
     _semaphore.signal();
   }
-  debug_only(static bool current_thread_has_lock();)
+  DEBUG_ONLY(static bool current_thread_has_lock();)
 };
 
 Semaphore ConfigurationLock::_semaphore(1);
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index e846eb3ddde..156c96d621f 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -165,8 +165,8 @@ uintx Universe::_the_array_interfaces_bitmap = 0;
 uintx Universe::_the_empty_klass_bitmap      = 0;
 
 // These variables are guarded by FullGCALot_lock.
-debug_only(OopHandle Universe::_fullgc_alot_dummy_array;)
-debug_only(int Universe::_fullgc_alot_dummy_next = 0;)
+DEBUG_ONLY(OopHandle Universe::_fullgc_alot_dummy_array;)
+DEBUG_ONLY(int Universe::_fullgc_alot_dummy_next = 0;)
 
 // Heap
 int             Universe::_verify_count = 0;
diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
index 69f8642d6da..35c31330f08 100644
--- a/src/hotspot/share/memory/universe.hpp
+++ b/src/hotspot/share/memory/universe.hpp
@@ -117,8 +117,8 @@ class Universe: AllStatic {
   static intptr_t _non_oop_bits;
 
   // array of dummy objects used with +FullGCAlot
-  debug_only(static OopHandle   _fullgc_alot_dummy_array;)
-  debug_only(static int         _fullgc_alot_dummy_next;)
+  DEBUG_ONLY(static OopHandle   _fullgc_alot_dummy_array;)
+  DEBUG_ONLY(static int         _fullgc_alot_dummy_next;)
 
   // Compiler/dispatch support
   static int  _base_vtable_size;                      // Java vtbl size of klass Object (in words)
@@ -357,7 +357,7 @@ class Universe: AllStatic {
 
   // Change the number of dummy objects kept reachable by the full gc dummy
   // array; this should trigger relocation in a sliding compaction collector.
-  debug_only(static bool release_fullgc_alot_dummy();)
+  DEBUG_ONLY(static bool release_fullgc_alot_dummy();)
   // The non-oop pattern (see compiledIC.hpp, etc)
   static void*         non_oop_word();
   static bool contains_non_oop_word(void* p);
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index fa1de208804..2c2d629f032 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -200,7 +200,7 @@ static bool commit_expanded(char* start, size_t size, size_t alignment, bool pre
     return true;
   }
 
-  debug_only(warning(
+  DEBUG_ONLY(warning(
       "INFO: os::commit_memory(" PTR_FORMAT ", " PTR_FORMAT
       " size=%zu, executable=%d) failed",
       p2i(start), p2i(start + size), size, executable);)
@@ -371,7 +371,7 @@ void VirtualSpace::shrink_by(size_t size) {
            aligned_upper_new_high + upper_needs <= upper_high_boundary(),
            "must not shrink beyond region");
     if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable)) {
-      debug_only(warning("os::uncommit_memory failed"));
+      DEBUG_ONLY(warning("os::uncommit_memory failed"));
       return;
     } else {
       _upper_high -= upper_needs;
@@ -382,7 +382,7 @@ void VirtualSpace::shrink_by(size_t size) {
            aligned_middle_new_high + middle_needs <= middle_high_boundary(),
            "must not shrink beyond region");
     if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable)) {
-      debug_only(warning("os::uncommit_memory failed"));
+      DEBUG_ONLY(warning("os::uncommit_memory failed"));
       return;
     } else {
       _middle_high -= middle_needs;
@@ -393,7 +393,7 @@ void VirtualSpace::shrink_by(size_t size) {
            aligned_lower_new_high + lower_needs <= lower_high_boundary(),
            "must not shrink beyond region");
     if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable)) {
-      debug_only(warning("os::uncommit_memory failed"));
+      DEBUG_ONLY(warning("os::uncommit_memory failed"));
       return;
     } else {
       _lower_high -= lower_needs;
diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
index 6490a012e9a..83af4b88e32 100644
--- a/src/hotspot/share/oops/cpCache.hpp
+++ b/src/hotspot/share/oops/cpCache.hpp
@@ -76,7 +76,7 @@ class ConstantPoolCache: public MetaspaceObj {
   Array<ResolvedMethodEntry>* _resolved_method_entries;
 
   // Sizing
-  debug_only(friend class ClassVerifier;)
+  DEBUG_ONLY(friend class ClassVerifier;)
 
   public:
     // specific but defiinitions for ldc
diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp
index a3db976046d..a17d1ca4e37 100644
--- a/src/hotspot/share/oops/generateOopMap.cpp
+++ b/src/hotspot/share/oops/generateOopMap.cpp
@@ -2027,7 +2027,7 @@ void GenerateOopMap::ret_jump_targets_do(BytecodeStream *bcs, jmpFct_t jmpFct, i
     int target_bci = rtEnt->jsrs(i);
     // Make sure a jrtRet does not set the changed bit for dead basicblock.
     BasicBlock* jsr_bb    = get_basic_block_containing(target_bci - 1);
-    debug_only(BasicBlock* target_bb = &jsr_bb[1];)
+    DEBUG_ONLY(BasicBlock* target_bb = &jsr_bb[1];)
     assert(target_bb  == get_basic_block_at(target_bci), "wrong calc. of successor basicblock");
     bool alive = jsr_bb->is_alive();
     if (TraceNewOopMapGeneration) {
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 715c8f473d0..32445759491 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1321,7 +1321,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
   // Step 9
   if (!HAS_PENDING_EXCEPTION) {
     set_initialization_state_and_notify(fully_initialized, CHECK);
-    debug_only(vtable().verify(tty, true);)
+    DEBUG_ONLY(vtable().verify(tty, true);)
   }
   else {
     // Step 10 and 11
@@ -4191,7 +4191,7 @@ JNIid::JNIid(Klass* holder, int offset, JNIid* next) {
   _holder = holder;
   _offset = offset;
   _next = next;
-  debug_only(_is_static_field_id = false;)
+  DEBUG_ONLY(_is_static_field_id = false;)
 }
 
 
diff --git a/src/hotspot/share/oops/instanceRefKlass.cpp b/src/hotspot/share/oops/instanceRefKlass.cpp
index eb507495cf5..b8327492493 100644
--- a/src/hotspot/share/oops/instanceRefKlass.cpp
+++ b/src/hotspot/share/oops/instanceRefKlass.cpp
@@ -71,10 +71,10 @@ void InstanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
   InstanceKlass* ik = InstanceKlass::cast(k);
 
   // Check that we have the right class
-  debug_only(static bool first_time = true);
+  DEBUG_ONLY(static bool first_time = true);
   assert(k == vmClasses::Reference_klass() && first_time,
          "Invalid update of maps");
-  debug_only(first_time = false);
+  DEBUG_ONLY(first_time = false);
   assert(ik->nonstatic_oop_map_count() == 1, "just checking");
 
   OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index ac0e125ab4c..b0d2e84335e 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -678,7 +678,7 @@ void Klass::append_to_sibling_list() {
   if (Universe::is_fully_initialized()) {
     assert_locked_or_safepoint(Compile_lock);
   }
-  debug_only(verify();)
+  DEBUG_ONLY(verify();)
   // add ourselves to superklass' subklass list
   InstanceKlass* super = superklass();
   if (super == nullptr) return;     // special case: class Object
@@ -703,7 +703,7 @@ void Klass::append_to_sibling_list() {
       return;
     }
   }
-  debug_only(verify();)
+  DEBUG_ONLY(verify();)
 }
 
 void Klass::clean_subklass() {
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 0c4430b44c3..07f2c559604 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1256,7 +1256,7 @@ address Method::make_adapters(const methodHandle& mh, TRAPS) {
 // or adapter that it points to is still live and valid.
 // This function must not hit a safepoint!
 address Method::verified_code_entry() {
-  debug_only(NoSafepointVerifier nsv;)
+  DEBUG_ONLY(NoSafepointVerifier nsv;)
   assert(_from_compiled_entry != nullptr, "must be set");
   return _from_compiled_entry;
 }
diff --git a/src/hotspot/share/opto/block.cpp b/src/hotspot/share/opto/block.cpp
index 5d4ac471303..c33f656047d 100644
--- a/src/hotspot/share/opto/block.cpp
+++ b/src/hotspot/share/opto/block.cpp
@@ -42,7 +42,7 @@ void Block_Array::grow( uint i ) {
   if (i < Max()) {
     return; // No need to grow
   }
-  debug_only(_limit = i+1);
+  DEBUG_ONLY(_limit = i+1);
   if( i < _size )  return;
   if( !_size ) {
     _size = 1;
diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp
index 4ac6399d3a0..5baa72dfffb 100644
--- a/src/hotspot/share/opto/block.hpp
+++ b/src/hotspot/share/opto/block.hpp
@@ -48,7 +48,7 @@ struct Tarjan;
 // allocation I do not need a destructor to reclaim storage.
 class Block_Array : public ArenaObj {
   uint _size;                   // allocated size, as opposed to formal limit
-  debug_only(uint _limit;)      // limit to formal domain
+  DEBUG_ONLY(uint _limit;)      // limit to formal domain
   Arena *_arena;                // Arena to allocate in
   ReallocMark _nesting;         // Safety checks for arena reallocation
 protected:
@@ -57,7 +57,7 @@ class Block_Array : public ArenaObj {
 
 public:
   Block_Array(Arena *a) : _size(OptoBlockListSize), _arena(a) {
-    debug_only(_limit=0);
+    DEBUG_ONLY(_limit=0);
     _blocks = NEW_ARENA_ARRAY( a, Block *, OptoBlockListSize );
     for( int i = 0; i < OptoBlockListSize; i++ ) {
       _blocks[i] = nullptr;
@@ -69,7 +69,7 @@ class Block_Array : public ArenaObj {
   { assert( i < Max(), "oob" ); return _blocks[i]; }
   // Extend the mapping: index i maps to Block *n.
   void map( uint i, Block *n ) { grow(i); _blocks[i] = n; }
-  uint Max() const { debug_only(return _limit); return _size; }
+  uint Max() const { DEBUG_ONLY(return _limit); return _size; }
 };
 
 
diff --git a/src/hotspot/share/opto/buildOopMap.cpp b/src/hotspot/share/opto/buildOopMap.cpp
index f135df21114..675113163e8 100644
--- a/src/hotspot/share/opto/buildOopMap.cpp
+++ b/src/hotspot/share/opto/buildOopMap.cpp
@@ -191,7 +191,7 @@ void OopFlow::clone( OopFlow *flow, int max_size ) {
 OopFlow *OopFlow::make( Arena *A, int max_size, Compile* C ) {
   short *callees = NEW_ARENA_ARRAY(A,short,max_size+1);
   Node **defs    = NEW_ARENA_ARRAY(A,Node*,max_size+1);
-  debug_only( memset(defs,0,(max_size+1)*sizeof(Node*)) );
+  DEBUG_ONLY( memset(defs,0,(max_size+1)*sizeof(Node*)) );
   OopFlow *flow = new (A) OopFlow(callees+1, defs+1, C);
   assert( &flow->_callees[OptoReg::Bad] == callees, "Ok to index at OptoReg::Bad" );
   assert( &flow->_defs   [OptoReg::Bad] == defs   , "Ok to index at OptoReg::Bad" );
@@ -209,7 +209,7 @@ static void clr_live_bit( int *live, int reg ) {
 OopMap *OopFlow::build_oop_map( Node *n, int max_reg, PhaseRegAlloc *regalloc, int* live ) {
   int framesize = regalloc->_framesize;
   int max_inarg_slot = OptoReg::reg2stack(regalloc->_matcher._new_SP);
-  debug_only( char *dup_check = NEW_RESOURCE_ARRAY(char,OptoReg::stack0());
+  DEBUG_ONLY( char *dup_check = NEW_RESOURCE_ARRAY(char,OptoReg::stack0());
               memset(dup_check,0,OptoReg::stack0()) );
 
   OopMap *omap = new OopMap( framesize,  max_inarg_slot );
@@ -351,7 +351,7 @@ OopMap *OopFlow::build_oop_map( Node *n, int max_reg, PhaseRegAlloc *regalloc, i
     } else if( OptoReg::is_valid(_callees[reg])) { // callee-save?
       // It's a callee-save value
       assert( dup_check[_callees[reg]]==0, "trying to callee save same reg twice" );
-      debug_only( dup_check[_callees[reg]]=1; )
+      DEBUG_ONLY( dup_check[_callees[reg]]=1; )
       VMReg callee = OptoReg::as_VMReg(OptoReg::Name(_callees[reg]));
       omap->set_callee_saved(r, callee);
 
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index bb30dcb2976..3527e46c24b 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -266,8 +266,8 @@ JVMState::JVMState(ciMethod* method, JVMState* caller) :
   assert(method != nullptr, "must be valid call site");
   _bci = InvocationEntryBci;
   _reexecute = Reexecute_Undefined;
-  debug_only(_bci = -99);  // random garbage value
-  debug_only(_map = (SafePointNode*)-1);
+  DEBUG_ONLY(_bci = -99);  // random garbage value
+  DEBUG_ONLY(_map = (SafePointNode*)-1);
   _caller = caller;
   _depth  = 1 + (caller == nullptr ? 0 : caller->depth());
   _locoff = TypeFunc::Parms;
@@ -281,7 +281,7 @@ JVMState::JVMState(int stack_size) :
   _method(nullptr) {
   _bci = InvocationEntryBci;
   _reexecute = Reexecute_Undefined;
-  debug_only(_map = (SafePointNode*)-1);
+  DEBUG_ONLY(_map = (SafePointNode*)-1);
   _caller = nullptr;
   _depth  = 1;
   _locoff = TypeFunc::Parms;
@@ -323,14 +323,14 @@ bool JVMState::same_calls_as(const JVMState* that) const {
 
 //------------------------------debug_start------------------------------------
 uint JVMState::debug_start()  const {
-  debug_only(JVMState* jvmroot = of_depth(1));
+  DEBUG_ONLY(JVMState* jvmroot = of_depth(1));
   assert(jvmroot->locoff() <= this->locoff(), "youngest JVMState must be last");
   return of_depth(1)->locoff();
 }
 
 //-------------------------------debug_end-------------------------------------
 uint JVMState::debug_end() const {
-  debug_only(JVMState* jvmroot = of_depth(1));
+  DEBUG_ONLY(JVMState* jvmroot = of_depth(1));
   assert(jvmroot->endoff() <= this->endoff(), "youngest JVMState must be last");
   return endoff();
 }
@@ -1465,7 +1465,7 @@ void SafePointNode::push_monitor(const FastLockNode *lock) {
 
 void SafePointNode::pop_monitor() {
   // Delete last monitor from debug info
-  debug_only(int num_before_pop = jvms()->nof_monitors());
+  DEBUG_ONLY(int num_before_pop = jvms()->nof_monitors());
   const int MonitorEdges = 2;
   assert(JVMState::logMonitorEdges == exact_log2(MonitorEdges), "correct MonitorEdges");
   int scloff = jvms()->scloff();
diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index 4885d44a13d..92f6c938dba 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -2233,7 +2233,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     }
 
     // One unique input.
-    debug_only(Node* ident = Identity(phase));
+    DEBUG_ONLY(Node* ident = Identity(phase));
     // The unique input must eventually be detected by the Identity call.
 #ifdef ASSERT
     if (ident != uin && !ident->is_top() && !must_wait_for_region_in_irreducible_loop(phase)) {
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 11e1797d034..7832cbd42f8 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -1323,7 +1323,7 @@ void PhaseChaitin::Simplify( ) {
     bool bound = lrgs(lo_score)._is_bound;
 
     // Find cheapest guy
-    debug_only( int lo_no_simplify=0; );
+    DEBUG_ONLY( int lo_no_simplify=0; );
     for (uint i = _hi_degree; i; i = lrgs(i)._next) {
       assert(!_ifg->_yanked->test(i), "");
       // It's just vaguely possible to move hi-degree to lo-degree without
@@ -1335,7 +1335,7 @@ void PhaseChaitin::Simplify( ) {
         lo_score = i;
         break;
       }
-      debug_only( if( lrgs(i)._was_lo ) lo_no_simplify=i; );
+      DEBUG_ONLY( if( lrgs(i)._was_lo ) lo_no_simplify=i; );
       double iscore = lrgs(i).score();
       double iarea = lrgs(i)._area;
       double icost = lrgs(i)._cost;
@@ -1577,7 +1577,7 @@ uint PhaseChaitin::Select( ) {
 
     // Remove neighbor colors
     IndexSet *s = _ifg->neighbors(lidx);
-    debug_only(RegMask orig_mask = lrg->mask();)
+    DEBUG_ONLY(RegMask orig_mask = lrg->mask();)
 
     if (!s->is_empty()) {
       IndexSetIterator elements(s);
@@ -1706,8 +1706,8 @@ uint PhaseChaitin::Select( ) {
         ttyLocker ttyl;
         tty->print("L%d spilling with neighbors: ", lidx);
         s->dump();
-        debug_only(tty->print(" original mask: "));
-        debug_only(orig_mask.dump());
+        DEBUG_ONLY(tty->print(" original mask: "));
+        DEBUG_ONLY(orig_mask.dump());
         dump_lrg(lidx);
       }
 #endif
diff --git a/src/hotspot/share/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp
index 4b74420f996..cc3d3479c81 100644
--- a/src/hotspot/share/opto/chaitin.hpp
+++ b/src/hotspot/share/opto/chaitin.hpp
@@ -82,11 +82,11 @@ class LRG : public ResourceObj {
   // set makes it not valid.
   void set_degree( uint degree ) {
     _eff_degree = degree;
-    debug_only(_degree_valid = 1;)
+    DEBUG_ONLY(_degree_valid = 1;)
     assert(!_mask.is_AllStack() || (_mask.is_AllStack() && lo_degree()), "_eff_degree can't be bigger than AllStack_size - _num_regs if the mask supports stack registers");
   }
   // Made a change that hammered degree
-  void invalid_degree() { debug_only(_degree_valid=0;) }
+  void invalid_degree() { DEBUG_ONLY(_degree_valid=0;) }
   // Incrementally modify degree.  If it was correct, it should remain correct
   void inc_degree( uint mod ) {
     _eff_degree += mod;
@@ -128,15 +128,15 @@ class LRG : public ResourceObj {
   // count of bits in the current mask.
   int get_invalid_mask_size() const { return _mask_size; }
   const RegMask &mask() const { return _mask; }
-  void set_mask( const RegMask &rm ) { _mask = rm; debug_only(_msize_valid=0;)}
-  void AND( const RegMask &rm ) { _mask.AND(rm); debug_only(_msize_valid=0;)}
-  void SUBTRACT( const RegMask &rm ) { _mask.SUBTRACT(rm); debug_only(_msize_valid=0;)}
-  void Clear()   { _mask.Clear()  ; debug_only(_msize_valid=1); _mask_size = 0; }
-  void Set_All() { _mask.Set_All(); debug_only(_msize_valid=1); _mask_size = RegMask::CHUNK_SIZE; }
-
-  void Insert( OptoReg::Name reg ) { _mask.Insert(reg);  debug_only(_msize_valid=0;) }
-  void Remove( OptoReg::Name reg ) { _mask.Remove(reg);  debug_only(_msize_valid=0;) }
-  void clear_to_sets()  { _mask.clear_to_sets(_num_regs); debug_only(_msize_valid=0;) }
+  void set_mask( const RegMask &rm ) { _mask = rm; DEBUG_ONLY(_msize_valid=0;)}
+  void AND( const RegMask &rm ) { _mask.AND(rm); DEBUG_ONLY(_msize_valid=0;)}
+  void SUBTRACT( const RegMask &rm ) { _mask.SUBTRACT(rm); DEBUG_ONLY(_msize_valid=0;)}
+  void Clear()   { _mask.Clear()  ; DEBUG_ONLY(_msize_valid=1); _mask_size = 0; }
+  void Set_All() { _mask.Set_All(); DEBUG_ONLY(_msize_valid=1); _mask_size = RegMask::CHUNK_SIZE; }
+
+  void Insert( OptoReg::Name reg ) { _mask.Insert(reg);  DEBUG_ONLY(_msize_valid=0;) }
+  void Remove( OptoReg::Name reg ) { _mask.Remove(reg);  DEBUG_ONLY(_msize_valid=0;) }
+  void clear_to_sets()  { _mask.clear_to_sets(_num_regs); DEBUG_ONLY(_msize_valid=0;) }
 
 private:
   // Number of registers this live range uses when it colors
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index e4e82cbddab..effc7e21354 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -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*/, root_and_safepoints);)
+  DEBUG_ONLY(verify_graph_edges(true /*check for no_dead_code*/, root_and_safepoints);)
 }
 
 // ============================================================================
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 1fb34e799b2..3a6a81f656e 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -4567,7 +4567,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
         }
       }
     } else {
-      debug_only(n->dump();)
+      DEBUG_ONLY(n->dump();)
       assert(false, "EA: unexpected node");
       continue;
     }
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index df9177a4938..20feca26ede 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -72,8 +72,8 @@ GraphKit::GraphKit()
 {
   _exceptions = nullptr;
   set_map(nullptr);
-  debug_only(_sp = -99);
-  debug_only(set_bci(-99));
+  DEBUG_ONLY(_sp = -99);
+  DEBUG_ONLY(set_bci(-99));
 }
 
 
@@ -196,7 +196,7 @@ bool GraphKit::has_exception_handler() {
 void GraphKit::set_saved_ex_oop(SafePointNode* ex_map, Node* ex_oop) {
   assert(!has_saved_ex_oop(ex_map), "clear ex-oop before setting again");
   ex_map->add_req(ex_oop);
-  debug_only(verify_exception_state(ex_map));
+  DEBUG_ONLY(verify_exception_state(ex_map));
 }
 
 inline static Node* common_saved_ex_oop(SafePointNode* ex_map, bool clear_it) {
@@ -296,7 +296,7 @@ JVMState* GraphKit::transfer_exceptions_into_jvms() {
       _map = clone_map();
       _map->set_next_exception(nullptr);
       clear_saved_ex_oop(_map);
-      debug_only(verify_map());
+      DEBUG_ONLY(verify_map());
     } else {
       // ...or created from scratch
       JVMState* jvms = new (C) JVMState(_method, nullptr);
@@ -672,7 +672,7 @@ ciInstance* GraphKit::builtin_throw_exception(Deoptimization::DeoptReason reason
 
 //----------------------------PreserveJVMState---------------------------------
 PreserveJVMState::PreserveJVMState(GraphKit* kit, bool clone_map) {
-  debug_only(kit->verify_map());
+  DEBUG_ONLY(kit->verify_map());
   _kit    = kit;
   _map    = kit->map();   // preserve the map
   _sp     = kit->sp();
@@ -780,7 +780,7 @@ void GraphKit::set_map_clone(SafePointNode* m) {
   _map = m;
   _map = clone_map();
   _map->set_next_exception(nullptr);
-  debug_only(verify_map());
+  DEBUG_ONLY(verify_map());
 }
 
 
@@ -1537,7 +1537,7 @@ Node* GraphKit::memory(uint alias_idx) {
 Node* GraphKit::reset_memory() {
   Node* mem = map()->memory();
   // do not use this node for any more parsing!
-  debug_only( map()->set_memory((Node*)nullptr) );
+  DEBUG_ONLY( map()->set_memory((Node*)nullptr) );
   return _gvn.transform( mem );
 }
 
@@ -1574,7 +1574,7 @@ Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
   int adr_idx = C->get_alias_index(_gvn.type(adr)->isa_ptr());
   assert(adr_idx != Compile::AliasIdxTop, "use other make_load factory" );
   const TypePtr* adr_type = nullptr; // debug-mode-only argument
-  debug_only(adr_type = C->get_adr_type(adr_idx));
+  DEBUG_ONLY(adr_type = C->get_adr_type(adr_idx));
   Node* mem = memory(adr_idx);
   Node* ld = LoadNode::make(_gvn, ctl, mem, adr, adr_type, t, bt, mo, control_dependency, require_atomic_access, unaligned, mismatched, unsafe, barrier_data);
   ld = _gvn.transform(ld);
@@ -1602,7 +1602,7 @@ Node* GraphKit::store_to_memory(Node* ctl, Node* adr, Node *val, BasicType bt,
   int adr_idx = C->get_alias_index(_gvn.type(adr)->isa_ptr());
   assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
   const TypePtr* adr_type = nullptr;
-  debug_only(adr_type = C->get_adr_type(adr_idx));
+  DEBUG_ONLY(adr_type = C->get_adr_type(adr_idx));
   Node *mem = memory(adr_idx);
   Node* st = StoreNode::make(_gvn, ctl, mem, adr, adr_type, val, bt, mo, require_atomic_access);
   if (unaligned) {
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index d1b58526a6d..28773d75333 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -145,7 +145,7 @@ class GraphKit : public Phase {
                                         _sp = jvms->sp();
                                         _bci = jvms->bci();
                                         _method = jvms->has_method() ? jvms->method() : nullptr; }
-  void set_map(SafePointNode* m)      { _map = m; debug_only(verify_map()); }
+  void set_map(SafePointNode* m)      { _map = m; DEBUG_ONLY(verify_map()); }
   void set_sp(int sp)                 { assert(sp >= 0, "sp must be non-negative: %d", sp); _sp = sp; }
   void clean_stack(int from_sp); // clear garbage beyond from_sp to top
 
@@ -226,14 +226,14 @@ class GraphKit : public Phase {
     if (ex_map != nullptr) {
       _exceptions = ex_map->next_exception();
       ex_map->set_next_exception(nullptr);
-      debug_only(verify_exception_state(ex_map));
+      DEBUG_ONLY(verify_exception_state(ex_map));
     }
     return ex_map;
   }
 
   // Add an exception, using the given JVM state, without commoning.
   void push_exception_state(SafePointNode* ex_map) {
-    debug_only(verify_exception_state(ex_map));
+    DEBUG_ONLY(verify_exception_state(ex_map));
     ex_map->set_next_exception(_exceptions);
     _exceptions = ex_map;
   }
diff --git a/src/hotspot/share/opto/idealKit.cpp b/src/hotspot/share/opto/idealKit.cpp
index 8c26e1cc39d..dd7e9ae52b7 100644
--- a/src/hotspot/share/opto/idealKit.cpp
+++ b/src/hotspot/share/opto/idealKit.cpp
@@ -354,7 +354,7 @@ Node* IdealKit::load(Node* ctl,
 
   assert(adr_idx != Compile::AliasIdxTop, "use other make_load factory" );
   const TypePtr* adr_type = nullptr; // debug-mode-only argument
-  debug_only(adr_type = C->get_adr_type(adr_idx));
+  DEBUG_ONLY(adr_type = C->get_adr_type(adr_idx));
   Node* mem = memory(adr_idx);
   Node* ld = LoadNode::make(_gvn, ctl, mem, adr, adr_type, t, bt, mo, control_dependency, require_atomic_access);
   return transform(ld);
@@ -366,7 +366,7 @@ Node* IdealKit::store(Node* ctl, Node* adr, Node *val, BasicType bt,
                       bool mismatched) {
   assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory");
   const TypePtr* adr_type = nullptr;
-  debug_only(adr_type = C->get_adr_type(adr_idx));
+  DEBUG_ONLY(adr_type = C->get_adr_type(adr_idx));
   Node *mem = memory(adr_idx);
   Node* st = StoreNode::make(_gvn, ctl, mem, adr, adr_type, val, bt, mo, require_atomic_access);
   if (mismatched) {
diff --git a/src/hotspot/share/opto/indexSet.cpp b/src/hotspot/share/opto/indexSet.cpp
index 7f02f01c83f..367f5b78af2 100644
--- a/src/hotspot/share/opto/indexSet.cpp
+++ b/src/hotspot/share/opto/indexSet.cpp
@@ -121,7 +121,7 @@ IndexSet::BitBlock *IndexSet::alloc_block_containing(uint element) {
 // Add a BitBlock to the free list.
 
 void IndexSet::free_block(uint i) {
-  debug_only(check_watch("free block", i));
+  DEBUG_ONLY(check_watch("free block", i));
   assert(i < _max_blocks, "block index too large");
   BitBlock *block = _blocks[i];
   assert(block != &_empty_block, "cannot free the empty block");
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index c3f411eea94..195d48b37c6 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -359,7 +359,7 @@ void PhaseIdealLoop::insert_loop_limit_check_predicate(ParsePredicateSuccessProj
   // for this loop
   if (TraceLoopLimitCheck) {
     tty->print_cr("Counted Loop Limit Check generated:");
-    debug_only( bol->dump(2); )
+    DEBUG_ONLY( bol->dump(2); )
   }
 #endif
 }
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 1bd35f9dcc9..1fe59c9156b 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -225,7 +225,7 @@ static Node *scan_mem_chain(Node *mem, int alias_idx, int offset, Node *start_me
       if (!ClearArrayNode::step_through(&mem, alloc->_idx, phase)) {
         // Can not bypass initialization of the instance
         // we are looking.
-        debug_only(intptr_t offset;)
+        DEBUG_ONLY(intptr_t offset;)
         assert(alloc == AllocateNode::Ideal_allocation(mem->in(3), phase, offset), "sanity");
         InitializeNode* init = alloc->as_Allocate()->initialization();
         // We are looking for stored value, return Initialize node
@@ -1328,7 +1328,7 @@ void PhaseMacroExpand::expand_allocate_common(
     // No initial test, just fall into next case
     assert(allocation_has_use || !expand_fast_path, "Should already have been handled");
     toobig_false = ctrl;
-    debug_only(slow_region = NodeSentinel);
+    DEBUG_ONLY(slow_region = NodeSentinel);
   }
 
   // If we are here there are several possibilities
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index e34a43cc1e2..0849b40ad7e 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -128,7 +128,7 @@ Matcher::Matcher()
   idealreg2mhdebugmask[Op_RegFlags] = nullptr;
   idealreg2mhdebugmask[Op_RegVectMask] = nullptr;
 
-  debug_only(_mem_node = nullptr;)   // Ideal memory node consumed by mach node
+  DEBUG_ONLY(_mem_node = nullptr;)   // Ideal memory node consumed by mach node
 }
 
 //------------------------------warp_incoming_stk_arg------------------------
@@ -1184,7 +1184,7 @@ Node *Matcher::xform( Node *n, int max_stack ) {
                                                   n->_idx);
             C->set_node_notes_at(m->_idx, nn);
           }
-          debug_only(match_alias_type(C, n, m));
+          DEBUG_ONLY(match_alias_type(C, n, m));
         }
         n = m;    // n is now a new-space node
         mstack.set_node(n);
@@ -1591,7 +1591,7 @@ MachNode *Matcher::match_tree( const Node *n ) {
     }
   }
 
-  debug_only( _mem_node = save_mem_node; )
+  DEBUG_ONLY( _mem_node = save_mem_node; )
   return m;
 }
 
@@ -1965,9 +1965,9 @@ void Matcher::ReduceInst_Chain_Rule(State* s, int rule, Node* &mem, MachNode* ma
     assert(newrule >= _LAST_MACH_OPER, "Do NOT chain from internal operand");
     mach->_opnds[1] = s->MachOperGenerator(_reduceOp[catch_op]);
     Node *mem1 = (Node*)1;
-    debug_only(Node *save_mem_node = _mem_node;)
+    DEBUG_ONLY(Node *save_mem_node = _mem_node;)
     mach->add_req( ReduceInst(s, newrule, mem1) );
-    debug_only(_mem_node = save_mem_node;)
+    DEBUG_ONLY(_mem_node = save_mem_node;)
   }
   return;
 }
@@ -1979,7 +1979,7 @@ uint Matcher::ReduceInst_Interior( State *s, int rule, Node *&mem, MachNode *mac
   if( s->_leaf->is_Load() ) {
     Node *mem2 = s->_leaf->in(MemNode::Memory);
     assert( mem == (Node*)1 || mem == mem2, "multiple Memories being matched at once?" );
-    debug_only( if( mem == (Node*)1 ) _mem_node = s->_leaf;)
+    DEBUG_ONLY( if( mem == (Node*)1 ) _mem_node = s->_leaf;)
     mem = mem2;
   }
   if( s->_leaf->in(0) != nullptr && s->_leaf->req() > 1) {
@@ -2023,9 +2023,9 @@ uint Matcher::ReduceInst_Interior( State *s, int rule, Node *&mem, MachNode *mac
         //             --> ReduceInst( newrule )
         mach->_opnds[num_opnds++] = s->MachOperGenerator(_reduceOp[catch_op]);
         Node *mem1 = (Node*)1;
-        debug_only(Node *save_mem_node = _mem_node;)
+        DEBUG_ONLY(Node *save_mem_node = _mem_node;)
         mach->add_req( ReduceInst( newstate, newrule, mem1 ) );
-        debug_only(_mem_node = save_mem_node;)
+        DEBUG_ONLY(_mem_node = save_mem_node;)
       }
     }
     assert( mach->_opnds[num_opnds-1], "" );
@@ -2056,7 +2056,7 @@ void Matcher::ReduceOper( State *s, int rule, Node *&mem, MachNode *mach ) {
   if( s->_leaf->is_Load() ) {
     assert( mem == (Node*)1, "multiple Memories being matched at once?" );
     mem = s->_leaf->in(MemNode::Memory);
-    debug_only(_mem_node = s->_leaf;)
+    DEBUG_ONLY(_mem_node = s->_leaf;)
   }
 
   handle_precedence_edges(s->_leaf, mach);
@@ -2085,9 +2085,9 @@ void Matcher::ReduceOper( State *s, int rule, Node *&mem, MachNode *mach ) {
       // Reduce the instruction, and add a direct pointer from this
       // machine instruction to the newly reduced one.
       Node *mem1 = (Node*)1;
-      debug_only(Node *save_mem_node = _mem_node;)
+      DEBUG_ONLY(Node *save_mem_node = _mem_node;)
       mach->add_req( ReduceInst( kid, newrule, mem1 ) );
-      debug_only(_mem_node = save_mem_node;)
+      DEBUG_ONLY(_mem_node = save_mem_node;)
     }
   }
 }
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index 157cc1866a0..a751022f752 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -71,7 +71,7 @@ class MemNode : public Node {
       _unsafe_access(false),
       _barrier_data(0) {
     init_class_id(Class_Mem);
-    debug_only(_adr_type=at; adr_type();)
+    DEBUG_ONLY(_adr_type=at; adr_type();)
   }
   MemNode( Node *c0, Node *c1, Node *c2, const TypePtr* at, Node *c3 ) :
       Node(c0,c1,c2,c3),
@@ -80,7 +80,7 @@ class MemNode : public Node {
       _unsafe_access(false),
       _barrier_data(0) {
     init_class_id(Class_Mem);
-    debug_only(_adr_type=at; adr_type();)
+    DEBUG_ONLY(_adr_type=at; adr_type();)
   }
   MemNode( Node *c0, Node *c1, Node *c2, const TypePtr* at, Node *c3, Node *c4) :
       Node(c0,c1,c2,c3,c4),
@@ -89,7 +89,7 @@ class MemNode : public Node {
       _unsafe_access(false),
       _barrier_data(0) {
     init_class_id(Class_Mem);
-    debug_only(_adr_type=at; adr_type();)
+    DEBUG_ONLY(_adr_type=at; adr_type();)
   }
 
   virtual Node* find_previous_arraycopy(PhaseValues* phase, Node* ld_alloc, Node*& mem, bool can_see_stored_value) const { return nullptr; }
@@ -273,7 +273,7 @@ class LoadNode : public MemNode {
   // Following method is copied from TypeNode:
   void set_type(const Type* t) {
     assert(t != nullptr, "sanity");
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    DEBUG_ONLY(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
     *(const Type**)&_type = t;   // cast away const-ness
     // If this node is in the hash table, make sure it doesn't need a rehash.
     assert(check_hash == NO_HASH || check_hash == hash(), "type change must preserve hash code");
@@ -1497,7 +1497,7 @@ class MergeMemStream : public StackObj {
   MergeMemStream(MergeMemNode* mm) {
     mm->iteration_setup();
     init(mm);
-    debug_only(_cnt2 = 999);
+    DEBUG_ONLY(_cnt2 = 999);
   }
   // iterate in parallel over two merges
   // only iterates through non-empty elements of mm2
diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
index 25dad70a50a..dff2caed38d 100644
--- a/src/hotspot/share/opto/multnode.hpp
+++ b/src/hotspot/share/opto/multnode.hpp
@@ -71,7 +71,7 @@ class ProjNode : public Node {
     // Optimistic setting. Need additional checks in Node::is_dead_loop_safe().
     if (con != TypeFunc::Memory || src->is_Start())
       init_flags(Flag_is_dead_loop_safe);
-    debug_only(check_con());
+    DEBUG_ONLY(check_con());
   }
   const uint _con;              // The field in the tuple we are projecting
   const bool _is_io_use;        // Used to distinguish between the projections
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 76e19360910..a635abebec1 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -322,7 +322,7 @@ Node::Node(uint req)
 #endif
 {
   assert( req < Compile::current()->max_node_limit() - NodeLimitFudgeFactor, "Input limit exceeded" );
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   if (req == 0) {
     _in = nullptr;
@@ -341,7 +341,7 @@ Node::Node(Node *n0)
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   _in[0] = n0; if (n0 != nullptr) n0->add_out((Node *)this);
@@ -354,7 +354,7 @@ Node::Node(Node *n0, Node *n1)
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -369,7 +369,7 @@ Node::Node(Node *n0, Node *n1, Node *n2)
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -386,7 +386,7 @@ Node::Node(Node *n0, Node *n1, Node *n2, Node *n3)
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -405,7 +405,7 @@ Node::Node(Node *n0, Node *n1, Node *n2, Node *n3, Node *n4)
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -427,7 +427,7 @@ Node::Node(Node *n0, Node *n1, Node *n2, Node *n3,
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -451,7 +451,7 @@ Node::Node(Node *n0, Node *n1, Node *n2, Node *n3,
   , _parse_idx(_idx)
 #endif
 {
-  debug_only( verify_construction() );
+  DEBUG_ONLY( verify_construction() );
   NOT_PRODUCT(nodes_created++);
   assert( is_not_dead(n0), "can not use dead node");
   assert( is_not_dead(n1), "can not use dead node");
@@ -489,7 +489,7 @@ Node *Node::clone() const {
   n->_outcnt = 0;
   n->_outmax = 0;
   // Unlock this guy, since he is not in any hash table.
-  debug_only(n->_hash_lock = 0);
+  DEBUG_ONLY(n->_hash_lock = 0);
   // Walk the old node's input list to duplicate its edges
   uint i;
   for( i = 0; i < len(); i++ ) {
@@ -525,11 +525,11 @@ Node *Node::clone() const {
 
   n->set_idx(C->next_unique()); // Get new unique index as well
   NOT_PRODUCT(n->_igv_idx = C->next_igv_idx());
-  debug_only( n->verify_construction() );
+  DEBUG_ONLY( n->verify_construction() );
   NOT_PRODUCT(nodes_created++);
   // Do not patch over the debug_idx of a clone, because it makes it
   // impossible to break on the clone's moment of creation.
-  //debug_only( n->set_debug_idx( debug_idx() ) );
+  //DEBUG_ONLY( n->set_debug_idx( debug_idx() ) );
 
   C->copy_node_notes_to(n, (Node*) this);
 
@@ -942,7 +942,7 @@ void Node::disconnect_inputs(Compile* C) {
 #endif
 
   // Node::destruct requires all out edges be deleted first
-  // debug_only(destruct();)   // no reuse benefit expected
+  // DEBUG_ONLY(destruct();)   // no reuse benefit expected
   C->record_dead_node(_idx);
 }
 
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 1cb9009ef27..e1a4ee22661 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -427,11 +427,11 @@ class Node {
     assert(_outcnt > 0,"oob");
     #if OPTO_DU_ITERATOR_ASSERT
     // Record that a change happened here.
-    debug_only(_last_del = _out[i]; ++_del_tick);
+    DEBUG_ONLY(_last_del = _out[i]; ++_del_tick);
     #endif
     _out[i] = _out[--_outcnt];
     // Smash the old edge so it can't be used accidentally.
-    debug_only(_out[_outcnt] = (Node *)(uintptr_t)0xdeadbeef);
+    DEBUG_ONLY(_out[_outcnt] = (Node *)(uintptr_t)0xdeadbeef);
   }
 
 #ifdef ASSERT
@@ -533,10 +533,10 @@ class Node {
     } while (*--outp != n);
     *outp = _out[--_outcnt];
     // Smash the old edge so it can't be used accidentally.
-    debug_only(_out[_outcnt] = (Node *)(uintptr_t)0xdeadbeef);
+    DEBUG_ONLY(_out[_outcnt] = (Node *)(uintptr_t)0xdeadbeef);
     // Record that a change happened here.
     #if OPTO_DU_ITERATOR_ASSERT
-    debug_only(_last_del = n; ++_del_tick);
+    DEBUG_ONLY(_last_del = n; ++_del_tick);
     #endif
   }
   // Close gap after removing edge.
@@ -593,7 +593,7 @@ class Node {
   }
   // Swap input edge order.  (Edge indexes i1 and i2 are usually 1 and 2.)
   void swap_edges(uint i1, uint i2) {
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    DEBUG_ONLY(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
     // Def-Use info is unchanged
     Node* n1 = in(i1);
     Node* n2 = in(i2);
@@ -1431,15 +1431,15 @@ class DUIterator : public DUIterator_Common {
   #endif
 
   DUIterator(const Node* node, int dummy_to_avoid_conversion)
-    { _idx = 0;                         debug_only(sample(node)); }
+    { _idx = 0;                         DEBUG_ONLY(sample(node)); }
 
  public:
   // initialize to garbage; clear _vdui to disable asserts
   DUIterator()
-    { /*initialize to garbage*/         debug_only(_vdui = false); }
+    { /*initialize to garbage*/         DEBUG_ONLY(_vdui = false); }
 
   DUIterator(const DUIterator& that)
-    { _idx = that._idx;                 debug_only(_vdui = false; reset(that)); }
+    { _idx = that._idx;                 DEBUG_ONLY(_vdui = false; reset(that)); }
 
   void operator++(int dummy_to_specify_postfix_op)
     { _idx++;                           VDUI_ONLY(verify_increment()); }
@@ -1451,7 +1451,7 @@ class DUIterator : public DUIterator_Common {
     { VDUI_ONLY(verify_finish()); }
 
   void operator=(const DUIterator& that)
-    { _idx = that._idx;                 debug_only(reset(that)); }
+    { _idx = that._idx;                 DEBUG_ONLY(reset(that)); }
 };
 
 DUIterator Node::outs() const
@@ -1461,7 +1461,7 @@ DUIterator& Node::refresh_out_pos(DUIterator& i) const
 bool Node::has_out(DUIterator& i) const
   { I_VDUI_ONLY(i, i.verify(this,true));return i._idx < _outcnt; }
 Node*    Node::out(DUIterator& i) const
-  { I_VDUI_ONLY(i, i.verify(this));     return debug_only(i._last=) _out[i._idx]; }
+  { I_VDUI_ONLY(i, i.verify(this));     return DEBUG_ONLY(i._last=) _out[i._idx]; }
 
 
 // Faster DU iterator.  Disallows insertions into the out array.
@@ -1496,15 +1496,15 @@ class DUIterator_Fast : public DUIterator_Common {
 
   // Note:  offset must be signed, since -1 is sometimes passed
   DUIterator_Fast(const Node* node, ptrdiff_t offset)
-    { _outp = node->_out + offset;      debug_only(sample(node)); }
+    { _outp = node->_out + offset;      DEBUG_ONLY(sample(node)); }
 
  public:
   // initialize to garbage; clear _vdui to disable asserts
   DUIterator_Fast()
-    { /*initialize to garbage*/         debug_only(_vdui = false); }
+    { /*initialize to garbage*/         DEBUG_ONLY(_vdui = false); }
 
   DUIterator_Fast(const DUIterator_Fast& that)
-    { _outp = that._outp;               debug_only(_vdui = false; reset(that)); }
+    { _outp = that._outp;               DEBUG_ONLY(_vdui = false; reset(that)); }
 
   void operator++(int dummy_to_specify_postfix_op)
     { _outp++;                          VDUI_ONLY(verify(_node, true)); }
@@ -1522,7 +1522,7 @@ class DUIterator_Fast : public DUIterator_Common {
   }
 
   void operator=(const DUIterator_Fast& that)
-    { _outp = that._outp;               debug_only(reset(that)); }
+    { _outp = that._outp;               DEBUG_ONLY(reset(that)); }
 };
 
 DUIterator_Fast Node::fast_outs(DUIterator_Fast& imax) const {
@@ -1533,7 +1533,7 @@ DUIterator_Fast Node::fast_outs(DUIterator_Fast& imax) const {
 }
 Node* Node::fast_out(DUIterator_Fast& i) const {
   I_VDUI_ONLY(i, i.verify(this));
-  return debug_only(i._last=) *i._outp;
+  return DEBUG_ONLY(i._last=) *i._outp;
 }
 
 
@@ -1591,7 +1591,7 @@ DUIterator_Last Node::last_outs(DUIterator_Last& imin) const {
 }
 Node* Node::last_out(DUIterator_Last& i) const {
   I_VDUI_ONLY(i, i.verify(this));
-  return debug_only(i._last=) *i._outp;
+  return DEBUG_ONLY(i._last=) *i._outp;
 }
 
 #endif //OPTO_DU_ITERATOR_ASSERT
@@ -2035,7 +2035,7 @@ class TypeNode : public Node {
 public:
   void set_type(const Type* t) {
     assert(t != nullptr, "sanity");
-    debug_only(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
+    DEBUG_ONLY(uint check_hash = (VerifyHashTableKeys && _hash_lock) ? hash() : NO_HASH);
     *(const Type**)&_type = t;   // cast away const-ness
     // If this node is in the hash table, make sure it doesn't need a rehash.
     assert(check_hash == NO_HASH || check_hash == hash(), "type change must preserve hash code");
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 9fe5ad562b0..1cd6ebabc4b 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -2971,7 +2971,7 @@ void Scheduling::anti_do_def( Block *b, Node *def, OptoReg::Name def_reg, int is
   }
 
   Node *kill = def;             // Rename 'def' to more descriptive 'kill'
-  debug_only( def = (Node*)((intptr_t)0xdeadbeef); )
+  DEBUG_ONLY( def = (Node*)((intptr_t)0xdeadbeef); )
 
   // After some number of kills there _may_ be a later def
   Node *later_def = nullptr;
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index f7330d10df3..6fa0b0f497d 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -1835,10 +1835,10 @@ void Parse::merge_common(Parse::Block* target, int pnum) {
           // Now _gvn will join that with the meet of current inputs.
           // BOTTOM is never permissible here, 'cause pessimistically
           // Phis of pointers cannot lose the basic pointer type.
-          debug_only(const Type* bt1 = phi->bottom_type());
+          DEBUG_ONLY(const Type* bt1 = phi->bottom_type());
           assert(bt1 != Type::BOTTOM, "should not be building conflict phis");
           map()->set_req(j, _gvn.transform(phi));
-          debug_only(const Type* bt2 = phi->bottom_type());
+          DEBUG_ONLY(const Type* bt2 = phi->bottom_type());
           assert(bt2->higher_equal_speculative(bt1), "must be consistent with type-flow");
           record_for_igvn(phi);
         }
@@ -1936,7 +1936,7 @@ void Parse::ensure_phis_everywhere() {
   // Ensure a phi on all currently known memories.
   for (MergeMemStream mms(merged_memory()); mms.next_non_empty(); ) {
     ensure_memory_phi(mms.alias_idx());
-    debug_only(mms.set_memory());  // keep the iterator happy
+    DEBUG_ONLY(mms.set_memory());  // keep the iterator happy
   }
 
   // Note:  This is our only chance to create phis for memory slices.
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 9be15b153b3..82e5b3f9d85 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -123,7 +123,7 @@ Node *NodeHash::hash_find_insert( Node *n ) {
   if( !k ) {                    // ?Miss?
     NOT_PRODUCT( _lookup_misses++ );
     _table[key] = n;            // Insert into table!
-    debug_only(n->enter_hash_lock()); // Lock down the node while in the table.
+    DEBUG_ONLY(n->enter_hash_lock()); // Lock down the node while in the table.
     check_grow();               // Grow table if insert hit limit
     return nullptr;             // Miss!
   }
@@ -152,7 +152,7 @@ Node *NodeHash::hash_find_insert( Node *n ) {
       NOT_PRODUCT( _lookup_misses++ );
       key = (first_sentinel == 0) ? key : first_sentinel; // ?saw sentinel?
       _table[key] = n;          // Insert into table!
-      debug_only(n->enter_hash_lock()); // Lock down the node while in the table.
+      DEBUG_ONLY(n->enter_hash_lock()); // Lock down the node while in the table.
       check_grow();             // Grow table if insert hit limit
       return nullptr;           // Miss!
     }
@@ -188,7 +188,7 @@ void NodeHash::hash_insert( Node *n ) {
     key = (key + stride) & (_max-1); // Stride through table w/ relative prime
   }
   _table[key] = n;              // Insert into table!
-  debug_only(n->enter_hash_lock()); // Lock down the node while in the table.
+  DEBUG_ONLY(n->enter_hash_lock()); // Lock down the node while in the table.
   // if( conflict ) { n->dump(); }
 }
 
@@ -203,9 +203,9 @@ bool NodeHash::hash_delete( const Node *n ) {
   }
   uint key = hash & (_max-1);
   uint stride = key | 0x01;
-  debug_only( uint counter = 0; );
+  DEBUG_ONLY( uint counter = 0; );
   for( ; /* (k != nullptr) && (k != _sentinel) */; ) {
-    debug_only( counter++ );
+    DEBUG_ONLY( counter++ );
     NOT_PRODUCT( _delete_probes++ );
     k = _table[key];            // Get hashed value
     if( !k ) {                  // Miss?
@@ -215,7 +215,7 @@ bool NodeHash::hash_delete( const Node *n ) {
     else if( n == k ) {
       NOT_PRODUCT( _delete_hits++ );
       _table[key] = _sentinel;  // Hit! Label as deleted entry
-      debug_only(((Node*)n)->exit_hash_lock()); // Unlock the node upon removal from table.
+      DEBUG_ONLY(((Node*)n)->exit_hash_lock()); // Unlock the node upon removal from table.
       return true;
     }
     else {
@@ -257,7 +257,7 @@ void  NodeHash::grow() {
   for( uint i = 0; i < old_max; i++ ) {
     Node *m = *old_table++;
     if( !m || m == _sentinel ) continue;
-    debug_only(m->exit_hash_lock()); // Unlock the node upon removal from old table.
+    DEBUG_ONLY(m->exit_hash_lock()); // Unlock the node upon removal from old table.
     hash_insert(m);
   }
 }
@@ -289,7 +289,7 @@ void NodeHash::remove_useless_nodes(VectorSet &useful) {
   for( uint i = 0; i < max; ++i ) {
     Node *n = at(i);
     if(n != nullptr && n != sentinel_node && !useful.test(n->_idx)) {
-      debug_only(n->exit_hash_lock()); // Unlock the node when removed
+      DEBUG_ONLY(n->exit_hash_lock()); // Unlock the node when removed
       _table[i] = sentinel_node;       // Replace with placeholder
     }
   }
diff --git a/src/hotspot/share/opto/regalloc.hpp b/src/hotspot/share/opto/regalloc.hpp
index 86877e18325..c724406a168 100644
--- a/src/hotspot/share/opto/regalloc.hpp
+++ b/src/hotspot/share/opto/regalloc.hpp
@@ -60,12 +60,12 @@ class PhaseRegAlloc : public Phase {
 
   // Get the register associated with the Node
   OptoReg::Name get_reg_first( const Node *n ) const {
-    debug_only( if( n->_idx >= _node_regs_max_index ) n->dump(); );
+    DEBUG_ONLY( if( n->_idx >= _node_regs_max_index ) n->dump(); );
     assert( n->_idx < _node_regs_max_index, "Exceeded _node_regs array");
     return _node_regs[n->_idx].first();
   }
   OptoReg::Name get_reg_second( const Node *n ) const {
-    debug_only( if( n->_idx >= _node_regs_max_index ) n->dump(); );
+    DEBUG_ONLY( if( n->_idx >= _node_regs_max_index ) n->dump(); );
     assert( n->_idx < _node_regs_max_index, "Exceeded _node_regs array");
     return _node_regs[n->_idx].second();
   }
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 6d24fb26cd2..fcb0ac38ace 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -1944,7 +1944,7 @@ address OptoRuntime::handle_exception_C(JavaThread* current) {
 #ifndef PRODUCT
   SharedRuntime::_find_handler_ctr++;          // find exception handler
 #endif
-  debug_only(NoHandleMark __hm;)
+  DEBUG_ONLY(NoHandleMark __hm;)
   nmethod* nm = nullptr;
   address handler_address = nullptr;
   {
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index 4556555acea..163f94ee959 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -756,7 +756,7 @@ void Type::Initialize(Compile* current) {
 // delete the current Type and return the existing Type.  Otherwise stick the
 // current Type in the Type table.
 const Type *Type::hashcons(void) {
-  debug_only(base());           // Check the assertion in Type::base().
+  DEBUG_ONLY(base());           // Check the assertion in Type::base().
   // Look up the Type in the Type dictionary
   Dict *tdic = type_dict();
   Type* old = (Type*)(tdic->Insert(this, this, false));
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index d2916fad185..430d6997e77 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -215,7 +215,7 @@ intptr_t jfieldIDWorkaround::encode_klass_hash(Klass* k, int offset) {
       field_klass = super_klass;   // super contains the field also
       super_klass = field_klass->super();
     }
-    debug_only(NoSafepointVerifier nosafepoint;)
+    DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
     uintptr_t klass_hash = field_klass->identity_hash();
     return ((klass_hash & klass_mask) << klass_shift) | checked_mask_in_place;
   } else {
@@ -235,7 +235,7 @@ bool jfieldIDWorkaround::klass_hash_ok(Klass* k, jfieldID id) {
   uintptr_t as_uint = (uintptr_t) id;
   intptr_t klass_hash = (as_uint >> klass_shift) & klass_mask;
   do {
-    debug_only(NoSafepointVerifier nosafepoint;)
+    DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
     // Could use a non-blocking query for identity_hash here...
     if ((k->identity_hash() & klass_mask) == klass_hash)
       return true;
@@ -410,7 +410,7 @@ JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
     int offset = InstanceKlass::cast(k1)->field_offset( slot );
     JNIid* id = InstanceKlass::cast(k1)->jni_id_for(offset);
     assert(id != nullptr, "corrupt Field object");
-    debug_only(id->set_is_static_field_id();)
+    DEBUG_ONLY(id->set_is_static_field_id();)
     // A jfieldID for a static field is a JNIid specifying the field holder and the offset within the Klass*
     ret = jfieldIDWorkaround::to_static_jfieldID(id);
     return ret;
@@ -472,7 +472,7 @@ JNI_ENTRY(jclass, jni_GetSuperclass(JNIEnv *env, jclass sub))
   // return mirror for superclass
   Klass* super = k->java_super();
   // super2 is the value computed by the compiler's getSuperClass intrinsic:
-  debug_only(Klass* super2 = ( k->is_array_klass()
+  DEBUG_ONLY(Klass* super2 = ( k->is_array_klass()
                                  ? vmClasses::Object_klass()
                                  : k->super() ) );
   assert(super == super2,
@@ -906,7 +906,7 @@ static void jni_invoke_nonstatic(JNIEnv *env, JavaValue* result, jobject receive
         selected_method = m;
     } else if (!m->has_itable_index()) {
       // non-interface call -- for that little speed boost, don't handlize
-      debug_only(NoSafepointVerifier nosafepoint;)
+      DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
       // jni_GetMethodID makes sure class is linked and initialized
       // so m should have a valid vtable index.
       assert(m->valid_vtable_index(), "no valid vtable index");
@@ -1995,9 +1995,9 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
 
   // A jfieldID for a static field is a JNIid specifying the field holder and the offset within the Klass*
   JNIid* id = fd.field_holder()->jni_id_for(fd.offset());
-  debug_only(id->set_is_static_field_id();)
+  DEBUG_ONLY(id->set_is_static_field_id();)
 
-  debug_only(id->verify(fd.field_holder()));
+  DEBUG_ONLY(id->verify(fd.field_holder()));
 
   ret = jfieldIDWorkaround::to_static_jfieldID(id);
   return ret;
diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index aa158490eab..14d9c36c9fd 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -2320,7 +2320,7 @@ struct JNINativeInterface_* jni_functions_check() {
   // make sure the last pointer in the checked table is not null, indicating
   // an addition to the JNINativeInterface_ structure without initializing
   // it in the checked table.
-  debug_only(intptr_t *lastPtr = (intptr_t *)((char *)&checked_jni_NativeInterface + \
+  DEBUG_ONLY(intptr_t *lastPtr = (intptr_t *)((char *)&checked_jni_NativeInterface + \
              sizeof(*unchecked_jni_NativeInterface) - sizeof(char *));)
   assert(*lastPtr != 0,
          "Mismatched JNINativeInterface tables, check for new entries");
diff --git a/src/hotspot/share/prims/jvmtiEnter.xsl b/src/hotspot/share/prims/jvmtiEnter.xsl
index bbca1ccc6e1..d1274158be4 100644
--- a/src/hotspot/share/prims/jvmtiEnter.xsl
+++ b/src/hotspot/share/prims/jvmtiEnter.xsl
@@ -444,7 +444,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text>
     <xsl:apply-templates select="." mode="functionid"/>
     <xsl:text> , current_thread)</xsl:text>
     <xsl:value-of select="$space"/>
-    <xsl:text>debug_only(VMNativeEntryWrapper __vew;)</xsl:text>
+    <xsl:text>DEBUG_ONLY(VMNativeEntryWrapper __vew;)</xsl:text>
     <xsl:if test="count(@callbacksafe)=0 or not(contains(@callbacksafe,'safe'))">
       <xsl:value-of select="$space"/>
       <xsl:text>PreserveExceptionMark __em(this_thread);</xsl:text>
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 7a0c9a428c5..b2af12b08a6 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -199,7 +199,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread thread, void** data_ptr) {
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));
     ThreadInVMfromNative __tiv(current_thread);
     VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-    debug_only(VMNativeEntryWrapper __vew;)
+    DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
     JvmtiVTMSTransitionDisabler disabler(thread);
     ThreadsListHandle tlh(current_thread);
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 32dd6fc13e7..13822f73f77 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -384,7 +384,7 @@ JvmtiExport::get_jvmti_interface(JavaVM *jvm, void **penv, jint version) {
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));
     ThreadInVMfromNative __tiv(current_thread);
     VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-    debug_only(VMNativeEntryWrapper __vew;)
+    DEBUG_ONLY(VMNativeEntryWrapper __vew;)
 
     JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
     *penv = jvmti_env->jvmti_external();  // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index e9d496fc696..b4119825bd3 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -102,7 +102,7 @@ JvmtiThreadState::JvmtiThreadState(JavaThread* thread, oop thread_oop)
   {
     // The thread state list manipulation code must not have safepoints.
     // See periodic_clean_up().
-    debug_only(NoSafepointVerifier nosafepoint;)
+    DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
 
     _prev = nullptr;
     _next = _head;
@@ -154,7 +154,7 @@ JvmtiThreadState::~JvmtiThreadState()   {
   {
     // The thread state list manipulation code must not have safepoints.
     // See periodic_clean_up().
-    debug_only(NoSafepointVerifier nosafepoint;)
+    DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
 
     if (_prev == nullptr) {
       assert(_head == this, "sanity check");
@@ -759,7 +759,7 @@ void JvmtiThreadState::add_env(JvmtiEnvBase *env) {
   // add this environment thread state to the end of the list (order is important)
   {
     // list deallocation (which occurs at a safepoint) cannot occur simultaneously
-    debug_only(NoSafepointVerifier nosafepoint;)
+    DEBUG_ONLY(NoSafepointVerifier nosafepoint;)
 
     JvmtiEnvThreadStateIterator it(this);
     JvmtiEnvThreadState* previous_ets = nullptr;
diff --git a/src/hotspot/share/prims/perf.cpp b/src/hotspot/share/prims/perf.cpp
index f5f91e4614f..0b051bbc60f 100644
--- a/src/hotspot/share/prims/perf.cpp
+++ b/src/hotspot/share/prims/perf.cpp
@@ -111,7 +111,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
   char* name_utf = nullptr;
 
   if (units <= 0 || units > PerfData::U_Last) {
-    debug_only(warning("unexpected units argument, units = %d", units));
+    DEBUG_ONLY(warning("unexpected units argument, units = %d", units));
     THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
@@ -150,7 +150,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
     break;
 
   default: /* Illegal Argument */
-    debug_only(warning("unexpected variability value: %d", variability));
+    DEBUG_ONLY(warning("unexpected variability value: %d", variability));
     THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
     break;
   }
@@ -179,14 +179,14 @@ PERF_ENTRY(jobject, Perf_CreateByteArray(JNIEnv *env, jobject perf,
   // check for valid variability classification
   if (variability != PerfData::V_Constant &&
       variability != PerfData::V_Variable) {
-    debug_only(warning("unexpected variability value: %d", variability));
+    DEBUG_ONLY(warning("unexpected variability value: %d", variability));
     THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   // check for valid units
   if (units != PerfData::U_String) {
     // only String based ByteArray objects are currently supported
-    debug_only(warning("unexpected units value: %d", variability));
+    DEBUG_ONLY(warning("unexpected units value: %d", variability));
     THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
diff --git a/src/hotspot/share/prims/upcallLinker.cpp b/src/hotspot/share/prims/upcallLinker.cpp
index 911f0f3ad2c..bc6a56dab05 100644
--- a/src/hotspot/share/prims/upcallLinker.cpp
+++ b/src/hotspot/share/prims/upcallLinker.cpp
@@ -104,7 +104,7 @@ JavaThread* UpcallLinker::on_entry(UpcallStub::FrameData* context) {
   context->jfa.copy(thread->frame_anchor());
   thread->frame_anchor()->clear();
 
-  debug_only(thread->inc_java_call_counter());
+  DEBUG_ONLY(thread->inc_java_call_counter());
   thread->set_active_handles(context->new_handles);     // install new handle block and reset Java frame linkage
 
   return thread;
@@ -118,7 +118,7 @@ void UpcallLinker::on_exit(UpcallStub::FrameData* context) {
   // restore previous handle block
   thread->set_active_handles(context->old_handles);
 
-  debug_only(thread->dec_java_call_counter());
+  DEBUG_ONLY(thread->dec_java_call_counter());
 
   thread->frame_anchor()->copy(&context->jfa);
 
diff --git a/src/hotspot/share/runtime/handles.cpp b/src/hotspot/share/runtime/handles.cpp
index f747b4dc76e..cd3bd3eb3e0 100644
--- a/src/hotspot/share/runtime/handles.cpp
+++ b/src/hotspot/share/runtime/handles.cpp
@@ -133,7 +133,7 @@ void HandleMark::initialize(Thread* thread) {
   _hwm   = _area->_hwm;
   _max   = _area->_max;
   _size_in_bytes = _area->_size_in_bytes;
-  debug_only(_area->_handle_mark_nesting++);
+  DEBUG_ONLY(_area->_handle_mark_nesting++);
   assert(_area->_handle_mark_nesting > 0, "must stack allocate HandleMarks");
 
   // Link this in the thread
diff --git a/src/hotspot/share/runtime/handles.hpp b/src/hotspot/share/runtime/handles.hpp
index 8ed16d33a2f..d2020e34121 100644
--- a/src/hotspot/share/runtime/handles.hpp
+++ b/src/hotspot/share/runtime/handles.hpp
@@ -188,8 +188,8 @@ class HandleArea: public Arena {
  public:
   // Constructor
   HandleArea(MemTag mem_tag, HandleArea* prev) : Arena(mem_tag, Tag::tag_ha, Chunk::tiny_size) {
-    debug_only(_handle_mark_nesting    = 0);
-    debug_only(_no_handle_mark_nesting = 0);
+    DEBUG_ONLY(_handle_mark_nesting    = 0);
+    DEBUG_ONLY(_no_handle_mark_nesting = 0);
     _prev = prev;
   }
 
@@ -212,7 +212,7 @@ class HandleArea: public Arena {
   // Garbage collection support
   void oops_do(OopClosure* f);
 
-  debug_only(bool no_handle_mark_active() { return _no_handle_mark_nesting > 0; })
+  DEBUG_ONLY(bool no_handle_mark_active() { return _no_handle_mark_nesting > 0; })
 };
 
 
diff --git a/src/hotspot/share/runtime/handles.inline.hpp b/src/hotspot/share/runtime/handles.inline.hpp
index 669a940eca9..4d3dd527c0d 100644
--- a/src/hotspot/share/runtime/handles.inline.hpp
+++ b/src/hotspot/share/runtime/handles.inline.hpp
@@ -80,7 +80,7 @@ inline void HandleMark::push() {
   // This is intentionally a NOP. pop_and_restore will reset
   // values to the HandleMark further down the stack, typically
   // in JavaCalls::call_helper.
-  debug_only(_area->_handle_mark_nesting++);
+  DEBUG_ONLY(_area->_handle_mark_nesting++);
 }
 
 inline void HandleMark::pop_and_restore() {
@@ -95,7 +95,7 @@ inline void HandleMark::pop_and_restore() {
   _area->_chunk = _chunk;
   _area->_hwm = _hwm;
   _area->_max = _max;
-  debug_only(_area->_handle_mark_nesting--);
+  DEBUG_ONLY(_area->_handle_mark_nesting--);
 }
 
 inline HandleMarkCleaner::HandleMarkCleaner(Thread* thread) {
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index 403ff1d9ea2..c52c2664faa 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -259,12 +259,12 @@ class VMNativeEntryWrapper {
 // in the codecache.
 
 #define VM_LEAF_BASE(result_type, header)                            \
-  debug_only(NoHandleMark __hm;)                                     \
+  DEBUG_ONLY(NoHandleMark __hm;)                                     \
   os::verify_stack_alignment();                                      \
   /* begin of body */
 
 #define VM_ENTRY_BASE_FROM_LEAF(result_type, header, thread)         \
-  debug_only(ResetNoHandleMark __rnhm;)                              \
+  DEBUG_ONLY(ResetNoHandleMark __rnhm;)                              \
   HandleMarkCleaner __hm(thread);                                    \
   JavaThread* THREAD = thread; /* For exception macros. */           \
   os::verify_stack_alignment();                                      \
@@ -286,7 +286,7 @@ class VMNativeEntryWrapper {
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
     ThreadInVMfromJava __tiv(current);                               \
     VM_ENTRY_BASE(result_type, header, current)                      \
-    debug_only(VMEntryWrapper __vew;)
+    DEBUG_ONLY(VMEntryWrapper __vew;)
 
 // JRT_LEAF currently can be called from either _thread_in_Java or
 // _thread_in_native mode.
@@ -305,7 +305,7 @@ class VMNativeEntryWrapper {
 #define JRT_LEAF(result_type, header)                                \
   result_type header {                                               \
   VM_LEAF_BASE(result_type, header)                                  \
-  debug_only(NoSafepointVerifier __nsv;)
+  DEBUG_ONLY(NoSafepointVerifier __nsv;)
 
 
 #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
@@ -314,7 +314,7 @@ class VMNativeEntryWrapper {
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
     ThreadInVMfromJava __tiv(current, false /* check asyncs */);     \
     VM_ENTRY_BASE(result_type, header, current)                      \
-    debug_only(VMEntryWrapper __vew;)
+    DEBUG_ONLY(VMEntryWrapper __vew;)
 
 // Same as JRT Entry but allows for return value after the safepoint
 // to get back into Java from the VM
@@ -329,14 +329,14 @@ class VMNativeEntryWrapper {
     assert(current == JavaThread::current(), "Must be");             \
     ThreadInVMfromJava __tiv(current);                               \
     JavaThread* THREAD = current; /* For exception macros. */        \
-    debug_only(VMEntryWrapper __vew;)
+    DEBUG_ONLY(VMEntryWrapper __vew;)
 
 #define JRT_BLOCK_NO_ASYNC                                           \
     {                                                                \
     assert(current == JavaThread::current(), "Must be");             \
     ThreadInVMfromJava __tiv(current, false /* check asyncs */);     \
     JavaThread* THREAD = current; /* For exception macros. */        \
-    debug_only(VMEntryWrapper __vew;)
+    DEBUG_ONLY(VMEntryWrapper __vew;)
 
 #define JRT_BLOCK_END }
 
@@ -360,7 +360,7 @@ extern "C" {                                                         \
     assert(thread == Thread::current(), "JNIEnv is only valid in same thread"); \
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
-    debug_only(VMNativeEntryWrapper __vew;)                          \
+    DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
 
@@ -385,7 +385,7 @@ extern "C" {                                                         \
     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
-    debug_only(VMNativeEntryWrapper __vew;)                          \
+    DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
 
@@ -395,7 +395,7 @@ extern "C" {                                                         \
     JavaThread* thread = JavaThread::current();                      \
     MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
-    debug_only(VMNativeEntryWrapper __vew;)                          \
+    DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
 
diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp
index 012cea19bb0..04bd0871073 100644
--- a/src/hotspot/share/runtime/javaCalls.cpp
+++ b/src/hotspot/share/runtime/javaCalls.cpp
@@ -91,7 +91,7 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
   _anchor.copy(_thread->frame_anchor());
   _thread->frame_anchor()->clear();
 
-  debug_only(_thread->inc_java_call_counter());
+  DEBUG_ONLY(_thread->inc_java_call_counter());
   _thread->set_active_handles(new_handles);     // install new handle block and reset Java frame linkage
 
   MACOS_AARCH64_ONLY(_thread->enable_wx(WXExec));
@@ -109,7 +109,7 @@ JavaCallWrapper::~JavaCallWrapper() {
 
   _thread->frame_anchor()->zap();
 
-  debug_only(_thread->dec_java_call_counter());
+  DEBUG_ONLY(_thread->dec_java_call_counter());
 
   // Old thread-local info. has been restored. We are not back in the VM.
   ThreadStateTransition::transition_from_java(_thread, _thread_in_vm);
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index e4f377a1217..8a6da52d762 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -553,7 +553,7 @@ void JavaThread::interrupt() {
   // All callers should have 'this' thread protected by a
   // ThreadsListHandle so that it cannot terminate and deallocate
   // itself.
-  debug_only(check_for_dangling_thread_pointer(this);)
+  DEBUG_ONLY(check_for_dangling_thread_pointer(this);)
 
   // For Windows _interrupt_event
   WINDOWS_ONLY(osthread()->set_interrupted(true);)
@@ -569,7 +569,7 @@ void JavaThread::interrupt() {
 }
 
 bool JavaThread::is_interrupted(bool clear_interrupted) {
-  debug_only(check_for_dangling_thread_pointer(this);)
+  DEBUG_ONLY(check_for_dangling_thread_pointer(this);)
 
   if (_threadObj.peek() == nullptr) {
     // If there is no j.l.Thread then it is impossible to have
diff --git a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
index e44fb064813..68db2e36d45 100644
--- a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
+++ b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp
@@ -157,7 +157,7 @@ class jfieldIDWorkaround: AllStatic {
   static jfieldID to_jfieldID(InstanceKlass* k, int offset, bool is_static) {
     if (is_static) {
       JNIid *id = k->jni_id_for(offset);
-      debug_only(id->set_is_static_field_id());
+      DEBUG_ONLY(id->set_is_static_field_id());
       return jfieldIDWorkaround::to_static_jfieldID(id);
     } else {
       return jfieldIDWorkaround::to_instance_jfieldID(k, offset);
diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp
index b4fc32947dd..e7564467a81 100644
--- a/src/hotspot/share/runtime/jniHandles.cpp
+++ b/src/hotspot/share/runtime/jniHandles.cpp
@@ -342,9 +342,9 @@ JNIHandleBlock* JNIHandleBlock::allocate_block(JavaThread* thread, AllocFailType
   block->_next = nullptr;
   block->_pop_frame_link = nullptr;
   // _last, _free_list & _allocate_before_rebuild initialized in allocate_handle
-  debug_only(block->_last = nullptr);
-  debug_only(block->_free_list = nullptr);
-  debug_only(block->_allocate_before_rebuild = -1);
+  DEBUG_ONLY(block->_last = nullptr);
+  DEBUG_ONLY(block->_free_list = nullptr);
+  DEBUG_ONLY(block->_allocate_before_rebuild = -1);
   return block;
 }
 
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index a58be403827..496ad372c38 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -243,7 +243,7 @@ char* os::iso8601_time(jlong milliseconds_since_19700101, char* buffer, size_t b
 }
 
 OSReturn os::set_priority(Thread* thread, ThreadPriority p) {
-  debug_only(Thread::check_for_dangling_thread_pointer(thread);)
+  DEBUG_ONLY(Thread::check_for_dangling_thread_pointer(thread);)
 
   if ((p >= MinPriority && p <= MaxPriority) ||
       (p == CriticalPriority && thread->is_ConcurrentGC_thread())) {
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index a42576b562d..183ecea03ca 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -92,7 +92,7 @@ Thread::Thread(MemTag mem_tag) {
   new HandleMark(this);
 
   // plain initialization
-  debug_only(_owned_locks = nullptr;)
+  DEBUG_ONLY(_owned_locks = nullptr;)
   NOT_PRODUCT(_skip_gcalot = false;)
   _jvmti_env_iteration_count = 0;
   set_allocated_bytes(0);
@@ -379,7 +379,7 @@ bool Thread::is_JavaThread_protected_by_TLH(const JavaThread* target) {
 }
 
 void Thread::set_priority(Thread* thread, ThreadPriority priority) {
-  debug_only(check_for_dangling_thread_pointer(thread);)
+  DEBUG_ONLY(check_for_dangling_thread_pointer(thread);)
   // Can return an error!
   (void)os::set_priority(thread, priority);
 }
@@ -488,7 +488,7 @@ void Thread::print_on(outputStream* st, bool print_extended_info) const {
   }
   ThreadsSMRSupport::print_info_on(this, st);
   st->print(" ");
-  debug_only(if (WizardMode) print_owned_locks_on(st);)
+  DEBUG_ONLY(if (WizardMode) print_owned_locks_on(st);)
 }
 
 void Thread::print() const { print_on(tty); }
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index 7a2c8d52969..a042a390925 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -455,7 +455,7 @@ class AbstractDumpWriter : public CHeapObj<mtInternal> {
 void AbstractDumpWriter::write_fast(const void* s, size_t len) {
   assert(!_in_dump_segment || (_sub_record_left >= len), "sub-record too large");
   assert(buffer_size() - position() >= len, "Must fit");
-  debug_only(_sub_record_left -= len);
+  DEBUG_ONLY(_sub_record_left -= len);
   memcpy(buffer() + position(), s, len);
   set_position(position() + len);
 }
@@ -467,7 +467,7 @@ bool AbstractDumpWriter::can_write_fast(size_t len) {
 // write raw bytes
 void AbstractDumpWriter::write_raw(const void* s, size_t len) {
   assert(!_in_dump_segment || (_sub_record_left >= len), "sub-record too large");
-  debug_only(_sub_record_left -= len);
+  DEBUG_ONLY(_sub_record_left -= len);
 
   // flush buffer to make room.
   while (len > buffer_size() - position()) {
@@ -591,8 +591,8 @@ void AbstractDumpWriter::start_sub_record(u1 tag, u4 len) {
     return;
   }
 
-  debug_only(_sub_record_left = len);
-  debug_only(_sub_record_ended = false);
+  DEBUG_ONLY(_sub_record_left = len);
+  DEBUG_ONLY(_sub_record_ended = false);
 
   write_u1(tag);
 }
@@ -601,7 +601,7 @@ void AbstractDumpWriter::end_sub_record() {
   assert(_in_dump_segment, "must be in dump segment");
   assert(_sub_record_left == 0, "sub-record not written completely");
   assert(!_sub_record_ended, "Must not have ended yet");
-  debug_only(_sub_record_ended = true);
+  DEBUG_ONLY(_sub_record_ended = true);
 }
 
 // Supports I/O operations for a dump
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index 89ee69242c9..d320e17fafb 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -228,7 +228,7 @@ void ThreadService::current_thread_exiting(JavaThread* jt, bool daemon) {
 // FIXME: JVMTI should call this function
 Handle ThreadService::get_current_contended_monitor(JavaThread* thread) {
   assert(thread != nullptr, "should be non-null");
-  debug_only(Thread::check_for_dangling_thread_pointer(thread);)
+  DEBUG_ONLY(Thread::check_for_dangling_thread_pointer(thread);)
 
   // This function can be called on a target JavaThread that is not
   // the caller and we are not at a safepoint. So it is possible for
diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
index 31e797fc192..86b7ed5f917 100644
--- a/src/hotspot/share/utilities/growableArray.hpp
+++ b/src/hotspot/share/utilities/growableArray.hpp
@@ -622,7 +622,7 @@ class GrowableArrayMetadata {
   uintptr_t _bits;
 
   // resource area nesting at creation
-  debug_only(GrowableArrayNestingCheck _nesting_check;)
+  DEBUG_ONLY(GrowableArrayNestingCheck _nesting_check;)
 
   // Resource allocation
   static uintptr_t bits() {
@@ -645,19 +645,19 @@ class GrowableArrayMetadata {
   // Resource allocation
   GrowableArrayMetadata() :
       _bits(bits())
-      debug_only(COMMA _nesting_check(true)) {
+      DEBUG_ONLY(COMMA _nesting_check(true)) {
   }
 
   // Arena allocation
   GrowableArrayMetadata(Arena* arena) :
       _bits(bits(arena))
-      debug_only(COMMA _nesting_check(arena)) {
+      DEBUG_ONLY(COMMA _nesting_check(arena)) {
   }
 
   // CHeap allocation
   GrowableArrayMetadata(MemTag mem_tag) :
       _bits(bits(mem_tag))
-      debug_only(COMMA _nesting_check(false)) {
+      DEBUG_ONLY(COMMA _nesting_check(false)) {
   }
 
 #ifdef ASSERT
@@ -725,7 +725,7 @@ class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E>> {
 
   GrowableArrayMetadata _metadata;
 
-  void init_checks() const { debug_only(_metadata.init_checks(this);) }
+  void init_checks() const { DEBUG_ONLY(_metadata.init_checks(this);) }
 
   // Where are we going to allocate memory?
   bool on_C_heap() const        { return _metadata.on_C_heap(); }
@@ -734,7 +734,7 @@ class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E>> {
 
   E* allocate() {
     if (on_resource_area()) {
-      debug_only(_metadata.on_resource_area_alloc_check());
+      DEBUG_ONLY(_metadata.on_resource_area_alloc_check());
       return allocate(this->_capacity);
     }
 
@@ -743,7 +743,7 @@ class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E>> {
     }
 
     assert(on_arena(), "Sanity");
-    debug_only(_metadata.on_arena_alloc_check());
+    DEBUG_ONLY(_metadata.on_arena_alloc_check());
     return allocate(this->_capacity, _metadata.arena());
   }
 
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 5c3cfaa0dd5..a5caf316aa3 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -377,13 +377,10 @@
 #define DEBUG_ONLY(code) code
 #define NOT_DEBUG(code)
 #define NOT_DEBUG_RETURN  /*next token must be ;*/
-// Historical.
-#define debug_only(code) code
 #else // ASSERT
 #define DEBUG_ONLY(code)
 #define NOT_DEBUG(code) code
 #define NOT_DEBUG_RETURN {}
-#define debug_only(code)
 #endif // ASSERT
 
 #ifdef  _LP64

From 2447b9812a9f7316a2313f70db4974534fceb9d9 Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Mon, 28 Apr 2025 08:44:36 +0000
Subject: [PATCH 159/901] 8355498: [AIX] Adapt code for C++ VLA rule

Reviewed-by: jkern, mdoerr
---
 src/hotspot/os/aix/os_perf_aix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/os/aix/os_perf_aix.cpp b/src/hotspot/os/aix/os_perf_aix.cpp
index e9feb3fe47d..8444002b871 100644
--- a/src/hotspot/os/aix/os_perf_aix.cpp
+++ b/src/hotspot/os/aix/os_perf_aix.cpp
@@ -72,7 +72,7 @@ enum {
  * Get info for requested PID from /proc/<pid>/psinfo file
  */
 static bool read_psinfo(const u_longlong_t& pid, psinfo_t& psinfo) {
-  static size_t BUF_LENGTH = 32 + sizeof(u_longlong_t);
+  const size_t BUF_LENGTH = 32 + sizeof(u_longlong_t);
 
   FILE* fp;
   char buf[BUF_LENGTH];

From b0c3485d6c911898b1ac07eccfe7d2b2668144cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 28 Apr 2025 10:04:20 +0000
Subject: [PATCH 160/901] 8348282: Add option for syntax highlighting in
 javadoc snippets

Reviewed-by: liach, nbenalla, erikj
---
 make/Docs.gmk                                 |    2 +-
 .../doclets/formats/html/HtmlDoclet.java      |    6 +
 .../formats/html/HtmlDocletWriter.java        |    1 +
 .../doclets/formats/html/HtmlOptions.java     |   22 +-
 .../doclets/formats/html/markup/Head.java     |   16 +
 .../formats/html/resources/highlight.css      |   67 +
 .../formats/html/resources/highlight.js       | 3278 +++++++++++++++++
 .../formats/html/resources/script.js.template |    4 +
 .../html/resources/standard.properties        |    4 +
 .../formats/html/resources/stylesheet.css     |   17 +-
 .../doclets/toolkit/util/DocPaths.java        |    8 +-
 src/jdk.javadoc/share/man/javadoc.md          |   19 +-
 .../TestSyntaxHighlightOption.java            |   97 +
 13 files changed, 3527 insertions(+), 14 deletions(-)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.js
 create mode 100644 test/langtools/jdk/javadoc/doclet/testSyntaxHighlightOption/TestSyntaxHighlightOption.java

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 60c029ce8f9..965ae689e21 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -98,7 +98,7 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary
+    --override-methods=summary --syntax-highlight
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
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 b768aee081f..c6f583de361 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
@@ -311,6 +311,12 @@ protected void generateOtherFiles(ClassTree classTree)
             copyFontResources();
         }
 
+        var syntaxHighlight = options.syntaxHighlight();
+        if (syntaxHighlight) {
+            copyResource(DocPaths.HIGHLIGHT_CSS, DocPaths.RESOURCE_FILES.resolve(DocPaths.HIGHLIGHT_CSS), true);
+            copyResource(DocPaths.HIGHLIGHT_JS, DocPaths.SCRIPT_FILES.resolve(DocPaths.HIGHLIGHT_JS), true);
+        }
+
         // If a stylesheet file is not specified, copy the default stylesheet
         // and replace newline with platform-specific newline.
         if (options.stylesheetFile().isEmpty()) {
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 448a68fd5a1..34ef40ed650 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
@@ -511,6 +511,7 @@ public void printHtmlDocument(List<String> metakeywords,
                 .setStylesheets(configuration.getMainStylesheet(), additionalStylesheets, localStylesheets)
                 .setAdditionalScripts(configuration.getAdditionalScripts())
                 .setIndex(options.createIndex(), mainBodyScript)
+                .setSyntaxHighlight(options.syntaxHighlight())
                 .addContent(extraHeadContent);
 
         HtmlDocument htmlDocument = new HtmlDocument(
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java
index 10483fb4a4c..faf1f8c897d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlOptions.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
@@ -198,6 +198,11 @@ public class HtmlOptions extends BaseOptions {
      */
     private String stylesheetFile = "";
 
+    /**
+     * Argument for command line option {@code --syntax-highlight}.
+     */
+    private boolean syntaxHighlight = false;
+
     /**
      * Argument for command-line option {@code -tagletpath}.
      * The path to Taglets
@@ -423,6 +428,14 @@ public boolean process(String opt, List<String> args) {
                     }
                 },
 
+                new Option(resources, "--syntax-highlight") {
+                    @Override
+                    public boolean process(String opt, List<String> args) {
+                        syntaxHighlight = true;
+                        return true;
+                    }
+                },
+
                 new Option(resources, "-tag", 1) {
                     @Override
                     public boolean process(String opt, List<String> args) {
@@ -806,6 +819,13 @@ String stylesheetFile() {
         return stylesheetFile;
     }
 
+    /**
+     * Argument for command line option {@code --syntax-highlight}.
+     * True if command line option "--syntax-highlight" is used and syntax
+     * highlighting should be enabled. Default value is false.
+     */
+    public boolean syntaxHighlight() { return syntaxHighlight; }
+
     /**
      * Argument for command-line option {@code -tagletpath}.
      * The path to Taglets
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 7170c6bcc8a..0c54fc1e29c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -70,6 +70,7 @@ public class Head extends Content {
     private final List<Content> extraContent;
     private boolean addDefaultScript = true;
     private DocPath canonicalLink;
+    private boolean syntaxHighlight = false;
 
     /**
      * Creates a {@code Head} object, for a given file and HTML version.
@@ -238,6 +239,16 @@ public void setCanonicalLink(DocPath link) {
         this.canonicalLink = link;
     }
 
+    /**
+     * Enables or disables support for syntax highlighting.
+     * @param value {@code true} to enable syntax highligting
+     * @return this object
+     */
+    public Head setSyntaxHighlight(boolean value) {
+        this.syntaxHighlight = value;
+        return this;
+    }
+
     /**
      * Adds additional content to be included in the HEAD element.
      *
@@ -339,6 +350,11 @@ private void addStylesheets(HtmlTree head) {
             addStylesheet(head, DocPaths.RESOURCE_FILES.resolve(path));
         }
 
+        if (syntaxHighlight) {
+            addStylesheet(head, DocPaths.RESOURCE_FILES.resolve(DocPaths.HIGHLIGHT_CSS));
+            addScriptElement(head, DocPaths.HIGHLIGHT_JS);
+        }
+
         for (DocPath path : localStylesheets) {
             // Local stylesheets are contained in doc-files, so omit resource-files prefix
             addStylesheet(head, path);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
new file mode 100644
index 00000000000..145c1c7f5d2
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.css
@@ -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.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+ */
+/* Syntax highlight style sheet */
+.hljs-title.function_,
+.hljs-template-variable {
+    color: #00738F;
+}
+.hljs-code,
+.hljs-comment,
+.hljs-quote {
+    color: #6e6e71;
+    font-style: italic;
+}
+.hljs-meta {
+    color: #836F00;
+}
+.hljs-symbol,
+.hljs-template-tag,
+.hljs-keyword,
+.hljs-literal,
+.hljs-name,
+.hljs-built_in,
+.hljs-char.escape_ {
+    color: #0C40C2;
+}
+.hljs-variable,
+.hljs-property,
+.hljs-attr,
+.hljs-section {
+    color: #841191;
+}
+.hljs-attribute {
+    color: #164ad9;
+}
+.hljs-regexp,
+.hljs-number {
+    color: #104BEB;
+}
+.hljs-link {
+    color: #47688a;
+}
+.hljs-string {
+    color: #008313;
+}
+.hljs-doctag {
+    text-decoration: underline;
+}
+.hljs-emphasis {
+    font-style: italic;
+}
+.hljs-strong {
+    font-weight: bold;
+}
+.hljs-subst,
+.hljs-title,
+.hljs-params,
+.hljs-bullet,
+.hljs-formula,
+.hljs-tag,
+.hljs-type {
+    /* ignored */
+}
+
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.js
new file mode 100644
index 00000000000..efa14c8c306
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/highlight.js
@@ -0,0 +1,3278 @@
+/*!
+  Highlight.js v11.11.1 (git: 08cb242e7d)
+  (c) 2006-2025 Josh Goebel <hello@joshgoebel.com> and other contributors
+  License: BSD-3-Clause
+ */
+var hljs = (function () {
+  'use strict';
+
+  /* eslint-disable no-multi-assign */
+
+  function deepFreeze(obj) {
+    if (obj instanceof Map) {
+      obj.clear =
+        obj.delete =
+        obj.set =
+          function () {
+            throw new Error('map is read-only');
+          };
+    } else if (obj instanceof Set) {
+      obj.add =
+        obj.clear =
+        obj.delete =
+          function () {
+            throw new Error('set is read-only');
+          };
+    }
+
+    // Freeze self
+    Object.freeze(obj);
+
+    Object.getOwnPropertyNames(obj).forEach((name) => {
+      const prop = obj[name];
+      const type = typeof prop;
+
+      // Freeze prop if it is an object or function and also not already frozen
+      if ((type === 'object' || type === 'function') && !Object.isFrozen(prop)) {
+        deepFreeze(prop);
+      }
+    });
+
+    return obj;
+  }
+
+  /** @typedef {import('highlight.js').CallbackResponse} CallbackResponse */
+  /** @typedef {import('highlight.js').CompiledMode} CompiledMode */
+  /** @implements CallbackResponse */
+
+  class Response {
+    /**
+     * @param {CompiledMode} mode
+     */
+    constructor(mode) {
+      // eslint-disable-next-line no-undefined
+      if (mode.data === undefined) mode.data = {};
+
+      this.data = mode.data;
+      this.isMatchIgnored = false;
+    }
+
+    ignoreMatch() {
+      this.isMatchIgnored = true;
+    }
+  }
+
+  /**
+   * @param {string} value
+   * @returns {string}
+   */
+  function escapeHTML(value) {
+    return value
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#x27;');
+  }
+
+  /**
+   * performs a shallow merge of multiple objects into one
+   *
+   * @template T
+   * @param {T} original
+   * @param {Record<string,any>[]} objects
+   * @returns {T} a single new object
+   */
+  function inherit$1(original, ...objects) {
+    /** @type Record<string,any> */
+    const result = Object.create(null);
+
+    for (const key in original) {
+      result[key] = original[key];
+    }
+    objects.forEach(function(obj) {
+      for (const key in obj) {
+        result[key] = obj[key];
+      }
+    });
+    return /** @type {T} */ (result);
+  }
+
+  /**
+   * @typedef {object} Renderer
+   * @property {(text: string) => void} addText
+   * @property {(node: Node) => void} openNode
+   * @property {(node: Node) => void} closeNode
+   * @property {() => string} value
+   */
+
+  /** @typedef {{scope?: string, language?: string, sublanguage?: boolean}} Node */
+  /** @typedef {{walk: (r: Renderer) => void}} Tree */
+  /** */
+
+  const SPAN_CLOSE = '</span>';
+
+  /**
+   * Determines if a node needs to be wrapped in <span>
+   *
+   * @param {Node} node */
+  const emitsWrappingTags = (node) => {
+    // rarely we can have a sublanguage where language is undefined
+    // TODO: track down why
+    return !!node.scope;
+  };
+
+  /**
+   *
+   * @param {string} name
+   * @param {{prefix:string}} options
+   */
+  const scopeToCSSClass = (name, { prefix }) => {
+    // sub-language
+    if (name.startsWith("language:")) {
+      return name.replace("language:", "language-");
+    }
+    // tiered scope: comment.line
+    if (name.includes(".")) {
+      const pieces = name.split(".");
+      return [
+        `${prefix}${pieces.shift()}`,
+        ...(pieces.map((x, i) => `${x}${"_".repeat(i + 1)}`))
+      ].join(" ");
+    }
+    // simple scope
+    return `${prefix}${name}`;
+  };
+
+  /** @type {Renderer} */
+  class HTMLRenderer {
+    /**
+     * Creates a new HTMLRenderer
+     *
+     * @param {Tree} parseTree - the parse tree (must support `walk` API)
+     * @param {{classPrefix: string}} options
+     */
+    constructor(parseTree, options) {
+      this.buffer = "";
+      this.classPrefix = options.classPrefix;
+      parseTree.walk(this);
+    }
+
+    /**
+     * Adds texts to the output stream
+     *
+     * @param {string} text */
+    addText(text) {
+      this.buffer += escapeHTML(text);
+    }
+
+    /**
+     * Adds a node open to the output stream (if needed)
+     *
+     * @param {Node} node */
+    openNode(node) {
+      if (!emitsWrappingTags(node)) return;
+
+      const className = scopeToCSSClass(node.scope,
+        { prefix: this.classPrefix });
+      this.span(className);
+    }
+
+    /**
+     * Adds a node close to the output stream (if needed)
+     *
+     * @param {Node} node */
+    closeNode(node) {
+      if (!emitsWrappingTags(node)) return;
+
+      this.buffer += SPAN_CLOSE;
+    }
+
+    /**
+     * returns the accumulated buffer
+    */
+    value() {
+      return this.buffer;
+    }
+
+    // helpers
+
+    /**
+     * Builds a span element
+     *
+     * @param {string} className */
+    span(className) {
+      this.buffer += `<span class="${className}">`;
+    }
+  }
+
+  /** @typedef {{scope?: string, language?: string, children: Node[]} | string} Node */
+  /** @typedef {{scope?: string, language?: string, children: Node[]} } DataNode */
+  /** @typedef {import('highlight.js').Emitter} Emitter */
+  /**  */
+
+  /** @returns {DataNode} */
+  const newNode = (opts = {}) => {
+    /** @type DataNode */
+    const result = { children: [] };
+    Object.assign(result, opts);
+    return result;
+  };
+
+  class TokenTree {
+    constructor() {
+      /** @type DataNode */
+      this.rootNode = newNode();
+      this.stack = [this.rootNode];
+    }
+
+    get top() {
+      return this.stack[this.stack.length - 1];
+    }
+
+    get root() { return this.rootNode; }
+
+    /** @param {Node} node */
+    add(node) {
+      this.top.children.push(node);
+    }
+
+    /** @param {string} scope */
+    openNode(scope) {
+      /** @type Node */
+      const node = newNode({ scope });
+      this.add(node);
+      this.stack.push(node);
+    }
+
+    closeNode() {
+      if (this.stack.length > 1) {
+        return this.stack.pop();
+      }
+      // eslint-disable-next-line no-undefined
+      return undefined;
+    }
+
+    closeAllNodes() {
+      while (this.closeNode());
+    }
+
+    toJSON() {
+      return JSON.stringify(this.rootNode, null, 4);
+    }
+
+    /**
+     * @typedef { import("./html_renderer").Renderer } Renderer
+     * @param {Renderer} builder
+     */
+    walk(builder) {
+      // this does not
+      return this.constructor._walk(builder, this.rootNode);
+      // this works
+      // return TokenTree._walk(builder, this.rootNode);
+    }
+
+    /**
+     * @param {Renderer} builder
+     * @param {Node} node
+     */
+    static _walk(builder, node) {
+      if (typeof node === "string") {
+        builder.addText(node);
+      } else if (node.children) {
+        builder.openNode(node);
+        node.children.forEach((child) => this._walk(builder, child));
+        builder.closeNode(node);
+      }
+      return builder;
+    }
+
+    /**
+     * @param {Node} node
+     */
+    static _collapse(node) {
+      if (typeof node === "string") return;
+      if (!node.children) return;
+
+      if (node.children.every(el => typeof el === "string")) {
+        // node.text = node.children.join("");
+        // delete node.children;
+        node.children = [node.children.join("")];
+      } else {
+        node.children.forEach((child) => {
+          TokenTree._collapse(child);
+        });
+      }
+    }
+  }
+
+  /**
+    Currently this is all private API, but this is the minimal API necessary
+    that an Emitter must implement to fully support the parser.
+
+    Minimal interface:
+
+    - addText(text)
+    - __addSublanguage(emitter, subLanguageName)
+    - startScope(scope)
+    - endScope()
+    - finalize()
+    - toHTML()
+
+  */
+
+  /**
+   * @implements {Emitter}
+   */
+  class TokenTreeEmitter extends TokenTree {
+    /**
+     * @param {*} options
+     */
+    constructor(options) {
+      super();
+      this.options = options;
+    }
+
+    /**
+     * @param {string} text
+     */
+    addText(text) {
+      if (text === "") { return; }
+
+      this.add(text);
+    }
+
+    /** @param {string} scope */
+    startScope(scope) {
+      this.openNode(scope);
+    }
+
+    endScope() {
+      this.closeNode();
+    }
+
+    /**
+     * @param {Emitter & {root: DataNode}} emitter
+     * @param {string} name
+     */
+    __addSublanguage(emitter, name) {
+      /** @type DataNode */
+      const node = emitter.root;
+      if (name) node.scope = `language:${name}`;
+
+      this.add(node);
+    }
+
+    toHTML() {
+      const renderer = new HTMLRenderer(this, this.options);
+      return renderer.value();
+    }
+
+    finalize() {
+      this.closeAllNodes();
+      return true;
+    }
+  }
+
+  /**
+   * @param {string} value
+   * @returns {RegExp}
+   * */
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function source(re) {
+    if (!re) return null;
+    if (typeof re === "string") return re;
+
+    return re.source;
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function lookahead(re) {
+    return concat('(?=', re, ')');
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function anyNumberOfTimes(re) {
+    return concat('(?:', re, ')*');
+  }
+
+  /**
+   * @param {RegExp | string } re
+   * @returns {string}
+   */
+  function optional(re) {
+    return concat('(?:', re, ')?');
+  }
+
+  /**
+   * @param {...(RegExp | string) } args
+   * @returns {string}
+   */
+  function concat(...args) {
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
+  }
+
+  /**
+   * @param { Array<string | RegExp | Object> } args
+   * @returns {object}
+   */
+  function stripOptionsFromArgs(args) {
+    const opts = args[args.length - 1];
+
+    if (typeof opts === 'object' && opts.constructor === Object) {
+      args.splice(args.length - 1, 1);
+      return opts;
+    } else {
+      return {};
+    }
+  }
+
+  /** @typedef { {capture?: boolean} } RegexEitherOptions */
+
+  /**
+   * Any of the passed expresssions may match
+   *
+   * Creates a huge this | this | that | that match
+   * @param {(RegExp | string)[] | [...(RegExp | string)[], RegexEitherOptions]} args
+   * @returns {string}
+   */
+  function either(...args) {
+    /** @type { object & {capture?: boolean} }  */
+    const opts = stripOptionsFromArgs(args);
+    const joined = '('
+      + (opts.capture ? "" : "?:")
+      + args.map((x) => source(x)).join("|") + ")";
+    return joined;
+  }
+
+  /**
+   * @param {RegExp | string} re
+   * @returns {number}
+   */
+  function countMatchGroups(re) {
+    return (new RegExp(re.toString() + '|')).exec('').length - 1;
+  }
+
+  /**
+   * Does lexeme start with a regular expression match at the beginning
+   * @param {RegExp} re
+   * @param {string} lexeme
+   */
+  function startsWith(re, lexeme) {
+    const match = re && re.exec(lexeme);
+    return match && match.index === 0;
+  }
+
+  // BACKREF_RE matches an open parenthesis or backreference. To avoid
+  // an incorrect parse, it additionally matches the following:
+  // - [...] elements, where the meaning of parentheses and escapes change
+  // - other escape sequences, so we do not misparse escape sequences as
+  //   interesting elements
+  // - non-matching or lookahead parentheses, which do not capture. These
+  //   follow the '(' with a '?'.
+  const BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
+
+  // **INTERNAL** Not intended for outside usage
+  // join logically computes regexps.join(separator), but fixes the
+  // backreferences so they continue to match.
+  // it also places each individual regular expression into it's own
+  // match group, keeping track of the sequencing of those match groups
+  // is currently an exercise for the caller. :-)
+  /**
+   * @param {(string | RegExp)[]} regexps
+   * @param {{joinWith: string}} opts
+   * @returns {string}
+   */
+  function _rewriteBackreferences(regexps, { joinWith }) {
+    let numCaptures = 0;
+
+    return regexps.map((regex) => {
+      numCaptures += 1;
+      const offset = numCaptures;
+      let re = source(regex);
+      let out = '';
+
+      while (re.length > 0) {
+        const match = BACKREF_RE.exec(re);
+        if (!match) {
+          out += re;
+          break;
+        }
+        out += re.substring(0, match.index);
+        re = re.substring(match.index + match[0].length);
+        if (match[0][0] === '\\' && match[1]) {
+          // Adjust the backreference.
+          out += '\\' + String(Number(match[1]) + offset);
+        } else {
+          out += match[0];
+          if (match[0] === '(') {
+            numCaptures++;
+          }
+        }
+      }
+      return out;
+    }).map(re => `(${re})`).join(joinWith);
+  }
+
+  /** @typedef {import('highlight.js').Mode} Mode */
+  /** @typedef {import('highlight.js').ModeCallback} ModeCallback */
+
+  // Common regexps
+  const MATCH_NOTHING_RE = /\b\B/;
+  const IDENT_RE = '[a-zA-Z]\\w*';
+  const UNDERSCORE_IDENT_RE = '[a-zA-Z_]\\w*';
+  const NUMBER_RE = '\\b\\d+(\\.\\d+)?';
+  const C_NUMBER_RE = '(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)'; // 0x..., 0..., decimal, float
+  const BINARY_NUMBER_RE = '\\b(0b[01]+)'; // 0b...
+  const RE_STARTERS_RE = '!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~';
+
+  /**
+  * @param { Partial<Mode> & {binary?: string | RegExp} } opts
+  */
+  const SHEBANG = (opts = {}) => {
+    const beginShebang = /^#![ ]*\//;
+    if (opts.binary) {
+      opts.begin = concat(
+        beginShebang,
+        /.*\b/,
+        opts.binary,
+        /\b.*/);
+    }
+    return inherit$1({
+      scope: 'meta',
+      begin: beginShebang,
+      end: /$/,
+      relevance: 0,
+      /** @type {ModeCallback} */
+      "on:begin": (m, resp) => {
+        if (m.index !== 0) resp.ignoreMatch();
+      }
+    }, opts);
+  };
+
+  // Common modes
+  const BACKSLASH_ESCAPE = {
+    begin: '\\\\[\\s\\S]', relevance: 0
+  };
+  const APOS_STRING_MODE = {
+    scope: 'string',
+    begin: '\'',
+    end: '\'',
+    illegal: '\\n',
+    contains: [BACKSLASH_ESCAPE]
+  };
+  const QUOTE_STRING_MODE = {
+    scope: 'string',
+    begin: '"',
+    end: '"',
+    illegal: '\\n',
+    contains: [BACKSLASH_ESCAPE]
+  };
+  const PHRASAL_WORDS_MODE = {
+    begin: /\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/
+  };
+  /**
+   * Creates a comment mode
+   *
+   * @param {string | RegExp} begin
+   * @param {string | RegExp} end
+   * @param {Mode | {}} [modeOptions]
+   * @returns {Partial<Mode>}
+   */
+  const COMMENT = function(begin, end, modeOptions = {}) {
+    const mode = inherit$1(
+      {
+        scope: 'comment',
+        begin,
+        end,
+        contains: []
+      },
+      modeOptions
+    );
+    mode.contains.push({
+      scope: 'doctag',
+      // hack to avoid the space from being included. the space is necessary to
+      // match here to prevent the plain text rule below from gobbling up doctags
+      begin: '[ ]*(?=(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):)',
+      end: /(TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):/,
+      excludeBegin: true,
+      relevance: 0
+    });
+    const ENGLISH_WORD = either(
+      // list of common 1 and 2 letter words in English
+      "I",
+      "a",
+      "is",
+      "so",
+      "us",
+      "to",
+      "at",
+      "if",
+      "in",
+      "it",
+      "on",
+      // note: this is not an exhaustive list of contractions, just popular ones
+      /[A-Za-z]+['](d|ve|re|ll|t|s|n)/, // contractions - can't we'd they're let's, etc
+      /[A-Za-z]+[-][a-z]+/, // `no-way`, etc.
+      /[A-Za-z][a-z]{2,}/ // allow capitalized words at beginning of sentences
+    );
+    // looking like plain text, more likely to be a comment
+    mode.contains.push(
+      {
+        // TODO: how to include ", (, ) without breaking grammars that use these for
+        // comment delimiters?
+        // begin: /[ ]+([()"]?([A-Za-z'-]{3,}|is|a|I|so|us|[tT][oO]|at|if|in|it|on)[.]?[()":]?([.][ ]|[ ]|\))){3}/
+        // ---
+
+        // this tries to find sequences of 3 english words in a row (without any
+        // "programming" type syntax) this gives us a strong signal that we've
+        // TRULY found a comment - vs perhaps scanning with the wrong language.
+        // It's possible to find something that LOOKS like the start of the
+        // comment - but then if there is no readable text - good chance it is a
+        // false match and not a comment.
+        //
+        // for a visual example please see:
+        // https://github.com/highlightjs/highlight.js/issues/2827
+
+        begin: concat(
+          /[ ]+/, // necessary to prevent us gobbling up doctags like /* @author Bob Mcgill */
+          '(',
+          ENGLISH_WORD,
+          /[.]?[:]?([.][ ]|[ ])/,
+          '){3}') // look for 3 words in a row
+      }
+    );
+    return mode;
+  };
+  const C_LINE_COMMENT_MODE = COMMENT('//', '$');
+  const C_BLOCK_COMMENT_MODE = COMMENT('/\\*', '\\*/');
+  const HASH_COMMENT_MODE = COMMENT('#', '$');
+  const NUMBER_MODE = {
+    scope: 'number',
+    begin: NUMBER_RE,
+    relevance: 0
+  };
+  const C_NUMBER_MODE = {
+    scope: 'number',
+    begin: C_NUMBER_RE,
+    relevance: 0
+  };
+  const BINARY_NUMBER_MODE = {
+    scope: 'number',
+    begin: BINARY_NUMBER_RE,
+    relevance: 0
+  };
+  const REGEXP_MODE = {
+    scope: "regexp",
+    begin: /\/(?=[^/\n]*\/)/,
+    end: /\/[gimuy]*/,
+    contains: [
+      BACKSLASH_ESCAPE,
+      {
+        begin: /\[/,
+        end: /\]/,
+        relevance: 0,
+        contains: [BACKSLASH_ESCAPE]
+      }
+    ]
+  };
+  const TITLE_MODE = {
+    scope: 'title',
+    begin: IDENT_RE,
+    relevance: 0
+  };
+  const UNDERSCORE_TITLE_MODE = {
+    scope: 'title',
+    begin: UNDERSCORE_IDENT_RE,
+    relevance: 0
+  };
+  const METHOD_GUARD = {
+    // excludes method names from keyword processing
+    begin: '\\.\\s*' + UNDERSCORE_IDENT_RE,
+    relevance: 0
+  };
+
+  /**
+   * Adds end same as begin mechanics to a mode
+   *
+   * Your mode must include at least a single () match group as that first match
+   * group is what is used for comparison
+   * @param {Partial<Mode>} mode
+   */
+  const END_SAME_AS_BEGIN = function(mode) {
+    return Object.assign(mode,
+      {
+        /** @type {ModeCallback} */
+        'on:begin': (m, resp) => { resp.data._beginMatch = m[1]; },
+        /** @type {ModeCallback} */
+        'on:end': (m, resp) => { if (resp.data._beginMatch !== m[1]) resp.ignoreMatch(); }
+      });
+  };
+
+  var MODES = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    APOS_STRING_MODE: APOS_STRING_MODE,
+    BACKSLASH_ESCAPE: BACKSLASH_ESCAPE,
+    BINARY_NUMBER_MODE: BINARY_NUMBER_MODE,
+    BINARY_NUMBER_RE: BINARY_NUMBER_RE,
+    COMMENT: COMMENT,
+    C_BLOCK_COMMENT_MODE: C_BLOCK_COMMENT_MODE,
+    C_LINE_COMMENT_MODE: C_LINE_COMMENT_MODE,
+    C_NUMBER_MODE: C_NUMBER_MODE,
+    C_NUMBER_RE: C_NUMBER_RE,
+    END_SAME_AS_BEGIN: END_SAME_AS_BEGIN,
+    HASH_COMMENT_MODE: HASH_COMMENT_MODE,
+    IDENT_RE: IDENT_RE,
+    MATCH_NOTHING_RE: MATCH_NOTHING_RE,
+    METHOD_GUARD: METHOD_GUARD,
+    NUMBER_MODE: NUMBER_MODE,
+    NUMBER_RE: NUMBER_RE,
+    PHRASAL_WORDS_MODE: PHRASAL_WORDS_MODE,
+    QUOTE_STRING_MODE: QUOTE_STRING_MODE,
+    REGEXP_MODE: REGEXP_MODE,
+    RE_STARTERS_RE: RE_STARTERS_RE,
+    SHEBANG: SHEBANG,
+    TITLE_MODE: TITLE_MODE,
+    UNDERSCORE_IDENT_RE: UNDERSCORE_IDENT_RE,
+    UNDERSCORE_TITLE_MODE: UNDERSCORE_TITLE_MODE
+  });
+
+  /**
+  @typedef {import('highlight.js').CallbackResponse} CallbackResponse
+  @typedef {import('highlight.js').CompilerExt} CompilerExt
+  */
+
+  // Grammar extensions / plugins
+  // See: https://github.com/highlightjs/highlight.js/issues/2833
+
+  // Grammar extensions allow "syntactic sugar" to be added to the grammar modes
+  // without requiring any underlying changes to the compiler internals.
+
+  // `compileMatch` being the perfect small example of now allowing a grammar
+  // author to write `match` when they desire to match a single expression rather
+  // than being forced to use `begin`.  The extension then just moves `match` into
+  // `begin` when it runs.  Ie, no features have been added, but we've just made
+  // the experience of writing (and reading grammars) a little bit nicer.
+
+  // ------
+
+  // TODO: We need negative look-behind support to do this properly
+  /**
+   * Skip a match if it has a preceding dot
+   *
+   * This is used for `beginKeywords` to prevent matching expressions such as
+   * `bob.keyword.do()`. The mode compiler automatically wires this up as a
+   * special _internal_ 'on:begin' callback for modes with `beginKeywords`
+   * @param {RegExpMatchArray} match
+   * @param {CallbackResponse} response
+   */
+  function skipIfHasPrecedingDot(match, response) {
+    const before = match.input[match.index - 1];
+    if (before === ".") {
+      response.ignoreMatch();
+    }
+  }
+
+  /**
+   *
+   * @type {CompilerExt}
+   */
+  function scopeClassName(mode, _parent) {
+    // eslint-disable-next-line no-undefined
+    if (mode.className !== undefined) {
+      mode.scope = mode.className;
+      delete mode.className;
+    }
+  }
+
+  /**
+   * `beginKeywords` syntactic sugar
+   * @type {CompilerExt}
+   */
+  function beginKeywords(mode, parent) {
+    if (!parent) return;
+    if (!mode.beginKeywords) return;
+
+    // for languages with keywords that include non-word characters checking for
+    // a word boundary is not sufficient, so instead we check for a word boundary
+    // or whitespace - this does no harm in any case since our keyword engine
+    // doesn't allow spaces in keywords anyways and we still check for the boundary
+    // first
+    mode.begin = '\\b(' + mode.beginKeywords.split(' ').join('|') + ')(?!\\.)(?=\\b|\\s)';
+    mode.__beforeBegin = skipIfHasPrecedingDot;
+    mode.keywords = mode.keywords || mode.beginKeywords;
+    delete mode.beginKeywords;
+
+    // prevents double relevance, the keywords themselves provide
+    // relevance, the mode doesn't need to double it
+    // eslint-disable-next-line no-undefined
+    if (mode.relevance === undefined) mode.relevance = 0;
+  }
+
+  /**
+   * Allow `illegal` to contain an array of illegal values
+   * @type {CompilerExt}
+   */
+  function compileIllegal(mode, _parent) {
+    if (!Array.isArray(mode.illegal)) return;
+
+    mode.illegal = either(...mode.illegal);
+  }
+
+  /**
+   * `match` to match a single expression for readability
+   * @type {CompilerExt}
+   */
+  function compileMatch(mode, _parent) {
+    if (!mode.match) return;
+    if (mode.begin || mode.end) throw new Error("begin & end are not supported with match");
+
+    mode.begin = mode.match;
+    delete mode.match;
+  }
+
+  /**
+   * provides the default 1 relevance to all modes
+   * @type {CompilerExt}
+   */
+  function compileRelevance(mode, _parent) {
+    // eslint-disable-next-line no-undefined
+    if (mode.relevance === undefined) mode.relevance = 1;
+  }
+
+  // allow beforeMatch to act as a "qualifier" for the match
+  // the full match begin must be [beforeMatch][begin]
+  const beforeMatchExt = (mode, parent) => {
+    if (!mode.beforeMatch) return;
+    // starts conflicts with endsParent which we need to make sure the child
+    // rule is not matched multiple times
+    if (mode.starts) throw new Error("beforeMatch cannot be used with starts");
+
+    const originalMode = Object.assign({}, mode);
+    Object.keys(mode).forEach((key) => { delete mode[key]; });
+
+    mode.keywords = originalMode.keywords;
+    mode.begin = concat(originalMode.beforeMatch, lookahead(originalMode.begin));
+    mode.starts = {
+      relevance: 0,
+      contains: [
+        Object.assign(originalMode, { endsParent: true })
+      ]
+    };
+    mode.relevance = 0;
+
+    delete originalMode.beforeMatch;
+  };
+
+  // keywords that should have no default relevance value
+  const COMMON_KEYWORDS = [
+    'of',
+    'and',
+    'for',
+    'in',
+    'not',
+    'or',
+    'if',
+    'then',
+    'parent', // common variable name
+    'list', // common variable name
+    'value' // common variable name
+  ];
+
+  const DEFAULT_KEYWORD_SCOPE = "keyword";
+
+  /**
+   * Given raw keywords from a language definition, compile them.
+   *
+   * @param {string | Record<string,string|string[]> | Array<string>} rawKeywords
+   * @param {boolean} caseInsensitive
+   */
+  function compileKeywords(rawKeywords, caseInsensitive, scopeName = DEFAULT_KEYWORD_SCOPE) {
+    /** @type {import("highlight.js/private").KeywordDict} */
+    const compiledKeywords = Object.create(null);
+
+    // input can be a string of keywords, an array of keywords, or a object with
+    // named keys representing scopeName (which can then point to a string or array)
+    if (typeof rawKeywords === 'string') {
+      compileList(scopeName, rawKeywords.split(" "));
+    } else if (Array.isArray(rawKeywords)) {
+      compileList(scopeName, rawKeywords);
+    } else {
+      Object.keys(rawKeywords).forEach(function(scopeName) {
+        // collapse all our objects back into the parent object
+        Object.assign(
+          compiledKeywords,
+          compileKeywords(rawKeywords[scopeName], caseInsensitive, scopeName)
+        );
+      });
+    }
+    return compiledKeywords;
+
+    // ---
+
+    /**
+     * Compiles an individual list of keywords
+     *
+     * Ex: "for if when while|5"
+     *
+     * @param {string} scopeName
+     * @param {Array<string>} keywordList
+     */
+    function compileList(scopeName, keywordList) {
+      if (caseInsensitive) {
+        keywordList = keywordList.map(x => x.toLowerCase());
+      }
+      keywordList.forEach(function(keyword) {
+        const pair = keyword.split('|');
+        compiledKeywords[pair[0]] = [scopeName, scoreForKeyword(pair[0], pair[1])];
+      });
+    }
+  }
+
+  /**
+   * Returns the proper score for a given keyword
+   *
+   * Also takes into account comment keywords, which will be scored 0 UNLESS
+   * another score has been manually assigned.
+   * @param {string} keyword
+   * @param {string} [providedScore]
+   */
+  function scoreForKeyword(keyword, providedScore) {
+    // manual scores always win over common keywords
+    // so you can force a score of 1 if you really insist
+    if (providedScore) {
+      return Number(providedScore);
+    }
+
+    return commonKeyword(keyword) ? 0 : 1;
+  }
+
+  /**
+   * Determines if a given keyword is common or not
+   *
+   * @param {string} keyword */
+  function commonKeyword(keyword) {
+    return COMMON_KEYWORDS.includes(keyword.toLowerCase());
+  }
+
+  /*
+
+  For the reasoning behind this please see:
+  https://github.com/highlightjs/highlight.js/issues/2880#issuecomment-747275419
+
+  */
+
+  /**
+   * @type {Record<string, boolean>}
+   */
+  const seenDeprecations = {};
+
+  /**
+   * @param {string} message
+   */
+  const error = (message) => {
+    console.error(message);
+  };
+
+  /**
+   * @param {string} message
+   * @param {any} args
+   */
+  const warn = (message, ...args) => {
+    console.log(`WARN: ${message}`, ...args);
+  };
+
+  /**
+   * @param {string} version
+   * @param {string} message
+   */
+  const deprecated = (version, message) => {
+    if (seenDeprecations[`${version}/${message}`]) return;
+
+    console.log(`Deprecated as of ${version}. ${message}`);
+    seenDeprecations[`${version}/${message}`] = true;
+  };
+
+  /* eslint-disable no-throw-literal */
+
+  /**
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  */
+
+  const MultiClassError = new Error();
+
+  /**
+   * Renumbers labeled scope names to account for additional inner match
+   * groups that otherwise would break everything.
+   *
+   * Lets say we 3 match scopes:
+   *
+   *   { 1 => ..., 2 => ..., 3 => ... }
+   *
+   * So what we need is a clean match like this:
+   *
+   *   (a)(b)(c) => [ "a", "b", "c" ]
+   *
+   * But this falls apart with inner match groups:
+   *
+   * (a)(((b)))(c) => ["a", "b", "b", "b", "c" ]
+   *
+   * Our scopes are now "out of alignment" and we're repeating `b` 3 times.
+   * What needs to happen is the numbers are remapped:
+   *
+   *   { 1 => ..., 2 => ..., 5 => ... }
+   *
+   * We also need to know that the ONLY groups that should be output
+   * are 1, 2, and 5.  This function handles this behavior.
+   *
+   * @param {CompiledMode} mode
+   * @param {Array<RegExp | string>} regexes
+   * @param {{key: "beginScope"|"endScope"}} opts
+   */
+  function remapScopeNames(mode, regexes, { key }) {
+    let offset = 0;
+    const scopeNames = mode[key];
+    /** @type Record<number,boolean> */
+    const emit = {};
+    /** @type Record<number,string> */
+    const positions = {};
+
+    for (let i = 1; i <= regexes.length; i++) {
+      positions[i + offset] = scopeNames[i];
+      emit[i + offset] = true;
+      offset += countMatchGroups(regexes[i - 1]);
+    }
+    // we use _emit to keep track of which match groups are "top-level" to avoid double
+    // output from inside match groups
+    mode[key] = positions;
+    mode[key]._emit = emit;
+    mode[key]._multi = true;
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function beginMultiClass(mode) {
+    if (!Array.isArray(mode.begin)) return;
+
+    if (mode.skip || mode.excludeBegin || mode.returnBegin) {
+      error("skip, excludeBegin, returnBegin not compatible with beginScope: {}");
+      throw MultiClassError;
+    }
+
+    if (typeof mode.beginScope !== "object" || mode.beginScope === null) {
+      error("beginScope must be object");
+      throw MultiClassError;
+    }
+
+    remapScopeNames(mode, mode.begin, { key: "beginScope" });
+    mode.begin = _rewriteBackreferences(mode.begin, { joinWith: "" });
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function endMultiClass(mode) {
+    if (!Array.isArray(mode.end)) return;
+
+    if (mode.skip || mode.excludeEnd || mode.returnEnd) {
+      error("skip, excludeEnd, returnEnd not compatible with endScope: {}");
+      throw MultiClassError;
+    }
+
+    if (typeof mode.endScope !== "object" || mode.endScope === null) {
+      error("endScope must be object");
+      throw MultiClassError;
+    }
+
+    remapScopeNames(mode, mode.end, { key: "endScope" });
+    mode.end = _rewriteBackreferences(mode.end, { joinWith: "" });
+  }
+
+  /**
+   * this exists only to allow `scope: {}` to be used beside `match:`
+   * Otherwise `beginScope` would necessary and that would look weird
+
+    {
+      match: [ /def/, /\w+/ ]
+      scope: { 1: "keyword" , 2: "title" }
+    }
+
+   * @param {CompiledMode} mode
+   */
+  function scopeSugar(mode) {
+    if (mode.scope && typeof mode.scope === "object" && mode.scope !== null) {
+      mode.beginScope = mode.scope;
+      delete mode.scope;
+    }
+  }
+
+  /**
+   * @param {CompiledMode} mode
+   */
+  function MultiClass(mode) {
+    scopeSugar(mode);
+
+    if (typeof mode.beginScope === "string") {
+      mode.beginScope = { _wrap: mode.beginScope };
+    }
+    if (typeof mode.endScope === "string") {
+      mode.endScope = { _wrap: mode.endScope };
+    }
+
+    beginMultiClass(mode);
+    endMultiClass(mode);
+  }
+
+  /**
+  @typedef {import('highlight.js').Mode} Mode
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  @typedef {import('highlight.js').Language} Language
+  @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
+  @typedef {import('highlight.js').CompiledLanguage} CompiledLanguage
+  */
+
+  // compilation
+
+  /**
+   * Compiles a language definition result
+   *
+   * Given the raw result of a language definition (Language), compiles this so
+   * that it is ready for highlighting code.
+   * @param {Language} language
+   * @returns {CompiledLanguage}
+   */
+  function compileLanguage(language) {
+    /**
+     * Builds a regex with the case sensitivity of the current language
+     *
+     * @param {RegExp | string} value
+     * @param {boolean} [global]
+     */
+    function langRe(value, global) {
+      return new RegExp(
+        source(value),
+        'm'
+        + (language.case_insensitive ? 'i' : '')
+        + (language.unicodeRegex ? 'u' : '')
+        + (global ? 'g' : '')
+      );
+    }
+
+    /**
+      Stores multiple regular expressions and allows you to quickly search for
+      them all in a string simultaneously - returning the first match.  It does
+      this by creating a huge (a|b|c) regex - each individual item wrapped with ()
+      and joined by `|` - using match groups to track position.  When a match is
+      found checking which position in the array has content allows us to figure
+      out which of the original regexes / match groups triggered the match.
+
+      The match object itself (the result of `Regex.exec`) is returned but also
+      enhanced by merging in any meta-data that was registered with the regex.
+      This is how we keep track of which mode matched, and what type of rule
+      (`illegal`, `begin`, end, etc).
+    */
+    class MultiRegex {
+      constructor() {
+        this.matchIndexes = {};
+        // @ts-ignore
+        this.regexes = [];
+        this.matchAt = 1;
+        this.position = 0;
+      }
+
+      // @ts-ignore
+      addRule(re, opts) {
+        opts.position = this.position++;
+        // @ts-ignore
+        this.matchIndexes[this.matchAt] = opts;
+        this.regexes.push([opts, re]);
+        this.matchAt += countMatchGroups(re) + 1;
+      }
+
+      compile() {
+        if (this.regexes.length === 0) {
+          // avoids the need to check length every time exec is called
+          // @ts-ignore
+          this.exec = () => null;
+        }
+        const terminators = this.regexes.map(el => el[1]);
+        this.matcherRe = langRe(_rewriteBackreferences(terminators, { joinWith: '|' }), true);
+        this.lastIndex = 0;
+      }
+
+      /** @param {string} s */
+      exec(s) {
+        this.matcherRe.lastIndex = this.lastIndex;
+        const match = this.matcherRe.exec(s);
+        if (!match) { return null; }
+
+        // eslint-disable-next-line no-undefined
+        const i = match.findIndex((el, i) => i > 0 && el !== undefined);
+        // @ts-ignore
+        const matchData = this.matchIndexes[i];
+        // trim off any earlier non-relevant match groups (ie, the other regex
+        // match groups that make up the multi-matcher)
+        match.splice(0, i);
+
+        return Object.assign(match, matchData);
+      }
+    }
+
+    /*
+      Created to solve the key deficiently with MultiRegex - there is no way to
+      test for multiple matches at a single location.  Why would we need to do
+      that?  In the future a more dynamic engine will allow certain matches to be
+      ignored.  An example: if we matched say the 3rd regex in a large group but
+      decided to ignore it - we'd need to started testing again at the 4th
+      regex... but MultiRegex itself gives us no real way to do that.
+
+      So what this class creates MultiRegexs on the fly for whatever search
+      position they are needed.
+
+      NOTE: These additional MultiRegex objects are created dynamically.  For most
+      grammars most of the time we will never actually need anything more than the
+      first MultiRegex - so this shouldn't have too much overhead.
+
+      Say this is our search group, and we match regex3, but wish to ignore it.
+
+        regex1 | regex2 | regex3 | regex4 | regex5    ' ie, startAt = 0
+
+      What we need is a new MultiRegex that only includes the remaining
+      possibilities:
+
+        regex4 | regex5                               ' ie, startAt = 3
+
+      This class wraps all that complexity up in a simple API... `startAt` decides
+      where in the array of expressions to start doing the matching. It
+      auto-increments, so if a match is found at position 2, then startAt will be
+      set to 3.  If the end is reached startAt will return to 0.
+
+      MOST of the time the parser will be setting startAt manually to 0.
+    */
+    class ResumableMultiRegex {
+      constructor() {
+        // @ts-ignore
+        this.rules = [];
+        // @ts-ignore
+        this.multiRegexes = [];
+        this.count = 0;
+
+        this.lastIndex = 0;
+        this.regexIndex = 0;
+      }
+
+      // @ts-ignore
+      getMatcher(index) {
+        if (this.multiRegexes[index]) return this.multiRegexes[index];
+
+        const matcher = new MultiRegex();
+        this.rules.slice(index).forEach(([re, opts]) => matcher.addRule(re, opts));
+        matcher.compile();
+        this.multiRegexes[index] = matcher;
+        return matcher;
+      }
+
+      resumingScanAtSamePosition() {
+        return this.regexIndex !== 0;
+      }
+
+      considerAll() {
+        this.regexIndex = 0;
+      }
+
+      // @ts-ignore
+      addRule(re, opts) {
+        this.rules.push([re, opts]);
+        if (opts.type === "begin") this.count++;
+      }
+
+      /** @param {string} s */
+      exec(s) {
+        const m = this.getMatcher(this.regexIndex);
+        m.lastIndex = this.lastIndex;
+        let result = m.exec(s);
+
+        // The following is because we have no easy way to say "resume scanning at the
+        // existing position but also skip the current rule ONLY". What happens is
+        // all prior rules are also skipped which can result in matching the wrong
+        // thing. Example of matching "booger":
+
+        // our matcher is [string, "booger", number]
+        //
+        // ....booger....
+
+        // if "booger" is ignored then we'd really need a regex to scan from the
+        // SAME position for only: [string, number] but ignoring "booger" (if it
+        // was the first match), a simple resume would scan ahead who knows how
+        // far looking only for "number", ignoring potential string matches (or
+        // future "booger" matches that might be valid.)
+
+        // So what we do: We execute two matchers, one resuming at the same
+        // position, but the second full matcher starting at the position after:
+
+        //     /--- resume first regex match here (for [number])
+        //     |/---- full match here for [string, "booger", number]
+        //     vv
+        // ....booger....
+
+        // Which ever results in a match first is then used. So this 3-4 step
+        // process essentially allows us to say "match at this position, excluding
+        // a prior rule that was ignored".
+        //
+        // 1. Match "booger" first, ignore. Also proves that [string] does non match.
+        // 2. Resume matching for [number]
+        // 3. Match at index + 1 for [string, "booger", number]
+        // 4. If #2 and #3 result in matches, which came first?
+        if (this.resumingScanAtSamePosition()) {
+          if (result && result.index === this.lastIndex) ; else { // use the second matcher result
+            const m2 = this.getMatcher(0);
+            m2.lastIndex = this.lastIndex + 1;
+            result = m2.exec(s);
+          }
+        }
+
+        if (result) {
+          this.regexIndex += result.position + 1;
+          if (this.regexIndex === this.count) {
+            // wrap-around to considering all matches again
+            this.considerAll();
+          }
+        }
+
+        return result;
+      }
+    }
+
+    /**
+     * Given a mode, builds a huge ResumableMultiRegex that can be used to walk
+     * the content and find matches.
+     *
+     * @param {CompiledMode} mode
+     * @returns {ResumableMultiRegex}
+     */
+    function buildModeRegex(mode) {
+      const mm = new ResumableMultiRegex();
+
+      mode.contains.forEach(term => mm.addRule(term.begin, { rule: term, type: "begin" }));
+
+      if (mode.terminatorEnd) {
+        mm.addRule(mode.terminatorEnd, { type: "end" });
+      }
+      if (mode.illegal) {
+        mm.addRule(mode.illegal, { type: "illegal" });
+      }
+
+      return mm;
+    }
+
+    /** skip vs abort vs ignore
+     *
+     * @skip   - The mode is still entered and exited normally (and contains rules apply),
+     *           but all content is held and added to the parent buffer rather than being
+     *           output when the mode ends.  Mostly used with `sublanguage` to build up
+     *           a single large buffer than can be parsed by sublanguage.
+     *
+     *             - The mode begin ands ends normally.
+     *             - Content matched is added to the parent mode buffer.
+     *             - The parser cursor is moved forward normally.
+     *
+     * @abort  - A hack placeholder until we have ignore.  Aborts the mode (as if it
+     *           never matched) but DOES NOT continue to match subsequent `contains`
+     *           modes.  Abort is bad/suboptimal because it can result in modes
+     *           farther down not getting applied because an earlier rule eats the
+     *           content but then aborts.
+     *
+     *             - The mode does not begin.
+     *             - Content matched by `begin` is added to the mode buffer.
+     *             - The parser cursor is moved forward accordingly.
+     *
+     * @ignore - Ignores the mode (as if it never matched) and continues to match any
+     *           subsequent `contains` modes.  Ignore isn't technically possible with
+     *           the current parser implementation.
+     *
+     *             - The mode does not begin.
+     *             - Content matched by `begin` is ignored.
+     *             - The parser cursor is not moved forward.
+     */
+
+    /**
+     * Compiles an individual mode
+     *
+     * This can raise an error if the mode contains certain detectable known logic
+     * issues.
+     * @param {Mode} mode
+     * @param {CompiledMode | null} [parent]
+     * @returns {CompiledMode | never}
+     */
+    function compileMode(mode, parent) {
+      const cmode = /** @type CompiledMode */ (mode);
+      if (mode.isCompiled) return cmode;
+
+      [
+        scopeClassName,
+        // do this early so compiler extensions generally don't have to worry about
+        // the distinction between match/begin
+        compileMatch,
+        MultiClass,
+        beforeMatchExt
+      ].forEach(ext => ext(mode, parent));
+
+      language.compilerExtensions.forEach(ext => ext(mode, parent));
+
+      // __beforeBegin is considered private API, internal use only
+      mode.__beforeBegin = null;
+
+      [
+        beginKeywords,
+        // do this later so compiler extensions that come earlier have access to the
+        // raw array if they wanted to perhaps manipulate it, etc.
+        compileIllegal,
+        // default to 1 relevance if not specified
+        compileRelevance
+      ].forEach(ext => ext(mode, parent));
+
+      mode.isCompiled = true;
+
+      let keywordPattern = null;
+      if (typeof mode.keywords === "object" && mode.keywords.$pattern) {
+        // we need a copy because keywords might be compiled multiple times
+        // so we can't go deleting $pattern from the original on the first
+        // pass
+        mode.keywords = Object.assign({}, mode.keywords);
+        keywordPattern = mode.keywords.$pattern;
+        delete mode.keywords.$pattern;
+      }
+      keywordPattern = keywordPattern || /\w+/;
+
+      if (mode.keywords) {
+        mode.keywords = compileKeywords(mode.keywords, language.case_insensitive);
+      }
+
+      cmode.keywordPatternRe = langRe(keywordPattern, true);
+
+      if (parent) {
+        if (!mode.begin) mode.begin = /\B|\b/;
+        cmode.beginRe = langRe(cmode.begin);
+        if (!mode.end && !mode.endsWithParent) mode.end = /\B|\b/;
+        if (mode.end) cmode.endRe = langRe(cmode.end);
+        cmode.terminatorEnd = source(cmode.end) || '';
+        if (mode.endsWithParent && parent.terminatorEnd) {
+          cmode.terminatorEnd += (mode.end ? '|' : '') + parent.terminatorEnd;
+        }
+      }
+      if (mode.illegal) cmode.illegalRe = langRe(/** @type {RegExp | string} */ (mode.illegal));
+      if (!mode.contains) mode.contains = [];
+
+      mode.contains = [].concat(...mode.contains.map(function(c) {
+        return expandOrCloneMode(c === 'self' ? mode : c);
+      }));
+      mode.contains.forEach(function(c) { compileMode(/** @type Mode */ (c), cmode); });
+
+      if (mode.starts) {
+        compileMode(mode.starts, parent);
+      }
+
+      cmode.matcher = buildModeRegex(cmode);
+      return cmode;
+    }
+
+    if (!language.compilerExtensions) language.compilerExtensions = [];
+
+    // self is not valid at the top-level
+    if (language.contains && language.contains.includes('self')) {
+      throw new Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");
+    }
+
+    // we need a null object, which inherit will guarantee
+    language.classNameAliases = inherit$1(language.classNameAliases || {});
+
+    return compileMode(/** @type Mode */ (language));
+  }
+
+  /**
+   * Determines if a mode has a dependency on it's parent or not
+   *
+   * If a mode does have a parent dependency then often we need to clone it if
+   * it's used in multiple places so that each copy points to the correct parent,
+   * where-as modes without a parent can often safely be re-used at the bottom of
+   * a mode chain.
+   *
+   * @param {Mode | null} mode
+   * @returns {boolean} - is there a dependency on the parent?
+   * */
+  function dependencyOnParent(mode) {
+    if (!mode) return false;
+
+    return mode.endsWithParent || dependencyOnParent(mode.starts);
+  }
+
+  /**
+   * Expands a mode or clones it if necessary
+   *
+   * This is necessary for modes with parental dependenceis (see notes on
+   * `dependencyOnParent`) and for nodes that have `variants` - which must then be
+   * exploded into their own individual modes at compile time.
+   *
+   * @param {Mode} mode
+   * @returns {Mode | Mode[]}
+   * */
+  function expandOrCloneMode(mode) {
+    if (mode.variants && !mode.cachedVariants) {
+      mode.cachedVariants = mode.variants.map(function(variant) {
+        return inherit$1(mode, { variants: null }, variant);
+      });
+    }
+
+    // EXPAND
+    // if we have variants then essentially "replace" the mode with the variants
+    // this happens in compileMode, where this function is called from
+    if (mode.cachedVariants) {
+      return mode.cachedVariants;
+    }
+
+    // CLONE
+    // if we have dependencies on parents then we need a unique
+    // instance of ourselves, so we can be reused with many
+    // different parents without issue
+    if (dependencyOnParent(mode)) {
+      return inherit$1(mode, { starts: mode.starts ? inherit$1(mode.starts) : null });
+    }
+
+    if (Object.isFrozen(mode)) {
+      return inherit$1(mode);
+    }
+
+    // no special dependency issues, just return ourselves
+    return mode;
+  }
+
+  var version = "11.11.1";
+
+  class HTMLInjectionError extends Error {
+    constructor(reason, html) {
+      super(reason);
+      this.name = "HTMLInjectionError";
+      this.html = html;
+    }
+  }
+
+  /*
+  Syntax highlighting with language autodetection.
+  https://highlightjs.org/
+  */
+
+
+
+  /**
+  @typedef {import('highlight.js').Mode} Mode
+  @typedef {import('highlight.js').CompiledMode} CompiledMode
+  @typedef {import('highlight.js').CompiledScope} CompiledScope
+  @typedef {import('highlight.js').Language} Language
+  @typedef {import('highlight.js').HLJSApi} HLJSApi
+  @typedef {import('highlight.js').HLJSPlugin} HLJSPlugin
+  @typedef {import('highlight.js').PluginEvent} PluginEvent
+  @typedef {import('highlight.js').HLJSOptions} HLJSOptions
+  @typedef {import('highlight.js').LanguageFn} LanguageFn
+  @typedef {import('highlight.js').HighlightedHTMLElement} HighlightedHTMLElement
+  @typedef {import('highlight.js').BeforeHighlightContext} BeforeHighlightContext
+  @typedef {import('highlight.js/private').MatchType} MatchType
+  @typedef {import('highlight.js/private').KeywordData} KeywordData
+  @typedef {import('highlight.js/private').EnhancedMatch} EnhancedMatch
+  @typedef {import('highlight.js/private').AnnotatedError} AnnotatedError
+  @typedef {import('highlight.js').AutoHighlightResult} AutoHighlightResult
+  @typedef {import('highlight.js').HighlightOptions} HighlightOptions
+  @typedef {import('highlight.js').HighlightResult} HighlightResult
+  */
+
+
+  const escape = escapeHTML;
+  const inherit = inherit$1;
+  const NO_MATCH = Symbol("nomatch");
+  const MAX_KEYWORD_HITS = 7;
+
+  /**
+   * @param {any} hljs - object that is extended (legacy)
+   * @returns {HLJSApi}
+   */
+  const HLJS = function(hljs) {
+    // Global internal variables used within the highlight.js library.
+    /** @type {Record<string, Language>} */
+    const languages = Object.create(null);
+    /** @type {Record<string, string>} */
+    const aliases = Object.create(null);
+    /** @type {HLJSPlugin[]} */
+    const plugins = [];
+
+    // safe/production mode - swallows more errors, tries to keep running
+    // even if a single syntax or parse hits a fatal error
+    let SAFE_MODE = true;
+    const LANGUAGE_NOT_FOUND = "Could not find the language '{}', did you forget to load/include a language module?";
+    /** @type {Language} */
+    const PLAINTEXT_LANGUAGE = { disableAutodetect: true, name: 'Plain text', contains: [] };
+
+    // Global options used when within external APIs. This is modified when
+    // calling the `hljs.configure` function.
+    /** @type HLJSOptions */
+    let options = {
+      ignoreUnescapedHTML: false,
+      throwUnescapedHTML: false,
+      noHighlightRe: /^(no-?highlight)$/i,
+      languageDetectRe: /\blang(?:uage)?-([\w-]+)\b/i,
+      classPrefix: 'hljs-',
+      cssSelector: 'pre code',
+      languages: null,
+      // beta configuration options, subject to change, welcome to discuss
+      // https://github.com/highlightjs/highlight.js/issues/1086
+      __emitter: TokenTreeEmitter
+    };
+
+    /* Utility functions */
+
+    /**
+     * Tests a language name to see if highlighting should be skipped
+     * @param {string} languageName
+     */
+    function shouldNotHighlight(languageName) {
+      return options.noHighlightRe.test(languageName);
+    }
+
+    /**
+     * @param {HighlightedHTMLElement} block - the HTML element to determine language for
+     */
+    function blockLanguage(block) {
+      let classes = block.className + ' ';
+
+      classes += block.parentNode ? block.parentNode.className : '';
+
+      // language-* takes precedence over non-prefixed class names.
+      const match = options.languageDetectRe.exec(classes);
+      if (match) {
+        const language = getLanguage(match[1]);
+        if (!language) {
+          warn(LANGUAGE_NOT_FOUND.replace("{}", match[1]));
+          warn("Falling back to no-highlight mode for this block.", block);
+        }
+        return language ? match[1] : 'no-highlight';
+      }
+
+      return classes
+        .split(/\s+/)
+        .find((_class) => shouldNotHighlight(_class) || getLanguage(_class));
+    }
+
+    /**
+     * Core highlighting function.
+     *
+     * OLD API
+     * highlight(lang, code, ignoreIllegals, continuation)
+     *
+     * NEW API
+     * highlight(code, {lang, ignoreIllegals})
+     *
+     * @param {string} codeOrLanguageName - the language to use for highlighting
+     * @param {string | HighlightOptions} optionsOrCode - the code to highlight
+     * @param {boolean} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+     *
+     * @returns {HighlightResult} Result - an object that represents the result
+     * @property {string} language - the language name
+     * @property {number} relevance - the relevance score
+     * @property {string} value - the highlighted HTML code
+     * @property {string} code - the original raw code
+     * @property {CompiledMode} top - top of the current mode stack
+     * @property {boolean} illegal - indicates whether any illegal matches were found
+    */
+    function highlight(codeOrLanguageName, optionsOrCode, ignoreIllegals) {
+      let code = "";
+      let languageName = "";
+      if (typeof optionsOrCode === "object") {
+        code = codeOrLanguageName;
+        ignoreIllegals = optionsOrCode.ignoreIllegals;
+        languageName = optionsOrCode.language;
+      } else {
+        // old API
+        deprecated("10.7.0", "highlight(lang, code, ...args) has been deprecated.");
+        deprecated("10.7.0", "Please use highlight(code, options) instead.\nhttps://github.com/highlightjs/highlight.js/issues/2277");
+        languageName = codeOrLanguageName;
+        code = optionsOrCode;
+      }
+
+      // https://github.com/highlightjs/highlight.js/issues/3149
+      // eslint-disable-next-line no-undefined
+      if (ignoreIllegals === undefined) { ignoreIllegals = true; }
+
+      /** @type {BeforeHighlightContext} */
+      const context = {
+        code,
+        language: languageName
+      };
+      // the plugin can change the desired language or the code to be highlighted
+      // just be changing the object it was passed
+      fire("before:highlight", context);
+
+      // a before plugin can usurp the result completely by providing it's own
+      // in which case we don't even need to call highlight
+      const result = context.result
+        ? context.result
+        : _highlight(context.language, context.code, ignoreIllegals);
+
+      result.code = context.code;
+      // the plugin can change anything in result to suite it
+      fire("after:highlight", result);
+
+      return result;
+    }
+
+    /**
+     * private highlight that's used internally and does not fire callbacks
+     *
+     * @param {string} languageName - the language to use for highlighting
+     * @param {string} codeToHighlight - the code to highlight
+     * @param {boolean?} [ignoreIllegals] - whether to ignore illegal matches, default is to bail
+     * @param {CompiledMode?} [continuation] - current continuation mode, if any
+     * @returns {HighlightResult} - result of the highlight operation
+    */
+    function _highlight(languageName, codeToHighlight, ignoreIllegals, continuation) {
+      const keywordHits = Object.create(null);
+
+      /**
+       * Return keyword data if a match is a keyword
+       * @param {CompiledMode} mode - current mode
+       * @param {string} matchText - the textual match
+       * @returns {KeywordData | false}
+       */
+      function keywordData(mode, matchText) {
+        return mode.keywords[matchText];
+      }
+
+      function processKeywords() {
+        if (!top.keywords) {
+          emitter.addText(modeBuffer);
+          return;
+        }
+
+        let lastIndex = 0;
+        top.keywordPatternRe.lastIndex = 0;
+        let match = top.keywordPatternRe.exec(modeBuffer);
+        let buf = "";
+
+        while (match) {
+          buf += modeBuffer.substring(lastIndex, match.index);
+          const word = language.case_insensitive ? match[0].toLowerCase() : match[0];
+          const data = keywordData(top, word);
+          if (data) {
+            const [kind, keywordRelevance] = data;
+            emitter.addText(buf);
+            buf = "";
+
+            keywordHits[word] = (keywordHits[word] || 0) + 1;
+            if (keywordHits[word] <= MAX_KEYWORD_HITS) relevance += keywordRelevance;
+            if (kind.startsWith("_")) {
+              // _ implied for relevance only, do not highlight
+              // by applying a class name
+              buf += match[0];
+            } else {
+              const cssClass = language.classNameAliases[kind] || kind;
+              emitKeyword(match[0], cssClass);
+            }
+          } else {
+            buf += match[0];
+          }
+          lastIndex = top.keywordPatternRe.lastIndex;
+          match = top.keywordPatternRe.exec(modeBuffer);
+        }
+        buf += modeBuffer.substring(lastIndex);
+        emitter.addText(buf);
+      }
+
+      function processSubLanguage() {
+        if (modeBuffer === "") return;
+        /** @type HighlightResult */
+        let result = null;
+
+        if (typeof top.subLanguage === 'string') {
+          if (!languages[top.subLanguage]) {
+            emitter.addText(modeBuffer);
+            return;
+          }
+          result = _highlight(top.subLanguage, modeBuffer, true, continuations[top.subLanguage]);
+          continuations[top.subLanguage] = /** @type {CompiledMode} */ (result._top);
+        } else {
+          result = highlightAuto(modeBuffer, top.subLanguage.length ? top.subLanguage : null);
+        }
+
+        // Counting embedded language score towards the host language may be disabled
+        // with zeroing the containing mode relevance. Use case in point is Markdown that
+        // allows XML everywhere and makes every XML snippet to have a much larger Markdown
+        // score.
+        if (top.relevance > 0) {
+          relevance += result.relevance;
+        }
+        emitter.__addSublanguage(result._emitter, result.language);
+      }
+
+      function processBuffer() {
+        if (top.subLanguage != null) {
+          processSubLanguage();
+        } else {
+          processKeywords();
+        }
+        modeBuffer = '';
+      }
+
+      /**
+       * @param {string} text
+       * @param {string} scope
+       */
+      function emitKeyword(keyword, scope) {
+        if (keyword === "") return;
+
+        emitter.startScope(scope);
+        emitter.addText(keyword);
+        emitter.endScope();
+      }
+
+      /**
+       * @param {CompiledScope} scope
+       * @param {RegExpMatchArray} match
+       */
+      function emitMultiClass(scope, match) {
+        let i = 1;
+        const max = match.length - 1;
+        while (i <= max) {
+          if (!scope._emit[i]) { i++; continue; }
+          const klass = language.classNameAliases[scope[i]] || scope[i];
+          const text = match[i];
+          if (klass) {
+            emitKeyword(text, klass);
+          } else {
+            modeBuffer = text;
+            processKeywords();
+            modeBuffer = "";
+          }
+          i++;
+        }
+      }
+
+      /**
+       * @param {CompiledMode} mode - new mode to start
+       * @param {RegExpMatchArray} match
+       */
+      function startNewMode(mode, match) {
+        if (mode.scope && typeof mode.scope === "string") {
+          emitter.openNode(language.classNameAliases[mode.scope] || mode.scope);
+        }
+        if (mode.beginScope) {
+          // beginScope just wraps the begin match itself in a scope
+          if (mode.beginScope._wrap) {
+            emitKeyword(modeBuffer, language.classNameAliases[mode.beginScope._wrap] || mode.beginScope._wrap);
+            modeBuffer = "";
+          } else if (mode.beginScope._multi) {
+            // at this point modeBuffer should just be the match
+            emitMultiClass(mode.beginScope, match);
+            modeBuffer = "";
+          }
+        }
+
+        top = Object.create(mode, { parent: { value: top } });
+        return top;
+      }
+
+      /**
+       * @param {CompiledMode } mode - the mode to potentially end
+       * @param {RegExpMatchArray} match - the latest match
+       * @param {string} matchPlusRemainder - match plus remainder of content
+       * @returns {CompiledMode | void} - the next mode, or if void continue on in current mode
+       */
+      function endOfMode(mode, match, matchPlusRemainder) {
+        let matched = startsWith(mode.endRe, matchPlusRemainder);
+
+        if (matched) {
+          if (mode["on:end"]) {
+            const resp = new Response(mode);
+            mode["on:end"](match, resp);
+            if (resp.isMatchIgnored) matched = false;
+          }
+
+          if (matched) {
+            while (mode.endsParent && mode.parent) {
+              mode = mode.parent;
+            }
+            return mode;
+          }
+        }
+        // even if on:end fires an `ignore` it's still possible
+        // that we might trigger the end node because of a parent mode
+        if (mode.endsWithParent) {
+          return endOfMode(mode.parent, match, matchPlusRemainder);
+        }
+      }
+
+      /**
+       * Handle matching but then ignoring a sequence of text
+       *
+       * @param {string} lexeme - string containing full match text
+       */
+      function doIgnore(lexeme) {
+        if (top.matcher.regexIndex === 0) {
+          // no more regexes to potentially match here, so we move the cursor forward one
+          // space
+          modeBuffer += lexeme[0];
+          return 1;
+        } else {
+          // no need to move the cursor, we still have additional regexes to try and
+          // match at this very spot
+          resumeScanAtSamePosition = true;
+          return 0;
+        }
+      }
+
+      /**
+       * Handle the start of a new potential mode match
+       *
+       * @param {EnhancedMatch} match - the current match
+       * @returns {number} how far to advance the parse cursor
+       */
+      function doBeginMatch(match) {
+        const lexeme = match[0];
+        const newMode = match.rule;
+
+        const resp = new Response(newMode);
+        // first internal before callbacks, then the public ones
+        const beforeCallbacks = [newMode.__beforeBegin, newMode["on:begin"]];
+        for (const cb of beforeCallbacks) {
+          if (!cb) continue;
+          cb(match, resp);
+          if (resp.isMatchIgnored) return doIgnore(lexeme);
+        }
+
+        if (newMode.skip) {
+          modeBuffer += lexeme;
+        } else {
+          if (newMode.excludeBegin) {
+            modeBuffer += lexeme;
+          }
+          processBuffer();
+          if (!newMode.returnBegin && !newMode.excludeBegin) {
+            modeBuffer = lexeme;
+          }
+        }
+        startNewMode(newMode, match);
+        return newMode.returnBegin ? 0 : lexeme.length;
+      }
+
+      /**
+       * Handle the potential end of mode
+       *
+       * @param {RegExpMatchArray} match - the current match
+       */
+      function doEndMatch(match) {
+        const lexeme = match[0];
+        const matchPlusRemainder = codeToHighlight.substring(match.index);
+
+        const endMode = endOfMode(top, match, matchPlusRemainder);
+        if (!endMode) { return NO_MATCH; }
+
+        const origin = top;
+        if (top.endScope && top.endScope._wrap) {
+          processBuffer();
+          emitKeyword(lexeme, top.endScope._wrap);
+        } else if (top.endScope && top.endScope._multi) {
+          processBuffer();
+          emitMultiClass(top.endScope, match);
+        } else if (origin.skip) {
+          modeBuffer += lexeme;
+        } else {
+          if (!(origin.returnEnd || origin.excludeEnd)) {
+            modeBuffer += lexeme;
+          }
+          processBuffer();
+          if (origin.excludeEnd) {
+            modeBuffer = lexeme;
+          }
+        }
+        do {
+          if (top.scope) {
+            emitter.closeNode();
+          }
+          if (!top.skip && !top.subLanguage) {
+            relevance += top.relevance;
+          }
+          top = top.parent;
+        } while (top !== endMode.parent);
+        if (endMode.starts) {
+          startNewMode(endMode.starts, match);
+        }
+        return origin.returnEnd ? 0 : lexeme.length;
+      }
+
+      function processContinuations() {
+        const list = [];
+        for (let current = top; current !== language; current = current.parent) {
+          if (current.scope) {
+            list.unshift(current.scope);
+          }
+        }
+        list.forEach(item => emitter.openNode(item));
+      }
+
+      /** @type {{type?: MatchType, index?: number, rule?: Mode}}} */
+      let lastMatch = {};
+
+      /**
+       *  Process an individual match
+       *
+       * @param {string} textBeforeMatch - text preceding the match (since the last match)
+       * @param {EnhancedMatch} [match] - the match itself
+       */
+      function processLexeme(textBeforeMatch, match) {
+        const lexeme = match && match[0];
+
+        // add non-matched text to the current mode buffer
+        modeBuffer += textBeforeMatch;
+
+        if (lexeme == null) {
+          processBuffer();
+          return 0;
+        }
+
+        // we've found a 0 width match and we're stuck, so we need to advance
+        // this happens when we have badly behaved rules that have optional matchers to the degree that
+        // sometimes they can end up matching nothing at all
+        // Ref: https://github.com/highlightjs/highlight.js/issues/2140
+        if (lastMatch.type === "begin" && match.type === "end" && lastMatch.index === match.index && lexeme === "") {
+          // spit the "skipped" character that our regex choked on back into the output sequence
+          modeBuffer += codeToHighlight.slice(match.index, match.index + 1);
+          if (!SAFE_MODE) {
+            /** @type {AnnotatedError} */
+            const err = new Error(`0 width match regex (${languageName})`);
+            err.languageName = languageName;
+            err.badRule = lastMatch.rule;
+            throw err;
+          }
+          return 1;
+        }
+        lastMatch = match;
+
+        if (match.type === "begin") {
+          return doBeginMatch(match);
+        } else if (match.type === "illegal" && !ignoreIllegals) {
+          // illegal match, we do not continue processing
+          /** @type {AnnotatedError} */
+          const err = new Error('Illegal lexeme "' + lexeme + '" for mode "' + (top.scope || '<unnamed>') + '"');
+          err.mode = top;
+          throw err;
+        } else if (match.type === "end") {
+          const processed = doEndMatch(match);
+          if (processed !== NO_MATCH) {
+            return processed;
+          }
+        }
+
+        // edge case for when illegal matches $ (end of line) which is technically
+        // a 0 width match but not a begin/end match so it's not caught by the
+        // first handler (when ignoreIllegals is true)
+        if (match.type === "illegal" && lexeme === "") {
+          // advance so we aren't stuck in an infinite loop
+          modeBuffer += "\n";
+          return 1;
+        }
+
+        // infinite loops are BAD, this is a last ditch catch all. if we have a
+        // decent number of iterations yet our index (cursor position in our
+        // parsing) still 3x behind our index then something is very wrong
+        // so we bail
+        if (iterations > 100000 && iterations > match.index * 3) {
+          const err = new Error('potential infinite loop, way more iterations than matches');
+          throw err;
+        }
+
+        /*
+        Why might be find ourselves here?  An potential end match that was
+        triggered but could not be completed.  IE, `doEndMatch` returned NO_MATCH.
+        (this could be because a callback requests the match be ignored, etc)
+
+        This causes no real harm other than stopping a few times too many.
+        */
+
+        modeBuffer += lexeme;
+        return lexeme.length;
+      }
+
+      const language = getLanguage(languageName);
+      if (!language) {
+        error(LANGUAGE_NOT_FOUND.replace("{}", languageName));
+        throw new Error('Unknown language: "' + languageName + '"');
+      }
+
+      const md = compileLanguage(language);
+      let result = '';
+      /** @type {CompiledMode} */
+      let top = continuation || md;
+      /** @type Record<string,CompiledMode> */
+      const continuations = {}; // keep continuations for sub-languages
+      const emitter = new options.__emitter(options);
+      processContinuations();
+      let modeBuffer = '';
+      let relevance = 0;
+      let index = 0;
+      let iterations = 0;
+      let resumeScanAtSamePosition = false;
+
+      try {
+        if (!language.__emitTokens) {
+          top.matcher.considerAll();
+
+          for (;;) {
+            iterations++;
+            if (resumeScanAtSamePosition) {
+              // only regexes not matched previously will now be
+              // considered for a potential match
+              resumeScanAtSamePosition = false;
+            } else {
+              top.matcher.considerAll();
+            }
+            top.matcher.lastIndex = index;
+
+            const match = top.matcher.exec(codeToHighlight);
+            // console.log("match", match[0], match.rule && match.rule.begin)
+
+            if (!match) break;
+
+            const beforeMatch = codeToHighlight.substring(index, match.index);
+            const processedCount = processLexeme(beforeMatch, match);
+            index = match.index + processedCount;
+          }
+          processLexeme(codeToHighlight.substring(index));
+        } else {
+          language.__emitTokens(codeToHighlight, emitter);
+        }
+
+        emitter.finalize();
+        result = emitter.toHTML();
+
+        return {
+          language: languageName,
+          value: result,
+          relevance,
+          illegal: false,
+          _emitter: emitter,
+          _top: top
+        };
+      } catch (err) {
+        if (err.message && err.message.includes('Illegal')) {
+          return {
+            language: languageName,
+            value: escape(codeToHighlight),
+            illegal: true,
+            relevance: 0,
+            _illegalBy: {
+              message: err.message,
+              index,
+              context: codeToHighlight.slice(index - 100, index + 100),
+              mode: err.mode,
+              resultSoFar: result
+            },
+            _emitter: emitter
+          };
+        } else if (SAFE_MODE) {
+          return {
+            language: languageName,
+            value: escape(codeToHighlight),
+            illegal: false,
+            relevance: 0,
+            errorRaised: err,
+            _emitter: emitter,
+            _top: top
+          };
+        } else {
+          throw err;
+        }
+      }
+    }
+
+    /**
+     * returns a valid highlight result, without actually doing any actual work,
+     * auto highlight starts with this and it's possible for small snippets that
+     * auto-detection may not find a better match
+     * @param {string} code
+     * @returns {HighlightResult}
+     */
+    function justTextHighlightResult(code) {
+      const result = {
+        value: escape(code),
+        illegal: false,
+        relevance: 0,
+        _top: PLAINTEXT_LANGUAGE,
+        _emitter: new options.__emitter(options)
+      };
+      result._emitter.addText(code);
+      return result;
+    }
+
+    /**
+    Highlighting with language detection. Accepts a string with the code to
+    highlight. Returns an object with the following properties:
+
+    - language (detected language)
+    - relevance (int)
+    - value (an HTML string with highlighting markup)
+    - secondBest (object with the same structure for second-best heuristically
+      detected language, may be absent)
+
+      @param {string} code
+      @param {Array<string>} [languageSubset]
+      @returns {AutoHighlightResult}
+    */
+    function highlightAuto(code, languageSubset) {
+      languageSubset = languageSubset || options.languages || Object.keys(languages);
+      const plaintext = justTextHighlightResult(code);
+
+      const results = languageSubset.filter(getLanguage).filter(autoDetection).map(name =>
+        _highlight(name, code, false)
+      );
+      results.unshift(plaintext); // plaintext is always an option
+
+      const sorted = results.sort((a, b) => {
+        // sort base on relevance
+        if (a.relevance !== b.relevance) return b.relevance - a.relevance;
+
+        // always award the tie to the base language
+        // ie if C++ and Arduino are tied, it's more likely to be C++
+        if (a.language && b.language) {
+          if (getLanguage(a.language).supersetOf === b.language) {
+            return 1;
+          } else if (getLanguage(b.language).supersetOf === a.language) {
+            return -1;
+          }
+        }
+
+        // otherwise say they are equal, which has the effect of sorting on
+        // relevance while preserving the original ordering - which is how ties
+        // have historically been settled, ie the language that comes first always
+        // wins in the case of a tie
+        return 0;
+      });
+
+      const [best, secondBest] = sorted;
+
+      /** @type {AutoHighlightResult} */
+      const result = best;
+      result.secondBest = secondBest;
+
+      return result;
+    }
+
+    /**
+     * Builds new class name for block given the language name
+     *
+     * @param {HTMLElement} element
+     * @param {string} [currentLang]
+     * @param {string} [resultLang]
+     */
+    function updateClassName(element, currentLang, resultLang) {
+      const language = (currentLang && aliases[currentLang]) || resultLang;
+
+      element.classList.add("hljs");
+      element.classList.add(`language-${language}`);
+    }
+
+    /**
+     * Applies highlighting to a DOM node containing code.
+     *
+     * @param {HighlightedHTMLElement} element - the HTML element to highlight
+    */
+    function highlightElement(element) {
+      /** @type HTMLElement */
+      let node = null;
+      const language = blockLanguage(element);
+
+      if (shouldNotHighlight(language)) return;
+
+      fire("before:highlightElement",
+        { el: element, language });
+
+      if (element.dataset.highlighted) {
+        console.log("Element previously highlighted. To highlight again, first unset `dataset.highlighted`.", element);
+        return;
+      }
+
+      // we should be all text, no child nodes (unescaped HTML) - this is possibly
+      // an HTML injection attack - it's likely too late if this is already in
+      // production (the code has likely already done its damage by the time
+      // we're seeing it)... but we yell loudly about this so that hopefully it's
+      // more likely to be caught in development before making it to production
+      if (element.children.length > 0) {
+        if (!options.ignoreUnescapedHTML) {
+          console.warn("One of your code blocks includes unescaped HTML. This is a potentially serious security risk.");
+          console.warn("https://github.com/highlightjs/highlight.js/wiki/security");
+          console.warn("The element with unescaped HTML:");
+          console.warn(element);
+        }
+        if (options.throwUnescapedHTML) {
+          const err = new HTMLInjectionError(
+            "One of your code blocks includes unescaped HTML.",
+            element.innerHTML
+          );
+          throw err;
+        }
+      }
+
+      node = element;
+      const text = node.textContent;
+      const result = language ? highlight(text, { language, ignoreIllegals: true }) : highlightAuto(text);
+
+      element.innerHTML = result.value;
+      element.dataset.highlighted = "yes";
+      updateClassName(element, language, result.language);
+      element.result = {
+        language: result.language,
+        // TODO: remove with version 11.0
+        re: result.relevance,
+        relevance: result.relevance
+      };
+      if (result.secondBest) {
+        element.secondBest = {
+          language: result.secondBest.language,
+          relevance: result.secondBest.relevance
+        };
+      }
+
+      fire("after:highlightElement", { el: element, result, text });
+    }
+
+    /**
+     * Updates highlight.js global options with the passed options
+     *
+     * @param {Partial<HLJSOptions>} userOptions
+     */
+    function configure(userOptions) {
+      options = inherit(options, userOptions);
+    }
+
+    // TODO: remove v12, deprecated
+    const initHighlighting = () => {
+      highlightAll();
+      deprecated("10.6.0", "initHighlighting() deprecated.  Use highlightAll() now.");
+    };
+
+    // TODO: remove v12, deprecated
+    function initHighlightingOnLoad() {
+      highlightAll();
+      deprecated("10.6.0", "initHighlightingOnLoad() deprecated.  Use highlightAll() now.");
+    }
+
+    let wantsHighlight = false;
+
+    /**
+     * auto-highlights all pre>code elements on the page
+     */
+    function highlightAll() {
+      function boot() {
+        // if a highlight was requested before DOM was loaded, do now
+        highlightAll();
+      }
+
+      // if we are called too early in the loading process
+      if (document.readyState === "loading") {
+        // make sure the event listener is only added once
+        if (!wantsHighlight) {
+          window.addEventListener('DOMContentLoaded', boot, false);
+        }
+        wantsHighlight = true;
+        return;
+      }
+
+      const blocks = document.querySelectorAll(options.cssSelector);
+      blocks.forEach(highlightElement);
+    }
+
+    /**
+     * Register a language grammar module
+     *
+     * @param {string} languageName
+     * @param {LanguageFn} languageDefinition
+     */
+    function registerLanguage(languageName, languageDefinition) {
+      let lang = null;
+      try {
+        lang = languageDefinition(hljs);
+      } catch (error$1) {
+        error("Language definition for '{}' could not be registered.".replace("{}", languageName));
+        // hard or soft error
+        if (!SAFE_MODE) { throw error$1; } else { error(error$1); }
+        // languages that have serious errors are replaced with essentially a
+        // "plaintext" stand-in so that the code blocks will still get normal
+        // css classes applied to them - and one bad language won't break the
+        // entire highlighter
+        lang = PLAINTEXT_LANGUAGE;
+      }
+      // give it a temporary name if it doesn't have one in the meta-data
+      if (!lang.name) lang.name = languageName;
+      languages[languageName] = lang;
+      lang.rawDefinition = languageDefinition.bind(null, hljs);
+
+      if (lang.aliases) {
+        registerAliases(lang.aliases, { languageName });
+      }
+    }
+
+    /**
+     * Remove a language grammar module
+     *
+     * @param {string} languageName
+     */
+    function unregisterLanguage(languageName) {
+      delete languages[languageName];
+      for (const alias of Object.keys(aliases)) {
+        if (aliases[alias] === languageName) {
+          delete aliases[alias];
+        }
+      }
+    }
+
+    /**
+     * @returns {string[]} List of language internal names
+     */
+    function listLanguages() {
+      return Object.keys(languages);
+    }
+
+    /**
+     * @param {string} name - name of the language to retrieve
+     * @returns {Language | undefined}
+     */
+    function getLanguage(name) {
+      name = (name || '').toLowerCase();
+      return languages[name] || languages[aliases[name]];
+    }
+
+    /**
+     *
+     * @param {string|string[]} aliasList - single alias or list of aliases
+     * @param {{languageName: string}} opts
+     */
+    function registerAliases(aliasList, { languageName }) {
+      if (typeof aliasList === 'string') {
+        aliasList = [aliasList];
+      }
+      aliasList.forEach(alias => { aliases[alias.toLowerCase()] = languageName; });
+    }
+
+    /**
+     * Determines if a given language has auto-detection enabled
+     * @param {string} name - name of the language
+     */
+    function autoDetection(name) {
+      const lang = getLanguage(name);
+      return lang && !lang.disableAutodetect;
+    }
+
+    /**
+     * Upgrades the old highlightBlock plugins to the new
+     * highlightElement API
+     * @param {HLJSPlugin} plugin
+     */
+    function upgradePluginAPI(plugin) {
+      // TODO: remove with v12
+      if (plugin["before:highlightBlock"] && !plugin["before:highlightElement"]) {
+        plugin["before:highlightElement"] = (data) => {
+          plugin["before:highlightBlock"](
+            Object.assign({ block: data.el }, data)
+          );
+        };
+      }
+      if (plugin["after:highlightBlock"] && !plugin["after:highlightElement"]) {
+        plugin["after:highlightElement"] = (data) => {
+          plugin["after:highlightBlock"](
+            Object.assign({ block: data.el }, data)
+          );
+        };
+      }
+    }
+
+    /**
+     * @param {HLJSPlugin} plugin
+     */
+    function addPlugin(plugin) {
+      upgradePluginAPI(plugin);
+      plugins.push(plugin);
+    }
+
+    /**
+     * @param {HLJSPlugin} plugin
+     */
+    function removePlugin(plugin) {
+      const index = plugins.indexOf(plugin);
+      if (index !== -1) {
+        plugins.splice(index, 1);
+      }
+    }
+
+    /**
+     *
+     * @param {PluginEvent} event
+     * @param {any} args
+     */
+    function fire(event, args) {
+      const cb = event;
+      plugins.forEach(function(plugin) {
+        if (plugin[cb]) {
+          plugin[cb](args);
+        }
+      });
+    }
+
+    /**
+     * DEPRECATED
+     * @param {HighlightedHTMLElement} el
+     */
+    function deprecateHighlightBlock(el) {
+      deprecated("10.7.0", "highlightBlock will be removed entirely in v12.0");
+      deprecated("10.7.0", "Please use highlightElement now.");
+
+      return highlightElement(el);
+    }
+
+    /* Interface definition */
+    Object.assign(hljs, {
+      highlight,
+      highlightAuto,
+      highlightAll,
+      highlightElement,
+      // TODO: Remove with v12 API
+      highlightBlock: deprecateHighlightBlock,
+      configure,
+      initHighlighting,
+      initHighlightingOnLoad,
+      registerLanguage,
+      unregisterLanguage,
+      listLanguages,
+      getLanguage,
+      registerAliases,
+      autoDetection,
+      inherit,
+      addPlugin,
+      removePlugin
+    });
+
+    hljs.debugMode = function() { SAFE_MODE = false; };
+    hljs.safeMode = function() { SAFE_MODE = true; };
+    hljs.versionString = version;
+
+    hljs.regex = {
+      concat: concat,
+      lookahead: lookahead,
+      either: either,
+      optional: optional,
+      anyNumberOfTimes: anyNumberOfTimes
+    };
+
+    for (const key in MODES) {
+      // @ts-ignore
+      if (typeof MODES[key] === "object") {
+        // @ts-ignore
+        deepFreeze(MODES[key]);
+      }
+    }
+
+    // merge all the modes/regexes into our main object
+    Object.assign(hljs, MODES);
+
+    return hljs;
+  };
+
+  // Other names for the variable may break build script
+  const highlight = HLJS({});
+
+  // returns a new instance of the highlighter to be used for extensions
+  // check https://github.com/wooorm/lowlight/issues/47
+  highlight.newInstance = () => HLJS({});
+
+  // https://docs.oracle.com/javase/specs/jls/se15/html/jls-3.html#jls-3.10
+  var decimalDigits = '[0-9](_*[0-9])*';
+  var frac = `\\.(${decimalDigits})`;
+  var hexDigits = '[0-9a-fA-F](_*[0-9a-fA-F])*';
+  var NUMERIC = {
+    className: 'number',
+    variants: [
+      // DecimalFloatingPointLiteral
+      // including ExponentPart
+      { begin: `(\\b(${decimalDigits})((${frac})|\\.)?|(${frac}))` +
+        `[eE][+-]?(${decimalDigits})[fFdD]?\\b` },
+      // excluding ExponentPart
+      { begin: `\\b(${decimalDigits})((${frac})[fFdD]?\\b|\\.([fFdD]\\b)?)` },
+      { begin: `(${frac})[fFdD]?\\b` },
+      { begin: `\\b(${decimalDigits})[fFdD]\\b` },
+
+      // HexadecimalFloatingPointLiteral
+      { begin: `\\b0[xX]((${hexDigits})\\.?|(${hexDigits})?\\.(${hexDigits}))` +
+        `[pP][+-]?(${decimalDigits})[fFdD]?\\b` },
+
+      // DecimalIntegerLiteral
+      { begin: '\\b(0|[1-9](_*[0-9])*)[lL]?\\b' },
+
+      // HexIntegerLiteral
+      { begin: `\\b0[xX](${hexDigits})[lL]?\\b` },
+
+      // OctalIntegerLiteral
+      { begin: '\\b0(_*[0-7])*[lL]?\\b' },
+
+      // BinaryIntegerLiteral
+      { begin: '\\b0[bB][01](_*[01])*[lL]?\\b' },
+    ],
+    relevance: 0
+  };
+
+  /*
+  Language: Java
+  Author: Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
+  Category: common, enterprise
+  Website: https://www.java.com/
+  */
+
+
+  /**
+   * Allows recursive regex expressions to a given depth
+   *
+   * ie: recurRegex("(abc~~~)", /~~~/g, 2) becomes:
+   * (abc(abc(abc)))
+   *
+   * @param {string} re
+   * @param {RegExp} substitution (should be a g mode regex)
+   * @param {number} depth
+   * @returns {string}``
+   */
+  function recurRegex(re, substitution, depth) {
+    if (depth === -1) return "";
+
+    return re.replace(substitution, _ => {
+      return recurRegex(re, substitution, depth - 1);
+    });
+  }
+
+  /** @type LanguageFn */
+  function java(hljs) {
+    const regex = hljs.regex;
+    const JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
+    const TYPE_ARG_RE = '(?:(?:' + JAVA_IDENT_RE + '~~~)|(?:\\?\\s+(?:extends|super)\\s+' + JAVA_IDENT_RE + '~~~)|(?:\\?))';
+    const GENERIC_RE = recurRegex('(?:<' + TYPE_ARG_RE + '(?:\\s*,\\s*' + TYPE_ARG_RE + ')*>)?', /~~~/g, 2);
+    const ARRAY_RE = '(?:(?:\\[])+)?';
+    const MAIN_KEYWORDS = [
+      'synchronized',
+      'abstract',
+      'private',
+      'var',
+      'static',
+      'if',
+      'const ',
+      'for',
+      'while',
+      'strictfp',
+      'finally',
+      'protected',
+      'import',
+      'native',
+      'final',
+      'void',
+      'enum',
+      'else',
+      'break',
+      'transient',
+      'catch',
+      'instanceof',
+      'volatile',
+      'case',
+      'assert',
+      'package',
+      'default',
+      'public',
+      'try',
+      'switch',
+      'continue',
+      'throws',
+      'protected',
+      'public',
+      'private',
+      'module',
+      'requires',
+      'exports',
+      'do',
+      'sealed',
+      'yield',
+      'permits',
+      'goto',
+      'when'
+    ];
+
+    const BUILT_INS = [
+      'super',
+      'this'
+    ];
+
+    const LITERALS = [
+      'false',
+      'true',
+      'null'
+    ];
+
+    const TYPES = [
+      'char',
+      'boolean',
+      'long',
+      'float',
+      'int',
+      'byte',
+      'short',
+      'double'
+    ];
+
+    const KEYWORDS = {
+      keyword: MAIN_KEYWORDS,
+      literal: LITERALS,
+      type: TYPES,
+      built_in: BUILT_INS
+    };
+
+    const ANNOTATION = {
+      className: 'meta',
+      begin: '@' + JAVA_IDENT_RE,
+      contains: [
+        {
+          begin: /\(/,
+          end: /\)/,
+          contains: [ "self" ] // allow nested () inside our annotation
+        }
+      ]
+    };
+    const PARAMS = {
+      className: 'params',
+      begin: /\(/,
+      end: /\)/,
+      keywords: KEYWORDS,
+      relevance: 0,
+      contains: [ hljs.C_BLOCK_COMMENT_MODE ],
+      endsParent: true
+    };
+
+    return {
+      name: 'Java',
+      aliases: [ 'jsp' ],
+      keywords: KEYWORDS,
+      illegal: /<\/|#/,
+      contains: [
+        hljs.COMMENT(
+          '/\\*\\*',
+          '\\*/',
+          {
+            relevance: 0,
+            contains: [
+              {
+                // eat up @'s in emails to prevent them to be recognized as doctags
+                begin: /\w+@/,
+                relevance: 0
+              },
+              {
+                className: 'doctag',
+                begin: '@[A-Za-z]+'
+              }
+            ]
+          }
+        ),
+        // relevance boost
+        {
+          begin: /import java\.[a-z]+\./,
+          keywords: "import",
+          relevance: 2
+        },
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE,
+        {
+          begin: /"""/,
+          end: /"""/,
+          className: "string",
+          contains: [ hljs.BACKSLASH_ESCAPE ]
+        },
+        hljs.APOS_STRING_MODE,
+        hljs.QUOTE_STRING_MODE,
+        {
+          match: [
+            /\b(?:class|interface|enum|extends|implements|new)/,
+            /\s+/,
+            JAVA_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          }
+        },
+        {
+          // Exceptions for hyphenated keywords
+          match: /non-sealed/,
+          scope: "keyword"
+        },
+        {
+          begin: [
+            regex.concat(/(?!else)/, JAVA_IDENT_RE),
+            GENERIC_RE,
+            ARRAY_RE,
+            /\s+/,
+            JAVA_IDENT_RE,
+            /\s+/,
+            /=(?!=)/
+          ],
+          className: {
+            1: "type",
+            5: "variable",
+            7: "operator"
+          }
+        },
+        {
+          begin: [
+            /record/,
+            /\s+/,
+            JAVA_IDENT_RE
+          ],
+          className: {
+            1: "keyword",
+            3: "title.class"
+          },
+          contains: [
+            PARAMS,
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        {
+          // Expression keywords prevent 'keyword Name(...)' from being
+          // recognized as a function definition
+          beginKeywords: 'new throw return else',
+          relevance: 0
+        },
+        {
+          begin: [
+            '(?:' + JAVA_IDENT_RE + GENERIC_RE + ARRAY_RE + '\\s+)',
+            hljs.UNDERSCORE_IDENT_RE,
+            /\s*(?=\()/
+          ],
+          className: { 2: "title.function" },
+          keywords: KEYWORDS,
+          contains: [
+            {
+              className: 'params',
+              begin: /\(/,
+              end: /\)/,
+              keywords: KEYWORDS,
+              relevance: 0,
+              contains: [
+                ANNOTATION,
+                hljs.APOS_STRING_MODE,
+                hljs.QUOTE_STRING_MODE,
+                NUMERIC,
+                hljs.C_BLOCK_COMMENT_MODE
+              ]
+            },
+            hljs.C_LINE_COMMENT_MODE,
+            hljs.C_BLOCK_COMMENT_MODE
+          ]
+        },
+        NUMERIC,
+        ANNOTATION
+      ]
+    };
+  }
+
+  /*
+  Language: .properties
+  Contributors: Valentin Aitken <valentin@nalisbg.com>, Egor Rogov <e.rogov@postgrespro.ru>
+  Website: https://en.wikipedia.org/wiki/.properties
+  Category: config
+  */
+
+  /** @type LanguageFn */
+  function properties(hljs) {
+    // whitespaces: space, tab, formfeed
+    const WS0 = '[ \\t\\f]*';
+    const WS1 = '[ \\t\\f]+';
+    // delimiter
+    const EQUAL_DELIM = WS0 + '[:=]' + WS0;
+    const WS_DELIM = WS1;
+    const DELIM = '(' + EQUAL_DELIM + '|' + WS_DELIM + ')';
+    const KEY = '([^\\\\:= \\t\\f\\n]|\\\\.)+';
+
+    const DELIM_AND_VALUE = {
+      // skip DELIM
+      end: DELIM,
+      relevance: 0,
+      starts: {
+        // value: everything until end of line (again, taking into account backslashes)
+        className: 'string',
+        end: /$/,
+        relevance: 0,
+        contains: [
+          { begin: '\\\\\\\\' },
+          { begin: '\\\\\\n' }
+        ]
+      }
+    };
+
+    return {
+      name: '.properties',
+      disableAutodetect: true,
+      case_insensitive: true,
+      illegal: /\S/,
+      contains: [
+        hljs.COMMENT('^\\s*[!#]', '$'),
+        // key: everything until whitespace or = or : (taking into account backslashes)
+        // case of a key-value pair
+        {
+          returnBegin: true,
+          variants: [
+            { begin: KEY + EQUAL_DELIM },
+            { begin: KEY + WS_DELIM }
+          ],
+          contains: [
+            {
+              className: 'attr',
+              begin: KEY,
+              endsParent: true
+            }
+          ],
+          starts: DELIM_AND_VALUE
+        },
+        // case of an empty key
+        {
+          className: 'attr',
+          begin: KEY + WS0 + '$'
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: HTML, XML
+  Website: https://www.w3.org/XML/
+  Category: common, web
+  Audit: 2020
+  */
+
+  /** @type LanguageFn */
+  function xml(hljs) {
+    const regex = hljs.regex;
+    // XML names can have the following additional letters: https://www.w3.org/TR/xml/#NT-NameChar
+    // OTHER_NAME_CHARS = /[:\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]/;
+    // Element names start with NAME_START_CHAR followed by optional other Unicode letters, ASCII digits, hyphens, underscores, and periods
+    // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);;
+    // const XML_IDENT_RE = /[A-Z_a-z:\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]+/;
+    // const TAG_NAME_RE = regex.concat(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]/, regex.optional(/[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*:/), /[A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\-.0-9\u00B7\u0300-\u036F\u203F-\u2040]*/);
+    // however, to cater for performance and more Unicode support rely simply on the Unicode letter class
+    const TAG_NAME_RE = regex.concat(/[\p{L}_]/u, regex.optional(/[\p{L}0-9_.-]*:/u), /[\p{L}0-9_.-]*/u);
+    const XML_IDENT_RE = /[\p{L}0-9._:-]+/u;
+    const XML_ENTITIES = {
+      className: 'symbol',
+      begin: /&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;/
+    };
+    const XML_META_KEYWORDS = {
+      begin: /\s/,
+      contains: [
+        {
+          className: 'keyword',
+          begin: /#?[a-z_][a-z1-9_-]+/,
+          illegal: /\n/
+        }
+      ]
+    };
+    const XML_META_PAR_KEYWORDS = hljs.inherit(XML_META_KEYWORDS, {
+      begin: /\(/,
+      end: /\)/
+    });
+    const APOS_META_STRING_MODE = hljs.inherit(hljs.APOS_STRING_MODE, { className: 'string' });
+    const QUOTE_META_STRING_MODE = hljs.inherit(hljs.QUOTE_STRING_MODE, { className: 'string' });
+    const TAG_INTERNALS = {
+      endsWithParent: true,
+      illegal: /</,
+      relevance: 0,
+      contains: [
+        {
+          className: 'attr',
+          begin: XML_IDENT_RE,
+          relevance: 0
+        },
+        {
+          begin: /=\s*/,
+          relevance: 0,
+          contains: [
+            {
+              className: 'string',
+              endsParent: true,
+              variants: [
+                {
+                  begin: /"/,
+                  end: /"/,
+                  contains: [ XML_ENTITIES ]
+                },
+                {
+                  begin: /'/,
+                  end: /'/,
+                  contains: [ XML_ENTITIES ]
+                },
+                { begin: /[^\s"'=<>`]+/ }
+              ]
+            }
+          ]
+        }
+      ]
+    };
+    return {
+      name: 'HTML, XML',
+      aliases: [
+        'html',
+        'xhtml',
+        'rss',
+        'atom',
+        'xjb',
+        'xsd',
+        'xsl',
+        'plist',
+        'wsf',
+        'svg'
+      ],
+      case_insensitive: true,
+      unicodeRegex: true,
+      contains: [
+        {
+          className: 'meta',
+          begin: /<![a-z]/,
+          end: />/,
+          relevance: 10,
+          contains: [
+            XML_META_KEYWORDS,
+            QUOTE_META_STRING_MODE,
+            APOS_META_STRING_MODE,
+            XML_META_PAR_KEYWORDS,
+            {
+              begin: /\[/,
+              end: /\]/,
+              contains: [
+                {
+                  className: 'meta',
+                  begin: /<![a-z]/,
+                  end: />/,
+                  contains: [
+                    XML_META_KEYWORDS,
+                    XML_META_PAR_KEYWORDS,
+                    QUOTE_META_STRING_MODE,
+                    APOS_META_STRING_MODE
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        hljs.COMMENT(
+          /<!--/,
+          /-->/,
+          { relevance: 10 }
+        ),
+        {
+          begin: /<!\[CDATA\[/,
+          end: /\]\]>/,
+          relevance: 10
+        },
+        XML_ENTITIES,
+        // xml processing instructions
+        {
+          className: 'meta',
+          end: /\?>/,
+          variants: [
+            {
+              begin: /<\?xml/,
+              relevance: 10,
+              contains: [
+                QUOTE_META_STRING_MODE
+              ]
+            },
+            {
+              begin: /<\?[a-z][a-z0-9]+/,
+            }
+          ]
+
+        },
+        {
+          className: 'tag',
+          /*
+          The lookahead pattern (?=...) ensures that 'begin' only matches
+          '<style' as a single word, followed by a whitespace or an
+          ending bracket.
+          */
+          begin: /<style(?=\s|>)/,
+          end: />/,
+          keywords: { name: 'style' },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/style>/,
+            returnEnd: true,
+            subLanguage: [
+              'css',
+              'xml'
+            ]
+          }
+        },
+        {
+          className: 'tag',
+          // See the comment in the <style tag about the lookahead pattern
+          begin: /<script(?=\s|>)/,
+          end: />/,
+          keywords: { name: 'script' },
+          contains: [ TAG_INTERNALS ],
+          starts: {
+            end: /<\/script>/,
+            returnEnd: true,
+            subLanguage: [
+              'javascript',
+              'handlebars',
+              'xml'
+            ]
+          }
+        },
+        // we need this for now for jSX
+        {
+          className: 'tag',
+          begin: /<>|<\/>/
+        },
+        // open tag
+        {
+          className: 'tag',
+          begin: regex.concat(
+            /</,
+            regex.lookahead(regex.concat(
+              TAG_NAME_RE,
+              // <tag/>
+              // <tag>
+              // <tag ...
+              regex.either(/\/>/, />/, /\s/)
+            ))
+          ),
+          end: /\/?>/,
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0,
+              starts: TAG_INTERNALS
+            }
+          ]
+        },
+        // close tag
+        {
+          className: 'tag',
+          begin: regex.concat(
+            /<\//,
+            regex.lookahead(regex.concat(
+              TAG_NAME_RE, />/
+            ))
+          ),
+          contains: [
+            {
+              className: 'name',
+              begin: TAG_NAME_RE,
+              relevance: 0
+            },
+            {
+              begin: />/,
+              relevance: 0,
+              endsParent: true
+            }
+          ]
+        }
+      ]
+    };
+  }
+
+  /*
+  Language: JSON
+  Description: JSON (JavaScript Object Notation) is a lightweight data-interchange format.
+  Author: Ivan Sagalaev <maniac@softwaremaniacs.org>
+  Website: http://www.json.org
+  Category: common, protocols, web
+  */
+
+  function json(hljs) {
+    const ATTRIBUTE = {
+      className: 'attr',
+      begin: /"(\\.|[^\\"\r\n])*"(?=\s*:)/,
+      relevance: 1.01
+    };
+    const PUNCTUATION = {
+      match: /[{}[\],:]/,
+      className: "punctuation",
+      relevance: 0
+    };
+    const LITERALS = [
+      "true",
+      "false",
+      "null"
+    ];
+    // NOTE: normally we would rely on `keywords` for this but using a mode here allows us
+    // - to use the very tight `illegal: \S` rule later to flag any other character
+    // - as illegal indicating that despite looking like JSON we do not truly have
+    // - JSON and thus improve false-positively greatly since JSON will try and claim
+    // - all sorts of JSON looking stuff
+    const LITERALS_MODE = {
+      scope: "literal",
+      beginKeywords: LITERALS.join(" "),
+    };
+
+    return {
+      name: 'JSON',
+      aliases: ['jsonc'],
+      keywords:{
+        literal: LITERALS,
+      },
+      contains: [
+        ATTRIBUTE,
+        PUNCTUATION,
+        hljs.QUOTE_STRING_MODE,
+        LITERALS_MODE,
+        hljs.C_NUMBER_MODE,
+        hljs.C_LINE_COMMENT_MODE,
+        hljs.C_BLOCK_COMMENT_MODE
+      ],
+      illegal: '\\S'
+    };
+  }
+
+  var builtIns = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    grmr_java: java,
+    grmr_json: json,
+    grmr_properties: properties,
+    grmr_xml: xml
+  });
+
+  const hljs = highlight;
+
+  for (const key of Object.keys(builtIns)) {
+    // our builtInLanguages Rollup plugin has to use `_` to allow identifiers to be
+    // compatible with `export` naming conventions, so we need to convert the
+    // identifiers back into the more typical dash style that we use for language
+    // naming via the API
+    const languageName = key.replace("grmr_", "").replace("_", "-");
+    hljs.registerLanguage(languageName, builtIns[key]);
+  }
+
+  return hljs;
+
+})();
+if (typeof exports === 'object' && typeof module !== 'undefined') { module.exports = hljs; }
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 662cca89dc6..1b4a5021a08 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
@@ -21,6 +21,10 @@ var activeTableTab = "active-table-tab";
 const linkIcon = "##REPLACE:doclet.Link_icon##";
 const linkToSection = "##REPLACE:doclet.Link_to_section##";
 
+if (hljs) {
+    hljs.highlightAll();
+}
+
 function loadScripts(doc, tag) {
     createElem(doc, tag, 'script-files/search.js');
 
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 a713179a487..76b223bf130 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
@@ -735,6 +735,10 @@ doclet.usage.allow-script-in-comments.description=\
     Allow JavaScript in documentation comments, and options\n\
     whose value is html-code
 
+doclet.usage.syntax-highlight.description=\
+    Enable syntax highlighting for code fragments in {@snippet} tags\n\
+    and <pre><code> elements.
+
 doclet.usage.xdocrootparent.parameters=\
     <url>
 doclet.usage.xdocrootparent.description=\
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 54c7c5cbe21..c2351d113cc 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
@@ -23,11 +23,11 @@
     /* Base font sizes for body and code elements */
     --body-font-size: 14.2px;
     --block-font-size: 14.4px;
-    --code-font-size: 14px;
+    --code-font-size: 13.9px;
     --nav-font-size: 13.4px;
     /* Line height for continuous text blocks */
     --block-line-height: 1.5;
-    --code-line-height: 1.55;
+    --code-line-height: 1.6;
     /* Text colors for body and block elements */
     --body-text-color: #282828;
     --block-text-color: #282828;
@@ -63,10 +63,10 @@
     --toc-highlight-color: var(--subnav-background-color);
     --toc-hover-color: #e9ecf0;
     /* Snippet and pre colors */
-    --snippet-background-color: #f0f0f2;
+    --snippet-background-color: #f2f2f4;
     --snippet-text-color: var(--block-text-color);
     --snippet-highlight-color: #f7c590;
-    --pre-background-color: #f3f3f5;
+    --pre-background-color: var(--snippet-background-color);
     --pre-text-color: var(--snippet-text-color);
     /* Border colors for structural elements and user defined tables */
     --border-color: #e6e6e6;
@@ -565,9 +565,6 @@ ul.horizontal li {
     display:inline;
     font-size:0.9em;
 }
-div.inheritance {
-    font-size: 0.99em;
-}
 div.inheritance div.inheritance {
     margin-left:2em;
 }
@@ -1389,8 +1386,8 @@ button#page-search-copy span {
 /* snippet copy button */
 button.snippet-copy {
     position: absolute;
-    top: 2px;
-    right: 2px;
+    top: 4px;
+    right: 1px;
     height: 32px;
 }
 button.snippet-copy img {
@@ -1653,7 +1650,7 @@ table.striped > tbody > tr > th {
 pre.snippet {
     background-color: var(--snippet-background-color);
     color: var(--snippet-text-color);
-    padding: 10px;
+    padding: 12px;
 }
 div.snippet-container {
     position: relative;
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 cb2b7df761a..21f12673619 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
@@ -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
@@ -115,6 +115,12 @@ public static DocPath indexN(int n) {
     /** The name of the right pointing angle icon. */
     public static final DocPath RIGHT_SVG = DocPath.create("right.svg");
 
+    /** The name of the syntax highlighting style sheet. */
+    public static final DocPath HIGHLIGHT_CSS = DocPath.create("highlight.css");
+
+    /** The name of the syntax highlighting script file. */
+    public static final DocPath HIGHLIGHT_JS = DocPath.create("highlight.js");
+
     /** The name of the default jQuery directory. */
     public static final DocPath JQUERY_DIR = DocPath.create("jquery");
 
diff --git a/src/jdk.javadoc/share/man/javadoc.md b/src/jdk.javadoc/share/man/javadoc.md
index 6a1a92e7d16..2ba64dfb2e5 100644
--- a/src/jdk.javadoc/share/man/javadoc.md
+++ b/src/jdk.javadoc/share/man/javadoc.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -867,6 +867,23 @@ The following options are provided by the standard doclet.
     letter, plus a file for any index entries that start with non-alphabetical
     symbols.
 
+<span id="option-syntax-highlight">`--syntax-highlight`</span>
+:   Enables syntax highlighting for code fragments in `{@snippet}` tags and
+    `<pre><code>` elements. For snippets, the `lang` attribute is used to
+    determine the language of code fragments, which defaults to "java" for
+    inline snippets and is derived from the file extension for external
+    snippets. In HTML `<pre><code>` tags, the `class` attribute can be used
+    to specify the language of the contained code fragment as shown below:
+
+    ```
+    <pre><code class="language-java">...</code></pre>
+    ```
+
+    If neither of these attributes is available automatic language detection is
+    applied. To disable syntax highlighting for a code fragment set the language
+    to "text" using one of the mechanisms described above. The languages and
+    formats supported by this option are Java, Properties, JSON, HTML and XML.
+
 <span id="option-tag">`-tag` *name*:*locations*:*header*</span>
 :   Specifies a custom tag with a single argument. For the `javadoc` tool to
     spell-check tag names, it is important to include a `-tag` option for every
diff --git a/test/langtools/jdk/javadoc/doclet/testSyntaxHighlightOption/TestSyntaxHighlightOption.java b/test/langtools/jdk/javadoc/doclet/testSyntaxHighlightOption/TestSyntaxHighlightOption.java
new file mode 100644
index 00000000000..f43b50504bf
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testSyntaxHighlightOption/TestSyntaxHighlightOption.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 8348282
+ * @summary Add option for syntax highlighting in javadoc snippets
+ * @library /tools/lib ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build toolbox.ToolBox javadoc.tester.*
+ * @run main TestSyntaxHighlightOption
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestSyntaxHighlightOption extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestSyntaxHighlightOption();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+    Path src = Path.of("src");
+
+
+    TestSyntaxHighlightOption() throws IOException {
+        tb.writeJavaFiles(src, """
+                    package p;
+                    /** Class C. */
+                    public class C {
+                        /**
+                         * Method m.
+                         */
+                        public void m() {
+                        }
+                    }
+                    """);
+
+    }
+
+    @Test
+    public void testSyntaxHighlightOption(Path base) {
+        javadoc("-d", base.resolve("out").toString(),
+                "-sourcepath", src.toString(),
+                "--syntax-highlight",
+                "p");
+        checkExit(Exit.OK);
+        checkOutput("resource-files/highlight.css", true, "Syntax highlight style sheet");
+        checkOutput("script-files/highlight.js", true, "Highlight.js v11.11.1 (git: 08cb242e7d)");
+        checkOutput("index-all.html", true, """
+                <link rel="stylesheet" type="text/css" href="http://github.com/resource-files/highlight.css">
+                <script type="text/javascript" src="http://github.com/script-files/highlight.js"></script>""");
+        checkOutput("p/package-summary.html", true, """
+                <link rel="stylesheet" type="text/css" href="http://github.com/resource-files/highlight.css">
+                <script type="text/javascript" src="http://github.com/script-files/highlight.js"></script>""");
+        checkOutput("p/C.html", true, """
+                <link rel="stylesheet" type="text/css" href="http://github.com/resource-files/highlight.css">
+                <script type="text/javascript" src="http://github.com/script-files/highlight.js"></script>""");
+    }
+
+    @Test
+    public void testNoSyntaxHighlightOption(Path base) {
+        javadoc("-d", base.resolve("out").toString(),
+                "-sourcepath", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+        checkFiles(false, "resource-files/highlight.css", "script-files/highlight.js");
+        checkOutput("index-all.html", false, "highlight.css", "highlight.js");
+        checkOutput("p/package-summary.html", false, "highlight.css", "highlight.js");
+        checkOutput("p/C.html", false, "highlight.css", "highlight.js");
+    }
+}

From a7359a5091e7ed911cc0505235eee6dee6d44919 Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Mon, 28 Apr 2025 12:12:50 +0000
Subject: [PATCH 161/901] 8354453: Don't strcpy in os::strdup, use memcpy
 instead

Reviewed-by: jsjolen, kbarrett
---
 src/hotspot/share/runtime/os.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 496ad372c38..b24b7e5b0fa 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -598,7 +598,7 @@ char *os::strdup(const char *str, MemTag mem_tag) {
   size_t size = strlen(str);
   char *dup_str = (char *)malloc(size + 1, mem_tag);
   if (dup_str == nullptr) return nullptr;
-  strcpy(dup_str, str);
+  memcpy(dup_str, str, size + 1);
   return dup_str;
 }
 

From 3eaec040b4e82e1a31bd12683dd783a33025d1bf Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 28 Apr 2025 13:29:51 +0000
Subject: [PATCH 162/901] 8355635: Do not collect C strings in C2 scratch
 buffer

Reviewed-by: jrose, thartmann, shade
---
 src/hotspot/share/asm/codeBuffer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 2a9b6215614..fc8f72a881e 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -1042,6 +1042,9 @@ void CodeBuffer::shared_stub_to_interp_for(ciMethod* callee, csize_t call_offset
 
 #ifndef PRODUCT
 void CodeBuffer::block_comment(ptrdiff_t offset, const char* comment) {
+  if (insts()->scratch_emit()) {
+    return;
+  }
   if (_collect_comments) {
     const char* str = _asm_remarks.insert(offset, comment);
     postcond(str != comment);
@@ -1049,6 +1052,9 @@ void CodeBuffer::block_comment(ptrdiff_t offset, const char* comment) {
 }
 
 const char* CodeBuffer::code_string(const char* str) {
+  if (insts()->scratch_emit()) {
+    return str;
+  }
   const char* tmp = _dbg_strings.insert(str);
   postcond(tmp != str);
   return tmp;

From e7a416254be88ad3af74d874e444a4921b2a31f7 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Mon, 28 Apr 2025 13:54:41 +0000
Subject: [PATCH 163/901] 8355717: Problem list tests until JDK-8355708 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 d4276946360..c5b24475107 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -78,6 +78,9 @@ compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
 
 compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all
 
+compiler/c2/irTests/TestFloat16ScalarOperations.java 8355708 linux-aarch64
+compiler/c2/irTests/MulHFNodeIdealizationTests.java 8355708 linux-aarch64
+
 #############################################################################
 
 # :hotspot_gc

From 66358fa2c0074b02f6087f1e1501eff9364a25f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 28 Apr 2025 14:08:59 +0000
Subject: [PATCH 164/901] 8355616: Incorrect ifdef in
 compilationMemoryStatistic.cpp

Reviewed-by: shade, stuefe, jwaters
---
 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 0c2822c94d2..3138eb3a8c0 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -374,7 +374,7 @@ void ArenaStatCounter::on_arena_chunk_deallocation(size_t size, uint64_t stamp)
 void ArenaStatCounter::print_peak_state_on(outputStream* st) const {
   st->print("Total Usage: %zu ", _peak);
   if (_peak > 0) {
-#ifdef COMPILER2
+#ifdef COMPILER1
     // C1: print allocations broken down by arena types
     if (_comp_type == CompilerType::compiler_c1) {
       st->print("[");

From b1e778d9d2ad13ee5f1ed629a8805008580f86c0 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Mon, 28 Apr 2025 14:38:59 +0000
Subject: [PATCH 165/901] 8354686: [AIX] now ubsan is possible

Reviewed-by: mbaesken, clanger
---
 make/autoconf/jdk-options.m4            | 10 ++++++++++
 make/data/ubsan/ubsan_default_options.c | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 79e44dd4ad1..ca0b0ee251e 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -522,6 +522,16 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
       $ADDITIONAL_UBSAN_CHECKS"
   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"
+  # On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
+  # full qualified llvm_symbolizer path in the __ubsan_default_options() function in
+  # make/data/ubsan/ubsan_default_options.c. To get it there we compile our sources
+  # with an additional define LLVM_SYMBOLIZER, which we set here.
+  # To calculate the correct llvm_symbolizer path we can use the location of the compiler, because
+  # their relation is fixed.
+  if test "x$TOOLCHAIN_TYPE" = "xclang" && test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      UBSAN_CFLAGS="$UBSAN_CFLAGS -fno-sanitize=function,vptr -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
+      UBSAN_LDFLAGS="$UBSAN_LDFLAGS -fno-sanitize=function,vptr -Wl,-bbigtoc"
+  fi
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
       DESC: [enable UndefinedBehaviorSanitizer],
       CHECK_AVAILABLE: [
diff --git a/make/data/ubsan/ubsan_default_options.c b/make/data/ubsan/ubsan_default_options.c
index 011d1a675a9..05e4722e45a 100644
--- a/make/data/ubsan/ubsan_default_options.c
+++ b/make/data/ubsan/ubsan_default_options.c
@@ -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
@@ -43,6 +43,18 @@
 #define ATTRIBUTE_USED
 #endif
 
+// On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
+// full qualified llvm_symbolizer path in the __ubsan_default_options() function.
+// To get it here we compile our sources with an additional define LLVM_SYMBOLIZER
+// containing the path, which we set in make/autoconf/jdk-options.m4.
+#ifdef LLVM_SYMBOLIZER
+#define _LLVM_SYMBOLIZER(X) ",external_symbolizer_path=" X_LLVM_SYMBOLIZER(X)
+#define X_LLVM_SYMBOLIZER(X) #X
+#else
+#define LLVM_SYMBOLIZER
+#define _LLVM_SYMBOLIZER(X)
+#endif
+
 // Override weak symbol exposed by UBSan to override default options. This is called by UBSan
 // extremely early during library loading, before main is called. We need to override the default
 // options because by default UBSan only prints a warning for each occurrence. We want jtreg tests
@@ -50,5 +62,5 @@
 // thread so it is easier to track down. You can override these options by setting the environment
 // variable UBSAN_OPTIONS.
 ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* __ubsan_default_options() {
-  return "halt_on_error=1,print_stacktrace=1";
+  return "halt_on_error=1,print_stacktrace=1" _LLVM_SYMBOLIZER(LLVM_SYMBOLIZER);
 }

From c0dc31422d6e7435ad7abdb547dedcc50b7fc0c3 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 28 Apr 2025 16:03:40 +0000
Subject: [PATCH 166/901] 8355558: SJIS.java test is always ignored

Reviewed-by: bpb
---
 test/jdk/java/io/pathNames/win32/SJIS.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/io/pathNames/win32/SJIS.java b/test/jdk/java/io/pathNames/win32/SJIS.java
index d1cad9dec9f..580f06330a6 100644
--- a/test/jdk/java/io/pathNames/win32/SJIS.java
+++ b/test/jdk/java/io/pathNames/win32/SJIS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 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
@@ -26,9 +26,15 @@
    @summary Check that pathnames containing double-byte characters are not
             corrupted by win32 path processing
    @author Mark Reinhold
+   @library /test/lib
 */
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import jtreg.SkippedException;
 
 
 public class SJIS {
@@ -47,8 +53,11 @@ public static void main(String[] args) throws Exception {
         /* This test is only valid on win32 systems
            that use the SJIS encoding */
         if (File.separatorChar != '\\') return;
-        String enc = System.getProperty("file.encoding");
-        if ((enc == null) || !enc.equals("SJIS")) return;
+        String enc = System.getProperty("native.encoding");
+        if ((enc == null) || !enc.equals("MS932")) {
+            throw new SkippedException(
+                "native.encoding(%s) is not MS932".formatted(enc));
+        }
 
         File f = new File("\u30BD");
         if (f.exists()) rm(f);

From a090aa3ff8b79b553061e8d61bc42eb3d915c955 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 28 Apr 2025 17:13:44 +0000
Subject: [PATCH 167/901] 8354902: Change to Visual Studio 17.13.2 for building
 on Windows at Oracle

Reviewed-by: erikj, ihse
---
 doc/building.html         |  2 +-
 doc/building.md           | 10 +++++-----
 make/conf/jib-profiles.js |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 1e6f99e97c9..a085f10c48e 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -594,7 +594,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 version 17.6.5</td>
+<td>Microsoft Visual Studio 2022 version 17.13.2</td>
 </tr>
 </tbody>
 </table>
diff --git a/doc/building.md b/doc/building.md
index 18e030baa9e..a31cd5fe775 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -390,11 +390,11 @@ possible to compile the JDK with both older and newer versions, but the closer
 you stay to this list, the more likely you are to compile successfully without
 issues.
 
-| Operating system   | Toolchain version                           |
-| ------------------ | ------------------------------------------- |
-| Linux              | gcc 14.2.0                                  |
-| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)     |
-| Windows            | Microsoft Visual Studio 2022 version 17.6.5 |
+| Operating system   | Toolchain version                            |
+| ------------------ | -------------------------------------------- |
+| Linux              | gcc 14.2.0                                   |
+| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)      |
+| Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
 
 All compilers are expected to be able to handle the C11 language standard for
 C, and C++14 for C++.
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index aa4d846280e..40fa453f954 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1090,7 +1090,7 @@ var getJibProfilesDependencies = function (input, common) {
     var devkit_platform_revisions = {
         linux_x64: "gcc14.2.0-OL6.4+1.0",
         macosx: "Xcode14.3.1+1.0",
-        windows_x64: "VS2022-17.6.5+1.0",
+        windows_x64: "VS2022-17.13.2+1.0",
         linux_aarch64: "gcc14.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc14.2.0-Fedora_41+1.0",

From 2f8448034f28276ad5ac1edfa0fb8650e47d4ffa Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 28 Apr 2025 18:21:46 +0000
Subject: [PATCH 168/901] 8354053: Remove unused JavaIOFilePermissionAccess

Reviewed-by: liach, weijun
---
 .../share/classes/java/io/FilePermission.java | 114 ++++++++++--------
 .../access/JavaIOFilePermissionAccess.java    |  50 --------
 .../jdk/internal/access/SharedSecrets.java    |  15 ---
 .../sun/security/util/FilePermCompat.java     |  80 ------------
 .../FilePermissionCollectionMerge.java        |  29 +++--
 5 files changed, 85 insertions(+), 203 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/access/JavaIOFilePermissionAccess.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/FilePermCompat.java

diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index aa6f11e00ee..883f0410b6d 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -34,11 +34,9 @@
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.internal.access.JavaIOFilePermissionAccess;
-import jdk.internal.access.SharedSecrets;
 import sun.nio.fs.DefaultFileSystemProvider;
-import sun.security.util.FilePermCompat;
 import sun.security.util.SecurityConstants;
+import sun.security.util.SecurityProperties;
 
 /**
  * This class represents access to a file or directory.  A FilePermission consists
@@ -155,6 +153,26 @@ public final class FilePermission extends Permission implements Serializable {
     private static final char RECURSIVE_CHAR = '-';
     private static final char WILD_CHAR = '*';
 
+    /**
+     * New behavior? Keep compatibility?
+     * The new behavior does not use the canonical path normalization
+     */
+    private static final boolean nb = initNb();
+
+    // Initialize the nb flag from the System property jdk.io.permissionsUseCanonicalPath.
+    private static boolean initNb() {
+        String flag = SecurityProperties.getOverridableProperty(
+                "jdk.io.permissionsUseCanonicalPath");
+        return switch (flag) {
+            case "true" -> false;   // compatibility mode to canonicalize paths
+            case "false" -> true;   // do not canonicalize
+            case null -> true;      // default, do not canonicalize
+            default ->
+                throw new RuntimeException(
+                        "Invalid jdk.io.permissionsUseCanonicalPath: " + flag);
+        };
+    }
+
 //    public String toString() {
 //        StringBuilder sb = new StringBuilder();
 //        sb.append("*** FilePermission on " + getName() + " ***");
@@ -232,51 +250,49 @@ private static Path altPath(Path in) {
         }
     }
 
-    static {
-        SharedSecrets.setJavaIOFilePermissionAccess(
-            /**
-             * Creates FilePermission objects with special internals.
-             * See {@link FilePermCompat#newPermPlusAltPath(Permission)} and
-             * {@link FilePermCompat#newPermUsingAltPath(Permission)}.
-             */
-            new JavaIOFilePermissionAccess() {
-                public FilePermission newPermPlusAltPath(FilePermission input) {
-                    if (!input.invalid && input.npath2 == null && !input.allFiles) {
-                        Path npath2 = altPath(input.npath);
-                        if (npath2 != null) {
-                            // Please note the name of the new permission is
-                            // different than the original so that when one is
-                            // added to a FilePermissionCollection it will not
-                            // be merged with the original one.
-                            return new FilePermission(input.getName() + "#plus",
-                                    input,
-                                    input.npath,
-                                    npath2,
-                                    input.mask,
-                                    input.actions);
-                        }
-                    }
-                    return input;
-                }
-                public FilePermission newPermUsingAltPath(FilePermission input) {
-                    if (!input.invalid && !input.allFiles) {
-                        Path npath2 = altPath(input.npath);
-                        if (npath2 != null) {
-                            // New name, see above.
-                            return new FilePermission(input.getName() + "#using",
-                                    input,
-                                    npath2,
-                                    null,
-                                    input.mask,
-                                    input.actions);
-                        }
-                    }
-                    return null;
-                }
+    // Construct a new Permission with altPath
+    // Used by test FilePermissionCollectionMerge
+    private FilePermission newPermPlusAltPath() {
+        System.err.println("PlusAlt path: " + this + ", npath: " + npath);
+        if (nb && !invalid && npath2 == null && !allFiles) {
+            Path npath2 = altPath(npath);
+            if (npath2 != null) {
+                // Please note the name of the new permission is
+                // different than the original so that when one is
+                // added to a FilePermissionCollection it will not
+                // be merged with the original one.
+                return new FilePermission(getName() + "#plus",
+                        this,
+                        npath,
+                        npath2,
+                        mask,
+                        actions);
             }
-        );
+        }
+        return this;
     }
 
+    // Construct a new Permission adding altPath
+    // Used by test FilePermissionCollectionMerge
+    private FilePermission newPermUsingAltPath() {
+        System.err.println("Alt path: " + this + ", npath: " + npath);
+        if (!invalid && !allFiles) {
+            Path npath2 = altPath(npath);
+            if (npath2 != null) {
+                // New name, see above.
+                return new FilePermission(getName() + "#using",
+                        this,
+                        npath2,
+                        null,
+                        mask,
+                        actions);
+            }
+        }
+        return this;
+}
+
+
+
     /**
      * initialize a FilePermission object. Common to all constructors.
      * Also called during de-serialization.
@@ -291,7 +307,7 @@ private void init(int mask) {
         if (mask == NONE)
                 throw new IllegalArgumentException("invalid actions mask");
 
-        if (FilePermCompat.nb) {
+        if (nb) {
             String name = getName();
 
             if (name == null)
@@ -567,7 +583,7 @@ boolean impliesIgnoreMask(FilePermission that) {
         if (that.allFiles) {
             return false;
         }
-        if (FilePermCompat.nb) {
+        if (nb) {
             // Left at least same level of wildness as right
             if ((this.recursive && that.recursive) != that.recursive
                     || (this.directory && that.directory) != that.directory) {
@@ -766,7 +782,7 @@ public boolean equals(Object obj) {
         if (this.invalid || that.invalid) {
             return false;
         }
-        if (FilePermCompat.nb) {
+        if (nb) {
             return (this.mask == that.mask) &&
                     (this.allFiles == that.allFiles) &&
                     this.npath.equals(that.npath) &&
@@ -789,7 +805,7 @@ public boolean equals(Object obj) {
      */
     @Override
     public int hashCode() {
-        if (FilePermCompat.nb) {
+        if (nb) {
             return Objects.hash(
                     mask, allFiles, directory, recursive, npath, npath2, invalid);
         } else {
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaIOFilePermissionAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaIOFilePermissionAccess.java
deleted file mode 100644
index ed9f88685d6..00000000000
--- a/src/java.base/share/classes/jdk/internal/access/JavaIOFilePermissionAccess.java
+++ /dev/null
@@ -1,50 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.internal.access;
-
-import java.io.FilePermission;
-
-public interface JavaIOFilePermissionAccess {
-
-    /**
-     * Returns a new FilePermission plus an alternative path.
-     *
-     * @param input the input
-     * @return the new FilePermission plus the alt path (as npath2)
-     *         or the input itself if no alt path is available.
-     */
-    @SuppressWarnings("removal")
-    FilePermission newPermPlusAltPath(FilePermission input);
-
-    /**
-     * Returns a new FilePermission using an alternative path.
-     *
-     * @param input the input
-     * @return the new FilePermission using the alt path (as npath)
-     *         or null if no alt path is available
-     */
-    @SuppressWarnings("removal")
-    FilePermission newPermUsingAltPath(FilePermission input);
-}
diff --git a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
index 3ec9d6d4bae..bc955a76abb 100644
--- a/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
+++ b/src/java.base/share/classes/jdk/internal/access/SharedSecrets.java
@@ -69,7 +69,6 @@ public class SharedSecrets {
     private static JavaLangReflectAccess javaLangReflectAccess;
     private static JavaIOAccess javaIOAccess;
     private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess;
-    private static JavaIOFilePermissionAccess javaIOFilePermissionAccess;
     private static JavaIORandomAccessFileAccess javaIORandomAccessFileAccess;
     private static JavaObjectInputStreamReadString javaObjectInputStreamReadString;
     private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
@@ -287,20 +286,6 @@ public static void setJavaIOFileDescriptorAccess(JavaIOFileDescriptorAccess jiof
         javaIOFileDescriptorAccess = jiofda;
     }
 
-    @SuppressWarnings("removal")
-    public static JavaIOFilePermissionAccess getJavaIOFilePermissionAccess() {
-        var access = javaIOFilePermissionAccess;
-        if (access == null) {
-            ensureClassInitialized(FilePermission.class);
-            access = javaIOFilePermissionAccess;
-        }
-        return access;
-    }
-
-    public static void setJavaIOFilePermissionAccess(JavaIOFilePermissionAccess jiofpa) {
-        javaIOFilePermissionAccess = jiofpa;
-    }
-
     public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
         var access = javaIOFileDescriptorAccess;
         if (access == null) {
diff --git a/src/java.base/share/classes/sun/security/util/FilePermCompat.java b/src/java.base/share/classes/sun/security/util/FilePermCompat.java
deleted file mode 100644
index 651c84a462b..00000000000
--- a/src/java.base/share/classes/sun/security/util/FilePermCompat.java
+++ /dev/null
@@ -1,80 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.io.FilePermission;
-import java.security.Permission;
-import jdk.internal.access.SharedSecrets;
-
-/**
- * Take care of FilePermission compatibility after JDK-8164705.
- */
-public class FilePermCompat {
-    /**
-     * New behavior? Keep compatibility? Both default true.
-     */
-    public static final boolean nb;
-    public static final boolean compat;
-
-    static {
-        String flag = SecurityProperties.getOverridableProperty(
-                "jdk.io.permissionsUseCanonicalPath");
-        if (flag == null) {
-            flag = "false";
-        }
-        switch (flag) {
-            case "true":
-                nb = false;
-                compat = false;
-                break;
-            case "false":
-                nb = true;
-                compat = true;
-                break;
-            default:
-                throw new RuntimeException(
-                        "Invalid jdk.io.permissionsUseCanonicalPath: " + flag);
-        }
-    }
-
-    @SuppressWarnings("removal")
-    public static Permission newPermPlusAltPath(Permission input) {
-        if (compat && input instanceof FilePermission) {
-            return SharedSecrets.getJavaIOFilePermissionAccess()
-                    .newPermPlusAltPath((FilePermission) input);
-        }
-        return input;
-    }
-
-    @SuppressWarnings("removal")
-    public static Permission newPermUsingAltPath(Permission input) {
-        if (input instanceof FilePermission) {
-            return SharedSecrets.getJavaIOFilePermissionAccess()
-                    .newPermUsingAltPath((FilePermission) input);
-        }
-        return null;
-    }
-}
diff --git a/test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.java b/test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.java
index b8964931f30..dde2131e787 100644
--- a/test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.java
+++ b/test/jdk/java/io/FilePermission/FilePermissionCollectionMerge.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
@@ -24,19 +24,21 @@
 /**
  *
  * @test
- * @bug 8168127
+ * @bug 8168127 8354053
  * @summary FilePermissionCollection merges incorrectly
- * @modules java.base/sun.security.util
+ * @modules java.base/java.io:open
  * @library /test/lib
  * @build jdk.test.lib.Asserts
  * @run main FilePermissionCollectionMerge
  */
 
-import sun.security.util.FilePermCompat;
 import java.io.FilePermission;
+import java.lang.reflect.Method;
 import java.security.Permissions;
+
 import jdk.test.lib.Asserts;
 
+@SuppressWarnings("removal")
 public class FilePermissionCollectionMerge {
 
     public static void main(String[] args) throws Exception {
@@ -50,13 +52,22 @@ public static void main(String[] args) throws Exception {
         test("/x/-");
     }
 
-    static void test(String arg) {
+    static void test(String arg) throws Exception {
 
+        Method altPathMethod;
+        Method plusAltPathMethod;
+        try {
+            altPathMethod = FilePermission.class.getDeclaredMethod("newPermUsingAltPath");
+            altPathMethod.setAccessible(true);
+            plusAltPathMethod = FilePermission.class.getDeclaredMethod("newPermPlusAltPath");
+            plusAltPathMethod.setAccessible(true);
+        } catch (Exception ex) {
+            System.err.println("File permission compatibility initialization failed");
+            throw ex;
+        }
         FilePermission fp1 = new FilePermission(arg, "read");
-        FilePermission fp2 = (FilePermission)
-                FilePermCompat.newPermUsingAltPath(fp1);
-        FilePermission fp3 = (FilePermission)
-                FilePermCompat.newPermPlusAltPath(fp1);
+        FilePermission fp2 = (FilePermission) altPathMethod.invoke(fp1);
+        FilePermission fp3 = (FilePermission) plusAltPathMethod.invoke(fp1);
 
         // All 3 are different
         Asserts.assertNE(fp1, fp2);

From acd93df612525777656701821338caf9c81e5a6a Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 28 Apr 2025 18:55:26 +0000
Subject: [PATCH 169/901] 8355080:
 java.base/jdk.internal.foreign.SystemLookup.find() doesn't work on static JDK

Reviewed-by: mcimadamore, jvernee
---
 make/modules/java.base/Lib.gmk                |  1 +
 .../aix/native/libsyslookup/syslookup.c       |  6 +++-
 .../jdk/internal/foreign/SystemLookup.java    | 28 +++++++++----------
 .../share/native/libsyslookup/syslookup.c     |  6 +++-
 .../windows/native/libsyslookup/syslookup.c   |  6 +++-
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 84ee309dadd..51d323a0344 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -158,6 +158,7 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
     NAME := syslookup, \
+    EXTRA_HEADER_DIRS := java.base:libjava, \
     LD_SET_ORIGIN := false, \
     LDFLAGS_linux := -Wl$(COMMA)--no-as-needed, \
     LDFLAGS_aix := -brtl -bexpfull, \
diff --git a/src/java.base/aix/native/libsyslookup/syslookup.c b/src/java.base/aix/native/libsyslookup/syslookup.c
index 66bd50e01a0..95aff2d4300 100644
--- a/src/java.base/aix/native/libsyslookup/syslookup.c
+++ b/src/java.base/aix/native/libsyslookup/syslookup.c
@@ -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.
  * Copyright (c) 2023, IBM Corp.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,10 @@
 #include <string.h>
 #include <math.h>
 
+#include "jni_util.h"
+
+DEF_STATIC_JNI_OnLoad
+
 // Addresses of functions to be referenced using static linking.
 void* funcs[] = {
     //string.h
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
index bf5371d43a0..640c7580d15 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SystemLookup.java
@@ -25,6 +25,7 @@
 
 package jdk.internal.foreign;
 
+import jdk.internal.loader.NativeLibraries;
 import jdk.internal.loader.NativeLibrary;
 import jdk.internal.loader.RawNativeLibraries;
 import jdk.internal.util.OperatingSystem;
@@ -66,7 +67,7 @@ private static SymbolLookup makeSystemLookup() {
             if (OperatingSystem.isWindows()) {
                 return makeWindowsLookup();
             } else {
-                return libLookup(libs -> libs.load(jdkLibraryPath("syslookup")));
+                return sysLookup();
             }
         } catch (Throwable ex) {
             // This can happen in the event of a library loading failure - e.g. if one of the libraries the
@@ -84,13 +85,12 @@ private static SymbolLookup makeWindowsLookup() {
 
         boolean useUCRT = Files.exists(ucrtbase);
         Path stdLib = useUCRT ? ucrtbase : msvcrt;
-        SymbolLookup lookup = libLookup(libs -> libs.load(stdLib));
+        SymbolLookup lookup = stdLibLookup(libs -> libs.load(stdLib));
 
         if (useUCRT) {
             // use a fallback lookup to look up inline functions from fallback lib
 
-            SymbolLookup fallbackLibLookup =
-                    libLookup(libs -> libs.load(jdkLibraryPath("syslookup")));
+            SymbolLookup fallbackLibLookup = sysLookup();
 
             @SuppressWarnings("restricted")
             MemorySegment funcs = fallbackLibLookup.findOrThrow("funcs")
@@ -110,8 +110,7 @@ private static SymbolLookup makeWindowsLookup() {
         return lookup;
     }
 
-    private static SymbolLookup libLookup(Function<RawNativeLibraries, NativeLibrary> loader) {
-        NativeLibrary lib = loader.apply(RawNativeLibraries.newInstance(MethodHandles.lookup()));
+    private static SymbolLookup lookup(NativeLibrary lib) {
         return name -> {
             Objects.requireNonNull(name);
             if (Utils.containsNullChars(name)) return Optional.empty();
@@ -126,16 +125,17 @@ private static SymbolLookup libLookup(Function<RawNativeLibraries, NativeLibrary
         };
     }
 
-    /*
-     * Returns the path of the given library name from JDK
-     */
-    private static Path jdkLibraryPath(String name) {
-        Path javahome = Path.of(StaticProperty.javaHome());
-        String lib = OperatingSystem.isWindows() ? "bin" : "lib";
-        String libname = System.mapLibraryName(name);
-        return javahome.resolve(lib).resolve(libname);
+    private static SymbolLookup stdLibLookup(Function<RawNativeLibraries, NativeLibrary> loader) {
+        NativeLibrary lib = loader.apply(RawNativeLibraries.newInstance(MethodHandles.lookup()));
+        return lookup(lib);
     }
 
+    @SuppressWarnings("restricted")
+    private static SymbolLookup sysLookup() {
+        NativeLibraries libs = NativeLibraries.newInstance(null);
+        NativeLibrary lib = libs.loadLibrary(SymbolLookup.class, "syslookup");
+        return lookup(lib);
+    }
 
     public static SystemLookup getInstance() {
         return INSTANCE;
diff --git a/src/java.base/share/native/libsyslookup/syslookup.c b/src/java.base/share/native/libsyslookup/syslookup.c
index b1f543bfdb7..fa7ddca4156 100644
--- a/src/java.base/share/native/libsyslookup/syslookup.c
+++ b/src/java.base/share/native/libsyslookup/syslookup.c
@@ -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
@@ -27,6 +27,10 @@
 // Adding at least one #include removes unwanted warnings on some platforms.
 #include <stdlib.h>
 
+#include "jni_util.h"
+
+DEF_STATIC_JNI_OnLoad
+
 // Simple dummy function so this library appears as a normal library to tooling.
 char* syslookup() {
   return "syslookup";
diff --git a/src/java.base/windows/native/libsyslookup/syslookup.c b/src/java.base/windows/native/libsyslookup/syslookup.c
index c7ddce46a79..3216632c53d 100644
--- a/src/java.base/windows/native/libsyslookup/syslookup.c
+++ b/src/java.base/windows/native/libsyslookup/syslookup.c
@@ -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
@@ -26,6 +26,10 @@
 #include <stdio.h>
 #include <time.h>
 
+#include "jni_util.h"
+
+DEF_STATIC_JNI_OnLoad
+
 // Forces generation of inline code on Windows
 __declspec(dllexport) void* funcs[] = {
     // stdio.h

From af4388abf232ec66614df51b34d5966ee6706b7b Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Mon, 28 Apr 2025 19:24:09 +0000
Subject: [PATCH 170/901] 8355649: Missing ResourceMark in
 ExceptionMark::check_no_pending_exception

Reviewed-by: jsjolen, shade
---
 src/hotspot/share/utilities/exceptions.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 724797eb9f3..a3ad480f50c 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -540,6 +540,7 @@ inline void ExceptionMark::check_no_pending_exception() {
   if (_thread->has_pending_exception()) {
     oop exception = _thread->pending_exception();
     _thread->clear_pending_exception(); // Needed to avoid infinite recursion
+    ResourceMark rm;
     exception->print();
     fatal("ExceptionMark constructor expects no pending exceptions");
   }
@@ -551,6 +552,7 @@ ExceptionMark::~ExceptionMark() {
     Handle exception(_thread, _thread->pending_exception());
     _thread->clear_pending_exception(); // Needed to avoid infinite recursion
     if (is_init_completed()) {
+      ResourceMark rm;
       exception->print();
       fatal("ExceptionMark destructor expects no pending exceptions");
     } else {

From 62d165d0e4e5ab1bcef35d5031554a354052c6d5 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 28 Apr 2025 19:44:04 +0000
Subject: [PATCH 171/901] 8355669: Add static-jdk-bundles make target

Reviewed-by: ihse
---
 make/Bundles.gmk                | 20 +++++++++++++++++++-
 make/Main.gmk                   |  6 ++++++
 make/autoconf/spec.gmk.template |  4 ++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 8962b596278..ba8ec0c864b 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -174,9 +174,11 @@ else
   JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
   JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
+  STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
     JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
+    STATIC_JDK_BUNDLE_SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
   # In certain situations, the JDK_IMAGE_DIR points to an image without the
   # the symbols and demos. If so, the symobls and demos can be found in a
@@ -500,6 +502,21 @@ ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
   STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
 endif
 
+#################################################################################
+
+ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
+  STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
+
+  $(eval $(call SetupBundleFile, BUILD_STATIC_JDK_BUNDLE, \
+      BUNDLE_NAME := $(STATIC_JDK_BUNDLE_NAME), \
+      FILES := $(STATIC_JDK_BUNDLE_FILES), \
+      BASE_DIRS := $(STATIC_JDK_IMAGE_DIR), \
+      SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR), \
+  ))
+
+  STATIC_JDK_TARGETS += $(BUILD_STATIC_JDK_BUNDLE)
+endif
+
 ################################################################################
 
 product-bundles: $(PRODUCT_TARGETS)
@@ -510,11 +527,12 @@ docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
 docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
+static-jdk-bundles: $(STATIC_JDK_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
 .PHONY: product-bundles test-bundles \
     docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
-    static-libs-bundles static-libs-graal-bundles jcov-bundles
+    static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
 
 ################################################################################
 
diff --git a/make/Main.gmk b/make/Main.gmk
index eda3b79265a..3535ad16aae 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -875,6 +875,12 @@ $(eval $(call SetupTarget, static-libs-graal-bundles, \
     DEPS := static-libs-graal-image, \
 ))
 
+$(eval $(call SetupTarget, static-jdk-bundles, \
+    MAKEFILE := Bundles, \
+    TARGET := static-jdk-bundles, \
+    DEPS := static-jdk-image, \
+))
+
 ifeq ($(JCOV_ENABLED), true)
   $(eval $(call SetupTarget, jcov-bundles, \
       MAKEFILE := Bundles, \
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 907a60290ec..ebaa487b40a 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -846,10 +846,12 @@ SVE_CFLAGS := @SVE_CFLAGS@
 JDK_IMAGE_SUBDIR := jdk
 JRE_IMAGE_SUBDIR := jre
 JCOV_IMAGE_SUBDIR := jdk-jcov
+STATIC_JDK_IMAGE_SUBDIR := static-jdk
 
 # Colon left out to be able to override output dir for bootcycle-images
 JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
 JRE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
+STATIC_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(STATIC_JDK_IMAGE_SUBDIR)
 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
 
 # Test image, as above
@@ -929,6 +931,7 @@ DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
 STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_PART).tar.gz
+STATIC_JDK_BUNDLE_NAME := static-jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
@@ -939,6 +942,7 @@ TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
 DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
 DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
 DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
+STATIC_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(STATIC_JDK_BUNDLE_NAME)
 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
 
 # This macro is called to allow inclusion of closed source counterparts.

From 1fd136cd6b863ebee70e42b2966584218d0919ec Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 28 Apr 2025 21:36:14 +0000
Subject: [PATCH 172/901] 8354335: No longer deprecate wrapper class
 constructors for removal

Reviewed-by: liach, bchristi, iris
---
 src/java.base/share/classes/java/lang/Boolean.java          | 6 +++---
 src/java.base/share/classes/java/lang/Byte.java             | 6 +++---
 src/java.base/share/classes/java/lang/Character.java        | 2 +-
 src/java.base/share/classes/java/lang/Double.java           | 4 ++--
 src/java.base/share/classes/java/lang/Float.java            | 6 +++---
 src/java.base/share/classes/java/lang/Integer.java          | 6 +++---
 src/java.base/share/classes/java/lang/Long.java             | 6 +++---
 src/java.base/share/classes/java/lang/Short.java            | 6 +++---
 .../share/classes/java/lang/invoke/MemberName.java          | 2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Boolean.java b/src/java.base/share/classes/java/lang/Boolean.java
index aa64d799b66..4c24e98a549 100644
--- a/src/java.base/share/classes/java/lang/Boolean.java
+++ b/src/java.base/share/classes/java/lang/Boolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public final class Boolean implements java.io.Serializable,
      * Also consider using the final fields {@link #TRUE} and {@link #FALSE}
      * if possible.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Boolean(boolean value) {
         this.value = value;
     }
@@ -124,7 +124,7 @@ public Boolean(boolean value) {
      * {@code boolean} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Boolean} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Boolean(String s) {
         this(parseBoolean(s));
     }
diff --git a/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java
index 5835f65366f..accd448a0cd 100644
--- a/src/java.base/share/classes/java/lang/Byte.java
+++ b/src/java.base/share/classes/java/lang/Byte.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
@@ -346,7 +346,7 @@ public static Byte decode(String nm) throws NumberFormatException {
      * {@link #valueOf(byte)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Byte(byte value) {
         this.value = value;
     }
@@ -369,7 +369,7 @@ public Byte(byte value) {
      * {@code byte} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Byte} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Byte(String s) throws NumberFormatException {
         this.value = parseByte(s, 10);
     }
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index 4347a3bc8aa..a439a90761d 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -9232,7 +9232,7 @@ public static final UnicodeScript forName(String scriptName) {
      * {@link #valueOf(char)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Character(char value) {
         this.value = value;
     }
diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
index 54be998cac5..5ab6dce080b 100644
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -1041,7 +1041,7 @@ public static boolean isFinite(double d) {
      * {@link #valueOf(double)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Double(double value) {
         this.value = value;
     }
@@ -1062,7 +1062,7 @@ public Double(double value) {
      * {@code double} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Double} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Double(String s) throws NumberFormatException {
         value = parseDouble(s);
     }
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
index 746d90db81e..4344d9657b4 100644
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -668,7 +668,7 @@ public static boolean isFinite(float f) {
      * {@link #valueOf(float)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Float(float value) {
         this.value = value;
     }
@@ -684,7 +684,7 @@ public Float(float value) {
      * static factory method {@link #valueOf(float)} method as follows:
      * {@code Float.valueOf((float)value)}.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Float(double value) {
         this.value = (float)value;
     }
@@ -705,7 +705,7 @@ public Float(double value) {
      * {@code float} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Float} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Float(String s) throws NumberFormatException {
         value = parseFloat(s);
     }
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 99b056ec18a..1350a66b66c 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1024,7 +1024,7 @@ public static Integer valueOf(int i) {
      * {@link #valueOf(int)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Integer(int value) {
         this.value = value;
     }
@@ -1046,7 +1046,7 @@ public Integer(int value) {
      * {@code int} primitive, or use {@link #valueOf(String)}
      * to convert a string to an {@code Integer} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Integer(String s) throws NumberFormatException {
         this.value = parseInt(s, 10);
     }
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index c401fcd8027..3093f37e99a 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1109,7 +1109,7 @@ else if (nm.startsWith("0", index) && nm.length() > 1 + index) {
      * {@link #valueOf(long)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Long(long value) {
         this.value = value;
     }
@@ -1132,7 +1132,7 @@ public Long(long value) {
      * {@code long} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Long} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Long(String s) throws NumberFormatException {
         this.value = parseLong(s, 10);
     }
diff --git a/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java
index 57e88442b27..f0ae8b28e45 100644
--- a/src/java.base/share/classes/java/lang/Short.java
+++ b/src/java.base/share/classes/java/lang/Short.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
@@ -352,7 +352,7 @@ public static Short decode(String nm) throws NumberFormatException {
      * {@link #valueOf(short)} is generally a better choice, as it is
      * likely to yield significantly better space and time performance.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Short(short value) {
         this.value = value;
     }
@@ -375,7 +375,7 @@ public Short(short value) {
      * {@code short} primitive, or use {@link #valueOf(String)}
      * to convert a string to a {@code Short} object.
      */
-    @Deprecated(since="9", forRemoval = true)
+    @Deprecated(since="9")
     public Short(String s) throws NumberFormatException {
         this.value = parseShort(s, 10);
     }
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 35fd26331b1..918d1b10791 100644
--- a/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -711,7 +711,7 @@ public MemberName getDefinition() {
     }
 
     @Override
-    @SuppressWarnings("removal")
+    @SuppressWarnings("deprecation")
     public int hashCode() {
         // Avoid autoboxing getReferenceKind(), since this is used early and will force
         // early initialization of Byte$ByteCache

From 62ef706dd1b21a347c2cca717a2277b75dd25097 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 28 Apr 2025 23:31:54 +0000
Subject: [PATCH 173/901] 8355648: Thread.SpinAcquire()'s lock name parameter
 is not used

Reviewed-by: shade, coleenp
---
 src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp |  8 ++------
 src/hotspot/share/runtime/objectMonitor.cpp           | 10 +++++-----
 src/hotspot/share/runtime/park.cpp                    |  4 ++--
 src/hotspot/share/runtime/thread.cpp                  |  2 +-
 src/hotspot/share/runtime/thread.hpp                  |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
index 8d381a646ee..4b5ca80470e 100644
--- a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
@@ -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
@@ -33,11 +33,7 @@ class JfrSpinlockHelper {
 
  public:
   JfrSpinlockHelper(volatile int* lock) : _lock(lock) {
-    Thread::SpinAcquire(_lock, nullptr);
-  }
-
-  JfrSpinlockHelper(volatile int* const lock, const char* name) : _lock(lock) {
-    Thread::SpinAcquire(_lock, name);
+    Thread::SpinAcquire(_lock);
   }
 
   ~JfrSpinlockHelper() {
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 48e068714f5..44899225691 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1805,7 +1805,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   // 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(&_wait_set_lock, "wait_set - add");
+  Thread::SpinAcquire(&_wait_set_lock);
   add_waiter(&node);
   Thread::SpinRelease(&_wait_set_lock);
 
@@ -1864,7 +1864,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     // That is, we fail toward safety.
 
     if (node.TState == ObjectWaiter::TS_WAIT) {
-      Thread::SpinAcquire(&_wait_set_lock, "wait_set - unlink");
+      Thread::SpinAcquire(&_wait_set_lock);
       if (node.TState == ObjectWaiter::TS_WAIT) {
         dequeue_specific_waiter(&node);       // unlink from wait_set
         assert(!node._notified, "invariant");
@@ -1980,7 +1980,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 
 bool ObjectMonitor::notify_internal(JavaThread* current) {
   bool did_notify = false;
-  Thread::SpinAcquire(&_wait_set_lock, "wait_set - notify");
+  Thread::SpinAcquire(&_wait_set_lock);
   ObjectWaiter* iterator = dequeue_waiter();
   if (iterator != nullptr) {
     guarantee(iterator->TState == ObjectWaiter::TS_WAIT, "invariant");
@@ -2120,7 +2120,7 @@ void ObjectMonitor::vthread_wait(JavaThread* current, jlong millis) {
   // 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(&_wait_set_lock, "wait_set - add");
+  Thread::SpinAcquire(&_wait_set_lock);
   add_waiter(node);
   Thread::SpinRelease(&_wait_set_lock);
 
@@ -2143,7 +2143,7 @@ bool ObjectMonitor::vthread_wait_reenter(JavaThread* current, ObjectWaiter* node
   // need to check if we were interrupted or the wait timed-out, and
   // in that case remove ourselves from the _wait_set queue.
   if (node->TState == ObjectWaiter::TS_WAIT) {
-    Thread::SpinAcquire(&_wait_set_lock, "wait_set - unlink");
+    Thread::SpinAcquire(&_wait_set_lock);
     if (node->TState == ObjectWaiter::TS_WAIT) {
       dequeue_specific_waiter(node);       // unlink from wait_set
       assert(!node->_notified, "invariant");
diff --git a/src/hotspot/share/runtime/park.cpp b/src/hotspot/share/runtime/park.cpp
index a5a67686f2c..37dfe6fcc3d 100644
--- a/src/hotspot/share/runtime/park.cpp
+++ b/src/hotspot/share/runtime/park.cpp
@@ -60,7 +60,7 @@ ParkEvent * ParkEvent::Allocate (Thread * t) {
   // Using a spin lock since we are part of the mutex impl.
   // 8028280: using concurrent free list without memory management can leak
   // pretty badly it turns out.
-  Thread::SpinAcquire(&ListLock, "ParkEventFreeListAllocate");
+  Thread::SpinAcquire(&ListLock);
   {
     ev = FreeList;
     if (ev != nullptr) {
@@ -88,7 +88,7 @@ void ParkEvent::Release (ParkEvent * ev) {
   ev->AssociatedWith = nullptr ;
   // Note that if we didn't have the TSM/immortal constraint, then
   // when reattaching we could trim the list.
-  Thread::SpinAcquire(&ListLock, "ParkEventFreeListRelease");
+  Thread::SpinAcquire(&ListLock);
   {
     ev->FreeNext = FreeList;
     FreeList = ev;
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 183ecea03ca..400d69ad510 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -562,7 +562,7 @@ bool Thread::set_as_starting_thread(JavaThread* jt) {
 // short-duration critical sections where we're concerned
 // about native mutex_t or HotSpot Mutex:: latency.
 
-void Thread::SpinAcquire(volatile int * adr, const char * LockName) {
+void Thread::SpinAcquire(volatile int * adr) {
   if (Atomic::cmpxchg(adr, 0, 1) == 0) {
     return;   // normal fast-path return
   }
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index d0c0e4d5f73..81307c4acab 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -605,7 +605,7 @@ class Thread: public ThreadShadow {
 
   // Low-level leaf-lock primitives used to implement synchronization.
   // Not for general synchronization use.
-  static void SpinAcquire(volatile int * Lock, const char * Name);
+  static void SpinAcquire(volatile int * Lock);
   static void SpinRelease(volatile int * Lock);
 
 #if defined(__APPLE__) && defined(AARCH64)

From ea3cf1b882c89bfe96af3aa389b69b842d72159c Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Tue, 29 Apr 2025 01:23:47 +0000
Subject: [PATCH 174/901] 8355668: RISC-V:
 jdk/incubator/vector/Int256VectorTests.java fails when using RVV

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

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 4e7b36a9fcb..8ed22008327 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -1124,10 +1124,10 @@ instruct vxorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
 // vector and not
 
 instruct vand_not(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(UseZvbb &&
+            (Matcher::vector_element_basic_type(n) == T_BYTE ||
+             Matcher::vector_element_basic_type(n) == T_SHORT ||
+             Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
   format %{ "vand_not $dst, $src1, $src2" %}
   ins_encode %{
@@ -1141,8 +1141,7 @@ instruct vand_not(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
 %}
 
 instruct vand_notL(vReg dst, vReg src1, vReg src2, immL_M1 m1) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
   format %{ "vand_notL $dst, $src1, $src2" %}
   ins_encode %{
@@ -1155,10 +1154,10 @@ instruct vand_notL(vReg dst, vReg src1, vReg src2, immL_M1 m1) %{
 %}
 
 instruct vand_not_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(UseZvbb &&
+            (Matcher::vector_element_basic_type(n) == T_BYTE ||
+             Matcher::vector_element_basic_type(n) == T_SHORT ||
+             Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
   format %{ "vand_not_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
@@ -1173,8 +1172,7 @@ instruct vand_not_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %
 %}
 
 instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
   format %{ "vand_notL_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
@@ -1188,10 +1186,10 @@ instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, vRegMask_V0 v0)
 %}
 
 instruct vand_not_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(UseZvbb &&
+            (Matcher::vector_element_basic_type(n) == T_BYTE ||
+             Matcher::vector_element_basic_type(n) == T_SHORT ||
+             Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
   format %{ "vand_not_vx $dst, $src1, $src2" %}
   ins_encode %{
@@ -1205,8 +1203,7 @@ instruct vand_not_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
 %}
 
 instruct vand_notL_vx(vReg dst, vReg src1, iRegL src2, immL_M1 m1) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (AndV src1 (Replicate (XorL src2 m1))));
   format %{ "vand_notL_vx $dst, $src1, $src2" %}
   ins_encode %{
@@ -1219,10 +1216,10 @@ instruct vand_notL_vx(vReg dst, vReg src1, iRegL src2, immL_M1 m1) %{
 %}
 
 instruct vand_not_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(UseZvbb &&
+            (Matcher::vector_element_basic_type(n) == T_BYTE ||
+             Matcher::vector_element_basic_type(n) == T_SHORT ||
+             Matcher::vector_element_basic_type(n) == T_INT));
   match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
   format %{ "vand_not_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
@@ -1237,8 +1234,7 @@ instruct vand_not_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask
 %}
 
 instruct vand_notL_vx_masked(vReg dst_src1, iRegL src2, immL_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb);
-  predicate(Matcher::vector_element_basic_type(n) == T_LONG);
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorL src2 m1))) v0));
   format %{ "vand_notL_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{

From 7cf190fbb02e950eb3b5461be139d09add3f6a7d Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Tue, 29 Apr 2025 01:50:23 +0000
Subject: [PATCH 175/901] 8345225: AARCH64: VM crashes with -NearCpool
 +UseShenandoahGC options

Reviewed-by: aph, shade
---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp |  6 +-----
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp | 10 ----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index f231caeba9f..fd6af0b9b4b 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1003,9 +1003,6 @@ void MacroAssembler::c2bool(Register x) {
 
 address MacroAssembler::ic_call(address entry, jint method_index) {
   RelocationHolder rh = virtual_call_Relocation::spec(pc(), method_index);
-  // address const_ptr = long_constant((jlong)Universe::non_oop_word());
-  // uintptr_t offset;
-  // ldr_constant(rscratch2, const_ptr);
   movptr(rscratch2, (intptr_t)Universe::non_oop_word());
   return trampoline_call(Address(entry, rh));
 }
@@ -5520,9 +5517,8 @@ void MacroAssembler::movoop(Register dst, jobject obj) {
     mov(dst, Address((address)obj, rspec));
   } else {
     address dummy = address(uintptr_t(pc()) & -wordSize); // A nearby aligned address
-    ldr_constant(dst, Address(dummy, rspec));
+    ldr(dst, Address(dummy, rspec));
   }
-
 }
 
 // Move a metadata address into a register.
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index af09f97e938..e6075b0073b 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1472,16 +1472,6 @@ class MacroAssembler: public Assembler {
 
   public:
 
-  void ldr_constant(Register dest, const Address &const_addr) {
-    if (NearCpool) {
-      ldr(dest, const_addr);
-    } else {
-      uint64_t offset;
-      adrp(dest, InternalAddress(const_addr.target()), offset);
-      ldr(dest, Address(dest, offset));
-    }
-  }
-
   address read_polling_page(Register r, relocInfo::relocType rtype);
   void get_polling_page(Register dest, relocInfo::relocType rtype);
 

From 7bde2bb57159aaac36a6a585f70c4672919c8c16 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Tue, 29 Apr 2025 02:12:04 +0000
Subject: [PATCH 176/901] 8355654: RISC-V: Relax register constraint for some
 vector-scalar instructions

Reviewed-by: fyang, dzhang
---
 src/hotspot/cpu/riscv/riscv_v.ad | 230 +++++++++++++++----------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 8ed22008327..81c14460b05 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -685,30 +685,30 @@ instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate and (unpredicated)
 
-instruct vand_vi(vReg dst_src, immI5 con) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (AndV dst_src (Replicate con)));
-  format %{ "vand_vi $dst_src, $dst_src, $con" %}
+instruct vand_vi(vReg dst, vReg src1, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (AndV src1 (Replicate con)));
+  format %{ "vand_vi $dst, $src1, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vand_vi(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
+    __ vand_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
                $con$$constant);
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vandL_vi(vReg dst_src, immL5 con) %{
+instruct vandL_vi(vReg dst, vReg src1, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (AndV dst_src (Replicate con)));
-  format %{ "vandL_vi $dst_src, $dst_src, $con" %}
+  match(Set dst (AndV src1 (Replicate con)));
+  format %{ "vandL_vi $dst, $src1, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vand_vi(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
+    __ vand_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
                $con$$constant);
   %}
   ins_pipe(pipe_slow);
@@ -716,31 +716,31 @@ instruct vandL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar and (unpredicated)
 
-instruct vand_vx(vReg dst_src, iRegIorL2I src) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (AndV dst_src (Replicate src)));
-  format %{ "vand_vx $dst_src, $dst_src, $src" %}
+instruct vand_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (AndV src1 (Replicate src2)));
+  format %{ "vand_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vand_vx(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
-               as_Register($src$$reg));
+    __ vand_vx(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vandL_vx(vReg dst_src, iRegL src) %{
+instruct vandL_vx(vReg dst, vReg src1, iRegL src2) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (AndV dst_src (Replicate src)));
-  format %{ "vandL_vx $dst_src, $dst_src, $src" %}
+  match(Set dst (AndV src1 (Replicate src2)));
+  format %{ "vandL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vand_vx(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
-               as_Register($src$$reg));
+    __ vand_vx(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
@@ -748,9 +748,9 @@ instruct vandL_vx(vReg dst_src, iRegL src) %{
 // vector-immediate and (predicated)
 
 instruct vand_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (AndV (Binary dst_src (Replicate con)) v0));
   format %{ "vand_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
@@ -779,9 +779,9 @@ instruct vandL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 // vector-scalar and (predicated)
 
 instruct vand_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (AndV (Binary dst_src (Replicate src)) v0));
   format %{ "vand_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
@@ -841,30 +841,30 @@ instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate or (unpredicated)
 
-instruct vor_vi(vReg dst_src, immI5 con) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (OrV dst_src (Replicate con)));
-  format %{ "vor_vi $dst_src, $dst_src, $con" %}
+instruct vor_vi(vReg dst, vReg src1, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (OrV src1 (Replicate con)));
+  format %{ "vor_vi $dst, $src1, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vor_vi(as_VectorRegister($dst_src$$reg),
-              as_VectorRegister($dst_src$$reg),
+    __ vor_vi(as_VectorRegister($dst$$reg),
+              as_VectorRegister($src1$$reg),
               $con$$constant);
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vorL_vi(vReg dst_src, immL5 con) %{
+instruct vorL_vi(vReg dst, vReg src1, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (OrV dst_src (Replicate con)));
-  format %{ "vorL_vi $dst_src, $dst_src, $con" %}
+  match(Set dst (OrV src1 (Replicate con)));
+  format %{ "vorL_vi $dst, $src1, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vor_vi(as_VectorRegister($dst_src$$reg),
-              as_VectorRegister($dst_src$$reg),
+    __ vor_vi(as_VectorRegister($dst$$reg),
+              as_VectorRegister($src1$$reg),
               $con$$constant);
   %}
   ins_pipe(pipe_slow);
@@ -872,31 +872,31 @@ instruct vorL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar or (unpredicated)
 
-instruct vor_vx(vReg dst_src, iRegIorL2I src) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (OrV dst_src (Replicate src)));
-  format %{ "vor_vx $dst_src, $dst_src, $src" %}
+instruct vor_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (OrV src1 (Replicate src2)));
+  format %{ "vor_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vor_vx(as_VectorRegister($dst_src$$reg),
-              as_VectorRegister($dst_src$$reg),
-              as_Register($src$$reg));
+    __ vor_vx(as_VectorRegister($dst$$reg),
+              as_VectorRegister($src1$$reg),
+              as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vorL_vx(vReg dst_src, iRegL src) %{
+instruct vorL_vx(vReg dst, vReg src1, iRegL src2) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (OrV dst_src (Replicate src)));
-  format %{ "vorL_vx $dst_src, $dst_src, $src" %}
+  match(Set dst (OrV src1 (Replicate src2)));
+  format %{ "vorL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vor_vx(as_VectorRegister($dst_src$$reg),
-              as_VectorRegister($dst_src$$reg),
-              as_Register($src$$reg));
+    __ vor_vx(as_VectorRegister($dst$$reg),
+              as_VectorRegister($src1$$reg),
+              as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
@@ -904,9 +904,9 @@ instruct vorL_vx(vReg dst_src, iRegL src) %{
 // vector-immediate or (predicated)
 
 instruct vor_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (OrV (Binary dst_src (Replicate con)) v0));
   format %{ "vor_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
@@ -935,9 +935,9 @@ instruct vorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 // vector-scalar or (predicated)
 
 instruct vor_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (OrV (Binary dst_src (Replicate src)) v0));
   format %{ "vor_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
@@ -997,30 +997,30 @@ instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 // vector-immediate xor (unpredicated)
 
-instruct vxor_vi(vReg dst_src, immI5 con) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (XorV dst_src (Replicate con)));
-  format %{ "vxor_vi $dst_src, $dst_src, $con" %}
+instruct vxor_vi(vReg dst, vReg src1, immI5 con) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (XorV src1 (Replicate con)));
+  format %{ "vxor_vi $dst, $src1, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vxor_vi(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
                $con$$constant);
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vxorL_vi(vReg dst_src, immL5 con) %{
+instruct vxorL_vi(vReg dst, vReg src1, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (XorV dst_src (Replicate con)));
-  format %{ "vxorL_vi $dst_src, $dst_src, $con" %}
+  match(Set dst (XorV src1 (Replicate con)));
+  format %{ "vxorL_vi $dst, $src1, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vxor_vi(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
+    __ vxor_vi(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
                $con$$constant);
   %}
   ins_pipe(pipe_slow);
@@ -1028,31 +1028,31 @@ instruct vxorL_vi(vReg dst_src, immL5 con) %{
 
 // vector-scalar xor (unpredicated)
 
-instruct vxor_vx(vReg dst_src, iRegIorL2I src) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
-  match(Set dst_src (XorV dst_src (Replicate src)));
-  format %{ "vxor_vx $dst_src, $dst_src, $src" %}
+instruct vxor_vx(vReg dst, vReg src1, iRegIorL2I src2) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (XorV src1 (Replicate src2)));
+  format %{ "vxor_vx $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
     __ vsetvli_helper(bt, Matcher::vector_length(this));
-    __ vxor_vx(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
-               as_Register($src$$reg));
+    __ vxor_vx(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
 
-instruct vxorL_vx(vReg dst_src, iRegL src) %{
+instruct vxorL_vx(vReg dst, vReg src1, iRegL src2) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
-  match(Set dst_src (XorV dst_src (Replicate src)));
-  format %{ "vxorL_vx $dst_src, $dst_src, $src" %}
+  match(Set dst (XorV src1 (Replicate src2)));
+  format %{ "vxorL_vx $dst, $src1, $src2" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
-    __ vxor_vx(as_VectorRegister($dst_src$$reg),
-               as_VectorRegister($dst_src$$reg),
-               as_Register($src$$reg));
+    __ vxor_vx(as_VectorRegister($dst$$reg),
+               as_VectorRegister($src1$$reg),
+               as_Register($src2$$reg));
   %}
   ins_pipe(pipe_slow);
 %}
@@ -1060,9 +1060,9 @@ instruct vxorL_vx(vReg dst_src, iRegL src) %{
 // vector-immediate xor (predicated)
 
 instruct vxor_vi_masked(vReg dst_src, immI5 con, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (XorV (Binary dst_src (Replicate con)) v0));
   format %{ "vxor_vi_masked $dst_src, $dst_src, $con, $v0" %}
   ins_encode %{
@@ -1091,9 +1091,9 @@ instruct vxorL_vi_masked(vReg dst_src, immL5 con, vRegMask_V0 v0) %{
 // vector-scalar xor (predicated)
 
 instruct vxor_vx_masked(vReg dst_src, iRegIorL2I src, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (XorV (Binary dst_src (Replicate src)) v0));
   format %{ "vxor_vx_masked $dst_src, $dst_src, $src, $v0" %}
   ins_encode %{
@@ -1252,9 +1252,9 @@ instruct vand_notL_vx_masked(vReg dst_src1, iRegL src2, immL_M1 m1, vRegMask_V0
 // vector not
 
 instruct vnot(vReg dst, vReg src, immI_M1 m1) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst (XorV src (Replicate m1)));
   format %{ "vnot $dst, $src" %}
   ins_encode %{
@@ -1283,9 +1283,9 @@ instruct vnotL(vReg dst, vReg src, immL_M1 m1) %{
 // vector not - predicated
 
 instruct vnot_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst_src (XorV (Binary dst_src (Replicate m1)) v0));
   format %{ "vnot_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
@@ -4303,8 +4303,8 @@ instruct vcvtStoB(vReg dst, vReg src) %{
 %}
 
 instruct vcvtStoX(vReg dst, vReg src) %{
-  predicate((Matcher::vector_element_basic_type(n) == T_INT ||
-             Matcher::vector_element_basic_type(n) == T_LONG));
+  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
+            Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (VectorCastS2X src));
   effect(TEMP_DEF dst);
   format %{ "vcvtStoX $dst, $src" %}
@@ -4317,8 +4317,8 @@ instruct vcvtStoX(vReg dst, vReg src) %{
 %}
 
 instruct vcvtStoX_fp(vReg dst, vReg src) %{
-  predicate((Matcher::vector_element_basic_type(n) == T_FLOAT ||
-             Matcher::vector_element_basic_type(n) == T_DOUBLE));
+  predicate(Matcher::vector_element_basic_type(n) == T_FLOAT ||
+            Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst (VectorCastS2X src));
   effect(TEMP_DEF dst);
   format %{ "vcvtStoX_fp $dst, $src" %}
@@ -4415,9 +4415,9 @@ instruct vcvtItoD(vReg dst, vReg src) %{
 // VectorCastL2X
 
 instruct vcvtLtoI(vReg dst, vReg src) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_INT ||
-            Matcher::vector_element_basic_type(n) == T_BYTE ||
-            Matcher::vector_element_basic_type(n) == T_SHORT);
+  predicate(Matcher::vector_element_basic_type(n) == T_BYTE ||
+            Matcher::vector_element_basic_type(n) == T_SHORT ||
+            Matcher::vector_element_basic_type(n) == T_INT);
   match(Set dst (VectorCastL2X src));
   format %{ "vcvtLtoI $dst, $src" %}
   ins_encode %{

From e4cb49fc8531ee7cdc66ed16f5f5e2ec94d1244b Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 29 Apr 2025 03:06:23 +0000
Subject: [PATCH 177/901] 8342206: Convenience method to check if a constant
 pool entry matches nominal descriptors

Reviewed-by: asotona
---
 .../classfile/constantpool/ClassEntry.java    |  14 ++
 .../constantpool/MethodTypeEntry.java         |  13 +
 .../classfile/constantpool/ModuleEntry.java   |  13 +
 .../classfile/constantpool/PackageEntry.java  |  13 +
 .../classfile/constantpool/StringEntry.java   |  15 ++
 .../classfile/constantpool/Utf8Entry.java     |  18 ++
 .../classfile/impl/AbstractPoolEntry.java     | 128 +++++++++-
 .../classfile/impl/SplitConstantPool.java     |   4 +-
 .../classfile/ConstantDescSymbolsTest.java    | 232 +++++++++++++++++-
 9 files changed, 432 insertions(+), 18 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/ClassEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/ClassEntry.java
index 5017838d68e..108c47c8089 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/ClassEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/ClassEntry.java
@@ -104,8 +104,22 @@ default ConstantDesc constantValue() {
      * returned descriptor is never {@linkplain ClassDesc#isPrimitive()
      * primitive}.
      *
+     * @apiNote
+     * If only symbol equivalence is desired, {@link #matches(ClassDesc)
+     * matches} should be used.  It requires reduced parsing and can
+     * improve {@code class} file reading performance.
+     *
      * @see ConstantPoolBuilder#classEntry(ClassDesc)
      *      ConstantPoolBuilder::classEntry(ClassDesc)
      */
     ClassDesc asSymbol();
+
+    /**
+     * {@return whether this entry describes the given reference type}  Returns
+     * {@code false} if {@code desc} is primitive.
+     *
+     * @param desc the reference type
+     * @since 25
+     */
+    boolean matches(ClassDesc desc);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/MethodTypeEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/MethodTypeEntry.java
index 5da36502678..2f56ce2e6ab 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/MethodTypeEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/MethodTypeEntry.java
@@ -70,6 +70,19 @@ default ConstantDesc constantValue() {
     /**
      * {@return a symbolic descriptor for the {@linkplain #descriptor() method
      * type}}
+     *
+     * @apiNote
+     * If only symbol equivalence is desired, {@link #matches(MethodTypeDesc)
+     * matches} should be used.  It requires reduced parsing and can
+     * improve {@code class} file reading performance.
      */
     MethodTypeDesc asSymbol();
+
+    /**
+     * {@return whether this entry describes the given method type}
+     *
+     * @param desc the method type descriptor
+     * @since 25
+     */
+    boolean matches(MethodTypeDesc desc);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/ModuleEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/ModuleEntry.java
index fd920aa1231..169927868b6 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/ModuleEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/ModuleEntry.java
@@ -55,6 +55,19 @@ public sealed interface ModuleEntry extends PoolEntry
 
     /**
      * {@return a symbolic descriptor for the {@linkplain #name() module name}}
+     *
+     * @apiNote
+     * If only symbol equivalence is desired, {@link #matches(ModuleDesc)
+     * matches} should be used.  It requires reduced parsing and can
+     * improve {@code class} file reading performance.
      */
     ModuleDesc asSymbol();
+
+    /**
+     * {@return whether this entry describes the given module}
+     *
+     * @param desc the module descriptor
+     * @since 25
+     */
+    boolean matches(ModuleDesc desc);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/PackageEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/PackageEntry.java
index ec56d0a4870..19f4560b5e6 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/PackageEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/PackageEntry.java
@@ -58,6 +58,19 @@ public sealed interface PackageEntry extends PoolEntry
 
     /**
      * {@return a symbolic descriptor for the {@linkplain #name() package name}}
+     *
+     * @apiNote
+     * If only symbol equivalence is desired, {@link #matches(PackageDesc)
+     * matches} should be used.  It requires reduced parsing and can
+     * improve {@code class} file reading performance.
      */
     PackageDesc asSymbol();
+
+    /**
+     * {@return whether this entry describes the given package}
+     *
+     * @param desc the package descriptor
+     * @since 25
+     */
+    boolean matches(PackageDesc desc);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/StringEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/StringEntry.java
index 8a0bbb4b015..b49e74df404 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/StringEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/StringEntry.java
@@ -56,7 +56,22 @@ public sealed interface StringEntry
     /**
      * {@return the string value for this entry}
      *
+     * @apiNote
+     * A {@code Utf8Entry} can be used directly as a {@link CharSequence} if
+     * {@code String} functionalities are not strictly desired.  If only string
+     * equivalence is desired, {@link #equalsString(String) equalsString} should
+     * be used.  Reduction of string processing can significantly improve {@code
+     * class} file reading performance.
+     *
      * @see ConstantPoolBuilder#stringEntry(String)
      */
     String stringValue();
+
+    /**
+     * {@return whether this entry describes the same string as the provided string}
+     *
+     * @param value the string to compare to
+     * @since 25
+     */
+    boolean equalsString(String value);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/Utf8Entry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/Utf8Entry.java
index 1d885051b2b..81a4e973d3f 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/Utf8Entry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/Utf8Entry.java
@@ -84,4 +84,22 @@ public sealed interface Utf8Entry
      * @param s the string to compare to
      */
     boolean equalsString(String s);
+
+    /**
+     * {@return whether this entry describes the descriptor string of this
+     * field type}
+     *
+     * @param desc the field type
+     * @since 25
+     */
+    boolean isFieldType(ClassDesc desc);
+
+    /**
+     * {@return whether this entry describes the descriptor string of this
+     * method type}
+     *
+     * @param desc the method type
+     * @since 25
+     */
+    boolean isMethodType(MethodTypeDesc desc);
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index 3e50773d59e..bf558ddef16 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.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,8 @@
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.constant.ClassOrInterfaceDescImpl;
+import jdk.internal.constant.PrimitiveClassDescImpl;
 import jdk.internal.util.ArraysSupport;
 import jdk.internal.vm.annotation.Stable;
 
@@ -73,11 +75,6 @@ static int hashClassFromDescriptor(int descriptorHash) {
         return hash1(PoolEntry.TAG_CLASS, descriptorHash);
     }
 
-    static boolean isArrayDescriptor(Utf8EntryImpl cs) {
-        // Do not throw out-of-bounds for empty strings
-        return !cs.isEmpty() && cs.charAt(0) == '[';
-    }
-
     @SuppressWarnings("unchecked")
     public static <T extends PoolEntry> T maybeClone(ConstantPoolBuilder cp, T entry) {
         if (cp.canWriteDirect(entry.constantPool()))
@@ -438,6 +435,79 @@ public MethodTypeDesc methodTypeSymbol() {
             typeSym = ret;
             return ret;
         }
+
+        @Override
+        public boolean isFieldType(ClassDesc desc) {
+            var sym = typeSym;
+            if (sym != null) {
+                return sym instanceof ClassDesc cd && cd.equals(desc);
+            }
+
+            // In parsing, Utf8Entry is not even inflated by this point
+            // We can operate on the raw byte arrays, as all ascii are compatible
+            var ret = state == State.RAW
+                    ? rawEqualsSym(desc)
+                    : equalsString(desc.descriptorString());
+            if (ret)
+                this.typeSym = desc;
+            return ret;
+        }
+
+        private boolean rawEqualsSym(ClassDesc desc) {
+            int len = rawLen;
+            if (len < 1) {
+                return false;
+            }
+            int c = rawBytes[offset];
+            if (len == 1) {
+                return desc instanceof PrimitiveClassDescImpl pd && pd.wrapper().basicTypeChar() == c;
+            } else if (c == 'L') {
+                return desc.isClassOrInterface() && equalsString(desc.descriptorString());
+            } else if (c == '[') {
+                return desc.isArray() && equalsString(desc.descriptorString());
+            } else {
+                return false;
+            }
+        }
+
+        boolean mayBeArrayDescriptor() {
+            if (state == State.RAW) {
+                return rawLen > 0 && rawBytes[offset] == '[';
+            } else {
+                return charLen > 0 && charAt(0) == '[';
+            }
+        }
+
+        @Override
+        public boolean isMethodType(MethodTypeDesc desc) {
+            var sym = typeSym;
+            if (sym != null) {
+                return sym instanceof MethodTypeDesc mtd && mtd.equals(desc);
+            }
+
+            // In parsing, Utf8Entry is not even inflated by this point
+            // We can operate on the raw byte arrays, as all ascii are compatible
+            var ret = state == State.RAW
+                    ? rawEqualsSym(desc)
+                    : equalsString(desc.descriptorString());
+            if (ret)
+                this.typeSym = desc;
+            return ret;
+        }
+
+        private boolean rawEqualsSym(MethodTypeDesc desc) {
+            if (rawLen < 3) {
+                return false;
+            }
+            var bytes = rawBytes;
+            int index = offset;
+            int c = bytes[index] | (bytes[index + 1] << Byte.SIZE);
+            if ((desc.parameterCount() == 0) != (c == ('(' | (')' << Byte.SIZE)))) {
+                // heuristic - avoid inflation for no-arg status mismatch
+                return false;
+            }
+            return (c & 0xFF) == '(' && equalsString(desc.descriptorString());
+        }
     }
 
     abstract static sealed class AbstractRefEntry<T extends PoolEntry> extends AbstractPoolEntry {
@@ -538,7 +608,7 @@ public ClassDesc asSymbol() {
                 return sym;
             }
 
-            if (isArrayDescriptor(ref1)) {
+            if (ref1.mayBeArrayDescriptor()) {
                 sym = ref1.fieldTypeSymbol(); // array, symbol already available
             } else {
                 sym = ClassDesc.ofInternalName(asInternalName()); // class or interface
@@ -546,6 +616,28 @@ public ClassDesc asSymbol() {
             return this.sym = sym;
         }
 
+        @Override
+        public boolean matches(ClassDesc desc) {
+            var sym = this.sym;
+            if (sym != null) {
+                return sym.equals(desc);
+            }
+
+            var ret = rawEqualsSymbol(desc);
+            if (ret)
+                this.sym = desc;
+            return ret;
+        }
+
+        private boolean rawEqualsSymbol(ClassDesc desc) {
+            if (ref1.mayBeArrayDescriptor()) {
+                return desc.isArray() && ref1.isFieldType(desc);
+            } else {
+                return desc instanceof ClassOrInterfaceDescImpl coid
+                        && ref1.equalsString(coid.internalName());
+            }
+        }
+
         @Override
         public boolean equals(Object o) {
             if (o == this) return true;
@@ -571,7 +663,7 @@ public int hashCode() {
             if (hash != 0)
                 return hash;
 
-            return this.hash = hashClassFromUtf8(isArrayDescriptor(ref1), ref1);
+            return this.hash = hashClassFromUtf8(ref1.mayBeArrayDescriptor(), ref1);
         }
     }
 
@@ -596,6 +688,11 @@ public PackageDesc asSymbol() {
             return PackageDesc.ofInternalName(asInternalName());
         }
 
+        @Override
+        public boolean matches(PackageDesc desc) {
+            return ref1.equalsString(desc.internalName());
+        }
+
         @Override
         public boolean equals(Object o) {
             if (o == this) return true;
@@ -627,6 +724,11 @@ public ModuleDesc asSymbol() {
             return ModuleDesc.of(asInternalName());
         }
 
+        @Override
+        public boolean matches(ModuleDesc desc) {
+            return ref1.equalsString(desc.name());
+        }
+
         @Override
         public boolean equals(Object o) {
             if (o == this) return true;
@@ -983,6 +1085,11 @@ public MethodTypeDesc asSymbol() {
             return ref1.methodTypeSymbol();
         }
 
+        @Override
+        public boolean matches(MethodTypeDesc desc) {
+            return ref1.isMethodType(desc);
+        }
+
         @Override
         public boolean equals(Object o) {
             if (o == this) return true;
@@ -1016,6 +1123,11 @@ public String stringValue() {
             return ref1.toString();
         }
 
+        @Override
+        public boolean equalsString(String value) {
+            return ref1.equalsString(value);
+        }
+
         @Override
         public ConstantDesc constantValue() {
             return stringValue();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
index 5ba81fc2927..2ea6fa943a7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.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
@@ -497,7 +497,7 @@ AbstractPoolEntry.Utf8EntryImpl maybeCloneUtf8Entry(Utf8Entry entry) {
     @Override
     public AbstractPoolEntry.ClassEntryImpl classEntry(Utf8Entry nameEntry) {
         var ne = maybeCloneUtf8Entry(nameEntry);
-        return classEntry(ne, AbstractPoolEntry.isArrayDescriptor(ne));
+        return classEntry(ne, ne.mayBeArrayDescriptor());
     }
 
     AbstractPoolEntry.ClassEntryImpl classEntry(AbstractPoolEntry.Utf8EntryImpl ne, boolean isArray) {
diff --git a/test/jdk/jdk/classfile/ConstantDescSymbolsTest.java b/test/jdk/jdk/classfile/ConstantDescSymbolsTest.java
index b5d3ba5d584..ac1292b1062 100644
--- a/test/jdk/jdk/classfile/ConstantDescSymbolsTest.java
+++ b/test/jdk/jdk/classfile/ConstantDescSymbolsTest.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
@@ -30,22 +30,25 @@
  * @run junit ConstantDescSymbolsTest
  */
 
-import java.lang.classfile.constantpool.ConstantPoolBuilder;
-import java.lang.constant.ClassDesc;
-import java.lang.constant.DynamicConstantDesc;
-import java.lang.constant.MethodHandleDesc;
-import java.lang.constant.MethodTypeDesc;
+import java.lang.classfile.constantpool.*;
+import java.lang.constant.*;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.nio.charset.StandardCharsets;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.lang.classfile.ClassFile;
 import java.util.stream.Stream;
 
-import jdk.internal.classfile.impl.AbstractPoolEntry;
+import jdk.internal.classfile.impl.Util;
 import jdk.internal.constant.ConstantUtils;
 import org.junit.jupiter.api.Assertions;
 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 static java.lang.classfile.ClassFile.ACC_PUBLIC;
@@ -88,7 +91,8 @@ void testPrimitiveClassDesc() throws Throwable {
     // Tests that condy symbols with non-static-method bootstraps are using the right lookup descriptor.
     @Test
     void testConstantDynamicNonStaticBootstrapMethod() throws Throwable {
-        record CondyBoot(MethodHandles.Lookup lookup, String name, Class<?> type) {}
+        record CondyBoot(MethodHandles.Lookup lookup, String name, Class<?> type) {
+        }
         var bootClass = CondyBoot.class.describeConstable().orElseThrow();
         var bootMhDesc = MethodHandleDesc.ofConstructor(bootClass, CD_MethodHandles_Lookup, CD_String, CD_Class);
         var condyDesc = DynamicConstantDesc.of(bootMhDesc);
@@ -165,4 +169,216 @@ void testConstantPoolBuilderClassOrInterfaceEntry(ClassDesc cd) {
         assertSame(utf8, ce.name(), "Reusing existing utf8 entry");
         assertEquals(cd, ce.asSymbol(), "Symbol propagation on create with utf8");
     }
+
+    @ParameterizedTest
+    @MethodSource("equalityCases")
+    <T, P extends PoolEntry> void testAsSymbolEquality(ValidSymbolCase<T, P> validSymbolCase, String entryState, P p) {
+        var asSymbol = validSymbolCase.translator.extractor.apply(p);
+        assertEquals(validSymbolCase.sym, asSymbol, "asSym vs sym");
+        assertEquals(validSymbolCase.other, asSymbol, "asSym vs other sym");
+    }
+
+    @ParameterizedTest
+    @MethodSource("equalityCases")
+    <T, P extends PoolEntry> void testMatchesOriginalEquality(ValidSymbolCase<T, P> validSymbolCase, String entryState, P p) {
+        assertTrue(validSymbolCase.translator.tester.test(p, validSymbolCase.sym));
+    }
+
+    @ParameterizedTest
+    @MethodSource("equalityCases")
+    <T, P extends PoolEntry> void testMatchesEquivalentEquality(ValidSymbolCase<T, P> validSymbolCase, String entryState, P p) {
+        assertTrue(validSymbolCase.translator.tester.test(p, validSymbolCase.other));
+    }
+
+    @ParameterizedTest
+    @MethodSource("inequalityCases")
+    <T, P extends PoolEntry> void testAsSymbolInequality(ValidSymbolCase<T, P> validSymbolCase, String stateName, P p) {
+        var asSymbol = validSymbolCase.translator.extractor.apply(p);
+        assertEquals(validSymbolCase.sym, asSymbol, "asSymbol vs original");
+        assertNotEquals(validSymbolCase.other, asSymbol, "asSymbol vs inequal");
+    }
+
+    @ParameterizedTest
+    @MethodSource("inequalityCases")
+    <T, P extends PoolEntry> void testMatchesOriginalInequality(ValidSymbolCase<T, P> validSymbolCase, String stateName, P p) {
+        assertTrue(validSymbolCase.translator.tester.test(p, validSymbolCase.sym));
+    }
+
+    @ParameterizedTest
+    @MethodSource("inequalityCases")
+    <T, P extends PoolEntry> void testMatchesNonEquivalentInequality(ValidSymbolCase<T, P> validSymbolCase, String stateName, P p) {
+        assertFalse(validSymbolCase.translator.tester.test(p, validSymbolCase.other));
+    }
+
+    @ParameterizedTest
+    @MethodSource("malformedCases")
+    <T, P extends PoolEntry> void testAsSymbolMalformed(InvalidSymbolCase<T, P> baseCase, String entryState, P p) {
+        assertThrows(IllegalArgumentException.class, () -> baseCase.translator.extractor.apply(p));
+    }
+
+    @ParameterizedTest
+    @MethodSource("malformedCases")
+    <T, P extends PoolEntry> void testMatchesMalformed(InvalidSymbolCase<T, P> baseCase, String entryState, P p) {
+        assertFalse(baseCase.translator.tester.test(p, baseCase.target));
+    }
+
+    // Support for complex pool entry creation with different inflation states.
+    // Inflation states include:
+    //   - bound/unbound,
+    //   - asSymbol()
+    //   - matches() resulting in match
+    //   - matches() resulting in mismatch
+
+    // a pool entry, suitable for testing lazy behaviors and has descriptive name
+    record StatefulPoolEntry<P>(String desc, Supplier<P> factory) {
+    }
+
+    // Test pool entry <-> nominal descriptor, also the equals methods
+    record SymbolicTranslator<T, P extends PoolEntry>(String name, BiFunction<ConstantPoolBuilder, T, P> writer,
+                                                      BiPredicate<P, T> tester, Function<P, T> extractor) {
+        private P createUnboundEntry(T symbol) {
+            ConstantPoolBuilder cpb = ConstantPoolBuilder.of(); // Temp pool does not support some entries
+            return writer.apply(cpb, symbol);
+        }
+
+        @SuppressWarnings("unchecked")
+        private P toBoundEntry(P unboundEntry) {
+            ConstantPoolBuilder cpb = (ConstantPoolBuilder) unboundEntry.constantPool();
+            int index = unboundEntry.index();
+            var bytes = ClassFile.of().build(cpb.classEntry(ClassDesc.of("Test")), cpb, _ -> {
+            });
+            return (P) ClassFile.of().parse(bytes).constantPool().entryByIndex(index);
+        }
+
+        // Spawn entries to test from a nominal descriptor
+        public Stream<StatefulPoolEntry<P>> entriesSpawner(T original) {
+            return spawnBounded(() -> this.createUnboundEntry(original));
+        }
+
+        // Spawn additional bound entries to test from an initial unbound entry
+        public Stream<StatefulPoolEntry<P>> spawnBounded(Supplier<P> original) {
+            return Stream.of(new StatefulPoolEntry<>(original.get().toString(), original))
+                    .mapMulti((s, sink) -> {
+                        sink.accept(s); // unbound
+                        sink.accept(new StatefulPoolEntry<>(s.desc + "+lazy", () -> toBoundEntry(s.factory.get()))); // bound
+                    });
+        }
+
+        // Add extra stage of entry spawn to "inflate" entries via positive/negative tests
+        public StatefulPoolEntry<P> inflateByMatching(StatefulPoolEntry<P> last, T arg, String msg) {
+            return new StatefulPoolEntry<>("+matches(" + msg + ")", () -> {
+                var ret = last.factory.get();
+                tester.test(ret, arg);
+                return ret;
+            });
+        }
+
+        // Add extra stage of entry spawn to "inflate" entries via descriptor computation
+        // This should not be used if the pool entry may be invalid (i.e. throws IAE)
+        public StatefulPoolEntry<P> inflateByComputeSymbol(StatefulPoolEntry<P> last) {
+            return new StatefulPoolEntry<>(last.desc + "+asSymbol()", () -> {
+                var ret = last.factory.get();
+                extractor.apply(ret);
+                return ret;
+            });
+        }
+
+        @Override
+        public String toString() {
+            return name; // don't include lambda garbage in failure reports
+        }
+    }
+
+    // A case testing valid symbol sym; other is another symbol that may match or mismatch.
+    record ValidSymbolCase<T, P extends PoolEntry>(SymbolicTranslator<T, P> translator, T sym, T other) {
+    }
+
+    // Current supported conversions
+    static final SymbolicTranslator<String, Utf8Entry> UTF8_STRING_TRANSLATOR = new SymbolicTranslator<>("Utf8", ConstantPoolBuilder::utf8Entry, Utf8Entry::equalsString, Utf8Entry::stringValue);
+    static final SymbolicTranslator<ClassDesc, Utf8Entry> UTF8_CLASS_TRANSLATOR = new SymbolicTranslator<>("FieldTypeUtf8", ConstantPoolBuilder::utf8Entry, Utf8Entry::isFieldType, Util::fieldTypeSymbol);
+    static final SymbolicTranslator<MethodTypeDesc, Utf8Entry> UTF8_METHOD_TYPE_TRANSLATOR = new SymbolicTranslator<>("MethodTypeUtf8", ConstantPoolBuilder::utf8Entry, Utf8Entry::isMethodType, Util::methodTypeSymbol);
+    static final SymbolicTranslator<ClassDesc, ClassEntry> CLASS_ENTRY_TRANSLATOR = new SymbolicTranslator<>("ClassEntry", ConstantPoolBuilder::classEntry, ClassEntry::matches, ClassEntry::asSymbol);
+    static final SymbolicTranslator<MethodTypeDesc, MethodTypeEntry> METHOD_TYPE_ENTRY_TRANSLATOR = new SymbolicTranslator<>("MethodTypeEntry", ConstantPoolBuilder::methodTypeEntry, MethodTypeEntry::matches, MethodTypeEntry::asSymbol);
+    static final SymbolicTranslator<String, StringEntry> STRING_ENTRY_TRANSLATOR = new SymbolicTranslator<>("StringEntry", ConstantPoolBuilder::stringEntry, StringEntry::equalsString, StringEntry::stringValue);
+    static final SymbolicTranslator<PackageDesc, PackageEntry> PACKAGE_ENTRY_TRANSLATOR = new SymbolicTranslator<>("PackageEntry", ConstantPoolBuilder::packageEntry, PackageEntry::matches, PackageEntry::asSymbol);
+    static final SymbolicTranslator<ModuleDesc, ModuleEntry> MODULE_ENTRY_TRANSLATOR = new SymbolicTranslator<>("ModuleEntry", ConstantPoolBuilder::moduleEntry, ModuleEntry::matches, ModuleEntry::asSymbol);
+
+    // Create arguments of tuple (ValidSymbolCase, entryState, PoolEntry) to verify symbolic behavior of pool entries
+    // with particular inflation states
+    static <T, P extends PoolEntry> void specializeInflation(ValidSymbolCase<T, P> validSymbolCase, Consumer<Arguments> callArgs) {
+        validSymbolCase.translator.entriesSpawner(validSymbolCase.sym)
+                .<StatefulPoolEntry<P>>mapMulti((src, sink) -> {
+                    sink.accept(src);
+                    sink.accept(validSymbolCase.translator.inflateByMatching(src, validSymbolCase.sym, "same symbol"));
+                    sink.accept(validSymbolCase.translator.inflateByMatching(src, validSymbolCase.other, "another symbol"));
+                    sink.accept(validSymbolCase.translator.inflateByComputeSymbol(src));
+                })
+                .forEach(stateful -> callArgs.accept(Arguments.of(validSymbolCase, stateful.desc, stateful.factory.get())));
+    }
+
+    static Stream<Arguments> equalityCases() {
+        return Stream.of(
+                new ValidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, CD_Object, ClassDesc.ofInternalName("java/lang/Object")), // class or interface
+                new ValidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, CD_Object.arrayType(), ClassDesc.ofDescriptor("[Ljava/lang/Object;")), // array
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_int, ClassDesc.ofDescriptor("I")), // primitive
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_Object, ClassDesc.ofInternalName("java/lang/Object")), // class or interface
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_Object.arrayType(), ClassDesc.ofDescriptor("[Ljava/lang/Object;")), // array
+                new ValidSymbolCase<>(UTF8_STRING_TRANSLATOR, "Ab\u0000c", "Ab\u0000c"),
+                new ValidSymbolCase<>(UTF8_METHOD_TYPE_TRANSLATOR, MTD_void, MethodTypeDesc.ofDescriptor("()V")),
+                new ValidSymbolCase<>(UTF8_METHOD_TYPE_TRANSLATOR, MethodTypeDesc.of(CD_int, CD_Long), MethodTypeDesc.ofDescriptor("(Ljava/lang/Long;)I")),
+                new ValidSymbolCase<>(METHOD_TYPE_ENTRY_TRANSLATOR, MethodTypeDesc.of(CD_Object), MethodTypeDesc.ofDescriptor("()Ljava/lang/Object;")),
+                new ValidSymbolCase<>(STRING_ENTRY_TRANSLATOR, "Ape", new String("Ape".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)),
+                new ValidSymbolCase<>(PACKAGE_ENTRY_TRANSLATOR, PackageDesc.of("java.lang"), PackageDesc.ofInternalName("java/lang")),
+                new ValidSymbolCase<>(MODULE_ENTRY_TRANSLATOR, ModuleDesc.of("java.base"), ModuleDesc.of(new String("java.base".getBytes(StandardCharsets.US_ASCII), StandardCharsets.US_ASCII)))
+        ).mapMulti(ConstantDescSymbolsTest::specializeInflation);
+    }
+
+    static Stream<Arguments> inequalityCases() {
+        return Stream.of(
+                new ValidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, CD_Object, ClassDesc.ofInternalName("java/io/Object")), // class or interface
+                new ValidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, CD_Object.arrayType(), ClassDesc.ofDescriptor("[Ljava/lang/String;")), // array
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_int, ClassDesc.ofDescriptor("S")), // primitive
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_Object, ClassDesc.ofInternalName("java/lang/String")), // class or interface
+                new ValidSymbolCase<>(UTF8_CLASS_TRANSLATOR, CD_Object.arrayType(), ClassDesc.ofDescriptor("[Ljava/lang/System;")), // array
+                new ValidSymbolCase<>(UTF8_STRING_TRANSLATOR, "Ab\u0000c", "Abdc"),
+                new ValidSymbolCase<>(UTF8_METHOD_TYPE_TRANSLATOR, MTD_void, MethodTypeDesc.ofDescriptor("()I")),
+                new ValidSymbolCase<>(UTF8_METHOD_TYPE_TRANSLATOR, MethodTypeDesc.of(CD_int, CD_Short), MethodTypeDesc.ofDescriptor("(Ljava/lang/Long;)I")),
+                new ValidSymbolCase<>(METHOD_TYPE_ENTRY_TRANSLATOR, MethodTypeDesc.of(CD_String), MethodTypeDesc.ofDescriptor("()Ljava/lang/Object;")),
+                new ValidSymbolCase<>(STRING_ENTRY_TRANSLATOR, "Cat", new String("Ape".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8)),
+                new ValidSymbolCase<>(PACKAGE_ENTRY_TRANSLATOR, PackageDesc.of("java.lang"), PackageDesc.ofInternalName("java/util")),
+                new ValidSymbolCase<>(MODULE_ENTRY_TRANSLATOR, ModuleDesc.of("java.base"), ModuleDesc.of(new String("java.desktop".getBytes(StandardCharsets.US_ASCII), StandardCharsets.US_ASCII)))
+        ).mapMulti(ConstantDescSymbolsTest::specializeInflation);
+    }
+
+    record InvalidSymbolCase<T, P extends PoolEntry>(SymbolicTranslator<T, P> translator, Supplier<P> factory, T target) {
+    }
+
+    // Type hint function
+    private static <P extends PoolEntry> Supplier<P> badFactory(Function<ConstantPoolBuilder, P> func) {
+        return () -> func.apply(ConstantPoolBuilder.of());
+    }
+
+    static <T, P extends PoolEntry> void specializeInflation(InvalidSymbolCase<T, P> invalidSymbolCase, Consumer<Arguments> callArgs) {
+        invalidSymbolCase.translator.spawnBounded(invalidSymbolCase.factory)
+                .<StatefulPoolEntry<P>>mapMulti((src, sink) -> {
+                    sink.accept(src);
+                    sink.accept(invalidSymbolCase.translator.inflateByMatching(src, invalidSymbolCase.target, "target"));
+                })
+                .forEach(stateful -> callArgs.accept(Arguments.of(invalidSymbolCase, stateful.desc, stateful.factory.get())));
+    }
+
+    static Stream<Arguments> malformedCases() {
+        return Stream.of(
+                new InvalidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, badFactory(b -> b.classEntry(b.utf8Entry("java.lang.Object"))), CD_Object), // class or interface
+                new InvalidSymbolCase<>(CLASS_ENTRY_TRANSLATOR, badFactory(b -> b.classEntry(b.utf8Entry("[Ljava/lang/String"))), CD_String.arrayType()), // array
+                new InvalidSymbolCase<>(UTF8_CLASS_TRANSLATOR, badFactory(b -> b.utf8Entry("int")), ClassDesc.ofDescriptor("I")), // primitive
+                new InvalidSymbolCase<>(UTF8_CLASS_TRANSLATOR, badFactory(b -> b.utf8Entry("Ljava/lang/String")), CD_String), // class or interface
+                new InvalidSymbolCase<>(UTF8_CLASS_TRANSLATOR, badFactory(b -> b.utf8Entry("[Ljava/lang/String")), CD_String.arrayType()), // array
+                new InvalidSymbolCase<>(METHOD_TYPE_ENTRY_TRANSLATOR, badFactory(b -> b.methodTypeEntry(b.utf8Entry("()"))), MTD_void),
+                new InvalidSymbolCase<>(METHOD_TYPE_ENTRY_TRANSLATOR, badFactory(b -> b.methodTypeEntry(b.utf8Entry("(V)"))), MTD_void),
+                new InvalidSymbolCase<>(UTF8_METHOD_TYPE_TRANSLATOR, badFactory(b -> b.utf8Entry("()Ljava/lang/String")), MethodTypeDesc.of(CD_String)),
+                new InvalidSymbolCase<>(PACKAGE_ENTRY_TRANSLATOR, badFactory(b -> b.packageEntry(b.utf8Entry("java.lang"))), PackageDesc.of("java.lang")),
+                new InvalidSymbolCase<>(MODULE_ENTRY_TRANSLATOR, badFactory(b -> b.moduleEntry(b.utf8Entry("java@base"))), ModuleDesc.of("java.base"))
+        ).mapMulti(ConstantDescSymbolsTest::specializeInflation);
+    }
 }

From 44374a572096fc98b390ab2cb9063d832e110020 Mon Sep 17 00:00:00 2001
From: Gustavo Simon <gustavo.andre.simon@hotmail.com>
Date: Tue, 29 Apr 2025 04:17:00 +0000
Subject: [PATCH 178/901] 8350542: Optional.orElseThrow(Supplier) does not
 specify behavior when supplier returns null

Reviewed-by: liach, clanger
---
 src/java.base/share/classes/java/util/Optional.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java
index 21128fa980d..e19dde6383e 100644
--- a/src/java.base/share/classes/java/util/Optional.java
+++ b/src/java.base/share/classes/java/util/Optional.java
@@ -394,7 +394,7 @@ public T orElseThrow() {
      * @return the value, if present
      * @throws X if no value is present
      * @throws NullPointerException if no value is present and the exception
-     *          supplying function is {@code null}
+     *         supplying function is {@code null} or produces a {@code null} result
      */
     public <X extends Throwable> T orElseThrow(Supplier<? extends X> exceptionSupplier) throws X {
         if (value != null) {

From 841989b2701b4ee0ec9be03d8007e6788edf56b4 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 29 Apr 2025 06:57:33 +0000
Subject: [PATCH 179/901] 8318730: MonitorVmStartTerminate.java still times out
 after JDK-8209595

Reviewed-by: lmesnik, sspitsyn, cjplummer
---
 .../MonitoredVm/MonitorVmStartTerminate.java  | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
index 1a59b0df118..b4291645007 100644
--- a/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
+++ b/test/jdk/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, 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
@@ -74,6 +74,7 @@
 public final class MonitorVmStartTerminate {
 
     private static final int PROCESS_COUNT = 10;
+    private static final int ARGS_ATTEMPTS = 10;
 
     public static void main(String... args) throws Exception {
 
@@ -175,8 +176,6 @@ private void releaseTerminated(Integer id) {
             }
         }
 
-        private static final int ARGS_ATTEMPTS = 3;
-
         private boolean hasMainArgs(Integer id, String args) {
             VmIdentifier vmid = null;
             try {
@@ -204,7 +203,10 @@ private boolean hasMainArgs(Integer id, String args) {
                 } catch (MonitorException e) {
                     // Process probably not running or not ours, e.g.
                     // sun.jvmstat.monitor.MonitorException: Could not attach to PID
-                    System.out.println("hasMainArgs(" + id + "): " + e);
+                    // Only log if something else, to avoid filling log:
+                    if (!e.getMessage().contains("Could not attach")) {
+                        System.out.println("hasMainArgs(" + id + "): " + e);
+                    }
                 }
             }
             return false;
@@ -249,23 +251,15 @@ private static void createFile(Path path) throws IOException {
         }
 
         private static void waitForRemoval(Path path) {
-            String timeoutFactorText = System.getProperty("test.timeout.factor", "1.0");
-            double timeoutFactor = Double.parseDouble(timeoutFactorText);
-            long timeoutNanos = 1000_000_000L*(long)(1000*timeoutFactor);
             long start = System.nanoTime();
+            System.out.println("Waiting for " + path + " to be removed");
             while (true) {
                 long now = System.nanoTime();
                 long waited = now - start;
-                System.out.println("Waiting for " + path + " to be removed, " + waited + " ns");
                 if (!Files.exists(path)) {
+                    System.out.println("waitForRemoval: " + path + " has been removed in " + waited + " ns");
                     return;
                 }
-                if (waited > timeoutNanos) {
-                    System.out.println("Start: " + start);
-                    System.out.println("Now: " + now);
-                    System.out.println("Process timed out after " + waited + " ns. Abort.");
-                    System.exit(1);
-                }
                 takeNap();
             }
         }

From 108078a6813f49fa82b6f97a8a6665d200d95e28 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Tue, 29 Apr 2025 07:43:37 +0000
Subject: [PATCH 180/901] 8338194: ubsan: mulnode.cpp:862:59: runtime error:
 shift exponent 64 is too large for 64-bit type 'long unsigned int'

Reviewed-by: dlong, dfenacci
---
 src/hotspot/share/opto/mulnode.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index 1d046583ee0..72562a657ea 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -924,13 +924,15 @@ Node *AndLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     if( t12 && t12->is_con() ) { // Shift is by a constant
       int shift = t12->get_con();
       shift &= BitsPerJavaLong - 1;  // semantics of Java shifts
-      const julong sign_bits_mask = ~(((julong)CONST64(1) << (julong)(BitsPerJavaLong - shift)) -1);
-      // If the AND'ing of the 2 masks has no bits, then only original shifted
-      // bits survive.  NO sign-extension bits survive the maskings.
-      if( (sign_bits_mask & mask) == 0 ) {
-        // Use zero-fill shift instead
-        Node *zshift = phase->transform(new URShiftLNode(in1->in(1), in1->in(2)));
-        return new AndLNode(zshift, in(2));
+      if (shift != 0) {
+        const julong sign_bits_mask = ~(((julong)CONST64(1) << (julong)(BitsPerJavaLong - shift)) -1);
+        // If the AND'ing of the 2 masks has no bits, then only original shifted
+        // bits survive.  NO sign-extension bits survive the maskings.
+        if( (sign_bits_mask & mask) == 0 ) {
+          // Use zero-fill shift instead
+          Node *zshift = phase->transform(new URShiftLNode(in1->in(1), in1->in(2)));
+          return new AndLNode(zshift, in(2));
+        }
       }
     }
   }

From 31e70e41d56777ba6f4bba4cc3266130646b3202 Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Tue, 29 Apr 2025 08:31:20 +0000
Subject: [PATCH 181/901] 8355697: Create windows devkit on wsl and msys2

Reviewed-by: ihse, erikj
---
 make/devkit/createWindowsDevkit.sh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/make/devkit/createWindowsDevkit.sh b/make/devkit/createWindowsDevkit.sh
index 0646cb68ef4..757fb157ad4 100644
--- a/make/devkit/createWindowsDevkit.sh
+++ b/make/devkit/createWindowsDevkit.sh
@@ -56,16 +56,22 @@ BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
 
 UNAME_SYSTEM=`uname -s`
 UNAME_RELEASE=`uname -r`
+UNAME_OS=`uname -o`
 
 # Detect cygwin or WSL
 IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
 IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
+IS_MSYS=`echo $UNAME_OS | grep -i Msys`
+MSYS2_ARG_CONV_EXCL="*"          # make "cmd.exe /c" work for msys2
+CMD_EXE="cmd.exe /c"
 if test "x$IS_CYGWIN" != "x"; then
     BUILD_ENV="cygwin"
+elif test "x$IS_MSYS" != "x"; then
+    BUILD_ENV="cygwin"
 elif test "x$IS_WSL" != "x"; then
     BUILD_ENV="wsl"
 else
-    echo "Unknown environment; only Cygwin and WSL are supported."
+    echo "Unknown environment; only Cygwin/MSYS2/WSL are supported."
     exit 1
 fi
 
@@ -76,7 +82,7 @@ elif test "x$BUILD_ENV" = "xwsl"; then
 fi
 
 # Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
+PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(${CMD_EXE} set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
 PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
 
 case $VS_VERSION in
@@ -99,13 +105,15 @@ esac
 
 
 # Find Visual Studio installation dir
-VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
+VSNNNCOMNTOOLS=`${CMD_EXE} echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
+VSNNNCOMNTOOLS="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS")"
 if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
+    VS_INSTALL_DIR="$VSNNNCOMNTOOLS/../.."
 else
     VS_INSTALL_DIR="${MSVC_PROGRAMFILES_DIR}/Microsoft Visual Studio/$VS_VERSION"
     VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
 fi
+echo "VSNNNCOMNTOOLS: $VSNNNCOMNTOOLS"
 echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
 
 # Extract semantic version
@@ -180,7 +188,11 @@ cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
 ################################################################################
 # Copy SDK files
 
-SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
+SDK_INSTALL_DIR=`${CMD_EXE} echo %WindowsSdkDir% | tr -d '\r'`
+SDK_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$SDK_INSTALL_DIR")"
+if [ ! -d "$SDK_INSTALL_DIR" ]; then
+    SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
+fi
 echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
 
 SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"

From 6a0c24f9db0b15a00ecadca6e853ed5aa3775b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel@haessig.org>
Date: Tue, 29 Apr 2025 09:22:18 +0000
Subject: [PATCH 182/901] 8355472: Clean up x86 nativeInst after 32-bit x86
 removal

Reviewed-by: shade, rcastanedalo, jwaters
---
 src/hotspot/cpu/x86/nativeInst_x86.cpp | 60 +-------------------------
 src/hotspot/cpu/x86/nativeInst_x86.hpp | 23 ----------
 2 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/src/hotspot/cpu/x86/nativeInst_x86.cpp b/src/hotspot/cpu/x86/nativeInst_x86.cpp
index 6e0e078b36e..c3345be2172 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.cpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.cpp
@@ -67,9 +67,7 @@ void NativeCall::print() {
 // Inserts a native call instruction at a given pc
 void NativeCall::insert(address code_pos, address entry) {
   intptr_t disp = (intptr_t)entry - ((intptr_t)code_pos + 1 + 4);
-#ifdef AMD64
   guarantee(disp == (intptr_t)(jint)disp, "must be 32-bit offset");
-#endif // AMD64
   *code_pos = instruction_code;
   *((int32_t *)(code_pos+1)) = (int32_t) disp;
   ICache::invalidate_range(code_pos, instruction_size);
@@ -157,7 +155,6 @@ void NativeCall::set_destination_mt_safe(address dest) {
 
 
 void NativeMovConstReg::verify() {
-#ifdef AMD64
   // make sure code pattern is actually a mov reg64, imm64 instruction
   bool valid_rex_prefix  = ubyte_at(0) == Assembler::REX_W || ubyte_at(0) == Assembler::REX_WB;
   bool valid_rex2_prefix = ubyte_at(0) == Assembler::REX2  &&
@@ -169,12 +166,6 @@ void NativeMovConstReg::verify() {
     print();
     fatal("not a REX.W[B] mov reg64, imm64");
   }
-#else
-  // make sure code pattern is actually a mov reg, imm32 instruction
-  u_char test_byte = *(u_char*)instruction_address();
-  u_char test_byte_2 = test_byte & ( 0xff ^ register_mask);
-  if (test_byte_2 != instruction_code) fatal("not a mov reg, imm32");
-#endif // AMD64
 }
 
 
@@ -192,12 +183,10 @@ int NativeMovRegMem::instruction_start() const {
   // See comment in Assembler::locate_operand() about VEX prefixes.
   if (instr_0 == instruction_VEX_prefix_2bytes) {
     assert((UseAVX > 0), "shouldn't have VEX prefix");
-    NOT_LP64(assert((0xC0 & ubyte_at(1)) == 0xC0, "shouldn't have LDS and LES instructions"));
     return 2;
   }
   if (instr_0 == instruction_VEX_prefix_3bytes) {
     assert((UseAVX > 0), "shouldn't have VEX prefix");
-    NOT_LP64(assert((0xC0 & ubyte_at(1)) == 0xC0, "shouldn't have LDS and LES instructions"));
     return 3;
   }
   if (instr_0 == instruction_EVEX_prefix_4bytes) {
@@ -313,8 +302,7 @@ void NativeMovRegMem::print() {
 void NativeLoadAddress::verify() {
   // make sure code pattern is actually a mov [reg+offset], reg instruction
   u_char test_byte = *(u_char*)instruction_address();
-  if ( ! ((test_byte == lea_instruction_code)
-          LP64_ONLY(|| (test_byte == mov64_instruction_code) ))) {
+  if ((test_byte != lea_instruction_code) && (test_byte != mov64_instruction_code)) {
     fatal ("not a lea reg, [reg+offs] instruction");
   }
 }
@@ -340,9 +328,7 @@ void NativeJump::verify() {
 
 void NativeJump::insert(address code_pos, address entry) {
   intptr_t disp = (intptr_t)entry - ((intptr_t)code_pos + 1 + 4);
-#ifdef AMD64
   guarantee(disp == (intptr_t)(int32_t)disp, "must be 32-bit offset");
-#endif // AMD64
 
   *code_pos = instruction_code;
   *((int32_t*)(code_pos + 1)) = (int32_t)disp;
@@ -355,11 +341,7 @@ void NativeJump::check_verified_entry_alignment(address entry, address verified_
   // in use. The patching in that instance must happen only when certain
   // alignment restrictions are true. These guarantees check those
   // conditions.
-#ifdef AMD64
   const int linesize = 64;
-#else
-  const int linesize = 32;
-#endif // AMD64
 
   // Must be wordSize aligned
   guarantee(((uintptr_t) verified_entry & (wordSize -1)) == 0,
@@ -386,7 +368,6 @@ void NativeJump::check_verified_entry_alignment(address entry, address verified_
 //
 void NativeJump::patch_verified_entry(address entry, address verified_entry, address dest) {
   // complete jump instruction (to be inserted) is in code_buffer;
-#ifdef _LP64
   union {
     jlong cb_long;
     unsigned char code_buffer[8];
@@ -402,43 +383,6 @@ void NativeJump::patch_verified_entry(address entry, address verified_entry, add
 
   Atomic::store((jlong *) verified_entry, u.cb_long);
   ICache::invalidate_range(verified_entry, 8);
-
-#else
-  unsigned char code_buffer[5];
-  code_buffer[0] = instruction_code;
-  intptr_t disp = (intptr_t)dest - ((intptr_t)verified_entry + 1 + 4);
-  *(int32_t*)(code_buffer + 1) = (int32_t)disp;
-
-  check_verified_entry_alignment(entry, verified_entry);
-
-  // Can't call nativeJump_at() because it's asserts jump exists
-  NativeJump* n_jump = (NativeJump*) verified_entry;
-
-  //First patch dummy jmp in place
-
-  unsigned char patch[4];
-  assert(sizeof(patch)==sizeof(int32_t), "sanity check");
-  patch[0] = 0xEB;       // jmp rel8
-  patch[1] = 0xFE;       // jmp to self
-  patch[2] = 0xEB;
-  patch[3] = 0xFE;
-
-  // First patch dummy jmp in place
-  *(int32_t*)verified_entry = *(int32_t *)patch;
-
-  n_jump->wrote(0);
-
-  // Patch 5th byte (from jump instruction)
-  verified_entry[4] = code_buffer[4];
-
-  n_jump->wrote(4);
-
-  // Patch bytes 0-3 (from jump instruction)
-  *(int32_t*)verified_entry = *(int32_t *)code_buffer;
-  // Invalidate.  Opteron requires a flush after every write.
-  n_jump->wrote(0);
-#endif // _LP64
-
 }
 
 void NativeIllegalInstruction::insert(address code_pos) {
@@ -455,9 +399,7 @@ void NativeGeneralJump::verify() {
 
 void NativeGeneralJump::insert_unconditional(address code_pos, address entry) {
   intptr_t disp = (intptr_t)entry - ((intptr_t)code_pos + 1 + 4);
-#ifdef AMD64
   guarantee(disp == (intptr_t)(int32_t)disp, "must be 32-bit offset");
-#endif // AMD64
 
   *code_pos = unconditional_long_jump;
   *((int32_t *)(code_pos+1)) = (int32_t) disp;
diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp
index f6abadbeb5c..b2448cb99fd 100644
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp
@@ -126,10 +126,8 @@ class NativeCall: public NativeInstruction {
   address return_address() const            { return addr_at(return_address_offset); }
   address destination() const;
   void  set_destination(address dest)       {
-#ifdef AMD64
     intptr_t disp = dest - return_address();
     guarantee(disp == (intptr_t)(jint)disp, "must be 32-bit offset");
-#endif // AMD64
     set_int_at(displacement_offset, (int)(dest - return_address()));
   }
   // Returns whether the 4-byte displacement operand is 4-byte aligned.
@@ -211,15 +209,9 @@ class NativeCallReg: public NativeInstruction {
 // Instruction format for implied addressing mode immediate operand move to register instruction:
 //  [REX/REX2] [OPCODE] [IMM32]
 class NativeMovConstReg: public NativeInstruction {
-#ifdef AMD64
   static const bool has_rex = true;
   static const int rex_size = 1;
   static const int rex2_size = 2;
-#else
-  static const bool has_rex = false;
-  static const int rex_size = 0;
-  static const int rex2_size = 0;
-#endif // AMD64
  public:
   enum Intel_specific_constants {
     instruction_code             = 0xB8,
@@ -390,13 +382,8 @@ inline NativeMovRegMem* nativeMovRegMem_at (address address) {
 //        leal reg, [reg + offset]
 
 class NativeLoadAddress: public NativeMovRegMem {
-#ifdef AMD64
   static const bool has_rex = true;
   static const int rex_size = 1;
-#else
-  static const bool has_rex = false;
-  static const int rex_size = 0;
-#endif // AMD64
  public:
   enum Intel_specific_constants {
     instruction_prefix_wide             = Assembler::REX_W,
@@ -447,9 +434,7 @@ class NativeJump: public NativeInstruction {
     if (dest == (address) -1) {
       val = -5; // jump to self
     }
-#ifdef AMD64
     assert((labs(val)  & 0xFFFFFFFF00000000) == 0 || dest == (address)-1, "must be 32bit offset or -1");
-#endif // AMD64
     set_int_at(data_offset, (jint)val);
   }
 
@@ -572,19 +557,14 @@ inline bool NativeInstruction::is_jump_reg()     {
 inline bool NativeInstruction::is_cond_jump()    { return (int_at(0) & 0xF0FF) == 0x800F /* long jump */ ||
                                                           (ubyte_at(0) & 0xF0) == 0x70;  /* short jump */ }
 inline bool NativeInstruction::is_safepoint_poll() {
-#ifdef AMD64
   const bool has_rex_prefix = ubyte_at(0) == NativeTstRegMem::instruction_rex_b_prefix;
   const int test_offset = has_rex2_prefix() ? 2 : (has_rex_prefix ? 1 : 0);
-#else
-  const int test_offset = 0;
-#endif
   const bool is_test_opcode = ubyte_at(test_offset) == NativeTstRegMem::instruction_code_memXregl;
   const bool is_rax_target = (ubyte_at(test_offset + 1) & NativeTstRegMem::modrm_mask) == NativeTstRegMem::modrm_reg;
   return is_test_opcode && is_rax_target;
 }
 
 inline bool NativeInstruction::is_mov_literal64() {
-#ifdef AMD64
   bool valid_rex_prefix  = ubyte_at(0) == Assembler::REX_W || ubyte_at(0) == Assembler::REX_WB;
   bool valid_rex2_prefix = ubyte_at(0) == Assembler::REX2  &&
        (ubyte_at(1) == Assembler::REX2BIT_W  ||
@@ -593,9 +573,6 @@ inline bool NativeInstruction::is_mov_literal64() {
 
   int opcode = has_rex2_prefix() ? ubyte_at(2) : ubyte_at(1);
   return ((valid_rex_prefix || valid_rex2_prefix) &&  (opcode & (0xff ^ NativeMovConstReg::register_mask)) == 0xB8);
-#else
-  return false;
-#endif // AMD64
 }
 
 class NativePostCallNop: public NativeInstruction {

From edf8ce8db10521037045115f4cb9569a1477a40a Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Tue, 29 Apr 2025 11:57:37 +0000
Subject: [PATCH 183/901] 8355739: AssertionError: Invalid CPU feature name
 after 8353786

Reviewed-by: vlivanov, shade, mdoerr
---
 .../share/classes/jdk/incubator/vector/CPUFeatures.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
index 1d44860ab86..c0d8ef03ada 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
@@ -42,6 +42,9 @@
     private static Set<String> getCPUFeatures() {
         String featuresString = VectorSupport.getCPUFeatures();
         debug(featuresString);
+
+        if (featuresString.equals("")) return Set.of();
+
         String[] features = featuresString.toLowerCase(Locale.ROOT)
                                           .split(",? "); // " " or ", " are used as a delimiter by JVM
         assert validateFeatures(features);

From 9f42ff8960c740fa6ae5be21677b874463c7f500 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 29 Apr 2025 13:26:51 +0000
Subject: [PATCH 184/901] 8355594: Warnings occur when building with clang and
 enabling ubsan

Reviewed-by: erikj, jkern, ihse
---
 make/autoconf/jdk-options.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index ca0b0ee251e..f8a512f503d 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -520,7 +520,10 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
   # 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 -Wno-array-bounds -Wno-stringop-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
+  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-array-bounds -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
+  if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
+    UBSAN_CFLAGS="$UBSAN_CFLAGS -Wno-format-overflow -Wno-stringop-overflow -Wno-stringop-truncation"
+  fi
   UBSAN_LDFLAGS="$UBSAN_CHECKS"
   # On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
   # full qualified llvm_symbolizer path in the __ubsan_default_options() function in

From 2ed7ad4b5c7d2344ae6571c186f8a2903770aa57 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Tue, 29 Apr 2025 13:41:04 +0000
Subject: [PATCH 185/901] 8355667: RISC-V: Add backend implementation for
 unsigned vector Min / Max operations

Reviewed-by: mli, gcao
---
 src/hotspot/cpu/riscv/riscv_v.ad              | 60 +++++++++++++++++++
 .../VectorCommutativeOperSharingTest.java     | 40 ++++++-------
 .../VectorUnsignedMinMaxOperationsTest.java   | 30 +++++-----
 3 files changed, 95 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 81c14460b05..63d4607f1c1 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -1409,6 +1409,66 @@ instruct vmin_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector unsigned integer max/min
+
+instruct vmaxu(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (UMaxV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmaxu $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vmaxu_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vminu(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (UMinV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vminu $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vminu_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector unsigned integer max/min - predicated
+
+instruct vmaxu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
+  match(Set dst_src1 (UMaxV (Binary dst_src1 src2) v0));
+  ins_cost(VEC_COST);
+  format %{ "vmaxu_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vmaxu_vv(as_VectorRegister($dst_src1$$reg), as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vminu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
+  match(Set dst_src1 (UMinV (Binary dst_src1 src2) v0));
+  ins_cost(VEC_COST);
+  format %{ "vminu_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vminu_vv(as_VectorRegister($dst_src1$$reg), as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector float-point max/min
 
 instruct vmax_fp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
index 73718193109..c3e0cbc3a9a 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
@@ -76,7 +76,7 @@ public static void main(String[] args) {
                   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"})
+        applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing1(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -115,7 +115,7 @@ public void checkVectorIRSharing1() {
     @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"})
+        applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing2(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -172,7 +172,7 @@ public void checkVectorIRSharing3() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing4(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -197,7 +197,7 @@ public void checkVectorIRSharing4() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing5(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -222,7 +222,7 @@ public void checkVectorIRSharing5() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing6(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -247,7 +247,7 @@ public void checkVectorIRSharing6() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing7(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -272,7 +272,7 @@ public void checkVectorIRSharing7() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing8(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -297,7 +297,7 @@ public void checkVectorIRSharing8() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing9(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -322,7 +322,7 @@ public void checkVectorIRSharing9() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing10(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -347,7 +347,7 @@ public void checkVectorIRSharing10() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing11(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -372,7 +372,7 @@ public void checkVectorIRSharing11() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing12(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -397,7 +397,7 @@ public void checkVectorIRSharing12() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing13(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -422,7 +422,7 @@ public void checkVectorIRSharing13() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing14(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -447,7 +447,7 @@ public void checkVectorIRSharing14() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing15(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -472,7 +472,7 @@ public void checkVectorIRSharing15() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing16(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -497,7 +497,7 @@ public void checkVectorIRSharing16() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing17(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -522,7 +522,7 @@ public void checkVectorIRSharing17() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing18(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -547,7 +547,7 @@ public void checkVectorIRSharing18() {
     }
 
     @Test
-    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx512vl", "true", "sve", "true"})
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx512vl", "true", "sve", "true", "rvv", "true"})
     public void testVectorIRSharing19(int index) {
         VectorMask<Integer> VMASK = VectorMask.fromLong(I_SPECIES, ((1 << 4) - 1));
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
@@ -575,7 +575,7 @@ public void checkVectorIRSharing19() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing20(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
@@ -600,7 +600,7 @@ public void checkVectorIRSharing20() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, IRNode.VECTOR_SIZE_ANY, " 1 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     public void testVectorIRSharing21(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java
index d94d65c5143..464e887cbac 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorUnsignedMinMaxOperationsTest.java
@@ -105,7 +105,7 @@ public VectorUnsignedMinMaxOperationsTest() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umax_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -128,7 +128,7 @@ public void umax_byte_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umax_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -151,7 +151,7 @@ public void umax_short_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umax_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -174,7 +174,7 @@ public void umax_int_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umax_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -197,7 +197,7 @@ public void umax_long_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -220,7 +220,7 @@ public void umin_byte_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -243,7 +243,7 @@ public void umin_short_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -266,7 +266,7 @@ public void umin_int_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -289,7 +289,7 @@ public void umin_long_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, " 0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, " 0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_ir_transform1() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -312,7 +312,7 @@ public void umin_ir_transform1_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VI, " 0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VI, " 0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umax_ir_transform1() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -335,7 +335,7 @@ public void umax_ir_transform1_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_max_ir_transform1() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -362,7 +362,7 @@ public void umin_max_ir_transform1_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_max_ir_transform2() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -389,7 +389,7 @@ public void umin_max_ir_transform2_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMAX_VI, " 0 ", IRNode.UMIN_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_max_ir_transform3() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -416,7 +416,7 @@ public void umin_max_ir_transform3_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_max_ir_transform4() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -443,7 +443,7 @@ public void umin_max_ir_transform4_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.UMIN_VI, " 0 ", IRNode.UMAX_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void umin_max_ir_transform5() {
         for (int i = 0; i < COUNT; i += ispec.length()) {

From b5156bb16aade1ff40f20ed6ce6faafe7becb671 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Tue, 29 Apr 2025 14:32:38 +0000
Subject: [PATCH 186/901] 8355065: ConcurrentModificationException in
 RichDiagnosticFormatter

Reviewed-by: vromero
---
 .../javac/util/RichDiagnosticFormatter.java   |  78 +++++++---
 .../RichFormatterWithTypeAnnotationsTest.java | 133 ++++++++++++++++++
 2 files changed, 188 insertions(+), 23 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
index fa81ce7ba75..512fa0e07e3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
@@ -83,8 +83,37 @@ public class RichDiagnosticFormatter extends
     /* type/symbol printer used by this formatter */
     private RichPrinter printer;
 
+    private static class WhereClauses {
+        private final Map<WhereClauseKind, Map<Type, JCDiagnostic>> whereClauses;
+
+        WhereClauses() {
+            Map<WhereClauseKind, Map<Type, JCDiagnostic>> whereClauses = new EnumMap<>(WhereClauseKind.class);
+            for (WhereClauseKind kind : WhereClauseKind.values()) {
+                whereClauses.put(kind, new LinkedHashMap<>());
+            }
+            this.whereClauses = whereClauses;
+        }
+
+        public Map<Type, JCDiagnostic> get(WhereClauseKind kind) {
+            return whereClauses.get(kind);
+        }
+    }
+
     /* map for keeping track of a where clause associated to a given type */
-    Map<WhereClauseKind, Map<Type, JCDiagnostic>> whereClauses;
+    WhereClauses whereClauses;
+
+    private void enter() {
+        if (nameSimplifier != null || whereClauses != null) {
+            throw new IllegalStateException();
+        }
+        nameSimplifier = new ClassNameSimplifier();
+        whereClauses = new WhereClauses();
+    }
+
+    private void exit() {
+        nameSimplifier = null;
+        whereClauses = null;
+    }
 
     /** Get the DiagnosticFormatter instance for this context. */
     public static RichDiagnosticFormatter instance(Context context) {
@@ -102,39 +131,42 @@ protected RichDiagnosticFormatter(Context context) {
         this.diags = JCDiagnostic.Factory.instance(context);
         this.types = Types.instance(context);
         this.messages = JavacMessages.instance(context);
-        whereClauses = new EnumMap<>(WhereClauseKind.class);
         configuration = new RichConfiguration(Options.instance(context), formatter);
-        for (WhereClauseKind kind : WhereClauseKind.values())
-            whereClauses.put(kind, new LinkedHashMap<Type, JCDiagnostic>());
     }
 
     @Override
     public String format(JCDiagnostic diag, Locale l) {
-        StringBuilder sb = new StringBuilder();
-        nameSimplifier = new ClassNameSimplifier();
-        for (WhereClauseKind kind : WhereClauseKind.values())
-            whereClauses.get(kind).clear();
-        preprocessDiagnostic(diag);
-        sb.append(formatter.format(diag, l));
-        if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
-            List<JCDiagnostic> clauses = getWhereClauses();
-            String indent = formatter.isRaw() ? "" :
-                formatter.indentString(DetailsInc);
-            for (JCDiagnostic d : clauses) {
-                String whereClause = formatter.format(d, l);
-                if (whereClause.length() > 0) {
-                    sb.append('\n' + indent + whereClause);
+        enter();
+        try {
+            StringBuilder sb = new StringBuilder();
+            preprocessDiagnostic(diag);
+            sb.append(formatter.format(diag, l));
+            if (getConfiguration().isEnabled(RichFormatterFeature.WHERE_CLAUSES)) {
+                List<JCDiagnostic> clauses = getWhereClauses();
+                String indent = formatter.isRaw() ? "" :
+                        formatter.indentString(DetailsInc);
+                for (JCDiagnostic d : clauses) {
+                    String whereClause = formatter.format(d, l);
+                    if (whereClause.length() > 0) {
+                        sb.append('\n' + indent + whereClause);
+                    }
                 }
             }
+            return sb.toString();
+        } finally {
+            exit();
         }
-        return sb.toString();
     }
 
     @Override
     public String formatMessage(JCDiagnostic diag, Locale l) {
-        nameSimplifier = new ClassNameSimplifier();
-        preprocessDiagnostic(diag);
-        return super.formatMessage(diag, l);
+        enter();
+        try {
+            preprocessDiagnostic(diag);
+            return super.formatMessage(diag, l);
+        } finally {
+            exit();
+        }
     }
 
     /**
@@ -556,7 +588,7 @@ public Void visitClassType(ClassType t, Void ignored) {
 
         @Override
         public Void visitTypeVar(TypeVar t, Void ignored) {
-            t = (TypeVar)t.stripMetadataIfNeeded();
+            t = (TypeVar)t.stripMetadata();
             if (indexOf(t, WhereClauseKind.TYPEVAR) == -1) {
                 //access the bound type and skip error types
                 Type bound = t.getUpperBound();
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsTest.java
new file mode 100644
index 00000000000..4482bd46854
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2025, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8355065
+ * @summary ConcurrentModificationException in RichDiagnosticFormatter
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.main jdk.compiler/com.sun.tools.javac.api
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main RichFormatterWithTypeAnnotationsTest
+ */
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+public class RichFormatterWithTypeAnnotationsTest extends TestRunner {
+    ToolBox tb;
+
+    public RichFormatterWithTypeAnnotationsTest() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String[] args) throws Exception {
+        new RichFormatterWithTypeAnnotationsTest()
+                .runTests(m -> new Object[] {Paths.get(m.getName())});
+    }
+
+    @Test
+    public void test(Path base) throws Exception {
+        Path libClasses = base.resolve("libclasses");
+        Files.createDirectories(libClasses);
+        new JavacTask(tb)
+                .outdir(libClasses)
+                .sources(
+                        """
+                        package lib;
+                        enum Bar {
+                          BAZ
+                        }
+                        """,
+                        """
+                        package lib;
+                        import java.lang.annotation.ElementType;
+                        import java.lang.annotation.Retention;
+                        import java.lang.annotation.RetentionPolicy;
+                        import java.lang.annotation.Target;
+
+                        @Retention(RetentionPolicy.RUNTIME)
+                        @interface Foo {
+                          Bar value();
+                        }
+                        """,
+                        """
+                        package lib;
+                        import java.lang.annotation.ElementType;
+                        import java.lang.annotation.Retention;
+                        import java.lang.annotation.RetentionPolicy;
+                        import java.lang.annotation.Target;
+
+                        @Retention(RetentionPolicy.RUNTIME)
+                        @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+                        @Foo(Bar.BAZ)
+                        @interface A {}
+                        """,
+                        """
+                        package lib;
+                        public interface M<K, V> {
+                          @A
+                          V f(K k, V v);
+                        }
+                        """)
+                .options()
+                .run()
+                .writeAll();
+        Files.delete(libClasses.resolve("lib").resolve("Bar.class"));
+        String code =
+                """
+                import lib.M;
+                class T {
+                  protected M m;
+
+                  public void f() {
+                    m.f(null, 0);
+                  }
+                }
+                """;
+        List<String> output =
+                new JavacTask(tb)
+                        .classpath(libClasses)
+                        .sources(code)
+                        .options("-Xlint:all", "-Werror", "-XDrawDiagnostics")
+                        .run(Task.Expect.FAIL)
+                        .writeAll()
+                        .getOutputLines(Task.OutputKind.DIRECT);
+        List<String> expected =
+                Arrays.asList(
+                        "T.java:3:13: compiler.warn.raw.class.use: lib.M, lib.M<K,V>",
+                        "T.java:6:8: compiler.warn.unchecked.call.mbr.of.raw.type: f(K,V), lib.M",
+                        "- compiler.err.warnings.and.werror",
+                        "1 error",
+                        "2 warnings");
+        tb.checkEqual(expected, output);
+    }
+}

From fa2a9d1e10679aad270f4641f43595b36fe8e04c Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Tue, 29 Apr 2025 15:37:16 +0000
Subject: [PATCH 187/901] 8354919: Move HotSpot .editorconfig into the global
 .editorconfig

Reviewed-by: erikj, ihse
---
 .editorconfig             | 4 ++++
 src/hotspot/.editorconfig | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 src/hotspot/.editorconfig

diff --git a/.editorconfig b/.editorconfig
index 0e6c17e7674..98f07b3c5fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,7 @@ trim_trailing_whitespace = true
 
 [Makefile]
 trim_trailing_whitespace = true
+
+[src/hotspot/**.{cpp,hpp,h}]
+indent_style = space
+indent_size = 2
diff --git a/src/hotspot/.editorconfig b/src/hotspot/.editorconfig
deleted file mode 100644
index 48e63362b54..00000000000
--- a/src/hotspot/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.{cpp,hpp,c,h}]
-indent_style = space
-indent_size = 2

From 5d2d1ab5740259bc30d0184e4d691a05fdf63e19 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 29 Apr 2025 15:42:08 +0000
Subject: [PATCH 188/901] 8354996: Reduce dynamic code generation for a single
 downcall

Reviewed-by: jvernee
---
 .../build/tools/classlist/HelloClasslist.java | 13 ++++-
 .../classes/java/lang/foreign/Linker.java     |  5 +-
 .../internal/foreign/abi/AbstractLinker.java  | 41 ++++++++++++----
 .../internal/foreign/abi/CapturableState.java |  6 +++
 .../internal/foreign/abi/LinkerOptions.java   | 48 +++++++++++++++++--
 .../foreign/abi/NativeEntryPoint.java         | 24 +++++++++-
 .../jdk/internal/foreign/abi/VMStorage.java   | 14 +++++-
 7 files changed, 132 insertions(+), 19 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
index 1b930ca7527..9434889e0bb 100644
--- a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
+++ b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.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
@@ -31,6 +31,8 @@
  */
 package build.tools.classlist;
 
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -59,6 +61,7 @@ public class HelloClasslist {
 
     private static final Logger LOGGER = Logger.getLogger("Hello");
 
+    @SuppressWarnings("restricted")
     public static void main(String ... args) throws Throwable {
 
         FileSystems.getDefault();
@@ -141,6 +144,7 @@ public static void main(String ... args) throws Throwable {
         HelloClasslist.class.getMethod("staticMethod_V").invoke(null);
         var obj = HelloClasslist.class.getMethod("staticMethod_L_L", Object.class).invoke(null, instance);
         HelloClasslist.class.getField("field").get(instance);
+        MethodHandles.Lookup.ClassOption.class.getEnumConstants();
 
         // A selection of trivial and relatively common MH operations
         invoke(MethodHandles.identity(double.class), 1.0);
@@ -160,6 +164,9 @@ record B(int b) { }
             case B b -> b.b;
             default -> 17;
         };
+        // record run-time methods
+        o.equals(new B(5));
+        o.hashCode();
         LOGGER.log(Level.FINE, "Value: " + value);
 
         // The Striped64$Cell is loaded rarely only when there's a contention among
@@ -167,6 +174,10 @@ record B(int b) { }
         // an inconsistency in the classlist between builds (see JDK-8295951).
         // To avoid the problem, load the class explicitly.
         Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
+
+        // Initialize FFM linkers
+        var signature = FunctionDescriptor.ofVoid();
+        Linker.nativeLinker().downcallHandle(signature);
     }
 
     public HelloClasslist() {}
diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java
index 6e7aae9f72b..8f1cab22b86 100644
--- a/src/java.base/share/classes/java/lang/foreign/Linker.java
+++ b/src/java.base/share/classes/java/lang/foreign/Linker.java
@@ -859,10 +859,11 @@ static Option firstVariadicArg(int index) {
          * @see #captureStateLayout()
          */
         static Option captureCallState(String... capturedState) {
-            Set<CapturableState> set = Stream.of(Objects.requireNonNull(capturedState))
+            int set = Stream.of(Objects.requireNonNull(capturedState))
                     .map(Objects::requireNonNull)
                     .map(CapturableState::forName)
-                    .collect(Collectors.toSet());
+                    .mapToInt(state -> 1 << state.ordinal())
+                    .sum();
             return new LinkerOptions.CaptureCallState(set);
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
index 19b235963a3..401d3e9a9c5 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/AbstractLinker.java
@@ -71,7 +71,20 @@ public interface UpcallStubFactory {
         MemorySegment makeStub(MethodHandle target, Arena arena);
     }
 
-    private record LinkRequest(FunctionDescriptor descriptor, LinkerOptions options) {}
+    private record LinkRequest(FunctionDescriptor descriptor, LinkerOptions options) {
+        // Overrides for boot performance
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof LinkRequest other &&
+                    other.descriptor.equals(descriptor) &&
+                    other.options.equals(options);
+        }
+
+        @Override
+        public int hashCode() {
+            return descriptor.hashCode() * 1237 + options.hashCode();
+        }
+    }
     private final SoftReferenceCache<LinkRequest, MethodHandle> DOWNCALL_CACHE = new SoftReferenceCache<>();
     private final SoftReferenceCache<LinkRequest, UpcallStubFactory> UPCALL_CACHE = new SoftReferenceCache<>();
     private final Set<MemoryLayout> CANONICAL_LAYOUTS_CACHE = new HashSet<>(canonicalLayouts().values());
@@ -308,22 +321,30 @@ private static MemoryLayout stripNames(MemoryLayout ml) {
             case StructLayout sl -> MemoryLayout.structLayout(stripNames(sl.memberLayouts()));
             case UnionLayout ul -> MemoryLayout.unionLayout(stripNames(ul.memberLayouts()));
             case SequenceLayout sl -> MemoryLayout.sequenceLayout(sl.elementCount(), stripNames(sl.elementLayout()));
-            case AddressLayout al -> al.targetLayout()
-                    .map(tl -> al.withoutName().withTargetLayout(stripNames(tl))) // restricted
-                    .orElseGet(al::withoutName);
+            case AddressLayout al -> {
+                var stripped = al.withoutName();
+                var target = al.targetLayout();
+                if (target.isPresent())
+                    stripped = stripped.withTargetLayout(stripNames(target.get()));
+                yield stripped;
+            }
             default -> ml.withoutName(); // ValueLayout and PaddingLayout
         };
     }
 
     private static MemoryLayout[] stripNames(List<MemoryLayout> layouts) {
-        return layouts.stream()
-                .map(AbstractLinker::stripNames)
-                .toArray(MemoryLayout[]::new);
+        var ret = new MemoryLayout[layouts.size()];
+        for (int i = 0; i < ret.length; i++) {
+            ret[i] = stripNames(layouts.get(i));
+        }
+        return ret;
     }
 
     private static FunctionDescriptor stripNames(FunctionDescriptor function) {
-        return function.returnLayout()
-                .map(rl -> FunctionDescriptor.of(stripNames(rl), stripNames(function.argumentLayouts())))
-                .orElseGet(() -> FunctionDescriptor.ofVoid(stripNames(function.argumentLayouts())));
+        var retLayout = function.returnLayout();
+        if (retLayout.isEmpty()) {
+            return FunctionDescriptor.ofVoid(stripNames(function.argumentLayouts()));
+        }
+        return FunctionDescriptor.of(stripNames(retLayout.get()), stripNames(function.argumentLayouts()));
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
index 7fb62c56bf1..d95e713541f 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
@@ -30,6 +30,7 @@
 import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.StructLayout;
 import java.lang.foreign.ValueLayout;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -42,6 +43,11 @@ public enum CapturableState {
 
     public static final StructLayout LAYOUT = MemoryLayout.structLayout(
         supportedStates().map(CapturableState::layout).toArray(MemoryLayout[]::new));
+    public static final List<CapturableState> BY_ORDINAL = List.of(values());
+
+    static {
+        assert (BY_ORDINAL.size() < Integer.SIZE); // Update LinkerOptions.CaptureCallState
+    }
 
     private final String stateName;
     private final ValueLayout layout;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java b/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java
index 5ca410f40e2..4ada4b23417 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java
@@ -26,6 +26,7 @@
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -137,18 +138,57 @@ public void validateForDowncall(FunctionDescriptor descriptor) {
                 throw new IllegalArgumentException("Index '" + index + "' not in bounds for descriptor: " + descriptor);
             }
         }
+
+        @Override
+        public int hashCode() {
+            return index;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof FirstVariadicArg that && index == that.index;
+        }
     }
 
-    public record CaptureCallState(Set<CapturableState> saved) implements LinkerOptionImpl {
+    public record CaptureCallState(int compact) implements LinkerOptionImpl {
         @Override
         public void validateForDowncall(FunctionDescriptor descriptor) {
             // done during construction
         }
+
+        public Set<CapturableState> saved() {
+            var set = EnumSet.noneOf(CapturableState.class);
+            int mask = compact;
+            int i = 0;
+            while (mask != 0) {
+                if ((mask & 1) == 1) {
+                    set.add(CapturableState.BY_ORDINAL.get(i));
+                }
+                mask >>= 1;
+                i++;
+            }
+            return set;
+        }
+
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof CaptureCallState that && compact == that.compact;
+        }
+
+        @Override
+        public int hashCode() {
+            return compact;
+        }
     }
 
-    public record Critical(boolean allowHeapAccess) implements LinkerOptionImpl {
-        public static Critical ALLOW_HEAP = new Critical(true);
-        public static Critical DONT_ALLOW_HEAP = new Critical(false);
+    public enum Critical implements LinkerOptionImpl {
+        ALLOW_HEAP,
+        DONT_ALLOW_HEAP;
+
+        public boolean allowHeapAccess() {
+            return ordinal() == 0; // this == ALLOW_HEAP
+        }
 
         @Override
         public void validateForDowncall(FunctionDescriptor descriptor) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
index abcc6027919..3940f996e0d 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
@@ -48,7 +48,29 @@ public class NativeEntryPoint {
     private record CacheKey(MethodType methodType, ABIDescriptor abi,
                             List<VMStorage> argMoves, List<VMStorage> retMoves,
                             boolean needsReturnBuffer, int capturedStateMask,
-                            boolean needsTransition) {}
+                            boolean needsTransition) {
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof CacheKey other)) return false;
+
+            return methodType == other.methodType && abi == other.abi && capturedStateMask == other.capturedStateMask
+                    && needsTransition == other.needsTransition && needsReturnBuffer == other.needsReturnBuffer
+                    && argMoves.equals(other.argMoves) && retMoves.equals(other.retMoves);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = System.identityHashCode(methodType);
+            result = 31 * result + abi.hashCode();
+            result = 31 * result + argMoves.hashCode();
+            result = 31 * result + retMoves.hashCode();
+            result = 31 * result + Boolean.hashCode(needsReturnBuffer);
+            result = 31 * result + capturedStateMask;
+            result = 31 * result + Boolean.hashCode(needsTransition);
+            return result;
+        }
+    }
 
     private NativeEntryPoint(MethodType methodType, long downcallStubAddress) {
         this.methodType = methodType;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java b/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
index 1237650e026..0be1675ccd8 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/VMStorage.java
@@ -24,6 +24,8 @@
  */
 package jdk.internal.foreign.abi;
 
+import java.util.Objects;
+
 /**
  *
  * @param type              the type of storage. e.g. stack, or which register type (GP, FP, vector)
@@ -32,7 +34,7 @@
  * @param indexOrOffset     the index is either a register number within a type, or
  *                          a stack offset in bytes if type = stack.
  *                          (a particular platform might add a bias to this in generate code)
- * @param debugName         the debug name
+ * @param debugName         the debug name, mostly derived from type
  */
 public record VMStorage(byte type,
                         short segmentMaskOrSize,
@@ -43,4 +45,14 @@ public VMStorage(byte type, short segmentMaskOrSize, int indexOrOffset) {
         this(type, segmentMaskOrSize, indexOrOffset, "Stack@" + indexOrOffset);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, segmentMaskOrSize, indexOrOffset);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof VMStorage that &&
+                type == that.type && segmentMaskOrSize == that.segmentMaskOrSize && indexOrOffset == that.indexOrOffset;
+    }
 }

From bd7561c315e8fd80e32cb154998bd28745c98682 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 29 Apr 2025 16:43:15 +0000
Subject: [PATCH 189/901] 8355441: Remove antipattern from
 PassFailJFrame.forcePass javadoc

Reviewed-by: aivanov, honkar
---
 .../awt/regtesthelpers/PassFailJFrame.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
index f7d9cd8840d..0c3748bf832 100644
--- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
+++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
@@ -1294,14 +1294,16 @@ private static synchronized void showUI() {
 
     /**
      * Forcibly pass the test.
-     * <p>The sample usage:
-     * <pre><code>
-     *      PrinterJob pj = PrinterJob.getPrinterJob();
-     *      if (pj == null || pj.getPrintService() == null) {
-     *          System.out.println(""Printer not configured or available.");
-     *          PassFailJFrame.forcePass();
-     *      }
-     * </code></pre>
+     * <p>
+     * Use this method in semi-automatic tests when
+     * the test determines that all the conditions for passing the test are met.
+     * <p>
+     * <strong>Do not use</strong> this method in cases where a resource is unavailable or a
+     * feature isn't supported, throw {@code jtreg.SkippedException} instead.
+     *
+     * <p>A sample usage can be found in
+     * <a href="https://github.com/openjdk/jdk/blob/7283c8b/test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest.java#L84">{@code
+     * SaveFileNameOverrideTest.java}</a>
      */
     public static void forcePass() {
         latch.countDown();

From ead6757486fb58f35f6e93b691519673bca1a549 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 29 Apr 2025 18:08:28 +0000
Subject: [PATCH 190/901] 8342283: CDS cannot handle a large number of classes

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: iklam, lmesnik, ccheung
---
 .../share/classes/java/lang/ClassLoader.java  |  30 +++-
 test/hotspot/jtreg/TEST.groups                |   3 +-
 ...tsOfClasses.java => LotsOfJRTClasses.java} |   4 +-
 .../cds/appcds/LotsOfSyntheticClasses.java    | 137 ++++++++++++++++++
 4 files changed, 164 insertions(+), 10 deletions(-)
 rename test/hotspot/jtreg/runtime/cds/appcds/{LotsOfClasses.java => LotsOfJRTClasses.java} (96%)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java

diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index b890ba51651..6082bc53297 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -2565,22 +2565,38 @@ private void initializeJavaAssertionMaps() {
      */
     private boolean trySetObjectField(String name, Object obj) {
         Unsafe unsafe = Unsafe.getUnsafe();
-        Class<?> k = ClassLoader.class;
-        long offset;
-        offset = unsafe.objectFieldOffset(k, name);
+        long offset = unsafe.objectFieldOffset(ClassLoader.class, name);
         return unsafe.compareAndSetReference(this, offset, null, obj);
     }
 
+    private void reinitObjectField(String name, Object obj) {
+        Unsafe unsafe = Unsafe.getUnsafe();
+        long offset = unsafe.objectFieldOffset(ClassLoader.class, name);
+
+        // Extra safety: check the types
+        Object current = unsafe.getReference(this, offset);
+        if (current.getClass() != obj.getClass()) {
+            throw new IllegalStateException("Wrong field type");
+        }
+
+        unsafe.putReference(this, offset, obj);
+    }
+
     /**
-     * Called by the VM, during -Xshare:dump
+     * Called only by the VM, during -Xshare:dump.
+     *
+     * @implNote This is done while the JVM is running in single-threaded mode,
+     * and at the very end of Java bytecode execution. We know that no more classes
+     * will be loaded and none of the fields modified by this method will be used again.
      */
     private void resetArchivedStates() {
         if (parallelLockMap != null) {
-            parallelLockMap.clear();
+            reinitObjectField("parallelLockMap", new ConcurrentHashMap<>());
         }
-        packages.clear();
-        package2certs.clear();
+        reinitObjectField("packages", new ConcurrentHashMap<>());
+        reinitObjectField("package2certs", new ConcurrentHashMap<>());
         classes.clear();
+        classes.trimToSize();
         classLoaderValueMap = null;
     }
 }
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 3e3e9e5dd84..a990de30ad4 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -449,7 +449,8 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/LambdaWithUseImplMethodHandle.java \
  -runtime/cds/appcds/LambdaWithOldClass.java \
  -runtime/cds/appcds/LongClassListPath.java \
- -runtime/cds/appcds/LotsOfClasses.java \
+ -runtime/cds/appcds/LotsOfJRTClasses.java \
+ -runtime/cds/appcds/LotsOfSyntheticClasses.java \
  -runtime/cds/appcds/MismatchedPathTriggerMemoryRelease.java \
  -runtime/cds/appcds/NonExistClasspath.java \
  -runtime/cds/appcds/RelativePath.java \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
similarity index 96%
rename from test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java
rename to test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
index bf2a1215549..9c7a06ed8bc 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfJRTClasses.java
@@ -33,10 +33,10 @@
  *          this will produce an archive with over 30,000 classes.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @run driver/timeout=500 LotsOfClasses
+ * @run driver/timeout=500 LotsOfJRTClasses
  */
 
-public class LotsOfClasses {
+public class LotsOfJRTClasses {
 
     public static void main(String[] args) throws Exception {
         ArrayList<String> list = new ArrayList<>();
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java
new file mode 100644
index 00000000000..96d2dc0d6ee
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
+
+import jdk.test.lib.cds.CDSJarUtils;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+
+/*
+ * @test
+ * @summary Try to archive lots and lots of classes.
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @run driver/timeout=500 LotsOfSyntheticClasses
+ */
+
+public class LotsOfSyntheticClasses {
+
+    // Generate 100 top-level classes, each containing 1000 nested classes.
+    // 100K total classes are more than enough to push the CDS limits.
+    private static final int NUM_CLASSES = 100;
+    private static final int NUM_NESTED_CLASSES = 1000;
+
+    private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
+    private static final Path APP_JAR = USER_DIR.resolve("test.jar");
+    private static final Path SRC_DIR = USER_DIR.resolve("src");
+
+    private static final String TOP_CLASS_NAME = "Class";
+    private static final String NESTED_CLASS_NAME = "Nested";
+    private static final String MAIN_CLASS_NAME = "Main";
+
+    public static List<String> generateClass(int idx) {
+        List<String> out = new ArrayList<>();
+        out.add("public class " + TOP_CLASS_NAME + idx + " {");
+        out.add("public " + TOP_CLASS_NAME + idx + "() {");
+        for (int c = 0; c < NUM_NESTED_CLASSES; c++) {
+            out.add("new " + NESTED_CLASS_NAME + c + "();");
+        }
+        out.add("}");
+        for (int c = 0; c < NUM_NESTED_CLASSES; c++) {
+            out.add("public static class " + NESTED_CLASS_NAME + c + " {}");
+        }
+        out.add("}");
+        return out;
+    }
+
+    public static List<String> generateMainClass() {
+        List<String> out = new ArrayList<>();
+        out.add("public class " + MAIN_CLASS_NAME + " {");
+        out.add("public static void main(String... args) {");
+        for (int c = 0; c < NUM_CLASSES; c++) {
+            out.add("new " + TOP_CLASS_NAME + c + "();");
+        }
+        out.add("System.out.println(\"Success\");");
+        out.add("}");
+        out.add("}");
+        return out;
+    }
+
+    public static String[] listAppClasses() {
+        String[] res = new String[NUM_CLASSES * NUM_NESTED_CLASSES];
+        for (int c = 0; c < NUM_CLASSES; c++) {
+            for (int sc = 0; sc < NUM_NESTED_CLASSES; sc++) {
+                res[c * NUM_NESTED_CLASSES + sc] = TOP_CLASS_NAME + c + "$" + NESTED_CLASS_NAME + sc;
+            }
+        }
+        return res;
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Step 1. Generate classes and build the JAR with them.
+        {
+            SRC_DIR.toFile().mkdirs();
+
+            for (int i = 0; i < NUM_CLASSES; i++) {
+                Path file = SRC_DIR.resolve(TOP_CLASS_NAME + i + ".java");
+                Files.write(file, generateClass(i));
+            }
+
+            Path mainFile = SRC_DIR.resolve(MAIN_CLASS_NAME + ".java");
+            Files.write(mainFile, generateMainClass());
+
+            CDSJarUtils.buildFromSourceDirectory(
+                APP_JAR.toString(),
+                SRC_DIR.toString()
+            );
+        }
+
+        // Step 2. Try to dump the archive.
+        {
+            OutputAnalyzer output = TestCommon.createArchive(
+                APP_JAR.toString(),
+                listAppClasses(),
+                MAIN_CLASS_NAME
+            );
+            TestCommon.checkDump(output);
+        }
+
+        // Step 3. Try to run, touching every class.
+        {
+            TestCommon.run(
+                // Verifying dependencies for lots of classes slows down the test.
+                "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-VerifyDependencies",
+                "-Xlog:cds",
+                "-cp", APP_JAR.toString(),
+                MAIN_CLASS_NAME).
+                    assertNormalExit("Success");
+        }
+
+    }
+}

From c2485d5f7dd00eaed34a5d309276114eb4c78cb0 Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Tue, 29 Apr 2025 19:12:52 +0000
Subject: [PATCH 191/901] 8351113: RC2ParameterSpec throws
 IllegalArgumentException when offset is negative

Reviewed-by: mullan
---
 .../javax/crypto/spec/RC2ParameterSpec.java   |  7 +++-
 .../RC2ParameterSpec/InvalidArrayIndex.java   | 40 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java

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 e37e3872ff2..0e664510324 100644
--- a/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
@@ -98,7 +98,12 @@ public RC2ParameterSpec(int effectiveKeyBits, byte[] iv) {
      */
     public RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) {
         this.effectiveKeyBits = effectiveKeyBits;
-        if (iv == null) throw new IllegalArgumentException("IV missing");
+        if (iv == null) {
+            throw new IllegalArgumentException("IV missing");
+        }
+        if (offset < 0) {
+            throw new ArrayIndexOutOfBoundsException("offset is negative");
+        }
         int blockSize = 8;
         if (iv.length - offset < blockSize) {
             throw new IllegalArgumentException("IV too short");
diff --git a/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java b/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java
new file mode 100644
index 00000000000..0a2dcecb76d
--- /dev/null
+++ b/test/jdk/java/security/spec/RC2ParameterSpec/InvalidArrayIndex.java
@@ -0,0 +1,40 @@
+/*
+ * 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 8351113
+ * @summary check for negative offset
+ * @library /test/lib
+ */
+
+import jdk.test.lib.Utils;
+import javax.crypto.spec.RC2ParameterSpec;
+
+public class InvalidArrayIndex {
+
+    public static void main(String[] args) throws Exception {
+        Utils.runAndCheckException(() -> new RC2ParameterSpec(0, new byte[20],
+                Integer.MIN_VALUE), ArrayIndexOutOfBoundsException.class);
+    }
+}

From bf52eb035865353fdf5c6c242f9676a51dcc9e22 Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Tue, 29 Apr 2025 20:15:00 +0000
Subject: [PATCH 192/901] 8355632: WhiteBox.waitForReferenceProcessing() fails
 assert for return type

Reviewed-by: kbarrett
---
 .../jdk/test/whitebox/WaitForRefProcTest.java | 30 +++++++++++++++++++
 test/lib/jdk/test/whitebox/WhiteBox.java      |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 test/lib-test/jdk/test/whitebox/WaitForRefProcTest.java

diff --git a/test/lib-test/jdk/test/whitebox/WaitForRefProcTest.java b/test/lib-test/jdk/test/whitebox/WaitForRefProcTest.java
new file mode 100644
index 00000000000..1a254775f77
--- /dev/null
+++ b/test/lib-test/jdk/test/whitebox/WaitForRefProcTest.java
@@ -0,0 +1,30 @@
+/*
+ * @test
+ * @summary Test WhiteBox.waitForReferenceProcessing
+ * @bug 8305186 8355632
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @modules java.base/java.lang.ref:open
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -ea -esa
+ *      -Xbootclasspath/a:.
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+WhiteBoxAPI
+ *      WaitForRefProcTest
+ */
+
+import jdk.test.whitebox.WhiteBox;
+
+public class WaitForRefProcTest {
+
+    public static void main(String[] args) {
+        WhiteBox.getWhiteBox().fullGC();
+        try {
+            boolean ret = WhiteBox.getWhiteBox().waitForReferenceProcessing();
+            System.out.println("wFRP returned " + ret);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            throw new RuntimeException("test caught InterruptedException");
+        }
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index bd68cf72cc3..4747740274e 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -569,7 +569,7 @@ private static Method getWaitForReferenceProcessingMethod() {
       try {
         wfrp = Reference.class.getDeclaredMethod("waitForReferenceProcessing");
         wfrp.setAccessible(true);
-        assert wfrp.getReturnType() == Boolean.class;
+        assert wfrp.getReturnType().equals(boolean.class);
         Class<?>[] ev = wfrp.getExceptionTypes();
         assert ev.length == 1;
         assert ev[0] == InterruptedException.class;

From 8b16897b74cfdc3c2693e3ae7e05f3d8c6468ebe Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Tue, 29 Apr 2025 20:42:37 +0000
Subject: [PATCH 193/901] 8355262: Test
 sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java failed:
 accept timed out

Reviewed-by: jnimeh, wetmore
---
 .../ssl/SSLSessionImpl/NoInvalidateSocketException.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java b/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
index 7b2efd2c59c..696eb58d463 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.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
@@ -28,7 +28,7 @@
 
 /*
  * @test
- * @bug 8274736 8277970
+ * @bug 8274736 8277970 8355262
  * @summary Concurrent read/close of SSLSockets causes SSLSessions to be
  *          invalidated unnecessarily
  * @library /javax/net/ssl/templates
@@ -285,7 +285,7 @@ public void doServerSide() throws Exception {
         // Signal the client, the server is ready to accept connection.
         serverCondition.countDown();
 
-        // Try to accept a connection in 5 seconds.
+        // Try to accept a connection in 10 seconds.
         // We will do this in a loop until the client flips the
         // finished variable to true
         SSLSocket sslSocket;
@@ -351,7 +351,7 @@ public void doServerSide() throws Exception {
     public void configureServerSocket(SSLServerSocket socket) {
         try {
             socket.setReuseAddress(true);
-            socket.setSoTimeout(5000);
+            socket.setSoTimeout(10000);
         } catch (SocketException se) {
             // Rethrow as unchecked to satisfy the override signature
             throw new RuntimeException(se);

From 6850757fe6c6c7868fab2314babb7c30bce2662e Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Tue, 29 Apr 2025 22:25:20 +0000
Subject: [PATCH 194/901] 8355689: Wrong native entry name for FloatMaxVector
 vector math stubs with -XX:MaxVectorSize=8

Reviewed-by: psandoz, haosun, kvn
---
 .../classes/jdk/incubator/vector/VectorMathLibrary.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
index 1dfd6f131d2..4729235e2d9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
@@ -140,7 +140,8 @@ private static String suffix(VectorSpecies<?> vspecies) {
         public String symbolName(Operator op, VectorSpecies<?> vspecies) {
             String suffix = suffix(vspecies);
             String elemType = (vspecies.elementType() == float.class ? "f" : "");
-            int vlen = (vspecies == FloatVector.SPECIES_64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            boolean isFloat64Vector = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // Float64Vector or FloatMaxVector
+            int vlen = (isFloat64Vector ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
             return String.format("__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
         }
 
@@ -211,7 +212,8 @@ private static String precisionLevel(Operator op) {
 
         @Override
         public String symbolName(Operator op, VectorSpecies<?> vspecies) {
-            int vlen = (vspecies == FloatVector.SPECIES_64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            boolean isFloat64Vector = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // Float64Vector or FloatMaxVector
+            int vlen = (isFloat64Vector ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
             boolean isShapeAgnostic = isRISCV64() || (isAARCH64() && vspecies.vectorBitSize() > 128);
             return String.format("%s%s%s_%s%s", op.operatorName(),
                                  (vspecies.elementType() == float.class ? "f" : "d"),

From 5e27547e2d577e17316ae1a91f83e4091e9729c5 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 29 Apr 2025 22:56:19 +0000
Subject: [PATCH 195/901] 8355789: GenShen: assert(_degen_point ==
 ShenandoahGC::_degenerated_unset) failed: Should not be set yet: Outside of
 Cycle

Reviewed-by: kdnilsen, ysr
---
 .../shenandoahGenerationalControlThread.cpp   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index fe4679bbf05..6b33d5207d0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -482,17 +482,14 @@ bool ShenandoahGenerationalControlThread::resume_concurrent_old_cycle(Shenandoah
   }
 
   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
-    // cancellation. We set the degeneration point to be outside
-    // the cycle because if this is an allocation failure, that is
-    // what must be done (there is no degenerated old cycle). If the
-    // cancellation was due to a heuristic wanting to start a young
-    // 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 (cause == GCCause::_shenandoah_concurrent_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 cancellation. We set the degeneration
+    // point to be outside the cycle because if this is an allocation failure, that is what must be done (there is no
+    // degenerated old cycle). If the cancellation was due to a heuristic wanting to start a young cycle, then we are
+    // not actually going to a degenerated cycle, so don't set the degeneration point here.
+    if (ShenandoahCollectorPolicy::is_allocation_failure(cause)) {
+      check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle);
+    } else if (cause == GCCause::_shenandoah_concurrent_gc) {
       _heap->shenandoah_policy()->record_interrupted_old();
     }
     return false;

From 1652948862c135c67d52622062773bf7922e02d0 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 29 Apr 2025 23:07:14 +0000
Subject: [PATCH 196/901] 8355442: Reference field lambda forms with type casts
 are not generated

Reviewed-by: jvernee
---
 .../java/lang/invoke/DirectMethodHandle.java  | 129 +++++++++---------
 .../lang/invoke/GenerateJLIClassesHelper.java |  21 ++-
 .../lang/invoke/InvokerBytecodeGenerator.java |  42 +++---
 .../classes/java/lang/invoke/LambdaForm.java  |  60 ++++----
 4 files changed, 122 insertions(+), 130 deletions(-)

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 0a943d253af..4eb825d13ce 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -621,10 +621,9 @@ Object checkCast(Object obj) {
     // Enumerate the different field kinds using Wrapper,
     // with an extra case added for checked references.
     static final int
-            FT_LAST_WRAPPER    = Wrapper.COUNT-1,
             FT_UNCHECKED_REF   = Wrapper.OBJECT.ordinal(),
-            FT_CHECKED_REF     = FT_LAST_WRAPPER+1,
-            FT_LIMIT           = FT_LAST_WRAPPER+2;
+            FT_CHECKED_REF     = Wrapper.VOID.ordinal(),
+            FT_LIMIT           = Wrapper.COUNT;
     private static int afIndex(byte formOp, boolean isVolatile, int ftypeKind) {
         return ((formOp * FT_LIMIT * 2)
                 + (isVolatile ? FT_LIMIT : 0)
@@ -683,63 +682,69 @@ private static LambdaForm preparedFieldLambdaForm(byte formOp, boolean isVolatil
         return lform;
     }
 
-    private static final Wrapper[] ALL_WRAPPERS = Wrapper.values();
-
-    private static Kind getFieldKind(boolean isGetter, boolean isVolatile, Wrapper wrapper) {
-        if (isGetter) {
-            if (isVolatile) {
-                switch (wrapper) {
-                    case BOOLEAN: return GET_BOOLEAN_VOLATILE;
-                    case BYTE:    return GET_BYTE_VOLATILE;
-                    case SHORT:   return GET_SHORT_VOLATILE;
-                    case CHAR:    return GET_CHAR_VOLATILE;
-                    case INT:     return GET_INT_VOLATILE;
-                    case LONG:    return GET_LONG_VOLATILE;
-                    case FLOAT:   return GET_FLOAT_VOLATILE;
-                    case DOUBLE:  return GET_DOUBLE_VOLATILE;
-                    case OBJECT:  return GET_REFERENCE_VOLATILE;
-                }
+    private static final @Stable Wrapper[] ALL_WRAPPERS = Wrapper.values();
+
+    // Names in kind may overload but differ from their basic type
+    private static Kind getFieldKind(boolean isVolatile, boolean needsInit, boolean needsCast, Wrapper wrapper) {
+        if (isVolatile) {
+            if (needsInit) {
+                return switch (wrapper) {
+                    case BYTE -> VOLATILE_FIELD_ACCESS_INIT_B;
+                    case CHAR -> VOLATILE_FIELD_ACCESS_INIT_C;
+                    case SHORT -> VOLATILE_FIELD_ACCESS_INIT_S;
+                    case BOOLEAN -> VOLATILE_FIELD_ACCESS_INIT_Z;
+                    default -> needsCast ? VOLATILE_FIELD_ACCESS_INIT_CAST : VOLATILE_FIELD_ACCESS_INIT;
+                };
             } else {
-                switch (wrapper) {
-                    case BOOLEAN: return GET_BOOLEAN;
-                    case BYTE:    return GET_BYTE;
-                    case SHORT:   return GET_SHORT;
-                    case CHAR:    return GET_CHAR;
-                    case INT:     return GET_INT;
-                    case LONG:    return GET_LONG;
-                    case FLOAT:   return GET_FLOAT;
-                    case DOUBLE:  return GET_DOUBLE;
-                    case OBJECT:  return GET_REFERENCE;
-                }
+                return switch (wrapper) {
+                    case BYTE -> VOLATILE_FIELD_ACCESS_B;
+                    case CHAR -> VOLATILE_FIELD_ACCESS_C;
+                    case SHORT -> VOLATILE_FIELD_ACCESS_S;
+                    case BOOLEAN -> VOLATILE_FIELD_ACCESS_Z;
+                    default -> needsCast ? VOLATILE_FIELD_ACCESS_CAST : VOLATILE_FIELD_ACCESS;
+                };
             }
         } else {
-            if (isVolatile) {
-                switch (wrapper) {
-                    case BOOLEAN: return PUT_BOOLEAN_VOLATILE;
-                    case BYTE:    return PUT_BYTE_VOLATILE;
-                    case SHORT:   return PUT_SHORT_VOLATILE;
-                    case CHAR:    return PUT_CHAR_VOLATILE;
-                    case INT:     return PUT_INT_VOLATILE;
-                    case LONG:    return PUT_LONG_VOLATILE;
-                    case FLOAT:   return PUT_FLOAT_VOLATILE;
-                    case DOUBLE:  return PUT_DOUBLE_VOLATILE;
-                    case OBJECT:  return PUT_REFERENCE_VOLATILE;
-                }
+            if (needsInit) {
+                return switch (wrapper) {
+                    case BYTE -> FIELD_ACCESS_INIT_B;
+                    case CHAR -> FIELD_ACCESS_INIT_C;
+                    case SHORT -> FIELD_ACCESS_INIT_S;
+                    case BOOLEAN -> FIELD_ACCESS_INIT_Z;
+                    default -> needsCast ? FIELD_ACCESS_INIT_CAST : FIELD_ACCESS_INIT;
+                };
             } else {
-                switch (wrapper) {
-                    case BOOLEAN: return PUT_BOOLEAN;
-                    case BYTE:    return PUT_BYTE;
-                    case SHORT:   return PUT_SHORT;
-                    case CHAR:    return PUT_CHAR;
-                    case INT:     return PUT_INT;
-                    case LONG:    return PUT_LONG;
-                    case FLOAT:   return PUT_FLOAT;
-                    case DOUBLE:  return PUT_DOUBLE;
-                    case OBJECT:  return PUT_REFERENCE;
-                }
+                return switch (wrapper) {
+                    case BYTE -> FIELD_ACCESS_B;
+                    case CHAR -> FIELD_ACCESS_C;
+                    case SHORT -> FIELD_ACCESS_S;
+                    case BOOLEAN -> FIELD_ACCESS_Z;
+                    default -> needsCast ? FIELD_ACCESS_CAST : FIELD_ACCESS;
+                };
             }
         }
-        throw new AssertionError("Invalid arguments");
+    }
+
+    private static String unsafeMethodName(boolean isGetter, boolean isVolatile, Wrapper wrapper) {
+        var name = switch (wrapper) {
+            case BOOLEAN -> "Boolean";
+            case BYTE -> "Byte";
+            case CHAR -> "Char";
+            case SHORT -> "Short";
+            case INT -> "Int";
+            case FLOAT -> "Float";
+            case LONG -> "Long";
+            case DOUBLE -> "Double";
+            case OBJECT -> "Reference";
+            case VOID -> throw new InternalError();
+        };
+        var sb = new StringBuilder(3 + name.length() + (isVolatile ? 8 : 0))
+                .append(isGetter ? "get" : "put")
+                .append(name);
+        if (isVolatile) {
+            sb.append("Volatile");
+        }
+        return sb.toString();
     }
 
     static LambdaForm makePreparedFieldLambdaForm(byte formOp, boolean isVolatile, int ftypeKind) {
@@ -752,14 +757,16 @@ static LambdaForm makePreparedFieldLambdaForm(byte formOp, boolean isVolatile, i
         assert(ftypeKind(needsCast ? String.class : ft) == ftypeKind);
 
         // getObject, putIntVolatile, etc.
-        Kind kind = getFieldKind(isGetter, isVolatile, fw);
+        String unsafeMethodName = unsafeMethodName(isGetter, isVolatile, fw);
+        // isGetter and isStatic is reflected in field type; basic type clash for subwords
+        Kind kind = getFieldKind(isVolatile, needsInit, needsCast, fw);
 
         MethodType linkerType;
         if (isGetter)
             linkerType = MethodType.methodType(ft, Object.class, long.class);
         else
             linkerType = MethodType.methodType(void.class, Object.class, long.class, ft);
-        MemberName linker = new MemberName(Unsafe.class, kind.methodName, linkerType, REF_invokeVirtual);
+        MemberName linker = new MemberName(Unsafe.class, unsafeMethodName, linkerType, REF_invokeVirtual);
         try {
             linker = IMPL_NAMES.resolveOrFail(REF_invokeVirtual, linker, null, LM_TRUSTED,
                                               NoSuchMethodException.class);
@@ -817,18 +824,12 @@ static LambdaForm makePreparedFieldLambdaForm(byte formOp, boolean isVolatile, i
             names[POST_CAST] = new Name(getFunction(NF_checkCast), names[DMH_THIS], names[LINKER_CALL]);
         for (Name n : names)  assert(n != null);
 
-        LambdaForm form;
-        if (needsCast || needsInit) {
-            // can't use the pre-generated form when casting and/or initializing
-            form = LambdaForm.create(ARG_LIMIT, names, RESULT);
-        } else {
-            form = LambdaForm.create(ARG_LIMIT, names, RESULT, kind);
-        }
+        LambdaForm form = LambdaForm.create(ARG_LIMIT, names, RESULT, kind);
 
         if (LambdaForm.debugNames()) {
             // add some detail to the lambdaForm debugname,
             // significant only for debugging
-            StringBuilder nameBuilder = new StringBuilder(kind.methodName);
+            StringBuilder nameBuilder = new StringBuilder(unsafeMethodName);
             if (isStatic) {
                 nameBuilder.append("Static");
             } else {
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 e52438544ae..561f9122398 100644
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -430,24 +430,21 @@ static byte[] generateDirectMethodHandleHolderClassBytes(String className,
             names.add(form.kind.defaultLambdaName);
         }
         for (Wrapper wrapper : Wrapper.values()) {
-            if (wrapper == Wrapper.VOID) {
-                continue;
-            }
+            int ftype = wrapper == Wrapper.VOID ? DirectMethodHandle.FT_CHECKED_REF : DirectMethodHandle.ftypeKind(wrapper.primitiveType());
             for (byte b = DirectMethodHandle.AF_GETFIELD; b < DirectMethodHandle.AF_LIMIT; b++) {
-                int ftype = DirectMethodHandle.ftypeKind(wrapper.primitiveType());
                 LambdaForm form = DirectMethodHandle
                         .makePreparedFieldLambdaForm(b, /*isVolatile*/false, ftype);
-                if (form.kind != LambdaForm.Kind.GENERIC) {
-                    forms.add(form);
-                    names.add(form.kind.defaultLambdaName);
-                }
+                if (form.kind == GENERIC)
+                    throw new InternalError(b + " non-volatile " + ftype);
+                forms.add(form);
+                names.add(form.kind.defaultLambdaName);
                 // volatile
                 form = DirectMethodHandle
                         .makePreparedFieldLambdaForm(b, /*isVolatile*/true, ftype);
-                if (form.kind != LambdaForm.Kind.GENERIC) {
-                    forms.add(form);
-                    names.add(form.kind.defaultLambdaName);
-                }
+                if (form.kind == GENERIC)
+                    throw new InternalError(b + " volatile " + ftype);
+                forms.add(form);
+                names.add(form.kind.defaultLambdaName);
             }
         }
         return generateCodeBytesForLFs(className,
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 f5998c46aa1..b3d2ff2c880 100644
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -468,24 +468,30 @@ private static MemberName lookupPregenerated(LambdaForm form, MethodType invoker
             case LINK_TO_TARGET_METHOD:     // fall-through
             case GENERIC_INVOKER:           // fall-through
             case GENERIC_LINKER:            return resolveFrom(name, invokerType, Invokers.Holder.class);
-            case GET_REFERENCE:             // fall-through
-            case GET_BOOLEAN:               // fall-through
-            case GET_BYTE:                  // fall-through
-            case GET_CHAR:                  // fall-through
-            case GET_SHORT:                 // fall-through
-            case GET_INT:                   // fall-through
-            case GET_LONG:                  // fall-through
-            case GET_FLOAT:                 // fall-through
-            case GET_DOUBLE:                // fall-through
-            case PUT_REFERENCE:             // fall-through
-            case PUT_BOOLEAN:               // fall-through
-            case PUT_BYTE:                  // fall-through
-            case PUT_CHAR:                  // fall-through
-            case PUT_SHORT:                 // fall-through
-            case PUT_INT:                   // fall-through
-            case PUT_LONG:                  // fall-through
-            case PUT_FLOAT:                 // fall-through
-            case PUT_DOUBLE:                // fall-through
+            case FIELD_ACCESS:              // fall-through
+            case FIELD_ACCESS_INIT:         // fall-through
+            case VOLATILE_FIELD_ACCESS:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT:// fall-through
+            case FIELD_ACCESS_B:              // fall-through
+            case FIELD_ACCESS_INIT_B:         // fall-through
+            case VOLATILE_FIELD_ACCESS_B:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT_B:// fall-through
+            case FIELD_ACCESS_C:              // fall-through
+            case FIELD_ACCESS_INIT_C:         // fall-through
+            case VOLATILE_FIELD_ACCESS_C:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT_C:// fall-through
+            case FIELD_ACCESS_S:              // fall-through
+            case FIELD_ACCESS_INIT_S:         // fall-through
+            case VOLATILE_FIELD_ACCESS_S:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT_S:// fall-through
+            case FIELD_ACCESS_Z:              // fall-through
+            case FIELD_ACCESS_INIT_Z:         // fall-through
+            case VOLATILE_FIELD_ACCESS_Z:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT_Z:// fall-through
+            case FIELD_ACCESS_CAST:              // fall-through
+            case FIELD_ACCESS_INIT_CAST:         // fall-through
+            case VOLATILE_FIELD_ACCESS_CAST:     // fall-through
+            case VOLATILE_FIELD_ACCESS_INIT_CAST:// fall-through
             case DIRECT_NEW_INVOKE_SPECIAL: // fall-through
             case DIRECT_INVOKE_INTERFACE:   // fall-through
             case DIRECT_INVOKE_SPECIAL:     // fall-through
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 7ba66a473fe..c1a07d8d0de 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -263,42 +263,30 @@ enum Kind {
         DIRECT_NEW_INVOKE_SPECIAL("DMH.newInvokeSpecial", "newInvokeSpecial"),
         DIRECT_INVOKE_INTERFACE("DMH.invokeInterface", "invokeInterface"),
         DIRECT_INVOKE_STATIC_INIT("DMH.invokeStaticInit", "invokeStaticInit"),
-        GET_REFERENCE("getReference"),
-        PUT_REFERENCE("putReference"),
-        GET_REFERENCE_VOLATILE("getReferenceVolatile"),
-        PUT_REFERENCE_VOLATILE("putReferenceVolatile"),
-        GET_INT("getInt"),
-        PUT_INT("putInt"),
-        GET_INT_VOLATILE("getIntVolatile"),
-        PUT_INT_VOLATILE("putIntVolatile"),
-        GET_BOOLEAN("getBoolean"),
-        PUT_BOOLEAN("putBoolean"),
-        GET_BOOLEAN_VOLATILE("getBooleanVolatile"),
-        PUT_BOOLEAN_VOLATILE("putBooleanVolatile"),
-        GET_BYTE("getByte"),
-        PUT_BYTE("putByte"),
-        GET_BYTE_VOLATILE("getByteVolatile"),
-        PUT_BYTE_VOLATILE("putByteVolatile"),
-        GET_CHAR("getChar"),
-        PUT_CHAR("putChar"),
-        GET_CHAR_VOLATILE("getCharVolatile"),
-        PUT_CHAR_VOLATILE("putCharVolatile"),
-        GET_SHORT("getShort"),
-        PUT_SHORT("putShort"),
-        GET_SHORT_VOLATILE("getShortVolatile"),
-        PUT_SHORT_VOLATILE("putShortVolatile"),
-        GET_LONG("getLong"),
-        PUT_LONG("putLong"),
-        GET_LONG_VOLATILE("getLongVolatile"),
-        PUT_LONG_VOLATILE("putLongVolatile"),
-        GET_FLOAT("getFloat"),
-        PUT_FLOAT("putFloat"),
-        GET_FLOAT_VOLATILE("getFloatVolatile"),
-        PUT_FLOAT_VOLATILE("putFloatVolatile"),
-        GET_DOUBLE("getDouble"),
-        PUT_DOUBLE("putDouble"),
-        GET_DOUBLE_VOLATILE("getDoubleVolatile"),
-        PUT_DOUBLE_VOLATILE("putDoubleVolatile"),
+        FIELD_ACCESS("fieldAccess"),
+        FIELD_ACCESS_INIT("fieldAccessInit"),
+        VOLATILE_FIELD_ACCESS("volatileFieldAccess"),
+        VOLATILE_FIELD_ACCESS_INIT("volatileFieldAccessInit"),
+        FIELD_ACCESS_B("fieldAccessB"),
+        FIELD_ACCESS_INIT_B("fieldAccessInitB"),
+        VOLATILE_FIELD_ACCESS_B("volatileFieldAccessB"),
+        VOLATILE_FIELD_ACCESS_INIT_B("volatileFieldAccessInitB"),
+        FIELD_ACCESS_C("fieldAccessC"),
+        FIELD_ACCESS_INIT_C("fieldAccessInitC"),
+        VOLATILE_FIELD_ACCESS_C("volatileFieldAccessC"),
+        VOLATILE_FIELD_ACCESS_INIT_C("volatileFieldAccessInitC"),
+        FIELD_ACCESS_S("fieldAccessS"),
+        FIELD_ACCESS_INIT_S("fieldAccessInitS"),
+        VOLATILE_FIELD_ACCESS_S("volatileFieldAccessS"),
+        VOLATILE_FIELD_ACCESS_INIT_S("volatileFieldAccessInitS"),
+        FIELD_ACCESS_Z("fieldAccessZ"),
+        FIELD_ACCESS_INIT_Z("fieldAccessInitZ"),
+        VOLATILE_FIELD_ACCESS_Z("volatileFieldAccessZ"),
+        VOLATILE_FIELD_ACCESS_INIT_Z("volatileFieldAccessInitZ"),
+        FIELD_ACCESS_CAST("fieldAccessCast"),
+        FIELD_ACCESS_INIT_CAST("fieldAccessInitCast"),
+        VOLATILE_FIELD_ACCESS_CAST("volatileFieldAccessCast"),
+        VOLATILE_FIELD_ACCESS_INIT_CAST("volatileFieldAccessInitCast"),
         TRY_FINALLY("tryFinally"),
         TABLE_SWITCH("tableSwitch"),
         COLLECTOR("collector"),

From 83d0bd85afaf1b5724c12f4d2f6e9c7087bab4e8 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 29 Apr 2025 23:44:45 +0000
Subject: [PATCH 197/901] 8355069: Allocation::check_out_of_memory() should
 support CheckUnhandledOops mode

Reviewed-by: sspitsyn
---
 src/hotspot/share/gc/shared/memAllocator.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 09ac5d25f86..a8ba2074cd1 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -126,6 +126,10 @@ bool MemAllocator::Allocation::check_out_of_memory() {
     // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support
     report_java_out_of_memory(message);
     if (JvmtiExport::should_post_resource_exhausted()) {
+#ifdef CHECK_UNHANDLED_OOPS
+      // obj is null, no need to handle, but CheckUnhandledOops is not aware about null
+      THREAD->allow_unhandled_oop(_obj_ptr);
+#endif // CHECK_UNHANDLED_OOPS
       JvmtiExport::post_resource_exhausted(
         JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP,
         message);

From dcffd9d9ac1ad1ed814b5bb45222a25621eeccda Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 30 Apr 2025 00:39:02 +0000
Subject: [PATCH 198/901] 8347471: Provide valid flags and mask in
 AccessFlag.Location

Reviewed-by: rriggs
---
 .../classes/java/lang/reflect/AccessFlag.java | 667 +++++++++++-------
 .../classes/java/lang/reflect/Modifier.java   |   8 +
 .../AccessFlag/BasicAccessFlagTest.java       |  17 +-
 .../AccessFlag/ClassAccessFlagTest.java       |  52 +-
 .../AccessFlag/FieldAccessFlagTest.java       |  31 +-
 .../AccessFlag/MethodAccessFlagTest.java      |  41 +-
 .../AccessFlag/StrictAccessFlagTest.java      |  23 +-
 .../AccessFlag/VersionedLocationsTest.java    |  55 +-
 test/jdk/java/util/Collection/MOAT.java       |   6 +-
 9 files changed, 579 insertions(+), 321 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java b/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
index bc6b20be9a8..bb58c440688 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessFlag.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
@@ -25,12 +25,31 @@
 
 package java.lang.reflect;
 
-import java.util.Collections;
-import java.util.Objects;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.FieldModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.attribute.InnerClassInfo;
+import java.lang.classfile.attribute.MethodParameterInfo;
+import java.lang.classfile.attribute.ModuleAttribute;
+import java.lang.classfile.attribute.ModuleExportInfo;
+import java.lang.classfile.attribute.ModuleOpenInfo;
+import java.lang.classfile.attribute.ModuleRequireInfo;
+import java.lang.module.ModuleDescriptor;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Set;
-import java.util.function.Function;
-import static java.util.Map.entry;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+import jdk.internal.vm.annotation.Stable;
+
+import static java.lang.classfile.ClassFile.*;
+import static java.lang.reflect.ClassFileFormatVersion.*;
 
 /**
  * Represents a JVM access or module-related flag on a runtime member,
@@ -93,26 +112,14 @@
  */
 @SuppressWarnings("doclint:reference") // cross-module link
 public enum AccessFlag {
-    // Note to maintainers: anonymous class instances are used rather
-    // than lambdas to initialize the functions used for the
-    // cffvToLocations field to avoid using lambdas too early in JDK
-    // initialization.
-
     /**
      * The access flag {@code ACC_PUBLIC}, corresponding to the source
      * modifier {@link Modifier#PUBLIC public}, with a mask value of
      * <code>{@value "0x%04x" Modifier#PUBLIC}</code>.
      */
     PUBLIC(Modifier.PUBLIC, true,
-           Location.SET_PUBLIC_1,
-           new Function<ClassFileFormatVersion, Set<Location>>() {
-               @Override
-               public Set<Location> apply(ClassFileFormatVersion cffv) {
-                   return (cffv == ClassFileFormatVersion.RELEASE_0) ?
-                       Location.SET_CLASS_FIELD_METHOD:
-                       Location.SET_PUBLIC_1;
-               }
-           }),
+           Location.SET_CLASS_FIELD_METHOD_INNER_CLASS,
+           List.of(Map.entry(RELEASE_0, Location.SET_CLASS_FIELD_METHOD))),
 
     /**
      * The access flag {@code ACC_PRIVATE}, corresponding to the
@@ -120,14 +127,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * value of <code>{@value "0x%04x" Modifier#PRIVATE}</code>.
      */
     PRIVATE(Modifier.PRIVATE, true, Location.SET_FIELD_METHOD_INNER_CLASS,
-            new Function<ClassFileFormatVersion, Set<Location>>() {
-                @Override
-                    public Set<Location> apply(ClassFileFormatVersion cffv) {
-                    return (cffv == ClassFileFormatVersion.RELEASE_0) ?
-                        Location.SET_FIELD_METHOD:
-                        Location.SET_FIELD_METHOD_INNER_CLASS;
-                }
-            }),
+            List.of(Map.entry(RELEASE_0, Location.SET_FIELD_METHOD))),
 
     /**
      * The access flag {@code ACC_PROTECTED}, corresponding to the
@@ -135,14 +135,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * value of <code>{@value "0x%04x" Modifier#PROTECTED}</code>.
      */
     PROTECTED(Modifier.PROTECTED, true, Location.SET_FIELD_METHOD_INNER_CLASS,
-              new Function<ClassFileFormatVersion, Set<Location>>() {
-                  @Override
-                  public Set<Location> apply(ClassFileFormatVersion cffv) {
-                  return (cffv == ClassFileFormatVersion.RELEASE_0) ?
-                      Location.SET_FIELD_METHOD:
-                      Location.SET_FIELD_METHOD_INNER_CLASS;
-                  }
-              }),
+              List.of(Map.entry(RELEASE_0, Location.SET_FIELD_METHOD))),
 
     /**
      * The access flag {@code ACC_STATIC}, corresponding to the source
@@ -150,13 +143,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * <code>{@value "0x%04x" Modifier#STATIC}</code>.
      */
     STATIC(Modifier.STATIC, true, Location.SET_FIELD_METHOD_INNER_CLASS,
-           new Function<ClassFileFormatVersion, Set<Location>>() {
-               @Override
-               public Set<Location> apply(ClassFileFormatVersion cffv) {
-                   return (cffv == ClassFileFormatVersion.RELEASE_0) ?
-                       Location.SET_FIELD_METHOD:
-                       Location.SET_FIELD_METHOD_INNER_CLASS;}
-           }),
+           List.of(Map.entry(RELEASE_0, Location.SET_FIELD_METHOD))),
 
     /**
      * The access flag {@code ACC_FINAL}, corresponding to the source
@@ -165,18 +152,8 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      */
     FINAL(Modifier.FINAL, true,
           Location.SET_FINAL_8,
-           new Function<ClassFileFormatVersion, Set<Location>>() {
-              @Override
-              public Set<Location> apply(ClassFileFormatVersion cffv) {
-                  if (cffv.compareTo(ClassFileFormatVersion.RELEASE_8) >= 0) {
-                      return Location.SET_FINAL_8;
-                  } else {
-                      return (cffv == ClassFileFormatVersion.RELEASE_0) ?
-                          Location.SET_CLASS_FIELD_METHOD :
-                          Location.SET_CLASS_FIELD_METHOD_INNER_CLASS;
-                  }
-              }
-          }),
+          List.of(Map.entry(RELEASE_7, Location.SET_CLASS_FIELD_METHOD_INNER_CLASS),
+                  Map.entry(RELEASE_0, Location.SET_CLASS_FIELD_METHOD))),
 
     /**
      * The access flag {@code ACC_SUPER} with a mask value of {@code
@@ -186,21 +163,15 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * In Java SE 8 and above, the JVM treats the {@code ACC_SUPER}
      * flag as set in every class file (JVMS {@jvms 4.1}).
      */
-    SUPER(0x0000_0020, false, Location.SET_CLASS, null),
+    SUPER(0x0000_0020, false, Location.SET_CLASS, List.of()),
 
     /**
      * The module flag {@code ACC_OPEN} with a mask value of {@code
      * 0x0020}.
      * @see java.lang.module.ModuleDescriptor#isOpen
      */
-        OPEN(0x0000_0020, false, Location.SET_MODULE,
-             new Function<ClassFileFormatVersion, Set<Location>>() {
-                 @Override
-                 public Set<Location> apply(ClassFileFormatVersion cffv) {
-                     return (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 ) ?
-                         Location.SET_MODULE:
-                         Location.EMPTY_SET;}
-             }),
+    OPEN(0x0000_0020, false, Location.SET_MODULE,
+         List.of(Map.entry(RELEASE_8, Location.EMPTY_SET))),
 
     /**
      * The module requires flag {@code ACC_TRANSITIVE} with a mask
@@ -208,20 +179,14 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see java.lang.module.ModuleDescriptor.Requires.Modifier#TRANSITIVE
      */
     TRANSITIVE(0x0000_0020, false, Location.SET_MODULE_REQUIRES,
-               new Function<ClassFileFormatVersion, Set<Location>>() {
-                   @Override
-                   public Set<Location> apply(ClassFileFormatVersion cffv) {
-                       return (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 ) ?
-                           Location.SET_MODULE_REQUIRES:
-                           Location.EMPTY_SET;}
-               }),
+               List.of(Map.entry(RELEASE_8, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_SYNCHRONIZED}, corresponding to the
      * source modifier {@link Modifier#SYNCHRONIZED synchronized}, with
      * a mask value of <code>{@value "0x%04x" Modifier#SYNCHRONIZED}</code>.
      */
-    SYNCHRONIZED(Modifier.SYNCHRONIZED, true, Location.SET_METHOD, null),
+    SYNCHRONIZED(Modifier.SYNCHRONIZED, true, Location.SET_METHOD, List.of()),
 
     /**
      * The module requires flag {@code ACC_STATIC_PHASE} with a mask
@@ -229,20 +194,14 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see java.lang.module.ModuleDescriptor.Requires.Modifier#STATIC
      */
     STATIC_PHASE(0x0000_0040, false, Location.SET_MODULE_REQUIRES,
-                 new Function<ClassFileFormatVersion, Set<Location>>() {
-                     @Override
-                     public Set<Location> apply(ClassFileFormatVersion cffv) {
-                         return (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 ) ?
-                             Location.SET_MODULE_REQUIRES:
-                             Location.EMPTY_SET;}
-                 }),
-
-   /**
+                 List.of(Map.entry(RELEASE_8, Location.EMPTY_SET))),
+
+    /**
      * The access flag {@code ACC_VOLATILE}, corresponding to the
      * source modifier {@link Modifier#VOLATILE volatile}, with a mask
      * value of <code>{@value "0x%04x" Modifier#VOLATILE}</code>.
      */
-    VOLATILE(Modifier.VOLATILE, true, Location.SET_FIELD, null),
+    VOLATILE(Modifier.VOLATILE, true, Location.SET_FIELD, List.of()),
 
     /**
      * The access flag {@code ACC_BRIDGE} with a mask value of
@@ -250,41 +209,29 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see Method#isBridge()
      */
     BRIDGE(Modifier.BRIDGE, false, Location.SET_METHOD,
-           new Function<ClassFileFormatVersion, Set<Location>>() {
-               @Override
-               public Set<Location> apply(ClassFileFormatVersion cffv) {
-                   return (cffv.compareTo(ClassFileFormatVersion.RELEASE_5) >= 0 ) ?
-                       Location.SET_METHOD:
-                       Location.EMPTY_SET;}
-           }),
+           List.of(Map.entry(RELEASE_4, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_TRANSIENT}, corresponding to the
      * source modifier {@link Modifier#TRANSIENT transient}, with a
      * mask value of <code>{@value "0x%04x" Modifier#TRANSIENT}</code>.
      */
-    TRANSIENT(Modifier.TRANSIENT, true, Location.SET_FIELD, null),
+    TRANSIENT(Modifier.TRANSIENT, true, Location.SET_FIELD, List.of()),
 
     /**
      * The access flag {@code ACC_VARARGS} with a mask value of
-     <code>{@value "0x%04x" Modifier#VARARGS}</code>.
+     * <code>{@value "0x%04x" Modifier#VARARGS}</code>.
      * @see Executable#isVarArgs()
      */
     VARARGS(Modifier.VARARGS, false, Location.SET_METHOD,
-            new Function<ClassFileFormatVersion, Set<Location>>() {
-                @Override
-                public Set<Location> apply(ClassFileFormatVersion cffv) {
-                    return (cffv.compareTo(ClassFileFormatVersion.RELEASE_5) >= 0 ) ?
-                        Location.SET_METHOD:
-                        Location.EMPTY_SET;}
-            }),
+            List.of(Map.entry(RELEASE_4, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_NATIVE}, corresponding to the source
      * modifier {@link Modifier#NATIVE native}, with a mask value of
      * <code>{@value "0x%04x" Modifier#NATIVE}</code>.
      */
-    NATIVE(Modifier.NATIVE, true, Location.SET_METHOD, null),
+    NATIVE(Modifier.NATIVE, true, Location.SET_METHOD, List.of()),
 
     /**
      * The access flag {@code ACC_INTERFACE} with a mask value of
@@ -292,13 +239,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see Class#isInterface()
      */
     INTERFACE(Modifier.INTERFACE, false, Location.SET_CLASS_INNER_CLASS,
-              new Function<ClassFileFormatVersion, Set<Location>>() {
-                  @Override
-                  public Set<Location> apply(ClassFileFormatVersion cffv) {
-                      return (cffv.compareTo(ClassFileFormatVersion.RELEASE_0) == 0 ) ?
-                          Location.SET_CLASS:
-                          Location.SET_CLASS_INNER_CLASS;}
-              }),
+              List.of(Map.entry(RELEASE_0, Location.SET_CLASS))),
 
     /**
      * The access flag {@code ACC_ABSTRACT}, corresponding to the
@@ -307,13 +248,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      */
     ABSTRACT(Modifier.ABSTRACT, true,
              Location.SET_CLASS_METHOD_INNER_CLASS,
-             new Function<ClassFileFormatVersion, Set<Location>>() {
-                 @Override
-                 public Set<Location> apply(ClassFileFormatVersion cffv) {
-                     return (cffv.compareTo(ClassFileFormatVersion.RELEASE_0) == 0 ) ?
-                         Location.SET_CLASS_METHOD:
-                         Location.SET_CLASS_METHOD_INNER_CLASS;}
-             }),
+             List.of(Map.entry(RELEASE_0, Location.SET_CLASS_METHOD))),
 
     /**
      * The access flag {@code ACC_STRICT}, corresponding to the source
@@ -326,14 +261,8 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * corresponding to Java SE 1.2 through 16.
      */
     STRICT(Modifier.STRICT, true, Location.EMPTY_SET,
-             new Function<ClassFileFormatVersion, Set<Location>>() {
-               @Override
-               public Set<Location> apply(ClassFileFormatVersion cffv) {
-                   return (cffv.compareTo(ClassFileFormatVersion.RELEASE_2)  >= 0 &&
-                           cffv.compareTo(ClassFileFormatVersion.RELEASE_16) <= 0) ?
-                       Location.SET_METHOD:
-                       Location.EMPTY_SET;}
-           }),
+           List.of(Map.entry(RELEASE_16, Location.SET_METHOD),
+                   Map.entry(RELEASE_1, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_SYNTHETIC} with a mask value of
@@ -343,21 +272,9 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see java.lang.module.ModuleDescriptor.Modifier#SYNTHETIC
      */
     SYNTHETIC(Modifier.SYNTHETIC, false, Location.SET_SYNTHETIC_9,
-              new Function<ClassFileFormatVersion, Set<Location>>() {
-                  @Override
-                  public Set<Location> apply(ClassFileFormatVersion cffv) {
-                      if (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 )
-                          return Location.SET_SYNTHETIC_9;
-                      else {
-                          return
-                              switch(cffv) {
-                              case RELEASE_7 -> Location.SET_SYNTHETIC_7;
-                              case RELEASE_8 -> Location.SET_SYNTHETIC_8;
-                              default        -> Location.EMPTY_SET;
-                              };
-                      }
-                  }
-              }),
+              List.of(Map.entry(RELEASE_8, Location.SET_SYNTHETIC_8),
+                      Map.entry(RELEASE_7, Location.SET_SYNTHETIC_5),
+                      Map.entry(RELEASE_4, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_ANNOTATION} with a mask value of
@@ -365,13 +282,7 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see Class#isAnnotation()
      */
     ANNOTATION(Modifier.ANNOTATION, false, Location.SET_CLASS_INNER_CLASS,
-               new Function<ClassFileFormatVersion, Set<Location>>() {
-                   @Override
-                   public Set<Location> apply(ClassFileFormatVersion cffv) {
-                       return (cffv.compareTo(ClassFileFormatVersion.RELEASE_5) >= 0 ) ?
-                           Location.SET_CLASS_INNER_CLASS:
-                           Location.EMPTY_SET;}
-               }),
+               List.of(Map.entry(RELEASE_4, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_ENUM} with a mask value of
@@ -379,44 +290,22 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
      * @see Class#isEnum()
      */
     ENUM(Modifier.ENUM, false, Location.SET_CLASS_FIELD_INNER_CLASS,
-         new Function<ClassFileFormatVersion, Set<Location>>() {
-             @Override
-             public Set<Location> apply(ClassFileFormatVersion cffv) {
-                 return (cffv.compareTo(ClassFileFormatVersion.RELEASE_5) >= 0 ) ?
-                     Location.SET_CLASS_FIELD_INNER_CLASS:
-                     Location.EMPTY_SET;}
-         }),
+         List.of(Map.entry(RELEASE_4, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_MANDATED} with a mask value of
      * <code>{@value "0x%04x" Modifier#MANDATED}</code>.
      */
     MANDATED(Modifier.MANDATED, false, Location.SET_MANDATED_9,
-             new Function<ClassFileFormatVersion, Set<Location>>() {
-                 @Override
-                 public Set<Location> apply(ClassFileFormatVersion cffv) {
-                     if (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 ) {
-                         return Location.SET_MANDATED_9;
-                     } else {
-                         return (cffv == ClassFileFormatVersion.RELEASE_8) ?
-                             Location.SET_METHOD_PARAM:
-                             Location.EMPTY_SET;
-                     }
-                 }
-             }),
+             List.of(Map.entry(RELEASE_8, Location.SET_METHOD_PARAM),
+                     Map.entry(RELEASE_7, Location.EMPTY_SET))),
 
     /**
      * The access flag {@code ACC_MODULE} with a mask value of {@code
      * 0x8000}.
      */
     MODULE(0x0000_8000, false, Location.SET_CLASS,
-           new Function<ClassFileFormatVersion, Set<Location>>() {
-               @Override
-               public Set<Location> apply(ClassFileFormatVersion cffv) {
-                   return (cffv.compareTo(ClassFileFormatVersion.RELEASE_9) >= 0 ) ?
-                       Location.SET_CLASS:
-                       Location.EMPTY_SET;}
-           })
+           List.of(Map.entry(RELEASE_8, Location.EMPTY_SET))),
     ;
 
     // May want to override toString for a different enum constant ->
@@ -425,31 +314,31 @@ public Set<Location> apply(ClassFileFormatVersion cffv) {
     private final int mask;
     private final boolean sourceModifier;
 
-    // Intentionally using Set rather than EnumSet since EnumSet is
-    // mutable.
+    // immutable
     private final Set<Location> locations;
-    // Lambda to implement locations(ClassFileFormatVersion cffv)
-    private final Function<ClassFileFormatVersion, Set<Location>> cffvToLocations;
+    // historical locations up to a given version; immutable
+    private final List<Map.Entry<ClassFileFormatVersion, Set<Location>>> historicalLocations;
 
     private AccessFlag(int mask,
                        boolean sourceModifier,
                        Set<Location> locations,
-                       Function<ClassFileFormatVersion, Set<Location>> cffvToLocations) {
+                       List<Map.Entry<ClassFileFormatVersion, Set<Location>>> historicalLocations) {
         this.mask = mask;
         this.sourceModifier = sourceModifier;
         this.locations = locations;
-        this.cffvToLocations = cffvToLocations;
+        this.historicalLocations = Location.ensureHistoryOrdered(historicalLocations);
     }
 
     /**
-     * {@return the corresponding integer mask for the access flag}
+     * {@return the corresponding mask for the access flag}  The mask has
+     * exactly one bit set and is in the range of {@code char}.
      */
     public int mask() {
         return mask;
     }
 
     /**
-     * {@return whether or not the flag has a directly corresponding
+     * {@return whether or not this flag has a directly corresponding
      * modifier in the Java programming language}
      */
     public boolean sourceModifier() {
@@ -457,26 +346,28 @@ public boolean sourceModifier() {
     }
 
     /**
-     * {@return kinds of constructs the flag can be applied to in the
-     * latest class file format version}
+     * {@return locations this flag can be applied to in the current class file
+     * format version}
+     * <p>
+     * This method returns an empty set if this flag is not defined in
+     * the current class file format version.
      */
     public Set<Location> locations() {
         return locations;
     }
 
     /**
-     * {@return kinds of constructs the flag can be applied to in the
-     * given class file format version}
+     * {@return locations this flag can be applied to in the given class file
+     * format version}
+     * <p>
+     * This method returns an empty set if this flag is not defined in
+     * the given {@code cffv}.
+     *
      * @param cffv the class file format version to use
      * @throws NullPointerException if the parameter is {@code null}
      */
     public Set<Location> locations(ClassFileFormatVersion cffv) {
-        Objects.requireNonNull(cffv);
-        if (cffvToLocations == null) {
-            return locations;
-        } else {
-            return cffvToLocations.apply(cffv);
-        }
+        return Location.findInHistory(locations, historicalLocations, cffv);
     }
 
     /**
@@ -489,84 +380,160 @@ public Set<Location> locations(ClassFileFormatVersion cffv) {
      * positions not support for the location in question
      */
     public static Set<AccessFlag> maskToAccessFlags(int mask, Location location) {
-        Set<AccessFlag> result = java.util.EnumSet.noneOf(AccessFlag.class);
-        for (var accessFlag : LocationToFlags.locationToFlags.get(location)) {
-            int accessMask = accessFlag.mask();
-            if ((mask &  accessMask) != 0) {
-                result.add(accessFlag);
-                mask = mask & ~accessMask;
-            }
-        }
-        if (mask != 0) {
+        var definition = findDefinition(location);
+        int flagsMask = location.flagsMask();
+        int parsingMask = location == Location.METHOD ? flagsMask | ACC_STRICT : flagsMask; // flagMask lacks strictfp
+        int unmatchedMask = mask & (~parsingMask);
+        if (unmatchedMask != 0) {
             throw new IllegalArgumentException("Unmatched bit position 0x" +
-                                               Integer.toHexString(mask) +
-                                               " for location " + location);
+                    Integer.toHexString(unmatchedMask) +
+                    " for location " + location);
         }
-        return Collections.unmodifiableSet(result);
+        return new AccessFlagSet(definition, mask);
     }
 
     /**
-     * A location within a class file where flags can be applied.
-     *
-     * Note that since these locations represent class file structures
-     * rather than language structures many language structures, such
+     * A location within a {@code class} file where flags can be applied.
+     * <p>
+     * Note that since these locations represent {@code class} file structures
+     * rather than language structures, many language structures, such
      * as constructors and interfaces, are <em>not</em> present.
      * @since 20
      */
     public enum Location {
         /**
          * Class location.
-         * @jvms 4.1 The ClassFile Structure
+         *
+         * @see Class#accessFlags()
+         * @see ClassModel#flags()
+         * @see Modifier#classModifiers()
+         * @see Modifier#interfaceModifiers()
+         * @jvms 4.1 The {@code ClassFile} Structure
          */
-        CLASS,
+        CLASS(ACC_PUBLIC | ACC_FINAL | ACC_SUPER |
+              ACC_INTERFACE | ACC_ABSTRACT |
+              ACC_SYNTHETIC | ACC_ANNOTATION |
+              ACC_ENUM | ACC_MODULE,
+              List.of(Map.entry(RELEASE_8, // no module
+                                ACC_PUBLIC | ACC_FINAL | ACC_SUPER |
+                                ACC_INTERFACE | ACC_ABSTRACT |
+                                ACC_SYNTHETIC | ACC_ANNOTATION | ACC_ENUM),
+                      Map.entry(RELEASE_4, // no synthetic, annotation, enum
+                                ACC_PUBLIC | ACC_FINAL | ACC_SUPER |
+                                ACC_INTERFACE | ACC_ABSTRACT))),
 
         /**
          * Field location.
+         *
+         * @see Field#accessFlags()
+         * @see FieldModel#flags()
+         * @see Modifier#fieldModifiers()
          * @jvms 4.5 Fields
          */
-        FIELD,
+        FIELD(ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+              ACC_STATIC | ACC_FINAL | ACC_VOLATILE |
+              ACC_TRANSIENT | ACC_SYNTHETIC | ACC_ENUM,
+              List.of(Map.entry(RELEASE_4, // no synthetic, enum
+                                ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                                ACC_STATIC | ACC_FINAL | ACC_VOLATILE |
+                                ACC_TRANSIENT))),
 
         /**
          * Method location.
+         *
+         * @see Executable#accessFlags()
+         * @see MethodModel#flags()
+         * @see Modifier#methodModifiers()
+         * @see Modifier#constructorModifiers()
          * @jvms 4.6 Methods
          */
-        METHOD,
+        METHOD(ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+               ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
+               ACC_BRIDGE | ACC_VARARGS | ACC_NATIVE |
+               ACC_ABSTRACT | ACC_SYNTHETIC,
+               List.of(Map.entry(RELEASE_16, // had strict
+                                 ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                                 ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
+                                 ACC_BRIDGE | ACC_VARARGS | ACC_NATIVE |
+                                 ACC_ABSTRACT | ACC_STRICT | ACC_SYNTHETIC),
+                       Map.entry(RELEASE_4, // no bridge, varargs, synthetic
+                                 ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                                 ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
+                                 ACC_NATIVE | ACC_ABSTRACT | ACC_STRICT),
+                       Map.entry(RELEASE_1, // no strict
+                                 ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                                 ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED |
+                                 ACC_NATIVE | ACC_ABSTRACT))),
 
         /**
          * Inner class location.
-         * @jvms 4.7.6 The InnerClasses Attribute
+         *
+         * @see Class#accessFlags()
+         * @see InnerClassInfo#flags()
+         * @see Modifier#classModifiers()
+         * @see Modifier#interfaceModifiers()
+         * @jvms 4.7.6 The {@code InnerClasses} Attribute
          */
-        INNER_CLASS,
+        INNER_CLASS(ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                    ACC_STATIC | ACC_FINAL | ACC_INTERFACE | ACC_ABSTRACT |
+                    ACC_SYNTHETIC | ACC_ANNOTATION | ACC_ENUM,
+                    List.of(Map.entry(RELEASE_4, // no synthetic, annotation, enum
+                            ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED |
+                            ACC_STATIC | ACC_FINAL | ACC_INTERFACE |
+                            ACC_ABSTRACT),
+                            Map.entry(RELEASE_0, 0))), // did not exist
 
         /**
          * Method parameter location.
-         * @jvms 4.7.24 The MethodParameters Attribute
+         *
+         * @see Parameter#accessFlags()
+         * @see MethodParameterInfo#flags()
+         * @see Modifier#parameterModifiers()
+         * @jvms 4.7.24 The {@code MethodParameters} Attribute
          */
-        METHOD_PARAMETER,
+        METHOD_PARAMETER(ACC_FINAL | ACC_SYNTHETIC | ACC_MANDATED,
+                         List.of(Map.entry(RELEASE_7, 0))),  // did not exist
 
         /**
-         * Module location
-         * @jvms 4.7.25 The Module Attribute
+         * Module location.
+         *
+         * @see ModuleDescriptor#accessFlags()
+         * @see ModuleAttribute#moduleFlags()
+         * @jvms 4.7.25 The {@code Module} Attribute
          */
-        MODULE,
+        MODULE(ACC_OPEN | ACC_SYNTHETIC | ACC_MANDATED,
+               List.of(Map.entry(RELEASE_8, 0))),  // did not exist
 
         /**
-         * Module requires location
-         * @jvms 4.7.25 The Module Attribute
+         * Module requires location.
+         *
+         * @see ModuleDescriptor.Requires#accessFlags()
+         * @see ModuleRequireInfo#requiresFlags()
+         * @jvms 4.7.25 The {@code Module} Attribute
          */
-        MODULE_REQUIRES,
+        MODULE_REQUIRES(ACC_TRANSITIVE | ACC_STATIC_PHASE | ACC_SYNTHETIC | ACC_MANDATED,
+                        List.of(Map.entry(RELEASE_8, 0))),  // did not exist
 
         /**
-         * Module exports location
-         * @jvms 4.7.25 The Module Attribute
+         * Module exports location.
+         *
+         * @see ModuleDescriptor.Exports#accessFlags()
+         * @see ModuleExportInfo#exportsFlags()
+         * @jvms 4.7.25 The {@code Module} Attribute
          */
-        MODULE_EXPORTS,
+        MODULE_EXPORTS(ACC_SYNTHETIC | ACC_MANDATED,
+                       List.of(Map.entry(RELEASE_8, 0))),  // did not exist
 
         /**
-         * Module opens location
-         * @jvms 4.7.25 The Module Attribute
+         * Module opens location.
+         *
+         * @see ModuleDescriptor.Opens#accessFlags()
+         * @see ModuleOpenInfo#opensFlags()
+         * @jvms 4.7.25 The {@code Module} Attribute
          */
-        MODULE_OPENS;
+        MODULE_OPENS(ACC_SYNTHETIC | ACC_MANDATED,
+                     List.of(Map.entry(RELEASE_8, 0))),  // did not exist
+        ;
 
         // Repeated sets of locations used by AccessFlag constants
         private static final Set<Location> EMPTY_SET = Set.of();
@@ -593,20 +560,18 @@ public enum Location {
             Set.of(CLASS, INNER_CLASS);
         private static final Set<Location> SET_MODULE_REQUIRES =
             Set.of(MODULE_REQUIRES);
-        private static final Set<Location> SET_PUBLIC_1 =
-            Set.of(CLASS, FIELD, METHOD, INNER_CLASS);
         private static final Set<Location> SET_FINAL_8 =
             Set.of(CLASS, FIELD, METHOD,
                    INNER_CLASS,     /* added in 1.1 */
                    METHOD_PARAMETER); /* added in 8 */
-        private static final Set<Location> SET_SYNTHETIC_7 =
+        private static final Set<Location> SET_SYNTHETIC_5 =
               Set.of(CLASS, FIELD, METHOD,
                      INNER_CLASS);
         private static final Set<Location> SET_SYNTHETIC_8 =
               Set.of(CLASS, FIELD, METHOD,
                      INNER_CLASS, METHOD_PARAMETER);
         private static final Set<Location> SET_SYNTHETIC_9 =
-              // Added as an access flag in 7
+              // Added as an access flag in 5.0
               Set.of(CLASS, FIELD, METHOD,
                      INNER_CLASS,
                      METHOD_PARAMETER, // Added in 8
@@ -618,37 +583,227 @@ public enum Location {
                    // Starting in 9
                    MODULE, MODULE_REQUIRES,
                    MODULE_EXPORTS, MODULE_OPENS);
+
+        private final int flagsMask;
+        private final List<Map.Entry<ClassFileFormatVersion, Integer>> historicalFlagsMasks;
+
+        Location(int flagsMask,
+                 List<Map.Entry<ClassFileFormatVersion, Integer>> historicalFlagsMasks) {
+            this.flagsMask = flagsMask;
+            this.historicalFlagsMasks = ensureHistoryOrdered(historicalFlagsMasks);
+        }
+
+        // Ensures the historical versions are from newest to oldest and do not include the latest
+        // These 2 utilities reside in Location because Location must be initialized before AccessFlag
+        private static <T> List<Map.Entry<ClassFileFormatVersion, T>> ensureHistoryOrdered(
+                List<Map.Entry<ClassFileFormatVersion, T>> history) {
+            ClassFileFormatVersion lastVersion = ClassFileFormatVersion.latest();
+            for (var e : history) {
+                var historyVersion = e.getKey();
+                if (lastVersion.compareTo(historyVersion) <= 0) {
+                    throw new IllegalArgumentException("Versions out of order");
+                }
+                lastVersion = historyVersion;
+            }
+            return history;
+        }
+
+        private static <T> T findInHistory(T candidate, List<Map.Entry<ClassFileFormatVersion, T>> history,
+                                           ClassFileFormatVersion cffv) {
+            Objects.requireNonNull(cffv);
+            for (var e : history) {
+                if (e.getKey().compareTo(cffv) < 0) {
+                    // last version found was valid
+                    return candidate;
+                }
+                candidate = e.getValue();
+            }
+            return candidate;
+        }
+
+        /**
+         * {@return the union of masks of all access flags defined for
+         * this location in the current class file format version}
+         * <p>
+         * This method returns {@code 0} if this location does not exist in
+         * the current class file format version.
+         *
+         * @since 25
+         */
+        public int flagsMask() {
+            return flagsMask;
+        }
+
+        /**
+         * {@return the union of masks of all access flags defined for
+         * this location in the given class file format version}
+         * <p>
+         * This method returns {@code 0} if this location does not exist in
+         * the given {@code cffv}.
+         *
+         * @param cffv the class file format version
+         * @throws NullPointerException if {@code cffv} is {@code null}
+         * @since 25
+         */
+        public int flagsMask(ClassFileFormatVersion cffv) {
+            return findInHistory(flagsMask, historicalFlagsMasks, cffv);
+        }
+
+        /**
+         * {@return the set of access flags defined for this location in the
+         * current class file format version}  The set is immutable.
+         * <p>
+         * This method returns an empty set if this location does not exist
+         * in the current class file format version.
+         *
+         * @since 25
+         */
+        public Set<AccessFlag> flags() {
+            return new AccessFlagSet(findDefinition(this), flagsMask());
+        }
+
+        /**
+         * {@return the set of access flags defined for this location in the
+         * given class file format version}  The set is immutable.
+         * <p>
+         * This method returns an empty set if this location does not exist
+         * in the given {@code cffv}.
+         *
+         * @param cffv the class file format version
+         * @throws NullPointerException if {@code cffv} is {@code null}
+         * @since 25
+         */
+        public Set<AccessFlag> flags(ClassFileFormatVersion cffv) {
+            // implicit null check cffv
+            return new AccessFlagSet(findDefinition(this), flagsMask(cffv));
+        }
+    }
+
+    private static AccessFlag[] createDefinition(AccessFlag... known) {
+        var ret = new AccessFlag[Character.SIZE];
+        for (var flag : known) {
+            var mask = flag.mask;
+            int pos = Integer.numberOfTrailingZeros(mask);
+            assert ret[pos] == null : ret[pos] + " " + flag;
+            ret[pos] = flag;
+        }
+        return ret;
+    }
+
+    // Will take extra args in the future for valhalla switch
+    private static AccessFlag[] findDefinition(Location location) {
+        return switch (location) {
+            case CLASS -> CLASS_FLAGS;
+            case FIELD -> FIELD_FLAGS;
+            case METHOD -> METHOD_FLAGS;
+            case INNER_CLASS -> INNER_CLASS_FLAGS;
+            case METHOD_PARAMETER -> METHOD_PARAMETER_FLAGS;
+            case MODULE -> MODULE_FLAGS;
+            case MODULE_REQUIRES -> MODULE_REQUIRES_FLAGS;
+            case MODULE_EXPORTS -> MODULE_EXPORTS_FLAGS;
+            case MODULE_OPENS -> MODULE_OPENS_FLAGS;
+        };
     }
 
-    private static class LocationToFlags {
-        private static Map<Location, Set<AccessFlag>> locationToFlags =
-            Map.ofEntries(entry(Location.CLASS,
-                                Set.of(PUBLIC, FINAL, SUPER,
-                                       INTERFACE, ABSTRACT,
-                                       SYNTHETIC, ANNOTATION,
-                                       ENUM, AccessFlag.MODULE)),
-                          entry(Location.FIELD,
-                                Set.of(PUBLIC, PRIVATE, PROTECTED,
-                                       STATIC, FINAL, VOLATILE,
-                                       TRANSIENT, SYNTHETIC, ENUM)),
-                          entry(Location.METHOD,
-                                Set.of(PUBLIC, PRIVATE, PROTECTED,
-                                       STATIC, FINAL, SYNCHRONIZED,
-                                       BRIDGE, VARARGS, NATIVE,
-                                       ABSTRACT, STRICT, SYNTHETIC)),
-                          entry(Location.INNER_CLASS,
-                                Set.of(PUBLIC, PRIVATE, PROTECTED,
-                                       STATIC, FINAL, INTERFACE, ABSTRACT,
-                                       SYNTHETIC, ANNOTATION, ENUM)),
-                          entry(Location.METHOD_PARAMETER,
-                                Set.of(FINAL, SYNTHETIC, MANDATED)),
-                          entry(Location.MODULE,
-                                Set.of(OPEN, SYNTHETIC, MANDATED)),
-                          entry(Location.MODULE_REQUIRES,
-                                Set.of(TRANSITIVE, STATIC_PHASE, SYNTHETIC, MANDATED)),
-                          entry(Location.MODULE_EXPORTS,
-                                Set.of(SYNTHETIC, MANDATED)),
-                          entry(Location.MODULE_OPENS,
-                                Set.of(SYNTHETIC, MANDATED)));
+    private static final @Stable AccessFlag[] // Can use stable array and lazy init in the future
+            CLASS_FLAGS = createDefinition(PUBLIC, FINAL, SUPER, INTERFACE, ABSTRACT, SYNTHETIC, ANNOTATION, ENUM, MODULE),
+            FIELD_FLAGS = createDefinition(PUBLIC, PRIVATE, PROTECTED, STATIC, FINAL, VOLATILE, TRANSIENT, SYNTHETIC, ENUM),
+            METHOD_FLAGS = createDefinition(PUBLIC, PRIVATE, PROTECTED, STATIC, FINAL, SYNCHRONIZED, BRIDGE, VARARGS, NATIVE, ABSTRACT, STRICT, SYNTHETIC),
+            INNER_CLASS_FLAGS = createDefinition(PUBLIC, PRIVATE, PROTECTED, STATIC, FINAL, INTERFACE, ABSTRACT, SYNTHETIC, ANNOTATION, ENUM),
+            METHOD_PARAMETER_FLAGS = createDefinition(FINAL, SYNTHETIC, MANDATED),
+            MODULE_FLAGS = createDefinition(OPEN, SYNTHETIC, MANDATED),
+            MODULE_REQUIRES_FLAGS = createDefinition(TRANSITIVE, STATIC_PHASE, SYNTHETIC, MANDATED),
+            MODULE_EXPORTS_FLAGS = createDefinition(SYNTHETIC, MANDATED),
+            MODULE_OPENS_FLAGS = createDefinition(SYNTHETIC, MANDATED);
+
+    private static int undefinedMask(AccessFlag[] definition, int mask) {
+        assert definition.length == Character.SIZE;
+        int definedMask = 0;
+        for (int i = 0; i < Character.SIZE; i++) {
+            if (definition[i] != null) {
+                definedMask |= 1 << i;
+            }
+        }
+        return mask & ~definedMask;
+    }
+
+    private static final class AccessFlagSet extends AbstractSet<AccessFlag> {
+        private final @Stable AccessFlag[] definition;
+        private final int mask;
+
+        // all mutating methods throw UnsupportedOperationException
+        @Override public boolean add(AccessFlag e) { throw uoe(); }
+        @Override public boolean addAll(Collection<? extends AccessFlag> c) { throw uoe(); }
+        @Override public void    clear() { throw uoe(); }
+        @Override public boolean remove(Object o) { throw uoe(); }
+        @Override public boolean removeAll(Collection<?> c) { throw uoe(); }
+        @Override public boolean removeIf(Predicate<? super AccessFlag> filter) { throw uoe(); }
+        @Override public boolean retainAll(Collection<?> c) { throw uoe(); }
+        private static UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
+
+        private AccessFlagSet(AccessFlag[] definition, int mask) {
+            assert undefinedMask(definition, mask) == 0 : mask;
+            this.definition = definition;
+            this.mask = mask;
+        }
+
+        @Override
+        public Iterator<AccessFlag> iterator() {
+            return new AccessFlagIterator(definition, mask);
+        }
+
+        @Override
+        public void forEach(Consumer<? super AccessFlag> action) {
+            Objects.requireNonNull(action); // in case of empty
+            for (int i = 0; i < Character.SIZE; i++) {
+                if ((mask & (1 << i)) != 0) {
+                    action.accept(definition[i]);
+                }
+            }
+        }
+
+        private static final class AccessFlagIterator implements Iterator<AccessFlag> {
+            private final @Stable AccessFlag[] definition;
+            private int remainingMask;
+
+            private AccessFlagIterator(AccessFlag[] definition, int remainingMask) {
+                this.definition = definition;
+                this.remainingMask = remainingMask;
+            }
+
+            @Override
+            public boolean hasNext() {
+                return remainingMask != 0;
+            }
+
+            @Override
+            public AccessFlag next() {
+                int flagBit = Integer.lowestOneBit(remainingMask);
+                if (flagBit == 0) {
+                    throw new NoSuchElementException();
+                }
+                remainingMask &= ~flagBit;
+                return definition[Integer.numberOfTrailingZeros(flagBit)];
+            }
+        }
+
+        @Override
+        public int size() {
+            return Integer.bitCount(mask);
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            if (Objects.requireNonNull(o) instanceof AccessFlag flag) {
+                int bit = flag.mask;
+                return (bit & mask) != 0 && definition[Integer.numberOfTrailingZeros(bit)] == flag;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return mask == 0;
+        }
     }
 }
diff --git a/src/java.base/share/classes/java/lang/reflect/Modifier.java b/src/java.base/share/classes/java/lang/reflect/Modifier.java
index 1b7bc3bf65b..624f32b4e04 100644
--- a/src/java.base/share/classes/java/lang/reflect/Modifier.java
+++ b/src/java.base/share/classes/java/lang/reflect/Modifier.java
@@ -448,6 +448,8 @@ static boolean isMandated(int mod) {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to a class.
      *
+     * @see AccessFlag.Location#CLASS
+     * @see AccessFlag.Location#INNER_CLASS
      * @jls 8.1.1 Class Modifiers
      * @since 1.7
      */
@@ -461,6 +463,8 @@ public static int classModifiers() {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to an interface.
      *
+     * @see AccessFlag.Location#CLASS
+     * @see AccessFlag.Location#INNER_CLASS
      * @jls 9.1.1 Interface Modifiers
      * @since 1.7
      */
@@ -474,6 +478,7 @@ public static int interfaceModifiers() {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to a constructor.
      *
+     * @see AccessFlag.Location#METHOD
      * @jls 8.8.3 Constructor Modifiers
      * @since 1.7
      */
@@ -487,6 +492,7 @@ public static int constructorModifiers() {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to a method.
      *
+     * @see AccessFlag.Location#METHOD
      * @jls 8.4.3 Method Modifiers
      * @since 1.7
      */
@@ -500,6 +506,7 @@ public static int methodModifiers() {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to a field.
      *
+     * @see AccessFlag.Location#FIELD
      * @jls 8.3.1 Field Modifiers
      * @since 1.7
      */
@@ -513,6 +520,7 @@ public static int fieldModifiers() {
      * @return an {@code int} value OR-ing together the source language
      * modifiers that can be applied to a parameter.
      *
+     * @see AccessFlag.Location#METHOD_PARAMETER
      * @jls 8.4.1 Formal Parameters
      * @since 1.8
      */
diff --git a/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java
index 12eeeb45c6e..d87f60a0a1a 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.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
@@ -158,5 +158,20 @@ private static void testLocationsNullHandling() {
                 ; // Expected
             }
         }
+
+        for (var location : AccessFlag.Location.values()) {
+            try {
+                location.flags(null);
+                throw new RuntimeException("Did not get NPE on " + location + ".flags(null)");
+            } catch (NullPointerException npe ) {
+                ; // Expected
+            }
+            try {
+                location.flagsMask(null);
+                throw new RuntimeException("Did not get NPE on " + location + ".flagsMask(null)");
+            } catch (NullPointerException npe ) {
+                ; // Expected
+            }
+        }
     }
 }
diff --git a/test/jdk/java/lang/reflect/AccessFlag/ClassAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/ClassAccessFlagTest.java
index 10ebfd6aff2..1c80c29dc9b 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/ClassAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/ClassAccessFlagTest.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
@@ -31,6 +31,8 @@
 import java.lang.reflect.*;
 import java.util.*;
 
+import static java.lang.reflect.AccessFlag.*;
+
 /*
  * Class access flags that can directly or indirectly declared in
  * source include:
@@ -47,7 +49,7 @@
  * file. Therefore, this test does not attempt to probe the setting of
  * that access flag.
  */
-@ExpectedClassFlags("[PUBLIC, FINAL, SUPER]")
+@ExpectedClassFlags({PUBLIC, FINAL, SUPER})
 public final class ClassAccessFlagTest {
     public static void main(String... args) {
         // Top-level and auxiliary classes; i.e. non-inner classes
@@ -76,10 +78,12 @@ private static void checkClass(Class<?> clazz) {
         ExpectedClassFlags expected =
             clazz.getAnnotation(ExpectedClassFlags.class);
         if (expected != null) {
-            String actual = clazz.accessFlags().toString();
-            if (!expected.value().equals(actual)) {
+            Set<AccessFlag> base = EnumSet.noneOf(AccessFlag.class);
+            Collections.addAll(base, expected.value());
+            Set<AccessFlag> actual = clazz.accessFlags();
+            if (!base.equals(actual)) {
                 throw new RuntimeException("On " + clazz +
-                                           " expected " + expected.value() +
+                                           " expected " + base +
                                            " got " + actual);
             }
         }
@@ -98,7 +102,7 @@ private static void checkPrimitives() {
             void.class // same access flag rules
         };
 
-        var expected = Set.of(AccessFlag.PUBLIC,
+        var expected = Set.of(PUBLIC,
                               AccessFlag.FINAL,
                               AccessFlag.ABSTRACT);
 
@@ -127,8 +131,8 @@ private static void checkArrays() {
         for (var accessClass : accessClasses) {
             AccessFlag accessLevel;
             var flags = accessClass.accessFlags();
-            if (flags.contains(AccessFlag.PUBLIC))
-                accessLevel = AccessFlag.PUBLIC;
+            if (flags.contains(PUBLIC))
+                accessLevel = PUBLIC;
             else if (flags.contains(AccessFlag.PROTECTED))
                 accessLevel = AccessFlag.PROTECTED;
             else if (flags.contains(AccessFlag.PRIVATE))
@@ -145,7 +149,7 @@ else if (flags.contains(AccessFlag.PRIVATE))
                 }
             } else {
                 if (containsAny(arrayClass.accessFlags(),
-                                Set.of(AccessFlag.PUBLIC,
+                                Set.of(PUBLIC,
                                        AccessFlag.PROTECTED,
                                        AccessFlag.PRIVATE))) {
                     throw new RuntimeException("Unexpected access flags on " +
@@ -161,32 +165,32 @@ else if (flags.contains(AccessFlag.PRIVATE))
     // PUBLIC, PRIVATE, PROTECTED, STATIC, FINAL, INTERFACE, ABSTRACT,
     // SYNTHETIC, ANNOTATION, ENUM.
 
-    @ExpectedClassFlags("[PUBLIC, STATIC, INTERFACE, ABSTRACT]")
+    @ExpectedClassFlags({PUBLIC, STATIC, INTERFACE, ABSTRACT})
     public      interface PublicInterface {}
-    @ExpectedClassFlags("[PROTECTED, STATIC, INTERFACE, ABSTRACT]")
+    @ExpectedClassFlags({PROTECTED, STATIC, INTERFACE, ABSTRACT})
     protected   interface ProtectedInterface {}
-    @ExpectedClassFlags("[PRIVATE, STATIC, INTERFACE, ABSTRACT]")
+    @ExpectedClassFlags({PRIVATE, STATIC, INTERFACE, ABSTRACT})
     private     interface PrivateInterface {}
-    @ExpectedClassFlags("[STATIC, INTERFACE, ABSTRACT]")
+    @ExpectedClassFlags({STATIC, INTERFACE, ABSTRACT})
     /*package*/ interface PackageInterface {}
 
-    @ExpectedClassFlags("[FINAL]")
+    @ExpectedClassFlags({FINAL})
     /*package*/ final class TestFinalClass {}
 
-    @ExpectedClassFlags("[ABSTRACT]")
+    @ExpectedClassFlags({ABSTRACT})
     /*package*/ abstract class TestAbstractClass {}
 
-    @ExpectedClassFlags("[STATIC, INTERFACE, ABSTRACT, ANNOTATION]")
+    @ExpectedClassFlags({STATIC, INTERFACE, ABSTRACT, ANNOTATION})
     /*package*/ @interface TestMarkerAnnotation {}
 
-    @ExpectedClassFlags("[PUBLIC, STATIC, FINAL, ENUM]")
+    @ExpectedClassFlags({PUBLIC, STATIC, FINAL, ENUM})
     public enum MetaSynVar {
         QUUX;
     }
 
     // Is there is at least one special enum constant, the enum class
     // itself is implicitly abstract rather than final.
-    @ExpectedClassFlags("[PROTECTED, STATIC, ABSTRACT, ENUM]")
+    @ExpectedClassFlags({PROTECTED, STATIC, ABSTRACT, ENUM})
     protected enum MetaSynVar2 {
         WOMBAT{
             @Override
@@ -195,24 +199,24 @@ protected enum MetaSynVar2 {
         public abstract int foo();
     }
 
-    @ExpectedClassFlags("[PRIVATE, ABSTRACT]")
+    @ExpectedClassFlags({PRIVATE, ABSTRACT})
     private abstract class Foo {}
 
-    @ExpectedClassFlags("[STATIC, INTERFACE, ABSTRACT]")
+    @ExpectedClassFlags({STATIC, INTERFACE, ABSTRACT})
     interface StaticTestInterface {}
 }
 
 @Retention(RetentionPolicy.RUNTIME)
-@ExpectedClassFlags("[INTERFACE, ABSTRACT, ANNOTATION]")
+@ExpectedClassFlags({INTERFACE, ABSTRACT, ANNOTATION})
 @interface ExpectedClassFlags {
-    String value();
+    AccessFlag[] value();
 }
 
-@ExpectedClassFlags("[INTERFACE, ABSTRACT]")
+@ExpectedClassFlags({INTERFACE, ABSTRACT})
 interface TestInterface {}
 
 
-@ExpectedClassFlags("[FINAL, SUPER, ENUM]")
+@ExpectedClassFlags({FINAL, SUPER, ENUM})
 enum TestOuterEnum {
     INSTANCE;
 }
diff --git a/test/jdk/java/lang/reflect/AccessFlag/FieldAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/FieldAccessFlagTest.java
index edd35f7b6a3..ab12bc75e16 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/FieldAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/FieldAccessFlagTest.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,6 +29,11 @@
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import static java.lang.reflect.AccessFlag.*;
 
 /*
  * Field modifiers include:
@@ -54,39 +59,41 @@ private static void checkField(Field field) {
         ExpectedFieldFlags expected =
             field.getAnnotation(ExpectedFieldFlags.class);
         if (expected != null) {
-            String actual = field.accessFlags().toString();
-            if (!expected.value().equals(actual)) {
+            Set<AccessFlag> base = EnumSet.noneOf(AccessFlag.class);
+            Collections.addAll(base, expected.value());
+            Set<AccessFlag> actual = field.accessFlags();
+            if (!base.equals(actual)) {
                 throw new RuntimeException("On " + field +
-                                           " expected " + expected.value() +
-                                           " got " + actual);
+                        " expected " + base +
+                        " got " + actual);
             }
         }
     }
 
     // Fields
-    @ExpectedFieldFlags("[PUBLIC, STATIC, FINAL]")
+    @ExpectedFieldFlags({PUBLIC, STATIC, FINAL})
     public static final String f1 = "foo";
 
-    @ExpectedFieldFlags("[PRIVATE, VOLATILE, TRANSIENT]")
+    @ExpectedFieldFlags({PRIVATE, VOLATILE, TRANSIENT})
     private volatile transient String secret = "xxyzzy";
 
-    @ExpectedFieldFlags("[PROTECTED]")
+    @ExpectedFieldFlags({PROTECTED})
     protected String meadow = "";
 
     // Enum constant should have the enum access flag set
     static enum MetaSynVar {
-        @ExpectedFieldFlags("[PUBLIC, STATIC, FINAL, ENUM]")
+        @ExpectedFieldFlags({PUBLIC, STATIC, FINAL, ENUM})
         FOO,
 
-        @ExpectedFieldFlags("[PUBLIC, STATIC, FINAL, ENUM]")
+        @ExpectedFieldFlags({PUBLIC, STATIC, FINAL, ENUM})
         BAR;
 
-        @ExpectedFieldFlags("[PRIVATE]") // no "ENUM"
+        @ExpectedFieldFlags({PRIVATE}) // no "ENUM"
         private int field = 0;
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     private @interface ExpectedFieldFlags {
-        String value();
+        AccessFlag[] value();
     }
 }
diff --git a/test/jdk/java/lang/reflect/AccessFlag/MethodAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/MethodAccessFlagTest.java
index a6f65aa31e6..91296727f96 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/MethodAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/MethodAccessFlagTest.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
@@ -34,6 +34,11 @@
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import static java.lang.reflect.AccessFlag.*;
 
 /*
  * Method modifiers include:
@@ -49,7 +54,7 @@
  * Method parameters can be final, synthetic, and mandated.
  */
 public abstract class MethodAccessFlagTest {
-    @ExpectedMethodFlags("[PUBLIC, STATIC, VARARGS]")
+    @ExpectedMethodFlags({PUBLIC, STATIC, VARARGS})
     public static void main(String... args) {
         for (var ctor :
                  MethodAccessFlagTest.class.getDeclaredConstructors()) {
@@ -136,11 +141,17 @@ enum TestEnum {
     }
 
     private static void checkExecutable(Executable method) {
-        ExpectedMethodFlags emf =
+        ExpectedMethodFlags expected =
             method.getAnnotation(ExpectedMethodFlags.class);
-        if (emf != null) {
-            String actual = method.accessFlags().toString();
-            checkString(method.toString(), emf.value(), actual);
+        if (expected != null) {
+            Set<AccessFlag> base = EnumSet.noneOf(AccessFlag.class);
+            Collections.addAll(base, expected.value());
+            Set<AccessFlag> actual = method.accessFlags();
+            if (!base.equals(actual)) {
+                throw new RuntimeException("On " + method +
+                        " expected " + base +
+                        " got " + actual);
+            }
         }
     }
 
@@ -155,33 +166,33 @@ private static void checkString(String declaration,
     }
 
     // Constructors
-    @ExpectedMethodFlags("[PUBLIC]")
+    @ExpectedMethodFlags({PUBLIC})
     public MethodAccessFlagTest() {}
 
-    @ExpectedMethodFlags("[PROTECTED]")
+    @ExpectedMethodFlags({PROTECTED})
     protected MethodAccessFlagTest(int i) {super();}
 
-    @ExpectedMethodFlags("[PRIVATE]")
+    @ExpectedMethodFlags({PRIVATE})
     private MethodAccessFlagTest(String s) {super();}
 
     // Methods
-    @ExpectedMethodFlags("[PROTECTED, SYNCHRONIZED]")
+    @ExpectedMethodFlags({PROTECTED, SYNCHRONIZED})
     protected synchronized void m0() {}
 
-    @ExpectedMethodFlags("[PRIVATE]")
+    @ExpectedMethodFlags({PRIVATE})
     private void m1() {}
 
-    @ExpectedMethodFlags("[ABSTRACT]")
+    @ExpectedMethodFlags({ABSTRACT})
     abstract void m2();
 
-    @ExpectedMethodFlags("[PUBLIC, FINAL]")
+    @ExpectedMethodFlags({PUBLIC, FINAL})
     public final void m3() {}
 
-    @ExpectedMethodFlags("[NATIVE]")
+    @ExpectedMethodFlags({NATIVE})
     native void m4();
 
     @Retention(RetentionPolicy.RUNTIME)
     private @interface ExpectedMethodFlags {
-        String value();
+        AccessFlag[] value();
     }
 }
diff --git a/test/jdk/java/lang/reflect/AccessFlag/StrictAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/StrictAccessFlagTest.java
index 53a133b57b8..1c2d6d01df0 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/StrictAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/StrictAccessFlagTest.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
@@ -35,6 +35,11 @@
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import static java.lang.reflect.AccessFlag.*;
 
 /*
  * Test expected value of ACC_STRICT access flag.
@@ -42,7 +47,7 @@
 // Declaring the class strictfp implicitly sets ACC_STRICT on all its
 // methods and constructors.
 public strictfp class StrictAccessFlagTest {
-    @ExpectedFlags("[PUBLIC, STATIC, VARARGS, STRICT]")
+    @ExpectedFlags({PUBLIC, STATIC, VARARGS, STRICT})
     public static void main(String... args) {
         for (var ctor :
                  StrictAccessFlagTest.class.getDeclaredConstructors()) {
@@ -59,21 +64,23 @@ private static void checkExecutable(Executable method) {
         ExpectedFlags expected =
             method.getAnnotation(ExpectedFlags.class);
         if (expected != null) {
-            String actual = method.accessFlags().toString();
-            if (!expected.value().equals(actual)) {
+            Set<AccessFlag> base = EnumSet.noneOf(AccessFlag.class);
+            Collections.addAll(base, expected.value());
+            Set<AccessFlag> actual = method.accessFlags();
+            if (!base.equals(actual)) {
                 throw new RuntimeException("On " + method +
-                                           " expected " + expected.value() +
-                                           " got " + actual);
+                        " expected " + base +
+                        " got " + actual);
             }
         }
     }
 
     // Constructor
-    @ExpectedFlags("[PUBLIC, STRICT]")
+    @ExpectedFlags({PUBLIC, STRICT})
     public StrictAccessFlagTest() {}
 
     @Retention(RetentionPolicy.RUNTIME)
     private @interface ExpectedFlags {
-        String value();
+        AccessFlag[] value();
     }
 }
diff --git a/test/jdk/java/lang/reflect/AccessFlag/VersionedLocationsTest.java b/test/jdk/java/lang/reflect/AccessFlag/VersionedLocationsTest.java
index 353edb7852a..29130cbec38 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/VersionedLocationsTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/VersionedLocationsTest.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
@@ -24,7 +24,8 @@
 /*
  * @test
  * @bug 8289106 8293627
- * @summary Tests of AccessFlag.locations(ClassFileFormatVersion)
+ * @summary Tests of AccessFlag.locations(ClassFileFormatVersion) and
+ *          accessors on AccessFlag.Location
  */
 
 import java.lang.reflect.AccessFlag;
@@ -79,6 +80,8 @@ public static void main(String... args) throws Exception {
         testSynthetic();
         testStrict();
         testLatestMatch();
+        testFlagVersionConsistency();
+        testLocationMaskFlagConsistency();
     }
 
     /**
@@ -241,12 +244,13 @@ private static void testTwoStepAccessFlags() {
     private static void testSynthetic() {
         for (var cffv : ClassFileFormatVersion.values()) {
             Set<AccessFlag.Location> expected;
-            if (cffv.compareTo(ClassFileFormatVersion.RELEASE_6) <= 0) {
+            if (cffv.compareTo(ClassFileFormatVersion.RELEASE_5) < 0) {
                 expected = Set.of();
             } else {
                 expected =
                     switch(cffv) {
-                        case RELEASE_7 -> Set.of(Location.CLASS, Location.FIELD,
+                        case RELEASE_5, RELEASE_6,
+                             RELEASE_7 -> Set.of(Location.CLASS, Location.FIELD,
                                                  Location.METHOD,
                                                  Location.INNER_CLASS);
                         case RELEASE_8 -> Set.of(Location.CLASS, Location.FIELD,
@@ -285,4 +289,47 @@ private static void testLatestMatch() {
         }
     }
 
+    private static void testFlagVersionConsistency() {
+        for (var flag : AccessFlag.values()) {
+            for (var location : AccessFlag.Location.values()) {
+                if (location.flags().contains(flag) != flag.locations().contains(location)) {
+                    throw new RuntimeException(String.format("AccessFlag and Location inconsistency:" +
+                            "flag %s and location %s are inconsistent for the latest version"));
+                }
+            }
+        }
+        for (var cffv : ClassFileFormatVersion.values()) {
+            for (var flag : AccessFlag.values()) {
+                for (var location : AccessFlag.Location.values()) {
+                    if (location.flags(cffv).contains(flag) != flag.locations(cffv).contains(location)) {
+                        throw new RuntimeException(String.format("AccessFlag and Location inconsistency:" +
+                                "flag %s and location %s are inconsistent for class file version %s"));
+                    }
+                }
+            }
+        }
+    }
+
+    private static void testLocationMaskFlagConsistency() {
+        for (var location : AccessFlag.Location.values()) {
+            if (!flagsAndMaskMatch(location.flags(), location.flagsMask())) {
+                throw new RuntimeException(String.format("Flags and mask mismatch for %s", location));
+            }
+            for (var cffv : ClassFileFormatVersion.values()) {
+                if (!flagsAndMaskMatch(location.flags(cffv), location.flagsMask(cffv))) {
+                    throw new RuntimeException(String.format("Flags and mask mismatch for %s in %s", location, cffv));
+                }
+            }
+        }
+    }
+
+    private static boolean flagsAndMaskMatch(Set<AccessFlag> flags, int mask) {
+        for (var flag : flags) {
+            int bit = flag.mask();
+            if (((mask & bit) == 0))
+                return false;
+            mask &= ~bit;
+        }
+        return mask == 0;
+    }
 }
diff --git a/test/jdk/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java
index 1a4e5503f63..1c997a4b26a 100644
--- a/test/jdk/java/util/Collection/MOAT.java
+++ b/test/jdk/java/util/Collection/MOAT.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
@@ -138,6 +138,8 @@ public static void realMain(String[] args) {
 
         // Unmodifiable wrappers
         testImmutableSet(unmodifiableSet(new HashSet<>(Arrays.asList(1,2,3))), 99);
+        testImmutableSet(AccessFlag.maskToAccessFlags(0, AccessFlag.Location.CLASS), AccessFlag.ABSTRACT);
+        testImmutableSet(AccessFlag.maskToAccessFlags(Modifier.PUBLIC | Modifier.STATIC | Modifier.SYNCHRONIZED, AccessFlag.Location.METHOD), AccessFlag.ABSTRACT);
         testImmutableList(unmodifiableList(Arrays.asList(1,2,3)));
         testImmutableMap(unmodifiableMap(Collections.singletonMap(1,2)));
         testImmutableSeqColl(unmodifiableSequencedCollection(Arrays.asList(1,2,3)), 99);
@@ -478,6 +480,8 @@ private static <T> void testImmutableCollection(final Collection<T> c, T t) {
                    () -> c.remove(first),
                    () -> c.removeAll(singleton(first)),
                    () -> c.retainAll(emptyList()));
+        } else {
+            testEmptyIterator(c.iterator());
         }
         testForEachMatch(c);
         testSpliteratorMatch(c);

From 1a9a9288a6c1a58e1678cf0abae75bcf84e1f6af Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 30 Apr 2025 01:14:51 +0000
Subject: [PATCH 199/901] 8355651: Issues with post-image hook

Reviewed-by: almatvee
---
 .../jpackage/internal/LinuxDebBundler.java    |  12 +-
 .../jpackage/internal/LinuxRpmBundler.java    |  11 +-
 .../jdk/jpackage/internal/MacDmgBundler.java  |  20 +-
 .../jdk/jpackage/internal/MacPkgBundler.java  | 110 +++--
 .../resources/MacResources.properties         |   1 -
 .../resources/MainResources.properties        |   2 +
 .../jdk/jpackage/internal/WinMsiBundler.java  |  17 +-
 .../resources/WinResources.properties         |   1 -
 .../jdk/jpackage/test/TKitTest.java           |   6 +-
 .../helpers/jdk/jpackage/test/Comm.java       |   6 +-
 .../jdk/jpackage/test/JPackageUserScript.java | 435 ++++++++++++++++++
 .../jdk/jpackage/test/LinuxHelper.java        |   4 +-
 .../helpers/jdk/jpackage/test/TKit.java       |  30 +-
 test/jdk/tools/jpackage/share/BasicTest.java  |   4 +-
 .../jpackage/share/PostImageScriptTest.java   | 276 +++++++++++
 .../tools/jpackage/windows/WinScriptTest.java |  32 +-
 16 files changed, 853 insertions(+), 114 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
 create mode 100644 test/jdk/tools/jpackage/share/PostImageScriptTest.java

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 436d414cac1..1c1c27075c1 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
@@ -494,13 +494,21 @@ private Path getConfig_CopyrightFile(Map<String, ? super Object> params) {
 
     private Path buildDeb(Map<String, ? super Object> params,
             Path outdir) throws IOException {
+
+        PlatformPackage thePackage = createMetaPackage(params);
+
+        new ScriptRunner()
+              .setDirectory(thePackage.sourceRoot())
+              .setResourceCategoryId("resource.post-app-image-script")
+              .setScriptNameSuffix("post-image")
+              .setEnvironmentVariable("JpAppImageDir", thePackage.sourceRoot().toAbsolutePath().toString())
+              .run(params);
+
         Path outFile = outdir.resolve(
                 FULL_PACKAGE_NAME.fetchFrom(params)+".deb");
         Log.verbose(MessageFormat.format(I18N.getString(
                 "message.outputting-to-location"), outFile.toAbsolutePath().toString()));
 
-        PlatformPackage thePackage = createMetaPackage(params);
-
         List<String> cmdline = new ArrayList<>();
         cmdline.addAll(List.of(TOOL_FAKEROOT, TOOL_DPKG_DEB));
         if (Log.isVerbose()) {
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 054e6cbdc18..ce428d16ff2 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
@@ -296,6 +296,15 @@ private Path specFile(Map<String, ? super Object> params) {
     private Path buildRPM(Map<String, ? super Object> params,
             Path outdir) throws IOException {
 
+        PlatformPackage thePackage = createMetaPackage(params);
+
+        new ScriptRunner()
+                .setDirectory(thePackage.sourceRoot())
+                .setResourceCategoryId("resource.post-app-image-script")
+                .setScriptNameSuffix("post-image")
+                .setEnvironmentVariable("JpAppImageDir", thePackage.sourceRoot().toAbsolutePath().toString())
+                .run(params);
+
         Path rpmFile = outdir.toAbsolutePath().resolve(String.format(
                 "%s-%s-%s.%s.rpm", PACKAGE_NAME.fetchFrom(params),
                 VERSION.fetchFrom(params), RELEASE.fetchFrom(params), rpmArch()));
@@ -304,8 +313,6 @@ private Path buildRPM(Map<String, ? super Object> params,
                 "message.outputting-bundle-location"),
                 rpmFile.getParent()));
 
-        PlatformPackage thePackage = createMetaPackage(params);
-
         //run rpmbuild
         Executor.of(
                 TOOL_RPMBUILD,
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
index a3e6b342463..3e324573bcf 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
@@ -80,10 +80,12 @@ public Path bundle(Map<String, ? super Object> params,
             Path appLocation = prepareAppBundle(params);
 
             if (appLocation != null && prepareConfigFiles(appLocation,params)) {
-                Path configScript = getConfig_Script(params);
-                if (IOUtils.exists(configScript)) {
-                    IOUtils.run("bash", configScript);
-                }
+                new ScriptRunner()
+                        .setDirectory(appLocation)
+                        .setResourceCategoryId("resource.post-app-image-script")
+                        .setScriptNameSuffix("post-image")
+                        .setEnvironmentVariable("JpAppImageDir", appLocation.toAbsolutePath().toString())
+                        .run(params);
 
                 return buildDMG(params, appLocation, outdir);
             }
@@ -197,10 +199,6 @@ private boolean prepareConfigFiles(Path appLocation,
                 .setExternal(ICON_ICNS.fetchFrom(params))
                 .saveToFile(getConfig_VolumeIcon(params));
 
-        createResource(null, params)
-                .setCategory(I18N.getString("resource.post-install-script"))
-                .saveToFile(getConfig_Script(params));
-
         prepareLicense(params);
 
         prepareDMGSetupScript(appLocation, params);
@@ -208,12 +206,6 @@ private boolean prepareConfigFiles(Path appLocation,
         return true;
     }
 
-    // name of post-image script
-    private Path getConfig_Script(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-post-image.sh");
-    }
-
     // Location of SetFile utility may be different depending on MacOS version
     // We look for several known places and if none of them work will
     // try ot find it
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 8328fa07851..ecd9a94e6c0 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
@@ -54,9 +54,6 @@
 import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
 import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
 import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.INSTALLER_SIGN_IDENTITY;
 import static jdk.jpackage.internal.MacAppBundler.APP_IMAGE_SIGN_IDENTITY;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
 import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
@@ -154,12 +151,23 @@ public Path bundle(Map<String, ? super Object> params,
             Path appImageDir = prepareAppBundle(params);
 
             if (appImageDir != null && prepareConfigFiles(params)) {
+                prepareCPLFile(params, appImageDir);
 
-                Path configScript = getConfig_Script(params);
-                if (IOUtils.exists(configScript)) {
-                    IOUtils.run("bash", configScript);
+                if (withServicesPkg(params)) {
+                    prepareServicesPkg(params);
                 }
 
+                if (!APP_STORE.fetchFrom(params)) {
+                    preparePackageScripts(params);
+                }
+
+                new ScriptRunner()
+                        .setDirectory(appImageDir)
+                        .setResourceCategoryId("resource.post-app-image-script")
+                        .setScriptNameSuffix("post-image")
+                        .setEnvironmentVariable("JpAppImageDir", appImageDir.toAbsolutePath().toString())
+                        .run(params);
+
                 return createPKG(params, outdir, appImageDir);
             }
             return null;
@@ -360,19 +368,9 @@ private boolean prepareConfigFiles(Map<String, ? super Object> params)
 
         prepareDistributionXMLFile(params);
 
-        createResource(null, params)
-                .setCategory(I18N.getString("resource.post-install-script"))
-                .saveToFile(getConfig_Script(params));
-
         return true;
     }
 
-    // name of post-image script
-    private Path getConfig_Script(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-post-image.sh");
-    }
-
     private void patchCPLFile(Path cpl) throws IOException {
         String cplData = Files.readString(cpl);
         String[] lines = cplData.split("\n");
@@ -464,8 +462,7 @@ private boolean withServicesPkg(Map<String, Object> params) {
         }
     }
 
-    private void createServicesPkg(Map<String, Object> params) throws
-            IOException {
+    private void prepareServicesPkg(Map<String, Object> params) throws IOException {
         Path root = TEMP_ROOT.fetchFrom(params).resolve("services");
 
         Path srcRoot = root.resolve("src");
@@ -482,22 +479,10 @@ private void createServicesPkg(Map<String, Object> params) throws
                 .setSubstitutionData(data)
                 .saveInFolder(scriptsDir);
 
-        var pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                "--root",
-                srcRoot.toString(),
-                "--install-location",
-                "/",
-                "--scripts",
-                scriptsDir.toString(),
-                "--identifier",
-                getServicesIdentifier(params),
-                getPackages_ServicesPackage(params).toAbsolutePath().toString());
-        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-
-        createSupportPkg(params, data);
+        prepareSupportPkg(params, data);
     }
 
-    private void createSupportPkg(Map<String, Object> params,
+    private void prepareSupportPkg(Map<String, Object> params,
             Map<String, String> servicesSubstitutionData) throws IOException {
         Path root = TEMP_ROOT.fetchFrom(params).resolve("support");
 
@@ -518,6 +503,35 @@ private void createSupportPkg(Map<String, Object> params,
                         .setPublicName("uninstaller")
                         .setSubstitutionData(data))
                 .saveInFolder(srcRoot.resolve(APP_NAME.fetchFrom(params)));
+    }
+
+    private void createServicesPkg(Map<String, Object> params) throws
+            IOException {
+        Path root = TEMP_ROOT.fetchFrom(params).resolve("services");
+
+        Path srcRoot = root.resolve("src");
+
+        Path scriptsDir = root.resolve("scripts");
+
+        var pb = new ProcessBuilder("/usr/bin/pkgbuild",
+                "--root",
+                srcRoot.toString(),
+                "--install-location",
+                "/",
+                "--scripts",
+                scriptsDir.toString(),
+                "--identifier",
+                getServicesIdentifier(params),
+                getPackages_ServicesPackage(params).toAbsolutePath().toString());
+        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+
+        createSupportPkg(params);
+    }
+
+    private void createSupportPkg(Map<String, Object> params) throws IOException {
+        Path root = TEMP_ROOT.fetchFrom(params).resolve("support");
+
+        Path srcRoot = root.resolve("src");
 
         var pb = new ProcessBuilder("/usr/bin/pkgbuild",
                 "--root",
@@ -530,6 +544,23 @@ private void createSupportPkg(Map<String, Object> params,
         IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
     }
 
+    private void prepareCPLFile(Map<String, ? super Object> params, Path appLocation) throws IOException {
+        String root = getRoot(params, appLocation);
+        // Generate default CPL file
+        Path cpl = CONFIG_ROOT.fetchFrom(params).resolve("cpl.plist");
+        ProcessBuilder pb = new ProcessBuilder("/usr/bin/pkgbuild",
+                "--root",
+                root,
+                "--install-location",
+                getInstallDir(params, false),
+                "--analyze",
+                cpl.toAbsolutePath().toString());
+
+        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+
+        patchCPLFile(cpl);
+    }
+
     private Path createPKG(Map<String, ? super Object> params,
             Path outdir, Path appLocation) {
         // generic find attempt
@@ -542,19 +573,9 @@ private Path createPKG(Map<String, ? super Object> params,
                 createServicesPkg(params);
             }
 
-            // Generate default CPL file
-            Path cpl = CONFIG_ROOT.fetchFrom(params).resolve("cpl.plist");
-            ProcessBuilder pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                    "--root",
-                    root,
-                    "--install-location",
-                    getInstallDir(params, false),
-                    "--analyze",
-                    cpl.toAbsolutePath().toString());
-
-            IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+            ProcessBuilder pb;
 
-            patchCPLFile(cpl);
+            Path cpl = CONFIG_ROOT.fetchFrom(params).resolve("cpl.plist");
 
             // build application package
             if (APP_STORE.fetchFrom(params)) {
@@ -570,7 +591,6 @@ private Path createPKG(Map<String, ? super Object> params,
                         appPKG.toAbsolutePath().toString());
                 IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
             } else {
-                preparePackageScripts(params);
                 pb = new ProcessBuilder("/usr/bin/pkgbuild",
                         "--root",
                         root,
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 f4e97aad72e..e7e4b2adb61 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
@@ -47,7 +47,6 @@ resource.dmg-setup-script=DMG setup script
 resource.license-setup=License setup
 resource.dmg-background=dmg background
 resource.volume-icon=volume icon
-resource.post-install-script=script to run after application image is populated
 resource.pkg-preinstall-script=PKG preinstall script
 resource.pkg-postinstall-script=PKG postinstall script
 resource.pkg-services-preinstall-script=PKG preinstall script for services package
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 037b38d36fd..148eb375e84 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
@@ -30,6 +30,8 @@ param.copyright.default=Copyright (C) {0,date,YYYY}
 param.description.default=None
 param.vendor.default=Unknown
 
+resource.post-app-image-script=script to run after application image is populated
+
 message.using-default-resource=Using default package resource {0} {1} (add {2} to the resource-dir to customize).
 message.no-default-resource=no default package resource {0} {1} (add {2} to the resource-dir to customize).
 message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
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 88bf18dc45d..c95449a81e1 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -431,14 +431,6 @@ public Path execute(Map<String, ? super Object> params,
             }
 
             Map<String, String> wixVars = prepareMainProjectFile(params);
-
-            new ScriptRunner()
-            .setDirectory(imageDir)
-            .setResourceCategoryId("resource.post-app-image-script")
-            .setScriptNameSuffix("post-image")
-            .setEnvironmentVariable("JpAppImageDir", imageDir.toAbsolutePath().toString())
-            .run(params);
-
             return buildMSI(params, wixVars, outputParentDir);
         } catch (IOException ex) {
             Log.verbose(ex);
@@ -600,6 +592,15 @@ private Path buildMSI(Map<String, ? super Object> params,
         // Save all WiX resources into config dir.
         wixResources.saveResources();
 
+        final var imageDir = WIN_APP_IMAGE.fetchFrom(params);
+
+        new ScriptRunner()
+                .setDirectory(imageDir)
+                .setResourceCategoryId("resource.post-app-image-script")
+                .setScriptNameSuffix("post-image")
+                .setEnvironmentVariable("JpAppImageDir", imageDir.toAbsolutePath().toString())
+                .run(params);
+
         // All l10n files are supplied to WiX with "-loc", but only
         // Cultures from custom files and a single primary Culture are
         // included into "-cultures" list
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 d8f5194b4f6..c2be3756426 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
@@ -32,7 +32,6 @@ param.menu-group.default=Unknown
 
 resource.executable-properties-template=Template for creating executable properties file
 resource.setup-icon=setup dialog icon
-resource.post-app-image-script=script to run after application image is populated
 resource.post-msi-script=script to run after msi file for exe installer is created
 resource.wxl-file=WiX localization file
 resource.main-wix-file=Main WiX project file
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 f7f76a209cc..590f23b002d 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
@@ -54,7 +54,7 @@ public static Collection<Object[]> test() {
         data.addAll(List.of(assertFunc.args(false).pass().expectLog("assertFalse()").createForMessage("Stork")));
         data.addAll(List.of(assertFunc.args(true).fail().expectLog("Failed").createForMessage("Stork")));
 
-        assertFunc = MethodCallConfig.build("assertEquals", String.class, String.class, String.class);
+        assertFunc = MethodCallConfig.build("assertEquals", Object.class, Object.class, String.class);
         data.addAll(List.of(assertFunc.args("a", "a").pass().expectLog("assertEquals(a)").createForMessage("Crow")));
         data.addAll(List.of(assertFunc.args("a", "b").fail().expectLog("Expected [a]. Actual [b]").createForMessage("Crow")));
 
@@ -68,7 +68,7 @@ public static Collection<Object[]> test() {
         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);
+        assertFunc = MethodCallConfig.build("assertNotEquals", Object.class, Object.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")));
 
@@ -280,7 +280,7 @@ static Builder role(String role) {
             return new Builder(role);
         }
 
-        final static class Builder {
+        static final class Builder {
 
             private Builder(String role) {
                 this.role = role;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Comm.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Comm.java
index 84a9eb02885..901eb571590 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Comm.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Comm.java
@@ -34,6 +34,10 @@ public static <T> Comm<T> compare(Set<T> a, Set<T> b) {
         unique1.removeAll(common);
         Set<T> unique2 = new HashSet<>(b);
         unique2.removeAll(common);
-        return new Comm<T>(common, unique1, unique2);
+        return new Comm<>(common, unique1, unique2);
+    }
+
+    public boolean uniqueEmpty() {
+        return unique1.isEmpty() && unique2.isEmpty();
     }
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
new file mode 100644
index 00000000000..8bf4218dd4a
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
@@ -0,0 +1,435 @@
+/*
+ * 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.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.XmlUtils;
+
+public enum JPackageUserScript {
+    POST_IMAGE("post-image"),
+    POST_MSI("post-msi");
+
+    JPackageUserScript(String suffix) {
+        if (TKit.isWindows()) {
+            this.suffix = suffix + ".wsf";
+        } else {
+            this.suffix = suffix + ".sh";
+        }
+    }
+
+    public enum WinGlobals {
+        JS_SHELL("var shell = new ActiveXObject('WScript.Shell')"),
+        JS_FS("var fs = new ActiveXObject('Scripting.FileSystemObject')");
+
+        WinGlobals(String expr) {
+            this.expr = expr;
+        }
+
+        public String expr() {
+            return expr;
+        }
+
+        private final String expr;
+    }
+
+    public void create(JPackageCommand cmd, List<String> script) {
+        create(scriptPath(cmd), script);
+    }
+
+    public static class PackagingDirectoryVerifierBuilder {
+
+        public PackagingDirectoryVerifierBuilder withUnchangedDirectory(Path v) {
+            unchangedDirectories.add(verifyPath(v));
+            return this;
+        }
+
+        public PackagingDirectoryVerifierBuilder withUnchangedDirectory(String v) {
+            return withUnchangedDirectory(Path.of(v));
+        }
+
+        public PackagingDirectoryVerifierBuilder withEmptyDirectory(Path v) {
+            emptyDirectories.add(verifyPath(v));
+            return this;
+        }
+
+        public PackagingDirectoryVerifierBuilder withEmptyDirectory(String v) {
+            return withEmptyDirectory(Path.of(v));
+        }
+
+        public PackagingDirectoryVerifierBuilder withNonexistantPath(Path v) {
+            nonexistantPaths.add(verifyPath(v));
+            return this;
+        }
+
+        public PackagingDirectoryVerifierBuilder withNonexistantPath(String v) {
+            return withNonexistantPath(Path.of(v));
+        }
+
+        public PackageTest apply(PackageTest test) {
+            return verifyPackagingDirectories(test, unchangedDirectories, emptyDirectories, nonexistantPaths);
+        }
+
+        private Path verifyPath(Path v) {
+            if (v.isAbsolute() ) {
+                throw new IllegalArgumentException();
+            }
+            return v;
+        }
+
+        private final List<Path> unchangedDirectories = new ArrayList<>();
+        private final List<Path> emptyDirectories = new ArrayList<>();
+        private final List<Path> nonexistantPaths = new ArrayList<>();
+    }
+
+    public static PackagingDirectoryVerifierBuilder verifyPackagingDirectories() {
+        return new PackagingDirectoryVerifierBuilder();
+    }
+
+    public static PackageTest verifyPackagingDirectories(PackageTest test) {
+        return new PackagingDirectoryVerifierBuilder().apply(test);
+    }
+
+    public interface EnvVarVerifier {
+        boolean isEmpty();
+        List<String> createScript();
+        void verify(Map<String, Object> envVarsWithExpectedValues);
+    }
+
+    public interface ExpectedEnvVarValue {
+        Object fromString(String v);
+        Object value();
+
+        static ExpectedEnvVarValue create(Object expectedValue, Function<String, Object> conv) {
+            Objects.requireNonNull(expectedValue);
+            Objects.requireNonNull(conv);
+            return new ExpectedEnvVarValue() {
+
+                @Override
+                public Object fromString(String v) {
+                    return conv.apply(v);
+                }
+
+                @Override
+                public Object value() {
+                    return expectedValue;
+                }
+            };
+        }
+    }
+
+    public static final class EnvVarVerifierBuilder {
+
+        public EnvVarVerifierBuilder outputDir(Path v) {
+            outputDir = v;
+            return this;
+        }
+
+        public EnvVarVerifierBuilder envVar(String v) {
+            envVarNames.add(v);
+            return this;
+        }
+
+        public EnvVarVerifier create() {
+            return new DefaultEnvVarVerifier(envVarNames, Optional.ofNullable(outputDir).orElseGet(() -> {
+                return TKit.createTempDirectory("env-vars");
+            }).toAbsolutePath());
+        }
+
+        private final Set<String> envVarNames = new HashSet<>();
+        private Path outputDir;
+    }
+
+    public static EnvVarVerifierBuilder verifyEnvVariables() {
+        return new EnvVarVerifierBuilder();
+    }
+
+    private record DefaultEnvVarVerifier(Set<String> envVarNames, Path outputDir) implements EnvVarVerifier {
+        DefaultEnvVarVerifier {
+            Objects.requireNonNull(envVarNames);
+            Objects.requireNonNull(outputDir);
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return envVarNames.isEmpty();
+        }
+
+        @Override
+        public List<String> createScript() {
+            final List<String> script = new ArrayList<>();
+
+            if (TKit.isWindows()) {
+                script.add(WinGlobals.JS_SHELL.expr());
+                script.add(WinGlobals.JS_FS.expr());
+            }
+
+            script.addAll(envVarNames.stream().sorted().map(envVarName -> {
+                final var outputFile = outputDir.resolve(envVarName);
+                if (TKit.isWindows()) {
+                    return Stream.of(
+                            String.format("WScript.Echo('Env var: %s')", envVarName),
+                            "{",
+                            String.format("    var o = fs.CreateTextFile('%s', true)", outputFile.toString().replace('\\', '/')),
+                            String.format("    o.Write(shell.ExpandEnvironmentStrings('%%%s%%'))", envVarName),
+                            "    o.Close()",
+                            "}"
+                    );
+                } else {
+                    return Stream.of(
+                            String.format("printf 'Env var: %%s\\n' '%s'", envVarName),
+                            String.format("printf '%%s' \"${%s}\" > '%s'", envVarName, outputFile)
+                    );
+                }
+            }).flatMap(x -> x).toList());
+
+            return script;
+        }
+
+        @Override
+        public void verify(Map<String, Object> envVarsWithExpectedValues) {
+            if (!Comm.compare(envVarNames, envVarsWithExpectedValues.keySet()).uniqueEmpty()) {
+                throw new IllegalArgumentException();
+            }
+            try {
+                for (final var envVarName : envVarNames.stream().sorted().toList()) {
+                    Object actualValue = Files.readString(outputDir.resolve(envVarName));
+                    Object expetedValue = envVarsWithExpectedValues.get(envVarName);
+                    if (expetedValue instanceof ExpectedEnvVarValue ext) {
+                        actualValue = ext.fromString((String)actualValue);
+                        expetedValue = ext.value();
+                    }
+                    TKit.assertEquals(expetedValue, actualValue, String.format("Check value of [%s] environment variable", envVarName));
+                }
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+    }
+
+    private void create(Path scriptFilePath, List<String> script) {
+        try {
+            if (TKit.isWindows()) {
+                XmlUtils.createXml(scriptFilePath, xml -> {
+                    xml.writeStartElement("job");
+                    xml.writeAttribute("id", "main");
+                    xml.writeStartElement("script");
+                    xml.writeAttribute("language", "JScript");
+                    xml.writeCData("\n" + String.join("\n", script) + "\n");
+                    xml.writeEndElement();
+                    xml.writeEndElement();
+                });
+            } else {
+                Files.write(scriptFilePath, script);
+            }
+            TKit.traceFileContents(scriptFilePath, String.format("[%s] script", name()));
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    private Path scriptPath(JPackageCommand cmd) {
+        return Path.of(cmd.getArgumentValue("--resource-dir"), String.format("%s-%s", cmd.name(), suffix));
+    }
+
+    private static PackageTest verifyPackagingDirectories(PackageTest test,
+            List<Path> additionalUnchangedDirectories, List<Path> additionalEmptyDirectories, List<Path> additionalNonexistantPaths) {
+
+        final Map<PackageType, Path> capturedConfigDirs = new HashMap<>();
+        final Map<PackageType, Path> capturedAppImageDirs = new HashMap<>();
+        final var capturedAdditionalDirs = Stream.generate(() -> {
+            return new HashMap<PackageType, Path>();
+        }).limit(additionalUnchangedDirectories.size()).toList();
+
+        return test.addInitializer(cmd -> {
+            setupDirectory(cmd, "temp", "--temp");
+            setupDirectory(cmd, "resources", "--resource-dir");
+
+            final var configDirContets = TKit.createTempFile(addPkgTypeSuffix("config-listing", cmd) + ".txt").toAbsolutePath();
+            capturedConfigDirs.put(cmd.packageType(), configDirContets);
+
+            final var appImageDirContets = TKit.createTempFile(addPkgTypeSuffix("app-image-listing", cmd) + ".txt").toAbsolutePath();
+            capturedAppImageDirs.put(cmd.packageType(), appImageDirContets);
+
+            final var additionalDirContets = IntStream.range(0, additionalUnchangedDirectories.size()).mapToObj(i -> {
+                return String.format("additional-dir-%d", i);
+            }).map(name -> {
+                return addPkgTypeSuffix(name, cmd) + ".txt";
+            }).map(TKit::createTempFile).map(Path::toAbsolutePath).toList();
+            for (int i = 0; i != additionalUnchangedDirectories.size(); i++) {
+                capturedAdditionalDirs.get(i).put(cmd.packageType(), additionalDirContets.get(i));
+            }
+
+            final List<String> script = new ArrayList<>();
+            if (TKit.isWindows()) {
+                script.addAll(List.of(
+                        "function listDir (dir) {",
+                        "    o.WriteLine(dir.Path)",
+                        "    for(var e = new Enumerator(dir.Files); !e.atEnd(); e.moveNext()) {",
+                        "        o.WriteLine(e.item().Path)",
+                        "    }",
+                        "    for(var e = new Enumerator(dir.SubFolders); !e.atEnd(); e.moveNext()) {",
+                        "        listDir(e.item())",
+                        "    }",
+                        "}",
+                        WinGlobals.JS_FS.expr(),
+                        WinGlobals.JS_SHELL.expr(),
+                        String.format("var o = fs.CreateTextFile('%s', true)", configDirContets.toString().replace('\\', '/')),
+                        "var configDir = fs.GetFolder(fs.GetParentFolderName(WScript.ScriptFullName))",
+                        "listDir(configDir)",
+                        "o.Close()",
+                        String.format("o = fs.CreateTextFile('%s', true)", appImageDirContets.toString().replace('\\', '/')),
+                        "listDir(fs.GetFolder(shell.CurrentDirectory))",
+                        "o.Close()"
+                ));
+            } else {
+                script.addAll(List.of(
+                        "set -e",
+                        String.format("find \"${0%%/*}\" >> '%s'", configDirContets),
+                        String.format("find \"$PWD\" >> '%s'", appImageDirContets)
+                ));
+            }
+
+            script.addAll(IntStream.range(0, additionalUnchangedDirectories.size()).mapToObj(i -> {
+                final var dirAsStr = additionalPathInScript(additionalUnchangedDirectories.get(i));
+                final var captureFile = additionalDirContets.get(i);
+                if (TKit.isWindows()) {
+                    return Stream.of(
+                            String.format("WScript.Echo('Save directory listing: ' + %s)", dirAsStr),
+                            String.format("o = fs.CreateTextFile('%s', true)", captureFile.toString().replace('\\', '/')),
+                            String.format("listDir(fs.GetFolder(%s))", dirAsStr),
+                            "o.Close()"
+                    );
+                } else {
+                    return Stream.of(
+                            String.format("printf 'Save directory listing: %%s\\n' %s", dirAsStr),
+                            String.format("find %s >> '%s'", dirAsStr, captureFile)
+                    );
+                }
+            }).flatMap(x -> x).toList());
+
+            script.addAll(additionalEmptyDirectories.stream().map(JPackageUserScript::additionalPathInScript).map(dirAsStr -> {
+                if (TKit.isWindows()) {
+                    return Stream.of(
+                            String.format("WScript.Echo('Check directory: ' + %s)", dirAsStr),
+                            "{",
+                            "    WScript.Echo('  exists')",
+                            String.format("    var f = fs.GetFolder(%s)", dirAsStr),
+                            "    WScript.Echo('  is empty')",
+                            "    if (f.SubFolders.Count != 0 || f.Files.Count != 0) WScript.Quit(1)",
+                            "}"
+                    );
+                } else {
+                    return Stream.of(
+                            String.format("printf 'Check directory: %%s\\n' %s", dirAsStr),
+                            "echo '  exists'",
+                            String.format("[ -d %s ]", dirAsStr),
+                            "echo '  is empty'",
+                            "exec 3>&1",
+                            String.format("[ -z \"$(find %s -mindepth 1 -maxdepth 1 3>&- | tee /dev/fd/3)\" ]", dirAsStr),
+                            "exec 3>&-"
+                    );
+                }
+            }).flatMap(x -> x).toList());
+
+            script.addAll(additionalNonexistantPaths.stream().map(JPackageUserScript::additionalPathInScript).map(pathAsStr -> {
+                if (TKit.isWindows()) {
+                    return Stream.of(
+                            String.format("WScript.Echo('Check nonexistant: ' + %s)", pathAsStr),
+                            String.format("if (fs.FileExists(%s) || fs.FolderExists(%s)) WScript.Quit(1)", pathAsStr, pathAsStr)
+                    );
+                } else {
+                    return Stream.of(
+                            String.format("printf 'Check nonexistant: %%s\\n' %s", pathAsStr),
+                            String.format("[ ! -e %s ]", pathAsStr)
+                    );
+                }
+            }).flatMap(x -> x).toList());
+
+            POST_IMAGE.create(cmd, script);
+        }).addBundleVerifier(cmd -> {
+            final var configDir = verifyDirectoryContents(capturedConfigDirs.get(cmd.packageType()));
+            verifyDirectoryContents(capturedAppImageDirs.get(cmd.packageType()));
+            for (final var v : capturedAdditionalDirs) {
+                verifyDirectoryContents(v.get(cmd.packageType()));
+            }
+            additionalNonexistantPaths.forEach(path -> {
+                TKit.assertPathExists(configDir.resolve(path), true);
+            });
+            additionalEmptyDirectories.forEach(path -> {
+                TKit.assertDirectoryNotEmpty(configDir.resolve(path));
+            });
+        });
+    }
+
+    private static String additionalPathInScript(Path path) {
+        path = path.normalize();
+        if (TKit.isWindows()) {
+            return String.format("configDir.Path + '/%s'", path.toString().replace('\\', '/'));
+        } else {
+            return String.format("\"${0%%/*}\"'/%s'", path);
+        }
+    }
+
+    private static Path verifyDirectoryContents(Path fileWithExpectedDirContents) throws IOException {
+        TKit.trace(String.format("Process [%s] file...", fileWithExpectedDirContents));
+
+        final var data = Files.readAllLines(fileWithExpectedDirContents);
+        final var dir = Path.of(data.getFirst());
+        final var capturedDirContents = data.stream().skip(1).map(Path::of).map(dir::relativize).toList();
+
+        // Verify new files are not created in the "config" directory after the script execution.
+        TKit.assertDirectoryContentRecursive(dir).removeAll(capturedDirContents).match();
+
+        return dir;
+    }
+
+    private static Path setupDirectory(JPackageCommand cmd, String role, String argName) {
+        if (!cmd.hasArgument(argName)) {
+            cmd.setArgumentValue(argName, TKit.createTempDirectory(addPkgTypeSuffix(role, cmd)));
+        }
+
+        return Path.of(cmd.getArgumentValue(argName));
+    }
+
+    private static String addPkgTypeSuffix(String str, JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.NATIVE);
+        Objects.requireNonNull(str);
+        return String.format("%s-%s", str, cmd.packageType().getType());
+    }
+
+    private final String suffix;
+}
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 8eaec2f0e72..b0291fc52eb 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -309,9 +309,9 @@ static String getRpmBundleProperty(Path bundle, String fieldName) {
 
     static void verifyPackageBundleEssential(JPackageCommand cmd) {
         String packageName = LinuxHelper.getPackageName(cmd);
-        Long packageSize = LinuxHelper.getInstalledPackageSizeKB(cmd);
+        long packageSize = LinuxHelper.getInstalledPackageSizeKB(cmd);
         TKit.trace("InstalledPackageSize: " + packageSize);
-        TKit.assertNotEquals(0L, packageSize, String.format(
+        TKit.assertNotEquals(0, packageSize, String.format(
                 "Check installed size of [%s] package in not zero", packageName));
 
         final boolean checkPrerequisites;
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 7d0aaca8a95..e2f35f4df35 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -656,7 +656,7 @@ public static void assertNotEquals(boolean expected, boolean actual, String msg)
     }
 
 
-    public static void assertEquals(String expected, String actual, String msg) {
+    public static void assertEquals(Object expected, Object actual, String msg) {
         currentTest.notifyAssert();
         if ((actual != null && !actual.equals(expected))
                 || (expected != null && !expected.equals(actual))) {
@@ -668,7 +668,7 @@ public static void assertEquals(String expected, String actual, String msg) {
         traceAssert(concatMessages(String.format("assertEquals(%s)", expected), msg));
     }
 
-    public static void assertNotEquals(String expected, String actual, String msg) {
+    public static void assertNotEquals(Object expected, Object actual, String msg) {
         currentTest.notifyAssert();
         if ((actual != null && !actual.equals(expected))
                 || (expected != null && !expected.equals(actual))) {
@@ -760,9 +760,9 @@ private static void assertDirectoryExists(Path path, Optional<Boolean> isEmptyCh
                 try (var files = Files.list(path)) {
                     boolean actualIsEmpty = files.findFirst().isEmpty();
                     if (isEmptyCheck.get()) {
-                        TKit.assertTrue(actualIsEmpty, String.format("Check [%s] is not an empty directory", path));
+                        TKit.assertTrue(actualIsEmpty, String.format("Check [%s] is an empty directory", path));
                     } else {
-                        TKit.assertTrue(!actualIsEmpty, String.format("Check [%s] is an empty directory", path));
+                        TKit.assertTrue(!actualIsEmpty, String.format("Check [%s] is not an empty directory", path));
                     }
                 }
             }).run();
@@ -803,18 +803,22 @@ public static void assertUnexpected(String msg) {
     }
 
     public static DirectoryContentVerifier assertDirectoryContent(Path dir) {
-        return new DirectoryContentVerifier(dir);
+        return new DirectoryContentVerifier(dir, ThrowingSupplier.toSupplier(() -> {
+            try (var files = Files.list(dir)) {
+                return files.map(Path::getFileName).collect(toSet());
+            }
+        }).get());
     }
 
-    public static final class DirectoryContentVerifier {
-        public DirectoryContentVerifier(Path baseDir) {
-            this(baseDir, ThrowingSupplier.toSupplier(() -> {
-                try (var files = Files.list(baseDir)) {
-                    return files.map(Path::getFileName).collect(toSet());
-                }
-            }).get());
-        }
+    public static DirectoryContentVerifier assertDirectoryContentRecursive(Path dir) {
+        return new DirectoryContentVerifier(dir, ThrowingSupplier.toSupplier(() -> {
+            try (var files = Files.walk(dir).skip(1)) {
+                return files.map(dir::relativize).collect(toSet());
+            }
+        }).get());
+    }
 
+    public static final class DirectoryContentVerifier {
         public void match(Path ... expected) {
             DirectoryContentVerifier.this.match(Set.of(expected));
         }
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index 2b164baa359..b55f7bb87ad 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -169,9 +169,9 @@ public void testHelp() {
         };
 
         TKit.trace("Check parameters in help text");
-        TKit.assertNotEquals(0, countStrings.apply(List.of(expectedPrefix)),
+        TKit.assertNotEquals(0, countStrings.apply(List.of(expectedPrefix)).longValue(),
                 "Check help text contains platform specific parameters");
-        TKit.assertEquals(0, countStrings.apply(unexpectedPrefixes),
+        TKit.assertEquals(0, countStrings.apply(unexpectedPrefixes).longValue(),
                 "Check help text doesn't contain unexpected parameters");
     }
 
diff --git a/test/jdk/tools/jpackage/share/PostImageScriptTest.java b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
new file mode 100644
index 00000000000..1bb1d5dc78b
--- /dev/null
+++ b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
@@ -0,0 +1,276 @@
+/*
+ * 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 static jdk.internal.util.OperatingSystem.LINUX;
+import static jdk.internal.util.OperatingSystem.MACOS;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.ApplicationLayout;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageUserScript;
+import jdk.jpackage.test.JPackageUserScript.WinGlobals;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary jpackage with user-supplied post app image script
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror PostImageScriptTest.java
+ * @run main/othervm/timeout=720 -Xmx512m
+ *  jdk.jpackage.test.Main
+ *  --jpt-run=PostImageScriptTest
+ */
+
+public class PostImageScriptTest {
+
+    public enum Mode {
+        APP,
+        RUNTIME,
+        EXTERNAL_APP_IMAGE
+    }
+
+    public record TestSpec(Mode mode, boolean verifyAppImageContents) {
+
+        public TestSpec {
+            Objects.requireNonNull(mode);
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append(mode);
+            if (verifyAppImageContents) {
+                sb.append("; verifyAppImageContents");
+            }
+            return sb.toString();
+        }
+
+        static PackageTest createTest(Mode mode, PackageType... types) {
+            if (types.length > 0 && Stream.of(types).allMatch(Predicate.not(PackageType::isEnabled))) {
+                throw TKit.throwSkippedException(String.format("All native packagers from %s list are disabled", List.of(types)));
+            }
+
+            final var test = new PackageTest().forTypes(types);
+
+            final var appImageCmd = JPackageCommand.helloAppImage()
+                    .setFakeRuntime().setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
+
+            appImageCmd.execute();
+
+            switch (mode) {
+                case APP -> {
+                    test.configureHelloApp();
+                    test.addInitializer(cmd -> {
+                        cmd.addArguments("--runtime-image", appImageCmd.appRuntimeDirectory());
+                    });
+                }
+                case RUNTIME -> {
+                    test.addInitializer(cmd -> {
+                        cmd.removeArgumentWithValue("--input");
+                        cmd.addArguments("--runtime-image", appImageCmd.appRuntimeDirectory());
+                    });
+                }
+                case EXTERNAL_APP_IMAGE -> {
+                    test.addInitializer(cmd -> {
+                        cmd.removeArgumentWithValue("--input");
+                        cmd.addArguments("--app-image", appImageCmd.outputBundle());
+                    });
+                }
+            }
+
+            test.addInitializer(cmd -> {
+                cmd.setArgumentValue("--resource-dir", TKit.createTempDirectory("resources"));
+            });
+
+            return test;
+        }
+
+        PackageTest createTest() {
+            return createTest(mode);
+        }
+
+        PackageTest initTest() {
+            return initTest(createTest());
+        }
+
+        PackageTest initTest(PackageTest test) {
+            if (verifyAppImageContents) {
+                test.addInitializer(cmd -> {
+                    final Path runtimeDir;
+                    if (TKit.isLinux()) {
+                        runtimeDir = Path.of("/").relativize(cmd.appRuntimeDirectory());
+                    } else if (!cmd.isRuntime()) {
+                        runtimeDir = ApplicationLayout.platformAppImage().runtimeHomeDirectory();
+                    } else if (TKit.isOSX()) {
+                        runtimeDir = Path.of("Contents/Home");
+                    } else {
+                        runtimeDir = Path.of("");
+                    }
+
+                    final Path runtimeBinDir = runtimeDir.resolve("bin");
+
+                    if (TKit.isWindows()) {
+                        JPackageUserScript.POST_IMAGE.create(cmd, List.of(
+                                WinGlobals.JS_SHELL.expr(),
+                                WinGlobals.JS_FS.expr(),
+                                "WScript.Echo('PWD: ' + fs.GetFolder(shell.CurrentDirectory).Path)",
+                                String.format("WScript.Echo('Probe directory: %s')", runtimeBinDir),
+                                String.format("fs.GetFolder('%s')", runtimeBinDir.toString().replace('\\', '/'))
+                        ));
+                    } else {
+                        JPackageUserScript.POST_IMAGE.create(cmd, List.of(
+                                "set -e",
+                                "printf 'PWD: %s\\n' \"$PWD\"",
+                                String.format("printf 'Probe directory: %%s\\n' '%s'", runtimeBinDir),
+                                String.format("[ -d '%s' ]", runtimeBinDir)
+                        ));
+                    }
+                });
+            } else {
+                JPackageUserScript.verifyPackagingDirectories(test);
+            }
+
+            return test;
+        }
+    }
+
+    @Test
+    @ParameterSupplier(value="createVerifyAppImageContentsTestSpecs")
+    @ParameterSupplier(value="createVerifyNoNewFilesInDirectoriesTestSpecs")
+    public static void test(TestSpec spec) {
+        spec.initTest().run(Action.CREATE);
+    }
+
+    public static Collection<Object[]> createVerifyAppImageContentsTestSpecs() {
+        return createModeTestSpecs(true);
+    }
+
+    public static Collection<Object[]> createVerifyNoNewFilesInDirectoriesTestSpecs() {
+        return createModeTestSpecs(false);
+    }
+
+    @Test(ifOS = LINUX)
+    @ParameterSupplier(value="createVerifyAppImageContentsTestSpecs")
+    public static void testWithInstallDir(TestSpec spec) {
+        spec.initTest(spec.createTest().addInitializer(cmd -> {
+            cmd.addArguments("--install-dir", "/usr");
+        })).run(Action.CREATE);
+    }
+
+    @Test(ifOS = MACOS)
+    @Parameter("APP")
+    public static void testWithServices(Mode mode) {
+        final var test = TestSpec.createTest(mode, PackageType.MAC_PKG).addInitializer(cmd -> {
+            cmd.addArgument("--launcher-as-service");
+        });
+
+        JPackageUserScript.verifyPackagingDirectories()
+                .withUnchangedDirectory("../services")
+                .withUnchangedDirectory("../support")
+                .withEmptyDirectory("../packages")
+                .apply(test).run(Action.CREATE);
+    }
+
+    @Test
+    public static void testEnvVars() {
+        final Map<PackageType, JPackageUserScript.EnvVarVerifier> verifiers = new HashMap<>();
+
+        final var imageDirOutputPrefix = "image-dir=";
+
+        TestSpec.createTest(Mode.APP).addInitializer(cmd -> {
+            final var verifier = JPackageUserScript.verifyEnvVariables().envVar("JpAppImageDir").create();
+            verifiers.put(cmd.packageType(), verifier);
+
+            final List<String> script = new ArrayList<>();
+            script.addAll(verifier.createScript());
+            if (TKit.isWindows()) {
+                script.add("WScript.Echo('" + imageDirOutputPrefix + "' + fs.GetFolder(shell.CurrentDirectory).Path)");
+            } else {
+                script.add("printf '" + imageDirOutputPrefix + "%s\\n' \"$PWD\"");
+            }
+
+            JPackageUserScript.POST_IMAGE.create(cmd, script);
+
+            cmd.saveConsoleOutput(true);
+
+        }).addBundleVerifier((cmd, result) -> {
+            final var imageDir = result.stdout().getOutput().stream().map(String::stripLeading).filter(str -> {
+                return str.startsWith(imageDirOutputPrefix);
+            }).map(str -> {
+                return str.substring(imageDirOutputPrefix.length());
+            }).findFirst().orElseThrow();
+            final var verifier = verifiers.get(cmd.packageType());
+            // On macOS, the path to app image set from jpackage starts with "/var"
+            // and the value of `PWD` variable in the "post-image" script is a path
+            // starting with "/private/var", which is a target of "/var" symlink.
+            //
+            // Can't use Path.toRealPath() to resolve symlinks because the app image directory is gone.
+            //
+            // Instead, the workaround is to strip all leading path components
+            // before the path component starting with "jdk.jpackage" substring.
+            verifier.verify(Map.of("JpAppImageDir", JPackageUserScript.ExpectedEnvVarValue.create(
+                    stripLeadingNonJPackagePathComponents(imageDir),
+                    PostImageScriptTest::stripLeadingNonJPackagePathComponents)));
+        }).run(Action.CREATE);
+    }
+
+    private static Collection<Object[]> createModeTestSpecs(boolean verifyAppImageContents) {
+        return Stream.of(Mode.values()).map(mode -> {
+            return new TestSpec(mode, verifyAppImageContents);
+        }).map(spec -> {
+            return new Object[] {spec};
+        }).toList();
+    }
+
+    private static Path stripLeadingNonJPackagePathComponents(String path) {
+        if (!Path.of(path).isAbsolute()) {
+            throw new IllegalArgumentException();
+        }
+
+        final var m = JPACKAGE_TEMP_DIR_REGEXP.matcher(path);
+        if (!m.find()) {
+            TKit.assertUnexpected(String.format("jpackage temp directory not foind in [%s] path", path));
+        }
+
+        return Path.of(m.group());
+    }
+
+    private static final Pattern JPACKAGE_TEMP_DIR_REGEXP = Pattern.compile("[\\\\/]jdk\\.jpackage.+$",
+            TKit.isWindows() ? 0 : Pattern.CASE_INSENSITIVE);
+}
diff --git a/test/jdk/tools/jpackage/windows/WinScriptTest.java b/test/jdk/tools/jpackage/windows/WinScriptTest.java
index dc1483c8c57..6dcb132cf8a 100644
--- a/test/jdk/tools/jpackage/windows/WinScriptTest.java
+++ b/test/jdk/tools/jpackage/windows/WinScriptTest.java
@@ -24,14 +24,15 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import jdk.jpackage.internal.util.XmlUtils;
-import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.PackageTest;
-import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Parameters;
+import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageUserScript;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
 
 /*
  * @test usage of scripts from resource dir
@@ -107,7 +108,7 @@ public void test(int wsfExitCode) throws IOException {
                 throw new UnsupportedOperationException();
         }
 
-        test.run();
+        test.run(Action.CREATE);
     }
 
     private static class ScriptData {
@@ -115,11 +116,11 @@ private static class ScriptData {
             if (scriptType == PackageType.WIN_MSI) {
                 echoText = "post app image wsf";
                 envVarName = "JpAppImageDir";
-                scriptSuffixName = "post-image";
+                script = JPackageUserScript.POST_IMAGE;
             } else {
                 echoText = "post msi wsf";
                 envVarName = "JpMsiFile";
-                scriptSuffixName = "post-msi";
+                script = JPackageUserScript.POST_MSI;
             }
             this.wsfExitCode = wsfExitCode;
         }
@@ -149,26 +150,17 @@ void assertJPackageOutput(List<String> output) {
         }
 
         void createScript(JPackageCommand cmd) throws IOException {
-           XmlUtils.createXml(Path.of(cmd.getArgumentValue("--resource-dir"),
-                    String.format("%s-%s.wsf", cmd.name(), scriptSuffixName)), xml -> {
-                xml.writeStartElement("job");
-                xml.writeAttribute("id", "main");
-                xml.writeStartElement("script");
-                xml.writeAttribute("language", "JScript");
-                xml.writeCData(String.join("\n", List.of(
+            script.create(cmd, List.of(
                     "var shell = new ActiveXObject('WScript.Shell')",
                     "WScript.Echo('jp: " + envVarName + "=' + shell.ExpandEnvironmentStrings('%" + envVarName + "%'))",
                     "WScript.Echo('jp: CWD(" + envVarName + ")=' + shell.CurrentDirectory)",
                     String.format("WScript.Echo('jp: %s')", echoText),
                     String.format("WScript.Quit(%d)", wsfExitCode)
-                )));
-                xml.writeEndElement();
-                xml.writeEndElement();
-            });
+            ));
         }
 
         private final int wsfExitCode;
-        private final String scriptSuffixName;
+        private final JPackageUserScript script;
         private final String echoText;
         private final String envVarName;
     }

From 375ac6d446332f0763ce294b200143ff63865cf6 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Wed, 30 Apr 2025 01:58:41 +0000
Subject: [PATCH 200/901] 8355796: RISC-V:
 compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java fails after JDK-8355657

Reviewed-by: fyang, gcao
---
 src/hotspot/cpu/riscv/riscv_v.ad | 156 ++++++++++++++++++++++++-------
 1 file changed, 124 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 63d4607f1c1..58c78874797 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -1123,16 +1123,38 @@ instruct vxorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
 
 // vector and not
 
-instruct vand_not(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
-  predicate(UseZvbb &&
-            (Matcher::vector_element_basic_type(n) == T_BYTE ||
-             Matcher::vector_element_basic_type(n) == T_SHORT ||
-             Matcher::vector_element_basic_type(n) == T_INT));
+instruct vand_notB(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
-  format %{ "vand_not $dst, $src1, $src2" %}
+  format %{ "vand_notB $dst, $src1, $src2" %}
   ins_encode %{
-    BasicType bt = Matcher::vector_element_basic_type(this);
-    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
+    __ vandn_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notS(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
+  format %{ "vand_notS $dst, $src1, $src2" %}
+  ins_encode %{
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vandn_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notI(vReg dst, vReg src1, vReg src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (AndV src1 (XorV src2 (Replicate m1))));
+  format %{ "vand_notI $dst, $src1, $src2" %}
+  ins_encode %{
+    __ vsetvli_helper(T_INT, Matcher::vector_length(this));
     __ vandn_vv(as_VectorRegister($dst$$reg),
                 as_VectorRegister($src1$$reg),
                 as_VectorRegister($src2$$reg));
@@ -1153,16 +1175,40 @@ instruct vand_notL(vReg dst, vReg src1, vReg src2, immL_M1 m1) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_not_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb &&
-            (Matcher::vector_element_basic_type(n) == T_BYTE ||
-             Matcher::vector_element_basic_type(n) == T_SHORT ||
-             Matcher::vector_element_basic_type(n) == T_INT));
+instruct vand_notB_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
-  format %{ "vand_not_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  format %{ "vand_notB_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
-    BasicType bt = Matcher::vector_element_basic_type(this);
-    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
+    __ vandn_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notS_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
+  format %{ "vand_notS_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vandn_vv(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notI_masked(vReg dst_src1, vReg src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst_src1 (AndV (Binary dst_src1 (XorV src2 (Replicate m1))) v0));
+  format %{ "vand_notI_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_INT, Matcher::vector_length(this));
     __ vandn_vv(as_VectorRegister($dst_src1$$reg),
                 as_VectorRegister($dst_src1$$reg),
                 as_VectorRegister($src2$$reg),
@@ -1185,16 +1231,38 @@ instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, vRegMask_V0 v0)
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_not_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
-  predicate(UseZvbb &&
-            (Matcher::vector_element_basic_type(n) == T_BYTE ||
-             Matcher::vector_element_basic_type(n) == T_SHORT ||
-             Matcher::vector_element_basic_type(n) == T_INT));
+instruct vand_notB_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
-  format %{ "vand_not_vx $dst, $src1, $src2" %}
+  format %{ "vand_notB_vx $dst, $src1, $src2" %}
   ins_encode %{
-    BasicType bt = Matcher::vector_element_basic_type(this);
-    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_Register($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notS_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
+  format %{ "vand_notS_vx $dst, $src1, $src2" %}
+  ins_encode %{
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_Register($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notI_vx(vReg dst, vReg src1, iRegIorL2I src2, immI_M1 m1) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst (AndV src1 (Replicate (XorI src2 m1))));
+  format %{ "vand_notI_vx $dst, $src1, $src2" %}
+  ins_encode %{
+    __ vsetvli_helper(T_INT, Matcher::vector_length(this));
     __ vandn_vx(as_VectorRegister($dst$$reg),
                 as_VectorRegister($src1$$reg),
                 as_Register($src2$$reg));
@@ -1215,16 +1283,40 @@ instruct vand_notL_vx(vReg dst, vReg src1, iRegL src2, immL_M1 m1) %{
   ins_pipe(pipe_slow);
 %}
 
-instruct vand_not_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
-  predicate(UseZvbb &&
-            (Matcher::vector_element_basic_type(n) == T_BYTE ||
-             Matcher::vector_element_basic_type(n) == T_SHORT ||
-             Matcher::vector_element_basic_type(n) == T_INT));
+instruct vand_notB_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
-  format %{ "vand_not_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  format %{ "vand_notB_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
-    BasicType bt = Matcher::vector_element_basic_type(this);
-    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsetvli_helper(T_BYTE, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_Register($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notS_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
+  format %{ "vand_notS_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vandn_vx(as_VectorRegister($dst_src1$$reg),
+                as_VectorRegister($dst_src1$$reg),
+                as_Register($src2$$reg),
+                Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vand_notI_vx_masked(vReg dst_src1, iRegIorL2I src2, immI_M1 m1, vRegMask_V0 v0) %{
+  predicate(UseZvbb && Matcher::vector_element_basic_type(n) == T_INT);
+  match(Set dst_src1 (AndV (Binary dst_src1 (Replicate (XorI src2 m1))) v0));
+  format %{ "vand_notI_vx_masked $dst_src1, $dst_src1, $src2, $v0" %}
+  ins_encode %{
+    __ vsetvli_helper(T_INT, Matcher::vector_length(this));
     __ vandn_vx(as_VectorRegister($dst_src1$$reg),
                 as_VectorRegister($dst_src1$$reg),
                 as_Register($src2$$reg),

From 7d9a43839ad190a53efdbcc7afd1728760c14e21 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Wed, 30 Apr 2025 08:15:21 +0000
Subject: [PATCH 201/901] 8355370: Include server name in HTTP test server
 thread names to improve diagnostics

Reviewed-by: dfuchs, jpai
---
 .../test/lib/common/HttpServerAdapters.java   | 14 ++++++++++-
 .../test/lib/http2/Http2TestServer.java       | 23 ++++++++-----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
index 6dc945231ab..93a93ad25d2 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
@@ -765,7 +765,7 @@ public static abstract class HttpTestContext {
     /**
      * A version agnostic adapter class for HTTP Servers.
      */
-    public static abstract class HttpTestServer {
+    abstract class HttpTestServer implements AutoCloseable {
         private static final class ServerLogging {
             private static final Logger logger = Logger.getLogger("com.sun.net.httpserver");
             static void enableLogging() {
@@ -782,6 +782,11 @@ static void enableLogging() {
         public abstract Version getVersion();
         public abstract void setRequestApprover(final Predicate<String> approver);
 
+        @Override
+        public void close() throws Exception {
+            stop();
+        }
+
         public String serverAuthority() {
             InetSocketAddress address = getAddress();
             String hostString = address.getHostString();
@@ -971,6 +976,13 @@ public void stop() {
                 System.out.println("Http2TestServerImpl: stop");
                 impl.stop();
             }
+
+            @Override
+            public void close() throws Exception {
+                System.out.println("Http2TestServerImpl: close");
+                impl.close();
+            }
+
             @Override
             public HttpTestContext addHandler(HttpTestHandler handler, String path) {
                 System.out.println("Http2TestServerImpl[" + getAddress()
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java
index ca7e7d3dc30..a4d696ee53c 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.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
@@ -38,6 +38,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocket;
+
 import jdk.internal.net.http.frame.ErrorFrame;
 
 /**
@@ -64,24 +65,18 @@ public class Http2TestServer implements AutoCloseable {
     // request approver which takes the server connection key as the input
     private volatile Predicate<String> newRequestApprover;
 
-    private static ThreadFactory defaultThreadFac =
-        (Runnable r) -> {
-            Thread t = new Thread(r);
-            t.setName("Test-server-pool");
-            return t;
-        };
-
-
-    private static ExecutorService getDefaultExecutor() {
-        return Executors.newCachedThreadPool(defaultThreadFac);
+    private static ExecutorService createExecutor(String name) {
+        String threadNamePrefix = "%s-pool".formatted(name);
+        ThreadFactory threadFactory = Thread.ofPlatform().name(threadNamePrefix, 0).factory();
+        return Executors.newCachedThreadPool(threadFactory);
     }
 
     public Http2TestServer(String serverName, boolean secure, int port) throws Exception {
-        this(serverName, secure, port, getDefaultExecutor(), 50, null, null);
+        this(serverName, secure, port, null, 50, null, null);
     }
 
     public Http2TestServer(boolean secure, int port) throws Exception {
-        this(null, secure, port, getDefaultExecutor(), 50, null, null);
+        this(null, secure, port, null, 50, null, null);
     }
 
     public InetSocketAddress getAddress() {
@@ -197,7 +192,7 @@ public Http2TestServer(InetAddress localAddr,
             server = initPlaintext(port, backlog);
         }
         this.secure = secure;
-        this.exec = exec == null ? getDefaultExecutor() : exec;
+        this.exec = exec == null ? createExecutor(name) : exec;
         this.handlers = Collections.synchronizedMap(new HashMap<>());
         this.properties = properties == null ? new Properties() : properties;
         this.connections = ConcurrentHashMap.newKeySet();

From d802fd0da234275c79b67f74f2cfb15fbe18d7b9 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Wed, 30 Apr 2025 08:45:54 +0000
Subject: [PATCH 202/901] 8352422: [ubsan] Out-of-range reported in
 ciMethod.cpp:917:20: runtime error: 2.68435e+09 is outside the range of
 representable values of type 'int'

Reviewed-by: epeter, dlong
---
 src/hotspot/share/ci/ciMethod.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index 3b2670c3eb0..6b6f1b6f0a8 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -914,8 +914,14 @@ int ciMethod::scale_count(int count, float prof_factor) {
       method_life = counter_life;
     }
     if (counter_life > 0) {
-      count = (int)((double)count * prof_factor * method_life / counter_life + 0.5);
-      count = (count > 0) ? count : 1;
+      double count_d = (double)count * prof_factor * method_life / counter_life + 0.5;
+      if (count_d >= static_cast<double>(INT_MAX)) {
+        // Clamp in case of overflowing int range.
+        count = INT_MAX;
+      } else {
+        count = int(count_d);
+        count = (count > 0) ? count : 1;
+      }
     } else {
       count = 1;
     }

From 765cef45465806e53f11fa7d92b9c184899b0932 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Wed, 30 Apr 2025 09:04:54 +0000
Subject: [PATCH 203/901] 8355878: RISC-V:
 jdk/incubator/vector/DoubleMaxVectorTests.java fails when using RVV

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

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 83c16ce5d82..e96ea480da4 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1596,7 +1596,8 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         __ unspill(as_VectorRegister(Matcher::_regEncode[dst_lo]), ra_->reg2offset(src_lo));
       } else if (src_lo_rc == rc_vector && dst_lo_rc == rc_vector) {
         // vpr to vpr
-        __ vmv1r_v(as_VectorRegister(Matcher::_regEncode[dst_lo]), as_VectorRegister(Matcher::_regEncode[src_lo]));
+        __ vsetvli_helper(T_BYTE, MaxVectorSize);
+        __ vmv_v_v(as_VectorRegister(Matcher::_regEncode[dst_lo]), as_VectorRegister(Matcher::_regEncode[src_lo]));
       } else {
         ShouldNotReachHere();
       }
@@ -1614,7 +1615,8 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
         __ unspill_vmask(as_VectorRegister(Matcher::_regEncode[dst_lo]), ra_->reg2offset(src_lo));
       } else if (src_lo_rc == rc_vector && dst_lo_rc == rc_vector) {
         // vmask to vmask
-        __ vmv1r_v(as_VectorRegister(Matcher::_regEncode[dst_lo]), as_VectorRegister(Matcher::_regEncode[src_lo]));
+        __ vsetvli_helper(T_BYTE, MaxVectorSize >> 3);
+        __ vmv_v_v(as_VectorRegister(Matcher::_regEncode[dst_lo]), as_VectorRegister(Matcher::_regEncode[src_lo]));
       } else {
         ShouldNotReachHere();
       }

From 526951dba731f0e733e22a3bff7ac7a18ce9dece Mon Sep 17 00:00:00 2001
From: Tongbao Zhang <tobytbzhang@tencent.com>
Date: Wed, 30 Apr 2025 09:57:23 +0000
Subject: [PATCH 204/901] 8354145: G1: UseCompressedOops boundary is calculated
 on maximum heap region size instead of maxiumum ergonomic heap region size

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1Arguments.cpp       |  3 +
 src/hotspot/share/gc/g1/g1HeapRegion.cpp      |  4 +
 src/hotspot/share/gc/g1/g1HeapRegion.hpp      |  1 +
 .../gc/arguments/TestG1CompressedOops.java    | 86 +++++++++++++++++++
 4 files changed, 94 insertions(+)
 create mode 100644 test/hotspot/jtreg/gc/arguments/TestG1CompressedOops.java

diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp
index b1cf9fd3046..bd156a69fe6 100644
--- a/src/hotspot/share/gc/g1/g1Arguments.cpp
+++ b/src/hotspot/share/gc/g1/g1Arguments.cpp
@@ -71,6 +71,9 @@ void G1Arguments::initialize_alignments() {
 }
 
 size_t G1Arguments::conservative_max_heap_alignment() {
+  if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
+    return G1HeapRegion::max_ergonomics_size();
+  }
   return G1HeapRegion::max_region_size();
 }
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 288ddae48fb..03610ab520b 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -57,6 +57,10 @@ size_t G1HeapRegion::max_region_size() {
   return G1HeapRegionBounds::max_size();
 }
 
+size_t G1HeapRegion::max_ergonomics_size() {
+  return G1HeapRegionBounds::max_ergonomics_size();
+}
+
 size_t G1HeapRegion::min_region_size_in_words() {
   return G1HeapRegionBounds::min_size() >> LogHeapWordSize;
 }
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
index 62804b47d93..1962d3173b7 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
@@ -316,6 +316,7 @@ class G1HeapRegion : public CHeapObj<mtGC> {
   }
 
   static size_t max_region_size();
+  static size_t max_ergonomics_size();
   static size_t min_region_size_in_words();
 
   // It sets up the heap region size (GrainBytes / GrainWords), as well as
diff --git a/test/hotspot/jtreg/gc/arguments/TestG1CompressedOops.java b/test/hotspot/jtreg/gc/arguments/TestG1CompressedOops.java
new file mode 100644
index 00000000000..5a705ffe8ed
--- /dev/null
+++ b/test/hotspot/jtreg/gc/arguments/TestG1CompressedOops.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (C) 2025 THL A29 Limited, a Tencent company. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package gc.arguments;
+
+/*
+ * @test TestG1CompressedOops
+ * @bug 8354145
+ * @requires vm.flagless
+ * @summary Verify that the flag UseCompressedOops is updated properly
+ * @library /test/lib
+ * @library /
+ * @run driver gc.arguments.TestG1CompressedOops
+ */
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestG1CompressedOops {
+
+  private static void checkG1CompressedOops(String[] flags, boolean expectedValue, int exitValue) throws Exception {
+    ArrayList<String> flagList = new ArrayList<String>();
+    flagList.addAll(Arrays.asList(flags));
+    flagList.add("-XX:+UseG1GC");
+    flagList.add("-XX:+PrintFlagsFinal");
+    flagList.add("-version");
+
+    OutputAnalyzer output = GCArguments.executeTestJava(flagList);
+    output.shouldHaveExitValue(exitValue);
+
+    if (exitValue == 0) {
+      String stdout = output.getStdout();
+      boolean flagValue = getFlagValue("UseCompressedOops", stdout);
+      if (flagValue != expectedValue) {
+        throw new RuntimeException("Wrong value for UseCompressedOops. Expected " + expectedValue + " but got " + flagValue);
+      }
+    }
+  }
+
+  private static boolean getFlagValue(String flag, String where) {
+      Matcher m = Pattern.compile(flag + "\\s+:?=\\s+\\D+").matcher(where);
+      if (!m.find()) {
+          throw new RuntimeException("Could not find value for flag " + flag + " in output string");
+      }
+      String match = m.group();
+      return match.contains("true");
+  }
+
+  public static void main(String args[]) throws Exception {
+    checkG1CompressedOops(new String[] { "-Xmx64m"   /* default is 1m */        }, true, 0);
+    checkG1CompressedOops(new String[] { "-Xmx64m",  "-XX:G1HeapRegionSize=2m"  }, true, 0);
+    checkG1CompressedOops(new String[] { "-Xmx32768m" /* 32g will turn off the usecompressedoops */  }, false, 0);
+    checkG1CompressedOops(new String[] { "-Xmx32760m" }, false, 0);
+    checkG1CompressedOops(new String[] { "-Xmx32736m", /* 32g - 32m will turn on the usecomppressedoops */ }, true, 0);
+
+    // if set G1HeapRegionSize explicitly with -Xmx32736m will turn off the UseCompressedOops
+    checkG1CompressedOops(new String[] { "-Xmx32736m", "-XX:G1HeapRegionSize=1m" }, false, 0);
+    checkG1CompressedOops(new String[] { "-Xmx32256m", "-XX:G1HeapRegionSize=512m" }, true, 0);
+  }
+}

From 0110acaa9086e5adb49be4fff06d66f96b821119 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 30 Apr 2025 11:29:06 +0000
Subject: [PATCH 205/901] 8354791: Use Hashtable.putIfAbsent in CSS constructor

Reviewed-by: serb, aivanov
---
 .../share/classes/javax/swing/text/html/CSS.java          | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
index ddd6c8ec354..8be635a6c49 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
@@ -735,12 +735,8 @@ public CSS() {
         valueConvertor.put(CSS.Attribute.BACKGROUND_ATTACHMENT,
                            valueMapper);
         Object generic = new CssValue();
-        int n = CSS.Attribute.allAttributes.length;
-        for (int i = 0; i < n; i++) {
-            CSS.Attribute key = CSS.Attribute.allAttributes[i];
-            if (valueConvertor.get(key) == null) {
-                valueConvertor.put(key, generic);
-            }
+        for (CSS.Attribute key : CSS.Attribute.allAttributes) {
+            valueConvertor.putIfAbsent(key, generic);
         }
     }
 

From 482538b100856afe2252395d47e576e6c6d885ce Mon Sep 17 00:00:00 2001
From: Rajat Mahajan <rmahajan@openjdk.org>
Date: Wed, 30 Apr 2025 12:23:24 +0000
Subject: [PATCH 206/901] 8351884: Refactor bug8033699.java test  code

Reviewed-by: aivanov, honkar, dmarkov
---
 .../JRadioButton/8033699/bug8033699.java      | 138 +++++++++++-------
 1 file changed, 86 insertions(+), 52 deletions(-)

diff --git a/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java b/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
index 471d30c5c19..e8cabb7e181 100644
--- a/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
+++ b/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
@@ -35,11 +35,10 @@
 import java.awt.event.KeyEvent;
 
 import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
+import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
-import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -55,11 +54,14 @@ public class bug8033699 {
     private static JRadioButton radioBtn2;
     private static JRadioButton radioBtn3;
     private static JRadioButton radioBtnSingle;
+    private static KeyboardFocusManager focusManager;
 
     public static void main(String[] args) throws Throwable {
         robot = new Robot();
 
-        // Get all installed Look and Feels
+        SwingUtilities.invokeAndWait(() ->
+                focusManager = KeyboardFocusManager.getCurrentKeyboardFocusManager());
+
         UIManager.LookAndFeelInfo[] lafs = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo laf : lafs) {
             testLaF(laf);
@@ -97,11 +99,13 @@ private static void testLaF(UIManager.LookAndFeelInfo laf) throws Exception {
             runTest5();
             robot.delay(100);
 
-            // tab from radio button in group to next component in the middle of button group layout
+            // 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
+            // tab to radio button in group from component in the middle of
+            // button group layout
             runTest7();
             robot.delay(100);
 
@@ -109,11 +113,15 @@ private static void testLaF(UIManager.LookAndFeelInfo laf) throws Exception {
             runTest8();
             robot.delay(100);
 
-            // Verify that ActionListener is called when a RadioButton is selected using arrow key.
+            // 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);
+            Throwable cause = e.getCause();
+            throw new RuntimeException("Error testing LaF: " + laf.getName()
+                    + (cause != null ? " - " + cause.getMessage() : ""),
+                    e);
         } finally {
             SwingUtilities.invokeAndWait(() -> {
                 if (mainFrame != null) {
@@ -135,13 +143,12 @@ private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
     }
 
     private static void createAndShowGUI() {
-        mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons");
+        mainFrame = new JFrame("Radio Button Focus Tests");
         btnStart = new JButton("Start");
         btnEnd = new JButton("End");
         btnMiddle = new JButton("Middle");
 
-        JPanel box = new JPanel();
-        box.setLayout(new BoxLayout(box, BoxLayout.Y_AXIS));
+        Box box = Box.createVerticalBox();
         box.setBorder(BorderFactory.createTitledBorder("Grouped Radio Buttons"));
         radioBtn1 = new JRadioButton("A");
         radioBtn2 = new JRadioButton("B");
@@ -161,16 +168,17 @@ private static void createAndShowGUI() {
         radioBtnSingle = new JRadioButton("Not Grouped");
         radioBtnSingle.setSelected(true);
 
-        mainFrame.getContentPane().add(btnStart);
-        mainFrame.getContentPane().add(box);
-        mainFrame.getContentPane().add(radioBtnSingle);
-        mainFrame.getContentPane().add(btnEnd);
+        Box mainBox = Box.createVerticalBox();
+        mainBox.add(btnStart);
+        mainBox.add(box);
+        mainBox.add(radioBtnSingle);
+        mainBox.add(btnEnd);
 
+        mainFrame.add(mainBox);
         mainFrame.getRootPane().setDefaultButton(btnStart);
         btnStart.requestFocus();
 
         mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        mainFrame.setLayout(new BoxLayout(mainFrame.getContentPane(), BoxLayout.Y_AXIS));
 
         mainFrame.setSize(300, 300);
         mainFrame.setLocationRelativeTo(null);
@@ -185,33 +193,41 @@ private static void runTest1() throws Exception {
         hitKey(KeyEvent.VK_TAB);
 
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) {
-                System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
-                throw new RuntimeException("Focus is not on Radio Button Single as Expected");
+            if (focusManager.getFocusOwner() != radioBtnSingle) {
+                System.out.println("Radio Button Group Go To "
+                                   + "Next Component through Tab Key failed");
+                throw new RuntimeException("Focus is not on "
+                                           + "Radio Button Single as Expected");
             }
         });
     }
 
-    // Non-Grouped Radio button as a single component when traversing through tab key
+    // Non-Grouped Radio button as a single component when traversing through
+    // tab key
     private static void runTest2() throws Exception {
         hitKey(KeyEvent.VK_TAB);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnEnd) {
-                System.out.println("Non Grouped Radio Button Go To Next Component through Tab Key failed");
-                throw new RuntimeException("Focus is not on Button End as Expected");
+            if (focusManager.getFocusOwner() != btnEnd) {
+                System.out.println("Non Grouped Radio Button Go To "
+                                   + "Next Component through Tab Key failed");
+                throw new RuntimeException("Focus is not on Button End "
+                                            + "as Expected");
             }
         });
     }
 
-    // Non-Grouped Radio button and Group Radio button as a single component when traversing through shift-tab key
+    // Non-Grouped Radio button and Group Radio button as a single component
+    // when traversing through shift-tab key
     private static void runTest3() throws Exception {
         hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
         hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
         hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) {
-                System.out.println("Radio button Group/Non Grouped Radio Button SHIFT-Tab Key Test failed");
-                throw new RuntimeException("Focus is not on Radio Button A as Expected");
+            if (focusManager.getFocusOwner() != radioBtn1) {
+                System.out.println("Radio button Group/Non Grouped "
+                                   + "Radio Button SHIFT-Tab Key Test failed");
+                throw new RuntimeException("Focus is not on Radio Button A "
+                                           + "as Expected");
             }
         });
     }
@@ -221,9 +237,11 @@ private static void runTest4() throws Exception {
         hitKey(KeyEvent.VK_DOWN);
         hitKey(KeyEvent.VK_RIGHT);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) {
-                System.out.println("Radio button Group UP/LEFT Arrow Key Move Focus Failed");
-                throw new RuntimeException("Focus is not on Radio Button C as Expected");
+            if (focusManager.getFocusOwner() != radioBtn3) {
+                System.out.println("Radio button Group UP/LEFT Arrow Key "
+                                   + "Move Focus Failed");
+                throw new RuntimeException("Focus is not on Radio Button C "
+                                           + "as Expected");
             }
         });
     }
@@ -232,9 +250,11 @@ private static void runTest5() throws Exception {
         hitKey(KeyEvent.VK_UP);
         hitKey(KeyEvent.VK_LEFT);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) {
-                System.out.println("Radio button Group Left/Up Arrow Key Move Focus Failed");
-                throw new RuntimeException("Focus is not on Radio Button A as Expected");
+            if (focusManager.getFocusOwner() != radioBtn1) {
+                System.out.println("Radio button Group Left/Up Arrow Key "
+                                   + "Move Focus Failed");
+                throw new RuntimeException("Focus is not on Radio Button A "
+                                           + "as Expected");
             }
         });
     }
@@ -243,9 +263,11 @@ private static void runTest6() throws Exception {
         hitKey(KeyEvent.VK_UP);
         hitKey(KeyEvent.VK_UP);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn2) {
-                System.out.println("Radio button Group Circle Back To First Button Test");
-                throw new RuntimeException("Focus is not on Radio Button B as Expected");
+            if (focusManager.getFocusOwner() != radioBtn2) {
+                System.out.println("Radio button Group Circle Back To "
+                                   + "First Button Test");
+                throw new RuntimeException("Focus is not on Radio Button B "
+                                           + "as Expected");
             }
         });
     }
@@ -253,9 +275,11 @@ private static void runTest6() throws Exception {
     private static void runTest7() throws Exception {
         hitKey(KeyEvent.VK_TAB);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnMiddle) {
-                System.out.println("Separate Component added in button group layout");
-                throw new RuntimeException("Focus is not on Middle Button as Expected");
+            if (focusManager.getFocusOwner() != btnMiddle) {
+                System.out.println("Separate Component added in"
+                                   + " button group layout");
+                throw new RuntimeException("Focus is not on Middle Button"
+                                           + " as Expected");
             }
         });
     }
@@ -263,18 +287,21 @@ private static void runTest7() throws Exception {
     private static void runTest8() throws Exception {
         hitKey(KeyEvent.VK_TAB);
         SwingUtilities.invokeAndWait(() -> {
-            if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) {
-                System.out.println("Separate Component added in button group layout");
-                throw new RuntimeException("Focus is not on Radio Button Single as Expected");
+            if (focusManager.getFocusOwner() != radioBtnSingle) {
+                System.out.println("Separate Component added in"
+                                   + " button group layout");
+                throw new RuntimeException("Focus is not on Radio Button Single"
+                                           + " as Expected");
             }
         });
     }
 
-    private static boolean actRB1 = false;
-    private static boolean actRB2 = false;
-    private static boolean actRB3 = false;
+    private static volatile boolean actRB1 = false;
+    private static volatile boolean actRB2 = false;
+    private static volatile boolean actRB3 = false;
 
-    // JDK-8226892: Verify that ActionListener is called when a RadioButton is selected using arrow key.
+    // JDK-8226892: Verify that ActionListener is called when a RadioButton
+    // is selected using arrow key
     private static void runTest9() throws Exception {
         SwingUtilities.invokeAndWait(() -> {
             radioBtn1.setSelected(true);
@@ -285,15 +312,19 @@ private static void runTest9() throws Exception {
         ActionListener actLrRB2 = e -> actRB2 = true;
         ActionListener actLrRB3 = e -> actRB3 = true;
 
-        radioBtn1.addActionListener(actLrRB1);
-        radioBtn2.addActionListener(actLrRB2);
-        radioBtn3.addActionListener(actLrRB3);
+        // Adding Action Listeners
+        SwingUtilities.invokeAndWait(() -> {
+            radioBtn1.addActionListener(actLrRB1);
+            radioBtn2.addActionListener(actLrRB2);
+            radioBtn3.addActionListener(actLrRB3);
+        });
 
         hitKey(KeyEvent.VK_DOWN);
         hitKey(KeyEvent.VK_DOWN);
         hitKey(KeyEvent.VK_DOWN);
 
-        String failMessage = "ActionListener not invoked when selected using arrow key.";
+        String failMessage = "ActionListener not invoked when selected using "
+                             + "arrow key.";
         if (!actRB2) {
             throw new RuntimeException("RadioButton 2: " + failMessage);
         }
@@ -304,9 +335,12 @@ private static void runTest9() throws Exception {
             throw new RuntimeException("RadioButton 1: " + failMessage);
         }
 
-        radioBtn1.removeActionListener(actLrRB1);
-        radioBtn2.removeActionListener(actLrRB2);
-        radioBtn3.removeActionListener(actLrRB3);
+        // Removing Action Listeners
+        SwingUtilities.invokeAndWait(() -> {
+            radioBtn1.removeActionListener(actLrRB1);
+            radioBtn2.removeActionListener(actLrRB2);
+            radioBtn3.removeActionListener(actLrRB3);
+        });
     }
 
     private static void hitKey(int keycode) {

From 4c695fa8a459adcdb8cdfe9e90783007c65fb90e Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Wed, 30 Apr 2025 13:50:57 +0000
Subject: [PATCH 207/901] 8351000: StringBuilder getChar and putChar robustness

Reviewed-by: liach, lancea, rgiulietti, pminborg
---
 .../java/lang/AbstractStringBuilder.java      |  14 +-
 .../lang/StringBuilder/RacingSBThreads.java   | 303 ++++++++++++++++++
 2 files changed, 312 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/lang/StringBuilder/RacingSBThreads.java

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index c2f90e22802..b8d209b8a6e 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.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
@@ -29,7 +29,6 @@
 import jdk.internal.math.FloatToDecimal;
 import jdk.internal.util.DecimalDigits;
 
-import java.io.IOException;
 import java.nio.CharBuffer;
 import java.util.Arrays;
 import java.util.Spliterator;
@@ -360,8 +359,12 @@ public void setLength(int newLength) {
      */
     @Override
     public char charAt(int index) {
+        byte coder = this.coder;
+        byte[] value = this.value;
+        // Ensure count is less than or equal to capacity (racy reads and writes can produce inconsistent values)
+        int count = Math.min(this.count, value.length >> coder);
         checkIndex(index, count);
-        if (isLatin1()) {
+        if (coder == LATIN1) {
             return (char)(value[index] & 0xff);
         }
         return StringUTF16.getChar(value, index);
@@ -420,6 +423,7 @@ public int codePointAt(int index) {
      *            of this sequence.
      */
     public int codePointBefore(int index) {
+        byte[] value = this.value;
         int i = index - 1;
         checkIndex(i, count);
         if (isLatin1()) {
@@ -1730,7 +1734,7 @@ private final void putCharsAt(int index, CharSequence s, int off, int end) {
                 } else {
                     inflate();
                     // store c to make sure it has a UTF16 char
-                    StringUTF16.putChar(this.value, j++, c);
+                    StringUTF16.putCharSB(this.value, j++, c);
                     i++;
                     StringUTF16.putCharsSB(this.value, j, s, i, end);
                     return;
@@ -1825,7 +1829,7 @@ private final void appendChars(CharSequence s, int off, int end) {
                     count = j;
                     inflate();
                     // Store c to make sure sb has a UTF16 char
-                    StringUTF16.putChar(this.value, j++, c);
+                    StringUTF16.putCharSB(this.value, j++, c);
                     count = j;
                     i++;
                     StringUTF16.putCharsSB(this.value, j, s, i, end);
diff --git a/test/jdk/java/lang/StringBuilder/RacingSBThreads.java b/test/jdk/java/lang/StringBuilder/RacingSBThreads.java
new file mode 100644
index 00000000000..9177f5de1aa
--- /dev/null
+++ b/test/jdk/java/lang/StringBuilder/RacingSBThreads.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.
+ */
+
+/*
+ * @test
+ * @summary Test multi-threaded use of StringBuilder
+ * @compile --release 8 RacingSBThreads.java
+ * @run main/othervm -esa RacingSBThreads read
+ * @run main/othervm -esa RacingSBThreads insert
+ * @run main/othervm -esa RacingSBThreads append
+ * @run main/othervm -Xcomp RacingSBThreads
+ */
+
+import java.nio.CharBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiConsumer;
+
+/**
+ * Test racing accesses in StringBuilder.
+ * Test source code should be compatible with JDK 8 to allow testing on older versions.
+ */
+public class RacingSBThreads {
+
+    private static final int TIMEOUT_SEC = 1;   // Duration to run each test case
+    private static final int N = 10_000_000;    // static number of iterations for writes and modifies
+    private static final int LEN = 100_000;     // Length of initial SB
+
+    // Strings available to be used as the initial contents of a StringBuilder
+    private static final String UTF16_CHARS = initString('\u1000', LEN);
+    private static final String LATIN1_CHARS = initString('a', LEN);
+
+    // Cache jtreg timeout factor to allow test to be run as a standalone main()
+    private static final double TIMEOUT_FACTOR = Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"));
+
+    // Constant arguments available to be passed to StringBuilder operations
+    private static final StringBuilder otherSB = new StringBuilder("ab\uFF21\uFF22");
+    private static final StringBuilder otherLongerSB = new StringBuilder("abcde\uFF21\uFF22\uFF23\uFF24\uFF25");
+
+    // Create a String with a repeated character
+    private static String initString(char c, int len) {
+        char[] chars = new char[len];
+        Arrays.fill(chars, c);
+        return new String(chars);
+    }
+
+    // Plain unsynchronized reference to a StringBuilder
+    // Updated by the writer thread
+    // Read by the reader thread
+    private StringBuilder buf;
+
+    // The current stress test case
+    private final StressKind stressKind;
+
+    // Count of faults, zero if no faults found
+    private final AtomicInteger faultCount = new AtomicInteger(0);
+
+    /**
+     * Run the stress cases indicated by command line arguments or run all cases.
+     * Running each for TIMEOUT_SEC seconds or until a failure.
+     * The timeout/test duration can be scaled by setting System property
+     * `test.timeout.factor` to a double value, for example, `-Dtest.timeout.factor=2.0`
+     * @param args command line arguments
+     */
+    public static void main(String[] args) {
+        Duration duration = Duration.ofSeconds((long)(TIMEOUT_SEC * TIMEOUT_FACTOR));
+
+        StressKind[] kinds = StressKind.values();
+        if (args.length > 0) {
+            // Parse explicitly supplied StressKind arguments
+            try {
+                 kinds = Arrays.stream(args)
+                         .map((s) -> StressKind.valueOf(s.toUpperCase(Locale.ROOT)))
+                         .toArray(StressKind[]::new);
+            } catch (Exception ex) {
+                System.out.println("Invalid StressKind arguments: " + Arrays.toString(args));
+                return;
+            }
+        }
+
+        // Run each kind for the duration
+        int totalFaults = 0;
+        for (StressKind sk : kinds) {
+            Instant end = Instant.now().plus(duration); // note clock time, not runtime
+            while (Instant.now().isBefore(end)) {
+                int faultCount = new RacingSBThreads(sk).stress();
+                if (faultCount > 0) {
+                    System.out.printf("ERROR: Test case %s, %d faults%n", sk, faultCount);
+                }
+                totalFaults += faultCount;
+            }
+        }
+        if (totalFaults > 0) {
+            throw new AssertionError("Total faults: " + totalFaults);
+        }
+    }
+
+    // Enum of the various test cases with a lambda to invoke for each
+    enum StressKind {
+        /**
+         * Reading characters should always be one of the known values being written to the destination
+         */
+        READ(LATIN1_CHARS, (sb,  chr) -> {
+            char ch = sb.charAt(LEN * 4 / 5);
+            if (ch != chr & ch != (chr & 0xff) & ch != chr >> 8) {
+                throw new AssertionError("Unexpected characters in buffer: 0x" + Integer.toHexString(ch));
+            }
+        }),
+        /**
+         * Insert another StringBuilder; in the face of racy changes to the destination
+         */
+        INSERT(LATIN1_CHARS, (sb, C) -> {
+            sb.insert(sb.length() - 1, otherLongerSB, 0, otherLongerSB.length());
+        }),
+        /**
+         * Appending a StringBuilder in the face of racy changes to the destination
+         */
+        APPEND(LATIN1_CHARS, (sb, C) -> {
+            sb.append(otherSB, 0, otherSB.length());
+        }),
+        ;
+
+        private final BiConsumer<StringBuilder,Character> func;
+        private final String sbInitString;
+
+        /**
+         * Defines a test case.
+         * @param sbInitString the initial contents of the StringBuilder; chooses the coder
+         * @param func the test BiConsumer to apply to the StringBuilder
+         */
+        private StressKind(String sbInitString, BiConsumer<StringBuilder,Character> func) {
+            this.func = func;
+            this.sbInitString = sbInitString;
+        }
+    }
+
+    public RacingSBThreads(StressKind stressKind) {
+        this.stressKind = stressKind;
+    }
+
+    /**
+     * Run the stress case.
+     * One thread continuously creates a StringBuilder and fills it before trimming it to zero.
+     * The other thread performs the test case on the same StringBuilder (without any synchronization)
+     * @return the count of faults
+     */
+    private int stress() {
+        PokeBuilder r = new PokeBuilder(this, N);
+        Writer w = new Writer(this, N);
+
+        Thread writer = new Thread(w::createShrink);
+        Thread reader = new Thread(r::readModify);
+        writer.start();
+        reader.start();
+        join(reader);
+        System.out.println(r);
+        writer.interrupt();
+        join(writer);
+        System.out.println(w);
+        return r.racing.faultCount.get();
+    }
+
+    /**
+     * Wait for a thread to terminate.
+     * @param thread a thread to wait for
+     */
+    private void join(Thread thread) {
+        do {
+            try {
+                thread.join();
+                break;
+            } catch (InterruptedException ie) {
+                // ignore and retry
+            }
+        } while (true);
+    }
+
+    /**
+     * Run a StressKind case in a loop keeping track of exceptions.
+     * The StringBuilder under test is shared with the writer task without benefit of synchronization.
+     */
+    private static class PokeBuilder {
+        private final RacingSBThreads racing;
+        private final int iterations;
+        private int nulls;
+        private int bounds;
+        private int pokeCycles;
+        private int bufChanges;
+
+        public PokeBuilder(RacingSBThreads racing, int iterations) {
+            this.racing = racing;
+            this.iterations = iterations;
+            nulls = 0;
+            bounds = 0;
+            pokeCycles = 0;
+            bufChanges = 0;
+        }
+
+        // Repeatedly change the racy StringBuilder, ignoring and counting exceptions
+        private void readModify() {
+            System.out.println("Starting " + racing.stressKind);
+            sleep(100);
+            for (int i = 0; i < iterations; ++i) {
+                pokeCycles++;
+                StringBuilder sb = racing.buf;  // read once
+                try {
+                    if (sb.length() > Integer.MAX_VALUE / 4) {
+                        sb.setLength(Integer.MAX_VALUE / 4);
+                    }
+                    // Invoke the test case
+                    racing.stressKind.func.accept(sb, racing.stressKind.sbInitString.charAt(0));
+                    if (sb != racing.buf) {
+                        bufChanges++;
+                    }
+                } catch (NullPointerException e) {
+                    ++nulls;
+                } catch (IndexOutOfBoundsException e) {
+                    ++bounds;
+                } catch (AssertionError ae) {
+                    racing.faultCount.incrementAndGet();
+                    throw ae;
+                }
+            }
+        }
+
+        private static void sleep(int i) {
+            try {
+                Thread.sleep(i);
+            } catch (InterruptedException ignored) {
+            }
+        }
+
+        public String toString() {
+            return String.format("pokeCycles:%d, bounds:%d, bufChanges:%d, nulls=%d",
+                    pokeCycles, bounds, bufChanges, nulls);
+        }
+    }
+
+    /**
+     * Repeatedly create and append strings to a StringBuilder shared through fields of RacingSBThreads.
+     * The StringBuilder is created new on each iteration and truncated at the end of each iteration.
+     * Exceptions are counted and reported.
+     */
+    private static class Writer {
+        private final RacingSBThreads racing;
+        private final int iterations;
+        private int sumWriter;
+        private int writeCycles;
+        private int putBounds;
+
+        public Writer(RacingSBThreads racing, int iterations) {
+            this.racing = racing;
+            this.iterations = iterations;
+        }
+
+        private void createShrink() {
+            for (int i = 0; i < iterations; ++i) {
+                if (i % 100_000 == 0) {
+                    if (Thread.interrupted()) {
+                        break;
+                    }
+                }
+                try {
+                    ++writeCycles;
+                    racing.buf = new StringBuilder(racing.stressKind.sbInitString);
+                    racing.buf.append(UTF16_CHARS);
+                    sumWriter += racing.buf.length();
+                    racing.buf.setLength(0);
+                    racing.buf.trimToSize();
+                } catch (Exception ex) {
+                    ++putBounds;
+                }
+            }
+        }
+
+        public String toString() {
+            return String.format("writeCycles:%d, bounds:%d, sumWriter=%d", writeCycles, putBounds, sumWriter);
+        }
+    }
+}

From fbc4691bfa11f31601fd89d05da63e689343e214 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 30 Apr 2025 16:03:25 +0000
Subject: [PATCH 208/901] 8351565: Implement JEP 502: Stable Values (Preview)

Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Reviewed-by: vklang, jvernee, alanb, liach
---
 .../share/classes/java/lang/StableValue.java  | 757 ++++++++++++++++++
 .../share/classes/java/util/Collection.java   |   2 +-
 .../java/util/ImmutableCollections.java       | 275 ++++++-
 .../access/JavaUtilCollectionAccess.java      |   8 +-
 .../jdk/internal/javac/PreviewFeature.java    |   4 +-
 .../lang/stable/StableEnumFunction.java       | 117 +++
 .../internal/lang/stable/StableFunction.java  |  83 ++
 .../lang/stable/StableIntFunction.java        |  83 ++
 .../internal/lang/stable/StableSupplier.java  |  69 ++
 .../jdk/internal/lang/stable/StableUtil.java  | 105 +++
 .../internal/lang/stable/StableValueImpl.java | 218 +++++
 .../lang/StableValue/StableFunctionTest.java  | 237 ++++++
 .../StableValue/StableIntFunctionTest.java    | 109 +++
 .../java/lang/StableValue/StableListTest.java | 436 ++++++++++
 .../java/lang/StableValue/StableMapTest.java  | 357 +++++++++
 .../lang/StableValue/StableSupplierTest.java  | 104 +++
 .../java/lang/StableValue/StableTestUtil.java | 120 +++
 .../StableValue/StableValueFactoriesTest.java |  43 +
 .../lang/StableValue/StableValueTest.java     | 389 +++++++++
 .../StableValuesSafePublicationTest.java      | 179 +++++
 .../StableValue/TrustedFieldTypeTest.java     | 124 +++
 test/jdk/java/util/Collection/MOAT.java       |  19 +-
 .../lang/stable/StableFunctionBenchmark.java  | 105 +++
 .../stable/StableFunctionSingleBenchmark.java |  88 ++
 .../stable/StableIntFunctionBenchmark.java    | 102 +++
 .../StableIntFunctionSingleBenchmark.java     |  84 ++
 .../stable/StableMethodHandleBenchmark.java   | 136 ++++
 .../lang/stable/StableSupplierBenchmark.java  |  94 +++
 .../lang/stable/StableValueBenchmark.java     | 196 +++++
 .../lang/stable/VarHandleHolderBenchmark.java | 174 ++++
 30 files changed, 4806 insertions(+), 11 deletions(-)
 create mode 100644 src/java.base/share/classes/java/lang/StableValue.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
 create mode 100644 src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
 create mode 100644 test/jdk/java/lang/StableValue/StableFunctionTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableIntFunctionTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableListTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableMapTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableSupplierTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableTestUtil.java
 create mode 100644 test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableValueTest.java
 create mode 100644 test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java
 create mode 100644 test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java

diff --git a/src/java.base/share/classes/java/lang/StableValue.java b/src/java.base/share/classes/java/lang/StableValue.java
new file mode 100644
index 00000000000..b12d6f5e921
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/StableValue.java
@@ -0,0 +1,757 @@
+/*
+ * 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 java.lang;
+
+import jdk.internal.access.SharedSecrets;
+import jdk.internal.javac.PreviewFeature;
+import jdk.internal.lang.stable.StableEnumFunction;
+import jdk.internal.lang.stable.StableFunction;
+import jdk.internal.lang.stable.StableIntFunction;
+import jdk.internal.lang.stable.StableSupplier;
+import jdk.internal.lang.stable.StableUtil;
+import jdk.internal.lang.stable.StableValueImpl;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.Supplier;
+
+/**
+ * A stable value is a holder of contents that can be set at most once.
+ * <p>
+ * A {@code StableValue<T>} is typically created using the factory method
+ * {@linkplain StableValue#of() {@code StableValue.of()}}. When created this way,
+ * the stable value is <em>unset</em>, which means it holds no <em>contents</em>.
+ * Its contents, of type {@code T}, can be <em>set</em> by calling
+ * {@linkplain #trySet(Object) trySet()}, {@linkplain #setOrThrow(Object) setOrThrow()},
+ * or {@linkplain #orElseSet(Supplier) orElseSet()}. Once set, the contents
+ * can never change and can be retrieved by calling {@linkplain #orElseThrow() orElseThrow()}
+ * , {@linkplain #orElse(Object) orElse()}, or {@linkplain #orElseSet(Supplier) orElseSet()}.
+ * <p>
+ * Consider the following example where a stable value field "{@code logger}" is a
+ * shallowly immutable holder of contents of type {@code Logger} and that is initially
+ * created as <em>unset</em>, which means it holds no contents. Later in the example, the
+ * state of the "{@code logger}" field is checked and if it is still <em>unset</em>,
+ * the contents is <em>set</em>:
+ *
+ * {@snippet lang = java:
+ * public class Component {
+ *
+ *    // Creates a new unset stable value with no contents
+ *    // @link substring="of" target="#of" :
+ *    private final StableValue<Logger> logger = StableValue.of();
+ *
+ *    private Logger getLogger() {
+ *        if (!logger.isSet()) {
+ *            logger.trySet(Logger.create(Component.class));
+ *        }
+ *        return logger.orElseThrow();
+ *    }
+ *
+ *    public void process() {
+ *        getLogger().info("Process started");
+ *        // ...
+ *    }
+ * }
+ *}
+ * <p>
+ * If {@code getLogger()} is called from several threads, several instances of
+ * {@code Logger} might be created. However, the contents can only be set at most once
+ * meaning the first writer wins.
+ * <p>
+ * In order to guarantee that, even under races, only one instance of {@code Logger} is
+ * ever created, the {@linkplain #orElseSet(Supplier) orElseSet()} method can be used
+ * instead, where the contents are lazily computed, and atomically set, via a
+ * {@linkplain Supplier supplier}. In the example below, the supplier is provided in the
+ * form of a lambda expression:
+ *
+ * {@snippet lang = java:
+ * public class Component {
+ *
+ *    // Creates a new unset stable value with no contents
+ *    // @link substring="of" target="#of" :
+ *    private final StableValue<Logger> logger = StableValue.of();
+ *
+ *    private Logger getLogger() {
+ *        return logger.orElseSet( () -> Logger.create(Component.class) );
+ *    }
+ *
+ *    public void process() {
+ *        getLogger().info("Process started");
+ *        // ...
+ *    }
+ * }
+ *}
+ * <p>
+ * The {@code getLogger()} method calls {@code logger.orElseSet()} on the stable value to
+ * retrieve its contents. If the stable value is <em>unset</em>, then {@code orElseSet()}
+ * evaluates the given supplier, and sets the contents to the result; the result is then
+ * returned to the client. In other words, {@code orElseSet()} guarantees that a
+ * stable value's contents is <em>set</em> before it returns.
+ * <p>
+ * Furthermore, {@code orElseSet()} guarantees that out of one or more suppliers provided,
+ * only at most one is ever evaluated, and that one is only ever evaluated once,
+ * even when {@code logger.orElseSet()} is invoked concurrently. This property is crucial
+ * as evaluation of the supplier may have side effects, for example, the call above to
+ * {@code Logger.create()} may result in storage resources being prepared.
+ *
+ * <h2 id="stable-functions">Stable Functions</h2>
+ * Stable values provide the foundation for higher-level functional abstractions. A
+ * <em>stable supplier</em> is a supplier that computes a value and then caches it into
+ * a backing stable value storage for subsequent use. A stable supplier is created via the
+ * {@linkplain StableValue#supplier(Supplier) StableValue.supplier()} factory, by
+ * providing an underlying {@linkplain Supplier} which is invoked when the stable supplier
+ * is first accessed:
+ *
+ * {@snippet lang = java:
+ * public class Component {
+ *
+ *     private final Supplier<Logger> logger =
+ *             // @link substring="supplier" target="#supplier(Supplier)" :
+ *             StableValue.supplier( () -> Logger.getLogger(Component.class) );
+ *
+ *     public void process() {
+ *        logger.get().info("Process started");
+ *        // ...
+ *     }
+ * }
+ *}
+ * A stable supplier encapsulates access to its backing stable value storage. This means
+ * that code inside {@code Component} can obtain the logger object directly from the
+ * stable supplier, without having to go through an accessor method like {@code getLogger()}.
+ * <p>
+ * A <em>stable int function</em> is a function that takes an {@code int} parameter and
+ * uses it to compute a result that is then cached by the backing stable value storage
+ * for that parameter value. A stable {@link IntFunction} is created via the
+ * {@linkplain StableValue#intFunction(int, IntFunction) StableValue.intFunction()}
+ * factory. Upon creation, the input range (i.e. {@code [0, size)}) is specified together
+ * with an underlying {@linkplain IntFunction} which is invoked at most once per input
+ * value. In effect, the stable int function will act like a cache for the underlying
+ * {@linkplain IntFunction}:
+ *
+ * {@snippet lang = java:
+ * final class PowerOf2Util {
+ *
+ *     private PowerOf2Util() {}
+ *
+ *     private static final int SIZE = 6;
+ *     private static final IntFunction<Integer> UNDERLYING_POWER_OF_TWO =
+ *         v -> 1 << v;
+ *
+ *     private static final IntFunction<Integer> POWER_OF_TWO =
+ *         // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
+ *         StableValue.intFunction(SIZE, UNDERLYING_POWER_OF_TWO);
+ *
+ *     public static int powerOfTwo(int a) {
+ *         return POWER_OF_TWO.apply(a);
+ *     }
+ * }
+ *
+ * int result = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
+ *
+ *}
+ * The {@code PowerOf2Util.powerOfTwo()} function is a <em>partial function</em> that only
+ * allows a subset {@code [0, 5]} of the underlying function's {@code UNDERLYING_POWER_OF_TWO}
+ * input range.
+ *
+ * <p>
+ * A <em>stable function</em> is a function that takes a parameter (of type {@code T}) and
+ * uses it to compute a result (of type {@code R}) that is then cached by the backing
+ * stable value storage for that parameter value. A stable function is created via the
+ * {@linkplain StableValue#function(Set, Function) StableValue.function()} factory.
+ * Upon creation, the input {@linkplain Set} is specified together with an underlying
+ * {@linkplain Function} which is invoked at most once per input value. In effect, the
+ * stable function will act like a cache for the underlying {@linkplain Function}:
+ *
+ * {@snippet lang = java:
+ * class Log2Util {
+ *
+ *     private Log2Util() {}
+ *
+ *     private static final Set<Integer> KEYS =
+ *         Set.of(1, 2, 4, 8, 16, 32);
+ *     private static final UnaryOperator<Integer> UNDERLYING_LOG2 =
+ *         i -> 31 - Integer.numberOfLeadingZeros(i);
+ *
+ *     private static final Function<Integer, Integer> LOG2 =
+ *         // @link substring="function" target="#function(Set,Function)" :
+ *         StableValue.function(KEYS, UNDERLYING_LOG2);
+ *
+ *     public static int log2(int a) {
+ *         return LOG2.apply(a);
+ *     }
+ *
+ * }
+ *
+ * int result = Log2Util.log2(16);   // May eventually constant fold to 4 at runtime
+ *}
+ *
+ * The {@code Log2Util.log2()} function is a <em>partial function</em> that only allows
+ * a subset {@code {1, 2, 4, 8, 16, 32}} of the underlying function's
+ * {@code UNDERLYING_LOG2} input range.
+ *
+ * <h2 id="stable-collections">Stable Collections</h2>
+ * Stable values can also be used as backing storage for
+ * {@linkplain Collection##unmodifiable unmodifiable collections}. A <em>stable list</em>
+ * is an unmodifiable list, backed by an array of stable values. The stable list elements
+ * are computed when they are first accessed, using a provided {@linkplain IntFunction}:
+ *
+ * {@snippet lang = java:
+ * final class PowerOf2Util {
+ *
+ *     private PowerOf2Util() {}
+ *
+ *     private static final int SIZE = 6;
+ *     private static final IntFunction<Integer> UNDERLYING_POWER_OF_TWO =
+ *             v -> 1 << v;
+ *
+ *     private static final List<Integer> POWER_OF_TWO =
+ *         // @link substring="list" target="#list(int,IntFunction)" :
+ *         StableValue.list(SIZE, UNDERLYING_POWER_OF_TWO);
+ *
+ *     public static int powerOfTwo(int a) {
+ *         return POWER_OF_TWO.get(a);
+ *     }
+ * }
+ *
+ * int result = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
+ *
+ * }
+ * <p>
+ * Similarly, a <em>stable map</em> is an unmodifiable map whose keys are known at
+ * construction. The stable map values are computed when they are first accessed,
+ * using a provided {@linkplain Function}:
+ *
+ * {@snippet lang = java:
+ * class Log2Util {
+ *
+ *     private Log2Util() {}
+ *
+ *     private static final Set<Integer> KEYS =
+ *         Set.of(1, 2, 4, 8, 16, 32);
+ *     private static final UnaryOperator<Integer> UNDERLYING_LOG2 =
+ *         i -> 31 - Integer.numberOfLeadingZeros(i);
+ *
+ *     private static final Map<Integer, INTEGER> LOG2 =
+ *         // @link substring="map" target="#map(Set,Function)" :
+ *         StableValue.map(CACHED_KEYS, UNDERLYING_LOG2);
+ *
+ *     public static int log2(int a) {
+ *          return LOG2.get(a);
+ *     }
+ *
+ * }
+ *
+ * int result = Log2Util.log2(16);   // May eventually constant fold to 4 at runtime
+ *
+ *}
+ *
+ * <h2 id="composition">Composing stable values</h2>
+ * A stable value can depend on other stable values, forming a dependency graph
+ * that can be lazily computed but where access to individual elements can still be
+ * performant. In the following example, a single {@code Foo} and a {@code Bar}
+ * instance (that is dependent on the {@code Foo} instance) are lazily created, both of
+ * which are held by stable values:
+ * {@snippet lang = java:
+ * public final class DependencyUtil {
+ *
+ *     private DependencyUtil() {}
+ *
+ *     public static class Foo {
+ *          // ...
+ *      }
+ *
+ *     public static class Bar {
+ *         public Bar(Foo foo) {
+ *              // ...
+ *         }
+ *     }
+ *
+ *     private static final Supplier<Foo> FOO = StableValue.supplier(Foo::new);
+ *     private static final Supplier<Bar> BAR = StableValue.supplier(() -> new Bar(FOO.get()));
+ *
+ *     public static Foo foo() {
+ *         return FOO.get();
+ *     }
+ *
+ *     public static Bar bar() {
+ *         return BAR.get();
+ *     }
+ *
+ * }
+ *}
+ * Calling {@code bar()} will create the {@code Bar} singleton if it is not already
+ * created. Upon such a creation, the dependent {@code Foo} will first be created if
+ * the {@code Foo} does not already exist.
+ * <p>
+ * Another example, which has a more complex dependency graph, is to compute the
+ * Fibonacci sequence lazily:
+ * {@snippet lang = java:
+ * public final class Fibonacci {
+ *
+ *     private Fibonacci() {}
+ *
+ *     private static final int MAX_SIZE_INT = 46;
+ *
+ *     private static final IntFunction<Integer> FIB =
+ *         StableValue.intFunction(MAX_SIZE_INT, Fibonacci::fib);
+ *
+ *     public static int fib(int n) {
+ *         return n < 2
+ *                 ? n
+ *                 : FIB.apply(n - 1) + FIB.apply(n - 2);
+ *     }
+ *
+ * }
+ *}
+ * Both {@code FIB} and {@code Fibonacci::fib} recurse into each other. Because the
+ * stable int function {@code FIB} caches intermediate results, the initial
+ * computational complexity is reduced from exponential to linear compared to a
+ * traditional non-caching recursive fibonacci method. Once computed, the VM is free to
+ * constant-fold expressions like {@code Fibonacci.fib(5)}.
+ * <p>
+ * The fibonacci example above is a directed acyclic graph (i.e.,
+ * it has no circular dependencies and is therefore a dependency tree):
+ *{@snippet lang=text :
+ *
+ *              ___________fib(5)____________
+ *             /                             \
+ *       ____fib(4)____                  ____fib(3)____
+ *      /              \                /              \
+ *    fib(3)          fib(2)          fib(2)          fib(1)
+ *   /     \         /     \         /     \
+ * fib(2) fib(1)   fib(1) fib(0)   fib(1) fib(0)
+ *}
+ *
+ * If there are circular dependencies in a dependency graph, a stable value will
+ * eventually throw an {@linkplain IllegalStateException} upon referencing elements in
+ * a circularity.
+ *
+ * <h2 id="thread-safety">Thread Safety</h2>
+ * The contents of a stable value is guaranteed to be set at most once. If competing
+ * threads are racing to set a stable value, only one update succeeds, while the other
+ * updates are blocked until the stable value is set, whereafter the other updates
+ * observes the stable value is set and leave the stable value unchanged.
+ * <p>
+ * The at-most-once write operation on a stable value that succeeds
+ * (e.g. {@linkplain #trySet(Object) trySet()})
+ * {@linkplain java.util.concurrent##MemoryVisibility <em>happens-before</em>}
+ * any successful read operation (e.g. {@linkplain #orElseThrow()}).
+ * A successful write operation can be either:
+ * <ul>
+ *     <li>a {@link #trySet(Object)} that returns {@code true},</li>
+ *     <li>a {@link #setOrThrow(Object)} that does not throw, or</li>
+ *     <li>an {@link #orElseSet(Supplier)} that successfully runs the supplier</li>
+ * </ul>
+ * A successful read operation can be either:
+ * <ul>
+ *     <li>a {@link #orElseThrow()} that does not throw,</li>
+ *     <li>a {@link #orElse(Object) orElse(other)} that does not return the {@code other} value</li>
+ *     <li>an {@link #orElseSet(Supplier)} that does not {@code throw}, or</li>
+ *     <li>an {@link #isSet()} that returns {@code true}</li>
+ * </ul>
+ * <p>
+ * The method {@link #orElseSet(Supplier)} guarantees that the provided
+ * {@linkplain Supplier} is invoked successfully at most once, even under race.
+ * Invocations of {@link #setOrThrow(Object)} form a total order of zero or more
+ * exceptional invocations followed by zero (if the contents were already set) or one
+ * successful invocation. Since stable functions and stable collections are built on top
+ * of the same principles as {@linkplain StableValue#orElseSet(Supplier) orElseSet()} they
+ * too are thread safe and guarantee at-most-once-per-input invocation.
+ *
+ * <h2 id="performance">Performance</h2>
+ * As the contents of a stable value can never change after it has been set, a JVM
+ * implementation may, for a set stable value, elide all future reads of that
+ * stable value, and instead directly use any contents that it has previously observed.
+ * This is true if the reference to the stable value is a constant (e.g. in cases where
+ * the stable value itself is stored in a {@code static final} field). Stable functions
+ * and collections are built on top of StableValue. As such, they might also be eligible
+ * for the same JVM optimizations as for StableValue.
+ *
+ * @implSpec Implementing classes of {@code StableValue} are free to synchronize on
+ *           {@code this} and consequently, it should be avoided to
+ *           (directly or indirectly) synchronize on a {@code StableValue}. Hence,
+ *           synchronizing on {@code this} may lead to deadlock.
+ *           <p>
+ *           Except for a {@code StableValue}'s contents itself,
+ *           an {@linkplain #orElse(Object) orElse(other)} parameter, and
+ *           an {@linkplain #equals(Object) equals(obj)} parameter; all
+ *           method parameters must be <em>non-null</em> or a {@link NullPointerException}
+ *           will be thrown.
+ *
+ * @implNote A {@code StableValue} is mainly intended to be a non-public field in
+ *           a class and is usually neither exposed directly via accessors nor passed as
+ *           a method parameter.
+ *           <p>
+ *           Stable functions and collections make reasonable efforts to provide
+ *           {@link Object#toString()} operations that do not trigger evaluation
+ *           of the internal stable values when called.
+ *           Stable collections have {@link Object#equals(Object)} operations that try
+ *           to minimize evaluation of the internal stable values when called.
+ *           <p>
+ *           As objects can be set via stable values but never removed, this can be a
+ *           source of unintended memory leaks. A stable value's contents are
+ *           {@linkplain java.lang.ref##reachability strongly reachable}.
+ *           Be advised that reachable stable values will hold their set contents until
+ *           the stable value itself is collected.
+ *           <p>
+ *           A {@code StableValue} that has a type parameter {@code T} that is an array
+ *           type (of arbitrary rank) will only allow the JVM to treat the
+ *           <em>array reference</em> as a stable value but <em>not its components</em>.
+ *           Instead, a {@linkplain #list(int, IntFunction) a stable list} of arbitrary
+ *           depth can be used, which provides stable components. More generally, a
+ *           stable value can hold other stable values of arbitrary depth and still
+ *           provide transitive constantness.
+ *           <p>
+ *           Stable values, functions, and collections are not {@link Serializable}.
+ *
+ * @param <T> type of the contents
+ *
+ * @since 25
+ */
+@PreviewFeature(feature = PreviewFeature.Feature.STABLE_VALUES)
+public sealed interface StableValue<T>
+        permits StableValueImpl {
+
+    // Principal methods
+
+    /**
+     * Tries to set the contents of this StableValue to the provided {@code contents}.
+     * The contents of this StableValue can only be set once, implying this method only
+     * returns {@code true} once.
+     * <p>
+     * When this method returns, the contents of this StableValue is always set.
+     *
+     * @return {@code true} if the contents of this StableValue was set to the
+     *         provided {@code contents}, {@code false} otherwise
+     * @param contents to set
+     * @throws IllegalStateException if a supplier invoked by {@link #orElseSet(Supplier)}
+     *         recursively attempts to set this stable value by calling this method
+     *         directly or indirectly.
+     */
+    boolean trySet(T contents);
+
+    /**
+     * {@return the contents if set, otherwise, returns the provided {@code other} value}
+     *
+     * @param other to return if the contents is not set
+     */
+    T orElse(T other);
+
+    /**
+     * {@return the contents if set, otherwise, throws {@code NoSuchElementException}}
+     *
+     * @throws NoSuchElementException if no contents is set
+     */
+    T orElseThrow();
+
+    /**
+     * {@return {@code true} if the contents is set, {@code false} otherwise}
+     */
+    boolean isSet();
+
+    /**
+     * {@return the contents; if unset, first attempts to compute and set the
+     *          contents using the provided {@code supplier}}
+     * <p>
+     * The provided {@code supplier} is guaranteed to be invoked at most once if it
+     * completes without throwing an exception. If this method is invoked several times
+     * with different suppliers, only one of them will be invoked provided it completes
+     * without throwing an exception.
+     * <p>
+     * If the supplier throws an (unchecked) exception, the exception is rethrown and no
+     * contents is set. The most common usage is to construct a new object serving
+     * as a lazily computed value or memoized result, as in:
+     *
+     * {@snippet lang=java:
+     * Value v = stable.orElseSet(Value::new);
+     * }
+     * <p>
+     * When this method returns successfully, the contents is always set.
+     * <p>
+     * The provided {@code supplier} will only be invoked once even if invoked from
+     * several threads unless the {@code supplier} throws an exception.
+     *
+     * @param  supplier to be used for computing the contents, if not previously set
+     * @throws IllegalStateException if the provided {@code supplier} recursively
+     *                               attempts to set this stable value.
+     */
+    T orElseSet(Supplier<? extends T> supplier);
+
+    // Convenience methods
+
+    /**
+     * Sets the contents of this StableValue to the provided {@code contents}, or, if
+     * already set, throws {@code IllegalStateException}.
+     * <p>
+     * When this method returns (or throws an exception), the contents is always set.
+     *
+     * @param contents to set
+     * @throws IllegalStateException if the contents was already set
+     */
+    void setOrThrow(T contents);
+
+    // Object methods
+
+    /**
+     * {@return {@code true} if {@code this == obj}, {@code false} otherwise}
+     *
+     * @param obj to check for equality
+     */
+    boolean equals(Object obj);
+
+    /**
+     * {@return the {@linkplain System#identityHashCode(Object) identity hash code} of
+     *          {@code this} object}
+     */
+    int hashCode();
+
+    // Factories
+
+    /**
+     * {@return a new unset stable value}
+     * <p>
+     * An unset stable value has no contents.
+     *
+     * @param <T> type of the contents
+     */
+    static <T> StableValue<T> of() {
+        return StableValueImpl.of();
+    }
+
+    /**
+     * {@return a new pre-set stable value with the provided {@code contents}}
+     *
+     * @param contents to set
+     * @param <T>     type of the contents
+     */
+    static <T> StableValue<T> of(T contents) {
+        final StableValue<T> stableValue = StableValue.of();
+        stableValue.trySet(contents);
+        return stableValue;
+    }
+
+    /**
+     * {@return a new stable supplier}
+     * <p>
+     * The returned {@linkplain Supplier supplier} is a caching supplier that records
+     * the value of the provided {@code underlying} supplier upon being first accessed via
+     * the returned supplier's {@linkplain Supplier#get() get()} method.
+     * <p>
+     * The provided {@code underlying} supplier is guaranteed to be successfully invoked
+     * at most once even in a multi-threaded environment. Competing threads invoking the
+     * returned supplier's {@linkplain Supplier#get() get()} method when a value is
+     * already under computation will block until a value is computed or an exception is
+     * thrown by the computing thread. The computing threads will then observe the newly
+     * computed value (if any) and will then never execute.
+     * <p>
+     * If the provided {@code underlying} supplier throws an exception, it is rethrown
+     * to the initial caller and no contents is recorded.
+     * <p>
+     * If the provided {@code underlying} supplier recursively calls the returned
+     * supplier, an {@linkplain IllegalStateException} will be thrown.
+     *
+     * @param underlying supplier used to compute a cached value
+     * @param <T>        the type of results supplied by the returned supplier
+     */
+    static <T> Supplier<T> supplier(Supplier<? extends T> underlying) {
+        Objects.requireNonNull(underlying);
+        return StableSupplier.of(underlying);
+    }
+
+    /**
+     * {@return a new stable {@linkplain IntFunction}}
+     * <p>
+     * The returned function is a caching function that, for each allowed {@code int}
+     * input, records the values of the provided {@code underlying}
+     * function upon being first accessed via the returned function's
+     * {@linkplain IntFunction#apply(int) apply()} method. If the returned function is
+     * invoked with an input that is not in the range {@code [0, size)}, an
+     * {@link IllegalArgumentException} will be thrown.
+     * <p>
+     * The provided {@code underlying} function is guaranteed to be successfully invoked
+     * at most once per allowed input, even in a multi-threaded environment. Competing
+     * threads invoking the returned function's
+     * {@linkplain IntFunction#apply(int) apply()} method when a value is already under
+     * computation will block until a value is computed or an exception is thrown by
+     * the computing thread.
+     * <p>
+     * If invoking the provided {@code underlying} function throws an exception, it is
+     * rethrown to the initial caller and no contents is recorded.
+     * <p>
+     * If the provided {@code underlying} function recursively calls the returned
+     * function for the same input, an {@linkplain IllegalStateException} will
+     * be thrown.
+     *
+     * @param size       the size of the allowed inputs in the continuous
+     *                   interval {@code [0, size)}
+     * @param underlying IntFunction used to compute cached values
+     * @param <R>        the type of results delivered by the returned IntFunction
+     * @throws IllegalArgumentException if the provided {@code size} is negative.
+     */
+    static <R> IntFunction<R> intFunction(int size,
+                                          IntFunction<? extends R> underlying) {
+        StableUtil.assertSizeNonNegative(size);
+        Objects.requireNonNull(underlying);
+        return StableIntFunction.of(size, underlying);
+    }
+
+    /**
+     * {@return a new stable {@linkplain Function}}
+     * <p>
+     * The returned function is a caching function that, for each allowed
+     * input in the given set of {@code inputs}, records the values of the provided
+     * {@code underlying} function upon being first accessed via the returned function's
+     * {@linkplain Function#apply(Object) apply()} method. If the returned function is
+     * invoked with an input that is not in {@code inputs}, an {@link IllegalArgumentException}
+     * will be thrown.
+     * <p>
+     * The provided {@code underlying} function is guaranteed to be successfully invoked
+     * at most once per allowed input, even in a multi-threaded environment. Competing
+     * threads invoking the returned function's {@linkplain Function#apply(Object) apply()}
+     * method when a value is already under computation will block until a value is
+     * computed or an exception is thrown by the computing thread.
+     * <p>
+     * If invoking the provided {@code underlying} function throws an exception, it is
+     * rethrown to the initial caller and no contents is recorded.
+     * <p>
+     * If the provided {@code underlying} function recursively calls the returned
+     * function for the same input, an {@linkplain IllegalStateException} will
+     * be thrown.
+     *
+     * @param inputs     the set of (non-null) allowed input values
+     * @param underlying {@code Function} used to compute cached values
+     * @param <T>        the type of the input to the returned Function
+     * @param <R>        the type of results delivered by the returned Function
+     * @throws NullPointerException if the provided set of {@code inputs} contains a
+     *                              {@code null} element.
+     */
+    static <T, R> Function<T, R> function(Set<? extends T> inputs,
+                                          Function<? super T, ? extends R> underlying) {
+        Objects.requireNonNull(inputs);
+        // Checking that the Set of inputs does not contain a `null` value is made in the
+        // implementing classes.
+        Objects.requireNonNull(underlying);
+        return inputs instanceof EnumSet<?> && !inputs.isEmpty()
+                ? StableEnumFunction.of(inputs, underlying)
+                : StableFunction.of(inputs, underlying);
+    }
+
+    /**
+     * {@return a new stable list with the provided {@code size}}
+     * <p>
+     * The returned list is an {@linkplain Collection##unmodifiable unmodifiable} list
+     * with the provided {@code size}. The list's elements are computed via the
+     * provided {@code mapper} when they are first accessed
+     * (e.g. via {@linkplain List#get(int) List::get}).
+     * <p>
+     * The provided {@code mapper} function is guaranteed to be successfully invoked
+     * at most once per list index, even in a multi-threaded environment. Competing
+     * threads accessing an element already under computation will block until an element
+     * is computed or an exception is thrown by the computing thread.
+     * <p>
+     * If invoking the provided {@code mapper} function throws an exception, it
+     * is rethrown to the initial caller and no value for the element is recorded.
+     * <p>
+     * Any direct {@link List#subList(int, int) subList} or {@link List#reversed()} views
+     * of the returned list are also stable.
+     * <p>
+     * The returned list and its {@link List#subList(int, int) subList} or
+     * {@link List#reversed()} views implement the {@link RandomAccess} interface.
+     * <p>
+     * The returned list is unmodifiable and does not implement the
+     * {@linkplain Collection##optional-operation optional operations} in the
+     * {@linkplain List} interface.
+     * <p>
+     * If the provided {@code mapper} recursively calls the returned list for the
+     * same index, an {@linkplain IllegalStateException} will be thrown.
+     *
+     * @param size   the size of the returned list
+     * @param mapper to invoke whenever an element is first accessed
+     *               (may return {@code null})
+     * @param <E>    the type of elements in the returned list
+     * @throws IllegalArgumentException if the provided {@code size} is negative.
+     */
+    static <E> List<E> list(int size,
+                            IntFunction<? extends E> mapper) {
+        StableUtil.assertSizeNonNegative(size);
+        Objects.requireNonNull(mapper);
+        return SharedSecrets.getJavaUtilCollectionAccess().stableList(size, mapper);
+    }
+
+    /**
+     * {@return a new stable map with the provided {@code keys}}
+     * <p>
+     * The returned map is an {@linkplain Collection##unmodifiable unmodifiable} map whose
+     * keys are known at construction. The map's values are computed via the provided
+     * {@code mapper} when they are first accessed
+     * (e.g. via {@linkplain Map#get(Object) Map::get}).
+     * <p>
+     * The provided {@code mapper} function is guaranteed to be successfully invoked
+     * at most once per key, even in a multi-threaded environment. Competing
+     * threads accessing a value already under computation will block until an element
+     * is computed or an exception is thrown by the computing thread.
+     * <p>
+     * If invoking the provided {@code mapper} function throws an exception, it
+     * is rethrown to the initial caller and no value associated with the provided key
+     * is recorded.
+     * <p>
+     * Any direct {@link Map#values()} or {@link Map#entrySet()} views
+     * of the returned map are also stable.
+     * <p>
+     * The returned map is unmodifiable and does not implement the
+     * {@linkplain Collection##optional-operations optional operations} in the
+     * {@linkplain Map} interface.
+     * <p>
+     * If the provided {@code mapper} recursively calls the returned map for
+     * the same key, an {@linkplain IllegalStateException} will be thrown.
+     *
+     * @param keys   the (non-null) keys in the returned map
+     * @param mapper to invoke whenever an associated value is first accessed
+     *               (may return {@code null})
+     * @param <K>    the type of keys maintained by the returned map
+     * @param <V>    the type of mapped values in the returned map
+     * @throws NullPointerException if the provided set of {@code inputs} contains a
+     *                              {@code null} element.
+     */
+    static <K, V> Map<K, V> map(Set<K> keys,
+                                Function<? super K, ? extends V> mapper) {
+        Objects.requireNonNull(keys);
+        // Checking that the Set of keys does not contain a `null` value is made in the
+        // implementing class.
+        Objects.requireNonNull(mapper);
+        return SharedSecrets.getJavaUtilCollectionAccess().stableMap(keys, mapper);
+    }
+
+}
diff --git a/src/java.base/share/classes/java/util/Collection.java b/src/java.base/share/classes/java/util/Collection.java
index 0253dbc7e1a..43e8db55d7f 100644
--- a/src/java.base/share/classes/java/util/Collection.java
+++ b/src/java.base/share/classes/java/util/Collection.java
@@ -58,7 +58,7 @@
  * constructors) but all of the general-purpose {@code Collection}
  * implementations in the Java platform libraries comply.
  *
- * <p>Certain methods are specified to be
+ * <p><a id="optional-operations"></a>Certain methods are specified to be
  * <i>optional</i>. If a collection implementation doesn't implement a
  * particular operation, it should define the corresponding method to throw
  * {@code UnsupportedOperationException}. Such methods are marked "optional
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index 205a6be6f89..9becf167176 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.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
@@ -36,11 +36,19 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.IntFunction;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
+
 import jdk.internal.access.JavaUtilCollectionAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.lang.stable.StableUtil;
+import jdk.internal.lang.stable.StableValueImpl;
 import jdk.internal.misc.CDS;
+import jdk.internal.util.ArraysSupport;
+import jdk.internal.util.NullableKeyValueHolder;
+import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Stable;
 
 /**
@@ -128,6 +136,12 @@ public <E> List<E> listFromTrustedArray(Object[] array) {
                 public <E> List<E> listFromTrustedArrayNullsAllowed(Object[] array) {
                     return ImmutableCollections.listFromTrustedArrayNullsAllowed(array);
                 }
+                public <E> List<E> stableList(int size, IntFunction<? extends E> mapper) {
+                    return ImmutableCollections.stableList(size, mapper);
+                }
+                public <K, V> Map<K, V> stableMap(Set<K> keys, Function<? super K, ? extends V> mapper) {
+                    return new StableMap<>(keys, mapper);
+                }
             });
         }
     }
@@ -250,6 +264,11 @@ static <E> List<E> listFromTrustedArrayNullsAllowed(Object... input) {
         }
     }
 
+    static <E> List<E> stableList(int size, IntFunction<? extends E> mapper) {
+        // A lazy list is not Serializable so, we cannot return `List.of()` if size == 0
+        return new StableList<>(size, mapper);
+    }
+
     // ---------- List Implementations ----------
 
     @jdk.internal.ValueBased
@@ -448,7 +467,7 @@ static final class SubList<E> extends AbstractImmutableList<E>
         private final int size;
 
         private SubList(AbstractImmutableList<E> root, int offset, int size) {
-            assert root instanceof List12 || root instanceof ListN;
+            assert root instanceof List12 || root instanceof ListN || root instanceof StableList;
             this.root = root;
             this.offset = offset;
             this.size = size;
@@ -499,7 +518,8 @@ private void rangeCheck(int index) {
         }
 
         private boolean allowNulls() {
-            return root instanceof ListN && ((ListN<?>)root).allowNulls;
+            return root instanceof ListN<?> listN && listN.allowNulls
+                    || root instanceof StableList<E>;
         }
 
         @Override
@@ -551,6 +571,15 @@ public <T> T[] toArray(T[] a) {
             }
             return array;
         }
+
+        @Override
+        public String toString() {
+            if (root instanceof StableList<E> stableList) {
+                return StableUtil.renderElements(root, "StableList", stableList.delegates, offset, size);
+            } else {
+                return super.toString();
+            }
+        }
     }
 
     @jdk.internal.ValueBased
@@ -768,6 +797,116 @@ public int lastIndexOf(Object o) {
         }
     }
 
+    @jdk.internal.ValueBased
+    static final class StableList<E> extends AbstractImmutableList<E> {
+
+        @Stable
+        private final IntFunction<? extends E> mapper;
+        @Stable
+        final StableValueImpl<E>[] delegates;
+
+        StableList(int size, IntFunction<? extends E> mapper) {
+            this.mapper = mapper;
+            this.delegates = StableUtil.array(size);
+        }
+
+        @Override public boolean  isEmpty() { return delegates.length == 0;}
+        @Override public int      size() { return delegates.length; }
+        @Override public Object[] toArray() { return copyInto(new Object[size()]); }
+
+        @ForceInline
+        @Override
+        public E get(int i) {
+            final StableValueImpl<E> delegate;
+            try {
+                delegate = delegates[i];
+            } catch (ArrayIndexOutOfBoundsException aioobe) {
+                throw new IndexOutOfBoundsException(i);
+            }
+            return delegate.orElseSet(new Supplier<E>() {
+                        @Override  public E get() { return mapper.apply(i); }});
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            final int size = delegates.length;
+            if (a.length < size) {
+                // Make a new array of a's runtime type, but my contents:
+                T[] n = (T[])Array.newInstance(a.getClass().getComponentType(), size);
+                return copyInto(n);
+            }
+            copyInto(a);
+            if (a.length > size) {
+                a[size] = null; // null-terminate
+            }
+            return a;
+        }
+
+        @Override
+        public int indexOf(Object o) {
+            final int size = size();
+            for (int i = 0; i < size; i++) {
+                if (Objects.equals(o, get(i))) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @Override
+        public int lastIndexOf(Object o) {
+            for (int i = size() - 1; i >= 0; i--) {
+                if (Objects.equals(o, get(i))) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+
+        @SuppressWarnings("unchecked")
+        private <T> T[] copyInto(Object[] a) {
+            final int len = delegates.length;
+            for (int i = 0; i < len; i++) {
+                a[i] = get(i);
+            }
+            return (T[]) a;
+        }
+
+        @Override
+        public List<E> reversed() {
+            return new StableReverseOrderListView<>(this);
+        }
+
+        @Override
+        public String toString() {
+            return StableUtil.renderElements(this, "StableList", delegates);
+        }
+
+        private static final class StableReverseOrderListView<E> extends ReverseOrderListView.Rand<E> {
+
+            private StableReverseOrderListView(List<E> base) {
+                super(base, false);
+            }
+
+            // This method does not evaluate the elements
+            @Override
+            public String toString() {
+                final StableValueImpl<E>[] delegates = ((StableList<E>)base).delegates;
+                final StableValueImpl<E>[] reversed = ArraysSupport.reverse(
+                        Arrays.copyOf(delegates, delegates.length));
+                return StableUtil.renderElements(base, "Collection", reversed);
+            }
+
+            @Override
+            public List<E> reversed() {
+                return base;
+            }
+
+        }
+
+    }
+
     // ---------- Set Implementations ----------
 
     @jdk.internal.ValueBased
@@ -1112,7 +1251,7 @@ public <T> T[] toArray(T[] a) {
     // ---------- Map Implementations ----------
 
     // Not a jdk.internal.ValueBased class; disqualified by fields in superclass AbstractMap
-    abstract static class AbstractImmutableMap<K,V> extends AbstractMap<K,V> implements Serializable {
+    abstract static class AbstractImmutableMap<K,V> extends AbstractMap<K,V> {
         @Override public void clear() { throw uoe(); }
         @Override public V compute(K key, BiFunction<? super K,? super V,? extends V> rf) { throw uoe(); }
         @Override public V computeIfAbsent(K key, Function<? super K,? extends V> mf) { throw uoe(); }
@@ -1143,7 +1282,7 @@ public V getOrDefault(Object key, V defaultValue) {
     }
 
     // Not a jdk.internal.ValueBased class; disqualified by fields in superclass AbstractMap
-    static final class Map1<K,V> extends AbstractImmutableMap<K,V> {
+    static final class Map1<K,V> extends AbstractImmutableMap<K,V> implements Serializable {
         @Stable
         private final K k0;
         @Stable
@@ -1215,7 +1354,7 @@ public void forEach(BiConsumer<? super K, ? super V> action) {
      * @param <V> the value type
      */
     // Not a jdk.internal.ValueBased class; disqualified by fields in superclass AbstractMap
-    static final class MapN<K,V> extends AbstractImmutableMap<K,V> {
+    static final class MapN<K,V> extends AbstractImmutableMap<K,V> implements Serializable {
 
         @Stable
         final Object[] table; // pairs of key, value
@@ -1405,6 +1544,130 @@ private Object writeReplace() {
             return new CollSer(CollSer.IMM_MAP, array);
         }
     }
+
+    static final class StableMap<K, V>
+            extends AbstractImmutableMap<K, V> {
+
+        @Stable
+        private final Function<? super K, ? extends V> mapper;
+        @Stable
+        private final Map<K, StableValueImpl<V>> delegate;
+
+        StableMap(Set<K> keys, Function<? super K, ? extends V> mapper) {
+            this.mapper = mapper;
+            this.delegate = StableUtil.map(keys);
+        }
+
+        @Override public boolean              containsKey(Object o) { return delegate.containsKey(o); }
+        @Override public int                  size() { return delegate.size(); }
+        @Override public Set<Map.Entry<K, V>> entrySet() { return new StableMapEntrySet(); }
+
+        @ForceInline
+        @Override
+        public V get(Object key) {
+            return getOrDefault(key, null);
+        }
+
+        @ForceInline
+        @Override
+        public V getOrDefault(Object key, V defaultValue) {
+            final StableValueImpl<V> stable = delegate.get(key);
+            if (stable == null) {
+                return defaultValue;
+            }
+            @SuppressWarnings("unchecked")
+            final K k = (K) key;
+            return stable.orElseSet(new Supplier<V>() {
+                @Override public V get() { return mapper.apply(k); }});
+        }
+
+        @jdk.internal.ValueBased
+        final class StableMapEntrySet extends AbstractImmutableSet<Map.Entry<K, V>> {
+
+            @Stable
+            private final Set<Map.Entry<K, StableValueImpl<V>>> delegateEntrySet;
+
+            StableMapEntrySet() {
+                this.delegateEntrySet = delegate.entrySet();
+            }
+
+            @Override public Iterator<Map.Entry<K, V>> iterator() { return new LazyMapIterator(); }
+            @Override public int                       size() { return delegateEntrySet.size(); }
+            @Override public int                       hashCode() { return StableMap.this.hashCode(); }
+
+            @Override
+            public String toString() {
+                return StableUtil.renderMappings(this, "StableSet", delegateEntrySet, false);
+            }
+
+            @jdk.internal.ValueBased
+            final class LazyMapIterator implements Iterator<Map.Entry<K, V>> {
+
+                @Stable
+                private final Iterator<Map.Entry<K, StableValueImpl<V>>> delegateIterator;
+
+                LazyMapIterator() {
+                    this.delegateIterator = delegateEntrySet.iterator();
+                }
+
+                @Override public boolean hasNext() { return delegateIterator.hasNext(); }
+
+                @Override
+                public Entry<K, V> next() {
+                    final Map.Entry<K, StableValueImpl<V>> inner = delegateIterator.next();
+                    final K k = inner.getKey();
+                    return new NullableKeyValueHolder<>(k, inner.getValue().orElseSet(new Supplier<V>() {
+                        @Override public V get() { return mapper.apply(k); }}));
+                }
+
+                @Override
+                public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
+                    final Consumer<? super Map.Entry<K, StableValueImpl<V>>> innerAction =
+                            new Consumer<>() {
+                                @Override
+                                public void accept(Entry<K, StableValueImpl<V>> inner) {
+                                    final K k = inner.getKey();
+                                    action.accept(new NullableKeyValueHolder<>(k, inner.getValue().orElseSet(new Supplier<V>() {
+                                        @Override public V get() { return mapper.apply(k); }})));
+                                }
+                            };
+                    delegateIterator.forEachRemaining(innerAction);
+                }
+            }
+        }
+
+        @Override
+        public Collection<V> values() {
+            return new StableMapValues();
+        }
+
+        final class StableMapValues extends AbstractImmutableCollection<V> {
+            @Override public Iterator<V> iterator() { return new ValueIterator(); }
+            @Override public int size() { return StableMap.this.size(); }
+            @Override public boolean isEmpty() { return StableMap.this.isEmpty();}
+            @Override public boolean contains(Object v) { return StableMap.this.containsValue(v); }
+
+            private static final IntFunction<StableValueImpl<?>[]> GENERATOR = new IntFunction<StableValueImpl<?>[]>() {
+                @Override
+                public StableValueImpl<?>[] apply(int len) {
+                    return new StableValueImpl<?>[len];
+                }
+            };
+
+            @Override
+            public String toString() {
+                final StableValueImpl<?>[] values = delegate.values().toArray(GENERATOR);
+                return StableUtil.renderElements(StableMap.this, "StableMap", values);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return StableUtil.renderMappings(this, "StableMap", delegate.entrySet(), true);
+        }
+
+    }
+
 }
 
 // ---------- Serialization Proxy ----------
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java
index f88d57521ac..cac8785b158 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaUtilCollectionAccess.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
@@ -26,8 +26,14 @@
 package jdk.internal.access;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.IntFunction;
 
 public interface JavaUtilCollectionAccess {
     <E> List<E> listFromTrustedArray(Object[] array);
     <E> List<E> listFromTrustedArrayNullsAllowed(Object[] array);
+    <E> List<E> stableList(int size, IntFunction<? extends E> mapper);
+    <K, V> Map<K, V> stableMap(Set<K> keys, Function<? super K, ? extends V> mapper);
 }
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index deb786b42bd..2ed6dde794a 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.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
@@ -80,6 +80,8 @@ public enum Feature {
         MODULE_IMPORTS,
         @JEP(number=478, title="Key Derivation Function API", status="Preview")
         KEY_DERIVATION,
+        @JEP(number = 502, title = "Stable Values", status = "Preview")
+        STABLE_VALUES,
         LANGUAGE_MODEL,
         /**
          * A key for testing.
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
new file mode 100644
index 00000000000..88be2cea1b6
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
@@ -0,0 +1,117 @@
+/*
+ * 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.internal.lang.stable;
+
+import jdk.internal.util.ImmutableBitSetPredicate;
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.IntPredicate;
+import java.util.function.Supplier;
+
+/**
+ * Optimized implementation of a stable Function with enums as keys.
+ *
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ *           rely on reflection, MethodHandles, Streams etc.
+ *
+ * @param firstOrdinal the lowest ordinal used
+ * @param delegates    a delegate array of inputs to StableValue mappings
+ * @param original     the original Function
+ * @param <E>          the type of the input to the function
+ * @param <R>          the type of the result of the function
+ */
+public record StableEnumFunction<E extends Enum<E>, R>(Class<E> enumType,
+                                                       int firstOrdinal,
+                                                       IntPredicate member,
+                                                       @Stable StableValueImpl<R>[] delegates,
+                                                       Function<? super E, ? extends R> original) implements Function<E, R> {
+    @ForceInline
+    @Override
+    public R apply(E value) {
+        if (!member.test(value.ordinal())) { // Implicit null-check of value
+            throw new IllegalArgumentException("Input not allowed: " + value);
+        }
+        final int index = value.ordinal() - firstOrdinal;
+        final StableValueImpl<R> delegate;
+        // Since we did the member.test above, we know the index is in bounds
+        delegate = delegates[index];
+        return delegate.orElseSet(new Supplier<R>() {
+                    @Override public R get() { return original.apply(value); }});
+
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == this;
+    }
+
+    @Override
+    public String toString() {
+        final E[] enumElements = enumType.getEnumConstants();
+        final Collection<Map.Entry<E, StableValueImpl<R>>> entries = new ArrayList<>(enumElements.length);
+        int ordinal = firstOrdinal;
+        for (int i = 0; i < delegates.length; i++, ordinal++) {
+            if (member.test(ordinal)) {
+                entries.add(new AbstractMap.SimpleImmutableEntry<>(enumElements[ordinal], delegates[i]));
+            }
+        }
+        return StableUtil.renderMappings(this, "StableFunction", entries, true);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T, E extends Enum<E>, R> Function<T, R> of(Set<? extends T> inputs,
+                                                              Function<? super T, ? extends R> original) {
+        // The input set is not empty
+        final Class<E> enumType = (Class<E>)inputs.iterator().next().getClass();
+        final BitSet bitSet = new BitSet(enumType.getEnumConstants().length);
+        int min = Integer.MAX_VALUE;
+        int max = Integer.MIN_VALUE;
+        for (T t : inputs) {
+            final int ordinal = ((E) t).ordinal();
+            min = Math.min(min, ordinal);
+            max = Math.max(max, ordinal);
+            bitSet.set(ordinal);
+        }
+        final int size = max - min + 1;
+        final IntPredicate member = ImmutableBitSetPredicate.of(bitSet);
+        return (Function<T, R>) new StableEnumFunction<E, R>(enumType, min, member, StableUtil.array(size), (Function<E, R>) original);
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
new file mode 100644
index 00000000000..1b10593e5e8
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.lang.stable;
+
+import jdk.internal.vm.annotation.ForceInline;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+// Note: It would be possible to just use `LazyMap::get` with some additional logic
+// instead of this class but explicitly providing a class like this provides better
+// debug capability, exception handling, and may provide better performance.
+/**
+ * Implementation of a stable Function.
+ *
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ *           rely on reflection, MethodHandles, Streams etc.
+ *
+ * @param values   a delegate map of inputs to StableValue mappings
+ * @param original the original Function
+ * @param <T>      the type of the input to the function
+ * @param <R>      the type of the result of the function
+ */
+public record StableFunction<T, R>(Map<? extends T, StableValueImpl<R>> values,
+                                   Function<? super T, ? extends R> original) implements Function<T, R> {
+
+    @ForceInline
+    @Override
+    public R apply(T value) {
+        final StableValueImpl<R> stable = values.get(value);
+        if (stable == null) {
+            throw new IllegalArgumentException("Input not allowed: " + value);
+        }
+        return stable.orElseSet(new Supplier<R>() {
+            @Override  public R get() { return original.apply(value); }});
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == this;
+    }
+
+    @Override
+    public String toString() {
+        return StableUtil.renderMappings(this, "StableFunction", values.entrySet(), true);
+    }
+
+    public static <T, R> StableFunction<T, R> of(Set<? extends T> inputs,
+                                                 Function<? super T, ? extends R> original) {
+        return new StableFunction<>(StableUtil.map(inputs), original);
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
new file mode 100644
index 00000000000..8bb046a762d
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.lang.stable;
+
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.util.function.IntFunction;
+import java.util.function.Supplier;
+
+// Note: It would be possible to just use `LazyList::get` instead of this
+// class but explicitly providing a class like this provides better
+// debug capability, exception handling, and may provide better performance.
+/**
+ * Implementation of a stable IntFunction.
+ * <p>
+ * For performance reasons (~10%), we are not delegating to a StableList but are using
+ * the more primitive functions in StableValueUtil that are shared with StableList/StableValueImpl.
+ *
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ *           rely on reflection, MethodHandles, Streams etc.
+ *
+ * @param <R> the return type
+ */
+public record StableIntFunction<R>(@Stable StableValueImpl<R>[] delegates,
+                                   IntFunction<? extends R> original) implements IntFunction<R> {
+
+    @ForceInline
+    @Override
+    public R apply(int index) {
+        final StableValueImpl<R> delegate;
+        try {
+            delegate =  delegates[index];
+        } catch (ArrayIndexOutOfBoundsException ioob) {
+            throw new IllegalArgumentException("Input not allowed: " + index, ioob);
+        }
+        return delegate.orElseSet(new Supplier<R>() {
+                    @Override public R get() { return original.apply(index); }});
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == this;
+    }
+
+    @Override
+    public String toString() {
+        return StableUtil.renderElements(this, "StableIntFunction", delegates);
+    }
+
+    public static <R> StableIntFunction<R> of(int size, IntFunction<? extends R> original) {
+        return new StableIntFunction<>(StableUtil.array(size), original);
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
new file mode 100644
index 00000000000..bdb40648db6
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.lang.stable;
+
+import jdk.internal.vm.annotation.ForceInline;
+
+import java.util.function.Supplier;
+
+/**
+ * Implementation of a stable supplier.
+ * <p>
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ *           rely on reflection, MethodHandles, Streams etc.
+ *
+ * @param <T> the return type
+ */
+public record StableSupplier<T>(StableValueImpl<T> delegate,
+                                Supplier<? extends T> original) implements Supplier<T> {
+
+    @ForceInline
+    @Override
+    public T get() {
+        return delegate.orElseSet(original);
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == this;
+    }
+
+    @Override
+    public String toString() {
+        final Object t = delegate.wrappedContentAcquire();
+        return t == this ? "(this StableSupplier)" : StableValueImpl.renderWrapped(t);
+    }
+
+    public static <T> StableSupplier<T> of(Supplier<? extends T> original) {
+        return new StableSupplier<>(StableValueImpl.of(), original);
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
new file mode 100644
index 00000000000..f6f33f9b1e8
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
@@ -0,0 +1,105 @@
+/*
+ * 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.internal.lang.stable;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
+
+public final class StableUtil {
+
+    private StableUtil() {}
+
+    public static <R> String renderElements(Object self,
+                                            String selfName,
+                                            StableValueImpl<?>[] delegates) {
+        return renderElements(self, selfName, delegates, 0, delegates.length);
+    }
+
+    public static <R> String renderElements(Object self,
+                                            String selfName,
+                                            StableValueImpl<?>[] delegates,
+                                            int offset,
+                                            int length) {
+        final StringJoiner sj = new StringJoiner(", ", "[", "]");
+        for (int i = 0; i < length; i++) {
+            final Object value = delegates[i + offset].wrappedContentAcquire();
+            if (value == self) {
+                sj.add("(this " + selfName + ")");
+            } else {
+                sj.add(StableValueImpl.renderWrapped(value));
+            }
+        }
+        return sj.toString();
+    }
+
+    public static <K, V> String renderMappings(Object self,
+                                               String selfName,
+                                               Iterable<Map.Entry<K, StableValueImpl<V>>> delegates,
+                                               boolean curly) {
+        final StringJoiner sj = new StringJoiner(", ", curly ? "{" : "[", curly ? "}" : "]");
+        for (var e : delegates) {
+            final Object value = e.getValue().wrappedContentAcquire();
+            final String valueString;
+            if (value == self) {
+                valueString = ("(this ") + selfName + ")";
+            } else {
+                valueString = StableValueImpl.renderWrapped(value);
+            }
+            sj.add(e.getKey() + "=" + valueString);
+        }
+        return sj.toString();
+    }
+
+    public static <T> StableValueImpl<T>[] array(int size) {
+        assertSizeNonNegative(size);
+        @SuppressWarnings("unchecked")
+        final var stableValues = (StableValueImpl<T>[]) new StableValueImpl<?>[size];
+        for (int i = 0; i < size; i++) {
+            stableValues[i] = StableValueImpl.of();
+        }
+        return stableValues;
+    }
+
+    public static <K, T> Map<K, StableValueImpl<T>> map(Set<K> keys) {
+        Objects.requireNonNull(keys);
+        @SuppressWarnings("unchecked")
+        final var entries = (Map.Entry<K, StableValueImpl<T>>[]) new Map.Entry<?, ?>[keys.size()];
+        int i = 0;
+        for (K key : keys) {
+            entries[i++] = Map.entry(key, StableValueImpl.of());
+        }
+        return Map.ofEntries(entries);
+    }
+
+    public static void assertSizeNonNegative(int size) {
+        if (size < 0) {
+            throw new IllegalArgumentException("size can not be negative: " + size);
+        }
+    }
+
+}
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
new file mode 100644
index 00000000000..88c80eb6b39
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
@@ -0,0 +1,218 @@
+/*
+ * 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.internal.lang.stable;
+
+import jdk.internal.misc.Unsafe;
+import jdk.internal.vm.annotation.DontInline;
+import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
+
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * The implementation of StableValue.
+ *
+ * @implNote This implementation can be used early in the boot sequence as it does not
+ *           rely on reflection, MethodHandles, Streams etc.
+ *
+ * @param <T> type of the contents
+ */
+public final class StableValueImpl<T> implements StableValue<T> {
+
+    static final String UNSET_LABEL = ".unset";
+
+    // Unsafe allows StableValue to be used early in the boot sequence
+    static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    // Unsafe offsets for direct field access
+
+    private static final long CONTENT_OFFSET =
+            UNSAFE.objectFieldOffset(StableValueImpl.class, "contents");
+    // Used to indicate a holder value is `null` (see field `value` below)
+    // A wrapper method `nullSentinel()` is used for generic type conversion.
+    private static final Object NULL_SENTINEL = new Object();
+
+    // Generally, fields annotated with `@Stable` are accessed by the JVM using special
+    // memory semantics rules (see `parse.hpp` and `parse(1|2|3).cpp`).
+    //
+    // This field is used directly and reflectively via Unsafe using explicit memory semantics.
+    //
+    // | Value          |  Meaning      |
+    // | -------------- |  ------------ |
+    // | null           |  Unset        |
+    // | NULL_SENTINEL  |  Set(null)    |
+    // | other          |  Set(other)   |
+    //
+    @Stable
+    private Object contents;
+
+    // Only allow creation via the factory `StableValueImpl::newInstance`
+    private StableValueImpl() {}
+
+    @ForceInline
+    @Override
+    public boolean trySet(T contents) {
+        if (wrappedContentAcquire() != null) {
+            return false;
+        }
+        // Prevent reentry via an orElseSet(supplier)
+        preventReentry();
+        // Mutual exclusion is required here as `orElseSet` might also
+        // attempt to modify the `wrappedValue`
+        synchronized (this) {
+            return wrapAndSet(contents);
+        }
+    }
+
+    @ForceInline
+    @Override
+    public void setOrThrow(T contents) {
+        if (!trySet(contents)) {
+            // Neither the set contents nor the provided contents is revealed in the
+            // exception message as it might be sensitive.
+            throw new IllegalStateException("The contents is already set");
+        }
+    }
+
+    @ForceInline
+    @Override
+    public T orElseThrow() {
+        final Object t = wrappedContentAcquire();
+        if (t == null) {
+            throw new NoSuchElementException("No contents set");
+        }
+        return unwrap(t);
+    }
+
+    @ForceInline
+    @Override
+    public T orElse(T other) {
+        final Object t = wrappedContentAcquire();
+        return (t == null) ? other : unwrap(t);
+    }
+
+    @ForceInline
+    @Override
+    public boolean isSet() {
+        return wrappedContentAcquire() != null;
+    }
+
+    @ForceInline
+    @Override
+    public T orElseSet(Supplier<? extends T> supplier) {
+        Objects.requireNonNull(supplier);
+        final Object t = wrappedContentAcquire();
+        return (t == null) ? orElseSetSlowPath(supplier) : unwrap(t);
+    }
+
+    @DontInline
+    private T orElseSetSlowPath(Supplier<? extends T> supplier) {
+        preventReentry();
+        synchronized (this) {
+            final Object t = contents;  // Plain semantics suffice here
+            if (t == null) {
+                final T newValue = supplier.get();
+                // The mutex is not reentrant so we know newValue should be returned
+                wrapAndSet(newValue);
+                return newValue;
+            }
+            return unwrap(t);
+        }
+    }
+
+    // The methods equals() and hashCode() should be based on identity (defaults from Object)
+
+    @Override
+    public String toString() {
+        final Object t = wrappedContentAcquire();
+        return t == this
+                ? "(this StableValue)"
+                : renderWrapped(t);
+    }
+
+    // Internal methods shared with other internal classes
+
+    @ForceInline
+    public Object wrappedContentAcquire() {
+        return UNSAFE.getReferenceAcquire(this, CONTENT_OFFSET);
+    }
+
+    static String renderWrapped(Object t) {
+        return (t == null) ? UNSET_LABEL : Objects.toString(unwrap(t));
+    }
+
+    // Private methods
+
+    // This method is not annotated with @ForceInline as it is always called
+    // in a slow path.
+    private void preventReentry() {
+        if (Thread.holdsLock(this)) {
+            throw new IllegalStateException("Recursive initialization of a stable value is illegal");
+        }
+    }
+
+    /**
+     * Wraps the provided {@code newValue} and tries to set the contents.
+     * <p>
+     * This method ensures the {@link Stable} field is written to at most once.
+     *
+     * @param newValue to wrap and set
+     * @return if the contents was set
+     */
+    @ForceInline
+    private boolean wrapAndSet(Object newValue) {
+        assert Thread.holdsLock(this);
+        // We know we hold the monitor here so plain semantic is enough
+        if (contents == null) {
+            UNSAFE.putReferenceRelease(this, CONTENT_OFFSET, wrap(newValue));
+            return true;
+        }
+        return false;
+    }
+
+
+    // Wraps `null` values into a sentinel value
+    @ForceInline
+    private static Object wrap(Object t) {
+        return (t == null) ? NULL_SENTINEL : t;
+    }
+
+    // Unwraps null sentinel values into `null`
+    @SuppressWarnings("unchecked")
+    @ForceInline
+    private static <T> T unwrap(Object t) {
+        return t != NULL_SENTINEL ? (T) t : null;
+    }
+
+    // Factory
+
+    public static <T> StableValueImpl<T> of() {
+        return new StableValueImpl<>();
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableFunctionTest.java b/test/jdk/java/lang/StableValue/StableFunctionTest.java
new file mode 100644
index 00000000000..4476c046957
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableFunctionTest.java
@@ -0,0 +1,237 @@
+/*
+ * 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 Basic tests for StableFunction methods
+ * @enablePreview
+ * @run junit StableFunctionTest
+ */
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableFunctionTest {
+
+    enum Value {
+        // Zero is here so that we have enums with ordinals before the first one
+        // actually used in input sets (i.e. ZERO is not in the input set)
+        ZERO(0),
+        ILLEGAL_BEFORE(-1),
+        // Valid values
+        THIRTEEN(13),
+        ILLEGAL_BETWEEN(-2),
+        FORTY_TWO(42),
+        // Illegal values (not in the input set)
+        ILLEGAL_AFTER(-3);
+
+        final int intValue;
+
+        Value(int intValue) {
+            this.intValue = intValue;
+        }
+
+        int asInt() {
+            return intValue;
+        }
+
+    }
+
+    private static final Function<Value, Integer> MAPPER = Value::asInt;
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void factoryInvariants(Set<Value> inputs) {
+        assertThrows(NullPointerException.class, () -> StableValue.function(null, MAPPER));
+        assertThrows(NullPointerException.class, () -> StableValue.function(inputs, null));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void basic(Set<Value> inputs) {
+        basic(inputs, MAPPER);
+        toStringTest(inputs, MAPPER);
+        basic(inputs, _ -> null);
+        toStringTest(inputs, _ -> null);
+    }
+
+    void basic(Set<Value> inputs, Function<Value, Integer> mapper) {
+        StableTestUtil.CountingFunction<Value, Integer> cif = new StableTestUtil.CountingFunction<>(mapper);
+        var cached = StableValue.function(inputs, cif);
+        assertEquals(mapper.apply(Value.FORTY_TWO), cached.apply(Value.FORTY_TWO));
+        assertEquals(1, cif.cnt());
+        assertEquals(mapper.apply(Value.FORTY_TWO), cached.apply(Value.FORTY_TWO));
+        assertEquals(1, cif.cnt());
+        var x0 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_BEFORE));
+        assertEquals("Input not allowed: ILLEGAL_BEFORE", x0.getMessage());
+        var x1 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_BETWEEN));
+        assertEquals("Input not allowed: ILLEGAL_BETWEEN", x1.getMessage());
+        var x2 = assertThrows(IllegalArgumentException.class, () -> cached.apply(Value.ILLEGAL_AFTER));
+        assertEquals("Input not allowed: ILLEGAL_AFTER", x2.getMessage());
+    }
+
+    void toStringTest(Set<Value> inputs, Function<Value, Integer> mapper) {
+        var cached = StableValue.function(inputs, mapper);
+        cached.apply(Value.FORTY_TWO);
+        var toString = cached.toString();
+        assertTrue(toString.startsWith("{"));
+        // Key order is unspecified
+        assertTrue(toString.contains(Value.THIRTEEN + "=.unset"));
+        assertTrue(toString.contains(Value.FORTY_TWO + "=" + mapper.apply(Value.FORTY_TWO)));
+        assertTrue(toString.endsWith("}"));
+        // One between the values
+        assertEquals(1L, toString.chars().filter(ch -> ch == ',').count());
+    }
+
+    @ParameterizedTest
+    @MethodSource("emptySets")
+    void empty(Set<Value> inputs) {
+        Function<Value, Integer> f0 = StableValue.function(inputs, Value::asInt);
+        Function<Value, Integer> f1 = StableValue.function(inputs, Value::asInt);
+        assertEquals("{}", f0.toString());
+        assertThrows(NullPointerException.class, () -> f0.apply(null));
+        assertNotEquals(f0, f1);
+        assertNotEquals(null, f0);
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void exception(Set<Value> inputs) {
+        StableTestUtil.CountingFunction<Value, Integer> cif = new StableTestUtil.CountingFunction<>(_ -> {
+            throw new UnsupportedOperationException();
+        });
+        var cached = StableValue.function(inputs, cif);
+        assertThrows(UnsupportedOperationException.class, () -> cached.apply(Value.FORTY_TWO));
+        assertEquals(1, cif.cnt());
+        assertThrows(UnsupportedOperationException.class, () -> cached.apply(Value.FORTY_TWO));
+        assertEquals(2, cif.cnt());
+        var toString = cached.toString();
+        assertTrue(toString.startsWith("{"));
+        // Key order is unspecified
+        assertTrue(toString.contains(Value.THIRTEEN + "=.unset"));
+        assertTrue(toString.contains(Value.FORTY_TWO + "=.unset"));
+        assertTrue(toString.endsWith("}"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("nonEmptySets")
+    void circular(Set<Value> inputs) {
+        final AtomicReference<Function<?, ?>> ref = new AtomicReference<>();
+        Function<Value, Function<?, ?>> cached = StableValue.function(inputs, _ -> ref.get());
+        ref.set(cached);
+        cached.apply(Value.FORTY_TWO);
+        var toString = cached.toString();
+        assertTrue(toString.contains("FORTY_TWO=(this StableFunction)"), toString);
+        assertDoesNotThrow(cached::hashCode);
+        assertDoesNotThrow((() -> cached.equals(cached)));
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void equality(Set<Value> inputs) {
+        Function<Value, Integer> mapper = Value::asInt;
+        Function<Value, Integer> f0 = StableValue.function(inputs, mapper);
+        Function<Value, Integer> f1 = StableValue.function(inputs, mapper);
+        // No function is equal to another function
+        assertNotEquals(f0, f1);
+    }
+
+    @ParameterizedTest
+    @MethodSource("allSets")
+    void hashCodeStable(Set<Value> inputs) {
+        Function<Value, Integer> f0 = StableValue.function(inputs, Value::asInt);
+        assertEquals(System.identityHashCode(f0), f0.hashCode());
+        if (!inputs.isEmpty()) {
+            f0.apply(Value.FORTY_TWO);
+            assertEquals(System.identityHashCode(f0), f0.hashCode());
+        }
+    }
+
+    @Test
+    void nullKeys() {
+        Set<Value> inputs = new HashSet<>();
+        inputs.add(Value.FORTY_TWO);
+        inputs.add(null);
+        assertThrows(NullPointerException.class, () -> StableValue.function(inputs, MAPPER));
+    }
+
+    @Test
+    void usesOptimizedVersion() {
+        Function<Value, Integer> enumFunction = StableValue.function(EnumSet.of(Value.FORTY_TWO), Value::asInt);
+        assertEquals("jdk.internal.lang.stable.StableEnumFunction", enumFunction.getClass().getName());
+        Function<Value, Integer> emptyFunction = StableValue.function(Set.of(), Value::asInt);
+        assertEquals("jdk.internal.lang.stable.StableFunction", emptyFunction.getClass().getName());
+    }
+
+    private static Stream<Set<Value>> nonEmptySets() {
+        return Stream.of(
+                Set.of(Value.FORTY_TWO, Value.THIRTEEN),
+                linkedHashSet(Value.THIRTEEN, Value.FORTY_TWO),
+                treeSet(Value.FORTY_TWO, Value.THIRTEEN),
+                EnumSet.of(Value.FORTY_TWO, Value.THIRTEEN)
+        );
+    }
+
+    private static Stream<Set<Value>> emptySets() {
+        return Stream.of(
+                Set.of(),
+                linkedHashSet(),
+                treeSet(),
+                EnumSet.noneOf(Value.class)
+        );
+    }
+
+    private static Stream<Set<Value>> allSets() {
+        return Stream.concat(
+                nonEmptySets(),
+                emptySets()
+        );
+    }
+
+    static Set<Value> treeSet(Value... values) {
+        return populate(new TreeSet<>(Comparator.comparingInt(Value::asInt).reversed()),values);
+    }
+
+    static Set<Value> linkedHashSet(Value... values) {
+        return populate(new LinkedHashSet<>(), values);
+    }
+
+    static Set<Value> populate(Set<Value> set, Value... values) {
+        set.addAll(Arrays.asList(values));
+        return set;
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableIntFunctionTest.java b/test/jdk/java/lang/StableValue/StableIntFunctionTest.java
new file mode 100644
index 00000000000..7397a688ee6
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableIntFunctionTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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 Basic tests for StableIntFunction methods
+ * @enablePreview
+ * @run junit StableIntFunctionTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.IntFunction;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableIntFunctionTest {
+
+    private static final int SIZE = 2;
+    private static final IntFunction<Integer> MAPPER = i -> i;
+
+    @Test
+    void factoryInvariants() {
+        assertThrows(IllegalArgumentException.class, () -> StableValue.intFunction(-1, MAPPER));
+        assertThrows(NullPointerException.class, () -> StableValue.intFunction(SIZE, null));
+    }
+
+    @Test
+    void basic() {
+        basic(MAPPER);
+        basic(i -> null);
+    }
+
+    void basic(IntFunction<Integer> mapper) {
+        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(mapper);
+        var cached = StableValue.intFunction(SIZE, cif);
+        assertEquals("[.unset, .unset]", cached.toString());
+        assertEquals(mapper.apply(1), cached.apply(1));
+        assertEquals(1, cif.cnt());
+        assertEquals(mapper.apply(1), cached.apply(1));
+        assertEquals(1, cif.cnt());
+        assertEquals("[.unset, " + mapper.apply(1) + "]", cached.toString());
+        assertThrows(IllegalArgumentException.class, () -> cached.apply(SIZE));
+        assertThrows(IllegalArgumentException.class, () -> cached.apply(-1));
+        assertThrows(IllegalArgumentException.class, () -> cached.apply(1_000_000));
+    }
+
+    @Test
+    void exception() {
+        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(_ -> {
+            throw new UnsupportedOperationException();
+        });
+        var cached = StableValue.intFunction(SIZE, cif);
+        assertThrows(UnsupportedOperationException.class, () -> cached.apply(1));
+        assertEquals(1, cif.cnt());
+        assertThrows(UnsupportedOperationException.class, () -> cached.apply(1));
+        assertEquals(2, cif.cnt());
+        assertEquals("[.unset, .unset]", cached.toString());
+    }
+
+    @Test
+    void circular() {
+        final AtomicReference<IntFunction<?>> ref = new AtomicReference<>();
+        IntFunction<IntFunction<?>> cached = StableValue.intFunction(SIZE, _ -> ref.get());
+        ref.set(cached);
+        cached.apply(0);
+        String toString = cached.toString();
+        assertEquals("[(this StableIntFunction), .unset]", toString);
+        assertDoesNotThrow(cached::hashCode);
+        assertDoesNotThrow((() -> cached.equals(cached)));
+    }
+
+    @Test
+    void equality() {
+        IntFunction<Integer> f0 = StableValue.intFunction(8, MAPPER);
+        IntFunction<Integer> f1 = StableValue.intFunction(8, MAPPER);
+        // No function is equal to another function
+        assertNotEquals(f0, f1);
+    }
+
+    @Test
+    void hashCodeStable() {
+        IntFunction<Integer> f0 = StableValue.intFunction(8, MAPPER);
+        assertEquals(System.identityHashCode(f0), f0.hashCode());
+        f0.apply(4);
+        assertEquals(System.identityHashCode(f0), f0.hashCode());
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableListTest.java b/test/jdk/java/lang/StableValue/StableListTest.java
new file mode 100644
index 00000000000..f0ae081c76c
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableListTest.java
@@ -0,0 +1,436 @@
+/*
+ * 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 Basic tests for StableList methods
+ * @modules java.base/jdk.internal.lang.stable
+ * @enablePreview
+ * @run junit StableListTest
+ */
+
+import jdk.internal.lang.stable.StableUtil;
+import jdk.internal.lang.stable.StableValueImpl;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.IntFunction;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableListTest {
+
+    private static final int ZERO = 0;
+    private static final int INDEX = 7;
+    private static final int SIZE = 31;
+    private static final IntFunction<Integer> IDENTITY = i -> i;
+
+    @Test
+    void factoryInvariants() {
+        assertThrows(NullPointerException.class, () -> StableValue.list(SIZE, null));
+        assertThrows(IllegalArgumentException.class, () -> StableValue.list(-1, IDENTITY));
+    }
+
+    @Test
+    void isEmpty() {
+        assertFalse(newList().isEmpty());
+        assertTrue(newEmptyList().isEmpty());
+    }
+
+    @Test
+    void size() {
+        assertEquals(SIZE, newList().size());
+        assertEquals(ZERO, newEmptyList().size());
+    }
+
+    @Test
+    void get() {
+        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(IDENTITY);
+        var lazy = StableValue.list(SIZE, cif);
+        for (int i = 0; i < SIZE; i++) {
+            assertEquals(i, lazy.get(i));
+            assertEquals(i + 1, cif.cnt());
+            assertEquals(i, lazy.get(i));
+            assertEquals(i + 1, cif.cnt());
+        }
+    }
+
+    @Test
+    void getException() {
+        StableTestUtil.CountingIntFunction<Integer> cif = new StableTestUtil.CountingIntFunction<>(_ -> {
+            throw new UnsupportedOperationException();
+        });
+        var lazy = StableValue.list(SIZE, cif);
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(INDEX));
+        assertEquals(1, cif.cnt());
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(INDEX));
+        assertEquals(2, cif.cnt());
+    }
+
+    @Test
+    void toArray() {
+        assertArrayEquals(new Object[ZERO], newEmptyList().toArray());
+        assertArrayEquals(newRegularList().toArray(), newList().toArray());
+    }
+
+    @Test
+    void toArrayWithArrayLarger() {
+        Integer[] actual = new Integer[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            actual[INDEX] = 100 + i;
+        }
+        var list = StableValue.list(INDEX, IDENTITY);
+        assertSame(actual, list.toArray(actual));
+        Integer[] expected = IntStream.range(0, SIZE)
+                .mapToObj(i -> i < INDEX ? i : null)
+                .toArray(Integer[]::new);
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    void toArrayWithArraySmaller() {
+        Integer[] arr = new Integer[INDEX];
+        Integer[] actual = newList().toArray(arr);
+        assertNotSame(arr, actual);
+        Integer[] expected = newRegularList().toArray(new Integer[0]);
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    void toArrayWithGenerator() {
+        Integer[] expected = newRegularList().toArray(Integer[]::new);
+        Integer[] actual = newList().toArray(Integer[]::new);
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    void firstIndex() {
+        var lazy = newList();
+        for (int i = INDEX; i < SIZE; i++) {
+            assertEquals(i, lazy.indexOf(i));
+        }
+        assertEquals(-1, lazy.indexOf(SIZE + 1));
+    }
+
+    @Test
+    void lastIndex() {
+        var lazy = newList();
+        for (int i = INDEX; i < SIZE; i++) {
+            assertEquals(i, lazy.lastIndexOf(i));
+        }
+        assertEquals(-1, lazy.lastIndexOf(SIZE + 1));
+    }
+
+    @Test
+    void toStringTest() {
+        assertEquals("[]", newEmptyList().toString());
+        var list = StableValue.list(2, IDENTITY);
+        assertEquals("[.unset, .unset]", list.toString());
+        list.get(0);
+        assertEquals("[0, .unset]", list.toString());
+        list.get(1);
+        assertEquals("[0, 1]", list.toString());
+    }
+
+    @Test
+    void hashCodeTest() {
+        assertEquals(List.of().hashCode(), newEmptyList().hashCode());
+        assertEquals(newRegularList().hashCode(), newList().hashCode());
+    }
+
+    @Test
+    void equalsTest() {
+        assertTrue(newEmptyList().equals(List.of()));
+        assertTrue(List.of().equals(newEmptyList()));
+        assertTrue(newList().equals(newRegularList()));
+        assertTrue(newRegularList().equals(newList()));
+        assertFalse(newList().equals("A"));
+    }
+
+    @Test
+    void equalsPartialEvaluationTest() {
+        var list = StableValue.list(2, IDENTITY);
+        assertFalse(list.equals(List.of(0)));
+        assertEquals("[0, .unset]", list.toString());
+        assertTrue(list.equals(List.of(0, 1)));
+        assertEquals("[0, 1]", list.toString());
+    }
+
+    @Test
+    void iteratorTotal() {
+        var iterator = newList().iterator();
+        for (int i = 0; i < SIZE; i++) {
+            assertTrue(iterator.hasNext());
+            assertTrue(iterator.hasNext());
+            assertEquals(i, iterator.next());
+        }
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, iterator::next);
+        AtomicInteger cnt = new AtomicInteger();
+        iterator.forEachRemaining(_ -> cnt.incrementAndGet());
+        assertEquals(0, cnt.get());
+    }
+
+    @Test
+    void iteratorPartial() {
+        var iterator = newList().iterator();
+        for (int i = 0; i < INDEX; i++) {
+            assertTrue(iterator.hasNext());
+            assertTrue(iterator.hasNext());
+            assertEquals(i, iterator.next());
+        }
+        assertTrue(iterator.hasNext());
+        AtomicInteger cnt = new AtomicInteger();
+        iterator.forEachRemaining(_ -> cnt.incrementAndGet());
+        assertEquals(SIZE - INDEX, cnt.get());
+        assertFalse(iterator.hasNext());
+        assertThrows(NoSuchElementException.class, iterator::next);
+    }
+
+    @Test
+    void subList() {
+        var lazy = newList();
+        var lazySubList = lazy.subList(1, SIZE);
+        assertInstanceOf(RandomAccess.class, lazySubList);
+        var regularList = newRegularList();
+        var regularSubList = regularList.subList(1, SIZE);
+        assertEquals(regularSubList, lazySubList);
+    }
+
+    @Test
+    void subList2() {
+        var lazy = newList();
+        var lazySubList = lazy.subList(1, SIZE);
+        lazySubList.get(0);
+        var eq = newList();
+        eq.get(1);
+        assertEquals(eq.toString(), lazy.toString());
+    }
+
+    @Test
+    void subListToString() {
+        subListToString0(newList());
+        subListToString0(newList().subList(1, SIZE));
+        subListToString0(newList().subList(1, SIZE).subList(0, SIZE - 2));
+    }
+
+    void subListToString0(List<Integer> subList) {
+        assertEquals(asString(".unset", subList), subList.toString());
+
+        var first = subList.getFirst();
+        assertEquals(asString(first.toString(), subList), subList.toString());
+    }
+
+    @Test
+    void reversed() {
+        var reversed = newList().reversed();
+        assertInstanceOf(RandomAccess.class, reversed);
+        assertEquals(SIZE - 1, reversed.getFirst());
+        assertEquals(0, reversed.getLast());
+
+        var reversed2 = reversed.reversed();
+        assertInstanceOf(RandomAccess.class, reversed2);
+        assertEquals(0, reversed2.getFirst());
+        assertEquals(SIZE - 1, reversed2.getLast());
+        // Make sure we get back a non-reversed implementation
+        assertEquals("java.util.ImmutableCollections$StableList", reversed2.getClass().getName());
+    }
+
+    @Test
+    void reversedToString() {
+        var reversed = newList().reversed();
+        subListToString0(reversed);
+    }
+
+    @Test
+    void subListReversedToString() {
+        var list = newList().subList(1, SIZE - 1).reversed();
+        // This combination is not lazy. There has to be a limit somewhere.
+        var regularList = newRegularList().subList(1, SIZE - 1).reversed();
+        assertEquals(regularList.toString(), list.toString());
+    }
+
+    @Test
+    void recursiveCall() {
+        AtomicReference<IntFunction<Integer>> ref = new AtomicReference<>();
+        var lazy = StableValue.list(SIZE, i -> ref.get().apply(i));
+        ref.set(lazy::get);
+        var x = assertThrows(IllegalStateException.class, () -> lazy.get(INDEX));
+        assertEquals("Recursive initialization of a stable value is illegal", x.getMessage());
+    }
+
+    // Immutability
+
+    @ParameterizedTest
+    @MethodSource("unsupportedOperations")
+    void unsupported(Operation operation) {
+        assertThrowsForOperation(UnsupportedOperationException.class, operation);
+    }
+
+    // Method parameter invariant checking
+
+    @ParameterizedTest
+    @MethodSource("nullAverseOperations")
+    void nullAverse(Operation operation) {
+        assertThrowsForOperation(NullPointerException.class, operation);
+    }
+
+    @ParameterizedTest
+    @MethodSource("outOfBoundsOperations")
+    void outOfBounds(Operation operation) {
+        assertThrowsForOperation(IndexOutOfBoundsException.class, operation);
+    }
+
+    static <T extends Throwable> void assertThrowsForOperation(Class<T> expectedType, Operation operation) {
+        var lazy = newList();
+        assertThrows(expectedType, () -> operation.accept(lazy));
+        var sub = lazy.subList(1, SIZE / 2);
+        assertThrows(expectedType, () -> operation.accept(sub));
+        var subSub = sub.subList(1, sub.size() / 2);
+        assertThrows(expectedType, () -> operation.accept(subSub));
+    }
+
+    // Implementing interfaces
+
+    @Test
+    void serializable() {
+        serializable(newList());
+        serializable(newEmptyList());
+    }
+
+    void serializable(List<Integer> list) {
+        assertFalse(list instanceof Serializable);
+        if (list.size()>INDEX) {
+            assertFalse(newList().subList(1, INDEX) instanceof Serializable);
+        }
+        assertFalse(list.iterator() instanceof Serializable);
+        assertFalse(list.reversed() instanceof Serializable);
+        assertFalse(list.spliterator() instanceof Serializable);
+    }
+
+    @Test
+    void randomAccess() {
+        assertInstanceOf(RandomAccess.class, newList());
+        assertInstanceOf(RandomAccess.class, newEmptyList());
+        assertInstanceOf(RandomAccess.class, newList().subList(1, INDEX));
+    }
+
+    @Test
+    void distinct() {
+        StableValueImpl<Integer>[] array = StableUtil.array(SIZE);
+        assertEquals(SIZE, array.length);
+        // Check, every StableValue is distinct
+        Map<StableValue<Integer>, Boolean> idMap = new IdentityHashMap<>();
+        for (var e: array) {
+            idMap.put(e, true);
+        }
+        assertEquals(SIZE, idMap.size());
+    }
+
+    // Support constructs
+
+    record Operation(String name,
+                     Consumer<List<Integer>> consumer) implements Consumer<List<Integer>> {
+        @Override public void   accept(List<Integer> list) { consumer.accept(list); }
+        @Override public String toString() { return name; }
+    }
+
+    static Stream<Operation> nullAverseOperations() {
+        return Stream.of(
+                new Operation("forEach",     l -> l.forEach(null)),
+                new Operation("containsAll", l -> l.containsAll(null)),
+                new Operation("toArray",     l -> l.toArray((Integer[]) null)),
+                new Operation("toArray",     l -> l.toArray((IntFunction<Integer[]>) null))
+        );
+    }
+
+    static Stream<Operation> outOfBoundsOperations() {
+        return Stream.of(
+                new Operation("get(-1)",        l -> l.get(-1)),
+                new Operation("get(size)",      l -> l.get(l.size())),
+                new Operation("sublist(-1,)",   l -> l.subList(-1, INDEX)),
+                new Operation("sublist(,size)", l -> l.subList(0, l.size() + 1)),
+                new Operation("listIter(-1)",   l -> l.listIterator(-1)),
+                new Operation("listIter(size)", l -> l.listIterator(l.size() + 1))
+        );
+    }
+
+    static Stream<Operation> unsupportedOperations() {
+        final Set<Integer> SET = Set.of(0, 1);
+        return Stream.of(
+                new Operation("add(0)",            l -> l.add(0)),
+                new Operation("add(0, 1)",         l -> l.add(0, 1)),
+                new Operation("addAll(col)",       l -> l.addAll(SET)),
+                new Operation("addAll(1, coll)",   l -> l.addAll(1, SET)),
+                new Operation("addFirst(0)",       l -> l.addFirst(0)),
+                new Operation("addLast(0)",        l -> l.addLast(0)),
+                new Operation("clear",             List::clear),
+                new Operation("remove(Obj)",       l -> l.remove((Object)1)),
+                new Operation("remove(1)",         l -> l.remove(1)),
+                new Operation("removeAll",         l -> l.removeAll(SET)),
+                new Operation("removeFirst",       List::removeFirst),
+                new Operation("removeLast",        List::removeLast),
+                new Operation("removeIf",          l -> l.removeIf(i -> i % 2 == 0)),
+                new Operation("replaceAll",        l -> l.replaceAll(i -> i + 1)),
+                new Operation("sort",              l -> l.sort(Comparator.naturalOrder())),
+                new Operation("iterator().remove", l -> l.iterator().remove()),
+                new Operation("listIter().remove", l -> l.listIterator().remove()),
+                new Operation("listIter().add",    l -> l.listIterator().add(1)),
+                new Operation("listIter().set",    l -> l.listIterator().set(1))
+        );
+    }
+
+    static List<Integer> newList() {
+        return StableValue.list(SIZE, IDENTITY);
+    }
+
+    static List<Integer> newEmptyList() {
+        return StableValue.list(ZERO, IDENTITY);
+    }
+
+    static List<Integer> newRegularList() {
+        return IntStream.range(0, SIZE).boxed().toList();
+    }
+
+    static String asString(String first, List<Integer> list) {
+        return "[" + first + ", " + Stream.generate(() -> ".unset")
+                .limit(list.size() - 1)
+                .collect(Collectors.joining(", ")) + "]";
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableMapTest.java b/test/jdk/java/lang/StableValue/StableMapTest.java
new file mode 100644
index 00000000000..3133acc2f29
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableMapTest.java
@@ -0,0 +1,357 @@
+/*
+ * 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 Basic tests for StableMap methods
+ * @modules java.base/jdk.internal.lang.stable
+ * @enablePreview
+ * @run junit StableMapTest
+ */
+
+import jdk.internal.lang.stable.StableUtil;
+import jdk.internal.lang.stable.StableValueImpl;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableMapTest {
+
+    private static final int NOT_PRESENT = 147;
+    private static final int KEY = 7;
+    private static final Set<Integer> KEYS = Set.of(0, KEY, 13);
+    private static final Set<Integer> EMPTY = Set.of();
+    private static final Function<Integer, Integer> IDENTITY = Function.identity();
+
+    @Test
+    void factoryInvariants() {
+        assertThrows(NullPointerException.class, () -> StableValue.map(KEYS, null));
+        assertThrows(NullPointerException.class, () -> StableValue.map(null, IDENTITY));
+    }
+
+    @Test
+    void isEmpty() {
+        assertFalse(newMap().isEmpty());
+        assertTrue(newEmptyMap().isEmpty());
+    }
+
+    @Test
+    void size() {
+        assertEquals(KEYS.size(), newMap().size());
+        assertEquals(EMPTY.size(), newEmptyMap().size());
+    }
+
+    @Test
+    void get() {
+        StableTestUtil.CountingFunction<Integer, Integer> cf = new StableTestUtil.CountingFunction<>(IDENTITY);
+        var lazy = StableValue.map(KEYS, cf);
+        int cnt = 1;
+        for (int i : KEYS) {
+            assertEquals(i, lazy.get(i));
+            assertEquals(cnt, cf.cnt());
+            assertEquals(i, lazy.get(i));
+            assertEquals(cnt++, cf.cnt());
+        }
+        assertNull(lazy.get(NOT_PRESENT));
+    }
+
+    @Test
+    void getException() {
+        StableTestUtil.CountingFunction<Integer, Integer> cf = new StableTestUtil.CountingFunction<>(_ -> {
+            throw new UnsupportedOperationException();
+        });
+        var lazy = StableValue.map(KEYS, cf);
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
+        assertEquals(1, cf.cnt());
+        assertThrows(UnsupportedOperationException.class, () -> lazy.get(KEY));
+        assertEquals(2, cf.cnt());
+    }
+
+    @Test
+    void containsKey() {
+        var lazy = newMap();
+        for (int i : KEYS) {
+            assertTrue(lazy.containsKey(i));
+        }
+        assertFalse(lazy.containsKey(NOT_PRESENT));
+    }
+
+    @Test
+    void containsValue() {
+        var lazy = newMap();
+        for (int i : KEYS) {
+            assertTrue(lazy.containsValue(i));
+        }
+        assertFalse(lazy.containsValue(NOT_PRESENT));
+    }
+
+    @Test
+    void forEach() {
+        var lazy = newMap();
+        Set<Map.Entry<Integer, Integer>> expected = KEYS.stream()
+                .map(i -> new AbstractMap.SimpleImmutableEntry<>(i , i))
+                .collect(Collectors.toSet());
+        Set<Map.Entry<Integer, Integer>> actual = new HashSet<>();
+        lazy.forEach((k, v) -> actual.add(new AbstractMap.SimpleImmutableEntry<>(k , v)));
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void toStringTest() {
+        assertEquals("{}", newEmptyMap().toString());
+        var map = StableValue.map(Set.of(KEY), IDENTITY);
+        assertEquals("{" + KEY + "=.unset}", map.toString());
+        map.get(KEY);
+        assertEquals("{" + KEY + "=" + KEY + "}", map.toString());
+        String actual = newMap().toString();
+        assertTrue(actual.startsWith("{"));
+        for (int key : KEYS) {
+            assertTrue(actual.contains(key + "=.unset"));
+        }
+        assertTrue(actual.endsWith("}"));
+    }
+
+    @Test
+    void hashCodeTest() {
+        assertEquals(Map.of().hashCode(), newEmptyMap().hashCode());
+        assertEquals(newRegularMap().hashCode(), newMap().hashCode());
+    }
+
+    @Test
+    void equalsTest() {
+        assertTrue(newEmptyMap().equals(Map.of()));
+        assertTrue(Map.of().equals(newEmptyMap()));
+        assertTrue(newMap().equals(newRegularMap()));
+        assertTrue(newRegularMap().equals(newMap()));
+        assertFalse(newMap().equals("A"));
+    }
+
+    @Test
+    void entrySet() {
+        var regular = newRegularMap().entrySet();
+        var actual = newMap().entrySet();
+        assertTrue(regular.equals(actual));
+        assertTrue(actual.equals(regular));
+        assertTrue(regular.equals(actual));
+    }
+
+    @Test
+    void entrySetToString() {
+        var map = newMap();
+        var entrySet = map.entrySet();
+        var toString = entrySet.toString();
+        for (var key : KEYS) {
+            assertTrue(toString.contains(key + "=.unset"));
+        }
+        assertTrue(toString.startsWith("["));
+        assertTrue(toString.endsWith("]"));
+
+        map.get(KEY);
+        for (var key : KEYS) {
+            if (key.equals(KEY)) {
+                continue;
+            }
+            assertTrue(entrySet.toString().contains(key + "=.unset"));
+        }
+        assertTrue(entrySet.toString().contains(KEY + "=" + KEY));
+    }
+
+    @Test
+    void values() {
+        var map = newMap();
+        var values = map.values();
+        // Look at one of the elements
+        var val = values.stream().iterator().next();
+        var toString = map.toString();
+        for (var key : KEYS) {
+            if (key.equals(val)) {
+                assertTrue(toString.contains(key + "=" + key));
+            } else {
+                assertTrue(toString.contains(key + "=.unset"));
+            }
+        }
+
+        // Mod ops
+        assertThrows(UnsupportedOperationException.class, () -> values.remove(KEY));
+        assertThrows(UnsupportedOperationException.class, () -> values.add(KEY));
+        assertThrows(UnsupportedOperationException.class, values::clear);
+        assertThrows(UnsupportedOperationException.class, () -> values.addAll(Set.of(1)));
+        assertThrows(UnsupportedOperationException.class, () -> values.removeIf(i -> true));
+        assertThrows(UnsupportedOperationException.class, () -> values.retainAll(Set.of(KEY)));
+    }
+
+    @Test
+    void valuesToString() {
+        var map = newMap();
+        var values = map.values();
+        assertEquals("[.unset, .unset, .unset]", values.toString());
+        map.get(KEY);
+        var afterGet = values.toString();
+        assertTrue(afterGet.contains(Integer.toString(KEY)), afterGet);
+    }
+
+    @Test
+    void iteratorNext() {
+        Set<Integer> encountered = new HashSet<>();
+        var iterator = newMap().entrySet().iterator();
+        while (iterator.hasNext()) {
+            var entry = iterator.next();
+            assertEquals(entry.getKey(), entry.getValue());
+            encountered.add(entry.getValue());
+        }
+        assertEquals(KEYS, encountered);
+    }
+
+    @Test
+    void iteratorForEachRemaining() {
+        Set<Integer> encountered = new HashSet<>();
+        var iterator = newMap().entrySet().iterator();
+        var entry = iterator.next();
+        assertEquals(entry.getKey(), entry.getValue());
+        encountered.add(entry.getValue());
+        iterator.forEachRemaining(e -> {
+            assertEquals(e.getKey(), e.getValue());
+            encountered.add(e.getValue());
+        });
+        assertEquals(KEYS, encountered);
+    }
+
+    // Immutability
+    @ParameterizedTest
+    @MethodSource("unsupportedOperations")
+    void unsupported(Operation operation) {
+        assertThrowsForOperation(UnsupportedOperationException.class, operation);
+    }
+
+    // Method parameter invariant checking
+
+    @ParameterizedTest
+    @MethodSource("nullAverseOperations")
+    void nullAverse(Operation operation) {
+        assertThrowsForOperation(NullPointerException.class, operation);
+    }
+
+    static <T extends Throwable> void assertThrowsForOperation(Class<T> expectedType, Operation operation) {
+        var lazy = newMap();
+        assertThrows(expectedType, () -> operation.accept(lazy));
+    }
+
+    // Implementing interfaces
+
+    @Test
+    void serializable() {
+        serializable(newMap());
+        serializable(newEmptyMap());
+    }
+
+    void serializable(Map<Integer, Integer> map) {
+        assertFalse(map instanceof Serializable);
+        assertFalse(map.entrySet() instanceof Serializable);
+        assertFalse(map.keySet() instanceof Serializable);
+        assertFalse(map.values() instanceof Serializable);
+    }
+
+    @Test
+    void distinct() {
+        Map<Integer, StableValueImpl<Integer>> map = StableUtil.map(Set.of(1, 2, 3));
+        assertEquals(3, map.size());
+        // Check, every StableValue is distinct
+        Map<StableValue<Integer>, Boolean> idMap = new IdentityHashMap<>();
+        map.forEach((k, v) -> idMap.put(v, true));
+        assertEquals(3, idMap.size());
+    }
+
+    @Test
+    void nullResult() {
+        var map = StableValue.map(Set.of(0), _ -> null);
+        assertNull(map.getOrDefault(0, 1));;
+        assertTrue(map.containsKey(0));
+        assertNull(map.get(0));
+    }
+
+    @Test
+    void nullKeys() {
+        Set<Integer> inputs = new HashSet<>();
+        inputs.add(0);
+        inputs.add(null);
+        assertThrows(NullPointerException.class, () -> StableValue.map(inputs, IDENTITY));
+    }
+
+    // Support constructs
+
+    record Operation(String name,
+                     Consumer<Map<Integer, Integer>> consumer) implements Consumer<Map<Integer, Integer>> {
+        @java.lang.Override
+        public void accept(Map<Integer, Integer> map) { consumer.accept(map); }
+        @java.lang.Override
+        public String toString() { return name; }
+    }
+
+    static Stream<Operation> nullAverseOperations() {
+        return Stream.of(
+            new Operation("forEach",     m -> m.forEach(null))
+        );
+    }
+
+    static Stream<Operation> unsupportedOperations() {
+        return Stream.of(
+            new Operation("clear",             Map::clear),
+            new Operation("compute",           m -> m.compute(KEY, (_, _) -> 1)),
+            new Operation("computeIfAbsent",   m -> m.computeIfAbsent(KEY, _ -> 1)),
+            new Operation("computeIfPresent",  m -> m.computeIfPresent(KEY, (_, _) -> 1)),
+            new Operation("merge",             m -> m.merge(KEY, KEY, (a, _) -> a)),
+            new Operation("put",               m -> m.put(0, 0)),
+            new Operation("putAll",            m -> m.putAll(Map.of())),
+            new Operation("remove1",           m -> m.remove(KEY)),
+            new Operation("remove2",           m -> m.remove(KEY, KEY)),
+            new Operation("replace2",          m -> m.replace(KEY, 1)),
+            new Operation("replace3",          m -> m.replace(KEY, KEY, 1)),
+            new Operation("replaceAll",        m -> m.replaceAll((a, _) -> a))
+        );
+    }
+
+    static Map<Integer, Integer> newMap() {
+        return StableValue.map(KEYS, IDENTITY);
+    }
+
+    static Map<Integer, Integer> newEmptyMap() {
+        return StableValue.map(EMPTY, IDENTITY);
+    }
+
+    static Map<Integer, Integer> newRegularMap() {
+        return KEYS.stream().collect(Collectors.toMap(IDENTITY, IDENTITY));
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableSupplierTest.java b/test/jdk/java/lang/StableValue/StableSupplierTest.java
new file mode 100644
index 00000000000..2d542fbf6ca
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableSupplierTest.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
+ * @summary Basic tests for StableSupplier methods
+ * @enablePreview
+ * @run junit StableSupplierTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableSupplierTest {
+
+    private static final Supplier<Integer> SUPPLIER = () -> 42;
+
+    @Test
+    void factoryInvariants() {
+        assertThrows(NullPointerException.class, () -> StableValue.supplier(null));
+    }
+
+    @Test
+    void basic() {
+        basic(SUPPLIER);
+        basic(() -> null);
+    }
+
+    void basic(Supplier<Integer> supplier) {
+        StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(supplier);
+        var cached = StableValue.supplier(cs);
+        assertEquals(".unset", cached.toString());
+        assertEquals(supplier.get(), cached.get());
+        assertEquals(1, cs.cnt());
+        assertEquals(supplier.get(), cached.get());
+        assertEquals(1, cs.cnt());
+        assertEquals(Objects.toString(supplier.get()), cached.toString());
+    }
+
+    @Test
+    void exception() {
+        StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(() -> {
+            throw new UnsupportedOperationException();
+        });
+        var cached = StableValue.supplier(cs);
+        assertThrows(UnsupportedOperationException.class, cached::get);
+        assertEquals(1, cs.cnt());
+        assertThrows(UnsupportedOperationException.class, cached::get);
+        assertEquals(2, cs.cnt());
+        assertEquals(".unset", cached.toString());
+    }
+
+    @Test
+    void circular() {
+        final AtomicReference<Supplier<?>> ref = new AtomicReference<>();
+        Supplier<Supplier<?>> cached = StableValue.supplier(ref::get);
+        ref.set(cached);
+        cached.get();
+        String toString = cached.toString();
+        assertTrue(toString.startsWith("(this StableSupplier)"));
+        assertDoesNotThrow(cached::hashCode);
+    }
+
+    @Test
+    void equality() {
+        Supplier<Integer> f0 = StableValue.supplier(SUPPLIER);
+        Supplier<Integer> f1 = StableValue.supplier(SUPPLIER);
+        // No function is equal to another function
+        assertNotEquals(f0, f1);
+    }
+
+    @Test
+    void hashCodeStable() {
+        Supplier<Integer> f0 = StableValue.supplier(SUPPLIER);
+        assertEquals(System.identityHashCode(f0), f0.hashCode());
+        f0.get();
+        assertEquals(System.identityHashCode(f0), f0.hashCode());
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableTestUtil.java b/test/jdk/java/lang/StableValue/StableTestUtil.java
new file mode 100644
index 00000000000..f71915c28ee
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableTestUtil.java
@@ -0,0 +1,120 @@
+/*
+ * 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.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.Supplier;
+
+final class StableTestUtil {
+
+    private StableTestUtil() {}
+
+    public static final class CountingSupplier<T>
+            extends AbstractCounting<Supplier<T>>
+            implements Supplier<T> {
+
+        public CountingSupplier(Supplier<T> delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public T get() {
+            incrementCounter();
+            return delegate.get();
+        }
+
+    }
+
+    public static final class CountingIntFunction<R>
+            extends AbstractCounting<IntFunction<R>>
+            implements IntFunction<R> {
+
+        public CountingIntFunction(IntFunction<R> delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public R apply(int value) {
+            incrementCounter();
+            return delegate.apply(value);
+        }
+
+    }
+
+    public static final class CountingFunction<T, R>
+            extends AbstractCounting<Function<T, R>>
+            implements Function<T, R> {
+
+        public CountingFunction(Function<T, R> delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public R apply(T t) {
+            incrementCounter();
+            return delegate.apply(t);
+        }
+
+    }
+
+    public static final class CountingBiFunction<T, U, R>
+            extends AbstractCounting<BiFunction<T, U, R>>
+            implements BiFunction<T, U, R> {
+
+        public CountingBiFunction(BiFunction<T, U, R> delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public R apply(T t, U u) {
+            incrementCounter();
+            return delegate.apply(t, u);
+        }
+    }
+
+    abstract static class AbstractCounting<D> {
+
+        private final AtomicInteger cnt = new AtomicInteger();
+        protected final D delegate;
+
+        protected AbstractCounting(D delegate) {
+            this.delegate = delegate;
+        }
+
+        protected final void incrementCounter() {
+            cnt.incrementAndGet();
+        }
+
+        public final int cnt() {
+            return cnt.get();
+        }
+
+        @Override
+        public final String toString() {
+            return cnt.toString();
+        }
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java b/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
new file mode 100644
index 00000000000..85aee0cbeec
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableValueFactoriesTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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 Basic tests for StableValue factory implementations
+ * @modules java.base/jdk.internal.lang.stable
+ * @enablePreview
+ * @run junit StableValueFactoriesTest
+ */
+
+import jdk.internal.lang.stable.StableUtil;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableValueFactoriesTest {
+
+    @Test
+    void array() {
+        assertThrows(IllegalArgumentException.class, () -> StableUtil.array(-1));
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableValueTest.java b/test/jdk/java/lang/StableValue/StableValueTest.java
new file mode 100644
index 00000000000..0ed68352509
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableValueTest.java
@@ -0,0 +1,389 @@
+/*
+ * 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 Basic tests for StableValue implementations
+ * @enablePreview
+ * @run junit StableValueTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.LockSupport;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+final class StableValueTest {
+
+    private static final int VALUE = 42;
+    private static final int VALUE2 = 13;
+
+    @Test
+    void trySet() {
+        trySet(VALUE);
+        trySet(null);
+    }
+
+    @Test
+    void preSet() {
+        StableValue<Integer> stable = StableValue.of(VALUE);
+        assertTrue(stable.isSet());
+        assertEquals(VALUE, stable.orElseThrow());
+        assertEquals(VALUE, stable.orElse(VALUE2));
+        assertEquals(VALUE, stable.orElseSet(() -> VALUE2));
+        assertFalse(stable.trySet(VALUE2));
+        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(VALUE2));
+        assertEquals(
+                "The contents is already set",
+                e.getMessage());
+    }
+
+    void trySet(Integer initial) {
+        StableValue<Integer> stable = StableValue.of();
+        assertTrue(stable.trySet(initial));
+        assertFalse(stable.trySet(null));
+        assertFalse(stable.trySet(VALUE));
+        assertFalse(stable.trySet(VALUE2));
+        assertEquals(initial, stable.orElseThrow());
+    }
+
+    @Test
+    void setOrThrowValue() {
+        StableValue<Integer> stable = StableValue.of();
+        stable.setOrThrow(VALUE);
+        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(VALUE2));
+        assertEquals("The contents is already set", e.getMessage());
+    }
+
+    @Test
+    void setOrThrowNull() {
+        StableValue<Integer> stable = StableValue.of();
+        stable.setOrThrow(null);
+        var e = assertThrows(IllegalStateException.class, () -> stable.setOrThrow(null));
+        assertEquals("The contents is already set", e.getMessage());
+    }
+
+    @Test
+    void orElse() {
+        StableValue<Integer> stable = StableValue.of();
+        assertEquals(VALUE, stable.orElse(VALUE));
+        assertNull(stable.orElse(null));
+        stable.trySet(VALUE);
+        assertEquals(VALUE, stable.orElse(VALUE2));
+    }
+
+    @Test
+    void orElseThrow() {
+        StableValue<Integer> stable = StableValue.of();
+        var e = assertThrows(NoSuchElementException.class, stable::orElseThrow);
+        assertEquals("No contents set", e.getMessage());
+        stable.trySet(VALUE);
+        assertEquals(VALUE, stable.orElseThrow());
+    }
+
+    @Test
+    void isSet() {
+        isSet(VALUE);
+        isSet(null);
+   }
+
+    void isSet(Integer initial) {
+        StableValue<Integer> stable = StableValue.of();
+        assertFalse(stable.isSet());
+        stable.trySet(initial);
+        assertTrue(stable.isSet());
+    }
+
+   @Test
+   void testOrElseSetSupplier() {
+       StableTestUtil.CountingSupplier<Integer> cs = new StableTestUtil.CountingSupplier<>(() -> VALUE);
+       StableValue<Integer> stable = StableValue.of();
+       assertThrows(NullPointerException.class, () -> stable.orElseSet(null));
+       assertEquals(VALUE, stable.orElseSet(cs));
+       assertEquals(1, cs.cnt());
+       assertEquals(VALUE, stable.orElseSet(cs));
+       assertEquals(1, cs.cnt());
+   }
+
+    @Test
+    void testHashCode() {
+        StableValue<Integer> stableValue = StableValue.of();
+        // Should be Object::hashCode
+        assertEquals(System.identityHashCode(stableValue), stableValue.hashCode());
+    }
+
+    @Test
+    void testEquals() {
+        StableValue<Integer> s0 = StableValue.of();
+        assertNotEquals(null, s0);
+        StableValue<Integer> s1 = StableValue.of();
+        assertNotEquals(s0, s1); // Identity based
+        s0.setOrThrow(42);
+        s1.setOrThrow(42);
+        assertNotEquals(s0, s1);
+        assertNotEquals("a", s0);
+        StableValue<Integer> null0 = StableValue.of();
+        StableValue<Integer> null1 = StableValue.of();
+        null0.setOrThrow(null);
+        null1.setOrThrow(null);
+        assertNotEquals(null0, null1);
+    }
+
+    @Test
+    void toStringUnset() {
+        StableValue<Integer> stable = StableValue.of();
+        assertEquals(".unset", stable.toString());
+    }
+
+    @Test
+    void toStringNull() {
+        StableValue<Integer> stable = StableValue.of();
+        assertTrue(stable.trySet(null));
+        assertEquals("null", stable.toString());
+    }
+
+    @Test
+    void toStringNonNull() {
+        StableValue<Integer> stable = StableValue.of();
+        assertTrue(stable.trySet(VALUE));
+        assertEquals(Objects.toString(VALUE), stable.toString());
+    }
+
+    @Test
+    void toStringCircular() {
+        StableValue<StableValue<?>> stable = StableValue.of();
+        stable.trySet(stable);
+        String toString = assertDoesNotThrow(stable::toString);
+        assertEquals("(this StableValue)", toString);
+        assertDoesNotThrow(stable::hashCode);
+        assertDoesNotThrow((() -> stable.equals(stable)));
+    }
+
+    @Test
+    void recursiveCall() {
+        StableValue<Integer> stable = StableValue.of();
+        AtomicReference<StableValue<Integer>> ref = new AtomicReference<>(stable);
+        assertThrows(IllegalStateException.class, () ->
+                stable.orElseSet(() -> {
+                    ref.get().trySet(1);
+                    return 1;
+                })
+        );
+        assertThrows(IllegalStateException.class, () ->
+                stable.orElseSet(() -> {
+                    ref.get().orElseSet(() -> 1);
+                    return 1;
+                })
+        );
+    }
+
+    @Test
+    void intFunctionExample() {
+        final class SqrtUtil {
+
+            private SqrtUtil() {}
+
+            private static final int CACHED_SIZE = 10;
+
+            private static final IntFunction<Double> SQRT =
+                    // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
+                    StableValue.intFunction(CACHED_SIZE, StrictMath::sqrt);
+
+            public static double sqrt(int a) {
+                return SQRT.apply(a);
+            }
+        }
+
+        double sqrt9 = SqrtUtil.sqrt(9);   // May eventually constant fold to 3.0 at runtime
+
+        assertEquals(3, sqrt9);
+        assertThrows(IllegalArgumentException.class, () -> SqrtUtil.sqrt(16));
+    }
+
+    @Test
+    void intFunctionExample2() {
+        final class PowerOf2Util {
+
+            private PowerOf2Util() {}
+
+            private static final int SIZE = 6;
+            private static final IntFunction<Integer> ORIGINAL_POWER_OF_TWO =
+                    v -> 1 << v;
+
+            private static final IntFunction<Integer> POWER_OF_TWO =
+                    // @link substring="intFunction" target="#intFunction(int,IntFunction)" :
+                    StableValue.intFunction(SIZE, ORIGINAL_POWER_OF_TWO);
+
+            public static int powerOfTwo(int a) {
+                return POWER_OF_TWO.apply(a);
+            }
+        }
+
+        int pwr4 = PowerOf2Util.powerOfTwo(4);   // May eventually constant fold to 16 at runtime
+
+        assertEquals(16, pwr4);
+        assertEquals(1, PowerOf2Util.powerOfTwo(0));
+        assertEquals(8, PowerOf2Util.powerOfTwo(3));
+        assertEquals(32, PowerOf2Util.powerOfTwo(5));
+        assertThrows(IllegalArgumentException.class, () -> PowerOf2Util.powerOfTwo(10));
+    }
+
+    @Test
+    void functionExample() {
+
+        class Log2Util {
+
+            private Log2Util() {}
+
+            private static final Set<Integer> CACHED_KEYS =
+                    Set.of(1, 2, 4, 8, 16, 32);
+            private static final UnaryOperator<Integer> LOG2_ORIGINAL =
+                    i -> 31 - Integer.numberOfLeadingZeros(i);
+
+            private static final Function<Integer, Integer> LOG2_CACHED =
+                    // @link substring="function" target="#function(Set,Function)" :
+                    StableValue.function(CACHED_KEYS, LOG2_ORIGINAL);
+
+            public static double log2(int a) {
+                if (CACHED_KEYS.contains(a)) {
+                    return LOG2_CACHED.apply(a);
+                } else {
+                    return LOG2_ORIGINAL.apply(a);
+                }
+            }
+
+        }
+
+        double log16 = Log2Util.log2(16); // May eventually constant fold to 4.0 at runtime
+        double log256 = Log2Util.log2(256); // Will not constant fold
+
+        assertEquals(4, log16);
+        assertEquals(8, log256);
+    }
+
+    @Test
+    void functionExample2() {
+
+        class Log2Util {
+
+            private Log2Util() {}
+
+            private static final Set<Integer> KEYS =
+                    Set.of(1, 2, 4, 8);
+            private static final UnaryOperator<Integer> LOG2_ORIGINAL =
+                    i -> 31 - Integer.numberOfLeadingZeros(i);
+
+            private static final Function<Integer, Integer> LOG2 =
+                    // @link substring="function" target="#function(Set,Function)" :
+                    StableValue.function(KEYS, LOG2_ORIGINAL);
+
+            public static double log2(int a) {
+                return LOG2.apply(a);
+            }
+
+        }
+
+        double log16 = Log2Util.log2(8); // May eventually constant fold to 3.0 at runtime
+
+        assertEquals(3, log16);
+        assertThrows(IllegalArgumentException.class, () -> Log2Util.log2(3));
+    }
+
+    private static final BiPredicate<StableValue<Integer>, Integer> TRY_SET = StableValue::trySet;
+    private static final BiPredicate<StableValue<Integer>, Integer> SET_OR_THROW = (s, i) -> {
+        try {
+            s.setOrThrow(i);
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    };
+
+    @Test
+    void raceTrySet() {
+        race(TRY_SET);
+    }
+
+    @Test
+    void raceSetOrThrow() {
+        race(SET_OR_THROW);
+    }
+
+    @Test
+    void raceMixed() {
+        race((s, i) -> switch (i % 2) {
+            case 0 -> TRY_SET.test(s, i);
+            case 1 -> SET_OR_THROW.test(s, i);
+            default -> fail("should not reach here");
+        });
+    }
+
+    void race(BiPredicate<StableValue<Integer>, Integer> winnerPredicate) {
+        int noThreads = 10;
+        CountDownLatch starter = new CountDownLatch(1);
+        StableValue<Integer> stable = StableValue.of();
+        Map<Integer, Boolean> winners = new ConcurrentHashMap<>();
+        List<Thread> threads = IntStream.range(0, noThreads).mapToObj(i -> new Thread(() -> {
+                    try {
+                        // Ready, set ...
+                        starter.await();
+                        // Here we go!
+                        winners.put(i, winnerPredicate.test(stable, i));
+                    } catch (Throwable t) {
+                        fail(t);
+                    }
+                }))
+                .toList();
+        threads.forEach(Thread::start);
+        LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(1));
+        // Start the race
+        starter.countDown();
+        threads.forEach(StableValueTest::join);
+        // There can only be one winner
+        assertEquals(1, winners.values().stream().filter(b -> b).count());
+    }
+
+    private static void join(Thread thread) {
+        try {
+            thread.join();
+        } catch (InterruptedException e) {
+            fail(e);
+        }
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java b/test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java
new file mode 100644
index 00000000000..151d6f9c805
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/StableValuesSafePublicationTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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 Basic tests for making sure StableValue publishes values safely
+ * @modules java.base/jdk.internal.misc
+ * @enablePreview
+ * @run junit StableValuesSafePublicationTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class StableValuesSafePublicationTest {
+
+    private static final int SIZE = 100_000;
+    private static final int THREADS = Runtime.getRuntime().availableProcessors();
+    private static final StableValue<Holder>[] STABLES = stables();
+
+    static StableValue<Holder>[] stables() {
+        @SuppressWarnings("unchecked")
+        StableValue<Holder>[] stables = (StableValue<Holder>[]) new StableValue[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            stables[i] = StableValue.of();
+        }
+        return stables;
+    }
+
+    static final class Holder {
+        // These are non-final fields but should be seen
+        // fully initialized thanks to the HB properties of StableValue.
+        int a, b, c, d, e;
+
+        Holder() {
+            a = b = c = d = e = 1;
+        }
+    }
+
+    static final class Consumer implements Runnable {
+
+        final int[] observations = new int[SIZE];
+        final StableValue<Holder>[] stables = STABLES;
+        int i = 0;
+
+        @Override
+        public void run() {
+            for (; i < SIZE; i++) {
+                StableValue<Holder> s = stables[i];
+                Holder h;
+                // Wait until the StableValue has a holder value
+                while ((h = s.orElse(null)) == null) {}
+                int a = h.a;
+                int b = h.b;
+                int c = h.c;
+                int d = h.d;
+                int e = h.e;
+                observations[i] = a + (b << 1) + (c << 2) + (c << 3) + (d << 4) + (e << 5);
+            }
+        }
+    }
+
+    static final class Producer implements Runnable {
+
+        final StableValue<Holder>[] stables = STABLES;
+
+        @Override
+        public void run() {
+            StableValue<Holder> s;
+            long deadlineNs = System.nanoTime();
+            for (int i = 0; i < SIZE; i++) {
+                s = stables[i];
+                s.trySet(new Holder());
+                deadlineNs += 1000;
+                while (System.nanoTime() < deadlineNs) {
+                    Thread.onSpinWait();
+                }
+            }
+        }
+    }
+
+    @Test
+    void main() {
+        List<Consumer> consumers = IntStream.range(0, THREADS)
+                .mapToObj(_ -> new Consumer())
+                .toList();
+
+        List<Thread> consumersThreads = IntStream.range(0, THREADS)
+                .mapToObj(i -> Thread.ofPlatform()
+                        .name("Consumer Thread " + i)
+                        .start(consumers.get(i)))
+                .toList();
+
+        Producer producer = new Producer();
+
+        Thread producerThread = Thread.ofPlatform()
+                .name("Producer Thread")
+                .start(producer);
+
+        join(consumers, producerThread);
+        join(consumers, consumersThreads.toArray(Thread[]::new));
+
+        int[] histogram = new int[64];
+        for (Consumer consumer : consumers) {
+            for (int i = 0; i < SIZE; i++) {
+                histogram[consumer.observations[i]]++;
+            }
+        }
+
+        // unless a = 1, ..., e = 1, zero observations should be seen
+        for (int i = 0; i < 63; i++) {
+            assertEquals(0, histogram[i]);
+        }
+        // a = 1, ..., e = 1 : index 2^5-1 = 63
+        // All observations should end up in this bucket
+        assertEquals(THREADS * SIZE, histogram[63]);
+    }
+
+    static void join(List<Consumer> consumers, Thread... threads) {
+        try {
+            for (Thread t:threads) {
+                long deadline = System.nanoTime() + TimeUnit.MINUTES.toNanos(1);
+                while (t.isAlive()) {
+                    t.join(TimeUnit.SECONDS.toMillis(10));
+                    if (t.isAlive()) {
+                        String stack = Arrays.stream(t.getStackTrace())
+                                .map(Objects::toString)
+                                .collect(Collectors.joining(System.lineSeparator()));
+                        System.err.println(t + ": " + stack);
+                        for (int i = 0; i < consumers.size(); i++) {
+                            System.err.println("Consumer " + i + ": " + consumers.get(i).i);
+                        }
+                    }
+                    if (System.nanoTime() > deadline) {
+                        long nonNulls = CompletableFuture.supplyAsync(() ->
+                                Stream.of(STABLES)
+                                        .map(s -> s.orElse(null))
+                                        .filter(Objects::nonNull)
+                                        .count(), Executors.newSingleThreadExecutor()).join();
+                        fail("Giving up! Set stables seen by a new thread: " + nonNulls);
+                    }
+                }
+            }
+        } catch (InterruptedException ie) {
+            fail(ie);
+        }
+    }
+
+}
diff --git a/test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java b/test/jdk/java/lang/StableValue/TrustedFieldTypeTest.java
new file mode 100644
index 00000000000..205e5ed3a77
--- /dev/null
+++ b/test/jdk/java/lang/StableValue/TrustedFieldTypeTest.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.
+ */
+
+/* @test
+ * @summary Basic tests for TrustedFieldType implementations
+ * @modules jdk.unsupported/sun.misc
+ * @modules java.base/jdk.internal.lang.stable
+ * @modules java.base/jdk.internal.misc
+ * @enablePreview
+ * @run junit/othervm --add-opens java.base/jdk.internal.lang.stable=ALL-UNNAMED -Dopens=true TrustedFieldTypeTest
+ * @run junit/othervm -Dopens=false TrustedFieldTypeTest
+ */
+
+import jdk.internal.lang.stable.StableValueImpl;
+import jdk.internal.misc.Unsafe;
+import org.junit.jupiter.api.Test;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.lang.reflect.Field;
+import java.lang.reflect.InaccessibleObjectException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class TrustedFieldTypeTest {
+
+    @Test
+    void varHandle() throws NoSuchFieldException, IllegalAccessException {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+        StableValue<Integer> originalValue = StableValue.of();
+        @SuppressWarnings("unchecked")
+        StableValue<Integer>[] originalArrayValue = new StableValue[10];
+
+        final class Holder {
+            private final StableValue<Integer> value = originalValue;
+        }
+        final class ArrayHolder {
+            private final StableValue<Integer>[] array = originalArrayValue;
+        }
+
+
+        VarHandle valueVarHandle = lookup.findVarHandle(Holder.class, "value", StableValue.class);
+        Holder holder = new Holder();
+
+        assertThrows(UnsupportedOperationException.class, () ->
+                valueVarHandle.set(holder, StableValue.of())
+        );
+
+        assertThrows(UnsupportedOperationException.class, () ->
+                valueVarHandle.compareAndSet(holder, originalValue, StableValue.of())
+        );
+
+        VarHandle arrayVarHandle = lookup.findVarHandle(ArrayHolder.class, "array", StableValue[].class);
+        ArrayHolder arrayHolder = new ArrayHolder();
+
+        assertThrows(UnsupportedOperationException.class, () ->
+                arrayVarHandle.set(arrayHolder, new StableValue[1])
+        );
+
+        assertThrows(UnsupportedOperationException.class, () ->
+                arrayVarHandle.compareAndSet(arrayHolder, originalArrayValue, new StableValue[1])
+        );
+
+    }
+
+    @Test
+    void updateStableValueContentVia_j_i_m_Unsafe() {
+        StableValue<Integer> stableValue = StableValue.of();
+        stableValue.trySet(42);
+        jdk.internal.misc.Unsafe unsafe = Unsafe.getUnsafe();
+
+        long offset = unsafe.objectFieldOffset(stableValue.getClass(), "contents");
+        assertTrue(offset > 0);
+
+        // Unfortunately, it is possible to update the underlying data via jdk.internal.misc.Unsafe
+        Object oldData = unsafe.getAndSetReference(stableValue, offset, 13);
+        assertEquals(42, oldData);
+        assertEquals(13, stableValue.orElseThrow());
+    }
+
+    @Test
+    void updateStableValueContentViaSetAccessible() throws NoSuchFieldException, IllegalAccessException {
+
+        if (Boolean.getBoolean("opens")) {
+            // Unfortunately, add-opens allows direct access to the `value` field
+            Field field = StableValueImpl.class.getDeclaredField("contents");
+            field.setAccessible(true);
+
+            StableValue<Integer> stableValue = StableValue.of();
+            stableValue.trySet(42);
+
+            Object oldData = field.get(stableValue);
+            assertEquals(42, oldData);
+
+            field.set(stableValue, 13);
+            assertEquals(13, stableValue.orElseThrow());
+        } else {
+            Field field = StableValueImpl.class.getDeclaredField("contents");
+            assertThrows(InaccessibleObjectException.class, ()-> field.setAccessible(true));
+        }
+    }
+
+}
diff --git a/test/jdk/java/util/Collection/MOAT.java b/test/jdk/java/util/Collection/MOAT.java
index 1c997a4b26a..e87b071d80a 100644
--- a/test/jdk/java/util/Collection/MOAT.java
+++ b/test/jdk/java/util/Collection/MOAT.java
@@ -30,6 +30,7 @@
  * @summary Run many tests on many Collection and Map implementations
  * @author  Martin Buchholz
  * @modules java.base/java.util:open
+ * @enablePreview
  * @run main MOAT
  * @key randomness
  */
@@ -219,10 +220,15 @@ public static void realMain(String[] args) {
         // Immutable List
         testEmptyList(List.of());
         testEmptyList(List.of().subList(0,0));
+        testEmptyList(StableValue.list(0, i -> i));
+        testEmptyList(StableValue.list(3, i -> i).subList(0, 0));
         testListMutatorsAlwaysThrow(List.of());
         testListMutatorsAlwaysThrow(List.<Integer>of().subList(0,0));
+        testListMutatorsAlwaysThrow(StableValue.list(0, i -> i));
         testEmptyListMutatorsAlwaysThrow(List.of());
         testEmptyListMutatorsAlwaysThrow(List.<Integer>of().subList(0,0));
+        testEmptyListMutatorsAlwaysThrow(StableValue.list(0, i -> i));
+        testEmptyListMutatorsAlwaysThrow(StableValue.list(3, i -> i).subList(0, 0));
         for (List<Integer> list : Arrays.asList(
                 List.<Integer>of(),
                 List.of(1),
@@ -244,7 +250,10 @@ public static void realMain(String[] args) {
                 Stream.of((Integer)null).toList(),
                 Stream.of(1, null).toList(),
                 Stream.of(1, null, 3).toList(),
-                Stream.of(1, null, 3, 4).toList())) {
+                Stream.of(1, null, 3, 4).toList(),
+                StableValue.list(0, i -> i),
+                StableValue.list(3, i -> i),
+                StableValue.list(10, i -> i))) {
             testCollection(list);
             testImmutableList(list);
             testListMutatorsAlwaysThrow(list);
@@ -356,6 +365,9 @@ public static void realMain(String[] args) {
         testEmptyMap(Map.of());
         testMapMutatorsAlwaysThrow(Map.of());
         testEmptyMapMutatorsAlwaysThrow(Map.of());
+        testEmptyMap(StableValue.map(Set.of(), k -> k));
+        testMapMutatorsAlwaysThrow(StableValue.map(Set.of(), k -> k));
+        testEmptyMapMutatorsAlwaysThrow(StableValue.map(Set.of(), k -> k));
         for (Map<Integer,Integer> map : Arrays.asList(
                 Map.<Integer,Integer>of(),
                 Map.of(1, 101),
@@ -368,7 +380,10 @@ public static void realMain(String[] args) {
                 Map.of(1, 101, 2, 202, 3, 303, 4, 404, 5, 505, 6, 606, 7, 707, 8, 808),
                 Map.of(1, 101, 2, 202, 3, 303, 4, 404, 5, 505, 6, 606, 7, 707, 8, 808, 9, 909),
                 Map.of(1, 101, 2, 202, 3, 303, 4, 404, 5, 505, 6, 606, 7, 707, 8, 808, 9, 909, 10, 1010),
-                Map.ofEntries(ea))) {
+                Map.ofEntries(ea),
+                StableValue.map(Set.<Integer>of(), k -> k),
+                StableValue.map(Set.of(1), k -> k),
+                StableValue.map(Set.of(1, 2, 3), k -> k))) {
             testMap(map);
             testImmutableMap(map);
             testMapMutatorsAlwaysThrow(map);
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java
new file mode 100644
index 00000000000..44fd3f2c18e
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionBenchmark.java
@@ -0,0 +1,105 @@
+/*
+ * 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.java.lang.stable;
+
+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.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+@OperationsPerInvocation(100)
+public class StableFunctionBenchmark {
+
+    private static final int SIZE = 100;
+    private static final Set<Integer> SET = IntStream.range(0, SIZE).boxed().collect(Collectors.toSet());
+
+    private static final Map<Integer, Integer> MAP = StableValue.map(SET, Function.identity());
+    private static final Function<Integer, Integer> FUNCTION = StableValue.function(SET, Function.identity());
+
+    private final Map<Integer, Integer> map = StableValue.map(SET, Function.identity());
+    private final Function<Integer, Integer> function = StableValue.function(SET, Function.identity());
+
+    @Benchmark
+    public int map() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += map.get(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int function() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += function.apply(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int staticSMap() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += MAP.get(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int staticIntFunction() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += FUNCTION.apply(i);
+        }
+        return sum;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java
new file mode 100644
index 00000000000..1cb1a04582f
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableFunctionSingleBenchmark.java
@@ -0,0 +1,88 @@
+/*
+ * 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.java.lang.stable;
+
+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.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+public class StableFunctionSingleBenchmark {
+
+    private static final int SIZE = 100;
+    private static final Set<Integer> SET = IntStream.range(0, SIZE).boxed().collect(Collectors.toSet());
+
+    private static final Map<Integer, Integer> MAP = StableValue.map(SET, Function.identity());
+    private static final Function<Integer, Integer> FUNCTION = StableValue.function(SET, Function.identity());
+
+    private final Map<Integer, Integer> map = StableValue.map(SET, Function.identity());
+    private final Function<Integer, Integer> function = StableValue.function(SET, Function.identity());
+
+    @Benchmark
+    public int map() {
+        return map.get(1);
+    }
+
+    @Benchmark
+    public int function() {
+        return function.apply(1);
+    }
+
+    @Benchmark
+    public int staticSMap() {
+        return MAP.get(1);
+    }
+
+    @Benchmark
+    public int staticIntFunction() {
+        return FUNCTION.apply(1);
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java
new file mode 100644
index 00000000000..0b8e5d97cac
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionBenchmark.java
@@ -0,0 +1,102 @@
+/*
+ * 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.java.lang.stable;
+
+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.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntFunction;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+@OperationsPerInvocation(100)
+public class StableIntFunctionBenchmark {
+
+    private static final int SIZE = 100;
+    private static final IntFunction<Integer> IDENTITY = i -> i;
+
+    private static final List<Integer> LIST = StableValue.list(SIZE, IDENTITY);
+    private static final IntFunction<Integer> INT_FUNCTION = StableValue.intFunction(SIZE, IDENTITY);
+
+    private final List<Integer> list = StableValue.list(SIZE, IDENTITY);
+    private final IntFunction<Integer> intFunction = StableValue.intFunction(SIZE, IDENTITY);
+
+    @Benchmark
+    public int list() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += list.get(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int intFunction() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += intFunction.apply(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int staticList() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += LIST.get(i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int staticIntFunction() {
+        int sum = 0;
+        for (int i = 0; i < SIZE; i++) {
+            sum += INT_FUNCTION.apply(i);
+        }
+        return sum;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java
new file mode 100644
index 00000000000..1e8e250ba8a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableIntFunctionSingleBenchmark.java
@@ -0,0 +1,84 @@
+/*
+ * 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.java.lang.stable;
+
+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.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntFunction;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+public class StableIntFunctionSingleBenchmark {
+
+    private static final int SIZE = 100;
+    private static final IntFunction<Integer> IDENTITY = i -> i;
+
+    private static final List<Integer> STABLE = StableValue.list(SIZE, IDENTITY);
+    private static final IntFunction<Integer> INT_FUNCTION = StableValue.intFunction(SIZE, IDENTITY);
+
+    private final List<Integer> stable = StableValue.list(SIZE, IDENTITY);
+    private final IntFunction<Integer> intFunction = StableValue.intFunction(SIZE, IDENTITY);
+
+    @Benchmark
+    public int list() {
+        return stable.get(1);
+    }
+
+    @Benchmark
+    public int intFunction() {
+        return intFunction.apply(1);
+    }
+
+    @Benchmark
+    public int staticList() {
+        return STABLE.get(1);
+    }
+
+    @Benchmark
+    public int staticIntFunction() {
+        return INT_FUNCTION.apply(1);
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
new file mode 100644
index 00000000000..5017fb4e11a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.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.
+ */
+
+package org.openjdk.bench.java.lang.stable;
+
+import org.openjdk.bench.java.lang.stable.StableValueBenchmark.Dcl;
+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.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.constantpool.ConstantPoolBuilder;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static java.lang.constant.ConstantDescs.*;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+public class StableMethodHandleBenchmark {
+
+    private static final MethodHandle FINAL_MH = identityHandle();
+    private static final StableValue<MethodHandle> STABLE_MH;
+    private static MethodHandle mh = identityHandle();
+    private static final Dcl<MethodHandle> DCL = new Dcl<>(StableMethodHandleBenchmark::identityHandle);
+    private static final AtomicReference<MethodHandle> ATOMIC_REFERENCE = new AtomicReference<>(identityHandle());
+    private static final Map<String, MethodHandle> MAP = new ConcurrentHashMap<>();
+    private static final Map<String, MethodHandle> STABLE_MAP = StableValue.map(Set.of("identityHandle"), _ -> identityHandle());
+
+    static {
+        STABLE_MH = StableValue.of();
+        STABLE_MH.setOrThrow(identityHandle());
+        MAP.put("identityHandle", identityHandle());
+    }
+
+    @Benchmark
+    public int atomic() throws Throwable {
+        return (int) ATOMIC_REFERENCE.get().invokeExact(1);
+    }
+
+    @Benchmark
+    public int dcl() throws Throwable {
+        return (int) DCL.get().invokeExact(1);
+    }
+
+    @Benchmark
+    public int finalMh() throws Throwable {
+        return (int) FINAL_MH.invokeExact(1);
+    }
+
+    @Benchmark
+    public int map() throws Throwable {
+        return (int) MAP.get("identityHandle").invokeExact(1);
+    }
+
+    @Benchmark
+    public int nonFinalMh() throws Throwable {
+        return (int) mh.invokeExact(1);
+    }
+
+    @Benchmark
+    public int stableMap() throws Throwable {
+        return (int) STABLE_MAP.get("identityHandle").invokeExact(1);
+    }
+
+    @Benchmark
+    public int stableMh() throws Throwable {
+        return (int) STABLE_MH.orElseThrow().invokeExact(1);
+    }
+
+    Object cp() {
+        CodeBuilder cob = null;
+        ConstantPoolBuilder cp = ConstantPoolBuilder.of();
+        cob.ldc(cp.constantDynamicEntry(cp.bsmEntry(cp.methodHandleEntry(BSM_CLASS_DATA), List.of()),
+                cp.nameAndTypeEntry(DEFAULT_NAME, CD_MethodHandle)));
+        return null;
+    }
+
+    static MethodHandle identityHandle() {
+        var lookup = MethodHandles.lookup();
+        try {
+            return lookup.findStatic(StableMethodHandleBenchmark.class, "identity", MethodType.methodType(int.class, int.class));
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static int identity(int value) {
+        return value;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
new file mode 100644
index 00000000000..883f13da05a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableSupplierBenchmark.java
@@ -0,0 +1,94 @@
+/*
+ * 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.java.lang.stable;
+
+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.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+@OperationsPerInvocation(2)
+public class StableSupplierBenchmark {
+
+    private static final int VALUE = 42;
+    private static final int VALUE2 = 23;
+
+    private static final StableValue<Integer> STABLE = init(StableValue.of(), VALUE);
+    private static final StableValue<Integer> STABLE2 = init(StableValue.of(), VALUE2);
+    private static final Supplier<Integer> SUPPLIER = StableValue.supplier(() -> VALUE);
+    private static final Supplier<Integer> SUPPLIER2 = StableValue.supplier(() -> VALUE);
+
+    private final StableValue<Integer> stable = init(StableValue.of(), VALUE);
+    private final StableValue<Integer> stable2 = init(StableValue.of(), VALUE2);
+    private final Supplier<Integer> supplier = StableValue.supplier(() -> VALUE);
+    private final Supplier<Integer> supplier2 = StableValue.supplier(() -> VALUE2);
+
+    @Benchmark
+    public int stable() {
+        return stable.orElseThrow() + stable2.orElseThrow();
+    }
+
+    @Benchmark
+    public int supplier() {
+        return supplier.get() + supplier2.get();
+    }
+
+    @Benchmark
+    public int staticStable() {
+        return STABLE.orElseThrow() + STABLE2.orElseThrow();
+    }
+
+    @Benchmark
+    public int staticSupplier() {
+        return SUPPLIER.get() + SUPPLIER2.get();
+    }
+
+    private static StableValue<Integer> init(StableValue<Integer> m, Integer value) {
+        m.trySet(value);
+        return m;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
new file mode 100644
index 00000000000..505cfffdc2c
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableValueBenchmark.java
@@ -0,0 +1,196 @@
+/*
+ * 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.java.lang.stable;
+
+import org.openjdk.jmh.annotations.*;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+/**
+ * Benchmark measuring StableValue performance
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Benchmark) // Share the same state instance (for contention)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 2)
+@Fork(value = 2, jvmArgsAppend = {
+        "--enable-preview"
+})
+@Threads(Threads.MAX)   // Benchmark under contention
+@OperationsPerInvocation(2)
+public class StableValueBenchmark {
+
+    private static final int VALUE = 42;
+    private static final int VALUE2 = 23;
+
+    private static final StableValue<Integer> STABLE = init(StableValue.of(), VALUE);
+    private static final StableValue<Integer> STABLE2 = init(StableValue.of(), VALUE2);
+    private static final StableValue<Integer> DCL = init(StableValue.of(), VALUE);
+    private static final StableValue<Integer> DCL2 = init(StableValue.of(), VALUE2);
+    private static final AtomicReference<Integer> ATOMIC = new AtomicReference<>(VALUE);
+    private static final AtomicReference<Integer> ATOMIC2 = new AtomicReference<>(VALUE2);
+    private static final Holder HOLDER = new Holder(VALUE);
+    private static final Holder HOLDER2 = new Holder(VALUE2);
+    private static final RecordHolder RECORD_HOLDER = new RecordHolder(VALUE);
+    private static final RecordHolder RECORD_HOLDER2 = new RecordHolder(VALUE2);
+
+    private final StableValue<Integer> stable = init(StableValue.of(), VALUE);
+    private final StableValue<Integer> stable2 = init(StableValue.of(), VALUE2);
+    private final StableValue<Integer> stableNull = StableValue.of();
+    private final StableValue<Integer> stableNull2 = StableValue.of();
+    private final Supplier<Integer> dcl = new Dcl<>(() -> VALUE);
+    private final Supplier<Integer> dcl2 = new Dcl<>(() -> VALUE2);
+    private final AtomicReference<Integer> atomic = new AtomicReference<>(VALUE);
+    private final AtomicReference<Integer> atomic2 = new AtomicReference<>(VALUE2);
+    private final Supplier<Integer> supplier = () -> VALUE;
+    private final Supplier<Integer> supplier2 = () -> VALUE2;
+
+
+    @Setup
+    public void setup() {
+        stableNull.trySet(null);
+        stableNull2.trySet(null);
+    }
+
+    @Benchmark
+    public int atomic() {
+        return atomic.get() + atomic2.get();
+    }
+
+    @Benchmark
+    public int dcl() {
+        return dcl.get() + dcl2.get();
+    }
+
+    @Benchmark
+    public int stable() {
+        return stable.orElseThrow() + stable2.orElseThrow();
+    }
+
+    @Benchmark
+    public int stableNull() {
+        return (stableNull.orElseThrow() == null ? VALUE : VALUE2) + (stableNull2.orElseThrow() == null ? VALUE : VALUE2);
+    }
+
+    // Reference case
+    @Benchmark
+    public int refSupplier() {
+        return supplier.get() + supplier2.get();
+    }
+
+    @Benchmark
+    public int staticAtomic() {
+        return ATOMIC.get() + ATOMIC2.get();
+    }
+
+    @Benchmark
+    public int staticDcl() {
+        return DCL.orElseThrow() + DCL2.orElseThrow();
+    }
+
+    @Benchmark
+    public int staticHolder() {
+        return HOLDER.get() + HOLDER2.get();
+    }
+
+    @Benchmark
+    public int staticRecordHolder() {
+        return RECORD_HOLDER.get() + RECORD_HOLDER2.get();
+    }
+
+    @Benchmark
+    public int staticStable() {
+        return STABLE.orElseThrow() + STABLE2.orElseThrow();
+    }
+
+
+    private static StableValue<Integer> init(StableValue<Integer> m, Integer value) {
+        m.trySet(value);
+        return m;
+    }
+
+    private static final class Holder {
+
+        private final StableValue<Integer> delegate = StableValue.of();
+
+        Holder(int value) {
+            delegate.setOrThrow(value);
+        }
+
+        int get() {
+            return delegate.orElseThrow();
+        }
+
+    }
+
+    private record RecordHolder(StableValue<Integer> delegate) {
+
+        RecordHolder(int value) {
+            this(StableValue.of());
+            delegate.setOrThrow(value);
+        }
+
+        int get() {
+            return delegate.orElseThrow();
+        }
+
+    }
+
+
+    // Handles null values
+    public static class Dcl<V> implements Supplier<V> {
+
+        private final Supplier<V> supplier;
+
+        private volatile V value;
+        private boolean bound;
+
+        public Dcl(Supplier<V> supplier) {
+            this.supplier = supplier;
+        }
+
+        @Override
+        public V get() {
+            V v = value;
+            if (v == null) {
+                if (!bound) {
+                    synchronized (this) {
+                        v = value;
+                        if (v == null) {
+                            if (!bound) {
+                                value = v = supplier.get();
+                                bound = true;
+                            }
+                        }
+                    }
+                }
+            }
+            return v;
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java
new file mode 100644
index 00000000000..65d53a42e88
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/stable/VarHandleHolderBenchmark.java
@@ -0,0 +1,174 @@
+/*
+ * 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.java.lang.stable;
+
+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.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.lang.invoke.VarHandle;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
+import static java.util.concurrent.TimeUnit.*;
+
+@Warmup(iterations = 5, time = 5, timeUnit = SECONDS)
+@Measurement(iterations = 5, time = 5, timeUnit = SECONDS)
+@Fork(value = 1, jvmArgs = { "--enable-preview" })
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(NANOSECONDS)
+@State(Scope.Benchmark)
+public class VarHandleHolderBenchmark {
+
+    private static final MemoryLayout LAYOUT = MemoryLayout.structLayout(
+            ValueLayout.JAVA_INT.withName("x"),
+            ValueLayout.JAVA_INT.withName("y")
+    );
+
+    private static final long SIZEOF = LAYOUT.byteSize();
+    private static final long OFFSET_X = LAYOUT.byteOffset(MemoryLayout.PathElement.groupElement("x"));
+    private static final long OFFSET_Y = LAYOUT.byteOffset(groupElement("y"));
+
+    static final class MyVarHandleLookup implements Function<String, VarHandle> {
+        @Override
+        public VarHandle apply(String name) {
+            return LAYOUT.arrayElementVarHandle(groupElement(name)).withInvokeExactBehavior();
+        }
+    }
+
+    private static final Function<String, VarHandle> VAR_HANDLE_FUNCTION = new MyVarHandleLookup();
+
+    private static final VarHandle VH_X = VAR_HANDLE_FUNCTION.apply("x");
+    private static final VarHandle VH_Y = VAR_HANDLE_FUNCTION.apply("y");
+
+    private static final Supplier<VarHandle> SV_X = StableValue.supplier(() -> VAR_HANDLE_FUNCTION.apply("x"));
+    private static final Supplier<VarHandle> SV_Y = StableValue.supplier(() -> VAR_HANDLE_FUNCTION.apply("y"));
+
+    private static final Map<String, VarHandle> U_MAP = Map.of(
+            "x", VH_X,
+            "y", VH_Y);
+
+    private static final Map<String, VarHandle> U_MAP_ELEMENT = Map.of(
+            "x", LAYOUT.varHandle(groupElement("x")),
+            "y", LAYOUT.varHandle(groupElement("y")));
+
+    private static final Map<String, VarHandle> S_MAP = StableValue.map(
+            Set.of("x", "y"),
+            VAR_HANDLE_FUNCTION);
+
+    private static final Function<String, VarHandle> S_FUN = StableValue.function(
+            Set.of("x", "y"),
+            VAR_HANDLE_FUNCTION);
+
+    private static final MemorySegment confined;
+    static {
+        var array = new int[512 * (int) SIZEOF / (int) ValueLayout.JAVA_INT.byteSize()];
+        var heap = MemorySegment.ofArray(array);
+        for(var i = 0; i < 512; i++) {
+            heap.set(ValueLayout.JAVA_INT, i * SIZEOF + OFFSET_X, i);
+            heap.set(ValueLayout.JAVA_INT, i * SIZEOF + OFFSET_Y, i);
+        }
+        confined = Arena.ofConfined().allocate(LAYOUT, 512);
+        confined.copyFrom(heap);
+    }
+
+    @Benchmark
+    public int confinedVarHandleLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) VH_X.get(confined, 0L, (long) i);
+            var y = (int) VH_Y.get(confined, 0L, (long) i);
+            sum += x /*+y*/;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int confinedStableValueLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) SV_X.get().get(confined, 0L, (long) i);
+            var y = (int) SV_Y.get().get(confined, 0L, (long) i);
+            sum += x + y;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int confinedStableMapLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) S_MAP.get("x").get(confined, 0L, (long) i);
+            var y = (int) S_MAP.get("y").get(confined, 0L, (long) i);
+            sum += x + y;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int confinedStableMapElementLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) U_MAP_ELEMENT.get("x").get(confined, i * 8L);
+            var y = (int) U_MAP_ELEMENT.get("y").get(confined, i * 8L);
+            sum += x + y;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int confinedUnmodifiableMapLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) U_MAP.get("x").get(confined, 0L, (long) i);
+            var y = (int) U_MAP.get("y").get(confined, 0L, (long) i);
+            sum += x + y;
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int confinedStableFunctionLoop() {
+        var sum = 0;
+        for (var i = 0; i < 512; i++) {
+            var x = (int) S_FUN.apply("x").get(confined, 0L, (long) i);
+            var y = (int) S_FUN.apply("y").get(confined, 0L, (long) i);
+            sum += x + y;
+        }
+        return sum;
+    }
+}
\ No newline at end of file

From 66122811aae02caaa0545a7b6dd1fdb06b186f00 Mon Sep 17 00:00:00 2001
From: Gautham Krishnan <140151984+gauthamkrishnanibm@users.noreply.github.com>
Date: Wed, 30 Apr 2025 16:06:22 +0000
Subject: [PATCH 209/901] 8342886: Update MET timezone in TimeZoneNames files

Reviewed-by: naoto
---
 .../classes/sun/util/resources/TimeZoneNames.java     |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_de.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_es.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_fr.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_it.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_ja.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_ko.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_pt_BR.java   |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_sv.java      |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_zh_CN.java   |  6 ++----
 .../sun/util/resources/ext/TimeZoneNames_zh_TW.java   |  6 ++----
 test/jdk/sun/util/resources/TimeZone/Bug4848242.java  | 11 +++++++----
 12 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
index 2763ac30ca7..dced9151d5b 100644
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.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
@@ -929,9 +929,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Middle Europe Time", "MET",
-                                  "Middle Europe Summer Time", "MEST",
-                                  "Middle Europe Time", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
index 1f437ae8ec2..5cc8a38892d 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET",
-                                  "Zentraleurop\u00e4ische Sommerzeit", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
index 126010ba396..92dcaca5b1f 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Hora de Europa Central", "MET",
-                                  "Hora de verano de Europa Central", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
index bd6bceb6ddd..7eb166300c2 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Heure de l'Europe centrale", "MET",
-                                  "Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
index 7f55e19fff5..90d3c2927dc 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Ora dell'Europa centrale", "MET",
-                                  "Ora estiva dell'Europa centrale", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
index fe00a00404d..22db0a4f35e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET",
-                                  "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
index 3b0f44a2e4e..e8e6d45e523 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET",
-                                  "\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
index 557e0bf9001..8f79d22ca4e 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET",
-                                  "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
index d4b1377b430..6b0e1dd7266 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"Mellaneuropeisk tid", "MET",
-                                  "Mellaneuropeisk sommartid", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
index 8224549464f..4d493df7254 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.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
@@ -903,9 +903,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET",
-                                  "\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
index 3d28bfa2cd6..f2ddb6c407b 100644
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.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
@@ -905,9 +905,7 @@ protected final Object[][] getContents() {
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
-            {"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET",
-                                  "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST",
-                                  "MET", "MET"}},
+            {"MET", CET},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
diff --git a/test/jdk/sun/util/resources/TimeZone/Bug4848242.java b/test/jdk/sun/util/resources/TimeZone/Bug4848242.java
index 68962f135d0..55bd91b9372 100644
--- a/test/jdk/sun/util/resources/TimeZone/Bug4848242.java
+++ b/test/jdk/sun/util/resources/TimeZone/Bug4848242.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
@@ -23,9 +23,12 @@
 
 /*
  *@test
- *@bug 4848242
- *@summary Make sure that MET time zone is not misinterpreted in euro locales.
- *         Display the MET and MEST TZ human-readable name in all euro locales.
+ *@bug 4848242 8342886
+ *@summary Verifies that sampled European locales use consistent short time zone names.
+ *         Originally assumed all European locales had the same short names,
+ *         but due to changes in time zone data and locale handling, that is no longer guaranteed.
+ *         This test now verifies that a representative sample of locales (e.g., fr, it)
+ *         still use the same short names (CET/CEST).
  */
 
 import java.util.Locale;

From 486acc06e0325d247a96df8f7fc88c9111c3315d Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 30 Apr 2025 17:09:53 +0000
Subject: [PATCH 210/901] 8355453: nsk.share.jdi.Debugee.waitingEvent() does
 not timeout properly

Reviewed-by: lmesnik, amenkov, sspitsyn
---
 test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 732a7a6696b..4ff6ab6f397 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.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
@@ -437,8 +437,7 @@ public void setDebugTraceMode(int traceMode) {
     /**
      * Wait for the requested event and skip other events.
      *
-     * @param request non-null value for events generated by this
-     * event request; null value for <code>VMStartEvent</code>.
+     * @param request non-null value for events generated by this event request;
      * @param timeout timeout in milliseconds to wait for the requested event.
      *
      * @throws InterruptedException if another thread has interrupted this thread
@@ -461,7 +460,7 @@ public Event waitingEvent(EventRequest request, long timeout)
 
             EventSet eventSet = eventQueue.remove(timeLeft);
             if (eventSet == null) {
-                continue;
+                return null;
             }
 
             EventIterator eventIterator = eventSet.eventIterator();

From 50145bb74ad87f5b3f80ed910f6ebb95e406b802 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 30 Apr 2025 17:15:52 +0000
Subject: [PATCH 211/901] 8355773: Some nsk/jdi tests can fetch ThreadReference
 from static field in the debuggee

Reviewed-by: sspitsyn, amenkov
---
 .../addCountFilter/addcountfilter001.java     |  2 +-
 .../jdi/EventRequest/disable/disable001.java  |  2 +-
 .../jdi/EventRequest/disable/disable002.java  |  3 +--
 .../jdi/EventRequest/enable/enable001.java    |  2 +-
 .../jdi/EventRequest/enable/enable002.java    |  2 +-
 .../getProperty/getproperty001.java           |  2 +-
 .../EventRequest/isEnabled/isenabled001.java  |  2 +-
 .../putProperty/putproperty001.java           |  2 +-
 .../setEnabled/setenabled001.java             |  2 +-
 .../setEnabled/setenabled002.java             |  2 +-
 .../setSuspendPolicy/setsuspendpolicy001.java |  2 +-
 .../suspendPolicy/suspendpolicy001.java       |  2 +-
 .../createStepRequest/crstepreq002.java       |  2 +-
 .../createStepRequest/crstepreq003.java       |  6 ++---
 .../createStepRequest/crstepreq003a.java      | 12 ++++++---
 .../createStepRequest/crstepreq004.java       |  8 +++---
 .../createStepRequest/crstepreq004a.java      |  9 ++++---
 .../addClassFilter_rt/filter_rt002.java       |  2 +-
 .../addClassFilter_s/filter_s002.java         |  2 +-
 .../nsk/jdi/StepRequest/depth/depth001.java   |  2 +-
 .../nsk/jdi/StepRequest/depth/depth002.java   |  2 +-
 .../nsk/jdi/StepRequest/depth/depth003.java   |  2 +-
 .../nsk/jdi/StepRequest/size/size001.java     |  2 +-
 .../nsk/jdi/StepRequest/size/size002.java     |  2 +-
 .../nsk/jdi/StepRequest/thread/thread001.java |  2 +-
 .../popFrames/popframes001.java               |  4 +--
 .../popFrames/popframes002.java               |  4 +--
 .../popFrames/popframes003.java               |  4 +--
 .../popFrames/popframes004.java               |  2 +-
 .../popFrames/popframes005.java               |  2 +-
 .../vmTestbase/nsk/share/jdi/Debugee.java     | 27 +++++++++++++++++++
 31 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
index f4e41409cae..1ba99246f60 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
@@ -291,7 +291,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
index 75e9f40790c..0e784c89738 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
index b46bf2ee1a2..0a698997d0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable002.java
@@ -283,8 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
-
+                  thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
                                      (thread1, StepRequest.STEP_MIN, StepRequest.STEP_INTO);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
index 615cf46c746..3a72bb8ff7c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
@@ -283,7 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
index 767f069438f..8cf7d15e780 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable002.java
@@ -285,7 +285,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
index b4b9f0edcbc..070286903f4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/getProperty/getproperty001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
index d91db9a5a6a..ccc8f47299f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
@@ -284,7 +284,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
index 479c40904e7..9e9112faf37 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/putProperty/putproperty001.java
@@ -289,7 +289,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
index 57ed8454eda..6c175ec5ee3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
@@ -282,7 +282,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
index 25b665dbed9..a36154cd580 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
@@ -286,7 +286,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
index 04995ea0b13..b35e6f39898 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
@@ -291,7 +291,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
index b11a291b2f5..8372daab067 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/suspendPolicy/suspendpolicy001.java
@@ -287,7 +287,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest");
                      eventRequest1 = eventRManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
index a5dd9023dfd..7eaa31598aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq002.java
@@ -275,7 +275,7 @@ private void testRun()
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
 
-            thread = debuggee.threadByNameOrThrow(threadName);
+            thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
 
             if (StepRequest.STEP_MIN > StepRequest.STEP_LINE) {
                 maxSize = StepRequest.STEP_MIN;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
index d712fb34c42..1de51ac8366 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003.java
@@ -77,8 +77,8 @@ public static void main (String argv[]) {
 
     //------------------------------------------------------ test specific fields
 
-    static final int lineForBreakInThread    = 137;
-    static final int[] checkedLines = { 138, 138, 178 };
+    static final int lineForBreakInThread    = 141;
+    static final int[] checkedLines = { 142, 142, 182 };
 
     //------------------------------------------------------ mutable common methods
 
@@ -247,7 +247,7 @@ private void setAndCheckStepEvent ( BreakpointRequest bpRequest,
             exitCode = FAILED;
         }
 
-        ThreadReference thread = debuggee.threadByNameOrThrow(threadName);
+        ThreadReference thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
         StepRequest stepRequest = setStepRequest( thread,
                                                   StepRequest.STEP_LINE,
                                                   stepDepth,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java
index 460dc8e92f1..d1a5362251c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq003a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -55,6 +55,10 @@ public class crstepreq003a {
 
     static Object waitnotifyObj = new Object();
 
+    static Thread thread0;
+    static Thread thread1;
+    static Thread thread2;
+
     //------------------------------------------------------ mutable common method
 
     public static void main (String argv[]) {
@@ -72,21 +76,21 @@ public static void main (String argv[]) {
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ test case section
                 case 0:
 
-                    Thread thread0 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread0"));
+                    thread0 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread0"));
                     threadStart(thread0);
                     threadJoin (thread0, "0");
                     break;
 
                 case 1:
 
-                    Thread thread1 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread1"));
+                    thread1 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread1"));
                     threadStart(thread1);
                     threadJoin (thread1, "1");
                     break;
 
                 case 2:
 
-                    Thread thread2 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread2"));
+                    thread2 = JDIThreadFactory.newThread(new Thread0crstepreq003a("thread2"));
                     threadStart(thread2);
                     threadJoin (thread2, "2");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
index 1ab0ce68af8..16c6f79ffc3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004.java
@@ -77,9 +77,9 @@ public static void main (String argv[]) {
 
     //------------------------------------------------------ test specific fields
 
-    static final int lineForBreakInThread = 146;
-    static final int[] checkedLines = { 160, 160, 193 };
-    static final int[] checkedLinesAlt = { 161, 161, 193 };
+    static final int lineForBreakInThread = 149;
+    static final int[] checkedLines = { 163, 163, 196 };
+    static final int[] checkedLinesAlt = { 164, 164, 196 };
 
     //------------------------------------------------------ mutable common methods
 
@@ -248,7 +248,7 @@ private void setAndCheckStepEvent ( BreakpointRequest bpRequest,
             exitCode = FAILED;
         }
 
-        ThreadReference thread = debuggee.threadByNameOrThrow(threadName);
+        ThreadReference thread = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
         StepRequest stepRequest = setStepRequest( thread,
                                                   StepRequest.STEP_LINE,
                                                   stepDepth,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java
index 881d211aa0e..d6e28602ed7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq004a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -58,6 +58,9 @@ public class crstepreq004a {
     private static volatile boolean isFirstThreadReady = false;
     private static volatile boolean isSecondThreadReady = false;
 
+    static Thread thread1;
+    static Thread thread2;
+
     //------------------------------------------------------ mutable common method
 
     public static void main (String argv[]) {
@@ -95,8 +98,8 @@ public static void main (String argv[]) {
     private static void runTestCase(int testCaseId) {
         isFirstThreadReady = false;
         isSecondThreadReady = false;
-        Thread thread1 = JDIThreadFactory.newThread(new Thread1crstepreq004a("thread1"));
-        Thread thread2 = JDIThreadFactory.newThread(new Thread2crstepreq004a("thread2"));
+        thread1 = JDIThreadFactory.newThread(new Thread1crstepreq004a("thread1"));
+        thread2 = JDIThreadFactory.newThread(new Thread2crstepreq004a("thread2"));
         synchronized (lockObj) {
             thread1.start();
             while (!isFirstThreadReady) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
index 23be3eab4c9..363661d6847 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt002.java
@@ -290,7 +290,7 @@ private void testRun()
                      testClassReference =
                           (ReferenceType) vm.classesByName(testedClassName).get(0);
 
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      eventRequest1 = setting21StepRequest(thread1, testClassReference,
                                               EventRequest.SUSPEND_NONE, property1);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
index d4ff86268da..9498fdb53e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s002.java
@@ -282,7 +282,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     ThreadReference thread1 = debuggee.threadByNameOrThrow("thread1");
+                     ThreadReference thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread1");
                      eventRequest1 = setting23StepRequest(thread1, testedClassName1,
                                               EventRequest.SUSPEND_NONE, property1);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
index de63a0af86b..d908cb4251f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth001.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                    thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_INTO");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
index 5cd109f6fa3..acb9792d884 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth002.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_OVER");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
index 03b8f415b56..8e828925f83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/depth/depth003.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with depth StepRequest.STEP_OUT");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
index db59bf6e498..3ae173708bf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size001.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_MIN");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_MIN,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
index 09b0c53ea8c..836d8803c84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/size/size002.java
@@ -281,7 +281,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_LINE");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_LINE,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
index a8d3769c6c2..c00193a8958 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/thread/thread001.java
@@ -283,7 +283,7 @@ private void testRun()
             switch (i) {
 
               case 0:
-                     thread1 = debuggee.threadByNameOrThrow(threadName1);
+                     thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
 
                      log2("......setting up StepRequest with size StepRequest.STEP_MIN");
                      eventRequest1 = setting24StepRequest(thread1, StepRequest.STEP_MIN,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
index 3091f510977..198e20fc626 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001.java
@@ -302,7 +302,7 @@ private void testRun()
             }
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
 
             String poppedMethod    = "poppedMethod";
@@ -311,7 +311,7 @@ private void testRun()
 
             log2("......setting breakpoint in poppedMethod");
             try {
-                breakpointRequest = settingBreakpoint(debuggee.threadByNameOrThrow(thread2Name),
+                breakpointRequest = settingBreakpoint(thread2Ref,
                                           debuggeeClass,
                                           poppedMethod, breakpointLine, "one");
             } catch ( Exception e ) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
index c47358e96f8..05d8c1c39f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes002.java
@@ -270,10 +270,10 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             String thread3Name         = "thread3";
-            ThreadReference thread3Ref = debuggee.threadByNameOrThrow(thread3Name);
+            ThreadReference thread3Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread3Name);
 
             String poppedMethod    = "poppedMethod";
             String breakpointLine  = "breakpointLine";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
index 84ee5996a77..117a626752c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes003.java
@@ -283,10 +283,10 @@ private void testRun()
 
 
         String thread2Name         = "thread2";
-        ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+        ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
         String thread3Name         = "thread3";
-        ThreadReference thread3Ref = debuggee.threadByNameOrThrow(thread3Name);
+        ThreadReference thread3Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread3Name);
 
         String poppedMethod    = "poppedMethod";
         String breakpointLine  = "breakpointLine";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
index eb46fac37da..d4acdde1c9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes004.java
@@ -270,7 +270,7 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             StackFrame stackFrame = null;
             int var;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
index ec499eba24d..170f2973a35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes005.java
@@ -274,7 +274,7 @@ private void testRun()
             breakpointForCommunication();
 
             String thread2Name         = "thread2";
-            ThreadReference thread2Ref = debuggee.threadByNameOrThrow(thread2Name);
+            ThreadReference thread2Ref = debuggee.threadByFieldNameOrThrow(debuggeeClass, thread2Name);
 
             StackFrame stackFrame0 = null;
             StackFrame stackFrame1 = null;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 4ff6ab6f397..0f0b6fe9052 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -264,6 +264,33 @@ public ThreadReference threadByNameOrThrow(String name) throws JDITestRuntimeExc
         throw new JDITestRuntimeException("** Thread IS NOT found ** : " + name);
     }
 
+    /**
+     * Return a debuggee thread by fetching it from a static field in the debuggee.
+     */
+    public ThreadReference threadByFieldNameOrThrow(ReferenceType debuggeeClass,
+                                                    String threadFieldName)
+            throws JDITestRuntimeException {
+
+        Field field = debuggeeClass.fieldByName(threadFieldName);
+        if (field == null) {
+            throw new JDITestRuntimeException("** Thread field not found ** : "
+                                              + threadFieldName);
+        }
+
+        ThreadReference thread = (ThreadReference)debuggeeClass.getValue(field);
+        if (thread == null) {
+            throw new JDITestRuntimeException("** Thread field is null ** : "
+                                              + threadFieldName);
+        }
+
+        if (!thread.name().equals(threadFieldName)) {
+            throw new JDITestRuntimeException("** Thread names do not match ** : "
+                                              + threadFieldName + " vs. " + thread.name());
+        }
+
+        return thread;
+    }
+
     // --------------------------------------------------- //
 
     /**

From 18983b635fe3469c1d9060611eee76e0155ba21b Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Wed, 30 Apr 2025 17:52:55 +0000
Subject: [PATCH 212/901] 8355391: Use Long::hashCode in java.time

Reviewed-by: rriggs, pminborg, naoto
---
 src/java.base/share/classes/java/time/Clock.java            | 6 ++----
 src/java.base/share/classes/java/time/Duration.java         | 2 +-
 src/java.base/share/classes/java/time/Instant.java          | 2 +-
 src/java.base/share/classes/java/time/LocalDate.java        | 5 +----
 .../share/classes/java/time/chrono/ChronoLocalDateImpl.java | 4 ++--
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/java.base/share/classes/java/time/Clock.java b/src/java.base/share/classes/java/time/Clock.java
index 731a117fcea..7fab5d27fb3 100644
--- a/src/java.base/share/classes/java/time/Clock.java
+++ b/src/java.base/share/classes/java/time/Clock.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
@@ -61,8 +61,6 @@
  */
 package java.time;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.io.ObjectStreamException;
 
 import static java.time.LocalTime.NANOS_PER_MINUTE;
@@ -780,7 +778,7 @@ public boolean equals(Object obj) {
         }
         @Override
         public int hashCode() {
-            return baseClock.hashCode() ^ ((int) (tickNanos ^ (tickNanos >>> 32)));
+            return baseClock.hashCode() ^ Long.hashCode(tickNanos);
         }
         @Override
         public String toString() {
diff --git a/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java
index d640121f32d..88d49fa9e45 100644
--- a/src/java.base/share/classes/java/time/Duration.java
+++ b/src/java.base/share/classes/java/time/Duration.java
@@ -1460,7 +1460,7 @@ public boolean equals(Object other) {
      */
     @Override
     public int hashCode() {
-        return ((int) (seconds ^ (seconds >>> 32))) + (51 * nanos);
+        return Long.hashCode(seconds) + (51 * nanos);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 82ff18c1421..1c7a41d7f0e 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -1363,7 +1363,7 @@ public boolean equals(Object other) {
      */
     @Override
     public int hashCode() {
-        return ((int) (seconds ^ (seconds >>> 32))) + 51 * nanos;
+        return Long.hashCode(seconds) + 51 * nanos;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 13478530301..016bdab5394 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -2133,10 +2133,7 @@ public boolean equals(Object obj) {
      */
     @Override
     public int hashCode() {
-        int yearValue = year;
-        int monthValue = month;
-        int dayValue = day;
-        return (yearValue & 0xFFFFF800) ^ ((yearValue << 11) + (monthValue << 6) + (dayValue));
+        return (year & 0xFFFFF800) ^ ((year << 11) + (month << 6) + day);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
index a79ecebe0c2..ca226b70d24 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, 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
@@ -421,7 +421,7 @@ public boolean equals(Object obj) {
     @Override
     public int hashCode() {
         long epDay = toEpochDay();
-        return getChronology().hashCode() ^ ((int) (epDay ^ (epDay >>> 32)));
+        return getChronology().hashCode() ^ Long.hashCode(epDay);
     }
 
     @Override

From 9a2a2c5bb17d052574f7e6cd712672151e1b193f Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Wed, 30 Apr 2025 17:57:00 +0000
Subject: [PATCH 213/901] 8354547: REDO: Force clients to explicitly pass
 mem_tag value, even if it is mtNone

Co-authored-by: Stefan Karlsson <stefank@openjdk.org>
Reviewed-by: stefank, coleenp, jsjolen
---
 .../cpu/aarch64/compressedKlass_aarch64.cpp   |  4 +--
 .../bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp   |  2 +-
 src/hotspot/os/linux/os_linux.cpp             |  4 +--
 src/hotspot/os/posix/os_posix.cpp             |  4 +--
 src/hotspot/os/posix/perfMemory_posix.cpp     |  2 +-
 src/hotspot/os/windows/os_windows.cpp         | 20 ++++++------
 src/hotspot/os/windows/perfMemory_windows.cpp |  2 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |  3 +-
 src/hotspot/share/cds/filemap.cpp             | 10 +++---
 src/hotspot/share/cds/metaspaceShared.cpp     | 14 +++++---
 .../share/classfile/compactHashtable.cpp      |  2 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  3 +-
 .../share/gc/parallel/parMarkBitMap.cpp       |  3 +-
 .../share/gc/parallel/psParallelCompact.cpp   |  3 +-
 src/hotspot/share/gc/shared/cardTable.cpp     |  2 +-
 .../gc/shenandoah/shenandoahCardTable.cpp     |  4 +--
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  6 ++--
 .../jfr/recorder/storage/jfrVirtualMemory.cpp |  3 +-
 .../share/memory/allocation.inline.hpp        |  4 +--
 src/hotspot/share/memory/memoryReserver.cpp   |  8 ++---
 src/hotspot/share/memory/memoryReserver.hpp   |  4 +--
 src/hotspot/share/memory/metaspace.cpp        |  5 +--
 .../share/memory/metaspace/testHelpers.cpp    |  3 +-
 .../memory/metaspace/virtualSpaceNode.cpp     |  2 +-
 src/hotspot/share/nmt/memReporter.cpp         |  2 +-
 src/hotspot/share/nmt/memReporter.hpp         |  2 +-
 src/hotspot/share/nmt/memTracker.hpp          |  4 +--
 .../share/nmt/virtualMemoryTracker.hpp        |  4 +--
 src/hotspot/share/prims/jni.cpp               |  2 +-
 src/hotspot/share/prims/whitebox.cpp          |  6 ++--
 src/hotspot/share/runtime/os.cpp              | 12 +++----
 src/hotspot/share/runtime/os.hpp              | 16 +++++-----
 .../share/runtime/safepointMechanism.cpp      |  2 +-
 src/hotspot/share/utilities/debug.cpp         |  2 +-
 .../gtest/gc/g1/test_stressCommitUncommit.cpp | 10 +++---
 test/hotspot/gtest/gc/z/test_zForwarding.cpp  |  2 +-
 .../gtest/gc/z/test_zVirtualMemoryManager.cpp |  2 +-
 .../gtest/memory/test_virtualspace.cpp        | 24 ++++++++------
 .../gtest/nmt/test_nmt_locationprinting.cpp   |  2 +-
 .../runtime/test_committed_virtualmemory.cpp  |  6 ++--
 test/hotspot/gtest/runtime/test_os.cpp        | 32 +++++++++----------
 test/hotspot/gtest/runtime/test_os_aix.cpp    |  4 +--
 test/hotspot/gtest/runtime/test_os_linux.cpp  |  2 +-
 .../gtest/runtime/test_os_reserve_between.cpp |  6 ++--
 .../runtime/NMT/MallocRoundingReportTest.java |  4 +--
 .../jtreg/runtime/NMT/MallocTestType.java     |  6 ++--
 .../runtime/NMT/MallocTrackingVerify.java     |  4 +--
 .../runtime/NMT/ThreadedMallocTestType.java   |  4 +--
 48 files changed, 147 insertions(+), 130 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
index 0c2d9a32c8c..3874c8cd54e 100644
--- a/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/compressedKlass_aarch64.cpp
@@ -70,7 +70,7 @@ static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
     const uint64_t immediate = ((uint64_t)immediates[index]) << 32;
     assert(immediate > 0 && Assembler::operand_valid_for_logical_immediate(/*is32*/false, immediate),
            "Invalid immediate %d " UINT64_FORMAT, index, immediate);
-    result = os::attempt_reserve_memory_at((char*)immediate, size, false);
+    result = os::attempt_reserve_memory_at((char*)immediate, size, mtNone);
     if (result == nullptr) {
       log_trace(metaspace, map)("Failed to attach at " UINT64_FORMAT_X, immediate);
     }
@@ -114,7 +114,7 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
   if (result == nullptr) {
     constexpr size_t alignment = nth_bit(32);
     log_debug(metaspace, map)("Trying to reserve at a 32-bit-aligned address");
-    result = os::reserve_memory_aligned(size, alignment, false);
+    result = os::reserve_memory_aligned(size, alignment, mtNone);
   }
 
   return result;
diff --git a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
index 86549e878cb..861fda7a71d 100644
--- a/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
@@ -77,7 +77,7 @@ ZPhysicalMemoryBacking::ZPhysicalMemoryBacking(size_t max_capacity)
     _initialized(false) {
 
   // Reserve address space for backing memory
-  _base = (uintptr_t)os::reserve_memory(max_capacity, false, mtJavaHeap);
+  _base = (uintptr_t)os::reserve_memory(max_capacity, mtJavaHeap);
   if (_base == 0) {
     // Failed
     ZInitialize::error("Failed to reserve address space for backing memory");
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 7061e5ac9d8..9bd45b0fec8 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -4568,7 +4568,7 @@ static void workaround_expand_exec_shield_cs_limit() {
    */
   char* hint = (char*)(os::Linux::initial_thread_stack_bottom() -
                        (StackOverflow::stack_guard_zone_size() + page_size));
-  char* codebuf = os::attempt_reserve_memory_at(hint, page_size, false, mtThread);
+  char* codebuf = os::attempt_reserve_memory_at(hint, page_size, mtThread);
 
   if (codebuf == nullptr) {
     // JDK-8197429: There may be a stack gap of one megabyte between
@@ -4576,7 +4576,7 @@ static void workaround_expand_exec_shield_cs_limit() {
     // Linux kernel workaround for CVE-2017-1000364.  If we failed to
     // map our codebuf, try again at an address one megabyte lower.
     hint -= 1 * M;
-    codebuf = os::attempt_reserve_memory_at(hint, page_size, false, mtThread);
+    codebuf = os::attempt_reserve_memory_at(hint, page_size, mtThread);
   }
 
   if ((codebuf == nullptr) || (!os::commit_memory(codebuf, page_size, true))) {
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index a331e303913..1da0eb219b6 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -492,9 +492,9 @@ static char* chop_extra_memory(size_t size, size_t alignment, char* extra_base,
 // Multiple threads can race in this code, and can remap over each other with MAP_FIXED,
 // so on posix, unmap the section at the start and at the end of the chunk that we mapped
 // rather than unmapping and remapping the whole chunk to get requested alignment.
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, MemTag mem_tag, bool exec) {
   size_t extra_size = calculate_aligned_extra_size(size, alignment);
-  char* extra_base = os::reserve_memory(extra_size, exec);
+  char* extra_base = os::reserve_memory(extra_size, mem_tag, exec);
   if (extra_base == nullptr) {
     return nullptr;
   }
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 4d6fc1e4b8c..cbbecea3a6a 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -64,7 +64,7 @@ static char* backing_store_file_name = nullptr;  // name of the backing store
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size);
+  char* mapAddress = os::reserve_memory(size, mtInternal);
 
   if (mapAddress == nullptr) {
     return nullptr;
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 55ad3bf840d..c6107b95259 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3017,7 +3017,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
                                 PAGE_READWRITE);
   // If reservation failed, return null
   if (p_buf == nullptr) return nullptr;
-  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC);
+  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC, mtNone);
   os::release_memory(p_buf, bytes + chunk_size);
 
   // we still need to round up to a page boundary (in case we are using large pages)
@@ -3078,7 +3078,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
         // need to create a dummy 'reserve' record to match
         // the release.
         MemTracker::record_virtual_memory_reserve((address)p_buf,
-                                                  bytes_to_release, CALLER_PC);
+                                                  bytes_to_release, CALLER_PC, mtNone);
         os::release_memory(p_buf, bytes_to_release);
       }
 #ifdef ASSERT
@@ -3096,9 +3096,9 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
   // Although the memory is allocated individually, it is returned as one.
   // NMT records it as one block.
   if ((flags & MEM_COMMIT) != 0) {
-    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve_and_commit((address)p_buf, bytes, CALLER_PC, mtNone);
   } else {
-    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, CALLER_PC, mtNone);
   }
 
   // made it this far, success
@@ -3238,7 +3238,7 @@ char* os::replace_existing_mapping_with_file_mapping(char* base, size_t size, in
 // Multiple threads can race in this code but it's not possible to unmap small sections of
 // virtual space to get requested alignment, like posix-like os's.
 // Windows prevents multiple thread from remapping over each other so this loop is thread-safe.
-static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MemTag mem_tag = mtNone) {
+static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int file_desc, MemTag mem_tag) {
   assert(is_aligned(alignment, os::vm_allocation_granularity()),
       "Alignment must be a multiple of allocation granularity (page size)");
   assert(is_aligned(size, os::vm_allocation_granularity()),
@@ -3252,7 +3252,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
 
   for (int attempt = 0; attempt < max_attempts && aligned_base == nullptr; attempt ++) {
     char* extra_base = file_desc != -1 ? os::map_memory_to_file(extra_size, file_desc, mem_tag) :
-                                         os::reserve_memory(extra_size, false, mem_tag);
+                                         os::reserve_memory(extra_size, mem_tag);
     if (extra_base == nullptr) {
       return nullptr;
     }
@@ -3269,7 +3269,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
     // Attempt to map, into the just vacated space, the slightly smaller aligned area.
     // Which may fail, hence the loop.
     aligned_base = file_desc != -1 ? os::attempt_map_memory_to_file_at(aligned_base, size, file_desc, mem_tag) :
-                                     os::attempt_reserve_memory_at(aligned_base, size, false, mem_tag);
+                                     os::attempt_reserve_memory_at(aligned_base, size, mem_tag);
   }
 
   assert(aligned_base != nullptr,
@@ -3278,9 +3278,9 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
   return aligned_base;
 }
 
-char* os::reserve_memory_aligned(size_t size, size_t alignment, bool exec) {
+char* os::reserve_memory_aligned(size_t size, size_t alignment, MemTag mem_tag, bool exec) {
   // exec can be ignored
-  return map_or_reserve_memory_aligned(size, alignment, -1 /* file_desc */);
+  return map_or_reserve_memory_aligned(size, alignment, -1/* file_desc */, mem_tag);
 }
 
 char* os::map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MemTag mem_tag) {
@@ -5185,7 +5185,7 @@ char* os::pd_map_memory(int fd, const char* file_name, size_t file_offset,
     }
 
     // Record virtual memory allocation
-    MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, CALLER_PC, mtNone);
 
     DWORD bytes_read;
     OVERLAPPED overlapped;
diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index dda0acde793..322b844f413 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -54,7 +54,7 @@ typedef BOOL (WINAPI *SetSecurityDescriptorControlFnPtr)(
 static char* create_standard_memory(size_t size) {
 
   // allocate an aligned chuck of memory
-  char* mapAddress = os::reserve_memory(size);
+  char* mapAddress = os::reserve_memory(size, mtInternal);
 
   if (mapAddress == nullptr) {
     return nullptr;
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index c1ffd60370b..ef75bd42323 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -309,7 +309,8 @@ address ArchiveBuilder::reserve_buffer() {
   size_t buffer_size = LP64_ONLY(CompressedClassSpaceSize) NOT_LP64(256 * M);
   ReservedSpace rs = MemoryReserver::reserve(buffer_size,
                                              MetaspaceShared::core_region_alignment(),
-                                             os::vm_page_size());
+                                             os::vm_page_size(),
+                                             mtClassShared);
   if (!rs.is_reserved()) {
     log_error(cds)("Failed to reserve %zu bytes of output buffer.", buffer_size);
     MetaspaceShared::unrecoverable_writing_error();
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 580699b60b5..1b5d455485c 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1066,10 +1066,10 @@ void FileMapInfo::close() {
  */
 static char* map_memory(int fd, const char* file_name, size_t file_offset,
                         char *addr, size_t bytes, bool read_only,
-                        bool allow_exec, MemTag mem_tag = mtNone) {
+                        bool allow_exec, MemTag mem_tag) {
   char* mem = os::map_memory(fd, file_name, file_offset, addr, bytes,
-                             AlwaysPreTouch ? false : read_only,
-                             allow_exec, mem_tag);
+                             mem_tag, AlwaysPreTouch ? false : read_only,
+                             allow_exec);
   if (mem != nullptr && AlwaysPreTouch) {
     os::pretouch_memory(mem, mem + bytes);
   }
@@ -1094,7 +1094,7 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
   assert(WINDOWS_ONLY(false) NOT_WINDOWS(true), "Don't call on Windows");
   // Replace old mapping with new one that is writable.
   char *base = os::map_memory(_fd, _full_path, r->file_offset(),
-                              addr, size, false /* !read_only */,
+                              addr, size, mtNone, false /* !read_only */,
                               r->allow_exec());
   close();
   // These have to be errors because the shared region is now unmapped.
@@ -1620,7 +1620,7 @@ bool FileMapInfo::map_heap_region_impl() {
   } else {
     base = map_memory(_fd, _full_path, r->file_offset(),
                       addr, _mapped_heap_memregion.byte_size(), r->read_only(),
-                      r->allow_exec());
+                      r->allow_exec(), mtJavaHeap);
     if (base == nullptr || base != addr) {
       dealloc_heap_region();
       log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index ef2a6dcb8e6..5dcdbf271c3 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -1345,7 +1345,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
         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);
+                                                  mtClassShared);
           assert(p == mapped_base_address || p == nullptr, "must be");
           if (p == nullptr) {
             log_debug(cds)("Failed to re-reserve protection zone");
@@ -1537,7 +1537,8 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
     archive_space_rs = MemoryReserver::reserve((char*)base_address,
                                                archive_space_size,
                                                archive_space_alignment,
-                                               os::vm_page_size());
+                                               os::vm_page_size(),
+                                               mtNone);
     if (archive_space_rs.is_reserved()) {
       assert(base_address == nullptr ||
              (address)archive_space_rs.base() == base_address, "Sanity");
@@ -1605,11 +1606,13 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       archive_space_rs = MemoryReserver::reserve((char*)base_address,
                                                  archive_space_size,
                                                  archive_space_alignment,
-                                                 os::vm_page_size());
+                                                 os::vm_page_size(),
+                                                 mtNone);
       class_space_rs   = MemoryReserver::reserve((char*)ccs_base,
                                                  class_space_size,
                                                  class_space_alignment,
-                                                 os::vm_page_size());
+                                                 os::vm_page_size(),
+                                                 mtNone);
     }
     if (!archive_space_rs.is_reserved() || !class_space_rs.is_reserved()) {
       release_reserved_spaces(total_space_rs, archive_space_rs, class_space_rs);
@@ -1622,7 +1625,8 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       total_space_rs = MemoryReserver::reserve((char*) base_address,
                                                total_range_size,
                                                base_address_alignment,
-                                               os::vm_page_size());
+                                               os::vm_page_size(),
+                                               mtNone);
     } else {
       // We did not manage to reserve at the preferred address, or were instructed to relocate. In that
       // case we reserve wherever possible, but the start address needs to be encodable as narrow Klass
diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 8d50e8136a3..15ae5ba8013 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -226,7 +226,7 @@ HashtableTextDump::HashtableTextDump(const char* filename) : _fd(-1) {
   if (_fd < 0) {
     quit("Unable to open hashtable dump file", filename);
   }
-  _base = os::map_memory(_fd, filename, 0, nullptr, _size, true, false);
+  _base = os::map_memory(_fd, filename, 0, nullptr, _size, mtNone, true, false);
   if (_base == nullptr) {
     quit("Unable to map hashtable dump file", filename);
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 4ce45d06d1d..ad52388a64f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1230,7 +1230,8 @@ G1RegionToSpaceMapper* G1CollectedHeap::create_aux_memory_mapper(const char* des
   // Allocate a new reserved space, preferring to use large pages.
   ReservedSpace rs = MemoryReserver::reserve(size,
                                              alignment,
-                                             preferred_page_size);
+                                             preferred_page_size,
+                                             mtGC);
 
   size_t page_size = rs.page_size();
   G1RegionToSpaceMapper* result  =
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index f33d7f93f1d..d2d168cc2c0 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -48,7 +48,8 @@ ParMarkBitMap::initialize(MemRegion covered_region)
 
   ReservedSpace rs = MemoryReserver::reserve(_reserved_byte_size,
                                              rs_align,
-                                             page_sz);
+                                             page_sz,
+                                             mtGC);
 
   if (!rs.is_reserved()) {
     // Failed to reserve memory for the bitmap,
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 911384c23bf..ed8df5d42f6 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -246,7 +246,8 @@ ParallelCompactData::create_vspace(size_t count, size_t element_size)
 
   ReservedSpace rs = MemoryReserver::reserve(_reserved_byte_size,
                                              rs_align,
-                                             page_sz);
+                                             page_sz,
+                                             mtGC);
 
   if (!rs.is_reserved()) {
     // Failed to reserve memory.
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index e5dbbcc0746..76fe73abaf6 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -80,7 +80,7 @@ void CardTable::initialize(void* region0_start, void* region1_start) {
   HeapWord* high_bound = _whole_heap.end();
 
   const size_t rs_align = MAX2(_page_size, os::vm_allocation_granularity());
-  ReservedSpace rs = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size);
+  ReservedSpace rs = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size, mtGC);
 
   if (!rs.is_reserved()) {
     vm_exit_during_initialization("Could not reserve enough space for the "
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
index 00f11938489..e9e52475fb9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
@@ -45,7 +45,7 @@ void ShenandoahCardTable::initialize() {
   // ReservedSpace constructor would assert rs_align >= os::vm_page_size().
   const size_t rs_align = MAX2(_page_size, granularity);
 
-  ReservedSpace write_space = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size);
+  ReservedSpace write_space = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size, mtGC);
   initialize(write_space);
 
   // The assembler store_check code will do an unsigned shift of the oop,
@@ -60,7 +60,7 @@ void ShenandoahCardTable::initialize() {
   _write_byte_map = _byte_map;
   _write_byte_map_base = _byte_map_base;
 
-  ReservedSpace read_space = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size);
+  ReservedSpace read_space = MemoryReserver::reserve(_byte_map_size, rs_align, _page_size, mtGC);
   initialize(read_space);
 
   _read_byte_map = (CardValue*) read_space.base();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index b5b8e4b9e1a..41faf3efa24 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -161,7 +161,7 @@ static ReservedSpace reserve(size_t size, size_t preferred_page_size) {
     size = align_up(size, alignment);
   }
 
-  const ReservedSpace reserved = MemoryReserver::reserve(size, alignment, preferred_page_size);
+  const ReservedSpace reserved = MemoryReserver::reserve(size, alignment, preferred_page_size, mtGC);
   if (!reserved.is_reserved()) {
     vm_exit_during_initialization("Could not reserve space");
   }
@@ -375,7 +375,7 @@ jint ShenandoahHeap::initialize() {
     for (uintptr_t addr = min; addr <= max; addr <<= 1u) {
       char* req_addr = (char*)addr;
       assert(is_aligned(req_addr, cset_align), "Should be aligned");
-      cset_rs = MemoryReserver::reserve(req_addr, cset_size, cset_align, cset_page_size);
+      cset_rs = MemoryReserver::reserve(req_addr, cset_size, cset_align, cset_page_size, mtGC);
       if (cset_rs.is_reserved()) {
         assert(cset_rs.base() == req_addr, "Allocated where requested: " PTR_FORMAT ", " PTR_FORMAT, p2i(cset_rs.base()), addr);
         _collection_set = new ShenandoahCollectionSet(this, cset_rs, sh_rs.base());
@@ -384,7 +384,7 @@ jint ShenandoahHeap::initialize() {
     }
 
     if (_collection_set == nullptr) {
-      cset_rs = MemoryReserver::reserve(cset_size, cset_align, os::vm_page_size());
+      cset_rs = MemoryReserver::reserve(cset_size, cset_align, os::vm_page_size(), mtGC);
       if (!cset_rs.is_reserved()) {
         vm_exit_during_initialization("Cannot reserve memory for collection set");
       }
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index 97f2b8a1990..0ba54fc79be 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -106,7 +106,8 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
   assert(is_aligned(reservation_size_request_bytes, os::vm_allocation_granularity()), "invariant");
   _rs = MemoryReserver::reserve(reservation_size_request_bytes,
                                 os::vm_allocation_granularity(),
-                                os::vm_page_size());
+                                os::vm_page_size(),
+                                mtTracing);
   if (!_rs.is_reserved()) {
     return false;
   }
diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp
index 8d531c6dd23..01af1616ce1 100644
--- a/src/hotspot/share/memory/allocation.inline.hpp
+++ b/src/hotspot/share/memory/allocation.inline.hpp
@@ -58,7 +58,7 @@ template <class E>
 E* MmapArrayAllocator<E>::allocate_or_null(size_t length, MemTag mem_tag) {
   size_t size = size_for(length);
 
-  char* addr = os::reserve_memory(size, !ExecMem, mem_tag);
+  char* addr = os::reserve_memory(size, mem_tag);
   if (addr == nullptr) {
     return nullptr;
   }
@@ -75,7 +75,7 @@ template <class E>
 E* MmapArrayAllocator<E>::allocate(size_t length, MemTag mem_tag) {
   size_t size = size_for(length);
 
-  char* addr = os::reserve_memory(size, !ExecMem, mem_tag);
+  char* addr = os::reserve_memory(size, mem_tag);
   if (addr == nullptr) {
     vm_exit_out_of_memory(size, OOM_MMAP_ERROR, "Allocator (reserve)");
   }
diff --git a/src/hotspot/share/memory/memoryReserver.cpp b/src/hotspot/share/memory/memoryReserver.cpp
index 43cc71355ff..457818139cd 100644
--- a/src/hotspot/share/memory/memoryReserver.cpp
+++ b/src/hotspot/share/memory/memoryReserver.cpp
@@ -90,13 +90,13 @@ static char* reserve_memory_inner(char* requested_address,
     assert(is_aligned(requested_address, alignment),
            "Requested address " PTR_FORMAT " must be aligned to %zu",
            p2i(requested_address), alignment);
-    return os::attempt_reserve_memory_at(requested_address, size, exec, mem_tag);
+    return os::attempt_reserve_memory_at(requested_address, size, mem_tag, exec);
   }
 
   // Optimistically assume that the OS returns an aligned base pointer.
   // When reserving a large address range, most OSes seem to align to at
   // least 64K.
-  char* base = os::reserve_memory(size, exec, mem_tag);
+  char* base = os::reserve_memory(size, mem_tag, exec);
   if (is_aligned(base, alignment)) {
     return base;
   }
@@ -107,7 +107,7 @@ static char* reserve_memory_inner(char* requested_address,
   }
 
   // Map using the requested alignment.
-  return os::reserve_memory_aligned(size, alignment, exec);
+  return os::reserve_memory_aligned(size, alignment, mem_tag, exec);
 }
 
 ReservedSpace MemoryReserver::reserve_memory(char* requested_address,
@@ -261,7 +261,7 @@ static char* map_memory_to_file(char* requested_address,
   // Optimistically assume that the OS returns an aligned base pointer.
   // When reserving a large address range, most OSes seem to align to at
   // least 64K.
-  char* base = os::map_memory_to_file(size, fd);
+  char* base = os::map_memory_to_file(size, fd, mem_tag);
   if (is_aligned(base, alignment)) {
     return base;
   }
diff --git a/src/hotspot/share/memory/memoryReserver.hpp b/src/hotspot/share/memory/memoryReserver.hpp
index 1e16ec252a9..f8f642cca95 100644
--- a/src/hotspot/share/memory/memoryReserver.hpp
+++ b/src/hotspot/share/memory/memoryReserver.hpp
@@ -58,12 +58,12 @@ class MemoryReserver : AllStatic {
                                size_t size,
                                size_t alignment,
                                size_t page_size,
-                               MemTag mem_tag = mtNone);
+                               MemTag mem_tag);
 
   static ReservedSpace reserve(size_t size,
                                size_t alignment,
                                size_t page_size,
-                               MemTag mem_tag = mtNone);
+                               MemTag mem_tag);
 
   static ReservedSpace reserve(size_t size,
                                MemTag mem_tag);
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index ab7202d046a..c28360e5553 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -598,7 +598,7 @@ ReservedSpace Metaspace::reserve_address_space_for_compressed_classes(size_t siz
   if (result == nullptr) {
     // Fallback: reserve anywhere
     log_debug(metaspace, map)("Trying anywhere...");
-    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), false);
+    result = os::reserve_memory_aligned(size, Metaspace::reserve_alignment(), mtClass);
   }
 
   // Wrap resulting range in ReservedSpace
@@ -771,7 +771,8 @@ void Metaspace::global_initialize() {
       rs = MemoryReserver::reserve((char*)base,
                                    size,
                                    Metaspace::reserve_alignment(),
-                                   os::vm_page_size());
+                                   os::vm_page_size(),
+                                   mtClass);
 
       if (rs.is_reserved()) {
         log_info(metaspace)("Successfully forced class space address to " PTR_FORMAT, p2i(base));
diff --git a/src/hotspot/share/memory/metaspace/testHelpers.cpp b/src/hotspot/share/memory/metaspace/testHelpers.cpp
index 76fa1e36c45..f06f6c855be 100644
--- a/src/hotspot/share/memory/metaspace/testHelpers.cpp
+++ b/src/hotspot/share/memory/metaspace/testHelpers.cpp
@@ -82,7 +82,7 @@ MetaspaceTestContext::MetaspaceTestContext(const char* name, size_t commit_limit
                     reserve_limit, Metaspace::reserve_alignment_words());
   if (reserve_limit > 0) {
     // have reserve limit -> non-expandable context
-    _rs = MemoryReserver::reserve(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size());
+    _rs = MemoryReserver::reserve(reserve_limit * BytesPerWord, Metaspace::reserve_alignment(), os::vm_page_size(), mtTest);
     _context = MetaspaceContext::create_nonexpandable_context(name, _rs, &_commit_limiter);
   } else {
     // no reserve limit -> expandable vslist
@@ -142,4 +142,3 @@ size_t MetaspaceTestContext::reserved_words() const {
 }
 
 } // namespace metaspace
-
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index 66644c805a9..bb59192cf16 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -256,7 +256,7 @@ VirtualSpaceNode* VirtualSpaceNode::create_node(size_t word_size,
 
   ReservedSpace rs = MemoryReserver::reserve(word_size * BytesPerWord,
                                              Settings::virtual_space_node_reserve_alignment_words() * BytesPerWord,
-                                             os::vm_page_size());
+                                             os::vm_page_size(), mtMetaspace);
   if (!rs.is_reserved()) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to reserve memory for metaspace");
   }
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index c7327782a4a..512e1975929 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -249,7 +249,7 @@ void MemSummaryReporter::report_summary_of_tag(MemTag mem_tag,
 
    // report malloc'd memory
   if (amount_in_current_scale(MAX2(malloc_memory->malloc_size(), pk_malloc)) > 0) {
-    print_malloc(malloc_memory->malloc_counter());
+    print_malloc(malloc_memory->malloc_counter(), mem_tag);
     out->cr();
   }
 
diff --git a/src/hotspot/share/nmt/memReporter.hpp b/src/hotspot/share/nmt/memReporter.hpp
index 05b1588f38b..2238d42f15f 100644
--- a/src/hotspot/share/nmt/memReporter.hpp
+++ b/src/hotspot/share/nmt/memReporter.hpp
@@ -108,7 +108,7 @@ class MemReporterBase : public StackObj {
 
   // Print summary total, malloc and virtual memory
   void print_total(size_t reserved, size_t committed, size_t peak = 0) const;
-  void print_malloc(const MemoryCounter* c, MemTag mem_tag = mtNone) const;
+  void print_malloc(const MemoryCounter* c, MemTag mem_tag) const;
   void print_virtual_memory(size_t reserved, size_t committed, size_t peak) const;
   void print_arena(const MemoryCounter* c) const;
 
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 981e991a41e..3918e81dab7 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -127,7 +127,7 @@ class MemTracker : AllStatic {
   //  (we do not do any reservations before that).
 
   static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
-    MemTag mem_tag = mtNone) {
+    MemTag mem_tag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
@@ -153,7 +153,7 @@ class MemTracker : AllStatic {
   }
 
   static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
-    const NativeCallStack& stack, MemTag mem_tag = mtNone) {
+    const NativeCallStack& stack, MemTag mem_tag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index 74d299e6637..2b3b5722571 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -297,7 +297,7 @@ class ReservedMemoryRegion : public VirtualMemoryRegion {
 
  public:
   ReservedMemoryRegion(address base, size_t size, const NativeCallStack& stack,
-    MemTag mem_tag = mtNone) :
+    MemTag mem_tag) :
     VirtualMemoryRegion(base, size), _stack(stack), _mem_tag(mem_tag) { }
 
 
@@ -380,7 +380,7 @@ class VirtualMemoryTracker : AllStatic {
  public:
   static bool initialize(NMT_TrackingLevel level);
 
-  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MemTag mem_tag = mtNone);
+  static bool add_reserved_region (address base_addr, size_t size, const NativeCallStack& stack, MemTag mem_tag);
 
   static bool add_committed_region      (address base_addr, size_t size, const NativeCallStack& stack);
   static bool remove_uncommitted_region (address base_addr, size_t size);
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 430d6997e77..228244bbd05 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -2400,7 +2400,7 @@ static char* get_bad_address() {
   static char* bad_address = nullptr;
   if (bad_address == nullptr) {
     size_t size = os::vm_allocation_granularity();
-    bad_address = os::reserve_memory(size, false, mtInternal);
+    bad_address = os::reserve_memory(size, mtInternal);
     if (bad_address != nullptr) {
       os::protect_memory(bad_address, size, os::MEM_PROT_READ,
                          /*is_committed*/false);
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 41f32729cd4..2e277ffadab 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -728,11 +728,11 @@ WB_ENTRY(void, WB_NMTFree(JNIEnv* env, jobject o, jlong mem))
 WB_END
 
 WB_ENTRY(jlong, WB_NMTReserveMemory(JNIEnv* env, jobject o, jlong size))
-  return (jlong)(uintptr_t)os::reserve_memory(size, false, mtTest);
+  return (jlong)(uintptr_t)os::reserve_memory(size, mtTest);
 WB_END
 
 WB_ENTRY(jlong, WB_NMTAttemptReserveMemoryAt(JNIEnv* env, jobject o, jlong addr, jlong size))
-  return (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size, false, mtTest);
+  return (jlong)(uintptr_t)os::attempt_reserve_memory_at((char*)(uintptr_t)addr, (size_t)size, mtTest);
 WB_END
 
 WB_ENTRY(void, WB_NMTCommitMemory(JNIEnv* env, jobject o, jlong addr, jlong size))
@@ -1524,7 +1524,7 @@ WB_ENTRY(void, WB_ReadReservedMemory(JNIEnv* env, jobject o))
   static char c;
   static volatile char* p;
 
-  p = os::reserve_memory(os::vm_allocation_granularity());
+  p = os::reserve_memory(os::vm_allocation_granularity(), mtTest);
   if (p == nullptr) {
     THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "Failed to reserve memory");
   }
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index b24b7e5b0fa..8e85c0a8c02 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1968,7 +1968,7 @@ bool os::create_stack_guard_pages(char* addr, size_t bytes) {
   return os::pd_create_stack_guard_pages(addr, bytes);
 }
 
-char* os::reserve_memory(size_t bytes, bool executable, MemTag mem_tag) {
+char* os::reserve_memory(size_t bytes, MemTag mem_tag, bool executable) {
   char* result = pd_reserve_memory(bytes, executable);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve(result, bytes, CALLER_PC, mem_tag);
@@ -1979,7 +1979,7 @@ char* os::reserve_memory(size_t bytes, bool executable, MemTag mem_tag) {
   return result;
 }
 
-char* os::attempt_reserve_memory_at(char* addr, size_t bytes, bool executable, MemTag mem_tag) {
+char* os::attempt_reserve_memory_at(char* addr, size_t bytes, MemTag mem_tag, bool executable) {
   char* result = SimulateFullAddressSpace ? nullptr : pd_attempt_reserve_memory_at(addr, bytes, executable);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, mem_tag);
@@ -2185,7 +2185,7 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
     assert(is_aligned(result, alignment), "alignment invalid (" ERRFMT ")", ERRFMTARGS);
     log_trace(os, map)(ERRFMT, ERRFMTARGS);
     log_debug(os, map)("successfully attached at " PTR_FORMAT, p2i(result));
-    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve((address)result, bytes, CALLER_PC, mtNone);
   } else {
     log_debug(os, map)("failed to attach anywhere in [" PTR_FORMAT "-" PTR_FORMAT ")", p2i(min), p2i(max));
   }
@@ -2362,8 +2362,8 @@ char* os::attempt_map_memory_to_file_at(char* addr, size_t bytes, int file_desc,
 }
 
 char* os::map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only,
-                           bool allow_exec, MemTag mem_tag) {
+                           char *addr, size_t bytes, MemTag mem_tag,
+                            bool read_only, bool allow_exec) {
   char* result = pd_map_memory(fd, file_name, file_offset, addr, bytes, read_only, allow_exec);
   if (result != nullptr) {
     MemTracker::record_virtual_memory_reserve_and_commit((address)result, bytes, CALLER_PC, mem_tag);
@@ -2401,7 +2401,7 @@ char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size
   char* result = pd_reserve_memory_special(size, alignment, page_size, addr, executable);
   if (result != nullptr) {
     // The memory is committed
-    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC);
+    MemTracker::record_virtual_memory_reserve_and_commit((address)result, size, CALLER_PC, mtNone);
     log_debug(os, map)("Reserved and committed " RANGEFMT, RANGEFMTARGS(result, size));
   } else {
     log_info(os, map)("Reserve and commit failed (%zu bytes)", size);
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 16a74cd7ea9..dde80806912 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -457,14 +457,14 @@ class os: AllStatic {
   inline static size_t cds_core_region_alignment();
 
   // Reserves virtual memory.
-  static char*  reserve_memory(size_t bytes, bool executable = false, MemTag mem_tag = mtNone);
+  static char*  reserve_memory(size_t bytes, MemTag mem_tag, bool executable = false);
 
   // Reserves virtual memory that starts at an address that is aligned to 'alignment'.
-  static char*  reserve_memory_aligned(size_t size, size_t alignment, bool executable = false);
+  static char*  reserve_memory_aligned(size_t size, size_t alignment, MemTag mem_tag, bool executable = false);
 
   // Attempts to reserve the virtual memory at [addr, addr + bytes).
   // Does not overwrite existing mappings.
-  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, bool executable = false, MemTag mem_tag = mtNone);
+  static char*  attempt_reserve_memory_at(char* addr, size_t bytes, MemTag mem_tag, bool executable = false);
 
   // Given an address range [min, max), attempts to reserve memory within this area, with the given alignment.
   // If randomize is true, the location will be randomized.
@@ -516,16 +516,16 @@ class os: AllStatic {
   static int create_file_for_heap(const char* dir);
   // Map memory to the file referred by fd. This function is slightly different from map_memory()
   // and is added to be used for implementation of -XX:AllocateHeapAt
-  static char* map_memory_to_file(size_t size, int fd, MemTag mem_tag = mtNone);
-  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MemTag mem_tag = mtNone);
+  static char* map_memory_to_file(size_t size, int fd, MemTag mem_tag);
+  static char* map_memory_to_file_aligned(size_t size, size_t alignment, int fd, MemTag mem_tag);
   static char* map_memory_to_file(char* base, size_t size, int fd);
-  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MemTag mem_tag = mtNone);
+  static char* attempt_map_memory_to_file_at(char* base, size_t size, int fd, MemTag mem_tag);
   // Replace existing reserved memory with file mapping
   static char* replace_existing_mapping_with_file_mapping(char* base, size_t size, int fd);
 
   static char*  map_memory(int fd, const char* file_name, size_t file_offset,
-                           char *addr, size_t bytes, bool read_only = false,
-                           bool allow_exec = false, MemTag mem_tag = mtNone);
+                           char *addr, size_t bytes, MemTag mem_tag, bool read_only = false,
+                           bool allow_exec = false);
   static bool   unmap_memory(char *addr, size_t bytes);
   static void   disclaim_memory(char *addr, size_t bytes);
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index 51038d764bb..71224bbff4c 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -57,7 +57,7 @@ void SafepointMechanism::default_initialize() {
     // Polling page
     const size_t page_size = os::vm_page_size();
     const size_t allocation_size = 2 * page_size;
-    char* polling_page = os::reserve_memory(allocation_size, !ExecMem, mtSafepoint);
+    char* polling_page = os::reserve_memory(allocation_size, mtSafepoint);
     os::commit_memory_or_exit(polling_page, allocation_size, !ExecMem, "Unable to commit Safepoint polling page");
 
     char* bad_page  = polling_page;
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 9413f1f72d7..abe3d6757b5 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -712,7 +712,7 @@ struct TestMultipleStaticAssertFormsInClassScope {
 // Support for showing register content on asserts/guarantees.
 #ifdef CAN_SHOW_REGISTERS_ON_ASSERT
 void initialize_assert_poison() {
-  char* page = os::reserve_memory(os::vm_page_size(), !ExecMem, mtInternal);
+  char* page = os::reserve_memory(os::vm_page_size(), mtInternal);
   if (page) {
     if (os::commit_memory(page, os::vm_page_size(), !ExecMem) &&
         os::protect_memory(page, os::vm_page_size(), os::MEM_PROT_NONE)) {
diff --git a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
index bc0ed0f3c59..45da22ce116 100644
--- a/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
+++ b/test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp
@@ -82,7 +82,8 @@ TEST_VM(G1RegionToSpaceMapper, smallStressAdjacent) {
 
   ReservedSpace rs = MemoryReserver::reserve(size,
                                              os::vm_allocation_granularity(),
-                                             os::vm_page_size());
+                                             os::vm_page_size(),
+                                             mtTest);
 
   G1RegionToSpaceMapper* small_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
@@ -90,7 +91,7 @@ TEST_VM(G1RegionToSpaceMapper, smallStressAdjacent) {
                                          page_size,
                                          region_size,
                                          G1BlockOffsetTable::heap_map_factor(),
-                                         mtGC);
+                                         mtTest);
 
 
 
@@ -108,14 +109,15 @@ TEST_VM(G1RegionToSpaceMapper, largeStressAdjacent) {
 
   ReservedSpace rs = MemoryReserver::reserve(size,
                                              os::vm_allocation_granularity(),
-                                             os::vm_page_size());
+                                             os::vm_page_size(),
+                                             mtTest);
   G1RegionToSpaceMapper* large_mapper  =
     G1RegionToSpaceMapper::create_mapper(rs,
                                          size,
                                          page_size,
                                          region_size,
                                          G1BlockOffsetTable::heap_map_factor(),
-                                         mtGC);
+                                         mtTest);
 
   G1TestCommitUncommit task(large_mapper);
   G1MapperWorkers::run_task(&task);
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index 71fb83827c7..f22eef50858 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -56,7 +56,7 @@ class ZForwardingTest : public Test {
     const size_t increment = MAX2(align_up(unused / 100, ZGranuleSize), ZGranuleSize);
 
     for (uintptr_t start = 0; start + ZGranuleSize <= ZAddressOffsetMax; start += increment) {
-      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, false /* executable */);
+      char* const reserved = os::attempt_reserve_memory_at((char*)ZAddressHeapBase + start, ZGranuleSize, mtTest);
       if (reserved != nullptr) {
         // Success
         return reserved;
diff --git a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
index 96e23d21750..b6b827aa0b7 100644
--- a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
+++ b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
@@ -128,7 +128,7 @@ class ZVirtualMemoryManagerTest : public ZTest {
 
     // Reserve the memory that is acting as a blocking reservation.
     {
-      char* const result = os::attempt_reserve_memory_at((char*)untype(blocked), ZGranuleSize, !ExecMem, mtTest);
+      char* const result = os::attempt_reserve_memory_at((char*)untype(blocked), ZGranuleSize, mtTest);
       if (uintptr_t(result) != untype(blocked)) {
         GTEST_SKIP() << "Failed to reserve requested memory at " << untype(blocked);
       }
diff --git a/test/hotspot/gtest/memory/test_virtualspace.cpp b/test/hotspot/gtest/memory/test_virtualspace.cpp
index d3fed31da0b..d2f8927ba28 100644
--- a/test/hotspot/gtest/memory/test_virtualspace.cpp
+++ b/test/hotspot/gtest/memory/test_virtualspace.cpp
@@ -73,7 +73,7 @@ namespace {
   static void test_reserved_size_alignment(size_t size, size_t alignment) {
     ASSERT_PRED2(is_size_aligned, size, alignment) << "Incorrect input parameters";
     size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
-    ReservedSpace rs = MemoryReserver::reserve(size, alignment, page_size);
+    ReservedSpace rs = MemoryReserver::reserve(size, alignment, page_size, mtTest);
 
     ASSERT_TRUE(rs.base() != nullptr) << "rs.special = " << rs.special();
     ASSERT_EQ(size, rs.size()) << "rs.special = " << rs.special();
@@ -101,7 +101,7 @@ namespace {
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
     size_t page_size = large ? os::large_page_size() : os::vm_page_size();
 
-    ReservedSpace rs = MemoryReserver::reserve(size, alignment, page_size);
+    ReservedSpace rs = MemoryReserver::reserve(size, alignment, page_size, mtTest);
     MemoryReleaser releaser(&rs);
 
     EXPECT_TRUE(rs.base() != nullptr) << "rs.special: " << rs.special();
@@ -217,7 +217,8 @@ namespace {
       case Commit:
         return MemoryReserver::reserve(reserve_size_aligned,
                                        os::vm_allocation_granularity(),
-                                       os::vm_page_size());
+                                       os::vm_page_size(),
+                                       mtTest);
     }
   }
 
@@ -296,7 +297,7 @@ TEST_VM(VirtualSpace, actual_committed_space_one_large_page) {
 
   size_t large_page_size = os::large_page_size();
 
-  ReservedSpace reserved = MemoryReserver::reserve(large_page_size, large_page_size, large_page_size);
+  ReservedSpace reserved = MemoryReserver::reserve(large_page_size, large_page_size, large_page_size, mtTest);
   ReservedSpaceReleaser releaser(&reserved);
   ASSERT_TRUE(reserved.is_reserved());
 
@@ -365,7 +366,8 @@ class TestReservedSpace : AllStatic {
     size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
     ReservedSpace rs = MemoryReserver::reserve(size,
                                                alignment,
-                                               page_size);
+                                               page_size,
+                                               mtTest);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -410,7 +412,8 @@ class TestReservedSpace : AllStatic {
 
     ReservedSpace rs = MemoryReserver::reserve(size,
                                                alignment,
-                                               page_size);
+                                               page_size,
+                                               mtTest);
 
     EXPECT_TRUE(rs.base() != nullptr);
     EXPECT_EQ(rs.size(), size) <<  "rs.size: " << rs.size();
@@ -514,12 +517,14 @@ class TestVirtualSpace : AllStatic {
     default:
     case Default:
     case Reserve:
-      return MemoryReserver::reserve(reserve_size_aligned, mtTest);
+      return MemoryReserver::reserve(reserve_size_aligned,
+                                     mtTest);
     case Disable:
     case Commit:
       return MemoryReserver::reserve(reserve_size_aligned,
                                      os::vm_allocation_granularity(),
-                                     os::vm_page_size());
+                                     os::vm_page_size(),
+                                     mtTest);
     }
   }
 
@@ -576,7 +581,8 @@ class TestVirtualSpace : AllStatic {
 
     ReservedSpace reserved = MemoryReserver::reserve(large_page_size,
                                                      large_page_size,
-                                                     large_page_size);
+                                                     large_page_size,
+                                                     mtTest);
 
     ASSERT_TRUE(reserved.is_reserved());
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
index e0e3c289102..c8711004f10 100644
--- a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
@@ -113,7 +113,7 @@ TEST_VM(NMT, DISABLED_location_printing_cheap_dead_7) { test_for_dead_c_heap_blo
 #endif
 
 static void test_for_mmap(size_t sz, ssize_t offset) {
-  char* addr = os::reserve_memory(sz, false, mtTest);
+  char* addr = os::reserve_memory(sz, mtTest);
   if (MemTracker::enabled()) {
     test_pointer(addr + offset, true, "in mmap'd memory region");
   } else {
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index de63e1807c1..f07b45bc32d 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -91,7 +91,7 @@ class CommittedVirtualMemoryTest {
   static void test_committed_region_impl(size_t num_pages, size_t touch_pages, int* page_num) {
     const size_t page_sz = os::vm_page_size();
     const size_t size = num_pages * page_sz;
-    char* base = os::reserve_memory(size, !ExecMem, mtThreadStack);
+    char* base = os::reserve_memory(size, mtThreadStack);
     bool result = os::commit_memory(base, size, !ExecMem);
     size_t index;
     ASSERT_NE(base, (char*)nullptr);
@@ -159,7 +159,7 @@ class CommittedVirtualMemoryTest {
     const size_t page_sz = os::vm_page_size();
     const size_t num_pages = 4;
     const size_t size = num_pages * page_sz;
-    char* base = os::reserve_memory(size, !ExecMem, mtTest);
+    char* base = os::reserve_memory(size, mtTest);
     ASSERT_NE(base, (char*)nullptr);
     result = os::commit_memory(base, size, !ExecMem);
 
@@ -205,7 +205,7 @@ class CommittedVirtualMemoryTest {
     const size_t page_sz = os::vm_page_size();
     const size_t size = num_pages * page_sz;
 
-    char* base = os::reserve_memory(size, !ExecMem, mtTest);
+    char* base = os::reserve_memory(size, mtTest);
     ASSERT_NE(base, (char*)nullptr);
 
     result = os::commit_memory(base, size, !ExecMem);
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 04d71a55a49..c52f7a692c7 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -259,7 +259,7 @@ TEST_VM(os, test_print_hex_dump) {
 
   // two pages, first one protected.
   const size_t ps = os::vm_page_size();
-  char* two_pages = os::reserve_memory(ps * 2, false, mtTest);
+  char* two_pages = os::reserve_memory(ps * 2, mtTest);
   os::commit_memory(two_pages, ps * 2, false);
   os::protect_memory(two_pages, ps, os::MEM_PROT_NONE, true);
 
@@ -493,7 +493,7 @@ TEST_VM(os, realpath) {
 static inline bool can_reserve_executable_memory(void) {
   bool executable = true;
   size_t len = 128;
-  char* p = os::reserve_memory(len, executable);
+  char* p = os::reserve_memory(len, mtTest, executable);
   bool exec_supported = (p != nullptr);
   if (exec_supported) {
     os::release_memory(p, len);
@@ -531,7 +531,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
   for (int tries = 0; tries < 256 && p == nullptr; tries ++) {
     size_t total_range_len = num_stripes * stripe_len;
     // Reserve a large contiguous area to get the address space...
-    p = (address)os::reserve_memory(total_range_len);
+    p = (address)os::reserve_memory(total_range_len, mtTest);
     EXPECT_NE(p, (address)nullptr);
     // .. release it...
     EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
@@ -545,7 +545,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 #else
       const bool executable = stripe % 2 == 0;
 #endif
-      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
+      q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, mtTest, executable);
       if (q == nullptr) {
         // Someone grabbed that area concurrently. Cleanup, then retry.
         tty->print_cr("reserve_multiple: retry (%d)...", stripe);
@@ -565,7 +565,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
 static address reserve_one_commit_multiple(int num_stripes, size_t stripe_len) {
   assert(is_aligned(stripe_len, os::vm_allocation_granularity()), "Sanity");
   size_t total_range_len = num_stripes * stripe_len;
-  address p = (address)os::reserve_memory(total_range_len);
+  address p = (address)os::reserve_memory(total_range_len, mtTest);
   EXPECT_NE(p, (address)nullptr);
   for (int stripe = 0; stripe < num_stripes; stripe++) {
     address q = p + (stripe * stripe_len);
@@ -632,7 +632,7 @@ TEST_VM(os, release_multi_mappings) {
   PRINT_MAPPINGS("B");
 
   // ...re-reserve the middle stripes. This should work unless release silently failed.
-  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)p_middle_stripes, middle_stripe_len, mtTest);
 
   ASSERT_EQ(p2, p_middle_stripes);
 
@@ -655,7 +655,7 @@ TEST_VM_ASSERT_MSG(os, release_bad_ranges, ".*bad release") {
 #else
 TEST_VM(os, release_bad_ranges) {
 #endif
-  char* p = os::reserve_memory(4 * M);
+  char* p = os::reserve_memory(4 * M, mtTest);
   ASSERT_NE(p, (char*)nullptr);
   // Release part of range
   ASSERT_FALSE(os::release_memory(p, M));
@@ -690,7 +690,7 @@ TEST_VM(os, release_one_mapping_multi_commits) {
 
   // // make things even more difficult by trying to reserve at the border of the region
   address border = p + num_stripes * stripe_len;
-  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len);
+  address p2 = (address)os::attempt_reserve_memory_at((char*)border, stripe_len, mtTest);
   PRINT_MAPPINGS("B");
 
   ASSERT_TRUE(p2 == nullptr || p2 == border);
@@ -731,7 +731,7 @@ TEST_VM(os, show_mappings_small_range) {
 TEST_VM(os, show_mappings_full_range) {
   // Reserve a small range and fill it with a marker string, should show up
   // on implementations displaying range snippets
-  char* p = os::reserve_memory(1 * M, false, mtInternal);
+  char* p = os::reserve_memory(1 * M, mtTest);
   if (p != nullptr) {
     if (os::commit_memory(p, 1 * M, false)) {
       strcpy(p, "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
@@ -755,7 +755,7 @@ TEST_VM(os, find_mapping_simple) {
 
   // A simple allocation
   {
-    address p = (address)os::reserve_memory(total_range_len);
+    address p = (address)os::reserve_memory(total_range_len, mtTest);
     ASSERT_NE(p, (address)nullptr);
     PRINT_MAPPINGS("A");
     for (size_t offset = 0; offset < total_range_len; offset += 4711) {
@@ -1060,9 +1060,9 @@ TEST_VM(os, open_O_CLOEXEC) {
 }
 
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
-  char* p1 = os::reserve_memory(M, false, mtTest);
+  char* p1 = os::reserve_memory(M, mtTest);
   ASSERT_NE(p1, nullptr);
-  char* p2 = os::attempt_reserve_memory_at(p1, M);
+  char* p2 = os::attempt_reserve_memory_at(p1, M, mtTest);
   ASSERT_EQ(p2, nullptr); // should have failed
   os::release_memory(p1, M);
 }
@@ -1070,7 +1070,7 @@ TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_smallpages) {
 TEST_VM(os, reserve_at_wish_address_shall_not_replace_mappings_largepages) {
   if (UseLargePages && !os::can_commit_large_page_memory()) { // aka special
     const size_t lpsz = os::large_page_size();
-    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, false);
+    char* p1 = os::reserve_memory_aligned(lpsz, lpsz, mtTest);
     ASSERT_NE(p1, nullptr);
     char* p2 = os::reserve_memory_special(lpsz, lpsz, lpsz, p1, false);
     ASSERT_EQ(p2, nullptr); // should have failed
@@ -1096,7 +1096,7 @@ TEST_VM(os, free_without_uncommit) {
   const size_t pages = 64;
   const size_t size = pages * page_sz;
 
-  char* base = os::reserve_memory(size, false, mtTest);
+  char* base = os::reserve_memory(size, mtTest);
   ASSERT_NE(base, (char*) nullptr);
   ASSERT_TRUE(os::commit_memory(base, size, false));
 
@@ -1120,7 +1120,7 @@ TEST_VM(os, commit_memory_or_exit) {
   const size_t size = 16 * page_sz;
   const char* letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-  char* base = os::reserve_memory(size, false, mtTest);
+  char* base = os::reserve_memory(size, mtTest, false);
   ASSERT_NOT_NULL(base);
   os::commit_memory_or_exit(base, size, false, "Commit failed.");
   strcpy(base, letters);
@@ -1158,7 +1158,7 @@ TEST_VM(os, map_unmap_memory) {
   ::close(fd);
 
   fd = os::open(path, O_RDONLY, 0666);
-  char* result = os::map_memory(fd, path, 0, nullptr, size, true, false, mtTest);
+  char* result = os::map_memory(fd, path, 0, nullptr, size, mtTest, true, false);
   ASSERT_NOT_NULL(result);
   EXPECT_EQ(strcmp(letters, result), 0);
   EXPECT_TRUE(os::unmap_memory(result, size));
diff --git a/test/hotspot/gtest/runtime/test_os_aix.cpp b/test/hotspot/gtest/runtime/test_os_aix.cpp
index 9fcb2f9c691..73ed55dc3ce 100644
--- a/test/hotspot/gtest/runtime/test_os_aix.cpp
+++ b/test/hotspot/gtest/runtime/test_os_aix.cpp
@@ -34,9 +34,9 @@
 TEST_VM(os_aix, aix_reserve_at_non_shmlba_aligned_address) {
   if (os::vm_page_size() != 4*K && !os::Aix::supports_64K_mmap_pages()) {
     // With this condition true shmget() is used inside
-    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M);
+    char* p = os::attempt_reserve_memory_at((char*)0x1f00000, M, mtTest);
     ASSERT_EQ(p, nullptr); // should have failed
-    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M);
+    p = os::attempt_reserve_memory_at((char*)((64 * G) + M), M, mtTest);
     ASSERT_EQ(p, nullptr); // should have failed
   }
 }
diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp
index caa227c5e35..21133788a36 100644
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp
@@ -354,7 +354,7 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   const size_t size = 1 * G;
   const bool useThp = UseTransparentHugePages;
   UseTransparentHugePages = true;
-  char* const heap = os::reserve_memory(size, false, mtInternal);
+  char* const heap = os::reserve_memory(size, mtTest);
   EXPECT_NE(heap, nullptr);
   EXPECT_TRUE(os::commit_memory(heap, size, false));
 
diff --git a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
index 34dd26dcf17..ee91ff49ded 100644
--- a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
+++ b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
@@ -157,7 +157,7 @@ struct SpaceWithHole {
       // the hole.
       const uintptr_t candidate = nth_bit(i);
       if ((candidate + _len) <= ARMB_constants::absolute_max) {
-        _base = os::attempt_reserve_memory_at((char*)candidate, _len);
+        _base = os::attempt_reserve_memory_at((char*)candidate, _len, mtTest);
       }
     }
     if (_base == nullptr) {
@@ -165,8 +165,8 @@ struct SpaceWithHole {
     }
     // Release total mapping, remap the individual non-holy parts
     os::release_memory(_base, _len);
-    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size);
-    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size);
+    _p1 = os::attempt_reserve_memory_at(_base + _p1_offset, _p1_size, mtTest);
+    _p2 = os::attempt_reserve_memory_at(_base + _p2_offset, _p2_size, mtTest);
     if (_p1 == nullptr || _p2 == nullptr) {
       return false;
     }
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
index 30a03f973bf..a0c14d70831 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocRoundingReportTest.java
@@ -57,7 +57,7 @@ public static void main(String args[]) throws Exception {
                 // NMT does not track memory allocations less than 1KB, and rounds to the nearest KB
                 NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
                         "Test (reserved=" + numKB + "KB, committed=" + numKB + "KB)",
-                        "(malloc=" + numKB + "KB #1) (at peak)"
+                        "(malloc=" + numKB + "KB tag=Test #1) (at peak)" // (malloc=1KB tag=Test #1) (at peak)
                 );
 
                 wb.NMTFree(mallocd_total);
@@ -65,7 +65,7 @@ public static void main(String args[]) throws Exception {
                 // Run 'jcmd <pid> VM.native_memory summary', check for expected output
                 NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
                         "Test (reserved=0KB, committed=0KB)",
-                        "(malloc=0KB) (peak=" + numKB + "KB #1)"
+                        "(malloc=0KB tag=Test) (peak=" + numKB + "KB #1)"
                 );
             }
         }
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocTestType.java b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
index 67df864e7b4..1612cbd81c0 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTestType.java
@@ -46,7 +46,7 @@ public static void main(String args[]) throws Exception {
 
     NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
             new String[]{"Test (reserved=384KB, committed=384KB)",
-                         "(malloc=384KB #2) (at peak)"});
+                         "(malloc=384KB tag=Test #2) (at peak)"});
 
     wb.NMTFree(memAlloc3);                           // current +256K #1 peak +384K #2
     long memAlloc1 = wb.NMTMalloc(512 * 1024);  // current +768K #2 peak +768K #2
@@ -54,13 +54,13 @@ public static void main(String args[]) throws Exception {
 
     NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
             new String[]{"Test (reserved=512KB, committed=512KB)",
-                         "(malloc=512KB #1) (peak=768KB #2)"});
+                         "(malloc=512KB tag=Test #1) (peak=768KB #2)"});
 
     // Free the memory allocated by NMTAllocTest
     wb.NMTFree(memAlloc1); // current 0K #0 peak +768K #2
 
     NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
             new String[]{"Test (reserved=0KB, committed=0KB)",
-                         "(malloc=0KB) (peak=768KB #2)"});
+                         "(malloc=0KB tag=Test) (peak=768KB #2)"});
   }
 }
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
index 0c08e07fd25..141ef9f2ac3 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocTrackingVerify.java
@@ -72,7 +72,7 @@ public static void main(String args[]) throws Exception {
 
         NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
                 "Test (reserved=4KB, committed=4KB)",
-                "(malloc=4KB #" + mallocd_memory.size() + ") (at peak)"
+                "(malloc=4KB tag=Test #" + mallocd_memory.size() + ") (at peak)"
         );
 
         // Free
@@ -83,7 +83,7 @@ public static void main(String args[]) throws Exception {
         // Run 'jcmd <pid> VM.native_memory summary', check for expected output
         NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
                 "Test (reserved=0KB, committed=0KB)",
-                "(malloc=0KB) (peak=4KB #" + + mallocd_memory.size() + ")"
+                "(malloc=0KB tag=Test) (peak=4KB #" + + mallocd_memory.size() + ")"
         );
 
     }
diff --git a/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
index 290984c4185..f6b0f3baf04 100644
--- a/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
+++ b/test/hotspot/jtreg/runtime/NMT/ThreadedMallocTestType.java
@@ -61,7 +61,7 @@ public void run() {
     // Run 'jcmd <pid> VM.native_memory summary'
     NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
             "Test (reserved=896KB, committed=896KB)",
-            "(malloc=896KB #3) (at peak)"
+            "(malloc=896KB tag=Test #3) (at peak)"
     );
 
     Thread freeThread = new Thread() {
@@ -78,7 +78,7 @@ public void run() {
 
     NMTTestUtils.runJcmdSummaryReportAndCheckOutput(
             "Test (reserved=0KB, committed=0KB)",
-            "(malloc=0KB) (peak=896KB #3)"
+            "(malloc=0KB tag=Test) (peak=896KB #3)"
     );
   }
 }

From 1ff7e813e39d16376baccdbd9e7075035248319d Mon Sep 17 00:00:00 2001
From: Mat Carter <macarte@openjdk.org>
Date: Wed, 30 Apr 2025 18:05:59 +0000
Subject: [PATCH 214/901] 8354897: Support Soft/Weak Reference in AOT cache

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: liach, eosterlund
---
 src/hotspot/share/cds/aotArtifactFinder.cpp   |   2 +
 src/hotspot/share/cds/aotClassInitializer.cpp |   3 +-
 .../share/cds/aotReferenceObjSupport.cpp      | 240 ++++++++++++++
 .../share/cds/aotReferenceObjSupport.hpp      |  45 +++
 src/hotspot/share/cds/archiveHeapWriter.cpp   |  18 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   3 -
 src/hotspot/share/cds/heapShared.cpp          |  42 ++-
 src/hotspot/share/cds/heapShared.hpp          |   4 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  15 +-
 src/hotspot/share/classfile/javaClasses.cpp   |   5 +-
 src/hotspot/share/classfile/vmSymbols.hpp     |   1 -
 .../java/lang/invoke/LambdaFormEditor.java    |  19 +-
 .../java/lang/invoke/MethodHandleNatives.java |  20 +-
 .../classes/java/lang/invoke/MethodType.java  |  41 +--
 .../java/lang/invoke/MethodTypeForm.java      |  44 +--
 .../classes/java/lang/ref/Reference.java      |  19 +-
 .../classes/java/lang/ref/ReferenceQueue.java |  10 +-
 .../share/classes/jdk/internal/misc/CDS.java  |  27 ++
 .../jdk/internal/util/ReferencedKeyMap.java   |  37 ++-
 .../jdk/internal/util/ReferencedKeySet.java   |   6 +-
 .../aotClassLinking/TestSetupAOTTest.java     |  57 ++++
 .../aotClassLinking/WeakReferenceTest.java    | 306 ++++++++++++++++++
 test/setup_aot/TestSetupAOT.java              |  87 ++++-
 23 files changed, 874 insertions(+), 177 deletions(-)
 create mode 100644 src/hotspot/share/cds/aotReferenceObjSupport.cpp
 create mode 100644 src/hotspot/share/cds/aotReferenceObjSupport.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java

diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 65eb06ca7f0..d87b501150b 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotClassLinker.hpp"
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
+#include "cds/aotReferenceObjSupport.hpp"
 #include "cds/dumpTimeClassInfo.inline.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/lambdaProxyClassDictionary.hpp"
@@ -73,6 +74,7 @@ void AOTArtifactFinder::find_artifacts() {
   // Note, if a class is not excluded, it does NOT mean it will be automatically included
   // into the AOT cache -- that will be decided by the code below.
   SystemDictionaryShared::finish_exclusion_checks();
+  AOTReferenceObjSupport::init_keep_alive_objs_table();
 
   start_scanning_for_oops();
 
diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 297f8109eb4..be7e1f31d8a 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -338,7 +338,8 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
 bool AOTClassInitializer::is_runtime_setup_required(InstanceKlass* ik) {
   return ik == vmClasses::Class_klass() ||
          ik == vmClasses::internal_Unsafe_klass() ||
-         ik == vmClasses::ConcurrentHashMap_klass();
+         ik == vmClasses::ConcurrentHashMap_klass() ||
+         ik == vmClasses::Reference_klass();
 }
 
 void AOTClassInitializer::call_runtime_setup(JavaThread* current, InstanceKlass* ik) {
diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.cpp b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
new file mode 100644
index 00000000000..e948a6cefa3
--- /dev/null
+++ b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
@@ -0,0 +1,240 @@
+/*
+ * 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.
+ *
+ */
+
+#include "cds/aotReferenceObjSupport.hpp"
+#include "cds/heapShared.hpp"
+#include "classfile/javaClasses.hpp"
+#include "classfile/symbolTable.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "oops/oop.inline.hpp"
+#include "oops/oopHandle.inline.hpp"
+#include "runtime/fieldDescriptor.inline.hpp"
+#include "runtime/javaCalls.hpp"
+#include "utilities/resourceHash.hpp"
+
+// Handling of java.lang.ref.Reference objects in the AOT cache
+// ============================================================
+//
+// When AOTArtifactFinder finds an oop which is a instance of java.lang.ref.Reference:
+//
+// - We check if the oop is eligible to be stored in the AOT cache. If not, the AOT cache
+//   creation fails -- see AOTReferenceObjSupport::check_if_ref_obj()
+//
+// - Otherwise, we store the oop into the AOT cache, but we unconditionally reset its
+//   "next" and "discovered" fields to null. Otherwise, if AOTArtifactFinder follows these
+//   fields, it may found unrelated objects that we don't intend to cache.
+//
+// Eligibility
+// ===========
+//
+// [1] A reference that does not require special clean up (i.e., Reference::queue == ReferenceQueue.NULL_QUEUE)
+//     is eligible.
+//
+// [2] A reference that REQUIRE specials clean up (i.e., Reference::queue != ReferenceQueue.NULL_QUEUE)
+//     is eligible ONLY if its referent is not null.
+//
+// As of this version, the only oops in group [2] that can be found by AOTArtifactFinder are
+// the keys used by ReferencedKeyMap in the implementation of MethodType::internTable.
+// stabilize_cached_reference_objects() ensures that all keys found by AOTArtifactFinder are eligible.
+//
+// The purpose of the error check in check_if_ref_obj() is to guard against changes in the JDK core
+// libs that might introduce new types of oops in group [2] into the AOT cache.
+//
+// Reasons for the eligibility restrictions
+// ========================================
+//
+// Reference handling is complex. In this version, we implement only enough functionality to support
+// the use of Weak/Soft references used by java.lang.invoke.
+//
+// We intend to evolve the implementation in the future by
+// -- implementing more assemblySetup() operations for other use cases, and/or
+// -- relaxing the eligibility restrictions.
+//
+//
+// null referents for group [1]
+// ============================
+//
+// Any cached reference R1 of group [1] is allowed to have a null referent.
+// This can happen in the following situations:
+//    (a) R1.clear() was called by Java code during the assembly phase.
+//    (b) The referent has been collected, and R1 is in the "pending" state.
+// In case (b), the "next" and "discovered" fields of the cached copy of R1 will
+// be set to null. During the production run:
+//    - It would appear to the Java program as if immediately during VM start-up, the referent
+//      was collected and ReferenceThread completed processing of R1.
+//    - It would appear to the GC as if immediately during VM start-up, the Java program called
+//      R1.clear().
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+class KeepAliveObjectsTable : public ResourceHashtable<oop, bool,
+    36137, // prime number
+    AnyObj::C_HEAP,
+    mtClassShared,
+    HeapShared::oop_hash> {};
+
+static KeepAliveObjectsTable* _keep_alive_objs_table;
+static OopHandle _keep_alive_objs_array;
+static OopHandle _null_queue;
+
+bool AOTReferenceObjSupport::is_enabled() {
+  // For simplicity, AOTReferenceObjSupport is enabled only when dumping method handles.
+  // Otherwise we won't see Reference objects in the AOT cache. Let's be conservative now.
+  return CDSConfig::is_dumping_method_handles();
+}
+
+void AOTReferenceObjSupport::initialize(TRAPS) {
+  if (!AOTReferenceObjSupport::is_enabled()) {
+    return;
+  }
+
+  TempNewSymbol class_name = SymbolTable::new_symbol("java/lang/ref/ReferenceQueue");
+  Klass* k = SystemDictionary::resolve_or_fail(class_name, true, CHECK);
+  InstanceKlass* ik = InstanceKlass::cast(k);
+  ik->initialize(CHECK);
+
+  TempNewSymbol field_name = SymbolTable::new_symbol("NULL_QUEUE");
+  fieldDescriptor fd;
+  bool found = ik->find_local_field(field_name, vmSymbols::referencequeue_signature(), &fd);
+  precond(found);
+  precond(fd.is_static());
+
+  _null_queue = OopHandle(Universe::vm_global(), ik->java_mirror()->obj_field(fd.offset()));
+}
+
+// Ensure that all group [2] references found by AOTArtifactFinder are eligible.
+void AOTReferenceObjSupport::stabilize_cached_reference_objects(TRAPS) {
+  if (AOTReferenceObjSupport::is_enabled()) {
+    // This assert means that the MethodType and MethodTypeForm tables won't be
+    // updated concurrently, so we can remove GC'ed entries ...
+    assert(CDSConfig::allow_only_single_java_thread(), "Required");
+
+    {
+      TempNewSymbol method_name = SymbolTable::new_symbol("assemblySetup");
+      JavaValue result(T_VOID);
+      JavaCalls::call_static(&result, vmClasses::MethodType_klass(),
+                           method_name,
+                           vmSymbols::void_method_signature(),
+                           CHECK);
+    }
+
+    {
+      Symbol* cds_name  = vmSymbols::jdk_internal_misc_CDS();
+      Klass* cds_klass = SystemDictionary::resolve_or_fail(cds_name, true /*throw error*/,  CHECK);
+      TempNewSymbol method_name = SymbolTable::new_symbol("getKeepAliveObjects");
+      TempNewSymbol method_sig = SymbolTable::new_symbol("()[Ljava/lang/Object;");
+      JavaValue result(T_OBJECT);
+      JavaCalls::call_static(&result, cds_klass, method_name, method_sig, CHECK);
+
+      _keep_alive_objs_array = OopHandle(Universe::vm_global(), result.get_oop());
+    }
+  }
+}
+
+void AOTReferenceObjSupport::init_keep_alive_objs_table() {
+  assert_at_safepoint(); // _keep_alive_objs_table uses raw oops
+  oop a = _keep_alive_objs_array.resolve();
+  if (a != nullptr) {
+    precond(a->is_objArray());
+    precond(AOTReferenceObjSupport::is_enabled());
+    objArrayOop array = objArrayOop(a);
+
+    _keep_alive_objs_table = new (mtClass)KeepAliveObjectsTable();
+    for (int i = 0; i < array->length(); i++) {
+      oop obj = array->obj_at(i);
+      _keep_alive_objs_table->put(obj, true); // The array may have duplicated entries but that's OK.
+    }
+  }
+}
+
+// Returns true IFF obj is an instance of java.lang.ref.Reference. If so, perform extra eligibility checks.
+bool AOTReferenceObjSupport::check_if_ref_obj(oop obj) {
+  // We have a single Java thread. This means java.lang.ref.Reference$ReferenceHandler thread
+  // is not running. Otherwise the checks for next/discovered may not work.
+  precond(CDSConfig::allow_only_single_java_thread());
+  assert_at_safepoint(); // _keep_alive_objs_table uses raw oops
+
+  if (obj->klass()->is_subclass_of(vmClasses::Reference_klass())) {
+    precond(AOTReferenceObjSupport::is_enabled());
+    precond(JavaClasses::is_supported_for_archiving(obj));
+    precond(_keep_alive_objs_table != nullptr);
+
+    // GC needs to know about this load, It will keep referent alive until the current safepoint ends.
+    oop referent = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(obj, java_lang_ref_Reference::referent_offset());
+
+    oop queue = obj->obj_field(java_lang_ref_Reference::queue_offset());
+    oop next = java_lang_ref_Reference::next(obj);
+    oop discovered = java_lang_ref_Reference::discovered(obj);
+    bool needs_special_cleanup = (queue != _null_queue.resolve());
+
+    // If you see the errors below, you probably modified the implementation of java.lang.invoke.
+    // Please check the comments at the top of this file.
+    if (needs_special_cleanup && (referent == nullptr || !_keep_alive_objs_table->contains(referent))) {
+      ResourceMark rm;
+
+      log_error(cds, heap)("Cannot archive reference object " PTR_FORMAT " of class %s",
+                           p2i(obj), obj->klass()->external_name());
+      log_error(cds, heap)("referent = " PTR_FORMAT
+                           ", queue = " PTR_FORMAT
+                           ", next = " PTR_FORMAT
+                           ", discovered = " PTR_FORMAT,
+                           p2i(referent), p2i(queue), p2i(next), p2i(discovered));
+      log_error(cds, heap)("This object requires special clean up as its queue is not ReferenceQueue::N" "ULL ("
+                           PTR_FORMAT ")", p2i(_null_queue.resolve()));
+      log_error(cds, heap)("%s", (referent == nullptr) ?
+                           "referent cannot be null" : "referent is not registered with CDS.keepAlive()");
+      HeapShared::debug_trace();
+      MetaspaceShared::unrecoverable_writing_error();
+    }
+
+    if (log_is_enabled(Info, cds, ref)) {
+      ResourceMark rm;
+      log_info(cds, ref)("Reference obj:"
+                         " r=" PTR_FORMAT
+                         " q=" PTR_FORMAT
+                         " n=" PTR_FORMAT
+                         " d=" PTR_FORMAT
+                         " %s",
+                         p2i(referent),
+                         p2i(queue),
+                         p2i(next),
+                         p2i(discovered),
+                         obj->klass()->external_name());
+    }
+    return true;
+  } else {
+    return false;
+  }
+}
+
+bool AOTReferenceObjSupport::skip_field(int field_offset) {
+  return (field_offset == java_lang_ref_Reference::next_offset() ||
+          field_offset == java_lang_ref_Reference::discovered_offset());
+}
+
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.hpp b/src/hotspot/share/cds/aotReferenceObjSupport.hpp
new file mode 100644
index 00000000000..3d645c2df17
--- /dev/null
+++ b/src/hotspot/share/cds/aotReferenceObjSupport.hpp
@@ -0,0 +1,45 @@
+/*
+ * 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_CDS_AOTREFERENCEOBJSUPPORT_HPP
+#define SHARE_CDS_AOTREFERENCEOBJSUPPORT_HPP
+
+#include "memory/allStatic.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/exceptions.hpp"
+
+// Support for ahead-of-time allocated instances of java.lang.ref.Reference
+
+class AOTReferenceObjSupport : AllStatic {
+
+public:
+  static void initialize(TRAPS);
+  static void stabilize_cached_reference_objects(TRAPS);
+  static void init_keep_alive_objs_table() NOT_CDS_JAVA_HEAP_RETURN;
+  static bool check_if_ref_obj(oop obj);
+  static bool skip_field(int field_offset);
+  static bool is_enabled();
+};
+
+#endif // SHARE_CDS_AOTREFERENCEOBJSUPPORT_HPP
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index 5684066105f..2b6d403d835 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/filemap.hpp"
@@ -607,18 +608,27 @@ class ArchiveHeapWriter::EmbeddedOopRelocator: public BasicOopIterateClosure {
   oop _src_obj;
   address _buffered_obj;
   CHeapBitMap* _oopmap;
-
+  bool _is_java_lang_ref;
 public:
   EmbeddedOopRelocator(oop src_obj, address buffered_obj, CHeapBitMap* oopmap) :
-    _src_obj(src_obj), _buffered_obj(buffered_obj), _oopmap(oopmap) {}
+    _src_obj(src_obj), _buffered_obj(buffered_obj), _oopmap(oopmap)
+  {
+    _is_java_lang_ref = AOTReferenceObjSupport::check_if_ref_obj(src_obj);
+  }
 
   void do_oop(narrowOop *p) { EmbeddedOopRelocator::do_oop_work(p); }
   void do_oop(      oop *p) { EmbeddedOopRelocator::do_oop_work(p); }
 
 private:
   template <class T> void do_oop_work(T *p) {
-    size_t field_offset = pointer_delta(p, _src_obj, sizeof(char));
-    ArchiveHeapWriter::relocate_field_in_buffer<T>((T*)(_buffered_obj + field_offset), _oopmap);
+    int field_offset = pointer_delta_as_int((char*)p, cast_from_oop<char*>(_src_obj));
+    T* field_addr = (T*)(_buffered_obj + field_offset);
+    if (_is_java_lang_ref && AOTReferenceObjSupport::skip_field(field_offset)) {
+      // Do not copy these fields. Set them to null
+      *field_addr = (T)0x0;
+    } else {
+      ArchiveHeapWriter::relocate_field_in_buffer<T>(field_addr, _oopmap);
+    }
   }
 };
 
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 64ad07b0cf8..9af83653351 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -536,9 +536,6 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
     // run to another which resulting in non-determinstic CDS archives.
     // Disable UseStringDeduplication while dumping CDS archive.
     UseStringDeduplication = false;
-
-    // Don't use SoftReferences so that objects used by java.lang.invoke tables can be archived.
-    Arguments::PropertyList_add(new SystemProperty("java.lang.invoke.MethodHandleNatives.USE_SOFT_CACHE", "false", false));
   }
 
   // RecordDynamicDumpInfo is not compatible with ArchiveClassesAtExit
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index ce98b2b93b7..ef71d5895f6 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveHeapWriter.hpp"
@@ -1363,34 +1364,37 @@ void HeapShared::clear_archived_roots_of(Klass* k) {
   }
 }
 
-// Push all oops that are referenced by _referencing_obj onto the _stack.
-class HeapShared::ReferentPusher: public BasicOopIterateClosure {
+// Push all oop fields (or oop array elemenets in case of an objArray) in
+// _referencing_obj onto the _stack.
+class HeapShared::OopFieldPusher: public BasicOopIterateClosure {
   PendingOopStack* _stack;
   GrowableArray<oop> _found_oop_fields;
   int _level;
   bool _record_klasses_only;
   KlassSubGraphInfo* _subgraph_info;
   oop _referencing_obj;
+  bool _is_java_lang_ref;
  public:
-  ReferentPusher(PendingOopStack* stack,
-                           int level,
-                           bool record_klasses_only,
-                           KlassSubGraphInfo* subgraph_info,
-                           oop orig) :
+  OopFieldPusher(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) {
+    _is_java_lang_ref = AOTReferenceObjSupport::check_if_ref_obj(orig);
   }
-  void do_oop(narrowOop *p) { ReferentPusher::do_oop_work(p); }
-  void do_oop(      oop *p) { ReferentPusher::do_oop_work(p); }
+  void do_oop(narrowOop *p) { OopFieldPusher::do_oop_work(p); }
+  void do_oop(      oop *p) { OopFieldPusher::do_oop_work(p); }
 
-  ~ReferentPusher() {
+  ~OopFieldPusher() {
     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,
+      // of OopFieldPusher 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));
@@ -1399,14 +1403,18 @@ class HeapShared::ReferentPusher: public BasicOopIterateClosure {
 
  protected:
   template <class T> void do_oop_work(T *p) {
-    oop obj = RawAccess<>::oop_load(p);
+    int field_offset = pointer_delta_as_int((char*)p, cast_from_oop<char*>(_referencing_obj));
+    oop obj = HeapAccess<ON_UNKNOWN_OOP_REF>::oop_load_at(_referencing_obj, field_offset);
     if (!CompressedOops::is_null(obj)) {
-      size_t field_delta = pointer_delta(p, _referencing_obj, sizeof(char));
+      if (_is_java_lang_ref && AOTReferenceObjSupport::skip_field(field_offset)) {
+        // Do not follow these fields. They will be cleared to null.
+        return;
+      }
 
       if (!_record_klasses_only && log_is_enabled(Debug, cds, heap)) {
         ResourceMark rm;
-        log_debug(cds, heap)("(%d) %s[%zu] ==> " PTR_FORMAT " size %zu %s", _level,
-                             _referencing_obj->klass()->external_name(), field_delta,
+        log_debug(cds, heap)("(%d) %s[%d] ==> " PTR_FORMAT " size %zu %s", _level,
+                             _referencing_obj->klass()->external_name(), field_offset,
                              p2i(obj), obj->size() * HeapWordSize, obj->klass()->external_name());
         if (log_is_enabled(Trace, cds, heap)) {
           LogTarget(Trace, cds, heap) log;
@@ -1586,7 +1594,7 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
     // 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);
+    OopFieldPusher pusher(stack, level, record_klasses_only, subgraph_info, orig_obj);
     orig_obj->oop_iterate(&pusher);
   }
 
@@ -1613,7 +1621,7 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
 // - No java.lang.Class instance (java mirror) can be included inside
 //   an archived sub-graph. Mirror can only be the sub-graph entry object.
 //
-// The Java heap object sub-graph archiving process (see ReferentPusher):
+// The Java heap object sub-graph archiving process (see OopFieldPusher):
 //
 // 1) Java object sub-graph archiving starts from a given static field
 // within a Class instance (java mirror). If the static field is a
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index 04c9ae91381..f4e86aa5895 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -164,8 +164,8 @@ class HeapShared: AllStatic {
 
   static void count_allocation(size_t size);
   static void print_stats();
-  static void debug_trace();
 public:
+  static void debug_trace();
   static unsigned oop_hash(oop const& p);
   static unsigned string_oop_hash(oop const& string) {
     return java_lang_String::hash_code(string);
@@ -357,7 +357,7 @@ class HeapShared: AllStatic {
     int level()    const { return _level; }
   };
 
-  class ReferentPusher;
+  class OopFieldPusher;
   using PendingOopStack = GrowableArrayCHeap<PendingOop, mtClassShared>;
 
   static PendingOop _object_being_archived;
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 5dcdbf271c3..bdec6441080 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -28,6 +28,7 @@
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotConstantPoolResolver.hpp"
 #include "cds/aotLinkedClassBulkLoader.hpp"
+#include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveHeapWriter.hpp"
@@ -962,22 +963,14 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
 #if INCLUDE_CDS_JAVA_HEAP
   if (CDSConfig::is_dumping_heap()) {
     ArchiveHeapWriter::init();
+
     if (CDSConfig::is_dumping_full_module_graph()) {
       ClassLoaderDataShared::ensure_module_entry_tables_exist();
       HeapShared::reset_archived_object_states(CHECK);
     }
 
-    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");
-
-      JavaValue result(T_VOID);
-      JavaCalls::call_static(&result, vmClasses::MethodType_klass(),
-                             vmSymbols::createArchivedObjects(),
-                             vmSymbols::void_method_signature(),
-                             CHECK);
-    }
+    AOTReferenceObjSupport::initialize(CHECK);
+    AOTReferenceObjSupport::stabilize_cached_reference_objects(CHECK);
 
     if (CDSConfig::is_initing_classes_at_dump_time()) {
       // java.lang.Class::reflectionFactory cannot be archived yet. We set this field
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index a39164232ae..c7cca9682fe 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
@@ -5460,9 +5461,7 @@ bool JavaClasses::is_supported_for_archiving(oop obj) {
     }
   }
 
-  if (klass->is_subclass_of(vmClasses::Reference_klass())) {
-    // It's problematic to archive Reference objects. One of the reasons is that
-    // Reference::discovered may pull in unwanted objects (see JDK-8284336)
+  if (!AOTReferenceObjSupport::is_enabled() && klass->is_subclass_of(vmClasses::Reference_klass())) {
     return false;
   }
 
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index e66066738ef..f9f6bd07254 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -719,7 +719,6 @@ class SerializeClosure;
   JFR_TEMPLATES(template)                                                                                         \
                                                                                                                   \
   /* CDS */                                                                                                       \
-  template(createArchivedObjects,                           "createArchivedObjects")                              \
   template(dumpSharedArchive,                               "dumpSharedArchive")                                  \
   template(dumpSharedArchive_signature,                     "(ZLjava/lang/String;)Ljava/lang/String;")            \
   template(generateLambdaFormHolderClasses,                 "generateLambdaFormHolderClasses")                    \
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 6a25bf9c0a8..471de5aa48f 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
@@ -38,7 +38,6 @@
 import static java.lang.invoke.MethodHandleImpl.Intrinsic;
 import static java.lang.invoke.MethodHandleImpl.NF_loop;
 import static java.lang.invoke.MethodHandleImpl.makeIntrinsic;
-import static java.lang.invoke.MethodHandleNatives.USE_SOFT_CACHE;
 
 /** Transforms on LFs.
  *  A lambda-form editor can derive new LFs from its base LF.
@@ -90,17 +89,12 @@ static LambdaFormEditor lambdaFormEditor(LambdaForm lambdaForm) {
      * Tightly coupled with the TransformKey class, which is used to lookup existing
      * Transforms.
      */
-    private static final class Transform {
-        final Object cache;
+    private static final class Transform extends SoftReference<LambdaForm> {
         final long packedBytes;
         final byte[] fullBytes;
 
         private Transform(long packedBytes, byte[] fullBytes, LambdaForm result) {
-            if (USE_SOFT_CACHE) {
-                cache = new SoftReference<LambdaForm>(result);
-            } else {
-                cache = result;
-            }
+            super(result);
             this.packedBytes = packedBytes;
             this.fullBytes = fullBytes;
         }
@@ -141,15 +135,6 @@ public String toString() {
             }
             return buf.toString();
         }
-
-        @SuppressWarnings("unchecked")
-        public LambdaForm get() {
-            if (cache instanceof LambdaForm lf) {
-                return lf;
-            } else {
-                return ((SoftReference<LambdaForm>)cache).get();
-            }
-        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
index 9df7d25258d..0db7a6a8ddb 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.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
@@ -665,22 +665,4 @@ static boolean canBeCalledVirtual(MemberName symbolicRef, Class<?> definingClass
         return (definingClass.isAssignableFrom(symbolicRefClass) ||  // Msym overrides Mdef
                 symbolicRefClass.isInterface());                     // Mdef implements Msym
     }
-
-    //--- AOTCache support
-
-    /**
-     * In normal execution, this is set to true, so that LambdaFormEditor and MethodTypeForm will
-     * use soft references to allow class unloading.
-     *
-     * When dumping the AOTCache, this is set to false so that no cached heap objects will
-     * contain soft references (which are not yet supported by AOTCache - see JDK-8341587). AOTCache
-     * only stores LambdaFormEditors and MethodTypeForms for classes in the boot/platform/app loaders.
-     * Such classes will never be unloaded, so it's OK to use hard references.
-     */
-    static final boolean USE_SOFT_CACHE;
-
-    static {
-        USE_SOFT_CACHE = Boolean.parseBoolean(
-                System.getProperty("java.lang.invoke.MethodHandleNatives.USE_SOFT_CACHE", "true"));
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java
index 5e1c0f8581c..3d15ce68710 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodType.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 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
@@ -31,8 +31,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.function.Supplier;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -42,7 +40,6 @@
 
 import jdk.internal.util.ReferencedKeySet;
 import jdk.internal.util.ReferenceKey;
-import jdk.internal.misc.CDS;
 import jdk.internal.vm.annotation.Stable;
 import sun.invoke.util.BytecodeDescriptor;
 import sun.invoke.util.VerifyType;
@@ -394,17 +391,6 @@ private static MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean tr
             ptypes = NO_PTYPES; trusted = true;
         }
         MethodType primordialMT = new MethodType(rtype, ptypes);
-        if (archivedMethodTypes != null) {
-            // If this JVM process reads from archivedMethodTypes, it never
-            // modifies the table. So there's no need for synchronization.
-            // See copyInternTable() below.
-            assert CDS.isUsingArchive();
-            MethodType mt = archivedMethodTypes.get(primordialMT);
-            if (mt != null) {
-                return mt;
-            }
-        }
-
         MethodType mt = internTable.get(primordialMT);
         if (mt != null)
             return mt;
@@ -425,7 +411,6 @@ private static MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean tr
     }
 
     private static final @Stable MethodType[] objectOnlyTypes = new MethodType[20];
-    private static @Stable HashMap<MethodType,MethodType> archivedMethodTypes;
 
     /**
      * Finds or creates a method type whose components are {@code Object} with an optional trailing {@code Object[]} array.
@@ -1397,29 +1382,9 @@ private Object readResolve() {
         return mt;
     }
 
-    static HashMap<MethodType,MethodType> copyInternTable() {
-        HashMap<MethodType,MethodType> copy = new HashMap<>();
-
-        for (Iterator<MethodType> i = internTable.iterator(); i.hasNext(); ) {
-            MethodType t = i.next();
-            copy.put(t, t);
-        }
-
-        return copy;
-    }
-
     // This is called from C code, at the very end of Java code execution
     // during the AOT cache assembly phase.
-    static void createArchivedObjects() {
-        // After the archivedMethodTypes field is assigned, this table
-        // is never modified. So we don't need synchronization when reading from
-        // it (which happens only in a future JVM process, never in the current process).
-        //
-        // @implNote CDS.isDumpingStaticArchive() is mutually exclusive with
-        // CDS.isUsingArchive(); at most one of them can return true for any given JVM
-        // process.
-        assert CDS.isDumpingStaticArchive();
-        archivedMethodTypes = copyInternTable();
-        internTable.clear();
+    private static void assemblySetup() {
+        internTable.prepareForAOTCache();
     }
 }
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 8bbc4dd5f72..d5272337585 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
@@ -30,7 +30,6 @@
 import java.lang.ref.SoftReference;
 
 import static java.lang.invoke.MethodHandleStatics.newIllegalArgumentException;
-import static java.lang.invoke.MethodHandleNatives.USE_SOFT_CACHE;
 
 /**
  * Shared information for a group of method types, which differ
@@ -52,7 +51,7 @@ final class MethodTypeForm {
     final MethodType basicType;         // the canonical erasure, with primitives simplified
 
     // Cached adapter information:
-    private final Object[] methodHandles;
+    private final SoftReference<MethodHandle>[] methodHandles;
 
     // Indexes into methodHandles:
     static final int
@@ -62,7 +61,7 @@ final class MethodTypeForm {
             MH_LIMIT          =  3;
 
     // Cached lambda form information, for basic types only:
-    private final Object[] lambdaForms;
+    private final SoftReference<LambdaForm>[] lambdaForms;
 
     private SoftReference<MemberName> interpretEntry;
 
@@ -111,16 +110,9 @@ public MethodType basicType() {
         return basicType;
     }
 
-    @SuppressWarnings("unchecked")
     public MethodHandle cachedMethodHandle(int which) {
-        Object entry = methodHandles[which];
-        if (entry == null) {
-            return null;
-        } else if (entry instanceof MethodHandle mh) {
-            return mh;
-        } else {
-            return ((SoftReference<MethodHandle>)entry).get();
-        }
+        SoftReference<MethodHandle> entry = methodHandles[which];
+        return (entry != null) ? entry.get() : null;
     }
 
     public synchronized MethodHandle setCachedMethodHandle(int which, MethodHandle mh) {
@@ -129,24 +121,13 @@ public synchronized MethodHandle setCachedMethodHandle(int which, MethodHandle m
         if (prev != null) {
             return prev;
         }
-        if (USE_SOFT_CACHE) {
-            methodHandles[which] = new SoftReference<>(mh);
-        } else {
-            methodHandles[which] = mh;
-        }
+        methodHandles[which] = new SoftReference<>(mh);
         return mh;
     }
 
-    @SuppressWarnings("unchecked")
     public LambdaForm cachedLambdaForm(int which) {
-        Object entry = lambdaForms[which];
-        if (entry == null) {
-            return null;
-        } else if (entry instanceof LambdaForm lf) {
-            return lf;
-        } else {
-            return ((SoftReference<LambdaForm>)entry).get();
-        }
+        SoftReference<LambdaForm> entry = lambdaForms[which];
+        return (entry != null) ? entry.get() : null;
     }
 
     public synchronized LambdaForm setCachedLambdaForm(int which, LambdaForm form) {
@@ -155,11 +136,7 @@ public synchronized LambdaForm setCachedLambdaForm(int which, LambdaForm form) {
         if (prev != null) {
             return prev;
         }
-        if (USE_SOFT_CACHE) {
-            lambdaForms[which] = new SoftReference<>(form);
-        } else {
-            lambdaForms[which] = form;
-        }
+        lambdaForms[which] = new SoftReference<>(form);
         return form;
     }
 
@@ -181,6 +158,7 @@ public synchronized MemberName setCachedInterpretEntry(MemberName mn) {
      * 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;
 
@@ -221,8 +199,8 @@ protected MethodTypeForm(MethodType erasedType) {
 
             this.primitiveCount = primitiveCount;
             this.parameterSlotCount = (short)pslotCount;
-            this.lambdaForms   = new Object[LF_LIMIT];
-            this.methodHandles = new Object[MH_LIMIT];
+            this.lambdaForms   = new SoftReference[LF_LIMIT];
+            this.methodHandles = new SoftReference[MH_LIMIT];
         } else {
             this.basicType = MethodType.methodType(basicReturnType, basicPtypes, true);
             // fill in rest of data from the basic type:
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index 13ba76e5dd2..e109b974adc 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.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
@@ -76,10 +76,10 @@ public abstract sealed class Reference<T>
      *   indicate end of list.
      *
      *   Dequeued: Added to the associated queue and then removed.
-     *   queue = ReferenceQueue.NULL; next = this.
+     *   queue = ReferenceQueue.NULL_QUEUE; next = this.
      *
      *   Unregistered: Not associated with a queue when created.
-     *   queue = ReferenceQueue.NULL.
+     *   queue = ReferenceQueue.NULL_QUEUE.
      *
      * The collector only needs to examine the referent field and the
      * discovered field to determine whether a (non-FinalReference) Reference
@@ -161,8 +161,8 @@ public abstract sealed class Reference<T>
      *
      * When registered: the queue with which this reference is registered.
      *        enqueued: ReferenceQueue.ENQUEUE
-     *        dequeued: ReferenceQueue.NULL
-     *    unregistered: ReferenceQueue.NULL
+     *        dequeued: ReferenceQueue.NULL_QUEUE
+     *    unregistered: ReferenceQueue.NULL_QUEUE
      */
     volatile ReferenceQueue<? super T> queue;
 
@@ -232,7 +232,7 @@ public void run() {
      */
     private void enqueueFromPending() {
         var q = queue;
-        if (q != ReferenceQueue.NULL) q.enqueue(this);
+        if (q != ReferenceQueue.NULL_QUEUE) q.enqueue(this);
     }
 
     private static final Object processPendingLock = new Object();
@@ -306,7 +306,12 @@ static void startReferenceHandlerThread(ThreadGroup tg) {
         handler.start();
     }
 
+    // Called from JVM when loading an AOT cache
     static {
+        runtimeSetup();
+    }
+
+    private static void runtimeSetup() {
         // provide access in SharedSecrets
         SharedSecrets.setJavaLangRefAccess(new JavaLangRefAccess() {
             @Override
@@ -540,7 +545,7 @@ protected Object clone() throws CloneNotSupportedException {
 
     Reference(T referent, ReferenceQueue<? super T> queue) {
         this.referent = referent;
-        this.queue = (queue == null) ? ReferenceQueue.NULL : queue;
+        this.queue = (queue == null) ? ReferenceQueue.NULL_QUEUE : queue;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index 07110a19fa1..4dcaf796e25 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 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
@@ -55,7 +55,7 @@ boolean enqueue(Reference<?> r) {
         }
     }
 
-    static final ReferenceQueue<Object> NULL = new Null();
+    static final ReferenceQueue<Object> NULL_QUEUE = new Null();
     static final ReferenceQueue<Object> ENQUEUED = new Null();
 
     private volatile Reference<? extends T> head;
@@ -74,7 +74,7 @@ private boolean enqueue0(Reference<? extends T> r) { // must hold lock
         // Check that since getting the lock this reference hasn't already been
         // enqueued (and even then removed)
         ReferenceQueue<?> queue = r.queue;
-        if ((queue == NULL) || (queue == ENQUEUED)) {
+        if ((queue == NULL_QUEUE) || (queue == ENQUEUED)) {
             return false;
         }
         assert queue == this;
@@ -96,7 +96,7 @@ private boolean enqueue0(Reference<? extends T> r) { // must hold lock
     private Reference<? extends T> poll0() { // must hold lock
         Reference<? extends T> r = head;
         if (r != null) {
-            r.queue = NULL;
+            r.queue = NULL_QUEUE;
             // Update r.queue *before* removing from list, to avoid
             // race with concurrent enqueued checks and fast-path
             // poll().  Volatiles ensure ordering.
@@ -248,7 +248,7 @@ void forEach(Consumer<? super Reference<? extends T>> action) {
                     // still enqueued -> we reached end of chain
                     r = null;
                 } else {
-                    // already dequeued: r.queue == NULL; ->
+                    // already dequeued: r.queue == NULL_QUEUE; ->
                     // restart from head when overtaken by queue poller(s)
                     r = head;
                 }
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 f070738e0c7..94696551645 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CDS.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CDS.java
@@ -82,9 +82,36 @@ public static boolean isDumpingStaticArchive() {
         return (configStatus & IS_DUMPING_STATIC_ARCHIVE) != 0;
     }
 
+    public static boolean isSingleThreadVM() {
+        return isDumpingStaticArchive();
+    }
+
     private static native int getCDSConfigStatus();
     private static native void logLambdaFormInvoker(String line);
 
+
+    // Used only when dumping static archive to keep weak references alive to
+    // ensure that Soft/Weak Reference objects can be reliably archived.
+    private static ArrayList<Object> keepAliveList;
+
+    public static void keepAlive(Object s) {
+        assert isSingleThreadVM(); // no need for synchronization
+        assert isDumpingStaticArchive();
+        if (keepAliveList == null) {
+            keepAliveList = new ArrayList<>();
+        }
+        keepAliveList.add(s);
+    }
+
+    // This is called by native JVM code at the very end of Java execution before
+    // dumping the static archive.
+    // It collects the objects from keepAliveList so that they can be easily processed
+    // by the native JVM code to check that any Reference objects that need special
+    // clean up must have been registed with keepAlive()
+    private static Object[] getKeepAliveObjects() {
+        return keepAliveList.toArray();
+    }
+
     /**
      * Initialize archived static fields in the given Class using archived
      * values from CDS dump time. Also initialize the classes of objects in
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
index 766aca20b21..150b9d752bb 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.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
@@ -42,6 +42,7 @@
 import java.util.stream.Stream;
 
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.misc.CDS;
 
 /**
  * This class provides management of {@link Map maps} where it is desirable to
@@ -336,6 +337,40 @@ public void removeStaleReferences() {
         }
     }
 
+    @SuppressWarnings("unchecked")
+    public void prepareForAOTCache() {
+        // We are running the AOT assembly phase. The JVM has a single Java thread, so
+        // we don't have any concurrent threads that may modify the map while we are
+        // iterating its keys.
+        //
+        // Also, the java.lang.ref.Reference$ReferenceHandler thread is not running,
+        // so even if the GC has put some of the keys on the pending ReferencePendingList,
+        // none of the keys would have been added to the stale queue yet.
+        assert CDS.isSingleThreadVM();
+
+        for (ReferenceKey<K> key : map.keySet()) {
+            Object referent = key.get();
+            if (referent == null) {
+                // We don't need this key anymore. Add to stale queue
+                ((Reference)key).enqueue();
+            } else {
+                // Make sure the referent cannot be collected. Otherwise, when
+                // the referent is collected, the GC may push the key onto
+                // Universe::reference_pending_list() at an unpredictable time,
+                // making it difficult to correctly serialize the key's
+                // state into the CDS archive.
+                //
+                // See aotReferenceObjSupport.cpp for more info.
+                CDS.keepAlive(referent);
+            }
+            Reference.reachabilityFence(referent);
+        }
+
+        // Remove all keys enqueued above
+        removeStaleReferences();
+    }
+
+
     /**
      * Puts an entry where the key and the value are the same. Used for
      * interning values in a set.
diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
index 355af10aa7c..960b63b12d3 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeySet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -193,4 +193,8 @@ public T intern(T e) {
     public T intern(T e, UnaryOperator<T> interner) {
         return ReferencedKeyMap.intern(map, e, interner);
     }
+
+    public void prepareForAOTCache() {
+        map.prepareForAOTCache();
+    }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.java
new file mode 100644
index 00000000000..f88af3caed5
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TestSetupAOTTest.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 This is a test case for creating an AOT cache using the setup_aot/TestSetupAOT.java program, which
+ *          is used for running HotSpot tests in the "AOT mode"
+ *          (E.g., make test JTREG=AOT_JDK=true TEST=open/test/hotspot/jtreg/runtime/invokedynamic)
+ * @requires vm.cds
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/setup_aot
+ * @build TestSetupAOTTest JavacBenchApp TestSetupAOT
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller
+ *                 TestSetupAOT
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 TestSetupAOT
+ *                 TestSetupAOT$ToolOutput
+ *                 JavacBenchApp
+ *                 JavacBenchApp$ClassFile
+ *                 JavacBenchApp$FileManager
+ *                 JavacBenchApp$SourceFile
+ * @run driver TestSetupAOTTest
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestSetupAOTTest {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("TestSetupAOT")
+            .classpath("app.jar")
+            .appCommandLine("TestSetupAOT", ".")
+            .runAOTWorkflow();
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
new file mode 100644
index 00000000000..ac6d1188672
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
@@ -0,0 +1,306 @@
+/*
+ * 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 WeakReference 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 WeakReferenceTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar weakref.jar
+ *             WeakReferenceTestApp WeakReferenceTestApp$Inner ShouldNotBeAOTInited ShouldNotBeArchived SharedQueue
+ *             WeakReferenceTestBadApp1 WeakReferenceTestBadApp2
+ * @run driver WeakReferenceTest AOT
+ */
+
+import java.lang.ref.WeakReference;
+import java.lang.ref.ReferenceQueue;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jtreg.SkippedException;
+
+public class WeakReferenceTest {
+    static final String appJar = ClassFileInstaller.getJarPath("weakref.jar");
+
+    static final String goodApp = "WeakReferenceTestApp";
+    static final String badApp1 = "WeakReferenceTestBadApp1";
+    static final String badApp2 = "WeakReferenceTestBadApp2";
+
+    public static void main(String[] args) throws Exception {
+        new Tester(goodApp).run(args);
+
+        runBadApp(badApp1, args);
+        runBadApp(badApp2, args);
+    }
+
+    static void runBadApp(String badApp, String[] args) throws Exception {
+        try {
+            new Tester(badApp).run(args);
+            throw new RuntimeException(badApp + " did not fail in assembly phase as expected");
+        } catch (SkippedException e) {
+            System.out.println("Negative test: expected SkippedException");
+        }
+    }
+
+    static class Tester extends CDSAppTester {
+        String mainClass;
+        public Tester(String mainClass) {
+            super(mainClass);
+            this.mainClass = mainClass;
+
+            if (mainClass != goodApp) {
+                setCheckExitValue(false);
+            }
+        }
+
+        @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=" + mainClass,
+                    "-Xlog:cds+map,cds+map+oops=trace:file=cds.oops.txt:none:filesize=0",
+                };
+            } else {
+                return new String[] {
+                    "-Xlog:gc",
+                };
+            }
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+                runMode.toString(),
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.ASSEMBLY && mainClass != goodApp) {
+                out.shouldNotHaveExitValue(0);
+                out.shouldMatch("Cannot archive reference object .* of class java.lang.ref.WeakReference");
+                if (mainClass == badApp1) {
+                    out.shouldContain("referent cannot be null");
+                } else {
+                    out.shouldContain("referent is not registered with CDS.keepAlive()");
+                }
+                throw new SkippedException("Assembly phase expected to fail");
+            }
+
+            out.shouldHaveExitValue(0);
+            out.shouldNotContain("Unexpected exception:");
+        }
+    }
+}
+
+class WeakReferenceTestApp {
+    static class Inner { // This class is NOT aot-initialized
+        static boolean WeakReferenceTestApp_clinit_executed;
+    }
+
+    static {
+        Inner.WeakReferenceTestApp_clinit_executed = true;
+
+        // This static {} block is executed the training run (which uses no AOT cache).
+        //
+        // During the assembly phase, this static {} block of is also executed
+        // (triggered by the -XX:AOTInitTestClass=WeakReferenceTestApp flag).
+        // It runs the aot_init_for_testXXX() method to set up the aot-initialized data structures
+        // that are used by  each testXXX() function.
+        //
+        // This block is NOT executed during the production run, because WeakReferenceTestApp
+        // is aot-initialized.
+
+        aot_init_for_testCollectedInAssembly();
+        aot_init_for_testWeakReferenceCollection();
+    }
+
+    public static void main(String[] args) {
+        try {
+            runTests(args);
+        } catch (Throwable t) {
+            System.err.println("Unexpected exception:");
+            t.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    static void runTests(String[] args) throws Exception {
+        boolean isProduction = args[0].equals("PRODUCTION");
+
+        if (isProduction && Inner.WeakReferenceTestApp_clinit_executed) {
+            throw new RuntimeException("WeakReferenceTestApp should have been aot-inited");
+        }
+
+        if (isProduction) {
+            // A GC should have happened before the heap objects are written into
+            // the AOT cache. So any unreachable referents should have been collected.
+        } else {
+            // We are in the training run. Simulate the GC mentioned in the above comment,
+            // so the test cases should observe the same states as in the production run.
+            System.gc();
+        }
+
+        testCollectedInAssembly(isProduction);
+        testWeakReferenceCollection(isProduction);
+    }
+
+    //----------------------------------------------------------------------
+    // Set up for testCollectedInAssembly()
+    static WeakReference refToCollectedObj;
+
+    static void aot_init_for_testCollectedInAssembly() {
+        // The referent will be GC-ed in the assembly run when the JVM forces a full GC.
+        refToCollectedObj = new WeakReference(new String("collected in assembly"));
+    }
+
+    // [TEST CASE] Test the storage of a WeakReference whose referent has been collected during the assembly phase.
+    static void testCollectedInAssembly(boolean isProduction) {
+        System.out.println("refToCollectedObj.get() = " + refToCollectedObj.get());
+
+        if (refToCollectedObj.get() != null) {
+            throw new RuntimeException("refToCollectedObj.get() should have been GC'ed");
+        }
+    }
+
+    //----------------------------------------------------------------------
+    // Set up for testWeakReferenceCollection()
+    static Object root;
+    static WeakReference ref;
+
+    static void aot_init_for_testWeakReferenceCollection() {
+        root = new String("to be collected in production");
+        ref = makeRef();
+    }
+
+    static WeakReference makeRef() {
+        System.out.println("WeakReferenceTestApp::makeRef() is executed");
+        WeakReference r = new WeakReference(root);
+        System.out.println("r.get() = " + r.get());
+
+        ShouldNotBeAOTInited.doit();
+        return r;
+    }
+
+    static WeakReference makeRef2() {
+        return new WeakReference(new String("to be collected in production"));
+    }
+
+
+    // [TEST CASE] A WeakReference allocated in assembly phase should be collectable in the production run
+    static void testWeakReferenceCollection(boolean isProduction) {
+        WeakReference ref2 = makeRef2();
+        System.out.println("ref.get() = " + ref.get());   // created during assembly phase
+        System.out.println("ref2.get() = " + ref2.get()); // created during production run
+
+        if (ref.get() == null) {
+            throw new RuntimeException("ref.get() should not be null");
+        }
+
+        System.out.println("... running GC ...");
+        root = null; // make ref.referent() eligible for collection
+        System.gc();
+
+        System.out.println("ref.get() = " + ref.get());
+        System.out.println("ref2.get() = " + ref2.get());
+
+        if (ref.get() != null) {
+            throw new RuntimeException("ref.get() should be null");
+        }
+        if (ref2.get() != null) {
+            throw new RuntimeException("ref2.get() should be null");
+        }
+
+        System.out.println("ShouldNotBeAOTInited.doit_executed = " + ShouldNotBeAOTInited.doit_executed);
+        if (isProduction && ShouldNotBeAOTInited.doit_executed) {
+            throw new RuntimeException("ShouldNotBeAOTInited should not have been aot-inited");
+        }
+    }
+}
+
+class ShouldNotBeAOTInited {
+    static WeakReference ref;
+    static boolean doit_executed;
+    static {
+        System.out.println("ShouldNotBeAOTInited.<clinit> called");
+    }
+    static void doit() {
+        System.out.println("ShouldNotBeAOTInited.doit()> called");
+        doit_executed = true;
+        ref = new WeakReference(new ShouldNotBeAOTInited());
+    }
+}
+
+class ShouldNotBeArchived {
+    static ShouldNotBeArchived instance = new ShouldNotBeArchived();
+    static WeakReference ref;
+    static int state = 1;
+}
+
+class SharedQueue {
+    static SharedQueue sharedQueueInstance = new SharedQueue();
+    private ReferenceQueue<Object> theQueue = new ReferenceQueue<Object>();
+
+    static ReferenceQueue<Object> queue() {
+        return sharedQueueInstance.theQueue;
+    }
+}
+
+class WeakReferenceTestBadApp1 {
+    static WeakReference refWithQueue;
+    static SharedQueue sharedQueueInstance;
+
+    static {
+        // See comments in aotReferenceObjSupport.cpp: group [2] references cannot have null referent.
+        sharedQueueInstance = SharedQueue.sharedQueueInstance;
+        refWithQueue = new WeakReference(String.class, SharedQueue.queue());
+        refWithQueue.clear();
+    }
+
+    public static void main(String args[]) {}
+}
+
+class WeakReferenceTestBadApp2 {
+    static WeakReference refWithQueue;
+    static SharedQueue sharedQueueInstance;
+
+    static {
+        // See comments in aotReferenceObjSupport.cpp: group [2] references must be registered with CDS.keepAlive()
+        sharedQueueInstance = SharedQueue.sharedQueueInstance;
+        refWithQueue = new WeakReference(String.class, SharedQueue.queue());
+    }
+
+    public static void main(String args[]) {}
+}
diff --git a/test/setup_aot/TestSetupAOT.java b/test/setup_aot/TestSetupAOT.java
index 89a6dd30c72..e078279e716 100644
--- a/test/setup_aot/TestSetupAOT.java
+++ b/test/setup_aot/TestSetupAOT.java
@@ -23,12 +23,17 @@
  * questions.
  */
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 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.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.spi.ToolProvider;
 import java.util.stream.Stream;
 import static java.util.stream.Collectors.*;
@@ -60,6 +65,42 @@ public static void main(String[] args) throws Throwable {
         LOGGER.log(Level.FINE, "Done");
     }
 
+    static class ToolOutput {
+        ByteArrayOutputStream baos;
+        PrintStream ps;
+        String output;
+
+        ToolOutput() throws Exception {
+            baos = new ByteArrayOutputStream();
+            ps = new PrintStream(baos, true, StandardCharsets.UTF_8.name());
+        }
+        void finish() throws Exception {
+            output = baos.toString(StandardCharsets.UTF_8.name());
+            System.out.println(output);
+        }
+
+        ToolOutput shouldContain(String... substrings) {
+            for (String s : substrings) {
+                if (!output.contains(s)) {
+                    throw new RuntimeException("\"" + s + "\" missing from tool output");
+                }
+            }
+
+            return this;
+        }
+
+        ToolOutput shouldMatch(String... regexps) {
+            for (String regexp : regexps) {
+                Pattern pattern = Pattern.compile(regexp, Pattern.MULTILINE);
+                if (!pattern.matcher(output).find()) {
+                    throw new RuntimeException("Pattern \"" + regexp + "\" missing from tool output");
+                }
+            }
+
+            return this;
+        }
+    }
+
     static void runJDKTools(String[] args) throws Throwable {
         String tmpDir = args[0];
         System.out.println("Working Directory = " + System.getProperty("user.dir"));
@@ -68,26 +109,33 @@ static void runJDKTools(String[] args) throws Throwable {
         // ------------------------------
         // javac
 
-        execTool("javac", "--help");
+        execTool("javac", "--help")
+            .shouldContain("Usage: javac <options> <source files>");
 
         JavacBenchApp.main(new String[] {"5"});
 
         // ------------------------------
         // javap
 
-        execTool("javap", "--help");
+        execTool("javap", "--help")
+            .shouldContain("Show package/protected/public classes");
         execTool("javap", "-c", "-private", "-v", "-verify",
                  "java.lang.System",
                  "java/util/stream/IntStream",
-                 "jdk.internal.module.ModuleBootstrap");
+                 "jdk.internal.module.ModuleBootstrap")
+            .shouldContain("Compiled from \"System.java\"",
+                           "public static java.io.Console console()");
 
         // ------------------------------
         // jlink
 
         String jlinkOutput = tmpDir + File.separator + "jlinkOutput";
 
-        execTool("jlink", "--help");
-        execTool("jlink", "--list-plugins");
+        execTool("jlink", "--help")
+            .shouldContain("Compression to use in compressing resources");
+        execTool("jlink", "--list-plugins")
+            .shouldContain("List of available plugins",
+                           "--generate-cds-archive ");
 
         deleteAll(jlinkOutput);
         execTool("jlink", "--add-modules", "java.base", "--strip-debug", "--output", jlinkOutput);
@@ -98,20 +146,27 @@ static void runJDKTools(String[] args) throws Throwable {
 
         String jarOutput = tmpDir + File.separator + "tmp.jar";
 
-        execTool("jar", "--help");
+        execTool("jar", "--help")
+            .shouldContain("--main-class=CLASSNAME");
 
         deleteAll(jarOutput);
-        execTool("jar", "cvf", jarOutput, "TestSetupAOT.class");
-        execTool("jar", "uvf", jarOutput, "TestSetupAOT.class");
-        execTool("jar", "tvf", jarOutput);
-        execTool("jar", "--describe-module", "--file=" + jarOutput);
+        execTool("jar", "cvf", jarOutput, "TestSetupAOT.class")
+            .shouldContain("adding: TestSetupAOT.class");
+        execTool("jar", "uvf", jarOutput, "TestSetupAOT.class")
+            .shouldContain("adding: TestSetupAOT.class");
+        execTool("jar", "tvf", jarOutput)
+            .shouldContain("META-INF/MANIFEST.MF");
+        execTool("jar", "--describe-module", "--file=" + jarOutput)
+            .shouldMatch("Unable to derive module descriptor for: .*tmp.jar");
         deleteAll(jarOutput);
 
         // ------------------------------
         // jdeps
 
-        execTool("jdeps", "--help");
-        execTool("jdeps", "-v", "TestSetupAOT.class");
+        execTool("jdeps", "--help")
+            .shouldContain("--ignore-missing-deps");
+        execTool("jdeps", "-v", "TestSetupAOT.class")
+            .shouldContain("-> JavacBenchApp");
     }
 
     static void deleteAll(String f) {
@@ -129,7 +184,7 @@ static void deleteAll(File f) {
         f.delete();
     }
 
-    static void execTool(String tool, String... args) throws Throwable {
+    static ToolOutput execTool(String tool, String... args) throws Throwable {
         System.out.println("== Running tool ======================================================");
         System.out.print(tool);
         for (String s : args) {
@@ -138,9 +193,13 @@ static void execTool(String tool, String... args) throws Throwable {
         System.out.println();
         System.out.println("======================================================================");
 
+        ToolOutput output = new ToolOutput();
         ToolProvider t = ToolProvider.findFirst(tool)
             .orElseThrow(() -> new RuntimeException(tool + " not found"));
-        t.run(System.out, System.out, args);
+        t.run(output.ps, output.ps, args);
+
+        output.finish();
+        return output;
     }
 
 

From 1313349a2efd42ab84a543dfee11e3547f6ef4a3 Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 30 Apr 2025 18:14:10 +0000
Subject: [PATCH 215/901] 8350498: Remove two Camerfirma root CA certificates

Reviewed-by: mullan
---
 .../validator/CamerfirmaTLSPolicy.java        | 30 +++------
 .../data/cacerts/camerfirmachamberscommerceca | 35 -----------
 .../data/cacerts/camerfirmachambersignca      | 48 --------------
 .../security/lib/cacerts/VerifyCACerts.java   | 10 +--
 .../distrust/Camerfirma.java                  | 24 +++----
 .../camerfirmachamberscommerceca-chain.pem    | 48 --------------
 .../camerfirmachambersignca-chain.pem         | 62 -------------------
 7 files changed, 24 insertions(+), 233 deletions(-)
 delete mode 100644 src/java.base/share/data/cacerts/camerfirmachamberscommerceca
 delete mode 100644 src/java.base/share/data/cacerts/camerfirmachambersignca
 delete mode 100644 test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachamberscommerceca-chain.pem
 delete mode 100644 test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachambersignca-chain.pem

diff --git a/src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java b/src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java
index 591a7a26c68..984f5a0ab47 100644
--- a/src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java
+++ b/src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java
@@ -43,26 +43,14 @@ final class CamerfirmaTLSPolicy {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-    // SHA-256 certificate fingerprints of distrusted roots
-    private static final Set<String> FINGERPRINTS = Set.of(
-        // cacerts alias: camerfirmachamberscommerceca
-        // DN: CN=Chambers of Commerce Root,
-        //     OU=http://www.chambersign.org,
-        //     O=AC Camerfirma SA CIF A82743287, C=EU
-        "0C258A12A5674AEF25F28BA7DCFAECEEA348E541E6F5CC4EE63B71B361606AC3",
-        // cacerts alias: camerfirmachambersca
-        // DN: CN=Chambers of Commerce Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0",
-        // cacerts alias: camerfirmachambersignca
-        // DN: CN=Global Chambersign Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "136335439334A7698016A0D324DE72284E079D7B5220BB8FBD747816EEBEBACA"
-    );
+    // SHA-256 certificate fingerprint of distrusted root for TLS
+    // cacerts alias: camerfirmachambersca
+    // DN: CN=Chambers of Commerce Root - 2008,
+    //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
+    //     L=Madrid (see current address at www.camerfirma.com/address),
+    //     C=EU
+    private static final String FINGERPRINT =
+            "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0";
 
     // Any TLS Server certificate that is anchored by one of the Camerfirma
     // roots above and is issued after this date will be distrusted.
@@ -85,7 +73,7 @@ static void checkDistrust(X509Certificate[] chain)
             throw new ValidatorException("Cannot generate fingerprint for "
                 + "trust anchor of TLS server certificate");
         }
-        if (FINGERPRINTS.contains(fp)) {
+        if (FINGERPRINT.equalsIgnoreCase(fp)) {
             Date notBefore = chain[0].getNotBefore();
             LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
                                                         ZoneOffset.UTC);
diff --git a/src/java.base/share/data/cacerts/camerfirmachamberscommerceca b/src/java.base/share/data/cacerts/camerfirmachamberscommerceca
deleted file mode 100644
index b92255f770c..00000000000
--- a/src/java.base/share/data/cacerts/camerfirmachamberscommerceca
+++ /dev/null
@@ -1,35 +0,0 @@
-Owner: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
-Issuer: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
-Serial number: 0
-Valid from: Tue Sep 30 16:13:43 GMT 2003 until: Wed Sep 30 16:13:44 GMT 2037
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 2048-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
-MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
-ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
-IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
-AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
-unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
-BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
-7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
-0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
-roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
-A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
-aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
-26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
-BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
-EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
-BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
-AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
-p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
-1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
-XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
-eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
-tGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
diff --git a/src/java.base/share/data/cacerts/camerfirmachambersignca b/src/java.base/share/data/cacerts/camerfirmachambersignca
deleted file mode 100644
index 935eea9c212..00000000000
--- a/src/java.base/share/data/cacerts/camerfirmachambersignca
+++ /dev/null
@@ -1,48 +0,0 @@
-Owner: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
-Issuer: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
-Serial number: c9cdd3e9d57d23ce
-Valid from: Fri Aug 01 12:31:40 GMT 2008 until: Sat Jul 31 12:31:40 GMT 2038
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index f7fb48a3912..d176a93784d 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -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 8303770
+ *      8321408 8316138 8341057 8303770 8350498
  * @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 = 111;
+    private static final int COUNT = 109;
 
     // 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
-            = "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";
+            = "BD:6B:AB:BB:17:87:0D:D5:8D:53:D3:63:A5:DD:70:57:0F:4E:D3:57:4F:E5:FB:05:41:1C:A9:6E:B0:BF:79:38";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -69,10 +69,6 @@ public class VerifyCACerts {
                     "ED:F7:EB:BC:A2:7A:2A:38:4D:38:7B:7D:40:10:C6:66:E2:ED:B4:84:3E:4C:29:B4:AE:1D:5B:93:32:E6:B2:4D");
             put("camerfirmachambersca [jdk]",
                     "06:3E:4A:FA:C4:91:DF:D3:32:F3:08:9B:85:42:E9:46:17:D8:93:D7:FE:94:4E:10:A7:93:7E:E2:9D:96:93:C0");
-            put("camerfirmachambersignca [jdk]",
-                    "13:63:35:43:93:34:A7:69:80:16:A0:D3:24:DE:72:28:4E:07:9D:7B:52:20:BB:8F:BD:74:78:16:EE:BE:BA:CA");
-            put("camerfirmachamberscommerceca [jdk]",
-                    "0C:25:8A:12:A5:67:4A:EF:25:F2:8B:A7:DC:FA:EC:EE:A3:48:E5:41:E6:F5:CC:4E:E6:3B:71:B3:61:60:6A:C3");
             put("certumca [jdk]",
                     "D8:E0:FE:BC:1D:B2:E3:8D:00:94:0F:37:D2:7D:41:34:4D:99:3E:73:4B:99:D5:65:6D:97:78:D4:D8:14:36:24");
             put("certumtrustednetworkca [jdk]",
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Camerfirma.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Camerfirma.java
index 50a723441a5..8d9dfe1ef18 100644
--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Camerfirma.java
+++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Camerfirma.java
@@ -21,17 +21,19 @@
  * questions.
  */
 
+import javax.net.ssl.X509TrustManager;
 import java.io.File;
 import java.security.Security;
-import java.time.*;
-import java.util.*;
-import javax.net.ssl.*;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.Date;
 
-/**
+/*
  * @test
- * @bug 8346587
+ * @bug 8346587 8350498
  * @summary Check that TLS Server certificates chaining back to distrusted
- *          Camerfirma roots are invalid
+ *          Camerfirma root are invalid
  * @library /test/lib
  * @modules java.base/sun.security.validator
  * @run main/othervm Camerfirma after policyOn invalid
@@ -42,13 +44,11 @@
 
 public class Camerfirma {
 
-    private static final String certPath = "chains" + File.separator + "camerfirma";
+    private static final String CERT_PATH = "chains" + File.separator + "camerfirma";
 
     // Each of the roots have a test certificate chain stored in a file
     // named "<root>-chain.pem".
-    private static String[] rootsToTest = new String[] {
-            "camerfirmachamberscommerceca", "camerfirmachambersca",
-            "camerfirmachambersignca"};
+    private static final String ROOT_TO_TEST = "camerfirmachambersca";
 
     // Date after the restrictions take effect
     private static final ZonedDateTime DISTRUST_DATE =
@@ -56,7 +56,7 @@ public class Camerfirma {
 
     public static void main(String[] args) throws Exception {
 
-        // All of the test certificates are signed with SHA-1 so we need
+        // All the test certificates are signed with SHA-1, so we need
         // to remove the constraint that disallows SHA-1 certificates.
         String prop = Security.getProperty("jdk.certpath.disabledAlgorithms");
         String newProp = prop.replace(", SHA1 jdkCA & usage TLSServer", "");
@@ -70,6 +70,6 @@ public static void main(String[] args) throws Exception {
         };
 
         Date notBefore = distrust.getNotBefore(DISTRUST_DATE);
-        distrust.testCertificateChain(certPath, notBefore, tms, rootsToTest);
+        distrust.testCertificateChain(CERT_PATH, notBefore, tms, ROOT_TO_TEST);
     }
 }
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachamberscommerceca-chain.pem b/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachamberscommerceca-chain.pem
deleted file mode 100644
index b27d46c17c8..00000000000
--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachamberscommerceca-chain.pem
+++ /dev/null
@@ -1,48 +0,0 @@
-Owner:   CN=AC Camerfirma Certificados Camerales,
-         O=AC Camerfirma SA, SERIALNUMBER=A82743287,
-         L=Madrid (see current address at www.camerfirma.com/address),
-         EMAILADDRESS=ac_camerfirma_cc@camerfirma.com, C=ES
-Issuer:  CN=Chambers of Commerce Root, OU=http://www.chambersign.org,
-         O=AC Camerfirma SA CIF A82743287, C=EU
-Serial number: 5
-Valid from: Mon Feb 09 07:42:47 PST 2004 until: Thu Feb 09 07:42:47 PST 2034
-Certificate fingerprints:
-         SHA1: 9F:36:B4:BE:9D:AF:1C:91:01:B2:D7:61:58:FB:95:CB:53:82:01:10
-         SHA256: C7:D8:43:81:E1:1F:7C:57:46:77:1A:F5:B0:50:DC:51:FC:6F:DA:D6:F6:F3:5B:B5:3A:3D:E9:13:82:2E:A0:9E
-Signature algorithm name: SHA1withRSA (weak)
-Subject Public Key Algorithm: 2048-bit RSA key
-Version: 3
-
------BEGIN CERTIFICATE-----
-MIIFwDCCBKigAwIBAgIBBTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wNDAyMDkxNTQyNDdaFw0zNDAyMDkxNTQyNDda
-MIHgMQswCQYDVQQGEwJFUzEuMCwGCSqGSIb3DQEJARYfYWNfY2FtZXJmaXJtYV9j
-Y0BjYW1lcmZpcm1hLmNvbTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBh
-ZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRkwFwYDVQQKExBBQyBDYW1lcmZpcm1hIFNBMS0wKwYDVQQDEyRB
-QyBDYW1lcmZpcm1hIENlcnRpZmljYWRvcyBDYW1lcmFsZXMwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQCjxnvvj01f36lgGhihRYVf1fAPEXsTJKrY4aLQ
-cEUSh5szZE7VTtGiyMTMc2uCmnaXafjYHK8Lgmy6T9xxGEZ5OS4x6rgtuPyy13AP
-tu3X3Y2kPVLu7ZMw5HoQC64wBj6YcnxTnBwmVW05DjzRXp6OyBIEKEaAB9vv2qEl
-fh/Y234FG6Wd/ut1s0ScRZAo+6CSMNQxaY+ryXKD11uWkzWXJa9UZOasG7z4uPqc
-Gr4/Hz2/CTLDTgp0xkMJYuzOztpUvOACrxlkS2utKUwVlAikJnboNwf/en94RbHN
-zkKc5t0SAbzCf57ueawbzxSdPa+SAC25FNur64FKkfdq5PPjAgEDo4IB5TCCAeEw
-EgYDVR0TAQH/BAgwBgEB/wIBCzA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vY3Js
-LmNoYW1iZXJzaWduLm9yZy9jaGFtYmVyc3Jvb3QuY3JsMB0GA1UdDgQWBBS2H06d
-HGiRLjdyYOFGj1qlKjExuTCBqwYDVR0jBIGjMIGggBTjlPWxTenboSlbV4tNdgZ2
-4dGiiqGBhKSBgTB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJz
-aWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdIIBADAO
-BgNVHQ8BAf8EBAMCAYYwKgYDVR0RBCMwIYEfYWNfY2FtZXJmaXJtYV9jY0BjYW1l
-cmZpcm1hLmNvbTAnBgNVHRIEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24u
-b3JnMFsGA1UdIARUMFIwUAYLKwYBBAGBhy4KCQEwQTA/BggrBgEFBQcCARYzaHR0
-cDovL2Nwcy5jYW1lcmZpcm1hLmNvbS9jcHMvYWNfY2FtZXJmaXJtYV9jYy5odG1s
-MA0GCSqGSIb3DQEBBQUAA4IBAQBl8KoPBYL//EBonqQWS0N+hLfxImP1eQ6nac+v
-R5QfF/0w+VCTkShfKwHaa6V/W1dPlVwXSECuvXHkX6DYrtxFGGFB6qxuP1rkIpRs
-sTkAlpvOx3REiFjIkhsijKd/ijvqxjbMbuYU+EFACK/jQIRoj+LEEZ+haiqbALZB
-Iqq/26HTqX0itDosBj6M94YWcIpbTDefQNWCGsSnZcw2+k+az/wAOZT6xAxlnEim
-HpDDlgRsmaLrHpDPDoIRYOih0gbJTnn4mKex9Wgr0sZ+XFl03j+bvcXL1tiuQnwb
-9dMRDe/OdXABT35W4ZzLbpost65ZW3Tx+oi/bLbmu6pbKCgs
------END CERTIFICATE-----
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachambersignca-chain.pem b/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachambersignca-chain.pem
deleted file mode 100644
index 2ab3091439c..00000000000
--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/chains/camerfirma/camerfirmachambersignca-chain.pem
+++ /dev/null
@@ -1,62 +0,0 @@
-Owner:   CN=AC Camerfirma - 2009,
-         L=Madrid (see current address at https://www.camerfirma.com/address),
-         SERIALNUMBER=A82743287, O=AC Camerfirma S.A., C=ES
-Issuer:  CN=Global Chambersign Root - 2008,
-         O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-         L=Madrid (see current address at www.camerfirma.com/address), C=EU
-Serial number: 2
-Valid from: Mon Mar 16 10:16:25 PDT 2009 until: Sun Mar 11 10:16:25 PDT 2029
-Certificate fingerprints:
-         SHA1: BA:BA:69:CF:D5:CC:C9:4D:05:6B:5B:E7:80:5F:E2:03:CB:EB:5C:57
-         SHA256: B6:8D:5D:9B:4E:A6:35:95:7C:0C:32:15:C2:0D:35:B2:21:7B:69:E3:49:C7:A3:04:C4:F9:7F:20:C4:08:1F:88
-Signature algorithm name: SHA1withRSA (weak)
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
-
------BEGIN CERTIFICATE-----
-MIIIPzCCBiegAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMCRVUx
-QzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2Ft
-ZXJmaXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UE
-ChMSQUMgQ2FtZXJmaXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNp
-Z24gUm9vdCAtIDIwMDgwHhcNMDkwMzE2MTcxNjI1WhcNMjkwMzExMTcxNjI1WjCB
-qjELMAkGA1UEBhMCRVMxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjESMBAG
-A1UEBRMJQTgyNzQzMjg3MUswSQYDVQQHE0JNYWRyaWQgKHNlZSBjdXJyZW50IGFk
-ZHJlc3MgYXQgaHR0cHM6Ly93d3cuY2FtZXJmaXJtYS5jb20vYWRkcmVzcykxHTAb
-BgNVBAMTFEFDIENhbWVyZmlybWEgLSAyMDA5MIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEAmbHxFEYTJmMdPcYiPlWUGZu2+tQo4voohYi3dwCwoVuGdHSp
-kyoqs1B3YGx4u5KT4n0A7+Bb8YQ/QzbNy7UQ4JXAK+rT8JpNeKIvfN4lHnQJaChE
-4fdn0KpvHWymaNq2k+EbQClquZB6OsTLvsivwSuSnyLcUw5rbajj53wq77fwB12y
-phMjwz2AnD1BvHZd3vLOaH1jRQP3zzNmyjT/Oj6+jdux7SBKlJWgQEaKflwcvYyc
-DPFPhGM4KPwEGX61PCrS+l8Lw0Kdy6K4lE+GrfgJrXM5m1Ey1R0c9McYQQPAtYcm
-cOnHHgkJdEAFVDa76T9C+lcMP6DNckbJIyc/ENrmM2v4rq/JnsJKEEx0VLyLizQx
-cGU3gp4ckg0ImQ9hV3H/DLWEqfrPuD++zaV81gpstnc9+pLg0Jibvwg3qvIr7nS5
-acc//qqxH0iJGYoStHW5J5HoM9HcBvhACq5rjzjrNLPYSJqbPJwBHKcql/uUjQ6S
-SVWe3/CeJp6/vGuY1aRXAk9c/8oO0ZDrLKE8LsUgZesTLnWGd1LQcyQf6UMG1nb9
-5C3eZRkCVpKma6Hl/SUQNukerlbLOU9InFGNPdeEVq1Jo62XeEi8KMbTPdXou6Yl
-rpe99dFnOUjVOdY7gfBGSgIVJjORqf/V70jwsxcYz7j6PKl0XulJs06vpSECAwEA
-AaOCAmowggJmMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYDVR0OBBYEFMgAD/zGUvyf
-2ztkLjK5bi5x82V5MIHhBgNVHSMEgdkwgdaAFLkJypwe29NsOmuu7VTxW5MGNS5e
-oYGypIGvMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwOIIJAMnN0+nVfSPO
-MH0GCCsGAQUFBwEBBHEwbzBFBggrBgEFBQcwAoY5aHR0cDovL3d3dy5jYW1lcmZp
-cm1hLmNvbS9jZXJ0cy9yb290X2NoYW1iZXJzaWduLTIwMDguY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC5jYW1lcmZpcm1hLmNvbTAOBgNVHQ8BAf8EBAMCAQYw
-PgYDVR0gBDcwNTAzBgRVHSAAMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vcG9saWN5
-LmNhbWVyZmlybWEuY29tMH4GA1UdHwR3MHUwOKA2oDSGMmh0dHA6Ly9jcmwuY2Ft
-ZXJmaXJtYS5jb20vY2hhbWJlcnNpZ25yb290LTIwMDguY3JsMDmgN6A1hjNodHRw
-Oi8vY3JsMS5jYW1lcmZpcm1hLmNvbS9jaGFtYmVyc2lnbnJvb3QtMjAwOC5jcmww
-DQYJKoZIhvcNAQEFBQADggIBABNYG4jBwoI7e8pCuUyDc6rwpE9H6AgrUdL7O1xK
-TgTjDGBrMOBK+ZPS4Si8J3yZngvSrL694a1HmiiblJ+CmCdNGli2nBBM+OPK3tQB
-4TW6hgkIe3vSNg/9o9y6+MAJcm8Kn0nPCBkSRME87NwvpehtekuF1G2ng1KDVwAn
-F+eCXfNanEwY++vWbJAuPE69Z/0+rCgNyH1PzihiNu6vrUlSlLWKaG34O1DEttX+
-SsWTpEbpH9w5y9Vmw6WQ/B5nfhPM551HaMbiGgSxT9jHmf8APYQ3iT8EktcdTAdw
-m1miiyxfKG+WjPT7P/x8Np1spJZw+sNIDTLdZ0T1XQ6obVkBTFUDSULKW8949HDu
-VSwdl9Hu9lkDzzh9tyVYwwjEWVFZOiD/4TPVLfphf4ZEiyHt5YpNd9kZJIGGDxdc
-CdtzPm2dQODFpv72LnPQHbuBQPJ71zkoAmyeM/1Qj0DlrFsPcYnbRasck1VmYgDc
-Xc0+is0wcgCd7Gpx1zpEeVqwMD96am2xZPzd6nsbXvo+6TzsKLRMJo6nOERwrzuI
-F+/eq3WXxYMt2UenJsHqwSgPJRMdl3SFz0+SZN0viHeLuwb7qaHN74qC6GP8yHGp
-2xe6Z11mJDPLDSrQQ2dOceSJ1LurJgLP7amYmFlWwVnmM7LnfShhMWMV+MDrICnL
-2ksL
------END CERTIFICATE-----

From bccf057fa4a0208bda55d2972d0161044f050ea5 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 30 Apr 2025 19:26:27 +0000
Subject: [PATCH 216/901] 8355971: Build warnings after the changes for
 JDK-8354996

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

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 5fc745ba223..54022e4e27a 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -66,7 +66,7 @@ endif
 #   default classlist is minimal, let's filter out the '@cp' lines until we can
 #   find a proper solution.
 CLASSLIST_FILE_VM_OPTS = \
-    -Duser.language=en -Duser.country=US
+    -Duser.language=en -Duser.country=US --enable-native-access=ALL-UNNAMED
 
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.

From 4cc19ba5e36829e23ebdfc0a9f4a7bc2117387f6 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Wed, 30 Apr 2025 20:24:54 +0000
Subject: [PATCH 217/901] 8355650: Remove unused fields in ParkEvent

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

diff --git a/src/hotspot/share/runtime/park.hpp b/src/hotspot/share/runtime/park.hpp
index 6d8f67edb9b..f353ce34b74 100644
--- a/src/hotspot/share/runtime/park.hpp
+++ b/src/hotspot/share/runtime/park.hpp
@@ -117,10 +117,6 @@ class ParkEvent : public PlatformEvent {
     // Current association
     Thread * AssociatedWith ;
 
-  public:
-    volatile int TState ;
-    volatile int Notified ;             // for native monitor construct
-
   private:
     static ParkEvent * volatile FreeList ;
     static volatile int ListLock ;
@@ -137,8 +133,6 @@ class ParkEvent : public PlatformEvent {
     ParkEvent() : PlatformEvent() {
        AssociatedWith = nullptr ;
        FreeNext       = nullptr ;
-       TState         = 0 ;
-       Notified       = 0 ;
     }
 
     // We use placement-new to force ParkEvent instances to be

From 24bc714d5e8437c191a6e88871756acdf4b1a36f Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 30 Apr 2025 21:55:57 +0000
Subject: [PATCH 218/901] 8355956: Prepare javap for class file format aware
 access flag parsing

Reviewed-by: vromero
---
 .../com/sun/tools/javap/AttributeWriter.java  | 35 +++++----
 .../com/sun/tools/javap/BasicWriter.java      | 31 ++------
 .../com/sun/tools/javap/ClassWriter.java      | 75 +++++++++++--------
 .../com/sun/tools/javap/CodeWriter.java       | 21 +++---
 .../tools/javap/UndefinedAccessFlagTest.java  |  7 +-
 5 files changed, 89 insertions(+), 80 deletions(-)

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
index 2335d882ab1..8b7ac158639 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.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
@@ -25,15 +25,24 @@
 
 package com.sun.tools.javap;
 
+import java.lang.classfile.Annotation;
+import java.lang.classfile.Attribute;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.Signature;
+import java.lang.classfile.TypeAnnotation;
+import java.lang.classfile.attribute.*;
+import java.lang.classfile.constantpool.ModuleEntry;
+import java.lang.classfile.constantpool.PoolEntry;
+import java.lang.classfile.constantpool.Utf8Entry;
+import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
 import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
-import java.lang.classfile.*;
-import java.lang.reflect.AccessFlag;
-import java.lang.classfile.constantpool.*;
-import java.lang.classfile.attribute.*;
-import static java.lang.classfile.ClassFile.*;
+
+import static java.lang.classfile.ClassFile.ACC_MANDATED;
+import static java.lang.classfile.ClassFile.ACC_SYNTHETIC;
 import static java.lang.classfile.attribute.StackMapFrameInfo.*;
 import static java.lang.classfile.instruction.CharacterRange.*;
 
@@ -63,21 +72,21 @@ protected AttributeWriter(Context context) {
         options = Options.instance(context);
     }
 
-    public void write(List<Attribute<?>> attrs) {
-        write(attrs, null);
+    public void write(List<Attribute<?>> attrs, ClassFileFormatVersion cffv) {
+        write(attrs, null, cffv);
     }
 
-    public void write(List<Attribute<?>> attrs, CodeAttribute lr) {
+    public void write(List<Attribute<?>> attrs, CodeAttribute lr, ClassFileFormatVersion cffv) {
         if (attrs != null) {
             for (var attr : attrs) try {
-                write(attr, lr);
+                write(attr, lr, cffv);
             } catch (IllegalArgumentException e) {
                 report(e);
             }
         }
     }
 
-    public void write(Attribute<?> a, CodeAttribute lr) {
+    public void write(Attribute<?> a, CodeAttribute lr, ClassFileFormatVersion cffv) {
         switch (a) {
             case UnknownAttribute attr -> {
                 byte[] data = attr.contents();
@@ -209,7 +218,7 @@ public void write(Attribute<?> a, CodeAttribute lr) {
                             indent(+1);
                             first = false;
                         }
-                        for (var flag : maskToAccessFlagsReportUnknown(access_flags, AccessFlag.Location.INNER_CLASS)) {
+                        for (var flag : maskToAccessFlagsReportUnknown(access_flags, AccessFlag.Location.INNER_CLASS, cffv)) {
                             if (flag.sourceModifier() && (flag != AccessFlag.ABSTRACT
                                     || !info.has(AccessFlag.INTERFACE))) {
                                 print(Modifier.toString(flag.mask()) + " ");
@@ -494,7 +503,7 @@ public void write(Attribute<?> a, CodeAttribute lr) {
                         println("descriptor: " + componentInfo.descriptor().stringValue());
                     }
                     if (options.showAllAttrs) {
-                        write(componentInfo.attributes());
+                        write(componentInfo.attributes(), cffv);
                         println();
                     }
                     indent(-1);
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
index 64eecf92082..66345855da5 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.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
@@ -28,6 +28,7 @@
 import java.io.PrintWriter;
 import java.lang.classfile.AccessFlags;
 import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
 import java.lang.reflect.Modifier;
 import java.util.EnumMap;
 import java.util.Map;
@@ -44,25 +45,6 @@
  *  deletion without notice.</b>
  */
 public class BasicWriter {
-    private static final Map<AccessFlag.Location, Integer> LOCATION_MASKS;
-
-    static {
-        var map = new EnumMap<AccessFlag.Location, Integer>(AccessFlag.Location.class);
-        for (var loc : AccessFlag.Location.values()) {
-            map.put(loc, 0);
-        }
-
-        for (var flag : AccessFlag.values()) {
-            for (var loc : flag.locations()) {
-                map.compute(loc, (_, v) -> v | flag.mask());
-            }
-        }
-
-        // Peculiarities from AccessFlag.maskToAccessFlag
-        map.compute(AccessFlag.Location.METHOD, (_, v) -> v | Modifier.STRICT);
-
-        LOCATION_MASKS = map;
-    }
 
     protected BasicWriter(Context context) {
         lineWriter = LineWriter.instance(context);
@@ -72,15 +54,16 @@ protected BasicWriter(Context context) {
             throw new AssertionError();
     }
 
-    protected Set<AccessFlag> flagsReportUnknown(AccessFlags flags) {
-        return maskToAccessFlagsReportUnknown(flags.flagsMask(), flags.location());
+    protected Set<AccessFlag> flagsReportUnknown(AccessFlags flags, ClassFileFormatVersion cffv) {
+        return maskToAccessFlagsReportUnknown(flags.flagsMask(), flags.location(), cffv);
     }
 
-    protected Set<AccessFlag> maskToAccessFlagsReportUnknown(int mask, AccessFlag.Location location) {
+    protected Set<AccessFlag> maskToAccessFlagsReportUnknown(int mask, AccessFlag.Location location, ClassFileFormatVersion cffv) {
+        // TODO pass cffv to maskToAccessFlags
         try {
             return AccessFlag.maskToAccessFlags(mask, location);
         } catch (IllegalArgumentException ex) {
-            mask &= LOCATION_MASKS.get(location);
+            mask &= location.flagsMask(cffv);
             report("Access Flags: " + ex.getMessage());
             return AccessFlag.maskToAccessFlags(mask, location);
         }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
index 3ac3d35b787..4036a185ab1 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -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
@@ -25,33 +25,36 @@
 
 package com.sun.tools.javap;
 
-import java.lang.reflect.AccessFlag;
-import java.net.URI;
-import java.text.DateFormat;
-import java.util.Collection;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
-import java.lang.constant.ClassDesc;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.lang.classfile.AccessFlags;
 import java.lang.classfile.Attributes;
-import java.lang.classfile.ClassModel;
-import java.lang.classfile.ClassSignature;
 import java.lang.classfile.ClassFile;
-import static java.lang.classfile.ClassFile.*;
 import java.lang.classfile.ClassHierarchyResolver;
-import java.lang.classfile.constantpool.*;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.ClassSignature;
 import java.lang.classfile.FieldModel;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodSignature;
 import java.lang.classfile.Signature;
 import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.attribute.SignatureAttribute;
+import java.lang.classfile.constantpool.ClassEntry;
+import java.lang.classfile.constantpool.ConstantValueEntry;
+import java.lang.classfile.constantpool.PoolEntry;
+import java.lang.constant.ClassDesc;
+import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
+import java.lang.reflect.Modifier;
+import java.net.URI;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import static java.lang.classfile.ClassFile.*;
 
 /*
  *  The main javap class to write the contents of a class file as text.
@@ -112,6 +115,16 @@ protected void setMethod(MethodModel m) {
         method = m;
     }
 
+    protected ClassFileFormatVersion cffv() {
+        var major = classModel.majorVersion();
+        if (major < JAVA_1_VERSION || major > ClassFile.latestMajorVersion())
+            return null;
+        if (major >= JAVA_12_VERSION && classModel.minorVersion() != 0) {
+            return null;
+        }
+        return ClassFileFormatVersion.fromMajor(major);
+    }
+
     public boolean write(ClassModel cm) {
         errorReported = false;
         setClassFile(cm);
@@ -249,7 +262,7 @@ public boolean write(ClassModel cm) {
         println("}");
 
         if (options.verbose) {
-            attrWriter.write(classModel.attributes());
+            attrWriter.write(classModel.attributes(), cffv());
         }
 
         if (options.verify) {
@@ -266,10 +279,10 @@ public boolean write(ClassModel cm) {
     }
     // where
 
-    private static final ClassFile VERIFIER = ClassFile.of(ClassFile.ClassHierarchyResolverOption.of(
+    private static final ClassFile VERIFIER = ClassFile.of(ClassHierarchyResolverOption.of(
             ClassHierarchyResolver.defaultResolver().orElse(new ClassHierarchyResolver() {
                 @Override
-                public ClassHierarchyResolver.ClassHierarchyInfo getClassInfo(ClassDesc classDesc) {
+                public ClassHierarchyInfo getClassInfo(ClassDesc classDesc) {
                     // mark all unresolved classes as interfaces to exclude them from assignability verification
                     return ClassHierarchyInfo.ofInterface();
                 }
@@ -419,7 +432,7 @@ protected void writeField(FieldModel f) {
             return;
 
         var flags = f.flags();
-        writeModifiers(flagsReportUnknown(flags).stream().filter(fl -> fl.sourceModifier())
+        writeModifiers(flagsReportUnknown(flags, cffv()).stream().filter(fl -> fl.sourceModifier())
                 .map(fl -> Modifier.toString(fl.mask())).toList());
         print(() -> sigPrinter.print(
                 f.findAttribute(Attributes.signature())
@@ -448,11 +461,11 @@ protected void writeField(FieldModel f) {
 
         if (options.verbose)
             writeList(String.format("flags: (0x%04x) ", flags.flagsMask()),
-                    flagsReportUnknown(flags).stream().map(fl -> "ACC_" + fl.name()).toList(),
+                    flagsReportUnknown(flags, cffv()).stream().map(fl -> "ACC_" + fl.name()).toList(),
                     "\n");
 
         if (options.showAllAttrs) {
-            attrWriter.write(f.attributes());
+            attrWriter.write(f.attributes(), cffv());
             showBlank = true;
         }
 
@@ -480,7 +493,7 @@ protected void writeMethod(MethodModel m) {
         int flags = m.flags().flagsMask();
 
         var modifiers = new ArrayList<String>();
-        for (var f : flagsReportUnknown(m.flags()))
+        for (var f : flagsReportUnknown(m.flags(), cffv()))
             if (f.sourceModifier()) modifiers.add(Modifier.toString(f.mask()));
 
         String name = "???";
@@ -563,7 +576,7 @@ protected void writeMethod(MethodModel m) {
             StringBuilder sb = new StringBuilder();
             String sep = "";
             sb.append(String.format("flags: (0x%04x) ", flags));
-            for (var f : flagsReportUnknown(m.flags())) {
+            for (var f : flagsReportUnknown(m.flags(), cffv())) {
                 sb.append(sep).append("ACC_").append(f.name());
                 sep = ", ";
             }
@@ -573,7 +586,7 @@ protected void writeMethod(MethodModel m) {
         var code = (CodeAttribute)m.code().orElse(null);
 
         if (options.showAllAttrs) {
-            attrWriter.write(m.attributes());
+            attrWriter.write(m.attributes(), cffv());
         } else if (code != null && options.showDisassembled) {
             codeWriter.writeMinimal(code);
         }
@@ -786,7 +799,7 @@ else switch (c) {
     }
 
     private Set<String> getClassModifiers(AccessFlags flags) {
-        var flagSet = flagsReportUnknown(flags);
+        var flagSet = flagsReportUnknown(flags, cffv());
         Set<AccessFlag> set;
         if (flagSet.contains(AccessFlag.INTERFACE)) {
             set = EnumSet.copyOf(flagSet);
@@ -797,7 +810,7 @@ private Set<String> getClassModifiers(AccessFlags flags) {
         return getModifiers(set);
     }
 
-    private static Set<String> getModifiers(Set<java.lang.reflect.AccessFlag> flags) {
+    private static Set<String> getModifiers(Set<AccessFlag> flags) {
         Set<String> s = new LinkedHashSet<>();
         for (var f : flags)
             if (f.sourceModifier()) s.add(Modifier.toString(f.mask()));
@@ -805,10 +818,10 @@ private static Set<String> getModifiers(Set<java.lang.reflect.AccessFlag> flags)
     }
 
     private Set<String> getClassFlags(AccessFlags flags) {
-        return getFlags(flags.flagsMask(), flagsReportUnknown(flags));
+        return getFlags(flags.flagsMask(), flagsReportUnknown(flags, cffv()));
     }
 
-    private static Set<String> getFlags(int mask, Set<java.lang.reflect.AccessFlag> flags) {
+    private static Set<String> getFlags(int mask, Set<AccessFlag> flags) {
         Set<String> s = new LinkedHashSet<>();
         for (var f: flags) {
             s.add("ACC_" + f.name());
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
index 9c884fff7ee..9de6010430f 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/CodeWriter.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
@@ -25,15 +25,18 @@
 
 package com.sun.tools.javap;
 
-import java.lang.classfile.*;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.Instruction;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.attribute.CodeAttribute;
+import java.lang.classfile.constantpool.PoolEntry;
+import java.lang.classfile.instruction.*;
 import java.util.ArrayList;
 import java.util.List;
-
 import java.util.Locale;
 import java.util.stream.Collectors;
-import java.lang.classfile.constantpool.*;
-import java.lang.classfile.attribute.CodeAttribute;
-import java.lang.classfile.instruction.*;
 
 /*
  *  Write the contents of a Code attribute.
@@ -277,14 +280,14 @@ private void writeVerboseMode(CodeAttribute attr) {
         writeVerboseHeader(attr);
         writeInstrs(attr);
         writeExceptionTable(attr);
-        attrWriter.write(attr.attributes(), attr);
+        attrWriter.write(attr.attributes(), attr, classWriter.cffv());
     }
 
     private void writeLineAndLocalVariableTables(CodeAttribute attr) {
         attr.findAttribute(Attributes.lineNumberTable())
-            .ifPresent(a -> attrWriter.write(a, attr));
+            .ifPresent(a -> attrWriter.write(a, attr, classWriter.cffv()));
         attr.findAttribute(Attributes.localVariableTable())
-            .ifPresent(a -> attrWriter.write(a, attr));
+            .ifPresent(a -> attrWriter.write(a, attr, classWriter.cffv()));
     }
 
     private AttributeWriter attrWriter;
diff --git a/test/langtools/tools/javap/UndefinedAccessFlagTest.java b/test/langtools/tools/javap/UndefinedAccessFlagTest.java
index ab63dbddce8..682483223ae 100644
--- a/test/langtools/tools/javap/UndefinedAccessFlagTest.java
+++ b/test/langtools/tools/javap/UndefinedAccessFlagTest.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,7 +22,8 @@
  */
 
 /*
- * @test 8333748
+ * @test
+ * @bug 8333748 8349536
  * @summary javap should not fail if reserved access flag bits are set to 1
  * @library /tools/lib
  * @modules jdk.jdeps/com.sun.tools.javap
@@ -91,7 +92,7 @@ void test(TestLocation location) throws Throwable {
                     });
                 case InnerClassesAttribute attr when location == TestLocation.INNER_CLASS -> cb
                     .with(InnerClassesAttribute.of(attr.classes().stream()
-                        .map(ic -> InnerClassInfo.of(ic.innerClass(), ic.outerClass(), ic.innerName(), ic.flagsMask() | 0x0020))
+                        .map(ic -> InnerClassInfo.of(ic.innerClass(), ic.outerClass(), ic.innerName(), ic.flagsMask() | ACC_SUPER))
                         .toList()));
                 default -> cb.with(ce);
             }

From e36756b264000fe2deb95ec8f68d1571fd7653f9 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 30 Apr 2025 21:56:13 +0000
Subject: [PATCH 219/901] 8297727: Forcing LF interpretation lead to
 StackOverflowError in reflection code

Reviewed-by: jvernee
---
 .../java/lang/invoke/DirectMethodHandle.java  | 11 ++---
 .../ReflectionInInterpretTest.java            | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 test/jdk/java/lang/invoke/LFInterpret/ReflectionInInterpretTest.java

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 4eb825d13ce..ad6387e8c9e 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -214,7 +214,6 @@ private static LambdaForm preparedLambdaForm(MemberName m, boolean adaptToSpecia
             which = LF_INVSPECIAL_IFC;
         }
         LambdaForm lform = preparedLambdaForm(mtype, which);
-        maybeCompile(lform, m);
         assert(lform.methodType().dropParameterTypes(0, 1)
                 .equals(m.getInvocationType().basicType()))
                 : Arrays.asList(m, m.getInvocationType().basicType(), lform, lform.methodType());
@@ -320,12 +319,6 @@ static LambdaForm makePreparedLambdaForm(MethodType mtype, int which) {
         return null;
     }
 
-    private static void maybeCompile(LambdaForm lform, MemberName m) {
-        if (lform.vmentry == null && VerifyAccess.isSamePackage(m.getDeclaringClass(), MethodHandle.class))
-            // Help along bootstrapping...
-            lform.compileToBytecode();
-    }
-
     /** Static wrapper for DirectMethodHandle.internalMemberName. */
     @ForceInline
     /*non-public*/
@@ -666,7 +659,6 @@ private static LambdaForm preparedFieldLambdaForm(MemberName m) {
             formOp += (AF_GETSTATIC_INIT - AF_GETSTATIC);
         }
         LambdaForm lform = preparedFieldLambdaForm(formOp, isVolatile, ftype);
-        maybeCompile(lform, m);
         assert(lform.methodType().dropParameterTypes(0, 1)
                 .equals(m.getInvocationType().basicType()))
                 : Arrays.asList(m, m.getInvocationType().basicType(), lform, lform.methodType());
@@ -843,6 +835,9 @@ static LambdaForm makePreparedFieldLambdaForm(byte formOp, boolean isVolatile, i
             }
             LambdaForm.associateWithDebugName(form, nameBuilder.toString());
         }
+
+        // NF_UNSAFE uses field form, avoid circular dependency in interpreter
+        form.compileToBytecode();
         return form;
     }
 
diff --git a/test/jdk/java/lang/invoke/LFInterpret/ReflectionInInterpretTest.java b/test/jdk/java/lang/invoke/LFInterpret/ReflectionInInterpretTest.java
new file mode 100644
index 00000000000..a7fece07e5c
--- /dev/null
+++ b/test/jdk/java/lang/invoke/LFInterpret/ReflectionInInterpretTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+/*
+ * @test
+ * @bug 8297727
+ * @summary MethodHandle field access fails with bytecode compilation disabled
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowHiddenFrames
+ *     -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=-1
+ *     ReflectionInInterpretTest
+ */
+public class ReflectionInInterpretTest {
+    private static Integer f; // non-Object type is required to find a non-compiled form
+
+    public static void main(String... args) throws Throwable {
+        MethodHandle mh = MethodHandles.lookup().findStaticGetter(ReflectionInInterpretTest.class, "f", Integer.class);
+        var _ = (Integer) mh.invokeExact();
+    }
+}

From e2ae50d877b13b121912e2496af4b5209b315a05 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 30 Apr 2025 22:53:31 +0000
Subject: [PATCH 220/901] 8355569: Some nsk/jdi tests can glean the "main"
 thread by using the ClassPrepareEvent for the debuggee main class

Reviewed-by: sspitsyn, amenkov
---
 .../isPackagePrivate/accipp001.java           |  5 +-
 .../EventRequest/hashCode/hashcode001.java    |  4 +-
 .../_bounds_/requests001.java                 |  4 +-
 .../suspendPolicy/suspendpolicy001.java       |  3 +-
 .../jdi/Method/isObsolete/isobsolete003.java  |  5 +-
 .../MethodEntryEvent/method/method002.java    |  7 +-
 .../jdi/MethodExitEvent/method/method001.java |  7 +-
 .../jdi/MethodExitEvent/method/method002.java |  7 +-
 .../entryCount/entrycount002.java             |  6 +-
 .../owningThread/owningthread002.java         |  6 +-
 .../jdi/StackFrame/_bounds_/bounds002.java    |  4 +-
 .../jdi/StepRequest/_bounds_/filters001.java  |  4 +-
 .../ThreadReference/_bounds_/bounds001.java   |  4 +-
 .../redefineClasses/redefineclasses004.java   |  5 +-
 .../redefineClasses/redefineclasses005.java   |  5 +-
 .../redefineClasses/redefineclasses006.java   |  5 +-
 .../redefineClasses/redefineclasses007.java   |  5 +-
 .../redefineClasses/redefineclasses008.java   |  5 +-
 .../redefineClasses/redefineclasses009.java   |  5 +-
 .../redefineClasses/redefineclasses010.java   |  5 +-
 .../redefineClasses/redefineclasses011.java   |  5 +-
 .../redefineClasses/redefineclasses012.java   |  5 +-
 .../redefineClasses/redefineclasses013.java   |  5 +-
 .../redefineClasses/redefineclasses014.java   |  5 +-
 .../redefineClasses/redefineclasses015.java   |  5 +-
 .../redefineClasses/redefineclasses016.java   |  5 +-
 .../redefineClasses/redefineclasses020.java   |  4 +-
 .../redefineClasses/redefineclasses021.java   |  4 +-
 .../redefineClasses/redefineclasses022.java   |  4 +-
 .../redefineClasses/redefineclasses024.java   |  4 +-
 .../redefineClasses/redefineclasses025.java   |  4 +-
 .../redefineClasses/redefineclasses026.java   |  4 +-
 .../redefineClasses/redefineclasses027.java   |  4 +-
 .../redefineClasses/redefineclasses028.java   |  4 +-
 .../redefineClasses/redefineclasses030.java   |  4 +-
 .../redefineClasses/redefineclasses031.java   |  4 +-
 .../redefineClasses/redefineclasses032.java   |  4 +-
 .../vmTestbase/nsk/share/jdi/Debugee.java     | 65 ++++++++++++++++++-
 38 files changed, 150 insertions(+), 90 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java
index 7378c4dc96b..201995bde3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Accessible/isPackagePrivate/accipp001.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
@@ -108,8 +108,7 @@ private int runThis (String argv[], PrintStream out) {
         logHandler      = new Log(out, argsHandler);
         Binder binder   = new Binder(argsHandler, logHandler);
 
-        debugee = Debugee.prepareDebugee(argsHandler, logHandler,
-                debugeeName + (argsHandler.verbose() ? " -vbs" : ""));
+        debugee = Debugee.prepareDebugee(argsHandler, logHandler, debugeeName);
 
 //        ReferenceType classes[] = debugee.classes();
 //        for (int i=0; i<classes.length; i++) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
index 05756d91327..1affebe18a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/hashCode/hashcode001.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
@@ -118,7 +118,7 @@ private static void execTest() {
             switch (i) {
 
                 case 0:
-                       ThreadReference thread = debuggee.threadByNameOrThrow(methodName);
+                       ThreadReference thread = debuggee.mainThread();
 
                        display(".....setting up StepRequest");
                        eventRequest = eventRequestManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java
index 36ade0bcc70..8fb2c012b7b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/_bounds_/requests001.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
@@ -95,7 +95,7 @@ private void execTest() {
 
         EventRequest request;
         EventRequestManager evm = debugee.getEventRequestManager();
-        ThreadReference thread = debugee.threadByName("main");
+        ThreadReference thread = debugee.mainThread();
 
         display("");
         display("...calling createStepRequest(null, StepRequest.STEP_LINE, "
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
index d145bf46136..17e515af080 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/suspendPolicy/suspendpolicy001.java
@@ -250,6 +250,7 @@ private void testRun()
 
         ClassPrepareEvent event = (ClassPrepareEvent) eventIterator.next();
         debuggeeClass = event.referenceType();
+        debuggee.setMainThread(event.thread());
 
         if (!debuggeeClass.name().equals(debuggeeName))
            throw new JDITestRuntimeException("** Unexpected ClassName for ClassPrepareEvent **");
@@ -257,7 +258,7 @@ private void testRun()
 
         log2("......setting up ClassPrepareEvent for breakpointForCommunication");
 
-        ThreadReference mainThread = debuggee.threadByNameOrThrow("main");
+        ThreadReference mainThread = debuggee.mainThread();
         setupBreakpointForCommunication(debuggeeClass);
 
     //------------------------------------------------------  testing section
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java
index 0f6339b0ae4..f9084ef3d94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Method/isObsolete/isobsolete003.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
@@ -139,7 +139,7 @@ public static int run(String argv[], PrintStream out) {
 
     private static void execTest() {
 
-        ThreadReference mainThread = debuggee.threadByName("main");
+        ThreadReference mainThread = debuggee.mainThread();
 
         // Set first breakpoint to have isobsolete003b class loaded.
         BreakpointRequest bpRequest = debuggee.makeBreakpoint(debuggeeClass, "main", brkpMainLineNumber);
@@ -456,6 +456,7 @@ private static void waitForDebuggeeClassPrepared () {
         ClassPrepareEvent event = (ClassPrepareEvent) waitForEvent(cpRequest);
         cpRequest.disable();
 
+        debuggee.setMainThread(event.thread());
         debuggeeClass = event.referenceType();
         if (!debuggeeClass.name().equals(debuggeeName))
            throw new Failure("Unexpected class name for ClassPrepareEvent : " + debuggeeClass.name());
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java
index 20a1cfb6cdf..e230a8dc072 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method002.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
@@ -113,6 +113,9 @@ public static int run(final String args[], final PrintStream out) {
 
         pipe = debuggee.createIOPipe();
 
+        ClassPrepareEvent cpEvent = debuggee.waitForClassPrepare(DEBUGGEE_NAME);
+        debuggee.setMainThread(cpEvent.thread());
+
         // resume debuggee
         log.display("Resuming debuggee");
         debuggee.resume();
@@ -135,7 +138,7 @@ public static int run(final String args[], final PrintStream out) {
             checkedClass = debuggee.classByName(CHILD_NAME);
 
             log.display("Getting <main> thread in debuggee");
-            checkedThread = debuggee.threadByName("main");
+            checkedThread = debuggee.mainThread();
             if (checkedThread == null) {
                 throw new Failure("TEST BUG: unable to find reference to main thread");
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java
index a1515979a18..98e9b31c965 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method001.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
@@ -110,6 +110,9 @@ public static int run(final String args[], final PrintStream out) {
 
         pipe = debuggee.createIOPipe();
 
+        ClassPrepareEvent cpEvent = debuggee.waitForClassPrepare(DEBUGGEE_NAME);
+        debuggee.setMainThread(cpEvent.thread());
+
         // resume debuggee
         log.display("Resuming debuggee");
         debuggee.resume();
@@ -131,7 +134,7 @@ public static int run(final String args[], final PrintStream out) {
             checkedClass = debuggee.classByName(DEBUGGEE_NAME);
 
             log.display("Getting reference to thread <main>");
-            checkedThread = debuggee.threadByName("main");
+            checkedThread = debuggee.mainThread();
             if (checkedThread == null) {
                 throw new Failure("TEST BUG: unable to find reference to main thread");
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java
index 0f0bd3773f3..b7c6eb705b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodExitEvent/method/method002.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
@@ -114,6 +114,9 @@ public static int run(final String args[], final PrintStream out) {
 
         pipe = debuggee.createIOPipe();
 
+        ClassPrepareEvent cpEvent = debuggee.waitForClassPrepare(DEBUGGEE_NAME);
+        debuggee.setMainThread(cpEvent.thread());
+
         // resume debuggee
         log.display("Resuming debuggee");
         debuggee.resume();
@@ -136,7 +139,7 @@ public static int run(final String args[], final PrintStream out) {
             checkedClass = debuggee.classByName(CHILD_NAME);
 
             log.display("Getting reference to thread <main>");
-            checkedThread = debuggee.threadByName("main");
+            checkedThread = debuggee.mainThread();
             if (checkedThread == null) {
                 throw new Failure("TEST BUG: unable to find reference to main thread");
             }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java
index e5e8f4e8d80..d19bda3bb30 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/entryCount/entrycount002.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
@@ -153,7 +153,7 @@ private int runThis(String argv[], PrintStream out) {
     //--------------------------------------------------------- mutable common methods
 
     private void execTest() {
-        ThreadReference mainThread = debuggee.threadByName("main");
+        ThreadReference mainThread = debuggee.mainThread();
 
         BreakpointRequest bpRequest = debuggee.makeBreakpoint(debuggeeClass,
                                                             "methodForCommunication",
@@ -293,6 +293,8 @@ private ReferenceType waitForDebuggeeClassPrepared () {
         ClassPrepareEvent event = (ClassPrepareEvent) waitForEvent(cpRequest);
         cpRequest.disable();
 
+        debuggee.setMainThread(event.thread()); // Needed so debuggee.mainThread() will work
+
         if (!event.referenceType().name().equals(debuggeeName)) {
            throw new Failure("Unexpected class name for ClassPrepareEvent : " + debuggeeClass.name());
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java
index 83e0bbb8c05..d0b4b238dfc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread002.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
@@ -153,7 +153,7 @@ private int runThis(String argv[], PrintStream out) {
     //--------------------------------------------------------- mutable common methods
 
     private void execTest() {
-        ThreadReference mainThread = debuggee.threadByName("main");
+        ThreadReference mainThread = debuggee.mainThread();
 
         BreakpointRequest bpRequest = debuggee.makeBreakpoint(debuggeeClass,
                                                              "methodForCommunication",
@@ -307,6 +307,8 @@ private ReferenceType waitForDebuggeeClassPrepared () {
         ClassPrepareEvent event = (ClassPrepareEvent) waitForEvent(cpRequest);
         cpRequest.disable();
 
+        debuggee.setMainThread(event.thread()); // Needed so debuggee.mainThread() will work
+
         if (!event.referenceType().name().equals(debuggeeName)) {
            throw new Failure("Unexpected class name for ClassPrepareEvent : " + debuggeeClass.name());
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java
index 092e0beb983..7a9f5f0547e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/_bounds_/bounds002.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
@@ -95,7 +95,7 @@ public static int run(String argv[], PrintStream out) {
     private void execTest() {
 
         debugee.VM().suspend();
-        ThreadReference thread = debugee.threadByName("main");
+        ThreadReference thread = debugee.mainThread();
         StackFrame stackFrame = null;
         boolean isTopmostFrame = false;
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java
index 7ec7b0bb5a0..a415d5dd6ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/_bounds_/filters001.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
@@ -87,7 +87,7 @@ private void execTest() {
         display("");
         display(">>>creating StepRequest");
 
-        ThreadReference thread = debugee.threadByName("main");
+        ThreadReference thread = debugee.mainThread();
         EventRequestManager evm = debugee.getEventRequestManager();
         StepRequest request = evm.createStepRequest(thread, StepRequest.STEP_LINE,
                                                             StepRequest.STEP_INTO);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java
index 13355b1b125..9e6b52d8be4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/_bounds_/bounds001.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
@@ -97,7 +97,7 @@ public static int run(String argv[], PrintStream out) {
     private void execTest() {
 
         debugee.VM().suspend();
-        ThreadReference thread = debugee.threadByName("main");
+        ThreadReference thread = debugee.mainThread();
 
         display("\nTEST BEGINS");
         display("===========");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java
index cbccac467e7..f05b7dd1ed7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses004.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
@@ -158,7 +158,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             display("\n\n<<<Debugee is suspended>>>");
             display("--------------------------");
@@ -167,7 +167,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             display("\n\n<<<Debugee is not suspended>>>");
             display("------------------------------");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java
index 92e1a4617c8..78a888e6d4d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses005.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
@@ -155,7 +155,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -165,7 +165,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java
index c12295948a0..fab18f6b374 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses006.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
@@ -157,7 +157,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -167,7 +167,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java
index cafe5e05c35..a6340f30d4c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses007.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
@@ -164,7 +164,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -174,7 +174,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java
index 5ebc7d5442f..2fcc2ba2188 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses008.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
@@ -162,7 +162,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -172,7 +172,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java
index 38e0093570c..91e7d1b0caa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses009.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
@@ -154,7 +154,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -164,7 +164,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java
index 8d6fc4ac3c4..98465a87836 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses010.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
@@ -156,7 +156,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -166,7 +166,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java
index 573c60f5cb3..ed08a793ebd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses011.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
@@ -158,7 +158,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -168,7 +168,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java
index 23aac498c87..8b1d0bf6e0a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses012.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
@@ -154,7 +154,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -164,7 +164,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java
index e0b344e51a0..0bee7b62655 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses013.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
@@ -161,7 +161,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -171,7 +171,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java
index b664992fcc3..a2147234d2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses014.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
@@ -162,7 +162,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -172,7 +172,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java
index 083ceabc71d..288fb024f98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses015.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
@@ -182,7 +182,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -192,7 +192,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java
index 10ab031738b..812bf0d96a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses016.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
@@ -163,7 +163,7 @@ private void execTest() throws TestBug {
         display("\nTEST BEGINS");
         display("===========");
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
@@ -173,7 +173,6 @@ private void execTest() throws TestBug {
 
         debugee.resume();
 
-        thrd = debugee.threadByName("main");
         if (!thrd.isSuspended()) {
             statDebugee = "Debugee is not suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java
index 2d722a65bce..32182359084 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses020.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
@@ -236,7 +236,7 @@ private Map<? extends com.sun.jdi.ReferenceType,byte[]> mapClassToBytes(String f
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java
index 540573bf071..2b64ce73325 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021.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
@@ -233,7 +233,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java
index f703383d024..a818c152c36 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses022.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
@@ -234,7 +234,7 @@ private Map<? extends com.sun.jdi.ReferenceType,byte[]> mapClassToBytes(String f
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java
index 2c9c861908e..909f254ffac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses024.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
@@ -292,7 +292,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java
index dc3d8ff896f..fa9748ddd10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses025.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
@@ -267,7 +267,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java
index 9b391ac4459..e9c48d0d6c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026.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
@@ -206,7 +206,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java
index 6dc6ef4704f..ae29c6f9ef8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses027.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
@@ -265,7 +265,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java
index b22368d6b39..818b5f382f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028.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
@@ -210,7 +210,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java
index 3c7a028b5a8..5e9b921258e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030.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
@@ -231,7 +231,7 @@ private String typePrompt(ReferenceType refType) {
     }
 
     void displayVMStatus() {
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
         if (thrd.isSuspended()) {
             statDebugee = "Debugee is suspended";
             display("\n\n<<<" + statDebugee + ">>>");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java
index d0f65a08d70..11ee58817d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses031.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
@@ -140,7 +140,7 @@ private void execTest() throws Failure {
 
         display("Tested class\t:" + debugeeClass.name());
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
 
         StepRequest sreq;
         BreakpointRequest brkp;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java
index d36ce86835f..2b50e81ab26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses032.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
@@ -124,7 +124,7 @@ private void execTest() throws Failure {
 
         display("Tested class\t:" + debugeeClass.name());
 
-        ThreadReference thrd = debugee.threadByName("main");
+        ThreadReference thrd = debugee.mainThread();
 
         BreakpointRequest brkp = debugee.setBreakpoint(debugeeClass,
                                             redefineclasses032a.brkpMethodName,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 0f0b6fe9052..b121bd15fe3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -38,11 +38,11 @@
  * This class is wrapper for debugee VM constructed by <code>Binder</code>
  * and it uses <code>com.sun.jdi.VirtualMachine</code> to interact with debugee VM.
  * <p>
- * In addition to the general abities to control of debugee VM process,
+ * In addition to the general abilities to control the debugee VM process
  * provided by the base class <code>DebugeeProcess</code>, this class
  * adds also several service methods over the JDI features to simplify interaction
  * with debugee VM (such as finding classes, setting breakpoints,
- * handling events, and so on.).
+ * handling events, and so on).
  *
  * @see Binder
  * @see DebugeeProcess
@@ -61,11 +61,18 @@ public class Debugee extends DebugeeProcess {
     /** Argument handler. */
     protected ArgumentHandler argumentHandler = null;
 
+    /** wait time in ms. */
+    protected long waitTime;
+
+    /** Stashed ThreadReference for debuggee "main" thread. Not always setup. */
+    protected ThreadReference mainThread;
+
     /** Create new <code>Debugee</code> object for a given binder. */
     protected Debugee (Binder binder) {
         super(binder);
         this.binder = binder;
         this.argumentHandler = (ArgumentHandler)binder.getArgumentHandler();
+        this.waitTime = argumentHandler.getWaitTime() * 60000;
     }
 
     protected Debugee (Process process, Binder binder) {
@@ -73,6 +80,7 @@ protected Debugee (Process process, Binder binder) {
         this.process = process;
         this.binder = binder;
         this.argumentHandler = (ArgumentHandler)binder.getArgumentHandler();
+        this.waitTime = argumentHandler.getWaitTime() * 60000;
     }
 
     /** Setup <code>Debugee</code> object with given VM mirror. */
@@ -264,6 +272,21 @@ public ThreadReference threadByNameOrThrow(String name) throws JDITestRuntimeExc
         throw new JDITestRuntimeException("** Thread IS NOT found ** : " + name);
     }
 
+    public void setMainThread(ThreadReference thread) {
+        String threadName = thread.name();
+        if (!threadName.equals("main")) {
+            throw new TestBug("Thread is not \"main\" thread: " + threadName);
+        }
+        mainThread = thread;
+    }
+
+    public ThreadReference mainThread() {
+        if (mainThread == null) {
+            throw new JDITestRuntimeException("** mainThrad has not been set **");
+        }
+        return mainThread;
+    }
+
     /**
      * Return a debuggee thread by fetching it from a static field in the debuggee.
      */
@@ -576,8 +599,13 @@ public static Debugee prepareDebugee(ArgumentHandler argHandler, Log log,
         Debugee debugee = binder.bindToDebugee(mainClassName);
 
         debugee.createIOPipe();
-
         debugee.redirectStderr(log, DEBUGEE_STDERR_LOG_PREFIX);
+
+        // Get the ClassPrepareEvent for the main class for the sole purpose
+        // of using it to get the ThreadReference for the "main" thread.
+        ClassPrepareEvent cpEvent = debugee.waitForClassPrepare(mainClassName);
+        debugee.setMainThread(cpEvent.thread());
+
         debugee.resume();
 
         debugee.receiveExpectedSignal("ready");
@@ -585,6 +613,37 @@ public static Debugee prepareDebugee(ArgumentHandler argHandler, Log log,
         return debugee;
     }
 
+    public ClassPrepareEvent waitForClassPrepare(String classname) {
+        Event event;
+        EventRequestManager eventRManager = getEventRequestManager();
+        ClassPrepareRequest cpRequest = eventRManager.createClassPrepareRequest();
+        cpRequest.setSuspendPolicy(EventRequest.SUSPEND_ALL);
+        cpRequest.addClassFilter(classname);
+        cpRequest.addCountFilter(1);
+
+        cpRequest.enable();
+        vm.resume();
+        try {
+            event = (ClassPrepareEvent)waitingEvent(cpRequest, waitTime);
+        } catch (InterruptedException e) {
+            throw new Failure("Thread interrupted while waiting for ClassPrepareEvent: " + e);
+        }
+        cpRequest.disable();
+
+        if (!(event instanceof ClassPrepareEvent)) {
+            throw new Failure("Unexpected Event: " + event);
+        }
+
+        ClassPrepareEvent cpEvent = (ClassPrepareEvent)event;
+        ReferenceType cls = cpEvent.referenceType();
+        if (!cls.name().equals(classname)) {
+            throw new Failure("Unexpected ClassName for ClassPrepareEvent: " + cls.name());
+        }
+
+        display("received: ClassPrepareEvent for class: " + classname);
+        return cpEvent;
+    }
+
     /**
      * Send <code>"quit"</code> signal, wait for debugee VM exit and check exit.
      *

From 8ef7e256a09115b475601b621c9b6842185289d0 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 1 May 2025 07:29:56 +0000
Subject: [PATCH 221/901] 8355769: Optimize nmethod dependency recording

Reviewed-by: adinn, vlivanov, kvn
---
 src/hotspot/share/code/dependencyContext.cpp | 32 +++++++++++++++++---
 src/hotspot/share/oops/instanceKlass.cpp     |  1 +
 src/hotspot/share/prims/methodHandles.cpp    |  3 +-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/code/dependencyContext.cpp b/src/hotspot/share/code/dependencyContext.cpp
index 2b3253030c5..a8ef707978d 100644
--- a/src/hotspot/share/code/dependencyContext.cpp
+++ b/src/hotspot/share/code/dependencyContext.cpp
@@ -91,18 +91,40 @@ void DependencyContext::mark_dependent_nmethods(DeoptimizationScope* deopt_scope
 //
 void DependencyContext::add_dependent_nmethod(nmethod* nm) {
   assert_lock_strong(CodeCache_lock);
-  for (nmethodBucket* b = dependencies_not_unloading(); b != nullptr; b = b->next_not_unloading()) {
-    if (nm == b->get_nmethod()) {
-      return;
-    }
+  assert(nm->is_not_installed(), "Precondition: new nmethod");
+
+  // This method tries to add never before seen nmethod, holding the CodeCache_lock
+  // until all dependencies are added. The caller code can call multiple times
+  // with the same nmethod, but always under the same lock hold.
+  //
+  // This means the buckets list is guaranteed to be in either of two states, with
+  // regards to the newly added nmethod:
+  //   1. The nmethod is not in the list, and can be just added to the head of the list.
+  //   2. The nmethod is in the list, and it is already at the head of the list.
+  //
+  // This path is the only path that adds to the list. There can be concurrent removals
+  // from the list, but they do not break this invariant. This invariant allows us
+  // to skip list scans. The individual method checks are cheap, but walking the large
+  // list of dependencies gets expensive.
+
+  nmethodBucket* head = Atomic::load(_dependency_context_addr);
+  if (head != nullptr && nm == head->get_nmethod()) {
+    return;
+  }
+
+#ifdef ASSERT
+  for (nmethodBucket* b = head; b != nullptr; b = b->next()) {
+    assert(nm != b->get_nmethod(), "Invariant: should not be in the list yet");
   }
+#endif
+
   nmethodBucket* new_head = new nmethodBucket(nm, nullptr);
   for (;;) {
-    nmethodBucket* head = Atomic::load(_dependency_context_addr);
     new_head->set_next(head);
     if (Atomic::cmpxchg(_dependency_context_addr, head, new_head) == head) {
       break;
     }
+    head = Atomic::load(_dependency_context_addr);
   }
   if (UsePerfData) {
     _perf_total_buckets_allocated_count->inc();
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 32445759491..00ef75d8486 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2501,6 +2501,7 @@ void InstanceKlass::mark_dependent_nmethods(DeoptimizationScope* deopt_scope, Kl
 }
 
 void InstanceKlass::add_dependent_nmethod(nmethod* nm) {
+  assert_lock_strong(CodeCache_lock);
   dependencies().add_dependent_nmethod(nm);
 }
 
diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index 246e2cdbb13..1ab5d6ab7f7 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -929,8 +929,7 @@ void MethodHandles::expand_MemberName(Handle mname, int suppress, TRAPS) {
 }
 
 void MethodHandles::add_dependent_nmethod(oop call_site, nmethod* nm) {
-  assert_locked_or_safepoint(CodeCache_lock);
-
+  assert_lock_strong(CodeCache_lock);
   DependencyContext deps = java_lang_invoke_CallSite::vmdependencies(call_site);
   deps.add_dependent_nmethod(nm);
 }

From b2184105088a21d0c55fd3105e3433d4eac767da Mon Sep 17 00:00:00 2001
From: Gustavo Simon <gustavo.andre.simon@hotmail.com>
Date: Thu, 1 May 2025 07:32:10 +0000
Subject: [PATCH 222/901] 8354292: Remove unused PRAGMA_FORMAT_IGNORED

Reviewed-by: mbaesken, kbarrett, shade
---
 src/hotspot/share/utilities/compilerWarnings.hpp     | 3 ---
 src/hotspot/share/utilities/compilerWarnings_gcc.hpp | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/hotspot/share/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp
index e2c9fc289f6..bf5ca5b4893 100644
--- a/src/hotspot/share/utilities/compilerWarnings.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings.hpp
@@ -62,9 +62,6 @@
 #ifndef PRAGMA_FORMAT_NONLITERAL_IGNORED
 #define PRAGMA_FORMAT_NONLITERAL_IGNORED
 #endif
-#ifndef PRAGMA_FORMAT_IGNORED
-#define PRAGMA_FORMAT_IGNORED
-#endif
 
 #ifndef PRAGMA_STRINGOP_TRUNCATION_IGNORED
 #define PRAGMA_STRINGOP_TRUNCATION_IGNORED
diff --git a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
index 863cc512cca..c10650598cd 100644
--- a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
@@ -51,8 +51,6 @@
   PRAGMA_DISABLE_GCC_WARNING("-Wformat-nonliteral")     \
   PRAGMA_DISABLE_GCC_WARNING("-Wformat-security")
 
-#define PRAGMA_FORMAT_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wformat")
-
 // Disable -Wstringop-truncation which is introduced in GCC 8.
 // https://gcc.gnu.org/gcc-8/changes.html
 #if !defined(__clang_major__) && (__GNUC__ >= 8)

From 0a697f6ff4c2f8254e95519e04708cf406009dc3 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 1 May 2025 07:42:38 +0000
Subject: [PATCH 223/901] 8344708: Implement JEP 511: Module Import
 Declarations

Reviewed-by: mcimadamore, vromero, alanb
---
 .../jdk/internal/javac/PreviewFeature.java    |   3 +-
 .../jdk/internal/module/ModuleInfo.java       |  22 +---
 .../com/sun/source/tree/ImportTree.java       |   6 +-
 .../com/sun/tools/javac/code/Preview.java     |   6 +-
 .../com/sun/tools/javac/code/Source.java      |   4 +-
 .../com/sun/tools/javac/jvm/ClassReader.java  |   5 -
 .../jdk/internal/jshell/tool/JShellTool.java  |  25 +++-
 .../jdk/internal/jshell/tool/Startup.java     |  97 +++++++++-----
 .../share/classes/jdk/jshell/Snippet.java     |   4 +-
 .../share/classes/jdk/jshell/SnippetMaps.java |  49 +++++++
 .../jdk/jshell/tool/resources/DEFAULT.jsh     |  11 +-
 .../resources/DEFAULT_NO_MODULE_IMPORTS.jsh   |  10 ++
 .../lang/module/ClassFileVersionsTest.java    |   2 +-
 .../lang/module/ModuleDescriptorTest.java     |   2 -
 .../langtools/jdk/jshell/ReplToolTesting.java |  15 +--
 .../langtools/jdk/jshell/StartOptionTest.java | 124 +++++++++++++++++-
 .../jdk/jshell/ToolCommandOptionTest.java     |   4 +-
 .../jdk/jshell/ToolEnablePreviewTest.java     |  15 ++-
 .../jdk/jshell/ToolLocalSimpleTest.java       |   2 +-
 .../jdk/jshell/ToolProviderTest.java          |  12 +-
 test/langtools/jdk/jshell/ToolSimpleTest.java |  19 ++-
 test/langtools/tools/javac/ImportModule.java  |  96 ++++----------
 .../javac/diags/examples/ImportModule.java    |   4 +-
 .../ImportModuleDoesNotRead/module-info.java  |   4 +-
 .../ImportModuleDoesNotReadUnnamed.java       |   4 +-
 .../diags/examples/ImportModuleNotFound.java  |   3 -
 .../ModifierNotAllowed/module-info.java       |   3 +-
 .../javac/modules/AnnotationsOnModules.java   |   4 +-
 .../modules/ConvenientAccessErrorsTest.java   |   3 -
 .../tools/javac/modules/EdgeCases.java        |   5 +-
 .../tools/javac/modules/JavaBaseTest.java     |  10 +-
 .../tools/jdeps/listdeps/ListModuleDeps.java  |   1 -
 32 files changed, 358 insertions(+), 216 deletions(-)
 create mode 100644 src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT_NO_MODULE_IMPORTS.jsh

diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 2ed6dde794a..6455664b985 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -76,8 +76,7 @@ public enum Feature {
         STRUCTURED_CONCURRENCY,
         CLASSFILE_API,
         STREAM_GATHERERS,
-        @JEP(number=494, title="Module Import Declarations", status="Second Preview")
-        MODULE_IMPORTS,
+        MODULE_IMPORTS, //remove when the boot JDK is JDK 25
         @JEP(number=478, title="Key Derivation Function API", status="Preview")
         KEY_DERIVATION,
         @JEP(number = 502, title = "Stable Values", status = "Preview")
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
index ff3ffada22a..ed97937e39a 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
@@ -408,24 +408,10 @@ private Builder readModuleAttribute(DataInput in, ConstantPool cpool, int major,
                     throw invalidModuleDescriptor("The requires entry for java.base"
                                                   + " has ACC_SYNTHETIC set");
                 }
-                // requires transitive java.base is illegal unless:
-                // - the major version is 53 (JDK 9), or:
-                // - the classfile is a preview classfile, or:
-                // - the module is deemed to be participating in preview
-                //   (i.e. the module is a java.* module)
-                // requires static java.base is illegal unless:
-                // - the major version is 53 (JDK 9), or:
-                if (major >= 54
-                    && ((mods.contains(Requires.Modifier.TRANSITIVE)
-                         && !isPreview
-                         && !"java.se".equals(mn))
-                        || mods.contains(Requires.Modifier.STATIC))) {
-                    String flagName;
-                    if (mods.contains(Requires.Modifier.STATIC)) {
-                        flagName = "ACC_STATIC_PHASE";
-                    } else {
-                        flagName = "ACC_TRANSITIVE";
-                    }
+                // requires static java.base is illegal unless
+                // the major version is 53 (JDK 9)
+                if (major >= 54 && mods.contains(Requires.Modifier.STATIC)) {
+                    String flagName = "ACC_STATIC_PHASE";
                     throw invalidModuleDescriptor("The requires entry for java.base"
                                                   + " has " + flagName + " set");
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
index 83a6c3eb87b..ac4dc6258ac 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/ImportTree.java
@@ -25,8 +25,6 @@
 
 package com.sun.source.tree;
 
-import jdk.internal.javac.PreviewFeature;
-
 /**
  * A tree node for an import declaration.
  *
@@ -49,11 +47,11 @@ public interface ImportTree extends Tree {
      * @return true if this is a static import
      */
     boolean isStatic();
+
     /**
      * {@return true if this is an module import declaration.}
-     * @since 23
+     * @since 25
      */
-    @PreviewFeature(feature=PreviewFeature.Feature.MODULE_IMPORTS, reflective=true)
     boolean isModule();
 
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 9d7b1e65352..325274782ef 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -153,9 +153,7 @@ public boolean participatesInPreview(Symtab syms, ModuleSymbol m) {
         // s participates in the preview API
         return syms.java_base.exports.stream()
                 .filter(ed -> ed.packge.fullname == names.jdk_internal_javac)
-                .anyMatch(ed -> ed.modules.contains(m)) ||
-               //the specification lists the java.se module as participating in preview:
-               m.name == names.java_se;
+                .anyMatch(ed -> ed.modules.contains(m));
     }
 
     /**
@@ -231,8 +229,6 @@ public boolean isPreview(Feature feature) {
             case IMPLICIT_CLASSES -> true;
             case FLEXIBLE_CONSTRUCTORS -> true;
             case PRIMITIVE_PATTERNS -> true;
-            case MODULE_IMPORTS -> true;
-            case JAVA_BASE_TRANSITIVE -> true;
             //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
             //When real preview features will be added, this method can be implemented to return 'true'
             //for those selected features, and 'false' for all the others.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index f1c25d032d0..eed0ceaade0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -267,8 +267,8 @@ public enum Feature {
         UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
         PRIMITIVE_PATTERNS(JDK23, Fragments.FeaturePrimitivePatterns, DiagKind.PLURAL),
         FLEXIBLE_CONSTRUCTORS(JDK22, Fragments.FeatureFlexibleConstructors, DiagKind.NORMAL),
-        MODULE_IMPORTS(JDK23, Fragments.FeatureModuleImports, DiagKind.PLURAL),
-        JAVA_BASE_TRANSITIVE(JDK24, Fragments.FeatureJavaBaseTransitive, DiagKind.PLURAL),
+        MODULE_IMPORTS(JDK25, Fragments.FeatureModuleImports, DiagKind.PLURAL),
+        JAVA_BASE_TRANSITIVE(JDK25, Fragments.FeatureJavaBaseTransitive, DiagKind.PLURAL),
         PRIVATE_MEMBERS_IN_PERMITS_CLAUSE(JDK19),
         ERASE_POLY_SIG_RETURN_TYPE(JDK24),
         ;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 6f55903f489..0173ab109d7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1202,11 +1202,6 @@ protected void read(Symbol sym, int attrLen) {
                             ModuleSymbol rsym = poolReader.getModule(nextChar());
                             Set<RequiresFlag> flags = readRequiresFlags(nextChar());
                             if (rsym == syms.java_base && majorVersion >= V54.major) {
-                                if (flags.contains(RequiresFlag.TRANSITIVE) &&
-                                    (majorVersion != Version.MAX().major || !previewClassFile) &&
-                                    !preview.participatesInPreview(syms, msym)) {
-                                    throw badClassFile("bad.requires.flag", RequiresFlag.TRANSITIVE);
-                                }
                                 if (flags.contains(RequiresFlag.STATIC_PHASE)) {
                                     throw badClassFile("bad.requires.flag", RequiresFlag.STATIC_PHASE);
                                 }
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 1317a036982..802a75dc891 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -131,6 +131,7 @@
 import static jdk.jshell.Snippet.SubKind.TEMP_VAR_EXPRESSION_SUBKIND;
 import static jdk.jshell.Snippet.SubKind.VAR_VALUE_SUBKIND;
 import static java.util.stream.Collectors.toMap;
+import javax.lang.model.SourceVersion;
 import static jdk.internal.jshell.debug.InternalDebugControl.DBG_COMPA;
 import static jdk.internal.jshell.debug.InternalDebugControl.DBG_DEP;
 import static jdk.internal.jshell.debug.InternalDebugControl.DBG_EVNT;
@@ -642,7 +643,10 @@ Options parse(OptionSet options) {
             } else {
                 String packedStartup = prefs.get(STARTUP_KEY);
                 boolean preview = previewEnabled(options);
-                initialStartup = Startup.unpack(packedStartup, preview, new InitMessageHandler());
+                String sourceLevel = detectSourceLevel(options.valuesOf(argC)
+                                                              .toArray(String[]::new));
+                initialStartup = Startup.unpack(packedStartup, sourceLevel,
+                                                preview, new InitMessageHandler());
             }
             if (options.has(argExecution)) {
                 executionControlSpec = options.valueOf(argExecution);
@@ -2311,7 +2315,8 @@ boolean setStart(ArgTokenizer at) {
             }
         } else if (defaultOption) {
             boolean preview = options.hasOption(OptionKind.ENABLE_PREVIEW);
-            startup = Startup.defaultStartup(preview, this);
+            String sourceLevel = detectSourceLevel(options.compilerOptions());
+            startup = Startup.defaultStartup(sourceLevel, preview, this);
         } else if (noneOption) {
             startup = Startup.noStartup();
         }
@@ -2329,7 +2334,8 @@ void showSetStart() {
         String retained = prefs.get(STARTUP_KEY);
         if (retained != null) {
             boolean preview = options.hasOption(OptionKind.ENABLE_PREVIEW);
-            Startup retainedStart = Startup.unpack(retained, preview, this);
+            String sourceLevel = detectSourceLevel(options.compilerOptions());
+            Startup retainedStart = Startup.unpack(retained, sourceLevel, preview, this);
             boolean currentDifferent = !startup.equals(retainedStart);
             sb.append(retainedStart.show(true));
             if (currentDifferent) {
@@ -2346,6 +2352,19 @@ void showSetStart() {
         hard(escape(sb));
     }
 
+    private String detectSourceLevel(String[] compilerOptions) {
+        for (int i = 0; i < compilerOptions.length; i++) {
+            switch (compilerOptions[i]) {
+                case "-source", "--source", "--release":
+                    if (i + 1 < compilerOptions.length) {
+                        return compilerOptions[i + 1];
+                    }
+            }
+        }
+
+        return Integer.toString(SourceVersion.latest().runtimeVersion().feature());
+    }
+
     private void showIndent() {
         hard("/set indent %s", indent());
     }
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
index 53c31c3568d..f2472ee5623 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Startup.java
@@ -25,6 +25,8 @@
 
 package jdk.internal.jshell.tool;
 
+import com.sun.tools.javac.code.Source;
+import com.sun.tools.javac.code.Source.Feature;
 import java.nio.file.AccessDeniedException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -32,8 +34,11 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import static java.util.stream.Collectors.joining;
 import static jdk.internal.jshell.tool.JShellTool.RECORD_SEPARATOR;
@@ -118,13 +123,10 @@ public boolean equals(Object o) {
     }
 
     private static final String DEFAULT_STARTUP_NAME = "DEFAULT";
-    private static final String PREVIEW_DEFAULT_STARTUP_NAME = "PREVIEW_DEFAULT";
 
     // cached DEFAULT start-up
-    private static Startup[] defaultStartup = new Startup[] {
-        null, //standard startup
-        null  //preview  startup
-    };
+    private static Map<DefaultStartupType, Startup> defaultStartup =
+            new EnumMap<>(DefaultStartupType.class);
 
     // the list of entries
     private List<StartupEntry> entries;
@@ -170,8 +172,10 @@ boolean isEmpty() {
     boolean isDefault() {
         if (entries.size() == 1) {
             StartupEntry sue = entries.get(0);
-            if (sue.isBuiltIn && (sue.name.equals(DEFAULT_STARTUP_NAME) ||
-                                  sue.name.equals(PREVIEW_DEFAULT_STARTUP_NAME))) {
+            if (sue.isBuiltIn &&
+                Arrays.stream(DefaultStartupType.values())
+                      .map(DefaultStartupType::getResourceName)
+                      .anyMatch(sue.name::equals)) {
                 return true;
             }
         }
@@ -222,7 +226,7 @@ String showDetail() {
      * @param mh handler for error messages
      * @return Startup, or default startup when error (message has been printed)
      */
-    static Startup unpack(String storedForm, boolean preview, MessageHandler mh) {
+    static Startup unpack(String storedForm, String sourceLevel, boolean preview, MessageHandler mh) {
         if (storedForm != null) {
             if (storedForm.isEmpty()) {
                 return noStartup();
@@ -243,14 +247,18 @@ static Startup unpack(String storedForm, boolean preview, MessageHandler mh) {
                         String name = all[i + 1];
                         String timeStamp = all[i + 2];
                         String content = all[i + 3];
-                        if (isBuiltIn) {
-                            // update to current definition, use stored if removed/error
-                            String resource = getResource(name);
-                            if (resource != null) {
-                                content = resource;
+                        if (isBuiltIn && DEFAULT_STARTUP_NAME.equals(name)) {
+                            e.addAll(defaultStartup(sourceLevel, preview, mh).entries);
+                        } else {
+                            if (isBuiltIn) {
+                                // update to current definition, use stored if removed/error
+                                String resource = getResource(name);
+                                if (resource != null) {
+                                    content = resource;
+                                }
                             }
+                            e.add(new StartupEntry(isBuiltIn, name, content, timeStamp));
                         }
-                        e.add(new StartupEntry(isBuiltIn, name, content, timeStamp));
                     }
                     return new Startup(e);
                 } else {
@@ -260,7 +268,7 @@ static Startup unpack(String storedForm, boolean preview, MessageHandler mh) {
                 mh.errormsg("jshell.err.corrupted.stored.startup", ex.getMessage());
             }
         }
-        return defaultStartup(preview, mh);
+        return defaultStartup(sourceLevel, preview, mh);
     }
 
     /**
@@ -329,26 +337,49 @@ static Startup noStartup() {
      * @param mh handler for error messages
      * @return The default Startup, or empty startup when error (message has been printed)
      */
-    static Startup defaultStartup(boolean preview, MessageHandler mh) {
-        int idx = preview ? 1 : 0;
+    static Startup defaultStartup(String sourceLevel, boolean preview, MessageHandler mh) {
+        Source source = Source.lookup(sourceLevel);
+        DefaultStartupType type;
+        if (preview) {
+            type = DefaultStartupType.PREVIEW_DEFAULT_STARTUP;
+        } else if (source == null ||
+                   Feature.MODULE_IMPORTS.allowedInSource(source)) {
+            type = DefaultStartupType.DEFAULT_STARTUP;
+        } else {
+            type = DefaultStartupType.DEFAULT_STARTUP_NO_MODULE_IMPORTS;
+        }
+
+        return defaultStartup.computeIfAbsent(type, t -> {
+            String resourceName = t.getResourceName();
+
+            try {
+                String content = readResource(resourceName);
+                return new Startup(
+                        new StartupEntry(true, DEFAULT_STARTUP_NAME, content));
+            } catch (AccessDeniedException e) {
+                mh.errormsg("jshell.err.file.not.accessible", "jshell", resourceName, e.getMessage());
+            } catch (NoSuchFileException e) {
+                mh.errormsg("jshell.err.file.not.found", "jshell", resourceName);
+            } catch (Exception e) {
+                mh.errormsg("jshell.err.file.exception", "jshell", resourceName, e);
+            }
+            return noStartup();
+        });
+    }
+
+    private enum DefaultStartupType {
+        DEFAULT_STARTUP("DEFAULT"),
+        DEFAULT_STARTUP_NO_MODULE_IMPORTS("DEFAULT_NO_MODULE_IMPORTS"),
+        PREVIEW_DEFAULT_STARTUP("PREVIEW_DEFAULT");
 
-        if (defaultStartup[idx] != null) {
-            return defaultStartup[idx];
+        private final String resourceName;
+
+        private DefaultStartupType(String resourceName) {
+            this.resourceName = resourceName;
         }
-        String resourceName = preview ? PREVIEW_DEFAULT_STARTUP_NAME
-                                      : DEFAULT_STARTUP_NAME;
-        try {
-            String content = readResource(resourceName);
-            return defaultStartup[idx] = new Startup(
-                    new StartupEntry(true, resourceName, content));
-        } catch (AccessDeniedException e) {
-            mh.errormsg("jshell.err.file.not.accessible", "jshell", resourceName, e.getMessage());
-        } catch (NoSuchFileException e) {
-            mh.errormsg("jshell.err.file.not.found", "jshell", resourceName);
-        } catch (Exception e) {
-            mh.errormsg("jshell.err.file.exception", "jshell", resourceName, e);
+
+        public String getResourceName() {
+            return resourceName;
         }
-        return defaultStartup[idx] = noStartup();
     }
-
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index 4e72fed10fc..8e5971bedf8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -28,7 +28,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import jdk.internal.javac.PreviewFeature;
 
 /**
  * A Snippet represents a snippet of Java source code as passed to
@@ -219,9 +218,8 @@ public enum SubKind {
          * Import Module Declaration.
          * An import declaration of a module.
          * @jls 7.5.5 Import Module Declarations
-         * @since 23
+         * @since 25
          */
-        @PreviewFeature(feature=PreviewFeature.Feature.MODULE_IMPORTS, reflective=true)
         MODULE_IMPORT_SUBKIND(Kind.IMPORT),
 
         /**
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
index da3170e3948..bd0c9d86db3 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SnippetMaps.java
@@ -36,6 +36,13 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.stream.Stream;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.ModuleElement.ExportsDirective;
+import javax.lang.model.element.ModuleElement.RequiresDirective;
+import javax.lang.model.util.ElementFilter;
+
+import jdk.jshell.Snippet.SubKind;
+import jdk.jshell.TaskFactory.AnalyzeTask;
 
 import static jdk.jshell.Util.PREFIX_PATTERN;
 import static jdk.jshell.Util.REPL_PACKAGE;
@@ -51,6 +58,7 @@ final class SnippetMaps {
     private final List<Snippet> keyIndexToSnippet = new ArrayList<>();
     private final Set<Snippet> snippets = new LinkedHashSet<>();
     private final Map<String, Set<Integer>> dependencies = new HashMap<>();
+    private final Map<String, Set<String>> module2PackagesForImport = new HashMap<>();
     private final JShell state;
 
     SnippetMaps(JShell proc) {
@@ -186,6 +194,13 @@ String fullClassNameAndPackageToClass(String full, String pkg) {
         if (Stream.concat(Stream.of("java.lang"), pkgs).anyMatch(pkg::equals)) {
             return full.substring(pkg.length() + 1);
         }
+        Stream<String> modPkgs = importSnippets()
+                                   .filter(isi -> isi.subKind() == SubKind.MODULE_IMPORT_SUBKIND)
+                                   .map(isi -> isi.fullname)
+                                   .flatMap(this::module2PackagesForImport);
+        if (modPkgs.anyMatch(pkg::equals)) {
+            return full.substring(pkg.length() + 1);
+        }
         return full;
     }
 
@@ -198,4 +213,38 @@ private Stream<ImportSnippet> importSnippets() {
                 .map(key -> (ImportSnippet)getSnippet(key))
                 .filter(sn -> sn != null && state.status(sn).isDefined());
     }
+
+    private Stream<String> module2PackagesForImport(String module) {
+        return module2PackagesForImport.computeIfAbsent(module, mod -> {
+            return state.taskFactory
+                        .analyze(new OuterWrap(Wrap.identityWrap(" ")),
+                                 at -> computeImports(at, mod));
+        }).stream();
+    }
+
+    private Set<String> computeImports(AnalyzeTask at, String mod) {
+        List<ModuleElement> todo = new ArrayList<>();
+        Set<ModuleElement> seenModules = new HashSet<>();
+        Set<String> exportedPackages = new HashSet<>();
+        todo.add(at.getElements().getModuleElement(mod));
+        while (!todo.isEmpty()) {
+            ModuleElement current = todo.remove(todo.size() - 1);
+            if (current == null || !seenModules.add(current)) {
+                continue;
+            }
+            for (ExportsDirective exp : ElementFilter.exportsIn(current.getDirectives())) {
+                if (exp.getTargetModules() != null) {
+                    continue;
+                }
+                exportedPackages.add(exp.getPackage().getQualifiedName().toString());
+            }
+            for (RequiresDirective req : ElementFilter.requiresIn(current.getDirectives())) {
+                if (!req.isTransitive()) {
+                    continue;
+                }
+                todo.add(req.getDependency());
+            }
+        }
+        return exportedPackages;
+    }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh
index b65aada014a..4644ac86386 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh
+++ b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT.jsh
@@ -1,10 +1 @@
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.nio.file.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.function.*;
-import java.util.prefs.*;
-import java.util.regex.*;
-import java.util.stream.*;
+import module java.base;
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT_NO_MODULE_IMPORTS.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT_NO_MODULE_IMPORTS.jsh
new file mode 100644
index 00000000000..b65aada014a
--- /dev/null
+++ b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/DEFAULT_NO_MODULE_IMPORTS.jsh
@@ -0,0 +1,10 @@
+import java.io.*;
+import java.math.*;
+import java.net.*;
+import java.nio.file.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.prefs.*;
+import java.util.regex.*;
+import java.util.stream.*;
diff --git a/test/jdk/java/lang/module/ClassFileVersionsTest.java b/test/jdk/java/lang/module/ClassFileVersionsTest.java
index 9e22c45d5c5..308df36b81d 100644
--- a/test/jdk/java/lang/module/ClassFileVersionsTest.java
+++ b/test/jdk/java/lang/module/ClassFileVersionsTest.java
@@ -78,6 +78,7 @@ public Object[][] supported() {
         // for JDK 10 through FEATURE.
         for (int i = 10; i <= FEATURE; i++) {
             result.add(new Object[]{ 44 + i, 0, Set.of()});
+            result.add(new Object[]{ 44 + i, 0, Set.of(TRANSITIVE)});
         }
 
         result.add(new Object[]{ 44 + FEATURE,
@@ -110,7 +111,6 @@ public Object[][] unsupported() {
         for (int i = 10; i <= FEATURE ; i++) {
             // Major class file version of JDK N is 44+n
             result.add(new Object[]{i + 44, 0, Set.of(STATIC)});
-            result.add(new Object[]{i + 44, 0, Set.of(TRANSITIVE)});
             result.add(new Object[]{i + 44, 0, Set.of(STATIC, TRANSITIVE)});
         }
 
diff --git a/test/jdk/java/lang/module/ModuleDescriptorTest.java b/test/jdk/java/lang/module/ModuleDescriptorTest.java
index bf379570f51..fd7d32cc978 100644
--- a/test/jdk/java/lang/module/ModuleDescriptorTest.java
+++ b/test/jdk/java/lang/module/ModuleDescriptorTest.java
@@ -1523,7 +1523,6 @@ public void testToString() {
         assertTrue(s.contains("p1"));
     }
 
-    @Test(expectedExceptions = InvalidModuleDescriptorException.class)
     public void testRequiresTransitiveJavaBaseNotPermitted1() throws Exception {
         ModuleDescriptor descriptor = ModuleDescriptor.newModule("foo")
                 .requires(Set.of(Modifier.TRANSITIVE), "java.base")
@@ -1536,7 +1535,6 @@ public void testRequiresTransitiveJavaBaseNotPermitted1() throws Exception {
         ModuleDescriptor.read(bb, () -> Set.of("p", "q"));
     }
 
-    @Test(expectedExceptions = InvalidModuleDescriptorException.class)
     public void testRequiresTransitiveJavaBaseNotPermitted2() throws Exception {
         ModuleDescriptor descriptor = ModuleDescriptor.newModule("foo")
                 .requires(Set.of(Modifier.TRANSITIVE), "java.base")
diff --git a/test/langtools/jdk/jshell/ReplToolTesting.java b/test/langtools/jdk/jshell/ReplToolTesting.java
index d08c1008386..8bfae2fc390 100644
--- a/test/langtools/jdk/jshell/ReplToolTesting.java
+++ b/test/langtools/jdk/jshell/ReplToolTesting.java
@@ -57,19 +57,8 @@
 public class ReplToolTesting {
 
     private final static String DEFAULT_STARTUP_MESSAGE = "|  Welcome to";
-    final static List<ImportInfo> START_UP_IMPORTS = Stream.of(
-                    "java.io.*",
-                    "java.math.*",
-                    "java.net.*",
-                    "java.nio.file.*",
-                    "java.util.*",
-                    "java.util.concurrent.*",
-                    "java.util.function.*",
-                    "java.util.prefs.*",
-                    "java.util.regex.*",
-                    "java.util.stream.*")
-                    .map(s -> new ImportInfo("import " + s + ";", "", s))
-                    .collect(toList());
+    final static List<ImportInfo> START_UP_IMPORTS = List.of(
+            new ImportInfo("import module java.base;", "", "java.base"));
     final static List<MethodInfo> START_UP_METHODS = Stream.<MethodInfo>of()
                     .collect(toList());
     final static List<String> START_UP_CMD_METHOD = Stream.<String>of()
diff --git a/test/langtools/jdk/jshell/StartOptionTest.java b/test/langtools/jdk/jshell/StartOptionTest.java
index a83a7122cd3..25486d6da6e 100644
--- a/test/langtools/jdk/jshell/StartOptionTest.java
+++ b/test/langtools/jdk/jshell/StartOptionTest.java
@@ -42,6 +42,7 @@
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.function.Consumer;
 
@@ -68,6 +69,7 @@ public class StartOptionTest {
     protected ByteArrayOutputStream userout;
     protected ByteArrayOutputStream usererr;
     protected InputStream cmdInStream;
+    private Map<String, String> testPersistence;
 
     private JavaShellToolBuilder builder() {
         // turn on logging of launch failures
@@ -77,12 +79,23 @@ private JavaShellToolBuilder builder() {
                 .out(new PrintStream(cmdout), new PrintStream(console), new PrintStream(userout))
                 .err(new PrintStream(cmderr), new PrintStream(usererr))
                 .in(cmdInStream, null)
-                .persistence(new HashMap<>())
+                .persistence(getThisTestPersistence())
                 .env(new HashMap<>())
                 .locale(Locale.ROOT);
     }
 
+    protected Map<String, String> getThisTestPersistence() {
+        return testPersistence != null ? testPersistence
+                                       : new HashMap<>();
+    }
+
     protected int runShell(String... args) {
+        cmdout.reset();
+        cmderr.reset();
+        console.reset();
+        userout.reset();
+        usererr.reset();
+
         try {
             return builder()
                     .start(Presets.addExecutionIfMissing(args));
@@ -150,6 +163,17 @@ protected void startCheckUserOutput(Consumer<String> checkUserOutput,
             String... args) {
         runShell(args);
         check(userout, checkUserOutput, "userout");
+        check(cmderr, null, "cmderr");
+        check(usererr, null, "usererr");
+    }
+
+    protected void startCheckCommandUserOutput(Consumer<String> checkCommandOutput,
+            Consumer<String> checkUserOutput,
+            Consumer<String> checkCombinedCommandUserOutput,
+            String... args) {
+        runShell(args);
+        check(cmdout, checkCommandOutput, "cmdout");
+        check(userout, checkUserOutput, "userout");
         check(usererr, null, "usererr");
     }
 
@@ -226,8 +250,12 @@ public void setUp() {
     }
 
     protected String writeToFile(String stuff) {
+        return writeToFile("doit.repl", stuff);
+    }
+
+    protected String writeToFile(String fileName, String stuff) {
         Compiler compiler = new Compiler();
-        Path p = compiler.getPath("doit.repl");
+        Path p = compiler.getPath(fileName);
         compiler.writeToFile(p, stuff);
         return p.toString();
     }
@@ -393,7 +421,7 @@ public void testShowVersion() {
                 "--show-version");
     }
 
-    public void testPreviewEnabled() {
+    public void testSourceLevel() {
         String fn = writeToFile(
                 """
                 System.out.println(\"prefix\");
@@ -401,23 +429,105 @@ public void testPreviewEnabled() {
                 System.out.println(\"suffix\");
                 /exit
                 """);
-        startCheckUserOutput(s -> assertEquals(s, "prefix\nsuffix\n"),
+        startCheckUserOutput(s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
                              fn);
         startCheckUserOutput(s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
                              "--enable-preview", fn);
+        String fn24 = writeToFile(
+                """
+                System.out.println(\"test\");
+                /exit
+                """);
+        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+                             "-C--release", "-C24", fn24);
+        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+                             "-C--source", "-C24", fn24);
+        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+                             "-C-source", "-C24", fn24);
         //JDK-8341631:
         String fn2 = writeToFile(
+                """
+                System.out.println(\"test\");
+                /exit
+                """);
+        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+                             fn2);
+        String fn2Preview = writeToFile(
                 """
                 System.out.println(\"prefix\");
                 IO.println(\"test\");
                 System.out.println(\"suffix\");
                 /exit
                 """);
-        startCheckUserOutput(s -> assertEquals(s, "prefix\nsuffix\n"),
-                             fn2);
         startCheckUserOutput(s -> assertEquals(s, "prefix\ntest\nsuffix\n"),
-                             "--enable-preview", fn2);
+                             "--enable-preview", fn2Preview);
+
+        testPersistence = new HashMap<>();
+
+        String newStartupScript = writeToFile("test-startup.repl",
+                """
+                System.out.println("Custom start script");
+                """);
+        String setStartup = writeToFile(
+                """
+                /set start -retain {file}
+                /exit
+                """.replace("{file}", newStartupScript));
+        startCheckUserOutput(s -> {}, setStartup);
+        String exit = writeToFile(
+                """
+                /exit
+                """);
+        startCheckUserOutput(s -> assertEquals(s, "Custom start script\n"),
+                             exit);
+        String clearStartup = writeToFile(
+                """
+                /set start -retain -default
+                /exit
+                """);
+        startCheckUserOutput(s -> {}, clearStartup);
+        String retainTest = writeToFile(
+                """
+                /set start
+                System.out.println(\"prefix\");
+                System.out.println(MethodHandle.class.getName());
+                System.out.println(\"suffix\");
+                /exit
+                """);
+        startCheckCommandUserOutput(s -> assertEquals(s, "/set start -retain -default\n"),
+                                    s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
+                                    s -> assertEquals(s, "/set start -retain -default\nprefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
+                                    retainTest);
+        String retainTest24 = writeToFile(
+                """
+                System.out.println(\"test\");
+                /exit
+                """);
+        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+                             "-C--release", "-C24", retainTest24);
+
+        String set24DefaultTest = writeToFile(
+                """
+                /set start -default -retain
+                /exit
+                """);
+        startCheckUserOutput(s -> {},
+                             "-C--release", "-C24", set24DefaultTest);
+
+        String checkDefaultAfterSet24Test = writeToFile(
+                """
+                /set start
+                System.out.println(\"prefix\");
+                System.out.println(MethodHandle.class.getName());
+                System.out.println(\"suffix\");
+                /exit
+                """);
+        startCheckCommandUserOutput(s -> assertEquals(s, "/set start -retain -default\n"),
+                                    s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
+                                    s -> assertEquals(s, "/set start -retain -default\nprefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
+                                    checkDefaultAfterSet24Test);
     }
+
     public void testInput() {
         //readLine(String):
         String readLinePrompt = writeToFile(
diff --git a/test/langtools/jdk/jshell/ToolCommandOptionTest.java b/test/langtools/jdk/jshell/ToolCommandOptionTest.java
index ec137a3ec60..affeabacb7a 100644
--- a/test/langtools/jdk/jshell/ToolCommandOptionTest.java
+++ b/test/langtools/jdk/jshell/ToolCommandOptionTest.java
@@ -274,7 +274,7 @@ public void setStartTest() {
                 (a) -> assertCommand(a, "/set start DEFAULT PRINTING",
                         ""),
                 (a) -> assertCommandOutputContains(a, "/set start",
-                        "/set start DEFAULT PRINTING", "void println", "import java.util.*"),
+                        "/set start DEFAULT PRINTING", "void println", "import module java.base;"),
                 (a) -> assertCommand(a, "/set start " + startup.toString(),
                         ""),
                 (a) -> assertCommandOutputContains(a, "/set start",
@@ -333,7 +333,7 @@ public void retainStartTest() {
                         "|  ---- PRINTING ----\n",
                         "|  int iAmHere = 1234;\n",
                         "|  void println(String s)",
-                        "|  import java.io.*;")
+                        "|  import module java.base;")
         );
     }
 
diff --git a/test/langtools/jdk/jshell/ToolEnablePreviewTest.java b/test/langtools/jdk/jshell/ToolEnablePreviewTest.java
index 61a54254455..1825e7b39ad 100644
--- a/test/langtools/jdk/jshell/ToolEnablePreviewTest.java
+++ b/test/langtools/jdk/jshell/ToolEnablePreviewTest.java
@@ -28,6 +28,11 @@
  * @run testng ToolEnablePreviewTest
  */
 
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertTrue;
@@ -70,8 +75,14 @@ public void testCommandLineFlag() {
     }
 
     @Test
-    public void testCompilerTestFlagEnv() {
-        test(new String[] {"-C", "-XDforcePreview"},
+    public void testCompilerTestFlagEnv() throws IOException {
+        Path startupFile = Paths.get("startup.repl");
+        try (Writer w = Files.newBufferedWriter(startupFile)) {
+            w.write("""
+                    import java.util.function.*;
+                    """);
+        }
+        test(new String[] {"-C", "-XDforcePreview", "-startup", startupFile.toString()},
                 (a) -> assertCommandOutputContains(a, "Function<Integer,Integer> f = (var i) -> i + i",
                         "Error", "preview feature"),
                 (a) -> assertCommand(a, "/env --enable-preview",
diff --git a/test/langtools/jdk/jshell/ToolLocalSimpleTest.java b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java
index 6221f295103..bb6f4588968 100644
--- a/test/langtools/jdk/jshell/ToolLocalSimpleTest.java
+++ b/test/langtools/jdk/jshell/ToolLocalSimpleTest.java
@@ -73,7 +73,7 @@ public void testOptionR() {
     public void testCompoundStart() {
         test(new String[]{"--startup", "DEFAULT", "--startup", "PRINTING", "--startup", "TOOLING"},
                 (a) -> assertCommandOutputContains(a, "/list -start",
-                        "System.out.println", "import java.util.concurrent", "tools()")
+                        "System.out.println", "import module java.base;", "tools()")
         );
     }
 
diff --git a/test/langtools/jdk/jshell/ToolProviderTest.java b/test/langtools/jdk/jshell/ToolProviderTest.java
index 8fad066bc87..79bc1528a83 100644
--- a/test/langtools/jdk/jshell/ToolProviderTest.java
+++ b/test/langtools/jdk/jshell/ToolProviderTest.java
@@ -72,11 +72,21 @@ protected void startCheckUserOutput(Consumer<String> checkUserOutput, String...
         check(usererr, null, "usererr");
     }
 
+    @Override
+    protected void startCheckCommandUserOutput(Consumer<String> checkCommandOutput,
+            Consumer<String> checkUserOutput,
+            Consumer<String> checkCombinedCommandUserOutput,
+            String... args) {
+        runShell(args);
+        check(cmdout, checkCombinedCommandUserOutput, "userout");
+        check(usererr, null, "usererr");
+    }
+
     @Override
     protected int runShell(String... args) {
         //make sure the JShell running during the test is not using persisted preferences from the machine:
         Function<JavaShellToolBuilder, JavaShellToolBuilder> prevAugmentedToolBuilder =
-                getAndSetAugmentedToolBuilder(builder -> builder.persistence(new HashMap<>()));
+                getAndSetAugmentedToolBuilder(builder -> builder.persistence(getThisTestPersistence()));
         try {
             ServiceLoader<Tool> sl = ServiceLoader.load(Tool.class);
             for (Tool provider : sl) {
diff --git a/test/langtools/jdk/jshell/ToolSimpleTest.java b/test/langtools/jdk/jshell/ToolSimpleTest.java
index 81f75a3863e..62ea2451fb4 100644
--- a/test/langtools/jdk/jshell/ToolSimpleTest.java
+++ b/test/langtools/jdk/jshell/ToolSimpleTest.java
@@ -33,6 +33,7 @@
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
  *          jdk.jshell/jdk.internal.jshell.tool
+ *          java.desktop
  * @build KullaTesting TestingInputStream
  * @run testng ToolSimpleTest
  */
@@ -566,11 +567,11 @@ public void testListArgs() {
                         s -> checkLineToList(s, START_UP)),
                 a -> assertCommandCheckOutput(a, "/list -all",
                         s -> checkLineToList(s, startVarList)),
-                a -> assertCommandOutputStartsWith(a, "/list s3",
-                        "s3 : import"),
-                a -> assertCommandCheckOutput(a, "/list 1-2 s3",
+                a -> assertCommandOutputStartsWith(a, "/list s1",
+                        "s1 : import"),
+                a -> assertCommandCheckOutput(a, "/list 1-2 s1",
                         s -> {
-                            assertTrue(Pattern.matches(".*aardvark.*\\R.*weevil.*\\R.*s3.*import.*", s.trim()),
+                            assertTrue(Pattern.matches(".*aardvark.*\\R.*weevil.*\\R.*s1.*import.*", s.trim()),
                                     "No match: " + s);
                         }),
                 a -> assertCommandOutputStartsWith(a, "/list " + arg,
@@ -977,4 +978,14 @@ public void testSelfReference() {
                 (a) -> assertCommandOutputContains(a, "var a = a;", "cannot use 'var' on self-referencing variable")
         );
     }
+
+    @Test
+    public void testModuleImportShortenedTypes() {
+        test(
+                (a) -> assertCommandOutputContains(a, "import module java.desktop;", ""),
+                (a) -> assertCommandOutputContains(a, "var r1 = new JButton()", ""),
+                (a) -> assertCommandOutputContains(a, "/vars r1", "|    JButton r1 =")
+        );
+    }
+
 }
diff --git a/test/langtools/tools/javac/ImportModule.java b/test/langtools/tools/javac/ImportModule.java
index a53bc92f1b0..f088dbef658 100644
--- a/test/langtools/tools/javac/ImportModule.java
+++ b/test/langtools/tools/javac/ImportModule.java
@@ -92,7 +92,6 @@ public static void main(String... args) {
 
         {//with --release:
             new JavacTask(tb)
-                .options("--enable-preview", "--release", SOURCE_VERSION)
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.SUCCESS)
@@ -101,7 +100,6 @@ public static void main(String... args) {
             var out = new JavaTask(tb)
                     .classpath(classes.toString())
                     .className("test.Test")
-                    .vmOptions("--enable-preview")
                     .run()
                     .writeAll()
                     .getOutputLines(Task.OutputKind.STDOUT);
@@ -117,7 +115,6 @@ public static void main(String... args) {
 
         {//with --source:
             new JavacTask(tb)
-                .options("--enable-preview", "--source", SOURCE_VERSION)
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.SUCCESS)
@@ -126,7 +123,6 @@ public static void main(String... args) {
             var out = new JavaTask(tb)
                     .classpath(classes.toString())
                     .className("test.Test")
-                    .vmOptions("--enable-preview")
                     .run()
                     .writeAll()
                     .getOutputLines(Task.OutputKind.STDOUT);
@@ -161,7 +157,7 @@ public class Test {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--release", "21", "-XDrawDiagnostics")
+                    .options("--release", "24", "-XDrawDiagnostics")
                     .outdir(classes)
                     .files(tb.findJavaFiles(src))
                     .run(Task.Expect.FAIL)
@@ -169,34 +165,22 @@ public class Test {
                     .getOutputLines(Task.OutputKind.DIRECT);
 
         expectedErrors = List.of(
-                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
+                "Test.java:2:8: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.module.imports), 24, 25",
                 "1 error"
         );
 
         if (!Objects.equals(expectedErrors, actualErrors)) {
             throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
-                                      ", actual: " + out);
+                                      ", actual: " + actualErrors);
 
         }
-        actualErrors =
-                new JavacTask(tb)
-                    .options("-XDrawDiagnostics")
-                    .outdir(classes)
-                    .files(tb.findJavaFiles(src))
-                    .run(Task.Expect.FAIL)
-                    .writeAll()
-                    .getOutputLines(Task.OutputKind.DIRECT);
-
-        expectedErrors = List.of(
-                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
-                "1 error"
-        );
-
-        if (!Objects.equals(expectedErrors, actualErrors)) {
-            throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
-                                      ", actual: " + out);
 
-        }
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics")
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run()
+            .writeAll();
     }
 
     @Test
@@ -220,8 +204,7 @@ public class Test {
         List<String> expectedErrors;
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION,
-                     "-XDrawDiagnostics")
+            .options("-XDrawDiagnostics")
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.SUCCESS)
@@ -240,7 +223,6 @@ public class Test {
                           """);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run()
@@ -258,7 +240,6 @@ public class Test {
                           """);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run()
@@ -274,7 +255,6 @@ public class Test {
                           """);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run()
@@ -292,8 +272,7 @@ public class Test {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--enable-preview", "--release", SOURCE_VERSION,
-                             "-XDrawDiagnostics")
+                    .options("-XDrawDiagnostics")
                     .outdir(classes)
                     .files(tb.findJavaFiles(src))
                     .run(Task.Expect.FAIL)
@@ -302,8 +281,6 @@ public class Test {
 
         expectedErrors = List.of(
                 "Test.java:5:5: compiler.err.ref.ambiguous: Date, kindname.class, java.sql.Date, java.sql, kindname.class, java.util.Date, java.util",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "1 error"
         );
 
@@ -325,7 +302,6 @@ public class Test {
                           """);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run()
@@ -387,8 +363,7 @@ public static void main(String... args) {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--enable-preview", "--release", SOURCE_VERSION,
-                             "-p", libClasses.toString(),
+                    .options("-p", libClasses.toString(),
                              "--add-modules", "lib",
                              "-XDrawDiagnostics")
                     .outdir(classes)
@@ -399,8 +374,6 @@ public static void main(String... args) {
 
         expectedErrors = List.of(
                 "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "1 error"
         );
 
@@ -412,8 +385,7 @@ public static void main(String... args) {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--enable-preview", "--release", SOURCE_VERSION,
-                             "-p", libClasses.toString(),
+                    .options("-p", libClasses.toString(),
                              "-XDdev",
                              "-XDrawDiagnostics")
                     .outdir(classes)
@@ -425,8 +397,6 @@ public static void main(String... args) {
         expectedErrors = List.of(
                 "Test.java:2:1: compiler.err.import.module.does.not.read.unnamed: lib",
                 "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "2 errors"
         );
 
@@ -444,8 +414,7 @@ public static void main(String... args) {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--enable-preview", "--release", SOURCE_VERSION,
-                             "-p", libClasses.toString(),
+                    .options("-p", libClasses.toString(),
                              "-XDdev",
                              "-XDrawDiagnostics")
                     .outdir(classes)
@@ -457,8 +426,6 @@ public static void main(String... args) {
         expectedErrors = List.of(
                 "Test.java:2:1: compiler.err.import.module.does.not.read: test.module, lib",
                 "Test.java:6:9: compiler.err.cant.resolve.location: kindname.class, Impl, , , (compiler.misc.location: kindname.class, test.Test, null)",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "2 errors"
         );
 
@@ -539,8 +506,7 @@ public class Impl2 {
         Files.createDirectories(libClasses);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION,
-                     "--module-source-path", libSrc.toString(),
+            .options("--module-source-path", libSrc.toString(),
                      "-XDrawDiagnostics")
             .outdir(libClasses)
             .files(tb.findJavaFiles(libSrc))
@@ -591,8 +557,7 @@ public class Test2 {
 
         actualErrors =
                 new JavacTask(tb)
-                    .options("--enable-preview", "--release", SOURCE_VERSION,
-                             "--module-path", libClasses.toString(),
+                    .options("--module-path", libClasses.toString(),
                              "-XDrawDiagnostics")
                     .outdir(classes)
                     .files(tb.findJavaFiles(src))
@@ -611,8 +576,6 @@ public class Test2 {
                 "Test2.java:7:5: compiler.err.cant.resolve.location: kindname.class, Impl1, , , (compiler.misc.location: kindname.class, test.Test2, null)",
                 "Test2.java:10:5: compiler.err.cant.resolve.location: kindname.class, Api6, , , (compiler.misc.location: kindname.class, test.Test2, null)",
                 "Test2.java:11:5: compiler.err.cant.resolve.location: kindname.class, Impl2, , , (compiler.misc.location: kindname.class, test.Test2, null)",
-                "- compiler.note.preview.plural: DEFAULT",
-                "- compiler.note.preview.recompile",
                 "10 errors"
         );
 
@@ -640,7 +603,6 @@ public class Test {
         List<String> kinds = new ArrayList<>();
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .callback(task -> {
                 task.addTaskListener(new TaskListener() {
@@ -699,7 +661,6 @@ public class ModuleModuleClass {
         List<String> kinds = new ArrayList<>();
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.SUCCESS)
@@ -721,7 +682,7 @@ void main() {
         Files.createDirectories(classes);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
+            .options("--enable-preview", "--release", SOURCE_VERSION) //for implicitly declared classes
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.SUCCESS)
@@ -761,8 +722,7 @@ public class C {}
         Files.createDirectories(classes);
 
         List<String> actualErrors = new JavacTask(tb)
-                .options("-XDrawDiagnostics",
-                        "--enable-preview", "--release", SOURCE_VERSION)
+                .options("-XDrawDiagnostics")
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -772,8 +732,6 @@ public class C {}
         List<String> expectedErrors = List.of(
                 "module-info.java:3:18: compiler.warn.module.not.found: M1",
                 "module-info.java:6:9: compiler.err.cant.resolve: kindname.class, A, , ",
-                "- compiler.note.preview.filename: module-info.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "1 error",
                 "1 warning"
         );
@@ -816,7 +774,7 @@ public class Test {
                 "- compiler.warn.option.obsolete.source: 8",
                 "- compiler.warn.option.obsolete.target: 8",
                 "- compiler.warn.option.obsolete.suppression",
-                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
+                "Test.java:2:8: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.module.imports), 8, 25",
                 "Test.java:2:1: compiler.err.import.module.not.found: java.base",
                 "Test.java:4:5: compiler.err.cant.resolve.location: kindname.class, List, , , (compiler.misc.location: kindname.class, test.Test, null)",
                 "3 errors",
@@ -825,7 +783,7 @@ public class Test {
 
         if (!Objects.equals(expectedErrors, actualErrors)) {
             throw new AssertionError("Incorrect Output, expected: " + expectedErrors +
-                                      ", actual: " + out);
+                                      ", actual: " + actualErrors);
 
         }
     }
@@ -878,7 +836,6 @@ public class Test {
 
         List<String> actualErrors = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--enable-preview", "--release", SOURCE_VERSION,
                          "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
@@ -888,8 +845,6 @@ public class Test {
 
         List<String> expectedErrors = List.of(
                 "Test.java:5:5: compiler.err.ref.ambiguous: A, kindname.class, mb.p1.A, mb.p1, kindname.class, ma.p1.A, ma.p1",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "1 error"
         );
 
@@ -914,7 +869,6 @@ public class Test {
 
         new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--enable-preview", "--release", SOURCE_VERSION,
                          "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
@@ -1001,7 +955,8 @@ public static void main(String... args) {
         Files.createDirectories(maClasses);
 
         List<String> actualErrors = new JavacTask(tb)
-                .options("-XDrawDiagnostics")
+                .options("-XDrawDiagnostics",
+                         "--release", "24")
                 .outdir(maClasses)
                 .files(tb.findJavaFiles(ma))
                 .run(Task.Expect.FAIL)
@@ -1009,7 +964,7 @@ public static void main(String... args) {
                 .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expectedErrors = List.of(
-                "module-info.java:2:4: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.java.base.transitive)",
+                "module-info.java:2:4: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.java.base.transitive), 24, 25",
                 "1 error"
         );
 
@@ -1034,8 +989,7 @@ public static void main(String... args) {
         }
 
         new JavacTask(tb)
-            .options("-XDrawDiagnostics",
-                     "--enable-preview", "--release", SOURCE_VERSION)
+            .options("-XDrawDiagnostics")
             .outdir(maClasses)
             .files(tb.findJavaFiles(ma))
             .run()
@@ -1043,7 +997,7 @@ public static void main(String... args) {
 
         Path maModuleInfo2 = maClasses.resolve("module-info.class");
 
-        if (ClassFile.of().parse(maModuleInfo2).minorVersion() != ClassFile.PREVIEW_MINOR_VERSION) {
+        if (ClassFile.of().parse(maModuleInfo2).minorVersion() != 0) {
             throw new AssertionError("wrong minor version");
         }
     }
diff --git a/test/langtools/tools/javac/diags/examples/ImportModule.java b/test/langtools/tools/javac/diags/examples/ImportModule.java
index 2a0a39f5fad..f924a59acd4 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModule.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModule.java
@@ -22,8 +22,8 @@
  */
 
  // key: compiler.misc.feature.module.imports
- // key: compiler.warn.preview.feature.use.plural
- // options: --release ${jdk.version} --enable-preview -Xlint:preview
+ // key: compiler.err.feature.not.supported.in.source.plural
+ // options: --release 24 -Xlint:preview
 
 import module java.base;
 
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
index e8f9c952fbc..8c84bc009da 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotRead/module-info.java
@@ -22,7 +22,5 @@
  */
 
 // key: compiler.err.import.module.does.not.read
-// key: compiler.note.preview.filename
-// key: compiler.note.preview.recompile
-// options: --release ${jdk.version} --enable-preview
+
 module m {}
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
index 37ae9673cc8..d25e7593170 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleDoesNotReadUnnamed.java
@@ -22,9 +22,7 @@
  */
 
 // key: compiler.err.import.module.does.not.read.unnamed
-// key: compiler.note.preview.filename
-// key: compiler.note.preview.recompile
-// options: --release ${jdk.version} --enable-preview --limit-modules java.base
+// options: --limit-modules java.base
 
 import module java.compiler;
 
diff --git a/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
index 8a12fc0bd03..7e5f98e1a36 100644
--- a/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
+++ b/test/langtools/tools/javac/diags/examples/ImportModuleNotFound.java
@@ -22,9 +22,6 @@
  */
 
  // key: compiler.err.import.module.not.found
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // options: --release ${jdk.version} --enable-preview
 
 import module unknown;
 
diff --git a/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java b/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java
index 02cb11f5ac2..fd57f81117a 100644
--- a/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java
+++ b/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java
@@ -21,8 +21,9 @@
  * questions.
  */
 
-// key: compiler.err.preview.feature.disabled.plural
+// key: compiler.err.feature.not.supported.in.source.plural
 // key: compiler.misc.feature.java.base.transitive
+// options: --release 24
 
 module m {
      requires transitive java.base;
diff --git a/test/langtools/tools/javac/modules/AnnotationsOnModules.java b/test/langtools/tools/javac/modules/AnnotationsOnModules.java
index 291633b4fb2..6d9bfaad406 100644
--- a/test/langtools/tools/javac/modules/AnnotationsOnModules.java
+++ b/test/langtools/tools/javac/modules/AnnotationsOnModules.java
@@ -755,7 +755,7 @@ public void testBrokenModuleInfoClassWithAnnotation(Path base) throws Exception
                 for (ModuleRequireInfo mri : attr.requires()) {
                     if (mri.requires().name().equalsString("java.base")) {
                         requires.add(ModuleRequireInfo.of(mri.requires(),
-                                                          List.of(AccessFlag.TRANSITIVE),
+                                                          List.of(AccessFlag.STATIC_PHASE),
                                                           mri.requiresVersion()
                                                              .orElse(null)));
                     } else {
@@ -804,7 +804,7 @@ public class C {}
                 .writeAll()
                 .getOutputLines(OutputKind.DIRECT);
         List<String> expectedErrors = List.of(
-            "- compiler.err.cant.access: m.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.bad.requires.flag: ACC_TRANSITIVE (0x0020)))",
+            "- compiler.err.cant.access: m.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.bad.requires.flag: ACC_STATIC_PHASE (0x0040)))",
             "1 error"
         );
 
diff --git a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
index 2958384ae94..d02f7816814 100644
--- a/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
+++ b/test/langtools/tools/javac/modules/ConvenientAccessErrorsTest.java
@@ -448,7 +448,6 @@ public void testInModuleImport(Path base) throws Exception {
 
         List<String> log = new JavacTask(tb)
                 .options("-XDrawDiagnostics",
-                         "--enable-preview", "--source", System.getProperty("java.specification.version"),
                          "--module-source-path", src.toString())
                 .outdir(classes)
                 .files(findJavaFiles(src))
@@ -458,8 +457,6 @@ public void testInModuleImport(Path base) throws Exception {
 
         List<String> expected = Arrays.asList(
                 "Test.java:1:54: compiler.err.cant.resolve.location: kindname.class, Api, , , (compiler.misc.location: kindname.class, test.Test, null)",
-                "- compiler.note.preview.filename: Test.java, DEFAULT",
-                "- compiler.note.preview.recompile",
                 "1 error");
 
         if (!expected.equals(log))
diff --git a/test/langtools/tools/javac/modules/EdgeCases.java b/test/langtools/tools/javac/modules/EdgeCases.java
index a3825d9e3a6..39b72dda03a 100644
--- a/test/langtools/tools/javac/modules/EdgeCases.java
+++ b/test/langtools/tools/javac/modules/EdgeCases.java
@@ -1178,7 +1178,8 @@ public class Test {
 
         log = new JavacTask(tb)
             .outdir(classes)
-            .options("-XDrawDiagnostics", "-XDshould-stop.at=FLOW")
+            .options("-XDrawDiagnostics", "-XDshould-stop.at=FLOW",
+                     "--release", "24")
             .callback(verifyJavaSEDependency(true, seenJavaSEDependency))
             .files(findJavaFiles(src))
             .run(Task.Expect.FAIL)
@@ -1186,7 +1187,7 @@ public class Test {
             .getOutputLines(Task.OutputKind.DIRECT);
 
         List<String> expected = List.of(
-                "Test.java:2:8: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.module.imports)",
+                "Test.java:2:8: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.module.imports), 24, 25",
                 "1 error");
 
         if (!expected.equals(log))
diff --git a/test/langtools/tools/javac/modules/JavaBaseTest.java b/test/langtools/tools/javac/modules/JavaBaseTest.java
index a888c430f53..9c089982c00 100644
--- a/test/langtools/tools/javac/modules/JavaBaseTest.java
+++ b/test/langtools/tools/javac/modules/JavaBaseTest.java
@@ -129,7 +129,7 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
             case "current":
                 options.add("--release");
                 options.add(CURRENT_VERSION);
-                expectOK = false;
+                expectOK = true;
                 break;
             case "current-preview":
                 options.add("--enable-preview");
@@ -166,7 +166,7 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
             for (String mod : mods) {
                 String key = mod.equals("static")
                     ? "compiler.err.mod.not.allowed.here: " + mod
-                    : "compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.java.base.transitive)";
+                    : "compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.java.base.transitive), $(VERSION), 25".replace("$(VERSION)", target);
                 String message = "module-info.java:1:12: " + key;
                 if (log.contains(message)) {
                     foundErrorMessage = true;
@@ -179,30 +179,26 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
     }
 
     void testClass(Path base, List<String> mods, String target) throws Exception {
-        boolean expectOK;
+        boolean expectOK = true;
         List<String> options = new ArrayList<>();
 
         switch (target) {
             case "current":
                 options.add("--release");
                 options.add(CURRENT_VERSION);
-                expectOK = false;
                 break;
             case "current-preview":
                 options.add("--enable-preview");
                 options.add("--release");
                 options.add(CURRENT_VERSION);
-                expectOK = true;
                 break;
             case "9":
                 options.add("--release");
                 options.add(target);
-                expectOK = true;
                 break;
             default:
                 options.add("--release");
                 options.add(target);
-                expectOK = false;
                 break;
         }
 
diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
index b3f81ca1e1e..52db62dd41a 100644
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java
@@ -92,7 +92,6 @@ public void compileAll() throws Exception {
     public Object[][] jdkModules() {
         return new Object[][]{
             {"jdk.compiler", new String[]{
-                                "java.base/jdk.internal.javac",
                                 "java.base/jdk.internal.jmod",
                                 "java.base/jdk.internal.misc",
                                 "java.base/jdk.internal.module",

From 0cd0afb2b32abd77f6275cf34a499b5cb31f22b5 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 1 May 2025 08:15:24 +0000
Subject: [PATCH 224/901] 8355913: RISC-V: improve
 hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java

Reviewed-by: fyang, rehn
---
 src/hotspot/cpu/riscv/riscv.ad                     |  3 ++-
 .../compiler/lib/ir_framework/TestFramework.java   |  1 +
 .../vectorization/runner/BasicFloatOpTest.java     | 14 +++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index e96ea480da4..f6fb2e195d3 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1916,9 +1916,10 @@ bool Matcher::match_rule_supported(int opcode) {
 
     case Op_FmaF:
     case Op_FmaD:
+      return UseFMA;
     case Op_FmaVF:
     case Op_FmaVD:
-      return UseFMA;
+      return UseRVV && UseFMA;
 
     case Op_ConvHF2F:
     case Op_ConvF2HF:
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index a6d738b3a09..6782bd68fed 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -142,6 +142,7 @@ public class TestFramework {
                     "Xlog",
                     "LogCompilation",
                     "UseCompactObjectHeaders",
+                    "UseFMA",
                     // Riscv
                     "UseRVV",
                     "UseZbb",
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
index d1d7b981712..b89d068d8af 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
@@ -35,7 +35,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.BasicFloatOpTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -229,7 +229,7 @@ public float[] vectorMin() {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulAdd() {
         float[] res = new float[SIZE];
@@ -244,7 +244,7 @@ public float[] vectorMulAdd() {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulSub1() {
         float[] res = new float[SIZE];
@@ -259,7 +259,7 @@ public float[] vectorMulSub1() {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulSub2() {
         float[] res = new float[SIZE];
@@ -276,7 +276,7 @@ public float[] vectorMulSub2() {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulAdd1() {
         float[] res = new float[SIZE];
@@ -293,7 +293,7 @@ public float[] vectorNegateMulAdd1() {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulAdd2() {
         float[] res = new float[SIZE];
@@ -308,7 +308,7 @@ public float[] vectorNegateMulAdd2() {
         counts = {IRNode.FMA_VF, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
-    @IR(applyIfCPUFeature = {"rvv", "true"},
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
         counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulSub() {
         float[] res = new float[SIZE];

From 7b317623756d3e21d029bcded8a5e15de070a0c9 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Thu, 1 May 2025 11:04:33 +0000
Subject: [PATCH 225/901] 8354235: Test
 javax/net/ssl/SSLSocket/Tls13PacketSize.java failed with
 java.net.SocketException: An established connection was aborted by the
 software in your host machine

Reviewed-by: rhalade
---
 .../net/ssl/templates/SSLSocketTemplate.java    | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
index ce1a99a7f1e..0891523ac11 100644
--- a/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLSocketTemplate.java
@@ -168,7 +168,7 @@ protected void configureServerSocket(SSLServerSocket socket) {
     /*
      * What's the server address?  null means binding to the wildcard.
      */
-    protected volatile InetAddress serverAddress = null;
+    protected volatile InetAddress serverAddress = InetAddress.getLoopbackAddress();
 
     /*
      * Define the server side of the test.
@@ -177,13 +177,8 @@ protected void doServerSide() throws Exception {
         // kick start the server side service
         SSLContext context = createServerSSLContext();
         SSLServerSocketFactory sslssf = context.getServerSocketFactory();
-        InetAddress serverAddress = this.serverAddress;
-        SSLServerSocket sslServerSocket = serverAddress == null ?
-                (SSLServerSocket)sslssf.createServerSocket(serverPort)
-                : (SSLServerSocket)sslssf.createServerSocket();
-        if (serverAddress != null) {
-            sslServerSocket.bind(new InetSocketAddress(serverAddress, serverPort));
-        }
+        SSLServerSocket sslServerSocket = (SSLServerSocket)sslssf.createServerSocket(
+                serverPort, 0, serverAddress);
         configureServerSocket(sslServerSocket);
         serverPort = sslServerSocket.getLocalPort();
 
@@ -271,10 +266,8 @@ protected void doClientSide() throws Exception {
         try (SSLSocket sslSocket = (SSLSocket)sslsf.createSocket()) {
             try {
                 configureClientSocket(sslSocket);
-                InetAddress serverAddress = this.serverAddress;
-                InetSocketAddress connectAddress = serverAddress == null
-                        ? new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort)
-                        : new InetSocketAddress(serverAddress, serverPort);
+                InetSocketAddress connectAddress = new InetSocketAddress(serverAddress,
+                        serverPort);
                 sslSocket.connect(connectAddress, 15000);
             } catch (IOException ioe) {
                 // The server side may be impacted by naughty test cases or

From 34807df7627b067f750578987c941213a5f8336a Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Thu, 1 May 2025 13:09:14 +0000
Subject: [PATCH 226/901] 8355779: When no "signature_algorithms_cert"
 extension is present we do not apply certificate scope constraints to
 algorithms in "signature_algorithms" extension

Reviewed-by: mullan
---
 .../ssl/SignatureAlgorithmsExtension.java     | 99 ++++++++++---------
 1 file changed, 51 insertions(+), 48 deletions(-)

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 80029e73afb..a95b31583bb 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
@@ -25,6 +25,7 @@
 
 package sun.security.ssl;
 
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
 import static sun.security.ssl.SignatureScheme.HANDSHAKE_SCOPE;
 
 import java.io.IOException;
@@ -33,6 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLProtocolException;
 import sun.security.ssl.SSLExtension.ExtensionConsumer;
 import sun.security.ssl.SSLExtension.SSLExtensionSpec;
@@ -270,30 +272,8 @@ public void consume(ConnectionContext context,
                 return;
             }
 
-            // update the context
-            List<SignatureScheme> sss =
-                    SignatureScheme.getSupportedAlgorithms(
-                            shc.sslConfig,
-                            shc.algorithmConstraints, shc.negotiatedProtocol,
-                            spec.signatureSchemes,
-                            HANDSHAKE_SCOPE);
-
-            if (sss == null || sss.isEmpty()) {
-                throw shc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
-                        "No supported signature algorithm");
-            }
-            shc.peerRequestedSignatureSchemes = sss;
-
-            // If no "signature_algorithms_cert" extension is present, then
-            // the "signature_algorithms" extension also applies to
-            // signatures appearing in certificates.
-            SignatureSchemesSpec certSpec =
-                    (SignatureSchemesSpec)shc.handshakeExtensions.get(
-                            SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT);
-            if (certSpec == null) {
-                shc.peerRequestedCertSignSchemes = sss;
-                shc.handshakeSession.setPeerSupportedSignatureAlgorithms(sss);
-            }
+            updateHandshakeContext(shc, spec.signatureSchemes,
+                    SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT);
 
             if (!shc.isResumption &&
                     shc.negotiatedProtocol.useTLS13PlusSpec()) {
@@ -497,30 +477,8 @@ public void consume(ConnectionContext context,
                 return;
             }
 
-            // update the context
-            List<SignatureScheme> sss =
-                    SignatureScheme.getSupportedAlgorithms(
-                            chc.sslConfig,
-                            chc.algorithmConstraints, chc.negotiatedProtocol,
-                            spec.signatureSchemes,
-                            HANDSHAKE_SCOPE);
-
-            if (sss == null || sss.isEmpty()) {
-                throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
-                        "No supported signature algorithm");
-            }
-            chc.peerRequestedSignatureSchemes = sss;
-
-            // If no "signature_algorithms_cert" extension is present, then
-            // the "signature_algorithms" extension also applies to
-            // signatures appearing in certificates.
-            SignatureSchemesSpec certSpec =
-                    (SignatureSchemesSpec)chc.handshakeExtensions.get(
-                            SSLExtension.CR_SIGNATURE_ALGORITHMS_CERT);
-            if (certSpec == null) {
-                chc.peerRequestedCertSignSchemes = sss;
-                chc.handshakeSession.setPeerSupportedSignatureAlgorithms(sss);
-            }
+            updateHandshakeContext(chc, spec.signatureSchemes,
+                    SSLExtension.CR_SIGNATURE_ALGORITHMS_CERT);
         }
     }
 
@@ -543,4 +501,49 @@ public void absent(ConnectionContext context,
                     "received CertificateRequest handshake message");
         }
     }
+
+    // Updates given HandshakeContext with peer signature schemes.
+    private static void updateHandshakeContext(HandshakeContext hc,
+            int[] signatureSchemes, SSLExtension signatureAlgorithmsCertExt)
+            throws SSLException {
+        List<SignatureScheme> handshakeSS =
+                SignatureScheme.getSupportedAlgorithms(
+                        hc.sslConfig,
+                        hc.algorithmConstraints,
+                        hc.negotiatedProtocol,
+                        signatureSchemes,
+                        HANDSHAKE_SCOPE);
+
+        if (handshakeSS.isEmpty()) {
+            throw hc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
+                    "No supported signature algorithm");
+        }
+
+        hc.peerRequestedSignatureSchemes = handshakeSS;
+
+        // If no "signature_algorithms_cert" extension is present, then
+        // the "signature_algorithms" extension also applies to
+        // signatures appearing in certificates.
+        SignatureSchemesSpec certSpec =
+                (SignatureSchemesSpec) hc.handshakeExtensions.get(
+                        signatureAlgorithmsCertExt);
+
+        if (certSpec == null) {
+            List<SignatureScheme> certSS =
+                    SignatureScheme.getSupportedAlgorithms(
+                            hc.sslConfig,
+                            hc.algorithmConstraints,
+                            hc.negotiatedProtocol,
+                            signatureSchemes,
+                            CERTIFICATE_SCOPE);
+
+            if (certSS.isEmpty()) {
+                throw hc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
+                        "No supported signature algorithm");
+            }
+
+            hc.peerRequestedCertSignSchemes = certSS;
+            hc.handshakeSession.setPeerSupportedSignatureAlgorithms(certSS);
+        }
+    }
 }

From bee273d6b4e34692952d4e7474ab72ee5c54e33a Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 1 May 2025 14:37:26 +0000
Subject: [PATCH 227/901] 8297271: AccessFlag.maskToAccessFlags should be
 specific to class file version

Reviewed-by: rriggs
---
 .../share/classes/java/lang/Class.java        |  8 +-
 .../share/classes/java/lang/System.java       |  3 +
 .../classes/java/lang/reflect/AccessFlag.java | 35 ++++++--
 .../classes/java/lang/reflect/Executable.java |  7 +-
 .../classes/java/lang/reflect/Field.java      |  4 +-
 .../classes/java/lang/reflect/Parameter.java  |  6 +-
 .../jdk/internal/access/JavaLangAccess.java   |  6 ++
 .../internal/reflect/ReflectionFactory.java   | 36 ++++++--
 .../com/sun/tools/javap/BasicWriter.java      |  5 +-
 .../AccessFlag/BasicAccessFlagTest.java       | 86 ++++++++++++-------
 10 files changed, 136 insertions(+), 60 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index d86baaac362..8be5ae8fa15 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -1384,10 +1384,8 @@ public Set<AccessFlag> accessFlags() {
                         isAnonymousClass() || isArray()) ?
             AccessFlag.Location.INNER_CLASS :
             AccessFlag.Location.CLASS;
-        return AccessFlag.maskToAccessFlags((location == AccessFlag.Location.CLASS) ?
-                                            getClassAccessFlagsRaw() :
-                                            getModifiers(),
-                                            location);
+        return getReflectionFactory().parseAccessFlags((location == AccessFlag.Location.CLASS) ?
+                        getClassAccessFlagsRaw() : getModifiers(), location, this);
     }
 
     /**
@@ -4125,7 +4123,7 @@ public boolean isSealed() {
      * type is returned.  If the class is a primitive type then the latest class
      * file major version is returned and zero is returned for the minor version.
      */
-    private int getClassFileVersion() {
+    int getClassFileVersion() {
         Class<?> c = isArray() ? elementType() : this;
         return c.getClassFileVersion0();
     }
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index dc969c72536..a60958f6f82 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2017,6 +2017,9 @@ public byte[] getRawExecutableTypeAnnotations(Executable executable) {
             E[] getEnumConstantsShared(Class<E> klass) {
                 return klass.getEnumConstantsShared();
             }
+            public int classFileVersion(Class<?> clazz) {
+                return clazz.getClassFileVersion();
+            }
             public void blockedOn(Interruptible b) {
                 Thread.currentThread().blockedOn(b);
             }
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java b/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
index bb58c440688..4314c8c410d 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
@@ -372,18 +372,17 @@ public Set<Location> locations(ClassFileFormatVersion cffv) {
 
     /**
      * {@return an unmodifiable set of access flags for the given mask value
-     * appropriate for the location in question}
+     * appropriate for the location in the current class file format version}
      *
      * @param mask bit mask of access flags
      * @param location context to interpret mask value
      * @throws IllegalArgumentException if the mask contains bit
-     * positions not support for the location in question
+     * positions not defined for the location in the current class file format
+     * @throws NullPointerException if {@code location} is {@code null}
      */
     public static Set<AccessFlag> maskToAccessFlags(int mask, Location location) {
-        var definition = findDefinition(location);
-        int flagsMask = location.flagsMask();
-        int parsingMask = location == Location.METHOD ? flagsMask | ACC_STRICT : flagsMask; // flagMask lacks strictfp
-        int unmatchedMask = mask & (~parsingMask);
+        var definition = findDefinition(location);  // null checks location
+        int unmatchedMask = mask & (~location.flagsMask());
         if (unmatchedMask != 0) {
             throw new IllegalArgumentException("Unmatched bit position 0x" +
                     Integer.toHexString(unmatchedMask) +
@@ -392,6 +391,30 @@ public static Set<AccessFlag> maskToAccessFlags(int mask, Location location) {
         return new AccessFlagSet(definition, mask);
     }
 
+    /**
+     * {@return an unmodifiable set of access flags for the given mask value
+     * appropriate for the location in the given class file format version}
+     *
+     * @param mask bit mask of access flags
+     * @param location context to interpret mask value
+     * @param cffv the class file format to interpret mask value
+     * @throws IllegalArgumentException if the mask contains bit
+     * positions not defined for the location in the given class file format
+     * @throws NullPointerException if {@code location} or {@code cffv} is {@code null}
+     * @since 25
+     */
+    public static Set<AccessFlag> maskToAccessFlags(int mask, Location location, ClassFileFormatVersion cffv) {
+        var definition = findDefinition(location);  // null checks location
+        int unmatchedMask = mask & (~location.flagsMask(cffv));  // null checks cffv
+        if (unmatchedMask != 0) {
+            throw new IllegalArgumentException("Unmatched bit position 0x" +
+                    Integer.toHexString(unmatchedMask) +
+                    " for location " + location +
+                    " for class file format " + cffv);
+        }
+        return new AccessFlagSet(definition, mask);
+    }
+
     /**
      * A location within a {@code class} file where flags can be applied.
      * <p>
diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index b2978d73c8b..2f6f6cca89f 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.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
@@ -221,8 +221,9 @@ String sharedToGenericString(int modifierMask, boolean isDefault) {
      */
     @Override
     public Set<AccessFlag> accessFlags() {
-        return AccessFlag.maskToAccessFlags(getModifiers(),
-                                            AccessFlag.Location.METHOD);
+        return reflectionFactory.parseAccessFlags(getModifiers(),
+                                                  AccessFlag.Location.METHOD,
+                                                  getDeclaringClass());
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
index bffa211fe12..e26d8b03ff8 100644
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.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
@@ -218,7 +218,7 @@ public int getModifiers() {
      */
     @Override
     public Set<AccessFlag> accessFlags() {
-        return AccessFlag.maskToAccessFlags(getModifiers(), AccessFlag.Location.FIELD);
+        return reflectionFactory.parseAccessFlags(getModifiers(), AccessFlag.Location.FIELD, getDeclaringClass());
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/reflect/Parameter.java b/src/java.base/share/classes/java/lang/reflect/Parameter.java
index eac02001294..b8a57a9790b 100644
--- a/src/java.base/share/classes/java/lang/reflect/Parameter.java
+++ b/src/java.base/share/classes/java/lang/reflect/Parameter.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
@@ -172,8 +172,8 @@ public int getModifiers() {
      * @since 20
      */
     public Set<AccessFlag> accessFlags() {
-        return AccessFlag.maskToAccessFlags(getModifiers(),
-                                            AccessFlag.Location.METHOD_PARAMETER);
+        return AccessibleObject.reflectionFactory.parseAccessFlags(getModifiers(),
+                AccessFlag.Location.METHOD_PARAMETER, getDeclaringExecutable().getDeclaringClass());
     }
 
     /**
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 9e11bd7586f..20b6cd23682 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -119,6 +119,12 @@ public interface JavaLangAccess {
      */
     <E extends Enum<E>> E[] getEnumConstantsShared(Class<E> klass);
 
+    /**
+     * Returns the big-endian packed minor-major version of the class file
+     * of this class.
+     */
+    int classFileVersion(Class<?> clazz);
+
     /**
      * Set current thread's blocker field.
      */
diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
index 20b390855c9..19be5e53798 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.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
@@ -32,15 +32,10 @@
 import java.io.ObjectStreamField;
 import java.io.OptionalDataException;
 import java.io.Serializable;
+import java.lang.classfile.ClassFile;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
+import java.lang.reflect.*;
 import java.util.Set;
 
 import jdk.internal.access.JavaLangReflectAccess;
@@ -518,6 +513,31 @@ public final ObjectStreamField[] serialPersistentFields(Class<?> cl) {
         }
     }
 
+    public final Set<AccessFlag> parseAccessFlags(int mask, AccessFlag.Location location, Class<?> classFile) {
+        var cffv = classFileFormatVersion(classFile);
+        return cffv == null ?
+                AccessFlag.maskToAccessFlags(mask, location) :
+                AccessFlag.maskToAccessFlags(mask, location, cffv);
+    }
+
+    private final ClassFileFormatVersion classFileFormatVersion(Class<?> cl) {
+        int raw = SharedSecrets.getJavaLangAccess().classFileVersion(cl);
+
+        int major = raw & 0xFFFF;
+        int minor = raw >>> Character.SIZE;
+
+        assert VM.isSupportedClassFileVersion(major, minor) : major + "." + minor;
+
+        if (major >= ClassFile.JAVA_12_VERSION) {
+            if (minor == 0)
+                return ClassFileFormatVersion.fromMajor(raw);
+            return null; // preview or old preview, fallback to default handling
+        } else if (major == ClassFile.JAVA_1_VERSION) {
+            return minor < 3 ? ClassFileFormatVersion.RELEASE_0 : ClassFileFormatVersion.RELEASE_1;
+        }
+        return ClassFileFormatVersion.fromMajor(major);
+    }
+
     //--------------------------------------------------------------------------
     //
     // Internals only below this point
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
index 66345855da5..1780eb1297d 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/BasicWriter.java
@@ -59,13 +59,12 @@ protected Set<AccessFlag> flagsReportUnknown(AccessFlags flags, ClassFileFormatV
     }
 
     protected Set<AccessFlag> maskToAccessFlagsReportUnknown(int mask, AccessFlag.Location location, ClassFileFormatVersion cffv) {
-        // TODO pass cffv to maskToAccessFlags
         try {
-            return AccessFlag.maskToAccessFlags(mask, location);
+            return AccessFlag.maskToAccessFlags(mask, location, cffv);
         } catch (IllegalArgumentException ex) {
             mask &= location.flagsMask(cffv);
             report("Access Flags: " + ex.getMessage());
-            return AccessFlag.maskToAccessFlags(mask, location);
+            return AccessFlag.maskToAccessFlags(mask, location, cffv);
         }
     }
 
diff --git a/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java b/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java
index d87f60a0a1a..d2ee6a2434e 100644
--- a/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java
+++ b/test/jdk/java/lang/reflect/AccessFlag/BasicAccessFlagTest.java
@@ -23,11 +23,14 @@
 
 /*
  * @test
- * @bug 8266670 8293626
+ * @bug 8266670 8293626 8297271
  * @summary Basic tests of AccessFlag
+ * @run junit BasicAccessFlagTest
  */
 
+import java.lang.classfile.ClassFile;
 import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.EnumSet;
@@ -36,30 +39,26 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class BasicAccessFlagTest {
-    public static void main(String... args) throws Exception {
-        testSourceModifiers();
-        testMaskOrdering();
-        testDisjoint();
-        testMaskToAccessFlagsPositive();
-        testLocationsNullHandling();
-    }
 
     /*
      * Verify sourceModifier() == true access flags have a
      * corresponding constant in java.lang.reflect.Modifier.
      */
-    private static void testSourceModifiers() throws Exception {
+    @Test
+    public void testSourceModifiers() throws Exception {
         Class<?> modifierClass = Modifier.class;
 
         for(AccessFlag accessFlag : AccessFlag.values()) {
             if (accessFlag.sourceModifier()) {
                 // Check for consistency
                 Field f = modifierClass.getField(accessFlag.name());
-                if (accessFlag.mask() != f.getInt(null) ) {
-                    throw new RuntimeException("Unexpected mask for " +
-                                               accessFlag);
-                }
+                assertEquals(f.getInt(null), accessFlag.mask(), accessFlag + " mask");
             }
         }
     }
@@ -67,22 +66,22 @@ private static void testSourceModifiers() throws Exception {
     // The mask values of the enum constants must be non-decreasing;
     // in other words stay the same (for colliding mask values) or go
     // up.
-    private static void testMaskOrdering() {
+    @Test
+    public void testMaskOrdering() {
         AccessFlag[] values = AccessFlag.values();
         for (int i = 1; i < values.length; i++) {
             AccessFlag left  = values[i-1];
             AccessFlag right = values[i];
-            if (left.mask() > right.mask()) {
-                throw new RuntimeException(left
-                                           + "has a greater mask than "
-                                           + right);
-            }
+            assertTrue(left.mask() <= right.mask(), () -> left
+                    + "has a greater mask than "
+                    + right);
         }
     }
 
     // Test that if access flags have a matching mask, their locations
     // are disjoint.
-    private static void testDisjoint() {
+    @Test
+    public void testDisjoint() {
         // First build the mask -> access flags map...
         Map<Integer, Set<AccessFlag>> maskToFlags = new LinkedHashMap<>();
 
@@ -90,7 +89,7 @@ private static void testDisjoint() {
             Integer mask = accessFlag.mask();
             Set<AccessFlag> flags = maskToFlags.get(mask);
 
-            if (flags == null ) {
+            if (flags == null) {
                 flags = new HashSet<>();
                 flags.add(accessFlag);
                 maskToFlags.put(mask, flags);
@@ -135,7 +134,8 @@ private static void reportError(AccessFlag.Location location,
 
     // For each access flag, make sure it is recognized on every kind
     // of location it can apply to
-    private static void testMaskToAccessFlagsPositive() {
+    @Test
+    public void testMaskToAccessFlagsPositive() {
         for (var accessFlag : AccessFlag.values()) {
             Set<AccessFlag> expectedSet = EnumSet.of(accessFlag);
             for (var location : accessFlag.locations()) {
@@ -146,17 +146,43 @@ private static void testMaskToAccessFlagsPositive() {
                                                accessFlag + ", " + location);
                 }
             }
+            for (var cffv : ClassFileFormatVersion.values()) {
+                for (var location : accessFlag.locations(cffv)) {
+                    Set<AccessFlag> computedSet =
+                            AccessFlag.maskToAccessFlags(accessFlag.mask(), location, cffv);
+                    if (!expectedSet.equals(computedSet)) {
+                        throw new RuntimeException("Bad set computation on " +
+                                accessFlag + ", " + location);
+                    }
+                }
+            }
         }
+        assertEquals(Set.of(AccessFlag.STRICT), AccessFlag.maskToAccessFlags(Modifier.STRICT, AccessFlag.Location.METHOD, ClassFileFormatVersion.RELEASE_8));
     }
 
-    private static void testLocationsNullHandling() {
-        for (var flag : AccessFlag.values() ) {
-            try {
-                flag.locations(null);
-                throw new RuntimeException("Did not get NPE on " + flag + ".location(null)");
-            } catch (NullPointerException npe ) {
-                ; // Expected
-            }
+    @Test
+    public void testMaskToAccessFlagsNegative() {
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(Modifier.STRICT, AccessFlag.Location.METHOD));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(Modifier.STRICT, AccessFlag.Location.METHOD, ClassFileFormatVersion.RELEASE_17));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(Modifier.STRICT, AccessFlag.Location.METHOD, ClassFileFormatVersion.RELEASE_1));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(Modifier.PRIVATE, AccessFlag.Location.CLASS));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_MODULE, AccessFlag.Location.CLASS, ClassFileFormatVersion.RELEASE_8));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_ANNOTATION, AccessFlag.Location.CLASS, ClassFileFormatVersion.RELEASE_4));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_ENUM, AccessFlag.Location.FIELD, ClassFileFormatVersion.RELEASE_4));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_SYNTHETIC, AccessFlag.Location.INNER_CLASS, ClassFileFormatVersion.RELEASE_4));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_PUBLIC, AccessFlag.Location.INNER_CLASS, ClassFileFormatVersion.RELEASE_0));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_MANDATED, AccessFlag.Location.METHOD_PARAMETER, ClassFileFormatVersion.RELEASE_7));
+        assertThrows(IllegalArgumentException.class, () -> AccessFlag.maskToAccessFlags(ClassFile.ACC_MANDATED, AccessFlag.Location.MODULE, ClassFileFormatVersion.RELEASE_7));
+    }
+
+    @Test
+    public void testLocationsNullHandling() {
+        for (var flag : AccessFlag.values()) {
+            assertThrows(NullPointerException.class, () -> flag.locations(null));
+        }
+
+        for (var location : AccessFlag.Location.values()) {
+            assertThrows(NullPointerException.class, () -> location.flags(null));
         }
 
         for (var location : AccessFlag.Location.values()) {

From 2ad639f1b33fcd8e218e8ad549caf32024a36cb2 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Thu, 1 May 2025 15:47:01 +0000
Subject: [PATCH 228/901] 8356021: Use Double::hashCode in
 java.util.Locale::hashCode

Reviewed-by: rriggs, liach
---
 src/java.base/share/classes/java/util/Locale.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 28468165fab..14f3fe13918 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -3497,8 +3497,7 @@ public int hashCode() {
             if (h == 0) {
                 h = 17;
                 h = 37*h + range.hashCode();
-                long bitsWeight = Double.doubleToLongBits(weight);
-                h = 37*h + (int)(bitsWeight ^ (bitsWeight >>> 32));
+                h = 37*h + Double.hashCode(weight);
                 if (h != 0) {
                     hash = h;
                 }

From 09cae5fd8f228a8826e4de7aa43fe5365549c00c Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 1 May 2025 16:05:59 +0000
Subject: [PATCH 229/901] 8354407: Test
 com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java still fails
 on Windows

Reviewed-by: cjplummer, lmesnik
---
 .../GetProcessCpuLoad.java                    | 17 ++++++++-----
 .../OperatingSystemMXBean/TEST.properties     | 24 -------------------
 2 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties

diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
index 3ee847b28b1..db40d018d83 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
@@ -34,18 +34,21 @@
 import jdk.test.lib.Platform;
 
 public class GetProcessCpuLoad {
+
+    private static final int TEST_COUNT = 10;
+
     public static void main(String[] argv) throws Exception {
         OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
             ManagementFactory.getOperatingSystemMXBean();
 
         Exception ex = null;
-        double load;
+        int good = 0;
 
-        for(int i = 0; i < 10; i++) {
-            load = mbean.getProcessCpuLoad();
+        for (int i = 0; i < TEST_COUNT; i++) {
+            double load = mbean.getProcessCpuLoad();
             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.
+                // Some Windows systems can return -1 occasionally, at any time.
+                // Will fail if we never see good values.
                 ex = new RuntimeException("getProcessCpuLoad() returns " + load
                      + " which is not in the [0.0,1.0] interval");
             } else if (load < 0.0 || load > 1.0) {
@@ -54,6 +57,7 @@ public static void main(String[] argv) throws Exception {
             } else {
                 // A good reading: forget any previous -1.
                 ex = null;
+                good++;
             }
             try {
                 Thread.sleep(200);
@@ -62,7 +66,8 @@ public static void main(String[] argv) throws Exception {
             }
         }
 
-        if (ex != null) {
+        if (good == 0) {
+            // Delayed failure for Windows.
             throw ex;
         }
     }
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties b/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties
deleted file mode 100644
index 9ddb06fbbcb..00000000000
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties
+++ /dev/null
@@ -1,24 +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.
-#
-
-exclusiveAccess.dirs=.

From 6b553acbaace0a61203305f36f70bb74d14a234f Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Thu, 1 May 2025 16:16:25 +0000
Subject: [PATCH 230/901] 8277424: javax/net/ssl/TLSCommon/TLSTest.java  fails
 with connection refused

Reviewed-by: rhalade
---
 test/jdk/javax/net/ssl/TLSCommon/TLSTest.java | 116 +++++++++---------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
index 12de3c0e096..1b3aef8b0fe 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/TLSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, 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
@@ -50,91 +50,91 @@
  * @test
  * @bug 8205111
  * @summary Test TLS with different types of supported keys.
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
  *      TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
  *      TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_128_GCM_SHA256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_128_GCM_SHA256
  *
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 ecdsa_secp384r1_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha1 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pkcs1_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ec_rsa_pkcs1_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_sha1 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp384r1_sha384
  *      TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 ecdsa_secp521r1_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 ecdsa_secp521r1_sha512
  *      TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_rsae_sha512 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha256 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha384 TLS_AES_256_GCM_SHA384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.3 rsa_pss_pss_sha512 TLS_AES_256_GCM_SHA384
  *
- * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha384
  *      TLS_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.2 rsa_pkcs1_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pkcs1_sha512
  *      TLS_RSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ec_rsa_pkcs1_sha256
  *      TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm TLSTest TLSv1.2 ecdsa_sha1
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_sha1
  *      TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.2 ecdsa_secp384r1_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp384r1_sha384
  *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
- * @run main/othervm TLSTest TLSv1.2 ecdsa_secp521r1_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 ecdsa_secp521r1_sha512
  *      TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_256_CBC_SHA256
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_rsae_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA256
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha256
  *      TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha384
  *      TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm TLSTest TLSv1.2 rsa_pss_pss_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.2 rsa_pss_pss_sha512
  *      TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
  *
- * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha256
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha384
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pkcs1_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pkcs1_sha512
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1.1 rsa_pss_rsae_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1.1 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA
  *
- * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha256
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha1 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha256 TLS_RSA_WITH_AES_256_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha384 TLS_RSA_WITH_AES_128_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pkcs1_sha512 TLS_RSA_WITH_AES_256_CBC_SHA
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha256
  *      TLS_RSA_WITH_AES_128_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha384
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha384
  *      TLS_RSA_WITH_AES_256_CBC_SHA
- * @run main/othervm TLSTest TLSv1 rsa_pss_rsae_sha512
+ * @run main/othervm -Djavax.net.debug=ssl,handshake TLSTest TLSv1 rsa_pss_rsae_sha512
  *      TLS_RSA_WITH_AES_128_CBC_SHA
  */
 public class TLSTest {
@@ -279,7 +279,7 @@ void doClientSide() throws Exception {
                     keyType.getTrustedCert(), null, null, keyType.getKeyType());
             SSLSocketFactory sslsf = ctx.getSocketFactory();
             try (SSLSocket sslSocket
-                    = (SSLSocket) sslsf.createSocket("localhost", serverPort)) {
+                    = (SSLSocket) sslsf.createSocket(InetAddress.getLoopbackAddress(), serverPort)) {
                 // Specify the client cipher suites
                 sslSocket.setEnabledCipherSuites(new String[]{this.cipher});
                 sslSocket.setEnabledProtocols(new String[]{this.tlsProtocol});

From cf0db96314863376254bacbff4eefd13e3527707 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Thu, 1 May 2025 17:03:29 +0000
Subject: [PATCH 231/901] 8354084: Streamline XPath API's extension function
 control

Reviewed-by: rriggs, naoto
---
 .../internal/functions/FuncExtFunction.java   |  10 +-
 .../internal/jaxp/JAXPExtensionsProvider.java |  34 +--
 .../xpath/internal/jaxp/XPathImplUtil.java    |   7 +-
 .../internal/res/XPATHErrorResources.java     |  10 +-
 src/java.xml/share/classes/module-info.java   |   8 +-
 .../unittest/xpath/SecureProcessingTest.java  | 195 -----------------
 .../unittest/xpath/SecureProcessingTest.xml   |   2 -
 .../unittest/xpath/XPathFunctionTest.java     | 198 ++++++++++++++++++
 .../jaxp/unittest/xpath/XPathFunctionTest.xml |  12 ++
 9 files changed, 223 insertions(+), 253 deletions(-)
 delete mode 100644 test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
 delete mode 100644 test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.java
 create mode 100644 test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.xml

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
index 6fe57d28d2f..9f2a7e78951 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.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
@@ -41,7 +41,7 @@
  * the expression executes, it calls ExtensionsTable#extFunction, and then
  * converts the result to the appropriate XObject.
  * @xsl.usage advanced
- * @LastModified: May 2022
+ * @LastModified: Apr 2025
  */
 public class FuncExtFunction extends Function
 {
@@ -186,12 +186,6 @@ public FuncExtFunction(java.lang.String namespace,
    */
   public XObject execute(XPathContext xctxt) throws TransformerException
   {
-    if (xctxt.isSecureProcessing())
-      throw new javax.xml.transform.TransformerException(
-        XPATHMessages.createXPATHMessage(
-          XPATHErrorResources.ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED,
-          new Object[] {toString()}));
-
     XObject result;
     List<XObject> argVec = new ArrayList<>();
     int nArgs = m_argVec.size();
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
index 6d9d882f075..5622a0e3db0 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,26 +37,16 @@
 /**
  *
  * @author Ramesh Mandava
- * @LastModified: Nov 2017
+ * @LastModified: Apr 2025
  */
 public class JAXPExtensionsProvider implements ExtensionsProvider {
 
     private final XPathFunctionResolver resolver;
-    private boolean extensionInvocationDisabled = false;
 
     public JAXPExtensionsProvider(XPathFunctionResolver resolver) {
         this.resolver = resolver;
-        this.extensionInvocationDisabled = false;
     }
 
-    public JAXPExtensionsProvider(XPathFunctionResolver resolver,
-        boolean featureSecureProcessing, JdkXmlFeatures featureManager ) {
-        this.resolver = resolver;
-        if (featureSecureProcessing &&
-                !featureManager.getFeature(JdkXmlFeatures.XmlFeature.ENABLE_EXTENSION_FUNCTION)) {
-            this.extensionInvocationDisabled = true;
-        }
-    }
 
     /**
      * Is the extension function available?
@@ -111,16 +101,6 @@ public Object extFunction(String ns, String funcName, List<XObject> argVec,
             //Find the XPathFunction corresponding to namespace and funcName
             javax.xml.namespace.QName myQName = new QName( ns, funcName );
 
-            // JAXP 1.3 spec says When XMLConstants.FEATURE_SECURE_PROCESSING
-            // feature is set then invocation of extension functions need to
-            // throw XPathFunctionException
-            if ( extensionInvocationDisabled ) {
-                String fmsg = XSLMessages.createXPATHMessage(
-                    XPATHErrorResources.ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED,
-                    new Object[] { myQName.toString() } );
-                throw new XPathFunctionException ( fmsg );
-            }
-
             // Assuming user is passing all the needed parameters ( including
             // default values )
             int arity = argVec.size();
@@ -167,16 +147,6 @@ public Object extFunction(FuncExtFunction extFunction, List<XObject> argVec)
             javax.xml.namespace.QName myQName =
                 new javax.xml.namespace.QName( namespace, functionName );
 
-            // JAXP 1.3 spec says  When XMLConstants.FEATURE_SECURE_PROCESSING
-            // feature is set then invocation of extension functions need to
-            // throw XPathFunctionException
-            if ( extensionInvocationDisabled ) {
-                String fmsg = XSLMessages.createXPATHMessage(
-                    XPATHErrorResources.ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED,
-                        new Object[] { myQName.toString() } );
-                throw new XPathFunctionException ( fmsg );
-            }
-
             XPathFunction xpathFunction =
                 resolver.resolveFunction( myQName, arity );
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java
index e81523b5607..a92090900fa 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImplUtil.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
@@ -54,7 +54,7 @@
  * This class contains several utility methods used by XPathImpl and
  * XPathExpressionImpl
  *
- * @LastModified: Jan 2022
+ * @LastModified: Apr 2025
  */
 class XPathImplUtil {
     XPathFunctionResolver functionResolver;
@@ -85,8 +85,7 @@ XObject eval(Object contextItem, com.sun.org.apache.xpath.internal.XPath xpath)
                     new Object[] {}));
         }
         if (functionResolver != null) {
-            JAXPExtensionsProvider jep = new JAXPExtensionsProvider(
-                    functionResolver, featureSecureProcessing, featureManager);
+            JAXPExtensionsProvider jep = new JAXPExtensionsProvider(functionResolver);
             xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext(jep);
         } else {
             xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext();
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
index 433a0f85389..716a4bcf63b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@
   * Also you need to  update the count of messages(MAX_CODE)or
  * the count of warnings(MAX_WARNING) [ Information purpose only]
  * @xsl.usage advanced
- * @LastModified: Nov 2024
+ * @LastModified: Apr 2025
  */
 public class XPATHErrorResources extends ListResourceBundle
 {
@@ -305,7 +305,6 @@ public class XPATHErrorResources extends ListResourceBundle
   public static final String ER_XPATH_ERROR = "ER_XPATH_ERROR";
 
   //BEGIN: Keys needed for exception messages of  JAXP 1.3 XPath API implementation
-  public static final String ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED = "ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED";
   public static final String ER_RESOLVE_VARIABLE_RETURNS_NULL = "ER_RESOLVE_VARIABLE_RETURNS_NULL";
   public static final String ER_NO_XPATH_VARIABLE_RESOLVER = "ER_NO_XPATH_VARIABLE_RESOLVER";
   public static final String ER_NO_XPATH_FUNCTION_PROVIDER = "ER_NO_XPATH_FUNCTION_PROVIDER";
@@ -766,11 +765,6 @@ public class XPATHErrorResources extends ListResourceBundle
 
   //BEGIN:  Definitions of error keys used  in exception messages of  JAXP 1.3 XPath API implementation
 
-  /** Field ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED                       */
-
-  { ER_EXTENSION_FUNCTION_CANNOT_BE_INVOKED,
-       "Extension function: ''{0}'' can not be invoked when the XMLConstants.FEATURE_SECURE_PROCESSING feature is set to true."},
-
   /** Field ER_RESOLVE_VARIABLE_RETURNS_NULL                       */
 
   { ER_RESOLVE_VARIABLE_RETURNS_NULL,
diff --git a/src/java.xml/share/classes/module-info.java b/src/java.xml/share/classes/module-info.java
index a12fd3e8f45..1b4f345eb72 100644
--- a/src/java.xml/share/classes/module-info.java
+++ b/src/java.xml/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
@@ -868,19 +868,19 @@
  * </tr>
  * <tr>
  * <td id="ExtFunc">{@systemProperty jdk.xml.enableExtensionFunctions}</td>
- * <td>Determines if XSLT and XPath extension functions are to be allowed.
+ * <td>Determines whether extension functions in the Transform API are to be allowed.
+ * The extension functions in the XPath API are not affected by this property.
  * </td>
  * <td style="text-align:center" rowspan="5">yes</td>
  * <td style="text-align:center" rowspan="3">Boolean</td>
  * <td>
  * true or false. True indicates that extension functions are allowed; False otherwise.
  * </td>
- * <td style="text-align:center">true</td>
+ * <td style="text-align:center">false</td>
  * <td style="text-align:center">false</td>
  * <td style="text-align:center">Yes</td>
  * <td style="text-align:center">
  *     <a href="#Transform">Transform</a><br>
- *     <a href="#XPATH">XPath</a>
  * </td>
  * <td style="text-align:center"><a href="#Processor">Method 2</a></td>
  * <td style="text-align:center">8</td>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
deleted file mode 100644
index 21fc436226b..00000000000
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package xpath;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPathFactoryConfigurationException;
-import javax.xml.xpath.XPathFunction;
-import javax.xml.xpath.XPathFunctionException;
-import javax.xml.xpath.XPathFunctionResolver;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-/*
- * @test
- * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
- * @run testng/othervm xpath.SecureProcessingTest
- * @summary Test when FEATURE_SECURE_PROCESSING is true, calling an external function will cause XPathFunctionException.
- */
-@Test
-public class SecureProcessingTest {
-    public final void testSecureProcessing() {
-        boolean _isSecureMode = System.getSecurityManager() != null;
-
-        final String XPATH_EXPRESSION = "ext:helloWorld()";
-
-        // the xml source
-        InputStream xmlStream = this.getClass().getResourceAsStream("SecureProcessingTest.xml");
-
-        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder documentBuilder = null;
-        Document document = null;
-
-        try {
-            documentBuilder = documentBuilderFactory.newDocumentBuilder();
-            document = documentBuilder.parse(xmlStream);
-        } catch (ParserConfigurationException parserConfigurationException) {
-            parserConfigurationException.printStackTrace();
-            Assert.fail(parserConfigurationException.toString());
-        } catch (SAXException saxException) {
-            saxException.printStackTrace();
-            Assert.fail(saxException.toString());
-        } catch (IOException ioException) {
-            ioException.printStackTrace();
-            Assert.fail(ioException.toString());
-        }
-
-        // the XPath
-        XPathFactory xPathFactory = null;
-        XPath xPath = null;
-        String xPathResult = null;
-
-        // SECURE_PROCESSING == false
-        // evaluate an expression with a user defined function with a non-secure
-        // XPath
-        // expect success
-        if (!_isSecureMode) { // jaxp secure feature can not be turned off when
-                              // security manager is present
-            try {
-                xPathFactory = xPathFactory.newInstance();
-                xPathFactory.setXPathFunctionResolver(new MyXPathFunctionResolver());
-                xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false);
-
-                xPath = xPathFactory.newXPath();
-                xPath.setNamespaceContext(new MyNamespaceContext());
-
-                xPathResult = xPath.evaluate(XPATH_EXPRESSION, document);
-            } catch (XPathFactoryConfigurationException xPathFactoryConfigurationException) {
-                xPathFactoryConfigurationException.printStackTrace();
-                Assert.fail(xPathFactoryConfigurationException.toString());
-            } catch (XPathExpressionException xPathExpressionException) {
-                xPathExpressionException.printStackTrace();
-                Assert.fail(xPathExpressionException.toString());
-            }
-
-            // expected success
-            System.out.println("XPath result (SECURE_PROCESSING == false) = \"" + xPathResult + "\"");
-        }
-        // now try with SECURE_PROCESSING == true
-        // evaluate an expression with a user defined function with a secure
-        // XPath
-        // expect Exception
-        boolean securityException = false;
-        try {
-            xPathFactory = xPathFactory.newInstance();
-            xPathFactory.setXPathFunctionResolver(new MyXPathFunctionResolver());
-            xPathFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
-            xPath = xPathFactory.newXPath();
-            xPath.setNamespaceContext(new MyNamespaceContext());
-
-            xPathResult = xPath.evaluate(XPATH_EXPRESSION, document);
-        } catch (XPathFactoryConfigurationException xPathFactoryConfigurationException) {
-            xPathFactoryConfigurationException.printStackTrace();
-            Assert.fail(xPathFactoryConfigurationException.toString());
-        } catch (XPathFunctionException xPathFunctionException) {
-            // expected security exception
-            securityException = true;
-            xPathFunctionException.printStackTrace(System.out);
-        } catch (XPathExpressionException xPathExpressionException) {
-            xPathExpressionException.printStackTrace();
-            Assert.fail(xPathExpressionException.toString());
-        }
-
-        // expected Exception
-        if (!securityException) {
-            Assert.fail("XPath result (SECURE_PROCESSING == true) = \"" + xPathResult + "\"");
-        }
-    }
-
-    private class MyXPathFunctionResolver implements XPathFunctionResolver {
-
-        public XPathFunction resolveFunction(QName functionName, int arity) {
-
-            // not a real ewsolver, always return a default XPathFunction
-            return new MyXPathFunction();
-        }
-    }
-
-    private class MyXPathFunction implements XPathFunction {
-
-        public Object evaluate(List list) throws XPathFunctionException {
-
-            return "Hello World";
-        }
-    }
-
-    private class MyNamespaceContext implements NamespaceContext {
-
-        public String getNamespaceURI(String prefix) {
-            if (prefix == null) {
-                throw new IllegalArgumentException("The prefix cannot be null.");
-            }
-
-            if (prefix.equals("ext")) {
-                return "http://ext.com/";
-            } else {
-                return null;
-            }
-        }
-
-        public String getPrefix(String namespace) {
-
-            if (namespace == null) {
-                throw new IllegalArgumentException("The namespace uri cannot be null.");
-            }
-
-            if (namespace.equals("http://ext.com/")) {
-                return "ext";
-            } else {
-                return null;
-            }
-        }
-
-        public Iterator getPrefixes(String namespace) {
-            return null;
-        }
-    }
-}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml b/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
deleted file mode 100644
index bc916a958f9..00000000000
--- a/test/jaxp/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<helloWorld/>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.java b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.java
new file mode 100644
index 00000000000..d0f0a1284c1
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.java
@@ -0,0 +1,198 @@
+/*
+ * 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 xpath;
+
+import java.util.List;
+import java.util.stream.Stream;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.*;
+import jaxp.library.JUnitTestUtil;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/*
+ * @test
+ * @bug 8354084
+ * @summary Verifies that extensions to XPathFunction.
+ * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest /test/lib
+ * @run junit xpath.XPathFunctionTest
+ */
+public class XPathFunctionTest {
+    /*
+     * Arguments for XPath Extension Function Test, refer to the test below.
+     */
+    private static Stream<Arguments> testData() {
+        // expected result when a resolver is set properly
+        String result = "id=2 price=20";
+        return Stream.of(
+                // cases where the result is as expected when a resolver is set
+                Arguments.of(true, false, false, false, false, result, null),
+                Arguments.of(true, true, false, false, false, result, null),
+                Arguments.of(true, true, false, true, false, result, null),
+                Arguments.of(true, true, false, true, true, result, null),
+                Arguments.of(true, true, true, true, true, result, null),
+                // cases XPathExpressionException was thrown before the change even though there's a resolver
+                Arguments.of(true, true, true, false, false, result, null),
+                Arguments.of(true, true, true, true, false, result, null),
+                // XPathExpressionException will continue to be thrown due to missing resolver, though it was
+                // thrown for a different reason (FSP is turned on) before the change
+                Arguments.of(false, false, false, false, false, result, XPathExpressionException.class),
+                Arguments.of(false, true, true, false, false, result, XPathExpressionException.class),
+                Arguments.of(false, true, true, true, false, result, XPathExpressionException.class)
+        );
+    }
+
+    /**
+     * Verifies the control over XPath Extension Functions.
+     * @param useResolver indicates whether there is a custom resolver
+     * @param setFSP indicates whether FSP is to be set
+     * @param FSPValue the FSP value
+     * @param setProperty indicates whether the property {@code jdk.xml.enableExtensionFunctions}
+     *                   is to be set
+     * @param propertyValue the property value
+     * @param expected the expected result
+     * @param expectedType the expected throw type
+     * @throws Exception if the test fails other than the expected Exception, which
+     * would indicate an issue in configuring the test
+     */
+    @ParameterizedTest
+    @MethodSource("testData")
+    public void test(boolean useResolver, boolean setFSP, boolean FSPValue,
+            boolean setProperty, boolean propertyValue, String expected, Class<Throwable> expectedType) throws Exception {
+        if (expectedType != null) {
+            assertThrows(expectedType, () -> findToy(useResolver, setFSP, FSPValue, setProperty, propertyValue, expectedType));
+        } else {
+            String result = findToy(useResolver, setFSP, FSPValue, setProperty, propertyValue, expectedType);
+            assertEquals(expected, result);
+        }
+    }
+
+    public String findToy(boolean useResolver, boolean setFSP, boolean FSPValue,
+            boolean setProperty, boolean propertyValue, Class<Throwable> expectedType)
+            throws Exception {
+
+            Document doc = getDocument(JUnitTestUtil.SRC_DIR + "/XPathFunctionTest.xml");
+            XPathFactory xpf = XPathFactory.newDefaultInstance();
+            if (useResolver) {
+                xpf.setXPathFunctionResolver(new FunctionResolver(doc));
+            }
+            if (setFSP) {
+                xpf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, FSPValue);
+            }
+            if (setProperty) {
+                xpf.setFeature("jdk.xml.enableExtensionFunctions", propertyValue);
+            }
+
+            XPath xPath = xpf.newXPath();
+            XPathExpression exp = xPath.compile("ext:findToy('name', 'Another toy')");
+            Node toyNode = (Node)exp.evaluate(doc, XPathConstants.NODE);
+            String id = "", price = "";
+            if (toyNode != null && toyNode.getNodeType() == Node.ELEMENT_NODE) {
+                Element toyElement = (Element)toyNode;
+                id = toyElement.getAttribute("id");
+                price = toyElement.getElementsByTagName("price").item(0).getTextContent();
+
+            }
+            return "id=" + id + " price=" + price;
+
+    }
+
+    /**
+     * Returns a DOM Document.
+     * @param xmlFile the XML document to be parsed
+     * @return a DOM Document
+     * @throws Exception if error occurs
+     */
+    Document getDocument(String xmlFile)
+            throws Exception {
+        try {
+            DocumentBuilder builder = DocumentBuilderFactory.newDefaultInstance().newDocumentBuilder();
+            Document out = builder.parse(xmlFile);
+            return out;
+        } catch (Exception e) {
+            // won't happen, parsing a valid file
+        }
+        return null;
+    }
+
+    // XPathFunctionResolver customized for the FindFunction
+    class FunctionResolver implements XPathFunctionResolver {
+        private final Document doc;
+
+        public FunctionResolver(Document doc) {
+            this.doc = doc;
+        }
+
+        @Override
+        public XPathFunction resolveFunction(QName functionName, int arity) {
+            if ("findToy".equals(functionName.getLocalPart()) && arity == 2) {
+                return new FindFunction(doc);
+            }
+
+            return null;
+        }
+    }
+
+    // The Find function
+    class FindFunction implements XPathFunction {
+        private final Document doc;
+
+        public FindFunction(Document doc) {
+            this.doc = doc;
+        }
+
+        @SuppressWarnings("rawtypes")
+        public Object evaluate(List list) throws XPathFunctionException {
+            if (list == null || list.size() != 2) {
+                throw new XPathFunctionException("FindToy requires two args: name and value");
+            }
+
+            String eleName = (String)list.get(0);
+            String eleValue = (String)list.get(1);
+            NodeList toys = doc.getElementsByTagName("toy");
+
+            for (int i = 0; i<toys.getLength(); i++) {
+                Element toy = (Element)toys.item(i);
+                NodeList children = toy.getElementsByTagName(eleName);
+
+                if (children.getLength() > 0) {
+                    String text = children.item(0).getTextContent();
+                    if (eleValue.equals(text)) {
+                        return toy;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.xml b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.xml
new file mode 100644
index 00000000000..52c677fd72e
--- /dev/null
+++ b/test/jaxp/javax/xml/jaxp/unittest/xpath/XPathFunctionTest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<toys>
+    <toy id="1">
+        <name>Some toy</name>
+        <price>10</price>
+    </toy>
+    <toy id="2">
+        <name>Another toy</name>
+        <price>20</price>
+    </toy>
+</toys>

From 394961c8fe87da7376cc7522580cd4ac104c3cf5 Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Thu, 1 May 2025 17:26:32 +0000
Subject: [PATCH 232/901] 8328914: Document the java.security.debug property in
 javadoc

Reviewed-by: mullan
---
 .../doc-files/debug-system-property.html      | 193 ++++++++++++++++++
 .../classes/java/security/package-info.java   |   8 +-
 2 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 src/java.base/share/classes/java/security/doc-files/debug-system-property.html

diff --git a/src/java.base/share/classes/java/security/doc-files/debug-system-property.html b/src/java.base/share/classes/java/security/doc-files/debug-system-property.html
new file mode 100644
index 00000000000..4ea34252b3c
--- /dev/null
+++ b/src/java.base/share/classes/java/security/doc-files/debug-system-property.html
@@ -0,0 +1,193 @@
+<!doctype html>
+<!--
+ 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.
+-->
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>The java.security.debug system property</title>
+    <style>
+        #debug {
+         border: 1px solid black;
+         border-collapse: collapse;
+         margin: 0 auto;
+        }
+        #debug caption {
+          font-weight: bold;
+          font-size: smaller;
+        }
+        #debug, #debug th, #debug td {
+         border: 1px solid black;
+         padding: 2px .5em;
+        }
+        #debug tbody th {
+         font-weight: normal;
+         text-align:left;
+        }
+    </style>
+</head>
+<body LANG="en-US" DIR="LTR">
+<h1><B>{@systemProperty java.security.debug}</B></h1>
+<p> To monitor security access, you can set the <code>java.security.debug</code>
+    system property, which determines what trace messages are printed during
+    execution. The value of the property is one or more options separated by a
+    comma.
+</p>
+
+<h2>Printing Thread and Timestamp Information</h2>
+<p>
+    You can append the following strings to any option specified in the
+    <code>java.security.debug</code> system property to print additional
+    information:
+<ul>
+    <li><code>+thread</code>: Print thread and caller information</li>
+    <li><code>+timestamp</code>: Print timestamp information</li>
+</ul>
+<p>
+    For example, to add thread, caller, and timestamp information to all
+    debugging output, set the <code>java.security.debug</code> system property
+    on the command line as follows:
+    <pre><code>java -Djava.security.debug=all+thread+timestamp MyApp</code></pre>
+
+<p>The following table lists the <code>java.security.debug</code> options:</p>
+
+<table id="debug">
+    <caption><b>Security Debug Options</b></caption>
+    <thead>
+    <tr>
+        <th scope="col">Option</th>
+        <th scope="col">Description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <th scope="row"><code>all</code></th>
+        <td>Turn on all the debugging options</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>certpath</code></th>
+        <td>Turns on debugging for the PKIX <code>CertPathValidator</code> and
+            <code>CertPathBuilder</code> implementations. The following sub-options
+            can be used with the <code>certpath</code> option:
+            <ul>
+                <li><code><b>ocsp</b></code>: Dump OCSP protocol exchanges</li>
+                <li><code><b>verbose</b></code>: A hexadecimal dump of the OCSP
+                    request and response bytes is displayed.</li>
+            </ul>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><code>configfile</code></th>
+        <td>JAAS (Java Authentication and Authorization Service) configuration file loading</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>configparser</code></th>
+        <td>JAAS configuration file parsing</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>gssloginconfig</code></th>
+        <td>Java GSS (Generic Security Services) login configuration file debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>jar</code></th>
+        <td>JAR file verification</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>jca</code></th>
+        <td>JCA engine class debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>KeyStore</code></th>
+        <td><code>KeyStore</code> debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>logincontext</code></th>
+        <td><code>LoginContext</code> results</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>pcsc</code></th>
+        <td>Java Smart Card I/O and SunPCSC provider debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>pkcs11</code></th>
+        <td>PKCS11 session manager debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>pkcs11keystore</code></th>
+        <td>PKCS11 <code>KeyStore</code> debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>pkcs12</code></th>
+        <td>PKCS12 <code>KeyStore</code> debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>properties</code></th>
+        <td><code>java.security</code> configuration file debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>provider</code></th>
+        <td>Security provider debugging. The following sub-option can be used
+            with the <code>provider</code> option: <code>engine=(engines)</code>
+            : The output is displayed only for a specified list of one or more JCA
+            engines, separated by a comma. The supported values for (engines) are:
+            <ul>
+                <li><code>Cipher</code></li>
+                <li><code>KDF</code></li>
+                <li><code>KeyAgreement</code></li>
+                <li><code>KeyGenerator</code></li>
+                <li><code>KeyPairGenerator</code></li>
+                <li><code>KeyStore</code></li>
+                <li><code>Mac</code></li>
+                <li><code>MessageDigest</code></li>
+                <li><code>SecureRandom</code></li>
+                <li><code>Signature</code></li>
+            </ul>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><code>securerandom</code></th>
+        <td><code>SecureRandom</code> debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>sunpkcs11</code></th>
+        <td>SunPKCS11 provider debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>ts</code></th>
+        <td>Timestamping debugging</td>
+    </tr>
+    <tr>
+        <th scope="row"><code>x509</code></th>
+        <td>X.509 certificate debugging. The following sub-option can be used
+            with the <code>X.509</code> option.
+            <ul>
+                <li><code><b>ava</b></code>: Embed non-printable/non-escaped
+                    characters in AVA components as hex strings</li>
+            </ul>
+        </td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
diff --git a/src/java.base/share/classes/java/security/package-info.java b/src/java.base/share/classes/java/security/package-info.java
index b887d5c17a3..fafdca73801 100644
--- a/src/java.base/share/classes/java/security/package-info.java
+++ b/src/java.base/share/classes/java/security/package-info.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
@@ -71,6 +71,12 @@
  *
  * </ul>
  *
+ * <h2>Additional Specification</h2>
+ * <ul>
+ *   <li><a href="http://github.com/doc-files/debug-system-property.html">
+ *     The {@code java.security.debug} System Property</a></li>
+ * </ul>
+ *
  * @spec security/standard-names.html Java Security Standard Algorithm Names
  * @since 1.1
  */

From 9e26b9facba09c4d6f516e8032b876c6d9e95e9e Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Thu, 1 May 2025 17:40:57 +0000
Subject: [PATCH 233/901] 8355372: GenShen: Test
 gc/shenandoah/generational/TestOldGrowthTriggers.java fails with
 UseCompactObjectHeaders enabled

Reviewed-by: ysr, kdnilsen
---
 .../generational/TestOldGrowthTriggers.java   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java b/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
index d8471f2db2f..840ceffc4fe 100644
--- a/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
+++ b/test/hotspot/jtreg/gc/shenandoah/generational/TestOldGrowthTriggers.java
@@ -59,22 +59,17 @@ public static void makeOldAllocations() {
                 int deriveIndex = r.nextInt(ArraySize);
                 switch (i & 0x3) {
                     case 0:
-                        // 50% chance of creating garbage
-                        array[replaceIndex] = array[replaceIndex].max(array[deriveIndex]);
-                        break;
-                    case 1:
-                        // 50% chance of creating garbage
-                        array[replaceIndex] = array[replaceIndex].min(array[deriveIndex]);
-                        break;
-                    case 2:
                         // creates new old BigInteger, releases old BigInteger,
                         // may create ephemeral data while computing gcd
                         array[replaceIndex] = array[replaceIndex].gcd(array[deriveIndex]);
                         break;
-                    case 3:
+                    case 1:
                         // creates new old BigInteger, releases old BigInteger
                         array[replaceIndex] = array[replaceIndex].multiply(array[deriveIndex]);
                         break;
+                    case 2,3:
+                        // do nothing, let all objects in the array age to increase pressure on old generation
+                        break;
                 }
             }
         }
@@ -106,5 +101,17 @@ public static void main(String[] args) throws Exception {
                 "-XX:ShenandoahGuaranteedYoungGCInterval=0",
                 "-XX:ShenandoahGuaranteedOldGCInterval=0"
         );
+
+        testOld("-Xlog:gc",
+                "-Xms96m",
+                "-Xmx96m",
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+UseShenandoahGC",
+                "-XX:ShenandoahGCMode=generational",
+                "-XX:ShenandoahGuaranteedYoungGCInterval=0",
+                "-XX:ShenandoahGuaranteedOldGCInterval=0",
+                "-XX:+UseCompactObjectHeaders"
+        );
     }
 }

From c116b18b89950362d899448a36a4693f733067b1 Mon Sep 17 00:00:00 2001
From: Sergey Kuksenko <skuksenko@openjdk.org>
Date: Thu, 1 May 2025 18:45:20 +0000
Subject: [PATCH 234/901] 8355559: Benchmark modification/extension shouldn't
 affect the behavior of other benchmarks

Reviewed-by: ecaspole
---
 .../bench/javax/crypto/full/AESBench.java     | 27 +------
 .../javax/crypto/full/AESExtraBench.java      | 78 +++++++++++++++++++
 2 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/javax/crypto/full/AESExtraBench.java

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 0977d2bc462..59e995765e2 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
@@ -25,9 +25,6 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.infra.Blackhole;
-import java.security.GeneralSecurityException;
-import org.openjdk.jmh.annotations.Fork;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -39,10 +36,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidParameterSpecException;
 
-@Fork(jvmArgs = {"-Xms20g", "-Xmx20g", "-XX:+UseZGC"})
 public class AESBench extends CryptoBase {
 
-    public static final int SET_SIZE = 8;
+    public static final int SET_SIZE = 128;
 
     @Param({"AES/ECB/NoPadding", "AES/ECB/PKCS5Padding", "AES/CBC/NoPadding", "AES/CBC/PKCS5Padding"})
     private String algorithm;
@@ -55,9 +51,8 @@ public class AESBench extends CryptoBase {
 
     byte[][] data;
     byte[][] encryptedData;
-    private Cipher encryptCipher;
-    private Cipher decryptCipher;
-    private byte[] outBuffer;
+    Cipher encryptCipher;
+    Cipher decryptCipher;
     int index = 0;
 
     @Setup
@@ -71,7 +66,6 @@ public void setup() throws NoSuchAlgorithmException, NoSuchPaddingException, Inv
         decryptCipher.init(Cipher.DECRYPT_MODE, ks, encryptCipher.getParameters());
         data = fillRandom(new byte[SET_SIZE][dataSize]);
         encryptedData = fillEncrypted(data, encryptCipher);
-        outBuffer = new byte[dataSize + 128]; // extra space for tag, etc
     }
 
     @Benchmark
@@ -81,25 +75,10 @@ public byte[] encrypt() throws BadPaddingException, IllegalBlockSizeException {
         return encryptCipher.doFinal(d);
     }
 
-    @Benchmark
-    public void encrypt2(Blackhole bh) throws GeneralSecurityException {
-        byte[] d = data[index];
-        index = (index +1) % SET_SIZE;
-        bh.consume(encryptCipher.doFinal(d, 0, d.length, outBuffer));
-    }
-
     @Benchmark
     public byte[] decrypt() throws BadPaddingException, IllegalBlockSizeException {
         byte[] e = encryptedData[index];
         index = (index +1) % SET_SIZE;
         return decryptCipher.doFinal(e);
     }
-
-    @Benchmark
-    public void decrypt2(Blackhole bh) throws GeneralSecurityException {
-        byte[] e = encryptedData[index];
-        index = (index +1) % SET_SIZE;
-        bh.consume(decryptCipher.doFinal(e, 0, e.length, outBuffer));
-    }
-
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/AESExtraBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/AESExtraBench.java
new file mode 100644
index 00000000000..a78237f0c83
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESExtraBench.java
@@ -0,0 +1,78 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.crypto.full;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.GeneralSecurityException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidParameterSpecException;
+
+public class AESExtraBench extends AESBench {
+
+    public static final int SET_SIZE = 8;
+
+    @Param({"AES/CBC/NoPadding"})
+    private String algorithm;
+
+    @Param({"128", "192", "256"})
+    private int keyLength;
+
+    @Param({"" + 16 * 1024})
+    private int dataSize;
+
+    private byte[] outBuffer;
+    int index = 0;
+
+    @Setup
+    public void setup() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidParameterSpecException {
+        super.setup();
+        outBuffer = new byte[dataSize + 128]; // extra space for tag, etc
+    }
+
+    @Benchmark
+    public int encrypt2() throws GeneralSecurityException {
+        byte[] d = data[index];
+        index = (index +1) % SET_SIZE;
+        return encryptCipher.doFinal(d, 0, d.length, outBuffer);
+    }
+
+    @Benchmark
+    public int decrypt2() throws GeneralSecurityException {
+        byte[] e = encryptedData[index];
+        index = (index +1) % SET_SIZE;
+        return decryptCipher.doFinal(e, 0, e.length, outBuffer);
+    }
+
+}

From aae2bb62499855e3da33c06547d437e49c91a14b Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 1 May 2025 21:03:24 +0000
Subject: [PATCH 235/901] 8350209: Preserve adapters in AOT cache

Co-authored-by: Ashutosh Mehra <asmehra@openjdk.org>
Reviewed-by: vlivanov, asmehra, ihse, iklam
---
 make/hotspot/lib/JvmFeatures.gmk              |    1 +
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |   16 +-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |    5 +
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |   49 +-
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp     |   15 +-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |   16 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |   16 +-
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |   15 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |    5 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |   64 +-
 src/hotspot/cpu/zero/sharedRuntime_zero.cpp   |   23 +-
 .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp     |    7 +-
 .../os_cpu/linux_aarch64/os_linux_aarch64.cpp |    7 +-
 src/hotspot/share/asm/codeBuffer.cpp          |   20 +-
 src/hotspot/share/asm/codeBuffer.hpp          |    6 +-
 src/hotspot/share/cds/aotCacheAccess.cpp      |   55 +
 src/hotspot/share/cds/aotCacheAccess.hpp      |   47 +
 src/hotspot/share/cds/archiveBuilder.cpp      |   33 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |   10 +
 src/hotspot/share/cds/archiveUtils.cpp        |    8 +-
 src/hotspot/share/cds/archiveUtils.hpp        |    1 +
 src/hotspot/share/cds/cdsConfig.cpp           |   25 +-
 src/hotspot/share/cds/cdsConfig.hpp           |    6 +
 src/hotspot/share/cds/cds_globals.hpp         |   16 +
 src/hotspot/share/cds/cppVtables.cpp          |    2 +
 src/hotspot/share/cds/filemap.cpp             |   43 +-
 src/hotspot/share/cds/filemap.hpp             |    1 +
 src/hotspot/share/cds/metaspaceShared.cpp     |   24 +
 src/hotspot/share/cds/metaspaceShared.hpp     |    3 +-
 .../share/classfile/compactHashtable.hpp      |   16 +-
 src/hotspot/share/code/aotCodeCache.cpp       | 1324 +++++++++++++++++
 src/hotspot/share/code/aotCodeCache.hpp       |  365 +++++
 src/hotspot/share/code/codeBlob.cpp           |   88 +-
 src/hotspot/share/code/codeBlob.hpp           |   43 +
 src/hotspot/share/code/nmethod.cpp            |    2 +-
 src/hotspot/share/code/relocInfo.cpp          |  124 +-
 src/hotspot/share/code/relocInfo.hpp          |   18 +-
 src/hotspot/share/compiler/oopMap.cpp         |    2 -
 src/hotspot/share/compiler/oopMap.hpp         |    6 +-
 src/hotspot/share/include/cds.h               |    4 +-
 src/hotspot/share/memory/allocation.hpp       |    4 +-
 .../share/nmt/virtualMemoryTracker.cpp        |    5 +
 src/hotspot/share/oops/method.cpp             |   29 +-
 src/hotspot/share/opto/runtime.hpp            |    1 +
 src/hotspot/share/runtime/init.cpp            |    5 +-
 src/hotspot/share/runtime/mutexLocker.cpp     |    4 +
 src/hotspot/share/runtime/mutexLocker.hpp     |    2 +
 src/hotspot/share/runtime/sharedRuntime.cpp   |  760 +++++++---
 src/hotspot/share/runtime/sharedRuntime.hpp   |  118 +-
 test/hotspot/jtreg/TEST.groups                |    3 +
 .../cds/appcds/aotCode/AOTCodeFlags.java      |  108 ++
 51 files changed, 3100 insertions(+), 470 deletions(-)
 create mode 100644 src/hotspot/share/cds/aotCacheAccess.cpp
 create mode 100644 src/hotspot/share/cds/aotCacheAccess.hpp
 create mode 100644 src/hotspot/share/code/aotCodeCache.cpp
 create mode 100644 src/hotspot/share/code/aotCodeCache.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java

diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 0a897230f83..ffea9aa3926 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -125,6 +125,7 @@ endif
 ifneq ($(call check-jvm-feature, cds), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
   JVM_EXCLUDE_FILES += \
+      aotCodeCache.cpp \
       classLoaderDataShared.cpp \
       classLoaderExt.cpp \
       systemDictionaryShared.cpp
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index fd6af0b9b4b..cf347768de3 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -675,6 +675,9 @@ void MacroAssembler::set_last_Java_frame(Register last_java_sp,
 }
 
 static inline bool target_needs_far_branch(address addr) {
+  if (AOTCodeCache::is_on_for_dump()) {
+    return true;
+  }
   // codecache size <= 128M
   if (!MacroAssembler::far_branches()) {
     return false;
@@ -859,6 +862,9 @@ void MacroAssembler::call_VM_helper(Register oop_result, address entry_point, in
 
 // Check the entry target is always reachable from any branch.
 static bool is_always_within_branch_range(Address entry) {
+  if (AOTCodeCache::is_on_for_dump()) {
+    return false;
+  }
   const address target = entry.target();
 
   if (!CodeCache::contains(target)) {
@@ -2154,7 +2160,7 @@ void MacroAssembler::call_VM_leaf_base(address entry_point,
 
   stp(rscratch1, rmethod, Address(pre(sp, -2 * wordSize)));
 
-  mov(rscratch1, entry_point);
+  mov(rscratch1, RuntimeAddress(entry_point));
   blr(rscratch1);
   if (retaddr)
     bind(*retaddr);
@@ -3231,9 +3237,13 @@ void MacroAssembler::resolve_global_jobject(Register value, Register tmp1, Regis
 }
 
 void MacroAssembler::stop(const char* msg) {
-  BLOCK_COMMENT(msg);
+  // Skip AOT caching C strings in scratch buffer.
+  const char* str = (code_section()->scratch_emit()) ? msg : AOTCodeCache::add_C_string(msg);
+  BLOCK_COMMENT(str);
+  // load msg into r0 so we can access it from the signal handler
+  // ExternalAddress enables saving and restoring via the code cache
+  lea(c_rarg0, ExternalAddress((address) str));
   dcps1(0xdeae);
-  emit_int64((uintptr_t)msg);
 }
 
 void MacroAssembler::unimplemented(const char* what) {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index e6075b0073b..17ee72a00c0 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -27,6 +27,7 @@
 #define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
 
 #include "asm/assembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/vmreg.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "oops/compressedOops.hpp"
@@ -1315,6 +1316,10 @@ class MacroAssembler: public Assembler {
 
   // Check if branches to the non nmethod section require a far jump
   static bool codestub_branch_needs_far_jump() {
+    if (AOTCodeCache::is_on_for_dump()) {
+      // To calculate far_codestub_branch_size correctly.
+      return true;
+    }
     return CodeCache::max_distance_to_non_nmethod() > branch_range;
   }
 
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 967984b8821..0c3dfabc93e 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -557,40 +557,6 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   // If this happens, control eventually transfers back to the compiled
   // caller, but with an uncorrected stack, causing delayed havoc.
 
-  if (VerifyAdapterCalls &&
-      (Interpreter::code() != nullptr || StubRoutines::final_stubs_code() != nullptr)) {
-#if 0
-    // 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, r11,
-                  Interpreter::code()->code_start(), Interpreter::code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::initial_stubs_code() != nullptr) {
-      range_check(masm, rax, r11,
-                  StubRoutines::initial_stubs_code()->code_begin(),
-                  StubRoutines::initial_stubs_code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::final_stubs_code() != nullptr) {
-      range_check(masm, rax, r11,
-                  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 ");
-#endif
-  }
-
   // Cut-out for having no stack args.
   int comp_words_on_stack = align_up(comp_args_on_stack*VMRegImpl::stack_slot_size, wordSize)>>LogBytesPerWord;
   if (comp_args_on_stack) {
@@ -711,12 +677,12 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
 }
 
 // ---------------------------------------------------------------
-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) {
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   address i2c_entry = __ pc();
 
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
@@ -777,7 +743,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *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, c2i_no_clinit_check_entry);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+  return;
 }
 
 static int c_calling_convention_priv(const BasicType *sig_bt,
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 6dde82daaf9..8ba847e7e32 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -612,12 +612,12 @@ static void gen_c2i_adapter(MacroAssembler *masm,
 
 }
 
-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) {
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   address i2c_entry = __ pc();
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
 
@@ -637,7 +637,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
   address c2i_entry = __ pc();
   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);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, nullptr);
+  return;
 }
 
 
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 1c9c88b3c30..5a33a14f79e 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -1143,12 +1143,12 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   __ bctr();
 }
 
-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) {
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   address i2c_entry;
   address c2i_unverified_entry;
   address c2i_entry;
@@ -1223,8 +1223,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
 
   gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, call_interpreter, ientry);
 
-  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry,
-                                          c2i_no_clinit_check_entry);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+  return;
 }
 
 // An oop arg. Must pass a handle not the oop itself.
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 10790841490..5f53485a97f 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -596,12 +596,13 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
 }
 
 // ---------------------------------------------------------------
-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) {
+
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   address i2c_entry = __ pc();
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
 
@@ -658,7 +659,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *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, c2i_no_clinit_check_entry);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+  return;
 }
 
 int SharedRuntime::vector_calling_convention(VMRegPair *regs,
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 099e28a3adc..bd5bbf4c7e5 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2352,12 +2352,12 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   __ z_br(Z_R1_scratch);
 }
 
-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) {
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   __ align(CodeEntryAlignment);
   address i2c_entry = __ pc();
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
@@ -2411,7 +2411,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *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, c2i_no_clinit_check_entry);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+  return;
 }
 
 // This function returns the adjust size (in number of words) to a c2i adapter
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 4d3bd12ed66..35e461b601f 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -24,6 +24,7 @@
 
 #include "asm/assembler.hpp"
 #include "asm/assembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
@@ -366,7 +367,9 @@ void MacroAssembler::stop(const char* msg) {
     lea(c_rarg1, InternalAddress(rip));
     movq(c_rarg2, rsp); // pass pointer to regs array
   }
-  lea(c_rarg0, ExternalAddress((address) msg));
+  // Skip AOT caching C strings in scratch buffer.
+  const char* str = (code_section()->scratch_emit()) ? msg : AOTCodeCache::add_C_string(msg);
+  lea(c_rarg0, ExternalAddress((address) str));
   andq(rsp, -16); // align stack as required by ABI
   call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64)));
   hlt();
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 621340964ac..7811d59d12d 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -675,7 +675,6 @@ static void patch_callers_callsite(MacroAssembler *masm) {
   __ bind(L);
 }
 
-
 static void gen_c2i_adapter(MacroAssembler *masm,
                             int total_args_passed,
                             int comp_args_on_stack,
@@ -826,19 +825,6 @@ static void gen_c2i_adapter(MacroAssembler *masm,
   __ jmp(rcx);
 }
 
-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,
@@ -871,41 +857,6 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
   // If this happens, control eventually transfers back to the compiled
   // caller, but with an uncorrected stack, causing delayed havoc.
 
-  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 { ");
-    // Pick up the return address
-    __ movptr(rax, Address(rsp, 0));
-    Label L_ok;
-    if (Interpreter::code() != nullptr) {
-      range_check(masm, rax, r11,
-                  Interpreter::code()->code_start(),
-                  Interpreter::code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::initial_stubs_code() != nullptr) {
-      range_check(masm, rax, r11,
-                  StubRoutines::initial_stubs_code()->code_begin(),
-                  StubRoutines::initial_stubs_code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::final_stubs_code() != nullptr) {
-      range_check(masm, rax, r11,
-                  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(r11, rsp);
@@ -1050,12 +1001,12 @@ void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
 }
 
 // ---------------------------------------------------------------
-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) {
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
   address i2c_entry = __ pc();
 
   gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
@@ -1117,7 +1068,8 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *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, c2i_no_clinit_check_entry);
+  handler->set_entry_points(i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
+  return;
 }
 
 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
diff --git a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
index f141135ff95..60a873ab31f 100644
--- a/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
+++ b/src/hotspot/cpu/zero/sharedRuntime_zero.cpp
@@ -50,18 +50,17 @@ int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
   return 0;
 }
 
-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) {
-  return AdapterHandlerLibrary::new_entry(
-    fingerprint,
-    CAST_FROM_FN_PTR(address,zero_null_code_stub),
-    CAST_FROM_FN_PTR(address,zero_null_code_stub),
-    CAST_FROM_FN_PTR(address,zero_null_code_stub));
+void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
+                                            int total_args_passed,
+                                            int comp_args_on_stack,
+                                            const BasicType *sig_bt,
+                                            const VMRegPair *regs,
+                                            AdapterHandlerEntry* handler) {
+  handler->set_entry_points(CAST_FROM_FN_PTR(address,zero_null_code_stub),
+                            CAST_FROM_FN_PTR(address,zero_null_code_stub),
+                            CAST_FROM_FN_PTR(address,zero_null_code_stub),
+                            nullptr);
+  return;
 }
 
 nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index 7b35317882d..aeba308d3a2 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -271,11 +271,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
       } else if (sig == SIGILL && nativeInstruction_at(pc)->is_stop()) {
-        // Pull a pointer to the error message out of the instruction
-        // stream.
-        const uint64_t *detail_msg_ptr
-          = (uint64_t*)(pc + NativeInstruction::instruction_size);
-        const char *detail_msg = (const char *)*detail_msg_ptr;
+        // A pointer to the message will have been placed in r0
+        const char *detail_msg = (const char *)(uc->uc_mcontext->DU3_PREFIX(ss,x[0]));
         const char *msg = "stop";
         if (TraceTraps) {
           tty->print_cr("trap: %s: (SIGILL)", msg);
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 7728c62682c..4335733d1fe 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -248,11 +248,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
           stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
         }
       } else if (sig == SIGILL && nativeInstruction_at(pc)->is_stop()) {
-        // Pull a pointer to the error message out of the instruction
-        // stream.
-        const uint64_t *detail_msg_ptr
-          = (uint64_t*)(pc + NativeInstruction::instruction_size);
-        const char *detail_msg = (const char *)*detail_msg_ptr;
+        // A pointer to the message will have been placed in r0
+        const char *detail_msg = (const char *)(uc->uc_mcontext.regs[0]);
         const char *msg = "stop";
         if (TraceTraps) {
           tty->print_cr("trap: %s: (SIGILL)", msg);
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index fc8f72a881e..be7a39380d9 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -722,7 +722,7 @@ void CodeBuffer::copy_code_to(CodeBlob* dest_blob) {
 #ifndef PRODUCT
   if (PrintNMethods && (WizardMode || Verbose)) {
     tty->print("done with CodeBuffer:");
-    ((CodeBuffer*)this)->print();
+    ((CodeBuffer*)this)->print_on(tty);
   }
 #endif //PRODUCT
 
@@ -861,7 +861,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
 #ifndef PRODUCT
   if (PrintNMethods && (WizardMode || Verbose)) {
     tty->print("expanding CodeBuffer:");
-    this->print();
+    this->print_on(tty);
   }
 
   if (StressCodeBuffers && blob() != nullptr) {
@@ -949,7 +949,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
   _decode_begin = nullptr;  // sanity
   if (PrintNMethods && (WizardMode || Verbose)) {
     tty->print("expanded CodeBuffer:");
-    this->print();
+    this->print_on(tty);
   }
 #endif //PRODUCT
 }
@@ -1066,24 +1066,24 @@ void CodeBuffer::decode() {
   _decode_begin = insts_end();
 }
 
-void CodeSection::print(const char* name) {
+void CodeSection::print_on(outputStream* st, const char* name) {
   csize_t locs_size = locs_end() - locs_start();
-  tty->print_cr(" %7s.code = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d)",
+  st->print_cr(" %7s.code = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d)",
                 name, p2i(start()), p2i(end()), p2i(limit()), size(), capacity());
-  tty->print_cr(" %7s.locs = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d) point=%d",
+  st->print_cr(" %7s.locs = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d) point=%d",
                 name, p2i(locs_start()), p2i(locs_end()), p2i(locs_limit()), locs_size, locs_capacity(), locs_point_off());
   if (PrintRelocations && (locs_size != 0)) {
     RelocIterator iter(this);
-    iter.print();
+    iter.print_on(st);
   }
 }
 
-void CodeBuffer::print() {
-  tty->print_cr("CodeBuffer:");
+void CodeBuffer::print_on(outputStream* st) {
+  st->print_cr("CodeBuffer:%s", name());
   for (int n = 0; n < (int)SECT_LIMIT; n++) {
     // print each section
     CodeSection* cs = code_section(n);
-    cs->print(code_section_name(n));
+    cs->print_on(st, code_section_name(n));
   }
 }
 
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index b38cc74cc3b..95cd4b7f912 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -89,6 +89,7 @@ class CodeOffsets: public StackObj {
 // They are filled concurrently, and concatenated at the end.
 class CodeSection {
   friend class CodeBuffer;
+  friend class AOTCodeReader;
  public:
   typedef int csize_t;  // code size type; would be size_t except for history
 
@@ -283,7 +284,7 @@ class CodeSection {
 
 #ifndef PRODUCT
   void decode();
-  void print(const char* name);
+  void print_on(outputStream* st, const char* name);
 #endif //PRODUCT
 };
 
@@ -386,6 +387,7 @@ typedef GrowableArray<SharedStubToInterpRequest> SharedStubToInterpRequests;
 class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
   friend class CodeSection;
   friend class StubCodeGenerator;
+  friend class AOTCodeReader;
 
  private:
   // CodeBuffers must be allocated on the stack except for a single
@@ -742,7 +744,7 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
   // Printing / Decoding
   // decodes from decode_begin() to code_end() and sets decode_begin to end
   void    decode();
-  void    print();
+  void    print_on(outputStream* st);
 #endif
   // Directly disassemble code buffer.
   void    decode(address start, address end);
diff --git a/src/hotspot/share/cds/aotCacheAccess.cpp b/src/hotspot/share/cds/aotCacheAccess.cpp
new file mode 100644
index 00000000000..b6c4a201da5
--- /dev/null
+++ b/src/hotspot/share/cds/aotCacheAccess.cpp
@@ -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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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/aotCacheAccess.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/filemap.hpp"
+#include "cds/heapShared.hpp"
+#include "cds/metaspaceShared.hpp"
+#include "classfile/stringTable.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
+#include "memory/resourceArea.hpp"
+#include "memory/universe.hpp"
+#include "memory/virtualspace.hpp"
+#include "oops/instanceKlass.hpp"
+
+void* AOTCacheAccess::allocate_aot_code_region(size_t size) {
+  assert(CDSConfig::is_dumping_final_static_archive(), "must be");
+  return (void*)ArchiveBuilder::ac_region_alloc(size);
+}
+
+size_t AOTCacheAccess::get_aot_code_region_size() {
+  assert(CDSConfig::is_using_archive(), "must be");
+  FileMapInfo* mapinfo = FileMapInfo::current_info();
+  assert(mapinfo != nullptr, "must be");
+  return mapinfo->region_at(MetaspaceShared::ac)->used_aligned();
+}
+
+bool AOTCacheAccess::map_aot_code_region(ReservedSpace rs) {
+  FileMapInfo* static_mapinfo = FileMapInfo::current_info();
+  assert(UseSharedSpaces && static_mapinfo != nullptr, "must be");
+  return static_mapinfo->map_aot_code_region(rs);
+}
diff --git a/src/hotspot/share/cds/aotCacheAccess.hpp b/src/hotspot/share/cds/aotCacheAccess.hpp
new file mode 100644
index 00000000000..31fb9da534d
--- /dev/null
+++ b/src/hotspot/share/cds/aotCacheAccess.hpp
@@ -0,0 +1,47 @@
+/*
+ * 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_CDS_AOTCACHEACCESS_HPP
+#define SHARE_CDS_AOTCACHEACCESS_HPP
+
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.hpp"
+#include "memory/allStatic.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class ReservedSpace;
+
+// AOT Cache API for AOT compiler
+
+class AOTCacheAccess : AllStatic {
+public:
+  static void* allocate_aot_code_region(size_t size) NOT_CDS_RETURN_(nullptr);
+
+  static size_t get_aot_code_region_size() NOT_CDS_RETURN_(0);
+
+  static bool map_aot_code_region(ReservedSpace rs) NOT_CDS_RETURN_(false);
+};
+
+#endif // SHARE_CDS_AOTCACHEACCESS_HPP
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index ef75bd42323..3de4cdec187 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -42,6 +42,7 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
+#include "code/aotCodeCache.hpp"
 #include "interpreter/abstractInterpreter.hpp"
 #include "jvm.h"
 #include "logging/log.hpp"
@@ -163,6 +164,7 @@ ArchiveBuilder::ArchiveBuilder() :
   _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),
+  _ac_region("ac", MAX_SHARED_DELTA),
   _ptrmap(mtClassShared),
   _rw_ptrmap(mtClassShared),
   _ro_ptrmap(mtClassShared),
@@ -306,7 +308,8 @@ void ArchiveBuilder::sort_klasses() {
 }
 
 address ArchiveBuilder::reserve_buffer() {
-  size_t buffer_size = LP64_ONLY(CompressedClassSpaceSize) NOT_LP64(256 * M);
+  // AOTCodeCache::max_aot_code_size() accounts for aot code region.
+  size_t buffer_size = LP64_ONLY(CompressedClassSpaceSize) NOT_LP64(256 * M) + AOTCodeCache::max_aot_code_size();
   ReservedSpace rs = MemoryReserver::reserve(buffer_size,
                                              MetaspaceShared::core_region_alignment(),
                                              os::vm_page_size(),
@@ -532,6 +535,13 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
   } else if (ref->msotype() == MetaspaceObj::MethodDataType ||
              ref->msotype() == MetaspaceObj::MethodCountersType) {
     return set_to_null;
+  } else if (ref->msotype() == MetaspaceObj::AdapterHandlerEntryType) {
+    if (AOTCodeCache::is_dumping_adapters()) {
+      AdapterHandlerEntry* entry = (AdapterHandlerEntry*)ref->obj();
+      return AdapterHandlerLibrary::is_abstract_method_adapter(entry) ? set_to_null : make_a_copy;
+    } else {
+      return set_to_null;
+    }
   } else {
     if (ref->msotype() == MetaspaceObj::ClassType) {
       Klass* klass = (Klass*)ref->obj();
@@ -705,6 +715,11 @@ void ArchiveBuilder::mark_and_relocate_to_buffered_addr(address* ptr_location) {
   ArchivePtrMarker::mark_pointer(ptr_location);
 }
 
+bool ArchiveBuilder::has_been_archived(address src_addr) const {
+  SourceObjInfo* p = _src_obj_table.get(src_addr);
+  return (p != nullptr);
+}
+
 bool ArchiveBuilder::has_been_buffered(address src_addr) const {
   if (RegeneratedClasses::has_been_regenerated(src_addr) ||
       _src_obj_table.get(src_addr) == nullptr ||
@@ -973,6 +988,15 @@ address ArchiveBuilder::offset_to_buffered_address(u4 offset) const {
   return buffered_addr;
 }
 
+void ArchiveBuilder::start_ac_region() {
+  ro_region()->pack();
+  start_dump_region(&_ac_region);
+}
+
+void ArchiveBuilder::end_ac_region() {
+  _ac_region.pack();
+}
+
 #if INCLUDE_CDS_JAVA_HEAP
 narrowKlass ArchiveBuilder::get_requested_narrow_klass(Klass* k) {
   assert(CDSConfig::is_dumping_heap(), "sanity");
@@ -1082,8 +1106,9 @@ int ArchiveBuilder::precomputed_narrow_klass_shift() {
 #endif // _LP64
 
 void ArchiveBuilder::relocate_to_requested() {
-  ro_region()->pack();
-
+  if (!ro_region()->is_packed()) {
+    ro_region()->pack();
+  }
   size_t my_archive_size = buffer_top() - buffer_bottom();
 
   if (CDSConfig::is_dumping_static_archive()) {
@@ -1527,6 +1552,7 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
 
   write_region(mapinfo, MetaspaceShared::rw, &_rw_region, /*read_only=*/false,/*allow_exec=*/false);
   write_region(mapinfo, MetaspaceShared::ro, &_ro_region, /*read_only=*/true, /*allow_exec=*/false);
+  write_region(mapinfo, MetaspaceShared::ac, &_ac_region, /*read_only=*/false,/*allow_exec=*/false);
 
   // Split pointer map into read-write and read-only bitmaps
   ArchivePtrMarker::initialize_rw_ro_maps(&_rw_ptrmap, &_ro_ptrmap);
@@ -1579,6 +1605,7 @@ void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo, ArchiveHeapInfo* h
 
   _rw_region.print(total_reserved);
   _ro_region.print(total_reserved);
+  _ac_region.print(total_reserved);
 
   print_bitmap_region_stats(bitmap_used, total_reserved);
 
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 5913ae29c78..531c43e1cbf 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -217,6 +217,7 @@ class ArchiveBuilder : public StackObj {
 
   DumpRegion _rw_region;
   DumpRegion _ro_region;
+  DumpRegion _ac_region; // AOT code
 
   // Combined bitmap to track pointers in both RW and RO regions. This is updated
   // as objects are copied into RW and RO.
@@ -372,6 +373,7 @@ class ArchiveBuilder : public StackObj {
   DumpRegion* pz_region() { return &_pz_region; }
   DumpRegion* rw_region() { return &_rw_region; }
   DumpRegion* ro_region() { return &_ro_region; }
+  DumpRegion* ac_region() { return &_ac_region; }
 
   static char* rw_region_alloc(size_t num_bytes) {
     return current()->rw_region()->allocate(num_bytes);
@@ -379,6 +381,12 @@ class ArchiveBuilder : public StackObj {
   static char* ro_region_alloc(size_t num_bytes) {
     return current()->ro_region()->allocate(num_bytes);
   }
+  static char* ac_region_alloc(size_t num_bytes) {
+    return current()->ac_region()->allocate(num_bytes);
+  }
+
+  void start_ac_region();
+  void end_ac_region();
 
   template <typename T>
   static Array<T>* new_ro_array(int length) {
@@ -426,6 +434,8 @@ class ArchiveBuilder : public StackObj {
     mark_and_relocate_to_buffered_addr((address*)ptr_location);
   }
 
+  bool has_been_archived(address src_addr) const;
+
   bool has_been_buffered(address src_addr) const;
   template <typename T> bool has_been_buffered(T src_addr) const {
     return has_been_buffered((address)src_addr);
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 217b30e401d..0b01494574c 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -270,9 +270,10 @@ void DumpRegion::append_intptr_t(intptr_t n, bool need_to_mark) {
 }
 
 void DumpRegion::print(size_t total_bytes) const {
+  char* base = used() > 0 ? ArchiveBuilder::current()->to_requested(_base) : nullptr;
   log_debug(cds)("%s space: %9zu [ %4.1f%% of total] out of %9zu bytes [%5.1f%% used] at " INTPTR_FORMAT,
                  _name, used(), percent_of(used(), total_bytes), reserved(), percent_of(used(), reserved()),
-                 p2i(ArchiveBuilder::current()->to_requested(_base)));
+                 p2i(base));
 }
 
 void DumpRegion::print_out_of_space_msg(const char* failing_region, size_t needed_bytes) {
@@ -295,7 +296,10 @@ void DumpRegion::init(ReservedSpace* rs, VirtualSpace* vs) {
 }
 
 void DumpRegion::pack(DumpRegion* next) {
-  assert(!is_packed(), "sanity");
+  if (!is_packed()) {
+    _end = (char*)align_up(_top, MetaspaceShared::core_region_alignment());
+    _is_packed = true;
+  }
   _end = (char*)align_up(_top, MetaspaceShared::core_region_alignment());
   _is_packed = true;
   if (next != nullptr) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 56d28ec910c..836ec93f641 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -180,6 +180,7 @@ class DumpRegion {
   bool is_allocatable() const {
     return !is_packed() && _base != nullptr;
   }
+  bool is_empty()   const { return _base == _top; }
 
   void print(size_t total_bytes) const;
   void print_out_of_space_msg(const char* failing_region, size_t needed_bytes);
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 9af83653351..701b2584774 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -402,6 +402,10 @@ void CDSConfig::check_aot_flags() {
   CHECK_SINGLE_PATH(AOTCache);
   CHECK_SINGLE_PATH(AOTConfiguration);
 
+  if (FLAG_IS_DEFAULT(AOTCache) && AOTAdapterCaching) {
+    log_debug(aot,codecache,init)("AOTCache is not specified - AOTAdapterCaching is ignored");
+  }
+
   if (FLAG_IS_DEFAULT(AOTCache) && FLAG_IS_DEFAULT(AOTConfiguration) && FLAG_IS_DEFAULT(AOTMode)) {
     // AOTCache/AOTConfiguration/AOTMode not used.
     return;
@@ -517,7 +521,7 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
   }
 
   if (is_dumping_static_archive()) {
-    if (is_dumping_preimage_static_archive()) {
+    if (is_dumping_preimage_static_archive() || is_dumping_final_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.
@@ -844,3 +848,22 @@ bool CDSConfig::is_dumping_method_handles() {
 }
 
 #endif // INCLUDE_CDS_JAVA_HEAP
+
+// AOT code generation and its archiving is disabled by default.
+// We enable it only in the final image dump after the metadata and heap are dumped.
+// This affects only JITed code because it may have embedded oops and metadata pointers
+// which AOT code encodes as offsets in final CDS archive regions.
+
+static bool _is_dumping_aot_code = false;
+
+bool CDSConfig::is_dumping_aot_code() {
+  return _is_dumping_aot_code;
+}
+
+void CDSConfig::disable_dumping_aot_code() {
+  _is_dumping_aot_code = false;
+}
+
+void CDSConfig::enable_dumping_aot_code() {
+  _is_dumping_aot_code = true;
+}
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index e96291f6534..e82acebd175 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -181,6 +181,12 @@ class CDSConfig : public AllStatic {
   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;
 
+  // --- AOT code
+
+  static bool is_dumping_aot_code()                          NOT_CDS_RETURN_(false);
+  static void disable_dumping_aot_code()                     NOT_CDS_RETURN;
+  static void enable_dumping_aot_code()                      NOT_CDS_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 2dae9b45221..26853a3fb74 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -127,6 +127,22 @@
   product(bool, AOTCacheParallelRelocation, true, DIAGNOSTIC,               \
           "Use parallel relocation code to speed up startup.")              \
                                                                             \
+  /* AOT Code flags */                                                      \
+                                                                            \
+  product(bool, AOTAdapterCaching, false, DIAGNOSTIC,                       \
+          "Enable saving and restoring i2c2i adapters in AOT cache")        \
+                                                                            \
+  product(uint, AOTCodeMaxSize, 10*M, DIAGNOSTIC,                           \
+          "Buffer size in bytes for AOT code caching")                      \
+          range(1*M, max_jint)                                              \
+                                                                            \
+  product(bool, AbortVMOnAOTCodeFailure, false, DIAGNOSTIC,                 \
+          "Abort VM on the first occurrence of AOT code load or store "     \
+          "failure. By default VM will continue execute without AOT code.") \
+                                                                            \
+  develop(bool, TestAOTAdapterLinkFailure, false,                           \
+          "Test failure of adapter linking when loading from AOT cache.")   \
+
 // end of CDS_FLAGS
 
 DECLARE_FLAGS(CDS_FLAGS)
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index b8243cedf6d..7d484c8d327 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -281,6 +281,8 @@ intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address ob
   case MetaspaceObj::AnnotationsType:
   case MetaspaceObj::MethodCountersType:
   case MetaspaceObj::RecordComponentType:
+  case MetaspaceObj::AdapterHandlerEntryType:
+  case MetaspaceObj::AdapterFingerPrintType:
     // These have no vtables.
     break;
   case MetaspaceObj::MethodDataType:
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 1b5d455485c..fbef3c9532d 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -824,7 +824,7 @@ bool FileMapRegion::check_region_crc(char* base) const {
 
 static const char* region_name(int region_index) {
   static const char* names[] = {
-    "rw", "ro", "bm", "hp"
+    "rw", "ro", "bm", "hp", "ac"
   };
   const int num_regions = sizeof(names)/sizeof(names[0]);
   assert(0 <= region_index && region_index < num_regions, "sanity");
@@ -910,6 +910,9 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
                    " bytes, addr " INTPTR_FORMAT " file offset 0x%08" PRIxPTR
                    " crc 0x%08x",
                    region_name(region), region, size, p2i(requested_base), _file_offset, crc);
+  } else {
+     log_info(cds)("Shared file region (%s) %d: %8zu"
+                   " bytes", region_name(region), region, size);
   }
 
   r->init(region, mapping_offset, size, read_only, allow_exec, crc);
@@ -1111,7 +1114,7 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
 }
 
 // Memory map a region in the address space.
-static const char* shared_region_name[] = { "ReadWrite", "ReadOnly", "Bitmap", "Heap" };
+static const char* shared_region_name[] = { "ReadWrite", "ReadOnly", "Bitmap", "Heap", "Code" };
 
 MapArchiveResult FileMapInfo::map_regions(int regions[], int num_regions, char* mapped_base_address, ReservedSpace rs) {
   DEBUG_ONLY(FileMapRegion* last_region = nullptr);
@@ -1274,6 +1277,42 @@ char* FileMapInfo::map_bitmap_region() {
   return bitmap_base;
 }
 
+bool FileMapInfo::map_aot_code_region(ReservedSpace rs) {
+  FileMapRegion* r = region_at(MetaspaceShared::ac);
+  assert(r->used() > 0 && r->used_aligned() == rs.size(), "must be");
+
+  char* requested_base = rs.base();
+  assert(requested_base != nullptr, "should be inside code cache");
+
+  char* mapped_base;
+  if (MetaspaceShared::use_windows_memory_mapping()) {
+    if (!read_region(MetaspaceShared::ac, requested_base, r->used_aligned(), /* do_commit = */ true)) {
+      log_info(cds)("Failed to read aot code shared space into reserved space at " INTPTR_FORMAT,
+                    p2i(requested_base));
+      return false;
+    }
+    mapped_base = requested_base;
+  } else {
+    // We do not execute in-place in the AOT code region.
+    // AOT code is copied to the CodeCache for execution.
+    bool read_only = false, allow_exec = false;
+    mapped_base = map_memory(_fd, _full_path, r->file_offset(),
+                             requested_base, r->used_aligned(), read_only, allow_exec, mtClassShared);
+  }
+  if (mapped_base == nullptr) {
+    log_info(cds)("failed to map aot code region");
+    return false;
+  } else {
+    assert(mapped_base == requested_base, "must be");
+    r->set_mapped_from_file(true);
+    r->set_mapped_base(mapped_base);
+    log_info(cds)("Mapped static  region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
+                  MetaspaceShared::ac, p2i(r->mapped_base()), p2i(r->mapped_end()),
+                  shared_region_name[MetaspaceShared::ac]);
+    return true;
+  }
+}
+
 class SharedDataRelocationTask : public ArchiveWorkerTask {
 private:
   BitMapView* const _rw_bm;
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 8793e110948..d90be1ccff3 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -368,6 +368,7 @@ class FileMapInfo : public CHeapObj<mtInternal> {
   MemRegion get_heap_region_requested_range() NOT_CDS_JAVA_HEAP_RETURN_(MemRegion());
   bool  read_region(int i, char* base, size_t size, bool do_commit);
   char* map_bitmap_region();
+  bool  map_aot_code_region(ReservedSpace rs);
   void  unmap_region(int i);
   void  close();
   bool  is_open() { return _file_open; }
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index bdec6441080..5f7b496f8d2 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -59,6 +59,7 @@
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "interpreter/bytecodeStream.hpp"
@@ -491,6 +492,8 @@ void MetaspaceShared::serialize(SerializeClosure* soc) {
   soc->do_ptr((void**)&_archived_method_handle_intrinsics);
 
   LambdaFormInvokers::serialize(soc);
+  AdapterHandlerLibrary::serialize_shared_table_header(soc);
+
   soc->do_tag(666);
 }
 
@@ -609,6 +612,10 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
   // Write lambform lines into archive
   LambdaFormInvokers::dump_static_archive_invokers();
 
+  if (AOTCodeCache::is_dumping_adapters()) {
+    AdapterHandlerLibrary::dump_aot_adapter_table();
+  }
+
   // Write the other data to the output array.
   DumpRegion* ro_region = ArchiveBuilder::current()->ro_region();
   char* start = ro_region->top();
@@ -998,6 +1005,17 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
   VM_PopulateDumpSharedSpace op(builder);
   VMThread::execute(&op);
 
+  if (AOTCodeCache::is_on_for_dump() && CDSConfig::is_dumping_final_static_archive()) {
+    CDSConfig::enable_dumping_aot_code();
+    {
+      builder.start_ac_region();
+      // Write the contents to AOT code region and close AOTCodeCache before packing the region
+      AOTCodeCache::close();
+      builder.end_ac_region();
+    }
+    CDSConfig::disable_dumping_aot_code();
+  }
+
   if (!write_static_archive(&builder, op.map_info(), op.heap_info())) {
     THROW_MSG(vmSymbols::java_io_IOException(), "Encountered error while dumping");
   }
@@ -1769,6 +1787,7 @@ void MetaspaceShared::initialize_shared_spaces() {
   static_mapinfo->patch_heap_embedded_pointers();
   ArchiveHeapLoader::finish_initialization();
   Universe::load_archived_object_instances();
+  AOTCodeCache::initialize();
 
   // Close the mapinfo file
   static_mapinfo->close();
@@ -1820,6 +1839,11 @@ void MetaspaceShared::initialize_shared_spaces() {
       SystemDictionaryShared::print_shared_archive(tty, false/*dynamic*/);
     }
 
+    if (AOTCodeCache::is_on_for_use()) {
+      tty->print_cr("\n\nAOT Code");
+      AOTCodeCache::print_on(tty);
+    }
+
     // collect shared symbols and strings
     CountSharedSymbols cl;
     SymbolTable::shared_symbols_do(&cl);
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index e03994be1b9..875801cc0e6 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -67,8 +67,9 @@ class MetaspaceShared : AllStatic {
     ro = 1,  // read-only shared space
     bm = 2,  // relocation bitmaps (freed after file mapping is finished)
     hp = 3,  // heap region
+    ac = 4,  // aot code
     num_core_region = 2,       // rw and ro
-    n_regions = 4              // total number of regions
+    n_regions = 5              // total number of regions
   };
 
   static void preload_and_dump(TRAPS) NOT_CDS_RETURN;
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 2985f0f9a1a..47fbd06f629 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -282,7 +282,15 @@ class CompactHashtable : public SimpleCompactHashtable {
   }
 
   template <class ITER>
-  inline void iterate(ITER* iter) const {
+  inline void iterate(ITER* iter) const { iterate([&](V v) { iter->do_value(v); }); }
+
+  template<typename Function>
+  inline void iterate(const Function& function) const { // lambda enabled API
+    iterate(const_cast<Function&>(function));
+  }
+
+  template<typename Function>
+  inline void iterate(Function& function) const { // lambda enabled API
     for (u4 i = 0; i < _bucket_count; i++) {
       u4 bucket_info = _buckets[i];
       u4 bucket_offset = BUCKET_OFFSET(bucket_info);
@@ -290,11 +298,11 @@ class CompactHashtable : public SimpleCompactHashtable {
       u4* entry = _entries + bucket_offset;
 
       if (bucket_type == VALUE_ONLY_BUCKET_TYPE) {
-        iter->do_value(decode(entry[0]));
+        function(decode(entry[0]));
       } else {
-        u4*entry_max = _entries + BUCKET_OFFSET(_buckets[i + 1]);
+        u4* entry_max = _entries + BUCKET_OFFSET(_buckets[i + 1]);
         while (entry < entry_max) {
-          iter->do_value(decode(entry[1]));
+          function(decode(entry[1]));
           entry += 2;
         }
       }
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
new file mode 100644
index 00000000000..e94c9ac8665
--- /dev/null
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -0,0 +1,1324 @@
+/*
+ * 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.
+ *
+ */
+
+#include "cds/aotCacheAccess.hpp"
+#include "cds/cds_globals.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/heapShared.hpp"
+#include "cds/metaspaceShared.hpp"
+#include "classfile/javaAssertions.hpp"
+#include "code/aotCodeCache.hpp"
+#include "code/codeCache.hpp"
+#include "gc/shared/gcConfig.hpp"
+#include "logging/logStream.hpp"
+#include "memory/memoryReserver.hpp"
+#include "runtime/flags/flagSetting.hpp"
+#include "runtime/globals_extension.hpp"
+#include "runtime/java.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/os.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+#if INCLUDE_G1GC
+#include "gc/g1/g1BarrierSetRuntime.hpp"
+#endif
+#if INCLUDE_ZGC
+#include "gc/z/zBarrierSetRuntime.hpp"
+#endif
+
+#include <sys/stat.h>
+#include <errno.h>
+
+static void report_load_failure() {
+  if (AbortVMOnAOTCodeFailure) {
+    vm_exit_during_initialization("Unable to use AOT Code Cache.", nullptr);
+  }
+  log_info(aot, codecache, init)("Unable to use AOT Code Cache.");
+  AOTAdapterCaching = false;
+}
+
+static void report_store_failure() {
+  if (AbortVMOnAOTCodeFailure) {
+    tty->print_cr("Unable to create AOT Code Cache.");
+    vm_abort(false);
+  }
+  log_info(aot, codecache, exit)("Unable to create AOT Code Cache.");
+  AOTAdapterCaching = false;
+}
+
+bool AOTCodeCache::is_dumping_adapters() {
+  return AOTAdapterCaching && is_on_for_dump();
+}
+
+bool AOTCodeCache::is_using_adapters()   {
+  return AOTAdapterCaching && is_on_for_use();
+}
+
+static uint _max_aot_code_size = 0;
+uint AOTCodeCache::max_aot_code_size() {
+  return _max_aot_code_size;
+}
+
+void AOTCodeCache::initialize() {
+  if (FLAG_IS_DEFAULT(AOTCache)) {
+    log_info(aot, codecache, init)("AOT Code Cache is not used: AOTCache is not specified.");
+    return; // AOTCache must be specified to dump and use AOT code
+  }
+
+  bool is_dumping = false;
+  bool is_using   = false;
+  if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {
+    FLAG_SET_ERGO_IF_DEFAULT(AOTAdapterCaching, true);
+    is_dumping = true;
+  } else if (CDSConfig::is_using_archive() && CDSConfig::is_using_aot_linked_classes()) {
+    FLAG_SET_ERGO_IF_DEFAULT(AOTAdapterCaching, true);
+    is_using = true;
+  } else {
+    log_info(aot, codecache, init)("AOT Code Cache is not used: AOT Class Linking is not used.");
+    return; // nothing to do
+  }
+  if (!AOTAdapterCaching) {
+    return; // AOT code caching disabled on command line
+  }
+  _max_aot_code_size = AOTCodeMaxSize;
+  if (!FLAG_IS_DEFAULT(AOTCodeMaxSize)) {
+    if (!is_aligned(AOTCodeMaxSize, os::vm_allocation_granularity())) {
+      _max_aot_code_size = align_up(AOTCodeMaxSize, os::vm_allocation_granularity());
+      log_debug(aot,codecache,init)("Max AOT Code Cache size is aligned up to %uK", (int)(max_aot_code_size()/K));
+    }
+  }
+  size_t aot_code_size = is_using ? AOTCacheAccess::get_aot_code_region_size() : 0;
+  if (is_using && aot_code_size == 0) {
+    log_info(aot, codecache, init)("AOT Code Cache is empty");
+    return;
+  }
+  if (!open_cache(is_dumping, is_using)) {
+    if (is_using) {
+      report_load_failure();
+    } else {
+      report_store_failure();
+    }
+    return;
+  }
+  if (is_dumping) {
+    FLAG_SET_DEFAULT(ForceUnreachable, true);
+  }
+  FLAG_SET_DEFAULT(DelayCompilerStubsGeneration, false);
+}
+
+void AOTCodeCache::init2() {
+  if (!is_on()) {
+    return;
+  }
+  if (!verify_vm_config()) {
+    close();
+    report_load_failure();
+  }
+  // initialize the table of external routines so we can save
+  // generated code blobs that reference them
+  init_extrs_table();
+}
+
+AOTCodeCache* AOTCodeCache::_cache = nullptr;
+
+bool AOTCodeCache::open_cache(bool is_dumping, bool is_using) {
+  AOTCodeCache* cache = new AOTCodeCache(is_dumping, is_using);
+  if (cache->failed()) {
+    delete cache;
+    _cache = nullptr;
+    return false;
+  }
+  _cache = cache;
+  return true;
+}
+
+void AOTCodeCache::close() {
+  if (is_on()) {
+    delete _cache; // Free memory
+    _cache = nullptr;
+  }
+}
+
+#define DATA_ALIGNMENT HeapWordSize
+
+AOTCodeCache::AOTCodeCache(bool is_dumping, bool is_using) :
+  _load_header(nullptr),
+  _load_buffer(nullptr),
+  _store_buffer(nullptr),
+  _C_store_buffer(nullptr),
+  _write_position(0),
+  _load_size(0),
+  _store_size(0),
+  _for_use(is_using),
+  _for_dump(is_dumping),
+  _closing(false),
+  _failed(false),
+  _lookup_failed(false),
+  _table(nullptr),
+  _load_entries(nullptr),
+  _search_entries(nullptr),
+  _store_entries(nullptr),
+  _C_strings_buf(nullptr),
+  _store_entries_cnt(0)
+{
+  // Read header at the begining of cache
+  if (_for_use) {
+    // Read cache
+    size_t load_size = AOTCacheAccess::get_aot_code_region_size();
+    ReservedSpace rs = MemoryReserver::reserve(load_size, mtCode);
+    if (!rs.is_reserved()) {
+      log_warning(aot, codecache, init)("Failed to reserved %u bytes of memory for mapping AOT code region into AOT Code Cache", (uint)load_size);
+      set_failed();
+      return;
+    }
+    if (!AOTCacheAccess::map_aot_code_region(rs)) {
+      log_warning(aot, codecache, init)("Failed to read/mmap cached code region into AOT Code Cache");
+      set_failed();
+      return;
+    }
+
+    _load_size = (uint)load_size;
+    _load_buffer = (char*)rs.base();
+    assert(is_aligned(_load_buffer, DATA_ALIGNMENT), "load_buffer is not aligned");
+    log_debug(aot, codecache, init)("Mapped %u bytes at address " INTPTR_FORMAT " at AOT Code Cache", _load_size, p2i(_load_buffer));
+
+    _load_header = (Header*)addr(0);
+    if (!_load_header->verify_config(_load_size)) {
+      set_failed();
+      return;
+    }
+    log_info (aot, codecache, init)("Loaded %u AOT code entries from AOT Code Cache", _load_header->entries_count());
+    log_debug(aot, codecache, init)("  Adapters:  total=%u", _load_header->adapters_count());
+    log_debug(aot, codecache, init)("  All Blobs: total=%u", _load_header->blobs_count());
+    log_debug(aot, codecache, init)("  AOT code cache size: %u bytes", _load_header->cache_size());
+
+    // Read strings
+    load_strings();
+  }
+  if (_for_dump) {
+    _C_store_buffer = NEW_C_HEAP_ARRAY(char, max_aot_code_size() + DATA_ALIGNMENT, mtCode);
+    _store_buffer = align_up(_C_store_buffer, DATA_ALIGNMENT);
+    // Entries allocated at the end of buffer in reverse (as on stack).
+    _store_entries = (AOTCodeEntry*)align_up(_C_store_buffer + max_aot_code_size(), DATA_ALIGNMENT);
+    log_debug(aot, codecache, init)("Allocated store buffer at address " INTPTR_FORMAT " of size %u", p2i(_store_buffer), max_aot_code_size());
+  }
+  _table = new AOTCodeAddressTable();
+}
+
+void AOTCodeCache::init_extrs_table() {
+  AOTCodeAddressTable* table = addr_table();
+  if (table != nullptr) {
+    table->init_extrs();
+  }
+}
+
+void AOTCodeCache::init_shared_blobs_table() {
+  AOTCodeAddressTable* table = addr_table();
+  if (table != nullptr) {
+    table->init_shared_blobs();
+  }
+}
+
+AOTCodeCache::~AOTCodeCache() {
+  if (_closing) {
+    return; // Already closed
+  }
+  // Stop any further access to cache.
+  _closing = true;
+
+  MutexLocker ml(Compile_lock);
+  if (for_dump()) { // Finalize cache
+    finish_write();
+  }
+  _load_buffer = nullptr;
+  if (_C_store_buffer != nullptr) {
+    FREE_C_HEAP_ARRAY(char, _C_store_buffer);
+    _C_store_buffer = nullptr;
+    _store_buffer = nullptr;
+  }
+  if (_table != nullptr) {
+    delete _table;
+    _table = nullptr;
+  }
+}
+
+void AOTCodeCache::Config::record() {
+  _flags = 0;
+#ifdef ASSERT
+  _flags |= debugVM;
+#endif
+  if (UseCompressedOops) {
+    _flags |= compressedOops;
+  }
+  if (UseCompressedClassPointers) {
+    _flags |= compressedClassPointers;
+  }
+  if (UseTLAB) {
+    _flags |= useTLAB;
+  }
+  if (JavaAssertions::systemClassDefault()) {
+    _flags |= systemClassAssertions;
+  }
+  if (JavaAssertions::userClassDefault()) {
+    _flags |= userClassAssertions;
+  }
+  if (EnableContended) {
+    _flags |= enableContendedPadding;
+  }
+  if (RestrictContended) {
+    _flags |= restrictContendedPadding;
+  }
+  _compressedOopShift    = CompressedOops::shift();
+  _compressedKlassShift  = CompressedKlassPointers::shift();
+  _contendedPaddingWidth = ContendedPaddingWidth;
+  _objectAlignment       = ObjectAlignmentInBytes;
+  _gc                    = (uint)Universe::heap()->kind();
+}
+
+bool AOTCodeCache::Config::verify() const {
+#ifdef ASSERT
+  if ((_flags & debugVM) == 0) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created by product VM, it can't be used by debug VM");
+    return false;
+  }
+#else
+  if ((_flags & debugVM) != 0) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created by debug VM, it can't be used by product VM");
+    return false;
+  }
+#endif
+
+  CollectedHeap::Name aot_gc = (CollectedHeap::Name)_gc;
+  if (aot_gc != Universe::heap()->kind()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with different GC: %s vs current %s", GCConfig::hs_err_name(aot_gc), GCConfig::hs_err_name());
+    return false;
+  }
+
+  if (((_flags & compressedOops) != 0) != UseCompressedOops) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedOops = %s", UseCompressedOops ? "false" : "true");
+    return false;
+  }
+  if (((_flags & compressedClassPointers) != 0) != UseCompressedClassPointers) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedClassPointers = %s", UseCompressedClassPointers ? "false" : "true");
+    return false;
+  }
+
+  if (((_flags & systemClassAssertions) != 0) != JavaAssertions::systemClassDefault()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with JavaAssertions::systemClassDefault() = %s", JavaAssertions::systemClassDefault() ? "disabled" : "enabled");
+    return false;
+  }
+  if (((_flags & userClassAssertions) != 0) != JavaAssertions::userClassDefault()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with JavaAssertions::userClassDefault() = %s", JavaAssertions::userClassDefault() ? "disabled" : "enabled");
+    return false;
+  }
+
+  if (((_flags & enableContendedPadding) != 0) != EnableContended) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with EnableContended = %s", EnableContended ? "false" : "true");
+    return false;
+  }
+  if (((_flags & restrictContendedPadding) != 0) != RestrictContended) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with RestrictContended = %s", RestrictContended ? "false" : "true");
+    return false;
+  }
+  if (_compressedOopShift != (uint)CompressedOops::shift()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedOops::shift() = %d vs current %d", _compressedOopShift, CompressedOops::shift());
+    return false;
+  }
+  if (_compressedKlassShift != (uint)CompressedKlassPointers::shift()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedKlassPointers::shift() = %d vs current %d", _compressedKlassShift, CompressedKlassPointers::shift());
+    return false;
+  }
+  if (_contendedPaddingWidth != (uint)ContendedPaddingWidth) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with ContendedPaddingWidth = %d vs current %d", _contendedPaddingWidth, ContendedPaddingWidth);
+    return false;
+  }
+  if (_objectAlignment != (uint)ObjectAlignmentInBytes) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with ObjectAlignmentInBytes = %d vs current %d", _objectAlignment, ObjectAlignmentInBytes);
+    return false;
+  }
+  return true;
+}
+
+bool AOTCodeCache::Header::verify_config(uint load_size) const {
+  if (_version != AOT_CODE_VERSION) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: different AOT Code version %d vs %d recorded in AOT Code header", AOT_CODE_VERSION, _version);
+    return false;
+  }
+  if (load_size < _cache_size) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: AOT Code Cache size %d < %d recorded in AOT Code header", load_size, _cache_size);
+    return false;
+  }
+  return true;
+}
+
+AOTCodeCache* AOTCodeCache::open_for_use() {
+  if (AOTCodeCache::is_on_for_use()) {
+    return AOTCodeCache::cache();
+  }
+  return nullptr;
+}
+
+AOTCodeCache* AOTCodeCache::open_for_dump() {
+  if (AOTCodeCache::is_on_for_dump()) {
+    AOTCodeCache* cache = AOTCodeCache::cache();
+    cache->clear_lookup_failed(); // Reset bit
+    return cache;
+  }
+  return nullptr;
+}
+
+void copy_bytes(const char* from, address to, uint size) {
+  assert(size > 0, "sanity");
+  bool by_words = true;
+  if ((size > 2 * HeapWordSize) && (((intptr_t)from | (intptr_t)to) & (HeapWordSize - 1)) == 0) {
+    // Use wordwise copies if possible:
+    Copy::disjoint_words((HeapWord*)from,
+                         (HeapWord*)to,
+                         ((size_t)size + HeapWordSize-1) / HeapWordSize);
+  } else {
+    by_words = false;
+    Copy::conjoint_jbytes(from, to, (size_t)size);
+  }
+  log_trace(aot, codecache)("Copied %d bytes as %s from " INTPTR_FORMAT " to " INTPTR_FORMAT, size, (by_words ? "HeapWord" : "bytes"), p2i(from), p2i(to));
+}
+
+AOTCodeReader::AOTCodeReader(AOTCodeCache* cache, AOTCodeEntry* entry) {
+  _cache = cache;
+  _entry = entry;
+  _load_buffer = cache->cache_buffer();
+  _read_position = 0;
+  _lookup_failed = false;
+}
+
+void AOTCodeReader::set_read_position(uint pos) {
+  if (pos == _read_position) {
+    return;
+  }
+  assert(pos < _cache->load_size(), "offset:%d >= file size:%d", pos, _cache->load_size());
+  _read_position = pos;
+}
+
+bool AOTCodeCache::set_write_position(uint pos) {
+  if (pos == _write_position) {
+    return true;
+  }
+  if (_store_size < _write_position) {
+    _store_size = _write_position; // Adjust during write
+  }
+  assert(pos < _store_size, "offset:%d >= file size:%d", pos, _store_size);
+  _write_position = pos;
+  return true;
+}
+
+static char align_buffer[256] = { 0 };
+
+bool AOTCodeCache::align_write() {
+  // We are not executing code from cache - we copy it by bytes first.
+  // No need for big alignment (or at all).
+  uint padding = DATA_ALIGNMENT - (_write_position & (DATA_ALIGNMENT - 1));
+  if (padding == DATA_ALIGNMENT) {
+    return true;
+  }
+  uint n = write_bytes((const void*)&align_buffer, padding);
+  if (n != padding) {
+    return false;
+  }
+  log_trace(aot, codecache)("Adjust write alignment in AOT Code Cache");
+  return true;
+}
+
+// Check to see if AOT code cache has required space to store "nbytes" of data
+address AOTCodeCache::reserve_bytes(uint nbytes) {
+  assert(for_dump(), "Code Cache file is not created");
+  uint new_position = _write_position + nbytes;
+  if (new_position >= (uint)((char*)_store_entries - _store_buffer)) {
+    log_warning(aot,codecache)("Failed to ensure %d bytes at offset %d in AOT Code Cache. Increase AOTCodeMaxSize.",
+                               nbytes, _write_position);
+    set_failed();
+    report_store_failure();
+    return nullptr;
+  }
+  address buffer = (address)(_store_buffer + _write_position);
+  log_trace(aot, codecache)("Reserved %d bytes at offset %d in AOT Code Cache", nbytes, _write_position);
+  _write_position += nbytes;
+  if (_store_size < _write_position) {
+    _store_size = _write_position;
+  }
+  return buffer;
+}
+
+uint AOTCodeCache::write_bytes(const void* buffer, uint nbytes) {
+  assert(for_dump(), "Code Cache file is not created");
+  if (nbytes == 0) {
+    return 0;
+  }
+  uint new_position = _write_position + nbytes;
+  if (new_position >= (uint)((char*)_store_entries - _store_buffer)) {
+    log_warning(aot, codecache)("Failed to write %d bytes at offset %d to AOT Code Cache. Increase AOTCodeMaxSize.",
+                                nbytes, _write_position);
+    set_failed();
+    report_store_failure();
+    return 0;
+  }
+  copy_bytes((const char* )buffer, (address)(_store_buffer + _write_position), nbytes);
+  log_trace(aot, codecache)("Wrote %d bytes at offset %d to AOT Code Cache", nbytes, _write_position);
+  _write_position += nbytes;
+  if (_store_size < _write_position) {
+    _store_size = _write_position;
+  }
+  return nbytes;
+}
+
+void* AOTCodeEntry::operator new(size_t x, AOTCodeCache* cache) {
+  return (void*)(cache->add_entry());
+}
+
+static bool check_entry(AOTCodeEntry::Kind kind, uint id, AOTCodeEntry* entry) {
+  if (entry->kind() == kind) {
+    assert(entry->id() == id, "sanity");
+    return true; // Found
+  }
+  return false;
+}
+
+AOTCodeEntry* AOTCodeCache::find_entry(AOTCodeEntry::Kind kind, uint id) {
+  assert(_for_use, "sanity");
+  uint count = _load_header->entries_count();
+  if (_load_entries == nullptr) {
+    // Read it
+    _search_entries = (uint*)addr(_load_header->entries_offset()); // [id, index]
+    _load_entries = (AOTCodeEntry*)(_search_entries + 2 * count);
+    log_debug(aot, codecache, init)("Read %d entries table at offset %d from AOT Code Cache", count, _load_header->entries_offset());
+  }
+  // Binary search
+  int l = 0;
+  int h = count - 1;
+  while (l <= h) {
+    int mid = (l + h) >> 1;
+    int ix = mid * 2;
+    uint is = _search_entries[ix];
+    if (is == id) {
+      int index = _search_entries[ix + 1];
+      AOTCodeEntry* entry = &(_load_entries[index]);
+      if (check_entry(kind, id, entry)) {
+        return entry; // Found
+      }
+      break; // Not found match
+    } else if (is < id) {
+      l = mid + 1;
+    } else {
+      h = mid - 1;
+    }
+  }
+  return nullptr;
+}
+
+extern "C" {
+  static int uint_cmp(const void *i, const void *j) {
+    uint a = *(uint *)i;
+    uint b = *(uint *)j;
+    return a > b ? 1 : a < b ? -1 : 0;
+  }
+}
+
+bool AOTCodeCache::finish_write() {
+  if (!align_write()) {
+    return false;
+  }
+  uint strings_offset = _write_position;
+  int strings_count = store_strings();
+  if (strings_count < 0) {
+    return false;
+  }
+  if (!align_write()) {
+    return false;
+  }
+  uint strings_size = _write_position - strings_offset;
+
+  uint entries_count = 0; // Number of entrant (useful) code entries
+  uint entries_offset = _write_position;
+
+  uint store_count = _store_entries_cnt;
+  if (store_count > 0) {
+    uint header_size = (uint)align_up(sizeof(AOTCodeCache::Header),  DATA_ALIGNMENT);
+    uint code_count = store_count;
+    uint search_count = code_count * 2;
+    uint search_size = search_count * sizeof(uint);
+    uint entries_size = (uint)align_up(code_count * sizeof(AOTCodeEntry), DATA_ALIGNMENT); // In bytes
+    // _write_position includes size of code and strings
+    uint code_alignment = code_count * DATA_ALIGNMENT; // We align_up code size when storing it.
+    uint total_size = header_size + _write_position + code_alignment + search_size + entries_size;
+    assert(total_size < max_aot_code_size(), "AOT Code size (" UINT32_FORMAT " bytes) is greater than AOTCodeMaxSize(" UINT32_FORMAT " bytes).", total_size, max_aot_code_size());
+
+    // Create ordered search table for entries [id, index];
+    uint* search = NEW_C_HEAP_ARRAY(uint, search_count, mtCode);
+    // Allocate in AOT Cache buffer
+    char* buffer = (char *)AOTCacheAccess::allocate_aot_code_region(total_size + DATA_ALIGNMENT);
+    char* start = align_up(buffer, DATA_ALIGNMENT);
+    char* current = start + header_size; // Skip header
+
+    AOTCodeEntry* entries_address = _store_entries; // Pointer to latest entry
+    uint adapters_count = 0;
+    uint blobs_count = 0;
+    uint max_size = 0;
+    // AOTCodeEntry entries were allocated in reverse in store buffer.
+    // Process them in reverse order to cache first code first.
+    for (int i = store_count - 1; i >= 0; i--) {
+      entries_address[i].set_next(nullptr); // clear pointers before storing data
+      uint size = align_up(entries_address[i].size(), DATA_ALIGNMENT);
+      if (size > max_size) {
+        max_size = size;
+      }
+      copy_bytes((_store_buffer + entries_address[i].offset()), (address)current, size);
+      entries_address[i].set_offset(current - start); // New offset
+      current += size;
+      uint n = write_bytes(&(entries_address[i]), sizeof(AOTCodeEntry));
+      if (n != sizeof(AOTCodeEntry)) {
+        FREE_C_HEAP_ARRAY(uint, search);
+        return false;
+      }
+      search[entries_count*2 + 0] = entries_address[i].id();
+      search[entries_count*2 + 1] = entries_count;
+      entries_count++;
+      AOTCodeEntry::Kind kind = entries_address[i].kind();
+      if (kind == AOTCodeEntry::Adapter) {
+        adapters_count++;
+      } else if (kind == AOTCodeEntry::Blob) {
+        blobs_count++;
+      }
+    }
+    if (entries_count == 0) {
+      log_info(aot, codecache, exit)("AOT Code Cache was not created: no entires");
+      FREE_C_HEAP_ARRAY(uint, search);
+      return true; // Nothing to write
+    }
+    assert(entries_count <= store_count, "%d > %d", entries_count, store_count);
+    // Write strings
+    if (strings_count > 0) {
+      copy_bytes((_store_buffer + strings_offset), (address)current, strings_size);
+      strings_offset = (current - start); // New offset
+      current += strings_size;
+    }
+
+    uint new_entries_offset = (current - start); // New offset
+    // Sort and store search table
+    qsort(search, entries_count, 2*sizeof(uint), uint_cmp);
+    search_size = 2 * entries_count * sizeof(uint);
+    copy_bytes((const char*)search, (address)current, search_size);
+    FREE_C_HEAP_ARRAY(uint, search);
+    current += search_size;
+
+    // Write entries
+    entries_size = entries_count * sizeof(AOTCodeEntry); // New size
+    copy_bytes((_store_buffer + entries_offset), (address)current, entries_size);
+    current += entries_size;
+    uint size = (current - start);
+    assert(size <= total_size, "%d > %d", size , total_size);
+
+    log_debug(aot, codecache, exit)("  Adapters:  total=%u", adapters_count);
+    log_debug(aot, codecache, exit)("  All Blobs: total=%u", blobs_count);
+    log_debug(aot, codecache, exit)("  AOT code cache size: %u bytes, max entry's size: %u bytes", size, max_size);
+
+    // Finalize header
+    AOTCodeCache::Header* header = (AOTCodeCache::Header*)start;
+    header->init(size, (uint)strings_count, strings_offset,
+                 entries_count, new_entries_offset,
+                 adapters_count, blobs_count);
+
+    log_info(aot, codecache, exit)("Wrote %d AOT code entries to AOT Code Cache", entries_count);
+  }
+  return true;
+}
+
+//------------------Store/Load AOT code ----------------------
+
+bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind, uint id, const char* name, int entry_offset_count, int* entry_offsets) {
+  AOTCodeCache* cache = open_for_dump();
+  if (cache == nullptr) {
+    return false;
+  }
+  assert(AOTCodeEntry::is_valid_entry_kind(entry_kind), "invalid entry_kind %d", entry_kind);
+
+  if ((entry_kind == AOTCodeEntry::Adapter) && !AOTAdapterCaching) {
+    return false;
+  }
+  log_debug(aot, codecache, stubs)("Writing blob '%s' to AOT Code Cache", name);
+
+#ifdef ASSERT
+  LogStreamHandle(Trace, aot, codecache, stubs) log;
+  if (log.is_enabled()) {
+    FlagSetting fs(PrintRelocations, true);
+    blob.print_on(&log);
+  }
+#endif
+  // we need to take a lock to prevent race between compiler threads generating AOT code
+  // and the main thread generating adapter
+  MutexLocker ml(Compile_lock);
+  if (!cache->align_write()) {
+    return false;
+  }
+  uint entry_position = cache->_write_position;
+
+  // Write name
+  uint name_offset = cache->_write_position - entry_position;
+  uint name_size = (uint)strlen(name) + 1; // Includes '/0'
+  uint n = cache->write_bytes(name, name_size);
+  if (n != name_size) {
+    return false;
+  }
+
+  // Write CodeBlob
+  if (!cache->align_write()) {
+    return false;
+  }
+  uint blob_offset = cache->_write_position - entry_position;
+  address archive_buffer = cache->reserve_bytes(blob.size());
+  if (archive_buffer == nullptr) {
+    return false;
+  }
+  CodeBlob::archive_blob(&blob, archive_buffer);
+
+  uint reloc_data_size = blob.relocation_size();
+  n = cache->write_bytes((address)blob.relocation_begin(), reloc_data_size);
+  if (n != reloc_data_size) {
+    return false;
+  }
+
+  bool has_oop_maps = false;
+  if (blob.oop_maps() != nullptr) {
+    if (!cache->write_oop_map_set(blob)) {
+      return false;
+    }
+    has_oop_maps = true;
+  }
+
+  if (!cache->write_relocations(blob)) {
+    return false;
+  }
+
+  // Write entries offsets
+  n = cache->write_bytes(&entry_offset_count, sizeof(int));
+  if (n != sizeof(int)) {
+    return false;
+  }
+  for (int i = 0; i < entry_offset_count; i++) {
+    uint32_t off = (uint32_t)entry_offsets[i];
+    n = cache->write_bytes(&off, sizeof(uint32_t));
+    if (n != sizeof(uint32_t)) {
+      return false;
+    }
+  }
+  uint entry_size = cache->_write_position - entry_position;
+  AOTCodeEntry* entry = new(cache) AOTCodeEntry(entry_kind, id,
+                                                entry_position, entry_size, name_offset, name_size,
+                                                blob_offset, has_oop_maps, blob.content_begin());
+  log_debug(aot, codecache, stubs)("Wrote code blob '%s(id=%d)' to AOT Code Cache", name, id);
+  return true;
+}
+
+CodeBlob* AOTCodeCache::load_code_blob(AOTCodeEntry::Kind entry_kind, uint id, const char* name, int entry_offset_count, int* entry_offsets) {
+  AOTCodeCache* cache = open_for_use();
+  if (cache == nullptr) {
+    return nullptr;
+  }
+  assert(AOTCodeEntry::is_valid_entry_kind(entry_kind), "invalid entry_kind %d", entry_kind);
+
+  if ((entry_kind == AOTCodeEntry::Adapter) && !AOTAdapterCaching) {
+    return nullptr;
+  }
+  log_debug(aot, codecache, stubs)("Reading blob '%s' from AOT Code Cache", name);
+
+  AOTCodeEntry* entry = cache->find_entry(entry_kind, id);
+  if (entry == nullptr) {
+    return nullptr;
+  }
+  AOTCodeReader reader(cache, entry);
+  return reader.compile_code_blob(name, entry_offset_count, entry_offsets);
+}
+
+CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_count, int* entry_offsets) {
+  uint entry_position = _entry->offset();
+
+  // Read name
+  uint name_offset = entry_position + _entry->name_offset();
+  uint name_size = _entry->name_size(); // Includes '/0'
+  const char* stored_name = addr(name_offset);
+
+  if (strncmp(stored_name, name, (name_size - 1)) != 0) {
+    log_warning(aot, codecache, stubs)("Saved blob's name '%s' is different from the expected name '%s'",
+                                       stored_name, name);
+    ((AOTCodeCache*)_cache)->set_failed();
+    report_load_failure();
+    return nullptr;
+  }
+
+  // Read archived code blob
+  uint offset = entry_position + _entry->blob_offset();
+  CodeBlob* archived_blob = (CodeBlob*)addr(offset);
+  offset += archived_blob->size();
+
+  address reloc_data = (address)addr(offset);
+  offset += archived_blob->relocation_size();
+  set_read_position(offset);
+
+  ImmutableOopMapSet* oop_maps = nullptr;
+  if (_entry->has_oop_maps()) {
+    oop_maps = read_oop_map_set();
+  }
+
+  CodeBlob* code_blob = CodeBlob::create(archived_blob, stored_name, reloc_data, oop_maps);
+  if (code_blob == nullptr) { // no space left in CodeCache
+    return nullptr;
+  }
+
+  fix_relocations(code_blob);
+
+  // Read entries offsets
+  offset = read_position();
+  int stored_count = *(int*)addr(offset);
+  assert(stored_count == entry_offset_count, "entry offset count mismatch, count in AOT code cache=%d, expected=%d", stored_count, entry_offset_count);
+  offset += sizeof(int);
+  set_read_position(offset);
+  for (int i = 0; i < stored_count; i++) {
+    uint32_t off = *(uint32_t*)addr(offset);
+    offset += sizeof(uint32_t);
+    const char* entry_name = (_entry->kind() == AOTCodeEntry::Adapter) ? AdapterHandlerEntry::entry_name(i) : "";
+    log_trace(aot, codecache, stubs)("Reading adapter '%s:%s' (0x%x) offset: 0x%x from AOT Code Cache",
+                                      stored_name, entry_name, _entry->id(), off);
+    entry_offsets[i] = off;
+  }
+
+  log_debug(aot, codecache, stubs)("Read blob '%s' from AOT Code Cache", name);
+#ifdef ASSERT
+  LogStreamHandle(Trace, aot, codecache, stubs) log;
+  if (log.is_enabled()) {
+    FlagSetting fs(PrintRelocations, true);
+    code_blob->print_on(&log);
+  }
+#endif
+  return code_blob;
+}
+
+// ------------ process code and data --------------
+
+bool AOTCodeCache::write_relocations(CodeBlob& code_blob) {
+  GrowableArray<uint> reloc_data;
+  RelocIterator iter(&code_blob);
+  LogStreamHandle(Trace, aot, codecache, reloc) log;
+  while (iter.next()) {
+    int idx = reloc_data.append(0); // default value
+    switch (iter.type()) {
+      case relocInfo::none:
+        break;
+      case relocInfo::runtime_call_type: {
+        // Record offset of runtime destination
+        CallRelocation* r = (CallRelocation*)iter.reloc();
+        address dest = r->destination();
+        if (dest == r->addr()) { // possible call via trampoline on Aarch64
+          dest = (address)-1;    // do nothing in this case when loading this relocation
+        }
+        reloc_data.at_put(idx, _table->id_for_address(dest, iter, &code_blob));
+        break;
+      }
+      case relocInfo::runtime_call_w_cp_type:
+        fatal("runtime_call_w_cp_type unimplemented");
+        break;
+      case relocInfo::external_word_type: {
+        // Record offset of runtime target
+        address target = ((external_word_Relocation*)iter.reloc())->target();
+        reloc_data.at_put(idx, _table->id_for_address(target, iter, &code_blob));
+        break;
+      }
+      case relocInfo::internal_word_type:
+        break;
+      case relocInfo::section_word_type:
+        break;
+      default:
+        fatal("relocation %d unimplemented", (int)iter.type());
+        break;
+    }
+    if (log.is_enabled()) {
+      iter.print_current_on(&log);
+    }
+  }
+
+  // Write additional relocation data: uint per relocation
+  // Write the count first
+  int count = reloc_data.length();
+  write_bytes(&count, sizeof(int));
+  for (GrowableArrayIterator<uint> iter = reloc_data.begin();
+       iter != reloc_data.end(); ++iter) {
+    uint value = *iter;
+    int n = write_bytes(&value, sizeof(uint));
+    if (n != sizeof(uint)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+void AOTCodeReader::fix_relocations(CodeBlob* code_blob) {
+  LogStreamHandle(Trace, aot, reloc) log;
+  uint offset = read_position();
+  int count = *(int*)addr(offset);
+  offset += sizeof(int);
+  if (log.is_enabled()) {
+    log.print_cr("======== extra relocations count=%d", count);
+  }
+  uint* reloc_data = (uint*)addr(offset);
+  offset += (count * sizeof(uint));
+  set_read_position(offset);
+
+  RelocIterator iter(code_blob);
+  int j = 0;
+  while (iter.next()) {
+    switch (iter.type()) {
+      case relocInfo::none:
+        break;
+      case relocInfo::runtime_call_type: {
+        address dest = _cache->address_for_id(reloc_data[j]);
+        if (dest != (address)-1) {
+          ((CallRelocation*)iter.reloc())->set_destination(dest);
+        }
+        break;
+      }
+      case relocInfo::runtime_call_w_cp_type:
+        fatal("runtime_call_w_cp_type unimplemented");
+        break;
+      case relocInfo::external_word_type: {
+        address target = _cache->address_for_id(reloc_data[j]);
+        // Add external address to global table
+        int index = ExternalsRecorder::find_index(target);
+        // Update index in relocation
+        Relocation::add_jint(iter.data(), index);
+        external_word_Relocation* reloc = (external_word_Relocation*)iter.reloc();
+        assert(reloc->target() == target, "sanity");
+        reloc->set_value(target); // Patch address in the code
+        break;
+      }
+      case relocInfo::internal_word_type: {
+        internal_word_Relocation* r = (internal_word_Relocation*)iter.reloc();
+        r->fix_relocation_after_aot_load(aot_code_entry()->dumptime_content_start_addr(), code_blob->content_begin());
+        break;
+      }
+      case relocInfo::section_word_type: {
+        section_word_Relocation* r = (section_word_Relocation*)iter.reloc();
+        r->fix_relocation_after_aot_load(aot_code_entry()->dumptime_content_start_addr(), code_blob->content_begin());
+        break;
+      }
+      default:
+        fatal("relocation %d unimplemented", (int)iter.type());
+        break;
+    }
+    if (log.is_enabled()) {
+      iter.print_current_on(&log);
+    }
+    j++;
+  }
+  assert(j == count, "sanity");
+}
+
+bool AOTCodeCache::write_oop_map_set(CodeBlob& cb) {
+  ImmutableOopMapSet* oopmaps = cb.oop_maps();
+  int oopmaps_size = oopmaps->nr_of_bytes();
+  if (!write_bytes(&oopmaps_size, sizeof(int))) {
+    return false;
+  }
+  uint n = write_bytes(oopmaps, oopmaps->nr_of_bytes());
+  if (n != (uint)oopmaps->nr_of_bytes()) {
+    return false;
+  }
+  return true;
+}
+
+ImmutableOopMapSet* AOTCodeReader::read_oop_map_set() {
+  uint offset = read_position();
+  int size = *(int *)addr(offset);
+  offset += sizeof(int);
+  ImmutableOopMapSet* oopmaps = (ImmutableOopMapSet *)addr(offset);
+  offset += size;
+  set_read_position(offset);
+  return oopmaps;
+}
+
+//======================= AOTCodeAddressTable ===============
+
+// address table ids for generated routines, external addresses and C
+// string addresses are partitioned into positive integer ranges
+// defined by the following positive base and max values
+// i.e. [_extrs_base, _extrs_base + _extrs_max -1],
+//      [_blobs_base, _blobs_base + _blobs_max -1],
+//      ...
+//      [_c_str_base, _c_str_base + _c_str_max -1],
+#define _extrs_max 10
+#define _blobs_max 10
+#define _all_max   20
+
+#define _extrs_base 0
+#define _blobs_base (_extrs_base + _extrs_max)
+#define _blobs_end  (_blobs_base + _blobs_max)
+
+#if (_blobs_end > _all_max)
+#error AOTCodeAddress table ranges need adjusting
+#endif
+
+#define SET_ADDRESS(type, addr)                           \
+  {                                                       \
+    type##_addr[type##_length++] = (address) (addr);      \
+    assert(type##_length <= type##_max, "increase size"); \
+  }
+
+static bool initializing_extrs = false;
+
+void AOTCodeAddressTable::init_extrs() {
+  if (_extrs_complete || initializing_extrs) return; // Done already
+  initializing_extrs = true;
+  _extrs_addr = NEW_C_HEAP_ARRAY(address, _extrs_max, mtCode);
+
+  _extrs_length = 0;
+
+  // Recored addresses of VM runtime methods
+  SET_ADDRESS(_extrs, SharedRuntime::fixup_callers_callsite);
+  SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method);
+  SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_abstract);
+  SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_ic_miss);
+#if INCLUDE_G1GC
+  SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_post_entry);
+  SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_pre_entry);
+#endif
+#if INCLUDE_ZGC
+  SET_ADDRESS(_extrs, ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded_addr());
+#if defined(AMD64)
+  SET_ADDRESS(_extrs, &ZPointerLoadShift);
+#endif
+#endif
+#ifdef COMPILER2
+  SET_ADDRESS(_extrs, OptoRuntime::handle_exception_C);
+#endif
+#ifndef ZERO
+#if defined(AMD64) || defined(AARCH64) || defined(RISCV64)
+  SET_ADDRESS(_extrs, MacroAssembler::debug64);
+#endif
+#endif // ZERO
+
+  _extrs_complete = true;
+  log_debug(aot, codecache, init)("External addresses recorded");
+}
+
+static bool initializing_shared_blobs = false;
+
+void AOTCodeAddressTable::init_shared_blobs() {
+  if (_complete || initializing_shared_blobs) return; // Done already
+  initializing_shared_blobs = true;
+  _blobs_addr = NEW_C_HEAP_ARRAY(address, _blobs_max, mtCode);
+
+  _blobs_length = 0;       // for shared blobs
+
+  // Recored addresses of generated code blobs
+  SET_ADDRESS(_blobs, SharedRuntime::get_handle_wrong_method_stub());
+  SET_ADDRESS(_blobs, SharedRuntime::get_ic_miss_stub());
+
+  _shared_blobs_complete = true;
+  log_debug(aot, codecache, init)("Early shared blobs recorded");
+  _complete = true;
+}
+
+#undef SET_ADDRESS
+
+AOTCodeAddressTable::~AOTCodeAddressTable() {
+  if (_extrs_addr != nullptr) {
+    FREE_C_HEAP_ARRAY(address, _extrs_addr);
+  }
+  if (_blobs_addr != nullptr) {
+    FREE_C_HEAP_ARRAY(address, _blobs_addr);
+  }
+}
+
+#ifdef PRODUCT
+#define MAX_STR_COUNT 200
+#else
+#define MAX_STR_COUNT 500
+#endif
+#define _c_str_max  MAX_STR_COUNT
+#define _c_str_base _all_max
+
+static const char* _C_strings_in[MAX_STR_COUNT] = {nullptr}; // Incoming strings
+static const char* _C_strings[MAX_STR_COUNT]    = {nullptr}; // Our duplicates
+static int _C_strings_count = 0;
+static int _C_strings_s[MAX_STR_COUNT] = {0};
+static int _C_strings_id[MAX_STR_COUNT] = {0};
+static int _C_strings_used = 0;
+
+void AOTCodeCache::load_strings() {
+  uint strings_count  = _load_header->strings_count();
+  if (strings_count == 0) {
+    return;
+  }
+  uint strings_offset = _load_header->strings_offset();
+  uint* string_lengths = (uint*)addr(strings_offset);
+  strings_offset += (strings_count * sizeof(uint));
+  uint strings_size = _load_header->entries_offset() - strings_offset;
+  // We have to keep cached strings longer than _cache buffer
+  // because they are refernced from compiled code which may
+  // still be executed on VM exit after _cache is freed.
+  char* p = NEW_C_HEAP_ARRAY(char, strings_size+1, mtCode);
+  memcpy(p, addr(strings_offset), strings_size);
+  _C_strings_buf = p;
+  assert(strings_count <= MAX_STR_COUNT, "sanity");
+  for (uint i = 0; i < strings_count; i++) {
+    _C_strings[i] = p;
+    uint len = string_lengths[i];
+    _C_strings_s[i] = i;
+    _C_strings_id[i] = i;
+    p += len;
+  }
+  assert((uint)(p - _C_strings_buf) <= strings_size, "(" INTPTR_FORMAT " - " INTPTR_FORMAT ") = %d > %d ", p2i(p), p2i(_C_strings_buf), (uint)(p - _C_strings_buf), strings_size);
+  _C_strings_count = strings_count;
+  _C_strings_used  = strings_count;
+  log_debug(aot, codecache, init)("  Loaded %d C strings of total length %d at offset %d from AOT Code Cache", _C_strings_count, strings_size, strings_offset);
+}
+
+int AOTCodeCache::store_strings() {
+  if (_C_strings_used > 0) {
+    uint offset = _write_position;
+    uint length = 0;
+    uint* lengths = (uint *)reserve_bytes(sizeof(uint) * _C_strings_used);
+    if (lengths == nullptr) {
+      return -1;
+    }
+    for (int i = 0; i < _C_strings_used; i++) {
+      const char* str = _C_strings[_C_strings_s[i]];
+      uint len = (uint)strlen(str) + 1;
+      length += len;
+      assert(len < 1000, "big string: %s", str);
+      lengths[i] = len;
+      uint n = write_bytes(str, len);
+      if (n != len) {
+        return -1;
+      }
+    }
+    log_debug(aot, codecache, exit)("  Wrote %d C strings of total length %d at offset %d to AOT Code Cache",
+                                   _C_strings_used, length, offset);
+  }
+  return _C_strings_used;
+}
+
+const char* AOTCodeCache::add_C_string(const char* str) {
+  if (is_on_for_dump() && str != nullptr) {
+    return _cache->_table->add_C_string(str);
+  }
+  return str;
+}
+
+const char* AOTCodeAddressTable::add_C_string(const char* str) {
+  if (_extrs_complete) {
+    LogStreamHandle(Trace, aot, codecache, stringtable) log; // ctor outside lock
+    MutexLocker ml(AOTCodeCStrings_lock, Mutex::_no_safepoint_check_flag);
+    // Check previous strings address
+    for (int i = 0; i < _C_strings_count; i++) {
+      if (_C_strings_in[i] == str) {
+        return _C_strings[i]; // Found previous one - return our duplicate
+      } else if (strcmp(_C_strings[i], str) == 0) {
+        return _C_strings[i];
+      }
+    }
+    // Add new one
+    if (_C_strings_count < MAX_STR_COUNT) {
+      // Passed in string can be freed and used space become inaccessible.
+      // Keep original address but duplicate string for future compare.
+      _C_strings_id[_C_strings_count] = -1; // Init
+      _C_strings_in[_C_strings_count] = str;
+      const char* dup = os::strdup(str);
+      _C_strings[_C_strings_count++] = dup;
+      if (log.is_enabled()) {
+        log.print_cr("add_C_string: [%d] " INTPTR_FORMAT " '%s'", _C_strings_count, p2i(dup), dup);
+      }
+      return dup;
+    } else {
+      fatal("Number of C strings >= MAX_STR_COUNT");
+    }
+  }
+  return str;
+}
+
+int AOTCodeAddressTable::id_for_C_string(address str) {
+  if (str == nullptr) {
+    return -1;
+  }
+  MutexLocker ml(AOTCodeCStrings_lock, Mutex::_no_safepoint_check_flag);
+  for (int i = 0; i < _C_strings_count; i++) {
+    if (_C_strings[i] == (const char*)str) { // found
+      int id = _C_strings_id[i];
+      if (id >= 0) {
+        assert(id < _C_strings_used, "%d >= %d", id , _C_strings_used);
+        return id; // Found recorded
+      }
+      // Not found in recorded, add new
+      id = _C_strings_used++;
+      _C_strings_s[id] = i;
+      _C_strings_id[i] = id;
+      return id;
+    }
+  }
+  return -1;
+}
+
+address AOTCodeAddressTable::address_for_C_string(int idx) {
+  assert(idx < _C_strings_count, "sanity");
+  return (address)_C_strings[idx];
+}
+
+static int search_address(address addr, address* table, uint length) {
+  for (int i = 0; i < (int)length; i++) {
+    if (table[i] == addr) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+address AOTCodeAddressTable::address_for_id(int idx) {
+  if (!_extrs_complete) {
+    fatal("AOT Code Cache VM runtime addresses table is not complete");
+  }
+  if (idx == -1) {
+    return (address)-1;
+  }
+  uint id = (uint)idx;
+  // special case for symbols based relative to os::init
+  if (id > (_c_str_base + _c_str_max)) {
+    return (address)os::init + idx;
+  }
+  if (idx < 0) {
+    fatal("Incorrect id %d for AOT Code Cache addresses table", id);
+  }
+  // no need to compare unsigned id against 0
+  if (/* id >= _extrs_base && */ id < _extrs_length) {
+    return _extrs_addr[id - _extrs_base];
+  }
+  if (id >= _blobs_base && id < _blobs_base + _blobs_length) {
+    return _blobs_addr[id - _blobs_base];
+  }
+  if (id >= _c_str_base && id < (_c_str_base + (uint)_C_strings_count)) {
+    return address_for_C_string(id - _c_str_base);
+  }
+  fatal("Incorrect id %d for AOT Code Cache addresses table", id);
+  return nullptr;
+}
+
+int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeBlob* code_blob) {
+  if (!_extrs_complete) {
+    fatal("AOT Code Cache VM runtime addresses table is not complete");
+  }
+  int id = -1;
+  if (addr == (address)-1) { // Static call stub has jump to itself
+    return id;
+  }
+  // Seach for C string
+  id = id_for_C_string(addr);
+  if (id >= 0) {
+    return id + _c_str_base;
+  }
+  if (StubRoutines::contains(addr)) {
+    // Search in stubs
+    StubCodeDesc* desc = StubCodeDesc::desc_for(addr);
+    if (desc == nullptr) {
+      desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
+    }
+    const char* sub_name = (desc != nullptr) ? desc->name() : "<unknown>";
+    fatal("Address " INTPTR_FORMAT " for Stub:%s is missing in AOT Code Cache addresses table", p2i(addr), sub_name);
+  } else {
+    CodeBlob* cb = CodeCache::find_blob(addr);
+    if (cb != nullptr) {
+      // Search in code blobs
+      int id_base = _blobs_base;
+      id = search_address(addr, _blobs_addr, _blobs_length);
+      if (id < 0) {
+        fatal("Address " INTPTR_FORMAT " for Blob:%s is missing in AOT Code Cache addresses table", p2i(addr), cb->name());
+      } else {
+        return id_base + id;
+      }
+    } else {
+      // Search in runtime functions
+      id = search_address(addr, _extrs_addr, _extrs_length);
+      if (id < 0) {
+        ResourceMark rm;
+        const int buflen = 1024;
+        char* func_name = NEW_RESOURCE_ARRAY(char, buflen);
+        int offset = 0;
+        if (os::dll_address_to_function_name(addr, func_name, buflen, &offset)) {
+          if (offset > 0) {
+            // Could be address of C string
+            uint dist = (uint)pointer_delta(addr, (address)os::init, 1);
+            log_debug(aot, codecache)("Address " INTPTR_FORMAT " (offset %d) for runtime target '%s' is missing in AOT Code Cache addresses table",
+                                      p2i(addr), dist, (const char*)addr);
+            assert(dist > (uint)(_all_max + MAX_STR_COUNT), "change encoding of distance");
+            return dist;
+          }
+          reloc.print_current_on(tty);
+          code_blob->print_on(tty);
+          code_blob->print_code_on(tty);
+          fatal("Address " INTPTR_FORMAT " for runtime target '%s+%d' is missing in AOT Code Cache addresses table", p2i(addr), func_name, offset);
+        } else {
+          reloc.print_current_on(tty);
+          code_blob->print_on(tty);
+          code_blob->print_code_on(tty);
+          os::find(addr, tty);
+          fatal("Address " INTPTR_FORMAT " for <unknown>/('%s') is missing in AOT Code Cache addresses table", p2i(addr), (const char*)addr);
+        }
+      } else {
+        return _extrs_base + id;
+      }
+    }
+  }
+  return id;
+}
+
+void AOTCodeCache::print_on(outputStream* st) {
+  AOTCodeCache* cache = open_for_use();
+  if (cache != nullptr) {
+    uint count = cache->_load_header->entries_count();
+    uint* search_entries = (uint*)cache->addr(cache->_load_header->entries_offset()); // [id, index]
+    AOTCodeEntry* load_entries = (AOTCodeEntry*)(search_entries + 2 * count);
+
+    for (uint i = 0; i < count; i++) {
+      // Use search_entries[] to order ouput
+      int index = search_entries[2*i + 1];
+      AOTCodeEntry* entry = &(load_entries[index]);
+
+      uint entry_position = entry->offset();
+      uint name_offset = entry->name_offset() + entry_position;
+      const char* saved_name = cache->addr(name_offset);
+
+      st->print_cr("%4u: entry_idx:%4u Kind:%u Id:%u size=%u '%s'",
+                   i, index, entry->kind(), entry->id(), entry->size(), saved_name);
+    }
+  } else {
+    st->print_cr("failed to map code cache");
+  }
+}
+
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
new file mode 100644
index 00000000000..d5c938e3b8b
--- /dev/null
+++ b/src/hotspot/share/code/aotCodeCache.hpp
@@ -0,0 +1,365 @@
+/*
+ * 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_CODE_AOTCODECACHE_HPP
+#define SHARE_CODE_AOTCODECACHE_HPP
+
+/*
+ * AOT Code Cache collects code from Code Cache and corresponding metadata
+ * during application training run.
+ * In following "production" runs this code and data can be loaded into
+ * Code Cache skipping its generation.
+ */
+
+class CodeBuffer;
+class RelocIterator;
+class AOTCodeCache;
+class AdapterBlob;
+class ExceptionBlob;
+class ImmutableOopMapSet;
+
+enum class vmIntrinsicID : int;
+enum CompLevel : signed char;
+
+// Descriptor of AOT Code Cache's entry
+class AOTCodeEntry {
+public:
+  enum Kind {
+    None    = 0,
+    Adapter = 1,
+    Blob    = 2
+  };
+
+private:
+  AOTCodeEntry* _next;
+  Kind   _kind;
+  uint   _id;          // Adapter's id, vmIntrinsic::ID for stub or name's hash for nmethod
+  uint   _offset;      // Offset to entry
+  uint   _size;        // Entry size
+  uint   _name_offset; // Code blob name
+  uint   _name_size;
+  uint   _blob_offset; // Start of code in cache
+  bool   _has_oop_maps;
+  address _dumptime_content_start_addr; // CodeBlob::content_begin() at dump time; used for applying relocations
+
+public:
+  AOTCodeEntry(Kind kind,         uint id,
+               uint offset,       uint size,
+               uint name_offset,  uint name_size,
+               uint blob_offset,  bool has_oop_maps,
+               address dumptime_content_start_addr) {
+    _next         = nullptr;
+    _kind         = kind;
+    _id           = id;
+    _offset       = offset;
+    _size         = size;
+    _name_offset  = name_offset;
+    _name_size    = name_size;
+    _blob_offset  = blob_offset;
+    _has_oop_maps = has_oop_maps;
+    _dumptime_content_start_addr = dumptime_content_start_addr;
+  }
+  void* operator new(size_t x, AOTCodeCache* cache);
+  // Delete is a NOP
+  void operator delete( void *ptr ) {}
+
+  AOTCodeEntry* next()        const { return _next; }
+  void set_next(AOTCodeEntry* next) { _next = next; }
+
+  Kind kind()         const { return _kind; }
+  uint id()           const { return _id; }
+
+  uint offset()       const { return _offset; }
+  void set_offset(uint off) { _offset = off; }
+
+  uint size()         const { return _size; }
+  uint name_offset()  const { return _name_offset; }
+  uint name_size()    const { return _name_size; }
+  uint blob_offset()  const { return _blob_offset; }
+  bool has_oop_maps() const { return _has_oop_maps; }
+  address dumptime_content_start_addr() const { return _dumptime_content_start_addr; }
+
+  static bool is_valid_entry_kind(Kind kind) { return kind == Adapter || kind == Blob; }
+};
+
+// Addresses of stubs, blobs and runtime finctions called from compiled code.
+class AOTCodeAddressTable : public CHeapObj<mtCode> {
+private:
+  address* _extrs_addr;
+  address* _blobs_addr;
+  uint     _extrs_length;
+  uint     _blobs_length;
+
+  bool _extrs_complete;
+  bool _shared_blobs_complete;
+  bool _complete;
+
+public:
+  AOTCodeAddressTable() :
+    _extrs_addr(nullptr),
+    _blobs_addr(nullptr),
+    _extrs_length(0),
+    _blobs_length(0),
+    _extrs_complete(false),
+    _shared_blobs_complete(false),
+    _complete(false)
+  { }
+  ~AOTCodeAddressTable();
+  void init_extrs();
+  void init_shared_blobs();
+  const char* add_C_string(const char* str);
+  int  id_for_C_string(address str);
+  address address_for_C_string(int idx);
+  int  id_for_address(address addr, RelocIterator iter, CodeBlob* code_blob);
+  address address_for_id(int id);
+};
+
+class AOTCodeCache : public CHeapObj<mtCode> {
+
+// Classes used to describe AOT code cache.
+protected:
+  class Config {
+    uint _compressedOopShift;
+    uint _compressedKlassShift;
+    uint _contendedPaddingWidth;
+    uint _objectAlignment;
+    uint _gc;
+    enum Flags {
+      none                     = 0,
+      debugVM                  = 1,
+      compressedOops           = 2,
+      compressedClassPointers  = 4,
+      useTLAB                  = 8,
+      systemClassAssertions    = 16,
+      userClassAssertions      = 32,
+      enableContendedPadding   = 64,
+      restrictContendedPadding = 128
+    };
+    uint _flags;
+
+  public:
+    void record();
+    bool verify() const;
+  };
+
+  class Header : public CHeapObj<mtCode> {
+  private:
+    enum {
+      AOT_CODE_VERSION = 1
+    };
+    uint   _version;         // AOT code version (should match when reading code cache)
+    uint   _cache_size;      // cache size in bytes
+    uint   _strings_count;   // number of recorded C strings
+    uint   _strings_offset;  // offset to recorded C strings
+    uint   _entries_count;   // number of recorded entries
+    uint   _entries_offset;  // offset of AOTCodeEntry array describing entries
+    uint   _adapters_count;
+    uint   _blobs_count;
+    Config _config;
+
+public:
+    void init(uint cache_size,
+              uint strings_count,  uint strings_offset,
+              uint entries_count,  uint entries_offset,
+              uint adapters_count, uint blobs_count) {
+      _version        = AOT_CODE_VERSION;
+      _cache_size     = cache_size;
+      _strings_count  = strings_count;
+      _strings_offset = strings_offset;
+      _entries_count  = entries_count;
+      _entries_offset = entries_offset;
+      _adapters_count = adapters_count;
+      _blobs_count    = blobs_count;
+
+      _config.record();
+    }
+
+
+    uint cache_size()     const { return _cache_size; }
+    uint strings_count()  const { return _strings_count; }
+    uint strings_offset() const { return _strings_offset; }
+    uint entries_count()  const { return _entries_count; }
+    uint entries_offset() const { return _entries_offset; }
+    uint adapters_count() const { return _adapters_count; }
+    uint blobs_count()    const { return _blobs_count; }
+
+    bool verify_config(uint load_size)  const;
+    bool verify_vm_config() const { // Called after Universe initialized
+      return _config.verify();
+    }
+  };
+
+// Continue with AOTCodeCache class definition.
+private:
+  Header* _load_header;
+  char*   _load_buffer;    // Aligned buffer for loading cached code
+  char*   _store_buffer;   // Aligned buffer for storing cached code
+  char*   _C_store_buffer; // Original unaligned buffer
+
+  uint   _write_position;  // Position in _store_buffer
+  uint   _load_size;       // Used when reading cache
+  uint   _store_size;      // Used when writing cache
+  bool   _for_use;         // AOT cache is open for using AOT code
+  bool   _for_dump;        // AOT cache is open for dumping AOT code
+  bool   _closing;         // Closing cache file
+  bool   _failed;          // Failed read/write to/from cache (cache is broken?)
+  bool   _lookup_failed;   // Failed to lookup for info (skip only this code load)
+
+  AOTCodeAddressTable* _table;
+
+  AOTCodeEntry* _load_entries;   // Used when reading cache
+  uint*         _search_entries; // sorted by ID table [id, index]
+  AOTCodeEntry* _store_entries;  // Used when writing cache
+  const char*   _C_strings_buf;  // Loaded buffer for _C_strings[] table
+  uint          _store_entries_cnt;
+
+  static AOTCodeCache* open_for_use();
+  static AOTCodeCache* open_for_dump();
+
+  bool set_write_position(uint pos);
+  bool align_write();
+  address reserve_bytes(uint nbytes);
+  uint write_bytes(const void* buffer, uint nbytes);
+  const char* addr(uint offset) const { return _load_buffer + offset; }
+  static AOTCodeAddressTable* addr_table() {
+    return is_on() && (cache()->_table != nullptr) ? cache()->_table : nullptr;
+  }
+
+  void set_lookup_failed()     { _lookup_failed = true; }
+  void clear_lookup_failed()   { _lookup_failed = false; }
+  bool lookup_failed()   const { return _lookup_failed; }
+
+public:
+  AOTCodeCache(bool is_dumping, bool is_using);
+  ~AOTCodeCache();
+
+  const char* cache_buffer() const { return _load_buffer; }
+  bool failed() const { return _failed; }
+  void set_failed()   { _failed = true; }
+
+  static uint max_aot_code_size();
+
+  uint load_size() const { return _load_size; }
+  uint write_position() const { return _write_position; }
+
+  void load_strings();
+  int store_strings();
+
+  static void init_extrs_table() NOT_CDS_RETURN;
+  static void init_shared_blobs_table() NOT_CDS_RETURN;
+
+  address address_for_id(int id) const { return _table->address_for_id(id); }
+
+  bool for_use()  const { return _for_use  && !_failed; }
+  bool for_dump() const { return _for_dump && !_failed; }
+
+  bool closing()          const { return _closing; }
+
+  AOTCodeEntry* add_entry() {
+    _store_entries_cnt++;
+    _store_entries -= 1;
+    return _store_entries;
+  }
+
+  AOTCodeEntry* find_entry(AOTCodeEntry::Kind kind, uint id);
+
+  bool finish_write();
+
+  bool write_relocations(CodeBlob& code_blob);
+  bool write_oop_map_set(CodeBlob& cb);
+
+  static bool store_code_blob(CodeBlob& blob,
+                              AOTCodeEntry::Kind entry_kind,
+                              uint id, const char* name,
+                              int entry_offset_count,
+                              int* entry_offsets) NOT_CDS_RETURN_(false);
+
+  static CodeBlob* load_code_blob(AOTCodeEntry::Kind kind,
+                                  uint id, const char* name,
+                                  int entry_offset_count,
+                                  int* entry_offsets) NOT_CDS_RETURN_(nullptr);
+
+  static uint store_entries_cnt() {
+    if (is_on_for_dump()) {
+      return cache()->_store_entries_cnt;
+    }
+    return -1;
+  }
+
+// Static access
+
+private:
+  static AOTCodeCache*  _cache;
+
+  static bool open_cache(bool is_dumping, bool is_using);
+  static bool verify_vm_config() {
+    if (is_on_for_use()) {
+      return _cache->_load_header->verify_vm_config();
+    }
+    return true;
+  }
+public:
+  static AOTCodeCache* cache() { return _cache; }
+  static void initialize() NOT_CDS_RETURN;
+  static void init2() NOT_CDS_RETURN;
+  static void close() NOT_CDS_RETURN;
+  static bool is_on() CDS_ONLY({ return _cache != nullptr && !_cache->closing(); }) NOT_CDS_RETURN_(false);
+  static bool is_on_for_use()  { return is_on() && _cache->for_use(); }
+  static bool is_on_for_dump() { return is_on() && _cache->for_dump(); }
+
+  static bool is_dumping_adapters() NOT_CDS_RETURN_(false);
+  static bool is_using_adapters() NOT_CDS_RETURN_(false);
+
+  static const char* add_C_string(const char* str) NOT_CDS_RETURN_(str);
+
+  static void print_on(outputStream* st) NOT_CDS_RETURN;
+};
+
+// Concurent AOT code reader
+class AOTCodeReader {
+private:
+  const AOTCodeCache*  _cache;
+  const AOTCodeEntry*  _entry;
+  const char*          _load_buffer; // Loaded cached code buffer
+  uint  _read_position;              // Position in _load_buffer
+  uint  read_position() const { return _read_position; }
+  void  set_read_position(uint pos);
+  const char* addr(uint offset) const { return _load_buffer + offset; }
+
+  bool _lookup_failed;       // Failed to lookup for info (skip only this code load)
+  void set_lookup_failed()     { _lookup_failed = true; }
+  void clear_lookup_failed()   { _lookup_failed = false; }
+  bool lookup_failed()   const { return _lookup_failed; }
+
+  AOTCodeEntry* aot_code_entry() { return (AOTCodeEntry*)_entry; }
+public:
+  AOTCodeReader(AOTCodeCache* cache, AOTCodeEntry* entry);
+
+  CodeBlob* compile_code_blob(const char* name, int entry_offset_count, int* entry_offsets);
+
+  ImmutableOopMapSet* read_oop_map_set();
+
+  void fix_relocations(CodeBlob* code_blob);
+};
+#endif // SHARE_CODE_AOTCODECACH_HPP
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 4ae4ccbc858..1512f498b37 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -78,9 +78,12 @@ const BufferBlob::Vptr               BufferBlob::_vpntr;
 const RuntimeStub::Vptr              RuntimeStub::_vpntr;
 const SingletonBlob::Vptr            SingletonBlob::_vpntr;
 const DeoptimizationBlob::Vptr       DeoptimizationBlob::_vpntr;
+#ifdef COMPILER2
+const ExceptionBlob::Vptr            ExceptionBlob::_vpntr;
+#endif // COMPILER2
 const UpcallStub::Vptr               UpcallStub::_vpntr;
 
-const CodeBlob::Vptr* CodeBlob::vptr() const {
+const CodeBlob::Vptr* CodeBlob::vptr(CodeBlobKind kind) {
   constexpr const CodeBlob::Vptr* array[(size_t)CodeBlobKind::Number_Of_Kinds] = {
       nullptr/* None */,
       &nmethod::_vpntr,
@@ -98,7 +101,11 @@ const CodeBlob::Vptr* CodeBlob::vptr() const {
       &UpcallStub::_vpntr
   };
 
-  return array[(size_t)_kind];
+  return array[(size_t)kind];
+}
+
+const CodeBlob::Vptr* CodeBlob::vptr() const {
+  return vptr(_kind);
 }
 
 unsigned int CodeBlob::align_code_offset(int offset) {
@@ -181,6 +188,19 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t heade
   assert(_mutable_data = blob_end(), "sanity");
 }
 
+void CodeBlob::restore_mutable_data(address reloc_data) {
+  // Relocation data is now stored as part of the mutable data area; allocate it before copy relocations
+  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");
+    }
+  }
+  if (_relocation_size > 0) {
+    memcpy((address)relocation_begin(), reloc_data, relocation_size());
+  }
+}
+
 void CodeBlob::purge() {
   assert(_mutable_data != nullptr, "should never be null");
   if (_mutable_data != blob_end()) {
@@ -215,6 +235,68 @@ void CodeBlob::print_code_on(outputStream* st) {
   Disassembler::decode(this, st);
 }
 
+void CodeBlob::prepare_for_archiving_impl() {
+  set_name(nullptr);
+  _oop_maps = nullptr;
+  _mutable_data = nullptr;
+#ifndef PRODUCT
+  asm_remarks().clear();
+  dbg_strings().clear();
+#endif /* PRODUCT */
+}
+
+void CodeBlob::prepare_for_archiving() {
+  vptr(_kind)->prepare_for_archiving(this);
+}
+
+void CodeBlob::archive_blob(CodeBlob* blob, address archive_buffer) {
+  blob->copy_to(archive_buffer);
+  CodeBlob* archived_blob = (CodeBlob*)archive_buffer;
+  archived_blob->prepare_for_archiving();
+}
+
+void CodeBlob::post_restore_impl() {
+  // Track memory usage statistic after releasing CodeCache_lock
+  MemoryService::track_code_cache_memory_usage();
+}
+
+void CodeBlob::post_restore() {
+  vptr(_kind)->post_restore(this);
+}
+
+CodeBlob* CodeBlob::restore(address code_cache_buffer, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps) {
+  copy_to(code_cache_buffer);
+  CodeBlob* code_blob = (CodeBlob*)code_cache_buffer;
+  code_blob->set_name(name);
+  code_blob->restore_mutable_data(archived_reloc_data);
+  code_blob->set_oop_maps(archived_oop_maps);
+  return code_blob;
+}
+
+CodeBlob* CodeBlob::create(CodeBlob* archived_blob, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps) {
+  ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
+
+  CodeCache::gc_on_allocation();
+
+  CodeBlob* blob = nullptr;
+  unsigned int size = archived_blob->size();
+  {
+    MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+    address code_cache_buffer = (address)CodeCache::allocate(size, CodeBlobType::NonNMethod);
+    if (code_cache_buffer != nullptr) {
+      blob = archived_blob->restore(code_cache_buffer, name, archived_reloc_data, archived_oop_maps);
+      assert(blob != nullptr, "sanity check");
+      // Flush the code block
+      ICache::invalidate_range(blob->code_begin(), blob->code_size());
+      CodeCache::commit(blob); // Count adapters
+    }
+  }
+  if (blob != nullptr) {
+    blob->post_restore();
+  }
+  return blob;
+}
+
 //-----------------------------------------------------------------------------------------
 // Creates a RuntimeBlob from a CodeBuffer and copy code and relocation info.
 
@@ -720,7 +802,7 @@ void CodeBlob::print_value_on(outputStream* st) const {
 }
 
 void CodeBlob::print_on_impl(outputStream* st) const {
-  st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", p2i(this));
+  st->print_cr("[CodeBlob kind:%d (" INTPTR_FORMAT ")]", (int)_kind, p2i(this));
   st->print_cr("Framesize: %d", _frame_size);
 }
 
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 1daa35c16b5..37f83824987 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -97,11 +97,16 @@ enum class CodeBlobKind : u1 {
 class UpcallStub;      // for as_upcall_stub()
 class RuntimeStub;     // for as_runtime_stub()
 class JavaFrameAnchor; // for UpcallStub::jfa_for_frame
+class AdapterBlob;
+class ExceptionBlob;
 
 class CodeBlob {
   friend class VMStructs;
   friend class JVMCIVMStructs;
 
+private:
+  void restore_mutable_data(address reloc_data);
+
 protected:
   // order fields from large to small to minimize padding between fields
   ImmutableOopMapSet* _oop_maps;   // OopMap for this CodeBlob
@@ -140,8 +145,15 @@ class CodeBlob {
    public:
     virtual void print_on(const CodeBlob* instance, outputStream* st) const = 0;
     virtual void print_value_on(const CodeBlob* instance, outputStream* st) const = 0;
+    virtual void prepare_for_archiving(CodeBlob* instance) const {
+      instance->prepare_for_archiving_impl();
+    };
+    virtual void post_restore(CodeBlob* instance) const {
+      instance->post_restore_impl();
+    };
   };
 
+  static const Vptr* vptr(CodeBlobKind kind);
   const Vptr* vptr() const;
 
   CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
@@ -151,8 +163,12 @@ class CodeBlob {
   // Simple CodeBlob used for simple BufferBlob.
   CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size);
 
+
   void operator delete(void* p) { }
 
+  void prepare_for_archiving_impl();
+  void post_restore_impl();
+
 public:
 
   ~CodeBlob() {
@@ -188,6 +204,7 @@ class CodeBlob {
   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; }
+  AdapterBlob* as_adapter_blob() const        { assert(is_adapter_blob(), "must be adapter blob"); return (AdapterBlob*) 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; }
 
@@ -244,6 +261,7 @@ class CodeBlob {
   // OopMap for frame
   ImmutableOopMapSet* oop_maps() const           { return _oop_maps; }
   void set_oop_maps(OopMapSet* p);
+  void set_oop_maps(ImmutableOopMapSet* p)       { _oop_maps = p; }
 
   const ImmutableOopMap* oop_map_for_slot(int slot, address return_address) const;
   const ImmutableOopMap* oop_map_for_return_address(address return_address) const;
@@ -278,6 +296,19 @@ class CodeBlob {
   void use_remarks(AsmRemarks &remarks) { _asm_remarks.share(remarks); }
   void use_strings(DbgStrings &strings) { _dbg_strings.share(strings); }
 #endif
+
+  void copy_to(address buffer) {
+    memcpy(buffer, this, this->size());
+  }
+
+  // methods to archive a blob into AOT code cache
+  void prepare_for_archiving();
+  static void archive_blob(CodeBlob* blob, address archive_buffer);
+
+  // methods to restore a blob from AOT code cache into the CodeCache
+  void post_restore();
+  CodeBlob* restore(address code_cache_buffer, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps);
+  static CodeBlob* create(CodeBlob* archived_blob, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps);
 };
 
 //----------------------------------------------------------------------------------------------------
@@ -617,6 +648,18 @@ class ExceptionBlob: public SingletonBlob {
     OopMapSet*  oop_maps,
     int         frame_size
   );
+
+  void post_restore_impl() {
+    trace_new_stub(this, "ExceptionBlob");
+  }
+
+  class Vptr : public SingletonBlob::Vptr {
+    void post_restore(CodeBlob* instance) const override {
+      ((ExceptionBlob*)instance)->post_restore_impl();
+    }
+  };
+
+  static const Vptr _vpntr;
 };
 #endif // COMPILER2
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 4576a348a4f..e3bd3131b45 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -3243,7 +3243,7 @@ void nmethod::print_relocations() {
   ResourceMark m;       // in case methods get printed via the debugger
   tty->print_cr("relocations:");
   RelocIterator iter(this);
-  iter.print();
+  iter.print_on(tty);
 }
 #endif
 
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index a828a8356aa..81fa83dbe8d 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -179,8 +179,31 @@ RelocIterator::RelocIterator(CodeSection* cs, address begin, address limit) {
   set_limits(begin, limit);
 }
 
+RelocIterator::RelocIterator(CodeBlob* cb) {
+  initialize_misc();
+  if (cb->is_nmethod()) {
+    _code = cb->as_nmethod();
+  } else {
+    _code = nullptr;
+  }
+  _current = cb->relocation_begin() - 1;
+  _end = cb->relocation_end();
+  _addr = cb->content_begin();
+
+  _section_start[CodeBuffer::SECT_CONSTS] = cb->content_begin();
+  _section_start[CodeBuffer::SECT_INSTS] = cb->code_begin();
+
+  _section_end[CodeBuffer::SECT_CONSTS] = cb->code_begin();
+  _section_start[CodeBuffer::SECT_INSTS] = cb->code_end();
+  assert(!has_current(), "just checking");
+  set_limits(nullptr, nullptr);
+}
+
 bool RelocIterator::addr_in_const() const {
   const int n = CodeBuffer::SECT_CONSTS;
+  if (_section_start[n] == nullptr) {
+    return false;
+  }
   return section_start(n) <= addr() && addr() < section_end(n);
 }
 
@@ -471,7 +494,9 @@ void trampoline_stub_Relocation::unpack_data() {
 void external_word_Relocation::pack_data_to(CodeSection* dest) {
   short* p = (short*) dest->locs_end();
   int index = ExternalsRecorder::find_index(_target);
-  p = pack_1_int_to(p, index);
+  // Use 4 bytes to store index to be able patch it when
+  // updating relocations in AOTCodeReader::read_relocations().
+  p = add_jint(p, index);
   dest->set_locs_end((relocInfo*) p);
 }
 
@@ -766,6 +791,14 @@ void internal_word_Relocation::fix_relocation_after_move(const CodeBuffer* src,
   set_value(target);
 }
 
+void internal_word_Relocation::fix_relocation_after_aot_load(address orig_base_addr, address current_base_addr) {
+  address target = _target;
+  if (target == nullptr) {
+    target = this->target();
+    target = current_base_addr + (target - orig_base_addr);
+  }
+  set_value(target);
+}
 
 address internal_word_Relocation::target() {
   address target = _target;
@@ -779,12 +812,7 @@ address internal_word_Relocation::target() {
   return target;
 }
 
-//---------------------------------------------------------------------------------
-// Non-product code
-
-#ifndef PRODUCT
-
-static const char* reloc_type_string(relocInfo::relocType t) {
+const char* relocInfo::type_name(relocInfo::relocType t) {
   switch (t) {
   #define EACH_CASE(name) \
   case relocInfo::name##_type: \
@@ -802,26 +830,25 @@ static const char* reloc_type_string(relocInfo::relocType t) {
   }
 }
 
-
-void RelocIterator::print_current() {
+void RelocIterator::print_current_on(outputStream* st) {
   if (!has_current()) {
-    tty->print_cr("(no relocs)");
+    st->print_cr("(no relocs)");
     return;
   }
-  tty->print("relocInfo@" INTPTR_FORMAT " [type=%d(%s) addr=" INTPTR_FORMAT " offset=%d",
-             p2i(_current), type(), reloc_type_string((relocInfo::relocType) type()), p2i(_addr), _current->addr_offset());
+  st->print("relocInfo@" INTPTR_FORMAT " [type=%d(%s) addr=" INTPTR_FORMAT " offset=%d",
+             p2i(_current), type(), relocInfo::type_name((relocInfo::relocType) type()), p2i(_addr), _current->addr_offset());
   if (current()->format() != 0)
-    tty->print(" format=%d", current()->format());
+    st->print(" format=%d", current()->format());
   if (datalen() == 1) {
-    tty->print(" data=%d", data()[0]);
+    st->print(" data=%d", data()[0]);
   } else if (datalen() > 0) {
-    tty->print(" data={");
+    st->print(" data={");
     for (int i = 0; i < datalen(); i++) {
-      tty->print("%04x", data()[i] & 0xFFFF);
+      st->print("%04x", data()[i] & 0xFFFF);
     }
-    tty->print("}");
+    st->print("}");
   }
-  tty->print("]");
+  st->print("]");
   switch (type()) {
   case relocInfo::oop_type:
     {
@@ -834,14 +861,14 @@ void RelocIterator::print_current() {
         raw_oop   = *oop_addr;
         oop_value = r->oop_value();
       }
-      tty->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+      st->print(" | [oop_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
                  p2i(oop_addr), p2i(raw_oop));
       // Do not print the oop by default--we want this routine to
       // work even during GC or other inconvenient times.
       if (WizardMode && oop_value != nullptr) {
-        tty->print("oop_value=" INTPTR_FORMAT ": ", p2i(oop_value));
+        st->print("oop_value=" INTPTR_FORMAT ": ", p2i(oop_value));
         if (oopDesc::is_oop(oop_value)) {
-          oop_value->print_value_on(tty);
+          oop_value->print_value_on(st);
         }
       }
       break;
@@ -857,11 +884,11 @@ void RelocIterator::print_current() {
         raw_metadata   = *metadata_addr;
         metadata_value = r->metadata_value();
       }
-      tty->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
+      st->print(" | [metadata_addr=" INTPTR_FORMAT " *=" INTPTR_FORMAT "]",
                  p2i(metadata_addr), p2i(raw_metadata));
       if (metadata_value != nullptr) {
-        tty->print("metadata_value=" INTPTR_FORMAT ": ", p2i(metadata_value));
-        metadata_value->print_value_on(tty);
+        st->print("metadata_value=" INTPTR_FORMAT ": ", p2i(metadata_value));
+        metadata_value->print_value_on(st);
       }
       break;
     }
@@ -870,17 +897,17 @@ void RelocIterator::print_current() {
   case relocInfo::section_word_type:
     {
       DataRelocation* r = (DataRelocation*) reloc();
-      tty->print(" | [target=" INTPTR_FORMAT "]", p2i(r->value())); //value==target
+      st->print(" | [target=" INTPTR_FORMAT "]", p2i(r->value())); //value==target
       break;
     }
   case relocInfo::static_call_type:
     {
       static_call_Relocation* r = (static_call_Relocation*) reloc();
-      tty->print(" | [destination=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
+      st->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());
+        st->print(" Blob::%s", cb->name());
       }
       break;
     }
@@ -889,28 +916,28 @@ void RelocIterator::print_current() {
     {
       CallRelocation* r = (CallRelocation*) reloc();
       address dest = r->destination();
-      tty->print(" | [destination=" INTPTR_FORMAT "]", p2i(dest));
+      st->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());
+          st->print(" Stub::%s", desc->name());
         }
       } else {
         CodeBlob* cb = CodeCache::find_blob(dest);
         if (cb != nullptr) {
-          tty->print(" %s", cb->name());
+          st->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);
+            st->print(" %s", buf);
             if (offset != 0) {
-              tty->print("+%d", offset);
+              st->print("+%d", offset);
             }
           }
         }
@@ -920,45 +947,45 @@ void RelocIterator::print_current() {
   case relocInfo::virtual_call_type:
     {
       virtual_call_Relocation* r = (virtual_call_Relocation*) reloc();
-      tty->print(" | [destination=" INTPTR_FORMAT " cached_value=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
+      st->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());
+        st->print(" Blob::%s", cb->name());
       }
       break;
     }
   case relocInfo::static_stub_type:
     {
       static_stub_Relocation* r = (static_stub_Relocation*) reloc();
-      tty->print(" | [static_call=" INTPTR_FORMAT "]", p2i(r->static_call()));
+      st->print(" | [static_call=" INTPTR_FORMAT "]", p2i(r->static_call()));
       break;
     }
   case relocInfo::trampoline_stub_type:
     {
       trampoline_stub_Relocation* r = (trampoline_stub_Relocation*) reloc();
-      tty->print(" | [trampoline owner=" INTPTR_FORMAT "]", p2i(r->owner()));
+      st->print(" | [trampoline owner=" INTPTR_FORMAT "]", p2i(r->owner()));
       break;
     }
   case relocInfo::opt_virtual_call_type:
     {
       opt_virtual_call_Relocation* r = (opt_virtual_call_Relocation*) reloc();
-      tty->print(" | [destination=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
+      st->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());
+        st->print(" Blob::%s", cb->name());
       }
       break;
     }
   default:
     break;
   }
-  tty->cr();
+  st->cr();
 }
 
 
-void RelocIterator::print() {
+void RelocIterator::print_on(outputStream* st) {
   RelocIterator save_this = (*this);
   relocInfo* scan = _current;
   if (!has_current())  scan += 1;  // nothing to scan here!
@@ -969,32 +996,37 @@ void RelocIterator::print() {
     got_next = (skip_next || next());
     skip_next = false;
 
-    tty->print("         @" INTPTR_FORMAT ": ", p2i(scan));
+    st->print("         @" INTPTR_FORMAT ": ", p2i(scan));
     relocInfo* newscan = _current+1;
     if (!has_current())  newscan -= 1;  // nothing to scan here!
     while (scan < newscan) {
-      tty->print("%04x", *(short*)scan & 0xFFFF);
+      st->print("%04x", *(short*)scan & 0xFFFF);
       scan++;
     }
-    tty->cr();
+    st->cr();
 
     if (!got_next)  break;
-    print_current();
+    print_current_on(st);
   }
 
   (*this) = save_this;
 }
 
+//---------------------------------------------------------------------------------
+// Non-product code
+
+#ifndef PRODUCT
+
 // For the debugger:
 extern "C"
 void print_blob_locs(nmethod* nm) {
   nm->print();
   RelocIterator iter(nm);
-  iter.print();
+  iter.print_on(tty);
 }
 extern "C"
 void print_buf_locs(CodeBuffer* cb) {
   FlagSetting fs(PrintRelocations, true);
-  cb->print();
+  cb->print_on(tty);
 }
 #endif // !PRODUCT
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index a10f653bbb1..714a964b28d 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.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
@@ -451,6 +451,8 @@ class relocInfo {
     length_limit       = 1 + 1 + (3*BytesPerWord/BytesPerShort) + 1,
     have_format        = format_width > 0
   };
+
+  static const char* type_name(relocInfo::relocType t);
 };
 
 #define FORWARD_DECLARE_EACH_CLASS(name)              \
@@ -600,6 +602,7 @@ class RelocIterator : public StackObj {
   // constructor
   RelocIterator(nmethod* nm, address begin = nullptr, address limit = nullptr);
   RelocIterator(CodeSection* cb, address begin = nullptr, address limit = nullptr);
+  RelocIterator(CodeBlob* cb);
 
   // get next reloc info, return !eos
   bool next() {
@@ -638,11 +641,11 @@ class RelocIterator : public StackObj {
   bool   addr_in_const()      const;
 
   address section_start(int n) const {
-    assert(_section_start[n], "must be initialized");
+    assert(_section_start[n], "section %d must be initialized", n);
     return _section_start[n];
   }
   address section_end(int n) const {
-    assert(_section_end[n], "must be initialized");
+    assert(_section_end[n], "section %d must be initialized", n);
     return _section_end[n];
   }
 
@@ -658,11 +661,9 @@ class RelocIterator : public StackObj {
   // generic relocation accessor; switches on type to call the above
   Relocation* reloc();
 
-#ifndef PRODUCT
  public:
-  void print();
-  void print_current();
-#endif
+  void print_on(outputStream* st);
+  void print_current_on(outputStream* st);
 };
 
 
@@ -672,6 +673,7 @@ class RelocIterator : public StackObj {
 
 class Relocation {
   friend class RelocIterator;
+  friend class AOTCodeReader;
 
  private:
   // When a relocation has been created by a RelocIterator,
@@ -1377,6 +1379,8 @@ class internal_word_Relocation : public DataRelocation {
   void unpack_data() override;
 
   void fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) override;
+  void fix_relocation_after_aot_load(address orig_base_addr, address current_base_addr);
+
   address  target();        // if _target==nullptr, fetch addr from code stream
   int      section()        { return _section;   }
   address  value() override { return target();   }
diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index 88249fc8555..aeb6ac3828e 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -729,7 +729,6 @@ bool ImmutableOopMap::has_any(OopMapValue::oop_types type) const {
   return false;
 }
 
-#ifdef ASSERT
 int ImmutableOopMap::nr_of_bytes() const {
   OopMapStream oms(this);
 
@@ -738,7 +737,6 @@ int ImmutableOopMap::nr_of_bytes() const {
   }
   return sizeof(ImmutableOopMap) + oms.stream_position();
 }
-#endif
 
 ImmutableOopMapBuilder::ImmutableOopMapBuilder(const OopMapSet* set) : _set(set), _empty(nullptr), _last(nullptr), _empty_offset(-1), _last_offset(-1), _offset(0), _required(-1), _new_set(nullptr) {
   _mapping = NEW_RESOURCE_ARRAY(Mapping, _set->size());
diff --git a/src/hotspot/share/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp
index 191996f0f05..4b962444738 100644
--- a/src/hotspot/share/compiler/oopMap.hpp
+++ b/src/hotspot/share/compiler/oopMap.hpp
@@ -292,9 +292,7 @@ class ImmutableOopMap {
   bool has_derived_oops() const { return _has_derived_oops; }
   bool has_any(OopMapValue::oop_types type) const;
 
-#ifdef ASSERT
-  int nr_of_bytes() const; // this is an expensive operation, only used in debug builds
-#endif
+  int nr_of_bytes() const; // this is an expensive operation, only used in debug builds or in aot code generation
 
   void oops_do(const frame* fr, const RegisterMap* reg_map, OopClosure* f, DerivedOopClosure* df) const;
   void oops_do(const frame* fr, const RegisterMap* reg_map, OopClosure* f, DerivedPointerIterationMode derived_mode) const;
@@ -378,9 +376,7 @@ class OopMapStream : public StackObj {
   bool is_done()                        { if(!_valid_omv) { find_next(); } return !_valid_omv; }
   void next()                           { find_next(); }
   OopMapValue current()                 { return _omv; }
-#ifdef ASSERT
   int stream_position() const           { return _stream.position(); }
-#endif
 };
 
 class ImmutableOopMapBuilder {
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index 8819e4c00be..685fba47349 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -35,12 +35,12 @@
 //
 // Also, this is a C header file. Do not use C++ here.
 
-#define NUM_CDS_REGIONS 4 // this must be the same as MetaspaceShared::n_regions
+#define NUM_CDS_REGIONS 5 // 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
+#define CURRENT_CDS_ARCHIVE_VERSION 19
 
 typedef struct CDSFileMapRegion {
   int     _crc;               // CRC checksum of this region.
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index b67dcd43e4d..93fe4f2e99b 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -314,7 +314,9 @@ class MetaspaceObj {
   f(ConstantPoolCache) \
   f(Annotations) \
   f(MethodCounters) \
-  f(RecordComponent)
+  f(RecordComponent) \
+  f(AdapterHandlerEntry) \
+  f(AdapterFingerPrint)
 
 #define METASPACE_OBJ_TYPE_DECLARE(name) name ## Type,
 #define METASPACE_OBJ_TYPE_NAME_CASE(name) case name ## Type: return #name;
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 9e5d0a18c10..e6fac91f245 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -396,6 +396,11 @@ bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
         return true;
       }
 
+      if (reserved_rgn->mem_tag() == mtCode) {
+        assert(reserved_rgn->contain_region(base_addr, size), "Reserved code region should contain this mapping region");
+        return true;
+      }
+
       // Print some more details. Don't use UL here to avoid circularities.
       tty->print_cr("Error: existing region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %u.\n"
                     "       new region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %u.",
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 07f2c559604..ce7d77a38cc 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -31,6 +31,7 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compilationPolicy.hpp"
@@ -392,6 +393,7 @@ void Method::metaspace_pointers_do(MetaspaceClosure* it) {
   } else {
     it->push(&_constMethod);
   }
+  it->push(&_adapter);
   it->push(&_method_data);
   it->push(&_method_counters);
   NOT_PRODUCT(it->push(&_name);)
@@ -405,11 +407,18 @@ void Method::metaspace_pointers_do(MetaspaceClosure* it) {
 
 void Method::remove_unshareable_info() {
   unlink_method();
+  if (AOTCodeCache::is_dumping_adapters() && _adapter != nullptr) {
+    _adapter->remove_unshareable_info();
+  }
   JFR_ONLY(REMOVE_METHOD_ID(this);)
 }
 
 void Method::restore_unshareable_info(TRAPS) {
   assert(is_method() && is_valid_method(this), "ensure C++ vtable is restored");
+  if (_adapter != nullptr) {
+    assert(_adapter->is_linked(), "must be");
+    _from_compiled_entry = _adapter->get_c2i_entry();
+  }
   assert(!queued_for_compilation(), "method's queued_for_compilation flag should not be set");
 }
 #endif
@@ -1137,7 +1146,9 @@ void Method::unlink_code() {
 void Method::unlink_method() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   _code = nullptr;
-  _adapter = nullptr;
+  if (!AOTCodeCache::is_dumping_adapters() || AdapterHandlerLibrary::is_abstract_method_adapter(_adapter)) {
+    _adapter = nullptr;
+  }
   _i2i_entry = nullptr;
   _from_compiled_entry = nullptr;
   _from_interpreted_entry = nullptr;
@@ -1178,14 +1189,18 @@ void Method::link_method(const methodHandle& h_method, TRAPS) {
   // If the code cache is full, we may reenter this function for the
   // leftover methods that weren't linked.
   if (adapter() != nullptr) {
-    return;
+    if (adapter()->is_shared()) {
+      assert(adapter()->is_linked(), "Adapter is shared but not linked");
+    } else {
+      return;
+    }
   }
   assert( _code == nullptr, "nothing compiled yet" );
 
   // Setup interpreter entrypoint
   assert(this == h_method(), "wrong h_method()" );
 
-  assert(adapter() == nullptr, "init'd to null");
+  assert(adapter() == nullptr || adapter()->is_linked(), "init'd to null or restored from cache");
   address entry = Interpreter::entry_for_method(h_method);
   assert(entry != nullptr, "interpreter entry must be non-null");
   // Sets both _i2i_entry and _from_interpreted_entry
@@ -1206,7 +1221,10 @@ void Method::link_method(const methodHandle& h_method, TRAPS) {
   // called from the vtable.  We need adapters on such methods that get loaded
   // later.  Ditto for mega-morphic itable calls.  If this proves to be a
   // problem we'll make these lazily later.
-  (void) make_adapters(h_method, CHECK);
+  if (_adapter == nullptr) {
+    (void) make_adapters(h_method, CHECK);
+    assert(adapter()->is_linked(), "Adapter must have been linked");
+  }
 
   // ONLY USE the h_method now as make_adapter may have blocked
 
@@ -1482,6 +1500,9 @@ methodHandle Method::make_method_handle_intrinsic(vmIntrinsics::ID iid,
 
 #if INCLUDE_CDS
 void Method::restore_archived_method_handle_intrinsic(methodHandle m, TRAPS) {
+  if (m->adapter() != nullptr) {
+    m->set_from_compiled_entry(m->adapter()->get_c2i_entry());
+  }
   m->link_method(m, CHECK);
 
   if (m->intrinsic_id() == vmIntrinsics::_linkToNative) {
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index fd7fc796aa4..633cced0090 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -113,6 +113,7 @@ enum class OptoStubId :int {
 
 class OptoRuntime : public AllStatic {
   friend class Matcher;  // allow access to stub names
+  friend class AOTCodeAddressTable;
 
  private:
   // declare opto stub address/blob holder static fields
diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp
index 3756cdd4fd2..48e01f82025 100644
--- a/src/hotspot/share/runtime/init.cpp
+++ b/src/hotspot/share/runtime/init.cpp
@@ -24,6 +24,7 @@
 
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
+#include "code/aotCodeCache.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
@@ -143,7 +144,7 @@ jint init_globals() {
     LSAN_REGISTER_ROOT_REGION(summary.start(), summary.reserved_size());
   }
 #endif // LEAK_SANITIZER
-
+  AOTCodeCache::init2();     // depends on universe_init
   AsyncLogWriter::initialize();
   gc_barrier_stubs_init();   // depends on universe_init, must be before interpreter_init
   continuations_init();      // must precede continuation stub generation
@@ -156,6 +157,8 @@ jint init_globals() {
   InterfaceSupport_init();
   VMRegImpl::set_regName();  // need this before generate_stubs (for printing oop maps).
   SharedRuntime::generate_stubs();
+  AOTCodeCache::init_shared_blobs_table();  // need this after generate_stubs
+  SharedRuntime::init_adapter_library(); // do this after AOTCodeCache::init_shared_blobs_table
   return JNI_OK;
 }
 
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index faed0d5f952..8cb239636d2 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -123,6 +123,8 @@ Mutex*   CodeHeapStateAnalytics_lock  = nullptr;
 
 Mutex*   ExternalsRecorder_lock       = nullptr;
 
+Mutex*   AOTCodeCStrings_lock         = nullptr;
+
 Monitor* ContinuationRelativize_lock  = nullptr;
 
 Mutex*   Metaspace_lock               = nullptr;
@@ -319,6 +321,8 @@ void mutex_init() {
   // tty_lock is held when printing nmethod and its relocations which use this lock.
   MUTEX_DEFL(ExternalsRecorder_lock         , PaddedMutex  , tty_lock);
 
+  MUTEX_DEFL(AOTCodeCStrings_lock           , PaddedMutex  , tty_lock);
+
   MUTEX_DEFL(Threads_lock                   , PaddedMonitor, CompileThread_lock, true);
   MUTEX_DEFL(Compile_lock                   , PaddedMutex  , MethodCompileQueue_lock);
   MUTEX_DEFL(JNICritical_lock               , PaddedMonitor, AdapterHandlerLibrary_lock); // used for JNI critical regions
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 3bd01b575c4..c307f70ba80 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -148,6 +148,8 @@ extern Mutex*   CodeHeapStateAnalytics_lock;     // lock print functions against
 
 extern Mutex*   ExternalsRecorder_lock;          // used to guard access to the external addresses table
 
+extern Mutex*   AOTCodeCStrings_lock;            // used to guard access to the AOT code C strings table
+
 extern Monitor* ContinuationRelativize_lock;
 
 #if INCLUDE_JVMCI
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 3695d9dfe76..733e8a78d90 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -22,11 +22,14 @@
  *
  */
 
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.inline.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/nmethod.inline.hpp"
@@ -147,8 +150,6 @@ void SharedRuntime::generate_stubs() {
     generate_throw_exception(SharedStubId::throw_NullPointerException_at_call_id,
                              CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call));
 
-  AdapterHandlerLibrary::initialize();
-
 #if COMPILER2_OR_JVMCI
   // Vectors are generated only by C2 and JVMCI.
   bool support_wide = is_wide_vector(MaxVectorSize);
@@ -168,6 +169,10 @@ void SharedRuntime::generate_stubs() {
   generate_deopt_blob();
 }
 
+void SharedRuntime::init_adapter_library() {
+  AdapterHandlerLibrary::initialize();
+}
+
 #if INCLUDE_JFR
 //------------------------------generate jfr runtime stubs ------
 void SharedRuntime::generate_jfr_stubs() {
@@ -2170,13 +2175,14 @@ void SharedRuntime::print_call_statistics(uint64_t comp_total) {
 #ifndef PRODUCT
 static int _lookups; // number of calls to lookup
 static int _equals;  // number of buckets checked with matching hash
-static int _hits;    // number of successful lookups
+static int _archived_hits; // number of successful lookups in archived table
+static int _runtime_hits;  // number of successful lookups in runtime table
 static int _compact; // number of equals calls with compact signature
 #endif
 
 // A simple wrapper class around the calling convention information
 // that allows sharing of adapters for the same calling convention.
-class AdapterFingerPrint : public CHeapObj<mtCode> {
+class AdapterFingerPrint : public MetaspaceObj {
  private:
   enum {
     _basic_type_bits = 4,
@@ -2187,12 +2193,29 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
   // TO DO:  Consider integrating this with a more global scheme for compressing signatures.
   // For now, 4 bits per components (plus T_VOID gaps after double/long) is not excessive.
 
-  union {
-    int  _compact[_compact_int_count];
-    int* _fingerprint;
-  } _value;
-  int _length; // A negative length indicates the fingerprint is in the compact form,
-               // Otherwise _value._fingerprint is the array.
+  int _length;
+  int _value[_compact_int_count];
+
+  // Private construtor. Use allocate() to get an instance.
+  AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
+    // Pack the BasicTypes with 8 per int
+    _length = (total_args_passed + (_basic_types_per_int-1)) / _basic_types_per_int;
+    int sig_index = 0;
+    for (int index = 0; index < _length; index++) {
+      int value = 0;
+      for (int byte = 0; sig_index < total_args_passed && byte < _basic_types_per_int; byte++) {
+        int bt = adapter_encoding(sig_bt[sig_index++]);
+        assert((bt & _basic_type_mask) == bt, "must fit in 4 bits");
+        value = (value << _basic_type_bits) | bt;
+      }
+      _value[index] = value;
+    }
+  }
+
+  // Call deallocate instead
+  ~AdapterFingerPrint() {
+    FreeHeap(this);
+  }
 
   // Remap BasicTypes that are handled equivalently by the adapters.
   // These are correct for the current system but someday it might be
@@ -2229,64 +2252,63 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
     }
   }
 
- public:
-  AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
-    // The fingerprint is based on the BasicType signature encoded
-    // into an array of ints with eight entries per int.
-    int* ptr;
-    int len = (total_args_passed + (_basic_types_per_int-1)) / _basic_types_per_int;
-    if (len <= _compact_int_count) {
-      assert(_compact_int_count == 3, "else change next line");
-      _value._compact[0] = _value._compact[1] = _value._compact[2] = 0;
-      // Storing the signature encoded as signed chars hits about 98%
-      // of the time.
-      _length = -len;
-      ptr = _value._compact;
-    } else {
-      _length = len;
-      _value._fingerprint = NEW_C_HEAP_ARRAY(int, _length, mtCode);
-      ptr = _value._fingerprint;
-    }
+  void* operator new(size_t size, size_t fp_size) throw() {
+    assert(fp_size >= size, "sanity check");
+    void* p = AllocateHeap(fp_size, mtCode);
+    memset(p, 0, fp_size);
+    return p;
+  }
 
-    // Now pack the BasicTypes with 8 per int
-    int sig_index = 0;
-    for (int index = 0; index < len; index++) {
-      int value = 0;
-      for (int byte = 0; sig_index < total_args_passed && byte < _basic_types_per_int; byte++) {
-        int bt = adapter_encoding(sig_bt[sig_index++]);
-        assert((bt & _basic_type_mask) == bt, "must fit in 4 bits");
-        value = (value << _basic_type_bits) | bt;
+  template<typename Function>
+  void iterate_args(Function function) {
+    for (int i = 0; i < length(); i++) {
+      unsigned val = (unsigned)value(i);
+      // args are packed so that first/lower arguments are in the highest
+      // bits of each int value, so iterate from highest to the lowest
+      for (int j = 32 - _basic_type_bits; j >= 0; j -= _basic_type_bits) {
+        unsigned v = (val >> j) & _basic_type_mask;
+        if (v == 0) {
+          continue;
+        }
+        function(v);
       }
-      ptr[index] = value;
     }
   }
 
-  ~AdapterFingerPrint() {
-    if (_length > 0) {
-      FREE_C_HEAP_ARRAY(int, _value._fingerprint);
-    }
+ public:
+  static int allocation_size(int total_args_passed, BasicType* sig_bt) {
+    int len = (total_args_passed + (_basic_types_per_int-1)) / _basic_types_per_int;
+    return sizeof(AdapterFingerPrint) + (len > _compact_int_count ? (len - _compact_int_count) * sizeof(int) : 0);
+  }
+
+  static AdapterFingerPrint* allocate(int total_args_passed, BasicType* sig_bt) {
+    int size_in_bytes = allocation_size(total_args_passed, sig_bt);
+    return new (size_in_bytes) AdapterFingerPrint(total_args_passed, sig_bt);
+  }
+
+  static void deallocate(AdapterFingerPrint* fp) {
+    fp->~AdapterFingerPrint();
   }
 
   int value(int index) {
-    if (_length < 0) {
-      return _value._compact[index];
-    }
-    return _value._fingerprint[index];
+    return _value[index];
   }
+
   int length() {
     if (_length < 0) return -_length;
     return _length;
   }
 
   bool is_compact() {
-    return _length <= 0;
+    return _length <= _compact_int_count;
   }
 
   unsigned int compute_hash() {
     int hash = 0;
     for (int i = 0; i < length(); i++) {
       int v = value(i);
-      hash = (hash << 8) ^ v ^ (hash >> 5);
+      //Add arithmetic operation to the hash, like +3 to improve hashing
+      hash = ((hash << 8) ^ v ^ (hash >> 5)) + 3;
     }
     return (unsigned int)hash;
   }
@@ -2300,59 +2322,90 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
     return st.as_string();
   }
 
-#ifndef PRODUCT
-  // Reconstitutes the basic type arguments from the fingerprint,
-  // producing strings like LIJDF
   const char* as_basic_args_string() {
     stringStream st;
     bool long_prev = false;
-    for (int i = 0; i < length(); i++) {
-      unsigned val = (unsigned)value(i);
-      // args are packed so that first/lower arguments are in the highest
-      // bits of each int value, so iterate from highest to the lowest
-      for (int j = 32 - _basic_type_bits; j >= 0; j -= _basic_type_bits) {
-        unsigned v = (val >> j) & _basic_type_mask;
-        if (v == 0) {
-          assert(i == length() - 1, "Only expect zeroes in the last word");
-          continue;
-        }
-        if (long_prev) {
-          long_prev = false;
-          if (v == T_VOID) {
-            st.print("J");
-          } else {
-            st.print("L");
-          }
-        }
-        switch (v) {
-          case T_INT:    st.print("I");    break;
-          case T_LONG:   long_prev = true; break;
-          case T_FLOAT:  st.print("F");    break;
-          case T_DOUBLE: st.print("D");    break;
-          case T_VOID:   break;
-          default: ShouldNotReachHere();
+    iterate_args([&] (int arg) {
+      if (long_prev) {
+        long_prev = false;
+        if (arg == T_VOID) {
+          st.print("J");
+        } else {
+          st.print("L");
         }
       }
-    }
+      switch (arg) {
+        case T_INT:    st.print("I");    break;
+        case T_LONG:   long_prev = true; break;
+        case T_FLOAT:  st.print("F");    break;
+        case T_DOUBLE: st.print("D");    break;
+        case T_VOID:   break;
+        default: ShouldNotReachHere();
+      }
+    });
     if (long_prev) {
       st.print("L");
     }
     return st.as_string();
   }
-#endif // !product
+
+  BasicType* as_basic_type(int& nargs) {
+    nargs = 0;
+    GrowableArray<BasicType> btarray;
+    bool long_prev = false;
+
+    iterate_args([&] (int arg) {
+      if (long_prev) {
+        long_prev = false;
+        if (arg == T_VOID) {
+          btarray.append(T_LONG);
+        } else {
+          btarray.append(T_OBJECT); // it could be T_ARRAY; it shouldn't matter
+        }
+      }
+      switch (arg) {
+        case T_INT: // fallthrough
+        case T_FLOAT: // fallthrough
+        case T_DOUBLE:
+        case T_VOID:
+          btarray.append((BasicType)arg);
+          break;
+        case T_LONG:
+          long_prev = true;
+          break;
+        default: ShouldNotReachHere();
+      }
+    });
+
+    if (long_prev) {
+      btarray.append(T_OBJECT);
+    }
+
+    nargs = btarray.length();
+    BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType, nargs);
+    int index = 0;
+    GrowableArrayIterator<BasicType> iter = btarray.begin();
+    while (iter != btarray.end()) {
+      sig_bt[index++] = *iter;
+      ++iter;
+    }
+    assert(index == btarray.length(), "sanity check");
+#ifdef ASSERT
+    {
+      AdapterFingerPrint* compare_fp = AdapterFingerPrint::allocate(nargs, sig_bt);
+      assert(this->equals(compare_fp), "sanity check");
+      AdapterFingerPrint::deallocate(compare_fp);
+    }
+#endif
+    return sig_bt;
+  }
 
   bool equals(AdapterFingerPrint* other) {
     if (other->_length != _length) {
       return false;
-    }
-    if (_length < 0) {
-      assert(_compact_int_count == 3, "else change next line");
-      return _value._compact[0] == other->_value._compact[0] &&
-             _value._compact[1] == other->_value._compact[1] &&
-             _value._compact[2] == other->_value._compact[2];
     } else {
       for (int i = 0; i < _length; i++) {
-        if (_value._fingerprint[i] != other->_value._fingerprint[i]) {
+        if (_value[i] != other->_value[i]) {
           return false;
         }
       }
@@ -2360,6 +2413,11 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
     return true;
   }
 
+  // methods required by virtue of being a MetaspaceObj
+  void metaspace_pointers_do(MetaspaceClosure* it) { return; /* nothing to do here */ }
+  int size() const { return (int)heap_word_size(sizeof(AdapterFingerPrint) + (_length > _compact_int_count ? (_length - _compact_int_count) * sizeof(int) : 0)); }
+  MetaspaceObj::Type type() const { return AdapterFingerPrintType; }
+
   static bool equals(AdapterFingerPrint* const& fp1, AdapterFingerPrint* const& fp2) {
     NOT_PRODUCT(_equals++);
     return fp1->equals(fp2);
@@ -2370,27 +2428,63 @@ class AdapterFingerPrint : public CHeapObj<mtCode> {
   }
 };
 
+#if INCLUDE_CDS
+static inline bool adapter_fp_equals_compact_hashtable_entry(AdapterHandlerEntry* entry, AdapterFingerPrint* fp, int len_unused) {
+  return AdapterFingerPrint::equals(entry->fingerprint(), fp);
+}
+
+class ArchivedAdapterTable : public OffsetCompactHashtable<
+  AdapterFingerPrint*,
+  AdapterHandlerEntry*,
+  adapter_fp_equals_compact_hashtable_entry> {};
+#endif // INCLUDE_CDS
+
 // A hashtable mapping from AdapterFingerPrints to AdapterHandlerEntries
 using AdapterHandlerTable = ResourceHashtable<AdapterFingerPrint*, AdapterHandlerEntry*, 293,
                   AnyObj::C_HEAP, mtCode,
                   AdapterFingerPrint::compute_hash,
                   AdapterFingerPrint::equals>;
 static AdapterHandlerTable* _adapter_handler_table;
+static GrowableArray<AdapterHandlerEntry*>* _adapter_handler_list = nullptr;
 
 // Find a entry with the same fingerprint if it exists
-static AdapterHandlerEntry* lookup(int total_args_passed, BasicType* sig_bt) {
+AdapterHandlerEntry* AdapterHandlerLibrary::lookup(int total_args_passed, BasicType* sig_bt) {
   NOT_PRODUCT(_lookups++);
   assert_lock_strong(AdapterHandlerLibrary_lock);
-  AdapterFingerPrint fp(total_args_passed, sig_bt);
-  AdapterHandlerEntry** entry = _adapter_handler_table->get(&fp);
-  if (entry != nullptr) {
+  AdapterFingerPrint* fp = AdapterFingerPrint::allocate(total_args_passed, sig_bt);
+  AdapterHandlerEntry* entry = nullptr;
+#if INCLUDE_CDS
+  // if we are building the archive then the archived adapter table is
+  // not valid and we need to use the ones added to the runtime table
+  if (!AOTCodeCache::is_dumping_adapters()) {
+    // Search archived table first. It is read-only table so can be searched without lock
+    entry = _aot_adapter_handler_table.lookup(fp, fp->compute_hash(), 0 /* unused */);
+    if (entry != nullptr) {
 #ifndef PRODUCT
-    if (fp.is_compact()) _compact++;
-    _hits++;
+      if (fp->is_compact()) {
+        _compact++;
+      }
+      _archived_hits++;
 #endif
-    return *entry;
+    }
   }
-  return nullptr;
+#endif // INCLUDE_CDS
+  if (entry == nullptr) {
+    assert_lock_strong(AdapterHandlerLibrary_lock);
+    AdapterHandlerEntry** entry_p = _adapter_handler_table->get(fp);
+    if (entry_p != nullptr) {
+      entry = *entry_p;
+      assert(entry->fingerprint()->equals(fp), "fingerprint mismatch key fp %s %s (hash=%d) != found fp %s %s (hash=%d)",
+             entry->fingerprint()->as_basic_args_string(), entry->fingerprint()->as_string(), entry->fingerprint()->compute_hash(),
+             fp->as_basic_args_string(), fp->as_string(), fp->compute_hash());
+  #ifndef PRODUCT
+      if (fp->is_compact()) _compact++;
+      _runtime_hits++;
+  #endif
+    }
+  }
+  AdapterFingerPrint::deallocate(fp);
+  return entry;
 }
 
 #ifndef PRODUCT
@@ -2402,8 +2496,9 @@ static void print_table_statistics() {
   ts.print(tty, "AdapterHandlerTable");
   tty->print_cr("AdapterHandlerTable (table_size=%d, entries=%d)",
                 _adapter_handler_table->table_size(), _adapter_handler_table->number_of_entries());
-  tty->print_cr("AdapterHandlerTable: lookups %d equals %d hits %d compact %d",
-                _lookups, _equals, _hits, _compact);
+  int total_hits = _archived_hits + _runtime_hits;
+  tty->print_cr("AdapterHandlerTable: lookups %d equals %d hits %d (archived=%d+runtime=%d) compact %d",
+                _lookups, _equals, total_hits, _archived_hits, _runtime_hits, _compact);
 }
 #endif
 
@@ -2415,10 +2510,14 @@ AdapterHandlerEntry* AdapterHandlerLibrary::_int_arg_handler = nullptr;
 AdapterHandlerEntry* AdapterHandlerLibrary::_obj_arg_handler = nullptr;
 AdapterHandlerEntry* AdapterHandlerLibrary::_obj_int_arg_handler = nullptr;
 AdapterHandlerEntry* AdapterHandlerLibrary::_obj_obj_arg_handler = nullptr;
-const int AdapterHandlerLibrary_size = 16*K;
+#if INCLUDE_CDS
+ArchivedAdapterTable AdapterHandlerLibrary::_aot_adapter_handler_table;
+#endif // INCLUDE_CDS
+static const int AdapterHandlerLibrary_size = 16*K;
 BufferBlob* AdapterHandlerLibrary::_buffer = nullptr;
 
 BufferBlob* AdapterHandlerLibrary::buffer_blob() {
+  assert(_buffer != nullptr, "should be initialized");
   return _buffer;
 }
 
@@ -2441,7 +2540,39 @@ static void post_adapter_creation(const AdapterBlob* new_adapter,
   }
 }
 
+void AdapterHandlerLibrary::create_abstract_method_handler() {
+  assert_lock_strong(AdapterHandlerLibrary_lock);
+  // Create a special handler for abstract methods.  Abstract methods
+  // are never compiled so an i2c entry is somewhat meaningless, but
+  // throw AbstractMethodError just in case.
+  // Pass wrong_method_abstract for the c2i transitions to return
+  // AbstractMethodError for invalid invocations.
+  address wrong_method_abstract = SharedRuntime::get_handle_wrong_method_abstract_stub();
+  _abstract_method_handler = AdapterHandlerLibrary::new_entry(AdapterFingerPrint::allocate(0, nullptr));
+  _abstract_method_handler->set_entry_points(SharedRuntime::throw_AbstractMethodError_entry(),
+                                             wrong_method_abstract,
+                                             wrong_method_abstract,
+                                             nullptr);
+}
+
 void AdapterHandlerLibrary::initialize() {
+  {
+    ResourceMark rm;
+    MutexLocker mu(AdapterHandlerLibrary_lock);
+    _adapter_handler_table = new (mtCode) AdapterHandlerTable();
+    _buffer = BufferBlob::create("adapters", AdapterHandlerLibrary_size);
+    create_abstract_method_handler();
+  }
+
+#if INCLUDE_CDS
+  // Link adapters in AOT Cache to their code in AOT Code Cache
+  if (!_aot_adapter_handler_table.empty()) {
+    link_aot_adapters();
+    lookup_simple_adapters();
+    return;
+  }
+#endif // INCLUDE_CDS
+
   ResourceMark rm;
   AdapterBlob* no_arg_blob = nullptr;
   AdapterBlob* int_arg_blob = nullptr;
@@ -2449,39 +2580,27 @@ void AdapterHandlerLibrary::initialize() {
   AdapterBlob* obj_int_arg_blob = nullptr;
   AdapterBlob* obj_obj_arg_blob = nullptr;
   {
-    _adapter_handler_table = new (mtCode) AdapterHandlerTable();
     MutexLocker mu(AdapterHandlerLibrary_lock);
 
-    // Create a special handler for abstract methods.  Abstract methods
-    // are never compiled so an i2c entry is somewhat meaningless, but
-    // throw AbstractMethodError just in case.
-    // Pass wrong_method_abstract for the c2i transitions to return
-    // AbstractMethodError for invalid invocations.
-    address wrong_method_abstract = SharedRuntime::get_handle_wrong_method_abstract_stub();
-    _abstract_method_handler = AdapterHandlerLibrary::new_entry(new AdapterFingerPrint(0, nullptr),
-                                                                SharedRuntime::throw_AbstractMethodError_entry(),
-                                                                wrong_method_abstract, wrong_method_abstract);
-
-    _buffer = BufferBlob::create("adapters", AdapterHandlerLibrary_size);
-    _no_arg_handler = create_adapter(no_arg_blob, 0, nullptr, true);
+    _no_arg_handler = create_adapter(no_arg_blob, 0, nullptr);
 
     BasicType obj_args[] = { T_OBJECT };
-    _obj_arg_handler = create_adapter(obj_arg_blob, 1, obj_args, true);
+    _obj_arg_handler = create_adapter(obj_arg_blob, 1, obj_args);
 
     BasicType int_args[] = { T_INT };
-    _int_arg_handler = create_adapter(int_arg_blob, 1, int_args, true);
+    _int_arg_handler = create_adapter(int_arg_blob, 1, int_args);
 
     BasicType obj_int_args[] = { T_OBJECT, T_INT };
-    _obj_int_arg_handler = create_adapter(obj_int_arg_blob, 2, obj_int_args, true);
+    _obj_int_arg_handler = create_adapter(obj_int_arg_blob, 2, obj_int_args);
 
     BasicType obj_obj_args[] = { T_OBJECT, T_OBJECT };
-    _obj_obj_arg_handler = create_adapter(obj_obj_arg_blob, 2, obj_obj_args, true);
+    _obj_obj_arg_handler = create_adapter(obj_obj_arg_blob, 2, obj_obj_args);
 
     assert(no_arg_blob != nullptr &&
-          obj_arg_blob != nullptr &&
-          int_arg_blob != nullptr &&
-          obj_int_arg_blob != nullptr &&
-          obj_obj_arg_blob != nullptr, "Initial adapters must be properly created");
+           obj_arg_blob != nullptr &&
+           int_arg_blob != nullptr &&
+           obj_int_arg_blob != nullptr &&
+           obj_obj_arg_blob != nullptr, "Initial adapters must be properly created");
   }
 
   // Outside of the lock
@@ -2492,14 +2611,8 @@ void AdapterHandlerLibrary::initialize() {
   post_adapter_creation(obj_obj_arg_blob, _obj_obj_arg_handler);
 }
 
-AdapterHandlerEntry* AdapterHandlerLibrary::new_entry(AdapterFingerPrint* fingerprint,
-                                                      address i2c_entry,
-                                                      address c2i_entry,
-                                                      address c2i_unverified_entry,
-                                                      address c2i_no_clinit_check_entry) {
-  // Insert an entry into the table
-  return new AdapterHandlerEntry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry,
-                                 c2i_no_clinit_check_entry);
+AdapterHandlerEntry* AdapterHandlerLibrary::new_entry(AdapterFingerPrint* fingerprint) {
+  return AdapterHandlerEntry::allocate(fingerprint);
 }
 
 AdapterHandlerEntry* AdapterHandlerLibrary::get_simple_adapter(const methodHandle& method) {
@@ -2583,6 +2696,22 @@ class AdapterSignatureIterator : public SignatureIterator {
   }
 };
 
+
+const char* AdapterHandlerEntry::_entry_names[] = {
+  "i2c", "c2i", "c2i_unverified", "c2i_no_clinit_check"
+};
+
+#ifdef ASSERT
+void AdapterHandlerLibrary::verify_adapter_sharing(int total_args_passed, BasicType* sig_bt, AdapterHandlerEntry* cached_entry) {
+  AdapterBlob* comparison_blob = nullptr;
+  AdapterHandlerEntry* comparison_entry = create_adapter(comparison_blob, total_args_passed, sig_bt, true);
+  assert(comparison_blob == nullptr, "no blob should be created when creating an adapter for comparison");
+  assert(comparison_entry->compare_code(cached_entry), "code must match");
+  // Release the one just created
+  AdapterHandlerEntry::deallocate(comparison_entry);
+}
+#endif /* ASSERT*/
+
 AdapterHandlerEntry* AdapterHandlerLibrary::get_adapter(const methodHandle& method) {
   // Use customized signature handler.  Need to lock around updates to
   // the _adapter_handler_table (it is not safe for concurrent readers
@@ -2596,7 +2725,7 @@ AdapterHandlerEntry* AdapterHandlerLibrary::get_adapter(const methodHandle& meth
   }
 
   ResourceMark rm;
-  AdapterBlob* new_adapter = nullptr;
+  AdapterBlob* adapter_blob = nullptr;
 
   // Fill in the signature array, for the calling-convention call.
   int total_args_passed = method->size_of_parameters(); // All args on stack
@@ -2612,110 +2741,291 @@ AdapterHandlerEntry* AdapterHandlerLibrary::get_adapter(const methodHandle& meth
     entry = lookup(total_args_passed, sig_bt);
 
     if (entry != nullptr) {
+      assert(entry->is_linked(), "AdapterHandlerEntry must have been linked");
 #ifdef ASSERT
-      if (VerifyAdapterSharing) {
-        AdapterBlob* comparison_blob = nullptr;
-        AdapterHandlerEntry* comparison_entry = create_adapter(comparison_blob, total_args_passed, sig_bt, false);
-        assert(comparison_blob == nullptr, "no blob should be created when creating an adapter for comparison");
-        assert(comparison_entry->compare_code(entry), "code must match");
-        // Release the one just created and return the original
-        delete comparison_entry;
+      if (!entry->is_shared() && VerifyAdapterSharing) {
+        verify_adapter_sharing(total_args_passed, sig_bt, entry);
       }
 #endif
-      return entry;
+    } else {
+      entry = create_adapter(adapter_blob, total_args_passed, sig_bt);
     }
-
-    entry = create_adapter(new_adapter, total_args_passed, sig_bt, /* allocate_code_blob */ true);
   }
 
   // Outside of the lock
-  if (new_adapter != nullptr) {
-    post_adapter_creation(new_adapter, entry);
+  if (adapter_blob != nullptr) {
+    post_adapter_creation(adapter_blob, entry);
   }
   return entry;
 }
 
-AdapterHandlerEntry* AdapterHandlerLibrary::create_adapter(AdapterBlob*& new_adapter,
-                                                           int total_args_passed,
-                                                           BasicType* sig_bt,
-                                                           bool allocate_code_blob) {
+AdapterBlob* AdapterHandlerLibrary::lookup_aot_cache(AdapterHandlerEntry* handler) {
+  ResourceMark rm;
+  const char* name = AdapterHandlerLibrary::name(handler->fingerprint());
+  const uint32_t id = AdapterHandlerLibrary::id(handler->fingerprint());
+  int offsets[AdapterHandlerEntry::ENTRIES_COUNT];
+
+  AdapterBlob* adapter_blob = nullptr;
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::Adapter, id, name, AdapterHandlerEntry::ENTRIES_COUNT, offsets);
+  if (blob != nullptr) {
+    adapter_blob = blob->as_adapter_blob();
+    address i2c_entry = adapter_blob->content_begin();
+    assert(offsets[0] == 0, "sanity check");
+    handler->set_entry_points(i2c_entry, i2c_entry + offsets[1], i2c_entry + offsets[2], i2c_entry + offsets[3]);
+  }
+  return adapter_blob;
+}
+
+#ifndef PRODUCT
+void AdapterHandlerLibrary::print_adapter_handler_info(outputStream* st, AdapterHandlerEntry* handler, AdapterBlob* adapter_blob) {
+  ttyLocker ttyl;
+  ResourceMark rm;
+  int insts_size = adapter_blob->code_size();
+  handler->print_adapter_on(tty);
+  st->print_cr("i2c argument handler for: %s %s (%d bytes generated)",
+                handler->fingerprint()->as_basic_args_string(),
+                handler->fingerprint()->as_string(), insts_size);
+  st->print_cr("c2i argument handler starts at " INTPTR_FORMAT, p2i(handler->get_c2i_entry()));
+  if (Verbose || PrintStubCode) {
+    address first_pc = handler->base_address();
+    if (first_pc != nullptr) {
+      Disassembler::decode(first_pc, first_pc + insts_size, st, &adapter_blob->asm_remarks());
+      st->cr();
+    }
+  }
+}
+#endif // PRODUCT
+
+bool AdapterHandlerLibrary::generate_adapter_code(AdapterBlob*& adapter_blob,
+                                                  AdapterHandlerEntry* handler,
+                                                  int total_args_passed,
+                                                  BasicType* sig_bt,
+                                                  bool is_transient) {
   if (log_is_enabled(Info, perf, class, link)) {
     ClassLoader::perf_method_adapters_count()->inc();
   }
 
-  // StubRoutines::_final_stubs_code is initialized after this function can be called. As a result,
-  // VerifyAdapterCalls and VerifyAdapterSharing can fail if we re-use code that generated prior
-  // to all StubRoutines::_final_stubs_code being set. Checks refer to runtime range checks generated
-  // in an I2C stub that ensure that an I2C stub is called from an interpreter frame or stubs.
-  bool contains_all_checks = StubRoutines::final_stubs_code() != nullptr;
-
-  VMRegPair stack_regs[16];
-  VMRegPair* regs = (total_args_passed <= 16) ? stack_regs : NEW_RESOURCE_ARRAY(VMRegPair, total_args_passed);
-
-  // Get a description of the compiled java calling convention and the largest used (VMReg) stack slot usage
-  int comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed);
   BufferBlob* buf = buffer_blob(); // the temporary code buffer in CodeCache
   CodeBuffer buffer(buf);
   short buffer_locs[20];
   buffer.insts()->initialize_shared_locs((relocInfo*)buffer_locs,
-                                          sizeof(buffer_locs)/sizeof(relocInfo));
-
-  // Make a C heap allocated version of the fingerprint to store in the adapter
-  AdapterFingerPrint* fingerprint = new AdapterFingerPrint(total_args_passed, sig_bt);
-  MacroAssembler _masm(&buffer);
-  AdapterHandlerEntry* entry = SharedRuntime::generate_i2c2i_adapters(&_masm,
-                                                total_args_passed,
-                                                comp_args_on_stack,
-                                                sig_bt,
-                                                regs,
-                                                fingerprint);
+                                         sizeof(buffer_locs)/sizeof(relocInfo));
+  MacroAssembler masm(&buffer);
+  VMRegPair stack_regs[16];
+  VMRegPair* regs = (total_args_passed <= 16) ? stack_regs : NEW_RESOURCE_ARRAY(VMRegPair, total_args_passed);
 
+  // Get a description of the compiled java calling convention and the largest used (VMReg) stack slot usage
+  int comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed);
+  SharedRuntime::generate_i2c2i_adapters(&masm,
+                                         total_args_passed,
+                                         comp_args_on_stack,
+                                         sig_bt,
+                                         regs,
+                                         handler);
 #ifdef ASSERT
   if (VerifyAdapterSharing) {
-    entry->save_code(buf->code_begin(), buffer.insts_size());
-    if (!allocate_code_blob) {
-      return entry;
+    handler->save_code(buf->code_begin(), buffer.insts_size());
+    if (is_transient) {
+      return true;
     }
   }
 #endif
 
-  new_adapter = AdapterBlob::create(&buffer);
-  NOT_PRODUCT(int insts_size = buffer.insts_size());
-  if (new_adapter == nullptr) {
+  adapter_blob = AdapterBlob::create(&buffer);
+  if (adapter_blob == nullptr) {
     // CodeCache is full, disable compilation
     // Ought to log this but compile log is only per compile thread
     // and we're some non descript Java thread.
-    return nullptr;
+    return false;
   }
-  entry->relocate(new_adapter->content_begin());
+  if (!is_transient && AOTCodeCache::is_dumping_adapters()) {
+    // try to save generated code
+    const char* name = AdapterHandlerLibrary::name(handler->fingerprint());
+    const uint32_t id = AdapterHandlerLibrary::id(handler->fingerprint());
+    int entry_offset[AdapterHandlerEntry::ENTRIES_COUNT];
+    assert(AdapterHandlerEntry::ENTRIES_COUNT == 4, "sanity");
+    address i2c_entry = handler->get_i2c_entry();
+    entry_offset[0] = 0; // i2c_entry offset
+    entry_offset[1] = handler->get_c2i_entry() - i2c_entry;
+    entry_offset[2] = handler->get_c2i_unverified_entry() - i2c_entry;
+    entry_offset[3] = handler->get_c2i_no_clinit_check_entry() - i2c_entry;
+    bool success = AOTCodeCache::store_code_blob(*adapter_blob, AOTCodeEntry::Adapter, id, name, AdapterHandlerEntry::ENTRIES_COUNT, entry_offset);
+    assert(success || !AOTCodeCache::is_dumping_adapters(), "caching of adapter must be disabled");
+  }
+  handler->relocate(adapter_blob->content_begin());
 #ifndef PRODUCT
   // debugging support
   if (PrintAdapterHandlers || PrintStubCode) {
-    ttyLocker ttyl;
-    entry->print_adapter_on(tty);
-    tty->print_cr("i2c argument handler #%d for: %s %s (%d bytes generated)",
-                  _adapter_handler_table->number_of_entries(), fingerprint->as_basic_args_string(),
-                  fingerprint->as_string(), insts_size);
-    tty->print_cr("c2i argument handler starts at " INTPTR_FORMAT, p2i(entry->get_c2i_entry()));
-    if (Verbose || PrintStubCode) {
-      address first_pc = entry->base_address();
-      if (first_pc != nullptr) {
-        Disassembler::decode(first_pc, first_pc + insts_size, tty
-                             NOT_PRODUCT(COMMA &new_adapter->asm_remarks()));
-        tty->cr();
+    print_adapter_handler_info(tty, handler, adapter_blob);
+  }
+#endif
+  return true;
+}
+
+AdapterHandlerEntry* AdapterHandlerLibrary::create_adapter(AdapterBlob*& adapter_blob,
+                                                           int total_args_passed,
+                                                           BasicType* sig_bt,
+                                                           bool is_transient) {
+  AdapterFingerPrint* fp = AdapterFingerPrint::allocate(total_args_passed, sig_bt);
+  AdapterHandlerEntry* handler = AdapterHandlerLibrary::new_entry(fp);
+  if (!generate_adapter_code(adapter_blob, handler, total_args_passed, sig_bt, is_transient)) {
+    AdapterHandlerEntry::deallocate(handler);
+    return nullptr;
+  }
+  if (!is_transient) {
+    assert_lock_strong(AdapterHandlerLibrary_lock);
+    _adapter_handler_table->put(fp, handler);
+  }
+  return handler;
+}
+
+#if INCLUDE_CDS
+void AdapterHandlerEntry::remove_unshareable_info() {
+#ifdef ASSERT
+   _saved_code = nullptr;
+   _saved_code_length = 0;
+#endif // ASSERT
+  set_entry_points(nullptr, nullptr, nullptr, nullptr, false);
+}
+
+class CopyAdapterTableToArchive : StackObj {
+private:
+  CompactHashtableWriter* _writer;
+  ArchiveBuilder* _builder;
+public:
+  CopyAdapterTableToArchive(CompactHashtableWriter* writer) : _writer(writer),
+                                                             _builder(ArchiveBuilder::current())
+  {}
+
+  bool do_entry(AdapterFingerPrint* fp, AdapterHandlerEntry* entry) {
+    LogStreamHandle(Trace, cds) lsh;
+    if (ArchiveBuilder::current()->has_been_archived((address)entry)) {
+      assert(ArchiveBuilder::current()->has_been_archived((address)fp), "must be");
+      AdapterFingerPrint* buffered_fp = ArchiveBuilder::current()->get_buffered_addr(fp);
+      assert(buffered_fp != nullptr,"sanity check");
+      AdapterHandlerEntry* buffered_entry = ArchiveBuilder::current()->get_buffered_addr(entry);
+      assert(buffered_entry != nullptr,"sanity check");
+
+      uint hash = fp->compute_hash();
+      u4 delta = _builder->buffer_to_offset_u4((address)buffered_entry);
+      _writer->add(hash, delta);
+      if (lsh.is_enabled()) {
+        address fp_runtime_addr = (address)buffered_fp + ArchiveBuilder::current()->buffer_to_requested_delta();
+        address entry_runtime_addr = (address)buffered_entry + ArchiveBuilder::current()->buffer_to_requested_delta();
+        log_trace(cds)("Added fp=%p (%s), entry=%p to the archived adater table", buffered_fp, buffered_fp->as_basic_args_string(), buffered_entry);
+      }
+    } else {
+      if (lsh.is_enabled()) {
+        log_trace(cds)("Skipping adapter handler %p (fp=%s) as it is not archived", entry, fp->as_basic_args_string());
       }
     }
+    return true;
+  }
+};
+
+void AdapterHandlerLibrary::dump_aot_adapter_table() {
+  CompactHashtableStats stats;
+  CompactHashtableWriter writer(_adapter_handler_table->number_of_entries(), &stats);
+  CopyAdapterTableToArchive copy(&writer);
+  _adapter_handler_table->iterate(&copy);
+  writer.dump(&_aot_adapter_handler_table, "archived adapter table");
+}
+
+void AdapterHandlerLibrary::serialize_shared_table_header(SerializeClosure* soc) {
+  _aot_adapter_handler_table.serialize_header(soc);
+}
+
+AdapterBlob* AdapterHandlerLibrary::link_aot_adapter_handler(AdapterHandlerEntry* handler) {
+#ifdef ASSERT
+  if (TestAOTAdapterLinkFailure) {
+    return nullptr;
   }
 #endif
+  AdapterBlob* blob = lookup_aot_cache(handler);
+#ifndef PRODUCT
+  // debugging support
+  if ((blob != nullptr) && (PrintAdapterHandlers || PrintStubCode)) {
+    print_adapter_handler_info(tty, handler, blob);
+  }
+#endif
+  return blob;
+}
 
-  // Add the entry only if the entry contains all required checks (see sharedRuntime_xxx.cpp)
-  // The checks are inserted only if -XX:+VerifyAdapterCalls is specified.
-  if (contains_all_checks || !VerifyAdapterCalls) {
-    assert_lock_strong(AdapterHandlerLibrary_lock);
-    _adapter_handler_table->put(fingerprint, entry);
+// This method is used during production run to link archived adapters (stored in AOT Cache)
+// to their code in AOT Code Cache
+void AdapterHandlerEntry::link() {
+  AdapterBlob* adapter_blob = nullptr;
+  ResourceMark rm;
+  assert(_fingerprint != nullptr, "_fingerprint must not be null");
+  bool generate_code = false;
+  // Generate code only if AOTCodeCache is not available, or
+  // caching adapters is disabled, or we fail to link
+  // the AdapterHandlerEntry to its code in the AOTCodeCache
+  if (AOTCodeCache::is_using_adapters()) {
+    adapter_blob = AdapterHandlerLibrary::link_aot_adapter_handler(this);
+    if (adapter_blob == nullptr) {
+      log_warning(cds)("Failed to link AdapterHandlerEntry (fp=%s) to its code in the AOT code cache", _fingerprint->as_basic_args_string());
+      generate_code = true;
+    }
+  } else {
+    generate_code = true;
+  }
+  if (generate_code) {
+    int nargs;
+    BasicType* bt = _fingerprint->as_basic_type(nargs);
+    if (!AdapterHandlerLibrary::generate_adapter_code(adapter_blob, this, nargs, bt, /* is_transient */ false)) {
+      // Don't throw exceptions during VM initialization because java.lang.* classes
+      // might not have been initialized, causing problems when constructing the
+      // Java exception object.
+      vm_exit_during_initialization("Out of space in CodeCache for adapters");
+    }
   }
-  return entry;
+  // Outside of the lock
+  if (adapter_blob != nullptr) {
+    post_adapter_creation(adapter_blob, this);
+  }
+  assert(_linked, "AdapterHandlerEntry must now be linked");
+}
+
+void AdapterHandlerLibrary::link_aot_adapters() {
+  _aot_adapter_handler_table.iterate([](AdapterHandlerEntry* entry) {
+    assert(!entry->is_linked(), "AdapterHandlerEntry is already linked!");
+    entry->link();
+  });
+}
+
+// This method is called during production run to lookup simple adapters
+// in the archived adapter handler table
+void AdapterHandlerLibrary::lookup_simple_adapters() {
+  assert(!_aot_adapter_handler_table.empty(), "archived adapter handler table is empty");
+
+  MutexLocker mu(AdapterHandlerLibrary_lock);
+  _no_arg_handler = lookup(0, nullptr);
+
+  BasicType obj_args[] = { T_OBJECT };
+  _obj_arg_handler = lookup(1, obj_args);
+
+  BasicType int_args[] = { T_INT };
+  _int_arg_handler = lookup(1, int_args);
+
+  BasicType obj_int_args[] = { T_OBJECT, T_INT };
+  _obj_int_arg_handler = lookup(2, obj_int_args);
+
+  BasicType obj_obj_args[] = { T_OBJECT, T_OBJECT };
+  _obj_obj_arg_handler = lookup(2, obj_obj_args);
+
+  assert(_no_arg_handler != nullptr &&
+         _obj_arg_handler != nullptr &&
+         _int_arg_handler != nullptr &&
+         _obj_int_arg_handler != nullptr &&
+         _obj_obj_arg_handler != nullptr, "Initial adapters not found in archived adapter handler table");
+  assert(_no_arg_handler->is_linked() &&
+         _obj_arg_handler->is_linked() &&
+         _int_arg_handler->is_linked() &&
+         _obj_int_arg_handler->is_linked() &&
+         _obj_obj_arg_handler->is_linked(), "Initial adapters not in linked state");
 }
+#endif // INCLUDE_CDS
 
 address AdapterHandlerEntry::base_address() {
   address base = _i2c_entry;
@@ -2741,12 +3051,24 @@ void AdapterHandlerEntry::relocate(address new_base) {
   assert(base_address() == new_base, "");
 }
 
+void AdapterHandlerEntry::metaspace_pointers_do(MetaspaceClosure* it) {
+  LogStreamHandle(Trace, cds) lsh;
+  if (lsh.is_enabled()) {
+    lsh.print("Iter(AdapterHandlerEntry): %p(%s)", this, _fingerprint->as_basic_args_string());
+    lsh.cr();
+  }
+  it->push(&_fingerprint);
+}
 
 AdapterHandlerEntry::~AdapterHandlerEntry() {
-  delete _fingerprint;
+  if (_fingerprint != nullptr) {
+    AdapterFingerPrint::deallocate(_fingerprint);
+    _fingerprint = nullptr;
+  }
 #ifdef ASSERT
   FREE_C_HEAP_ARRAY(unsigned char, _saved_code);
 #endif
+  FreeHeap(this);
 }
 
 
@@ -3051,28 +3373,61 @@ JRT_END
 
 bool AdapterHandlerLibrary::contains(const CodeBlob* b) {
   bool found = false;
-  auto findblob = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
-    return (found = (b == CodeCache::find_blob(a->get_i2c_entry())));
+#if INCLUDE_CDS
+  auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
+    return (found = (b == CodeCache::find_blob(handler->get_i2c_entry())));
   };
-  assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
-  _adapter_handler_table->iterate(findblob);
+  _aot_adapter_handler_table.iterate(findblob_archived_table);
+#endif // INCLUDE_CDS
+  if (!found) {
+    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
+      return (found = (b == CodeCache::find_blob(a->get_i2c_entry())));
+    };
+    assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
+    _adapter_handler_table->iterate(findblob_runtime_table);
+  }
   return found;
 }
 
+const char* AdapterHandlerLibrary::name(AdapterFingerPrint* fingerprint) {
+  return fingerprint->as_basic_args_string();
+}
+
+uint32_t AdapterHandlerLibrary::id(AdapterFingerPrint* fingerprint) {
+  unsigned int hash = fingerprint->compute_hash();
+  return hash;
+}
+
 void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b) {
   bool found = false;
-  auto findblob = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
-    if (b == CodeCache::find_blob(a->get_i2c_entry())) {
+#if INCLUDE_CDS
+  auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
+    if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
       found = true;
       st->print("Adapter for signature: ");
-      a->print_adapter_on(st);
+      handler->print_adapter_on(st);
       return true;
     } else {
       return false; // keep looking
+
     }
   };
-  assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
-  _adapter_handler_table->iterate(findblob);
+  _aot_adapter_handler_table.iterate(findblob_archived_table);
+#endif // INCLUDE_CDS
+  if (!found) {
+    auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
+      if (b == CodeCache::find_blob(a->get_i2c_entry())) {
+        found = true;
+        st->print("Adapter for signature: ");
+        a->print_adapter_on(st);
+        return true;
+      } else {
+        return false; // keep looking
+      }
+    };
+    assert_locked_or_safepoint(AdapterHandlerLibrary_lock);
+    _adapter_handler_table->iterate(findblob_runtime_table);
+  }
   assert(found, "Should have found handler");
 }
 
@@ -3101,6 +3456,13 @@ void AdapterHandlerLibrary::print_statistics() {
 
 #endif /* PRODUCT */
 
+bool AdapterHandlerLibrary::is_abstract_method_adapter(AdapterHandlerEntry* entry) {
+  if (entry == _abstract_method_handler) {
+    return true;
+  }
+  return false;
+}
+
 JRT_LEAF(void, SharedRuntime::enable_stack_reserved_zone(JavaThread* current))
   assert(current == JavaThread::current(), "pre-condition");
   StackOverflow* overflow_state = current->stack_overflow_state();
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 94cbc460cad..de16a33fdcc 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -25,10 +25,12 @@
 #ifndef SHARE_RUNTIME_SHAREDRUNTIME_HPP
 #define SHARE_RUNTIME_SHAREDRUNTIME_HPP
 
+#include "classfile/compactHashtable.hpp"
 #include "code/codeBlob.hpp"
 #include "code/vmreg.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/stubDeclarations.hpp"
 #include "utilities/macros.hpp"
@@ -114,6 +116,7 @@ class SharedRuntime: AllStatic {
   // For c2: call to runtime to return a buffer lease.
   static RuntimeStub* generate_jfr_return_lease();
 #endif
+  static void init_adapter_library();
 
   static const char *stub_name(SharedStubId id) {
     assert(id > SharedStubId::NO_STUBID && id < SharedStubId::NUM_STUBIDS, "stub id out of range");
@@ -464,12 +467,12 @@ class SharedRuntime: AllStatic {
   // pointer as needed. This means the i2c adapter code doesn't need any special
   // handshaking path with compiled code to keep the stack walking correct.
 
-  static AdapterHandlerEntry* generate_i2c2i_adapters(MacroAssembler *_masm,
-                                                      int total_args_passed,
-                                                      int max_arg,
-                                                      const BasicType *sig_bt,
-                                                      const VMRegPair *regs,
-                                                      AdapterFingerPrint* fingerprint);
+  static void generate_i2c2i_adapters(MacroAssembler *_masm,
+                               int total_args_passed,
+                               int max_arg,
+                               const BasicType *sig_bt,
+                               const VMRegPair *regs,
+                               AdapterHandlerEntry* handler);
 
   static void gen_i2c_adapter(MacroAssembler *_masm,
                               int total_args_passed,
@@ -666,15 +669,21 @@ class SharedRuntime: AllStatic {
 // used by the adapters.  The code generation happens here because it's very
 // similar to what the adapters have to do.
 
-class AdapterHandlerEntry : public CHeapObj<mtCode> {
+class AdapterHandlerEntry : public MetaspaceObj {
   friend class AdapterHandlerLibrary;
 
+ public:
+  static const int ENTRIES_COUNT = 4;
+
  private:
   AdapterFingerPrint* _fingerprint;
   address _i2c_entry;
   address _c2i_entry;
   address _c2i_unverified_entry;
   address _c2i_no_clinit_check_entry;
+  bool    _linked;
+
+  static const char *_entry_names[];
 
 #ifdef ASSERT
   // Captures code and signature used to generate this adapter when
@@ -683,27 +692,58 @@ class AdapterHandlerEntry : public CHeapObj<mtCode> {
   int            _saved_code_length;
 #endif
 
-  AdapterHandlerEntry(AdapterFingerPrint* fingerprint, address i2c_entry, address c2i_entry,
-                      address c2i_unverified_entry,
-                      address c2i_no_clinit_check_entry) :
+  AdapterHandlerEntry(AdapterFingerPrint* fingerprint) :
     _fingerprint(fingerprint),
-    _i2c_entry(i2c_entry),
-    _c2i_entry(c2i_entry),
-    _c2i_unverified_entry(c2i_unverified_entry),
-    _c2i_no_clinit_check_entry(c2i_no_clinit_check_entry)
+    _i2c_entry(nullptr),
+    _c2i_entry(nullptr),
+    _c2i_unverified_entry(nullptr),
+    _c2i_no_clinit_check_entry(nullptr),
+    _linked(false)
 #ifdef ASSERT
-    , _saved_code_length(0)
+    , _saved_code(nullptr),
+    _saved_code_length(0)
 #endif
   { }
 
   ~AdapterHandlerEntry();
 
+  // Allocate on CHeap instead of metaspace (see JDK-8331086).
+  // Dummy argument is used to avoid C++ warning about using
+  // deleted opearator MetaspaceObj::delete().
+  void* operator new(size_t size, size_t dummy) throw() {
+    void* p = AllocateHeap(size, mtCode);
+    memset(p, 0, size);
+    return p;
+  }
+
  public:
+  static AdapterHandlerEntry* allocate(AdapterFingerPrint* fingerprint) {
+    return new(0) AdapterHandlerEntry(fingerprint);
+  }
+
+  static void deallocate(AdapterHandlerEntry *handler) {
+    handler->~AdapterHandlerEntry();
+  }
+
+  void set_entry_points(address i2c_entry, address c2i_entry, address c2i_unverified_entry, address c2i_no_clinit_check_entry, bool linked = true) {
+    _i2c_entry = i2c_entry;
+    _c2i_entry = c2i_entry;
+    _c2i_unverified_entry = c2i_unverified_entry;
+    _c2i_no_clinit_check_entry = c2i_no_clinit_check_entry;
+    _linked = linked;
+  }
+
   address get_i2c_entry()                  const { return _i2c_entry; }
   address get_c2i_entry()                  const { return _c2i_entry; }
   address get_c2i_unverified_entry()       const { return _c2i_unverified_entry; }
   address get_c2i_no_clinit_check_entry()  const { return _c2i_no_clinit_check_entry; }
 
+  static const char* entry_name(int i) {
+    assert(i >=0 && i < ENTRIES_COUNT, "entry id out of range");
+    return _entry_names[i];
+  }
+
+  bool is_linked() const { return _linked; }
   address base_address();
   void relocate(address new_base);
 
@@ -717,8 +757,19 @@ class AdapterHandlerEntry : public CHeapObj<mtCode> {
 
   //virtual void print_on(outputStream* st) const;  DO NOT USE
   void print_adapter_on(outputStream* st) const;
+
+  void metaspace_pointers_do(MetaspaceClosure* it);
+  int size() const {return (int)heap_word_size(sizeof(AdapterHandlerEntry)); }
+  MetaspaceObj::Type type() const { return AdapterHandlerEntryType; }
+
+  void remove_unshareable_info() NOT_CDS_RETURN;
+  void link() NOT_CDS_RETURN;
 };
 
+#if INCLUDE_CDS
+class ArchivedAdapterTable;
+#endif // INCLUDE_CDS
+
 class AdapterHandlerLibrary: public AllStatic {
   friend class SharedRuntime;
  private:
@@ -729,31 +780,54 @@ class AdapterHandlerLibrary: public AllStatic {
   static AdapterHandlerEntry* _obj_arg_handler;
   static AdapterHandlerEntry* _obj_int_arg_handler;
   static AdapterHandlerEntry* _obj_obj_arg_handler;
+#if INCLUDE_CDS
+  static ArchivedAdapterTable _aot_adapter_handler_table;
+#endif // INCLUDE_CDS
 
   static BufferBlob* buffer_blob();
   static void initialize();
+  static AdapterHandlerEntry* get_simple_adapter(const methodHandle& method);
+  static AdapterBlob* lookup_aot_cache(AdapterHandlerEntry* handler);
   static AdapterHandlerEntry* create_adapter(AdapterBlob*& new_adapter,
                                              int total_args_passed,
                                              BasicType* sig_bt,
-                                             bool allocate_code_blob);
-  static AdapterHandlerEntry* get_simple_adapter(const methodHandle& method);
+                                             bool is_transient = false);
+  static void create_abstract_method_handler();
+  static void lookup_simple_adapters() NOT_CDS_RETURN;
+#ifndef PRODUCT
+  static void print_adapter_handler_info(outputStream* st, AdapterHandlerEntry* handler, AdapterBlob* adapter_blob);
+#endif // PRODUCT
  public:
 
-  static AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint,
-                                        address i2c_entry,
-                                        address c2i_entry,
-                                        address c2i_unverified_entry,
-                                        address c2i_no_clinit_check_entry = nullptr);
+  static AdapterHandlerEntry* new_entry(AdapterFingerPrint* fingerprint);
   static void create_native_wrapper(const methodHandle& method);
   static AdapterHandlerEntry* get_adapter(const methodHandle& method);
+  static AdapterHandlerEntry* lookup(int total_args_passed, BasicType* sig_bt);
+  static bool generate_adapter_code(AdapterBlob*& adapter_blob,
+                                    AdapterHandlerEntry* handler,
+                                    int total_args_passed,
+                                    BasicType* sig_bt,
+                                    bool is_transient);
+
+#ifdef ASSERT
+  static void verify_adapter_sharing(int total_args_passed, BasicType* sig_bt, AdapterHandlerEntry* cached);
+#endif // ASSERT
 
   static void print_handler(const CodeBlob* b) { print_handler_on(tty, b); }
   static void print_handler_on(outputStream* st, const CodeBlob* b);
   static bool contains(const CodeBlob* b);
+  static const char* name(AdapterFingerPrint* fingerprint);
+  static uint32_t id(AdapterFingerPrint* fingerprint);
 #ifndef PRODUCT
   static void print_statistics();
 #endif // PRODUCT
 
+  static bool is_abstract_method_adapter(AdapterHandlerEntry* adapter);
+
+  static AdapterBlob* link_aot_adapter_handler(AdapterHandlerEntry* handler) NOT_CDS_RETURN_(nullptr);
+  static void dump_aot_adapter_table() NOT_CDS_RETURN;
+  static void serialize_shared_table_header(SerializeClosure* soc) NOT_CDS_RETURN;
+  static void link_aot_adapters() NOT_CDS_RETURN;
 };
 
 #endif // SHARE_RUNTIME_SHAREDRUNTIME_HPP
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index a990de30ad4..c52cc84f177 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -410,6 +410,7 @@ hotspot_appcds_dynamic = \
   runtime/cds/appcds/ \
  -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
+ -runtime/cds/appcds/aotCode \
  -runtime/cds/appcds/applications \
  -runtime/cds/appcds/cacheObject \
  -runtime/cds/appcds/complexURI \
@@ -511,6 +512,7 @@ hotspot_aot_classlinking = \
   runtime/cds \
  -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
+ -runtime/cds/appcds/aotCode \
  -runtime/cds/appcds/BadBSM.java \
  -runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java \
  -runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java \
@@ -589,6 +591,7 @@ hotspot_metaspace = \
 # A subset of AppCDS tests to be run in tier1
 tier1_runtime_appcds = \
   runtime/cds/appcds/aotCache/HelloAOTCache.java \
+  runtime/cds/appcds/aotCode \
   runtime/cds/appcds/HelloTest.java
 
 tier1_runtime_appcds_exclude = \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
new file mode 100644
index 00000000000..24479535057
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -0,0 +1,108 @@
+/*
+ * 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 of combinations of the AOT Code Caching diagnostic flags
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.flagless
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/setup_aot
+ * @build AOTCodeFlags JavacBenchApp
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 JavacBenchApp
+ *                 JavacBenchApp$ClassFile
+ *                 JavacBenchApp$FileManager
+ *                 JavacBenchApp$SourceFile
+ * @run driver AOTCodeFlags
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AOTCodeFlags {
+    public static int flag_sign = 0;
+    public static void main(String... args) throws Exception {
+        Tester t = new Tester();
+        for (int i = 0; i < 2; i++) {
+            flag_sign = i;
+            t.run(new String[] {"AOT"});
+        }
+    }
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super("AOTCodeFlags" + flag_sign);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return "app.jar";
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            switch (runMode) {
+            case RunMode.ASSEMBLY:
+            case RunMode.PRODUCTION:
+                return new String[] {
+                    "-XX:+UnlockDiagnosticVMOptions",
+                    "-XX:" + (flag_sign == 0 ? "-" : "+") + "AOTAdapterCaching",
+                    "-Xlog:aot+codecache+init=debug",
+                    "-Xlog:aot+codecache+exit=debug",
+                };
+            }
+            return new String[] {};
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                "JavacBenchApp", "10"
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (flag_sign == 0) {
+                switch (runMode) {
+                case RunMode.ASSEMBLY:
+                case RunMode.PRODUCTION:
+                    out.shouldNotContain("Adapters:  total");
+                    break;
+                }
+
+            } else {
+                switch (runMode) {
+                case RunMode.ASSEMBLY:
+                case RunMode.PRODUCTION:
+                    out.shouldContain("Adapters:  total");
+                    break;
+                }
+            }
+        }
+
+    }
+}

From 6536430a3bdedcf5e0636e0eb27bde5e0d7b40fd Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Thu, 1 May 2025 23:08:16 +0000
Subject: [PATCH 236/901] 8348732: SunJCE and SunPKCS11 have different PBE key
 encodings

Reviewed-by: weijun, fferrari
---
 .../com/sun/crypto/provider/PBEKey.java       |  15 +-
 .../sun/crypto/provider/PBKDF2KeyImpl.java    |  23 +-
 .../classes/sun/security/util/PBEUtil.java    |  73 +++---
 .../classes/sun/security/pkcs11/P11Key.java   |  12 +-
 .../classes/sun/security/pkcs11/P11Mac.java   |  51 ++--
 .../sun/security/pkcs11/P11PBECipher.java     |  61 ++---
 .../security/pkcs11/P11SecretKeyFactory.java  |  36 +--
 .../sun/security/pkcs11/SunPKCS11.java        |  40 ----
 .../sun/security/pkcs11/Cipher/PBECipher.java |  76 +++---
 test/jdk/sun/security/pkcs11/Mac/PBAMac.java  |  44 ++--
 .../pkcs11/Provider/RequiredMechCheck.java    |  14 +-
 .../pkcs11/SecretKeyFactory/TestPBKD.java     | 221 ++++++------------
 12 files changed, 232 insertions(+), 434 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java
index 8af64b11ac8..98fa2123009 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBEKey.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
@@ -36,6 +36,7 @@
 import java.util.Locale;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEKeySpec;
+import sun.security.util.PBEUtil;
 
 import jdk.internal.ref.CleanerFactory;
 
@@ -67,17 +68,7 @@ final class PBEKey implements SecretKey {
             // Should allow an empty password.
             passwd = new char[0];
         }
-        // Accept "\0" to signify "zero-length password with no terminator".
-        if (!(passwd.length == 1 && passwd[0] == 0)) {
-            for (int i=0; i<passwd.length; i++) {
-                if ((passwd[i] < '\u0020') || (passwd[i] > '\u007E')) {
-                    throw new InvalidKeySpecException("Password is not ASCII");
-                }
-            }
-        }
-        this.key = new byte[passwd.length];
-        for (int i=0; i<passwd.length; i++)
-            this.key[i] = (byte) (passwd[i] & 0x7f);
+        this.key = PBEUtil.encodePassword(passwd);
         Arrays.fill(passwd, '\0');
         type = keytype;
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
index c8b9c392a4b..6a0ecb6d462 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.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
@@ -31,8 +31,6 @@
 import java.io.ObjectStreamException;
 import java.lang.ref.Cleaner;
 import java.lang.ref.Reference;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.security.GeneralSecurityException;
 import java.security.KeyRep;
 import java.security.MessageDigest;
@@ -45,8 +43,7 @@
 import javax.crypto.spec.PBEKeySpec;
 
 import jdk.internal.ref.CleanerFactory;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
+import sun.security.util.PBEUtil;
 
 /**
  * This class represents a PBE key derived using PBKDF2 defined
@@ -72,18 +69,6 @@ final class PBKDF2KeyImpl implements javax.crypto.interfaces.PBEKey {
     private final transient Mac prf;
     private final transient Cleaner.Cleanable cleaner;
 
-    private static byte[] getPasswordBytes(char[] passwd) {
-        CharBuffer cb = CharBuffer.wrap(passwd);
-        ByteBuffer bb = UTF_8.encode(cb);
-
-        int len = bb.limit();
-        byte[] passwdBytes = new byte[len];
-        bb.get(passwdBytes, 0, len);
-        bb.clear().put(new byte[len]);
-
-        return passwdBytes;
-    }
-
     /**
      * Creates a PBE key from a given PBE key specification.
      *
@@ -93,8 +78,8 @@ private static byte[] getPasswordBytes(char[] passwd) {
     PBKDF2KeyImpl(PBEKeySpec keySpec, String prfAlgo)
         throws InvalidKeySpecException {
         this.passwd = keySpec.getPassword();
-        // Convert the password from char[] to byte[]
-        byte[] passwdBytes = getPasswordBytes(this.passwd);
+        // Convert the password from char[] to byte[] in UTF-8
+        byte[] passwdBytes = PBEUtil.encodePassword(this.passwd);
 
         byte[] key = null;
         try {
diff --git a/src/java.base/share/classes/sun/security/util/PBEUtil.java b/src/java.base/share/classes/sun/security/util/PBEUtil.java
index 12e71418bf4..5b7d6d5ce83 100644
--- a/src/java.base/share/classes/sun/security/util/PBEUtil.java
+++ b/src/java.base/share/classes/sun/security/util/PBEUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc.
+ * Copyright (c) 2023, 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
@@ -25,6 +25,9 @@
 
 package sun.security.util;
 
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -195,10 +198,7 @@ public PBEKeySpec getPBEKeySpec(int blkSize, int keyLength, int opmode,
                 }
                 initialize(blkSize, opmode, iCountInit, saltInit, ivSpecInit,
                         random);
-                passwdChars = new char[passwdBytes.length];
-                for (int i = 0; i < passwdChars.length; i++) {
-                    passwdChars[i] = (char) (passwdBytes[i] & 0x7f);
-                }
+                passwdChars = decodePassword(passwdBytes);
                 return new PBEKeySpec(passwdChars, salt, iCount, keyLength);
             } finally {
                 // password char[] was cloned in PBEKeySpec constructor,
@@ -254,7 +254,7 @@ private static int check(int iCount)
     public static PBEKeySpec getPBAKeySpec(Key key,
             AlgorithmParameterSpec params)
             throws InvalidKeyException, InvalidAlgorithmParameterException {
-        char[] passwdChars;
+        char[] passwdChars = null;
         byte[] salt = null;
         int iCount = 0;
         if (key instanceof javax.crypto.interfaces.PBEKey pbeKey) {
@@ -267,10 +267,7 @@ public static PBEKeySpec getPBAKeySpec(Key key,
                     (passwdBytes = key.getEncoded()) == null) {
                 throw new InvalidKeyException("Missing password");
             }
-            passwdChars = new char[passwdBytes.length];
-            for (int i = 0; i < passwdChars.length; i++) {
-                passwdChars[i] = (char) (passwdBytes[i] & 0x7f);
-            }
+            passwdChars = decodePassword(passwdBytes);
             Arrays.fill(passwdBytes, (byte)0x00);
         } else {
             throw new InvalidKeyException("SecretKey of PBE type required");
@@ -286,11 +283,7 @@ public static PBEKeySpec getPBAKeySpec(Key key,
                             "PBEParameterSpec required for salt " +
                             "and iteration count");
                 }
-            } else if (!(params instanceof PBEParameterSpec)) {
-                throw new InvalidAlgorithmParameterException(
-                        "PBEParameterSpec type required");
-            } else {
-                PBEParameterSpec pbeParams = (PBEParameterSpec) params;
+            } else if (params instanceof PBEParameterSpec pbeParams) {
                 // make sure the parameter values are consistent
                 if (salt != null) {
                     if (!Arrays.equals(salt, pbeParams.getSalt())) {
@@ -310,7 +303,11 @@ public static PBEKeySpec getPBAKeySpec(Key key,
                 } else {
                     iCount = pbeParams.getIterationCount();
                 }
+            } else {
+                throw new InvalidAlgorithmParameterException(
+                        "PBEParameterSpec type required");
             }
+
             // For security purpose, we need to enforce a minimum length
             // for salt; just require the minimum salt length to be 8-byte
             // which is what PKCS#5 recommends and openssl does.
@@ -324,32 +321,34 @@ public static PBEKeySpec getPBAKeySpec(Key key,
             }
             return new PBEKeySpec(passwdChars, salt, iCount);
         } finally {
-            Arrays.fill(passwdChars, '\0');
+            if (passwdChars != null) {
+                Arrays.fill(passwdChars, '\0');
+            }
         }
     }
 
     /*
-     * Check that the key implements the PBEKey interface. If params is an
-     * instance of PBEParameterSpec, validate consistency with the key's
-     * derivation data. Used by P11Mac and P11PBECipher (SunPKCS11).
+     * Converts the password char[] to the UTF-8 encoded byte[]. Used by PBEKey
+     * and PBKDF2KeyImpl (SunJCE).
      */
-    public static void checkKeyAndParams(Key key,
-            AlgorithmParameterSpec params, String algorithm)
-            throws InvalidKeyException, InvalidAlgorithmParameterException {
-        if (key instanceof javax.crypto.interfaces.PBEKey pbeKey) {
-            if (params instanceof PBEParameterSpec pbeParams) {
-                if (pbeParams.getIterationCount() !=
-                        pbeKey.getIterationCount() ||
-                        !Arrays.equals(pbeParams.getSalt(), pbeKey.getSalt())) {
-                    throw new InvalidAlgorithmParameterException(
-                            "Salt or iteration count parameters are " +
-                            "not consistent with PBE key");
-                }
-            }
-        } else {
-            throw new InvalidKeyException(
-                    "Cannot use a " + algorithm + " service with a key that " +
-                    "does not implement javax.crypto.interfaces.PBEKey");
-        }
+    public static byte[] encodePassword(char[] passwd) {
+        ByteBuffer bb = StandardCharsets.UTF_8.encode(CharBuffer.wrap(passwd));
+        int len = bb.limit();
+        byte[] passwdBytes = new byte[len];
+        bb.get(passwdBytes, 0, len);
+        bb.clear().put(new byte[len]);
+
+        return passwdBytes;
+    }
+
+    // converts the UTF-8 encoded byte[] to the password char[]
+    private static char[] decodePassword(byte[] passwdBytes) {
+        CharBuffer cb = StandardCharsets.UTF_8.decode(
+                ByteBuffer.wrap(passwdBytes));
+        int len = cb.limit();
+        char[] passwd = new char[len];
+        cb.get(passwd);
+        cb.clear().put(new char[len]);
+        return passwd;
     }
 }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
index bb2211ab9c1..b0caa413f0e 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -356,7 +356,9 @@ static SecretKey secretKey(Session session, long keyID, String algorithm,
         return new P11SecretKey(session, keyID, algorithm, keyLength, attrs);
     }
 
-    static SecretKey pbeKey(Session session, long keyID, String algorithm,
+    // for PBKDF2 and the deprecated PBE-based key derivation method defined
+    // in RFC 7292 PKCS#12 B.2
+    static SecretKey pbkdfKey(Session session, long keyID, String algorithm,
             int keyLength, CK_ATTRIBUTE[] attrs, char[] password, byte[] salt,
             int iterationCount) {
         attrs = getAttributes(session, keyID, attrs, new CK_ATTRIBUTE[] {
@@ -364,7 +366,7 @@ static SecretKey pbeKey(Session session, long keyID, String algorithm,
             new CK_ATTRIBUTE(CKA_SENSITIVE),
             new CK_ATTRIBUTE(CKA_EXTRACTABLE),
         });
-        return new P11PBEKey(session, keyID, algorithm, keyLength,
+        return new P11PBKDFKey(session, keyID, algorithm, keyLength,
                 attrs, password, salt, iterationCount);
     }
 
@@ -502,16 +504,16 @@ private abstract static class P11PublicKey extends P11Key implements
         }
     }
 
-    static final class P11PBEKey extends P11SecretKey
+    static final class P11PBKDFKey extends P11SecretKey
             implements PBEKey {
         private static final long serialVersionUID = 6847576994253634876L;
         private char[] password;
         private final byte[] salt;
         private final int iterationCount;
-        P11PBEKey(Session session, long keyID, String algorithm,
+        P11PBKDFKey(Session session, long keyID, String keyAlgo,
                 int keyLength, CK_ATTRIBUTE[] attributes,
                 char[] password, byte[] salt, int iterationCount) {
-            super(session, keyID, algorithm, keyLength, attributes);
+            super(session, keyID, keyAlgo, keyLength, attributes);
             this.password = password.clone();
             this.salt = salt.clone();
             this.iterationCount = iterationCount;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
index 8fd6c484ea4..f684b13fcd8 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
@@ -196,33 +196,23 @@ protected void engineInit(Key key, AlgorithmParameterSpec params)
         reset(true);
         p11Key = null;
         if (svcPbeKi != null) {
-            if (key instanceof P11Key) {
-                // If the key is a P11Key, it must come from a PBE derivation
-                // because this is a PBE Mac service. In addition to checking
-                // the key, check that params (if passed) are consistent.
-                PBEUtil.checkKeyAndParams(key, params, algorithm);
-            } else {
-                // If the key is not a P11Key, a derivation is needed. Data for
-                // derivation has to be carried either as part of the key or
-                // params. Use SunPKCS11 PBE key derivation to obtain a P11Key.
-                // Assign the derived key to p11Key because conversion is never
-                // needed for this case.
-                PBEKeySpec pbeKeySpec = PBEUtil.getPBAKeySpec(key, params);
-                try {
-                    P11Key.P11PBEKey p11PBEKey =
-                            P11SecretKeyFactory.derivePBEKey(token,
-                            pbeKeySpec, svcPbeKi);
-                    // This Mac service uses the token where the derived key
-                    // lives so there won't be any need to re-derive and use
-                    // the password. The p11Key cannot be accessed out of this
-                    // class.
-                    p11PBEKey.clearPassword();
-                    p11Key = p11PBEKey;
-                } catch (InvalidKeySpecException e) {
-                    throw new InvalidKeyException(e);
-                } finally {
-                    pbeKeySpec.clearPassword();
-                }
+            // Do key derivation using P11SecretKeyFactory, then store the
+            // derived key to p11Key
+            PBEKeySpec pbeKeySpec = PBEUtil.getPBAKeySpec(key, params);
+            try {
+                P11Key.P11PBKDFKey derivedKey =
+                        P11SecretKeyFactory.derivePBEKey(token,
+                        pbeKeySpec, svcPbeKi);
+                // This Mac service uses the token where the derived key
+                // lives so there won't be any need to re-derive and use
+                // the password. The p11Key cannot be accessed out of this
+                // class.
+                derivedKey.clearPassword();
+                p11Key = derivedKey;
+            } catch (InvalidKeySpecException e) {
+                throw new InvalidKeyException(e);
+            } finally {
+                pbeKeySpec.clearPassword();
             }
             if (params instanceof PBEParameterSpec pbeParams) {
                 // For PBE services, reassign params to the underlying
@@ -230,16 +220,13 @@ protected void engineInit(Key key, AlgorithmParameterSpec params)
                 // value to be null.
                 params = pbeParams.getParameterSpec();
             }
+        } else { // for the non-PBE case
+            p11Key = P11SecretKeyFactory.convertKey(token, key, algorithm);
         }
         if (params != null) {
             throw new InvalidAlgorithmParameterException(
                     "Parameters not supported");
         }
-        // In non-PBE cases and PBE cases where we didn't derive,
-        // a key conversion might be needed.
-        if (p11Key == null) {
-            p11Key = P11SecretKeyFactory.convertKey(token, key, algorithm);
-        }
         try {
             initialize();
         } catch (PKCS11Exception e) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PBECipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PBECipher.java
index dc4233793af..de49036d8e1 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PBECipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PBECipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc.
+ * Copyright (c) 2023, 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
@@ -22,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package sun.security.pkcs11;
 
 import java.security.AlgorithmParameters;
@@ -39,7 +38,6 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.ShortBufferException;
 import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
 
 import sun.security.jca.JCAUtil;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
@@ -128,46 +126,23 @@ protected void engineInit(int opmode, Key key,
             AlgorithmParameterSpec params, SecureRandom random)
                     throws InvalidKeyException,
                     InvalidAlgorithmParameterException {
-        if (key instanceof P11Key) {
-            // If the key is a P11Key, it must come from a PBE derivation
-            // because this is a PBE Cipher service. In addition to checking the
-            // key, check that params (if passed) are consistent.
-            PBEUtil.checkKeyAndParams(key, params, pbeAlg);
-            // At this point, we know that the key is a P11PBEKey.
-            P11Key.P11PBEKey p11PBEKey = (P11Key.P11PBEKey) key;
-            // PBE services require a PBE key of the same algorithm and the
-            // underlying service (non-PBE) won't check it.
-            if (!pbeAlg.equals(p11PBEKey.getAlgorithm())) {
-                throw new InvalidKeyException("Cannot use a " +
-                        p11PBEKey.getAlgorithm() + " key for a " + pbeAlg +
-                        " service");
-            }
-            if (params instanceof PBEParameterSpec pbeParams) {
-                params = pbeParams.getParameterSpec();
-            }
-            pbes2Params.initialize(blkSize, opmode,
-                    p11PBEKey.getIterationCount(), p11PBEKey.getSalt(), params,
-                    random);
-        } else {
-            // If the key is not a P11Key, a derivation is needed. Data for
-            // derivation has to be carried either as part of the key or params.
-            // Use SunPKCS11 PBE key derivation to obtain a P11Key.
-            PBEKeySpec pbeSpec = pbes2Params.getPBEKeySpec(
-                    blkSize, svcPbeKi.keyLen, opmode, key, params, random);
-            try {
-                P11Key.P11PBEKey p11PBEKey = P11SecretKeyFactory.derivePBEKey(
-                        token, pbeSpec, svcPbeKi);
-                // The internal Cipher service uses the token where the
-                // derived key lives so there won't be any need to re-derive
-                // and use the password. The key cannot be accessed out of this
-                // class.
-                p11PBEKey.clearPassword();
-                key = p11PBEKey;
-            } catch (InvalidKeySpecException e) {
-                throw new InvalidKeyException(e);
-            } finally {
-                pbeSpec.clearPassword();
-            }
+        // do key derivation, use P11SecretKeyFactory
+        PBEKeySpec pbeSpec = pbes2Params.getPBEKeySpec(
+                blkSize, svcPbeKi.keyLen, opmode, key, params, random);
+        try {
+            P11Key.P11PBKDFKey derivedKey =
+                    P11SecretKeyFactory.derivePBEKey(
+                    token, pbeSpec, svcPbeKi);
+            // The internal Cipher service uses the token where the
+            // derived key lives so there won't be any need to re-derive
+            // and use the password. The key cannot be accessed out of this
+            // class.
+            derivedKey.clearPassword();
+            key = derivedKey;
+        } catch (InvalidKeySpecException e) {
+            throw new InvalidKeyException(e);
+        } finally {
+            pbeSpec.clearPassword();
         }
         cipher.engineInit(opmode, key, pbes2Params.getIvSpec(), random);
     }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
index bc0a7d10cf1..3e32b0c7c2d 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
@@ -400,23 +400,30 @@ static P11Key convertKey(Token token, Key key, String svcAlgo,
         if (keyAlgo == null) {
             throw new InvalidKeyException("Key must specify its algorithm");
         }
+        KeyInfo ki = getKeyInfo(keyAlgo);
+        if (ki == null) {
+            throw new InvalidKeyException("Unknown algorithm " + keyAlgo);
+        }
+
+        KeyInfo si;
         if (svcAlgo == null) {
             svcAlgo = keyAlgo;
+            si = ki;
+        } else {
+            si = getKeyInfo(svcAlgo);
+            if (si == null) {
+                throw new InvalidKeyException("Unknown algorithm " + svcAlgo);
+            }
         }
-        KeyInfo ki = null;
-        KeyInfo si = getKeyInfo(svcAlgo);
-        if (si == null) {
-            throw new InvalidKeyException("Unknown algorithm " + svcAlgo);
-        }
+
         // Check if the key can be used for the service.
         // Any key can be used for a MAC service.
-        if (svcAlgo != keyAlgo && !(si instanceof HMACKeyInfo)) {
-            ki = getKeyInfo(keyAlgo);
-            if (ki == null || !KeyInfo.checkUse(ki, si)) {
-                throw new InvalidKeyException("Cannot use a " + keyAlgo +
+        if (svcAlgo != keyAlgo && !(si instanceof HMACKeyInfo) &&
+                !KeyInfo.checkUse(ki, si)) {
+            throw new InvalidKeyException("Cannot use a " + keyAlgo +
                         " key for a " + svcAlgo + " service");
-            }
         }
+
         if (key instanceof P11Key p11Key) {
             if (p11Key.token == token) {
                 if (extraAttrs != null) {
@@ -447,7 +454,6 @@ static P11Key convertKey(Token token, Key key, String svcAlgo,
             return p11Key;
         }
         if (key instanceof PBEKey pbeKey) {
-            ki = ki == null ? getKeyInfo(keyAlgo) : ki;
             if (ki instanceof PBEKeyInfo pbeKi) {
                 PBEKeySpec keySpec = getPbeKeySpec(pbeKey);
                 try {
@@ -479,7 +485,9 @@ static P11Key convertKey(Token token, Key key, String svcAlgo,
         return p11Key;
     }
 
-    static P11Key.P11PBEKey derivePBEKey(Token token, PBEKeySpec keySpec,
+    // utility method for deriving secret keys using PBKDF2 or the legacy
+    // PKCS#12 B.2 method.
+    static P11Key.P11PBKDFKey derivePBEKey(Token token, PBEKeySpec keySpec,
             PBEKeyInfo pbeKi) throws InvalidKeySpecException {
         token.ensureValid();
         if (keySpec == null) {
@@ -494,7 +502,7 @@ static P11Key.P11PBEKey derivePBEKey(Token token, PBEKeySpec keySpec,
             password = keySpec.getPassword();
             byte[] salt = keySpec.getSalt();
             int itCount = keySpec.getIterationCount();
-            int keySize = keySpec.getKeyLength();
+            int keySize = keySpec.getKeyLength(); // in bits
             assert password != null :
                     "PBEKeySpec does not allow a null password";
             if (salt == null) {
@@ -560,7 +568,7 @@ static P11Key.P11PBEKey derivePBEKey(Token token, PBEKeySpec keySpec,
             CK_ATTRIBUTE[] attr = token.getAttributes(
                     O_GENERATE, CKO_SECRET_KEY, pbeKi.keyType, attrs);
             long keyID = token.p11.C_GenerateKey(session.id(), ckMech, attr);
-            return (P11Key.P11PBEKey) P11Key.pbeKey(session, keyID, pbeKi.algo,
+            return (P11Key.P11PBKDFKey) P11Key.pbkdfKey(session, keyID, pbeKi.algo,
                     keySize, attr, password, salt, itCount);
         } catch (PKCS11Exception e) {
             throw new InvalidKeySpecException("Could not create key", e);
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
index 7664d8cc041..eb0569ec0d4 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -736,46 +736,6 @@ private static void register(Descriptor d) {
         d(SKF, "Generic",       P11SecretKeyFactory,
                 m(CKM_GENERIC_SECRET_KEY_GEN));
 
-        /*
-         * PBE Secret Key Factories
-         *
-         * KeyDerivationPrf must be supported for these services
-         * to be available.
-         *
-        */
-        d(SKF, "PBEWithHmacSHA1AndAES_128",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA_1_HMAC));
-        d(SKF, "PBEWithHmacSHA224AndAES_128",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA224_HMAC));
-        d(SKF, "PBEWithHmacSHA256AndAES_128",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA256_HMAC));
-        d(SKF, "PBEWithHmacSHA384AndAES_128",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA384_HMAC));
-        d(SKF, "PBEWithHmacSHA512AndAES_128",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA512_HMAC));
-        d(SKF, "PBEWithHmacSHA1AndAES_256",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA_1_HMAC));
-        d(SKF, "PBEWithHmacSHA224AndAES_256",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA224_HMAC));
-        d(SKF, "PBEWithHmacSHA256AndAES_256",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA256_HMAC));
-        d(SKF, "PBEWithHmacSHA384AndAES_256",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA384_HMAC));
-        d(SKF, "PBEWithHmacSHA512AndAES_256",
-                P11SecretKeyFactory, m(CKM_PKCS5_PBKD2), m(CKM_SHA512_HMAC));
-        /*
-         * PBA Secret Key Factories
-         */
-        d(SKF, "HmacPBESHA1",       P11SecretKeyFactory,
-                m(CKM_PBA_SHA1_WITH_SHA1_HMAC));
-        d(SKF, "HmacPBESHA224",     P11SecretKeyFactory,
-                m(CKM_NSS_PKCS12_PBE_SHA224_HMAC_KEY_GEN));
-        d(SKF, "HmacPBESHA256",     P11SecretKeyFactory,
-                m(CKM_NSS_PKCS12_PBE_SHA256_HMAC_KEY_GEN));
-        d(SKF, "HmacPBESHA384",     P11SecretKeyFactory,
-                m(CKM_NSS_PKCS12_PBE_SHA384_HMAC_KEY_GEN));
-        d(SKF, "HmacPBESHA512",     P11SecretKeyFactory,
-                m(CKM_NSS_PKCS12_PBE_SHA512_HMAC_KEY_GEN));
         /*
          * PBKDF2 Secret Key Factories
          */
diff --git a/test/jdk/sun/security/pkcs11/Cipher/PBECipher.java b/test/jdk/sun/security/pkcs11/Cipher/PBECipher.java
index 242d09f6e9b..ecce493459e 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/PBECipher.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/PBECipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc.
+ * Copyright (c) 2023, 2025, Red Hat, Inc.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -40,14 +40,14 @@
 
 /*
  * @test
- * @bug 8301553
+ * @bug 8301553 8348732
  * @summary test password based encryption on SunPKCS11's Cipher service
  * @library /test/lib ..
  * @run main/othervm/timeout=30 PBECipher
  */
 
 public final class PBECipher extends PKCS11Test {
-    private static final char[] password = "123456".toCharArray();
+    private static final char[] password = "123456\uA4F7".toCharArray();
     private static final byte[] salt = "abcdefgh".getBytes(
             StandardCharsets.UTF_8);
     private static final int iterations = 1000;
@@ -62,10 +62,6 @@ private enum Configuration {
         // Pass salt and iterations to a Cipher through a PBEParameterSpec.
         PBEParameterSpec,
 
-        // Derive a key using SunPKCS11's SecretKeyFactory (wrapping password,
-        // salt and iterations in a PBEKeySpec), and pass it to a Cipher.
-        SecretKeyFactoryDerivedKey,
-
         // Pass salt and iterations to a Cipher through an AlgorithmParameters.
         AlgorithmParameters,
 
@@ -116,35 +112,35 @@ private static void checkAssertionValues(BigInteger expectedValue,
     // Generated with SunJCE.
     private static final AssertionData[] assertionData = new AssertionData[]{
             cipherAssertionData("PBEWithHmacSHA1AndAES_128",
-                    "AES/CBC/PKCS5Padding", "ba1c9614d550912925d99e0bc8969032" +
-                    "7ac6258b72117dcf750c19ee6ca73dd4"),
+                    "AES/CBC/PKCS5Padding", "9e097796e8d8224f2a7f5c950677d879" +
+                    "c0c578340147c7ae357550e2f4d4c6ce"),
             cipherAssertionData("PBEWithHmacSHA224AndAES_128",
-                    "AES/CBC/PKCS5Padding", "41960c43ca99cf2184511aaf2f0508a9" +
-                    "7da3762ee6c2b7e2027c8076811f2e52"),
+                    "AES/CBC/PKCS5Padding", "7b915941d8e3a87c00e2fbd8ad67a578" +
+                    "9a25648933b737706de4e4d48bdb61b6"),
             cipherAssertionData("PBEWithHmacSHA256AndAES_128",
-                    "AES/CBC/PKCS5Padding", "6bb6a3dc3834e81e5ca6b5e70073ff46" +
-                    "903b188940a269ed26db2ffe622b8e16"),
+                    "AES/CBC/PKCS5Padding", "c23912d15599908f47cc32c9da56b37f" +
+                    "e41e958e9c3a6c6e4e631a2a9e6cd20f"),
             cipherAssertionData("PBEWithHmacSHA384AndAES_128",
-                    "AES/CBC/PKCS5Padding", "22aabf7a6a059415dc4ca7d985f3de06" +
-                    "8f8300ca48d8de585d802670f4c1d9bd"),
+                    "AES/CBC/PKCS5Padding", "f05c6b2dea545d59f2a6fde845170dd6" +
+                    "7aebd6b1cc28904699d7dcff1a0a238c"),
             cipherAssertionData("PBEWithHmacSHA512AndAES_128",
-                    "AES/CBC/PKCS5Padding", "b523e7c462a0b7fd74e492b3a6550464" +
-                    "ceebe81f08649ae163673afc242ad8a2"),
+                    "AES/CBC/PKCS5Padding", "949c0c01a29375b9d421f6e2bf6ed0d7" +
+                    "15a118e0980494797d3a3b799b67daf6"),
             cipherAssertionData("PBEWithHmacSHA1AndAES_256",
-                    "AES/CBC/PKCS5Padding", "1e7c25e166afae069cec68ef9affca61" +
-                    "aea02ab1c3dc7471cb767ed7d6e37af0"),
+                    "AES/CBC/PKCS5Padding", "7bd686b15bc09e5fb5aa1f881c92aa5a" +
+                    "e72bdcd864c74e62395b9aaea7443bcd"),
             cipherAssertionData("PBEWithHmacSHA224AndAES_256",
-                    "AES/CBC/PKCS5Padding", "6701f1cc75b6494ec4bd27158aa2c15d" +
-                    "7d10bc2f1fbb7d92d8277c7edfd1dd57"),
+                    "AES/CBC/PKCS5Padding", "df58a1b26cca7e9e297da61ada03ddc4" +
+                    "39d2a5699753433f19891de33f8741a2"),
             cipherAssertionData("PBEWithHmacSHA256AndAES_256",
-                    "AES/CBC/PKCS5Padding", "f82eb2fc016505baeb23ecdf85163933" +
-                    "5e8d6d48b48631185641febb75898a1d"),
+                    "AES/CBC/PKCS5Padding", "f6ae5a15ec2c18eaa25927858f1da990" +
+                    "6df58a3b4830dbaaaa4c4317e53d717d"),
             cipherAssertionData("PBEWithHmacSHA384AndAES_256",
-                    "AES/CBC/PKCS5Padding", "ee9528022e58cdd9be80cd88443e03b3" +
-                    "de13376cf97c53d946d5c5dfc88097be"),
+                    "AES/CBC/PKCS5Padding", "5795625f51ec701594506944e5ed79f0" +
+                    "c9d8e82319762f00f8ff06a8b6195ac4"),
             cipherAssertionData("PBEWithHmacSHA512AndAES_256",
-                    "AES/CBC/PKCS5Padding", "18f472912ffaa31824e20a5486324e14" +
-                    "0225e20cb158762e8647b1216fe0ab7e"),
+                    "AES/CBC/PKCS5Padding", "ddf55933f80f42f2a8d4e8726290766e" +
+                    "024f225b76b594e8005c00227d553d05"),
     };
 
     private static final class NoRandom extends SecureRandom {
@@ -201,11 +197,6 @@ private static BigInteger computeCipherText(Provider p, String svcAlgo,
                     }
                 }
             }
-            case SecretKeyFactoryDerivedKey -> {
-                SecretKey key = getDerivedSecretKey(p, keyAlgo);
-                cipher.init(Cipher.ENCRYPT_MODE, key,
-                        pbeSpec.getParameterSpec());
-            }
             case AnonymousPBEKey -> {
                 SecretKey key = getAnonymousPBEKey(keyAlgo,
                         svcAlgo.equals(keyAlgo));
@@ -222,30 +213,17 @@ private static SecretKey getPasswordOnlyPBEKey()
                 .generateSecret(new PBEKeySpec(password));
     }
 
-    private static SecretKey getDerivedSecretKey(Provider sunPKCS11,
-            String algorithm) throws GeneralSecurityException {
-        return SecretKeyFactory.getInstance(algorithm, sunPKCS11)
-                .generateSecret(new PBEKeySpec(password, salt, iterations));
-    }
-
     private static SecretKey getAnonymousPBEKey(String algorithm,
-            boolean isPbeCipherSvc) {
+            boolean isPbeCipherSvc) throws GeneralSecurityException {
+        byte[] enc = (isPbeCipherSvc ?
+                    getPasswordOnlyPBEKey().getEncoded() : null);
         return new PBEKey() {
             public byte[] getSalt() { return salt.clone(); }
             public int getIterationCount() { return iterations; }
             public String getAlgorithm() { return algorithm; }
             public String getFormat() { return "RAW"; }
             public char[] getPassword() { return password.clone(); }
-            public byte[] getEncoded() {
-                byte[] encodedKey = null;
-                if (isPbeCipherSvc) {
-                    encodedKey = new byte[password.length];
-                    for (int i = 0; i < password.length; i++) {
-                        encodedKey[i] = (byte) (password[i] & 0x7f);
-                    }
-                }
-                return encodedKey;
-            }
+            public byte[] getEncoded() { return enc; }
         };
     }
 
diff --git a/test/jdk/sun/security/pkcs11/Mac/PBAMac.java b/test/jdk/sun/security/pkcs11/Mac/PBAMac.java
index c9b5e2c3e7b..0baf85bb5de 100644
--- a/test/jdk/sun/security/pkcs11/Mac/PBAMac.java
+++ b/test/jdk/sun/security/pkcs11/Mac/PBAMac.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc.
+ * Copyright (c) 2023, 2025, Red Hat, Inc.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -37,14 +37,14 @@
 
 /*
  * @test
- * @bug 8301553
+ * @bug 8301553 8348732
  * @summary test password based authentication on SunPKCS11's Mac service
  * @library /test/lib ..
  * @run main/othervm/timeout=30 PBAMac
  */
 
 public final class PBAMac extends PKCS11Test {
-    private static final char[] password = "123456".toCharArray();
+    private static final char[] password = "123456\uA4F7".toCharArray();
     private static final byte[] salt = "abcdefgh".getBytes(
             StandardCharsets.UTF_8);
     private static final int iterations = 1000;
@@ -56,10 +56,6 @@ private enum Configuration {
         // Pass salt and iterations to a Mac through a PBEParameterSpec.
         PBEParameterSpec,
 
-        // Derive a key using SunPKCS11's SecretKeyFactory (wrapping password,
-        // salt and iterations in a PBEKeySpec), and pass it to a Mac.
-        SecretKeyFactoryDerivedKey,
-
         // Pass password, salt and iterations and iterations to
         // a Mac through an anonymous class implementing the
         // javax.crypto.interfaces.PBEKey interface.
@@ -106,19 +102,19 @@ private static void checkAssertionValues(BigInteger expectedValue,
     // Generated with SunJCE.
     private static final AssertionData[] assertionData = new AssertionData[]{
             macAssertionData("HmacPBESHA1", "HmacSHA1",
-                    "707606929395e4297adc63d520ac7d22f3f5fa66"),
+                    "8611414ddb1875d9f576282199ab492a802b7d49"),
             macAssertionData("HmacPBESHA224", "HmacSHA224",
-                    "4ffb5ad4974a7a9fca5a36ebe3e34dd443c07fb68c392f8b611657e6"),
+                    "cebb12b48eb90c07336c695f771d1d0ef4ccf5b9524fc0ab6fb9813a"),
             macAssertionData("HmacPBESHA256", "HmacSHA256",
-                    "9e8c102c212d2fd1334dc497acb4e002b04e84713b7eda5a63807af2" +
-                    "989d3e50"),
+                    "d83a6a4e8b0e1ec939d05790f385dd774bd2b7c17cfa2dd004efc894" +
+                    "e5d53f51"),
             macAssertionData("HmacPBESHA384", "HmacSHA384",
-                    "77f31a785d4f2220251143a4ba80f5610d9d0aeaebb4a278b8a7535c" +
-                    "8cea8e8211809ba450458e351c5b66d691839c23"),
+                    "ae6b69cf9edfd9cd8c3b51cdf2b0243502f35a3e6007f33b1ab73568" +
+                    "2ea81ea562f4383bb9512ff70752367b7259b16f"),
             macAssertionData("HmacPBESHA512", "HmacSHA512",
-                    "a53f942a844b234a69c1f92cba20ef272c4394a3cf4024dc16d9dbac" +
-                    "1969870b1c2b28b897149a1a3b9ad80a7ca8c547dfabf3ed5f144c6b" +
-                    "593900b62e120c45"),
+                    "46f6d09b0e7e50a66fa559ea4c4e9737a9d9e258b94f0075230d0acb" +
+                    "40f2c926f96a152c4f6b03b631efc7f99c84f052f1c78d79e07f2a9e" +
+                    "4a96164f5b46e70b"),
     };
 
     public void main(Provider sunPKCS11) throws Exception {
@@ -134,13 +130,13 @@ public void main(Provider sunPKCS11) throws Exception {
         System.out.println("TEST PASS - OK");
     }
 
-    private static void testWith(Provider sunPKCS11, AssertionData data,
+    private static void testWith(Provider p, AssertionData data,
             boolean testPBEService, Configuration conf) throws Exception {
         String svcAlgo = testPBEService ? data.pbeHmacAlgo : data.hmacAlgo;
         System.out.println(sep + System.lineSeparator() + svcAlgo
                 + " (with " + conf.name() + ")");
 
-        BigInteger mac = computeMac(sunPKCS11, svcAlgo, data.pbeHmacAlgo, conf);
+        BigInteger mac = computeMac(p, svcAlgo, data.pbeHmacAlgo, conf);
         printHex("HMAC", mac);
 
         if (!mac.equals(data.expectedMac)) {
@@ -158,15 +154,13 @@ private static BigInteger computeMac(Provider p, String svcAlgo,
                 SecretKey key = getPasswordOnlyPBEKey();
                 mac.init(key, new PBEParameterSpec(salt, iterations));
             }
-            case SecretKeyFactoryDerivedKey -> {
-                SecretKey key = getDerivedSecretKey(p, keyAlgo);
-                mac.init(key);
-            }
             case AnonymousPBEKey -> {
                 SecretKey key = getAnonymousPBEKey(keyAlgo);
                 mac.init(key);
             }
+            default -> throw new RuntimeException("Unsupported configuration");
         }
+
         return new BigInteger(1, mac.doFinal(
                 plainText.getBytes(StandardCharsets.UTF_8)));
     }
@@ -177,12 +171,6 @@ private static SecretKey getPasswordOnlyPBEKey()
                 .generateSecret(new PBEKeySpec(password));
     }
 
-    private static SecretKey getDerivedSecretKey(Provider sunPKCS11,
-            String algorithm) throws GeneralSecurityException {
-        return SecretKeyFactory.getInstance(algorithm, sunPKCS11)
-                .generateSecret(new PBEKeySpec(password, salt, iterations));
-    }
-
     private static SecretKey getAnonymousPBEKey(String algorithm) {
         return new PBEKey() {
             public byte[] getSalt() { return salt.clone(); }
diff --git a/test/jdk/sun/security/pkcs11/Provider/RequiredMechCheck.java b/test/jdk/sun/security/pkcs11/Provider/RequiredMechCheck.java
index 11fb562a825..049671a4ff0 100644
--- a/test/jdk/sun/security/pkcs11/Provider/RequiredMechCheck.java
+++ b/test/jdk/sun/security/pkcs11/Provider/RequiredMechCheck.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 8335288
+ * @bug 8335288 8348732
  * @library /test/lib ..
  * @modules jdk.crypto.cryptoki
  * @summary check that if any required mech is unavailable, then the
@@ -53,11 +53,11 @@ private static record TestData(String serviceType, String algo,
         new TestData("MAC", "HmacPBESHA256", true),
         new TestData("MAC", "HmacPBESHA384", false),
         new TestData("MAC", "HmacPBESHA512", false),
-        new TestData("SKF", "PBEWithHmacSHA1AndAES_128", false),
-        new TestData("SKF", "PBEWithHmacSHA224AndAES_128", true),
-        new TestData("SKF", "PBEWithHmacSHA256AndAES_128", true),
-        new TestData("SKF", "PBEWithHmacSHA384AndAES_128", false),
-        new TestData("SKF", "PBEWithHmacSHA512AndAES_128", false),
+        new TestData("SKF", "PBKDF2WithHmacSHA1", false),
+        new TestData("SKF", "PBKDF2WithHmacSHA224", true),
+        new TestData("SKF", "PBKDF2WithHmacSHA256", true),
+        new TestData("SKF", "PBKDF2WithHmacSHA384", false),
+        new TestData("SKF", "PBKDF2WithHmacSHA512", false),
         new TestData("CIP", "PBEWithHmacSHA1AndAES_128", false),
         new TestData("CIP", "PBEWithHmacSHA224AndAES_128", true),
         new TestData("CIP", "PBEWithHmacSHA256AndAES_128", true),
diff --git a/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestPBKD.java b/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestPBKD.java
index 8fabc0e90e4..eaaf1c331e3 100644
--- a/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestPBKD.java
+++ b/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestPBKD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc.
+ * Copyright (c) 2023, 2025, Red Hat, Inc.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -22,9 +22,6 @@
  * questions.
  */
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.ReflectiveOperationException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
@@ -43,10 +40,9 @@
 
 /*
  * @test
- * @bug 8301553
+ * @bug 8301553 8348732
  * @summary test key derivation on a SunPKCS11 SecretKeyFactory service
  * @library /test/lib ..
- * @modules java.base/com.sun.crypto.provider:open
  * @run main/othervm/timeout=30 TestPBKD
  */
 
@@ -74,48 +70,15 @@ private static BigInteger i(byte[] data) {
     private record AssertionData(String algo, PBEKeySpec keySpec,
             BigInteger expectedKey) {}
 
-    private static AssertionData p12PBKDAssertionData(String algo,
-            char[] password, int keyLen, String hashAlgo, int blockLen,
-            String staticExpectedKeyString) {
-        PBEKeySpec keySpec = new PBEKeySpec(password, salt, iterations, keyLen);
-        BigInteger staticExpectedKey = new BigInteger(staticExpectedKeyString,
-                16);
-        BigInteger expectedKey;
-        try {
-            // Since we need to access an internal
-            // SunJCE API, we use reflection.
-            Class<?> PKCS12PBECipherCore = Class.forName(
-                    "com.sun.crypto.provider.PKCS12PBECipherCore");
-
-            Field macKeyField = PKCS12PBECipherCore.getDeclaredField("MAC_KEY");
-            macKeyField.setAccessible(true);
-            int MAC_KEY = (int) macKeyField.get(null);
-
-            Method deriveMethod = PKCS12PBECipherCore.getDeclaredMethod(
-                    "derive", char[].class, byte[].class, int.class,
-                    int.class, int.class, String.class, int.class);
-            deriveMethod.setAccessible(true);
-            expectedKey = i((byte[]) deriveMethod.invoke(null,
-                    keySpec.getPassword(), keySpec.getSalt(),
-                    keySpec.getIterationCount(), keySpec.getKeyLength() / 8,
-                    MAC_KEY, hashAlgo, blockLen));
-            checkAssertionValues(expectedKey, staticExpectedKey);
-        } catch (ReflectiveOperationException ignored) {
-            expectedKey = staticExpectedKey;
-        }
-        return new AssertionData(algo, keySpec, expectedKey);
-    }
-
     private static AssertionData pbkd2AssertionData(String algo,
-            char[] password, int keyLen, String kdfAlgo,
-            String staticExpectedKeyString) {
+            char[] password, int keyLen, String staticExpectedKeyString) {
         PBEKeySpec keySpec = new PBEKeySpec(password, salt, iterations, keyLen);
         BigInteger staticExpectedKey = new BigInteger(staticExpectedKeyString,
                 16);
         BigInteger expectedKey = null;
         if (sunJCE != null) {
             try {
-                expectedKey = i(SecretKeyFactory.getInstance(kdfAlgo, sunJCE)
+                expectedKey = i(SecretKeyFactory.getInstance(algo, sunJCE)
                         .generateSecret(keySpec).getEncoded());
                 checkAssertionValues(expectedKey, staticExpectedKey);
             } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
@@ -147,80 +110,57 @@ private static void checkAssertionValues(BigInteger expectedValue,
 
     // Generated with SunJCE. Keep a reference to some
     // entries for tests executing invalid conditions.
-    private static final AssertionData hmacPBESHA1Data =
-            p12PBKDAssertionData("HmacPBESHA1", pwd, 160, "SHA-1", 64,
-                    "13156c6bee8e13ef568231e0174651afa5a358b0");
-    private static final AssertionData hmacPBESHA224Data =
-            p12PBKDAssertionData("HmacPBESHA224", pwd, 224, "SHA-224", 64,
-                    "d93acf4b3bea8a89d098e290928840c0b693a30cad0117f70ace50c2");
-    private static final AssertionData pbeWithHmacSHA512AndAES256Data =
-            pbkd2AssertionData("PBEWithHmacSHA512AndAES_256", pwd, 256,
-                    "PBKDF2WithHmacSHA512", "845560159e2f3f51dad8d6e0feccc898" +
-                    "7e3077595f90b60ab96d4f29203927b0");
+    private static final AssertionData pbkdf2WithHmacSHA512Data =
+            pbkd2AssertionData("PBKDF2WithHmacSHA512", pwd, 256,
+                    "845560159e2f3f51dad8d6e0feccc8987e3077595f90b60ab96d4f29" +
+                    "203927b0");
     private static final AssertionData pbkdf2WithHmacSHA256Data =
             pbkd2AssertionData("PBKDF2WithHmacSHA256", pwd, 384,
-                    "PBKDF2WithHmacSHA256", "6851e387278dd5a3a0d05e4d742f59d8" +
-                    "44984e3e9b619488a42b93dd6453f630ae3e2ad7ed809fa9e98a7921" +
-                    "87d62e84");
+                    "6851e387278dd5a3a0d05e4d742f59d844984e3e9b619488a42b93dd" +
+                    "6453f630ae3e2ad7ed809fa9e98a792187d62e84");
     private static final AssertionData[] assertionData = new AssertionData[]{
-            hmacPBESHA1Data,
-            hmacPBESHA224Data,
-            p12PBKDAssertionData("HmacPBESHA256", pwd, 256, "SHA-256", 64,
-                    "1bb3ed1ffb784ed32f59b4d7515971699af99cf67a2e574000964c8e" +
-                    "1eba1c45"),
-            p12PBKDAssertionData("HmacPBESHA384", pwd, 384, "SHA-384", 128,
-                    "d4ce121d3cec88a8c8b0c6225f7f996b72d76017c2d91bc51fd47985" +
-                    "86d1012d1ad03a39fdcd0fdc438d164ab50259fc"),
-            p12PBKDAssertionData("HmacPBESHA512", pwd, 512, "SHA-512", 128,
-                    "5f80b350986e5156669193eaa42a107e7d6636d82fb550f67af5b2c2" +
-                    "f546d977b70e52bbbcb6bb8976f9d3f0eaf9bfef5306c50ee5ccda3e" +
-                    "e4c4c7c8421fe4d"),
-            pbkd2AssertionData("PBEWithHmacSHA1AndAES_128", pwd, 128,
-                    "PBKDF2WithHmacSHA1", "29958f3f1c942e50903189eb7f1ba09d"),
-            pbkd2AssertionData("PBEWithHmacSHA224AndAES_128", pwd, 128,
-                    "PBKDF2WithHmacSHA224", "e328140e31f4ffb15af806986c23ee4e"),
-            pbkd2AssertionData("PBEWithHmacSHA256AndAES_128", pwd, 128,
-                    "PBKDF2WithHmacSHA256", "6851e387278dd5a3a0d05e4d742f59d8"),
-            pbkd2AssertionData("PBEWithHmacSHA384AndAES_128", pwd, 128,
-                    "PBKDF2WithHmacSHA384", "5570e2fb1a664910f055b71643b52351"),
-            pbkd2AssertionData("PBEWithHmacSHA512AndAES_128", pwd, 128,
-                    "PBKDF2WithHmacSHA512", "845560159e2f3f51dad8d6e0feccc898"),
-            pbkd2AssertionData("PBEWithHmacSHA1AndAES_256", pwd, 256,
-                    "PBKDF2WithHmacSHA1", "29958f3f1c942e50903189eb7f1ba09d40" +
+            pbkd2AssertionData("PBKDF2WithHmacSHA1", pwd, 128,
+                    "29958f3f1c942e50903189eb7f1ba09d"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA224", pwd, 128,
+                    "e328140e31f4ffb15af806986c23ee4e"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA256", pwd, 128,
+                    "6851e387278dd5a3a0d05e4d742f59d8"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA384", pwd, 128,
+                    "5570e2fb1a664910f055b71643b52351"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA512", pwd, 128,
+                    "845560159e2f3f51dad8d6e0feccc898"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA1", pwd, 256,
+                    "29958f3f1c942e50903189eb7f1ba09d40" +
                     "b5552da5e645dad4b5911ce0f2f06b"),
-            pbkd2AssertionData("PBEWithHmacSHA224AndAES_256", pwd, 256,
-                    "PBKDF2WithHmacSHA224", "e328140e31f4ffb15af806986c23ee4e" +
+            pbkd2AssertionData("PBKDF2WithHmacSHA224", pwd, 256,
+                    "e328140e31f4ffb15af806986c23ee4e" +
                     "7daa2119fee8c64aef7c1f4c1871724e"),
-            pbkd2AssertionData("PBEWithHmacSHA256AndAES_256", pwd, 256,
-                    "PBKDF2WithHmacSHA256", "6851e387278dd5a3a0d05e4d742f59d8" +
+            pbkd2AssertionData("PBKDF2WithHmacSHA256", pwd, 256,
+                    "6851e387278dd5a3a0d05e4d742f59d8" +
                     "44984e3e9b619488a42b93dd6453f630"),
-            pbkd2AssertionData("PBEWithHmacSHA384AndAES_256", pwd, 256,
-                    "PBKDF2WithHmacSHA384", "5570e2fb1a664910f055b71643b52351" +
+            pbkd2AssertionData("PBKDF2WithHmacSHA384", pwd, 256,
+                    "5570e2fb1a664910f055b71643b52351" +
                     "d7d0ad3a18912086f80d974f2acc2efb"),
-            pbeWithHmacSHA512AndAES256Data,
+            pbkdf2WithHmacSHA512Data,
             pbkd2AssertionData("PBKDF2WithHmacSHA1", pwd, 240,
-                    "PBKDF2WithHmacSHA1", "29958f3f1c942e50903189eb7f1ba09d40" +
-                    "b5552da5e645dad4b5911ce0f2"),
+                    "29958f3f1c942e50903189eb7f1ba09d40b5552da5e645dad4b5911c" +
+                    "e0f2"),
             pbkd2AssertionData("PBKDF2WithHmacSHA224", pwd, 336,
-                    "PBKDF2WithHmacSHA224", "e328140e31f4ffb15af806986c23ee4e" +
-                    "7daa2119fee8c64aef7c1f4c1871724e0ea628577e0ab54fa7c6"),
+                    "e328140e31f4ffb15af806986c23ee4e7daa2119fee8c64aef7c1f4c" +
+                    "1871724e0ea628577e0ab54fa7c6"),
             pbkdf2WithHmacSHA256Data,
             pbkd2AssertionData("PBKDF2WithHmacSHA384", pwd, 576,
-                    "PBKDF2WithHmacSHA384", "5570e2fb1a664910f055b71643b52351" +
-                    "d7d0ad3a18912086f80d974f2acc2efba52650d4bf872455820f24c8" +
-                    "46742161da84a1b4c3f197f4347308e8841a8971cf686aef29107396"),
+                    "5570e2fb1a664910f055b71643b52351d7d0ad3a18912086f80d974f" +
+                    "2acc2efba52650d4bf872455820f24c846742161da84a1b4c3f197f4" +
+                    "347308e8841a8971cf686aef29107396"),
             pbkd2AssertionData("PBKDF2WithHmacSHA512", pwd, 768,
-                    "PBKDF2WithHmacSHA512", "845560159e2f3f51dad8d6e0feccc898" +
-                    "7e3077595f90b60ab96d4f29203927b00aa1a11e4d19d4f275a7f453" +
-                    "14be500dacc3c1de9f704827b396463ccaa8957344d41bd64d9d09ff" +
-                    "474e776469d326b1ee6ee5a5d854b86d3d7a25084afd6d6f"),
-            p12PBKDAssertionData("HmacPBESHA512", emptyPwd, 512, "SHA-512",
-                    128, "90b6e088490c6c5e6b6e81209bd769d27df3868cae79591577a" +
-                    "c35b46e4c6ebcc4b90f4943e3cb165f9d1789d938235f4b35ba74df9" +
-                    "e509fbbb7aa329a432445"),
-            pbkd2AssertionData("PBEWithHmacSHA512AndAES_256", emptyPwd, 256,
-                    "PBKDF2WithHmacSHA512", "3a5c5fd11e4d381b32e11baa93d7b128" +
-                    "09e016e48e0542c5d3453fc240a0fa76"),
+                    "845560159e2f3f51dad8d6e0feccc8987e3077595f90b60ab96d4f29" +
+                    "203927b00aa1a11e4d19d4f275a7f45314be500dacc3c1de9f704827" +
+                    "b396463ccaa8957344d41bd64d9d09ff474e776469d326b1ee6ee5a5" +
+                    "d854b86d3d7a25084afd6d6f"),
+            pbkd2AssertionData("PBKDF2WithHmacSHA512", emptyPwd, 256,
+                    "3a5c5fd11e4d381b32e11baa93d7b12809e016e48e0542c5d3453fc2" +
+                    "40a0fa76"),
     };
 
     public void main(Provider sunPKCS11) throws Exception {
@@ -392,40 +332,40 @@ private static void testInvalidTranslateKey(Provider sunPKCS11)
                 + "Invalid SecretKeyFactory::translateKey tests");
 
         SecretKeyFactory skf1 = SecretKeyFactory.getInstance(
-                hmacPBESHA1Data.algo, sunPKCS11);
+                pbkdf2WithHmacSHA512Data.algo, sunPKCS11);
         SecretKeyFactory skf2 = SecretKeyFactory.getInstance("AES", sunPKCS11);
         SecretKeyFactory skf3 = SecretKeyFactory.getInstance(
                 pbkdf2WithHmacSHA256Data.algo, sunPKCS11);
-        PBEKey p11PbeKey = (PBEKey) skf1.translateKey(getAnonymousPBEKey(
-                skf1.getAlgorithm(), hmacPBESHA1Data.keySpec));
+        PBEKey p11PbkdfKey = (PBEKey) skf3.translateKey(getAnonymousPBEKey(
+                skf3.getAlgorithm(), pbkdf2WithHmacSHA256Data.keySpec));
+
         Class<?> e = InvalidKeyException.class;
 
         System.out.println(" * Non-PBEKey key to PBE SecretKeyFactory");
         assertThrows(e, "PBE service requires a PBE key",
-                () -> skf1.translateKey(new SecretKeySpec(
-                        new byte[10], hmacPBESHA1Data.algo)));
+                () -> skf3.translateKey(new SecretKeySpec(
+                        new byte[10], skf3.getAlgorithm())));
 
         System.out.println(" * PBEKey key to PBE SecretKeyFactory of a " +
                 "different algorithm");
-        assertThrows(e, "Cannot use a " + hmacPBESHA1Data.algo + " key for a " +
-                hmacPBESHA224Data.algo + " service",
-                () -> SecretKeyFactory.getInstance(hmacPBESHA224Data.algo,
-                        sunPKCS11).translateKey(p11PbeKey));
+        assertThrows(e, "Cannot use a " + pbkdf2WithHmacSHA256Data.algo +
+                " key for a " + pbkdf2WithHmacSHA512Data.algo + " service",
+                () -> skf1.translateKey(p11PbkdfKey));
 
         System.out.println(" * Non-AES PBEKey key to AES SecretKeyFactory");
-        assertThrows(e, "Cannot use a " + hmacPBESHA1Data.algo + " key for a " +
-                skf2.getAlgorithm() + " service",
-                () -> skf2.translateKey(p11PbeKey));
+        String keyAlg1 = "HmacPBESHA1";
+        PBEKeySpec kSpec1 = new PBEKeySpec(pwd, salt, 1, 16);
+        assertThrows(e, "Cannot use a " + keyAlg1 + " key for a " +
+                skf2.getAlgorithm() + " service", () ->
+                skf2.translateKey(getAnonymousPBEKey(keyAlg1, kSpec1)));
 
-        System.out.println(" * Inconsistent key length between key and " +
+        System.out.println(" * Inconsistent key length between key and its " +
                 "algorithm");
-        PBEKeySpec kSpec1 = new PBEKeySpec(pwd, salt, 1, 16);
+        String keyAlg2 = "PBEWithHmacSHA1AndAES_128";
         assertThrows(e, InvalidKeySpecException.class.getName() + ": Key " +
-                "length is invalid for " + skf1.getAlgorithm() + " (expecting" +
-                " " + hmacPBESHA1Data.keySpec.getKeyLength() + " but was " +
-                kSpec1.getKeyLength() + ")",
-                () -> skf1.translateKey(getAnonymousPBEKey(
-                        skf1.getAlgorithm(), kSpec1)));
+                "length is invalid for " + keyAlg2 + " (expecting 128 but " +
+                "was " + kSpec1.getKeyLength() + ")", () ->
+                skf2.translateKey(getAnonymousPBEKey(keyAlg2, kSpec1)));
 
         System.out.println(" * Invalid key length in bits");
         PBEKeySpec kSpec2 = new PBEKeySpec(pwd, salt, 1);
@@ -443,40 +383,25 @@ private static void testInvalidGenerateSecret(Provider sunPKCS11)
                 + "Invalid SecretKeyFactory::generateSecret tests");
 
         SecretKeyFactory skf1 = SecretKeyFactory.getInstance(
-                hmacPBESHA1Data.algo, sunPKCS11);
-        SecretKeyFactory skf2 = SecretKeyFactory.getInstance(
-                pbeWithHmacSHA512AndAES256Data.algo, sunPKCS11);
-        SecretKeyFactory skf3 = SecretKeyFactory.getInstance(
-                "PBKDF2WithHmacSHA512", sunPKCS11);
-        SecretKeyFactory skf4 = SecretKeyFactory.getInstance("AES", sunPKCS11);
+                pbkdf2WithHmacSHA512Data.algo, sunPKCS11);
+        SecretKeyFactory skf2 = SecretKeyFactory.getInstance("AES", sunPKCS11);
         Class<?> e = InvalidKeySpecException.class;
 
         System.out.println(" * Missing salt and iteration count");
         assertThrows(e, "Salt not found",
                 () -> skf1.generateSecret(new PBEKeySpec(pwd)));
 
-        System.out.println(" * Inconsistent key length between spec and " +
-                "algorithm");
-        PBEKeySpec kSpec = new PBEKeySpec(pwd, salt, 1, 16);
-        assertThrows(e, "Key length is invalid for " + skf1.getAlgorithm() +
-                " (expecting " + hmacPBESHA1Data.keySpec.getKeyLength() +
-                " but was " + kSpec.getKeyLength() + ")",
-                () -> skf1.generateSecret(kSpec));
-        assertThrows(e, "Key length is invalid for " + skf2.getAlgorithm() +
-                " (expecting " + pbeWithHmacSHA512AndAES256Data.keySpec
-                .getKeyLength() + " but was " + kSpec.getKeyLength() + ")",
-                () -> skf2.generateSecret(kSpec));
-
         System.out.println(" * Invalid key length in bits");
         String msg = "Key length must be multiple of 8 and greater than zero";
         assertThrows(e, msg,
-                () -> skf3.generateSecret(new PBEKeySpec(pwd, salt, 1)));
+                () -> skf1.generateSecret(new PBEKeySpec(pwd, salt, 1)));
         assertThrows(e, msg,
-                () -> skf3.generateSecret(new PBEKeySpec(pwd, salt, 1, 3)));
+                () -> skf1.generateSecret(new PBEKeySpec(pwd, salt, 1, 3)));
 
         System.out.println(" * PBEKeySpec to non-PBE SecretKeyFactory");
+        PBEKeySpec kSpec = new PBEKeySpec(pwd, salt, 1, 16);
         assertThrows(e, "Unsupported spec: javax.crypto.spec.PBEKeySpec",
-                () -> skf4.generateSecret(kSpec));
+                () -> skf2.generateSecret(kSpec));
 
         System.out.println();
     }
@@ -487,16 +412,16 @@ private static void testInvalidGetKeySpec(Provider sunPKCS11)
                 + "Invalid SecretKeyFactory::getKeySpec tests");
 
         SecretKeyFactory skf1 = SecretKeyFactory.getInstance(
-                hmacPBESHA1Data.algo, sunPKCS11);
+                pbkdf2WithHmacSHA256Data.algo, sunPKCS11);
         SecretKeyFactory skf2 = SecretKeyFactory.getInstance(
                 "AES", sunPKCS11);
-        PBEKey p11PbeKey = (PBEKey) skf1.translateKey(getAnonymousPBEKey(
-                skf1.getAlgorithm(), hmacPBESHA1Data.keySpec));
+        PBEKey p11PbkdfKey = (PBEKey) skf1.translateKey(getAnonymousPBEKey(
+                skf1.getAlgorithm(), pbkdf2WithHmacSHA256Data.keySpec));
         Class<?> e = InvalidKeySpecException.class;
 
         System.out.println(" * null KeySpec class");
         assertThrows(e, "key and keySpec must not be null",
-                () -> skf1.getKeySpec(p11PbeKey, null));
+                () -> skf1.getKeySpec(p11PbkdfKey, null));
 
         System.out.println(" * Invalid key type for PBEKeySpec");
         assertThrows(e, "Unsupported spec: " + PBEKeySpec.class.getName(),
@@ -506,7 +431,7 @@ private static void testInvalidGetKeySpec(Provider sunPKCS11)
         System.out.println(" * Invalid PBE key and PBEKeySpec for " +
                 skf2.getAlgorithm() + " SecretKeyFactory");
         assertThrows(e, "Unsupported spec: " + PBEKeySpec.class.getName(),
-                () -> skf2.getKeySpec(p11PbeKey, PBEKeySpec.class));
+                () -> skf2.getKeySpec(p11PbkdfKey, PBEKeySpec.class));
 
         System.out.println();
     }

From 494ef6cb8cff7f29a7346364e7620eebcec48d3b Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Thu, 1 May 2025 23:34:35 +0000
Subject: [PATCH 237/901] 8354305: SHAKE128 and SHAKE256 MessageDigest
 algorithms

Reviewed-by: valeriep, mullan
---
 .../classes/sun/security/provider/SHA3.java   | 21 ++++++-
 .../sun/security/provider/SunEntries.java     |  6 +-
 .../classes/sun/security/util/KnownOIDs.java  |  4 +-
 .../provider/MessageDigest/SHAKEhash.java     | 58 +++++++++++++++++++
 .../provider/MessageDigest/SHAKEsqueeze.java  | 14 ++++-
 5 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/sun/security/provider/MessageDigest/SHAKEhash.java

diff --git a/src/java.base/share/classes/sun/security/provider/SHA3.java b/src/java.base/share/classes/sun/security/provider/SHA3.java
index 5f974bc6ea6..a096cac5f50 100644
--- a/src/java.base/share/classes/sun/security/provider/SHA3.java
+++ b/src/java.base/share/classes/sun/security/provider/SHA3.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
@@ -476,9 +476,28 @@ public byte[] squeeze(int numBytes) {
 
         public void reset() {
             engineReset();
+            // engineReset (final in DigestBase) skips implReset if there's
+            // no update. This works for MessageDigest, since digest() always
+            // resets. But for XOF, squeeze() may be called without update,
+            // and still modifies state. So we always call implReset here
+            // to ensure correct behavior.
+            implReset();
         }
     }
 
+    public static final class SHAKE128Hash extends SHA3 {
+        public SHAKE128Hash() {
+            super("SHAKE128-256", 32, (byte) 0x1F, 32);
+        }
+    }
+
+    public static final class SHAKE256Hash extends SHA3 {
+        public SHAKE256Hash() {
+            super("SHAKE256-512", 64, (byte) 0x1F, 64);
+        }
+    }
+
+
     /*
      * The SHAKE128 extendable output function.
      */
diff --git a/src/java.base/share/classes/sun/security/provider/SunEntries.java b/src/java.base/share/classes/sun/security/provider/SunEntries.java
index 9f5e3447aeb..bfc702ec6a2 100644
--- a/src/java.base/share/classes/sun/security/provider/SunEntries.java
+++ b/src/java.base/share/classes/sun/security/provider/SunEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 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
@@ -264,6 +264,10 @@ public final class SunEntries {
                 "sun.security.provider.SHA3$SHA384", attrs);
         addWithAlias(p, "MessageDigest", "SHA3-512",
                 "sun.security.provider.SHA3$SHA512", attrs);
+        addWithAlias(p, "MessageDigest", "SHAKE128-256",
+                "sun.security.provider.SHA3$SHAKE128Hash", attrs);
+        addWithAlias(p, "MessageDigest", "SHAKE256-512",
+                "sun.security.provider.SHA3$SHAKE256Hash", attrs);
 
         /*
          * Certificates
diff --git a/src/java.base/share/classes/sun/security/util/KnownOIDs.java b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
index 223dddb7f61..9435a7a9d39 100644
--- a/src/java.base/share/classes/sun/security/util/KnownOIDs.java
+++ b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
@@ -152,8 +152,8 @@ public enum KnownOIDs {
     SHA3_256("2.16.840.1.101.3.4.2.8", "SHA3-256"),
     SHA3_384("2.16.840.1.101.3.4.2.9", "SHA3-384"),
     SHA3_512("2.16.840.1.101.3.4.2.10", "SHA3-512"),
-    SHAKE128("2.16.840.1.101.3.4.2.11"),
-    SHAKE256("2.16.840.1.101.3.4.2.12"),
+    SHAKE128_256("2.16.840.1.101.3.4.2.11", "SHAKE128-256", "SHAKE128"),
+    SHAKE256_512("2.16.840.1.101.3.4.2.12", "SHAKE256-512", "SHAKE256"),
     HmacSHA3_224("2.16.840.1.101.3.4.2.13", "HmacSHA3-224"),
     HmacSHA3_256("2.16.840.1.101.3.4.2.14", "HmacSHA3-256"),
     HmacSHA3_384("2.16.840.1.101.3.4.2.15", "HmacSHA3-384"),
diff --git a/test/jdk/sun/security/provider/MessageDigest/SHAKEhash.java b/test/jdk/sun/security/provider/MessageDigest/SHAKEhash.java
new file mode 100644
index 00000000000..1f4cbbf034a
--- /dev/null
+++ b/test/jdk/sun/security/provider/MessageDigest/SHAKEhash.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 8354305
+ * @summary Ensure SHAKE message digest algorithms behave the same
+ *      as correspondent XOF of the same output size
+ * @library /test/lib
+ * @modules java.base/sun.security.provider
+ */
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.security.SeededSecureRandom;
+import sun.security.provider.SHA3;
+
+import java.security.MessageDigest;
+
+public class SHAKEhash {
+    public static void main(String[] args) throws Exception {
+        var random = SeededSecureRandom.one();
+        var s1 = new SHA3.SHAKE128();
+        var m1 = MessageDigest.getInstance("SHAKE128-256"); // use standard name
+        var s2 = new SHA3.SHAKE256();
+        var m2 = MessageDigest.getInstance("SHAKE256"); // use alias
+        for (var i = 0; i < 1_000_000; i++) {
+            var msg = random.nBytes(random.nextInt(100));
+            s1.update(msg);
+            m1.update(msg);
+            Asserts.assertEqualsByteArray(s1.squeeze(32), m1.digest());
+            s2.update(msg);
+            m2.update(msg);
+            Asserts.assertEqualsByteArray(s2.squeeze(64), m2.digest());
+            s1.reset();
+            s2.reset();
+        }
+    }
+}
diff --git a/test/jdk/sun/security/provider/MessageDigest/SHAKEsqueeze.java b/test/jdk/sun/security/provider/MessageDigest/SHAKEsqueeze.java
index 5cdcce00e35..30edb9dbf13 100644
--- a/test/jdk/sun/security/provider/MessageDigest/SHAKEsqueeze.java
+++ b/test/jdk/sun/security/provider/MessageDigest/SHAKEsqueeze.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
@@ -38,6 +38,18 @@
 
 public class SHAKEsqueeze {
     public static void main(String[] args) throws Exception {
+        resetFix();
+        random();
+    }
+
+    static void resetFix() throws Exception {
+        var s = new SHA3.SHAKE256();
+        var d1 = s.squeeze(10);
+        s.reset();
+        Asserts.assertEqualsByteArray(d1, s.squeeze(10));
+    }
+
+    static void random() throws Exception {
         var r = SeededSecureRandom.one();
         var atlast = 0;
         // Random test on SHAKE

From c514f135ccf08c3be016a32ae8f2c055fb941857 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 2 May 2025 00:25:19 +0000
Subject: [PATCH 238/901] 8356051: Update SignatureUtil.java with the new
 KnownOIDs

Reviewed-by: rhalade
---
 .../share/classes/sun/security/util/SignatureUtil.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/security/util/SignatureUtil.java b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
index c1ffd248f2a..05cad48c042 100644
--- a/src/java.base/share/classes/sun/security/util/SignatureUtil.java
+++ b/src/java.base/share/classes/sun/security/util/SignatureUtil.java
@@ -198,7 +198,7 @@ public static class EdDSADigestAlgHolder {
         static {
             try {
                 sha512 = new AlgorithmId(ObjectIdentifier.of(KnownOIDs.SHA_512));
-                shake256 = new AlgorithmId(ObjectIdentifier.of(KnownOIDs.SHAKE256));
+                shake256 = new AlgorithmId(ObjectIdentifier.of(KnownOIDs.SHAKE256_512));
                 shake256$512 = new AlgorithmId(
                         ObjectIdentifier.of(KnownOIDs.SHAKE256_LEN),
                         new DerValue((byte) 2, new byte[]{2, 0})); // int 512

From bd7c77898a75dece0586bef24d4e18d540f08288 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 2 May 2025 01:30:47 +0000
Subject: [PATCH 239/901] 8350549: MethodHandleProxies.WRAPPER_TYPES is not
 thread-safe

Reviewed-by: jpai, jvernee
---
 .../java/lang/invoke/MethodHandleProxies.java |  5 ++-
 .../invoke/MethodHandleProxies/BasicTest.java | 32 +++++++++++++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
index 51846e682b6..70592351827 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -35,12 +35,10 @@
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
@@ -55,6 +53,7 @@
 import jdk.internal.loader.ClassLoaders;
 import jdk.internal.module.Modules;
 import jdk.internal.util.ClassFileDumper;
+import jdk.internal.util.ReferencedKeySet;
 
 import static java.lang.constant.ConstantDescs.*;
 import static java.lang.invoke.MethodHandleStatics.*;
@@ -200,7 +199,7 @@ private record MethodInfo(MethodTypeDesc desc, List<ClassDesc> thrown, String fi
     private static final ClassFileDumper DUMPER = ClassFileDumper.getInstance(
             "jdk.invoke.MethodHandleProxies.dumpClassFiles", "DUMP_MH_PROXY_CLASSFILES");
 
-    private static final Set<Class<?>> WRAPPER_TYPES = Collections.newSetFromMap(new WeakHashMap<>());
+    private static final Set<Class<?>> WRAPPER_TYPES = ReferencedKeySet.create(false, ReferencedKeySet.concurrentHashMapSupplier());
     private static final ClassValue<WeakReferenceHolder<Class<?>>> PROXIES = new ClassValue<>() {
         @Override
         protected WeakReferenceHolder<Class<?>> computeValue(Class<?> intfc) {
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java
index c2ca4bb5682..b02d3031c8a 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/BasicTest.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
@@ -30,6 +30,7 @@
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandleProxies;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.WrongMethodTypeException;
 import java.lang.reflect.AccessFlag;
@@ -45,6 +46,7 @@
 import java.util.function.IntFunction;
 import java.util.function.IntSupplier;
 import java.util.function.ToLongFunction;
+import java.util.stream.Stream;
 
 import static java.lang.constant.ConstantDescs.*;
 import static java.lang.invoke.MethodHandleProxies.*;
@@ -55,7 +57,7 @@
 
 /*
  * @test
- * @bug 6983726 8206955 8269351
+ * @bug 6983726 8206955 8269351 8350549
  * @summary Basic sanity tests for MethodHandleProxies
  * @build BasicTest Client
  * @run junit BasicTest
@@ -251,6 +253,32 @@ public void testWrongConversion() {
         assertThrows(ClassCastException.class, proxy::iterator);
     }
 
+    /**
+     * Verifies {@code isWrapperInstance} works under race and is thread safe
+     * like {@code Class} objects are.
+     */
+    @Test
+    public void testRacyWrapperCheck() {
+        MethodHandle noop = MethodHandles.zero(void.class);
+        var lookup = MethodHandles.lookup();
+        AtomicInteger counter = new AtomicInteger();
+        Stream.generate(() -> {
+            String name = "MHPRaceIface" + counter.getAndIncrement();
+            var bytes = ClassFile.of().build(ClassDesc.of(name), clb ->
+                    clb.withFlags(ACC_PUBLIC | ACC_ABSTRACT | ACC_INTERFACE)
+                       .withMethod("sam", MTD_void, ACC_PUBLIC | ACC_ABSTRACT, _ -> {}));
+            try {
+                return lookup.defineClass(bytes);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }).parallel()
+                .map(cl -> MethodHandleProxies.asInterfaceInstance(cl, noop))
+                .limit(100)
+                .forEach(inst -> assertTrue(MethodHandleProxies.isWrapperInstance(inst),
+                        () -> Objects.toIdentityString(inst) + " should pass wrapper test"));
+    }
+
     private static <T extends Throwable> Closeable throwing(Class<T> clz, T value) {
         return asInterfaceInstance(Closeable.class, MethodHandles.throwException(void.class, clz).bindTo(value));
     }

From d29700cc80003d6baddb419f2974ab226478bacc Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 2 May 2025 06:10:48 +0000
Subject: [PATCH 240/901] 8344706: Implement JEP 512: Compact Source Files and
 Instance Main Methods

Co-authored-by: Stuart Marks <smarks@openjdk.org>
Reviewed-by: liach, cstein, vromero, naoto
---
 .../share/classes/java/io/Console.java        |  97 +--------
 src/java.base/share/classes/java/io/IO.java   | 143 -------------
 .../classes/java/io/ProxyingConsole.java      |  50 +----
 src/java.base/share/classes/java/lang/IO.java | 196 ++++++++++++++++++
 .../classes/jdk/internal/io/JdkConsole.java   |   4 +-
 .../jdk/internal/io/JdkConsoleImpl.java       |  36 +---
 .../jdk/internal/javac/PreviewFeature.java    |   3 +-
 .../jdk/internal/misc/MethodFinder.java       |  15 +-
 .../classes/sun/launcher/LauncherHelper.java  |  10 -
 .../com/sun/tools/javac/code/Preview.java     |   1 -
 .../com/sun/tools/javac/code/Source.java      |   4 +-
 .../com/sun/tools/javac/code/Symtab.java      |   4 +-
 .../com/sun/tools/javac/comp/TypeEnter.java   |  14 --
 .../sun/tools/javac/parser/JavacParser.java   |  36 ++--
 .../tools/javac/resources/compiler.properties |   4 +-
 .../org/jline/JdkConsoleProviderImpl.java     |  27 +--
 .../jdk/internal/jshell/tool/JShellTool.java  |  11 +-
 .../classes/jdk/jshell/JShellConsole.java     |  17 +-
 .../jshell/execution/impl/ConsoleImpl.java    |  50 +----
 .../jshell/tool/resources/PREVIEW_DEFAULT.jsh |   1 -
 test/jdk/java/{io => lang}/IO/IO.java         |  24 +--
 test/jdk/java/{io => lang}/IO/Input.java      |   4 +-
 test/jdk/java/{io => lang}/IO/Methods.java    |   4 +-
 test/jdk/java/{io => lang}/IO/Output.java     |   4 +-
 .../java/{io => lang}/IO/input-no-prompt.exp  |   2 +-
 test/jdk/java/{io => lang}/IO/input.exp       |   2 +-
 test/jdk/java/{io => lang}/IO/output.exp      |   2 +-
 .../jline/LazyJdkConsoleProvider.java         |  11 +-
 test/jdk/tools/launcher/Arrrghs.java          |   6 +-
 test/langtools/jdk/jshell/ConsoleTest.java    |  20 +-
 .../langtools/jdk/jshell/ConsoleToolTest.java |  44 ++--
 .../jshell/tool/resources/PREVIEW_DEFAULT.jsh |  28 +++
 .../langtools/jdk/jshell/StartOptionTest.java |  24 ++-
 .../jdk/jshell/ToolProviderTest.java          |   2 +-
 .../javac/ImplicitClass/ErrorRecovery.java    |  20 +-
 .../ImplicitClass/ImplicitClassRecovery.java  |   3 +-
 .../ImplicitClass/ImplicitClassRecovery.out   |   4 +-
 .../javac/ImplicitClass/ImplicitImports.java  |  77 ++-----
 .../javac/ImplicitClass/NestedClasses.java    |   9 +-
 .../tools/javac/ImplicitClass/NestedEnum.java |   4 +-
 .../SourceLevelErrorPosition.java             |   4 +-
 .../SourceLevelErrorPosition.out              |   2 +-
 .../ImplicitClass/TestImplicitClass.java      |   5 +-
 test/langtools/tools/javac/T8036019.out       |   4 +-
 .../failures/AnnotatedImport.out              |  10 +-
 .../tools/javac/attr/AttrRecoveryTest.java    |   8 +-
 .../tools/javac/diags/examples.not-yet.txt    |   1 +
 .../tools/javac/diags/examples/Expected3.java |   7 +-
 .../diags/examples/IllegalStartOfStmt.java    |   3 +-
 .../javac/diags/examples/ImplicitClass.java   |   7 +-
 .../examples/ImplicitClassBad-Filename.java   |   5 +-
 .../examples/ImplicitClassHasPackage.java     |   5 +-
 .../diags/examples/ImplicitClassNoMain.java   |   5 +-
 .../launcher/BasicSourceLauncherTests.java    |   7 +-
 .../javac/launcher/SourceLauncherTest.java    |  66 ++++--
 .../tools/javac/parser/JavacParserTest.java   |   8 +-
 .../parser/SingleCommaAnnotationValueFail.out |   2 +-
 .../javac/sealed/SealedCompilationTests.java  |   6 +-
 .../tools/javac/tree/TreePosTest.java         |  29 ++-
 59 files changed, 476 insertions(+), 725 deletions(-)
 delete mode 100644 src/java.base/share/classes/java/io/IO.java
 create mode 100644 src/java.base/share/classes/java/lang/IO.java
 rename test/jdk/java/{io => lang}/IO/IO.java (91%)
 rename test/jdk/java/{io => lang}/IO/Input.java (92%)
 rename test/jdk/java/{io => lang}/IO/Methods.java (92%)
 rename test/jdk/java/{io => lang}/IO/Output.java (94%)
 rename test/jdk/java/{io => lang}/IO/input-no-prompt.exp (93%)
 rename test/jdk/java/{io => lang}/IO/input.exp (93%)
 rename test/jdk/java/{io => lang}/IO/output.exp (94%)
 create mode 100644 test/langtools/jdk/jshell/StartOptionTest-module-patch/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index 4f919c064b9..7e4540ecb06 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.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
@@ -31,7 +31,6 @@
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.io.JdkConsoleImpl;
 import jdk.internal.io.JdkConsoleProvider;
-import jdk.internal.javac.PreviewFeature;
 import sun.nio.cs.UTF_8;
 
 /**
@@ -148,100 +147,6 @@ public Reader reader() {
         throw newUnsupportedOperationException();
     }
 
-    /**
-     * Writes a string representation of the specified object to this console's
-     * output stream, terminates the line using {@link System#lineSeparator()}
-     * and then flushes the console.
-     *
-     * <p> The string representation of the specified object is obtained as if
-     * by calling {@link String#valueOf(Object)}.
-     *
-     * @param  obj
-     *         An object whose string representation is to be written,
-     *         may be {@code null}.
-     *
-     * @return  This console
-     *
-     * @since 23
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public Console println(Object obj) {
-        throw newUnsupportedOperationException();
-    }
-
-    /**
-     * Terminates the current line in this console's output stream using
-     * {@link System#lineSeparator()} and then flushes the console.
-     *
-     * @return  This console
-     *
-     * @since 24
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public Console println() {
-        return println("");
-    }
-
-    /**
-     * Writes a string representation of the specified object to this console's
-     * output stream and then flushes the console.
-     *
-     * <p> The string representation of the specified object is obtained as if
-     * by calling {@link String#valueOf(Object)}.
-     *
-     * @param  obj
-     *         An object whose string representation is to be written,
-     *         may be {@code null}.
-     *
-     * @return  This console
-     *
-     * @since 23
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public Console print(Object obj) {
-        throw newUnsupportedOperationException();
-    }
-
-    /**
-     * Writes a prompt as if by calling {@code print}, then reads a single line
-     * of text from this console.
-     *
-     * @param  prompt
-     *         A prompt string, may be {@code null}.
-     *
-     * @throws IOError
-     *         If an I/O error occurs.
-     *
-     * @return  A string containing the line read from the console, not
-     *          including any line-termination characters, or {@code null}
-     *          if an end of stream has been reached without having read
-     *          any characters.
-     *
-     * @since 23
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public String readln(String prompt) {
-        throw newUnsupportedOperationException();
-    }
-
-    /**
-     * Reads a single line of text from this console.
-     *
-     * @throws IOError
-     *         If an I/O error occurs.
-     *
-     * @return  A string containing the line read from the console, not
-     *          including any line-termination characters, or {@code null}
-     *          if an end of stream has been reached without having read
-     *          any characters.
-     *
-     * @since 24
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public String readln() {
-        throw newUnsupportedOperationException();
-    }
-
     /**
      * Writes a formatted string to this console's output stream using
      * the specified format string and arguments with the
diff --git a/src/java.base/share/classes/java/io/IO.java b/src/java.base/share/classes/java/io/IO.java
deleted file mode 100644
index a49a51041fc..00000000000
--- a/src/java.base/share/classes/java/io/IO.java
+++ /dev/null
@@ -1,143 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.io;
-
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * A collection of static convenience methods that provide access to
- * {@linkplain System#console() system console} for implicitly declared classes.
- *
- * <p> Each of this class' methods throws {@link IOError} if the system console
- * is {@code null}; otherwise, the effect is as if a similarly-named method
- * had been called on that console.
- *
- * <p> Input and output from methods in this class use the character set of
- * the system console as specified by {@link Console#charset}.
- *
- * @since 23
- */
-@PreviewFeature(feature = PreviewFeature.Feature.IMPLICIT_CLASSES)
-public final class IO {
-
-    private IO() {
-        throw new Error("no instances");
-    }
-
-    /**
-     * Writes a string representation of the specified object to the system
-     * console, terminates the line and then flushes that console.
-     *
-     * <p> The effect is as if {@link Console#println(Object) println(obj)}
-     * had been called on {@code System.console()}.
-     *
-     * @param obj the object to print, may be {@code null}
-     *
-     * @throws IOError if {@code System.console()} returns {@code null},
-     *                 or if an I/O error occurs
-     */
-    public static void println(Object obj) {
-        con().println(obj);
-    }
-
-    /**
-     * Terminates the current line on the system console and then flushes
-     * that console.
-     *
-     * <p> The effect is as if {@link Console#println() println()}
-     * had been called on {@code System.console()}.
-     *
-     * @throws IOError if {@code System.console()} returns {@code null},
-     *                 or if an I/O error occurs
-     * @since 24
-     */
-    public static void println() {
-        con().println();
-    }
-
-    /**
-     * Writes a string representation of the specified object to the system
-     * console and then flushes that console.
-     *
-     * <p> The effect is as if {@link Console#print(Object) print(obj)}
-     * had been called on {@code System.console()}.
-     *
-     * @param obj the object to print, may be {@code null}
-     *
-     * @throws IOError if {@code System.console()} returns {@code null},
-     *                 or if an I/O error occurs
-     */
-    public static void print(Object obj) {
-        con().print(obj);
-    }
-
-    /**
-     * Writes a prompt as if by calling {@code print}, then reads a single line
-     * of text from the system console.
-     *
-     * <p> The effect is as if {@link Console#readln(String) readln(prompt)}
-     * had been called on {@code System.console()}.
-     *
-     * @param prompt the prompt string, may be {@code null}
-     *
-     * @return a string containing the line read from the system console, not
-     * including any line-termination characters. Returns {@code null} if an
-     * end of stream has been reached without having read any characters.
-     *
-     * @throws IOError if {@code System.console()} returns {@code null},
-     *                 or if an I/O error occurs
-     */
-    public static String readln(String prompt) {
-        return con().readln(prompt);
-    }
-
-    /**
-     * Reads a single line of text from the system console.
-     *
-     * <p> The effect is as if {@link Console#readln() readln()}
-     * had been called on {@code System.console()}.
-     *
-     * @return a string containing the line read from the system console, not
-     * including any line-termination characters. Returns {@code null} if an
-     * end of stream has been reached without having read any characters.
-     *
-     * @throws IOError if {@code System.console()} returns {@code null},
-     *                 or if an I/O error occurs
-     * @since 24
-     */
-    public static String readln() {
-        return con().readln();
-    }
-
-    private static Console con() {
-        var con = System.console();
-        if (con != null) {
-            return con;
-        } else {
-            throw new IOError(null);
-        }
-    }
-}
diff --git a/src/java.base/share/classes/java/io/ProxyingConsole.java b/src/java.base/share/classes/java/io/ProxyingConsole.java
index cc5cd926264..5c8da9f51da 100644
--- a/src/java.base/share/classes/java/io/ProxyingConsole.java
+++ b/src/java.base/share/classes/java/io/ProxyingConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 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
@@ -81,54 +81,6 @@ public Reader reader() {
         return reader;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Console println(Object obj) {
-        synchronized (writeLock) {
-            delegate.println(obj);
-        }
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Console print(Object obj) {
-        synchronized (writeLock) {
-            delegate.print(obj);
-        }
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws IOError {@inheritDoc}
-     */
-    @Override
-    public String readln(String prompt) {
-        synchronized (writeLock) {
-            synchronized (readLock) {
-                return delegate.readln(prompt);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws IOError {@inheritDoc}
-     */
-    @Override
-    public String readln() {
-        synchronized (readLock) {
-            return delegate.readln();
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/java.base/share/classes/java/lang/IO.java b/src/java.base/share/classes/java/lang/IO.java
new file mode 100644
index 00000000000..1f88de7e238
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/IO.java
@@ -0,0 +1,196 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOError;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * A collection of static methods that provide convenient access to {@link System#in}
+ * and {@link System#out} for line-oriented input and output.
+ * <p>
+ * The {@link #readln()} and {@link #readln(String)} methods decode bytes read from
+ * {@code System.in} into characters. The charset used for decoding is specified by the
+ * {@link System#getProperties stdin.encoding} property. If this property is not present,
+ * or if the charset it names cannot be loaded, then UTF-8 is used instead. Decoding
+ * always replaces malformed and unmappable byte sequences with the charset's default
+ * replacement string.
+ * <p>
+ * Charset decoding is set up upon the first call to one of the {@code readln} methods.
+ * Decoding may buffer additional bytes beyond those that have been decoded to characters
+ * returned to the application. After the first call to one of the {@code readln} methods,
+ * any subsequent use of {@code System.in} results in unspecified behavior.
+ *
+ * @apiNote
+ * The expected use case is that certain applications will use only the {@code readln}
+ * methods to read from the standard input, and they will not mix these calls with
+ * other techniques for reading from {@code System.in}.
+ *
+ * @since 25
+ */
+public final class IO {
+
+    /*
+     * We are deliberately not including printf, at least not initially, for
+     * the following reasons. First, it introduces a rather cryptic and arcane
+     * formatting language that isn't really suited to beginners. Second, it
+     * is inherently localizable, which drags in a whole bunch of issues about
+     * what locale should be used for formatting, the possible inclusion of
+     * an overload with an explicit Locale parameter, and so forth. These issues
+     * are best avoided for the time being. Third, when string templates come
+     * along, they might offer a better alternative to printf-style formatting,
+     * so it's best not be saddled with this unnecessarily.
+     */
+
+    /*
+     * Notes on flushing. We want flushing to occur after every call to println
+     * and print, so that the user can see output immediately. This could be
+     * important if the user calls print() to issue a prompt before calling
+     * readln() instead of the readln(prompt) overload. It's also important to
+     * flush after print() in case the user is relying on print() to emit output
+     * as sort of a progress indicator.
+     *
+     * We rely on System.out to have autoflush enabled, which flushes after every
+     * println() call, so we needn't flush again. We flush unconditionally after
+     * calls to print(). Since System.out is doing a lot of flushing anyway, there
+     * isn't much point trying to make this conditional, for example, only if
+     * stdout is connected to a terminal.
+     */
+
+    private IO() {
+        throw new Error("no instances");
+    }
+
+    /**
+     * Writes a string representation of the specified object and then writes
+     * a line separator to the standard output.
+     *
+     * <p> The effect is as if {@link java.io.PrintStream#println(Object) println(obj)}
+     * had been called on {@code System.out}.
+     *
+     * @param obj the object to print, may be {@code null}
+     */
+    public static void println(Object obj) {
+        System.out.println(obj);
+    }
+
+    /**
+     * Writes a line separator to the standard output.
+     *
+     * <p> The effect is as if {@link java.io.PrintStream#println() println()}
+     * had been called on {@code System.out}.
+     */
+    public static void println() {
+        System.out.println();
+    }
+
+    /**
+     * Writes a string representation of the specified object to the
+     * standard output.
+     *
+     * <p> The effect is as if {@link java.io.PrintStream#print(Object) print(obj)}
+     * had been called on {@code System.out}.
+     *
+     * @param obj the object to print, may be {@code null}
+     */
+    public static void print(Object obj) {
+        var out = System.out;
+        out.print(obj);
+        out.flush();
+    }
+
+    /**
+     * Reads a single line of text from the standard input.
+     * <p>
+     * One line is read from the decoded input as if by
+     * {@link java.io.BufferedReader#readLine() BufferedReader.readLine()}
+     * and then the result is returned.
+     * <p>
+     * If necessary, this method first sets up charset decoding, as described in
+     * above in the class specification.
+     *
+     * @return a string containing the line read from the standard input, not
+     * including any line separator characters. Returns {@code null} if an
+     * end of stream has been reached without having read any characters.
+     *
+     * @throws IOError if an I/O error occurs
+     */
+    public static String readln() {
+        try {
+            return reader().readLine();
+        } catch (IOException ioe) {
+            throw new IOError(ioe);
+        }
+    }
+
+    /**
+     * Writes a prompt and then reads a line of input.
+     * <p>
+     * Writes a prompt as if by calling {@link #print print}, and then reads a single
+     * line of text as if by calling {@link #readln() readln}.
+     * <p>
+     * If necessary, this method first sets up charset decoding, as described in
+     * above in the class specification.
+     *
+     * @param prompt the prompt string, may be {@code null}
+     *
+     * @return a string containing the line read from the standard input, not
+     * including any line separator characters. Returns {@code null} if an
+     * end of stream has been reached without having read any characters.
+     *
+     * @throws IOError if an I/O error occurs
+     */
+    public static String readln(String prompt) {
+        print(prompt);
+        return readln();
+    }
+
+    /**
+     * The BufferedReader used by readln(). Initialized under a class lock by
+     * the reader() method. All access should be through the reader() method.
+     */
+    private static BufferedReader br;
+
+    /**
+     * On the first call, creates an InputStreamReader to decode characters from
+     * System.in, wraps it in a BufferedReader, and returns the BufferedReader.
+     * These objects are cached and returned by subsequent calls.
+     *
+     * @return the internal BufferedReader instance
+     */
+    static synchronized BufferedReader reader() {
+        if (br == null) {
+            String enc = System.getProperty("stdin.encoding", "");
+            Charset cs = Charset.forName(enc, StandardCharsets.UTF_8);
+            br = new BufferedReader(new InputStreamReader(System.in, cs));
+        }
+        return br;
+    }
+}
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
index 08bd840de37..2168a1c4feb 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 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
@@ -40,8 +40,6 @@ public interface JdkConsole {
     Reader reader();
     JdkConsole println(Object obj);
     JdkConsole print(Object obj);
-    String readln(String prompt);
-    String readln();
     JdkConsole format(Locale locale, String format, Object ... args);
     String readLine(Locale locale, String format, Object ... args);
     String readLine();
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index 3c0afd2005c..008ed68f56f 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 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
@@ -71,40 +71,6 @@ public JdkConsole print(Object obj) {
         return this;
     }
 
-    @Override
-    public String readln(String prompt) {
-        String line = null;
-        synchronized (writeLock) {
-            synchronized(readLock) {
-                pw.print(prompt);
-                pw.flush(); // automatic flushing does not cover print
-                try {
-                    char[] ca = readline(false);
-                    if (ca != null)
-                        line = new String(ca);
-                } catch (IOException x) {
-                    throw new IOError(x);
-                }
-            }
-        }
-        return line;
-    }
-
-    @Override
-    public String readln() {
-        String line = null;
-        synchronized(readLock) {
-            try {
-                char[] ca = readline(false);
-                if (ca != null)
-                    line = new String(ca);
-            } catch (IOException x) {
-                throw new IOError(x);
-            }
-        }
-        return line;
-    }
-
     @Override
     public JdkConsole format(Locale locale, String format, Object ... args) {
         formatter.format(locale, format, args).flush();
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 6455664b985..7461815e4c5 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -68,8 +68,7 @@ public enum Feature {
         // keeping the constant of a feature that has been integrated or dropped, serves the purpose of muting such warnings.
 
         //---
-        @JEP(number=495, title="Simple Source Files and Instance Main Methods", status="Fourth Preview")
-        IMPLICIT_CLASSES,
+        IMPLICIT_CLASSES, //to be removed when boot JDK is 25
         @JEP(number=487, title="Scoped Values", status="Fourth Preview")
         SCOPED_VALUES,
         @JEP(number=499, title="Structured Concurrency", status="Fourth Preview")
diff --git a/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java b/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java
index 970cebe74ed..af98e364a77 100644
--- a/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java
+++ b/src/java.base/share/classes/jdk/internal/misc/MethodFinder.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
@@ -82,10 +82,14 @@ private MethodFinder() {
      * @jls 12.1.4 Invoke a main method
      */
     public static Method findMainMethod(Class<?> cls) {
-        boolean isPreview = PreviewFeatures.isEnabled();
-        Method mainMethod = JLA.findMethod(cls, !isPreview, "main", String[].class);
+        Method mainMethod = JLA.findMethod(cls, true, "main", String[].class);
 
-        if (isPreview && mainMethod == null) {
+        if (mainMethod == null) {
+            //if not public method, try to lookup a non-public one
+            mainMethod = JLA.findMethod(cls, false, "main", String[].class);
+        }
+
+        if (mainMethod == null) {
             mainMethod = JLA.findMethod(cls, false, "main");
         }
 
@@ -97,8 +101,7 @@ public static Method findMainMethod(Class<?> cls) {
 
         if (Modifier.isAbstract(mods) ||
                 mainMethod.getReturnType() != void.class ||
-                (isPreview && Modifier.isPrivate(mods)) ||
-                (!isPreview && !Modifier.isStatic(mods))) {
+                Modifier.isPrivate(mods)) {
             return null;
         }
 
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index 8fbf76851cc..e31aca243b3 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -73,7 +73,6 @@
 import java.util.stream.Stream;
 
 import jdk.internal.misc.MethodFinder;
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.misc.VM;
 import jdk.internal.module.ModuleBootstrap;
 import jdk.internal.module.Modules;
@@ -945,17 +944,8 @@ private static void validateMainMethod(Class<?> mainClass) {
 
         int mods = mainMethod.getModifiers();
         isStaticMain = Modifier.isStatic(mods);
-        boolean isPublic = Modifier.isPublic(mods);
         noArgMain = mainMethod.getParameterCount() == 0;
 
-        if (!PreviewFeatures.isEnabled()) {
-            if (!isStaticMain || !isPublic || noArgMain) {
-                  abort(null, "java.launcher.cls.error2", mainClass.getName(),
-                       JAVAFX_APPLICATION_CLASS_NAME);
-            }
-            return;
-        }
-
         if (!isStaticMain) {
             String className = mainMethod.getDeclaringClass().getName();
             if (mainClass.isMemberClass() && !Modifier.isStatic(mainClass.getModifiers())) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 325274782ef..2d0f44200c1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -226,7 +226,6 @@ public boolean isEnabled() {
      */
     public boolean isPreview(Feature feature) {
         return switch (feature) {
-            case IMPLICIT_CLASSES -> true;
             case FLEXIBLE_CONSTRUCTORS -> true;
             case PRIMITIVE_PATTERNS -> true;
             //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index eed0ceaade0..e3585dd398b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -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
@@ -262,7 +262,7 @@ public enum Feature {
         REDUNDANT_STRICTFP(JDK17),
         UNCONDITIONAL_PATTERN_IN_INSTANCEOF(JDK21, Fragments.FeatureUnconditionalPatternsInInstanceof, DiagKind.PLURAL),
         RECORD_PATTERNS(JDK21, Fragments.FeatureDeconstructionPatterns, DiagKind.PLURAL),
-        IMPLICIT_CLASSES(JDK21, Fragments.FeatureImplicitClasses, DiagKind.PLURAL),
+        IMPLICIT_CLASSES(JDK25, Fragments.FeatureImplicitClasses, DiagKind.PLURAL),
         WARN_ON_ILLEGAL_UTF8(MIN, JDK21),
         UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
         PRIMITIVE_PATTERNS(JDK23, Fragments.FeaturePrimitivePatterns, DiagKind.PLURAL),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
index cfe4ef662e5..74c740656f4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -230,7 +230,6 @@ public static Symtab instance(Context context) {
     public final Type valueBasedInternalType;
     public final Type classDescType;
     public final Type enumDescType;
-    public final Type ioType;
 
     // For serialization lint checking
     public final Type objectStreamFieldType;
@@ -613,7 +612,6 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         valueBasedInternalType = enterSyntheticAnnotation("jdk.internal.ValueBased+Annotation");
         classDescType = enterClass("java.lang.constant.ClassDesc");
         enumDescType = enterClass("java.lang.Enum$EnumDesc");
-        ioType = enterClass("java.io.IO");
         // For serialization lint checking
         objectStreamFieldType = enterClass("java.io.ObjectStreamField");
         objectInputStreamType = enterClass("java.io.ObjectInputStream");
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index d0b85b3d1cb..eb4ab96dfd2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -340,20 +340,6 @@ private void implicitImports(JCCompilationUnit tree, Env<AttrContext> env) {
                     (cls.mods.flags & IMPLICIT_CLASS) != 0;
             if (isImplicitClass) {
                 doModuleImport(make.ModuleImport(make.QualIdent(syms.java_base)));
-                if (peekTypeExists(syms.ioType.tsym)) {
-                    doImport(make.Import(make.Select(make.QualIdent(syms.ioType.tsym),
-                            names.asterisk), true), false);
-                }
-            }
-        }
-
-        private boolean peekTypeExists(TypeSymbol type) {
-            try {
-                type.complete();
-                return !type.type.isErroneous();
-            } catch (CompletionFailure cf) {
-                //does not exist
-                return false;
             }
         }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index d0b9fccde48..1383baa57b8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -153,6 +153,7 @@ public class JavacParser implements Parser {
      * is true).
      */
     private boolean permitTypeAnnotationsPushBack = false;
+    private JCDiagnostic.Error unexpectedTopLevelDefinitionStartError;
 
     interface ErrorRecoveryAction {
         JCTree doRecover(JavacParser parser);
@@ -200,6 +201,7 @@ protected JavacParser(ParserFactory fac,
         this.allowYieldStatement = Feature.SWITCH_EXPRESSION.allowedInSource(source);
         this.allowRecords = Feature.RECORDS.allowedInSource(source);
         this.allowSealedTypes = Feature.SEALED_CLASSES.allowedInSource(source);
+        updateUnexpectedTopLevelDefinitionStartError(false);
     }
 
     /** Construct a parser from an existing parser, with minimal overhead.
@@ -224,6 +226,7 @@ protected JavacParser(JavacParser parser,
         this.allowYieldStatement = Feature.SWITCH_EXPRESSION.allowedInSource(source);
         this.allowRecords = Feature.RECORDS.allowedInSource(source);
         this.allowSealedTypes = Feature.SEALED_CLASSES.allowedInSource(source);
+        updateUnexpectedTopLevelDefinitionStartError(false);
     }
 
     protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
@@ -4021,6 +4024,7 @@ public JCTree.JCCompilationUnit parseCompilationUnit() {
             attach(pd, firstToken.docComment());
             consumedToplevelDoc = true;
             defs.append(pd);
+            updateUnexpectedTopLevelDefinitionStartError(true);
         }
 
         boolean firstTypeDecl = true;   // have we seen a class, enum, or interface declaration yet?
@@ -4094,7 +4098,7 @@ public JCTree.JCCompilationUnit parseCompilationUnit() {
                 // it is parsed. Otherwise, parsing continues as though
                 // implicitly declared classes did not exist and error reporting
                 // is the same as in the past.
-                if (Feature.IMPLICIT_CLASSES.allowedInSource(source) && !isDeclaration()) {
+                if (!isDeclaration(true)) {
                     final JCModifiers finalMods = mods;
                     JavacParser speculative = new VirtualParser(this);
                     List<JCTree> speculativeResult =
@@ -4348,18 +4352,7 @@ protected JCStatement classOrRecordOrInterfaceOrEnumDeclaration(JCModifiers mods
                 errs = List.of(mods);
             }
 
-            JCDiagnostic.Error error;
-            if (parseModuleInfo) {
-                error = Errors.ExpectedModuleOrOpen;
-            } else if (Feature.IMPLICIT_CLASSES.allowedInSource(source) &&
-                       (!preview.isPreview(Feature.IMPLICIT_CLASSES) || preview.isEnabled())) {
-                error = Errors.ClassMethodOrFieldExpected;
-            } else if (allowRecords) {
-                error = Errors.Expected4(CLASS, INTERFACE, ENUM, "record");
-            } else {
-                error = Errors.Expected3(CLASS, INTERFACE, ENUM);
-            }
-            return toP(F.Exec(syntaxError(pos, errs, error)));
+            return toP(F.Exec(syntaxError(pos, errs, unexpectedTopLevelDefinitionStartError)));
 
         }
     }
@@ -4948,6 +4941,10 @@ private List<JCTree> topLevelMethodOrFieldDeclaration(JCModifiers mods, Comment
     }
 
     protected boolean isDeclaration() {
+        return isDeclaration(allowRecords);
+    }
+
+    private boolean isDeclaration(boolean allowRecords) {
         return token.kind == CLASS ||
                token.kind == INTERFACE ||
                token.kind == ENUM ||
@@ -5612,6 +5609,19 @@ protected void checkSourceLevel(int pos, Feature feature) {
         }
     }
 
+    private void updateUnexpectedTopLevelDefinitionStartError(boolean hasPackageDecl) {
+        //TODO: proper tests for this logic (and updates):
+        if (parseModuleInfo) {
+            unexpectedTopLevelDefinitionStartError = Errors.ExpectedModuleOrOpen;
+        } else if (Feature.IMPLICIT_CLASSES.allowedInSource(source) && !hasPackageDecl) {
+            unexpectedTopLevelDefinitionStartError = Errors.ClassMethodOrFieldExpected;
+        } else if (allowRecords) {
+            unexpectedTopLevelDefinitionStartError = Errors.Expected4(CLASS, INTERFACE, ENUM, "record");
+        } else {
+            unexpectedTopLevelDefinitionStartError = Errors.Expected3(CLASS, INTERFACE, ENUM);
+        }
+    }
+
     /*
      * a functional source tree and end position mappings
      */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 79b6a4fd1da..37cb145f1a4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -529,10 +529,10 @@ compiler.err.bad.file.name=\
     bad file name: {0}
 
 compiler.err.implicit.class.should.not.have.package.declaration=\
-    implicitly declared class should not have package declaration
+    compact source file should not have package declaration
 
 compiler.err.implicit.class.does.not.have.main.method=\
-    implicitly declared class does not have main method in the form of void main() or void main(String[] args)
+    compact source file does not have main method in the form of void main() or void main(String[] args)
 
 # 0: name, 1: name
 compiler.err.same.binary.name=\
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index 11de96b7fc3..03a9da22771 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 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
@@ -93,16 +93,6 @@ public JdkConsole print(Object obj) {
             return this;
         }
 
-        @Override
-        public String readln(String prompt) {
-            return getDelegate(true).readln(prompt);
-        }
-
-        @Override
-        public String readln() {
-            return getDelegate(true).readln();
-        }
-
         @Override
         public JdkConsole format(Locale locale, String format, Object... args) {
             JdkConsole delegate = getDelegate(false);
@@ -219,21 +209,6 @@ public JdkConsole print(Object obj) {
             return this;
         }
 
-        @Override
-        public String readln(String prompt) {
-            try {
-                initJLineIfNeeded();
-                return jline.readLine(prompt == null ? "null" : prompt.replace("%", "%%"));
-            } catch (EndOfFileException eofe) {
-                return null;
-            }
-        }
-
-        @Override
-        public String readln() {
-            return readLine();
-        }
-
         @Override
         public JdkConsole format(Locale locale, String format, Object ... args) {
             writer().format(locale, format, args).flush();
diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
index 802a75dc891..86a84953c80 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -4147,15 +4147,6 @@ public String readLine(String prompt) {
             }
         }
 
-        @Override
-        public String readLine() throws IOError {
-            try {
-                return input.readUserLine();
-            } catch (IOException ex) {
-                throw new IOError(ex);
-            }
-        }
-
         @Override
         public char[] readPassword(String prompt) {
             try {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java b/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java
index 09e0c25b974..d0792f7bdd0 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/JShellConsole.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
@@ -76,21 +76,6 @@ public interface JShellConsole {
      */
     public String readLine(String prompt) throws IOError;
 
-    /**
-     * Reads a single line of text from the console.
-     *
-     * @throws IOError
-     *         If an I/O error occurs.
-     *
-     * @return  A string containing the line read from the console, not
-     *          including any line-termination characters, or {@code null}
-     *          if an end of stream has been reached.
-     * @see java.io.Console#readLine()
-     * @since 24
-     */
-    @PreviewFeature(feature=PreviewFeature.Feature.IMPLICIT_CLASSES)
-    public String readLine() throws IOError;
-
     /**
      * Provides a prompt, then reads a password or passphrase from
      * the console with echoing disabled.
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
index a697a37141e..529e60c65da 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -215,37 +215,6 @@ public JdkConsole print(Object obj) {
             return this;
         }
 
-        /**
-         * {@inheritDoc}
-         *
-         * @throws IOError {@inheritDoc}
-         */
-        @Override
-        public String readln(String prompt) {
-            char[] chars = (prompt == null ? "null" : prompt).toCharArray();
-
-            try {
-                return sendAndReceive(() -> {
-                    remoteInput.write(Task.READ_LINE.ordinal());
-                    sendChars(chars, 0, chars.length);
-                    char[] line = readChars();
-                    return new String(line);
-                });
-            } catch (IOException ex) {
-                throw new IOError(ex);
-            }
-        }
-
-        /**
-         * {@inheritDoc}
-         *
-         * @throws IOError {@inheritDoc}
-         */
-        @Override
-        public String readln() {
-            return readLine();
-        }
-
         /**
          * {@inheritDoc}
          */
@@ -285,15 +254,7 @@ public String readLine(Locale locale, String format, Object... args) {
          */
         @Override
         public String readLine() {
-            try {
-                return sendAndReceive(() -> {
-                    remoteInput.write(Task.READ_LINE_NO_PROMPT.ordinal());
-                    char[] line = readChars();
-                    return new String(line);
-                });
-            } catch (IOException ex) {
-                throw new IOError(ex);
-            }
+            return readLine(Locale.getDefault(Locale.Category.FORMAT), "");
         }
 
         /**
@@ -432,12 +393,6 @@ public synchronized void write(int b) throws IOException {
                         bp = 0;
                     }
                 }
-                case READ_LINE_NO_PROMPT -> {
-                    String line = console.readLine();
-                    char[] chars = line.toCharArray();
-                    sendChars(sinkOutput, chars, 0, chars.length);
-                    bp = 0;
-                }
                 case READ_PASSWORD -> {
                     char[] data = readCharsOrNull(1);
                     if (data != null) {
@@ -516,7 +471,6 @@ private enum Task {
         FLUSH_OUTPUT,
         READ_CHARS,
         READ_LINE,
-        READ_LINE_NO_PROMPT,
         READ_PASSWORD,
         FLUSH_CONSOLE,
         CHARSET,
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
index 975d1215535..4644ac86386 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
+++ b/src/jdk.jshell/share/classes/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
@@ -1,2 +1 @@
 import module java.base;
-import static java.io.IO.*;
diff --git a/test/jdk/java/io/IO/IO.java b/test/jdk/java/lang/IO/IO.java
similarity index 91%
rename from test/jdk/java/io/IO/IO.java
rename to test/jdk/java/lang/IO/IO.java
index adbe3e6d8f6..dbb83db5f80 100644
--- a/test/jdk/java/io/IO/IO.java
+++ b/test/jdk/java/lang/IO/IO.java
@@ -50,8 +50,8 @@
 
 /*
  * @test
- * @bug 8305457 8342936 8351435
- * @summary java.io.IO tests
+ * @bug 8305457 8342936 8351435 8344706
+ * @summary java.lang.IO tests
  * @library /test/lib
  * @modules jdk.internal.le
  * @run junit IO
@@ -184,15 +184,12 @@ public void printlnNoParamsTest() throws Exception {
         var file = Path.of("PrintlnNoParams.java");
         try (Writer w = Files.newBufferedWriter(file)) {
             w.write("""
+                    import static java.lang.IO.*;
                     void main() {
                         print("1 ");
                         print("2 ");
                         print("3 ");
                         println();
-                        System.console().print("1 ");
-                        System.console().print("2 ");
-                        System.console().print("3 ");
-                        System.console().println();
                     }
                     """);
         }
@@ -203,23 +200,10 @@ void main() {
         output.reportDiagnosticSummary();
         String out = output.getStdout();
         String nl = System.getProperty("line.separator");
-        assertEquals("1 2 3 " + nl + "1 2 3 " + nl, out);
+        assertEquals("1 2 3 " + nl, out);
     }
 
 
-    @ParameterizedTest
-    @ValueSource(strings = {"println", "print", "input"})
-    public void nullConsole(String method) throws Exception {
-        var file = Path.of(System.getProperty("test.src", "."), "Methods.java")
-                .toAbsolutePath().toString();
-        var pb = ProcessTools.createTestJavaProcessBuilder("-Djdk.console=gibberish",
-                "--enable-preview", file, method);
-        OutputAnalyzer output = ProcessTools.executeProcess(pb);
-        output.reportDiagnosticSummary();
-        assertEquals(1, output.getExitValue());
-        output.shouldContain("Exception in thread \"main\" java.io.IOError");
-    }
-
 
     // adapted from https://junit.org/junit5/docs/current/user-guide/#extensions-lifecycle-callbacks-timing-extension
     // remove after CODETOOLS-7903752 propagates to jtreg that this test is routinely run by
diff --git a/test/jdk/java/io/IO/Input.java b/test/jdk/java/lang/IO/Input.java
similarity index 92%
rename from test/jdk/java/io/IO/Input.java
rename to test/jdk/java/lang/IO/Input.java
index 1a62fb77166..a073b2583f4 100644
--- a/test/jdk/java/io/IO/Input.java
+++ b/test/jdk/java/lang/IO/Input.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 @@
 
 import java.io.IOException;
 
-import static java.io.IO.readln;
+import static java.lang.IO.readln;
 
 public class Input {
 
diff --git a/test/jdk/java/io/IO/Methods.java b/test/jdk/java/lang/IO/Methods.java
similarity index 92%
rename from test/jdk/java/io/IO/Methods.java
rename to test/jdk/java/lang/IO/Methods.java
index c1700241b32..b03bbf95462 100644
--- a/test/jdk/java/io/IO/Methods.java
+++ b/test/jdk/java/lang/IO/Methods.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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static java.io.IO.*;
+import static java.lang.IO.*;
 
 public class Methods {
 
diff --git a/test/jdk/java/io/IO/Output.java b/test/jdk/java/lang/IO/Output.java
similarity index 94%
rename from test/jdk/java/io/IO/Output.java
rename to test/jdk/java/lang/IO/Output.java
index 38d37fa9f41..52a310584ab 100644
--- a/test/jdk/java/io/IO/Output.java
+++ b/test/jdk/java/lang/IO/Output.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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static java.io.IO.*;
+import static java.lang.IO.*;
 import java.util.function.Consumer;
 
 public class Output {
diff --git a/test/jdk/java/io/IO/input-no-prompt.exp b/test/jdk/java/lang/IO/input-no-prompt.exp
similarity index 93%
rename from test/jdk/java/io/IO/input-no-prompt.exp
rename to test/jdk/java/lang/IO/input-no-prompt.exp
index 20cd481912b..cfb03aea254 100644
--- a/test/jdk/java/io/IO/input-no-prompt.exp
+++ b/test/jdk/java/lang/IO/input-no-prompt.exp
@@ -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
diff --git a/test/jdk/java/io/IO/input.exp b/test/jdk/java/lang/IO/input.exp
similarity index 93%
rename from test/jdk/java/io/IO/input.exp
rename to test/jdk/java/lang/IO/input.exp
index 6f17a1379ec..9899373faff 100644
--- a/test/jdk/java/io/IO/input.exp
+++ b/test/jdk/java/lang/IO/input.exp
@@ -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
diff --git a/test/jdk/java/io/IO/output.exp b/test/jdk/java/lang/IO/output.exp
similarity index 94%
rename from test/jdk/java/io/IO/output.exp
rename to test/jdk/java/lang/IO/output.exp
index a792b8791a4..e04c1e53403 100644
--- a/test/jdk/java/io/IO/output.exp
+++ b/test/jdk/java/lang/IO/output.exp
@@ -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
diff --git a/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.java b/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.java
index 42579a8eba9..acf0c848b43 100644
--- a/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.java
+++ b/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.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 8333086
+ * @bug 8333086 8344706
  * @summary Verify the JLine backend is not initialized for simple printing.
  * @enablePreview
  * @modules jdk.internal.le/jdk.internal.org.jline.reader
@@ -32,7 +32,6 @@
  * @run main LazyJdkConsoleProvider
  */
 
-import java.io.IO;
 import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.terminal.Terminal;
 
@@ -44,8 +43,8 @@ public class LazyJdkConsoleProvider {
     public static void main(String... args) throws Throwable {
         switch (args.length > 0 ? args[0] : "default") {
             case "write" -> {
-                System.console().println("Hello!");
-                System.console().print("Hello!");
+                System.console().printf("Hello!\n");
+                System.console().printf("Hello!");
                 System.console().format("\nHello!\n");
                 System.console().flush();
                 IO.println("Hello!");
@@ -66,7 +65,7 @@ record TestCase(String testKey, String expected, String notExpected) {}
         TestCase[] testCases = new TestCase[] {
             new TestCase("write", null, Terminal.class.getName()),
             new TestCase("read", LineReader.class.getName(), null),
-            new TestCase("IO-read", LineReader.class.getName(), null)
+            new TestCase("IO-read", null, Terminal.class.getName())
         };
         for (TestCase tc : testCases) {
             ProcessBuilder builder =
diff --git a/test/jdk/tools/launcher/Arrrghs.java b/test/jdk/tools/launcher/Arrrghs.java
index efc95052842..d922ce7eafc 100644
--- a/test/jdk/tools/launcher/Arrrghs.java
+++ b/test/jdk/tools/launcher/Arrrghs.java
@@ -563,16 +563,16 @@ void testMainMethod() throws FileNotFoundException {
         if (!tr.testStatus)
             System.out.println(tr);
 
-        // incorrect method type - non-static
+        // non-static method type
          createJar(new File("some.jar"), new File("Foo"),
                 "public void main(String[] args){}");
         tr = doExec(javaCmd, "-jar", "some.jar");
-        tr.contains("Error: Main method not found in class Foo");
+        tr.checkPositive();
         if (!tr.testStatus)
             System.out.println(tr);
         // use classpath to check
         tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
-        tr.contains("Error: Main method not found in class Foo");
+        tr.checkPositive();
         if (!tr.testStatus)
             System.out.println(tr);
 
diff --git a/test/langtools/jdk/jshell/ConsoleTest.java b/test/langtools/jdk/jshell/ConsoleTest.java
index 4aedc061939..cf282389261 100644
--- a/test/langtools/jdk/jshell/ConsoleTest.java
+++ b/test/langtools/jdk/jshell/ConsoleTest.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
@@ -23,9 +23,8 @@
 
 /*
  * @test
- * @bug 8298425
+ * @bug 8298425 8344706
  * @summary Verify behavior of System.console()
- * @enablePreview
  * @build KullaTesting TestingInputStream
  * @run testng ConsoleTest
  */
@@ -68,13 +67,6 @@ public String readLine(String prompt) throws IOError {
             }
         };
         assertEval("System.console().readLine(\"expected\")", "\"AB\"");
-        console = new ThrowingJShellConsole() {
-            @Override
-            public String readLine() throws IOError {
-                return "AB";
-            }
-        };
-        assertEval("System.console().readLine()", "\"AB\"");
         console = new ThrowingJShellConsole() {
             @Override
             public char[] readPassword(String prompt) throws IOError {
@@ -218,10 +210,6 @@ public String readLine(String prompt) throws IOError {
                 return console.readLine(prompt);
             }
             @Override
-            public String readLine() throws IOError {
-                return console.readLine();
-            }
-            @Override
             public char[] readPassword(String prompt) throws IOError {
                 return console.readPassword(prompt);
             }
@@ -252,10 +240,6 @@ public String readLine(String prompt) throws IOError {
             throw new IllegalStateException("Not expected!");
         }
         @Override
-        public String readLine() throws IOError {
-            throw new IllegalStateException("Not expected!");
-        }
-        @Override
         public char[] readPassword(String prompt) throws IOError {
             throw new IllegalStateException("Not expected!");
         }
diff --git a/test/langtools/jdk/jshell/ConsoleToolTest.java b/test/langtools/jdk/jshell/ConsoleToolTest.java
index 0af85a61862..a1d9a612ae5 100644
--- a/test/langtools/jdk/jshell/ConsoleToolTest.java
+++ b/test/langtools/jdk/jshell/ConsoleToolTest.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 8341631
+ * @bug 8331535 8341631 8344706
  * @summary Test the JShell tool Console handling
  * @modules jdk.internal.le/jdk.internal.org.jline.reader
  *          jdk.jshell/jdk.internal.jshell.tool:+open
@@ -59,33 +59,37 @@ public void testOutput() {
     @Test //JDK-8341631
     public void testIO() {
         test(new String[] {"--enable-preview"},
-             a -> {assertCommandWithOutputAndTerminal(a,
-                                                      "java.io.IO.readln(\"%%s\");\ninput", //newline automatically appended
+             a -> {assertCommandWithOutputAndInput(a,
+                                                      "java.lang.IO.readln(\"%%s\");",
+                                                      "input\n",
                                                       "$1 ==> \"input\"",
+                                                      "%%s",
                                                       """
-                                                      \u0005java.io.IO.readln(\"%%s\");
-                                                      %%sinput
+                                                      \u0005java.lang.IO.readln(\"%%s\");
                                                       """);},
-             a -> {assertCommandWithOutputAndTerminal(a,
-                                                      "java.io.IO.readln();\ninput!", //newline automatically appended
+             a -> {assertCommandWithOutputAndInput(a,
+                                                      "java.lang.IO.readln();",
+                                                      "input!\n",
                                                       "$2 ==> \"input!\"",
+                                                      "",
                                                       """
-                                                      \u0005java.io.IO.readln();
-                                                      input!
+                                                      \u0005java.lang.IO.readln();
                                                       """);},
-             a -> {assertCommandWithOutputAndTerminal(a,
-                                                      "java.io.IO.println(\"Hello, World!\");",
+             a -> {assertCommandWithOutputAndInput(a,
+                                                      "java.lang.IO.println(\"Hello, World!\");",
+                                                      "",
                                                       "",
+                                                      "Hello, World!\n",
                                                       """
-                                                      \u0005java.io.IO.println(\"Hello, World!\");
-                                                      Hello, World!
+                                                      \u0005java.lang.IO.println(\"Hello, World!\");
                                                       """);},
-             a -> {assertCommandWithOutputAndTerminal(a,
-                                                      "java.io.IO.println();",
+             a -> {assertCommandWithOutputAndInput(a,
+                                                      "java.lang.IO.println();",
+                                                      "",
                                                       "",
+                                                      "\n",
                                                       """
-                                                      \u0005java.io.IO.println();
-
+                                                      \u0005java.lang.IO.println();
                                                       """);}
             );
     }
@@ -94,4 +98,8 @@ void assertCommandWithOutputAndTerminal(boolean a, String command, String out, S
         assertCommand(a, command, out, null, null, null, null, terminalOut);
     }
 
+    void assertCommandWithOutputAndInput(boolean a, String command, String input, String out, String print, String terminalOut) {
+        assertCommand(a, command, out, null, input, print, null, terminalOut);
+    }
+
 }
diff --git a/test/langtools/jdk/jshell/StartOptionTest-module-patch/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh b/test/langtools/jdk/jshell/StartOptionTest-module-patch/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
new file mode 100644
index 00000000000..0146b8af81d
--- /dev/null
+++ b/test/langtools/jdk/jshell/StartOptionTest-module-patch/jdk/jshell/tool/resources/PREVIEW_DEFAULT.jsh
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+//a patched version of PREVIEW_DEFAULT.jsh, used to verify the correct resource
+//is selected when needed:
+void sayHello() {
+    System.out.println("Hello!");
+}
diff --git a/test/langtools/jdk/jshell/StartOptionTest.java b/test/langtools/jdk/jshell/StartOptionTest.java
index 25486d6da6e..0d6a9d0d65f 100644
--- a/test/langtools/jdk/jshell/StartOptionTest.java
+++ b/test/langtools/jdk/jshell/StartOptionTest.java
@@ -22,7 +22,8 @@
  */
 
  /*
- * @test 8151754 8080883 8160089 8170162 8166581 8172102 8171343 8178023 8186708 8179856 8185840 8190383 8341631 8341833
+ * @test
+ * @bug 8151754 8080883 8160089 8170162 8166581 8172102 8171343 8178023 8186708 8179856 8185840 8190383 8341631 8341833 8344706
  * @summary Testing startExCe-up options.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -31,7 +32,7 @@
  *          jdk.jshell/jdk.internal.jshell.tool.resources:+open
  * @library /tools/lib
  * @build Compiler toolbox.ToolBox
- * @run testng StartOptionTest
+ * @run testng/othervm --patch-module jdk.jshell=${test.src}/StartOptionTest-module-patch StartOptionTest
  */
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -421,7 +422,7 @@ public void testShowVersion() {
                 "--show-version");
     }
 
-    public void testSourceLevel() {
+    public void testPreviewEnabled() {
         String fn = writeToFile(
                 """
                 System.out.println(\"prefix\");
@@ -431,8 +432,6 @@ public void testSourceLevel() {
                 """);
         startCheckUserOutput(s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
                              fn);
-        startCheckUserOutput(s -> assertEquals(s, "prefix\njava.lang.invoke.MethodHandle\nsuffix\n"),
-                             "--enable-preview", fn);
         String fn24 = writeToFile(
                 """
                 System.out.println(\"test\");
@@ -447,20 +446,25 @@ public void testSourceLevel() {
         //JDK-8341631:
         String fn2 = writeToFile(
                 """
-                System.out.println(\"test\");
+                System.out.println(\"prefix\");
+                IO.println(\"test\");
+                System.out.println(\"suffix\");
                 /exit
                 """);
-        startCheckUserOutput(s -> assertEquals(s, "test\n"),
+        startCheckUserOutput(s -> assertEquals(s, "prefix\ntest\nsuffix\n"),
                              fn2);
+        //verify the correct resource is selected when --enable-preview, relies on
+        //--patch-module jdk.jshell=${test.src}/StartOptionTest-module-patch
         String fn2Preview = writeToFile(
                 """
                 System.out.println(\"prefix\");
-                IO.println(\"test\");
+                sayHello();
                 System.out.println(\"suffix\");
                 /exit
                 """);
-        startCheckUserOutput(s -> assertEquals(s, "prefix\ntest\nsuffix\n"),
-                             "--enable-preview", fn2Preview);
+        startCheckUserOutput(s -> assertEquals(s, "prefix\nHello!\nsuffix\n"),
+                             "--enable-preview", fn2Preview,
+                             "-");
 
         testPersistence = new HashMap<>();
 
diff --git a/test/langtools/jdk/jshell/ToolProviderTest.java b/test/langtools/jdk/jshell/ToolProviderTest.java
index 79bc1528a83..1a600efe737 100644
--- a/test/langtools/jdk/jshell/ToolProviderTest.java
+++ b/test/langtools/jdk/jshell/ToolProviderTest.java
@@ -43,7 +43,7 @@
  *          jdk.jshell/jdk.internal.jshell.tool.resources:+open
  * @library /tools/lib
  * @build Compiler toolbox.ToolBox
- * @run testng ToolProviderTest
+ * @run testng/othervm --patch-module jdk.jshell=${test.src}/StartOptionTest-module-patch ToolProviderTest
  */
 @Test
 public class ToolProviderTest extends StartOptionTest {
diff --git a/test/langtools/tools/javac/ImplicitClass/ErrorRecovery.java b/test/langtools/tools/javac/ImplicitClass/ErrorRecovery.java
index 883580893af..ed02e050ac8 100644
--- a/test/langtools/tools/javac/ImplicitClass/ErrorRecovery.java
+++ b/test/langtools/tools/javac/ImplicitClass/ErrorRecovery.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 8338301
+ * @bug 8338301 8344706
  * @summary Verify error recovery and reporting related to implicitly declared classes
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -78,8 +78,7 @@ public void testMethodNoReturnType(Path base) throws Exception {
         Files.createDirectories(classes);
 
         List<String> log = new JavacTask(tb)
-            .options("-XDrawDiagnostics",
-                     "--enable-preview", "--release", SOURCE_VERSION)
+            .options("-XDrawDiagnostics")
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.FAIL)
@@ -87,8 +86,6 @@ public void testMethodNoReturnType(Path base) throws Exception {
             .getOutputLines(OutputKind.DIRECT);
         List<String> expected = List.of(
             "Test.java:1:1: compiler.err.invalid.meth.decl.ret.type.req",
-            "- compiler.note.preview.filename: Test.java, DEFAULT",
-            "- compiler.note.preview.recompile",
             "1 error"
         );
         if (!Objects.equals(expected, log)) {
@@ -111,8 +108,7 @@ public void testStatement(Path base) throws Exception {
 
         List<String> log = new JavacTask(tb)
             .options("-XDrawDiagnostics",
-                     "-XDshould-stop.at=FLOW",
-                     "--enable-preview", "--release", SOURCE_VERSION)
+                     "-XDshould-stop.at=FLOW")
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.FAIL)
@@ -142,8 +138,7 @@ class C {};
         Files.createDirectories(classes);
 
         new JavacTask(tb)
-            .options("-XDrawDiagnostics",
-                     "--enable-preview", "--release", SOURCE_VERSION)
+            .options("-XDrawDiagnostics")
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.SUCCESS)
@@ -166,8 +161,7 @@ public void testVeryBroken(Path base) throws Exception {
         List<String> expected;
 
         log = new JavacTask(tb)
-                .options("-XDrawDiagnostics",
-                        "--enable-preview", "--release", SOURCE_VERSION)
+                .options("-XDrawDiagnostics")
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -191,7 +185,7 @@ public void testVeryBroken(Path base) throws Exception {
                 .writeAll()
                 .getOutputLines(OutputKind.DIRECT);
         expected = List.of(
-                "Test.java:1:1: compiler.err.expected4: class, interface, enum, record",
+                "Test.java:1:1: compiler.err.class.method.or.field.expected",
                 "1 error"
         );
 
diff --git a/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.java b/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.java
index 0057d779f8c..4998a342eae 100644
--- a/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.java
+++ b/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.java
@@ -1,6 +1,7 @@
 /**
  * @test /nodynamiccopyright/
- * @compile/fail/ref=ImplicitClassRecovery.out -XDrawDiagnostics --enable-preview --source ${jdk.version} ImplicitClassRecovery.java
+ * @bug 8344706
+ * @compile/fail/ref=ImplicitClassRecovery.out -XDrawDiagnostics ImplicitClassRecovery.java
  */
 public void main() {
     //the following is intentionally missing a semicolon:
diff --git a/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.out b/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.out
index 7de6ac6b3ee..c9fca33b9bc 100644
--- a/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.out
+++ b/test/langtools/tools/javac/ImplicitClass/ImplicitClassRecovery.out
@@ -1,4 +1,2 @@
-ImplicitClassRecovery.java:7:33: compiler.err.expected: ';'
-- compiler.note.preview.filename: ImplicitClassRecovery.java, DEFAULT
-- compiler.note.preview.recompile
+ImplicitClassRecovery.java:8:33: compiler.err.expected: ';'
 1 error
diff --git a/test/langtools/tools/javac/ImplicitClass/ImplicitImports.java b/test/langtools/tools/javac/ImplicitClass/ImplicitImports.java
index 1362864d8fe..aefe7d36357 100644
--- a/test/langtools/tools/javac/ImplicitClass/ImplicitImports.java
+++ b/test/langtools/tools/javac/ImplicitClass/ImplicitImports.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 8325324
+ * @bug 8325324 8344706
  * @summary Verify behavior w.r.t. implicit imports
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -82,7 +82,6 @@ public static void main(String... args) {
 
         {//with --release:
             new JavacTask(tb)
-                .options("--enable-preview", "--release", SOURCE_VERSION)
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.SUCCESS)
@@ -91,7 +90,6 @@ public static void main(String... args) {
             var out = new JavaTask(tb)
                     .classpath(classes.toString())
                     .className("Test")
-                    .vmOptions("--enable-preview")
                     .run()
                     .writeAll()
                     .getOutputLines(Task.OutputKind.STDOUT);
@@ -107,7 +105,6 @@ public static void main(String... args) {
 
         {//with --source:
             new JavacTask(tb)
-                .options("--enable-preview", "--source", SOURCE_VERSION)
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.SUCCESS)
@@ -116,7 +113,6 @@ public static void main(String... args) {
             var out = new JavaTask(tb)
                     .classpath(classes.toString())
                     .className("Test")
-                    .vmOptions("--enable-preview")
                     .run()
                     .writeAll()
                     .getOutputLines(Task.OutputKind.STDOUT);
@@ -132,11 +128,9 @@ public static void main(String... args) {
     }
 
     @Test
-    public void testImplicitSimpleIOImport(Path base) throws Exception {
+    public void testNoImplicitSimpleIOImport(Path base) throws Exception {
         Path current = base.resolve(".");
 
-        Path patchClasses = prepareIOPatch(current);
-
         Path src = current.resolve("src");
         Path classes = current.resolve("classes");
         tb.writeFile(src.resolve("Test.java"),
@@ -148,28 +142,21 @@ public static void main(String... args) {
 
         Files.createDirectories(classes);
 
-        new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION,
-                     "--patch-module", "java.base=" + patchClasses)
-            .outdir(classes)
-            .files(tb.findJavaFiles(src))
-            .run(Task.Expect.SUCCESS)
-            .writeAll();
-
-        var out = new JavaTask(tb)
-                .classpath(classes.toString())
-                .className("Test")
-                .vmOptions("--enable-preview",
-                           "--patch-module", "java.base=" + patchClasses)
-                .run()
+        var log = new JavacTask(tb)
+                .options("-XDrawDiagnostics")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.FAIL)
                 .writeAll()
-                .getOutputLines(Task.OutputKind.STDOUT);
+                .getOutputLines(OutputKind.DIRECT);
 
-        var expectedOut = List.of("Hello, World!");
+        var expectedLog = List.of(
+            "Test.java:2:5: compiler.err.cant.resolve.location.args: kindname.method, println, , java.lang.String, (compiler.misc.location: kindname.class, Test, null)",
+            "1 error");
 
-        if (!Objects.equals(expectedOut, out)) {
-            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
-                                      ", actual: " + out);
+        if (!Objects.equals(expectedLog, log)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedLog +
+                                      ", actual: " + log);
 
         }
     }
@@ -177,9 +164,6 @@ public static void main(String... args) {
     @Test
     public void testNoImplicitImportsForOrdinaryClasses(Path base) throws Exception {
         Path current = base.resolve(".");
-
-        Path patchClasses = prepareIOPatch(current);
-
         Path src = current.resolve("src");
         Path classes = current.resolve("classes");
         tb.writeFile(src.resolve("Test.java"),
@@ -195,9 +179,7 @@ public static void main(String... args) {
         Files.createDirectories(classes);
 
         var log = new JavacTask(tb)
-                .options("--enable-preview", "--release", SOURCE_VERSION,
-                        "--patch-module", "java.base=" + patchClasses,
-                        "-XDrawDiagnostics")
+                .options("-XDrawDiagnostics")
                 .outdir(classes)
                 .files(tb.findJavaFiles(src))
                 .run(Task.Expect.FAIL)
@@ -218,31 +200,6 @@ public static void main(String... args) {
         }
     }
 
-    private Path prepareIOPatch(Path base) throws IOException {
-        Path patchSrc = base.resolve("patch-src");
-        Path patchClasses = base.resolve("patch-classes");
-        tb.writeJavaFiles(patchSrc,
-                          """
-                          package java.io;
-                          public class IO {
-                              public static void println(Object o) {
-                                  System.out.println(o);
-                              }
-                          }
-                          """);
-
-        Files.createDirectories(patchClasses);
-
-        new JavacTask(tb)
-            .options("--patch-module", "java.base=" + patchSrc)
-            .outdir(patchClasses)
-            .files(tb.findJavaFiles(patchSrc))
-            .run(Task.Expect.SUCCESS)
-            .writeAll();
-
-        return patchClasses;
-    }
-
     @Test
     public void testWithExplicitImport(Path base) throws Exception {
         Path current = base.resolve(".");
@@ -260,7 +217,6 @@ public static void main(String... args) {
         Files.createDirectories(classes);
 
         new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION)
             .outdir(classes)
             .files(tb.findJavaFiles(src))
             .run(Task.Expect.SUCCESS)
@@ -269,7 +225,6 @@ public static void main(String... args) {
         var out = new JavaTask(tb)
                 .classpath(classes.toString())
                 .className("Test")
-                .vmOptions("--enable-preview")
                 .run()
                 .writeAll()
                 .getOutputLines(Task.OutputKind.STDOUT);
diff --git a/test/langtools/tools/javac/ImplicitClass/NestedClasses.java b/test/langtools/tools/javac/ImplicitClass/NestedClasses.java
index 19f070c4d48..4abddacddc8 100644
--- a/test/langtools/tools/javac/ImplicitClass/NestedClasses.java
+++ b/test/langtools/tools/javac/ImplicitClass/NestedClasses.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,8 +23,7 @@
 
 /*
  * @test
- * @bug 8315458
- * @enablePreview
+ * @bug 8315458 8344706
  * @summary Make sure nesting classes don't create symbol conflicts with implicit name.
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -77,7 +76,7 @@ static void compPass(String fileName, String code) throws IOException {
         String output = new JavacTask(TOOLBOX)
                 .files(List.of(path))
                 .classpath(".")
-                .options("-encoding", "utf8", "--enable-preview", "-source", JAVA_VERSION)
+                .options("-encoding", "utf8")
                 .run()
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
@@ -96,7 +95,7 @@ static void compFail(String fileName, String code) throws IOException {
         String output = new JavacTask(TOOLBOX)
                 .files(List.of(path))
                 .classpath(".")
-                .options("-XDrawDiagnostics", "-encoding", "utf8", "--enable-preview", "-source", JAVA_VERSION)
+                .options("-XDrawDiagnostics", "-encoding", "utf8")
                 .run(Task.Expect.FAIL)
                 .writeAll()
                 .getOutput(Task.OutputKind.DIRECT);
diff --git a/test/langtools/tools/javac/ImplicitClass/NestedEnum.java b/test/langtools/tools/javac/ImplicitClass/NestedEnum.java
index 75d4e63f6ab..014612054fa 100644
--- a/test/langtools/tools/javac/ImplicitClass/NestedEnum.java
+++ b/test/langtools/tools/javac/ImplicitClass/NestedEnum.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,8 +23,8 @@
 
 /*
  * @test
+ * @bug 8344706
  * @summary enums: ensure unnamed class is visible to java.lang.Enum<unnamed_class>
- * @enablePreview
  * @compile NestedEnum.java
  */
 
diff --git a/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.java b/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.java
index 786c228f11e..5dce53f4dd0 100644
--- a/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.java
+++ b/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.java
@@ -1,8 +1,8 @@
 /**
  * @test /nodynamiccopyright/
- * @bug 8310314
+ * @bug 8310314 8344706
  * @summary Ensure proper error position for the "implicit classes not supported" error
- * @compile/fail/ref=SourceLevelErrorPosition.out -XDrawDiagnostics SourceLevelErrorPosition.java
+ * @compile/fail/ref=SourceLevelErrorPosition.out --release 24 -XDrawDiagnostics SourceLevelErrorPosition.java
  */
 class Nested {}
 void main() {
diff --git a/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.out b/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.out
index 1376183d9c6..83e35474f47 100644
--- a/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.out
+++ b/test/langtools/tools/javac/ImplicitClass/SourceLevelErrorPosition.out
@@ -1,2 +1,2 @@
-SourceLevelErrorPosition.java:8:1: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.implicit.classes)
+SourceLevelErrorPosition.java:8:1: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.implicit.classes), 24, 25
 1 error
diff --git a/test/langtools/tools/javac/ImplicitClass/TestImplicitClass.java b/test/langtools/tools/javac/ImplicitClass/TestImplicitClass.java
index 673c31b6215..8bb666e2bd2 100644
--- a/test/langtools/tools/javac/ImplicitClass/TestImplicitClass.java
+++ b/test/langtools/tools/javac/ImplicitClass/TestImplicitClass.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,8 +23,7 @@
 
 /*
  * @test
- * @bug 8315458
- * @enablePreview
+ * @bug 8315458 8344706
  * @build Implicit TestImplicitClass
  * @run main TestImplicitClass
  * @summary Basic checks of java.lang.Class support for implicit classes
diff --git a/test/langtools/tools/javac/T8036019.out b/test/langtools/tools/javac/T8036019.out
index 2c874175793..b940093a57f 100644
--- a/test/langtools/tools/javac/T8036019.out
+++ b/test/langtools/tools/javac/T8036019.out
@@ -5,6 +5,6 @@ T8036019.java:40:24: compiler.err.expected2: >, ','
 T8036019.java:40:26: compiler.err.expected: token.identifier
 T8036019.java:40:32: compiler.err.expected: token.identifier
 T8036019.java:43:25: compiler.err.annotation.missing.element.value
-T8036019.java:43:27: compiler.err.expected4: class, interface, enum, record
-T8036019.java:46:1: compiler.err.expected4: class, interface, enum, record
+T8036019.java:43:27: compiler.err.class.method.or.field.expected
+T8036019.java:46:1: compiler.err.class.method.or.field.expected
 9 errors
\ No newline at end of file
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
index d202af7bd77..4b28708932d 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out
@@ -1,7 +1,7 @@
 AnnotatedImport.java:10:13: compiler.err.expected: token.identifier
-AnnotatedImport.java:10:16: compiler.err.expected4: class, interface, enum, record
-AnnotatedImport.java:11:1: compiler.err.expected4: class, interface, enum, record
-AnnotatedImport.java:11:11: compiler.err.expected4: class, interface, enum, record
-AnnotatedImport.java:12:1: compiler.err.expected4: class, interface, enum, record
-AnnotatedImport.java:12:21: compiler.err.expected4: class, interface, enum, record
+AnnotatedImport.java:10:16: compiler.err.class.method.or.field.expected
+AnnotatedImport.java:11:1: compiler.err.class.method.or.field.expected
+AnnotatedImport.java:11:11: compiler.err.class.method.or.field.expected
+AnnotatedImport.java:12:1: compiler.err.class.method.or.field.expected
+AnnotatedImport.java:12:21: compiler.err.class.method.or.field.expected
 6 errors
diff --git a/test/langtools/tools/javac/attr/AttrRecoveryTest.java b/test/langtools/tools/javac/attr/AttrRecoveryTest.java
index f5589a8093f..d4455a656ce 100644
--- a/test/langtools/tools/javac/attr/AttrRecoveryTest.java
+++ b/test/langtools/tools/javac/attr/AttrRecoveryTest.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
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8273039
+ * @bug 8273039 8344706
  * @summary Verify error recovery in Attr
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -84,7 +84,7 @@ public class Test {
                          """,
                          "java.lang.Deprecated",
                          "Test.java:2:30: compiler.err.dot.class.expected",
-                         "Test.java:2:51: compiler.err.expected4: class, interface, enum, record",
+                         "Test.java:2:51: compiler.err.class.method.or.field.expected",
                          "Test.java:2:26: compiler.err.unexpected.type: kindname.value, kindname.class",
                          "3 errors"),
             new TestCase("b",
@@ -95,7 +95,7 @@ public class Test {
                          """,
                          null,
                          "Test.java:2:30: compiler.err.dot.class.expected",
-                         "Test.java:2:39: compiler.err.expected4: class, interface, enum, record",
+                         "Test.java:2:39: compiler.err.class.method.or.field.expected",
                          "Test.java:2:26: compiler.err.unexpected.type: kindname.value, kindname.class",
                          "3 errors")
         };
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 39bcec33654..04a8b9b1a68 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -120,6 +120,7 @@ compiler.warn.illegal.char.for.encoding
 compiler.warn.incubating.modules                        # requires adjusted classfile
 compiler.warn.invalid.archive.file
 compiler.warn.invalid.utf8.in.classfile                 # bad class file
+compiler.warn.is.preview                                # difficult to produce reliably despite future changes to java.base
 compiler.warn.is.preview.reflective                     # difficult to produce reliably despite future changes to java.base
 compiler.warn.output.file.clash                         # this warning is not generated on Linux
 compiler.warn.override.bridge
diff --git a/test/langtools/tools/javac/diags/examples/Expected3.java b/test/langtools/tools/javac/diags/examples/Expected3.java
index 1a527034ff3..641c8bc0352 100644
--- a/test/langtools/tools/javac/diags/examples/Expected3.java
+++ b/test/langtools/tools/javac/diags/examples/Expected3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2023, 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
@@ -22,6 +22,7 @@
  */
 
 // key: compiler.err.expected3
-// options: --release 15
 
-int Expected3;
+public class Expected3 {
+    public void test(int i {}
+}
diff --git a/test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java b/test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java
index 88102faff97..d09af8071c4 100644
--- a/test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java
+++ b/test/langtools/tools/javac/diags/examples/IllegalStartOfStmt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, 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,6 +23,7 @@
 
 // key: compiler.err.illegal.start.of.stmt
 // key: compiler.err.expected4
+// options: --release 24
 
 class IllegalStartOfStmt {
     void m() {
diff --git a/test/langtools/tools/javac/diags/examples/ImplicitClass.java b/test/langtools/tools/javac/diags/examples/ImplicitClass.java
index 30285293b18..a206c2f7717 100644
--- a/test/langtools/tools/javac/diags/examples/ImplicitClass.java
+++ b/test/langtools/tools/javac/diags/examples/ImplicitClass.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
@@ -22,9 +22,8 @@
  */
 
 // key: compiler.misc.feature.implicit.classes
-// key: compiler.warn.preview.feature.use.plural
-// key: compiler.warn.is.preview
-// options: -source ${jdk.version} --enable-preview -Xlint:preview
+// key: compiler.err.feature.not.supported.in.source.plural
+// options: --release 24
 
 public static void main(String... args) {
 }
diff --git a/test/langtools/tools/javac/diags/examples/ImplicitClassBad-Filename.java b/test/langtools/tools/javac/diags/examples/ImplicitClassBad-Filename.java
index e3bc3d67783..35c4698df46 100644
--- a/test/langtools/tools/javac/diags/examples/ImplicitClassBad-Filename.java
+++ b/test/langtools/tools/javac/diags/examples/ImplicitClassBad-Filename.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
@@ -22,9 +22,6 @@
  */
 
  // key: compiler.err.bad.file.name
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // options: -source ${jdk.version} --enable-preview
 
 public static void main(String... args) {
 }
diff --git a/test/langtools/tools/javac/diags/examples/ImplicitClassHasPackage.java b/test/langtools/tools/javac/diags/examples/ImplicitClassHasPackage.java
index c90e0f3dfbc..d6493a54c76 100644
--- a/test/langtools/tools/javac/diags/examples/ImplicitClassHasPackage.java
+++ b/test/langtools/tools/javac/diags/examples/ImplicitClassHasPackage.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
@@ -22,9 +22,6 @@
  */
 
  // key: compiler.err.implicit.class.should.not.have.package.declaration
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // options: -source ${jdk.version} --enable-preview
 
 package implicit.classes;
 
diff --git a/test/langtools/tools/javac/diags/examples/ImplicitClassNoMain.java b/test/langtools/tools/javac/diags/examples/ImplicitClassNoMain.java
index 4c82341f5ac..45abf2cb7e1 100644
--- a/test/langtools/tools/javac/diags/examples/ImplicitClassNoMain.java
+++ b/test/langtools/tools/javac/diags/examples/ImplicitClassNoMain.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
@@ -22,9 +22,6 @@
  */
 
  // key: compiler.err.implicit.class.does.not.have.main.method
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
- // options: -source ${jdk.version} --enable-preview
 
 public void ordinaryMethod() {
 }
diff --git a/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java b/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java
index eb000276e14..2083f0751e7 100644
--- a/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.java
+++ b/test/langtools/tools/javac/launcher/BasicSourceLauncherTests.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
@@ -32,8 +32,7 @@
 
 /*
  * @test
- * @enablePreview
- * @bug 8304400
+ * @bug 8304400 8344706
  * @summary Test basic features of javac's source-code launcher
  * @modules jdk.compiler/com.sun.tools.javac.launcher
  * @run junit BasicSourceLauncherTests
@@ -98,7 +97,7 @@ void main() {
                 }
                 """);
 
-        var run = Run.of(hi, List.of("--enable-preview"), List.of());
+        var run = Run.of(hi, List.of(), List.of());
         assertAll("# " + run,
                 () -> assertLinesMatch(
                         """
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index 3676ced9535..c81a3f1393f 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.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 8192920 8204588 8246774 8248843 8268869 8235876 8328339 8335896
+ * @bug 8192920 8204588 8246774 8248843 8268869 8235876 8328339 8335896 8344706
  * @summary Test source launcher
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -283,6 +283,46 @@ void testSuccess(Path file, String expect) throws IOException {
         checkNull("exception", r.exception);
     }
 
+
+    @Test
+    public void testMainNoParams(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "package hello;\n" +
+            "import java.util.Arrays;\n" +
+            "class World {\n" +
+            "    public static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("hello").resolve("World.java"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testMainNotPublic(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "package hello;\n" +
+            "import java.util.Arrays;\n" +
+            "class World {\n" +
+            "    static void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("hello").resolve("World.java"), "Hello World! [1, 2, 3]\n");
+    }
+
+    @Test
+    public void testMainNotStatic(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            "package hello;\n" +
+            "import java.util.Arrays;\n" +
+            "class World {\n" +
+            "    public void main(String... args) {\n" +
+            "        System.out.println(\"Hello World! \" + Arrays.toString(args));\n" +
+            "    }\n" +
+            "}");
+        testSuccess(base.resolve("hello").resolve("World.java"), "Hello World! [1, 2, 3]\n");
+    }
+
     /*
      * Negative tests: such as cannot find or execute main method.
      */
@@ -302,7 +342,7 @@ public void testHelloWorldWithShebangJava(Path base) throws IOException {
             file + ":1: error: illegal character: '#'\n" +
             "#!/usr/bin/java --source " + thisVersion + "\n" +
             "^\n" +
-            file + ":1: error: class, interface, enum, or record expected\n" +
+            file + ":1: error: class, interface, annotation type, enum, record, method or field expected\n" +
             "#!/usr/bin/java --source " + thisVersion + "\n" +
             "  ^\n" +
             "2 errors\n",
@@ -516,7 +556,7 @@ public void testBadShebang(Path base) throws IOException {
             file + ":1: error: illegal character: '#'\n" +
             "#/usr/bin/java --source " + thisVersion + "\n" +
             "^\n" +
-            file + ":1: error: class, interface, enum, or record expected\n" +
+            file + ":1: error: class, interface, annotation type, enum, record, method or field expected\n" +
             "#/usr/bin/java --source " + thisVersion + "\n" +
             "  ^\n" +
             "2 errors\n",
@@ -567,27 +607,11 @@ public void testNoMain(Path base) throws IOException {
     @Test
     public void testMainBadParams(Path base) throws IOException {
         tb.writeJavaFiles(base,
-                "class BadParams { public static void main() { } }");
+                "class BadParams { public static void main(int n) { } }");
         testError(base.resolve("BadParams.java"), "",
                 "error: can't find main(String[]) method in class: BadParams");
     }
 
-    @Test
-    public void testMainNotPublic(Path base) throws IOException {
-        tb.writeJavaFiles(base,
-                "class NotPublic { static void main(String... args) { } }");
-        testError(base.resolve("NotPublic.java"), "",
-                "error: can't find main(String[]) method in class: NotPublic");
-    }
-
-    @Test
-    public void testMainNotStatic(Path base) throws IOException {
-        tb.writeJavaFiles(base,
-                "class NotStatic { public void main(String... args) { } }");
-        testError(base.resolve("NotStatic.java"), "",
-                "error: can't find main(String[]) method in class: NotStatic");
-    }
-
     @Test
     public void testMainNotVoid(Path base) throws IOException {
         tb.writeJavaFiles(base,
diff --git a/test/langtools/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java
index 40ab577a5d1..6a2850fc8dd 100644
--- a/test/langtools/tools/javac/parser/JavacParserTest.java
+++ b/test/langtools/tools/javac/parser/JavacParserTest.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326 8312093 8312204 8315452 8337976 8324859
+ * @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041 8253584 8246774 8256411 8256149 8259050 8266436 8267221 8271928 8275097 8293897 8295401 8304671 8310326 8312093 8312204 8315452 8337976 8324859 8344706
  * @summary tests error and diagnostics positions
  * @author  Jan Lahoda
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -1010,7 +1010,7 @@ void testVoidLambdaParameter() throws IOException {
     @Test //JDK-8065753
     void testWrongFirstToken() throws IOException {
         String code = "<";
-        String expectedErrors = "Test.java:1:1: compiler.err.expected4: class, interface, enum, record\n" +
+        String expectedErrors = "Test.java:1:1: compiler.err.class.method.or.field.expected\n" +
                                 "1 error\n";
         StringWriter out = new StringWriter();
         JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(out, fm, null,
@@ -2304,7 +2304,7 @@ void main() {
                       """;
         DiagnosticCollector<JavaFileObject> coll =
                 new DiagnosticCollector<>();
-        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, List.of("--enable-preview", "--source", System.getProperty("java.specification.version")),
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null,
                 null, Arrays.asList(new MyFileObject(code)));
         Trees trees = Trees.instance(ct);
         SourcePositions sp = trees.getSourcePositions();
diff --git a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
index 05d27bc67df..15ea81a7f16 100644
--- a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
+++ b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
@@ -1,3 +1,3 @@
 SingleCommaAnnotationValueFail.java:11:12: compiler.err.annotation.missing.element.value
-SingleCommaAnnotationValueFail.java:11:14: compiler.err.expected4: class, interface, enum, record
+SingleCommaAnnotationValueFail.java:11:14: compiler.err.class.method.or.field.expected
 2 errors
diff --git a/test/langtools/tools/javac/sealed/SealedCompilationTests.java b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
index 7cf63f5b2d5..17141ee3c67 100644
--- a/test/langtools/tools/javac/sealed/SealedCompilationTests.java
+++ b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
@@ -25,7 +25,7 @@
  * SealedCompilationTests
  *
  * @test
- * @bug 8246353 8273257 8294550 8347562
+ * @bug 8246353 8273257 8294550 8347562 8344706
  * @summary Negative compilation tests, and positive compilation (smoke) tests for sealed classes
  * @library /lib/combo /tools/lib
  * @modules
@@ -781,7 +781,7 @@ sealed class C permits Sub {}
             non/**/sealed class Sub extends C {}
             """
             )) {
-            assertFail("compiler.err.expected4", s);
+            assertFail("compiler.err.class.method.or.field.expected", s);
         }
     }
 
@@ -985,7 +985,7 @@ void testDoNotAllowSealedAnnotation() {
             non-sealed interface I extends A {}
             """
         )) {
-            assertFail("compiler.err.expected4", s);
+            assertFail("compiler.err.class.method.or.field.expected", s);
         }
     }
 
diff --git a/test/langtools/tools/javac/tree/TreePosTest.java b/test/langtools/tools/javac/tree/TreePosTest.java
index add1db72e29..0ae62ca940d 100644
--- a/test/langtools/tools/javac/tree/TreePosTest.java
+++ b/test/langtools/tools/javac/tree/TreePosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, 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
@@ -78,7 +78,10 @@
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
 import com.sun.tools.javac.tree.JCTree.JCCase;
+import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.tree.JCTree.JCImport;
+import com.sun.tools.javac.tree.JCTree.JCImportBase;
 import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
 import com.sun.tools.javac.tree.JCTree.JCNewClass;
 import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
@@ -87,6 +90,7 @@
 
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import static com.sun.tools.javac.util.Position.NOPOS;
+import java.util.stream.Stream;
 
 /**
  * Utility and test program to check validity of tree positions for tree nodes.
@@ -102,7 +106,7 @@
 
 /*
  * @test
- * @bug 6919889
+ * @bug 6919889 8344706
  * @summary assorted position errors in compiler syntax trees
  * OLD: -q -r -ef ./tools/javac/typeAnnotations -ef ./tools/javap/typeAnnotations -et ANNOTATED_TYPE .
  * @modules java.desktop
@@ -342,10 +346,18 @@ private static String getTagName(JCTree.Tag tag) {
      * Main class for testing assertions concerning tree positions for tree nodes.
      */
     private class PosTester extends TreeScanner {
+        private boolean compactSourceFile;
         void test(JCCompilationUnit tree) {
             sourcefile = tree.sourcefile;
             endPosTable = tree.endPositions;
             encl = new Info();
+            List<JCTree> nonImports = tree.defs
+                                          .stream()
+                                          .filter(t -> !(t instanceof JCImportBase))
+                                          .toList();
+            compactSourceFile = nonImports.size() == 1 &&
+                                nonImports.get(0) instanceof JCClassDecl classDecl &&
+                                tree.endPositions.getEndPos(classDecl) == NOPOS;
             tree.accept(this);
         }
 
@@ -369,7 +381,12 @@ public void scan(JCTree tree) {
                     // For this node, start , pos, and endpos should be all defined
                     check("start != NOPOS", encl, self, self.start != NOPOS);
                     check("pos != NOPOS", encl, self, self.pos != NOPOS);
-                    check("end != NOPOS", encl, self, self.end != NOPOS);
+                    boolean topLevelCompactClass = compactSourceFile &&
+                                                   encl.tree == null &&
+                                                   self.tag == CLASSDEF;
+                    if (!topLevelCompactClass) {
+                        check("end != NOPOS", encl, self, self.end != NOPOS);
+                    }
                     // The following should normally be ordered
                     // encl.start <= start <= pos <= end <= encl.end
                     // In addition, the position of the enclosing node should be
@@ -398,12 +415,14 @@ public void scan(JCTree tree) {
                         check("encl.pos <= start || end <= encl.pos",
                                 encl, self, encl.pos <= self.start || self.end <= encl.pos);
                     }
-                    check("pos <= end", encl, self, self.pos <= self.end);
+                    if (!topLevelCompactClass) {
+                        check("pos <= end", encl, self, self.pos <= self.end);
+                    }
                     if (!( (self.tag == TYPEARRAY || isAnnotatedArray(self.tree)) &&
                             (encl.tag == TYPEARRAY || isAnnotatedArray(encl.tree))
                            ||
                             encl.tag == MODIFIERS && self.tag == ANNOTATION
-                         ) ) {
+                         ) && !compactSourceFile) {
                         check("end <= encl.end", encl, self, self.end <= encl.end);
                     }
                 }

From 811f117ce396ac7aafd71f5618f2de96bb96f311 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 2 May 2025 08:28:57 +0000
Subject: [PATCH 241/901] 8355980: RISC-V: remove vmclr_m before vmsXX and
 vmfXX

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

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 0dc39744741..77b4e26cc92 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -3110,7 +3110,9 @@ void C2_MacroAssembler::compare_integral_v(VectorRegister vd, VectorRegister src
   assert(is_integral_type(bt), "unsupported element type");
   assert(vm == Assembler::v0_t ? vd != v0 : true, "should be different registers");
   vsetvli_helper(bt, vector_length);
-  vmclr_m(vd);
+  if (vm == Assembler::v0_t) {
+    vmclr_m(vd);
+  }
   switch (cond) {
     case BoolTest::eq: vmseq_vv(vd, src1, src2, vm); break;
     case BoolTest::ne: vmsne_vv(vd, src1, src2, vm); break;
@@ -3133,7 +3135,9 @@ void C2_MacroAssembler::compare_fp_v(VectorRegister vd, VectorRegister src1, Vec
   assert(is_floating_point_type(bt), "unsupported element type");
   assert(vm == Assembler::v0_t ? vd != v0 : true, "should be different registers");
   vsetvli_helper(bt, vector_length);
-  vmclr_m(vd);
+  if (vm == Assembler::v0_t) {
+    vmclr_m(vd);
+  }
   switch (cond) {
     case BoolTest::eq: vmfeq_vv(vd, src1, src2, vm); break;
     case BoolTest::ne: vmfne_vv(vd, src1, src2, vm); break;

From afb9134a31c326e90f2bb68ae17e32de9d1d7740 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 2 May 2025 11:40:19 +0000
Subject: [PATCH 242/901] 8355627: Don't use ThreadCritical for EventLog list

Reviewed-by: shade, lmesnik, zgu
---
 src/hotspot/share/utilities/events.cpp        | 22 +++---
 .../ErrorHandling/ShowEventsOnCrashTest.java  | 78 +++++++++++++++++++
 2 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java

diff --git a/src/hotspot/share/utilities/events.cpp b/src/hotspot/share/utilities/events.cpp
index 5b051305696..de86772816a 100644
--- a/src/hotspot/share/utilities/events.cpp
+++ b/src/hotspot/share/utilities/events.cpp
@@ -26,14 +26,13 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/symbol.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/osThread.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/events.hpp"
 
-
 EventLog* Events::_logs = nullptr;
 StringEventLog* Events::_messages = nullptr;
 StringEventLog* Events::_memprotect_messages = nullptr;
@@ -48,18 +47,19 @@ StringEventLog* Events::_deopt_messages = nullptr;
 StringEventLog* Events::_dll_messages = nullptr;
 
 EventLog::EventLog() {
-  // This normally done during bootstrap when we're only single
-  // threaded but use a ThreadCritical to ensure inclusion in case
-  // some are created slightly late.
-  ThreadCritical tc;
-  _next = Events::_logs;
-  Events::_logs = this;
+  // This is normally done during bootstrap when we're only single threaded,
+  // but use lock free add because there are some events that are created later.
+  EventLog* old_head;
+  do {
+    old_head = Atomic::load(&Events::_logs);
+    _next = old_head;
+  } while (Atomic::cmpxchg(&Events::_logs, old_head, this) != old_head);
 }
 
 // For each registered event logger, print out the current contents of
 // the buffer.
 void Events::print_all(outputStream* out, int max) {
-  EventLog* log = _logs;
+  EventLog* log = Atomic::load(&Events::_logs);
   while (log != nullptr) {
     log->print_log_on(out, max);
     log = log->next();
@@ -68,7 +68,7 @@ void Events::print_all(outputStream* out, int max) {
 
 // Print a single event log specified by name.
 void Events::print_one(outputStream* out, const char* log_name, int max) {
-  EventLog* log = _logs;
+  EventLog* log = Atomic::load(&Events::_logs);
   int num_printed = 0;
   while (log != nullptr) {
     if (log->matches_name_or_handle(log_name)) {
@@ -81,7 +81,7 @@ void Events::print_one(outputStream* out, const char* log_name, int max) {
   if (num_printed == 0) {
     out->print_cr("The name \"%s\" did not match any known event log. "
                   "Valid event log names are:", log_name);
-    EventLog* log = _logs;
+    EventLog* log = Atomic::load(&Events::_logs);
     while (log != nullptr) {
       log->print_names(out);
       out->cr();
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java
new file mode 100644
index 00000000000..e2c1e51c338
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.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 8355627
+ * @summary Test that events are listed in the hs_err_pid file
+ * @library /test/lib
+ * @requires vm.flagless
+ * @requires vm.debug == true & (os.family == "linux" | os.family == "windows")
+ * @modules java.base/jdk.internal.misc
+ * @run driver ShowEventsOnCrashTest
+ */
+
+// Note: this test can only run on debug since it relies on VMError::controlled_crash() which
+// only exists in debug builds.
+import java.io.File;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class ShowEventsOnCrashTest {
+
+    public static void main(String[] args) throws Exception {
+
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:+UnlockDiagnosticVMOptions", "-Xmx100M", "-XX:-CreateCoredumpOnCrash",
+            "-XX:ErrorHandlerTest=2",
+            "-version");
+
+        OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+
+        // we should have crashed with an internal error. We should definitely NOT have crashed with a segfault
+        // (which would be a sign that the assert poison page mechanism does not work).
+        output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
+        output_detail.shouldMatch("# +Internal Error.*");
+        File hs_err_file = HsErrFileUtils.openHsErrFileFromOutput(output_detail);
+        // Pattern match the hs_err_pid file.
+        Pattern[] patterns = new Pattern[] {
+            Pattern.compile("Compilation events \\([0-9]* events\\):"),
+            Pattern.compile("GC Heap History \\([0-9]* events\\):"),
+            Pattern.compile("Dll operation events \\([0-9]* events\\):"),
+            Pattern.compile("Deoptimization events \\([0-9]* events\\):"),
+            Pattern.compile("Classes loaded \\([0-9]* events\\):"),
+            Pattern.compile("Classes unloaded \\([0-9]* events\\):"),
+            Pattern.compile("Classes redefined \\([0-9]* events\\):"),
+            Pattern.compile("Internal exceptions \\([0-9]* events\\):"),
+            Pattern.compile("VM Operations \\([0-9]* events\\):"),
+            Pattern.compile("Memory protections \\([0-9]* events\\):")
+        };
+
+        HsErrFileUtils.checkHsErrFileContent(hs_err_file, patterns, false);
+
+    }
+}
+

From cdad6d788de4785c8dbf2710a86fdacb8d070565 Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Fri, 2 May 2025 12:30:32 +0000
Subject: [PATCH 243/901] 8216437: PPC64: Add intrinsic for GHASH algorithm

Reviewed-by: mdoerr, amitkumar
---
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp | 175 ++++++++++++++++++++++
 src/hotspot/cpu/ppc/vm_version_ppc.cpp    |  10 +-
 2 files changed, 183 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 939c3d3094a..4a0ced42ed4 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -546,6 +546,177 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  // Computes the Galois/Counter Mode (GCM) product and reduction.
+  //
+  // This function performs polynomial multiplication of the subkey H with
+  // the current GHASH state using vectorized polynomial multiplication (`vpmsumd`).
+  // The subkey H is divided into lower, middle, and higher halves.
+  // The multiplication results are reduced using `vConstC2` to stay within GF(2^128).
+  // The final computed value is stored back into `vState`.
+  static void computeGCMProduct(MacroAssembler* _masm,
+                                VectorRegister vLowerH, VectorRegister vH, VectorRegister vHigherH,
+                                VectorRegister vConstC2, VectorRegister vZero, VectorRegister vState,
+                                VectorRegister vLowProduct, VectorRegister vMidProduct, VectorRegister vHighProduct,
+                                VectorRegister vReducedLow, VectorRegister vTmp8, VectorRegister vTmp9,
+                                VectorRegister vCombinedResult, VectorRegister vSwappedH) {
+    __ vxor(vH, vH, vState);
+    __ vpmsumd(vLowProduct, vLowerH, vH);                          // L : Lower Half of subkey H
+    __ vpmsumd(vMidProduct, vSwappedH, vH);                        // M : Combined halves of subkey H
+    __ vpmsumd(vHighProduct, vHigherH, vH);                        // H : Higher Half of subkey H
+    __ vpmsumd(vReducedLow, vLowProduct, vConstC2);                // Reduction
+    __ vsldoi(vTmp8, vMidProduct, vZero, 8);                       // mL : Extract the lower 64 bits of M
+    __ vsldoi(vTmp9, vZero, vMidProduct, 8);                       // mH : Extract the higher 64 bits of M
+    __ vxor(vLowProduct, vLowProduct, vTmp8);                      // LL + mL : Partial result for lower half
+    __ vxor(vHighProduct, vHighProduct, vTmp9);                    // HH + mH : Partial result for upper half
+    __ vsldoi(vLowProduct, vLowProduct, vLowProduct, 8);           // Swap
+    __ vxor(vLowProduct, vLowProduct, vReducedLow);
+    __ vsldoi(vCombinedResult, vLowProduct, vLowProduct, 8);       // Swap
+    __ vpmsumd(vLowProduct, vLowProduct, vConstC2);                // Reduction using constant
+    __ vxor(vCombinedResult, vCombinedResult, vHighProduct);       // Combine reduced Low & High products
+    __ vxor(vState, vLowProduct, vCombinedResult);
+  }
+
+  // Generate stub for ghash process blocks.
+  //
+  // Arguments for generated stub:
+  //      state:    R3_ARG1 (long[] state)
+  //      subkeyH:  R4_ARG2 (long[] subH)
+  //      data:     R5_ARG3 (byte[] data)
+  //      blocks:   R6_ARG4 (number of 16-byte blocks to process)
+  //
+  // The polynomials are processed in bit-reflected order for efficiency reasons.
+  // This optimization leverages the structure of the Galois field arithmetic
+  // to minimize the number of bit manipulations required during multiplication.
+  // For an explanation of how this works, refer :
+  // Vinodh Gopal, Erdinc Ozturk, Wajdi Feghali, Jim Guilford, Gil Wolrich,
+  // Martin Dixon. "Optimized Galois-Counter-Mode Implementation on Intel®
+  // Architecture Processor"
+  // http://web.archive.org/web/20130609111954/http://www.intel.com/content/dam/www/public/us/en/documents/white-papers/communications-ia-galois-counter-mode-paper.pdf
+  //
+  //
+  address generate_ghash_processBlocks() {
+    StubCodeMark mark(this, "StubRoutines", "ghash");
+    address start = __ function_entry();
+
+    // Registers for parameters
+    Register state = R3_ARG1;                     // long[] state
+    Register subkeyH = R4_ARG2;                   // long[] subH
+    Register data = R5_ARG3;                      // byte[] data
+    Register blocks = R6_ARG4;
+    Register temp1 = R8;
+    // Vector Registers
+    VectorRegister vZero = VR0;
+    VectorRegister vH = VR1;
+    VectorRegister vLowerH = VR2;
+    VectorRegister vHigherH = VR3;
+    VectorRegister vLowProduct = VR4;
+    VectorRegister vMidProduct = VR5;
+    VectorRegister vHighProduct = VR6;
+    VectorRegister vReducedLow = VR7;
+    VectorRegister vTmp8 = VR8;
+    VectorRegister vTmp9 = VR9;
+    VectorRegister vTmp10 = VR10;
+    VectorRegister vSwappedH = VR11;
+    VectorRegister vTmp12 = VR12;
+    VectorRegister loadOrder = VR13;
+    VectorRegister vHigh = VR14;
+    VectorRegister vLow = VR15;
+    VectorRegister vState = VR16;
+    VectorRegister vPerm = VR17;
+    VectorRegister vCombinedResult = VR18;
+    VectorRegister vConstC2 = VR19;
+
+    __ li(temp1, 0xc2);
+    __ sldi(temp1, temp1, 56);
+    __ vspltisb(vZero, 0);
+    __ mtvrd(vConstC2, temp1);
+    __ lxvd2x(vH->to_vsr(), subkeyH);
+    __ lxvd2x(vState->to_vsr(), state);
+    // Operations to obtain lower and higher bytes of subkey H.
+    __ vspltisb(vReducedLow, 1);
+    __ vspltisb(vTmp10, 7);
+    __ vsldoi(vTmp8, vZero, vReducedLow, 1);            // 0x1
+    __ vor(vTmp8, vConstC2, vTmp8);                     // 0xC2...1
+    __ vsplt(vTmp9, 0, vH);                             // MSB of H
+    __ vsl(vH, vH, vReducedLow);                        // Carry = H<<7
+    __ vsrab(vTmp9, vTmp9, vTmp10);
+    __ vand(vTmp9, vTmp9, vTmp8);                       // Carry
+    __ vxor(vTmp10, vH, vTmp9);
+    __ vsldoi(vConstC2, vZero, vConstC2, 8);
+    __ vsldoi(vSwappedH, vTmp10, vTmp10, 8);            // swap Lower and Higher Halves of subkey H
+    __ vsldoi(vLowerH, vZero, vSwappedH, 8);            // H.L
+    __ vsldoi(vHigherH, vSwappedH, vZero, 8);           // H.H
+#ifdef ASSERT
+    __ cmpwi(CR0, blocks, 0);                           // Compare 'blocks' (R6_ARG4) with zero
+    __ asm_assert_ne("blocks should NOT be zero");
+#endif
+    __ clrldi(blocks, blocks, 32);
+    __ mtctr(blocks);
+    __ lvsl(loadOrder, temp1);
+#ifdef VM_LITTLE_ENDIAN
+    __ vspltisb(vTmp12, 0xf);
+    __ vxor(loadOrder, loadOrder, vTmp12);
+#define LE_swap_bytes(x) __ vec_perm(x, x, x, loadOrder)
+#else
+#define LE_swap_bytes(x)
+#endif
+
+    // This code performs Karatsuba multiplication in Galois fields to compute the GHASH operation.
+    //
+    // The Karatsuba method breaks the multiplication of two 128-bit numbers into smaller parts,
+    // performing three 128-bit multiplications and combining the results efficiently.
+    //
+    // (C1:C0) = A1*B1, (D1:D0) = A0*B0, (E1:E0) = (A0+A1)(B0+B1)
+    // (A1:A0)(B1:B0) = C1:(C0+C1+D1+E1):(D1+C0+D0+E0):D0
+    //
+    // Inputs:
+    // - vH:       The data vector (state), containing both B0 (lower half) and B1 (higher half).
+    // - vLowerH:  Lower half of the subkey H (A0).
+    // - vHigherH: Higher half of the subkey H (A1).
+    // - vConstC2: Constant used for reduction (for final processing).
+    //
+    // References:
+    // Shay Gueron, Michael E. Kounavis.
+    // "Intel® Carry-Less Multiplication Instruction and its Usage for Computing the GCM Mode"
+    // https://web.archive.org/web/20110609115824/https://software.intel.com/file/24918
+    //
+    Label L_aligned_loop, L_store, L_unaligned_loop, L_initialize_unaligned_loop;
+    __ andi(temp1, data, 15);
+    __ cmpwi(CR0, temp1, 0);
+    __ bne(CR0, L_initialize_unaligned_loop);
+
+    __ bind(L_aligned_loop);
+      __ lvx(vH, temp1, data);
+      LE_swap_bytes(vH);
+      computeGCMProduct(_masm, vLowerH, vH, vHigherH, vConstC2, vZero, vState,
+                    vLowProduct, vMidProduct, vHighProduct, vReducedLow, vTmp8, vTmp9, vCombinedResult, vSwappedH);
+      __ addi(data, data, 16);
+    __ bdnz(L_aligned_loop);
+    __ b(L_store);
+
+    __ bind(L_initialize_unaligned_loop);
+    __ li(temp1, 0);
+    __ lvsl(vPerm, temp1, data);
+    __ lvx(vHigh, temp1, data);
+#ifdef VM_LITTLE_ENDIAN
+    __ vspltisb(vTmp12, -1);
+    __ vxor(vPerm, vPerm, vTmp12);
+#endif
+    __ bind(L_unaligned_loop);
+      __ addi(data, data, 16);
+      __ lvx(vLow, temp1, data);
+      __ vec_perm(vH, vHigh, vLow, vPerm);
+      computeGCMProduct(_masm, vLowerH, vH, vHigherH, vConstC2, vZero, vState,
+                    vLowProduct, vMidProduct, vHighProduct, vReducedLow, vTmp8, vTmp9, vCombinedResult, vSwappedH);
+      __ vmr(vHigh, vLow);
+    __ bdnz(L_unaligned_loop);
+
+    __ bind(L_store);
+    __ stxvd2x(vState->to_vsr(), state);
+    __ blr();
+
+    return start;
+  }
   // -XX:+OptimizeFill : convert fill/copy loops into intrinsic
   //
   // The code is implemented(ported from sparc) as we believe it benefits JVM98, however
@@ -5028,6 +5199,10 @@ void generate_lookup_secondary_supers_table_stub() {
       StubRoutines::_data_cache_writeback_sync = generate_data_cache_writeback_sync();
     }
 
+    if (UseGHASHIntrinsics) {
+      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
+    }
+
     if (UseAESIntrinsics) {
       StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
       StubRoutines::_aescrypt_decryptBlock = generate_aescrypt_decryptBlock();
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 3cb0bf9bf72..c8c53543d14 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -308,8 +308,14 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
   }
 
-  if (UseGHASHIntrinsics) {
-    warning("GHASH intrinsics are not available on this CPU");
+  if (VM_Version::has_vsx()) {
+    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+      UseGHASHIntrinsics = true;
+    }
+  } else if (UseGHASHIntrinsics) {
+    if (!FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+      warning("GHASH intrinsics are not available on this CPU");
+    }
     FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
   }
 

From cf2f9ce8207f12bd25fc866c179ff13b961bea44 Mon Sep 17 00:00:00 2001
From: Ivan Bereziuk <ivan.bereziuk@oracle.com>
Date: Fri, 2 May 2025 12:49:03 +0000
Subject: [PATCH 244/901] 8356032: createAutoconfBundle.sh downloads to local
 directory

Reviewed-by: erikj
---
 make/devkit/createAutoconfBundle.sh | 40 ++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/make/devkit/createAutoconfBundle.sh b/make/devkit/createAutoconfBundle.sh
index 7363b9cd8a7..ebe9c427f76 100644
--- a/make/devkit/createAutoconfBundle.sh
+++ b/make/devkit/createAutoconfBundle.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# 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
@@ -24,10 +24,21 @@
 # questions.
 #
 
-# Create a bundle in the current directory, containing what's needed to run
+# Create a bundle in OpenJDK build folder, containing what's needed to run
 # the 'autoconf' program by the OpenJDK build. To override TARGET_PLATFORM
 # just set the variable before running this script.
 
+# This script fetches sources from network so make sure your proxy is setup appropriately.
+
+# colored print to highlight some of the logs
+function print_log()
+{
+  Color_Cyan='\033[1;36m'   # Cyan
+  Color_Off='\033[0m'       # Reset color
+  printf "${Color_Cyan}> $1${Color_Off}\n"
+}
+
+
 # Autoconf depends on m4, so download and build that first.
 AUTOCONF_VERSION=2.69
 M4_VERSION=1.4.18
@@ -58,11 +69,12 @@ MODULE_NAME=autoconf-$TARGET_PLATFORM-$AUTOCONF_VERSION+$PACKAGE_VERSION
 BUNDLE_NAME=$MODULE_NAME.tar.gz
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
-OUTPUT_ROOT="${SCRIPT_DIR}/../../build/autoconf"
+BASEDIR="$(cd "$SCRIPT_DIR/../.."  > /dev/null && pwd)"
+OUTPUT_ROOT="$BASEDIR/build/autoconf"
 
-cd $OUTPUT_ROOT
 IMAGE_DIR=$OUTPUT_ROOT/$MODULE_NAME
 mkdir -p $IMAGE_DIR/usr
+cd $OUTPUT_ROOT
 
 # Download and build m4
 
@@ -76,7 +88,7 @@ elif test "x$TARGET_PLATFORM" = xcygwin_x86; then
   cp /usr/bin/m4 $IMAGE_DIR/usr/bin
 elif test "x$TARGET_PLATFORM" = xlinux_x64; then
   M4_VERSION=1.4.13-5
-  wget http://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
+  wget https://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
   cd $IMAGE_DIR
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.x86_64.rpm | cpio -d -i
 elif test "x$TARGET_PLATFORM" = xlinux_x86; then
@@ -85,27 +97,38 @@ elif test "x$TARGET_PLATFORM" = xlinux_x86; then
   cd $IMAGE_DIR
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.i686.rpm | cpio -d -i
 else
+  print_log "m4: download"
   wget https://ftp.gnu.org/gnu/m4/m4-$M4_VERSION.tar.gz
-  tar xzf m4-$M4_VERSION.tar.gz
+  tar -xzf m4-$M4_VERSION.tar.gz
   cd m4-$M4_VERSION
+  print_log "m4: configure"
   ./configure --prefix=$IMAGE_DIR/usr CFLAGS="-w -Wno-everything"
+  print_log "m4: make"
   make
+  print_log "m4: make install"
   make install
   cd ..
 fi
 
 # Download and build autoconf
 
+print_log "autoconf: download"
 wget https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
-tar xzf autoconf-$AUTOCONF_VERSION.tar.gz
+tar -xzf autoconf-$AUTOCONF_VERSION.tar.gz
 cd autoconf-$AUTOCONF_VERSION
+print_log "autoconf: configure"
 ./configure --prefix=$IMAGE_DIR/usr M4=$IMAGE_DIR/usr/bin/m4
+print_log "autoconf: make"
 make
+print_log "autoconf: make install"
 make install
 cd ..
 
+# The resulting scripts from installation folder use absolute paths to reference other files within installation folder
+print_log "replace absolue paths from installation files with a relative ."
 perl -pi -e "s!$IMAGE_DIR/!./!" $IMAGE_DIR/usr/bin/auto* $IMAGE_DIR/usr/share/autoconf/autom4te.cfg
 
+print_log "creating $IMAGE_DIR/autoconf wrapper script"
 cat > $IMAGE_DIR/autoconf << EOF
 #!/bin/bash
 # Get an absolute path to this script
@@ -123,6 +146,9 @@ PREPEND_INCLUDE="--prepend-include \$this_script_dir/usr/share/autoconf"
 
 exec \$this_script_dir/usr/bin/autoconf \$PREPEND_INCLUDE "\$@"
 EOF
+
 chmod +x $IMAGE_DIR/autoconf
+
+print_log "archiving $IMAGE_DIR directory as $OUTPUT_ROOT/$BUNDLE_NAME"
 cd $IMAGE_DIR
 tar -cvzf $OUTPUT_ROOT/$BUNDLE_NAME *

From 995d54161fed657f38753813f55d0591e77a42e3 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Fri, 2 May 2025 12:54:09 +0000
Subject: [PATCH 245/901] 8355681:
 G1HeapRegionManager::find_contiguous_allow_expand ignores free regions when
 checking regions available for allocation

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1HeapRegionManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index 0098839c1a4..be469b655f7 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -478,7 +478,7 @@ uint G1HeapRegionManager::find_contiguous_in_free_list(uint num_regions) {
 
 uint G1HeapRegionManager::find_contiguous_allow_expand(uint num_regions) {
   // Check if we can actually satisfy the allocation.
-  if (num_regions > available()) {
+  if (num_regions > (num_free_regions() + available())) {
     return G1_NO_HRM_INDEX;
   }
   // Find any candidate.

From 9f9e73d5f9fcb5e926a2674c54cbbc92012b75f6 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Fri, 2 May 2025 14:14:59 +0000
Subject: [PATCH 246/901] 8349146: [REDO] Implement a better allocator for
 downcalls

Reviewed-by: mcimadamore, jvernee, liach
---
 .../jdk/internal/foreign/BufferStack.java     | 214 +++++++++++++
 .../internal/foreign/SlicingAllocator.java    |  18 +-
 .../jdk/internal/foreign/abi/SharedUtils.java |  26 +-
 test/jdk/ProblemList.txt                      |   2 +
 test/jdk/java/foreign/TestBufferStack.java    | 286 ++++++++++++++++++
 .../java/foreign/TestBufferStackStress.java   |  72 +++++
 .../java/foreign/TestBufferStackStress2.java  | 136 +++++++++
 test/jdk/java/foreign/libTestBufferStack.c    |  39 +++
 .../java/lang/foreign/BufferStackBench.java   |  79 +++++
 .../lang/foreign/CallOverheadByValue.java     | 100 ++++++
 .../lang/foreign/libCallOverheadByValue.c     |  38 +++
 11 files changed, 989 insertions(+), 21 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/foreign/BufferStack.java
 create mode 100644 test/jdk/java/foreign/TestBufferStack.java
 create mode 100644 test/jdk/java/foreign/TestBufferStackStress.java
 create mode 100644 test/jdk/java/foreign/TestBufferStackStress2.java
 create mode 100644 test/jdk/java/foreign/libTestBufferStack.c
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/BufferStackBench.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadByValue.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/libCallOverheadByValue.c

diff --git a/src/java.base/share/classes/jdk/internal/foreign/BufferStack.java b/src/java.base/share/classes/jdk/internal/foreign/BufferStack.java
new file mode 100644
index 00000000000..dbf21601c53
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/foreign/BufferStack.java
@@ -0,0 +1,214 @@
+/*
+ * 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.internal.foreign;
+
+import jdk.internal.misc.CarrierThreadLocal;
+import jdk.internal.vm.annotation.ForceInline;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SegmentAllocator;
+import java.lang.ref.Reference;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
+
+/**
+ * A buffer stack that allows efficient reuse of memory segments. This is useful in cases
+ * where temporary memory is needed.
+ * <p>
+ * Use the factories {@code BufferStack.of(...)} to create new instances of this class.
+ * <p>
+ * Note: The reused segments are neither zeroed out before nor after re-use.
+ */
+public final class BufferStack {
+
+    private final long byteSize;
+    private final long byteAlignment;
+    private final CarrierThreadLocal<PerThread> tl;
+
+    private BufferStack(long byteSize, long byteAlignment) {
+        this.byteSize = byteSize;
+        this.byteAlignment = byteAlignment;
+        this.tl = new CarrierThreadLocal<>() {
+            @Override
+            protected BufferStack.PerThread initialValue() {
+                return BufferStack.PerThread.of(byteSize, byteAlignment);
+            }
+        };
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code byteSize} and {@code byteAlignment}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param byteSize      to be reserved from this BufferStack's internal memory
+     * @param byteAlignment to be used for reservation
+     */
+    @ForceInline
+    public Arena pushFrame(long byteSize, long byteAlignment) {
+        return tl.get().pushFrame(byteSize, byteAlignment);
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code byteSize}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param byteSize      to be reserved from this BufferStack's internal memory
+     */
+    @ForceInline
+    public Arena pushFrame(long byteSize) {
+        return pushFrame(byteSize, 1);
+    }
+
+    /**
+     * {@return a new Arena that tries to provide {@code layout}
+     *          allocations by recycling the BufferStack's internal memory}
+     *
+     * @param layout for which to reserve internal memory
+     */
+    @ForceInline
+    public Arena pushFrame(MemoryLayout layout) {
+        return pushFrame(layout.byteSize(), layout.byteAlignment());
+    }
+
+    @Override
+    public String toString() {
+        return "BufferStack[byteSize=" + byteSize + ", byteAlignment=" + byteAlignment + "]";
+    }
+
+    private record PerThread(ReentrantLock lock,
+                             Arena arena,
+                             SlicingAllocator stack,
+                             CleanupAction cleanupAction) {
+
+        @ForceInline
+        public Arena pushFrame(long size, long byteAlignment) {
+            boolean needsLock = Thread.currentThread().isVirtual() && !lock.isHeldByCurrentThread();
+            if (needsLock && !lock.tryLock()) {
+                // Rare: another virtual thread on the same carrier competed for acquisition.
+                return Arena.ofConfined();
+            }
+            if (!stack.canAllocate(size, byteAlignment)) {
+                if (needsLock) lock.unlock();
+                return Arena.ofConfined();
+            }
+            return new Frame(needsLock, size, byteAlignment);
+        }
+
+        static PerThread of(long byteSize, long byteAlignment) {
+            final Arena arena = Arena.ofAuto();
+            return new PerThread(new ReentrantLock(),
+                    arena,
+                    new SlicingAllocator(arena.allocate(byteSize, byteAlignment)),
+                    new CleanupAction(arena));
+        }
+
+        private record CleanupAction(Arena arena) implements Consumer<MemorySegment> {
+            @Override
+            public void accept(MemorySegment memorySegment) {
+                Reference.reachabilityFence(arena);
+            }
+        }
+
+        private final class Frame implements Arena {
+
+            private final boolean locked;
+            private final long parentOffset;
+            private final long topOfStack;
+            private final Arena confinedArena;
+            private final SegmentAllocator frame;
+
+            @SuppressWarnings("restricted")
+            @ForceInline
+            public Frame(boolean locked, long byteSize, long byteAlignment) {
+                this.locked = locked;
+                this.parentOffset = stack.currentOffset();
+                final MemorySegment frameSegment = stack.allocate(byteSize, byteAlignment);
+                this.topOfStack = stack.currentOffset();
+                this.confinedArena = Arena.ofConfined();
+                // The cleanup action will keep the original automatic `arena` (from which
+                // the reusable segment is first allocated) alive even if this Frame
+                // becomes unreachable but there are reachable segments still alive.
+                this.frame = new SlicingAllocator(frameSegment.reinterpret(confinedArena, cleanupAction));
+            }
+
+            @ForceInline
+            private void assertOrder() {
+                if (topOfStack != stack.currentOffset())
+                    throw new IllegalStateException("Out of order access: frame not top-of-stack");
+            }
+
+            @ForceInline
+            @Override
+            @SuppressWarnings("restricted")
+            public MemorySegment allocate(long byteSize, long byteAlignment) {
+                // Make sure we are on the right thread and not closed
+                MemorySessionImpl.toMemorySession(confinedArena).checkValidState();
+                return frame.allocate(byteSize, byteAlignment);
+            }
+
+            @ForceInline
+            @Override
+            public MemorySegment.Scope scope() {
+                return confinedArena.scope();
+            }
+
+            @ForceInline
+            @Override
+            public void close() {
+                assertOrder();
+                // the Arena::close method is called "early" as it checks thread
+                // confinement and crucially before any mutation of the internal
+                // state takes place.
+                confinedArena.close();
+                stack.resetTo(parentOffset);
+                if (locked) {
+                    lock.unlock();
+                }
+            }
+        }
+    }
+
+    public static BufferStack of(long byteSize, long byteAlignment) {
+        if (byteSize < 0) {
+            throw new IllegalArgumentException("Negative byteSize: " + byteSize);
+        }
+        if (byteAlignment < 0) {
+            throw new IllegalArgumentException("Negative byteAlignment: " + byteAlignment);
+        }
+        return new BufferStack(byteSize, byteAlignment);
+    }
+
+    public static BufferStack of(long byteSize) {
+        return new BufferStack(byteSize, 1);
+    }
+
+    public static BufferStack of(MemoryLayout layout) {
+        // Implicit null check
+        return of(layout.byteSize(), layout.byteAlignment());
+    }
+}
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SlicingAllocator.java b/src/java.base/share/classes/jdk/internal/foreign/SlicingAllocator.java
index db7d476053e..6b1a071c2af 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SlicingAllocator.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SlicingAllocator.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
@@ -38,6 +38,22 @@ public SlicingAllocator(MemorySegment segment) {
         this.segment = segment;
     }
 
+    public long currentOffset() {
+        return sp;
+    }
+
+    public void resetTo(long offset) {
+        if (offset < 0 || offset > sp)
+            throw new IllegalArgumentException(String.format("offset %d should be in [0, %d] ", offset, sp));
+        this.sp = offset;
+    }
+
+    public boolean canAllocate(long byteSize, long byteAlignment) {
+        long min = segment.address();
+        long start = Utils.alignUp(min + sp, byteAlignment) - min;
+        return start + byteSize <= segment.byteSize();
+    }
+
     MemorySegment trySlice(long byteSize, long byteAlignment) {
         long min = segment.address();
         long start = Utils.alignUp(min + sp, byteAlignment) - min;
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 125730560a2..37200598d5b 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
@@ -24,9 +24,9 @@
  */
 package jdk.internal.foreign.abi;
 
-import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.JavaLangInvokeAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.foreign.BufferStack;
 import jdk.internal.foreign.CABI;
 import jdk.internal.foreign.abi.AbstractLinker.UpcallStubFactory;
 import jdk.internal.foreign.abi.aarch64.linux.LinuxAArch64Linker;
@@ -390,26 +390,12 @@ static long pickChunkOffset(long chunkOffset, long byteWidth, int chunkWidth) {
                 : chunkOffset;
     }
 
-    public static Arena newBoundedArena(long size) {
-        return new Arena() {
-            final Arena arena = Arena.ofConfined();
-            final SegmentAllocator slicingAllocator = SegmentAllocator.slicingAllocator(arena.allocate(size));
-
-            @Override
-            public Scope scope() {
-                return arena.scope();
-            }
+    private static final int LINKER_STACK_SIZE = Integer.getInteger("jdk.internal.foreign.LINKER_STACK_SIZE", 256);
+    private static final BufferStack LINKER_STACK = BufferStack.of(LINKER_STACK_SIZE, 1);
 
-            @Override
-            public void close() {
-                arena.close();
-            }
-
-            @Override
-            public MemorySegment allocate(long byteSize, long byteAlignment) {
-                return slicingAllocator.allocate(byteSize, byteAlignment);
-            }
-        };
+    @ForceInline
+    public static Arena newBoundedArena(long size) {
+        return LINKER_STACK.pushFrame(size, 8);
     }
 
     public static Arena newEmptyArena() {
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index c17d8dbe559..3edf4a9d18e 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -784,6 +784,8 @@ jdk/jfr/jvm/TestWaste.java                                      8282427 generic-
 
 # jdk_foreign
 
+java/foreign/TestBufferStackStress.java                         8350455 macosx-all
+
 ############################################################################
 # Client manual tests
 
diff --git a/test/jdk/java/foreign/TestBufferStack.java b/test/jdk/java/foreign/TestBufferStack.java
new file mode 100644
index 00000000000..f7bf67bfb50
--- /dev/null
+++ b/test/jdk/java/foreign/TestBufferStack.java
@@ -0,0 +1,286 @@
+/*
+ * 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
+ * @library /test/lib
+ * @modules java.base/jdk.internal.foreign
+ * @build NativeTestHelper TestBufferStack
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED TestBufferStack
+ */
+
+import jdk.internal.foreign.BufferStack;
+import org.junit.jupiter.api.Test;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SegmentAllocator;
+import java.lang.invoke.MethodHandle;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import jdk.test.lib.thread.VThreadRunner;
+
+import static java.lang.foreign.MemoryLayout.structLayout;
+import static java.lang.foreign.ValueLayout.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+final class TestBufferStack extends NativeTestHelper {
+
+    private static final long POOL_SIZE = 64;
+    private static final long SMALL_ALLOC_SIZE = 8;
+
+    @Test
+    void invariants() {
+        var exBS = assertThrows(IllegalArgumentException.class, () -> BufferStack.of(-1, 1));
+        assertEquals("Negative byteSize: -1", exBS.getMessage());
+        var exBA = assertThrows(IllegalArgumentException.class, () -> BufferStack.of(1, -1));
+        assertEquals("Negative byteAlignment: -1", exBA.getMessage());
+        assertThrows(NullPointerException.class, () -> BufferStack.of(null));
+
+        BufferStack stack = newBufferStack();
+        assertThrows(IllegalArgumentException.class, () -> stack.pushFrame(-1, 8));
+        assertThrows(IllegalArgumentException.class, () -> stack.pushFrame(SMALL_ALLOC_SIZE, -1));
+
+        try (var arena = stack.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+            assertThrows(IllegalArgumentException.class, () -> arena.allocate(-1));
+            assertThrows(IllegalArgumentException.class, () -> arena.allocate(4, -1));
+        }
+    }
+
+    @Test
+    void invariantsVt() {
+        VThreadRunner.run(this::invariants);
+    }
+
+    @Test
+    void testScopedAllocation() {
+        int stackSize = 128;
+        BufferStack stack = newBufferStack();
+        try (Arena frame1 = stack.pushFrame(3 * JAVA_INT.byteSize(), JAVA_INT.byteAlignment())) {
+            // Segments have expected sizes and are accessible and allocated consecutively in the same scope.
+            MemorySegment segment11 = frame1.allocate(JAVA_INT);
+            assertEquals(frame1.scope(), segment11.scope());
+            assertEquals(JAVA_INT.byteSize(), segment11.byteSize());
+            segment11.set(JAVA_INT, 0, 1);
+
+            MemorySegment segment12 = frame1.allocate(JAVA_INT);
+            assertEquals(segment11.address() + JAVA_INT.byteSize(), segment12.address());
+            assertEquals(JAVA_INT.byteSize(), segment12.byteSize());
+            assertEquals(frame1.scope(), segment12.scope());
+            segment12.set(JAVA_INT, 0, 1);
+
+            MemorySegment segment2;
+            try (Arena frame2 = stack.pushFrame(JAVA_LONG.byteSize(), JAVA_LONG.byteAlignment())) {
+                assertNotEquals(frame1.scope(), frame2.scope());
+                // same here, but a new scope.
+                segment2 = frame2.allocate(JAVA_LONG);
+                assertEquals( segment12.address() + /*segment12 size + frame 1 spare + alignment constraint*/ 3 * JAVA_INT.byteSize(), segment2.address());
+                assertEquals(JAVA_LONG.byteSize(), segment2.byteSize());
+                assertEquals(frame2.scope(), segment2.scope());
+                segment2.set(JAVA_LONG, 0, 1);
+
+                // Frames must be closed in stack order.
+                assertThrows(IllegalStateException.class, frame1::close);
+            }
+            // Scope is closed here, inner segments throw.
+            assertThrows(IllegalStateException.class, () -> segment2.get(JAVA_INT, 0));
+            // A new stack frame allocates at the same location (but different scope) as the previous did.
+            try (Arena frame3 = stack.pushFrame(2 * JAVA_INT.byteSize(), JAVA_INT.byteAlignment())) {
+                MemorySegment segment3 = frame3.allocate(JAVA_INT);
+                assertEquals(frame3.scope(), segment3.scope());
+                assertEquals(segment12.address() + 2 * JAVA_INT.byteSize(), segment3.address());
+            }
+
+            // Fallback arena behaves like regular stack frame.
+            MemorySegment outOfStack;
+            try (Arena hugeFrame = stack.pushFrame(1024, 4)) {
+                outOfStack = hugeFrame.allocate(4);
+                assertEquals(hugeFrame.scope(), outOfStack.scope());
+                assertTrue(outOfStack.asOverlappingSlice(segment11).isEmpty());
+            }
+            assertThrows(IllegalStateException.class, () -> outOfStack.get(JAVA_INT, 0));
+
+            // Outer segments are still accessible.
+            segment11.get(JAVA_INT, 0);
+            segment12.get(JAVA_INT, 0);
+        }
+    }
+
+    @Test
+    void testScopedAllocationVt() {
+        VThreadRunner.run(this::testScopedAllocation);
+    }
+
+    static {
+        System.loadLibrary("TestBufferStack");
+    }
+
+    private static final MemoryLayout HVAPoint3D = structLayout(NativeTestHelper.C_DOUBLE, C_DOUBLE, C_DOUBLE);
+    private static final MemorySegment UPCALL_MH = upcallStub(TestBufferStack.class, "recurse", FunctionDescriptor.of(HVAPoint3D, C_INT));
+    private static final MethodHandle DOWNCALL_MH = downcallHandle("recurse", FunctionDescriptor.of(HVAPoint3D, C_INT, ADDRESS));
+
+    public static MemorySegment recurse(int depth) {
+        try {
+            return (MemorySegment) DOWNCALL_MH.invokeExact((SegmentAllocator) Arena.ofAuto(), depth, UPCALL_MH);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    void testDeepStack() {
+        // Each downcall and upcall require 48 bytes of stack.
+        // After five allocations we start falling back.
+        MemorySegment point = recurse(10);
+        assertEquals( 12.0, point.getAtIndex(C_DOUBLE, 0));
+        assertEquals(11.0, point.getAtIndex(C_DOUBLE, 1));
+        assertEquals( 10.0, point.getAtIndex(C_DOUBLE, 2));
+    }
+
+    @Test
+    void testDeepStackVt() {
+        VThreadRunner.run(this::testDeepStack);
+    }
+
+    @Test
+    void equals() {
+        var first = newBufferStack();
+        var second = newBufferStack();
+        assertNotEquals(first, second);
+        assertEquals(first, first);
+    }
+
+    @Test
+    void allocationSameAsPoolSize() {
+        MemoryLayout twoInts = MemoryLayout.sequenceLayout(2, JAVA_INT);
+        var pool = newBufferStack();
+        long firstAddress;
+        try (var arena = pool.pushFrame(JAVA_INT)) {
+            var segment = arena.allocate(JAVA_INT);
+            firstAddress = segment.address();
+        }
+        for (int i = 0; i < 10; i++) {
+            try (var arena = pool.pushFrame(twoInts)) {
+                var segment = arena.allocate(JAVA_INT);
+                assertEquals(firstAddress, segment.address());
+                var segmentTwo = arena.allocate(JAVA_INT);
+                assertEquals(firstAddress + JAVA_INT.byteSize(), segmentTwo.address());
+                // Questionable exception type
+                assertThrows(IndexOutOfBoundsException.class, () -> arena.allocate(JAVA_INT));
+            }
+        }
+    }
+    @Test
+    void allocationSameAsPoolSizeVt() {
+        VThreadRunner.run(this::allocationSameAsPoolSize);
+    }
+
+    @Test
+    void allocateConfinement() {
+        var pool = newBufferStack();
+        Consumer<Arena> allocateAction = arena ->
+                assertThrows(WrongThreadException.class, () -> {
+                    CompletableFuture<Arena> future = CompletableFuture.supplyAsync(() -> pool.pushFrame(SMALL_ALLOC_SIZE, 1));
+                    var otherThreadArena = future.get();
+                    otherThreadArena.allocate(SMALL_ALLOC_SIZE);
+                    // Intentionally do not close the otherThreadArena here.
+                });
+        doInTwoStackedArenas(pool, allocateAction, allocateAction);
+    }
+
+    @Test
+    void allocateConfinementVt() {
+        VThreadRunner.run(this::allocateConfinement);
+    }
+
+    @Test
+    void closeConfinement() {
+        var pool = newBufferStack();
+        Consumer<Arena> closeAction = arena -> {
+            // Do not use CompletableFuture here as it might accidentally run on the
+            // same carrier thread as a virtual thread.
+            AtomicReference<Arena> otherThreadArena = new AtomicReference<>();
+            var thread = Thread.ofPlatform().start(() -> {
+                otherThreadArena.set(pool.pushFrame(SMALL_ALLOC_SIZE, 1));
+            });
+            try {
+                thread.join();
+            } catch (InterruptedException ie) {
+                fail(ie);
+            }
+            assertThrows(WrongThreadException.class, otherThreadArena.get()::close);
+        };
+        doInTwoStackedArenas(pool, closeAction, closeAction);
+    }
+
+    @Test
+    void closeConfinementVt() {
+        VThreadRunner.run(this::closeConfinement);
+    }
+
+    @Test
+    void toStringTest() {
+        BufferStack stack = newBufferStack();
+        assertEquals("BufferStack[byteSize=" + POOL_SIZE + ", byteAlignment=1]", stack.toString());
+    }
+
+    @Test
+    void allocBounds() {
+        BufferStack stack = newBufferStack();
+        try (var arena = stack.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+            assertThrows(IllegalArgumentException.class, () -> arena.allocate(-1));
+            assertDoesNotThrow(() -> arena.allocate(SMALL_ALLOC_SIZE));
+            assertThrows(IndexOutOfBoundsException.class, () -> arena.allocate(SMALL_ALLOC_SIZE + 1));
+        }
+    }
+
+    @Test
+    void accessBounds() {
+        BufferStack stack = newBufferStack();
+        try (var arena = stack.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+            var segment = arena.allocate(SMALL_ALLOC_SIZE);
+            assertThrows(IndexOutOfBoundsException.class, () -> segment.get(JAVA_BYTE, SMALL_ALLOC_SIZE));
+        }
+    }
+
+    static void doInTwoStackedArenas(BufferStack pool,
+                                     Consumer<Arena> firstAction,
+                                     Consumer<Arena> secondAction) {
+        try (var firstArena = pool.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+            firstAction.accept(firstArena);
+            try (var secondArena = pool.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+                secondAction.accept(secondArena);
+            }
+        }
+    }
+
+    private static BufferStack newBufferStack() {
+        return BufferStack.of(POOL_SIZE, 1);
+    }
+
+
+}
diff --git a/test/jdk/java/foreign/TestBufferStackStress.java b/test/jdk/java/foreign/TestBufferStackStress.java
new file mode 100644
index 00000000000..0ec46311a6f
--- /dev/null
+++ b/test/jdk/java/foreign/TestBufferStackStress.java
@@ -0,0 +1,72 @@
+/*
+ * 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
+ * @modules java.base/jdk.internal.foreign
+ * @build NativeTestHelper TestBufferStackStress
+ * @run junit TestBufferStackStress
+ */
+
+import jdk.internal.foreign.BufferStack;
+import org.junit.jupiter.api.Test;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.stream.IntStream;
+
+import static java.lang.foreign.ValueLayout.*;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestBufferStackStress {
+
+    @Test
+    public void stress() throws InterruptedException {
+        BufferStack stack = BufferStack.of(256, 1);
+        Thread[] vThreads = IntStream.range(0, 1024).mapToObj(_ ->
+                Thread.ofVirtual().start(() -> {
+                    long threadId = Thread.currentThread().threadId();
+                    while (!Thread.interrupted()) {
+                        for (int i = 0; i < 1_000_000; i++) {
+                            try (Arena arena = stack.pushFrame(JAVA_LONG.byteSize(), JAVA_LONG.byteAlignment())) {
+                                // Try to assert no two vThreads get allocated the same stack space.
+                                MemorySegment segment = arena.allocate(JAVA_LONG);
+                                JAVA_LONG.varHandle().setVolatile(segment, 0L, threadId);
+                                assertEquals(threadId, (long) JAVA_LONG.varHandle().getVolatile(segment, 0L));
+                            }
+                        }
+                        Thread.yield(); // make sure the driver thread gets a chance.
+                    }
+                })).toArray(Thread[]::new);
+        Thread.sleep(Duration.of(10, SECONDS));
+        Arrays.stream(vThreads).forEach(
+                thread -> {
+                    assertTrue(thread.isAlive());
+                    thread.interrupt();
+                });
+    }
+
+}
diff --git a/test/jdk/java/foreign/TestBufferStackStress2.java b/test/jdk/java/foreign/TestBufferStackStress2.java
new file mode 100644
index 00000000000..4b02f4691fb
--- /dev/null
+++ b/test/jdk/java/foreign/TestBufferStackStress2.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
+ * @modules java.base/jdk.internal.foreign
+ * @build NativeTestHelper TestBufferStackStress2
+ * @run junit TestBufferStackStress2
+ */
+
+import jdk.internal.foreign.BufferStack;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileDescriptor;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class TestBufferStackStress2 {
+
+    private static final long POOL_SIZE = 64;
+    private static final long SMALL_ALLOC_SIZE = 8;
+
+    /**
+     * The objective with this test is to test the case when a virtual thread VT0 is
+     * mounted on a carrier thread CT0; VT0 is then suspended; The pool of carrier threads
+     * are then contracted; VT0 is then remounted on another carrier thread C1. VT0 runs
+     * for a while when there is a lot of GC activity.
+     * In other words, we are trying to establish that there is no use-after-free and that
+     * the original arena, from which reusable segments are initially allocated from, is
+     * not closed underneath.
+     * <p>
+     * Unfortunately, this test takes about 30 seconds as that is the time it takes for
+     * the pool of carrier threads to be contracted.
+     */
+    @Test
+    void movingVirtualThreadWithGc() throws InterruptedException {
+        final long begin = System.nanoTime();
+        var pool = BufferStack.of(POOL_SIZE, 1);
+
+        System.setProperty("jdk.virtualThreadScheduler.parallelism", "1");
+
+        var done = new AtomicBoolean();
+        var completed = new AtomicBoolean();
+        var quiescent = new Object();
+        var executor = Executors.newVirtualThreadPerTaskExecutor();
+
+        executor.submit(() -> {
+            while (!done.get()) {
+                FileDescriptor.out.sync();
+            }
+            return null;
+        });
+
+        executor.submit(() -> {
+            System.out.println(duration(begin) + "ALLOCATING = " + Thread.currentThread());
+            try (Arena arena = pool.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+                MemorySegment segment = arena.allocate(SMALL_ALLOC_SIZE);
+                done.set(true);
+                synchronized (quiescent) {
+                    try {
+                        quiescent.wait();
+                    } catch (Throwable ex) {
+                        throw new AssertionError(ex);
+                    }
+                }
+                System.out.println(duration(begin) + "ACCESSING SEGMENT");
+
+                for (int i = 0; i < 100_000; i++) {
+                    if (i % 100 == 0) {
+                        System.gc();
+                    }
+                    segment.get(ValueLayout.JAVA_BYTE, i % SMALL_ALLOC_SIZE);
+                }
+                System.out.println(duration(begin) + "DONE ACCESSING SEGMENT");
+            }
+            System.out.println(duration(begin) + "VT DONE");
+            completed.set(true);
+        });
+
+        long count;
+        do {
+            Thread.sleep(1000);
+            count = Thread.getAllStackTraces().keySet().stream()
+                    .filter(t -> t instanceof ForkJoinWorkerThread)
+                    .count();
+        } while (count > 0);
+
+        System.out.println(duration(begin) + "FJP HAS CONTRACTED");
+
+        synchronized (quiescent) {
+            quiescent.notify();
+        }
+
+        System.out.println(duration(begin) + "CLOSING EXECUTOR");
+        executor.close();
+        System.out.println(duration(begin) + "EXECUTOR CLOSED");
+        assertTrue(completed.get(), "The VT did not complete properly");
+    }
+
+    private static String duration(Long begin) {
+        var duration = Duration.of(System.nanoTime() - begin, ChronoUnit.NANOS);
+        long seconds = duration.toSeconds();
+        int nanos = duration.toNanosPart();
+        return (Thread.currentThread().isVirtual() ? "VT: " : "PT: ") +
+                String.format("%3d:%09d ", seconds, nanos);
+    }
+
+}
diff --git a/test/jdk/java/foreign/libTestBufferStack.c b/test/jdk/java/foreign/libTestBufferStack.c
new file mode 100644
index 00000000000..79eb32bf933
--- /dev/null
+++ b/test/jdk/java/foreign/libTestBufferStack.c
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+#include "export.h"
+
+typedef struct { double x, y, z; } HVAPoint3D;
+
+EXPORT HVAPoint3D recurse(int depth, HVAPoint3D (*cb)(int)) {
+  if (depth == 0) {
+    HVAPoint3D result = { 2, 1, 0};
+    return result;
+  }
+
+  HVAPoint3D result = cb(depth - 1);
+  result.x += 1;
+  result.y += 1;
+  result.z += 1;
+  return result;
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/BufferStackBench.java b/test/micro/org/openjdk/bench/java/lang/foreign/BufferStackBench.java
new file mode 100644
index 00000000000..06f5a352209
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/BufferStackBench.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 org.openjdk.bench.java.lang.foreign;
+
+import jdk.internal.foreign.BufferStack;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.foreign.Arena;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgs = {"--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED"})
+public class BufferStackBench {
+
+    @Param({"8", "16", "32"})
+    public int ELEM_SIZE;
+
+    private BufferStack bufferStack;
+
+    @Setup
+    public void setup() {
+        bufferStack = BufferStack.of(128);
+    }
+
+    @Benchmark
+    public long confined() {
+        try (Arena arena = Arena.ofConfined()) {
+            return arena.allocate(ELEM_SIZE).address();
+        }
+    }
+
+    @Benchmark
+    public long buffer() {
+        try (Arena arena = bufferStack.pushFrame(64, 1)) {
+            return arena.allocate(ELEM_SIZE).address();
+        }
+    }
+
+    @Fork(value = 3, jvmArgsAppend = "-Djmh.executor=VIRTUAL")
+    public static class OfVirtual extends BufferStackBench {}
+
+}
+
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadByValue.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadByValue.java
new file mode 100644
index 00000000000..18ddcda495a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallOverheadByValue.java
@@ -0,0 +1,100 @@
+/*
+ * 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.java.lang.foreign;
+
+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.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SegmentAllocator;
+import java.lang.foreign.SymbolLookup;
+import java.lang.foreign.ValueLayout;
+import java.lang.invoke.MethodHandle;
+import java.util.concurrent.TimeUnit;
+
+import static org.openjdk.bench.java.lang.foreign.CLayouts.C_DOUBLE;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+public class CallOverheadByValue {
+
+    public static final MemoryLayout POINT_LAYOUT = MemoryLayout.structLayout(
+            C_DOUBLE, C_DOUBLE
+    );
+    private static final MethodHandle MH_UNIT_BY_VALUE;
+    private static final MethodHandle MH_UNIT_BY_PTR;
+
+    static {
+        Linker abi = Linker.nativeLinker();
+        System.loadLibrary("CallOverheadByValue");
+        SymbolLookup loaderLibs = SymbolLookup.loaderLookup();
+        MH_UNIT_BY_VALUE = abi.downcallHandle(
+                loaderLibs.findOrThrow("unit"),
+                FunctionDescriptor.of(POINT_LAYOUT)
+        );
+        MH_UNIT_BY_PTR = abi.downcallHandle(
+                loaderLibs.findOrThrow("unit_ptr"),
+                FunctionDescriptor.ofVoid(ValueLayout.ADDRESS)
+        );
+    }
+
+    private static final Arena arena = Arena.ofConfined();
+    private static final MemorySegment point = arena.allocate(POINT_LAYOUT);
+    private static final SegmentAllocator BY_VALUE_ALLOCATOR = (SegmentAllocator) (_, _) -> point;
+
+    @TearDown
+    public void tearDown() {
+        arena.close();
+    }
+
+    @Benchmark
+    public void byValue() throws Throwable {
+        // point = unit();
+        MemorySegment unused = (MemorySegment) MH_UNIT_BY_VALUE.invokeExact(BY_VALUE_ALLOCATOR);
+    }
+
+    @Benchmark
+    public void byPtr() throws Throwable {
+        // unit_ptr(&point);
+        MH_UNIT_BY_PTR.invokeExact(point);
+    }
+
+    @Fork(value = 3, jvmArgsAppend = "-Djmh.executor=VIRTUAL")
+    public static class OfVirtual extends CallOverheadByValue {}
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/libCallOverheadByValue.c b/test/micro/org/openjdk/bench/java/lang/foreign/libCallOverheadByValue.c
new file mode 100644
index 00000000000..2eb80f537d8
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/libCallOverheadByValue.c
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+#include "export.h"
+
+typedef struct {
+    double x;
+    double y;
+} DoublePoint;
+
+EXPORT DoublePoint unit() {
+    DoublePoint result = { 1, 0 };
+    return result;
+}
+
+EXPORT void unit_ptr(DoublePoint* out) {
+  *out = unit();
+}

From 01fd49ffb3f02840a360f5d4e19c6b0e6d22cd70 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 2 May 2025 16:56:05 +0000
Subject: [PATCH 247/901] 8355446: Change to Xcode 15.4 for building on macOS
 at Oracle

Reviewed-by: erikj, ihse
---
 doc/building.html         | 8 ++++----
 doc/building.md           | 6 +++---
 make/conf/jib-profiles.js | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index a085f10c48e..722fe6b8d12 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -376,7 +376,7 @@ <h2 id="operating-system-requirements">Operating System
 </tr>
 <tr class="odd">
 <td>macOS</td>
-<td>macOS 13.x (Ventura)</td>
+<td>macOS 14.x</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
@@ -513,8 +513,8 @@ <h3 id="macos">macOS</h3>
 a continuously updated machine running macOS. See the section on <a
 href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
-<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
-14, but earlier versions may also work.</p>
+<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
+earlier versions may also work.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -590,7 +590,7 @@ <h2 id="native-compiler-toolchain-requirements">Native Compiler
 </tr>
 <tr class="even">
 <td>macOS</td>
-<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
+<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
 </tr>
 <tr class="odd">
 <td>Windows</td>
diff --git a/doc/building.md b/doc/building.md
index a31cd5fe775..56bc860a13d 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -175,7 +175,7 @@ time of writing.
 | ----------------- | ---------------------------------- |
 | Linux/x64         | Oracle Enterprise Linux 6.4 / 8.x  |
 | Linux/aarch64     | Oracle Enterprise Linux 7.6 / 8.x  |
-| macOS             | macOS 13.x (Ventura)               |
+| macOS             | macOS 14.x                         |
 | Windows           | Windows Server 2016                |
 
 The double version numbers for Linux are due to the hybrid model used at
@@ -327,7 +327,7 @@ difficult for a project such as the JDK to keep pace with a continuously
 updated machine running macOS. See the section on [Apple Xcode](#apple-xcode)
 on some strategies to deal with this.
 
-It is recommended that you use at least macOS 13 (Ventura) and Xcode 14, but
+It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.
 
 The standard macOS environment contains the basic tooling needed to build, but
@@ -393,7 +393,7 @@ issues.
 | Operating system   | Toolchain version                            |
 | ------------------ | -------------------------------------------- |
 | Linux              | gcc 14.2.0                                   |
-| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)      |
+| macOS              | Apple Xcode 15.4 (using clang 15.0.0)       |
 | Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
 
 All compilers are expected to be able to handle the C11 language standard for
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 40fa453f954..f0cb6f451a3 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1089,7 +1089,7 @@ var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
         linux_x64: "gcc14.2.0-OL6.4+1.0",
-        macosx: "Xcode14.3.1+1.0",
+        macosx: "Xcode15.4+1.0",
         windows_x64: "VS2022-17.13.2+1.0",
         linux_aarch64: "gcc14.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",

From 5faa55902211e5ad8edc51282022ed9db3684b25 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 2 May 2025 16:59:41 +0000
Subject: [PATCH 248/901] 8355444: [java.io] Use @requires tag instead of
 exiting based on "os.name" property value

Reviewed-by: jpai, lancea
---
 test/jdk/java/io/File/MacPathTest.java           | 11 ++++++-----
 test/jdk/java/io/File/MaxPath.java               | 11 ++++++++---
 test/jdk/java/io/File/WinDeviceName.java         |  7 ++-----
 test/jdk/java/io/File/WinMaxPath.java            |  7 ++-----
 test/jdk/java/io/File/WinSpecialFiles.java       |  7 ++-----
 test/jdk/java/io/FileOutputStream/ManyFiles.java | 11 +----------
 6 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/test/jdk/java/io/File/MacPathTest.java b/test/jdk/java/io/File/MacPathTest.java
index c5b50f7e2cf..7082c4c13e9 100644
--- a/test/jdk/java/io/File/MacPathTest.java
+++ b/test/jdk/java/io/File/MacPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, 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
@@ -21,6 +21,11 @@
  * questions.
  */
 
+/*
+ * This test is launched via a ProcessBuilder in the main test MacPath which
+ * includes a @requires (os.family == "mac") tag so no operating system
+ * conditional is applied here.
+ */
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -29,10 +34,6 @@
 public class MacPathTest {
 
     public static void main(String args[]) throws Throwable {
-        String osname = System.getProperty("os.name");
-        if (!osname.contains("OS X") && !osname.contains("Darwin"))
-            return;
-
         // English
         test("TestDir_apple",                                    // test dir
              "dir_macosx",                                       // dir
diff --git a/test/jdk/java/io/File/MaxPath.java b/test/jdk/java/io/File/MaxPath.java
index 658d6a7904b..269b291709c 100644
--- a/test/jdk/java/io/File/MaxPath.java
+++ b/test/jdk/java/io/File/MaxPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 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
@@ -24,16 +24,21 @@
 /* @test
    @bug 6481955
    @summary Path length less than MAX_PATH (260) works on Windows
+   @library /test/lib
  */
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+
+import jtreg.SkippedException;
 
 public class MaxPath {
     public static void main(String[] args) throws Exception {
         String osName = System.getProperty("os.name");
         if (!osName.startsWith("Windows")) {
-            return;
+            throw new SkippedException("This test is run only on Windows");
         }
+
         int MAX_PATH = 260;
         String dir = new File(".").getAbsolutePath() + "\\";
         String padding = "1234567890123456789012345678901234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890";
diff --git a/test/jdk/java/io/File/WinDeviceName.java b/test/jdk/java/io/File/WinDeviceName.java
index a0afe2cade9..0c357fa231f 100644
--- a/test/jdk/java/io/File/WinDeviceName.java
+++ b/test/jdk/java/io/File/WinDeviceName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 6176051 4858457
    @summary Check whether reserved names are handled correctly on Windows
+   @requires (os.family == "windows")
  */
 
 import java.io.File;
@@ -38,10 +39,6 @@ public class WinDeviceName {
     };
     public static void main(String[] args) {
         String osName = System.getProperty("os.name");
-        if (!osName.startsWith("Windows")) {
-            return;
-        }
-
         for (int i = 0; i < devnames.length; i++) {
             String names[] = { devnames[i], devnames[i] + ".TXT",
                                devnames[i].toLowerCase(),
diff --git a/test/jdk/java/io/File/WinMaxPath.java b/test/jdk/java/io/File/WinMaxPath.java
index 21dba4cc12c..704b633395a 100644
--- a/test/jdk/java/io/File/WinMaxPath.java
+++ b/test/jdk/java/io/File/WinMaxPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 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
@@ -25,15 +25,12 @@
    @bug 6384833
    @summary Check if appropriate exception FileNotFoundException gets
             thrown when the pathlengh exceeds the limit.
+   @requires (os.family == "windows")
  */
 
 import java.io.*;
 public class WinMaxPath {
     public static void main(String[] args) throws Exception {
-        String osName = System.getProperty("os.name");
-        if (!osName.startsWith("Windows")) {
-            return;
-        }
         try {
             char[] as = new char[65000];
             java.util.Arrays.fill(as, 'a');
diff --git a/test/jdk/java/io/File/WinSpecialFiles.java b/test/jdk/java/io/File/WinSpecialFiles.java
index a5bff301495..027aba769d9 100644
--- a/test/jdk/java/io/File/WinSpecialFiles.java
+++ b/test/jdk/java/io/File/WinSpecialFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, 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
@@ -25,15 +25,12 @@
    @bug 6192331 6348207 8202076
    @summary Check if File.exists()/length() works correctly on Windows
             special files hiberfil.sys and pagefile.sys
+   @requires (os.family == "windows")
  */
 
 import java.io.File;
 public class WinSpecialFiles {
     public static void main(String[] args) throws Exception {
-        String osName = System.getProperty("os.name");
-        if (!osName.startsWith("Windows")) {
-            return;
-        }
         File root = new File("C:\\");
         File[] dir = root.listFiles();
         for (int i = 0; i < dir.length; i++) {
diff --git a/test/jdk/java/io/FileOutputStream/ManyFiles.java b/test/jdk/java/io/FileOutputStream/ManyFiles.java
index 5584a8f42ca..3aad65de432 100644
--- a/test/jdk/java/io/FileOutputStream/ManyFiles.java
+++ b/test/jdk/java/io/FileOutputStream/ManyFiles.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
@@ -37,15 +37,6 @@ public class ManyFiles {
     static int NUM_FILES = 2050;
 
     public static void main(String args[]) throws Exception {
-        // Linux does not yet allow opening this many files; Solaris
-        // 8 requires an explicit allocation of more file descriptors
-        // to succeed. Since this test is written to check for a
-        // Windows capability it is much simpler to only run it
-        // on that platform.
-        String osName = System.getProperty("os.name");
-        if (osName.startsWith("Linux"))
-            return;
-
         for (int n = 0; n < NUM_FILES; n++) {
             File f = new File("file" + count++);
             files.add(f);

From 4826a91e7a729999343f450ab7ec4621cc418550 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 2 May 2025 16:59:56 +0000
Subject: [PATCH 249/901] 8355443: [java.io] Use @requires tag instead of
 exiting based on File.separatorChar value

Reviewed-by: naoto, vyazici
---
 .../java/io/FileInputStream/LeadingSlash.java | 21 +++++++++----------
 .../jdk/java/io/pathNames/GeneralSolaris.java |  7 ++-----
 test/jdk/java/io/pathNames/GeneralWin32.java  |  7 ++-----
 .../java/io/pathNames/unix/TrailingSlash.java |  8 ++-----
 .../java/io/pathNames/win32/DriveOnly.java    |  2 +-
 .../io/pathNames/win32/DriveRelativePath.java |  8 ++-----
 .../java/io/pathNames/win32/DriveSlash.java   |  6 ++----
 .../java/io/pathNames/win32/RenameDelete.java |  8 ++-----
 test/jdk/java/io/pathNames/win32/SJIS.java    |  2 +-
 .../java/io/pathNames/win32/bug6344646.java   |  8 ++-----
 10 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/test/jdk/java/io/FileInputStream/LeadingSlash.java b/test/jdk/java/io/FileInputStream/LeadingSlash.java
index 8e8595d7bb2..0ce25581b9e 100644
--- a/test/jdk/java/io/FileInputStream/LeadingSlash.java
+++ b/test/jdk/java/io/FileInputStream/LeadingSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, 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
@@ -26,22 +26,21 @@
  * @bug 4487368
  * @summary Test, if FileInputStream can handle
  *          a leading slash in file name.
+ * @requires (os.family == "windows")
  */
 
 import java.io.*;
 
 public class LeadingSlash {
     public static void main (String args[]) throws Exception {
-        if (File.separatorChar == '\\') {       // Windows
-            File file = null;
-            try {
-                file = File.createTempFile("bug", "4487368");
-                new FileInputStream("\\" + file.getPath()).close();
-                new FileOutputStream("\\" + file.getPath()).close();
-            } finally {
-                if (file != null)
-                    file.delete();
-            }
+        File file = null;
+        try {
+            file = File.createTempFile("bug", "4487368");
+            new FileInputStream("\\" + file.getPath()).close();
+            new FileOutputStream("\\" + file.getPath()).close();
+        } finally {
+            if (file != null)
+                file.delete();
         }
     }
 }
diff --git a/test/jdk/java/io/pathNames/GeneralSolaris.java b/test/jdk/java/io/pathNames/GeneralSolaris.java
index 5b3c3d7f7ae..6aae15b4468 100644
--- a/test/jdk/java/io/pathNames/GeneralSolaris.java
+++ b/test/jdk/java/io/pathNames/GeneralSolaris.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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4035924 4095767
    @summary General exhaustive test of solaris pathname handling
+   @requires (os.family != "windows")
    @author Mark Reinhold
 
    @build General GeneralSolaris
@@ -65,10 +66,6 @@ private static void checkPaths() throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '/') {
-            /* This test is only valid on Unix systems */
-            return;
-        }
         if (args.length > 0) debug = true;
 
         initTestData(3);
diff --git a/test/jdk/java/io/pathNames/GeneralWin32.java b/test/jdk/java/io/pathNames/GeneralWin32.java
index 6ee64fd86f0..e7594816680 100644
--- a/test/jdk/java/io/pathNames/GeneralWin32.java
+++ b/test/jdk/java/io/pathNames/GeneralWin32.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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4032066 4039597 4046914 4054511 4065189 4109131 4875229 6983520 8009258
    @summary General exhaustive test of win32 pathname handling
+   @requires (os.family == "windows")
    @author Mark Reinhold
 
    @build General GeneralWin32
@@ -162,10 +163,6 @@ private static void checkUncPaths(int depth) throws Exception {
 
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '\\') {
-            /* This test is only valid on win32 systems */
-            return;
-        }
         if (args.length > 0) debug = true;
 
         initTestData(3);
diff --git a/test/jdk/java/io/pathNames/unix/TrailingSlash.java b/test/jdk/java/io/pathNames/unix/TrailingSlash.java
index b787cd0ef9d..bfab177b2cf 100644
--- a/test/jdk/java/io/pathNames/unix/TrailingSlash.java
+++ b/test/jdk/java/io/pathNames/unix/TrailingSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4427862
  * @summary Ensure that trailing slashes are ignored when opening files
+ * @requires (os.family != "windows")
  */
 
 import java.io.*;
@@ -107,11 +108,6 @@ static void go(String fn, String fns) throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '/') {
-            // This test is only valid on Unix systems
-            return;
-        }
-
         go("xyzzy", "xyzzy");
         go("xyzzy", "xyzzy/");
         go("xyzzy", "xyzzy//");
diff --git a/test/jdk/java/io/pathNames/win32/DriveOnly.java b/test/jdk/java/io/pathNames/win32/DriveOnly.java
index 4281200f0c7..96aba22a408 100644
--- a/test/jdk/java/io/pathNames/win32/DriveOnly.java
+++ b/test/jdk/java/io/pathNames/win32/DriveOnly.java
@@ -24,6 +24,7 @@
 /* @test
    @bug 4096648
    @summary Make sure that isDirectory and lastModified work on "x:"
+   @requires (os.family == "windows")
  */
 
 import java.io.File;
@@ -32,7 +33,6 @@
 public class DriveOnly {
 
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar != '\\') return;
         File f = new File("").getCanonicalFile();
         while (f.getParent() != null) f = f.getParentFile();
         String p = f.getPath().substring(0, 2);
diff --git a/test/jdk/java/io/pathNames/win32/DriveRelativePath.java b/test/jdk/java/io/pathNames/win32/DriveRelativePath.java
index 43fa2175e09..3f8e225ab3f 100644
--- a/test/jdk/java/io/pathNames/win32/DriveRelativePath.java
+++ b/test/jdk/java/io/pathNames/win32/DriveRelativePath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 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
@@ -24,6 +24,7 @@
 /* @test
    @bug 4070044 4164823
    @summary Check getCanonicalPath's treatment of drive-relative paths (win32)
+   @requires (os.family == "windows")
  */
 
 import java.io.*;
@@ -37,11 +38,6 @@ static void fail(String s) {
 
     public static void main(String[] args) throws IOException {
 
-        if (File.separatorChar != '\\') {
-            /* This test is only valid on win32 systems */
-            return;
-        }
-
         File f = new File("foo");
         String c = f.getCanonicalPath();
         System.err.println(c);
diff --git a/test/jdk/java/io/pathNames/win32/DriveSlash.java b/test/jdk/java/io/pathNames/win32/DriveSlash.java
index feb651204d0..32777ad83d4 100644
--- a/test/jdk/java/io/pathNames/win32/DriveSlash.java
+++ b/test/jdk/java/io/pathNames/win32/DriveSlash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 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
@@ -25,6 +25,7 @@
    @bug 4065189
    @summary Check that win32 pathnames of the form "C:\\"
             can be listed by the File.list method
+   @requires (os.family == "windows")
    @author Mark Reinhold
  */
 
@@ -35,9 +36,6 @@ public class DriveSlash {
 
     public static void main(String[] args) throws Exception {
 
-        /* This test is only valid on win32 systems */
-        if (File.separatorChar != '\\') return;
-
         File f = new File("c:\\");
         System.err.println(f.getCanonicalPath());
         String[] fs = f.list();
diff --git a/test/jdk/java/io/pathNames/win32/RenameDelete.java b/test/jdk/java/io/pathNames/win32/RenameDelete.java
index a6cfffade4b..4b674ddea91 100644
--- a/test/jdk/java/io/pathNames/win32/RenameDelete.java
+++ b/test/jdk/java/io/pathNames/win32/RenameDelete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 4042592 4042593
+   @requires (os.family == "windows")
  * @summary Test operation of rename and delete on win32
  */
 
@@ -40,11 +41,6 @@ public class RenameDelete {
     public static void main(String[] args) throws Exception {
         boolean success = false;
 
-        if (File.separatorChar != '\\') {
-            System.err.println("Not a win32 platform -- test inapplicable");
-            return;
-        }
-
         //construct a test file in this location
         File f1 = new File(".");
         StringBuffer location = new StringBuffer("\\");
diff --git a/test/jdk/java/io/pathNames/win32/SJIS.java b/test/jdk/java/io/pathNames/win32/SJIS.java
index 580f06330a6..11c69dca8df 100644
--- a/test/jdk/java/io/pathNames/win32/SJIS.java
+++ b/test/jdk/java/io/pathNames/win32/SJIS.java
@@ -25,6 +25,7 @@
    @bug 4039597
    @summary Check that pathnames containing double-byte characters are not
             corrupted by win32 path processing
+   @requires (os.family == "windows")
    @author Mark Reinhold
    @library /test/lib
 */
@@ -52,7 +53,6 @@ public static void main(String[] args) throws Exception {
 
         /* This test is only valid on win32 systems
            that use the SJIS encoding */
-        if (File.separatorChar != '\\') return;
         String enc = System.getProperty("native.encoding");
         if ((enc == null) || !enc.equals("MS932")) {
             throw new SkippedException(
diff --git a/test/jdk/java/io/pathNames/win32/bug6344646.java b/test/jdk/java/io/pathNames/win32/bug6344646.java
index a89d72fe165..ecb4bc2bc66 100644
--- a/test/jdk/java/io/pathNames/win32/bug6344646.java
+++ b/test/jdk/java/io/pathNames/win32/bug6344646.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
@@ -25,6 +25,7 @@
  * @bug 6344646
  * @summary tests that WinNTFileSystem.hashCode() uses
  *    locale independent case mapping.
+ * @requires (os.family == "windows")
  */
 
 import java.io.*;
@@ -34,11 +35,6 @@ public class bug6344646 {
     public static void main(String[] s) {
         Locale reservedLocale = Locale.getDefault();
         try {
-            /* This test is only valid on win32 systems */
-            if (File.separatorChar != '\\') {
-                return;
-            }
-
             Locale.setDefault(Locale.of("lt"));
             File f1 = new File("J\u0301");
             File f2 = new File("j\u0301");

From 84f570c573f5c355cf55e05d06ddb383deb476ca Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Fri, 2 May 2025 17:00:12 +0000
Subject: [PATCH 250/901] 8355445: [java.nio] Use @requires tag instead of
 exiting based on "os.name" property value

Reviewed-by: lancea, jpai, iris
---
 test/jdk/java/nio/channels/Selector/HelperSlowToDie.java  | 8 ++------
 .../nio/channels/SocketChannel/AsyncCloseChannel.java     | 7 ++-----
 .../nio/channels/SocketChannel/SocketInheritance.java     | 6 ++----
 .../inheritedChannel/InheritedChannelTest.java            | 8 +-------
 test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java     | 6 ++----
 test/jdk/java/nio/file/DirectoryStream/DriveLetter.java   | 8 ++------
 test/jdk/java/nio/file/WatchService/FileTreeModifier.java | 8 ++------
 7 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/test/jdk/java/nio/channels/Selector/HelperSlowToDie.java b/test/jdk/java/nio/channels/Selector/HelperSlowToDie.java
index 729aefaa05c..6111d0c2da2 100644
--- a/test/jdk/java/nio/channels/Selector/HelperSlowToDie.java
+++ b/test/jdk/java/nio/channels/Selector/HelperSlowToDie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, 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
@@ -26,6 +26,7 @@
  * @bug 6823609
  * @summary Selector.select can hangs on Windows for cases where a helper thread
  *   becomes redudant but a new helper is immediately needed.
+ * @requires (os.family == "windows")
  */
 
 import java.nio.channels.*;
@@ -37,11 +38,6 @@ public class HelperSlowToDie {
     private static volatile boolean done;
 
     public static void main(String[] args) throws IOException {
-        if (!System.getProperty("os.name").startsWith("Windows")) {
-            System.out.println("Test skipped as it verifies a Windows specific bug");
-            return;
-        }
-
         Selector sel = Selector.open();
 
         // register channels
diff --git a/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java b/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java
index 2561c5b9b06..cf26ef345f8 100644
--- a/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java
+++ b/test/jdk/java/nio/channels/SocketChannel/AsyncCloseChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2019, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 6285901 6501089
  * @summary Check no data is written to wrong socket channel during async closing.
+ * @requires (os.family != "windows")
  */
 
 import java.io.IOException;
@@ -44,10 +45,6 @@ public class AsyncCloseChannel {
     static int targetPort;
 
     public static void main(String args[]) throws Exception {
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            System.err.println("WARNING: Still does not work on Windows!");
-            return;
-        }
         Thread ss = new SensorServer(); ss.start();
         Thread ts = new TargetServer(); ts.start();
 
diff --git a/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java b/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java
index 18e26b38c55..2e547f9de04 100644
--- a/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java
+++ b/test/jdk/java/nio/channels/SocketChannel/SocketInheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, 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
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary Sockets shouldn't be inherited when creating a child process
+ * @requires (os.family == "windows")
  */
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
@@ -138,9 +139,6 @@ static void start() throws Exception {
     }
 
     public static void main(String[] args) throws Exception {
-        if (!System.getProperty("os.name").startsWith("Windows"))
-            return;
-
         if (args.length == 0) {
             start();
         } else {
diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
index be50e8b7864..99a127ca5ad 100644
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 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
@@ -59,15 +59,9 @@
 
 public class InheritedChannelTest {
 
-    private static final String TEST_SRC = System.getProperty("test.src");
     private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
     private static final String TEST_CLASSES = System.getProperty("test.classes");
 
-    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
-
-    private static final String ARCH = System.getProperty("os.arch");
-    private static final String OS_ARCH = ARCH.equals("i386") ? "i586" : ARCH;
-
     private static final Path libraryPath
             = Paths.get(System.getProperty("java.library.path"));
 
diff --git a/test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java b/test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java
index cee6e633470..7c0cd90345a 100644
--- a/test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.java
+++ b/test/jdk/java/nio/charset/RemovingSunIO/TestCOMP.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
@@ -24,6 +24,7 @@
 /* @test
    @bug 6176819
    @summary Check if COMPUND_TEXT charset works as expected
+   @requires (os.family != "windows")
    @run main/timeout=1200 TestCOMP
  */
 
@@ -35,9 +36,6 @@
 
 public class TestCOMP {
     public static void main(String[] argv) throws CharacterCodingException {
-        String osName = System.getProperty("os.name");
-        if (osName.startsWith("Windows"))
-            return;
         try {
             String src =
                 "JIS0208\u4eb0" +
diff --git a/test/jdk/java/nio/file/DirectoryStream/DriveLetter.java b/test/jdk/java/nio/file/DirectoryStream/DriveLetter.java
index cf2e7e59132..6a9a1f60e69 100644
--- a/test/jdk/java/nio/file/DirectoryStream/DriveLetter.java
+++ b/test/jdk/java/nio/file/DirectoryStream/DriveLetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, 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 @@
  * @bug 6808647
  * @summary Checks that a DirectoryStream's iterator returns the expected
  *    path when opening a directory by specifying only the drive letter.
+ * @requires (os.family == "windows")
  * @library ..
  */
 
@@ -35,11 +36,6 @@
 public class DriveLetter {
 
     public static void main(String[] args) throws IOException {
-        String os = System.getProperty("os.name");
-        if (!os.startsWith("Windows")) {
-            System.out.println("This is Windows specific test");
-            return;
-        }
         String here = System.getProperty("user.dir");
         if (here.length() < 2 || here.charAt(1) != ':')
             throw new RuntimeException("Unable to determine drive letter");
diff --git a/test/jdk/java/nio/file/WatchService/FileTreeModifier.java b/test/jdk/java/nio/file/WatchService/FileTreeModifier.java
index 1648df003a6..a36a22147ab 100644
--- a/test/jdk/java/nio/file/WatchService/FileTreeModifier.java
+++ b/test/jdk/java/nio/file/WatchService/FileTreeModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, 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
@@ -24,6 +24,7 @@
 /* @test
  * @bug 4313887 6838333
  * @summary Sanity test for JDK-specific FILE_TREE watch event modifier
+ * @requires (os.family == "windows")
  * @library ..
  * @modules jdk.unsupported
  */
@@ -129,11 +130,6 @@ static void doTest(Path top) throws IOException {
 
 
     public static void main(String[] args) throws IOException {
-        if (!System.getProperty("os.name").startsWith("Windows")) {
-            System.out.println("This is Windows-only test at this time!");
-            return;
-        }
-
         Path dir = TestUtil.createTemporaryDirectory();
         try {
             doTest(dir);

From c8bbcaf5de6982f673504a8dc766fb80bb6f0d07 Mon Sep 17 00:00:00 2001
From: Mohamed Issa <mohamed.issa@intel.com>
Date: Fri, 2 May 2025 17:21:50 +0000
Subject: [PATCH 251/901] 8348638: Performance regression in Math.tanh

Reviewed-by: jbhateja, epeter, sviswanathan
---
 .../cpu/x86/stubGenerator_x86_64_tanh.cpp     |  35 ++--
 .../org/openjdk/bench/java/lang/TanhPerf.java | 154 ++++++++++++++++++
 2 files changed, 171 insertions(+), 18 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/TanhPerf.java

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
index d13809bfcd9..52ce2731b1f 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2024, Intel Corporation. All rights reserved.
+* Copyright (c) 2024, 2025, Intel Corporation. All rights reserved.
 * Intel Math Library (LIBM) Source Code
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +46,7 @@
 //                      for |x| in [23/64,3*2^7)
 // e^{-2*|x|}=2^{-k-f}*2^{-r} ~ 2^{-k}*(Tn+Dn)*(1+p)=(T0+D0)*(1+p)
 //
-// For |x| in [2^{-4},2^5):
+// For |x| in [2^{-4},22):
 //         2^{-r}-1 ~ p=c1*r+c2*r^2+..+c5*r^5
 //      Let R=1/(1+T0+p*T0), truncated to 35 significant bits
 //  R=1/(1+T0+D0+p*(T0+D0))*(1+eps), |eps|<2^{-33}
@@ -66,11 +66,11 @@
 //
 // For |x|<2^{-64}:  x is returned
 //
-// For |x|>=2^32: return +/-1
+// For |x|>=22: return +/-1
 //
 // Special cases:
 //  tanh(NaN) = quiet NaN, and raise invalid exception
-//  tanh(INF) = that INF
+//  tanh(+/-INF) = +/-1
 //  tanh(+/-0) = +/-0
 //
 /******************************************************************************/
@@ -324,6 +324,12 @@ address StubGenerator::generate_libmTanh() {
   __ enter(); // required for proper stackwalking of RuntimeStub frame
 
   __ bind(B1_2);
+  __ pextrw(rcx, xmm0, 3);
+  __ movl(rdx, 32768);
+  __ andl(rdx, rcx);
+  __ andl(rcx, 32767);
+  __ cmpl(rcx, 16438);
+  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_2_0_1); // Branch only if |x| >= 22
   __ movsd(xmm3, ExternalAddress(HALFMASK), r11 /*rscratch*/);
   __ xorpd(xmm4, xmm4);
   __ movsd(xmm1, ExternalAddress(L2E), r11 /*rscratch*/);
@@ -331,16 +337,12 @@ address StubGenerator::generate_libmTanh() {
   __ movl(rax, 32768);
   __ pinsrw(xmm4, rax, 3);
   __ movsd(xmm6,  ExternalAddress(Shifter), r11 /*rscratch*/);
-  __ pextrw(rcx, xmm0, 3);
   __ andpd(xmm3, xmm0);
   __ andnpd(xmm4, xmm0);
   __ pshufd(xmm5, xmm4, 68);
-  __ movl(rdx, 32768);
-  __ andl(rdx, rcx);
-  __ andl(rcx, 32767);
   __ subl(rcx, 16304);
-  __ cmpl(rcx, 144);
-  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_1);
+  __ cmpl(rcx, 134);
+  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_1); // Branch only if |x| is not in [2^{-4},22)
   __ subsd(xmm4, xmm3);
   __ mulsd(xmm3, xmm1);
   __ mulsd(xmm2, xmm5);
@@ -427,8 +429,8 @@ address StubGenerator::generate_libmTanh() {
 
   __ bind(L_2TAG_PACKET_0_0_1);
   __ addl(rcx, 960);
-  __ cmpl(rcx, 1104);
-  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_1_0_1);
+  __ cmpl(rcx, 1094);
+  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_1_0_1); // Branch only if |x| not in [2^{-64}, 2^{-4})
   __ movdqu(xmm2, ExternalAddress(pv), r11 /*rscratch*/);
   __ pshufd(xmm1, xmm0, 68);
   __ movdqu(xmm3, ExternalAddress(pv + 16), r11 /*rscratch*/);
@@ -449,11 +451,8 @@ address StubGenerator::generate_libmTanh() {
   __ jmp(B1_4);
 
   __ bind(L_2TAG_PACKET_1_0_1);
-  __ addl(rcx, 15344);
-  __ cmpl(rcx, 16448);
-  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_2_0_1);
   __ cmpl(rcx, 16);
-  __ jcc(Assembler::below, L_2TAG_PACKET_3_0_1);
+  __ jcc(Assembler::below, L_2TAG_PACKET_3_0_1); // Branch only if |x| is denormalized
   __ xorpd(xmm2, xmm2);
   __ movl(rax, 17392);
   __ pinsrw(xmm2, rax, 3);
@@ -468,7 +467,7 @@ address StubGenerator::generate_libmTanh() {
 
   __ bind(L_2TAG_PACKET_2_0_1);
   __ cmpl(rcx, 32752);
-  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_4_0_1);
+  __ jcc(Assembler::aboveEqual, L_2TAG_PACKET_4_0_1); // Branch only if |x| is INF or NaN
   __ xorpd(xmm2, xmm2);
   __ movl(rcx, 15344);
   __ pinsrw(xmm2, rcx, 3);
@@ -489,7 +488,7 @@ address StubGenerator::generate_libmTanh() {
   __ movdl(rcx, xmm2);
   __ orl(rcx, rax);
   __ cmpl(rcx, 0);
-  __ jcc(Assembler::equal, L_2TAG_PACKET_5_0_1);
+  __ jcc(Assembler::equal, L_2TAG_PACKET_5_0_1); // Branch only if |x| is not NaN
   __ addsd(xmm0, xmm0);
 
   __ bind(B1_4);
diff --git a/test/micro/org/openjdk/bench/java/lang/TanhPerf.java b/test/micro/org/openjdk/bench/java/lang/TanhPerf.java
new file mode 100644
index 00000000000..6747b6b2aa3
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/TanhPerf.java
@@ -0,0 +1,154 @@
+/*
+ * 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.java.lang;
+
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.Random;
+
+public class TanhPerf {
+
+    @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.MILLISECONDS)
+    @Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.MILLISECONDS)
+    @Fork(2)
+    @BenchmarkMode(Mode.Throughput)
+    @State(Scope.Thread)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public static class TanhPerfRanges {
+        public static int tanhInputCount = 2048;
+
+        @Param({"0", "1", "2", "3"})
+        public int tanhRangeIndex;
+
+        public double [] tanhPosRandInputs;
+        public double [] tanhNegRandInputs;
+        public int       tanhInputIndex = 0;
+        public double    tanhRangeInputs[][] = {{0.0, 0x1.0P-55}, {0x1.0P-55, 1.0}, {1.0, 22.0}, {22.1, 1.7976931348623157E308} };
+
+        @Setup
+        public void setupValues() {
+            Random random = new Random(1023);
+
+            // Fill the positive and negative tanh vectors with random values
+            tanhPosRandInputs = new double[tanhInputCount];
+            tanhNegRandInputs = new double[tanhInputCount];
+
+            for (int i = 0; i < tanhInputCount; i++) {
+                double tanhLowerBound = tanhRangeInputs[tanhRangeIndex][0];
+                double tanhUpperBound = tanhRangeInputs[tanhRangeIndex][1];
+                tanhPosRandInputs[i] = random.nextDouble(tanhLowerBound, tanhUpperBound);
+                tanhNegRandInputs[i] = random.nextDouble(-tanhUpperBound, -tanhLowerBound);
+            }
+        }
+
+        @Benchmark
+        @OperationsPerInvocation(2048)
+        public double  tanhPosRangeDouble() {
+            double res = 0.0;
+            for (int i = 0; i < tanhInputCount; i++) {
+                res += Math.tanh(tanhPosRandInputs[i]);
+            }
+            return res;
+        }
+
+        @Benchmark
+        @OperationsPerInvocation(2048)
+        public double  tanhNegRangeDouble() {
+            double res = 0.0;
+            for (int i = 0; i < tanhInputCount; i++) {
+                res += Math.tanh(tanhNegRandInputs[i]);
+            }
+            return res;
+        }
+    }
+
+    @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Fork(2)
+    @BenchmarkMode(Mode.Throughput)
+    @State(Scope.Thread)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public static class TanhPerfConstant {
+        public static final double constDoubleTiny  = 0x1.0P-57;
+        public static final double constDoubleSmall = 0x1.0P-54;
+        public static final double constDouble1     = 1.0;
+        public static final double constDouble21    = 21.0;
+        public static final double constDoubleLarge = 23.0;
+
+        @Benchmark
+        public double  tanhConstDoubleTiny() {
+            return  Math.tanh(constDoubleTiny);
+        }
+
+        @Benchmark
+        public double  tanhConstDoubleSmall() {
+            return  Math.tanh(constDoubleSmall);
+        }
+
+        @Benchmark
+        public double  tanhConstDouble1() {
+            return  Math.tanh(constDouble1);
+        }
+
+        @Benchmark
+        public double  tanhConstDouble21() {
+            return  Math.tanh(constDouble21);
+        }
+
+        @Benchmark
+        public double  tanhConstDoubleLarge() {
+            return  Math.tanh(constDoubleLarge);
+        }
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(TanhPerfRanges.class.getSimpleName())
+                .build();
+
+        new Runner(opt).run();
+
+        opt = new OptionsBuilder()
+                .include(TanhPerfConstant.class.getSimpleName())
+                .build();
+
+        new Runner(opt).run();
+    }
+}

From 60ba81d77f0e299b8131cf23b1253689fa898e85 Mon Sep 17 00:00:00 2001
From: "Peter B. Kessler" <pbk@openjdk.org>
Date: Fri, 2 May 2025 18:54:11 +0000
Subject: [PATCH 252/901] 8354347: Increase the default padding size for
 aarch64 in JDK code.

Reviewed-by: aph, ecaspole
---
 src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
index faf635dc332..948ba97aa22 100644
--- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.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.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -46,7 +46,7 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 #define DEFAULT_CACHE_LINE_SIZE 64
 
 // The default padding size for data structures to avoid false sharing.
-#define DEFAULT_PADDING_SIZE DEFAULT_CACHE_LINE_SIZE
+#define DEFAULT_PADDING_SIZE (2*DEFAULT_CACHE_LINE_SIZE)
 
 // According to the ARMv8 ARM, "Concurrent modification and execution
 // of instructions can lead to the resulting instruction performing

From 56468c42bef8524e53a929dc2ae603cff05b55e3 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Fri, 2 May 2025 20:44:22 +0000
Subject: [PATCH 253/901] 8322810: Lambda expression types can't be classes

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Attr.java        |  9 ++++
 .../tools/javac/resources/compiler.properties |  2 +-
 .../tools/javac/diags/examples.not-yet.txt    |  2 -
 .../examples/NotAnInterfaceComponent.java     |  6 +--
 .../lambda/ClassInIntersectionTypeTest.java   | 49 +++++++++++++++++++
 .../lambda/ClassInIntersectionTypeTest.out    | 12 +++++
 6 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.java
 create mode 100644 test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 6dc0238f87e..53ce8b1b494 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -3343,6 +3343,10 @@ TargetInfo getTargetInfo(JCPolyExpression that, ResultInfo resultInfo, List<Type
                                 // do nothing
                             }
                         }
+                        if (bound.tsym != syms.objectType.tsym && (!bound.isInterface() || (bound.tsym.flags() & ANNOTATION) != 0)) {
+                            // bound must be j.l.Object or an interface, but not an annotation
+                            reportIntersectionError(that, "not.an.intf.component", bound);
+                        }
                         bound = types.removeWildcards(bound);
                         components.add(bound);
                     }
@@ -3366,6 +3370,11 @@ TargetInfo getTargetInfo(JCPolyExpression that, ResultInfo resultInfo, List<Type
             return new TargetInfo(currentTarget, lambdaType);
         }
 
+        private void reportIntersectionError(DiagnosticPosition pos, String key, Object... args) {
+             resultInfo.checkContext.report(pos,
+                 diags.fragment(Fragments.BadIntersectionTargetForFunctionalExpr(diags.fragment(key, args))));
+        }
+
         void preFlow(JCLambda tree) {
             attrRecover.doRecovery();
             new PostAttrAnalyzer() {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 37cb145f1a4..79d15a96a6e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -337,7 +337,7 @@ compiler.misc.bad.intersection.target.for.functional.expr=\
 
 # 0: symbol or type
 compiler.misc.not.an.intf.component=\
-    component type {0} is not an interface
+    component type {0} is not an interface or java.lang.Object
 
 # 0: kind name, 1: message segment
 compiler.err.invalid.mref=\
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index 04a8b9b1a68..b29f20e5ebb 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -145,8 +145,6 @@ compiler.note.multiple.elements                         # needs user code
 compiler.err.preview.feature.disabled.classfile         # preview feature support: needs compilation against classfile
 compiler.warn.preview.feature.use.classfile             # preview feature support: needs compilation against classfile
 compiler.note.preview.plural.additional                 # preview feature support: diag test causes intermittent failures (see JDK-8201498)
-compiler.misc.bad.intersection.target.for.functional.expr  # currently not generated, should be removed?
-compiler.misc.not.an.intf.component
 compiler.warn.declared.using.preview                    # after making sealed classes a final feature there is no other
                                                         # preview feature but we should keep this key for future use just
                                                         # in case
diff --git a/test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.java b/test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.java
index ae97a70e0f7..9adb4daf5b1 100644
--- a/test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.java
+++ b/test/langtools/tools/javac/diags/examples/NotAnInterfaceComponent.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
@@ -21,9 +21,9 @@
  * questions.
  */
 
-// key: compiler.misc.not.a.functional.intf.1
+// key: compiler.misc.bad.intersection.target.for.functional.expr
+// key: compiler.misc.not.an.intf.component
 // key: compiler.err.prob.found.req
-// key: compiler.misc.incompatible.abstracts
 
 class NotAnInterfaceComponent {
     Object o = (String & Runnable) ()-> { };
diff --git a/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.java b/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.java
new file mode 100644
index 00000000000..a0b2ce60229
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.java
@@ -0,0 +1,49 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8322810
+ * @summary Lambda expressions can implement classes
+ * @compile/fail/ref=ClassInIntersectionTypeTest.out -XDrawDiagnostics ClassInIntersectionTypeTest.java
+ */
+
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+
+public class ClassInIntersectionTypeTest {
+    // test 1
+    void m1() {
+        ClassInIntersectionTypeTest r1 = (ClassInIntersectionTypeTest & Runnable) () -> System.out.println("Hello, World!");
+        ClassInIntersectionTypeTest r2 = (ClassInIntersectionTypeTest & Runnable) ClassInIntersectionTypeTest::run1;
+    }
+
+    static void run1() {}
+
+    // test 2
+    static void foo() {
+        run2(() -> System.out.println("Hello, World!"));
+        run2(ClassInIntersectionTypeTest::run1);
+    }
+
+    static <T extends ClassInIntersectionTypeTest & Runnable> void run2(T t) {
+        t.run();
+    }
+
+    static Class<? extends Annotation> myAnnoType() { return null; }
+    @interface Anno {}
+    @interface Anno2 {}
+
+    Anno anno1 = (Anno & Serializable) ()-> null; // annotations not allowed
+    Anno anno2 = (Serializable & Anno & Anno2) ()-> null; // annotations not allowed
+    Anno anno3 = (Anno & Serializable) ClassInIntersectionTypeTest::myAnnoType; // annotations not allowed
+    Anno anno4 = (Serializable & Anno2 & Anno) ClassInIntersectionTypeTest::myAnnoType; // annotations not allowed
+
+    static void bar() {
+        annotationType(() -> null);
+        annotationType(ClassInIntersectionTypeTest::myAnnoType);
+    }
+
+    static <T extends Anno & Serializable> void annotationType(T t) {
+        t.annotationType();
+    }
+
+    Anno anno5 = ()-> null; // annotations are not functional interfaces
+}
diff --git a/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.out b/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.out
new file mode 100644
index 00000000000..b0a6bc2ab84
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/ClassInIntersectionTypeTest.out
@@ -0,0 +1,12 @@
+ClassInIntersectionTypeTest.java:14:83: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest))
+ClassInIntersectionTypeTest.java:15:83: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest))
+ClassInIntersectionTypeTest.java:22:13: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest)))
+ClassInIntersectionTypeTest.java:23:13: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest)))
+ClassInIntersectionTypeTest.java:34:40: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno))
+ClassInIntersectionTypeTest.java:35:48: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno))
+ClassInIntersectionTypeTest.java:36:40: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno))
+ClassInIntersectionTypeTest.java:37:48: compiler.err.prob.found.req: (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno2))
+ClassInIntersectionTypeTest.java:40:23: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno)))
+ClassInIntersectionTypeTest.java:41:23: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T, (compiler.misc.bad.intersection.target.for.functional.expr: (compiler.misc.not.an.intf.component: ClassInIntersectionTypeTest.Anno)))
+ClassInIntersectionTypeTest.java:48:18: compiler.err.prob.found.req: (compiler.misc.not.a.functional.intf: ClassInIntersectionTypeTest.Anno)
+11 errors

From 4d2d12987f8c1be64719a7d01276a789af245ee2 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 2 May 2025 22:34:10 +0000
Subject: [PATCH 254/901] 8355962: RISCV64 cross build fails after 8354996

Reviewed-by: erikj, manc
---
 make/GenerateLinkOptData.gmk                                | 2 +-
 .../src/classes/build/tools/classlist/HelloClasslist.java   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 54022e4e27a..5fc745ba223 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -66,7 +66,7 @@ endif
 #   default classlist is minimal, let's filter out the '@cp' lines until we can
 #   find a proper solution.
 CLASSLIST_FILE_VM_OPTS = \
-    -Duser.language=en -Duser.country=US --enable-native-access=ALL-UNNAMED
+    -Duser.language=en -Duser.country=US
 
 # Save the stderr output of the command and print it along with stdout in case
 # something goes wrong.
diff --git a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
index 9434889e0bb..fa1b33bb03e 100644
--- a/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
+++ b/make/jdk/src/classes/build/tools/classlist/HelloClasslist.java
@@ -31,8 +31,6 @@
  */
 package build.tools.classlist;
 
-import java.lang.foreign.FunctionDescriptor;
-import java.lang.foreign.Linker;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -174,10 +172,6 @@ record B(int b) { }
         // an inconsistency in the classlist between builds (see JDK-8295951).
         // To avoid the problem, load the class explicitly.
         Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
-
-        // Initialize FFM linkers
-        var signature = FunctionDescriptor.ofVoid();
-        Linker.nativeLinker().downcallHandle(signature);
     }
 
     public HelloClasslist() {}

From 03f0ec4a35855b59c8faaf4be2e7569a12b4d5db Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Fri, 2 May 2025 23:15:26 +0000
Subject: [PATCH 255/901] 8183348: Better cleanup for
 jdk/test/sun/security/pkcs12/P12SecretKey.java

Reviewed-by: rhalade, weijun
---
 .../jdk/sun/security/pkcs12/P12SecretKey.java | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/test/jdk/sun/security/pkcs12/P12SecretKey.java b/test/jdk/sun/security/pkcs12/P12SecretKey.java
index ed599a55962..80f037138bf 100644
--- a/test/jdk/sun/security/pkcs12/P12SecretKey.java
+++ b/test/jdk/sun/security/pkcs12/P12SecretKey.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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8149411 8007632
  * @summary Get AES key from keystore (uses SecretKeySpec not SecretKeyFactory)
+ * @library /test/lib
  * @run main P12SecretKey pkcs12 AES 128
  * @run main P12SecretKey pkcs12 DES 56
  * @run main P12SecretKey pkcs12 DESede 168
@@ -33,14 +34,14 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.nio.file.Files;
 import java.security.KeyStore;
-import java.security.cert.CertificateException;
 import java.util.Arrays;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
+import static jdk.test.lib.Utils.createTempFile;
+
 public class P12SecretKey {
 
     private static final String ALIAS = "alias";
@@ -66,30 +67,32 @@ private void run(String keystoreType, String algName, int keySize) throws Except
         KeyStore.ProtectionParameter kspp = new KeyStore.PasswordProtection(pw);
         ks.setEntry(ALIAS, ske, kspp);
 
-        File ksFile = File.createTempFile("test", ".test");
+        // temporary files are created in scratch directory
+        final File ksFile = createTempFile(
+                String.format("%s-%s-%d-",
+                                keystoreType,
+                                algName,
+                                keySize),
+                ".ks").toFile();
 
-        try {
-            try (FileOutputStream fos = new FileOutputStream(ksFile)) {
-                ks.store(fos, pw);
-                fos.flush();
-            }
+        try (FileOutputStream fos = new FileOutputStream(ksFile)) {
+            ks.store(fos, pw);
+            fos.flush();
+        }
 
-            // now see if we can get it back
-            try (FileInputStream fis = new FileInputStream(ksFile)) {
-                KeyStore ks2 = KeyStore.getInstance(keystoreType);
-                ks2.load(fis, pw);
-                KeyStore.Entry entry = ks2.getEntry(ALIAS, kspp);
-                SecretKey keyIn = ((KeyStore.SecretKeyEntry) entry).getSecretKey();
-                if (Arrays.equals(key.getEncoded(), keyIn.getEncoded())) {
-                    System.err.println("OK: worked just fine with " + keystoreType +
-                            " keystore");
-                } else {
-                    System.err.println("ERROR: keys are NOT equal after storing in "
-                            + keystoreType + " keystore");
-                }
+        // now see if we can get it back
+        try (FileInputStream fis = new FileInputStream(ksFile)) {
+            KeyStore ks2 = KeyStore.getInstance(keystoreType);
+            ks2.load(fis, pw);
+            KeyStore.Entry entry = ks2.getEntry(ALIAS, kspp);
+            SecretKey keyIn = ((KeyStore.SecretKeyEntry) entry).getSecretKey();
+            if (Arrays.equals(key.getEncoded(), keyIn.getEncoded())) {
+                System.err.println("OK: worked just fine with " + keystoreType +
+                                   " keystore");
+            } else {
+                throw new RuntimeException("ERROR: keys are NOT equal after storing in "
+                                           + keystoreType + " keystore");
             }
-        } finally {
-            Files.deleteIfExists(ksFile.toPath());
         }
     }
 }

From 5b3ae9210564c16b4d350dabd0445248cb205698 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Mon, 5 May 2025 04:02:51 +0000
Subject: [PATCH 256/901] 8350182: [s390x] Relativize locals in interpreter
 frames

Reviewed-by: lucy, rrich
---
 src/hotspot/cpu/s390/frame_s390.cpp                  |  5 +++--
 src/hotspot/cpu/s390/frame_s390.hpp                  |  6 +++++-
 src/hotspot/cpu/s390/frame_s390.inline.hpp           |  5 +++--
 src/hotspot/cpu/s390/interp_masm_s390.cpp            | 12 +++++++++++-
 .../cpu/s390/templateInterpreterGenerator_s390.cpp   |  6 +++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
index 01ed22c7d86..b602d0adce5 100644
--- a/src/hotspot/cpu/s390/frame_s390.cpp
+++ b/src/hotspot/cpu/s390/frame_s390.cpp
@@ -185,7 +185,8 @@ bool frame::is_interpreted_frame() const {
 
 void frame::interpreter_frame_set_locals(intptr_t* locs)  {
   assert(is_interpreted_frame(), "interpreted frame expected");
-  ijava_state_unchecked()->locals = (uint64_t)locs;
+  // set relativized locals
+  *addr_at(_z_ijava_idx(locals)) = (intptr_t) (locs - fp());
 }
 
 // sender_sp
@@ -340,7 +341,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
   if (MetaspaceObj::is_valid(cp) == false) return false;
 
   // validate locals
-  address locals = (address)(ijava_state_unchecked()->locals);
+  address locals = (address)interpreter_frame_locals();
   return thread->is_in_stack_range_incl(locals, (address)fp());
 }
 
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 3a6b3f33a55..1aaabfb1230 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_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, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -330,6 +330,10 @@
 #define _z_ijava_state_neg(_component) \
          (int) (-frame::z_ijava_state_size + offset_of(frame::z_ijava_state, _component))
 
+// Frame slot index relative to fp
+#define _z_ijava_idx(_component) \
+        (_z_ijava_state_neg(_component) >> LogBytesPerWord)
+
   // ENTRY_FRAME
 
   struct z_entry_frame_locals {
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index d29106cfc40..b033b3f939b 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.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, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -180,7 +180,8 @@ inline intptr_t* frame::link_or_null() const {
 }
 
 inline intptr_t* frame::interpreter_frame_locals() const {
-  return (intptr_t*) (ijava_state()->locals);
+  intptr_t n = *addr_at(_z_ijava_idx(locals));
+  return &fp()[n]; // return relativized locals
 }
 
 inline intptr_t* frame::interpreter_frame_bcp_addr() const {
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index 09995334330..a7bea358f4e 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -104,7 +104,15 @@ void InterpreterMacroAssembler::dispatch_base(TosState state, address* table, bo
   }
   { Label OK;
     // check if the locals pointer in Z_locals is correct
-    z_cg(Z_locals, _z_ijava_state_neg(locals), Z_fp);
+
+    // _z_ijava_state_neg(locals)) is fp relativized, so we need to
+    // extract the pointer.
+
+    z_lg(Z_R1_scratch, Address(Z_fp, _z_ijava_state_neg(locals)));
+    z_sllg(Z_R1_scratch, Z_R1_scratch, Interpreter::logStackElementSize);
+    z_agr(Z_R1_scratch, Z_fp);
+
+    z_cgr(Z_locals, Z_R1_scratch);
     z_bre(OK);
     reentry = stop_chain_static(reentry, "invalid locals pointer Z_locals: " FILE_AND_LINE);
     bind(OK);
@@ -684,6 +692,8 @@ void InterpreterMacroAssembler::save_mdp(Register mdp) {
 void InterpreterMacroAssembler::restore_locals() {
   asm_assert_ijava_state_magic(Z_locals);
   z_lg(Z_locals, Address(Z_fp, _z_ijava_state_neg(locals)));
+  z_sllg(Z_locals, Z_locals, Interpreter::logStackElementSize);
+  z_agr(Z_locals, Z_fp);
 }
 
 void InterpreterMacroAssembler::get_method(Register reg) {
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index a52d20e32a3..4edf8046833 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1134,7 +1134,11 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ z_agr(Z_locals, Z_esp);
   // z_ijava_state->locals - i*BytesPerWord points to i-th Java local (i starts at 0)
   // z_ijava_state->locals = Z_esp + parameter_count bytes
-  __ z_stg(Z_locals, _z_ijava_state_neg(locals), fp);
+
+  __ z_sgrk(Z_R0, Z_locals, fp); // Z_R0 = Z_locals - fp();
+  __ z_srlg(Z_R0, Z_R0, Interpreter::logStackElementSize);
+  // Store relativized Z_locals, see frame::interpreter_frame_locals().
+  __ z_stg(Z_R0, _z_ijava_state_neg(locals), fp);
 
   // z_ijava_state->oop_temp = nullptr;
   __ store_const(Address(fp, oop_tmp_offset), 0);

From c8ce61c8cadaf0371dc490c76b753f98bbaa118a Mon Sep 17 00:00:00 2001
From: Tatsunori Uchino <tats.u@live.jp>
Date: Mon, 5 May 2025 05:03:15 +0000
Subject: [PATCH 257/901] 8355371: NegativeArraySizeException in print methods
 in IO or System.console() in JShell 8354910: Output by java.io.IO or
 System.console() corrupted for some non-ASCII characters

Reviewed-by: liach, jlahoda
---
 .../jshell/execution/impl/ConsoleImpl.java    |  6 +++--
 test/langtools/jdk/jshell/ConsoleTest.java    | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
index 529e60c65da..0282b62da4c 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
@@ -356,7 +356,9 @@ public synchronized void write(int b) throws IOException {
                 buffer = Arrays.copyOf(buffer, 2 * buffer.length);
             }
 
-            buffer[bp++] = b;
+            // Can be negative because widening from byte in write(byte[], int, int).
+            // java.io.OutputStream.write(int b) stipulates "The 24 high-order bits of b are ignored."
+            buffer[bp++] = b & 0xff;
 
             switch (Task.values()[buffer[0]]) {
                 case WRITE_CHARS -> {
@@ -373,7 +375,7 @@ public synchronized void write(int b) throws IOException {
                 }
                 case READ_CHARS -> {
                     if (bp >= 5) {
-                        int len = readInt(b);
+                        int len = readInt(1);
                         int c = console.reader().read();
                         //XXX: EOF handling!
                         sendChars(sinkOutput, new char[] {(char) c}, 0, 1);
diff --git a/test/langtools/jdk/jshell/ConsoleTest.java b/test/langtools/jdk/jshell/ConsoleTest.java
index cf282389261..a82e0753b56 100644
--- a/test/langtools/jdk/jshell/ConsoleTest.java
+++ b/test/langtools/jdk/jshell/ConsoleTest.java
@@ -149,6 +149,31 @@ public void close() throws IOException {}
         assertEquals(sb.toString(), expected);
     }
 
+    @Test
+    public void testConsoleUnicodeWritingTest() {
+        StringBuilder sb = new StringBuilder();
+        console = new ThrowingJShellConsole() {
+            @Override
+            public PrintWriter writer() {
+                return new PrintWriter(new Writer() {
+                    @Override
+                    public void write(char[] cbuf, int off, int len) throws IOException {
+                        sb.append(cbuf, off, len);
+                    }
+                    @Override
+                    public void flush() throws IOException {}
+                    @Override
+                    public void close() throws IOException {}
+                });
+            }
+        };
+        int count = 384; // 128-255, 384-511, 640-767, ... (JDK-8355371)
+        String testStr = "\u30A2"; // Japanese katakana (A2 >= 80) (JDK-8354910)
+        assertEval("System.console().writer().write(\"" + testStr + "\".repeat(" + count + "))");
+        String expected = testStr.repeat(count);
+        assertEquals(sb.toString(), expected);
+    }
+
     @Test
     public void testConsoleMultiThreading() {
         StringBuilder sb = new StringBuilder();

From a5f4366a7f0b702b748fec9bcbcb95c522ff190b Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 5 May 2025 05:04:17 +0000
Subject: [PATCH 258/901] 8353565: Javac throws "inconsistent stack types at
 join point" exception

Reviewed-by: vromero, liach, mcimadamore
---
 .../classes/com/sun/tools/javac/jvm/Code.java |  27 +++--
 .../classes/com/sun/tools/javac/jvm/Gen.java  |   5 +-
 .../switchexpr/ExpressionSwitchEmbedding.java | 109 +++++++++++++++++-
 3 files changed, 127 insertions(+), 14 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
index 8e8dfd00058..2fb21a17a2d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Code.java
@@ -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
@@ -1807,11 +1807,7 @@ State join(State other) {
             for (int i=0; i<stacksize; ) {
                 Type t = stack[i];
                 Type tother = other.stack[i];
-                Type result =
-                    t==tother ? t :
-                    types.isSubtype(t, tother) ? tother :
-                    types.isSubtype(tother, t) ? t :
-                    error();
+                Type result = commonSuperClass(t, tother);
                 int w = width(result);
                 stack[i] = result;
                 if (w == 2) Assert.checkNull(stack[i+1]);
@@ -1820,8 +1816,23 @@ State join(State other) {
             return this;
         }
 
-        Type error() {
-            throw new AssertionError("inconsistent stack types at join point");
+        private Type commonSuperClass(Type t1, Type t2) {
+            if (t1 == t2) {
+                return t1;
+            } else if (types.isSubtype(t1, t2)) {
+                return t2;
+            } else if (types.isSubtype(t2, t1)) {
+                return t1;
+            } else {
+                Type lub = types.lub(t1, t2);
+
+                if (lub.hasTag(BOT)) {
+                    throw Assert.error("Cannot find a common super class of: " +
+                                       t1 + " and " + t2);
+                }
+
+                return types.erasure(lub);
+            }
         }
 
         void dump() {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index b21a7f190c9..ff65fc5f9cd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -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
@@ -1853,7 +1853,6 @@ public void visitYield(JCYield tree) {
                 if (switchResult != null)
                     switchResult.load();
 
-                code.state.forceStackTop(tree.target.type);
                 targetEnv.info.addExit(code.branch(goto_));
                 code.markDead();
             }
@@ -1969,7 +1968,6 @@ public void visitConditional(JCConditional tree) {
             int startpc = genCrt ? code.curCP() : 0;
             code.statBegin(tree.truepart.pos);
             genExpr(tree.truepart, pt).load();
-            code.state.forceStackTop(tree.type);
             if (genCrt) code.crt.put(tree.truepart, CRT_FLOW_TARGET,
                                      startpc, code.curCP());
             thenExit = code.branch(goto_);
@@ -1979,7 +1977,6 @@ public void visitConditional(JCConditional tree) {
             int startpc = genCrt ? code.curCP() : 0;
             code.statBegin(tree.falsepart.pos);
             genExpr(tree.falsepart, pt).load();
-            code.state.forceStackTop(tree.type);
             if (genCrt) code.crt.put(tree.falsepart, CRT_FLOW_TARGET,
                                      startpc, code.curCP());
         }
diff --git a/test/langtools/tools/javac/switchexpr/ExpressionSwitchEmbedding.java b/test/langtools/tools/javac/switchexpr/ExpressionSwitchEmbedding.java
index 7f8a9c06e17..1e652eb2119 100644
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchEmbedding.java
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchEmbedding.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8214031 8214114 8236546
+ * @bug 8214031 8214114 8236546 8353565
  * @summary Verify switch expressions embedded in various statements work properly.
  * @compile ExpressionSwitchEmbedding.java
  * @run main ExpressionSwitchEmbedding
@@ -32,6 +32,7 @@
 public class ExpressionSwitchEmbedding {
     public static void main(String... args) {
         new ExpressionSwitchEmbedding().run();
+        new ExpressionSwitchEmbedding().runStackMapMergingTest();
     }
 
     private void run() {
@@ -330,6 +331,110 @@ yield switch (i) {
         }
     }
 
+    private void runStackMapMergingTest() {
+        //JDK-8353565: verify that two types neither of which is a subtype of the other
+        //can be merged while computing StackMaps.
+        if (!(computeTypeAtMergePoint1(E.A, E.A) instanceof Impl1a)) {
+            throw new AssertionError("Unexpected result");
+        }
+        if (runMethodForInterfaceTypeAtMergePoint1(E.A, E.A) != 1) {
+            throw new AssertionError("Unexpected result");
+        }
+        if (runMethodForInterfaceTypeAtMergePoint2(E.A, E.A) != 2) {
+            throw new AssertionError("Unexpected result");
+        }
+    }
+
+    private Root computeTypeAtMergePoint1(E e1, E e2) {
+        return (Root) switch (e1) {
+            case A -> switch (e2) {
+                case A -> new Impl1a();
+                case B -> new Impl1b();
+                case C -> new Impl1c();
+            };
+            case B -> switch (e2) {
+                case A -> new Impl2a();
+                case B -> new Impl2b();
+                case C -> new Impl2c();
+            };
+            case C -> switch (e2) {
+                case A -> new Impl3a();
+                case B -> new Impl3b();
+                case C -> new Impl3c();
+            };
+        };
+    }
+
+    private int runMethodForInterfaceTypeAtMergePoint1(E e1, E e2) {
+        return (switch (e1) {
+            case A -> switch (e2) {
+                case A -> new C1();
+                case B -> new C1();
+                case C -> new C1();
+            };
+            case B -> switch (e2) {
+                case A -> new C2();
+                case B -> new C2();
+                case C -> new C2();
+            };
+            case C -> switch (e2) {
+                case A -> new C3();
+                case B -> new C3();
+                case C -> new C3();
+            };
+        }).test1();
+    }
+
+    private int runMethodForInterfaceTypeAtMergePoint2(E e1, E e2) {
+        return (switch (e1) {
+            case A -> switch (e2) {
+                case A -> new C1();
+                case B -> new C1();
+                case C -> new C1();
+            };
+            case B -> switch (e2) {
+                case A -> new C2();
+                case B -> new C2();
+                case C -> new C2();
+            };
+            case C -> switch (e2) {
+                case A -> new C3();
+                case B -> new C3();
+                case C -> new C3();
+            };
+        }).test2();
+    }
+
+    private static class Root {}
+    private static class Base1 extends Root {}
+    private static class Impl1a extends Base1 {}
+    private static class Impl1b extends Base1 {}
+    private static class Impl1c extends Base1 {}
+    private static class Base2 extends Root {}
+    private static class Impl2a extends Base2 {}
+    private static class Impl2b extends Base2 {}
+    private static class Impl2c extends Base2 {}
+    private static class Base3 extends Root {}
+    private static class Impl3a extends Base3 {}
+    private static class Impl3b extends Base3 {}
+    private static class Impl3c extends Base3 {}
+
+    private static interface RootInterface1 {
+        public default int test1() {
+            return 1;
+        }
+    }
+    private static interface RootInterface2 {
+        public default int test2() {
+            return 2;
+        }
+    }
+    private static class C1 implements RootInterface1, RootInterface2 {}
+    private static class C2 implements RootInterface1, RootInterface2 {}
+    private static class C3 implements RootInterface1, RootInterface2 {}
+
+    enum E {A, B, C;}
+
     private void throwException() {
         throw new RuntimeException();
     }

From c94a7ae11e588250cd0eb064c3280afd580530ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Mon, 5 May 2025 05:29:06 +0000
Subject: [PATCH 259/901] 8354276: Strict HTTP header validation

Reviewed-by: dfuchs, jpai
---
 .../internal/net/http/Http2Connection.java    |   8 +-
 .../classes/jdk/internal/net/http/Stream.java |   7 +-
 .../net/http/common/HeaderDecoder.java        |   5 +-
 .../common/ValidatingHeadersConsumer.java     |  50 ++++-
 .../net/httpclient/http2/BadHeadersTest.java  |  33 +++-
 .../httpclient/http2/BadPushPromiseTest.java  | 182 ++++++++++++++++++
 6 files changed, 264 insertions(+), 21 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/http2/BadPushPromiseTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
index cd6b3c0b89f..4fa970ee0eb 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
@@ -69,6 +69,7 @@
 import jdk.internal.net.http.common.SequentialScheduler;
 import jdk.internal.net.http.common.Utils;
 import jdk.internal.net.http.common.ValidatingHeadersConsumer;
+import jdk.internal.net.http.common.ValidatingHeadersConsumer.Context;
 import jdk.internal.net.http.frame.ContinuationFrame;
 import jdk.internal.net.http.frame.DataFrame;
 import jdk.internal.net.http.frame.ErrorFrame;
@@ -89,7 +90,6 @@
 import jdk.internal.net.http.hpack.DecodingCallback;
 import jdk.internal.net.http.hpack.Encoder;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static jdk.internal.net.http.frame.SettingsFrame.DEFAULT_INITIAL_WINDOW_SIZE;
 import static jdk.internal.net.http.frame.SettingsFrame.ENABLE_PUSH;
 import static jdk.internal.net.http.frame.SettingsFrame.HEADER_TABLE_SIZE;
 import static jdk.internal.net.http.frame.SettingsFrame.INITIAL_CONNECTION_WINDOW_SIZE;
@@ -340,6 +340,7 @@ private final class PushPromiseDecoder extends HeaderDecoder implements Decoding
         final AtomicReference<Throwable> errorRef = new AtomicReference<>();
 
         PushPromiseDecoder(int parentStreamId, int pushPromiseStreamId, Stream<?> parent) {
+            super(Context.REQUEST);
             this.parentStreamId = parentStreamId;
             this.pushPromiseStreamId = pushPromiseStreamId;
             this.parent = parent;
@@ -984,7 +985,10 @@ void processFrame(Http2Frame frame) throws IOException {
                     // always decode the headers as they may affect
                     // connection-level HPACK decoding state
                     if (orphanedConsumer == null || frame.getClass() != ContinuationFrame.class) {
-                        orphanedConsumer = new ValidatingHeadersConsumer();
+                        orphanedConsumer = new ValidatingHeadersConsumer(
+                                frame instanceof PushPromiseFrame ?
+                                        Context.REQUEST :
+                                        Context.RESPONSE);
                     }
                     DecodingCallback decoder = orphanedConsumer::onDecoded;
                     try {
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index 042d6c0ebfe..bfc4e75c021 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -1871,7 +1871,12 @@ void closeAsUnprocessed() {
         }
     }
 
-    private class HeadersConsumer extends ValidatingHeadersConsumer implements DecodingCallback {
+    private final class HeadersConsumer extends ValidatingHeadersConsumer
+            implements DecodingCallback {
+
+        private HeadersConsumer() {
+            super(Context.RESPONSE);
+        }
 
         boolean maxHeaderListSizeReached;
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java
index 92423314553..d9f855ca891 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/HeaderDecoder.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
@@ -30,7 +30,8 @@ public class HeaderDecoder extends ValidatingHeadersConsumer {
 
     private final HttpHeadersBuilder headersBuilder;
 
-    public HeaderDecoder() {
+    public HeaderDecoder(Context context) {
+        super(context);
         this.headersBuilder = new HttpHeadersBuilder();
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/ValidatingHeadersConsumer.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/ValidatingHeadersConsumer.java
index db873cdb05e..6c6cacace90 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/ValidatingHeadersConsumer.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/ValidatingHeadersConsumer.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
@@ -26,6 +26,9 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.ProtocolException;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /*
@@ -33,8 +36,29 @@
  */
 public class ValidatingHeadersConsumer {
 
-    private static final Set<String> PSEUDO_HEADERS =
-            Set.of(":authority", ":method", ":path", ":scheme", ":status");
+    private final Context context;
+
+    public ValidatingHeadersConsumer(Context context) {
+        this.context = Objects.requireNonNull(context);
+    }
+
+    public enum Context {
+        REQUEST,
+        RESPONSE,
+    }
+
+    // Map of permitted pseudo headers in requests and responses
+    private static final Map<String, Context> PSEUDO_HEADERS =
+            Map.of(":authority", Context.REQUEST,
+                    ":method", Context.REQUEST,
+                    ":path", Context.REQUEST,
+                    ":scheme", Context.REQUEST,
+                    ":status", Context.RESPONSE);
+
+    // connection-specific, prohibited by RFC 9113 section 8.2.2
+    private static final Set<String> PROHIBITED_HEADERS =
+            Set.of("connection", "proxy-connection", "keep-alive",
+                    "transfer-encoding", "upgrade");
 
     /** Used to check that if there are pseudo-headers, they go first */
     private boolean pseudoHeadersEnded;
@@ -60,11 +84,25 @@ public void onDecoded(CharSequence name, CharSequence value)
         if (n.startsWith(":")) {
             if (pseudoHeadersEnded) {
                 throw newException("Unexpected pseudo-header '%s'", n);
-            } else if (!PSEUDO_HEADERS.contains(n)) {
-                throw newException("Unknown pseudo-header '%s'", n);
+            } else {
+                Context expectedContext = PSEUDO_HEADERS.get(n);
+                if (expectedContext == null) {
+                    throw newException("Unknown pseudo-header '%s'", n);
+                } else if (expectedContext != context) {
+                    throw newException("Pseudo-header '%s' is not valid in context " + context, n);
+                }
             }
         } else {
             pseudoHeadersEnded = true;
+            // Check for prohibited connection-specific headers.
+            // Some servers echo request headers in push promises.
+            // If the request was a HTTP/1.1 upgrade, it included some prohibited headers.
+            // For compatibility, we ignore prohibited headers in push promises.
+            if (context != Context.REQUEST) {
+                if (PROHIBITED_HEADERS.contains(n)) {
+                    throw newException("Prohibited header name '%s'", n);
+                }
+            }
             // RFC-9113, section 8.2.1 for HTTP/2 and RFC-9114, section 4.2 state that
             // header name MUST be lowercase (and allowed characters)
             if (!Utils.isValidLowerCaseName(n)) {
@@ -84,6 +122,6 @@ protected String formatMessage(String message, String header) {
     protected UncheckedIOException newException(String message, String header)
     {
         return new UncheckedIOException(
-                new IOException(formatMessage(message, header)));
+                new ProtocolException(formatMessage(message, header)));
     }
 }
diff --git a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
index 062b4c89e09..35e1ea19950 100644
--- a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
+++ b/test/jdk/java/net/httpclient/http2/BadHeadersTest.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,10 @@
 
 /*
  * @test
- * @bug 8303965
+ * @bug 8303965 8354276
+ * @summary This test verifies the behaviour of the HttpClient when presented
+ *          with a HEADERS frame followed by CONTINUATION frames, and when presented
+ *          with bad header fields.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.internal.httpclient.debug=true BadHeadersTest
@@ -44,6 +47,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.ProtocolException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
@@ -76,6 +80,8 @@ public class BadHeadersTest {
         of(entry(":status", "200"),  entry("hell o", "value")),                    // Space in the name
         of(entry(":status", "200"),  entry("hello", "line1\r\n  line2\r\n")),      // Multiline value
         of(entry(":status", "200"),  entry("hello", "DE" + ((char) 0x7F) + "L")),  // Bad byte in value
+        of(entry(":status", "200"),  entry("connection", "close")),                // Prohibited connection-specific header
+        of(entry(":status", "200"),  entry(":scheme", "https")),                   // Request pseudo-header in response
         of(entry("hello", "world!"), entry(":status", "200"))                      // Pseudo header is not the first one
     );
 
@@ -86,7 +92,7 @@ public class BadHeadersTest {
     String https2URI;
 
     /**
-     * A function that returns a list of 1) a HEADERS frame ( with an empty
+     * A function that returns a list of 1) one HEADERS frame ( with an empty
      * payload ), and 2) a CONTINUATION frame with the actual headers.
      */
     static BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> oneContinuation =
@@ -100,7 +106,7 @@ public class BadHeadersTest {
             };
 
     /**
-     * A function that returns a list of a HEADERS frame followed by a number of
+     * A function that returns a list of one HEADERS frame followed by a number of
      * CONTINUATION frames. Each frame contains just a single byte of payload.
      */
     static BiFunction<Integer,List<ByteBuffer>,List<Http2Frame>> byteAtATime =
@@ -189,12 +195,13 @@ void testAsync(String uri,
             try {
                 HttpResponse<String> response = cc.sendAsync(request, BodyHandlers.ofString()).get();
                 fail("Expected exception, got :" + response + ", " + response.body());
-            } catch (Throwable t0) {
+            } catch (Exception t0) {
                 System.out.println("Got EXPECTED: " + t0);
                 if (t0 instanceof ExecutionException) {
-                    t0 = t0.getCause();
+                    t = t0.getCause();
+                } else {
+                    t = t0;
                 }
-                t = t0;
             }
             assertDetailMessage(t, i);
         }
@@ -204,15 +211,21 @@ void testAsync(String uri,
     // sync with implementation.
     static void assertDetailMessage(Throwable throwable, int iterationIndex) {
         try {
-            assertTrue(throwable instanceof IOException,
-                    "Expected IOException, got, " + throwable);
+            assertTrue(throwable instanceof ProtocolException,
+                    "Expected ProtocolException, got " + throwable);
             assertTrue(throwable.getMessage().contains("malformed response"),
                     "Expected \"malformed response\" in: " + throwable.getMessage());
 
             if (iterationIndex == 0) { // unknown
                 assertTrue(throwable.getMessage().contains("Unknown pseudo-header"),
                         "Expected \"Unknown pseudo-header\" in: " + throwable.getMessage());
-            } else if (iterationIndex == 4) { // unexpected
+            } else if (iterationIndex == 4) { // prohibited
+                assertTrue(throwable.getMessage().contains("Prohibited header name"),
+                        "Expected \"Prohibited header name\" in: " + throwable.getMessage());
+            } else if (iterationIndex == 5) { // unexpected type
+                assertTrue(throwable.getMessage().contains("not valid in context"),
+                        "Expected \"not valid in context\" in: " + throwable.getMessage());
+            } else if (iterationIndex == 6) { // unexpected sequence
                 assertTrue(throwable.getMessage().contains(" Unexpected pseudo-header"),
                         "Expected \" Unexpected pseudo-header\" in: " + throwable.getMessage());
             } else {
diff --git a/test/jdk/java/net/httpclient/http2/BadPushPromiseTest.java b/test/jdk/java/net/httpclient/http2/BadPushPromiseTest.java
new file mode 100644
index 00000000000..73cc12ce478
--- /dev/null
+++ b/test/jdk/java/net/httpclient/http2/BadPushPromiseTest.java
@@ -0,0 +1,182 @@
+/*
+ * 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 8354276
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
+ * @run testng/othervm
+ *      -Djdk.internal.httpclient.debug=true
+ *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
+ *      BadPushPromiseTest
+ */
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ProtocolException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static java.net.http.HttpClient.Version.HTTP_2;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.List.of;
+import static org.testng.Assert.*;
+
+public class BadPushPromiseTest {
+
+    private static final List<Map<String, List<String>>> BAD_HEADERS = of(
+            Map.of(":hello", of("GET")),                      // Unknown pseudo-header
+            Map.of("hell o", of("value")),                    // Space in the name
+            Map.of("hello", of("line1\r\n  line2\r\n")),      // Multiline value
+            Map.of("hello", of("DE" + ((char) 0x7F) + "L")),  // Bad byte in value
+            Map.of(":status", of("200"))                     // Response pseudo-header in request
+    );
+
+    static final String MAIN_RESPONSE_BODY = "the main response body";
+
+    HttpServerAdapters.HttpTestServer server;
+    URI uri;
+
+    @BeforeTest
+    public void setup() throws Exception {
+        server = HttpServerAdapters.HttpTestServer.create(HTTP_2);
+        HttpServerAdapters.HttpTestHandler handler = new ServerPushHandler(MAIN_RESPONSE_BODY);
+        server.addHandler(handler, "/");
+        server.start();
+        String authority = server.serverAuthority();
+        System.err.println("Server listening on address " + authority);
+        uri = new URI("http://" + authority + "/foo/a/b/c");
+    }
+
+    @AfterTest
+    public void teardown() {
+        server.stop();
+    }
+
+    /*
+     * Malformed push promise headers should kill the connection
+     */
+    @Test
+    public void test() throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
+
+        for (int i=0; i< BAD_HEADERS.size(); i++) {
+            URI uriWithQuery = URI.create(uri +  "?BAD_HEADERS=" + i);
+            HttpRequest request = HttpRequest.newBuilder(uriWithQuery)
+                    .build();
+            System.out.println("\nSending request:" + uriWithQuery);
+            final HttpClient cc = client;
+            try {
+                ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<String>>> promises
+                        = new ConcurrentHashMap<>();
+                PushPromiseHandler<String> pph = PushPromiseHandler
+                        .of((r) -> BodyHandlers.ofString(), promises);
+                HttpResponse<String> response = cc.sendAsync(request, BodyHandlers.ofString(), pph).join();
+                fail("Expected exception, got :" + response + ", " + response.body());
+            } catch (CompletionException ce) {
+                System.out.println("Got EXPECTED: " + ce);
+                assertDetailMessage(ce.getCause(), i);
+            }
+        }
+    }
+
+    // Assertions based on implementation specific detail messages. Keep in
+    // sync with implementation.
+    static void assertDetailMessage(Throwable throwable, int iterationIndex) {
+        try {
+            assertTrue(throwable instanceof ProtocolException,
+                    "Expected ProtocolException, got " + throwable);
+
+            if (iterationIndex == 0) { // unknown
+                assertTrue(throwable.getMessage().contains("Unknown pseudo-header"),
+                        "Expected \"Unknown pseudo-header\" in: " + throwable.getMessage());
+            } else if (iterationIndex == 4) { // unexpected type
+                assertTrue(throwable.getMessage().contains("not valid in context"),
+                        "Expected \"not valid in context\" in: " + throwable.getMessage());
+            } else {
+                assertTrue(throwable.getMessage().contains("Bad header"),
+                        "Expected \"Bad header\" in: " + throwable.getMessage());
+            }
+        } catch (AssertionError e) {
+            System.out.println("Exception does not match expectation: " + throwable);
+            throwable.printStackTrace(System.out);
+            throw e;
+        }
+    }
+
+    // --- server push handler ---
+    static class ServerPushHandler implements HttpServerAdapters.HttpTestHandler {
+
+        private final String mainResponseBody;
+
+        public ServerPushHandler(String mainResponseBody) {
+            this.mainResponseBody = mainResponseBody;
+        }
+
+        public void handle(HttpServerAdapters.HttpTestExchange exchange) throws IOException {
+            System.err.println("Server: handle " + exchange);
+            try (InputStream is = exchange.getRequestBody()) {
+                is.readAllBytes();
+            }
+
+            pushPromise(exchange);
+
+            // response data for the main response
+            try (OutputStream os = exchange.getResponseBody()) {
+                byte[] bytes = mainResponseBody.getBytes(UTF_8);
+                exchange.sendResponseHeaders(200, bytes.length);
+                os.write(bytes);
+            }
+        }
+
+        private void pushPromise(HttpServerAdapters.HttpTestExchange exchange) {
+            URI requestURI = exchange.getRequestURI();
+            String query = exchange.getRequestURI().getQuery();
+            int badHeadersIndex = Integer.parseInt(query.substring(query.indexOf("=") + 1));
+            URI uri = requestURI.resolve("/push/"+badHeadersIndex);
+            InputStream is = new ByteArrayInputStream(mainResponseBody.getBytes(UTF_8));
+            HttpHeaders headers = HttpHeaders.of(BAD_HEADERS.get(badHeadersIndex), (x, y) -> true);
+            exchange.serverPush(uri, headers, is);
+            System.err.println("Server: push sent");
+        }
+    }
+}

From 69d0f7a3954048da358bd2ac5ab458fb37fa25a6 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Mon, 5 May 2025 06:57:09 +0000
Subject: [PATCH 260/901] 8354284: Add more compiler test folders to tier1 runs

Reviewed-by: chagedorn, kvn
---
 test/hotspot/jtreg/TEST.groups                         | 7 ++++++-
 test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index c52cc84f177..3e2deb640c4 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -171,6 +171,8 @@ tier1_compiler_1 = \
   -compiler/c2/Test6912517.java
 
 tier1_compiler_2 = \
+  compiler/ccp/ \
+  compiler/ciTypeFlow/ \
   compiler/classUnloading/ \
   compiler/codecache/ \
   compiler/codegen/ \
@@ -181,11 +183,11 @@ tier1_compiler_2 = \
   compiler/exceptions/ \
   compiler/floatingpoint/ \
   compiler/gcbarriers/ \
+  compiler/igvn/ \
   compiler/inlining/ \
   compiler/integerArithmetic/ \
   compiler/interpreter/ \
   compiler/jvmci/ \
-  compiler/igvn/ \
   -compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java \
   -compiler/codecache/stress \
   -compiler/codegen/aes \
@@ -199,9 +201,12 @@ tier1_compiler_3 = \
   compiler/macronodes/ \
   compiler/memoryinitialization/ \
   compiler/osr/ \
+  compiler/predicates/ \
   compiler/profiling \
   compiler/regalloc/ \
   compiler/runtime/ \
+  compiler/sharedstubs/ \
+  compiler/splitif/ \
   compiler/startup/ \
   compiler/types/ \
   compiler/uncommontrap/ \
diff --git a/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java b/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
index 4304db5489c..628cbae8d86 100644
--- a/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
+++ b/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
@@ -26,7 +26,7 @@
  * @bug 8350563
  * @summary Test that And nodes are monotonic and added to the CCP worklist if they have a constant as input.
  * @run main/othervm -Xbatch -XX:-TieredCompilation compiler.ccp.TestAndConZeroCCP
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:RepeatCompilation=300 -XX:+StressIGVN -XX:+StressCCP -Xcomp
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:RepeatCompilation=100 -XX:+StressIGVN -XX:+StressCCP -Xcomp
  *                   -XX:CompileOnly=java.lang.Integer::parseInt compiler.ccp.TestAndConZeroCCP compileonly
  * @run main compiler.ccp.TestAndConZeroCCP
  */
@@ -42,7 +42,7 @@ public static void main(String[] args) {
             return;
         }
 
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100; ++i) {
             run();
         }
     }

From 604225fb0c5f6bf2128a305d09649d76c43dedc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 5 May 2025 06:58:20 +0000
Subject: [PATCH 261/901] 8354954: Typed static memory for late initialization
 of static class members in Hotspot

Reviewed-by: qamai, kbarrett, jvernee
---
 src/hotspot/share/nmt/memTracker.cpp        |  4 +-
 src/hotspot/share/nmt/memTracker.hpp        |  8 +--
 src/hotspot/share/nmt/memoryFileTracker.cpp |  7 +-
 src/hotspot/share/nmt/memoryFileTracker.hpp |  3 +-
 src/hotspot/share/utilities/deferred.hpp    | 76 +++++++++++++++++++++
 5 files changed, 88 insertions(+), 10 deletions(-)
 create mode 100644 src/hotspot/share/utilities/deferred.hpp

diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
index 1821f7bd10d..b3d94ceabec 100644
--- a/src/hotspot/share/nmt/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -41,6 +41,7 @@
 #include "runtime/vmThread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/deferred.hpp"
 #include "utilities/vmError.hpp"
 
 #ifdef _WINDOWS
@@ -49,7 +50,7 @@
 
 NMT_TrackingLevel MemTracker::_tracking_level = NMT_unknown;
 
-MemBaseline MemTracker::_baseline;
+Deferred<MemBaseline> MemTracker::_baseline;
 
 bool MemTracker::NmtVirtualMemoryLocker::_safe_to_use;
 
@@ -67,6 +68,7 @@ void MemTracker::initialize() {
   STATIC_ASSERT(mt_number_of_tags <= max_jubyte);
 
   if (level > NMT_off) {
+    _baseline.initialize();
     if (!MallocTracker::initialize(level) ||
         !MemoryFileTracker::Instance::initialize(level) ||
         !VirtualMemoryTracker::initialize(level)) {
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 3918e81dab7..c208a02054f 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/reservedSpace.hpp"
 #include "nmt/mallocTracker.hpp"
+#include "nmt/memBaseline.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "nmt/memoryFileTracker.hpp"
 #include "nmt/threadStackTracker.hpp"
@@ -34,14 +35,13 @@
 #include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/nativeCallStack.hpp"
+#include "utilities/deferred.hpp"
 
 #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail) ? \
                     NativeCallStack(0) : FAKE_CALLSTACK)
 #define CALLER_PC  ((MemTracker::tracking_level() == NMT_detail) ?  \
                     NativeCallStack(1) : FAKE_CALLSTACK)
 
-class MemBaseline;
-
 class MemTracker : AllStatic {
   friend class VirtualMemoryTrackerTest;
 
@@ -266,7 +266,7 @@ class MemTracker : AllStatic {
 
   // Stored baseline
   static inline MemBaseline& get_baseline() {
-    return _baseline;
+    return *_baseline;
   }
 
   static void tuning_statistics(outputStream* out);
@@ -319,7 +319,7 @@ class MemTracker : AllStatic {
   // Tracking level
   static NMT_TrackingLevel   _tracking_level;
   // Stored baseline
-  static MemBaseline      _baseline;
+  static Deferred<MemBaseline>      _baseline;
 };
 
 #endif // SHARE_NMT_MEMTRACKER_HPP
diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp
index 2b354161408..933fb30b123 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.cpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.cpp
@@ -32,7 +32,7 @@
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
-MemoryFileTracker* MemoryFileTracker::Instance::_tracker = nullptr;
+Deferred<MemoryFileTracker> MemoryFileTracker::Instance::_tracker;
 
 MemoryFileTracker::MemoryFileTracker(bool is_detailed_mode)
   : _stack_storage(is_detailed_mode), _files() {}
@@ -126,9 +126,8 @@ const GrowableArrayCHeap<MemoryFileTracker::MemoryFile*, mtNMT>& MemoryFileTrack
 
 bool MemoryFileTracker::Instance::initialize(NMT_TrackingLevel tracking_level) {
   if (tracking_level == NMT_TrackingLevel::NMT_off) return true;
-  _tracker = static_cast<MemoryFileTracker*>(os::malloc(sizeof(MemoryFileTracker), mtNMT));
-  if (_tracker == nullptr) return false;
-  new (_tracker) MemoryFileTracker(tracking_level == NMT_TrackingLevel::NMT_detail);
+  bool is_detailed_mode = tracking_level == NMT_TrackingLevel::NMT_detail;
+  _tracker.initialize(is_detailed_mode);
   return true;
 }
 
diff --git a/src/hotspot/share/nmt/memoryFileTracker.hpp b/src/hotspot/share/nmt/memoryFileTracker.hpp
index cda5614b59e..cd7a3fb8593 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.hpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.hpp
@@ -34,6 +34,7 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/deferred.hpp"
 
 // The MemoryFileTracker tracks memory of 'memory files',
 // storage with its own memory space separate from the process.
@@ -91,7 +92,7 @@ class MemoryFileTracker {
   const GrowableArrayCHeap<MemoryFile*, mtNMT>& files();
 
   class Instance : public AllStatic {
-    static MemoryFileTracker* _tracker;
+    static Deferred<MemoryFileTracker> _tracker;
 
   public:
 
diff --git a/src/hotspot/share/utilities/deferred.hpp b/src/hotspot/share/utilities/deferred.hpp
new file mode 100644
index 00000000000..8aa095c88e7
--- /dev/null
+++ b/src/hotspot/share/utilities/deferred.hpp
@@ -0,0 +1,76 @@
+/*
+* 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_UTILITIES_STABLEVALUE_HPP
+#define SHARE_UTILITIES_STABLEVALUE_HPP
+
+#include "globalDefinitions.hpp"
+#include <type_traits>
+
+// The purpose of this class is to defer initialization of a T to a later point in time,
+// and then to never deallocate it. This is mainly useful for deferring the initialization of
+// static fields in classes, in order to avoid "Static Initialization Order Fiasco".
+template<typename T>
+class Deferred {
+  union {
+    T _t;
+  };
+
+  DEBUG_ONLY(bool _initialized);
+
+public:
+  NONCOPYABLE(Deferred);
+
+  Deferred()
+  DEBUG_ONLY(: _initialized(false)) {
+    // Do not construct value, on purpose.
+  }
+
+  ~Deferred() {
+    // Do not destruct value, on purpose.
+  }
+
+  T* get() {
+    assert(_initialized, "must be initialized before access");
+    return &_t;
+  }
+
+  T& operator*() {
+    return *get();
+  }
+
+  T* operator->() {
+    return get();
+  }
+
+  template<typename... Ts>
+  void initialize(Ts&... args) {
+    assert(!_initialized, "Double initialization forbidden");
+    DEBUG_ONLY(_initialized = true);
+    using NCVP = std::add_pointer_t<std::remove_cv_t<T>>;
+    ::new (const_cast<NCVP>(get())) T(args...);
+  }
+};
+
+#endif // SHARE_UTILITIES_STABLEVALUE_HPP

From f04e556d471d65a9b1a86d33acf72f6ddec944e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 5 May 2025 07:14:24 +0000
Subject: [PATCH 262/901] 8355711: Remove incorrect overflow check in
 RawBytecodeStream::raw_next

Reviewed-by: dlong, matsaave
---
 src/hotspot/share/interpreter/bytecodeStream.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/hotspot/share/interpreter/bytecodeStream.hpp b/src/hotspot/share/interpreter/bytecodeStream.hpp
index de012de6e3e..89d97053b45 100644
--- a/src/hotspot/share/interpreter/bytecodeStream.hpp
+++ b/src/hotspot/share/interpreter/bytecodeStream.hpp
@@ -137,9 +137,6 @@ class RawBytecodeStream: public BaseBytecodeStream {
              && code != Bytecodes::_lookupswitch, "can't be special bytecode");
       _is_wide = false;
       _next_bci += len;
-      if (_next_bci <= _bci) { // Check for integer overflow
-        code = Bytecodes::_illegal;
-      }
       _raw_code = code;
       return code;
     } else {

From 8511220f9dd1428f9793ead43c20ed197881ab36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 5 May 2025 07:15:46 +0000
Subject: [PATCH 263/901] 8355490: Make
 VM_RedefineClasses::merge_constant_pools only take reference arguments

Reviewed-by: amenkov, sspitsyn, coleenp
---
 .../share/prims/jvmtiRedefineClasses.cpp      | 66 ++++++++-----------
 .../share/prims/jvmtiRedefineClasses.hpp      |  6 +-
 2 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index fd039471c93..33ae15fd805 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -1572,28 +1572,20 @@ void VM_RedefineClasses::map_operand_index(int old_index, int new_index) {
 
 
 // Merge old_cp and scratch_cp and return the results of the merge via
-// merge_cp_p. The number of entries in *merge_cp_p is returned via
+// merge_cp_p. The number of entries in merge_cp_p is returned via
 // merge_cp_length_p. The entries in old_cp occupy the same locations
-// in *merge_cp_p. Also creates a map of indices from entries in
-// scratch_cp to the corresponding entry in *merge_cp_p. Index map
+// in merge_cp_p. Also creates a map of indices from entries in
+// scratch_cp to the corresponding entry in merge_cp_p. Index map
 // entries are only created for entries in scratch_cp that occupy a
-// different location in *merged_cp_p.
+// different location in merged_cp_p.
 bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
-       const constantPoolHandle& scratch_cp, constantPoolHandle *merge_cp_p,
-       int *merge_cp_length_p, TRAPS) {
+       const constantPoolHandle& scratch_cp, constantPoolHandle& merge_cp_p,
+       int& merge_cp_length_p, TRAPS) {
 
-  if (merge_cp_p == nullptr) {
-    assert(false, "caller must provide scratch constantPool");
-    return false; // robustness
-  }
-  if (merge_cp_length_p == nullptr) {
-    assert(false, "caller must provide scratch CP length");
-    return false; // robustness
-  }
   // Worst case we need old_cp->length() + scratch_cp()->length(),
   // but the caller might be smart so make sure we have at least
   // the minimum.
-  if ((*merge_cp_p)->length() < old_cp->length()) {
+  if (merge_cp_p->length() < old_cp->length()) {
     assert(false, "merge area too small");
     return false; // robustness
   }
@@ -1621,36 +1613,36 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
         // revert the copy to JVM_CONSTANT_UnresolvedClass
         // May be resolving while calling this so do the same for
         // JVM_CONSTANT_UnresolvedClass (klass_name_at() deals with transition)
-        (*merge_cp_p)->temp_unresolved_klass_at_put(old_i,
+        merge_cp_p->temp_unresolved_klass_at_put(old_i,
           old_cp->klass_name_index_at(old_i));
         break;
 
       case JVM_CONSTANT_Double:
       case JVM_CONSTANT_Long:
-        // just copy the entry to *merge_cp_p, but double and long take
+        // just copy the entry to merge_cp_p, but double and long take
         // two constant pool entries
-        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i);
+        ConstantPool::copy_entry_to(old_cp, old_i, merge_cp_p, old_i);
         old_i++;
         break;
 
       default:
-        // just copy the entry to *merge_cp_p
-        ConstantPool::copy_entry_to(old_cp, old_i, *merge_cp_p, old_i);
+        // just copy the entry to merge_cp_p
+        ConstantPool::copy_entry_to(old_cp, old_i, merge_cp_p, old_i);
         break;
       }
     } // end for each old_cp entry
 
-    ConstantPool::copy_operands(old_cp, *merge_cp_p, CHECK_false);
-    (*merge_cp_p)->extend_operands(scratch_cp, CHECK_false);
+    ConstantPool::copy_operands(old_cp, merge_cp_p, CHECK_false);
+    merge_cp_p->extend_operands(scratch_cp, CHECK_false);
 
     // We don't need to sanity check that *merge_cp_length_p is within
     // *merge_cp_p bounds since we have the minimum on-entry check above.
-    (*merge_cp_length_p) = old_i;
+    merge_cp_length_p = old_i;
   }
 
   // merge_cp_len should be the same as old_cp->length() at this point
   // so this trace message is really a "warm-and-breathing" message.
-  log_debug(redefine, class, constantpool)("after pass 0: merge_cp_len=%d", *merge_cp_length_p);
+  log_debug(redefine, class, constantpool)("after pass 0: merge_cp_len=%d", merge_cp_length_p);
 
   int scratch_i;  // index into scratch_cp
   {
@@ -1674,13 +1666,13 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
         break;
       }
 
-      bool match = scratch_cp->compare_entry_to(scratch_i, *merge_cp_p, scratch_i);
+      bool match = scratch_cp->compare_entry_to(scratch_i, merge_cp_p, scratch_i);
       if (match) {
         // found a match at the same index so nothing more to do
         continue;
       }
 
-      int found_i = scratch_cp->find_matching_entry(scratch_i, *merge_cp_p);
+      int found_i = scratch_cp->find_matching_entry(scratch_i, merge_cp_p);
       if (found_i != 0) {
         guarantee(found_i != scratch_i,
           "compare_entry_to() and find_matching_entry() do not agree");
@@ -1692,14 +1684,14 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
       }
 
       // No match found so we have to append this entry and any unique
-      // referenced entries to *merge_cp_p.
-      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p);
+      // referenced entries to merge_cp_p.
+      append_entry(scratch_cp, scratch_i, &merge_cp_p, &merge_cp_length_p);
     }
   }
 
   log_debug(redefine, class, constantpool)
     ("after pass 1a: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
-     *merge_cp_length_p, scratch_i, _index_map_count);
+     merge_cp_length_p, scratch_i, _index_map_count);
 
   if (scratch_i < scratch_cp->length()) {
     // Pass 1b:
@@ -1721,24 +1713,24 @@ bool VM_RedefineClasses::merge_constant_pools(const constantPoolHandle& old_cp,
       }
 
       int found_i =
-        scratch_cp->find_matching_entry(scratch_i, *merge_cp_p);
+        scratch_cp->find_matching_entry(scratch_i, merge_cp_p);
       if (found_i != 0) {
-        // Found a matching entry somewhere else in *merge_cp_p so
+        // Found a matching entry somewhere else in merge_cp_p so
         // just need a mapping entry.
         map_index(scratch_cp, scratch_i, found_i);
         continue;
       }
 
       // No match found so we have to append this entry and any unique
-      // referenced entries to *merge_cp_p.
-      append_entry(scratch_cp, scratch_i, merge_cp_p, merge_cp_length_p);
+      // referenced entries to merge_cp_p.
+      append_entry(scratch_cp, scratch_i, &merge_cp_p, &merge_cp_length_p);
     }
 
     log_debug(redefine, class, constantpool)
       ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
-       *merge_cp_length_p, scratch_i, _index_map_count);
+       merge_cp_length_p, scratch_i, _index_map_count);
   }
-  finalize_operands_merge(*merge_cp_p, CHECK_false);
+  finalize_operands_merge(merge_cp_p, CHECK_false);
 
   return true;
 } // end merge_constant_pools()
@@ -1815,8 +1807,8 @@ jvmtiError VM_RedefineClasses::merge_cp_and_rewrite(
 
   // reference to the cp holder is needed for copy_operands()
   merge_cp->set_pool_holder(scratch_class);
-  bool result = merge_constant_pools(old_cp, scratch_cp, &merge_cp,
-                  &merge_cp_length, THREAD);
+  bool result = merge_constant_pools(old_cp, scratch_cp, merge_cp,
+                  merge_cp_length, THREAD);
   merge_cp->set_pool_holder(nullptr);
 
   if (!result) {
diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
index 5b8ad06d2d6..d2eda1f3eed 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp
@@ -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
@@ -441,8 +441,8 @@ class VM_RedefineClasses: public VM_Operation {
   void map_index(const constantPoolHandle& scratch_cp, int old_index, int new_index);
   void map_operand_index(int old_bootstrap_spec_index, int new_bootstrap_spec_index);
   bool merge_constant_pools(const constantPoolHandle& old_cp,
-    const constantPoolHandle& scratch_cp, constantPoolHandle *merge_cp_p,
-    int *merge_cp_length_p, TRAPS);
+    const constantPoolHandle& scratch_cp, constantPoolHandle& merge_cp_p,
+    int& merge_cp_length_p, TRAPS);
   jvmtiError merge_cp_and_rewrite(InstanceKlass* the_class,
     InstanceKlass* scratch_class, TRAPS);
   u2 rewrite_cp_ref_in_annotation_data(

From 6dd555382326d02a1fc419bc443285509886e46f Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Mon, 5 May 2025 08:52:52 +0000
Subject: [PATCH 264/901] 8354329: Rewrite runtime/ClassFile/JsrRewriting.java
 and OomWhileParsingRepeatedJsr.java tests

Reviewed-by: matsaave, coleenp
---
 .../jtreg/runtime/ClassFile/JsrRewriting.java |  34 ++---
 .../ClassFile/JsrRewritingTestCase.jar        | Bin 978 -> 0 bytes
 .../ClassFile/OOMCrashClass1960_2.java        | 129 ++++++++++++++++++
 .../ClassFile/OOMCrashClass4000_1.java        | 129 ++++++++++++++++++
 .../ClassFile/OomWhileParsingRepeatedJsr.java |  30 ++--
 .../jtreg/runtime/ClassFile/testcase.jar      | Bin 984 -> 0 bytes
 6 files changed, 286 insertions(+), 36 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/ClassFile/JsrRewritingTestCase.jar
 create mode 100644 test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass1960_2.java
 create mode 100644 test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass4000_1.java
 delete mode 100644 test/hotspot/jtreg/runtime/ClassFile/testcase.jar

diff --git a/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java b/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java
index 8563c79b19c..291e33f40e7 100644
--- a/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java
+++ b/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.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
@@ -34,50 +34,42 @@
  * @bug 7149464
  * @requires vm.flagless
  * @library /test/lib
+ * @library /testlibrary/asm
  * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
  * @run driver JsrRewriting
  */
 
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
 import java.io.File;
+import java.nio.file.Files;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class JsrRewriting {
 
     public static void main(String[] args) throws Exception {
 
-        // ======= Configure the test
-        String jarFile = System.getProperty("test.src") +
-            File.separator + "JsrRewritingTestCase.jar";
+        // create a file in the scratch dir
         String className = "OOMCrashClass4000_1";
+        File classFile = new File(className + ".class");
+        classFile.createNewFile();
 
-        // limit is 768MB in native words
-        int mallocMaxTestWords = (1024 * 1024 * 768 / 4);
-        if (Platform.is64bit())
-            mallocMaxTestWords = (mallocMaxTestWords / 2);
-
-        // ======= extract the test class
-        ProcessBuilder pb = new ProcessBuilder(new String[] {
-            JDKToolFinder.getJDKTool("jar"),
-            "xvf", jarFile } );
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldHaveExitValue(0);
+        // fill it with the binary data of the class file
+        byte[] bytes = OOMCrashClass4000_1.dump();
+        Files.write(classFile.toPath(), bytes);
 
         // ======= execute the test
         // We run the test with MallocLimit set to 768m in oom mode,
         // in order to trigger and observe a fake os::malloc oom. This needs NMT.
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-cp", ".",
             "-XX:+UnlockDiagnosticVMOptions",
             "-XX:NativeMemoryTracking=summary",
             "-XX:MallocLimit=768m:oom",
             className);
 
-        output = new OutputAnalyzer(pb.start());
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldNotHaveExitValue(0);
         String[] expectedMsgs = {
             "java.lang.LinkageError",
diff --git a/test/hotspot/jtreg/runtime/ClassFile/JsrRewritingTestCase.jar b/test/hotspot/jtreg/runtime/ClassFile/JsrRewritingTestCase.jar
deleted file mode 100644
index 287b73ab1868c0b042e69366901faeed8d63c271..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 978
zcmWIWW@Zs#;Nak3=x*t;V?Y9&3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`T^
zyq0{iOzqV&Rk7(ymZ(i#rk(LaTvhG)5-p48;-XK)Ri`nSW_>F9Si}f+&a52$t-e6Z
z{D2tYoQhUdzeoaQ{r!ENixP`7oO2S3i%kp+4B`#-l0odZ=lA-F1d1>`FxEMJXw$zB
ztB;+!!O)p#S|%X8xs#K#jj6e{RWfl?Po$X9?oUE?js6X~Q;!|G^+O{>?An^?xjmeF
z&zc{#{BHgHj`jC{d;Wa0&HAYEF7@Ia+kXLX#r03cO+5N0ZTk!HP&*yId8r#WZ2r6{
z_-XTDKYe+gdE0Kk-QF)9csl7{ZQZQ(&(+oUChhoFGe;`$e9|wK^=wDO>Sr9ibn08h
zis|2XzutX#)thqju<cP7J6`HM`?u{<!A0FwZYHx0rHv!6^ncoP|6Ee#)3c`PZ&D3s
zhTpwhvNQYE%e33ae^=(~uRrxCc6~*u=%v1MA054dXQ%F$Syp~EEbM#KMuG0LGrE>u
zk(Zm+T=Mj7_PyPL{7FW=v9-d6!sd_CmfUxVsgdaoQq}9bmgT?CE&H>3)PB4D|1(Q|
zS}r@6^vT9r`mf)g)(-lEAMuick!P0P@UqnFdlYs@?z&i#;nAO4>Sh$Za;<&qtuz1s
zZpBxH>hJop!)JAL+JlnrFZ0XOpE5Eq@Vo(~6-Fiz2Go=fOV*&2j|$*P8I%vuwIU}$
vP`XC|TObpz6)6`Wn*d6x$PNP~RRlN#Wa3P?0p6@^Af?PecmzoQ0DAxcdj4!{

diff --git a/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass1960_2.java b/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass1960_2.java
new file mode 100644
index 00000000000..12533f02906
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass1960_2.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 org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/*
+This is class is a dumper for the original OOMCrashClass1960_2.class, i.e. its dump() method
+produces a byte array with the original class file data.
+
+To get this source code, one needs to run the following command:
+java jdk.internal.org.objectweb.asm.util.ASMifier OOMCrashClass1960_2.class >> OOMCrashClass1960_2.java
+
+The resulting java source code is large (>2 mb), so certain refactoring is applied.
+ */
+
+public class OOMCrashClass1960_2 implements Opcodes {
+
+    public static byte[] dump() throws Exception {
+
+        ClassWriter classWriter = new ClassWriter(0);
+        MethodVisitor methodVisitor;
+
+        classWriter.visit(V1_1, ACC_PUBLIC | ACC_SUPER, "OOMCrashClass1960_2", null, "java/lang/Object", null);
+
+        classWriter.visitSource("<generated>", null);
+
+        {
+            methodVisitor = classWriter.visitMethod(ACC_PUBLIC | ACC_STATIC, "main0", "([Ljava/lang/String;)V", null, null);
+            methodVisitor.visitCode();
+            Label label0 = new Label();
+            methodVisitor.visitLabel(label0);
+            methodVisitor.visitVarInsn(ALOAD, 0);
+            methodVisitor.visitInsn(ICONST_0);
+            methodVisitor.visitInsn(AALOAD);
+            methodVisitor.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "parseInt", "(Ljava/lang/String;)I", false);
+            methodVisitor.visitVarInsn(ISTORE, 1);
+            Label label1 = new Label();
+            methodVisitor.visitJumpInsn(GOTO, label1);
+            Label label2 = new Label();
+            methodVisitor.visitLabel(label2);
+            methodVisitor.visitInsn(RETURN);
+
+            // This line overflows the jump target for jsr
+
+            Label prevLabel = label2;
+            for (int i = 0; i < 1959; ++i) {
+                Label curLabel = getCurLabel(methodVisitor, prevLabel);
+                prevLabel = curLabel;
+            }
+
+            Label label5877 = prevLabel;
+
+            methodVisitor.visitLabel(label1);
+            methodVisitor.visitVarInsn(ILOAD, 1);
+            methodVisitor.visitJumpInsn(IFEQ, label5877);
+            Label label5880 = new Label();
+            methodVisitor.visitJumpInsn(JSR, label5880);
+            Label label5881 = new Label();
+            methodVisitor.visitJumpInsn(GOTO, label5881);
+            methodVisitor.visitLabel(label5880);
+            methodVisitor.visitInsn(RETURN);
+            methodVisitor.visitLabel(label5881);
+            methodVisitor.visitInsn(ACONST_NULL);
+            methodVisitor.visitJumpInsn(GOTO, label1);
+            Label label5882 = new Label();
+            methodVisitor.visitLabel(label5882);
+            methodVisitor.visitLocalVariable("argv", "[Ljava/lang/String;", null, label0, label5882, 0);
+            methodVisitor.visitMaxs(65535, 2);
+            methodVisitor.visitEnd();
+        }
+        {
+            methodVisitor = classWriter.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            methodVisitor.visitCode();
+            Label label0 = new Label();
+            methodVisitor.visitLabel(label0);
+            methodVisitor.visitVarInsn(ALOAD, 0);
+            methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            methodVisitor.visitInsn(RETURN);
+            Label label1 = new Label();
+            methodVisitor.visitLabel(label1);
+            methodVisitor.visitLocalVariable("this", "LOOMCrashClass1960_2;", null, label0, label1, 0);
+            methodVisitor.visitMaxs(1, 1);
+            methodVisitor.visitEnd();
+        }
+        classWriter.visitEnd();
+
+        return classWriter.toByteArray();
+    }
+
+    public static Label getCurLabel(final MethodVisitor methodVisitor, final Label prevLabel) {
+        final Label curLabel = new Label();
+        methodVisitor.visitLabel(curLabel);
+        methodVisitor.visitVarInsn(ILOAD, 1);
+        methodVisitor.visitJumpInsn(IFEQ, prevLabel);
+        Label tmpLabel1 = new Label();
+        methodVisitor.visitJumpInsn(JSR, tmpLabel1);
+        Label tmpLabel2 = new Label();
+        methodVisitor.visitJumpInsn(GOTO, tmpLabel2);
+        methodVisitor.visitLabel(tmpLabel1);
+        methodVisitor.visitInsn(RETURN);
+        methodVisitor.visitLabel(tmpLabel2);
+        methodVisitor.visitInsn(ACONST_NULL);
+        methodVisitor.visitJumpInsn(GOTO, curLabel);
+        return curLabel;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass4000_1.java b/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass4000_1.java
new file mode 100644
index 00000000000..a7248a148c1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ClassFile/OOMCrashClass4000_1.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 org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+/*
+This is class is a dumper for the original OOMCrashClass4000_1.class, i.e. its dump() method
+produces a byte array with the original class file data.
+
+To get this source code, one needs to run the following command:
+java jdk.internal.org.objectweb.asm.util.ASMifier OOMCrashClass4000_1.class >> OOMCrashClass4000_1.java
+
+The resulting java source code is large (>2 mb), so certain refactoring is applied.
+ */
+
+public class OOMCrashClass4000_1 implements Opcodes {
+
+    public static byte[] dump() throws Exception {
+
+        ClassWriter classWriter = new ClassWriter(0);
+        MethodVisitor methodVisitor;
+
+        classWriter.visit(V1_1, ACC_PUBLIC | ACC_SUPER, "OOMCrashClass4000_1", null, "java/lang/Object", null);
+
+        classWriter.visitSource("<generated>", null);
+
+        {
+            methodVisitor = classWriter.visitMethod(ACC_PUBLIC | ACC_STATIC, "main0", "([Ljava/lang/String;)V", null, null);
+            methodVisitor.visitCode();
+            Label label0 = new Label();
+            methodVisitor.visitLabel(label0);
+            methodVisitor.visitVarInsn(ALOAD, 0);
+            methodVisitor.visitInsn(ICONST_0);
+            methodVisitor.visitInsn(AALOAD);
+            methodVisitor.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "parseInt", "(Ljava/lang/String;)I", false);
+            methodVisitor.visitVarInsn(ISTORE, 1);
+            Label label1 = new Label();
+            methodVisitor.visitJumpInsn(GOTO, label1);
+            Label label2 = new Label();
+            methodVisitor.visitLabel(label2);
+            methodVisitor.visitInsn(RETURN);
+
+            // This line overflows the jump target for jsr
+
+            Label prevLabel = label2;
+            for (int i = 0; i < 3999; ++i) {
+                Label curLabel = getCurLabel(methodVisitor, prevLabel);
+                prevLabel = curLabel;
+            }
+
+            Label label11997 = prevLabel;
+
+            methodVisitor.visitLabel(label1);
+            methodVisitor.visitVarInsn(ILOAD, 1);
+            methodVisitor.visitJumpInsn(IFEQ, label11997);
+            Label label12000 = new Label();
+            methodVisitor.visitJumpInsn(JSR, label12000);
+            Label label12001 = new Label();
+            methodVisitor.visitJumpInsn(GOTO, label12001);
+            methodVisitor.visitLabel(label12000);
+            methodVisitor.visitInsn(RETURN);
+            methodVisitor.visitLabel(label12001);
+            methodVisitor.visitInsn(ACONST_NULL);
+            methodVisitor.visitJumpInsn(GOTO, label1);
+            Label label12002 = new Label();
+            methodVisitor.visitLabel(label12002);
+            methodVisitor.visitLocalVariable("argv", "[Ljava/lang/String;", null, label0, label12002, 0);
+            methodVisitor.visitMaxs(65535, 2);
+            methodVisitor.visitEnd();
+        }
+        {
+            methodVisitor = classWriter.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            methodVisitor.visitCode();
+            Label label0 = new Label();
+            methodVisitor.visitLabel(label0);
+            methodVisitor.visitVarInsn(ALOAD, 0);
+            methodVisitor.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            methodVisitor.visitInsn(RETURN);
+            Label label1 = new Label();
+            methodVisitor.visitLabel(label1);
+            methodVisitor.visitLocalVariable("this", "LOOMCrashClass4000_1;", null, label0, label1, 0);
+            methodVisitor.visitMaxs(1, 1);
+            methodVisitor.visitEnd();
+        }
+        classWriter.visitEnd();
+
+        return classWriter.toByteArray();
+    }
+
+    public static Label getCurLabel(final MethodVisitor methodVisitor, final Label prevLabel) {
+        final Label curLabel = new Label();
+        methodVisitor.visitLabel(curLabel);
+        methodVisitor.visitVarInsn(ILOAD, 1);
+        methodVisitor.visitJumpInsn(IFEQ, prevLabel);
+        Label tmpLabel1 = new Label();
+        methodVisitor.visitJumpInsn(JSR, tmpLabel1);
+        Label tmpLabel2 = new Label();
+        methodVisitor.visitJumpInsn(GOTO, tmpLabel2);
+        methodVisitor.visitLabel(tmpLabel1);
+        methodVisitor.visitInsn(RETURN);
+        methodVisitor.visitLabel(tmpLabel2);
+        methodVisitor.visitInsn(ACONST_NULL);
+        methodVisitor.visitJumpInsn(GOTO, curLabel);
+        return curLabel;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java b/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java
index 9ea18f5e2fc..ba23e124117 100644
--- a/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java
+++ b/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.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
@@ -35,43 +35,43 @@
  * @bug 8016029
  * @requires vm.flagless
  * @library /test/lib
+ * @library /testlibrary/asm
  * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
  * @run driver OomWhileParsingRepeatedJsr
  */
 
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
+import java.io.File;
+import java.nio.file.Files;
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class OomWhileParsingRepeatedJsr {
 
     public static void main(String[] args) throws Exception {
 
-        // ======= Configure the test
-        String jarFile = System.getProperty("test.src") + "/testcase.jar";
         String className = "OOMCrashClass1960_2";
 
-        // ======= extract the test class
-        ProcessBuilder pb = new ProcessBuilder(new String[] {
-            JDKToolFinder.getJDKTool("jar"),
-            "xvf", jarFile } );
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldHaveExitValue(0);
+        // create a file in the scratch dir
+        File classFile = new File(className + ".class");
+        classFile.createNewFile();
+
+        // fill it with the binary data of the class file
+        byte[] bytes = OOMCrashClass1960_2.dump();
+        Files.write(classFile.toPath(), bytes);
 
         // ======= execute the test
         // We run the test with MallocLimit set to 768m in oom mode,
         // in order to trigger and observe a fake os::malloc oom. This needs NMT.
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-cp", ".",
             "-XX:+UnlockDiagnosticVMOptions",
             "-XX:NativeMemoryTracking=summary",
             "-XX:MallocLimit=768m:oom",
-            className );
+            className);
 
-        output = new OutputAnalyzer(pb.start());
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldNotHaveExitValue(0);
         output.shouldContain("Cannot reserve enough memory");
     }
diff --git a/test/hotspot/jtreg/runtime/ClassFile/testcase.jar b/test/hotspot/jtreg/runtime/ClassFile/testcase.jar
deleted file mode 100644
index b7001cf3dd0abdb35489dc59ee3f7a5a87d1c3f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 984
zcmWIWW@Zs#;Nak3Xs=1MWk3R)3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`T^
zyq0{iOie4}hq$WR^Cemq&&5Tbh^tOxn40~m=wlHh*by^QUSDtqTHyl32uDPfp!z@(
zDC_U<>s*vroZ+04SX^vqX=V^_q?Zh0zrDNHPb5%;;eoNv=|h|TDcJuDJ;vt2W8d1@
zI7326Scr$U?bx9ngUDlRxM#*ziqB_=*6MBDy78mt3*9x5`WZ<+*VI4Eel+jrvpLnz
z@2FeEpSQ2=i?Zpkjx;IfyB}74^zx?Q6vLhO^me&U{oeiec%)B$zWwbLpY9!WQ-A+8
zOwKl@Zs)CzC^7T6=f{5r)s<Y){N?Sh=dAoHvPb@D==vLPzHOc{_x>)OS5NMKyX3cD
zYxmo&t!Kkbl5DzH+OG_W+0wmA@NAmTF&D9~=9M>N&n4ykJ32wQY_r7K)!z!U@;t0c
zx0UXgUS9Tj)tUIxuIJ+3w>B2;i2q|(soK5q>!#>$m;Yvc=H9(_M(546o})3VUdvC}
zd*#=)3DxV5?v?OO75CRwd*l_<`(<}WT&_XK#Ew@v8@K&3jCvh^>G$@_yWg`tf1mtD
z#m#^7<b(Z3-gl4*e#jdrZJObgt$lRGxkphk{<AtVnGFTW1ce;`4F!z5XU_O*Dq#F>
z`HZ5#_&);X{{Qa@eBB|sU4MUUhKgGq6DR>!ckl22%E-Vl_c<u-FfxfSpr(IV;s&LE
zQ~*!Vpxl726*)<QQa=KKaur-FQeHqd0hDx+9R^Ce2yh6<#F>x-yjj^mN|}N12$22<
G_5c8H`%*9f


From f1e06c3c050b3440555d63b6de80fe9f60b35dfa Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 5 May 2025 09:00:59 +0000
Subject: [PATCH 265/901] 8299934: LocalExecutionControl replaces default
 uncaught exception handler

Reviewed-by: liach
---
 .../execution/LocalExecutionControl.java      |  29 ++--
 .../LocalExecutionControlExceptionTest.java   | 154 ++++++++++++++++++
 2 files changed, 169 insertions(+), 14 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/LocalExecutionControlExceptionTest.java

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
index 5f547b25178..d3aa891b8c4 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
@@ -132,28 +132,29 @@ protected String invoke(Method doitMethod) throws Exception {
         }
         allStop.set(null, false);
 
-        execThreadGroup = new ThreadGroup("JShell process local execution");
-
         AtomicReference<InvocationTargetException> iteEx = new AtomicReference<>();
         AtomicReference<IllegalAccessException> iaeEx = new AtomicReference<>();
         AtomicReference<NoSuchMethodException> nmeEx = new AtomicReference<>();
         AtomicReference<Boolean> stopped = new AtomicReference<>(false);
 
-        Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
-            if (e instanceof InvocationTargetException) {
-                if (e.getCause() instanceof ThreadDeath) {
+        execThreadGroup = new ThreadGroup("JShell process local execution") {
+            @Override
+            public void uncaughtException(Thread t, Throwable e) {
+                if (e instanceof InvocationTargetException) {
+                    if (e.getCause() instanceof ThreadDeath) {
+                        stopped.set(true);
+                    } else {
+                        iteEx.set((InvocationTargetException) e);
+                    }
+                } else if (e instanceof IllegalAccessException) {
+                    iaeEx.set((IllegalAccessException) e);
+                } else if (e instanceof NoSuchMethodException) {
+                    nmeEx.set((NoSuchMethodException) e);
+                } else if (e instanceof ThreadDeath) {
                     stopped.set(true);
-                } else {
-                    iteEx.set((InvocationTargetException) e);
                 }
-            } else if (e instanceof IllegalAccessException) {
-                iaeEx.set((IllegalAccessException) e);
-            } else if (e instanceof NoSuchMethodException) {
-                nmeEx.set((NoSuchMethodException) e);
-            } else if (e instanceof ThreadDeath) {
-                stopped.set(true);
             }
-        });
+        };
 
         final Object[] res = new Object[1];
         Thread snippetThread = new Thread(execThreadGroup, () -> {
diff --git a/test/langtools/jdk/jshell/LocalExecutionControlExceptionTest.java b/test/langtools/jdk/jshell/LocalExecutionControlExceptionTest.java
new file mode 100644
index 00000000000..afdf7d12e82
--- /dev/null
+++ b/test/langtools/jdk/jshell/LocalExecutionControlExceptionTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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 8299934
+ * @summary Test LocalExecutionControl
+ * @run junit LocalExecutionControlExceptionTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import jdk.jshell.EvalException;
+import jdk.jshell.JShell;
+import jdk.jshell.execution.LocalExecutionControlProvider;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.*;
+
+public class LocalExecutionControlExceptionTest {
+
+    @Test
+    @ExtendWith(NoUncaughtExceptionHandleInterceptor.class)
+    public void testUncaughtExceptions() throws InterruptedException {
+        List<Throwable> excs = new ArrayList<>();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Thread.setDefaultUncaughtExceptionHandler((t, ex) -> excs.add(ex));
+        try (var jshell = JShell.builder()
+                                .err(new PrintStream(out))
+                                .out(new PrintStream(out))
+                                .executionEngine(new LocalExecutionControlProvider(), Map.of())
+                                .build()) {
+            {
+                var events = jshell.eval("throw new java.io.IOException();");
+                Assertions.assertEquals(1, events.size());
+                Assertions.assertNotNull(events.get(0).exception());
+                Assertions.assertTrue(events.get(0).exception() instanceof EvalException);
+                Assertions.assertEquals("java.io.IOException",
+                                        ((EvalException) events.get(0).exception()).getExceptionClassName());
+                Assertions.assertEquals(0, excs.size());
+                Assertions.assertEquals(0, out.size());
+            }
+            {
+                var events = jshell.eval("throw new IllegalAccessException();");
+                Assertions.assertEquals(1, events.size());
+                Assertions.assertNotNull(events.get(0).exception());
+                Assertions.assertTrue(events.get(0).exception() instanceof EvalException);
+                Assertions.assertEquals("java.lang.IllegalAccessException",
+                                        ((EvalException) events.get(0).exception()).getExceptionClassName());
+                Assertions.assertEquals(0, excs.size());
+                Assertions.assertEquals(0, out.size());
+            }
+            jshell.eval("""
+                        <T extends Throwable> T t2(Throwable t) throws T {
+                            throw (T) t;
+                        }
+                        """);
+            jshell.eval("""
+                        void t(Throwable t) {
+                            throw t2(t);
+                        }
+                        """);
+            {
+                var events = jshell.eval("""
+                                         {
+                                             var t = new Thread(() -> t(new java.io.IOException()));
+                                             t.start();
+                                             t.join();
+                                         }
+                                         """);
+                Assertions.assertEquals(1, events.size());
+                Assertions.assertNull(events.get(0).exception());
+                Assertions.assertEquals(0, excs.size());
+                Assertions.assertEquals(0, out.size());
+            }
+            {
+                var events = jshell.eval("""
+                                         {
+                                             var t = new Thread(() -> t(new IllegalAccessException()));
+                                             t.start();
+                                             t.join();
+                                         }
+                                         """);
+                Assertions.assertEquals(1, events.size());
+                Assertions.assertNull(events.get(0).exception());
+                Assertions.assertEquals(0, excs.size());
+                Assertions.assertEquals(0, out.size());
+            }
+            Thread outsideOfJShell = new Thread(() -> {
+                t(new IOException());
+            });
+            outsideOfJShell.start();
+            outsideOfJShell.join();
+            Assertions.assertEquals(1, excs.size());
+        }
+    }
+
+    void t(Throwable t) {
+        throw t2(t);
+    }
+
+    <T extends Throwable> T t2(Throwable t) throws T {
+        throw (T) t;
+    }
+
+    public static final class NoUncaughtExceptionHandleInterceptor implements InvocationInterceptor {
+        public void interceptTestMethod(Invocation<Void> invocation,
+                                        ReflectiveInvocationContext<Method> invocationContext,
+                                        ExtensionContext extensionContext) throws Throwable {
+            Throwable[] exc = new Throwable[1];
+            //the tests normally run in a ThreadGroup which handles uncaught exception
+            //run in a ThreadGroup which does not handle the uncaught exceptions, and let them
+            //pass to the default uncaught handler for the test:
+            var thread = new Thread(Thread.currentThread().getThreadGroup().getParent(), "test-group") {
+                public void run() {
+                    try {
+                        invocation.proceed();
+                    } catch (Throwable ex) {
+                        exc[0] = ex;
+                    }
+                }
+            };
+            thread.start();
+            thread.join();
+            if (exc[0] != null) {
+                throw exc[0];
+            }
+        }
+    }
+}

From 026479767c011227b63e7fdb8a38f61977782249 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Mon, 5 May 2025 11:43:45 +0000
Subject: [PATCH 266/901] 8352730: RISC-V: Disable tests in qemu-user

Reviewed-by: fyang, mli
---
 test/hotspot/jtreg/runtime/os/TestTracePageSizes.java        | 5 +++++
 .../jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java      | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java       | 1 +
 .../jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java   | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java      | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java    | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java     | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbField.java        | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java       | 2 ++
 test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java        | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java      | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java      | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java         | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java       | 2 ++
 .../serviceability/sa/ClhsdbJstackWithConcurrentLock.java    | 1 +
 .../jtreg/serviceability/sa/ClhsdbJstackXcompStress.java     | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java         | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java     | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java      | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java     | 2 ++
 test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java       | 1 +
 .../jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java   | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java       | 1 +
 .../hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java | 1 +
 .../hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java | 1 +
 test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java        | 1 +
 .../jtreg/serviceability/sa/DeadlockDetectionTest.java       | 1 +
 .../hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java | 1 +
 test/hotspot/jtreg/serviceability/sa/TestClassDump.java      | 1 +
 .../jtreg/serviceability/sa/TestClhsdbJstackLock.java        | 1 +
 .../jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java   | 1 +
 .../hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java | 1 +
 test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java | 1 +
 test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java   | 1 +
 .../serviceability/sa/TestHeapDumpForInvokeDynamic.java      | 1 +
 .../jtreg/serviceability/sa/TestInstanceKlassSize.java       | 1 +
 .../serviceability/sa/TestInstanceKlassSizeForInterface.java | 1 +
 test/hotspot/jtreg/serviceability/sa/TestIntConstant.java    | 1 +
 .../hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java | 1 +
 .../jtreg/serviceability/sa/TestJhsdbJstackMixed.java        | 1 +
 .../jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java | 1 +
 .../jtreg/serviceability/sa/TestJhsdbJstackUpcall.java       | 1 +
 .../hotspot/jtreg/serviceability/sa/TestObjectAlignment.java | 1 +
 .../jtreg/serviceability/sa/TestObjectMonitorIterate.java    | 1 +
 test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/TestSysProps.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/TestType.java           | 1 +
 test/hotspot/jtreg/serviceability/sa/TestUniverse.java       | 1 +
 test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java   | 1 +
 .../serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java | 1 +
 .../sa/sadebugd/ClhsdbAttachToDebugServer.java               | 1 +
 .../sa/sadebugd/ClhsdbTestConnectArgument.java               | 1 +
 .../jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java  | 1 +
 .../serviceability/sa/sadebugd/DisableRegistryTest.java      | 1 +
 .../jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java   | 1 +
 .../serviceability/sa/sadebugd/RunCommandOnServerTest.java   | 1 +
 .../jtreg/serviceability/sa/sadebugd/SADebugDTest.java       | 1 +
 test/jdk/java/lang/ProcessHandle/InfoTest.java               | 1 +
 test/jdk/java/lang/System/i18nEnvArg.java                    | 1 +
 64 files changed, 71 insertions(+)

diff --git a/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java b/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java
index e6fe18dce30..d325468b2bb 100644
--- a/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java
+++ b/test/hotspot/jtreg/runtime/os/TestTracePageSizes.java
@@ -29,6 +29,7 @@
  * @build jdk.test.lib.Platform
  * @requires os.family == "linux"
  * @requires os.arch != "ppc64le"
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @run main/othervm -XX:+AlwaysPreTouch -Xlog:pagesize:ps-%p.log TestTracePageSizes
  */
 
@@ -53,6 +54,7 @@
  * @build jdk.test.lib.Platform
  * @requires os.family == "linux"
  * @requires os.arch != "ppc64le"
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @requires vm.gc != "Z" & vm.gc != "Shenandoah"
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:-SegmentedCodeCache TestTracePageSizes
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:-SegmentedCodeCache -XX:+UseLargePages TestTracePageSizes
@@ -66,6 +68,7 @@
  * @build jdk.test.lib.Platform
  * @requires os.family == "linux"
  * @requires os.arch != "ppc64le"
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @requires vm.gc.G1
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseG1GC TestTracePageSizes
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseG1GC -XX:+UseLargePages TestTracePageSizes
@@ -79,6 +82,7 @@
  * @build jdk.test.lib.Platform
  * @requires os.family == "linux"
  * @requires os.arch != "ppc64le"
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @requires vm.gc.Parallel
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseParallelGC TestTracePageSizes
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseParallelGC -XX:+UseLargePages TestTracePageSizes
@@ -92,6 +96,7 @@
  * @build jdk.test.lib.Platform
  * @requires os.family == "linux"
  * @requires os.arch != "ppc64le"
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @requires vm.gc.Serial
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseSerialGC TestTracePageSizes
  * @run main/othervm -XX:+AlwaysPreTouch -Xmx128m -Xlog:pagesize:ps-%p.log -XX:+UseSerialGC -XX:+UseLargePages TestTracePageSizes
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
index 6d6104da57e..1911862b361 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
@@ -36,6 +36,7 @@
  * @summary Test of diagnostic command System.map
  * @library /test/lib
  * @requires (os.family == "linux" | os.family == "windows" | os.family == "mac")
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @modules java.base/jdk.internal.misc
  *          java.compiler
  *          java.management
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
index fd0a152da3b..a6a56a0c266 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttach.java
@@ -33,6 +33,7 @@
  * @bug 8191658
  * @summary Test clhsdb attach, detach, reattach commands
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbAttach
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
index 1ed59b66429..d897c2f7188 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbAttachDifferentJVMs.java
@@ -33,6 +33,7 @@
  * @bug 8314679
  * @summary Test clhsdb attach, detach, and then attach to different JVM
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbAttachDifferentJVMs
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
index 14721e58cf6..8f94ddb56d4 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbClasses.java
@@ -33,6 +33,7 @@
  * @bug 8242142
  * @summary Test clhsdb class and classes commands
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbClasses
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
index e2d7073552e..47a5357bab4 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpclass.java
@@ -39,6 +39,7 @@
  * @bug 8240990
  * @summary Test clhsdb dumpclass command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver ClhsdbDumpclass
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
index b414a6f4e8d..fef7c827eb7 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
@@ -40,6 +40,7 @@
  * @bug 8240989
  * @summary Test clhsdb dumpheap command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.compMode != "Xcomp"
  * @comment Running this test with -Xcomp is slow and therefore tends to cause
  *          timeouts. As there is no known direct benefit from running the test
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
index 18f40603505..e0e249b7d7f 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
@@ -32,6 +32,7 @@
  * @bug 8191538
  * @summary Test clhsdb 'field' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbField
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
index f7df681704e..c75a38490d5 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
@@ -37,6 +37,7 @@
  * @summary Test the clhsdb 'findpc' command with Xcomp on live process
  * @requires vm.compMode != "Xcomp"
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.compiler1.enabled
  * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
@@ -60,6 +61,7 @@
  * @bug 8193124
  * @summary Test the clhsdb 'findpc' command w/o Xcomp on live process
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.compiler1.enabled
  * @library /test/lib
  * @run main/othervm/timeout=480 ClhsdbFindPC false false
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
index a1acaf7c60b..ff3d326dca0 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFlags.java
@@ -36,6 +36,7 @@
  * @bug 8217845
  * @summary Test clhsdb flags command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver ClhsdbFlags
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
index e39b4698f2c..00e703d00d4 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbHistory.java
@@ -36,6 +36,7 @@
  * @bug 8217845
  * @summary Test clhsdb command line history support
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbHistory
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
index d39779c4e4d..2ece0942a56 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
@@ -26,6 +26,7 @@
  * @bug 8192985
  * @summary Test the clhsdb 'inspect' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=480 ClhsdbInspect
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
index fa6137c74e7..6cfeacd9139 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java
@@ -26,6 +26,7 @@
  * @bug 8193124
  * @summary Test the clhsdb 'jdis' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbJdis
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
index c8943582d0c..da192b39c1e 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJhisto.java
@@ -35,6 +35,7 @@
  * @bug 8191658
  * @summary Test clhsdb jhisto command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbJhisto
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
index 2e21926adb2..d3fec454e40 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstack.java
@@ -33,6 +33,7 @@
  * @bug 8190198
  * @summary Test clhsdb Jstack command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=480 ClhsdbJstack true
  */
@@ -43,6 +44,7 @@
  * @requires vm.compMode != "Xcomp"
  * @summary Test clhsdb Jstack command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=480 ClhsdbJstack false
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackWithConcurrentLock.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackWithConcurrentLock.java
index ca134ffa4ac..43926941a1a 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackWithConcurrentLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackWithConcurrentLock.java
@@ -26,6 +26,7 @@
  * @bug 8324066
  * @summary Test the clhsdb 'jstack -l' command for printing concurrent lock information
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbJstackWithConcurrentLock
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
index f8ebd852a77..7e06cb3af95 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJstackXcompStress.java
@@ -36,6 +36,7 @@
  * @test
  * @bug 8196969
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
  * @run driver/timeout=300 ClhsdbJstackXcompStress
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
index 1f039eb73b5..ba65cb40e6d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
@@ -26,6 +26,7 @@
  * @bug 8190198
  * @summary Test clhsdb longConstant command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbLongConstant
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
index 9999f08208e..5c0aa9457ae 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
@@ -35,6 +35,7 @@
  * @bug 8190198
  * @summary Test clhsdb pmap command on a live process
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbPmap false
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
index 801c9acab3d..4452abe3cc0 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAll.java
@@ -32,6 +32,7 @@
  * @bug 8175384
  * @summary Test clhsdb 'printall' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=2400 -Xmx1g ClhsdbPrintAll
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
index 0326e143cb1..4c1ff20952a 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java
@@ -26,6 +26,7 @@
  * @bug 8192985
  * @summary Test the clhsdb 'printas' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbPrintAs
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
index abbcb552876..c6f83c06845 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
@@ -33,6 +33,7 @@
  * @bug 8190198
  * @summary Test clhsdb printstatics command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbPrintStatics
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
index 9a7dabcd6f8..cd5b1206ce9 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
@@ -35,6 +35,7 @@
  * @bug 8190198
  * @summary Test clhsdb pstack command on a live process
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbPstack false
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
index c032b71a000..cb90067f2f7 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java
@@ -27,6 +27,7 @@
  * @summary Test the clhsdb 'scanoops' command
  * @requires vm.gc.Parallel
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=1200 ClhsdbScanOops UseParallelGC
  */
@@ -37,6 +38,7 @@
  * @summary Test the clhsdb 'scanoops' command
  * @requires vm.gc.Serial
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm/timeout=1200 ClhsdbScanOops UseSerialGC
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
index dc7322babd3..732fb7bf174 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSource.java
@@ -36,6 +36,7 @@
  * @bug 8192823
  * @summary Test clhsdb source command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbSource
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
index bb7822c00d4..c4031c31aa6 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java
@@ -33,6 +33,7 @@
  * @bug 8261095
  * @summary Test the clhsdb 'symbol' command on live process
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbSymbol
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
index 2e17bc038de..ca52fcd156a 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbTestAllocationMerge.java
@@ -30,6 +30,7 @@
  * @bug 8318682
  * @summary Test clhsdb that decoding of AllocationMerge objects in debug info works correctly
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbTestAllocationMerge
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
index d3c4a5b8293..460af71bd0d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java
@@ -33,6 +33,7 @@
  * @bug 8193352
  * @summary Test clhsdb 'thread' and 'threads' commands
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbThread
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java
index e84ae52e920..988227f3961 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java
@@ -33,6 +33,7 @@
  * @test
  * @summary Test clhsdb where command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbThreadContext
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
index 8ca5b5e6e38..1fee2b8762b 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbVmStructsDump.java
@@ -32,6 +32,7 @@
  * @bug 8191538
  * @summary Test clhsdb 'vmstructsdump' command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbVmStructsDump
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
index 547034463d7..fb12fe896a1 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java
@@ -33,6 +33,7 @@
  * @bug 8190198
  * @summary Test clhsdb where command
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm ClhsdbWhere
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java b/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
index 3f0ab21412d..c21cd840f2a 100644
--- a/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/DeadlockDetectionTest.java
@@ -25,6 +25,7 @@
  * @test
  * @summary Test deadlock detection
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @modules java.management
diff --git a/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java b/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
index 8ea8d29dc5b..798de679d7c 100644
--- a/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/JhsdbThreadInfoTest.java
@@ -30,6 +30,7 @@
 /**
  * @test
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver JhsdbThreadInfoTest
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
index 04d225287b8..793c4e1d2d7 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java
@@ -37,6 +37,7 @@
  * @bug 8184982
  * @summary Test ClassDump tool
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestClassDump
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
index 266b14167ef..acca1827b3c 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
@@ -33,6 +33,7 @@
  * @test
  * @bug 8185796 8335743
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm TestClhsdbJstackLock
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
index ca5c99d00b8..bb66b388924 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
@@ -46,6 +46,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
index 946189f1195..108eb440d36 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestDebugInfoDecode.java
@@ -38,6 +38,7 @@
  * @bug 8318682
  * @summary Test decoding debug info for all nmethods in the code cache
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.code
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
index 094c7525048..173ade9c38f 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
@@ -45,6 +45,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
diff --git a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
index 147b3a50faa..1a719192fe9 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
@@ -41,6 +41,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.gc.G1
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.gc.g1
diff --git a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
index 8022d9a0090..bd6f7b55166 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestHeapDumpForInvokeDynamic.java
@@ -37,6 +37,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
diff --git a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
index ebe55b75061..5486dd0a203 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java
@@ -46,6 +46,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
diff --git a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
index e0f7cbecd2f..95d98e3cb83 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java
@@ -42,6 +42,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules java.base/jdk.internal.misc
  *          jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
diff --git a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
index 222cc4fd963..16b41913e39 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestIntConstant.java
@@ -34,6 +34,7 @@
  * @summary Test the 'intConstant' command of jhsdb clhsdb.
  * @bug 8190307
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm TestIntConstant
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
index d3c7f611031..8d5c95721d5 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
@@ -31,6 +31,7 @@
  * @test
  * @bug 8185796 8335743
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestJhsdbJstackLock
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
index 3a83601b579..739a0a358aa 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
@@ -37,6 +37,7 @@
  * @key randomness
  * @bug 8208091
  * @requires (os.family == "linux") & (vm.hasSA)
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestJhsdbJstackMixed
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
index e46306cf8d3..b7f3a78ef02 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackPrintVMLocks.java
@@ -31,6 +31,7 @@
  * @test
  * @summary Test verifies that jstack --mixed prints information about VM locks
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
index 924f56c9b44..046842aca46 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackUpcall.java
@@ -31,6 +31,7 @@
  * @test
  * @bug 8339307
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestJhsdbJstackUpcall
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
index 7dd4640650f..28d6f74c689 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestObjectAlignment.java
@@ -39,6 +39,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA & vm.bits == "64"
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.runtime
  * @run driver TestObjectAlignment
diff --git a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
index 5ab95277526..d4852750fd8 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
@@ -38,6 +38,7 @@
  * @bug 8259008
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
  *          jdk.hotspot.agent/sun.jvm.hotspot.runtime
diff --git a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
index 4b3977a1a08..9055884bec0 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
@@ -33,6 +33,7 @@
  * @test
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires vm.flavor == "server" & !vm.emulatedClient & !(vm.opt.TieredStopAtLevel == 1)
  * @run main/othervm TestPrintMdo
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestSysProps.java b/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
index 84b9752c912..3d613c6d8ee 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestSysProps.java
@@ -37,6 +37,7 @@
  * @bug 8242165 8242162
  * @summary Test "jhsdb jinfo --sysprops", "jinfo -sysprops", and clhsdb "sysprops" commands
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestSysProps
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestType.java b/test/hotspot/jtreg/serviceability/sa/TestType.java
index dca53fb83d3..d0eb1ab4337 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestType.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestType.java
@@ -34,6 +34,7 @@
  * @summary Test the 'type' command of jhsdb clhsdb.
  * @bug 8190307
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run main/othervm TestType
  */
diff --git a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
index a19a32f1b75..c519127c4f3 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestUniverse.java
@@ -35,6 +35,7 @@
  * @test
  * @summary Test the 'universe' command of jhsdb clhsdb.
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @bug 8190307
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java b/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
index 932974d2dce..d7d5ce6402e 100644
--- a/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/UniqueVtableTest.java
@@ -26,6 +26,7 @@
  *
  * @library /test/lib
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
  *          jdk.hotspot.agent/sun.jvm.hotspot.debugger
  *          jdk.hotspot.agent/sun.jvm.hotspot.types
diff --git a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index 9d923f7b710..640c755880e 100644
--- a/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -42,6 +42,7 @@
  * @test
  * @bug 6313383
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @summary Regression test for hprof export issue due to large heaps (>2G)
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
index 9bf0cbb963c..269d19c1e01 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbAttachToDebugServer.java
@@ -36,6 +36,7 @@
  * @bug 8262520
  * @summary Test clhsdb connect, detach, reattach commands
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @library /test/lib
  * @run driver ClhsdbAttachToDebugServer
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
index 11c0113dc14..2fea5e46e47 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/ClhsdbTestConnectArgument.java
@@ -35,6 +35,7 @@
  * @test
  * @bug 8263342
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @library /test/lib
  * @run driver ClhsdbTestConnectArgument
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
index 1a5072123a3..a467824e31a 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/DebugdConnectTest.java
@@ -26,6 +26,7 @@
  * @bug 8209790
  * @summary Checks ability for connecting to debug server (jstack, jmap, jinfo, jsnap)
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
index feb477d87b1..af2b6e9b23c 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/DisableRegistryTest.java
@@ -36,6 +36,7 @@
  * @bug 8263636 8263635
  * @summary Test to use already started RMI registry
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @library /test/lib
  * @run driver DisableRegistryTest
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java
index 6c14e7823e4..b1665634fb0 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/PmapOnDebugdTest.java
@@ -34,6 +34,7 @@
  * @test
  * @bug 8263670
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires (os.family != "windows") & (os.family != "mac")
  * @library /test/lib
  * @run driver PmapOnDebugdTest
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java
index 4ac5c452770..9e725561341 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/RunCommandOnServerTest.java
@@ -37,6 +37,7 @@
  * @bug 8265505
  * @summary Test clhsdb command which should be run on debugd server
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @library /test/lib
  * @run driver RunCommandOnServerTest
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
index 4ba76034276..ebdd69e7d40 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
@@ -27,6 +27,7 @@
  * @summary Checks that the jshdb debugd utility successfully starts
  *          and tries to attach to a running process
  * @requires vm.hasSA
+ * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
diff --git a/test/jdk/java/lang/ProcessHandle/InfoTest.java b/test/jdk/java/lang/ProcessHandle/InfoTest.java
index 9901ee81592..66ac2df830b 100644
--- a/test/jdk/java/lang/ProcessHandle/InfoTest.java
+++ b/test/jdk/java/lang/ProcessHandle/InfoTest.java
@@ -49,6 +49,7 @@
 /*
  * @test
  * @bug 8077350 8081566 8081567 8098852 8136597
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
diff --git a/test/jdk/java/lang/System/i18nEnvArg.java b/test/jdk/java/lang/System/i18nEnvArg.java
index ba9d31cb373..b6c62c15e1f 100644
--- a/test/jdk/java/lang/System/i18nEnvArg.java
+++ b/test/jdk/java/lang/System/i18nEnvArg.java
@@ -26,6 +26,7 @@
  * @bug 8285517
  * @summary System.getenv() and argument don't return locale dependent data by JEP400
  * @requires (os.family == "linux")
+ * @requires os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*")
  * @modules jdk.charsets
  * @library /test/lib
  * @build jdk.test.lib.process.*

From a8cd01f6e2075bef89fcd82893cf417c9e1fa877 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 5 May 2025 11:57:01 +0000
Subject: [PATCH 267/901] 8355353: File Leak in os::read_image_release_file of
 os.cpp:1552

Reviewed-by: zgu, jsjolen
---
 src/hotspot/share/runtime/os.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 8e85c0a8c02..ee1f0a3b081 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1551,6 +1551,7 @@ void os::read_image_release_file() {
   fseek(file, 0, SEEK_END);
   long sz = ftell(file);
   if (sz == -1) {
+    fclose(file);
     return;
   }
   fseek(file, 0, SEEK_SET);

From 1501a5e41e59162a374cf5b8cfc37faced48a6ed Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 5 May 2025 12:51:02 +0000
Subject: [PATCH 268/901] 8356122: Client build fails after JDK-8350209

Reviewed-by: chagedorn
---
 src/hotspot/share/code/aotCodeCache.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index e94c9ac8665..68a8e9ed70a 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "asm/macroAssembler.hpp"
 #include "cds/aotCacheAccess.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
@@ -40,6 +41,7 @@
 #include "runtime/os.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "utilities/copy.hpp"
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif

From 6719b9214fb9c99da52e5d6c11f5d40b2aa73bd9 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 5 May 2025 15:42:19 +0000
Subject: [PATCH 269/901] 8356108: Update SourceVersion.RELEASE_25 description
 for JEPs 511 and 512

Reviewed-by: vromero, liach, iris, jlahoda
---
 .../classes/javax/lang/model/SourceVersion.java      |  9 +++++++++
 test/langtools/tools/javac/versions/Versions.java    | 12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index 9260ce532f1..6bc1dab1f8a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -81,6 +81,8 @@ public enum SourceVersion {
      *      switch in second preview, module Import Declarations in second
      *      preview, simple source files and instance main in fourth
      *      preview, flexible constructor bodies in third preview)
+     *  25: module import declarations, compact source files and
+     *      instance main methods,
      */
 
     /**
@@ -449,11 +451,18 @@ public enum SourceVersion {
      * The version introduced by the Java Platform, Standard Edition
      * 25.
      *
+     * Additions in this release include module import declarations
+     * and compact source files and instance main methods.
+     *
      * @since 25
      *
      * @see <a
      * href="https://docs.oracle.com/javase/specs/jls/se25/html/index.html">
      * <cite>The Java Language Specification, Java SE 25 Edition</cite></a>
+     * @see <a href="https://openjdk.org/jeps/511">
+     * JEP 511: Module Import Declarations</a>
+     * @see <a href="https://openjdk.org/jeps/512">
+     * JEP 512: Compact Source Files and Instance Main Methods</a>
      */
     RELEASE_25,
     ; // Reduce code churn when appending new constants
diff --git a/test/langtools/tools/javac/versions/Versions.java b/test/langtools/tools/javac/versions/Versions.java
index 6d885a55972..52b0f0d366d 100644
--- a/test/langtools/tools/javac/versions/Versions.java
+++ b/test/langtools/tools/javac/versions/Versions.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,7 +26,7 @@
  * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545
  * 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563
  * 8245147 8245586 8257453 8286035 8306586 8320806 8306586 8319414 8330183
- * 8342982
+ * 8342982 8356108
  * @summary Check interpretation of -target and -source options
  * @modules java.compiler
  *          jdk.compiler
@@ -403,6 +403,14 @@ public static void main(String... args) {
                  }
              }
              """),
+
+         SOURCE_25(25, "New25.java",
+             // New feature in 25: module import declarations
+             """
+             import module java.base;
+             public class New25 {
+             }
+             """),
             ; // Reduce code churn when appending new constants
 
         private int sourceLevel;

From f68764490c9d355770475d26202fe10005375388 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 5 May 2025 16:30:25 +0000
Subject: [PATCH 270/901] 8356153: Shenandoah stubs are missing in AOT Code
 Cache addresses table

Reviewed-by: kvn
---
 src/hotspot/share/code/aotCodeCache.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 68a8e9ed70a..12706ef3e99 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -48,6 +48,9 @@
 #if INCLUDE_G1GC
 #include "gc/g1/g1BarrierSetRuntime.hpp"
 #endif
+#if INCLUDE_SHENANDOAHGC
+#include "gc/shenandoah/shenandoahRuntime.hpp"
+#endif
 #if INCLUDE_ZGC
 #include "gc/z/zBarrierSetRuntime.hpp"
 #endif
@@ -976,9 +979,9 @@ ImmutableOopMapSet* AOTCodeReader::read_oop_map_set() {
 //      [_blobs_base, _blobs_base + _blobs_max -1],
 //      ...
 //      [_c_str_base, _c_str_base + _c_str_max -1],
-#define _extrs_max 10
+#define _extrs_max 13
 #define _blobs_max 10
-#define _all_max   20
+#define _all_max   23
 
 #define _extrs_base 0
 #define _blobs_base (_extrs_base + _extrs_max)
@@ -1012,6 +1015,11 @@ void AOTCodeAddressTable::init_extrs() {
   SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_post_entry);
   SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_pre_entry);
 #endif
+#if INCLUDE_SHENANDOAHGC
+  SET_ADDRESS(_extrs, ShenandoahRuntime::write_ref_field_pre);
+  SET_ADDRESS(_extrs, ShenandoahRuntime::load_reference_barrier_phantom);
+  SET_ADDRESS(_extrs, ShenandoahRuntime::load_reference_barrier_phantom_narrow);
+#endif
 #if INCLUDE_ZGC
   SET_ADDRESS(_extrs, ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded_addr());
 #if defined(AMD64)

From 32f67a3e38be807164435ea0841c01d2b7c73652 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 5 May 2025 16:42:44 +0000
Subject: [PATCH 271/901] 8356040:
 java/util/PluggableLocale/LocaleNameProviderTest.java timed out

Reviewed-by: naoto
---
 .../LocaleNameProviderTest.java               | 154 ++++++++++--------
 1 file changed, 85 insertions(+), 69 deletions(-)

diff --git a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java
index 5d5355a9755..9d44dd79c02 100644
--- a/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java
+++ b/test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4052440 8000273 8062588 8210406 8174269
+ * @bug 4052440 8000273 8062588 8210406 8174269 8356040
  * @summary LocaleNameProvider tests
  * @library providersrc/foobarutils
  *          providersrc/barprovider
@@ -31,97 +31,113 @@
  *          java.base/sun.util.resources
  * @build com.foobar.Utils
  *        com.bar.*
- * @run main/othervm -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest
+ * @run junit/othervm -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest
  */
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 import com.bar.LocaleNameProviderImpl;
 
+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 sun.util.locale.provider.LocaleProviderAdapter;
 import sun.util.locale.provider.ResourceBundleBasedAdapter;
 import sun.util.resources.OpenListResourceBundle;
 
 public class LocaleNameProviderTest extends ProviderTest {
 
-    public static void main(String[] s) {
-        new LocaleNameProviderTest();
-    }
+    private static final LocaleNameProviderImpl LNP = new LocaleNameProviderImpl();
+
+    /*
+     * This is not an exhaustive test. Such a test would require iterating (1000x1000)+
+     * inputs. Instead, we check against Japanese lang locales which guarantees
+     * we will run into cases where the CLDR is not the preferred provider as the
+     * SPI has defined variants of the Japanese locale (E.g. osaka).
+     * See LocaleNameProviderImpl and LocaleNames ResourceBundle.
+     */
+    @ParameterizedTest
+    @MethodSource
+    void checkAvailLocValidityTest(Locale target, Locale test, ResourceBundle rb,
+                                   boolean jreSupports, boolean spiSupports) {
+        // codes
+        String lang = test.getLanguage();
+        String ctry = test.getCountry();
+        String vrnt = test.getVariant();
+
+        // the localized name
+        String langresult = test.getDisplayLanguage(target);
+        String ctryresult = test.getDisplayCountry(target);
+        String vrntresult = test.getDisplayVariant(target);
+
+        // provider's name (if any)
+        String providerslang = null;
+        String providersctry = null;
+        String providersvrnt = null;
+        if (spiSupports) {
+            providerslang = LNP.getDisplayLanguage(lang, target);
+            providersctry = LNP.getDisplayCountry(ctry, target);
+            providersvrnt = LNP.getDisplayVariant(vrnt, target);
+        }
 
-    LocaleNameProviderTest() {
-        checkAvailLocValidityTest();
-        variantFallbackTest();
-    }
+        // JRE's name
+        String jreslang = null;
+        String jresctry = null;
+        String jresvrnt = null;
+        if (!lang.isEmpty()) {
+            try {
+                jreslang = rb.getString(lang);
+            } catch (MissingResourceException mre) {}
+        }
+        if (!ctry.isEmpty()) {
+            try {
+                jresctry = rb.getString(ctry);
+            } catch (MissingResourceException mre) {}
+        }
+        if (!vrnt.isEmpty()) {
+            try {
+                jresvrnt = rb.getString("%%"+vrnt);
+            } catch (MissingResourceException mre) {}
+        }
 
-    void checkAvailLocValidityTest() {
-        LocaleNameProviderImpl lnp = new LocaleNameProviderImpl();
-        Locale[] availloc = Locale.getAvailableLocales();
-        Locale[] testloc = availloc.clone();
-        List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getLocaleNameProvider().getAvailableLocales());
-        List<Locale> providerloc = Arrays.asList(lnp.getAvailableLocales());
+        checkValidity(target, jreslang, providerslang, langresult,
+            jreSupports && jreslang != null);
+        checkValidity(target, jresctry, providersctry, ctryresult,
+            jreSupports && jresctry != null);
+        checkValidity(target, jresvrnt, providersvrnt, vrntresult,
+            jreSupports && jresvrnt != null);
+    }
 
-        for (Locale target: availloc) {
+    public static List<Arguments> checkAvailLocValidityTest() {
+        var args = new ArrayList<Arguments>();
+        Locale[] availloc = Locale.availableLocales()
+                .filter(l -> l.getLanguage().equals("ja"))
+                .toArray(Locale[]::new);
+        List<Locale> jreimplloc = Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)
+                        .getLocaleNameProvider().getAvailableLocales())
+                .filter(l -> l.getLanguage().equals("ja"))
+                .toList();
+        List<Locale> providerloc = Arrays.asList(LNP.getAvailableLocales());
+
+        for (Locale target : availloc) {
             // pure JRE implementation
-            OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getLocaleNames(target);
+            OpenListResourceBundle rb = ((ResourceBundleBasedAdapter) LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getLocaleNames(target);
             boolean jreSupportsTarget = jreimplloc.contains(target);
-
-            for (Locale test: testloc) {
-                // codes
-                String lang = test.getLanguage();
-                String ctry = test.getCountry();
-                String vrnt = test.getVariant();
-
-                // the localized name
-                String langresult = test.getDisplayLanguage(target);
-                String ctryresult = test.getDisplayCountry(target);
-                String vrntresult = test.getDisplayVariant(target);
-
-                // provider's name (if any)
-                String providerslang = null;
-                String providersctry = null;
-                String providersvrnt = null;
-                if (providerloc.contains(target)) {
-                    providerslang = lnp.getDisplayLanguage(lang, target);
-                    providersctry = lnp.getDisplayCountry(ctry, target);
-                    providersvrnt = lnp.getDisplayVariant(vrnt, target);
-                }
-
-                // JRE's name
-                String jreslang = null;
-                String jresctry = null;
-                String jresvrnt = null;
-                if (!lang.equals("")) {
-                    try {
-                        jreslang = rb.getString(lang);
-                    } catch (MissingResourceException mre) {}
-                }
-                if (!ctry.equals("")) {
-                    try {
-                        jresctry = rb.getString(ctry);
-                    } catch (MissingResourceException mre) {}
-                }
-                if (!vrnt.equals("")) {
-                    try {
-                        jresvrnt = rb.getString("%%"+vrnt);
-                    } catch (MissingResourceException mre) {}
-                }
-
-                System.out.print("For key: "+lang+" ");
-                checkValidity(target, jreslang, providerslang, langresult,
-                    jreSupportsTarget && jreslang != null);
-                System.out.print("For key: "+ctry+" ");
-                checkValidity(target, jresctry, providersctry, ctryresult,
-                    jreSupportsTarget && jresctry != null);
-                System.out.print("For key: "+vrnt+" ");
-                checkValidity(target, jresvrnt, providersvrnt, vrntresult,
-                    jreSupportsTarget && jresvrnt != null);
+            boolean providerSupportsTarget = providerloc.contains(target);
+            for (Locale test : availloc) {
+                args.add(Arguments.of(target, test, rb, jreSupportsTarget, providerSupportsTarget));
             }
         }
+        return args;
     }
 
+    @Test
     void variantFallbackTest() {
         Locale YY = Locale.of("yy", "YY", "YYYY");
         Locale YY_suffix = Locale.of("yy", "YY", "YYYY_suffix");

From cc34135fff7650ad44c910dca0fd47e9cbd56b68 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <never@openjdk.org>
Date: Mon, 5 May 2025 17:26:01 +0000
Subject: [PATCH 272/901] 8343158: [JVMCI] ZGC should deoptimize on old gen
 allocation

Reviewed-by: aboldtch, eosterlund
---
 src/hotspot/share/gc/z/zBarrierSet.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
index a4893fc351a..43ea791a260 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -115,7 +115,9 @@ static void deoptimize_allocation(JavaThread* thread) {
   assert(caller_frame.is_compiled_frame(), "must be compiled");
 
   const nmethod* const nm = caller_frame.cb()->as_nmethod();
-  if (nm->is_compiled_by_c2() && !caller_frame.is_deoptimized_frame()) {
+  if ((nm->is_compiled_by_c2() || nm->is_compiled_by_jvmci()) && !caller_frame.is_deoptimized_frame()) {
+    // The JIT might have elided barriers on this object so deoptimize the frame and let the
+    // intepreter deal with it.
     Deoptimization::deoptimize_frame(thread, caller_frame.id());
   }
 }

From 65f188f29f1e9fe0f73d730a4c6029a7742c6d15 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 5 May 2025 18:35:46 +0000
Subject: [PATCH 273/901] 8354334: Remove @ValueBased from ProcessHandle

Reviewed-by: liach
---
 .../classes/java/lang/ProcessHandle.java      | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ProcessHandle.java b/src/java.base/share/classes/java/lang/ProcessHandle.java
index 51d13457b3f..750c93c9c57 100644
--- a/src/java.base/share/classes/java/lang/ProcessHandle.java
+++ b/src/java.base/share/classes/java/lang/ProcessHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -89,7 +89,6 @@
  * @see Process
  * @since 9
  */
-@jdk.internal.ValueBased
 public interface ProcessHandle extends Comparable<ProcessHandle> {
 
     /**
@@ -114,7 +113,7 @@ public interface ProcessHandle extends Comparable<ProcessHandle> {
      * @throws UnsupportedOperationException if the implementation
      *         does not support this operation
      */
-    public static Optional<ProcessHandle> of(long pid) {
+    static Optional<ProcessHandle> of(long pid) {
         return ProcessHandleImpl.get(pid);
     }
 
@@ -126,7 +125,7 @@ public static Optional<ProcessHandle> of(long pid) {
      * @throws UnsupportedOperationException if the implementation
      *         does not support this operation
      */
-    public static ProcessHandle current() {
+    static ProcessHandle current() {
         return ProcessHandleImpl.current();
     }
 
@@ -204,21 +203,21 @@ static Stream<ProcessHandle> allProcesses() {
      * and actions if the value is available.
      * @since 9
      */
-    public interface Info {
+    interface Info {
         /**
          * Returns the executable pathname of the process.
          *
          * @return an {@code Optional<String>} of the executable pathname
          *         of the process
          */
-        public Optional<String> command();
+        Optional<String> command();
 
         /**
          * Returns the command line of the process.
          * <p>
          * If {@link #command command()} and  {@link #arguments arguments()} return
          * non-empty optionals, this is simply a convenience method which concatenates
-         * the values of the two functions separated by spaces. Otherwise it will return a
+         * the values of the two functions separated by spaces. Otherwise, it will return a
          * best-effort, platform dependent representation of the command line.
          *
          * @apiNote Note that the returned executable pathname and the
@@ -233,7 +232,7 @@ public interface Info {
          * @return an {@code Optional<String>} of the command line
          *         of the process
          */
-        public Optional<String> commandLine();
+        Optional<String> commandLine();
 
         /**
          * Returns an array of Strings of the arguments of the process.
@@ -244,28 +243,28 @@ public interface Info {
          *
          * @return an {@code Optional<String[]>} of the arguments of the process
          */
-        public Optional<String[]> arguments();
+        Optional<String[]> arguments();
 
         /**
          * Returns the start time of the process.
          *
          * @return an {@code Optional<Instant>} of the start time of the process
          */
-        public Optional<Instant> startInstant();
+        Optional<Instant> startInstant();
 
         /**
          * Returns the total cputime accumulated of the process.
          *
          * @return an {@code Optional<Duration>} for the accumulated total cputime
          */
-        public Optional<Duration> totalCpuDuration();
+        Optional<Duration> totalCpuDuration();
 
         /**
          * Return the user of the process.
          *
          * @return an {@code Optional<String>} for the user of the process
          */
-        public Optional<String> user();
+        Optional<String> user();
     }
 
     /**
@@ -285,13 +284,11 @@ public interface Info {
      * {@link java.util.concurrent.CompletableFuture#isDone done} or to
      * {@link java.util.concurrent.Future#get() wait} for it to terminate.
      * {@link java.util.concurrent.Future#cancel(boolean) Cancelling}
-     * the CompleteableFuture does not affect the Process.
+     * the {@linkplain CompletableFuture CompletableFuture} does not affect the Process.
      * @apiNote
      * The process may be observed to have terminated with {@link #isAlive}
-     * before the ComputableFuture is completed and dependent actions are invoked.
-     *
+     * before the {@code CompletableFuture} is completed and dependent actions are invoked.
      * @return a new {@code CompletableFuture<ProcessHandle>} for the ProcessHandle
-     *
      * @throws IllegalStateException if the process is the current process
      */
     CompletableFuture<ProcessHandle> onExit();

From 6bcbc3b0a21687504b07a0a405d824a448aea872 Mon Sep 17 00:00:00 2001
From: Oleksii Sylichenko <a.silichenko@gmail.com>
Date: Mon, 5 May 2025 18:56:48 +0000
Subject: [PATCH 274/901] 8353489: Increase timeout and improve Windows
 compatibility in test/jdk/java/lang/ProcessBuilder/Basic.java

Reviewed-by: rriggs
---
 test/jdk/java/lang/ProcessBuilder/Basic.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java
index 68b3ab56b6d..b77c292766d 100644
--- a/test/jdk/java/lang/ProcessBuilder/Basic.java
+++ b/test/jdk/java/lang/ProcessBuilder/Basic.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
@@ -35,8 +35,8 @@
  * @requires !vm.musl
  * @requires vm.flagless
  * @library /test/lib
- * @run main/othervm/native/timeout=300 Basic
- * @run main/othervm/native/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
+ * @run main/othervm/native/timeout=360 Basic
+ * @run main/othervm/native/timeout=360 -Djdk.lang.Process.launchMechanism=fork Basic
  * @author Martin Buchholz
  */
 
@@ -55,7 +55,6 @@
 import static java.lang.ProcessBuilder.Redirect.*;
 
 import java.io.*;
-import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -207,7 +206,7 @@ private static void compareLinesIgnoreCase(String lines1, String lines2) {
 
     private static final Runtime runtime = Runtime.getRuntime();
 
-    private static final String[] winEnvCommand = {"cmd.exe", "/c", "set"};
+    private static final String[] winEnvCommand = {"cmd.exe", "/d", "/c", "set"};
 
     private static String winEnvFilter(String env) {
         return env.replaceAll("\r", "")
@@ -1841,7 +1840,9 @@ public void doIt(Map<String,String> environ) {
         // Test Runtime.exec(...envp...) with envstrings without any `='
         //----------------------------------------------------------------
         try {
-            String[] cmdp = {"echo"};
+            // In Windows CMD (`cmd.exe`), `echo/` outputs a newline (i.e., an empty line).
+            // Wrapping it with `cmd.exe /c` ensures compatibility in both native Windows and Cygwin environments.
+            String[] cmdp = Windows.is() ? new String[]{"cmd.exe", "/c", "echo/"} : new String[]{"echo"};
             String[] envp = {"Hello", "World"}; // Yuck!
             Process p = Runtime.getRuntime().exec(cmdp, envp);
             equal(commandOutput(p), "\n");

From 620f81671ae721c5e40291f396bbc7707d9d6bcc Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Mon, 5 May 2025 19:36:26 +0000
Subject: [PATCH 275/901] 8327495: Print more warning with -Xshare:auto when
 CDS fails to use archive

Reviewed-by: iklam, matsaave
---
 src/hotspot/share/cds/aotClassLocation.cpp    |  1 +
 src/hotspot/share/cds/cdsConfig.cpp           |  8 ++++
 src/hotspot/share/cds/cdsConfig.hpp           |  1 +
 src/hotspot/share/cds/filemap.cpp             | 45 +++++++++++--------
 src/hotspot/share/cds/metaspaceShared.cpp     | 44 +++++++++++++-----
 src/hotspot/share/cds/metaspaceShared.hpp     |  3 +-
 src/hotspot/share/classfile/modules.cpp       |  8 ++--
 .../cds/appcds/SharedArchiveConsistency.java  | 11 +++--
 .../AOTClassLinkingVMOptions.java             | 16 +++----
 .../aotClassLinking/BulkLoaderTest.java       |  3 +-
 .../dynamicArchive/WrongTopClasspath.java     |  7 ++-
 .../jvmti/CFLH/ClassFileLoadHookTest.java     |  2 +-
 12 files changed, 99 insertions(+), 50 deletions(-)

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index 8471d04b572..9df28d61bbc 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -1030,6 +1030,7 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
       }
     } else {
       log_warning(cds)("%s%s", mismatch_msg, hint_msg);
+      MetaspaceShared::report_loading_error(nullptr);
     }
   }
   return success;
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 701b2584774..463bfe3a98d 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -647,6 +647,14 @@ bool CDSConfig::is_using_archive() {
   return UseSharedSpaces;
 }
 
+bool CDSConfig::is_using_only_default_archive() {
+  return is_using_archive() &&
+         input_static_archive_path() != nullptr &&
+         default_archive_path() != nullptr &&
+         strcmp(input_static_archive_path(), default_archive_path()) == 0 &&
+         input_dynamic_archive_path() == nullptr;
+}
+
 bool CDSConfig::is_logging_lambda_form_invokers() {
   return ClassListWriter::is_enabled() || is_dumping_dynamic_archive();
 }
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index e82acebd175..0fb6cc1ec6a 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -103,6 +103,7 @@ class CDSConfig : public AllStatic {
 
   // input archive(s)
   static bool is_using_archive()                             NOT_CDS_RETURN_(false);
+  static bool is_using_only_default_archive()                NOT_CDS_RETURN_(false);
 
   // static_archive
   static bool is_dumping_static_archive()                    { return CDS_ONLY(_is_dumping_static_archive) NOT_CDS(false); }
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index fbef3c9532d..ff537ef96d6 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -326,7 +326,7 @@ bool FileMapInfo::validate_class_location() {
 
   if (header()->has_full_module_graph() && has_extra_module_paths) {
     CDSConfig::stop_using_optimized_module_handling();
-    log_info(cds)("optimized module handling: disabled because extra module path(s) are specified");
+    MetaspaceShared::report_loading_error("optimized module handling: disabled because extra module path(s) are specified");
   }
 
   if (CDSConfig::is_dumping_dynamic_archive()) {
@@ -1256,7 +1256,7 @@ char* FileMapInfo::map_bitmap_region() {
   char* bitmap_base = map_memory(_fd, _full_path, r->file_offset(),
                                  requested_addr, r->used_aligned(), read_only, allow_exec, mtClassShared);
   if (bitmap_base == nullptr) {
-    log_info(cds)("failed to map relocation bitmap");
+    MetaspaceShared::report_loading_error("failed to map relocation bitmap");
     return nullptr;
   }
 
@@ -1454,9 +1454,9 @@ void FileMapInfo::map_or_load_heap_region() {
       success = ArchiveHeapLoader::load_heap_region(this);
     } else {
       if (!UseCompressedOops && !ArchiveHeapLoader::can_map()) {
-        log_info(cds)("Cannot use CDS heap data. Selected GC not compatible -XX:-UseCompressedOops");
+        MetaspaceShared::report_loading_error("Cannot use CDS heap data. Selected GC not compatible -XX:-UseCompressedOops");
       } else {
-        log_info(cds)("Cannot use CDS heap data. UseEpsilonGC, UseG1GC, UseSerialGC, UseParallelGC, or UseShenandoahGC are required.");
+        MetaspaceShared::report_loading_error("Cannot use CDS heap data. UseEpsilonGC, UseG1GC, UseSerialGC, UseParallelGC, or UseShenandoahGC are required.");
       }
     }
   }
@@ -1468,8 +1468,10 @@ void FileMapInfo::map_or_load_heap_region() {
       // all AOT-linked classes are visible.
       //
       // We get here because the heap is too small. The app will fail anyway. So let's quit.
-      MetaspaceShared::unrecoverable_loading_error("CDS archive has aot-linked classes but the archived "
-                                                   "heap objects cannot be loaded. Try increasing your heap size.");
+      log_error(cds)("%s has aot-linked classes but the archived "
+                     "heap objects cannot be loaded. Try increasing your heap size.",
+                     CDSConfig::type_of_archive_being_loaded());
+      MetaspaceShared::unrecoverable_loading_error();
     }
     CDSConfig::stop_using_full_module_graph("archive heap loading failed");
   }
@@ -1635,7 +1637,7 @@ bool FileMapInfo::map_heap_region_impl() {
   // allocate from java heap
   HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size, (HeapWord*)requested_start);
   if (start == nullptr) {
-    log_info(cds)("UseSharedSpaces: Unable to allocate java heap region for archive heap.");
+    MetaspaceShared::report_loading_error("UseSharedSpaces: Unable to allocate java heap region for archive heap.");
     return false;
   }
 
@@ -1670,7 +1672,7 @@ bool FileMapInfo::map_heap_region_impl() {
 
     if (VerifySharedSpaces && !r->check_region_crc(base)) {
       dealloc_heap_region();
-      log_info(cds)("UseSharedSpaces: mapped heap region is corrupt");
+      MetaspaceShared::report_loading_error("UseSharedSpaces: mapped heap region is corrupt");
       return false;
     }
   }
@@ -1694,7 +1696,7 @@ bool FileMapInfo::map_heap_region_impl() {
   if (_heap_pointers_need_patching) {
     char* bitmap_base = map_bitmap_region();
     if (bitmap_base == nullptr) {
-      log_info(cds)("CDS heap cannot be used because bitmap region cannot be mapped");
+      MetaspaceShared::report_loading_error("CDS heap cannot be used because bitmap region cannot be mapped");
       dealloc_heap_region();
       _heap_pointers_need_patching = false;
       return false;
@@ -1807,16 +1809,16 @@ bool FileMapInfo::open_as_input() {
     // are replaced at runtime by JVMTI ClassFileLoadHook. All of those classes are resolved
     // during the JVMTI "early" stage, so we can still use CDS if
     // JvmtiExport::has_early_class_hook_env() is false.
-    log_info(cds)("CDS is disabled because early JVMTI ClassFileLoadHook is in use.");
+    MetaspaceShared::report_loading_error("CDS is disabled because early JVMTI ClassFileLoadHook is in use.");
     return false;
   }
 
   if (!open_for_read() || !init_from_file(_fd) || !validate_header()) {
     if (_is_static) {
-      log_info(cds)("Loading static archive failed.");
+      MetaspaceShared::report_loading_error("Loading static archive failed.");
       return false;
     } else {
-      log_info(cds)("Loading dynamic archive failed.");
+      MetaspaceShared::report_loading_error("Loading dynamic archive failed.");
       if (AutoCreateSharedArchive) {
         CDSConfig::enable_dumping_dynamic_archive(_full_path);
       }
@@ -1831,29 +1833,34 @@ bool FileMapInfo::validate_aot_class_linking() {
   // These checks need to be done after FileMapInfo::initialize(), which gets called before Universe::heap()
   // is available.
   if (header()->has_aot_linked_classes()) {
+    const char* archive_type = CDSConfig::type_of_archive_being_loaded();
     CDSConfig::set_has_aot_linked_classes(true);
     if (JvmtiExport::should_post_class_file_load_hook()) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.");
+      log_error(cds)("%s has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.",
+                     archive_type);
       return false;
     }
     if (JvmtiExport::has_early_vmstart_env()) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used when JVMTI early vm start is in use.");
+      log_error(cds)("%s has aot-linked classes. It cannot be used when JVMTI early vm start is in use.",
+                     archive_type);
       return false;
     }
     if (!CDSConfig::is_using_full_module_graph()) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used when archived full module graph is not used.");
+      log_error(cds)("%s has aot-linked classes. It cannot be used when archived full module graph is not used.",
+                     archive_type);
       return false;
     }
 
     const char* prop = Arguments::get_property("java.security.manager");
     if (prop != nullptr && strcmp(prop, "disallow") != 0) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used with -Djava.security.manager=%s.", prop);
+      log_error(cds)("%s has aot-linked classes. It cannot be used with -Djava.security.manager=%s.",
+                     archive_type, prop);
       return false;
     }
 
 #if INCLUDE_JVMTI
     if (Arguments::has_jdwp_agent()) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used with JDWP agent");
+      log_error(cds)("%s has aot-linked classes. It cannot be used with JDWP agent", archive_type);
       return false;
     }
 #endif
@@ -1913,8 +1920,8 @@ bool FileMapHeader::validate() {
   const char* prop = Arguments::get_property("java.system.class.loader");
   if (prop != nullptr) {
     if (has_aot_linked_classes()) {
-      log_error(cds)("CDS archive has aot-linked classes. It cannot be used when the "
-                     "java.system.class.loader property is specified.");
+      log_error(cds)("%s has aot-linked classes. It cannot be used when the "
+                     "java.system.class.loader property is specified.", CDSConfig::type_of_archive_being_loaded());
       return false;
     }
     log_warning(cds)("Archived non-system classes are disabled because the "
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 5f7b496f8d2..654c2e7ecd7 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -937,7 +937,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
   if (CDSConfig::is_dumping_heap()) {
     assert(CDSConfig::allow_only_single_java_thread(), "Required");
     if (!HeapShared::is_archived_boot_layer_available(THREAD)) {
-      log_info(cds)("archivedBootLayer not available, disabling full module graph");
+      report_loading_error("archivedBootLayer not available, disabling full module graph");
       CDSConfig::stop_dumping_full_module_graph();
     }
     // Do this before link_shared_classes(), as the following line may load new classes.
@@ -1118,10 +1118,7 @@ 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 %s.", CDSConfig::type_of_archive_being_loaded());
-  if (message != nullptr) {
-    log_error(cds)("%s", message);
-  }
+  report_loading_error(message);
 
   if (CDSConfig::is_dumping_final_static_archive()) {
     vm_exit_during_initialization("Must be a valid AOT configuration generated by the current JVM", AOTConfiguration);
@@ -1132,6 +1129,30 @@ void MetaspaceShared::unrecoverable_loading_error(const char* message) {
   }
 }
 
+void MetaspaceShared::report_loading_error(const char* format, ...) {
+  // If the user doesn't specify any CDS options, we will try to load the default CDS archive, which
+  // may fail due to incompatible VM options. Print at the info level to avoid excessive verbosity.
+  // However, if the user has specified a CDS archive (or AOT cache), they would be interested in
+  // knowing that the loading fails, so we print at the error level.
+  Log(cds) log;
+  LogStream ls_error(log.error());
+  LogStream ls_info(log.info());
+  LogStream& ls = (!CDSConfig::is_using_archive()) || CDSConfig::is_using_only_default_archive() ? ls_info : ls_error;
+
+  static bool printed_error = false;
+  if (!printed_error) { // No need for locks. Loading error checks happen only in main thread.
+    ls.print_cr("An error has occurred while processing the %s. Run with -Xlog:cds for details.", CDSConfig::type_of_archive_being_loaded());
+    printed_error = true;
+  }
+
+  if (format != nullptr) {
+    va_list ap;
+    va_start(ap, format);
+    ls.vprint_cr(format, ap);
+    va_end(ap);
+  }
+}
+
 // This function is called when the JVM is unable to write the specified CDS archive due to an
 // unrecoverable error.
 void MetaspaceShared::unrecoverable_writing_error(const char* message) {
@@ -1193,11 +1214,14 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
     // The base archive cannot be mapped. We cannot dump the dynamic shared archive.
     AutoCreateSharedArchive = false;
     CDSConfig::disable_dumping_dynamic_archive();
-    log_info(cds)("Unable to map shared spaces");
     if (PrintSharedArchiveAndExit) {
       MetaspaceShared::unrecoverable_loading_error("Unable to use shared archive.");
-    } else if (RequireSharedSpaces) {
-      MetaspaceShared::unrecoverable_loading_error("Unable to map shared spaces");
+    } else {
+      if (RequireSharedSpaces) {
+        MetaspaceShared::unrecoverable_loading_error("Unable to map shared spaces");
+      } else {
+        report_loading_error("Unable to map shared spaces");
+      }
     }
   }
 
@@ -1712,8 +1736,8 @@ MapArchiveResult MetaspaceShared::map_archive(FileMapInfo* mapinfo, char* mapped
 
   mapinfo->set_is_mapped(false);
   if (mapinfo->core_region_alignment() != (size_t)core_region_alignment()) {
-    log_info(cds)("Unable to map CDS archive -- core_region_alignment() expected: %zu"
-                  " actual: %zu", mapinfo->core_region_alignment(), core_region_alignment());
+    report_loading_error("Unable to map CDS archive -- core_region_alignment() expected: %zu"
+                         " actual: %zu", mapinfo->core_region_alignment(), core_region_alignment());
     return MAP_ARCHIVE_OTHER_FAILURE;
   }
 
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 875801cc0e6..8fb92196acc 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -110,7 +110,8 @@ class MetaspaceShared : AllStatic {
   static bool is_shared_dynamic(void* p) NOT_CDS_RETURN_(false);
   static bool is_shared_static(void* p) NOT_CDS_RETURN_(false);
 
-  static void unrecoverable_loading_error(const char* message = nullptr);
+  static void unrecoverable_loading_error(const char* message = nullptr) ATTRIBUTE_PRINTF(1, 0);
+  static void report_loading_error(const char* format, ...) ATTRIBUTE_PRINTF(1, 0);
   static void unrecoverable_writing_error(const char* message = nullptr);
   static void writing_error(const char* message = nullptr);
 
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index a506c4502a4..463bd765701 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -604,21 +604,21 @@ void Modules::ArchivedProperty::runtime_check() const {
   bool disable = false;
   if (runtime_value == nullptr) {
     if (_archived_value != nullptr) {
-      log_info(cds)("Mismatched values for property %s: %s specified during dump time but not during runtime", _prop, _archived_value);
+      MetaspaceShared::report_loading_error("Mismatched values for property %s: %s specified during dump time but not during runtime", _prop, _archived_value);
       disable = true;
     }
   } else {
     if (_archived_value == nullptr) {
-      log_info(cds)("Mismatched values for property %s: %s specified during runtime but not during dump time", _prop, runtime_value);
+      MetaspaceShared::report_loading_error("Mismatched values for property %s: %s specified during runtime but not during dump time", _prop, runtime_value);
       disable = true;
     } else if (strcmp(runtime_value, _archived_value) != 0) {
-      log_info(cds)("Mismatched values for property %s: runtime %s dump time %s", _prop, runtime_value, _archived_value);
+      MetaspaceShared::report_loading_error("Mismatched values for property %s: runtime %s dump time %s", _prop, runtime_value, _archived_value);
       disable = true;
     }
   }
 
   if (disable) {
-    log_info(cds)("Disabling optimized module handling");
+    MetaspaceShared::report_loading_error("Disabling optimized module handling");
     CDSConfig::stop_using_optimized_module_handling();
   }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
index 090df514966..2ed29454df7 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
@@ -54,6 +54,7 @@ public class SharedArchiveConsistency {
     };
 
     public static final String HELLO_WORLD = "Hello World";
+    public static final String errMsg = "An error has occurred while processing the shared archive file.";
 
     public static int num_regions = shared_region_name.length;
     public static String[] matchMessages = {
@@ -170,6 +171,7 @@ public static void main(String... args) throws Exception {
         output = shareAuto ? TestCommon.execAuto(execArgs) : TestCommon.execCommon(execArgs);
         output.shouldContain("The shared archive file was created by a different version or build of HotSpot");
         output.shouldNotContain("Checksum verification failed");
+        output.shouldContain(errMsg);
         if (shareAuto) {
             output.shouldContain(HELLO_WORLD);
         }
@@ -194,6 +196,7 @@ public static void main(String... args) throws Exception {
         CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version);
         output = shareAuto ? TestCommon.execAuto(execArgs) : TestCommon.execCommon(execArgs);
         output.shouldContain("The shared archive file version " + hex(version) + " does not match the required version " + hex(currentCDSArchiveVersion));
+        output.shouldContain(errMsg);
         if (shareAuto) {
             output.shouldContain(HELLO_WORLD);
         }
@@ -237,26 +240,26 @@ public static void main(String... args) throws Exception {
         System.out.println("\n5. Insert bytes at beginning of data section, should fail\n");
         String insertBytes = startNewArchive("insert-bytes");
         CDSArchiveUtils.insertBytesRandomlyAfterHeader(orgJsaFile, insertBytes);
-        testAndCheck(verifyExecArgs);
+        testAndCheck(verifyExecArgs, errMsg);
 
         // delete bytes in data section forward
         System.out.println("\n6a. Delete bytes at beginning of data section, should fail\n");
         String deleteBytes = startNewArchive("delete-bytes");
         CDSArchiveUtils.deleteBytesAtRandomPositionAfterHeader(orgJsaFile, deleteBytes, 4096 /*bytes*/);
-        testAndCheck(verifyExecArgs);
+        testAndCheck(verifyExecArgs, errMsg);
 
         // delete bytes at the end
         System.out.println("\n6b. Delete bytes at the end, should fail\n");
         deleteBytes = startNewArchive("delete-bytes-end");
         CDSArchiveUtils.deleteBytesAtTheEnd(orgJsaFile, deleteBytes);
-        testAndCheck(verifyExecArgs, "The shared archive file has been truncated.");
+        testAndCheck(verifyExecArgs, "The shared archive file has been truncated.", errMsg);
 
         // modify contents in random area
         System.out.println("\n7. modify Content in random areas, should fail\n");
         String randomAreas = startNewArchive("random-areas");
         copiedJsa = CDSArchiveUtils.copyArchiveFile(orgJsaFile, randomAreas);
         CDSArchiveUtils.modifyRegionContentRandomly(copiedJsa);
-        testAndCheck(verifyExecArgs);
+        testAndCheck(verifyExecArgs, errMsg);
 
         // modify _base_archive_name_offet to non-zero
         System.out.println("\n8. modify _base_archive_name_offset to non-zero\n");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index 0fb72774ff4..7aef13abac7 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -61,24 +61,24 @@ public static void main(String[] args) throws Exception {
 
         testCase("Archived full module graph must be enabled at runtime");
         TestCommon.run("-cp", appJar, "-Djdk.module.validation=1", "Hello")
-            .assertAbnormalExit("CDS archive has aot-linked classes." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used when archived full module graph is not used");
 
         testCase("Cannot use -Djava.system.class.loader");
         TestCommon.run("-cp", appJar, "-Djava.system.class.loader=dummy", "Hello")
-            .assertAbnormalExit("CDS archive has aot-linked classes." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used when the java.system.class.loader property is specified.");
 
         testCase("Cannot use a different main module");
         TestCommon.run("-cp", appJar, "-Xlog:cds", "-m", "jdk.compiler/com.sun.tools.javac.Main")
-            .assertAbnormalExit("CDS archive has aot-linked classes." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used when archived full module graph is not used.");
         testCase("Cannot use security manager");
         TestCommon.run("-cp", appJar, "-Xlog:cds", "-Djava.security.manager=allow")
-            .assertAbnormalExit("CDS archive has aot-linked classes." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used with -Djava.security.manager=allow.");
         TestCommon.run("-cp", appJar, "-Xlog:cds", "-Djava.security.manager=default")
-            .assertAbnormalExit("CDS archive has aot-linked classes." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used with -Djava.security.manager=default.");
 
         // Dumping with AOTInvokeDynamicLinking disabled
@@ -91,7 +91,7 @@ public static void main(String[] args) throws Exception {
 
         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." +
+            .assertAbnormalExit("shared archive file has aot-linked classes." +
                                 " It cannot be used when archived full module graph is not used");
 
         // NOTE: tests for ClassFileLoadHook + AOTClassLinking is in
@@ -132,7 +132,7 @@ static void modulePathTests() throws Exception {
         TestCommon.run("-Xlog:cds",
                        "--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.");
+            .assertAbnormalExit("shared archive file 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, appClasses,
@@ -150,6 +150,6 @@ static void modulePathTests() throws Exception {
                        "--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.");
+                                "shared archive file has aot-linked classes. It cannot be used when archived full module graph is not used.");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
index cbc4644d5ca..aa34f479936 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
@@ -110,6 +110,7 @@ public static void main(String[] args) throws Exception {
 
         // Run without archived FMG -- fail to load
         {
+            final String archiveType = (args[0].equals("AOT")) ? "AOT cache" : "shared archive file";
             String extraVmArgs[] = {
                 "-Xlog:cds",
                 "-Djdk.module.showModuleResolution=true"
@@ -117,7 +118,7 @@ public static void main(String[] args) throws Exception {
             t.setCheckExitValue(false);
             OutputAnalyzer out = t.productionRun(extraVmArgs);
             out.shouldHaveExitValue(1);
-            out.shouldContain("CDS archive has aot-linked classes. It cannot be used when archived full module graph is not used.");
+            out.shouldContain(archiveType + " has aot-linked classes. It cannot be used when archived full module graph is not used.");
             t.setCheckExitValue(true);
         }
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
index af8f3acb5e9..1b20a371806 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
@@ -63,6 +63,7 @@ static void test(String args[]) throws Exception {
         String topArchiveMsg = "The top archive failed to load";
         String mismatchMsg = "shared class paths mismatch";
         String hintMsg = "(hint: enable -Xlog:class+path=info to diagnose the failure)";
+        String errMsg = "An error has occurred while processing the shared archive file.";
 
         // ... but try to load the top archive using "-cp WrongJar.jar".
         // Use -Xshare:auto so top archive can fail after base archive has succeeded,
@@ -75,7 +76,7 @@ static void test(String args[]) throws Exception {
                 "-cp", wrongJar, mainClass,
                 "assertShared:java.lang.Object",  // base archive still useable
                 "assertNotShared:GenericTestApp") // but top archive is not useable
-          .assertNormalExit(topArchiveMsg);
+          .assertNormalExit(topArchiveMsg, errMsg);
 
         // Turn off all CDS logging, the "shared class paths mismatch" warning
         // message should still be there.
@@ -84,7 +85,7 @@ static void test(String args[]) throws Exception {
                 "-cp", wrongJar, mainClass,
                 "assertShared:java.lang.Object",  // base archive still useable
                 "assertNotShared:GenericTestApp") // but top archive is not useable
-          .assertNormalExit(topArchiveMsg, mismatchMsg, hintMsg);
+          .assertNormalExit(topArchiveMsg, mismatchMsg, hintMsg, errMsg);
 
         // Enable class+path logging and run with -Xshare:on, the mismatchMsg
         // should be there, the hintMsg should NOT be there.
@@ -96,6 +97,7 @@ static void test(String args[]) throws Exception {
                 "assertNotShared:GenericTestApp") // but top archive is not useable
           .assertAbnormalExit( output -> {
             output.shouldContain(mismatchMsg)
+                  .shouldContain(errMsg)
                   .shouldNotContain(hintMsg);
           });
 
@@ -111,6 +113,7 @@ static void test(String args[]) throws Exception {
                 "assertNotShared:GenericTestApp") // but top archive is not useable
           .assertNormalExit(output -> {
               output.shouldContain(topArchiveMsg);
+              output.shouldContain(errMsg);
               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");});
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java
index 7ccd4e5d312..a49054d10a1 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java
@@ -111,7 +111,7 @@ public static void main(String[] args) throws Exception {
             // the static archive was not created with aot-linked classes.
             out.shouldHaveExitValue(0);
         } else {
-            out.shouldContain("CDS archive has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.");
+            out.shouldContain("shared archive file has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.");
             out.shouldNotHaveExitValue(0);
         }
     }

From ca7e4c4e055cf164b1b3707b7cf1ea72b1de77b9 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Mon, 5 May 2025 20:40:45 +0000
Subject: [PATCH 276/901] 8352612: No way to add back lint categories after
 "none"

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/main/Option.java      |  8 +-----
 .../tools/javac/resources/javac.properties    | 12 ++++-----
 .../classes/com/sun/tools/javac/util/Log.java |  2 +-
 src/jdk.compiler/share/man/javac.md           | 13 ++++-----
 test/langtools/tools/javac/lint/NoWarn.java   | 27 +++++++++++--------
 test/langtools/tools/javac/lint/NoWarn1.out   |  7 +++--
 test/langtools/tools/javac/lint/NoWarn2.out   |  5 ++++
 test/langtools/tools/javac/lint/NoWarn3.out   |  4 +++
 test/langtools/tools/javac/lint/NoWarn4.out   |  3 +++
 test/langtools/tools/javac/varargs/Warn1.java |  2 +-
 test/langtools/tools/javac/varargs/Warn2.java |  2 +-
 11 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 test/langtools/tools/javac/lint/NoWarn3.out
 create mode 100644 test/langtools/tools/javac/lint/NoWarn4.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index 44d90a7e59b..e0fdd30c242 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -146,13 +146,7 @@ public void process(OptionHelper helper, String option, String arg) {
         }
     },
 
-    // -nowarn is retained for command-line backward compatibility
-    NOWARN("-nowarn", "opt.nowarn", STANDARD, BASIC) {
-        @Override
-        public void process(OptionHelper helper, String option) {
-            helper.put("-Xlint:none", option);
-        }
-    },
+    NOWARN("-nowarn", "opt.nowarn", STANDARD, BASIC),
 
     VERBOSE("-verbose", "opt.verbose", STANDARD, BASIC),
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 28a89ee3072..1a8be506e7f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 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
@@ -36,7 +36,7 @@ javac.opt.g.none=\
 javac.opt.g.lines.vars.source=\
     Generate only some debugging info
 javac.opt.nowarn=\
-    Generate no warnings
+    Generate only mandatory warnings
 javac.opt.verbose=\
     Output messages about what the compiler is doing
 javac.opt.deprecation=\
@@ -168,16 +168,16 @@ javac.opt.Xbootclasspath.p=\
 javac.opt.Xbootclasspath.a=\
     Append to the bootstrap class path
 javac.opt.Xlint=\
-    Enable recommended warnings
+    Enable recommended warning categories
 javac.opt.Xlint.all=\
-    Enable all warnings
+    Enable all warning categories
 javac.opt.Xlint.none=\
-    Disable all warnings
+    Disable all warning categories
 #L10N: do not localize: -Xlint
 javac.opt.arg.Xlint=\
     <key>(,<key>)*
 javac.opt.Xlint.custom=\
-    Warnings to enable or disable, separated by comma.\n\
+    Warning categories to enable or disable, separated by comma.\n\
     Precede a key by ''-'' to disable the specified warning.\n\
     Use --help-lint to see the supported keys.
 javac.opt.Xlint.desc.auxiliaryclass=\
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
index ec74c860e0a..fd51729bf21 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
@@ -360,7 +360,7 @@ private Log(Context context, Map<WriterKind, PrintWriter> writers) {
         private void initOptions(Options options) {
             this.dumpOnError = options.isSet(DOE);
             this.promptOnError = options.isSet(PROMPT);
-            this.emitWarnings = options.isUnset(XLINT_CUSTOM, "none");
+            this.emitWarnings = options.isUnset(NOWARN);
             this.suppressNotes = options.isSet("suppressNotes");
             this.MaxErrors = getIntOption(options, XMAXERRS, getDefaultMaxErrors());
             this.MaxWarnings = getIntOption(options, XMAXWARNS, getDefaultMaxWarnings());
diff --git a/src/jdk.compiler/share/man/javac.md b/src/jdk.compiler/share/man/javac.md
index 3edbeda6eca..f951ea0def3 100644
--- a/src/jdk.compiler/share/man/javac.md
+++ b/src/jdk.compiler/share/man/javac.md
@@ -325,8 +325,7 @@ file system locations may be directories, JAR files or JMOD files.
 :   Specifies the version of modules that are being compiled.
 
 <a id="option-nowarn">`-nowarn`</a>
-:   Disables warning messages. This option operates the same as the
-    `-Xlint:none` option.
+:   Generate only mandatory warnings.
 
 <a id="option-parameters">`-parameters`</a>
 :   Generates metadata for reflection on method parameters. Stores formal
@@ -562,12 +561,14 @@ file system locations may be directories, JAR files or JMOD files.
     warnings is recommended.
 
 <a id="option-Xlint-custom">`-Xlint:`\[`-`\]*key*(`,`\[`-`\]*key*)\*</a>
-:   Supplies warnings to enable or disable, separated by comma. Precede a key
-    by a hyphen (`-`) to disable the specified warning.
+:   Enables and/or disables warning categories using the one or more of the keys described
+    below separated by commas. The keys `all` and `none` enable or disable all categories
+    (respectively); other keys enable the corresponding category, or disable it if preceded
+    by a hyphen (`-`).
 
     Supported values for *key* are:
 
-    -   `all`: Enables all warnings.
+    -   `all`: Enables all warning categories.
 
     -   `auxiliaryclass`: Warns about an auxiliary class that is hidden in a
         source file, and is used from other files.
@@ -659,7 +660,7 @@ file system locations may be directories, JAR files or JMOD files.
 
     -   `varargs`: Warns about the potentially unsafe `vararg` methods.
 
-    -   `none`: Disables all warnings.
+    -   `none`: Disables all warning categories.
 
     With the exception of `all` and `none`, the keys can be used with
     the `@SuppressWarnings` annotation to suppress warnings in a part
diff --git a/test/langtools/tools/javac/lint/NoWarn.java b/test/langtools/tools/javac/lint/NoWarn.java
index 7d6153807f2..4a1b99a7bed 100644
--- a/test/langtools/tools/javac/lint/NoWarn.java
+++ b/test/langtools/tools/javac/lint/NoWarn.java
@@ -1,15 +1,20 @@
 /**
- * @test  /nodynamiccopyright/
- * @bug 6183484
- * @summary verify -nowarn is the same as -Xlint:none
- * @compile/ref=NoWarn1.out -XDrawDiagnostics             NoWarn.java
- * @compile/ref=NoWarn2.out -XDrawDiagnostics -nowarn     NoWarn.java
- * @compile/ref=NoWarn2.out -XDrawDiagnostics -Xlint:none NoWarn.java
+ * @test /nodynamiccopyright/
+ * @bug 6183484 8352612
+ * @summary Restrict -Xlint:none to affect only lint categories, while -nowarn disables all warnings
+ * @compile/ref=NoWarn1.out -XDfind=diamond -XDrawDiagnostics -Xlint:none                           NoWarn.java
+ * @compile/ref=NoWarn2.out -XDfind=diamond -XDrawDiagnostics -Xlint:divzero,unchecked              NoWarn.java
+ * @compile/ref=NoWarn2.out -XDfind=diamond -XDrawDiagnostics -Xlint:none,divzero,unchecked         NoWarn.java
+ * @compile/ref=NoWarn3.out -XDfind=diamond -XDrawDiagnostics -Xlint:none                   -nowarn NoWarn.java
+ * @compile/ref=NoWarn4.out -XDfind=diamond -XDrawDiagnostics -Xlint:divzero,unchecked      -nowarn NoWarn.java
+ * @compile/ref=NoWarn4.out -XDfind=diamond -XDrawDiagnostics -Xlint:none,divzero,unchecked -nowarn NoWarn.java
  */
-
+import java.util.*;
 class NoWarn {
-    void m(Object... args) { }
-    void foo() {
-        m(null);
-    }
+    Set<?> z = null;                        // Mandatory  Lint  Lint Category   How can it be suppressed?
+                                            // ---------  ----  -------------   -------------------------
+    sun.misc.Unsafe b;                      //    Yes      No        N/A        Not possible
+    Set<String> a = new HashSet<String>();  //    No       No        N/A        "-nowarn" only (requires -XDfind=diamond)
+    Set<String> d = (Set<String>)z;         //    Yes      Yes    "unchecked"   "-Xlint:-unchecked" only
+    int c = 1/0;                            //    No       Yes    "divzero"     "-Xlint:-divzero" or "-nowarn"
 }
diff --git a/test/langtools/tools/javac/lint/NoWarn1.out b/test/langtools/tools/javac/lint/NoWarn1.out
index c4a8456889f..5fea0f7b51a 100644
--- a/test/langtools/tools/javac/lint/NoWarn1.out
+++ b/test/langtools/tools/javac/lint/NoWarn1.out
@@ -1,2 +1,5 @@
-NoWarn.java:13:11: compiler.warn.inexact.non-varargs.call: java.lang.Object, java.lang.Object[]
-1 warning
+NoWarn.java:16:13: compiler.warn.sun.proprietary: sun.misc.Unsafe
+NoWarn.java:17:32: compiler.warn.diamond.redundant.args
+- compiler.note.unchecked.filename: NoWarn.java
+- compiler.note.unchecked.recompile
+2 warnings
diff --git a/test/langtools/tools/javac/lint/NoWarn2.out b/test/langtools/tools/javac/lint/NoWarn2.out
index e69de29bb2d..d33c2404e1e 100644
--- a/test/langtools/tools/javac/lint/NoWarn2.out
+++ b/test/langtools/tools/javac/lint/NoWarn2.out
@@ -0,0 +1,5 @@
+NoWarn.java:16:13: compiler.warn.sun.proprietary: sun.misc.Unsafe
+NoWarn.java:18:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.util.Set<compiler.misc.type.captureof: 1, ?>, java.util.Set<java.lang.String>
+NoWarn.java:19:15: compiler.warn.div.zero
+NoWarn.java:17:32: compiler.warn.diamond.redundant.args
+4 warnings
diff --git a/test/langtools/tools/javac/lint/NoWarn3.out b/test/langtools/tools/javac/lint/NoWarn3.out
new file mode 100644
index 00000000000..9491fe8b9ee
--- /dev/null
+++ b/test/langtools/tools/javac/lint/NoWarn3.out
@@ -0,0 +1,4 @@
+NoWarn.java:16:13: compiler.warn.sun.proprietary: sun.misc.Unsafe
+- compiler.note.unchecked.filename: NoWarn.java
+- compiler.note.unchecked.recompile
+1 warning
diff --git a/test/langtools/tools/javac/lint/NoWarn4.out b/test/langtools/tools/javac/lint/NoWarn4.out
new file mode 100644
index 00000000000..6586ff995bf
--- /dev/null
+++ b/test/langtools/tools/javac/lint/NoWarn4.out
@@ -0,0 +1,3 @@
+NoWarn.java:16:13: compiler.warn.sun.proprietary: sun.misc.Unsafe
+NoWarn.java:18:34: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), java.util.Set<compiler.misc.type.captureof: 1, ?>, java.util.Set<java.lang.String>
+2 warnings
diff --git a/test/langtools/tools/javac/varargs/Warn1.java b/test/langtools/tools/javac/varargs/Warn1.java
index eb5758d9a23..f65c2f9bc73 100644
--- a/test/langtools/tools/javac/varargs/Warn1.java
+++ b/test/langtools/tools/javac/varargs/Warn1.java
@@ -6,7 +6,7 @@
  *
  * @compile Warn1.java
  * @compile/ref=Warn1.out -XDrawDiagnostics Warn1.java
- * @compile -Werror -Xlint:none Warn1.java
+ * @compile -Werror -nowarn Warn1.java
  */
 
 package varargs.warn1;
diff --git a/test/langtools/tools/javac/varargs/Warn2.java b/test/langtools/tools/javac/varargs/Warn2.java
index 9ba8b8f8832..6d411f31f57 100644
--- a/test/langtools/tools/javac/varargs/Warn2.java
+++ b/test/langtools/tools/javac/varargs/Warn2.java
@@ -6,7 +6,7 @@
  *
  * @compile                           Warn2.java
  * @compile/fail/ref=Warn2.out -XDrawDiagnostics   -Werror             Warn2.java
- * @compile       -Werror -Xlint:none Warn2.java
+ * @compile       -Werror -nowarn Warn2.java
  */
 
 package varargs.warn2;

From 2a4f37cc169e0e876b0b463261f84594af4e7569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Nie=C3=9Fing?= <zuniquex@protonmail.com>
Date: Mon, 5 May 2025 20:52:13 +0000
Subject: [PATCH 277/901] 8356119: Typo in bytecode behavior for
 Lookup.findGetter

Reviewed-by: liach
---
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3251de9bc4b..007834ed5f4 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -501,7 +501,7 @@ public static <T extends Member> T reflectAs(Class<T> expected, MethodHandle tar
      * <tbody>
      * <tr>
      *     <th scope="row">{@link java.lang.invoke.MethodHandles.Lookup#findGetter lookup.findGetter(C.class,"f",FT.class)}</th>
-     *     <td>{@code FT f;}</td><td>{@code (T) this.f;}</td>
+     *     <td>{@code FT f;}</td><td>{@code (FT) this.f;}</td>
      * </tr>
      * <tr>
      *     <th scope="row">{@link java.lang.invoke.MethodHandles.Lookup#findStaticGetter lookup.findStaticGetter(C.class,"f",FT.class)}</th>

From 606f2012b07855b90c4669356857060dcb65cae4 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Mon, 5 May 2025 21:52:25 +0000
Subject: [PATCH 278/901] 8174840: Elements.overrides does not check the return
 type of the methods

Co-authored-by: Pavel Rappo <prappo@openjdk.org>
Reviewed-by: liach, darcy
---
 .../javax/lang/model/util/Elements.java       |  8 ++-
 .../model/util/elements/overrides/S.java      | 63 ++++++++++++++++++
 .../elements/overrides/TestOverrides.java     | 64 +++++++++++++++++++
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 test/langtools/tools/javac/processing/model/util/elements/overrides/S.java
 create mode 100644 test/langtools/tools/javac/processing/model/util/elements/overrides/TestOverrides.java

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
index 7f0b493572e..5d97674c53d 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/Elements.java
@@ -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
@@ -778,6 +778,12 @@ default TypeElement getOutermostTypeElement(Element e) {
      *                           elements.getTypeElement("I"));
      * }
      *
+     * @apiNote This method examines the method's name, signature, subclass relationship, and accessibility
+     * in determining whether one method overrides another, as specified in JLS {@jls 8.4.8.1}.
+     * In addition, an implementation may have stricter checks including method modifiers, return types and
+     * exception types as described in JLS {@jls 8.4.8.1} and {@jls 8.4.8.3}.
+     * Note that such additional compile-time checks are not guaranteed and may vary between implementations.
+     *
      * @param overrider  the first method, possible overrider
      * @param overridden  the second method, possibly being overridden
      * @param type   the class or interface of which the first method is a member
diff --git a/test/langtools/tools/javac/processing/model/util/elements/overrides/S.java b/test/langtools/tools/javac/processing/model/util/elements/overrides/S.java
new file mode 100644
index 00000000000..f6da3324acb
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/overrides/S.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file models a few cases where Elements.overrides produces a false
+ * positive which warrants @apiNote.
+ */
+
+// S.java does not compile because it violates the JLS rules for overrides
+class S {
+
+    public void m() { }
+}
+
+// `protected` is a weaker modifier than `public`
+class T1 extends S {
+
+    protected void m() { }
+}
+
+// `package-private` is a weaker modifier than `public`
+class T2 extends S {
+
+    void m() { }
+}
+
+// `private` methods cannot override public method
+class T3 extends S {
+
+    private void m() { }
+}
+
+// return type int is not compatible with void
+class T4 extends S {
+
+    public int m() { return 0; }
+}
+
+// adding a checked exception violates the override rule
+class T5 extends S {
+
+    public void m() throws Exception { }
+}
diff --git a/test/langtools/tools/javac/processing/model/util/elements/overrides/TestOverrides.java b/test/langtools/tools/javac/processing/model/util/elements/overrides/TestOverrides.java
new file mode 100644
index 00000000000..724dda1d482
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/util/elements/overrides/TestOverrides.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8174840
+ * @library /tools/javac/lib
+ * @build   JavacTestingAbstractProcessor TestOverrides
+ * @compile -processor TestOverrides -proc:only S.java
+ */
+
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+
+import static javax.lang.model.element.ElementKind.METHOD;
+
+public class TestOverrides extends JavacTestingAbstractProcessor {
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
+        if (!round.processingOver()) {
+            var sm = mIn(elements.getTypeElement("S"));
+            for (var subtypeName : new String[]{"T1", "T2", "T3", "T4", "T5"}) {
+                var t = elements.getTypeElement(subtypeName);
+                var tm = mIn(t);
+                if (!elements.overrides(tm, sm, t))
+                    messager.printError(String.format(
+                            "%s does not override from %s method %s", tm, t.getQualifiedName(), sm));
+            }
+        }
+        return true;
+    }
+
+    private ExecutableElement mIn(TypeElement t) {
+        return t.getEnclosedElements().stream()
+                .filter(e -> e.getKind() == METHOD)
+                .filter(e -> e.getSimpleName().toString().equals("m"))
+                .map(e -> (ExecutableElement) e)
+                .findAny()
+                .get();
+    }
+}

From aea2837143289800cfbb7044de4f105e87e233ff Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Tue, 6 May 2025 01:26:15 +0000
Subject: [PATCH 279/901] 8355896: Lossy narrowing cast of
 JVMCINMethodData::size

Reviewed-by: kvn, dnsimon
---
 src/hotspot/share/code/nmethod.cpp | 12 +++++++-----
 src/hotspot/share/code/nmethod.hpp |  8 +++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index e3bd3131b45..00f884c67e8 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1323,8 +1323,9 @@ nmethod::nmethod(
     _unwind_handler_offset   = 0;
 
     CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
-    int metadata_size = align_up(code_buffer->total_metadata_size(), wordSize);
-    JVMCI_ONLY( _jvmci_data_size = 0; )
+    uint16_t metadata_size;
+    CHECKED_CAST(metadata_size, uint16_t, align_up(code_buffer->total_metadata_size(), wordSize));
+    JVMCI_ONLY( _metadata_size = metadata_size; )
     assert(_mutable_data_size == _relocation_size + metadata_size,
            "wrong mutable data size: %d != %d + %d",
            _mutable_data_size, _relocation_size, metadata_size);
@@ -1497,9 +1498,10 @@ nmethod::nmethod(
     }
 
     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);
+    uint16_t metadata_size;
+    CHECKED_CAST(metadata_size, uint16_t, align_up(code_buffer->total_metadata_size(), wordSize));
+    JVMCI_ONLY( _metadata_size = metadata_size; )
+    int jvmci_data_size = 0 JVMCI_ONLY( + align_up(compiler->is_jvmci() ? jvmci_data->size() : 0, oopSize));
     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);
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 1c536a5d7e1..2ce6e5cd361 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -237,7 +237,9 @@ class nmethod : public CodeBlob {
 
   uint16_t _oops_size;
 #if INCLUDE_JVMCI
-  uint16_t _jvmci_data_size;
+  // _metadata_size is not specific to JVMCI. In the non-JVMCI case, it can be derived as:
+  // _metadata_size = mutable_data_size - relocation_size
+  uint16_t _metadata_size;
 #endif
 
   // Offset in immutable data section
@@ -537,8 +539,8 @@ class nmethod : public CodeBlob {
   // mutable data
   Metadata** metadata_begin     () const { return (Metadata**) (mutable_data_begin() + _relocation_size); }
 #if INCLUDE_JVMCI
-  Metadata** metadata_end       () const { return (Metadata**) (mutable_data_end() - _jvmci_data_size); }
-  address jvmci_data_begin      () const { return               mutable_data_end() - _jvmci_data_size; }
+  Metadata** metadata_end       () const { return (Metadata**) (mutable_data_begin() + _relocation_size + _metadata_size); }
+  address jvmci_data_begin      () const { return               mutable_data_begin() + _relocation_size + _metadata_size; }
   address jvmci_data_end        () const { return               mutable_data_end(); }
 #else
   Metadata** metadata_end       () const { return (Metadata**)  mutable_data_end(); }

From 7f6ea27d3ef7a8f18f031467d302ed6b03d7d37a Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Tue, 6 May 2025 01:34:50 +0000
Subject: [PATCH 280/901] 8356020: Failed assert in virtualMemoryTracker.cpp

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

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 3de4cdec187..549b7b3ba6a 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -313,7 +313,7 @@ address ArchiveBuilder::reserve_buffer() {
   ReservedSpace rs = MemoryReserver::reserve(buffer_size,
                                              MetaspaceShared::core_region_alignment(),
                                              os::vm_page_size(),
-                                             mtClassShared);
+                                             mtNone);
   if (!rs.is_reserved()) {
     log_error(cds)("Failed to reserve %zu bytes of output buffer.", buffer_size);
     MetaspaceShared::unrecoverable_writing_error();

From 64b58f6a54c1197002527bdb6ba7b48283dc634e Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 6 May 2025 01:59:33 +0000
Subject: [PATCH 281/901] 8356089: java/lang/IO/IO.java fails with
 -XX:+AOTClassLinking

Reviewed-by: epavlova, iklam
---
 test/hotspot/jtreg/ProblemList-AotJdk.txt |  1 +
 test/jdk/ProblemList-AotJdk.txt           | 33 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList-AotJdk.txt b/test/hotspot/jtreg/ProblemList-AotJdk.txt
index 2528f8d377e..047fc6d33f8 100644
--- a/test/hotspot/jtreg/ProblemList-AotJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-AotJdk.txt
@@ -3,6 +3,7 @@ runtime/NMT/NMTWithCDS.java                           0000000 generic-all
 runtime/symbols/TestSharedArchiveConfigFile.java      0000000 generic-all
 
 gc/arguments/TestSerialHeapSizeFlags.java             0000000 generic-all
+gc/arguments/TestCompressedClassFlags.java            0000000 generic-all
 gc/TestAllocateHeapAtMultiple.java                    0000000 generic-all
 gc/TestAllocateHeapAt.java                            0000000 generic-all
 
diff --git a/test/jdk/ProblemList-AotJdk.txt b/test/jdk/ProblemList-AotJdk.txt
index 9030ba60c78..b0737126534 100644
--- a/test/jdk/ProblemList-AotJdk.txt
+++ b/test/jdk/ProblemList-AotJdk.txt
@@ -1,3 +1,32 @@
+#
+# 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.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing in AOT_JDK mode.
+#
+#############################################################################
+
 java/math/BigInteger/largeMemory/DivisionOverflow.java          0000000 generic-all
 java/math/BigInteger/largeMemory/StringConstructorOverflow.java 0000000 generic-all
 
@@ -9,3 +38,7 @@ java/lang/module/ModuleDescriptorHashCodeTest.java              0000000 generic-
 # The test case is incorrect. There's no guarantee that running a JVM with the following
 # parameters will always cause the class java/lang/invoke/MethodHandleStatics to be initialized
 java/lang/invoke/DumpMethodHandleInternals.java                 0000000 generic-all
+
+# The test uses "--add-modules jdk.internal.le" during production.
+# So the test is incompatible with AOT_JDK testing because because all runs must have consistent module options on the command line.
+java/lang/IO/IO.java                                           0000000 generic-all

From e09d2e275bc646201a8da39bd4b977d3fda97954 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 6 May 2025 02:51:23 +0000
Subject: [PATCH 282/901] 8288471: java/awt/ScrollPane/bug8077409Test.java is
 unstable and fails intermittently in CI

Reviewed-by: abhiscxk, serb
---
 .../java/awt/ScrollPane/bug8077409Test.java   | 133 ++++++++----------
 1 file changed, 58 insertions(+), 75 deletions(-)

diff --git a/test/jdk/java/awt/ScrollPane/bug8077409Test.java b/test/jdk/java/awt/ScrollPane/bug8077409Test.java
index 65d8da66ac9..c4a55307c9c 100644
--- a/test/jdk/java/awt/ScrollPane/bug8077409Test.java
+++ b/test/jdk/java/awt/ScrollPane/bug8077409Test.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
@@ -26,92 +26,75 @@
  * @key headful
  * @bug 8077409
  * @summary Drawing deviates when validate() is invoked on java.awt.ScrollPane
- * @author mikhail.cherkasov@oracle.com
  * @run main bug8077409Test
  */
 
-
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.ScrollPane;
+import java.awt.event.KeyEvent;
 
 public class bug8077409Test extends Frame {
-  ScrollPane pane;
-  MyCanvas myCanvas;
-
-  class MyCanvas extends Canvas {
-    public Dimension getPreferredSize() {
-      return new Dimension(400, 800);
+    ScrollPane pane;
+    MyCanvas myCanvas;
+
+    public bug8077409Test() {
+        super();
+        setLayout(new BorderLayout());
+        pane = new ScrollPane();
+        myCanvas = new MyCanvas();
+        pane.add(myCanvas);
+        add(pane, BorderLayout.CENTER);
+        setSize(320, 480);
     }
 
-    public void paint(Graphics g) {
-      g.setColor(Color.BLACK);
-      g.drawLine(0, 0, 399, 0);
-      g.setColor(Color.RED);
-      g.drawLine(0, 1, 399, 1);
-      g.setColor(Color.BLUE);
-      g.drawLine(0, 2, 399, 2);
-      g.setColor(Color.GREEN);
-      g.drawLine(0, 3, 399, 3);
+    public static void main(String[] args) throws AWTException, InterruptedException {
+        final bug8077409Test obj = new bug8077409Test();
+        try {
+            obj.setLocationRelativeTo(null);
+            obj.setVisible(true);
+            Point scrollPosition = obj.pane.getScrollPosition();
+            scrollPosition.translate(0, 1);
+            obj.pane.setScrollPosition(scrollPosition);
+            int y = obj.pane.getComponent(0).getLocation().y;
+            obj.pane.validate();
+            if (y != obj.pane.getComponent(0).getLocation().y) {
+                throw new RuntimeException("Wrong position of component in ScrollPane");
+            }
+        } finally {
+            obj.dispose();
+        }
     }
 
-  }
-
-  public bug8077409Test() {
-    super();
-    setLayout(new BorderLayout());
-    pane = new ScrollPane();
-
-    myCanvas = new MyCanvas();
-    pane.add(myCanvas);
-
-    add(pane, BorderLayout.CENTER);
-    setSize(320, 480);
-
-  }
-
-  @Override
-  protected void processKeyEvent(KeyEvent e) {
-    super.processKeyEvent(e);
+    @Override
+    protected void processKeyEvent(KeyEvent e) {
+        super.processKeyEvent(e);
+    }
 
-  }
+    class MyCanvas extends Canvas {
+        @Override
+        public Dimension getPreferredSize() {
+            return new Dimension(400, 800);
+        }
 
-  public static void main(String[] args) throws AWTException, InterruptedException {
-    final bug8077409Test obj = new bug8077409Test();
-    obj.setVisible(true);
-    Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
-      @Override
-      public void eventDispatched(AWTEvent e) {
-        KeyEvent keyEvent = (KeyEvent) e;
-        if(keyEvent.getID() == KeyEvent.KEY_RELEASED) {
-            if (keyEvent.getKeyCode() == KeyEvent.VK_1) {
-              System.out.println(obj.pane.toString());
-              System.out.println("obj.myCanvas.pos: " + obj.myCanvas.getBounds());
-              System.out.println(obj.myCanvas.toString());
-            }  else if (keyEvent.getKeyCode() == KeyEvent.VK_2) {
-              obj.repaint();
-           } else if (keyEvent.getKeyCode() == KeyEvent.VK_DOWN) {
-              Point scrollPosition = obj.pane.getScrollPosition();
-              scrollPosition.translate(0, 1);
-              obj.pane.setScrollPosition(scrollPosition);
-            } else if (keyEvent.getKeyCode() == KeyEvent.VK_UP) {
-              Point scrollPosition = obj.pane.getScrollPosition();
-              scrollPosition.translate(0, -1);
-              obj.pane.setScrollPosition(scrollPosition);
-            } else if (keyEvent.getKeyCode() == KeyEvent.VK_SPACE) {
-              obj.pane.validate();
-            }
-          }
+        @Override
+        public void paint(Graphics g) {
+            g.setColor(Color.BLACK);
+            g.drawLine(0, 0, 399, 0);
+            g.setColor(Color.RED);
+            g.drawLine(0, 1, 399, 1);
+            g.setColor(Color.BLUE);
+            g.drawLine(0, 2, 399, 2);
+            g.setColor(Color.GREEN);
+            g.drawLine(0, 3, 399, 3);
         }
-    }, AWTEvent.KEY_EVENT_MASK);
-      Point scrollPosition = obj.pane.getScrollPosition();
-      scrollPosition.translate(0, 1);
-      obj.pane.setScrollPosition(scrollPosition);
 
-      int y = obj.pane.getComponent(0).getLocation().y;
-      obj.pane.validate();
-      if(y != obj.pane.getComponent(0).getLocation().y){
-          throw new RuntimeException("Wrong position of component in ScrollPane");
-      }
-  }
+    }
 
 }

From 9f8fbf292278d995c9fa112d8f97b2375f619537 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 6 May 2025 06:26:09 +0000
Subject: [PATCH 283/901] 8352869: Verify.checkEQ: extension for NaN, VectorAPI
 and arbitrary Objects

Reviewed-by: chagedorn, thartmann
---
 .../jtreg/compiler/lib/verify/Verify.java     | 449 ++++++++++++++----
 .../verify/examples/TestWithVectorAPI.java    |  55 +++
 .../verify/tests/TestVerify.java              | 281 ++++++++++-
 3 files changed, 682 insertions(+), 103 deletions(-)
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/verify/examples/TestWithVectorAPI.java

diff --git a/test/hotspot/jtreg/compiler/lib/verify/Verify.java b/test/hotspot/jtreg/compiler/lib/verify/Verify.java
index 085ec591b0c..7b5e554b0e3 100644
--- a/test/hotspot/jtreg/compiler/lib/verify/Verify.java
+++ b/test/hotspot/jtreg/compiler/lib/verify/Verify.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,33 +25,80 @@
 
 import java.util.Optional;
 import java.lang.foreign.*;
+import java.lang.reflect.Method;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+
 
 /**
- * The {@link Verify} class provides a single {@link Verify#checkEQ} static method, which recursively
- * compares the two {@link Object}s by value. It deconstructs {@link Object[]}, compares boxed primitive
- * types, and compares the content of arrays and {@link MemorySegment}s.
+ * The {@link Verify} class provides {@link Verify#checkEQ} and {@link Verify#checkEQWithRawBits},
+ * which recursively compare the two {@link Object}s by value. They deconstruct an array of objects,
+ * compare boxed primitive types, compare the content of arrays and {@link MemorySegment}s, and check
+ * that the messages of two {@link Exception}s are equal. They also check for the equivalent content
+ * in {@code Vector}s from the Vector API.
+ *
+ * <p>
+ * Further, they compare Objects from arbitrary classes, using reflection. We check the fields of the
+ * Objects, and compare their recursive structure. Since we use reflection, this can be slow.
+ *
+ * <p>
+ * When a comparison fails, then methods print helpful messages, before throwing a {@link VerifyException}.
  *
- * When a comparison fail, then methods print helpful messages, before throwing a {@link VerifyException}.
+ * <p>
+ * We have to take special care of {@link Float}s and {@link Double}s, since they both have various
+ * encodings for NaN values while the Java specification regards them as equal. Hence, we
+ * have two modes of comparison. With {@link Verify#checkEQ} different NaN values are regarded as equal.
+ * This applies to the boxed floating types, as well as arrays of floating arrays. With
+ * {@link Verify#checkEQWithRawBits} we compare the raw bits, and so different NaN encodings are not equal.
+ * Note: {@link MemorySegment} data is always compared with raw bits.
  */
 public final class Verify {
+    private final boolean isFloatCheckWithRawBits;
+
+    /**
+     * When comparing arbitrary classes recursively, we need to remember which
+     * pairs of objects {@code (a, b)} we have already visited. The maps
+     * {@code a2b} and {@code b2a} track these edges. Caching which pairs
+     * we have already visited means the traversal only needs to visit every
+     * pair once. And should we ever find a pair {@code (a, b')} or {@code (a', b)},
+     * then we know that the two structures are not structurally equivalent.
+     */
+    private final HashMap<Object, Object> a2b = new HashMap<>();
+    private final HashMap<Object, Object> b2a = new HashMap<>();
 
-    private Verify() {}
+    private Verify(boolean isFloatCheckWithRawBits) {
+        this.isFloatCheckWithRawBits = isFloatCheckWithRawBits;
+    }
 
     /**
-     * Verify the content of two Objects, possibly recursively. Only limited types are implemented.
+     * Verify the contents of two Objects on a raw bit level, possibly recursively.
+     * Different NaN encodings are considered non-equal, since we compare
+     * floating numbers by their raw bits.
      *
      * @param a First object to be recursively compared with the second.
      * @param b Second object to be recursively compared with the first.
      * @throws VerifyException If the comparison fails.
      */
-    public static void checkEQ(Object a, Object b) {
-        checkEQ(a, b, "");
+    public static void checkEQWithRawBits(Object a, Object b) {
+        Verify v = new Verify(true);
+        v.checkEQdispatch(a, b, "<root>", null, null);
     }
 
     /**
-     * Verify the content of two Objects, possibly recursively. Only limited types are implemented.
+     * Verify the contents of two Objects, possibly recursively.
+     * Different NaN encodings are considered equal.
+     *
+     * @param a First object to be recursively compared with the second.
+     * @param b Second object to be recursively compared with the first.
+     * @throws VerifyException If the comparison fails.
      */
-    private static void checkEQ(Object a, Object b, String context) {
+    public static void checkEQ(Object a, Object b) {
+        Verify v = new Verify(false);
+        v.checkEQdispatch(a, b, "<root>", null, null);
+    }
+
+    private void checkEQdispatch(Object a, Object b, String field, Object aParent, Object bParent) {
         // Both null
         if (a == null && b == null) {
             return;
@@ -59,45 +106,53 @@ private static void checkEQ(Object a, Object b, String context) {
 
         // Null mismatch
         if (a == null || b == null) {
-            System.err.println("ERROR: Verify.checkEQ failed: null mismatch");
-            print(a, "a " + context);
-            print(b, "b " + context);
+            System.err.println("ERROR: Equality matching failed: null mismatch");
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Object array null mismatch.");
         }
 
         // Class mismatch
-        Class ca = a.getClass();
-        Class cb = b.getClass();
+        Class<?> ca = a.getClass();
+        Class<?> cb = b.getClass();
         if (ca != cb) {
-            System.err.println("ERROR: Verify.checkEQ failed: class mismatch.");
+            System.err.println("ERROR: Equality matching failed: class mismatch.");
             System.err.println("       " + ca.getName() + " vs " + cb.getName());
-            print(a, "a " + context);
-            print(b, "b " + context);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Object class mismatch.");
         }
 
+        // Already visited? This makes sure that we are not stuck in cycles, and that we have
+        // a mapping of pairs (a, b) for structurally equivalent Objects.
+        if (checkAlreadyVisited(a, b, field, aParent, bParent)) {
+            return;
+        }
+
         switch (a) {
-            case Object[]  x -> checkEQimpl(x, (Object[])b,                context);
-            case Byte      x -> checkEQimpl(x, ((Byte)b).byteValue(),      context);
-            case Character x -> checkEQimpl(x, ((Character)b).charValue(), context);
-            case Short     x -> checkEQimpl(x, ((Short)b).shortValue(),    context);
-            case Integer   x -> checkEQimpl(x, ((Integer)b).intValue(),    context);
-            case Long      x -> checkEQimpl(x, ((Long)b).longValue(),      context);
-            case Float     x -> checkEQimpl(x, ((Float)b).floatValue(),    context);
-            case Double    x -> checkEQimpl(x, ((Double)b).doubleValue(),  context);
-            case byte[]    x -> checkEQimpl(x, (byte[])b,                  context);
-            case char[]    x -> checkEQimpl(x, (char[])b,                  context);
-            case short[]   x -> checkEQimpl(x, (short[])b,                 context);
-            case int[]     x -> checkEQimpl(x, (int[])b,                   context);
-            case long[]    x -> checkEQimpl(x, (long[])b,                  context);
-            case float[]   x -> checkEQimpl(x, (float[])b,                 context);
-            case double[]  x -> checkEQimpl(x, (double[])b,                context);
-            case MemorySegment x -> checkEQimpl(x, (MemorySegment) b,      context);
+            case Object[]  x -> checkEQimpl(x, (Object[])b,                 field, aParent, bParent);
+            case Byte      x -> checkEQimpl(x, (Byte)b,                     field, aParent, bParent);
+            case Character x -> checkEQimpl(x, (Character)b,                field, aParent, bParent);
+            case Short     x -> checkEQimpl(x, (Short)b,                    field, aParent, bParent);
+            case Integer   x -> checkEQimpl(x, (Integer)b,                  field, aParent, bParent);
+            case Long      x -> checkEQimpl(x, (Long)b,                     field, aParent, bParent);
+            case Float     x -> checkEQimpl(x, (Float)b,                    field, aParent, bParent);
+            case Double    x -> checkEQimpl(x, (Double)b,                   field, aParent, bParent);
+            case Boolean   x -> checkEQimpl(x, (Boolean)b,                  field, aParent, bParent);
+            case byte[]    x -> checkEQimpl(x, (byte[])b,                   field, aParent, bParent);
+            case char[]    x -> checkEQimpl(x, (char[])b,                   field, aParent, bParent);
+            case short[]   x -> checkEQimpl(x, (short[])b,                  field, aParent, bParent);
+            case int[]     x -> checkEQimpl(x, (int[])b,                    field, aParent, bParent);
+            case long[]    x -> checkEQimpl(x, (long[])b,                   field, aParent, bParent);
+            case float[]   x -> checkEQimpl(x, (float[])b,                  field, aParent, bParent);
+            case double[]  x -> checkEQimpl(x, (double[])b,                 field, aParent, bParent);
+            case boolean[] x -> checkEQimpl(x, (boolean[])b,                field, aParent, bParent);
+            case MemorySegment x -> checkEQimpl(x, (MemorySegment) b,       field, aParent, bParent);
+            case Exception x -> checkEQimpl(x, (Exception) b,               field, aParent, bParent);
             default -> {
-                System.err.println("ERROR: Verify.checkEQ failed: type not supported: " + ca.getName());
-                print(a, "a " + context);
-                print(b, "b " + context);
-                throw new VerifyException("Object array type not supported: " + ca.getName());
+                if (isVectorAPIClass(ca)) {
+                    checkEQForVectorAPIClass(a, b, field, aParent, bParent);
+                } else {
+                    checkEQArbitraryClasses(a, b);
+                }
             }
         }
     }
@@ -105,9 +160,10 @@ private static void checkEQ(Object a, Object b, String context) {
     /**
      * Verify that two bytes are identical.
      */
-    private static void checkEQimpl(byte a, byte b, String context) {
+    private void checkEQimpl(byte a, byte b, String field, Object aParent, Object bParent) {
         if (a != b) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch: " + a + " vs " + b + " for " + context);
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + a + " vs " + b);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
@@ -115,9 +171,12 @@ private static void checkEQimpl(byte a, byte b, String context) {
     /**
      * Verify that two chars are identical.
      */
-    private static void checkEQimpl(char a, char b, String context) {
+    private void checkEQimpl(char a, char b, String field, Object aParent, Object bParent) {
         if (a != b) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch: " + (int)a + " vs " + (int)b + " for " + context);
+            // Note: we need to cast "(int)a", otherwise a char of numerical value "66" is
+            //       formatted as character "B".
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + (int)a + " vs " + (int)b);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + (int)a + " vs " + (int)b);
         }
     }
@@ -125,19 +184,21 @@ private static void checkEQimpl(char a, char b, String context) {
     /**
      * Verify that two shorts are identical.
      */
-    private static void checkEQimpl(short a, short b, String context) {
+    private void checkEQimpl(short a, short b, String field, Object aParent, Object bParent) {
         if (a != b) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch: " + (int)a + " vs " + (int)b + " for " + context);
-            throw new VerifyException("Value mismatch: " + (int)a + " vs " + (int)b);
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + a + " vs " + b);
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
 
     /**
      * Verify that two ints are identical.
      */
-    private static void checkEQimpl(int a, int b, String context) {
+    private void checkEQimpl(int a, int b, String field, Object aParent, Object bParent) {
         if (a != b) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch: " + a + " vs " + b + " for " + context);
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + a + " vs " + b);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
@@ -145,50 +206,88 @@ private static void checkEQimpl(int a, int b, String context) {
     /**
      * Verify that two longs are identical.
      */
-    private static void checkEQimpl(long a, long b, String context) {
+    private void checkEQimpl(long a, long b, String field, Object aParent, Object bParent) {
         if (a != b) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch: " + a + " vs " + b + " for " + context);
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + a + " vs " + b);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
 
     /**
-     * Verify that two floats have identical bits.
+     * There are two comparison modes: one where we compare the raw bits, which sees different NaN
+     * encodings as different values, and one where we see all NaN encodings as identical.
+     * Ideally, we would want to assert that the Float.floatToRawIntBits are identical.
+     * But the Java spec allows us to return different bits for a NaN, which allows swapping the inputs
+     * of an add or mul (NaN1 * NaN2 does not have same bits as NaN2 * NaN1, because the multiplication
+     * of two NaN values should always return the first of the two).
+     * Hence, by default, we pick the non-raw comparison: we verify that we have the same bit
+     * pattern in all cases, except for NaN we project to the canonical NaN, using Float.floatToIntBits.
      */
-    private static void checkEQimpl(float a, float b, String context) {
-        if (Float.floatToRawIntBits(a) != Float.floatToRawIntBits(b)) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch for " + context);
-            System.err.println("       Values: " + a + " vs " + b);
-            System.err.println("       Values: " + Float.floatToRawIntBits(a) + " vs " + Float.floatToRawIntBits(b));
+    private boolean isFloatEQ(float a, float b) {
+        return isFloatCheckWithRawBits ? Float.floatToRawIntBits(a) == Float.floatToRawIntBits(b)
+                                       : Float.floatToIntBits(a) == Float.floatToIntBits(b);
+    }
+
+    /**
+     * See comments for {@link #isFloatEQ}.
+     */
+    private boolean isDoubleEQ(double a, double b) {
+        return isFloatCheckWithRawBits ? Double.doubleToRawLongBits(a) == Double.doubleToRawLongBits(b)
+                                       : Double.doubleToLongBits(a) == Double.doubleToLongBits(b);
+    }
+
+    /**
+     * Check that two floats are equal according to {@link #isFloatEQ}.
+     */
+    private void checkEQimpl(float a, float b, String field, Object aParent, Object bParent) {
+        if (!isFloatEQ(a, b)) {
+            System.err.println("ERROR: Equality matching failed: value mismatch. check raw: " + isFloatCheckWithRawBits);
+            System.err.println("  Values: " + a + " vs " + b);
+            System.err.println("  Raw:    " + Float.floatToRawIntBits(a) + " vs " + Float.floatToRawIntBits(b));
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
 
     /**
-     * Verify that two doubles have identical bits.
+     * Check that two doubles are equal according to {@link #isDoubleEQ}.
      */
-    private static void checkEQimpl(double a, double b, String context) {
-        if (Double.doubleToRawLongBits(a) != Double.doubleToRawLongBits(b)) {
-            System.err.println("ERROR: Verify.checkEQ failed: value mismatch for " + context);
+    private void checkEQimpl(double a, double b, String field, Object aParent, Object bParent) {
+        if (!isDoubleEQ(a, b)) {
+            System.err.println("ERROR: Equality matching failed: value mismatch. check raw: " + isFloatCheckWithRawBits);
             System.err.println("       Values: " + a + " vs " + b);
-            System.err.println("       Values: " + Double.doubleToRawLongBits(a) + " vs " + Double.doubleToRawLongBits(b));
+            System.err.println("       Raw:    " + Double.doubleToRawLongBits(a) + " vs " + Double.doubleToRawLongBits(b));
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Value mismatch: " + a + " vs " + b);
+        }
+    }
+
+    /**
+     * Verify that two booleans are identical.
+     */
+    private void checkEQimpl(boolean a, boolean b, String field, Object aParent, Object bParent) {
+        if (a != b) {
+            System.err.println("ERROR: Equality matching failed: value mismatch: " + a + " vs " + b);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Value mismatch: " + a + " vs " + b);
         }
     }
 
     /**
-     * Verify that the content of two MemorySegments is identical. Note: we do not check the
+     * Verify that the contents of two MemorySegments are identical. Note: we do not check the
      * backing type, only the size and content.
      */
-    private static void checkEQimpl(MemorySegment a, MemorySegment b, String context) {
+    private void checkEQimpl(MemorySegment a, MemorySegment b, String field, Object aParent, Object bParent) {
         long offset = a.mismatch(b);
         if (offset == -1) { return; }
 
         // Print some general info
-        System.err.println("ERROR: Verify.checkEQ failed for: " + context);
+        System.err.println("ERROR: Equality matching failed");
 
-        printMemorySegment(a, "a " + context);
-        printMemorySegment(b, "b " + context);
+        print(a, b, field, aParent, bParent);
+        printMemorySegment(a, "a");
+        printMemorySegment(b, "b");
 
         // (1) Mismatch on size
         if (a.byteSize() != b.byteSize()) {
@@ -203,82 +302,232 @@ private static void checkEQimpl(MemorySegment a, MemorySegment b, String context
     }
 
     /**
-     * Verify that the content of two byte arrays is identical.
+     * Verify that two Exceptions have the same message. Messages are not always carried,
+     * they are often dropped for performance reasons, and that is okay. But if both Exceptions
+     * have the message, we should compare them.
+     */
+    private void checkEQimpl(Exception a, Exception b, String field, Object aParent, Object bParent) {
+        String am = a.getMessage();
+        String bm = b.getMessage();
+
+        // Missing messages is expected, but if they both have one, they must agree.
+        if (am == null || bm == null) { return; }
+        if (am.equals(bm)) { return; }
+
+        System.err.println("ERROR: Equality matching failed:");
+        System.err.println("a: " + a.getMessage());
+        System.err.println("b: " + b.getMessage());
+        print(a, b, field, aParent, bParent);
+        throw new VerifyException("Exception message mismatch: " + a + " vs " + b);
+    }
+
+    /**
+     * Verify that the contents of two byte arrays are identical.
      */
-    private static void checkEQimpl(byte[] a, byte[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(byte[] a, byte[] b, String field, Object aParent, Object bParent) {
+        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), field + " -> to MemorySegment", aParent, bParent);
     }
 
     /**
-     * Verify that the content of two char arrays is identical.
+     * Verify that the contents of two char arrays are identical.
      */
-    private static void checkEQimpl(char[] a, char[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(char[] a, char[] b, String field, Object aParent, Object bParent) {
+        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), field + " -> to MemorySegment", aParent, bParent);
     }
 
     /**
-     * Verify that the content of two short arrays is identical.
+     * Verify that the contents of two short arrays are identical.
      */
-    private static void checkEQimpl(short[] a, short[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(short[] a, short[] b, String field, Object aParent, Object bParent) {
+        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), field + " -> to MemorySegment", aParent, bParent);
     }
 
     /**
-     * Verify that the content of two int arrays is identical.
+     * Verify that the contents of two int arrays are identical.
      */
-    private static void checkEQimpl(int[] a, int[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(int[] a, int[] b, String field, Object aParent, Object bParent) {
+        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), field + " -> to MemorySegment", aParent, bParent);
     }
 
     /**
-     * Verify that the content of two long arrays is identical.
+     * Verify that the contents of two long arrays are identical.
      */
-    private static void checkEQimpl(long[] a, long[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(long[] a, long[] b, String field, Object aParent, Object bParent) {
+        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), field + " -> to MemorySegment", aParent, bParent);
     }
 
     /**
-     * Verify that the content of two float arrays is identical.
+     * Check that two float arrays are equal according to {@link #isFloatEQ}.
      */
-    private static void checkEQimpl(float[] a, float[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(float[] a, float[] b, String field, Object aParent, Object bParent) {
+        if (a.length != b.length) {
+            System.err.println("ERROR: Equality matching failed: length mismatch: " + a.length + " vs " + b.length);
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Float array length mismatch.");
+        }
+
+        for (int i = 0; i < a.length; i++) {
+            if (!isFloatEQ(a[i], b[i])) {
+                System.err.println("ERROR: Equality matching failed: value mismatch at " + i + ": " + a[i] + " vs " + b[i] + ". check raw: " + isFloatCheckWithRawBits);
+                print(a, b, field, aParent, bParent);
+                throw new VerifyException("Float array value mismatch " + a[i] + " vs " + b[i]);
+            }
+        }
+    }
+
+    /**
+     * Check that two double arrays are equal according to {@link #isDoubleEQ}.
+     */
+    private void checkEQimpl(double[] a, double[] b, String field, Object aParent, Object bParent) {
+        if (a.length != b.length) {
+            System.err.println("ERROR: Equality matching failed: length mismatch: " + a.length + " vs " + b.length);
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Double array length mismatch.");
+        }
+
+        for (int i = 0; i < a.length; i++) {
+            if (!isDoubleEQ(a[i], b[i])) {
+                System.err.println("ERROR: Equality matching failed: value mismatch at " + i + ": " + a[i] + " vs " + b[i] + ". check raw: " + isFloatCheckWithRawBits);
+                print(a, b, field, aParent, bParent);
+                throw new VerifyException("Double array value mismatch " + a[i] + " vs " + b[i]);
+            }
+        }
     }
 
     /**
-     * Verify that the content of two double arrays is identical.
+     * Verify that the contents of two boolean arrays are identical.
      */
-    private static void checkEQimpl(double[] a, double[] b, String context) {
-        checkEQimpl(MemorySegment.ofArray(a), MemorySegment.ofArray(b), context);
+    private void checkEQimpl(boolean[] a, boolean[] b, String field, Object aParent, Object bParent) {
+        if (a.length != b.length) {
+            System.err.println("ERROR: Equality matching failed: length mismatch: " + a.length + " vs " + b.length);
+            print(a, b, field, aParent, bParent);
+            throw new VerifyException("Boolean array length mismatch.");
+        }
+
+        for (int i = 0; i < a.length; i++) {
+            if (a[i] != b[i]) {
+                System.err.println("ERROR: Equality matching failed: value mismatch at " + i + ": " + a[i] + " vs " + b[i]);
+                print(a, b, field, aParent, bParent);
+                throw new VerifyException("Boolean array value mismatch.");
+            }
+        }
     }
 
     /**
-     * Verify that the content of two Object arrays is identical, recursively:
+     * Verify that the contents of two Object arrays are identical, recursively:
      * every element is compared with checkEQimpl for the corresponding type.
      */
-    private static void checkEQimpl(Object[] a, Object[] b, String context) {
+    private void checkEQimpl(Object[] a, Object[] b, String field, Object aParent, Object bParent) {
         // (1) Length mismatch
         if (a.length != b.length) {
-            System.err.println("ERROR: Verify.checkEQ failed: length mismatch: " + a.length + " vs " + b.length);
+            System.err.println("ERROR: Equality matching failed: length mismatch: " + a.length + " vs " + b.length);
+            print(a, b, field, aParent, bParent);
             throw new VerifyException("Object array length mismatch.");
         }
 
         for (int i = 0; i < a.length; i++) {
             // Recursive checkEQ call.
-            checkEQ(a[i], b[i], "[" + i + "]" + context);
+            checkEQdispatch(a[i], b[i], "[" + i + "]", a, b);
+        }
+    }
+
+    private static boolean isVectorAPIClass(Class<?> c) {
+        return c.getName().startsWith("jdk.incubator.vector") &&
+               c.getName().contains("Vector");
+    }
+
+    /**
+     * We do not want to import jdk.incubator.vector explicitly, because it would mean we would also have
+     * to add "--add-modules=jdk.incubator.vector" to the command-line of every test that uses the Verify
+     * class. So we hack this via reflection.
+     */
+    private void checkEQForVectorAPIClass(Object a, Object b, String field, Object aParent, Object bParent) {
+        Class<?> ca = a.getClass();
+        Object va;
+        Object vb;
+        try {
+            Method m = ca.getMethod("toArray");
+            m.setAccessible(true);
+            va = m.invoke(a);
+            vb = m.invoke(b);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException("Could not invoke toArray on " + ca.getName(), e);
+        }
+        checkEQdispatch(va, vb, field + ".toArray", aParent, bParent);
+    }
+
+    private void checkEQArbitraryClasses(Object a, Object b) {
+        Class<?> c = a.getClass();
+        while (c != Object.class) {
+            for (Field field : c.getDeclaredFields()) {
+                Object va;
+                Object vb;
+                try {
+                    field.setAccessible(true);
+                    va = field.get(a);
+                    vb = field.get(b);
+                } catch (IllegalAccessException e) {
+                    throw new VerifyException("Failure to access field: " + field + " of " + a);
+                }
+                checkEQdispatch(va, vb, field.getName(), a, b);
+            }
+            c = c.getSuperclass();
         }
     }
 
-    private static void print(Object a, String context) {
-        if (a == null) {
-            System.err.println("  " + context + ": null");
+    private void print(Object a, Object b, String field, Object aParent, Object bParent) {
+        System.err.println("  aParent: " + (aParent != null ? aParent : "<none>"));
+        System.err.println("  bParent: " + (bParent != null ? bParent : "<none>"));
+        System.err.println("  field:   " + field);
+        System.err.println("  a:       " + a);
+        System.err.println("  b:       " + b);
+    }
+    /**
+     * When comparing arbitrary classes recursively, we need to remember which
+     * pairs of objects {@code (a, b)} we have already visited. The maps
+     * {@link #a2b} and {@link #b2a} track these edges. Caching which pairs
+     * we have already visited means the traversal only needs to visit every
+     * pair once. And should we ever find a pair {@code (a, b')} or {@code (a', b)},
+     * then we know that the two structures are not structurally equivalent.
+     */
+    private boolean checkAlreadyVisited(Object a, Object b, String field, Object aParent, Object bParent) {
+        // Boxed primitives are not guaranteed to be the same Object for the same primitive value.
+        // Hence, we cannot use the mapping below. We test these boxed primitive types by value anyway,
+        // and they are no recursive structures, so there is no point in optimizing here anyway.
+        switch (a) {
+            case Boolean _,
+                 Byte _,
+                 Short _,
+                 Character _,
+                 Integer _,
+                 Long _,
+                 Float _,
+                 Double _ -> { return false; }
+            default -> {}
+        }
+
+        Object bPrevious = a2b.get(a);
+        Object aPrevious = b2a.get(b);
+        if (aPrevious == null && bPrevious == null) {
+            // Record for next time.
+            a2b.put(a, b);
+            b2a.put(b, a);
+            return false;
         } else {
-            System.err.println("  " + context + ": " + a);
+            if (a != aPrevious || b != bPrevious) {
+                System.err.println("ERROR: Equality matching failed:");
+                print(a, b, field, aParent, bParent);
+                System.err.println("  aPrevious: " + aPrevious);
+                System.err.println("  bPrevious: " + bPrevious);
+                throw new VerifyException("Mismatch with previous pair.");
+            }
+            return true;
         }
     }
 
-    private static void printMemorySegment(MemorySegment a, String context) {
+    private void printMemorySegment(MemorySegment a, String name) {
         Optional<Object> maybeBase = a.heapBase();
-        System.err.println("  " + context + " via MemorySegment:");
+        System.err.println("  MemorySegment " + name + ":");
         if (maybeBase.isEmpty()) {
             System.err.println("    no heap base (native).");
         } else {
@@ -289,14 +538,14 @@ private static void printMemorySegment(MemorySegment a, String context) {
         System.err.println("    byteSize: " + a.byteSize());
     }
 
-    private static void printMemorySegmentValue(MemorySegment a, long offset, int range) {
+    private void printMemorySegmentValue(MemorySegment a, long offset, int range) {
         long start = Long.max(offset - range, 0);
         long end   = Long.min(offset + range, a.byteSize());
         for (long i = start; i < end; i++) {
             byte b = a.get(ValueLayout.JAVA_BYTE, i);
             System.err.print(String.format("%02x ", b));
         }
-        System.err.println("");
+        System.err.println();
         for (long i = start; i < end; i++) {
             if (i == offset) {
                 System.err.print("^^ ");
@@ -304,6 +553,6 @@ private static void printMemorySegmentValue(MemorySegment a, long offset, int ra
                 System.err.print("   ");
             }
         }
-        System.err.println("");
+        System.err.println();
     }
 }
diff --git a/test/hotspot/jtreg/testlibrary_tests/verify/examples/TestWithVectorAPI.java b/test/hotspot/jtreg/testlibrary_tests/verify/examples/TestWithVectorAPI.java
new file mode 100644
index 00000000000..83d16fb3a6d
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/verify/examples/TestWithVectorAPI.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 show Verify.checkEQ with the VectorAPI.
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run main verify.examples.TestWithVectorAPI
+ */
+
+package verify.examples;
+
+import jdk.incubator.vector.*;
+
+import compiler.lib.verify.*;
+
+/**
+ * Example to show the use of Verify.checkEQ with the VectorAPI.
+ */
+public class TestWithVectorAPI {
+    public static void main(String[] args) {
+        IntVector iv1 = IntVector.broadcast(IntVector.SPECIES_64, 7);
+        IntVector iv2 = IntVector.broadcast(IntVector.SPECIES_64, 35);
+        IntVector iv3 = IntVector.broadcast(IntVector.SPECIES_64, 42);
+        IntVector iv4 = iv1.add(iv2);
+        Verify.checkEQ(iv3, iv4);
+
+        FloatVector fv1 = FloatVector.broadcast(FloatVector.SPECIES_64, 7);
+        FloatVector fv2 = FloatVector.broadcast(FloatVector.SPECIES_64, 35);
+        FloatVector fv3 = FloatVector.broadcast(FloatVector.SPECIES_64, 42);
+        FloatVector fv4 = fv1.add(fv2);
+        Verify.checkEQ(fv3, fv4);
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
index bdfeeb149eb..34cff79dd6e 100644
--- a/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
+++ b/test/hotspot/jtreg/testlibrary_tests/verify/tests/TestVerify.java
@@ -50,9 +50,14 @@ public static void main(String[] args) {
         testArrayFloat();
         testArrayDouble();
         testNativeMemorySegment();
+        testException();
+
+        testRawFloat();
 
         // Test recursive data: Object array of values, etc.
         testRecursive();
+
+        testArbitraryClasses();
     }
 
     public static void testArrayByte() {
@@ -290,6 +295,63 @@ public static void testNativeMemorySegment() {
         checkNE(a, c);
     }
 
+    public static void testException() {
+        Exception e1 = new ArithmeticException("abc");
+        Exception e2 = new ArithmeticException("abc");
+        Exception e3 = new ArithmeticException();
+        Exception e4 = new ArithmeticException("xyz");
+        Exception e5 = new RuntimeException("abc");
+
+        Verify.checkEQ(e1, e1);
+        Verify.checkEQ(e1, e2);
+        Verify.checkEQ(e3, e3);
+        Verify.checkEQ(e1, e3); // one has no message
+
+        checkNE(e1, e4);
+        checkNE(e2, e4);
+        Verify.checkEQ(e3, e4);
+
+        Verify.checkEQ(e5, e5);
+        checkNE(e1, e5);
+        checkNE(e2, e5);
+        checkNE(e3, e5);
+        checkNE(e4, e5);
+    }
+
+    public static void testRawFloat() {
+        float nanF1 = Float.intBitsToFloat(0x7f800001);
+        float nanF2 = Float.intBitsToFloat(0x7fffffff);
+        double nanD1 = Double.longBitsToDouble(0x7ff0000000000001L);
+        double nanD2 = Double.longBitsToDouble(0x7fffffffffffffffL);
+
+        float[] arrF1 = new float[]{nanF1};
+        float[] arrF2 = new float[]{nanF2};
+        double[] arrD1 = new double[]{nanD1};
+        double[] arrD2 = new double[]{nanD2};
+
+        Verify.checkEQ(nanF1, Float.NaN);
+        Verify.checkEQ(nanF1, nanF1);
+        Verify.checkEQWithRawBits(nanF1, nanF1);
+        Verify.checkEQ(nanF1, nanF2);
+        Verify.checkEQ(nanD1, Double.NaN);
+        Verify.checkEQ(nanD1, nanD1);
+        Verify.checkEQWithRawBits(nanD1, nanD1);
+        Verify.checkEQ(nanD1, nanD2);
+
+        Verify.checkEQ(arrF1, arrF1);
+        Verify.checkEQWithRawBits(arrF1, arrF1);
+        Verify.checkEQ(arrF1, arrF2);
+        Verify.checkEQ(arrD1, arrD1);
+        Verify.checkEQWithRawBits(arrD1, arrD1);
+        Verify.checkEQ(arrD1, arrD2);
+
+        checkNEWithRawBits(nanF1, nanF2);
+        checkNEWithRawBits(nanD1, nanD2);
+
+        checkNEWithRawBits(arrF1, arrF2);
+        checkNEWithRawBits(arrD1, arrD2);
+    }
+
     public static void testRecursive() {
         Verify.checkEQ(null, null);
 
@@ -400,20 +462,233 @@ public static void testRecursive() {
             int v1 = (int)RANDOM.nextInt();
             int v2 = (int)(v1 ^ (1 << RANDOM.nextInt(32)));
             checkNE(v1, v2);
-            checkNE(Float.intBitsToFloat(v1), Float.intBitsToFloat(v2));
+            checkNEWithRawBits(Float.intBitsToFloat(v1), Float.intBitsToFloat(v2));
         }
         for (int i = 0; i < 10; i++) {
             long v1 = (long)RANDOM.nextLong();
             long v2 = (long)(v1 ^ (1L << RANDOM.nextInt(64)));
             checkNE(v1, v2);
-            checkNE(Double.longBitsToDouble(v1), Double.longBitsToDouble(v2));
+            checkNEWithRawBits(Double.longBitsToDouble(v1), Double.longBitsToDouble(v2));
+        }
+    }
+
+    static class A {}
+
+    static class B {}
+
+    static class C extends B {}
+
+    static class D {
+        D(int x) {
+            this.x = x;
+        }
+
+        private int x;
+    }
+
+    static class E {
+        E(D d, E e1, E e2) {
+            this.d = d;
+            this.e1 = e1;
+            this.e2 = e2;
         }
+
+        private D d;
+        public E e1;
+        public E e2;
+    }
+
+    static class F {
+        private int x;
+
+        public F(int x) {
+            this.x = x;
+        }
+    }
+
+    static class F2 extends F {
+        private int y;
+
+        F2(int x, int y) {
+            super(x);
+            this.y = y;
+        }
+    }
+
+    static class G {
+        private float x;
+        private float y;
+
+        public G(float x, float y) {
+            this.x = x;
+            this.y = y;
+        }
+    }
+
+    public static class H1 {
+        public boolean bool = true;
+        public byte b = (byte)242;
+        public short s = (short)24242;
+        public char c = (char)24242;
+        public int i = 1335836768;
+        public long l = 4242424242L;
+        public float f = 42.0f;
+        public double d = 42.0;
+        public H1() {}
+    }
+
+    public static class H2 extends H1 {
+        public H1 h1 = new H1();
+        public H2() {}
+    }
+
+    static record R1() {}
+    static record R2() {}
+    static record R3(int x, int y) {}
+    static record R4(R4 x, R4 y) {}
+
+    public static void testArbitraryClasses() {
+        A a1 = new A();
+        A a2 = new A();
+        B b1 = new B();
+        B b2 = new B();
+        C c1 = new C();
+        C c2 = new C();
+
+        // Structurally equivalent.
+        Verify.checkEQ(a1, a1);
+        Verify.checkEQ(a1, a2);
+        Verify.checkEQ(b1, b1);
+        Verify.checkEQ(b1, b2);
+        Verify.checkEQ(c1, c1);
+        Verify.checkEQ(c1, c2);
+
+        // Must fail because of different classes.
+        checkNE(a1, b1);
+        checkNE(b1, a1);
+        checkNE(a1, c1);
+        checkNE(c1, a1);
+        checkNE(b1, c1);
+        checkNE(c1, b1);
+
+        // Objects with primitive values.
+        D d1 = new D(1);
+        D d2 = new D(1);
+        D d3 = new D(2);
+        Verify.checkEQ(d1, d1);
+        Verify.checkEQ(d1, d2);
+        Verify.checkEQ(d2, d1);
+        checkNE(d1, d3);
+        checkNE(d3, d1);
+
+        // Object fields, including cycles.
+        E e1 = new E(d1, null, null);
+        E e2 = new E(d1, null, null);
+        E e3 = new E(d3, null, null);
+        E e4 = new E(d1, e1, null);
+        E e5 = new E(d1, e2, null);
+        E e6 = new E(d1, null, null);
+        e6.e1 = e6;
+        E e7 = new E(d1, null, null);
+        e7.e1 = e7;
+        E e8 = new E(d1, e1, e1);
+        E e9 = new E(d1, e1, e2);
+
+        Verify.checkEQ(e1, e1);
+        Verify.checkEQ(e1, e2);
+        Verify.checkEQ(e2, e1);
+        checkNE(e1, e3);
+        checkNE(e3, e1);
+        Verify.checkEQ(e6, e6);
+        Verify.checkEQ(e6, e7);
+        Verify.checkEQ(e7, e6);
+        Verify.checkEQ(e8, e8);
+        checkNE(e8, e9);
+        checkNE(e9, e8);
+
+        // Fields from superclass.
+        F2 f1 = new F2(1, 1);
+        F2 f2 = new F2(1, 1);
+        F2 f3 = new F2(2, 1);
+        F2 f4 = new F2(1, 2);
+
+        Verify.checkEQ(f1, f1);
+        Verify.checkEQ(f1, f2);
+        Verify.checkEQ(f2, f1);
+        checkNE(f1, f3);
+        checkNE(f1, f4);
+        checkNE(f3, f1);
+        checkNE(f4, f1);
+        checkNE(f3, f4);
+        checkNE(f4, f3);
+
+        G g1 = new G(1.0f, 1.0f);
+        G g2 = new G(1.0f, 1.0f);
+        G g3 = new G(Float.NaN, Float.NaN);
+        G g4 = new G(Float.NaN, Float.NaN);
+
+        Verify.checkEQ(g1, g1);
+        Verify.checkEQ(g2, g1);
+        Verify.checkEQ(g1, g2);
+        Verify.checkEQ(g3, g3);
+        Verify.checkEQ(g3, g4);
+        Verify.checkEQ(g4, g3);
+        checkNE(g1, g3);
+        checkNE(g3, g1);
+
+        // Nested class with primitive types, where the boxed types may not be cached,
+        // and so they would create different boxed objects.
+        Verify.checkEQ(new H2(), new H2());
+
+        // Records.
+        R1 r11 = new R1();
+        R1 r12 = new R1();
+        R2 r21 = new R2();
+        R3 r31 = new R3(1, 1);
+        R3 r32 = new R3(1, 1);
+        R3 r33 = new R3(1, 2);
+        R3 r34 = new R3(2, 1);
+
+        Verify.checkEQ(r11, r11);
+        Verify.checkEQ(r11, r12);
+        Verify.checkEQ(r12, r11);
+        checkNE(r11, r21);
+        Verify.checkEQ(r31, r31);
+        Verify.checkEQ(r31, r32);
+        Verify.checkEQ(r32, r31);
+        checkNE(r31, r33);
+        checkNE(r33, r31);
+        checkNE(r31, r34);
+        checkNE(r34, r31);
+        checkNE(r33, r34);
+
+        R4 r41 = new R4(null, null);
+        R4 r42 = new R4(null, null);
+        R4 r43 = new R4(r41, null);
+        R4 r44 = new R4(r42, null);
+        R4 r45 = new R4(r43, r41);
+        R4 r46 = new R4(r44, r42);
+        R4 r47 = new R4(r44, r41);
+
+        Verify.checkEQ(r45, r46);
+        Verify.checkEQ(r46, r45);
+        checkNE(r45, r47);
+        checkNE(r47, r45);
+        checkNE(r46, r47);
+        checkNE(r47, r46);
     }
 
     public static void checkNE(Object a, Object b) {
          try {
             Verify.checkEQ(a, b);
-            throw new RuntimeException("Should have thrown");
+            throw new RuntimeException("Should have thrown: " + a + " vs " + b);
+        } catch (VerifyException e) {}
+    }
+
+    public static void checkNEWithRawBits(Object a, Object b) {
+         try {
+            Verify.checkEQWithRawBits(a, b);
+            throw new RuntimeException("Should have thrown: " + a + " vs " + b);
         } catch (VerifyException e) {}
     }
 }

From def907ab89f3e5593aef17dcc61807e2836d41ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Tue, 6 May 2025 08:16:09 +0000
Subject: [PATCH 284/901] 8354520: IGV: dump contextual information

Reviewed-by: epeter, dfenacci
---
 src/hotspot/share/opto/compile.cpp           |  55 +++++----
 src/hotspot/share/opto/compile.hpp           |   8 +-
 src/hotspot/share/opto/idealGraphPrinter.cpp | 120 ++++++++++++++++++-
 src/hotspot/share/opto/idealGraphPrinter.hpp |  15 ++-
 src/hotspot/share/opto/node.cpp              |  23 +++-
 src/hotspot/share/opto/node.hpp              |   3 +-
 src/utils/IdealGraphVisualizer/README.md     |  55 +++++++++
 7 files changed, 241 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index effc7e21354..10846a32626 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -5205,32 +5205,39 @@ IdealGraphPrinter* Compile::_debug_network_printer = nullptr;
 
 // Called from debugger. Prints method to the default file with the default phase name.
 // This works regardless of any Ideal Graph Visualizer flags set or not.
-void igv_print() {
-  Compile::current()->igv_print_method_to_file();
+// Use in debugger (gdb/rr): p igv_print($sp, $fp, $pc).
+void igv_print(void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
+  Compile::current()->igv_print_method_to_file(nullptr, false, &fr);
 }
 
 // Same as igv_print() above but with a specified phase name.
-void igv_print(const char* phase_name) {
-  Compile::current()->igv_print_method_to_file(phase_name);
+void igv_print(const char* phase_name, void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
+  Compile::current()->igv_print_method_to_file(phase_name, false, &fr);
 }
 
 // Called from debugger. Prints method with the default phase name to the default network or the one specified with
 // the network flags for the Ideal Graph Visualizer, or to the default file depending on the 'network' argument.
 // This works regardless of any Ideal Graph Visualizer flags set or not.
-void igv_print(bool network) {
+// Use in debugger (gdb/rr): p igv_print(true, $sp, $fp, $pc).
+void igv_print(bool network, void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
   if (network) {
-    Compile::current()->igv_print_method_to_network();
+    Compile::current()->igv_print_method_to_network(nullptr, &fr);
   } else {
-    Compile::current()->igv_print_method_to_file();
+    Compile::current()->igv_print_method_to_file(nullptr, false, &fr);
   }
 }
 
-// Same as igv_print(bool network) above but with a specified phase name.
-void igv_print(bool network, const char* phase_name) {
+// Same as igv_print(bool network, ...) above but with a specified phase name.
+// Use in debugger (gdb/rr): p igv_print(true, "MyPhase", $sp, $fp, $pc).
+void igv_print(bool network, const char* phase_name, void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
   if (network) {
-    Compile::current()->igv_print_method_to_network(phase_name);
+    Compile::current()->igv_print_method_to_network(phase_name, &fr);
   } else {
-    Compile::current()->igv_print_method_to_file(phase_name);
+    Compile::current()->igv_print_method_to_file(phase_name, false, &fr);
   }
 }
 
@@ -5242,16 +5249,20 @@ void igv_print_default() {
 // Called from debugger, especially when replaying a trace in which the program state cannot be altered like with rr replay.
 // A method is appended to an existing default file with the default phase name. This means that igv_append() must follow
 // an earlier igv_print(*) call which sets up the file. This works regardless of any Ideal Graph Visualizer flags set or not.
-void igv_append() {
-  Compile::current()->igv_print_method_to_file("Debug", true);
+// Use in debugger (gdb/rr): p igv_append($sp, $fp, $pc).
+void igv_append(void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
+  Compile::current()->igv_print_method_to_file(nullptr, true, &fr);
 }
 
-// Same as igv_append() above but with a specified phase name.
-void igv_append(const char* phase_name) {
-  Compile::current()->igv_print_method_to_file(phase_name, true);
+// Same as igv_append(...) above but with a specified phase name.
+// Use in debugger (gdb/rr): p igv_append("MyPhase", $sp, $fp, $pc).
+void igv_append(const char* phase_name, void* sp, void* fp, void* pc) {
+  frame fr(sp, fp, pc);
+  Compile::current()->igv_print_method_to_file(phase_name, true, &fr);
 }
 
-void Compile::igv_print_method_to_file(const char* phase_name, bool append) {
+void Compile::igv_print_method_to_file(const char* phase_name, bool append, const frame* fr) {
   const char* file_name = "custom_debug.xml";
   if (_debug_file_printer == nullptr) {
     _debug_file_printer = new IdealGraphPrinter(C, file_name, append);
@@ -5259,23 +5270,23 @@ void Compile::igv_print_method_to_file(const char* phase_name, bool append) {
     _debug_file_printer->update_compiled_method(C->method());
   }
   tty->print_cr("Method %s to %s", append ? "appended" : "printed", file_name);
-  _debug_file_printer->print_graph(phase_name);
+  _debug_file_printer->print_graph(phase_name, fr);
 }
 
-void Compile::igv_print_method_to_network(const char* phase_name) {
+void Compile::igv_print_method_to_network(const char* phase_name, const frame* fr) {
   ResourceMark rm;
   GrowableArray<const Node*> empty_list;
-  igv_print_graph_to_network(phase_name, empty_list);
+  igv_print_graph_to_network(phase_name, empty_list, fr);
 }
 
-void Compile::igv_print_graph_to_network(const char* name, GrowableArray<const Node*>& visible_nodes) {
+void Compile::igv_print_graph_to_network(const char* name, GrowableArray<const Node*>& visible_nodes, const frame* fr) {
   if (_debug_network_printer == nullptr) {
     _debug_network_printer = new IdealGraphPrinter(C);
   } else {
     _debug_network_printer->update_compiled_method(C->method());
   }
   tty->print_cr("Method printed over network stream to IGV");
-  _debug_network_printer->print(name, C->root(), visible_nodes);
+  _debug_network_printer->print(name, C->root(), visible_nodes, fr);
 }
 #endif
 
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 33b9187e262..6d43948964e 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -673,13 +673,13 @@ class Compile : public Phase {
   void init_igv();
   void dump_igv(const char* graph_name, int level = 3) {
     if (should_print_igv(level)) {
-      _igv_printer->print_graph(graph_name);
+      _igv_printer->print_graph(graph_name, nullptr);
     }
   }
 
-  void igv_print_method_to_file(const char* phase_name = "Debug", bool append = false);
-  void igv_print_method_to_network(const char* phase_name = "Debug");
-  void igv_print_graph_to_network(const char* name, GrowableArray<const Node*>& visible_nodes);
+  void igv_print_method_to_file(const char* phase_name = nullptr, bool append = false, const frame* fr = nullptr);
+  void igv_print_method_to_network(const char* phase_name = nullptr, const frame* fr = nullptr);
+  void igv_print_graph_to_network(const char* name, GrowableArray<const Node*>& visible_nodes, const frame* fr);
   static IdealGraphPrinter* debug_file_printer() { return _debug_file_printer; }
   static IdealGraphPrinter* debug_network_printer() { return _debug_network_printer; }
 #endif
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 9f17e350059..f532b7e5d6e 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -27,8 +27,10 @@
 #include "opto/idealGraphPrinter.hpp"
 #include "opto/machnode.hpp"
 #include "opto/parse.hpp"
+#include "runtime/arguments.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/threadSMR.hpp"
+#include "utilities/decoder.hpp"
 #include "utilities/stringUtils.hpp"
 
 #ifndef PRODUCT
@@ -49,6 +51,13 @@ const char *IdealGraphPrinter::REMOVE_EDGE_ELEMENT = "removeEdge";
 const char *IdealGraphPrinter::REMOVE_NODE_ELEMENT = "removeNode";
 const char *IdealGraphPrinter::COMPILATION_ID_PROPERTY = "compilationId";
 const char *IdealGraphPrinter::COMPILATION_OSR_PROPERTY = "osr";
+const char *IdealGraphPrinter::COMPILATION_ARGUMENTS_PROPERTY = "arguments";
+const char *IdealGraphPrinter::COMPILATION_MACHINE_PROPERTY = "machine";
+const char *IdealGraphPrinter::COMPILATION_CPU_FEATURES_PROPERTY = "cpuFeatures";
+const char *IdealGraphPrinter::COMPILATION_VM_VERSION_PROPERTY = "vm";
+const char *IdealGraphPrinter::COMPILATION_DATE_TIME_PROPERTY = "dateTime";
+const char *IdealGraphPrinter::COMPILATION_PROCESS_ID_PROPERTY = "processId";
+const char *IdealGraphPrinter::COMPILATION_THREAD_ID_PROPERTY = "threadId";
 const char *IdealGraphPrinter::METHOD_NAME_PROPERTY = "name";
 const char *IdealGraphPrinter::METHOD_IS_PUBLIC_PROPERTY = "public";
 const char *IdealGraphPrinter::METHOD_IS_STATIC_PROPERTY = "static";
@@ -336,6 +345,42 @@ void IdealGraphPrinter::begin_method() {
 
   print_prop(COMPILATION_ID_PROPERTY, C->compile_id());
 
+  stringStream args;
+  Arguments::print_jvm_args_on(&args);
+  print_prop(COMPILATION_ARGUMENTS_PROPERTY, args.freeze());
+
+  stringStream machine;
+  buffer[0] = 0;
+  os::print_summary_info(&machine, buffer, sizeof(buffer) - 1);
+  print_prop(COMPILATION_MACHINE_PROPERTY, machine.freeze());
+
+  print_prop(COMPILATION_CPU_FEATURES_PROPERTY, VM_Version::features_string());
+
+  stringStream version;
+  buffer[0] = 0;
+  JDK_Version::current().to_string(buffer, sizeof(buffer) - 1);
+  const char* runtime_name = JDK_Version::runtime_name() != nullptr ?
+    JDK_Version::runtime_name() : "";
+  const char* runtime_version = JDK_Version::runtime_version() != nullptr ?
+    JDK_Version::runtime_version() : "";
+  const char* vendor_version = JDK_Version::runtime_vendor_version() != nullptr ?
+    JDK_Version::runtime_vendor_version() : "";
+  const char* jdk_debug_level = VM_Version::printable_jdk_debug_level() != nullptr ?
+    VM_Version::printable_jdk_debug_level() : "";
+
+  version.print_cr("%s%s%s (%s) (%sbuild %s)", runtime_name,
+                   (*vendor_version != '\0') ? " " : "", vendor_version,
+                   buffer, jdk_debug_level, runtime_version);
+  print_prop(COMPILATION_VM_VERSION_PROPERTY, version.freeze());
+
+  stringStream time;
+  buffer[0] = 0;
+  os::print_date_and_time(&time, buffer, sizeof(buffer) - 1);
+  print_prop(COMPILATION_DATE_TIME_PROPERTY, time.freeze());
+
+  print_prop(COMPILATION_PROCESS_ID_PROPERTY, os::current_process_id());
+  print_prop(COMPILATION_THREAD_ID_PROPERTY, os::current_thread_id());
+
   tail(PROPERTIES_ELEMENT);
 
   _should_send_method = true;
@@ -862,24 +907,91 @@ void IdealGraphPrinter::walk_nodes(Node* start, bool edges) {
   }
 }
 
-void IdealGraphPrinter::print_graph(const char* name) {
+// Whether the stack walk should skip the given frame when producing a C2 stack
+// trace. We consider IGV- and debugger-specific frames uninteresting.
+static bool should_skip_frame(const char* name) {
+  return strstr(name, "IdealGraphPrinter") != nullptr ||
+         strstr(name, "Compile::print_method") != nullptr ||
+         strstr(name, "Compile::igv_print_graph") != nullptr ||
+         strstr(name, "PrintBFS") != nullptr ||
+         strstr(name, "Node::dump_bfs") != nullptr;
+}
+
+// Whether the stack walk should be considered done when visiting a certain
+// frame. The purpose of walking the stack is producing a C2 trace, so we
+// consider all frames below (and including) C2Compiler::compile_method(..)
+// uninteresting.
+static bool should_end_stack_walk(const char* name) {
+  return strstr(name, "C2Compiler::compile_method") != nullptr;
+}
+
+void IdealGraphPrinter::print_stack(const frame* initial_frame, outputStream* graph_name) {
+  char buf[O_BUFLEN];
+  frame fr = initial_frame == nullptr ? os::current_frame() : *initial_frame;
+  int frame = 0;
+  for (int count = 0; count < StackPrintLimit && fr.pc() != nullptr; count++) {
+    int offset;
+    buf[0] = '\0';
+    bool found = os::dll_address_to_function_name(fr.pc(), buf, sizeof(buf), &offset);
+    if (!found || should_end_stack_walk(buf)) {
+      break;
+    }
+    if (!should_skip_frame(buf)) {
+      stringStream frame_loc;
+      frame_loc.print("%s", buf);
+      buf[0] = '\0';
+      int line_no;
+      if (Decoder::get_source_info(fr.pc(), buf, sizeof(buf), &line_no, count != 1)) {
+        frame_loc.print(" (%s:%d)", buf, line_no);
+        if (graph_name != nullptr) {
+          // Extract a debug graph name and return.
+          graph_name->print("%s:%d", buf, line_no);
+          return;
+        }
+      }
+      if (graph_name == nullptr) {
+        // Print frame as IGV property and continue to the next frame.
+        stringStream frame_number_str;
+        frame_number_str.print("frame %d:", frame);
+        print_prop(frame_number_str.freeze(), frame_loc.freeze());
+        frame++;
+      }
+    }
+    fr = frame::next_frame(fr, Thread::current_or_null());
+  }
+}
+
+void IdealGraphPrinter::print_graph(const char* name, const frame* fr) {
   ResourceMark rm;
   GrowableArray<const Node*> empty_list;
-  print(name, (Node*) C->root(), empty_list);
+  print(name, (Node*) C->root(), empty_list, fr);
 }
 
 // Print current ideal graph
-void IdealGraphPrinter::print(const char* name, Node* node, GrowableArray<const Node*>& visible_nodes) {
+void IdealGraphPrinter::print(const char* name, Node* node, GrowableArray<const Node*>& visible_nodes, const frame* fr) {
 
   if (!_current_method || !_should_send_method || node == nullptr) return;
 
+  if (name == nullptr) {
+    stringStream graph_name;
+    print_stack(fr, &graph_name);
+    name = graph_name.freeze();
+    if (strlen(name) == 0) {
+      name = "Debug";
+    }
+  }
+
   // Warning, unsafe cast?
   _chaitin = (PhaseChaitin *)C->regalloc();
 
   begin_head(GRAPH_ELEMENT);
-  print_attr(GRAPH_NAME_PROPERTY, (const char *)name);
+  print_attr(GRAPH_NAME_PROPERTY, name);
   end_head();
 
+  head(PROPERTIES_ELEMENT);
+  print_stack(fr, nullptr);
+  tail(PROPERTIES_ELEMENT);
+
   head(NODES_ELEMENT);
   if (C->cfg() != nullptr) {
     // Compute the maximum estimated frequency in the current graph.
diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index a8e0e3462e7..69ba2841506 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -67,6 +67,13 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   static const char *ALL_PROPERTY;
   static const char *COMPILATION_ID_PROPERTY;
   static const char *COMPILATION_OSR_PROPERTY;
+  static const char *COMPILATION_ARGUMENTS_PROPERTY;
+  static const char *COMPILATION_MACHINE_PROPERTY;
+  static const char *COMPILATION_CPU_FEATURES_PROPERTY;
+  static const char *COMPILATION_VM_VERSION_PROPERTY;
+  static const char *COMPILATION_DATE_TIME_PROPERTY;
+  static const char *COMPILATION_PROCESS_ID_PROPERTY;
+  static const char *COMPILATION_THREAD_ID_PROPERTY;
   static const char *METHOD_NAME_PROPERTY;
   static const char *BLOCK_NAME_PROPERTY;
   static const char *BLOCK_DOMINATOR_PROPERTY;
@@ -110,6 +117,10 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   double _max_freq;
   bool _append;
 
+  // Walk the native stack and print relevant C2 frames as IGV properties (if
+  // graph_name == nullptr) or the graph name based on the highest C2 frame (if
+  // graph_name != nullptr).
+  void print_stack(const frame* initial_frame, outputStream* graph_name);
   void print_method(ciMethod* method, int bci, InlineTree* tree);
   void print_inline_tree(InlineTree* tree);
   void visit_node(Node* n, bool edges);
@@ -149,8 +160,8 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   void print_inlining();
   void begin_method();
   void end_method();
-  void print_graph(const char* name);
-  void print(const char* name, Node* root, GrowableArray<const Node*>& hidden_nodes);
+  void print_graph(const char* name, const frame* fr = nullptr);
+  void print(const char* name, Node* root, GrowableArray<const Node*>& hidden_nodes, const frame* fr = nullptr);
   void set_compile(Compile* compile) {C = compile; }
   void update_compiled_method(ciMethod* current_method);
 };
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index a635abebec1..3875c6ce325 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1774,8 +1774,8 @@ Node* Node::find(const int idx, bool only_ctrl) {
 
 class PrintBFS {
 public:
-  PrintBFS(const Node* start, const int max_distance, const Node* target, const char* options, outputStream* st)
-  : _start(start), _max_distance(max_distance), _target(target), _options(options), _output(st),
+  PrintBFS(const Node* start, const int max_distance, const Node* target, const char* options, outputStream* st, const frame* fr)
+    : _start(start), _max_distance(max_distance), _target(target), _options(options), _output(st), _frame(fr),
     _dcc(this), _info_uid(cmpkey, hashkey) {}
 
   void run();
@@ -1796,6 +1796,7 @@ class PrintBFS {
   const Node* _target;
   const char* _options;
   outputStream* _output;
+  const frame* _frame;
 
   // options
   bool _traverse_inputs = false;
@@ -2057,7 +2058,7 @@ void PrintBFS::print() {
     if (_print_igv) {
       Compile* C = Compile::current();
       C->init_igv();
-      C->igv_print_graph_to_network("PrintBFS", _print_list);
+      C->igv_print_graph_to_network(nullptr, _print_list, _frame);
     }
   } else {
     _output->print_cr("No nodes to print.");
@@ -2102,6 +2103,8 @@ void PrintBFS::print_options_help(bool print_examples) {
   _output->print_cr("      B: print scheduling blocks (if available)");
   _output->print_cr("      $: dump only, no header, no other columns");
   _output->print_cr("      !: show nodes on IGV (sent over network stream)");
+  _output->print_cr("        (use preferably with dump_bfs(int, Node*, char*, void*, void*, void*)");
+  _output->print_cr("         to produce a C2 stack trace along with the graph dump, see examples below)");
   _output->print_cr("");
   _output->print_cr("recursively follow edges to nodes with permitted visit types,");
   _output->print_cr("on the boundary additionally display nodes allowed in boundary types");
@@ -2151,6 +2154,9 @@ void PrintBFS::print_options_help(bool print_examples) {
     _output->print_cr("    find all paths (A) between two nodes of length at most 8");
     _output->print_cr("  find_node(741)->dump_bfs(7, find_node(741), \"c+A\")");
     _output->print_cr("    find all control loops for this node");
+    _output->print_cr("  find_node(741)->dump_bfs(7, find_node(741), \"c+A!\", $sp, $fp, $pc)");
+    _output->print_cr("    same as above, but printing the resulting subgraph");
+    _output->print_cr("    along with a C2 stack trace on IGV");
   }
 }
 
@@ -2409,8 +2415,8 @@ void Node::dump_bfs(const int max_distance, Node* target, const char* options) c
 }
 
 // Used to dump to stream.
-void Node::dump_bfs(const int max_distance, Node* target, const char* options, outputStream* st) const {
-  PrintBFS bfs(this, max_distance, target, options, st);
+void Node::dump_bfs(const int max_distance, Node* target, const char* options, outputStream* st, const frame* fr) const {
+  PrintBFS bfs(this, max_distance, target, options, st, fr);
   bfs.run();
 }
 
@@ -2419,6 +2425,13 @@ void Node::dump_bfs(const int max_distance) const {
   dump_bfs(max_distance, nullptr, nullptr);
 }
 
+// Call this from debugger, with stack handling register arguments for IGV dumps.
+// Example: p find_node(741)->dump_bfs(7, find_node(741), "c+A!", $sp, $fp, $pc).
+void Node::dump_bfs(const int max_distance, Node* target, const char* options, void* sp, void* fp, void* pc) const {
+  frame fr(sp, fp, pc);
+  dump_bfs(max_distance, target, options, tty, &fr);
+}
+
 // -----------------------------dump_idx---------------------------------------
 void Node::dump_idx(bool align, outputStream* st, DumpConfig* dc) const {
   if (dc != nullptr) {
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index e1a4ee22661..843baf48cf8 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1298,9 +1298,10 @@ class Node {
  public:
   Node* find(int idx, bool only_ctrl = false); // Search the graph for the given idx.
   Node* find_ctrl(int idx); // Search control ancestors for the given idx.
-  void dump_bfs(const int max_distance, Node* target, const char* options, outputStream* st) const;
+  void dump_bfs(const int max_distance, Node* target, const char* options, outputStream* st, const frame* fr = nullptr) const;
   void dump_bfs(const int max_distance, Node* target, const char* options) const; // directly to tty
   void dump_bfs(const int max_distance) const; // dump_bfs(max_distance, nullptr, nullptr)
+  void dump_bfs(const int max_distance, Node* target, const char* options, void* sp, void* fp, void* pc) const;
   class DumpConfig {
    public:
     // overridden to implement coloring of node idx
diff --git a/src/utils/IdealGraphVisualizer/README.md b/src/utils/IdealGraphVisualizer/README.md
index 904c7b9eaf6..195878a5b99 100644
--- a/src/utils/IdealGraphVisualizer/README.md
+++ b/src/utils/IdealGraphVisualizer/README.md
@@ -22,6 +22,8 @@ for building and running IGV.
 
 # Usage
 
+## Regular JVM Execution
+
 The JVM support is controlled by the flag `-XX:PrintIdealGraphLevel=N`, where
 Ideal graphs are dumped at the following points:
 
@@ -48,6 +50,59 @@ Alternatively the output can be sent to a file using
 with unique names being generated by adding a number onto the provided file
 name.
 
+## Dumping Graphs From a Debugger
+
+The JVM provides some entry functions to dump graphs from a debugger such as
+`gdb` or `rr`, see the different variants of `igv_print` and `igv_append` in
+[`compile.cpp`](/src/hotspot/share/opto/compile.cpp). In combination with the
+IGV network interface, these functions enable a powerful interactive workflow
+where the user can simultaneously step through C2's code and visualize the
+evolving Ideal graph. Note that, to produce and print meaningful C2 stack
+traces, these functions take the stack pointer, frame pointer, and program
+counter registers as arguments. These are usually `$sp`, `$fp`, and `$pc`:
+
+```
+(gdb) p igv_print(true, $sp, $fp, $pc)
+Method printed over network stream to IGV
+```
+
+but might be given different names on different platforms, see the output of
+`p help()` for more information. A tip to further simplify the workflow in
+`gdb` or `rr` is to create a user-defined command such as e.g.:
+
+```
+define igv
+  p igv_print(true, $sp, $fp, $pc)
+end
+```
+
+On `lldb`, it might be necessary to explicitly cast the registers to `void*` to
+ ensure their values are correctly passed as arguments:
+
+```
+(lldb) p igv_print(true, (void*)$sp, (void*)$fp, (void*)$pc)
+```
+
+Another way to dump graphs interactively is through the `Node::dump_bfs`
+functionality with the option `!` (run `p find_node(0)->dump_bfs(0,0,"H")` to
+see the complete list of options). One of the versions of this function also
+takes the three stack management registers to produce a C2 stack trace:
+
+```
+(gdb) p find_node(3)->dump_bfs(0, 0, "!", $sp, $fp, $pc)
+(...)
+Method printed over network stream to IGV
+```
+
+Again, user-defined debugger commands can be created for simplicity. For
+example, to dump the current graph with a given node highlighted:
+
+```
+define igv_node
+  p find_node($arg0)->dump_bfs(0, 0, "!", $sp, $fp, $pc)
+end
+```
+
 ## Defining Custom Filters
 
 IGV has a powerful filter mechanism with which nodes and blocks can be colored,

From 8c4f2ff21e21b158c333b3d36fcf323f68f4d187 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Tue, 6 May 2025 08:28:31 +0000
Subject: [PATCH 285/901] 8356182: Build fails on aarch64 without ZGC

This work was sponsored by The FreeBSD Foundation

Reviewed-by: stefank, chagedorn
---
 src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
index 3015206dadc..071dd2c4179 100644
--- a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
@@ -180,6 +180,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
     case POLL_RETURN_FAR:
       _instructions->relocate(pc, relocInfo::poll_return_type);
       return true;
+#if INCLUDE_ZGC
     case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_TB_X:
       _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeTbX);
       return true;
@@ -192,6 +193,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
     case Z_BARRIER_RELOCATION_FORMAT_STORE_BAD_BEFORE_MOV:
       _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatStoreBadBeforeMov);
       return true;
+#endif
 
   }
   return false;

From 1eee15eea692f57e35dd785bdd491411746ae3f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Tue, 6 May 2025 09:05:37 +0000
Subject: [PATCH 286/901] 8258229: Crash in nmethod::reloc_string_for

Reviewed-by: galder, thartmann
---
 src/hotspot/share/code/nmethod.cpp            | 16 ++++
 .../print/TestPrintAssemblyDeoptRace.java     | 77 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 00f884c67e8..ed6167dac22 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -28,6 +28,7 @@
 #include "code/dependencies.hpp"
 #include "code/nativeInst.hpp"
 #include "code/nmethod.inline.hpp"
+#include "code/relocInfo.hpp"
 #include "code/scopeDesc.hpp"
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compilationLog.hpp"
@@ -1648,6 +1649,10 @@ void nmethod::maybe_print_nmethod(const DirectiveSet* directive) {
 }
 
 void nmethod::print_nmethod(bool printmethod) {
+  // Enter a critical section to prevent a race with deopts that patch code and updates the relocation info.
+  // Unfortunately, we have to lock the NMethodState_lock before the tty lock due to the deadlock rules and
+  // cannot lock in a more finely grained manner.
+  ConditionalMutexLocker ml(NMethodState_lock, !NMethodState_lock->owned_by_self(), Mutex::_no_safepoint_check_flag);
   ttyLocker ttyl;  // keep the following output all in one block
   if (xtty != nullptr) {
     xtty->begin_head("print_nmethod");
@@ -2037,6 +2042,17 @@ bool nmethod::make_not_entrant(const char* reason) {
       // cache call.
       NativeJump::patch_verified_entry(entry_point(), verified_entry_point(),
                                        SharedRuntime::get_handle_wrong_method_stub());
+
+      // Update the relocation info for the patched entry.
+      // First, get the old relocation info...
+      RelocIterator iter(this, verified_entry_point(), verified_entry_point() + 8);
+      if (iter.next() && iter.addr() == verified_entry_point()) {
+        Relocation* old_reloc = iter.reloc();
+        // ...then reset the iterator to update it.
+        RelocIterator iter(this, verified_entry_point(), verified_entry_point() + 8);
+        relocInfo::change_reloc_info_for_address(&iter, verified_entry_point(), old_reloc->type(),
+                                                 relocInfo::relocType::runtime_call_type);
+      }
     }
 
     if (update_recompile_counts()) {
diff --git a/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java b/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java
new file mode 100644
index 00000000000..3b04d073771
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.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.
+ */
+
+/*
+ * @test
+ * @bug 8258229
+ * @summary If a method is made not entrant while printing the assembly, hotspot crashes due to mismatched relocation information.
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -XX:+DeoptimizeALot -XX:CompileCommand=print,java/math/BitSieve.bit
+ *                   compiler.print.TestPrintAssemblyDeoptRace
+ */
+
+package compiler.print;
+
+import java.util.Arrays;
+
+import java.security.Security;
+import java.security.Provider;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.MGF1ParameterSpec;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.OAEPParameterSpec;
+import javax.crypto.spec.PSource;
+
+public class TestPrintAssemblyDeoptRace {
+    private static RSAPrivateKey privateKey;
+    private static RSAPublicKey publicKey;
+    static Provider cp;
+
+    public static void main(String args[]) throws Exception {
+        cp = Security.getProvider("SunJCE");
+        System.out.println("Testing provider " + cp.getName() + "...");
+        Provider kfp = Security.getProvider("SunRsaSign");
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", kfp);
+        kpg.initialize(2048);
+        KeyPair kp = kpg.generateKeyPair();
+        privateKey = (RSAPrivateKey) kp.getPrivate();
+        publicKey = (RSAPublicKey) kp.getPublic();
+        testEncryptDecrypt(new OAEPParameterSpec("SHA-512/256", "MGF1",
+                MGF1ParameterSpec.SHA512, PSource.PSpecified.DEFAULT), 190);
+
+    }
+
+    private static void testEncryptDecrypt(OAEPParameterSpec spec,
+            int dataLength) throws Exception {
+
+        Cipher c = Cipher.getInstance("RSA/ECB/OAEPPadding", cp);
+        c.init(Cipher.ENCRYPT_MODE, publicKey, spec);
+
+        byte[] data = new byte[dataLength];
+        byte[] enc = c.doFinal(data);
+        c.init(Cipher.DECRYPT_MODE, privateKey, spec);
+    }
+}

From ecfaf354d761bc7034ea8783f4428157ea450207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 6 May 2025 09:50:44 +0000
Subject: [PATCH 287/901] 8356083: ZGC: Duplicate ZTestEntry symbols in gtests

Reviewed-by: aboldtch, tschatzl
---
 .../gtest/gc/z/test_zIntrusiveRBTree.cpp      | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp b/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp
index 45fa2033a7f..ca38201e53e 100644
--- a/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp
+++ b/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp
@@ -32,22 +32,22 @@
 
 #include <limits>
 
-struct ZTestEntryCompare {
+struct ZRBTestEntryCompare {
   int operator()(const ZIntrusiveRBTreeNode* a, const ZIntrusiveRBTreeNode* b);
   int operator()(int key, const ZIntrusiveRBTreeNode* entry);
 };
 
-class ZTestEntry : public ArenaObj {
-  friend class ZIntrusiveRBTree<int, ZTestEntryCompare>;
+class ZRBTestEntry : public ArenaObj {
+  friend class ZIntrusiveRBTree<int, ZRBTestEntryCompare>;
 
 public:
-  using ZTree = ZIntrusiveRBTree<int, ZTestEntryCompare>;
+  using ZTree = ZIntrusiveRBTree<int, ZRBTestEntryCompare>;
 private:
   const int   _id;
   ZIntrusiveRBTreeNode _node;
 
 public:
-  ZTestEntry(int id)
+  ZRBTestEntry(int id)
     : _id(id),
       _node() {}
 
@@ -55,26 +55,26 @@ class ZTestEntry : public ArenaObj {
     return _id;
   }
 
-  static ZIntrusiveRBTreeNode* cast_to_inner(ZTestEntry* element) {
+  static ZIntrusiveRBTreeNode* cast_to_inner(ZRBTestEntry* element) {
     return &element->_node;
   }
-  static const ZTestEntry* cast_to_outer(const ZIntrusiveRBTreeNode* node) {
-    return (ZTestEntry*)((uintptr_t)node - offset_of(ZTestEntry, _node));
+  static const ZRBTestEntry* cast_to_outer(const ZIntrusiveRBTreeNode* node) {
+    return (ZRBTestEntry*)((uintptr_t)node - offset_of(ZRBTestEntry, _node));
   }
 
 };
 
-int ZTestEntryCompare::operator()(const ZIntrusiveRBTreeNode* a, const ZIntrusiveRBTreeNode* b) {
-  return ZTestEntry::cast_to_outer(a)->id() - ZTestEntry::cast_to_outer(b)->id();
+int ZRBTestEntryCompare::operator()(const ZIntrusiveRBTreeNode* a, const ZIntrusiveRBTreeNode* b) {
+  return ZRBTestEntry::cast_to_outer(a)->id() - ZRBTestEntry::cast_to_outer(b)->id();
 }
-int ZTestEntryCompare::operator()(int key, const ZIntrusiveRBTreeNode* entry) {
-  return key - ZTestEntry::cast_to_outer(entry)->id();
+int ZRBTestEntryCompare::operator()(int key, const ZIntrusiveRBTreeNode* entry) {
+  return key - ZRBTestEntry::cast_to_outer(entry)->id();
 }
 
 class ZTreeTest : public ZTest {
 public:
-  void shuffle_array(ZTestEntry** beg, ZTestEntry** end);
-  void reverse_array(ZTestEntry** beg, ZTestEntry** end);
+  void shuffle_array(ZRBTestEntry** beg, ZRBTestEntry** end);
+  void reverse_array(ZRBTestEntry** beg, ZRBTestEntry** end);
 };
 
 class ResettableArena : public Arena {
@@ -96,10 +96,10 @@ TEST_F(ZTreeTest, test_random) {
   constexpr size_t sizes[] = {1, 2, 4, 8, 16, 1024, 1024 * 1024};
   constexpr size_t num_sizes = ARRAY_SIZE(sizes);
   constexpr size_t iterations_multiplier = 4;
-  constexpr size_t max_allocation_size = sizes[num_sizes - 1] * iterations_multiplier * sizeof(ZTestEntry);
+  constexpr size_t max_allocation_size = sizes[num_sizes - 1] * iterations_multiplier * sizeof(ZRBTestEntry);
   ResettableArena arena{MemTag::mtTest, Arena::Tag::tag_other, max_allocation_size};
   for (size_t s : sizes) {
-    ZTestEntry::ZTree tree;
+    ZRBTestEntry::ZTree tree;
     const size_t num_iterations = s * iterations_multiplier;
     for (size_t i = 0; i < num_iterations; i++) {
       if (i % s == 0) {
@@ -113,7 +113,7 @@ TEST_F(ZTreeTest, test_random) {
           // Replace
           if (i % 4 == 0) {
             // Replace with new
-            tree.replace(ZTestEntry::cast_to_inner(new (&arena) ZTestEntry(id)), cursor);
+            tree.replace(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id)), cursor);
           } else {
             // Replace with same
             tree.replace(cursor.node(), cursor);
@@ -124,7 +124,7 @@ TEST_F(ZTreeTest, test_random) {
         }
       } else {
         // Insert
-        tree.insert(ZTestEntry::cast_to_inner(new (&arena) ZTestEntry(id)), cursor);
+        tree.insert(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id)), cursor);
       }
     }
     tree.verify_tree();
@@ -132,13 +132,13 @@ TEST_F(ZTreeTest, test_random) {
   }
 }
 
-void ZTreeTest::reverse_array(ZTestEntry** beg, ZTestEntry** end) {
+void ZTreeTest::reverse_array(ZRBTestEntry** beg, ZRBTestEntry** end) {
   if (beg == end) {
     return;
   }
 
-  ZTestEntry** first = beg;
-  ZTestEntry** last = end - 1;
+  ZRBTestEntry** first = beg;
+  ZRBTestEntry** last = end - 1;
   while (first < last) {
     ::swap(*first, *last);
     first++;
@@ -146,12 +146,12 @@ void ZTreeTest::reverse_array(ZTestEntry** beg, ZTestEntry** end) {
   }
 }
 
-void ZTreeTest::shuffle_array(ZTestEntry** beg, ZTestEntry** end) {
+void ZTreeTest::shuffle_array(ZRBTestEntry** beg, ZRBTestEntry** end) {
   if (beg == end) {
     return;
   }
 
-  for (ZTestEntry** first = beg + 1; first != end; first++) {
+  for (ZRBTestEntry** first = beg + 1; first != end; first++) {
     const ptrdiff_t distance = first - beg;
     ASSERT_GE(distance, 0);
     const ptrdiff_t random_index = random() % (distance + 1);
@@ -162,51 +162,51 @@ void ZTreeTest::shuffle_array(ZTestEntry** beg, ZTestEntry** end) {
 TEST_F(ZTreeTest, test_insert) {
   Arena arena(MemTag::mtTest);
   constexpr size_t num_entries = 1024;
-  ZTestEntry* forward[num_entries]{};
-  ZTestEntry* reverse[num_entries]{};
-  ZTestEntry* shuffle[num_entries]{};
+  ZRBTestEntry* forward[num_entries]{};
+  ZRBTestEntry* reverse[num_entries]{};
+  ZRBTestEntry* shuffle[num_entries]{};
   for (size_t i = 0; i < num_entries; i++) {
     const int id = static_cast<int>(i);
-    forward[i] = new (&arena) ZTestEntry(id);
-    reverse[i] = new (&arena) ZTestEntry(id);
-    shuffle[i] = new (&arena) ZTestEntry(id);
+    forward[i] = new (&arena) ZRBTestEntry(id);
+    reverse[i] = new (&arena) ZRBTestEntry(id);
+    shuffle[i] = new (&arena) ZRBTestEntry(id);
   }
   reverse_array(reverse, reverse + num_entries);
   shuffle_array(shuffle, shuffle + num_entries);
 
-  ZTestEntry::ZTree forward_tree;
+  ZRBTestEntry::ZTree forward_tree;
   auto cursor = forward_tree.root_cursor();
   for (size_t i = 0; i < num_entries; i++) {
     ASSERT_TRUE(cursor.is_valid());
     ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZTestEntry::cast_to_inner(forward[i]);
+    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(forward[i]);
     forward_tree.insert(new_node, cursor);
     cursor = forward_tree.next_cursor(new_node);
   }
   forward_tree.verify_tree();
 
-  ZTestEntry::ZTree reverse_tree;
+  ZRBTestEntry::ZTree reverse_tree;
   cursor = reverse_tree.root_cursor();
   for (size_t i = 0; i < num_entries; i++) {
     ASSERT_TRUE(cursor.is_valid());
     ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZTestEntry::cast_to_inner(reverse[i]);
+    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(reverse[i]);
     reverse_tree.insert(new_node, cursor);
     cursor = reverse_tree.prev_cursor(new_node);
   }
   reverse_tree.verify_tree();
 
-  ZTestEntry::ZTree shuffle_tree;
+  ZRBTestEntry::ZTree shuffle_tree;
   for (size_t i = 0; i < num_entries; i++) {
     cursor = shuffle_tree.find(reverse[i]->id());
     ASSERT_TRUE(cursor.is_valid());
     ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZTestEntry::cast_to_inner(reverse[i]);
+    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(reverse[i]);
     shuffle_tree.insert(new_node, cursor);
   }
   shuffle_tree.verify_tree();
 
-  ZTestEntryCompare compare_fn;
+  ZRBTestEntryCompare compare_fn;
   const ZIntrusiveRBTreeNode* forward_node = forward_tree.first();
   const ZIntrusiveRBTreeNode* reverse_node = reverse_tree.first();
   const ZIntrusiveRBTreeNode* shuffle_node = shuffle_tree.first();
@@ -240,13 +240,13 @@ TEST_F(ZTreeTest, test_insert) {
 TEST_F(ZTreeTest, test_replace) {
   Arena arena(MemTag::mtTest);
   constexpr size_t num_entries = 1024;
-  ZTestEntry::ZTree tree;
+  ZRBTestEntry::ZTree tree;
   auto cursor = tree.root_cursor();
   for (size_t i = 0; i < num_entries; i++) {
     ASSERT_TRUE(cursor.is_valid());
     ASSERT_FALSE(cursor.found());
     const int id = static_cast<int>(i) * 2 + 1;
-    ZIntrusiveRBTreeNode* const new_node = ZTestEntry::cast_to_inner(new (&arena) ZTestEntry(id));
+    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id));
     tree.insert(new_node, cursor);
     cursor = tree.next_cursor(new_node);
   }
@@ -261,14 +261,14 @@ TEST_F(ZTreeTest, test_replace) {
     switch (i++ % 4) {
       case 0: {
         // Decrement
-        ZTestEntry* new_entry = new (&arena) ZTestEntry(ZTestEntry::cast_to_outer(&node)->id() - 1);
-        it.replace(ZTestEntry::cast_to_inner(new_entry));
+        ZRBTestEntry* new_entry = new (&arena) ZRBTestEntry(ZRBTestEntry::cast_to_outer(&node)->id() - 1);
+        it.replace(ZRBTestEntry::cast_to_inner(new_entry));
       } break;
       case 1: break;
       case 2: {
         // Increment
-        ZTestEntry* new_entry = new (&arena) ZTestEntry(ZTestEntry::cast_to_outer(&node)->id() + 1);
-        it.replace(ZTestEntry::cast_to_inner(new_entry));
+        ZRBTestEntry* new_entry = new (&arena) ZRBTestEntry(ZRBTestEntry::cast_to_outer(&node)->id() + 1);
+        it.replace(ZRBTestEntry::cast_to_inner(new_entry));
       } break;
       case 3: break;
       default:
@@ -279,7 +279,7 @@ TEST_F(ZTreeTest, test_replace) {
 
   int last_id = std::numeric_limits<int>::min();
   for (auto& node : tree) {
-    int id = ZTestEntry::cast_to_outer(&node)->id();
+    int id = ZRBTestEntry::cast_to_outer(&node)->id();
     ASSERT_LT(last_id, id);
     last_id = id;
   }
@@ -287,7 +287,7 @@ TEST_F(ZTreeTest, test_replace) {
 
   last_id = std::numeric_limits<int>::min();
   for (auto it = tree.begin(), end = tree.end(); it != end; ++it) {
-    int id = ZTestEntry::cast_to_outer(&*it)->id();
+    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
     ASSERT_LT(last_id, id);
     last_id = id;
   }
@@ -295,7 +295,7 @@ TEST_F(ZTreeTest, test_replace) {
 
   last_id = std::numeric_limits<int>::min();
   for (auto it = tree.cbegin(), end = tree.cend(); it != end; ++it) {
-    int id = ZTestEntry::cast_to_outer(&*it)->id();
+    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
     ASSERT_LT(last_id, id);
     last_id = id;
   }
@@ -303,7 +303,7 @@ TEST_F(ZTreeTest, test_replace) {
 
   last_id = std::numeric_limits<int>::max();
   for (auto it = tree.rbegin(), end = tree.rend(); it != end; ++it) {
-    int id = ZTestEntry::cast_to_outer(&*it)->id();
+    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
     ASSERT_GT(last_id, id);
     last_id = id;
   }
@@ -311,7 +311,7 @@ TEST_F(ZTreeTest, test_replace) {
 
   last_id = std::numeric_limits<int>::max();
   for (auto it = tree.crbegin(), end = tree.crend(); it != end; ++it) {
-    int id = ZTestEntry::cast_to_outer(&*it)->id();
+    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
     ASSERT_GT(last_id, id);
     last_id = id;
   }
@@ -321,19 +321,19 @@ TEST_F(ZTreeTest, test_replace) {
 TEST_F(ZTreeTest, test_remove) {
   Arena arena(MemTag::mtTest);
   constexpr int num_entries = 1024;
-  ZTestEntry::ZTree tree;
+  ZRBTestEntry::ZTree tree;
   int id = 0;
-  tree.insert(ZTestEntry::cast_to_inner(new (&arena) ZTestEntry(++id)), tree.root_cursor());
+  tree.insert(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(++id)), tree.root_cursor());
   for (auto& node : tree) {
-    if (ZTestEntry::cast_to_outer(&node)->id() == num_entries) {
+    if (ZRBTestEntry::cast_to_outer(&node)->id() == num_entries) {
       break;
     }
     auto cursor = tree.next_cursor(&node);
-    ZIntrusiveRBTreeNode* const new_node = ZTestEntry::cast_to_inner(new (&arena) ZTestEntry(++id));
+    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(++id));
     tree.insert(new_node, cursor);
   }
   tree.verify_tree();
-  ASSERT_EQ(ZTestEntry::cast_to_outer(tree.last())->id(), num_entries);
+  ASSERT_EQ(ZRBTestEntry::cast_to_outer(tree.last())->id(), num_entries);
 
   int i = 0;
   int removed = 0;

From 614ba9fc41a0274a31f0e8eff8a598a7c5afe164 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Tue, 6 May 2025 11:08:51 +0000
Subject: [PATCH 288/901] 8356075: Support Shenandoah GC in JVMCI

Reviewed-by: shade, dnsimon, cslucas
---
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  6 +++++
 .../share/gc/shenandoah/shenandoahRuntime.cpp |  4 +++
 .../share/gc/shenandoah/shenandoahRuntime.hpp |  1 +
 src/hotspot/share/jvmci/jvmciCompilerToVM.hpp |  4 +++
 .../share/jvmci/jvmciCompilerToVMInit.cpp     | 19 +++++++++++++
 src/hotspot/share/jvmci/jvmci_globals.cpp     |  2 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   | 27 +++++++++++++++++++
 7 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 41faf3efa24..353da67ed88 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -98,6 +98,9 @@
 #include "utilities/events.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci.hpp"
+#endif
 #if INCLUDE_JFR
 #include "gc/shenandoah/shenandoahJfrSupport.hpp"
 #endif
@@ -2233,6 +2236,9 @@ void ShenandoahHeap::stw_unload_classes(bool full_gc) {
       ShenandoahGCWorkerPhase worker_phase(phase);
       bool unloading_occurred = SystemDictionary::do_unloading(gc_timer());
 
+      // Clean JVMCI metadata handles.
+      JVMCI_ONLY(JVMCI::do_unloading(unloading_occurred));
+
       uint num_workers = _workers->active_workers();
       ShenandoahClassUnloadingTask unlink_task(phase, num_workers, unloading_occurred);
       _workers->run_task(&unlink_task);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
index d2a5f71bca6..97ba5012efa 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
@@ -48,6 +48,10 @@ JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre(oopDesc * orig, JavaThread
   ShenandoahBarrierSet::satb_mark_queue_set().enqueue_known_active(queue, orig);
 JRT_END
 
+void ShenandoahRuntime::write_barrier_pre(oopDesc* orig) {
+  write_ref_field_pre(orig, JavaThread::current());
+}
+
 JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong(oopDesc* src, oop* load_addr))
   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
 JRT_END
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
index 4ad8fc997ea..0ed8959d95e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
@@ -37,6 +37,7 @@ class ShenandoahRuntime : public AllStatic {
   static void arraycopy_barrier_narrow_oop(narrowOop* src, narrowOop* dst, size_t length);
 
   static void write_ref_field_pre(oopDesc* orig, JavaThread* thread);
+  static void write_barrier_pre(oopDesc* orig);
 
   static oopDesc* load_reference_barrier_strong(oopDesc* src, oop* load_addr);
   static oopDesc* load_reference_barrier_strong_narrow(oopDesc* src, narrowOop* load_addr);
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index b44b4bb9116..f9643c6394e 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
@@ -111,6 +111,10 @@ class CompilerToVM {
 #if INCLUDE_ZGC
     static int sizeof_ZStoreBarrierEntry;
 #endif
+#if INCLUDE_SHENANDOAHGC
+    static address shenandoah_in_cset_fast_test_addr;
+    static int shenandoah_region_size_bytes_shift;
+#endif
 
 #ifdef X86
     static int L1_line_size;
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index a729e34a279..c1c21a1043f 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -52,6 +52,10 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/resourceHash.hpp"
+#if INCLUDE_SHENANDOAHGC
+#include "gc/shenandoah/shenandoahHeap.hpp"
+#include "gc/shenandoah/shenandoahHeapRegion.hpp"
+#endif
 
 int CompilerToVM::Data::oopDesc_klass_offset_in_bytes;
 int CompilerToVM::Data::arrayOopDesc_length_offset_in_bytes;
@@ -86,6 +90,11 @@ address CompilerToVM::Data::ZPointerVectorLoadBadMask_address;
 address CompilerToVM::Data::ZPointerVectorStoreBadMask_address;
 address CompilerToVM::Data::ZPointerVectorStoreGoodMask_address;
 
+#if INCLUDE_SHENANDOAHGC
+address CompilerToVM::Data::shenandoah_in_cset_fast_test_addr;
+int CompilerToVM::Data::shenandoah_region_size_bytes_shift;
+#endif
+
 bool CompilerToVM::Data::continuations_enabled;
 
 #ifdef AARCH64
@@ -227,12 +236,22 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
     assert(base != nullptr, "unexpected byte_map_base");
     cardtable_start_address = base;
     cardtable_shift = CardTable::card_shift();
+  } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+    cardtable_start_address = nullptr;
+    cardtable_shift = CardTable::card_shift();
   } else {
     // No card mark barriers
     cardtable_start_address = nullptr;
     cardtable_shift = 0;
   }
 
+#if INCLUDE_SHENANDOAHGC
+  if (UseShenandoahGC) {
+    shenandoah_in_cset_fast_test_addr = ShenandoahHeap::in_cset_fast_test_addr();
+    shenandoah_region_size_bytes_shift = ShenandoahHeapRegion::region_size_bytes_shift_jint();
+  }
+#endif
+
 #ifdef X86
   L1_line_size = VM_Version::L1_line_size();
 #endif
diff --git a/src/hotspot/share/jvmci/jvmci_globals.cpp b/src/hotspot/share/jvmci/jvmci_globals.cpp
index a41351218f8..d4d52afd069 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.cpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.cpp
@@ -229,7 +229,7 @@ bool JVMCIGlobals::enable_jvmci_product_mode(JVMFlagOrigin origin, bool use_graa
 }
 
 bool JVMCIGlobals::gc_supports_jvmci() {
-  return UseSerialGC || UseParallelGC || UseG1GC || UseZGC || UseEpsilonGC;
+  return UseSerialGC || UseParallelGC || UseG1GC || UseZGC || UseShenandoahGC || UseEpsilonGC;
 }
 
 void JVMCIGlobals::check_jvmci_supported_gc() {
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 8ca13a3a6c3..dfc15368cf6 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -53,6 +53,10 @@
 #include "gc/z/zBarrierSetRuntime.hpp"
 #include "gc/z/zThreadLocalData.hpp"
 #endif
+#if INCLUDE_SHENANDOAHGC
+#include "gc/shenandoah/shenandoahRuntime.hpp"
+#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
+#endif
 
 #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
   static_field(CompilerToVM::Data,             oopDesc_klass_offset_in_bytes,          int)                                          \
@@ -129,6 +133,8 @@
   static_field(CompilerToVM::Data,             sizeof_arrayOopDesc,                    int)                                          \
   static_field(CompilerToVM::Data,             sizeof_BasicLock,                       int)                                          \
   ZGC_ONLY(static_field(CompilerToVM::Data,    sizeof_ZStoreBarrierEntry,              int))                                         \
+  SHENANDOAHGC_ONLY(static_field(CompilerToVM::Data, shenandoah_in_cset_fast_test_addr, address))                                    \
+  SHENANDOAHGC_ONLY(static_field(CompilerToVM::Data, shenandoah_region_size_bytes_shift,int))                                        \
                                                                                                                                      \
   static_field(CompilerToVM::Data,             dsin,                                   address)                                      \
   static_field(CompilerToVM::Data,             dcos,                                   address)                                      \
@@ -895,6 +901,13 @@
   declare_function(JVMCIRuntime::load_and_clear_exception)                \
   G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre))            \
   G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post))           \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_strong))         \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_strong_narrow))  \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_weak))           \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_weak_narrow))    \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_phantom))        \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::load_reference_barrier_phantom_narrow)) \
+  SHENANDOAHGC_ONLY(declare_function(ShenandoahRuntime::write_barrier_pre))                     \
   declare_function(JVMCIRuntime::validate_object)                         \
                                                                           \
   declare_function(JVMCIRuntime::test_deoptimize_call_int)
@@ -941,6 +954,15 @@
 
 #endif // INCLUDE_ZGC
 
+#if INCLUDE_SHENANDOAHGC
+
+#define VM_INT_CONSTANTS_JVMCI_SHENANDOAH(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
+   declare_constant_with_value("ShenandoahThreadLocalData::gc_state_offset", in_bytes(ShenandoahThreadLocalData::gc_state_offset())) \
+   declare_constant_with_value("ShenandoahThreadLocalData::satb_mark_queue_index_offset", in_bytes(ShenandoahThreadLocalData::satb_mark_queue_index_offset())) \
+   declare_constant_with_value("ShenandoahThreadLocalData::satb_mark_queue_buffer_offset", in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset())) \
+   declare_constant_with_value("ShenandoahThreadLocalData::card_table_offset", in_bytes(ShenandoahThreadLocalData::card_table_offset())) \
+
+#endif
 
 #ifdef LINUX
 
@@ -1063,6 +1085,11 @@ VMIntConstantEntry JVMCIVMStructs::localHotSpotVMIntConstants[] = {
                               GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY,
                               GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 #endif
+#if INCLUDE_SHENANDOAHGC
+  VM_INT_CONSTANTS_JVMCI_SHENANDOAH(GENERATE_VM_INT_CONSTANT_ENTRY,
+                                    GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY,
+                                    GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+#endif
 #ifdef VM_INT_CPU_FEATURE_CONSTANTS
   VM_INT_CPU_FEATURE_CONSTANTS
 #endif

From ddd07b107e814ec846579a66d4f2005b7db9bb2f Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 6 May 2025 11:48:02 +0000
Subject: [PATCH 289/901] 8356172: IdealGraphPrinter doesn't need
 ThreadCritical

Reviewed-by: rcastanedalo, chagedorn
---
 src/hotspot/share/opto/idealGraphPrinter.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index f532b7e5d6e..9a337739be5 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -1159,7 +1159,6 @@ void IdealGraphPrinter::print(const char* name, Node* node, GrowableArray<const
 }
 
 void IdealGraphPrinter::init_file_stream(const char* file_name, bool use_multiple_files) {
-  ThreadCritical tc;
   if (use_multiple_files && _file_count != 0) {
     assert(!_append, "append should only be used for debugging with a single file");
     ResourceMark rm;

From bfdafb762661fad5746607aaf5b21d6d11c72ffc Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Tue, 6 May 2025 13:25:07 +0000
Subject: [PATCH 290/901] 8356266: Fix non-Shenandoah build after JDK-8356075

Reviewed-by: dnsimon, shade
---
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index c1c21a1043f..591f30e7b19 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -236,9 +236,11 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
     assert(base != nullptr, "unexpected byte_map_base");
     cardtable_start_address = base;
     cardtable_shift = CardTable::card_shift();
+#if INCLUDE_SHENANDOAHGC
   } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
     cardtable_start_address = nullptr;
     cardtable_shift = CardTable::card_shift();
+#endif
   } else {
     // No card mark barriers
     cardtable_start_address = nullptr;

From 088825ed889551e6067d46bf77fe4d30a3972da1 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 6 May 2025 14:15:37 +0000
Subject: [PATCH 291/901] 8355979: ATTRIBUTE_NO_UBSAN needs to be extended to
 handle float divisions by zero on AIX

Reviewed-by: jkern, lucy
---
 src/hotspot/share/sanitizers/ub.hpp     | 9 ++++++---
 src/java.base/share/native/libjava/ub.h | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/sanitizers/ub.hpp b/src/hotspot/share/sanitizers/ub.hpp
index 66cd014c35c..d5901f6821c 100644
--- a/src/hotspot/share/sanitizers/ub.hpp
+++ b/src/hotspot/share/sanitizers/ub.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -33,7 +33,10 @@
 // Useful if the function or method is known to do something special or even 'dangerous', for
 // example causing desired signals/crashes.
 #ifdef UNDEFINED_BEHAVIOR_SANITIZER
-#if defined(__clang__) || defined(__GNUC__)
+#if defined(__clang__)
+#define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined","float-divide-by-zero")))
+#endif
+#if defined(__GNUC__) && !defined(__clang__)
 #define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined")))
 #endif
 #endif
diff --git a/src/java.base/share/native/libjava/ub.h b/src/java.base/share/native/libjava/ub.h
index d6e0cac3bea..3019e672694 100644
--- a/src/java.base/share/native/libjava/ub.h
+++ b/src/java.base/share/native/libjava/ub.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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
@@ -32,7 +32,10 @@
  * following function or method.
  */
 #ifdef UNDEFINED_BEHAVIOR_SANITIZER
-#if defined(__clang__) || defined(__GNUC__)
+#if defined(__clang__)
+#define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined","float-divide-by-zero")))
+#endif
+#if defined(__GNUC__) && !defined(__clang__)
 #define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined")))
 #endif
 #endif

From 9477c42215a219ef8d8f44f19506692f6efc82c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 6 May 2025 16:01:44 +0000
Subject: [PATCH 292/901] 8356276: JavaScript error in script.js after
 JDK-8348282

Reviewed-by: liach
---
 .../internal/doclets/formats/html/markup/Head.java        | 4 +++-
 .../doclets/formats/html/resources/script.js.template     | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 0c54fc1e29c..2b6bfa77951 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -352,7 +352,6 @@ private void addStylesheets(HtmlTree head) {
 
         if (syntaxHighlight) {
             addStylesheet(head, DocPaths.RESOURCE_FILES.resolve(DocPaths.HIGHLIGHT_CSS));
-            addScriptElement(head, DocPaths.HIGHLIGHT_JS);
         }
 
         for (DocPath path : localStylesheets) {
@@ -367,6 +366,9 @@ private void addStylesheet(HtmlTree head, DocPath stylesheet) {
     }
 
     private void addScripts(HtmlTree head) {
+        if (syntaxHighlight) {
+            addScriptElement(head, DocPaths.HIGHLIGHT_JS);
+        }
         if (addDefaultScript) {
             addScriptElement(head, DocPaths.SCRIPT_JS);
         }
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 1b4a5021a08..d3b59f4f40b 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
@@ -21,8 +21,12 @@ var activeTableTab = "active-table-tab";
 const linkIcon = "##REPLACE:doclet.Link_icon##";
 const linkToSection = "##REPLACE:doclet.Link_to_section##";
 
-if (hljs) {
-    hljs.highlightAll();
+if (typeof hljs !== "undefined") {
+    try {
+        hljs.highlightAll();
+    } catch (err) {
+        console.error(err)
+    }
 }
 
 function loadScripts(doc, tag) {

From a6995a3d42955f1f207c14be1634daf225b5ab3f Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Tue, 6 May 2025 16:26:21 +0000
Subject: [PATCH 293/901] 8354473: Incorrect results for compress/expand tests
 with -XX:+EnableX86ECoreOpts

Reviewed-by: jbhateja, sviswanathan, epeter
---
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 19e25cde2ec..177be6e59f7 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -5731,7 +5731,7 @@ void C2_MacroAssembler::vector_compress_expand_avx2(int opcode, XMMRegister dst,
   // in a permute table row contains either a valid permute index or a -1 (default)
   // value, this can potentially be used as a blending mask after
   // compressing/expanding the source vector lanes.
-  vblendvps(dst, dst, xtmp, permv, vec_enc, false, permv);
+  vblendvps(dst, dst, xtmp, permv, vec_enc, true, permv);
 }
 
 void C2_MacroAssembler::vector_compress_expand(int opcode, XMMRegister dst, XMMRegister src, KRegister mask,

From b21b3a38a5dbc7eb23c4bd1fd5c0900a3a1b470b Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 6 May 2025 16:50:14 +0000
Subject: [PATCH 294/901] 8355528: Update HarfBuzz to 11.2.0

Reviewed-by: dnguyen, prr
---
 src/java.desktop/share/legal/harfbuzz.md      |   2 +-
 .../native/libharfbuzz/OT/Color/CBDT/CBDT.hh  |  12 +-
 .../native/libharfbuzz/OT/Color/COLR/COLR.hh  | 158 +++-
 .../native/libharfbuzz/OT/Color/sbix/sbix.hh  |  11 +-
 .../native/libharfbuzz/OT/Color/svg/svg.hh    |  15 +-
 .../OT/Layout/Common/CoverageFormat1.hh       |   2 +-
 .../OT/Layout/Common/CoverageFormat2.hh       |   2 +-
 .../native/libharfbuzz/OT/Layout/GDEF/GDEF.hh |  24 +-
 .../native/libharfbuzz/OT/Layout/GPOS/GPOS.hh |   5 +-
 .../OT/Layout/GPOS/PairPosFormat1.hh          |   2 +-
 .../native/libharfbuzz/OT/Var/VARC/VARC.hh    | 160 ++--
 .../share/native/libharfbuzz/OT/glyf/glyf.hh  |  21 +-
 .../libharfbuzz/hb-aat-layout-common.hh       | 144 ++-
 .../libharfbuzz/hb-aat-layout-kerx-table.hh   |  62 +-
 .../libharfbuzz/hb-aat-layout-morx-table.hh   |  84 +-
 .../libharfbuzz/hb-aat-layout-trak-table.hh   |  47 +-
 .../share/native/libharfbuzz/hb-aat-layout.cc |  59 +-
 .../share/native/libharfbuzz/hb-aat-layout.hh |   8 +-
 .../share/native/libharfbuzz/hb-aat-map.cc    |   5 +
 .../share/native/libharfbuzz/hb-atomic.hh     |  78 +-
 .../share/native/libharfbuzz/hb-bit-set.hh    |   4 +-
 .../share/native/libharfbuzz/hb-bit-vector.hh | 195 ++++
 .../libharfbuzz/hb-buffer-deserialize-json.hh | 602 ++++++-------
 .../hb-buffer-deserialize-text-glyphs.hh      | 843 ++++++++----------
 .../hb-buffer-deserialize-text-unicode.hh     | 192 ++--
 .../native/libharfbuzz/hb-buffer-serialize.cc |  22 +-
 .../native/libharfbuzz/hb-buffer-verify.cc    |  35 +-
 .../share/native/libharfbuzz/hb-buffer.cc     |  16 +-
 .../share/native/libharfbuzz/hb-buffer.h      |  61 +-
 .../share/native/libharfbuzz/hb-buffer.hh     |   5 +
 .../share/native/libharfbuzz/hb-cache.hh      |  37 +-
 .../native/libharfbuzz/hb-cff2-interp-cs.hh   |  66 +-
 .../share/native/libharfbuzz/hb-common.cc     |  63 +-
 .../share/native/libharfbuzz/hb-common.h      | 443 +--------
 .../share/native/libharfbuzz/hb-config.hh     |   2 +-
 .../share/native/libharfbuzz/hb-debug.hh      |   6 +-
 .../share/native/libharfbuzz/hb-deprecated.h  |  82 +-
 .../share/native/libharfbuzz/hb-draw.cc       |  93 ++
 .../share/native/libharfbuzz/hb-draw.h        |   2 +-
 .../share/native/libharfbuzz/hb-draw.hh       |  60 +-
 .../share/native/libharfbuzz/hb-face.cc       | 228 ++++-
 .../share/native/libharfbuzz/hb-face.h        |  16 +-
 .../share/native/libharfbuzz/hb-face.hh       |   6 +-
 .../share/native/libharfbuzz/hb-font.cc       | 611 ++++++++++---
 .../share/native/libharfbuzz/hb-font.h        |  97 +-
 .../share/native/libharfbuzz/hb-font.hh       | 355 ++++++--
 .../share/native/libharfbuzz/hb-ft.cc         | 348 ++++----
 .../share/native/libharfbuzz/hb-ft.h          |   4 +
 .../share/native/libharfbuzz/hb-geometry.hh   |  30 +-
 .../share/native/libharfbuzz/hb-machinery.hh  |   2 +-
 .../share/native/libharfbuzz/hb-mutex.hh      |   6 +
 .../share/native/libharfbuzz/hb-object.hh     |   6 +-
 .../share/native/libharfbuzz/hb-open-type.hh  |  14 +-
 .../native/libharfbuzz/hb-ot-cff1-table.hh    |  10 +-
 .../native/libharfbuzz/hb-ot-cff2-table.cc    |  10 +-
 .../native/libharfbuzz/hb-ot-cff2-table.hh    |  18 +-
 .../native/libharfbuzz/hb-ot-cmap-table.hh    |  83 +-
 .../share/native/libharfbuzz/hb-ot-color.cc   |   8 +-
 .../libharfbuzz/hb-ot-face-table-list.hh      |   2 +-
 .../share/native/libharfbuzz/hb-ot-face.cc    |   1 +
 .../share/native/libharfbuzz/hb-ot-font.cc    | 395 ++++----
 .../native/libharfbuzz/hb-ot-hmtx-table.hh    |   8 +-
 .../native/libharfbuzz/hb-ot-kern-table.hh    |   2 +
 .../libharfbuzz/hb-ot-layout-base-table.hh    |   2 +-
 .../native/libharfbuzz/hb-ot-layout-common.hh |  55 +-
 .../libharfbuzz/hb-ot-layout-gsubgpos.hh      |  22 +-
 .../share/native/libharfbuzz/hb-ot-layout.cc  |  17 +-
 .../share/native/libharfbuzz/hb-ot-layout.hh  |  17 +-
 .../native/libharfbuzz/hb-ot-math-table.hh    |  18 +
 .../share/native/libharfbuzz/hb-ot-math.cc    |  14 +
 .../native/libharfbuzz/hb-ot-post-table.hh    |   2 +-
 .../libharfbuzz/hb-ot-shape-fallback.cc       |   9 +-
 .../share/native/libharfbuzz/hb-ot-shape.cc   |  44 +-
 .../share/native/libharfbuzz/hb-ot-shape.hh   |   4 +
 .../native/libharfbuzz/hb-ot-shaper-arabic.cc |   2 +-
 .../native/libharfbuzz/hb-ot-shaper-hangul.cc |   6 +-
 .../native/libharfbuzz/hb-ot-shaper-indic.cc  |   2 +-
 .../native/libharfbuzz/hb-ot-shaper-thai.cc   |   2 +-
 .../share/native/libharfbuzz/hb-ot-tag.cc     |   2 +-
 .../libharfbuzz/hb-ot-var-gvar-table.hh       |  10 +-
 .../share/native/libharfbuzz/hb-ot-var.cc     |   2 +-
 .../share/native/libharfbuzz/hb-outline.cc    |   6 +
 .../share/native/libharfbuzz/hb-outline.hh    |   1 +
 .../native/libharfbuzz/hb-paint-bounded.cc    | 207 +++++
 .../native/libharfbuzz/hb-paint-bounded.hh    | 117 +++
 .../native/libharfbuzz/hb-paint-extents.cc    |  95 +-
 .../native/libharfbuzz/hb-paint-extents.hh    |  11 +-
 .../share/native/libharfbuzz/hb-paint.cc      |  46 +-
 .../share/native/libharfbuzz/hb-paint.h       |  16 +-
 .../share/native/libharfbuzz/hb-paint.hh      |  16 +-
 .../share/native/libharfbuzz/hb-script-list.h | 484 ++++++++++
 .../share/native/libharfbuzz/hb-set-digest.hh |   9 +-
 .../share/native/libharfbuzz/hb-set.hh        |   1 +
 .../share/native/libharfbuzz/hb-shape.cc      |   6 +-
 .../share/native/libharfbuzz/hb-static.cc     |   1 +
 .../libharfbuzz/hb-subset-cff-common.hh       |   2 +-
 .../native/libharfbuzz/hb-subset-input.cc     |   2 +-
 .../native/libharfbuzz/hb-subset-plan.cc      | 772 ++--------------
 .../native/libharfbuzz/hb-subset-plan.hh      |  70 ++
 .../share/native/libharfbuzz/hb-subset.cc     | 104 +++
 .../share/native/libharfbuzz/hb-subset.h      |  24 +-
 .../share/native/libharfbuzz/hb-vector.hh     |   9 +-
 .../share/native/libharfbuzz/hb-version.h     |   6 +-
 .../share/native/libharfbuzz/hb.hh            |  55 +-
 104 files changed, 4873 insertions(+), 3407 deletions(-)
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-bit-vector.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.cc
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-script-list.h

diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md
index 2d0a28ed310..e0c40705ed6 100644
--- a/src/java.desktop/share/legal/harfbuzz.md
+++ b/src/java.desktop/share/legal/harfbuzz.md
@@ -1,4 +1,4 @@
-## Harfbuzz v10.4.0
+## Harfbuzz 11.2.0
 
 ### Harfbuzz License
 
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 43a611a0058..b8f6fa4054b 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
@@ -949,25 +949,25 @@ struct CBDT
 
       hb_glyph_extents_t extents;
       hb_glyph_extents_t pixel_extents;
-      hb_blob_t *blob = reference_png (font, glyph);
-
-      if (unlikely (blob == hb_blob_get_empty ()))
+      if (unlikely (!font->get_glyph_extents (glyph, &extents, false)))
         return false;
 
-      if (unlikely (!hb_font_get_glyph_extents (font, glyph, &extents)))
+      if (unlikely (!get_extents (font, glyph, &pixel_extents, false)))
         return false;
 
-      if (unlikely (!get_extents (font, glyph, &pixel_extents, false)))
+      hb_blob_t *blob = reference_png (font, glyph);
+      if (unlikely (hb_blob_is_immutable (blob)))
         return false;
 
       bool ret = funcs->image (data,
                                blob,
                                pixel_extents.width, -pixel_extents.height,
                                HB_PAINT_IMAGE_FORMAT_PNG,
-                               font->slant_xy,
+                               0.f,
                                &extents);
 
       hb_blob_destroy (blob);
+
       return ret;
     }
 
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 4d6272d05cb..73e6b4c305b 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
@@ -33,6 +33,7 @@
 #include "../../../hb-open-type.hh"
 #include "../../../hb-ot-var-common.hh"
 #include "../../../hb-paint.hh"
+#include "../../../hb-paint-bounded.hh"
 #include "../../../hb-paint-extents.hh"
 
 #include "../CPAL/CPAL.hh"
@@ -47,6 +48,12 @@ namespace OT {
 struct hb_paint_context_t;
 }
 
+struct hb_colr_scratch_t
+{
+  hb_paint_bounded_context_t paint_bounded;
+  hb_paint_extents_context_t paint_extents;
+};
+
 namespace OT {
 
 struct COLR;
@@ -90,12 +97,27 @@ public:
     font (font_),
     palette (
 #ifndef HB_NO_COLOR
-             font->face->table.CPAL->get_palette_colors (palette_)
+             // https://github.com/harfbuzz/harfbuzz/issues/5116
+             font->face->table.CPAL->get_palette_colors (palette_ < font->face->table.CPAL->get_palette_count () ? palette_ : 0)
 #endif
     ),
     foreground (foreground_),
     instancer (instancer_)
-  { }
+  {
+    if (font->is_synthetic ())
+    {
+      font = hb_font_create_sub_font (font);
+      hb_font_set_synthetic_bold (font, 0, 0, true);
+      hb_font_set_synthetic_slant (font, 0);
+    }
+    else
+      hb_font_reference (font);
+  }
+
+  ~hb_paint_context_t ()
+  {
+    hb_font_destroy (font);
+  }
 
   hb_color_t get_color (unsigned int color_index, float alpha, hb_bool_t *is_foreground)
   {
@@ -932,9 +954,9 @@ struct PaintGlyph
   void paint_glyph (hb_paint_context_t *c) const
   {
     TRACE_PAINT (this);
-    c->funcs->push_inverse_root_transform (c->data, c->font);
+    c->funcs->push_inverse_font_transform (c->data, c->font);
     c->funcs->push_clip_glyph (c->data, gid, c->font);
-    c->funcs->push_root_transform (c->data, c->font);
+    c->funcs->push_font_transform (c->data, c->font);
     c->recurse (this+paint);
     c->funcs->pop_transform (c->data);
     c->funcs->pop_clip (c->data);
@@ -1511,10 +1533,12 @@ struct PaintComposite
   void paint_glyph (hb_paint_context_t *c) const
   {
     TRACE_PAINT (this);
+    c->funcs->push_group (c->data);
     c->recurse (this+backdrop);
     c->funcs->push_group (c->data);
     c->recurse (this+src);
     c->funcs->pop_group (c->data, (hb_paint_composite_mode_t) (int) mode);
+    c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
   }
 
   HBUINT8               format; /* format = 32 */
@@ -1612,7 +1636,7 @@ struct ClipBox
   void closurev1 (hb_colrv1_closure_context_t* c) const
   {
     switch (u.format) {
-    case 2: u.format2.closurev1 (c);
+    case 2: u.format2.closurev1 (c); return;
     default:return;
     }
   }
@@ -2079,6 +2103,8 @@ struct COLR
 {
   static constexpr hb_tag_t tableTag = HB_OT_TAG_COLR;
 
+  bool has_data () const { return has_v0_data () || version; }
+
   bool has_v0_data () const { return numBaseGlyphs; }
   bool has_v1_data () const
   {
@@ -2112,7 +2138,53 @@ struct COLR
   {
     accelerator_t (hb_face_t *face)
     { colr = hb_sanitize_context_t ().reference_table<COLR> (face); }
-    ~accelerator_t () { this->colr.destroy (); }
+
+    ~accelerator_t ()
+    {
+      auto *scratch = cached_scratch.get_relaxed ();
+      if (scratch)
+      {
+        scratch->~hb_colr_scratch_t ();
+        hb_free (scratch);
+      }
+
+      colr.destroy ();
+    }
+
+
+    bool has_data () const { return colr->has_data (); }
+
+#ifndef HB_NO_PAINT
+    bool
+    get_extents (hb_font_t *font,
+                 hb_codepoint_t glyph,
+                 hb_glyph_extents_t *extents) const
+    {
+      if (unlikely (!has_data ())) return false;
+
+      hb_colr_scratch_t *scratch = acquire_scratch ();
+      if (unlikely (!scratch)) return true;
+      bool ret = colr->get_extents (font, glyph, extents, *scratch);
+      release_scratch (scratch);
+      return ret;
+    }
+
+    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
+    {
+      if (unlikely (!has_data ())) return false;
+
+      hb_colr_scratch_t *scratch = acquire_scratch ();
+      if (unlikely (!scratch)) return true;
+      bool ret = colr->paint_glyph (font, glyph, funcs, data, palette_index, foreground, clip, *scratch);
+      release_scratch (scratch);
+      return ret;
+    }
+#endif
 
     bool is_valid () { return colr.get_blob ()->length; }
 
@@ -2148,7 +2220,33 @@ struct COLR
     { return colr->get_delta_set_index_map_ptr (); }
 
     private:
+
+    hb_colr_scratch_t *acquire_scratch () const
+    {
+      hb_colr_scratch_t *scratch = cached_scratch.get_acquire ();
+
+      if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+      {
+        scratch = (hb_colr_scratch_t *) hb_calloc (1, sizeof (hb_colr_scratch_t));
+        if (unlikely (!scratch))
+          return nullptr;
+      }
+
+      return scratch;
+    }
+    void release_scratch (hb_colr_scratch_t *scratch) const
+    {
+      if (!cached_scratch.cmpexch (nullptr, scratch))
+      {
+        scratch->~hb_colr_scratch_t ();
+        hb_free (scratch);
+      }
+    }
+
+    public:
     hb_blob_ptr_t<COLR> colr;
+    private:
+    mutable hb_atomic_t<hb_colr_scratch_t *> cached_scratch;
   };
 
   void closure_glyphs (hb_codepoint_t glyph,
@@ -2520,7 +2618,10 @@ struct COLR
 
 #ifndef HB_NO_PAINT
   bool
-  get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
+  get_extents (hb_font_t *font,
+               hb_codepoint_t glyph,
+               hb_glyph_extents_t *extents,
+               hb_colr_scratch_t &scratch) const
   {
 
     ItemVarStoreInstancer instancer (get_var_store_ptr (),
@@ -2534,10 +2635,10 @@ struct COLR
     }
 
     auto *extents_funcs = hb_paint_extents_get_funcs ();
-    hb_paint_extents_context_t extents_data;
-    bool ret = paint_glyph (font, glyph, extents_funcs, &extents_data, 0, HB_COLOR(0,0,0,0));
+    scratch.paint_extents.clear ();
+    bool ret = paint_glyph (font, glyph, extents_funcs, &scratch.paint_extents, 0, HB_COLOR(0,0,0,0), true, scratch);
 
-    hb_extents_t e = extents_data.get_extents ();
+    auto e = scratch.paint_extents.get_extents ();
     if (e.is_void ())
     {
       extents->x_bearing = 0;
@@ -2583,7 +2684,12 @@ struct COLR
 
 #ifndef HB_NO_PAINT
   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
+  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,
+               hb_colr_scratch_t &scratch) const
   {
     ItemVarStoreInstancer instancer (get_var_store_ptr (),
                                      get_delta_set_index_map_ptr (),
@@ -2617,26 +2723,26 @@ struct COLR
           }
           else
           {
-            auto *extents_funcs = hb_paint_extents_get_funcs ();
-            hb_paint_extents_context_t extents_data;
+            clip = false;
+            is_bounded = false;
+          }
+
+          if (!is_bounded)
+          {
+            auto *bounded_funcs = hb_paint_bounded_get_funcs ();
+            scratch.paint_bounded.clear ();
 
             paint_glyph (font, glyph,
-                         extents_funcs, &extents_data,
+                         bounded_funcs, &scratch.paint_bounded,
                          palette_index, foreground,
-                         false);
-
-            hb_extents_t extents = extents_data.get_extents ();
-            is_bounded = extents_data.is_bounded ();
+                         false,
+                         scratch);
 
-            c.funcs->push_clip_rectangle (c.data,
-                                          extents.xmin,
-                                          extents.ymin,
-                                          extents.xmax,
-                                          extents.ymax);
+            is_bounded = scratch.paint_bounded.is_bounded ();
           }
         }
 
-        c.funcs->push_root_transform (c.data, font);
+        c.funcs->push_font_transform (c.data, font);
 
         if (is_bounded)
           c.recurse (*paint);
@@ -2714,9 +2820,7 @@ void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const
       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);
   }
 }
 
@@ -2728,7 +2832,7 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
   if (unlikely (!node.visit (gid)))
     return;
 
-  c->funcs->push_inverse_root_transform (c->data, c->font);
+  c->funcs->push_inverse_font_transform (c->data, c->font);
   if (c->funcs->color_glyph (c->data, gid, c->font))
   {
     c->funcs->pop_transform (c->data);
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 e95d8c13a44..b77486a4340 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
@@ -237,27 +237,28 @@ struct sbix
 
       int x_offset = 0, y_offset = 0;
       unsigned int strike_ppem = 0;
-      hb_blob_t *blob = reference_png (font, glyph, &x_offset, &y_offset, &strike_ppem);
       hb_glyph_extents_t extents;
       hb_glyph_extents_t pixel_extents;
 
-      if (blob == hb_blob_get_empty ())
+      if (!font->get_glyph_extents (glyph, &extents, false))
         return false;
 
-      if (!hb_font_get_glyph_extents (font, glyph, &extents))
+      if (unlikely (!get_extents (font, glyph, &pixel_extents, false)))
         return false;
 
-      if (unlikely (!get_extents (font, glyph, &pixel_extents, false)))
+      hb_blob_t *blob = reference_png (font, glyph, &x_offset, &y_offset, &strike_ppem);
+      if (hb_blob_is_immutable (blob))
         return false;
 
       bool ret = funcs->image (data,
                                blob,
                                pixel_extents.width, -pixel_extents.height,
                                HB_PAINT_IMAGE_FORMAT_PNG,
-                               font->slant_xy,
+                               0.f,
                                &extents);
 
       hb_blob_destroy (blob);
+
       return ret;
     }
 
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 9f676f9689e..9249abf7075 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
@@ -104,15 +104,16 @@ struct SVG
       if (blob == hb_blob_get_empty ())
         return false;
 
-      funcs->image (data,
-                    blob,
-                    0, 0,
-                    HB_PAINT_IMAGE_FORMAT_SVG,
-                    font->slant_xy,
-                    nullptr);
+      bool ret = funcs->image (data,
+                               blob,
+                               0, 0,
+                               HB_PAINT_IMAGE_FORMAT_SVG,
+                               0.f,
+                               nullptr);
 
       hb_blob_destroy (blob);
-      return true;
+
+      return ret;
     }
 
     private:
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 4a925763bd7..97ea51089ec 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
@@ -77,7 +77,7 @@ struct CoverageFormat1_3
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    if (glyphArray.len > glyphs->get_population () * hb_bit_storage ((unsigned) glyphArray.len) / 2)
+    if (glyphArray.len > glyphs->get_population () * hb_bit_storage ((unsigned) glyphArray.len))
     {
       for (auto g : *glyphs)
         if (get_coverage (g) != NOT_COVERED)
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 247b7274b14..0c9bd09cbf7 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
@@ -120,7 +120,7 @@ struct CoverageFormat2_4
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    if (rangeRecord.len > glyphs->get_population () * hb_bit_storage ((unsigned) rangeRecord.len) / 2)
+    if (rangeRecord.len > glyphs->get_population () * hb_bit_storage ((unsigned) rangeRecord.len))
     {
       for (auto g : *glyphs)
         if (get_coverage (g) != NOT_COVERED)
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 542480d2dd0..ceba37b0619 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
@@ -205,20 +205,19 @@ struct CaretValueFormat3
 
     unsigned varidx = (this+deviceTable).get_variation_index ();
     hb_pair_t<unsigned, int> *new_varidx_delta;
-    if (!c->plan->layout_variation_idx_delta_map.has (varidx, &new_varidx_delta))
-      return_trace (false);
+    if (c->plan->layout_variation_idx_delta_map.has (varidx, &new_varidx_delta)) {
+      uint32_t new_varidx = hb_first (*new_varidx_delta);
+      int delta = hb_second (*new_varidx_delta);
+      if (delta != 0)
+      {
+        if (!c->serializer->check_assign (out->coordinate, coordinate + delta, HB_SERIALIZE_ERROR_INT_OVERFLOW))
+          return_trace (false);
+      }
 
-    uint32_t new_varidx = hb_first (*new_varidx_delta);
-    int delta = hb_second (*new_varidx_delta);
-    if (delta != 0)
-    {
-      if (!c->serializer->check_assign (out->coordinate, coordinate + delta, HB_SERIALIZE_ERROR_INT_OVERFLOW))
-        return_trace (false);
+      if (new_varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
+        return_trace (c->serializer->check_assign (out->caretValueFormat, 1, HB_SERIALIZE_ERROR_INT_OVERFLOW));
     }
 
-    if (new_varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
-      return_trace (c->serializer->check_assign (out->caretValueFormat, 1, HB_SERIALIZE_ERROR_INT_OVERFLOW));
-
     if (!c->serializer->embed (deviceTable))
       return_trace (false);
 
@@ -1015,7 +1014,8 @@ struct GDEF
     hb_blob_ptr_t<GDEF> table;
 #ifndef HB_NO_GDEF_CACHE
     hb_vector_t<hb_set_digest_t> mark_glyph_set_digests;
-    mutable hb_cache_t<21, 3, 8> glyph_props_cache;
+    mutable hb_cache_t<21, 3> glyph_props_cache;
+    static_assert (sizeof (glyph_props_cache) == 512, "");
 #endif
   };
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
index f4af98b25fd..ce3f74d8c3b 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
@@ -152,8 +152,11 @@ GPOS::position_finish_offsets (hb_font_t *font, hb_buffer_t *buffer)
     for (unsigned i = 0; i < len; i++)
       propagate_attachment_offsets (pos, len, i, direction);
 
-  if (unlikely (font->slant))
+  if (unlikely (font->slant_xy) &&
+      HB_DIRECTION_IS_HORIZONTAL (direction))
   {
+    /* Slanting shaping results is only supported for horizontal text,
+     * as it gets weird otherwise. */
     for (unsigned i = 0; i < len; i++)
       if (unlikely (pos[i].y_offset))
         pos[i].x_offset += roundf (font->slant_xy * pos[i].y_offset);
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 597ff4c088a..2748882f527 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
@@ -54,7 +54,7 @@ struct PairPosFormat1_3
   {
     auto &cov = this+coverage;
 
-    if (pairSet.len > glyphs->get_population () * hb_bit_storage ((unsigned) pairSet.len) / 4)
+    if (pairSet.len > glyphs->get_population () * hb_bit_storage ((unsigned) pairSet.len))
     {
       for (hb_codepoint_t g : glyphs->iter())
       {
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
index dbbbec9eee0..2ea1b6bca32 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
@@ -21,6 +21,24 @@ namespace OT {
 
 #ifndef HB_NO_VAR_COMPOSITES
 
+struct hb_varc_scratch_t
+{
+  hb_vector_t<unsigned> axisIndices;
+  hb_vector_t<float> axisValues;
+  hb_glyf_scratch_t glyf_scratch;
+};
+
+struct hb_varc_context_t
+{
+  hb_font_t *font;
+  hb_draw_session_t *draw_session;
+  hb_extents_t *extents;
+  mutable hb_decycler_t decycler;
+  mutable signed edges_left;
+  mutable signed depth_left;
+  hb_varc_scratch_t &scratch;
+};
+
 struct VarComponent
 {
   enum class flags_t : uint32_t
@@ -44,41 +62,32 @@ struct VarComponent
   };
 
   HB_INTERNAL hb_ubytes_t
-  get_path_at (hb_font_t *font,
+  get_path_at (const hb_varc_context_t &c,
                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,
+  get_path_at (const hb_varc_context_t &c,
+               hb_codepoint_t gid,
                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)
+               VarRegionList::cache_t *cache)
   {
     while (record)
     {
       const VarComponent &comp = * (const VarComponent *) (record.arrayZ);
-      record = comp.get_path_at (font, glyph,
-                                 draw_session, coords, transform,
+      record = comp.get_path_at (c,
+                                 gid,
+                                 coords, transform,
                                  record,
-                                 decycler, edges_left, depth_left, scratch, cache);
+                                 cache);
     }
   }
 };
@@ -92,36 +101,47 @@ struct VARC
   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,
+  get_path_at (const hb_varc_context_t &c,
+               hb_codepoint_t gid,
                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;
+               hb_transform_t transform = HB_TRANSFORM_IDENTITY,
+               hb_codepoint_t parent_gid = HB_CODEPOINT_INVALID,
+               VarRegionList::cache_t *parent_cache = nullptr) 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_varc_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);
+    hb_varc_context_t c {font,
+                         &draw_session,
+                         nullptr,
+                         hb_decycler_t {},
+                         HB_MAX_GRAPH_EDGE_COUNT,
+                         HB_MAX_NESTING_LEVEL,
+                         scratch};
+
+    return get_path_at (c, gid,
+                        hb_array (font->coords, font->num_coords));
+  }
+
+  bool
+  get_extents (hb_font_t *font,
+               hb_codepoint_t gid,
+               hb_extents_t *extents,
+               hb_varc_scratch_t &scratch) const
+  {
+    hb_varc_context_t c {font,
+                         nullptr,
+                         extents,
+                         hb_decycler_t {},
+                         HB_MAX_GRAPH_EDGE_COUNT,
+                         HB_MAX_NESTING_LEVEL,
+                         scratch};
+
+    return get_path_at (c, gid,
+                        hb_array (font->coords, font->num_coords));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -150,7 +170,7 @@ struct VARC
       auto *scratch = cached_scratch.get_relaxed ();
       if (scratch)
       {
-        scratch->~hb_glyf_scratch_t ();
+        scratch->~hb_varc_scratch_t ();
         hb_free (scratch);
       }
 
@@ -162,34 +182,60 @@ struct VARC
     {
       if (!table->has_data ()) return false;
 
-      hb_glyf_scratch_t *scratch;
+      auto *scratch = acquire_scratch ();
+      if (unlikely (!scratch)) return true;
+      bool ret = table->get_path (font, gid, draw_session, *scratch);
+      release_scratch (scratch);
+      return ret;
+    }
+
+    bool
+    get_extents (hb_font_t *font,
+                 hb_codepoint_t gid,
+                 hb_glyph_extents_t *extents) const
+    {
+      if (!table->has_data ()) return false;
+
+      hb_extents_t f_extents;
+
+      auto *scratch = acquire_scratch ();
+      if (unlikely (!scratch)) return true;
+      bool ret = table->get_extents (font, gid, &f_extents, *scratch);
+      release_scratch (scratch);
+
+      if (ret)
+        *extents = f_extents.to_glyph_extents (font->x_scale < 0, font->y_scale < 0);
+
+      return ret;
+    }
+
+    private:
 
-      // Borrow the cached strach buffer.
+    hb_varc_scratch_t *acquire_scratch () const
+    {
+      hb_varc_scratch_t *scratch = cached_scratch.get_acquire ();
+
+      if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
       {
-        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;
-        }
+        scratch = (hb_varc_scratch_t *) hb_calloc (1, sizeof (hb_varc_scratch_t));
+        if (unlikely (!scratch))
+          return nullptr;
       }
 
-      bool ret = table->get_path (font, gid, draw_session, *scratch);
-
-      // Put it back.
+      return scratch;
+    }
+    void release_scratch (hb_varc_scratch_t *scratch) const
+    {
       if (!cached_scratch.cmpexch (nullptr, scratch))
       {
-        scratch->~hb_glyf_scratch_t ();
+        scratch->~hb_varc_scratch_t ();
         hb_free (scratch);
       }
-
-      return ret;
     }
 
     private:
     hb_blob_ptr_t<VARC> table;
-    hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
+    mutable hb_atomic_t<hb_varc_scratch_t *> cached_scratch;
   };
 
   bool has_data () const { return version.major != 0; }
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 681c3b9a007..d9e5fedfa92 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
@@ -429,16 +429,27 @@ struct glyf_accelerator_t
   }
 
   public:
-  bool get_extents (hb_font_t *font, hb_codepoint_t gid, hb_glyph_extents_t *extents) const
+
+  bool get_extents (hb_font_t *font,
+                    hb_codepoint_t gid,
+                    hb_glyph_extents_t *extents) const
+  { return get_extents_at (font, gid, extents, hb_array (font->coords, font->num_coords)); }
+
+  bool get_extents_at (hb_font_t *font,
+                       hb_codepoint_t gid,
+                       hb_glyph_extents_t *extents,
+                       hb_array_t<const int> coords) const
   {
     if (unlikely (gid >= num_glyphs)) return false;
 
 #ifndef HB_NO_VAR
-    if (font->num_coords)
+    if (coords)
     {
       hb_glyf_scratch_t scratch;
-      return get_points (font, gid, points_aggregator_t (font, extents, nullptr, true),
-                         hb_array (font->coords, font->num_coords),
+      return get_points (font,
+                         gid,
+                         points_aggregator_t (font, extents, nullptr, true),
+                         coords,
                          scratch);
     }
 #endif
@@ -532,7 +543,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;
+  mutable hb_atomic_t<hb_glyf_scratch_t *> cached_scratch;
 };
 
 
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 673c7fbe945..d5a44bf473c 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
@@ -29,6 +29,8 @@
 
 #include "hb-aat-layout.hh"
 #include "hb-aat-map.hh"
+#include "hb-ot-layout-common.hh"
+#include "hb-ot-layout-gdef-table.hh"
 #include "hb-open-type.hh"
 #include "hb-cache.hh"
 #include "hb-bit-set.hh"
@@ -48,6 +50,61 @@ 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_scratch_t
+{
+  hb_aat_scratch_t () = default;
+  hb_aat_scratch_t (const hb_aat_scratch_t &) = delete;
+
+  hb_aat_scratch_t (hb_aat_scratch_t &&o)
+  {
+    buffer_glyph_set.set_relaxed (o.buffer_glyph_set.get_relaxed ());
+    o.buffer_glyph_set.set_relaxed (nullptr);
+  }
+  hb_aat_scratch_t & operator = (hb_aat_scratch_t &&o)
+  {
+    buffer_glyph_set.set_relaxed (o.buffer_glyph_set.get_relaxed ());
+    o.buffer_glyph_set.set_relaxed (nullptr);
+    return *this;
+  }
+  ~hb_aat_scratch_t ()
+  {
+    auto *s = buffer_glyph_set.get_relaxed ();
+    if (unlikely (!s))
+      return;
+    s->fini ();
+    hb_free (s);
+  }
+
+  hb_bit_set_t *create_buffer_glyph_set () const
+  {
+    hb_bit_set_t *s = buffer_glyph_set.get_acquire ();
+    if (s && buffer_glyph_set.cmpexch (s, nullptr))
+      return s;
+
+    s = (hb_bit_set_t *) hb_calloc (1, sizeof (hb_bit_set_t));
+    if (unlikely (!s))
+      return nullptr;
+    s->init ();
+
+    return s;
+  }
+  void destroy_buffer_glyph_set (hb_bit_set_t *s) const
+  {
+    if (unlikely (!s))
+      return;
+    if (buffer_glyph_set.cmpexch (nullptr, s))
+      return;
+    s->fini ();
+    hb_free (s);
+  }
+
+  mutable hb_atomic_t<hb_bit_set_t *> buffer_glyph_set;
+};
+
+enum { DELETED_GLYPH = 0xFFFF };
+
+#define HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED HB_BUFFER_SCRATCH_FLAG_SHAPER0
+
 struct hb_aat_apply_context_t :
        hb_dispatch_context_t<hb_aat_apply_context_t, bool, HB_DEBUG_APPLY>
 {
@@ -64,10 +121,11 @@ struct hb_aat_apply_context_t :
   hb_buffer_t *buffer;
   hb_sanitize_context_t sanitizer;
   const ankr *ankr_table;
-  const OT::GDEF *gdef_table;
+  const OT::GDEF &gdef;
+  bool has_glyph_classes;
   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;
+  hb_bit_set_t *buffer_glyph_set = nullptr;
   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;
@@ -90,15 +148,15 @@ struct hb_aat_apply_context_t :
 
   void setup_buffer_glyph_set ()
   {
-    using_buffer_glyph_set = buffer->len >= 4;
+    using_buffer_glyph_set = buffer->len >= 4 && buffer_glyph_set;
 
-    if (using_buffer_glyph_set)
-      buffer->collect_codepoints (buffer_glyph_set);
+    if (likely (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);
+    if (likely (using_buffer_glyph_set))
+      return buffer_glyph_set->intersects (*machine_glyph_set);
 
     // Faster for shorter buffers.
     for (unsigned i = 0; i < buffer->len; i++)
@@ -106,6 +164,69 @@ struct hb_aat_apply_context_t :
         return true;
     return false;
   }
+
+  template <typename T>
+  HB_NODISCARD bool output_glyphs (unsigned int count,
+                                   const T *glyphs)
+  {
+    if (likely (using_buffer_glyph_set))
+      buffer_glyph_set->add_array (glyphs, count);
+    for (unsigned int i = 0; i < count; i++)
+    {
+      if (glyphs[i] == DELETED_GLYPH)
+      {
+        buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED;
+        _hb_glyph_info_set_aat_deleted (&buffer->cur());
+      }
+      else
+      {
+#ifndef HB_NO_OT_LAYOUT
+        if (has_glyph_classes)
+          _hb_glyph_info_set_glyph_props (&buffer->cur(),
+                                          gdef.get_glyph_props (glyphs[i]));
+#endif
+      }
+      if (unlikely (!buffer->output_glyph (glyphs[i]))) return false;
+    }
+    return true;
+  }
+
+  HB_NODISCARD bool replace_glyph (hb_codepoint_t glyph)
+  {
+    if (glyph == DELETED_GLYPH)
+    {
+      buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED;
+      _hb_glyph_info_set_aat_deleted (&buffer->cur());
+    }
+
+    if (likely (using_buffer_glyph_set))
+      buffer_glyph_set->add (glyph);
+#ifndef HB_NO_OT_LAYOUT
+    if (has_glyph_classes)
+      _hb_glyph_info_set_glyph_props (&buffer->cur(),
+                                      gdef.get_glyph_props (glyph));
+#endif
+    return buffer->replace_glyph (glyph);
+  }
+
+  HB_NODISCARD bool delete_glyph ()
+  {
+    buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED;
+    _hb_glyph_info_set_aat_deleted (&buffer->cur());
+    return buffer->replace_glyph (DELETED_GLYPH);
+  }
+
+  void replace_glyph_inplace (unsigned i, hb_codepoint_t glyph)
+  {
+    buffer->info[i].codepoint = glyph;
+    if (likely (using_buffer_glyph_set))
+      buffer_glyph_set->add (glyph);
+#ifndef HB_NO_OT_LAYOUT
+    if (has_glyph_classes)
+      _hb_glyph_info_set_glyph_props (&buffer->info[i],
+                                      gdef.get_glyph_props (glyph));
+#endif
+  }
 };
 
 
@@ -113,8 +234,6 @@ struct hb_aat_apply_context_t :
  * Lookup Table
  */
 
-enum { DELETED_GLYPH = 0xFFFF };
-
 template <typename T> struct Lookup;
 
 template <typename T>
@@ -179,6 +298,7 @@ struct LookupSegmentSingle
   template <typename set_t, typename filter_t>
   void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
   {
+    if (first == DELETED_GLYPH) return;
     if (!filter (value)) return;
     glyphs.add_range (first, last);
   }
@@ -268,6 +388,7 @@ struct LookupSegmentArray
   template <typename set_t, typename filter_t>
   void collect_glyphs_filtered (set_t &glyphs, const void *base, const filter_t &filter) const
   {
+    if (first == DELETED_GLYPH) return;
     const auto &values = base+valuesZ;
     for (hb_codepoint_t i = first; i <= last; i++)
       if (filter (values[i - first]))
@@ -368,6 +489,7 @@ struct LookupSingle
   template <typename set_t, typename filter_t>
   void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
   {
+    if (glyph == DELETED_GLYPH) return;
     if (!filter (value)) return;
     glyphs.add (glyph);
   }
@@ -746,6 +868,10 @@ struct StateTable
     }
 
     // And glyphs in those classes.
+
+    if (filter (CLASS_DELETED_GLYPH))
+      glyphs.add (DELETED_GLYPH);
+
     (this+classTable).collect_glyphs_filtered (glyphs, num_glyphs, filter);
   }
 
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 a091b05660c..ca4f2243346 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
@@ -185,6 +185,9 @@ struct Format1Entry<true>
     DEFINE_SIZE_STATIC (2);
   };
 
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & Push; }
+
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.data.kernActionIndex != 0xFFFF; }
 
@@ -325,8 +328,9 @@ struct KerxSubTableFormat1
             }
             else if (buffer->info[idx].mask & kern_mask)
             {
-              o.x_advance += c->font->em_scale_x (v);
-              o.x_offset += c->font->em_scale_x (v);
+              auto scaled = c->font->em_scale_x (v);
+              o.x_advance += scaled;
+              o.x_offset += scaled;
             }
           }
           else
@@ -394,10 +398,8 @@ struct KerxSubTableFormat1
   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);
+    machine.collect_initial_glyphs (left_set, num_glyphs, *this);
+    //machine.collect_glyphs (right_set, num_glyphs); // right_set is unused for machine kerning
   }
 
   protected:
@@ -671,10 +673,8 @@ struct KerxSubTableFormat4
   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);
+    machine.collect_initial_glyphs (left_set, num_glyphs, *this);
+    //machine.collect_glyphs (right_set, num_glyphs); // right_set is unused for machine kerning
   }
 
   protected:
@@ -921,7 +921,18 @@ struct KerxSubTable
  * The 'kerx' Table
  */
 
-using kern_accelerator_data_t = hb_vector_t<hb_pair_t<hb_bit_set_t, hb_bit_set_t>>;
+struct kern_subtable_accelerator_data_t
+{
+  hb_bit_set_t left_set;
+  hb_bit_set_t right_set;
+  mutable hb_aat_class_cache_t class_cache;
+};
+
+struct kern_accelerator_data_t
+{
+  hb_vector_t<kern_subtable_accelerator_data_t> subtable_accels;
+  hb_aat_scratch_t scratch;
+};
 
 template <typename T>
 struct KerxTable
@@ -985,6 +996,8 @@ struct KerxTable
   {
     c->buffer->unsafe_to_concat ();
 
+    c->setup_buffer_glyph_set ();
+
     typedef typename T::SubTable SubTable;
 
     bool ret = false;
@@ -996,12 +1009,25 @@ struct KerxTable
     {
       bool reverse;
 
+      auto &subtable_accel = accel_data.subtable_accels[i];
+
       if (!T::Types::extended && (st->u.header.coverage & st->u.header.Variation))
         goto skip;
 
       if (HB_DIRECTION_IS_HORIZONTAL (c->buffer->props.direction) != st->u.header.is_horizontal ())
         goto skip;
 
+      c->left_set = &subtable_accel.left_set;
+      c->right_set = &subtable_accel.right_set;
+      c->machine_glyph_set = &subtable_accel.left_set;
+      c->machine_class_cache = &subtable_accel.class_cache;
+
+      if (!c->buffer_intersects_machine ())
+      {
+        (void) c->buffer->message (c->font, "skipped subtable %u because no glyph matches", c->lookup_index);
+        goto skip;
+      }
+
       reverse = bool (st->u.header.coverage & st->u.header.Backwards) !=
                 HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction);
 
@@ -1028,9 +1054,6 @@ 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);
@@ -1106,9 +1129,13 @@ struct KerxTable
     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));
+      auto &subtable_accel = *accel_data.subtable_accels.push ();
+      if (unlikely (accel_data.subtable_accels.in_error ()))
+          return accel_data;
+
+      st->collect_glyphs (subtable_accel.left_set, subtable_accel.right_set, num_glyphs);
+      subtable_accel.class_cache.clear ();
+
       st = &StructAfter<SubTable> (*st);
     }
 
@@ -1137,6 +1164,7 @@ struct KerxTable
 
     hb_blob_ptr_t<T> table;
     kern_accelerator_data_t accel_data;
+    hb_aat_scratch_t scratch;
   };
 };
 
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 cabdc0eb555..92b07eec6e5 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
@@ -30,8 +30,6 @@
 #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"
 
 /*
@@ -178,12 +176,6 @@ struct RearrangementSubtable
 
     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);
@@ -242,9 +234,7 @@ struct ContextualSubtable
         ret (false),
         c (c_),
         table (table_),
-        gdef (*c->gdef_table),
         mark_set (false),
-        has_glyph_classes (gdef.has_glyph_classes ()),
         mark (0),
         subs (table+table->substitutionTables) {}
 
@@ -281,12 +271,7 @@ struct ContextualSubtable
       if (replacement)
       {
         buffer->unsafe_to_break (mark, hb_min (buffer->idx + 1, buffer->len));
-        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));
+        c->replace_glyph_inplace (mark, *replacement);
         ret = true;
       }
 
@@ -312,12 +297,7 @@ struct ContextualSubtable
       }
       if (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));
+        c->replace_glyph_inplace (idx, *replacement);
         ret = true;
       }
 
@@ -333,9 +313,7 @@ struct ContextualSubtable
     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 UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, void, false> &subs;
   };
@@ -348,12 +326,6 @@ struct ContextualSubtable
 
     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);
@@ -581,7 +553,7 @@ struct LigatureSubtable
             hb_codepoint_t lig = ligatureData;
 
             DEBUG_MSG (APPLY, nullptr, "Produced ligature %u", lig);
-            if (unlikely (!buffer->replace_glyph (lig))) return;
+            if (unlikely (!c->replace_glyph (lig))) return;
 
             unsigned int lig_end = match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] + 1u;
             /* Now go and delete all subsequent components. */
@@ -589,8 +561,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;
+              if (!c->delete_glyph ()) return;
             }
 
             if (unlikely (!buffer->move_to (lig_end))) return;
@@ -624,12 +595,6 @@ struct LigatureSubtable
 
     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);
@@ -665,15 +630,6 @@ 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 ();
-
     bool ret = false;
     unsigned int num_glyphs = c->face->get_num_glyphs ();
 
@@ -703,12 +659,7 @@ struct NoncontextualSubtable
       const HBGlyphID16 *replacement = substitute.get_value (info[i].codepoint, num_glyphs);
       if (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));
+        c->replace_glyph_inplace (i, *replacement);
         ret = true;
       }
     }
@@ -850,9 +801,7 @@ struct InsertionSubtable
         if (buffer->idx < buffer->len && !before)
           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]);
+        if (unlikely (!c->output_glyphs (count, glyphs))) return;
         ret = true;
         if (buffer->idx < buffer->len && !before)
           buffer->skip_glyph ();
@@ -881,7 +830,8 @@ struct InsertionSubtable
         if (buffer->idx < buffer->len && !before)
           if (unlikely (!buffer->copy_glyph ())) return;
         /* TODO We ignore KashidaLike setting. */
-        if (unlikely (!buffer->replace_glyphs (0, count, glyphs))) return;
+        if (unlikely (!c->output_glyphs (count, glyphs))) return;
+        ret = true;
         if (buffer->idx < buffer->len && !before)
           buffer->skip_glyph ();
 
@@ -921,12 +871,6 @@ struct InsertionSubtable
 
     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);
@@ -1224,6 +1168,7 @@ struct Chain
       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;
@@ -1233,6 +1178,12 @@ struct Chain
           bool (coverage & ChainSubtable<Types>::Vertical))
         goto skip;
 
+      if (!c->buffer_intersects_machine ())
+      {
+        (void) c->buffer->message (c->font, "skipped chainsubtable %u because no glyph matches", c->lookup_index);
+        goto skip;
+      }
+
       /* Buffer contents is always in logical direction.  Determine if
        * we need to reverse before applying this subtable.  We reverse
        * back after if we did reverse indeed.
@@ -1376,7 +1327,7 @@ struct mortmorx
 
       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));
+      this->accels = (hb_atomic_t<hb_aat_layout_chain_accelerator_t *> *) hb_calloc (this->chain_count, sizeof (*accels));
       if (unlikely (!this->accels))
       {
         this->chain_count = 0;
@@ -1423,7 +1374,8 @@ struct mortmorx
 
     hb_blob_ptr_t<T> table;
     unsigned int chain_count;
-    hb_atomic_ptr_t<hb_aat_layout_chain_accelerator_t> *accels;
+    hb_atomic_t<hb_aat_layout_chain_accelerator_t *> *accels;
+    hb_aat_scratch_t scratch;
   };
 
 
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 0db4035fd8c..4ee73ecee69 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
@@ -31,6 +31,7 @@
 #include "hb-aat-layout-common.hh"
 #include "hb-ot-layout.hh"
 #include "hb-open-type.hh"
+#include "hb-ot-stat-table.hh"
 
 /*
  * trak -- Tracking
@@ -115,7 +116,7 @@ struct TrackTableEntry
 
   protected:
   F16DOT16      track;          /* Track value for this record. */
-  NameID        trackNameID;    /* The 'name' table index for this track.
+  OT::NameID    trackNameID;    /* The 'name' table index for this track.
                                  * (a short word or phrase like "loose"
                                  * or "very tight") */
   NNOffset16To<UnsizedArrayOf<FWORD>>
@@ -142,9 +143,9 @@ struct TrackData
     unsigned j = count - 1;
 
     // Find the two entries that track is between.
-    while (i + 1 < count && trackTable[i + 1].get_track_value () < track)
+    while (i + 1 < count && trackTable[i + 1].get_track_value () <= track)
       i++;
-    while (j > 0 && trackTable[j - 1].get_track_value () > track)
+    while (j > 0 && trackTable[j - 1].get_track_value () >= track)
       j--;
 
     // Exact match.
@@ -200,6 +201,46 @@ struct trak
     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));
   }
+  hb_position_t get_tracking (hb_font_t *font, hb_direction_t dir, float track = 0.f) const
+  {
+#ifndef HB_NO_STYLE
+    if (!font->face->table.STAT->has_data ())
+      return 0;
+    return HB_DIRECTION_IS_HORIZONTAL (dir) ?
+      get_h_tracking (font, track) :
+      get_v_tracking (font, track);
+#else
+    return 0;
+#endif
+  }
+
+  bool apply (hb_aat_apply_context_t *c, float track = 0.f) const
+  {
+    TRACE_APPLY (this);
+
+    float ptem = c->font->ptem;
+    if (unlikely (ptem <= 0.f))
+    {
+      /* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
+      ptem = HB_CORETEXT_DEFAULT_FONT_SIZE;
+    }
+
+    hb_buffer_t *buffer = c->buffer;
+    if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
+    {
+      hb_position_t advance_to_add = get_h_tracking (c->font, track);
+      foreach_grapheme (buffer, start, end)
+        buffer->pos[start].x_advance += advance_to_add;
+    }
+    else
+    {
+      hb_position_t advance_to_add = get_v_tracking (c->font, track);
+      foreach_grapheme (buffer, start, end)
+        buffer->pos[start].y_advance += advance_to_add;
+    }
+
+    return_trace (true);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
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 2cc94257aa7..b349c3026b6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc
@@ -34,7 +34,7 @@
 #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" // Just so we compile it; unused otherwise.
+#include "hb-aat-layout-trak-table.hh"
 #include "hb-aat-ltag-table.hh"
 
 #include "hb-ot-layout-gsub-table.hh"
@@ -58,13 +58,14 @@ AAT::hb_aat_apply_context_t::hb_aat_apply_context_t (const hb_ot_shape_plan_t *p
                                                        buffer (buffer_),
                                                        sanitizer (),
                                                        ankr_table (&Null (AAT::ankr)),
-                                                       gdef_table (
+                                                       gdef (
 #ifndef HB_NO_OT_LAYOUT
-                                                         face->table.GDEF->table
+                                                         *face->table.GDEF->table
 #else
-                                                         &Null (GDEF)
+                                                         Null (GDEF)
 #endif
                                                        ),
+                                                       has_glyph_classes (gdef.has_glyph_classes ()),
                                                        lookup_index (0)
 {
   sanitizer.init (blob);
@@ -203,7 +204,7 @@ hb_aat_layout_find_feature_mapping (hb_tag_t tag)
 #endif
 
 
-#ifndef HB_NO_AAT
+#ifndef HB_NO_AAT_SHAPE
 
 /*
  * mort/morx/kerx/trak
@@ -287,11 +288,14 @@ hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan,
                           const hb_feature_t *features,
                           unsigned num_features)
 {
-  hb_aat_map_builder_t builder (font->face, plan->props);
-  for (unsigned i = 0; i < num_features; i++)
-    builder.add_feature (features[i]);
   hb_aat_map_t map;
-  builder.compile (map);
+  if (num_features)
+  {
+    hb_aat_map_builder_t builder (font->face, plan->props);
+    for (unsigned i = 0; i < num_features; i++)
+      builder.add_feature (features[i]);
+    builder.compile (map);
+  }
 
   {
     auto &accel = *font->face->table.morx;
@@ -300,7 +304,10 @@ hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan,
     {
       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);
+      c.buffer_glyph_set = accel.scratch.create_buffer_glyph_set ();
+      morx.apply (&c, num_features ? map : plan->aat_map, accel);
+      accel.scratch.destroy_buffer_glyph_set (c.buffer_glyph_set);
+      c.buffer_glyph_set = nullptr;
       (void) buffer->message (font, "end table morx");
       return;
     }
@@ -313,34 +320,24 @@ hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan,
     {
       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);
+      mort.apply (&c, num_features ? map : plan->aat_map, accel);
       (void) buffer->message (font, "end table mort");
       return;
     }
   }
 }
 
-void
-hb_aat_layout_zero_width_deleted_glyphs (hb_buffer_t *buffer)
-{
-  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 (unlikely (info[i].codepoint == AAT::DELETED_GLYPH))
-      pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
-}
-
 static bool
 is_deleted_glyph (const hb_glyph_info_t *info)
 {
-  return info->codepoint == AAT::DELETED_GLYPH;
+  return _hb_glyph_info_is_aat_deleted (info);
 }
 
 void
 hb_aat_layout_remove_deleted_glyphs (hb_buffer_t *buffer)
 {
-  buffer->delete_glyphs_inplace (is_deleted_glyph);
+  if (buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_AAT_HAS_DELETED)
+    buffer->delete_glyphs_inplace (is_deleted_glyph);
 }
 
 /**
@@ -371,8 +368,11 @@ hb_aat_layout_position (const hb_ot_shape_plan_t *plan,
 
   AAT::hb_aat_apply_context_t c (plan, font, buffer, accel.get_blob ());
   if (!buffer->message (font, "start table kerx")) return;
+  c.buffer_glyph_set = accel.scratch.create_buffer_glyph_set ();
   c.set_ankr_table (font->face->table.ankr.get ());
   accel.apply (&c);
+  accel.scratch.destroy_buffer_glyph_set (c.buffer_glyph_set);
+  c.buffer_glyph_set = nullptr;
   (void) buffer->message (font, "end table kerx");
 }
 
@@ -394,6 +394,17 @@ 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.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
index ee33223651a..ffa54408ebf 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
@@ -60,9 +60,6 @@ hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan,
                           const hb_feature_t *features,
                           unsigned num_features);
 
-HB_INTERNAL void
-hb_aat_layout_zero_width_deleted_glyphs (hb_buffer_t *buffer);
-
 HB_INTERNAL void
 hb_aat_layout_remove_deleted_glyphs (hb_buffer_t *buffer);
 
@@ -71,5 +68,10 @@ 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-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
index e0e9d14d9b8..306a95b7c4b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
@@ -85,6 +85,11 @@ void
 hb_aat_map_builder_t::compile (hb_aat_map_t  &m)
 {
   /* Compute active features per range, and compile each. */
+  if (!features.length)
+  {
+    hb_aat_layout_compile_map (this, &m);
+    return;
+  }
 
   /* Sort features by start/end events. */
   hb_vector_t<feature_event_t> feature_events;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
index d2de5f693f0..80bd90e87dc 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
@@ -80,15 +80,14 @@ _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
 
 #include <atomic>
 
-#define _hb_memory_barrier()                    std::atomic_thread_fence(std::memory_order_ack_rel)
 #define _hb_memory_r_barrier()                  std::atomic_thread_fence(std::memory_order_acquire)
 #define _hb_memory_w_barrier()                  std::atomic_thread_fence(std::memory_order_release)
 
-#define hb_atomic_int_impl_add(AI, V)           (reinterpret_cast<std::atomic<std::decay<decltype (*(AI))>::type> *> (AI)->fetch_add ((V), std::memory_order_acq_rel))
-#define hb_atomic_int_impl_set_relaxed(AI, V)   (reinterpret_cast<std::atomic<std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_relaxed))
-#define hb_atomic_int_impl_set(AI, V)           (reinterpret_cast<std::atomic<std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_release))
-#define hb_atomic_int_impl_get_relaxed(AI)      (reinterpret_cast<std::atomic<std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_relaxed))
-#define hb_atomic_int_impl_get(AI)              (reinterpret_cast<std::atomic<std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_acquire))
+#define hb_atomic_int_impl_add(AI, V)           (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->fetch_add ((V), std::memory_order_acq_rel))
+#define hb_atomic_int_impl_set_relaxed(AI, V)   (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_relaxed))
+#define hb_atomic_int_impl_set(AI, V)           (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_release))
+#define hb_atomic_int_impl_get_relaxed(AI)      (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_relaxed))
+#define hb_atomic_int_impl_get(AI)              (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_acquire))
 
 #define hb_atomic_ptr_impl_set_relaxed(P, V)    (reinterpret_cast<std::atomic<void*> *> (P)->store ((V), std::memory_order_relaxed))
 #define hb_atomic_ptr_impl_get_relaxed(P)       (reinterpret_cast<std::atomic<void*> const *> (P)->load (std::memory_order_relaxed))
@@ -149,68 +148,53 @@ static inline void _hb_compiler_memory_r_barrier () {}
 #define hb_atomic_ptr_impl_get_relaxed(P)       (*(P))
 #endif
 #ifndef hb_atomic_int_impl_set
-inline void hb_atomic_int_impl_set (int *AI, int v)     { _hb_memory_w_barrier (); *AI = v; }
-inline void hb_atomic_int_impl_set (short *AI, short v) { _hb_memory_w_barrier (); *AI = v; }
+template <typename T>
+inline void hb_atomic_int_impl_set (T *AI, T v) { _hb_memory_w_barrier (); *AI = v; }
 #endif
 #ifndef hb_atomic_int_impl_get
-inline int hb_atomic_int_impl_get (const int *AI)       { int v = *AI; _hb_memory_r_barrier (); return v; }
-inline short hb_atomic_int_impl_get (const short *AI)   { short v = *AI; _hb_memory_r_barrier (); return v; }
+template <typename T>
+inline T hb_atomic_int_impl_get (const T *AI)   { T v = *AI; _hb_memory_r_barrier (); return v; }
 #endif
 #ifndef hb_atomic_ptr_impl_get
 inline void *hb_atomic_ptr_impl_get (void ** const P)   { void *v = *P; _hb_memory_r_barrier (); return v; }
 #endif
 
 
-struct hb_atomic_short_t
+template <typename T>
+struct hb_atomic_t
 {
-  hb_atomic_short_t () = default;
-  constexpr hb_atomic_short_t (short v) : v (v) {}
+  hb_atomic_t () = default;
+  constexpr hb_atomic_t (T v) : v (v) {}
 
-  hb_atomic_short_t& operator = (short v_) { set_relaxed (v_); return *this; }
-  operator short () const { return get_relaxed (); }
+  hb_atomic_t& operator = (T v_) { set_relaxed (v_); return *this; }
+  operator T () const { return get_relaxed (); }
 
-  void set_relaxed (short v_) { hb_atomic_int_impl_set_relaxed (&v, v_); }
-  void set_release (short v_) { hb_atomic_int_impl_set (&v, v_); }
-  short get_relaxed () const { return hb_atomic_int_impl_get_relaxed (&v); }
-  short get_acquire () const { return hb_atomic_int_impl_get (&v); }
-  short inc () { return hb_atomic_int_impl_add (&v,  1); }
-  short dec () { return hb_atomic_int_impl_add (&v, -1); }
+  void set_relaxed (T v_) { hb_atomic_int_impl_set_relaxed (&v, v_); }
+  void set_release (T v_) { hb_atomic_int_impl_set (&v, v_); }
+  T get_relaxed () const { return hb_atomic_int_impl_get_relaxed (&v); }
+  T get_acquire () const { return hb_atomic_int_impl_get (&v); }
+  T inc () { return hb_atomic_int_impl_add (&v,  1); }
+  T dec () { return hb_atomic_int_impl_add (&v, -1); }
 
-  short v = 0;
-};
-
-struct hb_atomic_int_t
-{
-  hb_atomic_int_t () = default;
-  constexpr hb_atomic_int_t (int v) : v (v) {}
+  int operator ++ (int) { return inc (); }
+  int operator -- (int) { return dec (); }
+  long operator |= (long v_) { set_relaxed (get_relaxed () | v_); return *this; }
 
-  hb_atomic_int_t& operator = (int v_) { set_relaxed (v_); return *this; }
-  operator int () const { return get_relaxed (); }
-
-  void set_relaxed (int v_) { hb_atomic_int_impl_set_relaxed (&v, v_); }
-  void set_release (int v_) { hb_atomic_int_impl_set (&v, v_); }
-  int get_relaxed () const { return hb_atomic_int_impl_get_relaxed (&v); }
-  int get_acquire () const { return hb_atomic_int_impl_get (&v); }
-  int inc () { return hb_atomic_int_impl_add (&v,  1); }
-  int dec () { return hb_atomic_int_impl_add (&v, -1); }
-
-  int v = 0;
+  T v = 0;
 };
 
-template <typename P>
-struct hb_atomic_ptr_t
+template <typename T>
+struct hb_atomic_t<T*>
 {
-  typedef hb_remove_pointer<P> T;
-
-  hb_atomic_ptr_t () = default;
-  constexpr hb_atomic_ptr_t (T* v) : v (v) {}
-  hb_atomic_ptr_t (const hb_atomic_ptr_t &other) = delete;
+  hb_atomic_t () = default;
+  constexpr hb_atomic_t (T* v) : v (v) {}
+  hb_atomic_t (const hb_atomic_t &other) = delete;
 
   void init (T* v_ = nullptr) { set_relaxed (v_); }
   void set_relaxed (T* v_) { hb_atomic_ptr_impl_set_relaxed (&v, v_); }
   T *get_relaxed () const { return (T *) hb_atomic_ptr_impl_get_relaxed (&v); }
   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_); }
+  bool cmpexch (const T *old, T *new_) { 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 (); }
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 c42e617f67a..799c3607599 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
@@ -77,7 +77,7 @@ struct hb_bit_set_t
 
   bool successful = true; /* Allocations successful */
   mutable unsigned int population = 0;
-  mutable hb_atomic_int_t last_page_lookup = 0;
+  mutable hb_atomic_t<unsigned> last_page_lookup = 0;
   hb_sorted_vector_t<page_map_t> page_map;
   hb_vector_t<page_t> pages;
 
@@ -88,7 +88,7 @@ struct hb_bit_set_t
   {
     if (unlikely (!successful)) return false;
 
-    if (pages.length < count && count <= 2)
+    if (pages.length < count && (unsigned) pages.allocated < count && count <= 2)
       exact_size = true; // Most sets are small and local
 
     if (unlikely (!pages.resize (count, clear, exact_size) ||
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-vector.hh
new file mode 100644
index 00000000000..2a0ec3a0710
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-vector.hh
@@ -0,0 +1,195 @@
+/*
+ *  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_BIT_VECTOR_HH
+#define HB_BIT_VECTOR_HH
+
+#include "hb.hh"
+
+#include "hb-atomic.hh"
+
+struct hb_min_max_t
+{
+  void add (hb_codepoint_t v) { min_v = hb_min (min_v, v); max_v = hb_max (max_v, v); }
+  void add_range (hb_codepoint_t a, hb_codepoint_t b)
+  {
+    min_v = hb_min (min_v, a);
+    max_v = hb_max (max_v, b);
+  }
+
+  template <typename set_t>
+  void union_ (const set_t &set)
+  {
+    hb_codepoint_t set_min = set.get_min ();
+    if (unlikely (set_min == HB_CODEPOINT_INVALID))
+      return;
+    hb_codepoint_t set_max = set.get_max ();
+    min_v = hb_min (min_v, set_min);
+    max_v = hb_max (max_v, set_max);
+  }
+
+  hb_codepoint_t get_min () const { return min_v; }
+  hb_codepoint_t get_max () const { return max_v; }
+
+  private:
+  hb_codepoint_t min_v = HB_CODEPOINT_INVALID;
+  hb_codepoint_t max_v = 0;
+};
+
+template <bool atomic = false>
+struct hb_bit_vector_t
+{
+  using int_t = uint64_t;
+  using elt_t = typename std::conditional<atomic, hb_atomic_t<int_t>, int_t>::type;
+
+  hb_bit_vector_t () = delete;
+  hb_bit_vector_t (const hb_bit_vector_t &other) = delete;
+  hb_bit_vector_t &operator= (const hb_bit_vector_t &other) = delete;
+
+  // Move
+  hb_bit_vector_t (hb_bit_vector_t &&other)
+                : min_v (other.min_v), max_v (other.max_v), count (other.count), elts (other.elts)
+  {
+    other.min_v = other.max_v = other.count = 0;
+    other.elts = nullptr;
+  }
+  hb_bit_vector_t &operator= (hb_bit_vector_t &&other)
+  {
+    hb_swap (min_v, other.min_v);
+    hb_swap (max_v, other.max_v);
+    hb_swap (count, other.count);
+    hb_swap (elts, other.elts);
+    return *this;
+  }
+
+  hb_bit_vector_t (unsigned min_v, unsigned max_v)
+    : min_v (min_v), max_v (max_v)
+  {
+    if (unlikely (min_v >= max_v))
+    {
+      min_v = max_v = count = 0;
+      return;
+    }
+
+    unsigned num = (max_v - min_v + sizeof (int_t) * 8) / (sizeof (int_t) * 8);
+    elts = (elt_t *) hb_calloc (num, sizeof (int_t));
+    if (unlikely (!elts))
+    {
+      min_v = max_v = count = 0;
+      return;
+    }
+
+    count = max_v - min_v + 1;
+  }
+  ~hb_bit_vector_t ()
+  {
+    hb_free (elts);
+  }
+
+  void add (hb_codepoint_t g) { elt (g) |= mask (g); }
+  void del (hb_codepoint_t g) { elt (g) &= ~mask (g); }
+  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 has (hb_codepoint_t g) const { return get (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)
+  {
+    if (unlikely (!count || a > b || a < min_v || b > max_v))
+      return;
+
+    elt_t *la = &elt (a);
+    elt_t *lb = &elt (b);
+    if (la == lb)
+      *la |= (mask (b) << 1) - mask(a);
+    else
+    {
+      *la |= ~(mask (a) - 1llu);
+      la++;
+
+      hb_memset (la, 0xff, (char *) lb - (char *) la);
+
+      *lb |= ((mask (b) << 1) - 1llu);
+    }
+  }
+  void del_range (hb_codepoint_t a, hb_codepoint_t b)
+  {
+    if (unlikely (!count || a > b || a < min_v || b > max_v))
+      return;
+
+    elt_t *la = &elt (a);
+    elt_t *lb = &elt (b);
+    if (la == lb)
+      *la &= ~((mask (b) << 1llu) - mask(a));
+    else
+    {
+      *la &= mask (a) - 1;
+      la++;
+
+      hb_memset (la, 0, (char *) lb - (char *) la);
+
+      *lb &= ~((mask (b) << 1) - 1llu);
+    }
+  }
+  void set_range (hb_codepoint_t a, hb_codepoint_t b, bool v)
+  { if (v) add_range (a, b); else del_range (a, b); }
+
+  template <typename set_t>
+  void union_ (const set_t &set)
+  {
+    for (hb_codepoint_t g : set)
+      add (g);
+  }
+
+  static const unsigned int ELT_BITS = sizeof (elt_t) * 8;
+  static constexpr unsigned ELT_MASK = ELT_BITS - 1;
+
+  static constexpr elt_t zero = 0;
+
+  elt_t &elt (hb_codepoint_t g)
+  {
+    g -= min_v;
+    if (unlikely (g >= count))
+      return Crap(elt_t);
+    return elts[g / ELT_BITS];
+  }
+  const elt_t& elt (hb_codepoint_t g) const
+  {
+    g -= min_v;
+    if (unlikely (g >= count))
+      return Null(elt_t);
+    return elts[g / ELT_BITS];
+  }
+
+  static constexpr int_t mask (hb_codepoint_t g) { return elt_t (1) << (g & ELT_MASK); }
+
+  hb_codepoint_t min_v = 0, max_v = 0, count = 0;
+  elt_t *elts = nullptr;
+};
+
+
+#endif /* HB_BIT_VECTOR_HH */
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 69cc1640230..255497b652d 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
@@ -32,62 +32,68 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-json.hh"
+#line 33 "hb-buffer-deserialize-json.hh"
 static const unsigned char _deserialize_json_trans_keys[] = {
-        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, 93u, 9u, 123u, 0u, 0u, 0
+        0u, 0u, 9u, 34u, 97u, 121u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u,
+        9u, 125u, 9u, 125u, 9u, 93u, 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, 48u, 57u, 9u, 125u,
+        34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 98u, 98u, 9u, 123u, 9u, 123u, 9u, 123u,
+        0
 };
 
 static const char _deserialize_json_key_spans[] = {
-        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,
-        85, 115, 0
+        0, 26, 25, 2, 1, 50, 49, 10,
+        117, 117, 85, 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, 10, 117,
+        1, 50, 49, 117, 1, 115, 115, 115
 };
 
 static const short _deserialize_json_index_offsets[] = {
-        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
+        0, 0, 27, 53, 56, 58, 109, 159,
+        170, 288, 406, 492, 610, 612, 663, 713,
+        724, 842, 960, 962, 964, 1015, 1065, 1183,
+        1301, 1304, 1306, 1357, 1407, 1418, 1536, 1654,
+        1656, 1707, 1757, 1768, 1886, 2004, 2006, 2008,
+        2059, 2109, 2227, 2345, 2347, 2398, 2448, 2508,
+        2626, 2686, 2804, 2922, 2924, 2975, 3025, 3036,
+        3154, 3156, 3207, 3257, 3375, 3377, 3493, 3609
 };
 
 static const char _deserialize_json_indicies[] = {
         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,
+        0, 1, 2, 1, 3, 1, 4, 5,
+        1, 6, 7, 8, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        9, 1, 8, 10, 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, 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, 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, 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,
@@ -95,48 +101,41 @@ 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, 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, 22,
+        1, 23, 23, 23, 23, 23, 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,
+        23, 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,
-        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, 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, 24, 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, 25, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 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, 24, 24, 24,
-        24, 24, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 25, 1, 20, 20, 20,
+        20, 20, 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, 20, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        4, 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, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -145,43 +144,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, 22, 1, 26, 1, 26, 26, 26,
+        26, 26, 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, 26, 1, 1, 1,
         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, 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, 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, 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, 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, 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, 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, 32, 32, 32, 32, 32, 32,
+        32, 32, 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,
@@ -190,39 +188,41 @@ 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, 35,
-        1, 33, 33, 33, 33, 33, 1, 1,
+        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, 1, 37, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        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, 32, 1, 1, 1, 1, 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, 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, 1, 1, 1, 1, 1, 1,
+        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, 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, 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, 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, 39, 40, 40,
-        40, 40, 40, 40, 40, 40, 40, 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, 41,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 42, 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, 1, 1, 1, 1, 1, 1,
@@ -230,43 +230,43 @@ 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, 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, 43, 1, 41, 41,
-        41, 41, 41, 1, 1, 1, 1, 1,
+        1, 1, 47, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 41, 1, 1,
         1, 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, 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, 48, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 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, 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, 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,
-        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, 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, 48, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        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, 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,
@@ -274,44 +274,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, 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,
-        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,
+        57, 1, 1, 1, 1, 1, 1, 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, 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, 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,
+        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, 65, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
+        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, 1, 1, 1, 1, 1, 1,
@@ -320,39 +318,41 @@ 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, 66, 1, 64, 64, 64,
-        64, 64, 1, 1, 1, 1, 1, 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, 64, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        65, 1, 1, 1, 63, 63, 63, 63,
-        63, 63, 63, 63, 63, 63, 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, 1,
         1, 1, 1, 1, 1, 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,
+        1, 1, 74, 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, 75, 75, 75, 75, 75,
+        75, 75, 75, 75, 75, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -361,71 +361,70 @@ 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, 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,
-        74, 1, 72, 72, 72, 72, 72, 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, 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, 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, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 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,
-        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, 86, 1, 81, 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, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 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, 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, 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,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 81, 1, 87, 87, 87,
+        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, 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,
@@ -434,118 +433,151 @@ 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, 89, 1, 91, 1, 91, 91, 91,
+        91, 91, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 89, 1, 87, 87, 87, 87, 87,
+        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, 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, 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, 93, 1, 1, 94,
+        95, 95, 95, 95, 95, 95, 95, 95,
+        95, 1, 23, 96, 96, 96, 96, 96,
+        96, 96, 96, 96, 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,
+        0, 1, 1, 1, 96, 96, 96, 96,
+        96, 96, 96, 96, 96, 96, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 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, 24, 1, 97, 1, 97, 97, 97,
+        97, 97, 1, 1, 1, 1, 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, 97, 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, 95,
-        95, 95, 95, 95, 95, 95, 95, 95,
-        95, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 98, 1,
+        98, 98, 98, 98, 98, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 98,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 99,
+        100, 100, 100, 100, 100, 100, 100, 100,
+        100, 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, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 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,
+        8, 1, 102, 102, 102, 102, 102, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 102, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 103, 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, 97, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 104, 1, 103, 103,
+        103, 103, 103, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 103, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        104, 1, 25, 25, 25, 25, 25, 1,
         1, 1, 1, 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, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 3, 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, 104, 1, 0
 };
 
 static const char _deserialize_json_trans_targs[] = {
-        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
+        1, 0, 2, 3, 18, 24, 37, 43,
+        51, 56, 60, 4, 12, 5, 6, 7,
+        8, 11, 8, 11, 9, 1, 10, 9,
+        10, 63, 13, 14, 15, 16, 17, 16,
+        17, 9, 1, 10, 19, 20, 21, 22,
+        23, 9, 1, 10, 23, 25, 31, 26,
+        27, 28, 29, 30, 29, 30, 9, 1,
+        10, 32, 33, 34, 35, 36, 35, 36,
+        9, 1, 10, 38, 39, 40, 41, 42,
+        9, 1, 10, 42, 44, 45, 46, 49,
+        50, 46, 47, 48, 9, 1, 10, 9,
+        1, 10, 50, 52, 53, 54, 9, 55,
+        55, 57, 58, 49, 59, 59, 61, 62,
+        1
 };
 
 static const char _deserialize_json_trans_actions[] = {
-        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
+        0, 0, 0, 0, 0, 0, 0, 1,
+        1, 1, 0, 0, 2, 2, 2, 0,
+        0, 3, 0, 0, 1, 1, 1, 0,
+        0, 4, 4, 4, 0, 0, 0, 1,
+        1, 5, 5, 5, 0, 0, 0, 0,
+        0, 1, 1, 1, 0, 0, 6, 6,
+        6, 0, 0, 1, 1, 1, 0, 0,
+        7, 7, 7, 0, 0, 0, 1, 1,
+        8, 8, 8, 0, 0, 0, 1, 9,
+        9, 0, 10, 0, 11, 11, 11, 12,
+        12, 12, 10, 0, 0, 1, 1, 1,
+        0, 0, 0, 13, 13, 14, 0, 0,
+        15
 };
 
-static const int deserialize_json_start = 1;
-static const int deserialize_json_first_final = 56;
+static const int deserialize_json_start = 61;
+static const int deserialize_json_first_final = 61;
 static const int deserialize_json_error = 0;
 
-static const int deserialize_json_en_main = 1;
+static const int deserialize_json_en_main = 61;
 
 
-#line 111 "hb-buffer-deserialize-json.rl"
+#line 115 "hb-buffer-deserialize-json.rl"
 
 
 static hb_bool_t
@@ -565,12 +597,12 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
 
-#line 569 "hb-buffer-deserialize-json.hh"
+#line 594 "hb-buffer-deserialize-json.hh"
         {
         cs = deserialize_json_start;
         }
 
-#line 574 "hb-buffer-deserialize-json.hh"
+#line 597 "hb-buffer-deserialize-json.hh"
         {
         int _slen;
         int _trans;
@@ -595,14 +627,14 @@ _resume:
                 goto _again;
 
         switch ( _deserialize_json_trans_actions[_trans] ) {
-        case 1:
+        case 15:
 #line 38 "hb-buffer-deserialize-json.rl"
         {
         hb_memset (&info, 0, sizeof (info));
         hb_memset (&pos , 0, sizeof (pos ));
 }
         break;
-        case 5:
+        case 3:
 #line 43 "hb-buffer-deserialize-json.rl"
         {
         buffer->add_info (info);
@@ -612,21 +644,21 @@ _resume:
         *end_ptr = p;
 }
         break;
-        case 2:
+        case 1:
 #line 51 "hb-buffer-deserialize-json.rl"
         {
         tok = p;
 }
         break;
-        case 17:
+        case 10:
 #line 55 "hb-buffer-deserialize-json.rl"
         { if (unlikely (!buffer->ensure_glyphs ())) return false; }
         break;
-        case 23:
+        case 14:
 #line 56 "hb-buffer-deserialize-json.rl"
         { if (unlikely (!buffer->ensure_unicode ())) return false; }
         break;
-        case 18:
+        case 11:
 #line 58 "hb-buffer-deserialize-json.rl"
         {
         /* TODO Unescape \" and \\ if found. */
@@ -636,35 +668,35 @@ _resume:
           return false;
 }
         break;
-        case 20:
+        case 12:
 #line 66 "hb-buffer-deserialize-json.rl"
         { if (!parse_uint (tok, p, &info.codepoint)) return false; }
         break;
-        case 8:
+        case 5:
 #line 67 "hb-buffer-deserialize-json.rl"
         { if (!parse_uint (tok, p, &info.cluster )) return false; }
         break;
-        case 10:
+        case 6:
 #line 68 "hb-buffer-deserialize-json.rl"
         { if (!parse_int  (tok, p, &pos.x_offset )) return false; }
         break;
-        case 12:
+        case 7:
 #line 69 "hb-buffer-deserialize-json.rl"
         { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
         break;
-        case 3:
+        case 2:
 #line 70 "hb-buffer-deserialize-json.rl"
         { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
         break;
-        case 6:
+        case 4:
 #line 71 "hb-buffer-deserialize-json.rl"
         { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
         break;
-        case 14:
+        case 8:
 #line 72 "hb-buffer-deserialize-json.rl"
         { if (!parse_uint (tok, p, &info.mask    )) return false; }
         break;
-        case 16:
+        case 9:
 #line 51 "hb-buffer-deserialize-json.rl"
         {
         tok = p;
@@ -672,7 +704,7 @@ _resume:
 #line 55 "hb-buffer-deserialize-json.rl"
         { if (unlikely (!buffer->ensure_glyphs ())) return false; }
         break;
-        case 22:
+        case 13:
 #line 51 "hb-buffer-deserialize-json.rl"
         {
         tok = p;
@@ -680,109 +712,7 @@ _resume:
 #line 56 "hb-buffer-deserialize-json.rl"
         { if (unlikely (!buffer->ensure_unicode ())) return false; }
         break;
-        case 19:
-#line 58 "hb-buffer-deserialize-json.rl"
-        {
-        /* TODO Unescape \" and \\ if found. */
-        if (!hb_font_glyph_from_string (font,
-                                        tok+1, p - tok - 2, /* Skip "" */
-                                        &info.codepoint))
-          return false;
-}
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 21:
-#line 66 "hb-buffer-deserialize-json.rl"
-        { if (!parse_uint (tok, p, &info.codepoint)) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 9:
-#line 67 "hb-buffer-deserialize-json.rl"
-        { if (!parse_uint (tok, p, &info.cluster )) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 11:
-#line 68 "hb-buffer-deserialize-json.rl"
-        { if (!parse_int  (tok, p, &pos.x_offset )) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 13:
-#line 69 "hb-buffer-deserialize-json.rl"
-        { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 4:
-#line 70 "hb-buffer-deserialize-json.rl"
-        { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 7:
-#line 71 "hb-buffer-deserialize-json.rl"
-        { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 15:
-#line 72 "hb-buffer-deserialize-json.rl"
-        { if (!parse_uint (tok, p, &info.mask    )) return false; }
-#line 43 "hb-buffer-deserialize-json.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-#line 786 "hb-buffer-deserialize-json.hh"
+#line 689 "hb-buffer-deserialize-json.hh"
         }
 
 _again:
@@ -794,12 +724,12 @@ _again:
         _out: {}
         }
 
-#line 132 "hb-buffer-deserialize-json.rl"
+#line 136 "hb-buffer-deserialize-json.rl"
 
 
   *end_ptr = p;
 
-  return p == pe && *(p-1) != ']';
+  return p == pe;
 }
 
 #endif /* HB_BUFFER_DESERIALIZE_JSON_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-glyphs.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-glyphs.hh
index 8e526ce4e2a..78570486376 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-glyphs.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-glyphs.hh
@@ -32,287 +32,344 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-text-glyphs.hh"
+#line 33 "hb-buffer-deserialize-text-glyphs.hh"
 static const unsigned char _deserialize_text_glyphs_trans_keys[] = {
-        0u, 0u, 48u, 57u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u,
-        48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 43u, 124u, 9u, 124u, 9u, 124u,
-        9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u,
-        9u, 124u, 9u, 124u, 9u, 124u, 0
+        0u, 0u, 35u, 124u, 48u, 57u, 60u, 124u, 45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u,
+        48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 62u, 62u,
+        93u, 124u, 45u, 57u, 48u, 57u, 35u, 124u, 45u, 57u, 48u, 57u, 35u, 124u, 35u, 124u,
+        35u, 124u, 35u, 124u, 35u, 124u, 35u, 124u, 48u, 57u, 35u, 124u, 45u, 57u, 48u, 57u,
+        44u, 44u, 45u, 57u, 48u, 57u, 35u, 124u, 35u, 124u, 44u, 57u, 35u, 124u, 43u, 124u,
+        35u, 124u, 48u, 62u, 44u, 57u, 44u, 57u, 44u, 57u, 48u, 124u, 35u, 124u, 35u, 124u,
+        35u, 124u, 0
 };
 
 static const char _deserialize_text_glyphs_key_spans[] = {
-        0, 10, 13, 10, 13, 10, 10, 13,
-        10, 1, 13, 10, 14, 82, 116, 116,
-        116, 116, 116, 116, 116, 116, 116, 116,
-        116, 116, 116
+        0, 90, 10, 65, 13, 10, 1, 13,
+        10, 1, 13, 10, 1, 13, 10, 1,
+        32, 13, 10, 90, 13, 10, 90, 90,
+        90, 90, 90, 90, 10, 90, 13, 10,
+        1, 13, 10, 90, 90, 14, 90, 82,
+        90, 15, 14, 14, 14, 77, 90, 90,
+        90
 };
 
 static const short _deserialize_text_glyphs_index_offsets[] = {
-        0, 0, 11, 25, 36, 50, 61, 72,
-        86, 97, 99, 113, 124, 139, 222, 339,
-        456, 573, 690, 807, 924, 1041, 1158, 1275,
-        1392, 1509, 1626
+        0, 0, 91, 102, 168, 182, 193, 195,
+        209, 220, 222, 236, 247, 249, 263, 274,
+        276, 309, 323, 334, 425, 439, 450, 541,
+        632, 723, 814, 905, 996, 1007, 1098, 1112,
+        1123, 1125, 1139, 1150, 1241, 1332, 1347, 1438,
+        1521, 1612, 1628, 1643, 1658, 1673, 1751, 1842,
+        1933
 };
 
 static const char _deserialize_text_glyphs_indicies[] = {
-        0, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 1, 3, 1, 1, 4,
-        5, 5, 5, 5, 5, 5, 5, 5,
-        5, 1, 6, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 1, 8, 1, 1,
-        9, 10, 10, 10, 10, 10, 10, 10,
-        10, 10, 1, 11, 12, 12, 12, 12,
-        12, 12, 12, 12, 12, 1, 13, 14,
-        14, 14, 14, 14, 14, 14, 14, 14,
-        1, 15, 1, 1, 16, 17, 17, 17,
-        17, 17, 17, 17, 17, 17, 1, 18,
+        1, 0, 0, 0, 0, 0, 0,
+        0, 2, 3, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 4, 5, 0, 0, 6, 0,
+        0, 0, 0, 0, 0, 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, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 8, 0, 9, 10, 10, 10,
+        10, 10, 10, 10, 10, 10, 3, 11,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        12, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 12,
+        3, 13, 3, 3, 14, 15, 15, 15,
+        15, 15, 15, 15, 15, 15, 3, 14,
+        15, 15, 15, 15, 15, 15, 15, 15,
+        15, 3, 16, 3, 17, 3, 3, 18,
         19, 19, 19, 19, 19, 19, 19, 19,
-        19, 1, 20, 1, 21, 1, 1, 22,
-        23, 23, 23, 23, 23, 23, 23, 23,
-        23, 1, 24, 25, 25, 25, 25, 25,
-        25, 25, 25, 25, 1, 20, 1, 1,
-        1, 19, 19, 19, 19, 19, 19, 19,
-        19, 19, 19, 1, 26, 26, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 26, 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, 1, 1, 26, 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,
-        1, 1, 1, 1, 1, 26, 1, 28,
-        28, 28, 28, 28, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 28, 27,
-        27, 29, 27, 27, 27, 27, 27, 27,
-        27, 30, 1, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 31, 27, 27, 32, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 33, 1, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 27, 27, 27, 27, 27, 27,
-        27, 27, 28, 27, 34, 34, 34, 34,
-        34, 26, 26, 26, 26, 26, 26, 26,
-        26, 26, 26, 26, 26, 26, 26, 26,
-        26, 26, 26, 34, 26, 26, 35, 26,
-        26, 26, 26, 26, 26, 26, 36, 1,
-        26, 26, 26, 26, 26, 26, 26, 26,
-        26, 26, 26, 26, 26, 26, 26, 26,
-        37, 26, 26, 38, 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, 39,
-        1, 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, 40,
-        26, 41, 41, 41, 41, 41, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        41, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 44, 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, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 45, 45, 45, 45, 45, 45,
-        45, 45, 45, 45, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 42, 1,
-        46, 46, 46, 46, 46, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 46,
-        1, 1, 47, 1, 1, 1, 1, 1,
-        1, 1, 1, 48, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 49, 1, 50, 50, 50,
-        50, 50, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 50, 1, 1, 51,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        52, 1, 50, 50, 50, 50, 50, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 50, 1, 1, 51, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 12, 12, 12, 12, 12, 12, 12,
-        12, 12, 12, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 52, 1, 46,
-        46, 46, 46, 46, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 46, 1,
-        1, 47, 1, 1, 1, 1, 1, 1,
-        1, 1, 48, 1, 1, 1, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 49, 1, 53, 53, 53, 53,
-        53, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 53, 1, 1, 54, 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, 56, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 57,
-        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, 59, 1, 1, 1, 1,
-        1, 1, 1, 60, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 61, 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,
-        59, 1, 1, 1, 1, 1, 1, 1,
-        60, 1, 1, 1, 1, 25, 25, 25,
-        25, 25, 25, 25, 25, 25, 25, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 61, 1, 53, 53, 53, 53, 53,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 53, 1, 1, 54, 1, 1,
-        1, 1, 1, 1, 1, 55, 1, 1,
-        1, 1, 62, 62, 62, 62, 62, 62,
-        62, 62, 62, 62, 1, 1, 1, 1,
-        1, 1, 56, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 57, 1,
-        0
+        19, 3, 18, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 3, 20, 3, 21,
+        3, 3, 22, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 3, 22, 23, 23,
+        23, 23, 23, 23, 23, 23, 23, 3,
+        24, 3, 25, 3, 3, 26, 27, 27,
+        27, 27, 27, 27, 27, 27, 27, 3,
+        26, 27, 27, 27, 27, 27, 27, 27,
+        27, 27, 3, 28, 3, 29, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 29, 3, 30, 3,
+        3, 31, 32, 32, 32, 32, 32, 32,
+        32, 32, 32, 3, 33, 34, 34, 34,
+        34, 34, 34, 34, 34, 34, 3, 35,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        36, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        37, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 38, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        38, 3, 39, 3, 3, 40, 41, 41,
+        41, 41, 41, 41, 41, 41, 41, 3,
+        42, 43, 43, 43, 43, 43, 43, 43,
+        43, 43, 3, 44, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 45, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 46, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 46, 3, 44, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 43, 43, 43, 43, 43,
+        43, 43, 43, 43, 43, 3, 3, 45,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        46, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 46,
+        3, 35, 3, 3, 3, 3, 3, 3,
+        3, 3, 36, 3, 3, 3, 34, 34,
+        34, 34, 34, 34, 34, 34, 34, 34,
+        3, 3, 37, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 38, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 38, 3, 1, 0, 0, 0,
+        0, 0, 0, 0, 2, 3, 47, 0,
+        0, 48, 49, 49, 49, 49, 49, 49,
+        49, 49, 49, 0, 0, 4, 5, 0,
+        0, 6, 0, 0, 0, 0, 0, 0,
+        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, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 8, 0, 1,
+        0, 0, 0, 0, 0, 0, 0, 2,
+        3, 0, 0, 0, 48, 49, 49, 49,
+        49, 49, 49, 49, 49, 49, 0, 0,
+        4, 5, 0, 0, 6, 0, 0, 0,
+        0, 0, 0, 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, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        8, 0, 1, 0, 0, 0, 0, 0,
+        0, 0, 2, 16, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 4, 5, 0, 0, 6,
+        0, 0, 0, 0, 0, 0, 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,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 8, 0, 50, 51, 51,
+        51, 51, 51, 51, 51, 51, 51, 3,
+        52, 3, 3, 3, 3, 3, 3, 3,
+        53, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 54, 3, 3, 3, 55, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 56, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 56, 3, 57, 3, 3, 58, 59,
+        59, 59, 59, 59, 59, 59, 59, 59,
+        3, 60, 61, 61, 61, 61, 61, 61,
+        61, 61, 61, 3, 62, 3, 63, 3,
+        3, 64, 65, 65, 65, 65, 65, 65,
+        65, 65, 65, 3, 66, 67, 67, 67,
+        67, 67, 67, 67, 67, 67, 3, 68,
+        3, 3, 3, 3, 3, 3, 3, 69,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        70, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 71, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        71, 3, 68, 3, 3, 3, 3, 3,
+        3, 3, 69, 3, 3, 3, 3, 67,
+        67, 67, 67, 67, 67, 67, 67, 67,
+        67, 3, 3, 70, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 71, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 71, 3, 62, 3, 3,
+        3, 61, 61, 61, 61, 61, 61, 61,
+        61, 61, 61, 3, 52, 3, 3, 3,
+        3, 3, 3, 3, 53, 3, 3, 3,
+        3, 72, 72, 72, 72, 72, 72, 72,
+        72, 72, 72, 3, 3, 54, 3, 3,
+        3, 55, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 56, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 56, 3, 0,
+        0, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 0, 3, 3, 0, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        0, 0, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        0, 3, 1, 0, 0, 0, 0, 0,
+        0, 0, 2, 16, 0, 0, 0, 49,
+        49, 49, 49, 49, 49, 49, 49, 49,
+        49, 0, 0, 4, 5, 0, 0, 6,
+        0, 0, 0, 0, 0, 0, 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,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 8, 0, 27, 27, 27,
+        27, 27, 27, 27, 27, 27, 27, 3,
+        3, 3, 3, 28, 3, 24, 3, 3,
+        3, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 3, 20, 3, 3, 3,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 3, 16, 3, 3, 3, 15,
+        15, 15, 15, 15, 15, 15, 15, 15,
+        15, 3, 73, 73, 73, 73, 73, 73,
+        73, 73, 73, 73, 3, 3, 11, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 12,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        3, 3, 3, 3, 3, 3, 12, 3,
+        75, 74, 74, 74, 74, 74, 74, 74,
+        76, 3, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 77, 78, 74, 74, 79, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        80, 81, 82, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 82, 74, 84, 83, 83, 83, 83,
+        83, 83, 83, 85, 3, 83, 83, 83,
+        83, 83, 83, 83, 83, 83, 83, 83,
+        83, 83, 83, 83, 86, 87, 83, 83,
+        88, 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, 89, 90, 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, 90, 83, 91, 74,
+        74, 74, 74, 74, 74, 74, 92, 3,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 93,
+        94, 74, 74, 95, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 81,
+        96, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 74,
+        74, 74, 74, 74, 74, 74, 74, 96,
+        74, 0
 };
 
 static const char _deserialize_text_glyphs_trans_targs[] = {
-        16, 0, 18, 3, 19, 22, 19, 22,
-        5, 20, 21, 20, 21, 23, 26, 8,
-        9, 12, 9, 12, 10, 11, 24, 25,
-        24, 25, 15, 15, 14, 1, 2, 6,
-        7, 13, 15, 1, 2, 6, 7, 13,
-        14, 17, 14, 17, 14, 18, 17, 1,
-        4, 14, 17, 1, 14, 17, 1, 2,
-        7, 14, 17, 1, 2, 14, 26
+        1, 2, 17, 0, 25, 28, 30, 39,
+        47, 3, 45, 4, 47, 5, 6, 44,
+        7, 8, 9, 43, 10, 11, 12, 42,
+        13, 14, 15, 41, 16, 47, 18, 19,
+        24, 19, 24, 2, 20, 4, 47, 21,
+        22, 23, 22, 23, 2, 4, 47, 26,
+        27, 40, 29, 38, 2, 17, 4, 30,
+        47, 31, 32, 37, 32, 37, 33, 34,
+        35, 36, 35, 36, 2, 17, 4, 47,
+        38, 45, 1, 2, 17, 25, 28, 30,
+        48, 39, 47, 1, 2, 17, 25, 28,
+        30, 39, 47, 2, 17, 25, 28, 30,
+        47
 };
 
 static const char _deserialize_text_glyphs_trans_actions[] = {
-        1, 0, 1, 1, 1, 1, 0, 0,
-        1, 1, 1, 0, 0, 1, 1, 1,
-        1, 1, 0, 0, 2, 1, 1, 1,
-        0, 0, 0, 4, 3, 5, 5, 5,
-        5, 4, 6, 7, 7, 7, 7, 0,
-        6, 8, 8, 0, 0, 0, 9, 10,
-        10, 9, 11, 12, 11, 13, 14, 14,
-        14, 13, 15, 16, 16, 15, 0
+        0, 1, 1, 0, 1, 1, 1, 0,
+        1, 2, 2, 3, 3, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 2, 2,
+        2, 0, 0, 4, 4, 4, 4, 2,
+        2, 2, 0, 0, 5, 5, 5, 0,
+        0, 0, 2, 2, 6, 6, 6, 6,
+        6, 2, 2, 2, 0, 0, 7, 2,
+        2, 2, 0, 0, 8, 8, 8, 8,
+        0, 0, 9, 10, 10, 10, 10, 10,
+        9, 9, 10, 12, 13, 13, 13, 13,
+        13, 12, 13, 14, 14, 14, 14, 14,
+        14
 };
 
 static const char _deserialize_text_glyphs_eof_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 3, 6,
-        8, 0, 8, 9, 11, 11, 9, 13,
-        15, 15, 13
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 11,
+        0
 };
 
-static const int deserialize_text_glyphs_start = 14;
-static const int deserialize_text_glyphs_first_final = 14;
+static const int deserialize_text_glyphs_start = 46;
+static const int deserialize_text_glyphs_first_final = 46;
 static const int deserialize_text_glyphs_error = 0;
 
-static const int deserialize_text_glyphs_en_main = 14;
+static const int deserialize_text_glyphs_en_main = 46;
 
 
-#line 98 "hb-buffer-deserialize-text-glyphs.rl"
+#line 101 "hb-buffer-deserialize-text-glyphs.rl"
 
 
 static hb_bool_t
@@ -322,39 +379,22 @@ _hb_buffer_deserialize_text_glyphs (hb_buffer_t *buffer,
                                     const char **end_ptr,
                                     hb_font_t *font)
 {
-  const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
+  const char *p = buf, *pe = buf + buf_len, *eof = pe;
 
   /* 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 *end = strchr ((char *) p, ']');
-  if (end)
-    pe = eof = end;
-  else
-  {
-    end = strrchr ((char *) p, '|');
-    if (end)
-      pe = eof = end;
-    else
-      pe = eof = p;
-  }
-
   const char *tok = nullptr;
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
 
-#line 353 "hb-buffer-deserialize-text-glyphs.hh"
+#line 386 "hb-buffer-deserialize-text-glyphs.hh"
         {
         cs = deserialize_text_glyphs_start;
         }
 
-#line 358 "hb-buffer-deserialize-text-glyphs.hh"
+#line 389 "hb-buffer-deserialize-text-glyphs.hh"
         {
         int _slen;
         int _trans;
@@ -379,14 +419,14 @@ _resume:
                 goto _again;
 
         switch ( _deserialize_text_glyphs_trans_actions[_trans] ) {
-        case 1:
-#line 51 "hb-buffer-deserialize-text-glyphs.rl"
+        case 2:
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
         tok = p;
 }
         break;
-        case 7:
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
+        case 1:
+#line 54 "hb-buffer-deserialize-text-glyphs.rl"
         {
         /* TODO Unescape delimiters. */
         if (!hb_font_glyph_from_string (font,
@@ -395,162 +435,124 @@ _resume:
           return false;
 }
         break;
-        case 14:
-#line 63 "hb-buffer-deserialize-text-glyphs.rl"
+        case 6:
+#line 62 "hb-buffer-deserialize-text-glyphs.rl"
         { if (!parse_uint (tok, p, &info.cluster )) return false; }
         break;
-        case 2:
-#line 64 "hb-buffer-deserialize-text-glyphs.rl"
+        case 7:
+#line 63 "hb-buffer-deserialize-text-glyphs.rl"
         { if (!parse_int  (tok, p, &pos.x_offset )) return false; }
         break;
-        case 16:
-#line 65 "hb-buffer-deserialize-text-glyphs.rl"
+        case 8:
+#line 64 "hb-buffer-deserialize-text-glyphs.rl"
         { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
         break;
-        case 10:
-#line 66 "hb-buffer-deserialize-text-glyphs.rl"
+        case 4:
+#line 65 "hb-buffer-deserialize-text-glyphs.rl"
         { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
         break;
-        case 12:
-#line 67 "hb-buffer-deserialize-text-glyphs.rl"
+        case 5:
+#line 66 "hb-buffer-deserialize-text-glyphs.rl"
         { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
         break;
-        case 4:
+        case 3:
+#line 67 "hb-buffer-deserialize-text-glyphs.rl"
+        { if (!parse_uint (tok, p, &info.mask    )) return false; }
+        break;
+        case 9:
 #line 38 "hb-buffer-deserialize-text-glyphs.rl"
         {
         hb_memset (&info, 0, sizeof (info));
         hb_memset (&pos , 0, sizeof (pos ));
 }
-#line 51 "hb-buffer-deserialize-text-glyphs.rl"
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
         tok = p;
 }
         break;
-        case 6:
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
+        case 10:
+#line 38 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        /* TODO Unescape delimiters. */
-        if (!hb_font_glyph_from_string (font,
-                                        tok, p - tok,
-                                        &info.codepoint))
-          return false;
+        hb_memset (&info, 0, sizeof (info));
+        hb_memset (&pos , 0, sizeof (pos ));
 }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
+        tok = p;
 }
-        break;
-        case 13:
-#line 63 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_uint (tok, p, &info.cluster )) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
+#line 54 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
+        /* TODO Unescape delimiters. */
+        if (!hb_font_glyph_from_string (font,
+                                        tok, p - tok,
+                                        &info.codepoint))
           return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
 }
         break;
-        case 15:
-#line 65 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
+        case 12:
 #line 43 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
+        buffer->add_info_and_pos (info, pos);
         if (unlikely (!buffer->successful))
           return false;
-        buffer->pos[buffer->len - 1] = pos;
         *end_ptr = p;
 }
-        break;
-        case 9:
-#line 66 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
+#line 38 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
+        hb_memset (&info, 0, sizeof (info));
+        hb_memset (&pos , 0, sizeof (pos ));
 }
-        break;
-        case 11:
-#line 67 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
+        tok = p;
 }
         break;
-        case 8:
-#line 68 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_uint (tok, p, &info.mask    )) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
+        case 14:
+#line 54 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
+        /* TODO Unescape delimiters. */
+        if (!hb_font_glyph_from_string (font,
+                                        tok, p - tok,
+                                        &info.codepoint))
           return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
 }
-        break;
-        case 5:
 #line 38 "hb-buffer-deserialize-text-glyphs.rl"
         {
         hb_memset (&info, 0, sizeof (info));
         hb_memset (&pos , 0, sizeof (pos ));
 }
-#line 51 "hb-buffer-deserialize-text-glyphs.rl"
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
         tok = p;
 }
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
+        break;
+        case 13:
+#line 43 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        /* TODO Unescape delimiters. */
-        if (!hb_font_glyph_from_string (font,
-                                        tok, p - tok,
-                                        &info.codepoint))
+        buffer->add_info_and_pos (info, pos);
+        if (unlikely (!buffer->successful))
           return false;
+        *end_ptr = p;
 }
-        break;
-        case 3:
 #line 38 "hb-buffer-deserialize-text-glyphs.rl"
         {
         hb_memset (&info, 0, sizeof (info));
         hb_memset (&pos , 0, sizeof (pos ));
 }
-#line 51 "hb-buffer-deserialize-text-glyphs.rl"
+#line 50 "hb-buffer-deserialize-text-glyphs.rl"
         {
         tok = p;
 }
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
+#line 54 "hb-buffer-deserialize-text-glyphs.rl"
         {
         /* TODO Unescape delimiters. */
         if (!hb_font_glyph_from_string (font,
                                         tok, p - tok,
                                         &info.codepoint))
           return false;
-}
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
 }
         break;
-#line 554 "hb-buffer-deserialize-text-glyphs.hh"
+#line 523 "hb-buffer-deserialize-text-glyphs.hh"
         }
 
 _again:
@@ -562,127 +564,24 @@ _again:
         if ( p == eof )
         {
         switch ( _deserialize_text_glyphs_eof_actions[cs] ) {
-        case 6:
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        /* TODO Unescape delimiters. */
-        if (!hb_font_glyph_from_string (font,
-                                        tok, p - tok,
-                                        &info.codepoint))
-          return false;
-}
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 13:
-#line 63 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_uint (tok, p, &info.cluster )) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 15:
-#line 65 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.y_offset )) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 9:
-#line 66 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.x_advance)) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
         case 11:
-#line 67 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_int  (tok, p, &pos.y_advance)) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 8:
-#line 68 "hb-buffer-deserialize-text-glyphs.rl"
-        { if (!parse_uint (tok, p, &info.mask    )) return false; }
-#line 43 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 3:
-#line 38 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        hb_memset (&info, 0, sizeof (info));
-        hb_memset (&pos , 0, sizeof (pos ));
-}
-#line 51 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        tok = p;
-}
-#line 55 "hb-buffer-deserialize-text-glyphs.rl"
-        {
-        /* TODO Unescape delimiters. */
-        if (!hb_font_glyph_from_string (font,
-                                        tok, p - tok,
-                                        &info.codepoint))
-          return false;
-}
 #line 43 "hb-buffer-deserialize-text-glyphs.rl"
         {
-        buffer->add_info (info);
+        buffer->add_info_and_pos (info, pos);
         if (unlikely (!buffer->successful))
           return false;
-        buffer->pos[buffer->len - 1] = pos;
         *end_ptr = p;
 }
         break;
-#line 671 "hb-buffer-deserialize-text-glyphs.hh"
+#line 542 "hb-buffer-deserialize-text-glyphs.hh"
         }
         }
 
         _out: {}
         }
 
-#line 136 "hb-buffer-deserialize-text-glyphs.rl"
-
+#line 122 "hb-buffer-deserialize-text-glyphs.rl"
 
-  if (pe < orig_pe && *pe == ']')
-  {
-    pe++;
-    if (p == pe)
-      p++;
-  }
 
   *end_ptr = p;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
index 6a1706ccb72..9e21beebd34 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
@@ -34,135 +34,106 @@
 
 #line 36 "hb-buffer-deserialize-text-unicode.hh"
 static const unsigned char _deserialize_text_unicode_trans_keys[] = {
-        0u, 0u, 9u, 117u, 43u, 102u, 48u, 102u, 48u, 57u, 9u, 124u, 9u, 124u, 9u, 124u,
-        9u, 124u, 0
+        0u, 0u, 43u, 102u, 48u, 102u, 48u, 124u, 48u, 57u, 62u, 124u, 48u, 124u, 60u, 117u,
+        85u, 117u, 85u, 117u, 0
 };
 
 static const char _deserialize_text_unicode_key_spans[] = {
-        0, 109, 60, 55, 10, 116, 116, 116,
-        116
+        0, 60, 55, 77, 10, 63, 77, 58,
+        33, 33
 };
 
 static const short _deserialize_text_unicode_index_offsets[] = {
-        0, 0, 110, 171, 227, 238, 355, 472,
-        589
+        0, 0, 61, 117, 195, 206, 270, 348,
+        407, 441
 };
 
 static const char _deserialize_text_unicode_indicies[] = {
-        0, 0, 0, 0, 0, 1, 1,
+        0, 1, 1, 1, 1, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2,
+        1, 1, 1, 1, 1, 1, 1, 2,
+        2, 2, 2, 2, 2, 1, 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, 2,
+        2, 2, 2, 2, 2, 1, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2,
+        1, 1, 1, 1, 1, 1, 1, 2,
+        2, 2, 2, 2, 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, 2,
+        2, 2, 2, 2, 2, 1, 3, 3,
+        3, 3, 3, 3, 3, 3, 3, 3,
+        1, 1, 1, 4, 5, 1, 1, 3,
+        3, 3, 3, 3, 3, 1, 1, 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,
+        3, 3, 3, 3, 3, 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, 5, 1, 6, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 1, 8,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 2, 1, 3,
-        1, 1, 1, 1, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1, 1, 1, 4, 4, 4,
-        4, 4, 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, 4, 4, 4,
-        4, 4, 4, 1, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1, 1, 1, 4, 4, 4,
-        4, 4, 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, 4, 4, 4,
-        4, 4, 4, 1, 5, 6, 6, 6,
-        6, 6, 6, 6, 6, 6, 1, 7,
-        7, 7, 7, 7, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 7, 1,
+        1, 1, 1, 1, 1, 8, 1, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 1, 1, 1, 1, 8, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8,
-        1, 1, 1, 9, 1, 1, 1, 8,
-        8, 8, 8, 8, 8, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 8,
-        8, 8, 8, 8, 8, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 10, 1, 11, 11, 11, 11,
-        11, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 11, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 0,
-        1, 12, 12, 12, 12, 12, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        12, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 8, 1, 10, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 11, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 13, 1, 12, 12,
-        12, 12, 12, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 12, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 14, 14, 14,
-        14, 14, 14, 14, 14, 14, 14, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 11, 1,
+        11, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        11, 1, 12, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 13, 1, 0
+        1, 1, 12, 1, 0
 };
 
 static const char _deserialize_text_unicode_trans_targs[] = {
-        1, 0, 2, 3, 5, 7, 8, 6,
-        5, 4, 1, 6, 6, 1, 8
+        2, 0, 3, 3, 4, 9, 5, 6,
+        9, 6, 8, 1, 1
 };
 
 static const char _deserialize_text_unicode_trans_actions[] = {
-        0, 0, 1, 0, 2, 2, 2, 3,
-        0, 4, 3, 0, 5, 5, 0
+        0, 0, 1, 0, 2, 2, 1, 1,
+        3, 0, 0, 4, 6
 };
 
 static const char _deserialize_text_unicode_eof_actions[] = {
-        0, 0, 0, 0, 0, 3, 0, 5,
-        5
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 5
 };
 
-static const int deserialize_text_unicode_start = 1;
-static const int deserialize_text_unicode_first_final = 5;
+static const int deserialize_text_unicode_start = 7;
+static const int deserialize_text_unicode_first_final = 7;
 static const int deserialize_text_unicode_error = 0;
 
-static const int deserialize_text_unicode_en_main = 1;
+static const int deserialize_text_unicode_en_main = 7;
 
 
-#line 79 "hb-buffer-deserialize-text-unicode.rl"
+#line 80 "hb-buffer-deserialize-text-unicode.rl"
 
 
 static hb_bool_t
@@ -172,37 +143,19 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
                                      const char **end_ptr,
                                      hb_font_t *font)
 {
-  const char *p = buf, *pe = buf + buf_len, *eof = pe, *orig_pe = pe;
-
-  while (p < pe && ISSPACE (*p))
-    p++;
-  if (p < pe && *p == (buffer->len ? '|' : '<'))
-    *end_ptr = ++p;
-
-  const char *end = strchr ((char *) p, '>');
-  if (end)
-    pe = eof = end;
-  else
-  {
-    end = strrchr ((char *) p, '|');
-    if (end)
-      pe = eof = end;
-    else
-      pe = eof = p;
-  }
-
+  const char *p = buf, *pe = buf + buf_len, *eof = pe;
 
   const char *tok = nullptr;
   int cs;
   hb_glyph_info_t info = {0};
   const hb_glyph_position_t pos = {0};
 
-#line 201 "hb-buffer-deserialize-text-unicode.hh"
+#line 154 "hb-buffer-deserialize-text-unicode.hh"
         {
         cs = deserialize_text_unicode_start;
         }
 
-#line 206 "hb-buffer-deserialize-text-unicode.hh"
+#line 159 "hb-buffer-deserialize-text-unicode.hh"
         {
         int _slen;
         int _trans;
@@ -227,38 +180,27 @@ _resume:
                 goto _again;
 
         switch ( _deserialize_text_unicode_trans_actions[_trans] ) {
-        case 1:
+        case 4:
 #line 38 "hb-buffer-deserialize-text-unicode.rl"
         {
         hb_memset (&info, 0, sizeof (info));
 }
         break;
-        case 2:
+        case 1:
 #line 51 "hb-buffer-deserialize-text-unicode.rl"
         {
         tok = p;
 }
         break;
-        case 4:
+        case 2:
 #line 55 "hb-buffer-deserialize-text-unicode.rl"
         {if (!parse_hex (tok, p, &info.codepoint )) return false; }
         break;
         case 3:
-#line 55 "hb-buffer-deserialize-text-unicode.rl"
-        {if (!parse_hex (tok, p, &info.codepoint )) return false; }
-#line 42 "hb-buffer-deserialize-text-unicode.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        if (buffer->have_positions)
-          buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
-        case 5:
 #line 57 "hb-buffer-deserialize-text-unicode.rl"
         { if (!parse_uint (tok, p, &info.cluster )) return false; }
+        break;
+        case 6:
 #line 42 "hb-buffer-deserialize-text-unicode.rl"
         {
         buffer->add_info (info);
@@ -267,9 +209,13 @@ _resume:
         if (buffer->have_positions)
           buffer->pos[buffer->len - 1] = pos;
         *end_ptr = p;
+}
+#line 38 "hb-buffer-deserialize-text-unicode.rl"
+        {
+        hb_memset (&info, 0, sizeof (info));
 }
         break;
-#line 273 "hb-buffer-deserialize-text-unicode.hh"
+#line 219 "hb-buffer-deserialize-text-unicode.hh"
         }
 
 _again:
@@ -281,22 +227,7 @@ _again:
         if ( p == eof )
         {
         switch ( _deserialize_text_unicode_eof_actions[cs] ) {
-        case 3:
-#line 55 "hb-buffer-deserialize-text-unicode.rl"
-        {if (!parse_hex (tok, p, &info.codepoint )) return false; }
-#line 42 "hb-buffer-deserialize-text-unicode.rl"
-        {
-        buffer->add_info (info);
-        if (unlikely (!buffer->successful))
-          return false;
-        if (buffer->have_positions)
-          buffer->pos[buffer->len - 1] = pos;
-        *end_ptr = p;
-}
-        break;
         case 5:
-#line 57 "hb-buffer-deserialize-text-unicode.rl"
-        { if (!parse_uint (tok, p, &info.cluster )) return false; }
 #line 42 "hb-buffer-deserialize-text-unicode.rl"
         {
         buffer->add_info (info);
@@ -307,22 +238,15 @@ _again:
         *end_ptr = p;
 }
         break;
-#line 311 "hb-buffer-deserialize-text-unicode.hh"
+#line 242 "hb-buffer-deserialize-text-unicode.hh"
         }
         }
 
         _out: {}
         }
 
-#line 115 "hb-buffer-deserialize-text-unicode.rl"
-
+#line 98 "hb-buffer-deserialize-text-unicode.rl"
 
-  if (pe < orig_pe && *pe == '>')
-  {
-    pe++;
-    if (p == pe)
-      p++;
-  }
 
   *end_ptr = p;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
index bb2cddcb655..763172818c4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
@@ -169,11 +169,13 @@ _hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer,
     if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS)
     {
       hb_glyph_extents_t extents;
-      hb_font_get_glyph_extents(font, info[i].codepoint, &extents);
-      p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"xb\":%d,\"yb\":%d",
-                                extents.x_bearing, extents.y_bearing));
-      p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"w\":%d,\"h\":%d",
-                                extents.width, extents.height));
+      if (hb_font_get_glyph_extents(font, info[i].codepoint, &extents))
+      {
+        p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"xb\":%d,\"yb\":%d",
+                                  extents.x_bearing, extents.y_bearing));
+        p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"w\":%d,\"h\":%d",
+                                  extents.width, extents.height));
+      }
     }
 
     *p++ = '}';
@@ -318,8 +320,8 @@ _hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer,
     if (flags & HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS)
     {
       hb_glyph_extents_t extents;
-      hb_font_get_glyph_extents(font, info[i].codepoint, &extents);
-      p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "<%d,%d,%d,%d>", extents.x_bearing, extents.y_bearing, extents.width, extents.height));
+      if (hb_font_get_glyph_extents(font, info[i].codepoint, &extents))
+        p += hb_max (0, snprintf (p, ARRAY_LENGTH (b) - (p - b), "<%d,%d,%d,%d>", extents.x_bearing, extents.y_bearing, extents.width, extents.height));
     }
 
     if (i == end-1) {
@@ -737,8 +739,7 @@ parse_hex (const char *pp, const char *end, uint32_t *pv)
  * Deserializes glyphs @buffer from textual representation in the format
  * produced by hb_buffer_serialize_glyphs().
  *
- * Return value: `true` if parse was successful, `false` if an error
- * occurred.
+ * Return value: `true` if the full string was parsed, `false` otherwise.
  *
  * Since: 0.9.7
  **/
@@ -810,8 +811,7 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
  * Deserializes Unicode @buffer from textual representation in the format
  * produced by hb_buffer_serialize_unicode().
  *
- * Return value: `true` if parse was successful, `false` if an error
- * occurred.
+ * Return value: `true` if the full string was parsed, `false` otherwise.
  *
  * Since: 2.7.3
  **/
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 3a4c9c9f317..56299d9b7e0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
@@ -63,23 +63,24 @@ static bool
 buffer_verify_monotone (hb_buffer_t *buffer,
                         hb_font_t   *font)
 {
-  /* Check that clusters are monotone. */
-  if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES ||
-      buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS)
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (buffer->cluster_level))
   {
-    bool is_forward = HB_DIRECTION_IS_FORWARD (hb_buffer_get_direction (buffer));
+    /* Cannot perform this check without monotone clusters. */
+    return true;
+  }
 
-    unsigned int num_glyphs;
-    hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, &num_glyphs);
+  bool is_forward = HB_DIRECTION_IS_FORWARD (hb_buffer_get_direction (buffer));
 
-    for (unsigned int i = 1; i < num_glyphs; i++)
-      if (info[i-1].cluster != info[i].cluster &&
-          (info[i-1].cluster < info[i].cluster) != is_forward)
-      {
-        buffer_verify_error (buffer, font, BUFFER_VERIFY_ERROR "clusters are not monotone.");
-        return false;
-      }
-  }
+  unsigned int num_glyphs;
+  hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, &num_glyphs);
+
+  for (unsigned int i = 1; i < num_glyphs; i++)
+    if (info[i-1].cluster != info[i].cluster &&
+        (info[i-1].cluster < info[i].cluster) != is_forward)
+    {
+      buffer_verify_error (buffer, font, BUFFER_VERIFY_ERROR "clusters are not monotone.");
+      return false;
+    }
 
   return true;
 }
@@ -92,8 +93,7 @@ buffer_verify_unsafe_to_break (hb_buffer_t  *buffer,
                                unsigned int        num_features,
                                const char * const *shapers)
 {
-  if (buffer->cluster_level != HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES &&
-      buffer->cluster_level != HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS)
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (buffer->cluster_level))
   {
     /* Cannot perform this check without monotone clusters. */
     return true;
@@ -207,8 +207,7 @@ buffer_verify_unsafe_to_concat (hb_buffer_t        *buffer,
                                 unsigned int        num_features,
                                 const char * const *shapers)
 {
-  if (buffer->cluster_level != HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES &&
-      buffer->cluster_level != HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS)
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (buffer->cluster_level))
   {
     /* Cannot perform this check without monotone clusters. */
     return true;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
index 72970c9c2f7..c0600fd839b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
@@ -370,6 +370,18 @@ hb_buffer_t::add_info (const hb_glyph_info_t &glyph_info)
 
   len++;
 }
+void
+hb_buffer_t::add_info_and_pos (const hb_glyph_info_t &glyph_info,
+                               const hb_glyph_position_t &glyph_pos)
+{
+  if (unlikely (!ensure (len + 1))) return;
+
+  info[len] = glyph_info;
+  assert (have_positions);
+  pos[len] = glyph_pos;
+
+  len++;
+}
 
 
 void
@@ -518,7 +530,7 @@ void
 hb_buffer_t::merge_clusters_impl (unsigned int start,
                                   unsigned int end)
 {
-  if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS)
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
   {
     unsafe_to_break (start, end);
     return;
@@ -551,7 +563,7 @@ void
 hb_buffer_t::merge_out_clusters (unsigned int start,
                                  unsigned int end)
 {
-  if (cluster_level == HB_BUFFER_CLUSTER_LEVEL_CHARACTERS)
+  if (!HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE (cluster_level))
     return;
 
   if (unlikely (end - start < 2))
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.h b/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
index d2258634ff4..332001ef171 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
@@ -422,6 +422,7 @@ hb_buffer_get_flags (const hb_buffer_t *buffer);
  * @HB_BUFFER_CLUSTER_LEVEL_CHARACTERS: Don't group cluster values.
  * @HB_BUFFER_CLUSTER_LEVEL_DEFAULT: Default cluster level,
  *   equal to @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES.
+ * @HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES: Only group clusters, but don't enforce monotone order.
  *
  * Data type for holding HarfBuzz's clustering behavior options. The cluster level
  * dictates one aspect of how HarfBuzz will treat non-base characters
@@ -429,11 +430,26 @@ hb_buffer_get_flags (const hb_buffer_t *buffer);
  *
  * In @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES, non-base
  * characters are merged into the cluster of the base character that precedes them.
+ * There is also cluster merging every time the clusters will otherwise become non-monotone.
  *
  * In @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS, non-base characters are initially
  * assigned their own cluster values, which are not merged into preceding base
  * clusters. This allows HarfBuzz to perform additional operations like reorder
- * sequences of adjacent marks.
+ * sequences of adjacent marks. The output is still monotone, but the cluster
+ * values are more granular.
+ *
+ * In @HB_BUFFER_CLUSTER_LEVEL_CHARACTERS, non-base characters are assigned their
+ * own cluster values, which are not merged into preceding base clusters. Moreover,
+ * the cluster values are not merged into monotone order. This is the most granular
+ * cluster level, and it is useful for clients that need to know the exact cluster
+ * values of each character, but is harder to use for clients, since clusters
+ * might appear in any order.
+ *
+ * In @HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES, non-base characters are merged into the
+ * cluster of the base character that precedes them. This is similar to the Unicode
+ * Grapheme Cluster algorithm, but it is not exactly the same. The output is
+ * not forced to be monotone. This is useful for clients that want to use HarfBuzz
+ * as a cheap implementation of the Unicode Grapheme Cluster algorithm.
  *
  * @HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES is the default, because it maintains
  * backward compatibility with older versions of HarfBuzz. New client programs that
@@ -446,9 +462,52 @@ typedef enum {
   HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES    = 0,
   HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS   = 1,
   HB_BUFFER_CLUSTER_LEVEL_CHARACTERS            = 2,
+  HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES             = 3,
   HB_BUFFER_CLUSTER_LEVEL_DEFAULT = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES
 } hb_buffer_cluster_level_t;
 
+/**
+ * HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE:
+ * @level: #hb_buffer_cluster_level_t to test
+ *
+ * Tests whether a cluster level groups cluster values into monotone order.
+ * Requires that the level be valid.
+ *
+ * Since: 11.0.0
+ */
+#define HB_BUFFER_CLUSTER_LEVEL_IS_MONOTONE(level) \
+        ((bool) ((1u << (unsigned) (level)) & \
+                 ((1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES) | \
+                  (1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS))))
+
+/**
+ * HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES:
+ * @level: #hb_buffer_cluster_level_t to test
+ *
+ * Tests whether a cluster level groups cluster values by graphemes. Requires
+ * that the level be valid.
+ *
+ * Since: 11.0.0
+ */
+#define HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES(level) \
+        ((bool) ((1u << (unsigned) (level)) & \
+                 ((1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES) | \
+                  (1u << HB_BUFFER_CLUSTER_LEVEL_GRAPHEMES))))
+
+/**
+ * HB_BUFFER_CLUSTER_LEVEL_IS_CHARACTERS
+ * @level: #hb_buffer_cluster_level_t to test
+ *
+ * Tests whether a cluster level does not group cluster values by graphemes.
+ * Requires that the level be valid.
+ *
+ * Since: 11.0.0
+ */
+#define HB_BUFFER_CLUSTER_LEVEL_IS_CHARACTERS(level) \
+        ((bool) ((1u << (unsigned) (level)) & \
+                 ((1u << HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARCATERS) | \
+                  (1u << HB_BUFFER_CLUSTER_LEVEL_CHARACTERS))))
+
 HB_EXTERN void
 hb_buffer_set_cluster_level (hb_buffer_t               *buffer,
                              hb_buffer_cluster_level_t  cluster_level);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
index c92e7df320e..81c0f4a72e3 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
@@ -229,6 +229,8 @@ struct hb_buffer_t
   HB_INTERNAL void add (hb_codepoint_t  codepoint,
                         unsigned int    cluster);
   HB_INTERNAL void add_info (const hb_glyph_info_t &glyph_info);
+  HB_INTERNAL void add_info_and_pos (const hb_glyph_info_t &glyph_info,
+                                     const hb_glyph_position_t &glyph_pos);
 
   void reverse_range (unsigned start, unsigned end)
   {
@@ -410,6 +412,9 @@ struct hb_buffer_t
   {
     end = hb_min (end, len);
 
+    if (unlikely (end - start > 255))
+      return;
+
     if (interior && !from_out_buffer && end - start < 2)
       return;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
index 8c7e0c655e6..7d09ca89d7f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
@@ -30,18 +30,31 @@
 #include "hb.hh"
 
 
-/* Implements a lockfree cache for int->int functions.
+/* Implements a lockfree and thread-safe cache for int->int functions,
+ * using (optionally) _relaxed_ atomic integer operations.
  *
- * The cache is a fixed-size array of 16-bit or 32-bit integers.
- * The key is split into two parts: the cache index and the rest.
+ * The cache is a fixed-size array of 16-bit or 32-bit integers,
+ * typically 256 elements.
  *
- * The cache index is used to index into the array.  The rest is used
- * to store the key and the value.
+ * The key is split into two parts: the cache index (high bits)
+ * and the rest (low bits).
+ *
+ * The cache index is used to index into the array.  The array
+ * member is a 16-bit or 32-bit integer that is used *both*
+ * to store the low bits of the key, and the value.
  *
  * The value is stored in the least significant bits of the integer.
- * The key is stored in the most significant bits of the integer.
- * The key is shifted by cache_bits to the left to make room for the
- * value.
+ * The low bits of the key are stored in the most significant bits
+ * of the integer.
+ *
+ * A cache hit is detected by comparing the low bits of the key
+ * with the high bits of the integer at the array position indexed
+ * by the high bits of the key. If they match, the value is extracted
+ * from the least significant bits of the integer and returned.
+ * Otherwise, a cache miss is reported.
+ *
+ * Cache operations (storage and retrieval) involve just a few
+ * arithmetic operations and a single memory access.
  */
 
 template <unsigned int key_bits=16,
@@ -52,11 +65,11 @@ struct hb_cache_t
 {
   using item_t = typename std::conditional<thread_safe,
                                            typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-                                                                     hb_atomic_short_t,
-                                                                     hb_atomic_int_t>::type,
+                                                                     hb_atomic_t<unsigned short>,
+                                                                     hb_atomic_t<unsigned int>>::type,
                                            typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-                                                                     short,
-                                                                     int>::type
+                                                                     unsigned short,
+                                                                     unsigned int>::type
                                           >::type;
 
   static_assert ((key_bits >= cache_bits), "");
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 ab17d68318b..0eacdd92ab8 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
@@ -71,7 +71,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
   template <typename ACC>
   cff2_cs_interp_env_t (const hb_ubytes_t &str, ACC &acc, unsigned int fd,
                         const int *coords_=nullptr, unsigned int num_coords_=0)
-    : SUPER (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs)
+    : SUPER (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs),
+      cached_scalars_vector (&acc.cached_scalars_vector)
   {
     coords = coords_;
     num_coords = num_coords_;
@@ -80,9 +81,39 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
     set_ivs (acc.privateDicts[fd].ivs);
   }
 
-  void fini ()
+  ~cff2_cs_interp_env_t ()
   {
-    SUPER::fini ();
+    release_scalars_vector (scalars);
+  }
+
+  hb_vector_t<float> *acquire_scalars_vector () const
+  {
+    hb_vector_t<float> *scalars = cached_scalars_vector->get_acquire ();
+
+    if (!scalars || !cached_scalars_vector->cmpexch (scalars, nullptr))
+    {
+      scalars = (hb_vector_t<float> *) hb_calloc (1, sizeof (hb_vector_t<float>));
+      if (unlikely (!scalars))
+        return nullptr;
+      scalars->init ();
+    }
+
+    return scalars;
+  }
+
+  void release_scalars_vector (hb_vector_t<float> *scalars) const
+  {
+    if (!scalars)
+      return;
+
+    scalars->clear ();
+
+    if (!cached_scalars_vector->cmpexch (nullptr, scalars))
+    {
+      scalars->fini ();
+      hb_free (scalars);
+    }
+    scalars = nullptr;
   }
 
   op_code_t fetch_op ()
@@ -111,14 +142,20 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
   {
     if (!seen_blend)
     {
-      region_count = varStore->varStore.get_region_index_count (get_ivs ());
-      if (do_blend)
+      scalars = acquire_scalars_vector ();
+      if (unlikely (!scalars))
+        SUPER::set_error ();
+      else
       {
-        if (unlikely (!scalars.resize_exact (region_count)))
-          SUPER::set_error ();
-        else
-          varStore->varStore.get_region_scalars (get_ivs (), coords, num_coords,
-                                                 &scalars[0], region_count);
+        region_count = varStore->varStore.get_region_index_count (get_ivs ());
+        if (do_blend)
+        {
+          if (unlikely (!scalars->resize_exact (region_count)))
+            SUPER::set_error ();
+          else
+            varStore->varStore.get_region_scalars (get_ivs (), coords, num_coords,
+                                                   &(*scalars)[0], region_count);
+        }
       }
       seen_blend = true;
     }
@@ -149,11 +186,11 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
     double v = 0;
     if (do_blend)
     {
-      if (likely (scalars.length == deltas.length))
+      if (likely (scalars && scalars->length == deltas.length))
       {
-        unsigned count = scalars.length;
+        unsigned count = scalars->length;
         for (unsigned i = 0; i < count; i++)
-          v += (double) scalars.arrayZ[i] * deltas.arrayZ[i].to_real ();
+          v += (double) scalars->arrayZ[i] * deltas.arrayZ[i].to_real ();
       }
     }
     return v;
@@ -167,7 +204,8 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
   const  CFF2ItemVariationStore *varStore;
   unsigned int  region_count;
   unsigned int  ivs;
-  hb_vector_t<float>  scalars;
+  hb_vector_t<float>  *scalars = nullptr;
+  hb_atomic_t<hb_vector_t<float> *> *cached_scalars_vector = nullptr;
   bool    do_blend;
   bool    seen_vsindex_ = false;
   bool    seen_blend = false;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
index bce0d09d20a..5c8546a378c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-common.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
@@ -42,7 +42,7 @@
 
 /* hb_options_t */
 
-hb_atomic_int_t _hb_options;
+hb_atomic_t<unsigned> _hb_options;
 
 void
 _hb_options_init ()
@@ -273,7 +273,7 @@ struct hb_language_item_t {
 
 /* Thread-safe lockfree language list */
 
-static hb_atomic_ptr_t <hb_language_item_t> langs;
+static hb_atomic_t<hb_language_item_t *> langs;
 
 static inline void
 free_langs ()
@@ -403,7 +403,7 @@ hb_language_to_string (hb_language_t language)
 hb_language_t
 hb_language_get_default ()
 {
-  static hb_atomic_ptr_t <hb_language_t> default_language;
+  static hb_atomic_t<hb_language_t> default_language;
 
   hb_language_t language = default_language;
   if (unlikely (language == HB_LANGUAGE_INVALID))
@@ -968,6 +968,9 @@ hb_feature_from_string (const char *str, int len,
  * understood by hb_feature_from_string(). The client in responsible for
  * allocating big enough size for @buf, 128 bytes is more than enough.
  *
+ * Note that the feature value will be omitted if it is '1', but the
+ * string won't include any whitespace.
+ *
  * Since: 0.9.5
  **/
 void
@@ -1121,6 +1124,8 @@ get_C_locale ()
  * understood by hb_variation_from_string(). The client in responsible for
  * allocating big enough size for @buf, 128 bytes is more than enough.
  *
+ * Note that the string won't include any whitespace.
+ *
  * Since: 1.4.2
  */
 void
@@ -1212,6 +1217,58 @@ uint8_t
   return hb_color_get_blue (color);
 }
 
+/**
+ * hb_malloc:
+ * @size: The size of the memory to allocate.
+ *
+ * Allocates @size bytes of memory, using the allocator set at
+ * compile-time. Typically just malloc().
+ *
+ * Return value: A pointer to the allocated memory.
+ *
+ * Since: 11.0.0
+ **/
+void* hb_malloc(size_t size) { return hb_malloc_impl (size); }
+
+/**
+ * hb_calloc:
+ * @nmemb: The number of elements to allocate.
+ * @size: The size of each element.
+ *
+ * Allocates @nmemb elements of @size bytes each, initialized to zero,
+ * using the allocator set at compile-time. Typically just calloc().
+ *
+ * Return value: A pointer to the allocated memory.
+ *
+ * Since: 11.0.0
+ **/
+void* hb_calloc(size_t nmemb, size_t size) { return hb_calloc_impl (nmemb, size); }
+
+/**
+ * hb_realloc:
+ * @ptr: The pointer to the memory to reallocate.
+ * @size: The new size of the memory.
+ *
+ * Reallocates the memory pointed to by @ptr to @size bytes, using the
+ * allocator set at compile-time. Typically just realloc().
+ *
+ * Return value: A pointer to the reallocated memory.
+ *
+ * Since: 11.0.0
+ **/
+void* hb_realloc(void *ptr, size_t size) { return hb_realloc_impl (ptr, size); }
+
+/**
+ * hb_free:
+ * @ptr: The pointer to the memory to free.
+ *
+ * Frees the memory pointed to by @ptr, using the allocator set at
+ * compile-time. Typically just free().
+ *
+ * Since: 11.0.0
+ **/
+void  hb_free(void *ptr) { hb_free_impl (ptr); }
+
 
 /* If there is no visibility control, then hb-static.cc will NOT
  * define anything.  Instead, we get it to define one set in here
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.h b/src/java.desktop/share/native/libharfbuzz/hb-common.h
index a8bae366f7e..5a0ef65392d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-common.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-common.h
@@ -65,6 +65,7 @@ typedef unsigned __int64 uint64_t;
 #else
 #  include <inttypes.h>
 #endif
+#include <stddef.h>
 
 #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 #define HB_DEPRECATED __attribute__((__deprecated__))
@@ -337,437 +338,7 @@ HB_EXTERN hb_bool_t
 hb_language_matches (hb_language_t language,
                      hb_language_t specific);
 
-/**
- * hb_script_t:
- * @HB_SCRIPT_COMMON: `Zyyy`
- * @HB_SCRIPT_INHERITED: `Zinh`
- * @HB_SCRIPT_UNKNOWN: `Zzzz`
- * @HB_SCRIPT_ARABIC: `Arab`
- * @HB_SCRIPT_ARMENIAN: `Armn`
- * @HB_SCRIPT_BENGALI: `Beng`
- * @HB_SCRIPT_CYRILLIC: `Cyrl`
- * @HB_SCRIPT_DEVANAGARI: `Deva`
- * @HB_SCRIPT_GEORGIAN: `Geor`
- * @HB_SCRIPT_GREEK: `Grek`
- * @HB_SCRIPT_GUJARATI: `Gujr`
- * @HB_SCRIPT_GURMUKHI: `Guru`
- * @HB_SCRIPT_HANGUL: `Hang`
- * @HB_SCRIPT_HAN: `Hani`
- * @HB_SCRIPT_HEBREW: `Hebr`
- * @HB_SCRIPT_HIRAGANA: `Hira`
- * @HB_SCRIPT_KANNADA: `Knda`
- * @HB_SCRIPT_KATAKANA: `Kana`
- * @HB_SCRIPT_LAO: `Laoo`
- * @HB_SCRIPT_LATIN: `Latn`
- * @HB_SCRIPT_MALAYALAM: `Mlym`
- * @HB_SCRIPT_ORIYA: `Orya`
- * @HB_SCRIPT_TAMIL: `Taml`
- * @HB_SCRIPT_TELUGU: `Telu`
- * @HB_SCRIPT_THAI: `Thai`
- * @HB_SCRIPT_TIBETAN: `Tibt`
- * @HB_SCRIPT_BOPOMOFO: `Bopo`
- * @HB_SCRIPT_BRAILLE: `Brai`
- * @HB_SCRIPT_CANADIAN_SYLLABICS: `Cans`
- * @HB_SCRIPT_CHEROKEE: `Cher`
- * @HB_SCRIPT_ETHIOPIC: `Ethi`
- * @HB_SCRIPT_KHMER: `Khmr`
- * @HB_SCRIPT_MONGOLIAN: `Mong`
- * @HB_SCRIPT_MYANMAR: `Mymr`
- * @HB_SCRIPT_OGHAM: `Ogam`
- * @HB_SCRIPT_RUNIC: `Runr`
- * @HB_SCRIPT_SINHALA: `Sinh`
- * @HB_SCRIPT_SYRIAC: `Syrc`
- * @HB_SCRIPT_THAANA: `Thaa`
- * @HB_SCRIPT_YI: `Yiii`
- * @HB_SCRIPT_DESERET: `Dsrt`
- * @HB_SCRIPT_GOTHIC: `Goth`
- * @HB_SCRIPT_OLD_ITALIC: `Ital`
- * @HB_SCRIPT_BUHID: `Buhd`
- * @HB_SCRIPT_HANUNOO: `Hano`
- * @HB_SCRIPT_TAGALOG: `Tglg`
- * @HB_SCRIPT_TAGBANWA: `Tagb`
- * @HB_SCRIPT_CYPRIOT: `Cprt`
- * @HB_SCRIPT_LIMBU: `Limb`
- * @HB_SCRIPT_LINEAR_B: `Linb`
- * @HB_SCRIPT_OSMANYA: `Osma`
- * @HB_SCRIPT_SHAVIAN: `Shaw`
- * @HB_SCRIPT_TAI_LE: `Tale`
- * @HB_SCRIPT_UGARITIC: `Ugar`
- * @HB_SCRIPT_BUGINESE: `Bugi`
- * @HB_SCRIPT_COPTIC: `Copt`
- * @HB_SCRIPT_GLAGOLITIC: `Glag`
- * @HB_SCRIPT_KHAROSHTHI: `Khar`
- * @HB_SCRIPT_NEW_TAI_LUE: `Talu`
- * @HB_SCRIPT_OLD_PERSIAN: `Xpeo`
- * @HB_SCRIPT_SYLOTI_NAGRI: `Sylo`
- * @HB_SCRIPT_TIFINAGH: `Tfng`
- * @HB_SCRIPT_BALINESE: `Bali`
- * @HB_SCRIPT_CUNEIFORM: `Xsux`
- * @HB_SCRIPT_NKO: `Nkoo`
- * @HB_SCRIPT_PHAGS_PA: `Phag`
- * @HB_SCRIPT_PHOENICIAN: `Phnx`
- * @HB_SCRIPT_CARIAN: `Cari`
- * @HB_SCRIPT_CHAM: `Cham`
- * @HB_SCRIPT_KAYAH_LI: `Kali`
- * @HB_SCRIPT_LEPCHA: `Lepc`
- * @HB_SCRIPT_LYCIAN: `Lyci`
- * @HB_SCRIPT_LYDIAN: `Lydi`
- * @HB_SCRIPT_OL_CHIKI: `Olck`
- * @HB_SCRIPT_REJANG: `Rjng`
- * @HB_SCRIPT_SAURASHTRA: `Saur`
- * @HB_SCRIPT_SUNDANESE: `Sund`
- * @HB_SCRIPT_VAI: `Vaii`
- * @HB_SCRIPT_AVESTAN: `Avst`
- * @HB_SCRIPT_BAMUM: `Bamu`
- * @HB_SCRIPT_EGYPTIAN_HIEROGLYPHS: `Egyp`
- * @HB_SCRIPT_IMPERIAL_ARAMAIC: `Armi`
- * @HB_SCRIPT_INSCRIPTIONAL_PAHLAVI: `Phli`
- * @HB_SCRIPT_INSCRIPTIONAL_PARTHIAN: `Prti`
- * @HB_SCRIPT_JAVANESE: `Java`
- * @HB_SCRIPT_KAITHI: `Kthi`
- * @HB_SCRIPT_LISU: `Lisu`
- * @HB_SCRIPT_MEETEI_MAYEK: `Mtei`
- * @HB_SCRIPT_OLD_SOUTH_ARABIAN: `Sarb`
- * @HB_SCRIPT_OLD_TURKIC: `Orkh`
- * @HB_SCRIPT_SAMARITAN: `Samr`
- * @HB_SCRIPT_TAI_THAM: `Lana`
- * @HB_SCRIPT_TAI_VIET: `Tavt`
- * @HB_SCRIPT_BATAK: `Batk`
- * @HB_SCRIPT_BRAHMI: `Brah`
- * @HB_SCRIPT_MANDAIC: `Mand`
- * @HB_SCRIPT_CHAKMA: `Cakm`
- * @HB_SCRIPT_MEROITIC_CURSIVE: `Merc`
- * @HB_SCRIPT_MEROITIC_HIEROGLYPHS: `Mero`
- * @HB_SCRIPT_MIAO: `Plrd`
- * @HB_SCRIPT_SHARADA: `Shrd`
- * @HB_SCRIPT_SORA_SOMPENG: `Sora`
- * @HB_SCRIPT_TAKRI: `Takr`
- * @HB_SCRIPT_BASSA_VAH: `Bass`, Since: 0.9.30
- * @HB_SCRIPT_CAUCASIAN_ALBANIAN: `Aghb`, Since: 0.9.30
- * @HB_SCRIPT_DUPLOYAN: `Dupl`, Since: 0.9.30
- * @HB_SCRIPT_ELBASAN: `Elba`, Since: 0.9.30
- * @HB_SCRIPT_GRANTHA: `Gran`, Since: 0.9.30
- * @HB_SCRIPT_KHOJKI: `Khoj`, Since: 0.9.30
- * @HB_SCRIPT_KHUDAWADI: `Sind`, Since: 0.9.30
- * @HB_SCRIPT_LINEAR_A: `Lina`, Since: 0.9.30
- * @HB_SCRIPT_MAHAJANI: `Mahj`, Since: 0.9.30
- * @HB_SCRIPT_MANICHAEAN: `Mani`, Since: 0.9.30
- * @HB_SCRIPT_MENDE_KIKAKUI: `Mend`, Since: 0.9.30
- * @HB_SCRIPT_MODI: `Modi`, Since: 0.9.30
- * @HB_SCRIPT_MRO: `Mroo`, Since: 0.9.30
- * @HB_SCRIPT_NABATAEAN: `Nbat`, Since: 0.9.30
- * @HB_SCRIPT_OLD_NORTH_ARABIAN: `Narb`, Since: 0.9.30
- * @HB_SCRIPT_OLD_PERMIC: `Perm`, Since: 0.9.30
- * @HB_SCRIPT_PAHAWH_HMONG: `Hmng`, Since: 0.9.30
- * @HB_SCRIPT_PALMYRENE: `Palm`, Since: 0.9.30
- * @HB_SCRIPT_PAU_CIN_HAU: `Pauc`, Since: 0.9.30
- * @HB_SCRIPT_PSALTER_PAHLAVI: `Phlp`, Since: 0.9.30
- * @HB_SCRIPT_SIDDHAM: `Sidd`, Since: 0.9.30
- * @HB_SCRIPT_TIRHUTA: `Tirh`, Since: 0.9.30
- * @HB_SCRIPT_WARANG_CITI: `Wara`, Since: 0.9.30
- * @HB_SCRIPT_AHOM: `Ahom`, Since: 0.9.30
- * @HB_SCRIPT_ANATOLIAN_HIEROGLYPHS: `Hluw`, Since: 0.9.30
- * @HB_SCRIPT_HATRAN: `Hatr`, Since: 0.9.30
- * @HB_SCRIPT_MULTANI: `Mult`, Since: 0.9.30
- * @HB_SCRIPT_OLD_HUNGARIAN: `Hung`, Since: 0.9.30
- * @HB_SCRIPT_SIGNWRITING: `Sgnw`, Since: 0.9.30
- * @HB_SCRIPT_ADLAM: `Adlm`, Since: 1.3.0
- * @HB_SCRIPT_BHAIKSUKI: `Bhks`, Since: 1.3.0
- * @HB_SCRIPT_MARCHEN: `Marc`, Since: 1.3.0
- * @HB_SCRIPT_OSAGE: `Osge`, Since: 1.3.0
- * @HB_SCRIPT_TANGUT: `Tang`, Since: 1.3.0
- * @HB_SCRIPT_NEWA: `Newa`, Since: 1.3.0
- * @HB_SCRIPT_MASARAM_GONDI: `Gonm`, Since: 1.6.0
- * @HB_SCRIPT_NUSHU: `Nshu`, Since: 1.6.0
- * @HB_SCRIPT_SOYOMBO: `Soyo`, Since: 1.6.0
- * @HB_SCRIPT_ZANABAZAR_SQUARE: `Zanb`, Since: 1.6.0
- * @HB_SCRIPT_DOGRA: `Dogr`, Since: 1.8.0
- * @HB_SCRIPT_GUNJALA_GONDI: `Gong`, Since: 1.8.0
- * @HB_SCRIPT_HANIFI_ROHINGYA: `Rohg`, Since: 1.8.0
- * @HB_SCRIPT_MAKASAR: `Maka`, Since: 1.8.0
- * @HB_SCRIPT_MEDEFAIDRIN: `Medf`, Since: 1.8.0
- * @HB_SCRIPT_OLD_SOGDIAN: `Sogo`, Since: 1.8.0
- * @HB_SCRIPT_SOGDIAN: `Sogd`, Since: 1.8.0
- * @HB_SCRIPT_ELYMAIC: `Elym`, Since: 2.4.0
- * @HB_SCRIPT_NANDINAGARI: `Nand`, Since: 2.4.0
- * @HB_SCRIPT_NYIAKENG_PUACHUE_HMONG: `Hmnp`, Since: 2.4.0
- * @HB_SCRIPT_WANCHO: `Wcho`, Since: 2.4.0
- * @HB_SCRIPT_CHORASMIAN: `Chrs`, Since: 2.6.7
- * @HB_SCRIPT_DIVES_AKURU: `Diak`, Since: 2.6.7
- * @HB_SCRIPT_KHITAN_SMALL_SCRIPT: `Kits`, Since: 2.6.7
- * @HB_SCRIPT_YEZIDI: `Yezi`, Since: 2.6.7
- * @HB_SCRIPT_CYPRO_MINOAN: `Cpmn`, Since: 3.0.0
- * @HB_SCRIPT_OLD_UYGHUR: `Ougr`, Since: 3.0.0
- * @HB_SCRIPT_TANGSA: `Tnsa`, Since: 3.0.0
- * @HB_SCRIPT_TOTO: `Toto`, Since: 3.0.0
- * @HB_SCRIPT_VITHKUQI: `Vith`, Since: 3.0.0
- * @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
- * to the four-letter values defined by [ISO 15924](https://unicode.org/iso15924/).
- *
- * See also the Script (sc) property of the Unicode Character Database.
- *
- **/
-
-/* https://docs.google.com/spreadsheets/d/1Y90M0Ie3MUJ6UVCRDOypOtijlMDLNNyyLk36T6iMu0o */
-typedef enum
-{
-  HB_SCRIPT_COMMON                      = HB_TAG ('Z','y','y','y'), /*1.1*/
-  HB_SCRIPT_INHERITED                   = HB_TAG ('Z','i','n','h'), /*1.1*/
-  HB_SCRIPT_UNKNOWN                     = HB_TAG ('Z','z','z','z'), /*5.0*/
-
-  HB_SCRIPT_ARABIC                      = HB_TAG ('A','r','a','b'), /*1.1*/
-  HB_SCRIPT_ARMENIAN                    = HB_TAG ('A','r','m','n'), /*1.1*/
-  HB_SCRIPT_BENGALI                     = HB_TAG ('B','e','n','g'), /*1.1*/
-  HB_SCRIPT_CYRILLIC                    = HB_TAG ('C','y','r','l'), /*1.1*/
-  HB_SCRIPT_DEVANAGARI                  = HB_TAG ('D','e','v','a'), /*1.1*/
-  HB_SCRIPT_GEORGIAN                    = HB_TAG ('G','e','o','r'), /*1.1*/
-  HB_SCRIPT_GREEK                       = HB_TAG ('G','r','e','k'), /*1.1*/
-  HB_SCRIPT_GUJARATI                    = HB_TAG ('G','u','j','r'), /*1.1*/
-  HB_SCRIPT_GURMUKHI                    = HB_TAG ('G','u','r','u'), /*1.1*/
-  HB_SCRIPT_HANGUL                      = HB_TAG ('H','a','n','g'), /*1.1*/
-  HB_SCRIPT_HAN                         = HB_TAG ('H','a','n','i'), /*1.1*/
-  HB_SCRIPT_HEBREW                      = HB_TAG ('H','e','b','r'), /*1.1*/
-  HB_SCRIPT_HIRAGANA                    = HB_TAG ('H','i','r','a'), /*1.1*/
-  HB_SCRIPT_KANNADA                     = HB_TAG ('K','n','d','a'), /*1.1*/
-  HB_SCRIPT_KATAKANA                    = HB_TAG ('K','a','n','a'), /*1.1*/
-  HB_SCRIPT_LAO                         = HB_TAG ('L','a','o','o'), /*1.1*/
-  HB_SCRIPT_LATIN                       = HB_TAG ('L','a','t','n'), /*1.1*/
-  HB_SCRIPT_MALAYALAM                   = HB_TAG ('M','l','y','m'), /*1.1*/
-  HB_SCRIPT_ORIYA                       = HB_TAG ('O','r','y','a'), /*1.1*/
-  HB_SCRIPT_TAMIL                       = HB_TAG ('T','a','m','l'), /*1.1*/
-  HB_SCRIPT_TELUGU                      = HB_TAG ('T','e','l','u'), /*1.1*/
-  HB_SCRIPT_THAI                        = HB_TAG ('T','h','a','i'), /*1.1*/
-
-  HB_SCRIPT_TIBETAN                     = HB_TAG ('T','i','b','t'), /*2.0*/
-
-  HB_SCRIPT_BOPOMOFO                    = HB_TAG ('B','o','p','o'), /*3.0*/
-  HB_SCRIPT_BRAILLE                     = HB_TAG ('B','r','a','i'), /*3.0*/
-  HB_SCRIPT_CANADIAN_SYLLABICS          = HB_TAG ('C','a','n','s'), /*3.0*/
-  HB_SCRIPT_CHEROKEE                    = HB_TAG ('C','h','e','r'), /*3.0*/
-  HB_SCRIPT_ETHIOPIC                    = HB_TAG ('E','t','h','i'), /*3.0*/
-  HB_SCRIPT_KHMER                       = HB_TAG ('K','h','m','r'), /*3.0*/
-  HB_SCRIPT_MONGOLIAN                   = HB_TAG ('M','o','n','g'), /*3.0*/
-  HB_SCRIPT_MYANMAR                     = HB_TAG ('M','y','m','r'), /*3.0*/
-  HB_SCRIPT_OGHAM                       = HB_TAG ('O','g','a','m'), /*3.0*/
-  HB_SCRIPT_RUNIC                       = HB_TAG ('R','u','n','r'), /*3.0*/
-  HB_SCRIPT_SINHALA                     = HB_TAG ('S','i','n','h'), /*3.0*/
-  HB_SCRIPT_SYRIAC                      = HB_TAG ('S','y','r','c'), /*3.0*/
-  HB_SCRIPT_THAANA                      = HB_TAG ('T','h','a','a'), /*3.0*/
-  HB_SCRIPT_YI                          = HB_TAG ('Y','i','i','i'), /*3.0*/
-
-  HB_SCRIPT_DESERET                     = HB_TAG ('D','s','r','t'), /*3.1*/
-  HB_SCRIPT_GOTHIC                      = HB_TAG ('G','o','t','h'), /*3.1*/
-  HB_SCRIPT_OLD_ITALIC                  = HB_TAG ('I','t','a','l'), /*3.1*/
-
-  HB_SCRIPT_BUHID                       = HB_TAG ('B','u','h','d'), /*3.2*/
-  HB_SCRIPT_HANUNOO                     = HB_TAG ('H','a','n','o'), /*3.2*/
-  HB_SCRIPT_TAGALOG                     = HB_TAG ('T','g','l','g'), /*3.2*/
-  HB_SCRIPT_TAGBANWA                    = HB_TAG ('T','a','g','b'), /*3.2*/
-
-  HB_SCRIPT_CYPRIOT                     = HB_TAG ('C','p','r','t'), /*4.0*/
-  HB_SCRIPT_LIMBU                       = HB_TAG ('L','i','m','b'), /*4.0*/
-  HB_SCRIPT_LINEAR_B                    = HB_TAG ('L','i','n','b'), /*4.0*/
-  HB_SCRIPT_OSMANYA                     = HB_TAG ('O','s','m','a'), /*4.0*/
-  HB_SCRIPT_SHAVIAN                     = HB_TAG ('S','h','a','w'), /*4.0*/
-  HB_SCRIPT_TAI_LE                      = HB_TAG ('T','a','l','e'), /*4.0*/
-  HB_SCRIPT_UGARITIC                    = HB_TAG ('U','g','a','r'), /*4.0*/
-
-  HB_SCRIPT_BUGINESE                    = HB_TAG ('B','u','g','i'), /*4.1*/
-  HB_SCRIPT_COPTIC                      = HB_TAG ('C','o','p','t'), /*4.1*/
-  HB_SCRIPT_GLAGOLITIC                  = HB_TAG ('G','l','a','g'), /*4.1*/
-  HB_SCRIPT_KHAROSHTHI                  = HB_TAG ('K','h','a','r'), /*4.1*/
-  HB_SCRIPT_NEW_TAI_LUE                 = HB_TAG ('T','a','l','u'), /*4.1*/
-  HB_SCRIPT_OLD_PERSIAN                 = HB_TAG ('X','p','e','o'), /*4.1*/
-  HB_SCRIPT_SYLOTI_NAGRI                = HB_TAG ('S','y','l','o'), /*4.1*/
-  HB_SCRIPT_TIFINAGH                    = HB_TAG ('T','f','n','g'), /*4.1*/
-
-  HB_SCRIPT_BALINESE                    = HB_TAG ('B','a','l','i'), /*5.0*/
-  HB_SCRIPT_CUNEIFORM                   = HB_TAG ('X','s','u','x'), /*5.0*/
-  HB_SCRIPT_NKO                         = HB_TAG ('N','k','o','o'), /*5.0*/
-  HB_SCRIPT_PHAGS_PA                    = HB_TAG ('P','h','a','g'), /*5.0*/
-  HB_SCRIPT_PHOENICIAN                  = HB_TAG ('P','h','n','x'), /*5.0*/
-
-  HB_SCRIPT_CARIAN                      = HB_TAG ('C','a','r','i'), /*5.1*/
-  HB_SCRIPT_CHAM                        = HB_TAG ('C','h','a','m'), /*5.1*/
-  HB_SCRIPT_KAYAH_LI                    = HB_TAG ('K','a','l','i'), /*5.1*/
-  HB_SCRIPT_LEPCHA                      = HB_TAG ('L','e','p','c'), /*5.1*/
-  HB_SCRIPT_LYCIAN                      = HB_TAG ('L','y','c','i'), /*5.1*/
-  HB_SCRIPT_LYDIAN                      = HB_TAG ('L','y','d','i'), /*5.1*/
-  HB_SCRIPT_OL_CHIKI                    = HB_TAG ('O','l','c','k'), /*5.1*/
-  HB_SCRIPT_REJANG                      = HB_TAG ('R','j','n','g'), /*5.1*/
-  HB_SCRIPT_SAURASHTRA                  = HB_TAG ('S','a','u','r'), /*5.1*/
-  HB_SCRIPT_SUNDANESE                   = HB_TAG ('S','u','n','d'), /*5.1*/
-  HB_SCRIPT_VAI                         = HB_TAG ('V','a','i','i'), /*5.1*/
-
-  HB_SCRIPT_AVESTAN                     = HB_TAG ('A','v','s','t'), /*5.2*/
-  HB_SCRIPT_BAMUM                       = HB_TAG ('B','a','m','u'), /*5.2*/
-  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS        = HB_TAG ('E','g','y','p'), /*5.2*/
-  HB_SCRIPT_IMPERIAL_ARAMAIC            = HB_TAG ('A','r','m','i'), /*5.2*/
-  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI       = HB_TAG ('P','h','l','i'), /*5.2*/
-  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN      = HB_TAG ('P','r','t','i'), /*5.2*/
-  HB_SCRIPT_JAVANESE                    = HB_TAG ('J','a','v','a'), /*5.2*/
-  HB_SCRIPT_KAITHI                      = HB_TAG ('K','t','h','i'), /*5.2*/
-  HB_SCRIPT_LISU                        = HB_TAG ('L','i','s','u'), /*5.2*/
-  HB_SCRIPT_MEETEI_MAYEK                = HB_TAG ('M','t','e','i'), /*5.2*/
-  HB_SCRIPT_OLD_SOUTH_ARABIAN           = HB_TAG ('S','a','r','b'), /*5.2*/
-  HB_SCRIPT_OLD_TURKIC                  = HB_TAG ('O','r','k','h'), /*5.2*/
-  HB_SCRIPT_SAMARITAN                   = HB_TAG ('S','a','m','r'), /*5.2*/
-  HB_SCRIPT_TAI_THAM                    = HB_TAG ('L','a','n','a'), /*5.2*/
-  HB_SCRIPT_TAI_VIET                    = HB_TAG ('T','a','v','t'), /*5.2*/
-
-  HB_SCRIPT_BATAK                       = HB_TAG ('B','a','t','k'), /*6.0*/
-  HB_SCRIPT_BRAHMI                      = HB_TAG ('B','r','a','h'), /*6.0*/
-  HB_SCRIPT_MANDAIC                     = HB_TAG ('M','a','n','d'), /*6.0*/
-
-  HB_SCRIPT_CHAKMA                      = HB_TAG ('C','a','k','m'), /*6.1*/
-  HB_SCRIPT_MEROITIC_CURSIVE            = HB_TAG ('M','e','r','c'), /*6.1*/
-  HB_SCRIPT_MEROITIC_HIEROGLYPHS        = HB_TAG ('M','e','r','o'), /*6.1*/
-  HB_SCRIPT_MIAO                        = HB_TAG ('P','l','r','d'), /*6.1*/
-  HB_SCRIPT_SHARADA                     = HB_TAG ('S','h','r','d'), /*6.1*/
-  HB_SCRIPT_SORA_SOMPENG                = HB_TAG ('S','o','r','a'), /*6.1*/
-  HB_SCRIPT_TAKRI                       = HB_TAG ('T','a','k','r'), /*6.1*/
-
-  /*
-   * Since: 0.9.30
-   */
-  HB_SCRIPT_BASSA_VAH                   = HB_TAG ('B','a','s','s'), /*7.0*/
-  HB_SCRIPT_CAUCASIAN_ALBANIAN          = HB_TAG ('A','g','h','b'), /*7.0*/
-  HB_SCRIPT_DUPLOYAN                    = HB_TAG ('D','u','p','l'), /*7.0*/
-  HB_SCRIPT_ELBASAN                     = HB_TAG ('E','l','b','a'), /*7.0*/
-  HB_SCRIPT_GRANTHA                     = HB_TAG ('G','r','a','n'), /*7.0*/
-  HB_SCRIPT_KHOJKI                      = HB_TAG ('K','h','o','j'), /*7.0*/
-  HB_SCRIPT_KHUDAWADI                   = HB_TAG ('S','i','n','d'), /*7.0*/
-  HB_SCRIPT_LINEAR_A                    = HB_TAG ('L','i','n','a'), /*7.0*/
-  HB_SCRIPT_MAHAJANI                    = HB_TAG ('M','a','h','j'), /*7.0*/
-  HB_SCRIPT_MANICHAEAN                  = HB_TAG ('M','a','n','i'), /*7.0*/
-  HB_SCRIPT_MENDE_KIKAKUI               = HB_TAG ('M','e','n','d'), /*7.0*/
-  HB_SCRIPT_MODI                        = HB_TAG ('M','o','d','i'), /*7.0*/
-  HB_SCRIPT_MRO                         = HB_TAG ('M','r','o','o'), /*7.0*/
-  HB_SCRIPT_NABATAEAN                   = HB_TAG ('N','b','a','t'), /*7.0*/
-  HB_SCRIPT_OLD_NORTH_ARABIAN           = HB_TAG ('N','a','r','b'), /*7.0*/
-  HB_SCRIPT_OLD_PERMIC                  = HB_TAG ('P','e','r','m'), /*7.0*/
-  HB_SCRIPT_PAHAWH_HMONG                = HB_TAG ('H','m','n','g'), /*7.0*/
-  HB_SCRIPT_PALMYRENE                   = HB_TAG ('P','a','l','m'), /*7.0*/
-  HB_SCRIPT_PAU_CIN_HAU                 = HB_TAG ('P','a','u','c'), /*7.0*/
-  HB_SCRIPT_PSALTER_PAHLAVI             = HB_TAG ('P','h','l','p'), /*7.0*/
-  HB_SCRIPT_SIDDHAM                     = HB_TAG ('S','i','d','d'), /*7.0*/
-  HB_SCRIPT_TIRHUTA                     = HB_TAG ('T','i','r','h'), /*7.0*/
-  HB_SCRIPT_WARANG_CITI                 = HB_TAG ('W','a','r','a'), /*7.0*/
-
-  HB_SCRIPT_AHOM                        = HB_TAG ('A','h','o','m'), /*8.0*/
-  HB_SCRIPT_ANATOLIAN_HIEROGLYPHS       = HB_TAG ('H','l','u','w'), /*8.0*/
-  HB_SCRIPT_HATRAN                      = HB_TAG ('H','a','t','r'), /*8.0*/
-  HB_SCRIPT_MULTANI                     = HB_TAG ('M','u','l','t'), /*8.0*/
-  HB_SCRIPT_OLD_HUNGARIAN               = HB_TAG ('H','u','n','g'), /*8.0*/
-  HB_SCRIPT_SIGNWRITING                 = HB_TAG ('S','g','n','w'), /*8.0*/
-
-  /*
-   * Since 1.3.0
-   */
-  HB_SCRIPT_ADLAM                       = HB_TAG ('A','d','l','m'), /*9.0*/
-  HB_SCRIPT_BHAIKSUKI                   = HB_TAG ('B','h','k','s'), /*9.0*/
-  HB_SCRIPT_MARCHEN                     = HB_TAG ('M','a','r','c'), /*9.0*/
-  HB_SCRIPT_OSAGE                       = HB_TAG ('O','s','g','e'), /*9.0*/
-  HB_SCRIPT_TANGUT                      = HB_TAG ('T','a','n','g'), /*9.0*/
-  HB_SCRIPT_NEWA                        = HB_TAG ('N','e','w','a'), /*9.0*/
-
-  /*
-   * Since 1.6.0
-   */
-  HB_SCRIPT_MASARAM_GONDI               = HB_TAG ('G','o','n','m'), /*10.0*/
-  HB_SCRIPT_NUSHU                       = HB_TAG ('N','s','h','u'), /*10.0*/
-  HB_SCRIPT_SOYOMBO                     = HB_TAG ('S','o','y','o'), /*10.0*/
-  HB_SCRIPT_ZANABAZAR_SQUARE            = HB_TAG ('Z','a','n','b'), /*10.0*/
-
-  /*
-   * Since 1.8.0
-   */
-  HB_SCRIPT_DOGRA                       = HB_TAG ('D','o','g','r'), /*11.0*/
-  HB_SCRIPT_GUNJALA_GONDI               = HB_TAG ('G','o','n','g'), /*11.0*/
-  HB_SCRIPT_HANIFI_ROHINGYA             = HB_TAG ('R','o','h','g'), /*11.0*/
-  HB_SCRIPT_MAKASAR                     = HB_TAG ('M','a','k','a'), /*11.0*/
-  HB_SCRIPT_MEDEFAIDRIN                 = HB_TAG ('M','e','d','f'), /*11.0*/
-  HB_SCRIPT_OLD_SOGDIAN                 = HB_TAG ('S','o','g','o'), /*11.0*/
-  HB_SCRIPT_SOGDIAN                     = HB_TAG ('S','o','g','d'), /*11.0*/
-
-  /*
-   * Since 2.4.0
-   */
-  HB_SCRIPT_ELYMAIC                     = HB_TAG ('E','l','y','m'), /*12.0*/
-  HB_SCRIPT_NANDINAGARI                 = HB_TAG ('N','a','n','d'), /*12.0*/
-  HB_SCRIPT_NYIAKENG_PUACHUE_HMONG      = HB_TAG ('H','m','n','p'), /*12.0*/
-  HB_SCRIPT_WANCHO                      = HB_TAG ('W','c','h','o'), /*12.0*/
-
-  /*
-   * Since 2.6.7
-   */
-  HB_SCRIPT_CHORASMIAN                  = HB_TAG ('C','h','r','s'), /*13.0*/
-  HB_SCRIPT_DIVES_AKURU                 = HB_TAG ('D','i','a','k'), /*13.0*/
-  HB_SCRIPT_KHITAN_SMALL_SCRIPT         = HB_TAG ('K','i','t','s'), /*13.0*/
-  HB_SCRIPT_YEZIDI                      = HB_TAG ('Y','e','z','i'), /*13.0*/
-
-  /*
-   * Since 3.0.0
-   */
-  HB_SCRIPT_CYPRO_MINOAN                = HB_TAG ('C','p','m','n'), /*14.0*/
-  HB_SCRIPT_OLD_UYGHUR                  = HB_TAG ('O','u','g','r'), /*14.0*/
-  HB_SCRIPT_TANGSA                      = HB_TAG ('T','n','s','a'), /*14.0*/
-  HB_SCRIPT_TOTO                        = HB_TAG ('T','o','t','o'), /*14.0*/
-  HB_SCRIPT_VITHKUQI                    = HB_TAG ('V','i','t','h'), /*14.0*/
-
-  /*
-   * Since 3.4.0
-   */
-  HB_SCRIPT_MATH                        = HB_TAG ('Z','m','t','h'),
-
-  /*
-   * Since 5.2.0
-   */
-  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,
-
-  /*< private >*/
-
-  /* Dummy values to ensure any hb_tag_t value can be passed/stored as hb_script_t
-   * without risking undefined behavior.  We have two, for historical reasons.
-   * HB_TAG_MAX used to be unsigned, but that was invalid Ansi C, so was changed
-   * to _HB_SCRIPT_MAX_VALUE to be equal to HB_TAG_MAX_SIGNED as well.
-   *
-   * See this thread for technicalities:
-   *
-   *   https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
-   */
-  _HB_SCRIPT_MAX_VALUE                          = HB_TAG_MAX_SIGNED, /*< skip >*/
-  _HB_SCRIPT_MAX_VALUE_SIGNED                   = HB_TAG_MAX_SIGNED /*< skip >*/
-
-} hb_script_t;
-
+#include "hb-script-list.h"
 
 /* Script functions */
 
@@ -948,6 +519,16 @@ typedef struct hb_glyph_extents_t {
  */
 typedef struct hb_font_t hb_font_t;
 
+/* Not of much use to clients. */
+HB_EXTERN void*
+hb_malloc (size_t size);
+HB_EXTERN void*
+hb_calloc (size_t nmemb, size_t size);
+HB_EXTERN void*
+hb_realloc (void *ptr, size_t size);
+HB_EXTERN void
+hb_free (void *ptr);
+
 HB_END_DECLS
 
 #endif /* HB_COMMON_H */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-config.hh b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
index 40cc2403c18..3956690da35 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-config.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
@@ -146,6 +146,7 @@
 
 #ifdef HB_NO_DRAW
 #define HB_NO_OUTLINE
+#define HB_NO_PAINT
 #endif
 
 #ifdef HB_NO_GETENV
@@ -191,7 +192,6 @@
 #ifdef HB_MINIMIZE_MEMORY_USAGE
 #define HB_NO_GDEF_CACHE
 #define HB_NO_OT_LAYOUT_LOOKUP_CACHE
-#define HB_NO_OT_FONT_ADVANCE_CACHE
 #define HB_NO_OT_FONT_CMAP_CACHE
 #endif
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
index 341e61e57c6..1e9a18b9326 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
@@ -49,15 +49,15 @@ struct hb_options_t
 };
 
 union hb_options_union_t {
-  int i;
+  unsigned i;
   hb_options_t opts;
 };
-static_assert ((sizeof (hb_atomic_int_t) >= sizeof (hb_options_union_t)), "");
+static_assert ((sizeof (hb_atomic_t<unsigned>) >= sizeof (hb_options_union_t)), "");
 
 HB_INTERNAL void
 _hb_options_init ();
 
-extern HB_INTERNAL hb_atomic_int_t _hb_options;
+extern HB_INTERNAL hb_atomic_t<unsigned> _hb_options;
 
 static inline hb_options_t
 hb_options ()
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
index d854a2b16f5..927563c4c40 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
@@ -275,6 +275,48 @@ typedef void (*hb_font_get_glyph_shape_func_t) (hb_font_t *font, void *font_data
                                                 hb_draw_funcs_t *draw_funcs, void *draw_data,
                                                 void *user_data);
 
+/**
+ * hb_font_draw_glyph_func_t:
+ * @font: #hb_font_t to work upon
+ * @font_data: @font user data pointer
+ * @glyph: The glyph ID to query
+ * @draw_funcs: The draw functions to send the shape data to
+ * @draw_data: The data accompanying the draw functions
+ * @user_data: User data pointer passed by the caller
+ *
+ * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
+ *
+ * Since: 7.0.0
+ * XDeprecated: REPLACEME: Use hb_font_draw_glyph_func_or_fail_t instead.
+ **/
+typedef void (*hb_font_draw_glyph_func_t) (hb_font_t *font, void *font_data,
+                                           hb_codepoint_t glyph,
+                                           hb_draw_funcs_t *draw_funcs, void *draw_data,
+                                           void *user_data);
+
+/**
+ * hb_font_paint_glyph_func_t:
+ * @font: #hb_font_t to work upon
+ * @font_data: @font user data pointer
+ * @glyph: The glyph ID to query
+ * @paint_funcs: The paint functions to use
+ * @paint_data: The data accompanying the paint functions
+ * @palette_index: The color palette to use
+ * @foreground: The foreground color
+ * @user_data: User data pointer passed by the caller
+ *
+ * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
+ *
+ * Since: 7.0.0
+ * XDeprecated: REPLACEME: Use hb_font_paint_glyph_or_fail_func_t instead.
+ */
+typedef hb_bool_t (*hb_font_paint_glyph_func_t) (hb_font_t *font, void *font_data,
+                                                 hb_codepoint_t glyph,
+                                                 hb_paint_funcs_t *paint_funcs, void *paint_data,
+                                                 unsigned int palette_index,
+                                                 hb_color_t foreground,
+                                                 void *user_data);
+
 /**
  * hb_font_funcs_set_glyph_shape_func:
  * @ffuncs: A font-function structure
@@ -288,13 +330,49 @@ typedef void (*hb_font_get_glyph_shape_func_t) (hb_font_t *font, void *font_data
  * Since: 4.0.0
  * Deprecated: 7.0.0: Use hb_font_funcs_set_draw_glyph_func() instead
  **/
-HB_DEPRECATED_FOR (hb_font_funcs_set_draw_glyph_func)
+HB_DEPRECATED_FOR (hb_font_funcs_set_draw_glyph_or_fail_func)
 HB_EXTERN void
 hb_font_funcs_set_glyph_shape_func (hb_font_funcs_t *ffuncs,
                                     hb_font_get_glyph_shape_func_t func,
                                     void *user_data, hb_destroy_func_t destroy);
 
-HB_DEPRECATED_FOR (hb_font_draw_glyph)
+/**
+ * hb_font_funcs_set_draw_glyph_func:
+ * @ffuncs: A font-function structure
+ * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
+ * @user_data: Data to pass to @func
+ * @destroy: (nullable): The function to call when @user_data is not needed anymore
+ *
+ * Sets the implementation function for #hb_font_draw_glyph_func_t.
+ *
+ * Since: 7.0.0
+ * XDeprecated: REPLACEME: Use hb_font_funcs_set_draw_glyph_or_fail_func instead.
+ **/
+HB_DEPRECATED_FOR (hb_font_funcs_set_draw_glyph_or_fail_func)
+HB_EXTERN void
+hb_font_funcs_set_draw_glyph_func (hb_font_funcs_t *ffuncs,
+                                   hb_font_draw_glyph_func_t func,
+                                   void *user_data, hb_destroy_func_t destroy);
+
+/**
+ * hb_font_funcs_set_paint_glyph_func:
+ * @ffuncs: A font-function structure
+ * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
+ * @user_data: Data to pass to @func
+ * @destroy: (nullable): The function to call when @user_data is no longer needed
+ *
+ * Sets the implementation function for #hb_font_paint_glyph_func_t.
+ *
+ * Since: 7.0.0
+ * XDeprecated: REPLACEME: Use hb_font_funcs_set_paint_glyph_or_fail_func() instead.
+ */
+HB_DEPRECATED_FOR (hb_font_funcs_set_paint_glyph_or_fail_func)
+HB_EXTERN void
+hb_font_funcs_set_paint_glyph_func (hb_font_funcs_t *ffuncs,
+                                    hb_font_paint_glyph_func_t func,
+                                    void *user_data, hb_destroy_func_t destroy);
+
+HB_DEPRECATED_FOR (hb_font_draw_glyph_or_fail)
 HB_EXTERN void
 hb_font_get_glyph_shape (hb_font_t *font,
                          hb_codepoint_t glyph,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
index f2821578b65..8764ffe7129 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
@@ -28,6 +28,11 @@
 
 #include "hb-draw.hh"
 
+#include "hb-geometry.hh"
+
+#include "hb-machinery.hh"
+
+
 /**
  * SECTION:hb-draw
  * @title: hb-draw
@@ -455,4 +460,92 @@ hb_draw_close_path (hb_draw_funcs_t *dfuncs, void *draw_data,
 }
 
 
+static void
+hb_draw_extents_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                         void *data,
+                         hb_draw_state_t *st,
+                         float to_x, float to_y,
+                         void *user_data HB_UNUSED)
+{
+  hb_extents_t *extents = (hb_extents_t *) data;
+
+  extents->add_point (to_x, to_y);
+}
+
+static void
+hb_draw_extents_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                         void *data,
+                         hb_draw_state_t *st,
+                         float to_x, float to_y,
+                         void *user_data HB_UNUSED)
+{
+  hb_extents_t *extents = (hb_extents_t *) data;
+
+  extents->add_point (to_x, to_y);
+}
+
+static void
+hb_draw_extents_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                              void *data,
+                              hb_draw_state_t *st,
+                              float control_x, float control_y,
+                              float to_x, float to_y,
+                              void *user_data HB_UNUSED)
+{
+  hb_extents_t *extents = (hb_extents_t *) data;
+
+  extents->add_point (control_x, control_y);
+  extents->add_point (to_x, to_y);
+}
+
+static void
+hb_draw_extents_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                          void *data,
+                          hb_draw_state_t *st,
+                          float control1_x, float control1_y,
+                          float control2_x, float control2_y,
+                          float to_x, float to_y,
+                          void *user_data HB_UNUSED)
+{
+  hb_extents_t *extents = (hb_extents_t *) data;
+
+  extents->add_point (control1_x, control1_y);
+  extents->add_point (control2_x, control2_y);
+  extents->add_point (to_x, to_y);
+}
+
+static inline void free_static_draw_extents_funcs ();
+
+static struct hb_draw_extents_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t<hb_draw_extents_funcs_lazy_loader_t>
+{
+  static hb_draw_funcs_t *create ()
+  {
+    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
+
+    hb_draw_funcs_set_move_to_func (funcs, hb_draw_extents_move_to, nullptr, nullptr);
+    hb_draw_funcs_set_line_to_func (funcs, hb_draw_extents_line_to, nullptr, nullptr);
+    hb_draw_funcs_set_quadratic_to_func (funcs, hb_draw_extents_quadratic_to, nullptr, nullptr);
+    hb_draw_funcs_set_cubic_to_func (funcs, hb_draw_extents_cubic_to, nullptr, nullptr);
+
+    hb_draw_funcs_make_immutable (funcs);
+
+    hb_atexit (free_static_draw_extents_funcs);
+
+    return funcs;
+  }
+} static_draw_extents_funcs;
+
+static inline
+void free_static_draw_extents_funcs ()
+{
+  static_draw_extents_funcs.free_instance ();
+}
+
+hb_draw_funcs_t *
+hb_draw_extents_get_funcs ()
+{
+  return static_draw_extents_funcs.get_unconst ();
+}
+
+
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.h b/src/java.desktop/share/native/libharfbuzz/hb-draw.h
index 4556b082d60..06299e17a78 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.}, {0.}, {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 2c30843de64..224e10939fe 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-draw.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.hh
@@ -99,6 +99,7 @@ struct hb_draw_funcs_t
            float to_x, float to_y)
   {
     if (unlikely (st.path_open)) close_path (draw_data, st);
+
     st.current_x = to_x;
     st.current_y = to_y;
   }
@@ -109,7 +110,9 @@ struct hb_draw_funcs_t
            float to_x, float to_y)
   {
     if (unlikely (!st.path_open)) start_path (draw_data, st);
+
     emit_line_to (draw_data, st, to_x, to_y);
+
     st.current_x = to_x;
     st.current_y = to_y;
   }
@@ -121,7 +124,9 @@ struct hb_draw_funcs_t
                 float to_x, float to_y)
   {
     if (unlikely (!st.path_open)) start_path (draw_data, st);
+
     emit_quadratic_to (draw_data, st, control_x, control_y, to_x, to_y);
+
     st.current_x = to_x;
     st.current_y = to_y;
   }
@@ -134,7 +139,9 @@ struct hb_draw_funcs_t
             float to_x, float to_y)
   {
     if (unlikely (!st.path_open)) start_path (draw_data, st);
+
     emit_cubic_to (draw_data, st, control1_x, control1_y, control2_x, control2_y, to_x, to_y);
+
     st.current_x = to_x;
     st.current_y = to_y;
   }
@@ -168,9 +175,8 @@ DECLARE_NULL_INSTANCE (hb_draw_funcs_t);
 
 struct hb_draw_session_t
 {
-  hb_draw_session_t (hb_draw_funcs_t *funcs_, void *draw_data_, float slant_ = 0.f)
-    : slant {slant_}, not_slanted {slant == 0.f},
-      funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT
+  hb_draw_session_t (hb_draw_funcs_t *funcs_, void *draw_data_)
+    : funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT
   {}
 
   ~hb_draw_session_t () { close_path (); }
@@ -178,36 +184,23 @@ struct hb_draw_session_t
   HB_ALWAYS_INLINE
   void move_to (float to_x, float to_y)
   {
-    if (likely (not_slanted))
-      funcs->move_to (draw_data, st,
-                      to_x, to_y);
-    else
-      funcs->move_to (draw_data, st,
-                      to_x + to_y * slant, to_y);
+    funcs->move_to (draw_data, st,
+                    to_x, to_y);
   }
   HB_ALWAYS_INLINE
   void line_to (float to_x, float to_y)
   {
-    if (likely (not_slanted))
-      funcs->line_to (draw_data, st,
-                      to_x, to_y);
-    else
-      funcs->line_to (draw_data, st,
-                      to_x + to_y * slant, to_y);
+    funcs->line_to (draw_data, st,
+                    to_x, to_y);
   }
   void
   HB_ALWAYS_INLINE
   quadratic_to (float control_x, float control_y,
                 float to_x, float to_y)
   {
-    if (likely (not_slanted))
-      funcs->quadratic_to (draw_data, st,
-                           control_x, control_y,
-                           to_x, to_y);
-    else
-      funcs->quadratic_to (draw_data, st,
-                           control_x + control_y * slant, control_y,
-                           to_x + to_y * slant, to_y);
+    funcs->quadratic_to (draw_data, st,
+                         control_x, control_y,
+                         to_x, to_y);
   }
   void
   HB_ALWAYS_INLINE
@@ -215,16 +208,10 @@ struct hb_draw_session_t
             float control2_x, float control2_y,
             float to_x, float to_y)
   {
-    if (likely (not_slanted))
-      funcs->cubic_to (draw_data, st,
-                       control1_x, control1_y,
-                       control2_x, control2_y,
-                       to_x, to_y);
-    else
-      funcs->cubic_to (draw_data, st,
-                       control1_x + control1_y * slant, control1_y,
-                       control2_x + control2_y * slant, control2_y,
-                       to_x + to_y * slant, to_y);
+    funcs->cubic_to (draw_data, st,
+                     control1_x, control1_y,
+                     control2_x, control2_y,
+                     to_x, to_y);
   }
   HB_ALWAYS_INLINE
   void close_path ()
@@ -233,11 +220,14 @@ struct hb_draw_session_t
   }
 
   public:
-  float slant;
-  bool not_slanted;
   hb_draw_funcs_t *funcs;
   void *draw_data;
   hb_draw_state_t st;
 };
 
+
+HB_INTERNAL hb_draw_funcs_t *
+hb_draw_extents_get_funcs ();
+
+
 #endif /* HB_DRAW_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
index 7967ae3241b..9d59d7c9468 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
@@ -34,6 +34,16 @@
 #include "hb-ot-face.hh"
 #include "hb-ot-cmap-table.hh"
 
+#ifdef HAVE_FREETYPE
+#include "hb-ft.h"
+#endif
+#ifdef HAVE_CORETEXT
+#include "hb-coretext.h"
+#endif
+#ifdef HAVE_DIRECTWRITE
+#include "hb-directwrite.h"
+#endif
+
 
 /**
  * SECTION:hb-face
@@ -72,14 +82,14 @@ hb_face_count (hb_blob_t *blob)
   if (unlikely (!blob))
     return 0;
 
-  /* TODO We shouldn't be sanitizing blob.  Port to run sanitizer and return if not sane. */
-  /* Make API signature const after. */
-  hb_blob_t *sanitized = hb_sanitize_context_t ().sanitize_blob<OT::OpenTypeFontFile> (hb_blob_reference (blob));
-  const OT::OpenTypeFontFile& ot = *sanitized->as<OT::OpenTypeFontFile> ();
-  unsigned int ret = ot.get_face_count ();
-  hb_blob_destroy (sanitized);
+  hb_sanitize_context_t c (blob);
+
+  const char *start = hb_blob_get_data (blob, nullptr);
+  auto *ot = reinterpret_cast<OT::OpenTypeFontFile *> (const_cast<char *> (start));
+  if (unlikely (!ot->sanitize (&c)))
+    return 0;
 
-  return ret;
+  return ot->get_face_count ();
 }
 
 /*
@@ -318,7 +328,209 @@ hb_face_create_from_file_or_fail (const char   *file_name,
 
   return face;
 }
+
+static struct supported_face_loaders_t {
+        char name[16];
+        hb_face_t * (*from_file) (const char *font_file, unsigned face_index);
+        hb_face_t * (*from_blob) (hb_blob_t *blob, unsigned face_index);
+} supported_face_loaders[] =
+{
+  {"ot",
+#ifndef HB_NO_OPEN
+   hb_face_create_from_file_or_fail,
+#else
+   nullptr,
+#endif
+   hb_face_create_or_fail
+  },
+#ifdef HAVE_FREETYPE
+  {"ft",
+   hb_ft_face_create_from_file_or_fail,
+   hb_ft_face_create_from_blob_or_fail
+  },
+#endif
+#ifdef HAVE_CORETEXT
+  {"coretext",
+   hb_coretext_face_create_from_file_or_fail,
+   hb_coretext_face_create_from_blob_or_fail
+  },
 #endif
+#ifdef HAVE_DIRECTWRITE
+  {"directwrite",
+   hb_directwrite_face_create_from_file_or_fail,
+   hb_directwrite_face_create_from_blob_or_fail
+  },
+#endif
+};
+
+static const char *get_default_loader_name ()
+{
+  static hb_atomic_t<const char *> static_loader_name;
+  const char *loader_name = static_loader_name.get_acquire ();
+  if (!loader_name)
+  {
+    loader_name = getenv ("HB_FACE_LOADER");
+    if (!loader_name)
+      loader_name = "";
+    if (!static_loader_name.cmpexch (nullptr, loader_name))
+      loader_name = static_loader_name.get_acquire ();
+  }
+  return loader_name;
+}
+
+/**
+ * hb_face_create_from_file_or_fail_using:
+ * @file_name: A font filename
+ * @index: The index of the face within the file
+ * @loader_name: (nullable): The name of the loader to use, or `NULL`
+ *
+ * A thin wrapper around the face loader functions registered with HarfBuzz.
+ * If @loader_name is `NULL` or the empty string, the first available loader
+ * is used.
+ *
+ * For example, the FreeType ("ft") loader might be able to load
+ * WOFF and WOFF2 files if FreeType is built with those features,
+ * whereas the OpenType ("ot") loader will not.
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * the file cannot be read or the loader fails to load the face.
+ *
+ * Since: 11.0.0
+ **/
+hb_face_t *
+hb_face_create_from_file_or_fail_using (const char   *file_name,
+                                        unsigned int  index,
+                                        const char   *loader_name)
+{
+  // Duplicated in hb_face_create_or_fail_using
+  bool retry = false;
+  if (!loader_name || !*loader_name)
+  {
+    loader_name = get_default_loader_name ();
+    retry = true;
+  }
+  if (loader_name && !*loader_name) loader_name = nullptr;
+
+retry:
+  for (unsigned i = 0; i < ARRAY_LENGTH (supported_face_loaders); i++)
+  {
+    if (!loader_name || (supported_face_loaders[i].from_file && !strcmp (supported_face_loaders[i].name, loader_name)))
+      return supported_face_loaders[i].from_file (file_name, index);
+  }
+
+  if (retry)
+  {
+    retry = false;
+    loader_name = nullptr;
+    goto retry;
+  }
+
+  return nullptr;
+}
+
+/**
+ * hb_face_create_or_fail_using:
+ * @blob: #hb_blob_t to work upon
+ * @index: The index of the face within @blob
+ * @loader_name: (nullable): The name of the loader to use, or `NULL`
+ *
+ * A thin wrapper around the face loader functions registered with HarfBuzz.
+ * If @loader_name is `NULL` or the empty string, the first available loader
+ * is used.
+ *
+ * For example, the FreeType ("ft") loader might be able to load
+ * WOFF and WOFF2 files if FreeType is built with those features,
+ * whereas the OpenType ("ot") loader will not.
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * the loader fails to load the face.
+ *
+ * Since: 11.0.0
+ **/
+hb_face_t *
+hb_face_create_or_fail_using (hb_blob_t    *blob,
+                              unsigned int  index,
+                              const char   *loader_name)
+{
+  // Duplicated in hb_face_create_from_file_or_fail_using
+  bool retry = false;
+  if (!loader_name || !*loader_name)
+  {
+    loader_name = get_default_loader_name ();
+    retry = true;
+  }
+  if (loader_name && !*loader_name) loader_name = nullptr;
+
+retry:
+  for (unsigned i = 0; i < ARRAY_LENGTH (supported_face_loaders); i++)
+  {
+    if (!loader_name || (supported_face_loaders[i].from_blob && !strcmp (supported_face_loaders[i].name, loader_name)))
+      return supported_face_loaders[i].from_blob (blob, index);
+  }
+
+  if (retry)
+  {
+    retry = false;
+    loader_name = nullptr;
+    goto retry;
+  }
+
+  return nullptr;
+}
+
+static inline void free_static_face_loader_list ();
+
+static const char * const nil_face_loader_list[] = {nullptr};
+
+static struct hb_face_loader_list_lazy_loader_t : hb_lazy_loader_t<const char *,
+                                                                  hb_face_loader_list_lazy_loader_t>
+{
+  static const char ** create ()
+  {
+    const char **face_loader_list = (const char **) hb_calloc (1 + ARRAY_LENGTH (supported_face_loaders), sizeof (const char *));
+    if (unlikely (!face_loader_list))
+      return nullptr;
+
+    unsigned i;
+    for (i = 0; i < ARRAY_LENGTH (supported_face_loaders); i++)
+      face_loader_list[i] = supported_face_loaders[i].name;
+    face_loader_list[i] = nullptr;
+
+    hb_atexit (free_static_face_loader_list);
+
+    return face_loader_list;
+  }
+  static void destroy (const char **l)
+  { hb_free (l); }
+  static const char * const * get_null ()
+  { return nil_face_loader_list; }
+} static_face_loader_list;
+
+static inline
+void free_static_face_loader_list ()
+{
+  static_face_loader_list.free_instance ();
+}
+
+/**
+ * hb_face_list_loaders:
+ *
+ * Retrieves the list of face loaders supported by HarfBuzz.
+ *
+ * Return value: (transfer none) (array zero-terminated=1): a
+ *    `NULL`-terminated array of supported face loaders
+ *    constant strings. The returned array is owned by HarfBuzz
+ *    and should not be modified or freed.
+ *
+ * Since: 11.0.0
+ **/
+const char **
+hb_face_list_loaders ()
+{
+  return static_face_loader_list.get_unconst ();
+}
+#endif
+
 
 /**
  * hb_face_get_empty:
@@ -460,7 +672,7 @@ hb_face_make_immutable (hb_face_t *face)
  * Since: 0.9.2
  **/
 hb_bool_t
-hb_face_is_immutable (const hb_face_t *face)
+hb_face_is_immutable (hb_face_t *face)
 {
   return hb_object_is_immutable (face);
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.h b/src/java.desktop/share/native/libharfbuzz/hb-face.h
index 953298fa50b..2c130f00fee 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.h
@@ -63,10 +63,24 @@ 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_or_fail_using (hb_blob_t    *blob,
+                              unsigned int  index,
+                              const char   *loader_name);
+
 HB_EXTERN hb_face_t *
 hb_face_create_from_file_or_fail (const char   *file_name,
                                   unsigned int  index);
 
+HB_EXTERN hb_face_t *
+hb_face_create_from_file_or_fail_using (const char   *file_name,
+                                        unsigned int  index,
+                                        const char   *loader_name);
+
+HB_EXTERN const char **
+hb_face_list_loaders (void);
+
+
 /**
  * hb_reference_table_func_t:
  * @face: an #hb_face_t to reference table for
@@ -117,7 +131,7 @@ HB_EXTERN void
 hb_face_make_immutable (hb_face_t *face);
 
 HB_EXTERN hb_bool_t
-hb_face_is_immutable (const hb_face_t *face);
+hb_face_is_immutable (hb_face_t *face);
 
 
 HB_EXTERN hb_blob_t *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.hh b/src/java.desktop/share/native/libharfbuzz/hb-face.hh
index 4d12030f187..e58e8f9b94c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.hh
@@ -49,8 +49,8 @@ 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. */
+  mutable hb_atomic_t<unsigned> upem;   /* Units-per-EM. */
+  mutable hb_atomic_t<unsigned> num_glyphs;/* Number of glyphs. */
 
   hb_reference_table_func_t  reference_table_func;
   void                      *user_data;
@@ -70,7 +70,7 @@ struct hb_face_t
     plan_node_t *next;
   };
 #ifndef HB_NO_SHAPER
-  hb_atomic_ptr_t<plan_node_t> shape_plans;
+  hb_atomic_t<plan_node_t *> shape_plans;
 #endif
 
   hb_blob_t *reference_table (hb_tag_t tag) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
index 0c9084c574f..849855e2c22 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
@@ -38,6 +38,22 @@
 #include "hb-ot-var-avar-table.hh"
 #include "hb-ot-var-fvar-table.hh"
 
+#ifndef HB_NO_OT_FONT
+#include "hb-ot.h"
+#endif
+#ifdef HAVE_FREETYPE
+#include "hb-ft.h"
+#endif
+#ifdef HAVE_FONTATIONS
+#include "hb-fontations.h"
+#endif
+#ifdef HAVE_CORETEXT
+#include "hb-coretext.h"
+#endif
+#ifdef HAVE_DIRECTWRITE
+#include "hb-directwrite.h"
+#endif
+
 
 /**
  * SECTION:hb-font
@@ -87,7 +103,7 @@ hb_font_get_font_h_extents_default (hb_font_t         *font,
                                     hb_font_extents_t *extents,
                                     void              *user_data HB_UNUSED)
 {
-  hb_bool_t ret = font->parent->get_font_h_extents (extents);
+  hb_bool_t ret = font->parent->get_font_h_extents (extents, false);
   if (ret) {
     extents->ascender = font->parent_scale_y_distance (extents->ascender);
     extents->descender = font->parent_scale_y_distance (extents->descender);
@@ -112,7 +128,7 @@ hb_font_get_font_v_extents_default (hb_font_t         *font,
                                     hb_font_extents_t *extents,
                                     void              *user_data HB_UNUSED)
 {
-  hb_bool_t ret = font->parent->get_font_v_extents (extents);
+  hb_bool_t ret = font->parent->get_font_v_extents (extents, false);
   if (ret) {
     extents->ascender = font->parent_scale_x_distance (extents->ascender);
     extents->descender = font->parent_scale_x_distance (extents->descender);
@@ -218,10 +234,10 @@ hb_font_get_glyph_h_advance_default (hb_font_t      *font,
   if (font->has_glyph_h_advances_func_set ())
   {
     hb_position_t ret;
-    font->get_glyph_h_advances (1, &glyph, 0, &ret, 0);
+    font->get_glyph_h_advances (1, &glyph, 0, &ret, 0, false);
     return ret;
   }
-  return font->parent_scale_x_distance (font->parent->get_glyph_h_advance (glyph));
+  return font->parent_scale_x_distance (font->parent->get_glyph_h_advance (glyph, false));
 }
 
 static hb_position_t
@@ -243,10 +259,10 @@ hb_font_get_glyph_v_advance_default (hb_font_t      *font,
   if (font->has_glyph_v_advances_func_set ())
   {
     hb_position_t ret;
-    font->get_glyph_v_advances (1, &glyph, 0, &ret, 0);
+    font->get_glyph_v_advances (1, &glyph, 0, &ret, 0, false);
     return ret;
   }
-  return font->parent_scale_y_distance (font->parent->get_glyph_v_advance (glyph));
+  return font->parent_scale_y_distance (font->parent->get_glyph_v_advance (glyph, false));
 }
 
 #define hb_font_get_glyph_h_advances_nil hb_font_get_glyph_h_advances_default
@@ -265,7 +281,7 @@ hb_font_get_glyph_h_advances_default (hb_font_t*            font,
   {
     for (unsigned int i = 0; i < count; i++)
     {
-      *first_advance = font->get_glyph_h_advance (*first_glyph);
+      *first_advance = font->get_glyph_h_advance (*first_glyph, false);
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
@@ -274,7 +290,8 @@ hb_font_get_glyph_h_advances_default (hb_font_t*            font,
 
   font->parent->get_glyph_h_advances (count,
                                       first_glyph, glyph_stride,
-                                      first_advance, advance_stride);
+                                      first_advance, advance_stride,
+                                      false);
   for (unsigned int i = 0; i < count; i++)
   {
     *first_advance = font->parent_scale_x_distance (*first_advance);
@@ -297,7 +314,7 @@ hb_font_get_glyph_v_advances_default (hb_font_t*            font,
   {
     for (unsigned int i = 0; i < count; i++)
     {
-      *first_advance = font->get_glyph_v_advance (*first_glyph);
+      *first_advance = font->get_glyph_v_advance (*first_glyph, false);
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
@@ -306,7 +323,8 @@ hb_font_get_glyph_v_advances_default (hb_font_t*            font,
 
   font->parent->get_glyph_v_advances (count,
                                       first_glyph, glyph_stride,
-                                      first_advance, advance_stride);
+                                      first_advance, advance_stride,
+                                      false);
   for (unsigned int i = 0; i < count; i++)
   {
     *first_advance = font->parent_scale_y_distance (*first_advance);
@@ -426,7 +444,7 @@ hb_font_get_glyph_extents_default (hb_font_t          *font,
                                    hb_glyph_extents_t *extents,
                                    void               *user_data HB_UNUSED)
 {
-  hb_bool_t ret = font->parent->get_glyph_extents (glyph, extents);
+  hb_bool_t ret = font->parent->get_glyph_extents (glyph, extents, false);
   if (ret) {
     font->parent_scale_position (&extents->x_bearing, &extents->y_bearing);
     font->parent_scale_distance (&extents->width, &extents->height);
@@ -456,7 +474,7 @@ hb_font_get_glyph_contour_point_default (hb_font_t      *font,
                                          hb_position_t  *y,
                                          void           *user_data HB_UNUSED)
 {
-  hb_bool_t ret = font->parent->get_glyph_contour_point (glyph, point_index, x, y);
+  hb_bool_t ret = font->parent->get_glyph_contour_point (glyph, point_index, x, y, false);
   if (ret)
     font->parent_scale_position (x, y);
   return ret;
@@ -508,26 +526,28 @@ hb_font_get_glyph_from_name_default (hb_font_t      *font,
   return font->parent->get_glyph_from_name (name, len, glyph);
 }
 
-static void
-hb_font_draw_glyph_nil (hb_font_t       *font HB_UNUSED,
-                        void            *font_data HB_UNUSED,
-                        hb_codepoint_t   glyph,
-                        hb_draw_funcs_t *draw_funcs,
-                        void            *draw_data,
-                        void            *user_data HB_UNUSED)
+static hb_bool_t
+hb_font_draw_glyph_or_fail_nil (hb_font_t       *font HB_UNUSED,
+                                void            *font_data HB_UNUSED,
+                                hb_codepoint_t   glyph,
+                                hb_draw_funcs_t *draw_funcs,
+                                void            *draw_data,
+                                void            *user_data HB_UNUSED)
 {
+  return false;
 }
 
-static void
-hb_font_paint_glyph_nil (hb_font_t *font HB_UNUSED,
-                         void *font_data HB_UNUSED,
-                         hb_codepoint_t glyph HB_UNUSED,
-                         hb_paint_funcs_t *paint_funcs HB_UNUSED,
-                         void *paint_data HB_UNUSED,
-                         unsigned int palette HB_UNUSED,
-                         hb_color_t foreground HB_UNUSED,
-                         void *user_data HB_UNUSED)
+static hb_bool_t
+hb_font_paint_glyph_or_fail_nil (hb_font_t *font HB_UNUSED,
+                                 void *font_data HB_UNUSED,
+                                 hb_codepoint_t glyph HB_UNUSED,
+                                 hb_paint_funcs_t *paint_funcs HB_UNUSED,
+                                 void *paint_data HB_UNUSED,
+                                 unsigned int palette HB_UNUSED,
+                                 hb_color_t foreground HB_UNUSED,
+                                 void *user_data HB_UNUSED)
 {
+  return false;
 }
 
 typedef struct hb_font_draw_glyph_default_adaptor_t {
@@ -535,7 +555,6 @@ typedef struct hb_font_draw_glyph_default_adaptor_t {
   void            *draw_data;
   float            x_scale;
   float            y_scale;
-  float            slant;
 } hb_font_draw_glyph_default_adaptor_t;
 
 static void
@@ -548,10 +567,9 @@ hb_draw_move_to_default (hb_draw_funcs_t *dfuncs HB_UNUSED,
   hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data;
   float x_scale = adaptor->x_scale;
   float y_scale = adaptor->y_scale;
-  float slant   = adaptor->slant;
 
   adaptor->draw_funcs->emit_move_to (adaptor->draw_data, *st,
-                                     x_scale * to_x + slant * to_y, y_scale * to_y);
+                                     x_scale * to_x, y_scale * to_y);
 }
 
 static void
@@ -563,13 +581,12 @@ hb_draw_line_to_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data,
   hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data;
   float x_scale = adaptor->x_scale;
   float y_scale = adaptor->y_scale;
-  float slant   = adaptor->slant;
 
-  st->current_x = st->current_x * x_scale + st->current_y * slant;
+  st->current_x = st->current_x * x_scale;
   st->current_y = st->current_y * y_scale;
 
   adaptor->draw_funcs->emit_line_to (adaptor->draw_data, *st,
-                                     x_scale * to_x + slant * to_y, y_scale * to_y);
+                                     x_scale * to_x, y_scale * to_y);
 }
 
 static void
@@ -582,14 +599,13 @@ hb_draw_quadratic_to_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data
   hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data;
   float x_scale = adaptor->x_scale;
   float y_scale = adaptor->y_scale;
-  float slant   = adaptor->slant;
 
-  st->current_x = st->current_x * x_scale + st->current_y * slant;
+  st->current_x = st->current_x * x_scale;
   st->current_y = st->current_y * y_scale;
 
   adaptor->draw_funcs->emit_quadratic_to (adaptor->draw_data, *st,
-                                          x_scale * control_x + slant * control_y, y_scale * control_y,
-                                          x_scale * to_x + slant * to_y, y_scale * to_y);
+                                          x_scale * control_x, y_scale * control_y,
+                                          x_scale * to_x, y_scale * to_y);
 }
 
 static void
@@ -603,15 +619,14 @@ hb_draw_cubic_to_default (hb_draw_funcs_t *dfuncs HB_UNUSED, void *draw_data,
   hb_font_draw_glyph_default_adaptor_t *adaptor = (hb_font_draw_glyph_default_adaptor_t *) draw_data;
   float x_scale = adaptor->x_scale;
   float y_scale = adaptor->y_scale;
-  float slant   = adaptor->slant;
 
-  st->current_x = st->current_x * x_scale + st->current_y * slant;
+  st->current_x = st->current_x * x_scale;
   st->current_y = st->current_y * y_scale;
 
   adaptor->draw_funcs->emit_cubic_to (adaptor->draw_data, *st,
-                                      x_scale * control1_x + slant * control1_y, y_scale * control1_y,
-                                      x_scale * control2_x + slant * control2_y, y_scale * control2_y,
-                                      x_scale * to_x + slant * to_y, y_scale * to_y);
+                                      x_scale * control1_x, y_scale * control1_y,
+                                      x_scale * control2_x, y_scale * control2_y,
+                                      x_scale * to_x, y_scale * to_y);
 }
 
 static void
@@ -634,49 +649,47 @@ static const hb_draw_funcs_t _hb_draw_funcs_default = {
   }
 };
 
-static void
-hb_font_draw_glyph_default (hb_font_t       *font,
-                                 void            *font_data HB_UNUSED,
-                                 hb_codepoint_t   glyph,
-                                 hb_draw_funcs_t *draw_funcs,
-                                 void            *draw_data,
-                                 void            *user_data HB_UNUSED)
+static hb_bool_t
+hb_font_draw_glyph_or_fail_default (hb_font_t       *font,
+                                    void            *font_data HB_UNUSED,
+                                    hb_codepoint_t   glyph,
+                                    hb_draw_funcs_t *draw_funcs,
+                                    void            *draw_data,
+                                    void            *user_data HB_UNUSED)
 {
   hb_font_draw_glyph_default_adaptor_t adaptor = {
     draw_funcs,
     draw_data,
     font->parent->x_scale ? (float) font->x_scale / (float) font->parent->x_scale : 0.f,
-    font->parent->y_scale ? (float) font->y_scale / (float) font->parent->y_scale : 0.f,
-    font->parent->y_scale ? (font->slant - font->parent->slant) *
-                            (float) font->x_scale / (float) font->parent->y_scale : 0.f
+    font->parent->y_scale ? (float) font->y_scale / (float) font->parent->y_scale : 0.f
   };
 
-  font->parent->draw_glyph (glyph,
-                                 const_cast<hb_draw_funcs_t *> (&_hb_draw_funcs_default),
-                                 &adaptor);
+  return font->parent->draw_glyph_or_fail (glyph,
+                                           const_cast<hb_draw_funcs_t *> (&_hb_draw_funcs_default),
+                                           &adaptor,
+                                           false);
 }
 
-static void
-hb_font_paint_glyph_default (hb_font_t *font,
-                             void *font_data,
-                             hb_codepoint_t glyph,
-                             hb_paint_funcs_t *paint_funcs,
-                             void *paint_data,
-                             unsigned int palette,
-                             hb_color_t foreground,
-                             void *user_data)
+static hb_bool_t
+hb_font_paint_glyph_or_fail_default (hb_font_t *font,
+                                     void *font_data,
+                                     hb_codepoint_t glyph,
+                                     hb_paint_funcs_t *paint_funcs,
+                                     void *paint_data,
+                                     unsigned int palette,
+                                     hb_color_t foreground,
+                                     void *user_data)
 {
   paint_funcs->push_transform (paint_data,
-    font->parent->x_scale ? (float) font->x_scale / (float) font->parent->x_scale : 0.f,
-    font->parent->y_scale ? (font->slant - font->parent->slant) *
-                            (float) font->x_scale / (float) font->parent->y_scale : 0.f,
-    0.f,
-    font->parent->y_scale ? (float) font->y_scale / (float) font->parent->y_scale : 0.f,
-    0.f, 0.f);
+    font->parent->x_scale ? (float) font->x_scale / (float) font->parent->x_scale : 0, 0,
+    0, font->parent->y_scale ? (float) font->y_scale / (float) font->parent->y_scale : 0,
+    0, 0);
 
-  font->parent->paint_glyph (glyph, paint_funcs, paint_data, palette, foreground);
+  bool ret = font->parent->paint_glyph_or_fail (glyph, paint_funcs, paint_data, palette, foreground);
 
   paint_funcs->pop_transform (paint_data);
+
+  return ret;
 }
 
 DEFINE_NULL_INSTANCE (hb_font_funcs_t) =
@@ -1413,6 +1426,92 @@ hb_font_get_glyph_shape (hb_font_t *font,
 }
 #endif
 
+/**
+ * hb_font_draw_glyph_or_fail:
+ * @font: #hb_font_t to work upon
+ * @glyph: The glyph ID
+ * @dfuncs: #hb_draw_funcs_t to draw to
+ * @draw_data: User data to pass to draw callbacks
+ *
+ * Draws the outline that corresponds to a glyph in the specified @font.
+ *
+ * This is a newer name for hb_font_draw_glyph(), that returns `false`
+ * if the font has no outlines for the glyph.
+ *
+ * The outline is returned by way of calls to the callbacks of the @dfuncs
+ * objects, with @draw_data passed to them.
+ *
+ * Return value: `true` if glyph was drawn, `false` otherwise
+ *
+ * XSince: REPLACEME
+ **/
+hb_bool_t
+hb_font_draw_glyph_or_fail (hb_font_t *font,
+                            hb_codepoint_t glyph,
+                            hb_draw_funcs_t *dfuncs, void *draw_data)
+{
+  return font->draw_glyph_or_fail (glyph, dfuncs, draw_data);
+}
+
+/**
+ * hb_font_paint_glyph_or_fail:
+ * @font: #hb_font_t to work upon
+ * @glyph: The glyph ID
+ * @pfuncs: #hb_paint_funcs_t to paint with
+ * @paint_data: User data to pass to paint callbacks
+ * @palette_index: The index of the font's color palette to use
+ * @foreground: The foreground color, unpremultipled
+ *
+ * Paints a color glyph.
+ *
+ * This function is similar to, but lower-level than,
+ * hb_font_paint_glyph(). It is suitable for clients that
+ * need more control.  If there are no color glyphs available,
+ * it will return `false`. The client can then fall back to
+ * hb_font_draw_glyph_or_fail() for the monochrome outline glyph.
+ *
+ * The painting instructions are returned by way of calls to
+ * the callbacks of the @funcs object, with @paint_data passed
+ * to them.
+ *
+ * If the font has color palettes (see hb_ot_color_has_palettes()),
+ * then @palette_index selects the palette to use. If the font only
+ * has one palette, this will be 0.
+ *
+ * Return value: `true` if glyph was painted, `false` otherwise
+ *
+ * XSince: REPLACEME
+ */
+hb_bool_t
+hb_font_paint_glyph_or_fail (hb_font_t *font,
+                             hb_codepoint_t glyph,
+                             hb_paint_funcs_t *pfuncs, void *paint_data,
+                             unsigned int palette_index,
+                             hb_color_t foreground)
+{
+  return font->paint_glyph_or_fail (glyph, pfuncs, paint_data, palette_index, foreground);
+}
+
+/* A bit higher-level, and with fallback */
+
+void
+hb_font_t::paint_glyph (hb_codepoint_t glyph,
+                        hb_paint_funcs_t *paint_funcs, void *paint_data,
+                        unsigned int palette,
+                        hb_color_t foreground)
+{
+  if (paint_glyph_or_fail (glyph,
+                           paint_funcs, paint_data,
+                           palette, foreground))
+    return;
+
+  /* Fallback for outline glyph. */
+  paint_funcs->push_clip_glyph (paint_data, glyph, this);
+  paint_funcs->color (paint_data, true, foreground);
+  paint_funcs->pop_clip (paint_data);
+}
+
+
 /**
  * hb_font_draw_glyph:
  * @font: #hb_font_t to work upon
@@ -1422,6 +1521,9 @@ hb_font_get_glyph_shape (hb_font_t *font,
  *
  * Draws the outline that corresponds to a glyph in the specified @font.
  *
+ * This is an older name for hb_font_draw_glyph_or_fail(), with no
+ * return value.
+ *
  * The outline is returned by way of calls to the callbacks of the @dfuncs
  * objects, with @draw_data passed to them.
  *
@@ -1429,10 +1531,10 @@ hb_font_get_glyph_shape (hb_font_t *font,
  **/
 void
 hb_font_draw_glyph (hb_font_t *font,
-                         hb_codepoint_t glyph,
-                         hb_draw_funcs_t *dfuncs, void *draw_data)
+                    hb_codepoint_t glyph,
+                    hb_draw_funcs_t *dfuncs, void *draw_data)
 {
-  font->draw_glyph (glyph, dfuncs, draw_data);
+  (void) hb_font_draw_glyph_or_fail (font, glyph, dfuncs, draw_data);
 }
 
 /**
@@ -1444,7 +1546,10 @@ hb_font_draw_glyph (hb_font_t *font,
  * @palette_index: The index of the font's color palette to use
  * @foreground: The foreground color, unpremultipled
  *
- * Paints the glyph.
+ * Paints the glyph. This function is similar to
+ * hb_font_paint_glyph_or_fail(), but if painting a color glyph
+ * failed, it will fall back to painting an outline monochrome
+ * glyph.
  *
  * The painting instructions are returned by way of calls to
  * the callbacks of the @funcs object, with @paint_data passed
@@ -1466,8 +1571,6 @@ hb_font_paint_glyph (hb_font_t *font,
   font->paint_glyph (glyph, pfuncs, paint_data, palette_index, foreground);
 }
 
-/* A bit higher-level, and with fallback */
-
 /**
  * hb_font_get_extents_for_direction:
  * @font: #hb_font_t to work upon
@@ -1854,10 +1957,7 @@ hb_font_create (hb_face_t *face)
 {
   hb_font_t *font = _hb_font_create (face);
 
-#ifndef HB_NO_OT_FONT
-  /* Install our in-house, very lightweight, funcs. */
-  hb_ot_font_set_funcs (font);
-#endif
+  hb_font_set_funcs_using (font, nullptr);
 
 #ifndef HB_NO_VAR
   if (face && face->index >> 16)
@@ -1880,7 +1980,8 @@ _hb_font_adopt_var_coords (hb_font_t *font,
   font->design_coords = design_coords;
   font->num_coords = coords_length;
 
-  font->mults_changed (); // Easiest to call this to drop cached data
+  font->changed ();
+  font->serial_coords = font->serial;
 }
 
 /**
@@ -1935,7 +2036,8 @@ hb_font_create_sub_font (hb_font_t *parent)
     }
   }
 
-  font->mults_changed ();
+  font->changed ();
+  font->serial_coords = font->serial;
 
   return font;
 }
@@ -2023,7 +2125,7 @@ hb_font_set_user_data (hb_font_t          *font,
                        hb_bool_t           replace)
 {
   if (!hb_object_is_immutable (font))
-    font->serial++;
+    font->changed ();
 
   return hb_object_set_user_data (font, key, data, destroy, replace);
 }
@@ -2098,7 +2200,7 @@ hb_font_is_immutable (hb_font_t *font)
 unsigned int
 hb_font_get_serial (hb_font_t *font)
 {
-  return font->serial;
+  return font->serial.get_acquire ();
 }
 
 /**
@@ -2117,9 +2219,7 @@ hb_font_changed (hb_font_t *font)
   if (hb_object_is_immutable (font))
     return;
 
-  font->serial++;
-
-  font->mults_changed ();
+  font->changed ();
 }
 
 /**
@@ -2141,8 +2241,6 @@ hb_font_set_parent (hb_font_t *font,
   if (parent == font->parent)
     return;
 
-  font->serial++;
-
   if (!parent)
     parent = hb_font_get_empty ();
 
@@ -2151,6 +2249,8 @@ hb_font_set_parent (hb_font_t *font,
   font->parent = hb_font_reference (parent);
 
   hb_font_destroy (old);
+
+  font->changed ();
 }
 
 /**
@@ -2188,8 +2288,6 @@ hb_font_set_face (hb_font_t *font,
   if (face == font->face)
     return;
 
-  font->serial++;
-
   if (unlikely (!face))
     face = hb_face_get_empty ();
 
@@ -2197,9 +2295,12 @@ hb_font_set_face (hb_font_t *font,
 
   hb_face_make_immutable (face);
   font->face = hb_face_reference (face);
-  font->mults_changed ();
+  font->changed ();
 
   hb_face_destroy (old);
+
+  font->changed ();
+  font->serial_coords = font->serial;
 }
 
 /**
@@ -2244,8 +2345,6 @@ hb_font_set_funcs (hb_font_t         *font,
     return;
   }
 
-  font->serial++;
-
   if (font->destroy)
     font->destroy (font->user_data);
 
@@ -2257,6 +2356,8 @@ hb_font_set_funcs (hb_font_t         *font,
   font->klass = klass;
   font->user_data = font_data;
   font->destroy = destroy;
+
+  font->changed ();
 }
 
 /**
@@ -2283,15 +2384,151 @@ hb_font_set_funcs_data (hb_font_t         *font,
     return;
   }
 
-  font->serial++;
-
   if (font->destroy)
     font->destroy (font->user_data);
 
   font->user_data = font_data;
   font->destroy = destroy;
+
+  font->changed ();
+}
+
+static struct supported_font_funcs_t {
+        char name[16];
+        void (*func) (hb_font_t *);
+} supported_font_funcs[] =
+{
+#ifndef HB_NO_OT_FONT
+  {"ot",        hb_ot_font_set_funcs},
+#endif
+#ifdef HAVE_FREETYPE
+  {"ft",        hb_ft_font_set_funcs},
+#endif
+#ifdef HAVE_FONTATIONS
+  {"fontations",hb_fontations_font_set_funcs},
+#endif
+#ifdef HAVE_CORETEXT
+  {"coretext",  hb_coretext_font_set_funcs},
+#endif
+#ifdef HAVE_DIRECTWRITE
+  {"directwrite",hb_directwrite_font_set_funcs},
+#endif
+};
+
+static const char *get_default_funcs_name ()
+{
+  static hb_atomic_t<const char *> static_funcs_name;
+  const char *name = static_funcs_name.get_acquire ();
+  if (!name)
+  {
+    name = getenv ("HB_FONT_FUNCS");
+    if (!name)
+      name = "";
+    if (!static_funcs_name.cmpexch (nullptr, name))
+      name = static_funcs_name.get_acquire ();
+  }
+  return name;
+}
+
+/**
+ * hb_font_set_funcs_using:
+ * @font: #hb_font_t to work upon
+ * @name: The name of the font-functions structure to use, or `NULL`
+ *
+ * Sets the font-functions structure to use for a font, based on the
+ * specified name.
+ *
+ * If @name is `NULL` or the empty string, the default (first) functioning font-functions
+ * are used.  This default can be changed by setting the `HB_FONT_FUNCS` environment
+ * variable to the name of the desired font-functions.
+ *
+ * Return value: `true` if the font-functions was found and set, `false` otherwise
+ *
+ * Since: 11.0.0
+ **/
+hb_bool_t
+hb_font_set_funcs_using (hb_font_t  *font,
+                         const char *name)
+{
+  bool retry = false;
+
+  if (!name || !*name)
+  {
+    name = get_default_funcs_name ();
+    retry = true;
+  }
+  if (name && !*name) name = nullptr;
+
+retry:
+  for (unsigned i = 0; i < ARRAY_LENGTH (supported_font_funcs); i++)
+    if (!name || strcmp (supported_font_funcs[i].name, name) == 0)
+    {
+      supported_font_funcs[i].func (font);
+      if (name || font->klass != hb_font_funcs_get_empty ())
+        return true;
+    }
+
+  if (retry)
+  {
+    retry = false;
+    name = nullptr;
+    goto retry;
+  }
+
+  return false;
 }
 
+static inline void free_static_font_funcs_list ();
+
+static const char * const nil_font_funcs_list[] = {nullptr};
+
+static struct hb_font_funcs_list_lazy_loader_t : hb_lazy_loader_t<const char *,
+                                                                  hb_font_funcs_list_lazy_loader_t>
+{
+  static const char ** create ()
+  {
+    const char **font_funcs_list = (const char **) hb_calloc (1 + ARRAY_LENGTH (supported_font_funcs), sizeof (const char *));
+    if (unlikely (!font_funcs_list))
+      return nullptr;
+
+    unsigned i;
+    for (i = 0; i < ARRAY_LENGTH (supported_font_funcs); i++)
+      font_funcs_list[i] = supported_font_funcs[i].name;
+    font_funcs_list[i] = nullptr;
+
+    hb_atexit (free_static_font_funcs_list);
+
+    return font_funcs_list;
+  }
+  static void destroy (const char **l)
+  { hb_free (l); }
+  static const char * const * get_null ()
+  { return nil_font_funcs_list; }
+} static_font_funcs_list;
+
+static inline
+void free_static_font_funcs_list ()
+{
+  static_font_funcs_list.free_instance ();
+}
+
+/**
+ * hb_font_list_funcs:
+ *
+ * Retrieves the list of font functions supported by HarfBuzz.
+ *
+ * Return value: (transfer none) (array zero-terminated=1): a
+ *    `NULL`-terminated array of supported font functions
+ *    constant strings. The returned array is owned by HarfBuzz
+ *    and should not be modified or freed.
+ *
+ * Since: 11.0.0
+ **/
+const char **
+hb_font_list_funcs ()
+{
+  return static_font_funcs_list.get_unconst ();
+}
 
 /**
  * hb_font_set_scale:
@@ -2339,11 +2576,10 @@ hb_font_set_scale (hb_font_t *font,
   if (font->x_scale == x_scale && font->y_scale == y_scale)
     return;
 
-  font->serial++;
-
   font->x_scale = x_scale;
   font->y_scale = y_scale;
-  font->mults_changed ();
+
+  font->changed ();
 }
 
 /**
@@ -2390,10 +2626,10 @@ hb_font_set_ppem (hb_font_t    *font,
   if (font->x_ppem == x_ppem && font->y_ppem == y_ppem)
     return;
 
-  font->serial++;
-
   font->x_ppem = x_ppem;
   font->y_ppem = y_ppem;
+
+  font->changed ();
 }
 
 /**
@@ -2437,9 +2673,9 @@ hb_font_set_ptem (hb_font_t *font,
   if (font->ptem == ptem)
     return;
 
-  font->serial++;
-
   font->ptem = ptem;
+
+  font->changed ();
 }
 
 /**
@@ -2459,6 +2695,23 @@ hb_font_get_ptem (hb_font_t *font)
   return font->ptem;
 }
 
+/**
+ * hb_font_is_synthetic:
+ * @font: #hb_font_t to work upon
+ *
+ * Tests whether a font is synthetic. A synthetic font is one
+ * that has either synthetic slant or synthetic bold set on it.
+ *
+ * Return value: `true` if the font is synthetic, `false` otherwise.
+ *
+ * XSince: REPLACEME
+ */
+hb_bool_t
+hb_font_is_synthetic (hb_font_t *font)
+{
+  return font->is_synthetic ();
+}
+
 /**
  * hb_font_set_synthetic_bold:
  * @font: #hb_font_t to work upon
@@ -2476,7 +2729,7 @@ hb_font_get_ptem (hb_font_t *font)
  * points of the glyph shape.
  *
  * Synthetic boldness is applied when rendering a glyph via
- * hb_font_draw_glyph().
+ * hb_font_draw_glyph_or_fail().
  *
  * If @in_place is `false`, then glyph advance-widths are also
  * adjusted, otherwise they are not.  The in-place mode is
@@ -2499,12 +2752,11 @@ hb_font_set_synthetic_bold (hb_font_t *font,
       font->embolden_in_place == (bool) in_place)
     return;
 
-  font->serial++;
-
   font->x_embolden = x_embolden;
   font->y_embolden = y_embolden;
   font->embolden_in_place = in_place;
-  font->mults_changed ();
+
+  font->changed ();
 }
 
 /**
@@ -2541,7 +2793,7 @@ hb_font_get_synthetic_bold (hb_font_t *font,
  * HarfBuzz needs to know this value to adjust shaping results,
  * metrics, and style values to match the slanted rendering.
  *
- * <note>Note: The glyph shape fetched via the hb_font_draw_glyph()
+ * <note>Note: The glyph shape fetched via the hb_font_draw_glyph_or_fail()
  * function is slanted to reflect this value as well.</note>
  *
  * <note>Note: The slant value is a ratio.  For example, a
@@ -2558,10 +2810,9 @@ hb_font_set_synthetic_slant (hb_font_t *font, float slant)
   if (font->slant == slant)
     return;
 
-  font->serial++;
-
   font->slant = slant;
-  font->mults_changed ();
+
+  font->changed ();
 }
 
 /**
@@ -2607,8 +2858,6 @@ hb_font_set_variations (hb_font_t            *font,
   if (hb_object_is_immutable (font))
     return;
 
-  font->serial_coords = ++font->serial;
-
   if (!variations_length && font->instance_index == HB_FONT_NO_VAR_NAMED_INSTANCE)
   {
     hb_font_set_var_coords_normalized (font, nullptr, 0);
@@ -2677,8 +2926,6 @@ hb_font_set_variation (hb_font_t *font,
   if (hb_object_is_immutable (font))
     return;
 
-  font->serial_coords = ++font->serial;
-
   // TODO Share some of this code with set_variations()
 
   const OT::fvar &fvar = *font->face->table.fvar;
@@ -2749,8 +2996,6 @@ hb_font_set_var_coords_design (hb_font_t    *font,
   if (hb_object_is_immutable (font))
     return;
 
-  font->serial_coords = ++font->serial;
-
   int *normalized = coords_length ? (int *) hb_calloc (coords_length, sizeof (int)) : nullptr;
   float *design_coords = coords_length ? (float *) hb_calloc (coords_length, sizeof (float)) : nullptr;
 
@@ -2787,8 +3032,6 @@ hb_font_set_var_named_instance (hb_font_t *font,
   if (font->instance_index == instance_index)
     return;
 
-  font->serial_coords = ++font->serial;
-
   font->instance_index = instance_index;
   hb_font_set_variations (font, nullptr, 0);
 }
@@ -2834,8 +3077,6 @@ hb_font_set_var_coords_normalized (hb_font_t    *font,
   if (hb_object_is_immutable (font))
     return;
 
-  font->serial_coords = ++font->serial;
-
   int *copy = coords_length ? (int *) hb_calloc (coords_length, sizeof (coords[0])) : nullptr;
   int *unmapped = coords_length ? (int *) hb_calloc (coords_length, sizeof (coords[0])) : nullptr;
   float *design_coords = coords_length ? (float *) hb_calloc (coords_length, sizeof (design_coords[0])) : nullptr;
@@ -3058,12 +3299,134 @@ hb_font_funcs_set_glyph_func (hb_font_funcs_t          *ffuncs,
 
 
 #ifndef HB_DISABLE_DEPRECATED
+
+struct hb_draw_glyph_closure_t
+{
+  hb_font_draw_glyph_func_t func;
+  void *user_data;
+  hb_destroy_func_t destroy;
+};
+static hb_bool_t
+hb_font_draw_glyph_trampoline (hb_font_t       *font,
+                               void            *font_data,
+                               hb_codepoint_t   glyph,
+                               hb_draw_funcs_t *draw_funcs,
+                               void            *draw_data,
+                               void            *user_data)
+{
+  hb_draw_glyph_closure_t *closure = (hb_draw_glyph_closure_t *) user_data;
+  closure->func (font, font_data, glyph, draw_funcs, draw_data, closure->user_data);
+  return true;
+}
+static void
+hb_font_draw_glyph_closure_destroy (void *user_data)
+{
+  hb_draw_glyph_closure_t *closure = (hb_draw_glyph_closure_t *) user_data;
+
+  if (closure->destroy)
+    closure->destroy (closure->user_data);
+  hb_free (closure);
+}
+static void
+_hb_font_funcs_set_draw_glyph_func (hb_font_funcs_t           *ffuncs,
+                                    hb_font_draw_glyph_func_t  func,
+                                    void                      *user_data,
+                                    hb_destroy_func_t          destroy /* May be NULL. */)
+{
+  if (hb_object_is_immutable (ffuncs))
+  {
+    if (destroy)
+      destroy (user_data);
+    return;
+  }
+  hb_draw_glyph_closure_t *closure = (hb_draw_glyph_closure_t *) hb_calloc (1, sizeof (hb_draw_glyph_closure_t));
+  if (unlikely (!closure))
+  {
+    if (destroy)
+      destroy (user_data);
+    return;
+  }
+  closure->func = func;
+  closure->user_data = user_data;
+  closure->destroy = destroy;
+
+  hb_font_funcs_set_draw_glyph_or_fail_func (ffuncs,
+                                             hb_font_draw_glyph_trampoline,
+                                             closure,
+                                             hb_font_draw_glyph_closure_destroy);
+}
+void
+hb_font_funcs_set_draw_glyph_func (hb_font_funcs_t           *ffuncs,
+                                   hb_font_draw_glyph_func_t  func,
+                                   void                      *user_data,
+                                   hb_destroy_func_t          destroy /* May be NULL. */)
+{
+  _hb_font_funcs_set_draw_glyph_func (ffuncs, func, user_data, destroy);
+}
 void
 hb_font_funcs_set_glyph_shape_func (hb_font_funcs_t               *ffuncs,
                                    hb_font_get_glyph_shape_func_t  func,
                                    void                           *user_data,
                                    hb_destroy_func_t               destroy /* May be NULL. */)
 {
-  hb_font_funcs_set_draw_glyph_func (ffuncs, func, user_data, destroy);
+  _hb_font_funcs_set_draw_glyph_func (ffuncs, func, user_data, destroy);
+}
+
+struct hb_paint_glyph_closure_t
+{
+  hb_font_paint_glyph_func_t func;
+  void *user_data;
+  hb_destroy_func_t destroy;
+};
+static hb_bool_t
+hb_font_paint_glyph_trampoline (hb_font_t        *font,
+                                void *font_data,
+                                hb_codepoint_t glyph,
+                                hb_paint_funcs_t *paint_funcs,
+                                void *paint_data,
+                                unsigned int palette,
+                                hb_color_t foreground,
+                                void *user_data)
+{
+  hb_paint_glyph_closure_t *closure = (hb_paint_glyph_closure_t *) user_data;
+  closure->func (font, font_data, glyph, paint_funcs, paint_data, palette, foreground, closure->user_data);
+  return true;
+}
+static void
+hb_font_paint_glyph_closure_destroy (void *user_data)
+{
+  hb_paint_glyph_closure_t *closure = (hb_paint_glyph_closure_t *) user_data;
+
+  if (closure->destroy)
+    closure->destroy (closure->user_data);
+  hb_free (closure);
+}
+void
+hb_font_funcs_set_paint_glyph_func (hb_font_funcs_t           *ffuncs,
+                                    hb_font_paint_glyph_func_t  func,
+                                    void                      *user_data,
+                                    hb_destroy_func_t          destroy /* May be NULL. */)
+{
+  if (hb_object_is_immutable (ffuncs))
+  {
+    if (destroy)
+      destroy (user_data);
+    return;
+  }
+  hb_paint_glyph_closure_t *closure = (hb_paint_glyph_closure_t *) hb_calloc (1, sizeof (hb_paint_glyph_closure_t));
+  if (unlikely (!closure))
+  {
+    if (destroy)
+      destroy (user_data);
+    return;
+  }
+  closure->func = func;
+  closure->user_data = user_data;
+  closure->destroy = destroy;
+
+  hb_font_funcs_set_paint_glyph_or_fail_func (ffuncs,
+                                              hb_font_paint_glyph_trampoline,
+                                              closure,
+                                              hb_font_paint_glyph_closure_destroy);
 }
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.h b/src/java.desktop/share/native/libharfbuzz/hb-font.h
index f16658d9d88..4e267ba6a80 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.h
@@ -486,7 +486,7 @@ typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *
                                                          void *user_data);
 
 /**
- * hb_font_draw_glyph_func_t:
+ * hb_font_draw_glyph_or_fail_func_t:
  * @font: #hb_font_t to work upon
  * @font_data: @font user data pointer
  * @glyph: The glyph ID to query
@@ -496,16 +496,17 @@ typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * Since: 7.0.0
+ * Return value: `true` if glyph was drawn, `false` otherwise
  *
+ * XSince: REPLACEME
  **/
-typedef void (*hb_font_draw_glyph_func_t) (hb_font_t *font, void *font_data,
-                                           hb_codepoint_t glyph,
-                                           hb_draw_funcs_t *draw_funcs, void *draw_data,
-                                           void *user_data);
+typedef hb_bool_t (*hb_font_draw_glyph_or_fail_func_t) (hb_font_t *font, void *font_data,
+                                                        hb_codepoint_t glyph,
+                                                        hb_draw_funcs_t *draw_funcs, void *draw_data,
+                                                        void *user_data);
 
 /**
- * hb_font_paint_glyph_func_t:
+ * hb_font_paint_glyph_or_fail_func_t:
  * @font: #hb_font_t to work upon
  * @font_data: @font user data pointer
  * @glyph: The glyph ID to query
@@ -517,14 +518,16 @@ typedef void (*hb_font_draw_glyph_func_t) (hb_font_t *font, void *font_data,
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * Since: 7.0.0
+ * Return value: `true` if glyph was painted, `false` otherwise
+ *
+ * XSince: REPLACEME
  */
-typedef void (*hb_font_paint_glyph_func_t) (hb_font_t *font, void *font_data,
-                                            hb_codepoint_t glyph,
-                                            hb_paint_funcs_t *paint_funcs, void *paint_data,
-                                            unsigned int palette_index,
-                                            hb_color_t foreground,
-                                            void *user_data);
+typedef hb_bool_t (*hb_font_paint_glyph_or_fail_func_t) (hb_font_t *font, void *font_data,
+                                                         hb_codepoint_t glyph,
+                                                         hb_paint_funcs_t *paint_funcs, void *paint_data,
+                                                         unsigned int palette_index,
+                                                         hb_color_t foreground,
+                                                         void *user_data);
 
 /* func setters */
 
@@ -785,36 +788,36 @@ hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs,
                                         void *user_data, hb_destroy_func_t destroy);
 
 /**
- * hb_font_funcs_set_draw_glyph_func:
+ * hb_font_funcs_set_draw_glyph_or_fail_func:
  * @ffuncs: A font-function structure
  * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
  * @user_data: Data to pass to @func
  * @destroy: (nullable): The function to call when @user_data is not needed anymore
  *
- * Sets the implementation function for #hb_font_draw_glyph_func_t.
+ * Sets the implementation function for #hb_font_draw_glyph_or_fail_func_t.
  *
- * Since: 7.0.0
+ * XSince: REPLACEME
  **/
 HB_EXTERN void
-hb_font_funcs_set_draw_glyph_func (hb_font_funcs_t *ffuncs,
-                                   hb_font_draw_glyph_func_t func,
-                                   void *user_data, hb_destroy_func_t destroy);
+hb_font_funcs_set_draw_glyph_or_fail_func (hb_font_funcs_t *ffuncs,
+                                           hb_font_draw_glyph_or_fail_func_t func,
+                                           void *user_data, hb_destroy_func_t destroy);
 
 /**
- * hb_font_funcs_set_paint_glyph_func:
+ * hb_font_funcs_set_paint_glyph_or_fail_func:
  * @ffuncs: A font-function structure
  * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
  * @user_data: Data to pass to @func
  * @destroy: (nullable): The function to call when @user_data is no longer needed
  *
- * Sets the implementation function for #hb_font_paint_glyph_func_t.
+ * Sets the implementation function for #hb_font_paint_glyph_or_fail_func_t.
  *
- * Since: 7.0.0
+ * XSince: REPLACEME
  */
 HB_EXTERN void
-hb_font_funcs_set_paint_glyph_func (hb_font_funcs_t *ffuncs,
-                                    hb_font_paint_glyph_func_t func,
-                                    void *user_data, hb_destroy_func_t destroy);
+hb_font_funcs_set_paint_glyph_or_fail_func (hb_font_funcs_t *ffuncs,
+                                            hb_font_paint_glyph_or_fail_func_t func,
+                                            void *user_data, hb_destroy_func_t destroy);
 
 /* func dispatch */
 
@@ -896,17 +899,17 @@ hb_font_get_glyph_from_name (hb_font_t *font,
                              const char *name, int len, /* -1 means nul-terminated */
                              hb_codepoint_t *glyph);
 
-HB_EXTERN void
-hb_font_draw_glyph (hb_font_t *font,
-                    hb_codepoint_t glyph,
-                    hb_draw_funcs_t *dfuncs, void *draw_data);
+HB_EXTERN hb_bool_t
+hb_font_draw_glyph_or_fail (hb_font_t *font,
+                            hb_codepoint_t glyph,
+                            hb_draw_funcs_t *dfuncs, void *draw_data);
 
-HB_EXTERN void
-hb_font_paint_glyph (hb_font_t *font,
-                     hb_codepoint_t glyph,
-                     hb_paint_funcs_t *pfuncs, void *paint_data,
-                     unsigned int palette_index,
-                     hb_color_t foreground);
+HB_EXTERN hb_bool_t
+hb_font_paint_glyph_or_fail (hb_font_t *font,
+                             hb_codepoint_t glyph,
+                             hb_paint_funcs_t *pfuncs, void *paint_data,
+                             unsigned int palette_index,
+                             hb_color_t foreground);
 
 /* high-level funcs, with fallback */
 
@@ -979,6 +982,19 @@ hb_font_glyph_from_string (hb_font_t *font,
                            const char *s, int len, /* -1 means nul-terminated */
                            hb_codepoint_t *glyph);
 
+/* Older alias for hb_font_draw_glyph_or_fail() with no return value. */
+HB_EXTERN void
+hb_font_draw_glyph (hb_font_t *font,
+                    hb_codepoint_t glyph,
+                    hb_draw_funcs_t *dfuncs, void *draw_data);
+
+/* Paints color glyph; if failed, draws outline glyph. */
+HB_EXTERN void
+hb_font_paint_glyph (hb_font_t *font,
+                     hb_codepoint_t glyph,
+                     hb_paint_funcs_t *pfuncs, void *paint_data,
+                     unsigned int palette_index,
+                     hb_color_t foreground);
 
 /*
  * hb_font_t
@@ -1052,6 +1068,12 @@ hb_font_set_funcs_data (hb_font_t         *font,
                         void              *font_data,
                         hb_destroy_func_t  destroy);
 
+HB_EXTERN hb_bool_t
+hb_font_set_funcs_using (hb_font_t  *font,
+                         const char *name);
+
+HB_EXTERN const char **
+hb_font_list_funcs (void);
 
 HB_EXTERN void
 hb_font_set_scale (hb_font_t *font,
@@ -1086,6 +1108,9 @@ hb_font_set_ptem (hb_font_t *font, float ptem);
 HB_EXTERN float
 hb_font_get_ptem (hb_font_t *font);
 
+HB_EXTERN hb_bool_t
+hb_font_is_synthetic (hb_font_t *font);
+
 HB_EXTERN void
 hb_font_set_synthetic_bold (hb_font_t *font,
                             float x_embolden, float y_embolden,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.hh b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
index 8273f347562..69d8d4b09df 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
@@ -32,7 +32,11 @@
 #include "hb.hh"
 
 #include "hb-face.hh"
+#include "hb-atomic.hh"
+#include "hb-draw.hh"
+#include "hb-paint-extents.hh"
 #include "hb-shaper.hh"
+#include "hb-outline.hh"
 
 
 /*
@@ -57,8 +61,8 @@
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_contour_point) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_name) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_from_name) \
-  HB_FONT_FUNC_IMPLEMENT (,draw_glyph) \
-  HB_FONT_FUNC_IMPLEMENT (,paint_glyph) \
+  HB_FONT_FUNC_IMPLEMENT (,draw_glyph_or_fail) \
+  HB_FONT_FUNC_IMPLEMENT (,paint_glyph_or_fail) \
   /* ^--- Add new callbacks here */
 
 struct hb_font_funcs_t
@@ -105,8 +109,8 @@ DECLARE_NULL_INSTANCE (hb_font_funcs_t);
 struct hb_font_t
 {
   hb_object_header_t header;
-  unsigned int serial;
-  unsigned int serial_coords;
+  hb_atomic_t<unsigned> serial;
+  hb_atomic_t<unsigned> serial_coords;
 
   hb_font_t *parent;
   hb_face_t *face;
@@ -191,23 +195,35 @@ struct hb_font_t
 
   void scale_glyph_extents (hb_glyph_extents_t *extents)
   {
-    float x1 = em_fscale_x (extents->x_bearing);
-    float y1 = em_fscale_y (extents->y_bearing);
-    float x2 = em_fscale_x (extents->x_bearing + extents->width);
-    float y2 = em_fscale_y (extents->y_bearing + extents->height);
+    float x1 = em_scale_x (extents->x_bearing);
+    float y1 = em_scale_y (extents->y_bearing);
+    float x2 = em_scale_x (extents->x_bearing + extents->width);
+    float y2 = em_scale_y (extents->y_bearing + extents->height);
 
-    /* Apply slant. */
+    extents->x_bearing = roundf (x1);
+    extents->y_bearing = roundf (y1);
+    extents->width = roundf (x2) - extents->x_bearing;
+    extents->height = roundf (y2) - extents->y_bearing;
+  }
+
+  void synthetic_glyph_extents (hb_glyph_extents_t *extents)
+  {
+    /* Slant. */
     if (slant_xy)
     {
-      x1 += hb_min (y1 * slant_xy, y2 * slant_xy);
-      x2 += hb_max (y1 * slant_xy, y2 * slant_xy);
-    }
+      hb_position_t x1 = extents->x_bearing;
+      hb_position_t y1 = extents->y_bearing;
+      hb_position_t x2 = extents->x_bearing + extents->width;
+      hb_position_t y2 = extents->y_bearing + extents->height;
+
+      x1 += floorf (hb_min (y1 * slant_xy, y2 * slant_xy));
+      x2 += ceilf (hb_max (y1 * slant_xy, y2 * slant_xy));
 
-    extents->x_bearing = floorf (x1);
-    extents->y_bearing = floorf (y1);
-    extents->width = ceilf (x2) - extents->x_bearing;
-    extents->height = ceilf (y2) - extents->y_bearing;
+      extents->x_bearing = x1;
+      extents->width = x2 - extents->x_bearing;
+    }
 
+    /* Embolden. */
     if (x_strength || y_strength)
     {
       /* Y */
@@ -250,19 +266,45 @@ struct hb_font_t
   HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
 #undef HB_FONT_FUNC_IMPLEMENT
 
-  hb_bool_t get_font_h_extents (hb_font_extents_t *extents)
+  hb_bool_t get_font_h_extents (hb_font_extents_t *extents,
+                                bool synthetic = true)
   {
     hb_memset (extents, 0, sizeof (*extents));
-    return klass->get.f.font_h_extents (this, user_data,
-                                        extents,
-                                        !klass->user_data ? nullptr : klass->user_data->font_h_extents);
+    bool ret = klass->get.f.font_h_extents (this, user_data,
+                                            extents,
+                                            !klass->user_data ? nullptr : klass->user_data->font_h_extents);
+
+    if (synthetic && ret)
+    {
+      /* Embolden */
+      int y_shift = y_scale < 0 ? -y_strength : y_strength;
+      extents->ascender += y_shift;
+    }
+
+    return ret;
   }
-  hb_bool_t get_font_v_extents (hb_font_extents_t *extents)
+  hb_bool_t get_font_v_extents (hb_font_extents_t *extents,
+                                bool synthetic = true)
   {
     hb_memset (extents, 0, sizeof (*extents));
-    return klass->get.f.font_v_extents (this, user_data,
-                                        extents,
-                                        !klass->user_data ? nullptr : klass->user_data->font_v_extents);
+    bool ret = klass->get.f.font_v_extents (this, user_data,
+                                            extents,
+                                            !klass->user_data ? nullptr : klass->user_data->font_v_extents);
+
+    if (synthetic && ret)
+    {
+      /* Embolden */
+      int x_shift = x_scale < 0 ? -x_strength : x_strength;
+      if (embolden_in_place)
+      {
+        extents->ascender += x_shift / 2;
+        extents->descender -= x_shift - x_shift / 2;
+      }
+      else
+        extents->ascender += x_shift;
+    }
+
+    return ret;
   }
 
   bool has_glyph (hb_codepoint_t unicode)
@@ -303,44 +345,88 @@ struct hb_font_t
                                          !klass->user_data ? nullptr : klass->user_data->variation_glyph);
   }
 
-  hb_position_t get_glyph_h_advance (hb_codepoint_t glyph)
+  hb_position_t get_glyph_h_advance (hb_codepoint_t glyph,
+                                     bool synthetic = true)
   {
-    return klass->get.f.glyph_h_advance (this, user_data,
-                                         glyph,
-                                         !klass->user_data ? nullptr : klass->user_data->glyph_h_advance);
+    hb_position_t advance = klass->get.f.glyph_h_advance (this, user_data,
+                                                          glyph,
+                                                          !klass->user_data ? nullptr : klass->user_data->glyph_h_advance);
+
+    if (synthetic && x_strength && !embolden_in_place)
+    {
+      /* Embolden */
+      hb_position_t strength = x_scale >= 0 ? x_strength : -x_strength;
+      advance += advance ? strength : 0;
+    }
+
+    return advance;
   }
 
-  hb_position_t get_glyph_v_advance (hb_codepoint_t glyph)
+  hb_position_t get_glyph_v_advance (hb_codepoint_t glyph,
+                                     bool synthetic = true)
   {
-    return klass->get.f.glyph_v_advance (this, user_data,
-                                         glyph,
-                                         !klass->user_data ? nullptr : klass->user_data->glyph_v_advance);
+    hb_position_t advance = klass->get.f.glyph_v_advance (this, user_data,
+                                                          glyph,
+                                                          !klass->user_data ? nullptr : klass->user_data->glyph_v_advance);
+
+    if (synthetic && y_strength && !embolden_in_place)
+    {
+      /* Embolden */
+      hb_position_t strength = y_scale >= 0 ? y_strength : -y_strength;
+      advance += advance ? strength : 0;
+    }
+
+    return advance;
   }
 
   void get_glyph_h_advances (unsigned int count,
                              const hb_codepoint_t *first_glyph,
                              unsigned int glyph_stride,
                              hb_position_t *first_advance,
-                             unsigned int advance_stride)
+                             unsigned int advance_stride,
+                             bool synthetic = true)
   {
-    return klass->get.f.glyph_h_advances (this, user_data,
-                                          count,
-                                          first_glyph, glyph_stride,
-                                          first_advance, advance_stride,
-                                          !klass->user_data ? nullptr : klass->user_data->glyph_h_advances);
+    klass->get.f.glyph_h_advances (this, user_data,
+                                   count,
+                                   first_glyph, glyph_stride,
+                                   first_advance, advance_stride,
+                                   !klass->user_data ? nullptr : klass->user_data->glyph_h_advances);
+
+    if (synthetic && x_strength && !embolden_in_place)
+    {
+      /* Embolden */
+      hb_position_t strength = x_scale >= 0 ? x_strength : -x_strength;
+      for (unsigned int i = 0; i < count; i++)
+      {
+        *first_advance += *first_advance ? strength : 0;
+        first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+      }
+    }
   }
 
   void get_glyph_v_advances (unsigned int count,
                              const hb_codepoint_t *first_glyph,
                              unsigned int glyph_stride,
                              hb_position_t *first_advance,
-                             unsigned int advance_stride)
+                             unsigned int advance_stride,
+                             bool synthetic = true)
   {
-    return klass->get.f.glyph_v_advances (this, user_data,
-                                          count,
-                                          first_glyph, glyph_stride,
-                                          first_advance, advance_stride,
-                                          !klass->user_data ? nullptr : klass->user_data->glyph_v_advances);
+    klass->get.f.glyph_v_advances (this, user_data,
+                                   count,
+                                   first_glyph, glyph_stride,
+                                   first_advance, advance_stride,
+                                   !klass->user_data ? nullptr : klass->user_data->glyph_v_advances);
+
+    if (synthetic && y_strength && !embolden_in_place)
+    {
+      /* Embolden */
+      hb_position_t strength = y_scale >= 0 ? y_strength : -y_strength;
+      for (unsigned int i = 0; i < count; i++)
+      {
+        *first_advance += *first_advance ? strength : 0;
+        first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+      }
+    }
   }
 
   hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph,
@@ -386,23 +472,82 @@ struct hb_font_t
   }
 
   hb_bool_t get_glyph_extents (hb_codepoint_t glyph,
-                               hb_glyph_extents_t *extents)
+                               hb_glyph_extents_t *extents,
+                               bool synthetic = true)
   {
     hb_memset (extents, 0, sizeof (*extents));
-    return klass->get.f.glyph_extents (this, user_data,
-                                       glyph,
-                                       extents,
-                                       !klass->user_data ? nullptr : klass->user_data->glyph_extents);
+
+    /* This is rather messy, but necessary. */
+
+    if (!synthetic)
+    {
+      return klass->get.f.glyph_extents (this, user_data,
+                                         glyph,
+                                         extents,
+                                         !klass->user_data ? nullptr : klass->user_data->glyph_extents);
+    }
+    if (!is_synthetic () &&
+        klass->get.f.glyph_extents (this, user_data,
+                                    glyph,
+                                    extents,
+                                    !klass->user_data ? nullptr : klass->user_data->glyph_extents))
+      return true;
+
+    /* Try getting extents from paint(), then draw(), *then* get_extents()
+     * and apply synthetic settings in the last case. */
+
+    hb_paint_extents_context_t paint_extents;
+    if (paint_glyph_or_fail (glyph,
+                             hb_paint_extents_get_funcs (), &paint_extents,
+                             0, 0))
+    {
+      *extents = paint_extents.get_extents ().to_glyph_extents ();
+      return true;
+    }
+
+    hb_extents_t draw_extents;
+    if (draw_glyph_or_fail (glyph,
+                            hb_draw_extents_get_funcs (), &draw_extents))
+    {
+      *extents = draw_extents.to_glyph_extents ();
+      return true;
+    }
+
+    bool ret = klass->get.f.glyph_extents (this, user_data,
+                                           glyph,
+                                           extents,
+                                           !klass->user_data ? nullptr : klass->user_data->glyph_extents);
+    if (ret)
+      synthetic_glyph_extents (extents);
+
+    return ret;
   }
 
   hb_bool_t get_glyph_contour_point (hb_codepoint_t glyph, unsigned int point_index,
-                                     hb_position_t *x, hb_position_t *y)
+                                     hb_position_t *x, hb_position_t *y,
+                                     bool synthetic = true)
   {
     *x = *y = 0;
-    return klass->get.f.glyph_contour_point (this, user_data,
-                                             glyph, point_index,
-                                             x, y,
-                                             !klass->user_data ? nullptr : klass->user_data->glyph_contour_point);
+    bool ret = klass->get.f.glyph_contour_point (this, user_data,
+                                                 glyph, point_index,
+                                                 x, y,
+                                                 !klass->user_data ? nullptr : klass->user_data->glyph_contour_point);
+
+    if (synthetic && ret)
+    {
+      /* Slant */
+      if (slant_xy)
+        *x += roundf (*y * slant_xy);
+
+      /* Embolden */
+      if (!embolden_in_place)
+      {
+        int x_shift = x_scale < 0 ? -x_strength : x_strength;
+        *x += x_shift;
+      }
+    }
+
+    return ret;
   }
 
   hb_bool_t get_glyph_name (hb_codepoint_t glyph,
@@ -426,29 +571,88 @@ struct hb_font_t
                                          !klass->user_data ? nullptr : klass->user_data->glyph_from_name);
   }
 
-  void draw_glyph (hb_codepoint_t glyph,
-                   hb_draw_funcs_t *draw_funcs, void *draw_data)
+  bool draw_glyph_or_fail (hb_codepoint_t glyph,
+                           hb_draw_funcs_t *draw_funcs, void *draw_data,
+                           bool synthetic = true)
   {
-    klass->get.f.draw_glyph (this, user_data,
-                             glyph,
-                             draw_funcs, draw_data,
-                             !klass->user_data ? nullptr : klass->user_data->draw_glyph);
+#ifndef HB_NO_OUTLINE
+    bool embolden = x_strength || y_strength;
+    bool slanted = slant_xy;
+    synthetic = synthetic && (embolden || slanted);
+#else
+    synthetic = false;
+#endif
+
+    if (!synthetic)
+    {
+      return klass->get.f.draw_glyph_or_fail (this, user_data,
+                                              glyph,
+                                              draw_funcs, draw_data,
+                                              !klass->user_data ? nullptr : klass->user_data->draw_glyph_or_fail);
+    }
+
+#ifndef HB_NO_OUTLINE
+
+    hb_outline_t outline;
+    if (!klass->get.f.draw_glyph_or_fail (this, user_data,
+                                          glyph,
+                                          hb_outline_recording_pen_get_funcs (), &outline,
+                                          !klass->user_data ? nullptr : klass->user_data->draw_glyph_or_fail))
+      return false;
+
+    // Slant before embolden; produces nicer results.
+
+    if (slanted)
+      outline.slant (slant_xy);
+
+    if (embolden)
+    {
+      float x_shift = embolden_in_place ? 0 : (float) x_strength / 2;
+      float y_shift = (float) y_strength / 2;
+      if (x_scale < 0) x_shift = -x_shift;
+      if (y_scale < 0) y_shift = -y_shift;
+      outline.embolden (x_strength, y_strength, x_shift, y_shift);
+    }
+
+    outline.replay (draw_funcs, draw_data);
+
+    return true;
+#endif
   }
 
-  void paint_glyph (hb_codepoint_t glyph,
-                    hb_paint_funcs_t *paint_funcs, void *paint_data,
-                    unsigned int palette,
-                    hb_color_t foreground)
+  bool paint_glyph_or_fail (hb_codepoint_t glyph,
+                            hb_paint_funcs_t *paint_funcs, void *paint_data,
+                            unsigned int palette,
+                            hb_color_t foreground,
+                            bool synthetic = true)
   {
-    klass->get.f.paint_glyph (this, user_data,
-                              glyph,
-                              paint_funcs, paint_data,
-                              palette, foreground,
-                              !klass->user_data ? nullptr : klass->user_data->paint_glyph);
+    /* Slant */
+    if (synthetic && slant_xy)
+      hb_paint_push_transform (paint_funcs, paint_data,
+                               1.f, 0.f,
+                               slant_xy, 1.f,
+                               0.f, 0.f);
+
+    bool ret = klass->get.f.paint_glyph_or_fail (this, user_data,
+                                                 glyph,
+                                                 paint_funcs, paint_data,
+                                                 palette, foreground,
+                                                 !klass->user_data ? nullptr : klass->user_data->paint_glyph_or_fail);
+
+    if (synthetic && slant_xy)
+      hb_paint_pop_transform (paint_funcs, paint_data);
+
+    return ret;
   }
 
   /* A bit higher-level, and with fallback */
 
+  HB_INTERNAL
+  void paint_glyph (hb_codepoint_t glyph,
+                    hb_paint_funcs_t *paint_funcs, void *paint_data,
+                    unsigned int palette,
+                    hb_color_t foreground);
+
   void get_h_extents_with_fallback (hb_font_extents_t *extents)
   {
     if (!get_font_h_extents (extents))
@@ -686,7 +890,12 @@ struct hb_font_t
     return false;
   }
 
-  void mults_changed ()
+  bool is_synthetic () const
+  {
+    return x_embolden || y_embolden || slant;
+  }
+
+  void changed ()
   {
     float upem = face->get_upem ();
 
@@ -697,12 +906,14 @@ struct hb_font_t
     bool y_neg = y_scale < 0;
     y_mult = (y_neg ? -((int64_t) -y_scale << 16) : ((int64_t) y_scale << 16)) / upem;
 
-    x_strength = fabsf (roundf (x_scale * x_embolden));
-    y_strength = fabsf (roundf (y_scale * y_embolden));
+    x_strength = roundf (abs (x_scale) * x_embolden);
+    y_strength = roundf (abs (y_scale) * y_embolden);
 
     slant_xy = y_scale ? slant * x_scale / y_scale : 0.f;
 
     data.fini ();
+
+    serial++;
   }
 
   hb_position_t em_mult (int16_t v, int64_t mult)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
index b126d2022d1..e9c0e734a53 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
@@ -37,11 +37,7 @@
 #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"
 
@@ -101,7 +97,7 @@ struct hb_ft_font_t
 
   mutable hb_mutex_t lock; /* Protects members below. */
   FT_Face ft_face;
-  mutable unsigned cached_serial;
+  mutable hb_atomic_t<unsigned> cached_serial;
   mutable hb_ft_advance_cache_t advance_cache;
 };
 
@@ -118,7 +114,7 @@ _hb_ft_font_create (FT_Face ft_face, bool symbol, bool unref)
 
   ft_font->load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING;
 
-  ft_font->cached_serial = (unsigned) -1;
+  ft_font->cached_serial = UINT_MAX;
   new (&ft_font->advance_cache) hb_ft_advance_cache_t;
 
   return ft_font;
@@ -213,9 +209,10 @@ _hb_ft_hb_font_check_changed (hb_font_t *font,
 {
   if (font->serial != ft_font->cached_serial)
   {
+    hb_lock_t lock (ft_font->lock);
     _hb_ft_hb_font_changed (font, ft_font->ft_face);
     ft_font->advance_cache.clear ();
-    ft_font->cached_serial = font->serial;
+    ft_font->cached_serial.set_release (font->serial.get_acquire ());
     return true;
   }
   return false;
@@ -478,7 +475,8 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data,
                             void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
-  hb_position_t *orig_first_advance = first_advance;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
   int load_flags = ft_font->load_flags;
@@ -519,38 +517,6 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data,
     first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
     first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
   }
-
-  if (font->x_strength && !font->embolden_in_place)
-  {
-    /* Emboldening. */
-    hb_position_t x_strength = font->x_scale >= 0 ? font->x_strength : -font->x_strength;
-    first_advance = orig_first_advance;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      *first_advance += *first_advance ? x_strength : 0;
-      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
@@ -561,6 +527,8 @@ hb_ft_get_glyph_v_advance (hb_font_t *font,
                            void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Fixed v;
   float y_mult;
@@ -581,26 +549,11 @@ hb_ft_get_glyph_v_advance (hb_font_t *font,
   if (unlikely (FT_Get_Advance (ft_font->ft_face, glyph, ft_font->load_flags | FT_LOAD_VERTICAL_LAYOUT, &v)))
     return 0;
 
-  v = (int) (y_mult * v);
-
   /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates
    * have a Y growing upward.  Hence the extra negation. */
+  v = ((-v + (1<<9)) >> 10);
 
-  hb_position_t y_strength = font->y_scale >= 0 ? font->y_strength : -font->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;
+  return (hb_position_t) (y_mult * v);
 }
 #endif
 
@@ -614,6 +567,8 @@ hb_ft_get_glyph_v_origin (hb_font_t *font,
                           void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
   float x_mult, y_mult;
@@ -658,6 +613,8 @@ hb_ft_get_glyph_h_kerning (hb_font_t *font,
                            void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Vector kerningv;
 
@@ -669,6 +626,41 @@ hb_ft_get_glyph_h_kerning (hb_font_t *font,
 }
 #endif
 
+static bool
+hb_ft_is_colr_glyph (hb_font_t *font,
+                     void *font_data,
+                     hb_codepoint_t gid)
+{
+#ifndef HB_NO_PAINT
+#if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21300
+  const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  FT_Face ft_face = ft_font->ft_face;
+
+
+  /* COLRv1 */
+  FT_OpaquePaint paint = {0};
+  if (FT_Get_Color_Glyph_Paint (ft_face, gid,
+                                FT_COLOR_NO_ROOT_TRANSFORM,
+                                &paint))
+    return true;
+
+  /* COLRv0 */
+  FT_LayerIterator  iterator;
+  FT_UInt  layer_glyph_index;
+  FT_UInt  layer_color_index;
+  iterator.p  = NULL;
+  if (FT_Get_Color_Glyph_Layer (ft_face,
+                                gid,
+                                &layer_glyph_index,
+                                &layer_color_index,
+                                &iterator))
+    return true;
+#endif
+#endif
+
+  return false;
+}
+
 static hb_bool_t
 hb_ft_get_glyph_extents (hb_font_t *font,
                          void *font_data,
@@ -676,11 +668,17 @@ hb_ft_get_glyph_extents (hb_font_t *font,
                          hb_glyph_extents_t *extents,
                          void *user_data HB_UNUSED)
 {
+  // FreeType doesn't return COLR glyph extents.
+  if (hb_ft_is_colr_glyph (font, font_data, glyph))
+    return false;
+
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
   float x_mult, y_mult;
-  float slant_xy = font->slant_xy;
+
 #ifdef HAVE_FT_GET_TRANSFORM
   if (ft_font->transform)
   {
@@ -708,33 +706,10 @@ hb_ft_get_glyph_extents (hb_font_t *font,
   float x2 = x1 + x_mult *  ft_face->glyph->metrics.width;
   float y2 = y1 + y_mult * -ft_face->glyph->metrics.height;
 
-  /* Apply slant. */
-  if (slant_xy)
-  {
-    x1 += hb_min (y1 * slant_xy, y2 * slant_xy);
-    x2 += hb_max (y1 * slant_xy, y2 * slant_xy);
-  }
-
-  extents->x_bearing = floorf (x1);
-  extents->y_bearing = floorf (y1);
-  extents->width = ceilf (x2) - extents->x_bearing;
-  extents->height = ceilf (y2) - extents->y_bearing;
-
-  if (font->x_strength || font->y_strength)
-  {
-    /* Y */
-    int y_shift = font->y_strength;
-    if (font->y_scale < 0) y_shift = -y_shift;
-    extents->y_bearing += y_shift;
-    extents->height -= y_shift;
-
-    /* X */
-    int x_shift = font->x_strength;
-    if (font->x_scale < 0) x_shift = -x_shift;
-    if (font->embolden_in_place)
-      extents->x_bearing -= x_shift / 2;
-    extents->width += x_shift;
-  }
+  extents->x_bearing = roundf (x1);
+  extents->y_bearing = roundf (y1);
+  extents->width = roundf (x2) - extents->x_bearing;
+  extents->height = roundf (y2) - extents->y_bearing;
 
   return true;
 }
@@ -749,6 +724,8 @@ hb_ft_get_glyph_contour_point (hb_font_t *font HB_UNUSED,
                                void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
 
@@ -826,6 +803,8 @@ hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED,
                           void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
   float y_mult;
@@ -857,7 +836,7 @@ hb_ft_get_font_h_extents (hb_font_t *font HB_UNUSED,
     metrics->line_gap = ft_face->size->metrics.height - (metrics->ascender - metrics->descender);
   }
 
-  metrics->ascender  = (hb_position_t) (y_mult * (metrics->ascender + font->y_strength));
+  metrics->ascender  = (hb_position_t) (y_mult * metrics->ascender);
   metrics->descender = (hb_position_t) (y_mult * metrics->descender);
   metrics->line_gap  = (hb_position_t) (y_mult * metrics->line_gap);
 
@@ -908,23 +887,25 @@ _hb_ft_cubic_to (const FT_Vector *control1,
   return FT_Err_Ok;
 }
 
-static void
-hb_ft_draw_glyph (hb_font_t *font,
-                  void *font_data,
-                  hb_codepoint_t glyph,
-                  hb_draw_funcs_t *draw_funcs, void *draw_data,
-                  void *user_data HB_UNUSED)
+static hb_bool_t
+hb_ft_draw_glyph_or_fail (hb_font_t *font,
+                          void *font_data,
+                          hb_codepoint_t glyph,
+                          hb_draw_funcs_t *draw_funcs, void *draw_data,
+                          void *user_data HB_UNUSED)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_font);
+
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
 
   if (unlikely (FT_Load_Glyph (ft_face, glyph,
                                FT_LOAD_NO_BITMAP | ft_font->load_flags)))
-    return;
+    return false;
 
   if (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
-    return;
+    return false;
 
   const FT_Outline_Funcs outline_funcs = {
     _hb_ft_move_to,
@@ -935,43 +916,13 @@ hb_ft_draw_glyph (hb_font_t *font,
     0, /* delta */
   };
 
-  hb_draw_session_t draw_session (draw_funcs, draw_data, font->slant_xy);
-
-  /* Embolden */
-  if (font->x_strength || font->y_strength)
-  {
-    FT_Outline_EmboldenXY (&ft_face->glyph->outline, font->x_strength, font->y_strength);
-
-    int x_shift = 0;
-    int y_shift = 0;
-    if (font->embolden_in_place)
-    {
-      /* Undo the FreeType shift. */
-      x_shift = -font->x_strength / 2;
-      y_shift = 0;
-      if (font->y_scale < 0) y_shift = -font->y_strength;
-    }
-    else
-    {
-      /* FreeType applied things in the wrong direction for negative scale; fix up. */
-      if (font->x_scale < 0) x_shift = -font->x_strength;
-      if (font->y_scale < 0) y_shift = -font->y_strength;
-    }
-    if (x_shift || y_shift)
-    {
-      auto &outline = ft_face->glyph->outline;
-      for (auto &point : hb_iter (outline.points, outline.contours[outline.n_contours - 1] + 1))
-      {
-        point.x += x_shift;
-        point.y += y_shift;
-      }
-    }
-  }
-
+  hb_draw_session_t draw_session {draw_funcs, draw_data};
 
   FT_Outline_Decompose (&ft_face->glyph->outline,
                         &outline_funcs,
                         &draw_session);
+
+  return true;
 }
 #endif
 
@@ -980,20 +931,22 @@ hb_ft_draw_glyph (hb_font_t *font,
 
 #include "hb-ft-colr.hh"
 
-static void
-hb_ft_paint_glyph (hb_font_t *font,
-                   void *font_data,
-                   hb_codepoint_t gid,
-                   hb_paint_funcs_t *paint_funcs, void *paint_data,
-                   unsigned int palette_index,
-                   hb_color_t foreground,
-                   void *user_data)
+static hb_bool_t
+hb_ft_paint_glyph_or_fail (hb_font_t *font,
+                           void *font_data,
+                           hb_codepoint_t gid,
+                           hb_paint_funcs_t *paint_funcs, void *paint_data,
+                           unsigned int palette_index,
+                           hb_color_t foreground,
+                           void *user_data)
 {
   const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font_data;
+  _hb_ft_hb_font_check_changed (font, ft_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;
+  FT_Long load_flags = ft_font->load_flags | FT_LOAD_COLOR;
 #if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21301
   load_flags |= FT_LOAD_NO_SVG;
 #endif
@@ -1002,7 +955,7 @@ hb_ft_paint_glyph (hb_font_t *font,
    * eg. draw API can call back into the face.*/
 
   if (unlikely (FT_Load_Glyph (ft_face, gid, load_flags)))
-    return;
+    return false;
 
   if (ft_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE)
   {
@@ -1010,26 +963,21 @@ hb_ft_paint_glyph (hb_font_t *font,
                                 paint_funcs, paint_data,
                                 palette_index, foreground,
                                 user_data))
-      return;
-
-    /* Simple outline. */
-    ft_font->lock.unlock ();
-    paint_funcs->push_clip_glyph (paint_data, gid, font);
-    ft_font->lock.lock ();
-    paint_funcs->color (paint_data, true, foreground);
-    paint_funcs->pop_clip (paint_data);
+      return true;
 
-    return;
+    // Outline glyph
+    return false;
   }
 
   auto *glyph = ft_face->glyph;
   if (glyph->format == FT_GLYPH_FORMAT_BITMAP)
   {
+    bool ret = false;
     auto &bitmap = glyph->bitmap;
     if (bitmap.pixel_mode == FT_PIXEL_MODE_BGRA)
     {
       if (bitmap.pitch != (signed) bitmap.width * 4)
-        return;
+        return ret;
 
       ft_font->lock.unlock ();
 
@@ -1039,27 +987,26 @@ hb_ft_paint_glyph (hb_font_t *font,
                                         nullptr, nullptr);
 
       hb_glyph_extents_t extents;
-      if (!hb_font_get_glyph_extents (font, gid, &extents))
+      if (!font->get_glyph_extents (gid, &extents, false))
         goto out;
 
-      if (!paint_funcs->image (paint_data,
-                               blob,
-                               bitmap.width,
-                               bitmap.rows,
-                               HB_PAINT_IMAGE_FORMAT_BGRA,
-                               font->slant_xy,
-                               &extents))
-      {
-        /* TODO Try a forced outline load and paint? */
-      }
+      if (paint_funcs->image (paint_data,
+                              blob,
+                              bitmap.width,
+                              bitmap.rows,
+                              HB_PAINT_IMAGE_FORMAT_BGRA,
+                              0.f,
+                              &extents))
+        ret = true;
 
     out:
       hb_blob_destroy (blob);
       ft_font->lock.lock ();
     }
 
-    return;
+    return ret;
   }
+  return false;
 }
 #endif
 #endif
@@ -1079,10 +1026,8 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
 
     hb_font_funcs_set_font_h_extents_func (funcs, hb_ft_get_font_h_extents, nullptr, nullptr);
     hb_font_funcs_set_glyph_h_advances_func (funcs, hb_ft_get_glyph_h_advances, nullptr, nullptr);
-    //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ft_get_glyph_h_origin, nullptr, nullptr);
 
 #ifndef HB_NO_VERTICAL
-    //hb_font_funcs_set_font_v_extents_func (funcs, hb_ft_get_font_v_extents, nullptr, nullptr);
     hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ft_get_glyph_v_advance, nullptr, nullptr);
     hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ft_get_glyph_v_origin, nullptr, nullptr);
 #endif
@@ -1090,19 +1035,18 @@ static struct hb_ft_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ft
 #ifndef HB_NO_OT_SHAPE_FALLBACK
     hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ft_get_glyph_h_kerning, nullptr, nullptr);
 #endif
-    //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ft_get_glyph_v_kerning, nullptr, nullptr);
     hb_font_funcs_set_glyph_extents_func (funcs, hb_ft_get_glyph_extents, nullptr, nullptr);
     hb_font_funcs_set_glyph_contour_point_func (funcs, hb_ft_get_glyph_contour_point, nullptr, nullptr);
     hb_font_funcs_set_glyph_name_func (funcs, hb_ft_get_glyph_name, nullptr, nullptr);
     hb_font_funcs_set_glyph_from_name_func (funcs, hb_ft_get_glyph_from_name, nullptr, nullptr);
 
 #ifndef HB_NO_DRAW
-    hb_font_funcs_set_draw_glyph_func (funcs, hb_ft_draw_glyph, nullptr, nullptr);
+    hb_font_funcs_set_draw_glyph_or_fail_func (funcs, hb_ft_draw_glyph_or_fail, nullptr, nullptr);
 #endif
 
 #ifndef HB_NO_PAINT
 #if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21300
-    hb_font_funcs_set_paint_glyph_func (funcs, hb_ft_paint_glyph, nullptr, nullptr);
+    hb_font_funcs_set_paint_glyph_or_fail_func (funcs, hb_ft_paint_glyph_or_fail, nullptr, nullptr);
 #endif
 #endif
 
@@ -1456,6 +1400,10 @@ hb_ft_font_changed (hb_font_t *font)
  * variation-axis settings on the @font.
  * This call is fast if nothing has changed on @font.
  *
+ * Note that as of version 11.0.0, calling this function is not necessary,
+ * as HarfBuzz will automatically detect changes to the font and update
+ * the underlying FT_Face as needed.
+ *
  * Return value: true if changed, false otherwise
  *
  * Since: 4.4.0
@@ -1587,7 +1535,8 @@ destroy_ft_library (void *arg)
  * 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.
+ * but uses the FreeType library for loading the font file. This can
+ * be useful, for example, to load WOFF and WOFF2 font data.
  *
  * 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.
@@ -1624,6 +1573,75 @@ hb_ft_face_create_from_file_or_fail (const char   *file_name,
   return face;
 }
 
+static hb_user_data_key_t ft_blob_key = {0};
+
+static void
+_destroy_blob (void *p)
+{
+  hb_blob_destroy ((hb_blob_t *) p);
+}
+
+/**
+ * hb_ft_face_create_from_blob_or_fail:
+ * @blob: A blob
+ * @index: The index of the face within the blob
+ *
+ * Creates an #hb_face_t face object from the specified
+ * font blob and face index.
+ *
+ * This is similar in functionality to hb_face_create_from_blob_or_fail(),
+ * but uses the FreeType library for loading the font blob. This can
+ * be useful, for example, to load WOFF and WOFF2 font data.
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * loading fails (eg. blob does not contain valid font data).
+ *
+ * Since: 11.0.0
+ */
+hb_face_t *
+hb_ft_face_create_from_blob_or_fail (hb_blob_t    *blob,
+                                     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;
+  }
+
+  hb_blob_make_immutable (blob);
+  unsigned blob_size;
+  const char *blob_data = hb_blob_get_data (blob, &blob_size);
+
+  FT_Face ft_face;
+  if (unlikely (FT_New_Memory_Face (ft_library,
+                                    (const FT_Byte *) blob_data,
+                                    blob_size,
+                                    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;
+
+  // Hook the blob to the hb_face_t, since FT_Face still needs it.
+  hb_blob_reference (blob);
+  if (!hb_face_set_user_data (face, &ft_blob_key, blob, _destroy_blob, true))
+  {
+    hb_blob_destroy (blob);
+    hb_face_destroy (face);
+    return nullptr;
+  }
+
+  return face;
+}
+
 static void
 _release_blob (void *arg)
 {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.h b/src/java.desktop/share/native/libharfbuzz/hb-ft.h
index 94952f48a05..9f83b91abb6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ft.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.h
@@ -88,6 +88,10 @@ HB_EXTERN hb_face_t *
 hb_ft_face_create_from_file_or_fail (const char   *file_name,
                                      unsigned int  index);
 
+HB_EXTERN hb_face_t *
+hb_ft_face_create_from_blob_or_fail (hb_blob_t    *blob,
+                                     unsigned int  index);
+
 /*
  * hb-font from ft-face.
  */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
index e91e371dc0c..795f29f6ab0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
@@ -30,6 +30,11 @@
 struct hb_extents_t
 {
   hb_extents_t () {}
+  hb_extents_t (const hb_glyph_extents_t &extents) :
+                xmin (hb_min (extents.x_bearing, extents.x_bearing + extents.width)),
+                ymin (hb_min (extents.y_bearing, extents.y_bearing + extents.height)),
+                xmax (hb_max (extents.x_bearing, extents.x_bearing + extents.width)),
+                ymax (hb_max (extents.y_bearing, extents.y_bearing + extents.height)) {}
   hb_extents_t (float xmin, float ymin, float xmax, float ymax) :
     xmin (xmin), ymin (ymin), xmax (xmax), ymax (ymax) {}
 
@@ -38,6 +43,12 @@ struct hb_extents_t
 
   void union_ (const hb_extents_t &o)
   {
+    if (o.is_empty ()) return;
+    if (is_empty ())
+    {
+      *this = o;
+      return;
+    }
     xmin = hb_min (xmin, o.xmin);
     ymin = hb_min (ymin, o.ymin);
     xmax = hb_max (xmax, o.xmax);
@@ -46,6 +57,11 @@ struct hb_extents_t
 
   void intersect (const hb_extents_t &o)
   {
+    if (o.is_empty () || is_empty ())
+    {
+      *this = hb_extents_t {};
+      return;
+    }
     xmin = hb_max (xmin, o.xmin);
     ymin = hb_max (ymin, o.ymin);
     xmax = hb_min (xmax, o.xmax);
@@ -69,6 +85,18 @@ struct hb_extents_t
     }
   }
 
+  hb_glyph_extents_t to_glyph_extents (bool xneg = false, bool yneg = false) const
+  {
+    hb_position_t x0 = (hb_position_t) roundf (xmin);
+    hb_position_t y0 = (hb_position_t) roundf (ymin);
+    hb_position_t x1 = (hb_position_t) roundf (xmax);
+    hb_position_t y1 = (hb_position_t) roundf (ymax);
+    return hb_glyph_extents_t {xneg ? x1 : x0,
+                               yneg ? y0 : y1,
+                               xneg ? x0 - x1 : x1 - x0,
+                               yneg ? y1 - y0 : y0 - y1};
+  }
+
   float xmin = 0.f;
   float ymin = 0.f;
   float xmax = -1.f;
@@ -218,7 +246,7 @@ struct hb_bounds_t
     EMPTY,
   };
 
-  hb_bounds_t (status_t status) : status (status) {}
+  hb_bounds_t (status_t status = UNBOUNDED) : status (status) {}
   hb_bounds_t (const hb_extents_t &extents) :
     status (extents.is_empty () ? EMPTY : BOUNDED), extents (extents) {}
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
index 580c9f0c785..ffbb8f3d301 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
@@ -273,7 +273,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
 
   private:
   /* Must only have one pointer. */
-  hb_atomic_ptr_t<Stored *> instance;
+  mutable hb_atomic_t<Stored *> instance;
 };
 
 /* Specializations. */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-mutex.hh b/src/java.desktop/share/native/libharfbuzz/hb-mutex.hh
index 72012bd2e64..4b6c5a118ae 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-mutex.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-mutex.hh
@@ -99,6 +99,8 @@ struct hb_mutex_t
 
   hb_mutex_t () { init (); }
   ~hb_mutex_t () { fini (); }
+  hb_mutex_t (const hb_mutex_t &) = delete;
+  hb_mutex_t &operator= (const hb_mutex_t &) = delete;
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
@@ -114,6 +116,10 @@ struct hb_lock_t
   hb_lock_t (hb_mutex_t &mutex_) : mutex (&mutex_) { mutex->lock (); }
   hb_lock_t (hb_mutex_t *mutex_) : mutex (mutex_) { if (mutex) mutex->lock (); }
   ~hb_lock_t () { if (mutex) mutex->unlock (); }
+
+  hb_lock_t (const hb_lock_t &) = delete;
+  hb_lock_t &operator= (const hb_lock_t &) = delete;
+
   private:
   hb_mutex_t *mutex;
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-object.hh b/src/java.desktop/share/native/libharfbuzz/hb-object.hh
index c02ec8bfacf..fa9a249b2e2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-object.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-object.hh
@@ -142,7 +142,7 @@ struct hb_lockable_set_t
 
 struct hb_reference_count_t
 {
-  mutable hb_atomic_int_t ref_count;
+  mutable hb_atomic_t<int> ref_count;
 
   void init (int v = 1) { ref_count = v; }
   int get_relaxed () const { return ref_count; }
@@ -213,8 +213,8 @@ struct hb_user_data_array_t
 struct hb_object_header_t
 {
   hb_reference_count_t ref_count;
-  mutable hb_atomic_int_t writable = 0;
-  hb_atomic_ptr_t<hb_user_data_array_t> user_data;
+  mutable hb_atomic_t<bool> writable = false;
+  hb_atomic_t<hb_user_data_array_t *> user_data;
 
   bool is_inert () const { return !ref_count.get_relaxed (); }
 };
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 89da9c7bc95..75d87f11ea5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
@@ -1888,7 +1888,7 @@ struct TupleValues
 
     bool ensure_run ()
     {
-      if (likely (run_count > 0)) return true;
+      if (run_count > 0) return true;
 
       if (unlikely (p >= end))
       {
@@ -1943,6 +1943,11 @@ struct TupleValues
         unsigned count = hb_min (n - i, (unsigned) run_count);
         switch (width)
         {
+          case 0:
+          {
+            arrayZ += count;
+            break;
+          }
           case 1:
           {
             const auto *pp = (const HBINT8 *) p;
@@ -1958,6 +1963,8 @@ struct TupleValues
 #endif
             for (; j < count; j++)
               *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+
+            p = (const unsigned char *) pp;
           }
           break;
           case 2:
@@ -1975,6 +1982,8 @@ struct TupleValues
 #endif
             for (; j < count; j++)
               *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+
+            p = (const unsigned char *) pp;
           }
           break;
           case 4:
@@ -1982,10 +1991,11 @@ struct TupleValues
             const auto *pp = (const HBINT32 *) p;
             for (unsigned j = 0; j < count; j++)
               *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+
+            p = (const unsigned char *) pp;
           }
           break;
         }
-        p += count * width;
         run_count -= count;
         i += count;
       }
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 0116a0c9192..27c4d31b9ce 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
@@ -1073,7 +1073,7 @@ struct cff1
 
       this->blob = sc.reference_table<cff1> (face);
 
-      /* setup for run-time santization */
+      /* setup for run-time sanitization */
       sc.init (this->blob);
       sc.start_processing ();
 
@@ -1176,7 +1176,8 @@ struct cff1
           if (unlikely (!font_interp.interpret (*font)))   goto fail;
           PRIVDICTVAL *priv = &privateDicts[i];
           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;
+          if (unlikely (font->privateDictInfo.size &&
+                        privDictStr == (const unsigned char *) &Null (UnsizedByteStr))) goto fail;
           num_interp_env_t env2 (privDictStr);
           dict_interpreter_t<PRIVOPSET, PRIVDICTVAL> priv_interp (env2);
           priv->init ();
@@ -1191,7 +1192,8 @@ struct cff1
         PRIVDICTVAL *priv = &privateDicts[0];
 
         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;
+        if (font->privateDictInfo.size &&
+            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 ();
@@ -1483,7 +1485,7 @@ struct cff1
       int cmp (const gname_t &a) const { return cmp (&a, this); }
     };
 
-    mutable hb_atomic_ptr_t<hb_sorted_vector_t<gname_t>> glyph_names;
+    mutable hb_atomic_t<hb_sorted_vector_t<gname_t> *> glyph_names;
 
     typedef accelerator_templ_t<cff1_private_dict_opset_t, cff1_private_dict_values_t> SUPER;
   };
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 fce39da21ce..b2702106ecc 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
@@ -102,6 +102,14 @@ struct cff2_cs_opset_extents_t : cff2_cs_opset_t<cff2_cs_opset_extents_t, cff2_e
 bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
                                            hb_codepoint_t glyph,
                                            hb_glyph_extents_t *extents) const
+{
+  return get_extents_at (font, glyph, extents, hb_array (font->coords, font->num_coords));
+}
+
+bool OT::cff2::accelerator_t::get_extents_at (hb_font_t *font,
+                                              hb_codepoint_t glyph,
+                                              hb_glyph_extents_t *extents,
+                                              hb_array_t<const int> coords) const
 {
 #ifdef HB_NO_OT_FONT_CFF
   /* XXX Remove check when this code moves to .hh file. */
@@ -112,7 +120,7 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
 
   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_extents_t, cff2_extents_param_t, number_t> interp (env);
   cff2_extents_param_t  param;
   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 81d30f57a28..7e94e38e115 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
@@ -405,7 +405,7 @@ struct cff2
 
       this->blob = sc.reference_table<cff2> (face);
 
-      /* setup for run-time santization */
+      /* setup for run-time sanitization */
       sc.init (this->blob);
       sc.start_processing ();
 
@@ -458,7 +458,8 @@ struct cff2
         if (unlikely (!font_interp.interpret (*font))) 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;
+        if (unlikely (font->privateDictInfo.size &&
+                      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 ();
@@ -481,6 +482,13 @@ struct cff2
       privateDicts.fini ();
       hb_blob_destroy (blob);
       blob = nullptr;
+
+      auto *scalars = cached_scalars_vector.get_acquire ();
+      if (scalars && cached_scalars_vector.cmpexch (scalars, nullptr))
+      {
+        scalars->fini ();
+        hb_free (scalars);
+      }
     }
 
     hb_vector_t<uint16_t> *create_glyph_to_sid_map () const
@@ -508,6 +516,8 @@ struct cff2
     hb_vector_t<cff2_font_dict_values_t>     fontDicts;
     hb_vector_t<PRIVDICTVAL>  privateDicts;
 
+    mutable hb_atomic_t<hb_vector_t<float> *> cached_scalars_vector;
+
     unsigned int              num_glyphs = 0;
   };
 
@@ -518,6 +528,10 @@ struct cff2
     HB_INTERNAL bool get_extents (hb_font_t *font,
                                   hb_codepoint_t glyph,
                                   hb_glyph_extents_t *extents) const;
+    HB_INTERNAL bool get_extents_at (hb_font_t *font,
+                                     hb_codepoint_t glyph,
+                                     hb_glyph_extents_t *extents,
+                                     hb_array_t<const int> coords) 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;
   };
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 249d4cac5db..6bf37c062fc 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
@@ -2014,7 +2014,8 @@ struct cmap
 
   struct accelerator_t
   {
-    using cache_t = hb_cache_t<21, 16, 8, true>;
+    using cache_t = hb_cache_t<21, 19>;
+    static_assert (sizeof (cache_t) == 1024, "");
 
     accelerator_t (hb_face_t *face)
     {
@@ -2028,6 +2029,14 @@ struct cmap
           subtable_uvs = &st->u.format14;
       }
 
+#ifndef HB_NO_OT_FONT_CMAP_CACHE
+      cache = (cache_t *) hb_malloc (sizeof (cache_t));
+      if (cache)
+        new (cache) cache_t ();
+      else
+        return; // Such that get_glyph_funcZ remains null.
+#endif
+
       this->get_glyph_data = subtable;
 #ifndef HB_NO_CMAP_LEGACY_SUBTABLES
       if (unlikely (symbol))
@@ -2061,62 +2070,71 @@ struct cmap
 #endif
       {
         switch (subtable->u.format) {
-        /* Accelerate format 4 and format 12. */
-        default:
-          this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
-          break;
-        case 12:
-          this->get_glyph_funcZ = get_glyph_from<CmapSubtableFormat12>;
-          break;
-        case  4:
-        {
-          this->format4_accel.init (&subtable->u.format4);
-          this->get_glyph_data = &this->format4_accel;
-          this->get_glyph_funcZ = this->format4_accel.get_glyph_func;
-          break;
-        }
+          /* Accelerate format 4 and format 12. */
+          default:
+            this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
+            break;
+          case 12:
+            this->get_glyph_funcZ = get_glyph_from<CmapSubtableFormat12>;
+            break;
+          case  4:
+          {
+            this->format4_accel.init (&subtable->u.format4);
+            this->get_glyph_data = &this->format4_accel;
+            this->get_glyph_funcZ = this->format4_accel.get_glyph_func;
+            break;
+          }
         }
       }
     }
-    ~accelerator_t () { this->table.destroy (); }
+    ~accelerator_t ()
+    {
+#ifndef HB_NO_OT_FONT_CMAP_CACHE
+      hb_free (cache);
+#endif
+      table.destroy ();
+    }
 
     inline bool _cached_get (hb_codepoint_t unicode,
-                             hb_codepoint_t *glyph,
-                             cache_t *cache) const
+                             hb_codepoint_t *glyph) const
     {
+#ifndef HB_NO_OT_FONT_CMAP_CACHE
+      // cache is always non-null if we have a get_glyph_funcZ
       unsigned v;
-      if (cache && cache->get (unicode, &v))
+      if (cache->get (unicode, &v))
       {
         *glyph = v;
         return true;
       }
+#endif
       bool ret  = this->get_glyph_funcZ (this->get_glyph_data, unicode, glyph);
 
-      if (cache && ret)
+#ifndef HB_NO_OT_FONT_CMAP_CACHE
+      if (ret)
         cache->set (unicode, *glyph);
+#endif
+
       return ret;
     }
 
     bool get_nominal_glyph (hb_codepoint_t  unicode,
-                            hb_codepoint_t *glyph,
-                            cache_t *cache = nullptr) const
+                            hb_codepoint_t *glyph) const
     {
       if (unlikely (!this->get_glyph_funcZ)) return false;
-      return _cached_get (unicode, glyph, cache);
+      return _cached_get (unicode, glyph);
     }
 
     unsigned int get_nominal_glyphs (unsigned int count,
                                      const hb_codepoint_t *first_unicode,
                                      unsigned int unicode_stride,
                                      hb_codepoint_t *first_glyph,
-                                     unsigned int glyph_stride,
-                                     cache_t *cache = nullptr) const
+                                     unsigned int glyph_stride) const
     {
       if (unlikely (!this->get_glyph_funcZ)) return 0;
 
       unsigned int done;
       for (done = 0;
-           done < count && _cached_get (*first_unicode, first_glyph, cache);
+           done < count && _cached_get (*first_unicode, first_glyph);
            done++)
       {
         first_unicode = &StructAtOffsetUnaligned<hb_codepoint_t> (first_unicode, unicode_stride);
@@ -2127,8 +2145,7 @@ struct cmap
 
     bool get_variation_glyph (hb_codepoint_t  unicode,
                               hb_codepoint_t  variation_selector,
-                              hb_codepoint_t *glyph,
-                              cache_t *cache = nullptr) const
+                              hb_codepoint_t *glyph) const
     {
       switch (this->subtable_uvs->get_glyph_variant (unicode,
                                                      variation_selector,
@@ -2139,7 +2156,7 @@ struct cmap
         case GLYPH_VARIANT_USE_DEFAULT: break;
       }
 
-      return get_nominal_glyph (unicode, glyph, cache);
+      return get_nominal_glyph (unicode, glyph);
     }
 
     void collect_unicodes (hb_set_t *out, unsigned int num_glyphs) const
@@ -2209,11 +2226,15 @@ struct cmap
     hb_nonnull_ptr_t<const CmapSubtable> subtable;
     hb_nonnull_ptr_t<const CmapSubtableFormat14> subtable_uvs;
 
-    hb_cmap_get_glyph_func_t get_glyph_funcZ;
-    const void *get_glyph_data;
+    hb_cmap_get_glyph_func_t get_glyph_funcZ = nullptr;
+    const void *get_glyph_data = nullptr;
 
     CmapSubtableFormat4::accelerator_t format4_accel;
 
+#ifndef HB_NO_OT_FONT_CMAP_CACHE
+    cache_t *cache = nullptr;
+#endif
+
     public:
     hb_blob_ptr_t<cmap> table;
   };
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc
index ef46fe5429a..2d9b8e7cad2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-color.cc
@@ -204,7 +204,7 @@ hb_ot_color_palette_get_colors (hb_face_t     *face,
 hb_bool_t
 hb_ot_color_has_layers (hb_face_t *face)
 {
-  return face->table.COLR->has_v0_data ();
+  return face->table.COLR->colr->has_v0_data ();
 }
 
 /**
@@ -221,7 +221,7 @@ hb_ot_color_has_layers (hb_face_t *face)
 hb_bool_t
 hb_ot_color_has_paint (hb_face_t *face)
 {
-  return face->table.COLR->has_v1_data ();
+  return face->table.COLR->colr->has_v1_data ();
 }
 
 /**
@@ -240,7 +240,7 @@ hb_bool_t
 hb_ot_color_glyph_has_paint (hb_face_t      *face,
                              hb_codepoint_t  glyph)
 {
-  return face->table.COLR->has_paint_for_glyph (glyph);
+  return face->table.COLR->colr->has_paint_for_glyph (glyph);
 }
 
 /**
@@ -266,7 +266,7 @@ hb_ot_color_glyph_get_layers (hb_face_t           *face,
                               unsigned int        *layer_count, /* IN/OUT.  May be NULL. */
                               hb_ot_color_layer_t *layers /* OUT.     May be NULL. */)
 {
-  return face->table.COLR->get_glyph_layers (glyph, start_offset, layer_count, layers);
+  return face->table.COLR->colr->get_glyph_layers (glyph, start_offset, layer_count, layers);
 }
 
 
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 97825f4d19c..afc8aa476e2 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
@@ -136,7 +136,7 @@ HB_OT_TABLE (AAT, feat)
 
 /* OpenType color fonts. */
 #ifndef HB_NO_COLOR
-HB_OT_CORE_TABLE (OT, COLR)
+HB_OT_ACCELERATOR (OT, COLR)
 HB_OT_CORE_TABLE (OT, CPAL)
 HB_OT_ACCELERATOR (OT, CBDT)
 HB_OT_ACCELERATOR (OT, sbix)
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 1cf14f3ebc6..d17f088073c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc
@@ -36,6 +36,7 @@
 #include "hb-ot-name-table.hh"
 #include "hb-ot-post-table.hh"
 #include "OT/Color/CBDT/CBDT.hh"
+#include "OT/Color/COLR/COLR.hh"
 #include "OT/Color/sbix/sbix.hh"
 #include "OT/Color/svg/svg.hh"
 #include "hb-ot-layout-gdef-table.hh"
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 2a633c77816..0238bb346a9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
@@ -34,11 +34,7 @@
 #include "hb-font.hh"
 #include "hb-machinery.hh"
 #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"
@@ -65,28 +61,111 @@
  * never need to call these functions directly.
  **/
 
-using hb_ot_font_cmap_cache_t    = hb_cache_t<21, 16, 8, true>;
-using hb_ot_font_advance_cache_t = hb_cache_t<24, 16, 8, true>;
-
-#ifndef HB_NO_OT_FONT_CMAP_CACHE
-static hb_user_data_key_t hb_ot_font_cmap_cache_user_data_key;
-#endif
+using hb_ot_font_advance_cache_t = hb_cache_t<24, 16>;
+static_assert (sizeof (hb_ot_font_advance_cache_t) == 1024, "");
 
 struct hb_ot_font_t
 {
   const hb_ot_face_t *ot_face;
 
-#ifndef HB_NO_AAT
-  bool apply_trak;
-#endif
+  /* h_advance caching */
+  mutable hb_atomic_t<int> cached_coords_serial;
+  struct advance_cache_t
+  {
+    mutable hb_atomic_t<hb_ot_font_advance_cache_t *> advance_cache;
+    mutable hb_atomic_t<OT::ItemVariationStore::cache_t *> varStore_cache;
 
-#ifndef HB_NO_OT_FONT_CMAP_CACHE
-  hb_ot_font_cmap_cache_t *cmap_cache;
-#endif
+    ~advance_cache_t ()
+    {
+      clear ();
+    }
 
-  /* h_advance caching */
-  mutable hb_atomic_int_t cached_coords_serial;
-  mutable hb_atomic_ptr_t<hb_ot_font_advance_cache_t> advance_cache;
+    hb_ot_font_advance_cache_t *acquire_advance_cache () const
+    {
+    retry:
+      auto *cache = advance_cache.get_acquire ();
+      if (!cache)
+      {
+        cache = (hb_ot_font_advance_cache_t *) hb_malloc (sizeof (hb_ot_font_advance_cache_t));
+        if (!cache)
+          return nullptr;
+        new (cache) hb_ot_font_advance_cache_t;
+        return cache;
+      }
+      if (advance_cache.cmpexch (cache, nullptr))
+        return cache;
+      else
+        goto retry;
+    }
+    void release_advance_cache (hb_ot_font_advance_cache_t *cache) const
+    {
+      if (!cache)
+        return;
+      if (!advance_cache.cmpexch (nullptr, cache))
+        hb_free (cache);
+    }
+    void clear_advance_cache () const
+    {
+    retry:
+      auto *cache = advance_cache.get_acquire ();
+      if (!cache)
+        return;
+      if (advance_cache.cmpexch (cache, nullptr))
+        hb_free (cache);
+      else
+        goto retry;
+    }
+
+    OT::ItemVariationStore::cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const
+    {
+    retry:
+      auto *cache = varStore_cache.get_acquire ();
+      if (!cache)
+        return varStore.create_cache ();
+      if (varStore_cache.cmpexch (cache, nullptr))
+        return cache;
+      else
+        goto retry;
+    }
+    void release_varStore_cache (OT::ItemVariationStore::cache_t *cache) const
+    {
+      if (!cache)
+        return;
+      if (!varStore_cache.cmpexch (nullptr, cache))
+        OT::ItemVariationStore::destroy_cache (cache);
+    }
+    void clear_varStore_cache () const
+    {
+    retry:
+      auto *cache = varStore_cache.get_acquire ();
+      if (!cache)
+        return;
+      if (varStore_cache.cmpexch (cache, nullptr))
+        OT::ItemVariationStore::destroy_cache (cache);
+      else
+        goto retry;
+    }
+
+    void clear () const
+    {
+      clear_advance_cache ();
+      clear_varStore_cache ();
+    }
+
+  } h, v;
+
+  void check_serial (hb_font_t *font) const
+  {
+    int font_serial = font->serial_coords.get_acquire ();
+
+    if (cached_coords_serial.get_acquire () == font_serial)
+      return;
+
+    h.clear ();
+    v.clear ();
+
+    cached_coords_serial.set_release (font_serial);
+  }
 };
 
 static hb_ot_font_t *
@@ -98,44 +177,6 @@ _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,
-                                                                         &hb_ot_font_cmap_cache_user_data_key);
-  if (!cmap_cache)
-  {
-    cmap_cache = (hb_ot_font_cmap_cache_t *) hb_malloc (sizeof (hb_ot_font_cmap_cache_t));
-    if (unlikely (!cmap_cache)) goto out;
-    new (cmap_cache) hb_ot_font_cmap_cache_t ();
-    if (unlikely (!hb_face_set_user_data (font->face,
-                                          &hb_ot_font_cmap_cache_user_data_key,
-                                          cmap_cache,
-                                          hb_free,
-                                          false)))
-    {
-      hb_free (cmap_cache);
-      cmap_cache = nullptr;
-      /* Normally we would retry here, but that would
-       * infinite-loop if the face is the empty-face.
-       * Just let it go and this font will be uncached if it
-       * happened to collide with another thread creating the
-       * cache at the same time. */
-      // goto retry;
-    }
-  }
-  out:
-  ot_font->cmap_cache = cmap_cache;
-#endif
-
   return ot_font;
 }
 
@@ -144,8 +185,7 @@ _hb_ot_font_destroy (void *font_data)
 {
   hb_ot_font_t *ot_font = (hb_ot_font_t *) font_data;
 
-  auto *cache = ot_font->advance_cache.get_relaxed ();
-  hb_free (cache);
+  ot_font->~hb_ot_font_t ();
 
   hb_free (ot_font);
 }
@@ -159,11 +199,7 @@ hb_ot_get_nominal_glyph (hb_font_t *font 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;
-  hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
-#ifndef HB_NO_OT_FONT_CMAP_CACHE
-  cmap_cache = ot_font->cmap_cache;
-#endif
-  return ot_face->cmap->get_nominal_glyph (unicode, glyph, cmap_cache);
+  return ot_face->cmap->get_nominal_glyph (unicode, glyph);
 }
 
 static unsigned int
@@ -178,14 +214,9 @@ hb_ot_get_nominal_glyphs (hb_font_t *font 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;
-  hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
-#ifndef HB_NO_OT_FONT_CMAP_CACHE
-  cmap_cache = ot_font->cmap_cache;
-#endif
   return ot_face->cmap->get_nominal_glyphs (count,
                                             first_unicode, unicode_stride,
-                                            first_glyph, glyph_stride,
-                                            cmap_cache);
+                                            first_glyph, glyph_stride);
 }
 
 static hb_bool_t
@@ -198,13 +229,8 @@ hb_ot_get_variation_glyph (hb_font_t *font 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;
-  hb_ot_font_cmap_cache_t *cmap_cache = nullptr;
-#ifndef HB_NO_OT_FONT_CMAP_CACHE
-  cmap_cache = ot_font->cmap_cache;
-#endif
   return ot_face->cmap->get_variation_glyph (unicode,
-                                             variation_selector, glyph,
-                                             cmap_cache);
+                                             variation_selector, glyph);
 }
 
 static void
@@ -216,47 +242,25 @@ 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;
 
-  hb_position_t *orig_first_advance = first_advance;
-
-#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
+  ot_font->check_serial (font);
   const OT::HVAR &HVAR = *hmtx.var_table;
   const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore;
-  OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? varStore.create_cache () : nullptr;
+  OT::ItemVariationStore::cache_t *varStore_cache = ot_font->h.acquire_varStore_cache (varStore);
 
-  bool use_cache = font->num_coords;
-#else
-  OT::ItemVariationStore::cache_t *varStore_cache = nullptr;
-  bool use_cache = false;
-#endif
+  hb_ot_font_advance_cache_t *advance_cache = nullptr;
 
-  hb_ot_font_advance_cache_t *cache = nullptr;
+  bool use_cache = font->num_coords;
   if (use_cache)
   {
-  retry:
-    cache = ot_font->advance_cache.get_acquire ();
-    if (unlikely (!cache))
-    {
-      cache = (hb_ot_font_advance_cache_t *) hb_malloc (sizeof (hb_ot_font_advance_cache_t));
-      if (unlikely (!cache))
-      {
-        use_cache = false;
-        goto out;
-      }
-      new (cache) hb_ot_font_advance_cache_t;
-
-      if (unlikely (!ot_font->advance_cache.cmpexch (nullptr, cache)))
-      {
-        hb_free (cache);
-        goto retry;
-      }
-      ot_font->cached_coords_serial.set_release (font->serial_coords);
-    }
+    advance_cache = ot_font->h.acquire_advance_cache ();
+    if (!advance_cache)
+      use_cache = false;
   }
-  out:
 
   if (!use_cache)
   {
@@ -269,58 +273,26 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
   }
   else
   { /* Use cache. */
-    if (ot_font->cached_coords_serial.get_acquire () != (int) font->serial_coords)
-    {
-      ot_font->advance_cache->clear ();
-      ot_font->cached_coords_serial.set_release (font->serial_coords);
-    }
-
     for (unsigned int i = 0; i < count; i++)
     {
       hb_position_t v;
       unsigned cv;
-      if (ot_font->advance_cache->get (*first_glyph, &cv))
+      if (advance_cache->get (*first_glyph, &cv))
         v = cv;
       else
       {
         v = hmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache);
-        ot_font->advance_cache->set (*first_glyph, v);
+        advance_cache->set (*first_glyph, v);
       }
       *first_advance = font->em_scale_x (v);
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
-  }
-
-#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
-  OT::ItemVariationStore::destroy_cache (varStore_cache);
-#endif
 
-  if (font->x_strength && !font->embolden_in_place)
-  {
-    /* Emboldening. */
-    hb_position_t x_strength = font->x_scale >= 0 ? font->x_strength : -font->x_strength;
-    first_advance = orig_first_advance;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      *first_advance += *first_advance ? x_strength : 0;
-      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
-    }
+    ot_font->h.release_advance_cache (advance_cache);
   }
 
-#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
+  ot_font->h.release_varStore_cache (varStore_cache);
 }
 
 #ifndef HB_NO_VERTICAL
@@ -337,17 +309,13 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
   const hb_ot_face_t *ot_face = ot_font->ot_face;
   const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
 
-  hb_position_t *orig_first_advance = first_advance;
-
   if (vmtx.has_data ())
   {
-#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
+    ot_font->check_serial (font);
     const OT::VVAR &VVAR = *vmtx.var_table;
     const OT::ItemVariationStore &varStore = &VVAR + VVAR.varStore;
-    OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords ? varStore.create_cache () : nullptr;
-#else
-    OT::ItemVariationStore::cache_t *varStore_cache = nullptr;
-#endif
+    OT::ItemVariationStore::cache_t *varStore_cache = ot_font->v.acquire_varStore_cache (varStore);
+    // TODO Use advance_cache.
 
     for (unsigned int i = 0; i < count; i++)
     {
@@ -356,9 +324,7 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
 
-#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
-    OT::ItemVariationStore::destroy_cache (varStore_cache);
-#endif
+    ot_font->v.release_varStore_cache (varStore_cache);
   }
   else
   {
@@ -373,32 +339,6 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
-
-  if (font->y_strength && !font->embolden_in_place)
-  {
-    /* Emboldening. */
-    hb_position_t y_strength = font->y_scale >= 0 ? font->y_strength : -font->y_strength;
-    first_advance = orig_first_advance;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      *first_advance += *first_advance ? y_strength : 0;
-      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
 
@@ -435,7 +375,8 @@ hb_ot_get_glyph_v_origin (hb_font_t *font,
   }
 
   hb_glyph_extents_t extents = {0};
-  if (ot_face->glyf->get_extents (font, glyph, &extents))
+
+  if (hb_font_get_glyph_extents (font, glyph, &extents))
   {
     const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
     int tsb = 0;
@@ -448,7 +389,7 @@ hb_ot_get_glyph_v_origin (hb_font_t *font,
     hb_font_extents_t font_extents;
     font->get_h_extents_with_fallback (&font_extents);
     hb_position_t advance = font_extents.ascender - font_extents.descender;
-    int diff = advance - -extents.height;
+    hb_position_t diff = advance - -extents.height;
     *y = extents.y_bearing + (diff >> 1);
     return true;
   }
@@ -477,6 +418,9 @@ hb_ot_get_glyph_extents (hb_font_t *font,
 #endif
 #if !defined(HB_NO_COLOR) && !defined(HB_NO_PAINT)
   if (ot_face->COLR->get_extents (font, glyph, extents)) return true;
+#endif
+#ifndef HB_NO_VAR_COMPOSITES
+  if (ot_face->VARC->get_extents (font, glyph, extents)) return true;
 #endif
   if (ot_face->glyf->get_extents (font, glyph, extents)) return true;
 #ifndef HB_NO_OT_FONT_CFF
@@ -528,16 +472,9 @@ hb_ot_get_font_h_extents (hb_font_t *font,
                           hb_font_extents_t *metrics,
                           void *user_data HB_UNUSED)
 {
-  bool ret = _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, &metrics->ascender) &&
-             _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER, &metrics->descender) &&
-             _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP, &metrics->line_gap);
-
-  /* Embolden */
-  int y_shift = font->y_strength;
-  if (font->y_scale < 0) y_shift = -y_shift;
-  metrics->ascender += y_shift;
-
-  return ret;
+  return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, &metrics->ascender) &&
+         _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER, &metrics->descender) &&
+         _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP, &metrics->line_gap);
 }
 
 #ifndef HB_NO_VERTICAL
@@ -554,68 +491,46 @@ hb_ot_get_font_v_extents (hb_font_t *font,
 #endif
 
 #ifndef HB_NO_DRAW
-static void
-hb_ot_draw_glyph (hb_font_t *font,
-                  void *font_data HB_UNUSED,
-                  hb_codepoint_t glyph,
-                  hb_draw_funcs_t *draw_funcs, void *draw_data,
-                  void *user_data)
+static hb_bool_t
+hb_ot_draw_glyph_or_fail (hb_font_t *font,
+                          void *font_data HB_UNUSED,
+                          hb_codepoint_t glyph,
+                          hb_draw_funcs_t *draw_funcs, void *draw_data,
+                          void *user_data)
 {
-  bool embolden = font->x_strength || font->y_strength;
-  hb_outline_t outline;
-
-  { // 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);
+  hb_draw_session_t draw_session {draw_funcs, draw_data};
 #ifndef HB_NO_VAR_COMPOSITES
-    if (!font->face->table.VARC->get_path (font, glyph, draw_session))
+  if (font->face->table.VARC->get_path (font, glyph, draw_session)) return true;
 #endif
-    // Keep the following in synch with VARC::get_path_at()
-    if (!font->face->table.glyf->get_path (font, glyph, draw_session))
+  // Keep the following in synch with VARC::get_path_at()
+  if (font->face->table.glyf->get_path (font, glyph, draw_session)) return true;
 #ifndef HB_NO_CFF
-    if (!font->face->table.cff2->get_path (font, glyph, draw_session))
-    if (!font->face->table.cff1->get_path (font, glyph, draw_session))
+  if (font->face->table.cff2->get_path (font, glyph, draw_session)) return true;
+  if (font->face->table.cff1->get_path (font, glyph, draw_session)) return true;
 #endif
-    {}
-  }
-
-  if (embolden)
-  {
-    float x_shift = font->embolden_in_place ? 0 : (float) font->x_strength / 2;
-    float y_shift = (float) font->y_strength / 2;
-    if (font->x_scale < 0) x_shift = -x_shift;
-    if (font->y_scale < 0) y_shift = -y_shift;
-    outline.embolden (font->x_strength, font->y_strength,
-                      x_shift, y_shift);
-
-    outline.replay (draw_funcs, draw_data);
-  }
+  return false;
 }
 #endif
 
 #ifndef HB_NO_PAINT
-static void
-hb_ot_paint_glyph (hb_font_t *font,
-                   void *font_data,
-                   hb_codepoint_t glyph,
-                   hb_paint_funcs_t *paint_funcs, void *paint_data,
-                   unsigned int palette,
-                   hb_color_t foreground,
-                   void *user_data)
+static hb_bool_t
+hb_ot_paint_glyph_or_fail (hb_font_t *font,
+                           void *font_data,
+                           hb_codepoint_t glyph,
+                           hb_paint_funcs_t *paint_funcs, void *paint_data,
+                           unsigned int palette,
+                           hb_color_t foreground,
+                           void *user_data)
 {
 #ifndef HB_NO_COLOR
-  if (font->face->table.COLR->paint_glyph (font, glyph, paint_funcs, paint_data, palette, foreground)) return;
-  if (font->face->table.SVG->paint_glyph (font, glyph, paint_funcs, paint_data)) return;
+  if (font->face->table.COLR->paint_glyph (font, glyph, paint_funcs, paint_data, palette, foreground)) return true;
+  if (font->face->table.SVG->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
 #ifndef HB_NO_OT_FONT_BITMAP
-  if (font->face->table.CBDT->paint_glyph (font, glyph, paint_funcs, paint_data)) return;
-  if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return;
+  if (font->face->table.CBDT->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
+  if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return true;
 #endif
 #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);
+  return false;
 }
 #endif
 
@@ -642,11 +557,11 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
 #endif
 
 #ifndef HB_NO_DRAW
-    hb_font_funcs_set_draw_glyph_func (funcs, hb_ot_draw_glyph, nullptr, nullptr);
+    hb_font_funcs_set_draw_glyph_or_fail_func (funcs, hb_ot_draw_glyph_or_fail, nullptr, nullptr);
 #endif
 
 #ifndef HB_NO_PAINT
-    hb_font_funcs_set_paint_glyph_func (funcs, hb_ot_paint_glyph, nullptr, nullptr);
+    hb_font_funcs_set_paint_glyph_or_fail_func (funcs, hb_ot_paint_glyph_or_fail, nullptr, nullptr);
 #endif
 
     hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, nullptr, nullptr);
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 f7b4ca72198..67b58b17683 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
@@ -359,7 +359,13 @@ struct hmtxvmtx
         return true;
       }
 
-      return _glyf_get_leading_bearing_with_var_unscaled (font, glyph, T::tableTag == HB_OT_TAG_vmtx, lsb);
+      // If there's no vmtx data, the phantom points from glyf table are not accurate,
+      // so we cannot take the next path.
+      bool is_vertical = T::tableTag == HB_OT_TAG_vmtx;
+      if (is_vertical && !has_data ())
+        return false;
+
+      return _glyf_get_leading_bearing_with_var_unscaled (font, glyph, is_vertical, lsb);
 #else
       return false;
 #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 bc90c345d05..97d012e58b8 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
@@ -27,6 +27,7 @@
 #ifndef HB_OT_KERN_TABLE_HH
 #define HB_OT_KERN_TABLE_HH
 
+#include "hb-aat-layout-common.hh"
 #include "hb-aat-layout-kerx-table.hh"
 
 
@@ -400,6 +401,7 @@ struct kern
 
     hb_blob_ptr_t<kern> table;
     AAT::kern_accelerator_data_t accel_data;
+    AAT::hb_aat_scratch_t scratch;
   };
 
   protected:
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 5a3679e4bfa..04a79a93a89 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
@@ -182,7 +182,7 @@ struct BaseCoord
   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);
+    case 3: hb_barrier (); u.format3.collect_variation_indices (varidx_set); return;
     default:return;
     }
   }
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 f14675295f6..7ee34185575 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
@@ -1850,7 +1850,7 @@ struct ClassDefFormat2_4
     hb_sorted_vector_t<hb_codepoint_pair_t> glyph_and_klass;
     hb_set_t orig_klasses;
 
-    if (glyph_set.get_population () * hb_bit_storage ((unsigned) rangeRecord.len) / 2
+    if (glyph_set.get_population () * hb_bit_storage ((unsigned) rangeRecord.len)
         < get_population ())
     {
       for (hb_codepoint_t g : glyph_set)
@@ -1931,7 +1931,7 @@ struct ClassDefFormat2_4
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    if (rangeRecord.len > glyphs->get_population () * hb_bit_storage ((unsigned) rangeRecord.len) / 2)
+    if (rangeRecord.len > glyphs->get_population () * hb_bit_storage ((unsigned) rangeRecord.len))
     {
       for (auto g : *glyphs)
         if (get_class (g))
@@ -2000,7 +2000,7 @@ struct ClassDefFormat2_4
     }
 
     unsigned count = rangeRecord.len;
-    if (count > glyphs->get_population () * hb_bit_storage (count) * 8)
+    if (count > glyphs->get_population () * hb_bit_storage (count))
     {
       for (auto g : *glyphs)
       {
@@ -2548,11 +2548,13 @@ struct SparseVarRegionAxis
   DEFINE_SIZE_STATIC (8);
 };
 
-#define REGION_CACHE_ITEM_CACHE_INVALID 2.f
+#define REGION_CACHE_ITEM_CACHE_INVALID INT_MIN
+#define REGION_CACHE_ITEM_MULTIPLIER (float (1 << ((sizeof (int) * 8) - 2)))
+#define REGION_CACHE_ITEM_DIVISOR (1.f / float (1 << ((sizeof (int) * 8) - 2)))
 
 struct VarRegionList
 {
-  using cache_t = float;
+  using cache_t = hb_atomic_t<int>;
 
   float evaluate (unsigned int region_index,
                   const int *coords, unsigned int coord_len,
@@ -2561,12 +2563,12 @@ struct VarRegionList
     if (unlikely (region_index >= regionCount))
       return 0.;
 
-    float *cached_value = nullptr;
+    cache_t *cached_value = nullptr;
     if (cache)
     {
       cached_value = &(cache[region_index]);
-      if (likely (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID))
-        return *cached_value;
+      if (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID)
+        return *cached_value * REGION_CACHE_ITEM_DIVISOR;
     }
 
     const VarRegionAxis *axes = axesZ.arrayZ + (region_index * axisCount);
@@ -2587,7 +2589,7 @@ struct VarRegionList
     }
 
     if (cache)
-      *cached_value = v;
+      *cached_value = v * REGION_CACHE_ITEM_MULTIPLIER;
     return v;
   }
 
@@ -2730,7 +2732,7 @@ struct SparseVariationRegion : Array16Of<SparseVarRegionAxis>
 
 struct SparseVarRegionList
 {
-  using cache_t = float;
+  using cache_t = hb_atomic_t<int>;
 
   float evaluate (unsigned int region_index,
                   const int *coords, unsigned int coord_len,
@@ -2739,12 +2741,12 @@ struct SparseVarRegionList
     if (unlikely (region_index >= regions.len))
       return 0.;
 
-    float *cached_value = nullptr;
+    cache_t *cached_value = nullptr;
     if (cache)
     {
       cached_value = &(cache[region_index]);
-      if (likely (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID))
-        return *cached_value;
+      if (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID)
+        return *cached_value * REGION_CACHE_ITEM_DIVISOR;
     }
 
     const SparseVariationRegion &region = this+regions[region_index];
@@ -2752,7 +2754,7 @@ struct SparseVarRegionList
     float v = region.evaluate (coords, coord_len);
 
     if (cache)
-      *cached_value = v;
+      *cached_value = v * REGION_CACHE_ITEM_MULTIPLIER;
     return v;
   }
 
@@ -2861,8 +2863,13 @@ struct VarData
                   const hb_vector_t<const hb_vector_t<int>*>& rows)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (this))) return_trace (false);
     unsigned row_count = rows.length;
+    if (!row_count) {
+      // Nothing to serialize, will be empty.
+      return false;
+    }
+
+    if (unlikely (!c->extend_min (this))) return_trace (false);
     itemCount = row_count;
 
     int min_threshold = has_long ? -65536 : -128;
@@ -3187,10 +3194,10 @@ struct ItemVariationStore
 #ifdef HB_NO_VAR
     return nullptr;
 #endif
-    auto &r = this+regions;
-    unsigned count = r.regionCount;
+    unsigned count = (this+regions).regionCount;
+    if (!count) return nullptr;
 
-    float *cache = (float *) hb_malloc (sizeof (float) * count);
+    cache_t *cache = (cache_t *) hb_malloc (sizeof (float) * count);
     if (unlikely (!cache)) return nullptr;
 
     for (unsigned i = 0; i < count; i++)
@@ -3440,7 +3447,7 @@ struct MultiItemVariationStore
 {
   using cache_t = SparseVarRegionList::cache_t;
 
-  cache_t *create_cache (hb_array_t<float> static_cache = hb_array_t<float> ()) const
+  cache_t *create_cache (hb_array_t<cache_t> static_cache = hb_array_t<cache_t> ()) const
   {
 #ifdef HB_NO_VAR
     return nullptr;
@@ -3448,12 +3455,12 @@ struct MultiItemVariationStore
     auto &r = this+regions;
     unsigned count = r.regions.len;
 
-    float *cache;
+    cache_t *cache;
     if (count <= static_cache.length)
       cache = static_cache.arrayZ;
     else
     {
-      cache = (float *) hb_malloc (sizeof (float) * count);
+      cache = (cache_t *) hb_malloc (sizeof (float) * count);
       if (unlikely (!cache)) return nullptr;
     }
 
@@ -3464,7 +3471,7 @@ struct MultiItemVariationStore
   }
 
   static void destroy_cache (cache_t *cache,
-                             hb_array_t<float> static_cache = hb_array_t<float> ())
+                             hb_array_t<cache_t> static_cache = hb_array_t<cache_t> ())
   {
     if (cache != static_cache.arrayZ)
       hb_free (cache);
@@ -4777,12 +4784,12 @@ struct VariationDevice
   hb_position_t get_x_delta (hb_font_t *font,
                              const ItemVariationStore &store,
                              ItemVariationStore::cache_t *store_cache = nullptr) const
-  { return font->em_scalef_x (get_delta (font, store, store_cache)); }
+  { return !font->num_coords ? 0 : font->em_scalef_x (get_delta (font, store, store_cache)); }
 
   hb_position_t get_y_delta (hb_font_t *font,
                              const ItemVariationStore &store,
                              ItemVariationStore::cache_t *store_cache = nullptr) const
-  { return font->em_scalef_y (get_delta (font, store, store_cache)); }
+  { return !font->num_coords ? 0 : font->em_scalef_y (get_delta (font, store, store_cache)); }
 
   VariationDevice* copy (hb_serialize_context_t *c,
                          const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map) const
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 1a719391b8e..072e5cdba26 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
@@ -737,7 +737,8 @@ struct hb_ot_apply_context_t :
   hb_ot_apply_context_t (unsigned int table_index_,
                          hb_font_t *font_,
                          hb_buffer_t *buffer_,
-                         hb_blob_t *table_blob_) :
+                         hb_blob_t *table_blob_,
+                         ItemVariationStore::cache_t *var_store_cache_ = nullptr) :
                         table_index (table_index_),
                         font (font_), face (font->face), buffer (buffer_),
                         sanitizer (table_blob_),
@@ -756,13 +757,7 @@ struct hb_ot_apply_context_t :
 #endif
                              ),
                         var_store (gdef.get_var_store ()),
-                        var_store_cache (
-#ifndef HB_NO_VAR
-                                         table_index == 1 && font->num_coords ? var_store.create_cache () : nullptr
-#else
-                                         nullptr
-#endif
-                                        ),
+                        var_store_cache (var_store_cache_),
                         direction (buffer_->props.direction),
                         has_glyph_classes (gdef.has_glyph_classes ())
   {
@@ -770,13 +765,6 @@ struct hb_ot_apply_context_t :
     buffer->collect_codepoints (digest);
   }
 
-  ~hb_ot_apply_context_t ()
-  {
-#ifndef HB_NO_VAR
-    ItemVariationStore::destroy_cache (var_store_cache);
-#endif
-  }
-
   void init_iters ()
   {
     iter_input.init (this, false);
@@ -4900,7 +4888,7 @@ struct GSUBGPOS
 
       this->lookup_count = table->get_lookup_count ();
 
-      this->accels = (hb_atomic_ptr_t<hb_ot_layout_lookup_accelerator_t> *) hb_calloc (this->lookup_count, sizeof (*accels));
+      this->accels = (hb_atomic_t<hb_ot_layout_lookup_accelerator_t *> *) hb_calloc (this->lookup_count, sizeof (*accels));
       if (unlikely (!this->accels))
       {
         this->lookup_count = 0;
@@ -4948,7 +4936,7 @@ struct GSUBGPOS
 
     hb_blob_ptr_t<T> table;
     unsigned int lookup_count;
-    hb_atomic_ptr_t<hb_ot_layout_lookup_accelerator_t> *accels;
+    hb_atomic_t<hb_ot_layout_lookup_accelerator_t *> *accels;
   };
 
   protected:
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 787119dc62b..afe52963201 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
@@ -131,13 +131,15 @@ hb_ot_layout_kern (const hb_ot_shape_plan_t *plan,
                    hb_font_t *font,
                    hb_buffer_t  *buffer)
 {
-  hb_blob_t *blob = font->face->table.kern.get_blob ();
-  const auto& kern = *font->face->table.kern;
+  auto &accel = *font->face->table.kern;
+  hb_blob_t *blob = accel.get_blob ();
 
   AAT::hb_aat_apply_context_t c (plan, font, buffer, blob);
 
   if (!buffer->message (font, "start table kern")) return;
-  kern.apply (&c);
+  c.buffer_glyph_set = accel.scratch.create_buffer_glyph_set ();
+  accel.apply (&c);
+  accel.scratch.destroy_buffer_glyph_set (c.buffer_glyph_set);
   (void) buffer->message (font, "end table kern");
 }
 #endif
@@ -2013,7 +2015,11 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
 {
   const unsigned int table_index = proxy.table_index;
   unsigned int i = 0;
-  OT::hb_ot_apply_context_t c (table_index, font, buffer, proxy.accel.get_blob ());
+
+  auto *font_data = font->data.ot.get ();
+  auto *var_store_cache = font_data == HB_SHAPER_DATA_SUCCEEDED ? nullptr : (OT::ItemVariationStore::cache_t *) font_data;
+
+  OT::hb_ot_apply_context_t c (table_index, font, buffer, proxy.accel.get_blob (), var_store_cache);
   c.set_recurse_func (Proxy::Lookup::template dispatch_recurse_func<OT::hb_ot_apply_context_t>);
 
   for (unsigned int stage_index = 0; stage_index < stages[table_index].length; stage_index++)
@@ -2626,7 +2632,8 @@ struct hb_get_glyph_alternates_dispatch_t :
  * @alternate_glyphs: (out caller-allocates) (array length=alternate_count): A glyphs buffer.
  *                    Alternate glyphs associated with the glyph id.
  *
- * Fetches alternates of a glyph from a given GSUB lookup index.
+ * Fetches alternates of a glyph from a given GSUB lookup index. Note that for one-to-one GSUB
+ * glyph substitutions, this function fetches the substituted glyph.
  *
  * Return value: Total number of alternates found in the specific lookup index for the given glyph id.
  *
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 71074a87401..a68c8421e4c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
@@ -202,7 +202,8 @@ enum hb_unicode_props_flags_t {
   /* If GEN_CAT=FORMAT, top byte masks: */
   UPROPS_MASK_Cf_ZWJ    = 0x0100u,
   UPROPS_MASK_Cf_ZWNJ   = 0x0200u,
-  UPROPS_MASK_Cf_VS     = 0x0400u
+  UPROPS_MASK_Cf_VS     = 0x0400u,
+  UPROPS_MASK_Cf_AAT_DELETED    = 0x0800u
 };
 HB_MARK_AS_FLAG_T (hb_unicode_props_flags_t);
 
@@ -386,6 +387,8 @@ _hb_grapheme_group_func (const hb_glyph_info_t& a HB_UNUSED,
 static inline void
 _hb_ot_layout_reverse_graphemes (hb_buffer_t *buffer)
 {
+  // MONOTONE_GRAPHEMES was already applied and is taken care of by _hb_grapheme_group_func.
+  // So we just check for MONOTONE_CHARACTERS here.
   buffer->reverse_groups (_hb_grapheme_group_func,
                           buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
 }
@@ -418,6 +421,18 @@ _hb_glyph_info_flip_joiners (hb_glyph_info_t *info)
     return;
   info->unicode_props() ^= UPROPS_MASK_Cf_ZWNJ | UPROPS_MASK_Cf_ZWJ;
 }
+static inline bool
+_hb_glyph_info_is_aat_deleted (const hb_glyph_info_t *info)
+{
+  return _hb_glyph_info_is_unicode_format (info) && (info->unicode_props() & UPROPS_MASK_Cf_AAT_DELETED);
+}
+static inline void
+_hb_glyph_info_set_aat_deleted (hb_glyph_info_t *info)
+{
+  _hb_glyph_info_set_general_category (info, HB_UNICODE_GENERAL_CATEGORY_FORMAT);
+  info->unicode_props() |= UPROPS_MASK_Cf_AAT_DELETED;
+  info->unicode_props() |= UPROPS_MASK_HIDDEN;
+}
 
 /* lig_props: aka lig_id / lig_comp
  *
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 c1b2a27b21d..b33e01fd6c9 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
@@ -1104,6 +1104,24 @@ struct MATH
                   mathVariants.sanitize (c, this));
   }
 
+  // https://github.com/harfbuzz/harfbuzz/issues/4653
+  HB_INTERNAL bool is_bad_cambria (hb_font_t *font) const
+  {
+#ifndef HB_NO_MATH
+    switch HB_CODEPOINT_ENCODE3 (font->face->table.MATH.get_blob ()->length,
+                                 get_constant (HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT, font),
+                                 get_constant (HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT, font))
+    {
+      /* sha1sum:ab4a4fe054d23061f3c039493d6f665cfda2ecf5  cambria.ttc
+       * sha1sum:086855301bff644f9d8827b88491fcf73a6d4cb9  cambria.ttc
+       * sha1sum:b1e5a3feaca2ea3dfcf79ccb377de749ecf60343  cambria.ttc */
+      case HB_CODEPOINT_ENCODE3 (25722, 2500, 3000):
+        return true;
+    }
+#endif
+    return false;
+  }
+
   hb_position_t get_constant (hb_ot_math_constant_t  constant,
                               hb_font_t            *font) const
   { return (this+mathConstants).get_value (constant, font); }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc
index 191149964f9..ab1f50c8eb8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-math.cc
@@ -87,6 +87,20 @@ hb_position_t
 hb_ot_math_get_constant (hb_font_t *font,
                          hb_ot_math_constant_t constant)
 {
+  /* https://github.com/harfbuzz/harfbuzz/issues/4653
+   * Cambria Math has incorrect value for displayOperatorMinHeight, and
+   * apparently Microsoft implementation swaps displayOperatorMinHeight and
+   * delimitedSubFormulaMinHeight, so we do the same if we detect Cambria Math
+   * with the swapped values. */
+  if ((constant == HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT ||
+       constant == HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT) &&
+      font->face->table.MATH->is_bad_cambria (font))
+  {
+    if (constant == HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT)
+      constant = HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT;
+    else
+      constant = HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT;
+  }
   return font->face->table.MATH->get_constant(constant, font);
 }
 
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 83d310e16a0..2c4c6c04663 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
@@ -290,7 +290,7 @@ struct post
     const Array16Of<HBUINT16> *glyphNameIndex = nullptr;
     hb_vector_t<uint32_t> index_to_offset;
     const uint8_t *pool = nullptr;
-    hb_atomic_ptr_t<uint16_t *> gids_sorted_by_name;
+    mutable hb_atomic_t<uint16_t *> gids_sorted_by_name;
   };
 
   bool has_data () const { return version.to_int (); }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
index b74d3104a7e..2401e18f0e6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
@@ -427,8 +427,13 @@ position_cluster (const hb_ot_shape_plan_t *plan,
       /* Find mark glyphs */
       unsigned int j;
       for (j = i + 1; j < end; j++)
+      {
+        if (_hb_glyph_info_is_hidden (&info[j]) ||
+            _hb_glyph_info_is_default_ignorable (&info[j]))
+          continue;
         if (!_hb_glyph_info_is_unicode_mark (&info[j]))
           break;
+      }
 
       position_around_base (plan, font, buffer, i, j, adjust_offsets_when_zeroing);
 
@@ -455,7 +460,9 @@ _hb_ot_shape_fallback_mark_position (const hb_ot_shape_plan_t *plan,
   unsigned int count = buffer->len;
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 1; i < count; i++)
-    if (likely (!_hb_glyph_info_is_unicode_mark (&info[i]))) {
+    if (likely (!_hb_glyph_info_is_unicode_mark (&info[i]) &&
+                !_hb_glyph_info_is_hidden (&info[i]) &&
+                !_hb_glyph_info_is_default_ignorable (&info[i]))) {
       position_cluster (plan, font, buffer, start, i, adjust_offsets_when_zeroing);
       start = i;
     }
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 6265f0eb17d..477a7c7fc72 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,7 @@
 #include "hb-set.hh"
 
 #include "hb-aat-layout.hh"
+#include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-stat-table.hh"
 
 
@@ -84,6 +85,7 @@ hb_ot_shape_planner_t::hb_ot_shape_planner_t (hb_face_t                     *fac
                                                 props (props),
                                                 map (face, props)
 #ifndef HB_NO_AAT_SHAPE
+                                                , aat_map (face, props)
                                                 , apply_morx (_hb_apply_morx (face, props))
 #endif
 {
@@ -106,6 +108,10 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
   plan.props = props;
   plan.shaper = shaper;
   map.compile (plan.map, key);
+#ifndef HB_NO_AAT_SHAPE
+  if (apply_morx)
+    aat_map.compile (plan.aat_map);
+#endif
 
 #ifndef HB_NO_OT_SHAPE_FRACTIONS
   plan.frac_mask = plan.map.get_1_mask (HB_TAG ('f','r','a','c'));
@@ -205,6 +211,14 @@ 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;
+
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  plan.apply_trak = hb_aat_layout_has_tracking (face) && face->table.STAT->has_data ();
+#else
+  plan.apply_trak = false;
+#endif
+
 #endif
 }
 
@@ -269,6 +283,11 @@ 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
 }
 
 
@@ -405,17 +424,26 @@ _hb_ot_shaper_face_data_destroy (hb_ot_face_data_t *data)
  * shaper font data
  */
 
-struct hb_ot_font_data_t {};
+struct hb_ot_font_data_t {
+  OT::ItemVariationStore::cache_t unused; // Just for alignment
+};
 
 hb_ot_font_data_t *
-_hb_ot_shaper_font_data_create (hb_font_t *font HB_UNUSED)
+_hb_ot_shaper_font_data_create (hb_font_t *font)
 {
-  return (hb_ot_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+  if (!font->num_coords)
+    return (hb_ot_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+
+  const OT::ItemVariationStore &var_store = font->face->table.GDEF->table->get_var_store ();
+  auto *cache = (hb_ot_font_data_t *) var_store.create_cache ();
+  return cache ? cache : (hb_ot_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
 }
 
 void
-_hb_ot_shaper_font_data_destroy (hb_ot_font_data_t *data HB_UNUSED)
+_hb_ot_shaper_font_data_destroy (hb_ot_font_data_t *data)
 {
+  if (data == HB_SHAPER_DATA_SUCCEEDED) return;
+  OT::ItemVariationStore::destroy_cache ((OT::ItemVariationStore::cache_t *) data);
 }
 
 
@@ -551,7 +579,7 @@ hb_form_clusters (hb_buffer_t *buffer)
   if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII))
     return;
 
-  if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES)
+  if (HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES (buffer->cluster_level))
     foreach_grapheme (buffer, start, end)
       buffer->merge_clusters (start, end);
   else
@@ -609,7 +637,7 @@ hb_ensure_native_direction (hb_buffer_t *buffer)
    * Ogham fonts are supposed to be implemented BTT or not.  Need to research that
    * first. */
   if ((HB_DIRECTION_IS_HORIZONTAL (direction) &&
-       direction != horiz_dir && horiz_dir != HB_DIRECTION_INVALID) ||
+       direction != horiz_dir && HB_DIRECTION_IS_VALID (horiz_dir)) ||
       (HB_DIRECTION_IS_VERTICAL   (direction) &&
        direction != HB_DIRECTION_TTB))
   {
@@ -1109,10 +1137,6 @@ hb_ot_position_plan (const hb_ot_shape_context_t *c)
   /* Finish off.  Has to follow a certain order. */
   hb_ot_layout_position_finish_advances (c->font, c->buffer);
   hb_ot_zero_width_default_ignorables (c->buffer);
-#ifndef HB_NO_AAT_SHAPE
-  if (c->plan->apply_morx)
-    hb_aat_layout_zero_width_deleted_glyphs (c->buffer);
-#endif
   hb_ot_layout_position_finish_offsets (c->font, c->buffer);
 
   /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
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 d5ee82d4c0b..068d7192d0d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
@@ -66,6 +66,7 @@ struct hb_ot_shape_plan_t
   hb_segment_properties_t props;
   const struct hb_ot_shaper_t *shaper;
   hb_ot_map_t map;
+  hb_aat_map_t aat_map;
   const void *data;
 #ifndef HB_NO_OT_SHAPE_FRACTIONS
   hb_mask_t frac_mask, numr_mask, dnom_mask;
@@ -108,9 +109,11 @@ 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
@@ -141,6 +144,7 @@ struct hb_ot_shape_planner_t
   hb_segment_properties_t props;
   hb_ot_map_builder_t map;
 #ifndef HB_NO_AAT_SHAPE
+  hb_aat_map_builder_t aat_map;
   bool apply_morx : 1;
 #else
   static constexpr bool apply_morx = false;
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 67db6cb26c4..7379bb7f15b 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
@@ -260,7 +260,7 @@ struct arabic_shape_plan_t
    * mask_array[NONE] == 0. */
   hb_mask_t mask_array[ARABIC_NUM_FEATURES + 1];
 
-  hb_atomic_ptr_t<arabic_fallback_plan_t> fallback_plan;
+  mutable hb_atomic_t<arabic_fallback_plan_t *> fallback_plan;
 
   unsigned int do_fallback : 1;
   unsigned int has_stch : 1;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
index 8b41e2219b1..5c46ebbc281 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
@@ -298,8 +298,7 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan HB_UNUSED,
           end = start + 2;
         if (unlikely (!buffer->successful))
           break;
-        if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES)
-          buffer->merge_out_clusters (start, end);
+        buffer->merge_out_clusters (start, end);
         continue;
       }
     }
@@ -372,8 +371,7 @@ preprocess_text_hangul (const hb_ot_shape_plan_t *plan HB_UNUSED,
           if (i < end)
             info[i++].hangul_shaping_feature() = TJMO;
 
-          if (buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES)
-            buffer->merge_out_clusters (start, end);
+          buffer->merge_out_clusters (start, end);
           continue;
         }
         else if ((!tindex && buffer->idx + 1 < count && isT (buffer->cur(+1).codepoint)))
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
index 20007df8963..d78b5670f61 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
@@ -301,7 +301,7 @@ struct indic_shape_plan_t
 #else
   static constexpr bool uniscribe_bug_compatible = false;
 #endif
-  mutable hb_atomic_int_t virama_glyph;
+  mutable hb_atomic_t<hb_codepoint_t> virama_glyph;
 
   hb_indic_would_substitute_feature_t rphf;
   hb_indic_would_substitute_feature_t pref;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
index 68642a5c178..a0ea464e775 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
@@ -360,7 +360,7 @@ preprocess_text_thai (const hb_ot_shape_plan_t *plan,
     {
       /* Since we decomposed, and NIKHAHIT is combining, merge clusters with the
        * previous cluster. */
-      if (start && buffer->cluster_level == HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES)
+      if (start)
         buffer->merge_out_clusters (start - 1, end);
     }
   }
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 3cdb703203b..786a220b6ec 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc
@@ -326,7 +326,7 @@ hb_ot_tags_from_language (const char   *lang_str,
 
     hb_tag_t lang_tag = hb_tag_from_string (lang_str, first_len);
 
-    static hb_atomic_int_t last_tag_idx; /* Poor man's cache. */
+    static hb_atomic_t<unsigned> last_tag_idx = 0; /* Poor man's cache. */
     unsigned tag_idx = last_tag_idx;
 
     if (likely (tag_idx < ot_languages_len && ot_languages[tag_idx].language == lang_tag) ||
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 c3040187f6e..9f9b5be3cbe 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
@@ -53,10 +53,6 @@ struct hb_glyf_scratch_t
   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 {
@@ -594,9 +590,9 @@ struct gvar_GVAR
       /* If sanitize failed, set glyphCount to 0. */
       glyphCount = table->version.to_int () ? face->get_num_glyphs () : 0;
 
-      /* For shared tuples that only have one axis active, shared the index of
-       * that axis as a cache. This will speed up caclulate_scalar() a lot
-       * for fonts with lots of axes and many "monovar" tuples. */
+      /* For shared tuples that only have one or two axes active, shared the index
+       * of that axis as a cache. This will speed up caclulate_scalar() a lot
+       * for fonts with lots of axes and many "monovar" or "duovar" tuples. */
       hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * table->axisCount);
       unsigned count = table->sharedTupleCount;
       if (unlikely (!shared_tuple_active_idx.resize (count, false))) return;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
index 82bbbb0b1f2..8c695c41e24 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
@@ -117,7 +117,7 @@ hb_ot_var_get_axes (hb_face_t        *face,
  * in the specified face.
  *
  * Since: 1.4.2
- * Deprecated: 2.2.0 - use hb_ot_var_find_axis_info() instead
+ * Deprecated: 2.2.0: use hb_ot_var_find_axis_info() instead
  **/
 hb_bool_t
 hb_ot_var_find_axis (hb_face_t        *face,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
index a0a6ea156c3..85ffc793678 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
@@ -84,6 +84,12 @@ void hb_outline_t::replay (hb_draw_funcs_t *pen, void *pen_data) const
   }
 }
 
+void hb_outline_t::slant (float slant_xy)
+{
+  for (auto &p : points)
+    p.x += slant_xy * p.y;
+}
+
 float hb_outline_t::control_area () const
 {
   float a = 0;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
index c44625da2e1..c5b68c05dd7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
@@ -69,6 +69,7 @@ struct hb_outline_t
 
   HB_INTERNAL void replay (hb_draw_funcs_t *pen, void *pen_data) const;
   HB_INTERNAL float control_area () const;
+  HB_INTERNAL void slant (float slant_xy);
   HB_INTERNAL void embolden (float x_strength, float y_strength,
                              float x_shift, float y_shift);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.cc
new file mode 100644
index 00000000000..bc7e962bb46
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.cc
@@ -0,0 +1,207 @@
+/*
+ * 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.
+ */
+
+#include "hb.hh"
+
+#ifndef HB_NO_PAINT
+
+#include "hb-paint-bounded.hh"
+
+#include "hb-machinery.hh"
+
+
+/*
+ * This file implements boundedness computation of COLRv1 fonts as described in:
+ *
+ * https://learn.microsoft.com/en-us/typography/opentype/spec/colr#glyph-metrics-and-boundedness
+ */
+
+static void
+hb_paint_bounded_push_clip_glyph (hb_paint_funcs_t *funcs HB_UNUSED,
+                                  void *paint_data,
+                                  hb_codepoint_t glyph,
+                                  hb_font_t *font,
+                                  void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->push_clip ();
+}
+
+static void
+hb_paint_bounded_push_clip_rectangle (hb_paint_funcs_t *funcs HB_UNUSED,
+                                      void *paint_data,
+                                      float xmin, float ymin, float xmax, float ymax,
+                                      void *user_data)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->push_clip ();
+}
+
+static void
+hb_paint_bounded_pop_clip (hb_paint_funcs_t *funcs HB_UNUSED,
+                           void *paint_data,
+                           void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->pop_clip ();
+}
+
+static void
+hb_paint_bounded_push_group (hb_paint_funcs_t *funcs HB_UNUSED,
+                             void *paint_data,
+                             void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->push_group ();
+}
+
+static void
+hb_paint_bounded_pop_group (hb_paint_funcs_t *funcs HB_UNUSED,
+                            void *paint_data,
+                            hb_paint_composite_mode_t mode,
+                            void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->pop_group (mode);
+}
+
+static hb_bool_t
+hb_paint_bounded_paint_image (hb_paint_funcs_t *funcs HB_UNUSED,
+                              void *paint_data,
+                              hb_blob_t *blob HB_UNUSED,
+                              unsigned int width HB_UNUSED,
+                              unsigned int height HB_UNUSED,
+                              hb_tag_t format HB_UNUSED,
+                              float slant HB_UNUSED,
+                              hb_glyph_extents_t *glyph_extents,
+                              void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->push_clip ();
+  c->paint ();
+  c->pop_clip ();
+
+  return true;
+}
+
+static void
+hb_paint_bounded_paint_color (hb_paint_funcs_t *funcs HB_UNUSED,
+                              void *paint_data,
+                              hb_bool_t use_foreground HB_UNUSED,
+                              hb_color_t color HB_UNUSED,
+                              void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->paint ();
+}
+
+static void
+hb_paint_bounded_paint_linear_gradient (hb_paint_funcs_t *funcs HB_UNUSED,
+                                        void *paint_data,
+                                        hb_color_line_t *color_line HB_UNUSED,
+                                        float x0 HB_UNUSED, float y0 HB_UNUSED,
+                                        float x1 HB_UNUSED, float y1 HB_UNUSED,
+                                        float x2 HB_UNUSED, float y2 HB_UNUSED,
+                                        void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->paint ();
+}
+
+static void
+hb_paint_bounded_paint_radial_gradient (hb_paint_funcs_t *funcs HB_UNUSED,
+                                        void *paint_data,
+                                        hb_color_line_t *color_line HB_UNUSED,
+                                        float x0 HB_UNUSED, float y0 HB_UNUSED, float r0 HB_UNUSED,
+                                        float x1 HB_UNUSED, float y1 HB_UNUSED, float r1 HB_UNUSED,
+                                        void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->paint ();
+}
+
+static void
+hb_paint_bounded_paint_sweep_gradient (hb_paint_funcs_t *funcs HB_UNUSED,
+                                       void *paint_data,
+                                       hb_color_line_t *color_line HB_UNUSED,
+                                       float cx HB_UNUSED, float cy HB_UNUSED,
+                                       float start_angle HB_UNUSED,
+                                       float end_angle HB_UNUSED,
+                                       void *user_data HB_UNUSED)
+{
+  hb_paint_bounded_context_t *c = (hb_paint_bounded_context_t *) paint_data;
+
+  c->paint ();
+}
+
+static inline void free_static_paint_bounded_funcs ();
+
+static struct hb_paint_bounded_funcs_lazy_loader_t : hb_paint_funcs_lazy_loader_t<hb_paint_bounded_funcs_lazy_loader_t>
+{
+  static hb_paint_funcs_t *create ()
+  {
+    hb_paint_funcs_t *funcs = hb_paint_funcs_create ();
+
+    hb_paint_funcs_set_push_clip_glyph_func (funcs, hb_paint_bounded_push_clip_glyph, nullptr, nullptr);
+    hb_paint_funcs_set_push_clip_rectangle_func (funcs, hb_paint_bounded_push_clip_rectangle, nullptr, nullptr);
+    hb_paint_funcs_set_pop_clip_func (funcs, hb_paint_bounded_pop_clip, nullptr, nullptr);
+    hb_paint_funcs_set_push_group_func (funcs, hb_paint_bounded_push_group, nullptr, nullptr);
+    hb_paint_funcs_set_pop_group_func (funcs, hb_paint_bounded_pop_group, nullptr, nullptr);
+    hb_paint_funcs_set_color_func (funcs, hb_paint_bounded_paint_color, nullptr, nullptr);
+    hb_paint_funcs_set_image_func (funcs, hb_paint_bounded_paint_image, nullptr, nullptr);
+    hb_paint_funcs_set_linear_gradient_func (funcs, hb_paint_bounded_paint_linear_gradient, nullptr, nullptr);
+    hb_paint_funcs_set_radial_gradient_func (funcs, hb_paint_bounded_paint_radial_gradient, nullptr, nullptr);
+    hb_paint_funcs_set_sweep_gradient_func (funcs, hb_paint_bounded_paint_sweep_gradient, nullptr, nullptr);
+
+    hb_paint_funcs_make_immutable (funcs);
+
+    hb_atexit (free_static_paint_bounded_funcs);
+
+    return funcs;
+  }
+} static_paint_bounded_funcs;
+
+static inline
+void free_static_paint_bounded_funcs ()
+{
+  static_paint_bounded_funcs.free_instance ();
+}
+
+hb_paint_funcs_t *
+hb_paint_bounded_get_funcs ()
+{
+  return static_paint_bounded_funcs.get_unconst ();
+}
+
+
+#endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.hh
new file mode 100644
index 00000000000..bdcdba76397
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-bounded.hh
@@ -0,0 +1,117 @@
+/*
+ * 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_PAINT_BOUNDED_HH
+#define HB_PAINT_BOUNDED_HH
+
+#include "hb.hh"
+#include "hb-paint.h"
+
+#include "hb-geometry.hh"
+
+
+typedef struct  hb_paint_bounded_context_t hb_paint_bounded_context_t;
+
+struct hb_paint_bounded_context_t
+{
+  void clear ()
+  {
+    clips = 0;
+    bounded = true;
+    groups.clear ();
+  }
+
+  hb_paint_bounded_context_t ()
+  {
+    clear ();
+  }
+
+  bool is_bounded ()
+  {
+    return bounded;
+  }
+
+  void push_clip ()
+  {
+    clips++;
+  }
+
+  void pop_clip ()
+  {
+    if (clips == 0) return;
+    clips--;
+  }
+
+  void push_group ()
+  {
+    groups.push (bounded);
+    bounded = true;
+  }
+
+  void pop_group (hb_paint_composite_mode_t mode)
+  {
+    const bool src_bounded = bounded;
+    bounded = groups.pop ();
+    bool &backdrop_bounded = bounded;
+
+    // https://learn.microsoft.com/en-us/typography/opentype/spec/colr#format-32-paintcomposite
+    switch ((int) mode)
+    {
+      case HB_PAINT_COMPOSITE_MODE_CLEAR:
+        backdrop_bounded = true;
+        break;
+      case HB_PAINT_COMPOSITE_MODE_SRC:
+      case HB_PAINT_COMPOSITE_MODE_SRC_OUT:
+        backdrop_bounded = src_bounded;
+        break;
+      case HB_PAINT_COMPOSITE_MODE_DEST:
+      case HB_PAINT_COMPOSITE_MODE_DEST_OUT:
+        break;
+      case HB_PAINT_COMPOSITE_MODE_SRC_IN:
+      case HB_PAINT_COMPOSITE_MODE_DEST_IN:
+        backdrop_bounded = backdrop_bounded && src_bounded;
+        break;
+      default:
+        backdrop_bounded = backdrop_bounded || src_bounded;
+        break;
+     }
+  }
+
+  void paint ()
+  {
+    if (!clips)
+      bounded = false;
+  }
+
+  protected:
+  bool bounded; // true if current drawing bounded
+  unsigned clips; // number of active clips
+  hb_vector_t<bool> groups; // true if group bounded
+};
+
+HB_INTERNAL hb_paint_funcs_t *
+hb_paint_bounded_get_funcs ();
+
+
+#endif /* HB_PAINT_BOUNDED_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
index 3bbe6351725..bc08c5a9e14 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
@@ -28,14 +28,13 @@
 
 #include "hb-paint-extents.hh"
 
-#include "hb-draw.h"
+#include "hb-draw.hh"
 
 #include "hb-machinery.hh"
 
 
 /*
- * This file implements bounds-extraction as well as boundedness
- * computation of COLRv1 fonts as described in:
+ * This file implements bounds-extraction computation of COLRv1 fonts as described in:
  *
  * https://learn.microsoft.com/en-us/typography/opentype/spec/colr#glyph-metrics-and-boundedness
  */
@@ -63,93 +62,6 @@ hb_paint_extents_pop_transform (hb_paint_funcs_t *funcs HB_UNUSED,
   c->pop_transform ();
 }
 
-static void
-hb_draw_extents_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                         void *data,
-                         hb_draw_state_t *st,
-                         float to_x, float to_y,
-                         void *user_data HB_UNUSED)
-{
-  hb_extents_t *extents = (hb_extents_t *) data;
-
-  extents->add_point (to_x, to_y);
-}
-
-static void
-hb_draw_extents_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                         void *data,
-                         hb_draw_state_t *st,
-                         float to_x, float to_y,
-                         void *user_data HB_UNUSED)
-{
-  hb_extents_t *extents = (hb_extents_t *) data;
-
-  extents->add_point (to_x, to_y);
-}
-
-static void
-hb_draw_extents_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                              void *data,
-                              hb_draw_state_t *st,
-                              float control_x, float control_y,
-                              float to_x, float to_y,
-                              void *user_data HB_UNUSED)
-{
-  hb_extents_t *extents = (hb_extents_t *) data;
-
-  extents->add_point (control_x, control_y);
-  extents->add_point (to_x, to_y);
-}
-
-static void
-hb_draw_extents_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
-                          void *data,
-                          hb_draw_state_t *st,
-                          float control1_x, float control1_y,
-                          float control2_x, float control2_y,
-                          float to_x, float to_y,
-                          void *user_data HB_UNUSED)
-{
-  hb_extents_t *extents = (hb_extents_t *) data;
-
-  extents->add_point (control1_x, control1_y);
-  extents->add_point (control2_x, control2_y);
-  extents->add_point (to_x, to_y);
-}
-
-static inline void free_static_draw_extents_funcs ();
-
-static struct hb_draw_extents_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t<hb_draw_extents_funcs_lazy_loader_t>
-{
-  static hb_draw_funcs_t *create ()
-  {
-    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
-
-    hb_draw_funcs_set_move_to_func (funcs, hb_draw_extents_move_to, nullptr, nullptr);
-    hb_draw_funcs_set_line_to_func (funcs, hb_draw_extents_line_to, nullptr, nullptr);
-    hb_draw_funcs_set_quadratic_to_func (funcs, hb_draw_extents_quadratic_to, nullptr, nullptr);
-    hb_draw_funcs_set_cubic_to_func (funcs, hb_draw_extents_cubic_to, nullptr, nullptr);
-
-    hb_draw_funcs_make_immutable (funcs);
-
-    hb_atexit (free_static_draw_extents_funcs);
-
-    return funcs;
-  }
-} static_draw_extents_funcs;
-
-static inline
-void free_static_draw_extents_funcs ()
-{
-  static_draw_extents_funcs.free_instance ();
-}
-
-static hb_draw_funcs_t *
-hb_draw_extents_get_funcs ()
-{
-  return static_draw_extents_funcs.get_unconst ();
-}
-
 static void
 hb_paint_extents_push_clip_glyph (hb_paint_funcs_t *funcs HB_UNUSED,
                                   void *paint_data,
@@ -221,6 +133,9 @@ hb_paint_extents_paint_image (hb_paint_funcs_t *funcs HB_UNUSED,
 {
   hb_paint_extents_context_t *c = (hb_paint_extents_context_t *) paint_data;
 
+  if (!glyph_extents)
+    return false; // Happens with SVG images.
+
   hb_extents_t extents = {(float) glyph_extents->x_bearing,
                           (float) glyph_extents->y_bearing + glyph_extents->height,
                           (float) glyph_extents->x_bearing + glyph_extents->width,
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 18aa638c7ad..60374eaa2d2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
@@ -35,13 +35,22 @@ typedef struct  hb_paint_extents_context_t hb_paint_extents_context_t;
 
 struct hb_paint_extents_context_t
 {
-  hb_paint_extents_context_t ()
+  void clear ()
   {
+    transforms.clear ();
+    clips.clear ();
+    groups.clear ();
+
     transforms.push (hb_transform_t{});
     clips.push (hb_bounds_t{hb_bounds_t::UNBOUNDED});
     groups.push (hb_bounds_t{hb_bounds_t::EMPTY});
   }
 
+  hb_paint_extents_context_t ()
+  {
+    clear ();
+  }
+
   hb_extents_t get_extents ()
   {
     return groups.tail().extents;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint.cc
index 6f2a296744f..094597d6457 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.cc
@@ -87,7 +87,7 @@ hb_paint_image_nil (hb_paint_funcs_t *funcs, void *paint_data,
                     unsigned int width,
                     unsigned int height,
                     hb_tag_t format,
-                    float slant_xy,
+                    float slant_xy_deprecated,
                     hb_glyph_extents_t *extents,
                     void *user_data) { return false; }
 
@@ -464,6 +464,42 @@ hb_paint_push_transform (hb_paint_funcs_t *funcs, void *paint_data,
   funcs->push_transform (paint_data, xx, yx, xy, yy, dx, dy);
 }
 
+/**
+ * hb_paint_push_font_transform:
+ * @funcs: paint functions
+ * @paint_data: associated data passed by the caller
+ * @font: a font
+ *
+ * Push the transform reflecting the font's scale and slant
+ * settings onto the paint functions.
+ *
+ * Since: 11.0.0
+ */
+void
+hb_paint_push_font_transform (hb_paint_funcs_t *funcs, void *paint_data,
+                              const hb_font_t *font)
+{
+  funcs->push_font_transform (paint_data, font);
+}
+
+/**
+ * hb_paint_push_inverse_font_transform:
+ * @funcs: paint functions
+ * @paint_data: associated data passed by the caller
+ * @font: a font
+ *
+ * Push the inverse of the transform reflecting the font's
+ * scale and slant settings onto the paint functions.
+ *
+ * Since: 11.0.0
+ */
+void
+hb_paint_push_inverse_font_transform (hb_paint_funcs_t *funcs, void *paint_data,
+                                      const hb_font_t *font)
+{
+  funcs->push_inverse_font_transform (paint_data, font);
+}
+
 /**
  * hb_paint_pop_transform:
  * @funcs: paint functions
@@ -579,7 +615,7 @@ hb_paint_color (hb_paint_funcs_t *funcs, void *paint_data,
  * @width: width of the raster image in pixels, or 0
  * @height: height of the raster image in pixels, or 0
  * @format: the image format as a tag
- * @slant: the synthetic slant ratio to be applied to the image during rendering
+ * @slant: Deprecated. set to 0.0
  * @extents: (nullable): the extents of the glyph
  *
  * Perform a "image" paint operation.
@@ -592,10 +628,10 @@ hb_paint_image (hb_paint_funcs_t *funcs, void *paint_data,
                 unsigned int width,
                 unsigned int height,
                 hb_tag_t format,
-                float slant,
+                HB_UNUSED float slant,
                 hb_glyph_extents_t *extents)
 {
-  funcs->image (paint_data, image, width, height, format, slant, extents);
+  funcs->image (paint_data, image, width, height, format, 0.f, extents);
 }
 
 /**
@@ -646,7 +682,7 @@ hb_paint_radial_gradient (hb_paint_funcs_t *funcs, void *paint_data,
                           float x0, float y0, float r0,
                           float x1, float y1, float r1)
 {
-  funcs->radial_gradient (paint_data, color_line, x0, y0, r0, y1, x1, r1);
+  funcs->radial_gradient (paint_data, color_line, x0, y0, r0, x1, y1, r1);
 }
 
 /**
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.h b/src/java.desktop/share/native/libharfbuzz/hb-paint.h
index f0d9438506d..9827a02887b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.h
@@ -167,8 +167,10 @@ typedef hb_bool_t (*hb_paint_color_glyph_func_t) (hb_paint_funcs_t *funcs,
  * A virtual method for the #hb_paint_funcs_t to clip
  * subsequent paint calls to the outline of a glyph.
  *
- * The coordinates of the glyph outline are interpreted according
- * to the current transform.
+ * The coordinates of the glyph outline are expected in the
+ * current @font scale (ie. the results of calling
+ * hb_font_draw_glyph() with @font). The outline is
+ * transformed by the current transform.
  *
  * This clip is applied in addition to the current clip,
  * and remains in effect until a matching call to
@@ -281,7 +283,7 @@ typedef void (*hb_paint_color_func_t) (hb_paint_funcs_t *funcs,
  * @width: width of the raster image in pixels, or 0
  * @height: height of the raster image in pixels, or 0
  * @format: the image format as a tag
- * @slant: the synthetic slant ratio to be applied to the image during rendering
+ * @slant: Deprecated. Always set to 0.0.
  * @extents: (nullable): glyph extents for desired rendering
  * @user_data: User data pointer passed to hb_paint_funcs_set_image_func()
  *
@@ -956,6 +958,14 @@ hb_paint_push_transform (hb_paint_funcs_t *funcs, void *paint_data,
                          float xy, float yy,
                          float dx, float dy);
 
+HB_EXTERN void
+hb_paint_push_font_transform (hb_paint_funcs_t *funcs, void *paint_data,
+                              const hb_font_t *font);
+
+HB_EXTERN void
+hb_paint_push_inverse_font_transform (hb_paint_funcs_t *funcs, void *paint_data,
+                                      const hb_font_t *font);
+
 HB_EXTERN void
 hb_paint_pop_transform (hb_paint_funcs_t *funcs, void *paint_data);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
index fbf4a08cfff..2abadebab3c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
@@ -157,27 +157,29 @@ struct hb_paint_funcs_t
 
   /* Internal specializations. */
 
-  void push_root_transform (void *paint_data,
+  void push_font_transform (void *paint_data,
                             const hb_font_t *font)
   {
     float upem = font->face->get_upem ();
     int xscale = font->x_scale, yscale = font->y_scale;
-    float slant = font->slant_xy;
 
     push_transform (paint_data,
-                    xscale/upem, 0, slant * yscale/upem, yscale/upem, 0, 0);
+                    xscale/upem, 0,
+                    0, yscale/upem,
+                    0, 0);
   }
 
-  void push_inverse_root_transform (void *paint_data,
-                                    hb_font_t *font)
+  void push_inverse_font_transform (void *paint_data,
+                                    const hb_font_t *font)
   {
     float upem = font->face->get_upem ();
     int xscale = font->x_scale ? font->x_scale : upem;
     int yscale = font->y_scale ? font->y_scale : upem;
-    float slant = font->slant_xy;
 
     push_transform (paint_data,
-                    upem/xscale, 0, -slant * upem/xscale, upem/yscale, 0, 0);
+                    upem/xscale, 0,
+                    0, upem/yscale,
+                    0, 0);
   }
 
   HB_NODISCARD
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-script-list.h b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h
new file mode 100644
index 00000000000..f811dbc3408
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h
@@ -0,0 +1,484 @@
+/*
+ * Copyright © 2007,2008,2009  Red Hat, Inc.
+ * Copyright © 2011,2012  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.
+ *
+ * Red Hat Author(s): Behdad Esfahbod
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
+#error "Include <hb.h> instead."
+#endif
+
+#ifndef HB_SCRIPT_LIST_H
+#define HB_SCRIPT_LIST_H
+
+/* This file belongs to the middle of hb-common.h.
+ * The reason it has been surgically extracted is because
+ * FreeType imports types and enums from hb-common.h,
+ * and since this enum is large and growing, we want to
+ * make it easy to just copy the file over to FreeType.
+ * https://github.com/harfbuzz/harfbuzz/issues/5271
+ */
+
+/* Dummy lines to make our checks happy.  */
+#if 0
+#include "hb-common.h"
+HB_BEGIN_DECLS
+HB_END_DECLS
+#endif
+
+
+/**
+ * hb_script_t:
+ * @HB_SCRIPT_COMMON: `Zyyy`
+ * @HB_SCRIPT_INHERITED: `Zinh`
+ * @HB_SCRIPT_UNKNOWN: `Zzzz`
+ * @HB_SCRIPT_ARABIC: `Arab`
+ * @HB_SCRIPT_ARMENIAN: `Armn`
+ * @HB_SCRIPT_BENGALI: `Beng`
+ * @HB_SCRIPT_CYRILLIC: `Cyrl`
+ * @HB_SCRIPT_DEVANAGARI: `Deva`
+ * @HB_SCRIPT_GEORGIAN: `Geor`
+ * @HB_SCRIPT_GREEK: `Grek`
+ * @HB_SCRIPT_GUJARATI: `Gujr`
+ * @HB_SCRIPT_GURMUKHI: `Guru`
+ * @HB_SCRIPT_HANGUL: `Hang`
+ * @HB_SCRIPT_HAN: `Hani`
+ * @HB_SCRIPT_HEBREW: `Hebr`
+ * @HB_SCRIPT_HIRAGANA: `Hira`
+ * @HB_SCRIPT_KANNADA: `Knda`
+ * @HB_SCRIPT_KATAKANA: `Kana`
+ * @HB_SCRIPT_LAO: `Laoo`
+ * @HB_SCRIPT_LATIN: `Latn`
+ * @HB_SCRIPT_MALAYALAM: `Mlym`
+ * @HB_SCRIPT_ORIYA: `Orya`
+ * @HB_SCRIPT_TAMIL: `Taml`
+ * @HB_SCRIPT_TELUGU: `Telu`
+ * @HB_SCRIPT_THAI: `Thai`
+ * @HB_SCRIPT_TIBETAN: `Tibt`
+ * @HB_SCRIPT_BOPOMOFO: `Bopo`
+ * @HB_SCRIPT_BRAILLE: `Brai`
+ * @HB_SCRIPT_CANADIAN_SYLLABICS: `Cans`
+ * @HB_SCRIPT_CHEROKEE: `Cher`
+ * @HB_SCRIPT_ETHIOPIC: `Ethi`
+ * @HB_SCRIPT_KHMER: `Khmr`
+ * @HB_SCRIPT_MONGOLIAN: `Mong`
+ * @HB_SCRIPT_MYANMAR: `Mymr`
+ * @HB_SCRIPT_OGHAM: `Ogam`
+ * @HB_SCRIPT_RUNIC: `Runr`
+ * @HB_SCRIPT_SINHALA: `Sinh`
+ * @HB_SCRIPT_SYRIAC: `Syrc`
+ * @HB_SCRIPT_THAANA: `Thaa`
+ * @HB_SCRIPT_YI: `Yiii`
+ * @HB_SCRIPT_DESERET: `Dsrt`
+ * @HB_SCRIPT_GOTHIC: `Goth`
+ * @HB_SCRIPT_OLD_ITALIC: `Ital`
+ * @HB_SCRIPT_BUHID: `Buhd`
+ * @HB_SCRIPT_HANUNOO: `Hano`
+ * @HB_SCRIPT_TAGALOG: `Tglg`
+ * @HB_SCRIPT_TAGBANWA: `Tagb`
+ * @HB_SCRIPT_CYPRIOT: `Cprt`
+ * @HB_SCRIPT_LIMBU: `Limb`
+ * @HB_SCRIPT_LINEAR_B: `Linb`
+ * @HB_SCRIPT_OSMANYA: `Osma`
+ * @HB_SCRIPT_SHAVIAN: `Shaw`
+ * @HB_SCRIPT_TAI_LE: `Tale`
+ * @HB_SCRIPT_UGARITIC: `Ugar`
+ * @HB_SCRIPT_BUGINESE: `Bugi`
+ * @HB_SCRIPT_COPTIC: `Copt`
+ * @HB_SCRIPT_GLAGOLITIC: `Glag`
+ * @HB_SCRIPT_KHAROSHTHI: `Khar`
+ * @HB_SCRIPT_NEW_TAI_LUE: `Talu`
+ * @HB_SCRIPT_OLD_PERSIAN: `Xpeo`
+ * @HB_SCRIPT_SYLOTI_NAGRI: `Sylo`
+ * @HB_SCRIPT_TIFINAGH: `Tfng`
+ * @HB_SCRIPT_BALINESE: `Bali`
+ * @HB_SCRIPT_CUNEIFORM: `Xsux`
+ * @HB_SCRIPT_NKO: `Nkoo`
+ * @HB_SCRIPT_PHAGS_PA: `Phag`
+ * @HB_SCRIPT_PHOENICIAN: `Phnx`
+ * @HB_SCRIPT_CARIAN: `Cari`
+ * @HB_SCRIPT_CHAM: `Cham`
+ * @HB_SCRIPT_KAYAH_LI: `Kali`
+ * @HB_SCRIPT_LEPCHA: `Lepc`
+ * @HB_SCRIPT_LYCIAN: `Lyci`
+ * @HB_SCRIPT_LYDIAN: `Lydi`
+ * @HB_SCRIPT_OL_CHIKI: `Olck`
+ * @HB_SCRIPT_REJANG: `Rjng`
+ * @HB_SCRIPT_SAURASHTRA: `Saur`
+ * @HB_SCRIPT_SUNDANESE: `Sund`
+ * @HB_SCRIPT_VAI: `Vaii`
+ * @HB_SCRIPT_AVESTAN: `Avst`
+ * @HB_SCRIPT_BAMUM: `Bamu`
+ * @HB_SCRIPT_EGYPTIAN_HIEROGLYPHS: `Egyp`
+ * @HB_SCRIPT_IMPERIAL_ARAMAIC: `Armi`
+ * @HB_SCRIPT_INSCRIPTIONAL_PAHLAVI: `Phli`
+ * @HB_SCRIPT_INSCRIPTIONAL_PARTHIAN: `Prti`
+ * @HB_SCRIPT_JAVANESE: `Java`
+ * @HB_SCRIPT_KAITHI: `Kthi`
+ * @HB_SCRIPT_LISU: `Lisu`
+ * @HB_SCRIPT_MEETEI_MAYEK: `Mtei`
+ * @HB_SCRIPT_OLD_SOUTH_ARABIAN: `Sarb`
+ * @HB_SCRIPT_OLD_TURKIC: `Orkh`
+ * @HB_SCRIPT_SAMARITAN: `Samr`
+ * @HB_SCRIPT_TAI_THAM: `Lana`
+ * @HB_SCRIPT_TAI_VIET: `Tavt`
+ * @HB_SCRIPT_BATAK: `Batk`
+ * @HB_SCRIPT_BRAHMI: `Brah`
+ * @HB_SCRIPT_MANDAIC: `Mand`
+ * @HB_SCRIPT_CHAKMA: `Cakm`
+ * @HB_SCRIPT_MEROITIC_CURSIVE: `Merc`
+ * @HB_SCRIPT_MEROITIC_HIEROGLYPHS: `Mero`
+ * @HB_SCRIPT_MIAO: `Plrd`
+ * @HB_SCRIPT_SHARADA: `Shrd`
+ * @HB_SCRIPT_SORA_SOMPENG: `Sora`
+ * @HB_SCRIPT_TAKRI: `Takr`
+ * @HB_SCRIPT_BASSA_VAH: `Bass`, Since: 0.9.30
+ * @HB_SCRIPT_CAUCASIAN_ALBANIAN: `Aghb`, Since: 0.9.30
+ * @HB_SCRIPT_DUPLOYAN: `Dupl`, Since: 0.9.30
+ * @HB_SCRIPT_ELBASAN: `Elba`, Since: 0.9.30
+ * @HB_SCRIPT_GRANTHA: `Gran`, Since: 0.9.30
+ * @HB_SCRIPT_KHOJKI: `Khoj`, Since: 0.9.30
+ * @HB_SCRIPT_KHUDAWADI: `Sind`, Since: 0.9.30
+ * @HB_SCRIPT_LINEAR_A: `Lina`, Since: 0.9.30
+ * @HB_SCRIPT_MAHAJANI: `Mahj`, Since: 0.9.30
+ * @HB_SCRIPT_MANICHAEAN: `Mani`, Since: 0.9.30
+ * @HB_SCRIPT_MENDE_KIKAKUI: `Mend`, Since: 0.9.30
+ * @HB_SCRIPT_MODI: `Modi`, Since: 0.9.30
+ * @HB_SCRIPT_MRO: `Mroo`, Since: 0.9.30
+ * @HB_SCRIPT_NABATAEAN: `Nbat`, Since: 0.9.30
+ * @HB_SCRIPT_OLD_NORTH_ARABIAN: `Narb`, Since: 0.9.30
+ * @HB_SCRIPT_OLD_PERMIC: `Perm`, Since: 0.9.30
+ * @HB_SCRIPT_PAHAWH_HMONG: `Hmng`, Since: 0.9.30
+ * @HB_SCRIPT_PALMYRENE: `Palm`, Since: 0.9.30
+ * @HB_SCRIPT_PAU_CIN_HAU: `Pauc`, Since: 0.9.30
+ * @HB_SCRIPT_PSALTER_PAHLAVI: `Phlp`, Since: 0.9.30
+ * @HB_SCRIPT_SIDDHAM: `Sidd`, Since: 0.9.30
+ * @HB_SCRIPT_TIRHUTA: `Tirh`, Since: 0.9.30
+ * @HB_SCRIPT_WARANG_CITI: `Wara`, Since: 0.9.30
+ * @HB_SCRIPT_AHOM: `Ahom`, Since: 0.9.30
+ * @HB_SCRIPT_ANATOLIAN_HIEROGLYPHS: `Hluw`, Since: 0.9.30
+ * @HB_SCRIPT_HATRAN: `Hatr`, Since: 0.9.30
+ * @HB_SCRIPT_MULTANI: `Mult`, Since: 0.9.30
+ * @HB_SCRIPT_OLD_HUNGARIAN: `Hung`, Since: 0.9.30
+ * @HB_SCRIPT_SIGNWRITING: `Sgnw`, Since: 0.9.30
+ * @HB_SCRIPT_ADLAM: `Adlm`, Since: 1.3.0
+ * @HB_SCRIPT_BHAIKSUKI: `Bhks`, Since: 1.3.0
+ * @HB_SCRIPT_MARCHEN: `Marc`, Since: 1.3.0
+ * @HB_SCRIPT_OSAGE: `Osge`, Since: 1.3.0
+ * @HB_SCRIPT_TANGUT: `Tang`, Since: 1.3.0
+ * @HB_SCRIPT_NEWA: `Newa`, Since: 1.3.0
+ * @HB_SCRIPT_MASARAM_GONDI: `Gonm`, Since: 1.6.0
+ * @HB_SCRIPT_NUSHU: `Nshu`, Since: 1.6.0
+ * @HB_SCRIPT_SOYOMBO: `Soyo`, Since: 1.6.0
+ * @HB_SCRIPT_ZANABAZAR_SQUARE: `Zanb`, Since: 1.6.0
+ * @HB_SCRIPT_DOGRA: `Dogr`, Since: 1.8.0
+ * @HB_SCRIPT_GUNJALA_GONDI: `Gong`, Since: 1.8.0
+ * @HB_SCRIPT_HANIFI_ROHINGYA: `Rohg`, Since: 1.8.0
+ * @HB_SCRIPT_MAKASAR: `Maka`, Since: 1.8.0
+ * @HB_SCRIPT_MEDEFAIDRIN: `Medf`, Since: 1.8.0
+ * @HB_SCRIPT_OLD_SOGDIAN: `Sogo`, Since: 1.8.0
+ * @HB_SCRIPT_SOGDIAN: `Sogd`, Since: 1.8.0
+ * @HB_SCRIPT_ELYMAIC: `Elym`, Since: 2.4.0
+ * @HB_SCRIPT_NANDINAGARI: `Nand`, Since: 2.4.0
+ * @HB_SCRIPT_NYIAKENG_PUACHUE_HMONG: `Hmnp`, Since: 2.4.0
+ * @HB_SCRIPT_WANCHO: `Wcho`, Since: 2.4.0
+ * @HB_SCRIPT_CHORASMIAN: `Chrs`, Since: 2.6.7
+ * @HB_SCRIPT_DIVES_AKURU: `Diak`, Since: 2.6.7
+ * @HB_SCRIPT_KHITAN_SMALL_SCRIPT: `Kits`, Since: 2.6.7
+ * @HB_SCRIPT_YEZIDI: `Yezi`, Since: 2.6.7
+ * @HB_SCRIPT_CYPRO_MINOAN: `Cpmn`, Since: 3.0.0
+ * @HB_SCRIPT_OLD_UYGHUR: `Ougr`, Since: 3.0.0
+ * @HB_SCRIPT_TANGSA: `Tnsa`, Since: 3.0.0
+ * @HB_SCRIPT_TOTO: `Toto`, Since: 3.0.0
+ * @HB_SCRIPT_VITHKUQI: `Vith`, Since: 3.0.0
+ * @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
+ * to the four-letter values defined by [ISO 15924](https://unicode.org/iso15924/).
+ *
+ * See also the Script (sc) property of the Unicode Character Database.
+ *
+ **/
+
+/* https://docs.google.com/spreadsheets/d/1Y90M0Ie3MUJ6UVCRDOypOtijlMDLNNyyLk36T6iMu0o */
+typedef enum
+{
+  HB_SCRIPT_COMMON                      = HB_TAG ('Z','y','y','y'), /*1.1*/
+  HB_SCRIPT_INHERITED                   = HB_TAG ('Z','i','n','h'), /*1.1*/
+  HB_SCRIPT_UNKNOWN                     = HB_TAG ('Z','z','z','z'), /*5.0*/
+
+  HB_SCRIPT_ARABIC                      = HB_TAG ('A','r','a','b'), /*1.1*/
+  HB_SCRIPT_ARMENIAN                    = HB_TAG ('A','r','m','n'), /*1.1*/
+  HB_SCRIPT_BENGALI                     = HB_TAG ('B','e','n','g'), /*1.1*/
+  HB_SCRIPT_CYRILLIC                    = HB_TAG ('C','y','r','l'), /*1.1*/
+  HB_SCRIPT_DEVANAGARI                  = HB_TAG ('D','e','v','a'), /*1.1*/
+  HB_SCRIPT_GEORGIAN                    = HB_TAG ('G','e','o','r'), /*1.1*/
+  HB_SCRIPT_GREEK                       = HB_TAG ('G','r','e','k'), /*1.1*/
+  HB_SCRIPT_GUJARATI                    = HB_TAG ('G','u','j','r'), /*1.1*/
+  HB_SCRIPT_GURMUKHI                    = HB_TAG ('G','u','r','u'), /*1.1*/
+  HB_SCRIPT_HANGUL                      = HB_TAG ('H','a','n','g'), /*1.1*/
+  HB_SCRIPT_HAN                         = HB_TAG ('H','a','n','i'), /*1.1*/
+  HB_SCRIPT_HEBREW                      = HB_TAG ('H','e','b','r'), /*1.1*/
+  HB_SCRIPT_HIRAGANA                    = HB_TAG ('H','i','r','a'), /*1.1*/
+  HB_SCRIPT_KANNADA                     = HB_TAG ('K','n','d','a'), /*1.1*/
+  HB_SCRIPT_KATAKANA                    = HB_TAG ('K','a','n','a'), /*1.1*/
+  HB_SCRIPT_LAO                         = HB_TAG ('L','a','o','o'), /*1.1*/
+  HB_SCRIPT_LATIN                       = HB_TAG ('L','a','t','n'), /*1.1*/
+  HB_SCRIPT_MALAYALAM                   = HB_TAG ('M','l','y','m'), /*1.1*/
+  HB_SCRIPT_ORIYA                       = HB_TAG ('O','r','y','a'), /*1.1*/
+  HB_SCRIPT_TAMIL                       = HB_TAG ('T','a','m','l'), /*1.1*/
+  HB_SCRIPT_TELUGU                      = HB_TAG ('T','e','l','u'), /*1.1*/
+  HB_SCRIPT_THAI                        = HB_TAG ('T','h','a','i'), /*1.1*/
+
+  HB_SCRIPT_TIBETAN                     = HB_TAG ('T','i','b','t'), /*2.0*/
+
+  HB_SCRIPT_BOPOMOFO                    = HB_TAG ('B','o','p','o'), /*3.0*/
+  HB_SCRIPT_BRAILLE                     = HB_TAG ('B','r','a','i'), /*3.0*/
+  HB_SCRIPT_CANADIAN_SYLLABICS          = HB_TAG ('C','a','n','s'), /*3.0*/
+  HB_SCRIPT_CHEROKEE                    = HB_TAG ('C','h','e','r'), /*3.0*/
+  HB_SCRIPT_ETHIOPIC                    = HB_TAG ('E','t','h','i'), /*3.0*/
+  HB_SCRIPT_KHMER                       = HB_TAG ('K','h','m','r'), /*3.0*/
+  HB_SCRIPT_MONGOLIAN                   = HB_TAG ('M','o','n','g'), /*3.0*/
+  HB_SCRIPT_MYANMAR                     = HB_TAG ('M','y','m','r'), /*3.0*/
+  HB_SCRIPT_OGHAM                       = HB_TAG ('O','g','a','m'), /*3.0*/
+  HB_SCRIPT_RUNIC                       = HB_TAG ('R','u','n','r'), /*3.0*/
+  HB_SCRIPT_SINHALA                     = HB_TAG ('S','i','n','h'), /*3.0*/
+  HB_SCRIPT_SYRIAC                      = HB_TAG ('S','y','r','c'), /*3.0*/
+  HB_SCRIPT_THAANA                      = HB_TAG ('T','h','a','a'), /*3.0*/
+  HB_SCRIPT_YI                          = HB_TAG ('Y','i','i','i'), /*3.0*/
+
+  HB_SCRIPT_DESERET                     = HB_TAG ('D','s','r','t'), /*3.1*/
+  HB_SCRIPT_GOTHIC                      = HB_TAG ('G','o','t','h'), /*3.1*/
+  HB_SCRIPT_OLD_ITALIC                  = HB_TAG ('I','t','a','l'), /*3.1*/
+
+  HB_SCRIPT_BUHID                       = HB_TAG ('B','u','h','d'), /*3.2*/
+  HB_SCRIPT_HANUNOO                     = HB_TAG ('H','a','n','o'), /*3.2*/
+  HB_SCRIPT_TAGALOG                     = HB_TAG ('T','g','l','g'), /*3.2*/
+  HB_SCRIPT_TAGBANWA                    = HB_TAG ('T','a','g','b'), /*3.2*/
+
+  HB_SCRIPT_CYPRIOT                     = HB_TAG ('C','p','r','t'), /*4.0*/
+  HB_SCRIPT_LIMBU                       = HB_TAG ('L','i','m','b'), /*4.0*/
+  HB_SCRIPT_LINEAR_B                    = HB_TAG ('L','i','n','b'), /*4.0*/
+  HB_SCRIPT_OSMANYA                     = HB_TAG ('O','s','m','a'), /*4.0*/
+  HB_SCRIPT_SHAVIAN                     = HB_TAG ('S','h','a','w'), /*4.0*/
+  HB_SCRIPT_TAI_LE                      = HB_TAG ('T','a','l','e'), /*4.0*/
+  HB_SCRIPT_UGARITIC                    = HB_TAG ('U','g','a','r'), /*4.0*/
+
+  HB_SCRIPT_BUGINESE                    = HB_TAG ('B','u','g','i'), /*4.1*/
+  HB_SCRIPT_COPTIC                      = HB_TAG ('C','o','p','t'), /*4.1*/
+  HB_SCRIPT_GLAGOLITIC                  = HB_TAG ('G','l','a','g'), /*4.1*/
+  HB_SCRIPT_KHAROSHTHI                  = HB_TAG ('K','h','a','r'), /*4.1*/
+  HB_SCRIPT_NEW_TAI_LUE                 = HB_TAG ('T','a','l','u'), /*4.1*/
+  HB_SCRIPT_OLD_PERSIAN                 = HB_TAG ('X','p','e','o'), /*4.1*/
+  HB_SCRIPT_SYLOTI_NAGRI                = HB_TAG ('S','y','l','o'), /*4.1*/
+  HB_SCRIPT_TIFINAGH                    = HB_TAG ('T','f','n','g'), /*4.1*/
+
+  HB_SCRIPT_BALINESE                    = HB_TAG ('B','a','l','i'), /*5.0*/
+  HB_SCRIPT_CUNEIFORM                   = HB_TAG ('X','s','u','x'), /*5.0*/
+  HB_SCRIPT_NKO                         = HB_TAG ('N','k','o','o'), /*5.0*/
+  HB_SCRIPT_PHAGS_PA                    = HB_TAG ('P','h','a','g'), /*5.0*/
+  HB_SCRIPT_PHOENICIAN                  = HB_TAG ('P','h','n','x'), /*5.0*/
+
+  HB_SCRIPT_CARIAN                      = HB_TAG ('C','a','r','i'), /*5.1*/
+  HB_SCRIPT_CHAM                        = HB_TAG ('C','h','a','m'), /*5.1*/
+  HB_SCRIPT_KAYAH_LI                    = HB_TAG ('K','a','l','i'), /*5.1*/
+  HB_SCRIPT_LEPCHA                      = HB_TAG ('L','e','p','c'), /*5.1*/
+  HB_SCRIPT_LYCIAN                      = HB_TAG ('L','y','c','i'), /*5.1*/
+  HB_SCRIPT_LYDIAN                      = HB_TAG ('L','y','d','i'), /*5.1*/
+  HB_SCRIPT_OL_CHIKI                    = HB_TAG ('O','l','c','k'), /*5.1*/
+  HB_SCRIPT_REJANG                      = HB_TAG ('R','j','n','g'), /*5.1*/
+  HB_SCRIPT_SAURASHTRA                  = HB_TAG ('S','a','u','r'), /*5.1*/
+  HB_SCRIPT_SUNDANESE                   = HB_TAG ('S','u','n','d'), /*5.1*/
+  HB_SCRIPT_VAI                         = HB_TAG ('V','a','i','i'), /*5.1*/
+
+  HB_SCRIPT_AVESTAN                     = HB_TAG ('A','v','s','t'), /*5.2*/
+  HB_SCRIPT_BAMUM                       = HB_TAG ('B','a','m','u'), /*5.2*/
+  HB_SCRIPT_EGYPTIAN_HIEROGLYPHS        = HB_TAG ('E','g','y','p'), /*5.2*/
+  HB_SCRIPT_IMPERIAL_ARAMAIC            = HB_TAG ('A','r','m','i'), /*5.2*/
+  HB_SCRIPT_INSCRIPTIONAL_PAHLAVI       = HB_TAG ('P','h','l','i'), /*5.2*/
+  HB_SCRIPT_INSCRIPTIONAL_PARTHIAN      = HB_TAG ('P','r','t','i'), /*5.2*/
+  HB_SCRIPT_JAVANESE                    = HB_TAG ('J','a','v','a'), /*5.2*/
+  HB_SCRIPT_KAITHI                      = HB_TAG ('K','t','h','i'), /*5.2*/
+  HB_SCRIPT_LISU                        = HB_TAG ('L','i','s','u'), /*5.2*/
+  HB_SCRIPT_MEETEI_MAYEK                = HB_TAG ('M','t','e','i'), /*5.2*/
+  HB_SCRIPT_OLD_SOUTH_ARABIAN           = HB_TAG ('S','a','r','b'), /*5.2*/
+  HB_SCRIPT_OLD_TURKIC                  = HB_TAG ('O','r','k','h'), /*5.2*/
+  HB_SCRIPT_SAMARITAN                   = HB_TAG ('S','a','m','r'), /*5.2*/
+  HB_SCRIPT_TAI_THAM                    = HB_TAG ('L','a','n','a'), /*5.2*/
+  HB_SCRIPT_TAI_VIET                    = HB_TAG ('T','a','v','t'), /*5.2*/
+
+  HB_SCRIPT_BATAK                       = HB_TAG ('B','a','t','k'), /*6.0*/
+  HB_SCRIPT_BRAHMI                      = HB_TAG ('B','r','a','h'), /*6.0*/
+  HB_SCRIPT_MANDAIC                     = HB_TAG ('M','a','n','d'), /*6.0*/
+
+  HB_SCRIPT_CHAKMA                      = HB_TAG ('C','a','k','m'), /*6.1*/
+  HB_SCRIPT_MEROITIC_CURSIVE            = HB_TAG ('M','e','r','c'), /*6.1*/
+  HB_SCRIPT_MEROITIC_HIEROGLYPHS        = HB_TAG ('M','e','r','o'), /*6.1*/
+  HB_SCRIPT_MIAO                        = HB_TAG ('P','l','r','d'), /*6.1*/
+  HB_SCRIPT_SHARADA                     = HB_TAG ('S','h','r','d'), /*6.1*/
+  HB_SCRIPT_SORA_SOMPENG                = HB_TAG ('S','o','r','a'), /*6.1*/
+  HB_SCRIPT_TAKRI                       = HB_TAG ('T','a','k','r'), /*6.1*/
+
+  /*
+   * Since: 0.9.30
+   */
+  HB_SCRIPT_BASSA_VAH                   = HB_TAG ('B','a','s','s'), /*7.0*/
+  HB_SCRIPT_CAUCASIAN_ALBANIAN          = HB_TAG ('A','g','h','b'), /*7.0*/
+  HB_SCRIPT_DUPLOYAN                    = HB_TAG ('D','u','p','l'), /*7.0*/
+  HB_SCRIPT_ELBASAN                     = HB_TAG ('E','l','b','a'), /*7.0*/
+  HB_SCRIPT_GRANTHA                     = HB_TAG ('G','r','a','n'), /*7.0*/
+  HB_SCRIPT_KHOJKI                      = HB_TAG ('K','h','o','j'), /*7.0*/
+  HB_SCRIPT_KHUDAWADI                   = HB_TAG ('S','i','n','d'), /*7.0*/
+  HB_SCRIPT_LINEAR_A                    = HB_TAG ('L','i','n','a'), /*7.0*/
+  HB_SCRIPT_MAHAJANI                    = HB_TAG ('M','a','h','j'), /*7.0*/
+  HB_SCRIPT_MANICHAEAN                  = HB_TAG ('M','a','n','i'), /*7.0*/
+  HB_SCRIPT_MENDE_KIKAKUI               = HB_TAG ('M','e','n','d'), /*7.0*/
+  HB_SCRIPT_MODI                        = HB_TAG ('M','o','d','i'), /*7.0*/
+  HB_SCRIPT_MRO                         = HB_TAG ('M','r','o','o'), /*7.0*/
+  HB_SCRIPT_NABATAEAN                   = HB_TAG ('N','b','a','t'), /*7.0*/
+  HB_SCRIPT_OLD_NORTH_ARABIAN           = HB_TAG ('N','a','r','b'), /*7.0*/
+  HB_SCRIPT_OLD_PERMIC                  = HB_TAG ('P','e','r','m'), /*7.0*/
+  HB_SCRIPT_PAHAWH_HMONG                = HB_TAG ('H','m','n','g'), /*7.0*/
+  HB_SCRIPT_PALMYRENE                   = HB_TAG ('P','a','l','m'), /*7.0*/
+  HB_SCRIPT_PAU_CIN_HAU                 = HB_TAG ('P','a','u','c'), /*7.0*/
+  HB_SCRIPT_PSALTER_PAHLAVI             = HB_TAG ('P','h','l','p'), /*7.0*/
+  HB_SCRIPT_SIDDHAM                     = HB_TAG ('S','i','d','d'), /*7.0*/
+  HB_SCRIPT_TIRHUTA                     = HB_TAG ('T','i','r','h'), /*7.0*/
+  HB_SCRIPT_WARANG_CITI                 = HB_TAG ('W','a','r','a'), /*7.0*/
+
+  HB_SCRIPT_AHOM                        = HB_TAG ('A','h','o','m'), /*8.0*/
+  HB_SCRIPT_ANATOLIAN_HIEROGLYPHS       = HB_TAG ('H','l','u','w'), /*8.0*/
+  HB_SCRIPT_HATRAN                      = HB_TAG ('H','a','t','r'), /*8.0*/
+  HB_SCRIPT_MULTANI                     = HB_TAG ('M','u','l','t'), /*8.0*/
+  HB_SCRIPT_OLD_HUNGARIAN               = HB_TAG ('H','u','n','g'), /*8.0*/
+  HB_SCRIPT_SIGNWRITING                 = HB_TAG ('S','g','n','w'), /*8.0*/
+
+  /*
+   * Since 1.3.0
+   */
+  HB_SCRIPT_ADLAM                       = HB_TAG ('A','d','l','m'), /*9.0*/
+  HB_SCRIPT_BHAIKSUKI                   = HB_TAG ('B','h','k','s'), /*9.0*/
+  HB_SCRIPT_MARCHEN                     = HB_TAG ('M','a','r','c'), /*9.0*/
+  HB_SCRIPT_OSAGE                       = HB_TAG ('O','s','g','e'), /*9.0*/
+  HB_SCRIPT_TANGUT                      = HB_TAG ('T','a','n','g'), /*9.0*/
+  HB_SCRIPT_NEWA                        = HB_TAG ('N','e','w','a'), /*9.0*/
+
+  /*
+   * Since 1.6.0
+   */
+  HB_SCRIPT_MASARAM_GONDI               = HB_TAG ('G','o','n','m'), /*10.0*/
+  HB_SCRIPT_NUSHU                       = HB_TAG ('N','s','h','u'), /*10.0*/
+  HB_SCRIPT_SOYOMBO                     = HB_TAG ('S','o','y','o'), /*10.0*/
+  HB_SCRIPT_ZANABAZAR_SQUARE            = HB_TAG ('Z','a','n','b'), /*10.0*/
+
+  /*
+   * Since 1.8.0
+   */
+  HB_SCRIPT_DOGRA                       = HB_TAG ('D','o','g','r'), /*11.0*/
+  HB_SCRIPT_GUNJALA_GONDI               = HB_TAG ('G','o','n','g'), /*11.0*/
+  HB_SCRIPT_HANIFI_ROHINGYA             = HB_TAG ('R','o','h','g'), /*11.0*/
+  HB_SCRIPT_MAKASAR                     = HB_TAG ('M','a','k','a'), /*11.0*/
+  HB_SCRIPT_MEDEFAIDRIN                 = HB_TAG ('M','e','d','f'), /*11.0*/
+  HB_SCRIPT_OLD_SOGDIAN                 = HB_TAG ('S','o','g','o'), /*11.0*/
+  HB_SCRIPT_SOGDIAN                     = HB_TAG ('S','o','g','d'), /*11.0*/
+
+  /*
+   * Since 2.4.0
+   */
+  HB_SCRIPT_ELYMAIC                     = HB_TAG ('E','l','y','m'), /*12.0*/
+  HB_SCRIPT_NANDINAGARI                 = HB_TAG ('N','a','n','d'), /*12.0*/
+  HB_SCRIPT_NYIAKENG_PUACHUE_HMONG      = HB_TAG ('H','m','n','p'), /*12.0*/
+  HB_SCRIPT_WANCHO                      = HB_TAG ('W','c','h','o'), /*12.0*/
+
+  /*
+   * Since 2.6.7
+   */
+  HB_SCRIPT_CHORASMIAN                  = HB_TAG ('C','h','r','s'), /*13.0*/
+  HB_SCRIPT_DIVES_AKURU                 = HB_TAG ('D','i','a','k'), /*13.0*/
+  HB_SCRIPT_KHITAN_SMALL_SCRIPT         = HB_TAG ('K','i','t','s'), /*13.0*/
+  HB_SCRIPT_YEZIDI                      = HB_TAG ('Y','e','z','i'), /*13.0*/
+
+  /*
+   * Since 3.0.0
+   */
+  HB_SCRIPT_CYPRO_MINOAN                = HB_TAG ('C','p','m','n'), /*14.0*/
+  HB_SCRIPT_OLD_UYGHUR                  = HB_TAG ('O','u','g','r'), /*14.0*/
+  HB_SCRIPT_TANGSA                      = HB_TAG ('T','n','s','a'), /*14.0*/
+  HB_SCRIPT_TOTO                        = HB_TAG ('T','o','t','o'), /*14.0*/
+  HB_SCRIPT_VITHKUQI                    = HB_TAG ('V','i','t','h'), /*14.0*/
+
+  /*
+   * Since 3.4.0
+   */
+  HB_SCRIPT_MATH                        = HB_TAG ('Z','m','t','h'),
+
+  /*
+   * Since 5.2.0
+   */
+  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,
+
+  /*< private >*/
+
+  /* Dummy values to ensure any hb_tag_t value can be passed/stored as hb_script_t
+   * without risking undefined behavior.  We have two, for historical reasons.
+   * HB_TAG_MAX used to be unsigned, but that was invalid Ansi C, so was changed
+   * to _HB_SCRIPT_MAX_VALUE to be equal to HB_TAG_MAX_SIGNED as well.
+   *
+   * See this thread for technicalities:
+   *
+   *   https://lists.freedesktop.org/archives/harfbuzz/2014-March/004150.html
+   */
+  _HB_SCRIPT_MAX_VALUE                          = HB_TAG_MAX_SIGNED, /*< skip >*/
+  _HB_SCRIPT_MAX_VALUE_SIGNED                   = HB_TAG_MAX_SIGNED /*< skip >*/
+
+} hb_script_t;
+
+
+#endif /* HB_SCRIPT_LIST_H */
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 7bd14a28193..f0416d5fa1d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
@@ -31,11 +31,10 @@
 #include "hb-machinery.hh"
 
 /*
- * The set-digests here implement various "filters" that support
- * "approximate member query".  Conceptually these are like Bloom
- * Filter and Quotient Filter, however, much smaller, faster, and
- * designed to fit the requirements of our uses for glyph coverage
- * queries.
+ * The set-digests implement "filters" that support "approximate
+ * member query".  Conceptually these are like Bloom Filter and
+ * Quotient Filter, however, much smaller, faster, and designed
+ * to fit the requirements of our uses for glyph coverage queries.
  *
  * Our filters are highly accurate if the lookup covers fairly local
  * set of glyphs, but fully flooded and ineffective if coverage is
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-set.hh
index eaa892ab9f5..c5df9b8aec4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-set.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-set.hh
@@ -30,6 +30,7 @@
 
 #include "hb.hh"
 #include "hb-bit-set-invertible.hh"
+#include "hb-bit-vector.hh" // Just to include
 
 
 template <typename impl_t>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
index 2f7d335ddce..d14f577be00 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
@@ -91,8 +91,10 @@ void free_static_shaper_list ()
  *
  * Retrieves the list of shapers supported by HarfBuzz.
  *
- * Return value: (transfer none) (array zero-terminated=1): an array of
- *    constant strings
+ * Return value: (transfer none) (array zero-terminated=1): a
+ *    `NULL`-terminated array of supported shapers constant string.
+ *    The returned array is owned by HarfBuzz and should not be
+ *    modified or freed.
  *
  * Since: 0.9.2
  **/
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-static.cc b/src/java.desktop/share/native/libharfbuzz/hb-static.cc
index abdfda9a756..4e70e413651 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-static.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-static.cc
@@ -41,6 +41,7 @@
 #include "hb-ot-maxp-table.hh"
 
 #ifndef HB_NO_VISIBILITY
+
 #include "hb-ot-name-language-static.hh"
 
 uint64_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
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 62206e0f5aa..e7bddaef723 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
@@ -570,7 +570,7 @@ struct cff_subset_accelerator_t
   parsed_cs_str_vec_t parsed_charstrings;
   parsed_cs_str_vec_t parsed_global_subrs;
   hb_vector_t<parsed_cs_str_vec_t> parsed_local_subrs;
-  mutable hb_atomic_ptr_t<glyph_to_sid_map_t> glyph_to_sid_map;
+  mutable hb_atomic_t<glyph_to_sid_map_t *> glyph_to_sid_map;
 
  private:
   hb_blob_t* original_blob;
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 bbe50b1fb36..5de29081cc1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc
@@ -868,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 ascii characters only for mac platform\n");
+          // Non-ascii character detected, ignored...
           return false;
         }
       }
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 fb5282916b9..3ba726d925e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
@@ -29,27 +29,21 @@
 #include "hb-map.hh"
 #include "hb-multimap.hh"
 #include "hb-set.hh"
+#include "hb-subset.h"
+#include "hb-unicode.h"
 
 #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"
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "OT/Color/COLR/COLR.hh"
 #include "OT/Color/COLR/colrv1-closure.hh"
 #include "OT/Color/CPAL/CPAL.hh"
 #include "hb-ot-var-fvar-table.hh"
-#include "hb-ot-var-avar-table.hh"
 #include "hb-ot-stat-table.hh"
 #include "hb-ot-math-table.hh"
 
-using OT::Layout::GSUB;
-using OT::Layout::GPOS;
-
-
 hb_subset_accelerator_t::~hb_subset_accelerator_t ()
 {
   if (cmap_cache && destroy_cmap_cache)
@@ -63,7 +57,6 @@ hb_subset_accelerator_t::~hb_subset_accelerator_t ()
 }
 
 
-typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map;
 #ifndef HB_NO_SUBSET_CFF
 static inline bool
 _add_cff_seac_components (const OT::cff1::accelerator_subset_t &cff,
@@ -98,414 +91,14 @@ _remap_palette_indexes (const hb_set_t *palette_indexes,
   }
 }
 
-static void
-_remap_indexes (const hb_set_t *indexes,
-                hb_map_t       *mapping /* OUT */)
+void
+remap_indexes (const hb_set_t *indexes,
+               hb_map_t       *mapping /* OUT */)
 {
   for (auto _ : + hb_enumerate (indexes->iter ()))
     mapping->set (_.second, _.first);
-
-}
-
-#ifndef HB_NO_SUBSET_LAYOUT
-
-/*
- * Removes all tags from 'tags' that are not in filter. Additionally eliminates any duplicates.
- * Returns true if anything was removed (not including duplicates).
- */
-static bool _filter_tag_list(hb_vector_t<hb_tag_t>* tags, /* IN/OUT */
-                             const hb_set_t* filter)
-{
-  hb_vector_t<hb_tag_t> out;
-  out.alloc (tags->get_size() + 1); // +1 is to allocate room for the null terminator.
-
-  bool removed = false;
-  hb_set_t visited;
-
-  for (hb_tag_t tag : *tags)
-  {
-    if (!tag) continue;
-    if (visited.has (tag)) continue;
-
-    if (!filter->has (tag))
-    {
-      removed = true;
-      continue;
-    }
-
-    visited.add (tag);
-    out.push (tag);
-  }
-
-  // The collect function needs a null element to signal end of the array.
-  out.push (HB_TAG_NONE);
-
-  hb_swap (out, *tags);
-  return removed;
-}
-
-template <typename T>
-static void _collect_layout_indices (hb_subset_plan_t     *plan,
-                                     const T&              table,
-                                     hb_set_t             *lookup_indices, /* OUT */
-                                     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 */
-                                     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;
-  if (!plan->check_success (features.resize (num_features))) return;
-  table.get_feature_tags (0, &num_features, features.arrayZ);
-  bool retain_all_features = !_filter_tag_list (&features, &plan->layout_features);
-
-  unsigned num_scripts = table.get_script_count ();
-  hb_vector_t<hb_tag_t> scripts;
-  if (!plan->check_success (scripts.resize (num_scripts))) return;
-  table.get_script_tags (0, &num_scripts, scripts.arrayZ);
-  bool retain_all_scripts = !_filter_tag_list (&scripts, &plan->layout_scripts);
-
-  if (!plan->check_success (!features.in_error ()) || !features
-      || !plan->check_success (!scripts.in_error ()) || !scripts)
-    return;
-
-  hb_ot_layout_collect_features (plan->source,
-                                 T::tableTag,
-                                 retain_all_scripts ? nullptr : scripts.arrayZ,
-                                 nullptr,
-                                 retain_all_features ? nullptr : features.arrayZ,
-                                 feature_indices);
-
-#ifndef HB_NO_VAR
-  // collect feature substitutes with variations
-  if (!plan->user_axes_location.is_empty ())
-  {
-    hb_hashmap_t<hb::shared_ptr<hb_map_t>, unsigned> conditionset_map;
-    OT::hb_collect_feature_substitutes_with_var_context_t c =
-    {
-      &plan->axes_old_index_tag_map,
-      &plan->axes_location,
-      feature_record_cond_idx_map,
-      feature_substitutes_map,
-      catch_all_record_feature_idxes,
-      feature_indices,
-      false,
-      false,
-      false,
-      0,
-      &conditionset_map
-    };
-    table.collect_feature_substitutes_with_variations (&c);
-  }
-#endif
-
-  for (unsigned feature_index : *feature_indices)
-  {
-    const OT::Feature* f = &(table.get_feature (feature_index));
-    const OT::Feature **p = nullptr;
-    if (feature_substitutes_map->has (feature_index, &p))
-      f = *p;
-
-    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)
-    table.feature_variation_collect_lookups (feature_indices,
-                                             plan->user_axes_location.is_empty () ? nullptr: feature_record_cond_idx_map,
-                                             lookup_indices);
-#endif
-}
-
-
-static inline void
-_GSUBGPOS_find_duplicate_features (const OT::GSUBGPOS &g,
-                                   const hb_map_t *lookup_indices,
-                                   const hb_set_t *feature_indices,
-                                   const hb_hashmap_t<unsigned, const OT::Feature*> *feature_substitutes_map,
-                                   hb_map_t *duplicate_feature_map /* OUT */)
-{
-  if (feature_indices->is_empty ()) return;
-  hb_hashmap_t<hb_tag_t, hb::unique_ptr<hb_set_t>> unique_features;
-  //find out duplicate features after subset
-  for (unsigned i : feature_indices->iter ())
-  {
-    hb_tag_t t = g.get_feature_tag (i);
-    if (t == HB_MAP_VALUE_INVALID) continue;
-    if (!unique_features.has (t))
-    {
-      if (unlikely (!unique_features.set (t, hb::unique_ptr<hb_set_t> {hb_set_create ()})))
-        return;
-      if (unique_features.has (t))
-        unique_features.get (t)->add (i);
-      duplicate_feature_map->set (i, i);
-      continue;
-    }
-
-    bool found = false;
-
-    hb_set_t* same_tag_features = unique_features.get (t);
-    for (unsigned other_f_index : same_tag_features->iter ())
-    {
-      const OT::Feature* f = &(g.get_feature (i));
-      const OT::Feature **p = nullptr;
-      if (feature_substitutes_map->has (i, &p))
-        f = *p;
-
-      const OT::Feature* other_f = &(g.get_feature (other_f_index));
-      if (feature_substitutes_map->has (other_f_index, &p))
-        other_f = *p;
-
-      auto f_iter =
-      + hb_iter (f->lookupIndex)
-      | hb_filter (lookup_indices)
-      ;
-
-      auto other_f_iter =
-      + hb_iter (other_f->lookupIndex)
-      | hb_filter (lookup_indices)
-      ;
-
-      bool is_equal = true;
-      for (; f_iter && other_f_iter; f_iter++, other_f_iter++)
-      {
-        unsigned a = *f_iter;
-        unsigned b = *other_f_iter;
-        if (a != b) { is_equal = false; break; }
-      }
-
-      if (is_equal == false || f_iter || other_f_iter) continue;
-
-      found = true;
-      duplicate_feature_map->set (i, other_f_index);
-      break;
-    }
-
-    if (found == false)
-    {
-      same_tag_features->add (i);
-      duplicate_feature_map->set (i, i);
-    }
-  }
-}
-
-template <typename T>
-static inline void
-_closure_glyphs_lookups_features (hb_subset_plan_t   *plan,
-                                  hb_set_t           *gids_to_retain,
-                                  hb_map_t           *lookups,
-                                  hb_map_t           *features,
-                                  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,
-                                  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;
-  hb_set_t lookup_indices, feature_indices;
-  _collect_layout_indices<T> (plan,
-                              *table,
-                              &lookup_indices,
-                              &feature_indices,
-                              feature_record_cond_idx_map,
-                              feature_substitutes_map,
-                              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,
-                                             &lookup_indices,
-                                             gids_to_retain);
-  table->closure_lookups (plan->source,
-                          gids_to_retain,
-                          &lookup_indices);
-  _remap_indexes (&lookup_indices, lookups);
-
-  // prune features
-  table->prune_features (lookups,
-                         plan->user_axes_location.is_empty () ? nullptr : feature_record_cond_idx_map,
-                         feature_substitutes_map,
-                         &feature_indices);
-  hb_map_t duplicate_feature_map;
-  _GSUBGPOS_find_duplicate_features (*table, lookups, &feature_indices, feature_substitutes_map, &duplicate_feature_map);
-
-  feature_indices.clear ();
-  table->prune_langsys (&duplicate_feature_map, &plan->layout_scripts, langsys_map, &feature_indices);
-  _remap_indexes (&feature_indices, features);
-
-  table.destroy ();
-}
-
-#endif
-
-#ifndef HB_NO_VAR
-static inline void
-_generate_varstore_inner_maps (const hb_set_t& varidx_set,
-                               unsigned subtable_count,
-                               hb_vector_t<hb_inc_bimap_t> &inner_maps /* OUT */)
-{
-  if (varidx_set.is_empty () || subtable_count == 0) return;
-
-  if (unlikely (!inner_maps.resize (subtable_count))) return;
-  for (unsigned idx : varidx_set)
-  {
-    uint16_t major = idx >> 16;
-    uint16_t minor = idx & 0xFFFF;
-
-    if (major >= subtable_count)
-      continue;
-    inner_maps[major].add (minor);
-  }
-}
-
-static inline hb_font_t*
-_get_hb_font_with_variations (const hb_subset_plan_t *plan)
-{
-  hb_font_t *font = hb_font_create (plan->source);
-
-  hb_vector_t<hb_variation_t> vars;
-  if (!vars.alloc (plan->user_axes_location.get_population ())) {
-    hb_font_destroy (font);
-    return nullptr;
-  }
-
-  for (auto _ : plan->user_axes_location)
-  {
-    hb_variation_t var;
-    var.tag = _.first;
-    var.value = _.second.middle;
-    vars.push (var);
-  }
-
-#ifndef HB_NO_VAR
-  hb_font_set_variations (font, vars.arrayZ, plan->user_axes_location.get_population ());
-#endif
-  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 () || !gdef->has_var_store ())
-  {
-    gdef.destroy ();
-    gpos.destroy ();
-    return;
-  }
-
-  hb_set_t varidx_set;
-  OT::hb_collect_variation_indices_context_t c (&varidx_set,
-                                                &plan->_glyphset_gsub,
-                                                &plan->gpos_lookups);
-  gdef->collect_variation_indices (&c);
-
-  if (hb_ot_layout_has_positioning (plan->source))
-    gpos->collect_variation_indices (&c);
-
-  _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->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
 _cmap_closure (hb_face_t           *face,
                const hb_set_t      *unicodes,
@@ -515,41 +108,6 @@ _cmap_closure (hb_face_t           *face,
   cmap.table->closure_glyphs (unicodes, glyphset);
 }
 
-#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)
 {
@@ -569,7 +127,7 @@ static void _colr_closure (hb_subset_plan_t* plan,
   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, &plan->colrv1_layers);
+  remap_indexes (&layer_indices, &plan->colrv1_layers);
   _remap_palette_indexes (&palette_indices, &plan->colr_palettes);
 
 #ifndef HB_NO_VAR
@@ -578,7 +136,7 @@ static void _colr_closure (hb_subset_plan_t* plan,
   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);
+  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
@@ -590,7 +148,7 @@ static void _colr_closure (hb_subset_plan_t* plan,
    * instancing. */
   if (!plan->all_axes_pinned)
   {
-    _remap_variation_indices (var_store,
+    remap_variation_indices (var_store,
                               variation_indices,
                               plan->normalized_coords,
                               false, /* no need to calculate delta for COLR during planning */
@@ -598,7 +156,7 @@ static void _colr_closure (hb_subset_plan_t* plan,
                               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 (),
+      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);
@@ -616,25 +174,6 @@ _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,
                       unsigned int num_glyphs)
@@ -672,15 +211,46 @@ _fill_unicode_and_glyph_map(hb_subset_plan_t *plan,
   _fill_unicode_and_glyph_map(plan, unicode_iterator, unicode_to_gid_for_iterator, unicode_to_gid_for_iterator);
 }
 
+/*
+ * Finds additional unicode codepoints which are reachable from the input unicode set.
+ * Currently this adds in mirrored variants (needed for bidi) of any input unicodes.
+ */
+static hb_set_t
+_unicode_closure (const hb_set_t* unicodes, bool bidi_closure) {
+  // TODO: we may want to also consider pulling in reachable unicode composition and decompositions.
+  //       see: https://github.com/harfbuzz/harfbuzz/issues/2283
+  hb_set_t out = *unicodes;
+  if (!bidi_closure) return out;
+
+  if (out.is_inverted()) {
+    // don't closure inverted sets, they are asking to specifically exclude certain codepoints.
+    // otherwise everything is already included.
+    return out;
+  }
+
+  auto unicode_funcs = hb_unicode_funcs_get_default ();
+  for (hb_codepoint_t cp : *unicodes) {
+   hb_codepoint_t mirror = hb_unicode_mirroring(unicode_funcs, cp);
+   if (unlikely (mirror != cp)) {
+     out.add(mirror);
+   }
+  }
+
+  return out;
+}
+
 static void
-_populate_unicodes_to_retain (const hb_set_t *unicodes,
+_populate_unicodes_to_retain (const hb_set_t *unicodes_in,
                               const hb_set_t *glyphs,
                               hb_subset_plan_t *plan)
 {
+  hb_set_t unicodes = _unicode_closure(unicodes_in,
+    !(plan->flags & HB_SUBSET_FLAGS_NO_BIDI_CLOSURE));
+
   OT::cmap::accelerator_t cmap (plan->source);
   unsigned size_threshold = plan->source->get_num_glyphs ();
 
-  if (glyphs->is_empty () && unicodes->get_population () < size_threshold)
+  if (glyphs->is_empty () && unicodes.get_population () < size_threshold)
   {
 
     const hb_map_t* unicode_to_gid = nullptr;
@@ -690,9 +260,9 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     // This is approach to collection is faster, but can only be used  if glyphs
     // are not being explicitly added to the subset and the input unicodes set is
     // not excessively large (eg. an inverted set).
-    plan->unicode_to_new_gid_list.alloc (unicodes->get_population ());
+    plan->unicode_to_new_gid_list.alloc (unicodes.get_population ());
     if (!unicode_to_gid) {
-      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
+      _fill_unicode_and_glyph_map(plan, unicodes.iter(), [&] (hb_codepoint_t cp) {
         hb_codepoint_t gid;
         if (!cmap.get_nominal_glyph (cp, &gid)) {
           return HB_MAP_VALUE_INVALID;
@@ -704,7 +274,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
       // the map. This code is mostly duplicated from above to avoid doing
       // conditionals on the presence of the unicode_to_gid map each
       // iteration.
-      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
+      _fill_unicode_and_glyph_map(plan, unicodes.iter(), [&] (hb_codepoint_t cp) {
         return unicode_to_gid->get (cp);
       });
     }
@@ -721,7 +291,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
 
     if (!plan->accelerator) {
       cmap.collect_mapping (&cmap_unicodes_storage, &unicode_glyphid_map_storage);
-      plan->unicode_to_new_gid_list.alloc (hb_min(unicodes->get_population ()
+      plan->unicode_to_new_gid_list.alloc (hb_min(unicodes.get_population ()
                                                   + glyphs->get_population (),
                                                   cmap_unicodes->get_population ()));
     } else {
@@ -730,10 +300,10 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     }
 
     if (plan->accelerator &&
-        unicodes->get_population () < cmap_unicodes->get_population () &&
+        unicodes.get_population () < cmap_unicodes->get_population () &&
         glyphs->get_population () < cmap_unicodes->get_population ())
     {
-      plan->codepoint_to_glyph->alloc (unicodes->get_population () + glyphs->get_population ());
+      plan->codepoint_to_glyph->alloc (unicodes.get_population () + glyphs->get_population ());
 
       auto &gid_to_unicodes = plan->accelerator->gid_to_unicodes;
 
@@ -748,7 +318,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
         });
       }
 
-      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
+      _fill_unicode_and_glyph_map(plan, unicodes.iter(), [&] (hb_codepoint_t cp) {
           /* Don't double-add entry. */
         if (plan->codepoint_to_glyph->has (cp))
           return HB_MAP_VALUE_INVALID;
@@ -769,7 +339,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
       {
         _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))
+          if (!unicodes.has (cp) && !glyphs->has (gid))
             return HB_MAP_VALUE_INVALID;
           return gid;
         },
@@ -860,18 +430,7 @@ _nameid_closure (hb_subset_plan_t* plan,
 #endif
 
 #ifndef HB_NO_SUBSET_LAYOUT
-  if (!drop_tables->has (HB_OT_TAG_GPOS))
-  {
-    hb_blob_ptr_t<GPOS> gpos = plan->source_table<GPOS> ();
-    gpos->collect_name_ids (&plan->gpos_features, &plan->name_ids);
-    gpos.destroy ();
-  }
-  if (!drop_tables->has (HB_OT_TAG_GSUB))
-  {
-    hb_blob_ptr_t<GSUB> gsub = plan->source_table<GSUB> ();
-    gsub->collect_name_ids (&plan->gsub_features, &plan->name_ids);
-    gsub.destroy ();
-  }
+  layout_nameid_closure(plan, drop_tables);
 #endif
 }
 
@@ -893,31 +452,9 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
   _cmap_closure (plan->source, &plan->unicodes, &plan->_glyphset_gsub);
 
 #ifndef HB_NO_SUBSET_LAYOUT
-  if (!drop_tables->has (HB_OT_TAG_GSUB))
-    // closure all glyphs/lookups/features needed for GSUB substitutions.
-    _closure_glyphs_lookups_features<GSUB> (
-        plan,
-        &plan->_glyphset_gsub,
-        &plan->gsub_lookups,
-        &plan->gsub_features,
-        &plan->gsub_langsys,
-        &plan->gsub_feature_record_cond_idx_map,
-        &plan->gsub_feature_substitutes_map,
-        plan->gsub_old_features,
-        plan->gsub_old_feature_idx_tag_map);
-
-  if (!drop_tables->has (HB_OT_TAG_GPOS))
-    _closure_glyphs_lookups_features<GPOS> (
-        plan,
-        &plan->_glyphset_gsub,
-        &plan->gpos_lookups,
-        &plan->gpos_features,
-        &plan->gpos_langsys,
-        &plan->gpos_feature_record_cond_idx_map,
-        &plan->gpos_feature_substitutes_map,
-        plan->gpos_old_features,
-        plan->gpos_old_feature_idx_tag_map);
+  layout_populate_gids_to_retain(plan, drop_tables);
 #endif
+
   _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ());
 
   plan->_glyphset_mathed = plan->_glyphset_gsub;
@@ -962,8 +499,10 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
   _remove_invalid_gids (&plan->_glyphset, plan->source->get_num_glyphs ());
 
 #ifndef HB_NO_VAR
+#ifndef HB_NO_SUBSET_LAYOUT
   if (!drop_tables->has (HB_OT_TAG_GDEF))
-    _collect_layout_variation_indices (plan);
+    collect_layout_variation_indices (plan);
+#endif
 #endif
 }
 
@@ -1077,193 +616,6 @@ _create_old_gid_to_new_gid_map (const hb_face_t *face,
   return true;
 }
 
-#ifndef HB_NO_VAR
-static void
-_normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
-{
-  if (plan->user_axes_location.is_empty ())
-    return;
-
-  hb_array_t<const OT::AxisRecord> axes = face->table.fvar->get_axes ();
-  plan->normalized_coords.resize (axes.length);
-
-  bool has_avar = face->table.avar->has_data ();
-  const OT::SegmentMaps *seg_maps = nullptr;
-  unsigned avar_axis_count = 0;
-  if (has_avar)
-  {
-    seg_maps = face->table.avar->get_segment_maps ();
-    avar_axis_count = face->table.avar->get_axis_count();
-  }
-
-  bool axis_not_pinned = false;
-  unsigned old_axis_idx = 0, new_axis_idx = 0;
-  for (const auto& axis : axes)
-  {
-    hb_tag_t axis_tag = axis.get_axis_tag ();
-    plan->axes_old_index_tag_map.set (old_axis_idx, axis_tag);
-
-    if (!plan->user_axes_location.has (axis_tag) ||
-        !plan->user_axes_location.get (axis_tag).is_point ())
-    {
-      axis_not_pinned = true;
-      plan->axes_index_map.set (old_axis_idx, new_axis_idx);
-      plan->axis_tags.push (axis_tag);
-      new_axis_idx++;
-    }
-
-    Triple *axis_range;
-    if (plan->user_axes_location.has (axis_tag, &axis_range))
-    {
-      plan->axes_triple_distances.set (axis_tag, axis.get_triple_distances ());
-
-      int normalized_min = axis.normalize_axis_value (axis_range->minimum);
-      int normalized_default = axis.normalize_axis_value (axis_range->middle);
-      int normalized_max = axis.normalize_axis_value (axis_range->maximum);
-
-      if (has_avar && old_axis_idx < avar_axis_count)
-      {
-        normalized_min = seg_maps->map (normalized_min);
-        normalized_default = seg_maps->map (normalized_default);
-        normalized_max = seg_maps->map (normalized_max);
-      }
-      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;
-
-      plan->normalized_coords[old_axis_idx] = normalized_default;
-    }
-
-    old_axis_idx++;
-
-    if (has_avar && old_axis_idx < avar_axis_count)
-      seg_maps = &StructAfter<OT::SegmentMaps> (*seg_maps);
-  }
-  plan->all_axes_pinned = !axis_not_pinned;
-}
-
-static void
-_update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
-{
-  if (!plan->normalized_coords) return;
-  OT::cff2::accelerator_t cff2 (plan->source);
-  if (!cff2.is_valid ()) return;
-
-  hb_font_t *font = _get_hb_font_with_variations (plan);
-  if (unlikely (!plan->check_success (font != nullptr)))
-  {
-    hb_font_destroy (font);
-    return;
-  }
-
-  hb_glyph_extents_t extents = {0x7FFF, -0x7FFF};
-  OT::hmtx_accelerator_t _hmtx (plan->source);
-  float *hvar_store_cache = nullptr;
-  if (_hmtx.has_data () && _hmtx.var_table.get_length ())
-    hvar_store_cache = _hmtx.var_table->get_var_store ().create_cache ();
-
-  OT::vmtx_accelerator_t _vmtx (plan->source);
-  float *vvar_store_cache = nullptr;
-  if (_vmtx.has_data () && _vmtx.var_table.get_length ())
-    vvar_store_cache = _vmtx.var_table->get_var_store ().create_cache ();
-
-  for (auto p : *plan->glyph_map)
-  {
-    hb_codepoint_t old_gid = p.first;
-    hb_codepoint_t new_gid = p.second;
-    if (!cff2.get_extents (font, old_gid, &extents)) continue;
-    bool has_bounds_info = true;
-    if (extents.x_bearing == 0 && extents.width == 0 &&
-        extents.height == 0 && extents.y_bearing == 0)
-      has_bounds_info = false;
-
-    if (has_bounds_info)
-    {
-      plan->head_maxp_info.xMin = hb_min (plan->head_maxp_info.xMin, extents.x_bearing);
-      plan->head_maxp_info.xMax = hb_max (plan->head_maxp_info.xMax, extents.x_bearing + extents.width);
-      plan->head_maxp_info.yMax = hb_max (plan->head_maxp_info.yMax, extents.y_bearing);
-      plan->head_maxp_info.yMin = hb_min (plan->head_maxp_info.yMin, extents.y_bearing + extents.height);
-    }
-
-    if (_hmtx.has_data ())
-    {
-      int hori_aw = _hmtx.get_advance_without_var_unscaled (old_gid);
-      if (_hmtx.var_table.get_length ())
-        hori_aw += (int) roundf (_hmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords,
-                                                                              hvar_store_cache));
-      int lsb = extents.x_bearing;
-      if (!has_bounds_info)
-      {
-        if (!_hmtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb))
-          continue;
-      }
-      plan->hmtx_map.set (new_gid, hb_pair ((unsigned) hori_aw, lsb));
-      plan->bounds_width_vec[new_gid] = extents.width;
-    }
-
-    if (_vmtx.has_data ())
-    {
-      int vert_aw = _vmtx.get_advance_without_var_unscaled (old_gid);
-      if (_vmtx.var_table.get_length ())
-        vert_aw += (int) roundf (_vmtx.var_table->get_advance_delta_unscaled (old_gid, font->coords, font->num_coords,
-                                                                              vvar_store_cache));
-
-      int tsb = extents.y_bearing;
-      if (!has_bounds_info)
-      {
-        if (!_vmtx.get_leading_bearing_without_var_unscaled (old_gid, &tsb))
-          continue;
-      }
-      plan->vmtx_map.set (new_gid, hb_pair ((unsigned) vert_aw, tsb));
-      plan->bounds_height_vec[new_gid] = extents.height;
-    }
-  }
-  hb_font_destroy (font);
-  if (hvar_store_cache)
-    _hmtx.var_table->get_var_store ().destroy_cache (hvar_store_cache);
-  if (vvar_store_cache)
-    _vmtx.var_table->get_var_store ().destroy_cache (vvar_store_cache);
-}
-
-static bool
-_get_instance_glyphs_contour_points (hb_subset_plan_t *plan)
-{
-  /* 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;
-
-  OT::glyf_accelerator_t glyf (plan->source);
-
-  for (auto &_ : plan->new_to_old_gid_list)
-  {
-    hb_codepoint_t new_gid = _.first;
-    contour_point_vector_t all_points;
-    if (new_gid == 0 && !(plan->flags & HB_SUBSET_FLAGS_NOTDEF_OUTLINE))
-    {
-      if (unlikely (!plan->new_gid_contour_points_map.set (new_gid, all_points)))
-        return false;
-      continue;
-    }
-
-    hb_codepoint_t old_gid = _.second;
-    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;
-}
-#endif
-
 hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
                                     const hb_subset_input_t *input)
 {
@@ -1324,7 +676,7 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
     return;
 
 #ifndef HB_NO_VAR
-  _normalize_axes_location (face, this);
+  normalize_axes_location (face, this);
 #endif
 
   _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, this);
@@ -1365,13 +717,15 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
   for (auto &v : bounds_height_vec)
     v = 0xFFFFFFFF;
 
+#ifndef HB_NO_SUBSET_LAYOUT
   if (!drop_tables.has (HB_OT_TAG_GDEF))
-    _remap_used_mark_sets (this, used_mark_sets_map);
+    remap_used_mark_sets (this, used_mark_sets_map);
+#endif
 
 #ifndef HB_NO_VAR
 #ifndef HB_NO_BASE
   if (!drop_tables.has (HB_OT_TAG_BASE))
-    _collect_base_variation_indices (this);
+    collect_base_variation_indices (this);
 #endif
 #endif
 
@@ -1379,8 +733,8 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
     return;
 
 #ifndef HB_NO_VAR
-  _update_instance_metrics_map_from_cff2 (this);
-  if (!check_success (_get_instance_glyphs_contour_points (this)))
+  update_instance_metrics_map_from_cff2 (this);
+  if (!check_success (get_instance_glyphs_contour_points (this)))
       return;
 #endif
 
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 a6bae23966a..8a6574365ed 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
@@ -296,5 +296,75 @@ struct hb_subset_plan_t
   }
 };
 
+// hb-subset-plan implementation is split into multiple files to keep
+// compile times more reasonable:
+// - hb-subset-plan.cc
+// - hb-subset-plan-layout.cc
+//
+// The functions below are those needed to connect the split files
+// above together.
+HB_INTERNAL void
+remap_indexes (const hb_set_t *indexes,
+               hb_map_t       *mapping /* OUT */);
+
+
+#ifndef HB_NO_VAR
+template<typename ItemVarStore>
+HB_INTERNAL void
+remap_variation_indices (const ItemVarStore &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 */);
+
+
+template<typename DeltaSetIndexMap>
+HB_INTERNAL void
+remap_colrv1_delta_set_index_indices (const 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 */);
+
+
+HB_INTERNAL void
+generate_varstore_inner_maps (const hb_set_t& varidx_set,
+                              unsigned subtable_count,
+                              hb_vector_t<hb_inc_bimap_t> &inner_maps /* OUT */);
+
+HB_INTERNAL void
+normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan);
+
+HB_INTERNAL void
+update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan);
+
+HB_INTERNAL bool
+get_instance_glyphs_contour_points (hb_subset_plan_t *plan);
+
+#ifndef HB_NO_BASE
+HB_INTERNAL void
+collect_base_variation_indices (hb_subset_plan_t* plan);
+#endif
+#endif
+
+#ifndef HB_NO_SUBSET_LAYOUT
+typedef hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> script_langsys_map;
+
+HB_INTERNAL void
+remap_used_mark_sets (hb_subset_plan_t *plan,
+                      hb_map_t& used_mark_sets_map);
+
+HB_INTERNAL void
+layout_nameid_closure (hb_subset_plan_t* plan,
+                       hb_set_t* drop_tables);
+
+HB_INTERNAL void
+layout_populate_gids_to_retain (hb_subset_plan_t* plan,
+                                hb_set_t* drop_tables);
+
+HB_INTERNAL void
+collect_layout_variation_indices (hb_subset_plan_t* plan);
+#endif
+
 
 #endif /* HB_SUBSET_PLAN_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
index 595cafc283e..079c94eddfe 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
@@ -708,3 +708,107 @@ hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan)
 end:
   return success ? hb_face_reference (plan->dest) : nullptr;
 }
+
+
+#ifdef HB_EXPERIMENTAL_API
+
+#include "hb-ot-cff1-table.hh"
+
+template<typename accel_t>
+static hb_blob_t* get_charstrings_data(accel_t& accel, hb_codepoint_t glyph_index) {
+  if (!accel.is_valid()) {
+    return hb_blob_get_empty ();
+  }
+
+  hb_ubytes_t bytes = (*accel.charStrings)[glyph_index];
+  if (!bytes) {
+    return hb_blob_get_empty ();
+  }
+
+  hb_blob_t* cff_blob = accel.get_blob();
+  uint32_t length;
+  const char* cff_data = hb_blob_get_data(cff_blob, &length) ;
+
+  long int offset = (const char*) bytes.arrayZ - cff_data;
+  if (offset < 0 || offset > INT32_MAX) {
+    return hb_blob_get_empty ();
+  }
+
+  return hb_blob_create_sub_blob(cff_blob, (uint32_t) offset, bytes.length);
+}
+
+template<typename accel_t>
+static hb_blob_t* get_charstrings_index(accel_t& accel) {
+  if (!accel.is_valid()) {
+    return hb_blob_get_empty ();
+  }
+
+  const char* charstrings_start = (const char*) accel.charStrings;
+  unsigned charstrings_length = accel.charStrings->get_size();
+
+  hb_blob_t* cff_blob = accel.get_blob();
+  uint32_t length;
+  const char* cff_data = hb_blob_get_data(cff_blob, &length) ;
+
+  long int offset = charstrings_start - cff_data;
+  if (offset < 0 || offset > INT32_MAX) {
+    return hb_blob_get_empty ();
+  }
+
+  return hb_blob_create_sub_blob(cff_blob, (uint32_t) offset, charstrings_length);
+}
+
+/**
+ * hb_subset_cff_get_charstring_data:
+ * @face: A face object
+ * @glyph_index: Glyph index to get data for.
+ *
+ * Returns the raw outline data from the CFF/CFF2 table associated with the given glyph index.
+ *
+ * XSince: EXPERIMENTAL
+ **/
+HB_EXTERN hb_blob_t*
+hb_subset_cff_get_charstring_data(hb_face_t* face, hb_codepoint_t glyph_index) {
+  return get_charstrings_data(*face->table.cff1, glyph_index);
+}
+
+/**
+ * hb_subset_cff_get_charstrings_index:
+ * @face: A face object
+ *
+ * Returns the raw CFF CharStrings INDEX from the CFF table.
+ *
+ * XSince: EXPERIMENTAL
+ **/
+HB_EXTERN hb_blob_t*
+hb_subset_cff_get_charstrings_index (hb_face_t* face) {
+  return get_charstrings_index (*face->table.cff1);
+}
+
+/**
+ * hb_subset_cff2_get_charstring_data:
+ * @face: A face object
+ * @glyph_index: Glyph index to get data for.
+ *
+ * Returns the raw outline data from the CFF/CFF2 table associated with the given glyph index.
+ *
+ * XSince: EXPERIMENTAL
+ **/
+HB_EXTERN hb_blob_t*
+hb_subset_cff2_get_charstring_data(hb_face_t* face, hb_codepoint_t glyph_index) {
+  return get_charstrings_data(*face->table.cff2, glyph_index);
+}
+
+/**
+ * hb_subset_cff2_get_charstrings_index:
+ * @face: A face object
+ *
+ * Returns the raw CFF2 CharStrings INDEX from the CFF2 table.
+ *
+ * XSince: EXPERIMENTAL
+ **/
+HB_EXTERN hb_blob_t*
+hb_subset_cff2_get_charstrings_index (hb_face_t* face) {
+  return get_charstrings_index (*face->table.cff2);
+}
+#endif
\ No newline at end of file
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.h b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
index 13fcd5332e6..3eccd25738e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
@@ -71,10 +71,12 @@ typedef struct hb_subset_plan_t hb_subset_plan_t;
  * in the final subset.
  * @HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES: If set then the unicode ranges in
  * OS/2 will not be recalculated.
- * @HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE: If set don't perform glyph closure on layout
+ * @HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE: If set do not 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_NO_BIDI_CLOSURE: If set do not pull mirrored versions of input
+ * codepoints into the subset. Since: 11.1.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
@@ -96,8 +98,9 @@ typedef enum { /*< flags >*/
   HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES =  0x00000100u,
   HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE =        0x00000200u,
   HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS     =  0x00000400u,
+  HB_SUBSET_FLAGS_NO_BIDI_CLOSURE         =  0x00000800u,
 #ifdef HB_EXPERIMENTAL_API
-  HB_SUBSET_FLAGS_IFTB_REQUIREMENTS       =  0x00000800u,
+  HB_SUBSET_FLAGS_IFTB_REQUIREMENTS       =  0x00001000u,
 #endif
 } hb_subset_flags_t;
 
@@ -224,6 +227,23 @@ hb_subset_input_override_name_table (hb_subset_input_t  *input,
                                      unsigned            language_id,
                                      const char         *name_str,
                                      int                 str_len);
+
+
+/*
+* Raw outline data access
+*/
+
+HB_EXTERN hb_blob_t*
+hb_subset_cff_get_charstring_data (hb_face_t* face, hb_codepoint_t glyph_index);
+
+HB_EXTERN hb_blob_t*
+hb_subset_cff_get_charstrings_index (hb_face_t* face);
+
+HB_EXTERN hb_blob_t*
+hb_subset_cff2_get_charstring_data (hb_face_t* face, hb_codepoint_t glyph_index);
+
+HB_EXTERN hb_blob_t*
+hb_subset_cff2_get_charstrings_index (hb_face_t* face);
 #endif
 
 HB_EXTERN hb_face_t *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
index 7e755818ddd..cd27da96648 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
@@ -90,7 +90,13 @@ struct hb_vector_t
   {
     auto iter = hb_iter (o);
     if (iter.is_random_access_iterator || iter.has_fast_len)
-      alloc (hb_len (iter), true);
+    {
+      if (unlikely (!alloc (hb_len (iter), true)))
+        return;
+      unsigned count = hb_len (iter);
+      for (unsigned i = 0; i < count; i++)
+        push_has_room (*iter++);
+    }
     while (iter)
     {
       if (unlikely (!alloc (length + 1)))
@@ -436,7 +442,6 @@ struct hb_vector_t
         new_allocated += (new_allocated >> 1) + 8;
     }
 
-
     /* Reallocate */
 
     bool overflows =
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-version.h b/src/java.desktop/share/native/libharfbuzz/hb-version.h
index 01edf174350..e41286d2d8c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-version.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-version.h
@@ -41,13 +41,13 @@ HB_BEGIN_DECLS
  *
  * The major component of the library version available at compile-time.
  */
-#define HB_VERSION_MAJOR 10
+#define HB_VERSION_MAJOR 11
 /**
  * HB_VERSION_MINOR:
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 4
+#define HB_VERSION_MINOR 2
 /**
  * HB_VERSION_MICRO:
  *
@@ -60,7 +60,7 @@ HB_BEGIN_DECLS
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "10.4.0"
+#define HB_VERSION_STRING "11.2.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 fee1c9cd663..8c430e5770d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb.hh
@@ -89,6 +89,7 @@
 #pragma GCC diagnostic error   "-Wstring-conversion"
 #pragma GCC diagnostic error   "-Wswitch-enum"
 #pragma GCC diagnostic error   "-Wtautological-overlap-compare"
+#pragma GCC diagnostic error   "-Wuninitialized"
 #pragma GCC diagnostic error   "-Wunneeded-internal-declaration"
 #pragma GCC diagnostic error   "-Wunused"
 #pragma GCC diagnostic error   "-Wunused-local-typedefs"
@@ -230,33 +231,6 @@
 #define HB_PASTE(a,b) HB_PASTE1(a,b)
 
 
-/* Compile-time custom allocator support. */
-
-#if !defined(HB_CUSTOM_MALLOC) \
-  && defined(hb_malloc_impl) \
-  && defined(hb_calloc_impl) \
-  && defined(hb_realloc_impl) \
-  && defined(hb_free_impl)
-#define HB_CUSTOM_MALLOC
-#endif
-
-#ifdef HB_CUSTOM_MALLOC
-extern "C" void* hb_malloc_impl(size_t size);
-extern "C" void* hb_calloc_impl(size_t nmemb, size_t size);
-extern "C" void* hb_realloc_impl(void *ptr, size_t size);
-extern "C" void  hb_free_impl(void *ptr);
-#define hb_malloc hb_malloc_impl
-#define hb_calloc hb_calloc_impl
-#define hb_realloc hb_realloc_impl
-#define hb_free hb_free_impl
-#else
-#define hb_malloc malloc
-#define hb_calloc calloc
-#define hb_realloc realloc
-#define hb_free free
-#endif
-
-
 /*
  * Compiler attributes
  */
@@ -282,7 +256,7 @@ extern "C" void  hb_free_impl(void *ptr);
 #define __attribute__(x)
 #endif
 
-#if defined(__MINGW32__) && (__GNUC__ >= 3)
+#if defined(__MINGW32__) && (__GNUC__ >= 3) && !defined(__clang__)
 #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)))
@@ -491,7 +465,7 @@ static int HB_UNUSED _hb_errno = 0;
 #    define hb_atexit atexit
 #  else
      template <void (*function) (void)> struct hb_atexit_t { ~hb_atexit_t () { function (); } };
-#    define hb_atexit(f) static hb_atexit_t<f> _hb_atexit_##__LINE__;
+#    define hb_atexit(f) static hb_atexit_t<f> _hb_atexit_##__LINE__
 #  endif
 #endif
 #endif
@@ -539,6 +513,29 @@ static_assert ((sizeof (hb_var_int_t) == 4), "");
 #define HB_PI 3.14159265358979f
 #define HB_2_PI (2.f * HB_PI)
 
+/* Compile-time custom allocator support. */
+
+#if !defined(HB_CUSTOM_MALLOC) \
+  && defined(hb_malloc_impl) \
+  && defined(hb_calloc_impl) \
+  && defined(hb_realloc_impl) \
+  && defined(hb_free_impl)
+#define HB_CUSTOM_MALLOC
+#endif
+
+#ifdef HB_CUSTOM_MALLOC
+extern "C" void* hb_malloc_impl(size_t size);
+extern "C" void* hb_calloc_impl(size_t nmemb, size_t size);
+extern "C" void* hb_realloc_impl(void *ptr, size_t size);
+extern "C" void  hb_free_impl(void *ptr);
+#else
+#define hb_malloc_impl malloc
+#define hb_calloc_impl calloc
+#define hb_realloc_impl realloc
+#define hb_free_impl free
+#endif
+
+
 
 /* Headers we include for everyone.  Keep topologically sorted by dependency.
  * They express dependency amongst themselves, but no other file should include

From 052e2522b661e51b5fd2e0561c4866e97b9d170d Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Tue, 6 May 2025 17:32:36 +0000
Subject: [PATCH 295/901] 8356152: String.concat can throw
 StringIndexOutOfBoundsException

Reviewed-by: liach, aturbanov, redestad, rriggs
---
 .../classes/java/lang/StringConcatHelper.java |  2 +-
 .../lang/String/concat/HugeConcatTest.java    | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/lang/String/concat/HugeConcatTest.java

diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index 3b057ecb028..f82e392a1fb 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -432,7 +432,7 @@ static String simpleConcat(Object first, Object second) {
     @ForceInline
     static String doConcat(String s1, String s2) {
         byte coder = (byte) (s1.coder() | s2.coder());
-        int newLength = (s1.length() + s2.length()) << coder;
+        int newLength = checkOverflow(s1.length() + s2.length()) << coder;
         byte[] buf = newArray(newLength);
         s1.getBytes(buf, 0, coder);
         s2.getBytes(buf, s1.length(), coder);
diff --git a/test/jdk/java/lang/String/concat/HugeConcatTest.java b/test/jdk/java/lang/String/concat/HugeConcatTest.java
new file mode 100644
index 00000000000..e0465be9178
--- /dev/null
+++ b/test/jdk/java/lang/String/concat/HugeConcatTest.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 8356152
+ * @summary Check that huge concatenations throw OutOfMemoryError
+ * @requires os.maxMemory > 8G
+ * @run junit/othervm -Xmx8G -XX:+CompactStrings -Dcompact=true HugeConcatTest
+ * @run junit/othervm -Xmx8G -XX:-CompactStrings -Dcompact=false HugeConcatTest
+ */
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertThrows;
+
+public class HugeConcatTest {
+
+    private static final int HUGE_LENGTH_UTF16 = Integer.MAX_VALUE / 2 - 2;
+
+    private static String hugeLatin1;
+    private static final String hugeUTF16 = "\u20AC".repeat(HUGE_LENGTH_UTF16);
+
+    @BeforeAll
+    public static void initHugeLatin1() {
+        String compact = System.getProperty("compact", "true");
+        int hugeLatin1Length = Boolean.parseBoolean(compact)
+                ? Integer.MAX_VALUE - 2
+                : HUGE_LENGTH_UTF16;
+        hugeLatin1 = "a".repeat(hugeLatin1Length);
+    }
+
+    @Test
+    public void testConcat_Latin1_Latin1() {
+        assertThrows(OutOfMemoryError.class, () -> { var s = hugeLatin1 + hugeLatin1; });
+        assertThrows(OutOfMemoryError.class, () -> hugeLatin1.concat(hugeLatin1));
+    }
+
+    @Test
+    public void testConcat_Latin1_UTF16() {
+        assertThrows(OutOfMemoryError.class, () -> { var s = hugeLatin1 + hugeUTF16; });
+        assertThrows(OutOfMemoryError.class, () -> hugeLatin1.concat(hugeUTF16));
+    }
+
+    @Test
+    public void testConcat_UTF16_Latin1() {
+        assertThrows(OutOfMemoryError.class, () -> { var s = hugeUTF16 + hugeLatin1; });
+        assertThrows(OutOfMemoryError.class, () -> hugeUTF16.concat(hugeLatin1));
+    }
+
+    @Test
+    public void testConcat_UTF16_UTF16() {
+        assertThrows(OutOfMemoryError.class, () -> { var s = hugeUTF16 + hugeUTF16; });
+        assertThrows(OutOfMemoryError.class, () -> hugeUTF16.concat(hugeUTF16));
+    }
+
+}

From 064b036ebd73407ce036d283dbacce44530dbb38 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Tue, 6 May 2025 17:56:03 +0000
Subject: [PATCH 296/901] 8356050: Problemlist jdk, langtools & lib-test tier1
 tests requiring runtime usages of <jdk>/bin/tools for static-jdk

Reviewed-by: ihse
---
 test/jdk/ProblemList-StaticJdk.txt       | 14 ++++++++++++
 test/langtools/ProblemList-StaticJdk.txt | 29 ++++++++++++++++++++++++
 test/lib-test/ProblemList-StaticJdk.txt  |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 test/jdk/ProblemList-StaticJdk.txt
 create mode 100644 test/langtools/ProblemList-StaticJdk.txt
 create mode 100644 test/lib-test/ProblemList-StaticJdk.txt

diff --git a/test/jdk/ProblemList-StaticJdk.txt b/test/jdk/ProblemList-StaticJdk.txt
new file mode 100644
index 00000000000..12ff29dbae9
--- /dev/null
+++ b/test/jdk/ProblemList-StaticJdk.txt
@@ -0,0 +1,14 @@
+# Require jarsigner
+java/lang/System/LoggerFinder/SignedLoggerFinderTest/SignedLoggerFinderTest.java 8346719 generic-all
+java/util/jar/JarFile/jarVerification/MultiProviderTest.java                     8346719 generic-all
+
+# Require jar
+java/lang/System/MacEncoding/TestFileEncoding.java                               8346719 generic-all
+java/util/ResourceBundle/modules/basic/BasicTest.java                            8346719 generic-all
+
+# Require javac
+java/util/ResourceBundle/modules/layer/LayerTest.java                            8346719 generic-all
+java/util/ResourceBundle/modules/unnamed/UnNamedTest.java                        8346719 generic-all
+
+# Require jps
+java/util/concurrent/locks/Lock/TimedAcquireLeak.java                            8346719 generic-all
diff --git a/test/langtools/ProblemList-StaticJdk.txt b/test/langtools/ProblemList-StaticJdk.txt
new file mode 100644
index 00000000000..85fa3a6e14d
--- /dev/null
+++ b/test/langtools/ProblemList-StaticJdk.txt
@@ -0,0 +1,29 @@
+# Requires javadoc
+jdk/javadoc/tool/6964914/TestStdDoclet.java                                8346719 generic-all
+jdk/javadoc/tool/6964914/TestUserDoclet.java                               8346719 generic-all
+jdk/javadoc/tool/AddOpensTest.java                                         8346719 generic-all
+jdk/javadoc/tool/EncodingTest.java                                         8346719 generic-all
+jdk/javadoc/tool/EnsureNewOldDoclet.java                                   8346719 generic-all
+jdk/javadoc/tool/QuietOption.java                                          8346719 generic-all
+jdk/javadoc/tool/testLocaleOption/TestLocaleOption.java                    8346719 generic-all
+
+# Requires javac
+tools/javac/ClassPathTest/ClassPathTest.java                               8346719 generic-all
+tools/javac/Paths/ClassPath.java                                           8346719 generic-all
+tools/javac/Paths/WildcardMineField.java                                   8346719 generic-all
+tools/javac/T8132562/ClassPathWithDoubleQuotesTest.java                    8346719 generic-all
+tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java                  8346719 generic-all
+tools/javac/modules/AllDefaultTest.java                                    8346719 generic-all
+tools/javac/modules/EnvVarTest.java                                        8346719 generic-all
+tools/javac/modules/InheritRuntimeEnvironmentTest.java                     8346719 generic-all
+tools/javac/modules/NPEEmptyFileTest.java                                  8346719 generic-all
+tools/javac/newlines/NewLineTest.java                                      8346719 generic-all
+tools/javac/options/smokeTests/OptionSmokeTest.java                        8346719 generic-all
+tools/javac/platform/PlatformProviderTest.java                             8346719 generic-all
+tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java 8346719 generic-all
+
+# Requires jar
+tools/jdeps/MultiReleaseJar.java                                           8346719 generic-all
+
+# Requires jimage
+tools/javac/Paths/MineField.java                                           8346719 generic-all
diff --git a/test/lib-test/ProblemList-StaticJdk.txt b/test/lib-test/ProblemList-StaticJdk.txt
new file mode 100644
index 00000000000..3d151e07d41
--- /dev/null
+++ b/test/lib-test/ProblemList-StaticJdk.txt
@@ -0,0 +1,2 @@
+# Requires jcmd
+jdk/test/lib/hprof/HprofTest.java   8346719 generic-all

From 9c43871fd15c6fa89f7ad8803c68db7d7a6c09ca Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 6 May 2025 17:57:23 +0000
Subject: [PATCH 297/901] 8356219: jpackage places libapplauncher.so in
 incorrect location in the app image

Reviewed-by: almatvee
---
 .../jpackage/internal/ApplicationLayout.java  |  26 +-
 .../jdk/jpackage/internal/util/PathGroup.java | 480 +++++++++++++-----
 .../jdk/jpackage/test/ApplicationLayout.java  |  22 +-
 .../jdk/jpackage/test/JPackageCommand.java    |  29 +-
 .../jpackage/test/LauncherIconVerifier.java   |   2 +-
 .../jdk/jpackage/test/LinuxHelper.java        |  10 +-
 .../jpackage/internal/util/PathGroupTest.java | 338 +++++++++++-
 .../jdk/tools/jpackage/linux/UsrTreeTest.java |  32 +-
 8 files changed, 758 insertions(+), 181 deletions(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
index c89131b2d4b..230e4beb49b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
@@ -26,14 +26,16 @@
 
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.util.PathGroup;
+import java.io.IOException;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
 
 
 /**
  * Application directory layout.
  */
-public final class ApplicationLayout implements PathGroup.Facade<ApplicationLayout> {
+public final class ApplicationLayout {
     enum PathRole {
         /**
          * Java run-time directory.
@@ -84,16 +86,34 @@ private ApplicationLayout(PathGroup data) {
         this.data = data;
     }
 
-    @Override
     public PathGroup pathGroup() {
         return data;
     }
 
-    @Override
     public ApplicationLayout resolveAt(Path root) {
         return new ApplicationLayout(pathGroup().resolveAt(root));
     }
 
+    public List<Path> roots() {
+        return data.roots();
+    }
+
+    public long sizeInBytes() throws IOException {
+        return data.sizeInBytes();
+    }
+
+    public void copy(ApplicationLayout other) throws IOException {
+        data.copy(other.data);
+    }
+
+    public void move(ApplicationLayout other) throws IOException {
+        data.move(other.data);
+    }
+
+    public void transform(ApplicationLayout other, PathGroup.TransformHandler handler) throws IOException {
+        data.transform(other.data, handler);
+    }
+
     /**
      * Path to launchers directory.
      */
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
index c6938b6b986..bad4bc3069f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
@@ -24,36 +24,69 @@
  */
 package jdk.jpackage.internal.util;
 
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.CopyOption;
+import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Stream;
 
-
 /**
- * Group of paths.
- * Each path in the group is assigned a unique id.
+ * Group of paths. Each path in the group is assigned a unique id.
  */
 public final class PathGroup {
+
+    /**
+     * Creates path group with the initial paths.
+     *
+     * @param paths the initial paths
+     */
     public PathGroup(Map<Object, Path> paths) {
+        paths.keySet().forEach(Objects::requireNonNull);
+        paths.values().forEach(Objects::requireNonNull);
         entries = new HashMap<>(paths);
     }
 
+    /**
+     * Returns a path associated with the given identifier in this path group.
+     *
+     * @param id the identifier
+     * @return the path corresponding to the given identifier in this path group or
+     *         <code>null</code> if there is no such path
+     */
     public Path getPath(Object id) {
-        if (id == null) {
-            throw new NullPointerException();
-        }
+        Objects.requireNonNull(id);
         return entries.get(id);
     }
 
+    /**
+     * Assigns the specified path value to the given identifier in this path group.
+     * If the given identifier doesn't exist in this path group, it is added,
+     * otherwise, the current value associated with the identifier is replaced with
+     * the given path value. If the path value is <code>null</code> the given
+     * identifier is removed from this path group if it existed; otherwise, no
+     * action is taken.
+     *
+     * @param id   the identifier
+     * @param path the path to associate with the identifier or <code>null</code>
+     */
     public void setPath(Object id, Path path) {
+        Objects.requireNonNull(id);
         if (path != null) {
             entries.put(id, path);
         } else {
@@ -62,197 +95,380 @@ public void setPath(Object id, Path path) {
     }
 
     /**
-     * All configured entries.
+     * Adds a path associated with the new unique identifier to this path group.
+     *
+     * @param path the path to associate the new unique identifier in this path
+     *             group
+     */
+    public void ghostPath(Path path) {
+        Objects.requireNonNull(path);
+        setPath(new Object(), path);
+    }
+
+    /**
+     * Gets all identifiers of this path group.
+     * <p>
+     * The order of identifiers in the returned list is undefined.
+     *
+     * @return all identifiers of this path group
+     */
+    public Set<Object> keys() {
+        return entries.keySet();
+    }
+
+    /**
+     * Gets paths associated with all identifiers in this path group.
+     * <p>
+     * The order of paths in the returned list is undefined.
+     *
+     * @return paths associated with all identifiers in this path group
      */
     public List<Path> paths() {
         return entries.values().stream().toList();
     }
 
     /**
-     * Root entries.
+     * Gets root paths in this path group.
+     * <p>
+     * If multiple identifiers are associated with the same path value in the group,
+     * the path value is added to the returned list only once. Paths that are
+     * descendants of other paths in the group are not added to the returned list.
+     * <p>
+     * The order of paths in the returned list is undefined.
+     *
+     * @return unique root paths in this path group
      */
     public List<Path> roots() {
-        // Sort by the number of path components in ascending order.
-        List<Map.Entry<Path, Path>> sorted = normalizedPaths().stream().sorted(
-                (a, b) -> a.getKey().getNameCount() - b.getKey().getNameCount()).toList();
-
-        // Returns `true` if `a` is a parent of `b`
-        BiFunction<Map.Entry<Path, Path>, Map.Entry<Path, Path>, Boolean> isParentOrSelf = (a, b) -> {
-            return a == b || b.getKey().startsWith(a.getKey());
-        };
-
-        return sorted.stream().filter(
-                v -> v == sorted.stream().sequential().filter(
-                        v2 -> isParentOrSelf.apply(v2, v)).findFirst().get()).map(
-                        v -> v.getValue()).toList();
+        if (entries.isEmpty()) {
+            return List.of();
+        }
+
+        // Sort by the number of path components in descending order.
+        final var sorted = entries.entrySet().stream().map(e -> {
+            return Map.entry(e.getValue().normalize(), e.getValue());
+        }).sorted(Comparator.comparingInt(e -> e.getValue().getNameCount() * -1)).distinct().toList();
+
+        final var shortestNormalizedPath = sorted.getLast().getKey();
+        if (shortestNormalizedPath.getNameCount() == 1 && shortestNormalizedPath.getFileName().toString().isEmpty()) {
+            return List.of(sorted.getLast().getValue());
+        }
+
+        final List<Path> roots = new ArrayList<>();
+
+        for (int i = 0; i < sorted.size(); ++i) {
+            final var path = sorted.get(i).getKey();
+            boolean pathIsRoot = true;
+            for (int j = i + 1; j < sorted.size(); ++j) {
+                final var maybeParent = sorted.get(j).getKey();
+                if (path.getNameCount() > maybeParent.getNameCount() && path.startsWith(maybeParent)) {
+                    pathIsRoot = false;
+                    break;
+                }
+            }
+
+            if (pathIsRoot) {
+                roots.add(sorted.get(i).getValue());
+            }
+        }
+
+        return roots;
     }
 
+    /**
+     * Gets the number of bytes in root paths of this path group. The method sums
+     * the size of all root path entries in the group. If the path entry is a
+     * directory it calculates the total size of the files in the directory. If the
+     * path entry is a file, it takes its size.
+     *
+     * @return the total number of bytes in root paths of this path group
+     * @throws IOException If an I/O error occurs
+     */
     public long sizeInBytes() throws IOException {
         long reply = 0;
-        for (Path dir : roots().stream().filter(f -> Files.isDirectory(f)).collect(
-                Collectors.toList())) {
-            try (Stream<Path> stream = Files.walk(dir)) {
-                reply += stream.filter(p -> Files.isRegularFile(p)).mapToLong(
-                        f -> f.toFile().length()).sum();
+        final var roots = roots();
+        try {
+            for (Path dir : roots.stream().filter(Files::isDirectory).toList()) {
+                try (Stream<Path> stream = Files.walk(dir)) {
+                    reply += stream.mapToLong(PathGroup::sizeInBytes).sum();
+                }
             }
+            reply += roots.stream().mapToLong(PathGroup::sizeInBytes).sum();
+        } catch (UncheckedIOException ex) {
+            throw ex.getCause();
         }
         return reply;
     }
 
+    private static long sizeInBytes(Path path) throws UncheckedIOException {
+        if (Files.isRegularFile(path)) {
+            try {
+                return Files.size(path);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Creates a copy of this path group with all paths resolved against the given
+     * root. Taken action is equivalent to creating a copy of this path group and
+     * calling <code>root.resolve()</code> on every path in the copy.
+     *
+     * @param root the root against which to resolve paths
+     *
+     * @return a new path group resolved against the given root path
+     */
     public PathGroup resolveAt(Path root) {
-        return new PathGroup(entries.entrySet().stream().collect(
-                Collectors.toMap(e -> e.getKey(),
-                        e -> root.resolve(e.getValue()))));
+        Objects.requireNonNull(root);
+        return new PathGroup(entries.entrySet().stream()
+                .collect(toMap(Map.Entry::getKey, e -> root.resolve(e.getValue()))));
     }
 
-    public void copy(PathGroup dst) throws IOException {
-        copy(this, dst, null, false);
+    /**
+     * Copies files/directories from the locations in the path group into the
+     * locations of the given path group. For every identifier found in this and the
+     * given group, copy the associated file or directory from the location
+     * specified by the path value associated with the identifier in this group into
+     * the location associated with the identifier in the given group.
+     *
+     * @param dst the destination path group
+     * @throws IOException If an I/O error occurs
+     */
+    public void copy(PathGroup dst, CopyOption ...options) throws IOException {
+        final var handler = new Copy(false, options);
+        copy(this, dst, handler, handler.followSymlinks());
     }
 
-    public void move(PathGroup dst) throws IOException {
-        copy(this, dst, null, true);
+    /**
+     * Similar to {@link #copy(PathGroup)} but moves files/directories instead of
+     * copying.
+     *
+     * @param dst the destination path group
+     * @throws IOException If an I/O error occurs
+     */
+    public void move(PathGroup dst, CopyOption ...options) throws IOException {
+        final var handler = new Copy(true, options);
+        copy(this, dst, handler, handler.followSymlinks());
+        deleteEntries();
     }
 
+    /**
+     * Similar to {@link #copy(PathGroup)} but uses the given handler to transform
+     * paths instead of coping.
+     *
+     * @param dst the destination path group
+     * @param handler the path transformation handler
+     * @throws IOException If an I/O error occurs
+     */
     public void transform(PathGroup dst, TransformHandler handler) throws IOException {
         copy(this, dst, handler, false);
     }
 
-    public static interface Facade<T> {
-        PathGroup pathGroup();
+    /**
+     * Handler of file copying and directory creating.
+     *
+     * @see #transform
+     */
+    public static interface TransformHandler {
+
+        /**
+         * Request to copy a file from the given source location into the given
+         * destination location.
+         *
+         * @implNote Default implementation takes no action
+         *
+         * @param src the source file location
+         * @param dst the destination file location
+         * @throws IOException If an I/O error occurs
+         */
+        default void copyFile(Path src, Path dst) throws IOException {
 
-        default Collection<Path> paths() {
-            return pathGroup().paths();
         }
 
-        default List<Path> roots() {
-            return pathGroup().roots();
+        /**
+         * Request to create a directory at the given location.
+         *
+         * @implNote Default implementation takes no action
+         *
+         * @param dir the path where the directory is requested to be created
+         * @throws IOException
+         */
+        default void createDirectory(Path dir) throws IOException {
+
         }
 
-        default long sizeInBytes() throws IOException {
-            return pathGroup().sizeInBytes();
+        /**
+         * Request to copy a symbolic link from the given source location into the given
+         * destination location.
+         *
+         * @implNote Default implementation calls {@link #copyFile}.
+         *
+         * @param src the source symbolic link location
+         * @param dst the destination symbolic link location
+         * @throws IOException If an I/O error occurs
+         */
+        default void copySymbolicLink(Path src, Path dst) throws IOException {
+            copyFile(src, dst);
         }
+    }
 
-        T resolveAt(Path root);
+    private void deleteEntries() throws IOException {
+        for (final var file : entries.values()) {
+            if (Files.isDirectory(file)) {
+                FileUtils.deleteRecursive(file);
+            } else {
+                Files.deleteIfExists(file);
+            }
+        }
+    }
 
-        default void copy(Facade<T> dst) throws IOException {
-            pathGroup().copy(dst.pathGroup());
+    private record CopySpec(Path basepath, Path from, Path to) {
+        CopySpec {
+            Objects.requireNonNull(basepath);
+            Objects.requireNonNull(to);
+            if (!from.startsWith(basepath)) {
+                throw new IllegalArgumentException();
+            }
         }
 
-        default void move(Facade<T> dst) throws IOException {
-            pathGroup().move(dst.pathGroup());
+        @Override
+        public int hashCode() {
+            return Objects.hash(from, to);
         }
 
-        default void transform(Facade<T> dst, TransformHandler handler) throws
-                IOException {
-            pathGroup().transform(dst.pathGroup(), handler);
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if ((obj == null) || (getClass() != obj.getClass())) {
+                return false;
+            }
+            CopySpec other = (CopySpec) obj;
+            return Objects.equals(from, other.from) && Objects.equals(to, other.to);
         }
-    }
 
-    public static interface TransformHandler {
-        void copyFile(Path src, Path dst) throws IOException;
-        void createDirectory(Path dir) throws IOException;
+        Path fromNormalized() {
+            return from().normalize();
+        }
+
+        Path toNormalized() {
+            return to().normalize();
+        }
+
+        CopySpec(Path from, Path to) {
+            this(from, from, to);
+        }
     }
 
-    private static void copy(PathGroup src, PathGroup dst,
-            TransformHandler handler, boolean move) throws IOException {
-        List<Map.Entry<Path, Path>> copyItems = new ArrayList<>();
-        List<Path> excludeItems = new ArrayList<>();
+    private static void copy(PathGroup src, PathGroup dst, TransformHandler handler, boolean followSymlinks) throws IOException {
+        List<CopySpec> copySpecs = new ArrayList<>();
+        List<Path> excludePaths = new ArrayList<>();
 
-        for (var id: src.entries.keySet()) {
-            Path srcPath = src.entries.get(id);
-            if (dst.entries.containsKey(id)) {
-                copyItems.add(Map.entry(srcPath, dst.entries.get(id)));
+        for (final var e : src.entries.entrySet()) {
+            final var srcPath = e.getValue();
+            final var dstPath = dst.entries.get(e.getKey());
+            if (dstPath != null) {
+                copySpecs.add(new CopySpec(srcPath, dstPath));
             } else {
-                excludeItems.add(srcPath);
+                excludePaths.add(srcPath.normalize());
             }
         }
 
-        copy(move, copyItems, excludeItems, handler);
+        copy(copySpecs, excludePaths, handler, followSymlinks);
     }
 
-    private static void copy(boolean move, List<Map.Entry<Path, Path>> entries,
-            List<Path> excludePaths, TransformHandler handler) throws
-            IOException {
-
-        if (handler == null) {
-            handler = new TransformHandler() {
-                @Override
-                public void copyFile(Path src, Path dst) throws IOException {
-                    Files.createDirectories(dst.getParent());
-                    if (move) {
-                        Files.move(src, dst);
-                    } else {
-                        Files.copy(src, dst);
-                    }
-                }
+    private record Copy(boolean move, boolean followSymlinks, CopyOption ... options) implements TransformHandler {
 
-                @Override
-                public void createDirectory(Path dir) throws IOException {
-                    Files.createDirectories(dir);
-                }
-            };
+        Copy(boolean move, CopyOption ... options) {
+            this(move, !Set.of(options).contains(LinkOption.NOFOLLOW_LINKS), options);
         }
 
-        // destination -> source file mapping
-        Map<Path, Path> actions = new HashMap<>();
-        for (var action: entries) {
-            Path src = action.getKey();
-            Path dst = action.getValue();
-            if (Files.isDirectory(src)) {
-               try (Stream<Path> stream = Files.walk(src)) {
-                   stream.sequential().forEach(path -> actions.put(dst.resolve(
-                            src.relativize(path)).normalize(), path));
-               }
+        @Override
+        public void copyFile(Path src, Path dst) throws IOException {
+            Files.createDirectories(dst.getParent());
+            if (move) {
+                Files.move(src, dst, options);
             } else {
-                actions.put(dst.normalize(), src);
+                Files.copy(src, dst, options);
             }
         }
 
-        for (var action : actions.entrySet()) {
-            Path dst = action.getKey();
-            Path src = action.getValue();
+        @Override
+        public void createDirectory(Path dir) throws IOException {
+            Files.createDirectories(dir);
+        }
+    }
 
-            if (excludePaths.stream().anyMatch(src::startsWith)) {
-                continue;
-            }
+    private static boolean match(Path what, List<Path> paths) {
+        return paths.stream().anyMatch(what::startsWith);
+    }
 
-            if (src.equals(dst) || !src.toFile().exists()) {
-                continue;
-            }
+    private static void copy(List<CopySpec> copySpecs, List<Path> excludePaths,
+            TransformHandler handler, boolean followSymlinks) throws IOException {
+        Objects.requireNonNull(excludePaths);
+        Objects.requireNonNull(handler);
 
-            if (Files.isDirectory(src)) {
-                handler.createDirectory(dst);
-            } else {
-                handler.copyFile(src, dst);
+
+        final var filteredCopySpecs = copySpecs.stream().<CopySpec>mapMulti((copySpec, consumer) -> {
+            final var src = copySpec.from();
+
+            if (!Files.exists(src) || match(src, excludePaths)) {
+                return;
             }
-        }
 
-        if (move) {
-            // Delete source dirs.
-            for (var entry: entries) {
-                Path srcFile = entry.getKey();
-                if (Files.isDirectory(srcFile)) {
-                    FileUtils.deleteRecursive(srcFile);
+            if (Files.isDirectory(copySpec.from())) {
+                final var dst = copySpec.to;
+                final var walkMode = followSymlinks ? new FileVisitOption[] { FileVisitOption.FOLLOW_LINKS } : new FileVisitOption[0];
+                try (final var files = Files.walk(src, walkMode)) {
+                    files.filter(file -> {
+                        return !match(file, excludePaths);
+                    }).map(file -> {
+                        return new CopySpec(src, file, dst.resolve(src.relativize(file)));
+                    }).toList().forEach(consumer::accept);
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
                 }
+            } else {
+                consumer.accept(copySpec);
             }
+        }).collect(groupingBy(CopySpec::fromNormalized, collectingAndThen(toSet(), copySpecGroup -> {
+            return copySpecGroup.stream().filter(copySpec -> {
+                for (final var otherCopySpec : copySpecGroup) {
+                    if (otherCopySpec != copySpec && !otherCopySpec.basepath().equals(copySpec.basepath())
+                            && otherCopySpec.basepath().startsWith(copySpec.basepath())) {
+                        return false;
+                    }
+                }
+                return true;
+            }).toList();
+        }))).values().stream().flatMap(Collection::stream).toList();
+
+        filteredCopySpecs.stream().collect(toMap(CopySpec::toNormalized, x -> x, (x, y) -> {
+            throw new IllegalStateException(String.format(
+                    "Duplicate source files [%s] and [%s] for [%s] destination file", x.from(), y.from(), x.to()));
+        }));
+
+        try {
+            filteredCopySpecs.stream().forEach(copySpec -> {
+                try {
+                    if (Files.isSymbolicLink(copySpec.from())) {
+                        handler.copySymbolicLink(copySpec.from(), copySpec.to());
+                    } else if (Files.isDirectory(copySpec.from())) {
+                        handler.createDirectory(copySpec.to());
+                    } else {
+                        handler.copyFile(copySpec.from(), copySpec.to());
+                    }
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            });
+        } catch (UncheckedIOException ex) {
+            throw ex.getCause();
         }
     }
 
-    private static Map.Entry<Path, Path> normalizedPath(Path v) {
-        final Path normalized;
-        if (!v.isAbsolute()) {
-            normalized = Path.of("./").resolve(v.normalize());
-        } else {
-            normalized = v.normalize();
-        }
-
-        return Map.entry(normalized, v);
-    }
-
-    private List<Map.Entry<Path, Path>> normalizedPaths() {
-        return entries.values().stream().map(PathGroup::normalizedPath).collect(
-                Collectors.toList());
-    }
-
     private final Map<Object, Path> entries;
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ApplicationLayout.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ApplicationLayout.java
index 88ce7169da7..7ab3b824aa4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ApplicationLayout.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ApplicationLayout.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
@@ -29,7 +29,7 @@
 
 public record ApplicationLayout(Path launchersDirectory, Path appDirectory,
         Path runtimeDirectory, Path runtimeHomeDirectory, Path appModsDirectory,
-        Path destktopIntegrationDirectory, Path contentDirectory) {
+        Path desktopIntegrationDirectory, Path contentDirectory, Path libapplauncher) {
 
     public ApplicationLayout resolveAt(Path root) {
         return new ApplicationLayout(
@@ -38,8 +38,9 @@ public ApplicationLayout resolveAt(Path root) {
                 resolve(root, runtimeDirectory),
                 resolve(root, runtimeHomeDirectory),
                 resolve(root, appModsDirectory),
-                resolve(root, destktopIntegrationDirectory),
-                resolve(root, contentDirectory));
+                resolve(root, desktopIntegrationDirectory),
+                resolve(root, contentDirectory),
+                resolve(root, libapplauncher));
     }
 
     public static ApplicationLayout linuxAppImage() {
@@ -50,7 +51,8 @@ public static ApplicationLayout linuxAppImage() {
                 Path.of("lib/runtime"),
                 Path.of("lib/app/mods"),
                 Path.of("lib"),
-                Path.of("lib")
+                Path.of("lib"),
+                Path.of("lib/libapplauncher.so")
         );
     }
 
@@ -62,7 +64,8 @@ public static ApplicationLayout windowsAppImage() {
                 Path.of("runtime"),
                 Path.of("app/mods"),
                 Path.of(""),
-                Path.of("")
+                Path.of(""),
+                null
         );
     }
 
@@ -74,7 +77,8 @@ public static ApplicationLayout macAppImage() {
                 Path.of("Contents/runtime/Contents/Home"),
                 Path.of("Contents/app/mods"),
                 Path.of("Contents/Resources"),
-                Path.of("Contents")
+                Path.of("Contents"),
+                null
         );
     }
 
@@ -102,6 +106,7 @@ public static ApplicationLayout javaRuntime() {
                 null,
                 null,
                 null,
+                null,
                 null
         );
     }
@@ -116,7 +121,8 @@ public static ApplicationLayout linuxUsrTreePackageImage(Path prefix,
                 lib.resolve("runtime"),
                 lib.resolve("app/mods"),
                 lib,
-                lib
+                lib,
+                lib.resolve("lib/libapplauncher.so")
         );
     }
 
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 722515887b8..8c5a653f5a0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -1008,9 +1008,9 @@ private void assertAppImageFile() {
 
         final Path lookupPath = AppImageFile.getPathInAppImage(appImageDir);
         if (!expectAppImageFile()) {
-            assertFileInAppImage(lookupPath, null);
+            assertFileNotInAppImage(lookupPath);
         } else {
-            assertFileInAppImage(lookupPath, lookupPath);
+            assertFileInAppImage(lookupPath);
 
             if (TKit.isOSX()) {
                 final Path rootDir = isImagePackageType() ? outputBundle() :
@@ -1035,22 +1035,39 @@ private void assertPackageFile() {
         final Path lookupPath = PackageFile.getPathInAppImage(Path.of(""));
 
         if (isRuntime() || isImagePackageType() || TKit.isLinux()) {
-            assertFileInAppImage(lookupPath, null);
+            assertFileNotInAppImage(lookupPath);
         } else {
             if (TKit.isOSX() && hasArgument("--app-image")) {
                 String appImage = getArgumentValue("--app-image");
                 if (AppImageFile.load(Path.of(appImage)).macSigned()) {
-                    assertFileInAppImage(lookupPath, null);
+                    assertFileNotInAppImage(lookupPath);
                 } else {
-                    assertFileInAppImage(lookupPath, lookupPath);
+                    assertFileInAppImage(lookupPath);
                 }
             } else {
-                assertFileInAppImage(lookupPath, lookupPath);
+                assertFileInAppImage(lookupPath);
             }
         }
     }
 
+    public void assertFileInAppImage(Path expectedPath) {
+        assertFileInAppImage(expectedPath.getFileName(), expectedPath);
+    }
+
+    public void assertFileNotInAppImage(Path filename) {
+        assertFileInAppImage(filename, null);
+    }
+
     private void assertFileInAppImage(Path filename, Path expectedPath) {
+        if (expectedPath != null) {
+            if (expectedPath.isAbsolute()) {
+                throw new IllegalArgumentException();
+            }
+            if (!expectedPath.getFileName().equals(filename.getFileName())) {
+                throw new IllegalArgumentException();
+            }
+        }
+
         if (filename.getNameCount() > 1) {
             assertFileInAppImage(filename.getFileName(), expectedPath);
             return;
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 a5eb24980ae..a1971ee0835 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
@@ -57,7 +57,7 @@ public void applyTo(JPackageCommand cmd) throws IOException {
             label = String.format("[%s]", launcherName);
         }
 
-        Path iconPath = cmd.appLayout().destktopIntegrationDirectory().resolve(
+        Path iconPath = cmd.appLayout().desktopIntegrationDirectory().resolve(
                 curLauncherName + TKit.ICON_SUFFIX);
 
         if (TKit.isWindows()) {
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 b0291fc52eb..b5786a5065a 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -82,7 +82,7 @@ public static Path getDesktopFile(JPackageCommand cmd, String launcherName) {
         String desktopFileName = String.format("%s-%s.desktop", getPackageName(
                 cmd), Optional.ofNullable(launcherName).orElseGet(
                         () -> cmd.name()).replaceAll("\\s+", "_"));
-        return cmd.appLayout().destktopIntegrationDirectory().resolve(
+        return cmd.appLayout().desktopIntegrationDirectory().resolve(
                 desktopFileName);
     }
 
@@ -393,7 +393,7 @@ static void addBundleDesktopIntegrationVerifier(PackageTest test,
 
         test.addInstallVerifier(cmd -> {
             // Verify .desktop files.
-            try (var files = Files.list(cmd.appLayout().destktopIntegrationDirectory())) {
+            try (var files = Files.list(cmd.appLayout().desktopIntegrationDirectory())) {
                 List<Path> desktopFiles = files
                         .filter(path -> path.getFileName().toString().endsWith(".desktop"))
                         .toList();
@@ -470,7 +470,7 @@ private static void verifyDesktopFile(JPackageCommand cmd, Path desktopFile)
 
         for (var e : List.<Map.Entry<Map.Entry<String, Optional<String>>, Function<ApplicationLayout, Path>>>of(
                 Map.entry(Map.entry("Exec", Optional.of(launcherPath)), ApplicationLayout::launchersDirectory),
-                Map.entry(Map.entry("Icon", Optional.empty()), ApplicationLayout::destktopIntegrationDirectory))) {
+                Map.entry(Map.entry("Icon", Optional.empty()), ApplicationLayout::desktopIntegrationDirectory))) {
             var path = e.getKey().getValue().or(() -> Optional.of(data.get(
                     e.getKey().getKey()))).map(Path::of).get();
             TKit.assertFileExists(cmd.pathToUnpackedPackageFile(path));
@@ -537,7 +537,7 @@ static void addFileAssociationsVerifier(PackageTest test, FileAssociations fa) {
 
                 Path systemDesktopFile = getSystemDesktopFilesFolder().resolve(
                         desktopFileName);
-                Path appDesktopFile = cmd.appLayout().destktopIntegrationDirectory().resolve(
+                Path appDesktopFile = cmd.appLayout().desktopIntegrationDirectory().resolve(
                         desktopFileName);
 
                 TKit.assertFileExists(systemDesktopFile);
@@ -569,7 +569,7 @@ static void addFileAssociationsVerifier(PackageTest test, FileAssociations fa) {
             final Path mimeTypeIconFileName = fa.getLinuxIconFileName();
             if (mimeTypeIconFileName != null) {
                 // Verify there are xdg registration commands for mime icon file.
-                Path mimeTypeIcon = cmd.appLayout().destktopIntegrationDirectory().resolve(
+                Path mimeTypeIcon = cmd.appLayout().desktopIntegrationDirectory().resolve(
                         mimeTypeIconFileName);
 
                 Map<Scriptlet, List<String>> scriptlets = getScriptlets(cmd);
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
index 42578227cf5..c46dbb148de 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
@@ -23,23 +23,35 @@
 
 package jdk.jpackage.internal.util;
 
+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 org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 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.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -113,6 +125,69 @@ public void testRoots() {
         assertEquals(Path.of("foo"), roots.get(0));
     }
 
+    public record TestRootsSpec(Collection<Path> paths, Set<Path> expectedRoots) {
+        public TestRootsSpec {
+            paths.forEach(Objects::requireNonNull);
+            expectedRoots.forEach(Objects::requireNonNull);
+        }
+
+        void test() {
+            final var pg = new PathGroup(paths.stream().collect(toMap(x -> new Object(), x -> x)));
+            final var actualRoots = pg.roots().stream().collect(toSet());
+            assertEquals(expectedRoots, actualRoots);
+        }
+
+        static TestRootsSpec create(Collection<String> paths, Set<String> expectedRoots) {
+            return new TestRootsSpec(paths.stream().map(Path::of).toList(), expectedRoots.stream().map(Path::of).collect(toSet()));
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("testRootsValues")
+    public void testRoots(TestRootsSpec testSpec) {
+        testSpec.test();
+    }
+
+    private static Collection<TestRootsSpec> testRootsValues() {
+        return List.of(
+                TestRootsSpec.create(List.of(""), Set.of("")),
+                TestRootsSpec.create(List.of("/", "a/b/c", "a/b", "a/b", "a/b/"), Set.of("a/b", "/"))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testSizeInBytes(List<Path> paths, @TempDir Path tempDir) throws IOException {
+        final var files = Set.of("AA.txt", "a/b/c/BB.txt", "a/b/c/DD.txt", "d/foo.txt").stream().map(Path::of).toList();
+
+        int counter = 0;
+        for (var file : files) {
+            file = tempDir.resolve(file);
+            Files.createDirectories(file.getParent());
+            Files.writeString(file, "x".repeat(++counter * 100));
+        }
+
+        final var expectedSize = Stream.of(walkFiles(tempDir))
+                .map(tempDir::resolve)
+                .filter(Files::isRegularFile)
+                .map(toFunction(Files::size))
+                .mapToLong(Long::longValue).sum();
+
+        final var pg = new PathGroup(paths.stream().collect(toMap(x -> new Object(), x -> x))).resolveAt(tempDir);
+
+        assertEquals(expectedSize, pg.sizeInBytes());
+    }
+
+    private static Collection<List<Path>> testSizeInBytes() {
+        return Stream.of(
+                List.of(""),
+                List.of("AA.txt", "a/b", "d", "non-existant", "non-existant/foo/bar"),
+                List.of("AA.txt", "a/b", "d", "a/b/c/BB.txt", "a/b/c/BB.txt")
+        ).map(v -> {
+            return v.stream().map(Path::of).toList();
+        }).toList();
+    }
+
     @Test
     public void testResolveAt() {
         final PathGroup pg = new PathGroup(Map.of(
@@ -140,7 +215,7 @@ public void testResolveAt() {
         assertEquals(aPath, pg2.roots().get(0));
     }
 
-    enum TransformType { COPY, MOVE, HANDLER };
+    enum TransformType { COPY, MOVE, HANDLER }
 
     private static Stream<Object[]> testTransform() {
         return Stream.of(TransformType.values()).flatMap(transform -> {
@@ -265,6 +340,253 @@ public void createDirectory(Path dir) throws IOException {
         }
     }
 
+    private enum PathRole {
+        DESKTOP,
+        LINUX_APPLAUNCHER_LIB,
+    }
+
+    private static PathGroup linuxAppImage() {
+        return new PathGroup(Map.of(
+                PathRole.DESKTOP, Path.of("lib"),
+                PathRole.LINUX_APPLAUNCHER_LIB, Path.of("lib/libapplauncher.so")
+        ));
+    }
+
+    private static PathGroup linuxUsrTreePackageImage(Path prefix, String packageName) {
+        final Path lib = prefix.resolve(Path.of("lib", packageName));
+        return new PathGroup(Map.of(
+                PathRole.DESKTOP, lib,
+                PathRole.LINUX_APPLAUNCHER_LIB, lib.resolve("lib/libapplauncher.so")
+        ));
+    }
+
+    @Test
+    public void testLinuxLibapplauncher(@TempDir Path tempDir) throws IOException {
+        final Path srcDir = tempDir.resolve("src");
+        final Path dstDir = tempDir.resolve("dst");
+
+        final Map<PathRole, List<Path>> files = Map.of(
+                PathRole.LINUX_APPLAUNCHER_LIB, List.of(Path.of("")),
+                PathRole.DESKTOP, List.of(Path.of("UsrUsrTreeTest.png"))
+        );
+
+        final var srcAppLayout = linuxAppImage().resolveAt(srcDir);
+        final var dstAppLayout = linuxUsrTreePackageImage(dstDir.resolve("usr"), "foo");
+
+        for (final var e : files.entrySet()) {
+            final var pathRole = e.getKey();
+            final var basedir = srcAppLayout.getPath(pathRole);
+            for (var file : e.getValue().stream().map(basedir::resolve).toList()) {
+                Files.createDirectories(file.getParent());
+                Files.writeString(file, "foo");
+            }
+        }
+
+        srcAppLayout.copy(dstAppLayout);
+
+        Stream.of(walkFiles(dstDir)).filter(p -> {
+            return p.getFileName().equals(dstAppLayout.getPath(PathRole.LINUX_APPLAUNCHER_LIB).getFileName());
+        }).reduce((x, y) -> {
+            throw new AssertionError(String.format("Multiple libapplauncher: [%s], [%s]", x, y));
+        });
+    }
+
+
+    public enum TestFileContent {
+        A,
+        B,
+        C;
+
+        void assertFileContent(Path path) {
+            try {
+                final var expected = name();
+                final var actual = Files.readString(path);
+                assertEquals(expected, actual);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        void createFile(Path path) {
+            try {
+                Files.createDirectories(path.getParent());
+                Files.writeString(path, name());
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+    }
+
+    public record PathGroupCopy(Path from, Path to) {
+        public PathGroupCopy {
+            Objects.requireNonNull(from);
+        }
+
+        public PathGroupCopy(Path from) {
+            this(from, null);
+        }
+    }
+
+    public record TestFile(Path path, TestFileContent content) {
+        public TestFile {
+            Objects.requireNonNull(content);
+            if (path.isAbsolute()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        void assertFileContent(Path basedir) {
+            content.assertFileContent(basedir.resolve(path));
+        }
+
+        void create(Path basedir) {
+            content.createFile(basedir.resolve(path));
+        }
+    }
+
+    public record TestCopySpec(List<PathGroupCopy> pathGroupSpecs, Collection<TestFile> src, Collection<TestFile> dst) {
+        public TestCopySpec {
+            pathGroupSpecs.forEach(Objects::requireNonNull);
+            src.forEach(Objects::requireNonNull);
+            dst.forEach(Objects::requireNonNull);
+        }
+
+        PathGroup from() {
+            return createPathGroup(PathGroupCopy::from);
+        }
+
+        PathGroup to() {
+            return createPathGroup(PathGroupCopy::to);
+        }
+
+        void test(Path tempDir) throws IOException {
+            final Path srcDir = tempDir.resolve("src");
+            final Path dstDir = tempDir.resolve("dst");
+
+            src.stream().forEach(testFile -> {
+                testFile.create(srcDir);
+            });
+
+            from().resolveAt(srcDir).copy(to().resolveAt(dstDir));
+
+            dst.stream().forEach(testFile -> {
+                testFile.assertFileContent(dstDir);
+            });
+
+            Files.createDirectories(dstDir);
+            final var actualFiles = Stream.of(walkFiles(dstDir)).filter(path -> {
+                return Files.isRegularFile(dstDir.resolve(path));
+            }).collect(toSet());
+            final var expectedFiles = dst.stream().map(TestFile::path).collect(toSet());
+
+            assertEquals(expectedFiles, actualFiles);
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static class Builder {
+            Builder addPath(String from, String to) {
+                pathGroupSpecs.add(new PathGroupCopy(Path.of(from), Optional.ofNullable(to).map(Path::of).orElse(null)));
+                return this;
+            }
+
+            Builder file(TestFileContent content, String srcPath, String ...dstPaths) {
+                srcFiles.putAll(Map.of(Path.of(srcPath), content));
+                dstFiles.putAll(Stream.of(dstPaths).collect(toMap(Path::of, x -> content)));
+                return this;
+            }
+
+            TestCopySpec create() {
+                return new TestCopySpec(pathGroupSpecs, convert(srcFiles), convert(dstFiles));
+            }
+
+            private static Collection<TestFile> convert(Map<Path, TestFileContent> map) {
+                return map.entrySet().stream().map(e -> {
+                    return new TestFile(e.getKey(), e.getValue());
+                }).toList();
+            }
+
+            private final List<PathGroupCopy> pathGroupSpecs = new ArrayList<>();
+            private final Map<Path, TestFileContent> srcFiles = new HashMap<>();
+            private final Map<Path, TestFileContent> dstFiles = new HashMap<>();
+        }
+
+        private PathGroup createPathGroup(Function<PathGroupCopy, Path> keyFunc) {
+            return new PathGroup(IntStream.range(0, pathGroupSpecs.size()).mapToObj(Integer::valueOf).map(i -> {
+                return Optional.ofNullable(keyFunc.apply(pathGroupSpecs.get(i))).map(path -> {
+                    return Map.entry(i, path);
+                });
+            }).filter(Optional::isPresent).map(Optional::orElseThrow).collect(toMap(Map.Entry::getKey, Map.Entry::getValue)));
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testCopy(TestCopySpec testSpec, @TempDir Path tempDir) throws IOException {
+        testSpec.test(tempDir);
+    }
+
+    private static Collection<TestCopySpec> testCopy() {
+        return List.of(
+                TestCopySpec.build().create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "a")
+                        .file(TestFileContent.A, "a/b/c/j/k/foo", "a/j/k/foo")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "a")
+                        .addPath("a/b/c", "d")
+                        .file(TestFileContent.A, "a/b/c/j/k/foo", "a/j/k/foo", "d/j/k/foo")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "")
+                        .addPath("a/b/c", "d")
+                        .file(TestFileContent.A, "a/b/c/j/k/foo", "j/k/foo", "d/j/k/foo")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "cc")
+                        .addPath("a/b/c", "dd")
+                        .addPath("a/b/c/foo", null)
+                        .file(TestFileContent.A, "a/b/c/foo")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "cc")
+                        .addPath("a/b/c", "dd")
+                        .addPath("a/b/c/foo", null)
+                        .file(TestFileContent.A, "a/b/c/foo")
+                        .file(TestFileContent.B, "a/b/c/bar", "cc/bar", "dd/bar")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "cc")
+                        .addPath("a/b/c", "dd")
+                        .addPath("a/b/c/bar", "dd/buz")
+                        .addPath("a/b/c/foo", null)
+                        .file(TestFileContent.A, "a/b/c/foo")
+                        .file(TestFileContent.B, "a/b/c/bar", "dd/buz")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b/c", "cc")
+                        .addPath("a/b/c", "dd")
+                        .addPath("a/b/c/bar", "dd/buz")
+                        .addPath("a/b/c/bar", "cc/rab")
+                        .addPath("a/b/c/foo", null)
+                        .file(TestFileContent.A, "a/b/c/foo")
+                        .file(TestFileContent.B, "a/b/c/bar", "cc/rab", "dd/buz")
+                        .create(),
+                TestCopySpec.build()
+                        .addPath("a/b", null)
+                        .addPath("a/b/c", "cc")
+                        .addPath("a/b/c", "dd")
+                        .addPath("a/b/c/bar", "dd/buz")
+                        .addPath("a/b/c/bar", "cc/rab")
+                        .file(TestFileContent.A, "a/b/c/foo")
+                        .file(TestFileContent.B, "a/b/c/bar")
+                        .create()
+        );
+    }
+
     private static Path[] walkFiles(Path root) throws IOException {
         try (var files = Files.walk(root)) {
             return files.map(root::relativize).sorted().toArray(Path[]::new);
diff --git a/test/jdk/tools/jpackage/linux/UsrTreeTest.java b/test/jdk/tools/jpackage/linux/UsrTreeTest.java
index e33364c605d..1950aab39a3 100644
--- a/test/jdk/tools/jpackage/linux/UsrTreeTest.java
+++ b/test/jdk/tools/jpackage/linux/UsrTreeTest.java
@@ -21,15 +21,18 @@
  * questions.
  */
 
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.test.ApplicationLayout.linuxAppImage;
+
 import java.nio.file.Path;
 import java.util.List;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import jdk.jpackage.test.TKit;
+import java.util.stream.Stream;
+import jdk.jpackage.test.Annotations.Test;
+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 jdk.jpackage.test.TKit;
 
 
 /**
@@ -90,20 +93,13 @@ private static void test(String installDir, boolean expectedImageSplit) {
                             "Check there is%spackage name [%s] in common path [%s] between [%s] and [%s]",
                             expectedImageSplit ? " no " : " ", packageName,
                             commonPath, launcherPath, launcherCfgPath));
-
-            List<Path> packageFiles = LinuxHelper.getPackageFiles(cmd).collect(
-                    Collectors.toList());
-
-            Consumer<Path> packageFileVerifier = file -> {
-                TKit.assertTrue(packageFiles.stream().filter(
-                        path -> path.equals(file)).findFirst().orElse(
-                                null) != null, String.format(
-                                "Check file [%s] is in [%s] package", file,
-                                packageName));
-            };
-
-            packageFileVerifier.accept(launcherPath);
-            packageFileVerifier.accept(launcherCfgPath);
+        })
+        .addInstallVerifier(cmd -> {
+            Stream.of(
+                    cmd.appLauncherPath(),
+                    cmd.appLauncherCfgPath(null),
+                    cmd.appLayout().libapplauncher()
+            ).map(cmd::pathToPackageFile).map(cmd.appInstallationDirectory()::relativize).forEachOrdered(cmd::assertFileInAppImage);
         })
         .run();
     }

From 08dd4a75c5b751a66d2e088b0ec9c6d6c443c14a Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 6 May 2025 18:00:57 +0000
Subject: [PATCH 298/901] 8354273: Replace even more Unicode characters with
 ASCII

Reviewed-by: naoto
---
 src/java.xml/share/legal/xhtml11.md                         | 2 +-
 src/java.xml/share/legal/xmlxsd.md                          | 2 +-
 test/jdk/java/awt/geom/Path2D/GetBounds2DPrecisionTest.java | 4 ++--
 test/jdk/java/awt/im/PinyinIMCapsTest.java                  | 3 +--
 test/jdk/java/awt/im/PinyinIMCommaTest.java                 | 2 +-
 test/jdk/java/awt/im/PinyinIMFullstopTest.java              | 2 +-
 test/jdk/java/util/Currency/ValidateISO4217.java            | 2 +-
 test/jdk/java/util/stream/GathererTest.java                 | 4 ++--
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/java.xml/share/legal/xhtml11.md b/src/java.xml/share/legal/xhtml11.md
index b447a5ac9e4..eafd55a9c16 100644
--- a/src/java.xml/share/legal/xhtml11.md
+++ b/src/java.xml/share/legal/xhtml11.md
@@ -47,7 +47,7 @@ The notice is:
 "Copyright © 2023 W3C®. This software or document includes material copied from
 or derived from [title and URI of the W3C document]."
 
-Disclaimers §anchor
+Disclaimers
 
 THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
 OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
diff --git a/src/java.xml/share/legal/xmlxsd.md b/src/java.xml/share/legal/xmlxsd.md
index 163e26e9f77..b752b10da29 100644
--- a/src/java.xml/share/legal/xmlxsd.md
+++ b/src/java.xml/share/legal/xmlxsd.md
@@ -26,7 +26,7 @@ modifications:
     [$year-of-document] World Wide Web Consortium.
     https://www.w3.org/copyright/software-license-2023/"
 
-Disclaimers §anchor
+Disclaimers
 
 THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR
 WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
diff --git a/test/jdk/java/awt/geom/Path2D/GetBounds2DPrecisionTest.java b/test/jdk/java/awt/geom/Path2D/GetBounds2DPrecisionTest.java
index 71b22399cb1..f97c98a6b25 100644
--- a/test/jdk/java/awt/geom/Path2D/GetBounds2DPrecisionTest.java
+++ b/test/jdk/java/awt/geom/Path2D/GetBounds2DPrecisionTest.java
@@ -189,7 +189,7 @@ private static String toUniformString(double value) {
         int DIGIT_COUNT = 40;
         String str = decimal.toPlainString();
         if (str.length() >= DIGIT_COUNT) {
-            str = str.substring(0,DIGIT_COUNT-1)+"…";
+            str = str.substring(0,DIGIT_COUNT-1)+"...";
         }
         while(str.length() < DIGIT_COUNT) {
             str = str + " ";
@@ -260,4 +260,4 @@ private static int solveQuadratic(BigDecimal[] eqn, BigDecimal[] res) {
         }
         return roots;
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/java/awt/im/PinyinIMCapsTest.java b/test/jdk/java/awt/im/PinyinIMCapsTest.java
index 4dca27d9922..707f56c6651 100644
--- a/test/jdk/java/awt/im/PinyinIMCapsTest.java
+++ b/test/jdk/java/awt/im/PinyinIMCapsTest.java
@@ -47,7 +47,7 @@ public class PinyinIMCapsTest {
 
             Test settings:
             Go to "System Preferences -> Keyboard -> Input Sources" and
-            add "Pinyin – Traditional" or "Pinyin – Simplified" IM from Chinese language group.
+            add "Pinyin - Traditional" or "Pinyin - Simplified" IM from Chinese language group.
             Set current IM to "Pinyin".
 
             1. Set focus to the text field shown below and press Caps Lock key on the keyboard.
@@ -79,4 +79,3 @@ private static JComponent createUI() {
         return panel;
     }
 }
-
diff --git a/test/jdk/java/awt/im/PinyinIMCommaTest.java b/test/jdk/java/awt/im/PinyinIMCommaTest.java
index 273403e7d68..4fccd47ea7c 100644
--- a/test/jdk/java/awt/im/PinyinIMCommaTest.java
+++ b/test/jdk/java/awt/im/PinyinIMCommaTest.java
@@ -44,7 +44,7 @@ with Pinyin input method (IM).
 
             Test settings:
             Go to "System Preferences -> Keyboard -> Input Sources" and
-            add "Pinyin – Traditional" or "Pinyin – Simplified" IM from Chinese language group.
+            add "Pinyin - Traditional" or "Pinyin - Simplified" IM from Chinese language group.
             Set current IM to "Pinyin".
 
             1. Set focus to the text field below and press "comma" character
diff --git a/test/jdk/java/awt/im/PinyinIMFullstopTest.java b/test/jdk/java/awt/im/PinyinIMFullstopTest.java
index 82d66f950f9..2c8da202544 100644
--- a/test/jdk/java/awt/im/PinyinIMFullstopTest.java
+++ b/test/jdk/java/awt/im/PinyinIMFullstopTest.java
@@ -43,7 +43,7 @@ with Pinyin input method (IM).
 
             Test settings:
             Go to "System Preferences -> Keyboard -> Input Sources" and
-            add "Pinyin – Traditional" or "Pinyin – Simplified" IM from Chinese language group.
+            add "Pinyin - Traditional" or "Pinyin - Simplified" IM from Chinese language group.
             Set current IM to "Pinyin".
 
             1. Set focus to the text area below and press "dot" character
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index 34635f5c53a..743db3beeab 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -89,7 +89,7 @@
 /**
  * This class tests the latest ISO 4217 data and Java's currency data which is
  * based on ISO 4217. The golden-data file, 'ISO4217-list-one.txt', based on the
- * “List one: Currency, fund and precious metal codes” has the following
+ * "List one: Currency, fund and precious metal codes" has the following
  * format: <Country code>\t<Currency code>\t<Numeric code>\t<Minor unit>[\t<Cutover Date>\t<new Currency code>\t<new Numeric code>\t<new Minor unit>]
  * The Cutover Date is given in SimpleDateFormat's 'yyyy-MM-dd-HH-mm-ss' format in the GMT time zone.
  */
diff --git a/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java
index ca22fc21236..d85f466496f 100644
--- a/test/jdk/java/util/stream/GathererTest.java
+++ b/test/jdk/java/util/stream/GathererTest.java
@@ -106,11 +106,11 @@ void combine(InvocationTracker other) {
     }
 
     final Gatherer<Integer,Void,Integer> addOne = Gatherer.of(
-            Gatherer.Integrator.<Void,Integer,Integer>ofGreedy((vöid, element, downstream) -> downstream.push(element + 1))
+            Gatherer.Integrator.<Void,Integer,Integer>ofGreedy((void_state, element, downstream) -> downstream.push(element + 1))
     );
 
     final Gatherer<Integer,Void,Integer> timesTwo = Gatherer.of(
-            Gatherer.Integrator.<Void,Integer,Integer>ofGreedy((vöid, element, downstream) -> downstream.push(element * 2))
+            Gatherer.Integrator.<Void,Integer,Integer>ofGreedy((void_state, element, downstream) -> downstream.push(element * 2))
     );
 
     @ParameterizedTest

From 5d17a28c4edc097162cb078ebb72ad84d925fff4 Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Tue, 6 May 2025 18:10:46 +0000
Subject: [PATCH 299/901] 8353001: Remove leftover Security Manager parsing
 code in sun.security.util.Debug

Reviewed-by: mullan
---
 .../classes/sun/security/util/Debug.java      | 67 +------------------
 .../sun/security/util/Debug/MultiOptions.java | 59 ----------------
 2 files changed, 1 insertion(+), 125 deletions(-)
 delete mode 100644 test/jdk/sun/security/util/Debug/MultiOptions.java

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 74d33c036ef..f6c0c523165 100644
--- a/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
@@ -31,8 +31,6 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.HexFormat;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
 import java.util.Locale;
 
 /**
@@ -65,7 +63,7 @@ public class Debug {
         }
 
         if (args != null) {
-            args = marshal(args);
+            args = args.toLowerCase(Locale.ENGLISH);
             if (args.equals("help")) {
                 Help();
             } else if (args.contains("all")) {
@@ -349,69 +347,6 @@ public static String toHexString(BigInteger b) {
         return sb.toString();
     }
 
-    /**
-     * change a string into lower case except permission classes and URLs.
-     */
-    private static String marshal(String args) {
-        if (args != null) {
-            StringBuilder target = new StringBuilder();
-            StringBuilder source = new StringBuilder(args);
-
-            // obtain the "permission=<classname>" options
-            // the syntax of classname: IDENTIFIER.IDENTIFIER
-            // the regular express to match a class name:
-            // "[a-zA-Z_$][a-zA-Z0-9_$]*([.][a-zA-Z_$][a-zA-Z0-9_$]*)*"
-            String keyReg = "[Pp][Ee][Rr][Mm][Ii][Ss][Ss][Ii][Oo][Nn]=";
-            String keyStr = "permission=";
-            String reg = keyReg +
-                "[a-zA-Z_$][a-zA-Z0-9_$]*([.][a-zA-Z_$][a-zA-Z0-9_$]*)*";
-            Pattern pattern = Pattern.compile(reg);
-            Matcher matcher = pattern.matcher(source);
-            StringBuilder left = new StringBuilder();
-            while (matcher.find()) {
-                String matched = matcher.group();
-                target.append(matched.replaceFirst(keyReg, keyStr));
-                target.append("  ");
-
-                // delete the matched sequence
-                matcher.appendReplacement(left, "");
-            }
-            matcher.appendTail(left);
-            source = left;
-
-            // obtain the "codebase=<URL>" options
-            // the syntax of URL is too flexible, and here assumes that the
-            // URL contains no space, comma(','), and semicolon(';'). That
-            // also means those characters also could be used as separator
-            // after codebase option.
-            // However, the assumption is incorrect in some special situation
-            // when the URL contains comma or semicolon
-            keyReg = "[Cc][Oo][Dd][Ee][Bb][Aa][Ss][Ee]=";
-            keyStr = "codebase=";
-            reg = keyReg + "[^, ;]*";
-            pattern = Pattern.compile(reg);
-            matcher = pattern.matcher(source);
-            left = new StringBuilder();
-            while (matcher.find()) {
-                String matched = matcher.group();
-                target.append(matched.replaceFirst(keyReg, keyStr));
-                target.append("  ");
-
-                // delete the matched sequence
-                matcher.appendReplacement(left, "");
-            }
-            matcher.appendTail(left);
-            source = left;
-
-            // convert the rest to lower-case characters
-            target.append(source.toString().toLowerCase(Locale.ENGLISH));
-
-            return target.toString();
-        }
-
-        return null;
-    }
-
     public static String toString(byte[] b) {
         if (b == null) {
             return "(null)";
diff --git a/test/jdk/sun/security/util/Debug/MultiOptions.java b/test/jdk/sun/security/util/Debug/MultiOptions.java
deleted file mode 100644
index 82987f4348a..00000000000
--- a/test/jdk/sun/security/util/Debug/MultiOptions.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test 1.1, 06/11/07
- * @author Xuelei Fan
- * @bug 6466247
- * @summary java.security.debug permission=<classname> and codebase=<URL>
- *          options do not work
- * @modules java.base/sun.security.util
- * @run main/othervm -Djava.security.debug="stacknothing--=-30logincontextacCess:stack-domain,combiner;access:fAilure-jarpermission=sun.dummy.DummyPermission;peRmiSsion=sun.Dummy.DummyPermission2=permission=sun.dummy.DummyPermission3:codEbAse=/dir1/DIR2/Dir3/File.java,codebase=http://www.sun.com/search?q=SunMicro,codEbAse=/dir1/DIR2/Dir3/File.java;coDebase=www.sun.com;codebase=file:///C:/temp/foo%20more/a.txt" MultiOptions
- */
-import sun.security.util.Debug;
-
-public class MultiOptions
-{
-    public static void main(String args[]) throws Exception {
-
-        if (!Debug.isOn("access") ||
-                !Debug.isOn("stack") ||
-                !Debug.isOn("logincontext") ||
-                !Debug.isOn("domain") ||
-                !Debug.isOn("combiner") ||
-                !Debug.isOn("failure") ||
-                !Debug.isOn("jar") ||
-                !Debug.isOn("permission=sun.dummy.DummyPermission") ||
-                Debug.isOn("permission=sun.dummy.dummypermission") ||
-                !Debug.isOn("permission=sun.Dummy.DummyPermission2") ||
-                !Debug.isOn("permission=sun.dummy.DummyPermission3") ||
-                !Debug.isOn("codebase=/dir1/DIR2/Dir3/File.java") ||
-                Debug.isOn("codebase=/dir1/dir2/dir3/file.java") ||
-                !Debug.isOn("codebase=www.sun.com") ||
-                !Debug.isOn("codebase=file:///C:/temp/foo%20more/a.txt") ||
-                !Debug.isOn("codebase=http://www.sun.com/search?q=SunMicro") ) {
-            throw new Exception("sun.security.Debug failed to parse options");
-        }
-    }
-
-}

From 0cb355ee921183423c8ffc44491f428c49c62c28 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 6 May 2025 18:27:20 +0000
Subject: [PATCH 300/901] 8356096: ISO 4217 Amendment 179 Update

Reviewed-by: naoto, iris
---
 .../classes/sun/util/resources/CurrencyNames.properties     | 4 +++-
 src/java.base/share/data/currency/CurrencyData.properties   | 6 +++---
 test/jdk/java/util/Currency/ISO4217-list-one.txt            | 6 +++---
 test/jdk/java/util/Currency/ValidateISO4217.java            | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
index 7e6acccf6e5..d2d9ff1035b 100644
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
@@ -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
@@ -261,6 +261,7 @@ VES=VES
 VND=VND
 VUV=VUV
 WST=WST
+XAD=XAD
 XAF=XAF
 XAG=XAG
 XAU=XAU
@@ -488,6 +489,7 @@ ves=Venezuelan Bolívar Soberano
 vnd=Vietnamese Dong
 vuv=Vanuatu Vatu
 wst=Samoan Tala
+xad=Arab Accounting Dinar
 xaf=CFA Franc BEAC
 xag=Silver
 xau=Gold
diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
index 5a28abccd00..ff2d1f87ed3 100644
--- a/src/java.base/share/data/currency/CurrencyData.properties
+++ b/src/java.base/share/data/currency/CurrencyData.properties
@@ -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
@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=177
+dataVersion=179
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
-    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAD396-XAF950-XAG961-XAU959-XBA955-\
     XBB956-XBC957-XBD958-XCD951-XCG532-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
     XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWG924-\
     ZWL932-ZWN942-ZWR935
diff --git a/test/jdk/java/util/Currency/ISO4217-list-one.txt b/test/jdk/java/util/Currency/ISO4217-list-one.txt
index 1912b5cc7db..aa8c2725899 100644
--- a/test/jdk/java/util/Currency/ISO4217-list-one.txt
+++ b/test/jdk/java/util/Currency/ISO4217-list-one.txt
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 177
-#   (As of 20 June 2024)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 179
+#   (As of 02 May 2025)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=177
+DATAVERSION=179
 
 # ISO 4217 currency data
 AF	AFN	971	2
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index 743db3beeab..6996045fc3a 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -26,7 +26,7 @@
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
  *      8208746 8209775 8264792 8274658 8283277 8296239 8321480 8334653
- *      8354343 8354344
+ *      8354343 8354344 8356096
  * @summary Validate ISO 4217 data for Currency class.
  * @modules java.base/java.util:open
  *          jdk.localedata
@@ -119,7 +119,7 @@ public class ValidateISO4217 {
             "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
                     + "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-HRK-IEP-ITL-LTL-LUF-LVL-MGF-MRO-MTL-MXV-MZM-NLG-"
                     + "PTE-ROL-RUR-SDD-SIT-SLL-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-VED-"
-                    + "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
+                    + "XAD-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
                     + "YUM-ZMK-ZWD-ZWL-ZWN-ZWR";
     private static final String[][] extraCodes = {
             /* Defined in ISO 4217 list, but don't have code and minor unit info. */

From fe29cad5e0b10cd088fc39967599f5a8dcaa445c Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Tue, 6 May 2025 18:40:33 +0000
Subject: [PATCH 301/901] 8298783: java/lang/ref/FinalizerHistogramTest.java
 failed with "RuntimeException: MyObject is not found in test output"

Reviewed-by: kbarrett, jpai
---
 .../java/lang/ref/FinalizerHistogramTest.java | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/jdk/java/lang/ref/FinalizerHistogramTest.java b/test/jdk/java/lang/ref/FinalizerHistogramTest.java
index 66cf76ea7f2..192c229c7b5 100644
--- a/test/jdk/java/lang/ref/FinalizerHistogramTest.java
+++ b/test/jdk/java/lang/ref/FinalizerHistogramTest.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,8 +21,9 @@
  * questions.
  */
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
+import jdk.test.whitebox.WhiteBox;
+
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 
 import java.lang.reflect.Method;
@@ -32,37 +33,49 @@
  * @test
  * @summary Unit test for FinalizerHistogram
  * @modules java.base/java.lang.ref:open
- * @run main FinalizerHistogramTest
+ * @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
+ *      FinalizerHistogramTest
  */
 
 public class FinalizerHistogramTest {
     static ReentrantLock lock = new ReentrantLock();
-    static volatile int wasInitialized = 0;
-    static volatile int wasTrapped = 0;
-    static final int objectsCount = 1000;
+    static final AtomicInteger initializedCount = new AtomicInteger(0);
+    static final int OBJECTS_COUNT = 1000;
+
+    static WhiteBox wb;
 
     static class MyObject {
         public MyObject() {
             // Make sure object allocation/deallocation is not optimized out
-            wasInitialized += 1;
+            initializedCount.incrementAndGet();
         }
 
         protected void finalize() {
             // Trap the object in a finalization queue
-            wasTrapped += 1;
             lock.lock();
         }
     }
 
-    public static void main(String[] argvs) {
+    public static void main(String[] argvs) throws InterruptedException {
         try {
             lock.lock();
-            for(int i = 0; i < objectsCount; ++i) {
+            for(int i = 0; i < OBJECTS_COUNT; ++i) {
                 new MyObject();
             }
-            System.out.println("Objects intialized: " + objectsCount);
-            System.gc();
-            while(wasTrapped < 1);
+            System.out.println("Objects intialized: " + initializedCount.get());
+            wb = WhiteBox.getWhiteBox();
+            wb.fullGC();
+            boolean refProResult;
+            do {
+                refProResult = wb.waitForReferenceProcessing();
+                System.out.println("waitForReferenceProcessing returned: " + refProResult);
+            } while (refProResult);
 
             Class<?> klass = Class.forName("java.lang.ref.FinalizerHistogram");
 

From 4977588d5e3424282f40209590737a487747095d Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 6 May 2025 19:00:06 +0000
Subject: [PATCH 302/901] 8330022: Failure
 test/hotspot/jtreg/vmTestbase/nsk/sysdict/share/BTreeTest.java: Could not
 initialize class java.util.concurrent.ThreadLocalRandom

Co-authored-by: David Leopoldseder <davleopo@openjdk.org>
Reviewed-by: tschatzl, matsaave
---
 .../vmTestbase/nsk/share/gc/gp/GarbageUtils.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.java b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.java
index ee82d88f6fa..1c7a8c6172c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.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.
  * 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,6 +245,12 @@ public static int eatMemory(ExecutionController stresser, GarbageProducer gp, lo
              }
          }
 
+        private static Throwable ultimateCause(Throwable t) {
+            while (t.getCause() != null) {
+                t = t.getCause();
+            }
+            return t;
+        }
 
          public static int eatMemory(ExecutionController stresser, GarbageProducer gp, long initialFactor, long minMemoryChunk, long factor, OOM_TYPE type) {
             try {
@@ -253,6 +259,9 @@ public static int eatMemory(ExecutionController stresser, GarbageProducer gp, lo
             } catch (OutOfMemoryError e) {
                return numberOfOOMEs++;
             } catch (Throwable t) {
+                if (ultimateCause(t) instanceof OutOfMemoryError) {
+                    return numberOfOOMEs++;
+                }
                throw new RuntimeException(t);
             }
          }

From e2df9cdeb081735bddd24ac2622f59e20cda47ad Mon Sep 17 00:00:00 2001
From: Alexandre Iline <shurailine@openjdk.org>
Date: Tue, 6 May 2025 19:19:10 +0000
Subject: [PATCH 303/901] 8356226: JCov Grabber server didn't respond

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

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 69dc47a0c61..4881d585e5c 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1343,12 +1343,14 @@ TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
 
 ifeq ($(TEST_OPTS_JCOV), true)
 
+  JCOV_VM_OPTS := -Xmx4g -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.maxGeneralEntitySizeLimit=0
+
   jcov-do-start-grabber:
 	$(call MakeDir, $(JCOV_OUTPUT_DIR))
 	if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
 	  $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
 	fi
-	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
+	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
 	    $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
 	    1>$(JCOV_GRABBER_LOG) 2>&1 &
 
@@ -1368,7 +1370,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
 
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
-	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
 	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
 	    $(JCOV_FILTERS) \
 	    -mainReportTitle "$(JCOV_REPORT_TITLE)" \
@@ -1392,7 +1394,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
     jcov-gen-diffcoverage: jcov-stop-grabber
 	$(call LogWarn, Generating diff coverage with changeset $(TEST_OPTS_JCOV_DIFF_CHANGESET) ... )
 	$(DIFF_COMMAND)
-	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar \
+	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar \
 	  DiffCoverage -replaceDiff "src/.*/classes/:" -all \
 	    $(JCOV_RESULT_FILE) $(JCOV_SOURCE_DIFF) > \
 	    $(JCOV_DIFF_COVERAGE_REPORT)

From bed5114e3a061d13bbc2031334d73f4527309f90 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Tue, 6 May 2025 19:38:39 +0000
Subject: [PATCH 304/901] 8356209: Problemlist failed gtests on static-jdk

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

diff --git a/test/hotspot/jtreg/ProblemList-StaticJdk.txt b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
index 2ca0961bae0..e5bdfaf8337 100644
--- a/test/hotspot/jtreg/ProblemList-StaticJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
@@ -32,3 +32,14 @@ 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
+
+# Dynamically link with JDK/VM native libraries
+gtest/GTestWrapper.java                                 8356201 generic-all
+gtest/LargePageGtests.java#use-large-pages              8356201 generic-all
+gtest/LargePageGtests.java#use-large-pages-1G           8356201 generic-all
+gtest/LockStackGtests.java                              8356201 generic-all
+gtest/MetaspaceGtests.java#no-ccs                       8356201 generic-all
+gtest/NMTGtests.java#nmt-detail                         8356201 generic-all
+gtest/NMTGtests.java#nmt-off                            8356201 generic-all
+gtest/NMTGtests.java#nmt-summary                        8356201 generic-all
+

From 9a23f721c7bcbfdb2fcf5b2bd145d6967e000dc4 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Tue, 6 May 2025 22:08:51 +0000
Subject: [PATCH 305/901] 8316682:
 serviceability/jvmti/vthread/SelfSuspendDisablerTest timed out

Reviewed-by: lmesnik, pchilanomate
---
 src/hotspot/share/prims/jvmtiEnv.cpp          |   8 +
 src/hotspot/share/prims/jvmtiEnvBase.cpp      | 137 ++++++++----------
 src/hotspot/share/prims/jvmtiImpl.cpp         |   2 +-
 src/hotspot/share/prims/jvmtiThreadState.cpp  |  40 +++--
 src/hotspot/share/prims/jvmtiThreadState.hpp  |   4 +-
 src/hotspot/share/runtime/handshake.cpp       |  40 +++--
 src/hotspot/share/runtime/handshake.hpp       |   8 +-
 src/hotspot/share/runtime/javaThread.cpp      |   8 +-
 src/hotspot/share/runtime/javaThread.hpp      |  10 +-
 .../share/runtime/javaThread.inline.hpp       |   8 +-
 src/hotspot/share/runtime/mutexLocker.cpp     |   2 +
 src/hotspot/share/runtime/mutexLocker.hpp     |   1 +
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 13 files changed, 147 insertions(+), 122 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index b2af12b08a6..6a1f451bb74 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -988,6 +988,10 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm
         self_tobj = Handle(current, thread_oop);
         continue; // self suspend after all other suspends
       }
+      if (java_lang_VirtualThread::is_instance(thread_oop)) {
+        oop carrier_thread = java_lang_VirtualThread::carrier_thread(thread_oop);
+        java_thread = carrier_thread == nullptr ? nullptr : java_lang_Thread::thread(carrier_thread);
+      }
       results[i] = suspend_thread(thread_oop, java_thread, /* single_suspend */ true);
     }
   }
@@ -1114,6 +1118,10 @@ JvmtiEnv::ResumeThreadList(jint request_count, const jthread* request_list, jvmt
         continue;
       }
     }
+    if (java_lang_VirtualThread::is_instance(thread_oop)) {
+      oop carrier_thread = java_lang_VirtualThread::carrier_thread(thread_oop);
+      java_thread = carrier_thread == nullptr ? nullptr : java_lang_Thread::thread(carrier_thread);
+    }
     results[i] = resume_thread(thread_oop, java_thread, /* single_resume */ true);
   }
   // per-thread resume results returned via results parameter
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 9e0929e69cf..3b6602f2420 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1398,8 +1398,7 @@ JvmtiEnvBase::is_vthread_suspended(oop vt_oop, JavaThread* jt) {
   bool suspended = false;
   if (java_lang_VirtualThread::is_instance(vt_oop)) {
     suspended = JvmtiVTSuspender::is_vthread_suspended(vt_oop);
-  }
-  if (vt_oop->is_a(vmClasses::BoundVirtualThread_klass())) {
+  } else if (vt_oop->is_a(vmClasses::BoundVirtualThread_klass())) {
     suspended = jt->is_suspended();
   }
   return suspended;
@@ -1757,57 +1756,46 @@ JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool singl
   Handle thread_h(current, thread_oop);
   bool is_virtual = java_lang_VirtualThread::is_instance(thread_h());
 
-  if (is_virtual) {
-    if (single_suspend) {
-      if (JvmtiVTSuspender::is_vthread_suspended(thread_h())) {
-        return JVMTI_ERROR_THREAD_SUSPENDED;
-      }
-      JvmtiVTSuspender::register_vthread_suspend(thread_h());
-      // Check if virtual thread is mounted and there is a java_thread.
-      // A non-null java_thread is always passed in the !single_suspend case.
-      oop carrier_thread = java_lang_VirtualThread::carrier_thread(thread_h());
-      java_thread = carrier_thread == nullptr ? nullptr : java_lang_Thread::thread(carrier_thread);
-    }
-    // The java_thread can be still blocked in VTMS transition after a previous JVMTI resume call.
-    // There is no need to suspend the java_thread in this case. After vthread unblocking,
-    // it will check for ext_suspend request and suspend itself if necessary.
-    if (java_thread == nullptr || java_thread->is_suspended()) {
-      // We are done if the virtual thread is unmounted or
-      // the java_thread is externally suspended.
-      return JVMTI_ERROR_NONE;
-    }
-    // The virtual thread is mounted: suspend the java_thread.
-  }
-  // Don't allow hidden thread suspend request.
-  if (java_thread->is_hidden_from_external_view()) {
-    return JVMTI_ERROR_NONE;
-  }
-  bool is_thread_carrying = is_thread_carrying_vthread(java_thread, thread_h());
+  // Unmounted vthread case.
 
-  // A case of non-virtual thread.
-  if (!is_virtual) {
-    // Thread.suspend() is used in some tests. It sets jt->is_suspended() only.
-    if (java_thread->is_carrier_thread_suspended() ||
-        (!is_thread_carrying && java_thread->is_suspended())) {
+  if (is_virtual && java_thread == nullptr) {
+    assert(single_suspend, "sanity check");
+    if (JvmtiVTSuspender::is_vthread_suspended(thread_h())) {
       return JVMTI_ERROR_THREAD_SUSPENDED;
     }
-    java_thread->set_carrier_thread_suspended();
+    JvmtiVTSuspender::register_vthread_suspend(thread_h());
+    return JVMTI_ERROR_NONE;
   }
+
+  // Platform thread or mounted vthread cases.
+
+  assert(java_thread != nullptr, "sanity check");
   assert(!java_thread->is_in_VTMS_transition(), "sanity check");
 
-  assert(!single_suspend || (!is_virtual && java_thread->is_carrier_thread_suspended()) ||
-          (is_virtual && JvmtiVTSuspender::is_vthread_suspended(thread_h())),
-         "sanity check");
+  // Don't allow hidden thread suspend request.
+  if (java_thread->is_hidden_from_external_view()) {
+    return JVMTI_ERROR_NONE;
+  }
 
   // An attempt to handshake-suspend a thread carrying a virtual thread will result in
   // suspension of mounted virtual thread. So, we just mark it as suspended
   // and it will be actually suspended at virtual thread unmount transition.
-  if (!is_thread_carrying) {
+  bool is_thread_carrying = is_thread_carrying_vthread(java_thread, thread_h());
+  if (is_thread_carrying) {
+    return java_thread->set_carrier_thread_suspended() ? JVMTI_ERROR_NONE : JVMTI_ERROR_THREAD_SUSPENDED;
+  } else {
+    // Platform thread (not carrying vthread) or mounted vthread cases.
     assert(thread_h() != nullptr, "sanity check");
     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 (!java_thread->java_suspend()) {
+
+    // Ideally we would just need to check java_thread->is_suspended(), but we have to
+    // consider the case of trying to suspend a thread that was previously suspended while
+    // carrying a vthread but has already unmounted it.
+    if (java_thread->is_suspended() || (!is_virtual && java_thread->is_carrier_thread_suspended())) {
+      return JVMTI_ERROR_THREAD_SUSPENDED;
+    }
+    if (!java_thread->java_suspend(is_virtual && single_suspend)) {
       // Thread is already suspended or in process of exiting.
       if (java_thread->is_exiting()) {
         // The thread was in the process of exiting.
@@ -1815,8 +1803,8 @@ JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool singl
       }
       return JVMTI_ERROR_THREAD_SUSPENDED;
     }
+    return JVMTI_ERROR_NONE;
   }
-  return JVMTI_ERROR_NONE;
 }
 
 // java_thread - protected by ThreadsListHandle
@@ -1827,54 +1815,51 @@ JvmtiEnvBase::resume_thread(oop thread_oop, JavaThread* java_thread, bool single
   Handle thread_h(current, thread_oop);
   bool is_virtual = java_lang_VirtualThread::is_instance(thread_h());
 
-  if (is_virtual) {
-    if (single_resume) {
-      if (!JvmtiVTSuspender::is_vthread_suspended(thread_h())) {
-        return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
-      }
-      JvmtiVTSuspender::register_vthread_resume(thread_h());
-      // Check if virtual thread is mounted and there is a java_thread.
-      // A non-null java_thread is always passed in the !single_resume case.
-      oop carrier_thread = java_lang_VirtualThread::carrier_thread(thread_h());
-      java_thread = carrier_thread == nullptr ? nullptr : java_lang_Thread::thread(carrier_thread);
-    }
-    // The java_thread can be still blocked in VTMS transition after a previous JVMTI suspend call.
-    // There is no need to resume the java_thread in this case. After vthread unblocking,
-    // it will check for is_vthread_suspended request and remain resumed if necessary.
-    if (java_thread == nullptr || !java_thread->is_suspended()) {
-      // We are done if the virtual thread is unmounted or
-      // the java_thread is not externally suspended.
-      return JVMTI_ERROR_NONE;
+  // Unmounted vthread case.
+
+  if (is_virtual && java_thread == nullptr) {
+    assert(single_resume, "sanity check");
+    if (!JvmtiVTSuspender::is_vthread_suspended(thread_h())) {
+      return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
     }
-    // The virtual thread is mounted and java_thread is supended: resume the java_thread.
+    JvmtiVTSuspender::register_vthread_resume(thread_h());
+    return JVMTI_ERROR_NONE;
   }
+
+  // Platform thread or mounted vthread cases.
+
+  assert(java_thread != nullptr, "sanity check");
+  assert(!java_thread->is_in_VTMS_transition(), "sanity check");
+
   // Don't allow hidden thread resume request.
   if (java_thread->is_hidden_from_external_view()) {
     return JVMTI_ERROR_NONE;
   }
-  bool is_thread_carrying = is_thread_carrying_vthread(java_thread, thread_h());
 
-  // A case of a non-virtual thread.
-  if (!is_virtual) {
-    if (!java_thread->is_carrier_thread_suspended() &&
-        (is_thread_carrying || !java_thread->is_suspended())) {
-      return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
-    }
-    java_thread->clear_carrier_thread_suspended();
-  }
-  assert(!java_thread->is_in_VTMS_transition(), "sanity check");
+  bool is_thread_carrying = is_thread_carrying_vthread(java_thread, thread_h());
+  if (is_thread_carrying) {
+    return java_thread->clear_carrier_thread_suspended() ? JVMTI_ERROR_NONE : JVMTI_ERROR_THREAD_NOT_SUSPENDED;
+  } else {
+    // Platform thread (not carrying vthread) or mounted vthread cases.
 
-  if (!is_thread_carrying) {
     assert(thread_h() != nullptr, "sanity check");
     assert(single_resume || thread_h()->is_a(vmClasses::BaseVirtualThread_klass()),
            "ResumeAllVirtualThreads should never resume non-virtual threads");
-    if (java_thread->is_suspended()) {
-      if (!java_thread->java_resume()) {
-        return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
-      }
+
+    // Ideally we would not have to check this but we have to consider the case
+    // of trying to resume a thread that was previously suspended while carrying
+    // a vthread but has already unmounted it.
+    if (!is_virtual && java_thread->is_carrier_thread_suspended()) {
+      bool res = java_thread->clear_carrier_thread_suspended();
+      assert(res, "resume operations running concurrently?");
+      return JVMTI_ERROR_NONE;
+    }
+
+    if (!java_thread->java_resume(is_virtual && single_resume)) {
+      return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
     }
+    return JVMTI_ERROR_NONE;
   }
-  return JVMTI_ERROR_NONE;
 }
 
 ResourceTracker::ResourceTracker(JvmtiEnv* env) {
diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp
index 9caea2de520..0059636099e 100644
--- a/src/hotspot/share/prims/jvmtiImpl.cpp
+++ b/src/hotspot/share/prims/jvmtiImpl.cpp
@@ -658,7 +658,7 @@ vframe *VM_GetOrSetLocal::get_vframe() {
 
 javaVFrame *VM_GetOrSetLocal::get_java_vframe() {
   vframe* vf = get_vframe();
-  if (!(_self || _thread->is_carrier_thread_suspended())) {
+  if (!_self && !_thread->is_suspended() && !_thread->is_carrier_thread_suspended()) {
     _result = JVMTI_ERROR_THREAD_NOT_SUSPENDED;
     return nullptr;
   }
diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index b4119825bd3..40d7800de79 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -254,7 +254,10 @@ JvmtiVTMSTransitionDisabler::print_info() {
 // disable VTMS transitions for one virtual thread
 // disable VTMS transitions for all threads if thread is nullptr or a platform thread
 JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(jthread thread)
-  : _is_SR(false), _thread(thread)
+  : _is_SR(false),
+    _is_virtual(false),
+    _is_self(false),
+    _thread(thread)
 {
   if (!Continuations::enabled()) {
     return; // JvmtiVTMSTransitionDisabler is no-op without virtual threads
@@ -262,21 +265,26 @@ JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(jthread thread)
   if (Thread::current_or_null() == nullptr) {
     return;  // Detached thread, can be a call from Agent_OnLoad.
   }
+  JavaThread* current = JavaThread::current();
+  oop thread_oop = JNIHandles::resolve_external_guard(thread);
+  _is_virtual = java_lang_VirtualThread::is_instance(thread_oop);
+
+  if (thread == nullptr ||
+      (!_is_virtual && thread_oop == current->threadObj()) ||
+      (_is_virtual && thread_oop == current->vthread())) {
+    _is_self = true;
+    return; // no need for current thread to disable and enable transitions for itself
+  }
   if (!sync_protocol_enabled_permanently()) {
     JvmtiVTMSTransitionDisabler::inc_sync_protocol_enabled_count();
   }
-  oop thread_oop = JNIHandles::resolve_external_guard(thread);
 
   // Target can be virtual or platform thread.
   // If target is a platform thread then we have to disable VTMS transitions for all threads.
   // It is by several reasons:
   // - carrier threads can mount virtual threads which may cause incorrect behavior
   // - there is no mechanism to disable transitions for a specific carrier thread yet
-  if (!java_lang_VirtualThread::is_instance(thread_oop)) {
-    _thread = nullptr; // target is a platform thread, switch to disabling VTMS transitions for all threads
-  }
-
-  if (_thread != nullptr) {
+  if (_is_virtual) {
     VTMS_transition_disable_for_one(); // disable VTMS transitions for one virtual thread
   } else {
     VTMS_transition_disable_for_all(); // disable VTMS transitions for all virtual threads
@@ -285,7 +293,10 @@ JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(jthread thread)
 
 // disable VTMS transitions for all virtual threads
 JvmtiVTMSTransitionDisabler::JvmtiVTMSTransitionDisabler(bool is_SR)
-  : _is_SR(is_SR), _thread(nullptr)
+  : _is_SR(is_SR),
+    _is_virtual(false),
+    _is_self(false),
+    _thread(nullptr)
 {
   if (!Continuations::enabled()) {
     return; // JvmtiVTMSTransitionDisabler is no-op without virtual threads
@@ -309,7 +320,10 @@ JvmtiVTMSTransitionDisabler::~JvmtiVTMSTransitionDisabler() {
   if (Thread::current_or_null() == nullptr) {
     return;  // Detached thread, can be a call from Agent_OnLoad.
   }
-  if (_thread != nullptr) {
+  if (_is_self) {
+    return; // no need for current thread to disable and enable transitions for itself
+  }
+  if (_is_virtual) {
     VTMS_transition_enable_for_one(); // enable VTMS transitions for one virtual thread
   } else {
     VTMS_transition_enable_for_all(); // enable VTMS transitions for all virtual threads
@@ -684,7 +698,7 @@ JvmtiVTSuspender::_not_suspended_list = new VirtualThreadList();
 
 void
 JvmtiVTSuspender::register_all_vthreads_suspend() {
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
+  MutexLocker ml(JvmtiVThreadSuspend_lock, Mutex::_no_safepoint_check_flag);
 
   _SR_mode = SR_all;
   _suspended_list->invalidate();
@@ -693,7 +707,7 @@ JvmtiVTSuspender::register_all_vthreads_suspend() {
 
 void
 JvmtiVTSuspender::register_all_vthreads_resume() {
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
+  MutexLocker ml(JvmtiVThreadSuspend_lock, Mutex::_no_safepoint_check_flag);
 
   _SR_mode = SR_none;
   _suspended_list->invalidate();
@@ -703,7 +717,7 @@ JvmtiVTSuspender::register_all_vthreads_resume() {
 void
 JvmtiVTSuspender::register_vthread_suspend(oop vt) {
   int64_t id = java_lang_Thread::thread_id(vt);
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
+  MutexLocker ml(JvmtiVThreadSuspend_lock, Mutex::_no_safepoint_check_flag);
 
   if (_SR_mode == SR_all) {
     assert(_not_suspended_list->contains(id),
@@ -720,7 +734,7 @@ JvmtiVTSuspender::register_vthread_suspend(oop vt) {
 void
 JvmtiVTSuspender::register_vthread_resume(oop vt) {
   int64_t id = java_lang_Thread::thread_id(vt);
-  MonitorLocker ml(JvmtiVTMSTransition_lock);
+  MutexLocker ml(JvmtiVThreadSuspend_lock, Mutex::_no_safepoint_check_flag);
 
   if (_SR_mode == SR_all) {
     assert(!_not_suspended_list->contains(id),
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index c9362d5b8cb..53144607a3c 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.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.
  * 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,8 @@ class JvmtiVTMSTransitionDisabler {
   static volatile bool _sync_protocol_enabled_permanently; // seen a suspender: JvmtiVTMSTransitionDisabler protocol is enabled permanently
 
   bool _is_SR;                                           // is suspender or resumer
+  bool _is_virtual;                                      // target thread is virtual
+  bool _is_self;                                         // JvmtiVTMSTransitionDisabler is a no-op for current platform, carrier or virtual thread
   jthread _thread;                                       // virtual thread to disable transitions for, no-op if it is a platform thread
 
   DEBUG_ONLY(static void print_info();)
diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp
index 26d3be7c36a..6bed5e9d546 100644
--- a/src/hotspot/share/runtime/handshake.cpp
+++ b/src/hotspot/share/runtime/handshake.cpp
@@ -28,6 +28,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
+#include "prims/jvmtiThreadState.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handshake.hpp"
@@ -729,7 +730,7 @@ class ThreadSelfSuspensionHandshake : public AsyncHandshakeClosure {
   virtual bool is_suspend() { return true; }
 };
 
-bool HandshakeState::suspend_with_handshake() {
+bool HandshakeState::suspend_with_handshake(bool register_vthread_SR) {
   assert(_handshakee->threadObj() != nullptr, "cannot suspend with a null threadObj");
   if (_handshakee->is_exiting()) {
     log_trace(thread, suspend)("JavaThread:" INTPTR_FORMAT " exiting", p2i(_handshakee));
@@ -744,7 +745,7 @@ bool HandshakeState::suspend_with_handshake() {
       // Target is going to wake up and leave suspension.
       // Let's just stop the thread from doing that.
       log_trace(thread, suspend)("JavaThread:" INTPTR_FORMAT " re-suspended", p2i(_handshakee));
-      set_suspended(true);
+      set_suspended(true, register_vthread_SR);
       return true;
     }
   }
@@ -752,7 +753,7 @@ bool HandshakeState::suspend_with_handshake() {
   assert(!is_suspended(), "cannot be suspended without a suspend request");
   // Thread is safe, so it must execute the request, thus we can count it as suspended
   // from this point.
-  set_suspended(true);
+  set_suspended(true, register_vthread_SR);
   set_async_suspend_handshake(true);
   log_trace(thread, suspend)("JavaThread:" INTPTR_FORMAT " suspended, arming ThreadSuspension", p2i(_handshakee));
   ThreadSelfSuspensionHandshake* ts = new ThreadSelfSuspensionHandshake();
@@ -762,17 +763,19 @@ bool HandshakeState::suspend_with_handshake() {
 
 // This is the closure that synchronously honors the suspend request.
 class SuspendThreadHandshake : public HandshakeClosure {
+  bool _register_vthread_SR;
   bool _did_suspend;
 public:
-  SuspendThreadHandshake() : HandshakeClosure("SuspendThread"), _did_suspend(false) {}
+  SuspendThreadHandshake(bool register_vthread_SR) : HandshakeClosure("SuspendThread"),
+    _register_vthread_SR(register_vthread_SR), _did_suspend(false) {}
   void do_thread(Thread* thr) {
     JavaThread* target = JavaThread::cast(thr);
-    _did_suspend = target->handshake_state()->suspend_with_handshake();
+    _did_suspend = target->handshake_state()->suspend_with_handshake(_register_vthread_SR);
   }
   bool did_suspend() { return _did_suspend; }
 };
 
-bool HandshakeState::suspend() {
+bool HandshakeState::suspend(bool register_vthread_SR) {
   JVMTI_ONLY(assert(!_handshakee->is_in_VTMS_transition(), "no suspend allowed in VTMS transition");)
   JavaThread* self = JavaThread::current();
   if (_handshakee == self) {
@@ -780,31 +783,42 @@ bool HandshakeState::suspend() {
     // and just suspend directly
     ThreadBlockInVM tbivm(self);
     MutexLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
-    set_suspended(true);
+    set_suspended(true, register_vthread_SR);
     do_self_suspend();
     return true;
   } else {
-    SuspendThreadHandshake st;
+    SuspendThreadHandshake st(register_vthread_SR);
     Handshake::execute(&st, _handshakee);
     return st.did_suspend();
   }
 }
 
-bool HandshakeState::resume() {
-  if (!is_suspended()) {
-    return false;
-  }
+bool HandshakeState::resume(bool register_vthread_SR) {
   MutexLocker ml(&_lock, Mutex::_no_safepoint_check_flag);
   if (!is_suspended()) {
     assert(!_handshakee->is_suspended(), "cannot be suspended without a suspend request");
     return false;
   }
   // Resume the thread.
-  set_suspended(false);
+  set_suspended(false, register_vthread_SR);
   _lock.notify();
   return true;
 }
 
+void HandshakeState::set_suspended(bool is_suspend, bool register_vthread_SR) {
+#if INCLUDE_JVMTI
+  if (register_vthread_SR) {
+    assert(_handshakee->is_vthread_mounted(), "sanity check");
+    if (is_suspend) {
+      JvmtiVTSuspender::register_vthread_suspend(_handshakee->vthread());
+    } else {
+      JvmtiVTSuspender::register_vthread_resume(_handshakee->vthread());
+    }
+  }
+#endif
+  Atomic::store(&_suspended, is_suspend);
+}
+
 void HandshakeState::handle_unsafe_access_error() {
   if (is_suspended()) {
     // A suspend handshake was added to the queue after the
diff --git a/src/hotspot/share/runtime/handshake.hpp b/src/hotspot/share/runtime/handshake.hpp
index f754b744de9..9e963003053 100644
--- a/src/hotspot/share/runtime/handshake.hpp
+++ b/src/hotspot/share/runtime/handshake.hpp
@@ -173,18 +173,18 @@ class HandshakeState {
   bool _async_suspend_handshake;
 
   // Called from the suspend handshake.
-  bool suspend_with_handshake();
+  bool suspend_with_handshake(bool register_vthread_SR);
   // Called from the async handshake (the trap)
   // to stop a thread from continuing execution when suspended.
   void do_self_suspend();
 
   bool is_suspended()                       { return Atomic::load(&_suspended); }
-  void set_suspended(bool to)               { return Atomic::store(&_suspended, to); }
+  void set_suspended(bool to, bool register_vthread_SR);
   bool has_async_suspend_handshake()        { return _async_suspend_handshake; }
   void set_async_suspend_handshake(bool to) { _async_suspend_handshake = to; }
 
-  bool suspend();
-  bool resume();
+  bool suspend(bool register_vthread_SR);
+  bool resume(bool register_vthread_SR);
 };
 
 #endif // SHARE_RUNTIME_HANDSHAKE_HPP
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 8a6da52d762..9f5dd07c4dc 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1193,7 +1193,7 @@ void JavaThread::set_is_VTMS_transition_disabler(bool val) {
 //   - Target thread will not execute any new bytecode.
 //   - Target thread will not enter any new monitors.
 //
-bool JavaThread::java_suspend() {
+bool JavaThread::java_suspend(bool register_vthread_SR) {
 #if INCLUDE_JVMTI
   // Suspending a JavaThread in VTMS transition or disabling VTMS transitions can cause deadlocks.
   assert(!is_in_VTMS_transition(), "no suspend allowed in VTMS transition");
@@ -1202,13 +1202,13 @@ bool JavaThread::java_suspend() {
 
   guarantee(Thread::is_JavaThread_protected(/* target */ this),
             "target JavaThread is not protected in calling context.");
-  return this->handshake_state()->suspend();
+  return this->handshake_state()->suspend(register_vthread_SR);
 }
 
-bool JavaThread::java_resume() {
+bool JavaThread::java_resume(bool register_vthread_SR) {
   guarantee(Thread::is_JavaThread_protected_by_TLH(/* target */ this),
             "missing ThreadsListHandle in calling context.");
-  return this->handshake_state()->resume();
+  return this->handshake_state()->resume(register_vthread_SR);
 }
 
 // Wait for another thread to perform object reallocation and relocking on behalf of
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 01da26a97e8..8c62319f8dc 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -698,8 +698,8 @@ class JavaThread: public Thread {
 
   // Suspend/resume support for JavaThread
   // higher-level suspension/resume logic called by the public APIs
-  bool java_suspend();
-  bool java_resume();
+  bool java_suspend(bool register_vthread_SR);
+  bool java_resume(bool register_vthread_SR);
   bool is_suspended()     { return _handshake.is_suspended(); }
 
   // Check for async exception in addition to safepoint.
@@ -710,11 +710,11 @@ class JavaThread: public Thread {
   void wait_for_object_deoptimization();
 
 #if INCLUDE_JVMTI
-  inline void set_carrier_thread_suspended();
-  inline void clear_carrier_thread_suspended();
+  inline bool set_carrier_thread_suspended();
+  inline bool clear_carrier_thread_suspended();
 
   bool is_carrier_thread_suspended() const {
-    return _carrier_thread_suspended;
+    return Atomic::load(&_carrier_thread_suspended);
   }
 
   bool is_in_VTMS_transition() const             { return _is_in_VTMS_transition; }
diff --git a/src/hotspot/share/runtime/javaThread.inline.hpp b/src/hotspot/share/runtime/javaThread.inline.hpp
index f434fc161bb..de492fda50b 100644
--- a/src/hotspot/share/runtime/javaThread.inline.hpp
+++ b/src/hotspot/share/runtime/javaThread.inline.hpp
@@ -71,11 +71,11 @@ inline void JavaThread::clear_obj_deopt_flag() {
 }
 
 #if INCLUDE_JVMTI
-inline void JavaThread::set_carrier_thread_suspended() {
-  _carrier_thread_suspended = true;
+inline bool JavaThread::set_carrier_thread_suspended() {
+  return Atomic::cmpxchg(&_carrier_thread_suspended, false, true) == false;
 }
-inline void JavaThread::clear_carrier_thread_suspended() {
-  _carrier_thread_suspended = false;
+inline bool JavaThread::clear_carrier_thread_suspended() {
+  return Atomic::cmpxchg(&_carrier_thread_suspended, true, false) == true;
 }
 #endif
 
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 8cb239636d2..74df0fa9188 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -50,6 +50,7 @@ Monitor* JNICritical_lock             = nullptr;
 Mutex*   JvmtiThreadState_lock        = nullptr;
 Monitor* EscapeBarrier_lock           = nullptr;
 Monitor* JvmtiVTMSTransition_lock     = nullptr;
+Mutex*   JvmtiVThreadSuspend_lock     = nullptr;
 Monitor* Heap_lock                    = nullptr;
 #if INCLUDE_PARALLELGC
 Mutex*   PSOldGenExpand_lock      = nullptr;
@@ -260,6 +261,7 @@ void mutex_init() {
   MUTEX_DEFN(DirectivesStack_lock            , PaddedMutex  , nosafepoint);
 
   MUTEX_DEFN(JvmtiVTMSTransition_lock        , PaddedMonitor, safepoint);   // used for Virtual Thread Mount State transition management
+  MUTEX_DEFN(JvmtiVThreadSuspend_lock        , PaddedMutex,   nosafepoint-1);
   MUTEX_DEFN(EscapeBarrier_lock              , PaddedMonitor, nosafepoint); // Used to synchronize object reallocation/relocking triggered by JVMTI
   MUTEX_DEFN(Management_lock                 , PaddedMutex  , safepoint);   // used for JVM management
 
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index c307f70ba80..b21a738c8ff 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -48,6 +48,7 @@ extern Monitor* JNICritical_lock;                // a lock used while synchroniz
 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
+extern Mutex*   JvmtiVThreadSuspend_lock;        // a lock for virtual threads suspension
 extern Monitor* Heap_lock;                       // a lock on the heap
 #if INCLUDE_PARALLELGC
 extern Mutex*   PSOldGenExpand_lock;         // a lock on expanding the heap
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index c5b24475107..94c957f77b9 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -108,7 +108,6 @@ gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
 # :hotspot_runtime
 
 runtime/jni/terminatedThread/TestTerminatedThread.java 8317789 aix-ppc64
-runtime/handshake/HandshakeSuspendExitTest.java 8294313 generic-all
 runtime/Monitor/SyncOnValueBasedClassTest.java 8340995 linux-s390x
 runtime/os/TestTracePageSizes.java#no-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#explicit-large-page-size 8267460 linux-aarch64

From cbbab07d232ff7d46f91b2df4e1b0ef4f37bba95 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 6 May 2025 23:40:48 +0000
Subject: [PATCH 306/901] 8356309: Fix issues uncovered after running jpackage
 tests locally with installing test packages

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/LinuxHelper.java        | 10 +--
 .../jdk/jpackage/test/PackageTest.java        | 51 ++++++++++------
 .../internal/util/PListReaderTest.java        |  8 +--
 .../jpackage/internal/util/PathGroupTest.java |  1 +
 .../tools/jpackage/share/EmptyFolderTest.java | 11 +++-
 .../jpackage/share/RuntimeImageTest.java      | 61 +++++++++++++------
 .../jpackage/share/RuntimePackageTest.java    | 17 +++---
 7 files changed, 101 insertions(+), 58 deletions(-)

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 b5786a5065a..1669d1f8233 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -533,7 +533,7 @@ static void addFileAssociationsVerifier(PackageTest test, FileAssociations fa) {
                 TKit.assertEquals(fa.getMime(), mimeType, String.format(
                         "Check mime type of [%s] file", testFile));
 
-                String desktopFileName = queryMimeTypeDefaultHandler(mimeType);
+                String desktopFileName = queryMimeTypeDefaultHandler(mimeType).orElse(null);
 
                 Path systemDesktopFile = getSystemDesktopFilesFolder().resolve(
                         desktopFileName);
@@ -557,7 +557,7 @@ static void addFileAssociationsVerifier(PackageTest test, FileAssociations fa) {
                 TKit.assertNotEquals(fa.getMime(), mimeType, String.format(
                         "Check mime type of [%s] file", testFile));
 
-                String desktopFileName = queryMimeTypeDefaultHandler(fa.getMime());
+                String desktopFileName = queryMimeTypeDefaultHandler(fa.getMime()).orElse(null);
 
                 TKit.assertNull(desktopFileName, String.format(
                         "Check there is no default handler for [%s] mime type",
@@ -584,9 +584,9 @@ private static String queryFileMimeType(Path file) {
                 .executeAndGetFirstLineOfOutput();
     }
 
-    private static String queryMimeTypeDefaultHandler(String mimeType) {
+    private static Optional<String> queryMimeTypeDefaultHandler(String mimeType) {
         return Executor.of("xdg-mime", "query", "default", mimeType)
-                .executeAndGetFirstLineOfOutput();
+                .discardStderr().saveFirstLineOfOutput().execute().findFirstLineOfOutput();
     }
 
     private static void verifyIconInScriptlet(Scriptlet scriptletType,
@@ -708,7 +708,7 @@ private static enum Scriptlet {
 
         static final Map<String, Scriptlet> RPM_MAP = Stream.of(values()).collect(
                 Collectors.toMap(v -> v.rpm, v -> v));
-    };
+    }
 
     public static String getDefaultPackageArch(PackageType type) {
         if (archs == null) {
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 fd26b4a5368..c1739b9095a 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -42,7 +42,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -365,27 +364,37 @@ public PackageTest addHelloAppInitializer(String javaAppDesc) {
 
     public static class Group extends RunnablePackageTest {
         public Group(PackageTest... tests) {
-            handlers = Stream.of(tests)
-                    .map(PackageTest::createPackageTypeHandlers)
-                    .flatMap(List<Consumer<Action>>::stream)
-                    .collect(Collectors.toUnmodifiableList());
+            typeHandlers = Stream.of(PackageType.values()).map(type -> {
+                return Map.entry(type, Stream.of(tests).map(test -> {
+                    return test.createPackageTypeHandler(type);
+                }).filter(Optional::isPresent).map(Optional::orElseThrow).toList());
+            }).filter(e -> {
+                return !e.getValue().isEmpty();
+            }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         }
 
         @Override
         protected void runAction(Action... action) {
-            if (Set.of(action).contains(Action.UNINSTALL)) {
-                ListIterator<Consumer<Action>> listIterator = handlers.listIterator(
-                        handlers.size());
+            typeHandlers.entrySet().stream()
+                    .sorted(Comparator.comparing(Map.Entry::getKey))
+                    .map(Map.Entry::getValue).forEachOrdered(handlers -> {
+                        runAction(handlers, List.of(action));
+                    });
+        }
+
+        private static void runAction(List<Consumer<Action>> handlers, List<Action> actions) {
+            if (actions.contains(Action.UNINSTALL)) {
+                final var listIterator = handlers.listIterator(handlers.size());
                 while (listIterator.hasPrevious()) {
-                    var handler = listIterator.previous();
-                    List.of(action).forEach(handler::accept);
+                    final var handler = listIterator.previous();
+                    actions.forEach(handler::accept);
                 }
             } else {
-                handlers.forEach(handler -> List.of(action).forEach(handler::accept));
+                handlers.forEach(handler -> actions.forEach(handler::accept));
             }
         }
 
-        private final List<Consumer<Action>> handlers;
+        private final Map<PackageType, List<Consumer<Action>>> typeHandlers;
     }
 
     PackageTest packageHandlers(PackageHandlers v) {
@@ -455,16 +464,22 @@ protected void runAction(Action... action) {
         throw new UnsupportedOperationException();
     }
 
+    private Optional<Consumer<Action>> createPackageTypeHandler(PackageType type) {
+        Objects.requireNonNull(type);
+        return Optional.ofNullable(handlers.get(type)).filter(Predicate.not(Handler::isVoid)).map(h -> {
+            return createPackageTypeHandler(type, h);
+        });
+    }
+
     private List<Consumer<Action>> createPackageTypeHandlers() {
         if (handlers.keySet().stream().noneMatch(isPackageTypeEnabled)) {
             PackageType.throwSkippedExceptionIfNativePackagingUnavailable();
         }
-        return handlers.entrySet().stream()
-                .filter(entry -> !entry.getValue().isVoid())
-                .sorted(Comparator.comparing(Map.Entry::getKey))
-                .map(entry -> {
-                    return  createPackageTypeHandler(entry.getKey(), entry.getValue());
-                }).toList();
+        return Stream.of(PackageType.values()).sorted()
+                .map(this::createPackageTypeHandler)
+                .filter(Optional::isPresent)
+                .map(Optional::orElseThrow)
+                .toList();
     }
 
     private record PackageTypePipeline(PackageType type, int expectedJPackageExitCode,
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PListReaderTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PListReaderTest.java
index bae4921fda3..d766505cf14 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PListReaderTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PListReaderTest.java
@@ -51,7 +51,7 @@ public class PListReaderTest {
     enum QueryType {
         STRING(PListReader::queryValue),
         BOOLEAN(PListReader::queryBoolValue),
-        STRING_ARRY(PListReader::queryArrayValue);
+        STRING_ARRAY(PListReader::queryArrayValue);
 
         QueryType(BiFunction<PListReader, String, ?> queryMethod) {
             this.queryMethod = Objects.requireNonNull(queryMethod);
@@ -98,7 +98,7 @@ Builder expectedValue(Object v) {
                 } else if (v instanceof Boolean) {
                     queryType(QueryType.BOOLEAN);
                 } else if (v instanceof List<?>) {
-                    queryType(QueryType.STRING_ARRY);
+                    queryType(QueryType.STRING_ARRAY);
                 }
                 return this;
             }
@@ -196,7 +196,7 @@ public void testWrongValueType(QueryType queryType) {
                 testSpecs.add(builder.keyName("string-key").create());
                 testSpecs.add(builder.keyName("array-key").create());
             }
-            case STRING_ARRY -> {
+            case STRING_ARRAY -> {
                 testSpecs.add(builder.keyName("string-key").create());
                 testSpecs.add(builder.keyName("boolean-true-key").create());
                 testSpecs.add(builder.keyName("boolean-false-key").create());
@@ -230,7 +230,7 @@ private static List<QueryValueTestSpec> testQueryValue() {
                 testSpec(QueryType.BOOLEAN).xml("<key>foo</key><False/>").create(),
                 testSpec().expectedValue(List.of("foo", "bar")).xml("<key>foo</key><array><string>foo</string><string>bar</string></array>").create(),
                 testSpec().expectedValue(List.of()).xml("<key>foo</key><array/>").create(),
-                testSpec(QueryType.STRING_ARRY).xml("<key>foo</key><Array/>").create(),
+                testSpec(QueryType.STRING_ARRAY).xml("<key>foo</key><Array/>").create(),
                 testSpec().expectedValue("A").xml("<key>foo</key><string>A</string><string>B</string>").create(),
                 testSpec().expectedValue("A").xml("<key>foo</key><string>A</string><key>foo</key><string>B</string>").create()
         );
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
index c46dbb148de..579cf5f083c 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/PathGroupTest.java
@@ -60,6 +60,7 @@
 
 public class PathGroupTest {
 
+    @Test
     public void testNullId() {
         assertThrowsExactly(NullPointerException.class, () -> new PathGroup(Map.of()).getPath(null));
     }
diff --git a/test/jdk/tools/jpackage/share/EmptyFolderTest.java b/test/jdk/tools/jpackage/share/EmptyFolderTest.java
index 40a4db03d6f..f2cb72e097d 100644
--- a/test/jdk/tools/jpackage/share/EmptyFolderTest.java
+++ b/test/jdk/tools/jpackage/share/EmptyFolderTest.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
@@ -97,16 +97,21 @@ private static void createDirTree(JPackageCommand cmd) throws IOException {
     }
 
     private static void validateDirTree(JPackageCommand cmd) {
+        // When MSI package is unpacked and not installed, empty directories are not created.
+        final boolean emptyDirSupported = !(PackageType.WINDOWS.contains(cmd.packageType()) && cmd.isPackageUnpacked());
+        validateDirTree(cmd, emptyDirSupported);
+    }
+
+    private static void validateDirTree(JPackageCommand cmd, boolean emptyDirSupported) {
         var outputBaseDir = cmd.appLayout().appDirectory();
         var inputBaseDir = cmd.inputDir();
         for (var path : DIR_STRUCT) {
             Path outputPath = outputBaseDir.resolve(path);
             if (isFile(outputPath)) {
                 TKit.assertFileExists(outputPath);
-            } else if (!PackageType.WINDOWS.contains(cmd.packageType())) {
+            } else if (emptyDirSupported) {
                 TKit.assertDirectoryExists(outputPath);
             } else if (inputBaseDir.resolve(path).toFile().list().length == 0) {
-                // MSI packages don't support empty folders
                 TKit.assertPathExists(outputPath, false);
             } else {
                 TKit.assertDirectoryNotEmpty(outputPath);
diff --git a/test/jdk/tools/jpackage/share/RuntimeImageTest.java b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
index 0e30d7ee179..6ed38f2c5c1 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
@@ -21,13 +21,14 @@
  * questions.
  */
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JavaTool;
-import jdk.jpackage.test.Executor;
+import jdk.jpackage.test.TKit;
 
 /*
  * @test
@@ -43,27 +44,49 @@
 public class RuntimeImageTest {
 
     @Test
-    public static void test() throws Exception {
-        final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
-        final Path jlinkOutputDir = workDir.resolve("temp.runtime");
-        Files.createDirectories(jlinkOutputDir.getParent());
+    public static void test() throws IOException {
+
+        JPackageCommand cmd = JPackageCommand.helloAppImage();
+
+        if (JPackageCommand.DEFAULT_RUNTIME_IMAGE == null) {
+            final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
+            final Path jlinkOutputDir = workDir.resolve("temp.runtime");
+            Files.createDirectories(jlinkOutputDir.getParent());
 
-        new Executor()
-        .setToolProvider(JavaTool.JLINK)
-        .dumpOutput()
-        .addArguments(
-                "--output", jlinkOutputDir.toString(),
-                "--add-modules", "java.desktop",
-                "--strip-debug",
-                "--no-header-files",
-                "--no-man-pages",
-                "--strip-native-commands")
-        .execute();
+            new Executor()
+            .setToolProvider(JavaTool.JLINK)
+            .dumpOutput()
+            .addArguments(
+                    "--output", jlinkOutputDir.toString(),
+                    "--add-modules", "java.desktop",
+                    "--strip-debug",
+                    "--no-header-files",
+                    "--no-man-pages",
+                    "--strip-native-commands")
+            .execute();
 
-        JPackageCommand cmd = JPackageCommand.helloAppImage()
-            .setArgumentValue("--runtime-image", jlinkOutputDir.toString());
+            cmd.setArgumentValue("--runtime-image", jlinkOutputDir.toString());
+        }
 
         cmd.executeAndAssertHelloAppImageCreated();
     }
 
+    @Test
+    public static void testStrippedFiles() throws IOException {
+        final var cmd = JPackageCommand.helloAppImage().setFakeRuntime();
+
+        final var runtimePath = Path.of(cmd.executePrerequisiteActions().getArgumentValue("--runtime-image"));
+
+        Files.createDirectories(runtimePath.resolve("jmods"));
+        Files.createDirectories(runtimePath.resolve("lib"));
+        Files.createFile(runtimePath.resolve("lib/src.zip"));
+        Files.createFile(runtimePath.resolve("src.zip"));
+
+        (new JPackageCommand()).addArguments(cmd.getAllArguments()).executeAndAssertHelloAppImageCreated();
+
+        final var appRuntimeDir = cmd.appLayout().runtimeHomeDirectory();
+        TKit.assertPathExists(appRuntimeDir.resolve("jmods"), false);
+        TKit.assertPathExists(appRuntimeDir.resolve("lib/src.zip"), false);
+        TKit.assertPathExists(appRuntimeDir.resolve("src.zip"), false);
+    }
 }
diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index 9eb4f8d231e..2af6543c2db 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -40,6 +40,7 @@
 import jdk.jpackage.test.LinuxHelper;
 import static jdk.jpackage.test.TKit.assertTrue;
 import static jdk.jpackage.test.TKit.assertFalse;
+import static jdk.internal.util.OperatingSystem.LINUX;
 
 /**
  * Test --runtime-image parameter.
@@ -81,22 +82,22 @@ public class RuntimePackageTest {
 
     @Test
     public static void test() {
-        init(PackageType.NATIVE).run();
+        init().run();
     }
 
-    @Test
+    @Test(ifOS = LINUX)
     @Parameter("/usr")
     @Parameter("/usr/lib/Java")
     public static void testUsrInstallDir(String installDir) {
-        init(PackageType.LINUX)
-        .addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr"))
+        init()
+        .addInitializer(cmd -> cmd.addArguments("--install-dir", installDir))
         .run();
     }
 
     @Test
     public static void testName() {
         // Test that jpackage can derive package name from the path to runtime image.
-        init(PackageType.NATIVE)
+        init()
         .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`
@@ -105,9 +106,8 @@ public static void testName() {
         .run(Action.CREATE_AND_UNPACK);
     }
 
-    private static PackageTest init(Set<PackageType> types) {
+    private static PackageTest init() {
         return new PackageTest()
-        .forTypes(types)
         .addInitializer(cmd -> {
             final Path runtimeImageDir;
 
@@ -166,8 +166,7 @@ private static PackageTest init(Set<PackageType> types) {
                         "Check the package doesn't deliver [%s] copyright file",
                         copyright));
             }
-        })
-        .forTypes(types);
+        });
     }
 
     private static Set<Path> listFiles(Path root) throws IOException {

From acad0b4968f931a00664f18fd22ee97fdb001099 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dzhang@openjdk.org>
Date: Wed, 7 May 2025 00:58:19 +0000
Subject: [PATCH 307/901] 8356188: RISC-V: Cleanup effect of vmaskcmp_fp

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

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 58c78874797..34b7268b137 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -251,7 +251,6 @@ instruct vmaskcmp_fp(vRegMask dst, vReg src1, vReg src2, immI cond) %{
   predicate(Matcher::vector_element_basic_type(n) == T_FLOAT ||
             Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst (VectorMaskCmp (Binary src1 src2) cond));
-  effect(TEMP_DEF dst);
   format %{ "vmaskcmp_fp $dst, $src1, $src2, $cond" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);

From 762423d64d10dcdb37800767d2b2f1b7757c804a Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 7 May 2025 02:54:41 +0000
Subject: [PATCH 308/901] 8355561: [macos] Build failure with Xcode 16.3

Reviewed-by: kizune, prr
---
 .../libjsound/PLATFORM_API_MacOSX_Ports.cpp   | 83 ++++++++++++++-----
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
index bf4f2e143a0..ae0ffa5f2ca 100644
--- a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
+++ b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, 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
@@ -124,9 +124,12 @@ OSStatus ChangeListenerProc(AudioObjectID inObjectID, UInt32 inNumberAddresses,
                 kAudioHardwarePropertyDevices, &size);
             if (err == noErr) {
                 int count = size/sizeof(AudioDeviceID);
-                AudioDeviceID devices[count];
+                AudioDeviceID *devices = (AudioDeviceID *) malloc(size);
+                if (!devices) {
+                    break;
+                }
                 err = GetAudioObjectProperty(kAudioObjectSystemObject, kAudioObjectPropertyScopeGlobal,
-                    kAudioHardwarePropertyDevices, count*sizeof(AudioDeviceID), devices, 1);
+                    kAudioHardwarePropertyDevices, size, devices, 1);
                 if (err == noErr) {
                     bool found = false;
                     for (int j = 0; j < count; j++) {
@@ -139,6 +142,7 @@ OSStatus ChangeListenerProc(AudioObjectID inObjectID, UInt32 inNumberAddresses,
                         invalid = true;
                     }
                 }
+                free(devices);
             }
             break;
         case kAudioObjectPropertyOwnedObjects:
@@ -148,9 +152,12 @@ OSStatus ChangeListenerProc(AudioObjectID inObjectID, UInt32 inNumberAddresses,
                 kAudioObjectPropertyOwnedObjects, &size);
             if (err == noErr) {
                 int count = size / sizeof(AudioObjectID);
-                AudioObjectID controlIDs[count];
+                AudioObjectID *controlIDs = (AudioObjectID *) malloc(size);
+                if (!controlIDs) {
+                    break;
+                }
                 err = GetAudioObjectProperty(mixer->deviceID, kAudioObjectPropertyScopeGlobal,
-                    kAudioObjectPropertyOwnedObjects, count * sizeof(AudioObjectID), &controlIDs, 1);
+                    kAudioObjectPropertyOwnedObjects, size, controlIDs, 1);
                 if (err == noErr) {
                     for (PortControl *ctrl = mixer->portControls; ctrl != NULL; ctrl = ctrl->next) {
                         for (int i = 0; i < ctrl->controlCount; i++) {
@@ -168,6 +175,7 @@ OSStatus ChangeListenerProc(AudioObjectID inObjectID, UInt32 inNumberAddresses,
                         }
                     }
                 }
+                free(controlIDs);
             }
         }
     }
@@ -229,6 +237,9 @@ INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* mixer
 void* PORT_Open(INT32 mixerIndex) {
     TRACE1("\n>>PORT_Open (mixerIndex=%d)\n", (int)mixerIndex);
     PortMixer *mixer = (PortMixer *)calloc(1, sizeof(PortMixer));
+    if (!mixer) {
+        return nullptr;
+    }
 
     mixer->deviceID = deviceCache.GetDeviceID(mixerIndex);
     if (mixer->deviceID != 0) {
@@ -480,16 +491,20 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
             mixer->deviceControlCount = size / sizeof(AudioObjectID);
             TRACE1("  PORT_GetControls: detected %d owned objects\n", mixer->deviceControlCount);
 
-            AudioObjectID controlIDs[mixer->deviceControlCount];
+            AudioObjectID *controlIDs = (AudioObjectID *) malloc(size);
+            if (!controlIDs) {
+                return;
+            }
 
             err = GetAudioObjectProperty(mixer->deviceID, kAudioObjectPropertyScopeGlobal,
-                kAudioObjectPropertyOwnedObjects, sizeof(controlIDs), controlIDs, 1);
+                kAudioObjectPropertyOwnedObjects, size, controlIDs, 1);
 
             if (err) {
                 OS_ERROR1(err, "PORT_GetControls (portIndex = %d) get OwnedObject values", portIndex);
             } else {
                 mixer->deviceControls = (AudioControl *)calloc(mixer->deviceControlCount, sizeof(AudioControl));
                 if (mixer->deviceControls == NULL) {
+                    free(controlIDs);
                     return;
                 }
 
@@ -513,6 +528,7 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
                         control->controlID, FourCC2Str(control->classID), FourCC2Str(control->scope), control->channel);
                 }
             }
+            free(controlIDs);
         }
     }
 
@@ -524,10 +540,14 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
     int totalChannels = GetChannelCount(mixer->deviceID, port->scope == kAudioDevicePropertyScopeOutput ? 1 : 0);
 
     // collect volume and mute controls
-    AudioControl* volumeControls[totalChannels+1];  // 0 - for master channel
-    memset(&volumeControls, 0, sizeof(AudioControl *) * (totalChannels+1));
-    AudioControl* muteControls[totalChannels+1];  // 0 - for master channel
-    memset(&muteControls, 0, sizeof(AudioControl *) * (totalChannels+1));
+    size_t totalAndMaster = totalChannels + 1; // 0 - for master channel
+    AudioControl **volumeControls = (AudioControl **) calloc(totalAndMaster, sizeof(AudioControl *));
+    AudioControl **muteControls = (AudioControl **) calloc(totalAndMaster, sizeof(AudioControl *));
+    if (!volumeControls || !muteControls) {
+        free(muteControls);
+        free(volumeControls);
+        return;
+    }
 
     for (int i=0; i<mixer->deviceControlCount; i++) {
         AudioControl *control = &mixer->deviceControls[i];
@@ -626,6 +646,8 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
                     CFIndex length = CFStringGetLength(cfname) + 1;
                     channelName = (char *)malloc(length);
                     if (channelName == NULL) {
+                        free(muteControls);
+                        free(volumeControls);
                         return;
                     }
                     CFStringGetCString(cfname, channelName, length, kCFStringEncodingUTF8);
@@ -633,6 +655,8 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
                 } else {
                     channelName = (char *)malloc(16);
                     if (channelName == NULL) {
+                        free(muteControls);
+                        free(volumeControls);
                         return;
                     }
                     snprintf(channelName, 16, "Ch %d", ch);
@@ -657,7 +681,8 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
     }
 
     AddChangeListeners(mixer);
-
+    free(muteControls);
+    free(volumeControls);
     TRACE1("<<PORT_GetControls (portIndex = %d)\n", portIndex);
 }
 
@@ -772,28 +797,35 @@ float PORT_GetFloatValue(void* controlIDV) {
     PortControl *control = (PortControl *)controlIDV;
     Float32 result = 0;
 
-    Float32 subVolumes[control->controlCount];
+    Float32 *subVolumes = (Float32 *) malloc(control->controlCount * sizeof(Float32));
+    if (!subVolumes) {
+        return DEFAULT_VOLUME_VALUE;
+    }
     Float32 maxVolume;
 
     switch (control->type) {
     case PortControl::Volume:
         if (!TestPortControlValidity(control)) {
-            return DEFAULT_VOLUME_VALUE;
+            result = DEFAULT_VOLUME_VALUE;
+            break;
         }
 
         if (!GetPortControlVolumes(control, subVolumes, &maxVolume)) {
-            return DEFAULT_VOLUME_VALUE;
+            result = DEFAULT_VOLUME_VALUE;
+            break;
         }
         result = maxVolume;
         break;
     case PortControl::Balance:
         if (!TestPortControlValidity(control)) {
-            return DEFAULT_BALANCE_VALUE;
+            result = DEFAULT_BALANCE_VALUE;
+            break;
         }
 
         // balance control always has 2 volume controls
         if (!GetPortControlVolumes(control, subVolumes, &maxVolume)) {
-            return DEFAULT_VOLUME_VALUE;
+            result = DEFAULT_VOLUME_VALUE;
+            break;
         }
         // calculate balance value
         if (subVolumes[0] > subVolumes[1]) {
@@ -806,9 +838,10 @@ float PORT_GetFloatValue(void* controlIDV) {
         break;
     default:
         ERROR1("GetFloatValue requested for non-Float control (control-type == %d)\n", control->type);
-        return 0;
+        result = 0;
+        break;
     }
-
+    free(subVolumes);
     TRACE1("<<PORT_GetFloatValue = %f\n", result);
     return result;
 }
@@ -821,13 +854,16 @@ void PORT_SetFloatValue(void* controlIDV, float value) {
         return;
     }
 
-    Float32 subVolumes[control->controlCount];
+    Float32 *subVolumes = (Float32 *) malloc(sizeof(Float32) * control->controlCount);
+    if (!subVolumes) {
+        return;
+    }
     Float32 maxVolume;
 
     switch (control->type) {
     case PortControl::Volume:
         if (!GetPortControlVolumes(control, subVolumes, &maxVolume)) {
-            return;
+            break;
         }
         // update the values
         if (maxVolume > 0.001) {
@@ -845,7 +881,7 @@ void PORT_SetFloatValue(void* controlIDV, float value) {
     case PortControl::Balance:
         // balance control always has 2 volume controls
         if (!GetPortControlVolumes(control, subVolumes, &maxVolume)) {
-            return;
+            break;
         }
         // calculate new values
         if (value < 0.0f) {
@@ -861,8 +897,9 @@ void PORT_SetFloatValue(void* controlIDV, float value) {
         break;
     default:
         ERROR1("PORT_SetFloatValue requested for non-Float control (control-type == %d)\n", control->type);
-        return;
+        break;
     }
+    free(subVolumes);
 }
 
 #endif // USE_PORTS

From 0eb680ca463e8df20f058d2c0a09ed7006faa353 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Wed, 7 May 2025 04:12:56 +0000
Subject: [PATCH 309/901] 8350308: [s390x] Relativize last_sp (and
 top_frame_sp) in interpreter frames

Reviewed-by: lucy, rrich
---
 src/hotspot/cpu/s390/frame_s390.inline.hpp                 | 7 +++++--
 src/hotspot/cpu/s390/interp_masm_s390.cpp                  | 5 ++++-
 src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index b033b3f939b..ede7039ce0a 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -203,11 +203,14 @@ inline intptr_t* frame::interpreter_frame_expression_stack() const {
 // Also begin is one past last monitor.
 
 inline intptr_t* frame::interpreter_frame_top_frame_sp() {
-  return (intptr_t*)ijava_state()->top_frame_sp;
+  intptr_t n = *addr_at(_z_ijava_idx(top_frame_sp));
+  return &fp()[n]; // return relativized locals
 }
 
 inline void frame::interpreter_frame_set_top_frame_sp(intptr_t* top_frame_sp) {
-  ijava_state()->top_frame_sp = (intptr_t) top_frame_sp;
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  // set relativized top_frame_sp
+  ijava_state()->top_frame_sp = (intptr_t) (top_frame_sp - fp());
 }
 
 inline void frame::interpreter_frame_set_sender_sp(intptr_t* sender_sp) {
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index a7bea358f4e..9717d260279 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -576,7 +576,10 @@ void InterpreterMacroAssembler::prepare_to_jump_from_interpreted(Register method
   // Satisfy interpreter calling convention (see generate_normal_entry()).
   z_lgr(Z_R10, Z_SP); // Set sender sp (aka initial caller sp, aka unextended sp).
   // Record top_frame_sp, because the callee might modify it, if it's compiled.
-  z_stg(Z_SP, _z_ijava_state_neg(top_frame_sp), Z_fp);
+  assert_different_registers(Z_R1, method);
+  z_sgrk(Z_R1, Z_SP, Z_fp);
+  z_srag(Z_R1, Z_R1, Interpreter::logStackElementSize);
+  z_stg(Z_R1, _z_ijava_state_neg(top_frame_sp), Z_fp);
   save_bcp();
   save_esp();
   z_lgr(Z_method, method); // Set Z_method (kills Z_fp!).
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 4edf8046833..04fe574088e 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -637,6 +637,8 @@ address TemplateInterpreterGenerator::generate_return_entry_for (TosState state,
   Register sp_before_i2c_extension = Z_bcp;
   __ z_lg(Z_fp, _z_abi(callers_sp), Z_SP); // Restore frame pointer.
   __ z_lg(sp_before_i2c_extension, Address(Z_fp, _z_ijava_state_neg(top_frame_sp)));
+  __ z_slag(sp_before_i2c_extension, sp_before_i2c_extension, Interpreter::logStackElementSize);
+  __ z_agr(sp_before_i2c_extension, Z_fp);
   __ resize_frame_absolute(sp_before_i2c_extension, Z_locals/*tmp*/, true/*load_fp*/);
 
   // TODO(ZASM): necessary??

From 4e3ec3c04c1c60404b9ec7d5524eaceab6472b67 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Wed, 7 May 2025 05:36:00 +0000
Subject: [PATCH 310/901] 8356208: Remove obsolete code in PSPrinterJob for
 plugin printing

Reviewed-by: serb
---
 .../share/classes/sun/print/PSPrinterJob.java | 377 +++---------------
 1 file changed, 61 insertions(+), 316 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
index 7404c6c3948..03fdb532b71 100644
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
@@ -127,24 +127,6 @@ public class PSPrinterJob extends RasterPrinterJob {
      */
     private static final int MAX_PSSTR = (1024 * 64 - 1);
 
-    private static final int RED_MASK = 0x00ff0000;
-    private static final int GREEN_MASK = 0x0000ff00;
-    private static final int BLUE_MASK = 0x000000ff;
-
-    private static final int RED_SHIFT = 16;
-    private static final int GREEN_SHIFT = 8;
-    private static final int BLUE_SHIFT = 0;
-
-    private static final int LOWNIBBLE_MASK = 0x0000000f;
-    private static final int HINIBBLE_MASK =  0x000000f0;
-    private static final int HINIBBLE_SHIFT = 4;
-    private static final byte[] hexDigits = {
-        (byte)'0', (byte)'1', (byte)'2', (byte)'3',
-        (byte)'4', (byte)'5', (byte)'6', (byte)'7',
-        (byte)'8', (byte)'9', (byte)'A', (byte)'B',
-        (byte)'C', (byte)'D', (byte)'E', (byte)'F'
-    };
-
     private static final int PS_XRES = 300;
     private static final int PS_YRES = 300;
 
@@ -267,14 +249,6 @@ public class PSPrinterJob extends RasterPrinterJob {
    private double xres = PS_XRES;
    private double yres = PS_YRES;
 
-   /* non-null if printing EPS for Java Plugin */
-   private EPSPrinter epsPrinter = null;
-
-   /**
-    * The metrics for the font currently set.
-    */
-   FontMetrics mCurMetrics;
-
    /**
     * The output stream to which the generated PostScript
     * is written.
@@ -513,46 +487,43 @@ protected void startDoc() throws PrinterException {
 
         OutputStream output = null;
 
-        if (epsPrinter == null) {
-            if (getPrintService() instanceof PSStreamPrintService) {
-                StreamPrintService sps = (StreamPrintService)getPrintService();
-                mDestType = RasterPrinterJob.STREAM;
-                if (sps.isDisposed()) {
-                    throw new PrinterException("service is disposed");
-                }
-                output = sps.getOutputStream();
-                if (output == null) {
-                    throw new PrinterException("Null output stream");
+        if (getPrintService() instanceof PSStreamPrintService) {
+            StreamPrintService sps = (StreamPrintService)getPrintService();
+            mDestType = RasterPrinterJob.STREAM;
+            if (sps.isDisposed()) {
+                throw new PrinterException("service is disposed");
+            }
+            output = sps.getOutputStream();
+            if (output == null) {
+                throw new PrinterException("Null output stream");
+            }
+        } else {
+            /* REMIND: This needs to be more maintainable */
+            mNoJobSheet = super.noJobSheet;
+            if (super.destinationAttr != null) {
+                mDestType = RasterPrinterJob.FILE;
+                mDestination = super.destinationAttr;
+            }
+            if (mDestType == RasterPrinterJob.FILE) {
+                try {
+                    spoolFile = new File(mDestination);
+                    output = new FileOutputStream(spoolFile);
+                } catch (IOException ex) {
+                    abortDoc();
+                    throw new PrinterIOException(ex);
                 }
             } else {
-                /* REMIND: This needs to be more maintainable */
-                mNoJobSheet = super.noJobSheet;
-                if (super.destinationAttr != null) {
-                    mDestType = RasterPrinterJob.FILE;
-                    mDestination = super.destinationAttr;
-                }
-                if (mDestType == RasterPrinterJob.FILE) {
-                    try {
-                        spoolFile = new File(mDestination);
-                        output =  new FileOutputStream(spoolFile);
-                    } catch (IOException ex) {
-                        abortDoc();
-                        throw new PrinterIOException(ex);
-                    }
-                } else {
-                    PrinterOpener po = new PrinterOpener();
-                    po.run();
-                    if (po.pex != null) {
-                        throw po.pex;
-                    }
-                    output = po.result;
+                PrinterOpener po = new PrinterOpener();
+                po.run();
+                if (po.pex != null) {
+                    throw po.pex;
                 }
+                output = po.result;
             }
-
-            mPSStream = new PrintStream(new BufferedOutputStream(output));
-            mPSStream.println(ADOBE_PS_STR);
         }
 
+        mPSStream = new PrintStream(new BufferedOutputStream(output));
+        mPSStream.println(ADOBE_PS_STR);
         mPSStream.println("%%BeginProlog");
         mPSStream.println(READIMAGEPROC);
         mPSStream.println("/BD {bind def} bind def");
@@ -619,45 +590,43 @@ protected void startDoc() throws PrinterException {
         mPSStream.println("%%EndProlog");
 
         mPSStream.println("%%BeginSetup");
-        if (epsPrinter == null) {
-            // Set Page Size using first page's format.
-            PageFormat pageFormat = getPageable().getPageFormat(0);
-            double paperHeight = pageFormat.getPaper().getHeight();
-            double paperWidth = pageFormat.getPaper().getWidth();
+        // Set Page Size using first page's format.
+        PageFormat pageFormat = getPageable().getPageFormat(0);
+        double paperHeight = pageFormat.getPaper().getHeight();
+        double paperWidth = pageFormat.getPaper().getWidth();
 
-            /* PostScript printers can always generate uncollated copies.
-             */
-            mPSStream.print("<< /PageSize [" +
-                                           paperWidth + " "+ paperHeight+"]");
+        /* PostScript printers can always generate uncollated copies.
+         */
+        mPSStream.print("<< /PageSize [" +
+                                       paperWidth + " "+ paperHeight+"]");
 
-            final PrintService pservice = getPrintService();
-            Boolean isPS = Boolean.TRUE;
-            try {
-                Class<?> psClass = Class.forName("sun.print.IPPPrintService");
-                if (psClass.isInstance(pservice)) {
-                    Method isPSMethod = psClass.getMethod("isPostscript",
-                                                          (Class[])null);
-                    isPS = (Boolean)isPSMethod.invoke(pservice, (Object[])null);
-                }
-            } catch (Throwable t) {
-            }
-            if (isPS) {
-                mPSStream.print(" /DeferredMediaSelection true");
+        final PrintService pservice = getPrintService();
+        Boolean isPS = Boolean.TRUE;
+        try {
+            Class<?> psClass = Class.forName("sun.print.IPPPrintService");
+            if (psClass.isInstance(pservice)) {
+                Method isPSMethod = psClass.getMethod("isPostscript",
+                                                      (Class[])null);
+                isPS = (Boolean)isPSMethod.invoke(pservice, (Object[])null);
             }
+        } catch (Throwable t) {
+        }
+        if (isPS) {
+            mPSStream.print(" /DeferredMediaSelection true");
+        }
 
-            mPSStream.print(" /ImagingBBox null /ManualFeed false");
-            mPSStream.print(isCollated() ? " /Collate true":"");
-            mPSStream.print(" /NumCopies " +getCopiesInt());
+        mPSStream.print(" /ImagingBBox null /ManualFeed false");
+        mPSStream.print(isCollated() ? " /Collate true":"");
+        mPSStream.print(" /NumCopies " +getCopiesInt());
 
-            if (sidesAttr != Sides.ONE_SIDED) {
-                if (sidesAttr == Sides.TWO_SIDED_LONG_EDGE) {
-                    mPSStream.print(" /Duplex true ");
-                } else if (sidesAttr == Sides.TWO_SIDED_SHORT_EDGE) {
-                    mPSStream.print(" /Duplex true /Tumble true ");
-                }
+        if (sidesAttr != Sides.ONE_SIDED) {
+            if (sidesAttr == Sides.TWO_SIDED_LONG_EDGE) {
+                mPSStream.print(" /Duplex true ");
+            } else if (sidesAttr == Sides.TWO_SIDED_SHORT_EDGE) {
+                mPSStream.print(" /Duplex true /Tumble true ");
             }
-            mPSStream.println(" >> setpagedevice ");
         }
+        mPSStream.println(" >> setpagedevice ");
         mPSStream.println("%%EndSetup");
     }
 
@@ -1175,36 +1144,6 @@ private int[] getPSFontIndexArray(Font font, CharsetString[] charSet) {
          return psFont;
      }
 
-
-    private static String escapeParens(String str) {
-        if (str.indexOf('(') == -1 && str.indexOf(')') == -1 ) {
-            return str;
-        } else {
-            int count = 0;
-            int pos = 0;
-            while ((pos = str.indexOf('(', pos)) != -1) {
-                count++;
-                pos++;
-            }
-            pos = 0;
-            while ((pos = str.indexOf(')', pos)) != -1) {
-                count++;
-                pos++;
-            }
-            char []inArr = str.toCharArray();
-            char []outArr = new char[inArr.length+count];
-            pos = 0;
-            for (int i=0;i<inArr.length;i++) {
-                if (inArr[i] == '(' || inArr[i] == ')') {
-                    outArr[pos++] = '\\';
-                }
-                outArr[pos++] = inArr[i];
-            }
-            return new String(outArr);
-
-        }
-    }
-
     /* return of 0 means unsupported. Other return indicates the number
      * of distinct PS fonts needed to draw this text. This saves us
      * doing this processing one extra time.
@@ -2099,198 +2038,4 @@ private byte[] ascii85Encode(byte[] inArr) {
         return retArr;
 
     }
-
-    /**
-     * PluginPrinter generates EPSF wrapped with a header and trailer
-     * comment. This conforms to the new requirements of Mozilla 1.7
-     * and FireFox 1.5 and later. Earlier versions of these browsers
-     * did not support plugin printing in the general sense (not just Java).
-     * A notable limitation of these browsers is that they handle plugins
-     * which would span page boundaries by scaling plugin content to fit on a
-     * single page. This means white space is left at the bottom of the
-     * previous page and its impossible to print these cases as they appear on
-     * the web page. This is contrast to how the same browsers behave on
-     * Windows where it renders as on-screen.
-     * Cases where the content fits on a single page do work fine, and they
-     * are the majority of cases.
-     * The scaling that the browser specifies to make the plugin content fit
-     * when it is larger than a single page can hold is non-uniform. It
-     * scales the axis in which the content is too large just enough to
-     * ensure it fits. For content which is extremely long this could lead
-     * to noticeable distortion. However that is probably rare enough that
-     * its not worth compensating for that here, but we can revisit that if
-     * needed, and compensate by making the scale for the other axis the
-     * same.
-     */
-    public static class PluginPrinter implements Printable {
-
-        private EPSPrinter epsPrinter;
-        private Component applet;
-        private PrintStream stream;
-        private String epsTitle;
-        private int bx, by, bw, bh;
-        private int width, height;
-
-        /**
-         * This is called from the Java Plug-in to print an Applet's
-         * contents as EPS to a postscript stream provided by the browser.
-         * @param applet the applet component to print.
-         * @param stream the print stream provided by the plug-in
-         * @param x the x location of the applet panel in the browser window
-         * @param y the y location of the applet panel in the browser window
-         * @param w the width of the applet panel in the browser window
-         * @param h the width of the applet panel in the browser window
-         */
-        @SuppressWarnings("deprecation")
-        public PluginPrinter(Component applet,
-                             PrintStream stream,
-                             int x, int y, int w, int h) {
-
-            this.applet = applet;
-            this.epsTitle = "Java Plugin Applet";
-            this.stream = stream;
-            bx = x;
-            by = y;
-            bw = w;
-            bh = h;
-            width = applet.size().width;
-            height = applet.size().height;
-            epsPrinter = new EPSPrinter(this, epsTitle, stream,
-                                        0, 0, width, height);
-        }
-
-        public void printPluginPSHeader() {
-            stream.println("%%BeginDocument: JavaPluginApplet");
-        }
-
-        public void printPluginApplet() {
-            try {
-                epsPrinter.print();
-            } catch (PrinterException e) {
-            }
-        }
-
-        public void printPluginPSTrailer() {
-            stream.println("%%EndDocument: JavaPluginApplet");
-            stream.flush();
-        }
-
-        public void printAll() {
-            printPluginPSHeader();
-            printPluginApplet();
-            printPluginPSTrailer();
-        }
-
-        public int print(Graphics g, PageFormat pf, int pgIndex) {
-            if (pgIndex > 0) {
-                return Printable.NO_SUCH_PAGE;
-            } else {
-                // "aware" client code can detect that its been passed a
-                // PrinterGraphics and could theoretically print
-                // differently. I think this is more likely useful than
-                // a problem.
-                applet.printAll(g);
-                return Printable.PAGE_EXISTS;
-            }
-        }
-
-    }
-
-    /*
-     * This class can take an application-client supplied printable object
-     * and send the result to a stream.
-     * The application does not need to send any postscript to this stream
-     * unless it needs to specify a translation etc.
-     * It assumes that its importing application obeys all the conventions
-     * for importation of EPS. See Appendix H - Encapsulated Postscript File
-     * Format - of the Adobe Postscript Language Reference Manual, 2nd edition.
-     * This class could be used as the basis for exposing the ability to
-     * generate EPSF from 2D graphics as a StreamPrintService.
-     * In that case a MediaPrintableArea attribute could be used to
-     * communicate the bounding box.
-     */
-    public static class EPSPrinter implements Pageable {
-
-        private PageFormat pf;
-        private PSPrinterJob job;
-        private int llx, lly, urx, ury;
-        private Printable printable;
-        private PrintStream stream;
-        private String epsTitle;
-
-        public EPSPrinter(Printable printable, String title,
-                          PrintStream stream,
-                          int x, int y, int wid, int hgt) {
-
-            this.printable = printable;
-            this.epsTitle = title;
-            this.stream = stream;
-            llx = x;
-            lly = y;
-            urx = llx+wid;
-            ury = lly+hgt;
-            // construct a PageFormat with zero margins representing the
-            // exact bounds of the applet. ie construct a theoretical
-            // paper which happens to exactly match applet panel size.
-            Paper p = new Paper();
-            p.setSize((double)wid, (double)hgt);
-            p.setImageableArea(0.0,0.0, (double)wid, (double)hgt);
-            pf = new PageFormat();
-            pf.setPaper(p);
-        }
-
-        public void print() throws PrinterException {
-            stream.println("%!PS-Adobe-3.0 EPSF-3.0");
-            stream.println("%%BoundingBox: " +
-                           llx + " " + lly + " " + urx + " " + ury);
-            stream.println("%%Title: " + epsTitle);
-            stream.println("%%Creator: Java Printing");
-            stream.println("%%CreationDate: " + new java.util.Date());
-            stream.println("%%EndComments");
-            stream.println("/pluginSave save def");
-            stream.println("mark"); // for restoring stack state on return
-
-            job = new PSPrinterJob();
-            job.epsPrinter = this; // modifies the behaviour of PSPrinterJob
-            job.mPSStream = stream;
-            job.mDestType = RasterPrinterJob.STREAM; // prevents closure
-
-            job.startDoc();
-            try {
-                job.printPage(this, 0);
-            } catch (Throwable t) {
-                if (t instanceof PrinterException) {
-                    throw (PrinterException)t;
-                } else {
-                    throw new PrinterException(t.toString());
-                }
-            } finally {
-                stream.println("cleartomark"); // restore stack state
-                stream.println("pluginSave restore");
-                job.endDoc();
-            }
-            stream.flush();
-        }
-
-        public int getNumberOfPages() {
-            return 1;
-        }
-
-        public PageFormat getPageFormat(int pgIndex) {
-            if (pgIndex > 0) {
-                throw new IndexOutOfBoundsException("pgIndex");
-            } else {
-                return pf;
-            }
-        }
-
-        public Printable getPrintable(int pgIndex) {
-            if (pgIndex > 0) {
-                throw new IndexOutOfBoundsException("pgIndex");
-            } else {
-            return printable;
-            }
-        }
-
-    }
 }

From 772c97039e9841410f0ca2a25e984719221174e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Wed, 7 May 2025 06:17:50 +0000
Subject: [PATCH 311/901] 8354257: xctracenorm profiler not working with JDK
 JMH benchmarks

Reviewed-by: ihse
---
 make/test/BuildMicrobenchmark.gmk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 92f40472c3c..347ca44d25f 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -119,7 +119,6 @@ $(JMH_UNPACKED_JARS_DONE): $(JMH_RUNTIME_JARS)
 	$(foreach jar, $(JMH_RUNTIME_JARS), \
             $$($(UNZIP) -oq $(jar) -d $(JMH_UNPACKED_DIR)))
 	$(RM) -r $(JMH_UNPACKED_DIR)/META-INF
-	$(RM) $(JMH_UNPACKED_DIR)/*.xml
 	$(TOUCH) $@
 
 # Copy dependency files for inclusion in the benchmark JARs

From 4458719a108f45d3744d47a6ea081fe9ec3e675e Mon Sep 17 00:00:00 2001
From: Daishi Tabata <tabata.daishi@fujitsu.com>
Date: Wed, 7 May 2025 06:19:56 +0000
Subject: [PATCH 312/901] 8355249: Remove the use of WMIC from the entire
 source code

Reviewed-by: erikj, ihse, asemenyuk
---
 make/RunTestsPrebuilt.gmk                     |  6 ++--
 make/autoconf/build-performance.m4            |  5 ++--
 .../src/share/conf/windows.properties         | 16 +++++-----
 .../jdk/jpackage/test/WindowsHelper.java      | 29 ++++++++++---------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index ba9731789b0..f5fe1d33830 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -217,9 +217,9 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
-          | $(GREP) = | $(SED) 's/\\r//g' \
-          | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
+      $(EXPR) `powershell -Command \
+          "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" \
+          | $(SED) 's/\\r//g' ` / 1024 / 1024 \
   )
 endif
 ifeq ($(NUM_CORES), )
diff --git a/make/autoconf/build-performance.m4 b/make/autoconf/build-performance.m4
index 4414ea0d93c..10e86e75199 100644
--- a/make/autoconf/build-performance.m4
+++ b/make/autoconf/build-performance.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
@@ -75,7 +75,8 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
     FOUND_MEM=yes
   elif test "x$OPENJDK_BUILD_OS" = xwindows; then
     # Windows, but without cygwin
-    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
+    MEMORY_SIZE=`powershell -Command \
+        "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" | $SED 's/\\r//g' `
     MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
     FOUND_MEM=yes
   fi
diff --git a/test/failure_handler/src/share/conf/windows.properties b/test/failure_handler/src/share/conf/windows.properties
index 6d11553ebbf..69b9ed4f47d 100644
--- a/test/failure_handler/src/share/conf/windows.properties
+++ b/test/failure_handler/src/share/conf/windows.properties
@@ -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,10 +22,10 @@
 #
 
 config.execSuffix=.exe
-config.getChildren.app=bash
+config.getChildren.app=powershell
 config.getChildren.pattern=%p
-config.getChildren.args=-c\0wmic process where ParentProcessId=%p get ProcessId | tail -n+2
 config.getChildren.args.delimiter=\0
+config.getChildren.args=-NoLogo\0-Command\0"Get-CimInstance Win32_Process -Filter \\\"ParentProcessId = %p\\\" | Select-Object ProcessId" | tail -n+4
 ################################################################################
 # process info to gather
 ################################################################################
@@ -39,8 +39,9 @@ native.pattern=%p
 native.javaOnly=false
 native.args=%p
 
-native.info.app=wmic
-native.info.args=process where processId=%p list full
+native.info.app=powershell
+native.info.delimiter=\0
+native.info.args=-NoLogo\0-Command\0"Get-WmiObject Win32_Process -Filter \\\"ProcessId = %p\\\" | Format-List -Property *"
 
 native.pmap.app=pmap
 native.pmap.normal.args=%p
@@ -96,8 +97,9 @@ system.events.delimiter=\0
 system.events.system.args=-NoLogo\0-Command\0Get-EventLog System -After (Get-Date).AddDays(-1) | Format-List
 system.events.application.args=-NoLogo\0-Command\0Get-EventLog Application -After (Get-Date).AddDays(-1) | Format-List
 
-system.os.app=wmic
-system.os.args=os get /format:list
+system.os.app=powershell
+system.os.delimiter=\0
+system.os.args=-NoLogo\0-Command\0Get-WmiObject Win32_OperatingSystem | Format-List -Property *
 
 process.top.app=top
 process.top.args=-b -n 1
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 1c6ac9a7669..3ac302ce0fe 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -322,32 +322,33 @@ public static void killAppLauncherProcess(JPackageCommand cmd,
 
     private static long[] findAppLauncherPIDs(JPackageCommand cmd, String launcherName) {
         // Get the list of PIDs and PPIDs of app launcher processes. Run setWinRunWithEnglishOutput(true) for JDK-8344275.
-        // wmic process where (name = "foo.exe") get ProcessID,ParentProcessID
-        final var result = Executor.of("wmic", "process", "where", "(name",
-                "=",
-                "\"" + cmd.appLauncherPath(launcherName).getFileName().toString() + "\"",
-                ")", "get", "ProcessID,ParentProcessID").dumpOutput(true).saveOutput().
-                setWinRunWithEnglishOutput(true).execute();
-        if ("No Instance(s) Available.".equals(result.stderr().findFirstLineOfOutput().map(String::trim).orElse(""))) {
+        // powershell -NoLogo -NoProfile -NonInteractive -Command
+        //   "Get-CimInstance Win32_Process -Filter \"Name = 'foo.exe'\" | select ProcessID,ParentProcessID"
+        String command = "Get-CimInstance Win32_Process -Filter \\\"Name = '"
+                + cmd.appLauncherPath(launcherName).getFileName().toString()
+                + "'\\\" | select ProcessID,ParentProcessID";
+        List<String> output = Executor.of("powershell", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command", command)
+                .dumpOutput(true).saveOutput().setWinRunWithEnglishOutput(true).executeAndGetOutput();
+
+        if (output.size() < 1) {
             return new long[0];
         }
 
-        final var stdout = result.stdout();
-        String[] headers = Stream.of(stdout.getFirstLineOfOutput().split("\\s+", 2)).map(
+        String[] headers = Stream.of(output.get(1).split("\\s+", 2)).map(
                 String::trim).map(String::toLowerCase).toArray(String[]::new);
-        final Pattern pattern;
+        Pattern pattern;
         if (headers[0].equals("parentprocessid") && headers[1].equals(
                 "processid")) {
-            pattern = Pattern.compile("^(?<ppid>\\d+)\\s+(?<pid>\\d+)\\s+$");
+            pattern = Pattern.compile("^\\s+(?<ppid>\\d+)\\s+(?<pid>\\d+)$");
         } else if (headers[1].equals("parentprocessid") && headers[0].equals(
                 "processid")) {
-            pattern = Pattern.compile("^(?<pid>\\d+)\\s+(?<ppid>\\d+)\\s+$");
+            pattern = Pattern.compile("^\\s+(?<pid>\\d+)\\s+(?<ppid>\\d+)$");
         } else {
             throw new RuntimeException(
-                    "Unrecognizable output of \'wmic process\' command");
+                    "Unrecognizable output of \'Get-CimInstance Win32_Process\' command");
         }
 
-        List<long[]> processes = stdout.getOutput().stream().skip(1).map(line -> {
+        List<long[]> processes = output.stream().skip(3).map(line -> {
             Matcher m = pattern.matcher(line);
             long[] pids = null;
             if (m.matches()) {

From 910d77d39e6fb9ca339272c75fa4ff7ff99bffcf Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 7 May 2025 06:55:29 +0000
Subject: [PATCH 313/901] 8354260: Launcher help text is wrong for -Xms

Reviewed-by: jsikstro, jlahoda
---
 .../share/classes/sun/launcher/resources/launcher.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index e8dc89161fd..5ed1ca2bfbc 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -154,7 +154,7 @@ java.launcher.X.usage=\n\
 \    -Xmixed           mixed mode execution (default)\n\
 \    -Xmn<size>        sets the initial and maximum size (in bytes) of the heap\n\
 \                      for the young generation (nursery)\n\
-\    -Xms<size>        set initial Java heap size\n\
+\    -Xms<size>        set minimum and initial Java heap size\n\
 \    -Xmx<size>        set maximum Java heap size\n\
 \    -Xnoclassgc       disable class garbage collection\n\
 \    -Xrs              reduce use of OS signals by Java/VM (see documentation)\n\

From 21f01e0c89e40ae2701d8cb24c737be78f4dcd19 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 7 May 2025 07:19:42 +0000
Subject: [PATCH 314/901] 8356269: Fix broken web-links after JDK-8295470

Reviewed-by: chagedorn, epeter
---
 test/hotspot/jtreg/applications/jcstress/README             | 2 +-
 test/hotspot/jtreg/applications/jcstress/TestGenerator.java | 2 +-
 test/hotspot/jtreg/compiler/membars/DekkerTest.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/applications/jcstress/README b/test/hotspot/jtreg/applications/jcstress/README
index 842b047a776..2aaf1210f9b 100644
--- a/test/hotspot/jtreg/applications/jcstress/README
+++ b/test/hotspot/jtreg/applications/jcstress/README
@@ -37,5 +37,5 @@ The */Test.java files should never be modified directly, because they are
 generated by TestGenerator and therefore all required changes must be made in
 that class.
 
-[1] https://wiki.openjdk.org/display/CodeTools/jcstress
+[1] https://github.com/openjdk/jcstress
 
diff --git a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
index cdb2093975b..b6b22e2ebdb 100644
--- a/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
+++ b/test/hotspot/jtreg/applications/jcstress/TestGenerator.java
@@ -56,7 +56,7 @@
  * added to classpath. One can replace @notest by @test in jtreg test
  * description above to run this class with jtreg.
  *
- * @see <a href=https://wiki.openjdk.org/display/CodeTools/jcstress>jcstress</a>
+ * @see <a href="https://github.com/openjdk/jcstress">jcstress</a>
  */
 public class TestGenerator {
     private static final String COPYRIGHT;
diff --git a/test/hotspot/jtreg/compiler/membars/DekkerTest.java b/test/hotspot/jtreg/compiler/membars/DekkerTest.java
index 2f329588abe..9e5f135a2b2 100644
--- a/test/hotspot/jtreg/compiler/membars/DekkerTest.java
+++ b/test/hotspot/jtreg/compiler/membars/DekkerTest.java
@@ -47,7 +47,7 @@ public class DekkerTest {
     /*
       Read After Write Test (basically a simple Dekker test with volatile variables)
       Derived from the original jcstress test, available at:
-        hhttps://git.openjdk.org/jcstress/commit/15acd86
+        https://git.openjdk.org/jcstress/commit/15acd86
         tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java
      */
 

From 50895835e0c78f54a0b33db7f42f3769e2a1e652 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 7 May 2025 07:44:05 +0000
Subject: [PATCH 315/901] 8356259: Lift basic -Xlog:jit* logging to "info"
 level

Reviewed-by: kvn
---
 src/hotspot/share/compiler/compileTask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index 87d4a11e528..fd066a9bc87 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -471,7 +471,7 @@ void CompileTask::print_inlining_inner_message(outputStream* st, InliningResult
 }
 
 void CompileTask::print_ul(const char* msg){
-  LogTarget(Debug, jit, compilation) lt;
+  LogTarget(Info, jit, compilation) lt;
   if (lt.is_enabled()) {
     LogStream ls(lt);
     print(&ls, msg, /* short form */ true, /* cr */ true);
@@ -479,7 +479,7 @@ void CompileTask::print_ul(const char* msg){
 }
 
 void CompileTask::print_ul(const nmethod* nm, const char* msg) {
-  LogTarget(Debug, jit, compilation) lt;
+  LogTarget(Info, jit, compilation) lt;
   if (lt.is_enabled()) {
     LogStream ls(lt);
     print_impl(&ls, nm->method(), nm->compile_id(),

From 328715d84c0eafb4fe58d28b301138374ddac168 Mon Sep 17 00:00:00 2001
From: Ivan Bereziuk <ivan.bereziuk@oracle.com>
Date: Wed, 7 May 2025 08:06:29 +0000
Subject: [PATCH 316/901] 8356187: TestJcmd.java may incorrectly parse podman
 version

Reviewed-by: sgehwolf
---
 .../jtreg/containers/docker/TestJcmd.java     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/containers/docker/TestJcmd.java b/test/hotspot/jtreg/containers/docker/TestJcmd.java
index ca8f1659fe9..4b604096b00 100644
--- a/test/hotspot/jtreg/containers/docker/TestJcmd.java
+++ b/test/hotspot/jtreg/containers/docker/TestJcmd.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
@@ -37,6 +37,8 @@
  */
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import jdk.test.lib.Container;
 import jdk.test.lib.JDKToolFinder;
@@ -264,14 +266,16 @@ public int compareTo(PodmanVersion other) {
         }
 
         private static PodmanVersion fromVersionString(String version) {
-            try {
-                // Example 'podman version 3.2.1'
-                String versNums = version.split("\\s+", 3)[2];
-                String[] numbers = versNums.split("\\.", 3);
-                return new PodmanVersion(Integer.parseInt(numbers[0]),
-                                         Integer.parseInt(numbers[1]),
-                                         Integer.parseInt(numbers[2]));
-            } catch (Exception e) {
+            // Examples: 'podman version 3.2.1', 'podman version 4.9.4-rhel'
+            final Pattern pattern = Pattern.compile("podman version (\\d+)\\.(\\d+)\\.(\\d+).*");
+            final Matcher matcher = pattern.matcher(version);
+
+            if (matcher.matches()) {
+                return new PodmanVersion(
+                        Integer.parseInt(matcher.group(1)),
+                        Integer.parseInt(matcher.group(2)),
+                        Integer.parseInt(matcher.group(3)));
+            } else {
                 System.out.println("Failed to parse podman version: " + version);
                 return DEFAULT;
             }

From b5fd289f53e8380dfc38c3615acd10396ac647d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Wed, 7 May 2025 08:16:35 +0000
Subject: [PATCH 317/901] 8356310:
 compiler/print/TestPrintAssemblyDeoptRace.java fails with Improperly
 specified VM option 'DeoptimizeALot'

Reviewed-by: epeter, mchevalier, thartmann, chagedorn, rcastanedalo
---
 .../jtreg/compiler/print/TestPrintAssemblyDeoptRace.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java b/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java
index 3b04d073771..22ce12f9641 100644
--- a/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java
+++ b/test/hotspot/jtreg/compiler/print/TestPrintAssemblyDeoptRace.java
@@ -25,8 +25,8 @@
  * @test
  * @bug 8258229
  * @summary If a method is made not entrant while printing the assembly, hotspot crashes due to mismatched relocation information.
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -XX:+DeoptimizeALot -XX:CompileCommand=print,java/math/BitSieve.bit
- *                   compiler.print.TestPrintAssemblyDeoptRace
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+DeoptimizeALot
+ *                   -XX:CompileCommand=print,java/math/BitSieve.bit compiler.print.TestPrintAssemblyDeoptRace
  */
 
 package compiler.print;

From da004cb6579c96c444faa55496db0056e9ac34e0 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 7 May 2025 08:33:35 +0000
Subject: [PATCH 318/901] 8356030: RISC-V: enable (part of)
 BasicDoubleOpTest.java

Reviewed-by: fyang, luhenry
---
 .../runner/BasicDoubleOpTest.java             | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
index c1bef52a8b1..9e5bf9c3753 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicDoubleOpTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
  * Copyright (c) 2024, 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
@@ -36,7 +37,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.BasicDoubleOpTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -118,7 +119,7 @@ public BasicDoubleOpTest() {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.NEG_VD, ">0"})
     public double[] vectorNeg() {
         double[] res = new double[SIZE];
@@ -129,7 +130,7 @@ public double[] vectorNeg() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ABS_VD, ">0"})
     public double[] vectorAbs() {
         double[] res = new double[SIZE];
@@ -140,7 +141,7 @@ public double[] vectorAbs() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.SQRT_VD, ">0"})
     public double[] vectorSqrt() {
         double[] res = new double[SIZE];
@@ -184,7 +185,7 @@ public double[] vectorRint() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VD, ">0"})
     public double[] vectorAdd() {
         double[] res = new double[SIZE];
@@ -195,7 +196,7 @@ public double[] vectorAdd() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VD, ">0"})
     public double[] vectorSub() {
         double[] res = new double[SIZE];
@@ -206,7 +207,7 @@ public double[] vectorSub() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VD, ">0"})
     public double[] vectorMul() {
         double[] res = new double[SIZE];
@@ -217,7 +218,7 @@ public double[] vectorMul() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.DIV_VD, ">0"})
     public double[] vectorDiv() {
         double[] res = new double[SIZE];
@@ -228,7 +229,7 @@ public double[] vectorDiv() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.MAX_VD, ">0"})
     public double[] vectorMax() {
         double[] res = new double[SIZE];
@@ -239,7 +240,7 @@ public double[] vectorMax() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.MAX_VD, "0"})
     public double[] vectorMax_8322090() {
         double[] res = new double[SIZE];
@@ -250,7 +251,7 @@ public double[] vectorMax_8322090() {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.MIN_VD, ">0"})
     public double[] vectorMin() {
         double[] res = new double[SIZE];
@@ -265,6 +266,8 @@ public double[] vectorMin() {
         counts = {IRNode.FMA_VD, ">0", IRNode.VFMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorMulAdd() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -278,6 +281,8 @@ public double[] vectorMulAdd() {
         counts = {IRNode.FMA_VD, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorMulSub1() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -291,6 +296,8 @@ public double[] vectorMulSub1() {
         counts = {IRNode.FMA_VD, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorMulSub2() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -306,6 +313,8 @@ public double[] vectorMulSub2() {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorNegateMulAdd1() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -321,6 +330,8 @@ public double[] vectorNegateMulAdd1() {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorNegateMulAdd2() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -334,6 +345,8 @@ public double[] vectorNegateMulAdd2() {
         counts = {IRNode.FMA_VD, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VD, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"}, applyIf = {"UseFMA", "true"},
+        counts = {IRNode.FMA_VD, ">0"})
     public double[] vectorNegateMulSub() {
         double[] res = new double[SIZE];
         for (int i = 0; i < SIZE; i++) {

From 1a4bbb0027ae9e6df3b668454fa155861d531f72 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 7 May 2025 08:33:49 +0000
Subject: [PATCH 319/901] 8355699: RISC-V: support SUADD/SADD/SUSUB/SSUB

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |   8 +-
 src/hotspot/cpu/riscv/riscv_v.ad              | 138 ++++++++++++++++++
 .../VectorCommutativeOperSharingTest.java     |   3 +-
 .../VectorSaturatedOperationsTest.java        |  40 ++---
 4 files changed, 167 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 4773043e1ba..63d5d4f3e61 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1904,8 +1904,14 @@ enum VectorMask {
   INSN(vand_vv, 0b1010111, 0b000, 0b001001);
 
   // Vector Single-Width Integer Add and Subtract
-  INSN(vsub_vv, 0b1010111, 0b000, 0b000010);
   INSN(vadd_vv, 0b1010111, 0b000, 0b000000);
+  INSN(vsub_vv, 0b1010111, 0b000, 0b000010);
+
+  // Vector Saturating Integer Add and Subtract
+  INSN(vsadd_vv,  0b1010111, 0b000, 0b100001);
+  INSN(vsaddu_vv, 0b1010111, 0b000, 0b100000);
+  INSN(vssub_vv,  0b1010111, 0b000, 0b100011);
+  INSN(vssubu_vv, 0b1010111, 0b000, 0b100010);
 
   // Vector Register Gather Instructions
   INSN(vrgather_vv,     0b1010111, 0b000, 0b001100);
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 34b7268b137..b6b8395dbb7 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -650,6 +650,144 @@ instruct vsubL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// -------- vector saturating integer operations
+
+// vector saturating signed integer addition
+
+instruct vsadd(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingAddV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsadd $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsadd_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating unsigned integer addition
+
+instruct vsaddu(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingAddV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsaddu $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsaddu_vv(as_VectorRegister($dst$$reg),
+                 as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating signed integer addition (predicated)
+
+instruct vsadd_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
+  predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src (SaturatingAddV (Binary dst_src src1) v0));
+  ins_cost(VEC_COST);
+  format %{ "vsadd_masked $dst_src, $dst_src, $src1, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsadd_vv(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg),
+                as_VectorRegister($src1$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating unsigned integer addition (predicated)
+
+instruct vsaddu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
+  predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src (SaturatingAddV (Binary dst_src src1) v0));
+  ins_cost(VEC_COST);
+  format %{ "vsaddu_masked $dst_src, $dst_src, $src1, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vsaddu_vv(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg),
+                 as_VectorRegister($src1$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating signed integer subtraction
+
+instruct vssub(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingSubV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vssub $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vssub_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating unsigned integer subtraction
+
+instruct vssubu(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingSubV src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vssubu $dst, $src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vssubu_vv(as_VectorRegister($dst$$reg),
+                 as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating signed integer subtraction (predicated)
+
+instruct vssub_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
+  predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src (SaturatingSubV (Binary dst_src src1) v0));
+  ins_cost(VEC_COST);
+  format %{ "vssub_masked $dst_src, $dst_src, $src1, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vssub_vv(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg),
+                as_VectorRegister($src1$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector saturating unsigned integer subtraction (predicated)
+
+instruct vssubu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
+  predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src (SaturatingSubV (Binary dst_src src1) v0));
+  ins_cost(VEC_COST);
+  format %{ "vssubu_masked $dst_src, $dst_src, $src1, $v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vssubu_vv(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg),
+                 as_VectorRegister($src1$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector and
 
 instruct vand(vReg dst, vReg src1, vReg src2) %{
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
index c3e0cbc3a9a..a51946dd698 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
@@ -147,7 +147,8 @@ public void checkVectorIRSharing2() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx2", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "},
+        applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"})
     public void testVectorIRSharing3(int index) {
         IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
         IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
index 84aaacb3a01..887c41efd48 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
@@ -166,7 +166,7 @@ public VectorSaturatedOperationsTest() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void sadd_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -189,7 +189,7 @@ public void sadd_byte_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void sadd_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -212,7 +212,7 @@ public void sadd_short_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void sadd_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -235,7 +235,7 @@ public void sadd_int_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void sadd_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -260,7 +260,7 @@ public void sadd_long_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 " , "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void suadd_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -285,7 +285,7 @@ public void suadd_byte_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void suadd_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -310,7 +310,7 @@ public void suadd_short_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void suadd_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -335,7 +335,7 @@ public void suadd_int_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void suadd_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -358,7 +358,7 @@ public void suadd_long_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void ssub_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -381,7 +381,7 @@ public void ssub_byte_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void ssub_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -404,7 +404,7 @@ public void ssub_short_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void ssub_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -427,7 +427,7 @@ public void ssub_int_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void ssub_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -452,7 +452,7 @@ public void ssub_long_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 " , "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void susub_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -477,7 +477,7 @@ public void susub_byte_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void susub_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -502,7 +502,7 @@ public void susub_short_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void susub_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -527,7 +527,7 @@ public void susub_int_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     @Warmup(value = 10000)
     public void susub_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -550,7 +550,7 @@ public void susub_long_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "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)
@@ -576,7 +576,7 @@ public void sadd_masked_verify() {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "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)
@@ -604,7 +604,7 @@ public void ssub_masked_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "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)
@@ -632,7 +632,7 @@ public void suadd_masked_verify() {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "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)

From 50554fa1982f042fb1d7b6c8a16334b97b31bb63 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 7 May 2025 08:34:03 +0000
Subject: [PATCH 320/901] 8355704: RISC-V: enable TestIRFma.java

Reviewed-by: rehn, luhenry
---
 .../jtreg/compiler/c2/irTests/TestIRFma.java  | 29 +++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     | 10 +++++++
 2 files changed, 39 insertions(+)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIRFma.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIRFma.java
index 0e2cd067a13..da38a76f947 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIRFma.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIRFma.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023, Arm Limited. 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
@@ -87,6 +88,8 @@ public void assertResult(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test1(float a, float b, float c) {
         return Math.fma(-a, -b, c);
     }
@@ -94,6 +97,8 @@ static float test1(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test2(double a, double b, double c) {
         return Math.fma(-a, -b, c);
     }
@@ -101,6 +106,8 @@ static double test2(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test3(float a, float b, float c) {
         return Math.fma(-a, b, c);
     }
@@ -108,6 +115,8 @@ static float test3(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test4(double a, double b, double c) {
         return Math.fma(-a, b, c);
     }
@@ -115,6 +124,8 @@ static double test4(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test5(float a, float b, float c) {
         return Math.fma(a, -b, c);
     }
@@ -122,6 +133,8 @@ static float test5(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test6(double a, double b, double c) {
         return Math.fma(a, -b, c);
     }
@@ -129,6 +142,8 @@ static double test6(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test7(float a, float b, float c) {
         return Math.fma(-a, b, -c);
     }
@@ -136,6 +151,8 @@ static float test7(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test8(double a, double b, double c) {
         return Math.fma(-a, b, -c);
     }
@@ -143,6 +160,8 @@ static double test8(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test9(float a, float b, float c) {
         return Math.fma(a, -b, -c);
     }
@@ -150,6 +169,8 @@ static float test9(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test10(double a, double b, double c) {
         return Math.fma(a, -b, -c);
     }
@@ -157,6 +178,8 @@ static double test10(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FNMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test11(float a, float b, float c) {
         return Math.fma(a, b, -c);
     }
@@ -164,6 +187,8 @@ static float test11(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FNMSUB, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test12(double a, double b, double c) {
         return Math.fma(a, b, -c);
     }
@@ -171,6 +196,8 @@ static double test12(double a, double b, double c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_F, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static float test13(float a, float b, float c) {
         return Math.fma(-a, -b, -c);
     }
@@ -178,6 +205,8 @@ static float test13(float a, float b, float c) {
     @Test
     @IR(counts = {IRNode.FNMADD, "> 0"},
         applyIfCPUFeature = {"asimd", "true"})
+    @IR(counts = {IRNode.FMA_D, "= 1"},
+        applyIfPlatform = {"riscv64", "true"}, applyIf = {"UseFMA", "true"})
     static double test14(double a, double b, double c) {
         return Math.fma(-a, -b, -c);
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index ebcbd9fbbc7..965b0083c49 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2511,6 +2511,16 @@ public class IRNode {
         machOnlyNameRegex(FNMSUB, "mnsub(F|D)_reg_reg");
     }
 
+    public static final String FMA_F = PREFIX + "FMA_F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(FMA_F, "FmaF");
+    }
+
+    public static final String FMA_D = PREFIX + "FMA_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(FMA_D, "FmaD");
+    }
+
     public static final String VFMLA = PREFIX + "VFMLA" + POSTFIX;
     static {
         machOnlyNameRegex(VFMLA, "vfmla");

From 1bdff3ccd069142e21c8b0a9ecf759b82302a2d2 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 7 May 2025 09:12:44 +0000
Subject: [PATCH 321/901] 8356114: java/foreign/TestBufferStackStress2.java
 failed with junit action timed out

Reviewed-by: djelinski, alanb
---
 test/jdk/java/foreign/TestBufferStackStress2.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/jdk/java/foreign/TestBufferStackStress2.java b/test/jdk/java/foreign/TestBufferStackStress2.java
index 4b02f4691fb..8ec5d512ff6 100644
--- a/test/jdk/java/foreign/TestBufferStackStress2.java
+++ b/test/jdk/java/foreign/TestBufferStackStress2.java
@@ -29,6 +29,7 @@
  */
 
 import jdk.internal.foreign.BufferStack;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 import java.io.FileDescriptor;
@@ -62,6 +63,14 @@ final class TestBufferStackStress2 {
      */
     @Test
     void movingVirtualThreadWithGc() throws InterruptedException {
+
+        // If the VM is configured such that the main thread is virtual,
+        // this stress test will not work as the main thread is always alive causing
+        // us to wait forever for contraction.
+        // Hence, we will skip this test if the main thread is virtual.
+        Assumptions.assumeFalse(Thread.currentThread().isVirtual(),
+                "Skipped because the main thread is a virtual thread");
+
         final long begin = System.nanoTime();
         var pool = BufferStack.of(POOL_SIZE, 1);
 

From 0844745e7bd954a96441365f8010741ec1c29dbf Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 7 May 2025 09:21:58 +0000
Subject: [PATCH 322/901] 8339561: The test/jdk/java/awt/Paint/ListRepaint.java
 may fail after JDK-8327401

Reviewed-by: azvegint
---
 test/jdk/ProblemList.txt                      |   2 +
 .../MiscUndecorated/ActiveAWTWindowTest.java  |  23 ++--
 .../awt/List/KeyEventsTest/KeyEventsTest.java | 102 +++++++++---------
 test/jdk/java/awt/Paint/ButtonRepaint.java    |  30 +++---
 test/jdk/java/awt/Paint/CheckboxRepaint.java  |  29 ++---
 test/jdk/java/awt/Paint/LabelRepaint.java     |  24 +++--
 test/jdk/java/awt/Paint/ListRepaint.java      |  45 +++-----
 7 files changed, 129 insertions(+), 126 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3edf4a9d18e..606ac735088 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -148,6 +148,8 @@ java/awt/EventQueue/6980209/bug6980209.java 8198615 macosx-all
 java/awt/EventQueue/PushPopDeadlock/PushPopDeadlock.java 8024034 generic-all
 java/awt/grab/EmbeddedFrameTest1/EmbeddedFrameTest1.java 7080150 macosx-all
 java/awt/event/InputEvent/EventWhenTest/EventWhenTest.java 8168646 generic-all
+java/awt/List/KeyEventsTest/KeyEventsTest.java 8201307 linux-all
+java/awt/Paint/ListRepaint.java 8201307 linux-all
 java/awt/Mixing/AWT_Mixing/HierarchyBoundsListenerMixingTest.java 8049405 macosx-all
 java/awt/Mixing/AWT_Mixing/OpaqueOverlapping.java 8294264 windows-x64
 java/awt/Mixing/AWT_Mixing/OpaqueOverlappingChoice.java 8048171 generic-all
diff --git a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
index 7aa5b8c5132..c7ec6c6d969 100644
--- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.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
@@ -25,15 +25,24 @@
  * @test
  * @key headful
  * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus
- * @author Jitender(jitender.singh@eng.sun.com) area=AWT
- * @author yan
  * @library /lib/client
  * @build ExtendedRobot
  * @run main ActiveAWTWindowTest
  */
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
 
 public class ActiveAWTWindowTest {
 
@@ -47,12 +56,12 @@ public class ActiveAWTWindowTest {
     private boolean passed = true;
     private final int delay = 150;
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         ActiveAWTWindowTest test = new ActiveAWTWindowTest();
         try {
             test.doTest();
         } finally {
-            EventQueue.invokeLater(() -> {
+            EventQueue.invokeAndWait(() -> {
                 if (test.frame != null) {
                     test.frame.dispose();
                 }
diff --git a/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java b/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java
index 919ea72a494..b4c3e5e4f05 100644
--- a/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.java
+++ b/test/jdk/java/awt/List/KeyEventsTest/KeyEventsTest.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
@@ -22,9 +22,8 @@
  */
 
 import java.awt.BorderLayout;
-import java.awt.EventQueue;
-import java.awt.KeyboardFocusManager;
 import java.awt.Frame;
+import java.awt.KeyboardFocusManager;
 import java.awt.List;
 import java.awt.Panel;
 import java.awt.Point;
@@ -51,7 +50,7 @@
  * @run main KeyEventsTest
  */
 public class KeyEventsTest {
-    TestState currentState;
+    private volatile TestState currentState;
     final Object LOCK = new Object();
     final int ACTION_TIMEOUT = 500;
 
@@ -66,16 +65,14 @@ public static void main(final String[] args) throws Exception {
         r = new Robot();
         KeyEventsTest app = new KeyEventsTest();
         try {
-            EventQueue.invokeAndWait(app::initAndShowGui);
+            app.initAndShowGui();
             r.waitForIdle();
             r.delay(500);
             app.doTest();
         } finally {
-            EventQueue.invokeAndWait(() -> {
-                if (app.keyFrame != null) {
-                    app.keyFrame.dispose();
-                }
-            });
+            if (app.keyFrame != null) {
+                app.keyFrame.dispose();
+            }
         }
     }
 
@@ -184,52 +181,51 @@ private void test(TestState currentState) throws Exception {
                 throw new RuntimeException("Test failed - list isn't focus owner.");
             }
 
-            EventQueue.invokeAndWait(() -> {
-                list.deselect(0);
-                list.deselect(1);
-                list.deselect(2);
-                list.deselect(3);
-                list.deselect(4);
-                list.deselect(5);
-                list.deselect(6);
-                list.deselect(7);
-                list.deselect(8);
-
-                int selectIndex = 0;
-                int visibleIndex = 0;
-
-                if (currentState.getScrollMoved()) {
-                    if (currentState.getKeyID() == KeyEvent.VK_PAGE_UP ||
-                            currentState.getKeyID() == KeyEvent.VK_HOME) {
-                        selectIndex = 8;
-                        visibleIndex = 8;
-                    } else if (currentState.getKeyID() == KeyEvent.VK_PAGE_DOWN ||
-                            currentState.getKeyID() == KeyEvent.VK_END) {
+            list.deselect(0);
+            list.deselect(1);
+            list.deselect(2);
+            list.deselect(3);
+            list.deselect(4);
+            list.deselect(5);
+            list.deselect(6);
+            list.deselect(7);
+            list.deselect(8);
+
+            int selectIndex = 0;
+            int visibleIndex = 0;
+
+            if (currentState.getScrollMoved()) {
+                if (currentState.getKeyID() == KeyEvent.VK_PAGE_UP ||
+                        currentState.getKeyID() == KeyEvent.VK_HOME) {
+                    selectIndex = 8;
+                    visibleIndex = 8;
+                } else if (currentState.getKeyID() == KeyEvent.VK_PAGE_DOWN ||
+                        currentState.getKeyID() == KeyEvent.VK_END) {
+                    selectIndex = 0;
+                    visibleIndex = 0;
+                }
+            } else {
+                if (currentState.getKeyID() == KeyEvent.VK_PAGE_UP ||
+                        currentState.getKeyID() == KeyEvent.VK_HOME) {
+                    if (currentState.getSelectedMoved()) {
+                        selectIndex = 1;
+                    } else {
                         selectIndex = 0;
-                        visibleIndex = 0;
                     }
-                } else {
-                    if (currentState.getKeyID() == KeyEvent.VK_PAGE_UP ||
-                            currentState.getKeyID() == KeyEvent.VK_HOME) {
-                        if (currentState.getSelectedMoved()) {
-                            selectIndex = 1;
-                        } else {
-                            selectIndex = 0;
-                        }
-                        visibleIndex = 0;
-                    } else if (currentState.getKeyID() == KeyEvent.VK_PAGE_DOWN ||
-                            currentState.getKeyID() == KeyEvent.VK_END) {
-                        if (currentState.getSelectedMoved()) {
-                            selectIndex = 7;
-                        } else {
-                            selectIndex = 8;
-                        }
-                        visibleIndex = 8;
+                    visibleIndex = 0;
+                } else if (currentState.getKeyID() == KeyEvent.VK_PAGE_DOWN ||
+                        currentState.getKeyID() == KeyEvent.VK_END) {
+                    if (currentState.getSelectedMoved()) {
+                        selectIndex = 7;
+                    } else {
+                        selectIndex = 8;
                     }
+                    visibleIndex = 8;
                 }
-                list.select(selectIndex);
-                list.makeVisible(visibleIndex);
-            });
+            }
+            list.select(selectIndex);
+            list.makeVisible(visibleIndex);
+
 
             r.delay(10);
             r.waitForIdle();
@@ -309,7 +305,7 @@ class TestState {
     private final boolean scrollMoved;
     private final int keyID;
     private final boolean template;
-    private boolean action;
+    private volatile boolean action;
 
     public TestState(boolean multiple, boolean selectedMoved, boolean scrollMoved, int keyID, boolean template){
         this.multiple = multiple;
diff --git a/test/jdk/java/awt/Paint/ButtonRepaint.java b/test/jdk/java/awt/Paint/ButtonRepaint.java
index 77cd1a4649d..260e6c1097f 100644
--- a/test/jdk/java/awt/Paint/ButtonRepaint.java
+++ b/test/jdk/java/awt/Paint/ButtonRepaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, 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
@@ -21,28 +21,32 @@
  * questions.
  */
 
-
-import java.awt.*;
+import java.awt.Button;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
 
 /**
  * @test
  * @key headful
  * @bug 7090424
- * @author Sergey Bylokhov
  */
 public final class ButtonRepaint extends Button {
 
     public static void main(final String[] args) {
         for (int i = 0; i < 10; ++i) {
-            final Frame frame = new Frame();
-            frame.setSize(300, 300);
-            frame.setLocationRelativeTo(null);
-            ButtonRepaint button = new ButtonRepaint();
-            frame.add(button);
-            frame.setVisible(true);
-            sleep();
-            button.test();
-            frame.dispose();
+            Frame frame = new Frame();
+            try {
+                frame.setSize(300, 300);
+                frame.setLocationRelativeTo(null);
+                ButtonRepaint button = new ButtonRepaint();
+                frame.add(button);
+                frame.setVisible(true);
+                sleep();
+                button.test();
+            } finally {
+                frame.dispose();
+            }
         }
     }
 
diff --git a/test/jdk/java/awt/Paint/CheckboxRepaint.java b/test/jdk/java/awt/Paint/CheckboxRepaint.java
index 409c11f6f4d..5522497dc2a 100644
--- a/test/jdk/java/awt/Paint/CheckboxRepaint.java
+++ b/test/jdk/java/awt/Paint/CheckboxRepaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, 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
@@ -21,27 +21,32 @@
  * questions.
  */
 
-import java.awt.*;
+import java.awt.Checkbox;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
 
 /**
  * @test
  * @key headful
  * @bug 7090424
- * @author Sergey Bylokhov
  */
 public final class CheckboxRepaint extends Checkbox {
 
     public static void main(final String[] args) {
         for (int i = 0; i < 10; ++i) {
-            final Frame frame = new Frame();
-            frame.setSize(300, 300);
-            frame.setLocationRelativeTo(null);
-            CheckboxRepaint checkbox = new CheckboxRepaint();
-            frame.add(checkbox);
-            frame.setVisible(true);
-            sleep();
-            checkbox.test();
-            frame.dispose();
+            Frame frame = new Frame();
+            try {
+                frame.setSize(300, 300);
+                frame.setLocationRelativeTo(null);
+                CheckboxRepaint checkbox = new CheckboxRepaint();
+                frame.add(checkbox);
+                frame.setVisible(true);
+                sleep();
+                checkbox.test();
+            } finally {
+                frame.dispose();
+            }
         }
     }
 
diff --git a/test/jdk/java/awt/Paint/LabelRepaint.java b/test/jdk/java/awt/Paint/LabelRepaint.java
index 7131f6d4f0f..56e096a2457 100644
--- a/test/jdk/java/awt/Paint/LabelRepaint.java
+++ b/test/jdk/java/awt/Paint/LabelRepaint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, 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
@@ -30,21 +30,23 @@
  * @test
  * @key headful
  * @bug 7090424
- * @author Sergey Bylokhov
  */
 public final class LabelRepaint extends Label {
 
     public static void main(final String[] args) {
         for (int i = 0; i < 10; ++i) {
-            final Frame frame = new Frame();
-            frame.setSize(300, 300);
-            frame.setLocationRelativeTo(null);
-            LabelRepaint label = new LabelRepaint();
-            frame.add(label);
-            frame.setVisible(true);
-            sleep();
-            label.test();
-            frame.dispose();
+            Frame frame = new Frame();
+            try {
+                frame.setSize(300, 300);
+                frame.setLocationRelativeTo(null);
+                LabelRepaint label = new LabelRepaint();
+                frame.add(label);
+                frame.setVisible(true);
+                sleep();
+                label.test();
+            } finally {
+                frame.dispose();
+            }
         }
     }
 
diff --git a/test/jdk/java/awt/Paint/ListRepaint.java b/test/jdk/java/awt/Paint/ListRepaint.java
index 08cf06d63f6..a2d9c77a95b 100644
--- a/test/jdk/java/awt/Paint/ListRepaint.java
+++ b/test/jdk/java/awt/Paint/ListRepaint.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
@@ -30,26 +30,27 @@
  * @test
  * @key headful
  * @bug 7090424
- * @author Sergey Bylokhov
  */
 public final class ListRepaint extends List {
 
-    static ListRepaint listRepaint;
-    static Frame frame;
-
-    public static void main(final String[] args) throws Exception {
+    public static void main(final String[] args) {
         for (int i = 0; i < 10; ++i) {
+            Frame frame = new Frame();
             try {
-                EventQueue.invokeLater(ListRepaint::createAndShowGUI);
+                frame.setSize(300, 300);
+                frame.setLocationRelativeTo(null);
+                ListRepaint list = new ListRepaint();
+                list.add("1");
+                list.add("2");
+                list.add("3");
+                list.add("4");
+                list.select(0);
+                frame.add(list);
+                frame.setVisible(true);
                 sleep();
-                EventQueue.invokeAndWait(listRepaint::test);
+                list.test();
             } finally {
-                EventQueue.invokeAndWait(() -> {
-                    if (frame != null) {
-                        frame.dispose();
-                        frame = null;
-                    }
-                });
+                frame.dispose();
             }
         }
     }
@@ -61,22 +62,6 @@ private static void sleep() {
         }
     }
 
-    static void createAndShowGUI() {
-        frame = new Frame();
-        frame.setSize(300, 300);
-        frame.setLocationRelativeTo(null);
-
-        listRepaint = new ListRepaint();
-        listRepaint.add("1");
-        listRepaint.add("2");
-        listRepaint.add("3");
-        listRepaint.add("4");
-        listRepaint.select(0);
-
-        frame.add(listRepaint);
-        frame.setVisible(true);
-    }
-
     @Override
     public void paint(final Graphics g) {
         super.paint(g);

From 60a4594b9f9acd82ef3ff22fc6a2df238dd981b9 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Wed, 7 May 2025 12:07:47 +0000
Subject: [PATCH 323/901] 8355578: [java.net] Use @requires tag instead of
 exiting based on "os.name" property value

Reviewed-by: dfuchs
---
 test/jdk/java/net/Inet4Address/PingThis.java   | 13 +++----------
 .../net/MulticastSocket/NoLoopbackPackets.java | 17 ++++-------------
 .../net/MulticastSocket/PromiscuousIPv6.java   | 18 ++++--------------
 .../net/MulticastSocket/SetOutgoingIf.java     | 17 ++++-------------
 .../ServerSocket/AnotherSelectFdsLimit.java    |  7 ++-----
 .../java/net/ServerSocket/SelectFdsLimit.java  | 10 ++--------
 6 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/test/jdk/java/net/Inet4Address/PingThis.java b/test/jdk/java/net/Inet4Address/PingThis.java
index 885b60341f3..476ff0ad8a6 100644
--- a/test/jdk/java/net/Inet4Address/PingThis.java
+++ b/test/jdk/java/net/Inet4Address/PingThis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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
@@ -27,27 +27,20 @@
 
 /* @test
  * @bug 7163874 8133015
+ * @summary InetAddress.isReachable is returning false for InetAdress 0.0.0.0 and ::0
+ * @requires os.family != "windows"
  * @library /test/lib
- * @summary InetAddress.isReachable is returning false
- *          for InetAdress 0.0.0.0 and ::0
  * @run main PingThis
  * @run main/othervm -Djava.net.preferIPv4Stack=true PingThis
  */
 
-import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.net.NetworkInterface;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import jdk.test.lib.net.IPSupport;
 
 public class PingThis {
     public static void main(String args[]) throws Exception {
-        if (System.getProperty("os.name").startsWith("Windows")) {
-            return;
-        }
         IPSupport.throwSkippedExceptionIfNonOperational();
 
         List<String> addrs = new ArrayList<String>();
diff --git a/test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java b/test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java
index 3e1bc8b55ea..36b6f12413d 100644
--- a/test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java
+++ b/test/jdk/java/net/MulticastSocket/NoLoopbackPackets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, 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
@@ -24,8 +24,9 @@
 /*
  * @test
  * @bug 4742177
- * @library /test/lib
  * @summary Re-test IPv6 (and specifically MulticastSocket) with latest Linux & USAGI code
+ * @requires os.family != "windows"
+ * @library /test/lib
  */
 import java.util.*;
 import java.net.*;
@@ -33,20 +34,10 @@
 import jdk.test.lib.net.IPSupport;
 
 public class NoLoopbackPackets {
-    private static String osname;
-
-    static boolean isWindows() {
-        if (osname == null)
-            osname = System.getProperty("os.name");
-        return osname.contains("Windows");
-    }
 
     private static final String MESSAGE = "hello world (" + System.nanoTime() + ")";
+
     public static void main(String[] args) throws Exception {
-        if (isWindows()) {
-            System.out.println("The test only run on non-Windows OS. Bye.");
-            return;
-        }
 
         MulticastSocket msock = null;
         List<SocketAddress> failedGroups = new ArrayList<SocketAddress>();
diff --git a/test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java b/test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
index 4ac2dd8f16f..8fc23ea96aa 100644
--- a/test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
+++ b/test/jdk/java/net/MulticastSocket/PromiscuousIPv6.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
@@ -24,7 +24,9 @@
 /*
  * @test
  * @bug 8215294
- * @requires os.family == "linux"
+ * @requires os.family == "linux" & !(os.version ~= "3\\.10\\.0.*")
+ * @comment This test should only be run on Linux.
+ *          The behavior under test is known NOT to work on Linux 3.10.0* kernels.
  * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        PromiscuousIPv6
@@ -148,18 +150,6 @@ static void test(NetworkInterface nif, InetAddress group1, InetAddress group2)
     }
 
     public static void main(String args[]) throws IOException {
-        String os = System.getProperty("os.name");
-
-        if (!os.equals("Linux")) {
-            throw new SkippedException("This test should be run only on Linux");
-        } else {
-            String osVersion = System.getProperty("os.version");
-            String prefix = "3.10.0";
-            if (osVersion.startsWith(prefix)) {
-                throw new SkippedException(
-                        String.format("The behavior under test is known NOT to work on '%s' kernels", prefix));
-            }
-        }
 
         NetworkConfiguration.printSystemConfiguration(System.out);
         List<NetworkInterface> nifs = NetworkConfiguration.probe()
diff --git a/test/jdk/java/net/MulticastSocket/SetOutgoingIf.java b/test/jdk/java/net/MulticastSocket/SetOutgoingIf.java
index 8a752ae2eee..e56a4598da7 100644
--- a/test/jdk/java/net/MulticastSocket/SetOutgoingIf.java
+++ b/test/jdk/java/net/MulticastSocket/SetOutgoingIf.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
@@ -24,9 +24,10 @@
 /*
  * @test
  * @bug 4742177 8241786
+ * @summary Re-test IPv6 (and specifically MulticastSocket) with latest Linux & USAGI code
+ * @requires os.family != "windows"
  * @library /test/lib
  * @run main/othervm SetOutgoingIf
- * @summary Re-test IPv6 (and specifically MulticastSocket) with latest Linux & USAGI code
  */
 import java.io.IOException;
 import java.net.*;
@@ -36,7 +37,7 @@
 
 
 public class SetOutgoingIf implements AutoCloseable {
-    private static String osname;
+
     private final MulticastSocket SOCKET;
     private final int PORT;
     private final Map<NetIf, MulticastSender> sendersMap = new ConcurrentHashMap<>();
@@ -49,12 +50,6 @@ private SetOutgoingIf() {
         }
     }
 
-    static boolean isWindows() {
-        if (osname == null)
-            osname = System.getProperty("os.name");
-        return osname.contains("Windows");
-    }
-
     static boolean isMacOS() {
         return System.getProperty("os.name").contains("OS X");
     }
@@ -82,10 +77,6 @@ public void close() {
     }
 
     public void run() throws Exception {
-        if (isWindows()) {
-            System.out.println("The test only run on non-Windows OS. Bye.");
-            return;
-        }
 
         if (!hasIPv6()) {
             System.out.println("No IPv6 available. Bye.");
diff --git a/test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.java b/test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.java
index 391c5fb0094..f50a886140a 100644
--- a/test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.java
+++ b/test/jdk/java/net/ServerSocket/AnotherSelectFdsLimit.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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8035897
  * @summary FD_SETSIZE should be set on macosx
+ * @requires os.family == "mac"
  * @run main/othervm AnotherSelectFdsLimit 1023
  * @run main/othervm AnotherSelectFdsLimit 1024
  * @run main/othervm AnotherSelectFdsLimit 1025
@@ -41,10 +42,6 @@ public class AnotherSelectFdsLimit {
     static final int DEFAULT_FDS_TO_USE = 1600;
 
     public static void main(String [] args) throws Exception {
-        if (!System.getProperty("os.name").contains("OS X")) {
-            System.out.println("Test only run on MAC. Exiting.");
-            return;
-        }
 
         int fdsToUse = DEFAULT_FDS_TO_USE;
         if (args.length == 1)
diff --git a/test/jdk/java/net/ServerSocket/SelectFdsLimit.java b/test/jdk/java/net/ServerSocket/SelectFdsLimit.java
index 2ecb1a28e1e..5ee45bc2299 100644
--- a/test/jdk/java/net/ServerSocket/SelectFdsLimit.java
+++ b/test/jdk/java/net/ServerSocket/SelectFdsLimit.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
@@ -27,6 +27,7 @@
  * @summary The total number of file descriptors is limited to
  * 1024(FDSET_SIZE) on MacOSX (the size of fd array passed to select()
  * call in java.net classes is limited to this value).
+ * @requires os.family == "mac"
  * @run main/othervm SelectFdsLimit
  * @author aleksej.efimov@oracle.com
  */
@@ -35,7 +36,6 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.ServerSocket;
 import java.net.SocketTimeoutException;
 
@@ -72,12 +72,6 @@ static void openFiles(int fn, File f) throws FileNotFoundException, IOException
 
     public static void main(String [] args) throws IOException, FileNotFoundException {
 
-        //The bug 8021820 is a Mac specific and because of that test will pass on all
-        //other platforms
-        if (!System.getProperty("os.name").contains("OS X")) {
-           return;
-        }
-
         //Create test directory with test files
         prepareTestEnv();
 

From fa765e7d346d26a1c5065830bd01d850720da8ae Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 7 May 2025 13:23:16 +0000
Subject: [PATCH 324/901] 8356335: Remove linux-x86 from jib profiles

Reviewed-by: erikj
---
 make/conf/jib-profiles.js | 100 +++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 55 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index f0cb6f451a3..172ed74f4cd 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -241,10 +241,10 @@ var getJibProfilesCommon = function (input, data) {
 
     // List of the main profile names used for iteration
     common.main_profile_names = [
-        "linux-x64", "linux-x86", "macosx-x64", "macosx-aarch64",
+        "macosx-x64", "macosx-aarch64",
         "windows-x64", "windows-aarch64",
-        "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x",
-        "linux-riscv64"
+        "linux-x64", "linux-aarch64",
+        "linux-arm32", "linux-ppc64le", "linux-s390x", "linux-riscv64"
     ];
 
     // These are the base settings for all the main build profiles.
@@ -283,9 +283,6 @@ var getJibProfilesCommon = function (input, data) {
         labels: "open"
     };
 
-    common.configure_args_64bit = ["--with-target-bits=64"];
-    common.configure_args_32bit = ["--with-target-bits=32"];
-
     /**
      * Define common artifacts template for all main profiles
      * @param o - Object containing data for artifacts
@@ -412,58 +409,34 @@ var getJibProfilesProfiles = function (input, common, data) {
 
     // Main SE profiles
     var profiles = {
-
-        "linux-x64": {
-            target_os: "linux",
-            target_cpu: "x64",
-            dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
-            configure_args: concat(
-                (input.build_cpu == "x64" ? common.configure_args_64bit
-                 : "--openjdk-target=x86_64-linux-gnu"),
-                "--with-zlib=system", "--disable-dtrace",
-                (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
-                    "--build=x86_64-unknown-linux-gnu" ] : [])),
-        },
-
-        "linux-x86": {
-            target_os: "linux",
-            target_cpu: "x86",
-            build_cpu: "x64",
-            dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: concat(common.configure_args_32bit, [
-                "--with-jvm-variants=minimal,server",
-                "--with-zlib=system",
-                "--with-libffi=" + input.get("libffi", "home_path"),
-                "--enable-libffi-bundling",
-                "--enable-fallback-linker"
-            ])
-        },
-
         "macosx-x64": {
             target_os: "macosx",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
-            configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
+            configure_args: [
+                "--with-zlib=system",
                 "--with-macosx-version-max=11.00.00",
                 "--enable-compatible-cds-alignment",
                 // Use system SetFile instead of the one in the devkit as the
                 // devkit one may not work on Catalina.
-                "SETFILE=/usr/bin/SetFile"),
+                "SETFILE=/usr/bin/SetFile"
+            ],
         },
 
         "macosx-aarch64": {
             target_os: "macosx",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
-            configure_args: concat(common.configure_args_64bit,
-                "--with-macosx-version-max=11.00.00"),
+            configure_args: [
+                "--with-macosx-version-max=11.00.00"
+            ],
         },
 
         "windows-x64": {
             target_os: "windows",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "pandoc"],
-            configure_args: concat(common.configure_args_64bit),
+            configure_args: [],
         },
 
         "windows-aarch64": {
@@ -475,7 +448,19 @@ var getJibProfilesProfiles = function (input, common, data) {
             ],
         },
 
-        "linux-aarch64": {
+        "linux-x64": {
+          target_os: "linux",
+          target_cpu: "x64",
+          dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
+          configure_args: concat(
+              "--with-zlib=system",
+              "--disable-dtrace",
+              (cross_compiling ? [ "--openjdk-target=x86_64-linux-gnu" ] : []),
+              (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
+                  "--build=x86_64-unknown-linux-gnu" ] : [])),
+        },
+
+       "linux-aarch64": {
             target_os: "linux",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
@@ -492,8 +477,10 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
-                "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
+                "--openjdk-target=arm-linux-gnueabihf",
+                "--with-freetype=bundled",
+                "--with-abi-profile=arm-vfp-hflt",
+                "--disable-warnings-as-errors"
             ],
         },
 
@@ -503,7 +490,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled",
+                "--openjdk-target=ppc64le-linux-gnu",
+                "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -514,7 +502,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled",
+                "--openjdk-target=s390x-linux-gnu",
+                "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -525,7 +514,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=riscv64-linux-gnu", "--with-freetype=bundled",
+                "--openjdk-target=riscv64-linux-gnu",
+                "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -586,24 +576,24 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: "linux",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: concat(common.configure_args_64bit, [
+            configure_args: [
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling",
-            ])
+            ]
         },
 
         "linux-aarch64-zero": {
             target_os: "linux",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: concat(common.configure_args_64bit, [
+            configure_args: [
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling"
-            ])
+            ]
         },
 
         "linux-x86-zero": {
@@ -611,12 +601,13 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_cpu: "x86",
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args:  concat(common.configure_args_32bit, [
+            configure_args: [
+                "--with-target-bits=32",
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling"
-            ])
+            ]
         }
     }
     profiles = concatObjects(profiles, zeroProfiles);
@@ -635,8 +626,10 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: "linux",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest"],
-            configure_args: concat(common.configure_args_64bit,
-                "--with-zlib=system", "--disable-precompiled-headers"),
+            configure_args: [
+                "--with-zlib=system",
+                "--disable-precompiled-headers"
+            ],
         },
     };
     profiles = concatObjects(profiles, noPchProfiles);
@@ -693,9 +686,6 @@ var getJibProfilesProfiles = function (input, common, data) {
         "linux-x64": {
             platform: "linux-x64",
         },
-        "linux-x86": {
-            platform: "linux-x86",
-        },
         "macosx-x64": {
             platform: "macos-x64",
             jdk_subdir: "jdk-" + data.version +  ".jdk/Contents/Home",

From a72f7506bf07be722c90ed64f5177699d2cebdb2 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 7 May 2025 13:23:28 +0000
Subject: [PATCH 325/901] 8356379: Need a proper way to test existence of
 binary from configure

Reviewed-by: erikj
---
 make/autoconf/boot-jdk.m4   | 14 ++++++++------
 make/autoconf/util_paths.m4 | 32 +++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
index d39e6e75a94..feb16c7d179 100644
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.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
@@ -180,11 +180,13 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
 [
-  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac, , NOFIXPATH)
-  UTIL_LOOKUP_PROGS(JAVA_CHECK, java, , NOFIXPATH)
-  BINARY="$JAVAC_CHECK"
-  if test "x$JAVAC_CHECK" = x; then
-    BINARY="$JAVA_CHECK"
+  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac)
+  UTIL_GET_EXECUTABLE(JAVAC_CHECK) # Will setup JAVAC_CHECK_EXECUTABLE
+  UTIL_LOOKUP_PROGS(JAVA_CHECK, java)
+  UTIL_GET_EXECUTABLE(JAVA_CHECK) # Will setup JAVA_CHECK_EXECUTABLE
+  BINARY="$JAVAC_CHECK_EXECUTABLE"
+  if test "x$JAVAC_CHECK_EXECUTABLE" = x; then
+    BINARY="$JAVA_CHECK_EXECUTABLE"
   fi
   if test "x$BINARY" != x; then
     # So there is a java(c) binary, it might be part of a JDK.
diff --git a/make/autoconf/util_paths.m4 b/make/autoconf/util_paths.m4
index 9e3e5472c9e..c3cc3955deb 100644
--- a/make/autoconf/util_paths.m4
+++ b/make/autoconf/util_paths.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
@@ -186,7 +186,6 @@ AC_DEFUN([UTIL_CHECK_WINENV_EXEC_TYPE],
 # it need to be in the PATH.
 # $1: The name of the variable to fix
 # $2: Where to look for the command (replaces $PATH)
-# $3: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
 AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
 [
   input="[$]$1"
@@ -282,10 +281,6 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
       fi
     fi
 
-    if test "x$3" = xNOFIXPATH; then
-      fixpath_prefix=""
-    fi
-
     # Now join together the path and the arguments once again
     new_complete="$fixpath_prefix$new_path$arguments"
     $1="$new_complete"
@@ -379,7 +374,6 @@ AC_DEFUN([UTIL_SETUP_TOOL],
 # $1: variable to set
 # $2: executable name (or list of names) to look for
 # $3: [path]
-# $4: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
 AC_DEFUN([UTIL_LOOKUP_PROGS],
 [
   UTIL_SETUP_TOOL($1, [
@@ -421,10 +415,8 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
 
             # If we have FIXPATH enabled, strip all instances of it and prepend
             # a single one, to avoid double fixpath prefixing.
-            if test "x$4" != xNOFIXPATH; then
-              [ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
-                result="\$FIXPATH ${result#"$FIXPATH "}"
-              fi
+            [ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
+              result="\$FIXPATH ${result#"$FIXPATH "}"
             fi
             AC_MSG_RESULT([$result])
             break 2;
@@ -515,6 +507,24 @@ AC_DEFUN([UTIL_ADD_FIXPATH],
   fi
 ])
 
+################################################################################
+# Return a path to the executable binary from a command line, stripping away
+# any FIXPATH prefix or arguments. The resulting value can be checked for
+# existence using "test -e". The result is returned in a variable named
+# "$1_EXECUTABLE".
+#
+# $1: variable describing the command to get the binary for
+AC_DEFUN([UTIL_GET_EXECUTABLE],
+[
+  # Strip the FIXPATH prefix, if any
+  fixpath_stripped="[$]$1"
+  [ if [[ $FIXPATH != "" && $fixpath_stripped =~ ^"$FIXPATH " ]]; then ]
+      fixpath_stripped="${fixpath_stripped#"$FIXPATH "}"
+  fi
+  # Remove any arguments following the binary
+  $1_EXECUTABLE="${fixpath_stripped%% *}"
+])
+
 ################################################################################
 AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
 [

From ca5e0b1848054848fb5e39eebac06f2011cceb2e Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 7 May 2025 13:28:46 +0000
Subject: [PATCH 326/901] 8282493: Add --with-jcov-modules convenience option

Reviewed-by: erikj
---
 doc/testing.html                |  7 +++++++
 doc/testing.md                  |  8 ++++++++
 make/Coverage.gmk               | 15 +++++++++++----
 make/RunTests.gmk               | 12 +++++++++---
 make/autoconf/jdk-options.m4    |  9 +++++++++
 make/autoconf/spec.gmk.template |  3 ++-
 6 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index 6285fab1682..c1c0f15fed9 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -411,6 +411,13 @@ <h4 id="jcov">JCOV</h4>
 special target <code>jcov-test</code> instead of <code>test</code>, e.g.
 <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov
 image is built, and that JCov reporting is enabled.</p>
+<p>To include JCov coverage for just a subset of all modules, you can
+use the <code>--with-jcov-modules</code> arguments to
+<code>configure</code>, e.g.
+<code>--with-jcov-modules=jdk.compiler,java.desktop</code>.</p>
+<p>For more fine-grained control, you can pass arbitrary filters to JCov
+using <code>--with-jcov-filters</code>, and you can specify a specific
+JDK to instrument using <code>--with-jcov-input-jdk</code>.</p>
 <p>The JCov report is stored in
 <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory
diff --git a/doc/testing.md b/doc/testing.md
index 351690c5e60..f6a25457b5e 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -345,6 +345,14 @@ The simplest way to run tests with JCov coverage report is to use the special
 target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
 will make sure the JCov image is built, and that JCov reporting is enabled.
 
+To include JCov coverage for just a subset of all modules, you can use the
+`--with-jcov-modules` arguments to `configure`, e.g.
+`--with-jcov-modules=jdk.compiler,java.desktop`.
+
+For more fine-grained control, you can pass arbitrary filters to JCov using
+`--with-jcov-filters`, and you can specify a specific JDK to instrument
+using `--with-jcov-input-jdk`.
+
 The JCov report is stored in `build/$BUILD/test-results/jcov-output/report`.
 
 Please note that running with JCov reporting can be very memory intensive.
diff --git a/make/Coverage.gmk b/make/Coverage.gmk
index 2fd4e4ec6d4..a375c343185 100644
--- a/make/Coverage.gmk
+++ b/make/Coverage.gmk
@@ -34,21 +34,28 @@ else
   JCOV_INPUT_IMAGE_DIR := $(JDK_IMAGE_DIR)
 endif
 
+JCOV_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/jcov
+
 #moving instrumented jdk image in and out of jcov_temp because of CODETOOLS-7902299
-JCOV_TEMP := $(SUPPORT_OUTPUTDIR)/jcov_temp
+JCOV_TEMP := $(JCOV_SUPPORT_DIR)/temp
+
+ifneq ($(JCOV_MODULES), )
+  JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
+endif
 
 $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	$(call LogWarn, Creating instrumented jdk image with JCov)
 	$(call MakeDir, $(JCOV_TEMP) $(IMAGES_OUTPUTDIR))
 	$(RM) -r $(JCOV_IMAGE_DIR) $(JCOV_TEMP)/*
 	$(CP) -r $(JCOV_INPUT_IMAGE_DIR) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
-	$(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
+	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov, \
+	    $(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
 	    -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
 	    -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
 	    -exclude 'java.lang.Object' \
 	    -exclude jdk.test.Main -exclude '**\$Proxy*' \
-	    $(JCOV_FILTERS) \
-	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
+	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
+	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR))
 	$(MV) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(JCOV_IMAGE_DIR)
 	$(RMDIR) $(JCOV_TEMP)
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 4881d585e5c..3c0280353a9 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -115,6 +115,7 @@ JTREG_COV_OPTIONS :=
 
 ifeq ($(TEST_OPTS_JCOV), true)
   JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
+  JCOV_SUPPORT_DIR := $(TEST_SUPPORT_DIR)/jcov-support
   JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
   JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
   JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
@@ -1363,6 +1364,10 @@ ifeq ($(TEST_OPTS_JCOV), true)
 	$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
 
   JCOV_REPORT_TITLE := JDK code coverage report<br/>
+  ifneq ($(JCOV_MODULES), )
+    JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
+    JCOV_REPORT_TITLE += Included modules: $(JCOV_MODULES)<br>
+  endif
   ifneq ($(JCOV_FILTERS), )
     JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
   endif
@@ -1370,11 +1375,12 @@ ifeq ($(TEST_OPTS_JCOV), true)
 
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
-	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov-repgen, \
+	    $(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
 	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
-	    $(JCOV_FILTERS) \
+	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
 	    -mainReportTitle "$(JCOV_REPORT_TITLE)" \
-	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
+	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE))
 
   TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \
       jcov-gen-report
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index f8a512f503d..289ed935fdf 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -405,10 +405,19 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
       JCOV_FILTERS="$with_jcov_filters"
     fi
   fi
+
+  UTIL_ARG_WITH(NAME: jcov-modules, TYPE: string,
+      DEFAULT: [], RESULT: JCOV_MODULES_COMMMA_SEPARATED,
+      DESC: [which modules to include in jcov (comma-separated)],
+      OPTIONAL: true)
+
+  # Replace ","  with " ".
+  JCOV_MODULES=${JCOV_MODULES_COMMMA_SEPARATED//,/ }
   AC_SUBST(JCOV_ENABLED)
   AC_SUBST(JCOV_HOME)
   AC_SUBST(JCOV_INPUT_JDK)
   AC_SUBST(JCOV_FILTERS)
+  AC_SUBST(JCOV_MODULES)
 ])
 
 ################################################################################
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index ebaa487b40a..e720916d88a 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -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
@@ -454,6 +454,7 @@ JCOV_ENABLED := @JCOV_ENABLED@
 JCOV_HOME := @JCOV_HOME@
 JCOV_INPUT_JDK := @JCOV_INPUT_JDK@
 JCOV_FILTERS := @JCOV_FILTERS@
+JCOV_MODULES := @JCOV_MODULES@
 
 # AddressSanitizer
 ASAN_ENABLED := @ASAN_ENABLED@

From d7e648bb2737362d3cba3350cae63b1013967a66 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 7 May 2025 14:08:21 +0000
Subject: [PATCH 327/901] 8355775: Improve symbolic sharing in dynamic constant
 pool entries

Reviewed-by: asotona
---
 .../java/lang/classfile/CodeBuilder.java      |  4 +-
 .../constantpool/ConstantPoolBuilder.java     | 13 +++--
 .../classfile/impl/AbstractPoolEntry.java     | 54 +++++++++++++++++--
 .../classfile/impl/BytecodeHelpers.java       | 36 +------------
 .../classfile/impl/SplitConstantPool.java     |  5 ++
 .../classfile/impl/StackMapGenerator.java     |  4 +-
 6 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index 9eafaa2df9c..6b1751476f7 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -2483,7 +2483,7 @@ default CodeBuilder invokedynamic(DynamicCallSiteDesc ref) {
         var cpArgs = ref.bootstrapArgs();
         List<LoadableConstantEntry> bsArguments = new ArrayList<>(cpArgs.length);
         for (var constantValue : cpArgs) {
-            bsArguments.add(BytecodeHelpers.constantEntry(constantPool(), constantValue));
+            bsArguments.add(constantPool().loadableConstantEntry(requireNonNull(constantValue)));
         }
         BootstrapMethodEntry bm = constantPool().bsmEntry(bsMethod, bsArguments);
         NameAndTypeEntry nameAndType = constantPool().nameAndTypeEntry(ref.invocationName(), ref.invocationType());
@@ -2941,7 +2941,7 @@ default CodeBuilder lconst_1() {
      * @see ConstantInstruction.LoadConstantInstruction
      */
     default CodeBuilder ldc(ConstantDesc value) {
-        return ldc(BytecodeHelpers.constantEntry(constantPool(), value));
+        return ldc(constantPool().loadableConstantEntry(requireNonNull(value)));
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java b/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
index b7145eeb59c..6b75126a90f 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import jdk.internal.classfile.impl.AbstractPoolEntry;
 import jdk.internal.classfile.impl.AbstractPoolEntry.ClassEntryImpl;
 import jdk.internal.classfile.impl.ClassReaderImpl;
 import jdk.internal.classfile.impl.SplitConstantPool;
@@ -385,11 +386,13 @@ default InterfaceMethodRefEntry interfaceMethodRefEntry(ClassDesc owner, String
     default MethodHandleEntry methodHandleEntry(DirectMethodHandleDesc descriptor) {
         var owner = classEntry(descriptor.owner());
         var nat = nameAndTypeEntry(utf8Entry(descriptor.methodName()), utf8Entry(descriptor.lookupDescriptor()));
-        return methodHandleEntry(descriptor.refKind(), switch (descriptor.kind()) {
+        var ret = methodHandleEntry(descriptor.refKind(), switch (descriptor.kind()) {
             case GETTER, SETTER, STATIC_GETTER, STATIC_SETTER -> fieldRefEntry(owner, nat);
             case INTERFACE_STATIC, INTERFACE_VIRTUAL, INTERFACE_SPECIAL -> interfaceMethodRefEntry(owner, nat);
             case STATIC, VIRTUAL, SPECIAL, CONSTRUCTOR -> methodRefEntry(owner, nat);
         });
+        ((AbstractPoolEntry.MethodHandleEntryImpl) ret).sym = descriptor;
+        return ret;
     }
 
     /**
@@ -414,7 +417,9 @@ default MethodHandleEntry methodHandleEntry(DirectMethodHandleDesc descriptor) {
      * @see InvokeDynamicEntry#asSymbol() InvokeDynamicEntry::asSymbol
      */
     default InvokeDynamicEntry invokeDynamicEntry(DynamicCallSiteDesc dcsd) {
-        return invokeDynamicEntry(bsmEntry((DirectMethodHandleDesc)dcsd.bootstrapMethod(), List.of(dcsd.bootstrapArgs())), nameAndTypeEntry(dcsd.invocationName(), dcsd.invocationType()));
+        var ret = invokeDynamicEntry(bsmEntry((DirectMethodHandleDesc)dcsd.bootstrapMethod(), List.of(dcsd.bootstrapArgs())), nameAndTypeEntry(dcsd.invocationName(), dcsd.invocationType()));
+        ((AbstractPoolEntry.InvokeDynamicEntryImpl) ret).sym = dcsd;
+        return ret;
     }
 
     /**
@@ -440,7 +445,9 @@ InvokeDynamicEntry invokeDynamicEntry(BootstrapMethodEntry bootstrapMethodEntry,
      * @see ConstantDynamicEntry#asSymbol() ConstantDynamicEntry::asSymbol
      */
     default ConstantDynamicEntry constantDynamicEntry(DynamicConstantDesc<?> dcd) {
-        return constantDynamicEntry(bsmEntry(dcd.bootstrapMethod(), List.of(dcd.bootstrapArgs())), nameAndTypeEntry(dcd.constantName(), dcd.constantType()));
+        var ret = constantDynamicEntry(bsmEntry(dcd.bootstrapMethod(), List.of(dcd.bootstrapArgs())), nameAndTypeEntry(dcd.constantName(), dcd.constantType()));
+        ((AbstractPoolEntry.ConstantDynamicEntryImpl) ret).sym = dcd;
+        return ret;
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index bf558ddef16..962a2057585 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -295,9 +295,13 @@ private ConstantPoolException malformedInput(int px) {
 
         @Override
         public Utf8EntryImpl clone(ConstantPoolBuilder cp) {
-            return (state == State.STRING && rawBytes == null)
+            var ret = (state == State.STRING && rawBytes == null)
                    ? (Utf8EntryImpl) cp.utf8Entry(stringValue)
                    : ((SplitConstantPool) cp).maybeCloneUtf8Entry(this);
+            var mySym = this.typeSym;
+            if (ret.typeSym == null && mySym != null)
+                ret.typeSym = mySym;
+            return ret;
         }
 
         @Override
@@ -939,6 +943,8 @@ public static final class InvokeDynamicEntryImpl
             extends AbstractDynamicConstantPoolEntry
             implements InvokeDynamicEntry {
 
+        public @Stable DynamicCallSiteDesc sym;
+
         InvokeDynamicEntryImpl(ConstantPool cpm, int index, int hash, BootstrapMethodEntryImpl bootstrapMethod,
                                    NameAndTypeEntryImpl nameAndType) {
             super(cpm, index, hash, bootstrapMethod, nameAndType);
@@ -957,13 +963,27 @@ public int tag() {
 
         @Override
         public InvokeDynamicEntry clone(ConstantPoolBuilder cp) {
-            return cp.invokeDynamicEntry(bootstrap(), nameAndType());
+            var ret = (InvokeDynamicEntryImpl) cp.invokeDynamicEntry(bootstrap(), nameAndType());
+            var mySym = this.sym;
+            if (ret.sym == null && mySym != null)
+                ret.sym = mySym;
+            return ret;
+        }
+
+        @Override
+        public DynamicCallSiteDesc asSymbol() {
+            var cache = this.sym;
+            if (cache != null)
+                return cache;
+            return this.sym = InvokeDynamicEntry.super.asSymbol();
         }
     }
 
     public static final class ConstantDynamicEntryImpl extends AbstractDynamicConstantPoolEntry
             implements ConstantDynamicEntry {
 
+        public @Stable DynamicConstantDesc<?> sym;
+
         ConstantDynamicEntryImpl(ConstantPool cpm, int index, int hash, BootstrapMethodEntryImpl bootstrapMethod,
                                      NameAndTypeEntryImpl nameAndType) {
             super(cpm, index, hash, bootstrapMethod, nameAndType);
@@ -982,7 +1002,19 @@ public int tag() {
 
         @Override
         public ConstantDynamicEntry clone(ConstantPoolBuilder cp) {
-            return cp.constantDynamicEntry(bootstrap(), nameAndType());
+            var ret = (ConstantDynamicEntryImpl) cp.constantDynamicEntry(bootstrap(), nameAndType());
+            var mySym = this.sym;
+            if (ret.sym == null && mySym != null)
+                ret.sym = mySym;
+            return ret;
+        }
+
+        @Override
+        public DynamicConstantDesc<?> asSymbol() {
+            var cache = this.sym;
+            if (cache != null)
+                return cache;
+            return this.sym = ConstantDynamicEntry.super.asSymbol();
         }
     }
 
@@ -991,6 +1023,7 @@ public static final class MethodHandleEntryImpl extends AbstractPoolEntry
 
         private final int refKind;
         private final AbstractPoolEntry.AbstractMemberRefEntry reference;
+        public @Stable DirectMethodHandleDesc sym;
 
         MethodHandleEntryImpl(ConstantPool cpm, int index, int hash, int refKind, AbstractPoolEntry.AbstractMemberRefEntry
                 reference) {
@@ -1023,7 +1056,14 @@ public AbstractPoolEntry.AbstractMemberRefEntry reference() {
 
         @Override
         public DirectMethodHandleDesc asSymbol() {
-            return MethodHandleDesc.of(
+            var cache = this.sym;
+            if (cache != null)
+                return cache;
+            return computeSymbol();
+        }
+
+        private DirectMethodHandleDesc computeSymbol() {
+            return this.sym = MethodHandleDesc.of(
                     DirectMethodHandleDesc.Kind.valueOf(kind(), reference() instanceof InterfaceMethodRefEntry),
                     ((MemberRefEntry) reference()).owner().asSymbol(),
                     ((MemberRefEntry) reference()).nameAndType().name().stringValue(),
@@ -1037,7 +1077,11 @@ void writeTo(BufWriterImpl pool) {
 
         @Override
         public MethodHandleEntry clone(ConstantPoolBuilder cp) {
-            return cp.methodHandleEntry(refKind, reference);
+            var ret = (MethodHandleEntryImpl) cp.methodHandleEntry(refKind, reference);
+            var mySym = this.sym;
+            if (ret.sym == null && mySym != null)
+                ret.sym = mySym;
+            return ret;
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BytecodeHelpers.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BytecodeHelpers.java
index 25daf4e4648..a51728eb3e9 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BytecodeHelpers.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BytecodeHelpers.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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,12 +29,10 @@
 import java.lang.classfile.Opcode;
 import java.lang.classfile.TypeKind;
 import java.lang.classfile.constantpool.*;
-import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.DynamicConstantDesc;
-import java.lang.constant.MethodTypeDesc;
 import java.lang.invoke.MethodHandleInfo;
 import java.util.ArrayList;
 import java.util.List;
@@ -515,38 +513,6 @@ public static Opcode ldcOpcode(LoadableConstantEntry entry) {
                 : Opcode.LDC;
     }
 
-    public static LoadableConstantEntry constantEntry(ConstantPoolBuilder constantPool,
-                                                      ConstantDesc constantValue) {
-        // this method is invoked during JVM bootstrap - cannot use pattern switch
-        if (constantValue instanceof Integer value) {
-            return constantPool.intEntry(value);
-        }
-        if (constantValue instanceof String value) {
-            return constantPool.stringEntry(value);
-        }
-        if (constantValue instanceof ClassDesc value && !value.isPrimitive()) {
-            return constantPool.classEntry(value);
-        }
-        if (constantValue instanceof Long value) {
-            return constantPool.longEntry(value);
-        }
-        if (constantValue instanceof Float value) {
-            return constantPool.floatEntry(value);
-        }
-        if (constantValue instanceof Double value) {
-            return constantPool.doubleEntry(value);
-        }
-        if (constantValue instanceof MethodTypeDesc value) {
-            return constantPool.methodTypeEntry(value);
-        }
-        if (constantValue instanceof DirectMethodHandleDesc value) {
-            return handleDescToHandleInfo(constantPool, value);
-        } if (constantValue instanceof DynamicConstantDesc<?> value) {
-            return handleConstantDescToHandleInfo(constantPool, value);
-        }
-        throw new UnsupportedOperationException("not yet: " + requireNonNull(constantValue));
-    }
-
     public static ConstantDesc intrinsicConstantValue(Opcode opcode) {
         return switch (opcode) {
             case ACONST_NULL -> ConstantDescs.NULL;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
index 2ea6fa943a7..5a5f2908ae6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
@@ -30,6 +30,7 @@
 import java.lang.classfile.attribute.BootstrapMethodsAttribute;
 import java.lang.classfile.constantpool.*;
 import java.lang.constant.ClassDesc;
+import java.lang.constant.DynamicCallSiteDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.util.Arrays;
 import java.util.List;
@@ -521,6 +522,10 @@ public ClassEntry classEntry(ClassDesc cd) {
     AbstractPoolEntry.ClassEntryImpl cloneClassEntry(AbstractPoolEntry.ClassEntryImpl e) {
         var ce = tryFindClassEntry(e.hashCode(), e.ref1);
         if (ce != null) {
+            var mySym = e.sym;
+            if (ce.sym == null && mySym != null) {
+                ce.sym = mySym;
+            }
             return ce;
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
index 7e16aea5a52..eb17e99a94d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
@@ -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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -716,7 +716,7 @@ private void processLdc(int index) {
             case TAG_METHOD_TYPE ->
                 currentFrame.pushStack(Type.METHOD_TYPE);
             case TAG_DYNAMIC ->
-                currentFrame.pushStack(cp.entryByIndex(index, ConstantDynamicEntry.class).asSymbol().constantType());
+                currentFrame.pushStack(cp.entryByIndex(index, ConstantDynamicEntry.class).typeSymbol());
             default ->
                 throw generatorError("CP entry #%d %s is not loadable constant".formatted(index, cp.entryByIndex(index).tag()));
         }

From 90f0f1b88badbf1f72d7b9434621457aa47cde30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gbarany@openjdk.org>
Date: Wed, 7 May 2025 14:49:37 +0000
Subject: [PATCH 328/901] 8354443: [Graal] crash after deopt in
 TestG1BarrierGeneration.java

Reviewed-by: dnsimon, yzheng
---
 src/hotspot/share/code/nmethod.inline.hpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.inline.hpp b/src/hotspot/share/code/nmethod.inline.hpp
index 49af1e0b95f..1e556b68250 100644
--- a/src/hotspot/share/code/nmethod.inline.hpp
+++ b/src/hotspot/share/code/nmethod.inline.hpp
@@ -33,21 +33,12 @@
 
 inline bool nmethod::is_deopt_pc(address pc) { return is_deopt_entry(pc) || is_deopt_mh_entry(pc); }
 
-// When using JVMCI the address might be off by the size of a call instruction.
 inline bool nmethod::is_deopt_entry(address pc) {
-  return pc == deopt_handler_begin()
-#if INCLUDE_JVMCI
-    || (is_compiled_by_jvmci() && pc == (deopt_handler_begin() + NativeCall::byte_size()))
-#endif
-    ;
+  return pc == deopt_handler_begin();
 }
 
 inline bool nmethod::is_deopt_mh_entry(address pc) {
-  return pc == deopt_mh_handler_begin()
-#if INCLUDE_JVMCI
-    || (is_compiled_by_jvmci() && pc == (deopt_mh_handler_begin() + NativeCall::byte_size()))
-#endif
-    ;
+  return pc == deopt_mh_handler_begin();
 }
 
 // class ExceptionCache methods

From c8a30c2aaba04c11b70a4f74ee74452250be6e59 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 7 May 2025 15:42:00 +0000
Subject: [PATCH 329/901] 8347004:
 vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java fails
 with CDS disabled

Reviewed-by: coleenp
---
 .../metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
index fffb10bbb3a..eee6a8442b6 100644
--- a/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
+++ b/test/hotspot/jtreg/vmTestbase/metaspace/shrink_grow/ShrinkGrowTest/ShrinkGrowTest.java
@@ -31,8 +31,8 @@
  * @requires vm.opt.final.ClassUnloading
  * @library /vmTestbase /test/lib
  * @run main/othervm
- *      -XX:MetaspaceSize=10m
- *      -XX:MaxMetaspaceSize=10m
+ *      -XX:MetaspaceSize=20m
+ *      -XX:MaxMetaspaceSize=20m
  *      -Xlog:gc*:gc.log
  *      metaspace.shrink_grow.ShrinkGrowTest.ShrinkGrowTest
  */

From da5dc5287b3a81909a5c316f164f7f42d07d3664 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 7 May 2025 16:52:45 +0000
Subject: [PATCH 330/901] 8356025: Provide a PrintVMInfoAtExit diagnostic
 switch

Reviewed-by: mbaesken, jsikstro
---
 src/hotspot/share/runtime/globals.hpp         |  3 +
 src/hotspot/share/runtime/java.cpp            |  7 +++
 .../ErrorHandling/PrintVMInfoAtExitTest.java  | 60 +++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 29f0948276a..10eecf1f097 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -702,6 +702,9 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, PrintClassLoaderDataGraphAtExit, false,                     \
           "Print the class loader data graph at exit")                      \
                                                                             \
+  product(bool, PrintVMInfoAtExit, false, DIAGNOSTIC,                       \
+          "Executes the VM.info diagnostic command at exit")                \
+                                                                            \
   product(bool, AllowParallelDefineClass, false,                            \
           "Allow parallel defineClass requests for class loaders "          \
           "registering as parallel capable")                                \
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index b3ad15ae3ff..1079212a843 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -332,6 +332,13 @@ void print_statistics() {
 
   print_bytecode_count();
 
+  if (PrintVMInfoAtExit) {
+    // Use an intermediate stream to prevent deadlocking on tty_lock
+    stringStream ss;
+    VMError::print_vm_info(&ss);
+    tty->print_raw(ss.base());
+  }
+
   if (PrintSystemDictionaryAtExit) {
     ResourceMark rm;
     MutexLocker mcld(ClassLoaderDataGraph_lock);
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
new file mode 100644
index 00000000000..2b9393e3d35
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/PrintVMInfoAtExitTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 PrintVMInfoAtExit
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @requires vm.flagless
+ * @requires vm.bits == "64"
+ * @run driver PrintVMInfoAtExitTest
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class PrintVMInfoAtExitTest {
+
+  public static void main(String[] args) throws Exception {
+    ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-Xmx64M", "-Xms64M",
+            "-XX:-CreateCoredumpOnCrash",
+            "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:+PrintVMInfoAtExit",
+            "-XX:NativeMemoryTracking=summary",
+            "-XX:CompressedClassSpaceSize=256m",
+            "-version");
+
+    OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+    output_detail.shouldContain("# JRE version:");
+    output_detail.shouldContain("--  S U M M A R Y --");
+    output_detail.shouldContain("Command Line: -Xmx64M -Xms64M -XX:-CreateCoredumpOnCrash -XX:+UnlockDiagnosticVMOptions -XX:+PrintVMInfoAtExit -XX:NativeMemoryTracking=summary -XX:CompressedClassSpaceSize=256m");
+    output_detail.shouldContain("Native Memory Tracking:");
+    output_detail.shouldContain("Java Heap (reserved=65536KB, committed=65536KB)");
+  }
+}
+
+

From 40f696dbe49f348327bf0f3dc6493a7110918813 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 7 May 2025 17:36:37 +0000
Subject: [PATCH 331/901] 8356318: Unexpected VerifyError in AOT training run

Reviewed-by: shade, kvn
---
 src/hotspot/share/classfile/verifier.cpp      | 16 ++--
 .../cds/appcds/aotCache/VerifierFailOver.java | 65 +++++++++++++
 .../aotCache/VerifierFailOver_Helper.jcod     | 96 +++++++++++++++++++
 .../jdk/test/lib/cds/SimpleCDSAppTester.java  | 18 +++-
 4 files changed, 185 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver_Helper.jcod

diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index d8f9b8589ef..51145d441c9 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -223,12 +223,9 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
     split_verifier.verify_class(THREAD);
     exception_name = split_verifier.result();
 
-    // If dumping static archive then don't fall back to the old verifier on
-    // verification failure. If a class fails verification with the split verifier,
-    // it might fail the CDS runtime verifier constraint check. In that case, we
-    // don't want to share the class. We only archive classes that pass the split
-    // verifier.
-    bool can_failover = !CDSConfig::is_dumping_static_archive() &&
+    // If dumping {classic, final} static archive, don't bother to run the old verifier, as
+    // the class will be excluded from the archive anyway.
+    bool can_failover = !(CDSConfig::is_dumping_classic_static_archive() || CDSConfig::is_dumping_final_static_archive()) &&
       klass->major_version() < NOFAILOVER_MAJOR_VERSION;
 
     if (can_failover && !HAS_PENDING_EXCEPTION &&  // Split verifier doesn't set PENDING_EXCEPTION for failure
@@ -237,9 +234,10 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
       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");
+      // Exclude any classes that are verified with the old verifier, as the old verifier
+      // doesn't call SystemDictionaryShared::add_verification_constraint()
+      if (CDSConfig::is_dumping_archive()) {
+        SystemDictionaryShared::warn_excluded(klass, "Verified with old verifier");
         SystemDictionaryShared::set_excluded(klass);
       }
 #endif
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
new file mode 100644
index 00000000000..e53775a2041
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
@@ -0,0 +1,65 @@
+/*
+ * 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 AOTCache
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build VerifierFailOver_Helper
+ * @build VerifierFailOver
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar VerifierFailOverApp VerifierFailOver_Helper
+ * @run driver VerifierFailOver
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class VerifierFailOver {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("VerifierFailOver")
+            .addVmArgs("-Xlog:cds+class=debug")
+            .classpath("app.jar")
+            .appCommandLine("VerifierFailOverApp")
+            .setTrainingChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Skipping VerifierFailOver_Helper: Verified with old verifier");
+                })
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    // classes verified with fail-over mode should not be cached.
+                    out.shouldMatch("class.* klasses.* VerifierFailOverApp");
+                    out.shouldNotMatch("class.* klasses.* VerifierFailOver_Helper");
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class VerifierFailOverApp {
+    public static void main(String[] args) throws Throwable {
+        Class goodClass = Class.forName("VerifierFailOver_Helper");
+        Object obj = goodClass.newInstance();
+        System.out.println("Successfully loaded: " + obj.getClass().getName());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver_Helper.jcod b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver_Helper.jcod
new file mode 100644
index 00000000000..43081e98a5e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver_Helper.jcod
@@ -0,0 +1,96 @@
+/*
+ * 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 class should be rejected by the new verifier, but will be accepted by the old verifier.
+
+class VerifierFailOver_Helper {
+  0xCAFEBABE;
+  0;
+  50;
+  [] { // Constant Pool
+    ; // first element is empty
+    Method #3 #5; // #1    
+    Utf8 "StackMapTable"; // #2    
+    class #4; // #3    
+    Utf8 "java/lang/Object"; // #4    
+    NameAndType #12 #7; // #5    
+    Utf8 "SourceFile"; // #6    
+    Utf8 "()V"; // #7    
+    class #9; // #8    
+    Utf8 "VerifierFailOver_Helper"; // #9    
+    Utf8 "Code"; // #10    
+    Utf8 "VerifierFailOver_Helper.jasm"; // #11    
+    Utf8 "<init>"; // #12    
+    Utf8 "stackmap"; // #13
+  } // Constant Pool
+
+  0x0000; // access
+  #8;// this_cpx
+  #3;// super_cpx
+
+  [] { // Interfaces
+  } // Interfaces
+
+  [] { // fields
+  } // fields
+
+  [] { // methods
+    { // Member
+      0x0001; // access
+      #12; // name_cpx
+      #7; // sig_cpx
+      [] { // Attributes
+        Attr(#10) { // Code
+          1; // max_stack
+          1; // max_locals
+          Bytes[]{
+            0x2AB70001B100B1;
+          };
+          [] { // Traps
+          } // end Traps
+          [] { // Attributes
+/* right:
+            Attr(#2) { // StackMap
+end right */
+// wrong:
+            Attr(#13) { // stackmap
+// end wrong
+              [] { // 
+                255b,  5, []{I}, []{};
+              }
+            } // end StackMap
+          } // Attributes
+        } // end Code
+      } // Attributes
+    } // Member
+  } // methods
+
+  [] { // Attributes
+    Attr(#6) { // SourceFile
+      #11;
+    } // end SourceFile
+  } // Attributes
+} // end class stackmap00303m1n
+
+
diff --git a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
index 7ab28ebb369..c869cfa366b 100644
--- a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
@@ -51,6 +51,7 @@
  */
 public class SimpleCDSAppTester {
     private String name;
+    private BiConsumer<OutputAnalyzer, RunMode> trainingChecker;
     private BiConsumer<OutputAnalyzer, RunMode> assemblyChecker;
     private BiConsumer<OutputAnalyzer, RunMode> productionChecker;
     private String classpath;
@@ -100,6 +101,11 @@ public SimpleCDSAppTester appCommandLine(String... args) {
         return this;
     }
 
+    public SimpleCDSAppTester setTrainingChecker(BiConsumer<OutputAnalyzer, RunMode> checker) {
+        this.trainingChecker = checker;
+        return this;
+    }
+
     public SimpleCDSAppTester setAssemblyChecker(BiConsumer<OutputAnalyzer, RunMode> checker) {
         this.assemblyChecker = checker;
         return this;
@@ -110,6 +116,12 @@ public SimpleCDSAppTester setProductionChecker(BiConsumer<OutputAnalyzer, RunMod
         return this;
     }
 
+    public SimpleCDSAppTester setTrainingChecker(Consumer<OutputAnalyzer> checker) {
+        this.trainingChecker = (OutputAnalyzer out, RunMode runMode) -> {
+            checker.accept(out);
+        };
+        return this;
+    }
 
     public SimpleCDSAppTester setAssemblyChecker(Consumer<OutputAnalyzer> checker) {
         this.assemblyChecker = (OutputAnalyzer out, RunMode runMode) -> {
@@ -152,7 +164,11 @@ public String[] appCommandLine(RunMode runMode) {
 
         @Override
         public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
-            if (isDumping(runMode) && runMode != RunMode.TRAINING) {
+            if (runMode == RunMode.TRAINING) {
+                if (trainingChecker != null) {
+                    trainingChecker.accept(out, runMode);
+                }
+            } else if (isDumping(runMode)) {
                 if (assemblyChecker != null) {
                     assemblyChecker.accept(out, runMode);
                 }

From 28e6b7cb7462b0e231698c86ff57828e9e288087 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 7 May 2025 17:40:44 +0000
Subject: [PATCH 332/901] 8351313: VM crashes when
 AOTMode/AOTCache/AOTConfiguration are empty

Reviewed-by: ccheung, shade, kvn
---
 src/hotspot/share/cds/cds_globals.hpp         |  2 ++
 .../flags/jvmFlagConstraintsRuntime.cpp       | 22 ++++++++++++++++++-
 .../flags/jvmFlagConstraintsRuntime.hpp       |  2 ++
 .../jtreg/runtime/cds/appcds/AOTFlags.java    | 14 ++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index 26853a3fb74..b5657a73ef1 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -112,9 +112,11 @@
           "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. ")       \
+          constraint(AOTConfigurationConstraintFunc, AtParse)               \
                                                                             \
   product(ccstr, AOTCache, nullptr,                                         \
           "Cache for improving start up and warm up")                       \
+          constraint(AOTCacheConstraintFunc, AtParse)                       \
                                                                             \
   product(bool, AOTInvokeDynamicLinking, false, DIAGNOSTIC,                 \
           "AOT-link JVM_CONSTANT_InvokeDynamic entries in cached "          \
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
index d85b0645b7b..efffa8ac753 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
@@ -31,7 +31,27 @@
 #include "runtime/task.hpp"
 #include "utilities/powerOfTwo.hpp"
 
+JVMFlag::Error AOTCacheConstraintFunc(ccstr value, bool verbose) {
+  if (value == nullptr) {
+    JVMFlag::printError(verbose, "AOTCache cannot be empty\n");
+    return JVMFlag::VIOLATES_CONSTRAINT;
+  }
+  return JVMFlag::SUCCESS;
+}
+
+JVMFlag::Error AOTConfigurationConstraintFunc(ccstr value, bool verbose) {
+  if (value == nullptr) {
+    JVMFlag::printError(verbose, "AOTConfiguration cannot be empty\n");
+    return JVMFlag::VIOLATES_CONSTRAINT;
+  }
+  return JVMFlag::SUCCESS;
+}
+
 JVMFlag::Error AOTModeConstraintFunc(ccstr value, bool verbose) {
+  if (value == nullptr) {
+    JVMFlag::printError(verbose, "AOTMode cannot be empty\n");
+    return JVMFlag::VIOLATES_CONSTRAINT;
+  }
   if (strcmp(value, "off") != 0 &&
       strcmp(value, "record") != 0 &&
       strcmp(value, "create") != 0 &&
@@ -43,9 +63,9 @@ JVMFlag::Error AOTModeConstraintFunc(ccstr value, bool verbose) {
                         value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
-
   return JVMFlag::SUCCESS;
 }
+
 JVMFlag::Error ObjectAlignmentInBytesConstraintFunc(int value, bool verbose) {
   if (!is_power_of_2(value)) {
     JVMFlag::printError(verbose,
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
index 20d420a8e7e..3040dafabc5 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
@@ -34,6 +34,8 @@
  */
 
 #define RUNTIME_CONSTRAINTS(f)                        \
+  f(ccstr,  AOTCacheConstraintFunc)                   \
+  f(ccstr,  AOTConfigurationConstraintFunc)           \
   f(ccstr,  AOTModeConstraintFunc)                    \
   f(int,    ObjectAlignmentInBytesConstraintFunc)     \
   f(int,    ContendedPaddingWidthConstraintFunc)      \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
index 46f76fab368..53036071fe3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
@@ -354,6 +354,20 @@ static void negativeTests() throws Exception {
         out.shouldContain("Unable to use AOT cache.");
         out.shouldContain("Not a valid AOT cache (dynamic.jsa)");
         out.shouldHaveExitValue(1);
+
+        //----------------------------------------------------------------------
+        testEmptyValue("AOTCache");
+        testEmptyValue("AOTConfiguration");
+        testEmptyValue("AOTMode");
+    }
+
+    static void testEmptyValue(String option) throws Exception {
+        printTestCase("Empty values for " + option);
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:" + option + "=", "--version");
+        OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("Improperly specified VM option '" + option + "='");
+        out.shouldHaveExitValue(1);
     }
 
     static int testNum = 0;

From cb02158090fa97bf4d11d09c23ce3058a5f83fc8 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Wed, 7 May 2025 18:05:48 +0000
Subject: [PATCH 333/901] 8354461: Update tests to disable streaming output for
 attach tools

Reviewed-by: sspitsyn, cjplummer
---
 .../runtime/CommandLine/PrintClasses.java     |  8 ++---
 .../runtime/ElfDecoder/TestElfDirectRead.java |  9 ++----
 .../runtime/Metaspace/PrintMetaspaceDcmd.java | 29 ++++++++----------
 .../runtime/NMT/CommitOverlappingRegions.java |  8 ++---
 .../jtreg/runtime/NMT/JcmdDetailDiff.java     | 27 ++++-------------
 .../runtime/NMT/MallocSiteTypeChange.java     | 16 +++-------
 .../jtreg/runtime/NMT/NMTTestUtils.java       | 14 ++++-----
 .../VirtualAllocAttemptReserveMemoryAt.java   |  9 ++----
 .../TestThreadDumpClassInitMonitor.java       |  6 ++--
 .../runtime/Thread/TestThreadDumpSMRInfo.java |  6 ++--
 .../runtime/Thread/ThreadPriorities.java      |  4 ++-
 .../runtime/cds/DumpSharedDictionary.java     | 12 +++-----
 .../runtime/cds/DumpSymbolAndStringTable.java | 16 ++++------
 .../tmtools/jstack/JstackThreadTest.java      |  4 ++-
 .../tools/jcmd/JcmdOutputEncodingTest.java    |  4 ++-
 test/jdk/sun/tools/jmap/BasicJMapTest.java    |  4 ++-
 .../jdk/sun/tools/jstack/BasicJStackTest.java |  4 ++-
 test/lib/jdk/test/lib/dcmd/JcmdExecutor.java  |  8 ++++-
 .../jdk/test/lib/dcmd/PidJcmdExecutor.java    | 30 ++++++++++++++-----
 19 files changed, 103 insertions(+), 115 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java b/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java
index 29f902e3717..e2b0b4ba9f6 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/PrintClasses.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2022, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,20 +40,19 @@
  * @run main/othervm -XX:StartFlightRecording PrintClasses
  */
 
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 
 public class PrintClasses {
   public static void main(String args[]) throws Exception {
-    var pid = Long.toString(ProcessHandle.current().pid());
     var pb = new ProcessBuilder();
 
-    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.classes"});
+    pb.command(new PidJcmdExecutor().getCommandLine("VM.classes"));
     var output = new OutputAnalyzer(pb.start());
     output.shouldNotContain("instance size");
     output.shouldContain(PrintClasses.class.getSimpleName());
 
-    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.classes", "-verbose"});
+    pb.command(new PidJcmdExecutor().getCommandLine("VM.classes", "-verbose"));
     output = new OutputAnalyzer(pb.start());
     output.shouldContain("instance size");
     output.shouldContain(PrintClasses.class.getSimpleName());
diff --git a/test/hotspot/jtreg/runtime/ElfDecoder/TestElfDirectRead.java b/test/hotspot/jtreg/runtime/ElfDecoder/TestElfDirectRead.java
index 8d6da919ae5..02b9b76e449 100644
--- a/test/hotspot/jtreg/runtime/ElfDecoder/TestElfDirectRead.java
+++ b/test/hotspot/jtreg/runtime/ElfDecoder/TestElfDirectRead.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
@@ -57,9 +57,8 @@
                                  -XX:NativeMemoryTracking=detail TestElfDirectRead
  */
 
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 import jdk.test.whitebox.WhiteBox;
 
 public class TestElfDirectRead {
@@ -68,10 +67,8 @@ public static void main(String args[]) throws Exception {
     wb.disableElfSectionCache();
     ProcessBuilder pb = new ProcessBuilder();
     OutputAnalyzer output;
-    // Grab my own PID
-    String pid = Long.toString(ProcessTools.getProcessId());
 
-    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
+    pb.command(new PidJcmdExecutor().getCommandLine("VM.native_memory", "detail"));
     output = new OutputAnalyzer(pb.start());
     // This is a pre-populated stack frame, should always exist if can decode
     output.shouldContain("MallocSiteTable::new_entry");
diff --git a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java
index 42f22309d96..7ff19326324 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/PrintMetaspaceDcmd.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.
  * Copyright (c) 2018, SAP and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -22,9 +22,8 @@
  * questions.
  */
 
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 
 /*
  * @test id=test-64bit-ccs
@@ -71,10 +70,8 @@ public class PrintMetaspaceDcmd {
     private static void doTheNoSpecifiedPropTest() throws Exception {
         ProcessBuilder pb = new ProcessBuilder();
         OutputAnalyzer output;
-        // Grab my own PID
-        String pid = Long.toString(ProcessTools.getProcessId());
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "basic"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "basic"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldMatch("MaxMetaspaceSize: unlimited");
@@ -83,10 +80,8 @@ private static void doTheNoSpecifiedPropTest() throws Exception {
     private static void doTheCCSPropTest(boolean usesCompressedClassSpace) throws Exception {
         ProcessBuilder pb = new ProcessBuilder();
         OutputAnalyzer output;
-        // Grab my own PID
-        String pid = Long.toString(ProcessTools.getProcessId());
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "basic"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "basic"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         if (usesCompressedClassSpace) {
@@ -97,7 +92,7 @@ private static void doTheCCSPropTest(boolean usesCompressedClassSpace) throws Ex
         output.shouldContain("Chunk freelists:");
         output.shouldMatch("MaxMetaspaceSize:.*201.00.*MB");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         if (usesCompressedClassSpace) {
@@ -109,12 +104,12 @@ private static void doTheCCSPropTest(boolean usesCompressedClassSpace) throws Ex
         output.shouldContain("Waste");
         output.shouldMatch("MaxMetaspaceSize:.*201.00.*MB");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "show-loaders"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "show-loaders"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldMatch("CLD.*<bootstrap>");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "by-chunktype"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "by-chunktype"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldContain("1k:");
@@ -131,13 +126,13 @@ private static void doTheCCSPropTest(boolean usesCompressedClassSpace) throws Ex
         output.shouldContain("2m:");
         output.shouldContain("4m:");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "vslist"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "vslist"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldContain("Virtual space list");
         output.shouldMatch("node.*reserved.*committed.*used.*");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "chunkfreelist"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "chunkfreelist"));
         // Output should look somewhat like this...
         // vvvvvvvvvvvvvvvv
         // Chunk freelist details:
@@ -161,17 +156,17 @@ private static void doTheCCSPropTest(boolean usesCompressedClassSpace) throws Ex
         output.shouldMatch(".*total chunks.*total word size.*");
 
         // Test with different scales
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "scale=G"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "scale=G"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldMatch("MaxMetaspaceSize:.*0.2.*GB");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "scale=K"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "scale=K"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldMatch("MaxMetaspaceSize:.*205824.00 KB");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.metaspace", "scale=1"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.metaspace", "scale=1"));
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         output.shouldMatch("MaxMetaspaceSize:.*210763776 bytes");
diff --git a/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java b/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java
index e896d57a8d5..a5a2620e250 100644
--- a/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.java
+++ b/test/hotspot/jtreg/runtime/NMT/CommitOverlappingRegions.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
@@ -32,9 +32,8 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail CommitOverlappingRegions
  */
 
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 import jdk.test.whitebox.WhiteBox;
 
 public class CommitOverlappingRegions {
@@ -49,10 +48,9 @@ public static void main(String args[]) throws Exception {
 
         long addr = wb.NMTReserveMemory(8*size);
 
-        String pid = Long.toString(ProcessTools.getProcessId());
         ProcessBuilder pb = new ProcessBuilder();
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.native_memory", "detail"));
         System.out.println("Address is " + Long.toHexString(addr));
 
         // Start: . . . . . . . .
diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java
index 75ed55f3462..14f19f70afa 100644
--- a/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.java
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdDetailDiff.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
@@ -32,9 +32,7 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff
  */
 
-import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 
 import jdk.test.whitebox.WhiteBox;
 
@@ -43,43 +41,30 @@ public class JcmdDetailDiff {
     public static WhiteBox wb = WhiteBox.getWhiteBox();
 
     public static void main(String args[]) throws Exception {
-        ProcessBuilder pb = new ProcessBuilder();
         OutputAnalyzer output;
-        // Grab my own PID
-        String pid = Long.toString(ProcessTools.getProcessId());
 
         long commitSize = 128 * 1024;
         long reserveSize = 256 * 1024;
         long addr;
 
         // Run 'jcmd <pid> VM.native_memory baseline=true'
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline=true"});
-
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("baseline=true");
         output.shouldContain("Baseline taken");
 
         addr = wb.NMTReserveMemory(reserveSize);
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
-
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail.diff", "scale=KB");
         output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
 
         wb.NMTCommitMemory(addr, commitSize);
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
-
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail.diff", "scale=KB");
         output.shouldContain("Test (reserved=256KB +256KB, committed=128KB +128KB)");
 
         wb.NMTUncommitMemory(addr, commitSize);
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
-
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail.diff", "scale=KB");
         output.shouldContain("Test (reserved=256KB +256KB, committed=0KB)");
 
         wb.NMTReleaseMemory(addr, reserveSize);
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff", "scale=KB"});
-
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail.diff", "scale=KB");
         output.shouldNotContain("Test (reserved=");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/NMT/MallocSiteTypeChange.java b/test/hotspot/jtreg/runtime/NMT/MallocSiteTypeChange.java
index 18b3139ef80..34075e898d1 100644
--- a/test/hotspot/jtreg/runtime/NMT/MallocSiteTypeChange.java
+++ b/test/hotspot/jtreg/runtime/NMT/MallocSiteTypeChange.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,8 +33,6 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteTypeChange
  */
 
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.whitebox.WhiteBox;
 
@@ -42,26 +41,19 @@ public static void main(String args[]) throws Exception {
         OutputAnalyzer output;
         WhiteBox wb = WhiteBox.getWhiteBox();
 
-        // Grab my own PID
-        String pid = Long.toString(ProcessTools.getProcessId());
-        ProcessBuilder pb = new ProcessBuilder();
-
         int pc = 1;
         long addr = wb.NMTMallocWithPseudoStack(4 * 1024, pc);
 
         // Verify that current tracking level is "detail"
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail");
         output.shouldContain("Test (reserved=4KB, committed=4KB)");
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "baseline"});
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("baseline");
         output.shouldContain("Baseline taken");
 
         wb.NMTFree(addr);
         addr = wb.NMTMallocWithPseudoStackAndType(2 * 1024, pc, 9 /* mtInternal */ );
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail.diff"});
-        output = new OutputAnalyzer(pb.start());
+        output = NMTTestUtils.startJcmdVMNativeMemory("detail.diff");
         output.shouldContain("(malloc=0KB type=Test -4KB)");
         output.shouldContain("(malloc=2KB type=Internal +2KB #1 +1)");
         output.shouldHaveExitValue(0);
diff --git a/test/hotspot/jtreg/runtime/NMT/NMTTestUtils.java b/test/hotspot/jtreg/runtime/NMT/NMTTestUtils.java
index 6cb0d727328..004f8604323 100644
--- a/test/hotspot/jtreg/runtime/NMT/NMTTestUtils.java
+++ b/test/hotspot/jtreg/runtime/NMT/NMTTestUtils.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.
  * Copyright (c) 2023 Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -22,9 +22,9 @@
  * questions.
  */
 
-import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.StringArrayUtils;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
 
 public class NMTTestUtils {
 
@@ -32,13 +32,9 @@ public static OutputAnalyzer startJcmdVMNativeMemory(String... additional_args)
         if (additional_args == null) {
             additional_args = new String[] {};
         }
-        String fullargs[] = new String[3 + additional_args.length];
-        fullargs[0] = JDKToolFinder.getJDKTool("jcmd");
-        fullargs[1] = Long.toString(ProcessTools.getProcessId());
-        fullargs[2] = "VM.native_memory";
-        System.arraycopy(additional_args, 0, fullargs, 3, additional_args.length);
+        String fullargs[] = StringArrayUtils.concat("VM.native_memory", additional_args);
         ProcessBuilder pb = new ProcessBuilder();
-        pb.command(fullargs);
+        pb.command(new PidJcmdExecutor().getCommandLine(fullargs));
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         return output;
     }
diff --git a/test/hotspot/jtreg/runtime/NMT/VirtualAllocAttemptReserveMemoryAt.java b/test/hotspot/jtreg/runtime/NMT/VirtualAllocAttemptReserveMemoryAt.java
index 56c24dc175c..c23de47bb4e 100644
--- a/test/hotspot/jtreg/runtime/NMT/VirtualAllocAttemptReserveMemoryAt.java
+++ b/test/hotspot/jtreg/runtime/NMT/VirtualAllocAttemptReserveMemoryAt.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
@@ -33,9 +33,8 @@
  *
  */
 
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 
 import jdk.test.whitebox.WhiteBox;
 
@@ -48,7 +47,6 @@ public class VirtualAllocAttemptReserveMemoryAt {
     public static void main(String args[]) throws Exception {
         long reserveSize = 4 * 1024 * 1024; // 4096KB
 
-        String pid = Long.toString(ProcessTools.getProcessId());
         ProcessBuilder pb = new ProcessBuilder();
 
         // Find an address
@@ -67,8 +65,7 @@ public static void main(String args[]) throws Exception {
 
         assertEQ(addr, attempt_addr);
 
-        pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid,
-                "VM.native_memory", "detail" });
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.native_memory", "detail"));
 
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
diff --git a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
index f032e3216b7..f0048feef8b 100644
--- a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.java
+++ b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpClassInitMonitor.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
@@ -43,6 +43,8 @@ public class TestThreadDumpClassInitMonitor {
     // so use getTestJDKTool() instead of getCompileJDKTool() or even
     // getJDKTool() which can fall back to "compile.jdk".
     final static String JSTACK = JDKToolFinder.getTestJDKTool("jstack");
+    // jstack output may be lengthy, disable streaming output to avoid deadlocks
+    final static String DISABLE_STREAMING_OUTPUT = "-J-Djdk.attach.allowStreamingOutput=false";
     final static String PID = "" + ProcessHandle.current().pid();
 
     final static Thread current = Thread.currentThread();
@@ -111,7 +113,7 @@ public void run() {
 
             // Now run jstack
             try {
-                ProcessBuilder pb = new ProcessBuilder(JSTACK, PID);
+                ProcessBuilder pb = new ProcessBuilder(JSTACK, DISABLE_STREAMING_OUTPUT, PID);
                 OutputAnalyzer output = new OutputAnalyzer(pb.start());
                 output.shouldHaveExitValue(0);
                 stackDump = output.asLines();
diff --git a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.java b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.java
index 8502a2b09dd..0ec0ef6ffa2 100644
--- a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.java
+++ b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.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
@@ -40,6 +40,8 @@ public class TestThreadDumpSMRInfo {
     // so use getTestJDKTool() instead of getCompileJDKTool() or even
     // getJDKTool() which can fall back to "compile.jdk".
     final static String JSTACK = JDKToolFinder.getTestJDKTool("jstack");
+    // jstack output may be lengthy, disable streaming output to avoid deadlocks
+    final static String DISABLE_STREAMING_OUTPUT = "-J-Djdk.attach.allowStreamingOutput=false";
     final static String PID = "" + ProcessHandle.current().pid();
 
     // Here's a sample "Threads class SMR info" section:
@@ -70,7 +72,7 @@ public static void main(String[] args) throws Exception {
             }
         }
 
-        ProcessBuilder pb = new ProcessBuilder(JSTACK, PID);
+        ProcessBuilder pb = new ProcessBuilder(JSTACK, DISABLE_STREAMING_OUTPUT, PID);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
         if (verbose) {
diff --git a/test/hotspot/jtreg/runtime/Thread/ThreadPriorities.java b/test/hotspot/jtreg/runtime/Thread/ThreadPriorities.java
index 1ad4f2fb746..0368b845d5b 100644
--- a/test/hotspot/jtreg/runtime/Thread/ThreadPriorities.java
+++ b/test/hotspot/jtreg/runtime/Thread/ThreadPriorities.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
@@ -74,6 +74,8 @@ public void run() {
         ArrayList<String> failed = new ArrayList<>();
         ProcessBuilder pb = new ProcessBuilder(
                 JDKToolFinder.getJDKTool("jstack"),
+                // jstack output may be lengthy, disable streaming output to avoid deadlocks
+                "-J-Djdk.attach.allowStreamingOutput=false",
                 String.valueOf(ProcessTools.getProcessId()));
 
         String[] output = new OutputAnalyzer(pb.start()).getOutput().split("\\R");
diff --git a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java
index 66522c11adb..fa1fb884339 100644
--- a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java
+++ b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.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
@@ -32,9 +32,8 @@
 
 import jdk.test.lib.cds.CDSOptions;
 import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 
 public class DumpSharedDictionary {
 
@@ -55,11 +54,8 @@ public static void main(String[] args) throws Exception {
             CDSTestUtils.run(opts)
                         .assertNormalExit();
         } else {
-            // Grab my own PID
-            String pid = Long.toString(ProcessTools.getProcessId());
-
             ProcessBuilder pb = new ProcessBuilder();
-            pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.systemdictionary"});
+            pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary"));
             OutputAnalyzer output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary");
             try {
                 output.shouldContain("Shared Dictionary statistics:");
@@ -70,7 +66,7 @@ public static void main(String[] args) throws Exception {
                 output.shouldContain("Unknown diagnostic command");
             }
 
-            pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.systemdictionary", "-verbose"});
+            pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary", "-verbose"));
             output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary-verbose");
             try {
                 output.shouldContain("Shared Dictionary");
diff --git a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
index 78241963c58..735d5a3070b 100644
--- a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
+++ b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.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
@@ -32,21 +32,17 @@
  *                   -XX:+WhiteBoxAPI DumpSymbolAndStringTable
  */
 import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
 import jdk.test.whitebox.WhiteBox;
 
 public class DumpSymbolAndStringTable {
     public static void main(String[] args) throws Exception {
-        // Grab my own PID
-        String pid = Long.toString(ProcessTools.getProcessId());
-
         WhiteBox wb = WhiteBox.getWhiteBox();
         boolean sharingEnabled = wb.isSharingEnabled();
 
         ProcessBuilder pb = new ProcessBuilder();
-        pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.symboltable", "-verbose"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.symboltable", "-verbose"));
         OutputAnalyzer output = CDSTestUtils.executeAndLog(pb, "jcmd-symboltable");
         final String sharedSymbolsHeader = "Shared symbols:\n";
         try {
@@ -59,7 +55,7 @@ public static void main(String[] args) throws Exception {
             output.shouldContain("Unknown diagnostic command");
         }
 
-        pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.stringtable", "-verbose"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.stringtable", "-verbose"));
         output = CDSTestUtils.executeAndLog(pb, "jcmd-stringtable");
         final String sharedStringsHeader = "Shared strings:\n";
         try {
@@ -74,7 +70,7 @@ public static void main(String[] args) throws Exception {
             output.shouldContain("Unknown diagnostic command");
         }
 
-        pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.systemdictionary"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary"));
         output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary");
         try {
             output.shouldContain("System Dictionary for 'app' class loader statistics:");
@@ -85,7 +81,7 @@ public static void main(String[] args) throws Exception {
             output.shouldContain("Unknown diagnostic command");
         }
 
-        pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.systemdictionary", "-verbose"});
+        pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary", "-verbose"));
         output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary");
         try {
             output.shouldContain("Dictionary for loader data: 0x");
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java b/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java
index e09dfd45dad..a4fec902a7a 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstack/JstackThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, 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
@@ -70,6 +70,8 @@ private static void testWithName(String name) throws Exception {
     ProcessBuilder processBuilder = new ProcessBuilder();
     JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstack");
     launcher.addVMArgs(jdk.test.lib.Utils.getTestJavaOpts());
+    // jstack output may be lengthy, disable streaming output to avoid deadlocks
+    launcher.addVMArg("-Djdk.attach.allowStreamingOutput=false");
     launcher.addToolArg("-l");
     launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
     processBuilder.command(launcher.getCommand());
diff --git a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
index 01797a6a82a..11f25e5d7d2 100644
--- a/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.java
+++ b/test/jdk/sun/tools/jcmd/JcmdOutputEncodingTest.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
@@ -53,6 +53,8 @@ private static void testThreadDump() throws Exception {
         launcher.addVMArgs(Utils.getTestJavaOpts());
         launcher.addVMArg("-Dfile.encoding=" + cs);
         launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
+        // Thread.print command output may be lengthy, disable streaming output to avoid deadlocks
+        launcher.addVMArg("-Djdk.attach.allowStreamingOutput=false");
         launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
         boolean isVirtualThread = Thread.currentThread().isVirtual();
         Path threadDumpFile = null;
diff --git a/test/jdk/sun/tools/jmap/BasicJMapTest.java b/test/jdk/sun/tools/jmap/BasicJMapTest.java
index c3eeb717e9f..be73a6eb298 100644
--- a/test/jdk/sun/tools/jmap/BasicJMapTest.java
+++ b/test/jdk/sun/tools/jmap/BasicJMapTest.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
@@ -290,6 +290,8 @@ private static void dump(boolean live,
     private static OutputAnalyzer jmap(String... toolArgs) throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jmap");
         launcher.addVMArgs(Utils.getTestJavaOpts());
+        // jmap output may be lengthy, disable streaming output to avoid deadlocks
+        launcher.addVMArg("-Djdk.attach.allowStreamingOutput=false");
         if (toolArgs != null) {
             for (String toolArg : toolArgs) {
                 launcher.addToolArg(toolArg);
diff --git a/test/jdk/sun/tools/jstack/BasicJStackTest.java b/test/jdk/sun/tools/jstack/BasicJStackTest.java
index ec0a80e8d78..3ac410f03b7 100644
--- a/test/jdk/sun/tools/jstack/BasicJStackTest.java
+++ b/test/jdk/sun/tools/jstack/BasicJStackTest.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
@@ -85,6 +85,8 @@ private static OutputAnalyzer jstack(String marker, String... toolArgs) throws E
         launcher.addVMArg("-XX:+UsePerfData");
         launcher.addVMArg("-Dfile.encoding=" + cs);
         launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
+        // jstack output may be lengthy, disable output streaming to avoid deadlocks
+        launcher.addVMArg("-Djdk.attach.allowStreamingOutput=false");
         if (toolArgs != null) {
             for (String toolArg : toolArgs) {
                 launcher.addToolArg(toolArg);
diff --git a/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java
index 6bf940cda6e..52b64c5a0cb 100644
--- a/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java
+++ b/test/lib/jdk/test/lib/dcmd/JcmdExecutor.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
@@ -34,6 +34,8 @@
  */
 public abstract class JcmdExecutor extends CommandExecutor {
     protected String jcmdBinary;
+    // VM option to disable streaming output
+    protected String jcmdDisableStreamingOption = "-J-Djdk.attach.allowStreamingOutput=false";
 
     protected abstract List<String> createCommandLine(String cmd) throws CommandExecutorException;
 
@@ -41,6 +43,10 @@ protected JcmdExecutor() {
         jcmdBinary = JDKToolFinder.getJDKTool("jcmd");
     }
 
+    public List<String> getCommandLine(String... cmds) {
+        return createCommandLine(String.join(" ", cmds));
+    }
+
     protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException {
         List<String> commandLine = createCommandLine(cmd);
 
diff --git a/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java
index 25b3f532fc6..2b132c39b09 100644
--- a/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java
+++ b/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.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
@@ -25,6 +25,7 @@
 
 import jdk.test.lib.process.ProcessTools;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -33,17 +34,15 @@
  */
 public class PidJcmdExecutor extends JcmdExecutor {
     protected final long pid;
+    // jcmd output for many commands may be lengthy when command is executed against main test process
+    protected boolean disableStreamingOutput = true;
 
     /**
      * Instantiates a new PidJcmdExecutor targeting the current VM
      */
     public PidJcmdExecutor() {
         super();
-        try {
-            pid = ProcessTools.getProcessId();
-        } catch (Exception e) {
-            throw new CommandExecutorException("Could not determine own pid", e);
-        }
+        pid = getCurrentPid();
     }
 
     /**
@@ -54,10 +53,27 @@ public PidJcmdExecutor() {
     public PidJcmdExecutor(String target) {
         super();
         pid = Long.valueOf(target);
+        disableStreamingOutput = (pid == getCurrentPid());
+    }
+
+    private static long getCurrentPid() {
+        try {
+            return ProcessTools.getProcessId();
+        } catch (Exception e) {
+            throw new CommandExecutorException("Could not determine own pid", e);
+        }
     }
 
     protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
-        return Arrays.asList(jcmdBinary, Long.toString(pid), cmd);
+        List<String> commandLine = new ArrayList<>();
+        commandLine.add(jcmdBinary);
+        if (disableStreamingOutput) {
+            commandLine.add(jcmdDisableStreamingOption);
+        }
+        commandLine.add(Long.toString(pid));
+        commandLine.add(cmd);
+        return commandLine;
+        //return Arrays.asList(jcmdBinary, Long.toString(pid), cmd);
     }
 
 }

From 3f6b17777ffe59d8981e252891ef2e5beeaf2fdd Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 7 May 2025 18:09:23 +0000
Subject: [PATCH 334/901] 8332934: Do loop with continue with subsequent switch
 leads to incorrect stack maps

Reviewed-by: vromero
---
 .../classes/com/sun/tools/javac/jvm/Gen.java  | 38 +++++++-----
 .../tools/javac/flow/LVTHarness.java          |  3 +-
 .../{ => stackmap}/BranchToFewerDefines.java  |  4 +-
 .../DoLoopLocalEscapeThroughContinueTest.java | 59 +++++++++++++++++++
 .../{ => stackmap}/SwitchExitStateTest.java   |  4 +-
 5 files changed, 87 insertions(+), 21 deletions(-)
 rename test/langtools/tools/javac/{ => stackmap}/BranchToFewerDefines.java (97%)
 create mode 100644 test/langtools/tools/javac/stackmap/DoLoopLocalEscapeThroughContinueTest.java
 rename test/langtools/tools/javac/{ => stackmap}/SwitchExitStateTest.java (93%)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index ff65fc5f9cd..725c7f8063b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -1192,11 +1192,7 @@ private void genLoop(JCStatement loop,
                     code.resolve(c.falseJumps);
                 }
             }
-            Chain exit = loopEnv.info.exit;
-            if (exit != null) {
-                code.resolve(exit);
-                exit.state.defined.excludeFrom(code.nextreg);
-            }
+            code.resolve(loopEnv.info.exit);
         }
 
     public void visitForeachLoop(JCEnhancedForLoop tree) {
@@ -1206,11 +1202,7 @@ public void visitForeachLoop(JCEnhancedForLoop tree) {
     public void visitLabelled(JCLabeledStatement tree) {
         Env<GenContext> localEnv = env.dup(tree, new GenContext());
         genStat(tree.body, localEnv, CRT_STATEMENT);
-        Chain exit = localEnv.info.exit;
-        if (exit != null) {
-            code.resolve(exit);
-            exit.state.defined.excludeFrom(code.nextreg);
-        }
+        code.resolve(localEnv.info.exit);
     }
 
     public void visitSwitch(JCSwitch tree) {
@@ -1413,11 +1405,7 @@ private void handleSwitch(JCTree swtch, JCExpression selector, List<JCCase> case
             }
 
             // Resolve all breaks.
-            Chain exit = switchEnv.info.exit;
-            if  (exit != null) {
-                code.resolve(exit);
-                exit.state.defined.excludeFrom(limit);
-            }
+            code.resolve(switchEnv.info.exit);
 
             // If we have not set the default offset, we do so now.
             if (code.get4(tableBase) == -1) {
@@ -2537,7 +2525,14 @@ void afterBody() {}
     /** code generation contexts,
      *  to be used as type parameter for environments.
      */
-    static class GenContext {
+    final class GenContext {
+
+        /**
+         * The top defined local variables for exit or continue branches to merge into.
+         * It may contain uninitialized variables to be initialized by branched code,
+         * so we cannot use Code.State.defined bits.
+         */
+        final int limit;
 
         /** A chain for all unresolved jumps that exit the current environment.
          */
@@ -2563,15 +2558,26 @@ static class GenContext {
          */
         ListBuffer<Integer> gaps = null;
 
+        GenContext() {
+            var code = Gen.this.code;
+            this.limit = code == null ? 0 : code.nextreg;
+        }
+
         /** Add given chain to exit chain.
          */
         void addExit(Chain c)  {
+            if (c != null) {
+                c.state.defined.excludeFrom(limit);
+            }
             exit = Code.mergeChains(c, exit);
         }
 
         /** Add given chain to cont chain.
          */
         void addCont(Chain c) {
+            if (c != null) {
+                c.state.defined.excludeFrom(limit);
+            }
             cont = Code.mergeChains(c, cont);
         }
     }
diff --git a/test/langtools/tools/javac/flow/LVTHarness.java b/test/langtools/tools/javac/flow/LVTHarness.java
index 7afe90c1991..996b611d304 100644
--- a/test/langtools/tools/javac/flow/LVTHarness.java
+++ b/test/langtools/tools/javac/flow/LVTHarness.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
@@ -157,6 +157,7 @@ void checkMethod(MethodModel method, AliveRanges ranges) {
 
         if (i < infoFromRanges.size()) {
             error(infoFromLVT, infoFromRanges, method.methodName().stringValue());
+            System.err.println(method.toDebugString());
         }
     }
 
diff --git a/test/langtools/tools/javac/BranchToFewerDefines.java b/test/langtools/tools/javac/stackmap/BranchToFewerDefines.java
similarity index 97%
rename from test/langtools/tools/javac/BranchToFewerDefines.java
rename to test/langtools/tools/javac/stackmap/BranchToFewerDefines.java
index dabdff64d32..7a0c69e4ae5 100644
--- a/test/langtools/tools/javac/BranchToFewerDefines.java
+++ b/test/langtools/tools/javac/stackmap/BranchToFewerDefines.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8067429
+ * @bug 8067429 8332934
  * @summary java.lang.VerifyError: Inconsistent stackmap frames at branch target
  * @author srikanth
  *
diff --git a/test/langtools/tools/javac/stackmap/DoLoopLocalEscapeThroughContinueTest.java b/test/langtools/tools/javac/stackmap/DoLoopLocalEscapeThroughContinueTest.java
new file mode 100644
index 00000000000..dbc73ca73c0
--- /dev/null
+++ b/test/langtools/tools/javac/stackmap/DoLoopLocalEscapeThroughContinueTest.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8332934
+ * @summary Incorrect defined locals escaped from continue in do loop
+ * @library /tools/lib /test/lib
+ * @run main DoLoopLocalEscapeThroughContinueTest
+ */
+
+import jdk.test.lib.ByteCodeLoader;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+
+import java.lang.classfile.ClassFile;
+import java.lang.invoke.MethodHandles;
+
+public class DoLoopLocalEscapeThroughContinueTest {
+    public static void main(String... args) throws Throwable {
+        String source = """
+                static void main(String[] k) {
+                  do {
+                    int b = 1;
+                    continue;
+                  } while (Math.random() > 0.5D) ;
+                  switch (2) {
+                  case 3:
+                    double d;
+                  case 4:
+                    k.toString();
+                  }
+                }
+                """;
+        var bytes = InMemoryJavaCompiler.compile("Test", source, "-XDdebug.code");
+        System.out.println(ClassFile.of().parse(bytes).toDebugString());
+        var clz = ByteCodeLoader.load("Test", bytes);
+        MethodHandles.privateLookupIn(clz, MethodHandles.lookup()).ensureInitialized(clz); // force verification
+    }
+}
diff --git a/test/langtools/tools/javac/SwitchExitStateTest.java b/test/langtools/tools/javac/stackmap/SwitchExitStateTest.java
similarity index 93%
rename from test/langtools/tools/javac/SwitchExitStateTest.java
rename to test/langtools/tools/javac/stackmap/SwitchExitStateTest.java
index 4b9e0d61e07..74b443a5803 100644
--- a/test/langtools/tools/javac/SwitchExitStateTest.java
+++ b/test/langtools/tools/javac/stackmap/SwitchExitStateTest.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8160699
+ * @bug 8160699 8332934
  * @summary Verify that having finished executing a switch statement live locals are exactly the same as it was upon entry of the switch.
  * @run main SwitchExitStateTest
  */

From 8c1b915c7ef2b3a6e65705b91f4eb464caaec4e7 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 7 May 2025 18:11:03 +0000
Subject: [PATCH 335/901] 8356126: Duplication handling and optimization of
 CaptureCallState

Reviewed-by: jvernee
---
 src/hotspot/share/prims/downcallLinker.cpp    |   2 +-
 .../classes/java/lang/foreign/Linker.java     |  15 +--
 .../internal/foreign/abi/CallingSequence.java |   4 +-
 .../internal/foreign/abi/CapturableState.java | 103 +++++++++---------
 .../internal/foreign/abi/LinkerOptions.java   |  32 ++----
 .../foreign/abi/fallback/FallbackLinker.java  |   4 +-
 .../TestCaptureCallState.java                 |  15 ++-
 7 files changed, 84 insertions(+), 91 deletions(-)

diff --git a/src/hotspot/share/prims/downcallLinker.cpp b/src/hotspot/share/prims/downcallLinker.cpp
index 64861439817..5dde825d75f 100644
--- a/src/hotspot/share/prims/downcallLinker.cpp
+++ b/src/hotspot/share/prims/downcallLinker.cpp
@@ -32,7 +32,7 @@
 
 // We call this from _thread_in_native, right after a downcall
 JVM_LEAF(void, DowncallLinker::capture_state(int32_t* value_ptr, int captured_state_mask))
-  // keep in synch with jdk.internal.foreign.abi.PreservableValues
+  // keep in synch with jdk.internal.foreign.abi.CapturableState
   enum PreservableValues {
     NONE = 0,
     GET_LAST_ERROR = 1,
diff --git a/src/java.base/share/classes/java/lang/foreign/Linker.java b/src/java.base/share/classes/java/lang/foreign/Linker.java
index 8f1cab22b86..cfa03090299 100644
--- a/src/java.base/share/classes/java/lang/foreign/Linker.java
+++ b/src/java.base/share/classes/java/lang/foreign/Linker.java
@@ -34,11 +34,7 @@
 
 import java.lang.invoke.MethodHandle;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * A linker provides access to foreign functions from Java code, and access to Java code
@@ -859,12 +855,11 @@ static Option firstVariadicArg(int index) {
          * @see #captureStateLayout()
          */
         static Option captureCallState(String... capturedState) {
-            int set = Stream.of(Objects.requireNonNull(capturedState))
-                    .map(Objects::requireNonNull)
-                    .map(CapturableState::forName)
-                    .mapToInt(state -> 1 << state.ordinal())
-                    .sum();
-            return new LinkerOptions.CaptureCallState(set);
+            int mask = 0;
+            for (var state : capturedState) {
+                mask |= CapturableState.maskFromName(state);
+            }
+            return new LinkerOptions.CaptureCallState(mask);
         }
 
          /**
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequence.java b/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequence.java
index 4f7a049fd6d..c2a74eb0965 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequence.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/CallingSequence.java
@@ -185,9 +185,7 @@ public boolean hasReturnBindings() {
     }
 
     public int capturedStateMask() {
-        return linkerOptions.capturedCallState()
-                .mapToInt(CapturableState::mask)
-                .reduce(0, (a, b) -> a | b);
+        return linkerOptions.capturedCallStateMask();
     }
 
     public boolean needsTransition() {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
index d95e713541f..d22c23b03a1 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/CapturableState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 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
@@ -29,67 +29,68 @@
 
 import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.StructLayout;
-import java.lang.foreign.ValueLayout;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.ArrayList;
+import java.util.Map;
 
 import static java.lang.foreign.ValueLayout.JAVA_INT;
 
-public enum CapturableState {
-    GET_LAST_ERROR    ("GetLastError",    JAVA_INT, 1 << 0, OperatingSystem.isWindows()),
-    WSA_GET_LAST_ERROR("WSAGetLastError", JAVA_INT, 1 << 1, OperatingSystem.isWindows()),
-    ERRNO             ("errno",           JAVA_INT, 1 << 2, true);
+/**
+ * Utility class for the call states to capture.
+ */
+public final class CapturableState {
 
-    public static final StructLayout LAYOUT = MemoryLayout.structLayout(
-        supportedStates().map(CapturableState::layout).toArray(MemoryLayout[]::new));
-    public static final List<CapturableState> BY_ORDINAL = List.of(values());
+    public static final StructLayout LAYOUT;
+    // Keep in synch with DowncallLinker::capture_state in downcallLinker.cpp
+    private static final Map<String, Integer> MASKS;
 
     static {
-        assert (BY_ORDINAL.size() < Integer.SIZE); // Update LinkerOptions.CaptureCallState
-    }
-
-    private final String stateName;
-    private final ValueLayout layout;
-    private final int mask;
-    private final boolean isSupported;
-
-    CapturableState(String stateName, ValueLayout layout, int mask, boolean isSupported) {
-        this.stateName = stateName;
-        this.layout = layout.withName(stateName);
-        this.mask = mask;
-        this.isSupported = isSupported;
-    }
-
-    private static Stream<CapturableState> supportedStates() {
-        return Stream.of(values()).filter(CapturableState::isSupported);
-    }
-
-    public static CapturableState forName(String name) {
-        return Stream.of(values())
-                .filter(stl -> stl.stateName().equals(name))
-                .filter(CapturableState::isSupported)
-                .findAny()
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "Unknown name: " + name +", must be one of: "
-                            + supportedStates()
-                                    .map(CapturableState::stateName)
-                                    .collect(Collectors.joining(", "))));
-    }
-
-    public String stateName() {
-        return stateName;
+        if (OperatingSystem.isWindows()) {
+            LAYOUT = MemoryLayout.structLayout(
+                    JAVA_INT.withName("GetLastError"),
+                    JAVA_INT.withName("WSAGetLastError"),
+                    JAVA_INT.withName("errno"));
+            MASKS = Map.of(
+                    "GetLastError",    1 << 0,
+                    "WSAGetLastError", 1 << 1,
+                    "errno",           1 << 2
+            );
+        } else {
+            LAYOUT = MemoryLayout.structLayout(
+                    JAVA_INT.withName("errno"));
+            MASKS = Map.of(
+                    "errno",           1 << 2
+            );
+        }
     }
 
-    public ValueLayout layout() {
-        return layout;
+    private CapturableState() {
     }
 
-    public int mask() {
-        return mask;
+    /**
+     * Returns the mask for a supported capturable state, or throw an
+     * IllegalArgumentException if no supported state with this name exists.
+     */
+    public static int maskFromName(String name) {
+        var ret = MASKS.get(name);
+        if (ret == null) {
+            throw new IllegalArgumentException(
+                    "Unknown name: " + name + ", must be one of: "
+                            + MASKS.keySet());
+        }
+        return ret;
     }
 
-    public boolean isSupported() {
-        return isSupported;
+    /**
+     * Returns a collection-like display string for a captured state mask.
+     * Enclosed with brackets.
+     */
+    public static String displayString(int mask) {
+        var displayList = new ArrayList<>(); // unordered
+        for (var e : MASKS.entrySet()) {
+            if ((mask & e.getValue()) != 0) {
+                displayList.add(e.getKey());
+            }
+        }
+        return displayList.toString();
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java b/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java
index 4ada4b23417..848d6b22b83 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/LinkerOptions.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
@@ -84,9 +84,9 @@ public boolean hasCapturedCallState() {
         return getOption(CaptureCallState.class) != null;
     }
 
-    public Stream<CapturableState> capturedCallState() {
+    public int capturedCallStateMask() {
         CaptureCallState stl = getOption(CaptureCallState.class);
-        return stl == null ? Stream.empty() : stl.saved().stream();
+        return stl == null ? 0 : stl.mask();
     }
 
     public boolean isVariadicFunction() {
@@ -150,35 +150,25 @@ public boolean equals(Object obj) {
         }
     }
 
-    public record CaptureCallState(int compact) implements LinkerOptionImpl {
+    public record CaptureCallState(int mask) implements LinkerOptionImpl {
         @Override
         public void validateForDowncall(FunctionDescriptor descriptor) {
             // done during construction
         }
 
-        public Set<CapturableState> saved() {
-            var set = EnumSet.noneOf(CapturableState.class);
-            int mask = compact;
-            int i = 0;
-            while (mask != 0) {
-                if ((mask & 1) == 1) {
-                    set.add(CapturableState.BY_ORDINAL.get(i));
-                }
-                mask >>= 1;
-                i++;
-            }
-            return set;
-        }
-
-
         @Override
         public boolean equals(Object obj) {
-            return obj instanceof CaptureCallState that && compact == that.compact;
+            return obj instanceof CaptureCallState that && mask == that.mask;
         }
 
         @Override
         public int hashCode() {
-            return compact;
+            return mask;
+        }
+
+        @Override
+        public String toString() {
+            return "CaptureCallState" + CapturableState.displayString(mask);
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
index 9be958e7689..7343a23436d 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/fallback/FallbackLinker.java
@@ -84,9 +84,7 @@ protected MethodHandle arrangeDowncall(MethodType inferredMethodType, FunctionDe
         assertNotEmpty(function);
         MemorySegment cif = makeCif(inferredMethodType, function, options, Arena.ofAuto());
 
-        int capturedStateMask = options.capturedCallState()
-                .mapToInt(CapturableState::mask)
-                .reduce(0, (a, b) -> a | b);
+        int capturedStateMask = options.capturedCallStateMask();
         DowncallData invData = new DowncallData(cif, function.returnLayout().orElse(null),
                 function.argumentLayouts(), capturedStateMask, options.allowsHeapAccess());
 
diff --git a/test/jdk/java/foreign/capturecallstate/TestCaptureCallState.java b/test/jdk/java/foreign/capturecallstate/TestCaptureCallState.java
index 842f36fd08d..2c69c5691b8 100644
--- a/test/jdk/java/foreign/capturecallstate/TestCaptureCallState.java
+++ b/test/jdk/java/foreign/capturecallstate/TestCaptureCallState.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8356126
  * @library ../ /test/lib
  * @run testng/othervm/native --enable-native-access=ALL-UNNAMED TestCaptureCallState
  */
@@ -47,8 +48,7 @@
 import static java.lang.foreign.ValueLayout.JAVA_DOUBLE;
 import static java.lang.foreign.ValueLayout.JAVA_INT;
 import static java.lang.foreign.ValueLayout.JAVA_LONG;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
 
 public class TestCaptureCallState extends NativeTestHelper {
 
@@ -61,6 +61,17 @@ public class TestCaptureCallState extends NativeTestHelper {
         }
     }
 
+    // Basic sanity tests around Java API contracts
+    @Test
+    public void testApiContracts() {
+        assertThrows(IllegalArgumentException.class, () -> Linker.Option.captureCallState("Does not exist"));
+        var duplicateOpt = Linker.Option.captureCallState("errno", "errno"); // duplicates
+        var noDuplicateOpt = Linker.Option.captureCallState("errno");
+        assertEquals(duplicateOpt, noDuplicateOpt, "auto deduplication");
+        var display = duplicateOpt.toString();
+        assertTrue(display.contains("errno"), "toString should contain state name 'errno': " + display);
+    }
+
     private record SaveValuesCase(String nativeTarget, FunctionDescriptor nativeDesc, String threadLocalName,
                                   Consumer<Object> resultCheck, boolean critical) {}
 

From 493ac93606e4637638ec1ae34e24526aaba7b7f3 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 7 May 2025 21:33:39 +0000
Subject: [PATCH 336/901] 8244533: Configure should abort on missing short
 names in Windows

Co-authored-by: Jorn Vernee <jvernee@openjdk.org>
Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: erikj
---
 doc/building.html              | 33 ++++++++++++++++++----
 doc/building.md                | 49 +++++++++++++++++++++-----------
 doc/hotspot-unit-tests.html    | 14 +++++-----
 make/autoconf/basic_windows.m4 |  6 ++--
 make/autoconf/util_paths.m4    | 51 ++++++++++++++++++++++++----------
 make/scripts/fixpath.sh        | 14 ++++++++--
 6 files changed, 119 insertions(+), 48 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 722fe6b8d12..b5d39a68ea8 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -282,9 +282,29 @@ <h3 id="special-considerations">Special Considerations</h3>
 having slow disk access will significantly increase build times. If you
 need to use a network share for the source code, see below for
 suggestions on how to keep the build artifacts on a local disk.</p></li>
-<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
-must be taken to make sure the environment is consistent. It is
-recommended that you follow this procedure:</p>
+<li><p>On Windows, extra care must be taken to have a smooth building
+experience:</p>
+<ul>
+<li><p>Make sure that all relevant paths have short names. Short names
+are used by the build system to create space-free alternative paths.
+Short name creation is enabled per volume. The default setting can be
+checked with the command: <code>fsutil 8dot3name query</code>. If short
+name creation was turned off when a directory was created, it will not
+have a short name. Whether a short name exists can be checked by running
+<code>dir /X</code> in the containing directory (in cmd.exe). If a short
+path is present you should see something like 'ASDF~1' being displayed
+in one of the columns of the ouput. If a directory is missing a short
+name, the safest way to get one is to enable short names for that
+particular volume with
+<code>fsutil 8dot3name set &lt;drive   letter&gt;: 0</code> (note that
+you need to run as administrator for this), and then re-create the
+particular directory. A short name should be generated automatically
+then. Another option is to manually assign a short name to the directory
+using
+<code>fsutil file setShortName &lt;path&gt; &lt;short name&gt;</code>.</p></li>
+<li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
+file permissions and attributes between Windows and Cygwin are
+consistent. It is recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin
@@ -294,6 +314,9 @@ <h3 id="special-considerations">Special Considerations</h3>
 <li><p>Do not put the JDK clone in a path under your Cygwin home
 directory. This is especially important if your user name contains
 spaces and/or mixed upper and lower case letters.</p></li>
+</ul>
+<p>Failure to follow these procedures might result in hard-to-debug
+build problems.</p></li>
 <li><p>You need to install a git client. You have two choices, Cygwin
 git or Git for Windows. Unfortunately there are pros and cons with each
 choice.</p>
@@ -311,9 +334,7 @@ <h3 id="special-considerations">Special Considerations</h3>
 line ending problems, make sure you set <code>core.autocrlf</code> to
 <code>false</code> (this is asked during installation).</p></li>
 </ul></li>
-</ul>
-<p>Failure to follow this procedure might result in hard-to-debug build
-problems.</p></li>
+</ul></li>
 </ul>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>The JDK is a massive project, and require machines ranging from
diff --git a/doc/building.md b/doc/building.md
index 56bc860a13d..61490820061 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -83,19 +83,39 @@ on where and how to check out the source code.
   for the source code, see below for suggestions on how to keep the build
   artifacts on a local disk.
 
-* On Windows, if using [Cygwin](#cygwin), extra care must be taken to make sure
-  the environment is consistent. It is recommended that you follow this
-  procedure:
-
-  * Create the directory that is going to contain the top directory of the JDK
-    clone by using the `mkdir` command in the Cygwin bash shell. That is, do
-    *not* create it using Windows Explorer. This will ensure that it will have
-    proper Cygwin attributes, and that it's children will inherit those
-    attributes.
-
-  * Do not put the JDK clone in a path under your Cygwin home directory. This
-    is especially important if your user name contains spaces and/or mixed
-    upper and lower case letters.
+* On Windows, extra care must be taken to have a smooth building experience:
+
+  * Make sure that all relevant paths have short names. Short names are used by
+    the build system to create space-free alternative paths. Short name
+    creation is enabled per volume. The default setting can be checked with the
+    command: `fsutil 8dot3name query`. If short name creation was turned off
+    when a directory was created, it will not have a short name. Whether a
+    short name exists can be checked by running `dir /X` in the containing
+    directory (in cmd.exe). If a short path is present you should see something
+    like 'ASDF~1' being displayed in one of the columns of the ouput. If a
+    directory is missing a short name, the safest way to get one is to enable
+    short names for that particular volume with `fsutil 8dot3name set <drive
+    letter>: 0` (note that you need to run as administrator for this), and then
+    re-create the particular directory. A short name should be generated
+    automatically then. Another option is to manually assign a short name to
+    the directory using `fsutil file setShortName <path> <short name>`.
+
+  * If using [Cygwin](#cygwin), you must make sure the file permissions and
+    attributes between Windows and Cygwin are consistent. It is recommended
+    that you follow this procedure:
+
+    * Create the directory that is going to contain the top directory of the
+      JDK clone by using the `mkdir` command in the Cygwin bash shell. That is,
+      do *not* create it using Windows Explorer. This will ensure that it will
+      have proper Cygwin attributes, and that it's children will inherit those
+      attributes.
+
+    * Do not put the JDK clone in a path under your Cygwin home directory. This
+      is especially important if your user name contains spaces and/or mixed
+      upper and lower case letters.
+
+    Failure to follow these procedures might result in hard-to-debug build
+    problems.
 
   * You need to install a git client. You have two choices, Cygwin git or Git
     for Windows. Unfortunately there are pros and cons with each choice.
@@ -113,9 +133,6 @@ on where and how to check out the source code.
       make sure you set `core.autocrlf` to `false` (this is asked during
       installation).
 
-  Failure to follow this procedure might result in hard-to-debug build
-  problems.
-
 ## Build Hardware Requirements
 
 The JDK is a massive project, and require machines ranging from decent to
diff --git a/doc/hotspot-unit-tests.html b/doc/hotspot-unit-tests.html
index fcd4a93f8e4..b3700abb3ac 100644
--- a/doc/hotspot-unit-tests.html
+++ b/doc/hotspot-unit-tests.html
@@ -189,7 +189,7 @@ <h3 id="nearness">Nearness</h3>
 <p>Prefer having checks inside test code.</p>
 <p>Not only does having test logic outside, e.g. verification method,
 depending on asserts in product code contradict with several items above
-but also decreases test’s readability and stability. It is much easier
+but also decreases test's readability and stability. It is much easier
 to understand that a test is testing when all testing logic is located
 inside a test or nearby in shared test libraries. As a rule of thumb,
 the closer a check to a test, the better.</p>
@@ -198,7 +198,7 @@ <h3 id="several-checks">Several checks</h3>
 <p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
 <p>This is related to the <a href="#informativeness">informativeness</a>
 property of tests, information for other checks can help to better
-localize a defect’s root-cause. One should use <code>ASSERT</code> if it
+localize a defect's root-cause. One should use <code>ASSERT</code> if it
 is impossible to continue test execution or if it does not make much
 sense. Later in the text, <code>EXPECT</code> forms will be used to
 refer to both <code>ASSERT/EXPECT</code>.</p>
@@ -235,7 +235,7 @@ <h3 id="floating-point-comparison">Floating-point comparison</h3>
 <code>eps</code>.</p>
 <h3 id="c-string-comparison">C string comparison</h3>
 <p>Use string special macros for C strings comparisons.</p>
-<p><code>EXPECT_EQ</code> just compares pointers’ values, which is
+<p><code>EXPECT_EQ</code> just compares pointers' values, which is
 hardly what one wants comparing C strings. GoogleTest provides
 <code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to
 compare C string contents. There are also case-insensitive versions
@@ -293,7 +293,7 @@ <h3 id="test-group-names">Test group names</h3>
 <p>This naming scheme helps to find tests, filter them and simplifies
 test failure analysis. For example, class <code>Foo</code> - test group
 <code>Foo</code>, compiler logging subsystem - test group
-<code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and
+<code>CompilerLogging</code>, G1 GC - test group <code>G1GC</code>, and
 so forth.</p>
 <h3 id="filename">Filename</h3>
 <p>A test file must have <code>test_</code> prefix and <code>.cpp</code>
@@ -345,7 +345,7 @@ <h3 id="fixture-classes">Fixture classes</h3>
 <h3 id="friend-classes">Friend classes</h3>
 <p>All test purpose friends should have either <code>Test</code> or
 <code>Testable</code> suffix.</p>
-<p>It greatly simplifies understanding of friendship’s purpose and
+<p>It greatly simplifies understanding of friendship's purpose and
 allows statically check that private members are not exposed
 unexpectedly. Having <code>FooTest</code> as a friend of
 <code>Foo</code> without any comments will be understood as a necessary
@@ -435,7 +435,7 @@ <h3 id="test-specific-flags">Test-specific flags</h3>
 <h3 id="flag-restoring">Flag restoring</h3>
 <p>Restore changed flags.</p>
 <p>It is quite common for tests to configure JVM in a certain way
-changing flags’ values. GoogleTest provides two ways to set up
+changing flags' values. GoogleTest provides two ways to set up
 environment before a test and restore it afterward: using either
 constructor and destructor or <code>SetUp</code> and
 <code>TearDown</code> functions. Both ways require to use a test fixture
@@ -444,7 +444,7 @@ <h3 id="flag-restoring">Flag restoring</h3>
 be used in such cases to restore/set values.</p>
 <p>Caveats:</p>
 <ul>
-<li><p>Changing a flag’s value could break the invariants between flags'
+<li><p>Changing a flag's value could break the invariants between flags'
 values and hence could lead to unexpected/unsupported JVM
 state.</p></li>
 <li><p><code>FLAG_SET_*</code> macros can change more than one flag (in
diff --git a/make/autoconf/basic_windows.m4 b/make/autoconf/basic_windows.m4
index fb6fc526bfa..dac6ec15db6 100644
--- a/make/autoconf/basic_windows.m4
+++ b/make/autoconf/basic_windows.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
@@ -159,7 +159,7 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   else
     WINENV_PREFIX_ARG="$WINENV_PREFIX"
   fi
-  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
+  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD"
   FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
   FIXPATH="$FIXPATH_BASE exec"
 
@@ -215,7 +215,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
         -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR \
-        -c $CMD -q"
+        -c $CMD"
     $ECHO >  $OUTPUTDIR/fixpath '#!/bin/bash'
     $ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'
     $ECHO >> $OUTPUTDIR/fixpath $FIXPATH_CMDLINE '"[$]@"'
diff --git a/make/autoconf/util_paths.m4 b/make/autoconf/util_paths.m4
index c3cc3955deb..40864680aad 100644
--- a/make/autoconf/util_paths.m4
+++ b/make/autoconf/util_paths.m4
@@ -58,21 +58,32 @@ AC_DEFUN([UTIL_PREPEND_TO_PATH],
 # 2) The path will be absolute, and it will be in unix-style (on
 #     cygwin).
 # $1: The name of the variable to fix
-# $2: if NOFAIL, errors will be silently ignored
+# $2: if NOFAIL, if the path cannot be resolved then errors will not be
+#     reported and an empty path will be set
 AC_DEFUN([UTIL_FIXUP_PATH],
 [
   # Only process if variable expands to non-empty
   path="[$]$1"
   if test "x$path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-      if test "x$2" = "xNOFAIL"; then
-        quiet_option="-q"
+      imported_path=`$FIXPATH_BASE -q import "$path"`
+      if test $? -ne 0 || test ! -e $imported_path; then
+        if test "x$2" != "xNOFAIL"; then
+          AC_MSG_NOTICE([The path of $1, which is given as "$path", can not be properly resolved.])
+          AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
+          AC_MSG_NOTICE([This is the error message given by fixpath:])
+          # Rerun fixpath without -q to get an error message
+          $FIXPATH_BASE import "$path"
+          AC_MSG_ERROR([Cannot continue])
+        else
+          imported_path=""
+        fi
       fi
-      imported_path=`$FIXPATH_BASE $quiet_option import "$path"`
-      $FIXPATH_BASE verify "$imported_path"
+
+      $FIXPATH_BASE -q verify "$imported_path"
       if test $? -ne 0; then
         if test "x$2" != "xNOFAIL"; then
-          AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be imported.])
+          AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be verified.])
         else
           imported_path=""
         fi
@@ -83,7 +94,7 @@ AC_DEFUN([UTIL_FIXUP_PATH],
       if test "x$imported_path_lower" != "x$orig_path_lower"; then
         $1="$imported_path"
       fi
-    else
+    else # non-Windows
       [ if [[ "$path" =~ " " ]]; then ]
         if test "x$2" != "xNOFAIL"; then
           AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
@@ -232,15 +243,19 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
       # This is a path with slashes, don't look at $PATH
       if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
         # fixpath.sh import will do all heavy lifting for us
-        new_path=`$FIXPATH_BASE import "$path"`
+        new_path=`$FIXPATH_BASE -q import "$path"`
 
-        if test ! -e $new_path; then
+        if test $? -ne 0 || test ! -e $new_path; then
           # It failed, but maybe spaces were part of the path and not separating
           # the command and argument. Retry using that assumption.
-          new_path=`$FIXPATH_BASE import "$input"`
-          if test ! -e $new_path; then
-            AC_MSG_NOTICE([The command for $1, which resolves as "$input", can not be found.])
-            AC_MSG_ERROR([Cannot locate $input])
+          new_path=`$FIXPATH_BASE -q import "$input"`
+          if test $? -ne 0 || test ! -e $new_path; then
+            AC_MSG_NOTICE([The command for $1, which is given as "$input", can not be properly resolved.])
+            AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
+            AC_MSG_NOTICE([This is the error message given by fixpath:])
+            # Rerun fixpath without -q to get an error message
+            $FIXPATH_BASE import "$input"
+            AC_MSG_ERROR([Cannot continue])
           fi
           # It worked, clear all "arguments"
           arguments=""
@@ -348,7 +363,15 @@ AC_DEFUN([UTIL_SETUP_TOOL],
         else
           # Otherwise we believe it is a complete path. Use it as it is.
           if test ! -x "$tool_command" && test ! -x "${tool_command}.exe"; then
-            AC_MSG_ERROR([User supplied tool $1="$tool_command" does not exist or is not executable])
+            # Maybe the path had spaces in it; try again with the entire argument
+            if test ! -x "$tool_override" && test ! -x "${tool_override}.exe"; then
+              AC_MSG_ERROR([User supplied tool $1="$tool_override" does not exist or is not executable])
+            else
+              # We successfully located the executable assuming the spaces were part of the path.
+              # We can't combine using paths with spaces and arguments, so assume tool_args is empty.
+              tool_command="$tool_override"
+              tool_args=""
+            fi
           fi
           if test ! -x "$tool_command"; then
             tool_command="${tool_command}.exe"
diff --git a/make/scripts/fixpath.sh b/make/scripts/fixpath.sh
index 3a886fee07c..8eaf57d18f3 100644
--- a/make/scripts/fixpath.sh
+++ b/make/scripts/fixpath.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# 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
@@ -157,11 +157,21 @@ function import_path() {
     if [[ $? -eq 0 && -e "$unixpath" ]]; then
       if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
         # If it is not in envroot, it's a generic windows path
-        if [[ ! $winpath =~ ^[-_.:\\a-zA-Z0-9]*$ ]] ; then
+        if [[ ! $winpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then
           # Path has forbidden characters, rewrite as short name
           # This monster of a command uses the %~s support from cmd.exe to
           # reliably convert to short paths on all winenvs.
           shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)"
+          if [[ ! $shortpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then
+            if [[ $QUIET != true ]]; then
+              echo fixpath: failure: Path "'"$path"'" could not be converted to short path >&2
+            fi
+            if [[ $IGNOREFAILURES != true ]]; then
+              exit 1
+            else
+              shortpath=""
+            fi
+          fi
           unixpath="$($PATHTOOL -u "$shortpath")"
           # unixpath is based on short name
         fi

From 7642556a5a131e9104033ad7d7abfdb4be5012cf Mon Sep 17 00:00:00 2001
From: Markus KARG <markus@headcrashing.eu>
Date: Thu, 8 May 2025 00:58:10 +0000
Subject: [PATCH 337/901] 8343110: Add getChars(int, int, char[], int) to
 CharSequence and CharBuffer

Reviewed-by: liach, jpai, rriggs
---
 .../share/classes/java/io/Reader.java         |  13 +-
 .../java/lang/AbstractStringBuilder.java      |  28 +--
 .../share/classes/java/lang/CharSequence.java |  45 +++-
 .../share/classes/java/lang/String.java       |  35 +--
 .../share/classes/java/lang/StringBuffer.java |   5 +-
 .../classes/java/nio/X-Buffer.java.template   |  40 +++-
 test/jdk/java/lang/CharSequence/GetChars.java | 109 +++++++++
 test/jdk/java/nio/Buffer/GetChars.java        | 207 ++++++++++++++++++
 8 files changed, 411 insertions(+), 71 deletions(-)
 create mode 100644 test/jdk/java/lang/CharSequence/GetChars.java
 create mode 100644 test/jdk/java/nio/Buffer/GetChars.java

diff --git a/src/java.base/share/classes/java/io/Reader.java b/src/java.base/share/classes/java/io/Reader.java
index 1654156bee1..f882a939fbc 100644
--- a/src/java.base/share/classes/java/io/Reader.java
+++ b/src/java.base/share/classes/java/io/Reader.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
@@ -193,16 +193,7 @@ public int read(char[] cbuf, int off, int len) throws IOException {
                 if (next >= length)
                     return -1;
                 int n = Math.min(length - next, len);
-                switch (cs) {
-                    case String s -> s.getChars(next, next + n, cbuf, off);
-                    case StringBuilder sb -> sb.getChars(next, next + n, cbuf, off);
-                    case StringBuffer sb -> sb.getChars(next, next + n, cbuf, off);
-                    case CharBuffer cb -> cb.get(next, cbuf, off, n);
-                    default -> {
-                        for (int i = 0; i < n; i++)
-                            cbuf[off + i] = cs.charAt(next + i);
-                    }
-                }
+                cs.getChars(next, next + n, cbuf, off);
                 next += n;
                 return n;
             }
diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index b8d209b8a6e..c83effb0b45 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -488,33 +488,9 @@ public int offsetByCodePoints(int index, int codePointOffset) {
     }
 
     /**
-     * Characters are copied from this sequence into the
-     * destination character array {@code dst}. The first character to
-     * be copied is at index {@code srcBegin}; the last character to
-     * be copied is at index {@code srcEnd-1}. The total number of
-     * characters to be copied is {@code srcEnd-srcBegin}. The
-     * characters are copied into the subarray of {@code dst} starting
-     * at index {@code dstBegin} and ending at index:
-     * <pre>{@code
-     * dstbegin + (srcEnd-srcBegin) - 1
-     * }</pre>
-     *
-     * @param      srcBegin   start copying at this offset.
-     * @param      srcEnd     stop copying at this offset.
-     * @param      dst        the array to copy the data into.
-     * @param      dstBegin   offset into {@code dst}.
-     * @throws     IndexOutOfBoundsException  if any of the following is true:
-     *             <ul>
-     *             <li>{@code srcBegin} is negative
-     *             <li>{@code dstBegin} is negative
-     *             <li>the {@code srcBegin} argument is greater than
-     *             the {@code srcEnd} argument.
-     *             <li>{@code srcEnd} is greater than
-     *             {@code this.length()}.
-     *             <li>{@code dstBegin+srcEnd-srcBegin} is greater than
-     *             {@code dst.length}
-     *             </ul>
+     * {@inheritDoc CharSequence}
      */
+    @Override
     public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
     {
         Preconditions.checkFromToIndex(srcBegin, srcEnd, count, Preconditions.SIOOBE_FORMATTER);  // compatible to old version
diff --git a/src/java.base/share/classes/java/lang/CharSequence.java b/src/java.base/share/classes/java/lang/CharSequence.java
index 87bc4a5525a..2732ee35933 100644
--- a/src/java.base/share/classes/java/lang/CharSequence.java
+++ b/src/java.base/share/classes/java/lang/CharSequence.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
@@ -302,4 +302,47 @@ public static int compare(CharSequence cs1, CharSequence cs2) {
         return cs1.length() - cs2.length();
     }
 
+    /**
+     * Copies characters from this sequence into the given destination array.
+     * The first character to be copied is at index {@code srcBegin}; the last
+     * character to be copied is at index {@code srcEnd-1}. The total number of
+     * characters to be copied is {@code srcEnd-srcBegin}. The
+     * characters are copied into the subarray of {@code dst} starting
+     * at index {@code dstBegin} and ending at index:
+     * <pre>{@code
+     * dstbegin + (srcEnd-srcBegin) - 1
+     * }</pre>
+     *
+     * @param      srcBegin   start copying at this offset.
+     * @param      srcEnd     stop copying at this offset.
+     * @param      dst        the array to copy the data into.
+     * @param      dstBegin   offset into {@code dst}.
+     * @throws     IndexOutOfBoundsException  if any of the following is true:
+     *             <ul>
+     *             <li>{@code srcBegin} is negative
+     *             <li>{@code dstBegin} is negative
+     *             <li>the {@code srcBegin} argument is greater than
+     *             the {@code srcEnd} argument.
+     *             <li>{@code srcEnd} is greater than
+     *             {@code this.length()}.
+     *             <li>{@code dstBegin+srcEnd-srcBegin} is greater than
+     *             {@code dst.length}
+     *             </ul>
+     * @throws     NullPointerException if {@code dst} is {@code null}
+     *
+     * @implSpec
+     * The default implementation invokes {@link #charAt(int index)} in a loop
+     * iterating {@code index} from {@code srcBegin} to {@code srcEnd-1}.
+     * Concurrent truncation of this character sequence can throw
+     * {@code IndexOutOfBoundsException}. In this case, some characters, but not
+     * all, may be already transferred.
+     *
+     * @since 25
+     */
+    public default void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin) {
+        Objects.checkFromToIndex(srcBegin, srcEnd, length());
+        Objects.checkIndex(dstBegin, dst.length - (srcEnd - srcBegin) + 1);
+        while (srcBegin < srcEnd)
+            dst[dstBegin++] = charAt(srcBegin++);
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 0632785d899..76566de089c 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1739,35 +1739,14 @@ public int offsetByCodePoints(int index, int codePointOffset) {
     }
 
     /**
-     * Copies characters from this string into the destination character
-     * array.
-     * <p>
-     * The first character to be copied is at index {@code srcBegin};
-     * the last character to be copied is at index {@code srcEnd-1}
-     * (thus the total number of characters to be copied is
-     * {@code srcEnd-srcBegin}). The characters are copied into the
-     * subarray of {@code dst} starting at index {@code dstBegin}
-     * and ending at index:
-     * <blockquote><pre>
-     *     dstBegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @param      srcBegin   index of the first character in the string
-     *                        to copy.
-     * @param      srcEnd     index after the last character in the string
-     *                        to copy.
-     * @param      dst        the destination array.
-     * @param      dstBegin   the start offset in the destination array.
-     * @throws    IndexOutOfBoundsException If any of the following
-     *            is true:
-     *            <ul><li>{@code srcBegin} is negative.
-     *            <li>{@code srcBegin} is greater than {@code srcEnd}
-     *            <li>{@code srcEnd} is greater than the length of this
-     *                string
-     *            <li>{@code dstBegin} is negative
-     *            <li>{@code dstBegin+(srcEnd-srcBegin)} is larger than
-     *                {@code dst.length}</ul>
+     * {@inheritDoc CharSequence}
+     * @param srcBegin {@inheritDoc CharSequence}
+     * @param srcEnd   {@inheritDoc CharSequence}
+     * @param dst      {@inheritDoc CharSequence}
+     * @param dstBegin {@inheritDoc CharSequence}
+     * @throws    IndexOutOfBoundsException {@inheritDoc CharSequence}
      */
+    @Override
     public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin) {
         checkBoundsBeginEnd(srcBegin, srcEnd, length());
         checkBoundsOffCount(dstBegin, srcEnd - srcBegin, dst.length);
diff --git a/src/java.base/share/classes/java/lang/StringBuffer.java b/src/java.base/share/classes/java/lang/StringBuffer.java
index 1aeceb95985..2546a84f39c 100644
--- a/src/java.base/share/classes/java/lang/StringBuffer.java
+++ b/src/java.base/share/classes/java/lang/StringBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -279,9 +279,6 @@ public synchronized int offsetByCodePoints(int index, int codePointOffset) {
         return super.offsetByCodePoints(index, codePointOffset);
     }
 
-    /**
-     * @throws IndexOutOfBoundsException {@inheritDoc}
-     */
     @Override
     public synchronized void getChars(int srcBegin, int srcEnd, char[] dst,
                                       int dstBegin)
diff --git a/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template
index d089155abf9..283f5534597 100644
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -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
@@ -1896,6 +1896,44 @@ public abstract sealed class $Type$Buffer
 
 #if[char]
 
+    /**
+     * Absolute bulk <i>get</i> method.
+     *
+     * <p> This method transfers {@code srcEnd-srcBegin} characters from this
+     * buffer into the given array, starting at index {@code srcBegin} in this
+     * buffer and at offset {@code dstBegin} in the array. The position of this
+     * buffer is unchanged.
+     *
+     * @param  srcBegin
+     *         The index in this buffer from which the first character will be
+     *         read; must be non-negative and less than {@code limit()}
+     *
+     * @param  srcEnd
+     *         The index in this buffer directly before the last character to
+     *         read; must be non-negative and less or equal than {@code limit()}
+     *         and must be greater or equal than {@code srcBegin}
+     *
+     * @param  dst
+     *         The destination array
+     *
+     * @param  dstBegin
+     *         The offset within the array of the first character to be
+     *         written; must be non-negative and less than {@code dst.length}
+     *
+     * @throws  IndexOutOfBoundsException
+     *          If the preconditions on the {@code srcBegin}, {@code srcEnd},
+     *          and {@code dstBegin} parameters do not hold
+     *
+     * @implSpec This method is equivalent to
+     *           {@code get(srcBegin, dst, dstBegin, srcEnd - srcBegin)}.
+     *
+     * @since 25
+     */
+    @Override
+    public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin) {
+        get(srcBegin, dst, dstBegin, srcEnd - srcBegin);
+    }
+
     /**
      * Returns a string containing the characters in this buffer.
      *
diff --git a/test/jdk/java/lang/CharSequence/GetChars.java b/test/jdk/java/lang/CharSequence/GetChars.java
new file mode 100644
index 00000000000..5d0594a0897
--- /dev/null
+++ b/test/jdk/java/lang/CharSequence/GetChars.java
@@ -0,0 +1,109 @@
+/*
+ * 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 org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @test
+ * @bug 8343110
+ * @summary Check for expected behavior of default implementation of
+ *          CharSequence.getChars().
+ * @run testng GetChars
+ */
+public class GetChars {
+    private static CharSequence CS = new CharSequence() {
+        @Override
+        public int length() {
+            return 4;
+        }
+
+        @Override
+        public char charAt(int index) {
+            return "Test".charAt(index);
+        }
+
+        @Override
+        public CharSequence subSequence(int start, int end) {
+            throw new UnsupportedOperationException();
+        }
+    };
+
+    @Test
+    public void testExactCopy() {
+        var dst = new char[4];
+        CS.getChars(0, 4, dst, 0);
+        Assert.assertEquals(dst, new char[] {'T', 'e', 's', 't'});
+    }
+
+    @Test
+    public void testPartialCopy() {
+        var dst = new char[2];
+        CS.getChars(1, 3, dst, 0);
+        Assert.assertEquals(dst, new char[] {'e', 's'});
+    }
+
+    @Test
+    public void testPositionedCopy() {
+        var dst = new char[] {1, 2, 3, 4, 5, 6};
+        CS.getChars(0, 4, dst, 1);
+        Assert.assertEquals(dst, new char[] {1, 'T', 'e', 's', 't', 6});
+    }
+
+    @Test
+    public void testSrcBeginIsNegative() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CS.getChars(-1, 3, new char[4], 0));
+    }
+
+    @Test
+    public void testDstBeginIsNegative() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CS.getChars(0, 4, new char[4], -1));
+    }
+
+    @Test
+    public void testSrcBeginIsGreaterThanSrcEnd() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CS.getChars(4, 0, new char[4], 0));
+    }
+
+    @Test
+    public void testSrcEndIsGreaterThanSequenceLength() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CS.getChars(0, 5, new char[4], 0));
+    }
+
+    @Test
+    public void testRequestedLengthIsGreaterThanDstLength() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CS.getChars(0, 4, new char[3], 0));
+    }
+
+    @Test
+    public void testDstIsNull() {
+        Assert.assertThrows(NullPointerException.class,
+                () -> CS.getChars(0, 4, null, 0));
+    }
+
+}
diff --git a/test/jdk/java/nio/Buffer/GetChars.java b/test/jdk/java/nio/Buffer/GetChars.java
new file mode 100644
index 00000000000..86334828717
--- /dev/null
+++ b/test/jdk/java/nio/Buffer/GetChars.java
@@ -0,0 +1,207 @@
+/*
+ * 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.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @test
+ * @bug 8343110
+ * @summary Check for expected behavior of CharBuffer.getChars().
+ * @run testng GetChars
+ * @key randomness
+ */
+public class GetChars {
+    private static CharBuffer CB = CharBuffer.wrap("Test");
+
+    @Test
+    public void testExactCopy() {
+        var dst = new char[4];
+        CB.getChars(0, 4, dst, 0);
+        Assert.assertEquals(dst, new char[] {'T', 'e', 's', 't'});
+    }
+
+    @Test
+    public void testPartialCopy() {
+        var dst = new char[2];
+        CB.getChars(1, 3, dst, 0);
+        Assert.assertEquals(dst, new char[] {'e', 's'});
+    }
+
+    @Test
+    public void testPositionedCopy() {
+        var dst = new char[] {1, 2, 3, 4, 5, 6};
+        CB.getChars(0, 4, dst, 1);
+        Assert.assertEquals(dst, new char[] {1, 'T', 'e', 's', 't', 6});
+    }
+
+    @Test
+    public void testSrcBeginIsNegative() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CB.getChars(-1, 3, new char[4], 0));
+    }
+
+    @Test
+    public void testDstBeginIsNegative() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CB.getChars(0, 4, new char[4], -1));
+    }
+
+    @Test
+    public void testSrcBeginIsGreaterThanSrcEnd() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CB.getChars(4, 0, new char[4], 0));
+    }
+
+    @Test
+    public void testSrcEndIsGreaterThanSequenceLength() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CB.getChars(0, 5, new char[4], 0));
+    }
+
+    @Test
+    public void testRequestedLengthIsGreaterThanDstLength() {
+        Assert.assertThrows(IndexOutOfBoundsException.class,
+                () -> CB.getChars(0, 4, new char[3], 0));
+    }
+
+    @Test
+    public void testDstIsNull() {
+        Assert.assertThrows(NullPointerException.class,
+                () -> CB.getChars(0, 4, null, 0));
+    }
+
+    private static final Random RAND = new Random();
+    private static final int SIZE = 128 + RAND.nextInt(1024);
+
+    /**
+     * Randomize the char buffer's position and limit.
+     */
+    private static CharBuffer randomizeRange(CharBuffer cb) {
+        int mid = cb.capacity() >>> 1;
+        int start = RAND.nextInt(mid + 1); // from 0 to mid
+        int end = mid + RAND.nextInt(cb.capacity() - mid + 1); // from mid to capacity
+        cb.position(start);
+        cb.limit(end);
+        return cb;
+    }
+
+    /**
+     * Randomize the char buffer's contents, position and limit.
+     */
+    private static CharBuffer randomize(CharBuffer cb) {
+        while (cb.hasRemaining()) {
+            cb.put((char)RAND.nextInt());
+        }
+        return randomizeRange(cb);
+    }
+
+    /**
+     * Sums the remaining chars in the char buffer.
+     */
+    private static int intSum(CharBuffer cb) {
+        int sum = 0;
+        cb.mark();
+        while (cb.hasRemaining()) {
+            sum += cb.get();
+        }
+        cb.reset();
+        return sum;
+    }
+
+    /**
+     * Sums the chars in the char array.
+     */
+    private static int intSum(char[] ca) {
+        int sum = 0;
+        for (int i = 0; i < ca.length; i++)
+            sum += ca[i];
+        return sum;
+    }
+
+    /**
+     * Creates char buffers to test, adding them to the given list.
+     */
+    private static void addCases(CharBuffer cb, List<CharBuffer> buffers) {
+        randomize(cb);
+        buffers.add(cb);
+
+        buffers.add(cb.slice());
+        buffers.add(cb.duplicate());
+        buffers.add(cb.asReadOnlyBuffer());
+
+        buffers.add(randomizeRange(cb.slice()));
+        buffers.add(randomizeRange(cb.duplicate()));
+        buffers.add(randomizeRange(cb.asReadOnlyBuffer()));
+    }
+
+    @DataProvider(name = "charbuffers")
+    public Object[][] createCharBuffers() {
+        List<CharBuffer> buffers = new ArrayList<>();
+
+        // heap
+        addCases(CharBuffer.allocate(SIZE), buffers);
+        addCases(CharBuffer.wrap(new char[SIZE]), buffers);
+        addCases(ByteBuffer.allocate(SIZE*2).order(ByteOrder.BIG_ENDIAN).asCharBuffer(),
+                buffers);
+        addCases(ByteBuffer.allocate(SIZE*2).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer(),
+                buffers);
+
+        // direct
+        addCases(ByteBuffer.allocateDirect(SIZE*2).order(ByteOrder.BIG_ENDIAN).asCharBuffer(),
+                buffers);
+        addCases(ByteBuffer.allocateDirect(SIZE*2).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer(),
+                buffers);
+
+        // read-only buffer backed by a CharSequence
+        buffers.add(CharBuffer.wrap(randomize(CharBuffer.allocate(SIZE))));
+
+        Object[][] params = new Object[buffers.size()][];
+        for (int i = 0; i < buffers.size(); i++) {
+            CharBuffer cb = buffers.get(i);
+            params[i] = new Object[] { cb.getClass().getName(), cb };
+        }
+
+        return params;
+    }
+
+    @Test(dataProvider = "charbuffers")
+    public void testGetChars(String type, CharBuffer cb) {
+        System.out.format("%s position=%d, limit=%d%n", type, cb.position(), cb.limit());
+        int expected = intSum(cb);
+        var dst = new char[cb.remaining()];
+        cb.getChars(cb.position(), cb.limit(), dst, 0);
+        int actual = intSum(dst);
+        assertEquals(actual, expected);
+    }
+}

From 3e258cbddf335a6b4f4307e5a1304fe2664c80a0 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 8 May 2025 01:08:52 +0000
Subject: [PATCH 338/901] 8356407: Part of class verification is skipped in AOT
 training run

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: matsaave, coleenp
---
 .../classfile/systemDictionaryShared.cpp      | 48 ++++++++++------
 .../classfile/systemDictionaryShared.hpp      |  5 +-
 .../share/classfile/verificationType.cpp      | 13 +++--
 .../AOTCacheSupportForCustomLoaders.java      | 18 +++++-
 .../test-classes/ReturnIntegerAsString.jasm   | 56 +++++++++++++++++++
 5 files changed, 113 insertions(+), 27 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReturnIntegerAsString.jasm

diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 5c4ee3f9452..1f4bf80fbd6 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -752,29 +752,43 @@ void SystemDictionaryShared::dumptime_classes_do(MetaspaceClosure* it) {
   }
 }
 
-bool SystemDictionaryShared::add_verification_constraint(InstanceKlass* k, Symbol* name,
-         Symbol* from_name, bool from_field_is_protected, bool from_is_array, bool from_is_object) {
+// Called from VerificationType::is_reference_assignable_from() before performing the assignability check of
+//     T1 must be assignable from T2
+// Where:
+//     L is the class loader of <k>
+//     T1 is the type resolved by L using the name <name>
+//     T2 is the type resolved by L using the name <from_name>
+//
+// The meaning of (*skip_assignability_check):
+//     true:  is_reference_assignable_from() should SKIP the assignability check
+//     false: is_reference_assignable_from() should COMPLETE the assignability check
+void SystemDictionaryShared::add_verification_constraint(InstanceKlass* k, Symbol* name,
+         Symbol* from_name, bool from_field_is_protected, bool from_is_array, bool from_is_object,
+         bool* skip_assignability_check) {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   DumpTimeClassInfo* info = get_info(k);
   info->add_verification_constraint(k, name, from_name, from_field_is_protected,
                                     from_is_array, from_is_object);
 
-  if (CDSConfig::is_dumping_dynamic_archive()) {
-    // For dynamic dumping, we can resolve all the constraint classes for all class loaders during
-    // the initial run prior to creating the archive before vm exit. We will also perform verification
-    // check when running with the archive.
-    return false;
+  if (CDSConfig::is_dumping_classic_static_archive() && !is_builtin(k)) {
+    // This applies ONLY to the "classic" CDS static dump, which reads the list of
+    // unregistered classes (those intended for custom class loaders) from the classlist
+    // and loads them using jdk.internal.misc.CDS$UnregisteredClassLoader.
+    //
+    // When the classlist contains an unregistered class k, the supertypes of k are also
+    // recorded in the classlist. However, the classlist does not contain information about
+    // any class X that's not a supertype of k but is needed in the verification of k.
+    // As a result, CDS$UnregisteredClassLoader will not know how to resolve X.
+    //
+    // Therefore, we tell the verifier to refrain from resolving X. Instead, X is recorded
+    // (symbolically) in the verification constraints of k. In the production run,
+    // when k is loaded, we will go through its verification constraints and resolve X to complete
+    // the is_reference_assignable_from() checks.
+    *skip_assignability_check = true;
   } else {
-    if (is_builtin(k)) {
-      // For builtin class loaders, we can try to complete the verification check at dump time,
-      // because we can resolve all the constraint classes. We will also perform verification check
-      // when running with the archive.
-      return false;
-    } else {
-      // For non-builtin class loaders, we cannot complete the verification check at dump time,
-      // because at dump time we don't know how to resolve classes for such loaders.
-      return true;
-    }
+    // In all other cases, we are using an *actual* class loader to load k, so it should be able
+    // to resolve any types that are needed for the verification of k.
+    *skip_assignability_check = false;
   }
 }
 
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 22fc3fd825d..a0019ac0bd8 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -233,9 +233,10 @@ class SystemDictionaryShared: public SystemDictionary {
   // ensures that you cannot load a shared class if its super type(s) are changed. However,
   // we need an additional check to ensure that the verification_constraints did not change
   // between dump time and runtime.
-  static bool add_verification_constraint(InstanceKlass* k, Symbol* name,
+  static void add_verification_constraint(InstanceKlass* k, Symbol* name,
                   Symbol* from_name, bool from_field_is_protected,
-                  bool from_is_array, bool from_is_object) NOT_CDS_RETURN_(false);
+                  bool from_is_array, bool from_is_object,
+                  bool* skip_assignability_check);
   static void check_verification_constraints(InstanceKlass* klass,
                                              TRAPS) NOT_CDS_RETURN;
   static void add_enum_klass_static_field(InstanceKlass* ik, int root_index);
diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp
index d0541a0d20f..e6115dfce9b 100644
--- a/src/hotspot/share/classfile/verificationType.cpp
+++ b/src/hotspot/share/classfile/verificationType.cpp
@@ -106,16 +106,19 @@ bool VerificationType::is_reference_assignable_from(
       return true;
     }
 
+#if INCLUDE_CDS
     if (CDSConfig::is_dumping_archive()) {
-      if (SystemDictionaryShared::add_verification_constraint(klass,
+      bool skip_assignability_check = false;
+      SystemDictionaryShared::add_verification_constraint(klass,
               name(), from.name(), from_field_is_protected, from.is_array(),
-              from.is_object())) {
-        // If add_verification_constraint() returns true, the resolution/check should be
-        // delayed until runtime.
+              from.is_object(), &skip_assignability_check);
+      if (skip_assignability_check) {
+        // We are not able to resolve name() or from.name(). The actual assignability check
+        // will be delayed until runtime.
         return true;
       }
     }
-
+#endif
     return resolve_and_check_assignability(klass, name(), from.name(),
           from_field_is_protected, from.is_array(), from.is_object(), THREAD);
   } else if (is_array() && from.is_array()) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
index dabc35a4604..50505502217 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
@@ -29,10 +29,11 @@
  * @requires vm.cds.supports.aot.class.linking
  * @comment work around JDK-8345635
  * @requires !vm.jvmci.enabled
- * @library /test/lib
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build ReturnIntegerAsString
  * @build AOTCacheSupportForCustomLoaders
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar AppWithCustomLoaders AppWithCustomLoaders$MyLoader
- * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar cust.jar AppWithCustomLoaders$MyLoadeeA AppWithCustomLoaders$MyLoadeeB
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar cust.jar AppWithCustomLoaders$MyLoadeeA AppWithCustomLoaders$MyLoadeeB ReturnIntegerAsString
  * @run driver AOTCacheSupportForCustomLoaders AOT
  */
 
@@ -50,7 +51,8 @@ public static void main(String... args) throws Exception {
             .appCommandLine("AppWithCustomLoaders")
             .setAssemblyChecker((OutputAnalyzer out) -> {
                     out.shouldMatch("cds,class.*unreg AppWithCustomLoaders[$]MyLoadeeA")
-                       .shouldMatch("cds,class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;");
+                       .shouldMatch("cds,class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;")
+                       .shouldNotMatch("cds,class.* ReturnIntegerAsString");
                 })
             .setProductionChecker((OutputAnalyzer out) -> {
                     out.shouldContain("Using AOT-linked classes: true");
@@ -69,6 +71,16 @@ public static void main(String args[]) throws Exception {
         Class klass = loader.loadClass("AppWithCustomLoaders$MyLoadeeA");
         klass.newInstance();
 
+        // Test 2: VerificationType::is_reference_assignable_from() cannot be skipped (JDK-8356407)
+        try {
+            Class bad = loader.loadClass("ReturnIntegerAsString");
+            Object o = bad.newInstance(); // force verification
+            System.out.println("Expected String but got: " + o.toString().getClass());
+            throw new RuntimeException("VerifyError expected but not thrown");
+        } catch (VerifyError ve) {
+            System.out.println("Expected: " + ve);
+        }
+
         // TODO: more test cases JDK-8354557
     }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReturnIntegerAsString.jasm b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReturnIntegerAsString.jasm
new file mode 100644
index 00000000000..31b67b90e6e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/test-classes/ReturnIntegerAsString.jasm
@@ -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.
+ *
+ */
+
+
+/*
+
+class ReturnIntegerAsString {
+    String doit() {
+        return new Integer(1);
+    }
+}
+
+*/
+
+public super class ReturnIntegerAsString
+    version 60:0
+{
+  public Method "<init>":"()V"
+    stack 1 locals 1
+  {
+        aload_0;
+        invokespecial    Method java/lang/Object."<init>":"()V";
+        return;
+  }
+  public Method toString:"()Ljava/lang/String;"
+    stack 3 locals 2
+  {
+        new              class java/lang/Integer;
+        dup;
+        iconst_1;
+        invokespecial    Method java/lang/Integer."<init>":"(I)V";
+        areturn;
+  }
+
+} // end Class ReturnIntegerAsString

From 52a5583d691388f833c3aeb56ce92cbfb5d61274 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 8 May 2025 03:56:45 +0000
Subject: [PATCH 339/901] 8356154: Respecify java.net.Socket constructors that
 allow creating UDP sockets to throw IllegalArgumentException

Reviewed-by: dfuchs, alanb
---
 .../share/classes/java/net/Socket.java        | 44 +++++-----
 .../share/classes/java/net/SocketImpl.java    | 15 ++--
 .../AsynchronousServerSocketChannelImpl.java  |  4 +-
 .../nio/ch/AsynchronousSocketChannelImpl.java |  2 +-
 .../share/classes/sun/nio/ch/Net.java         | 14 ++--
 .../classes/sun/nio/ch/NioSocketImpl.java     | 44 ++++------
 .../sun/nio/ch/ServerSocketChannelImpl.java   |  2 +-
 test/jdk/java/net/Socket/UdpSocket.java       | 81 +++++++++----------
 test/jdk/java/net/SocketImpl/BadUsages.java   | 29 +++----
 9 files changed, 100 insertions(+), 135 deletions(-)

diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index 8566367a62d..cdf2d703233 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.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
@@ -378,27 +378,22 @@ public Socket(InetAddress address, int port, InetAddress localAddr,
      * In other words, it is equivalent to specifying an address of the
      * loopback interface. </p>
      * <p>
-     * If the stream argument is {@code true}, this creates a
-     * stream socket. If the stream argument is {@code false}, it
-     * creates a datagram socket.
-     * <p>
      * If the application has specified a {@linkplain SocketImplFactory client
      * socket implementation factory}, that factory's
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl}
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
-     * <p>
-     * If a UDP socket is used, TCP/IP related socket options will not apply.
      *
      * @param      host     the host name, or {@code null} for the loopback address.
      * @param      port     the port number.
-     * @param      stream   a {@code boolean} indicating whether this is
-     *                      a stream socket or a datagram socket.
+     * @param      stream   must be true, false is not allowed.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     IllegalArgumentException if the port parameter is outside
-     *             the specified range of valid port values, which is between
-     *             0 and 65535, inclusive.
-     * @deprecated Use {@link DatagramSocket} instead for UDP transport.
+     * @throws     IllegalArgumentException if the stream parameter is {@code false}
+     *             or if the port parameter is outside the specified range of valid
+     *             port values, which is between 0 and 65535, inclusive.
+     * @deprecated The {@code stream} parameter provided a way in early JDK releases
+     *             to create a {@code Socket} that used a datagram socket. This feature
+     *             no longer exists. Instead use {@link DatagramSocket} for datagram sockets.
      */
     @Deprecated(forRemoval = true, since = "1.1")
     @SuppressWarnings("this-escape")
@@ -412,28 +407,23 @@ public Socket(String host, int port, boolean stream) throws IOException {
      * Creates a socket and connects it to the specified port number at
      * the specified IP address.
      * <p>
-     * If the stream argument is {@code true}, this creates a
-     * stream socket. If the stream argument is {@code false}, it
-     * creates a datagram socket.
-     * <p>
      * If the application has specified a {@linkplain SocketImplFactory client
      * socket implementation factory}, that factory's
      * {@linkplain SocketImplFactory#createSocketImpl() createSocketImpl}
      * method is called to create the actual socket implementation. Otherwise
      * a system-default socket implementation is created.
-     * <p>
-     * If UDP socket is used, TCP/IP related socket options will not apply.
      *
      * @param      host     the IP address.
      * @param      port      the port number.
-     * @param      stream    if {@code true}, create a stream socket;
-     *                       otherwise, create a datagram socket.
+     * @param      stream    must be true, false is not allowed.
      * @throws     IOException  if an I/O error occurs when creating the socket.
-     * @throws     IllegalArgumentException if the port parameter is outside
-     *             the specified range of valid port values, which is between
-     *             0 and 65535, inclusive.
+     * @throws     IllegalArgumentException if the stream parameter is {@code false}
+     *             or if the port parameter is outside the specified range of valid
+     *             port values, which is between 0 and 65535, inclusive.
      * @throws     NullPointerException if {@code host} is null.
-     * @deprecated Use {@link DatagramSocket} instead for UDP transport.
+     * @deprecated The {@code stream} parameter provided a way in early JDK releases
+     *             to create a {@code Socket} that used a datagram socket. This feature
+     *             no longer exists. Instead use {@link DatagramSocket} for datagram sockets.
      */
     @Deprecated(forRemoval = true, since = "1.1")
     @SuppressWarnings("this-escape")
@@ -454,6 +444,10 @@ private Socket(SocketAddress address, SocketAddress localAddr, boolean stream)
         throws IOException
     {
         Objects.requireNonNull(address);
+        if (!stream) {
+            throw new IllegalArgumentException(
+                    "Socket constructor does not support creation of datagram sockets");
+        }
         assert address instanceof InetSocketAddress;
 
         // create the SocketImpl and the underlying socket
diff --git a/src/java.base/share/classes/java/net/SocketImpl.java b/src/java.base/share/classes/java/net/SocketImpl.java
index 31ac881b0e2..15c12457aac 100644
--- a/src/java.base/share/classes/java/net/SocketImpl.java
+++ b/src/java.base/share/classes/java/net/SocketImpl.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
@@ -78,15 +78,16 @@ static <S extends SocketImpl & PlatformSocketImpl> S createPlatformSocketImpl(bo
     public SocketImpl() { }
 
     /**
-     * Creates either a stream or a datagram socket.
+     * Creates a stream socket.
      *
      * @apiNote
-     * The {@link Socket} constructors to create a datagram socket
-     * are deprecated for removal. This method will be re-specified
-     * in a future release to not support creating datagram sockets.
+     * The {@code stream} parameter provided a way in early JDK releases
+     * to create a {@link Socket} that used a datagram socket.
+     * The Socket API no longer provides a way to do this, so the
+     * {@code create} method will always be called with a {@code stream}
+     * value of {@code true}.
      *
-     * @param      stream   if {@code true}, create a stream socket;
-     *                      otherwise, create a datagram socket.
+     * @param      stream   must be {@code true}.
      * @throws     IOException  if an I/O error occurs while creating the
      *               socket.
      */
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
index 0e6ca6c3dcd..565c393c2a0 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.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
@@ -69,7 +69,7 @@ abstract class AsynchronousServerSocketChannelImpl
 
     AsynchronousServerSocketChannelImpl(AsynchronousChannelGroupImpl group) {
         super(group.provider());
-        this.fd = Net.serverSocket(true);
+        this.fd = Net.serverSocket();
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
index e08a873d73d..c53aca8b1c7 100644
--- a/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
@@ -88,7 +88,7 @@ abstract class AsynchronousSocketChannelImpl
         throws IOException
     {
         super(group.provider());
-        this.fd = Net.socket(true);
+        this.fd = Net.socket();
         this.state = ST_UNCONNECTED;
     }
 
diff --git a/src/java.base/share/classes/sun/nio/ch/Net.java b/src/java.base/share/classes/sun/nio/ch/Net.java
index 5c922aff676..5cd14a8b301 100644
--- a/src/java.base/share/classes/sun/nio/ch/Net.java
+++ b/src/java.base/share/classes/sun/nio/ch/Net.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
@@ -470,8 +470,8 @@ private static boolean isFastTcpLoopbackRequested() {
 
     private static native boolean canUseIPv6OptionsWithIPv4LocalAddress0();
 
-    static FileDescriptor socket(boolean stream) throws IOException {
-        return socket(UNSPEC, stream);
+    static FileDescriptor socket() throws IOException {
+        return socket(UNSPEC, true);
     }
 
     static FileDescriptor socket(ProtocolFamily family, boolean stream) throws IOException {
@@ -480,14 +480,14 @@ static FileDescriptor socket(ProtocolFamily family, boolean stream) throws IOExc
         return IOUtil.newFD(socket0(preferIPv6, stream, false, FAST_LOOPBACK));
     }
 
-    static FileDescriptor serverSocket(boolean stream) {
-        return serverSocket(UNSPEC, stream);
+    static FileDescriptor serverSocket() {
+        return serverSocket(UNSPEC);
     }
 
-    static FileDescriptor serverSocket(ProtocolFamily family, boolean stream) {
+    static FileDescriptor serverSocket(ProtocolFamily family) {
         boolean preferIPv6 = isIPv6Available() &&
             (family != StandardProtocolFamily.INET);
-        return IOUtil.newFD(socket0(preferIPv6, stream, true, FAST_LOOPBACK));
+        return IOUtil.newFD(socket0(preferIPv6, true, true, FAST_LOOPBACK));
     }
 
     // Due to oddities SO_REUSEADDR on Windows reuse is ignored
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 96d6e1e1db7..b3939f2ca05 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -100,8 +100,6 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     private static final int ST_CLOSED = 5;
     private volatile int state;  // need stateLock to change
 
-    // set by SocketImpl.create, protected by stateLock
-    private boolean stream;
     private Cleanable cleaner;
 
     // set to true when the socket is in non-blocking mode
@@ -451,19 +449,20 @@ private void write(byte[] b, int off, int len) throws IOException {
      */
     @Override
     protected void create(boolean stream) throws IOException {
+        if (!stream) {
+            throw new IOException("Datagram socket creation not supported");
+        }
         synchronized (stateLock) {
             if (state != ST_NEW)
                 throw new IOException("Already created");
             FileDescriptor fd;
             if (server) {
-                assert stream;
-                fd = Net.serverSocket(true);
+                fd = Net.serverSocket();
             } else {
-                fd = Net.socket(stream);
+                fd = Net.socket();
             }
-            Runnable closer = closerFor(fd, stream);
+            Runnable closer = closerFor(fd);
             this.fd = fd;
-            this.stream = stream;
             this.cleaner = CleanerFactory.cleaner().register(this, closer);
             this.state = ST_UNCONNECTED;
         }
@@ -653,8 +652,6 @@ protected void listen(int backlog) throws IOException {
     private FileDescriptor beginAccept() throws SocketException {
         synchronized (stateLock) {
             ensureOpen();
-            if (!stream)
-                throw new SocketException("Not a stream socket");
             if (localport == 0)
                 throw new SocketException("Not bound");
             readerThread = NativeThread.current();
@@ -764,10 +761,9 @@ protected void accept(SocketImpl si) throws IOException {
         }
 
         // set the fields
-        Runnable closer = closerFor(newfd, true);
+        Runnable closer = closerFor(newfd);
         synchronized (nsi.stateLock) {
             nsi.fd = newfd;
-            nsi.stream = true;
             nsi.cleaner = CleanerFactory.cleaner().register(nsi, closer);
             nsi.localport = localAddress.getPort();
             nsi.address = isaa[0].getAddress();
@@ -1187,24 +1183,14 @@ protected void sendUrgentData(int data) throws IOException {
     /**
      * Returns an action to close the given file descriptor.
      */
-    private static Runnable closerFor(FileDescriptor fd, boolean stream) {
-        if (stream) {
-            return () -> {
-                try {
-                    nd.close(fd);
-                } catch (IOException ioe) {
-                    throw new UncheckedIOException(ioe);
-                }
-            };
-        } else {
-            return () -> {
-                try {
-                    nd.close(fd);
-                } catch (IOException ioe) {
-                    throw new UncheckedIOException(ioe);
-                }
-            };
-        }
+    private static Runnable closerFor(FileDescriptor fd) {
+        return () -> {
+            try {
+                nd.close(fd);
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        };
     }
 
     /**
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 62a4b9a7cf8..b8e25b23b69 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -132,7 +132,7 @@ class ServerSocketChannelImpl
         if (family == UNIX) {
             this.fd = UnixDomainSockets.socket();
         } else {
-            this.fd = Net.serverSocket(family, true);
+            this.fd = Net.serverSocket(family);
         }
         this.fdVal = IOUtil.fdVal(fd);
     }
diff --git a/test/jdk/java/net/Socket/UdpSocket.java b/test/jdk/java/net/Socket/UdpSocket.java
index add9077d435..7e93343cefb 100644
--- a/test/jdk/java/net/Socket/UdpSocket.java
+++ b/test/jdk/java/net/Socket/UdpSocket.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
@@ -21,61 +21,52 @@
  * questions.
  */
 
-/**
- * @test
- * @run testng/othervm UdpSocket
- * @summary Basic test for a Socket to a UDP socket
- */
-
-import java.io.IOException;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.DatagramChannel;
-import java.util.Arrays;
 
 import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.testng.Assert.fail;
 
-@Test
+/*
+ * @test
+ * @summary Basic test for the UDP sockets through the java.net.Socket constructors
+ * @run testng UdpSocket
+ */
 public class UdpSocket {
 
-    private static final int MAX_RETRIES = 3;
-
     /**
-     * Test using the Socket API to send/receive datagrams
+     * Verifies that the {@code Socket} constructors that take the {@code stream}
+     * parameter don't allow construction of UDP sockets.
      */
-    public void testSendReceive() throws IOException {
-        final String MESSAGE = "hello";
-
-        try (DatagramChannel dc = DatagramChannel.open()) {
-            var loopback = InetAddress.getLoopbackAddress();
-            dc.bind(new InetSocketAddress(loopback, 0));
-
-            int port = ((InetSocketAddress) dc.getLocalAddress()).getPort();
-            try (Socket s = new Socket(loopback, port, false)) {
-                // send datagram with socket output stream
-                byte[] array1 = MESSAGE.getBytes("UTF-8");
-                s.getOutputStream().write(array1);
-
-                // receive the datagram
-                var buf = ByteBuffer.allocate(100);
-                SocketAddress remote = dc.receive(buf);
-                buf.flip();
-                assertTrue(buf.remaining() == MESSAGE.length(), "Unexpected size");
+    @Test
+    public void testUDPConstructors() throws Exception {
+        try {
+            new Socket("doesnotmatter", 12345, false);
+            fail("Socket constructor was expected to throw IllegalArgumentException" +
+                    " for stream=false, but didn't");
+        } catch (IllegalArgumentException iae) {
+            // verify it's thrown for the right reason
+            assertExceptionMessage(iae);
+        }
 
-                // echo the datagram
-                dc.send(buf, remote);
+        try {
+            new Socket(InetAddress.getLoopbackAddress(), 12345, false);
+            fail("Socket constructor was expected to throw IllegalArgumentException" +
+                    " for stream=false, but didn't");
+        } catch (IllegalArgumentException iae) {
+            // verify it's thrown for the right reason
+            assertExceptionMessage(iae);
+        }
+    }
 
-                // receive datagram with the socket input stream
-                byte[] array2 = new byte[100];
-                int n = s.getInputStream().read(array2);
-                assertTrue(n == MESSAGE.length(), "Unexpected size");
-                assertEquals(Arrays.copyOf(array1, n), Arrays.copyOf(array2, n),
-                            "Unexpected contents");
-            }
+    private static void assertExceptionMessage(final IllegalArgumentException iae) {
+        final String msg = iae.getMessage();
+        if (msg != null && msg.contains(
+                "Socket constructor does not support creation of datagram socket")) {
+            // contains the expected message
+            return;
         }
+        // unexpected exception message, propagate the original exception
+        throw iae;
     }
 }
diff --git a/test/jdk/java/net/SocketImpl/BadUsages.java b/test/jdk/java/net/SocketImpl/BadUsages.java
index 1af674b7673..b5d85708dde 100644
--- a/test/jdk/java/net/SocketImpl/BadUsages.java
+++ b/test/jdk/java/net/SocketImpl/BadUsages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 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
@@ -24,24 +24,20 @@
 /*
  * @test
  * @bug 8221481
+ * @summary Test the platform SocketImpl when used in unintended ways
  * @compile/module=java.base java/net/PlatformSocketImpl.java
  * @run testng/othervm BadUsages
- * @summary Test the platform SocketImpl when used in unintended ways
  */
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.SocketAddress;
 import java.net.SocketException;
-import java.net.SocketImpl;
 import java.net.SocketOption;
 import java.net.SocketOptions;
 import java.net.StandardSocketOptions;
-import java.util.Set;
 
 import java.net.PlatformSocketImpl;  // test helper
 
@@ -80,6 +76,15 @@ public void testCreate2() throws IOException {
         expectThrows(IOException.class, () -> impl.create(true));
     }
 
+    /**
+     * Test create when not a stream socket.
+     */
+    public void testCreate3() throws IOException {
+        try (var impl = new PlatformSocketImpl(false)) {
+            expectThrows(IOException.class, () -> impl.create(false));
+        }
+    }
+
     /**
      * Test connect when not created.
      */
@@ -235,18 +240,6 @@ public void testAccept2() throws IOException {
         }
     }
 
-    /**
-     * Test accept when not a stream socket.
-     */
-    public void testAccept3() throws IOException {
-        try (var impl = new PlatformSocketImpl(false)) {
-            impl.create(false);
-            impl.bind(InetAddress.getLoopbackAddress(), 0);
-            var si = new PlatformSocketImpl(false);
-            expectThrows(IOException.class, () -> impl.accept(si));
-        }
-    }
-
     /**
      * Test accept when closed.
      */

From 223eec55018f1640cb292b11130e3e1d6451990d Mon Sep 17 00:00:00 2001
From: Anass Baya <abaya@openjdk.org>
Date: Thu, 8 May 2025 07:30:40 +0000
Subject: [PATCH 340/901] 8354219: Automate
 javax/swing/JComboBox/ComboPopupBug.java

Reviewed-by: aivanov, achung
---
 .../javax/swing/JComboBox/ComboPopupBug.java  | 101 ++++++++++--------
 1 file changed, 58 insertions(+), 43 deletions(-)

diff --git a/test/jdk/javax/swing/JComboBox/ComboPopupBug.java b/test/jdk/javax/swing/JComboBox/ComboPopupBug.java
index 8c9dcde7d65..97074caba14 100644
--- a/test/jdk/javax/swing/JComboBox/ComboPopupBug.java
+++ b/test/jdk/javax/swing/JComboBox/ComboPopupBug.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
@@ -21,66 +21,81 @@
  * questions.
  */
 
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
 
 /*
  * @test
  * @bug 8322754
+ * @key headful
  * @summary Verifies clicking JComboBox during frame closure causes Exception
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @run main/manual ComboPopupBug
+ * @run main ComboPopupBug
  */
 
 public class ComboPopupBug {
-    private static final String instructionsText = """
-            This test is used to verify that clicking on JComboBox
-            when frame containing it is about to close should not
-            cause IllegalStateException.
-
-            A JComboBox is shown with Close button at the bottom.
-            Click on Close and then click on JComboBox arrow button
-            to try to show combobox popup.
-            If IllegalStateException is thrown, test will automatically Fail
-            otherwise click Pass.""";
+    private static JFrame frame;
+    private static JButton closeButton;
+    private static JComboBox<String> comboBox;
+    private static Robot robot;
+    private static final int PADDING = 10;
 
     public static void main(String[] args) throws Exception {
-        PassFailJFrame.builder()
-                .title("ComboPopup Instructions")
-                .instructions(instructionsText)
-                .testTimeOut(5)
-                .rows(10)
-                .columns(35)
-                .testUI(ComboPopupBug::createUI)
-                .build()
-                .awaitAndCheck();
+        try {
+            robot = new Robot();
+            robot.setAutoDelay(50);
+
+            SwingUtilities.invokeAndWait(ComboPopupBug::createUI);
+
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> closeButton.doClick());
+
+            robot.waitForIdle();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
     }
 
-    private static JFrame createUI() {
-        JFrame frame = new JFrame("ComboPopup");
+    private static void clickComboBox() {
+        Point comboBoxLocation = comboBox.getLocationOnScreen();
+        Dimension comboBoxSize = comboBox.getSize();
 
-        JComboBox<String> cb = new JComboBox<>();
-        cb.setEditable(true);
-        cb.addItem("test");
-        cb.addItem("test2");
-        cb.addItem("test3");
+        robot.mouseMove(comboBoxLocation.x + comboBoxSize.width - PADDING,
+                comboBoxLocation.y + comboBoxSize.height / 2);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+    }
 
-        JButton b = new JButton("Close");
-        b.addActionListener(
-                (e)->{
-                    try {
-                        Thread.sleep(3000);
-                    } catch (Exception ignored) {
-                    }
-                    frame.setVisible(false);
-                });
+    private static void createUI() {
+        frame = new JFrame("ComboPopup");
 
-        frame.getContentPane().add(cb, "North");
-        frame.getContentPane().add(b, "South");
-        frame.setSize(200, 200);
+        comboBox = new JComboBox<>();
+        comboBox.setEditable(true);
+        comboBox.addItem("test");
+        comboBox.addItem("test2");
+        comboBox.addItem("test3");
 
-        return frame;
+        closeButton = new JButton("Close");
+        closeButton.addActionListener((e) -> {
+            clickComboBox();
+            frame.setVisible(false);
+        });
+
+        frame.getContentPane().add(comboBox, "North");
+        frame.getContentPane().add(closeButton, "South");
+        frame.setSize(200, 200);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
     }
 }

From daf6fa1e6153d3fdf48ef0840790794e57349c38 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Thu, 8 May 2025 07:44:42 +0000
Subject: [PATCH 341/901] 8356085: AArch64: compiler stub buffer size wrongly
 depends on ZGC

Reviewed-by: shade, kvn
---
 src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
index c8b215b6eb4..425146e6bf4 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, 65000 ZGC_ONLY(+5000))                         \
+  do_arch_blob(compiler, 70000)                                         \
   do_stub(compiler, vector_iota_indices)                                \
   do_arch_entry(aarch64, compiler, vector_iota_indices,                 \
                 vector_iota_indices, vector_iota_indices)               \

From 2c1eb339d6c9b6cc6fa4a8780b0e0b8d4d9a5f01 Mon Sep 17 00:00:00 2001
From: nibjen <jena.nibedita@oracle.com>
Date: Thu, 8 May 2025 09:06:19 +0000
Subject: [PATCH 342/901] 8350830: Values converted incorrectly when reading
 TLS session tickets

Reviewed-by: djelinski, ascarpino
---
 .../sun/security/ssl/SSLSessionImpl.java      | 100 ++---
 .../ResumeClientTLS12withSNI.java             | 367 ++++++++++++++++++
 2 files changed, 402 insertions(+), 65 deletions(-)
 create mode 100644 test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java

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 566415e23c7..f5e173c636a 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
@@ -310,113 +311,90 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     SSLSessionImpl(HandshakeContext hc, ByteBuffer buf) throws IOException {
         boundValues = new ConcurrentHashMap<>();
         this.protocolVersion =
-                ProtocolVersion.valueOf(Short.toUnsignedInt(buf.getShort()));
+                ProtocolVersion.valueOf(Record.getInt16(buf));
 
         // The CH session id may reset this if it's provided
         this.sessionId = new SessionId(true,
                 hc.sslContext.getSecureRandom());
 
         this.cipherSuite =
-                CipherSuite.valueOf(Short.toUnsignedInt(buf.getShort()));
+                CipherSuite.valueOf(Record.getInt16(buf));
 
         // Local Supported signature algorithms
         ArrayList<SignatureScheme> list = new ArrayList<>();
-        int i = Byte.toUnsignedInt(buf.get());
+        int i = Record.getInt8(buf);
         while (i-- > 0) {
             list.add(SignatureScheme.valueOf(
-                    Short.toUnsignedInt(buf.getShort())));
+                    Record.getInt16(buf)));
         }
         this.localSupportedSignAlgs = Collections.unmodifiableCollection(list);
 
         // Peer Supported signature algorithms
-        i = Byte.toUnsignedInt(buf.get());
+        i = Record.getInt8(buf);
         list.clear();
         while (i-- > 0) {
             list.add(SignatureScheme.valueOf(
-                    Short.toUnsignedInt(buf.getShort())));
+                    Record.getInt16(buf)));
         }
         this.peerSupportedSignAlgs = Collections.unmodifiableCollection(list);
 
         // PSK
-        byte[] b;
-        i = Short.toUnsignedInt(buf.getShort());
-        if (i > 0) {
-            b = new byte[i];
-            // Get algorithm string
-            buf.get(b, 0, i);
-            // Encoded length
-            i = Short.toUnsignedInt(buf.getShort());
-            // Encoded SecretKey
-            b = new byte[i];
-            buf.get(b);
+        byte[] b = Record.getBytes16(buf);
+        if (b.length > 0) {
+            b = Record.getBytes16(buf);
             this.preSharedKey = new SecretKeySpec(b, "TlsMasterSecret");
         } else {
             this.preSharedKey = null;
         }
 
         // PSK identity
-        i = buf.get();
-        if (i > 0) {
-            b = new byte[i];
-            buf.get(b);
+        b = Record.getBytes8(buf);
+        if (b.length > 0) {
             this.pskIdentity = b;
         } else {
             this.pskIdentity = null;
         }
 
         // Master secret length of secret key algorithm  (one byte)
-        i = buf.get();
-        if (i > 0) {
-            b = new byte[i];
-            // Get algorithm string
-            buf.get(b, 0, i);
-            // Encoded length
-            i = Short.toUnsignedInt(buf.getShort());
-            // Encoded SecretKey
-            b = new byte[i];
-            buf.get(b);
+        b = Record.getBytes8(buf);
+        if (b.length > 0) {
+            b = Record.getBytes16(buf);
             this.masterSecret = new SecretKeySpec(b, "TlsMasterSecret");
         } else {
             this.masterSecret = null;
         }
+
         // Use extended master secret
-        this.useExtendedMasterSecret = (buf.get() != 0);
+        this.useExtendedMasterSecret = (Record.getInt8(buf) != 0);
 
         // Identification Protocol
-        i = buf.get();
-        if (i == 0) {
+        b = Record.getBytes8(buf);
+        if (b.length == 0) {
             identificationProtocol = null;
         } else {
-            b = new byte[i];
-            buf.get(b);
             identificationProtocol = new String(b);
         }
 
         // SNI
-        i = buf.get();  // length
-        if (i == 0) {
+        b = Record.getBytes8(buf);
+        if (b.length == 0) {
             serverNameIndication = null;
         } else {
-            b = new byte[i];
-            buf.get(b, 0, b.length);
             serverNameIndication = new SNIHostName(b);
         }
 
         // List of SNIServerName
-        int len = Short.toUnsignedInt(buf.getShort());
+        int len = Record.getInt16(buf);
         if (len == 0) {
             this.requestedServerNames = Collections.emptyList();
         } else {
             requestedServerNames = new ArrayList<>();
             while (len > 0) {
-                int l = buf.get();
-                b = new byte[l];
-                buf.get(b, 0, l);
+                b = Record.getBytes8(buf);
                 requestedServerNames.add(new SNIHostName(new String(b)));
                 len--;
             }
         }
-
         maximumPacketSize = buf.getInt();
         negotiatedMaxFragLen = buf.getInt();
 
@@ -426,31 +404,28 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         // Get Buffer sizes
 
         // Status Response
-        len = Short.toUnsignedInt(buf.getShort());
+        len = Record.getInt16(buf);
         if (len == 0) {
             statusResponses = Collections.emptyList();
         } else {
             statusResponses = new ArrayList<>();
         }
         while (len-- > 0) {
-            b = new byte[Short.toUnsignedInt(buf.getShort())];
-            buf.get(b);
+            b = Record.getBytes16(buf);
             statusResponses.add(b);
         }
 
         // Get Peer host & port
-        i = Byte.toUnsignedInt(buf.get());
-        if (i == 0) {
+        b = Record.getBytes8(buf);
+        if (b.length == 0) {
             this.host = "";
         } else {
-            b = new byte[i];
-            buf.get(b, 0, i);
             this.host = new String(b);
         }
-        this.port = Short.toUnsignedInt(buf.getShort());
+        this.port = Record.getInt16(buf);
 
         // Peer certs
-        i = buf.get();
+        i = Record.getInt8(buf);
         if (i == 0) {
             this.peerCerts = null;
         } else {
@@ -469,7 +444,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         }
 
         // Get local certs of PSK
-        switch (buf.get()) {
+        switch (Record.getInt8(buf)) {
             case 0:
                 break;
             case 1:
@@ -491,21 +466,15 @@ final class SSLSessionImpl extends ExtendedSSLSession {
             case 2:
                 // pre-shared key
                 // Length of pre-shared key algorithm  (one byte)
-                i = buf.get();
-                b = new byte[i];
-                buf.get(b, 0, i);
+                b = Record.getBytes8(buf);
                 String alg = new String(b);
-                // Get length of encoding
-                i = Short.toUnsignedInt(buf.getShort());
                 // Get encoding
-                b = new byte[i];
-                buf.get(b);
+                b = Record.getBytes16(buf);
                 this.preSharedKey = new SecretKeySpec(b, alg);
                 // Get identity len
-                i = buf.get();
+                i = Record.getInt8(buf);
                 if (i > 0) {
-                    this.pskIdentity = new byte[buf.get()];
-                    buf.get(pskIdentity);
+                    this.pskIdentity = Record.getBytes8(buf);
                 } else {
                     this.pskIdentity = null;
                 }
@@ -519,6 +488,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.lastUsedTime = System.currentTimeMillis();
     }
 
+
     // Some situations we cannot provide a stateless ticket, but after it
     // has been negotiated
     boolean isStatelessable() {
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
new file mode 100644
index 00000000000..b3c66eb9bcd
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
@@ -0,0 +1,367 @@
+/*
+ * 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 8350830
+ * @summary TLS 1.2 Client session resumption having ServerNameIndication
+ * @modules java.base/sun.security.tools.keytool
+ * @run main/othervm -Djavax.net.debug=all ResumeClientTLS12withSNI
+ */
+
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.*;
+
+public class ResumeClientTLS12withSNI {
+
+    /*
+     * Enables logging of the SSLEngine operations.
+     */
+    private static final boolean logging = true;
+
+    private static SSLContext sslc;
+
+    private SSLEngine clientEngine; // client Engine
+    private ByteBuffer clientOut; // write side of clientEngine
+    private ByteBuffer clientIn; // read side of clientEngine
+
+    private SSLEngine serverEngine; // server Engine
+    private ByteBuffer serverOut; // write side of serverEngine
+    private ByteBuffer serverIn; // read side of serverEngine
+
+    /*
+     * For data transport, this example uses local ByteBuffers.
+     */
+    private ByteBuffer cTOs; // "reliable" transport client->server
+    private ByteBuffer sTOc; // "reliable" transport server->client
+
+    /*
+     * The following is to set up the keystores.
+     */
+    private static final String pathToStores = System.getProperty("test.src", ".");
+    private static final String keyStoreFile = "ks_san.p12";
+    private static final String trustStoreFile = "ks_san.p12";
+    private static final char[] passphrase = "123456".toCharArray();
+
+    private static final String keyFilename =
+            pathToStores + "/" + keyStoreFile;
+    private static final String trustFilename =
+            pathToStores + "/" + trustStoreFile;
+
+    private static final String HOST_NAME = "arf.yak.foo.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456."
+            + "localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456";
+    private static final SNIMatcher SNI_MATCHER = SNIHostName.createSNIMatcher("arf\\.yak\\.foo.*");
+
+    /*
+     * Main entry point for this test.
+     */
+    public static void main(String args[]) throws Exception {
+        Files.deleteIfExists(Path.of(keyFilename));
+
+        sun.security.tools.keytool.Main.main(
+                ("-keystore " + keyFilename + " -storepass 123456 -keypass 123456 -dname"
+                 + " CN=test" + " -alias ks_san -genkeypair -keyalg rsa -ext "
+                 + "san=dns:localhost123.localhost123.localhost123.localhost123."
+                 + "localhost123.localhost123.localhost123.localhost123.localhost123."
+                 + "localhost123.localhost123.localhost123.localhost123.localhost123."
+                 + "localhost123.localhost123.localhost123.localhost123.localhost123.com,"
+                 + "dns:localhost456").split(" "));
+        final ResumeClientTLS12withSNI clientSession = new ResumeClientTLS12withSNI("TLSv1.2");
+        for (int i = 0; i < 2; i++) {
+            clientSession.runTest();
+        }
+
+        Files.deleteIfExists(Path.of(keyFilename));
+    }
+
+    public ResumeClientTLS12withSNI(final String sslProtocol) throws Exception {
+
+        KeyManagerFactory kmf = makeKeyManagerFactory(keyFilename,
+                passphrase);
+        TrustManagerFactory tmf = makeTrustManagerFactory(trustFilename,
+                passphrase);
+
+        SSLContext sslCtx = SSLContext.getInstance(sslProtocol);
+
+        sslCtx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+        sslc = sslCtx;
+    }
+
+    private static KeyManagerFactory makeKeyManagerFactory(String ksPath,
+                                                           char[] pass) throws GeneralSecurityException, IOException {
+        KeyManagerFactory kmf;
+        KeyStore ks = KeyStore.getInstance("JKS");
+
+        try (FileInputStream fsIn = new FileInputStream(ksPath)) {
+            ks.load(fsIn, pass);
+            kmf = KeyManagerFactory.getInstance("SunX509");
+            kmf.init(ks, pass);
+        }
+        return kmf;
+    }
+
+    private static TrustManagerFactory makeTrustManagerFactory(String tsPath,
+                                                               char[] pass) throws GeneralSecurityException, IOException {
+        TrustManagerFactory tmf;
+        KeyStore ts = KeyStore.getInstance("JKS");
+
+        try (FileInputStream fsIn = new FileInputStream(tsPath)) {
+            ts.load(fsIn, pass);
+            tmf = TrustManagerFactory.getInstance("SunX509");
+            tmf.init(ts);
+        }
+        return tmf;
+    }
+
+    /*
+     * Run the test.
+     *
+     * Sit in a tight loop, both engines calling wrap/unwrap regardless
+     * of whether data is available or not. We do this until both engines
+     * report back they are closed.
+     *
+     * The main loop handles all of the I/O phases of the SSLEngine's
+     * lifetime:
+     *
+     * initial handshaking
+     * application data transfer
+     * engine closing
+     *
+     */
+    private void runTest() throws Exception {
+        boolean dataDone = false;
+
+        createSSLEngines();
+        createBuffers();
+
+        SSLEngineResult clientResult; // results from client's last operation
+        SSLEngineResult serverResult; // results from server's last operation
+
+        /*
+         * Examining the SSLEngineResults could be much more involved,
+         * and may alter the overall flow of the application.
+         *
+         * For example, if we received a BUFFER_OVERFLOW when trying
+         * to write to the output pipe, we could reallocate a larger
+         * pipe, but instead we wait for the peer to drain it.
+         */
+        while (!isEngineClosed(clientEngine) ||
+                !isEngineClosed(serverEngine)) {
+
+            log("================");
+
+            clientResult = clientEngine.wrap(clientOut, cTOs);
+            log("client wrap: ", clientResult);
+            runDelegatedTasks(clientResult, clientEngine);
+
+            serverResult = serverEngine.wrap(serverOut, sTOc);
+            log("server wrap: ", serverResult);
+            runDelegatedTasks(serverResult, serverEngine);
+
+            cTOs.flip();
+            sTOc.flip();
+
+            log("-------");
+
+            clientResult = clientEngine.unwrap(sTOc, clientIn);
+            log("client unwrap: ", clientResult);
+            runDelegatedTasks(clientResult, clientEngine);
+
+            serverResult = serverEngine.unwrap(cTOs, serverIn);
+            log("server unwrap: ", serverResult);
+            runDelegatedTasks(serverResult, serverEngine);
+
+            cTOs.compact();
+            sTOc.compact();
+
+            /*
+             * After we've transfered all application data between the client
+             * and server, we close the clientEngine's outbound stream.
+             * This generates a close_notify handshake message, which the
+             * server engine receives and responds by closing itself.
+             *
+             * In normal operation, each SSLEngine should call
+             * closeOutbound(). To protect against truncation attacks,
+             * SSLEngine.closeInbound() should be called whenever it has
+             * determined that no more input data will ever be
+             * available (say a closed input stream).
+             */
+            if (!dataDone && (clientOut.limit() == serverIn.position()) &&
+                    (serverOut.limit() == clientIn.position())) {
+
+                /*
+                 * A sanity check to ensure we got what was sent.
+                 */
+                checkTransfer(serverOut, clientIn);
+                checkTransfer(clientOut, serverIn);
+
+                log("\tClosing clientEngine's *OUTBOUND*...");
+                clientEngine.closeOutbound();
+                // serverEngine.closeOutbound();
+                dataDone = true;
+            }
+        }
+    }
+
+    /*
+     * Using the SSLContext created during object creation,
+     * create/configure the SSLEngines we'll use for this test.
+     */
+    private void createSSLEngines() throws Exception {
+        /*
+         * Configure the serverEngine to act as a server in the SSL/TLS
+         * handshake.
+         */
+        serverEngine = sslc.createSSLEngine();
+        serverEngine.setUseClientMode(false);
+        serverEngine.setNeedClientAuth(false);
+        SSLParameters servSSLParams = serverEngine.getSSLParameters();
+        servSSLParams.setSNIMatchers(List.of(SNI_MATCHER));
+        serverEngine.setSSLParameters(servSSLParams);
+
+        /*
+         * Similar to above, but using client mode instead.
+         */
+        clientEngine = sslc.createSSLEngine(HOST_NAME, 80);
+        clientEngine.setUseClientMode(true);
+        SSLParameters cliSSLParams = clientEngine.getSSLParameters();
+        clientEngine.setSSLParameters(cliSSLParams);
+    }
+
+    /*
+     * Create and size the buffers appropriately.
+     */
+    private void createBuffers() {
+
+        /*
+         * We'll assume the buffer sizes are the same
+         * between client and server.
+         */
+        SSLSession session = clientEngine.getSession();
+        int appBufferMax = session.getApplicationBufferSize();
+        int netBufferMax = session.getPacketBufferSize();
+
+        /*
+         * We'll make the input buffers a bit bigger than the max needed
+         * size, so that unwrap()s following a successful data transfer
+         * won't generate BUFFER_OVERFLOWS.
+         *
+         * We'll use a mix of direct and indirect ByteBuffers for
+         * tutorial purposes only. In reality, only use direct
+         * ByteBuffers when they give a clear performance enhancement.
+         */
+        clientIn = ByteBuffer.allocate(appBufferMax + 50);
+        serverIn = ByteBuffer.allocate(appBufferMax + 50);
+
+        cTOs = ByteBuffer.allocateDirect(netBufferMax);
+        sTOc = ByteBuffer.allocateDirect(netBufferMax);
+
+        clientOut = ByteBuffer.wrap("Hi Server, I'm Client".getBytes());
+        serverOut = ByteBuffer.wrap("Hello Client, I'm Server".getBytes());
+    }
+
+    /*
+     * If the result indicates that we have outstanding tasks to do,
+     * go ahead and run them in this thread.
+     */
+    private static void runDelegatedTasks(SSLEngineResult result,
+                                          SSLEngine engine) throws Exception {
+
+        if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+            Runnable runnable;
+            while ((runnable = engine.getDelegatedTask()) != null) {
+                log("\trunning delegated task...");
+                runnable.run();
+            }
+            HandshakeStatus hsStatus = engine.getHandshakeStatus();
+            if (hsStatus == HandshakeStatus.NEED_TASK) {
+                throw new Exception(
+                        "handshake shouldn't need additional tasks");
+            }
+            log("\tnew HandshakeStatus: " + hsStatus);
+        }
+    }
+
+    private static boolean isEngineClosed(SSLEngine engine) {
+        return (engine.isOutboundDone() && engine.isInboundDone());
+    }
+
+    /*
+     * Simple check to make sure everything came across as expected.
+     */
+    private static void checkTransfer(ByteBuffer a, ByteBuffer b)
+            throws Exception {
+        a.flip();
+        b.flip();
+
+        if (!a.equals(b)) {
+            throw new Exception("Data didn't transfer cleanly");
+        } else {
+            log("\tData transferred cleanly");
+        }
+
+        a.position(a.limit());
+        b.position(b.limit());
+        a.limit(a.capacity());
+        b.limit(b.capacity());
+    }
+
+    /*
+     * Logging code
+     */
+    private static boolean resultOnce = true;
+
+    private static void log(String str, SSLEngineResult result) {
+        if (!logging) {
+            return;
+        }
+        if (resultOnce) {
+            resultOnce = false;
+            System.out.println("The format of the SSLEngineResult is: \n" +
+                    "\t\"getStatus() / getHandshakeStatus()\" +\n" +
+                    "\t\"bytesConsumed() / bytesProduced()\"\n");
+        }
+        HandshakeStatus hsStatus = result.getHandshakeStatus();
+        log(str +
+                result.getStatus() + "/" + hsStatus + ", " +
+                result.bytesConsumed() + "/" + result.bytesProduced() +
+                " bytes");
+        if (hsStatus == HandshakeStatus.FINISHED) {
+            log("\t...ready for application data");
+        }
+    }
+
+    private static void log(String str) {
+        if (logging) {
+            System.out.println(str);
+        }
+    }
+}

From 5df7089c3eb2e6d7cf6634840a2a21bcaa7e3f4e Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Thu, 8 May 2025 10:56:01 +0000
Subject: [PATCH 343/901] 8350398: [s390x] Relativize initial_sp/monitors in
 interpreter frames

Reviewed-by: lucy, aph
---
 src/hotspot/cpu/s390/frame_s390.hpp           |  4 ++--
 src/hotspot/cpu/s390/frame_s390.inline.hpp    | 15 +++++++-----
 src/hotspot/cpu/s390/interp_masm_s390.cpp     | 23 ++++++++++++++++---
 .../templateInterpreterGenerator_s390.cpp     |  8 +++++--
 src/hotspot/cpu/s390/templateTable_s390.cpp   |  9 +++++---
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 1aaabfb1230..ab15e75bc5b 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -498,8 +498,6 @@
 
   inline z_ijava_state* ijava_state() const;
 
-  // Where z_ijava_state.monitors is saved.
-  inline BasicObjectLock**  interpreter_frame_monitors_addr() const;
   // Where z_ijava_state.esp is saved.
   inline intptr_t** interpreter_frame_esp_addr() const;
 
@@ -517,6 +515,8 @@
   // Next two functions read and write z_ijava_state.monitors.
  private:
   inline BasicObjectLock* interpreter_frame_monitors() const;
+
+  // Where z_ijava_state.monitors is saved.
   inline void interpreter_frame_set_monitors(BasicObjectLock* monitors);
 
  public:
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index ede7039ce0a..59e23af7f48 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -109,16 +109,19 @@ inline frame::z_ijava_state* frame::ijava_state() const {
   return state;
 }
 
-inline BasicObjectLock** frame::interpreter_frame_monitors_addr() const {
-  return (BasicObjectLock**) &(ijava_state()->monitors);
-}
-
 // The next two functions read and write z_ijava_state.monitors.
 inline BasicObjectLock* frame::interpreter_frame_monitors() const {
-  return *interpreter_frame_monitors_addr();
+  BasicObjectLock* result = (BasicObjectLock*) at_relative(_z_ijava_idx(monitors));
+  // make sure the pointer points inside the frame
+  assert(sp() <= (intptr_t*) result, "monitor end should be above the stack pointer");
+  assert((intptr_t*) result < fp(),  "monitor end should be strictly below the frame pointer: result: " INTPTR_FORMAT " fp: " INTPTR_FORMAT, p2i(result), p2i(fp()));
+  return result;
 }
+
 inline void frame::interpreter_frame_set_monitors(BasicObjectLock* monitors) {
-  *interpreter_frame_monitors_addr() = monitors;
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  // set relativized monitors
+  ijava_state()->monitors = (intptr_t) ((intptr_t*)monitors - fp());
 }
 
 // Accessors
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index 9717d260279..aac130ea66e 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -627,7 +627,7 @@ void InterpreterMacroAssembler::verify_esp(Register Resp, Register Rtemp) {
     // i.e. IJAVA_STATE.monitors > Resp.
     NearLabel OK;
     Register Rmonitors = Rtemp;
-    z_lg(Rmonitors, _z_ijava_state_neg(monitors), Z_fp);
+    get_monitors(Rmonitors);
     compareU64_and_branch(Rmonitors, Resp, bcondHigh, OK);
     reentry = stop_chain_static(reentry, "too many pops: Z_esp points into monitor area");
     bind(OK);
@@ -676,10 +676,28 @@ void InterpreterMacroAssembler::restore_esp() {
 
 void InterpreterMacroAssembler::get_monitors(Register reg) {
   asm_assert_ijava_state_magic(reg);
+#ifdef ASSERT
+  NearLabel ok;
+  z_cg(Z_fp, 0, Z_SP);
+  z_bre(ok);
+  stop("Z_fp is corrupted");
+  bind(ok);
+#endif // ASSERT
   mem2reg_opt(reg, Address(Z_fp, _z_ijava_state_neg(monitors)));
+  z_slag(reg, reg, Interpreter::logStackElementSize);
+  z_agr(reg, Z_fp);
 }
 
 void InterpreterMacroAssembler::save_monitors(Register reg) {
+#ifdef ASSERT
+  NearLabel ok;
+  z_cg(Z_fp, 0, Z_SP);
+  z_bre(ok);
+  stop("Z_fp is corrupted");
+  bind(ok);
+#endif // ASSERT
+  z_sgr(reg, Z_fp);
+  z_srag(reg, reg, Interpreter::logStackElementSize);
   reg2mem_opt(reg, Address(Z_fp, _z_ijava_state_neg(monitors)));
 }
 
@@ -840,12 +858,11 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
     // register for unlock_object to pass to VM directly.
     Register R_current_monitor = Z_ARG2;
     Register R_monitor_block_bot = Z_ARG1;
-    const Address monitor_block_top(Z_fp, _z_ijava_state_neg(monitors));
     const Address monitor_block_bot(Z_fp, -frame::z_ijava_state_size);
 
     bind(restart);
     // Starting with top-most entry.
-    z_lg(R_current_monitor, monitor_block_top);
+    get_monitors(R_current_monitor);
     // Points to word before bottom of monitor block.
     load_address(R_monitor_block_bot, monitor_block_bot);
     z_bru(entry);
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 04fe574088e..c3c99d7297d 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1174,7 +1174,11 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   // z_ijava_state->monitors = fp - frame::z_ijava_state_size - Interpreter::stackElementSize;
   // z_ijava_state->esp = Z_esp = z_ijava_state->monitors;
   __ add2reg(Z_esp, -frame::z_ijava_state_size, fp);
-  __ z_stg(Z_esp, _z_ijava_state_neg(monitors), fp);
+
+  __ z_sgrk(Z_R0, Z_esp, fp);
+  __ z_srag(Z_R0, Z_R0, Interpreter::logStackElementSize);
+  __ z_stg(Z_R0, _z_ijava_state_neg(monitors), fp);
+
   __ add2reg(Z_esp, -Interpreter::stackElementSize);
   __ z_stg(Z_esp, _z_ijava_state_neg(esp), fp);
 
@@ -1633,7 +1637,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ add2reg(Rfirst_monitor, -(frame::z_ijava_state_size + (int)sizeof(BasicObjectLock)), Z_fp);
 #ifdef ASSERT
     NearLabel ok;
-    __ z_lg(Z_R1, _z_ijava_state_neg(monitors), Z_fp);
+    __ get_monitors(Z_R1);
     __ compareU64_and_branch(Rfirst_monitor, Z_R1, Assembler::bcondEqual, ok);
     reentry = __ stop_chain_static(reentry, "native_entry:unlock: inconsistent z_ijava_state.monitors");
     __ bind(ok);
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index 4262c77ecd7..2b39cc8318c 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -65,7 +65,8 @@
 // The actual size of each block heavily depends on the CPU capabilities and,
 // of course, on the logic implemented in each block.
 #ifdef ASSERT
-  #define BTB_MINSIZE 256
+// With introduced assert in get_monitor() & set_monitor(), required block size is now 322.
+  #define BTB_MINSIZE 512
 #else
   #define BTB_MINSIZE  64
 #endif
@@ -91,7 +92,8 @@
     if (len > alignment) {                                                     \
       tty->print_cr("%4d of %4d @ " INTPTR_FORMAT ": Block len for %s",        \
                     len, alignment, e_addr-len, name);                         \
-      guarantee(len <= alignment, "block too large");                          \
+      guarantee(len <= alignment, "block too large, len = %d, alignment = %d", \
+                      len, alignment);                                         \
     }                                                                          \
     guarantee(len == e_addr-b_addr, "block len mismatch");                     \
   }
@@ -112,7 +114,8 @@
     if (len > alignment) {                                                     \
       tty->print_cr("%4d of %4d @ " INTPTR_FORMAT ": Block len for %s",        \
                     len, alignment, e_addr-len, name);                         \
-      guarantee(len <= alignment, "block too large");                          \
+      guarantee(len <= alignment, "block too large, len = %d, alignment = %d", \
+                      len, alignment);                                         \
     }                                                                          \
     guarantee(len == e_addr-b_addr, "block len mismatch");                     \
   }

From b47b2062a2232694eb01473054a468ad9a6a2507 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Thu, 8 May 2025 11:33:31 +0000
Subject: [PATCH 344/901] 8355674: C2: Partial Peeling should not introduce Phi
 nodes above OpaqueInitializedAssertionPredicate nodes

Reviewed-by: epeter, thartmann
---
 src/hotspot/share/opto/loopopts.cpp           |  2 +-
 ...veOpaqueInitializedAssertionPredicate.java | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/assertion/TestPhiAboveOpaqueInitializedAssertionPredicate.java

diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index b8bbaa964e8..070749cfe1f 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -3391,7 +3391,7 @@ void PhaseIdealLoop::clone_for_special_use_inside_loop( IdealLoopTree *loop, Nod
   for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) {
     Node* use = n->fast_out(j);
     if ( not_peel.test(use->_idx) &&
-         (use->is_If() || use->is_CMove() || use->is_Bool()) &&
+         (use->is_If() || use->is_CMove() || use->is_Bool() || use->is_OpaqueInitializedAssertionPredicate()) &&
          use->in(1) == n)  {
       worklist.push(use);
     }
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestPhiAboveOpaqueInitializedAssertionPredicate.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestPhiAboveOpaqueInitializedAssertionPredicate.java
new file mode 100644
index 00000000000..b32647f3f71
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestPhiAboveOpaqueInitializedAssertionPredicate.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 8355674
+ * @summary Check that we do not introduce a Phi above a OpaqueInitializedAssertionPredicateNode during Partial Peeling.
+ * @run main/othervm -Xcomp -XX:CompileOnly=compiler.predicates.assertion.TestPhiAboveOpaqueInitializedAssertionPredicate::test
+ *                   compiler.predicates.assertion.TestPhiAboveOpaqueInitializedAssertionPredicate
+ * @run main         compiler.predicates.assertion.TestPhiAboveOpaqueInitializedAssertionPredicate
+ */
+
+package compiler.predicates.assertion;
+
+public class TestPhiAboveOpaqueInitializedAssertionPredicate {
+    public static void main(String[] o) {
+        for (int i = 0; i < 1000; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        int e;
+        int h = 8;
+        int[][] iArr = new int[100][100];
+        for (float j = 8; j < 100 ; ++j) {
+            for (int f = 5; f > 1; f -= 2) {
+                for (int g = 1; 3 > g; ++g) {
+                    try {
+                        e = iArr[(int) j][g] / h;
+                    } catch (ArithmeticException k) {
+                    }
+                    h += g;
+                }
+            }
+        }
+    }
+}

From ad07426fab3396caefd7c08d924e085c1f6f61ba Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Thu, 8 May 2025 11:34:46 +0000
Subject: [PATCH 345/901] 8356084: C2: Data is wrongly rewired to Initialized
 Assertion Predicates instead of Template Assertion Predicates

Reviewed-by: epeter, kvn
---
 src/hotspot/share/opto/predicates.cpp         |  7 +-
 src/hotspot/share/opto/predicates.hpp         |  2 +-
 .../assertion/TestAssertionPredicates.java    | 99 ++++++++++++++++---
 3 files changed, 93 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index d6078e50d69..137d16712d8 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -984,15 +984,16 @@ void CreateAssertionPredicatesVisitor::visit(const TemplateAssertionPredicate& t
 
 // Create an Initialized Assertion Predicate from the provided Template Assertion Predicate.
 InitializedAssertionPredicate CreateAssertionPredicatesVisitor::initialize_from_template(
-    const TemplateAssertionPredicate& template_assertion_predicate, Node* new_control) const {
+  const TemplateAssertionPredicate& template_assertion_predicate, IfTrueNode* cloned_template_predicate_tail) const {
   DEBUG_ONLY(template_assertion_predicate.verify();)
   IfNode* template_head = template_assertion_predicate.head();
   InitializedAssertionPredicateCreator initialized_assertion_predicate_creator(_phase);
   InitializedAssertionPredicate initialized_assertion_predicate =
-      initialized_assertion_predicate_creator.create_from_template(template_head, new_control, _init, _stride);
+      initialized_assertion_predicate_creator.create_from_template(template_head, cloned_template_predicate_tail, _init,
+                                                                   _stride);
 
   DEBUG_ONLY(initialized_assertion_predicate.verify();)
-  template_assertion_predicate.rewire_loop_data_dependencies(initialized_assertion_predicate.tail(),
+  template_assertion_predicate.rewire_loop_data_dependencies(cloned_template_predicate_tail,
                                                              _node_in_loop_body, _phase);
   rewire_to_old_predicate_chain_head(initialized_assertion_predicate.tail());
   return initialized_assertion_predicate;
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index f19b2d73c56..2181e498bd4 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -1098,7 +1098,7 @@ class CreateAssertionPredicatesVisitor : public PredicateVisitor {
   clone_template_and_replace_init_input(const TemplateAssertionPredicate& template_assertion_predicate) const;
 
   InitializedAssertionPredicate initialize_from_template(const TemplateAssertionPredicate& template_assertion_predicate,
-                                                         Node* new_control) const;
+                                                         IfTrueNode* cloned_template_predicate_tail) const;
   void rewire_to_old_predicate_chain_head(Node* initialized_assertion_predicate_success_proj) const;
 
  public:
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
index f7f2f1f20f6..8f30dce15bc 100644
--- a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
@@ -179,6 +179,18 @@
  *                   compiler.predicates.assertion.TestAssertionPredicates Stress
  */
 
+/*
+ * @test id=StressXcompMaxUnroll0
+ * @key randomness
+ * @bug 8288981 8356084
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
+ *                   -XX:LoopMaxUnroll=0 -XX:+IgnoreUnrecognizedVMOptions -XX:-KillPathsReachableByDeadTypeNode
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates StressXcompMaxUnroll0
+ */
+
 /*
  * @test id=NoLoopPredicationXcomp
  * @bug 8288981 8350577
@@ -226,6 +238,7 @@ public class TestAssertionPredicates {
     static boolean flagFalse, flagFalse2;
     static int iFld = 34;
     static int iFld2, iFld3;
+    static int two = 2;
     static long lFld, lFldOne = 1;
     static float fFld;
     static short sFld;
@@ -238,7 +251,7 @@ static class Foo {
     }
 
     static Foo foo = new Foo();
-
+    static int fooArrSize = 10000001;
 
     public static void main(String[] args) {
         switch (args[0]) {
@@ -315,7 +328,7 @@ public static void main(String[] args) {
                     test8308504No2();
                 }
             }
-            case "DataUpdate" -> {
+            case "DataUpdate", "StressXcompMaxUnroll0" -> {
                 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;
@@ -323,6 +336,7 @@ public static void main(String[] args) {
                     testDataUpdateUnswitchUnroll();
                     testDataUpdateUnroll();
                     testDataUpdatePeelingUnroll();
+                    testPeelingThreeTimesDataUpdate();
                 }
             }
             case "CloneDown" -> {
@@ -1064,18 +1078,18 @@ static void testDataUpdateUnswitchingPeelingUnroll() {
         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
+        // 10) 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
+        // 11) 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
+            // 4) 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.
+            // 5) Loop unroll policy now returns true.
             //    Peeled iteration [i = 0]
             //    - Loop is pre-main-posted
             //        Loop-pre[i = 1..4, stride = 1]
@@ -1085,16 +1099,16 @@ static void testDataUpdateUnswitchingPeelingUnroll() {
             //        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
+            // 6) 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.
+            // 7) 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
+                // 8) 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
+                // 9) 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) {
@@ -1327,11 +1341,74 @@ static void testDataUpdatePeelingUnroll() {
         }
     }
 
+
+    // -Xcomp -XX:LoopMaxUnroll=0 -XX:+StressGCM -XX:CompileCommand=compileonly,Test*::*
+    private static void testPeelingThreeTimesDataUpdate() {
+        Foo[] fooArr = new Foo[fooArrSize];
+        for (int i = 0; i < two; i++) {
+            fooArr[10000000 * i] = foo;
+        }
+        int x = 0;
+
+        // 2) The Hoisted Range Check Predicate is accompanied by two Template Assertion Predicates. The LoadN node,
+        //    previously pinned at the hoisted range check, is now pinned at the Template Assertion Predicate. Note
+        //    that the LoadN is still inside the loop body.
+        // 3) The loop is now peeled 3 times which also peels 3 loads from 'fooArr' out of the loop:
+        //       // Peeled section from 1st Loop Peeling
+        //       ...
+        //       LoadN[0]
+        //       ...
+        //       <loop entry guard>
+        //       // Peeled section from 2nd Loop Peeling
+        //       ...
+        //       LoadN[10000000]
+        //       Initialized Assertion Predicate (***)
+        //       <loop entry guard>
+        //       // Peeled section from 3rd Loop Peeling
+        //       ...
+        //       LoadN[20000000]
+        //       ...
+        //       Initialized Assertion Predicate
+        //       <loop entry guard>
+        //       Template Assertion Predicate
+        //       Initialized Assertion Predicate
+        // Loop:
+        //   LoadN[i*10000000]
+        //
+        // To avoid that the peeled LoadN nodes float above the corresponding loop entry guards, we need to pin them
+        // below. That is done by updating the dependency of the peeled LoadN to the new Template Assertion Predicate.
+        // This is currently broken: We wrongly set the dependency to the Initialized Assertion Predicate instead of the
+        // Template Assertion Predicate. We can then no longer find the dependency and miss to update it in the next
+        // Loop Peeling application. As a result, all the LoadN pile up at the originally added Initialized Assertion
+        // Predicate of the first Loop Peeling application at (***).
+        //
+        // With GCM, we could schedule LoadN[20000000] at (***), before the loop entry corresponding loop entry guard
+        // for this load. We then crash during runtime because we are accessing an out-of-range index. The fix is to
+        // properly update the data dependencies to the Template Assertion Predicates and not the Initialized Assertion
+        // Predicates.
+        for (int i = 0; i < two; i++) {
+            // 1) Hoisted with a Hoisted Range Check Predicate
+            x += fooArr[i * 10000000].iFld;
+
+            if (iFld2 == 4) {
+                return;
+            }
+
+            if (i > 0 && iFld2 == 3) {
+                iFld2 = 42;
+                return;
+            }
+
+            if (i > 1 && iFld2 == 2) {
+                return;
+            }
+        }
+    }
+
     /*
      * Tests collected in JBS and duplicated issues
      */
 
-
     // -Xbatch -XX:CompileCommand=compileonly,Test*::*
     static void test8305428() {
         int j = 1;

From 900b3ff7ee933520efe2438fb7c841a4e6a93d17 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 8 May 2025 13:18:02 +0000
Subject: [PATCH 346/901] 8351359: OperatingSystemMXBean: values from
 getCpuLoad and getProcessCpuLoad are stale after 24.8 days (Windows)

Reviewed-by: amenkov, sspitsyn
---
 .../native/libmanagement_ext/OperatingSystemImpl.c        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
index c53d949cb64..0681164fa47 100644
--- a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
+++ b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
@@ -50,6 +50,8 @@
 #include <process.h>
 #pragma warning(pop)
 
+#include <sysinfoapi.h>
+
 typedef unsigned __int32 juint;
 typedef unsigned __int64 julong;
 
@@ -215,10 +217,10 @@ static PdhLookupPerfNameByIndexFunc PdhLookupPerfNameByIndex_i;
  */
 typedef struct {
     HQUERY      query;
-    uint64_t    lastUpdate; // Last time query was updated (ticks)
+    uint64_t    lastUpdate; // Last time query was updated (millis)
 } UpdateQueryS, *UpdateQueryP;
 
-// Min time between query updates (ticks)
+// Min time between query updates (millis)
 static const int MIN_UPDATE_INTERVAL = 500;
 
 /*
@@ -991,7 +993,7 @@ bindPdhFunctionPointers(HMODULE h) {
  */
 static int
 getPerformanceData(UpdateQueryP query, HCOUNTER c, PDH_FMT_COUNTERVALUE* value, DWORD format) {
-    clock_t now = clock();
+    uint64_t now = GetTickCount64();
 
     /*
      * Need to limit how often we update the query

From 57297e60de92b9878fb3926109da3e0058a506ae Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 8 May 2025 13:33:57 +0000
Subject: [PATCH 347/901] 8354278: Revert use of non-POSIX echo -n introduced
 in JDK-8301197

Reviewed-by: iris
---
 make/Docs.gmk             |  2 +-
 make/MainSupport.gmk      | 20 ++++++++++----------
 make/autoconf/help.m4     |  4 ++--
 make/common/FindTests.gmk |  4 ++--
 make/common/Modules.gmk   |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 965ae689e21..2d8ce7c2a69 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -262,7 +262,7 @@ define create_overview_file
   $$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
 	$$(call LogInfo, Creating overview.html for $1)
 	$$(call MakeDir, $$(@D))
-	$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
+	$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
 endef
 
 ################################################################################
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index ae4858c35af..d8dc894c1e9 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -57,7 +57,7 @@ define SetupTargetBody
 endef
 
 define CleanDocs
-	@$(ECHO) -n "Cleaning docs ..."
+	@$(PRINTF) "Cleaning docs ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
@@ -67,28 +67,28 @@ endef
 
 # Cleans the dir given as $1
 define CleanDir
-	@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
+	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	($(CD) $(OUTPUTDIR) && $(RM) -r $1)
 	@$(ECHO) " done"
 endef
 
 define CleanSupportDir
-	@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
+	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanMakeSupportDir
-	@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
+	@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanTest
-	@$(ECHO) -n "Cleaning test $(strip $1) ..."
+	@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
         # Remove as much of the test directory structure as is empty
@@ -97,25 +97,25 @@ define CleanTest
 endef
 
 define Clean-gensrc
-	@$(ECHO) -n "Cleaning gensrc $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-java
-	@$(ECHO) -n "Cleaning java $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
 	$(ECHO) " done"
-	$(ECHO) -n "Cleaning headers $(if $1,for $(strip $1) )..."
+	$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-native
-	@$(ECHO) -n "Cleaning native $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
@@ -124,7 +124,7 @@ define Clean-native
 endef
 
 define Clean-include
-	@$(ECHO) -n "Cleaning include $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
 	@$(ECHO) " done"
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 93796d27f06..d8c0b2ffaef 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -292,12 +292,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   $ECHO "* Debug level:    $DEBUG_LEVEL"
   $ECHO "* HS debug level: $HOTSPOT_DEBUG_LEVEL"
   $ECHO "* JVM variants:   $JVM_VARIANTS"
-  $ECHO -n "* JVM features:   "
+  $PRINTF "* JVM features:   "
 
   for variant in $JVM_VARIANTS; do
     features_var_name=JVM_FEATURES_$variant
     JVM_FEATURES_FOR_VARIANT=${!features_var_name}
-    $ECHO -n "$variant: '$JVM_FEATURES_FOR_VARIANT' "
+    $PRINTF "%s: \'%s\' " "$variant" "$JVM_FEATURES_FOR_VARIANT"
   done
   $ECHO ""
 
diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index 41cf08d9e48..517bb2973f4 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -59,14 +59,14 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
 	$(call MakeTargetDir)
 	( $(foreach root, $(JTREG_TESTROOTS), \
 	    $(ECHO) ""; \
-	    $(ECHO) -n "$(root)_JTREG_TEST_GROUPS := "; \
+	    $(PRINTF) "\n%s_JTREG_TEST_GROUPS := " "$(root)"; \
 	    $(SED) -n -e 's/^\#.*//g' -e 's/\([^ ]*\)\w*=.*/\1/gp' \
 	      $($(root)_JTREG_GROUP_FILES) \
 	      | $(SORT) -u | $(TR) '\n' ' ' ; \
 	  ) \
 	) > $@
 	$(ECHO) "" >> $@
-	$(ECHO) -n "MAKE_TEST_TARGETS := " >> $@
+	$(PRINTF) "MAKE_TEST_TARGETS := " >> $@
 	$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
 	    SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
 	    TARGETS_FILE=$@
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 663e9075cf8..725424d7618 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -180,7 +180,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
-	    ( $(ECHO) -n "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	    ( $(PRINTF) "DEPS_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires/ { sub(/;/, ""); \
@@ -194,7 +194,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	                          gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m && \
-	      $(ECHO) -n "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
+	      $(PRINTF) "TRANSITIVE_MODULES_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires  *transitive/ { \

From 2ea629f3f2ae07de9cb92baac13497a789d16ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= <eirbjo@openjdk.org>
Date: Thu, 8 May 2025 14:52:53 +0000
Subject: [PATCH 348/901] 8353440: Disable FTP fallback for non-local file URLs
 by default

Reviewed-by: dfuchs
---
 .../java/net/doc-files/net-properties.html    | 11 +++
 .../www/protocol/file/FileURLConnection.java  | 19 +++++
 .../sun/net/www/protocol/file/Handler.java    |  1 +
 .../sun/net/www/protocol/file/Handler.java    |  1 +
 test/jdk/java/net/URL/OpenStream.java         | 12 +--
 .../protocol/file/NonLocalFtpFallback.java    | 54 ++++++++++++--
 .../file/NonLocalFtpFallbackDisabled.java     | 73 +++++++++++++++++++
 7 files changed, 155 insertions(+), 16 deletions(-)
 create mode 100644 test/jdk/sun/net/www/protocol/file/NonLocalFtpFallbackDisabled.java

diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index 684c90a8164..4b9b62f1ed8 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -169,6 +169,17 @@ <H2>Proxies</H2>
 	globally through their user interface). Note that this property is
 	checked only once at startup.</P>
 </UL>
+<a id="FileHandler"></a>
+<H2>File URL stream protocol handler properties</H2>
+<P>The following properties are used to configure the handler for URLs with the {@code file://} scheme:</P>
+<UL>
+	<LI><P><B>{@systemProperty jdk.net.file.ftpfallback}</B> (default: &lt;false&gt;)<BR>
+		The {@code file://} handler by default rejects any non-local file URL (as defined by RFC 8089)
+		as invalid. Setting this property to <B>true</B> enables a legacy feature where
+		the handler instead opens an FTP connection for such non-local URLs.</P>
+		<P>Any modern code should use explicit {@code ftp://} URLs instead and not rely on
+			enabling this legacy FTP fallback feature.</P>
+</UL>
 <a id="MiscHTTP"></a>
 <H2>Misc HTTP URL stream protocol handler properties</H2>
 <UL>
diff --git a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
index 97e797040a0..98ff8709aa4 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
@@ -25,6 +25,7 @@
 
 package sun.net.www.protocol.file;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.FileNameMap;
 import java.io.*;
@@ -46,6 +47,11 @@ public class FileURLConnection extends URLConnection {
     private static final String TEXT_PLAIN = "text/plain";
     private static final String LAST_MODIFIED = "last-modified";
 
+    // The feature of falling back to FTP for non-local file URLs is disabled
+    // by default and can be re-enabled by setting a system property
+    private static final boolean FTP_FALLBACK_ENABLED =
+            Boolean.getBoolean("jdk.net.file.ftpfallback");
+
     private final File file;
     private InputStream is;
     private List<String> directoryListing;
@@ -222,4 +228,17 @@ public Permission getPermission() throws IOException {
         }
         return permission;
     }
+
+    /**
+     * Throw {@link MalformedURLException} if the FTP fallback feature for non-local
+     * file URLs is not explicitly enabled via system property.
+     *
+     * @see #FTP_FALLBACK_ENABLED
+     * @throws MalformedURLException if FTP fallback is not enabled
+     */
+     static void requireFtpFallbackEnabled() throws MalformedURLException {
+        if (!FTP_FALLBACK_ENABLED) {
+            throw new MalformedURLException("Unsupported non-local file URL");
+        }
+    }
 }
diff --git a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
index efde6a809e9..81f898afc39 100644
--- a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
+++ b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java
@@ -72,6 +72,7 @@ public URLConnection openConnection(URL u, Proxy p)
         /* If you reach here, it implies that you have a hostname
            so attempt an ftp connection.
          */
+        FileURLConnection.requireFtpFallbackEnabled();
         URLConnection uc;
         URL ru;
 
diff --git a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
index 38ad16267e7..0cd32e600e9 100644
--- a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
+++ b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java
@@ -88,6 +88,7 @@ public URLConnection openConnection(URL url, Proxy p)
         /*
          * Now attempt an ftp connection.
          */
+        FileURLConnection.requireFtpFallbackEnabled();
         URLConnection uc;
         URL newurl;
 
diff --git a/test/jdk/java/net/URL/OpenStream.java b/test/jdk/java/net/URL/OpenStream.java
index 08ffd93b7fb..82fd5106056 100644
--- a/test/jdk/java/net/URL/OpenStream.java
+++ b/test/jdk/java/net/URL/OpenStream.java
@@ -25,6 +25,8 @@
  * @bug 4064962 8202708
  * @summary openStream should work even when not using proxies and
  *          UnknownHostException is thrown as expected.
+ * @comment For testing of non-local file URLs with the legacy FTP
+ *          fallback feature enabled, see NonLocalFtpFallback.
  */
 
 import java.io.*;
@@ -34,24 +36,15 @@
 public class OpenStream {
 
     private static final String badHttp = "http://foo.bar.baz/";
-    private static final String badUnc = "file://h7qbp368oix47/not-exist.txt";
 
     public static void main(String[] args) throws IOException {
         testHttp();
-        testUnc();
     }
 
     static void testHttp() throws IOException {
         checkThrows(badHttp);
     }
 
-    static void testUnc() throws IOException {
-        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
-        if (isWindows) {
-            checkThrows(badUnc);
-        }
-    }
-
     static void checkThrows(String url) throws IOException {
         URL u = new URL(url);
         try {
@@ -62,7 +55,6 @@ static void checkThrows(String url) throws IOException {
         }
         throw new RuntimeException("Expected UnknownHostException to be " +
                 "thrown for " + url);
-
     }
 }
 
diff --git a/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallback.java b/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallback.java
index 49d09cfb507..fb7b0412063 100644
--- a/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallback.java
+++ b/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallback.java
@@ -40,14 +40,16 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @test
- * @bug 8353662
- * @summary Verify long-standing behavior of resolving non-local file URLs using FTP.
- * @run junit NonLocalFtpFallback
+ * @bug 8353662 8202708
+ * @summary Verify long-standing, disabled by default behavior of resolving non-local
+ *          file URLs using FTP.
+ * @run junit/othervm -Djdk.net.file.ftpfallback=true NonLocalFtpFallback
  */
 
 public class NonLocalFtpFallback {
@@ -112,9 +114,8 @@ public void destroy() throws IOException {
      * Verifies the long-standing and unspecified FTP fallback feature where the file
      * URL scheme handler attempts an FTP connection for non-local files.
      *
-     * The non-local file URL used here is of the form file://127.0.0.1/path. Since the
-     * host component here is not equal to "localhost", this is considered a non-local
-     * URL.
+     * The non-local file URL used here is of the form 'file://remotehost/path'. Since the
+     * host component is not equal to 'localhost', this is considered a non-local URL.
      *
      * @throws Exception
      */
@@ -142,4 +143,45 @@ public void verifyNonLocalFtpFallback() throws Exception {
         URL ftpURL = new URL("ftp", hostname, localURL.getFile());
         assertEquals(ftpURL.toURI(), uris.iterator().next());
     }
+
+    /**
+     * Sanity check that a local file URL (with a host component equal to 'localhost')
+     * does not open any FtpURLConnection when the FTP fallback feature is enabled.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void verifyLocalFileURL() throws Exception {
+        URL localURL = file.toUri().toURL();
+        URL nonLocalURL = new URL("file", "localhost", localURL.getFile());
+
+        // Open the local file: URL connection supplying a proxy
+        Proxy proxy = new Proxy(Proxy.Type.HTTP,
+                new InetSocketAddress(proxyServer.getAddress().getAddress(),
+                        proxyServer.getAddress().getPort()));
+        URLConnection con = nonLocalURL.openConnection(proxy);
+
+        // Assert that the expected file content is read
+        try (InputStream in = con.getInputStream()) {
+            byte[] retrived = in.readAllBytes();
+            assertArrayEquals(Files.readAllBytes(file), retrived);
+        }
+
+        // Assert that no FTP URIs were requested in the HTTP proxy
+        assertEquals(0, uris.size());
+    }
+
+    /**
+     * Verify that opening a stream on a non-proxy URLConnection for a non-local
+     * file URL with an unknown host fails with UnknownHostException
+     * when the fallback FtpURLConnection attempts to connect to the non-existing
+     * FTP server.
+     */
+    @Test
+    public void verifyFtpUnknownHost() throws IOException {
+        URL url = new URL("file://nonexistinghost/not-exist.txt");
+        assertThrows(UnknownHostException.class, () -> {
+            InputStream in = url.openConnection(Proxy.NO_PROXY).getInputStream();
+        });
+    }
 }
diff --git a/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallbackDisabled.java b/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallbackDisabled.java
new file mode 100644
index 00000000000..52bc3a5d0ad
--- /dev/null
+++ b/test/jdk/sun/net/www/protocol/file/NonLocalFtpFallbackDisabled.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 org.junit.jupiter.api.Test;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Path;
+
+import static org.junit.Assert.assertThrows;
+
+/**
+ * @test
+ * @bug 8353440
+ * @summary Verify that non-local file URLs are rejected by default
+ * @run junit/othervm NonLocalFtpFallbackDisabled
+ * @run junit/othervm -Djdk.net.file.ftpfallback=false NonLocalFtpFallbackDisabled
+ * @run junit/othervm -Djdk.net.file.ftpfallback NonLocalFtpFallbackDisabled
+ */
+public class NonLocalFtpFallbackDisabled {
+
+    // The file requested in this test
+    private Path file = Path.of("ftp-file.txt");
+
+    /**
+     * Verifies that the long-standing and unspecified FTP fallback feature
+     * where the file URL scheme handler attempts an FTP connection for non-local
+     * files is disabled by default and that opening connections for such URLs
+     * is rejected with a MalformedURLException.
+     *
+     * @throws MalformedURLException if an unexpected URL exception occurs
+     * @throws URISyntaxException if an unexpected URI exception occurs
+     */
+    @Test
+    public void verifyNonLocalFileURLRejected() throws MalformedURLException, URISyntaxException {
+        // We can use a fake host name here, no actual FTP request will be made
+        String hostname = "remotehost";
+
+        URL local = file.toUri().toURL();
+
+        URL nonLocal = new URI("file", hostname, local.getFile(), "").toURL();
+        assertThrows(MalformedURLException.class, () -> {
+            nonLocal.openConnection();
+        });
+
+        URL nonLocalEmptyPath = new URI("file", hostname, "", "").toURL();
+        assertThrows(MalformedURLException.class, () -> {
+            nonLocalEmptyPath.openConnection();
+        });
+    }
+}

From c6ffacb5754642083f614a5ee6dc76b7d145c605 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Thu, 8 May 2025 15:14:35 +0000
Subject: [PATCH 349/901] 8344703: Compiler Implementation for Flexible
 Constructor Bodies

Reviewed-by: vromero, liach, jlahoda
---
 .../com/sun/tools/javac/code/Preview.java     |  1 -
 .../com/sun/tools/javac/code/Source.java      |  2 +-
 .../DefiniteAssignment/DA_DUConstructors.java |  1 -
 .../DefiniteAssignment/DA_DUConstructors.out  |  6 +-
 .../tools/javac/LocalClassCtorPrologue.java   |  1 -
 .../tools/javac/LocalClassCtorPrologue.out    |  4 +-
 .../SuperInit/EarlyAssignmentNoPreview1.java  |  2 +-
 .../SuperInit/EarlyAssignmentNoPreview1.out   |  2 +-
 .../SuperInit/EarlyAssignmentNoPreview2.java  |  2 +-
 .../SuperInit/EarlyAssignmentNoPreview2.out   |  2 +-
 .../SuperInit/EarlyAssignmentNoPreview3.java  |  2 +-
 .../SuperInit/EarlyAssignmentNoPreview3.out   |  2 +-
 .../javac/SuperInit/EarlyAssignments.java     |  1 -
 .../javac/SuperInit/EarlyAssignments.out      | 54 +++++++--------
 .../EarlyInnerAccessErrorMessageTest.java     |  1 -
 .../EarlyInnerAccessErrorMessageTest.out      |  4 +-
 .../javac/SuperInit/EarlyLambdaReturn.java    |  3 +-
 .../javac/SuperInit/EarlyLocalClass.java      |  1 -
 .../tools/javac/SuperInit/EarlyLocalClass.out |  4 +-
 .../javac/SuperInit/EarlyLocalCtorRef.java    |  3 +-
 .../javac/SuperInit/EarlyLocalTest1.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest2.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest3.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest4.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest5.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest6.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest7.java      |  3 +-
 .../javac/SuperInit/EarlyLocalTest8.java      |  3 +-
 .../SuperInit/LambdaLocalEarlyCrash.java      |  3 +-
 .../javac/SuperInit/LambdaOuterCapture.java   |  3 +-
 .../SuperInit/MultiLevelOuterInstance.java    |  3 +-
 .../tools/javac/SuperInit/SuperInitFails.java |  1 -
 .../tools/javac/SuperInit/SuperInitFails.out  | 68 +++++++++----------
 .../tools/javac/SuperInit/SuperInitGood.java  |  3 +-
 ...CantAssignInitializedBeforeCtorCalled.java |  5 +-
 .../examples/FeatureFlexibleConstructors.java |  6 +-
 .../diags/examples/PreviewFeatureUse.java     | 11 +--
 .../examples/PreviewFeatureUsePlural.java     | 34 ++++++++++
 .../examples/ReturnBeforeSuperclassInit.java  |  3 -
 39 files changed, 129 insertions(+), 133 deletions(-)
 create mode 100644 test/langtools/tools/javac/diags/examples/PreviewFeatureUsePlural.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 2d0f44200c1..d1e64e90a07 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -226,7 +226,6 @@ public boolean isEnabled() {
      */
     public boolean isPreview(Feature feature) {
         return switch (feature) {
-            case FLEXIBLE_CONSTRUCTORS -> true;
             case PRIMITIVE_PATTERNS -> true;
             //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
             //When real preview features will be added, this method can be implemented to return 'true'
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index e3585dd398b..b0b82fa5734 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -266,7 +266,7 @@ public enum Feature {
         WARN_ON_ILLEGAL_UTF8(MIN, JDK21),
         UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
         PRIMITIVE_PATTERNS(JDK23, Fragments.FeaturePrimitivePatterns, DiagKind.PLURAL),
-        FLEXIBLE_CONSTRUCTORS(JDK22, Fragments.FeatureFlexibleConstructors, DiagKind.NORMAL),
+        FLEXIBLE_CONSTRUCTORS(JDK25, Fragments.FeatureFlexibleConstructors, DiagKind.NORMAL),
         MODULE_IMPORTS(JDK25, Fragments.FeatureModuleImports, DiagKind.PLURAL),
         JAVA_BASE_TRANSITIVE(JDK25, Fragments.FeatureJavaBaseTransitive, DiagKind.PLURAL),
         PRIVATE_MEMBERS_IN_PERMITS_CLAUSE(JDK19),
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.java b/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.java
index 7947b69b830..60d79d93129 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.java
@@ -3,7 +3,6 @@
  * @bug 8325805
  * @summary Permit non-superclass instance field assignments before this/super in constructors
  * @compile/fail/ref=DA_DUConstructors.out -XDrawDiagnostics DA_DUConstructors.java
- * @enablePreview
  */
 
 public class DA_DUConstructors {
diff --git a/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.out b/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.out
index 78cd3d314a8..03cd6c2574b 100644
--- a/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.out
+++ b/test/langtools/tools/javac/DefiniteAssignment/DA_DUConstructors.out
@@ -1,5 +1,3 @@
-DA_DUConstructors.java:23:17: compiler.err.var.might.already.be.assigned: x
-DA_DUConstructors.java:42:23: compiler.err.var.might.not.have.been.initialized: x
-- compiler.note.preview.filename: DA_DUConstructors.java, DEFAULT
-- compiler.note.preview.recompile
+DA_DUConstructors.java:22:17: compiler.err.var.might.already.be.assigned: x
+DA_DUConstructors.java:41:23: compiler.err.var.might.not.have.been.initialized: x
 2 errors
diff --git a/test/langtools/tools/javac/LocalClassCtorPrologue.java b/test/langtools/tools/javac/LocalClassCtorPrologue.java
index 2a7178ed857..b5bd35f4745 100644
--- a/test/langtools/tools/javac/LocalClassCtorPrologue.java
+++ b/test/langtools/tools/javac/LocalClassCtorPrologue.java
@@ -3,7 +3,6 @@
  * @bug 8328649
  * @summary Verify local classes in constructor prologues don't have enclosing instances
  * @compile/fail/ref=LocalClassCtorPrologue.out -XDrawDiagnostics LocalClassCtorPrologue.java
- * @enablePreview
  */
 
 class LocalClassCtorPrologue {
diff --git a/test/langtools/tools/javac/LocalClassCtorPrologue.out b/test/langtools/tools/javac/LocalClassCtorPrologue.out
index 65f3418825d..086addaacd0 100644
--- a/test/langtools/tools/javac/LocalClassCtorPrologue.out
+++ b/test/langtools/tools/javac/LocalClassCtorPrologue.out
@@ -1,4 +1,2 @@
-LocalClassCtorPrologue.java:16:17: compiler.err.cant.ref.before.ctor.called: x
-- compiler.note.preview.filename: LocalClassCtorPrologue.java, DEFAULT
-- compiler.note.preview.recompile
+LocalClassCtorPrologue.java:15:17: compiler.err.cant.ref.before.ctor.called: x
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.java b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.java
index abb6bacbc8f..0d7938d7216 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8334258
  * @summary Disallow early assignment if FLEXIBLE_CONSTRUCTORS preview feature is not enabled
- * @compile/fail/ref=EarlyAssignmentNoPreview1.out -XDrawDiagnostics EarlyAssignmentNoPreview1.java
+ * @compile/fail/ref=EarlyAssignmentNoPreview1.out --release 24 -XDrawDiagnostics EarlyAssignmentNoPreview1.java
  */
 public class EarlyAssignmentNoPreview1 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.out b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.out
index 6c5afbbd12b..c28d53b3774 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview1.out
@@ -1,2 +1,2 @@
-EarlyAssignmentNoPreview1.java:12:14: compiler.err.preview.feature.disabled: (compiler.misc.feature.flexible.constructors)
+EarlyAssignmentNoPreview1.java:12:14: compiler.err.feature.not.supported.in.source: (compiler.misc.feature.flexible.constructors), 24, 25
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.java b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.java
index 3c33734f42a..64332244e01 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8334258
  * @summary Disallow early assignment if FLEXIBLE_CONSTRUCTORS preview feature is not enabled
- * @compile/fail/ref=EarlyAssignmentNoPreview2.out -XDrawDiagnostics EarlyAssignmentNoPreview2.java
+ * @compile/fail/ref=EarlyAssignmentNoPreview2.out --release 24 -XDrawDiagnostics EarlyAssignmentNoPreview2.java
  */
 public class EarlyAssignmentNoPreview2 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.out b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.out
index 38fb885684e..1250c714c4a 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview2.out
@@ -1,2 +1,2 @@
-EarlyAssignmentNoPreview2.java:12:14: compiler.err.preview.feature.disabled: (compiler.misc.feature.flexible.constructors)
+EarlyAssignmentNoPreview2.java:12:14: compiler.err.feature.not.supported.in.source: (compiler.misc.feature.flexible.constructors), 24, 25
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.java b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.java
index f6269f2cb1f..e021d80e6c1 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8334258
  * @summary Disallow early assignment if FLEXIBLE_CONSTRUCTORS preview feature is not enabled
- * @compile/fail/ref=EarlyAssignmentNoPreview3.out -XDrawDiagnostics EarlyAssignmentNoPreview3.java
+ * @compile/fail/ref=EarlyAssignmentNoPreview3.out --release 24 -XDrawDiagnostics EarlyAssignmentNoPreview3.java
  */
 public class EarlyAssignmentNoPreview3 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.out b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.out
index def9f4f3722..f1ccf9cfa7d 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignmentNoPreview3.out
@@ -1,2 +1,2 @@
-EarlyAssignmentNoPreview3.java:12:39: compiler.err.preview.feature.disabled: (compiler.misc.feature.flexible.constructors)
+EarlyAssignmentNoPreview3.java:12:39: compiler.err.feature.not.supported.in.source: (compiler.misc.feature.flexible.constructors), 24, 25
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignments.java b/test/langtools/tools/javac/SuperInit/EarlyAssignments.java
index c3cad5d7016..0168ed9f4b4 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignments.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignments.java
@@ -3,7 +3,6 @@
  * @bug 8325805
  * @summary Permit non-superclass instance field assignments before this/super in constructors
  * @compile/fail/ref=EarlyAssignments.out -XDrawDiagnostics EarlyAssignments.java
- * @enablePreview
  */
 public class EarlyAssignments {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyAssignments.out b/test/langtools/tools/javac/SuperInit/EarlyAssignments.out
index 38182c2d312..ac765c141e7 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyAssignments.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyAssignments.out
@@ -1,29 +1,27 @@
-EarlyAssignments.java:21:17: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:22:17: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:23:23: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:31:21: compiler.err.cant.ref.before.ctor.called: super
-EarlyAssignments.java:32:21: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:33:26: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:34:34: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:36:36: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:40:17: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:44:21: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:48:22: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:66:13: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:67:17: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:68:25: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:69:31: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:98:17: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:104:22: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:110:35: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:119:17: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:124:22: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:129:29: compiler.err.cant.ref.before.ctor.called: x
-EarlyAssignments.java:134:17: compiler.err.cant.ref.before.ctor.called: super
-EarlyAssignments.java:139:23: compiler.err.cant.ref.before.ctor.called: this
-EarlyAssignments.java:148:13: compiler.err.cant.assign.initialized.before.ctor.called: x
-EarlyAssignments.java:157:13: compiler.err.cant.assign.val.to.var: final, x
-EarlyAssignments.java:168:13: compiler.err.cant.ref.before.ctor.called: this
-- compiler.note.preview.filename: EarlyAssignments.java, DEFAULT
-- compiler.note.preview.recompile
+EarlyAssignments.java:20:17: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:21:17: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:22:23: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:30:21: compiler.err.cant.ref.before.ctor.called: super
+EarlyAssignments.java:31:21: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:32:26: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:33:34: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:35:36: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:39:17: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:43:21: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:47:22: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:65:13: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:66:17: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:67:25: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:68:31: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:97:17: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:103:22: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:109:35: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:118:17: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:123:22: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:128:29: compiler.err.cant.ref.before.ctor.called: x
+EarlyAssignments.java:133:17: compiler.err.cant.ref.before.ctor.called: super
+EarlyAssignments.java:138:23: compiler.err.cant.ref.before.ctor.called: this
+EarlyAssignments.java:147:13: compiler.err.cant.assign.initialized.before.ctor.called: x
+EarlyAssignments.java:156:13: compiler.err.cant.assign.val.to.var: final, x
+EarlyAssignments.java:167:13: compiler.err.cant.ref.before.ctor.called: this
 26 errors
diff --git a/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.java b/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.java
index a8ee3a2aea5..c8279543244 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.java
@@ -3,7 +3,6 @@
  * @bug 8334488
  * @summary Verify the error message generated for early access from inner class
  * @compile/fail/ref=EarlyInnerAccessErrorMessageTest.out -XDrawDiagnostics EarlyInnerAccessErrorMessageTest.java
- * @enablePreview
  */
 public class EarlyInnerAccessErrorMessageTest {
     int x;
diff --git a/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.out b/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.out
index a8d690a4c23..2bea02bed10 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyInnerAccessErrorMessageTest.out
@@ -1,4 +1,2 @@
-EarlyInnerAccessErrorMessageTest.java:12:34: compiler.err.cant.ref.before.ctor.called: x
-- compiler.note.preview.filename: EarlyInnerAccessErrorMessageTest.java, DEFAULT
-- compiler.note.preview.recompile
+EarlyInnerAccessErrorMessageTest.java:11:34: compiler.err.cant.ref.before.ctor.called: x
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java b/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java
index fd63f4c1a3b..a56974ea252 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLambdaReturn.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8345438
  * @summary Verify 'return' allowed in a lambda declared in an early construction context
- * @enablePreview
  */
 public class EarlyLambdaReturn {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalClass.java b/test/langtools/tools/javac/SuperInit/EarlyLocalClass.java
index 1c68de603fb..5ac5aba82ed 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalClass.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalClass.java
@@ -3,7 +3,6 @@
  * @bug 8325805
  * @summary Verify local class in early construction context has no outer instance
  * @compile/fail/ref=EarlyLocalClass.out -XDrawDiagnostics EarlyLocalClass.java
- * @enablePreview
  */
 public class EarlyLocalClass {
     EarlyLocalClass() {
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalClass.out b/test/langtools/tools/javac/SuperInit/EarlyLocalClass.out
index ee01f9c403d..1024b5bdf26 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalClass.out
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalClass.out
@@ -1,4 +1,2 @@
-EarlyLocalClass.java:12:32: compiler.err.cant.ref.before.ctor.called: this
-- compiler.note.preview.filename: EarlyLocalClass.java, DEFAULT
-- compiler.note.preview.recompile
+EarlyLocalClass.java:11:32: compiler.err.cant.ref.before.ctor.called: this
 1 error
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalCtorRef.java b/test/langtools/tools/javac/SuperInit/EarlyLocalCtorRef.java
index 3346d6ff4f7..6d0c2c74dfe 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalCtorRef.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalCtorRef.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8334248
  * @summary Allow early construction local class constructor method references
- * @enablePreview
  */
 
 import java.util.function.Supplier;
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest1.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest1.java
index 5d9060da83c..a51189c11c9 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest1.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest1.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 public class EarlyLocalTest1 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest2.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest2.java
index ba90f06dc5e..09dbc66e2d3 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest2.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest2.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 public class EarlyLocalTest2 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest3.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest3.java
index bf8d6faa099..34d280532c3 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest3.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest3.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 public class EarlyLocalTest3 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest4.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest4.java
index cce6092f606..7f6fa032ec7 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest4.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest4.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 public class EarlyLocalTest4 {
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest5.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest5.java
index 6858e068af8..c75b97c6beb 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest5.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest5.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest6.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest6.java
index 742496a48d5..35eda1a5257 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest6.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest6.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest7.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest7.java
index 1ce63bc04ba..885783eb9b0 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest7.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest7.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/test/langtools/tools/javac/SuperInit/EarlyLocalTest8.java b/test/langtools/tools/javac/SuperInit/EarlyLocalTest8.java
index 806903e9017..d09e12fcd5d 100644
--- a/test/langtools/tools/javac/SuperInit/EarlyLocalTest8.java
+++ b/test/langtools/tools/javac/SuperInit/EarlyLocalTest8.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8333313
  * @summary Verify references to local classes declared in early construction contexts
- * @enablePreview
  */
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/test/langtools/tools/javac/SuperInit/LambdaLocalEarlyCrash.java b/test/langtools/tools/javac/SuperInit/LambdaLocalEarlyCrash.java
index 660e7d19f4e..2d2f8c030ee 100644
--- a/test/langtools/tools/javac/SuperInit/LambdaLocalEarlyCrash.java
+++ b/test/langtools/tools/javac/SuperInit/LambdaLocalEarlyCrash.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8334037
  * @summary Test for compiler crash when local class created in early lambda
- * @enablePreview
  */
 
 public class LambdaLocalEarlyCrash {
diff --git a/test/langtools/tools/javac/SuperInit/LambdaOuterCapture.java b/test/langtools/tools/javac/SuperInit/LambdaOuterCapture.java
index 261b23dc298..f1f8535e2dd 100644
--- a/test/langtools/tools/javac/SuperInit/LambdaOuterCapture.java
+++ b/test/langtools/tools/javac/SuperInit/LambdaOuterCapture.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8334252
  * @summary Test lambda declared in early construction context
- * @enablePreview
  */
 
 public class LambdaOuterCapture {
diff --git a/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java b/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java
index e47e70a3bdc..5bdec42f483 100644
--- a/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java
+++ b/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8334121
  * @summary Anonymous class capturing two enclosing instances fails to compile
- * @enablePreview
  */
 
 public class MultiLevelOuterInstance {
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitFails.java b/test/langtools/tools/javac/SuperInit/SuperInitFails.java
index feb5b81c1b0..f9cfe5cd7c4 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitFails.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitFails.java
@@ -3,7 +3,6 @@
  * @bug 8194743
  * @summary Permit additional statements before this/super in constructors
  * @compile/fail/ref=SuperInitFails.out -XDrawDiagnostics SuperInitFails.java
- * @enablePreview
  */
 import java.util.concurrent.atomic.AtomicReference;
 public class SuperInitFails extends AtomicReference<Object> implements Iterable<Object> {
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitFails.out b/test/langtools/tools/javac/SuperInit/SuperInitFails.out
index a6cabb6f5ed..1a8e8797135 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitFails.out
+++ b/test/langtools/tools/javac/SuperInit/SuperInitFails.out
@@ -1,36 +1,34 @@
-SuperInitFails.java:57:9: compiler.err.cant.ref.before.ctor.called: hashCode()
-SuperInitFails.java:62:9: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:67:9: compiler.err.cant.ref.before.ctor.called: super
-SuperInitFails.java:72:23: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:77:23: compiler.err.cant.ref.before.ctor.called: super
-SuperInitFails.java:94:9: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:99:33: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:104:14: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:108:20: compiler.err.not.encl.class: java.lang.Object
-SuperInitFails.java:112:17: compiler.err.cant.ref.before.ctor.called: super
-SuperInitFails.java:119:22: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:125:9: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:133:9: compiler.err.non.canonical.constructor.invoke.another.constructor: SuperInitFails.Record1
-SuperInitFails.java:138:9: compiler.err.non.canonical.constructor.invoke.another.constructor: SuperInitFails.Record2
-SuperInitFails.java:155:31: compiler.err.cant.ref.before.ctor.called: x
-SuperInitFails.java:159:15: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:168:13: compiler.err.cant.ref.before.ctor.called: x
-SuperInitFails.java:172:17: compiler.err.cant.ref.before.ctor.called: x
-SuperInitFails.java:176:24: compiler.err.cant.ref.before.ctor.called: x
-SuperInitFails.java:180:18: compiler.err.cant.ref.before.ctor.called: x
-SuperInitFails.java:186:28: compiler.err.cant.ref.before.ctor.called: this
-SuperInitFails.java:195:25: compiler.err.return.before.superclass.initialized
-SuperInitFails.java:200:33: compiler.err.ctor.calls.not.allowed.here
-SuperInitFails.java:205:29: compiler.err.redundant.superclass.init
-SuperInitFails.java:33:13: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:37:14: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:41:14: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:45:13: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:49:33: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:53:32: compiler.err.call.must.only.appear.in.ctor
-SuperInitFails.java:83:18: compiler.err.ctor.calls.not.allowed.here
-SuperInitFails.java:89:13: compiler.err.return.before.superclass.initialized
-SuperInitFails.java:150:18: compiler.err.call.must.only.appear.in.ctor
-- compiler.note.preview.filename: SuperInitFails.java, DEFAULT
-- compiler.note.preview.recompile
+SuperInitFails.java:56:9: compiler.err.cant.ref.before.ctor.called: hashCode()
+SuperInitFails.java:61:9: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:66:9: compiler.err.cant.ref.before.ctor.called: super
+SuperInitFails.java:71:23: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:76:23: compiler.err.cant.ref.before.ctor.called: super
+SuperInitFails.java:93:9: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:98:33: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:103:14: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:107:20: compiler.err.not.encl.class: java.lang.Object
+SuperInitFails.java:111:17: compiler.err.cant.ref.before.ctor.called: super
+SuperInitFails.java:118:22: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:124:9: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:132:9: compiler.err.non.canonical.constructor.invoke.another.constructor: SuperInitFails.Record1
+SuperInitFails.java:137:9: compiler.err.non.canonical.constructor.invoke.another.constructor: SuperInitFails.Record2
+SuperInitFails.java:154:31: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:158:15: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:167:13: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:171:17: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:175:24: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:179:18: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:185:28: compiler.err.cant.ref.before.ctor.called: this
+SuperInitFails.java:194:25: compiler.err.return.before.superclass.initialized
+SuperInitFails.java:199:33: compiler.err.ctor.calls.not.allowed.here
+SuperInitFails.java:204:29: compiler.err.redundant.superclass.init
+SuperInitFails.java:32:13: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:36:14: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:40:14: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:44:13: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:48:33: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:52:32: compiler.err.call.must.only.appear.in.ctor
+SuperInitFails.java:82:18: compiler.err.ctor.calls.not.allowed.here
+SuperInitFails.java:88:13: compiler.err.return.before.superclass.initialized
+SuperInitFails.java:149:18: compiler.err.call.must.only.appear.in.ctor
 33 errors
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitGood.java b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
index 11b845f7d32..83815f851e3 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitGood.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitGood.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
@@ -24,7 +24,6 @@
  * @test
  * @bug 8194743
  * @summary Test valid placements of super()/this() in constructors
- * @enablePreview
  */
 
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/test/langtools/tools/javac/diags/examples/CantAssignInitializedBeforeCtorCalled.java b/test/langtools/tools/javac/diags/examples/CantAssignInitializedBeforeCtorCalled.java
index 55f5d19451d..0d19a9a9a12 100644
--- a/test/langtools/tools/javac/diags/examples/CantAssignInitializedBeforeCtorCalled.java
+++ b/test/langtools/tools/javac/diags/examples/CantAssignInitializedBeforeCtorCalled.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
@@ -21,10 +21,7 @@
  * questions.
  */
 
- // key: compiler.note.preview.filename
- // key: compiler.note.preview.recompile
  // key: compiler.err.cant.assign.initialized.before.ctor.called
- // options: --enable-preview  -source ${jdk.version}
 
 class CantAssignInitializedBeforeCtorCalled {
     int x = 1;
diff --git a/test/langtools/tools/javac/diags/examples/FeatureFlexibleConstructors.java b/test/langtools/tools/javac/diags/examples/FeatureFlexibleConstructors.java
index 6bdff09e96f..269e0bda687 100644
--- a/test/langtools/tools/javac/diags/examples/FeatureFlexibleConstructors.java
+++ b/test/langtools/tools/javac/diags/examples/FeatureFlexibleConstructors.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,8 +22,8 @@
  */
 
  // key: compiler.misc.feature.flexible.constructors
- // key: compiler.warn.preview.feature.use
- // options: --enable-preview -source ${jdk.version} -Xlint:preview
+ // key: compiler.err.feature.not.supported.in.source
+ // options: --release 24
 
 class FeatureFlexibleConstructors {
     FeatureFlexibleConstructors() {
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java b/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
index 799775cf5f8..455ddddab86 100644
--- a/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
+++ b/test/langtools/tools/javac/diags/examples/PreviewFeatureUse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, 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
@@ -21,14 +21,15 @@
  * questions.
  */
 
-//key: compiler.warn.preview.feature.use.plural
-//key: compiler.misc.feature.var.syntax.in.implicit.lambda
+//key: compiler.warn.preview.feature.use
+//key: compiler.misc.feature.flexible.constructors
 //options: -Xlint:preview -XDforcePreview -source ${jdk.version} --enable-preview
 
 import java.util.function.Function;
 
 class PreviewFeatureUse {
-    void test() {
-        Function<String, String> f = (var s) -> s;
+    PreviewFeatureUse() {
+        System.out.println("early init!");
+        super();
     }
 }
diff --git a/test/langtools/tools/javac/diags/examples/PreviewFeatureUsePlural.java b/test/langtools/tools/javac/diags/examples/PreviewFeatureUsePlural.java
new file mode 100644
index 00000000000..ae6bccecadd
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/PreviewFeatureUsePlural.java
@@ -0,0 +1,34 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+//key: compiler.warn.preview.feature.use.plural
+//key: compiler.misc.feature.var.syntax.in.implicit.lambda
+//options: -Xlint:preview -XDforcePreview -source ${jdk.version} --enable-preview
+
+import java.util.function.Function;
+
+class PreviewFeatureUsePlural {
+    void test() {
+        Function<String, String> f = (var s) -> s;
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java b/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
index dc883b59b8f..033a8430625 100644
--- a/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
+++ b/test/langtools/tools/javac/diags/examples/ReturnBeforeSuperclassInit.java
@@ -22,9 +22,6 @@
  */
 
 // key: compiler.err.return.before.superclass.initialized
-// key: compiler.note.preview.filename
-// key: compiler.note.preview.recompile
-// options: --enable-preview -source ${jdk.version}
 
 class ReturnBeforeSuperclassInit {
     ReturnBeforeSuperclassInit(boolean maybe) {

From 6b1e88a946c5aa5ab8c1b320ebdfdf595c469855 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Thu, 8 May 2025 16:07:25 +0000
Subject: [PATCH 350/901] 8356329: Report compact object headers in hs_err

Reviewed-by: stuefe, lmesnik, zgu
---
 src/hotspot/share/utilities/vmError.cpp       |   3 +-
 .../TestVMConfigInHsErrFile.java              | 103 ++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/TestVMConfigInHsErrFile.java

diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index ee402b8b894..2b88369cb37 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -530,7 +530,8 @@ static void report_vm_version(outputStream* st, char* buf, int buflen) {
                  "", "",
 #endif
                  UseCompressedOops ? ", compressed oops" : "",
-                 UseCompressedClassPointers ? ", compressed class ptrs" : "",
+                 UseCompactObjectHeaders ? ", compact obj headers"
+                                         : (UseCompressedClassPointers ? ", compressed class ptrs" : ""),
                  GCConfig::hs_err_name(),
                  VM_Version::vm_platform_string()
                );
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestVMConfigInHsErrFile.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestVMConfigInHsErrFile.java
new file mode 100644
index 00000000000..f2f7e4697a3
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestVMConfigInHsErrFile.java
@@ -0,0 +1,103 @@
+/*
+ * 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
+ * @summary Test that we see VM configs reported correctly in hs_err file
+ * @library /test/lib
+ * @requires vm.flagless
+ * @requires vm.debug
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestVMConfigInHsErrFile
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+public class TestVMConfigInHsErrFile {
+
+  public static void main(String[] args) throws Exception {
+    testCompactObjectHeaders();
+    testCompressedClassPointers();
+  }
+
+  private static void testCompactObjectHeaders() throws Exception {
+    ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        "-XX:+UnlockDiagnosticVMOptions",
+        "-XX:+UnlockExperimentalVMOptions",
+        "-XX:+UseCompactObjectHeaders",
+        "-Xmx100M",
+        "-XX:-CreateCoredumpOnCrash",
+        "-XX:ErrorHandlerTest=14",
+        "-version");
+
+    OutputAnalyzer output = new OutputAnalyzer(pb.start());
+    output.shouldNotHaveExitValue(0);
+
+    // extract hs-err file
+    File f = HsErrFileUtils.openHsErrFileFromOutput(output);
+
+    Pattern[] expectedPatterns = new Pattern[] {
+      Pattern.compile("# Java VM: .*compact obj headers.*")
+    };
+    Pattern[] notExpectedPatterns = new Pattern[] {
+      Pattern.compile("# Java VM: .*compressed class ptrs.*")
+    };
+
+    HsErrFileUtils.checkHsErrFileContent(f, expectedPatterns, notExpectedPatterns, true, true);
+
+  }
+
+  private static void testCompressedClassPointers() throws Exception {
+    ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        "-XX:+UnlockDiagnosticVMOptions",
+        "-XX:+UnlockExperimentalVMOptions",
+        "-XX:-UseCompactObjectHeaders",
+        "-XX:+UseCompressedClassPointers",
+        "-Xmx100M",
+        "-XX:-CreateCoredumpOnCrash",
+        "-XX:ErrorHandlerTest=14",
+        "-version");
+
+    OutputAnalyzer output = new OutputAnalyzer(pb.start());
+    output.shouldNotHaveExitValue(0);
+
+    // extract hs-err file
+    File f = HsErrFileUtils.openHsErrFileFromOutput(output);
+
+    Pattern[] expectedPatterns = new Pattern[] {
+      Pattern.compile("# Java VM: .*compressed class ptrs.*")
+    };
+    Pattern[] notExpectedPatterns = new Pattern[] {
+      Pattern.compile("# Java VM: .*compact obj headers.*")
+    };
+
+    HsErrFileUtils.checkHsErrFileContent(f, expectedPatterns, notExpectedPatterns, true, true);
+
+  }
+}

From 7f3191a630edba32ddb7bb64a835ec663d91ed92 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 8 May 2025 16:20:53 +0000
Subject: [PATCH 351/901] 8354878: File Leak in
 CgroupSubsystemFactory::determine_type of cgroupSubsystem_linux.cpp:300

Reviewed-by: sgehwolf, jsjolen, dholmes
---
 src/hotspot/os/linux/cgroupSubsystem_linux.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
index 94cc87d5f9f..068914d7049 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_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
@@ -297,6 +297,7 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
     } else {
       log_debug(os, container)("Can't read %s, %s", controllers_file, os::strerror(errno));
       *flags = INVALID_CGROUPS_V2;
+      fclose(controllers);
       return false;
     }
     for (int i = 0; i < CG_INFO_LENGTH; i++) {

From 1e8927dded2d6d7049dc277564c77dff81ff1047 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 8 May 2025 16:21:14 +0000
Subject: [PATCH 352/901] 8354433: Assert in
 AbstractRBTree::visit_range_in_order(const K& from, const K& to, F f) is
 wrong

Reviewed-by: jsjolen, aboldtch
---
 src/hotspot/share/utilities/rbTree.hpp        | 51 ++++++++-----------
 src/hotspot/share/utilities/rbTree.inline.hpp | 16 ++----
 test/hotspot/gtest/utilities/test_rbtree.cpp  | 32 +++++++++++-
 3 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/hotspot/share/utilities/rbTree.hpp b/src/hotspot/share/utilities/rbTree.hpp
index 0656b9babb5..04c46c85d2c 100644
--- a/src/hotspot/share/utilities/rbTree.hpp
+++ b/src/hotspot/share/utilities/rbTree.hpp
@@ -37,10 +37,14 @@
 //     - an int < 0 when a < b
 //     - an int == 0 when a == b
 //     - an int > 0 when a > b
-// A second static function `cmp(const IntrusiveRBNode* a, const IntrusiveRBNode* b)`
-// used for `verify_self` and other extra validation can optionally be provided. This should return:
-//     - true if a < b
-//     - false otherwise
+// Additional static functions used for extra validation can optionally be provided:
+//   `cmp(K a, K b)` which returns:
+//       - an int < 0 when a < b
+//       - an int == 0 when a == b
+//       - an int > 0 when a > b
+//   `cmp(const IntrusiveRBNode* a, const IntrusiveRBNode* b)` which returns:
+//       - true if a < b
+//       - false otherwise
 // K needs to be of a type that is trivially destructible.
 // K needs to be stored by the user and is not stored inside the tree.
 // Nodes are address stable and will not change during its lifetime.
@@ -48,7 +52,7 @@
 // A red-black tree is constructed with four template parameters:
 // K is the key type stored in the tree nodes.
 // V is the value type stored in the tree nodes.
-// COMPARATOR must have one of the static functions `cmp(K a, K b)` or `cmp(K a, const RBNode<K, V>* b)` which returns:
+// COMPARATOR must have a static function `cmp(K a, K b)` which returns:
 //     - an int < 0 when a < b
 //     - an int == 0 when a == b
 //     - an int > 0 when a > b
@@ -198,20 +202,20 @@ class AbstractRBTree {
   struct has_cmp_type<CMP, RET, ARG1, ARG2, decltype(static_cast<RET(*)(ARG1, ARG2)>(CMP::cmp), void())> : std::true_type {};
 
   template <typename CMP>
-  static constexpr bool IsKeyComparator = has_cmp_type<CMP, int, K, K>::value;
+  static constexpr bool HasKeyComparator = has_cmp_type<CMP, int, K, K>::value;
 
   template <typename CMP>
-  static constexpr bool IsNodeComparator = has_cmp_type<CMP, int, K, const NodeType*>::value;
+  static constexpr bool HasNodeComparator = has_cmp_type<CMP, int, K, const NodeType*>::value;
 
   template <typename CMP>
   static constexpr bool HasNodeVerifier = has_cmp_type<CMP, bool, const NodeType*, const NodeType*>::value;
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsKeyComparator<CMP>)>
+  template <typename CMP = COMPARATOR, ENABLE_IF(HasKeyComparator<CMP> && !HasNodeComparator<CMP>)>
   int cmp(const K& a, const NodeType* b) const {
     return COMPARATOR::cmp(a, b->key());
   }
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsNodeComparator<CMP>)>
+  template <typename CMP = COMPARATOR, ENABLE_IF(HasNodeComparator<CMP>)>
   int cmp(const K& a, const NodeType* b) const {
     return COMPARATOR::cmp(a, b);
   }
@@ -226,24 +230,13 @@ class AbstractRBTree {
     return COMPARATOR::cmp(a, b);
   }
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsKeyComparator<CMP>)>
-  void assert_leq(const K& a, const NodeType* b) const {
-    assert(COMPARATOR::cmp(a, b->key()) <= 0, "key not <= node");
-  }
-
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsNodeComparator<CMP>)>
-  void assert_leq(const K& a, const NodeType* b) const {
-    assert(COMPARATOR::cmp(a, b) <= 0, "key not <= node");
-  }
-
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsKeyComparator<CMP>)>
-  void assert_geq(const K& a, const NodeType* b) const {
-    assert(COMPARATOR::cmp(a, b->key()) >= 0, "key not >= node");
-  }
+  // Cannot assert if no key comparator exist.
+  template <typename CMP = COMPARATOR, ENABLE_IF(!HasKeyComparator<CMP>)>
+  void assert_key_leq(K a, K b) const {}
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsNodeComparator<CMP>)>
-  void assert_geq(const K& a, const NodeType* b) const {
-    assert(COMPARATOR::cmp(a, b) >= 0, "key not >= node");
+  template <typename CMP = COMPARATOR, ENABLE_IF(HasKeyComparator<CMP>)>
+  void assert_key_leq(K a, K b) const {
+    assert(COMPARATOR::cmp(a, b) <= 0, "key a must be less or equal to key b");
   }
 
   // True if node is black (nil nodes count as black)
@@ -272,7 +265,7 @@ class AbstractRBTree {
 
   AbstractRBTree() : _num_nodes(0), _root(nullptr) DEBUG_ONLY(COMMA _expected_visited(false)) {
     static_assert(std::is_trivially_destructible<K>::value, "key type must be trivially destructable");
-    static_assert(IsKeyComparator<COMPARATOR> || IsNodeComparator<COMPARATOR>,
+    static_assert(HasKeyComparator<COMPARATOR> || HasNodeComparator<COMPARATOR>,
                   "comparator must be of correct type");
   }
 
@@ -425,12 +418,12 @@ class AbstractRBTree {
     verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::cmp(a, b);});
   }
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsKeyComparator<CMP> && !HasNodeVerifier<CMP>)>
+  template <typename CMP = COMPARATOR, ENABLE_IF(HasKeyComparator<CMP> && !HasNodeVerifier<CMP>)>
   void verify_self() const {
     verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::cmp(a->key(), b->key()) < 0; });
   }
 
-  template <typename CMP = COMPARATOR, ENABLE_IF(IsNodeComparator<CMP> && !HasNodeVerifier<CMP>)>
+  template <typename CMP = COMPARATOR, ENABLE_IF(HasNodeComparator<CMP> && !HasKeyComparator<CMP> && !HasNodeVerifier<CMP>)>
   void verify_self() const {
     verify_self([](const NodeType*, const NodeType*){ return true;});
   }
diff --git a/src/hotspot/share/utilities/rbTree.inline.hpp b/src/hotspot/share/utilities/rbTree.inline.hpp
index 9c703c0283f..c28c2784f6d 100644
--- a/src/hotspot/share/utilities/rbTree.inline.hpp
+++ b/src/hotspot/share/utilities/rbTree.inline.hpp
@@ -550,19 +550,19 @@ inline void AbstractRBTree<K, NodeType, COMPARATOR>::replace_at_cursor(NodeType*
   new_node->_parent = old_node->_parent;
 
   if (new_node->is_left_child()) {
-    assert(cmp((const NodeType*)new_node, (const NodeType*)new_node->_parent), "new node not < parent");
+    assert(cmp(static_cast<const NodeType*>(new_node), static_cast<const NodeType*>(new_node->parent())), "new node not < parent");
   } else if (new_node->is_right_child()) {
-    assert(cmp((const NodeType*)new_node->_parent, (const NodeType*)new_node->_right), "new node not > parent");
+    assert(cmp(static_cast<const NodeType*>(new_node->parent()), static_cast<const NodeType*>(new_node)), "new node not > parent");
   }
 
   new_node->_left = old_node->_left;
   new_node->_right = old_node->_right;
   if (new_node->_left != nullptr) {
-    assert(cmp((const NodeType*)new_node->_left, (const NodeType*)new_node), "left child not < new node");
+    assert(cmp(static_cast<const NodeType*>(new_node->_left), static_cast<const NodeType*>(new_node)), "left child not < new node");
     new_node->_left->set_parent(new_node);
   }
   if (new_node->_right != nullptr) {
-    assert(cmp((const NodeType*)new_node, (const NodeType*)new_node->_right), "right child not > new node");
+    assert(cmp(static_cast<const NodeType*>(new_node), static_cast<const NodeType*>(new_node->_right)), "right child not > new node");
     new_node->_right->set_parent(new_node);
   }
 
@@ -606,6 +606,7 @@ inline void AbstractRBTree<K, NodeType, COMPARATOR>::visit_in_order(F f) const {
 template <typename K, typename NodeType, typename COMPARATOR>
 template <typename F>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::visit_range_in_order(const K& from, const K& to, F f) const {
+  assert_key_leq(from, to);
   if (_root == nullptr) {
     return;
   }
@@ -615,13 +616,6 @@ inline void AbstractRBTree<K, NodeType, COMPARATOR>::visit_range_in_order(const
   const NodeType* start = cursor_start.found() ? cursor_start.node() : next(cursor_start).node();
   const NodeType* end = next(cursor_end).node();
 
-  if (start != nullptr) {
-    assert_leq(from, start);
-    assert_geq(to, start);
-  } else {
-    assert(end == nullptr, "end node found but not start node");
-  }
-
   while (start != end) {
     f(start);
     start = start->next();
diff --git a/test/hotspot/gtest/utilities/test_rbtree.cpp b/test/hotspot/gtest/utilities/test_rbtree.cpp
index 640fea1329b..c47e6cb2d58 100644
--- a/test/hotspot/gtest/utilities/test_rbtree.cpp
+++ b/test/hotspot/gtest/utilities/test_rbtree.cpp
@@ -33,10 +33,16 @@
 
 class RBTreeTest : public testing::Test {
 public:
+  using RBTreeIntNode = RBNode<int, int>;
+
   struct Cmp {
     static int cmp(int a, int b) {
       return a - b;
     }
+
+    static bool cmp(const RBTreeIntNode* a, const RBTreeIntNode* b) {
+      return a->key() < b->key();
+    }
   };
 
   struct CmpInverse {
@@ -73,7 +79,6 @@ struct ArrayAllocator {
 };
 
   using RBTreeInt = RBTreeCHeap<int, int, Cmp, mtTest>;
-  using RBTreeIntNode = RBNode<int, int>;
   using IntrusiveTreeNode = IntrusiveRBNode;
 
   struct IntrusiveHolder {
@@ -93,6 +98,10 @@ struct ArrayAllocator {
       return a - IntrusiveHolder::cast_to_self(b)->key;
     }
 
+    static int cmp(int a, int b) {
+      return a - b;
+    }
+
     // true if a < b
     static bool cmp(const IntrusiveTreeNode* a, const IntrusiveTreeNode* b) {
       return (IntrusiveHolder::cast_to_self(a)->key -
@@ -300,6 +309,23 @@ struct ArrayAllocator {
     }
   }
 
+  void test_visit_outside_range() {
+    RBTreeInt rbtree;
+    using Node = RBTreeIntNode;
+
+    rbtree.upsert(2, 0);
+    rbtree.upsert(5, 0);
+
+    constexpr int test_cases[9][2] = {{0, 0}, {0, 1}, {1, 1}, {3, 3}, {3, 4},
+                                      {4, 4}, {6, 6}, {6, 7}, {7, 7}};
+
+    for (const int (&test_case)[2] : test_cases) {
+      rbtree.visit_range_in_order(test_case[0], test_case[1], [&](const Node* x) {
+        FAIL() << "Range should not visit nodes";
+      });
+    }
+  }
+
   void test_closest_leq() {
     using Node = RBTreeIntNode;
     {
@@ -802,6 +828,10 @@ TEST_VM_F(RBTreeTest, TestVisitors) {
   this->test_visitors();
 }
 
+TEST_VM_F(RBTreeTest, TestVisitOutsideRange) {
+  this->test_visit_outside_range();
+}
+
 TEST_VM_F(RBTreeTest, TestClosestLeq) {
   this->test_closest_leq();
 }

From 24d84cf66a47e10002a836275794f3f17e147c99 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 8 May 2025 16:30:01 +0000
Subject: [PATCH 353/901] 8354091: Update RELEASE_25 description for Flexible
 Constructor Bodies

Reviewed-by: iris, liach, vromero
---
 .../share/classes/javax/lang/model/SourceVersion.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index 6bc1dab1f8a..46d1a2cf9c9 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.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
@@ -82,7 +82,7 @@ public enum SourceVersion {
      *      preview, simple source files and instance main in fourth
      *      preview, flexible constructor bodies in third preview)
      *  25: module import declarations, compact source files and
-     *      instance main methods,
+     *      instance main methods, and flexible constructor bodies
      */
 
     /**
@@ -451,8 +451,9 @@ public enum SourceVersion {
      * The version introduced by the Java Platform, Standard Edition
      * 25.
      *
-     * Additions in this release include module import declarations
-     * and compact source files and instance main methods.
+     * Additions in this release include module import declarations,
+     * compact source files and instance main methods, and flexible
+     * constructor bodies.
      *
      * @since 25
      *
@@ -463,6 +464,8 @@ public enum SourceVersion {
      * JEP 511: Module Import Declarations</a>
      * @see <a href="https://openjdk.org/jeps/512">
      * JEP 512: Compact Source Files and Instance Main Methods</a>
+     * @see <a href="https://openjdk.org/jeps/513">
+     * JEP 513: Flexible Constructor Bodies</a>
      */
     RELEASE_25,
     ; // Reduce code churn when appending new constants

From 927309453822183bbfa9af278043fe0dca17031c Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 8 May 2025 17:48:26 +0000
Subject: [PATCH 354/901] 8356023: Some nsk/jdi tests can fetch ThreadReference
 from static field in the debuggee: part 2

Reviewed-by: amenkov, sspitsyn, lmesnik
---
 .../invokeMethod/invokemethod001.java         |  9 ++---
 .../invokeMethod/invokemethod001a.java        |  8 ++--
 .../ClassType/newInstance/newinstance001.java | 22 ++---------
 .../newInstance/newinstance001a.java          |  7 ++--
 .../ClassType/newInstance/newinstance002.java | 21 ++---------
 .../newInstance/newinstance002a.java          |  5 ++-
 .../ObjectReference/getValue/getvalue001.java | 20 ++--------
 .../getValue/getvalue001a.java                |  9 +++--
 .../ObjectReference/getValue/getvalue002.java | 22 ++---------
 .../getValue/getvalue002a.java                |  6 +--
 .../invokeMethod/invokemethod001.java         | 23 ++----------
 .../invokeMethod/invokemethod001a.java        |  8 ++--
 .../referenceType/referencetype001.java       | 31 ++--------------
 .../referenceType/referencetype001a.java      |  8 ++--
 .../jdi/StackFrame/getValue/getvalue001.java  |  9 ++---
 .../jdi/StackFrame/getValue/getvalue001a.java |  7 +++-
 .../jdi/StackFrame/getValue/getvalue002.java  |  8 ++--
 .../jdi/StackFrame/getValue/getvalue002a.java |  9 +++--
 .../StackFrame/getValues/getvalues001.java    |  9 ++---
 .../StackFrame/getValues/getvalues001a.java   |  9 +++--
 .../StackFrame/getValues/getvalues002.java    |  9 ++---
 .../StackFrame/getValues/getvalues002a.java   |  9 +++--
 .../jdi/StackFrame/location/location001.java  |  9 ++---
 .../jdi/StackFrame/location/location001a.java |  9 +++--
 .../setValue/setvalue001/setvalue001.java     |  9 ++---
 .../setValue/setvalue001/setvalue001a.java    |  9 +++--
 .../setValue/setvalue002/setvalue002.java     |  9 ++---
 .../setValue/setvalue002/setvalue002a.java    |  6 +--
 .../setValue/setvalue003/setvalue003.java     |  9 ++---
 .../setValue/setvalue003/setvalue003a.java    |  9 +++--
 .../setValue/setvalue004/setvalue004.java     |  9 ++---
 .../setValue/setvalue004/setvalue004a.java    |  9 +++--
 .../StackFrame/thisObject/thisobject001.java  |  9 ++---
 .../StackFrame/thisObject/thisobject001a.java |  8 ++--
 .../StackFrame/thisObject/thisobject002.java  |  9 ++---
 .../StackFrame/thisObject/thisobject002a.java |  9 +++--
 .../nsk/jdi/StackFrame/thread/thread001.java  |  9 ++---
 .../nsk/jdi/StackFrame/thread/thread001a.java |  9 +++--
 .../visiblevarbyname001.java                  |  9 ++---
 .../visiblevarbyname001a.java                 |  9 +++--
 .../visiblevarbyname002.java                  | 10 ++---
 .../visiblevarbyname002a.java                 |  9 +++--
 .../visibleVariables/visiblevariables001.java |  9 ++---
 .../visiblevariables001a.java                 |  9 +++--
 .../visibleVariables/visiblevariables002.java |  9 ++---
 .../visiblevariables002a.java                 |  7 +++-
 .../forceEarlyReturn002.java                  |  6 ++-
 .../forceEarlyReturn002a.java                 |  6 ++-
 .../jdi/ThreadReference/frame/frame001.java   | 21 ++---------
 .../jdi/ThreadReference/frame/frame001a.java  |  9 +++--
 .../frameCount/framecount001.java             | 21 ++---------
 .../frameCount/framecount001a.java            |  9 +++--
 .../jdi/ThreadReference/frames/frames001.java | 21 ++---------
 .../ThreadReference/frames/frames001a.java    |  7 +++-
 .../frames_ii/frames_ii001.java               | 21 ++---------
 .../frames_ii/frames_ii001a.java              |  7 +++-
 .../frames_ii/frames_ii002.java               | 21 ++---------
 .../frames_ii/frames_ii002a.java              |  7 +++-
 .../isAtBreakpoint/isatbreakpoint001.java     | 21 ++---------
 .../isAtBreakpoint/isatbreakpoint001a.java    |  7 +++-
 .../isSuspended/issuspended001.java           | 37 ++-----------------
 .../isSuspended/issuspended001a.java          |  9 +++--
 .../isSuspended/issuspended002.java           | 35 ++----------------
 .../isSuspended/issuspended002a.java          | 12 ++++--
 .../isSuspended/issuspended003.java           | 37 ++-----------------
 .../isSuspended/issuspended003a.java          |  9 +++--
 .../isSuspended/issuspended004.java           | 37 ++-----------------
 .../isSuspended/issuspended004a.java          |  9 +++--
 .../nsk/jdi/ThreadReference/name/name001.java | 21 ++---------
 .../jdi/ThreadReference/name/name001a.java    |  9 +++--
 .../jdi/ThreadReference/resume/resume001.java | 21 ++---------
 .../ThreadReference/resume/resume001a.java    |  9 +++--
 .../nsk/jdi/ThreadReference/stop/stop001.java | 20 ++--------
 .../ThreadReference/suspend/suspend001.java   | 21 ++---------
 .../ThreadReference/suspend/suspend001a.java  |  9 +++--
 .../suspendCount/suspendcount001.java         | 21 ++---------
 .../suspendCount/suspendcount001a.java        |  7 +++-
 .../cangccm001.java                           | 22 ++---------
 .../cangccm001a.java                          |  5 ++-
 .../cangetmonitorinfo001.java                 | 20 ++--------
 .../canGetOwnedMonitorInfo/cangetinfo001.java | 20 ++--------
 .../cangetinfo001a.java                       |  5 ++-
 .../VirtualMachine/dispose/dispose002.java    | 20 ++--------
 .../VirtualMachine/dispose/dispose002a.java   |  9 +++--
 .../VirtualMachine/dispose/dispose003.java    | 20 ++--------
 .../VirtualMachine/dispose/dispose003a.java   |  9 +++--
 .../VirtualMachine/dispose/dispose004.java    | 34 ++---------------
 .../VirtualMachine/dispose/dispose004a.java   | 12 ++++--
 .../VirtualMachine/dispose/dispose005.java    |  7 +---
 .../VirtualMachine/suspend/suspend001.java    | 34 ++---------------
 .../VirtualMachine/suspend/suspend001a.java   | 10 ++++-
 .../vmTestbase/nsk/share/jdi/Debugee.java     | 15 ++++++--
 92 files changed, 400 insertions(+), 828 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java
index 94a209f6e65..d2e63f024f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001.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
@@ -173,6 +173,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -209,9 +210,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -231,7 +229,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                     classType   = (ClassType) testedclass;
@@ -241,7 +238,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001a.java
index b843a177d7b..f678ac244ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod001a.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
@@ -59,6 +59,8 @@ private static void logErr(String message) {
 
     //====================================================== test program
 
+    static Thread test_thread = null;
+
     //    String mName =                        //!!!!!!!!!!!!!!!!!!!!!!
     //    "nsk.jdi.ClassType.invokeMethod";
 
@@ -98,8 +100,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadinvokemethod001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadinvokemethod001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java
index b36d63c308e..6fc9a24bf89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001.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
@@ -184,6 +184,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -216,8 +217,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String bpLine1 = "breakpointLineNumber1";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -228,7 +227,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(threadClassName);
                     threadClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -237,21 +235,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-
-                log2("......getting Thread thread2 - 1-st argument");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001a.java
index 434918cf86e..da5121abede 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,7 @@ private static void logErr(String message) {
 
     //====================================================== test program
 
+    static Thread test_thread = null;
     static TestClass obj = new TestClass();
 
     //----------------------------------------------------   main method
@@ -96,8 +97,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadnewinstance001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadnewinstance001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java
index df33538733e..2ca320d1581 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002.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
@@ -181,6 +181,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -213,8 +214,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String bpLine1 = "breakpointLineNumber1";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -225,7 +224,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(threadClassName);
                     threadClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -234,20 +232,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002a.java
index 4ae343397bb..21ddf900881 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -60,6 +60,7 @@ private static void logErr(String message) {
 
     //====================================================== test program
 
+    static Threadnewinstance002a test_thread = null;
 //    static TestClass obj = new TestClass();
 
     //----------------------------------------------------   main method
@@ -97,7 +98,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadnewinstance002a test_thread =
+                         test_thread =
                              new Threadnewinstance002a("testedThread");
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java
index 6c2e0e37db5..066848a9d81 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001.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
@@ -168,6 +168,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -199,8 +200,6 @@ private int runThis (String argv[], PrintStream out) {
             String breakpointMethod1 = "runt1";
             String bpLine1           = "breakpointLineNumber1";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -211,7 +210,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -220,19 +218,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001a.java
index d58fe7eba0c..1602c6633f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadgetvalue001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadgetvalue001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java
index cf137dd5785..3eed80a7fd1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002.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
@@ -172,6 +172,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -204,8 +205,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String bpLine1 = "breakpointLineNumber1";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -216,7 +215,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(threadClassName);
                     threadClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -225,21 +223,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-
-                log2("......getting Thread thread2 - 1-st argument");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002a.java
index 6e47f790924..bf21a09c44d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -60,6 +60,7 @@ private static void logErr(String message) {
 
     //====================================================== test program
 
+    static getvalue002aThread test_thread = null;
     static getvalue002aTestClass obj = new getvalue002aTestClass();
 
     //----------------------------------------------------   main method
@@ -97,8 +98,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         getvalue002aThread test_thread =
-                             new getvalue002aThread("testedThread");
+                         test_thread = new getvalue002aThread("testedThread");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
index 6fda6375ee2..2fb81d7ddac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.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
@@ -176,6 +176,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -233,25 +234,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-
-                if (thread2 == null) {
-                    log3("ERROR: didn't find thread '" + threadName + "'");
-                    expresult = returnCode1;
-                    break label0;
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 threadObjRef = thread2;
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001a.java
index d0bca2b31d9..cb322d75ee9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -60,6 +60,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadinvokemethod001a test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -95,8 +98,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadinvokemethod001a test_thread =
-                             new Threadinvokemethod001a("testedThread");
+                         test_thread = new Threadinvokemethod001a("testedThread");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java
index 3acfeef10c3..0fdf879f673 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001.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
@@ -153,6 +153,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -179,35 +180,9 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "testedThread";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
-
-
             label0: {
 
-                log2("getting ThreadReference object");
-                try {
-                    allThreads  = vm.allThreads();
-                } catch ( Exception e) {
-                    log3("ERROR: Exception at very beginning !? : " + e);
-                    expresult = returnCode1;
-                    break label0;
-                }
-
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001a.java
index 471c13c44e4..88cdccadb4a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/referenceType/referencetype001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -60,6 +60,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadreferencetype001a test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -95,8 +98,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadreferencetype001a test_thread =
-                             new Threadreferencetype001a("testedThread");
+                         test_thread = new Threadreferencetype001a("testedThread");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java
index 3364faf11fa..38a13e0863a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001.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
@@ -168,6 +168,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -204,9 +205,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -224,7 +222,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -233,7 +230,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001a.java
index 81f8782f8d2..bb62a21e8e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadgetvalue001a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java
index 4306c1024a9..1e61ed92720 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002.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
@@ -174,6 +174,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -211,8 +212,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine3 = "breakpointLineNumber3";
 
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -230,7 +229,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -239,7 +237,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002a.java
index 2108d301698..96be4327c26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue002a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadgetvalue002a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadgetvalue002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java
index 59f2abab4de..1a2302983d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001.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
@@ -169,6 +169,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -205,9 +206,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -225,7 +223,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -234,7 +231,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001a.java
index c640ba3138c..8ec36ad4ca2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadgetvalues001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadgetvalues001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java
index 0c3b235fdf7..5609d7813b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002.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
@@ -176,6 +176,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -212,9 +213,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -232,7 +230,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -241,7 +238,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002a.java
index 4d726cef3e5..4140c045521 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues002a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadgetvalues002a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadgetvalues002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java
index 408122474b5..d111d5bab02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001.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
@@ -174,6 +174,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -210,9 +211,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -230,7 +228,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -239,7 +236,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001a.java
index af6ed716c15..8f4129ff34d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/location/location001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadlocation001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadlocation001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java
index 910ecff94b4..978681c2c1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001.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
@@ -252,6 +252,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
         //------------------------------------------------------  testing section
 
@@ -289,9 +290,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -309,7 +307,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -318,7 +315,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001a.java
index 00b234645d2..28e993f7005 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue001/setvalue001a.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
@@ -58,7 +58,10 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
-    //----------------------------------------------------   main method
+
+    static Thread test_thread = null;
+
+   //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadsetvalue001a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java
index 49544e795d7..fa63588a11f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002.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
@@ -266,6 +266,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -302,9 +303,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -322,7 +320,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -331,7 +328,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002a.java
index c64790c1c41..7afbe3c80bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue002/setvalue002a.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
@@ -59,7 +59,7 @@ private static void logErr(String message) {
 
     //====================================================== test program
 
-    static public Thread test_thread = null;
+    static Thread test_thread = null;
 
     //----------------------------------------------------   main method
 
@@ -97,7 +97,7 @@ public static void main (String argv[]) {
 
                 case 0:
                          test_thread =
-                                 JDIThreadFactory.newThread(new Threadsetvalue002a("testedThread"));
+                             JDIThreadFactory.newThread(new Threadsetvalue002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java
index 5470a720801..0e9f798e319 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003.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
@@ -260,6 +260,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -296,9 +297,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -316,7 +314,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -325,7 +322,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003a.java
index 615b8786a42..311fc2c8b30 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue003/setvalue003a.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
@@ -57,6 +57,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -92,8 +95,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadsetvalue003a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadsetvalue003a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java
index 5d8010ef48d..bbf4d95f95e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004.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
@@ -253,6 +253,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -289,9 +290,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -309,7 +307,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -318,7 +315,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004a.java
index 34b501fa176..e7ecdc4d930 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue004/setvalue004a.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
@@ -57,6 +57,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -92,8 +95,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadsetvalue004a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadsetvalue004a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java
index 97bd0ed68e7..2629dfc5e0f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001.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
@@ -170,6 +170,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -206,9 +207,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -226,7 +224,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -235,7 +232,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001a.java
index 80d06e0364f..10d34374c75 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadthisobject001a test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadthisobject001a test_thread =
-                             new Threadthisobject001a("testedThread");
+                         test_thread = new Threadthisobject001a("testedThread");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java
index 92af5040a9d..82038fbaaaf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002.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
@@ -169,6 +169,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -205,9 +206,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -225,7 +223,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -234,7 +231,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002a.java
index f99281fce86..63a3ae9b657 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thisObject/thisobject002a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadthisobject002a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadthisobject002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java
index e95f92ddee9..3125c163d70 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001.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
@@ -167,6 +167,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -203,9 +204,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -223,7 +221,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -232,7 +229,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001a.java
index 2ed786de5c4..9d48619f2c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/thread/thread001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadthread001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadthread001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java
index 4502fb235f2..6137275fa23 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001.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
@@ -172,6 +172,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -208,9 +209,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -228,7 +226,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -237,7 +234,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001a.java
index dcf210c8ef2..65abcc5c08f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadvisiblevarbyname001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadvisiblevarbyname001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java
index 9e5c0e3d3d8..4899fd1aa1c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002.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
@@ -163,6 +163,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -199,9 +200,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -219,7 +217,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -228,7 +225,8 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
+
                 log2("setting up breakpoints");
 
                 breakpRequest1 = settingBreakpoint(breakpointMethod1, bpLine1, "one");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002a.java
index be0f57e2a19..47afb882e3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariableByName/visiblevarbyname002a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadvisiblevarbyname002a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadvisiblevarbyname002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java
index 32b262071fd..86941e2edb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001.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
@@ -167,6 +167,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -203,9 +204,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -223,7 +221,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -232,7 +229,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001a.java
index 7c5255421a0..b12d3ce1d66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadvisiblevariables001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadvisiblevariables001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java
index f1b00b5a975..14d2e7b267d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002.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
@@ -164,6 +164,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -200,9 +201,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -220,7 +218,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -229,7 +226,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                thread2 = debuggee.threadByName(threadName);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002a.java
index 3f61c2fc00e..c72dba87a54 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/visibleVariables/visiblevariables002a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadvisiblevariables002a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
index e9a089bb0a3..7cc305c6293 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.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
@@ -83,6 +83,7 @@ public static int run(String argv[], PrintStream out) {
     public void doTest() {
         // initialize breakpoint
 
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeClassName());
         ReferenceType referenceType = debuggee.classByName(ClassUsingTestClass.class.getName());
 
         BreakpointRequest breakpointRequest = debuggee.makeBreakpoint(referenceType,
@@ -116,7 +117,8 @@ public void doTest() {
             }
         }
 
-        ThreadReference threadReference = debuggee.threadByName(forceEarlyReturn002a.mainThreadName);
+        ThreadReference threadReference =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", forceEarlyReturn002a.mainThreadName);
 
         try {
             if (testClassIsLoaded) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java
index 1351c7dacfd..9d138021374 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/forceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002a.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.
  * 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,12 +59,14 @@ public class forceEarlyReturn002a extends AbstractJDIDebuggee {
     public String[] doInit(String args[]) {
         args = super.doInit(args);
 
-        Thread.currentThread().setName(mainThreadName);
+        mainThread = Thread.currentThread();
+        mainThread.setName(mainThreadName);
 
         return args;
     }
 
     public static String mainThreadName = "MainThread";
+    public static Thread mainThread = null;
 
     // call testClassMethod()
     public final static String COMMAND_CALL_OBJECT_METHOD = "callObjectMethod";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java
index 85ac08b35a8..23f395da42d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001.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
@@ -184,6 +184,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -221,9 +222,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -243,7 +241,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -252,19 +249,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001a.java
index 1e539df3d0d..c6a57a58e95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frame/frame001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadframe001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadframe001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java
index 60610373b86..d55af33192b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001.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
@@ -175,6 +175,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -212,9 +213,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -232,7 +230,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -241,19 +238,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001a.java
index 86ce89e1d5f..9dc666a225b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frameCount/framecount001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadframecount001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadframecount001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
index 11827a71170..aa7765f487e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.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
@@ -189,6 +189,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -226,9 +227,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -248,7 +246,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -257,19 +254,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001a.java
index 4e5f4987a0a..d8ede6ae49d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadframes001a test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,7 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadframes001a test_thread =
+                         test_thread =
                              new Threadframes001a("testedThread");
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java
index 3ac9a39da88..869bf03e28c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001.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
@@ -190,6 +190,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -228,9 +229,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest0 = null;
@@ -250,7 +248,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -259,19 +256,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001a.java
index 5a87140a1dc..916d40cd4bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadframes_ii001a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java
index 0109d783e97..54bcbc51d62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002.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
@@ -173,6 +173,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -211,9 +212,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest0 = null;
@@ -234,7 +232,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -243,19 +240,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002a.java
index 013ef438b8c..8d2b7d1d928 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames_ii/frames_ii002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadframes_ii002a test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,7 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadframes_ii002a test_thread =
+                         test_thread =
                              new Threadframes_ii002a("testedThread");
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java
index ff41fb4caaf..7b03d08dcf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001.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
@@ -167,6 +167,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -204,9 +205,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -220,7 +218,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -229,19 +226,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001a.java
index d2c49da45b5..2db902f6a63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isAtBreakpoint/isatbreakpoint001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadisatbreakpoint001a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java
index 99b1ddd1f5a..e7fa75c042f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001.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
@@ -129,7 +129,6 @@ private static void log3(String message) {
 
     ReferenceType     testedclass  = null;
     ThreadReference   thread2      = null;
-    ThreadReference   mainThread   = null;
 
     static int  testExitCode = PASSED;
 
@@ -173,6 +172,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -212,9 +212,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -229,7 +226,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -238,34 +234,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-
-                log2("getting ThreadReference objects for main thread");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next() for 'mainThread'");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001a.java
index 50046edf7e1..c3c34d385ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadissuspended001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadissuspended001a("testedThread"));
                          log1("thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java
index 3fb49c0c262..92d23c4f954 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002.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
@@ -173,6 +173,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -210,9 +211,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -227,7 +225,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -236,34 +233,10 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("getting ThreadReference objects for main thread");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next() for 'mainThread'");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002a.java
index 483be91f3b9..7b55698c16c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002a.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
@@ -58,10 +58,16 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+    static Thread mainThread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i = 0; i < argv.length; i++) {
             if (argv[i].equals("-vbs") || argv[i].equals("-verbose")) {
                 verbMode = true;
@@ -91,8 +97,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                    Thread test_thread =
-                            JDIThreadFactory.newThread(new Threadissuspended002a("testedThread"));
+                    test_thread =
+                        JDIThreadFactory.newThread(new Threadissuspended002a("testedThread"));
                     log1("       thread2 is created");
                 label:
                     synchronized (Threadissuspended002a.lockingObject) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java
index 81549caccb4..365cc94d184 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003.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
@@ -127,7 +127,6 @@ private static void log3(String message) {
 
     ReferenceType     testedclass  = null;
     ThreadReference   thread2      = null;
-    ThreadReference   mainThread   = null;
 
     static int  testExitCode = PASSED;
 
@@ -171,6 +170,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -207,9 +207,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -223,7 +220,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -232,34 +228,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-
-                log2("getting ThreadReference objects for main thread");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next() for 'mainThread'");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003a.java
index 8fe2442b376..e478979bfb9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended003a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadissuspended003a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadissuspended003a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java
index 799ca455f47..05d46b3b066 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004.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
@@ -125,7 +125,6 @@ private static void log3(String message) {
 
     ReferenceType     testedclass  = null;
     ThreadReference   thread2      = null;
-    ThreadReference   mainThread   = null;
 
     static int  testExitCode = PASSED;
 
@@ -169,6 +168,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -205,9 +205,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -222,7 +219,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -231,34 +227,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-
-                log2("getting ThreadReference objects for main thread");
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next() for 'mainThread'");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004a.java
index a6ae6ba4c7f..026cde9e777 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended004a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadissuspended004a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadissuspended004a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java
index 219930df6b9..b4c840c9b13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001.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
@@ -162,6 +162,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -199,9 +200,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             //BreakpointRequest breakpRequest1 = null;
@@ -213,7 +211,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -222,19 +219,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001a.java
index ebf93f55ee6..49b16f33cb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/name/name001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,8 +96,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadname001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadname001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
index c7dd827a569..3bbd213c048 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.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
@@ -166,6 +166,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -203,9 +204,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -219,7 +217,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -228,19 +225,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java
index 7efc2dd7c01..0a4c2a88e35 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -99,8 +102,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadresume001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadresume001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java
index c1baa909eec..cbefebb984f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop001.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
@@ -169,6 +169,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
 
@@ -196,8 +197,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "Thread2";
 
-            List            allThreads    = null;
-            ListIterator    listIterator  = null;
             List            classes       = null;
             ReferenceType mainthreadClass = null;
             ObjectReference throwableObj  = null;
@@ -207,7 +206,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(debuggeeName);
                     mainthreadClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -216,19 +214,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
             }
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java
index 92ba863bbf2..60426af806f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001.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
@@ -167,6 +167,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
 
@@ -205,9 +206,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -219,7 +217,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -228,19 +225,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001a.java
index 0474ff84ed9..424ea3294bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspend/suspend001a.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
@@ -57,6 +57,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -92,8 +95,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threadsuspend001a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threadsuspend001a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java
index e6608f96646..a4febfdc641 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001.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
@@ -166,6 +166,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -203,9 +204,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             //BreakpointRequest breakpRequest1 = null;
@@ -217,7 +215,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -226,19 +223,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001a.java
index 5ce0343b045..e7b676d3825 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/suspendCount/suspendcount001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
+                         test_thread =
                              JDIThreadFactory.newThread(new Threadsuspendcount001a("testedThread"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java
index a9e56f30b3a..ce889296bd7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001.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
@@ -165,6 +165,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -189,11 +190,7 @@ private int runThis (String argv[], PrintStream out) {
 
             int expresult = returnCode0;
 
-            String threadName = "testedThread";
-
-            List            allThreads   = null;
             ObjectReference monitor      = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
 
@@ -201,7 +198,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -210,19 +206,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO 'main' thread  ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
             }
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001a.java
index 9275e236272..35b4b2bf788 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetCurrentContendedMonitor/cangccm001a.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
@@ -60,11 +60,14 @@ private static void logErr(String message) {
     //====================================================== test program
 
     private static Thread thread2 = null;
+    static Thread mainThread = null;
 
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java
index cc550ba50b2..9a2bb8e2dae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetMonitorInfo/cangetmonitorinfo001.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
@@ -173,6 +173,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -199,9 +200,7 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "Thread2";
 
-            List            allThreads   = null;
             ObjectReference monitor      = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
 
@@ -209,7 +208,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -218,19 +216,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO 'main' thread  ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java
index 08aa1cbd3a6..68236100d69 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001.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
@@ -165,6 +165,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -191,9 +192,7 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "testedThread";
 
-            List            allThreads   = null;
             List            monitors     = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
 
@@ -201,7 +200,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -210,19 +208,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO 'main' thread  ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
             }
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001a.java
index 1f3a22f4c34..2172653a89c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canGetOwnedMonitorInfo/cangetinfo001a.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
@@ -60,11 +60,14 @@ private static void logErr(String message) {
     //====================================================== test program
 
     private static Thread thread2 = null;
+    static Thread mainThread = null;
 
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java
index 6e29432692c..ac6a4a3f876 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002.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
@@ -165,6 +165,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -203,8 +204,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine3 = "breakpointLineNumber3";
 
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -216,7 +215,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -225,19 +223,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002a.java
index 6d5e08bfde0..6e6edda0d2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002a.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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threaddispose002a("testedThread"));
+                        test_thread =
+                            JDIThreadFactory.newThread(new Threaddispose002a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java
index 41e5d6c87ec..66cc732f664 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003.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
@@ -158,6 +158,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -185,8 +186,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "testedThread";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
 
@@ -194,7 +193,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -203,19 +201,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003a.java
index a8d1fa6336e..602f027eb1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003a.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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threaddispose003a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threaddispose003a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java
index 14a6468c41c..6d63d8fcd89 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004.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
@@ -159,6 +159,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -185,8 +186,6 @@ private int runThis (String argv[], PrintStream out) {
 
             String threadName = "testedThread";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
 
@@ -194,7 +193,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -203,32 +201,8 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "test_thread", threadName);
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004a.java
index ef6412000b9..8595c2b46d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004a.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
@@ -60,10 +60,16 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread mainThread = null;
+    static Thread test_thread = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
@@ -95,8 +101,8 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread test_thread =
-                                 JDIThreadFactory.newThread(new Threaddispose004a("testedThread"));
+                         test_thread =
+                             JDIThreadFactory.newThread(new Threaddispose004a("testedThread"));
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java
index 874ff2c9406..790142dc706 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005.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
@@ -206,6 +206,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -242,9 +243,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -259,7 +257,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                     classType   = (ClassType) testedclass;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java
index b50b1d883ff..56db85535a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001.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
@@ -170,6 +170,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -206,8 +207,6 @@ private int runThis (String argv[], PrintStream out) {
             String bpLine1 = "breakpointLineNumber1";
             String bpLine2 = "breakpointLineNumber2";
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -218,7 +217,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference objects and setting up breakponts");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -227,32 +225,8 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO MAIN THREAD ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
 
                 log2("setting up breakpoints");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001a.java
index 955d2b86ad9..18e3604552d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/suspend/suspend001a.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
@@ -57,10 +57,16 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread mainThread = null;
+    static Thread thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
@@ -92,7 +98,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread thread2 =
+                         thread2 =
                              JDIThreadFactory.newThread(new VMsuspend001a("Thread2"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index b121bd15fe3..4f2bdd34137 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -293,22 +293,29 @@ public ThreadReference mainThread() {
     public ThreadReference threadByFieldNameOrThrow(ReferenceType debuggeeClass,
                                                     String threadFieldName)
             throws JDITestRuntimeException {
+        return threadByFieldNameOrThrow(debuggeeClass, threadFieldName, threadFieldName);
+    }
+
+    public ThreadReference threadByFieldNameOrThrow(ReferenceType debuggeeClass,
+                                                    String threadFieldName,
+                                                    String threadName)
+            throws JDITestRuntimeException {
 
         Field field = debuggeeClass.fieldByName(threadFieldName);
         if (field == null) {
             throw new JDITestRuntimeException("** Thread field not found ** : "
-                                              + threadFieldName);
+                                              + debuggeeClass.name() + "." + threadFieldName);
         }
 
         ThreadReference thread = (ThreadReference)debuggeeClass.getValue(field);
         if (thread == null) {
             throw new JDITestRuntimeException("** Thread field is null ** : "
-                                              + threadFieldName);
+                                              + debuggeeClass.name() + "." + threadFieldName);
         }
 
-        if (!thread.name().equals(threadFieldName)) {
+        if (!thread.name().equals(threadName)) {
             throw new JDITestRuntimeException("** Thread names do not match ** : "
-                                              + threadFieldName + " vs. " + thread.name());
+                                              + threadName + " vs. " + thread.name());
         }
 
         return thread;

From e4ecda2b2563fbdff96d82fbbed6c022e28a49da Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 8 May 2025 17:52:05 +0000
Subject: [PATCH 355/901] 8356221: Clarify Console.charset() method description

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

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index 7e4540ecb06..aaa3ba8dd27 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -512,7 +512,7 @@ public void flush() {
      * Returns the {@link java.nio.charset.Charset Charset} object used for
      * the {@code Console}.
      * <p>
-     * The returned charset corresponds to the input and output source
+     * The returned charset is used for interpreting the input and output source
      * (e.g., keyboard and/or display) specified by the host environment or user,
      * which defaults to the one based on {@link System##stdout.encoding stdout.encoding}.
      * It may not necessarily be the same as the default charset returned from

From b7b437d5bd579a7a90a90470979768cdd085728c Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Thu, 8 May 2025 17:53:27 +0000
Subject: [PATCH 356/901] 8356453: C2: assert(!vbox->is_Phi()) during vector
 box expansion

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/opto/vector.cpp                         | 8 ++++++--
 .../jtreg/compiler/vectorapi/VectorBoxExpandTest.java     | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index a0121819978..4ffbd2e96b4 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -44,6 +44,10 @@ void PhaseVector::optimize_vector_boxes() {
 
   C->igvn_worklist()->ensure_empty(); // should be done with igvn
 
+  if (StressMacroExpansion) {
+    C->shuffle_macro_nodes();
+  }
+
   expand_vunbox_nodes();
   scalarize_vbox_nodes();
 
@@ -311,7 +315,7 @@ Node* PhaseVector::expand_vbox_node_helper(Node* vbox,
                                            VectorSet &visited) {
   // JDK-8304948 shows an example that there may be a cycle in the graph.
   if (visited.test_set(vbox->_idx)) {
-    assert(vbox->is_Phi(), "should be phi");
+    assert(vbox->is_Phi() || vbox->is_CheckCastPP(), "either phi or expanded");
     return vbox; // already visited
   }
 
@@ -362,7 +366,7 @@ Node* PhaseVector::expand_vbox_node_helper(Node* vbox,
     return C->initial_gvn()->transform(vbox);
   }
 
-  assert(!vbox->is_Phi(), "should be expanded");
+  assert(vbox->is_CheckCastPP(), "should be expanded");
   // TODO: assert that expanded vbox is initialized with the same value (vect).
   return vbox; // already expanded
 }
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandTest.java
index 13d03bf1d43..2d9e70a86c2 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandTest.java
@@ -41,6 +41,7 @@ public class VectorBoxExpandTest {
 
     private static int[] iarr = new int[ARR_LEN];
     private static IntVector g;
+    private static int acc = 0;
 
     // C2 would generate IR graph like below:
     //
@@ -86,10 +87,14 @@ private static void test() {
 
         for (int ic = 0; ic < NUM_ITER; ic++) {
             for (int i = 0; i < iarr.length; i++) {
+                acc += System.identityHashCode(a);
                 a = a.add(a);
+                acc += System.identityHashCode(a);
             }
         }
         g = a;
+        acc += System.identityHashCode(a);
+
     }
 
     public static void main(String[] args) {

From 4379e2d26bd445d3f303a5937d1e335885be9216 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 8 May 2025 17:54:47 +0000
Subject: [PATCH 357/901] 8356125: Interned strings are omitted from AOT cache

Reviewed-by: shade, ccheung
---
 src/hotspot/share/cds/aotClassLinker.cpp      |  4 -
 .../share/cds/aotConstantPoolResolver.cpp     | 23 +-----
 .../share/cds/aotConstantPoolResolver.hpp     | 11 +--
 src/hotspot/share/cds/heapShared.cpp          | 16 +---
 src/hotspot/share/cds/metaspaceShared.cpp     | 13 +--
 src/hotspot/share/classfile/stringTable.cpp   | 63 +++++++++------
 src/hotspot/share/classfile/stringTable.hpp   |  5 +-
 src/hotspot/share/oops/constantPool.cpp       | 34 --------
 src/hotspot/share/oops/constantPool.hpp       |  2 -
 .../GeneratedInternedString.java              | 72 +++++++++++++++++
 .../NonFinalStaticWithInitVal.java            | 79 +++++++++++++++++++
 .../NonFinalStaticWithInitVal_Helper.jasm     | 38 +++++++++
 12 files changed, 240 insertions(+), 120 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal_Helper.jasm

diff --git a/src/hotspot/share/cds/aotClassLinker.cpp b/src/hotspot/share/cds/aotClassLinker.cpp
index dc539eb3d55..cd3712f0c65 100644
--- a/src/hotspot/share/cds/aotClassLinker.cpp
+++ b/src/hotspot/share/cds/aotClassLinker.cpp
@@ -64,8 +64,6 @@ void AOTClassLinker::initialize() {
   }
 
   assert(is_initialized(), "sanity");
-
-  AOTConstantPoolResolver::initialize();
 }
 
 void AOTClassLinker::dispose() {
@@ -79,8 +77,6 @@ void AOTClassLinker::dispose() {
   _sorted_candidates = nullptr;
 
   assert(!is_initialized(), "sanity");
-
-  AOTConstantPoolResolver::dispose();
 }
 
 bool AOTClassLinker::is_vm_class(InstanceKlass* ik) {
diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
index 15ca2b2c2a0..cadad2e11ff 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
@@ -37,19 +37,6 @@
 #include "oops/klass.inline.hpp"
 #include "runtime/handles.inline.hpp"
 
-AOTConstantPoolResolver::ClassesTable* AOTConstantPoolResolver::_processed_classes = nullptr;
-
-void AOTConstantPoolResolver::initialize() {
-  assert(_processed_classes == nullptr, "must be");
-  _processed_classes = new (mtClass)ClassesTable();
-}
-
-void AOTConstantPoolResolver::dispose() {
-  assert(_processed_classes != nullptr, "must be");
-  delete _processed_classes;
-  _processed_classes = nullptr;
-}
-
 // Returns true if we CAN PROVE that cp_index will always resolve to
 // the same information at both dump time and run time. This is a
 // necessary (but not sufficient) condition for pre-resolving cp_index
@@ -144,17 +131,11 @@ bool AOTConstantPoolResolver::is_class_resolution_deterministic(InstanceKlass* c
   }
 }
 
-void AOTConstantPoolResolver::dumptime_resolve_constants(InstanceKlass* ik, TRAPS) {
+void AOTConstantPoolResolver::preresolve_string_cp_entries(InstanceKlass* ik, TRAPS) {
   if (!ik->is_linked()) {
+    // The cp->resolved_referenced() array is not ready yet, so we can't call resolve_string().
     return;
   }
-  bool first_time;
-  _processed_classes->put_if_absent(ik, &first_time);
-  if (!first_time) {
-    // We have already resolved the constants in class, so no need to do it again.
-    return;
-  }
-
   constantPoolHandle cp(THREAD, ik->constants());
   for (int cp_index = 1; cp_index < cp->length(); cp_index++) { // Index 0 is unused
     switch (cp->tag_at(cp_index).value()) {
diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.hpp b/src/hotspot/share/cds/aotConstantPoolResolver.hpp
index 2f65849fbb4..89d9d5c2476 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.hpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.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
@@ -80,17 +80,10 @@ class AOTConstantPoolResolver :  AllStatic {
   static bool check_lambda_metafactory_methodhandle_arg(ConstantPool* cp, int bsms_attribute_index, int arg_i);
 
 public:
-  static void initialize();
-  static void dispose();
-
   static void preresolve_class_cp_entries(JavaThread* current, InstanceKlass* ik, GrowableArray<bool>* preresolve_list);
   static void preresolve_field_and_method_cp_entries(JavaThread* current, InstanceKlass* ik, GrowableArray<bool>* preresolve_list);
   static void preresolve_indy_cp_entries(JavaThread* current, InstanceKlass* ik, GrowableArray<bool>* preresolve_list);
-
-
-  // Resolve all constant pool entries that are safe to be stored in the
-  // CDS archive.
-  static void dumptime_resolve_constants(InstanceKlass* ik, TRAPS);
+  static void preresolve_string_cp_entries(InstanceKlass* ik, TRAPS);
 
   static bool is_resolution_deterministic(ConstantPool* cp, int cp_index);
 };
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index ef71d5895f6..32b4e9e13ed 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -606,11 +606,8 @@ static objArrayOop get_archived_resolved_references(InstanceKlass* src_ik) {
 }
 
 void HeapShared::archive_strings() {
-  oop shared_strings_array = StringTable::init_shared_strings_array(_dumped_interned_strings);
+  oop shared_strings_array = StringTable::init_shared_strings_array();
   bool success = archive_reachable_objects_from(1, _dump_time_special_subgraph, shared_strings_array);
-  // We must succeed because:
-  // - _dumped_interned_strings do not contain any large strings.
-  // - StringTable::init_shared_table() doesn't create any large arrays.
   assert(success, "shared strings array must not point to arrays or strings that are too large to archive");
   StringTable::set_shared_strings_array_index(append_root(shared_strings_array));
 }
@@ -683,7 +680,7 @@ void HeapShared::write_heap(ArchiveHeapInfo *heap_info) {
     check_special_subgraph_classes();
   }
 
-  StringTable::write_shared_table(_dumped_interned_strings);
+  StringTable::write_shared_table();
   ArchiveHeapWriter::write(_pending_roots, heap_info);
 
   ArchiveBuilder::OtherROAllocMark mark;
@@ -710,8 +707,6 @@ void HeapShared::scan_java_class(Klass* orig_k) {
       bool success = HeapShared::archive_reachable_objects_from(1, _dump_time_special_subgraph, rr);
       assert(success, "must be");
     }
-
-    orig_ik->constants()->add_dumped_interned_strings();
   }
 }
 
@@ -2067,11 +2062,8 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
 #endif
 }
 
-// Not all the strings in the global StringTable are dumped into the archive, because
-// some of those strings may be only referenced by classes that are excluded from
-// the archive. We need to explicitly mark the strings that are:
-//   [1] used by classes that WILL be archived;
-//   [2] included in the SharedArchiveConfigFile.
+// Keep track of the contents of the archived interned string table. This table
+// is used only by CDSHeapVerifier.
 void HeapShared::add_to_dumped_interned_strings(oop string) {
   assert_at_safepoint(); // DumpedInternedStrings uses raw oops
   assert(!ArchiveHeapWriter::is_string_too_large_to_archive(string), "must be");
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 654c2e7ecd7..6ea81c05437 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -646,15 +646,6 @@ void VM_PopulateDumpSharedSpace::doit() {
   // Block concurrent class unloading from changing the _dumptime_table
   MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
 
-#if INCLUDE_CDS_JAVA_HEAP
-  if (CDSConfig::is_dumping_heap() && _extra_interned_strings != nullptr) {
-    for (int i = 0; i < _extra_interned_strings->length(); i ++) {
-      OopHandle string = _extra_interned_strings->at(i);
-      HeapShared::add_to_dumped_interned_strings(string.resolve());
-    }
-  }
-#endif
-
   _builder.gather_source_objs();
   _builder.reserve_buffer();
 
@@ -777,7 +768,7 @@ void MetaspaceShared::link_shared_classes(TRAPS) {
     // Keep scanning until we have linked no more classes.
   }
 
-  // Resolve constant pool entries -- we don't load any new classes during this stage
+  // Eargerly resolve all string constants in constant pools
   {
     ResourceMark rm(THREAD);
     CollectClassesForLinking collect_classes;
@@ -785,7 +776,7 @@ void MetaspaceShared::link_shared_classes(TRAPS) {
     for (int i = 0; i < mirrors->length(); i++) {
       OopHandle mirror = mirrors->at(i);
       InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(mirror.resolve()));
-      AOTConstantPoolResolver::dumptime_resolve_constants(ik, CHECK);
+      AOTConstantPoolResolver::preresolve_string_cp_entries(ik, CHECK);
     }
   }
 
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index 1076ffb2dd7..b048c531d13 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -946,6 +946,8 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
   if (!CDSConfig::is_dumping_heap()) {
     return;
   }
+  assert(CDSConfig::allow_only_single_java_thread(), "No more interned strings can be added");
+
   if (_items_count > (size_t)max_jint) {
     fatal("Too many strings to be archived: %zu", _items_count);
   }
@@ -1026,48 +1028,61 @@ void StringTable::verify_secondary_array_index_bits() {
 // For each shared string:
 // [1] Store it into _shared_strings_array. Encode its position as a 32-bit index.
 // [2] Store the index and hashcode into _shared_table.
-oop StringTable::init_shared_strings_array(const DumpedInternedStrings* dumped_interned_strings) {
+oop StringTable::init_shared_strings_array() {
   assert(CDSConfig::is_dumping_heap(), "must be");
   objArrayOop array = (objArrayOop)(_shared_strings_array.resolve());
 
   verify_secondary_array_index_bits();
 
   int index = 0;
-  auto copy_into_array = [&] (oop string, bool value_ignored) {
-    if (!_is_two_dimensional_shared_strings_array) {
-      assert(index < array->length(), "no strings should have been added");
-      array->obj_at_put(index, string);
-    } else {
-      int primary_index = index >> _secondary_array_index_bits;
-      int secondary_index = index & _secondary_array_index_mask;
+  auto copy_into_array = [&] (WeakHandle* val) {
+    oop string = val->peek();
+    if (string != nullptr && !ArchiveHeapWriter::is_string_too_large_to_archive(string)) {
+      // If string is too large, don't put it into the string table.
+      // - If there are no other refernences to it, it won't be stored into the archive,
+      //   so we are all good.
+      // - If there's a referece to it, we will report an error inside HeapShared.cpp and
+      //   dumping will fail.
+      HeapShared::add_to_dumped_interned_strings(string);
+      if (!_is_two_dimensional_shared_strings_array) {
+        assert(index < array->length(), "no strings should have been added");
+        array->obj_at_put(index, string);
+      } else {
+        int primary_index = index >> _secondary_array_index_bits;
+        int secondary_index = index & _secondary_array_index_mask;
 
-      assert(primary_index < array->length(), "no strings should have been added");
-      objArrayOop secondary = (objArrayOop)array->obj_at(primary_index);
+        assert(primary_index < array->length(), "no strings should have been added");
+        objArrayOop secondary = (objArrayOop)array->obj_at(primary_index);
 
-      assert(secondary != nullptr && secondary->is_objArray(), "must be");
-      assert(secondary_index < secondary->length(), "no strings should have been added");
-      secondary->obj_at_put(secondary_index, string);
+        assert(secondary != nullptr && secondary->is_objArray(), "must be");
+        assert(secondary_index < secondary->length(), "no strings should have been added");
+        secondary->obj_at_put(secondary_index, string);
+      }
+      index ++;
     }
-
-    index ++;
+    return true;
   };
-  dumped_interned_strings->iterate_all(copy_into_array);
 
+  _local_table->do_safepoint_scan(copy_into_array);
+  log_info(cds)("Archived %d interned strings", index);
   return array;
-}
+};
 
-void StringTable::write_shared_table(const DumpedInternedStrings* dumped_interned_strings) {
+void StringTable::write_shared_table() {
   _shared_table.reset();
   CompactHashtableWriter writer((int)_items_count, ArchiveBuilder::string_stats());
 
   int index = 0;
-  auto copy_into_shared_table = [&] (oop string, bool value_ignored) {
-    unsigned int hash = java_lang_String::hash_code(string);
-    writer.add(hash, index);
-    index ++;
+  auto copy_into_shared_table = [&] (WeakHandle* val) {
+    oop string = val->peek();
+    if (string != nullptr && !ArchiveHeapWriter::is_string_too_large_to_archive(string)) {
+      unsigned int hash = java_lang_String::hash_code(string);
+      writer.add(hash, index);
+      index ++;
+    }
+    return true;
   };
-  dumped_interned_strings->iterate_all(copy_into_shared_table);
-
+  _local_table->do_safepoint_scan(copy_into_shared_table);
   writer.dump(&_shared_table, "string");
 }
 
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index 15539009f66..bf7bb9e2cd9 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -33,7 +33,6 @@
 #include "utilities/tableStatistics.hpp"
 
 class CompactHashtableWriter;
-class DumpedInternedStrings;
 class JavaThread;
 class SerializeClosure;
 
@@ -147,8 +146,8 @@ class StringTable : AllStatic {
   static oop lookup_shared(const jchar* name, int len) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
   static size_t shared_entry_count() NOT_CDS_JAVA_HEAP_RETURN_(0);
   static void allocate_shared_strings_array(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
-  static oop init_shared_strings_array(const DumpedInternedStrings* dumped_interned_strings) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  static void write_shared_table(const DumpedInternedStrings* dumped_interned_strings) NOT_CDS_JAVA_HEAP_RETURN;
+  static oop init_shared_strings_array() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
+  static void write_shared_table() NOT_CDS_JAVA_HEAP_RETURN;
   static void set_shared_strings_array_index(int root_index) NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_shared_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 0d3b44351f8..c02fdaf2dc6 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -374,40 +374,6 @@ objArrayOop ConstantPool::prepare_resolved_references_for_archiving() {
   }
   return rr;
 }
-
-void ConstantPool::add_dumped_interned_strings() {
-  InstanceKlass* ik = pool_holder();
-  if (!ik->is_linked()) {
-    // resolved_references() doesn't exist yet, so we have no resolved CONSTANT_String entries. However,
-    // some static final fields may have default values that were initialized when the class was parsed.
-    // We need to enter those into the CDS archive strings table.
-    for (JavaFieldStream fs(ik); !fs.done(); fs.next()) {
-      if (fs.access_flags().is_static()) {
-        fieldDescriptor& fd = fs.field_descriptor();
-        if (fd.field_type() == T_OBJECT) {
-          int offset = fd.offset();
-          check_and_add_dumped_interned_string(ik->java_mirror()->obj_field(offset));
-        }
-      }
-    }
-  } else {
-    objArrayOop rr = resolved_references();
-    if (rr != nullptr) {
-      int rr_len = rr->length();
-      for (int i = 0; i < rr_len; i++) {
-        check_and_add_dumped_interned_string(rr->obj_at(i));
-      }
-    }
-  }
-}
-
-void ConstantPool::check_and_add_dumped_interned_string(oop obj) {
-  if (obj != nullptr && java_lang_String::is_instance(obj) &&
-      !ArchiveHeapWriter::is_string_too_large_to_archive(obj)) {
-    HeapShared::add_to_dumped_interned_strings(obj);
-  }
-}
-
 #endif
 
 #if INCLUDE_CDS
diff --git a/src/hotspot/share/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp
index 4457f8a84e7..cc9491d7935 100644
--- a/src/hotspot/share/oops/constantPool.hpp
+++ b/src/hotspot/share/oops/constantPool.hpp
@@ -162,7 +162,6 @@ class ConstantPool : public Metadata {
     assert(is_within_bounds(cp_index), "index out of bounds");
     return (jdouble*) &base()[cp_index];
   }
-  static void check_and_add_dumped_interned_string(oop obj);
 
   ConstantPool(Array<u1>* tags);
   ConstantPool();
@@ -684,7 +683,6 @@ class ConstantPool : public Metadata {
 #if INCLUDE_CDS
   // CDS support
   objArrayOop prepare_resolved_references_for_archiving() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  void add_dumped_interned_strings() NOT_CDS_JAVA_HEAP_RETURN;
   void remove_unshareable_info();
   void restore_unshareable_info(TRAPS);
 private:
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java
new file mode 100644
index 00000000000..dcb1c59c09f
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/GeneratedInternedString.java
@@ -0,0 +1,72 @@
+/*
+ * 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 storing a dynamically generated interned string in the AOT cache
+ * @bug 8356125
+ * @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 GeneratedInternedString
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar GeneratedInternedStringApp
+ * @run driver GeneratedInternedString
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+
+public class GeneratedInternedString {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("GeneratedInternedString")
+            .addVmArgs("-XX:AOTInitTestClass=GeneratedInternedStringApp")
+            .classpath("app.jar")
+            .appCommandLine("GeneratedInternedStringApp")
+            .runAOTWorkflow();
+    }
+}
+
+// This class is cached in the AOT-initialized state. At the beginning of the production
+// run, all of the static fields in GeneratedInternedStringApp will retain their values
+// at the end of the assembly phase. GeneratedInternedStringApp::<clinit> is NOT executed in the
+// production run.
+class GeneratedInternedStringApp {
+    static volatile int n = 0;
+    static final String generatedInternedString = generate();
+
+    public static void main(String args[]) {
+        n = args.length;
+        String b = generate();
+        if (generatedInternedString != b) {
+            throw new RuntimeException("generatedInternedString: " + System.identityHashCode(generatedInternedString)
+                                       + " vs b:" + System.identityHashCode(b));
+        }
+    }
+
+    static String generate() {
+        System.out.println("generate() is called");
+        return ("GeneratedInternedStringApp_String" + n).intern();
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.java
new file mode 100644
index 00000000000..ba21f5f98fb
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal.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.
+ *
+ */
+
+/*
+ * @test
+ * @summary Handling of non-final static string that has an initial value
+ * @bug 8356125
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build NonFinalStaticWithInitVal_Helper
+ * @build NonFinalStaticWithInitVal
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp NonFinalStaticWithInitVal_Helper
+ * @run driver NonFinalStaticWithInitVal AOT
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class NonFinalStaticWithInitVal {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "MyTestApp";
+
+    public static void main(String[] args) throws Exception {
+        for (int i = 0; i < 2; i++) {
+            SimpleCDSAppTester.of("NonFinalStaticWithInitVal")
+                .addVmArgs("-XX:" + (i == 0 ? "-" : "+") + "AOTClassLinking",
+                           "-Xlog:cds")
+            .classpath("app.jar")
+            .appCommandLine("MyTestApp")
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("field = Dummy 12345678");
+                })
+            .runStaticWorkflow()
+            .runAOTWorkflow();
+        }
+    }
+}
+
+class MyTestApp {
+    volatile static int x = 0;
+
+    public static void main(String args[]) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Dummy ");
+        sb.append("1234567");
+        sb.append(8 + x);
+        String myValue = sb.toString().intern();
+        String theirValue = NonFinalStaticWithInitVal_Helper.foo;
+        System.out.println("field = " + theirValue);
+        if (myValue != theirValue) {
+            // String literals from different class files must be interned.
+            throw new RuntimeException("Interned strings do not match");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal_Helper.jasm b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal_Helper.jasm
new file mode 100644
index 00000000000..3cf205dc2eb
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/NonFinalStaticWithInitVal_Helper.jasm
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ *
+ */
+
+/*
+
+public class NonFinalStaticWithInitVal_Helper {
+    static String foo = String "Dummy 12345678";
+}
+
+*/
+
+public class NonFinalStaticWithInitVal_Helper
+    version 51:0
+{
+    static Field foo:"Ljava/lang/String;" = String "Dummy 12345678";
+}
+

From c2a4fa1d83bd690e4e453eb1dbe59c6503b5281d Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Thu, 8 May 2025 22:11:37 +0000
Subject: [PATCH 358/901] 8355573: Remove kludge_c++11.h from jpackage code

Reviewed-by: asemenyuk, almatvee
---
 .../libapplauncher/LinuxLauncherLib.cpp       |   2 -
 .../share/native/applauncher/CfgFile.cpp      |   2 -
 .../share/native/applauncher/PackageFile.cpp  |   2 -
 .../native/applauncher/StringProcessing.cpp   |   2 -
 src/jdk.jpackage/share/native/common/Dll.h    |   2 -
 src/jdk.jpackage/share/native/common/app.cpp  |   2 -
 .../share/native/common/kludge_c++11.h        | 170 ------------------
 .../windows/native/common/MsiUtils.h          |   1 +
 8 files changed, 1 insertion(+), 182 deletions(-)
 delete mode 100644 src/jdk.jpackage/share/native/common/kludge_c++11.h

diff --git a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
index 52d3f2892cd..7d7c8b7213d 100644
--- a/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
+++ b/src/jdk.jpackage/linux/native/libapplauncher/LinuxLauncherLib.cpp
@@ -23,8 +23,6 @@
  * questions.
  */
 
-#include "kludge_c++11.h"
-
 #include <memory>
 #include "JvmLauncher.h"
 #include "AppLauncher.h"
diff --git a/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp b/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp
index 0e99d131e69..f9cce661155 100644
--- a/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp
@@ -23,8 +23,6 @@
  * questions.
  */
 
-#include "kludge_c++11.h"
-
 #include <set>
 #include <fstream>
 #include <algorithm>
diff --git a/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp b/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
index aa78e5f711e..31b431215d5 100644
--- a/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/PackageFile.cpp
@@ -23,8 +23,6 @@
  * questions.
  */
 
-#include "kludge_c++11.h"
-
 #include <fstream>
 #include "PackageFile.h"
 #include "Log.h"
diff --git a/src/jdk.jpackage/share/native/applauncher/StringProcessing.cpp b/src/jdk.jpackage/share/native/applauncher/StringProcessing.cpp
index 207db25fd94..161b18fd99b 100644
--- a/src/jdk.jpackage/share/native/applauncher/StringProcessing.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/StringProcessing.cpp
@@ -23,8 +23,6 @@
  * questions.
  */
 
-#include "kludge_c++11.h"
-
 #include <algorithm>
 #include "StringProcessing.h"
 
diff --git a/src/jdk.jpackage/share/native/common/Dll.h b/src/jdk.jpackage/share/native/common/Dll.h
index 491f0867868..c84242373a7 100644
--- a/src/jdk.jpackage/share/native/common/Dll.h
+++ b/src/jdk.jpackage/share/native/common/Dll.h
@@ -32,8 +32,6 @@
 typedef void* HMODULE;
 #endif
 
-#include "kludge_c++11.h"
-
 #include <memory>
 #include "tstrings.h"
 #include "ErrorHandling.h"
diff --git a/src/jdk.jpackage/share/native/common/app.cpp b/src/jdk.jpackage/share/native/common/app.cpp
index 2a004b508d3..d9492785f06 100644
--- a/src/jdk.jpackage/share/native/common/app.cpp
+++ b/src/jdk.jpackage/share/native/common/app.cpp
@@ -23,8 +23,6 @@
  * questions.
  */
 
-#include "kludge_c++11.h"
-
 #include <memory>
 #include "app.h"
 #include "Log.h"
diff --git a/src/jdk.jpackage/share/native/common/kludge_c++11.h b/src/jdk.jpackage/share/native/common/kludge_c++11.h
deleted file mode 100644
index 5f475ff0ce9..00000000000
--- a/src/jdk.jpackage/share/native/common/kludge_c++11.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-#ifndef kludge_cxx11_h
-#define kludge_cxx11_h
-
-//
-// This file contains kludge implementation of C++11 features needed to build
-// jpackage until Open JDK moves forward from C++98 standard.
-//
-
-#ifdef __GNUG__
-#ifndef __clang__
-#if __cplusplus < 201103L
-#define JP_WITH_KLUDGE_CXX11
-#endif
-#endif
-#endif
-
-#ifdef JP_WITH_KLUDGE_CXX11
-
-#include <algorithm>
-
-
-namespace std {
-
-namespace impl {
-
-template <typename Tp, typename Dp>
-class unique_ptr_impl {
-public:
-    typedef typename Dp::pointer pointer;
-    typedef Tp element_type;
-    typedef Dp deleter_type;
-
-    unique_ptr_impl(): value(0) {
-    }
-
-    unique_ptr_impl(pointer p): value(p) {
-    }
-
-    pointer release() {
-        const pointer retValue = value;
-        value = 0;
-        return retValue;
-    }
-
-    void swap(unique_ptr_impl& other) {
-        std::swap(value, other.value);
-    }
-
-    pointer get() const {
-        return value;
-    }
-
-private:
-    unique_ptr_impl(const unique_ptr_impl&);
-    unique_ptr_impl& operator= (const unique_ptr_impl&);
-
-private:
-    pointer value;
-};
-
-} // namespace impl
-
-
-template <typename Tp>
-struct default_delete {
-    typedef Tp* pointer;
-
-    void operator()(Tp* ptr) const {
-        delete ptr;
-    }
-};
-
-
-template <typename Tp, typename Dp = default_delete<Tp> >
-class unique_ptr {
-    typedef impl::unique_ptr_impl<Tp, Dp> impl_type;
-public:
-    typedef typename impl_type::pointer pointer;
-    typedef typename impl_type::element_type element_type;
-    typedef typename impl_type::deleter_type deleter_type;
-
-    unique_ptr() {
-    }
-
-    unique_ptr(pointer p): impl(p) {
-    }
-
-    ~unique_ptr() {
-        if (get() != 0) {
-            impl_type tmp;
-            tmp.swap(impl);
-            Dp()(tmp.get());
-        }
-    }
-
-    pointer release() {
-        return impl.release();
-    }
-
-    void swap(unique_ptr& other) {
-        impl.swap(other.impl);
-    }
-
-    pointer get() const {
-        return impl.get();
-    }
-
-    element_type& operator *() const {
-        return *impl.get();
-    }
-
-    pointer operator ->() const {
-        return impl.get();
-    }
-
-private:
-    impl_type impl;
-};
-
-template <class Ctnr>
-typename Ctnr::const_iterator begin(const Ctnr& ctnr) {
-    return ctnr.begin();
-}
-
-template <class Ctnr>
-typename Ctnr::iterator begin(Ctnr& ctnr) {
-    return ctnr.begin();
-}
-
-template <class Ctnr>
-typename Ctnr::const_iterator end(const Ctnr& ctnr) {
-    return ctnr.end();
-}
-
-template <class Ctnr>
-typename Ctnr::iterator end(Ctnr& ctnr) {
-    return ctnr.end();
-}
-
-} // namespace std
-
-#endif // #ifdef JP_WITH_KLUDGE_CXX11
-
-#endif // #ifndef kludge_cxx11_h
diff --git a/src/jdk.jpackage/windows/native/common/MsiUtils.h b/src/jdk.jpackage/windows/native/common/MsiUtils.h
index ad75d758b0a..26fa9f91045 100644
--- a/src/jdk.jpackage/windows/native/common/MsiUtils.h
+++ b/src/jdk.jpackage/windows/native/common/MsiUtils.h
@@ -32,6 +32,7 @@
 #include <stdexcept>
 #include <new>
 #include <map>
+#include <memory>
 
 #include "ErrorHandling.h"
 #include "Toolbox.h"

From 8a8893ec030b19583efd65bd0751e66254689ead Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 8 May 2025 22:18:56 +0000
Subject: [PATCH 359/901] 8356562: SigningAppImageTwoStepsTest test fails

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/JPackageCommand.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 8c5a653f5a0..c1f1bc05d51 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -1001,12 +1001,8 @@ private boolean expectAppImageFile() {
     }
 
     private void assertAppImageFile() {
-        Path appImageDir = Path.of("");
-        if (isImagePackageType() && hasArgument("--app-image")) {
-            appImageDir = Path.of(getArgumentValue("--app-image"));
-        }
+        final Path lookupPath = AppImageFile.getPathInAppImage(Path.of(""));
 
-        final Path lookupPath = AppImageFile.getPathInAppImage(appImageDir);
         if (!expectAppImageFile()) {
             assertFileNotInAppImage(lookupPath);
         } else {
@@ -1073,8 +1069,14 @@ private void assertFileInAppImage(Path filename, Path expectedPath) {
             return;
         }
 
-        final Path rootDir = isImagePackageType() ? outputBundle() : pathToUnpackedPackageFile(
-                appInstallationDirectory());
+        final Path rootDir;
+        if (TKit.isOSX() && MacHelper.signPredefinedAppImage(this)) {
+            rootDir = Path.of(getArgumentValue("--app-image"));
+        } else if (isImagePackageType()) {
+            rootDir = outputBundle();
+        } else {
+            rootDir = pathToUnpackedPackageFile(appInstallationDirectory());
+        }
 
         try ( Stream<Path> walk = ThrowingSupplier.toSupplier(() -> {
             if (TKit.isLinux() && rootDir.equals(Path.of("/"))) {

From cc3a366e2a616226b776f683dbfb7cddaf2270d3 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 9 May 2025 00:06:26 +0000
Subject: [PATCH 360/901] 8333568: Test that jpackage doesn't modify R/O
 files/directories

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/JPackageCommand.java    | 152 +++++++++++++++++-
 .../helpers/jdk/jpackage/test/TKit.java       |  42 +++++
 2 files changed, 189 insertions(+), 5 deletions(-)

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 c1f1bc05d51..476b6a3ef74 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -23,10 +23,18 @@
 
 package jdk.jpackage.test;
 
+import static java.util.stream.Collectors.groupingBy;
+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.test.AdditionalLauncher.forEachAdditionalLauncher;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -46,7 +54,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static jdk.jpackage.test.AdditionalLauncher.forEachAdditionalLauncher;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
@@ -78,6 +85,7 @@ public JPackageCommand(JPackageCommand cmd) {
         prerequisiteActions = new Actions(cmd.prerequisiteActions);
         verifyActions = new Actions(cmd.verifyActions);
         appLayoutAsserts = cmd.appLayoutAsserts;
+        readOnlyPathAsserts = cmd.readOnlyPathAsserts;
         outputValidators = cmd.outputValidators;
         executeInDirectory = cmd.executeInDirectory;
         winMsiLogFile = cmd.winMsiLogFile;
@@ -843,10 +851,13 @@ public Executor.Result execute(int expectedExitCode) {
             }
         }
 
-        Executor.Result result = new JPackageCommand(this)
-                .adjustArgumentsBeforeExecution()
-                .createExecutor()
-                .execute(expectedExitCode);
+        final var copy = new JPackageCommand(this).adjustArgumentsBeforeExecution();
+
+        final var directoriesAssert = new ReadOnlyPathsAssert(copy);
+
+        Executor.Result result = copy.createExecutor().execute(expectedExitCode);
+
+        directoriesAssert.updateAndAssert();
 
         for (final var outputValidator: outputValidators) {
             outputValidator.accept(result.getOutput().iterator());
@@ -903,6 +914,136 @@ public String macroValue(Macro macro) {
         return macro.value(this);
     }
 
+    private static final class ReadOnlyPathsAssert {
+        ReadOnlyPathsAssert(JPackageCommand cmd) {
+            this.asserts = cmd.readOnlyPathAsserts.stream().map(a -> {
+                return a.getPaths(cmd).stream().map(dir -> {
+                    return Map.entry(a, dir);
+                });
+            }).flatMap(x -> x).collect(groupingBy(Map.Entry::getKey, mapping(Map.Entry::getValue, toList())));
+            snapshots = createSnapshots();
+        }
+
+        void updateAndAssert() {
+            final var newSnapshots = createSnapshots();
+            for (final var a : asserts.keySet().stream().sorted().toList()) {
+                final var snapshopGroup = snapshots.get(a);
+                final var newSnapshopGroup = newSnapshots.get(a);
+                for (int i = 0; i < snapshopGroup.size(); i++) {
+                    TKit.PathSnapshot.assertEquals(snapshopGroup.get(i), newSnapshopGroup.get(i),
+                            String.format("Check jpackage didn't modify ${%s}=[%s]", a, asserts.get(a).get(i)));
+                }
+            }
+        }
+
+        private Map<ReadOnlyPathAssert, List<TKit.PathSnapshot>> createSnapshots() {
+            return asserts.entrySet().stream()
+                    .map(e -> {
+                        return Map.entry(e.getKey(), e.getValue().stream().map(TKit.PathSnapshot::new).toList());
+                    }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+        }
+
+        private final Map<ReadOnlyPathAssert, List<Path>> asserts;
+        private final Map<ReadOnlyPathAssert, List<TKit.PathSnapshot>> snapshots;
+    }
+
+    public static enum ReadOnlyPathAssert{
+        APP_IMAGE(new Builder("--app-image").enable(cmd -> {
+            // External app image should be R/O unless it is an app image signing on macOS.
+            return !(TKit.isOSX() && MacHelper.signPredefinedAppImage(cmd));
+        }).create()),
+        APP_CONTENT(new Builder("--app-content").multiple().create()),
+        RESOURCE_DIR(new Builder("--resource-dir").create()),
+        MAC_DMG_CONTENT(new Builder("--mac-dmg-content").multiple().create()),
+        RUNTIME_IMAGE(new Builder("--runtime-image").create());
+
+        ReadOnlyPathAssert(Function<JPackageCommand, List<Path>> getPaths) {
+            this.getPaths = getPaths;
+        }
+
+        List<Path> getPaths(JPackageCommand cmd) {
+            return getPaths.apply(cmd).stream().toList();
+        }
+
+        private final static class Builder {
+
+            Builder(String argName) {
+                this.argName = Objects.requireNonNull(argName);
+            }
+
+            Builder multiple() {
+                multiple = true;
+                return this;
+            }
+
+            Builder enable(Predicate<JPackageCommand> v) {
+                enable = v;
+                return this;
+            }
+
+            Function<JPackageCommand, List<Path>> create() {
+                return cmd -> {
+                    if (enable != null && !enable.test(cmd)) {
+                        return List.of();
+                    } else {
+                        final List<Optional<Path>> dirs;
+                        if (multiple) {
+                            dirs = Stream.of(cmd.getAllArgumentValues(argName))
+                                    .map(Builder::tokenizeValue)
+                                    .flatMap(x -> x)
+                                    .map(Builder::toExistingFile).toList();
+                        } else {
+                            dirs = Optional.ofNullable(cmd.getArgumentValue(argName))
+                                    .map(Builder::toExistingFile).map(List::of).orElseGet(List::of);
+                        }
+
+                        final var mutablePaths = Stream.of("--temp", "--dest")
+                                .map(cmd::getArgumentValue)
+                                .filter(Objects::nonNull)
+                                .map(Builder::toExistingFile)
+                                .filter(Optional::isPresent).map(Optional::orElseThrow)
+                                .collect(toSet());
+
+                        return dirs.stream()
+                                .filter(Optional::isPresent).map(Optional::orElseThrow)
+                                .filter(Predicate.not(mutablePaths::contains))
+                                .toList();
+                    }
+                };
+            }
+
+            private static Optional<Path> toExistingFile(String path) {
+                Objects.requireNonNull(path);
+                try {
+                    return Optional.of(Path.of(path)).filter(Files::exists).map(Path::toAbsolutePath);
+                } catch (InvalidPathException ex) {
+                    return Optional.empty();
+                }
+            }
+
+            private static Stream<String> tokenizeValue(String str) {
+                return Stream.of(str.split(","));
+            }
+
+            private Predicate<JPackageCommand> enable;
+            private final String argName;
+            private boolean multiple;
+        }
+
+        private final Function<JPackageCommand, List<Path>> getPaths;
+    }
+
+    public JPackageCommand setReadOnlyPathAsserts(ReadOnlyPathAssert... asserts) {
+        readOnlyPathAsserts = Set.of(asserts);
+        return this;
+    }
+
+    public JPackageCommand excludeReadOnlyPathAssert(ReadOnlyPathAssert... asserts) {
+        var asSet = Set.of(asserts);
+        return setReadOnlyPathAsserts(readOnlyPathAsserts.stream().filter(Predicate.not(
+                asSet::contains)).toArray(ReadOnlyPathAssert[]::new));
+    }
+
     public static enum AppLayoutAssert {
         APP_IMAGE_FILE(JPackageCommand::assertAppImageFile),
         PACKAGE_FILE(JPackageCommand::assertPackageFile),
@@ -1320,6 +1461,7 @@ public void run() {
     private final Actions verifyActions;
     private Path executeInDirectory;
     private Path winMsiLogFile;
+    private Set<ReadOnlyPathAssert> readOnlyPathAsserts = Set.of(ReadOnlyPathAssert.values());
     private Set<AppLayoutAssert> appLayoutAsserts = Set.of(AppLayoutAssert.values());
     private List<Consumer<Iterator<String>>> outputValidators = new ArrayList<>();
     private static boolean defaultWithToolProvider;
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 e2f35f4df35..cfed969f4b0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -34,6 +34,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardWatchEventKinds;
@@ -1130,6 +1131,47 @@ private static PrintStream openLogStream() {
                 new FileOutputStream(LOG_FILE.toFile(), true))).get();
     }
 
+    public record PathSnapshot(List<String> contentHashes) {
+        public PathSnapshot {
+            contentHashes.forEach(Objects::requireNonNull);
+        }
+
+        public PathSnapshot(Path path) {
+            this(hashRecursive(path));
+        }
+
+        public static void assertEquals(PathSnapshot a, PathSnapshot b, String msg) {
+            assertStringListEquals(a.contentHashes(), b.contentHashes(), msg);
+        }
+
+        private static List<String> hashRecursive(Path path) {
+            try {
+                try (final var walk = Files.walk(path)) {
+                    return walk.sorted().map(p -> {
+                        final String hash;
+                        if (Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS)) {
+                            hash = "";
+                        } else {
+                            hash = hashFile(p);
+                        }
+                        return String.format("%s#%s", path.relativize(p), hash);
+                    }).toList();
+                }
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        private static String hashFile(Path path) {
+            try {
+                final var time = Files.getLastModifiedTime(path, LinkOption.NOFOLLOW_LINKS);
+                return time.toString();
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+    }
+
     private static TestInstance currentTest;
     private static PrintStream extraLogStream;
 

From 9a0e6f338f34fb5da16d5f9eb710cdddd4302945 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 9 May 2025 02:08:29 +0000
Subject: [PATCH 361/901] 8356571: Re-enable -Wtype-limits for GCC in LCMS

Reviewed-by: jwaters, prr
---
 make/modules/java.desktop/lib/ClientLibraries.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index a9511fba58b..dcb41defba3 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -87,7 +87,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
         libawt/java2d \
         java.base:libjvm, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-    DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation type-limits \
+    DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation \
         unused-variable, \
     DISABLED_WARNINGS_clang := format-nonliteral, \
     JDK_LIBS := libawt java.base:libjava, \

From 53ad4b2ad2664e5056c113543dfaa26647d6ce26 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Fri, 9 May 2025 05:28:56 +0000
Subject: [PATCH 362/901] 8355364: [REDO] Missing REX2 prefix accounting in ZGC
 barriers leads to incorrect encoding

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Reviewed-by: aboldtch, sviswanathan
---
 src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 9cdf0b229c0..4a956b450bd 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1328,7 +1328,13 @@ void ZBarrierSetAssembler::patch_barrier_relocation(address addr, int format) {
   const uint16_t value = patch_barrier_relocation_value(format);
   uint8_t* const patch_addr = (uint8_t*)addr + offset;
   if (format == ZBarrierRelocationFormatLoadGoodBeforeShl) {
-    *patch_addr = (uint8_t)value;
+    if (VM_Version::supports_apx_f()) {
+      NativeInstruction* instruction = nativeInstruction_at(addr);
+      uint8_t* const rex2_patch_addr = patch_addr + (instruction->has_rex2_prefix() ? 1 : 0);
+      *rex2_patch_addr = (uint8_t)value;
+    } else {
+      *patch_addr = (uint8_t)value;
+    }
   } else {
     *(uint16_t*)patch_addr = value;
   }

From 591e71ebe501e6e88249f46efda4134277f29b08 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 9 May 2025 06:00:23 +0000
Subject: [PATCH 363/901] 8354890: AOT-initialize j.l.i.MethodHandleImpl and
 inner classes

Reviewed-by: liach, vlivanov
---
 src/hotspot/share/cds/aotClassInitializer.cpp |   5 +
 .../share/cds/aotConstantPoolResolver.cpp     |   2 +-
 src/hotspot/share/cds/cdsHeapVerifier.cpp     |   9 +-
 src/hotspot/share/classfile/vmClassMacros.hpp |   1 +
 src/hotspot/share/oops/instanceKlass.cpp      |   7 +-
 .../java/lang/invoke/MethodHandleImpl.java    |   5 +
 .../classes/java/lang/ref/Reference.java      |   2 +-
 .../aotClassLinking/MethodHandleTest.java     | 157 +++++++++++++++++-
 8 files changed, 176 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index be7e1f31d8a..6f45c979880 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -321,6 +321,10 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
     if (is_allowed(indy_specs, ik)) {
       return true;
     }
+
+    if (ik->name()->starts_with("java/lang/invoke/MethodHandleImpl")) {
+      return true;
+    }
   }
 
 #ifdef ASSERT
@@ -339,6 +343,7 @@ bool AOTClassInitializer::is_runtime_setup_required(InstanceKlass* ik) {
   return ik == vmClasses::Class_klass() ||
          ik == vmClasses::internal_Unsafe_klass() ||
          ik == vmClasses::ConcurrentHashMap_klass() ||
+         ik == vmClasses::MethodHandleImpl_klass() ||
          ik == vmClasses::Reference_klass();
 }
 
diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
index cadad2e11ff..6787242adbd 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
@@ -506,7 +506,7 @@ bool AOTConstantPoolResolver::is_indy_resolution_deterministic(ConstantPool* cp,
     Symbol* factory_type_sig = cp->uncached_signature_ref_at(cp_index);
     if (log_is_enabled(Debug, cds, resolve)) {
       ResourceMark rm;
-      log_debug(cds, resolve)("Checking indy callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
+      log_debug(cds, resolve)("Checking lambda callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
     }
 
     if (!check_lambda_metafactory_signature(cp, factory_type_sig)) {
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index 9bab62dabe6..2e96f818c14 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -138,11 +138,10 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0)
                                                           "CD_Object_array",       // E same as <...>ConstantUtils.CD_Object_array::CD_Object
                                                           "INVOKER_SUPER_DESC");   // E same as java.lang.constant.ConstantDescs::CD_Object
 
-    ADD_EXCL("java/lang/invoke/MethodHandleImpl$ArrayAccessor",
-                                                          "OBJECT_ARRAY_GETTER",    // D
-                                                          "OBJECT_ARRAY_SETTER",    // D
-                                                          "OBJECT_ARRAY_LENGTH");   // D
-
+    ADD_EXCL("java/lang/runtime/ObjectMethods",           "CLASS_IS_INSTANCE",     // D
+                                                          "FALSE",                 // D
+                                                          "TRUE",                  // D
+                                                          "ZERO");                 // D
   }
 
 # undef ADD_EXCL
diff --git a/src/hotspot/share/classfile/vmClassMacros.hpp b/src/hotspot/share/classfile/vmClassMacros.hpp
index 351b9b0b53f..1edc13054d4 100644
--- a/src/hotspot/share/classfile/vmClassMacros.hpp
+++ b/src/hotspot/share/classfile/vmClassMacros.hpp
@@ -114,6 +114,7 @@
   do_klass(VarHandle_klass,                             java_lang_invoke_VarHandle                            ) \
   do_klass(MemberName_klass,                            java_lang_invoke_MemberName                           ) \
   do_klass(ResolvedMethodName_klass,                    java_lang_invoke_ResolvedMethodName                   ) \
+  do_klass(MethodHandleImpl_klass,                      java_lang_invoke_MethodHandleImpl                     ) \
   do_klass(MethodHandleNatives_klass,                   java_lang_invoke_MethodHandleNatives                  ) \
   do_klass(LambdaForm_klass,                            java_lang_invoke_LambdaForm                           ) \
   do_klass(MethodType_klass,                            java_lang_invoke_MethodType                           ) \
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 00ef75d8486..5bde777c47e 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -860,6 +860,12 @@ void InstanceKlass::initialize_with_aot_initialized_mirror(TRAPS) {
     return;
   }
 
+  if (is_runtime_setup_required()) {
+    // Need to take the slow path, which will call the runtimeSetup() function instead
+    // of <clinit>
+    initialize(CHECK);
+    return;
+  }
   if (log_is_enabled(Info, cds, init)) {
     ResourceMark rm;
     log_info(cds, init)("%s (aot-inited)", external_name());
@@ -878,7 +884,6 @@ void InstanceKlass::initialize_with_aot_initialized_mirror(TRAPS) {
 #endif
 
   set_init_thread(THREAD);
-  AOTClassInitializer::call_runtime_setup(THREAD, this);
   set_initialization_state_and_notify(fully_initialized, CHECK);
 }
 #endif
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 cd97413182b..a759ec6162e 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1526,6 +1526,11 @@ private static NamedFunction createFunction(byte func) {
     }
 
     static {
+        runtimeSetup();
+    }
+
+    // Also called from JVM when loading an AOT cache
+    private static void runtimeSetup() {
         SharedSecrets.setJavaLangInvokeAccess(new JavaLangInvokeAccess() {
             @Override
             public Class<?> getDeclaringClass(Object rmname) {
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index e109b974adc..e3e0258c3c9 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -306,11 +306,11 @@ static void startReferenceHandlerThread(ThreadGroup tg) {
         handler.start();
     }
 
-    // Called from JVM when loading an AOT cache
     static {
         runtimeSetup();
     }
 
+    // Also called from JVM when loading an AOT cache
     private static void runtimeSetup() {
         // provide access in SharedSecrets
         SharedSecrets.setJavaLangRefAccess(new JavaLangRefAccess() {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
index 84f89ebe215..bc07991eeb2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
@@ -33,16 +33,22 @@
  * @build MethodHandleTest
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar mh.jar
  *             MethodHandleTestApp MethodHandleTestApp$A MethodHandleTestApp$B
+ *             UnsupportedBSMs UnsupportedBSMs$MyEnum
+ *             ObjectMethodsTest ObjectMethodsTest$C
  * @run driver MethodHandleTest AOT
  */
 
+import java.io.Serializable;
+import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
+import java.lang.runtime.ObjectMethods;
 import jdk.test.lib.cds.CDSAppTester;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.helpers.ClassFileInstaller;
+import static java.lang.invoke.MethodType.methodType;
 
 public class MethodHandleTest {
     static final String appJar = ClassFileInstaller.getJarPath("mh.jar");
@@ -87,6 +93,7 @@ public String[] appCommandLine(RunMode runMode) {
         @Override
         public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
             out.shouldHaveExitValue(0);
+            out.shouldContain("SwitchBootstraps.typeSwitch: 5678");
 
             if (!runMode.isProductionRun()) {
                 // MethodHandleTestApp should be initialized in the assembly phase as well,
@@ -95,6 +102,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception
             } else {
                 // Make sure MethodHandleTestApp is aot-initialized in the production run.
                 out.shouldNotContain("MethodHandleTestApp.<clinit>");
+                out.shouldContain("intElm = 777");
             }
         }
     }
@@ -141,17 +149,29 @@ static class B {
     static VarHandle staticVH;
     static VarHandle instanceVH;
 
+    static MethodHandle arrayGetMH;
+
+    // Created in assembly phase.
+    // Used in production run.
+    static MethodHandle ObjectMethodsTest_handle;
+
     static {
         System.out.println("MethodHandleTestApp.<clinit>");
 
         try {
-            setupCachedStatics();
+            setupCachedMHs();
+            ObjectMethodsTest_handle = ObjectMethodsTest.makeHandle();
+            UnsupportedBSMs.invokeUnsupportedBSMs();
         } catch (Throwable t) {
             throw new RuntimeException("Unexpected exception", t);
         }
     }
 
-    static void setupCachedStatics() throws Throwable {
+    // This method is executed during the assembly phase.
+    //
+    // Store some MHs into the AOT cache. Make sure they can be used during the production run.
+    // Also check that the class initialization order is consistent with specification.
+    static void setupCachedMHs() 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);
@@ -161,11 +181,13 @@ static void setupCachedStatics() throws Throwable {
         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);
+
+        // Array access MHs
+        arrayGetMH = MethodHandles.arrayElementGetter(int[].class);
     }
 
     private static Object invoke(MethodHandle mh, Object ... args) {
@@ -184,8 +206,11 @@ public static void main(String[] args) throws Throwable {
 
         testMethodHandles(isProduction);
         testVarHandles(isProduction);
-    }
 
+        ObjectMethodsTest.testEqualsC(ObjectMethodsTest_handle);
+
+        UnsupportedBSMs.invokeUnsupportedBSMs();
+    }
 
     static void testMethodHandles(boolean isProduction) throws Throwable {
         state_A = 0;
@@ -212,6 +237,14 @@ static void testMethodHandles(boolean isProduction) throws Throwable {
                 throw new RuntimeException("state_A should be 6 but is: " + state_A);
             }
         }
+
+        // (3) Test an array access MH
+        int[] intArray = new int[] {111, 222, 777};
+        int intElm = (Integer)arrayGetMH.invoke(intArray, 2);
+        System.out.println("intElm = " + intElm);
+        if (intElm != 777) {
+            throw new RuntimeException("intElm should be 777 but is: " + intElm);
+        }
     }
 
     static void testVarHandles(boolean isProduction) throws Throwable {
@@ -246,3 +279,119 @@ static void testVarHandles(boolean isProduction) throws Throwable {
         }
     }
 }
+
+// Excerpt from test/jdk/java/lang/runtime/ObjectMethodsTest.java
+class ObjectMethodsTest {
+    public static class C {
+        static final MethodType EQUALS_DESC = methodType(boolean.class, C.class, Object.class);
+        static final MethodType HASHCODE_DESC = methodType(int.class, C.class);
+        static final MethodType TO_STRING_DESC = methodType(String.class, C.class);
+
+        static final MethodHandle[] ACCESSORS = accessors();
+        static final String NAME_LIST = "x;y";
+        private static MethodHandle[] accessors() {
+            try {
+                return  new MethodHandle[]{
+                        MethodHandles.lookup().findGetter(C.class, "x", int.class),
+                        MethodHandles.lookup().findGetter(C.class, "y", int.class),
+                };
+            } catch (Exception e) {
+                throw new AssertionError(e);
+            }
+        }
+
+        private final int x;
+        private final int y;
+        C (int x, int y) { this.x = x; this.y = y; }
+        public int x() { return x; }
+        public int y() { return y; }
+    }
+
+    public static MethodHandle makeHandle() throws Throwable {
+        MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+
+        CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "equals", C.EQUALS_DESC, C.class, C.NAME_LIST, C.ACCESSORS);
+        return cs.dynamicInvoker();
+    }
+
+    public static void testEqualsC(MethodHandle handle) throws Throwable {
+        C c = new C(5, 5);
+        assertTrue((boolean)handle.invokeExact(c, (Object)c));
+        assertTrue((boolean)handle.invokeExact(c, (Object)new C(5, 5)));
+        assertFalse((boolean)handle.invokeExact(c, (Object)new C(5, 4)));
+        assertFalse((boolean)handle.invokeExact(c, (Object)new C(4, 5)));
+        assertFalse((boolean)handle.invokeExact(c, (Object)null));
+        assertFalse((boolean)handle.invokeExact(c, new Object()));
+    }
+
+    private static void assertTrue(boolean b) {
+        if (b != true) {
+            throw new RuntimeException("Assertion fails");
+        }
+    }
+
+    private static void assertFalse(boolean b) {
+        assertTrue(!b);
+    }
+}
+
+class UnsupportedBSMs {
+    // This method is executed during the assembly phase.
+    //
+    // Try to invoke some BSMs that are normally not executed in the assembly phase. However, these
+    // BSMs may be executed in rare cases (such as when loading signed classes -- see JDK-8353330.)
+    // Let's make sure the assembly phase can tolerate such BSMs, even if the call sites that they
+    // produce are not stored into the AOT cache.
+    //
+    // Hopefully with enough testing in here, we can avoid situations where innocent changes in
+    // core libs might cause the AOT assembly phase to fail.
+    static void invokeUnsupportedBSMs() throws Throwable {
+        int n = testTypeSwitch((Integer)1234);
+        System.out.println("SwitchBootstraps.typeSwitch: " + n);
+        if (n != 5678) {
+            throw new RuntimeException("n should be " + 5678 + " but is: " + n);
+        }
+
+        Object o = getRunnableAndSerializable();
+        System.out.println(o.getClass());
+        if (!(o instanceof Runnable) || !(o instanceof Serializable)) {
+            throw new RuntimeException("o has wrong interfaces");
+        }
+
+        String s = statementEnum(MyEnum.A);
+        if (!s.equals("A")) {
+            throw new RuntimeException("enum switch incorrect");
+        }
+    }
+
+    static int testTypeSwitch(Number n) {
+        // BSM = java/lang/runtime/SwitchBootstraps::typeSwitch
+        return switch (n) {
+            case Integer in -> {
+                yield 5678;
+            }
+            default -> {
+                yield 0;
+            }
+        };
+    }
+
+    static Runnable getRunnableAndSerializable() {
+        // BSM = java/lang/invoke/LambdaMetafactory.altMetafactory
+        return (Runnable & Serializable) () -> {
+            System.out.println("Inside getRunnableAndSerializable");
+        };
+    }
+
+    // Excerpt from test/langtools/tools/javac/patterns/EnumTypeChanges.java
+    enum MyEnum { A, B; }
+    static String statementEnum(MyEnum e) {
+        // BSM = java/lang/runtime/SwitchBootstraps.enumSwitch
+        switch (e) {
+            case A ->  { return "A"; }
+            case B ->  { return "B"; }
+            case MyEnum e1 when e1 == null -> throw new AssertionError();
+            default -> { return "D"; }
+        }
+    }
+}

From c88f94c9d7a12225a3571e0ba5399d4c42eeb707 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 9 May 2025 07:12:51 +0000
Subject: [PATCH 364/901] 8356394: Remove  USE_LIBRARY_BASED_TLS_ONLY macro

Reviewed-by: dholmes, kbarrett, lucy
---
 src/hotspot/share/classfile/symbolTable.cpp | 6 +-----
 src/hotspot/share/runtime/thread.cpp        | 7 -------
 src/hotspot/share/runtime/thread.hpp        | 9 ---------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index 1fd28a1d4e9..e6889e6248d 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -88,13 +88,9 @@ static volatile bool   _has_items_to_clean = false;
 
 static volatile bool _alt_hash = false;
 
-#ifdef USE_LIBRARY_BASED_TLS_ONLY
-static volatile bool _lookup_shared_first = false;
-#else
 // "_lookup_shared_first" can get highly contended with many cores if multiple threads
-// are updating "lookup success history" in a global shared variable. If built-in TLS is available, use it.
+// are updating "lookup success history" in a global shared variable, so use built-in TLS
 static THREAD_LOCAL bool _lookup_shared_first = false;
-#endif
 
 // Static arena for symbols that are not deallocated
 Arena* SymbolTable::_arena = nullptr;
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 400d69ad510..0d245dae857 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -52,10 +52,7 @@
 #include "jfr/jfr.hpp"
 #endif
 
-#ifndef USE_LIBRARY_BASED_TLS_ONLY
-// Current thread is maintained as a thread-local variable
 THREAD_LOCAL Thread* Thread::_thr_current = nullptr;
-#endif
 
 // ======= Thread ========
 // Base class for all threads: VMThread, WatcherThread, ConcurrentMarkSweepThread,
@@ -158,10 +155,8 @@ void Thread::initialize_tlab() {
 }
 
 void Thread::initialize_thread_current() {
-#ifndef USE_LIBRARY_BASED_TLS_ONLY
   assert(_thr_current == nullptr, "Thread::current already initialized");
   _thr_current = this;
-#endif
   assert(ThreadLocalStorage::thread() == nullptr, "ThreadLocalStorage::thread already initialized");
   ThreadLocalStorage::set_thread(this);
   assert(Thread::current() == ThreadLocalStorage::thread(), "TLS mismatch!");
@@ -169,9 +164,7 @@ void Thread::initialize_thread_current() {
 
 void Thread::clear_thread_current() {
   assert(Thread::current() == ThreadLocalStorage::thread(), "TLS mismatch!");
-#ifndef USE_LIBRARY_BASED_TLS_ONLY
   _thr_current = nullptr;
-#endif
   ThreadLocalStorage::set_thread(nullptr);
 }
 
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 81307c4acab..7ab86121b89 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -113,10 +113,8 @@ class Thread: public ThreadShadow {
   friend class JavaThread;
  private:
 
-#ifndef USE_LIBRARY_BASED_TLS_ONLY
   // Current thread is maintained as a thread-local variable
   static THREAD_LOCAL Thread* _thr_current;
-#endif
 
   // On AArch64, the high order 32 bits are used by a "patching epoch" number
   // which reflects if this thread has executed the required fences, after
@@ -660,14 +658,7 @@ inline Thread* Thread::current() {
 }
 
 inline Thread* Thread::current_or_null() {
-#ifndef USE_LIBRARY_BASED_TLS_ONLY
   return _thr_current;
-#else
-  if (ThreadLocalStorage::is_initialized()) {
-    return ThreadLocalStorage::thread();
-  }
-  return nullptr;
-#endif
 }
 
 inline Thread* Thread::current_or_null_safe() {

From 74e981e85509ca072b2a45d529dab3a9883613a2 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Fri, 9 May 2025 08:39:16 +0000
Subject: [PATCH 365/901] 8353735: [JVMCI] Allow specifying storage kind of the
 callee save register

Reviewed-by: dnsimon, cslucas
---
 .../share/classes/jdk/vm/ci/code/RegisterConfig.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
index 09360885c0b..525930c8f3b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, 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
@@ -94,6 +94,16 @@ default int getMaximumFrameSize() {
      */
     RegisterArray getCalleeSaveRegisters();
 
+    /**
+     * Returns the storage kind for a callee-save register, which determines how the register is
+     * saved and restored. For example, according to the Windows x64 ABI, the upper portions of
+     * XMM0-XMM15 are considered destroyed, so saving the full width of these registers is not
+     * necessary.
+     */
+    default PlatformKind getCalleeSaveRegisterStorageKind(Architecture arch, Register calleeSaveRegister) {
+        return arch.getLargestStorableKind(calleeSaveRegister.getRegisterCategory());
+    }
+
     /**
      * Gets a map from register {@linkplain Register#number numbers} to register
      * {@linkplain RegisterAttributes attributes} for this register configuration.

From 3aa2ea7e67c879dafa0f967073c2d8b98d62c996 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 9 May 2025 09:05:10 +0000
Subject: [PATCH 366/901] 8301971: Make JDK source code UTF-8 8338973: Document
 need to have UTF-8 locale available to build the JDK

Reviewed-by: erikj, naoto, mbaesken
---
 .editorconfig                                 |   3 +
 .gitattributes                                |   1 +
 doc/building.html                             |   8 ++
 doc/building.md                               |   5 +
 make/Docs.gmk                                 |   4 +-
 make/autoconf/basic.m4                        |  24 ++++-
 make/autoconf/configure                       |   4 +-
 make/autoconf/flags-cflags.m4                 |  16 ++-
 make/common/JavaCompilation.gmk               |  19 ++--
 make/common/JdkNativeCompilation.gmk          |   2 +
 make/common/support/unicode2x.sed             | 100 ------------------
 .../unix/native/libjava/locale_str.h          |   6 +-
 .../libjava/HostLocaleProviderAdapter_md.c    |   8 +-
 13 files changed, 72 insertions(+), 128 deletions(-)
 delete mode 100644 make/common/support/unicode2x.sed

diff --git a/.editorconfig b/.editorconfig
index 98f07b3c5fb..8cf0bd8d62a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,8 @@
 root = true
 
+[*]
+charset = utf-8
+
 [*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
 trim_trailing_whitespace = true
 
diff --git a/.gitattributes b/.gitattributes
index ebb586628c3..5a18aa21d98 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 *	-text
+*	encoding=utf-8
 *.java	diff=java
 *.c	diff=cpp
 *.h	diff=cpp
diff --git a/doc/building.html b/doc/building.html
index b5d39a68ea8..fde6cde4c32 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -305,6 +305,14 @@ <h3 id="special-considerations">Special Considerations</h3>
 <li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
 file permissions and attributes between Windows and Cygwin are
 consistent. It is recommended that you follow this procedure:</p>
+<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
+typically means that the <code>C.UTF-8</code> or
+<code>en_US.UTF-8</code> locale needs to be available. For Windows
+users, please see the section on <a href="#locale-requirements">Locale
+Requirements</a> below.</p></li>
+<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
+must be taken to make sure the environment is consistent. It is
+recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin
diff --git a/doc/building.md b/doc/building.md
index 61490820061..1a9fe6b2e78 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -83,6 +83,11 @@ on where and how to check out the source code.
   for the source code, see below for suggestions on how to keep the build
   artifacts on a local disk.
 
+* UTF-8 support is needed to compile the JDK. On Unix systems, this typically
+  means that the `C.UTF-8` or `en_US.UTF-8` locale needs to be available. For
+  Windows users, please see the section on [Locale
+  Requirements](#locale-requirements) below.
+
 * On Windows, extra care must be taken to have a smooth building experience:
 
   * Make sure that all relevant paths have short names. Short names are used by
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 2d8ce7c2a69..4733b22b1ad 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -96,14 +96,14 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary --syntax-highlight
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
+    -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 6daba35547b..0e9470a1cff 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -134,17 +134,33 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
   )
   AC_SUBST(BUILD_ENV)
 
+  AC_MSG_CHECKING([for locale to use])
   if test "x$LOCALE" != x; then
     # Check if we actually have C.UTF-8; if so, use it
     if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
       LOCALE_USED=C.UTF-8
+      AC_MSG_RESULT([C.UTF-8 (recommended)])
+    elif $LOCALE -a | $GREP -q -E "^en_US\.(utf8|UTF-8)$"; then
+      LOCALE_USED=en_US.UTF-8
+      AC_MSG_RESULT([en_US.UTF-8 (acceptable fallback)])
     else
-      AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
-      LOCALE_USED=C
+      # As a fallback, check if users locale is UTF-8. USER_LOCALE was saved
+      # by the wrapper configure script before autconf messed up LC_ALL.
+      if $ECHO $USER_LOCALE | $GREP -q -E "\.(utf8|UTF-8)$"; then
+        LOCALE_USED=$USER_LOCALE
+        AC_MSG_RESULT([$USER_LOCALE (untested fallback)])
+        AC_MSG_WARN([Could not find C.UTF-8 or en_US.UTF-8 locale. This is not supported, and the build might fail unexpectedly.])
+      else
+        AC_MSG_RESULT([no UTF-8 locale found])
+        AC_MSG_WARN([No UTF-8 locale found. This is not supported. Proceeding with the C locale, but the build might fail unexpectedly.])
+        LOCALE_USED=C
+      fi
+      AC_MSG_NOTICE([The recommended locale is C.UTF-8, but en_US.UTF-8 is also accepted.])
     fi
   else
-    AC_MSG_WARN([locale command not not found, using C locale])
-    LOCALE_USED=C
+    LOCALE_USED=C.UTF-8
+    AC_MSG_RESULT([C.UTF-8 (default)])
+    AC_MSG_WARN([locale command not not found, using C.UTF-8 locale])
   fi
 
   export LC_ALL=$LOCALE_USED
diff --git a/make/autoconf/configure b/make/autoconf/configure
index 6fa0aacfbc9..443a37bae77 100644
--- a/make/autoconf/configure
+++ b/make/autoconf/configure
@@ -49,7 +49,9 @@ fi
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no
 
-# Make sure all shell commands are executed with the C locale
+# Save user's current locale, but make sure all future shell commands are
+# executed with the C locale
+export USER_LOCALE=$LC_ALL
 export LC_ALL=C
 
 if test "x$CUSTOM_CONFIG_DIR" != x; then
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index bafedddf04f..eb0e5e20e4c 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -573,12 +573,20 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -fvisibility=hidden -fstack-protector"
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
-    # compilation of all source files regardless of the active code page on Windows.
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -Zc:wchar_t-"
   fi
 
+  # Set character encoding in source
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    CHARSET_CFLAGS="-finput-charset=utf-8"
+  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+    # The -utf-8 option sets both source and execution character sets
+    CHARSET_CFLAGS="-utf-8 -validate-charset"
+  fi
+  TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $CHARSET_CFLAGS"
+  TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK $CHARSET_CFLAGS"
+
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     LANGSTD_CFLAGS="-std=c11"
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 70b3557baea..cb647f0ed47 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -80,15 +80,13 @@ endef
 #
 # The sed expression does this:
 # 1. Add a backslash before any :, = or ! that do not have a backslash already.
-# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX
-#    conversions.
-# 3. Delete all lines starting with #.
-# 4. Delete empty lines.
-# 5. Append lines ending with \ with the next line.
-# 6. Remove leading and trailing white space. Note that tabs must be explicit
+# 2. Delete all lines starting with #.
+# 3. Delete empty lines.
+# 4. Append lines ending with \ with the next line.
+# 5. Remove leading and trailing white space. Note that tabs must be explicit
 #    as sed on macosx does not understand '\t'.
-# 7. Replace the first \= with just =.
-# 8. Finally it's all sorted to create a stable output.
+# 6. Replace the first \= with just =.
+# 7. Finally it's all sorted to create a stable output.
 #
 # It is assumed that = is the character used for separating names and values.
 define add_file_to_clean
@@ -108,7 +106,6 @@ define add_file_to_clean
 	( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
 	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
-	    | $(SED) -f "$$(TOPDIR)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
 	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
@@ -265,10 +262,12 @@ define SetupJavaCompilationBody
   endif
 
   # Tell javac to do exactly as told and no more
-  PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii
+  PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true
 
   $1_FLAGS += -g -Xlint:all $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS)
   $1_FLAGS += $$($1_JAVAC_FLAGS)
+  # Set character encoding in source
+  $1_FLAGS += -encoding utf-8
 
   ifeq ($$(JAVA_WARNINGS_AS_ERRORS), true)
     $1_FLAGS += -Werror
diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
index 372ad39305c..0285669ffd8 100644
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -227,6 +227,8 @@ endef
 
 GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
+# \xA9 is the copyright symbol in ANSI encoding (Windows-1252), which rc.exe
+# assumes the resource file is in.
 JDK_RCFLAGS=$(RCFLAGS) \
     -D"JDK_VERSION_STRING=$(VERSION_STRING)" \
     -D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \
diff --git a/make/common/support/unicode2x.sed b/make/common/support/unicode2x.sed
deleted file mode 100644
index 5188b97fe03..00000000000
--- a/make/common/support/unicode2x.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-s/\\u0020/\x20/g
-s/\\u003A/\x3A/g
-s/\\u006B/\x6B/g
-s/\\u0075/\x75/g
-s/\\u00A0/\xA0/g
-s/\\u00A3/\xA3/g
-s/\\u00B0/\xB0/g
-s/\\u00B7/\xB7/g
-s/\\u00BA/\xBA/g
-s/\\u00BF/\xBF/g
-s/\\u00C0/\xC0/g
-s/\\u00C1/\xC1/g
-s/\\u00C2/\xC2/g
-s/\\u00C4/\xC4/g
-s/\\u00C5/\xC5/g
-s/\\u00C8/\xC8/g
-s/\\u00C9/\xC9/g
-s/\\u00CA/\xCA/g
-s/\\u00CD/\xCD/g
-s/\\u00CE/\xCE/g
-s/\\u00D3/\xD3/g
-s/\\u00D4/\xD4/g
-s/\\u00D6/\xD6/g
-s/\\u00DA/\xDA/g
-s/\\u00DC/\xDC/g
-s/\\u00DD/\xDD/g
-s/\\u00DF/\xDF/g
-s/\\u00E0/\xE0/g
-s/\\u00E1/\xE1/g
-s/\\u00E2/\xE2/g
-s/\\u00E3/\xE3/g
-s/\\u00E4/\xE4/g
-s/\\u00E5/\xE5/g
-s/\\u00E6/\xE6/g
-s/\\u00E7/\xE7/g
-s/\\u00E8/\xE8/g
-s/\\u00E9/\xE9/g
-s/\\u00EA/\xEA/g
-s/\\u00EB/\xEB/g
-s/\\u00EC/\xEC/g
-s/\\u00ED/\xED/g
-s/\\u00EE/\xEE/g
-s/\\u00EF/\xEF/g
-s/\\u00F1/\xF1/g
-s/\\u00F2/\xF2/g
-s/\\u00F3/\xF3/g
-s/\\u00F4/\xF4/g
-s/\\u00F5/\xF5/g
-s/\\u00F6/\xF6/g
-s/\\u00F9/\xF9/g
-s/\\u00FA/\xFA/g
-s/\\u00FC/\xFC/g
-s/\\u0020/\x20/g
-s/\\u003f/\x3f/g
-s/\\u006f/\x6f/g
-s/\\u0075/\x75/g
-s/\\u00a0/\xa0/g
-s/\\u00a3/\xa3/g
-s/\\u00b0/\xb0/g
-s/\\u00ba/\xba/g
-s/\\u00bf/\xbf/g
-s/\\u00c1/\xc1/g
-s/\\u00c4/\xc4/g
-s/\\u00c5/\xc5/g
-s/\\u00c8/\xc8/g
-s/\\u00c9/\xc9/g
-s/\\u00ca/\xca/g
-s/\\u00cd/\xcd/g
-s/\\u00d6/\xd6/g
-s/\\u00dc/\xdc/g
-s/\\u00dd/\xdd/g
-s/\\u00df/\xdf/g
-s/\\u00e0/\xe0/g
-s/\\u00e1/\xe1/g
-s/\\u00e2/\xe2/g
-s/\\u00e3/\xe3/g
-s/\\u00e4/\xe4/g
-s/\\u00e5/\xe5/g
-s/\\u00e7/\xe7/g
-s/\\u00e8/\xe8/g
-s/\\u00e9/\xe9/g
-s/\\u00ea/\xea/g
-s/\\u00eb/\xeb/g
-s/\\u00ec/\xec/g
-s/\\u00ed/\xed/g
-s/\\u00ee/\xee/g
-s/\\u00ef/\xef/g
-s/\\u00f0/\xf0/g
-s/\\u00f1/\xf1/g
-s/\\u00f2/\xf2/g
-s/\\u00f3/\xf3/g
-s/\\u00f4/\xf4/g
-s/\\u00f5/\xf5/g
-s/\\u00f6/\xf6/g
-s/\\u00f7/\xf7/g
-s/\\u00f8/\xf8/g
-s/\\u00f9/\xf9/g
-s/\\u00fa/\xfa/g
-s/\\u00fc/\xfc/g
-s/\\u00ff/\xff/g
diff --git a/src/java.base/unix/native/libjava/locale_str.h b/src/java.base/unix/native/libjava/locale_str.h
index 4d85b88ffb7..ea1a8c8fd47 100644
--- a/src/java.base/unix/native/libjava/locale_str.h
+++ b/src/java.base/unix/native/libjava/locale_str.h
@@ -87,7 +87,7 @@
     "zh", "zh_CN",
 #ifdef __linux__
     "bokmal", "nb_NO",
-    "bokm\xE5l", "nb_NO",
+    "bokmål", "nb_NO",
     "catalan", "ca_ES",
     "croatian", "hr_HR",
     "czech", "cs_CZ",
@@ -98,7 +98,7 @@
     "eesti", "et_EE",
     "estonian", "et_EE",
     "finnish", "fi_FI",
-    "fran\xE7\x61is", "fr_FR",
+    "français", "fr_FR",
     "french", "fr_FR",
     "galego", "gl_ES",
     "galician", "gl_ES",
@@ -162,7 +162,7 @@ static char *language_names[] = {
     "deutsch", "de",
     "dutch", "nl",
     "finnish", "fi",
-    "fran\xE7\x61is", "fr",
+    "français", "fr",
     "french", "fr",
     "german", "de",
     "greek", "el",
diff --git a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
index ebbad326146..df5ad1e8911 100644
--- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
+++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
@@ -134,7 +134,7 @@ WCHAR * fixes[2][2][3][16] =
                 L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
             },
             { // currency
-                L"\xA4", L"", L"\xA4 ", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
+                L"¤", L"", L"¤ ", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
             },
             { // percent
                 L"", L"", L"%", L"% ", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
@@ -145,7 +145,7 @@ WCHAR * fixes[2][2][3][16] =
                 L"(", L"-", L"- ", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
             },
             { //currency
-                L"(\xA4", L"-\xA4", L"\xA4-", L"\xA4", L"(", L"-", L"", L"", L"-", L"-\xA4 ", L"", L"\xA4 ", L"\xA4 -", L"", L"(\xA4 ", L"("
+                L"(¤", L"-¤", L"¤-", L"¤", L"(", L"-", L"", L"", L"-", L"-¤ ", L"", L"¤ ", L"¤ -", L"", L"(¤ ", L"("
             },
             { // percent
                 L"-", L"-", L"-%", L"%-", L"%", L"", L"", L"-% ", L"", L"% ", L"% -", L"", L"", L"", L"", L"",
@@ -158,7 +158,7 @@ WCHAR * fixes[2][2][3][16] =
                 L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L""
             },
             { // currency
-                L"", L"\xA4 ", L"", L" \xA4", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
+                L"", L"¤ ", L"", L" ¤", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
             },
             { // percent
                 L" %", L"%", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
@@ -169,7 +169,7 @@ WCHAR * fixes[2][2][3][16] =
                 L")", L"", L" ", L"-", L" -", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"", L"",
             },
             { //currency
-                L")", L"", L"", L"-", L"\xA4)", L"\xA4", L"-\xA4", L"\xA4-", L" \xA4", L"", L" \xA4-", L"-", L"", L"- \xA4", L")", L" \xA4)"
+                L")", L"", L"", L"-", L"¤)", L"¤", L"-¤", L"¤-", L" ¤", L"", L" ¤-", L"-", L"", L"- ¤", L")", L" ¤)"
             },
             { // percent
                 L" %", L"%", L"", L"", L"-", L"-%", L"%-", L"", L" %-", L"-", L"", L"- %", L"", L"", L"", L"",

From a091e2f2810da17ff61a63fd0f1f6538f1bdbb70 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 9 May 2025 09:10:06 +0000
Subject: [PATCH 367/901] 8351029: IncludeCustomExtension does not work on
 cygwin with source code below /home

Reviewed-by: erikj
---
 make/PreInit.gmk                 | 12 ++++++------
 make/PreInitSupport.gmk          |  7 ++++---
 make/common/MakeFileStart.gmk    |  2 +-
 make/common/MakeIncludeStart.gmk |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/make/PreInit.gmk b/make/PreInit.gmk
index a01971e845d..bce61ccde5f 100644
--- a/make/PreInit.gmk
+++ b/make/PreInit.gmk
@@ -161,19 +161,19 @@ ifneq ($(SKIP_SPEC), true)
 	  ( cd $(TOPDIR) && \
 	  $(foreach spec, $(SPECS), \
 	    $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	        SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
-	        main && \
+	        SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
+	        $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
 	    $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
 	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
+	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
 	          COMPARE_BUILD="$(COMPARE_BUILD)" \
 	          pre-compare-build && \
 	      $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
+	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
 	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          main && \
+	          $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
 	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
+	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
 	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
 	          post-compare-build && \
 	    ) \
diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk
index 668363d8725..1d3c3ce9135 100644
--- a/make/PreInitSupport.gmk
+++ b/make/PreInitSupport.gmk
@@ -250,13 +250,14 @@ endef
 # Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
 # Param 2: The SPEC file to use.
 define DefineMainTargets
+  SPEC_FILE := $(strip $2)
 
   # We will start by making sure the main-targets.gmk file is removed, if
   # make has not been restarted. By the -include, we will trigger the
   # rule for generating the file (which is never there since we removed it),
   # thus generating it fresh, and make will restart, incrementing the restart
   # count.
-  main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
+  main_targets_file := $$(dir $$(SPEC_FILE))make-support/main-targets.gmk
 
   ifeq ($$(MAKE_RESTARTS), )
     # Only do this if make has not been restarted, and if we do not force it.
@@ -268,10 +269,10 @@ define DefineMainTargets
   $$(main_targets_file):
 	@( cd $$(TOPDIR) && \
 	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) )
+	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
 	@( cd $$(TOPDIR) && \
 	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
+	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )
 
diff --git a/make/common/MakeFileStart.gmk b/make/common/MakeFileStart.gmk
index f1dd0abb792..f18c623d3e8 100644
--- a/make/common/MakeFileStart.gmk
+++ b/make/common/MakeFileStart.gmk
@@ -47,7 +47,7 @@ endif
 # We need spec.gmk to get $(TOPDIR)
 include $(SPEC)
 
-THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH)))
+THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH))))
 
 ifeq ($(LOG_FLOW), true)
   $(info :Enter $(THIS_MAKEFILE))
diff --git a/make/common/MakeIncludeStart.gmk b/make/common/MakeIncludeStart.gmk
index d09f027c1d3..3904633f9f2 100644
--- a/make/common/MakeIncludeStart.gmk
+++ b/make/common/MakeIncludeStart.gmk
@@ -29,7 +29,7 @@
 
 # Get the next to last word (by prepending a padding element)
 THIS_INCLUDE_PATH := $(word $(words ${MAKEFILE_LIST}),padding ${MAKEFILE_LIST})
-THIS_INCLUDE := $(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH))
+THIS_INCLUDE := $(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH)))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)

From 568dcc15cb1a2c02d6ac4421902d841d256ca1c2 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 9 May 2025 10:05:23 +0000
Subject: [PATCH 368/901] 8334391: JDK build should exclude *-files directories
 for Java source

Reviewed-by: erikj
---
 make/CompileInterimLangtools.gmk    |  3 ++-
 make/CompileJavaModules.gmk         |  1 +
 make/common/JavaCompilation.gmk     | 15 +++++++++++++++
 make/common/native/Paths.gmk        |  7 +++----
 make/modules/java.base/Java.gmk     |  5 -----
 make/modules/java.compiler/Java.gmk |  2 --
 make/modules/java.desktop/Java.gmk  |  9 ---------
 make/modules/jdk.jdi/Java.gmk       |  1 -
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index c869ea160c7..4a2bbaec5b8 100644
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -95,7 +95,7 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun javax/tools/snippet-files, \
+      EXCLUDES := sun, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
@@ -103,6 +103,7 @@ define SetupInterimModule
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
+      EXCLUDE_PATTERNS := -files, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \
       COPY := .gif .png .xml .css .svg .js .js.template .txt .woff .woff2 javax.tools.JavaCompilerTool, \
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index b4a193dfade..1e26fb2b529 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -113,6 +113,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
     EXCLUDES := $(EXCLUDES), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
+    EXCLUDE_PATTERNS := -files, \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
     JAVAC_FLAGS := \
         $(DOCLINT) \
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index cb647f0ed47..c5a74413de1 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -152,6 +152,7 @@ endef
 #   INCLUDE_FILES "com/sun/SolarisFoobar.java" means only compile this file!
 #   EXCLUDE_FILES "com/sun/SolarisFoobar.java" means do not compile this particular file!
 #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
+#   EXCLUDE_PATTERNS Exclude files matching any of these substrings
 #   EXTRA_FILES List of extra source files to include in compilation. Can be used to
 #       specify files that need to be generated by other rules first.
 #   HEADERS path to directory where all generated c-headers are written.
@@ -332,6 +333,20 @@ define SetupJavaCompilationBody
     $1_INCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_INCLUDES))))
   endif
 
+  ifneq ($$($1_EXCLUDE_PATTERNS), )
+    # We must not match the exclude pattern against the src roots, so first
+    # strip the src prefixes from the absolute file paths in SRCS.
+    $1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
+        $$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
+    $1_EXCLUDE_PATTERNS_WITHOUT_ROOTS := $$(call containing, \
+        $$($1_EXCLUDE_PATTERNS), $$($1_SRCS_WITHOUT_ROOTS))
+    # The add back all possible src prefixes; this will generate more paths
+    # than really exists, but it does not matter since we will use this as
+    # input to filter-out.
+    $1_EXCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, \
+        $$($1_EXCLUDE_PATTERNS_WITHOUT_ROOTS)))
+  endif
+
   # Apply include/exclude patterns to java sources
   ifneq ($$($1_EXCLUDE_PATTERN), )
     $1_SRCS := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_SRCS))
diff --git a/make/common/native/Paths.gmk b/make/common/native/Paths.gmk
index ee097b2e134..bdb8828eb32 100644
--- a/make/common/native/Paths.gmk
+++ b/make/common/native/Paths.gmk
@@ -128,10 +128,9 @@ define SetupSourceFiles
   # Extract the C/C++ files.
   ifneq ($$($1_EXCLUDE_PATTERNS), )
     # We must not match the exclude pattern against the src root(s).
-    $1_SRCS_WITHOUT_ROOTS := $$($1_SRCS)
-    $$(foreach i, $$($1_SRC), $$(eval $1_SRCS_WITHOUT_ROOTS := $$(patsubst \
-        $$i/%,%, $$($1_SRCS_WITHOUT_ROOTS))))
-    $1_ALL_EXCLUDE_FILES :=  $$(call containing, $$($1_EXCLUDE_PATTERNS), \
+    $1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
+        $$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
+    $1_ALL_EXCLUDE_FILES := $$(call containing, $$($1_EXCLUDE_PATTERNS), \
         $$($1_SRCS_WITHOUT_ROOTS))
   endif
   ifneq ($$($1_EXCLUDE_FILES), )
diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
index 84344f93409..fc091377456 100644
--- a/make/modules/java.base/Java.gmk
+++ b/make/modules/java.base/Java.gmk
@@ -41,11 +41,6 @@ CLEAN += intrinsic.properties
 EXCLUDE_FILES += \
   $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
 
-EXCLUDES += java/lang/doc-files \
-    java/lang/classfile/snippet-files \
-    java/lang/classfile/components/snippet-files \
-    java/lang/foreign/snippet-files
-
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
 EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
diff --git a/make/modules/java.compiler/Java.gmk b/make/modules/java.compiler/Java.gmk
index cb720672639..d0a1fbf4cd5 100644
--- a/make/modules/java.compiler/Java.gmk
+++ b/make/modules/java.compiler/Java.gmk
@@ -32,6 +32,4 @@
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 
-EXCLUDES += javax/tools/snippet-files
-
 ################################################################################
diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk
index 61c7fa44e0e..bab6186fb0d 100644
--- a/make/modules/java.desktop/Java.gmk
+++ b/make/modules/java.desktop/Java.gmk
@@ -31,15 +31,6 @@ DOCLINT += -Xdoclint:all/protected \
 COPY += .gif .png .wav .txt .xml .css .pf
 CLEAN += iio-plugin.properties cursors.properties
 
-EXCLUDES += \
-    java/awt/doc-files \
-    javax/swing/doc-files \
-    javax/swing/text/doc-files \
-    javax/swing/plaf/synth/doc-files \
-    javax/swing/undo/doc-files \
-    sun/awt/X11/doc-files \
-    #
-
 EXCLUDE_FILES += \
     javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
     javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
diff --git a/make/modules/jdk.jdi/Java.gmk b/make/modules/jdk.jdi/Java.gmk
index d31008c318f..c5e3e715c1a 100644
--- a/make/modules/jdk.jdi/Java.gmk
+++ b/make/modules/jdk.jdi/Java.gmk
@@ -31,7 +31,6 @@ EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
     com/sun/tools/example/debug/gui \
-    com/sun/jdi/doc-files \
     #
 
 EXCLUDE_FILES += jdi-overview.html

From 411a63ea1b0c6e8bfea219427bf1c317c5dadabf Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Fri, 9 May 2025 12:24:28 +0000
Subject: [PATCH 369/901] 8356251: Need minor cleanup for interp_only_mode

Reviewed-by: lmesnik, cjplummer
---
 src/hotspot/share/prims/jvmtiThreadState.cpp        |  9 +++++----
 src/hotspot/share/prims/jvmtiThreadState.hpp        |  4 ++--
 src/hotspot/share/prims/jvmtiThreadState.inline.hpp | 10 +++-------
 src/hotspot/share/runtime/javaThread.hpp            |  6 ++----
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index 40d7800de79..5346f7a860e 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -123,7 +123,7 @@ JvmtiThreadState::JvmtiThreadState(JavaThread* thread, oop thread_oop)
       // Set this only if thread_oop is current thread->jvmti_vthread().
       thread->set_jvmti_thread_state(this);
     }
-    thread->set_interp_only_mode(0);
+    thread->set_interp_only_mode(false);
   }
 }
 
@@ -790,8 +790,9 @@ void JvmtiThreadState::add_env(JvmtiEnvBase *env) {
 
 void JvmtiThreadState::enter_interp_only_mode() {
   assert(_thread != nullptr, "sanity check");
+  assert(!is_interp_only_mode(), "entering interp only when in interp only mode");
   _seen_interp_only_mode = true;
-  _thread->increment_interp_only_mode();
+  _thread->set_interp_only_mode(true);
   invalidate_cur_stack_depth();
 }
 
@@ -799,9 +800,9 @@ void JvmtiThreadState::leave_interp_only_mode() {
   assert(is_interp_only_mode(), "leaving interp only when not in interp only mode");
   if (_thread == nullptr) {
     // Unmounted virtual thread updates the saved value.
-    --_saved_interp_only_mode;
+    _saved_interp_only_mode = 0;
   } else {
-    _thread->decrement_interp_only_mode();
+    _thread->set_interp_only_mode(false);
   }
 }
 
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index 53144607a3c..cb0a779bd5a 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp
@@ -193,6 +193,7 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
   bool              _pending_step_for_popframe;
   bool              _pending_step_for_earlyret;
   bool              _top_frame_is_exiting;
+  bool              _saved_interp_only_mode;
   int               _hide_level;
 
  public:
@@ -213,7 +214,6 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
 
   // This is only valid when is_interp_only_mode() returns true
   int               _cur_stack_depth;
-  int               _saved_interp_only_mode;
 
   JvmtiThreadEventEnable _thread_event_enable;
 
@@ -275,7 +275,7 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
 
   // Used by the interpreter for fullspeed debugging support
   bool is_interp_only_mode()                {
-    return _thread == nullptr ?  _saved_interp_only_mode != 0 : _thread->is_interp_only_mode();
+    return _thread == nullptr ? _saved_interp_only_mode : _thread->is_interp_only_mode();
   }
   void enter_interp_only_mode();
   void leave_interp_only_mode();
diff --git a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
index 220001bb1b6..5f9aa842d15 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
@@ -144,13 +144,13 @@ inline void JvmtiThreadState::unbind_from(JvmtiThreadState* state, JavaThread* t
     return;
   }
   // Save thread's interp_only_mode.
-  state->_saved_interp_only_mode = thread->get_interp_only_mode();
+  state->_saved_interp_only_mode = thread->is_interp_only_mode();
   state->set_thread(nullptr);  // Make sure stale _thread value is never used.
 }
 
 inline void JvmtiThreadState::bind_to(JvmtiThreadState* state, JavaThread* thread) {
   // Restore thread's interp_only_mode.
-  thread->set_interp_only_mode(state == nullptr ? 0 : state->_saved_interp_only_mode);
+  thread->set_interp_only_mode(state != nullptr && state->_saved_interp_only_mode);
 
   // Make continuation notice the interp_only_mode change.
   Continuation::set_cont_fastpath_thread_state(thread);
@@ -168,11 +168,7 @@ inline void JvmtiThreadState::process_pending_interp_only(JavaThread* current) {
   JvmtiThreadState* state = current->jvmti_thread_state();
 
   if (state != nullptr && state->is_pending_interp_only_mode()) {
-    MutexLocker mu(JvmtiThreadState_lock);
-    state = current->jvmti_thread_state();
-    if (state != nullptr && state->is_pending_interp_only_mode()) {
-      JvmtiEventController::enter_interp_only_mode(state);
-    }
+    JvmtiEventController::enter_interp_only_mode(state);
   }
 }
 #endif // SHARE_PRIMS_JVMTITHREADSTATE_INLINE_HPP
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 8c62319f8dc..ab3b3611f1d 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -1167,16 +1167,14 @@ class JavaThread: public Thread {
   // It can be set to zero asynchronously to this threads execution (i.e., without
   // safepoint/handshake or a lock) so we have to be very careful.
   // Accesses by other threads are synchronized using JvmtiThreadState_lock though.
+  // This field is checked by the interpreter which expects it to be an integer.
   int               _interp_only_mode;
 
  public:
   // used by the interpreter for fullspeed debugging support (see above)
   static ByteSize interp_only_mode_offset() { return byte_offset_of(JavaThread, _interp_only_mode); }
   bool is_interp_only_mode()                { return (_interp_only_mode != 0); }
-  int get_interp_only_mode()                { return _interp_only_mode; }
-  int set_interp_only_mode(int val)         { return _interp_only_mode = val; }
-  void increment_interp_only_mode()         { ++_interp_only_mode; }
-  void decrement_interp_only_mode()         { --_interp_only_mode; }
+  void set_interp_only_mode(bool val)       { _interp_only_mode = val ? 1 : 0; }
 
   // support for cached flag that indicates whether exceptions need to be posted for this thread
   // if this is false, we can avoid deoptimizing when events are thrown

From 9ebb5d42d43a743cf3a5197c7dabe46ac8120474 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Fri, 9 May 2025 15:05:09 +0000
Subject: [PATCH 370/901] 8346255:
 java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java finds no
 deadlock

Reviewed-by: kevinw, dholmes, alanb
---
 .../ThreadMXBean/VirtualThreadDeadlocks.java      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java
index 91b31c41be3..23a5b53fbb2 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreadDeadlocks.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
@@ -47,6 +47,7 @@
 import java.lang.management.ThreadMXBean;
 import java.util.Arrays;
 import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 import jdk.test.lib.thread.VThreadRunner;   // ensureParallelism requires jdk.management
 
@@ -55,6 +56,8 @@ public class VirtualThreadDeadlocks {
     private static final Object LOCK2 = new Object();
 
     private static final CyclicBarrier barrier = new CyclicBarrier(2);
+    private static final AtomicBoolean reached1 = new AtomicBoolean();
+    private static final AtomicBoolean reached2 = new AtomicBoolean();
 
     /**
      * PP = test deadlock with two platform threads
@@ -72,6 +75,7 @@ public static void main(String[] args) throws Exception {
         Thread thread1 = builder1.start(() -> {
             synchronized (LOCK1) {
                 try { barrier.await(); } catch (Exception ie) {}
+                reached1.set(true);
                 synchronized (LOCK2) { }
             }
         });
@@ -84,14 +88,15 @@ public static void main(String[] args) throws Exception {
         Thread thread2 = builder2.start(() -> {
             synchronized (LOCK2) {
                 try { barrier.await(); } catch (Exception ie) {}
+                reached2.set(true);
                 synchronized (LOCK1) { }
             }
         });
         System.out.println("thread2 => " + thread2);
 
         System.out.println("Waiting for thread1 and thread2 to deadlock ...");
-        awaitBlocked(thread1);
-        awaitBlocked(thread2);
+        awaitTrueAndBlocked(thread1, reached1);
+        awaitTrueAndBlocked(thread2, reached2);
 
         ThreadMXBean bean = ManagementFactory.getPlatformMXBean(ThreadMXBean.class);
         long[] deadlockedThreads = sorted(bean.findMonitorDeadlockedThreads());
@@ -108,8 +113,8 @@ public static void main(String[] args) throws Exception {
             throw new RuntimeException("Unexpected result");
     }
 
-    private static void awaitBlocked(Thread thread) throws InterruptedException {
-        while (thread.getState() != Thread.State.BLOCKED) {
+    private static void awaitTrueAndBlocked(Thread thread, AtomicBoolean flag) throws InterruptedException {
+        while (!flag.get() || thread.getState() != Thread.State.BLOCKED) {
             Thread.sleep(10);
             if (!thread.isAlive()) {
                 throw new RuntimeException("Thread " + thread + " is terminated.");

From 0e0bd642aba3ac859043fc9505343d06d780f13a Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Fri, 9 May 2025 15:45:25 +0000
Subject: [PATCH 371/901] 8356441: IllegalStateException in
 RichDiagnosticFormatter after JDK-8355065

Reviewed-by: liach, mcimadamore
---
 .../javac/util/RichDiagnosticFormatter.java   |  35 +++---
 ...atterWithTypeAnnotationsReentrantTest.java | 115 ++++++++++++++++++
 2 files changed, 130 insertions(+), 20 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsReentrantTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
index 512fa0e07e3..f2ae7d8b581 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
@@ -32,6 +32,7 @@
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import com.sun.tools.javac.code.Printer;
 import com.sun.tools.javac.code.Symbol;
@@ -102,17 +103,17 @@ public Map<Type, JCDiagnostic> get(WhereClauseKind kind) {
     /* map for keeping track of a where clause associated to a given type */
     WhereClauses whereClauses;
 
-    private void enter() {
-        if (nameSimplifier != null || whereClauses != null) {
-            throw new IllegalStateException();
+    private String enter(Supplier<String> r) {
+        ClassNameSimplifier nameSimplifier = this.nameSimplifier;
+        WhereClauses whereClauses = this.whereClauses;
+        try {
+            this.nameSimplifier = new ClassNameSimplifier();
+            this.whereClauses = new WhereClauses();
+            return r.get();
+        } finally {
+            this.nameSimplifier = nameSimplifier;
+            this.whereClauses = whereClauses;
         }
-        nameSimplifier = new ClassNameSimplifier();
-        whereClauses = new WhereClauses();
-    }
-
-    private void exit() {
-        nameSimplifier = null;
-        whereClauses = null;
     }
 
     /** Get the DiagnosticFormatter instance for this context. */
@@ -136,8 +137,7 @@ protected RichDiagnosticFormatter(Context context) {
 
     @Override
     public String format(JCDiagnostic diag, Locale l) {
-        enter();
-        try {
+        return enter(() -> {
             StringBuilder sb = new StringBuilder();
             preprocessDiagnostic(diag);
             sb.append(formatter.format(diag, l));
@@ -153,20 +153,15 @@ public String format(JCDiagnostic diag, Locale l) {
                 }
             }
             return sb.toString();
-        } finally {
-            exit();
-        }
+        });
     }
 
     @Override
     public String formatMessage(JCDiagnostic diag, Locale l) {
-        enter();
-        try {
+        return enter(() -> {
             preprocessDiagnostic(diag);
             return super.formatMessage(diag, l);
-        } finally {
-            exit();
-        }
+        });
     }
 
     /**
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsReentrantTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsReentrantTest.java
new file mode 100644
index 00000000000..8b0afb50e65
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/RichFormatterWithTypeAnnotationsReentrantTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2025, Google LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8356441
+ * @summary Recursive formatting in RichDiagnosticFormatter
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.main jdk.compiler/com.sun.tools.javac.api
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main RichFormatterWithTypeAnnotationsReentrantTest
+ */
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+public class RichFormatterWithTypeAnnotationsReentrantTest extends TestRunner {
+    ToolBox tb;
+
+    public RichFormatterWithTypeAnnotationsReentrantTest() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String[] args) throws Exception {
+        new RichFormatterWithTypeAnnotationsReentrantTest()
+                .runTests(m -> new Object[] {Paths.get(m.getName())});
+    }
+
+    @Test
+    public void test(Path base) throws Exception {
+        Path libClasses = base.resolve("libclasses");
+        Files.createDirectories(libClasses);
+        new JavacTask(tb)
+                .outdir(libClasses)
+                .sources(
+                        """
+                        package lib;
+                        enum Bar {
+                          BAZ
+                        }
+                        """,
+                        """
+                        package lib;
+                        import java.lang.annotation.ElementType;
+                        import java.lang.annotation.Retention;
+                        import java.lang.annotation.RetentionPolicy;
+                        import java.lang.annotation.Target;
+
+                        @Retention(RetentionPolicy.RUNTIME)
+                        @interface Foo {
+                          Bar value();
+                        }
+                        """,
+                        """
+                        package lib;
+                        import java.lang.annotation.ElementType;
+                        import java.lang.annotation.Retention;
+                        import java.lang.annotation.RetentionPolicy;
+                        import java.lang.annotation.Target;
+
+                        @Retention(RetentionPolicy.RUNTIME)
+                        @Target({ElementType.TYPE_USE, ElementType.PARAMETER})
+                        @Foo(Bar.BAZ)
+                        @interface A {}
+                        """,
+                        """
+                        package lib;
+                        public interface M {
+                          String f(@A String k, @A String v);
+                        }
+                        """)
+                .run()
+                .writeAll();
+        Files.delete(libClasses.resolve("lib").resolve("Bar.class"));
+        String code =
+                """
+                import lib.M;
+                class T implements M {
+                }
+                """;
+        // verify that the compilation fails wtih an error, and does not crash
+        new JavacTask(tb)
+                .classpath(libClasses)
+                .sources(code)
+                .run(Task.Expect.FAIL);
+    }
+}

From 5f00c877e26f1716da231771b611234db5607fa7 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 9 May 2025 16:16:56 +0000
Subject: [PATCH 372/901] 8356450: NPE in CLDRTimeZoneNameProviderImpl for
 tzdata downgrades after JDK-8342550

Reviewed-by: bpb, jlu, joehw
---
 .../sun/util/cldr/CLDRTimeZoneNameProviderImpl.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
index ae5e64280bc..2ca99f6b618 100644
--- a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
+++ b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
@@ -93,8 +93,7 @@ protected String[] getDisplayNameArray(String id, Locale locale) {
                 switch (namesSuper[i]) {
                 case "":
                     // Fill in empty elements
-                    deriveFallbackName(namesSuper, i, locale,
-                                       ZoneInfo.getTimeZone(id).toZoneId().getRules().isFixedOffset());
+                    deriveFallbackName(namesSuper, i, locale, isFixedOffset(id));
                     break;
                 case NO_INHERITANCE_MARKER:
                     // CLDR's "no inheritance marker"
@@ -132,7 +131,7 @@ protected String[][] getZoneStrings(Locale locale) {
 
     // Derive fallback time zone name according to LDML's logic
     private void deriveFallbackNames(String[] names, Locale locale) {
-        boolean noDST = ZoneInfo.getTimeZone(names[0]).toZoneId().getRules().isFixedOffset();
+        boolean noDST = isFixedOffset(names[0]);
 
         for (int i = INDEX_STD_LONG; i <= INDEX_GEN_SHORT; i++) {
             deriveFallbackName(names, i, locale, noDST);
@@ -312,4 +311,11 @@ private String toGMTFormat(String id, boolean daylight, Locale l) {
                     String.format(l, hourFormat, offset / 60, offset % 60));
         }
     }
+
+    // ZoneInfo.getTimeZone() may return null if the tzdata has been
+    // forcibly downgraded to an older release using TZUpdater
+    private boolean isFixedOffset(String id) {
+        var zi = ZoneInfo.getTimeZone(id);
+        return zi == null || zi.toZoneId().getRules().isFixedOffset();
+    }
 }

From dd25799c21529bf8dac49a63ddbcab530af0215b Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 9 May 2025 16:17:14 +0000
Subject: [PATCH 373/901] 8356212:
 runtime/cds/appcds/LotsOfSyntheticClasses.java timed out with
 -XX:+AOTClassLinking

Reviewed-by: iklam, shade, syan
---
 .../cds/appcds/LotsOfSyntheticClasses.java    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java
index 96d2dc0d6ee..6267c6bdf33 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LotsOfSyntheticClasses.java
@@ -42,9 +42,12 @@
 
 public class LotsOfSyntheticClasses {
 
-    // Generate 100 top-level classes, each containing 1000 nested classes.
-    // 100K total classes are more than enough to push the CDS limits.
-    private static final int NUM_CLASSES = 100;
+    // Generate 70 top-level classes, each containing 1000 nested classes.
+    // 70K total classes is enough to push the CDS limits. Any archived
+    // collection that holds Classes should not have backing storage larger
+    // than CDS archival limit (256KB). This means we want at least 64K classes
+    // to probe that limit.
+    private static final int NUM_CLASSES = 70;
     private static final int NUM_NESTED_CLASSES = 1000;
 
     private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
@@ -117,7 +120,11 @@ public static void main(String[] args) throws Exception {
             OutputAnalyzer output = TestCommon.createArchive(
                 APP_JAR.toString(),
                 listAppClasses(),
-                MAIN_CLASS_NAME
+                MAIN_CLASS_NAME,
+                // Verification for lots of classes slows down the test.
+                "-XX:+IgnoreUnrecognizedVMOptions",
+                "-XX:-VerifyDependencies",
+                "-XX:-VerifyBeforeExit"
             );
             TestCommon.checkDump(output);
         }
@@ -125,9 +132,10 @@ public static void main(String[] args) throws Exception {
         // Step 3. Try to run, touching every class.
         {
             TestCommon.run(
-                // Verifying dependencies for lots of classes slows down the test.
-                "-XX:+IgnoreUnrecognizedVMOptions", "-XX:-VerifyDependencies",
-                "-Xlog:cds",
+                // Verification for lots of classes slows down the test.
+                "-XX:+IgnoreUnrecognizedVMOptions",
+                "-XX:-VerifyDependencies",
+                "-XX:-VerifyBeforeExit",
                 "-cp", APP_JAR.toString(),
                 MAIN_CLASS_NAME).
                     assertNormalExit("Success");

From bed29a03d198a9717f7d258ee21330462775136e Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Fri, 9 May 2025 16:35:51 +0000
Subject: [PATCH 374/901] 8356555: Incorrect use of {@link} in BigDecimal

Reviewed-by: bpb, nbenalla, liach, iris
---
 src/java.base/share/classes/java/math/BigDecimal.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index c710d67ec52..dd6253a7132 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -105,8 +105,8 @@
  * considers members of the same cohort to be equal to each other. In
  * contrast, the {@link equals equals} method requires both the
  * numerical value and representation to be the same for equality to
- * hold. The results of methods like {@link scale} and {@link
- * unscaledValue} will differ for numerically equal values with
+ * hold. The results of methods like {@link #scale()} and {@link
+ * #unscaledValue()} will differ for numerically equal values with
  * different representations.
  *
  * <p>In general the rounding modes and precision setting determine
@@ -360,10 +360,10 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
     private final BigInteger intVal;
 
     /**
-     * The scale of this BigDecimal, as returned by {@link #scale}.
+     * The scale of this BigDecimal, as returned by {@link #scale()}.
      *
      * @serial
-     * @see #scale
+     * @see #scale()
      */
     private final int scale;  // Note: this may have any value, so
                               // calculations must be done in longs

From 2661f62ca23f5589538d4ad50078d1f715ade342 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Fri, 9 May 2025 16:42:49 +0000
Subject: [PATCH 375/901] 8356036: (fs) FileKey.hashCode and
 UnixFileStore.hashCode implementations can use Long.hashCode

Reviewed-by: liach, bpb
---
 src/java.base/unix/classes/sun/nio/ch/FileKey.java       | 3 +--
 src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java   | 3 +--
 src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/ch/FileKey.java b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
index 119abe4a3b5..f08d92dc06b 100644
--- a/src/java.base/unix/classes/sun/nio/ch/FileKey.java
+++ b/src/java.base/unix/classes/sun/nio/ch/FileKey.java
@@ -49,8 +49,7 @@ public static FileKey create(FileDescriptor fd) throws IOException {
 
     @Override
     public int hashCode() {
-        return (int)(st_dev ^ (st_dev >>> 32)) +
-               (int)(st_ino ^ (st_ino >>> 32));
+        return Long.hashCode(st_dev) + Long.hashCode(st_ino);
     }
 
     @Override
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
index 29b1325f3e6..60c7e2a96f8 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
@@ -40,8 +40,7 @@ class UnixFileKey {
 
     @Override
     public int hashCode() {
-        return (int)(st_dev ^ (st_dev >>> 32)) +
-               (int)(st_ino ^ (st_ino >>> 32));
+        return Long.hashCode(st_dev) + Long.hashCode(st_ino);
     }
 
     @Override
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
index 4311cd6c646..1d16af23460 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
@@ -241,7 +241,7 @@ public boolean equals(Object ob) {
 
     @Override
     public int hashCode() {
-        return (int)(dev ^ (dev >>> 32)) ^ Arrays.hashCode(entry.dir());
+        return Long.hashCode(dev) ^ Arrays.hashCode(entry.dir());
     }
 
     @Override

From 601f05e06d3c364ab5b151785d4ac49183cf61b5 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 9 May 2025 16:47:06 +0000
Subject: [PATCH 376/901] 8352480: Don't follow symlinks in additional content
 for app images

Reviewed-by: asemenyuk
---
 .../internal/AbstractAppImageBuilder.java     |   6 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  |   4 +-
 .../tools/jpackage/share/AppContentTest.java  | 101 ++++++++++++------
 3 files changed, 72 insertions(+), 39 deletions(-)

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 9575e6ccb03..09d4ca5aefa 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.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,6 +28,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Map;
@@ -107,7 +108,8 @@ protected void copyApplication(Map<String, ? super Object> params)
         List<String> items = APP_CONTENT.fetchFrom(params);
         for (String item : items) {
             FileUtils.copyRecursive(Path.of(item),
-                appLayout.contentDirectory().resolve(Path.of(item).getFileName()));
+                appLayout.contentDirectory().resolve(Path.of(item).getFileName()),
+                LinkOption.NOFOLLOW_LINKS);
         }
     }
 
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 7e057a6a727..7b676737ed3 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -178,7 +178,7 @@ static PackageHandlers createDmgPackageHandlers() {
     private static int installDmg(JPackageCommand cmd) {
         cmd.verifyIsOfType(PackageType.MAC_DMG);
         withExplodedDmg(cmd, dmgImage -> {
-            Executor.of("sudo", "cp", "-r")
+            Executor.of("sudo", "cp", "-R")
                     .addArgument(dmgImage)
                     .addArgument(getInstallationDirectory(cmd).getParent())
                     .execute(0);
@@ -205,7 +205,7 @@ private static Path unpackDmg(JPackageCommand cmd, Path destinationDir) {
         }
 
         withExplodedDmg(cmd, dmgImage -> {
-            Executor.of("cp", "-r")
+            Executor.of("cp", "-R")
             .addArgument(dmgImage)
             .addArgument(unpackDir)
             .execute();
diff --git a/test/jdk/tools/jpackage/share/AppContentTest.java b/test/jdk/tools/jpackage/share/AppContentTest.java
index c14cd50cc11..ef34c375fc3 100644
--- a/test/jdk/tools/jpackage/share/AppContentTest.java
+++ b/test/jdk/tools/jpackage/share/AppContentTest.java
@@ -21,17 +21,20 @@
  * questions.
  */
 
+import static jdk.internal.util.OperatingSystem.LINUX;
+import static jdk.internal.util.OperatingSystem.MACOS;
+import static java.util.stream.Collectors.joining;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.Annotations.Parameters;
+import jdk.jpackage.test.Annotations.Parameter;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import static java.util.stream.Collectors.joining;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.FileUtils;
 import jdk.jpackage.internal.util.function.ThrowingFunction;
@@ -56,6 +59,7 @@ public class AppContentTest {
 
     private static final String TEST_JAVA = "apps/PrintEnv.java";
     private static final String TEST_DUKE = "apps/dukeplug.png";
+    private static final String TEST_DUKE_LINK = "dukeplugLink.txt";
     private static final String TEST_DIR = "apps";
     private static final String TEST_BAD = "non-existant";
 
@@ -67,24 +71,20 @@ public class AppContentTest {
     // Need to prepare arguments for `--app-content` accordingly.
     private static final boolean copyInResources = TKit.isOSX();
 
-    private final List<String> testPathArgs;
-
-    @Parameters
-    public static Collection<?> data() {
-        return List.of(new String[][]{
-            {TEST_JAVA, TEST_DUKE}, // include two files in two options
-            {TEST_JAVA, TEST_BAD},  // try to include non-existant content
-            {TEST_JAVA + "," + TEST_DUKE, TEST_DIR}, // two files in one option,
-                                            // and a dir tree in another option.
-        });
-    }
-
-    public AppContentTest(String... testPathArgs) {
-        this.testPathArgs = List.of(testPathArgs);
-    }
+    private static final String RESOURCES_DIR = "Resources";
+    private static final String LINKS_DIR = "Links";
 
     @Test
-    public void test() throws Exception {
+    // include two files in two options
+    @Parameter({TEST_JAVA, TEST_DUKE})
+    // try to include non-existant content
+    @Parameter({TEST_JAVA, TEST_BAD})
+     // two files in one option and a dir tree in another option.
+    @Parameter({TEST_JAVA + "," + TEST_DUKE, TEST_DIR})
+     // include one file and one link to the file
+    @Parameter(value = {TEST_JAVA, TEST_DUKE_LINK}, ifOS = {MACOS,LINUX})
+    public void test(String... args) throws Exception {
+        final List<String> testPathArgs = List.of(args);
         final int expectedJPackageExitCode;
         if (testPathArgs.contains(TEST_BAD)) {
             expectedJPackageExitCode = 1;
@@ -98,15 +98,19 @@ public void test() throws Exception {
             .addRunOnceInitializer(appContentInitializer::initAppContent)
             .addInitializer(appContentInitializer::applyTo)
             .addInstallVerifier(cmd -> {
-                Path baseDir = getAppContentRoot(cmd);
                 for (String arg : testPathArgs) {
                     List<String> paths = Arrays.asList(arg.split(","));
                     for (String p : paths) {
                         Path name = Path.of(p).getFileName();
-                        TKit.assertPathExists(baseDir.resolve(name), true);
+                        if (isSymlinkPath(name)) {
+                            TKit.assertSymbolicLinkExists(getAppContentRoot(cmd)
+                                .resolve(LINKS_DIR).resolve(name));
+                        } else {
+                            TKit.assertPathExists(getAppContentRoot(cmd)
+                                .resolve(name), true);
+                        }
                     }
                 }
-
             })
             .setExpectedExitCode(expectedJPackageExitCode)
             .run();
@@ -115,12 +119,16 @@ public void test() throws Exception {
     private static Path getAppContentRoot(JPackageCommand cmd) {
         Path contentDir = cmd.appLayout().contentDirectory();
         if (copyInResources) {
-            return contentDir.resolve("Resources");
+            return contentDir.resolve(RESOURCES_DIR);
         } else {
             return contentDir;
         }
     }
 
+    private static boolean isSymlinkPath(Path v) {
+        return v.getFileName().toString().contains("Link");
+    }
+
     private static final class AppContentInitializer {
         AppContentInitializer(List<String> appContentArgs) {
             appContentPathGroups = appContentArgs.stream().map(arg -> {
@@ -144,7 +152,7 @@ void applyTo(JPackageCommand cmd) {
         }
 
         private static Path copyAppContentPath(Path appContentPath) throws IOException {
-            var appContentArg = TKit.createTempDirectory("app-content").resolve("Resources");
+            var appContentArg = TKit.createTempDirectory("app-content").resolve(RESOURCES_DIR);
             var srcPath = TKit.TEST_SRC_ROOT.resolve(appContentPath);
             var dstPath = appContentArg.resolve(srcPath.getFileName());
             Files.createDirectories(dstPath.getParent());
@@ -152,20 +160,43 @@ private static Path copyAppContentPath(Path appContentPath) throws IOException {
             return appContentArg;
         }
 
-        private static List<Path> initAppContentPaths(List<Path> appContentPaths) {
+        private static Path createAppContentLink(Path appContentPath) throws IOException {
+            var appContentArg = TKit.createTempDirectory("app-content");
             if (copyInResources) {
-                return appContentPaths.stream().map(appContentPath -> {
-                    if (appContentPath.endsWith(TEST_BAD)) {
-                        return appContentPath;
-                    } else {
-                        return ThrowingFunction.toFunction(
-                                AppContentInitializer::copyAppContentPath).apply(
-                                        appContentPath);
-                    }
-                }).toList();
-            } else {
-                return appContentPaths.stream().map(TKit.TEST_SRC_ROOT::resolve).toList();
+                appContentArg = appContentArg.resolve(RESOURCES_DIR).resolve(LINKS_DIR);
+            }   else {
+                appContentArg = appContentArg.resolve(LINKS_DIR);
             }
+
+            var dstPath = appContentArg.resolve(appContentPath.getFileName());
+            Files.createDirectories(dstPath.getParent());
+
+            // Create target file for a link
+            String tagetName = dstPath.getFileName().toString().replace("Link", "");
+            Path targetPath = dstPath.getParent().resolve(tagetName);
+            Files.write(targetPath, "foo".getBytes());
+            // Create link
+            Files.createSymbolicLink(dstPath, targetPath.getFileName());
+
+            return appContentArg;
+        }
+
+        private static List<Path> initAppContentPaths(List<Path> appContentPaths) {
+            return appContentPaths.stream().map(appContentPath -> {
+                if (appContentPath.endsWith(TEST_BAD)) {
+                    return appContentPath;
+                } else if (isSymlinkPath(appContentPath)) {
+                    return ThrowingFunction.toFunction(
+                            AppContentInitializer::createAppContentLink).apply(
+                                    appContentPath);
+                } else if (copyInResources) {
+                    return ThrowingFunction.toFunction(
+                            AppContentInitializer::copyAppContentPath).apply(
+                                    appContentPath);
+                } else {
+                    return TKit.TEST_SRC_ROOT.resolve(appContentPath);
+                }
+            }).toList();
         }
 
         private List<String> jpackageArgs;

From 1c5eb370b7dbe7558b535bf27c9df292c2007b9b Mon Sep 17 00:00:00 2001
From: Fabio Romano <fabio19298@gmail.com>
Date: Fri, 9 May 2025 17:06:33 +0000
Subject: [PATCH 377/901] 8355719: Reduce memory consumption of
 BigInteger.pow()

Reviewed-by: rgiulietti
---
 .../share/classes/java/math/BigInteger.java   | 189 +++++++++---------
 .../bench/java/math/BigIntegerPow.java        | 189 ++++++++++++++++++
 2 files changed, 280 insertions(+), 98 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/math/BigIntegerPow.java

diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index fb6d1eca3f5..b0a7f784aab 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.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
@@ -1246,6 +1246,16 @@ else if (val < 0 && val >= -MAX_CONSTANT)
         return new BigInteger(val);
     }
 
+    /**
+     * Constructs a BigInteger with magnitude specified by the long,
+     * which may not be zero, and the signum specified by the int.
+     */
+    private BigInteger(long mag, int signum) {
+        assert mag != 0 && signum != 0;
+        this.signum = signum;
+        this.mag = toMagArray(mag);
+    }
+
     /**
      * Constructs a BigInteger with the specified value, which may not be zero.
      */
@@ -1256,16 +1266,14 @@ private BigInteger(long val) {
         } else {
             signum = 1;
         }
+        mag = toMagArray(val);
+    }
 
-        int highWord = (int)(val >>> 32);
-        if (highWord == 0) {
-            mag = new int[1];
-            mag[0] = (int)val;
-        } else {
-            mag = new int[2];
-            mag[0] = highWord;
-            mag[1] = (int)val;
-        }
+    private static int[] toMagArray(long mag) {
+        int highWord = (int) (mag >>> 32);
+        return highWord == 0
+                ? new int[] { (int) mag }
+                : new int[] { highWord, (int) mag };
     }
 
     /**
@@ -2589,116 +2597,101 @@ public BigInteger pow(int exponent) {
         if (exponent < 0) {
             throw new ArithmeticException("Negative exponent");
         }
-        if (signum == 0) {
-            return (exponent == 0 ? ONE : this);
-        }
+        if (exponent == 0 || this.equals(ONE))
+            return ONE;
+
+        if (signum == 0 || exponent == 1)
+            return this;
 
-        BigInteger partToSquare = this.abs();
+        BigInteger base = this.abs();
+        final boolean negative = signum < 0 && (exponent & 1) == 1;
 
         // Factor out powers of two from the base, as the exponentiation of
         // these can be done by left shifts only.
         // The remaining part can then be exponentiated faster.  The
         // powers of two will be multiplied back at the end.
-        int powersOfTwo = partToSquare.getLowestSetBit();
-        long bitsToShiftLong = (long)powersOfTwo * exponent;
-        if (bitsToShiftLong > Integer.MAX_VALUE) {
+        final int powersOfTwo = base.getLowestSetBit();
+        final long bitsToShiftLong = (long) powersOfTwo * exponent;
+        final int bitsToShift = (int) bitsToShiftLong;
+        if (bitsToShift != bitsToShiftLong) {
             reportOverflow();
         }
-        int bitsToShift = (int)bitsToShiftLong;
 
-        int remainingBits;
-
-        // Factor the powers of two out quickly by shifting right, if needed.
-        if (powersOfTwo > 0) {
-            partToSquare = partToSquare.shiftRight(powersOfTwo);
-            remainingBits = partToSquare.bitLength();
-            if (remainingBits == 1) {  // Nothing left but +/- 1?
-                if (signum < 0 && (exponent&1) == 1) {
-                    return NEGATIVE_ONE.shiftLeft(bitsToShift);
-                } else {
-                    return ONE.shiftLeft(bitsToShift);
-                }
-            }
-        } else {
-            remainingBits = partToSquare.bitLength();
-            if (remainingBits == 1) { // Nothing left but +/- 1?
-                if (signum < 0  && (exponent&1) == 1) {
-                    return NEGATIVE_ONE;
-                } else {
-                    return ONE;
-                }
-            }
-        }
+        // Factor the powers of two out quickly by shifting right.
+        base = base.shiftRight(powersOfTwo);
+        final int remainingBits = base.bitLength();
+        if (remainingBits == 1) // Nothing left but +/- 1?
+            return (negative ? NEGATIVE_ONE : ONE).shiftLeft(bitsToShift);
 
         // This is a quick way to approximate the size of the result,
         // similar to doing log2[n] * exponent.  This will give an upper bound
         // of how big the result can be, and which algorithm to use.
-        long scaleFactor = (long)remainingBits * exponent;
+        final long scaleFactor = (long) remainingBits * exponent;
 
         // Use slightly different algorithms for small and large operands.
-        // See if the result will safely fit into a long. (Largest 2^63-1)
-        if (partToSquare.mag.length == 1 && scaleFactor <= 62) {
-            // Small number algorithm.  Everything fits into a long.
-            int newSign = (signum <0  && (exponent&1) == 1 ? -1 : 1);
-            long result = 1;
-            long baseToPow2 = partToSquare.mag[0] & LONG_MASK;
-
-            int workingExponent = exponent;
-
-            // Perform exponentiation using repeated squaring trick
-            while (workingExponent != 0) {
-                if ((workingExponent & 1) == 1) {
-                    result = result * baseToPow2;
-                }
-
-                if ((workingExponent >>>= 1) != 0) {
-                    baseToPow2 = baseToPow2 * baseToPow2;
-                }
-            }
+        // See if the result will safely fit into an unsigned long. (Largest 2^64-1)
+        if (scaleFactor <= Long.SIZE) {
+            // Small number algorithm.  Everything fits into an unsigned long.
+            final int newSign = negative ? -1 : 1;
+            final long result = unsignedLongPow(base.mag[0] & LONG_MASK, exponent);
 
             // Multiply back the powers of two (quickly, by shifting left)
-            if (powersOfTwo > 0) {
-                if (bitsToShift + scaleFactor <= 62) { // Fits in long?
-                    return valueOf((result << bitsToShift) * newSign);
-                } else {
-                    return valueOf(result*newSign).shiftLeft(bitsToShift);
-                }
-            } else {
-                return valueOf(result*newSign);
-            }
-        } else {
-            if ((long)bitLength() * exponent / Integer.SIZE > MAX_MAG_LENGTH) {
-                reportOverflow();
-            }
+            return bitsToShift + scaleFactor <= Long.SIZE  // Fits in long?
+                    ? new BigInteger(result << bitsToShift, newSign)
+                    : new BigInteger(result, newSign).shiftLeft(bitsToShift);
+        }
 
-            // Large number algorithm.  This is basically identical to
-            // the algorithm above, but calls multiply() and square()
-            // which may use more efficient algorithms for large numbers.
-            BigInteger answer = ONE;
+        if ((bitLength() - 1L) * exponent >= Integer.MAX_VALUE) {
+            reportOverflow();
+        }
 
-            int workingExponent = exponent;
-            // Perform exponentiation using repeated squaring trick
-            while (workingExponent != 0) {
-                if ((workingExponent & 1) == 1) {
-                    answer = answer.multiply(partToSquare);
-                }
+        // Large number algorithm.  This is basically identical to
+        // the algorithm above, but calls multiply()
+        // which may use more efficient algorithms for large numbers.
+        BigInteger answer = ONE;
 
-                if ((workingExponent >>>= 1) != 0) {
-                    partToSquare = partToSquare.square();
-                }
-            }
-            // Multiply back the (exponentiated) powers of two (quickly,
-            // by shifting left)
-            if (powersOfTwo > 0) {
-                answer = answer.shiftLeft(bitsToShift);
-            }
+        final int expZeros = Integer.numberOfLeadingZeros(exponent);
+        int workingExp = exponent << expZeros;
+        // Perform exponentiation using repeated squaring trick
+        // The loop relies on this invariant:
+        // base^exponent == answer^(2^expLen) * base^(workingExp >>> (32-expLen))
+        for (int expLen = Integer.SIZE - expZeros; expLen > 0; expLen--) {
+            answer = answer.multiply(answer);
+            if (workingExp < 0) // leading bit is set
+                answer = answer.multiply(base);
 
-            if (signum < 0 && (exponent&1) == 1) {
-                return answer.negate();
-            } else {
-                return answer;
-            }
+            workingExp <<= 1;
+        }
+
+        // Multiply back the (exponentiated) powers of two (quickly,
+        // by shifting left)
+        answer = answer.shiftLeft(bitsToShift);
+        return negative ? answer.negate() : answer;
+    }
+
+    /**
+     * Computes {@code x^n} using repeated squaring trick.
+     * Assumes {@code x != 0 && x^n < 2^Long.SIZE}.
+     */
+    static long unsignedLongPow(long x, int n) {
+        if (x == 1L || n == 0)
+            return 1L;
+
+        if (x == 2L)
+            return 1L << n;
+
+        /*
+         * The method assumption means that n <= 40 here.
+         * Thus, the loop body executes at most 5 times.
+         */
+        long pow = 1L;
+        for (; n != 1; n >>>= 1) {
+            if ((n & 1) != 0)
+                pow *= x;
+
+            x *= x;
         }
+        return pow * x;
     }
 
     /**
diff --git a/test/micro/org/openjdk/bench/java/math/BigIntegerPow.java b/test/micro/org/openjdk/bench/java/math/BigIntegerPow.java
new file mode 100644
index 00000000000..007d9bb975a
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegerPow.java
@@ -0,0 +1,189 @@
+/*
+ * 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.java.math;
+
+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.OperationsPerInvocation;
+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.Param;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+import org.openjdk.jmh.profile.GCProfiler;
+
+import java.math.BigInteger;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 1, time = 1)
+@Measurement(iterations = 1, time = 1)
+@Fork(value = 3)
+public class BigIntegerPow {
+
+    private static final int TESTSIZE = 1;
+
+    private int xsExp = (1 << 20) - 1;
+    /* Each array entry is atmost 64 bits in size */
+    private BigInteger[] xsArray = new BigInteger[TESTSIZE];
+
+    private int sExp = (1 << 18) - 1;
+    /* Each array entry is atmost 256 bits in size */
+    private BigInteger[] sArray = new BigInteger[TESTSIZE];
+
+    private int mExp = (1 << 16) - 1;
+    /* Each array entry is atmost 1024 bits in size */
+    private BigInteger[] mArray = new BigInteger[TESTSIZE];
+
+    private int lExp = (1 << 14) - 1;
+    /* Each array entry is atmost 4096 bits in size */
+    private BigInteger[] lArray = new BigInteger[TESTSIZE];
+
+    private int xlExp = (1 << 12) - 1;
+    /* Each array entry is atmost 16384 bits in size */
+    private BigInteger[] xlArray = new BigInteger[TESTSIZE];
+
+    private int[] randomExps;
+
+    /*
+     * You can run this test via the command line:
+     *    $ make test TEST="micro:java.math.BigIntegerPow" MICRO="OPTIONS=-prof gc"
+     */
+
+    @Setup
+    public void setup() {
+        Random r = new Random(1123);
+
+        randomExps = new int[TESTSIZE];
+        for (int i = 0; i < TESTSIZE; i++) {
+            xsArray[i] = new BigInteger(64, r);
+            sArray[i] = new BigInteger(256, r);
+            mArray[i] = new BigInteger(1024, r);
+            lArray[i] = new BigInteger(4096, r);
+            xlArray[i] = new BigInteger(16384, r);
+            randomExps[i] = r.nextInt(1 << 12);
+        }
+    }
+
+    /** Test BigInteger.pow() with numbers long at most 64 bits  */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowXS(Blackhole bh) {
+        for (BigInteger xs : xsArray) {
+            bh.consume(xs.pow(xsExp));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowXSRandomExps(Blackhole bh) {
+        int i = 0;
+        for (BigInteger xs : xsArray) {
+            bh.consume(xs.pow(randomExps[i++]));
+        }
+    }
+
+    /** Test BigInteger.pow() with numbers long at most 256 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowS(Blackhole bh) {
+        for (BigInteger s : sArray) {
+            bh.consume(s.pow(sExp));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowSRandomExps(Blackhole bh) {
+        int i = 0;
+        for (BigInteger s : sArray) {
+            bh.consume(s.pow(randomExps[i++]));
+        }
+    }
+
+    /** Test BigInteger.pow() with numbers long at most 1024 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowM(Blackhole bh) {
+        for (BigInteger m : mArray) {
+            bh.consume(m.pow(mExp));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowMRandomExps(Blackhole bh) {
+        int i = 0;
+        for (BigInteger m : mArray) {
+            bh.consume(m.pow(randomExps[i++]));
+        }
+    }
+
+    /** Test BigInteger.pow() with numbers long at most 4096 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowL(Blackhole bh) {
+        for (BigInteger l : lArray) {
+            bh.consume(l.pow(lExp));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowLRandomExps(Blackhole bh) {
+        int i = 0;
+        for (BigInteger l : lArray) {
+            bh.consume(l.pow(randomExps[i++]));
+        }
+    }
+
+    /** Test BigInteger.pow() with numbers long at most 16384 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowXL(Blackhole bh) {
+        for (BigInteger xl : xlArray) {
+            bh.consume(xl.pow(xlExp));
+        }
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testPowXLRandomExps(Blackhole bh) {
+        int i = 0;
+        for (BigInteger xl : xlArray) {
+            bh.consume(xl.pow(randomExps[i++]));
+        }
+    }
+}

From 66f044271324643ee17df13ad3ef254bc4dbd798 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Fri, 9 May 2025 17:12:53 +0000
Subject: [PATCH 378/901] 8353232: Standardizing and Unifying XML Component
 Configurations

Reviewed-by: lancea
---
 .../xsltc/trax/TransformerFactoryImpl.java    |  14 +-
 .../internal/dom/DOMConfigurationImpl.java    |   7 +-
 .../xerces/internal/impl/PropertyManager.java |  10 +-
 .../internal/impl/XMLEntityManager.java       |  11 +-
 .../internal/impl/xs/XMLSchemaLoader.java     |   7 +-
 .../impl/xs/traversers/XSDHandler.java        |   6 +-
 .../jaxp/DocumentBuilderFactoryImpl.java      |  15 +-
 .../internal/jaxp/DocumentBuilderImpl.java    |   4 +-
 .../internal/jaxp/SAXParserFactoryImpl.java   |  13 +-
 .../xerces/internal/jaxp/SAXParserImpl.java   |   7 +-
 .../validation/StreamValidatorHelper.java     |   7 +-
 .../jaxp/validation/XMLSchemaFactory.java     |  19 +-
 .../XMLSchemaValidatorComponentManager.java   |   5 +-
 .../internal/parsers/AbstractSAXParser.java   |   6 +-
 .../xerces/internal/parsers/DOMParser.java    |   8 +-
 .../internal/parsers/DTDConfiguration.java    |   7 +-
 .../parsers/NonValidatingConfiguration.java   |   5 +-
 .../xerces/internal/parsers/SAXParser.java    |   4 +-
 .../parsers/SecurityConfiguration.java        |   8 +-
 .../xerces/internal/parsers/XMLParser.java    |   9 +-
 .../internal/jaxp/XPathExpressionImpl.java    |  10 +-
 .../xpath/internal/jaxp/XPathFactoryImpl.java |  15 +-
 .../apache/xpath/internal/jaxp/XPathImpl.java |  10 +-
 .../javax/xml/validation/SchemaFactory.java   |   3 +-
 .../jdk/xml/internal/FeaturePropertyBase.java |  41 ++--
 .../classes/jdk/xml/internal/JdkCatalog.java  |  46 -----
 .../jdk/xml/internal/JdkXmlConfig.java        | 180 ++++++++++++++++++
 .../jdk/xml/internal/JdkXmlFeatures.java      |  75 +++++---
 .../jdk/xml/internal/SecuritySupport.java     |  51 +----
 .../jdk/xml/internal/XMLSecurityManager.java  |  50 ++---
 .../internal/XMLSecurityPropertyManager.java  |  74 +++++--
 31 files changed, 463 insertions(+), 264 deletions(-)
 delete mode 100644 src/java.xml/share/classes/jdk/xml/internal/JdkCatalog.java
 create mode 100644 src/java.xml/share/classes/jdk/xml/internal/JdkXmlConfig.java

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
index ee730d3900a..ca56223aa44 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
@@ -69,14 +69,15 @@
 import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
 import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlFeatures;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.JdkProperty.ImplPropMap;
 import jdk.xml.internal.JdkProperty.State;
 import jdk.xml.internal.TransformErrorListener;
 import jdk.xml.internal.XMLSecurityManager;
-import jdk.xml.internal.XMLSecurityPropertyManager.Property;
 import jdk.xml.internal.XMLSecurityPropertyManager;
+import jdk.xml.internal.XMLSecurityPropertyManager.Property;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLFilter;
@@ -87,7 +88,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class TransformerFactoryImpl
     extends SAXTransformerFactory implements SourceLoader
@@ -265,17 +266,18 @@ public PIParamWrapper(String media, String title, String charset) {
      * javax.xml.transform.sax.TransformerFactory implementation.
      */
     public TransformerFactoryImpl() {
-        _xmlFeatures = new JdkXmlFeatures(!_isNotSecureProcessing);
+        JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+        // security (property) managers updated with current system properties
+        _xmlSecurityManager = config.getXMLSecurityManager(true);
+        _xmlSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
+        _xmlFeatures = config.getXMLFeatures(true);
         _overrideDefaultParser = _xmlFeatures.getFeature(
                 JdkXmlFeatures.XmlFeature.JDK_OVERRIDE_PARSER);
-        _xmlSecurityPropertyMgr = new XMLSecurityPropertyManager();
         _accessExternalDTD = _xmlSecurityPropertyMgr.getValue(
                 Property.ACCESS_EXTERNAL_DTD);
         _accessExternalStylesheet = _xmlSecurityPropertyMgr.getValue(
                 Property.ACCESS_EXTERNAL_STYLESHEET);
 
-        //Parser's security manager
-        _xmlSecurityManager = new XMLSecurityManager(true);
         //Unmodifiable hash map with loaded external extension functions
         _xsltcExtensionFunctions = null;
         _extensionClassLoader = new JdkProperty<>(ImplPropMap.EXTCLSLOADER,
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
index 7cf53f7478d..6c639c27c2c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
@@ -53,6 +53,7 @@
 import javax.xml.XMLConstants;
 import javax.xml.catalog.CatalogFeatures;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -71,7 +72,7 @@
  *
  * @author Elena Litani, IBM
  * @author Neeraj Bajaj, Sun Microsystems.
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class DOMConfigurationImpl extends ParserConfigurationSettings
     implements XMLParserConfiguration, DOMConfiguration {
@@ -414,10 +415,10 @@ protected DOMConfigurationImpl(SymbolTable symbolTable,
         fValidationManager = createValidationManager();
         setProperty(VALIDATION_MANAGER, fValidationManager);
 
-        setProperty(SECURITY_MANAGER, new XMLSecurityManager(true));
+        setProperty(SECURITY_MANAGER, JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
 
         setProperty(JdkConstants.XML_SECURITY_PROPERTY_MANAGER,
-                new XMLSecurityPropertyManager());
+                JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false));
 
         // add message formatters
         if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
index 8d83f039617..c759920c372 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
@@ -31,6 +31,7 @@
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLResolver;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -44,7 +45,7 @@
  * @author K Venugopal
  * @author Sunitha Reddy
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class PropertyManager {
 
@@ -66,6 +67,7 @@ public class PropertyManager {
 
     HashMap<String, Object> supportedProps = new HashMap<>();
 
+    JdkXmlConfig config = JdkXmlConfig.getInstance(true);
     private XMLSecurityManager fSecurityManager;
     private XMLSecurityPropertyManager fSecurityPropertyMgr;
 
@@ -141,9 +143,9 @@ private void initConfigurableReaderProperties() {
         supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ENTITYDEF_FEATURE, false);
         supportedProps.put(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_UNDECLARED_ELEMDEF_FEATURE, false);
 
-        fSecurityManager = new XMLSecurityManager(true);
+        fSecurityManager = config.getXMLSecurityManager(true);
+        fSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
         supportedProps.put(SECURITY_MANAGER, fSecurityManager);
-        fSecurityPropertyMgr = new XMLSecurityPropertyManager();
         supportedProps.put(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
 
         // Initialize Catalog features
@@ -232,7 +234,7 @@ public void setProperty(String property, Object value) {
         }
         if (property.equals(JdkConstants.XML_SECURITY_PROPERTY_MANAGER)) {
             if (value == null) {
-                fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+                fSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
             } else {
                 fSecurityPropertyMgr = (XMLSecurityPropertyManager) value;
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
index dbe03d41017..99b4193b39c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
@@ -49,15 +49,14 @@
 import java.util.StringTokenizer;
 import javax.xml.XMLConstants;
 import javax.xml.catalog.CatalogException;
-import javax.xml.catalog.CatalogFeatures.Feature;
 import javax.xml.catalog.CatalogFeatures;
 import javax.xml.catalog.CatalogManager;
 import javax.xml.catalog.CatalogResolver;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.transform.Source;
-import jdk.xml.internal.JdkCatalog;
 import jdk.xml.internal.JdkConstants;
 import jdk.xml.internal.JdkProperty;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.SecuritySupport;
 import jdk.xml.internal.XMLLimitAnalyzer;
@@ -94,7 +93,7 @@
  * @author K.Venugopal SUN Microsystems
  * @author Neeraj Bajaj SUN Microsystems
  * @author Sunitha Reddy SUN Microsystems
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
 
@@ -436,7 +435,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
      * If this constructor is used to create the object, reset() should be invoked on this object
      */
     public XMLEntityManager() {
-        this(null, new XMLSecurityManager(true));
+        this(null, JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
     }
 
     public XMLEntityManager(XMLSecurityPropertyManager securityPropertyMgr, XMLSecurityManager securityManager) {
@@ -1055,7 +1054,7 @@ public StaxXMLInputSource resolveEntityAsPerStax(XMLResourceIdentifier resourceI
                 && JdkXmlUtils.isResolveContinue(fCatalogFeatures)) {
             initJdkCatalogResolver();
 
-            staxInputSource = resolveWithCatalogStAX(fDefCR, JdkCatalog.JDKCATALOG, publicId, literalSystemId);
+            staxInputSource = resolveWithCatalogStAX(fDefCR, JdkXmlConfig.JDKCATALOG_FILE, publicId, literalSystemId);
         }
 
         // Step 4: default resolution if not resolved by a resolver and the RESOLVE
@@ -1697,7 +1696,7 @@ public void reset(XMLComponentManager componentManager)
         // JAXP 1.5 feature
         XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager) componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER, null);
         if (spm == null) {
-            spm = new XMLSecurityPropertyManager();
+            spm = JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false);
         }
         fAccessExternalDTD = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_DTD);
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
index f93818683c6..b4b76546d6d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
@@ -74,6 +74,7 @@
 import java.util.WeakHashMap;
 import javax.xml.XMLConstants;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -102,7 +103,7 @@
  * @xerces.internal
  *
  * @author Neil Graham, IBM
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 
 public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent, XSElementDeclHelper,
@@ -1001,13 +1002,13 @@ public void reset(XMLComponentManager componentManager) throws XMLConfigurationE
 
         XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
         if (spm == null) {
-            spm = new XMLSecurityPropertyManager();
+            spm = JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false);
             setProperty(XML_SECURITY_PROPERTY_MANAGER, spm);
         }
 
         XMLSecurityManager sm = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
         if (sm == null)
-            setProperty(SECURITY_MANAGER,new XMLSecurityManager(true));
+            setProperty(SECURITY_MANAGER, JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
 
         faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
 
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 b5becbcbde2..13973615adb 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
@@ -105,6 +105,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.SecuritySupport;
 import jdk.xml.internal.XMLSecurityManager;
@@ -131,7 +132,7 @@
  * @author Neil Graham, IBM
  * @author Pavani Mukthipudi, Sun Microsystems
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class XSDHandler {
 
@@ -735,7 +736,8 @@ private void createAnnotationValidator() {
         fAnnotationValidator.setFeature(XMLSCHEMA_VALIDATION, true);
         fAnnotationValidator.setProperty(XMLGRAMMAR_POOL, fGrammarBucketAdapter);
         /** set security manager and XML Security Property Manager **/
-        fAnnotationValidator.setProperty(SECURITY_MANAGER, (fSecurityManager != null) ? fSecurityManager : new XMLSecurityManager(true));
+        fAnnotationValidator.setProperty(SECURITY_MANAGER,
+                (fSecurityManager != null) ? fSecurityManager : JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
         fAnnotationValidator.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
         /** Set error handler. **/
         fAnnotationValidator.setProperty(ERROR_HANDLER, (fErrorHandler != null) ? fErrorHandler : new DefaultErrorHandler());
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
index 2939058e7d4..385b8e29439 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
@@ -29,6 +29,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.validation.Schema;
+
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -39,7 +41,7 @@
 /**
  * @author Rajiv Mordani
  * @author Edwin Goei
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
     /** These are DocumentBuilderFactory attributes not DOM attributes */
@@ -54,8 +56,15 @@ public class DocumentBuilderFactoryImpl extends DocumentBuilderFactory {
     private boolean fSecureProcess = true;
 
     // used to verify attributes
-    XMLSecurityManager fSecurityManager = new XMLSecurityManager(true);
-    XMLSecurityPropertyManager fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+    XMLSecurityManager fSecurityManager;
+    XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+    public DocumentBuilderFactoryImpl() {
+        JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+        // security (property) managers updated with current system properties
+        fSecurityManager = config.getXMLSecurityManager(true);
+        fSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
+    }
 
     /**
      * Creates a new instance of a {@link javax.xml.parsers.DocumentBuilder}
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
index 43b986b9939..c885cb58cbc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
@@ -59,7 +59,7 @@
 /**
  * @author Rajiv Mordani
  * @author Edwin Goei
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class DocumentBuilderImpl extends DocumentBuilder
         implements JAXPConstants
@@ -140,7 +140,7 @@ public class DocumentBuilderImpl extends DocumentBuilder
     {
         domParser = new DOMParser();
 
-        fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+        fSecurityPropertyMgr = dbf.fSecurityPropertyMgr;
         domParser.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
 
         fSecurityManager = dbf.fSecurityManager;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
index ab6a1548546..298f60708f3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
@@ -28,6 +28,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.validation.Schema;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
 import org.xml.sax.SAXException;
@@ -42,7 +43,7 @@
  * @author Rajiv Mordani
  * @author Edwin Goei
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class SAXParserFactoryImpl extends SAXParserFactory {
 
@@ -68,8 +69,14 @@ public class SAXParserFactoryImpl extends SAXParserFactory {
     private boolean fSecureProcess = true;
 
     // Security Managers
-    XMLSecurityManager fSecurityManager = new XMLSecurityManager(true);
-    XMLSecurityPropertyManager fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+    XMLSecurityManager fSecurityManager;
+    XMLSecurityPropertyManager fSecurityPropertyMgr;
+
+    public SAXParserFactoryImpl() {
+        JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+        fSecurityManager = config.getXMLSecurityManager(true);
+        fSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
+    }
 
     /**
      * Creates a new instance of <code>SAXParser</code> using the currently
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
index fe435aabbcc..9e729c9a9a2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
@@ -43,6 +43,7 @@
 import javax.xml.validation.Schema;
 import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -64,7 +65,7 @@
  * @author Rajiv Mordani
  * @author Edwin Goei
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 @SuppressWarnings("deprecation")
 public class SAXParserImpl extends javax.xml.parsers.SAXParser
@@ -412,7 +413,7 @@ public JAXPSAXParser() {
              * it is null.
              */
             if (fSecurityManager == null) {
-                fSecurityManager = new XMLSecurityManager(true);
+                fSecurityManager = JdkXmlConfig.getInstance(false).getXMLSecurityManager(false);
             }
             try {
                 super.setProperty(SECURITY_MANAGER, fSecurityManager);
@@ -423,7 +424,7 @@ public JAXPSAXParser() {
             }
 
             if (fSecurityPropertyMgr == null) {
-                fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+                fSecurityPropertyMgr = JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false);
             }
             try {
                 super.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
index 338655306b4..ae0f1964cc9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.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.
  */
  /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,7 @@
 import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter;
 import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
 import com.sun.org.apache.xerces.internal.parsers.XML11Configuration;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.XMLSecurityManager;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
@@ -49,7 +50,7 @@
  *
  * @author Michael Glavassevich, IBM
  * @author Sunitha Reddy
- * @LastModified: July 2023
+ * @LastModified: May 2025
  */
 final class StreamValidatorHelper implements ValidatorHelper {
 
@@ -190,7 +191,7 @@ else if (fComponentManager.getFeature(PARSER_SETTINGS)) {
     private XMLParserConfiguration initialize() {
         XML11Configuration config = new XML11Configuration();
         if (fComponentManager.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING)) {
-            config.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
+            config.setProperty(SECURITY_MANAGER, JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
         }
         config.setProperty(ENTITY_RESOLVER, fComponentManager.getProperty(ENTITY_RESOLVER));
         config.setProperty(ERROR_HANDLER, fComponentManager.getProperty(ERROR_HANDLER));
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
index 82960821f4d..fff15165ae8 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -52,6 +52,7 @@
 import jdk.xml.internal.JdkConstants;
 import jdk.xml.internal.JdkProperty;
 import jdk.xml.internal.JdkProperty.ImplPropMap;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlFeatures;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
@@ -70,7 +71,7 @@
  *
  * @author Kohsuke Kawaguchi
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public final class XMLSchemaFactory extends SchemaFactory {
 
@@ -152,19 +153,19 @@ public XMLSchemaFactory() {
         fXMLSchemaLoader.setErrorHandler(fErrorHandlerWrapper);
         fUseGrammarPoolOnly = true;
 
-        // Enable secure processing feature by default
-        fSecurityManager = new XMLSecurityManager(true);
-        fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
+        // security (property) managers updated with current system properties
+        JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+        fSecurityManager = config.getXMLSecurityManager(true);
+        fSecurityPropertyMgr = config.getXMLSecurityPropertyManager(true);
+        fXmlFeatures = config.getXMLFeatures(true);
 
-        fSecurityPropertyMgr = new XMLSecurityPropertyManager();
-        fXMLSchemaLoader.setProperty(XML_SECURITY_PROPERTY_MANAGER,
-                fSecurityPropertyMgr);
+        fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
+        fXMLSchemaLoader.setProperty(XML_SECURITY_PROPERTY_MANAGER, fSecurityPropertyMgr);
 
         // use catalog
         fXMLSchemaLoader.setFeature(XMLConstants.USE_CATALOG, JdkXmlUtils.USE_CATALOG_DEFAULT);
 
         fXMLSchemaLoader.setProperty(JdkConstants.CDATA_CHUNK_SIZE, JdkConstants.CDATA_CHUNK_SIZE_DEFAULT);
-        fXmlFeatures = new JdkXmlFeatures(fSecurityManager.isSecureProcessing());
         fOverrideDefaultParser = fXmlFeatures.getFeature(
                 JdkXmlFeatures.XmlFeature.JDK_OVERRIDE_PARSER);
         fXMLSchemaLoader.setFeature(JdkConstants.OVERRIDE_PARSER, fOverrideDefaultParser);
@@ -500,7 +501,7 @@ public void setProperty(String name, Object object)
             return;
         } else if (name.equals(JdkConstants.XML_SECURITY_PROPERTY_MANAGER)) {
             if (object == null) {
-                fSecurityPropertyMgr = new XMLSecurityPropertyManager();
+                fSecurityPropertyMgr = JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(true);
             } else {
                 fSecurityPropertyMgr = (XMLSecurityPropertyManager)object;
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
index 419bfe4b250..b53c582e41f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
@@ -48,6 +48,7 @@
 import javax.xml.catalog.CatalogFeatures;
 import jdk.xml.internal.FeaturePropertyBase;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -58,7 +59,7 @@
  * <p>An implementation of XMLComponentManager for a schema validator.</p>
  *
  * @author Michael Glavassevich, IBM
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 final class XMLSchemaValidatorComponentManager extends ParserConfigurationSettings implements
         XMLComponentManager {
@@ -298,7 +299,7 @@ public XMLSchemaValidatorComponentManager(XSGrammarPoolContainer grammarContaine
         if (fInitSecurityManager != null ) {
             fInitSecurityManager.setSecureProcessing(secureProcessing);
         } else {
-            fInitSecurityManager = new XMLSecurityManager(secureProcessing);
+            fInitSecurityManager = JdkXmlConfig.getInstance(false).getXMLSecurityManager(false);
         }
 
         setProperty(SECURITY_MANAGER, fInitSecurityManager);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
index 614bd2fdc99..1c46c95dba7 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,7 +79,7 @@
  * @author Arnaud Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @LastModified: Jan 2024
+ * @LastModified: May 2025
  */
 @SuppressWarnings("deprecation")
 public abstract class AbstractSAXParser
@@ -1665,7 +1665,7 @@ public void setFeature(String featureId, boolean state)
             else if (featureId.equals(XMLConstants.FEATURE_SECURE_PROCESSING)) {
                 if (state) {
                     if (fConfiguration.getProperty(SECURITY_MANAGER )==null) {
-                        fConfiguration.setProperty(SECURITY_MANAGER, new XMLSecurityManager());
+                        fConfiguration.setProperty(SECURITY_MANAGER, config.getXMLSecurityManager(true));
                     }
                 }
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
index 220b45ad243..9bc3d319619 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
@@ -61,7 +61,7 @@
  *
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class DOMParser
     extends AbstractDOMParser {
@@ -550,7 +550,7 @@ public void setProperty(String propertyId, Object value)
         }
         if (propertyId.equals(JdkConstants.XML_SECURITY_PROPERTY_MANAGER)) {
             if (value == null) {
-                securityPropertyManager = new XMLSecurityPropertyManager();
+                securityPropertyManager = config.getXMLSecurityPropertyManager(true);
             } else {
                 securityPropertyManager = (XMLSecurityPropertyManager)value;
             }
@@ -559,12 +559,12 @@ public void setProperty(String propertyId, Object value)
         }
 
         if (securityManager == null) {
-            securityManager = new XMLSecurityManager(true);
+            securityManager = config.getXMLSecurityManager(true);
             setProperty0(Constants.SECURITY_MANAGER, securityManager);
         }
 
         if (securityPropertyManager == null) {
-            securityPropertyManager = new XMLSecurityPropertyManager();
+            securityPropertyManager = config.getXMLSecurityPropertyManager(true);
             setProperty0(JdkConstants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
         }
         int index = securityPropertyManager.getIndex(propertyId);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
index 92755d7bc90..35e23909db9 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
@@ -50,8 +50,8 @@
 import javax.xml.XMLConstants;
 import javax.xml.catalog.CatalogFeatures;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
-import jdk.xml.internal.XMLSecurityPropertyManager;
 
 /**
  * This is the DTD-only parser configuration.  It extends the basic
@@ -89,7 +89,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  * @author Neil Graham, IBM
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class DTDConfiguration
     extends BasicParserConfiguration
@@ -427,7 +427,8 @@ public DTDConfiguration(SymbolTable symbolTable,
             // REVISIT: What is the right thing to do? -Ac
         }
 
-        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
+        setProperty(XML_SECURITY_PROPERTY_MANAGER,
+                JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false));
 
         // Initialize Catalog features
         for( CatalogFeatures.Feature f : CatalogFeatures.Feature.values()) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
index b9e2b6fb77a..b2d3c25a1fc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
@@ -49,8 +49,8 @@
 import javax.xml.XMLConstants;
 import javax.xml.catalog.CatalogFeatures;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlUtils;
-import jdk.xml.internal.XMLSecurityPropertyManager;
 
 /**
  * This is the non validating parser configuration. It extends the basic
@@ -390,7 +390,8 @@ public NonValidatingConfiguration(SymbolTable symbolTable,
             // REVISIT: What is the right thing to do? -Ac
         }
 
-        setProperty(XML_SECURITY_PROPERTY_MANAGER, new XMLSecurityPropertyManager());
+        setProperty(XML_SECURITY_PROPERTY_MANAGER,
+                JdkXmlConfig.getInstance(false).getXMLSecurityPropertyManager(false));
 
         // Initialize Catalog features
         for( CatalogFeatures.Feature f : CatalogFeatures.Feature.values()) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
index 9690ff58339..52be34a5a37 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
@@ -42,7 +42,7 @@
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
  *
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public class SAXParser
     extends AbstractSAXParser {
@@ -154,7 +154,7 @@ public void setProperty(String name, Object value)
         }
         if (name.equals(JdkConstants.XML_SECURITY_PROPERTY_MANAGER)) {
             if (value == null) {
-                securityPropertyManager = new XMLSecurityPropertyManager();
+                securityPropertyManager = config.getXMLSecurityPropertyManager(true);
             } else {
                 securityPropertyManager = (XMLSecurityPropertyManager)value;
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
index 17924445bd1..c97096010b6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +24,7 @@
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.XMLSecurityManager;
 
 /**
@@ -43,7 +44,7 @@
  * </ul>
  *
  * @author Neil Graham, IBM
- * @LastModified: July 2023
+ * @LastModified: May 2025
  */
 public class SecurityConfiguration extends XIncludeAwareParserConfiguration
 {
@@ -107,7 +108,8 @@ public SecurityConfiguration (SymbolTable symbolTable,
         super(symbolTable, grammarPool, parentSettings);
 
         // create the SecurityManager property:
-        setProperty(SECURITY_MANAGER_PROPERTY, new XMLSecurityManager(true));
+        setProperty(SECURITY_MANAGER_PROPERTY,
+                JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
     } // <init>(SymbolTable,XMLGrammarPool)
 
 } // class SecurityConfiguration
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
index 2e27e8719d8..7d49e55ce46 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
@@ -27,6 +27,7 @@
 import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
 import com.sun.org.apache.xerces.internal.xni.parser.XMLParserConfiguration;
 import jdk.xml.internal.JdkConstants;
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.Utils;
 import jdk.xml.internal.XMLSecurityManager;
 import jdk.xml.internal.XMLSecurityPropertyManager;
@@ -50,7 +51,7 @@
  *
  * @author Arnaud  Le Hors, IBM
  * @author Andy Clark, IBM
- * @LastModified: Apr 2025
+ * @LastModified: May 2025
  */
 public abstract class XMLParser {
 
@@ -81,6 +82,8 @@ public abstract class XMLParser {
     /** The parser configuration. */
     protected XMLParserConfiguration fConfiguration;
 
+    JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+
     /** The XML Security Manager. */
     XMLSecurityManager securityManager;
 
@@ -142,12 +145,12 @@ public void parse(XMLInputSource inputSource)
      */
     void initSecurityManager(XMLSecurityPropertyManager spm, XMLSecurityManager sm) {
         if (securityManager == null) {
-            securityManager = sm != null ? sm : new XMLSecurityManager(true);
+            securityManager = sm != null ? sm : config.getXMLSecurityManager(true);
         }
         fConfiguration.setProperty(Constants.SECURITY_MANAGER, securityManager);
 
         if (securityPropertyManager == null) {
-            securityPropertyManager = spm != null ? spm : new XMLSecurityPropertyManager();
+            securityPropertyManager = spm != null ? spm : config.getXMLSecurityPropertyManager(true);
         }
         fConfiguration.setProperty(JdkConstants.XML_SECURITY_PROPERTY_MANAGER, securityPropertyManager);
     }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
index 5ded2b99eaa..e3f25731e6d 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +31,8 @@
 import javax.xml.xpath.XPathFunctionException;
 import javax.xml.xpath.XPathFunctionResolver;
 import javax.xml.xpath.XPathVariableResolver;
+
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlFeatures;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -39,7 +41,7 @@
  * The XPathExpression interface encapsulates a (compiled) XPath expression.
  *
  * @author  Ramesh Mandava
- * @LastModified: May 2022
+ * @LastModified: May 2025
  */
 public class XPathExpressionImpl extends XPathImplUtil implements XPathExpression {
 
@@ -49,7 +51,7 @@ public class XPathExpressionImpl extends XPathImplUtil implements XPathExpressio
      * from the context.
      */
     protected XPathExpressionImpl() {
-        this(null, null, null, null, false, new JdkXmlFeatures(false));
+        this(null, null, null, null, false, JdkXmlConfig.getInstance(false).getXMLFeatures(true));
     };
 
     protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
@@ -57,7 +59,7 @@ protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
             XPathFunctionResolver functionResolver,
             XPathVariableResolver variableResolver) {
         this(xpath, prefixResolver, functionResolver, variableResolver,
-             false, new JdkXmlFeatures(false));
+             false, JdkXmlConfig.getInstance(false).getXMLFeatures(true));
     };
 
     protected XPathExpressionImpl(com.sun.org.apache.xpath.internal.XPath xpath,
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
index 7c5269f9d12..1288f1dbac3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,17 +27,15 @@
 import javax.xml.xpath.XPathFactoryConfigurationException;
 import javax.xml.xpath.XPathFunctionResolver;
 import javax.xml.xpath.XPathVariableResolver;
-import jdk.xml.internal.JdkConstants;
-import jdk.xml.internal.JdkProperty;
-import jdk.xml.internal.JdkXmlFeatures;
-import jdk.xml.internal.XMLSecurityManager;
+
+import jdk.xml.internal.*;
 
 /**
  * The XPathFactory builds XPaths.
  *
  * @author  Ramesh Mandava
  *
- * @LastModified: Nov 2024
+ * @LastModified: May 2025
  */
 public  class XPathFactoryImpl extends XPathFactory {
 
@@ -79,8 +77,9 @@ public  class XPathFactoryImpl extends XPathFactory {
          * javax.xml.xpath.XPathFactory implementation.
          */
         public XPathFactoryImpl() {
-            _featureManager = new JdkXmlFeatures(!_isNotSecureProcessing);
-            _xmlSecMgr = new XMLSecurityManager(true);
+            JdkXmlConfig config = JdkXmlConfig.getInstance(false);
+            _xmlSecMgr = config.getXMLSecurityManager(true);
+            _featureManager = config.getXMLFeatures(true);
         }
 
         /**
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
index 79a06eec785..53099ad078e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.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.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +32,8 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFunctionResolver;
 import javax.xml.xpath.XPathVariableResolver;
+
+import jdk.xml.internal.JdkXmlConfig;
 import jdk.xml.internal.JdkXmlFeatures;
 import jdk.xml.internal.XMLSecurityManager;
 import org.w3c.dom.Document;
@@ -48,7 +50,7 @@
  * New methods: evaluateExpression
  * Refactored to share code with XPathExpressionImpl.
  *
- * @LastModified: May 2022
+ * @LastModified: May 2025
  */
 public class XPathImpl extends XPathImplUtil implements javax.xml.xpath.XPath {
 
@@ -58,7 +60,9 @@ public class XPathImpl extends XPathImplUtil implements javax.xml.xpath.XPath {
     private NamespaceContext namespaceContext=null;
 
     XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr) {
-        this(vr, fr, false, new JdkXmlFeatures(false), new XMLSecurityManager(true));
+        this(vr, fr, false,
+                JdkXmlConfig.getInstance(false).getXMLFeatures(false),
+                JdkXmlConfig.getInstance(false).getXMLSecurityManager(false));
     }
 
     XPathImpl(XPathVariableResolver vr, XPathFunctionResolver fr,
diff --git a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
index 260ffa652fe..400a68581ea 100644
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.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
@@ -28,6 +28,7 @@
 import com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory;
 import java.io.File;
 import java.net.URL;
+import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import jdk.xml.internal.SecuritySupport;
diff --git a/src/java.xml/share/classes/jdk/xml/internal/FeaturePropertyBase.java b/src/java.xml/share/classes/jdk/xml/internal/FeaturePropertyBase.java
index 908ed77ebec..0a17ffa1121 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/FeaturePropertyBase.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/FeaturePropertyBase.java
@@ -186,27 +186,36 @@ public <E extends Enum<E>> int getIndex(Class<E> property, String propertyName)
 
 
     /**
-     * Read from system properties, or those in jaxp.properties
+     * Reads the system property, and sets the value if successful.
      *
      * @param property the property
      * @param systemProperty the name of the system property
      */
-    void getSystemProperty(Enum<?> property, String systemProperty) {
-        try {
-            String value = System.getProperty(systemProperty);
-            if (value != null) {
-                values[property.ordinal()] = value;
-                states[property.ordinal()] = State.SYSTEMPROPERTY;
-                return;
-            }
+    boolean getSystemProperty(Enum<?> property, String systemProperty) {
+        String value = System.getProperty(systemProperty);
+        if (value != null) {
+            values[property.ordinal()] = value;
+            states[property.ordinal()] = State.SYSTEMPROPERTY;
+            return true;
+        }
+        return false;
+    }
 
-            value = SecuritySupport.readConfig(systemProperty);
-            if (value != null) {
-                values[property.ordinal()] = value;
-                states[property.ordinal()] = State.JAXPDOTPROPERTIES;
-            }
-        } catch (NumberFormatException e) {
-            //invalid setting ignored
+    /**
+     * Reads the property from the JAXP Configuration File.
+     *
+     * @param property the property
+     * @param sysPropertyName the name of the system property
+     * @return true if the property is read successfully from the JAXP Config,
+     * false otherwise.
+     */
+    boolean getPropertyConfig(Enum<?> property, String sysPropertyName) {
+        String value = SecuritySupport.readConfig(sysPropertyName);
+        if (value != null) {
+            values[property.ordinal()] = value;
+            states[property.ordinal()] = State.JAXPDOTPROPERTIES;
+            return true;
         }
+        return false;
     }
 }
diff --git a/src/java.xml/share/classes/jdk/xml/internal/JdkCatalog.java b/src/java.xml/share/classes/jdk/xml/internal/JdkCatalog.java
deleted file mode 100644
index 51890307399..00000000000
--- a/src/java.xml/share/classes/jdk/xml/internal/JdkCatalog.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.xml.internal;
-
-import java.net.URI;
-import javax.xml.catalog.Catalog;
-import javax.xml.catalog.CatalogFeatures;
-import javax.xml.catalog.CatalogManager;
-
-/**
- * Represents the built-in Catalog that hosts the DTDs for the Java platform.
- */
-public class JdkCatalog {
-    public static final String JDKCATALOG = "/jdk/xml/internal/jdkcatalog/JDKCatalog.xml";
-    private static final String JDKCATALOG_URL = SecuritySupport.getResource(JDKCATALOG).toExternalForm();
-    public static Catalog catalog;
-
-    public static void init(String resolve) {
-        if (catalog == null) {
-            CatalogFeatures cf = JdkXmlUtils.getCatalogFeatures(null, JDKCATALOG_URL, null, resolve);
-            catalog = CatalogManager.catalog(cf, URI.create(JDKCATALOG_URL));
-        }
-    }
-}
diff --git a/src/java.xml/share/classes/jdk/xml/internal/JdkXmlConfig.java b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlConfig.java
new file mode 100644
index 00000000000..b3f6c33570a
--- /dev/null
+++ b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlConfig.java
@@ -0,0 +1,180 @@
+/*
+ * 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.xml.internal;
+
+import javax.xml.catalog.Catalog;
+import javax.xml.catalog.CatalogFeatures;
+import javax.xml.catalog.CatalogManager;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+/**
+ * Global configuration for JAXP components. A single instance of this class
+ * holds the properties from the JAXP Configuration File, the JDK built-in
+ * Catalog, a base XMLSecurityManager and XMLSecurityPropertyManager.
+ */
+public class JdkXmlConfig {
+    public static final String JDKCATALOG_FILE = "/jdk/xml/internal/jdkcatalog/JDKCatalog.xml";
+    private static final String JDKCATALOG_URL = "jrt:/java.xml/jdk/xml/internal/jdkcatalog/JDKCatalog.xml";
+
+    // The JDK Configuration instance
+    private static volatile JdkXmlConfig INSTANCE;
+    // Represents properties set in JAXP Configuration File
+    private final Properties jaxpConfig = new Properties();
+    // The security manager initialized when the JdkXmlConfig instance is created
+    private final XMLSecurityManager baseManager;
+    private final XMLSecurityPropertyManager basePropertyMgr;
+    private final JdkXmlFeatures baseFeatures;
+
+    // The JDK built-in Catalog
+    private static class CatalogHolder {
+        private static final Catalog JDKCATALOG = CatalogManager.catalog(
+                CatalogFeatures.defaults(), URI.create(JDKCATALOG_URL));
+    }
+
+    /**
+     * Constructs an instance of this class.
+     * @param stax a flag indicating whether the call is from StAX
+     */
+    private JdkXmlConfig(boolean stax) {
+        loadConfig(stax);
+        baseManager = new XMLSecurityManager(true);
+        basePropertyMgr = new XMLSecurityPropertyManager();
+        baseFeatures = new JdkXmlFeatures(true);
+    }
+
+    /**
+     * Returns the singleton instance of this class.
+     * @param stax a flag indicating whether the call is from StAX
+     * @return the singleton instance of this class
+     */
+    public static JdkXmlConfig getInstance(boolean stax) {
+        if (INSTANCE == null) {
+            synchronized (JdkXmlConfig.class) {
+                if (INSTANCE == null) {
+                    INSTANCE = new JdkXmlConfig(stax);
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public Properties getJaxpConfig() {
+        return jaxpConfig;
+    }
+
+    /**
+     * Returns a copy of the base XMLSecurityManager.
+     * @param update the flag indicating whether the copy should be updated
+     * @return a copy of the base XMLSecurityManager.
+     */
+    public XMLSecurityManager getXMLSecurityManager(boolean update) {
+        return update ? baseManager.cloneAndUpdate() : baseManager.clone();
+    }
+
+    /**
+     * Returns a copy of the base XMLSecurityPropertyManager.
+     * @param update the flag indicating whether the copy should be updated
+     * @return a copy of the base XMLSecurityPropertyManager.
+     */
+    public XMLSecurityPropertyManager getXMLSecurityPropertyManager(boolean update) {
+        return update ? basePropertyMgr.cloneAndUpdate() : basePropertyMgr.clone();
+    }
+
+    /**
+     * Returns a copy of the base XMLSecurityPropertyManager.
+     * @param update the flag indicating whether the copy should be updated
+     * @return a copy of the base XMLSecurityPropertyManager.
+     */
+    public JdkXmlFeatures getXMLFeatures(boolean update) {
+        return update ? baseFeatures.cloneAndUpdate() : baseFeatures.clone();
+    }
+
+    /**
+     * Returns the JDK built-in Catalog.
+     * @return the JDK built-in Catalog
+     */
+    public Catalog getJdkCatalog() {
+        return CatalogHolder.JDKCATALOG;
+    }
+
+    /**
+     * Loads the JAXP Configuration file.
+     * The method reads the JDK default configuration that is typically located
+     * at $java.home/conf/jaxp.properties. On top of the default, if the System
+     * Property "java.xml.config.file" exists, the configuration file it points
+     * to will also be read. Any settings in it will then override those in the
+     * default.
+     *
+     * @param stax a flag indicating whether to read stax.properties
+     * @return the value of the specified property, null if the property is not
+     * found
+     */
+    private void loadConfig(boolean stax) {
+        Properties properties = new Properties();
+        // load the default configuration file
+        boolean found = loadProperties(
+                Paths.get(System.getProperty("java.home"),
+                                "conf", "jaxp.properties")
+                        .toAbsolutePath().normalize().toString());
+
+        // attempts to find stax.properties only if jaxp.properties is not available
+        if (stax && !found) {
+            found = loadProperties(
+                    Paths.get(System.getProperty("java.home"),
+                                    "conf", "stax.properties")
+                            .toAbsolutePath().normalize().toString()
+            );
+        }
+
+        // load the custom configure on top of the default if any
+        String configFile = System.getProperty(JdkConstants.CONFIG_FILE_PROPNAME);
+        if (configFile != null) {
+            loadProperties(configFile);
+        }
+    }
+
+    /**
+     * Loads the properties from the specified file into the cache.
+     * @param file the specified file
+     * @return true if success, false otherwise
+     */
+    private boolean loadProperties(String file) {
+        File f = new File(file);
+        if (SecuritySupport.doesFileExist(f)) {
+            try (final InputStream in = SecuritySupport.getFileInputStream(f)) {
+                jaxpConfig.load(in);
+                return true;
+            } catch (IOException e) {
+                // shouldn't happen, but required by method getFileInputStream
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java
index e8e5c2c83de..7016d2227ea 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.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
@@ -34,7 +34,7 @@
  * This class manages JDK's XML Features. Previously added features and properties
  * may be gradually moved to this class.
  */
-public class JdkXmlFeatures {
+public class JdkXmlFeatures implements Cloneable {
     public static final String ORACLE_JAXP_PROPERTY_PREFIX =
         "http://www.oracle.com/xml/jaxp/properties/";
 
@@ -217,12 +217,12 @@ public State getState(String name) {
     /**
      * Values of the features
      */
-    private final boolean[] featureValues;
+    private boolean[] featureValues;
 
     /**
      * States of the settings for each property
      */
-    private final State[] states;
+    private State[] states;
 
     /**
      * Flag indicating if secure processing is set
@@ -246,8 +246,33 @@ public JdkXmlFeatures(boolean secureProcessing) {
                 states[f.ordinal()] = State.DEFAULT;
             }
         }
-        //read system properties or jaxp.properties
-        readSystemProperties();
+    }
+
+    /**
+     * Returns a copy of the JdkXmlFeatures.
+     * @return a copy of the JdkXmlFeatures
+     */
+    public JdkXmlFeatures clone() {
+        try {
+            JdkXmlFeatures copy = (JdkXmlFeatures) super.clone();
+            copy.featureValues = this.featureValues.clone();
+            copy.states = this.states.clone();
+            return copy;
+        } catch (CloneNotSupportedException e) {
+            // shouldn't happen as this class is Cloneable
+            throw new InternalError(e);
+        }
+    }
+
+    /**
+     * Returns a copy of the JdkXmlFeatures that is updated with the
+     * current System Properties.
+     * @return a copy of the JdkXmlFeatures
+     */
+    public JdkXmlFeatures cloneAndUpdate() {
+        JdkXmlFeatures copy = clone();
+        copy.readSystemProperties();
+        return copy;
     }
 
     /**
@@ -387,33 +412,29 @@ private void readSystemProperties() {
     }
 
     /**
-     * Read from system properties, or those in jaxp.properties
+     * Read the system property, or the setting in the Jaxp Configuration File
+     * corresponding to the XmlFeature.
      *
-     * @param property the type of the property
-     * @param sysPropertyName the name of system property
+     * @param feature the XmlFeature
+     * @param sysPropertyName the corresponding system property
      * @return true if the system property is found, false otherwise
      */
     private boolean getSystemProperty(XmlFeature feature, String sysPropertyName) {
-        try {
-            String value = System.getProperty(sysPropertyName);
-            if (value == null && feature.systemPropertyOld() != null) {
-                // legacy system property
-                value = System.getProperty(feature.systemPropertyOld());
-            }
+        String value = System.getProperty(sysPropertyName);
+        if (value == null && feature.systemPropertyOld() != null) {
+            // legacy system property
+            value = System.getProperty(feature.systemPropertyOld());
+        }
 
-            if (value != null && !value.isEmpty()) {
-                setFeature(feature, State.SYSTEMPROPERTY, Boolean.parseBoolean(value));
-                return true;
-            }
+        if (value != null && !value.isEmpty()) {
+            setFeature(feature, State.SYSTEMPROPERTY, Boolean.parseBoolean(value));
+            return true;
+        }
 
-            value = SecuritySupport.readConfig(sysPropertyName);
-            if (value != null && !value.isEmpty()) {
-                setFeature(feature, State.JAXPDOTPROPERTIES, Boolean.parseBoolean(value));
-                return true;
-            }
-        } catch (NumberFormatException e) {
-            //invalid setting
-            throw new NumberFormatException("Invalid setting for system property: " + feature.systemProperty());
+        value = SecuritySupport.readConfig(sysPropertyName);
+        if (value != null && !value.isEmpty()) {
+            setFeature(feature, State.JAXPDOTPROPERTIES, Boolean.parseBoolean(value));
+            return true;
         }
         return false;
     }
diff --git a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java
index dee62f58950..478d12220d7 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/SecuritySupport.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
@@ -140,54 +140,7 @@ public static String readConfig(String propName) {
      * found
      */
     public static String readConfig(String propName, boolean stax) {
-        // always load the default configuration file
-        if (firstTime) {
-            synchronized (cacheProps) {
-                if (firstTime) {
-                    boolean found = loadProperties(
-                            Paths.get(System.getProperty("java.home"),
-                                "conf", "jaxp.properties")
-                                .toAbsolutePath().normalize().toString());
-
-                    // attempts to find stax.properties only if jaxp.properties is not available
-                    if (stax && !found) {
-                        found = loadProperties(
-                            Paths.get(System.getProperty("java.home"),
-                                    "conf", "stax.properties")
-                                    .toAbsolutePath().normalize().toString()
-                        );
-                    }
-
-                    // load the custom configure on top of the default if any
-                    String configFile = System.getProperty(JdkConstants.CONFIG_FILE_PROPNAME);
-                    if (configFile != null) {
-                        loadProperties(configFile);
-                    }
-
-                    firstTime = false;
-                }
-            }
-        }
-
-        return cacheProps.getProperty(propName);
-    }
-
-    /**
-     * Loads the properties from the specified file into the cache.
-     * @param file the specified file
-     * @return true if success, false otherwise
-     */
-    private static boolean loadProperties(String file) {
-        File f = new File(file);
-        if (SecuritySupport.doesFileExist(f)) {
-            try (final InputStream in = SecuritySupport.getFileInputStream(f)) {
-                cacheProps.load(in);
-                return true;
-            } catch (IOException e) {
-                // shouldn't happen, but required by method getFileInputStream
-            }
-        }
-        return false;
+        return JdkXmlConfig.getInstance(stax).getJaxpConfig().getProperty(propName);
     }
 
     /**
diff --git a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java
index 90c222de40e..5ca4073e20f 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityManager.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
@@ -44,7 +44,7 @@
  * This class manages standard and implementation-specific limitations.
  *
  */
-public final class XMLSecurityManager {
+public final class XMLSecurityManager implements Cloneable {
 
     public static final String DTD_KEY = JdkConstants.DTD_PROPNAME;
 
@@ -232,7 +232,7 @@ public static enum Processor {
     /**
      * Values of the properties
      */
-    private final int[] values;
+    private int[] values;
 
     /**
      * States of the settings for each property
@@ -283,31 +283,36 @@ public XMLSecurityManager(boolean secureProcessing) {
                 states[limit.ordinal()] = State.DEFAULT;
             }
         }
-
-        //read system properties or the config file (jaxp.properties by default)
-        readSystemProperties();
-        // prepare the JDK Catalog
-        prepareCatalog();
     }
 
     /**
-     * Flag indicating whether the JDK Catalog has been initialized
+     * Returns a copy of the XMLSecurityManager.
+     * @return a copy of the XMLSecurityManager
      */
-    static volatile boolean jdkcatalogInitialized = false;
-    private final Object lock = new Object();
-
-    private void prepareCatalog() {
-        if (!jdkcatalogInitialized) {
-            synchronized (lock) {
-                if (!jdkcatalogInitialized) {
-                    jdkcatalogInitialized = true;
-                    String resolve = getLimitValueAsString(Limit.JDKCATALOG_RESOLVE);
-                    JdkCatalog.init(resolve);
-                }
-            }
+    public XMLSecurityManager clone() {
+        try {
+            XMLSecurityManager copy = (XMLSecurityManager) super.clone();
+            copy.values = this.values.clone();
+            copy.states = this.states.clone();
+            copy.isSet = this.isSet.clone();
+            return copy;
+        } catch (CloneNotSupportedException e) {
+            // shouldn't happen as this class is Cloneable
+            throw new InternalError(e);
         }
     }
 
+    /**
+     * Returns a copy of the XMLSecurityManager that is updated with the
+     * current System Properties.
+     * @return a copy of the XMLSecurityManager
+     */
+    public XMLSecurityManager cloneAndUpdate() {
+        XMLSecurityManager copy = clone();
+        copy.readSystemProperties();
+        return copy;
+    }
+
     /**
      * Returns the JDKCatalogResolver with the current setting of the RESOLVE
      * property.
@@ -316,7 +321,8 @@ private void prepareCatalog() {
      */
     public CatalogResolver getJDKCatalogResolver() {
         String resolve = getLimitValueAsString(Limit.JDKCATALOG_RESOLVE);
-        return CatalogManager.catalogResolver(JdkCatalog.catalog, toActionType(resolve));
+        return CatalogManager.catalogResolver(
+                JdkXmlConfig.getInstance(false).getJdkCatalog(), toActionType(resolve));
     }
 
     // convert the string value of the RESOLVE property to the corresponding
diff --git a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityPropertyManager.java b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityPropertyManager.java
index 0f2725fe762..ff9ab621fab 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityPropertyManager.java
+++ b/src/java.xml/share/classes/jdk/xml/internal/XMLSecurityPropertyManager.java
@@ -31,33 +31,39 @@
  * This class manages security related properties
  *
  */
-public final class XMLSecurityPropertyManager extends FeaturePropertyBase {
+public final class XMLSecurityPropertyManager extends FeaturePropertyBase implements Cloneable {
 
     /**
      * Properties managed by the security property manager
      */
     public static enum Property {
-        ACCESS_EXTERNAL_DTD(XMLConstants.ACCESS_EXTERNAL_DTD,
+        ACCESS_EXTERNAL_DTD(XMLConstants.ACCESS_EXTERNAL_DTD, JdkConstants.SP_ACCESS_EXTERNAL_DTD,
                 JdkConstants.EXTERNAL_ACCESS_DEFAULT),
-        ACCESS_EXTERNAL_SCHEMA(XMLConstants.ACCESS_EXTERNAL_SCHEMA,
+        ACCESS_EXTERNAL_SCHEMA(XMLConstants.ACCESS_EXTERNAL_SCHEMA, JdkConstants.SP_ACCESS_EXTERNAL_SCHEMA,
                 JdkConstants.EXTERNAL_ACCESS_DEFAULT),
-        ACCESS_EXTERNAL_STYLESHEET(XMLConstants.ACCESS_EXTERNAL_STYLESHEET,
+        ACCESS_EXTERNAL_STYLESHEET(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, JdkConstants.SP_ACCESS_EXTERNAL_STYLESHEET,
                 JdkConstants.EXTERNAL_ACCESS_DEFAULT);
 
-        final String name;
+        final String apiProperty;
+        final String systemProperty;
         final String defaultValue;
 
-        Property(String name, String value) {
-            this.name = name;
+        Property(String apiProperty, String systemProperty, String value) {
+            this.apiProperty = apiProperty;
+            this.systemProperty = systemProperty;
             this.defaultValue = value;
         }
 
         public boolean equalsName(String propertyName) {
-            return (propertyName == null) ? false : name.equals(propertyName);
+            return (propertyName == null) ? false :
+                    (apiProperty.equals(propertyName) || systemProperty.equals(propertyName));
         }
 
         public String propertyName() {
-            return name;
+            return apiProperty;
+        }
+        public String systemProperty() {
+            return systemProperty;
         }
         String defaultValue() {
             return defaultValue;
@@ -72,8 +78,33 @@ public XMLSecurityPropertyManager() {
         for (Property property : Property.values()) {
             values[property.ordinal()] = property.defaultValue();
         }
-        //read system properties or jaxp.properties
-        readSystemProperties();
+    }
+
+    /**
+     * Returns a copy of the XMLSecurityManager.
+     * @return a copy of the XMLSecurityManager
+     */
+    public XMLSecurityPropertyManager clone() {
+        try {
+            XMLSecurityPropertyManager copy = (XMLSecurityPropertyManager) super.clone();
+            copy.values = this.values.clone();
+            copy.states = this.states.clone();
+            return copy;
+        } catch (CloneNotSupportedException e) {
+            // shouldn't happen as this class is Cloneable
+            throw new InternalError(e);
+        }
+    }
+
+    /**
+     * Returns a copy of the XMLSecurityPropertyManager that is updated with the
+     * current System Properties.
+     * @return a copy of the XMLSecurityPropertyManager
+     */
+    public XMLSecurityPropertyManager cloneAndUpdate() {
+        XMLSecurityPropertyManager copy = clone();
+        copy.readSystemProperties();
+        return copy;
     }
 
     /**
@@ -133,13 +164,18 @@ public String getValue(Property property) {
     /**
      * Read from system properties, or those in jaxp.properties
      */
-    private void readSystemProperties() {
-        getSystemProperty(Property.ACCESS_EXTERNAL_DTD,
-                JdkConstants.SP_ACCESS_EXTERNAL_DTD);
-        getSystemProperty(Property.ACCESS_EXTERNAL_SCHEMA,
-                JdkConstants.SP_ACCESS_EXTERNAL_SCHEMA);
-        getSystemProperty(Property.ACCESS_EXTERNAL_STYLESHEET,
-                JdkConstants.SP_ACCESS_EXTERNAL_STYLESHEET);
+    public void readSystemProperties() {
+        for (Property property : Property.values()) {
+            if (State.SYSTEMPROPERTY.compareTo(states[property.ordinal()]) >= 0 &&
+                    property.systemProperty() != null) {
+                // attempts to read the System Property
+                if (!getSystemProperty(property, property.systemProperty())) {
+                    //if system property is not found, try the config file
+                    if (State.JAXPDOTPROPERTIES.compareTo(states[property.ordinal()]) >= 0) {
+                        getPropertyConfig(property, property.systemProperty());
+                    }
+                }
+            }
+        }
     }
-
 }

From 375f3dc9ed0f1704e726d0d704420c38a0a5513c Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 9 May 2025 17:50:51 +0000
Subject: [PATCH 379/901] 8356053: Test
 java/awt/Toolkit/Headless/HeadlessToolkit.java fails by timeout

Reviewed-by: prr, kizune
---
 .../awt/Toolkit/Headless/HeadlessToolkit.java | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java b/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java
index 87970aab10a..ebf4c598a15 100644
--- a/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.java
+++ b/test/jdk/java/awt/Toolkit/Headless/HeadlessToolkit.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
@@ -21,8 +21,20 @@
  * questions.
  */
 
-import javax.imageio.ImageIO;
-import java.awt.*;
+import java.awt.AWTEvent;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.AWTEventListener;
 import java.awt.event.KeyEvent;
@@ -35,16 +47,16 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URL;
 import java.util.Map;
 
+import javax.imageio.ImageIO;
+
 /*
  * @test
  * @summary Check that Toolkit methods do not throw unexpected exceptions
  *          in headless mode
  * @run main/othervm -Djava.awt.headless=true HeadlessToolkit
  */
-
 public class HeadlessToolkit {
 
     class awtEventListener implements AWTEventListener {
@@ -275,13 +287,12 @@ void doTest() throws IOException {
             im = tk.createImage(image.getAbsolutePath());
             im.flush();
 
-        }
-
-        im = tk.getImage(new URL("https://openjdk.org/images/openjdk.png"));
-        im.flush();
+            im = tk.getImage(image.toURI().toURL());
+            im.flush();
 
-        im = tk.createImage(new URL("https://openjdk.org/images/openjdk.png"));
-        im.flush();
+            im = tk.createImage(image.toURI().toURL());
+            im.flush();
+        }
 
         MemoryImageSource mis;
         int pixels[] = new int[50 * 50];

From 30cb94d6b04a2be764a11b38f8bacabc7aaf9388 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 9 May 2025 18:10:18 +0000
Subject: [PATCH 380/901] 8346683: Problem list automated tests that fail on
 macOS15

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 606ac735088..c1a20e9ee63 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -119,6 +119,7 @@ java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java 8081489 generi
 java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java 6849364 generic-all
 java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java 6848406 generic-all
 java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java 6848407 generic-all
+java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java 8340374 macosx-all
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
 java/awt/Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java 8286840 linux-all
 java/awt/Frame/InitialIconifiedTest.java 7144049,8203920 macosx-all,linux-all
@@ -127,8 +128,9 @@ java/awt/Frame/FocusTest.java 8341480 macosx-all
 java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java 8160558 windows-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all
+java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java 8353673 macosx-all
 java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java 8171510 macosx-all
-java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8288839 windows-x64
+java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java 8288839 windows-x64,macosx-all
 java/awt/dnd/DragExitBeforeDropTest.java 8242805 macosx-all
 java/awt/dnd/DragThresholdTest.java 8076299 macosx-all
 java/awt/dnd/CustomDragCursorTest.java 8242805 macosx-all

From 3b20bed6e2599fbddb16b75c06ee55637dd6836f Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 9 May 2025 18:22:45 +0000
Subject: [PATCH 381/901] 8356229: cmp-baseline build fail due to lib/modules
 difference

Reviewed-by: iklam, erikj, liach
---
 make/GenerateLinkOptData.gmk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 5fc745ba223..1f52b88e1ef 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -76,10 +76,12 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    $(CLASSLIST_FILE_VM_OPTS) \
+	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist $(LOG_DEBUG)
 	$(GREP) -v HelloClasslist $@.raw > $@.interim
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
+	    -Xlog:cds=off \
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
 	    -Xmx128M -Xms128M $(LOG_INFO)
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
@@ -87,6 +89,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    $(CLASSLIST_FILE_VM_OPTS) \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
+	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist \
 	    2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
@@ -100,6 +103,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
 	$(GREP) -v @cp $@.raw.3 > $@.raw.4
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
+	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.SortClasslist $@.raw.4 > $@
 

From 68a118509a562334eb8c099129d79520041b10cf Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Fri, 9 May 2025 19:20:17 +0000
Subject: [PATCH 382/901] 8310003: Improve logging when default truststore is
 inaccessible

Reviewed-by: mullan
---
 .../share/classes/sun/security/ssl/TrustStoreManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
index 8f464e058e2..82dc82362ca 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -112,7 +112,7 @@ private TrustStoreDescriptor(String storeName, String storeType,
                 SSLLogger.fine(
                     "trustStore is: " + storeName + "\n" +
                     "trustStore type is: " + storeType + "\n" +
-                    "trustStore provider is: " + storeProvider + "\n" +
+                    "trustStore provider is: " + (storeProvider.isEmpty() ? "unspecified" : storeProvider) + "\n" +
                     "the last modified time is: " + (new Date(lastModified)));
             }
         }

From 8fadf295b0ba720a5bc728c6b4d159e60447de97 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Fri, 9 May 2025 21:48:16 +0000
Subject: [PATCH 383/901] 8351443: Improve robustness of StringBuilder

Reviewed-by: liach, rgiulietti, bchristi, jpai
---
 .../java/lang/AbstractStringBuilder.java      | 728 ++++++++++++------
 .../share/classes/java/lang/StringLatin1.java |  23 +-
 .../share/classes/java/lang/StringUTF16.java  |  30 +-
 .../patches/java.base/java/lang/Helper.java   |  10 +-
 .../StringBuilder/CompactStringBuilder.java   |  57 +-
 .../java/lang/StringBuilder/HugeCapacity.java |  26 +-
 .../java/lang/StringBuilder/StressSBTest.java | 337 ++++++++
 .../StringBuilder/StringBuilderRepeat.java    |   8 +-
 8 files changed, 942 insertions(+), 277 deletions(-)
 create mode 100644 test/jdk/java/lang/StringBuilder/StressSBTest.java

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index c83effb0b45..b63e9d09210 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -120,7 +120,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
                 ? length + 16 : Integer.MAX_VALUE;
         final byte initCoder = str.coder();
         coder = initCoder;
-        value = (initCoder == LATIN1)
+        value = (isLatin1(coder))
                 ? new byte[capacity] : StringUTF16.newBytesFor(capacity);
         append(str);
     }
@@ -179,12 +179,13 @@ int compareTo(AbstractStringBuilder another) {
         int count1 = this.count;
         int count2 = another.count;
 
+        byte coder = this.coder;
         if (coder == another.coder) {
-            return isLatin1() ? StringLatin1.compareTo(val1, val2, count1, count2)
-                              : StringUTF16.compareTo(val1, val2, count1, count2);
+            return isLatin1(coder) ? StringLatin1.compareTo(val1, val2, count1, count2)
+                    : StringUTF16.compareTo(val1, val2, count1, count2);
         }
-        return isLatin1() ? StringLatin1.compareToUTF16(val1, val2, count1, count2)
-                          : StringUTF16.compareToLatin1(val1, val2, count1, count2);
+        return isLatin1(coder) ? StringLatin1.compareToUTF16(val1, val2, count1, count2)
+                : StringUTF16.compareToLatin1(val1, val2, count1, count2);
     }
 
     /**
@@ -227,39 +228,116 @@ public int capacity() {
      */
     public void ensureCapacity(int minimumCapacity) {
         if (minimumCapacity > 0) {
-            ensureCapacityInternal(minimumCapacity);
+            value = ensureCapacitySameCoder(value, coder, minimumCapacity);
         }
     }
 
     /**
+     * {@return true if the byte array should be replaced due to increased capacity or coder change}
+     * <ul>
+     *     <li>The new coder is different than the old coder
+     *     <li>The new length is greater than to the current length
+     *     <li>The new length is negative, as it might have overflowed due to an increment
+     * </ul>
+     *
+     * @param value       a byte array
+     * @param coder       old coder
+     * @param newCapacity new capacity in characters
+     * @param newCoder    new coder
+     */
+    private static boolean needsNewBuffer(byte[] value, byte coder, int newCapacity, byte newCoder) {
+        long newLength = (long) newCapacity << newCoder;
+        return coder != newCoder || newLength > value.length || 0 > newLength;
+    }
+
+    /**
+     * {@return the value, with the requested coder, in a buffer with at least the minimum capacity}
+     * If the coder matches and there is enough room, the same buffer is returned.
+     * Otherwise, a new buffer is allocated and the string is copied or inflated to match the new coder.
      * For positive values of {@code minimumCapacity}, this method
-     * behaves like {@code ensureCapacity}, however it is never
-     * synchronized.
-     * If {@code minimumCapacity} is non positive due to numeric
+     * behaves like the public {@linkplain #ensureCapacity}, however it is never synchronized.
+     * If {@code minimumCapacity} is non-positive due to numeric
      * overflow, this method throws {@code OutOfMemoryError}.
+     * @param value the current buffer
+     * @param coder of the current buffer
+     * @param count the count of chars in the current buffer
+     * @param minimumCapacity the new minimum capacity
+     * @param newCoder the desired new coder
+     */
+    private static byte[] ensureCapacityNewCoder(byte[] value, byte coder, int count,
+                                                 int minimumCapacity, byte newCoder) {
+        assert coder == newCoder || newCoder == UTF16 : "bad new coder UTF16 -> LATIN1";
+        // overflow-conscious code
+        // Compute the new larger size if growth is requested, otherwise keep the capacity the same
+        int oldCapacity = value.length >> coder;
+        int growth = minimumCapacity - oldCapacity;
+        int newCapacity = (growth <= 0)
+                ? oldCapacity               // Do not reduce capacity even if requested
+                : newCapacity(value, newCoder, minimumCapacity);
+        assert count <= newCapacity : "count exceeds new capacity";
+
+        if (coder == newCoder) {
+            if (newCapacity > oldCapacity) {
+                // copy all bytes to new larger buffer
+                value = Arrays.copyOf(value, newCapacity << newCoder);
+            }
+            return value;
+        } else {
+            // inflate (and grow if additional length is requested)
+            byte[] newValue = StringUTF16.newBytesFor(newCapacity);
+            StringLatin1.inflate(value, 0, newValue, 0, count);
+            return newValue;
+        }
+    }
+
+    /**
+     * {@return the value buffer sufficient to hold the minimumCapactity and a copy of the contents}
+     * There is no change to the coder.
+     * The current value buffer is returned if the size is already sufficient.
+     * For positive values of {@code minimumCapacity}, this method
+     * behaves like {@code ensureCapacity}, however it is never synchronized.
+     * If {@code minimumCapacity} is non-positive due to numeric
+     * overflow, this method throws {@code OutOfMemoryError}.
+     * @param value the current buffer
+     * @param coder of the current buffer
+     * @param minimumCapacity the new minimum capacity
      */
-    private void ensureCapacityInternal(int minimumCapacity) {
+    private static byte[] ensureCapacitySameCoder(byte[] value, byte coder, int minimumCapacity) {
         // overflow-conscious code
         int oldCapacity = value.length >> coder;
         if (minimumCapacity - oldCapacity > 0) {
             value = Arrays.copyOf(value,
-                    newCapacity(minimumCapacity) << coder);
+                    newCapacity(value, coder, minimumCapacity) << coder);
         }
+        return value;
+    }
+
+    /**
+     * Inflates the internal 8-bit latin1 storage to 16-bit <hi=0, low> pair storage.
+     * @param value the current byte array buffer
+     * @param count the number of latin1 characters to convert to UTF16
+     * @return the new buffer, the caller is responsible for updates to the coder
+     */
+    private static byte[] inflateToUTF16(byte[] value, int count) {
+        assert count <= value.length : "count > value.length";
+        byte[] newValue = StringUTF16.newBytesFor(value.length);
+        StringLatin1.inflate(value, 0, newValue, 0, count);
+        return newValue;
     }
 
     /**
      * Returns a capacity at least as large as the given minimum capacity.
-     * Returns the current capacity increased by the current length + 2 if
-     * that suffices.
-     * Will not return a capacity greater than
-     * {@code (SOFT_MAX_ARRAY_LENGTH >> coder)}
+     * Returns the current capacity increased by the current length + 2 if that suffices.
+     * Will not return a capacity greater than {@code (SOFT_MAX_ARRAY_LENGTH >> coder)}
      * unless the given minimum capacity is greater than that.
      *
+     * @param value the current buffer
+     * @param coder of the current buffer
      * @param  minCapacity the desired minimum capacity
      * @throws OutOfMemoryError if minCapacity is less than zero or
      *         greater than (Integer.MAX_VALUE >> coder)
      */
-    private int newCapacity(int minCapacity) {
+    private static int newCapacity(byte[] value, byte coder, int minCapacity) {
         int oldLength = value.length;
         int newLength = minCapacity << coder;
         int growth = newLength - oldLength;
@@ -270,20 +348,6 @@ private int newCapacity(int minCapacity) {
         return length >> coder;
     }
 
-    /**
-     * If the coder is "isLatin1", this inflates the internal 8-bit storage
-     * to 16-bit <hi=0, low> pair storage.
-     */
-    private void inflate() {
-        if (!isLatin1()) {
-            return;
-        }
-        byte[] buf = StringUTF16.newBytesFor(value.length);
-        StringLatin1.inflate(value, 0, buf, 0, count);
-        this.value = buf;
-        this.coder = UTF16;
-    }
-
     /**
      * Attempts to reduce storage used for the character sequence.
      * If the buffer is larger than necessary to hold its current sequence of
@@ -327,17 +391,16 @@ public void setLength(int newLength) {
         if (newLength < 0) {
             throw new StringIndexOutOfBoundsException(newLength);
         }
-        ensureCapacityInternal(newLength);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = ensureCapacitySameCoder(this.value, coder, newLength);
         if (count < newLength) {
-            if (isLatin1()) {
-                StringLatin1.fillNull(value, count, newLength);
-            } else {
-                StringUTF16.fillNull(value, count, newLength);
-            }
+            Arrays.fill(value, count << coder, newLength << coder, (byte)0);
         } else if (count > newLength) {
             maybeLatin1 = true;
         }
-        count = newLength;
+        this.count = newLength;
+        this.value = value;
     }
 
     /**
@@ -361,10 +424,10 @@ public void setLength(int newLength) {
     public char charAt(int index) {
         byte coder = this.coder;
         byte[] value = this.value;
-        // Ensure count is less than or equal to capacity (racy reads and writes can produce inconsistent values)
+        // Count should be less than or equal to capacity (racy reads and writes can produce inconsistent values)
         int count = Math.min(this.count, value.length >> coder);
         checkIndex(index, count);
-        if (coder == LATIN1) {
+        if (isLatin1(coder)) {
             return (char)(value[index] & 0xff);
         }
         return StringUTF16.getChar(value, index);
@@ -392,10 +455,11 @@ public char charAt(int index) {
      *             sequence.
      */
     public int codePointAt(int index) {
+        byte coder = this.coder;
         int count = this.count;
         byte[] value = this.value;
         checkIndex(index, count);
-        if (isLatin1()) {
+        if (isLatin1(coder)) {
             return value[index] & 0xff;
         }
         return StringUTF16.codePointAtSB(value, index, count);
@@ -423,10 +487,12 @@ public int codePointAt(int index) {
      *            of this sequence.
      */
     public int codePointBefore(int index) {
+        byte coder = this.coder;
+        int count = this.count;
         byte[] value = this.value;
         int i = index - 1;
         checkIndex(i, count);
-        if (isLatin1()) {
+        if (isLatin1(coder)) {
             return value[i] & 0xff;
         }
         return StringUTF16.codePointBeforeSB(value, index);
@@ -453,8 +519,11 @@ public int codePointBefore(int index) {
      * {@code beginIndex} is larger than {@code endIndex}.
      */
     public int codePointCount(int beginIndex, int endIndex) {
-        Preconditions.checkFromToIndex(beginIndex, endIndex, length(), null);
-        if (isLatin1()) {
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = this.value;
+        Preconditions.checkFromToIndex(beginIndex, endIndex, count, null);
+        if (isLatin1(coder)) {
             return endIndex - beginIndex;
         }
         return StringUTF16.codePointCountSB(value, beginIndex, endIndex);
@@ -496,7 +565,7 @@ public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
         Preconditions.checkFromToIndex(srcBegin, srcEnd, count, Preconditions.SIOOBE_FORMATTER);  // compatible to old version
         int n = srcEnd - srcBegin;
         Preconditions.checkFromToIndex(dstBegin, dstBegin + n, dst.length, Preconditions.IOOBE_FORMATTER);
-        if (isLatin1()) {
+        if (isLatin1(coder)) {
             StringLatin1.getChars(value, srcBegin, srcEnd, dst, dstBegin);
         } else {
             StringUTF16.getChars(value, srcBegin, srcEnd, dst, dstBegin);
@@ -518,14 +587,19 @@ public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
      *             negative or greater than or equal to {@code length()}.
      */
     public void setCharAt(int index, char ch) {
+        byte coder = this.coder;
+        int count = this.count;
         checkIndex(index, count);
-        if (isLatin1() && StringLatin1.canEncode(ch)) {
+        byte[] value  = this.value;
+        byte newCoder = (byte)(coder | StringLatin1.coderFromChar(ch));
+        if (needsNewBuffer(value, coder, count, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count, newCoder);
+            this.coder = coder = newCoder;
+        }
+        if (isLatin1(coder)) {
             value[index] = (byte)ch;
         } else {
-            if (isLatin1()) {
-                inflate();
-            }
-            StringUTF16.putCharSB(value, index, ch);
+            StringUTF16.putChar(value, index, ch);
             maybeLatin1 = true;
         }
     }
@@ -567,10 +641,17 @@ public AbstractStringBuilder append(String str) {
         if (str == null) {
             return appendNull();
         }
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = this.value;
         int len = str.length();
-        ensureCapacityInternal(count + len);
-        putStringAt(count, str);
-        count += len;
+        byte newCoder = (byte)(coder | str.coder());
+        if (needsNewBuffer(value, coder, count + len, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count + len, newCoder);
+            this.coder = newCoder;
+        }
+        str.getBytes(value, count, newCoder);
+        this.count = count + len;
         return this;
     }
 
@@ -592,10 +673,16 @@ AbstractStringBuilder append(AbstractStringBuilder asb) {
             return appendNull();
         }
         int len = asb.length();
-        ensureCapacityInternal(count + len);
-        inflateIfNeededFor(asb);
-        asb.getBytes(value, count, coder);
-        count += len;
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = this.value;
+        byte newCoder = (byte)(coder | asb.coder);
+        if (needsNewBuffer(value, coder, count + len, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count + len, newCoder);
+            this.coder = newCoder;
+        }
+        asb.getBytes(value, count, newCoder);
+        this.count = count + len;
         maybeLatin1 |= asb.maybeLatin1;
         return this;
     }
@@ -606,28 +693,26 @@ public AbstractStringBuilder append(CharSequence s) {
         if (s == null) {
             return appendNull();
         }
-        if (s instanceof String) {
-            return this.append((String)s);
+        if (s instanceof String str) {
+            return this.append(str);
         }
-        if (s instanceof AbstractStringBuilder) {
-            return this.append((AbstractStringBuilder)s);
+        if (s instanceof AbstractStringBuilder asb) {
+            return this.append(asb);
         }
         return this.append(s, 0, s.length());
     }
 
     private AbstractStringBuilder appendNull() {
-        ensureCapacityInternal(count + 4);
+        byte coder = this.coder;
         int count = this.count;
-        byte[] val = this.value;
-        if (isLatin1()) {
-            val[count++] = 'n';
-            val[count++] = 'u';
-            val[count++] = 'l';
-            val[count++] = 'l';
-        } else {
-            count = StringUTF16.putCharsAt(val, count, 'n', 'u', 'l', 'l');
-        }
-        this.count = count;
+        int newCount = count + 4;
+        byte[] value = ensureCapacitySameCoder(this.value, coder, newCount);
+        if (isLatin1(coder))
+            StringLatin1.putCharsAt(value, count, 'n', 'u', 'l', 'l');
+        else
+            StringUTF16.putCharsAt(value, count, 'n', 'u', 'l', 'l');
+        this.count = newCount;
+        this.value = value;
         return this;
     }
 
@@ -671,12 +756,17 @@ public AbstractStringBuilder append(CharSequence s, int start, int end) {
         }
         Preconditions.checkFromToIndex(start, end, s.length(), Preconditions.IOOBE_FORMATTER);
         int len = end - start;
-        ensureCapacityInternal(count + len);
-        if (s instanceof String) {
-            appendChars((String)s, start, end);
-        } else {
-            appendChars(s, start, end);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] currValue = ensureCapacitySameCoder(this.value, coder, count + len);
+        byte[] value = (s instanceof String str)
+            ? appendChars(currValue, coder, count, str, start, end)
+            : appendChars(currValue, coder, count, s, start, end);
+        if (currValue != value) {
+            this.coder = UTF16;
         }
+        this.count = count + len;
+        this.value = value;
         return this;
     }
 
@@ -699,8 +789,15 @@ public AbstractStringBuilder append(CharSequence s, int start, int end) {
      */
     public AbstractStringBuilder append(char[] str) {
         int len = str.length;
-        ensureCapacityInternal(count + len);
-        appendChars(str, 0, len);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] currValue = ensureCapacitySameCoder(this.value, coder, count + len);
+        byte[] value = appendChars(currValue, coder, count, str, 0, len);
+        if (currValue != value) {
+            this.coder = UTF16;
+        }
+        this.count = count + len;
+        this.value = value;
         return this;
     }
 
@@ -729,8 +826,15 @@ public AbstractStringBuilder append(char[] str) {
     public AbstractStringBuilder append(char[] str, int offset, int len) {
         int end = offset + len;
         Preconditions.checkFromToIndex(offset, end, str.length, Preconditions.IOOBE_FORMATTER);
-        ensureCapacityInternal(count + len);
-        appendChars(str, offset, end);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] currValue = ensureCapacitySameCoder(value, coder, count + len);
+        byte[] value = appendChars(currValue, coder, count, str, offset, end);
+        if (currValue != value) {
+            this.coder = UTF16;
+        }
+        this.count = count + len;
+        this.value = value;
         return this;
     }
 
@@ -747,30 +851,24 @@ public AbstractStringBuilder append(char[] str, int offset, int len) {
      * @return  a reference to this object.
      */
     public AbstractStringBuilder append(boolean b) {
-        ensureCapacityInternal(count + (b ? 4 : 5));
+        byte coder = this.coder;
         int count = this.count;
-        byte[] val = this.value;
-        if (isLatin1()) {
-            if (b) {
-                val[count++] = 't';
-                val[count++] = 'r';
-                val[count++] = 'u';
-                val[count++] = 'e';
-            } else {
-                val[count++] = 'f';
-                val[count++] = 'a';
-                val[count++] = 'l';
-                val[count++] = 's';
-                val[count++] = 'e';
-            }
+
+        int newCount = count + (b ? 4 : 5);
+        byte[] value = ensureCapacitySameCoder(this.value, coder, newCount);
+        if (b) {
+            if (isLatin1(coder))
+                StringLatin1.putCharsAt(value, count, 't', 'r', 'u', 'e');
+            else
+                StringUTF16.putCharsAt(value, count, 't', 'r', 'u', 'e');
         } else {
-            if (b) {
-                count = StringUTF16.putCharsAt(val, count, 't', 'r', 'u', 'e');
-            } else {
-                count = StringUTF16.putCharsAt(val, count, 'f', 'a', 'l', 's', 'e');
-            }
+            if (isLatin1(coder))
+                StringLatin1.putCharsAt(value, count, 'f', 'a', 'l', 's', 'e');
+            else
+                StringUTF16.putCharsAt(value, count, 'f', 'a', 'l', 's', 'e');
         }
-        this.count = count;
+        this.value = value;
+        this.count = newCount;
         return this;
     }
 
@@ -791,15 +889,20 @@ public AbstractStringBuilder append(boolean b) {
      */
     @Override
     public AbstractStringBuilder append(char c) {
-        ensureCapacityInternal(count + 1);
-        if (isLatin1() && StringLatin1.canEncode(c)) {
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = this.value;
+        byte newCoder = (byte) (coder | StringLatin1.coderFromChar(c));
+        if (needsNewBuffer(value, coder, count + 1, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count + 1, newCoder);
+            this.coder = coder = newCoder;
+        }
+        if (isLatin1(coder)) {
             value[count++] = (byte)c;
         } else {
-            if (isLatin1()) {
-                inflate();
-            }
-            StringUTF16.putCharSB(value, count++, c);
+            StringUTF16.putChar(value, count++, c);
         }
+        this.count = count;
         return this;
     }
 
@@ -816,14 +919,16 @@ public AbstractStringBuilder append(char c) {
      * @return  a reference to this object.
      */
     public AbstractStringBuilder append(int i) {
+        byte coder = this.coder;
         int count = this.count;
         int spaceNeeded = count + DecimalDigits.stringSize(i);
-        ensureCapacityInternal(spaceNeeded);
-        if (isLatin1()) {
+        byte[] value = ensureCapacitySameCoder(this.value, coder, spaceNeeded);
+        if (isLatin1(coder)) {
             DecimalDigits.getCharsLatin1(i, spaceNeeded, value);
         } else {
             DecimalDigits.getCharsUTF16(i, spaceNeeded, value);
         }
+        this.value = value;
         this.count = spaceNeeded;
         return this;
     }
@@ -841,14 +946,16 @@ public AbstractStringBuilder append(int i) {
      * @return  a reference to this object.
      */
     public AbstractStringBuilder append(long l) {
+        byte coder = this.coder;
         int count = this.count;
         int spaceNeeded = count + DecimalDigits.stringSize(l);
-        ensureCapacityInternal(spaceNeeded);
-        if (isLatin1()) {
+        byte[] value = ensureCapacitySameCoder(this.value, coder, spaceNeeded);
+        if (isLatin1(coder)) {
             DecimalDigits.getCharsLatin1(l, spaceNeeded, value);
         } else {
             DecimalDigits.getCharsUTF16(l, spaceNeeded, value);
         }
+        this.value = value;
         this.count = spaceNeeded;
         return this;
     }
@@ -866,9 +973,12 @@ public AbstractStringBuilder append(long l) {
      * @return  a reference to this object.
      */
     public AbstractStringBuilder append(float f) {
-        ensureCapacityInternal(count + FloatToDecimal.MAX_CHARS);
-        FloatToDecimal toDecimal = isLatin1() ? FloatToDecimal.LATIN1 : FloatToDecimal.UTF16;
-        count = toDecimal.putDecimal(value, count, f);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = ensureCapacitySameCoder(this.value, coder,count + FloatToDecimal.MAX_CHARS);
+        FloatToDecimal toDecimal = isLatin1(coder) ? FloatToDecimal.LATIN1 : FloatToDecimal.UTF16;
+        this.count = toDecimal.putDecimal(value, count, f);
+        this.value = value;
         return this;
     }
 
@@ -885,9 +995,12 @@ public AbstractStringBuilder append(float f) {
      * @return  a reference to this object.
      */
     public AbstractStringBuilder append(double d) {
-        ensureCapacityInternal(count + DoubleToDecimal.MAX_CHARS);
-        DoubleToDecimal toDecimal = isLatin1() ? DoubleToDecimal.LATIN1 : DoubleToDecimal.UTF16;
-        count = toDecimal.putDecimal(value, count, d);
+        byte coder = this.coder;
+        int count = this.count;
+        byte[] value = ensureCapacitySameCoder(this.value, coder,count + DoubleToDecimal.MAX_CHARS);
+        DoubleToDecimal toDecimal = isLatin1(coder) ? DoubleToDecimal.LATIN1 : DoubleToDecimal.UTF16;
+        this.count = toDecimal.putDecimal(value, count, d);
+        this.value = value;
         return this;
     }
 
@@ -913,7 +1026,7 @@ public AbstractStringBuilder delete(int start, int end) {
         Preconditions.checkFromToIndex(start, end, count, Preconditions.SIOOBE_FORMATTER);
         int len = end - start;
         if (len > 0) {
-            shift(end, -len);
+            shift(value, coder, count, end, -len);
             this.count = count - len;
             maybeLatin1 = true;
         }
@@ -964,9 +1077,10 @@ public AbstractStringBuilder appendCodePoint(int codePoint) {
      *              {@code length()}.
      */
     public AbstractStringBuilder deleteCharAt(int index) {
+        int count = this.count;
         checkIndex(index, count);
-        shift(index + 1, -1);
-        count--;
+        shift(value, coder, count, index + 1, -1);
+        this.count = count - 1;
         maybeLatin1 = true;
         return this;
     }
@@ -991,6 +1105,7 @@ public AbstractStringBuilder deleteCharAt(int index) {
      *             greater than {@code end}.
      */
     public AbstractStringBuilder replace(int start, int end, String str) {
+        byte coder = this.coder;
         int count = this.count;
         if (end > count) {
             end = count;
@@ -998,10 +1113,15 @@ public AbstractStringBuilder replace(int start, int end, String str) {
         Preconditions.checkFromToIndex(start, end, count, Preconditions.SIOOBE_FORMATTER);
         int len = str.length();
         int newCount = count + len - (end - start);
-        ensureCapacityInternal(newCount);
-        shift(end, newCount - count);
+        byte newCoder = (byte) (coder | str.coder());
+        byte[] value = this.value;
+        if (needsNewBuffer(value, coder, newCount, newCoder) ) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, newCount, newCoder);
+            this.coder = coder = newCoder;
+        }
+        shift(value, coder, count, end, newCount - count);
+        str.getBytes(value, start, coder);
         this.count = newCount;
-        putStringAt(start, str);
         maybeLatin1 = true;
         return this;
     }
@@ -1067,13 +1187,13 @@ public CharSequence subSequence(int start, int end) {
      */
     public String substring(int start, int end) {
         Preconditions.checkFromToIndex(start, end, count, Preconditions.SIOOBE_FORMATTER);
-        if (isLatin1()) {
+        if (isLatin1(coder)) {
             return StringLatin1.newString(value, start, end - start);
         }
         return StringUTF16.newString(value, start, end - start);
     }
 
-    private void shift(int offset, int n) {
+    private static void shift(byte[] value, byte coder, int count, int offset, int n) {
         System.arraycopy(value, offset << coder,
                          value, (offset + n) << coder, (count - offset) << coder);
     }
@@ -1102,12 +1222,19 @@ private void shift(int offset, int n) {
     public AbstractStringBuilder insert(int index, char[] str, int offset,
                                         int len)
     {
+        byte coder = this.coder;
+        int count = this.count;
         checkOffset(index, count);
         Preconditions.checkFromToIndex(offset, offset + len, str.length, Preconditions.SIOOBE_FORMATTER);
-        ensureCapacityInternal(count + len);
-        shift(index, len);
+        byte[] value = ensureCapacitySameCoder(this.value, coder, count + len);
+        shift(value, coder, count, index, len);
         count += len;
-        putCharsAt(index, str, offset, offset + len);
+        byte[] newValue = putCharsAt(value, coder, count, index, str, offset, offset + len);
+        if  (newValue != value) {
+            this.coder = UTF16;
+        }
+        this.value = newValue;
+        this.count = count;
         return this;
     }
 
@@ -1166,15 +1293,22 @@ public AbstractStringBuilder insert(int offset, Object obj) {
      * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
      */
     public AbstractStringBuilder insert(int offset, String str) {
+        byte coder = this.coder;
+        int count = this.count;
         checkOffset(offset, count);
         if (str == null) {
             str = "null";
         }
         int len = str.length();
-        ensureCapacityInternal(count + len);
-        shift(offset, len);
-        count += len;
-        putStringAt(offset, str);
+        byte newCoder = (byte) (coder | str.coder());
+        byte[] value = this.value;
+        if (needsNewBuffer(value, coder, count + len, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count + len, newCoder);
+            this.coder = coder = newCoder;
+        }
+        shift(value, coder, count, offset, len);
+        this.count = count + len;
+        str.getBytes(value, offset, coder);
         return this;
     }
 
@@ -1203,12 +1337,19 @@ public AbstractStringBuilder insert(int offset, String str) {
      * @throws     StringIndexOutOfBoundsException  if the offset is invalid.
      */
     public AbstractStringBuilder insert(int offset, char[] str) {
+        byte coder = this.coder;
+        int count = this.count;
         checkOffset(offset, count);
         int len = str.length;
-        ensureCapacityInternal(count + len);
-        shift(offset, len);
+        byte[] currValue = ensureCapacitySameCoder(this.value, coder, count + len);
+        shift(currValue, coder, count, offset, len);
         count += len;
-        putCharsAt(offset, str, 0, len);
+        byte[] newValue = putCharsAt(currValue, coder, count, offset, str, 0, len);
+        if (currValue != newValue) {
+            this.coder = UTF16;
+        }
+        this.count = count;
+        this.value = newValue;
         return this;
     }
 
@@ -1268,7 +1409,7 @@ public AbstractStringBuilder insert(int dstOffset, CharSequence s) {
      * The {@code dstOffset} argument must be greater than or equal to
      * {@code 0}, and less than or equal to the {@linkplain #length() length}
      * of this sequence.
-     * <p>The start argument must be nonnegative, and not greater than
+     * <p>The start argument must be non-negative, and not greater than
      * {@code end}.
      * <p>The end argument must be greater than or equal to
      * {@code start}, and less than or equal to the length of s.
@@ -1298,17 +1439,23 @@ public AbstractStringBuilder insert(int dstOffset, CharSequence s,
         if (s == null) {
             s = "null";
         }
+        byte coder = this.coder;
+        int count = this.count;
         checkOffset(dstOffset, count);
         Preconditions.checkFromToIndex(start, end, s.length(), Preconditions.IOOBE_FORMATTER);
         int len = end - start;
-        ensureCapacityInternal(count + len);
-        shift(dstOffset, len);
+        byte[] currValue = ensureCapacitySameCoder(this.value, coder, count + len);
+        shift(currValue, coder, count, dstOffset, len);
         count += len;
-        if (s instanceof String) {
-            putStringAt(dstOffset, (String) s, start, end);
-        } else {
-            putCharsAt(dstOffset, s, start, end);
+        // Coder of CharSequence may be a mismatch, requiring the value array to be inflated
+        byte[] newValue = (s instanceof String str)
+            ? putStringAt(currValue, coder, count, dstOffset, str, start, end)
+            : putCharsAt(currValue, coder, count, dstOffset, s, start, end);
+        if (currValue != newValue) {
+            this.coder = UTF16;
         }
+        this.value = newValue;
+        this.count = count;
         return this;
     }
 
@@ -1355,18 +1502,23 @@ public AbstractStringBuilder insert(int offset, boolean b) {
      * @throws     IndexOutOfBoundsException  if the offset is invalid.
      */
     public AbstractStringBuilder insert(int offset, char c) {
+        byte coder = this.coder;
+        int count = this.count;
         checkOffset(offset, count);
-        ensureCapacityInternal(count + 1);
-        shift(offset, 1);
-        count += 1;
-        if (isLatin1() && StringLatin1.canEncode(c)) {
+        byte newCoder = (byte)(coder | StringLatin1.coderFromChar(c));
+        byte[] value = this.value;
+
+        if (needsNewBuffer(value, coder, count + 1, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, count, count + 1, newCoder);
+            this.coder = coder = newCoder;
+        }
+        shift(value, coder, count, offset, 1);
+        if (isLatin1(coder)) {
             value[offset] = (byte)c;
         } else {
-            if (isLatin1()) {
-                inflate();
-            }
             StringUTF16.putCharSB(value, offset, c);
         }
+        this.count = count + 1;
         return this;
     }
 
@@ -1567,7 +1719,7 @@ public AbstractStringBuilder reverse() {
         byte[] val = this.value;
         int count = this.count;
         int n = count - 1;
-        if (isLatin1()) {
+        if (isLatin1(this.coder)) {
             for (int j = (n-1) >> 1; j >= 0; j--) {
                 int k = n - j;
                 byte cj = val[j];
@@ -1632,7 +1784,7 @@ public IntStream codePoints() {
                     byte[] val = this.value;
                     int count = this.count;
                     byte coder = this.coder;
-                    return coder == LATIN1
+                    return isLatin1(coder)
                            ? new StringLatin1.CharsSpliterator(val, 0, count, 0)
                            : new StringUTF16.CodePointsSpliterator(val, 0, count, 0);
                 },
@@ -1678,145 +1830,220 @@ final byte getCoder() {
         return COMPACT_STRINGS ? coder : UTF16;
     }
 
+    // Package access for String and StringBuffer.
     final boolean isLatin1() {
+        return isLatin1(coder);
+    }
+
+    private static boolean isLatin1(byte coder) {
         return COMPACT_STRINGS && coder == LATIN1;
     }
 
-    private final void putCharsAt(int index, char[] s, int off, int end) {
-        if (isLatin1()) {
-            byte[] val = this.value;
-            for (int i = off, j = index; i < end; i++) {
+    /**
+     * {@return Return the buffer containing the composed string and inserted characters}
+     * If the buffer coder needs to support UTF16 and does not, it is inflated and a different
+     * buffer is returned. The caller is responsible for setting the coder and updating the value ref
+     * based solely on the difference in the buffer reference.
+     *
+     * @param value byte array destination for the string (if the coder matches)
+     * @param coder the original buffer coder
+     * @param count the count of characters in the original buffer
+     * @param index the insertion point
+     * @param s char[] array to insert from
+     * @param off offset of the first character
+     * @param end the offset of the last character (exclusive)
+     */
+    private static byte[] putCharsAt(byte[] value, byte coder, int count, int index, char[] s, int off, int end) {
+        if (isLatin1(coder)) {
+            int latin1Len = StringUTF16.compress(s, off, value, index, end - off);
+            for (int i = off + latin1Len, j = index + latin1Len; i < end; i++) {
                 char c = s[i];
                 if (StringLatin1.canEncode(c)) {
-                    val[j++] = (byte)c;
+                    value[j++] = (byte)c;
                 } else {
-                    inflate();
-                    StringUTF16.putCharsSB(this.value, j, s, i, end);
-                    return;
+                    value = inflateToUTF16(value, count);
+                    // Store c to make sure sb has a UTF16 char
+                    StringUTF16.putCharSB(value, j++, c);
+                    i++;
+                    StringUTF16.putCharsSB(value, j, s, i, end);
+                    return value;
                 }
             }
         } else {
-            StringUTF16.putCharsSB(this.value, index, s, off, end);
+            StringUTF16.putCharsSB(value, index, s, off, end);
         }
+        return value;
     }
 
-    private final void putCharsAt(int index, CharSequence s, int off, int end) {
-        if (isLatin1()) {
-            byte[] val = this.value;
+    /**
+     * {@return Return the buffer containing the composed string and inserted characters}
+     * If the buffer coder needs to support UTF16 and does not, it is inflated and a different
+     * buffer is returned. The caller is responsible for setting the coder and updating the value ref
+     * based solely on the difference in the buffer reference.
+     *
+     * @param value byte array destination for the string (if the coder matches)
+     * @param coder the original buffer coder
+     * @param count the count of characters in the original buffer
+     * @param index the insertion point
+     * @param s CharSequence to insert from
+     * @param off offset of the first character
+     * @param end the offset of the last character (exclusive)
+     */
+    private static byte[] putCharsAt(byte[] value, byte coder, int count, int index, CharSequence s, int off, int end) {
+        if (isLatin1(coder)) {
             for (int i = off, j = index; i < end; i++) {
                 char c = s.charAt(i);
                 if (StringLatin1.canEncode(c)) {
-                    val[j++] = (byte)c;
+                    value[j++] = (byte)c;
                 } else {
-                    inflate();
+                    value = inflateToUTF16(value, count);
                     // store c to make sure it has a UTF16 char
-                    StringUTF16.putCharSB(this.value, j++, c);
+                    StringUTF16.putCharSB(value, j++, c);
                     i++;
-                    StringUTF16.putCharsSB(this.value, j, s, i, end);
-                    return;
+                    StringUTF16.putCharsSB(value, j, s, i, end);
+                    return value;
                 }
             }
         } else {
-            StringUTF16.putCharsSB(this.value, index, s, off, end);
-        }
-    }
-
-    private void inflateIfNeededFor(String input) {
-        if (COMPACT_STRINGS && (coder != input.coder())) {
-            inflate();
+            StringUTF16.putCharsSB(value, index, s, off, end);
         }
+        return value;
     }
 
-    private void inflateIfNeededFor(AbstractStringBuilder input) {
-        if (COMPACT_STRINGS && (coder != input.getCoder())) {
-            inflate();
+    private static byte[] inflateIfNeededFor(byte[] value, int count, byte coder, byte otherCoder) {
+        if (COMPACT_STRINGS && (coder == LATIN1 && otherCoder == UTF16)) {
+            return inflateToUTF16(value, count);
         }
+        return value;
     }
 
-    private void putStringAt(int index, String str, int off, int end) {
-        inflateIfNeededFor(str);
-        str.getBytes(value, off, index, coder, end - off);
-    }
-
-    private void putStringAt(int index, String str) {
-        inflateIfNeededFor(str);
-        str.getBytes(value, index, coder);
-    }
-
-    private final void appendChars(char[] s, int off, int end) {
-        int count = this.count;
-        if (isLatin1()) {
-            byte[] val = this.value;
-            for (int i = off, j = count; i < end; i++) {
+    /**
+     * {@return the buffer with the substring inserted}
+     * If the substring contains UTF16 characters and the current coder is LATIN1, inflation occurs
+     * into a new buffer and returned; the caller must update the coder to UTF16.
+     * Since the contents are immutable, a simple copy of characters is sufficient.
+     * @param value an existing buffer to insert into
+     * @param coder the coder of the buffer
+     * @param count the count of characters in the buffer
+     * @param index the index to insert the string
+     * @param str the string
+     */
+     private static byte[] putStringAt(byte[] value, byte coder, int count, int index, String str, int off, int end) {
+        byte[] newValue = inflateIfNeededFor(value, count, coder, str.coder());
+        coder = (newValue == value) ? coder : UTF16;
+        str.getBytes(newValue, off, index, coder, end - off);
+        return newValue;
+    }
+
+    /**
+     * {@return buffer with new characters appended, possibly inflated}
+     * The value buffer capacity must be large enough to hold the additional (end - off) characters
+     * (assuming they are all latin1).
+     * The buffer will be inflated if any character is UTF16 and the buffer is latin1.
+     * If the returned buffer is different then passed in, the new coder is UTF16.
+     * The caller is responsible for updating the count.
+     * @param value the current buffer
+     * @param coder the coder of the buffer
+     * @param count the character count
+     * @param s a char array
+     * @param off the offset of the first character to append
+     * @param end end last (exclusive) character to append
+     */
+    private static byte[] appendChars(byte[] value, byte coder, int count, char[] s, int off, int end) {
+        if (isLatin1(coder)) {
+            int latin1Len = StringUTF16.compress(s, off, value, count, end - off);
+            for (int i = off + latin1Len, j = count + latin1Len; i < end; i++) {
                 char c = s[i];
                 if (StringLatin1.canEncode(c)) {
-                    val[j++] = (byte)c;
+                    value[j++] = (byte)c;
                 } else {
-                    this.count = count = j;
-                    inflate();
-                    StringUTF16.putCharsSB(this.value, j, s, i, end);
-                    this.count = count + end - i;
-                    return;
+                    value = inflateToUTF16(value, j);
+                    // Store c to make sure sb has a UTF16 char
+                    StringUTF16.putCharSB(value, j++, c);
+                    i++;
+                    StringUTF16.putCharsSB(value, j, s, i, end);
+                    return value;
                 }
             }
         } else {
-            StringUTF16.putCharsSB(this.value, count, s, off, end);
+            StringUTF16.putCharsSB(value, count, s, off, end);
         }
-        this.count = count + end - off;
+        return value;
     }
 
-    private final void appendChars(String s, int off, int end) {
-        if (isLatin1()) {
+    /**
+     * {@return buffer with new characters appended, possibly inflated}
+     * The value buffer capacity must be large enough to hold the additional (end - off) characters
+     * (assuming they are all latin1).
+     * The buffer will be inflated if any character is UTF16 and the buffer is latin1.
+     * If the returned buffer is different then passed in, the new coder is UTF16.
+     * The caller is responsible for updating the count.
+     * @param value the current buffer
+     * @param coder the coder of the buffer
+     * @param count the character count
+     * @param s a string
+     * @param off the offset of the first character to append
+     * @param end end last (exclusive) character to append
+     */
+    private static byte[] appendChars(byte[] value, byte coder, int count, String s, int off, int end) {
+        if (isLatin1(coder)) {
             if (s.isLatin1()) {
-                System.arraycopy(s.value(), off, this.value, this.count, end - off);
+                System.arraycopy(s.value(), off, value, count, end - off);
             } else {
                 // We might need to inflate, but do it as late as possible since
                 // the range of characters we're copying might all be latin1
-                byte[] val = this.value;
                 for (int i = off, j = count; i < end; i++) {
                     char c = s.charAt(i);
                     if (StringLatin1.canEncode(c)) {
-                        val[j++] = (byte) c;
+                        value[j++] = (byte) c;
                     } else {
-                        count = j;
-                        inflate();
-                        System.arraycopy(s.value(), i << UTF16, this.value, j << UTF16, (end - i) << UTF16);
-                        count += end - i;
-                        return;
+                        value = inflateToUTF16(value, j);
+                        System.arraycopy(s.value(), i << UTF16, value, j << UTF16, (end - i) << UTF16);
+                        return value;
                     }
                 }
             }
         } else if (s.isLatin1()) {
-            StringUTF16.putCharsSB(this.value, this.count, s, off, end);
+            StringUTF16.putCharsSB(value, count, s, off, end);
         } else { // both UTF16
-            System.arraycopy(s.value(), off << UTF16, this.value, this.count << UTF16, (end - off) << UTF16);
+            System.arraycopy(s.value(), off << UTF16, value, count << UTF16, (end - off) << UTF16);
         }
-        count += end - off;
+        return value;
     }
 
-    private final void appendChars(CharSequence s, int off, int end) {
-        if (isLatin1()) {
-            byte[] val = this.value;
+    /**
+     * {@return buffer with new characters appended, possibly inflated}
+     * The value buffer capacity must be large enough to hold the additional (end - off) characters
+     * (assuming they are all latin1).
+     * The buffer will be inflated if any character is UTF16 and the buffer is latin1.
+     * If the returned buffer is different then passed in, the new coder is UTF16.
+     * The caller is responsible for updating the count.
+     * @param value the current buffer
+     * @param coder the coder of the buffer
+     * @param count the character count
+     * @param s CharSequence to append characters from
+     * @param off the offset of the first character to append
+     * @param end end last (exclusive) character to append
+     */
+    private static byte[] appendChars(byte[] value, byte coder, int count, CharSequence s, int off, int end) {
+        if (isLatin1(coder)) {
             for (int i = off, j = count; i < end; i++) {
                 char c = s.charAt(i);
                 if (StringLatin1.canEncode(c)) {
-                    val[j++] = (byte)c;
+                    value[j++] = (byte)c;
                 } else {
-                    count = j;
-                    inflate();
+                    value = inflateToUTF16(value, j);
                     // Store c to make sure sb has a UTF16 char
-                    StringUTF16.putCharSB(this.value, j++, c);
-                    count = j;
+                    StringUTF16.putCharSB(value, j++, c);
                     i++;
-                    StringUTF16.putCharsSB(this.value, j, s, i, end);
-                    count += end - i;
-                    return;
+                    StringUTF16.putCharsSB(value, j, s, i, end);
+                    return value;
                 }
             }
         } else {
-            StringUTF16.putCharsSB(this.value, count, s, off, end);
+            StringUTF16.putCharsSB(value, count, s, off, end);
         }
-        count += end - off;
+        return value;
     }
 
     /**
@@ -1846,7 +2073,7 @@ long prepend(long lengthCoder, byte[] buffer) {
 
         if (lengthCoder < ((long)UTF16 << 32)) {
             System.arraycopy(value, 0, buffer, (int)lengthCoder, count);
-        } else if (coder == LATIN1) {
+        } else if (isLatin1(coder)) {
             StringUTF16.inflate(value, 0, buffer, (int)lengthCoder, count);
         } else {
             System.arraycopy(value, 0, buffer, (int)lengthCoder << 1, count << 1);
@@ -1856,16 +2083,19 @@ long prepend(long lengthCoder, byte[] buffer) {
     }
 
     private AbstractStringBuilder repeat(char c, int count) {
-        int limit = this.count + count;
-        ensureCapacityInternal(limit);
-        boolean isLatin1 = isLatin1();
-        if (isLatin1 && StringLatin1.canEncode(c)) {
-            Arrays.fill(value, this.count, limit, (byte)c);
+        byte coder = this.coder;
+        int prevCount = this.count;
+        int limit = prevCount + count;
+        byte[] value = this.value;
+        byte newCoder = (byte) (coder | StringLatin1.coderFromChar(c));
+        if (needsNewBuffer(value, coder, limit, newCoder)) {
+            this.value = value = ensureCapacityNewCoder(value, coder, prevCount, limit, newCoder);
+            this.coder = coder = newCoder;
+        }
+        if (isLatin1(coder)) {
+            Arrays.fill(value, prevCount, limit, (byte)c);
         } else {
-            if (isLatin1) {
-                inflate();
-            }
-            for (int index = this.count; index < limit; index++) {
+            for (int index = prevCount; index < limit; index++) {
                 StringUTF16.putCharSB(value, index, c);
             }
         }
@@ -1950,20 +2180,36 @@ public AbstractStringBuilder repeat(CharSequence cs, int count) {
         } else if (length == 1) {
             return repeat(cs.charAt(0), count);
         }
+        byte coder = this.coder;
         int offset = this.count;
+        byte[] value = this.value;
         int valueLength = length << coder;
         if ((Integer.MAX_VALUE - offset) / count < valueLength) {
             throw new OutOfMemoryError("Required length exceeds implementation limit");
         }
         int total = count * length;
         int limit = offset + total;
-        ensureCapacityInternal(limit);
         if (cs instanceof String str) {
-            putStringAt(offset, str);
+            byte newCoder = (byte)(coder | str.coder());
+            if (needsNewBuffer(value, coder, limit, newCoder)) {
+                this.value = value = ensureCapacityNewCoder(value, coder, offset, limit, newCoder);
+                this.coder = coder = newCoder;
+            }
+            str.getBytes(value, offset, newCoder);
         } else if (cs instanceof AbstractStringBuilder asb) {
-            append(asb);
+            byte newCoder = (byte)(coder | asb.coder);
+            if (needsNewBuffer(value, coder, limit, newCoder)) {
+                this.value = value = ensureCapacityNewCoder(value, coder, offset, limit, newCoder);
+                this.coder = coder = newCoder;
+            }
+            asb.getBytes(value, offset, newCoder);
         } else {
-            appendChars(cs, 0, length);
+            byte[] currValue = ensureCapacitySameCoder(value, coder, limit);
+            value = appendChars(currValue, coder, offset, cs, 0, length);
+            if (currValue != value) {
+                this.coder = coder = UTF16;
+            }
+            this.value = value;
         }
         String.repeatCopyRest(value, offset << coder, total << coder, length << coder);
         this.count = limit;
diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index 5303eefc25c..da3acbe5f0a 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -54,6 +54,10 @@ public static boolean canEncode(int cp) {
         return cp >=0 && cp <= 0xff;
     }
 
+    public static byte coderFromChar(char cp) {
+        return (byte)((0xff - cp) >>> (Integer.SIZE - 1));
+    }
+
     public static int length(byte[] value) {
         return value.length;
     }
@@ -709,6 +713,21 @@ static Stream<String> lines(byte[] value) {
         return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
     }
 
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
+        value[i] = (byte)c1;
+        value[i + 1] = (byte)c2;
+        value[i + 2] = (byte)c3;
+        value[i + 3] = (byte)c4;
+    }
+
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
+        value[i] = (byte)c1;
+        value[i + 1] = (byte)c2;
+        value[i + 2] = (byte)c3;
+        value[i + 3] = (byte)c4;
+        value[i + 4] = (byte)c5;
+    }
+
     public static void putChar(byte[] val, int index, int c) {
         //assert (canEncode(c));
         val[index] = (byte)(c);
@@ -742,10 +761,6 @@ public static String newString(byte[] val, int index, int len) {
                           LATIN1);
     }
 
-    public static void fillNull(byte[] val, int index, int end) {
-        Arrays.fill(val, index, end, (byte)0);
-    }
-
     // inflatedCopy byte[] -> char[]
     @IntrinsicCandidate
     public static void inflate(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java
index a07c022040f..722c818017d 100644
--- a/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/src/java.base/share/classes/java/lang/StringUTF16.java
@@ -1331,10 +1331,6 @@ public static String newString(byte[] val, int index, int len) {
         return new String(Arrays.copyOfRange(val, index << 1, last << 1), UTF16);
     }
 
-    public static void fillNull(byte[] val, int index, int end) {
-        Arrays.fill(val, index << 1, end << 1, (byte)0);
-    }
-
     static class CharsSpliterator implements Spliterator.OfInt {
         private final byte[] array;
         private int index;        // current index, modified on advance/split
@@ -1532,27 +1528,23 @@ public static boolean contentEquals(byte[] value, CharSequence cs, int len) {
         return true;
     }
 
-    public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
         int end = i + 4;
         checkBoundsBeginEnd(i, end, value);
-        putChar(value, i++, c1);
-        putChar(value, i++, c2);
-        putChar(value, i++, c3);
-        putChar(value, i++, c4);
-        assert(i == end);
-        return end;
+        putChar(value, i, c1);
+        putChar(value, i + 1, c2);
+        putChar(value, i + 2, c3);
+        putChar(value, i + 3, c4);
     }
 
-    public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
         int end = i + 5;
         checkBoundsBeginEnd(i, end, value);
-        putChar(value, i++, c1);
-        putChar(value, i++, c2);
-        putChar(value, i++, c3);
-        putChar(value, i++, c4);
-        putChar(value, i++, c5);
-        assert(i == end);
-        return end;
+        putChar(value, i, c1);
+        putChar(value, i + 1, c2);
+        putChar(value, i + 2, c3);
+        putChar(value, i + 3, c4);
+        putChar(value, i + 4, c5);
     }
 
     public static char charAt(byte[] value, int index) {
diff --git a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
index 540c0774fd0..aef27bfb9a4 100644
--- a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
+++ b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.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
@@ -140,12 +140,12 @@ public static boolean contentEquals(byte[] value, CharSequence cs, int len) {
         return StringUTF16.contentEquals(value, cs, len);
     }
 
-    public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
-        return StringUTF16.putCharsAt(value, i, c1, c2, c3, c4);
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4) {
+        StringUTF16.putCharsAt(value, i, c1, c2, c3, c4);
     }
 
-    public static int putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
-        return StringUTF16.putCharsAt(value, i, c1, c2, c3, c4, c5);
+    public static void putCharsAt(byte[] value, int i, char c1, char c2, char c3, char c4, char c5) {
+        StringUTF16.putCharsAt(value, i, c1, c2, c3, c4, c5);
     }
 
     public static char charAt(byte[] value, int index) {
diff --git a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java
index 5564cce8662..49eb3b28ff3 100644
--- a/test/jdk/java/lang/StringBuilder/CompactStringBuilder.java
+++ b/test/jdk/java/lang/StringBuilder/CompactStringBuilder.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
@@ -30,11 +30,12 @@
 
 /*
  * @test
- * @bug 8054307 8077559
+ * @bug 8054307 8077559 8351443
  * @summary Tests Compact String. This test is testing StringBuilder
  *          behavior related to Compact String.
  * @run testng/othervm -XX:+CompactStrings CompactStringBuilder
  * @run testng/othervm -XX:-CompactStrings CompactStringBuilder
+ * @run testng/othervm -Xcomp CompactStringBuilder
  */
 
 public class CompactStringBuilder {
@@ -54,6 +55,10 @@ public void testCompactStringBuilderForLatinA() {
         check(new StringBuilder(ORIGIN).append(new StringBuffer("\uFF21")),
                 "A\uFF21");
         check(new StringBuilder(ORIGIN).append("\uFF21"), "A\uFF21");
+        check(new StringBuilder(ORIGIN).append(new char[] { 'a', 'b', 'c'}),
+                "Aabc");
+        check(new StringBuilder(ORIGIN).append(new char[] { 'a', 'b', 'c'}, 1, 2),
+                "Abc");
         check(new StringBuilder(ORIGIN).append(new StringBuffer("\uFF21")),
                 "A\uFF21");
         check(new StringBuilder(ORIGIN).delete(0, 1), "");
@@ -404,6 +409,54 @@ public void testCompactStringForMaybeLatin1() {
       check(new StringBuilder().append(sb), "AB");
     }
 
+    // Test cases to force expanding the capacity during replace.
+    // Start with a known capacity and a known initial value that almost fills it.
+    // Use both latin1 and utf16 initial values and replacement values.
+    // Iterate through cases of SB.replace start and end values and various lengths of replacement.
+    // The results are checked by composing the new string using concatenation of the segments.
+    @Test
+    public void testGrowingCapacityReplace() {
+        final int INIT_CAPACITY = 8;
+        final String[] INITIAL_CHARS = {"A", "\u0100"};
+        final String[] REPLACEMENT_CHARS = {"B", "\u0101"};
+        for (String INITIAL : INITIAL_CHARS) {
+            for (String REPLACEMENT : REPLACEMENT_CHARS) {
+                for (int initLen = INIT_CAPACITY - 1; initLen < INIT_CAPACITY + 2; initLen++) {
+                    final String orig = INITIAL.repeat(initLen);
+                    for (int start = INIT_CAPACITY - 4; start < orig.length(); start++) {
+                        for (int end = start; end < orig.length(); end++) {
+                            for (int insLen = 0; insLen < 2; insLen++) {
+                                final String repl = REPLACEMENT.repeat(insLen);
+                                var sb = new StringBuilder(INIT_CAPACITY)
+                                        .append(orig);
+                                int capBefore = sb.capacity();
+                                sb.replace(start, end, repl);
+                                int capAfter = sb.capacity();
+                                String expected = genReplacementString(orig, start, end, repl);
+                                try {
+                                    check(sb, expected);
+                                } catch (Throwable ex) {
+                                    System.out.printf("repl: \"%s\", actual: %s, expected: %s%n", repl, sb, expected);
+                                    System.out.printf("    insLen: %d, gap: %d, beforeLen: %d, afterLen: %d, capBefore: %d, capAfter: %d%n",
+                                            insLen, (end - start), orig.length(), sb.length(),
+                                            capBefore, capAfter);
+                                    throw ex;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Construct the replacement string using string concat of the segments
+    private static String genReplacementString(String orig, int start, int end, String repl) {
+        return orig.substring(0, start) +
+                repl +
+                orig.substring(end, orig.length());
+    }
+
     private void checkGetChars(StringBuilder sb, int srcBegin, int srcEnd,
             char expected[]) {
         char[] dst = new char[srcEnd - srcBegin];
diff --git a/test/jdk/java/lang/StringBuilder/HugeCapacity.java b/test/jdk/java/lang/StringBuilder/HugeCapacity.java
index a81f1614fe5..e8440915f8a 100644
--- a/test/jdk/java/lang/StringBuilder/HugeCapacity.java
+++ b/test/jdk/java/lang/StringBuilder/HugeCapacity.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
@@ -23,9 +23,11 @@
 
 import jdk.internal.util.ArraysSupport;
 
+import java.util.Arrays;
+
 /**
  * @test
- * @bug 8149330 8218227
+ * @bug 8149330 8218227 8351443
  * @summary Capacity should not get close to Integer.MAX_VALUE unless
  *          necessary
  * @modules java.base/jdk.internal.util
@@ -47,6 +49,7 @@ public static void main(String[] args) {
         testUtf16();
         testHugeInitialString();
         testHugeInitialCharSequence();
+        testHugePlus(isCompact);
         if (failures > 0) {
             throw new RuntimeException(failures + " tests failed");
         }
@@ -108,4 +111,23 @@ public CharSequence subSequence(int st, int e) {
         }
         public String toString() { return ""; }
     }
+
+    // Test creating and appending the max size string for -XX:+CompactStrings and -XX:-CompactStrings
+    private static void testHugePlus(boolean isCompact) {
+        int repeatCount = (isCompact) ? Integer.MAX_VALUE / 2 - 1 : Integer.MAX_VALUE / 4 - 1;
+        char[] chars = new char[repeatCount];
+        char[] aChar = {'A', '\uff21'};
+        for (char ch : aChar) {
+            try {
+                int size = (ch > 0xff) ? repeatCount / 2 : repeatCount;
+                Arrays.fill(chars, 0, size, ch);
+                StringBuilder b = new StringBuilder(0);
+                b.append(chars, 0, size);
+                b.append(chars, 0, size);
+            } catch (Throwable unexpected) {
+                unexpected.printStackTrace();
+                failures++;
+            }
+        }
+    }
 }
diff --git a/test/jdk/java/lang/StringBuilder/StressSBTest.java b/test/jdk/java/lang/StringBuilder/StressSBTest.java
new file mode 100644
index 00000000000..a5dc6672f07
--- /dev/null
+++ b/test/jdk/java/lang/StringBuilder/StressSBTest.java
@@ -0,0 +1,337 @@
+/*
+ * 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 8351443
+ * @summary Randomized test of StringBuilder
+ * @run main StressSBTest
+ */
+
+import java.lang.System.Logger;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.CharBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.stream.IntStream;
+
+
+public class StressSBTest {
+
+    // Logger for info and errors
+    static final Logger LOG = System.getLogger("StressSBTest");
+    // Number of concurrent platform threads
+    private final static int N_THREADS = 11;
+    // Base length of test run
+    private final static Duration N_Duration = Duration.ofSeconds(2);
+    // Cache jtreg timeout factor to allow test to be run as a standalone main()
+    private static final double TIMEOUT_FACTOR =
+            Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"));
+
+    /**
+     * Run the stress test with a fixed set of parameters.
+     *
+     * @param ignored
+     */
+    public static void main(String[] ignored) {
+        Duration duration = Duration.ofMillis((long) (N_Duration.toMillis() * TIMEOUT_FACTOR));
+        new StressSBTest().stress(N_THREADS, duration);
+    }
+
+    /**
+     * Stress test using a number of platform threads for a duration.
+     * Success is marked by a lack of exceptions.
+     * Logging output indicates the number of operations performed by each thread
+     *
+     * @param numThreads the number of threads
+     * @param duration   a Duration, typically a few seconds
+     */
+    public void stress(int numThreads, Duration duration) {
+        StressOps stressOps = new StressOps();
+
+        final StringBuilder sb = new StringBuilder("abcdefghijklmnopqrstuvwxyz");
+        // A single StringBuilder is used to exercise the API in the face of racy behavior
+        List<Thread> threads = IntStream.range(0, numThreads).mapToObj(i -> {
+                    try {
+                        Thread t = Thread.ofPlatform().start(() -> stressOps.randomStress(sb, duration));
+                        LOG.log(Logger.Level.DEBUG, t);
+                        return t;
+                    } catch (Throwable t) {
+                        LOG.log(Logger.Level.ERROR, "Thread.ofPlatform", t);
+                    }
+                    return null;
+                })
+                .filter(t -> t != null)
+                .toList();
+        threads.forEach(t -> {
+            try {
+                t.join();
+            } catch (InterruptedException ie) {
+                // ignore
+            }
+        });
+        LOG.log(Logger.Level.INFO, "Completed: threads: %d, duration: %s".formatted(numThreads, duration));
+    }
+
+
+    /**
+     * Methods and support for stress testing StringBuilder.
+     */
+    private static class StressOps {
+
+        private static final Random randomGen = new Random();
+        private static final StringBuilder stringBuilder = new StringBuilder("wxyz");
+        private static final StringBuffer stringBuffer = new StringBuffer("wxyz");
+        private static final CharBuffer charBuffer = CharBuffer.allocate(10).append("charBuffer");
+        private static final char[] charArray = "xyz".toCharArray();
+        private static final CharSequence charSequence = "now is the time";
+        // Cache of mappings of all StringBuilder public instand methods mh -> Method
+        private static Map<MethodHandle, Method> testMethodsCache;
+        // Active map of SB methods mh -> Method
+        private final Map<MethodHandle, Method> testMethods;
+
+        public StressOps() {
+            if (testMethodsCache == null) {
+                testMethodsCache = findTestMethods();
+            }
+            testMethods = testMethodsCache;
+        }
+
+        /**
+         * Stress test randomizes methods acting on a StringBuilder.
+         * Exceptions are logged but do no affect success/failure result.
+         *
+         * @param sb       a StringBuilder
+         * @param duration a Duration of time to stress
+         */
+        public void randomStress(StringBuilder sb, Duration duration) {
+            MethodHandle[] ops = testMethods.keySet().toArray(new MethodHandle[0]);
+            int count = 0;
+            int worked = 0;
+            Instant end = Instant.now().plus(duration);
+            while (Instant.now().isBefore(end)) {
+                int j = randomGen.nextInt(ops.length);
+                var mh = ops[j];
+                String name = testMethods.get(mh).getName();
+                MethodType mt = mh.type();
+                try {
+                    count++;
+                    if (invokeByMethodNameAndType(name, mt, sb)) {
+                        worked++;
+                    }
+
+                } catch (Throwable t) {
+                    LOG.log(Logger.Level.DEBUG, "Exception testing " + name + mt, t);
+                }
+            }
+            LOG.log(Logger.Level.INFO, "StringBuilder method calls: %d, successful: %d".formatted(count, worked));
+        }
+
+
+        /**
+         * {@return Return a map of all the public instance methods of java.lang.StringBuilder
+         * mapping MethodHandle to the Method}
+         */
+        private Map<MethodHandle, Method> findTestMethods() {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            Method[] methods = StringBuilder.class.getDeclaredMethods();
+            Map<MethodHandle, Method> map = new HashMap<>(methods.length);
+            Arrays.stream(methods)
+                    .filter(m -> Modifier.isPublic(m.getModifiers()) &&
+                            !Modifier.isStatic(m.getModifiers()))
+                    .forEach(m -> {
+                        try {
+                            MethodHandle mh = lookup.unreflect(m);
+                            map.put(mh, m);
+                        } catch (IllegalAccessException iae) {
+                            LOG.log(Logger.Level.DEBUG, "AsbTest annotated method not accessible", iae);
+                        }
+                    });
+            LOG.log(Logger.Level.DEBUG, "%d StringBuilder test methods".formatted(map.size()));
+            return map;
+        }
+
+        /**
+         * Invoke the indicated method on the StringBuilder
+         *
+         * @param name the method name
+         * @param mt   the method type
+         * @param sb   a StringBuilder
+         * @return true if the method returned a non-null result
+         */
+        private boolean invokeByMethodNameAndType(String name, MethodType mt, StringBuilder sb) {
+            String s = name + mt.toString();
+            Object o = switch (s) {
+                case "length(StringBuilder)int" -> sb.length();
+                case "toString(StringBuilder)String" -> sb.toString();
+                case "append(StringBuilder,StringBuffer)AbstractStringBuilder" ->
+                        sb.append(stringBuffer);
+                case "append(StringBuilder,StringBuffer)StringBuilder" -> sb.append(stringBuffer);
+                case "append(StringBuilder,CharSequence)AbstractStringBuilder" ->
+                        sb.append(charBuffer);
+                case "append(StringBuilder,CharSequence)StringBuilder" -> sb.append(charBuffer);
+                case "append(StringBuilder,CharSequence)Appendable" -> sb.append(charBuffer);
+                case "append(StringBuilder,CharSequence,int,int)AbstractStringBuilder" ->
+                        sb.append("abc", 1, 2);
+                case "append(StringBuilder,CharSequence,int,int)StringBuilder" ->
+                        sb.append("abc", 1, 2);
+                case "append(StringBuilder,CharSequence,int,int)Appendable" ->
+                        sb.append("abc", 1, 2);
+                case "append(StringBuilder,char[])AbstractStringBuilder" -> sb.append(charArray);
+                case "append(StringBuilder,char[])StringBuilder" -> sb.append(charArray);
+                case "append(StringBuilder,String)AbstractStringBuilder" -> sb.append("Abcdefg");
+                case "append(StringBuilder,String)StringBuilder" -> sb.append("abcdefg");
+                case "append(StringBuilder,Object)AbstractStringBuilder" -> new Object();
+                case "append(StringBuilder,Object)StringBuilder" -> sb.append(new Object());
+                case "append(StringBuilder,char)Appendable" -> sb.append('\uff21');
+                case "append(StringBuilder,char)AbstractStringBuilder" -> sb.append('A');
+                case "append(StringBuilder,char)StringBuilder" -> sb.append('B');
+                case "append(StringBuilder,int)AbstractStringBuilder" -> sb.append(987654321);
+                case "append(StringBuilder,int)StringBuilder" -> sb.append(987654321);
+                case "append(StringBuilder,long)AbstractStringBuilder" ->
+                        sb.append(987654321987654321L);
+                case "append(StringBuilder,long)StringBuilder" -> sb.append(987654321987654321L);
+                case "append(StringBuilder,float)AbstractStringBuilder" -> sb.append(Math.PI);
+                case "append(StringBuilder,float)StringBuilder" -> sb.append(Math.PI);
+                case "append(StringBuilder,double)AbstractStringBuilder" -> sb.append(Math.TAU);
+                case "append(StringBuilder,double)StringBuilder" -> sb.append(Math.TAU);
+                case "append(StringBuilder,boolean)AbstractStringBuilder" -> sb.append(true);
+                case "append(StringBuilder,boolean)StringBuilder" -> sb.append(false);
+                case "append(StringBuilder,char[],int,int)AbstractStringBuilder" ->
+                        sb.append(charArray, 3, 4);
+                case "append(StringBuilder,char[],int,int)StringBuilder" ->
+                        sb.append(charArray, 4, 3);
+                case "reverse(StringBuilder)StringBuilder" -> sb.reverse();
+                case "reverse(StringBuilder)AbstractStringBuilder" -> sb.reverse();
+                case "getChars(StringBuilder,int,int,char[],int)void" -> {
+                    sb.getChars(2, 4, charArray, 3);
+                    yield sb;
+                }
+                case "compareTo(StringBuilder,Object)int" -> sb.compareTo(stringBuilder);
+                case "compareTo(StringBuilder,StringBuilder)int" -> sb.compareTo(stringBuilder);
+                case "indexOf(StringBuilder,String,int)int" -> sb.indexOf("A", 2);
+                case "indexOf(StringBuilder,String)int" -> sb.indexOf("B");
+                case "insert(StringBuilder,int,CharSequence)StringBuilder" ->
+                        sb.insert(2, charSequence);
+                case "insert(StringBuilder,int,CharSequence)AbstractStringBuilder" ->
+                        sb.insert(2, charSequence);
+                case "insert(StringBuilder,int,String)StringBuilder" -> sb.insert(2, "Now");
+                case "insert(StringBuilder,int,String)AbstractStringBuilder" ->
+                        sb.insert(2, "Then");
+                case "insert(StringBuilder,int,char[])StringBuilder" -> sb.insert(4, charArray);
+                case "insert(StringBuilder,int,char[])AbstractStringBuilder" ->
+                        sb.insert(4, charArray);
+                case "insert(StringBuilder,int,Object)AbstractStringBuilder" ->
+                        sb.insert(3, new Object());
+                case "insert(StringBuilder,int,Object)StringBuilder" -> sb.insert(4, "RUST");
+                case "insert(StringBuilder,int,char[],int,int)AbstractStringBuilder" ->
+                        sb.insert(2, charArray, 0, 4);
+                case "insert(StringBuilder,int,char[],int,int)StringBuilder" ->
+                        sb.insert(2, charArray, 0, 4);
+                case "insert(StringBuilder,int,int)StringBuilder" -> sb.insert(2, 46000);
+                case "insert(StringBuilder,int,int)AbstractStringBuilder" -> sb.insert(3, 47000);
+                case "insert(StringBuilder,int,double)StringBuilder" -> sb.insert(2, Math.PI);
+                case "insert(StringBuilder,int,double)AbstractStringBuilder" ->
+                        sb.insert(2, Math.PI);
+                case "insert(StringBuilder,int,float)StringBuilder" -> sb.insert(2, Math.TAU);
+                case "insert(StringBuilder,int,float)AbstractStringBuilder" ->
+                        sb.insert(2, Math.TAU);
+                case "insert(StringBuilder,int,long)StringBuilder" -> sb.insert(2, 42L);
+                case "insert(StringBuilder,int,long)AbstractStringBuilder" -> sb.insert(2, 42L);
+                case "insert(StringBuilder,int,char)StringBuilder" -> sb.insert(2, 'Z');
+                case "insert(StringBuilder,int,char)AbstractStringBuilder" -> sb.insert(2, 'Z');
+                case "insert(StringBuilder,int,boolean)StringBuilder" -> sb.insert(2, true);
+                case "insert(StringBuilder,int,boolean)AbstractStringBuilder" ->
+                        sb.insert(3, false);
+                case "insert(StringBuilder,int,CharSequence,int,int)StringBuilder" ->
+                        sb.insert(4, charSequence, 4, 5);
+                case "insert(StringBuilder,int,CharSequence,int,int)AbstractStringBuilder" ->
+                        sb.insert(4, charSequence, 5, 4);
+                case "charAt(StringBuilder,int)char" -> sb.charAt(5);
+                case "codePointAt(StringBuilder,int)int" -> sb.codePointAt(4);
+                case "codePointBefore(StringBuilder,int)int" -> sb.codePointBefore(3);
+                case "codePointCount(StringBuilder,int,int)int" -> sb.codePointCount(3, 9);
+                case "offsetByCodePoints(StringBuilder,int,int)int" -> sb.offsetByCodePoints(3, 7);
+                case "lastIndexOf(StringBuilder,String,int)int" -> sb.lastIndexOf("A", 45);
+                case "lastIndexOf(StringBuilder,String)int" -> sb.lastIndexOf("B");
+                case "substring(StringBuilder,int)String" -> sb.substring(6);
+                case "substring(StringBuilder,int,int)String" -> sb.substring(6, 9);
+                case "replace(StringBuilder,int,int,String)StringBuilder" ->
+                        sb.replace(2, 5, "xyz");
+                case "replace(StringBuilder,int,int,String)AbstractStringBuilder" ->
+                        sb.replace(2, 5, "XYZ");
+                case "repeat(StringBuilder,CharSequence,int)StringBuilder" -> sb.repeat('Z', 6);
+                case "repeat(StringBuilder,CharSequence,int)AbstractStringBuilder" ->
+                        sb.repeat('X', 42);
+                case "repeat(StringBuilder,int,int)AbstractStringBuilder" -> sb.repeat(101, 25);
+                case "repeat(StringBuilder,int,int)StringBuilder" -> sb.repeat(102, 24);
+                case "codePoints(StringBuilder)IntStream" -> sb.codePoints().count();
+                case "subSequence(StringBuilder,int,int)CharSequence" -> sb.subSequence(3, 9);
+                case "chars(StringBuilder)IntStream" -> sb.chars().count();
+                case "setLength(StringBuilder,int)void" -> {
+                    sb.setLength(45);
+                    yield 45;
+                }
+                case "capacity(StringBuilder)int" -> sb.capacity();
+                case "ensureCapacity(StringBuilder,int)void" -> {
+                    sb.ensureCapacity(150);
+                    yield 150;
+                }
+                case "trimToSize(StringBuilder)void" -> {
+                    sb.trimToSize();
+                    yield sb.length();
+                }
+                case "setCharAt(StringBuilder,int,char)void" -> {
+                    sb.setCharAt(6, 'T');
+                    yield 'T';
+                }
+                case "appendCodePoint(StringBuilder,int)StringBuilder" ->
+                        sb.appendCodePoint(0xff21);
+                case "appendCodePoint(StringBuilder,int)AbstractStringBuilder" ->
+                        sb.appendCodePoint(0xff21);
+                case "delete(StringBuilder,int,int)StringBuilder" -> sb.delete(5, 20);
+                case "delete(StringBuilder,int,int)AbstractStringBuilder" -> sb.delete(6, 21);
+                case "deleteCharAt(StringBuilder,int)AbstractStringBuilder" -> sb.deleteCharAt(7);
+                case "deleteCharAt(StringBuilder,int)StringBuilder" -> sb.deleteCharAt(8);
+                case "equals(Object,Object)boolean" -> false;
+                case "hashCode(Object)int" -> sb.hashCode();
+                case "getClass(Object)Class" -> sb.getClass();
+                case "isEmpty(CharSequence)boolean" -> null;
+                default -> {
+                    System.out.println("not executing: " + s);
+                    yield null;
+                }
+            };
+            return o != null;
+        }
+    }
+}
diff --git a/test/jdk/java/lang/StringBuilder/StringBuilderRepeat.java b/test/jdk/java/lang/StringBuilder/StringBuilderRepeat.java
index c191e85d7f1..6549cd22ac7 100644
--- a/test/jdk/java/lang/StringBuilder/StringBuilderRepeat.java
+++ b/test/jdk/java/lang/StringBuilder/StringBuilderRepeat.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
@@ -29,7 +29,7 @@
 
 /**
  * @test
- * @bug 8302323
+ * @bug 8302323 8351443
  * @summary Test StringBuilder.repeat sanity tests
  * @run testng/othervm -XX:-CompactStrings StringBuilderRepeat
  * @run testng/othervm -XX:+CompactStrings StringBuilderRepeat
@@ -107,7 +107,7 @@ public void sanity() {
 
         String expected = "repeat233333233333-2-3-3-3-3-3\u2461\u2462\u2462\u2462\u2462\u2462\u2461\u2462\u2462\u2462\u2462\u2462-\u2461-\u2462-\u2462-\u2462-\u2462-\u2462abcabcabc" +
                           "nullnullnullnullnullnullnullnullnullnullnullnull";
-        assertEquals(expected, sb.toString());
+        assertEquals(sb.toString(), expected);
 
         // Codepoints
 
@@ -127,7 +127,7 @@ public void sanity() {
         sb.repeat(0x10FFFF, 5);
 
         expected = "\u0000\u0000\u0000\u0000\u0000\u0000\u0020\u0020\u0020\u0020\u0020\u0020\u2461\u2462\u2462\u2462\u2462\u2462\udbff\udfff\udbff\udfff\udbff\udfff\udbff\udfff\udbff\udfff\udbff\udfff";
-        assertEquals(expected, sb.toString());
+        assertEquals(sb.toString(), expected);
 
     }
 

From 0f2a6c266b2e3aab59a5cd183e10dfc4820ca92d Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 9 May 2025 21:58:24 +0000
Subject: [PATCH 384/901] 8356577: Migrate ClassFileVersionTest to be
 feature-agnostic

Reviewed-by: dholmes, alanb
---
 .../ClassFile/ClassFileVersionTest.java       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/ClassFile/ClassFileVersionTest.java b/test/hotspot/jtreg/runtime/ClassFile/ClassFileVersionTest.java
index c1e09f058c7..5f0696d6bfe 100644
--- a/test/hotspot/jtreg/runtime/ClassFile/ClassFileVersionTest.java
+++ b/test/hotspot/jtreg/runtime/ClassFile/ClassFileVersionTest.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
@@ -22,27 +22,24 @@
  *
  */
 
-/**
+/*
  * @test
  * @bug 8291360
  * @summary Test getting the class file version for java.lang.Class API
+ * @library /test/lib
  * @modules java.base/java.lang:open
  * @compile classFileVersions.jcod
- * @compile --enable-preview -source ${jdk.version} ClassFileVersionTest.java
  * @run main/othervm --enable-preview ClassFileVersionTest
  */
 
+import java.lang.classfile.ClassFile;
+import java.lang.constant.ClassDesc;
 import java.lang.reflect.*;
 
+import jdk.test.lib.ByteCodeLoader;
+
 public class ClassFileVersionTest {
     public static final int LOWER_16 = 0x0000_FFFF;
-    /*
-     * Include a use of a preview API so that the minor class file
-     * version of the class file for this class gets set during
-     * compilation. If a particular class becomes non-preview, any
-     * currently preview class can be substituted in.
-     */
-    private static final Class<?> PREVIEW_API = java.lang.ScopedValue.class;
     static Method m;
 
     public static void testIt(String className, int expectedResult) throws Exception {
@@ -69,8 +66,10 @@ public static void main(String argv[]) throws Throwable {
         int latestMajor = ClassFileFormatVersion.latest().major();
 
         testIt(Object.class, latestMajor);
-        // ClassFileVersionTest use preview features so its minor version should be 0xFFFF
-        testIt(ClassFileVersionTest.class, (~LOWER_16) | latestMajor);
+
+        Class<?> previewClass = ByteCodeLoader.load("PreviewClass", ClassFile.of().build(ClassDesc.of("PreviewClass"),
+                clb -> clb.withVersion(ClassFile.latestMajorVersion(), ClassFile.PREVIEW_MINOR_VERSION)));
+        testIt(previewClass, (~LOWER_16) | latestMajor);
         testIt("Version64", 64);
         testIt("Version59", 59);
         testIt("Version45_3", 0x0003_002D);  // 3:45

From 3b336a9da091c4df4373d2b845b60d2a7a4e3b1d Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Fri, 9 May 2025 23:33:32 +0000
Subject: [PATCH 385/901] 8352675: Support Intel AVX10 converged vector ISA
 feature detection

Reviewed-by: sviswanathan, vlivanov, yzheng
---
 src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp |   3 +-
 src/hotspot/cpu/x86/vmStructs_x86.hpp         |  15 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp        | 331 +++++++++++-------
 src/hotspot/cpu/x86/vm_version_x86.hpp        | 269 ++++++++++----
 .../share/jvmci/jvmciCompilerToVMInit.cpp     |   1 +
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  11 +-
 .../share/runtime/abstract_vm_version.cpp     |  16 -
 .../share/runtime/abstract_vm_version.hpp     |   4 +-
 src/hotspot/share/runtime/vmStructs.cpp       |   4 +-
 .../share/classes/jdk/vm/ci/amd64/AMD64.java  |   2 +
 .../hotspot/HotSpotJVMCIBackendFactory.java   |  57 ++-
 .../AMD64HotSpotJVMCIBackendFactory.java      |   9 +-
 .../hotspot/amd64/AMD64HotSpotVMConfig.java   |  10 +-
 .../serviceability/sa/ClhsdbLongConstant.java |   6 +-
 .../jdk/test/whitebox/CPUInfoTest.java        |   4 +-
 15 files changed, 493 insertions(+), 249 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
index bf9c965213c..2ec901f6a2e 100644
--- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
@@ -35,8 +35,7 @@
               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_toplevel_type(VM_Version)
+#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)
 
diff --git a/src/hotspot/cpu/x86/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp
index d894d8b09a7..b8089a6413e 100644
--- a/src/hotspot/cpu/x86/vmStructs_x86.hpp
+++ b/src/hotspot/cpu/x86/vmStructs_x86.hpp
@@ -29,15 +29,20 @@
 // 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)            \
-  volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
+#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,              _features,                      VM_Version::VM_Features) \
+           nonstatic_field(VM_Version::VM_Features, _features_bitmap[0],            uint64_t)                \
+              static_field(VM_Version::VM_Features, _features_bitmap_size,          int)
 
 #define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
+  declare_toplevel_type(VM_Version::VM_Features)
 
 #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)
+  declare_constant(frame::arg_reg_save_area_bytes)            \
+  declare_constant(frame::interpreter_frame_sender_sp_offset) \
+  declare_constant(frame::interpreter_frame_last_sp_offset)   \
+  declare_constant(frame::entry_frame_call_wrapper_offset)
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 5306f0becef..fe59a153413 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -63,6 +63,11 @@ address VM_Version::_cpuinfo_cont_addr_apx = nullptr;
 static BufferBlob* stub_blob;
 static const int stub_size = 2000;
 
+int VM_Version::VM_Features::_features_bitmap_size = sizeof(VM_Version::VM_Features::_features_bitmap) / BytesPerLong;
+
+VM_Version::VM_Features VM_Version::_features;
+VM_Version::VM_Features VM_Version::_cpu_features;
+
 extern "C" {
   typedef void (*get_cpu_info_stub_t)(void*);
   typedef void (*detect_virt_stub_t)(uint32_t, uint32_t*);
@@ -82,7 +87,7 @@ bool VM_Version::supports_clflush() {
   // up. Assembler::flush calls this routine to check that clflush
   // is allowed. So, we give the caller a free pass if Universe init
   // is still in progress.
-  assert ((!Universe::is_fully_initialized() || (_features & CPU_FLUSH) != 0), "clflush should be available");
+  assert ((!Universe::is_fully_initialized() || _features.supports_feature(CPU_FLUSH)), "clflush should be available");
   return true;
 }
 
@@ -133,7 +138,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     const uint32_t CPU_FAMILY_486 = (4 << CPU_FAMILY_SHIFT);
     bool use_evex = FLAG_IS_DEFAULT(UseAVX) || (UseAVX > 2);
 
-    Label detect_486, cpu486, detect_586, std_cpuid1, std_cpuid4;
+    Label detect_486, cpu486, detect_586, std_cpuid1, std_cpuid4, std_cpuid24;
     Label sef_cpuid, sefsl1_cpuid, ext_cpuid, ext_cpuid1, ext_cpuid5, ext_cpuid7;
     Label ext_cpuid8, done, wrapup, vector_save_restore, apx_save_restore_warning;
     Label legacy_setup, save_restore_except, legacy_save_restore, start_simd_check;
@@ -332,6 +337,17 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ movl(Address(rsi, 0), rax);
     __ movl(Address(rsi, 4), rdx);
 
+    //
+    // cpuid(0x24) Converged Vector ISA Main Leaf (EAX = 24H, ECX = 0).
+    //
+    __ bind(std_cpuid24);
+    __ movl(rax, 0x24);
+    __ movl(rcx, 0);
+    __ cpuid();
+    __ lea(rsi, Address(rbp, in_bytes(VM_Version::std_cpuid24_offset())));
+    __ movl(Address(rsi, 0), rax);
+    __ movl(Address(rsi, 4), rbx);
+
     //
     // Extended cpuid(0x80000000)
     //
@@ -418,13 +434,11 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ lea(rsi, Address(rbp, in_bytes(VM_Version::sefsl1_cpuid7_offset())));
     __ movl(rax, 0x200000);
     __ andl(rax, Address(rsi, 4));
-    __ cmpl(rax, 0x200000);
-    __ jcc(Assembler::notEqual, vector_save_restore);
+    __ jcc(Assembler::equal, vector_save_restore);
     // check _cpuid_info.xem_xcr0_eax.bits.apx_f
     __ movl(rax, 0x80000);
     __ andl(rax, Address(rbp, in_bytes(VM_Version::xem_xcr0_offset()))); // xcr0 bits apx_f
-    __ cmpl(rax, 0x80000);
-    __ jcc(Assembler::notEqual, vector_save_restore);
+    __ jcc(Assembler::equal, vector_save_restore);
 
 #ifndef PRODUCT
     bool save_apx = UseAPX;
@@ -477,11 +491,15 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     // If UseAVX is uninitialized or is set by the user to include EVEX
     if (use_evex) {
       // check _cpuid_info.sef_cpuid7_ebx.bits.avx512f
+      // OR check _cpuid_info.sefsl1_cpuid7_edx.bits.avx10
       __ lea(rsi, Address(rbp, in_bytes(VM_Version::sef_cpuid7_offset())));
       __ movl(rax, 0x10000);
-      __ andl(rax, Address(rsi, 4)); // xcr0 bits sse | ymm
-      __ cmpl(rax, 0x10000);
-      __ jccb(Assembler::notEqual, legacy_setup); // jump if EVEX is not supported
+      __ andl(rax, Address(rsi, 4));
+      __ lea(rsi, Address(rbp, in_bytes(VM_Version::sefsl1_cpuid7_offset())));
+      __ movl(rbx, 0x80000);
+      __ andl(rbx, Address(rsi, 4));
+      __ orl(rax, rbx);
+      __ jccb(Assembler::equal, legacy_setup); // jump if EVEX is not supported
       // check _cpuid_info.xem_xcr0_eax.bits.opmask
       // check _cpuid_info.xem_xcr0_eax.bits.zmm512
       // check _cpuid_info.xem_xcr0_eax.bits.zmm32
@@ -562,8 +580,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
       __ lea(rsi, Address(rbp, in_bytes(VM_Version::sef_cpuid7_offset())));
       __ movl(rax, 0x10000);
       __ andl(rax, Address(rsi, 4));
-      __ cmpl(rax, 0x10000);
-      __ jcc(Assembler::notEqual, legacy_save_restore);
+      __ jcc(Assembler::equal, legacy_save_restore);
       // check _cpuid_info.xem_xcr0_eax.bits.opmask
       // check _cpuid_info.xem_xcr0_eax.bits.zmm512
       // check _cpuid_info.xem_xcr0_eax.bits.zmm32
@@ -835,7 +852,6 @@ void VM_Version::get_processor_features() {
   _cpu = 4; // 486 by default
   _model = 0;
   _stepping = 0;
-  _features = 0;
   _logical_processors_per_package = 1;
   // i486 internal cache is both I&D and has a 16-byte line size
   _L1_data_cache_line_size = 16;
@@ -851,7 +867,7 @@ void VM_Version::get_processor_features() {
 
   if (cpu_family() > 4) { // it supports CPUID
     _features = _cpuid_info.feature_flags(); // These can be changed by VM settings
-    _cpu_features = _features;   // Preserve features
+    _cpu_features = _features; // Preserve features
     // Logical processors are only available on P4s and above,
     // and only if hyperthreading is available.
     _logical_processors_per_package = logical_processor_count();
@@ -900,21 +916,21 @@ void VM_Version::get_processor_features() {
   }
 
   if (UseSSE < 4) {
-    _features &= ~CPU_SSE4_1;
-    _features &= ~CPU_SSE4_2;
+    _features.clear_feature(CPU_SSE4_1);
+    _features.clear_feature(CPU_SSE4_2);
   }
 
   if (UseSSE < 3) {
-    _features &= ~CPU_SSE3;
-    _features &= ~CPU_SSSE3;
-    _features &= ~CPU_SSE4A;
+    _features.clear_feature(CPU_SSE3);
+    _features.clear_feature(CPU_SSSE3);
+    _features.clear_feature(CPU_SSE4A);
   }
 
   if (UseSSE < 2)
-    _features &= ~CPU_SSE2;
+    _features.clear_feature(CPU_SSE2);
 
   if (UseSSE < 1)
-    _features &= ~CPU_SSE;
+    _features.clear_feature(CPU_SSE);
 
   //since AVX instructions is slower than SSE in some ZX cpus, force USEAVX=0.
   if (is_zx() && ((cpu_family() == 6) || (cpu_family() == 7))) {
@@ -980,21 +996,25 @@ void VM_Version::get_processor_features() {
   }
 
   if (UseAVX < 3) {
-    _features &= ~CPU_AVX512F;
-    _features &= ~CPU_AVX512DQ;
-    _features &= ~CPU_AVX512CD;
-    _features &= ~CPU_AVX512BW;
-    _features &= ~CPU_AVX512VL;
-    _features &= ~CPU_AVX512_VPOPCNTDQ;
-    _features &= ~CPU_AVX512_VPCLMULQDQ;
-    _features &= ~CPU_AVX512_VAES;
-    _features &= ~CPU_AVX512_VNNI;
-    _features &= ~CPU_AVX512_VBMI;
-    _features &= ~CPU_AVX512_VBMI2;
-    _features &= ~CPU_AVX512_BITALG;
-    _features &= ~CPU_AVX512_IFMA;
-    _features &= ~CPU_APX_F;
-    _features &= ~CPU_AVX512_FP16;
+    _features.clear_feature(CPU_AVX512F);
+    _features.clear_feature(CPU_AVX512DQ);
+    _features.clear_feature(CPU_AVX512CD);
+    _features.clear_feature(CPU_AVX512BW);
+    _features.clear_feature(CPU_AVX512ER);
+    _features.clear_feature(CPU_AVX512PF);
+    _features.clear_feature(CPU_AVX512VL);
+    _features.clear_feature(CPU_AVX512_VPOPCNTDQ);
+    _features.clear_feature(CPU_AVX512_VPCLMULQDQ);
+    _features.clear_feature(CPU_AVX512_VAES);
+    _features.clear_feature(CPU_AVX512_VNNI);
+    _features.clear_feature(CPU_AVX512_VBMI);
+    _features.clear_feature(CPU_AVX512_VBMI2);
+    _features.clear_feature(CPU_AVX512_BITALG);
+    _features.clear_feature(CPU_AVX512_IFMA);
+    _features.clear_feature(CPU_APX_F);
+    _features.clear_feature(CPU_AVX512_FP16);
+    _features.clear_feature(CPU_AVX10_1);
+    _features.clear_feature(CPU_AVX10_2);
   }
 
   // Currently APX support is only enabled for targets supporting AVX512VL feature.
@@ -1007,45 +1027,47 @@ void VM_Version::get_processor_features() {
   }
 
   if (!UseAPX) {
-    _features &= ~CPU_APX_F;
+    _features.clear_feature(CPU_APX_F);
   }
 
   if (UseAVX < 2) {
-    _features &= ~CPU_AVX2;
-    _features &= ~CPU_AVX_IFMA;
+    _features.clear_feature(CPU_AVX2);
+    _features.clear_feature(CPU_AVX_IFMA);
   }
 
   if (UseAVX < 1) {
-    _features &= ~CPU_AVX;
-    _features &= ~CPU_VZEROUPPER;
-    _features &= ~CPU_F16C;
-    _features &= ~CPU_SHA512;
+    _features.clear_feature(CPU_AVX);
+    _features.clear_feature(CPU_VZEROUPPER);
+    _features.clear_feature(CPU_F16C);
+    _features.clear_feature(CPU_SHA512);
   }
 
   if (logical_processors_per_package() == 1) {
     // HT processor could be installed on a system which doesn't support HT.
-    _features &= ~CPU_HT;
+    _features.clear_feature(CPU_HT);
   }
 
   if (is_intel()) { // Intel cpus specific settings
     if (is_knights_family()) {
-      _features &= ~CPU_VZEROUPPER;
-      _features &= ~CPU_AVX512BW;
-      _features &= ~CPU_AVX512VL;
-      _features &= ~CPU_AVX512DQ;
-      _features &= ~CPU_AVX512_VNNI;
-      _features &= ~CPU_AVX512_VAES;
-      _features &= ~CPU_AVX512_VPOPCNTDQ;
-      _features &= ~CPU_AVX512_VPCLMULQDQ;
-      _features &= ~CPU_AVX512_VBMI;
-      _features &= ~CPU_AVX512_VBMI2;
-      _features &= ~CPU_CLWB;
-      _features &= ~CPU_FLUSHOPT;
-      _features &= ~CPU_GFNI;
-      _features &= ~CPU_AVX512_BITALG;
-      _features &= ~CPU_AVX512_IFMA;
-      _features &= ~CPU_AVX_IFMA;
-      _features &= ~CPU_AVX512_FP16;
+      _features.clear_feature(CPU_VZEROUPPER);
+      _features.clear_feature(CPU_AVX512BW);
+      _features.clear_feature(CPU_AVX512VL);
+      _features.clear_feature(CPU_AVX512DQ);
+      _features.clear_feature(CPU_AVX512_VNNI);
+      _features.clear_feature(CPU_AVX512_VAES);
+      _features.clear_feature(CPU_AVX512_VPOPCNTDQ);
+      _features.clear_feature(CPU_AVX512_VPCLMULQDQ);
+      _features.clear_feature(CPU_AVX512_VBMI);
+      _features.clear_feature(CPU_AVX512_VBMI2);
+      _features.clear_feature(CPU_CLWB);
+      _features.clear_feature(CPU_FLUSHOPT);
+      _features.clear_feature(CPU_GFNI);
+      _features.clear_feature(CPU_AVX512_BITALG);
+      _features.clear_feature(CPU_AVX512_IFMA);
+      _features.clear_feature(CPU_AVX_IFMA);
+      _features.clear_feature(CPU_AVX512_FP16);
+      _features.clear_feature(CPU_AVX10_1);
+      _features.clear_feature(CPU_AVX10_2);
     }
   }
 
@@ -1055,7 +1077,6 @@ void VM_Version::get_processor_features() {
     _has_intel_jcc_erratum = IntelJccErratumMitigation;
   }
 
-  assert(supports_cpuid(), "Always present");
   assert(supports_clflush(), "Always present");
   if (X86ICacheSync == -1) {
     // Auto-detect, choosing the best performant one that still flushes
@@ -1079,14 +1100,15 @@ void VM_Version::get_processor_features() {
     }
   }
 
-  char buf[1024];
-  int cpu_info_size = jio_snprintf(
+  char buf[2048];
+  size_t cpu_info_size = jio_snprintf(
               buf, sizeof(buf),
               "(%u cores per cpu, %u threads per core) family %d model %d stepping %d microcode 0x%x",
               cores_per_cpu(), threads_per_core(),
               cpu_family(), _model, _stepping, os::cpu_microcode_revision());
   assert(cpu_info_size > 0, "not enough temporary space allocated");
-  insert_features_names(buf + cpu_info_size, sizeof(buf) - cpu_info_size, _features_names);
+
+  insert_features_names(_features, buf + cpu_info_size, sizeof(buf) - cpu_info_size);
 
   _cpu_info_string = os::strdup(buf);
 
@@ -2088,6 +2110,7 @@ static bool _vm_version_initialized = false;
 
 void VM_Version::initialize() {
   ResourceMark rm;
+
   // Making this stub must be FIRST use of assembler
   stub_blob = BufferBlob::create("VM_Version stub", stub_size);
   if (stub_blob == nullptr) {
@@ -2863,185 +2886,212 @@ int64_t VM_Version::maximum_qualified_cpu_frequency(void) {
   return _max_qualified_cpu_frequency;
 }
 
-uint64_t VM_Version::CpuidInfo::feature_flags() const {
-  uint64_t result = 0;
+VM_Version::VM_Features VM_Version::CpuidInfo::feature_flags() const {
+  VM_Features vm_features;
   if (std_cpuid1_edx.bits.cmpxchg8 != 0)
-    result |= CPU_CX8;
+    vm_features.set_feature(CPU_CX8);
   if (std_cpuid1_edx.bits.cmov != 0)
-    result |= CPU_CMOV;
+    vm_features.set_feature(CPU_CMOV);
   if (std_cpuid1_edx.bits.clflush != 0)
-    result |= CPU_FLUSH;
+    vm_features.set_feature(CPU_FLUSH);
   // clflush should always be available on x86_64
   // if not we are in real trouble because we rely on it
   // to flush the code cache.
-  assert ((result & CPU_FLUSH) != 0, "clflush should be available");
+  assert (vm_features.supports_feature(CPU_FLUSH), "clflush should be available");
   if (std_cpuid1_edx.bits.fxsr != 0 || (is_amd_family() &&
       ext_cpuid1_edx.bits.fxsr != 0))
-    result |= CPU_FXSR;
+    vm_features.set_feature(CPU_FXSR);
   // HT flag is set for multi-core processors also.
   if (threads_per_core() > 1)
-    result |= CPU_HT;
+    vm_features.set_feature(CPU_HT);
   if (std_cpuid1_edx.bits.mmx != 0 || (is_amd_family() &&
       ext_cpuid1_edx.bits.mmx != 0))
-    result |= CPU_MMX;
+    vm_features.set_feature(CPU_MMX);
   if (std_cpuid1_edx.bits.sse != 0)
-    result |= CPU_SSE;
+    vm_features.set_feature(CPU_SSE);
   if (std_cpuid1_edx.bits.sse2 != 0)
-    result |= CPU_SSE2;
+    vm_features.set_feature(CPU_SSE2);
   if (std_cpuid1_ecx.bits.sse3 != 0)
-    result |= CPU_SSE3;
+    vm_features.set_feature(CPU_SSE3);
   if (std_cpuid1_ecx.bits.ssse3 != 0)
-    result |= CPU_SSSE3;
+    vm_features.set_feature(CPU_SSSE3);
   if (std_cpuid1_ecx.bits.sse4_1 != 0)
-    result |= CPU_SSE4_1;
+    vm_features.set_feature(CPU_SSE4_1);
   if (std_cpuid1_ecx.bits.sse4_2 != 0)
-    result |= CPU_SSE4_2;
+    vm_features.set_feature(CPU_SSE4_2);
   if (std_cpuid1_ecx.bits.popcnt != 0)
-    result |= CPU_POPCNT;
+    vm_features.set_feature(CPU_POPCNT);
   if (sefsl1_cpuid7_edx.bits.apx_f != 0 &&
       xem_xcr0_eax.bits.apx_f != 0) {
-    result |= CPU_APX_F;
+    vm_features.set_feature(CPU_APX_F);
   }
   if (std_cpuid1_ecx.bits.avx != 0 &&
       std_cpuid1_ecx.bits.osxsave != 0 &&
       xem_xcr0_eax.bits.sse != 0 &&
       xem_xcr0_eax.bits.ymm != 0) {
-    result |= CPU_AVX;
-    result |= CPU_VZEROUPPER;
+    vm_features.set_feature(CPU_AVX);
+    vm_features.set_feature(CPU_VZEROUPPER);
     if (sefsl1_cpuid7_eax.bits.sha512 != 0)
-      result |= CPU_SHA512;
+      vm_features.set_feature(CPU_SHA512);
     if (std_cpuid1_ecx.bits.f16c != 0)
-      result |= CPU_F16C;
+      vm_features.set_feature(CPU_F16C);
     if (sef_cpuid7_ebx.bits.avx2 != 0) {
-      result |= CPU_AVX2;
+      vm_features.set_feature(CPU_AVX2);
       if (sefsl1_cpuid7_eax.bits.avx_ifma != 0)
-        result |= CPU_AVX_IFMA;
+        vm_features.set_feature(CPU_AVX_IFMA);
     }
     if (sef_cpuid7_ecx.bits.gfni != 0)
-        result |= CPU_GFNI;
+        vm_features.set_feature(CPU_GFNI);
     if (sef_cpuid7_ebx.bits.avx512f != 0 &&
         xem_xcr0_eax.bits.opmask != 0 &&
         xem_xcr0_eax.bits.zmm512 != 0 &&
         xem_xcr0_eax.bits.zmm32 != 0) {
-      result |= CPU_AVX512F;
+      vm_features.set_feature(CPU_AVX512F);
       if (sef_cpuid7_ebx.bits.avx512cd != 0)
-        result |= CPU_AVX512CD;
+        vm_features.set_feature(CPU_AVX512CD);
       if (sef_cpuid7_ebx.bits.avx512dq != 0)
-        result |= CPU_AVX512DQ;
+        vm_features.set_feature(CPU_AVX512DQ);
       if (sef_cpuid7_ebx.bits.avx512ifma != 0)
-        result |= CPU_AVX512_IFMA;
+        vm_features.set_feature(CPU_AVX512_IFMA);
       if (sef_cpuid7_ebx.bits.avx512pf != 0)
-        result |= CPU_AVX512PF;
+        vm_features.set_feature(CPU_AVX512PF);
       if (sef_cpuid7_ebx.bits.avx512er != 0)
-        result |= CPU_AVX512ER;
+        vm_features.set_feature(CPU_AVX512ER);
       if (sef_cpuid7_ebx.bits.avx512bw != 0)
-        result |= CPU_AVX512BW;
+        vm_features.set_feature(CPU_AVX512BW);
       if (sef_cpuid7_ebx.bits.avx512vl != 0)
-        result |= CPU_AVX512VL;
+        vm_features.set_feature(CPU_AVX512VL);
       if (sef_cpuid7_ecx.bits.avx512_vpopcntdq != 0)
-        result |= CPU_AVX512_VPOPCNTDQ;
+        vm_features.set_feature(CPU_AVX512_VPOPCNTDQ);
       if (sef_cpuid7_ecx.bits.avx512_vpclmulqdq != 0)
-        result |= CPU_AVX512_VPCLMULQDQ;
+        vm_features.set_feature(CPU_AVX512_VPCLMULQDQ);
       if (sef_cpuid7_ecx.bits.vaes != 0)
-        result |= CPU_AVX512_VAES;
+        vm_features.set_feature(CPU_AVX512_VAES);
       if (sef_cpuid7_ecx.bits.avx512_vnni != 0)
-        result |= CPU_AVX512_VNNI;
+        vm_features.set_feature(CPU_AVX512_VNNI);
       if (sef_cpuid7_ecx.bits.avx512_bitalg != 0)
-        result |= CPU_AVX512_BITALG;
+        vm_features.set_feature(CPU_AVX512_BITALG);
       if (sef_cpuid7_ecx.bits.avx512_vbmi != 0)
-        result |= CPU_AVX512_VBMI;
+        vm_features.set_feature(CPU_AVX512_VBMI);
       if (sef_cpuid7_ecx.bits.avx512_vbmi2 != 0)
-        result |= CPU_AVX512_VBMI2;
+        vm_features.set_feature(CPU_AVX512_VBMI2);
+    }
+    if (is_intel()) {
+      if (sefsl1_cpuid7_edx.bits.avx10 != 0 &&
+          std_cpuid24_ebx.bits.avx10_vlen_512 !=0 &&
+          std_cpuid24_ebx.bits.avx10_converged_isa_version >= 1 &&
+          xem_xcr0_eax.bits.opmask != 0 &&
+          xem_xcr0_eax.bits.zmm512 != 0 &&
+          xem_xcr0_eax.bits.zmm32 != 0) {
+        vm_features.set_feature(CPU_AVX10_1);
+        vm_features.set_feature(CPU_AVX512F);
+        vm_features.set_feature(CPU_AVX512CD);
+        vm_features.set_feature(CPU_AVX512DQ);
+        vm_features.set_feature(CPU_AVX512PF);
+        vm_features.set_feature(CPU_AVX512ER);
+        vm_features.set_feature(CPU_AVX512BW);
+        vm_features.set_feature(CPU_AVX512VL);
+        vm_features.set_feature(CPU_AVX512_VPOPCNTDQ);
+        vm_features.set_feature(CPU_AVX512_VPCLMULQDQ);
+        vm_features.set_feature(CPU_AVX512_VAES);
+        vm_features.set_feature(CPU_AVX512_VNNI);
+        vm_features.set_feature(CPU_AVX512_BITALG);
+        vm_features.set_feature(CPU_AVX512_VBMI);
+        vm_features.set_feature(CPU_AVX512_VBMI2);
+        if (std_cpuid24_ebx.bits.avx10_converged_isa_version >= 2) {
+          vm_features.set_feature(CPU_AVX10_2);
+        }
+      }
     }
   }
+
   if (std_cpuid1_ecx.bits.hv != 0)
-    result |= CPU_HV;
+    vm_features.set_feature(CPU_HV);
   if (sef_cpuid7_ebx.bits.bmi1 != 0)
-    result |= CPU_BMI1;
+    vm_features.set_feature(CPU_BMI1);
   if (std_cpuid1_edx.bits.tsc != 0)
-    result |= CPU_TSC;
+    vm_features.set_feature(CPU_TSC);
   if (ext_cpuid7_edx.bits.tsc_invariance != 0)
-    result |= CPU_TSCINV_BIT;
+    vm_features.set_feature(CPU_TSCINV_BIT);
   if (std_cpuid1_ecx.bits.aes != 0)
-    result |= CPU_AES;
+    vm_features.set_feature(CPU_AES);
   if (ext_cpuid1_ecx.bits.lzcnt != 0)
-    result |= CPU_LZCNT;
+    vm_features.set_feature(CPU_LZCNT);
   if (ext_cpuid1_ecx.bits.prefetchw != 0)
-    result |= CPU_3DNOW_PREFETCH;
+    vm_features.set_feature(CPU_3DNOW_PREFETCH);
   if (sef_cpuid7_ebx.bits.erms != 0)
-    result |= CPU_ERMS;
+    vm_features.set_feature(CPU_ERMS);
   if (sef_cpuid7_edx.bits.fast_short_rep_mov != 0)
-    result |= CPU_FSRM;
+    vm_features.set_feature(CPU_FSRM);
   if (std_cpuid1_ecx.bits.clmul != 0)
-    result |= CPU_CLMUL;
+    vm_features.set_feature(CPU_CLMUL);
   if (sef_cpuid7_ebx.bits.rtm != 0)
-    result |= CPU_RTM;
+    vm_features.set_feature(CPU_RTM);
   if (sef_cpuid7_ebx.bits.adx != 0)
-     result |= CPU_ADX;
+     vm_features.set_feature(CPU_ADX);
   if (sef_cpuid7_ebx.bits.bmi2 != 0)
-    result |= CPU_BMI2;
+    vm_features.set_feature(CPU_BMI2);
   if (sef_cpuid7_ebx.bits.sha != 0)
-    result |= CPU_SHA;
+    vm_features.set_feature(CPU_SHA);
   if (std_cpuid1_ecx.bits.fma != 0)
-    result |= CPU_FMA;
+    vm_features.set_feature(CPU_FMA);
   if (sef_cpuid7_ebx.bits.clflushopt != 0)
-    result |= CPU_FLUSHOPT;
+    vm_features.set_feature(CPU_FLUSHOPT);
   if (sef_cpuid7_ebx.bits.clwb != 0)
-    result |= CPU_CLWB;
+    vm_features.set_feature(CPU_CLWB);
   if (ext_cpuid1_edx.bits.rdtscp != 0)
-    result |= CPU_RDTSCP;
+    vm_features.set_feature(CPU_RDTSCP);
   if (sef_cpuid7_ecx.bits.rdpid != 0)
-    result |= CPU_RDPID;
+    vm_features.set_feature(CPU_RDPID);
 
   // AMD|Hygon additional features.
   if (is_amd_family()) {
     // PREFETCHW was checked above, check TDNOW here.
     if ((ext_cpuid1_edx.bits.tdnow != 0))
-      result |= CPU_3DNOW_PREFETCH;
+      vm_features.set_feature(CPU_3DNOW_PREFETCH);
     if (ext_cpuid1_ecx.bits.sse4a != 0)
-      result |= CPU_SSE4A;
+      vm_features.set_feature(CPU_SSE4A);
   }
 
   // Intel additional features.
   if (is_intel()) {
     if (sef_cpuid7_edx.bits.serialize != 0)
-      result |= CPU_SERIALIZE;
+      vm_features.set_feature(CPU_SERIALIZE);
     if (_cpuid_info.sef_cpuid7_edx.bits.avx512_fp16 != 0)
-      result |= CPU_AVX512_FP16;
+      vm_features.set_feature(CPU_AVX512_FP16);
   }
 
   // ZX additional features.
   if (is_zx()) {
     // We do not know if these are supported by ZX, so we cannot trust
     // common CPUID bit for them.
-    assert((result & CPU_CLWB) == 0, "Check if it is supported?");
-    result &= ~CPU_CLWB;
+    assert(vm_features.supports_feature(CPU_CLWB), "Check if it is supported?");
+    vm_features.clear_feature(CPU_CLWB);
   }
 
   // Protection key features.
   if (sef_cpuid7_ecx.bits.pku != 0) {
-    result |= CPU_PKU;
+    vm_features.set_feature(CPU_PKU);
   }
   if (sef_cpuid7_ecx.bits.ospke != 0) {
-    result |= CPU_OSPKE;
+    vm_features.set_feature(CPU_OSPKE);
   }
 
   // Control flow enforcement (CET) features.
   if (sef_cpuid7_ecx.bits.cet_ss != 0) {
-    result |= CPU_CET_SS;
+    vm_features.set_feature(CPU_CET_SS);
   }
   if (sef_cpuid7_edx.bits.cet_ibt != 0) {
-    result |= CPU_CET_IBT;
+    vm_features.set_feature(CPU_CET_IBT);
   }
 
   // Composite features.
   if (supports_tscinv_bit() &&
       ((is_amd_family() && !is_amd_Barcelona()) ||
        is_intel_tsc_synched_at_init())) {
-    result |= CPU_TSCINV;
+    vm_features.set_feature(CPU_TSCINV);
   }
-
-  return result;
+  return vm_features;
 }
 
 bool VM_Version::os_supports_avx_vectors() {
@@ -3231,3 +3281,14 @@ bool VM_Version::is_intrinsic_supported(vmIntrinsicID id) {
   }
   return true;
 }
+
+void VM_Version::insert_features_names(VM_Version::VM_Features features, char* buf, size_t buflen) {
+  for (int i = 0; i < MAX_CPU_FEATURES; i++) {
+    if (features.supports_feature((VM_Version::Feature_Flag)i)) {
+      int res = jio_snprintf(buf, buflen, ", %s", _features_names[i]);
+      assert(res > 0, "not enough temporary space allocated");
+      buf += res;
+      buflen -= res;
+    }
+  }
+}
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index 7eb627c8714..a544eeb71b8 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -295,12 +295,32 @@ class VM_Version : public Abstract_VM_Version {
   union SefCpuid7SubLeaf1Edx {
     uint32_t value;
     struct {
-      uint32_t       : 21,
+      uint32_t       : 19,
+              avx10  : 1,
+                     : 1,
               apx_f  : 1,
                      : 10;
     } bits;
   };
 
+  union StdCpuid24MainLeafEax {
+    uint32_t value;
+    struct {
+      uint32_t  sub_leaves_cnt  : 31;
+    } bits;
+  };
+
+  union StdCpuid24MainLeafEbx {
+    uint32_t value;
+    struct {
+      uint32_t  avx10_converged_isa_version  : 8,
+                                             : 8,
+                                             : 2,
+                avx10_vlen_512               : 1,
+                                             : 13;
+    } bits;
+  };
+
   union ExtCpuid1EEbx {
     uint32_t value;
     struct {
@@ -342,9 +362,9 @@ class VM_Version : public Abstract_VM_Version {
   /*
    * Update following files when declaring new flags:
    * test/lib-test/jdk/test/whitebox/CPUInfoTest.java
-   * src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
+   * src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
    */
-  enum Feature_Flag : uint64_t {
+  enum Feature_Flag {
 #define CPU_FEATURE_FLAGS(decl) \
     decl(CX8,               "cx8",               0)  /*  next bits are from cpuid 1 (EDX) */ \
     decl(CMOV,              "cmov",              1)  \
@@ -420,15 +440,85 @@ class VM_Version : public Abstract_VM_Version {
     decl(AVX_IFMA,          "avx_ifma",          59) /* 256-bit VEX-coded variant of AVX512-IFMA*/ \
     decl(APX_F,             "apx_f",             60) /* Intel Advanced Performance Extensions*/ \
     decl(SHA512,            "sha512",            61) /* SHA512 instructions*/ \
-    decl(AVX512_FP16,       "avx512_fp16",       62) /* AVX512 FP16 ISA support*/
+    decl(AVX512_FP16,       "avx512_fp16",       62) /* AVX512 FP16 ISA support*/ \
+    decl(AVX10_1,           "avx10_1",           63) /* AVX10 512 bit vector ISA Version 1 support*/ \
+    decl(AVX10_2,           "avx10_2",           64) /* AVX10 512 bit vector ISA Version 2 support*/
 
-#define DECLARE_CPU_FEATURE_FLAG(id, name, bit) CPU_##id = (1ULL << bit),
+#define DECLARE_CPU_FEATURE_FLAG(id, name, bit) CPU_##id = (bit),
     CPU_FEATURE_FLAGS(DECLARE_CPU_FEATURE_FLAG)
 #undef DECLARE_CPU_FEATURE_FLAG
+    MAX_CPU_FEATURES
   };
 
+  class VM_Features {
+    friend class VMStructs;
+    friend class JVMCIVMStructs;
+
+   private:
+    uint64_t _features_bitmap[(MAX_CPU_FEATURES / BitsPerLong) + 1];
+
+    STATIC_ASSERT(sizeof(_features_bitmap) * BitsPerByte >= MAX_CPU_FEATURES);
+
+    // Number of 8-byte elements in _bitmap.
+    constexpr static int features_bitmap_element_count() {
+      return sizeof(_features_bitmap) / sizeof(uint64_t);
+    }
+
+    constexpr static int features_bitmap_element_shift_count() {
+      return LogBitsPerLong;
+    }
+
+    constexpr static uint64_t features_bitmap_element_mask() {
+      return (1ULL << features_bitmap_element_shift_count()) - 1;
+    }
+
+    static int index(Feature_Flag feature) {
+      int idx = feature >> features_bitmap_element_shift_count();
+      assert(idx < features_bitmap_element_count(), "Features array index out of bounds");
+      return idx;
+    }
+
+    static uint64_t bit_mask(Feature_Flag feature) {
+      return (1ULL << (feature & features_bitmap_element_mask()));
+    }
+
+    static int _features_bitmap_size; // for JVMCI purposes
+   public:
+    VM_Features() {
+      for (int i = 0; i < features_bitmap_element_count(); i++) {
+        _features_bitmap[i] = 0;
+      }
+    }
+
+    void set_feature(Feature_Flag feature) {
+      int idx = index(feature);
+      _features_bitmap[idx] |= bit_mask(feature);
+    }
+
+    void clear_feature(VM_Version::Feature_Flag feature) {
+      int idx = index(feature);
+      _features_bitmap[idx] &= ~bit_mask(feature);
+    }
+
+    bool supports_feature(VM_Version::Feature_Flag feature) {
+      int idx = index(feature);
+      return (_features_bitmap[idx] & bit_mask(feature)) != 0;
+    }
+  };
+
+  // CPU feature flags vector, can be affected by VM settings.
+  static VM_Features _features;
+
+  // Original CPU feature flags vector, not affected by VM settings.
+  static VM_Features _cpu_features;
+
   static const char* _features_names[];
 
+  static void clear_cpu_features() {
+    _features = VM_Features();
+    _cpu_features = VM_Features();
+  }
+
   enum Extended_Family {
     // AMD
     CPU_FAMILY_AMD_11H       = 0x11,
@@ -492,6 +582,11 @@ class VM_Version : public Abstract_VM_Version {
     SefCpuid7SubLeaf1Eax sefsl1_cpuid7_eax;
     SefCpuid7SubLeaf1Edx sefsl1_cpuid7_edx;
 
+    // cpuid function 24 converged vector ISA main leaf
+    // eax = 24, ecx = 0
+    StdCpuid24MainLeafEax std_cpuid24_eax;
+    StdCpuid24MainLeafEbx std_cpuid24_ebx;
+
     // cpuid function 0xB (processor topology)
     // ecx = 0
     uint32_t     tpl_cpuidB0_eax;
@@ -565,7 +660,7 @@ class VM_Version : public Abstract_VM_Version {
     // Space to save apx registers after signal handle
     jlong        apx_save[2]; // Save r16 and r31
 
-    uint64_t feature_flags() const;
+    VM_Features feature_flags() const;
 
     // Asserts
     void assert_is_initialized() const {
@@ -611,6 +706,7 @@ class VM_Version : public Abstract_VM_Version {
   // Offsets for cpuid asm stub
   static ByteSize std_cpuid0_offset() { return byte_offset_of(CpuidInfo, std_max_function); }
   static ByteSize std_cpuid1_offset() { return byte_offset_of(CpuidInfo, std_cpuid1_eax); }
+  static ByteSize std_cpuid24_offset() { return byte_offset_of(CpuidInfo, std_cpuid24_eax); }
   static ByteSize dcp_cpuid4_offset() { return byte_offset_of(CpuidInfo, dcp_cpuid4_eax); }
   static ByteSize sef_cpuid7_offset() { return byte_offset_of(CpuidInfo, sef_cpuid7_eax); }
   static ByteSize sefsl1_cpuid7_offset() { return byte_offset_of(CpuidInfo, sefsl1_cpuid7_eax); }
@@ -644,11 +740,29 @@ class VM_Version : public Abstract_VM_Version {
 
   static void clear_apx_test_state();
 
-  static void clean_cpuFeatures()   { _features = 0; }
-  static void set_avx_cpuFeatures() { _features |= (CPU_SSE | CPU_SSE2 | CPU_AVX | CPU_VZEROUPPER ); }
-  static void set_evex_cpuFeatures() { _features |= (CPU_AVX512F | CPU_SSE | CPU_SSE2 | CPU_VZEROUPPER ); }
-  static void set_apx_cpuFeatures() { _features |= CPU_APX_F; }
-  static void set_bmi_cpuFeatures() { _features |= (CPU_BMI1 | CPU_BMI2 | CPU_LZCNT | CPU_POPCNT); }
+  static void clean_cpuFeatures()   {
+    VM_Version::clear_cpu_features();
+  }
+  static void set_avx_cpuFeatures() {
+    _features.set_feature(CPU_SSE);
+    _features.set_feature(CPU_SSE2);
+    _features.set_feature(CPU_AVX);
+    _features.set_feature(CPU_VZEROUPPER);
+  }
+  static void set_evex_cpuFeatures() {
+    _features.set_feature(CPU_AVX10_1);
+    _features.set_feature(CPU_AVX512F);
+    _features.set_feature(CPU_SSE);
+    _features.set_feature(CPU_SSE2);
+    _features.set_feature(CPU_VZEROUPPER);
+  }
+  static void set_apx_cpuFeatures() { _features.set_feature(CPU_APX_F); }
+  static void set_bmi_cpuFeatures() {
+    _features.set_feature(CPU_BMI1);
+    _features.set_feature(CPU_BMI2);
+    _features.set_feature(CPU_LZCNT);
+    _features.set_feature(CPU_POPCNT);
+  }
 
   // Initialization
   static void initialize();
@@ -703,40 +817,39 @@ class VM_Version : public Abstract_VM_Version {
   //
   // Feature identification which can be affected by VM settings
   //
-  static bool supports_cpuid()        { return _features  != 0; }
-  static bool supports_cmov()         { return (_features & CPU_CMOV) != 0; }
-  static bool supports_fxsr()         { return (_features & CPU_FXSR) != 0; }
-  static bool supports_ht()           { return (_features & CPU_HT) != 0; }
-  static bool supports_mmx()          { return (_features & CPU_MMX) != 0; }
-  static bool supports_sse()          { return (_features & CPU_SSE) != 0; }
-  static bool supports_sse2()         { return (_features & CPU_SSE2) != 0; }
-  static bool supports_sse3()         { return (_features & CPU_SSE3) != 0; }
-  static bool supports_ssse3()        { return (_features & CPU_SSSE3)!= 0; }
-  static bool supports_sse4_1()       { return (_features & CPU_SSE4_1) != 0; }
-  static bool supports_sse4_2()       { return (_features & CPU_SSE4_2) != 0; }
-  static bool supports_popcnt()       { return (_features & CPU_POPCNT) != 0; }
-  static bool supports_avx()          { return (_features & CPU_AVX) != 0; }
-  static bool supports_avx2()         { return (_features & CPU_AVX2) != 0; }
-  static bool supports_tsc()          { return (_features & CPU_TSC) != 0; }
-  static bool supports_rdtscp()       { return (_features & CPU_RDTSCP) != 0; }
-  static bool supports_rdpid()        { return (_features & CPU_RDPID) != 0; }
-  static bool supports_aes()          { return (_features & CPU_AES) != 0; }
-  static bool supports_erms()         { return (_features & CPU_ERMS) != 0; }
-  static bool supports_fsrm()         { return (_features & CPU_FSRM) != 0; }
-  static bool supports_clmul()        { return (_features & CPU_CLMUL) != 0; }
-  static bool supports_rtm()          { return (_features & CPU_RTM) != 0; }
-  static bool supports_bmi1()         { return (_features & CPU_BMI1) != 0; }
-  static bool supports_bmi2()         { return (_features & CPU_BMI2) != 0; }
-  static bool supports_adx()          { return (_features & CPU_ADX) != 0; }
-  static bool supports_evex()         { return (_features & CPU_AVX512F) != 0; }
-  static bool supports_avx512dq()     { return (_features & CPU_AVX512DQ) != 0; }
-  static bool supports_avx512ifma()   { return (_features & CPU_AVX512_IFMA) != 0; }
-  static bool supports_avxifma()      { return (_features & CPU_AVX_IFMA) != 0; }
-  static bool supports_avx512pf()     { return (_features & CPU_AVX512PF) != 0; }
-  static bool supports_avx512er()     { return (_features & CPU_AVX512ER) != 0; }
-  static bool supports_avx512cd()     { return (_features & CPU_AVX512CD) != 0; }
-  static bool supports_avx512bw()     { return (_features & CPU_AVX512BW) != 0; }
-  static bool supports_avx512vl()     { return (_features & CPU_AVX512VL) != 0; }
+  static bool supports_cmov()         { return _features.supports_feature(CPU_CMOV); }
+  static bool supports_fxsr()         { return _features.supports_feature(CPU_FXSR); }
+  static bool supports_ht()           { return _features.supports_feature(CPU_HT); }
+  static bool supports_mmx()          { return _features.supports_feature(CPU_MMX); }
+  static bool supports_sse()          { return _features.supports_feature(CPU_SSE); }
+  static bool supports_sse2()         { return _features.supports_feature(CPU_SSE2); }
+  static bool supports_sse3()         { return _features.supports_feature(CPU_SSE3); }
+  static bool supports_ssse3()        { return _features.supports_feature(CPU_SSSE3); }
+  static bool supports_sse4_1()       { return _features.supports_feature(CPU_SSE4_1); }
+  static bool supports_sse4_2()       { return _features.supports_feature(CPU_SSE4_2); }
+  static bool supports_popcnt()       { return _features.supports_feature(CPU_POPCNT); }
+  static bool supports_avx()          { return _features.supports_feature(CPU_AVX); }
+  static bool supports_avx2()         { return _features.supports_feature(CPU_AVX2); }
+  static bool supports_tsc()          { return _features.supports_feature(CPU_TSC); }
+  static bool supports_rdtscp()       { return _features.supports_feature(CPU_RDTSCP); }
+  static bool supports_rdpid()        { return _features.supports_feature(CPU_RDPID); }
+  static bool supports_aes()          { return _features.supports_feature(CPU_AES); }
+  static bool supports_erms()         { return _features.supports_feature(CPU_ERMS); }
+  static bool supports_fsrm()         { return _features.supports_feature(CPU_FSRM); }
+  static bool supports_clmul()        { return _features.supports_feature(CPU_CLMUL); }
+  static bool supports_rtm()          { return _features.supports_feature(CPU_RTM); }
+  static bool supports_bmi1()         { return _features.supports_feature(CPU_BMI1); }
+  static bool supports_bmi2()         { return _features.supports_feature(CPU_BMI2); }
+  static bool supports_adx()          { return _features.supports_feature(CPU_ADX); }
+  static bool supports_evex()         { return _features.supports_feature(CPU_AVX512F); }
+  static bool supports_avx512dq()     { return _features.supports_feature(CPU_AVX512DQ); }
+  static bool supports_avx512ifma()   { return _features.supports_feature(CPU_AVX512_IFMA); }
+  static bool supports_avxifma()      { return _features.supports_feature(CPU_AVX_IFMA); }
+  static bool supports_avx512pf()     { return _features.supports_feature(CPU_AVX512PF); }
+  static bool supports_avx512er()     { return _features.supports_feature(CPU_AVX512ER); }
+  static bool supports_avx512cd()     { return _features.supports_feature(CPU_AVX512CD); }
+  static bool supports_avx512bw()     { return _features.supports_feature(CPU_AVX512BW); }
+  static bool supports_avx512vl()     { return _features.supports_feature(CPU_AVX512VL); }
   static bool supports_avx512vlbw()   { return (supports_evex() && supports_avx512bw() && supports_avx512vl()); }
   static bool supports_avx512bwdq()   { return (supports_evex() && supports_avx512bw() && supports_avx512dq()); }
   static bool supports_avx512vldq()   { return (supports_evex() && supports_avx512dq() && supports_avx512vl()); }
@@ -745,33 +858,39 @@ class VM_Version : public Abstract_VM_Version {
   static bool supports_avx512novl()   { return (supports_evex() && !supports_avx512vl()); }
   static bool supports_avx512nobw()   { return (supports_evex() && !supports_avx512bw()); }
   static bool supports_avx256only()   { return (supports_avx2() && !supports_evex()); }
-  static bool supports_apx_f()        { return (_features & CPU_APX_F) != 0; }
+  static bool supports_apx_f()        { return _features.supports_feature(CPU_APX_F); }
   static bool supports_avxonly()      { return ((supports_avx2() || supports_avx()) && !supports_evex()); }
-  static bool supports_sha()          { return (_features & CPU_SHA) != 0; }
-  static bool supports_fma()          { return (_features & CPU_FMA) != 0 && supports_avx(); }
-  static bool supports_vzeroupper()   { return (_features & CPU_VZEROUPPER) != 0; }
-  static bool supports_avx512_vpopcntdq()  { return (_features & CPU_AVX512_VPOPCNTDQ) != 0; }
-  static bool supports_avx512_vpclmulqdq() { return (_features & CPU_AVX512_VPCLMULQDQ) != 0; }
-  static bool supports_avx512_vaes()  { return (_features & CPU_AVX512_VAES) != 0; }
-  static bool supports_gfni()         { return (_features & CPU_GFNI) != 0; }
-  static bool supports_avx512_vnni()  { return (_features & CPU_AVX512_VNNI) != 0; }
-  static bool supports_avx512_bitalg()  { return (_features & CPU_AVX512_BITALG) != 0; }
-  static bool supports_avx512_vbmi()  { return (_features & CPU_AVX512_VBMI) != 0; }
-  static bool supports_avx512_vbmi2() { return (_features & CPU_AVX512_VBMI2) != 0; }
-  static bool supports_avx512_fp16()  { return (_features & CPU_AVX512_FP16) != 0; }
-  static bool supports_hv()           { return (_features & CPU_HV) != 0; }
-  static bool supports_serialize()    { return (_features & CPU_SERIALIZE) != 0; }
-  static bool supports_f16c()         { return (_features & CPU_F16C) != 0; }
-  static bool supports_pku()          { return (_features & CPU_PKU) != 0; }
-  static bool supports_ospke()        { return (_features & CPU_OSPKE) != 0; }
-  static bool supports_cet_ss()       { return (_features & CPU_CET_SS) != 0; }
-  static bool supports_cet_ibt()      { return (_features & CPU_CET_IBT) != 0; }
-  static bool supports_sha512()       { return (_features & CPU_SHA512) != 0; }
+  static bool supports_sha()          { return _features.supports_feature(CPU_SHA); }
+  static bool supports_fma()          { return _features.supports_feature(CPU_FMA) && supports_avx(); }
+  static bool supports_vzeroupper()   { return _features.supports_feature(CPU_VZEROUPPER); }
+  static bool supports_avx512_vpopcntdq()  { return _features.supports_feature(CPU_AVX512_VPOPCNTDQ); }
+  static bool supports_avx512_vpclmulqdq() { return _features.supports_feature(CPU_AVX512_VPCLMULQDQ); }
+  static bool supports_avx512_vaes()  { return _features.supports_feature(CPU_AVX512_VAES); }
+  static bool supports_gfni()         { return _features.supports_feature(CPU_GFNI); }
+  static bool supports_avx512_vnni()  { return _features.supports_feature(CPU_AVX512_VNNI); }
+  static bool supports_avx512_bitalg()  { return _features.supports_feature(CPU_AVX512_BITALG); }
+  static bool supports_avx512_vbmi()  { return _features.supports_feature(CPU_AVX512_VBMI); }
+  static bool supports_avx512_vbmi2() { return _features.supports_feature(CPU_AVX512_VBMI2); }
+  static bool supports_avx512_fp16()  { return _features.supports_feature(CPU_AVX512_FP16); }
+  static bool supports_hv()           { return _features.supports_feature(CPU_HV); }
+  static bool supports_serialize()    { return _features.supports_feature(CPU_SERIALIZE); }
+  static bool supports_f16c()         { return _features.supports_feature(CPU_F16C); }
+  static bool supports_pku()          { return _features.supports_feature(CPU_PKU); }
+  static bool supports_ospke()        { return _features.supports_feature(CPU_OSPKE); }
+  static bool supports_cet_ss()       { return _features.supports_feature(CPU_CET_SS); }
+  static bool supports_cet_ibt()      { return _features.supports_feature(CPU_CET_IBT); }
+  static bool supports_sha512()       { return _features.supports_feature(CPU_SHA512); }
+
+  // Intel® AVX10 introduces a versioned approach for enumeration that is monotonically increasing, inclusive,
+  // and supporting all vector lengths. Feature set supported by an AVX10 vector ISA version is also supported
+  // by all the versions above it.
+  static bool supports_avx10_1()      { return _features.supports_feature(CPU_AVX10_1);}
+  static bool supports_avx10_2()      { return _features.supports_feature(CPU_AVX10_2);}
 
   //
   // Feature identification not affected by VM flags
   //
-  static bool cpu_supports_evex()     { return (_cpu_features & CPU_AVX512F) != 0; }
+  static bool cpu_supports_evex()     { return _cpu_features.supports_feature(CPU_AVX512F); }
 
   static bool supports_avx512_simd_sort() {
     if (supports_avx512dq()) {
@@ -802,6 +921,8 @@ class VM_Version : public Abstract_VM_Version {
 
   static bool is_intel_tsc_synched_at_init();
 
+  static void insert_features_names(VM_Version::VM_Features features, char* buf, size_t buflen);
+
   // This checks if the JVM is potentially affected by an erratum on Intel CPUs (SKX102)
   // that causes unpredictable behaviour when jcc crosses 64 byte boundaries. Its microcode
   // mitigation causes regressions when jumps or fused conditional branches cross or end at
@@ -809,19 +930,19 @@ class VM_Version : public Abstract_VM_Version {
   static bool has_intel_jcc_erratum() { return _has_intel_jcc_erratum; }
 
   // AMD features
-  static bool supports_3dnow_prefetch()    { return (_features & CPU_3DNOW_PREFETCH) != 0; }
-  static bool supports_lzcnt()    { return (_features & CPU_LZCNT) != 0; }
-  static bool supports_sse4a()    { return (_features & CPU_SSE4A) != 0; }
+  static bool supports_3dnow_prefetch()    { return _features.supports_feature(CPU_3DNOW_PREFETCH); }
+  static bool supports_lzcnt()    { return _features.supports_feature(CPU_LZCNT); }
+  static bool supports_sse4a()    { return _features.supports_feature(CPU_SSE4A); }
 
   static bool is_amd_Barcelona()  { return is_amd() &&
                                            extended_cpu_family() == CPU_FAMILY_AMD_11H; }
 
   // Intel and AMD newer cores support fast timestamps well
   static bool supports_tscinv_bit() {
-    return (_features & CPU_TSCINV_BIT) != 0;
+    return _features.supports_feature(CPU_TSCINV_BIT);
   }
   static bool supports_tscinv() {
-    return (_features & CPU_TSCINV) != 0;
+    return _features.supports_feature(CPU_TSCINV);
   }
 
   // Intel Core and newer cpus have fast IDIV instruction (excluding Atom).
@@ -882,8 +1003,8 @@ class VM_Version : public Abstract_VM_Version {
   static bool supports_clflush(); // Can't inline due to header file conflict
 
   // Note: CPU_FLUSHOPT and CPU_CLWB bits should always be zero for 32-bit
-  static bool supports_clflushopt() { return ((_features & CPU_FLUSHOPT) != 0); }
-  static bool supports_clwb() { return ((_features & CPU_CLWB) != 0); }
+  static bool supports_clflushopt() { return (_features.supports_feature(CPU_FLUSHOPT)); }
+  static bool supports_clwb() { return (_features.supports_feature(CPU_CLWB)); }
 
   // Old CPUs perform lea on AGU which causes additional latency transferring the
   // value from/to ALU for other operations
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 591f30e7b19..532f3333a6d 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -470,6 +470,7 @@ jobjectArray readConfiguration0(JNIEnv *env, JVMCI_TRAPS) {
                  strcmp(vmField.typeString, "intptr_t") == 0 ||
                  strcmp(vmField.typeString, "uintptr_t") == 0 ||
                  strcmp(vmField.typeString, "OopHandle") == 0 ||
+                 strcmp(vmField.typeString, "VM_Version::VM_Features") == 0 ||
                  strcmp(vmField.typeString, "size_t") == 0 ||
                  // All foo* types are addresses.
                  vmField.typeString[strlen(vmField.typeString) - 1] == '*') {
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index dfc15368cf6..e504ee68f84 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -150,7 +150,7 @@
                                                                                                                                      \
   static_field(CompilerToVM::Data,             data_section_item_alignment,            int)                                          \
                                                                                                                                      \
-  JVMTI_ONLY(static_field(CompilerToVM::Data,  _should_notify_object_alloc,            int*))                                         \
+  JVMTI_ONLY(static_field(CompilerToVM::Data,  _should_notify_object_alloc,            int*))                                        \
                                                                                                                                      \
   static_field(Abstract_VM_Version,            _features,                              uint64_t)                                     \
                                                                                                                                      \
@@ -997,7 +997,11 @@
 
 #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)
+  static_field(VM_Version,                     _features,                      VM_Version::VM_Features) \
+                                                                                                        \
+  nonstatic_field(VM_Version::VM_Features,     _features_bitmap[0],            uint64_t)                \
+  static_field(VM_Version::VM_Features,        _features_bitmap_size,          int)                     \
+  static_field(VM_Version,                     _has_intel_jcc_erratum,         bool)
 
 #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant) \
   LP64_ONLY(declare_constant(frame::arg_reg_save_area_bytes))       \
@@ -1005,7 +1009,8 @@
   declare_constant(frame::interpreter_frame_last_sp_offset)
 
 #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)
+#define VM_LONG_CPU_FEATURE_CONSTANTS \
+   CPU_FEATURE_FLAGS(DECLARE_LONG_CPU_FEATURE_CONSTANT)
 
 #endif
 
diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index c0667d739ce..5b9d36115f8 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -325,22 +325,6 @@ unsigned int Abstract_VM_Version::jvm_version() {
          (Abstract_VM_Version::vm_build_number() & 0xFF);
 }
 
-void Abstract_VM_Version::insert_features_names(char* buf, size_t buflen, const char* features_names[]) {
-  uint64_t features = _features;
-  uint features_names_index = 0;
-
-  while (features != 0) {
-    if (features & 1) {
-      int res = jio_snprintf(buf, buflen, ", %s", features_names[features_names_index]);
-      assert(res > 0, "not enough temporary space allocated");
-      buf += res;
-      buflen -= res;
-    }
-    features >>= 1;
-    ++features_names_index;
-  }
-}
-
 const char* Abstract_VM_Version::extract_features_string(const char* cpu_info_string,
                                                          size_t cpu_info_string_len,
                                                          size_t features_offset) {
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index 6f1b886bc98..4972f02e3d8 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -56,6 +56,7 @@ class Abstract_VM_Version: AllStatic {
 
   // CPU feature flags, can be affected by VM settings.
   static uint64_t _features;
+
   static const char* _features_string;
 
   static const char* _cpu_info_string;
@@ -128,10 +129,9 @@ class Abstract_VM_Version: AllStatic {
   static const char* jdk_debug_level();
   static const char* printable_jdk_debug_level();
 
-  static uint64_t features()           { return _features; }
   static const char* features_string() { return _features_string; }
+
   static const char* cpu_info_string() { return _cpu_info_string; }
-  static void insert_features_names(char* buf, size_t buflen, const char* features_names[]);
   static const char* extract_features_string(const char* cpu_info_string,
                                              size_t cpu_info_string_len,
                                              size_t features_offset);
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 77fae3becb5..c47ad7092a8 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1164,6 +1165,7 @@
   /********************/                                                  \
                                                                           \
   declare_toplevel_type(Abstract_VM_Version)                              \
+  declare_toplevel_type(VM_Version)                                       \
                                                                           \
   /*************/                                                         \
   /* Arguments */                                                         \
@@ -1716,7 +1718,6 @@
   /**********************/                                                \
   NOT_ZERO(PPC64_ONLY(declare_constant(frame::entry_frame_locals_size)))  \
                                                                           \
-  NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)))      \
   declare_constant(frame::pc_return_offset)                               \
                                                                           \
   /*************/                                                         \
@@ -2146,3 +2147,4 @@ void vmStructs_init() {
   VMStructs::init();
 }
 #endif // ASSERT
+
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
index d25f7e71990..c75b3d9f9ce 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
@@ -258,6 +258,8 @@ public enum CPUFeature implements CPUFeatureName {
         APX_F,
         SHA512,
         AVX512_FP16,
+        AVX10_1,
+        AVX10_2
     }
 
     private final EnumSet<CPUFeature> features;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java
index 27fd3d23980..319b9b9bc44 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIBackendFactory.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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.runtime.JVMCIBackend;
+import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 
 public interface HotSpotJVMCIBackendFactory {
 
@@ -80,4 +81,58 @@ static <CPUFeatureType extends Enum<CPUFeatureType>> EnumSet<CPUFeatureType> con
         }
         return outFeatures;
     }
+
+    /**
+     * Converts CPU features bit map into enum constants.
+     *
+     * @param <CPUFeatureType> CPU feature enum type
+     * @param enumType the class of {@code CPUFeatureType}
+     * @param constants VM constants. Each entry whose key starts with {@code "VM_Version::CPU_"}
+     *            specifies a CPU feature and its value is a mask for a bit in {@code features}
+     * @param featuresBitMapAddress pointer to {@code VM_Features::_features_bitmap} field of {@code VM_Version::_features}
+     * @param featuresBitMapSize size of feature bit map in bytes
+     * @param renaming maps from VM feature names to enum constant names where the two differ
+     * @throws IllegalArgumentException if any VM CPU feature constant cannot be converted to an
+     *             enum value
+     * @return the set of converted values
+     */
+    static <CPUFeatureType extends Enum<CPUFeatureType>> EnumSet<CPUFeatureType> convertFeatures(
+                    Class<CPUFeatureType> enumType,
+                    Map<String, Long> constants,
+                    long featuresBitMapAddress,
+                    long featuresBitMapSize,
+                    Map<String, String> renaming) {
+        EnumSet<CPUFeatureType> outFeatures = EnumSet.noneOf(enumType);
+        List<String> missing = new ArrayList<>();
+
+        for (Entry<String, Long> e : constants.entrySet()) {
+            String key = e.getKey();
+            long bitIndex = e.getValue();
+            if (key.startsWith("VM_Version::CPU_")) {
+                String name = key.substring("VM_Version::CPU_".length());
+                try {
+                    final long featuresElementShiftCount = 6; // log (# of bits per long)
+                    final long featuresElementMask = (1L << featuresElementShiftCount) - 1;
+
+                    CPUFeatureType feature = Enum.valueOf(enumType, renaming.getOrDefault(name, name));
+
+                    long featureIndex = bitIndex >>> featuresElementShiftCount;
+                    long featureBitMask = 1L << (bitIndex & featuresElementMask);
+                    assert featureIndex < featuresBitMapSize;
+
+                    long featuresElement = UNSAFE.getLong(featuresBitMapAddress + featureIndex * Long.BYTES);
+
+                    if ((featuresElement & featureBitMask) != 0) {
+                        outFeatures.add(feature);
+                    }
+                } catch (IllegalArgumentException iae) {
+                    missing.add(name);
+                }
+            }
+        }
+        if (!missing.isEmpty()) {
+            throw new JVMCIError("Missing CPU feature constants: %s", missing);
+        }
+        return outFeatures;
+    }
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index 821bd9371b2..658bafea36d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.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
@@ -50,7 +50,12 @@ private static EnumSet<CPUFeature> computeFeatures(AMD64HotSpotVMConfig config)
         Map<String, Long> constants = config.getStore().getConstants();
         Map<String, String> renaming = Map.of("3DNOW_PREFETCH", "AMD_3DNOW_PREFETCH");
         assert config.useSSE >= 2 : "minimum config for x64";
-        EnumSet<CPUFeature> features = HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, renaming);
+        long featuresBitMapAddress = config.vmVersionFeatures + config.vmFeaturesFeaturesOffset;
+        EnumSet<CPUFeature> features = HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class,
+                                                                                  constants,
+                                                                                  featuresBitMapAddress,
+                                                                                  config.vmFeaturesFeaturesSize,
+                                                                                  renaming);
         features.add(AMD64.CPUFeature.SSE);
         features.add(AMD64.CPUFeature.SSE2);
         return features;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
index b0e2f425dae..05803bdbfc7 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.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
@@ -42,12 +42,14 @@ class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
     final boolean useCountTrailingZerosInstruction = getFlag("UseCountTrailingZerosInstruction", Boolean.class);
     final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
 
+    final long vmVersionFeatures = getFieldAddress("VM_Version::_features", "VM_Version::VM_Features");
+    final long vmFeaturesFeaturesOffset = getFieldOffset("VM_Version::VM_Features::_features_bitmap[0]", Long.class, "uint64_t");
+    final long vmFeaturesFeaturesSize = getFieldValue("VM_Version::VM_Features::_features_bitmap_size", Long.class, "int");
+
     // CPU capabilities
     final int useSSE = getFlag("UseSSE", Integer.class);
     final int useAVX = getFlag("UseAVX", Integer.class);
 
-    final long vmVersionFeatures = getFieldValue("Abstract_VM_Version::_features", Long.class, "uint64_t");
-
     // CPU feature flags
     final long amd64CX8 = getConstant("VM_Version::CPU_CX8", Long.class);
     final long amd64CMOV = getConstant("VM_Version::CPU_CMOV", Long.class);
@@ -88,4 +90,6 @@ class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
     final long amd64OSPKE = getConstant("VM_Version::CPU_OSPKE", Long.class);
     final long amd64CET_IBT = getConstant("VM_Version::CPU_CET_IBT", Long.class);
     final long amd64CET_SS = getConstant("VM_Version::CPU_CET_SS", Long.class);
+    final long amd64AVX10_1 = getConstant("VM_Version::CPU_AVX10_1", Long.class);
+    final long amd64AVX10_2 = getConstant("VM_Version::CPU_AVX10_2", Long.class);
 }
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
index ba65cb40e6d..fceb2097e46 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbLongConstant.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
@@ -92,7 +92,7 @@ private static void checkForTruncation(String longConstantOutput) throws Excepti
 
         // Expected output snippet is of the form (on x64-64):
         // ...
-        // longConstant VM_Version::CPU_SHA 17179869184
+        // longConstant VM_Version::CPU_SHA 34
         // longConstant markWord::age_shift 3
         // longConstant markWord::hash_mask_in_place 4398046509056
         // ...
@@ -106,7 +106,7 @@ private static void checkForTruncation(String longConstantOutput) throws Excepti
             // Expected value obtained from the CPU_SHA definition in vm_version_x86.hpp
             checkLongValue("VM_Version::CPU_SHA ",
                            longConstantOutput,
-                           17179869184L);
+                           34L);
         }
     }
 
diff --git a/test/lib-test/jdk/test/whitebox/CPUInfoTest.java b/test/lib-test/jdk/test/whitebox/CPUInfoTest.java
index 54a9ef872f5..8f0ef108885 100644
--- a/test/lib-test/jdk/test/whitebox/CPUInfoTest.java
+++ b/test/lib-test/jdk/test/whitebox/CPUInfoTest.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
@@ -66,7 +66,7 @@ public class CPUInfoTest {
                     "hv",           "fsrm",             "avx512_bitalg",     "gfni",
                     "f16c",         "pku",              "ospke",             "cet_ibt",
                     "cet_ss",       "avx512_ifma",      "serialize",         "avx_ifma",
-                    "apx_f"
+                    "apx_f",        "avx10_1",          "avx10_2"
                     );
             // @formatter:on
             // Checkstyle: resume

From fa7c5a65ba62da9b6598d484db923119ace0cf90 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Sat, 10 May 2025 02:59:05 +0000
Subject: [PATCH 386/901] 8356664: [macos] AppContentTest fails after
 JDK-8352480

Reviewed-by: asemenyuk
---
 test/jdk/tools/jpackage/share/AppContentTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/jdk/tools/jpackage/share/AppContentTest.java b/test/jdk/tools/jpackage/share/AppContentTest.java
index ef34c375fc3..15b61763562 100644
--- a/test/jdk/tools/jpackage/share/AppContentTest.java
+++ b/test/jdk/tools/jpackage/share/AppContentTest.java
@@ -162,13 +162,16 @@ private static Path copyAppContentPath(Path appContentPath) throws IOException {
 
         private static Path createAppContentLink(Path appContentPath) throws IOException {
             var appContentArg = TKit.createTempDirectory("app-content");
+            Path dstPath;
             if (copyInResources) {
-                appContentArg = appContentArg.resolve(RESOURCES_DIR).resolve(LINKS_DIR);
-            }   else {
+                appContentArg = appContentArg.resolve(RESOURCES_DIR);
+                dstPath = appContentArg.resolve(LINKS_DIR)
+                                       .resolve(appContentPath.getFileName());
+            } else {
                 appContentArg = appContentArg.resolve(LINKS_DIR);
+                dstPath = appContentArg.resolve(appContentPath.getFileName());
             }
 
-            var dstPath = appContentArg.resolve(appContentPath.getFileName());
             Files.createDirectories(dstPath.getParent());
 
             // Create target file for a link

From 436960308cebe020549fcdbb4bcb12c90ce7aeb8 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Sat, 10 May 2025 15:16:19 +0000
Subject: [PATCH 387/901] 8356597: AOT cache and CDS archive should not be
 created in read-only mode

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

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index ff537ef96d6..7414a553a74 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -747,8 +747,7 @@ void FileMapInfo::open_as_output() {
   // 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 mode = CDSConfig::is_dumping_preimage_static_archive() ? 0666 : 0444;
-  int fd = os::open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, mode);
+  int fd = os::open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0666);
   if (fd < 0) {
     log_error(cds)("Unable to create %s %s: (%s).", CDSConfig::type_of_archive_being_written(), _full_path,
                    os::strerror(errno));

From 97d2a37927fca993537644e748c8abca58752d44 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sun, 11 May 2025 07:39:15 +0000
Subject: [PATCH 388/901] 8355790: Enhance code consistency:
 java.desktop/unix:sun.awt

Reviewed-by: achung, prr
---
 .../unix/classes/sun/awt/FcFontManager.java   |  1 +
 .../classes/sun/awt/PlatformGraphicsInfo.java |  2 +-
 .../unix/classes/sun/awt/UNIXToolkit.java     |  2 +-
 .../sun/awt/X11/GtkFileDialogPeer.java        |  1 +
 .../unix/classes/sun/awt/X11/InfoWindow.java  | 18 +++++----
 .../sun/awt/X11/MotifColorUtilities.java      |  2 +-
 .../sun/awt/X11/MotifDnDConstants.java        |  2 +-
 .../awt/X11/MotifDnDDragSourceProtocol.java   | 13 ++++++-
 .../awt/X11/MotifDnDDropTargetProtocol.java   | 21 +++++++++-
 .../unix/classes/sun/awt/X11/Native.java      |  2 +-
 .../sun/awt/X11/UnsafeXDisposerRecord.java    |  3 +-
 .../classes/sun/awt/X11/WindowDimensions.java |  5 ++-
 .../sun/awt/X11/WindowPropertyGetter.java     |  2 +-
 .../classes/sun/awt/X11/XAWTLookAndFeel.java  |  4 +-
 .../classes/sun/awt/X11/XAWTXSettings.java    |  5 ++-
 .../unix/classes/sun/awt/X11/XAtom.java       |  3 ++
 .../unix/classes/sun/awt/X11/XAtomList.java   |  3 +-
 .../unix/classes/sun/awt/X11/XAwtState.java   |  2 +-
 .../classes/sun/awt/X11/XBaseMenuWindow.java  |  6 +++
 .../unix/classes/sun/awt/X11/XBaseWindow.java |  3 +-
 .../unix/classes/sun/awt/X11/XButtonPeer.java | 11 +++++-
 .../unix/classes/sun/awt/X11/XCanvasPeer.java |  3 ++
 .../classes/sun/awt/X11/XCheckboxPeer.java    | 11 +++++-
 .../unix/classes/sun/awt/X11/XChoicePeer.java | 30 ++++++++++++++
 .../unix/classes/sun/awt/X11/XClipboard.java  | 14 ++++++-
 .../classes/sun/awt/X11/XComponentPeer.java   | 35 +++++++++++++++++
 .../classes/sun/awt/X11/XContentWindow.java   |  7 +++-
 .../sun/awt/X11/XCreateWindowParams.java      |  3 +-
 .../classes/sun/awt/X11/XCustomCursor.java    |  3 +-
 .../classes/sun/awt/X11/XDataTransferer.java  |  3 +-
 .../classes/sun/awt/X11/XDecoratedPeer.java   | 38 ++++++++++++++++++
 .../classes/sun/awt/X11/XDesktopPeer.java     |  8 +++-
 .../unix/classes/sun/awt/X11/XDialogPeer.java |  6 +++
 .../classes/sun/awt/X11/XDnDConstants.java    |  2 +-
 .../sun/awt/X11/XDnDDragSourceProtocol.java   | 11 +++++-
 .../sun/awt/X11/XDnDDropTargetProtocol.java   | 22 ++++++++++-
 .../sun/awt/X11/XDragSourceContextPeer.java   | 11 ++++++
 .../sun/awt/X11/XDragSourceProtocol.java      |  2 +-
 .../sun/awt/X11/XDropTargetContextPeer.java   |  8 ++++
 .../classes/sun/awt/X11/XEmbedCanvasPeer.java | 27 +++++++++++--
 .../classes/sun/awt/X11/XEmbedChildProxy.java |  3 +-
 .../sun/awt/X11/XEmbedChildProxyPeer.java     | 39 ++++++++++++++++++-
 .../sun/awt/X11/XEmbedClientHelper.java       |  3 +-
 .../sun/awt/X11/XEmbedServerTester.java       |  3 +-
 .../classes/sun/awt/X11/XEmbeddedFrame.java   |  6 +++
 .../sun/awt/X11/XEmbeddedFramePeer.java       | 21 +++++++++-
 .../sun/awt/X11/XEmbeddingContainer.java      |  3 +-
 .../classes/sun/awt/X11/XErrorHandler.java    |  4 +-
 .../unix/classes/sun/awt/X11/XException.java  |  2 +-
 .../classes/sun/awt/X11/XFileDialogPeer.java  | 20 ++++++++--
 .../sun/awt/X11/XFocusProxyWindow.java        |  7 +++-
 .../unix/classes/sun/awt/X11/XFontPeer.java   |  1 +
 .../unix/classes/sun/awt/X11/XFramePeer.java  | 17 ++++++++
 .../sun/awt/X11/XGlobalCursorManager.java     |  5 +++
 .../sun/awt/X11/XHorizontalScrollbar.java     |  6 ++-
 .../unix/classes/sun/awt/X11/XIconWindow.java |  3 +-
 .../classes/sun/awt/X11/XInputMethod.java     | 12 +++++-
 .../sun/awt/X11/XInputMethodDescriptor.java   |  3 +-
 .../awt/X11/XKeyboardFocusManagerPeer.java    |  2 +-
 .../unix/classes/sun/awt/X11/XKeysym.java     |  4 +-
 .../unix/classes/sun/awt/X11/XLabelPeer.java  |  4 +-
 .../sun/awt/X11/XLightweightFramePeer.java    |  2 +-
 .../unix/classes/sun/awt/X11/XListPeer.java   | 33 +++++++++++++++-
 .../unix/classes/sun/awt/X11/XMSelection.java |  2 +-
 .../classes/sun/awt/X11/XMenuBarPeer.java     | 19 ++++++++-
 .../classes/sun/awt/X11/XMenuItemPeer.java    |  7 +++-
 .../unix/classes/sun/awt/X11/XMenuPeer.java   |  2 +-
 .../unix/classes/sun/awt/X11/XMenuWindow.java |  7 +++-
 .../awt/X11/XMouseDragGestureRecognizer.java  |  9 ++++-
 .../classes/sun/awt/X11/XMouseInfoPeer.java   |  2 +
 .../classes/sun/awt/X11/XNETProtocol.java     |  7 ++++
 .../unix/classes/sun/awt/X11/XPanelPeer.java  |  8 ++++
 .../classes/sun/awt/X11/XPopupMenuPeer.java   |  2 +-
 .../classes/sun/awt/X11/XPropertyCache.java   |  4 +-
 .../unix/classes/sun/awt/X11/XQueryTree.java  |  2 +-
 .../classes/sun/awt/X11/XRepaintArea.java     |  2 +
 .../unix/classes/sun/awt/X11/XRootWindow.java |  6 ++-
 .../classes/sun/awt/X11/XScrollPanePeer.java  | 19 ++++++++-
 .../unix/classes/sun/awt/X11/XScrollbar.java  |  4 +-
 .../classes/sun/awt/X11/XScrollbarPeer.java   | 12 +++++-
 .../unix/classes/sun/awt/X11/XSelection.java  |  9 +++--
 .../classes/sun/awt/X11/XSystemTrayPeer.java  |  6 ++-
 .../classes/sun/awt/X11/XTextAreaPeer.java    |  4 +-
 .../awt/X11/XToolkitThreadBlockedHandler.java |  4 ++
 .../sun/awt/X11/XTranslateCoordinates.java    |  2 +-
 .../classes/sun/awt/X11/XTrayIconPeer.java    | 33 +++++++++++++---
 .../sun/awt/X11/XVerticalScrollbar.java       |  6 ++-
 .../classes/sun/awt/X11/XWINProtocol.java     |  9 ++++-
 .../unix/classes/sun/awt/X11/XWM.java         |  1 +
 .../unix/classes/sun/awt/X11/XWindow.java     | 16 ++++++++
 .../sun/awt/X11/XWindowAttributesData.java    |  2 +-
 .../unix/classes/sun/awt/X11/XWindowPeer.java | 28 +++++++++++++
 .../classes/sun/awt/X11/XWrapperBase.java     |  2 +
 .../unix/classes/sun/awt/X11/XlibUtil.java    |  2 +-
 .../unix/classes/sun/awt/X11CustomCursor.java |  4 +-
 .../unix/classes/sun/awt/X11FontManager.java  |  3 ++
 .../classes/sun/awt/X11GraphicsConfig.java    |  5 ++-
 .../classes/sun/awt/X11GraphicsDevice.java    |  1 +
 .../sun/awt/X11GraphicsEnvironment.java       |  2 +
 .../unix/classes/sun/awt/X11InputMethod.java  |  7 ++++
 .../classes/sun/awt/X11InputMethodBase.java   | 20 ++++++++++
 .../sun/awt/X11InputMethodDescriptor.java     |  5 +++
 .../unix/classes/sun/awt/XSettings.java       |  2 +-
 .../sun/awt/screencast/ScreencastHelper.java  |  2 +-
 .../sun/awt/screencast/TokenStorage.java      |  2 +-
 105 files changed, 747 insertions(+), 102 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
index ecd7ac0ad35..0d787ceb1af 100644
--- a/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/FcFontManager.java
@@ -103,6 +103,7 @@ protected String[] getDefaultPlatformFont() {
 
     native String getFontPathNative(boolean noType1Fonts, boolean isX11GE);
 
+    @Override
     protected synchronized String getFontPath(boolean noType1Fonts) {
         return getFontPathNative(noType1Fonts, false);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
index 4e379a9e9e6..1ff871f9efc 100644
--- a/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
@@ -29,7 +29,7 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 
-public class PlatformGraphicsInfo {
+public final class PlatformGraphicsInfo {
 
     public static GraphicsEnvironment createGE() {
         return new X11GraphicsEnvironment();
diff --git a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
index 4c6b451b7e4..053684423de 100644
--- a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
@@ -70,7 +70,7 @@ public enum GtkVersions {
         ANY(0),
         GTK3(Constants.GTK3_MAJOR_NUMBER);
 
-        static class Constants {
+        static final class Constants {
             static final int GTK3_MAJOR_NUMBER = 3;
         }
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
index 71263ec49f3..7bd6bcb306f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
@@ -154,6 +154,7 @@ public void setFile(String file) {
         // have delegated to FileDialog#setFile
     }
 
+    @Override
     protected void requestXFocus(long time, boolean timeProvided) {
         if(standaloneWindow == 0) {
             super.requestXFocus(time, timeProvided);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
index b73c94ac86d..ede95bea3e8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java
@@ -78,6 +78,7 @@ public Insets getInsets() {
         closer = new Closer();
     }
 
+    @Override
     public Component add(Component c) {
         container.add(c, BorderLayout.CENTER);
         return c;
@@ -114,15 +115,17 @@ protected void show(Point corner, int indent) {
         closer.schedule();
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void hide() {
         closer.close();
     }
 
-    private class Closer implements Runnable {
+    private final class Closer implements Runnable {
         Runnable action;
         int time;
 
+        @Override
         public void run() {
             doClose();
         }
@@ -166,7 +169,7 @@ private interface LiveArguments {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    public static class Tooltip extends InfoWindow {
+    public static final class Tooltip extends InfoWindow {
 
         public interface LiveArguments extends InfoWindow.LiveArguments {
             /** The tooltip to be displayed. */
@@ -254,7 +257,7 @@ private boolean isPointerOverTrayIcon(Rectangle trayRect) {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    public static class Balloon extends InfoWindow {
+    public static final class Balloon extends InfoWindow {
 
         public interface LiveArguments extends InfoWindow.LiveArguments {
             /** The action to be performed upon clicking the balloon. */
@@ -422,6 +425,7 @@ public void run() {
                 });
         }
 
+        @Override
         public void dispose() {
             displayer.thread.interrupt();
             super.dispose();
@@ -451,7 +455,8 @@ private void loadGtkImages() {
             }
         }
         @SuppressWarnings("deprecation")
-        private class ActionPerformer extends MouseAdapter {
+        private final class ActionPerformer extends MouseAdapter {
+            @Override
             public void mouseClicked(MouseEvent e) {
                 // hide the balloon by any click
                 hide();
@@ -464,7 +469,7 @@ public void mouseClicked(MouseEvent e) {
             }
         }
 
-        private class Displayer implements Runnable {
+        private final class Displayer implements Runnable {
             final int MAX_CONCURRENT_MSGS = 10;
 
             ArrayBlockingQueue<Message> messageQueue = new ArrayBlockingQueue<Message>(MAX_CONCURRENT_MSGS);
@@ -511,7 +516,7 @@ void display(String caption, String text, String messageType) {
             }
         }
 
-        private static class Message {
+        private static final class Message {
             String caption, text, messageType;
 
             Message(String caption, String text, String messageType) {
@@ -522,4 +527,3 @@ private static class Message {
         }
     }
 }
-
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
index 664de49103f..6b6e8ad0c6d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java
@@ -41,7 +41,7 @@
   *
   */
 
-class MotifColorUtilities {
+final class MotifColorUtilities {
 
 
     static final float XmRED_LUMINOSITY=0.30f;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
index f2dbfc67abf..2e0fe9717d8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java
@@ -38,7 +38,7 @@
  *
  * @since 1.5
  */
-class MotifDnDConstants {
+final class MotifDnDConstants {
     // utility class can not be instantiated
     private MotifDnDConstants() {}
     // Note that offsets in all native structures below do not depend on the
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
index d2c02f829f8..ee1c5afcdf9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java
@@ -40,7 +40,7 @@
  *
  * @since 1.5
  */
-class MotifDnDDragSourceProtocol extends XDragSourceProtocol
+final class MotifDnDDragSourceProtocol extends XDragSourceProtocol
     implements XEventDispatcher {
 
     private static final Unsafe unsafe = XlibWrapper.unsafe;
@@ -61,10 +61,12 @@ static XDragSourceProtocol createInstance(XDragSourceProtocolListener listener)
         return new MotifDnDDragSourceProtocol(listener);
     }
 
+    @Override
     public String getProtocolName() {
         return XDragAndDropProtocols.MotifDnD;
     }
 
+    @Override
     protected void initializeDragImpl(int actions, Transferable contents,
                                       Map<Long, DataFlavor> formatMap, long[] formats)
       throws InvalidDnDOperationException,
@@ -95,6 +97,7 @@ protected void initializeDragImpl(int actions, Transferable contents,
      *
      * @return true if the event was successfully processed.
      */
+    @Override
     public boolean processClientMessage(XClientMessageEvent xclient) {
         if (xclient.get_message_type() !=
             MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -173,6 +176,7 @@ public boolean processClientMessage(XClientMessageEvent xclient) {
         return true;
     }
 
+    @Override
     public TargetWindowInfo getTargetWindowInfo(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -232,6 +236,7 @@ public TargetWindowInfo getTargetWindowInfo(long window) {
         }
     }
 
+    @Override
     public void sendEnterMessage(long[] formats,
                                  int sourceAction, int sourceActions, long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -273,6 +278,7 @@ public void sendEnterMessage(long[] formats,
         }
     }
 
+    @Override
     public void sendMoveMessage(int xRoot, int yRoot,
                                 int sourceAction, int sourceActions, long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -311,6 +317,7 @@ public void sendMoveMessage(int xRoot, int yRoot,
         }
     }
 
+    @Override
     public void sendLeaveMessage(long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
         assert getTargetWindow() != 0;
@@ -342,6 +349,7 @@ public void sendLeaveMessage(long time) {
         }
     }
 
+    @Override
     protected void sendDropMessage(int xRoot, int yRoot,
                                    int sourceAction, int sourceActions,
                                    long time) {
@@ -388,17 +396,20 @@ protected void sendDropMessage(int xRoot, int yRoot,
         }
     }
 
+    @Override
     public boolean processProxyModeEvent(XClientMessageEvent xclient,
                                          long sourceWindow) {
         // Motif DnD for XEmbed is not implemented.
         return false;
     }
 
+    @Override
     public void cleanupTargetInfo() {
         super.cleanupTargetInfo();
         targetEnterServerTime = XConstants.CurrentTime;
     }
 
+    @Override
     public void dispatchEvent(XEvent ev) {
         switch (ev.get_type()) {
         case XConstants.SelectionRequest:
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
index b211e9e27cc..fa8f7f46fc1 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
@@ -40,7 +40,7 @@
  *
  * @since 1.5
  */
-class MotifDnDDropTargetProtocol extends XDropTargetProtocol {
+final class MotifDnDDropTargetProtocol extends XDropTargetProtocol {
     private static final Unsafe unsafe = XlibWrapper.unsafe;
 
     private long sourceWindow = 0;
@@ -68,22 +68,26 @@ static XDropTargetProtocol createInstance(XDropTargetProtocolListener listener)
         return new MotifDnDDropTargetProtocol(listener);
     }
 
+    @Override
     public String getProtocolName() {
         return XDragAndDropProtocols.MotifDnD;
     }
 
+    @Override
     public void registerDropTarget(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
         MotifDnDConstants.writeDragReceiverInfoStruct(window);
     }
 
+    @Override
     public void unregisterDropTarget(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
         MotifDnDConstants.XA_MOTIF_ATOM_0.DeleteProperty(window);
     }
 
+    @Override
     public void registerEmbedderDropSite(long embedder) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -185,6 +189,7 @@ public void registerEmbedderDropSite(long embedder) {
         putEmbedderRegistryEntry(embedder, overridden, version, proxy);
     }
 
+    @Override
     public void unregisterEmbedderDropSite(long embedder) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -261,6 +266,7 @@ public void unregisterEmbedderDropSite(long embedder) {
      * Gets and stores in the registry the embedder's Motif DnD drop site info
      * from the embedded.
      */
+    @Override
     public void registerEmbeddedDropSite(long embedded) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -317,6 +323,7 @@ public void registerEmbeddedDropSite(long embedded) {
         putEmbedderRegistryEntry(embedded, overridden, version, proxy);
     }
 
+    @Override
     public boolean isProtocolSupported(long window) {
         WindowPropertyGetter wpg =
             new WindowPropertyGetter(window,
@@ -677,6 +684,7 @@ private boolean processDropStart(XClientMessageEvent xclient) {
         return true;
     }
 
+    @Override
     public int getMessageType(XClientMessageEvent xclient) {
         if (xclient.get_message_type() !=
             MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -703,6 +711,7 @@ public int getMessageType(XClientMessageEvent xclient) {
         }
     }
 
+    @Override
     protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
         if (xclient.get_message_type() !=
             MotifDnDConstants.XA_MOTIF_DRAG_AND_DROP_MESSAGE.getAtom()) {
@@ -751,26 +760,31 @@ protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
      * Currently we don't synthesize enter/leave messages for Motif DnD
      * protocol. See comments in XDropTargetProtocol.postProcessClientMessage.
      */
+    @Override
     protected void sendEnterMessageToToplevel(long win,
                                               XClientMessageEvent xclient) {
         throw new Error("UNIMPLEMENTED");
     }
 
+    @Override
     protected void sendLeaveMessageToToplevel(long win,
                                               XClientMessageEvent xclient) {
         throw new Error("UNIMPLEMENTED");
     }
 
+    @Override
     public boolean forwardEventToEmbedded(long embedded, long ctxt,
                                           int eventID) {
         // UNIMPLEMENTED.
         return false;
     }
 
+    @Override
     public boolean isXEmbedSupported() {
         return false;
     }
 
+    @Override
     public boolean sendResponse(long ctxt, int eventID, int action) {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
         if (xclient.get_message_type() !=
@@ -890,6 +904,7 @@ public boolean sendResponse(long ctxt, int eventID, int action) {
         return true;
     }
 
+    @Override
     public Object getData(long ctxt, long format)
       throws IllegalArgumentException, IOException {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
@@ -941,6 +956,7 @@ public Object getData(long ctxt, long format)
         return selection.getData(format, time_stamp);
     }
 
+    @Override
     public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
 
@@ -1004,6 +1020,7 @@ public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
         return true;
     }
 
+    @Override
     public final long getSourceWindow() {
         return sourceWindow;
     }
@@ -1011,6 +1028,7 @@ public final long getSourceWindow() {
     /**
      * Reset the state of the object.
      */
+    @Override
     public void cleanup() {
         // Clear the reference to this protocol.
         XDropTargetEventProcessor.reset();
@@ -1046,6 +1064,7 @@ public void cleanup() {
         topLevelLeavePostponed = false;
     }
 
+    @Override
     public boolean isDragOverComponent() {
         return targetXWindow != null;
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/Native.java b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
index 29490103f41..784328262b9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/Native.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/Native.java
@@ -33,7 +33,7 @@
  * native data types on different platforms similarly.
  */
 
-class Native {
+final class Native {
 
     private static Unsafe unsafe = XlibWrapper.unsafe;
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
index 6de0c0310ef..492fc0a0827 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java
@@ -27,7 +27,7 @@
 import jdk.internal.misc.Unsafe;
 import sun.util.logging.PlatformLogger;
 
-class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord {
+final class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord {
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.UnsafeXDisposerRecord");
     private static Unsafe unsafe = XlibWrapper.unsafe;
     final long[] unsafe_ptrs, x_ptrs;
@@ -55,6 +55,7 @@ public UnsafeXDisposerRecord(String name, long ... unsafe_ptrs) {
         }
     }
 
+    @Override
     public void dispose() {
         XToolkit.awtLock();
         try {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
index 811a5cf12c9..38ae4efbac0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
@@ -26,7 +26,7 @@
 
 import java.awt.*;
 
-class WindowDimensions {
+final class WindowDimensions {
     private Point loc;
     private Dimension size;
     private Insets insets;
@@ -160,10 +160,12 @@ public boolean isClientSizeSet() {
         return isClientSizeSet;
     }
 
+    @Override
     public String toString() {
         return "[" + loc + ", " + size + "(" +(isClientSizeSet?"client":"bounds") + ")+" + insets + "]";
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof WindowDimensions)) {
             return false;
@@ -174,6 +176,7 @@ public boolean equals(Object o) {
             && (getBounds().equals(dims.getBounds()));
     }
 
+    @Override
     public int hashCode() {
         return ((insets == null)? (0):(insets.hashCode())) ^ getClientRect().hashCode() ^ getBounds().hashCode();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
index ba2c9f9e5bd..c39802d08b8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java
@@ -28,7 +28,7 @@
 import java.util.*;
 import jdk.internal.misc.Unsafe;
 
-public class WindowPropertyGetter {
+public final class WindowPropertyGetter {
     private static Unsafe unsafe = XlibWrapper.unsafe;
     private final long actual_type = unsafe.allocateMemory(8);
     private final long actual_format = unsafe.allocateMemory(4);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
index b101d51f4e8..96aa097cb8f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java
@@ -39,7 +39,7 @@
 import sun.awt.X11.XComponentPeer;
 
 @SuppressWarnings({"serial", "removal"}) // JDK-implementation class
-class XAWTLookAndFeel extends MotifLookAndFeel {
+final class XAWTLookAndFeel extends MotifLookAndFeel {
 
     /**
      * Load the SystemColors into the defaults table.  The keys
@@ -49,6 +49,7 @@ class XAWTLookAndFeel extends MotifLookAndFeel {
      * values, otherwise we create color objects whose values match
      * the default CDE/Motif colors.
      */
+    @Override
     protected void initSystemColorDefaults(UIDefaults table) {
         String[] defaultSystemColors = {
             "desktop", "#005C5C", /* Color of the desktop background */
@@ -83,6 +84,7 @@ protected void initSystemColorDefaults(UIDefaults table) {
         loadSystemColors(table, defaultSystemColors, true);
     }
 
+    @Override
     protected void initComponentDefaults(UIDefaults table) {
         super.initComponentDefaults(table);
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
index 1dc774567b7..ed333a0b4e7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java
@@ -38,7 +38,7 @@
 import sun.util.logging.PlatformLogger;
 
 
-class XAWTXSettings extends XSettings implements XMSelectionListener {
+final class XAWTXSettings extends XSettings implements XMSelectionListener {
 
     private final XAtom xSettingsPropertyAtom = XAtom.get("_XSETTINGS_SETTINGS");
 
@@ -67,6 +67,7 @@ void dispose() {
         settings.removeSelectionListener(this);
     }
 
+    @Override
     public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("Owner " + deadOwner + " died for selection " + sel + " screen "+ screen);
@@ -74,12 +75,14 @@ public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
     }
 
 
+    @Override
     public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("New Owner "+ newOwner + " for selection = " + sel + " screen " +screen );
         }
     }
 
+    @Override
     public void selectionChanged(int screen, XMSelection sel, long owner , XPropertyEvent event) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("Selection changed on sel " + sel + " screen = " + screen + " owner = " + owner + " event = " + event);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
index 78b8844f061..c70183e8d4e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java
@@ -209,6 +209,7 @@ static String asString(long atom) {
     void register() {
         register(this);
     }
+    @Override
     public String toString() {
         if (name != null) {
             return name + ":" + atom;
@@ -769,6 +770,7 @@ void checkWindow(long window) {
         }
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof XAtom)) {
             return false;
@@ -776,6 +778,7 @@ public boolean equals(Object o) {
         XAtom ot = (XAtom)o;
         return (atom == ot.atom && display == ot.display);
     }
+    @Override
     public int hashCode() {
         return (int)((atom ^ display)& 0xFFFFL);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java b/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
index 1c803419f16..2ac6d42719c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAtomList.java
@@ -30,7 +30,7 @@
 /**
  * Helper class to ease the work with the lists of atoms.
  */
-class XAtomList {
+final class XAtomList {
     Set<XAtom> atoms = new HashSet<XAtom>();
 
     /**
@@ -151,6 +151,7 @@ public void addAll(XAtomList atoms) {
         }
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("[");
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java b/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
index 48405833248..16b2bc64120 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAwtState.java
@@ -35,7 +35,7 @@
 import java.awt.Component;
 import java.lang.ref.WeakReference;
 
-class XAwtState {
+final class XAwtState {
     /**
      * The mouse is over this component.
      * If the component is not disabled, it received MOUSE_ENTERED but no MOUSE_EXITED.
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
index 138e4a709a4..d562ae52969 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseMenuWindow.java
@@ -153,6 +153,7 @@ static class MappingData implements Cloneable {
             this.items = new XMenuItemPeer[0];
         }
 
+        @Override
         public Object clone() {
             try {
                 return super.clone();
@@ -227,6 +228,7 @@ public XMenuItemPeer[] getItems() {
     /**
      * Overrides XBaseWindow.instantPreInit
      */
+    @Override
     void instantPreInit(XCreateWindowParams params) {
         super.instantPreInit(params);
         items = new ArrayList<>();
@@ -894,6 +896,7 @@ void draw3DRect(Graphics g, int x, int y, int width, int height, boolean raised)
     /**
      * Filters X events
      */
+     @Override
      protected boolean isEventDisabled(XEvent e) {
         switch (e.get_type()) {
           case XConstants.Expose :
@@ -913,6 +916,7 @@ protected boolean isEventDisabled(XEvent e) {
     /**
      * Invokes disposal procedure on eventHandlerThread
      */
+    @Override
     public void dispose() {
         setDisposed(true);
 
@@ -943,6 +947,7 @@ protected void doDispose() {
      * XBaseMenuWindow has no corresponding component
      * so events cannot be processed using standard means
      */
+    @Override
     void postEvent(final AWTEvent event) {
         InvocationEvent ev = new InvocationEvent(event.getSource(), new Runnable() {
             public void run() {
@@ -969,6 +974,7 @@ protected void handleEvent(AWTEvent event) {
      * Save location of pointer for further use
      * then invoke superclass
      */
+    @Override
     public boolean grabInput() {
         int rootX;
         int rootY;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
index 670106fe05c..8c0e5075ee0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java
@@ -117,7 +117,7 @@ protected final void postInit() {}
 
     // internal lock for synchronizing state changes and paint calls, initialized in preInit.
     // the order with other locks: AWTLock -> stateLock
-    static class StateLock { }
+    static final class StateLock { }
     protected StateLock state_lock;
 
     /**
@@ -1235,6 +1235,7 @@ public XWindowPeer getToplevelXWindow() {
         }
         return (XWindowPeer)bw;
     }
+    @Override
     public String toString() {
         return super.toString() + "(" + Long.toString(getWindow(), 16) + ")";
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
index 7d2ebb6522d..49827f4af30 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XButtonPeer.java
@@ -33,7 +33,7 @@
 import javax.swing.plaf.basic.*;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingConstants;
-public class XButtonPeer extends XComponentPeer implements ButtonPeer {
+public final class XButtonPeer extends XComponentPeer implements ButtonPeer {
     private boolean pressed;
     private boolean armed;
     private Insets focusInsets;
@@ -51,6 +51,7 @@ protected String getPropertyPrefix() {
         return propertyPrefix;
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         borderInsets = new Insets(2,2,2,2);
@@ -67,6 +68,7 @@ public  XButtonPeer(Button target) {
         updateMotifColors(getPeerBackground());
     }
 
+    @Override
     public  void dispose() {
         synchronized (target)
         {
@@ -75,6 +77,7 @@ public  void dispose() {
         super.dispose();
     }
 
+    @Override
     public boolean isFocusable() {
         return true;
     }
@@ -90,11 +93,13 @@ public void setLabel(String label) {
         }
     }
 
+    @Override
     public void setBackground(Color c) {
         updateMotifColors(c);
         super.setBackground(c);
     }
 
+    @Override
     void handleJavaMouseEvent(MouseEvent e) {
         super.handleJavaMouseEvent(e);
         int id = e.getID();
@@ -151,16 +156,19 @@ public void action(final long when, final int modifiers) {
     }
 
 
+    @Override
     public void focusGained(FocusEvent e) {
         super.focusGained(e);
         repaint();
     }
 
+    @Override
     public void focusLost(FocusEvent e) {
         super.focusLost(e);
         repaint();
     }
 
+    @Override
     void handleJavaKeyEvent(KeyEvent e) {
         int id = e.getID();
         switch (id) {
@@ -191,6 +199,7 @@ void handleJavaKeyEvent(KeyEvent e) {
         }
     }
 
+    @Override
     public Dimension getMinimumSize() {
         FontMetrics fm = getFontMetrics(getPeerFont());
         if ( label == null ) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
index 2045288bce4..13c6e9c35f6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCanvasPeer.java
@@ -46,6 +46,7 @@ class XCanvasPeer extends XComponentPeer implements CanvasPeer {
         super(target);
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         if (SunToolkit.getSunAwtNoerasebackground()) {
@@ -56,6 +57,7 @@ void preInit(XCreateWindowParams params) {
     /* Get a GraphicsConfig with the same visual on the new
      * screen, which should be easy in Xinerama mode.
      */
+    @Override
     public GraphicsConfiguration getAppropriateGraphicsConfiguration(
                                     GraphicsConfiguration gc)
     {
@@ -97,6 +99,7 @@ protected boolean shouldFocusOnClick() {
     public void disableBackgroundErase() {
         eraseBackgroundDisabled = true;
     }
+    @Override
     protected boolean doEraseBackground() {
         return !eraseBackgroundDisabled;
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
index c66cda16443..f5bfc10120f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
@@ -35,7 +35,7 @@
 
 import sun.util.logging.PlatformLogger;
 
-class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
+final class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
 
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XCheckboxPeer");
 
@@ -82,6 +82,7 @@ class XCheckboxPeer extends XComponentPeer implements CheckboxPeer {
         updateMotifColors(getPeerBackground());
     }
 
+    @Override
     public void preInit(XCreateWindowParams params) {
         // Put this here so it is executed before layout() is called from
         // setFont() in XComponent.postInit()
@@ -90,14 +91,17 @@ public void preInit(XCreateWindowParams params) {
         super.preInit(params);
     }
 
+    @Override
     public boolean isFocusable() { return true; }
 
+    @Override
     public void focusGained(FocusEvent e) {
         // TODO: only need to paint the focus bit
         super.focusGained(e);
         repaint();
     }
 
+    @Override
     public void focusLost(FocusEvent e) {
         // TODO: only need to paint the focus bit?
         super.focusLost(e);
@@ -105,6 +109,7 @@ public void focusLost(FocusEvent e) {
     }
 
 
+    @Override
     void handleJavaKeyEvent(KeyEvent e) {
         int i = e.getID();
         switch (i) {
@@ -148,6 +153,7 @@ public void setLabel(String label) {
         }
     }
 
+    @Override
     void handleJavaMouseEvent(MouseEvent e) {
         super.handleJavaMouseEvent(e);
         int i = e.getID();
@@ -241,6 +247,7 @@ public void mouseExited(MouseEvent e) {
 
     public void mouseClicked(MouseEvent e) {}
 
+    @Override
     public Dimension getMinimumSize() {
         /*
          * Spacing (number of pixels between check mark and label text) is
@@ -263,6 +270,7 @@ private int getCheckboxSize(FontMetrics fm) {
         return (fm.getHeight() * 76 / 100) - 1;
     }
 
+    @Override
     public void setBackground(Color c) {
         updateMotifColors(c);
         super.setBackground(c);
@@ -271,6 +279,7 @@ public void setBackground(Color c) {
     /*
      * Layout the checkbox/radio button and text label
      */
+    @Override
     public void layout() {
         Dimension size = getPeerSize();
         Font f = getPeerFont();
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
index 923360f1a31..59011f4d729 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
@@ -144,6 +144,7 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
         super(target);
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         Choice target = (Choice)this.target;
@@ -164,6 +165,7 @@ void preInit(XCreateWindowParams params) {
                                 SCROLLBAR_WIDTH);
     }
 
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         Choice target = (Choice)this.target;
@@ -181,11 +183,13 @@ void postInit(XCreateWindowParams params) {
         updateMotifColors(getPeerBackground());
     }
 
+    @Override
     public boolean isFocusable() { return true; }
 
     // 6399679. check if super.setBounds() actually changes the size of the
     // component and then compare current Choice size with a new one. If
     // they differ then hide dropdown menu
+    @Override
     public void setBounds(int x, int y, int width, int height, int op) {
         int oldX = this.x;
         int oldY = this.y;
@@ -197,6 +201,7 @@ public void setBounds(int x, int y, int width, int height, int op) {
         }
     }
 
+    @Override
     public void focusGained(FocusEvent e) {
         // TODO: only need to paint the focus bit
         super.focusGained(e);
@@ -208,6 +213,7 @@ public void focusGained(FocusEvent e) {
      * if setEnabled(false) invoked we should close opened choice in
      * order to prevent keyboard/mouse lock.
      */
+    @Override
     public void setEnabled(boolean value) {
         super.setEnabled(value);
         helper.updateColors(getGUIcolors());
@@ -216,12 +222,14 @@ public void setEnabled(boolean value) {
         }
     }
 
+    @Override
     public void focusLost(FocusEvent e) {
         // TODO: only need to paint the focus bit?
         super.focusLost(e);
         repaint();
     }
 
+    @Override
     void ungrabInputImpl() {
         if (unfurled) {
             unfurled = false;
@@ -233,6 +241,7 @@ void ungrabInputImpl() {
         super.ungrabInputImpl();
     }
 
+    @Override
     void handleJavaKeyEvent(KeyEvent e) {
         if (e.getID() == KeyEvent.KEY_PRESSED) {
             keyPressed(e);
@@ -345,8 +354,10 @@ public void keyPressed(KeyEvent e) {
         }
     }
 
+    @Override
     public boolean handlesWheelScrolling() { return true; }
 
+    @Override
     void handleJavaMouseWheelEvent(MouseWheelEvent e) {
         if (unfurled && helper.isVSBVisible()) {
             if (ListHelper.doWheelScroll(helper.getVSB(), null, e)) {
@@ -355,6 +366,7 @@ void handleJavaMouseWheelEvent(MouseWheelEvent e) {
         }
     }
 
+    @Override
     void handleJavaMouseEvent(MouseEvent e) {
         super.handleJavaMouseEvent(e);
         int i = e.getID();
@@ -528,6 +540,7 @@ public void mouseDragged(MouseEvent e) {
     }
 
     // Stolen from TinyChoicePeer
+    @Override
     @SuppressWarnings("deprecation")
     public Dimension getMinimumSize() {
         // TODO: move this impl into ListHelper?
@@ -544,6 +557,7 @@ public Dimension getMinimumSize() {
     /*
      * Layout the...
      */
+    @Override
     public void layout() {
         /*
           Dimension size = target.getSize();
@@ -631,17 +645,20 @@ protected void paintFocus(Graphics g,
      * ChoicePeer methods stolen from TinyChoicePeer
      */
 
+    @Override
     public void select(int index) {
         helper.select(index);
         helper.setFocusedIndex(index);
         repaint();
     }
 
+    @Override
     public void add(String item, int index) {
         helper.add(item, index);
         repaint();
     }
 
+    @Override
     public void remove(int index) {
         boolean selected = (index == helper.getSelectedIndex());
         boolean visibled = (index >= helper.firstDisplayedIndex() && index <= helper.lastDisplayedIndex());
@@ -694,6 +711,7 @@ public void remove(int index) {
         }
     }
 
+    @Override
     public void removeAll() {
         helper.removeAll();
         helper.select(-1);
@@ -707,16 +725,19 @@ public void removeAll() {
         repaint();
     }
 
+    @Override
     public void setFont(Font font) {
         super.setFont(font);
         helper.setFont(this.font);
     }
 
+    @Override
     public void setForeground(Color c) {
         super.setForeground(c);
         helper.updateColors(getGUIcolors());
     }
 
+    @Override
     public void setBackground(Color c) {
         super.setBackground(c);
         unfurledChoice.setBackground(c);
@@ -750,6 +771,7 @@ public boolean isUnfurled(){
      * In this case we should hide pop-down menu.
      */
     //calls from XWindowPeer. Could accept X-styled state events
+    @Override
     public void stateChangedICCCM(int oldState, int newState) {
         if (unfurled && oldState != newState){
                 hidePopdownMenu();
@@ -757,6 +779,7 @@ public void stateChangedICCCM(int oldState, int newState) {
     }
 
     //calls from XFramePeer. Could accept Frame's states.
+    @Override
     public void stateChangedJava(int oldState, int newState) {
         if (unfurled && oldState != newState){
             hidePopdownMenu();
@@ -790,6 +813,7 @@ public UnfurledChoice(Component target) {
         }
 
         // Override so we can do our own create()
+        @Override
         public void preInit(XCreateWindowParams params) {
             // A parent of this window is the target, at this point: wrong.
             // Remove parent window; in the following preInit() call we'll calculate as a default
@@ -856,6 +880,7 @@ else if (x + width > screenBounds.x + screenBounds.width) {
             return new Rectangle(x, y, width, height);
         }
 
+        @Override
         public void toFront() {
             // see 6240074 for more information
             if (choiceListener != null)
@@ -1035,11 +1060,15 @@ private boolean isMouseInListArea(MouseEvent e) {
          * Overridden from XWindow() because we don't want to send
          * ComponentEvents
          */
+        @Override
         public void handleConfigureNotifyEvent(XEvent xev) {}
+        @Override
         public void handleMapNotifyEvent(XEvent xev) {}
+        @Override
         public void handleUnmapNotifyEvent(XEvent xev) {}
     } //UnfurledChoice
 
+    @Override
     public void dispose() {
         if (unfurledChoice != null) {
             unfurledChoice.destroy();
@@ -1057,6 +1086,7 @@ public void dispose() {
      * To be compatible with Motif we should handle all KeyEvents in
      * Choice if it is opened. KeyEvents should be sent into Java if Choice is not opened.
      */
+    @Override
     boolean prePostEvent(final AWTEvent e) {
         if (unfurled){
             // fix for 6253211: PIT: MouseWheel events not triggered for Choice drop down in XAWT
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
index c99d2c9f1a6..156b128d857 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XClipboard.java
@@ -73,6 +73,7 @@ public XClipboard(String name, String selectionName) {
      * NOTE: This method may be called by privileged threads.
      *       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
      */
+    @Override
     public void ownershipChanged(final boolean isOwner) {
         if (isOwner) {
             checkChangeHere(contents);
@@ -81,6 +82,7 @@ public void ownershipChanged(final boolean isOwner) {
         }
     }
 
+    @Override
     protected synchronized void setContentsNative(Transferable contents) {
         SortedMap<Long,DataFlavor> formatMap =
             DataTransferer.getInstance().getFormatsForTransferable
@@ -94,6 +96,7 @@ protected synchronized void setContentsNative(Transferable contents) {
         }
     }
 
+    @Override
     public long getID() {
         return selection.getSelectionAtom().getAtom();
     }
@@ -107,15 +110,18 @@ public synchronized Transferable getContents(Object requestor) {
     }
 
     /* Caller is synchronized on this. */
+    @Override
     protected void clearNativeContext() {
         selection.reset();
     }
 
 
+    @Override
     protected long[] getClipboardFormats() {
         return selection.getTargets(XToolkit.getCurrentServerTime());
     }
 
+    @Override
     protected byte[] getClipboardData(long format) throws IOException {
         return selection.getData(format, XToolkit.getCurrentServerTime());
     }
@@ -148,6 +154,7 @@ private XAtom getTargetsPropertyAtom() {
         return targetsPropertyAtom;
     }
 
+    @Override
     protected void registerClipboardViewerChecked() {
         // for XConvertSelection() to be called for the first time in getTargetsDelayed()
         isSelectionNotifyProcessed = true;
@@ -174,7 +181,8 @@ protected void registerClipboardViewerChecked() {
         }
     }
 
-    private static class CheckChangeTimerTask implements Runnable {
+    private static final class CheckChangeTimerTask implements Runnable {
+        @Override
         public void run() {
             for (XClipboard clpbrd : targetsAtom2Clipboard.values()) {
                 clpbrd.getTargetsDelayed();
@@ -188,7 +196,8 @@ public void run() {
         }
     }
 
-    private static class SelectionNotifyHandler implements XEventDispatcher {
+    private static final class SelectionNotifyHandler implements XEventDispatcher {
+        @Override
         public void dispatchEvent(XEvent ev) {
             if (ev.get_type() == XConstants.SelectionNotify) {
                 final XSelectionEvent xse = ev.get_xselection();
@@ -209,6 +218,7 @@ public void dispatchEvent(XEvent ev) {
         }
     }
 
+    @Override
     protected void unregisterClipboardViewerChecked() {
         isSelectionNotifyProcessed = false;
         synchronized (XClipboard.classLock) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
index 42e684bfac7..1a82053a72d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java
@@ -123,10 +123,12 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
     }
 
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         boundsOperation = DEFAULT_OPERATION;
     }
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
 
@@ -152,6 +154,7 @@ protected boolean isInitialReshape() {
         return true;
     }
 
+    @Override
     public void reparent(ContainerPeer newNativeParent) {
         XComponentPeer newPeer = (XComponentPeer)newNativeParent;
         XToolkit.awtLock();
@@ -164,10 +167,12 @@ public void reparent(ContainerPeer newNativeParent) {
             XToolkit.awtUnlock();
         }
     }
+    @Override
     public boolean isReparentSupported() {
         return System.getProperty("sun.awt.X11.XComponentPeer.reparentNotSupported", "false").equals("false");
     }
 
+    @Override
     public boolean isObscured() {
         Container container  = (target instanceof Container) ?
             (Container)target : target.getParent();
@@ -192,6 +197,7 @@ public boolean isObscured() {
         return true;
     }
 
+    @Override
     public boolean canDetermineObscurity() {
         return true;
     }
@@ -233,6 +239,7 @@ public void focusLost(FocusEvent e) {
         bHasFocus = false;
     }
 
+    @Override
     public boolean isFocusable() {
         /* should be implemented by other sub-classes */
         return false;
@@ -243,6 +250,7 @@ static final AWTEvent wrapInSequenced(AWTEvent event) {
     }
 
     // TODO: consider moving it to KeyboardFocusManagerPeerImpl
+    @Override
     public final boolean requestFocus(Component lightweightChild, boolean temporary,
                                       boolean focusedWindowChangeAllowed, long time,
                                       FocusEvent.Cause cause)
@@ -342,6 +350,7 @@ void handleJavaWindowFocusEvent(AWTEvent e) {
 
 
 
+    @Override
     public void setVisible(boolean b) {
         xSetVisible(b);
     }
@@ -353,6 +362,7 @@ public void hide() {
     /**
      * @see java.awt.peer.ComponentPeer
      */
+    @Override
     public void setEnabled(final boolean value) {
         if (enableLog.isLoggable(PlatformLogger.Level.FINE)) {
             enableLog.fine("{0}ing {1}", (value ? "Enabl" : "Disabl"), this);
@@ -400,9 +410,11 @@ public void paint(final Graphics g) {
         target.paint(g);
     }
 
+    @Override
     public Graphics getGraphics() {
         return getGraphics(surfaceData, getPeerForeground(), getPeerBackground(), getPeerFont());
     }
+    @Override
     public void print(Graphics g) {
         // clear rect here to emulate X clears rect before Expose
         g.setColor(target.getBackground());
@@ -414,6 +426,7 @@ public void print(Graphics g) {
         target.print(g);
     }
 
+    @Override
     public void setBounds(int x, int y, int width, int height, int op) {
         this.x = x;
         this.y = y;
@@ -424,10 +437,12 @@ public void setBounds(int x, int y, int width, int height, int op) {
         layout();
     }
 
+    @Override
     public void reshape(int x, int y, int width, int height) {
         setBounds(x, y, width, height, SET_BOUNDS);
     }
 
+    @Override
     public void coalescePaintEvent(PaintEvent e) {
         Rectangle r = e.getUpdateRect();
         if (!(e instanceof IgnorePaintEvent)) {
@@ -516,6 +531,7 @@ void handleF10JavaKeyEvent(KeyEvent e) {
         }
     }
 
+    @Override
     @SuppressWarnings("fallthrough")
     public void handleEvent(java.awt.AWTEvent e) {
         if ((e instanceof InputEvent) && !((InputEvent)e).isConsumed() && target.isEnabled())  {
@@ -567,14 +583,17 @@ else if (e instanceof InputMethodEvent) {
 
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return target.getSize();
     }
 
+    @Override
     public Dimension getPreferredSize() {
         return getMinimumSize();
     }
 
+    @Override
     public void layout() {}
 
     void updateMotifColors(Color bg) {
@@ -644,6 +663,7 @@ public void setForeground(Color c) {
      * @see       Toolkit#getFontMetrics(Font)
      * @since     1.0
      */
+    @Override
     public FontMetrics getFontMetrics(Font font) {
         if (fontLog.isLoggable(PlatformLogger.Level.FINE)) {
             fontLog.fine("Getting font metrics for " + font);
@@ -672,6 +692,7 @@ public Font getFont() {
         return font;
     }
 
+    @Override
     public void updateCursorImmediately() {
         XGlobalCursorManager.getCursorManager().updateCursorImmediately();
     }
@@ -708,10 +729,12 @@ public void pSetCursor(Cursor cursor, boolean ignoreSubComponents) {
         }
     }
 
+    @Override
     public Image createImage(int width, int height) {
         return graphicsConfig.createAcceleratedImage(target, width, height);
     }
 
+    @Override
     public VolatileImage createVolatileImage(int width, int height) {
         return new SunVolatileImage(target, width, height);
     }
@@ -732,6 +755,7 @@ public boolean isPaintPending() {
         return paintPending && isLayouting;
     }
 
+    @Override
     public boolean handlesWheelScrolling() {
         return false;
     }
@@ -753,6 +777,7 @@ public void endLayout() {
         isLayouting = false;
     }
 
+    @Override
     public Color getWinBackground() {
         return getPeerBackground();
     }
@@ -1102,6 +1127,7 @@ void drawScrollbar(Graphics g, Color bg, int thickness, int length,
 
     private BufferCapabilities backBufferCaps;
 
+    @Override
     public void createBuffers(int numBuffers, BufferCapabilities caps)
       throws AWTException
     {
@@ -1120,6 +1146,7 @@ public BufferCapabilities getBackBufferCaps() {
         return backBufferCaps;
     }
 
+    @Override
     public void flip(int x1, int y1, int x2, int y2,
                      BufferCapabilities.FlipContents flipAction)
     {
@@ -1133,6 +1160,7 @@ public void flip(int x1, int y1, int x2, int y2,
                             x1, y1, x2, y2, flipAction);
     }
 
+    @Override
     public Image getBackBuffer() {
         if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
             buffersLog.fine("getBackBuffer()");
@@ -1143,6 +1171,7 @@ public Image getBackBuffer() {
         return xBackBuffer;
     }
 
+    @Override
     public void destroyBuffers() {
         if (buffersLog.isLoggable(PlatformLogger.Level.FINE)) {
             buffersLog.fine("destroyBuffers()");
@@ -1178,6 +1207,7 @@ public void notifyTextComponentChange(boolean add){
      * Currently if target component is disabled the following event will be disabled on window:
      * ButtonPress, ButtonRelease, KeyPress, KeyRelease, EnterNotify, LeaveNotify, MotionNotify
      */
+    @Override
     protected boolean isEventDisabled(XEvent e) {
         if (enableLog.isLoggable(PlatformLogger.Level.FINEST)) {
             enableLog.finest("Component is {1}, checking for disabled event {0}", e, (isEnabled()?"enabled":"disable"));
@@ -1249,6 +1279,7 @@ static String operationToString(int operation) {
      * Lowers this component at the bottom of the above HW peer. If the above parameter
      * is null then the method places this component at the top of the Z-order.
      */
+    @Override
     public void setZOrder(ComponentPeer above) {
         long aboveWindow = (above != null) ? ((XComponentPeer)above).getWindow() : 0;
 
@@ -1280,6 +1311,7 @@ private void addTree(Collection<Long> order, Set<Long> set, Container cont) {
 
     /****** DropTargetPeer implementation ********************/
 
+    @Override
     public void addDropTarget(DropTarget dt) {
         Component comp = target;
         while(!(comp == null || comp instanceof Window)) {
@@ -1294,6 +1326,7 @@ public void addDropTarget(DropTarget dt) {
         }
     }
 
+    @Override
     public void removeDropTarget(DropTarget dt) {
         Component comp = target;
         while(!(comp == null || comp instanceof Window)) {
@@ -1313,6 +1346,7 @@ public void removeDropTarget(DropTarget dt) {
      * Applies the shape to the X-window.
      * @since 1.7
      */
+    @Override
     public void applyShape(Region shape) {
         if (XlibUtil.isShapingSupported()) {
             if (shapeLog.isLoggable(PlatformLogger.Level.FINER)) {
@@ -1357,6 +1391,7 @@ public void applyShape(Region shape) {
         }
     }
 
+    @Override
     public boolean updateGraphicsData(GraphicsConfiguration gc) {
         int oldVisual = -1, newVisual = -1;
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
index e6fe02f43d4..ae99cb44760 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java
@@ -73,6 +73,7 @@ private XContentWindow(XDecoratedPeer parentFrame, Rectangle bounds) {
         this.parentFrame = parentFrame;
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         params.putIfNull(BIT_GRAVITY, Integer.valueOf(XConstants.NorthWestGravity));
@@ -83,9 +84,11 @@ void preInit(XCreateWindowParams params) {
         }
     }
 
+    @Override
     protected String getWMName() {
         return "Content window";
     }
+    @Override
     protected boolean isEventDisabled(XEvent e) {
         switch (e.get_type()) {
           // Override parentFrame to receive MouseEnter/Exit
@@ -159,6 +162,7 @@ public void handleResize(Rectangle bounds) {
     }
 
 
+    @Override
     public void postPaintEvent(Component target, int x, int y, int w, int h) {
         // TODO: ?
         // get rid of 'instanceof' by subclassing:
@@ -188,7 +192,7 @@ void purgeIconifiedExposeEvents() {
         iconifiedExposeEvents.clear();
     }
 
-    private static class SavedExposeEvent {
+    private static final class SavedExposeEvent {
         Component target;
         int x, y, w, h;
         SavedExposeEvent(Component target, int x, int y, int w, int h) {
@@ -200,6 +204,7 @@ private static class SavedExposeEvent {
         }
     }
 
+    @Override
     public String toString() {
         return getClass().getName() + "[" + getBounds() + "]";
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java b/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
index 4f09ac28bca..a0365604b81 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCreateWindowParams.java
@@ -28,7 +28,7 @@
 import java.util.HashMap;
 
 @SuppressWarnings("serial") // JDK-implementation class
-public class XCreateWindowParams extends HashMap<Object, Object> {
+public final class XCreateWindowParams extends HashMap<Object, Object> {
     public XCreateWindowParams() {
     }
     public XCreateWindowParams(Object[] map) {
@@ -78,6 +78,7 @@ public XCreateWindowParams delete(Object key) {
         remove(key);
         return this;
     }
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         for (Entry<Object, Object> entry : entrySet()) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
index f2f6235346d..d4cf4a2aa4b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCustomCursor.java
@@ -36,7 +36,7 @@
  * @author      Bino George
  */
 @SuppressWarnings("serial") // JDK-implementation class
-public class XCustomCursor extends X11CustomCursor {
+public final class XCustomCursor extends X11CustomCursor {
 
     public XCustomCursor(Image cursor, Point hotSpot, String name)
       throws IndexOutOfBoundsException {
@@ -74,6 +74,7 @@ static Dimension getBestCursorSize(int preferredWidth, int preferredHeight) {
         return d;
     }
 
+    @Override
     protected void createCursor(byte[] xorMask, byte[] andMask,
                                 int width, int height,
                                 int fcolor, int bcolor,
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
index 09401191d3f..7ec8e191ab5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDataTransferer.java
@@ -61,7 +61,7 @@
 /**
  * Platform-specific support for the data transfer subsystem.
  */
-public class XDataTransferer extends DataTransferer {
+public final class XDataTransferer extends DataTransferer {
     static final XAtom FILE_NAME_ATOM = XAtom.get("FILE_NAME");
     static final XAtom DT_NET_FILE_ATOM = XAtom.get("_DT_NETFILE");
     static final XAtom PNG_ATOM = XAtom.get("PNG");
@@ -161,6 +161,7 @@ protected String getNativeForFormat(long format) {
         return getTargetNameForAtom(format);
     }
 
+    @Override
     public ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler() {
         return XToolkitThreadBlockedHandler.getToolkitThreadBlockedHandler();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
index 5be6089f243..d70a46517e1 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java
@@ -71,10 +71,12 @@ public long getShell() {
         return window;
     }
 
+    @Override
     public long getContentWindow() {
         return (content == null) ? window : content.getWindow();
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         winAttr.initialFocus = true;
@@ -98,6 +100,7 @@ void preInit(XCreateWindowParams params) {
         params.add(EVENT_MASK, Long.valueOf(eventMask.longValue() & ~(XConstants.FocusChangeMask | XConstants.KeyPressMask | XConstants.KeyReleaseMask)));
     }
 
+    @Override
     void postInit(XCreateWindowParams params) {
         // The size hints must be set BEFORE mapping the window (see 6895647)
         updateSizeHints(dimensions);
@@ -115,6 +118,7 @@ void postInit(XCreateWindowParams params) {
         focusProxy = createFocusProxy();
     }
 
+    @Override
     void setIconHints(java.util.List<IconInfo> icons) {
         if (!XWM.getWM().setNetWMIcon(this, icons)) {
             if (icons.size() > 0) {
@@ -126,6 +130,7 @@ void setIconHints(java.util.List<IconInfo> icons) {
         }
     }
 
+    @Override
     public void updateMinimumSize() {
         super.updateMinimumSize();
         XToolkit.awtLock();
@@ -177,6 +182,7 @@ XFocusProxyWindow createFocusProxy() {
         return new XFocusProxyWindow(this);
     }
 
+    @Override
     protected XAtomList getWMProtocols() {
         XAtomList protocols = super.getWMProtocols();
         protocols.add(wm_delete_window);
@@ -184,6 +190,7 @@ protected XAtomList getWMProtocols() {
         return protocols;
     }
 
+    @Override
     public Graphics getGraphics() {
         AWTAccessor.ComponentAccessor compAccessor = AWTAccessor.getComponentAccessor();
         return getGraphics(content.surfaceData,
@@ -205,6 +212,7 @@ public void setTitle(String title) {
         }
     }
 
+    @Override
     protected String getWMName() {
         if (winAttr.title == null || winAttr.title.trim().isEmpty()) {
             return " ";
@@ -213,6 +221,7 @@ protected String getWMName() {
         }
     }
 
+    @Override
     void updateWMName() {
         XToolkit.awtLock();
         try {
@@ -232,16 +241,19 @@ void updateWMName() {
 
     // NOTE: This method may be called by privileged threads.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    @Override
     public void handleIconify() {
         postEvent(new WindowEvent((Window)target, WindowEvent.WINDOW_ICONIFIED));
     }
 
     // NOTE: This method may be called by privileged threads.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    @Override
     public void handleDeiconify() {
         postEvent(new WindowEvent((Window)target, WindowEvent.WINDOW_DEICONIFIED));
     }
 
+    @Override
     public void handleFocusEvent(XEvent xev) {
         super.handleFocusEvent(xev);
         XFocusChangeEvent xfe = xev.get_xfocus();
@@ -258,6 +270,7 @@ public void handleFocusEvent(XEvent xev) {
  *                             I N S E T S   C O D E
  **************************************************************************************/
 
+    @Override
     protected boolean isInitialReshape() {
         return false;
     }
@@ -317,6 +330,7 @@ private void resetWMSetInsets() {
         }
     }
 
+    @Override
     public void handlePropertyNotify(XEvent xev) {
         super.handlePropertyNotify(xev);
 
@@ -394,6 +408,7 @@ public void handlePropertyNotify(XEvent xev) {
 
     long reparent_serial = 0;
 
+    @Override
     public void handleReparentNotifyEvent(XEvent xev) {
         XReparentEvent  xe = xev.get_xreparent();
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
@@ -552,6 +567,7 @@ private Insets getRealInsets() {
         return currentInsets;
     }
 
+    @Override
     public Insets getInsets() {
         Insets in = copy(getRealInsets());
         in.top += getMenuBarHeight();
@@ -576,6 +592,7 @@ void updateSizeHints(WindowDimensions dims) {
         updateSizeHints(rec.x, rec.y, rec.width, rec.height);
     }
 
+    @Override
     void updateSizeHints() {
         updateSizeHints(dimensions);
     }
@@ -720,6 +737,7 @@ private void reshape(int x, int y, int width, int height, int operation,
     /**
      * @see java.awt.peer.ComponentPeer#setBounds
      */
+    @Override
     public void setBounds(int x, int y, int width, int height, int op) {
         // TODO: Rewrite with WindowDimensions
         XToolkit.awtLock();
@@ -741,6 +759,7 @@ void reconfigureContentWindow(WindowDimensions dims) {
     }
 
     boolean no_reparent_artifacts = false;
+    @Override
     public void handleConfigureNotifyEvent(XEvent xev) {
         if (XWM.getWMID() == XWM.UNITY_COMPIZ_WM && !insets_corrected) {
             return;
@@ -936,18 +955,22 @@ Rectangle getShellBounds() {
         return dimensions.getClientRect();
     }
 
+    @Override
     public Rectangle getBounds() {
         return dimensions.getBounds();
     }
 
+    @Override
     public Dimension getSize() {
         return dimensions.getSize();
     }
 
+    @Override
     public int getX() {
         return dimensions.getLocation().x;
     }
 
+    @Override
     public int getY() {
         return dimensions.getLocation().y;
     }
@@ -956,20 +979,24 @@ public Point getLocation() {
         return dimensions.getLocation();
     }
 
+    @Override
     public int getAbsoluteX() {
         // NOTE: returning this peer's location which is shell location
         return dimensions.getScreenBounds().x;
     }
 
+    @Override
     public int getAbsoluteY() {
         // NOTE: returning this peer's location which is shell location
         return dimensions.getScreenBounds().y;
     }
 
+    @Override
     public int getWidth() {
         return getSize().width;
     }
 
+    @Override
     public int getHeight() {
         return getSize().height;
     }
@@ -978,6 +1005,7 @@ public final WindowDimensions getDimensions() {
         return dimensions;
     }
 
+    @Override
     public Point getLocationOnScreen() {
         XToolkit.awtLock();
         try {
@@ -1000,6 +1028,7 @@ public Point getLocationOnScreen() {
  *              END            OF             I N S E T S   C O D E
  **************************************************************************************/
 
+    @Override
     protected boolean isEventDisabled(XEvent e) {
         switch (e.get_type()) {
             // Do not generate MOVED/RESIZED events since we generate them by ourselves
@@ -1023,6 +1052,7 @@ int getFunctions() {
         return winAttr.functions;
     }
 
+    @Override
     public void setVisible(boolean vis) {
         if (log.isLoggable(PlatformLogger.Level.FINER)) {
             log.finer("Setting {0} to visible {1}", this, Boolean.valueOf(vis));
@@ -1041,6 +1071,7 @@ public void setVisible(boolean vis) {
         }
     }
 
+    @Override
     protected void suppressWmTakeFocus(boolean doSuppress) {
         XAtomList protocols = getWMProtocols();
         if (doSuppress) {
@@ -1051,6 +1082,7 @@ protected void suppressWmTakeFocus(boolean doSuppress) {
         wm_protocols.setAtomListProperty(this, protocols);
     }
 
+    @Override
     public void dispose() {
         if (content != null) {
             content.destroy();
@@ -1064,6 +1096,7 @@ public void dispose() {
         super.dispose();
     }
 
+    @Override
     public void handleClientMessage(XEvent xev) {
         super.handleClientMessage(xev);
         XClientMessageEvent cl = xev.get_xclient();
@@ -1102,6 +1135,7 @@ private void handleWmTakeFocus(XClientMessageEvent cl) {
      * Requests focus to this decorated top-level by requesting X input focus
      * to the shell window.
      */
+    @Override
     protected void requestXFocus(long time, boolean timeProvided) {
         // We have proxied focus mechanism - instead of shell the focus is held
         // by "proxy" - invisible mapped window. When we want to set X input focus to
@@ -1198,6 +1232,7 @@ boolean isOverrideRedirect() {
         return Window.Type.POPUP.equals(getWindowType());
     }
 
+    @Override
     public boolean requestWindowFocus(long time, boolean timeProvided) {
         focusLog.fine("Request for decorated window focus");
         // If this is Frame or Dialog we can't assure focus request success - but we still can try
@@ -1258,6 +1293,7 @@ public boolean requestWindowFocus(long time, boolean timeProvided) {
     }
 
     XWindowPeer actualFocusedWindow = null;
+    @Override
     void setActualFocusedWindow(XWindowPeer actualFocusedWindow) {
         synchronized(getStateLock()) {
             this.actualFocusedWindow = actualFocusedWindow;
@@ -1270,6 +1306,7 @@ boolean requestWindowFocus(XWindowPeer actualFocusedWindow,
         setActualFocusedWindow(actualFocusedWindow);
         return requestWindowFocus(time, timeProvided);
     }
+    @Override
     public void handleWindowFocusIn(long serial) {
         if (null == actualFocusedWindow) {
             super.handleWindowFocusIn(serial);
@@ -1302,6 +1339,7 @@ public void run() {
         }
     }
 
+    @Override
     public void handleWindowFocusOut(Window oppositeWindow, long serial) {
         Window actualFocusedWindow = XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow();
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
index 384e65e0793..f609e585369 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java
@@ -46,7 +46,7 @@
  *
  * @see DesktopPeer
  */
-public class XDesktopPeer implements DesktopPeer {
+public final class XDesktopPeer implements DesktopPeer {
 
     // supportedActions may be changed from native within an init() call
     private static final List<Action> supportedActions
@@ -78,10 +78,12 @@ static boolean isDesktopSupported() {
         return nativeLibraryLoaded && !supportedActions.isEmpty();
     }
 
+    @Override
     public boolean isSupported(Action type) {
         return supportedActions.contains(type);
     }
 
+    @Override
     public void open(File file) throws IOException {
         try {
             launch(file.toURI());
@@ -90,20 +92,24 @@ public void open(File file) throws IOException {
         }
     }
 
+    @Override
     public void edit(File file) throws IOException {
         throw new UnsupportedOperationException("The current platform " +
             "doesn't support the EDIT action.");
     }
 
+    @Override
     public void print(File file) throws IOException {
         throw new UnsupportedOperationException("The current platform " +
             "doesn't support the PRINT action.");
     }
 
+    @Override
     public void mail(URI uri) throws IOException {
         launch(uri);
     }
 
+    @Override
     public void browse(URI uri) throws IOException {
         launch(uri);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
index 4866da3c718..fb76ef2274a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java
@@ -40,6 +40,7 @@ class XDialogPeer extends XDecoratedPeer implements DialogPeer {
         super(target);
     }
 
+    @Override
     public void preInit(XCreateWindowParams params) {
         super.preInit(params);
 
@@ -58,6 +59,7 @@ public void preInit(XCreateWindowParams params) {
         winAttr.initialState = XWindowAttributesData.NORMAL;
     }
 
+    @Override
     public void setVisible(boolean vis) {
         XToolkit.awtLock();
         try {
@@ -89,6 +91,7 @@ boolean isTargetUndecorated() {
         }
     }
 
+    @Override
     int getDecorations() {
         int d = super.getDecorations();
         // remove minimize and maximize buttons for dialogs
@@ -100,6 +103,7 @@ int getDecorations() {
         return d;
     }
 
+    @Override
     int getFunctions() {
         int f = super.getFunctions();
         // remove minimize and maximize functions for dialogs
@@ -111,6 +115,7 @@ int getFunctions() {
         return f;
     }
 
+    @Override
     public void blockWindows(java.util.List<Window> toBlock) {
         Vector<XWindowPeer> javaToplevels = null;
         XToolkit.awtLock();
@@ -134,6 +139,7 @@ public void blockWindows(java.util.List<Window> toBlock) {
      * The focused window can't be blocked at the time it's focused.
      * Thus we don't have to perform any transitive (a blocker of a blocker) checks.
      */
+    @Override
     boolean isFocusedWindowModalBlocker() {
         Window focusedWindow = XKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow();
         XWindowPeer focusedWindowPeer = null;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
index d5fbd5c3bb2..b4a43b6df63 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDConstants.java
@@ -32,7 +32,7 @@
  *
  * @since 1.5
  */
-class XDnDConstants {
+final class XDnDConstants {
     static final XAtom XA_XdndActionCopy = XAtom.get("XdndActionCopy");
     static final XAtom XA_XdndActionMove = XAtom.get("XdndActionMove");
     static final XAtom XA_XdndActionLink = XAtom.get("XdndActionLink");
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
index fc60ec97fa8..92a1244c631 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java
@@ -42,7 +42,7 @@
  *
  * @since 1.5
  */
-class XDnDDragSourceProtocol extends XDragSourceProtocol {
+final class XDnDDragSourceProtocol extends XDragSourceProtocol {
     private static final PlatformLogger logger =
         PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDragSourceProtocol");
 
@@ -61,6 +61,7 @@ static XDragSourceProtocol createInstance(XDragSourceProtocolListener listener)
         return new XDnDDragSourceProtocol(listener);
     }
 
+    @Override
     public String getProtocolName() {
         return XDragAndDropProtocols.XDnD;
     }
@@ -70,6 +71,7 @@ public String getProtocolName() {
      *
      * @return true if the initialized successfully.
      */
+    @Override
     protected void initializeDragImpl(int actions, Transferable contents,
                                       Map<Long, DataFlavor> formatMap, long[] formats)
       throws InvalidDnDOperationException,
@@ -179,6 +181,7 @@ private boolean processXdndFinished(XClientMessageEvent xclient) {
         return true;
     }
 
+    @Override
     public boolean processClientMessage(XClientMessageEvent xclient) {
         if (xclient.get_message_type() == XDnDConstants.XA_XdndStatus.getAtom()) {
             return processXdndStatus(xclient);
@@ -189,6 +192,7 @@ public boolean processClientMessage(XClientMessageEvent xclient) {
         }
     }
 
+    @Override
     public TargetWindowInfo getTargetWindowInfo(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -276,6 +280,7 @@ public TargetWindowInfo getTargetWindowInfo(long window) {
         return null;
     }
 
+    @Override
     public void sendEnterMessage(long[] formats,
                                  int sourceAction, int sourceActions, long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -305,6 +310,7 @@ public void sendEnterMessage(long[] formats,
         }
     }
 
+    @Override
     public void sendMoveMessage(int xRoot, int yRoot,
                                 int sourceAction, int sourceActions, long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
@@ -330,6 +336,7 @@ public void sendMoveMessage(int xRoot, int yRoot,
         }
     }
 
+    @Override
     public void sendLeaveMessage(long time) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
         assert getTargetWindow() != 0;
@@ -354,6 +361,7 @@ public void sendLeaveMessage(long time) {
         }
     }
 
+    @Override
     public void sendDropMessage(int xRoot, int yRoot,
                                 int sourceAction, int sourceActions,
                                 long time) {
@@ -380,6 +388,7 @@ public void sendDropMessage(int xRoot, int yRoot,
         }
     }
 
+    @Override
     public boolean processProxyModeEvent(XClientMessageEvent xclient,
                                          long sourceWindow) {
         if (xclient.get_message_type() == XDnDConstants.XA_XdndStatus.getAtom() ||
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
index 89a4fecabd7..4466d8d6eed 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java
@@ -50,7 +50,7 @@
  *
  * @since 1.5
  */
-class XDnDDropTargetProtocol extends XDropTargetProtocol {
+final class XDnDDropTargetProtocol extends XDropTargetProtocol {
     private static final PlatformLogger logger =
         PlatformLogger.getLogger("sun.awt.X11.xembed.xdnd.XDnDDropTargetProtocol");
 
@@ -84,10 +84,12 @@ static XDropTargetProtocol createInstance(XDropTargetProtocolListener listener)
         return new XDnDDropTargetProtocol(listener);
     }
 
+    @Override
     public String getProtocolName() {
         return XDragAndDropProtocols.XDnD;
     }
 
+    @Override
     public void registerDropTarget(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -110,12 +112,14 @@ public void registerDropTarget(long window) {
         }
     }
 
+    @Override
     public void unregisterDropTarget(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
         XDnDConstants.XA_XdndAware.DeleteProperty(window);
     }
 
+    @Override
     public void registerEmbedderDropSite(long embedder) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -267,6 +271,7 @@ public void registerEmbedderDropSite(long embedder) {
         putEmbedderRegistryEntry(embedder, overridden, version, proxy);
     }
 
+    @Override
     public void unregisterEmbedderDropSite(long embedder) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -317,6 +322,7 @@ public void unregisterEmbedderDropSite(long embedder) {
      * Gets and stores in the registry the embedder's XDnD drop site info
      * from the embedded.
      */
+    @Override
     public void registerEmbeddedDropSite(long embedded) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -405,6 +411,7 @@ public void registerEmbeddedDropSite(long embedded) {
         putEmbedderRegistryEntry(embedded, overridden, version, proxy);
     }
 
+    @Override
     public boolean isProtocolSupported(long window) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -715,6 +722,7 @@ private boolean processXdndDrop(XClientMessageEvent xclient) {
         return true;
     }
 
+    @Override
     public int getMessageType(XClientMessageEvent xclient) {
         long messageType = xclient.get_message_type();
 
@@ -731,6 +739,7 @@ public int getMessageType(XClientMessageEvent xclient) {
         }
     }
 
+    @Override
     protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
         long messageType = xclient.get_message_type();
 
@@ -747,6 +756,7 @@ protected boolean processClientMessageImpl(XClientMessageEvent xclient) {
         }
     }
 
+    @Override
     protected void sendEnterMessageToToplevel(long toplevel,
                                               XClientMessageEvent xclient) {
         /* flags */
@@ -785,6 +795,7 @@ private void sendEnterMessageToToplevelImpl(long toplevel,
         }
     }
 
+    @Override
     protected void sendLeaveMessageToToplevel(long toplevel,
                                               XClientMessageEvent xclient) {
         sendLeaveMessageToToplevelImpl(toplevel, xclient.get_data(0));
@@ -809,6 +820,7 @@ protected void sendLeaveMessageToToplevelImpl(long toplevel,
         }
     }
 
+    @Override
     public boolean sendResponse(long ctxt, int eventID, int action) {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
 
@@ -858,6 +870,7 @@ public boolean sendResponse(long ctxt, int eventID, int action) {
         return true;
     }
 
+    @Override
     public Object getData(long ctxt, long format)
       throws IllegalArgumentException, IOException {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
@@ -879,6 +892,7 @@ public Object getData(long ctxt, long format)
         return XDnDConstants.XDnDSelection.getData(format, time_stamp);
     }
 
+    @Override
     public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
         XClientMessageEvent xclient = new XClientMessageEvent(ctxt);
 
@@ -963,6 +977,7 @@ public boolean sendDropDone(long ctxt, boolean success, int dropAction) {
         return true;
     }
 
+    @Override
     public final long getSourceWindow() {
         return sourceWindow;
     }
@@ -970,6 +985,7 @@ public final long getSourceWindow() {
     /**
      * Reset the state of the object.
      */
+    @Override
     public void cleanup() {
         // Clear the reference to this protocol.
         XDropTargetEventProcessor.reset();
@@ -1004,10 +1020,12 @@ public void cleanup() {
         targetXWindow = null;
     }
 
+    @Override
     public boolean isDragOverComponent() {
         return targetXWindow != null;
     }
 
+    @Override
     public void adjustEventForForwarding(XClientMessageEvent xclient,
                                          EmbedderRegistryEntry entry) {
         /* Adjust the event to match the XDnD protocol version. */
@@ -1077,6 +1095,7 @@ private void notifyProtocolListener(XWindow xwindow, int x, int y,
      * dispatch thread.
      */
 
+    @Override
     public boolean forwardEventToEmbedded(long embedded, long ctxt,
                                           int eventID) {
         if (logger.isLoggable(PlatformLogger.Level.FINEST)) {
@@ -1225,6 +1244,7 @@ public boolean forwardEventToEmbedded(long embedded, long ctxt,
         return true;
     }
 
+    @Override
     public boolean isXEmbedSupported() {
         return true;
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
index 29d3c962e79..907f0efbc96 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceContextPeer.java
@@ -114,6 +114,7 @@ static XDragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge)
         return theInstance;
     }
 
+    @Override
     protected void startDrag(Transferable transferable,
                              long[] formats, Map<Long, DataFlavor> formatMap) {
         Component component = getTrigger().getComponent();
@@ -256,6 +257,7 @@ public static void setProxyModeSourceWindow(long window) {
      * set cursor
      */
 
+    @Override
     public void setCursor(Cursor c) throws InvalidDnDOperationException {
         XToolkit.awtLock();
         try {
@@ -265,6 +267,7 @@ public void setCursor(Cursor c) throws InvalidDnDOperationException {
         }
     }
 
+    @Override
     protected void setNativeCursor(long nativeCtxt, Cursor c, int cType) {
         assert XToolkit.isAWTLockHeldByCurrentThread();
 
@@ -304,6 +307,7 @@ private void throwGrabFailureException(String msg, int grabStatus)
     /**
      * The caller must own awtLock.
      */
+    @Override
     public void cleanup(long time) {
         if (dndInProgress) {
             if (dragProtocol != null) {
@@ -794,18 +798,21 @@ static boolean processEvent(XEvent ev) {
 
     /* XDragSourceProtocolListener implementation */
 
+    @Override
     public void handleDragReply(int action) {
         // NOTE: we have to use the current pointer location, since
         // the target didn't specify the coordinates for the reply.
         handleDragReply(action, xRoot, yRoot);
     }
 
+    @Override
     public void handleDragReply(int action, int x, int y) {
         // NOTE: we have to use the current modifiers state, since
         // the target didn't specify the modifiers state for the reply.
         handleDragReply(action, xRoot, yRoot, XWindow.getModifiers(eventState,0,0));
     }
 
+    @Override
     public void handleDragReply(int action, int x, int y, int modifiers) {
         if (action == DnDConstants.ACTION_NONE &&
             targetAction != DnDConstants.ACTION_NONE) {
@@ -826,23 +833,27 @@ public void handleDragReply(int action, int x, int y, int modifiers) {
         targetAction = action;
     }
 
+    @Override
     public void handleDragFinished() {
         /* Assume that the drop was successful. */
         handleDragFinished(true);
     }
 
+    @Override
     public void handleDragFinished(boolean success) {
         /* Assume that the performed drop action is the latest drop action
            accepted by the drop target. */
         handleDragFinished(true, targetAction);
     }
 
+    @Override
     public void handleDragFinished(boolean success, int action) {
         // NOTE: we have to use the current pointer location, since
         // the target didn't specify the coordinates for the reply.
         handleDragFinished(success, action, xRoot, yRoot);
     }
 
+    @Override
     public void handleDragFinished(boolean success, int action, int x, int y) {
         dragDropFinished(success, action, x, y);
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
index c8ecb422611..24de318359f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDragSourceProtocol.java
@@ -241,7 +241,7 @@ protected final int getTargetProtocolVersion() {
         return targetProtocolVersion;
     }
 
-    public static class TargetWindowInfo {
+    public static final class TargetWindowInfo {
         private final long proxyWindow;
         private final int protocolVersion;
         public TargetWindowInfo(long proxy, int version) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
index d2a6c9f8c04..dbf27c55537 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
@@ -82,6 +82,7 @@ static XDropTargetProtocolListener getXDropTargetProtocolListener() {
     /*
      * @param returnValue the drop action selected by the Java drop target.
      */
+    @Override
     protected void eventProcessed(SunDropTargetEvent e, int returnValue,
                                   boolean dispatcherDone) {
         /* The native context is the pointer to the XClientMessageEvent
@@ -109,6 +110,7 @@ protected void eventProcessed(SunDropTargetEvent e, int returnValue,
         }
     }
 
+    @Override
     protected void doDropDone(boolean success, int dropAction,
                               boolean isLocal) {
         /* The native context is the pointer to the XClientMessageEvent
@@ -134,6 +136,7 @@ protected void doDropDone(boolean success, int dropAction,
         }
     }
 
+    @Override
     protected Object getNativeData(long format)
       throws IOException {
         /* The native context is the pointer to the XClientMessageEvent
@@ -161,18 +164,21 @@ protected Object getNativeData(long format)
     private void cleanup() {
     }
 
+    @Override
     protected void processEnterMessage(SunDropTargetEvent event) {
         if (!processSunDropTargetEvent(event)) {
             super.processEnterMessage(event);
         }
     }
 
+    @Override
     protected void processExitMessage(SunDropTargetEvent event) {
         if (!processSunDropTargetEvent(event)) {
             super.processExitMessage(event);
         }
     }
 
+    @Override
     protected void processMotionMessage(SunDropTargetEvent event,
                                         boolean operationChanged) {
         if (!processSunDropTargetEvent(event)) {
@@ -180,6 +186,7 @@ protected void processMotionMessage(SunDropTargetEvent event,
         }
     }
 
+    @Override
     protected void processDropMessage(SunDropTargetEvent event) {
         if (!processSunDropTargetEvent(event)) {
             super.processDropMessage(event);
@@ -247,6 +254,7 @@ static XDropTargetProtocolListener getInstance() {
             return theInstance;
         }
 
+        @Override
         public void handleDropTargetNotification(XWindow xwindow, int x, int y,
                                                  int dropAction, int actions,
                                                  long[] formats, long nativeCtxt,
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
index 97fa79c96f3..387b1e84f44 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
@@ -35,7 +35,7 @@
 import java.util.*;
 import static sun.awt.X11.XEmbedHelper.*;
 
-public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener, KeyEventPostProcessor, ModalityListener, WindowIDProvider {
+public final class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener, KeyEventPostProcessor, ModalityListener, WindowIDProvider {
     private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedCanvasPeer");
 
     boolean applicationActive; // Whether the application is active(has focus)
@@ -56,6 +56,7 @@ public class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusListener
         super(target);
     }
 
+    @Override
     protected void postInit(XCreateWindowParams params) {
         super.postInit(params);
 
@@ -68,6 +69,7 @@ protected void postInit(XCreateWindowParams params) {
         target.setFocusTraversalKeysEnabled(false);
     }
 
+    @Override
     protected void preInit(XCreateWindowParams params) {
         super.preInit(params);
 
@@ -168,6 +170,7 @@ void childDestroyed() {
         xembed.handle = 0;
     }
 
+    @Override
     public void handleEvent(AWTEvent e) {
         super.handleEvent(e);
         if (isXEmbedActive()) {
@@ -188,6 +191,7 @@ public void handleEvent(AWTEvent e) {
         }
     }
 
+    @Override
     public void dispatchEvent(XEvent ev) {
         super.dispatchEvent(ev);
         switch (ev.get_type()) {
@@ -233,6 +237,7 @@ public void dispatchEvent(XEvent ev) {
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         if (isXEmbedActive()) {
             XToolkit.awtLock();
@@ -250,6 +255,7 @@ public Dimension getPreferredSize() {
             return super.getPreferredSize();
         }
     }
+    @Override
     public Dimension getMinimumSize() {
         if (isXEmbedActive()) {
             XToolkit.awtLock();
@@ -267,6 +273,7 @@ public Dimension getMinimumSize() {
             return super.getMinimumSize();
         }
     }
+    @Override
     public void dispose() {
         if (isXEmbedActive()) {
             detachChild();
@@ -282,6 +289,7 @@ public void dispose() {
     }
 
     // Focusable is true in order to enable focus traversal through this Canvas
+    @Override
     public boolean isFocusable() {
         return true;
     }
@@ -407,6 +415,7 @@ void detachChild() {
         xembed.handle = 0;
     }
 
+    @Override
     public void windowGainedFocus(WindowEvent e) {
         applicationActive = true;
         if (isXEmbedActive()) {
@@ -415,6 +424,7 @@ public void windowGainedFocus(WindowEvent e) {
         }
     }
 
+    @Override
     public void windowLostFocus(WindowEvent e) {
         applicationActive = false;
         if (isXEmbedActive()) {
@@ -577,6 +587,7 @@ void propogateUnRegisterAccelerator(AWTKeyStroke stroke) {
         }
     }
 
+    @Override
     public boolean postProcessKeyEvent(KeyEvent e) {
         // Processing events only if we are in the focused window but
         // we are not focus owner since otherwise we will get
@@ -632,14 +643,17 @@ public boolean postProcessKeyEvent(KeyEvent e) {
         return result;
     }
 
+    @Override
     public void modalityPushed(ModalityEvent ev) {
         xembed.sendMessage(xembed.handle, XEMBED_MODALITY_ON);
     }
 
+    @Override
     public void modalityPopped(ModalityEvent ev) {
         xembed.sendMessage(xembed.handle, XEMBED_MODALITY_OFF);
     }
 
+    @Override
     public void handleClientMessage(XEvent xev) {
         super.handleClientMessage(xev);
         XClientMessageEvent msg = xev.get_xclient();
@@ -681,7 +695,8 @@ public void handleClientMessage(XEvent xev) {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    private static class XEmbedDropTarget extends DropTarget {
+    private static final class XEmbedDropTarget extends DropTarget {
+        @Override
         public void addDropTargetListener(DropTargetListener dtl)
           throws TooManyListenersException {
             // Drop target listeners registered with this target will never be
@@ -730,7 +745,7 @@ public boolean processXEmbedDnDEvent(long ctxt, int eventID) {
         }
     }
 
-    class XEmbedServer extends XEmbedHelper implements XEventDispatcher {
+    final class XEmbedServer extends XEmbedHelper implements XEventDispatcher {
         long handle; // Handle to XEmbed client
         long version;
         long flags;
@@ -814,6 +829,7 @@ void handleConfigureNotify(XEvent xev) {
                 }
             }
         }
+        @Override
         public void dispatchEvent(XEvent xev) {
             int type = xev.get_type();
             switch (type) {
@@ -830,7 +846,7 @@ public void dispatchEvent(XEvent xev) {
         }
     }
 
-    static class GrabbedKey {
+    static final class GrabbedKey {
         long keysym;
         long modifiers;
         GrabbedKey(long keysym, long modifiers) {
@@ -867,10 +883,12 @@ private void init(KeyEvent e) {
             }
         }
 
+        @Override
         public int hashCode() {
             return (int)keysym & 0xFFFFFFFF;
         }
 
+        @Override
         public boolean equals(Object o) {
             if (!(o instanceof GrabbedKey)) {
                 return false;
@@ -879,6 +897,7 @@ public boolean equals(Object o) {
             return (keysym == key.keysym && modifiers == key.modifiers);
         }
 
+        @Override
         public String toString() {
             return "Key combination[keysym=" + keysym + ", mods=" + modifiers + "]";
         }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
index def4eecf9cd..e2c37541201 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxy.java
@@ -30,7 +30,7 @@
 import sun.awt.AWTAccessor;
 
 @SuppressWarnings("serial") // JDK-implementation class
-public class XEmbedChildProxy extends Component {
+public final class XEmbedChildProxy extends Component {
     long handle;
     XEmbeddingContainer container;
     public XEmbedChildProxy(XEmbeddingContainer container, long handle) {
@@ -38,6 +38,7 @@ public XEmbedChildProxy(XEmbeddingContainer container, long handle) {
         this.container = container;
     }
 
+    @Override
     public void addNotify() {
         synchronized(getTreeLock()) {
             if (AWTAccessor.getComponentAccessor().getPeer(this) == null) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
index cf2a411e7e5..7204570afd7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedChildProxyPeer.java
@@ -54,7 +54,7 @@
 
 import sun.java2d.pipe.Region;
 
-public class XEmbedChildProxyPeer implements ComponentPeer, XEventDispatcher{
+public final class XEmbedChildProxyPeer implements ComponentPeer, XEventDispatcher{
     XEmbeddingContainer container;
     XEmbedChildProxy proxy;
     long handle;
@@ -77,8 +77,11 @@ void initDispatching() {
         }
         container.notifyChildEmbedded(handle);
     }
+    @Override
     public boolean isObscured() { return false; }
+    @Override
     public boolean canDetermineObscurity() { return false; }
+    @Override
     public void                 setVisible(boolean b) {
         if (!b) {
             XToolkit.awtLock();
@@ -98,9 +101,13 @@ public void                 setVisible(boolean b) {
             }
         }
     }
+    @Override
     public void setEnabled(boolean b) {}
+    @Override
     public void paint(Graphics g) {}
+    @Override
     public void print(Graphics g) {}
+    @Override
     public void setBounds(int x, int y, int width, int height, int op) {
         // Unimplemented: Check for min/max hints for non-resizable
         XToolkit.awtLock();
@@ -111,6 +118,7 @@ public void setBounds(int x, int y, int width, int height, int op) {
             XToolkit.awtUnlock();
         }
     }
+    @Override
     public void handleEvent(AWTEvent e) {
         switch (e.getID()) {
           case FocusEvent.FOCUS_GAINED:
@@ -129,7 +137,9 @@ public void handleEvent(AWTEvent e) {
               break;
         }
     }
+    @Override
     public void                coalescePaintEvent(PaintEvent e) {}
+    @Override
     public Point                getLocationOnScreen() {
         XWindowAttributes attr = new XWindowAttributes();
         XToolkit.awtLock();
@@ -141,6 +151,7 @@ public Point                getLocationOnScreen() {
             attr.dispose();
         }
     }
+    @Override
     public Dimension            getPreferredSize() {
         XToolkit.awtLock();
         long p_hints = XlibWrapper.XAllocSizeHints();
@@ -154,6 +165,7 @@ public Dimension            getPreferredSize() {
             XToolkit.awtUnlock();
         }
     }
+    @Override
     public Dimension            getMinimumSize() {
         XToolkit.awtLock();
         long p_hints = XlibWrapper.XAllocSizeHints();
@@ -167,17 +179,25 @@ public Dimension            getMinimumSize() {
             XToolkit.awtUnlock();
         }
     }
+    @Override
     public ColorModel           getColorModel() { return null; }
     public Toolkit              getToolkit() { return Toolkit.getDefaultToolkit(); }
 
+    @Override
     public Graphics             getGraphics() { return null; }
+    @Override
     public FontMetrics          getFontMetrics(Font font) { return null; }
+    @Override
     public void         dispose() {
         container.detachChild(handle);
     }
+    @Override
     public void         setForeground(Color c) {}
+    @Override
     public void         setBackground(Color c) {}
+    @Override
     public void         setFont(Font f) {}
+    @Override
     public void                 updateCursorImmediately() {}
 
     void postEvent(AWTEvent event) {
@@ -209,6 +229,7 @@ boolean simulateMotifRequestFocus(Component lightweightChild, boolean temporary,
         return true;
     }
 
+    @Override
     public boolean requestFocus(Component lightweightChild,
                                 boolean temporary,
                                 boolean focusedWindowChangeAllowed,
@@ -263,18 +284,27 @@ public boolean requestFocus(Component lightweightChild,
         }
         return false;
     }
+    @Override
     public boolean              isFocusable() {
         return true;
     }
 
+    @Override
     public Image                createImage(int width, int height) { return null; }
+    @Override
     public VolatileImage        createVolatileImage(int width, int height) { return null; }
+    @Override
     public GraphicsConfiguration getGraphicsConfiguration() { return null; }
+    @Override
     public boolean     handlesWheelScrolling() { return true; }
+    @Override
     public void createBuffers(int numBuffers, BufferCapabilities caps)
       throws AWTException { }
+    @Override
     public Image getBackBuffer() { return null; }
+    @Override
     public void flip(int x1, int y1, int x2, int y2, BufferCapabilities.FlipContents flipAction) {  }
+    @Override
     public void destroyBuffers() { }
 
     /**
@@ -282,6 +312,7 @@ public void destroyBuffers() { }
      * its sub-elements.  For instance, a lightweight Checkbox needs to layout
      * the box, as well as the text label.
      */
+    @Override
     public void        layout() {}
 
     Window getTopLevel(Component comp) {
@@ -310,6 +341,7 @@ void handlePropertyNotify(XEvent xev) {
     void handleConfigureNotify(XEvent xev) {
         childResized();
     }
+    @Override
     public void dispatchEvent(XEvent xev) {
         int type = xev.get_type();
         switch (type) {
@@ -330,8 +362,10 @@ public void run() {
             }));
     }
 
+    @Override
     public void reparent(ContainerPeer newNativeParent) {
     }
+    @Override
     public boolean isReparentSupported() {
         return false;
     }
@@ -349,12 +383,15 @@ public Rectangle getBounds() {
     public void setBoundsOperation(int operation) {
     }
 
+    @Override
     public void applyShape(Region shape) {
     }
 
+    @Override
     public void setZOrder(ComponentPeer above) {
     }
 
+    @Override
     public boolean updateGraphicsData(GraphicsConfiguration gc) {
         return false;
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
index f8a8c8a5e03..4a359644dfe 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedClientHelper.java
@@ -39,7 +39,7 @@
  * Window which wants to participate in a protocol should create an instance,
  * call install and forward all XClientMessageEvents to it.
  */
-public class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher {
+public final class XEmbedClientHelper extends XEmbedHelper implements XEventDispatcher {
     private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedClientHelper");
 
     private XEmbeddedFramePeer embedded; // XEmbed client
@@ -164,6 +164,7 @@ public void run() {
         }
     }
 
+    @Override
     public void dispatchEvent(XEvent xev) {
         switch(xev.get_type()) {
           case XConstants.ClientMessage:
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
index 009b909f830..b9f1caff48a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java
@@ -36,7 +36,7 @@
  * Test XEmbed server implementation. See file:///home/dom/bugs/4931668/test_plan.html for
  * specification and references.
  */
-public class XEmbedServerTester implements XEventDispatcher {
+public final class XEmbedServerTester implements XEventDispatcher {
     private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbedServerTester");
     private final Object EVENT_LOCK = new Object();
     static final int SYSTEM_EVENT_MASK = 0x8000;
@@ -647,6 +647,7 @@ private void sendMessage(int message, int detail, long data1, long data2) {
         xembed.sendMessage(parent, message, detail, data1, data2);
     }
 
+    @Override
     public void dispatchEvent(XEvent ev) {
         if (ev.get_type() == ClientMessage) {
             XClientMessageEvent msg = ev.get_xclient();
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
index 33d573afc13..699c18c253b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFrame.java
@@ -66,6 +66,7 @@ public XEmbeddedFrame(long handle, boolean supportsXEmbed, boolean isTrayIconWin
         }
     }
 
+    @Override
     public void addNotify()
     {
         if (!isDisplayable()) {
@@ -82,6 +83,7 @@ public XEmbeddedFrame(long handle, boolean supportsXEmbed) {
     /*
      * The method shouldn't be called in case of active XEmbed.
      */
+    @Override
     public boolean traverseIn(boolean direction) {
         XEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
                                              .getPeer(this);
@@ -95,6 +97,7 @@ public boolean traverseIn(boolean direction) {
         return false;
     }
 
+    @Override
     protected boolean traverseOut(boolean direction) {
         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
                                              .getPeer(this);
@@ -110,6 +113,7 @@ protected boolean traverseOut(boolean direction) {
     /*
      * The method shouldn't be called in case of active XEmbed.
      */
+    @Override
     public void synthesizeWindowActivation(boolean doActivate) {
         XEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
                                              .getPeer(this);
@@ -122,6 +126,7 @@ public void synthesizeWindowActivation(boolean doActivate) {
         }
     }
 
+    @Override
     public void registerAccelerator(AWTKeyStroke stroke) {
         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
                                              .getPeer(this);
@@ -130,6 +135,7 @@ public void registerAccelerator(AWTKeyStroke stroke) {
         }
     }
 
+    @Override
     public void unregisterAccelerator(AWTKeyStroke stroke) {
         XEmbeddedFramePeer xefp = AWTAccessor.getComponentAccessor()
                                              .getPeer(this);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
index 93c1ebd092e..d1e6e5ad979 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddedFramePeer.java
@@ -36,7 +36,7 @@
 
 import static sun.awt.X11.XConstants.*;
 
-public class XEmbeddedFramePeer extends XFramePeer {
+public final class XEmbeddedFramePeer extends XFramePeer {
 
     private static final PlatformLogger xembedLog = PlatformLogger.getLogger("sun.awt.X11.xembed.XEmbeddedFramePeer");
 
@@ -53,6 +53,7 @@ public XEmbeddedFramePeer(EmbeddedFrame target) {
             EMBEDDED, Boolean.TRUE}));
     }
 
+    @Override
     public void preInit(XCreateWindowParams params) {
         super.preInit(params);
         strokes = new ArrayList<>();
@@ -60,6 +61,7 @@ public void preInit(XCreateWindowParams params) {
             embedder = new XEmbedClientHelper();
         }
     }
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         if (embedder != null) {
@@ -89,9 +91,11 @@ public void dispose() {
         super.dispose();
     }
 
+    @Override
     public void updateMinimumSize() {
     }
 
+    @Override
     protected String getWMName() {
         return "JavaEmbeddedFrame";
     }
@@ -104,6 +108,7 @@ boolean supportsXEmbed() {
         return ((EmbeddedFrame)target).supportsXEmbed();
     }
 
+    @Override
     public boolean requestWindowFocus(long time, boolean timeProvided) {
         // Should check for active state of host application
         if (embedder != null && embedder.isActive()) {
@@ -115,6 +120,7 @@ public boolean requestWindowFocus(long time, boolean timeProvided) {
         }
     }
 
+    @Override
     protected void requestInitialFocus() {
         if (embedder != null && supportsXEmbed()) {
             embedder.requestFocus();
@@ -123,6 +129,7 @@ protected void requestInitialFocus() {
         }
     }
 
+    @Override
     protected boolean isEventDisabled(XEvent e) {
         if (embedder != null && embedder.isActive()) {
             switch (e.get_type()) {
@@ -134,6 +141,7 @@ protected boolean isEventDisabled(XEvent e) {
         return super.isEventDisabled(e);
     }
 
+    @Override
     public void handleConfigureNotifyEvent(XEvent xev)
     {
         assert (SunToolkit.isAWTLockHeldByCurrentThread());
@@ -187,6 +195,7 @@ protected void traverseOutBackward() {
     }
 
     // don't use getLocationOnScreen() inherited from XDecoratedPeer
+    @Override
     public Point getLocationOnScreen() {
         XToolkit.awtLock();
         try {
@@ -197,14 +206,17 @@ public Point getLocationOnScreen() {
     }
 
     // don't use getBounds() inherited from XDecoratedPeer
+    @Override
     public Rectangle getBounds() {
         return new Rectangle(x, y, width, height);
     }
 
+    @Override
     public void setBoundsPrivate(int x, int y, int width, int height) {
         setBounds(x, y, width, height, SET_BOUNDS | NO_EMBEDDED_CHECK);
     }
 
+    @Override
     public Rectangle getBoundsPrivate() {
         int x = 0, y = 0;
         int w = 0, h = 0;
@@ -262,6 +274,7 @@ void notifyStopped() {
         }
     }
 
+    @Override
     long getFocusTargetWindow() {
         return getWindow();
     }
@@ -270,6 +283,7 @@ boolean isXEmbedActive() {
         return embedder != null && embedder.isActive();
     }
 
+    @Override
     public int getAbsoluteX()
     {
         Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(),
@@ -278,6 +292,7 @@ public int getAbsoluteX()
         return absoluteLoc != null ? absoluteLoc.x : 0;
     }
 
+    @Override
     public int getAbsoluteY()
     {
         Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(),
@@ -286,19 +301,23 @@ public int getAbsoluteY()
         return absoluteLoc != null ? absoluteLoc.y : 0;
     }
 
+    @Override
     public int getWidth() {
         return width;
     }
+    @Override
     public int getHeight() {
         return height;
     }
 
+    @Override
     public Dimension getSize() {
         return new Dimension(width, height);
     }
 
     // override XWindowPeer's method to let the embedded frame to block
     // the containing window
+    @Override
     public void setModalBlocked(Dialog blocker, boolean blocked) {
         super.setModalBlocked(blocker, blocked);
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
index 39aa45fdc73..fe4c59b19b8 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbeddingContainer.java
@@ -30,7 +30,7 @@
 import java.awt.event.KeyEvent;
 import sun.awt.AWTAccessor;
 
-public class XEmbeddingContainer extends XEmbedHelper implements XEventDispatcher {
+public final class XEmbeddingContainer extends XEmbedHelper implements XEventDispatcher {
     HashMap<Long, java.awt.peer.ComponentPeer> children = new HashMap<>();
 
     XEmbeddingContainer() {
@@ -120,6 +120,7 @@ public void handleClientMessage(XEvent xev) {
             }
         }
     }
+    @Override
     public void dispatchEvent(XEvent xev) {
         switch(xev.get_type()) {
           case XConstants.ClientMessage:
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
index 4fc6bd84249..8d2d4715ce1 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XErrorHandler.java
@@ -47,7 +47,7 @@ public int handleError(long display, XErrorEvent err) {
      * but temporary install this function as the error handler to ignore
      * BadWindow error.
      */
-    public static class IgnoreBadWindowHandler extends XBaseErrorHandler {
+    public static final class IgnoreBadWindowHandler extends XBaseErrorHandler {
         @Override
         public int handleError(long display, XErrorEvent err) {
             if (err.get_error_code() == XConstants.BadWindow) {
@@ -62,7 +62,7 @@ public static IgnoreBadWindowHandler getInstance() {
         }
     }
 
-    public static class VerifyChangePropertyHandler extends XBaseErrorHandler {
+    public static final class VerifyChangePropertyHandler extends XBaseErrorHandler {
         @Override
         public int handleError(long display, XErrorEvent err) {
             if (err.get_request_code() == XProtocolConstants.X_ChangeProperty) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XException.java b/src/java.desktop/unix/classes/sun/awt/X11/XException.java
index 732c94b5abe..6577e6a45e6 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XException.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XException.java
@@ -31,7 +31,7 @@
  * @since 1.5
  */
 @SuppressWarnings("serial") // JDK-implementation class
-public class XException extends RuntimeException {
+public final class XException extends RuntimeException {
     public XException() {
         super();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
index 5c6fde2251c..0aaf6c75e89 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java
@@ -37,7 +37,7 @@
 import sun.util.logging.PlatformLogger;
 import sun.awt.AWTAccessor;
 
-class XFileDialogPeer extends XDialogPeer
+final class XFileDialogPeer extends XDialogPeer
         implements FileDialogPeer, ActionListener, ItemListener,
                    KeyEventDispatcher, XChoicePeerListener {
 
@@ -313,9 +313,11 @@ public void windowClosing(WindowEvent e){
 
     }
 
+    @Override
     public void updateMinimumSize() {
     }
 
+    @Override
     public void updateIconImages() {
         if (winAttr.icons == null){
             winAttr.iconsInherited = false;
@@ -544,6 +546,7 @@ void setFilterField(String str) {
      * @see java.awt.event.ItemEvent
      * ItemEvent.ITEM_STATE_CHANGED
      */
+    @Override
     public void itemStateChanged(ItemEvent itemEvent){
         if (itemEvent.getID() != ItemEvent.ITEM_STATE_CHANGED ||
             itemEvent.getStateChange() == ItemEvent.DESELECTED) {
@@ -603,6 +606,7 @@ String getParentDirectory(){
         return parent;
     }
 
+    @Override
     public void actionPerformed( ActionEvent actionEvent ) {
         String actionCommand = actionEvent.getActionCommand();
         Object source = actionEvent.getSource();
@@ -639,6 +643,7 @@ public void actionPerformed( ActionEvent actionEvent ) {
         }
     }
 
+    @Override
     public boolean dispatchKeyEvent(KeyEvent keyEvent) {
         int id = keyEvent.getID();
         int keyCode = keyEvent.getKeyCode();
@@ -673,6 +678,7 @@ public boolean dispatchKeyEvent(KeyEvent keyEvent) {
     /**
      * set the file
      */
+    @Override
     public void setFile(String file) {
 
         if (file == null) {
@@ -706,6 +712,7 @@ public void setFile(String file) {
      * since 'setDirectory' will be ignored
      * We can't update savedDir here now since it used very often
      */
+    @Override
     public void setDirectory(String dir) {
 
         if (dir == null) {
@@ -763,11 +770,13 @@ public void setDirectory(String dir) {
      * set filenameFilter
      *
      */
+    @Override
     public void setFilenameFilter(FilenameFilter filter) {
         this.filter = filter;
     }
 
 
+    @Override
     public void dispose() {
         FileDialog fd = (FileDialog)fileDialog;
         if (fd != null) {
@@ -777,6 +786,7 @@ public void dispose() {
     }
 
     // 03/02/2005 b5097243 Pressing 'ESC' on a file dlg does not dispose the dlg on Xtoolkit
+    @Override
     public void setVisible(boolean b){
         if (fileDialog == null) {
             init(target);
@@ -823,6 +833,7 @@ public void addItemsToPathChoice(String text){
      * Refresh the unfurled choice at the time of the opening choice according to the text of the path field
      * See 6240074 for more information
      */
+    @Override
     public void unfurledChoiceOpening(ListHelper choiceHelper){
 
         // When the unfurled choice is opening the first time, we need only to add elements, otherwise we've got exception
@@ -843,6 +854,7 @@ public void unfurledChoiceOpening(ListHelper choiceHelper){
      * Refresh the file dialog at the time of the closing choice according to the selected item of the choice
      * See 6240074 for more information
      */
+    @Override
     public void unfurledChoiceClosing(){
           // This is the exactly same code as invoking later at the time of the itemStateChanged
           // Here is we restore Windows behaviour: change current directory if user press 'ESC'
@@ -852,7 +864,7 @@ public void unfurledChoiceClosing(){
 }
 
 @SuppressWarnings("serial") // JDK-implementation class
-class Separator extends Canvas {
+final class Separator extends Canvas {
     public static final int HORIZONTAL = 0;
     public static final int VERTICAL = 1;
     int orientation;
@@ -869,6 +881,7 @@ public Separator(int length, int thickness, int orient) {
         }
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void paint(Graphics g) {
         int x1, y1, x2, y2;
@@ -903,7 +916,7 @@ public void paint(Graphics g) {
  * are displayed in the dialog. This filter is generally specified as a regular
  * expression. The class is used to implement Motif-like filtering.
  */
-class FileDialogFilter implements FilenameFilter {
+final class FileDialogFilter implements FilenameFilter {
 
     String filter;
 
@@ -914,6 +927,7 @@ public FileDialogFilter(String f) {
     /*
      * Tells whether or not the specified file should be included in a file list
      */
+    @Override
     public boolean accept(File dir, String fileName) {
 
         File f = new File(dir, fileName);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
index 1365a7d8a07..e6096eba5f3 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFocusProxyWindow.java
@@ -32,7 +32,7 @@
  * it instead sets focus to this proxy. This proxy is mapped but invisible(it is kept at (-1,-1))
  * and therefore X doesn't control focus after we have set it to proxy.
  */
-public class XFocusProxyWindow extends XBaseWindow {
+public final class XFocusProxyWindow extends XBaseWindow {
     XWindowPeer owner;
 
     public XFocusProxyWindow(XWindowPeer owner) {
@@ -45,12 +45,14 @@ BOUNDS, new Rectangle(-1, -1, 1, 1),
         this.owner = owner;
     }
 
+    @Override
     public void postInit(XCreateWindowParams params){
         super.postInit(params);
         setWMClass(getWMClass());
         xSetVisible(true);
     }
 
+    @Override
     protected String getWMName() {
         return "FocusProxy";
     }
@@ -62,6 +64,7 @@ public XWindowPeer getOwner() {
         return owner;
     }
 
+    @Override
     public void dispatchEvent(XEvent ev) {
         int type = ev.get_type();
         switch (type)
@@ -78,10 +81,12 @@ public void handleFocusEvent(XEvent xev) {
         owner.handleFocusEvent(xev);
     }
 
+    @Override
     public void handleKeyPress(XEvent xev) {
         owner.handleKeyPress(xev);
     }
 
+    @Override
     public void handleKeyRelease(XEvent xev) {
         owner.handleKeyRelease(xev);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
index 3dad9a2a21d..7e8271a7358 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFontPeer.java
@@ -33,6 +33,7 @@ final class XFontPeer extends PlatformFont {
         super(name, style);
     }
 
+    @Override
     protected char getMissingGlyphCharacter() {
         return '\u274F';
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
index acbe8639702..fb4030f4aad 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
@@ -59,6 +59,7 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
         super(params);
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         Frame target = (Frame)(this.target);
@@ -111,6 +112,7 @@ private int getWindowDecorationBits() {
         return decorations;
     }
 
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         setupState(true);
@@ -137,6 +139,7 @@ void setupState(boolean onInit) {
         setExtendedState(state);
     }
 
+    @Override
     public void setMenuBar(MenuBar mb) {
         // state_lock should always be the second after awt_lock
         XToolkit.awtLock();
@@ -170,6 +173,7 @@ XMenuBarPeer getMenubarPeer() {
         return menubarPeer;
     }
 
+    @Override
     int getMenuBarHeight() {
         if (menubarPeer != null) {
             return menubarPeer.getDesiredHeight();
@@ -178,6 +182,7 @@ int getMenuBarHeight() {
         }
     }
 
+    @Override
     void updateChildrenSizes() {
         super.updateChildrenSizes();
         int height = getMenuBarHeight();
@@ -238,6 +243,7 @@ public void run() {
         );
     }
 
+    @Override
     public void setMaximizedBounds(Rectangle b) {
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
             insLog.fine("Setting maximized bounds to " + b);
@@ -267,12 +273,14 @@ public void setMaximizedBounds(Rectangle b) {
         }
     }
 
+    @Override
     public int getState() {
         synchronized(getStateLock()) {
             return state;
         }
     }
 
+    @Override
     public void setState(int newState) {
         synchronized(getStateLock()) {
             if (!isShowing()) {
@@ -336,6 +344,7 @@ public void toFront() {
         super.toFront();
     }
 
+    @Override
     public void handlePropertyNotify(XEvent xev) {
         super.handlePropertyNotify(xev);
         XPropertyEvent ev = xev.get_xproperty();
@@ -389,6 +398,7 @@ public void handlePropertyNotify(XEvent xev) {
 
     // NOTE: This method may be called by privileged threads.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    @Override
     public void handleStateChange(int oldState, int newState) {
         super.handleStateChange(oldState, newState);
         for (ToplevelStateListener topLevelListenerTmp : toplevelStateListeners) {
@@ -396,6 +406,7 @@ public void handleStateChange(int oldState, int newState) {
         }
     }
 
+    @Override
     public void setVisible(boolean vis) {
         if (vis) {
             setupState(false);
@@ -426,6 +437,7 @@ void setInitialState(int wm_state) {
         }
     }
 
+    @Override
     public void dispose() {
         if (menubarPeer != null) {
             menubarPeer.dispose();
@@ -433,6 +445,7 @@ public void dispose() {
         super.dispose();
     }
 
+    @Override
     boolean isMaximized() {
         return (state & (Frame.MAXIMIZED_VERT  | Frame.MAXIMIZED_HORIZ)) != 0;
     }
@@ -481,6 +494,7 @@ boolean isMaximized() {
      * of Component (and thus it has no "print" method which gets called by
      * default).
      */
+    @Override
     public void print(Graphics g) {
         super.print(g);
 
@@ -703,14 +717,17 @@ public void print(Graphics g) {
         }
     }
 
+    @Override
     public void setBoundsPrivate(int x, int y, int width, int height) {
         setBounds(x, y, width, height, SET_BOUNDS);
     }
 
+    @Override
     public Rectangle getBoundsPrivate() {
         return getBounds();
     }
 
+    @Override
     public void emulateActivation(boolean doActivate) {
         if (doActivate) {
             handleWindowFocusIn(0);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java b/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
index bcef8c85315..af77656706d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XGlobalCursorManager.java
@@ -61,6 +61,7 @@ static void nativeUpdateCursor(Component heavy) {
     }
 
 
+    @Override
     protected void setCursor(Component comp, Cursor cursor, boolean useCache) {
         if (comp == null) {
             return;
@@ -108,6 +109,7 @@ private static void updateGrabbedCursor(Cursor cur) {
         }
     }
 
+    @Override
     protected void updateCursorOutOfJava() {
         // in case we have grabbed input for Swing we need to reset cursor
         // when mouse pointer is out of any java toplevel.
@@ -115,6 +117,7 @@ protected void updateCursorOutOfJava() {
         updateGrabbedCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
 
+    @Override
     protected void getCursorPos(Point p) {
 
         if (!((XToolkit)Toolkit.getDefaultToolkit()).getLastCursorPos(p)) {
@@ -147,10 +150,12 @@ protected  Component findHeavyweightUnderCursor() {
     /*
      * native method to call corresponding methods in Component
      */
+    @Override
     protected  Point getLocationOnScreen(Component c) {
         return c.getLocationOnScreen();
     }
 
+    @Override
     protected Component findHeavyweightUnderCursor(boolean useCache) {
         return findHeavyweightUnderCursor();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
index 2abcc4405ff..1f9cee8a7d9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XHorizontalScrollbar.java
@@ -31,12 +31,13 @@
 * A simple horizontal scroll bar. The scrollbar is made horizontal
 * by taking a vertical scrollbar and swapping the x and y coordinates.
 */
-class XHorizontalScrollbar extends XScrollbar {
+final class XHorizontalScrollbar extends XScrollbar {
 
     public XHorizontalScrollbar(XScrollbarClient sb) {
         super(ALIGNMENT_HORIZONTAL, sb);
     }
 
+    @Override
     public void setSize(int width, int height) {
         super.setSize(width, height);
         this.barWidth = height;
@@ -44,16 +45,19 @@ public void setSize(int width, int height) {
         calculateArrowWidth();
         rebuildArrows();
     }
+    @Override
     protected void rebuildArrows() {
         firstArrow = createArrowShape(false, true);
         secondArrow = createArrowShape(false, false);
     }
 
+    @Override
     boolean beforeThumb(int x, int y) {
         Rectangle pos = calculateThumbRect();
         return (x < pos.x);
     }
 
+    @Override
     protected Rectangle getThumbArea() {
         return new Rectangle(getArrowAreaWidth(), 2, width - 2*getArrowAreaWidth(), height-4);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
index 707df9fb771..c68e6dbd239 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XIconWindow.java
@@ -46,7 +46,7 @@
 import sun.awt.image.ToolkitImage;
 import sun.util.logging.PlatformLogger;
 
-public class XIconWindow extends XBaseWindow {
+public final class XIconWindow extends XBaseWindow {
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XIconWindow");
     XDecoratedPeer parent;
     Dimension size;
@@ -60,6 +60,7 @@ public class XIconWindow extends XBaseWindow {
             DELAYED, Boolean.TRUE}));
     }
 
+    @Override
     void instantPreInit(XCreateWindowParams params) {
         super.instantPreInit(params);
         this.parent = (XDecoratedPeer)params.get(PARENT);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
index 54912312c55..332b9860c19 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethod.java
@@ -42,17 +42,19 @@
  *
  * @author JavaSoft International
  */
-public class XInputMethod extends X11InputMethod {
+public final class XInputMethod extends X11InputMethod {
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XInputMethod");
 
     public XInputMethod() throws AWTException {
         super();
     }
 
+    @Override
     public void setInputMethodContext(InputMethodContext context) {
         context.enableClientWindowNotification(this, true);
     }
 
+    @Override
     public void notifyClientWindowChange(Rectangle location) {
         XComponentPeer peer = (XComponentPeer)getPeer(clientComponentWindow);
         if (peer != null) {
@@ -60,10 +62,12 @@ public void notifyClientWindowChange(Rectangle location) {
         }
     }
 
+    @Override
     protected boolean openXIM() {
         return openXIMNative(XToolkit.getDisplay());
     }
 
+    @Override
     protected boolean createXIC() {
         XComponentPeer peer = (XComponentPeer)getPeer(clientComponentWindow);
         if (peer == null) {
@@ -75,6 +79,7 @@ protected boolean createXIC() {
 
     private static volatile long xicFocus;
 
+    @Override
     protected void setXICFocus(ComponentPeer peer,
                                     boolean value, boolean active) {
         if (peer == null) {
@@ -93,6 +98,7 @@ public static long getXICFocus() {
 /* XAWT_HACK  FIX ME!
    do NOT call client code!
 */
+    @Override
     protected Container getParent(Component client) {
         return client.getParent();
     }
@@ -101,6 +107,7 @@ protected Container getParent(Component client) {
      * Returns peer of the given client component. If the given client component
      * doesn't have peer, peer of the native container of the client is returned.
      */
+    @Override
     protected ComponentPeer getPeer(Component client) {
         XComponentPeer peer;
 
@@ -126,15 +133,18 @@ protected ComponentPeer getPeer(Component client) {
      * Subclasses should override disposeImpl() instead of dispose(). Client
      * code should always invoke dispose(), never disposeImpl().
      */
+    @Override
     protected synchronized void disposeImpl() {
         super.disposeImpl();
         clientComponentWindow = null;
     }
 
+    @Override
     protected void awtLock() {
         XToolkit.awtLock();
     }
 
+    @Override
     protected void awtUnlock() {
         XToolkit.awtUnlock();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
index 93f9e1e40a9..d6fa0bdefd7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XInputMethodDescriptor.java
@@ -29,11 +29,12 @@
 import java.awt.im.spi.InputMethod;
 import sun.awt.X11InputMethodDescriptor;
 
-class XInputMethodDescriptor extends X11InputMethodDescriptor {
+final class XInputMethodDescriptor extends X11InputMethodDescriptor {
 
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#createInputMethod
      */
+    @Override
     public InputMethod createInputMethod() throws Exception {
         return new XInputMethod();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
index c1466a6a78c..fb0e163ef8b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java
@@ -32,7 +32,7 @@
 import sun.awt.KeyboardFocusManagerPeerImpl;
 import sun.util.logging.PlatformLogger;
 
-public class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl {
+public final class XKeyboardFocusManagerPeer extends KeyboardFocusManagerPeerImpl {
     private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.awt.X11.focus.XKeyboardFocusManagerPeer");
     private static final XKeyboardFocusManagerPeer inst = new XKeyboardFocusManagerPeer();
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
index acf8edf8c2d..2970305ce26 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java
@@ -42,11 +42,11 @@
 
 import sun.util.logging.PlatformLogger;
 
-public class XKeysym {
+public final class XKeysym {
 
     private XKeysym() {}
 
-    static class Keysym2JavaKeycode  {
+    static final class Keysym2JavaKeycode  {
         int jkeycode;
         int keyLocation;
         int getJavaKeycode() {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
index 3005ad3327e..5575f521284 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XLabelPeer.java
@@ -28,7 +28,7 @@
 import java.awt.*;
 import java.awt.peer.*;
 
-class XLabelPeer extends XComponentPeer implements LabelPeer {
+final class XLabelPeer extends XComponentPeer implements LabelPeer {
     /**
      * Create the label
      */
@@ -49,6 +49,7 @@ FontMetrics getFontMetrics()
 
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         Label target = (Label) this.target;
@@ -66,6 +67,7 @@ void preInit(XCreateWindowParams params) {
     /**
      * Minimum size.
      */
+    @Override
     public Dimension getMinimumSize() {
         FontMetrics fm = getFontMetrics();
         int w;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
index c2089ea8018..fb8880f36c5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XLightweightFramePeer.java
@@ -33,7 +33,7 @@
 import sun.swing.JLightweightFrame;
 import sun.swing.SwingAccessor;
 
-public class XLightweightFramePeer extends XFramePeer implements OverrideNativeWindowHandle {
+public final class XLightweightFramePeer extends XFramePeer implements OverrideNativeWindowHandle {
 
     XLightweightFramePeer(LightweightFrame target) {
         super(target);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
index 0f53d4d3575..eb1e9eab039 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java
@@ -38,7 +38,7 @@
 
 // TODO: some input actions should do nothing if Shift or Control are down
 
-class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
+final class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
 
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XListPeer");
 
@@ -135,6 +135,7 @@ class XListPeer extends XComponentPeer implements ListPeer, XScrollbarClient {
     /**
      * Overridden from XWindow
      */
+    @Override
     public void preInit(XCreateWindowParams params) {
         super.preInit(params);
 
@@ -150,6 +151,7 @@ public void preInit(XCreateWindowParams params) {
         fgColorSet = target.isForegroundSet();
     }
 
+    @Override
     public void postInit(XCreateWindowParams params) {
         super.postInit(params);
         initFontMetrics();
@@ -212,27 +214,33 @@ void createHorScrollbar() {
         hsb.setValues(0, 0, 0, 0, HORIZ_SCROLL_AMT, HORIZ_SCROLL_AMT);
     }
 
+    @Override
     public void add(String item, int index) {
         addItem(item, index);
     }
 
+    @Override
     public void removeAll() {
         clear();
         maxLength = 0;
     }
 
+    @Override
     public void setMultipleMode (boolean b) {
         setMultipleSelections(b);
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return getMinimumSize(DEFAULT_VISIBLE_ROWS);
     }
 
+    @Override
     public Dimension getPreferredSize(int rows) {
         return getMinimumSize(rows);
     }
 
+    @Override
     public Dimension getMinimumSize(int rows) {
         FontMetrics fm = getFontMetrics(getFont());
         initFontMetrics();
@@ -281,11 +289,13 @@ int stringLength(String str) {
         return fm.stringWidth(str);
     }
 
+    @Override
     public void setForeground(Color c) {
         fgColorSet = true;
         super.setForeground(c);
     }
 
+    @Override
     public void setBackground(Color c) {
         bgColorSet = true;
         super.setBackground(c);
@@ -341,6 +351,7 @@ int getLastVisibleItem() {
             return Math.min(items.size()-1, itemsInWindow()-1);
         }
     }
+    @Override
     public void repaintScrollbarRequest(XScrollbar scrollbar) {
         if (scrollbar == hsb)  {
             repaint(PAINT_HSCROLL);
@@ -352,6 +363,7 @@ else if (scrollbar == vsb) {
     /**
      * Overridden for performance
      */
+    @Override
     public void repaint() {
         repaint(getFirstVisibleItem(), getLastVisibleItem(), PAINT_ALL);
     }
@@ -397,14 +409,17 @@ private void repaint(int firstItem, int lastItem, int options, Rectangle source,
     void paintPeer(final Graphics g) {
         painter.paint(g, getFirstVisibleItem(), getLastVisibleItem(), PAINT_ALL);
     }
+    @Override
     public boolean isFocusable() { return true; }
 
     // TODO: share/promote the Focus methods?
+    @Override
     public void focusGained(FocusEvent e) {
         super.focusGained(e);
         repaint(PAINT_FOCUS);
     }
 
+    @Override
     public void focusLost(FocusEvent e) {
         super.focusLost(e);
         repaint(PAINT_FOCUS);
@@ -414,6 +429,7 @@ public void focusLost(FocusEvent e) {
      * Layout the sub-components of the List - that is, the scrollbars and the
      * list of items.
      */
+    @Override
     public void layout() {
         int vis, maximum;
         boolean vsbWasVisible;
@@ -520,15 +536,18 @@ Rectangle getFocusRect() {
         return focusRect;
     }
 
+    @Override
     public void handleConfigureNotifyEvent(XEvent xev) {
         super.handleConfigureNotifyEvent(xev);
 
         // Update buffer
         painter.invalidate();
     }
+    @Override
     public boolean handlesWheelScrolling() { return true; }
 
     // FIXME: need to support MouseWheel scrolling, too
+    @Override
     void handleJavaMouseEvent(MouseEvent e) {
         super.handleJavaMouseEvent(e);
         int i = e.getID();
@@ -545,6 +564,7 @@ void handleJavaMouseEvent(MouseEvent e) {
         }
     }
 
+    @Override
     void handleJavaMouseWheelEvent(MouseWheelEvent e) {
         if (ListHelper.doWheelScroll(vsbVis ? vsb : null,
                                      hsbVis ? hsb : null, e)) {
@@ -781,6 +801,7 @@ void trackMouseReleasedScroll(){
         }
     }
 
+    @Override
     void handleJavaKeyEvent(KeyEvent e) {
         switch(e.getID()) {
           case KeyEvent.KEY_PRESSED:
@@ -978,6 +999,7 @@ else if (!isSelected) { // Note: this changes the Solaris/Linux
     /**
      * return value from the scrollbar
      */
+    @Override
     public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) {
 
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
@@ -1097,6 +1119,7 @@ public void addItem(String item, int i) {
      * if s < 0 then s = 0
      * if e >= items.size() then e = items.size() - 1
      */
+    @Override
     public void delItems(int s, int e) {
         // save the current state of the scrollbars
         boolean hsbWasVisible = hsbVis;
@@ -1208,6 +1231,7 @@ public void delItems(int s, int e) {
     /**
      * ListPeer method
      */
+    @Override
     public void select(int index) {
         // Programmatic select() should also set the focus index
         setFocusIndex(index);
@@ -1266,6 +1290,7 @@ void selectItem(int index) {
      * ListPeer method
      * focusedIndex isn't updated according to native (Window, Motif) behaviour
      */
+    @Override
     public void deselect(int index) {
         deselectItem(index);
     }
@@ -1301,6 +1326,7 @@ void deselectItem(int index) {
      * if necessary, or doing nothing if the item is already visible.
      * The List must be repainted for changes to be visible.
      */
+    @Override
     public void makeVisible(int index) {
         if (index < 0 || index >= items.size()) {
             return;
@@ -1337,6 +1363,7 @@ public void clear() {
     /**
      * return the selected indexes
      */
+    @Override
     public int[] getSelectedIndexes() {
         return selected;
     }
@@ -1598,6 +1625,7 @@ boolean hsbIsVisible(boolean vsbVisible){
      * Returns true if the event has been handled and should not be
      * posted to Java
      */
+    @Override
     boolean prePostEvent(final AWTEvent e) {
         if (e instanceof MouseEvent) {
             return prePostMouseEvent((MouseEvent)e);
@@ -1662,6 +1690,7 @@ public void run() {
      * The bug is due to incorrect caching of the list item size
      * So we should recalculate font metrics on setFont
      */
+    @Override
     public void setFont(Font f) {
         if (!Objects.equals(getFont(), f)) {
             super.setFont(f);
@@ -1678,7 +1707,7 @@ public void setFont(Font f) {
      *     Painter -> awtLock
      * Since we can't guarantee the sequence, use awtLock.
      */
-    class ListPainter {
+    final class ListPainter {
         VolatileImage buffer;
         Color[] colors;
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
index ad8ac161d60..b4345111d11 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java
@@ -34,7 +34,7 @@
 import java.util.*;
 import sun.util.logging.PlatformLogger;
 
-public class  XMSelection {
+public final class  XMSelection {
 
     /*
      * A method for a subsystem to express its interest in a certain
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
index 39315e21f54..2369e1c5614 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java
@@ -32,7 +32,7 @@
 import sun.util.logging.PlatformLogger;
 import sun.awt.AWTAccessor;
 
-public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer {
+public final class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer {
 
     /************************************************
      *
@@ -76,7 +76,7 @@ public class XMenuBarPeer extends XBaseMenuWindow implements MenuBarPeer {
      * XBaseMenuWindow's mappingData is extended with
      * desired height of menu bar
      */
-    static class MappingData extends XBaseMenuWindow.MappingData {
+    static final class MappingData extends XBaseMenuWindow.MappingData {
         int desiredHeight;
 
         MappingData(XMenuItemPeer[] items, int desiredHeight) {
@@ -115,6 +115,7 @@ public int getDesiredHeight() {
     /*
      * From MenuComponentPeer
      */
+    @Override
     public void setFont(Font f) {
         resetMapping();
         setItemsFont(f);
@@ -147,11 +148,13 @@ public void setFont(Font f) {
      * Note that these functions don't perform
      * type checks and checks for nulls or duplicates
      */
+    @Override
     public void addMenu(Menu m) {
         addItem(m);
         postPaintEvent();
     }
 
+    @Override
     public void delMenu(int index) {
         synchronized(getMenuTreeLock()) {
             XMenuItemPeer item = getItem(index);
@@ -163,6 +166,7 @@ public void delMenu(int index) {
         postPaintEvent();
     }
 
+    @Override
     public void addHelpMenu(Menu m) {
         XMenuPeer mp = AWTAccessor.getMenuComponentAccessor().getPeer(m);
         synchronized(getMenuTreeLock()) {
@@ -192,6 +196,7 @@ public void init(Frame frame) {
     /**
      * Overridden initialization
      */
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         // Get menus from the target.
@@ -217,6 +222,7 @@ void postInit(XCreateWindowParams params) {
      * Menu bar is always root window in menu window's
      * hierarchy
      */
+    @Override
     protected XBaseMenuWindow getParentMenuWindow() {
         return null;
     }
@@ -224,6 +230,7 @@ protected XBaseMenuWindow getParentMenuWindow() {
     /**
      * @see XBaseMenuWindow#map
      */
+    @Override
     protected MappingData map() {
         XMenuItemPeer[] itemVector = copyItems();
         int itemCnt = itemVector.length;
@@ -296,6 +303,7 @@ protected MappingData map() {
     /**
      * @see XBaseMenuWindow#getSubmenuBounds
      */
+    @Override
     protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize) {
         Rectangle globalBounds = toGlobal(itemBounds);
         Rectangle screenBounds = getCurrentGraphicsConfiguration().getBounds();
@@ -324,6 +332,7 @@ protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize)
      * size of items has changed.
      * Invokes framePeer's updateChildrenSizes()
      */
+    @Override
     protected void updateSize() {
         resetMapping();
         if (framePeer != null) {
@@ -366,6 +375,7 @@ boolean isFramePeerEnabled() {
     /**
      * @see XBaseMenuWindow#doDispose()
      */
+    @Override
     protected void doDispose() {
         super.doDispose();
         XToolkit.targetDisposedPeer(menuBarTarget, this);
@@ -381,6 +391,7 @@ protected void doDispose() {
      * For menu bars this function is called from framePeer's
      * reshape(...) and updateChildrenSizes()
      */
+    @Override
     public void reshape(int x, int y, int width, int height) {
         if ((width != this.width) || (height != this.height)) {
             resetMapping();
@@ -392,6 +403,7 @@ public void reshape(int x, int y, int width, int height) {
      * Performs ungrabbing of input
      * @see XBaseWindow#ungrabInputImpl()
      */
+    @Override
     void ungrabInputImpl() {
         selectItem(null, false);
         super.ungrabInputImpl();
@@ -403,6 +415,7 @@ void ungrabInputImpl() {
      * Overridden XWindow painting & printing
      *
      ************************************************/
+    @Override
     public void paintPeer(Graphics g) {
         resetColors();
         /* Calculate menubar dimension. */
@@ -453,6 +466,7 @@ void print(Graphics g) {
      * Overridden XBaseMenuWindow event handling
      *
      ************************************************/
+    @Override
     protected void handleEvent(AWTEvent event) {
         // explicitly block all events except PaintEvent.PAINT for menus,
         // that are in the modal blocked window
@@ -520,6 +534,7 @@ void handleF10KeyPress(KeyEvent event) {
      * Now we override this function do disable F10 explicit
      * processing. All processing is done using KeyEvent.
      */
+    @Override
     public void handleKeyPress(XEvent xev) {
         XKeyEvent xkey = xev.get_xkey();
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
index 8ddb54dee0d..1d8c594e04c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuItemPeer.java
@@ -92,7 +92,7 @@ public class XMenuItemPeer implements MenuItemPeer {
      */
     private TextMetrics textMetrics;
 
-    static class TextMetrics implements Cloneable {
+    static final class TextMetrics implements Cloneable {
         /*
          * Calculated text size members
          */
@@ -106,6 +106,7 @@ static class TextMetrics implements Cloneable {
             this.textBaseline = textBaseline;
         }
 
+        @Override
         public Object clone() {
             try {
                 return super.clone();
@@ -145,10 +146,12 @@ int getTextBaseline() {
     /*
      * From MenuComponentPeer
      */
+    @Override
     public void dispose() {
         //Empty function
     }
 
+    @Override
     public void setFont(Font font) {
         resetTextMetrics();
         repaintIfShowing();
@@ -156,11 +159,13 @@ public void setFont(Font font) {
     /*
      * From MenuItemPeer
      */
+    @Override
     public void setLabel(String label) {
         resetTextMetrics();
         repaintIfShowing();
     }
 
+    @Override
     public void setEnabled(boolean enabled) {
         repaintIfShowing();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
index c1bed41226b..080193a70fd 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuPeer.java
@@ -31,7 +31,7 @@
 import sun.util.logging.PlatformLogger;
 import sun.awt.AWTAccessor;
 
-public class XMenuPeer extends XMenuItemPeer implements MenuPeer {
+public final class XMenuPeer extends XMenuItemPeer implements MenuPeer {
 
     /************************************************
      *
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
index e62f08c5287..42f0de8eb6c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java
@@ -81,7 +81,7 @@ public class XMenuWindow extends XBaseMenuWindow {
      *
      ************************************************/
 
-    static class MappingData extends XBaseMenuWindow.MappingData {
+    static final class MappingData extends XBaseMenuWindow.MappingData {
         /**
          * Rectangle for the caption
          * Necessary to fix 6267144: PIT: Popup menu label is not shown, XToolkit
@@ -183,6 +183,7 @@ public int getRightMarkOrigin() {
     /*
      * Overridden initialization
      */
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         //Fixed 6267182: PIT: Menu is not visible after
@@ -199,6 +200,7 @@ void postInit(XCreateWindowParams params) {
     /**
      * @see XBaseMenuWindow#getParentMenuWindow()
      */
+    @Override
     protected XBaseMenuWindow getParentMenuWindow() {
         return (menuPeer != null) ? menuPeer.getContainer() : null;
     }
@@ -206,6 +208,7 @@ protected XBaseMenuWindow getParentMenuWindow() {
     /**
      * @see XBaseMenuWindow#map()
      */
+    @Override
     protected MappingData map() {
         //TODO:Implement popup-menu caption mapping and painting and tear-off
         int itemCnt;
@@ -281,6 +284,7 @@ protected MappingData map() {
     /**
      * @see XBaseMenuWindow#getSubmenuBounds
      */
+    @Override
     protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize) {
         Rectangle globalBounds = toGlobal(itemBounds);
         Rectangle screenBounds = getCurrentGraphicsConfiguration().getBounds();
@@ -308,6 +312,7 @@ protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize)
      * It's likely that size of items was changed
      * invoke resizing of window on eventHandlerThread
      */
+    @Override
     protected void updateSize() {
         resetMapping();
         if (isShowing()) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
index 607533fc0da..04ff27759c9 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMouseDragGestureRecognizer.java
@@ -50,7 +50,7 @@
  * @see java.awt.dnd.DragSource
  */
 
-class XMouseDragGestureRecognizer extends MouseDragGestureRecognizer {
+final class XMouseDragGestureRecognizer extends MouseDragGestureRecognizer {
 
     /**
      * Use serialVersionUID from JDK 1.5 for interoperability.
@@ -141,6 +141,7 @@ protected int mapDragOperationFromModifiers(MouseEvent e) {
      * Invoked when the mouse has been clicked on a component.
      */
 
+    @Override
     public void mouseClicked(MouseEvent e) {
         // do nothing
     }
@@ -149,6 +150,7 @@ public void mouseClicked(MouseEvent e) {
      * Invoked when a mouse button has been pressed on a component.
      */
 
+    @Override
     public void mousePressed(MouseEvent e) {
         events.clear();
 
@@ -166,6 +168,7 @@ public void mousePressed(MouseEvent e) {
      * Invoked when a mouse button has been released on a component.
      */
 
+    @Override
     public void mouseReleased(MouseEvent e) {
         events.clear();
     }
@@ -174,6 +177,7 @@ public void mouseReleased(MouseEvent e) {
      * Invoked when the mouse enters a component.
      */
 
+    @Override
     public void mouseEntered(MouseEvent e) {
         events.clear();
     }
@@ -182,6 +186,7 @@ public void mouseEntered(MouseEvent e) {
      * Invoked when the mouse exits a component.
      */
 
+    @Override
     public void mouseExited(MouseEvent e) {
         if (!events.isEmpty()) { // gesture pending
             int dragAction = mapDragOperationFromModifiers(e);
@@ -196,6 +201,7 @@ public void mouseExited(MouseEvent e) {
      * Invoked when a mouse button is pressed on a component.
      */
 
+    @Override
     public void mouseDragged(MouseEvent e) {
         if (!events.isEmpty()) { // gesture pending
             int dop = mapDragOperationFromModifiers(e);
@@ -225,6 +231,7 @@ public void mouseDragged(MouseEvent e) {
      * (with no buttons no down).
      */
 
+    @Override
     public void mouseMoved(MouseEvent e) {
         // do nothing
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
index 321cb4fbf1e..41225db0c19 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMouseInfoPeer.java
@@ -42,6 +42,7 @@ public final class XMouseInfoPeer implements MouseInfoPeer {
     XMouseInfoPeer() {
     }
 
+    @Override
     public int fillPointWithCoords(Point point) {
         long display = XToolkit.getDisplay();
         GraphicsEnvironment ge = GraphicsEnvironment.
@@ -83,6 +84,7 @@ public int fillPointWithCoords(Point point) {
         return 0;
     }
 
+    @Override
     public boolean isWindowUnderMouse(Window w) {
         if (w == null) {
             return false;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
index 81c31b277fb..590dc43d322 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
@@ -43,10 +43,12 @@ final class XNETProtocol extends XProtocol implements XStateProtocol, XLayerProt
     /**
      * XStateProtocol
      */
+    @Override
     public boolean supportsState(int state) {
         return doStateProtocol() ; // TODO - check for Frame constants
     }
 
+    @Override
     public void setState(XWindowPeer window, int state) {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("Setting state of " + window + " to " + state);
@@ -132,6 +134,7 @@ private void requestState(XWindowPeer window, int state) {
         }
     }
 
+    @Override
     public int getState(XWindowPeer window) {
         return getStateImpl(window);
     }
@@ -154,6 +157,7 @@ int getStateImpl(XWindowPeer window) {
         return java_state;
     }
 
+    @Override
     public boolean isStateChange(XPropertyEvent e) {
         boolean res = doStateProtocol() && (e.get_atom() == XA_NET_WM_STATE.getAtom()) ;
 
@@ -168,6 +172,7 @@ public boolean isStateChange(XPropertyEvent e) {
     /*
      * Work around for 4775545.
      */
+    @Override
     public void unshadeKludge(XWindowPeer window) {
         XAtomList net_wm_state = window.getNETWMState();
         net_wm_state.remove(XA_NET_WM_STATE_SHADED);
@@ -177,6 +182,7 @@ public void unshadeKludge(XWindowPeer window) {
     /**
      * XLayerProtocol
      */
+    @Override
     public boolean supportsLayer(int layer) {
         return ((layer == LAYER_ALWAYS_ON_TOP) || (layer == LAYER_NORMAL)) && doLayerProtocol();
     }
@@ -244,6 +250,7 @@ private void setStateHelper(XWindowPeer window, XAtom state, boolean set) {
         XToolkit.XSync();
     }
 
+    @Override
     public void setLayer(XWindowPeer window, int layer) {
         setStateHelper(window, XA_NET_WM_STATE_ABOVE, layer == LAYER_ALWAYS_ON_TOP);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
index c96a1134efa..9be81191770 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPanelPeer.java
@@ -52,6 +52,7 @@ public void xembed(long window) {
         super(target);
     }
 
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
         if (embedder != null) {
@@ -59,9 +60,11 @@ void postInit(XCreateWindowParams params) {
         }
     }
 
+    @Override
     public Insets getInsets() {
         return new Insets(0, 0, 0, 0);
     }
+    @Override
     public void paint(Graphics g) {
         super.paint(g);
         SunGraphicsCallback.PaintHeavyweightComponentsCallback.getInstance().
@@ -69,6 +72,7 @@ public void paint(Graphics g) {
                           SunGraphicsCallback.LIGHTWEIGHTS |
                           SunGraphicsCallback.HEAVYWEIGHTS);
     }
+    @Override
     public void print(Graphics g) {
         super.print(g);
         SunGraphicsCallback.PrintHeavyweightComponentsCallback.getInstance().
@@ -78,6 +82,7 @@ public void print(Graphics g) {
 
     }
 
+    @Override
     public void setBackground(Color c) {
         Component comp;
         int i;
@@ -100,6 +105,7 @@ public void setBackground(Color c) {
         super.setBackground(c);
     }
 
+    @Override
     public void setForeground(Color c) {
         setForegroundForHierarchy((Container) target, c);
     }
@@ -126,6 +132,7 @@ private void setForegroundForHierarchy(Container cont, Color c) {
         }
     }
 
+    @Override
     public void dispose() {
         if (embedder != null) {
             embedder.deinstall();
@@ -133,6 +140,7 @@ public void dispose() {
         super.dispose();
     }
 
+    @Override
     protected boolean shouldFocusOnClick() {
         // Return false if this container has children so in that case it won't
         // be focused. Return true otherwise.
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
index ba22969b148..1bde8734a70 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java
@@ -45,7 +45,7 @@
 import sun.awt.SunToolkit;
 import sun.util.logging.PlatformLogger;
 
-public class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer {
+public final class XPopupMenuPeer extends XMenuWindow implements PopupMenuPeer {
 
     /************************************************
      *
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java b/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
index 1d6bba603db..d00c06e5a6e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XPropertyCache.java
@@ -37,9 +37,9 @@
  * access to properties is rewritten using general mechanisms, caching
  * will be enabled.
  */
-public class XPropertyCache {
+public final class XPropertyCache {
 
-    static class PropertyCacheEntry {
+    static final class PropertyCacheEntry {
         private final int format;
         private final int numberOfItems;
         private final long bytesAfter;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
index 7c3641d4c42..8f566792abc 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java
@@ -29,7 +29,7 @@
 
 import jdk.internal.misc.Unsafe;
 
-public class XQueryTree {
+public final class XQueryTree {
         private static Unsafe unsafe = XlibWrapper.unsafe;
         private boolean __executed = false;
         long _w;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java b/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
index 6f7b733c82f..790023031bd 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRepaintArea.java
@@ -45,6 +45,7 @@ final class XRepaintArea extends RepaintArea {
     /**
      * Calls {@code Component.update(Graphics)} with given Graphics.
      */
+    @Override
     protected void updateComponent(Component comp, Graphics g) {
         if (comp != null) {
             // We don't call peer.paintPeer() here, because we shouldn't paint
@@ -56,6 +57,7 @@ protected void updateComponent(Component comp, Graphics g) {
     /**
      * Calls {@code Component.paint(Graphics)} with given Graphics.
      */
+    @Override
     protected void paintComponent(Component comp, Graphics g) {
         if (comp != null) {
             final XComponentPeer peer = AWTAccessor.getComponentAccessor()
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
index bd77b61f7aa..99062a57903 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRootWindow.java
@@ -30,8 +30,8 @@
  * Object of this class is singleton, all window reference it to have
  * common logical ancestor
  */
-class XRootWindow extends XBaseWindow {
-    private static class LazyHolder {
+final class XRootWindow extends XBaseWindow {
+    private static final class LazyHolder {
         private static final XRootWindow xawtRootWindow;
 
         static {
@@ -54,11 +54,13 @@ private XRootWindow() {
                                                      EVENT_MASK, XConstants.StructureNotifyMask }));
     }
 
+    @Override
     public void postInit(XCreateWindowParams params){
         super.postInit(params);
         setWMClass(getWMClass());
     }
 
+    @Override
     protected String getWMName() {
         return XToolkit.getAWTAppClassName();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
index c13400f09f5..e02ddae753a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java
@@ -32,7 +32,7 @@
 
 import sun.awt.AWTAccessor;
 
-class XScrollPanePeer extends XComponentPeer implements ScrollPanePeer, XScrollbarClient {
+final class XScrollPanePeer extends XComponentPeer implements ScrollPanePeer, XScrollbarClient {
 
     public static final int     MARGIN = 1;
     public static final int     SCROLLBAR;
@@ -54,10 +54,11 @@ class XScrollPanePeer extends XComponentPeer implements ScrollPanePeer, XScrollb
     int                         hsbSpace;
     int                         vsbSpace;
 
-    static class XScrollPaneContentWindow extends XWindow {
+    static final class XScrollPaneContentWindow extends XWindow {
         XScrollPaneContentWindow(ScrollPane target, long parentWindow) {
             super(target, parentWindow);
         }
+        @Override
         public String getWMName() {
             return "ScrollPane content";
         }
@@ -108,11 +109,13 @@ public String getWMName() {
 
     }
 
+    @Override
     public long getContentWindow()
     {
         return (clip == null) ? window : clip.getWindow();
     }
 
+    @Override
     public void setBounds(int x, int y, int w, int h, int op) {
         super.setBounds(x, y, w, h, op);
 
@@ -122,18 +125,22 @@ public void setBounds(int x, int y, int w, int h, int op) {
         repaint();
     }
 
+    @Override
     public Insets getInsets() {
         return new Insets(MARGIN, MARGIN, MARGIN+hsbSpace, MARGIN+vsbSpace);
     }
 
+    @Override
     public int getHScrollbarHeight() {
         return SCROLLBAR;
     }
 
+    @Override
     public int getVScrollbarWidth() {
         return SCROLLBAR;
     }
 
+    @Override
     public void childResized(int w, int h) {
         if (setScrollbarSpace()) {
             setViewportSize();
@@ -241,6 +248,7 @@ void setViewportSize() {
                 height - (2*MARGIN) - hsbSpace);
     }
 
+    @Override
     public void setUnitIncrement(Adjustable adj, int u) {
         if (adj.getOrientation() == Adjustable.VERTICAL) {
             vsb.setUnitIncrement(u);
@@ -250,6 +258,7 @@ public void setUnitIncrement(Adjustable adj, int u) {
         }
     }
 
+    @Override
     public void setValue(Adjustable adj, int v) {
         if (adj.getOrientation() == Adjustable.VERTICAL) {
             scroll(-1, v, VERTICAL);
@@ -259,6 +268,7 @@ public void setValue(Adjustable adj, int v) {
         }
     }
 
+    @Override
     public void setScrollPosition(int x, int y) {
         scroll(x, y, VERTICAL | HORIZONTAL);
     }
@@ -361,6 +371,7 @@ void repaintScrollBars() {
             }
         }
     }
+    @Override
     public void repaintScrollbarRequest(XScrollbar sb) {
         Graphics g = getGraphics();
         Color[] colors = getGUIcolors();
@@ -376,6 +387,7 @@ public void repaintScrollbarRequest(XScrollbar sb) {
             }
         }
     }
+    @Override
     public void handleEvent(java.awt.AWTEvent e) {
         super.handleEvent(e);
 
@@ -467,6 +479,7 @@ void paintVerScrollbar(Graphics g, Color[] colors, boolean paintAll) {
      * MouseEvent.MOUSE_EXITED
      * MouseEvent.MOUSE_DRAGGED
      */
+    @Override
     @SuppressWarnings("deprecation")
     public void handleJavaMouseEvent( MouseEvent mouseEvent ) {
         super.handleJavaMouseEvent(mouseEvent);
@@ -522,6 +535,7 @@ public void handleJavaMouseEvent( MouseEvent mouseEvent ) {
     /**
      * return value from the scrollbar
      */
+    @Override
     public void notifyValue(XScrollbar obj, int type, int v, boolean isAdjusting) {
         if (obj == vsb) {
             scroll(-1, v, VERTICAL, type);
@@ -572,6 +586,7 @@ private Component getScrollChild() {
      * ToDo(aim): needs to query native motif for more accurate size and
      * color information.
      */
+    @Override
     @SuppressWarnings("deprecation")
     public void print(Graphics g) {
         ScrollPane sp = (ScrollPane)target;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
index 8fd97b45845..3ec52c8c4f0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java
@@ -858,13 +858,14 @@ protected Rectangle calculateThumbRect() {
         return retVal;
     }
 
+    @Override
     public String toString() {
         return getClass() + "[" + width + "x" + height + "," + barWidth + "x" + barLength + "]";
     }
 }
 
 
-class XScrollRepeater implements Runnable {
+final class XScrollRepeater implements Runnable {
     /**
      * Time to pause before the first scroll repeat.
      */
@@ -922,6 +923,7 @@ public synchronized void setScrollbar(XScrollbar sb) {
         newScroll = true;
     }
 
+    @Override
     public void run () {
         synchronized(this) {
             if (shouldSkip) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
index 48c6fc5a64d..05088daa8e7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbarPeer.java
@@ -32,7 +32,7 @@
 import sun.awt.OSInfo;
 import sun.util.logging.PlatformLogger;
 
-class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbarClient {
+final class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbarClient {
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XScrollbarPeer");
 
     private static final int DEFAULT_LENGTH = 50;
@@ -45,6 +45,7 @@ class XScrollbarPeer extends XComponentPeer implements ScrollbarPeer, XScrollbar
         DEFAULT_WIDTH_LINUX = XToolkit.getUIDefaults().getInt("ScrollBar.defaultWidth");
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void preInit(XCreateWindowParams params) {
         super.preInit(params);
@@ -87,6 +88,7 @@ private int getDefaultDimension() {
     /**
      * Compute the minimum size for the scrollbar.
      */
+    @Override
     public Dimension getMinimumSize() {
         Scrollbar sb = (Scrollbar)target;
         return (sb.getOrientation() == Scrollbar.VERTICAL)
@@ -104,6 +106,7 @@ void paintPeer(final Graphics g) {
         // paint the whole scrollbar
     }
 
+    @Override
     public void repaintScrollbarRequest(XScrollbar sb) {
      repaint();
     }
@@ -111,6 +114,7 @@ public void repaintScrollbarRequest(XScrollbar sb) {
     /**
      * The value has changed.
      */
+    @Override
     public void notifyValue(XScrollbar obj, int type, int value, boolean isAdjusting) {
         Scrollbar sb = (Scrollbar)target;
         sb.setValue(value);
@@ -128,6 +132,7 @@ public void notifyValue(XScrollbar obj, int type, int value, boolean isAdjusting
      * MouseEvent.MOUSE_EXITED
      * MouseEvent.MOUSE_DRAGGED
      */
+    @Override
     @SuppressWarnings("deprecation")
     public void handleJavaMouseEvent( MouseEvent mouseEvent ) {
         super.handleJavaMouseEvent(mouseEvent);
@@ -158,6 +163,7 @@ public void handleJavaMouseEvent( MouseEvent mouseEvent ) {
         }
     }
 
+    @Override
     public void handleJavaKeyEvent(KeyEvent event) {
         super.handleJavaKeyEvent(event);
         if (log.isLoggable(PlatformLogger.Level.FINER)) {
@@ -206,20 +212,24 @@ public void setValue(int value) {
         repaint();
     }
 
+    @Override
     public void setValues(int value, int visible, int minimum, int maximum) {
 
         tsb.setValues(value, visible, minimum, maximum);
         repaint();
     }
 
+    @Override
     public void setLineIncrement(int l) {
         tsb.setUnitIncrement(l);
     }
 
+    @Override
     public void setPageIncrement(int p) {
         tsb.setBlockIncrement(p);
     }
 
+    @Override
     public void layout() {
         super.layout();
         tsb.setSize(width, height);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
index 693970959be..ef43cb2d243 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
@@ -714,7 +714,8 @@ void unregisterOwnershipListener() {
         }
     }
 
-    private static class SelectionEventHandler implements XEventDispatcher {
+    private static final class SelectionEventHandler implements XEventDispatcher {
+        @Override
         public void dispatchEvent(XEvent ev) {
             switch (ev.get_type()) {
             case XConstants.SelectionNotify: {
@@ -769,7 +770,7 @@ public void dispatchEvent(XEvent ev) {
         }
     }
 
-    private static class IncrementalDataProvider implements XEventDispatcher {
+    private static final class IncrementalDataProvider implements XEventDispatcher {
         private final long requestor;
         private final long property;
         private final long target;
@@ -808,6 +809,7 @@ public IncrementalDataProvider(long requestor, long property,
             XToolkit.addEventDispatcher(requestor, this);
         }
 
+        @Override
         public void dispatchEvent(XEvent ev) {
             switch (ev.get_type()) {
             case XConstants.PropertyNotify:
@@ -855,7 +857,8 @@ public void dispatchEvent(XEvent ev) {
         }
     }
 
-    private static class IncrementalTransferHandler implements XEventDispatcher {
+    private static final class IncrementalTransferHandler implements XEventDispatcher {
+        @Override
         public void dispatchEvent(XEvent ev) {
             switch (ev.get_type()) {
             case XConstants.PropertyNotify:
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
index cdbb74ddac1..01c2ec22ca3 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
@@ -33,7 +33,7 @@
 import sun.awt.UNIXToolkit;
 import sun.util.logging.PlatformLogger;
 
-public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener {
+public final class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener {
     private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XSystemTrayPeer");
 
     SystemTray target;
@@ -70,6 +70,7 @@ public class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListener {
         }
     }
 
+    @Override
     public void ownerChanged(int screen, XMSelection sel, long newOwner, long data, long timestamp) {
         if (shouldDisableSystemTray) {
             return;
@@ -87,6 +88,7 @@ public void ownerChanged(int screen, XMSelection sel, long newOwner, long data,
         createTrayPeers();
     }
 
+    @Override
     public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
         if (shouldDisableSystemTray) {
             return;
@@ -102,9 +104,11 @@ public void ownerDeath(int screen, XMSelection sel, long deadOwner) {
         }
     }
 
+    @Override
     public void selectionChanged(int screen, XMSelection sel, long owner, XPropertyEvent event) {
     }
 
+    @Override
     public Dimension getTrayIconSize() {
         return new Dimension(XTrayIconPeer.TRAY_ICON_HEIGHT, XTrayIconPeer.TRAY_ICON_WIDTH);
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
index 68648059736..042a3e8ac21 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTextAreaPeer.java
@@ -1092,7 +1092,7 @@ protected void uninstallDefaults(JScrollPane c) {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    private static class AWTTextPane extends JScrollPane implements FocusListener {
+    private static final class AWTTextPane extends JScrollPane implements FocusListener {
 
         private final JTextArea jtext;
         private final XWindow xwin;
@@ -1189,7 +1189,7 @@ public void updateUI() {
     }
 
     @SuppressWarnings("serial") // JDK-implementation class
-    static class BevelBorder extends AbstractBorder implements UIResource {
+    static final class BevelBorder extends AbstractBorder implements UIResource {
         private Color darkShadow = SystemColor.controlDkShadow;
         private Color lightShadow = SystemColor.controlLtHighlight;
         private Color control = SystemColor.controlShadow;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
index 24ab05093c0..82dc03d54a0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java
@@ -39,15 +39,19 @@ private XToolkitThreadBlockedHandler() {}
     static ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler() {
         return priveleged_lock;
     }
+    @Override
     public void lock() {
         XToolkit.awtLock();
     }
+    @Override
     public void unlock() {
         XToolkit.awtUnlock();
     }
+    @Override
     public void enter() {
         tk.run(XToolkit.SECONDARY_LOOP);
     }
+    @Override
     public void exit() {
         XlibWrapper.ExitSecondaryLoop();
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
index bc08e2077dd..5928e9ef628 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java
@@ -29,7 +29,7 @@
 
 import jdk.internal.misc.Unsafe;
 
-public class XTranslateCoordinates {
+public final class XTranslateCoordinates {
         private static Unsafe unsafe = XlibWrapper.unsafe;
         private boolean __executed = false;
         long _scr_w;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
index 330f860efea..443d7ea7c1f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java
@@ -33,7 +33,7 @@
 import java.lang.reflect.InvocationTargetException;
 import sun.util.logging.PlatformLogger;
 
-public class XTrayIconPeer implements TrayIconPeer,
+public final class XTrayIconPeer implements TrayIconPeer,
        InfoWindow.Balloon.LiveArguments,
        InfoWindow.Tooltip.LiveArguments
 {
@@ -267,6 +267,7 @@ public void run() {
         addListeners();
     }
 
+    @Override
     public void dispose() {
         if (SunToolkit.isDispatchThreadForAppContext(target)) {
             disposeOnEDT();
@@ -310,14 +311,17 @@ public static void suppressWarningString(Window w) {
         AWTAccessor.getWindowAccessor().setTrayIconWindow(w, true);
     }
 
+    @Override
     public void setToolTip(String tooltip) {
         tooltipString = tooltip;
     }
 
+    @Override
     public String getTooltipString() {
         return tooltipString;
     }
 
+    @Override
     public void updateImage() {
         Runnable r = new Runnable() {
                 public void run() {
@@ -332,6 +336,7 @@ public void run() {
         }
     }
 
+    @Override
     public void displayMessage(String caption, String text, String messageType) {
         Point loc = getLocationOnScreen();
         Rectangle screen = eframe.getGraphicsConfiguration().getBounds();
@@ -345,6 +350,7 @@ public void displayMessage(String caption, String text, String messageType) {
     }
 
     // It's synchronized with disposal by EDT.
+    @Override
     public void showPopupMenu(int x, int y) {
         if (isDisposed())
             return;
@@ -405,6 +411,7 @@ private Point getLocationOnScreen() {
         return eframe.getLocationOnScreen();
     }
 
+    @Override
     public Rectangle getBounds() {
         Point loc = getLocationOnScreen();
         return new Rectangle(loc.x, loc.y, loc.x + TRAY_ICON_WIDTH, loc.y + TRAY_ICON_HEIGHT);
@@ -427,15 +434,17 @@ long getWindow() {
                           .<XEmbeddedFramePeer>getPeer(eframe).getWindow();
     }
 
+    @Override
     public boolean isDisposed() {
         return isDisposed;
     }
 
+    @Override
     public String getActionCommand() {
         return target.getActionCommand();
     }
 
-    static class TrayIconEventProxy implements MouseListener, MouseMotionListener {
+    static final class TrayIconEventProxy implements MouseListener, MouseMotionListener {
         XTrayIconPeer xtiPeer;
 
         TrayIconEventProxy(XTrayIconPeer xtiPeer) {
@@ -469,6 +478,7 @@ public void handleEvent(MouseEvent e) {
             e.setSource(xtiPeer.target);
             XToolkit.postEvent(XToolkit.targetToAppContext(e.getSource()), e);
         }
+        @Override
         @SuppressWarnings("deprecation")
         public void mouseClicked(MouseEvent e) {
             if ((e.getClickCount() == 1 || xtiPeer.balloon.isVisible()) &&
@@ -484,23 +494,29 @@ public void mouseClicked(MouseEvent e) {
             }
             handleEvent(e);
         }
+        @Override
         public void mouseEntered(MouseEvent e) {
             xtiPeer.tooltip.enter();
             handleEvent(e);
         }
+        @Override
         public void mouseExited(MouseEvent e) {
             xtiPeer.tooltip.exit();
             handleEvent(e);
         }
+        @Override
         public void mousePressed(MouseEvent e) {
             handleEvent(e);
         }
+        @Override
         public void mouseReleased(MouseEvent e) {
             handleEvent(e);
         }
+        @Override
         public void mouseDragged(MouseEvent e) {
             handleEvent(e);
         }
+        @Override
         public void mouseMoved(MouseEvent e) {
             handleEvent(e);
         }
@@ -511,20 +527,23 @@ public void mouseMoved(MouseEvent e) {
     // ***************************************
 
     @SuppressWarnings("serial") // JDK-implementation class
-    private static class XTrayIconEmbeddedFrame extends XEmbeddedFrame {
+    private static final class XTrayIconEmbeddedFrame extends XEmbeddedFrame {
         public XTrayIconEmbeddedFrame(){
             super(XToolkit.getDefaultRootWindow(), true, true);
         }
 
+        @Override
         public boolean isUndecorated() {
             return true;
         }
 
+        @Override
         public boolean isResizable() {
             return false;
         }
 
         // embedded frame for tray icon shouldn't be disposed by anyone except tray icon
+        @Override
         public void dispose(){
         }
 
@@ -538,7 +557,7 @@ public void realDispose(){
     // ***************************************
 
     @SuppressWarnings("serial") // JDK-implementation class
-    static class TrayIconCanvas extends IconCanvas {
+    static final class TrayIconCanvas extends IconCanvas {
         TrayIcon target;
         boolean autosize;
 
@@ -548,6 +567,7 @@ static class TrayIconCanvas extends IconCanvas {
         }
 
         // Invoke on EDT.
+        @Override
         protected void repaintImage(boolean doClear) {
             boolean old_autosize = autosize;
             autosize = target.isImageAutoSize();
@@ -558,6 +578,7 @@ protected void repaintImage(boolean doClear) {
             super.repaintImage(doClear || (old_autosize != autosize));
         }
 
+        @Override
         public void dispose() {
             super.dispose();
             target = null;
@@ -608,6 +629,7 @@ protected void repaintImage(boolean doClear) {
         }
 
         // Invoke on EDT.
+        @Override
         public void paint(Graphics g) {
             if (g != null && curW > 0 && curH > 0) {
                 BufferedImage bufImage = new BufferedImage(curW, curH, BufferedImage.TYPE_INT_ARGB);
@@ -627,7 +649,8 @@ public void paint(Graphics g) {
             }
         }
 
-        class IconObserver implements ImageObserver {
+        final class IconObserver implements ImageObserver {
+            @Override
             public boolean imageUpdate(final Image image, final int flags, int x, int y, int width, int height) {
                 if (image != IconCanvas.this.image || // if the image has been changed
                     !IconCanvas.this.isVisible())
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java b/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
index 9951161ee4d..4ecb86ea78a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XVerticalScrollbar.java
@@ -30,11 +30,12 @@
 /**
 * A simple vertical scroll bar.
 */
-class XVerticalScrollbar extends XScrollbar {
+final class XVerticalScrollbar extends XScrollbar {
     public XVerticalScrollbar(XScrollbarClient sb) {
         super(ALIGNMENT_VERTICAL, sb);
     }
 
+    @Override
     public void setSize(int width, int height) {
         super.setSize(width, height);
         this.barWidth = width;
@@ -43,16 +44,19 @@ public void setSize(int width, int height) {
         rebuildArrows();
     }
 
+    @Override
     protected void rebuildArrows() {
         firstArrow = createArrowShape(true, true);
         secondArrow = createArrowShape(true, false);
     }
 
+    @Override
     boolean beforeThumb(int x, int y) {
         Rectangle pos = calculateThumbRect();
         return (y < pos.y);
     }
 
+    @Override
     protected Rectangle getThumbArea() {
         return new Rectangle(2, getArrowAreaWidth(), width-4, height - 2*getArrowAreaWidth());
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java b/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
index c4f1f8ea8b3..5d0bd01084e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWINProtocol.java
@@ -29,7 +29,7 @@
 import java.awt.*;
 import sun.util.logging.PlatformLogger;
 
-class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
+final class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
     static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.XWINProtocol");
 
 /* Gnome WM spec  */
@@ -37,10 +37,12 @@ class XWINProtocol extends XProtocol implements XStateProtocol, XLayerProtocol {
     XAtom XA_WIN_PROTOCOLS = XAtom.get("_WIN_PROTOCOLS");
     XAtom XA_WIN_STATE = XAtom.get("_WIN_STATE");
 
+    @Override
     public boolean supportsState(int state) {
         return doStateProtocol();   // TODO - check for Frame constants
     }
 
+    @Override
     public void setState(XWindowPeer window, int state) {
         if (window.isShowing()) {
             /*
@@ -121,6 +123,7 @@ public void setState(XWindowPeer window, int state) {
         }
     }
 
+    @Override
     public int getState(XWindowPeer window) {
         long win_state = XA_WIN_STATE.getCard32Property(window);
         int java_state = Frame.NORMAL;
@@ -133,10 +136,12 @@ public int getState(XWindowPeer window) {
         return java_state;
     }
 
+    @Override
     public boolean isStateChange(XPropertyEvent e) {
         return doStateProtocol() && e.get_atom() == XA_WIN_STATE.getAtom();
     }
 
+    @Override
     public void unshadeKludge(XWindowPeer window) {
         long win_state = XA_WIN_STATE.getCard32Property(window);
         if ((win_state & WIN_STATE_SHADED) == 0) {
@@ -146,10 +151,12 @@ public void unshadeKludge(XWindowPeer window) {
         XA_WIN_STATE.setCard32Property(window, win_state);
     }
 
+    @Override
     public boolean supportsLayer(int layer) {
         return ((layer == LAYER_ALWAYS_ON_TOP) || (layer == LAYER_NORMAL)) && doLayerProtocol();
     }
 
+    @Override
     public void setLayer(XWindowPeer window, int layer) {
         if (window.isShowing()) {
             XClientMessageEvent req = new XClientMessageEvent();
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
index 0382a7b6caf..093479b999e 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
@@ -106,6 +106,7 @@ final class XWM
         CWM_WM = 14,
         MUTTER_WM = 15,
         UNITY_COMPIZ_WM = 16;
+    @Override
     public String toString() {
         switch  (WMID) {
           case NO_WM:
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
index 3c5dff2ec1c..78b14bc605d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java
@@ -189,6 +189,7 @@ protected void initGraphicsConfiguration() {
         graphicsConfigData = new AwtGraphicsConfigData(graphicsConfig.getAData());
     }
 
+    @Override
     void preInit(XCreateWindowParams params) {
         super.preInit(params);
         reparented = Boolean.TRUE.equals(params.get(REPARENTED));
@@ -254,6 +255,7 @@ void preInit(XCreateWindowParams params) {
         savedState = XUtilConstants.WithdrawnState;
     }
 
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
 
@@ -271,6 +273,7 @@ void postInit(XCreateWindowParams params) {
         }
     }
 
+    @Override
     public GraphicsConfiguration getGraphicsConfiguration() {
         if (graphicsConfig == null) {
             initGraphicsConfiguration();
@@ -342,6 +345,7 @@ boolean isParentOf(XWindow win) {
         return (parent == target);
     }
 
+    @Override
     public Object getTarget() {
         return target;
     }
@@ -384,6 +388,7 @@ Graphics getGraphics(SurfaceData surfData, Color afore, Color aback, Font afont)
         return new SunGraphics2D(surfData, fgColor, bgColor, font);
     }
 
+    @Override
     public Graphics getGraphics() {
         return getGraphics(surfaceData,
                            target.getForeground(),
@@ -533,6 +538,7 @@ public void paint(final Graphics g) {
     void paintPeer(final Graphics g) {
     }
     //used by Peers to avoid flickering within paint()
+    @Override
     protected void flush(){
         XToolkit.awtLock();
         try {
@@ -547,6 +553,7 @@ public void popup(int x, int y, int width, int height) {
         xSetBounds(x, y, width, height);
     }
 
+    @Override
     public void handleExposeEvent(XEvent xev) {
         super.handleExposeEvent(xev);
         XExposeEvent xe = xev.get_xexpose();
@@ -656,6 +663,7 @@ static int getMouseMovementSmudge() {
         return AWT_MULTICLICK_SMUDGE;
     }
 
+    @Override
     public void handleButtonPressRelease(XEvent xev) {
         super.handleButtonPressRelease(xev);
         XButtonEvent xbe = xev.get_xbutton();
@@ -779,6 +787,7 @@ public void handleButtonPressRelease(XEvent xev) {
         }
     }
 
+    @Override
     public void handleMotionNotify(XEvent xev) {
         super.handleMotionNotify(xev);
         XMotionEvent xme = xev.get_xmotion();
@@ -884,6 +893,7 @@ protected void leaveNotify(long window) {
         }
     }
 
+    @Override
     public void handleXCrossingEvent(XEvent xev) {
         super.handleXCrossingEvent(xev);
         XCrossingEvent xce = xev.get_xcrossing();
@@ -996,6 +1006,7 @@ public void handleXCrossingEvent(XEvent xev) {
 
     public void doLayout(int x, int y, int width, int height) {}
 
+    @Override
     public void handleConfigureNotifyEvent(XEvent xev) {
         Rectangle oldBounds = getBounds();
 
@@ -1020,6 +1031,7 @@ public void handleConfigureNotifyEvent(XEvent xev) {
 //  }
     }
 
+    @Override
     public void handleMapNotifyEvent(XEvent xev) {
         super.handleMapNotifyEvent(xev);
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
@@ -1034,6 +1046,7 @@ public void handleMapNotifyEvent(XEvent xev) {
         postEventToEventQueue(ce);
     }
 
+    @Override
     public void handleUnmapNotifyEvent(XEvent xev) {
         super.handleUnmapNotifyEvent(xev);
         if (isEventDisabled(xev)) {
@@ -1084,6 +1097,7 @@ void logIncomingKeyEvent(XKeyEvent ev) {
             keyEventLog.fine("XXXXXXXXXXXXXX javakeycode will be most probably:0x"+ Integer.toHexString(XKeysym.getJavaKeycodeOnly(ev)));
         }
     }
+    @Override
     public void handleKeyPress(XEvent xev) {
         super.handleKeyPress(xev);
         XKeyEvent ev = xev.get_xkey();
@@ -1193,6 +1207,7 @@ final void handleKeyPress(XKeyEvent ev) {
 
     }
 
+    @Override
     public void handleKeyRelease(XEvent xev) {
         super.handleKeyRelease(xev);
         XKeyEvent ev = xev.get_xkey();
@@ -1403,6 +1418,7 @@ final void doValidateSurface() {
         }
     }
 
+    @Override
     public SurfaceData getSurfaceData() {
         return surfaceData;
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
index 9e4270beb30..ccf8edc70d0 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowAttributesData.java
@@ -25,7 +25,7 @@
 package sun.awt.X11;
 import sun.awt.IconInfo;
 
-class XWindowAttributesData {
+final class XWindowAttributesData {
     static int NORMAL           = 0;
     static int ICONIC           = 1;
     static int MAXIMIZED        = 2;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
index cda05e0a6c7..f2b7efc978f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java
@@ -150,6 +150,7 @@ public final Window.Type getWindowType() {
      */
     private static final int MAXIMUM_BUFFER_LENGTH_NET_WM_ICON = (2<<15) - 1;
 
+    @Override
     void preInit(XCreateWindowParams params) {
         target = (Component)params.get(TARGET);
         windowType = ((Window)target).getType();
@@ -203,6 +204,7 @@ void preInit(XCreateWindowParams params) {
         ((X11GraphicsDevice)gc.getDevice()).addDisplayChangedListener(this);
     }
 
+    @Override
     protected String getWMName() {
         String name = target.getName();
         if (name == null || name.trim().isEmpty()) {
@@ -214,6 +216,7 @@ protected String getWMName() {
     private static native String getLocalHostname();
     private static native int getJvmPID();
 
+    @Override
     void postInit(XCreateWindowParams params) {
         super.postInit(params);
 
@@ -284,6 +287,7 @@ void postInit(XCreateWindowParams params) {
         // no need in updateOpaque() as it is no-op
     }
 
+    @Override
     public void updateIconImages() {
         Window target = (Window)this.target;
         java.util.List<Image> iconImages = target.getIconImages();
@@ -453,6 +457,7 @@ private void updateOpacity() {
         }
     }
 
+    @Override
     public void updateMinimumSize() {
         //This function only saves minimumSize value in XWindowPeer
         //Setting WMSizeHints is implemented in XDecoratedPeer
@@ -475,6 +480,7 @@ public XWindowPeer getOwnerPeer() {
     //Since events are not posted from Component.setBounds we need to send them here.
     //Note that this function is overridden in XDecoratedPeer so event
     //posting is not changing for decorated peers
+    @Override
     public void setBounds(int x, int y, int width, int height, int op) {
         XToolkit.awtLock();
         try {
@@ -516,6 +522,7 @@ void updateFocusability() {
         }
     }
 
+    @Override
     public Insets getInsets() {
         return new Insets(0, 0, 0, 0);
     }
@@ -717,6 +724,7 @@ public void run() {
      * From the DisplayChangedListener interface; called from
      * X11GraphicsDevice when the display mode has been changed.
      */
+    @Override
     public void displayChanged() {
         executeDisplayChangedOnEDT(getGraphicsConfiguration());
     }
@@ -725,6 +733,7 @@ public void displayChanged() {
      * From the DisplayChangedListener interface; top-levels do not need
      * to react to this event.
      */
+    @Override
     public void paletteChanged() {
     }
 
@@ -897,6 +906,7 @@ public void handleFocusEvent(XEvent xev) {
 
     void setSaveUnder(boolean state) {}
 
+    @Override
     public void toFront() {
         if (isOverrideRedirect() && mustControlStackPosition) {
             mustControlStackPosition = false;
@@ -914,6 +924,7 @@ public void toFront() {
         }
     }
 
+    @Override
     public void toBack() {
         XToolkit.awtLock();
         try {
@@ -1034,6 +1045,7 @@ private void updateAlwaysOnTop() {
                         XLayerProtocol.LAYER_NORMAL);
     }
 
+    @Override
     public void updateAlwaysOnTopState() {
         this.alwaysOnTop = ((Window) this.target).isAlwaysOnTop();
         if (ownerPeer != null) {
@@ -1049,6 +1061,7 @@ public void updateAlwaysOnTopState() {
         updateAlwaysOnTop();
     }
 
+    @Override
     boolean isLocationByPlatform() {
         return locationByPlatform;
     }
@@ -1068,6 +1081,7 @@ private void promoteDefaultPosition() {
         }
     }
 
+    @Override
     public void setVisible(boolean vis) {
         if (!isVisible() && vis) {
             isBeforeFirstMapNotify = true;
@@ -1174,6 +1188,7 @@ final boolean isOLWMDecorBug() {
             winAttr.nativeDecor == false;
     }
 
+    @Override
     public void dispose() {
         if (isGrabbed()) {
             if (grabLog.isLoggable(PlatformLogger.Level.FINE)) {
@@ -1208,10 +1223,12 @@ public void dispose() {
         }
     }
 
+    @Override
     boolean isResizable() {
         return winAttr.isResizable;
     }
 
+    @Override
     public void handleVisibilityEvent(XEvent xev) {
         super.handleVisibilityEvent(xev);
         XVisibilityEvent ve = xev.get_xvisibility();
@@ -1293,6 +1310,7 @@ private void removeStartupNotification() {
         }
     }
 
+    @Override
     public void handleMapNotifyEvent(XEvent xev) {
         removeStartupNotification();
 
@@ -1329,6 +1347,7 @@ public void handleMapNotifyEvent(XEvent xev) {
         }
     }
 
+    @Override
     public void handleUnmapNotifyEvent(XEvent xev) {
         super.handleUnmapNotifyEvent(xev);
 
@@ -1414,6 +1433,7 @@ boolean hasDecorations(int decor) {
         }
     }
 
+    @Override
     void setReparented(boolean newValue) {
         super.setReparented(newValue);
         XToolkit.awtLock();
@@ -1493,6 +1513,7 @@ static Vector<XWindowPeer> collectJavaToplevels() {
         return javaToplevels;
     }
 
+    @Override
     public void setModalBlocked(Dialog d, boolean blocked) {
         setModalBlocked(d, blocked, null);
     }
@@ -1980,6 +2001,7 @@ void removeRootPropertyEventDispatcher() {
             rootPropertyEventDispatcher = null;
         }
     }
+    @Override
     public void updateFocusableWindowState() {
         cachedFocusableWindow = isFocusableWindow();
     }
@@ -2000,6 +2022,7 @@ public void setNETWMState(XAtomList state) {
         }
     }
 
+    @Override
     public PropMwmHints getMWMHints() {
         if (mwm_hints == null) {
             mwm_hints = new PropMwmHints();
@@ -2010,6 +2033,7 @@ public PropMwmHints getMWMHints() {
         return mwm_hints;
     }
 
+    @Override
     public void setMWMHints(PropMwmHints hints) {
         mwm_hints = hints;
         if (hints != null) {
@@ -2046,6 +2070,7 @@ public boolean isGrabbed() {
         return grab && XAwtState.getGrabWindow() == this;
     }
 
+    @Override
     public void handleXCrossingEvent(XEvent xev) {
         XCrossingEvent xce = xev.get_xcrossing();
         if (grabLog.isLoggable(PlatformLogger.Level.FINE)) {
@@ -2074,6 +2099,7 @@ xce, isGrabbed(),
         super.handleXCrossingEvent(xev);
     }
 
+    @Override
     public void handleMotionNotify(XEvent xev) {
         XMotionEvent xme = xev.get_xmotion();
         if (grabLog.isLoggable(PlatformLogger.Level.FINER)) {
@@ -2135,6 +2161,7 @@ xme, isGrabbed(),
     // we use it to retarget mouse drag and mouse release during grab.
     private XBaseWindow pressTarget = this;
 
+    @Override
     public void handleButtonPressRelease(XEvent xev) {
         XButtonEvent xbe = xev.get_xbutton();
         /*
@@ -2269,6 +2296,7 @@ xbe, isGrabbed(),
         super.handleButtonPressRelease(xev);
     }
 
+    @Override
     public void print(Graphics g) {
         // We assume we print the whole frame,
         // so we expect no clip was set previously
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java b/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
index ab1f432b702..438053e6353 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWrapperBase.java
@@ -31,6 +31,7 @@
 abstract class XWrapperBase {
     static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.X11.wrappers");
 
+    @Override
     public String toString() {
         String ret = "";
 
@@ -62,6 +63,7 @@ String getWindow(long window) {
         }
     }
     public abstract long getPData();
+    @Override
     public XEvent clone() {
         long copy = XlibWrapper.unsafe.allocateMemory(getDataSize());
         XlibWrapper.unsafe.copyMemory(getPData(), copy, getDataSize());
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java b/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
index 7a005bcc8c5..c2cdfc0433c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibUtil.java
@@ -44,7 +44,7 @@
  * This class is a collection of utility methods that operate
  * with native windows.
  */
-public class XlibUtil
+public final class XlibUtil
 {
     /**
      * The constructor is made private to eliminate any
diff --git a/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
index e4eb2a1538f..48223e291e5 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java
@@ -44,10 +44,11 @@ public X11CustomCursor(Image cursor, Point hotSpot, String name)
         super(cursor, hotSpot, name);
     }
 
+    @Override
     protected void createNativeCursor(Image im, int[] pixels, int width, int height,
                                       int xHotSpot, int yHotSpot) {
 
-        class CCount implements Comparable<CCount> {
+        final class CCount implements Comparable<CCount> {
             int color;
             int count;
 
@@ -56,6 +57,7 @@ public CCount(int cl, int ct) {
                 count = ct;
             }
 
+            @Override
             public int compareTo(CCount cc) {
                 return cc.count - count;
             }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
index 26cf8fd6e05..1d0452128df 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11FontManager.java
@@ -673,6 +673,7 @@ protected void registerPlatformFontsUsedByFontConfiguration() {
     }
 
     // Implements SunGraphicsEnvironment.createFontConfiguration.
+    @Override
     protected FontConfiguration createFontConfiguration() {
         /* The logic here decides whether to use a preconfigured
          * fontconfig.properties file, or synthesise one using platform APIs.
@@ -697,6 +698,7 @@ protected FontConfiguration createFontConfiguration() {
         return mFontConfig;
     }
 
+    @Override
     public FontConfiguration
         createFontConfiguration(boolean preferLocaleFonts,
                                 boolean preferPropFonts) {
@@ -705,6 +707,7 @@ protected FontConfiguration createFontConfiguration() {
                                       preferLocaleFonts, preferPropFonts);
     }
 
+    @Override
     protected synchronized String getFontPath(boolean noType1Fonts) {
         isHeadless(); // make sure GE is inited, as its the X11 lock.
         return getFontPathNative(noType1Fonts, true);
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
index 9c7a7d5c376..e8b311aa25b 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsConfig.java
@@ -314,6 +314,7 @@ public long getAData() {
         return aData;
     }
 
+    @Override
     public String toString() {
         return ("X11GraphicsConfig[dev="+device+
                 ",vis=0x"+Integer.toHexString(visual)+
@@ -335,7 +336,7 @@ public final Rectangle getBounds() {
         return device.getBounds();
     }
 
-    private static class XDBECapabilities extends BufferCapabilities {
+    private static final class XDBECapabilities extends BufferCapabilities {
         public XDBECapabilities() {
             super(imageCaps, imageCaps, FlipContents.UNDEFINED);
         }
@@ -364,7 +365,7 @@ public boolean isDoubleBuffered() {
 
     private static native void dispose(long x11ConfigData);
 
-    private static class X11GCDisposerRecord implements DisposerRecord {
+    private static final class X11GCDisposerRecord implements DisposerRecord {
         private long x11ConfigData;
         public X11GCDisposerRecord(long x11CfgData) {
             this.x11ConfigData = x11CfgData;
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index a7ec9ccc9fd..77a67103fc3 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -605,6 +605,7 @@ public void removeDisplayChangedListener(DisplayChangedListener client) {
         topLevels.remove(client);
     }
 
+    @Override
     public String toString() {
         return ("X11GraphicsDevice[screen="+screen+"]");
     }
diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
index c24e311017e..c4076949c0d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java
@@ -179,6 +179,7 @@ public static boolean isXRenderVerbose() {
      */
     private static native void initDisplay(boolean glxRequested);
 
+    @Override
     protected native int getNumScreens();
 
     private native int getDefaultScreenNum();
@@ -267,6 +268,7 @@ protected GraphicsDevice makeScreenDevice(int screennum) {
                 "should not be called in this implementation");
     }
 
+    @Override
     public boolean isDisplayLocal() {
         if (isDisplayLocal == null) {
             SunToolkit.awtLock();
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
index fc88957fba8..86f0fd868f7 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java
@@ -54,6 +54,7 @@ public X11InputMethod() throws AWTException {
     /**
      * Reset the composition state to the current composition state.
      */
+    @Override
     protected void resetCompositionState() {
         if (compositionEnableSupported && haveActiveClient()) {
             try {
@@ -69,6 +70,7 @@ protected void resetCompositionState() {
     /**
      * Activate input method.
      */
+    @Override
     public synchronized void activate() {
         clientComponentWindow = getClientComponentWindow();
         if (clientComponentWindow == null)
@@ -120,6 +122,7 @@ public synchronized void activate() {
     /**
      * Deactivate input method.
      */
+    @Override
     public synchronized void deactivate(boolean isTemporary) {
         boolean   isAc =  haveActiveClient();
         /* Usually as the client component, let's call it component A,
@@ -157,6 +160,7 @@ public synchronized void deactivate(boolean isTemporary) {
     }
 
     // implements java.awt.im.spi.InputMethod.hideWindows
+    @Override
     public void hideWindows() {
         // ??? need real implementation
     }
@@ -174,6 +178,7 @@ public void hideWindows() {
     //       This functionality is implemented in a package-private method
     //       to insure that it cannot be overridden by client subclasses.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
+    @Override
     void dispatchComposedText(String chgText,
                                            int[] chgStyles,
                                            int chgOffset,
@@ -326,6 +331,7 @@ void dispatchComposedText(String chgText,
      * Subclasses should override disposeImpl() instead of dispose(). Client
      * code should always invoke dispose(), never disposeImpl().
      */
+    @Override
     protected synchronized void disposeImpl() {
         disposeXIC();
         awtLock();
@@ -340,6 +346,7 @@ protected synchronized void disposeImpl() {
     /**
      * @see java.awt.im.spi.InputMethod#setCompositionEnabled(boolean)
      */
+    @Override
     public void setCompositionEnabled(boolean enable) {
         /* If the composition state is successfully changed, set
            the savedCompositionState to 'enable'. Otherwise, simply
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
index b9267e02998..32067b6b6cb 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java
@@ -172,6 +172,7 @@ public X11InputMethodBase() throws AWTException {
         }
     }
 
+    @Override
     @SuppressWarnings("removal")
     protected void finalize() throws Throwable {
         dispose();
@@ -202,6 +203,7 @@ protected abstract void setXICFocus(ComponentPeer peer,
      *
      * @see java.awt.im.spi.InputMethod#setInputMethodContext
      */
+    @Override
     public void setInputMethodContext(InputMethodContext context) {
     }
 
@@ -212,6 +214,7 @@ public void setInputMethodContext(InputMethodContext context) {
      * @param lang locale to input
      * @return the true is returned when specified locale is supported.
      */
+    @Override
     public boolean setLocale(Locale lang) {
         if (lang.equals(locale)) {
             return true;
@@ -227,6 +230,7 @@ public boolean setLocale(Locale lang) {
     /**
      * Returns current input locale.
      */
+    @Override
     public Locale getLocale() {
         return locale;
     }
@@ -236,6 +240,7 @@ public Locale getLocale() {
      *
      * @see java.awt.im.spi.InputMethod#setCharacterSubsets
      */
+    @Override
     public void setCharacterSubsets(Subset[] subsets) {
     }
 
@@ -246,6 +251,7 @@ public void setCharacterSubsets(Subset[] subsets) {
      *
      * @param e event
      */
+    @Override
     public void dispatchEvent(AWTEvent e) {
     }
 
@@ -292,6 +298,7 @@ protected boolean getCompositionState() {
     /**
      * Activate input method.
      */
+    @Override
     public abstract void activate();
 
     protected abstract boolean createXIC();
@@ -299,12 +306,14 @@ protected boolean getCompositionState() {
     /**
      * Deactivate input method.
      */
+    @Override
     public abstract void deactivate(boolean isTemporary);
 
     /**
      * Explicitly disable the native IME. Native IME is not disabled when
      * deactivate is called.
      */
+    @Override
     public void disableInputMethod() {
         if (lastXICFocussedComponent != null) {
             setXICFocus(getPeer(lastXICFocussedComponent), false, isLastXICActive);
@@ -318,6 +327,7 @@ public void disableInputMethod() {
     }
 
     // implements java.awt.im.spi.InputMethod.hideWindows
+    @Override
     public abstract void hideWindows();
 
     /**
@@ -342,6 +352,7 @@ public void disableInputMethod() {
     /**
      * @see sun.awt.im.InputMethodAdapter#setAWTFocussedComponent
      */
+    @Override
     protected void setAWTFocussedComponent(Component component) {
         if (component == null) {
             return;
@@ -359,6 +370,7 @@ protected void setAWTFocussedComponent(Component component) {
     /**
      * @see sun.awt.im.InputMethodAdapter#stopListening
      */
+    @Override
     protected void stopListening() {
         // It is desirable to disable XIM by calling XSetICValues with
         // XNPreeditState == XIMPreeditDisable.  But Solaris 2.6 and
@@ -535,6 +547,7 @@ void flushText() {
      *
      * @see java.awt.im.spi.InputMethod#dispose
      */
+    @Override
     public final void dispose() {
         boolean call_disposeImpl = false;
 
@@ -556,6 +569,7 @@ public final void dispose() {
      *
      * @see java.awt.im.spi.InputMethod#getControlObject
      */
+    @Override
     public Object getControlObject() {
         return null;
     }
@@ -563,6 +577,7 @@ public Object getControlObject() {
     /**
      * @see java.awt.im.spi.InputMethod#removeNotify
      */
+    @Override
     public synchronized void removeNotify() {
         dispose();
     }
@@ -570,11 +585,13 @@ public synchronized void removeNotify() {
     /**
      * @see java.awt.im.spi.InputMethod#setCompositionEnabled(boolean)
      */
+    @Override
     public abstract void setCompositionEnabled(boolean enable);
 
     /**
      * @see java.awt.im.spi.InputMethod#isCompositionEnabled
      */
+    @Override
     public boolean isCompositionEnabled() {
         /* isCompositionEnabledNative may throw UnsupportedOperationException.
            Don't try to catch it since this method may be called by clients.
@@ -597,6 +614,7 @@ public boolean isCompositionEnabled() {
      * saved to a file or copied to the clipboard.
      *
      */
+    @Override
     public void endComposition() {
         if (disposed) {
             return;
@@ -664,6 +682,7 @@ public void endComposition() {
      * $HOME/.dtprofile when you run these two commands.
      *
      */
+    @Override
     public String getNativeInputMethodInfo() {
         String xmodifiers = System.getenv("XMODIFIERS");
         String imInfo = null;
@@ -786,6 +805,7 @@ int getOffset() {
             return index;
         }
 
+        @Override
         public String toString() {
             StringBuilder s = new StringBuilder();
             for (int i = 0; i < size;) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
index ef6bf091860..305d513de6d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodDescriptor.java
@@ -52,6 +52,7 @@ public X11InputMethodDescriptor() {
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#getAvailableLocales
      */
+    @Override
     public Locale[] getAvailableLocales() {
         Locale[] locales = {locale};
         return locales;
@@ -60,6 +61,7 @@ public Locale[] getAvailableLocales() {
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#hasDynamicLocaleList
      */
+    @Override
     public boolean hasDynamicLocaleList() {
         return false;
     }
@@ -67,6 +69,7 @@ public boolean hasDynamicLocaleList() {
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#getInputMethodDisplayName
      */
+    @Override
     public synchronized String getInputMethodDisplayName(Locale inputLocale, Locale displayLanguage) {
         // We ignore the input locale.
         // When displaying for the default locale, rely on the localized AWT properties;
@@ -81,6 +84,7 @@ public synchronized String getInputMethodDisplayName(Locale inputLocale, Locale
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#getInputMethodIcon
      */
+    @Override
     public Image getInputMethodIcon(Locale inputLocale) {
         return null;
     }
@@ -88,6 +92,7 @@ public Image getInputMethodIcon(Locale inputLocale) {
     /**
      * @see java.awt.im.spi.InputMethodDescriptor#createInputMethod
      */
+    @Override
     public abstract InputMethod createInputMethod() throws Exception;
 
     /**
diff --git a/src/java.desktop/unix/classes/sun/awt/XSettings.java b/src/java.desktop/unix/classes/sun/awt/XSettings.java
index 86fb8261bef..b36475c5cc1 100644
--- a/src/java.desktop/unix/classes/sun/awt/XSettings.java
+++ b/src/java.desktop/unix/classes/sun/awt/XSettings.java
@@ -58,7 +58,7 @@ public Map<String, Object> update(byte[] data) {
     /**
      * TBS ...
      */
-    class Update {
+    final class Update {
 
         /* byte order mark */
         private static final int LITTLE_ENDIAN = 0;
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
index 48fb20c69ba..4065fd04b93 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
@@ -46,7 +46,7 @@
  * org.freedesktop.portal.ScreenCast API</a>
  */
 
-public class ScreencastHelper {
+public final class ScreencastHelper {
 
     static final boolean SCREENCAST_DEBUG;
     private static final boolean IS_NATIVE_LOADED;
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
index 0db18c9c3b7..8f712e1d192 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
@@ -176,7 +176,7 @@ private static boolean setFilePermission(Path path) {
         return false;
     }
 
-    private static class WatcherThread extends Thread {
+    private static final class WatcherThread extends Thread {
         private final WatchService watcher;
 
         public WatcherThread(WatchService watchService) {

From 74f047b84d949891fb72e2f1c9eca7b0b4bd22c4 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Sun, 11 May 2025 22:40:29 +0000
Subject: [PATCH 389/901] 8356224: JFR: Default value of @Registered is ignored

Reviewed-by: mgronlun
---
 .../jfrEventClassTransformer.cpp              | 16 ++--
 .../jdk/jfr/internal/ClassInspector.java      | 79 +++++++++--------
 .../TestOverrideWithDefaultValue.java         | 86 +++++++++++++++++++
 3 files changed, 141 insertions(+), 40 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/api/metadata/annotations/TestOverrideWithDefaultValue.java

diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
index 5e4e4a5cf5f..52d7280716a 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
@@ -369,7 +369,7 @@ class AnnotationIterator : public StackObj {
 };
 
 static const char value_name[] = "value";
-static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_type, bool& value) {
+static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_type, bool default_value, bool& value) {
   assert(annotation_type != nullptr, "invariant");
   AnnotationArray* class_annotations = ik->class_annotations();
   if (class_annotations == nullptr) {
@@ -385,6 +385,12 @@ static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_typ
         SymbolTable::probe(value_name, sizeof value_name - 1);
       assert(value_symbol != nullptr, "invariant");
       const AnnotationElementIterator element_iterator = annotation_iterator.elements();
+      if (!element_iterator.has_next()) {
+        // Default values are not stored in the annotation element, so if the
+        // element-value pair is empty, return the default value.
+        value = default_value;
+        return true;
+      }
       while (element_iterator.has_next()) {
         element_iterator.move_to_next();
         if (value_symbol == element_iterator.name()) {
@@ -402,15 +408,15 @@ static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_typ
 // Evaluate to the value of the first found Symbol* annotation type.
 // Searching moves upwards in the klass hierarchy in order to support
 // inherited annotations in addition to the ability to override.
-static bool annotation_value(const InstanceKlass* ik, const Symbol* annotation_type, bool& value) {
+static bool annotation_value(const InstanceKlass* ik, const Symbol* annotation_type, bool default_value, bool& value) {
   assert(ik != nullptr, "invariant");
   assert(annotation_type != nullptr, "invariant");
   assert(JdkJfrEvent::is_a(ik), "invariant");
-  if (has_annotation(ik, annotation_type, value)) {
+  if (has_annotation(ik, annotation_type, default_value, value)) {
     return true;
   }
   InstanceKlass* const super = InstanceKlass::cast(ik->super());
-  return super != nullptr && JdkJfrEvent::is_a(super) ? annotation_value(super, annotation_type, value) : false;
+  return super != nullptr && JdkJfrEvent::is_a(super) ? annotation_value(super, annotation_type, default_value, value) : false;
 }
 
 static const char jdk_jfr_module_name[] = "jdk.jfr";
@@ -469,7 +475,7 @@ static bool should_register_klass(const InstanceKlass* ik, bool& untypedEventHan
   }
   assert(registered_symbol != nullptr, "invariant");
   bool value = false; // to be set by annotation_value
-  untypedEventHandler = !(annotation_value(ik, registered_symbol, value) || java_base_can_read_jdk_jfr());
+  untypedEventHandler = !(annotation_value(ik, registered_symbol, true, value) || java_base_can_read_jdk_jfr());
   return value;
 }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
index e7e0eac54ff..d310c505da6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
@@ -30,6 +30,7 @@
 import java.lang.classfile.AnnotationElement;
 import java.lang.classfile.AnnotationValue;
 import java.lang.classfile.Attribute;
+import java.lang.classfile.Attributes;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.FieldModel;
@@ -63,6 +64,7 @@ final class ClassInspector {
     private static final ClassDesc ANNOTATION_NAME = classDesc(Name.class);
     private static final ClassDesc ANNOTATION_ENABLED = classDesc(Enabled.class);
     private static final ClassDesc ANNOTATION_REMOVE_FIELDS = classDesc(RemoveFields.class);
+    private static final String[] EMPTY_STRING_ARRAY = {};
 
     private final ClassModel classModel;
     private final Class<?> superClass;
@@ -104,12 +106,12 @@ MethodDesc findStaticCommitMethod() {
     }
 
     String getEventName() {
-        String name = annotationValue(ANNOTATION_NAME, String.class);
+        String name = annotationValue(ANNOTATION_NAME, String.class, null);
         return name == null ? getClassName() : name;
     }
 
     boolean isRegistered() {
-        Boolean result = annotationValue(ANNOTATION_REGISTERED, Boolean.class);
+        Boolean result = annotationValue(ANNOTATION_REGISTERED, Boolean.class, true);
         if (result != null) {
             return result.booleanValue();
         }
@@ -123,7 +125,7 @@ boolean isRegistered() {
     }
 
     boolean isEnabled() {
-        Boolean result = annotationValue(ANNOTATION_ENABLED, Boolean.class);
+        Boolean result = annotationValue(ANNOTATION_ENABLED, Boolean.class, true);
         if (result != null) {
             return result.booleanValue();
         }
@@ -201,52 +203,59 @@ private ImplicitFields determineImplicitFields() {
             }
         }
         ImplicitFields ifs = new ImplicitFields(superClass);
-        String[] value = annotationValue(ANNOTATION_REMOVE_FIELDS, String[].class);
+        String[] value = annotationValue(ANNOTATION_REMOVE_FIELDS, String[].class, EMPTY_STRING_ARRAY);
         if (value != null) {
             ifs.removeFields(value);
         }
         return ifs;
     }
 
-    private List<AnnotationValue> getAnnotationValues(ClassDesc classDesc) {
-        List<AnnotationValue> list = new ArrayList<>();
-        for (Attribute<?> attribute: classModel.attributes()) {
-            if (attribute instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
-                for (Annotation a : rvaa.annotations()) {
-                    if (a.classSymbol().equals(classDesc) && a.elements().size() == 1) {
-                        AnnotationElement ae = a.elements().getFirst();
-                        if (ae.name().equalsString("value")) {
-                            list.add(ae.value());
-                        }
-                    }
+    private Annotation getFirstAnnotation(ClassDesc classDesc) {
+        for (RuntimeVisibleAnnotationsAttribute attribute : classModel.findAttributes(Attributes.runtimeVisibleAnnotations())) {
+            for (Annotation a : attribute.annotations()) {
+                if (a.classSymbol().equals(classDesc)) {
+                    return a;
                 }
             }
         }
-        return list;
+        return null;
     }
 
     @SuppressWarnings("unchecked")
     // Only supports String, String[] and Boolean values
-    private <T> T annotationValue(ClassDesc classDesc, Class<T> type) {
-        for (AnnotationValue a : getAnnotationValues(classDesc)) {
-            if (a instanceof AnnotationValue.OfBoolean ofb && type.equals(Boolean.class)) {
-                Boolean b = ofb.booleanValue();
-                return (T) b;
-            }
-            if (a instanceof AnnotationValue.OfString ofs && type.equals(String.class)) {
-                String s = ofs.stringValue();
-                return (T) s;
-            }
-            if (a instanceof AnnotationValue.OfArray ofa && type.equals(String[].class)) {
-                List<AnnotationValue> list = ofa.values();
-                String[] array = new String[list.size()];
-                int index = 0;
-                for (AnnotationValue av : list) {
-                    var avs = (AnnotationValue.OfString) av;
-                    array[index++] = avs.stringValue();
-                }
-                return (T) array;
+    private <T> T annotationValue(ClassDesc classDesc, Class<T> type, T defaultValue) {
+        Annotation annotation = getFirstAnnotation(classDesc);
+        if (annotation == null) {
+            return null;
+        }
+        // Default values are not stored in the annotation element, so if the
+        // element-value pair is empty, return the default value.
+        if (annotation.elements().isEmpty()) {
+            return defaultValue;
+        }
+
+        AnnotationElement ae = annotation.elements().getFirst();
+        if (!ae.name().equalsString("value")) {
+            return null;
+        }
+        AnnotationValue a = ae.value();
+        if (a instanceof AnnotationValue.OfBoolean ofb && type.equals(Boolean.class)) {
+            Boolean b = ofb.booleanValue();
+            return (T) b;
+        }
+        if (a instanceof AnnotationValue.OfString ofs && type.equals(String.class)) {
+            String s = ofs.stringValue();
+            return (T) s;
+        }
+        if (a instanceof AnnotationValue.OfArray ofa && type.equals(String[].class)) {
+            List<AnnotationValue> list = ofa.values();
+            String[] array = new String[list.size()];
+            int index = 0;
+            for (AnnotationValue av : list) {
+                var avs = (AnnotationValue.OfString) av;
+                array[index++] = avs.stringValue();
             }
+            return (T) array;
         }
         return null;
     }
diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestOverrideWithDefaultValue.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestOverrideWithDefaultValue.java
new file mode 100644
index 00000000000..d0e6f007983
--- /dev/null
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestOverrideWithDefaultValue.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.
+ */
+
+package jdk.jfr.api.metadata.annotations;
+
+import java.io.IOException;
+import java.util.List;
+
+import jdk.jfr.Enabled;
+import jdk.jfr.Event;
+import jdk.jfr.Recording;
+import jdk.jfr.Registered;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that annotations can be overridden with the default value.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.metadata.annotations.TestOverrideWithDefaultValue
+ */
+public class TestOverrideWithDefaultValue {
+
+    @Enabled(false)
+    static class Mammal extends Event {
+    }
+
+    @Enabled
+    static class Cat extends Mammal {
+    }
+
+    @Registered(false)
+    static class Animal extends Event {
+    }
+
+    @Registered
+    static class Dog extends Animal {
+    }
+
+    public static void main(String[] args) throws IOException {
+        testEnabled();
+        testRegistered();
+    }
+
+    private static void testEnabled() throws IOException {
+        try (Recording r = new Recording()) {
+            r.start();
+            Cat cat = new Cat();
+            cat.commit();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            Events.hasEvents(events);
+        }
+    }
+
+    private static void testRegistered() throws IOException {
+        try (Recording r = new Recording()) {
+            r.start();
+            Dog dog = new Dog();
+            dog.commit();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            Events.hasEvents(events);
+        }
+    }
+}

From d7cb933b89839b692f5562aeeb92076cd25a99f6 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Mon, 12 May 2025 03:01:46 +0000
Subject: [PATCH 390/901] 8356593: RISC-V: Small improvement to array fill stub

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 77 +++++++++++--------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index fb4539267ae..7187315f008 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2029,44 +2029,40 @@ class StubGenerator: public StubCodeGenerator {
 
     __ enter();
 
-    Label L_fill_elements, L_exit1;
+    Label L_fill_elements;
 
     int shift = -1;
     switch (t) {
       case T_BYTE:
         shift = 0;
+        // Short arrays (< 8 bytes) fill by element
+        __ mv(tmp_reg, 8 >> shift);
+        __ bltu(count, tmp_reg, L_fill_elements);
 
         // Zero extend value
         // 8 bit -> 16 bit
         __ zext(value, value, 8);
-        __ mv(tmp_reg, value);
-        __ slli(tmp_reg, tmp_reg, 8);
+        __ slli(tmp_reg, value, 8);
         __ orr(value, value, tmp_reg);
 
         // 16 bit -> 32 bit
-        __ mv(tmp_reg, value);
-        __ slli(tmp_reg, tmp_reg, 16);
+        __ slli(tmp_reg, value, 16);
         __ orr(value, value, tmp_reg);
-
-        __ mv(tmp_reg, 8 >> shift); // Short arrays (< 8 bytes) fill by element
-        __ bltu(count, tmp_reg, L_fill_elements);
         break;
       case T_SHORT:
         shift = 1;
+        // Short arrays (< 8 bytes) fill by element
+        __ mv(tmp_reg, 8 >> shift);
+        __ bltu(count, tmp_reg, L_fill_elements);
+
         // Zero extend value
         // 16 bit -> 32 bit
         __ zext(value, value, 16);
-        __ mv(tmp_reg, value);
-        __ slli(tmp_reg, tmp_reg, 16);
+        __ slli(tmp_reg, value, 16);
         __ orr(value, value, tmp_reg);
-
-        // Short arrays (< 8 bytes) fill by element
-        __ mv(tmp_reg, 8 >> shift);
-        __ bltu(count, tmp_reg, L_fill_elements);
         break;
       case T_INT:
         shift = 2;
-
         // Short arrays (< 8 bytes) fill by element
         __ mv(tmp_reg, 8 >> shift);
         __ bltu(count, tmp_reg, L_fill_elements);
@@ -2125,20 +2121,8 @@ class StubGenerator: public StubCodeGenerator {
       __ fill_words(to, cnt_words, value);
     }
 
-    // Remaining count is less than 8 bytes. Fill it by a single store.
-    // Note that the total length is no less than 8 bytes.
-    if (!AvoidUnalignedAccesses && (t == T_BYTE || t == T_SHORT)) {
-      __ beqz(count, L_exit1);
-      __ shadd(to, count, to, tmp_reg, shift); // points to the end
-      __ sd(value, Address(to, -8)); // overwrite some elements
-      __ bind(L_exit1);
-      __ leave();
-      __ ret();
-    }
-
-    // Handle copies less than 8 bytes.
-    Label L_fill_2, L_fill_4, L_exit2;
-    __ bind(L_fill_elements);
+    // Remaining count is less than 8 bytes and address is heapword aligned.
+    Label L_fill_2, L_fill_4, L_exit1;
     switch (t) {
       case T_BYTE:
         __ test_bit(t0, count, 0);
@@ -2152,7 +2136,7 @@ class StubGenerator: public StubCodeGenerator {
         __ addi(to, to, 2);
         __ bind(L_fill_4);
         __ test_bit(t0, count, 2);
-        __ beqz(t0, L_exit2);
+        __ beqz(t0, L_exit1);
         __ sw(value, Address(to, 0));
         break;
       case T_SHORT:
@@ -2162,11 +2146,39 @@ class StubGenerator: public StubCodeGenerator {
         __ addi(to, to, 2);
         __ bind(L_fill_4);
         __ test_bit(t0, count, 1);
-        __ beqz(t0, L_exit2);
+        __ beqz(t0, L_exit1);
         __ sw(value, Address(to, 0));
         break;
       case T_INT:
-        __ beqz(count, L_exit2);
+        __ beqz(count, L_exit1);
+        __ sw(value, Address(to, 0));
+        break;
+      default: ShouldNotReachHere();
+    }
+    __ bind(L_exit1);
+    __ leave();
+    __ ret();
+
+    // Handle copies less than 8 bytes.
+    Label L_loop1, L_loop2, L_exit2;
+    __ bind(L_fill_elements);
+    __ beqz(count, L_exit2);
+    switch (t) {
+      case T_BYTE:
+        __ bind(L_loop1);
+        __ sb(value, Address(to, 0));
+        __ addi(to, to, 1);
+        __ subiw(count, count, 1);
+        __ bnez(count, L_loop1);
+        break;
+      case T_SHORT:
+        __ bind(L_loop2);
+        __ sh(value, Address(to, 0));
+        __ addi(to, to, 2);
+        __ subiw(count, count, 2 >> shift);
+        __ bnez(count, L_loop2);
+        break;
+      case T_INT:
         __ sw(value, Address(to, 0));
         break;
       default: ShouldNotReachHere();
@@ -2174,6 +2186,7 @@ class StubGenerator: public StubCodeGenerator {
     __ bind(L_exit2);
     __ leave();
     __ ret();
+
     return start;
   }
 

From de801fea76b1328f3bda503088618162388eb119 Mon Sep 17 00:00:00 2001
From: Hannes Greule <hgreule@openjdk.org>
Date: Mon, 12 May 2025 06:43:52 +0000
Subject: [PATCH 391/901] 8353551: C2: Constant folding for ReverseBytes nodes

Reviewed-by: epeter, vlivanov
---
 src/hotspot/share/opto/subnode.cpp            |  21 ++
 src/hotspot/share/opto/subnode.hpp            |  24 ++-
 .../c2/gvn/ReverseBytesConstantsTests.java    | 198 ++++++++++++++++++
 3 files changed, 235 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/gvn/ReverseBytesConstantsTests.java

diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index d1384384101..d385e8b41aa 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -2021,6 +2021,27 @@ const Type* SqrtHFNode::Value(PhaseGVN* phase) const {
   return TypeH::make((float)sqrt((double)f));
 }
 
+static const Type* reverse_bytes(int opcode, const Type* con) {
+  switch (opcode) {
+    case Op_ReverseBytesS:  return TypeInt::make(byteswap(checked_cast<jshort>(con->is_int()->get_con())));
+    case Op_ReverseBytesUS: return TypeInt::make(byteswap(checked_cast<jchar>(con->is_int()->get_con())));
+    case Op_ReverseBytesI:  return TypeInt::make(byteswap(checked_cast<jint>(con->is_int()->get_con())));
+    case Op_ReverseBytesL:  return TypeLong::make(byteswap(checked_cast<jlong>(con->is_long()->get_con())));
+    default: ShouldNotReachHere();
+  }
+}
+
+const Type* ReverseBytesNode::Value(PhaseGVN* phase) const {
+  const Type* type = phase->type(in(1));
+  if (type == Type::TOP) {
+    return Type::TOP;
+  }
+  if (type->singleton()) {
+    return reverse_bytes(Opcode(), type);
+  }
+  return bottom_type();
+}
+
 const Type* ReverseINode::Value(PhaseGVN* phase) const {
   const Type *t1 = phase->type( in(1) );
   if (t1 == Type::TOP) {
diff --git a/src/hotspot/share/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp
index 0899a2c13fc..9a411f3d20e 100644
--- a/src/hotspot/share/opto/subnode.hpp
+++ b/src/hotspot/share/opto/subnode.hpp
@@ -561,11 +561,19 @@ class SqrtHFNode : public Node {
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
+
+class ReverseBytesNode : public InvolutionNode {
+public:
+  ReverseBytesNode(Node* in) : InvolutionNode(in) {}
+  virtual const Type* Value(PhaseGVN* phase) const;
+};
 //-------------------------------ReverseBytesINode--------------------------------
 // reverse bytes of an integer
-class ReverseBytesINode : public InvolutionNode {
+class ReverseBytesINode : public ReverseBytesNode {
 public:
-  ReverseBytesINode(Node* in) : InvolutionNode(in) {}
+  ReverseBytesINode(Node* in) : ReverseBytesNode(in) {
+  }
+
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
@@ -573,9 +581,9 @@ class ReverseBytesINode : public InvolutionNode {
 
 //-------------------------------ReverseBytesLNode--------------------------------
 // reverse bytes of a long
-class ReverseBytesLNode : public InvolutionNode {
+class ReverseBytesLNode : public ReverseBytesNode {
 public:
-  ReverseBytesLNode(Node* in) : InvolutionNode(in) {}
+  ReverseBytesLNode(Node* in) : ReverseBytesNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
@@ -583,9 +591,9 @@ class ReverseBytesLNode : public InvolutionNode {
 
 //-------------------------------ReverseBytesUSNode--------------------------------
 // reverse bytes of an unsigned short / char
-class ReverseBytesUSNode : public InvolutionNode {
+class ReverseBytesUSNode : public ReverseBytesNode {
 public:
-  ReverseBytesUSNode(Node* in1) : InvolutionNode(in1) {}
+  ReverseBytesUSNode(Node* in1) : ReverseBytesNode(in1) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::CHAR; }
   virtual uint ideal_reg() const { return Op_RegI; }
@@ -593,9 +601,9 @@ class ReverseBytesUSNode : public InvolutionNode {
 
 //-------------------------------ReverseBytesSNode--------------------------------
 // reverse bytes of a short
-class ReverseBytesSNode : public InvolutionNode {
+class ReverseBytesSNode : public ReverseBytesNode {
 public:
-  ReverseBytesSNode(Node* in) : InvolutionNode(in) {}
+  ReverseBytesSNode(Node* in) : ReverseBytesNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::SHORT; }
   virtual uint ideal_reg() const { return Op_RegI; }
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/ReverseBytesConstantsTests.java b/test/hotspot/jtreg/compiler/c2/gvn/ReverseBytesConstantsTests.java
new file mode 100644
index 00000000000..13461771cc9
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/ReverseBytesConstantsTests.java
@@ -0,0 +1,198 @@
+/*
+ * 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.gvn;
+
+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 8353551
+ * @summary Test that ReverseBytes operations constant-fold.
+ * @library /test/lib /
+ * @run driver compiler.c2.gvn.ReverseBytesConstantsTests
+ */
+public class ReverseBytesConstantsTests {
+
+    private static final RestrictableGenerator<Integer> GEN_CHAR = Generators.G.safeRestrict(Generators.G.ints(), Character.MIN_VALUE, Character.MAX_VALUE);
+    private static final char C_CHAR = (char) GEN_CHAR.next().intValue();
+    private static final RestrictableGenerator<Integer> GEN_SHORT = Generators.G.safeRestrict(Generators.G.ints(), Short.MIN_VALUE, Short.MAX_VALUE);
+    private static final short C_SHORT = GEN_SHORT.next().shortValue();
+    private static final RestrictableGenerator<Long> GEN_LONG = Generators.G.longs();
+    private static final long C_LONG = GEN_LONG.next();
+    private static final RestrictableGenerator<Integer> GEN_INT = Generators.G.ints();
+    private static final int C_INT = GEN_INT.next();
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = {
+        "testI1", "testI2", "testI3",
+        "testL1", "testL2", "testL3",
+        "testS1", "testS2", "testS3",
+        "testUS1", "testUS2", "testUS3",
+    })
+    public void runMethod() {
+        assertResultI();
+        assertResultL();
+        assertResultS();
+        assertResultUS();
+    }
+
+    @DontCompile
+    public void assertResultI() {
+        Asserts.assertEQ(Integer.reverseBytes(0x04030201), testI1());
+        Asserts.assertEQ(Integer.reverseBytes(0x50607080), testI2());
+        Asserts.assertEQ(Integer.reverseBytes(0x80706050), testI3());
+        Asserts.assertEQ(Integer.reverseBytes(C_INT), testI4());
+    }
+
+    @DontCompile
+    public void assertResultL() {
+        Asserts.assertEQ(Long.reverseBytes(0x0807060504030201L), testL1());
+        Asserts.assertEQ(Long.reverseBytes(0x1020304050607080L), testL2());
+        Asserts.assertEQ(Long.reverseBytes(0x8070605040302010L), testL3());
+        Asserts.assertEQ(Long.reverseBytes(C_LONG), testL4());
+    }
+
+    @DontCompile
+    public void assertResultS() {
+        Asserts.assertEQ(Short.reverseBytes((short) 0x0201), testS1());
+        Asserts.assertEQ(Short.reverseBytes((short) 0x7080), testS2());
+        Asserts.assertEQ(Short.reverseBytes((short) 0x8070), testS3());
+        Asserts.assertEQ(Short.reverseBytes(C_SHORT), testS4());
+    }
+
+    @DontCompile
+    public void assertResultUS() {
+        Asserts.assertEQ(Character.reverseBytes((char) 0x0201), testUS1());
+        Asserts.assertEQ(Character.reverseBytes((char) 0x7080), testUS2());
+        Asserts.assertEQ(Character.reverseBytes((char) 0x8070), testUS3());
+        Asserts.assertEQ(Character.reverseBytes(C_CHAR), testUS4());
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_I})
+    public int testI1() {
+        return Integer.reverseBytes(0x04030201);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_I})
+    public int testI2() {
+        return Integer.reverseBytes(0x50607080);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_I})
+    public int testI3() {
+        return Integer.reverseBytes(0x80706050);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_I})
+    public int testI4() {
+        return Integer.reverseBytes(C_INT);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_L})
+    public long testL1() {
+        return Long.reverseBytes(0x0807060504030201L);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_L})
+    public long testL2() {
+        return Long.reverseBytes(0x1020304050607080L);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_L})
+    public long testL3() {
+        return Long.reverseBytes(0x8070605040302010L);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_L})
+    public long testL4() {
+        return Long.reverseBytes(C_LONG);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_S})
+    public short testS1() {
+        return Short.reverseBytes((short) 0x0201);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_S})
+    public short testS2() {
+        return Short.reverseBytes((short) 0x7080);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_S})
+    public short testS3() {
+        return Short.reverseBytes((short) 0x8070);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_S})
+    public short testS4() {
+        return Short.reverseBytes(C_SHORT);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_US})
+    public char testUS1() {
+        return Character.reverseBytes((char) 0x0201);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_US})
+    public char testUS2() {
+        return Character.reverseBytes((char) 0x7080);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_US})
+    public char testUS3() {
+        return Character.reverseBytes((char) 0x8070);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_US})
+    public char testUS4() {
+        return Character.reverseBytes(C_CHAR);
+    }
+
+}

From 45cf32bd2c9e44e2fcbb4b8d0714b87e078cdb7c Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Mon, 12 May 2025 06:59:41 +0000
Subject: [PATCH 392/901] 8347408: Create an internal method handle adapter for
 system calls with errno

Reviewed-by: mcimadamore
---
 .../internal/foreign/CaptureStateUtil.java    | 371 ++++++++++++++++++
 test/jdk/java/foreign/TestBufferStack.java    |  10 +-
 .../java/foreign/TestCaptureStateUtil.java    | 154 ++++++++
 .../lang/foreign/CaptureStateUtilBench.java   | 116 ++++++
 4 files changed, 650 insertions(+), 1 deletion(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
 create mode 100644 test/jdk/java/foreign/TestCaptureStateUtil.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/CaptureStateUtilBench.java

diff --git a/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
new file mode 100644
index 00000000000..a98db6173fd
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
@@ -0,0 +1,371 @@
+/*
+ * 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.
+ */
+
+package jdk.internal.foreign;
+
+import jdk.internal.invoke.MhUtil;
+import jdk.internal.vm.annotation.ForceInline;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.StructLayout;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+/**
+ * An internal utility class that can be used to adapt system-call-styled method handles
+ * for efficient and easy use.
+ */
+public final class CaptureStateUtil {
+
+    private static final StructLayout CAPTURE_LAYOUT = Linker.Option.captureStateLayout();
+    private static final BufferStack POOL = BufferStack.of(CAPTURE_LAYOUT);
+
+    // The `BASIC_HANDLE_CACHE` contains the common "basic handles" that can be reused for
+    // all adapted method handles. Keeping as much as possible reusable reduces the number
+    // of combinators needed to form an adapted method handle.
+    // The function is lazily computed.
+    //
+    private static final Function<SegmentExtractorKey, MethodHandle> SEGMENT_EXTRACTION_HANDLE_CACHE;
+
+    static {
+        final Set<SegmentExtractorKey> inputs = new HashSet<>();
+        // The Cartesian product : (int.class, long.class) x ("errno", ...)
+        // Do not use Streams in order to enable "early" use in the init sequence.
+        for (Class<?> c : new Class<?>[]{int.class, long.class}) {
+            for (MemoryLayout layout : CAPTURE_LAYOUT.memberLayouts()) {
+                inputs.add(new SegmentExtractorKey(c, layout.name().orElseThrow()));
+            }
+        }
+
+        // Do not use a lambda in order to allow early use in the init sequence
+        final Function<SegmentExtractorKey, MethodHandle> segmentExtractionHandle = new Function<>() {
+            @Override
+            public MethodHandle apply(SegmentExtractorKey basicKey) {
+                return makeSegmentExtractionHandle(basicKey);
+            }
+        };
+
+        SEGMENT_EXTRACTION_HANDLE_CACHE = StableValue.function(inputs, segmentExtractionHandle);
+    }
+
+    // A key that holds both the `returnType` and the `stateName` needed to look up a
+    // specific "basic handle" in the `BASIC_HANDLE_CACHE`.
+    //   returnType in {int.class | long.class}
+    //   stateName can be anything non-null but should be in {"GetLastError" | "WSAGetLastError" | "errno"}
+    private record SegmentExtractorKey(Class<?> returnType, String stateName) {
+
+        SegmentExtractorKey(MethodHandle target, String stateName) {
+            this(returnType(target), Objects.requireNonNull(stateName));
+        }
+
+        static Class<?> returnType(MethodHandle target) {
+            // Implicit null check
+            final MethodType type = target.type();
+            final Class<?> returnType = type.returnType();
+
+            if (!(returnType.equals(int.class) || returnType.equals(long.class))) {
+                throw illegalArgDoesNot(target, "return an int or a long");
+            }
+            if (type.parameterCount() == 0 || type.parameterType(0) != MemorySegment.class) {
+                throw illegalArgDoesNot(target, "have a MemorySegment as the first parameter");
+            }
+            return returnType;
+        }
+
+        private static IllegalArgumentException illegalArgDoesNot(MethodHandle target, String info) {
+            return new IllegalArgumentException("The provided target " + target
+                    + " does not " + info);
+        }
+
+    }
+
+    private CaptureStateUtil() {}
+
+    /**
+     * {@return a new MethodHandle that adapts the provided {@code target} so that it
+     * directly returns the same value as the {@code target} if it is non-negative,
+     * otherwise returns the negated captured state defined by the provided
+     * {@code stateName}}
+     * <p>
+     * This method is suitable for adapting system-call method handles(e.g.
+     * {@code open()}, {@code read()}, and {@code close()}). Clients can check the return
+     * value as shown in this example:
+     * {@snippet lang = java:
+     *       // (MemorySegment capture, MemorySegment pathname, int flags)int
+     *       static final MethodHandle CAPTURING_OPEN = ...
+     *
+     *      // (MemorySegment pathname, int flags)int
+     *      static final MethodHandle OPEN = CaptureStateUtil
+     *             .adaptSystemCall(CAPTURING_OPEN, "errno");
+     *
+     *      try {
+     *         int fh = (int)OPEN.invokeExact(pathName, flags);
+     *         if (fh < 0) {
+     *             throw new IOException("Error opening file: errno = " + (-fh));
+     *         }
+     *         processFile(fh);
+     *      } catch (Throwable t) {
+     *           throw new RuntimeException(t);
+     *      }
+     *
+     *}
+     *
+     * For a {@code target} method handle that takes a {@code MemorySegment} and two
+     * {@code int} parameters and returns an {@code int} value, the method returns a new
+     * method handle that is doing the equivalent of:
+     * <p>
+     * {@snippet lang = java:
+     *         private static final MemoryLayout CAPTURE_LAYOUT =
+     *                 Linker.Option.captureStateLayout();
+     *         private static final BufferStack POOL =
+     *                 BufferStack.of(CAPTURE_LAYOUT);
+     *
+     *         public int invoke(MethodHandle target,
+     *                           String stateName,
+     *                           int a, int b) {
+     *             try (var arena = POOL.pushFrame(CAPTURE_LAYOUT)) {
+     *                 final MemorySegment segment = arena.allocate(CAPTURE_LAYOUT);
+     *                 final int result = (int) handle.invoke(segment, a, b);
+     *                 if (result >= 0) {
+     *                     return result;
+     *                 }
+     *                 return -(int) CAPTURE_LAYOUT
+     *                     .varHandle(MemoryLayout.PathElement.groupElement(stateName))
+     *                         .get(segment, 0);
+     *             }
+     *         }
+     *}
+     * except it is more performant. In the above {@code stateName} is the name of the
+     * captured state (e.g. {@code errno}). The static {@code CAPTURE_LAYOUT} is shared
+     * across all target method handles adapted by this method.
+     *
+     * @param target    method handle that returns an {@code int} or a {@code long} and
+     *                  has a capturing state MemorySegment as its first parameter
+     * @param stateName the name of the capturing state member layout (i.e. "errno",
+     *                  "GetLastError", or "WSAGetLastError")
+     * @throws IllegalArgumentException if the provided {@code target}'s return type is
+     *                                  not {@code int} or {@code long}
+     * @throws IllegalArgumentException if the provided {@code target}'s first parameter
+     *                                  type is not {@linkplain MemorySegment}
+     * @throws IllegalArgumentException if the provided {@code stateName} is unknown on
+     *                                  the current platform
+     */
+    public static MethodHandle adaptSystemCall(MethodHandle target,
+                                               String stateName) {
+        // Invariants checked in the BasicKey record
+        final SegmentExtractorKey key = new SegmentExtractorKey(target, stateName);
+
+        // ((int | long), MemorySegment)(int | long)
+        final MethodHandle segmentExtractor = SEGMENT_EXTRACTION_HANDLE_CACHE.apply(key);
+
+        // Make `target` specific adaptations of the basic handle
+
+        // Pre-pend all the parameters from the `target` MH.
+        // (C0=MemorySegment, C1-Cn, MemorySegment)(int|long)
+        MethodHandle innerAdapted = MethodHandles.collectArguments(segmentExtractor, 0, target);
+
+        final int[] perm = new int[target.type().parameterCount() + 1];
+        for (int i = 0; i < target.type().parameterCount(); i++) {
+            perm[i] = i;
+        }
+        // Last takes first
+        perm[perm.length - 1] = 0;
+        // Deduplicate the first and last coordinate and only use the first one.
+        // (C0=MemorySegment, C1-Cn)(int|long)
+        innerAdapted = MethodHandles.permuteArguments(innerAdapted, target.type(), perm);
+
+        // Use an `Arena` for the first argument instead and extract a segment from it.
+        // (C0=Arena, C1-Cn)(int|long)
+        innerAdapted = MethodHandles.collectArguments(innerAdapted, 0, HANDLES_CACHE.apply(ALLOCATE));
+
+        // Add an identity function for the result of the cleanup action.
+        // ((int|long))(int|long)
+        MethodHandle cleanup = MethodHandles.identity(key.returnType());
+        // Add a dummy `Throwable` argument for the cleanup action.
+        // This means, anything thrown will just be propagated.
+        // (Throwable, (int|long))(int|long)
+        cleanup = MethodHandles.dropArguments(cleanup, 0, Throwable.class);
+        // Add the first `Arena` parameter of the `innerAdapted` method handle to the
+        // cleanup action and invoke `Arena::close` when it is run. The `cleanup` handle
+        // does not have to have all parameters. It can have zero or more.
+        // (Throwable, (int|long), Arena)(int|long)
+        cleanup = MethodHandles.collectArguments(cleanup, 2, HANDLES_CACHE.apply(ARENA_CLOSE));
+
+        // Combine the `innerAdapted` and `cleanup` action into a try/finally block.
+        // (Arena, C1-Cn)(int|long)
+        final MethodHandle tryFinally = MethodHandles.tryFinally(innerAdapted, cleanup);
+
+        // Acquire the arena from the global pool.
+        // With this, we finally arrive at the intended method handle:
+        // (C1-Cn)(int|long)
+        return MethodHandles.collectArguments(tryFinally, 0, HANDLES_CACHE.apply(ACQUIRE_ARENA));
+    }
+
+    private static MethodHandle makeSegmentExtractionHandle(SegmentExtractorKey segmentExtractorKey) {
+        final VarHandle vh = CAPTURE_LAYOUT.varHandle(
+                MemoryLayout.PathElement.groupElement(segmentExtractorKey.stateName()));
+        // This MH is used to extract the named captured state
+        // from the capturing `MemorySegment`.
+        // (MemorySegment, long)int
+        MethodHandle intExtractor = vh.toMethodHandle(VarHandle.AccessMode.GET);
+        // As the MH is already adapted to use the appropriate
+        // offset, we just insert `0L` for the offset.
+        // (MemorySegment)int
+        intExtractor = MethodHandles.insertArguments(intExtractor, 1, 0L);
+
+        // If X is the `returnType` (either `int` or `long`) then
+        // the code below is equivalent to:
+        //
+        // X handle(X returnValue, MemorySegment segment)
+        //     if (returnValue >= 0) {
+        //         // Ignore the segment
+        //         return returnValue;
+        //     } else {
+        //         // ignore the returnValue
+        //         return -(X)intExtractor.invokeExact(segment);
+        //     }
+        // }
+        if (segmentExtractorKey.returnType().equals(int.class)) {
+            // (int, MemorySegment)int
+            return MethodHandles.guardWithTest(
+                    HANDLES_CACHE.apply(NON_NEGATIVE_INT),
+                    HANDLES_CACHE.apply(SUCCESS_INT),
+                    HANDLES_CACHE.apply(ERROR_INT).bindTo(intExtractor));
+        } else {
+            // (long, MemorySegment)long
+            return MethodHandles.guardWithTest(
+                    HANDLES_CACHE.apply(NON_NEGATIVE_LONG),
+                    HANDLES_CACHE.apply(SUCCESS_LONG),
+                    HANDLES_CACHE.apply(ERROR_LONG).bindTo(intExtractor));
+        }
+    }
+
+    // The methods below are reflective used via static MethodHandles
+
+    @ForceInline
+    private static Arena acquireArena() {
+        return POOL.pushFrame(CAPTURE_LAYOUT);
+    }
+
+    @ForceInline
+    private static MemorySegment allocate(Arena arena) {
+        return arena.allocate(CAPTURE_LAYOUT.byteSize(), CAPTURE_LAYOUT.byteAlignment());
+    }
+
+    @ForceInline
+    private static boolean nonNegative(int value) {
+        return value >= 0;
+    }
+
+    @ForceInline
+    private static int success(int value,
+                               MemorySegment segment) {
+        return value;
+    }
+
+    @ForceInline
+    private static int error(MethodHandle errorHandle,
+                             int value,
+                             MemorySegment segment) throws Throwable {
+        return -(int) errorHandle.invokeExact(segment);
+    }
+
+    @ForceInline
+    private static boolean nonNegative(long value) {
+        return value >= 0L;
+    }
+
+    @ForceInline
+    private static long success(long value,
+                                MemorySegment segment) {
+        return value;
+    }
+
+    @ForceInline
+    private static long error(MethodHandle errorHandle,
+                              long value,
+                              MemorySegment segment) throws Throwable {
+        return -(int) errorHandle.invokeExact(segment);
+    }
+
+    // The method handles below are bound to static methods residing in this class
+
+    private static final int
+            NON_NEGATIVE_INT  = 0,
+            SUCCESS_INT       = 1,
+            ERROR_INT         = 2,
+            NON_NEGATIVE_LONG = 3,
+            SUCCESS_LONG      = 4,
+            ERROR_LONG        = 5,
+            ACQUIRE_ARENA     = 6,
+            ALLOCATE          = 7,
+            ARENA_CLOSE       = 8;
+
+    // Do not use a lambda in order to allow early use in the init sequence
+    private static final IntFunction<MethodHandle> UNDERLYING_MAKE_HANDLE = new IntFunction<MethodHandle>() {
+        @Override
+        public MethodHandle apply(int value) {
+            return makeHandle(value);
+        }
+    };
+
+    private static final IntFunction<MethodHandle> HANDLES_CACHE =
+            StableValue.intFunction(ARENA_CLOSE + 1, UNDERLYING_MAKE_HANDLE);
+
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+
+    private static MethodHandle makeHandle(int index) {
+        return switch (index) {
+            case NON_NEGATIVE_INT -> MhUtil.findStatic(LOOKUP, "nonNegative",
+                    MethodType.methodType(boolean.class, int.class));
+            case SUCCESS_INT -> MhUtil.findStatic(LOOKUP, "success",
+                    MethodType.methodType(int.class, int.class, MemorySegment.class));
+            case ERROR_INT -> MhUtil.findStatic(LOOKUP, "error",
+                    MethodType.methodType(int.class, MethodHandle.class, int.class, MemorySegment.class));
+            case NON_NEGATIVE_LONG -> MhUtil.findStatic(LOOKUP, "nonNegative",
+                    MethodType.methodType(boolean.class, long.class));
+            case SUCCESS_LONG -> MhUtil.findStatic(LOOKUP, "success",
+                    MethodType.methodType(long.class, long.class, MemorySegment.class));
+            case ERROR_LONG -> MhUtil.findStatic(LOOKUP, "error",
+                    MethodType.methodType(long.class, MethodHandle.class, long.class, MemorySegment.class));
+            case ACQUIRE_ARENA -> MhUtil.findStatic(LOOKUP, "acquireArena",
+                    MethodType.methodType(Arena.class));
+            case ALLOCATE -> MhUtil.findStatic(LOOKUP, "allocate",
+                    MethodType.methodType(MemorySegment.class, Arena.class));
+            case ARENA_CLOSE -> MhUtil.findVirtual(LOOKUP, Arena.class, "close",
+                    MethodType.methodType(void.class));
+            default -> throw new InternalError("Unknown index: " + index);
+        };
+    }
+
+}
diff --git a/test/jdk/java/foreign/TestBufferStack.java b/test/jdk/java/foreign/TestBufferStack.java
index f7bf67bfb50..6873cb6415e 100644
--- a/test/jdk/java/foreign/TestBufferStack.java
+++ b/test/jdk/java/foreign/TestBufferStack.java
@@ -51,7 +51,7 @@
 final class TestBufferStack extends NativeTestHelper {
 
     private static final long POOL_SIZE = 64;
-    private static final long SMALL_ALLOC_SIZE = 8;
+    private static final long SMALL_ALLOC_SIZE = JAVA_LONG.byteSize();
 
     @Test
     void invariants() {
@@ -267,6 +267,14 @@ void accessBounds() {
         }
     }
 
+    @Test
+    void noInit() {
+        BufferStack stack = newBufferStack();
+        try (var arena = stack.pushFrame(SMALL_ALLOC_SIZE, 1)) {
+            assertDoesNotThrow(() -> arena.allocateFrom(JAVA_INT, 1));
+        }
+    }
+
     static void doInTwoStackedArenas(BufferStack pool,
                                      Consumer<Arena> firstAction,
                                      Consumer<Arena> secondAction) {
diff --git a/test/jdk/java/foreign/TestCaptureStateUtil.java b/test/jdk/java/foreign/TestCaptureStateUtil.java
new file mode 100644
index 00000000000..c4f0e038f09
--- /dev/null
+++ b/test/jdk/java/foreign/TestCaptureStateUtil.java
@@ -0,0 +1,154 @@
+/*
+ * 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
+ * @summary Test CaptureStateUtil
+ * @modules java.base/jdk.internal.foreign
+ * @run junit TestCaptureStateUtil
+ */
+
+import jdk.internal.foreign.CaptureStateUtil;
+import org.junit.jupiter.api.Test;
+
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+final class TestCaptureStateUtil {
+
+    private static final String ERRNO_NAME = "errno";
+
+    private static final VarHandle ERRNO_HANDLE = Linker.Option.captureStateLayout()
+            .varHandle(MemoryLayout.PathElement.groupElement(ERRNO_NAME));
+
+    private static final MethodHandle INT_DUMMY_HANDLE;
+    private static final MethodHandle LONG_DUMMY_HANDLE;
+
+    static {
+        try {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            INT_DUMMY_HANDLE = lookup
+                    .findStatic(TestCaptureStateUtil.class, "dummy",
+                            MethodType.methodType(int.class, MemorySegment.class, int.class, int.class));
+            LONG_DUMMY_HANDLE = lookup
+                    .findStatic(TestCaptureStateUtil.class, "dummy",
+                            MethodType.methodType(long.class, MemorySegment.class, long.class, int.class));
+        } catch (ReflectiveOperationException e) {
+            throw new InternalError(e);
+        }
+    }
+
+    private static final MethodHandle ADAPTED_INT = CaptureStateUtil
+            .adaptSystemCall(INT_DUMMY_HANDLE, ERRNO_NAME);
+    private static final MethodHandle ADAPTED_LONG = CaptureStateUtil
+            .adaptSystemCall(LONG_DUMMY_HANDLE, ERRNO_NAME);
+
+    @Test
+    void successfulInt() throws Throwable {
+        int r = (int) ADAPTED_INT.invokeExact(1, 0);
+        assertEquals(1, r);
+    }
+
+    private static final int EACCES = 13; /* Permission denied */
+
+    @Test
+    void errorInt() throws Throwable {
+        int r = (int) ADAPTED_INT.invokeExact(-1, EACCES);
+        assertEquals(-EACCES, r);
+    }
+
+    @Test
+    void successfulLong() throws Throwable {
+        long r = (long) ADAPTED_LONG.invokeExact(1L, 0);
+        assertEquals(1, r);
+    }
+
+    @Test
+    void errorLong() throws Throwable {
+        long r = (long) ADAPTED_LONG.invokeExact(-1L, EACCES);
+        assertEquals(-EACCES, r);
+    }
+
+    @Test
+    void successfulIntPerHandle() throws Throwable {
+        MethodHandle handle = CaptureStateUtil
+                .adaptSystemCall(INT_DUMMY_HANDLE, ERRNO_NAME);
+        int r = (int) handle.invokeExact(1, 0);
+        assertEquals(1, r);
+    }
+
+    @Test
+    void invariants() throws Throwable {
+        MethodHandle noSegment = MethodHandles.lookup()
+                .findStatic(TestCaptureStateUtil.class, "wrongType",
+                        MethodType.methodType(long.class, long.class, int.class));
+
+        var noSegEx = assertThrows(IllegalArgumentException.class, () -> CaptureStateUtil.adaptSystemCall(noSegment, ERRNO_NAME));
+        assertTrue(noSegEx.getMessage().contains("does not have a MemorySegment as the first parameter"));
+
+        MethodHandle noArgMH = MethodHandles.empty(MethodType.methodType(int.class));
+        var emptyEx = assertThrows(IllegalArgumentException.class, () -> CaptureStateUtil.adaptSystemCall(noArgMH, ERRNO_NAME));
+        assertTrue(emptyEx.getMessage().contains("does not have a MemorySegment as the first parameter"));
+
+        MethodHandle wrongReturnType = MethodHandles.lookup()
+                .findStatic(TestCaptureStateUtil.class, "wrongType",
+                        MethodType.methodType(short.class, MemorySegment.class, long.class, int.class));
+
+        var wrongRetEx = assertThrows(IllegalArgumentException.class, () -> CaptureStateUtil.adaptSystemCall(wrongReturnType, ERRNO_NAME));
+        assertTrue(wrongRetEx.getMessage().contains("does not return an int or a long"));
+
+        var wrongCaptureName = assertThrows(IllegalArgumentException.class, () -> CaptureStateUtil.adaptSystemCall(LONG_DUMMY_HANDLE, "foo"));
+        assertEquals("Input not allowed: SegmentExtractorKey[returnType=long, stateName=foo]", wrongCaptureName.getMessage());
+
+        assertThrows(NullPointerException.class, () -> CaptureStateUtil.adaptSystemCall(null, ERRNO_NAME));
+        assertThrows(IllegalArgumentException.class, () -> CaptureStateUtil.adaptSystemCall(noSegment, null));
+    }
+
+    // Dummy method that is just returning the provided parameters
+    private static int dummy(MemorySegment segment, int result, int errno) {
+        ERRNO_HANDLE.set(segment, 0, errno);
+        return result;
+    }
+
+    // Dummy method that is just returning the provided parameters
+    private static long dummy(MemorySegment segment, long result, int errno) {
+        ERRNO_HANDLE.set(segment, 0, errno);
+        return result;
+    }
+
+    private static long wrongType(long result, int errno) {
+        return 0;
+    }
+
+    private static short wrongType(MemorySegment segment, long result, int errno) {
+        return 0;
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CaptureStateUtilBench.java b/test/micro/org/openjdk/bench/java/lang/foreign/CaptureStateUtilBench.java
new file mode 100644
index 00000000000..c833444d713
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CaptureStateUtilBench.java
@@ -0,0 +1,116 @@
+/*
+ * 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.java.lang.foreign;
+
+import jdk.internal.foreign.CaptureStateUtil;
+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.lang.foreign.Arena;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(Scope.Benchmark)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgs = {"--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED",
+        "--enable-native-access=ALL-UNNAMED"})
+public class CaptureStateUtilBench {
+
+    private static final String ERRNO_NAME = "errno";
+
+    private static final VarHandle ERRNO_HANDLE = Linker.Option.captureStateLayout()
+            .varHandle(MemoryLayout.PathElement.groupElement(ERRNO_NAME));
+
+    private static final long SIZE = Linker.Option.captureStateLayout().byteSize();
+
+    private static final MethodHandle DUMMY_EXPLICIT_ALLOC = dummyExplicitAlloc();
+    private static final MethodHandle DUMMY_TL_ALLOC = dummyTlAlloc();
+
+    @Benchmark
+    public int explicitAllocationSuccess() throws Throwable {
+        try (var arena = Arena.ofConfined()) {
+            return (int) DUMMY_EXPLICIT_ALLOC.invokeExact(arena.allocate(SIZE), 0, 0);
+        }
+    }
+
+    @Benchmark
+    public int explicitAllocationFail() throws Throwable {
+        try (var arena = Arena.ofConfined()) {
+            return (int) DUMMY_EXPLICIT_ALLOC.invokeExact(arena.allocate(SIZE), -1, 1);
+        }
+    }
+
+    @Benchmark
+    public int adaptedSysCallSuccess() throws Throwable {
+        return (int) DUMMY_TL_ALLOC.invokeExact(0, 0);
+    }
+
+    @Benchmark
+    public int adaptedSysCallFail() throws Throwable {
+        return (int) DUMMY_TL_ALLOC.invokeExact( -1, 1);
+    }
+
+    private static MethodHandle dummyExplicitAlloc() {
+        try {
+            return MethodHandles.lookup().findStatic(CaptureStateUtilBench.class,
+                    "dummy", MethodType.methodType(int.class, MemorySegment.class, int.class, int.class));
+        } catch (ReflectiveOperationException roe) {
+            throw new RuntimeException(roe);
+        }
+    }
+
+    private static MethodHandle dummyTlAlloc() {
+        final MethodHandle handle = dummyExplicitAlloc();
+        return CaptureStateUtil.adaptSystemCall(handle, ERRNO_NAME);
+    }
+
+    // Dummy method that is just returning the provided parameters
+    private static int dummy(MemorySegment segment, int result, int errno) {
+        if (errno != 0) {
+            // Assuming the capture state is only modified upon detecting an error.
+            ERRNO_HANDLE.set(segment, 0, errno);
+        }
+        return result;
+    }
+
+    @Fork(value = 3, jvmArgsAppend = "-Djmh.executor=VIRTUAL")
+    public static class OfVirtual extends CaptureStateUtilBench {}
+
+}

From 43008b42cf98466b4c4528d357bfcc2ae309770a Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Mon, 12 May 2025 07:12:19 +0000
Subject: [PATCH 393/901] 8356486: ReverseOrderListView should override
 reversed() to return `base`

Reviewed-by: liach, smarks
---
 .../share/classes/java/util/ReverseOrderListView.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/ReverseOrderListView.java b/src/java.base/share/classes/java/util/ReverseOrderListView.java
index f48b41920c9..9d6d856bdb6 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderListView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderListView.java
@@ -43,9 +43,7 @@ class ReverseOrderListView<E> implements List<E> {
     final boolean modifiable;
 
     public static <T> List<T> of(List<T> list, boolean modifiable) {
-        if (list instanceof ReverseOrderListView<T> rolv) {
-            return rolv.base;
-        } else if (list instanceof RandomAccess) {
+        if (list instanceof RandomAccess) {
             return new ReverseOrderListView.Rand<>(list, modifiable);
         } else {
             return new ReverseOrderListView<>(list, modifiable);
@@ -395,6 +393,10 @@ public List<E> subList(int fromIndex, int toIndex) {
         return new ReverseOrderListView<>(base.subList(size - toIndex, size - fromIndex), modifiable);
     }
 
+    public List<E> reversed() {
+        return base;
+    }
+
     static void checkClosedRange(int index, int size) {
         if (index < 0 || index > size) {
             throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);

From a3afc9f7ceba24ab607141426bb0a2693e6d37ca Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Mon, 12 May 2025 08:15:53 +0000
Subject: [PATCH 394/901] 8308854: G1 archive region allocation may
 expand/shrink the heap above/below -Xms

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index ad52388a64f..e5732a695ee 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -547,7 +547,6 @@ void G1CollectedHeap::dealloc_archive_regions(MemRegion range) {
   assert(!is_init_completed(), "Expect to be called at JVM init time");
   MemRegion reserved = _hrm.reserved();
   size_t size_used = 0;
-  uint shrink_count = 0;
 
   // Free the G1 regions that are within the specified range.
   MutexLocker x(Heap_lock);
@@ -559,21 +558,32 @@ void G1CollectedHeap::dealloc_archive_regions(MemRegion range) {
          p2i(start_address), p2i(last_address));
   size_used += range.byte_size();
 
+  uint max_shrink_count = 0;
+  if (capacity() > MinHeapSize) {
+    size_t max_shrink_bytes = capacity() - MinHeapSize;
+    max_shrink_count = (uint)(max_shrink_bytes / G1HeapRegion::GrainBytes);
+  }
+
+  uint shrink_count = 0;
   // Free, empty and uncommit regions with CDS archive content.
   auto dealloc_archive_region = [&] (G1HeapRegion* r, bool is_last) {
     guarantee(r->is_old(), "Expected old region at index %u", r->hrm_index());
     _old_set.remove(r);
     r->set_free();
     r->set_top(r->bottom());
-    _hrm.shrink_at(r->hrm_index(), 1);
-    shrink_count++;
+    if (shrink_count < max_shrink_count) {
+      _hrm.shrink_at(r->hrm_index(), 1);
+      shrink_count++;
+    } else {
+      _hrm.insert_into_free_list(r);
+    }
   };
 
   iterate_regions_in_range(range, dealloc_archive_region);
 
   if (shrink_count != 0) {
-    log_debug(gc, ergo, heap)("Attempt heap shrinking (CDS archive regions). Total size: %zuB",
-                              G1HeapRegion::GrainWords * HeapWordSize * shrink_count);
+    log_debug(gc, ergo, heap)("Attempt heap shrinking (CDS archive regions). Total size: %zuB (%u Regions)",
+                              G1HeapRegion::GrainWords * HeapWordSize * shrink_count, shrink_count);
     // Explicit uncommit.
     uncommit_regions(shrink_count);
   }

From 39a28ffe4e23274dba34317d8960bfb7e6d203ed Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Mon, 12 May 2025 08:16:15 +0000
Subject: [PATCH 395/901] 8355646: Optimize ObjectMonitor::exit

Reviewed-by: pchilanomate, coleenp
---
 src/hotspot/share/runtime/objectMonitor.cpp | 58 +++++++++++----------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 44899225691..ceac0b42acf 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1507,7 +1507,34 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
 #endif
 
   for (;;) {
-    assert(has_owner(current), "invariant");
+    // If there is a successor we should release the lock as soon as
+    // possible, so that the successor can acquire the lock. If there is
+    // no successor, we might need to wake up a waiting thread.
+    if (!has_successor()) {
+      ObjectWaiter* w = Atomic::load(&_entry_list);
+      if (w != nullptr) {
+        // 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. Since threads
+        // are woken up in FIFO order, we need to find the tail of the
+        // entry_list.
+        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 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 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");
+        exit_epilog(current, w);
+        return;
+      }
+    }
 
     // Drop the lock.
     // release semantics: prior loads and stores from within the critical section
@@ -1547,11 +1574,9 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
       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
+    // Only the current lock owner can manipulate the entry_list
+    // (except for pushing new threads to the head), 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 (try_lock(current) != TryLockResult::Success) {
@@ -1561,27 +1586,6 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
     }
 
     guarantee(has_owner(current), "invariant");
-
-    ObjectWaiter* w = nullptr;
-
-    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 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 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");
-      exit_epilog(current, w);
-      return;
-    }
   }
 }
 

From 0258d9998ebc523a6463818be00353c6ac8b7c9c Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Mon, 12 May 2025 08:50:01 +0000
Subject: [PATCH 396/901] 8347515: C2: assert(!success || (C->macro_count() ==
 (old_macro_count - 1))) failed: elimination must have deleted one node from
 macro list

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/macro.cpp              | 12 ++++-
 src/hotspot/share/opto/macro.hpp              |  2 +
 ...TestLoopStripMiningInMacroElimination.java | 49 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/macronodes/TestLoopStripMiningInMacroElimination.java

diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 1fe59c9156b..c6ed2411fe3 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -2350,6 +2350,16 @@ void PhaseMacroExpand::expand_subtypecheck_node(SubTypeCheckNode *check) {
   _igvn.replace_node(check, C->top());
 }
 
+// Perform refining of strip mined loop nodes in the macro nodes list.
+void PhaseMacroExpand::refine_strip_mined_loop_macro_nodes() {
+   for (int i = C->macro_count(); i > 0; i--) {
+    Node* n = C->macro_node(i - 1);
+    if (n->is_OuterStripMinedLoop()) {
+      n->as_OuterStripMinedLoop()->adjust_strip_mined_loop(&_igvn);
+    }
+  }
+}
+
 //---------------------------eliminate_macro_nodes----------------------
 // Eliminate scalar replaced allocations and associated locks.
 void PhaseMacroExpand::eliminate_macro_nodes() {
@@ -2457,6 +2467,7 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
 //------------------------------expand_macro_nodes----------------------
 //  Returns true if a failure occurred.
 bool PhaseMacroExpand::expand_macro_nodes() {
+  refine_strip_mined_loop_macro_nodes();
   // Do not allow new macro nodes once we started to expand
   C->reset_allow_macro_nodes();
   if (StressMacroExpansion) {
@@ -2509,7 +2520,6 @@ bool PhaseMacroExpand::expand_macro_nodes() {
         _igvn.replace_node(n, _igvn.intcon(1));
 #endif // ASSERT
       } else if (n->Opcode() == Op_OuterStripMinedLoop) {
-        n->as_OuterStripMinedLoop()->adjust_strip_mined_loop(&_igvn);
         C->remove_macro_node(n);
         success = true;
       } else if (n->Opcode() == Op_MaxL) {
diff --git a/src/hotspot/share/opto/macro.hpp b/src/hotspot/share/opto/macro.hpp
index 0e2326fd9d4..4654789a290 100644
--- a/src/hotspot/share/opto/macro.hpp
+++ b/src/hotspot/share/opto/macro.hpp
@@ -202,6 +202,8 @@ class PhaseMacroExpand : public Phase {
   PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn), _has_locks(false) {
     _igvn.set_delay_transform(true);
   }
+
+  void refine_strip_mined_loop_macro_nodes();
   void eliminate_macro_nodes();
   bool expand_macro_nodes();
 
diff --git a/test/hotspot/jtreg/compiler/macronodes/TestLoopStripMiningInMacroElimination.java b/test/hotspot/jtreg/compiler/macronodes/TestLoopStripMiningInMacroElimination.java
new file mode 100644
index 00000000000..0d156636152
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/macronodes/TestLoopStripMiningInMacroElimination.java
@@ -0,0 +1,49 @@
+/*
+ * 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 8347515
+ * @summary Regression test for an assert triggered during elimination of OuterStripMinedLoop node. This happens
+ * due to a MaxL node being added to the macro list during refining of the OuterStripMinedLoop node prior to its
+ * elimination.
+ * @run main/othervm -XX:-TieredCompilation compiler.macronodes.TestLoopStripMiningInMacroElimination
+ */
+package compiler.macronodes;
+
+public class TestLoopStripMiningInMacroElimination {
+    static long l1 = 3434;
+    static long l2;
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 1000; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        for (int i = 0; i < 100; i++) {
+            l2 = Math.max(i, 56 % l1);
+        }
+    }
+
+}

From 2b3254160933e8b11527f801507a9c01b90d22b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Mon, 12 May 2025 09:02:25 +0000
Subject: [PATCH 397/901] 8354767: Test crashed: assert(increase <
 max_live_nodes_increase_per_iteration) failed: excessive live node increase
 in single iteration of IGVN: 4470 (should be at most 4000)

Reviewed-by: chagedorn, dfenacci, rcastanedalo, epeter
---
 src/hotspot/share/opto/phaseX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 82e5b3f9d85..953afb0e830 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1029,7 +1029,7 @@ void PhaseIterGVN::optimize() {
   // max_live_nodes_increase_per_iteration in between checks. If this
   // assumption does not hold, there is a risk that we exceed the max node
   // limit in between checks and trigger an assert during node creation.
-  const int max_live_nodes_increase_per_iteration = NodeLimitFudgeFactor * 2;
+  const int max_live_nodes_increase_per_iteration = NodeLimitFudgeFactor * 3;
 
   uint loop_count = 0;
   // Pull from worklist and transform the node. If the node has changed,

From ab8c808ed8ebec4f70141ee31fbaf312fccf7fa4 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Mon, 12 May 2025 09:15:13 +0000
Subject: [PATCH 398/901] 8356752: Log mouse enter and exit events for
 debugging

Reviewed-by: jdv, tr
---
 test/jdk/java/awt/List/ListEnterExitTest.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/awt/List/ListEnterExitTest.java b/test/jdk/java/awt/List/ListEnterExitTest.java
index 998b152a634..cb9c035d977 100644
--- a/test/jdk/java/awt/List/ListEnterExitTest.java
+++ b/test/jdk/java/awt/List/ListEnterExitTest.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
@@ -93,6 +93,7 @@ public void start() throws Exception {
                 }
             });
         }
+        System.out.println("mouseEnterExitListener.isPassed() : " + mouseEnterExitListener.isPassed());
         if (!mouseEnterExitListener.isPassed()) {
             throw new RuntimeException("Haven't receive mouse enter/exit events");
         }
@@ -108,10 +109,12 @@ class MouseEnterExitListener extends MouseAdapter {
 
     public void mouseEntered(MouseEvent e) {
         passed_1 = true;
+        System.out.println("passed_1 is: " + passed_1);
     }
 
     public void mouseExited(MouseEvent e) {
         passed_2 = true;
+        System.out.println("passed_2 is: " + passed_2);
     }
 
     public void mousePressed(MouseEvent e) {

From 8545e1357142db2e008970095a3f74f8121dbcf2 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 12 May 2025 12:25:13 +0000
Subject: [PATCH 399/901] 8356642: RISC-V: enable
 hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java

Reviewed-by: fyang, fjiang, mhaessig
---
 .../compiler/lib/ir_framework/IRNode.java     | 20 +++++++
 .../VectorFusedMultiplyAddSubTest.java        | 60 ++++++++++++-------
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 965b0083c49..96b62a2b12a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2466,21 +2466,41 @@ public class IRNode {
         machOnlyNameRegex(VFMSB_MASKED, "vfmsb_masked");
     }
 
+    public static final String RISCV_VFNMSUB_MASKED = PREFIX + "RISCV_VFNMSUB_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VFNMSUB_MASKED, "vfnmsub_masked");
+    }
+
     public static final String VFNMAD_MASKED = PREFIX + "VFNMAD_MASKED" + POSTFIX;
     static {
         machOnlyNameRegex(VFNMAD_MASKED, "vfnmad_masked");
     }
 
+    public static final String RISCV_VFNMADD_MASKED = PREFIX + "RISCV_VFNMADD_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VFNMADD_MASKED, "vfnmadd_masked");
+    }
+
     public static final String VFNMSB_MASKED = PREFIX + "VFNMSB_MASKED" + POSTFIX;
     static {
         machOnlyNameRegex(VFNMSB_MASKED, "vfnmsb_masked");
     }
 
+    public static final String RISCV_VFMSUB_MASKED = PREFIX + "RISCV_VFMSUB_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VFMSUB_MASKED, "vfmsub_masked");
+    }
+
     public static final String VFMAD_MASKED = PREFIX + "VFMAD_MASKED" + POSTFIX;
     static {
         machOnlyNameRegex(VFMAD_MASKED, "vfmad_masked");
     }
 
+    public static final String RISCV_VFMADD_MASKED = PREFIX + "RISCV_VFMADD_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VFMADD_MASKED, "vfmadd_masked");
+    }
+
     public static final String VMASK_AND_NOT_L = PREFIX + "VMASK_AND_NOT_L" + POSTFIX;
     static {
         machOnlyNameRegex(VMASK_AND_NOT_L, "vmask_and_notL");
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
index cc65fa69e5d..ff0d5b65667 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorFusedMultiplyAddSubTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. 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
@@ -38,6 +39,7 @@
 import jdk.incubator.vector.VectorSpecies;
 
 import jdk.test.lib.Asserts;
+import jdk.test.lib.Platform;
 import jdk.test.lib.Utils;
 
 /**
@@ -45,8 +47,8 @@
  * @bug 8282431
  * @key randomness
  * @library /test/lib /
- * @requires vm.cpu.features ~= ".*sve.*"
- * @summary AArch64: Add optimized rules for masked vector multiply-add/sub for SVE
+ * @requires vm.cpu.features ~= ".*sve.*" | vm.cpu.features ~= ".*rvv.*"
+ * @summary Add optimized rules for masked vector multiply-add/sub for SVE and RVV
  * @modules jdk.incubator.vector
  *
  * @run driver compiler.vectorapi.VectorFusedMultiplyAddSubTest
@@ -244,7 +246,7 @@ private static void assertArrayEqualsNeg(double[] r, double[] a, double[] b, dou
     }
 
     @Test
-    @IR(counts = { IRNode.VMLA_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLA_MASKED, ">= 1" })
     public static void testByteMultiplyAddMasked() {
         VectorMask<Byte> mask = VectorMask.fromArray(B_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += B_SPECIES.length()) {
@@ -257,7 +259,7 @@ public static void testByteMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLS_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLS_MASKED, ">= 1" })
     public static void testByteMultiplySubMasked() {
         VectorMask<Byte> mask = VectorMask.fromArray(B_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += B_SPECIES.length()) {
@@ -270,7 +272,7 @@ public static void testByteMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLA_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLA_MASKED, ">= 1" })
     public static void testShortMultiplyAddMasked() {
         VectorMask<Short> mask = VectorMask.fromArray(S_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
@@ -283,7 +285,7 @@ public static void testShortMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLS_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLS_MASKED, ">= 1" })
     public static void testShortMultiplySubMasked() {
         VectorMask<Short> mask = VectorMask.fromArray(S_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
@@ -296,7 +298,7 @@ public static void testShortMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLA_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLA_MASKED, ">= 1" })
     public static void testIntMultiplyAddMasked() {
         VectorMask<Integer> mask = VectorMask.fromArray(I_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
@@ -309,7 +311,7 @@ public static void testIntMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLS_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLS_MASKED, ">= 1" })
     public static void testIntMultiplySubMasked() {
         VectorMask<Integer> mask = VectorMask.fromArray(I_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
@@ -322,7 +324,7 @@ public static void testIntMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLA_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLA_MASKED, ">= 1" })
     public static void testLongMultiplyAddMasked() {
         VectorMask<Long> mask = VectorMask.fromArray(L_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += L_SPECIES.length()) {
@@ -335,7 +337,7 @@ public static void testLongMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VMLS_MASKED, ">= 1" })
+    @IR(applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"}, counts = { IRNode.VMLS_MASKED, ">= 1" })
     public static void testLongMultiplySubMasked() {
         VectorMask<Long> mask = VectorMask.fromArray(L_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += L_SPECIES.length()) {
@@ -348,7 +350,8 @@ public static void testLongMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFNMSUB_MASKED, ">= 1" })
     public static void testFloatMultiplySubMasked() {
         VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
@@ -361,7 +364,8 @@ public static void testFloatMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMADD_MASKED, ">= 1" })
     public static void testFloatMultiplyNegAMasked() {
         VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
@@ -374,7 +378,8 @@ public static void testFloatMultiplyNegAMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFNMADD_MASKED, ">= 1" })
     public static void testFloatNegatedMultiplyAddMasked() {
         VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
@@ -387,7 +392,8 @@ public static void testFloatNegatedMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMSUB_MASKED, ">= 1" })
     public static void testFloatNegatedMultiplyNegAMasked() {
         VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
@@ -400,7 +406,8 @@ public static void testFloatNegatedMultiplyNegAMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMSUB_MASKED, ">= 1" })
     public static void testFloatNegatedMultiplySubMasked() {
         VectorMask<Float> mask = VectorMask.fromArray(F_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += F_SPECIES.length()) {
@@ -413,7 +420,8 @@ public static void testFloatNegatedMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFNMSUB_MASKED, ">= 1" })
     public static void testDoubleMultiplySubMasked() {
         VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
@@ -426,7 +434,8 @@ public static void testDoubleMultiplySubMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMADD_MASKED, ">= 1" })
     public static void testDoubleMultiplyNegAMasked() {
         VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
@@ -439,7 +448,8 @@ public static void testDoubleMultiplyNegAMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMAD_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFNMADD_MASKED, ">= 1" })
     public static void testDoubleNegatedMultiplyAddMasked() {
         VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
@@ -452,7 +462,8 @@ public static void testDoubleNegatedMultiplyAddMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMSUB_MASKED, ">= 1" })
     public static void testDoubleNegatedMultiplyNegAMasked() {
         VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
@@ -465,7 +476,8 @@ public static void testDoubleNegatedMultiplyNegAMasked() {
     }
 
     @Test
-    @IR(counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"aarch64", "true"}, counts = { IRNode.VFNMSB_MASKED, ">= 1" })
+    @IR(applyIfPlatform = {"riscv64", "true"}, counts = { IRNode.RISCV_VFMSUB_MASKED, ">= 1" })
     public static void testDoubleNegatedMultiplySubMasked() {
         VectorMask<Double> mask = VectorMask.fromArray(D_SPECIES, m, 0);
         for (int i = 0; i < LENGTH; i += D_SPECIES.length()) {
@@ -479,8 +491,10 @@ public static void testDoubleNegatedMultiplySubMasked() {
 
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
-        testFramework.setDefaultWarmup(5000)
-                     .addFlags("--add-modules=jdk.incubator.vector", "-XX:UseSVE=1")
-                     .start();
+        testFramework.setDefaultWarmup(5000).addFlags("--add-modules=jdk.incubator.vector");
+        if (Platform.isAArch64()) {
+            testFramework.addFlags("-XX:UseSVE=1");
+        }
+        testFramework.start();
     }
 }

From 7ae52ce572794f9d17446c66381f703ea1bb8b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 12 May 2025 12:34:28 +0000
Subject: [PATCH 400/901] 8356390: Rename ResolvedIndyEntry::set_flags to
 set_has_appendix

Co-authored-by: John R Rose <jrose@openjdk.org>
Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/oops/resolvedIndyEntry.hpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/oops/resolvedIndyEntry.hpp b/src/hotspot/share/oops/resolvedIndyEntry.hpp
index 3d7d3893311..a7782c88f1e 100644
--- a/src/hotspot/share/oops/resolvedIndyEntry.hpp
+++ b/src/hotspot/share/oops/resolvedIndyEntry.hpp
@@ -68,9 +68,9 @@ class ResolvedIndyEntry {
     _flags(0) {}
 
   // Bit shift to get flags
-  // Note: Only two flags exists at the moment but more could be added
   enum {
-      has_appendix_shift        = 1,
+    resolution_failed_shift = 0,
+    has_appendix_shift      = 1,
   };
 
   // Getters
@@ -107,22 +107,22 @@ class ResolvedIndyEntry {
   void fill_in(Method* m, u2 num_params, u1 return_type, bool has_appendix) {
     set_num_parameters(num_params);
     _return_type = return_type;
-    set_flags(has_appendix);
+    set_has_appendix(has_appendix);
     // Set the method last since it is read lock free.
     // Resolution is indicated by whether or not the method is set.
     Atomic::release_store(&_method, m);
   }
 
-  // has_appendix is currently the only other flag besides resolution_failed
-  void set_flags(bool has_appendix) {
-    u1 new_flags = (has_appendix << has_appendix_shift);
-    assert((new_flags & 1) == 0, "New flags should not change resolution flag");
-    // Preserve the resolution_failed bit
-    _flags = (_flags & 1) | new_flags;
+  void set_has_appendix(bool has_appendix) {
+    u1 new_flags = (has_appendix ? 1 : 0) << has_appendix_shift;
+    u1 old_flags = _flags & ~(1 << has_appendix_shift);
+    // Preserve the unaffected bits
+    _flags = old_flags | new_flags;
   }
 
+
   void set_resolution_failed() {
-    _flags = _flags | 1;
+    _flags = _flags | (1 << resolution_failed_shift);
   }
 
   void adjust_method_entry(Method* new_method) { _method = new_method; }

From f5525ecf585b3876ae332d30b0e641ff0c844e58 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Mon, 12 May 2025 14:42:27 +0000
Subject: [PATCH 401/901] 8348410: Preview flag not checked during compilation
 resulting in runtime crash

Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org>
Reviewed-by: jlahoda, mcimadamore
---
 .../com/sun/tools/javac/comp/Attr.java        |  12 +-
 ...PrimitivePatternsSwitchRequirePreview.java | 178 ++++++++++++++++++
 2 files changed, 186 insertions(+), 4 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/PrimitivePatternsSwitchRequirePreview.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 53ce8b1b494..27dea4d5877 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1697,6 +1697,7 @@ private void handleSwitch(JCTree switchTree,
                               List<JCCase> cases,
                               BiConsumer<JCCase, Env<AttrContext>> attribCase) {
         Type seltype = attribExpr(selector, env);
+        Type seltypeUnboxed = types.unboxedTypeOrType(seltype);
 
         Env<AttrContext> switchEnv =
             env.dup(switchTree, env.info.dup(env.info.scope.dup()));
@@ -1704,7 +1705,7 @@ private void handleSwitch(JCTree switchTree,
         try {
             boolean enumSwitch = (seltype.tsym.flags() & Flags.ENUM) != 0;
             boolean stringSwitch = types.isSameType(seltype, syms.stringType);
-            boolean booleanSwitch = types.isSameType(types.unboxedTypeOrType(seltype), syms.booleanType);
+            boolean booleanSwitch = types.isSameType(seltypeUnboxed, syms.booleanType);
             boolean errorEnumSwitch = TreeInfo.isErrorEnumSwitch(selector, cases);
             boolean intSwitch = types.isAssignable(seltype, syms.intType);
             boolean patternSwitch;
@@ -1802,9 +1803,12 @@ private void handleSwitch(JCTree switchTree,
                                     }
                                 }
                                 else {
-                                    if (!stringSwitch && !intSwitch &&
-                                            !((pattype.getTag().isInSuperClassesOf(LONG) || pattype.getTag().equals(BOOLEAN)) &&
-                                              types.isSameType(types.unboxedTypeOrType(seltype), pattype))) {
+                                    boolean isLongFloatDoubleOrBooleanConstant =
+                                            pattype.getTag().isInSuperClassesOf(LONG) || pattype.getTag().equals(BOOLEAN);
+                                    if (isLongFloatDoubleOrBooleanConstant) {
+                                        preview.checkSourceLevel(label.pos(), Feature.PRIMITIVE_PATTERNS);
+                                    }
+                                    if (!stringSwitch && !intSwitch && !(isLongFloatDoubleOrBooleanConstant && types.isSameType(seltypeUnboxed, pattype))) {
                                         log.error(label.pos(), Errors.ConstantLabelNotCompatible(pattype, seltype));
                                     } else if (!constants.add(pattype.constValue())) {
                                         log.error(c.pos(), Errors.DuplicateCaseLabel);
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchRequirePreview.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchRequirePreview.java
new file mode 100644
index 00000000000..a69df09912a
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchRequirePreview.java
@@ -0,0 +1,178 @@
+/*
+ * 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 8348410
+ * @summary Ensure --enable-preview is required for primitive switch on a boxed expression
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main PrimitivePatternsSwitchRequirePreview
+ */
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+
+import toolbox.JavacTask;
+import toolbox.Task.Expect;
+import toolbox.Task.OutputKind;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class PrimitivePatternsSwitchRequirePreview extends TestRunner {
+
+    ToolBox tb;
+
+    public PrimitivePatternsSwitchRequirePreview() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public static void main(String[] args) throws Exception {
+        PrimitivePatternsSwitchRequirePreview t = new PrimitivePatternsSwitchRequirePreview();
+        t.runTests();
+    }
+
+    @Test
+    public void testBoolean() throws Exception {
+        String code = """
+                      class C {
+                          public static void testBoolean(Boolean value) {
+                            switch (value) {
+                                case true   -> System.out.println("true");
+                                default     -> System.out.println("false");
+                            }
+                          }
+                      }
+                      """;
+        Path curPath = Path.of(".");
+        List<String> actual = new JavacTask(tb)
+                .options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
+                .sources(code)
+                .outdir(curPath)
+                .run(Expect.FAIL)
+                .getOutputLines(OutputKind.DIRECT);
+
+        List<String> expected = List.of(
+                "C.java:4:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
+                "1 error"
+        );
+
+        if (!Objects.equals(actual, expected)) {
+            error("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+
+    @Test
+    public void testLong() throws Exception {
+        String code = """
+                      class C {
+                          public static void testLong(Long value) {
+                             switch (value) {
+                                 case 0L      -> System.out.println("zero");
+                                 default      -> System.out.println("non-zero");
+                             }
+                         }
+                      }
+                      """;
+        Path curPath = Path.of(".");
+        List<String> actual = new JavacTask(tb)
+                .options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
+                .sources(code)
+                .outdir(curPath)
+                .run(Expect.FAIL)
+                .getOutputLines(OutputKind.DIRECT);
+
+        List<String> expected = List.of(
+                "C.java:4:17: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
+                "1 error"
+        );
+
+        if (!Objects.equals(actual, expected)) {
+            error("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+
+    @Test
+    public void testFloat() throws Exception {
+        String code = """
+                      class C {
+                         public static void testFloat(Float value) {
+                           switch (value) {
+                               case 0f      -> System.out.println("zero");
+                               default      -> System.out.println("non-zero");
+                           }
+                         }
+                      }
+                      """;
+        Path curPath = Path.of(".");
+        List<String> actual = new JavacTask(tb)
+                .options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
+                .sources(code)
+                .outdir(curPath)
+                .run(Expect.FAIL)
+                .getOutputLines(OutputKind.DIRECT);
+
+        List<String> expected = List.of(
+                "C.java:4:15: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
+                "1 error"
+        );
+
+        if (!Objects.equals(actual, expected)) {
+            error("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+
+    @Test
+    public void testDouble() throws Exception {
+        String code = """
+                      class C {
+                        public static void testDouble(Long value) {
+                            switch (value) {
+                                case 0L      -> System.out.println("zero");
+                                default      -> System.out.println("non-zero");
+                            }
+                        }
+                      }
+                      """;
+        Path curPath = Path.of(".");
+        List<String> actual = new JavacTask(tb)
+                .options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
+                .sources(code)
+                .outdir(curPath)
+                .run(Expect.FAIL)
+                .getOutputLines(OutputKind.DIRECT);
+
+        List<String> expected = List.of(
+                "C.java:4:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.primitive.patterns)",
+                "1 error"
+        );
+
+        if (!Objects.equals(actual, expected)) {
+            error("Expected: " + expected + ", but got: " + actual);
+        }
+    }
+}
\ No newline at end of file

From 8128f638fac39f6874c13364cbf742493745d845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 12 May 2025 15:49:38 +0000
Subject: [PATCH 402/901] 8355692: Refactor stream indentation

Reviewed-by: stefank, cnorrbin
---
 src/hotspot/os/bsd/memMapPrinter_macosx.cpp   |  3 +-
 src/hotspot/os/linux/memMapPrinter_linux.cpp  |  3 +-
 .../os/windows/memMapPrinter_windows.cpp      |  3 +-
 .../share/classfile/defaultMethods.cpp        | 19 ++++---
 src/hotspot/share/classfile/stackMapFrame.cpp |  8 +--
 src/hotspot/share/classfile/stackMapTable.cpp |  6 +--
 src/hotspot/share/classfile/verifier.cpp      | 50 +++++++++---------
 .../compiler/compilationMemoryStatistic.cpp   | 16 +++---
 src/hotspot/share/gc/epsilon/epsilonHeap.cpp  |  4 +-
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  2 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    |  4 +-
 .../share/gc/parallel/parMarkBitMap.hpp       |  2 +-
 src/hotspot/share/gc/parallel/psOldGen.cpp    |  2 +-
 src/hotspot/share/gc/parallel/psYoungGen.cpp  |  2 +-
 .../share/gc/serial/defNewGeneration.cpp      |  2 +-
 .../share/gc/serial/tenuredGeneration.cpp     |  2 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp |  6 +--
 src/hotspot/share/gc/z/zHeap.cpp              |  2 +-
 src/hotspot/share/gc/z/zMappedCache.cpp       |  2 +-
 src/hotspot/share/gc/z/zPageAllocator.cpp     |  8 +--
 src/hotspot/share/memory/metaspace.cpp        |  2 +-
 .../memory/metaspace/metaspaceStatistics.cpp  | 20 +++----
 .../printCLDMetaspaceInfoClosure.cpp          |  6 +--
 .../printMetaspaceInfoKlassClosure.cpp        |  2 +-
 src/hotspot/share/memory/universe.cpp         |  2 +-
 src/hotspot/share/memory/virtualspace.cpp     |  2 +-
 src/hotspot/share/nmt/memMapPrinter.cpp       |  2 +-
 src/hotspot/share/nmt/memReporter.cpp         |  8 +--
 src/hotspot/share/nmt/memReporter.hpp         |  1 -
 src/hotspot/share/nmt/memoryFileTracker.cpp   |  2 +-
 src/hotspot/share/utilities/ostream.cpp       | 22 ++++----
 src/hotspot/share/utilities/ostream.hpp       | 52 +++++++++----------
 src/hotspot/share/utilities/vmError.cpp       |  4 +-
 test/hotspot/gtest/utilities/test_ostream.cpp | 42 +++++----------
 34 files changed, 145 insertions(+), 168 deletions(-)

diff --git a/src/hotspot/os/bsd/memMapPrinter_macosx.cpp b/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
index 477803001cb..154d2887c53 100644
--- a/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
+++ b/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
@@ -29,6 +29,7 @@
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 #include <limits.h>
@@ -303,7 +304,7 @@ class ProcSmapsPrinter {
     st->print_cr("vminfo:  VM information (requires NMT)");
     st->print_cr("file:    file mapped, if mapping is not anonymous");
     {
-      streamIndentor si(st, 16);
+      StreamIndentor si(st, 16);
       _session.print_nmt_flag_legend();
     }
     st->print_cr("file:            file mapped, if mapping is not anonymous");
diff --git a/src/hotspot/os/linux/memMapPrinter_linux.cpp b/src/hotspot/os/linux/memMapPrinter_linux.cpp
index b84921dd3bb..91fd552eec5 100644
--- a/src/hotspot/os/linux/memMapPrinter_linux.cpp
+++ b/src/hotspot/os/linux/memMapPrinter_linux.cpp
@@ -28,6 +28,7 @@
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
 
 #include <limits.h>
@@ -139,7 +140,7 @@ class ProcSmapsPrinter {
     st->print_cr("                      huge: mapping uses hugetlb pages");
     st->print_cr("vm info:         VM information (requires NMT)");
     {
-      streamIndentor si(st, 16);
+      StreamIndentor si(st, 16);
       _session.print_nmt_flag_legend();
     }
     st->print_cr("file:            file mapped, if mapping is not anonymous");
diff --git a/src/hotspot/os/windows/memMapPrinter_windows.cpp b/src/hotspot/os/windows/memMapPrinter_windows.cpp
index 075a64f5863..9388d20ab56 100644
--- a/src/hotspot/os/windows/memMapPrinter_windows.cpp
+++ b/src/hotspot/os/windows/memMapPrinter_windows.cpp
@@ -26,6 +26,7 @@
 #include "nmt/memMapPrinter.hpp"
 #include "os_windows.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/ostream.hpp"
 
 #include <limits.h>
 #include <winnt.h>
@@ -200,7 +201,7 @@ class MappingInfoPrinter {
     st->print_cr("vminfo:  VM information (requires NMT)");
     st->print_cr("file:    file mapped, if mapping is not anonymous");
     {
-      streamIndentor si(st, 16);
+      StreamIndentor si(st, 16);
       _session.print_nmt_flag_legend();
     }
   }
diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp
index 75bc33a3083..a9c694c33c1 100644
--- a/src/hotspot/share/classfile/defaultMethods.cpp
+++ b/src/hotspot/share/classfile/defaultMethods.cpp
@@ -237,8 +237,8 @@ class PrintHierarchy : public HierarchyVisitor<PrintHierarchy> {
  public:
   bool visit() {
     InstanceKlass* cls = current_class();
-    streamIndentor si(_st, current_depth() * 2);
-    _st->indent().print_cr("%s", cls->name()->as_C_string());
+    StreamIndentor si(_st, current_depth() * 2);
+    _st->print_cr("%s", cls->name()->as_C_string());
     return true;
   }
 
@@ -436,8 +436,8 @@ class MethodFamily : public ResourceObj {
 
   void print_selected(outputStream* str, int indent) const {
     assert(has_target(), "Should be called otherwise");
-    streamIndentor si(str, indent * 2);
-    str->indent().print("Selected method: ");
+    StreamIndentor si(str, indent * 2);
+    str->print("Selected method: ");
     print_method(str, _selected_target);
     Klass* method_holder = _selected_target->method_holder();
     if (!method_holder->is_interface()) {
@@ -449,8 +449,8 @@ class MethodFamily : public ResourceObj {
   void print_exception(outputStream* str, int indent) {
     assert(throws_exception(), "Should be called otherwise");
     assert(_exception_name != nullptr, "exception_name should be set");
-    streamIndentor si(str, indent * 2);
-    str->indent().print_cr("%s: %s", _exception_name->as_C_string(), _exception_message->as_C_string());
+    StreamIndentor si(str, indent * 2);
+    str->print_cr("%s: %s", _exception_name->as_C_string(), _exception_message->as_C_string());
   }
 };
 
@@ -678,9 +678,8 @@ static void find_empty_vtable_slots(GrowableArray<EmptyVtableSlot*>* slots,
     lt.print("Slots that need filling:");
     ResourceMark rm;
     LogStream ls(lt);
-    streamIndentor si(&ls);
+    StreamIndentor si(&ls, 2);
     for (int i = 0; i < slots->length(); ++i) {
-      ls.indent();
       slots->at(i)->print_on(&ls);
       ls.cr();
     }
@@ -851,8 +850,8 @@ void DefaultMethods::generate_default_methods(
       LogTarget(Debug, defaultmethods) lt;
       if (lt.is_enabled()) {
         LogStream ls(lt);
-        streamIndentor si(&ls, 2);
-        ls.indent().print("Looking for default methods for slot ");
+        StreamIndentor si(&ls, 2);
+        ls.print("Looking for default methods for slot ");
         slot->print_on(&ls);
         ls.cr();
       }
diff --git a/src/hotspot/share/classfile/stackMapFrame.cpp b/src/hotspot/share/classfile/stackMapFrame.cpp
index c71a278e0b8..4b847894e02 100644
--- a/src/hotspot/share/classfile/stackMapFrame.cpp
+++ b/src/hotspot/share/classfile/stackMapFrame.cpp
@@ -337,10 +337,10 @@ TypeOrigin StackMapFrame::stack_top_ctx() {
 }
 
 void StackMapFrame::print_on(outputStream* str) const {
-  str->indent().print_cr("bci: @%d", _offset);
-  str->indent().print_cr("flags: {%s }",
+  str->print_cr("bci: @%d", _offset);
+  str->print_cr("flags: {%s }",
       flag_this_uninit() ? " flagThisUninit" : "");
-  str->indent().print("locals: {");
+  str->print("locals: {");
   for (int32_t i = 0; i < _locals_size; ++i) {
     str->print(" ");
     _locals[i].print_on(str);
@@ -349,7 +349,7 @@ void StackMapFrame::print_on(outputStream* str) const {
     }
   }
   str->print_cr(" }");
-  str->indent().print("stack: {");
+  str->print("stack: {");
   for (int32_t j = 0; j < _stack_size; ++j) {
     str->print(" ");
     _stack[j].print_on(str);
diff --git a/src/hotspot/share/classfile/stackMapTable.cpp b/src/hotspot/share/classfile/stackMapTable.cpp
index b452beecb00..1ed72e998fb 100644
--- a/src/hotspot/share/classfile/stackMapTable.cpp
+++ b/src/hotspot/share/classfile/stackMapTable.cpp
@@ -143,10 +143,10 @@ void StackMapTable::check_jump_target(
 }
 
 void StackMapTable::print_on(outputStream* str) const {
-  str->indent().print_cr("StackMapTable: frame_count = %d", _frame_count);
-  str->indent().print_cr("table = { ");
+  str->print_cr("StackMapTable: frame_count = %d", _frame_count);
+  str->print_cr("table = {");
   {
-    streamIndentor si(str);
+    StreamIndentor si(str, 2);
     for (int32_t i = 0; i < _frame_count; ++i) {
       _frame_array->at(i)->print_on(str);
     }
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 51145d441c9..98c05909b82 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -444,10 +444,10 @@ void ErrorContext::details(outputStream* ss, const Method* method) const {
 }
 
 void ErrorContext::reason_details(outputStream* ss) const {
-  streamIndentor si(ss);
-  ss->indent().print_cr("Reason:");
-  streamIndentor si2(ss);
-  ss->indent().print("%s", "");
+  StreamIndentor si(ss, 2);
+  ss->print_cr("Reason:");
+
+  StreamIndentor si2(ss, 2);
   switch (_fault) {
     case INVALID_BYTECODE:
       ss->print("Error exists in the bytecode");
@@ -505,7 +505,6 @@ void ErrorContext::reason_details(outputStream* ss) const {
 
 void ErrorContext::location_details(outputStream* ss, const Method* method) const {
   if (_bci != -1 && method != nullptr) {
-    streamIndentor si(ss);
     const char* bytecode_name = "<invalid>";
     if (method->validate_bci(_bci) != -1) {
       Bytecodes::Code code = Bytecodes::code_or_bp_at(method->bcp_from(_bci));
@@ -516,46 +515,50 @@ void ErrorContext::location_details(outputStream* ss, const Method* method) cons
       }
     }
     InstanceKlass* ik = method->method_holder();
-    ss->indent().print_cr("Location:");
-    streamIndentor si2(ss);
-    ss->indent().print_cr("%s.%s%s @%d: %s",
+
+    StreamIndentor si(ss, 2);
+    ss->print_cr("Location:");
+
+    StreamIndentor si2(ss, 2);
+    ss->print_cr("%s.%s%s @%d: %s",
         ik->name()->as_C_string(), method->name()->as_C_string(),
         method->signature()->as_C_string(), _bci, bytecode_name);
   }
 }
 
 void ErrorContext::frame_details(outputStream* ss) const {
-  streamIndentor si(ss);
+  StreamIndentor si(ss, 2);
   if (_type.is_valid() && _type.frame() != nullptr) {
-    ss->indent().print_cr("Current Frame:");
-    streamIndentor si2(ss);
+    ss->print_cr("Current Frame:");
+    StreamIndentor si2(ss, 2);
     _type.frame()->print_on(ss);
   }
   if (_expected.is_valid() && _expected.frame() != nullptr) {
-    ss->indent().print_cr("Stackmap Frame:");
-    streamIndentor si2(ss);
+    ss->print_cr("Stackmap Frame:");
+    StreamIndentor si2(ss, 2);
     _expected.frame()->print_on(ss);
   }
 }
 
 void ErrorContext::bytecode_details(outputStream* ss, const Method* method) const {
   if (method != nullptr) {
-    streamIndentor si(ss);
-    ss->indent().print_cr("Bytecode:");
-    streamIndentor si2(ss);
+    StreamIndentor si(ss, 2);
+    ss->print_cr("Bytecode:");
+    StreamIndentor si2(ss, 2);
     ss->print_data(method->code_base(), method->code_size(), false);
   }
 }
 
 void ErrorContext::handler_details(outputStream* ss, const Method* method) const {
   if (method != nullptr) {
-    streamIndentor si(ss);
+    StreamIndentor si(ss, 2);
+
     ExceptionTable table(method);
     if (table.length() > 0) {
-      ss->indent().print_cr("Exception Handler Table:");
-      streamIndentor si2(ss);
+      ss->print_cr("Exception Handler Table:");
+      StreamIndentor si2(ss, 2);
       for (int i = 0; i < table.length(); ++i) {
-        ss->indent().print_cr("bci [%d, %d] => handler: %d", table.start_pc(i),
+        ss->print_cr("bci [%d, %d] => handler: %d", table.start_pc(i),
             table.end_pc(i), table.handler_pc(i));
       }
     }
@@ -564,17 +567,16 @@ void ErrorContext::handler_details(outputStream* ss, const Method* method) const
 
 void ErrorContext::stackmap_details(outputStream* ss, const Method* method) const {
   if (method != nullptr && method->has_stackmap_table()) {
-    streamIndentor si(ss);
-    ss->indent().print_cr("Stackmap Table:");
+    StreamIndentor si(ss, 2);
+    ss->print_cr("Stackmap Table:");
     Array<u1>* data = method->stackmap_data();
     stack_map_table* sm_table =
         stack_map_table::at((address)data->adr_at(0));
     stack_map_frame* sm_frame = sm_table->entries();
-    streamIndentor si2(ss);
+    StreamIndentor si2(ss, 2);
     int current_offset = -1;
     address end_of_sm_table = (address)sm_table + method->stackmap_data()->length();
     for (u2 i = 0; i < sm_table->number_of_entries(); ++i) {
-      ss->indent();
       if (!sm_frame->verify((address)sm_frame, end_of_sm_table)) {
         sm_frame->print_truncated(ss, current_offset);
         return;
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 3138eb3a8c0..d842bcb2b6f 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -396,16 +396,16 @@ void ArenaStatCounter::print_peak_state_on(outputStream* st) const {
 #ifdef COMPILER2
     // C2: print counters and timeline on multiple lines, indented
     if (_comp_type == CompilerType::compiler_c2) {
-      streamIndentor si(st, 4);
+      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);
+        StreamIndentor si(st, 4);
        _counters_at_global_peak.print_on(st);
       }
       st->print_cr("--- Allocation timelime by phase ---");
       {
-        streamIndentor si(st, 4);
+        StreamIndentor si(st, 4);
         _timeline.print_on(st);
       }
       st->print_cr("---");
@@ -825,7 +825,6 @@ void CompilationMemoryStatistic::on_end_compilation() {
   if (print) {
     // 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(": ");
@@ -1000,8 +999,7 @@ void CompilationMemoryStatistic::print_error_report(outputStream* st) {
   if (!check_before_reporting(st)) {
     return;
   }
-  StreamAutoIndentor sai(tty);
-  streamIndentor si(tty, 4);
+  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
@@ -1021,8 +1019,7 @@ void CompilationMemoryStatistic::print_final_report(outputStream* st) {
     return;
   }
   st->print_cr("Compiler Memory Statistic, 10 most expensive compilations:");
-  StreamAutoIndentor sai(st);
-  streamIndentor si(st, 4);
+  StreamIndentor si(st, 4);
   print_all_by_size(st, false, false, 0, 10);
 }
 
@@ -1031,8 +1028,7 @@ void CompilationMemoryStatistic::print_jcmd_report(outputStream* st, bool verbos
     return;
   }
   st->print_cr("Compiler Memory Statistic");
-  StreamAutoIndentor sai(st);
-  streamIndentor si(st, 4);
+  StreamIndentor si(st, 4);
   print_all_by_size(st, verbose, legend, minsize, -1);
 }
 
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index c3d3af26528..76d4ba5ab19 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -301,14 +301,14 @@ void EpsilonHeap::object_iterate(ObjectClosure *cl) {
 void EpsilonHeap::print_heap_on(outputStream *st) const {
   st->print_cr("Epsilon Heap");
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
 
   _virtual_space.print_on(st);
 
   if (_space != nullptr) {
     st->print_cr("Allocation space:");
 
-    StreamAutoIndentor indentor(st, 1);
+    StreamIndentor si(st, 1);
     _space->print_on(st, "");
   }
 }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index e5732a695ee..169384c3a37 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2133,7 +2133,7 @@ void G1CollectedHeap::print_heap_on(outputStream* st) const {
             p2i(_hrm.reserved().end()));
   st->cr();
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   st->print("region size %zuK, ", G1HeapRegion::GrainBytes / K);
   uint young_regions = young_regions_count();
   st->print("%u young (%zuK), ", young_regions,
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index abc0d7baa64..0c7d8de9bb5 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -611,13 +611,13 @@ void MutableNUMASpace::print_short_on(outputStream* st) const {
 void MutableNUMASpace::print_on(outputStream* st, const char* prefix) const {
   MutableSpace::print_on(st, prefix);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   for (int i = 0; i < lgrp_spaces()->length(); i++) {
     LGRPSpace *ls = lgrp_spaces()->at(i);
     FormatBuffer<128> lgrp_message("lgrp %u ", ls->lgrp_id());
     ls->space()->print_on(st, lgrp_message);
     if (NUMAStats) {
-      StreamAutoIndentor indentor_numa(st, 1);
+      StreamIndentor si2(st, 1);
       for (int i = 0; i < lgrp_spaces()->length(); i++) {
         lgrp_spaces()->at(i)->accumulate_statistics(page_size());
       }
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
index aa788ff7be0..bca548e24cd 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp
@@ -61,7 +61,7 @@ class ParMarkBitMap: public CHeapObj<mtGC> {
   void print_on(outputStream* st) const {
     st->print_cr("Marking Bits: (ParMarkBitMap*) " PTR_FORMAT, p2i(this));
 
-    StreamAutoIndentor indentor(st, 1);
+    StreamIndentor si(st, 1);
     _beg_bits.print_range_on(st, "Begin Bits: ");
   }
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 3bf125bc295..c1322fb7d9f 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -362,7 +362,7 @@ void PSOldGen::print_on(outputStream* st) const {
   st->print(" total %zuK, used %zuK ", capacity_in_bytes() / K, used_in_bytes() / K);
   virtual_space()->print_space_boundaries_on(st);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   object_space()->print_on(st, "object ");
 }
 
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp
index cf21e45da9e..f9cb067411e 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp
@@ -704,7 +704,7 @@ void PSYoungGen::print_on(outputStream* st) const {
   st->print(" total %zuK, used %zuK ", capacity_in_bytes() / K, used_in_bytes() / K);
   virtual_space()->print_space_boundaries_on(st);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   eden_space()->print_on(st, "eden ");
   from_space()->print_on(st, "from ");
   to_space()->print_on(st, "to   ");
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index cebfa743eac..61b0ccad191 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -830,7 +830,7 @@ void DefNewGeneration::print_on(outputStream* st) const {
   st->print(" total %zuK, used %zuK ", capacity() / K, used() / K);
   _virtual_space.print_space_boundaries_on(st);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   eden()->print_on(st, "eden ");
   from()->print_on(st, "from ");
   to()->print_on(st, "to   ");
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 975b0b5f98a..2725f1105f1 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -445,6 +445,6 @@ void TenuredGeneration::print_on(outputStream* st)  const {
             capacity()/K, used()/K);
   _virtual_space.print_space_boundaries_on(st);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   _the_space->print_on(st, "the  ");
 }
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index f0b90edeb79..07015d836ca 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -112,7 +112,7 @@ void GCHeapLog::log_heap(CollectedHeap* heap, bool before) {
                  heap->total_full_collections());
 
   {
-    StreamAutoIndentor indentor(&st, 1);
+    StreamIndentor si(&st, 1);
     heap->print_heap_on(&st);
     MetaspaceUtils::print_on(&st);
   }
@@ -169,7 +169,7 @@ void CollectedHeap::print_heap_before_gc() {
     LogStream ls(lt);
     ls.print_cr("Heap before GC invocations=%u (full %u):", total_collections(), total_full_collections());
 
-    StreamAutoIndentor indentor(&ls, 1);
+    StreamIndentor si(&ls, 1);
     print_heap_on(&ls);
     MetaspaceUtils::print_on(&ls);
   }
@@ -185,7 +185,7 @@ void CollectedHeap::print_heap_after_gc() {
     LogStream ls(lt);
     ls.print_cr("Heap after GC invocations=%u (full %u):", total_collections(), total_full_collections());
 
-    StreamAutoIndentor indentor(&ls, 1);
+    StreamIndentor si(&ls, 1);
     print_heap_on(&ls);
     MetaspaceUtils::print_on(&ls);
   }
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index ddfa5775fb2..5beee94e8aa 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -359,7 +359,7 @@ void ZHeap::print_page_table_on(outputStream* st) const {
   // Print all pages
   st->print_cr("ZGC Page Table:");
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
 
   ZPageTableIterator iter(&_page_table);
   for (ZPage* page; iter.next(&page);) {
diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index f2bea439df2..220176b638d 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -592,7 +592,7 @@ void ZMappedCache::print_on(outputStream* st) const {
   }
 
   // Print information on size classes
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
 
   st->print("size classes ");
   st->fill_to(17);
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index ef4ea76f22f..bf8ddf3e8dc 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -1160,7 +1160,7 @@ void ZPartition::print_on(outputStream* st) const {
   st->print_cr("used %zuM, capacity %zuM, max capacity %zuM",
                _used / M, _capacity / M, _max_capacity / M);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   print_cache_on(st);
 }
 
@@ -1171,7 +1171,7 @@ void ZPartition::print_cache_on(outputStream* st) const {
 void ZPartition::print_cache_extended_on(outputStream* st) const {
   st->print_cr("Partition %u", _numa_id);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   _cache.print_extended_on(st);
 }
 
@@ -2415,7 +2415,7 @@ void ZPageAllocator::print_usage_on(outputStream* st) const {
 
   print_total_usage_on(st);
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   print_partition_usage_on(st);
 
   if (locked) {
@@ -2448,7 +2448,7 @@ void ZPageAllocator::print_partition_usage_on(outputStream* st) const {
 void ZPageAllocator::print_cache_extended_on(outputStream* st) const {
   st->print_cr("ZMappedCache:");
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
 
   if (!try_lock_on_error(&_lock)) {
     // We can't print without taking the lock since printing the contents of
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index c28360e5553..7eca79142a6 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -227,7 +227,7 @@ void MetaspaceUtils::print_on(outputStream* out) {
                 stats.reserved()/K);
 
   if (Metaspace::using_class_space()) {
-    StreamAutoIndentor indentor(out, 1);
+    StreamIndentor si(out, 1);
     out->print("class space ");
     out->fill_to(17);
     out->print_cr("used %zuK, "
diff --git a/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
index d4cf551d054..aab46d64db5 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.cpp
@@ -150,14 +150,14 @@ InUseChunkStats ArenaStats::totals() const {
 }
 
 void ArenaStats::print_on(outputStream* st, size_t scale,  bool detailed) const {
-  streamIndentor sti(st);
   if (detailed) {
-    st->cr_indent();
+    StreamIndentor si(st, 2);
+    st->cr();
     st->print("Usage by chunk level:");
     {
-      streamIndentor sti2(st);
+      StreamIndentor si2(st, 2);
       for (chunklevel_t l = chunklevel::LOWEST_CHUNK_LEVEL; l <= chunklevel::HIGHEST_CHUNK_LEVEL; l++) {
-        st->cr_indent();
+        st->cr();
         chunklevel::print_chunk_size(st, l);
         st->print(" chunks: ");
         if (_stats[l]._num == 0) {
@@ -167,12 +167,12 @@ void ArenaStats::print_on(outputStream* st, size_t scale,  bool detailed) const
         }
       }
 
-      st->cr_indent();
+      st->cr();
       st->print("%15s: ", "-total-");
       totals().print_on(st, scale);
     }
     if (_free_blocks_num > 0) {
-      st->cr_indent();
+      st->cr();
       st->print("deallocated: %zu blocks with ", _free_blocks_num);
       print_scaled_words(st, _free_blocks_word_size, scale);
     }
@@ -203,8 +203,8 @@ ArenaStats ClmsStats::totals() const {
 }
 
 void ClmsStats::print_on(outputStream* st, size_t scale, bool detailed) const {
-  streamIndentor sti(st);
-  st->cr_indent();
+  StreamIndentor si(st, 2);
+  st->cr();
   if (Metaspace::using_class_space()) {
     st->print("Non-Class: ");
   }
@@ -213,13 +213,13 @@ void ClmsStats::print_on(outputStream* st, size_t scale, bool detailed) const {
     st->cr();
   }
   if (Metaspace::using_class_space()) {
-    st->cr_indent();
+    st->cr();
     st->print("    Class: ");
     _arena_stats_class.print_on(st, scale, detailed);
     if (detailed) {
       st->cr();
     }
-    st->cr_indent();
+    st->cr();
     st->print("     Both: ");
     totals().print_on(st, scale, detailed);
     if (detailed) {
diff --git a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
index 8dc16cd1777..d366038ceb1 100644
--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp
@@ -143,8 +143,8 @@ void PrintCLDMetaspaceInfoClosure::do_cld(ClassLoaderData* cld) {
 
     if (_do_print_classes) {
       // Print a detailed description of all loaded classes.
-      streamIndentor sti(_out, 6);
-      _out->cr_indent();
+      _out->cr();
+      StreamIndentor sai(_out, 6);
       _out->print("Loaded classes");
       if (ckc._num_classes_shared > 0) {
         _out->print("('s' = shared)");
@@ -152,7 +152,7 @@ void PrintCLDMetaspaceInfoClosure::do_cld(ClassLoaderData* cld) {
       _out->print(":");
       PrintMetaspaceInfoKlassClosure pkic(_out, true);
       cld->classes_do(&pkic);
-      _out->cr_indent();
+      _out->cr();
       _out->print("-total-: ");
       print_number_of_classes(_out, ckc._num_classes, ckc._num_classes_shared);
     } else {
diff --git a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp
index d91ee55ef97..d0d68203759 100644
--- a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp
+++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.cpp
@@ -36,7 +36,7 @@ PrintMetaspaceInfoKlassClosure::PrintMetaspaceInfoKlassClosure(outputStream* out
 
 void PrintMetaspaceInfoKlassClosure::do_klass(Klass* k) {
   _cnt++;
-  _out->cr_indent();
+  _out->cr();
   _out->print("%4zu: ", _cnt);
 
   // Print a 's' for shared classes
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 156c96d621f..ffdeec06ef8 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1160,7 +1160,7 @@ void Universe::print_on(outputStream* st) {
   GCMutexLocker hl(Heap_lock); // Heap_lock might be locked by caller thread.
   st->print_cr("Heap");
 
-  StreamAutoIndentor indentor(st, 1);
+  StreamIndentor si(st, 1);
   heap()->print_heap_on(st);
   MetaspaceUtils::print_on(st);
 }
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 2c2d629f032..92a168248d2 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -424,7 +424,7 @@ void VirtualSpace::check_for_contiguity() {
 void VirtualSpace::print_on(outputStream* out) const {
   out->print_cr("Virtual space:%s", special() ? " (pinned in memory)" : "");
 
-  StreamAutoIndentor indentor(out, 1);
+  StreamIndentor si(out, 1);
   out->print_cr("- committed: %zu", committed_size());
   out->print_cr("- reserved:  %zu", reserved_size());
   out->print_cr("- [low, high]:     [" PTR_FORMAT ", " PTR_FORMAT "]",  p2i(low()), p2i(high()));
diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index 804a03f45e5..2482c84a35b 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -237,7 +237,7 @@ MappingPrintSession::MappingPrintSession(outputStream* st, const CachedNMTInform
 {}
 
 void MappingPrintSession::print_nmt_flag_legend() const {
-#define DO(flag, shortname, text) _out->indent(); _out->print_cr("%10s: %s", shortname, text);
+#define DO(flag, shortname, text) _out->print_cr("%10s: %s", shortname, text);
   NMT_FLAGS_DO(DO)
 #undef DO
 }
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index 512e1975929..f7d7e121462 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -36,7 +36,7 @@
 #include "utilities/ostream.hpp"
 
 #define INDENT_BY(num_chars, CODE) { \
-  streamIndentor si(out, num_chars); \
+  StreamIndentor si(out, num_chars); \
   { CODE }                           \
 }
 
@@ -51,7 +51,7 @@ static ssize_t counter_diff(size_t c1, size_t c2) {
 }
 
 MemReporterBase::MemReporterBase(outputStream* out, size_t scale) :
-  _scale(scale), _output(out), _auto_indentor(out) {}
+  _scale(scale), _output(out) {}
 
 size_t MemReporterBase::reserved_total(const MallocMemory* malloc, const VirtualMemory* vm) {
   return malloc->malloc_size() + malloc->arena_size() + vm->reserved();
@@ -230,7 +230,7 @@ void MemSummaryReporter::report_summary_of_tag(MemTag mem_tag,
 #endif
   out->print_cr(")");
 
-  streamIndentor si(out, indent);
+  StreamIndentor si(out, indent);
 
   if (mem_tag == mtClass) {
     // report class count
@@ -641,7 +641,7 @@ void MemSummaryDiffReporter::diff_summary_of_tag(MemTag mem_tag,
       early_reserved_amount, early_committed_amount);
     out->print_cr(")");
 
-    streamIndentor si(out, indent);
+    StreamIndentor si(out, indent);
 
     // detail lines
     if (mem_tag == mtClass) {
diff --git a/src/hotspot/share/nmt/memReporter.hpp b/src/hotspot/share/nmt/memReporter.hpp
index 2238d42f15f..bab8de138d0 100644
--- a/src/hotspot/share/nmt/memReporter.hpp
+++ b/src/hotspot/share/nmt/memReporter.hpp
@@ -40,7 +40,6 @@ class MemReporterBase : public StackObj {
  private:
   const size_t  _scale;         // report in this scale
   outputStream* const _output;  // destination
-  StreamAutoIndentor _auto_indentor;
 
  public:
 
diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp
index 933fb30b123..d753a57ede7 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.cpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.cpp
@@ -90,7 +90,7 @@ void MemoryFileTracker::print_report_on(const MemoryFile* file, outputStream* st
                        NMTUtil::scale_name(scale),
                        NMTUtil::tag_to_name(prev->val().out.mem_tag()));
       {
-        streamIndentor si(stream, 4);
+        StreamIndentor si(stream, 4);
         _stack_storage.get(prev->val().out.stack()).print_on(stream);
       }
       stream->cr();
diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp
index e95bc776ce5..f3c469f1486 100644
--- a/src/hotspot/share/utilities/ostream.cpp
+++ b/src/hotspot/share/utilities/ostream.cpp
@@ -161,6 +161,12 @@ void outputStream::do_vsnprintf_and_write(const char* format, va_list ap, bool a
   }
 }
 
+bool outputStream::set_autoindent(bool value) {
+  const bool old = _autoindent;
+  _autoindent = value;
+  return old;
+}
+
 void outputStream::print(const char* format, ...) {
   va_list ap;
   va_start(ap, format);
@@ -225,10 +231,6 @@ void outputStream::cr() {
   this->write("\n", 1);
 }
 
-void outputStream::cr_indent() {
-  cr(); indent();
-}
-
 void outputStream::stamp() {
   if (! _stamp.is_updated()) {
     _stamp.update(); // start at 0 on first call to stamp()
@@ -277,12 +279,6 @@ outputStream& outputStream::indent() {
   return *this;
 }
 
-bool outputStream::set_autoindent(bool value) {
-  const bool old = _autoindent;
-  _autoindent = value;
-  return old;
-}
-
 void outputStream::print_jlong(jlong value) {
   print(JLONG_FORMAT, value);
 }
@@ -300,16 +296,16 @@ void outputStream::print_julong(julong value) {
  * 0000020: 0000 0000 0000 0040 0000 0000 0000 015d  .......@.......]
  * ...
  *
- * indent is applied to each line.  Ends with a CR.
+ * Ends with a CR.
  */
 void outputStream::print_data(void* data, size_t len, bool with_ascii, bool rel_addr) {
   size_t limit = (len + 16) / 16 * 16;
   for (size_t i = 0; i < limit; ++i) {
     if (i % 16 == 0) {
       if (rel_addr) {
-        indent().print("%07" PRIxPTR ":", i);
+        print("%07" PRIxPTR ":", i);
       } else {
-        indent().print(PTR_FORMAT ":", p2i((unsigned char*)data + i));
+        print(PTR_FORMAT ":", p2i((unsigned char*)data + i));
       }
     }
     if (i % 2 == 0) {
diff --git a/src/hotspot/share/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp
index 0a99ee886ad..79e95734a53 100644
--- a/src/hotspot/share/utilities/ostream.hpp
+++ b/src/hotspot/share/utilities/ostream.hpp
@@ -44,6 +44,8 @@ DEBUG_ONLY(class ResourceMark;)
 // -XX:+DisplayVMOutputToStderr.
 
 class outputStream : public CHeapObjBase {
+  friend class StreamIndentor;
+
  private:
    NONCOPYABLE(outputStream);
    int _indentation; // current indentation
@@ -87,6 +89,9 @@ class outputStream : public CHeapObjBase {
    // calls do_vsnprintf, then writes output to stream.
    void do_vsnprintf_and_write(const char* format, va_list ap, bool add_cr) ATTRIBUTE_PRINTF(2, 0);
 
+   // Automatic indentation. Returns old autoindent state.
+   bool set_autoindent(bool value);
+
  public:
    class TestSupport;  // Unit test support
 
@@ -104,14 +109,6 @@ class outputStream : public CHeapObjBase {
    int fill_to(int col);
    void move_to(int col, int slop = 6, int min_space = 2);
 
-   // Automatic indentation:
-   // If autoindent mode is on, the following APIs will automatically indent
-   // line starts depending on the current indentation level:
-   // print(), print_cr(), print_raw(), print_raw_cr()
-   // Other APIs are unaffected
-   // Returns old autoindent state.
-   bool set_autoindent(bool value);
-
    // sizing
    int position() const { return _position; }
    julong count() const { return _precount + _position; }
@@ -135,7 +132,6 @@ class outputStream : public CHeapObjBase {
    void put(char ch);
    void sp(int count = 1);
    void cr();
-   void cr_indent();
    void bol() { if (_position > 0)  cr(); }
 
 
@@ -175,25 +171,29 @@ class outputStream : public CHeapObjBase {
 // ANSI C++ name collision
 extern outputStream* tty;           // tty output
 
-class streamIndentor : public StackObj {
-protected:
-  outputStream* const _str;
-  const int _amount;
-  NONCOPYABLE(streamIndentor);
-public:
-  streamIndentor(outputStream* str, int amt = 2) : _str(str), _amount(amt) {
-    _str->inc(_amount);
-  }
-  ~streamIndentor() { _str->dec(_amount); }
-};
+// outputStream indentation. When used, indentation is automatically applied
+// when printing on the stream using the following APIs:
+// print(), print_cr(), print_raw(), print_raw_cr()
+class StreamIndentor {
+ private:
+  outputStream* const _stream;
+  const int           _indentation;
+  const bool          _old_autoindent;
+  NONCOPYABLE(StreamIndentor);
 
-class StreamAutoIndentor : public streamIndentor {
-  const bool _old;
-  NONCOPYABLE(StreamAutoIndentor);
  public:
-  StreamAutoIndentor(outputStream* os, int indentation = 0) :
-    streamIndentor(os, indentation), _old(os->set_autoindent(true)) {}
-  ~StreamAutoIndentor() { _str->set_autoindent(_old); }
+  StreamIndentor(outputStream* os, int indentation) :
+    _stream(os),
+    _indentation(indentation),
+    _old_autoindent(_stream->set_autoindent(true)) {
+
+    _stream->inc(_indentation);
+  }
+
+  ~StreamIndentor() {
+    _stream->dec(_indentation);
+    _stream->set_autoindent(_old_autoindent);
+  }
 };
 
 // advisory locking for the shared tty stream:
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 2b88369cb37..24d649e1f11 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -1201,7 +1201,7 @@ void VMError::report(outputStream* st, bool _verbose) {
 
     if (Universe::heap() != nullptr) {
       st->print_cr("Heap:");
-      StreamAutoIndentor indentor(st, 1);
+      StreamIndentor si(st, 1);
       Universe::heap()->print_heap_on(st);
       MetaspaceUtils::print_on(st);
       st->cr();
@@ -1402,7 +1402,7 @@ void VMError::print_vm_info(outputStream* st) {
       GCLogPrecious::print_on_error(st);
 
       st->print_cr("Heap:");
-      StreamAutoIndentor indentor(st, 1);
+      StreamIndentor si(st, 1);
       Universe::heap()->print_heap_on(st);
       MetaspaceUtils::print_on(st);
       st->cr();
diff --git a/test/hotspot/gtest/utilities/test_ostream.cpp b/test/hotspot/gtest/utilities/test_ostream.cpp
index c703c4f91e3..60f7cd19b70 100644
--- a/test/hotspot/gtest/utilities/test_ostream.cpp
+++ b/test/hotspot/gtest/utilities/test_ostream.cpp
@@ -103,18 +103,17 @@ TEST_VM(ostream, bufferedStream_dynamic_small) {
   }
 }
 
-static void test_autoindent(bool on) {
+TEST_VM(ostream, streamIndentor) {
   stringStream ss;
-  const bool prior = ss.set_autoindent(on);
-  EXPECT_FALSE(prior);
+
   {
-    streamIndentor si(&ss, 5);
+    StreamIndentor si(&ss, 5);
     ss.print("ABC");
     ss.print("DEF");
     ss.cr();
     ss.print_cr("0123");
     {
-      streamIndentor si(&ss, 5);
+      StreamIndentor si(&ss, 5);
       ss.print_cr("4567");
       ss.print_raw("89AB");
       ss.print_raw("CDEXXXX", 3);
@@ -126,33 +125,16 @@ static void test_autoindent(bool on) {
   }
   ss.print("end");
 
-  if (on) {
-    EXPECT_STREQ(ss.base(),
-        "     ABCDEF\n"
-        "     0123\n"
-        "          4567\n"
-        "          89ABCDEXYZ\n"
-        "     100KB\n"
-        "end"
-    );
-  } else {
-    // no autoindent: calls should work as always without indentation
-    EXPECT_STREQ(ss.base(),
-        "ABCDEF\n"
-        "0123\n"
-        "4567\n"
-        "89ABCDEXYZ\n"
-        "100KB\n"
-        "end"
-    );
-  }
-  bool prior2 = ss.set_autoindent(prior);
-  EXPECT_EQ(prior2, on);
+  EXPECT_STREQ(ss.base(),
+      "     ABCDEF\n"
+      "     0123\n"
+      "          4567\n"
+      "          89ABCDEXYZ\n"
+      "     100KB\n"
+      "end"
+  );
 }
 
-TEST_VM(ostream, autoindent_on)  { test_autoindent(true);  }
-TEST_VM(ostream, autoindent_off) { test_autoindent(false); }
-
 /* Activate to manually test bufferedStream dynamic cap.
 
 TEST_VM(ostream, bufferedStream_dynamic_large) {

From e4638954284a5e0592c27421ca53df0002bd0845 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 12 May 2025 16:31:12 +0000
Subject: [PATCH 403/901] 8356657: Use stable source-date for cmp-baseline jib
 profiles

Reviewed-by: liach, iris, alanb, jpai, erikj
---
 make/conf/jib-profiles.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 172ed74f4cd..30b857f6591 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -862,7 +862,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             profiles[cmpBaselineName].configure_args = concat(
                 profiles[cmpBaselineName].configure_args,
                 "--with-hotspot-build-time=n/a",
-                "--disable-precompiled-headers");
+                "--disable-precompiled-headers",
+                "--with-source-date=version");
             // Do not inherit artifact definitions from base profile
             delete profiles[cmpBaselineName].artifacts;
         });

From 50dced88ff1aed23bb4c8fe9e4a08e6cc200b897 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 12 May 2025 16:31:24 +0000
Subject: [PATCH 404/901] 8356656: Drop unused DEVKIT_HOME from jib-profiles.js

Reviewed-by: erikj
---
 make/conf/jib-profiles.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 30b857f6591..c2ae584c417 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1152,10 +1152,7 @@ var getJibProfilesDependencies = function (input, common) {
             organization: common.organization,
             ext: "tar.gz",
             module: "devkit-" + devkit_cross_prefix + devkit_platform,
-            revision: devkit_platform_revisions[devkit_platform],
-            environment: {
-                "DEVKIT_HOME": input.get("devkit", "home_path"),
-            }
+            revision: devkit_platform_revisions[devkit_platform]
         },
 
         build_devkit: {

From 8d7866ef5fbf98eae6f30c4a6199a0e709f445a5 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 12 May 2025 16:48:13 +0000
Subject: [PATCH 405/901] 8356606: (fs) PosixFileAttributes.permissions()
 implementations should return an EnumSet

Reviewed-by: liach, alanb
---
 .../unix/classes/sun/nio/fs/UnixFileAttributes.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
index 2a036d22aed..6fc86b66735 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.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
@@ -31,7 +31,7 @@
 import java.nio.file.attribute.PosixFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.UserPrincipal;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -239,7 +239,7 @@ public GroupPrincipal group() {
     @Override
     public Set<PosixFilePermission> permissions() {
         int bits = (st_mode & UnixConstants.S_IAMB);
-        HashSet<PosixFilePermission> perms = new HashSet<>();
+        EnumSet<PosixFilePermission> perms = EnumSet.noneOf(PosixFilePermission.class);
 
         if ((bits & UnixConstants.S_IRUSR) > 0)
             perms.add(PosixFilePermission.OWNER_READ);

From 45dfc2c6d6d6b2b0749347b0150bb22d49f12767 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 12 May 2025 16:49:42 +0000
Subject: [PATCH 406/901] 8353642: Deprecate URL::getPermission method and
 networking permission classes for removal

Reviewed-by: djelinski, iris, mullan, michaelm
---
 .../share/classes/java/net/HttpURLConnection.java         | 8 +++++++-
 src/java.base/share/classes/java/net/NetPermission.java   | 5 +++--
 src/java.base/share/classes/java/net/URLConnection.java   | 7 ++++++-
 src/java.base/share/classes/java/net/URLPermission.java   | 3 ++-
 .../sun/net/www/protocol/file/FileURLConnection.java      | 2 ++
 .../sun/net/www/protocol/ftp/FtpURLConnection.java        | 4 +++-
 .../net/www/protocol/https/HttpsURLConnectionImpl.java    | 5 ++++-
 .../sun/net/www/protocol/jar/JarURLConnection.java        | 5 ++++-
 .../share/classes/sun/nio/ch/UnixDomainSockets.java       | 6 +-----
 .../sun/net/www/protocol/file/UNCFileURLConnection.java   | 3 ++-
 src/jdk.net/share/classes/jdk/net/NetworkPermission.java  | 5 +++--
 11 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java
index 20b9068e7f3..8ecbb98e7c6 100644
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.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
@@ -606,7 +606,13 @@ public long getHeaderFieldDate(String name, long defaultValue) {
      * @return a {@code SocketPermission} object representing the
      *         permission necessary to connect to the destination
      *         host and port.
+     *
+     * @deprecated
+     * Permissions can no longer be used for controlling access to resources
+     * as the Security Manager is no longer supported.
      */
+    @Deprecated(since = "25", forRemoval = true)
+    @SuppressWarnings("removal")
     public Permission getPermission() throws IOException {
         int port = url.getPort();
         port = port < 0 ? 80 : port;
diff --git a/src/java.base/share/classes/java/net/NetPermission.java b/src/java.base/share/classes/java/net/NetPermission.java
index 7c52ba5ae7c..d2a086e9c3a 100644
--- a/src/java.base/share/classes/java/net/NetPermission.java
+++ b/src/java.base/share/classes/java/net/NetPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 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
@@ -40,7 +40,7 @@
  * to signify a wildcard match. For example: "foo.*" and "*" signify a wildcard
  * match, while "*foo" and "a*b" do not.
  *
- * @apiNote
+ * @deprecated
  * This permission cannot be used for controlling access to resources
  * as the Security Manager is no longer supported.
  *
@@ -56,6 +56,7 @@
  * @since 1.2
  */
 
+@Deprecated(since = "25", forRemoval = true)
 public final class NetPermission extends BasicPermission {
     @java.io.Serial
     private static final long serialVersionUID = -8343910153355041693L;
diff --git a/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java
index 585ab4fa15a..9bb9dec0458 100644
--- a/src/java.base/share/classes/java/net/URLConnection.java
+++ b/src/java.base/share/classes/java/net/URLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 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
@@ -822,7 +822,12 @@ public Object getContent(Class<?>[] classes) throws IOException {
      * @throws    IOException if the computation of the permission
      * requires network or file I/O and an exception occurs while
      * computing it.
+     *
+     * @deprecated
+     * Permissions can no longer be used for controlling access to resources
+     * as the Security Manager is no longer supported.
      */
+    @Deprecated(since = "25", forRemoval = true)
     public Permission getPermission() throws IOException {
         return SecurityConstants.ALL_PERMISSION;
     }
diff --git a/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java
index daf3e99a6a0..bf87cad8077 100644
--- a/src/java.base/share/classes/java/net/URLPermission.java
+++ b/src/java.base/share/classes/java/net/URLPermission.java
@@ -143,7 +143,7 @@
  * with initial letter of each word capitalized). Either list can contain a wild-card '*'
  * character which signifies all request methods or headers respectively.
  *
- * @apiNote
+ * @deprecated
  * This permission cannot be used for controlling access to resources
  * as the Security Manager is no longer supported.
  *
@@ -154,6 +154,7 @@
  *      RFC 2732: Format for Literal IPv6 Addresses in URL's
  * @since 1.8
  */
+@Deprecated(since = "25", forRemoval = true)
 public final class URLPermission extends Permission {
 
     @java.io.Serial
diff --git a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
index 98ff8709aa4..fc947f8977f 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/file/FileURLConnection.java
@@ -210,6 +210,8 @@ public synchronized InputStream getInputStream()
     /* since getOutputStream isn't supported, only read permission is
      * relevant
      */
+    @Override
+    @Deprecated(since = "25", forRemoval = true)
     @SuppressWarnings("removal")
     public Permission getPermission() throws IOException {
         if (permission == null) {
diff --git a/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
index 493fda1c1b3..be24f1133f2 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -569,6 +569,8 @@ String guessContentTypeFromFilename(String fname) {
      * @return  The {@code Permission} object.
      */
     @Override
+    @Deprecated(since = "25", forRemoval = true)
+    @SuppressWarnings("removal")
     public Permission getPermission() {
         if (permission == null) {
             int urlport = url.getPort();
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
index 2096957d289..26c9e0188d1 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, 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
@@ -355,6 +355,9 @@ public long getHeaderFieldDate(String name, long defaultValue) {
         return delegate.getHeaderFieldDate(name, defaultValue);
     }
 
+    @Override
+    @Deprecated(since = "25", forRemoval = true)
+    @SuppressWarnings("removal")
     public Permission getPermission() throws IOException {
         return delegate.getPermission();
     }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
index 85d36fe2320..3a346308f71 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jar/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
@@ -77,6 +77,9 @@ public JarEntry getJarEntry() throws IOException {
         return jarEntry;
     }
 
+    @Override
+    @Deprecated(since = "25", forRemoval = true)
+    @SuppressWarnings("removal")
     public Permission getPermission() throws IOException {
         return jarFileURLConnection.getPermission();
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/UnixDomainSockets.java b/src/java.base/share/classes/sun/nio/ch/UnixDomainSockets.java
index 128694cb52d..66c9fa40f2e 100644
--- a/src/java.base/share/classes/sun/nio/ch/UnixDomainSockets.java
+++ b/src/java.base/share/classes/sun/nio/ch/UnixDomainSockets.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
@@ -28,7 +28,6 @@
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.net.BindException;
-import java.net.NetPermission;
 import java.net.SocketAddress;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.UnsupportedAddressTypeException;
@@ -52,9 +51,6 @@ private static class UnnamedHolder {
 
     private static final String tempDir = UnixDomainSocketsUtil.getTempDir();
 
-    private static final NetPermission accessUnixDomainSocket =
-            new NetPermission("accessUnixDomainSocket");
-
     static boolean isSupported() {
         return supported;
     }
diff --git a/src/java.base/windows/classes/sun/net/www/protocol/file/UNCFileURLConnection.java b/src/java.base/windows/classes/sun/net/www/protocol/file/UNCFileURLConnection.java
index d5a510d8f31..0a86d3942f3 100644
--- a/src/java.base/windows/classes/sun/net/www/protocol/file/UNCFileURLConnection.java
+++ b/src/java.base/windows/classes/sun/net/www/protocol/file/UNCFileURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 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
@@ -42,6 +42,7 @@ final class UNCFileURLConnection extends FileURLConnection {
 
     @Override
     @SuppressWarnings("removal")
+    @Deprecated(since = "25", forRemoval = true)
     public Permission getPermission() {
         Permission perm = permission;
         if (perm == null) {
diff --git a/src/jdk.net/share/classes/jdk/net/NetworkPermission.java b/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
index 7aac1fb1120..c654f821e9d 100644
--- a/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
+++ b/src/jdk.net/share/classes/jdk/net/NetworkPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -32,7 +32,7 @@
  * defined in the jdk.net package. These permissions contain a target
  * name, but no actions list. Callers either possess the permission or not.
  *
- * @apiNote
+ * @deprecated
  * This permission cannot be used for controlling access to resources
  * as the Security Manager is no longer supported.
  *
@@ -41,6 +41,7 @@
  * @since 1.8
  */
 
+@Deprecated(since = "25", forRemoval = true)
 public final class NetworkPermission extends BasicPermission {
 
     private static final long serialVersionUID = -2012939586906722291L;

From 0f5c608143413bc0d40fca31e097c7b40c7a6618 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 12 May 2025 20:01:43 +0000
Subject: [PATCH 407/901] 8356695: java/lang/StringBuilder/HugeCapacity.java
 failing with OOME

Reviewed-by: liach, lancea, rgiulietti
---
 test/jdk/java/lang/StringBuilder/HugeCapacity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/lang/StringBuilder/HugeCapacity.java b/test/jdk/java/lang/StringBuilder/HugeCapacity.java
index e8440915f8a..30c2756c570 100644
--- a/test/jdk/java/lang/StringBuilder/HugeCapacity.java
+++ b/test/jdk/java/lang/StringBuilder/HugeCapacity.java
@@ -32,8 +32,8 @@
  *          necessary
  * @modules java.base/jdk.internal.util
  * @requires (sun.arch.data.model == "64" & os.maxMemory >= 8G)
- * @run main/othervm -Xms6G -Xmx6G -XX:+CompactStrings HugeCapacity true
- * @run main/othervm -Xms6G -Xmx6G -XX:-CompactStrings HugeCapacity false
+ * @run main/othervm -Xms8G -Xmx8G -XX:-CompactStrings -Xlog:gc HugeCapacity false
+ * @run main/othervm -Xms8G -Xmx8G -XX:+CompactStrings -Xlog:gc HugeCapacity true
  */
 
 public class HugeCapacity {

From 2595fcc7cc49912d8ac54803a5f74e6f0a45f06f Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 12 May 2025 20:29:42 +0000
Subject: [PATCH 408/901] 8356192: Enable AOT code caching only on supported
 platforms

Reviewed-by: shade, mdoerr, fyang
---
 src/hotspot/share/code/aotCodeCache.cpp                    | 7 +++++++
 .../jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java     | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 12706ef3e99..ff9f82f5488 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -89,8 +89,14 @@ uint AOTCodeCache::max_aot_code_size() {
 }
 
 void AOTCodeCache::initialize() {
+#if defined(ZERO) || !(defined(AMD64) || defined(AARCH64))
+  log_info(aot, codecache, init)("AOT Code Cache is not supported on this platform.");
+  AOTAdapterCaching = false;
+  return;
+#else
   if (FLAG_IS_DEFAULT(AOTCache)) {
     log_info(aot, codecache, init)("AOT Code Cache is not used: AOTCache is not specified.");
+    AOTAdapterCaching = false;
     return; // AOTCache must be specified to dump and use AOT code
   }
 
@@ -133,6 +139,7 @@ void AOTCodeCache::initialize() {
     FLAG_SET_DEFAULT(ForceUnreachable, true);
   }
   FLAG_SET_DEFAULT(DelayCompilerStubsGeneration, false);
+#endif // defined(AMD64) || defined(AARCH64)
 }
 
 void AOTCodeCache::init2() {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index 24479535057..7532db8a1e8 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -27,6 +27,8 @@
  * @summary Sanity test of combinations of the AOT Code Caching diagnostic flags
  * @requires vm.cds
  * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.flavor != "zero"
+ * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
  * @requires vm.flagless
  * @comment work around JDK-8345635
  * @requires !vm.jvmci.enabled

From b6b5ac1ef9042ed62a8358aa6943b8dc87dcf0ab Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 12 May 2025 20:35:13 +0000
Subject: [PATCH 409/901] 8348351: Improve lazy initialization of the available
 currencies set

Reviewed-by: liach, naoto
---
 .../share/classes/java/util/Currency.java     | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Currency.java b/src/java.base/share/classes/java/util/Currency.java
index 3aa966e83e8..febae04a77b 100644
--- a/src/java.base/share/classes/java/util/Currency.java
+++ b/src/java.base/share/classes/java/util/Currency.java
@@ -38,6 +38,7 @@
 import java.time.format.DateTimeParseException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 import java.util.spi.CurrencyNameProvider;
@@ -141,7 +142,8 @@ public final class Currency implements Serializable {
     // class data: instance map
 
     private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<>(7);
-    private static HashSet<Currency> available;
+    private static final Supplier<HashSet<Currency>> available =
+            StableValue.supplier(Currency::computeAllCurrencies);
 
     // Class data: currency data obtained from currency.data file.
     // Purpose:
@@ -447,7 +449,7 @@ public static Currency getInstance(Locale locale) {
      * @since 1.7
      */
     public static Set<Currency> getAvailableCurrencies() {
-        return new HashSet<>(getCurrencies());
+        return new HashSet<>(available.get());
     }
 
     /**
@@ -462,53 +464,52 @@ public static Set<Currency> getAvailableCurrencies() {
      * @since 25
      */
     public static Stream<Currency> availableCurrencies() {
-        return getCurrencies().stream();
+        return available.get().stream();
     }
 
-    // Returns the set of available Currencies which are lazily initialized
-    private static synchronized HashSet<Currency> getCurrencies() {
-        if (available == null) {
-            var sysTime = System.currentTimeMillis();
-            available = HashSet.newHashSet(256);
-
-            // Add simple currencies first
-            for (char c1 = 'A'; c1 <= 'Z'; c1 ++) {
-                for (char c2 = 'A'; c2 <= 'Z'; c2 ++) {
-                    int tableEntry = getMainTableEntry(c1, c2);
-                    if ((tableEntry & COUNTRY_TYPE_MASK) == SIMPLE_CASE_COUNTRY_MASK
-                            && tableEntry != INVALID_COUNTRY_ENTRY) {
-                        char finalChar = (char) ((tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) + 'A');
-                        int defaultFractionDigits = (tableEntry & SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK) >> SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT;
-                        int numericCode = (tableEntry & NUMERIC_CODE_MASK) >> NUMERIC_CODE_SHIFT;
-                        StringBuilder sb = new StringBuilder();
-                        sb.append(c1);
-                        sb.append(c2);
-                        sb.append(finalChar);
-                        available.add(getInstance(sb.toString(), defaultFractionDigits, numericCode));
-                    } else if ((tableEntry & COUNTRY_TYPE_MASK) == SPECIAL_CASE_COUNTRY_MASK
-                            && tableEntry != INVALID_COUNTRY_ENTRY
-                            && tableEntry != COUNTRY_WITHOUT_CURRENCY_ENTRY) {
-                        int index = SpecialCaseEntry.toIndex(tableEntry);
-                        SpecialCaseEntry scEntry = specialCasesList.get(index);
-
-                        if (scEntry.cutOverTime == Long.MAX_VALUE
-                                || sysTime < scEntry.cutOverTime) {
-                            available.add(getInstance(scEntry.oldCurrency,
-                                    scEntry.oldCurrencyFraction,
-                                    scEntry.oldCurrencyNumericCode));
-                        } else {
-                            available.add(getInstance(scEntry.newCurrency,
-                                    scEntry.newCurrencyFraction,
-                                    scEntry.newCurrencyNumericCode));
-                        }
+    // Builds and returns the set of available Currencies
+    private static HashSet<Currency> computeAllCurrencies() {
+        var sysTime = System.currentTimeMillis();
+        HashSet<Currency> available = HashSet.newHashSet(256);
+
+        for (char c1 = 'A'; c1 <= 'Z'; c1 ++) {
+            for (char c2 = 'A'; c2 <= 'Z'; c2 ++) {
+                int tableEntry = getMainTableEntry(c1, c2);
+                if ((tableEntry & COUNTRY_TYPE_MASK) == SIMPLE_CASE_COUNTRY_MASK
+                        && tableEntry != INVALID_COUNTRY_ENTRY) {
+                    // Simple Currencies
+                    char finalChar = (char) ((tableEntry & SIMPLE_CASE_COUNTRY_FINAL_CHAR_MASK) + 'A');
+                    int defaultFractionDigits = (tableEntry & SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_MASK) >> SIMPLE_CASE_COUNTRY_DEFAULT_DIGITS_SHIFT;
+                    int numericCode = (tableEntry & NUMERIC_CODE_MASK) >> NUMERIC_CODE_SHIFT;
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(c1);
+                    sb.append(c2);
+                    sb.append(finalChar);
+                    available.add(getInstance(sb.toString(), defaultFractionDigits, numericCode));
+                } else if ((tableEntry & COUNTRY_TYPE_MASK) == SPECIAL_CASE_COUNTRY_MASK
+                        && tableEntry != INVALID_COUNTRY_ENTRY
+                        && tableEntry != COUNTRY_WITHOUT_CURRENCY_ENTRY) {
+                    // Special Currencies
+                    int index = SpecialCaseEntry.toIndex(tableEntry);
+                    SpecialCaseEntry scEntry = specialCasesList.get(index);
+
+                    if (scEntry.cutOverTime == Long.MAX_VALUE
+                            || sysTime < scEntry.cutOverTime) {
+                        available.add(getInstance(scEntry.oldCurrency,
+                                scEntry.oldCurrencyFraction,
+                                scEntry.oldCurrencyNumericCode));
+                    } else {
+                        available.add(getInstance(scEntry.newCurrency,
+                                scEntry.newCurrencyFraction,
+                                scEntry.newCurrencyNumericCode));
                     }
                 }
             }
+        }
 
-            // Now add other currencies
-            for (OtherCurrencyEntry entry : otherCurrenciesList) {
-                available.add(getInstance(entry.currencyCode));
-            }
+        // Other Currencies
+        for (OtherCurrencyEntry entry : otherCurrenciesList) {
+            available.add(getInstance(entry.currencyCode));
         }
         return available;
     }

From c23469df162498e30119f43bc3d1effa15574a42 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Mon, 12 May 2025 23:14:27 +0000
Subject: [PATCH 410/901] 8355340: GenShen: Remove unneeded log messages
 related to remembered set write table

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

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 0634cba91d8..f581e8ef9ea 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -120,7 +120,7 @@ void ShenandoahDirectCardMarkRememberedSet::mark_read_table_as_clean() {
     *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));
+  log_develop_debug(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.
@@ -616,7 +616,7 @@ void ShenandoahDirectCardMarkRememberedSet::merge_write_table(HeapWord* start, s
     read_table[i] &= write_table[i];
   }
 
-  log_info(gc, remset)("Finished merging write_table into read_table.");
+  log_develop_debug(gc, remset)("Finished merging write_table into read_table.");
 }
 
 void ShenandoahDirectCardMarkRememberedSet::swap_card_tables() {
@@ -643,7 +643,7 @@ void ShenandoahDirectCardMarkRememberedSet::swap_card_tables() {
   // 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));
+  log_develop_debug(gc, barrier)("Current write_card_table: " PTR_FORMAT, p2i(swap_it._new_ptr));
 }
 
 ShenandoahScanRememberedTask::ShenandoahScanRememberedTask(ShenandoahObjToScanQueueSet* queue_set,

From 303f4101d44835b9c62f46d89137ad218228c132 Mon Sep 17 00:00:00 2001
From: Bhavana Kilambi <bkilambi@openjdk.org>
Date: Mon, 12 May 2025 23:21:17 +0000
Subject: [PATCH 411/901] 8355708: Two Float16 IR tests fail after JDK-8345125

Reviewed-by: jbhateja, haosun, mhaessig
---
 test/hotspot/jtreg/ProblemList.txt                             | 3 ---
 .../jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java  | 1 +
 .../jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 94c957f77b9..deab959c94e 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -78,9 +78,6 @@ compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
 
 compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all
 
-compiler/c2/irTests/TestFloat16ScalarOperations.java 8355708 linux-aarch64
-compiler/c2/irTests/MulHFNodeIdealizationTests.java 8355708 linux-aarch64
-
 #############################################################################
 
 # :hotspot_gc
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
index 82f43a9a097..291665ff90f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
@@ -53,6 +53,7 @@ public MulHFNodeIdealizationTests() {
     }
 
     @Test
+    @Warmup(value = 10000)
     @IR(counts = {IRNode.ADD_HF, "1"},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"},
         failOn = {IRNode.MUL_HF})
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
index 0acefad5d1d..c96146b8e39 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
@@ -608,6 +608,7 @@ public void checkRounding1() {
     }
 
     @Test
+    @Warmup(value = 10000)
     @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 "},
         applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})

From adebfa7ffda6383f5793278ced14a193066c5f6a Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Tue, 13 May 2025 03:06:36 +0000
Subject: [PATCH 412/901] 8356700: RISC-V: Declare incompressible scope in
 fill_words / zero_memory assembler routines

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     | 56 +++++++++----------
 .../cpu/riscv/c1_MacroAssembler_riscv.cpp     |  2 +-
 .../gc/shared/barrierSetAssembler_riscv.cpp   |  2 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        | 36 +++++++-----
 .../cpu/riscv/macroAssembler_riscv.hpp        |  4 +-
 src/hotspot/cpu/riscv/nativeInst_riscv.cpp    |  2 +-
 src/hotspot/cpu/riscv/riscv.ad                | 12 ++--
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |  4 +-
 8 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 63d5d4f3e61..caa465aed67 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -2516,17 +2516,17 @@ enum Nf {
 //    wrappers such as 'add' which do the compressing work through 'c_add' depending on the
 //    the operands of the instruction and availability of the RVC hardware extension.
 //
-// 2. 'CompressibleRegion' and 'IncompressibleRegion' are introduced to mark assembler scopes
+// 2. 'CompressibleScope' and 'IncompressibleScope' are introduced to mark assembler scopes
 //     within which instructions are qualified or unqualified to be compressed into their 16-bit
 //     versions. An example:
 //
-//      CompressibleRegion cr(_masm);
+//      CompressibleScope scope(_masm);
 //      __ add(...);       // this instruction will be compressed into 'c.add' when possible
 //      {
-//         IncompressibleRegion ir(_masm);
+//         IncompressibleScope scope(_masm);
 //         __ add(...);    // this instruction will not be compressed
 //         {
-//            CompressibleRegion cr(_masm);
+//            CompressibleScope scope(_masm);
 //            __ add(...); // this instruction will be compressed into 'c.add' when possible
 //         }
 //      }
@@ -2535,40 +2535,40 @@ enum Nf {
 //    distinguish compressed 16-bit instructions from normal 32-bit ones.
 
 private:
-  bool _in_compressible_region;
+  bool _in_compressible_scope;
 public:
-  bool in_compressible_region() const { return _in_compressible_region; }
-  void set_in_compressible_region(bool b) { _in_compressible_region = b; }
+  bool in_compressible_scope() const { return _in_compressible_scope; }
+  void set_in_compressible_scope(bool b) { _in_compressible_scope = b; }
 public:
 
-  // an abstract compressible region
-  class AbstractCompressibleRegion : public StackObj {
+  // An abstract compressible scope
+  class AbstractCompressibleScope : public StackObj {
   protected:
     Assembler *_masm;
-    bool _saved_in_compressible_region;
+    bool _saved_in_compressible_scope;
   protected:
-    AbstractCompressibleRegion(Assembler *_masm)
+    AbstractCompressibleScope(Assembler *_masm)
     : _masm(_masm)
-    , _saved_in_compressible_region(_masm->in_compressible_region()) {}
+    , _saved_in_compressible_scope(_masm->in_compressible_scope()) {}
   };
-  // a compressible region
-  class CompressibleRegion : public AbstractCompressibleRegion {
+  // A compressible scope
+  class CompressibleScope : public AbstractCompressibleScope {
   public:
-    CompressibleRegion(Assembler *_masm) : AbstractCompressibleRegion(_masm) {
-      _masm->set_in_compressible_region(true);
+    CompressibleScope(Assembler *_masm) : AbstractCompressibleScope(_masm) {
+      _masm->set_in_compressible_scope(true);
     }
-    ~CompressibleRegion() {
-      _masm->set_in_compressible_region(_saved_in_compressible_region);
+    ~CompressibleScope() {
+      _masm->set_in_compressible_scope(_saved_in_compressible_scope);
     }
   };
-  // an incompressible region
-  class IncompressibleRegion : public AbstractCompressibleRegion {
+  // An incompressible scope
+  class IncompressibleScope : public AbstractCompressibleScope {
   public:
-    IncompressibleRegion(Assembler *_masm) : AbstractCompressibleRegion(_masm) {
-      _masm->set_in_compressible_region(false);
+    IncompressibleScope(Assembler *_masm) : AbstractCompressibleScope(_masm) {
+      _masm->set_in_compressible_scope(false);
     }
-    ~IncompressibleRegion() {
-      _masm->set_in_compressible_region(_saved_in_compressible_region);
+    ~IncompressibleScope() {
+      _masm->set_in_compressible_scope(_saved_in_compressible_scope);
     }
   };
 
@@ -2583,13 +2583,13 @@ enum Nf {
   template <typename Callback>
   void relocate(RelocationHolder const& rspec, Callback emit_insts, int format = 0) {
     AbstractAssembler::relocate(rspec, format);
-    IncompressibleRegion ir(this);  // relocations
+    IncompressibleScope scope(this); // relocations
     emit_insts();
   }
   template <typename Callback>
   void relocate(relocInfo::relocType rtype, Callback emit_insts, int format = 0) {
     AbstractAssembler::relocate(rtype, format);
-    IncompressibleRegion ir(this);  // relocations
+    IncompressibleScope scope(this); // relocations
     emit_insts();
   }
 
@@ -3170,7 +3170,7 @@ enum Nf {
 
 public:
   bool do_compress() const {
-    return UseRVC && in_compressible_region();
+    return UseRVC && in_compressible_scope();
   }
 
   bool do_compress_zcb(Register reg1 = noreg, Register reg2 = noreg) const {
@@ -3838,7 +3838,7 @@ enum Nf {
     }
   }
 
-  Assembler(CodeBuffer* code) : AbstractAssembler(code), _in_compressible_region(true) {}
+  Assembler(CodeBuffer* code) : AbstractAssembler(code), _in_compressible_scope(true) {}
 };
 
 #endif // CPU_RISCV_ASSEMBLER_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
index 29bf3e5f2ed..32b99f56909 100644
--- a/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_MacroAssembler_riscv.cpp
@@ -349,7 +349,7 @@ void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
   // first instruction with a jump. For this action to be legal we
   // must ensure that this first instruction is a J, JAL or NOP.
   // Make it a NOP.
-  IncompressibleRegion ir(this);  // keep the nop as 4 bytes for patching.
+  IncompressibleScope scope(this); // keep the nop as 4 bytes for patching.
   assert_alignment(pc());
   nop();  // 4 bytes
 }
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index 5b3c926cfa9..7e9bea381a5 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -226,7 +226,7 @@ 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();
-  Assembler::IncompressibleRegion ir(masm);  // Fixed length: see entry_barrier_offset()
+  Assembler::IncompressibleScope scope(masm); // Fixed length: see entry_barrier_offset()
 
   Label local_guard;
   NMethodPatchingType patching_type = nmethod_patching_type();
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 825722ad29b..2d3edbb1bee 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -256,7 +256,7 @@ void MacroAssembler::dec_held_monitor_count(Register tmp) {
 }
 
 int MacroAssembler::align(int modulus, int extra_offset) {
-  CompressibleRegion cr(this);
+  CompressibleScope scope(this);
   intptr_t before = offset();
   while ((offset() + extra_offset) % modulus != 0) { nop(); }
   return (int)(offset() - before);
@@ -417,7 +417,7 @@ void MacroAssembler::set_last_Java_frame(Register last_java_sp,
     set_last_Java_frame(last_java_sp, last_java_fp, target(L), tmp);
   } else {
     L.add_patch_at(code(), locator());
-    IncompressibleRegion ir(this);  // the label address will be patched back.
+    IncompressibleScope scope(this); // the label address will be patched back.
     set_last_Java_frame(last_java_sp, last_java_fp, pc() /* Patched later */, tmp);
   }
 }
@@ -564,7 +564,7 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
     // The length of the instruction sequence emitted should not depend
     // on the address of the char buffer so that the size of mach nodes for
     // scratch emit and normal emit matches.
-    IncompressibleRegion ir(this);  // Fixed length
+    IncompressibleScope scope(this); // Fixed length
     movptr(t0, (address) b);
   }
 
@@ -604,7 +604,7 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
     // The length of the instruction sequence emitted should not depend
     // on the address of the char buffer so that the size of mach nodes for
     // scratch emit and normal emit matches.
-    IncompressibleRegion ir(this);  // Fixed length
+    IncompressibleScope scope(this); // Fixed length
     movptr(t0, (address) b);
   }
 
@@ -775,7 +775,7 @@ void MacroAssembler::unimplemented(const char* what) {
 }
 
 void MacroAssembler::emit_static_call_stub() {
-  IncompressibleRegion ir(this);  // Fixed length: see CompiledDirectCall::to_interp_stub_size().
+  IncompressibleScope scope(this); // Fixed length: see CompiledDirectCall::to_interp_stub_size().
   // CompiledDirectCall::set_to_interpreted knows the
   // exact layout of this stub.
 
@@ -907,7 +907,7 @@ void MacroAssembler::la(Register Rd, const Address &adr) {
 }
 
 void MacroAssembler::la(Register Rd, Label &label) {
-  IncompressibleRegion ir(this);   // the label address may be patched back.
+  IncompressibleScope scope(this); // the label address may be patched back.
   wrap_label(Rd, label, &MacroAssembler::la);
 }
 
@@ -971,7 +971,7 @@ void MacroAssembler::j(const address dest, Register temp) {
   int64_t distance = dest - pc();
 
   // We can't patch C, i.e. if Label wasn't bound we need to patch this jump.
-  IncompressibleRegion ir(this);
+  IncompressibleScope scope(this);
   if (is_simm21(distance) && ((distance % 2) == 0)) {
     Assembler::jal(x0, distance);
   } else {
@@ -4977,7 +4977,7 @@ address MacroAssembler::reloc_call(Address entry, Register tmp) {
 
 address MacroAssembler::ic_call(address entry, jint method_index) {
   RelocationHolder rh = virtual_call_Relocation::spec(pc(), method_index);
-  IncompressibleRegion ir(this);  // relocations
+  IncompressibleScope scope(this); // relocations
   movptr(t0, (address)Universe::non_oop_word(), t1);
   assert_cond(entry != nullptr);
   return reloc_call(Address(entry, rh));
@@ -4990,7 +4990,7 @@ int MacroAssembler::ic_check_size() {
 }
 
 int MacroAssembler::ic_check(int end_alignment) {
-  IncompressibleRegion ir(this);
+  IncompressibleScope scope(this);
   Register receiver = j_rarg0;
   Register data = t0;
 
@@ -5903,17 +5903,19 @@ void MacroAssembler::fill_words(Register base, Register cnt, Register value) {
 
   andi(t0, cnt, unroll - 1);
   sub(cnt, cnt, t0);
-  // align 8, so first sd n % 8 = mod, next loop sd 8 * n.
   shadd(base, t0, base, t1, 3);
   la(t1, entry);
-  slli(t0, t0, 2); // sd_inst_nums * 4; t0 is cnt % 8, so t1 = t1 - sd_inst_nums * 4, 4 is sizeof(inst)
+  slli(t0, t0, 2);
   sub(t1, t1, t0);
   jr(t1);
 
   bind(loop);
   addi(base, base, unroll * wordSize);
-  for (int i = -unroll; i < 0; i++) {
-    sd(value, Address(base, i * 8));
+  {
+    IncompressibleScope scope(this); // Fixed length
+    for (int i = -unroll; i < 0; i++) {
+      sd(value, Address(base, i * 8));
+    }
   }
   bind(entry);
   subi(cnt, cnt, unroll);
@@ -6120,10 +6122,14 @@ void MacroAssembler::zero_memory(Register addr, Register len, Register tmp) {
   slli(t0, t0, 2);
   sub(t1, t1, t0);
   jr(t1);
+
   bind(loop);
   sub(len, len, unroll);
-  for (int i = -unroll; i < 0; i++) {
-    sd(zr, Address(tmp, i * wordSize));
+  {
+    IncompressibleScope scope(this); // Fixed length
+    for (int i = -unroll; i < 0; i++) {
+      sd(zr, Address(tmp, i * wordSize));
+    }
   }
   bind(entry);
   add(tmp, tmp, unroll * wordSize);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index c47200579c7..468ba54438b 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -749,7 +749,7 @@ class MacroAssembler: public Assembler {
     guarantee(rtype == relocInfo::internal_word_type,                       \
               "only internal_word_type relocs make sense here");            \
     relocate(InternalAddress(dest).rspec());                                \
-    IncompressibleRegion ir(this);  /* relocations */
+    IncompressibleScope scope(this);  /* relocations */
 
 #define INSN(NAME)                                                                                       \
   void NAME(Register Rs1, Register Rs2, const address dest) {                                            \
@@ -970,7 +970,7 @@ class MacroAssembler: public Assembler {
     guarantee(rtype == relocInfo::internal_word_type,                       \
               "only internal_word_type relocs make sense here");            \
     relocate(InternalAddress(dest).rspec());                                \
-    IncompressibleRegion ir(this);  /* relocations */
+    IncompressibleScope scope(this);  /* relocations */
 
 #define INSN(NAME)                                                                                 \
   void NAME(Register Rd, address dest) {                                                           \
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index 6f20d54b222..31947b520d0 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -479,7 +479,7 @@ void NativeJump::patch_verified_entry(address entry, address verified_entry, add
 void NativeGeneralJump::insert_unconditional(address code_pos, address entry) {
   CodeBuffer cb(code_pos, instruction_size);
   MacroAssembler a(&cb);
-  Assembler::IncompressibleRegion ir(&a);  // Fixed length: see NativeGeneralJump::get_instruction_size()
+  Assembler::IncompressibleScope scope(&a); // Fixed length: see NativeGeneralJump::get_instruction_size()
 
   int32_t offset = 0;
   a.movptr(t1, entry, offset, t0); // lui, lui, slli, add
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index f6fb2e195d3..6ba5c79a955 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1295,7 +1295,7 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
 #endif
 
   void MachNopNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc*) const {
-    Assembler::CompressibleRegion cr(masm); // nops shall be 2-byte under RVC for alignment purposes.
+    Assembler::CompressibleScope scope(masm); // nops shall be 2-byte under RVC for alignment purposes.
     for (int i = 0; i < _count; i++) {
       __ nop();
     }
@@ -1371,7 +1371,7 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
   // insert a nop at the start of the prolog so we can patch in a
   // branch if we need to invalidate the method later
   {
-    Assembler::IncompressibleRegion ir(masm);  // keep the nop as 4 bytes for patching.
+    Assembler::IncompressibleScope scope(masm); // keep the nop as 4 bytes for patching.
     MacroAssembler::assert_alignment(__ pc());
     __ nop();  // 4 bytes
   }
@@ -1754,7 +1754,7 @@ void BoxLockNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
 #endif
 
 void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  Assembler::IncompressibleRegion ir(masm);  // Fixed length: see BoxLockNode::size()
+  Assembler::IncompressibleScope scope(masm); // Fixed length: see BoxLockNode::size()
 
   assert_cond(ra_ != nullptr);
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
@@ -2404,7 +2404,7 @@ encode %{
   %}
 
   enc_class riscv_enc_java_static_call(method meth) %{
-    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
+    Assembler::IncompressibleScope scope(masm); // Fixed length: see ret_addr_offset
 
     address addr = (address)$meth$$method;
     address call = nullptr;
@@ -2451,7 +2451,7 @@ encode %{
   %}
 
   enc_class riscv_enc_java_dynamic_call(method meth) %{
-    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
+    Assembler::IncompressibleScope scope(masm); // Fixed length: see ret_addr_offset
     int method_index = resolved_method_index(masm);
     address call = __ ic_call((address)$meth$$method, method_index);
     if (call == nullptr) {
@@ -2470,7 +2470,7 @@ encode %{
   %}
 
   enc_class riscv_enc_java_to_runtime(method meth) %{
-    Assembler::IncompressibleRegion ir(masm);  // Fixed length: see ret_addr_offset
+    Assembler::IncompressibleScope scope(masm); // Fixed length: see ret_addr_offset
 
     // Some calls to generated routines (arraycopy code) are scheduled by C2
     // as runtime calls. if so we can call them using a far call (they will be
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 5f53485a97f..7db1659c2fc 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1325,7 +1325,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
     // First instruction must be a nop as it may need to be patched on deoptimisation
     {
-      Assembler::IncompressibleRegion ir(masm);  // keep the nop as 4 bytes for patching.
+      Assembler::IncompressibleScope scope(masm); // keep the nop as 4 bytes for patching.
       MacroAssembler::assert_alignment(__ pc());
       __ nop();  // 4 bytes
     }
@@ -1468,7 +1468,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // If we have to make this method not-entrant we'll overwrite its
   // first instruction with a jump.
   {
-    Assembler::IncompressibleRegion ir(masm);  // keep the nop as 4 bytes for patching.
+    Assembler::IncompressibleScope scope(masm); // keep the nop as 4 bytes for patching.
     MacroAssembler::assert_alignment(__ pc());
     __ nop();  // 4 bytes
   }

From 4fc10a1e7e9483ecddbaaa9fb52c4db52de86cc8 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Tue, 13 May 2025 03:46:30 +0000
Subject: [PATCH 413/901] 8356087: Problematic KeyInfo check using key
 algorithm in P11SecretKeyFactory class

Reviewed-by: weijun
---
 .../security/pkcs11/P11SecretKeyFactory.java  | 28 ++++-----
 .../pkcs11/Mac/InitMacWithAnyKey.java         | 63 +++++++++++++++++++
 2 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 test/jdk/sun/security/pkcs11/Mac/InitMacWithAnyKey.java

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
index 3e32b0c7c2d..b80ccc35352 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
@@ -400,28 +400,22 @@ static P11Key convertKey(Token token, Key key, String svcAlgo,
         if (keyAlgo == null) {
             throw new InvalidKeyException("Key must specify its algorithm");
         }
-        KeyInfo ki = getKeyInfo(keyAlgo);
-        if (ki == null) {
-            throw new InvalidKeyException("Unknown algorithm " + keyAlgo);
-        }
-
-        KeyInfo si;
         if (svcAlgo == null) {
             svcAlgo = keyAlgo;
-            si = ki;
-        } else {
-            si = getKeyInfo(svcAlgo);
-            if (si == null) {
-                throw new InvalidKeyException("Unknown algorithm " + svcAlgo);
-            }
+        }
+        KeyInfo si = getKeyInfo(svcAlgo);
+        if (si == null) {
+            throw new InvalidKeyException("Unknown algorithm " + svcAlgo);
         }
 
         // Check if the key can be used for the service.
-        // Any key can be used for a MAC service.
-        if (svcAlgo != keyAlgo && !(si instanceof HMACKeyInfo) &&
-                !KeyInfo.checkUse(ki, si)) {
-            throw new InvalidKeyException("Cannot use a " + keyAlgo +
+        // Skip this check for Hmac as any key can be used for Mac.
+        if (svcAlgo != keyAlgo && !(si instanceof HMACKeyInfo)) {
+            KeyInfo ki = getKeyInfo(keyAlgo);
+            if (ki == null || !KeyInfo.checkUse(ki, si)) {
+                throw new InvalidKeyException("Cannot use a " + keyAlgo +
                         " key for a " + svcAlgo + " service");
+            }
         }
 
         if (key instanceof P11Key p11Key) {
@@ -454,6 +448,8 @@ static P11Key convertKey(Token token, Key key, String svcAlgo,
             return p11Key;
         }
         if (key instanceof PBEKey pbeKey) {
+            // make sure key info matches key type
+            KeyInfo ki = (keyAlgo == svcAlgo ? si : getKeyInfo(keyAlgo));
             if (ki instanceof PBEKeyInfo pbeKi) {
                 PBEKeySpec keySpec = getPbeKeySpec(pbeKey);
                 try {
diff --git a/test/jdk/sun/security/pkcs11/Mac/InitMacWithAnyKey.java b/test/jdk/sun/security/pkcs11/Mac/InitMacWithAnyKey.java
new file mode 100644
index 00000000000..e3708de4b6a
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/Mac/InitMacWithAnyKey.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 8356087
+ * @summary Ensure P11Mac using SHA message digests can be initialized with
+ *     secret keys with unrecognized algorithms
+ * @library /test/lib ..
+ * @modules jdk.crypto.cryptoki
+ * @run main/othervm InitMacWithAnyKey
+ */
+
+import java.security.Provider;
+import java.util.List;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+public class InitMacWithAnyKey extends PKCS11Test {
+
+    public static void main(String[] args) throws Exception {
+        main(new InitMacWithAnyKey(), args);
+    }
+
+    @Override
+    public void main(Provider p) throws Exception {
+        SecretKey skey = new SecretKeySpec("whatever".getBytes(), "Any");
+        // Test against Hmacs using SHA-1, SHA-2 message digests and skip
+        // PBE-related Hmacs as they need PBEKey
+        List<String> algorithms = getSupportedAlgorithms("Mac", "HmacSHA", p);
+        for (String algo : algorithms) {
+            System.out.println("Testing " + algo);
+            Mac mac = Mac.getInstance(algo, p);
+            try {
+                mac.init(skey);
+            } catch (Exception e) {
+                throw new Exception("Unexpected exception", e);
+            }
+        }
+        System.out.println("Passed");
+    }
+}

From 24d77adee9643c341d27366532c95923e1d97248 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 13 May 2025 04:44:07 +0000
Subject: [PATCH 414/901] 8356057: PrintingProcessor (-Xprint) does not print
 type variable bounds and type annotations for Object supertypes

Reviewed-by: darcy, vromero
---
 .../javac/processing/PrintingProcessor.java   | 41 +++++++-
 ...XprintTypeAnnotationsAndTypeVarBounds.java | 90 +++++++++++++++++
 .../XprintTypeAnnotationsAndTypeVarBounds.out | 99 +++++++++++++++++++
 .../rounds/OverwriteBetweenCompilations_1.out |  8 +-
 .../rounds/OverwriteBetweenCompilations_2.out | 12 +--
 .../rounds/OverwriteBetweenCompilations_3.out | 12 +--
 6 files changed, 241 insertions(+), 21 deletions(-)
 create mode 100644 test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.java
 create mode 100644 test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
index 7aca585f37e..72a2b564ec5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.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
@@ -259,9 +259,7 @@ public PrintingElementVisitor visitType(TypeElement e, Boolean p) {
                 if (kind == CLASS) {
                     TypeMirror supertype = e.getSuperclass();
                     if (supertype.getKind() != TypeKind.NONE) {
-                        TypeElement e2 = (TypeElement)
-                            ((DeclaredType) supertype).asElement();
-                        if (e2.getSuperclass().getKind() != TypeKind.NONE)
+                        if (isImportantType(supertype))
                             writer.print(" extends " + supertype);
                     }
                 }
@@ -524,13 +522,29 @@ private void printFormalTypeParameters(Parameterizable e,
             List<? extends TypeParameterElement> typeParams = e.getTypeParameters();
             if (!typeParams.isEmpty()) {
                 writer.print(typeParams.stream()
-                             .map(tpe -> annotationsToString(tpe) + tpe.toString())
+                             .map(tpe -> annotationsToString(tpe) + tpe.toString() + printTypeVariableBoundsIfNeeded(tpe))
                              .collect(Collectors.joining(", ", "<", ">")));
                 if (pad)
                     writer.print(" ");
             }
         }
 
+        private String printTypeVariableBoundsIfNeeded(TypeParameterElement tpe) {
+            List<? extends TypeMirror> printableBounds =
+                    tpe.getBounds()
+                       .stream()
+                       .filter(type -> isImportantType(type))
+                       .toList();
+
+            if (printableBounds.isEmpty()) {
+                return "";
+            }
+
+            return " extends " + printableBounds.stream()
+                                                .map(t -> t.toString())
+                                                .collect(Collectors.joining(" & "));
+        }
+
         private String annotationsToString(Element e) {
             List<? extends AnnotationMirror> annotations = e.getAnnotationMirrors();
             return annotations.isEmpty() ?
@@ -770,5 +784,22 @@ private void indent() {
             writer.print(spaces[indentation]);
         }
 
+        /**{@return true if this type is either not {@code java.lang.Object},
+         * or is annotated, and hence needs to be included in the output,
+         * even for cases where there's implicit {@code java.lang.Object} type.}
+         *
+         * @param type the type to check.
+         */
+        private boolean isImportantType(TypeMirror type) {
+            if (!type.getAnnotationMirrors().isEmpty()) {
+                return true;
+            }
+            TypeElement e2 = (TypeElement)
+                ((DeclaredType) type).asElement();
+            if (!e2.getKind().isClass()) {
+                return true;
+            }
+            return e2.getSuperclass().getKind() != TypeKind.NONE;
+        }
     }
 }
diff --git a/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.java b/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.java
new file mode 100644
index 00000000000..d81724763db
--- /dev/null
+++ b/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.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
+ * @bug 8356057
+ * @summary Verify annotated supertypes and type variable bounds are printed properly
+ * @compile/ref=XprintTypeAnnotationsAndTypeVarBounds.out -Xprint  XprintTypeAnnotationsAndTypeVarBounds.java
+ */
+
+import java.lang.annotation.*;
+
+class AnnotatedObjectSuperType extends @TA Object {
+}
+
+class UnannotatedObjectSuperType extends Object {
+}
+
+class TypeVariableWithAnnotation1<@TA T> {
+}
+
+class TypeVariableWithAnnotation2<@TA T extends Object> {
+}
+
+class TypeVariableWithBound1<T extends @TA Object> {
+}
+
+class TypeVariableWithBound2<T extends @TA CharSequence> {
+}
+
+class TypeVariableWithBound3<T extends @TA Object & CharSequence> {
+}
+
+class TypeVariableWithBound4<T extends Object & @TA CharSequence> {
+}
+
+class TypeVariableWithBound5<T extends CharSequence> {
+}
+
+class TypeVariableWithBound6<T extends Object & CharSequence> {
+}
+
+class TypeVariableWithBoundRecursive<T extends TypeVariableWithBoundRecursive<T>> {
+}
+
+class TypeVariableBoundsOnMethods {
+    public <@TA T> void test1() {}
+    public <@TA T extends Object> void test2() {}
+    public <T extends @TA Object> void test3() {}
+    public <T extends @TA CharSequence> void test4() {}
+    public <T extends @TA Object & CharSequence> void test5() {}
+    public <T extends Object & @TA CharSequence> void test6() {}
+    public <T extends CharSequence> void test7() {}
+    public <T extends Object & CharSequence> void test8() {}
+}
+
+class TypeVariableBoundsOnConstructors {
+    public <@TA T> TypeVariableBoundsOnConstructors(boolean b) {}
+    public <@TA T extends Object> TypeVariableBoundsOnConstructors(byte b) {}
+    public <T extends @TA Object> TypeVariableBoundsOnConstructors(char c) {}
+    public <T extends @TA CharSequence> TypeVariableBoundsOnConstructors(short s) {}
+    public <T extends @TA Object & CharSequence> TypeVariableBoundsOnConstructors(int i) {}
+    public <T extends Object & @TA CharSequence> TypeVariableBoundsOnConstructors(long l) {}
+    public <T extends CharSequence> TypeVariableBoundsOnConstructors(float f) {}
+    public <T extends Object & CharSequence> TypeVariableBoundsOnConstructors(double d) {}
+}
+
+@Target(ElementType.TYPE_USE)
+@interface TA {
+}
diff --git a/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.out b/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.out
new file mode 100644
index 00000000000..89c5c8747d0
--- /dev/null
+++ b/test/langtools/tools/javac/processing/options/XprintTypeAnnotationsAndTypeVarBounds.out
@@ -0,0 +1,99 @@
+
+class AnnotatedObjectSuperType extends java.lang.@TA Object {
+
+  AnnotatedObjectSuperType();
+}
+
+class UnannotatedObjectSuperType {
+
+  UnannotatedObjectSuperType();
+}
+
+class TypeVariableWithAnnotation1<@TA T> {
+
+  TypeVariableWithAnnotation1();
+}
+
+class TypeVariableWithAnnotation2<@TA T> {
+
+  TypeVariableWithAnnotation2();
+}
+
+class TypeVariableWithBound1<T extends java.lang.@TA Object> {
+
+  TypeVariableWithBound1();
+}
+
+class TypeVariableWithBound2<T extends java.lang.@TA CharSequence> {
+
+  TypeVariableWithBound2();
+}
+
+class TypeVariableWithBound3<T extends java.lang.@TA Object & java.lang.CharSequence> {
+
+  TypeVariableWithBound3();
+}
+
+class TypeVariableWithBound4<T extends java.lang.@TA CharSequence> {
+
+  TypeVariableWithBound4();
+}
+
+class TypeVariableWithBound5<T extends java.lang.CharSequence> {
+
+  TypeVariableWithBound5();
+}
+
+class TypeVariableWithBound6<T extends java.lang.CharSequence> {
+
+  TypeVariableWithBound6();
+}
+
+class TypeVariableWithBoundRecursive<T extends TypeVariableWithBoundRecursive<T>> {
+
+  TypeVariableWithBoundRecursive();
+}
+
+class TypeVariableBoundsOnMethods {
+
+  TypeVariableBoundsOnMethods();
+
+  public <@TA T> void test1();
+
+  public <@TA T> void test2();
+
+  public <T extends java.lang.@TA Object> void test3();
+
+  public <T extends java.lang.@TA CharSequence> void test4();
+
+  public <T extends java.lang.@TA Object & java.lang.CharSequence> void test5();
+
+  public <T extends java.lang.@TA CharSequence> void test6();
+
+  public <T extends java.lang.CharSequence> void test7();
+
+  public <T extends java.lang.CharSequence> void test8();
+}
+
+class TypeVariableBoundsOnConstructors {
+
+  public <@TA T> TypeVariableBoundsOnConstructors(boolean b);
+
+  public <@TA T> TypeVariableBoundsOnConstructors(byte b);
+
+  public <T extends java.lang.@TA Object> TypeVariableBoundsOnConstructors(char c);
+
+  public <T extends java.lang.@TA CharSequence> TypeVariableBoundsOnConstructors(short s);
+
+  public <T extends java.lang.@TA Object & java.lang.CharSequence> TypeVariableBoundsOnConstructors(int i);
+
+  public <T extends java.lang.@TA CharSequence> TypeVariableBoundsOnConstructors(long l);
+
+  public <T extends java.lang.CharSequence> TypeVariableBoundsOnConstructors(float f);
+
+  public <T extends java.lang.CharSequence> TypeVariableBoundsOnConstructors(double d);
+}
+
+@java.lang.annotation.Target({TYPE_USE})
+@interface TA {
+}
\ No newline at end of file
diff --git a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out
index 1840ca9205e..536ccc17754 100644
--- a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out
+++ b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_1.out
@@ -2,7 +2,7 @@ round: 1
 round: 2
 
 @java.lang.Deprecated
-public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedSource<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedSource();
 
@@ -12,7 +12,7 @@ public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> im
 }
 
 @java.lang.Deprecated
-public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedClass<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedClass();
 
@@ -23,7 +23,7 @@ public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> imp
 round: 3
 
 @java.lang.Deprecated
-public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedSource<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedSource();
 
@@ -33,7 +33,7 @@ public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> im
 }
 
 @java.lang.Deprecated
-public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedClass<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedClass();
 
diff --git a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out
index d1bf374bb74..826e2b4bcb0 100644
--- a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out
+++ b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_2.out
@@ -1,7 +1,7 @@
 round: 1
 
 @java.lang.Deprecated
-public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedSource<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedSource();
 
@@ -11,7 +11,7 @@ public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> im
 }
 
 @java.lang.Deprecated
-public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedClass<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedClass();
 
@@ -22,7 +22,7 @@ public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> imp
 round: 2
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedSource<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedSource();
 
@@ -30,7 +30,7 @@ public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.
 }
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedClass<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedClass<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedClass();
 
@@ -39,7 +39,7 @@ public abstract class GeneratedClass<E> extends java.util.LinkedList<java.lang.N
 round: 3
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedSource<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedSource();
 
@@ -47,7 +47,7 @@ public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.
 }
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedClass<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedClass<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedClass();
 
diff --git a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out
index 39b044ec78a..1831303304a 100644
--- a/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out
+++ b/test/langtools/tools/javac/processing/rounds/OverwriteBetweenCompilations_3.out
@@ -1,7 +1,7 @@
 round: 1
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedSource<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedSource();
 
@@ -9,7 +9,7 @@ public abstract class GeneratedSource<E> extends java.util.LinkedList<java.lang.
 }
 
 @javax.annotation.processing.SupportedAnnotationTypes({"*"})
-public abstract class GeneratedClass<E> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
+public abstract class GeneratedClass<E extends java.lang.Number> extends java.util.LinkedList<java.lang.Number> implements java.lang.Runnable, java.lang.CharSequence {
 
   public GeneratedClass();
 
@@ -18,7 +18,7 @@ public abstract class GeneratedClass<E> extends java.util.LinkedList<java.lang.N
 round: 2
 
 @java.lang.Deprecated
-public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedSource<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedSource();
 
@@ -28,7 +28,7 @@ public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> im
 }
 
 @java.lang.Deprecated
-public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedClass<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedClass();
 
@@ -39,7 +39,7 @@ public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> imp
 round: 3
 
 @java.lang.Deprecated
-public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedSource<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedSource();
 
@@ -49,7 +49,7 @@ public class GeneratedSource<T> extends java.util.ArrayList<java.lang.String> im
 }
 
 @java.lang.Deprecated
-public class GeneratedClass<T> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
+public class GeneratedClass<T extends java.lang.CharSequence> extends java.util.ArrayList<java.lang.String> implements java.lang.Runnable {
 
   public GeneratedClass();
 

From 6e0846918ce1286ea1571a6ec0de8e6b44e24218 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 13 May 2025 05:47:17 +0000
Subject: [PATCH 415/901] 8356658: java/foreign/TestBufferStackStress2.java
 failed again with junit action timed out

Reviewed-by: jpai, alanb
---
 .../java/foreign/TestBufferStackStress2.java  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/jdk/java/foreign/TestBufferStackStress2.java b/test/jdk/java/foreign/TestBufferStackStress2.java
index 8ec5d512ff6..cefdbb725d1 100644
--- a/test/jdk/java/foreign/TestBufferStackStress2.java
+++ b/test/jdk/java/foreign/TestBufferStackStress2.java
@@ -23,6 +23,11 @@
 
 /*
  * @test
+ *
+ * @comment If the VM does not have continuations, then VTs will be scheduled on OS threads.
+ * @requires vm.continuations
+ *
+ * @bug 8356114 8356658
  * @modules java.base/jdk.internal.foreign
  * @build NativeTestHelper TestBufferStackStress2
  * @run junit TestBufferStackStress2
@@ -38,6 +43,7 @@
 import java.lang.foreign.ValueLayout;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -78,7 +84,8 @@ void movingVirtualThreadWithGc() throws InterruptedException {
 
         var done = new AtomicBoolean();
         var completed = new AtomicBoolean();
-        var quiescent = new Object();
+        var quiescentLatch = new CountDownLatch(1);
+
         var executor = Executors.newVirtualThreadPerTaskExecutor();
 
         executor.submit(() -> {
@@ -93,12 +100,11 @@ void movingVirtualThreadWithGc() throws InterruptedException {
             try (Arena arena = pool.pushFrame(SMALL_ALLOC_SIZE, 1)) {
                 MemorySegment segment = arena.allocate(SMALL_ALLOC_SIZE);
                 done.set(true);
-                synchronized (quiescent) {
-                    try {
-                        quiescent.wait();
-                    } catch (Throwable ex) {
-                        throw new AssertionError(ex);
-                    }
+                // wait for ForkJoinPool to contract
+                try {
+                    quiescentLatch.await();
+                } catch (Throwable ex) {
+                    throw new AssertionError(ex);
                 }
                 System.out.println(duration(begin) + "ACCESSING SEGMENT");
 
@@ -123,14 +129,12 @@ void movingVirtualThreadWithGc() throws InterruptedException {
         } while (count > 0);
 
         System.out.println(duration(begin) + "FJP HAS CONTRACTED");
-
-        synchronized (quiescent) {
-            quiescent.notify();
-        }
+        quiescentLatch.countDown(); // notify the thread that accesses the MemorySegment
 
         System.out.println(duration(begin) + "CLOSING EXECUTOR");
         executor.close();
         System.out.println(duration(begin) + "EXECUTOR CLOSED");
+
         assertTrue(completed.get(), "The VT did not complete properly");
     }
 

From 03dca0323d79ef5fb1c8ee1152667e2188fa5e01 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 13 May 2025 06:16:34 +0000
Subject: [PATCH 416/901] 8354908: javac mishandles supplementary character in
 character literal

Reviewed-by: naoto, vromero
---
 .../sun/tools/javac/parser/JavaTokenizer.java |  4 +++
 .../tools/javac/resources/compiler.properties |  3 ++
 .../IllegalCharLiteralMultipleSurrogates.java | 28 ++++++++++++++++++
 .../tools/javac/lexer/JavaLexerTest.java      | 29 +++++++++++++++++--
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javac/diags/examples/IllegalCharLiteralMultipleSurrogates.java

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 db675e3d0b3..d799975a76a 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
@@ -389,6 +389,10 @@ private void scanLitChar(int pos, boolean isString) {
                     break;
             }
         } else {
+            if (!isString && !Character.isBmpCodePoint(getCodepoint())) {
+                lexError(pos, Errors.IllegalCharLiteralMultipleSurrogates);
+            }
+
             putThenNext();
         }
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 79d15a96a6e..46d0438f27d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -694,6 +694,9 @@ compiler.err.illegal.combination.of.modifiers=\
 compiler.err.illegal.enum.static.ref=\
     illegal reference to static field from initializer
 
+compiler.err.illegal.char.literal.multiple.surrogates=\
+    character literal contains more than one UTF-16 code unit
+
 compiler.err.illegal.esc.char=\
     illegal escape character
 
diff --git a/test/langtools/tools/javac/diags/examples/IllegalCharLiteralMultipleSurrogates.java b/test/langtools/tools/javac/diags/examples/IllegalCharLiteralMultipleSurrogates.java
new file mode 100644
index 00000000000..5c7f7c41475
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/IllegalCharLiteralMultipleSurrogates.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+// key: compiler.err.illegal.char.literal.multiple.surrogates
+
+class IllegalCharLiteralMultipleSurrogates {
+    char c = '\uD83D\uDE0A';
+}
diff --git a/test/langtools/tools/javac/lexer/JavaLexerTest.java b/test/langtools/tools/javac/lexer/JavaLexerTest.java
index 6b9c789087c..b2362801f84 100644
--- a/test/langtools/tools/javac/lexer/JavaLexerTest.java
+++ b/test/langtools/tools/javac/lexer/JavaLexerTest.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
@@ -30,8 +30,11 @@
  */
 
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
+import javax.tools.DiagnosticListener;
 import javax.tools.SimpleJavaFileObject;
 
 import com.sun.tools.javac.parser.JavaTokenizer;
@@ -101,17 +104,29 @@ public class JavaLexerTest {
             new TestTuple(ERROR,         "\'\'"),
             new TestTuple(ERROR,         "\'\\q\'", "\'\\q\'"),
             new TestTuple(ERROR,         "\'\\{1+2}\'", "\'\\{1+2}\'"),
+            new TestTuple(ERROR,         "'\uD83D\uDE0A'",
+                          List.of("compiler.err.illegal.char.literal.multiple.surrogates")),
     };
 
     static class TestTuple {
         String input;
         TokenKind kind;
         String expected;
+        List<String> expectedErrors;
 
-        TestTuple(TokenKind kind, String input, String expected) {
+        TestTuple(TokenKind kind, String input, String expected, List<String> expectedErrors) {
             this.input = input;
             this.kind = kind;
             this.expected = expected;
+            this.expectedErrors = expectedErrors;
+        }
+
+        TestTuple(TokenKind kind, String input, List<String> expectedErrors) {
+            this(kind, input, input, expectedErrors);
+        }
+
+        TestTuple(TokenKind kind, String input, String expected) {
+            this(kind, input, expected, null);
         }
 
         TestTuple(TokenKind kind, String input) {
@@ -121,6 +136,12 @@ static class TestTuple {
 
     void test(TestTuple test, boolean willFail) throws Exception {
         Context ctx = new Context();
+        List<String> errors = new ArrayList();
+
+        if (test.expectedErrors != null) {
+            ctx.put(DiagnosticListener.class, (DiagnosticListener) d -> errors.add(d.getCode()));
+        }
+
         Log log = Log.instance(ctx);
 
         log.useSource(SimpleJavaFileObject.forSource(URI.create("mem://Test.java"),
@@ -149,6 +170,10 @@ void test(TestTuple test, boolean willFail) throws Exception {
             System.err.println("input: " + test.input);
             throw new AssertionError("Unexpected token content: " + actual);
         }
+
+        if (test.expectedErrors != null && !test.expectedErrors.equals(errors)) {
+            throw new AssertionError("Unexpected errors: " + errors);
+        }
     }
 
     void run() throws Exception {

From 526f543adfeb90341b3b5b18916c1bb7ef725599 Mon Sep 17 00:00:00 2001
From: Stefan Johansson <sjohanss@openjdk.org>
Date: Tue, 13 May 2025 07:44:30 +0000
Subject: [PATCH 417/901] 8353184: ZGC: Simplify and correct tlab_used()
 tracking

Reviewed-by: stefank, aboldtch
---
 src/hotspot/share/gc/z/zAllocator.cpp       |  4 --
 src/hotspot/share/gc/z/zAllocator.hpp       |  1 -
 src/hotspot/share/gc/z/zArguments.cpp       |  5 ++
 src/hotspot/share/gc/z/zCollectedHeap.cpp   |  2 +-
 src/hotspot/share/gc/z/zGeneration.cpp      |  3 +
 src/hotspot/share/gc/z/zHeap.cpp            | 40 ++++++++++--
 src/hotspot/share/gc/z/zHeap.hpp            |  8 +++
 src/hotspot/share/gc/z/zObjectAllocator.cpp | 34 +---------
 src/hotspot/share/gc/z/zObjectAllocator.hpp |  3 -
 src/hotspot/share/gc/z/zTLABUsage.cpp       | 70 +++++++++++++++++++++
 src/hotspot/share/gc/z/zTLABUsage.hpp       | 60 ++++++++++++++++++
 test/hotspot/jtreg/ProblemList-zgc.txt      |  3 +
 12 files changed, 186 insertions(+), 47 deletions(-)
 create mode 100644 src/hotspot/share/gc/z/zTLABUsage.cpp
 create mode 100644 src/hotspot/share/gc/z/zTLABUsage.hpp

diff --git a/src/hotspot/share/gc/z/zAllocator.cpp b/src/hotspot/share/gc/z/zAllocator.cpp
index 87e1f6f76f9..22f3b6ba112 100644
--- a/src/hotspot/share/gc/z/zAllocator.cpp
+++ b/src/hotspot/share/gc/z/zAllocator.cpp
@@ -39,10 +39,6 @@ ZAllocatorEden::ZAllocatorEden()
   ZAllocator::_eden = this;
 }
 
-size_t ZAllocatorEden::tlab_used() const {
-  return _object_allocator.used();
-}
-
 size_t ZAllocatorEden::remaining() const {
   return _object_allocator.remaining();
 }
diff --git a/src/hotspot/share/gc/z/zAllocator.hpp b/src/hotspot/share/gc/z/zAllocator.hpp
index 21702800e6b..45a70888f9d 100644
--- a/src/hotspot/share/gc/z/zAllocator.hpp
+++ b/src/hotspot/share/gc/z/zAllocator.hpp
@@ -62,7 +62,6 @@ class ZAllocatorEden : public ZAllocator {
   zaddress alloc_object(size_t size);
 
   // Statistics
-  size_t tlab_used() const;
   size_t remaining() const;
 };
 
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 2c70d8417c9..73e06e5c34d 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -143,6 +143,11 @@ void ZArguments::initialize() {
     FLAG_SET_ERGO_IF_DEFAULT(ZCollectionIntervalMajor, ZCollectionInterval);
   }
 
+  // Set an initial TLAB size to avoid depending on the current capacity
+  if (FLAG_IS_DEFAULT(TLABSize)) {
+    FLAG_SET_DEFAULT(TLABSize, 256*K);
+  }
+
   // Set medium page size here because MaxTenuringThreshold may use it.
   ZHeuristics::set_medium_page_size();
 
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index a94e50e2a52..f69f8492eed 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -238,7 +238,7 @@ size_t ZCollectedHeap::tlab_used(Thread* ignored) const {
 }
 
 size_t ZCollectedHeap::max_tlab_size() const {
-  return _heap.max_tlab_size();
+  return _heap.max_tlab_size() / HeapWordSize;
 }
 
 size_t ZCollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index e74d7a8e9f3..78860bbe4cb 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -837,6 +837,9 @@ void ZGenerationYoung::mark_start() {
   // Change good colors
   flip_mark_start();
 
+  // Reset TLAB usage
+  ZHeap::heap()->reset_tlab_used();
+
   // Retire allocating pages
   ZAllocator::eden()->retire_pages();
   for (ZPageAge i = ZPageAge::survivor1; i <= ZPageAge::survivor14; i = static_cast<ZPageAge>(static_cast<uint>(i) + 1)) {
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 5beee94e8aa..51c6478dc94 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -62,6 +62,7 @@ ZHeap::ZHeap()
     _serviceability(InitialHeapSize, min_capacity(), max_capacity()),
     _old(&_page_table, &_page_allocator),
     _young(&_page_table, _old.forwarding_table(), &_page_allocator),
+    _tlab_usage(),
     _initialized(false) {
 
   // Install global heap instance
@@ -131,11 +132,11 @@ size_t ZHeap::unused() const {
 }
 
 size_t ZHeap::tlab_capacity() const {
-  return capacity();
+  return _tlab_usage.tlab_capacity();
 }
 
 size_t ZHeap::tlab_used() const {
-  return _allocator_eden.tlab_used();
+  return _tlab_usage.tlab_used();
 }
 
 size_t ZHeap::max_tlab_size() const {
@@ -156,6 +157,9 @@ size_t ZHeap::unsafe_max_tlab_alloc() const {
 
   return MIN2(size, max_tlab_size());
 }
+void ZHeap::reset_tlab_used() {
+  _tlab_usage.reset();
+}
 
 bool ZHeap::is_in(uintptr_t addr) const {
   if (addr == 0) {
@@ -219,11 +223,38 @@ void ZHeap::out_of_memory() {
   log_info(gc)("Out Of Memory (%s)", Thread::current()->name());
 }
 
+static bool is_small_eden_page(ZPage* page) {
+  return page->type() == ZPageType::small && page->age() == ZPageAge::eden;
+}
+
+void ZHeap::account_alloc_page(ZPage* page) {
+  // Do TLAB accounting for small eden pages
+  if (is_small_eden_page(page)) {
+    _tlab_usage.increase_used(page->size());
+  }
+}
+
+void ZHeap::account_undo_alloc_page(ZPage* page) {
+  // Increase the undo counter
+  ZStatInc(ZCounterUndoPageAllocation);
+
+  // Undo TLAB accounting for small eden pages
+  if (is_small_eden_page(page)) {
+    _tlab_usage.decrease_used(page->size());
+  }
+
+  log_trace(gc)("Undo page allocation, thread: " PTR_FORMAT " (%s), page: " PTR_FORMAT ", size: %zu",
+                p2i(Thread::current()), ZUtils::thread_name(), p2i(page), page->size());
+}
+
 ZPage* ZHeap::alloc_page(ZPageType type, size_t size, ZAllocationFlags flags, ZPageAge age) {
   ZPage* const page = _page_allocator.alloc_page(type, size, flags, age);
   if (page != nullptr) {
     // Insert page table entry
     _page_table.insert(page);
+
+    // Do accounting for the allocated page
+    account_alloc_page(page);
   }
 
   return page;
@@ -232,9 +263,8 @@ ZPage* ZHeap::alloc_page(ZPageType type, size_t size, ZAllocationFlags flags, ZP
 void ZHeap::undo_alloc_page(ZPage* page) {
   assert(page->is_allocating(), "Invalid page state");
 
-  ZStatInc(ZCounterUndoPageAllocation);
-  log_trace(gc)("Undo page allocation, thread: " PTR_FORMAT " (%s), page: " PTR_FORMAT ", size: %zu",
-                p2i(Thread::current()), ZUtils::thread_name(), p2i(page), page->size());
+  // Undo accounting for the page being freed
+  account_undo_alloc_page(page);
 
   free_page(page);
 }
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index 64be61cc873..49af5d66880 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -33,6 +33,7 @@
 #include "gc/z/zPageTable.hpp"
 #include "gc/z/zPageType.hpp"
 #include "gc/z/zServiceability.hpp"
+#include "gc/z/zTLABUsage.hpp"
 
 class OopFieldClosure;
 
@@ -55,8 +56,14 @@ class ZHeap {
   ZGenerationOld          _old;
   ZGenerationYoung        _young;
 
+  ZTLABUsage              _tlab_usage;
+
   bool                    _initialized;
 
+  // Page allocation accounting
+  void account_alloc_page(ZPage* page);
+  void account_undo_alloc_page(ZPage* page);
+
 public:
   static ZHeap* heap();
 
@@ -81,6 +88,7 @@ class ZHeap {
   size_t tlab_used() const;
   size_t max_tlab_size() const;
   size_t unsafe_max_tlab_alloc() const;
+  void reset_tlab_used();
 
   bool is_in(uintptr_t addr) const;
   bool is_in_page_relaxed(const ZPage* page, zaddress addr) const;
diff --git a/src/hotspot/share/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp
index 54724c1b48e..b92828e24a6 100644
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp
@@ -43,8 +43,6 @@ static const ZStatCounter ZCounterUndoObjectAllocationFailed("Memory", "Undo Obj
 ZObjectAllocator::ZObjectAllocator(ZPageAge age)
   : _age(age),
     _use_per_cpu_shared_small_pages(ZHeuristics::use_per_cpu_shared_small_pages()),
-    _used(0),
-    _undone(0),
     _shared_small_page(nullptr),
     _shared_medium_page(nullptr),
     _medium_page_alloc_lock() {}
@@ -58,13 +56,7 @@ ZPage* const* ZObjectAllocator::shared_small_page_addr() const {
 }
 
 ZPage* ZObjectAllocator::alloc_page(ZPageType type, size_t size, ZAllocationFlags flags) {
-  ZPage* const page = ZHeap::heap()->alloc_page(type, size, flags, _age);
-  if (page != nullptr) {
-    // Increment used bytes
-    Atomic::add(_used.addr(), size);
-  }
-
-  return page;
+  return ZHeap::heap()->alloc_page(type, size, flags, _age);
 }
 
 ZPage* ZObjectAllocator::alloc_page_for_relocation(ZPageType type, size_t size, ZAllocationFlags flags) {
@@ -72,9 +64,6 @@ ZPage* ZObjectAllocator::alloc_page_for_relocation(ZPageType type, size_t size,
 }
 
 void ZObjectAllocator::undo_alloc_page(ZPage* page) {
-  // Increment undone bytes
-  Atomic::add(_undone.addr(), page->size());
-
   ZHeap::heap()->undo_alloc_page(page);
 }
 
@@ -229,23 +218,6 @@ ZPageAge ZObjectAllocator::age() const {
   return _age;
 }
 
-size_t ZObjectAllocator::used() const {
-  size_t total_used = 0;
-  size_t total_undone = 0;
-
-  ZPerCPUConstIterator<size_t> iter_used(&_used);
-  for (const size_t* cpu_used; iter_used.next(&cpu_used);) {
-    total_used += *cpu_used;
-  }
-
-  ZPerCPUConstIterator<size_t> iter_undone(&_undone);
-  for (const size_t* cpu_undone; iter_undone.next(&cpu_undone);) {
-    total_undone += *cpu_undone;
-  }
-
-  return total_used - total_undone;
-}
-
 size_t ZObjectAllocator::remaining() const {
   assert(Thread::current()->is_Java_thread(), "Should be a Java thread");
 
@@ -260,10 +232,6 @@ size_t ZObjectAllocator::remaining() const {
 void ZObjectAllocator::retire_pages() {
   assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
 
-  // Reset used and undone bytes
-  _used.set_all(0);
-  _undone.set_all(0);
-
   // Reset allocation pages
   _shared_medium_page.set(nullptr);
   _shared_small_page.set_all(nullptr);
diff --git a/src/hotspot/share/gc/z/zObjectAllocator.hpp b/src/hotspot/share/gc/z/zObjectAllocator.hpp
index a350c4f876a..3a747afecbe 100644
--- a/src/hotspot/share/gc/z/zObjectAllocator.hpp
+++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp
@@ -38,8 +38,6 @@ class ZObjectAllocator {
 private:
   ZPageAge           _age;
   const bool         _use_per_cpu_shared_small_pages;
-  ZPerCPU<size_t>    _used;
-  ZPerCPU<size_t>    _undone;
   ZPerCPU<ZPage*>    _shared_small_page;
   ZContended<ZPage*> _shared_medium_page;
   ZLock              _medium_page_alloc_lock;
@@ -80,7 +78,6 @@ class ZObjectAllocator {
 
   ZPageAge age() const;
 
-  size_t used() const;
   size_t remaining() const;
 
   void retire_pages();
diff --git a/src/hotspot/share/gc/z/zTLABUsage.cpp b/src/hotspot/share/gc/z/zTLABUsage.cpp
new file mode 100644
index 00000000000..cd8141e47ff
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTLABUsage.cpp
@@ -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.
+ */
+
+#include "gc/z/zTLABUsage.hpp"
+#include "logging/log.hpp"
+#include "runtime/atomic.hpp"
+
+ZTLABUsage::ZTLABUsage()
+  : _used(0),
+    _used_history() {}
+
+void ZTLABUsage::increase_used(size_t size) {
+  Atomic::add(&_used, size, memory_order_relaxed);
+}
+
+void ZTLABUsage::decrease_used(size_t size) {
+  precond(size <= _used);
+
+  Atomic::sub(&_used, size, memory_order_relaxed);
+}
+
+void ZTLABUsage::reset() {
+  const size_t used = Atomic::xchg(&_used, (size_t) 0);
+
+  // Avoid updates when nothing has been allocated since the last YC
+  if (used == 0) {
+    return;
+  }
+
+  // Save the old values for logging
+  const size_t old_tlab_used = tlab_used();
+  const size_t old_tlab_capacity = tlab_capacity();
+
+  // Update the usage history with the current value
+  _used_history.add(used);
+
+  log_debug(gc, tlab)("TLAB usage update: used %zuM -> %zuM, capacity: %zuM -> %zuM",
+                      old_tlab_used / M,
+                      tlab_used() / M,
+                      old_tlab_capacity / M,
+                      tlab_capacity() / M);
+  }
+
+size_t ZTLABUsage::tlab_used() const {
+  return _used_history.last();
+}
+
+size_t ZTLABUsage::tlab_capacity() const {
+  return _used_history.davg();
+}
diff --git a/src/hotspot/share/gc/z/zTLABUsage.hpp b/src/hotspot/share/gc/z/zTLABUsage.hpp
new file mode 100644
index 00000000000..3d1b084fe16
--- /dev/null
+++ b/src/hotspot/share/gc/z/zTLABUsage.hpp
@@ -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.
+ */
+
+#ifndef SHARE_GC_Z_ZTLABUSAGE_HPP
+#define SHARE_GC_Z_ZTLABUSAGE_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/numberSeq.hpp"
+
+// ZGC is retiring TLABs concurrently with the application running when
+// processing the stack watermarks. For the common TLAB heuristic to work we
+// need to return consistent TLAB usage information when a TLAB is retired.
+// We snapshot the TLAB usage in the mark start pause for the young generation
+// and use this information until the next garbage collection cycle.
+//
+// ZGC does not have set generation sizes unlike most other GCs and because of
+// this there is no fixed TLAB capacity. For the common TLAB sizing heuristic
+// to work properly ZGC estimates the current capacity by using a weighted
+// average of the last 10 used values. ZGC uses the last snapshotted value as
+// the value returned as tlab_used().
+
+class ZTLABUsage {
+private:
+  // Accounting TLAB used until the next GC cycle
+  volatile size_t _used;
+  // Sequence of historic used values
+  TruncatedSeq    _used_history;
+
+public:
+  ZTLABUsage();
+
+  void increase_used(size_t size);
+  void decrease_used(size_t size);
+  void reset();
+
+  size_t tlab_used() const;
+  size_t tlab_capacity() const;
+};
+
+#endif // SHARE_GC_Z_ZTLABUSAGE_HPP
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 9571c717641..2706e1a3e63 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -116,6 +116,9 @@ serviceability/sa/sadebugd/PmapOnDebugdTest.java              8307393   generic-
 serviceability/sa/sadebugd/RunCommandOnServerTest.java        8307393   generic-all
 serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-all
 
+serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorInterpreterObjectTest.java                8356372 generic-all
+serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java	          8356372 generic-all
+
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java                   8343233 generic-all

From ad161a4ef85e03d4b7be3df2d584356bf4f7cc80 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Tue, 13 May 2025 07:58:36 +0000
Subject: [PATCH 418/901] 8355360: -d option of jwebserver command should
 accept relative paths

Reviewed-by: dfuchs, michaelm
---
 .../simpleserver/SimpleFileServerImpl.java    | 24 +++++-
 .../simpleserver/CommandLineNegativeTest.java | 10 ---
 .../simpleserver/CommandLinePositiveTest.java | 83 ++++++++++++++-----
 .../simpleserver/SimpleFileServerTest.java    | 10 +--
 .../jwebserver/CommandLineNegativeTest.java   | 10 ---
 .../jwebserver/CommandLinePositiveTest.java   | 83 ++++++++++++++-----
 6 files changed, 144 insertions(+), 76 deletions(-)

diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
index 88f72c7aeae..e61dc027f90 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 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
@@ -29,11 +29,13 @@
 import com.sun.net.httpserver.SimpleFileServer;
 import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -139,6 +141,7 @@ static int start(PrintWriter writer, String launcher, String[] args) {
 
         // configure and start server
         try {
+            root = realPath(root);
             var socketAddr = new InetSocketAddress(addr, port);
             var server = SimpleFileServer.createFileServer(socketAddr, root, outputLevel);
             server.start();
@@ -152,6 +155,25 @@ static int start(PrintWriter writer, String launcher, String[] args) {
         return Startup.OK.statusCode;
     }
 
+    private static Path realPath(Path root) {
+
+        // `toRealPath()` invocation below already checks if file exists, though
+        // there is no way to figure out if it fails due to a non-existent file.
+        // Hence, checking the existence here first to deliver the user a more
+        // descriptive message.
+        if (!Files.exists(root)) {
+            throw new IllegalArgumentException("Path does not exist: " + root);
+        }
+
+        // Obtain the real path
+        try {
+            return root.toRealPath();
+        } catch (IOException exception) {
+            throw new IllegalArgumentException("Path is invalid: " + root, exception);
+        }
+
+    }
+
     private static final class Out {
         private final PrintWriter writer;
         private Out() { throw new AssertionError(); }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
index 717b92158b8..5a16bedc29d 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
@@ -168,16 +168,6 @@ public void testPortOutOfRange(String opt) throws Throwable {
     @DataProvider
     public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
-    public void testRootNotAbsolute(String opt) throws Throwable {
-        out.println("\n--- testRootNotAbsolute, opt=\"%s\" ".formatted(opt));
-        var root = Path.of(".");
-        assertFalse(root.isAbsolute());
-        simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, root.toString())
-                .shouldNotHaveExitValue(0)
-                .shouldContain("Error: server config failed: " + "Path is not absolute:");
-    }
-
     @Test(dataProvider = "directoryOptions")
     public void testRootNotADirectory(String opt) throws Throwable {
         out.println("\n--- testRootNotADirectory, opt=\"%s\" ".formatted(opt));
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
index de5d6b54334..16d0ff67ee9 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLinePositiveTest.java
@@ -31,6 +31,7 @@
  */
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.InetAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -52,19 +53,44 @@ public class CommandLinePositiveTest {
     static final Path JAVA_HOME = Path.of(System.getProperty("java.home"));
     static final String LOCALE_OPT = "-Duser.language=en -Duser.country=US";
     static final String JAVA = getJava(JAVA_HOME);
-    static final Path CWD = Path.of(".").toAbsolutePath().normalize();
-    static final Path TEST_DIR = CWD.resolve("CommandLinePositiveTest");
-    static final Path TEST_FILE = TEST_DIR.resolve("file.txt");
-    static final String TEST_DIR_STR = TEST_DIR.toString();
+
+    /**
+     * The <b>real path</b> to the current working directory where
+     * <ol>
+     * <li>the web server process will be started in,</li>
+     * <li>and hence, unless given an explicit content root directory, the web
+     * server will be serving from.</li>
+     * </ol>
+     */
+    private static final Path CWD;
+
+    static {
+        try {
+            CWD = Path.of(".").toRealPath();
+        } catch (IOException exception) {
+            throw new UncheckedIOException(exception);
+        }
+    }
+
+    private static final String CWD_STR = CWD.toString();
+
+    /**
+     * The <b>real path</b> to the web server content root directory, if one
+     * needs to be provided explicitly.
+     */
+    private static final Path ROOT_DIR = CWD.resolve("www");
+
+    private static final String ROOT_DIR_STR = ROOT_DIR.toString();
+
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
     @BeforeTest
     public void setup() throws IOException {
-        if (Files.exists(TEST_DIR)) {
-            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        if (Files.exists(ROOT_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
-        Files.createDirectories(TEST_DIR);
-        Files.createFile(TEST_FILE);
+        Files.createDirectories(ROOT_DIR);
+        Files.createFile(ROOT_DIR.resolve("file.txt"));
     }
 
     static final int SIGTERM = 15;
@@ -83,12 +109,23 @@ static int normalExitCode() {
     public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
     @Test(dataProvider = "directoryOptions")
-    public void testDirectory(String opt) throws Throwable {
-        out.println("\n--- testDirectory, opt=\"%s\" ".formatted(opt));
-        simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, TEST_DIR_STR)
+    public void testAbsDirectory(String opt) throws Throwable {
+        out.printf("\n--- testAbsDirectory, opt=\"%s\"%n", opt);
+        testDirectory(opt, ROOT_DIR_STR);
+    }
+
+    @Test(dataProvider = "directoryOptions")
+    public void testRelDirectory(String opt) throws Throwable {
+        out.printf("\n--- testRelDirectory, opt=\"%s\"%n", opt);
+        Path rootRelDir = CWD.relativize(ROOT_DIR);
+        testDirectory(opt, rootRelDir.toString());
+    }
+
+    private static void testDirectory(String opt, String rootDir) throws Throwable {
+        simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, rootDir)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + ROOT_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -101,7 +138,7 @@ public void testPort(String opt) throws Throwable {
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -155,12 +192,12 @@ public void testBindAllInterfaces(String opt) throws Throwable {
         out.println("\n--- testBindAllInterfaces, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "0.0.0.0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
                 .shouldContain("URL http://" + InetAddress.getLocalHost().getHostAddress());
         if (IPSupport.hasIPv6()) {
             simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "::0")
                     .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                    .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
+                    .shouldContain("Serving " + CWD_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
                     .shouldContain("URL http://" + InetAddress.getLocalHost().getHostAddress());
         }
     }
@@ -170,7 +207,7 @@ public void testLastOneWinsBindAddress(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsBindAddress, opt=\"%s\" ".formatted(opt));
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "123.4.5.6", opt, LOOPBACK_ADDR)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
 
     }
@@ -178,10 +215,10 @@ public void testLastOneWinsBindAddress(String opt) throws Throwable {
     @Test(dataProvider = "directoryOptions")
     public void testLastOneWinsDirectory(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsDirectory, opt=\"%s\" ".formatted(opt));
-        simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, TEST_DIR_STR, opt, TEST_DIR_STR)
+        simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, ROOT_DIR_STR, opt, ROOT_DIR_STR)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + ROOT_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -194,7 +231,7 @@ public void testLastOneWinsOutput(String opt) throws Throwable {
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", "-p", "0", opt, "none", opt, "verbose")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -204,14 +241,14 @@ public void testLastOneWinsPort(String opt) throws Throwable {
         simpleserver(JAVA, LOCALE_OPT, "-m", "jdk.httpserver", opt, "-999", opt, "0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
     @AfterTest
     public void teardown() throws IOException {
-        if (Files.exists(TEST_DIR)) {
-            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        if (Files.exists(ROOT_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
     }
 
@@ -247,7 +284,7 @@ static OutputAnalyzer simpleserver(WaitForLine waitForLine, boolean destroy, Str
         StringBuffer sb = new StringBuffer();  // stdout & stderr
         // start the process and await the waitForLine before returning
         var p = ProcessTools.startProcess("simpleserver",
-                new ProcessBuilder(args).directory(TEST_DIR.toFile()),
+                new ProcessBuilder(args),
                 line -> sb.append(line + "\n"),
                 line -> line.startsWith(waitForLine.value),
                 30,  // suitably high default timeout, not expected to timeout
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
index 3206b62188a..ea1c73b361b 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/SimpleFileServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 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
@@ -668,14 +668,6 @@ public void testBound() {
     @Test
     public void testIllegalPath() throws Exception {
         var addr = LOOPBACK_ADDR;
-        {   // not absolute
-            Path p = Path.of(".");
-            assert Files.isDirectory(p);
-            assert Files.exists(p);
-            assert !p.isAbsolute();
-            var iae = expectThrows(IAE, () -> SimpleFileServer.createFileServer(addr, p, OutputLevel.INFO));
-            assertTrue(iae.getMessage().contains("is not absolute"));
-        }
         {   // not a directory
             Path p = Files.createFile(TEST_DIR.resolve("aFile"));
             assert !Files.isDirectory(p);
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
index 9c7a89696e2..da01b1542d8 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLineNegativeTest.java
@@ -168,16 +168,6 @@ public void testPortOutOfRange(String opt) throws Throwable {
     @DataProvider
     public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
-    @Test(dataProvider = "directoryOptions")
-    public void testRootNotAbsolute(String opt) throws Throwable {
-        out.println("\n--- testRootNotAbsolute, opt=\"%s\" ".formatted(opt));
-        var root = Path.of(".");
-        assertFalse(root.isAbsolute());
-        simpleserver(JWEBSERVER, LOCALE_OPT, opt, root.toString())
-                .shouldNotHaveExitValue(0)
-                .shouldContain("Error: server config failed: " + "Path is not absolute:");
-    }
-
     @Test(dataProvider = "directoryOptions")
     public void testRootNotADirectory(String opt) throws Throwable {
         out.println("\n--- testRootNotADirectory, opt=\"%s\" ".formatted(opt));
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
index fc05c44377c..c0b0b4bc768 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePositiveTest.java
@@ -31,6 +31,7 @@
  */
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.InetAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -52,19 +53,44 @@ public class CommandLinePositiveTest {
     static final Path JAVA_HOME = Path.of(System.getProperty("java.home"));
     static final String LOCALE_OPT = "-J-Duser.language=en -J-Duser.country=US";
     static final String JWEBSERVER = getJwebserver(JAVA_HOME);
-    static final Path CWD = Path.of(".").toAbsolutePath().normalize();
-    static final Path TEST_DIR = CWD.resolve("CommandLinePositiveTest");
-    static final Path TEST_FILE = TEST_DIR.resolve("file.txt");
-    static final String TEST_DIR_STR = TEST_DIR.toString();
+
+    /**
+     * The <b>real path</b> to the current working directory where
+     * <ol>
+     * <li>the web server process will be started in,</li>
+     * <li>and hence, unless given an explicit content root directory, the web
+     * server will be serving from.</li>
+     * </ol>
+     */
+    private static final Path CWD;
+
+    static {
+        try {
+            CWD = Path.of(".").toRealPath();
+        } catch (IOException exception) {
+            throw new UncheckedIOException(exception);
+        }
+    }
+
+    private static final String CWD_STR = CWD.toString();
+
+    /**
+     * The <b>real path</b> to the web server content root directory, if one
+     * needs to be provided explicitly.
+     */
+    private static final Path ROOT_DIR = CWD.resolve("www");
+
+    private static final String ROOT_DIR_STR = ROOT_DIR.toString();
+
     static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
 
     @BeforeTest
     public void setup() throws IOException {
-        if (Files.exists(TEST_DIR)) {
-            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        if (Files.exists(ROOT_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
-        Files.createDirectories(TEST_DIR);
-        Files.createFile(TEST_FILE);
+        Files.createDirectories(ROOT_DIR);
+        Files.createFile(ROOT_DIR.resolve("file.txt"));
     }
 
     static final int SIGTERM = 15;
@@ -83,12 +109,23 @@ static int normalExitCode() {
     public Object[][] directoryOptions() { return new Object[][] {{"-d"}, {"--directory"}}; }
 
     @Test(dataProvider = "directoryOptions")
-    public void testDirectory(String opt) throws Throwable {
-        out.println("\n--- testDirectory, opt=\"%s\" ".formatted(opt));
-        simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, TEST_DIR_STR)
+    public void testAbsDirectory(String opt) throws Throwable {
+        out.printf("\n--- testAbsDirectory, opt=\"%s\"%n", opt);
+        testDirectory(opt, ROOT_DIR_STR);
+    }
+
+    @Test(dataProvider = "directoryOptions")
+    public void testRelDirectory(String opt) throws Throwable {
+        out.printf("\n--- testRelDirectory, opt=\"%s\"%n", opt);
+        Path rootRelDir = CWD.relativize(ROOT_DIR);
+        testDirectory(opt, rootRelDir.toString());
+    }
+
+    private static void testDirectory(String opt, String rootDir) throws Throwable {
+        simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, rootDir)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + ROOT_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -101,7 +138,7 @@ public void testPort(String opt) throws Throwable {
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, "0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -155,12 +192,12 @@ public void testBindAllInterfaces(String opt) throws Throwable {
         out.println("\n--- testBindAllInterfaces, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "0.0.0.0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
                 .shouldContain("URL http://" + InetAddress.getLocalHost().getHostAddress());
         if (IPSupport.hasIPv6()) {
             simpleserver(JWEBSERVER, LOCALE_OPT, opt, "::0")
                     .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                    .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
+                    .shouldContain("Serving " + CWD_STR + " and subdirectories on 0.0.0.0 (all interfaces) port")
                     .shouldContain("URL http://" + InetAddress.getLocalHost().getHostAddress());
         }
     }
@@ -170,7 +207,7 @@ public void testLastOneWinsBindAddress(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsBindAddress, opt=\"%s\" ".formatted(opt));
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "123.4.5.6", opt, LOOPBACK_ADDR)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
 
     }
@@ -178,10 +215,10 @@ public void testLastOneWinsBindAddress(String opt) throws Throwable {
     @Test(dataProvider = "directoryOptions")
     public void testLastOneWinsDirectory(String opt) throws Throwable {
         out.println("\n--- testLastOneWinsDirectory, opt=\"%s\" ".formatted(opt));
-        simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, TEST_DIR_STR, opt, TEST_DIR_STR)
+        simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, CWD_STR, opt, CWD_STR)
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -194,7 +231,7 @@ public void testLastOneWinsOutput(String opt) throws Throwable {
         simpleserver(JWEBSERVER, LOCALE_OPT, "-p", "0", opt, "none", opt, "verbose")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
@@ -204,14 +241,14 @@ public void testLastOneWinsPort(String opt) throws Throwable {
         simpleserver(JWEBSERVER, LOCALE_OPT, opt, "-999", opt, "0")
                 .shouldHaveExitValue(NORMAL_EXIT_CODE)
                 .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
-                .shouldContain("Serving " + TEST_DIR_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
+                .shouldContain("Serving " + CWD_STR + " and subdirectories on " + LOOPBACK_ADDR + " port")
                 .shouldContain("URL http://" + LOOPBACK_ADDR);
     }
 
     @AfterTest
     public void teardown() throws IOException {
-        if (Files.exists(TEST_DIR)) {
-            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        if (Files.exists(ROOT_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(ROOT_DIR);
         }
     }
 
@@ -247,7 +284,7 @@ static OutputAnalyzer simpleserver(WaitForLine waitForLine, boolean destroy, Str
         StringBuffer sb = new StringBuffer();  // stdout & stderr
         // start the process and await the waitForLine before returning
         var p = ProcessTools.startProcess("simpleserver",
-                new ProcessBuilder(args).directory(TEST_DIR.toFile()),
+                new ProcessBuilder(args),
                 line -> sb.append(line + "\n"),
                 line -> line.startsWith(waitForLine.value),
                 30,  // suitably high default timeout, not expected to timeout

From 522c7b446fef17a8400bc589c55b161e939770cc Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Tue, 13 May 2025 08:10:11 +0000
Subject: [PATCH 419/901] 8356175: Remove unnecessary Map.get from
 XWM.getInsets

Reviewed-by: tr, aivanov, serb
---
 src/java.desktop/unix/classes/sun/awt/X11/XWM.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
index 093479b999e..a30dc5d5c76 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWM.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
@@ -1738,9 +1738,7 @@ Insets getInsets(XDecoratedPeer win, long window, long parent) {
         correctWM.left = win.scaleUp(correctWM.left);
         correctWM.right = win.scaleUp(correctWM.right);
 
-        if (storedInsets.get(win.getClass()) == null) {
-            storedInsets.put(win.getClass(), correctWM);
-        }
+        storedInsets.putIfAbsent(win.getClass(), correctWM);
         return correctWM;
     }
     boolean isDesktopWindow( long w ) {

From 132a890a9b3b70f2358237ebd9242b6747ba03dd Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 13 May 2025 08:43:26 +0000
Subject: [PATCH 420/901] 8342486: Implement JEP 505: Structured Concurrency
 (Fifth Preview)

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Co-authored-by: Viktor Klang <vklang@openjdk.org>
Reviewed-by: vklang
---
 .../share/classes/java/lang/ScopedValue.java  |    5 +-
 .../classes/java/util/concurrent/Joiners.java |  220 ++
 .../util/concurrent/StructuredTaskScope.java  | 1947 ++++++++---------
 .../concurrent/StructuredTaskScopeImpl.java   |  417 ++++
 .../jdk/internal/javac/PreviewFeature.java    |    2 +-
 .../jdk/internal/misc/ThreadFlock.java        |   13 +-
 .../lang/ScopedValue/StressStackOverflow.java |    5 +-
 ...sShutdown.java => StressCancellation.java} |   68 +-
 .../StructuredTaskScopeTest.java              | 1835 ++++++++--------
 .../StructuredThreadDumpTest.java             |   27 +-
 .../StructuredTaskScope/WithScopedValue.java  |   42 +-
 .../auth/Subject/CallAsWithScopedValue.java   |    5 +-
 .../misc/ThreadFlock/ThreadFlockTest.java     |  100 +-
 13 files changed, 2533 insertions(+), 2153 deletions(-)
 create mode 100644 src/java.base/share/classes/java/util/concurrent/Joiners.java
 create mode 100644 src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
 rename test/jdk/java/util/concurrent/StructuredTaskScope/{StressShutdown.java => StressCancellation.java} (54%)

diff --git a/src/java.base/share/classes/java/lang/ScopedValue.java b/src/java.base/share/classes/java/lang/ScopedValue.java
index 3730326ee3c..866e575390a 100644
--- a/src/java.base/share/classes/java/lang/ScopedValue.java
+++ b/src/java.base/share/classes/java/lang/ScopedValue.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.
  * Copyright (c) 2020, 2022, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -157,7 +157,8 @@
  *     private static final ScopedValue<String> NAME = ScopedValue.newInstance();
 
  *     ScopedValue.where(NAME, "duke").run(() -> {
- *         try (var scope = new StructuredTaskScope<String>()) {
+ *         // @link substring="open" target="StructuredTaskScope#open()" :
+ *         try (var scope = StructuredTaskScope.open()) {
  *
  *              // @link substring="fork" target="StructuredTaskScope#fork(java.util.concurrent.Callable)" :
  *              scope.fork(() -> childTask1());
diff --git a/src/java.base/share/classes/java/util/concurrent/Joiners.java b/src/java.base/share/classes/java/util/concurrent/Joiners.java
new file mode 100644
index 00000000000..768e260803e
--- /dev/null
+++ b/src/java.base/share/classes/java/util/concurrent/Joiners.java
@@ -0,0 +1,220 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.concurrent;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.concurrent.StructuredTaskScope.Joiner;
+import java.util.concurrent.StructuredTaskScope.Subtask;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.internal.invoke.MhUtil;
+
+/**
+ * Built-in StructuredTaskScope.Joiner implementations.
+ */
+class Joiners {
+    private Joiners() { }
+
+    /**
+     * Throws IllegalArgumentException if the subtask is not in the UNAVAILABLE state.
+     */
+    private static void ensureUnavailable(Subtask<?> subtask) {
+        if (subtask.state() != Subtask.State.UNAVAILABLE) {
+            throw new IllegalArgumentException("Subtask not in UNAVAILABLE state");
+        }
+    }
+
+    /**
+     * Throws IllegalArgumentException if the subtask has not completed.
+     */
+    private static Subtask.State ensureCompleted(Subtask<?> subtask) {
+        Subtask.State state = subtask.state();
+        if (state == Subtask.State.UNAVAILABLE) {
+            throw new IllegalArgumentException("Subtask has not completed");
+        }
+        return state;
+    }
+
+    /**
+     * A joiner that returns a stream of all subtasks when all subtasks complete
+     * successfully. Cancels the scope if any subtask fails.
+     */
+    static final class AllSuccessful<T> implements Joiner<T, Stream<Subtask<T>>> {
+        private static final VarHandle FIRST_EXCEPTION =
+                MhUtil.findVarHandle(MethodHandles.lookup(), "firstException", Throwable.class);
+
+        // list of forked subtasks, only accessed by owner thread
+        private final List<Subtask<T>> subtasks = new ArrayList<>();
+
+        private volatile Throwable firstException;
+
+        @Override
+        public boolean onFork(Subtask<? extends T> subtask) {
+            ensureUnavailable(subtask);
+            @SuppressWarnings("unchecked")
+            var s = (Subtask<T>) subtask;
+            subtasks.add(s);
+            return false;
+        }
+
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            Subtask.State state = ensureCompleted(subtask);
+            return (state == Subtask.State.FAILED)
+                    && (firstException == null)
+                    && FIRST_EXCEPTION.compareAndSet(this, null, subtask.exception());
+        }
+
+        @Override
+        public Stream<Subtask<T>> result() throws Throwable {
+            Throwable ex = firstException;
+            if (ex != null) {
+                throw ex;
+            } else {
+                return subtasks.stream();
+            }
+        }
+    }
+
+    /**
+     * A joiner that returns the result of the first subtask to complete successfully.
+     * Cancels the scope if any subtasks succeeds.
+     */
+    static final class AnySuccessful<T> implements Joiner<T, T> {
+        private static final VarHandle SUBTASK =
+                MhUtil.findVarHandle(MethodHandles.lookup(), "subtask", Subtask.class);
+
+        // UNAVAILABLE < FAILED < SUCCESS
+        private static final Comparator<Subtask.State> SUBTASK_STATE_COMPARATOR =
+                Comparator.comparingInt(AnySuccessful::stateToInt);
+
+        private volatile Subtask<T> subtask;
+
+        /**
+         * Maps a Subtask.State to an int that can be compared.
+         */
+        private static int stateToInt(Subtask.State s) {
+            return switch (s) {
+                case UNAVAILABLE -> 0;
+                case FAILED      -> 1;
+                case SUCCESS     -> 2;
+            };
+        }
+
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            Subtask.State state = ensureCompleted(subtask);
+            Subtask<T> s;
+            while (((s = this.subtask) == null)
+                    || SUBTASK_STATE_COMPARATOR.compare(s.state(), state) < 0) {
+                if (SUBTASK.compareAndSet(this, s, subtask)) {
+                    return (state == Subtask.State.SUCCESS);
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public T result() throws Throwable {
+            Subtask<T> subtask = this.subtask;
+            if (subtask == null) {
+                throw new NoSuchElementException("No subtasks completed");
+            }
+            return switch (subtask.state()) {
+                case SUCCESS -> subtask.get();
+                case FAILED  -> throw subtask.exception();
+                default      -> throw new InternalError();
+            };
+        }
+    }
+
+    /**
+     * A joiner that that waits for all successful subtasks. Cancels the scope if any
+     * subtask fails.
+     */
+    static final class AwaitSuccessful<T> implements Joiner<T, Void> {
+        private static final VarHandle FIRST_EXCEPTION =
+                MhUtil.findVarHandle(MethodHandles.lookup(), "firstException", Throwable.class);
+        private volatile Throwable firstException;
+
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            Subtask.State state = ensureCompleted(subtask);
+            return (state == Subtask.State.FAILED)
+                    && (firstException == null)
+                    && FIRST_EXCEPTION.compareAndSet(this, null, subtask.exception());
+        }
+
+        @Override
+        public Void result() throws Throwable {
+            Throwable ex = firstException;
+            if (ex != null) {
+                throw ex;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    /**
+     * A joiner that returns a stream of all subtasks.
+     */
+    static final class AllSubtasks<T> implements Joiner<T, Stream<Subtask<T>>> {
+        private final Predicate<Subtask<? extends T>> isDone;
+
+        // list of forked subtasks, only accessed by owner thread
+        private final List<Subtask<T>> subtasks = new ArrayList<>();
+
+        AllSubtasks(Predicate<Subtask<? extends T>> isDone) {
+            this.isDone = Objects.requireNonNull(isDone);
+        }
+
+        @Override
+        public boolean onFork(Subtask<? extends T> subtask) {
+            ensureUnavailable(subtask);
+            @SuppressWarnings("unchecked")
+            var s = (Subtask<T>) subtask;
+            subtasks.add(s);
+            return false;
+        }
+
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            ensureCompleted(subtask);
+            return isDone.test(subtask);
+        }
+
+        @Override
+        public Stream<Subtask<T>> result() {
+            return subtasks.stream();
+        }
+    }
+}
diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
index 41c6b4914b9..fb16e0a615e 100644
--- a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.java
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScope.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
@@ -24,315 +24,348 @@
  */
 package java.util.concurrent;
 
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
 import java.time.Duration;
-import java.time.Instant;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 import jdk.internal.javac.PreviewFeature;
-import jdk.internal.misc.ThreadFlock;
-import jdk.internal.invoke.MhUtil;
 
 /**
- * A basic API for <em>structured concurrency</em>. {@code StructuredTaskScope} supports
- * cases where a task splits into several concurrent subtasks, and where the subtasks must
- * complete before the main task continues. A {@code StructuredTaskScope} can be used to
- * ensure that the lifetime of a concurrent operation is confined by a <em>syntax block</em>,
- * just like that of a sequential operation in structured programming.
- *
- * <h2>Basic operation</h2>
- *
- * A {@code StructuredTaskScope} is created with one of its public constructors. It defines
- * the {@link #fork(Callable) fork} method to start a thread to execute a subtask, the {@link
- * #join() join} method to wait for all subtasks to finish, and the {@link #close() close}
- * method to close the task scope. The API is intended to be used with the {@code
- * try-with-resources} statement. The intention is that code in the try <em>block</em>
- * uses the {@code fork} method to fork threads to execute the subtasks, wait for the
- * subtasks to finish with the {@code join} method, and then <em>process the results</em>.
- * A call to the {@code fork} method returns a {@link Subtask Subtask} to representing
- * the <em>forked subtask</em>. Once {@code join} is called, the {@code Subtask} can be
- * used to get the result completed successfully, or the exception if the subtask failed.
- * {@snippet lang=java :
- *     Callable<String> task1 = ...
- *     Callable<Integer> task2 = ...
+ * An API for <em>structured concurrency</em>. {@code StructuredTaskScope} supports cases
+ * where execution of a <em>task</em> (a unit of work) splits into several concurrent
+ * subtasks, and where the subtasks must complete before the task continues. A {@code
+ * StructuredTaskScope} can be used to ensure that the lifetime of a concurrent operation
+ * is confined by a <em>syntax block</em>, similar to that of a sequential operation in
+ * structured programming.
+ *
+ * <p> {@code StructuredTaskScope} defines the static method {@link #open() open} to open
+ * a new {@code StructuredTaskScope} and the {@link #close() close} method to close it.
+ * The API is designed to be used with the {@code try}-with-resources statement where
+ * the {@code StructuredTaskScope} is opened as a resource and then closed automatically.
+ * The code inside the block uses the {@link #fork(Callable) fork} method to fork subtasks.
+ * After forking, it uses the {@link #join() join} method to wait for all subtasks to
+ * finish (or some other outcome) as a single operation. Forking a subtask starts a new
+ * {@link Thread} to run the subtask. The thread executing the task does not continue
+ * beyond the {@code close} method until all threads started to execute subtasks have finished.
+ * To ensure correct usage, the {@code fork}, {@code join} and {@code close} methods may
+ * only be invoked by the <em>owner thread</em> (the thread that opened the {@code
+ * StructuredTaskScope}), the {@code fork} method may not be called after {@code join},
+ * the {@code join} method may only be invoked once, and the {@code close} method throws
+ * an exception after closing if the owner did not invoke the {@code join} method after
+ * forking subtasks.
  *
- *     try (var scope = new StructuredTaskScope<Object>()) {
+ * <p> As a first example, consider a task that splits into two subtasks to concurrently
+ * fetch resources from two URL locations "left" and "right". Both subtasks may complete
+ * successfully, one subtask may succeed and the other may fail, or both subtasks may
+ * fail. The task in this example is interested in the successful result from both
+ * subtasks. It waits in the {@link #join() join} method for both subtasks to complete
+ * successfully or for either subtask to fail.
+ * {@snippet lang=java :
+ *    // @link substring="open" target="#open()" :
+ *    try (var scope = StructuredTaskScope.open()) {
  *
- *         Subtask<String> subtask1 = scope.fork(task1);   // @highlight substring="fork"
- *         Subtask<Integer> subtask2 = scope.fork(task2);  // @highlight substring="fork"
+ *        // @link substring="fork" target="#fork(Callable)" :
+ *        Subtask<String> subtask1 = scope.fork(() -> query(left));
+ *        Subtask<Integer> subtask2 = scope.fork(() -> query(right));
  *
- *         scope.join();                                   // @highlight substring="join"
+ *        // throws if either subtask fails
+ *        scope.join();  // @link substring="join" target="#join()"
  *
- *         ... process results/exceptions ...
+ *        // both subtasks completed successfully
+ *        // @link substring="get" target="Subtask#get()" :
+ *        return new MyResult(subtask1.get(), subtask2.get());
  *
- *     } // close                                          // @highlight substring="close"
+ *    // @link substring="close" target="#close()" :
+ *    } // close
  * }
- * <p> The following example forks a collection of homogeneous subtasks, waits for all of
- * them to complete with the {@code join} method, and uses the {@link Subtask.State
- * Subtask.State} to partition the subtasks into a set of the subtasks that completed
- * successfully and another for the subtasks that failed.
- * {@snippet lang=java :
- *     List<Callable<String>> callables = ...
  *
- *     try (var scope = new StructuredTaskScope<String>()) {
+ * <p> If both subtasks complete successfully then the {@code join} method completes
+ * normally and the task uses the {@link Subtask#get() Subtask.get()} method to get
+ * the result of each subtask. If one of the subtasks fails then the other subtask is
+ * cancelled (this will {@linkplain Thread#interrupt() interrupt} the thread executing the
+ * other subtask) and the {@code join} method throws {@link FailedException} with the
+ * exception from the failed subtask as the {@linkplain Throwable#getCause() cause}.
+ *
+ * <p> To allow for cancellation, subtasks must be coded so that they finish as soon as
+ * possible when interrupted. Subtasks that do not respond to interrupt, e.g. block on
+ * methods that are not interruptible, may delay the closing of a scope indefinitely. The
+ * {@link #close() close} method always waits for threads executing subtasks to finish,
+ * even if the scope is cancelled, so execution cannot continue beyond the {@code close}
+ * method until the interrupted threads finish.
+ *
+ * <p> In the example, the subtasks produce results of different types ({@code String} and
+ * {@code Integer}). In other cases the subtasks may all produce results of the same type.
+ * If the example had used {@code StructuredTaskScope.<String>open()} then it could
+ * only be used to fork subtasks that return a {@code String} result.
  *
- *         List<Subtask<String>> subtasks = callables.stream().map(scope::fork).toList();
+ * <h2>Joiners</h2>
  *
- *         scope.join();
+ * <p> In the example above, the task fails if any subtask fails. If all subtasks
+ * succeed then the {@code join} method completes normally. Other policy and outcome is
+ * supported by creating a {@code StructuredTaskScope} with a {@link Joiner} that
+ * implements the desired policy. A {@code Joiner} handles subtask completion and produces
+ * the outcome for the {@link #join() join} method. In the example above, {@code join}
+ * returns {@code null}. Depending on the {@code Joiner}, {@code join} may return a
+ * result, a stream of elements, or some other object. The {@code Joiner} interface defines
+ * factory methods to create {@code Joiner}s for some common cases.
  *
- *         Map<Boolean, Set<Subtask<String>>> map = subtasks.stream()
- *                 .collect(Collectors.partitioningBy(h -> h.state() == Subtask.State.SUCCESS,
- *                                                    Collectors.toSet()));
+ * <p> A {@code Joiner} may <a id="Cancallation">cancel</a> the scope (sometimes called
+ * "short-circuiting") when some condition is reached that does not require the result of
+ * subtasks that are still executing. Cancelling the scope prevents new threads from being
+ * started to execute further subtasks, {@linkplain Thread#interrupt() interrupts} the
+ * threads executing subtasks that have not completed, and causes the {@code join} method
+ * to wakeup with the outcome (result or exception). In the above example, the outcome is
+ * that {@code join} completes with a result of {@code null} when all subtasks succeed.
+ * The scope is cancelled if any of the subtasks fail and {@code join} throws {@code
+ * FailedException} with the exception from the failed subtask as the cause. Other {@code
+ * Joiner} implementations may cancel the scope for other reasons.
  *
- *     } // close
+ * <p> Now consider another example that splits into two subtasks. In this example,
+ * each subtask produces a {@code String} result and the task is only interested in
+ * the result from the first subtask to complete successfully. The example uses {@link
+ * Joiner#anySuccessfulResultOrThrow() Joiner.anySuccessfulResultOrThrow()} to
+ * create a {@code Joiner} that makes available the result of the first subtask to
+ * complete successfully. The type parameter in the example is "{@code String}" so that
+ * only subtasks that return a {@code String} can be forked.
+ * {@snippet lang=java :
+ *    // @link substring="open" target="#open(Joiner)" :
+ *    try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow())) {
+ *
+ *        scope.fork(callable1);
+ *        scope.fork(callable2);
+ *
+ *        // throws if both subtasks fail
+ *        String firstResult = scope.join();
+ *
+ *    }
  * }
  *
- * <p> To ensure correct usage, the {@code join} and {@code close} methods may only be
- * invoked by the <em>owner</em> (the thread that opened/created the task scope), and the
- * {@code close} method throws an exception after closing if the owner did not invoke the
- * {@code join} method after forking.
- *
- * <p> {@code StructuredTaskScope} defines the {@link #shutdown() shutdown} method to shut
- * down a task scope without closing it. The {@code shutdown()} method <em>cancels</em> all
- * unfinished subtasks by {@linkplain Thread#interrupt() interrupting} the threads. It
- * prevents new threads from starting in the task scope. If the owner is waiting in the
- * {@code join} method then it will wakeup.
- *
- * <p> Shutdown is used for <em>short-circuiting</em> and allow subclasses to implement
- * <em>policy</em> that does not require all subtasks to finish.
- *
- * <h2>Subclasses with policies for common cases</h2>
- *
- * Two subclasses of {@code StructuredTaskScope} are defined to implement policy for
- * common cases:
- * <ol>
- *   <li> {@link ShutdownOnSuccess ShutdownOnSuccess} captures the result of the first
- *   subtask to complete successfully. Once captured, it shuts down the task scope to
- *   interrupt unfinished threads and wakeup the owner. This class is intended for cases
- *   where the result of any subtask will do ("invoke any") and where there is no need to
- *   wait for results of other unfinished subtasks. It defines methods to get the first
- *   result or throw an exception if all subtasks fail.
- *   <li> {@link ShutdownOnFailure ShutdownOnFailure} captures the exception of the first
- *   subtask to fail. Once captured, it shuts down the task scope to interrupt unfinished
- *   threads and wakeup the owner. This class is intended for cases where the results of all
- *   subtasks are required ("invoke all"); if any subtask fails then the results of other
- *   unfinished subtasks are no longer needed. If defines methods to throw an exception if
- *   any of the subtasks fail.
- * </ol>
- *
- * <p> The following are two examples that use the two classes. In both cases, a pair of
- * subtasks are forked to fetch resources from two URL locations "left" and "right". The
- * first example creates a ShutdownOnSuccess object to capture the result of the first
- * subtask to complete successfully, cancelling the other by way of shutting down the task
- * scope. The main task waits in {@code join} until either subtask completes with a result
- * or both subtasks fail. It invokes {@link ShutdownOnSuccess#result(Function)
- * result(Function)} method to get the captured result. If both subtasks fail then this
- * method throws a {@code WebApplicationException} with the exception from one of the
- * subtasks as the cause.
+ * <p> In the example, the task forks the two subtasks, then waits in the {@code
+ * join} method for either subtask to complete successfully or for both subtasks to fail.
+ * If one of the subtasks completes successfully then the {@code Joiner} causes the other
+ * subtask to be cancelled (this will interrupt the thread executing the subtask), and
+ * the {@code join} method returns the result from the successful subtask. Cancelling the
+ * other subtask avoids the task waiting for a result that it doesn't care about. If
+ * both subtasks fail then the {@code join} method throws {@code FailedException} with the
+ * exception from one of the subtasks as the {@linkplain Throwable#getCause() cause}.
+ *
+ * <p> Whether code uses the {@code Subtask} returned from {@code fork} will depend on
+ * the {@code Joiner} and usage. Some {@code Joiner} implementations are suited to subtasks
+ * that return results of the same type and where the {@code join} method returns a result
+ * for the task to use. Code that forks subtasks that return results of different
+ * types, and uses a {@code Joiner} such as {@code Joiner.awaitAllSuccessfulOrThrow()} that
+ * does not return a result, will use {@link Subtask#get() Subtask.get()} after joining.
+ *
+ * <h2>Exception handling</h2>
+ *
+ * <p> A {@code StructuredTaskScope} is opened with a {@link Joiner Joiner} that
+ * handles subtask completion and produces the outcome for the {@link #join() join} method.
+ * In some cases, the outcome will be a result, in other cases it will be an exception.
+ * If the outcome is an exception then the {@code join} method throws {@link
+ * FailedException} with the exception as the {@linkplain Throwable#getCause()
+ * cause}. For many {@code Joiner} implementations, the exception will be an exception
+ * thrown by a subtask that failed. In the case of {@link Joiner#allSuccessfulOrThrow()
+ * allSuccessfulOrThrow} and {@link Joiner#awaitAllSuccessfulOrThrow() awaitAllSuccessfulOrThrow}
+ * for example, the exception is from the first subtask to fail.
+ *
+ * <p> Many of the details for how exceptions are handled will depend on usage. In some
+ * cases it may be useful to add a {@code catch} block to the {@code try}-with-resources
+ * statement to catch {@code FailedException}. The exception handling may use {@code
+ * instanceof} with pattern matching to handle specific causes.
  * {@snippet lang=java :
- *     try (var scope = new StructuredTaskScope.ShutdownOnSuccess<String>()) {
+ *    try (var scope = StructuredTaskScope.open()) {
  *
- *         scope.fork(() -> fetch(left));
- *         scope.fork(() -> fetch(right));
+ *        ..
  *
- *         scope.join();
+ *    } catch (StructuredTaskScope.FailedException e) {
  *
- *         // @link regex="result(?=\()" target="ShutdownOnSuccess#result" :
- *         String result = scope.result(e -> new WebApplicationException(e));
+ *        Throwable cause = e.getCause();
+ *        switch (cause) {
+ *            case IOException ioe -> ..
+ *            default -> ..
+ *        }
  *
- *         ...
- *     }
+ *    }
  * }
- * The second example creates a ShutdownOnFailure object to capture the exception of the
- * first subtask to fail, cancelling the other by way of shutting down the task scope. The
- * main task waits in {@link #joinUntil(Instant)} until both subtasks complete with a
- * result, either fails, or a deadline is reached. It invokes {@link
- * ShutdownOnFailure#throwIfFailed(Function) throwIfFailed(Function)} to throw an exception
- * if either subtask fails. This method is a no-op if both subtasks complete successfully.
- * The example uses {@link Supplier#get()} to get the result of each subtask. Using
- * {@code Supplier} instead of {@code Subtask} is preferred for common cases where the
- * object returned by fork is only used to get the result of a subtask that completed
- * successfully.
- * {@snippet lang=java :
- *    Instant deadline = ...
+ * In other cases it may not be useful to catch {@code FailedException} but instead leave
+ * it to propagate to the configured {@linkplain Thread.UncaughtExceptionHandler uncaught
+ * exception handler} for logging purposes.
+ *
+ * <p> For cases where a specific exception triggers the use of a default result then it
+ * may be more appropriate to handle this in the subtask itself rather than the subtask
+ * failing and the scope owner handling the exception.
+ *
+ * <h2>Configuration</h2>
  *
- *    try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
  *
- *         Supplier<String> supplier1 = scope.fork(() -> query(left));
- *         Supplier<String> supplier2 = scope.fork(() -> query(right));
+ * A {@code StructuredTaskScope} is opened with {@linkplain Configuration configuration}
+ * that consists of a {@link ThreadFactory} to create threads, an optional name for
+ * monitoring and management purposes, and an optional timeout.
  *
- *         scope.joinUntil(deadline);
+ * <p> The {@link #open()} and {@link #open(Joiner)} methods create a {@code StructuredTaskScope}
+ * with the <a id="DefaultConfiguration"> <em>default configuration</em></a>. The default
+ * configuration has a {@code ThreadFactory} that creates unnamed
+ * <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
+ * is unnamed for monitoring and management purposes, and has no timeout.
  *
- *         // @link substring="throwIfFailed" target="ShutdownOnFailure#throwIfFailed" :
- *         scope.throwIfFailed(e -> new WebApplicationException(e));
+ * <p> The 2-arg {@link #open(Joiner, Function) open} method can be used to create a
+ * {@code StructuredTaskScope} that uses a different {@code ThreadFactory}, has a name for
+ * the purposes of monitoring and management, or has a timeout that cancels the scope if
+ * the timeout expires before or while waiting for subtasks to complete. The {@code open}
+ * method is called with a {@linkplain Function function} that is applied to the default
+ * configuration and returns a {@link Configuration Configuration} for the
+ * {@code StructuredTaskScope} under construction.
  *
- *         // both subtasks completed successfully
- *         String result = Stream.of(supplier1, supplier2)
- *                 .map(Supplier::get)
- *                 .collect(Collectors.joining(", ", "{ ", " }"));
+ * <p> The following example opens a new {@code StructuredTaskScope} with a {@code
+ * ThreadFactory} that creates virtual threads {@linkplain Thread#setName(String) named}
+ * "duke-0", "duke-1" ...
+ * {@snippet lang = java:
+ *    // @link substring="name" target="Thread.Builder#name(String, long)" :
+ *    ThreadFactory factory = Thread.ofVirtual().name("duke-", 0).factory();
+ *
+ *    // @link substring="withThreadFactory" target="Configuration#withThreadFactory(ThreadFactory)" :
+ *    try (var scope = StructuredTaskScope.open(joiner, cf -> cf.withThreadFactory(factory))) {
+ *
+ *        scope.fork( .. );   // runs in a virtual thread with name "duke-0"
+ *        scope.fork( .. );   // runs in a virtual thread with name "duke-1"
+ *
+ *        scope.join();
  *
- *         ...
  *     }
- * }
+ *}
  *
- * <h2>Extending StructuredTaskScope</h2>
- *
- * {@code StructuredTaskScope} can be extended, and the {@link #handleComplete(Subtask)
- * handleComplete} method overridden, to implement policies other than those implemented
- * by {@code ShutdownOnSuccess} and {@code ShutdownOnFailure}. A subclass may, for example,
- * collect the results of subtasks that complete successfully and ignore subtasks that
- * fail. It may collect exceptions when subtasks fail. It may invoke the {@link #shutdown()
- * shutdown} method to shut down and cause {@link #join() join} to wakeup when some
- * condition arises.
- *
- * <p> A subclass will typically define methods to make available results, state, or other
- * outcome to code that executes after the {@code join} method. A subclass that collects
- * results and ignores subtasks that fail may define a method that returns the results.
- * A subclass that implements a policy to shut down when a subtask fails may define a
- * method to get the exception of the first subtask to fail.
- *
- * <p> The following is an example of a simple {@code StructuredTaskScope} implementation
- * that collects homogenous subtasks that complete successfully. It defines the method
- * "{@code completedSuccessfully()}" that the main task can invoke after it joins.
+ * <p> A second example sets a timeout, represented by a {@link Duration}. The timeout
+ * starts when the new scope is opened. If the timeout expires before the {@code join}
+ * method has completed then the scope is <a href="#Cancallation">cancelled</a>. This
+ * interrupts the threads executing the two subtasks and causes the {@link #join() join}
+ * method to throw {@link TimeoutException}.
  * {@snippet lang=java :
- *     class CollectingScope<T> extends StructuredTaskScope<T> {
- *         private final Queue<Subtask<? extends T>> subtasks = new LinkedTransferQueue<>();
- *
- *         @Override
- *         protected void handleComplete(Subtask<? extends T> subtask) {
- *             if (subtask.state() == Subtask.State.SUCCESS) {
- *                 subtasks.add(subtask);
- *             }
- *         }
+ *    Duration timeout = Duration.ofSeconds(10);
  *
- *         @Override
- *         public CollectingScope<T> join() throws InterruptedException {
- *             super.join();
- *             return this;
- *         }
+ *    // @link substring="allSuccessfulOrThrow" target="Joiner#allSuccessfulOrThrow()" :
+ *    try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow(),
+ *    // @link substring="withTimeout" target="Configuration#withTimeout(Duration)" :
+ *                                              cf -> cf.withTimeout(timeout))) {
  *
- *         public Stream<Subtask<? extends T>> completedSuccessfully() {
- *             // @link substring="ensureOwnerAndJoined" target="ensureOwnerAndJoined" :
- *             super.ensureOwnerAndJoined();
- *             return subtasks.stream();
- *         }
- *     }
+ *        scope.fork(callable1);
+ *        scope.fork(callable2);
+ *
+ *        List<String> result = scope.join()
+ *                                   .map(Subtask::get)
+ *                                   .toList();
+ *
+ *   }
  * }
- * <p> The implementations of the {@code completedSuccessfully()} method in the example
- * invokes {@link #ensureOwnerAndJoined()} to ensure that the method can only be invoked
- * by the owner thread and only after it has joined.
- *
- * <h2><a id="TreeStructure">Tree structure</a></h2>
- *
- * Task scopes form a tree where parent-child relations are established implicitly when
- * opening a new task scope:
- * <ul>
- *   <li> A parent-child relation is established when a thread started in a task scope
- *   opens its own task scope. A thread started in task scope "A" that opens task scope
- *   "B" establishes a parent-child relation where task scope "A" is the parent of task
- *   scope "B".
- *   <li> A parent-child relation is established with nesting. If a thread opens task
- *   scope "B", then opens task scope "C" (before it closes "B"), then the enclosing task
- *   scope "B" is the parent of the nested task scope "C".
- * </ul>
- *
- * The <i>descendants</i> of a task scope are the child task scopes that it is a parent
- * of, plus the descendants of the child task scopes, recursively.
- *
- * <p> The tree structure supports:
- * <ul>
- *   <li> Inheritance of {@linkplain ScopedValue scoped values} across threads.
- *   <li> Confinement checks. The phrase "threads contained in the task scope" in method
- *   descriptions means threads started in the task scope or descendant scopes.
- * </ul>
- *
- * <p> The following example demonstrates the inheritance of a scoped value. A scoped
- * value {@code USERNAME} is bound to the value "{@code duke}". A {@code StructuredTaskScope}
- * is created and its {@code fork} method invoked to start a thread to execute {@code
- * childTask}. The thread inherits the scoped value <em>bindings</em> captured when
- * creating the task scope. The code in {@code childTask} uses the value of the scoped
- * value and so reads the value "{@code duke}".
+ *
+ * <h2>Inheritance of scoped value bindings</h2>
+ *
+ * {@link ScopedValue} supports the execution of a method with a {@code ScopedValue} bound
+ * to a value for the bounded period of execution of the method by the <em>current thread</em>.
+ * It allows a value to be safely and efficiently shared to methods without using method
+ * parameters.
+ *
+ * <p> When used in conjunction with a {@code StructuredTaskScope}, a {@code ScopedValue}
+ * can also safely and efficiently share a value to methods executed by subtasks forked
+ * in the scope. When a {@code ScopedValue} object is bound to a value in the thread
+ * executing the task then that binding is inherited by the threads created to
+ * execute the subtasks. The thread executing the task does not continue beyond the
+ * {@link #close() close} method until all threads executing the subtasks have finished.
+ * This ensures that the {@code ScopedValue} is not reverted to being {@linkplain
+ * ScopedValue#isBound() unbound} (or its previous value) while subtasks are executing.
+ * In addition to providing a safe and efficient means to inherit a value into subtasks,
+ * the inheritance allows sequential code using {@code ScopedValue} be refactored to use
+ * structured concurrency.
+ *
+ * <p> To ensure correctness, opening a new {@code StructuredTaskScope} captures the
+ * current thread's scoped value bindings. These are the scoped values bindings that are
+ * inherited by the threads created to execute subtasks in the scope. Forking a
+ * subtask checks that the bindings in effect at the time that the subtask is forked
+ * match the bindings when the {@code StructuredTaskScope} was created. This check ensures
+ * that a subtask does not inherit a binding that is reverted in the task before the
+ * subtask has completed.
+ *
+ * <p> A {@code ScopedValue} that is shared across threads requires that the value be an
+ * immutable object or for all access to the value to be appropriately synchronized.
+ *
+ * <p> The following example demonstrates the inheritance of scoped value bindings. The
+ * scoped value USERNAME is bound to the value "duke" for the bounded period of a lambda
+ * expression by the thread executing it. The code in the block opens a {@code
+ * StructuredTaskScope} and forks two subtasks, it then waits in the {@code join} method
+ * and aggregates the results from both subtasks. If code executed by the threads
+ * running subtask1 and subtask2 uses {@link ScopedValue#get()}, to get the value of
+ * USERNAME, then value "duke" will be returned.
  * {@snippet lang=java :
+ *     // @link substring="newInstance" target="ScopedValue#newInstance()" :
  *     private static final ScopedValue<String> USERNAME = ScopedValue.newInstance();
  *
- *     // @link substring="run" target="ScopedValue.Carrier#run(Runnable)" :
- *     ScopedValue.where(USERNAME, "duke").run(() -> {
- *         try (var scope = new StructuredTaskScope<String>()) {
+ *     // @link substring="where" target="ScopedValue#where(ScopedValue, Object)" :
+ *     MyResult result = ScopedValue.where(USERNAME, "duke").call(() -> {
  *
- *             scope.fork(() -> childTask());           // @highlight substring="fork"
- *             ...
- *          }
- *     });
+ *         try (var scope = StructuredTaskScope.open()) {
  *
- *     ...
+ *             Subtask<String> subtask1 = scope.fork( .. );    // inherits binding
+ *             Subtask<Integer> subtask2 = scope.fork( .. );   // inherits binding
  *
- *     String childTask() {
- *         // @link substring="get" target="ScopedValue#get()" :
- *         String name = USERNAME.get();   // "duke"
- *         ...
- *     }
+ *             scope.join();
+ *             return new MyResult(subtask1.get(), subtask2.get());
+ *         }
+ *
+ *     });
  * }
  *
- * <p> {@code StructuredTaskScope} does not define APIs that exposes the tree structure
- * at this time.
+ * <p> A scoped value inherited into a subtask may be
+ * <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/ScopedValue.html#rebind">rebound</a> to a new
+ * value in the subtask for the bounded execution of some method executed in the subtask.
+ * When the method completes, the value of the {@code ScopedValue} reverts to its previous
+ * value, the value inherited from the thread executing the task.
  *
- * <p> Unless otherwise specified, passing a {@code null} argument to a constructor
- * or method in this class will cause a {@link NullPointerException} to be thrown.
+ * <p> A subtask may execute code that itself opens a new {@code StructuredTaskScope}.
+ * A task executing in thread T1 opens a {@code StructuredTaskScope} and forks a
+ * subtask that runs in thread T2. The scoped value bindings captured when T1 opens the
+ * scope are inherited into T2. The subtask (in thread T2) executes code that opens a
+ * new {@code StructuredTaskScope} and forks a subtask that runs in thread T3. The scoped
+ * value bindings captured when T2 opens the scope are inherited into T3. These
+ * include (or may be the same) as the bindings that were inherited from T1. In effect,
+ * scoped values are inherited into a tree of subtasks, not just one level of subtask.
  *
  * <h2>Memory consistency effects</h2>
  *
- * <p> Actions in the owner thread of, or a thread contained in, the task scope prior to
+ * <p> Actions in the owner thread of a {@code StructuredTaskScope} prior to
  * {@linkplain #fork forking} of a subtask
  * <a href="http://github.com/%7B@docRoot%7D/java.base/java/util/concurrent/package-summary.html#MemoryVisibility">
- * <i>happen-before</i></a> any actions taken by that subtask, which in turn <i>happen-before</i>
- * the subtask result is {@linkplain Subtask#get() retrieved} or <i>happen-before</i> any
- * actions taken in a thread after {@linkplain #join() joining} of the task scope.
+ * <i>happen-before</i></a> any actions taken by that subtask, which in turn
+ * <i>happen-before</i> the subtask result is {@linkplain Subtask#get() retrieved}.
  *
- * @jls 17.4.5 Happens-before Order
+ * <h2>General exceptions</h2>
+ *
+ * <p> Unless otherwise specified, passing a {@code null} argument to a method in this
+ * class will cause a {@link NullPointerException} to be thrown.
+ *
+ * @param <T> the result type of subtasks executed in the scope
+ * @param <R> the result type of the scope
  *
- * @param <T> the result type of tasks executed in the task scope
+ * @jls 17.4.5 Happens-before Order
  * @since 21
  */
 @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
-public class StructuredTaskScope<T> implements AutoCloseable {
-    private final ThreadFactory factory;
-    private final ThreadFlock flock;
-    private final ReentrantLock shutdownLock = new ReentrantLock();
-
-    // states: OPEN -> SHUTDOWN -> CLOSED
-    private static final int OPEN     = 0;   // initial state
-    private static final int SHUTDOWN = 1;
-    private static final int CLOSED   = 2;
-
-    // state: set to SHUTDOWN by any thread, set to CLOSED by owner, read by any thread
-    private volatile int state;
-
-    // Counters to support checking that the task scope owner joins before processing
-    // results and attempts join before closing the task scope. These counters are
-    // accessed only by the owner thread.
-    private int forkRound;         // incremented when the first subtask is forked after join
-    private int lastJoinAttempted; // set to the current fork round when join is attempted
-    private int lastJoinCompleted; // set to the current fork round when join completes
+public sealed interface StructuredTaskScope<T, R>
+        extends AutoCloseable
+        permits StructuredTaskScopeImpl {
 
     /**
-     * Represents a subtask forked with {@link #fork(Callable)}.
+     * Represents a subtask forked with {@link #fork(Callable)} or {@link #fork(Runnable)}.
+     *
+     * <p> Code that forks subtasks can use the {@link #get() get()} method after {@linkplain
+     * #join() joining} to obtain the result of a subtask that completed successfully. It
+     * can use the {@link #exception()} method to obtain the exception thrown by a subtask
+     * that failed.
+     *
      * @param <T> the result type
      * @since 21
      */
     @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
-    public sealed interface Subtask<T> extends Supplier<T> permits SubtaskImpl {
-        /**
-         * {@return the value returning task provided to the {@code fork} method}
-         *
-         * @apiNote Task objects with unique identity may be used for correlation by
-         * implementations of {@link #handleComplete(Subtask) handleComplete}.
-         */
-        Callable<? extends T> task();
-
+    sealed interface Subtask<T> extends Supplier<T> permits StructuredTaskScopeImpl.SubtaskImpl {
         /**
          * Represents the state of a subtask.
          * @see Subtask#state()
@@ -342,964 +375,698 @@ public sealed interface Subtask<T> extends Supplier<T> permits SubtaskImpl {
         enum State {
             /**
              * The subtask result or exception is not available. This state indicates that
-             * the subtask was forked but has not completed, it completed after the task
-             * scope was {@linkplain #shutdown() shut down}, or it was forked after the
-             * task scope was shut down.
+             * the subtask was forked but has not completed, it completed after the scope
+             * was cancelled, or it was forked after the scoped was cancelled (in which
+             * case a thread was not created to execute the subtask).
              */
             UNAVAILABLE,
             /**
-             * The subtask completed successfully with a result. The {@link Subtask#get()
-             * Subtask.get()} method can be used to obtain the result. This is a terminal
-             * state.
+             * The subtask completed successfully. The {@link Subtask#get() Subtask.get()}
+             * method can be used to get the result. This is a terminal state.
              */
             SUCCESS,
             /**
              * The subtask failed with an exception. The {@link Subtask#exception()
-             * Subtask.exception()} method can be used to obtain the exception. This is a
+             * Subtask.exception()} method can be used to get the exception. This is a
              * terminal state.
              */
             FAILED,
         }
 
         /**
-         * {@return the state of the subtask}
+         * {@return the subtask state}
          */
         State state();
 
         /**
-         * Returns the result of the subtask.
+         * Returns the result of this subtask if it completed successfully. If the subtask
+         * was forked with {@link #fork(Callable) fork(Callable)} then the result from the
+         * {@link Callable#call() call} method is returned. If the subtask was forked with
+         * {@link #fork(Runnable) fork(Runnable)} then {@code null} is returned.
+         *
+         * <p> Code executing in the scope owner thread can use this method to get the
+         * result of a successful subtask only after it has {@linkplain #join() joined}.
          *
-         * <p> To ensure correct usage, if the scope owner {@linkplain #fork(Callable) forks}
-         * a subtask, then it must join (with {@link #join() join} or {@link #joinUntil(Instant)
-         * joinUntil}) before it can obtain the result of the subtask.
+         * <p> Code executing in the {@code Joiner} {@link Joiner#onComplete(Subtask)
+         * onComplete} method should test that the {@linkplain #state() subtask state} is
+         * {@link State#SUCCESS SUCCESS} before using this method to get the result.
          *
          * @return the possibly-null result
          * @throws IllegalStateException if the subtask has not completed, did not complete
-         * successfully, or the current thread is the task scope owner and did not join
-         * after forking
+         * successfully, or the current thread is the scope owner invoking this
+         * method before {@linkplain #join() joining}
          * @see State#SUCCESS
          */
         T get();
 
         /**
-         * {@return the exception thrown by the subtask}
+         * {@return the exception or error thrown by this subtask if it failed}
+         * If the subtask was forked with {@link #fork(Callable) fork(Callable)} then the
+         * exception or error thrown by the {@link Callable#call() call} method is returned.
+         * If the subtask was forked with {@link #fork(Runnable) fork(Runnable)} then the
+         * exception or error thrown by the {@link Runnable#run() run} method is returned.
+         *
+         * <p> Code executing in the scope owner thread can use this method to get the
+         * exception thrown by a failed subtask only after it has {@linkplain #join() joined}.
          *
-         * <p> To ensure correct usage, if the scope owner {@linkplain #fork(Callable) forks}
-         * a subtask, then it must join (with {@link #join() join} or {@link #joinUntil(Instant)
-         * joinUntil}) before it can obtain the exception thrown by the subtask.
+         * <p> Code executing in a {@code Joiner} {@link Joiner#onComplete(Subtask)
+         * onComplete} method should test that the {@linkplain #state() subtask state} is
+         * {@link State#FAILED FAILED} before using this method to get the exception.
          *
          * @throws IllegalStateException if the subtask has not completed, completed with
-         * a result, or the current thread is the task scope owner and did not join after
-         * forking
+         * a result, or the current thread is the scope owner invoking this method
+         * before {@linkplain #join() joining}
          * @see State#FAILED
          */
         Throwable exception();
     }
 
     /**
-     * Creates a structured task scope with the given name and thread factory. The task
-     * scope is optionally named for the purposes of monitoring and management. The thread
-     * factory is used to {@link ThreadFactory#newThread(Runnable) create} threads when
-     * subtasks are {@linkplain #fork(Callable) forked}. The task scope is owned by the
-     * current thread.
-     *
-     * <p> Construction captures the current thread's {@linkplain ScopedValue scoped value}
-     * bindings for inheritance by threads started in the task scope. The
-     * <a href="#TreeStructure">Tree Structure</a> section in the class description details
-     * how parent-child relations are established implicitly for the purpose of inheritance
-     * of scoped value bindings.
-     *
-     * @param name the name of the task scope, can be null
-     * @param factory the thread factory
-     */
-    @SuppressWarnings("this-escape")
-    public StructuredTaskScope(String name, ThreadFactory factory) {
-        this.factory = Objects.requireNonNull(factory, "'factory' is null");
-        if (name == null)
-            name = Objects.toIdentityString(this);
-        this.flock = ThreadFlock.open(name);
-    }
-
-    /**
-     * Creates an unnamed structured task scope that creates virtual threads. The task
-     * scope is owned by the current thread.
-     *
-     * @implSpec This constructor is equivalent to invoking the 2-arg constructor with a
-     * name of {@code null} and a thread factory that creates virtual threads.
-     */
-    public StructuredTaskScope() {
-        this(null, Thread.ofVirtual().factory());
-    }
-
-    private IllegalStateException newIllegalStateExceptionScopeClosed() {
-        return new IllegalStateException("Task scope is closed");
-    }
-
-    private IllegalStateException newIllegalStateExceptionNoJoin() {
-        return new IllegalStateException("Owner did not join after forking subtasks");
-    }
-
-    /**
-     * Throws IllegalStateException if the scope is closed, returning the state if not
-     * closed.
-     */
-    private int ensureOpen() {
-        int s = state;
-        if (s == CLOSED)
-            throw newIllegalStateExceptionScopeClosed();
-        return s;
-    }
-
-    /**
-     * Throws WrongThreadException if the current thread is not the owner.
-     */
-    private void ensureOwner() {
-        if (Thread.currentThread() != flock.owner())
-            throw new WrongThreadException("Current thread not owner");
-    }
-
-    /**
-     * Throws WrongThreadException if the current thread is not the owner
-     * or a thread contained in the tree.
-     */
-    private void ensureOwnerOrContainsThread() {
-        Thread currentThread = Thread.currentThread();
-        if (currentThread != flock.owner() && !flock.containsThread(currentThread))
-            throw new WrongThreadException("Current thread not owner or thread in the tree");
-    }
-
-    /**
-     * Throws IllegalStateException if the current thread is the owner, and the owner did
-     * not join after forking a subtask in the given fork round.
-     */
-    private void ensureJoinedIfOwner(int round) {
-        if (Thread.currentThread() == flock.owner() && (round > lastJoinCompleted)) {
-            throw newIllegalStateExceptionNoJoin();
-        }
-    }
-
-    /**
-     * Ensures that the current thread is the owner of this task scope and that it joined
-     * (with {@link #join()} or {@link #joinUntil(Instant)}) after {@linkplain #fork(Callable)
-     * forking} subtasks.
-     *
-     * @apiNote This method can be used by subclasses that define methods to make available
-     * results, state, or other outcome to code intended to execute after the join method.
-     *
-     * @throws WrongThreadException if the current thread is not the task scope owner
-     * @throws IllegalStateException if the task scope is open and task scope owner did
-     * not join after forking
-     */
-    protected final void ensureOwnerAndJoined() {
-        ensureOwner();
-        if (forkRound > lastJoinCompleted) {
-            throw newIllegalStateExceptionNoJoin();
-        }
-    }
-
-    /**
-     * Invoked by a subtask when it completes successfully or fails in this task scope.
-     * This method is not invoked if a subtask completes after the task scope is
-     * {@linkplain #shutdown() shut down}.
-     *
-     * @implSpec The default implementation throws {@code NullPointerException} if the
-     * subtask is {@code null}. It throws {@link IllegalArgumentException} if the subtask
-     * has not completed.
-     *
-     * @apiNote The {@code handleComplete} method should be thread safe. It may be
-     * invoked by several threads concurrently.
-     *
-     * @param subtask the subtask
+     * An object used with a {@link StructuredTaskScope} to handle subtask completion and
+     * produce the result for the scope owner waiting in the {@link #join() join} method
+     * for subtasks to complete.
      *
-     * @throws IllegalArgumentException if called with a subtask that has not completed
-     */
-    protected void handleComplete(Subtask<? extends T> subtask) {
-        if (subtask.state() == Subtask.State.UNAVAILABLE)
-            throw new IllegalArgumentException();
-    }
-
-    /**
-     * Starts a new thread in this task scope to execute a value-returning task, thus
-     * creating a <em>subtask</em> of this task scope.
-     *
-     * <p> The value-returning task is provided to this method as a {@link Callable}, the
-     * thread executes the task's {@link Callable#call() call} method. The thread is
-     * created with the task scope's {@link ThreadFactory}. It inherits the current thread's
-     * {@linkplain ScopedValue scoped value} bindings. The bindings must match the bindings
-     * captured when the task scope was created.
-     *
-     * <p> This method returns a {@link Subtask Subtask} to represent the <em>forked
-     * subtask</em>. The {@code Subtask} object can be used to obtain the result when
-     * the subtask completes successfully, or the exception when the subtask fails. To
-     * ensure correct usage, the {@link Subtask#get() get()} and {@link Subtask#exception()
-     * exception()} methods may only be called by the task scope owner after it has waited
-     * for all threads to finish with the {@link #join() join} or {@link #joinUntil(Instant)}
-     * methods. When the subtask completes, the thread invokes the {@link
-     * #handleComplete(Subtask) handleComplete} method to consume the completed subtask.
-     * If the task scope is {@linkplain #shutdown() shut down} before the subtask completes
-     * then the {@code handleComplete} method will not be invoked.
-     *
-     * <p> If this task scope is {@linkplain #shutdown() shutdown} (or in the process of
-     * shutting down) then the subtask will not run and the {@code handleComplete} method
-     * will not be invoked.
-     *
-     * <p> This method may only be invoked by the task scope owner or threads contained
-     * in the task scope.
-     *
-     * @implSpec This method may be overridden for customization purposes, wrapping tasks
-     * for example. If overridden, the subclass must invoke {@code super.fork} to start a
-     * new thread in this task scope.
-     *
-     * @param task the value-returning task for the thread to execute
-     * @param <U> the result type
-     * @return the subtask
-     * @throws IllegalStateException if this task scope is closed
-     * @throws WrongThreadException if the current thread is not the task scope owner or a
-     * thread contained in the task scope
-     * @throws StructureViolationException if the current scoped value bindings are not
-     * the same as when the task scope was created
-     * @throws RejectedExecutionException if the thread factory rejected creating a
-     * thread to run the subtask
-     */
-    public <U extends T> Subtask<U> fork(Callable<? extends U> task) {
-        Objects.requireNonNull(task, "'task' is null");
-        int s = ensureOpen();   // throws ISE if closed
-
-        // when forked by the owner, the subtask is forked in the current or next round
-        int round = -1;
-        if (Thread.currentThread() == flock.owner()) {
-            round = forkRound;
-            if (forkRound == lastJoinCompleted) {
-                // new round if first fork after join
-                round++;
-            }
-        }
-
-        SubtaskImpl<U> subtask = new SubtaskImpl<>(this, task, round);
-        if (s < SHUTDOWN) {
-            // create thread to run task
-            Thread thread = factory.newThread(subtask);
-            if (thread == null) {
-                throw new RejectedExecutionException("Rejected by thread factory");
-            }
-
-            // attempt to start the thread
-            try {
-                flock.start(thread);
-            } catch (IllegalStateException e) {
-                // shutdown by another thread, or underlying flock is shutdown due
-                // to unstructured use
-            }
-        }
-
-        // force owner to join if this is the first fork in the round
-        if (Thread.currentThread() == flock.owner() && round > forkRound) {
-            forkRound = round;
-        }
-
-        // return forked subtask or a subtask that did not run
-        return subtask;
-    }
-
-    /**
-     * Wait for all threads to finish or the task scope to shut down.
-     */
-    private void implJoin(Duration timeout)
-        throws InterruptedException, TimeoutException
-    {
-        ensureOwner();
-        lastJoinAttempted = forkRound;
-        int s = ensureOpen();  // throws ISE if closed
-        if (s == OPEN) {
-            // wait for all threads, wakeup, interrupt, or timeout
-            if (timeout != null) {
-                flock.awaitAll(timeout);
-            } else {
-                flock.awaitAll();
-            }
-        }
-        lastJoinCompleted = forkRound;
-    }
-
-    /**
-     * Wait for all subtasks started in this task scope to finish or the task scope to
-     * shut down.
-     *
-     * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-     * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-     * when all threads finish, the task scope is {@linkplain #shutdown() shut down}, or
-     * the current thread is {@linkplain Thread#interrupt() interrupted}.
-     *
-     * <p> This method may only be invoked by the task scope owner.
-     *
-     * @implSpec This method may be overridden for customization purposes or to return a
-     * more specific return type. If overridden, the subclass must invoke {@code
-     * super.join} to ensure that the method waits for threads in this task scope to
-     * finish.
-     *
-     * @return this task scope
-     * @throws IllegalStateException if this task scope is closed
-     * @throws WrongThreadException if the current thread is not the task scope owner
-     * @throws InterruptedException if interrupted while waiting
-     */
-    public StructuredTaskScope<T> join() throws InterruptedException {
-        try {
-            implJoin(null);
-        } catch (TimeoutException e) {
-            throw new InternalError();
-        }
-        return this;
-    }
-
-    /**
-     * Wait for all subtasks started in this task scope to finish or the task scope to
-     * shut down, up to the given deadline.
-     *
-     * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-     * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-     * when all threads finish, the task scope is {@linkplain #shutdown() shut down}, the
-     * deadline is reached, or the current thread is {@linkplain Thread#interrupt()
-     * interrupted}.
-     *
-     * <p> This method may only be invoked by the task scope owner.
-     *
-     * @implSpec This method may be overridden for customization purposes or to return a
-     * more specific return type. If overridden, the subclass must invoke {@code
-     * super.joinUntil} to ensure that the method waits for threads in this task scope to
-     * finish.
-     *
-     * @param deadline the deadline
-     * @return this task scope
-     * @throws IllegalStateException if this task scope is closed
-     * @throws WrongThreadException if the current thread is not the task scope owner
-     * @throws InterruptedException if interrupted while waiting
-     * @throws TimeoutException if the deadline is reached while waiting
-     */
-    public StructuredTaskScope<T> joinUntil(Instant deadline)
-        throws InterruptedException, TimeoutException
-    {
-        Duration timeout = Duration.between(Instant.now(), deadline);
-        implJoin(timeout);
-        return this;
-    }
-
-    /**
-     * Interrupt all unfinished threads.
-     */
-    private void interruptAll() {
-        flock.threads()
-            .filter(t -> t != Thread.currentThread())
-            .forEach(t -> {
-                try {
-                    t.interrupt();
-                } catch (Throwable ignore) { }
-            });
-    }
-
-    /**
-     * Shutdown the task scope if not already shutdown. Return true if this method
-     * shutdowns the task scope, false if already shutdown.
-     */
-    private boolean implShutdown() {
-        shutdownLock.lock();
-        try {
-            if (state < SHUTDOWN) {
-                // prevent new threads from starting
-                flock.shutdown();
-
-                // set status before interrupting tasks
-                state = SHUTDOWN;
-
-                // interrupt all unfinished threads
-                interruptAll();
-
-                return true;
-            } else {
-                // already shutdown
-                return false;
-            }
-        } finally {
-            shutdownLock.unlock();
-        }
-    }
-
-    /**
-     * Shut down this task scope without closing it. Shutting down a task scope prevents
-     * new threads from starting, interrupts all unfinished threads, and causes the
-     * {@link #join() join} method to wakeup. Shutdown is useful for cases where the
-     * results of unfinished subtasks are no longer needed. It will typically be called
-     * by the {@link #handleComplete(Subtask)} implementation of a subclass that
-     * implements a policy to discard unfinished tasks once some outcome is reached.
-     *
-     * <p> More specifically, this method:
+     * <p> Joiner defines static methods to create {@code Joiner} objects for common cases:
      * <ul>
-     * <li> {@linkplain Thread#interrupt() Interrupts} all unfinished threads in the
-     * task scope (except the current thread).
-     * <li> Wakes up the task scope owner if it is waiting in {@link #join()} or {@link
-     * #joinUntil(Instant)}. If the task scope owner is not waiting then its next call to
-     * {@code join} or {@code joinUntil} will return immediately.
+     *   <li> {@link #allSuccessfulOrThrow() allSuccessfulOrThrow()} creates a {@code Joiner}
+     *   that yields a stream of the completed subtasks for {@code join} to return when
+     *   all subtasks complete successfully. It cancels the scope and causes {@code join}
+     *   to throw if any subtask fails.
+     *   <li> {@link #anySuccessfulResultOrThrow() anySuccessfulResultOrThrow()} creates a
+     *   {@code Joiner} that yields the result of the first subtask to succeed for {@code
+     *   join} to return. It causes {@code join} to throw if all subtasks fail.
+     *   <li> {@link #awaitAllSuccessfulOrThrow() awaitAllSuccessfulOrThrow()} creates a
+     *   {@code Joiner} that waits for all successful subtasks. It cancels the scope and
+     *   causes {@code join} to throw if any subtask fails.
+     *   <li> {@link #awaitAll() awaitAll()} creates a {@code Joiner} that waits for all
+     *   subtasks. It does not cancel the scope or cause {@code join} to throw.
      * </ul>
      *
-     * <p> The {@linkplain Subtask.State state} of unfinished subtasks that complete at
-     * around the time that the task scope is shutdown is not defined. A subtask that
-     * completes successfully with a result, or fails with an exception, at around
-     * the time that the task scope is shutdown may or may not <i>transition</i> to a
-     * terminal state.
-     *
-     * <p> This method may only be invoked by the task scope owner or threads contained
-     * in the task scope.
+     * <p> In addition to the methods to create {@code Joiner} objects for common cases,
+     * the {@link #allUntil(Predicate) allUntil(Predicate)} method is defined to create a
+     * {@code Joiner} that yields a stream of all subtasks. It is created with a {@link
+     * Predicate Predicate} that determines if the scope should continue or be cancelled.
+     * This {@code Joiner} can be built upon to create custom policies that cancel the
+     * scope based on some condition.
      *
-     * @implSpec This method may be overridden for customization purposes. If overridden,
-     * the subclass must invoke {@code super.shutdown} to ensure that the method shuts
-     * down the task scope.
+     * <p> More advanced policies can be developed by implementing the {@code Joiner}
+     * interface. The {@link #onFork(Subtask)} method is invoked when subtasks are forked.
+     * The {@link #onComplete(Subtask)} method is invoked when subtasks complete with a
+     * result or exception. These methods return a {@code boolean} to indicate if scope
+     * should be cancelled. These methods can be used to collect subtasks, results, or
+     * exceptions, and control when to cancel the scope. The {@link #result()} method
+     * must be implemented to produce the result (or exception) for the {@code join}
+     * method.
      *
-     * @apiNote
-     * There may be threads that have not finished because they are executing code that
-     * did not respond (or respond promptly) to thread interrupt. This method does not wait
-     * for these threads. When the owner invokes the {@link #close() close} method
-     * to close the task scope then it will wait for the remaining threads to finish.
+     * <p> Unless otherwise specified, passing a {@code null} argument to a method
+     * in this class will cause a {@link NullPointerException} to be thrown.
      *
-     * @throws IllegalStateException if this task scope is closed
-     * @throws WrongThreadException if the current thread is not the task scope owner or
-     * a thread contained in the task scope
-     * @see #isShutdown()
-     */
-    public void shutdown() {
-        ensureOwnerOrContainsThread();
-        int s = ensureOpen();  // throws ISE if closed
-        if (s < SHUTDOWN && implShutdown())
-            flock.wakeup();
-    }
-
-    /**
-     * {@return true if this task scope is shutdown, otherwise false}
-     * @see #shutdown()
-     */
-    public final boolean isShutdown() {
-        return state >= SHUTDOWN;
-    }
-
-    /**
-     * Closes this task scope.
+     * @implSpec Implementations of this interface must be thread safe. The {@link
+     * #onComplete(Subtask)} method defined by this interface may be invoked by several
+     * threads concurrently.
      *
-     * <p> This method first shuts down the task scope (as if by invoking the {@link
-     * #shutdown() shutdown} method). It then waits for the threads executing any
-     * unfinished tasks to finish. If interrupted, this method will continue to wait for
-     * the threads to finish before completing with the interrupt status set.
+     * @apiNote It is very important that a new {@code Joiner} object is created for each
+     * {@code StructuredTaskScope}. {@code Joiner} objects should never be shared with
+     * different scopes or re-used after a task is closed.
      *
-     * <p> This method may only be invoked by the task scope owner. If the task scope
-     * is already closed then the task scope owner invoking this method has no effect.
+     * <p> Designing a {@code Joiner} should take into account the code at the use-site
+     * where the results from the {@link StructuredTaskScope#join() join} method are
+     * processed. It should be clear what the {@code Joiner} does vs. the application
+     * code at the use-site. In general, the {@code Joiner} implementation is not the
+     * place for "business logic". A {@code Joiner} should be designed to be as general
+     * purpose as possible.
      *
-     * <p> A {@code StructuredTaskScope} is intended to be used in a <em>structured
-     * manner</em>. If this method is called to close a task scope before nested task
-     * scopes are closed then it closes the underlying construct of each nested task scope
-     * (in the reverse order that they were created in), closes this task scope, and then
-     * throws {@link StructureViolationException}.
-     * Similarly, if this method is called to close a task scope while executing with
-     * {@linkplain ScopedValue scoped value} bindings, and the task scope was created
-     * before the scoped values were bound, then {@code StructureViolationException} is
-     * thrown after closing the task scope.
-     * If a thread terminates without first closing task scopes that it owns then
-     * termination will cause the underlying construct of each of its open tasks scopes to
-     * be closed. Closing is performed in the reverse order that the task scopes were
-     * created in. Thread termination may therefore be delayed when the task scope owner
-     * has to wait for threads forked in these task scopes to finish.
-     *
-     * @implSpec This method may be overridden for customization purposes. If overridden,
-     * the subclass must invoke {@code super.close} to close the task scope.
-     *
-     * @throws IllegalStateException thrown after closing the task scope if the task scope
-     * owner did not attempt to join after forking
-     * @throws WrongThreadException if the current thread is not the task scope owner
-     * @throws StructureViolationException if a structure violation was detected
-     */
-    @Override
-    public void close() {
-        ensureOwner();
-        int s = state;
-        if (s == CLOSED)
-            return;
-
-        try {
-            if (s < SHUTDOWN)
-                implShutdown();
-            flock.close();
-        } finally {
-            state = CLOSED;
-        }
-
-        // throw ISE if the owner didn't attempt to join after forking
-        if (forkRound > lastJoinAttempted) {
-            lastJoinCompleted = forkRound;
-            throw newIllegalStateExceptionNoJoin();
-        }
-    }
-
-    @Override
-    public String toString() {
-        String name = flock.name();
-        return switch (state) {
-            case OPEN     -> name;
-            case SHUTDOWN -> name + "/shutdown";
-            case CLOSED   -> name + "/closed";
-            default -> throw new InternalError();
-        };
-    }
-
-    /**
-     * Subtask implementation, runs the task specified to the fork method.
+     * @param <T> the result type of subtasks executed in the scope
+     * @param <R> the result type of the scope
+     * @since 25
+     * @see #open(Joiner)
      */
-    private static final class SubtaskImpl<T> implements Subtask<T>, Runnable {
-        private static final AltResult RESULT_NULL = new AltResult(Subtask.State.SUCCESS);
-
-        private record AltResult(Subtask.State state, Throwable exception) {
-            AltResult(Subtask.State state) {
-                this(state, null);
-            }
-        }
-
-        private final StructuredTaskScope<? super T> scope;
-        private final Callable<? extends T> task;
-        private final int round;
-        private volatile Object result;
-
-        SubtaskImpl(StructuredTaskScope<? super T> scope,
-                    Callable<? extends T> task,
-                    int round) {
-            this.scope = scope;
-            this.task = task;
-            this.round = round;
-        }
-
-        @Override
-        public void run() {
-            T result = null;
-            Throwable ex = null;
-            try {
-                result = task.call();
-            } catch (Throwable e) {
-                ex = e;
-            }
-
-            // nothing to do if task scope is shutdown
-            if (scope.isShutdown())
-                return;
-
-            // capture result or exception, invoke handleComplete
-            if (ex == null) {
-                this.result = (result != null) ? result : RESULT_NULL;
-            } else {
-                this.result = new AltResult(State.FAILED, ex);
-            }
-            scope.handleComplete(this);
-        }
-
-        @Override
-        public Callable<? extends T> task() {
-            return task;
-        }
-
-        @Override
-        public Subtask.State state() {
-            Object result = this.result;
-            if (result == null) {
-                return State.UNAVAILABLE;
-            } else if (result instanceof AltResult alt) {
-                // null or failed
-                return alt.state();
-            } else {
-                return State.SUCCESS;
-            }
-        }
-
-        @Override
-        public T get() {
-            scope.ensureJoinedIfOwner(round);
-            Object result = this.result;
-            if (result instanceof AltResult) {
-                if (result == RESULT_NULL) return null;
-            } else if (result != null) {
-                @SuppressWarnings("unchecked")
-                T r = (T) result;
-                return r;
+    @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
+    @FunctionalInterface
+    interface Joiner<T, R> {
+        /**
+         * Invoked by {@link #fork(Callable) fork(Callable)} and {@link #fork(Runnable)
+         * fork(Runnable)} when forking a subtask. The method is invoked from the task
+         * owner thread. The method is invoked before a thread is created to run the
+         * subtask.
+         *
+         * @implSpec The default implementation throws {@code NullPointerException} if the
+         * subtask is {@code null}. It throws {@code IllegalArgumentException} if the
+         * subtask is not in the {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state, it
+         * otherwise returns {@code false}.
+         *
+         * @apiNote This method is invoked by the {@code fork} methods. It should not be
+         * invoked directly.
+         *
+         * @param subtask the subtask
+         * @return {@code true} to cancel the scope, otherwise {@code false}
+         */
+        default boolean onFork(Subtask<? extends T> subtask) {
+            if (subtask.state() != Subtask.State.UNAVAILABLE) {
+                throw new IllegalArgumentException("Subtask not in UNAVAILABLE state");
             }
-            throw new IllegalStateException(
-                    "Result is unavailable or subtask did not complete successfully");
+            return false;
         }
 
-        @Override
-        public Throwable exception() {
-            scope.ensureJoinedIfOwner(round);
-            Object result = this.result;
-            if (result instanceof AltResult alt && alt.state() == State.FAILED) {
-                return alt.exception();
+        /**
+         * Invoked by the thread started to execute a subtask after the subtask completes
+         * successfully or fails with an exception. This method is not invoked if a
+         * subtask completes after the scope is cancelled.
+         *
+         * @implSpec The default implementation throws {@code NullPointerException} if the
+         * subtask is {@code null}. It throws {@code IllegalArgumentException} if the
+         * subtask is not in the {@link Subtask.State#SUCCESS SUCCESS} or {@link
+         * Subtask.State#FAILED FAILED} state, it otherwise returns {@code false}.
+         *
+         * @apiNote This method is invoked by subtasks when they complete. It should not
+         * be invoked directly.
+         *
+         * @param subtask the subtask
+         * @return {@code true} to cancel the scope, otherwise {@code false}
+         */
+        default boolean onComplete(Subtask<? extends T> subtask) {
+            if (subtask.state() == Subtask.State.UNAVAILABLE) {
+                throw new IllegalArgumentException("Subtask has not completed");
             }
-            throw new IllegalStateException(
-                    "Exception is unavailable or subtask did not complete with exception");
-        }
-
-        @Override
-        public String toString() {
-            String stateAsString = switch (state()) {
-                case UNAVAILABLE -> "[Unavailable]";
-                case SUCCESS     -> "[Completed successfully]";
-                case FAILED      -> {
-                    Throwable ex = ((AltResult) result).exception();
-                    yield "[Failed: " + ex + "]";
-                }
-            };
-            return Objects.toIdentityString(this) + stateAsString;
-        }
-    }
-
-    /**
-     * A {@code StructuredTaskScope} that captures the result of the first subtask to
-     * complete {@linkplain Subtask.State#SUCCESS successfully}. Once captured, it
-     * {@linkplain #shutdown() shuts down} the task scope to interrupt unfinished threads
-     * and wakeup the task scope owner. The policy implemented by this class is intended
-     * for cases where the result of any subtask will do ("invoke any") and where the
-     * results of other unfinished subtasks are no longer needed.
-     *
-     * <p> Unless otherwise specified, passing a {@code null} argument to a method
-     * in this class will cause a {@link NullPointerException} to be thrown.
-     *
-     * @apiNote This class implements a policy to shut down the task scope when a subtask
-     * completes successfully. There shouldn't be any need to directly shut down the task
-     * scope with the {@link #shutdown() shutdown} method.
-     *
-     * @param <T> the result type
-     * @since 21
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
-    public static final class ShutdownOnSuccess<T> extends StructuredTaskScope<T> {
-        private static final Object RESULT_NULL = new Object();
-        private static final VarHandle FIRST_RESULT;
-        private static final VarHandle FIRST_EXCEPTION;
-        static {
-            MethodHandles.Lookup l = MethodHandles.lookup();
-            FIRST_RESULT = MhUtil.findVarHandle(l, "firstResult", Object.class);
-            FIRST_EXCEPTION = MhUtil.findVarHandle(l, "firstException", Throwable.class);
+            return false;
         }
-        private volatile Object firstResult;
-        private volatile Throwable firstException;
 
         /**
-         * Constructs a new {@code ShutdownOnSuccess} with the given name and thread factory.
-         * The task scope is optionally named for the purposes of monitoring and management.
-         * The thread factory is used to {@link ThreadFactory#newThread(Runnable) create}
-         * threads when subtasks are {@linkplain #fork(Callable) forked}. The task scope
-         * is owned by the current thread.
+         * Invoked by the {@link #join() join()} method to produce the result (or exception)
+         * after waiting for all subtasks to complete or the scope cancelled. The result
+         * from this method is returned by the {@code join} method. If this method throws,
+         * then {@code join} throws {@link FailedException} with the exception thrown by
+         * this method as the cause.
+         *
+         * <p> In normal usage, this method will be called at most once by the {@code join}
+         * method to produce the result (or exception). The behavior of this method when
+         * invoked directly, and invoked more than once, is undefined. Where possible, an
+         * implementation should return an equal result (or throw the same exception) on
+         * second or subsequent calls to produce the outcome.
          *
-         * <p> Construction captures the current thread's {@linkplain ScopedValue scoped
-         * value} bindings for inheritance by threads started in the task scope. The
-         * {@linkplain StructuredTaskScope##TreeStructure Tree Structure} section
-         * in the class description details how parent-child relations are established
-         * implicitly for the purpose of inheritance of scoped value bindings.
+         * @apiNote This method is invoked by the {@code join} method. It should not be
+         * invoked directly.
          *
-         * @param name the name of the task scope, can be null
-         * @param factory the thread factory
+         * @return the result
+         * @throws Throwable the exception
          */
-        public ShutdownOnSuccess(String name, ThreadFactory factory) {
-            super(name, factory);
-        }
+        R result() throws Throwable;
 
         /**
-         * Constructs a new unnamed {@code ShutdownOnSuccess} that creates virtual threads.
+         * {@return a new Joiner object that yields a stream of all subtasks when all
+         * subtasks complete successfully}
+         * The {@code Joiner} <a href="http://github.com/StructuredTaskScope.html#Cancallation">cancels</a>
+         * the scope and causes {@code join} to throw if any subtask fails.
+         *
+         * <p> If all subtasks complete successfully, the joiner's {@link Joiner#result()}
+         * method returns a stream of all subtasks in the order that they were forked.
+         * If any subtask failed then the {@code result} method throws the exception from
+         * the first subtask to fail.
+         *
+         * @apiNote Joiners returned by this method are suited to cases where all subtasks
+         * return a result of the same type. Joiners returned by {@link
+         * #awaitAllSuccessfulOrThrow()} are suited to cases where the subtasks return
+         * results of different types.
          *
-         * @implSpec This constructor is equivalent to invoking the 2-arg constructor with
-         * a name of {@code null} and a thread factory that creates virtual threads.
+         * @param <T> the result type of subtasks
          */
-        public ShutdownOnSuccess() {
-            this(null, Thread.ofVirtual().factory());
-        }
-
-        @Override
-        protected void handleComplete(Subtask<? extends T> subtask) {
-            if (firstResult != null) {
-                // already captured a result
-                return;
-            }
-
-            if (subtask.state() == Subtask.State.SUCCESS) {
-                // task succeeded
-                T result = subtask.get();
-                Object r = (result != null) ? result : RESULT_NULL;
-                if (FIRST_RESULT.compareAndSet(this, null, r)) {
-                    super.shutdown();
-                }
-            } else if (firstException == null) {
-                // capture the exception thrown by the first subtask that failed
-                FIRST_EXCEPTION.compareAndSet(this, null, subtask.exception());
-            }
+        static <T> Joiner<T, Stream<Subtask<T>>> allSuccessfulOrThrow() {
+            return new Joiners.AllSuccessful<>();
         }
 
         /**
-         * Wait for a subtask started in this task scope to complete {@linkplain
-         * Subtask.State#SUCCESS successfully} or all subtasks to complete.
+         * {@return a new Joiner object that yields the result of any subtask that
+         * completed successfully}
+         * The {@code Joiner} causes {@code join} to throw if all subtasks fail.
          *
-         * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-         * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-         * when all threads finish, a subtask completes successfully, or the current
-         * thread is {@linkplain Thread#interrupt() interrupted}. It also stops waiting
-         * if the {@link #shutdown() shutdown} method is invoked directly to shut down
-         * this task scope.
+         * <p> The joiner's {@link Joiner#result()} method returns the result of a subtask
+         * that completed successfully. If all subtasks fail then the {@code result} method
+         * throws the exception from one of the failed subtasks. The {@code result} method
+         * throws {@code NoSuchElementException} if no subtasks were forked.
          *
-         * <p> This method may only be invoked by the task scope owner.
-         *
-         * @throws IllegalStateException {@inheritDoc}
-         * @throws WrongThreadException {@inheritDoc}
+         * @param <T> the result type of subtasks
          */
-        @Override
-        public ShutdownOnSuccess<T> join() throws InterruptedException {
-            super.join();
-            return this;
+        static <T> Joiner<T, T> anySuccessfulResultOrThrow() {
+            return new Joiners.AnySuccessful<>();
         }
 
         /**
-         * Wait for a subtask started in this task scope to complete {@linkplain
-         * Subtask.State#SUCCESS successfully} or all subtasks to complete, up to the
-         * given deadline.
+         * {@return a new Joiner object that waits for subtasks to complete successfully}
+         * The {@code Joiner} <a href="http://github.com/StructuredTaskScope.html#Cancallation">cancels</a>
+         * the scope and causes {@code join} to throw if any subtask fails.
          *
-         * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-         * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-         * when all threads finish, a subtask completes successfully, the deadline is
-         * reached, or the current thread is {@linkplain Thread#interrupt() interrupted}.
-         * It also stops waiting if the {@link #shutdown() shutdown} method is invoked
-         * directly to shut down this task scope.
+         * <p> The joiner's {@link Joiner#result() result} method returns {@code null}
+         * if all subtasks complete successfully, or throws the exception from the first
+         * subtask to fail.
          *
-         * <p> This method may only be invoked by the task scope owner.
+         * @apiNote Joiners returned by this method are suited to cases where subtasks
+         * return results of different types. Joiners returned by {@link #allSuccessfulOrThrow()}
+         * are suited to cases where the subtasks return a result of the same type.
          *
-         * @throws IllegalStateException {@inheritDoc}
-         * @throws WrongThreadException {@inheritDoc}
+         * @param <T> the result type of subtasks
          */
-        @Override
-        public ShutdownOnSuccess<T> joinUntil(Instant deadline)
-            throws InterruptedException, TimeoutException
-        {
-            super.joinUntil(deadline);
-            return this;
+        static <T> Joiner<T, Void> awaitAllSuccessfulOrThrow() {
+            return new Joiners.AwaitSuccessful<>();
         }
 
         /**
-         * {@return the result of the first subtask that completed {@linkplain
-         * Subtask.State#SUCCESS successfully}}
+         * {@return a new Joiner object that waits for all subtasks to complete}
+         * The {@code Joiner} does not cancel the scope if a subtask fails.
+         *
+         * <p> The joiner's {@link Joiner#result() result} method returns {@code null}.
+         *
+         * @apiNote This Joiner is useful for cases where subtasks make use of
+         * <em>side-effects</em> rather than return results or fail with exceptions.
+         * The {@link #fork(Runnable) fork(Runnable)} method can be used to fork subtasks
+         * that do not return a result.
          *
-         * <p> When no subtask completed successfully, but a subtask {@linkplain
-         * Subtask.State#FAILED failed} then {@code ExecutionException} is thrown with
-         * the subtask's exception as the {@linkplain Throwable#getCause() cause}.
+         * <p> This Joiner can also be used for <em>fan-in</em> scenarios where subtasks
+         * are forked to handle incoming connections and the number of subtasks is unbounded.
+         * In this example, the thread executing the {@code acceptLoop} method will only
+         * stop when interrupted or the listener socket is closed asynchronously.
+         * {@snippet lang=java :
+         *   void acceptLoop(ServerSocket listener) throws IOException, InterruptedException {
+         *       try (var scope = StructuredTaskScope.open(Joiner.<Socket>awaitAll())) {
+         *           while (true) {
+         *               Socket socket = listener.accept();
+         *               scope.fork(() -> handle(socket));
+         *           }
+         *       }
+         *   }
+         * }
          *
-         * @throws ExecutionException if no subtasks completed successfully but at least
-         * one subtask failed
-         * @throws IllegalStateException if no subtasks completed or the task scope owner
-         * did not join after forking
-         * @throws WrongThreadException if the current thread is not the task scope owner
+         * @param <T> the result type of subtasks
          */
-        public T result() throws ExecutionException {
-            return result(ExecutionException::new);
+        static <T> Joiner<T, Void> awaitAll() {
+            // ensure that new Joiner object is returned
+            return new Joiner<T, Void>() {
+                @Override
+                public Void result() {
+                    return null;
+                }
+            };
         }
 
         /**
-         * Returns the result of the first subtask that completed {@linkplain
-         * Subtask.State#SUCCESS successfully}, otherwise throws an exception produced
-         * by the given exception supplying function.
+         * {@return a new Joiner object that yields a stream of all subtasks when all
+         * subtasks complete or a predicate returns {@code true} to cancel the scope}
+         *
+         * <p> The joiner's {@link Joiner#onComplete(Subtask)} method invokes the
+         * predicate's {@link Predicate#test(Object) test} method with the subtask that
+         * completed successfully or failed with an exception. If the {@code test} method
+         * returns {@code true} then <a href="http://github.com/StructuredTaskScope.html#Cancallation">
+         * the scope is cancelled</a>. The {@code test} method must be thread safe as it
+         * may be invoked concurrently from several threads. If the {@code test} method
+         * completes with an exception or error, then the thread that executed the subtask
+         * invokes the {@linkplain Thread.UncaughtExceptionHandler uncaught exception handler}
+         * with the exception or error before the thread terminates.
          *
-         * <p> When no subtask completed successfully, but a subtask {@linkplain
-         * Subtask.State#FAILED failed}, then the exception supplying function is invoked
-         * with subtask's exception.
+         * <p> The joiner's {@link #result()} method returns the stream of all subtasks,
+         * in fork order. The stream may contain subtasks that have completed
+         * (in {@link Subtask.State#SUCCESS SUCCESS} or {@link Subtask.State#FAILED FAILED}
+         * state) or subtasks in the {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state
+         * if the scope was cancelled before all subtasks were forked or completed.
          *
-         * @param esf the exception supplying function
-         * @param <X> type of the exception to be thrown
-         * @return the result of the first subtask that completed with a result
+         * <p> The following example uses this method to create a {@code Joiner} that
+         * <a href="http://github.com/StructuredTaskScope.html#Cancallation">cancels</a> the scope when
+         * two or more subtasks fail.
+         * {@snippet lang=java :
+         *    class CancelAfterTwoFailures<T> implements Predicate<Subtask<? extends T>> {
+         *         private final AtomicInteger failedCount = new AtomicInteger();
+         *         @Override
+         *         public boolean test(Subtask<? extends T> subtask) {
+         *             return subtask.state() == Subtask.State.FAILED
+         *                     && failedCount.incrementAndGet() >= 2;
+         *         }
+         *     }
          *
-         * @throws X if no subtasks completed successfully but at least one subtask failed
-         * @throws IllegalStateException if no subtasks completed or the task scope owner
-         * did not join after forking
-         * @throws WrongThreadException if the current thread is not the task scope owner
+         *     var joiner = Joiner.all(new CancelAfterTwoFailures<String>());
+         * }
+         *
+         * <p> The following example uses {@code allUntil} to wait for all subtasks to
+         * complete without any cancellation. This is similar to {@link #awaitAll()}
+         * except that it yields a stream of the completed subtasks.
+         * {@snippet lang=java :
+         *    <T> List<Subtask<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException {
+         *        try (var scope = StructuredTaskScope.open(Joiner.<T>allUntil(_ -> false))) {
+         *            tasks.forEach(scope::fork);
+         *            return scope.join().toList();
+         *        }
+         *    }
+         * }
+         *
+         * @param isDone the predicate to evaluate completed subtasks
+         * @param <T> the result type of subtasks
          */
-        public <X extends Throwable> T result(Function<Throwable, ? extends X> esf) throws X {
-            Objects.requireNonNull(esf);
-            ensureOwnerAndJoined();
-
-            Object result = firstResult;
-            if (result == RESULT_NULL) {
-                return null;
-            } else if (result != null) {
-                @SuppressWarnings("unchecked")
-                T r = (T) result;
-                return r;
-            }
-
-            Throwable exception = firstException;
-            if (exception != null) {
-                X ex = esf.apply(exception);
-                Objects.requireNonNull(ex, "esf returned null");
-                throw ex;
-            }
-
-            throw new IllegalStateException("No completed subtasks");
+        static <T> Joiner<T, Stream<Subtask<T>>> allUntil(Predicate<Subtask<? extends T>> isDone) {
+            return new Joiners.AllSubtasks<>(isDone);
         }
     }
 
     /**
-     * A {@code StructuredTaskScope} that captures the exception of the first subtask to
-     * {@linkplain Subtask.State#FAILED fail}. Once captured, it {@linkplain #shutdown()
-     * shuts down} the task scope to interrupt unfinished threads and wakeup the task
-     * scope owner. The policy implemented by this class is intended for cases where the
-     * results for all subtasks are required ("invoke all"); if any subtask fails then the
-     * results of other unfinished subtasks are no longer needed.
+     * Represents the configuration for a {@code StructuredTaskScope}.
+     *
+     * <p> The configuration for a {@code StructuredTaskScope} consists of a {@link
+     * ThreadFactory} to create threads, an optional name for the purposes of monitoring
+     * and management, and an optional timeout.
+     *
+     * <p> Creating a {@code StructuredTaskScope} with {@link #open()} or {@link #open(Joiner)}
+     * uses the <a href="http://github.com/StructuredTaskScope.html#DefaultConfiguration">default
+     * configuration</a>. The default configuration consists of a thread factory that
+     * creates unnamed <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/Thread.html#virtual-threads">
+     * virtual threads</a>, no name for monitoring and management purposes, and no timeout.
+     *
+     * <p> Creating a {@code StructuredTaskScope} with its 2-arg {@link #open(Joiner, Function)
+     * open} method allows a different configuration to be used. The function specified
+     * to the {@code open} method is applied to the default configuration and returns the
+     * configuration for the {@code StructuredTaskScope} under construction. The function
+     * can use the {@code with-} prefixed methods defined here to specify the components
+     * of the configuration to use.
      *
      * <p> Unless otherwise specified, passing a {@code null} argument to a method
      * in this class will cause a {@link NullPointerException} to be thrown.
      *
-     * @apiNote This class implements a policy to shut down the task scope when a subtask
-     * fails. There shouldn't be any need to directly shut down the task scope with the
-     * {@link #shutdown() shutdown} method.
-     *
-     * @since 21
+     * @since 25
      */
     @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
-    public static final class ShutdownOnFailure extends StructuredTaskScope<Object> {
-        private static final VarHandle FIRST_EXCEPTION =
-                MhUtil.findVarHandle(MethodHandles.lookup(), "firstException", Throwable.class);
-        private volatile Throwable firstException;
-
+    sealed interface Configuration permits StructuredTaskScopeImpl.ConfigImpl {
         /**
-         * Constructs a new {@code ShutdownOnFailure} with the given name and thread factory.
-         * The task scope is optionally named for the purposes of monitoring and management.
-         * The thread factory is used to {@link ThreadFactory#newThread(Runnable) create}
-         * threads when subtasks are {@linkplain #fork(Callable) forked}. The task scope
-         * is owned by the current thread.
+         * {@return a new {@code Configuration} object with the given thread factory}
+         * The other components are the same as this object. The thread factory is used by
+         * a scope to create threads when {@linkplain #fork(Callable) forking} subtasks.
+         * @param threadFactory the thread factory
          *
-         * <p> Construction captures the current thread's {@linkplain ScopedValue scoped
-         * value} bindings for inheritance by threads started in the task scope. The
-         * {@linkplain StructuredTaskScope##TreeStructure Tree Structure} section in the class description
-         * details how parent-child relations are established implicitly for the purpose
-         * of inheritance of scoped value bindings.
+         * @apiNote The thread factory will typically create
+         * <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
+         * maybe with names for monitoring purposes, an {@linkplain Thread.UncaughtExceptionHandler
+         * uncaught exception handler}, or other properties configured.
          *
-         * @param name the name of the task scope, can be null
-         * @param factory the thread factory
+         * @see #fork(Callable)
          */
-        public ShutdownOnFailure(String name, ThreadFactory factory) {
-            super(name, factory);
-        }
+        Configuration withThreadFactory(ThreadFactory threadFactory);
 
         /**
-         * Constructs a new unnamed {@code ShutdownOnFailure} that creates virtual threads.
-         *
-         * @implSpec This constructor is equivalent to invoking the 2-arg constructor with
-         * a name of {@code null} and a thread factory that creates virtual threads.
+         * {@return a new {@code Configuration} object with the given name}
+         * The other components are the same as this object. A scope is optionally
+         * named for the purposes of monitoring and management.
+         * @param name the name
          */
-        public ShutdownOnFailure() {
-            this(null, Thread.ofVirtual().factory());
-        }
-
-        @Override
-        protected void handleComplete(Subtask<?> subtask) {
-            if (subtask.state() == Subtask.State.FAILED
-                    && firstException == null
-                    && FIRST_EXCEPTION.compareAndSet(this, null, subtask.exception())) {
-                super.shutdown();
-            }
-        }
+        Configuration withName(String name);
 
         /**
-         * Wait for all subtasks started in this task scope to complete or for a subtask
-         * to {@linkplain Subtask.State#FAILED fail}.
-         *
-         * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-         * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-         * when all threads finish, a subtask fails, or the current thread is {@linkplain
-         * Thread#interrupt() interrupted}. It also stops waiting if the {@link #shutdown()
-         * shutdown} method is invoked directly to shut down this task scope.
+         * {@return a new {@code Configuration} object with the given timeout}
+         * The other components are the same as this object.
+         * @param timeout the timeout
          *
-         * <p> This method may only be invoked by the task scope owner.
+         * @apiNote Applications using deadlines, expressed as an {@link java.time.Instant},
+         * can use {@link Duration#between Duration.between(Instant.now(), deadline)} to
+         * compute the timeout for this method.
          *
-         * @throws IllegalStateException {@inheritDoc}
-         * @throws WrongThreadException {@inheritDoc}
+         * @see #join()
          */
-        @Override
-        public ShutdownOnFailure join() throws InterruptedException {
-            super.join();
-            return this;
-        }
+        Configuration withTimeout(Duration timeout);
+    }
 
-        /**
-         * Wait for all subtasks started in this task scope to complete or for a subtask
-         * to {@linkplain Subtask.State#FAILED fail}, up to the given deadline.
-         *
-         * <p> This method waits for all subtasks by waiting for all threads {@linkplain
-         * #fork(Callable) started} in this task scope to finish execution. It stops waiting
-         * when all threads finish, a subtask fails, the deadline is reached, or the current
-         * thread is {@linkplain Thread#interrupt() interrupted}. It also stops waiting
-         * if the {@link #shutdown() shutdown} method is invoked directly to shut down
-         * this task scope.
-         *
-         * <p> This method may only be invoked by the task scope owner.
-         *
-         * @throws IllegalStateException {@inheritDoc}
-         * @throws WrongThreadException {@inheritDoc}
-         */
-        @Override
-        public ShutdownOnFailure joinUntil(Instant deadline)
-            throws InterruptedException, TimeoutException
-        {
-            super.joinUntil(deadline);
-            return this;
-        }
+    /**
+     * Exception thrown by {@link #join()} when the outcome is an exception rather than a
+     * result.
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
+    final class FailedException extends RuntimeException {
+        @java.io.Serial
+        static final long serialVersionUID = -1533055100078459923L;
 
         /**
-         * Returns the exception of the first subtask that {@linkplain Subtask.State#FAILED
-         * failed}. If no subtasks failed then an empty {@code Optional} is returned.
-         *
-         * @return the exception for the first subtask to fail or an empty optional if no
-         * subtasks failed
+         * Constructs a {@code FailedException} with the specified cause.
          *
-         * @throws WrongThreadException if the current thread is not the task scope owner
-         * @throws IllegalStateException if the task scope owner did not join after forking
+         * @param  cause the cause, can be {@code null}
          */
-        public Optional<Throwable> exception() {
-            ensureOwnerAndJoined();
-            return Optional.ofNullable(firstException);
+        FailedException(Throwable cause) {
+            super(cause);
         }
+    }
 
-        /**
-         * Throws if a subtask {@linkplain Subtask.State#FAILED failed}.
-         * If any subtask failed with an exception then {@code ExecutionException} is
-         * thrown with the exception of the first subtask to fail as the {@linkplain
-         * Throwable#getCause() cause}. This method does nothing if no subtasks failed.
-         *
-         * @throws ExecutionException if a subtask failed
-         * @throws WrongThreadException if the current thread is not the task scope owner
-         * @throws IllegalStateException if the task scope owner did not join after forking
-         */
-        public void throwIfFailed() throws ExecutionException {
-            throwIfFailed(ExecutionException::new);
-        }
+    /**
+     * Exception thrown by {@link #join()} if the scope was created with a timeout and
+     * the timeout expired before or while waiting in {@code join}.
+     *
+     * @since 25
+     * @see Configuration#withTimeout(Duration)
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.STRUCTURED_CONCURRENCY)
+    final class TimeoutException extends RuntimeException {
+        @java.io.Serial
+        static final long serialVersionUID = 705788143955048766L;
 
         /**
-         * Throws the exception produced by the given exception supplying function if a
-         * subtask {@linkplain Subtask.State#FAILED failed}. If any subtask failed with
-         * an exception then the function is invoked with the exception of the first
-         * subtask to fail. The exception returned by the function is thrown. This method
-         * does nothing if no subtasks failed.
-         *
-         * @param esf the exception supplying function
-         * @param <X> type of the exception to be thrown
-         *
-         * @throws X produced by the exception supplying function
-         * @throws WrongThreadException if the current thread is not the task scope owner
-         * @throws IllegalStateException if the task scope owner did not join after forking
+         * Constructs a {@code TimeoutException} with no detail message.
          */
-        public <X extends Throwable>
-        void throwIfFailed(Function<Throwable, ? extends X> esf) throws X {
-            ensureOwnerAndJoined();
-            Objects.requireNonNull(esf);
-            Throwable exception = firstException;
-            if (exception != null) {
-                X ex = esf.apply(exception);
-                Objects.requireNonNull(ex, "esf returned null");
-                throw ex;
-            }
-        }
+        TimeoutException() { }
+    }
+
+    /**
+     * Opens a new {@code StructuredTaskScope} to use the given {@code Joiner} object and
+     * with configuration that is the result of applying the given function to the
+     * <a href="#DefaultConfiguration">default configuration</a>.
+     *
+     * <p> The {@code configFunction} is called with the default configuration and returns
+     * the configuration for the new scope. The function may, for example, set the
+     * {@linkplain Configuration#withThreadFactory(ThreadFactory) ThreadFactory} or set a
+     * {@linkplain Configuration#withTimeout(Duration) timeout}. If the function completes
+     * with an exception or error then it is propagated by this method. If the function
+     * returns {@code null} then {@code NullPointerException} is thrown.
+     *
+     * <p> If a {@code ThreadFactory} is set then its {@link ThreadFactory#newThread(Runnable)
+     * newThread} method will be called to create threads when {@linkplain #fork(Callable)
+     * forking} subtasks in this scope. If a {@code ThreadFactory} is not set then
+     * forking subtasks will create an unnamed virtual thread for each subtask.
+     *
+     * <p> If a {@linkplain Configuration#withTimeout(Duration) timeout} is set then it
+     * starts when the scope is opened. If the timeout expires before the scope has
+     * {@linkplain #join() joined} then the scope is <a href="#Cancallation">cancelled</a>
+     * and the {@code join} method throws {@link TimeoutException}.
+     *
+     * <p> The new scope is owned by the current thread. Only code executing in this
+     * thread can {@linkplain #fork(Callable) fork}, {@linkplain #join() join}, or
+     * {@linkplain #close close} the scope.
+     *
+     * <p> Construction captures the current thread's {@linkplain ScopedValue scoped
+     * value} bindings for inheritance by threads started in the scope.
+     *
+     * @param joiner the joiner
+     * @param configFunction a function to produce the configuration
+     * @return a new scope
+     * @param <T> the result type of subtasks executed in the scope
+     * @param <R> the result type of the scope
+     * @since 25
+     */
+    static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner,
+                                                 Function<Configuration, Configuration> configFunction) {
+        return StructuredTaskScopeImpl.open(joiner, configFunction);
+    }
+
+    /**
+     * Opens a new {@code StructuredTaskScope}to use the given {@code Joiner} object. The
+     * scope is created with the <a href="#DefaultConfiguration">default configuration</a>.
+     * The default configuration has a {@code ThreadFactory} that creates unnamed
+     * <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/Thread.html#virtual-threads">virtual threads</a>,
+     * is unnamed for monitoring and management purposes, and has no timeout.
+     *
+     * @implSpec
+     * This factory method is equivalent to invoking the 2-arg open method with the given
+     * joiner and the {@linkplain Function#identity() identity function}.
+     *
+     * @param joiner the joiner
+     * @return a new scope
+     * @param <T> the result type of subtasks executed in the scope
+     * @param <R> the result type of the scope
+     * @since 25
+     */
+    static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner) {
+        return open(joiner, Function.identity());
+    }
+
+    /**
+     * Opens a new {@code StructuredTaskScope} that can be used to fork subtasks that return
+     * results of any type. The scope's {@link #join()} method waits for all subtasks to
+     * succeed or any subtask to fail.
+     *
+     * <p> The {@code join} method returns {@code null} if all subtasks complete successfully.
+     * It throws {@link FailedException} if any subtask fails, with the exception from
+     * the first subtask to fail as the cause.
+     *
+     * <p> The scope is created with the <a href="#DefaultConfiguration">default
+     * configuration</a>. The default configuration has a {@code ThreadFactory} that creates
+     * unnamed <a href="http://github.com/%7B@docRoot%7D/java.base/java/lang/Thread.html#virtual-threads">virtual
+     * threads</a>, is unnamed for monitoring and management purposes, and has no timeout.
+     *
+     * @implSpec
+     * This factory method is equivalent to invoking the 2-arg open method with a joiner
+     * created with {@link Joiner#awaitAllSuccessfulOrThrow() awaitAllSuccessfulOrThrow()}
+     * and the {@linkplain Function#identity() identity function}.
+     *
+     * @param <T> the result type of subtasks
+     * @return a new scope
+     * @since 25
+     */
+    static <T> StructuredTaskScope<T, Void> open() {
+        return open(Joiner.awaitAllSuccessfulOrThrow(), Function.identity());
     }
-}
+
+    /**
+     * Fork a subtask by starting a new thread in this scope to execute a value-returning
+     * method. The new thread executes the subtask concurrently with the current thread.
+     * The parameter to this method is a {@link Callable}, the new thread executes its
+     * {@link Callable#call() call()} method.
+     *
+     * <p> This method first creates a {@link Subtask Subtask} object to represent the
+     * <em>forked subtask</em>. It invokes the joiner's {@link Joiner#onFork(Subtask) onFork}
+     * method with the subtask in the {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state.
+     * If the {@code onFork} completes with an exception or error then it is propagated by
+     * the {@code fork} method without creating a thread. If the scope is already
+     * <a href="#Cancallation">cancelled</a>, or {@code onFork} returns {@code true} to
+     * cancel the scope, then this method returns the {@code Subtask}, in the
+     * {@link Subtask.State#UNAVAILABLE UNAVAILABLE} state, without creating a thread to
+     * execute the subtask.
+     *
+     * <p> If the scope is not cancelled, and the {@code onFork} method returns {@code false},
+     * then a thread is created with the {@link ThreadFactory} configured when the scope
+     * was opened, and the thread is started. Forking a subtask inherits the current thread's
+     * {@linkplain ScopedValue scoped value} bindings. The bindings must match the bindings
+     * captured when the scope was opened. If the subtask completes (successfully or with
+     * an exception) before the scope is cancelled, then the thread invokes the joiner's
+     * {@link Joiner#onComplete(Subtask) onComplete} method with the subtask in the
+     * {@link Subtask.State#SUCCESS SUCCESS} or {@link Subtask.State#FAILED FAILED} state.
+     * If the {@code onComplete} method completes with an exception or error, then the
+     * {@linkplain Thread.UncaughtExceptionHandler uncaught exception handler} is invoked
+     * with the exception or error before the thread terminates.
+     *
+     * <p> This method returns the {@link Subtask Subtask} object. In some usages, this
+     * object may be used to get its result. In other cases it may be used for correlation
+     * or be discarded. To ensure correct usage, the {@link Subtask#get() Subtask.get()}
+     * method may only be called by the scope owner to get the result after it has
+     * waited for subtasks to complete with the {@link #join() join} method and the subtask
+     * completed successfully. Similarly, the {@link Subtask#exception() Subtask.exception()}
+     * method may only be called by the scope owner after it has joined and the subtask
+     * failed. If the scope was cancelled before the subtask was forked, or before it
+     * completes, then neither method can be used to obtain the outcome.
+     *
+     * <p> This method may only be invoked by the scope owner.
+     *
+     * @param task the value-returning task for the thread to execute
+     * @param <U> the result type
+     * @return the subtask
+     * @throws WrongThreadException if the current thread is not the scope owner
+     * @throws IllegalStateException if the owner has already {@linkplain #join() joined}
+     * or the scope is closed
+     * @throws StructureViolationException if the current scoped value bindings are not
+     * the same as when the scope was created
+     * @throws RejectedExecutionException if the thread factory rejected creating a
+     * thread to run the subtask
+     */
+    <U extends T> Subtask<U> fork(Callable<? extends U> task);
+
+    /**
+     * Fork a subtask by starting a new thread in this scope to execute a method that
+     * does not return a result.
+     *
+     * <p> This method works exactly the same as {@link #fork(Callable)} except that the
+     * parameter to this method is a {@link Runnable}, the new thread executes its
+     * {@link Runnable#run() run} method, and {@link Subtask#get() Subtask.get()} returns
+     * {@code null} if the subtask completes successfully.
+     *
+     * @param task the task for the thread to execute
+     * @param <U> the result type
+     * @return the subtask
+     * @throws WrongThreadException if the current thread is not the scope owner
+     * @throws IllegalStateException if the owner has already {@linkplain #join() joined}
+     * or the scope is closed
+     * @throws StructureViolationException if the current scoped value bindings are not
+     * the same as when the scope was created
+     * @throws RejectedExecutionException if the thread factory rejected creating a
+     * thread to run the subtask
+     * @since 25
+     */
+    <U extends T> Subtask<U> fork(Runnable task);
+
+    /**
+     * Returns the result, or throws, after waiting for all subtasks to complete or
+     * the scope to be <a href="#Cancallation">cancelled</a>.
+     *
+     * <p> This method waits for all subtasks started in this scope to complete or the
+     * scope to be cancelled. If a {@linkplain Configuration#withTimeout(Duration) timeout}
+     * is configured and the timeout expires before or while waiting, then the scope is
+     * cancelled and {@link TimeoutException TimeoutException} is thrown. Once finished
+     * waiting, the {@code Joiner}'s {@link Joiner#result() result()} method is invoked
+     * to get the result or throw an exception. If the {@code result()} method throws
+     * then this method throws {@code FailedException} with the exception as the cause.
+     *
+     * <p> This method may only be invoked by the scope owner, and only once.
+     *
+     * @return the result
+     * @throws WrongThreadException if the current thread is not the scope owner
+     * @throws IllegalStateException if already joined or this scope is closed
+     * @throws FailedException if the <i>outcome</i> is an exception, thrown with the
+     * exception from {@link Joiner#result() Joiner.result()} as the cause
+     * @throws TimeoutException if a timeout is set and the timeout expires before or
+     * while waiting
+     * @throws InterruptedException if interrupted while waiting
+     * @since 25
+     */
+    R join() throws InterruptedException;
+
+    /**
+     * {@return {@code true} if this scope is <a href="#Cancallation">cancelled</a> or in
+     * the process of being cancelled, otherwise {@code false}}
+     *
+     * <p> Cancelling the scope prevents new threads from starting in the scope and
+     * {@linkplain Thread#interrupt() interrupts} threads executing unfinished subtasks.
+     * It may take some time before the interrupted threads finish execution; this
+     * method may return {@code true} before all threads have been interrupted or before
+     * all threads have finished.
+     *
+     * @apiNote A task with a lengthy "forking phase" (the code that executes before
+     * it invokes {@link #join() join}) may use this method to avoid doing work in cases
+     * where scope is cancelled by the completion of a previously forked subtask or timeout.
+     *
+     * @since 25
+     */
+    boolean isCancelled();
+
+    /**
+     * Closes this scope.
+     *
+     * <p> This method first <a href="#Cancallation">cancels</a> the scope, if not
+     * already cancelled. This interrupts the threads executing unfinished subtasks. This
+     * method then waits for all threads to finish. If interrupted while waiting then it
+     * will continue to wait until the threads finish, before completing with the interrupt
+     * status set.
+     *
+     * <p> This method may only be invoked by the scope owner. If the scope
+     * is already closed then the scope owner invoking this method has no effect.
+     *
+     * <p> A {@code StructuredTaskScope} is intended to be used in a <em>structured
+     * manner</em>. If this method is called to close a scope before nested task
+     * scopes are closed then it closes the underlying construct of each nested scope
+     * (in the reverse order that they were created in), closes this scope, and then
+     * throws {@link StructureViolationException}.
+     * Similarly, if this method is called to close a scope while executing with
+     * {@linkplain ScopedValue scoped value} bindings, and the scope was created
+     * before the scoped values were bound, then {@code StructureViolationException} is
+     * thrown after closing the scope.
+     * If a thread terminates without first closing scopes that it owns then
+     * termination will cause the underlying construct of each of its open tasks scopes to
+     * be closed. Closing is performed in the reverse order that the scopes were
+     * created in. Thread termination may therefore be delayed when the scope owner
+     * has to wait for threads forked in these scopes to finish.
+     *
+     * @throws IllegalStateException thrown after closing the scope if the scope
+     * owner did not attempt to join after forking
+     * @throws WrongThreadException if the current thread is not the scope owner
+     * @throws StructureViolationException if a structure violation was detected
+     */
+    @Override
+    void close();
+}
\ No newline at end of file
diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
new file mode 100644
index 00000000000..29d85ac44ec
--- /dev/null
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
@@ -0,0 +1,417 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.concurrent;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.function.Function;
+import jdk.internal.misc.ThreadFlock;
+import jdk.internal.invoke.MhUtil;
+
+/**
+ * StructuredTaskScope implementation.
+ */
+final class StructuredTaskScopeImpl<T, R> implements StructuredTaskScope<T, R> {
+    private static final VarHandle CANCELLED =
+            MhUtil.findVarHandle(MethodHandles.lookup(), "cancelled", boolean.class);
+
+    private final Joiner<? super T, ? extends R> joiner;
+    private final ThreadFactory threadFactory;
+    private final ThreadFlock flock;
+
+    // state, only accessed by owner thread
+    private static final int ST_NEW            = 0,
+                             ST_FORKED         = 1,   // subtasks forked, need to join
+                             ST_JOIN_STARTED   = 2,   // join started, can no longer fork
+                             ST_JOIN_COMPLETED = 3,   // join completed
+                             ST_CLOSED         = 4;   // closed
+    private int state;
+
+    // timer task, only accessed by owner thread
+    private Future<?> timerTask;
+
+    // set or read by any thread
+    private volatile boolean cancelled;
+
+    // set by the timer thread, read by the owner thread
+    private volatile boolean timeoutExpired;
+
+    @SuppressWarnings("this-escape")
+    private StructuredTaskScopeImpl(Joiner<? super T, ? extends R> joiner,
+                                    ThreadFactory threadFactory,
+                                    String name) {
+        this.joiner = joiner;
+        this.threadFactory = threadFactory;
+        this.flock = ThreadFlock.open((name != null) ? name : Objects.toIdentityString(this));
+    }
+
+    /**
+     * Returns a new {@code StructuredTaskScope} to use the given {@code Joiner} object
+     * and with configuration that is the result of applying the given function to the
+     * default configuration.
+     */
+    static <T, R> StructuredTaskScope<T, R> open(Joiner<? super T, ? extends R> joiner,
+                                                 Function<Configuration, Configuration> configFunction) {
+        Objects.requireNonNull(joiner);
+
+        var config = (ConfigImpl) configFunction.apply(ConfigImpl.defaultConfig());
+        var scope = new StructuredTaskScopeImpl<T, R>(joiner, config.threadFactory(), config.name());
+
+        // schedule timeout
+        Duration timeout = config.timeout();
+        if (timeout != null) {
+            boolean scheduled = false;
+            try {
+                scope.scheduleTimeout(timeout);
+                scheduled = true;
+            } finally {
+                if (!scheduled) {
+                    scope.close();  // pop if scheduling timeout failed
+                }
+            }
+        }
+
+        return scope;
+    }
+
+    /**
+     * Throws WrongThreadException if the current thread is not the owner thread.
+     */
+    private void ensureOwner() {
+        if (Thread.currentThread() != flock.owner()) {
+            throw new WrongThreadException("Current thread not owner");
+        }
+    }
+
+    /**
+     * Throws IllegalStateException if already joined or scope is closed.
+     */
+    private void ensureNotJoined() {
+        assert Thread.currentThread() == flock.owner();
+        if (state > ST_FORKED) {
+            throw new IllegalStateException("Already joined or scope is closed");
+        }
+    }
+
+    /**
+     * Throws IllegalStateException if invoked by the owner thread and the owner thread
+     * has not joined.
+     */
+    private void ensureJoinedIfOwner() {
+        if (Thread.currentThread() == flock.owner() && state <= ST_JOIN_STARTED) {
+            throw new IllegalStateException("join not called");
+        }
+    }
+
+    /**
+     * Interrupts all threads in this scope, except the current thread.
+     */
+    private void interruptAll() {
+        flock.threads()
+                .filter(t -> t != Thread.currentThread())
+                .forEach(t -> {
+                    try {
+                        t.interrupt();
+                    } catch (Throwable ignore) { }
+                });
+    }
+
+    /**
+     * Cancel the scope if not already cancelled.
+     */
+    private void cancel() {
+        if (!cancelled && CANCELLED.compareAndSet(this, false, true)) {
+            // prevent new threads from starting
+            flock.shutdown();
+
+            // interrupt all unfinished threads
+            interruptAll();
+
+            // wakeup join
+            flock.wakeup();
+        }
+    }
+
+    /**
+     * Schedules a task to cancel the scope on timeout.
+     */
+    private void scheduleTimeout(Duration timeout) {
+        assert Thread.currentThread() == flock.owner() && timerTask == null;
+        long nanos = TimeUnit.NANOSECONDS.convert(timeout);
+        timerTask = ForkJoinPool.commonPool().schedule(() -> {
+            if (!cancelled) {
+                timeoutExpired = true;
+                cancel();
+            }
+        }, nanos, TimeUnit.NANOSECONDS);
+    }
+
+    /**
+     * Cancels the timer task if set.
+     */
+    private void cancelTimeout() {
+        assert Thread.currentThread() == flock.owner();
+        if (timerTask != null) {
+            timerTask.cancel(false);
+        }
+    }
+
+    /**
+     * Invoked by the thread for a subtask when the subtask completes before scope is cancelled.
+     */
+    private void onComplete(SubtaskImpl<? extends T> subtask) {
+        assert subtask.state() != Subtask.State.UNAVAILABLE;
+        if (joiner.onComplete(subtask)) {
+            cancel();
+        }
+    }
+
+    @Override
+    public <U extends T> Subtask<U> fork(Callable<? extends U> task) {
+        Objects.requireNonNull(task);
+        ensureOwner();
+        ensureNotJoined();
+
+        var subtask = new SubtaskImpl<U>(this, task);
+
+        // notify joiner, even if cancelled
+        if (joiner.onFork(subtask)) {
+            cancel();
+        }
+
+        if (!cancelled) {
+            // create thread to run task
+            Thread thread = threadFactory.newThread(subtask);
+            if (thread == null) {
+                throw new RejectedExecutionException("Rejected by thread factory");
+            }
+
+            // attempt to start the thread
+            try {
+                flock.start(thread);
+            } catch (IllegalStateException e) {
+                // shutdown by another thread, or underlying flock is shutdown due
+                // to unstructured use
+            }
+        }
+
+        // force owner to join
+        state = ST_FORKED;
+        return subtask;
+    }
+
+    @Override
+    public <U extends T> Subtask<U> fork(Runnable task) {
+        Objects.requireNonNull(task);
+        return fork(() -> { task.run(); return null; });
+    }
+
+    @Override
+    public R join() throws InterruptedException {
+        ensureOwner();
+        ensureNotJoined();
+
+        // join started
+        state = ST_JOIN_STARTED;
+
+        // wait for all subtasks, the scope to be cancelled, or interrupt
+        flock.awaitAll();
+
+        // throw if timeout expired
+        if (timeoutExpired) {
+            throw new TimeoutException();
+        }
+        cancelTimeout();
+
+        // all subtasks completed or cancelled
+        state = ST_JOIN_COMPLETED;
+
+        // invoke joiner to get result
+        try {
+            return joiner.result();
+        } catch (Throwable e) {
+            throw new FailedException(e);
+        }
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void close() {
+        ensureOwner();
+        int s = state;
+        if (s == ST_CLOSED) {
+            return;
+        }
+
+        // cancel the scope if join did not complete
+        if (s < ST_JOIN_COMPLETED) {
+            cancel();
+            cancelTimeout();
+        }
+
+        // wait for stragglers
+        try {
+            flock.close();
+        } finally {
+            state = ST_CLOSED;
+        }
+
+        // throw ISE if the owner didn't join after forking
+        if (s == ST_FORKED) {
+            throw new IllegalStateException("Owner did not join after forking");
+        }
+    }
+
+    @Override
+    public String toString() {
+        return flock.name();
+    }
+
+    /**
+     * Subtask implementation, runs the task specified to the fork method.
+     */
+    static final class SubtaskImpl<T> implements Subtask<T>, Runnable {
+        private static final AltResult RESULT_NULL = new AltResult(Subtask.State.SUCCESS);
+
+        private record AltResult(Subtask.State state, Throwable exception) {
+            AltResult(Subtask.State state) {
+                this(state, null);
+            }
+        }
+
+        private final StructuredTaskScopeImpl<? super T, ?> scope;
+        private final Callable<? extends T> task;
+        private volatile Object result;
+
+        SubtaskImpl(StructuredTaskScopeImpl<? super T, ?> scope, Callable<? extends T> task) {
+            this.scope = scope;
+            this.task = task;
+        }
+
+        @Override
+        public void run() {
+            T result = null;
+            Throwable ex = null;
+            try {
+                result = task.call();
+            } catch (Throwable e) {
+                ex = e;
+            }
+
+            // nothing to do if scope is cancelled
+            if (scope.isCancelled())
+                return;
+
+            // set result/exception and invoke onComplete
+            if (ex == null) {
+                this.result = (result != null) ? result : RESULT_NULL;
+            } else {
+                this.result = new AltResult(State.FAILED, ex);
+            }
+            scope.onComplete(this);
+        }
+
+        @Override
+        public Subtask.State state() {
+            Object result = this.result;
+            if (result == null) {
+                return State.UNAVAILABLE;
+            } else if (result instanceof AltResult alt) {
+                // null or failed
+                return alt.state();
+            } else {
+                return State.SUCCESS;
+            }
+        }
+
+        @Override
+        public T get() {
+            scope.ensureJoinedIfOwner();
+            Object result = this.result;
+            if (result instanceof AltResult) {
+                if (result == RESULT_NULL) return null;
+            } else if (result != null) {
+                @SuppressWarnings("unchecked")
+                T r = (T) result;
+                return r;
+            }
+            throw new IllegalStateException(
+                    "Result is unavailable or subtask did not complete successfully");
+        }
+
+        @Override
+        public Throwable exception() {
+            scope.ensureJoinedIfOwner();
+            Object result = this.result;
+            if (result instanceof AltResult alt && alt.state() == State.FAILED) {
+                return alt.exception();
+            }
+            throw new IllegalStateException(
+                    "Exception is unavailable or subtask did not complete with exception");
+        }
+
+        @Override
+        public String toString() {
+            String stateAsString = switch (state()) {
+                case UNAVAILABLE -> "[Unavailable]";
+                case SUCCESS     -> "[Completed successfully]";
+                case FAILED      -> "[Failed: " + ((AltResult) result).exception() + "]";
+            };
+            return Objects.toIdentityString(this) + stateAsString;
+        }
+    }
+
+    /**
+     * Configuration implementation.
+     */
+    record ConfigImpl(ThreadFactory threadFactory,
+                      String name,
+                      Duration timeout) implements Configuration {
+        static Configuration defaultConfig() {
+            return new ConfigImpl(Thread.ofVirtual().factory(), null, null);
+        }
+
+        @Override
+        public Configuration withThreadFactory(ThreadFactory threadFactory) {
+            return new ConfigImpl(Objects.requireNonNull(threadFactory), name, timeout);
+        }
+
+        @Override
+        public Configuration withName(String name) {
+            return new ConfigImpl(threadFactory, Objects.requireNonNull(name), timeout);
+        }
+
+        @Override
+        public Configuration withTimeout(Duration timeout) {
+            return new ConfigImpl(threadFactory, name, Objects.requireNonNull(timeout));
+        }
+    }
+}
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 7461815e4c5..5726671dfd4 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -71,7 +71,7 @@ public enum Feature {
         IMPLICIT_CLASSES, //to be removed when boot JDK is 25
         @JEP(number=487, title="Scoped Values", status="Fourth Preview")
         SCOPED_VALUES,
-        @JEP(number=499, title="Structured Concurrency", status="Fourth Preview")
+        @JEP(number=505, title="Structured Concurrency", status="Fifth Preview")
         STRUCTURED_CONCURRENCY,
         CLASSFILE_API,
         STREAM_GATHERERS,
diff --git a/src/java.base/share/classes/jdk/internal/misc/ThreadFlock.java b/src/java.base/share/classes/jdk/internal/misc/ThreadFlock.java
index 8bf38b79734..423ffa03d31 100644
--- a/src/java.base/share/classes/jdk/internal/misc/ThreadFlock.java
+++ b/src/java.base/share/classes/jdk/internal/misc/ThreadFlock.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
@@ -272,15 +272,8 @@ public Thread start(Thread thread) {
      * Shutdown this flock so that no new threads can be started, existing threads
      * in the flock will continue to run. This method is a no-op if the flock is
      * already shutdown or closed.
-     *
-     * <p> This method may only be invoked by the flock owner or threads {@linkplain
-     * #containsThread(Thread) contained} in the flock.
-     *
-     * @throws WrongThreadException if the current thread is not the owner or a thread
-     * contained in the flock
      */
     public void shutdown() {
-        ensureOwnerOrContainsThread();
         if (!shutdown) {
             shutdown = true;
         }
@@ -370,12 +363,8 @@ public boolean awaitAll(Duration timeout)
      * <p> If the owner is blocked in {@code awaitAll} then it will return immediately.
      * If the owner is not blocked in {@code awaitAll} then its next call to wait
      * will return immediately. The method does nothing when the flock is closed.
-     *
-     * @throws WrongThreadException if the current thread is not the owner or a thread
-     * contained in the flock
      */
     public void wakeup() {
-        ensureOwnerOrContainsThread();
         if (!getAndSetPermit(true) && Thread.currentThread() != owner()) {
             LockSupport.unpark(owner());
         }
diff --git a/test/jdk/java/lang/ScopedValue/StressStackOverflow.java b/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
index 83813745783..088bf62ee72 100644
--- a/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
+++ b/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
@@ -52,6 +52,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.StructureViolationException;
 import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.Joiner;
 import java.util.function.Supplier;
 
 public class StressStackOverflow {
@@ -169,7 +170,7 @@ long fibonacci_pad(int n, Runnable op) {
     void runInNewThread(Runnable op) {
         var threadFactory
                 = (ThreadLocalRandom.current().nextBoolean() ? Thread.ofPlatform() : Thread.ofVirtual()).factory();
-        try (var scope = new StructuredTaskScope<>("", threadFactory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withThreadFactory(threadFactory))) {
             var handle = scope.fork(() -> {
                 op.run();
                 return null;
@@ -186,7 +187,7 @@ void runInNewThread(Runnable op) {
     public void run() {
         try {
             ScopedValue.where(inheritedValue, 42).where(el, 0).run(() -> {
-                try (var scope = new StructuredTaskScope<>()) {
+                try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
                     try {
                         if (ThreadLocalRandom.current().nextBoolean()) {
                             // Repeatedly test Scoped Values set by ScopedValue::call(), get(), and run()
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/StressShutdown.java b/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java
similarity index 54%
rename from test/jdk/java/util/concurrent/StructuredTaskScope/StressShutdown.java
rename to test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.java
index 592333a169e..e8894353519 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/StressShutdown.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/StressCancellation.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,15 +23,15 @@
 
 /*
  * @test
- * @bug 8311867
- * @summary Stress test of StructuredTaskScope.shutdown with running and starting threads
+ * @summary Stress test of StructuredTaskScope cancellation with running and starting threads
  * @enablePreview
- * @run junit StressShutdown
+ * @run junit StressCancellation
  */
 
 import java.time.Duration;
-import java.util.concurrent.Callable;
 import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.Joiner;
+import java.util.concurrent.StructuredTaskScope.Subtask;
 import java.util.concurrent.ThreadFactory;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -41,12 +41,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import static org.junit.jupiter.api.Assertions.*;
 
-class StressShutdown {
-
-    static final Callable<Void> SLEEP_FOR_A_DAY = () -> {
-        Thread.sleep(Duration.ofDays(1));
-        return null;
-    };
+class StressCancellation {
 
     static Stream<Arguments> testCases() {
         Stream<ThreadFactory> factories = Stream.of(
@@ -59,34 +54,47 @@ static Stream<Arguments> testCases() {
     }
 
     /**
-     * Test StructuredTaskScope.shutdown with running threads and concurrently with
-     * threads that are starting. The shutdown should interrupt all threads so that
-     * join wakes up.
+     * Test StructuredTaskScope cancellation with running threads and concurrently with
+     * threads that are starting. The cancellation should interrupt all running threads,
+     * join should wakeup, and close would complete quickly.
      *
      * @param factory the ThreadFactory to use
-     * @param beforeShutdown the number of subtasks to fork before shutdown
-     * @param afterShutdown the number of subtasks to fork after shutdown
+     * @param beforeCancel the number of subtasks to fork before cancel
+     * @param afterCancel the number of subtasks to fork after cancel
      */
     @ParameterizedTest
     @MethodSource("testCases")
-    void testShutdown(ThreadFactory factory, int beforeShutdown, int afterShutdown)
-        throws InterruptedException
-    {
-        try (var scope = new StructuredTaskScope<>(null, factory)) {
+    void test(ThreadFactory factory, int beforeCancel, int afterCancel) throws Exception {
+        var joiner = new Joiner<Boolean, Void>() {
+            @Override
+            public boolean onComplete(Subtask<? extends Boolean> subtask) {
+                boolean cancel = subtask.get();
+                return cancel;
+            }
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+
+        try (var scope = StructuredTaskScope.open(joiner, cf -> cf.withThreadFactory(factory))) {
             // fork subtasks
-            for (int i = 0; i < beforeShutdown; i++) {
-                scope.fork(SLEEP_FOR_A_DAY);
+            for (int i = 0; i < beforeCancel; i++) {
+                scope.fork(() -> {
+                    Thread.sleep(Duration.ofDays(1));
+                    return false;
+                });
             }
 
-            // fork subtask to shutdown
-            scope.fork(() -> {
-                scope.shutdown();
-                return null;
-            });
+            // fork subtask to cancel
+            scope.fork(() -> true);
 
-            // fork after forking subtask to shutdown
-            for (int i = 0; i < afterShutdown; i++) {
-                scope.fork(SLEEP_FOR_A_DAY);
+            // fork after forking subtask to cancel
+            for (int i = 0; i < afterCancel; i++) {
+                scope.fork(() -> {
+                    Thread.sleep(Duration.ofDays(1));
+                    return false;
+                });
             }
 
             scope.join();
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
index 5ed7af8c46b..79f4a935195 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.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
@@ -36,32 +36,33 @@
  */
 
 import java.time.Duration;
-import java.io.IOException;
-import java.time.Instant;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.TimeoutException;
+import java.util.concurrent.StructuredTaskScope.Configuration;
+import java.util.concurrent.StructuredTaskScope.FailedException;
+import java.util.concurrent.StructuredTaskScope.Joiner;
 import java.util.concurrent.StructuredTaskScope.Subtask;
-import java.util.concurrent.StructuredTaskScope.ShutdownOnSuccess;
-import java.util.concurrent.StructuredTaskScope.ShutdownOnFailure;
 import java.util.concurrent.StructureViolationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 import static java.lang.Thread.State.*;
 
@@ -101,32 +102,19 @@ private static Stream<ThreadFactory> factories() {
     }
 
     /**
-     * Test that fork creates a new thread for each task.
+     * Test that fork creates virtual threads when no ThreadFactory is configured.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testForkCreatesThread(ThreadFactory factory) throws Exception {
-        Set<Long> tids = ConcurrentHashMap.newKeySet();
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            for (int i = 0; i < 100; i++) {
+    @Test
+    void testForkCreatesVirtualThread() throws Exception {
+        Set<Thread> threads = ConcurrentHashMap.newKeySet();
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            for (int i = 0; i < 50; i++) {
+                // runnable
                 scope.fork(() -> {
-                    tids.add(Thread.currentThread().threadId());
-                    return null;
+                    threads.add(Thread.currentThread());
                 });
-            }
-            scope.join();
-        }
-        assertEquals(100, tids.size());
-    }
 
-    /**
-     * Test that fork creates a new virtual thread for each task.
-     */
-    @Test
-    void testForkCreateVirtualThread() throws Exception {
-        Set<Thread> threads = ConcurrentHashMap.newKeySet();
-        try (var scope = new StructuredTaskScope<Object>()) {
-            for (int i = 0; i < 100; i++) {
+                // callable
                 scope.fork(() -> {
                     threads.add(Thread.currentThread());
                     return null;
@@ -139,100 +127,107 @@ void testForkCreateVirtualThread() throws Exception {
     }
 
     /**
-     * Test that fork creates a new thread with the given thread factory.
+     * Test that fork create threads with the configured ThreadFactory.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkUsesFactory(ThreadFactory factory) throws Exception {
-        var count = new AtomicInteger();
-        ThreadFactory countingFactory = task -> {
-            count.incrementAndGet();
-            return factory.newThread(task);
-        };
-        try (var scope = new StructuredTaskScope<Object>(null, countingFactory)) {
-            for (int i = 0; i < 100; i++) {
-                scope.fork(() -> null);
+    void testForkUsesThreadFactory(ThreadFactory factory) throws Exception {
+        // TheadFactory that keeps reference to all threads it creates
+        class RecordingThreadFactory implements ThreadFactory {
+            final ThreadFactory delegate;
+            final Set<Thread> threads = ConcurrentHashMap.newKeySet();
+            RecordingThreadFactory(ThreadFactory delegate) {
+                this.delegate = delegate;
+            }
+            @Override
+            public Thread newThread(Runnable task) {
+                Thread thread = delegate.newThread(task);
+                threads.add(thread);
+                return thread;
+            }
+            Set<Thread> threads() {
+                return threads;
+            }
+        }
+        var recordingThreadFactory = new RecordingThreadFactory(factory);
+        Set<Thread> threads = ConcurrentHashMap.newKeySet();
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(recordingThreadFactory))) {
+
+            for (int i = 0; i < 50; i++) {
+                // runnable
+                scope.fork(() -> {
+                    threads.add(Thread.currentThread());
+                });
+
+                // callable
+                scope.fork(() -> {
+                    threads.add(Thread.currentThread());
+                    return null;
+                });
             }
             scope.join();
         }
-        assertEquals(100, count.get());
+        assertEquals(100, threads.size());
+        assertEquals(recordingThreadFactory.threads(), threads);
     }
 
     /**
-     * Test fork is confined to threads in the scope "tree".
+     * Test fork method is owner confined.
      */
     @ParameterizedTest
     @MethodSource("factories")
     void testForkConfined(ThreadFactory factory) throws Exception {
-        try (var scope1 = new StructuredTaskScope<Boolean>();
-             var scope2 = new StructuredTaskScope<Boolean>()) {
-
-            // thread in scope1 cannot fork thread in scope2
-            Subtask<Boolean> subtask1 = scope1.fork(() -> {
-                assertThrows(WrongThreadException.class, () -> {
-                    scope2.fork(() -> null);
-                });
-                return true;
-            });
-
-            // thread in scope2 can fork thread in scope1
-            Subtask<Boolean> subtask2 = scope2.fork(() -> {
-                scope1.fork(() -> null);
-                return true;
-            });
-
-            scope2.join();
-            scope1.join();
-
-            assertTrue(subtask1.get());
-            assertTrue(subtask2.get());
+        try (var scope = StructuredTaskScope.open(Joiner.<Boolean>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
 
             // random thread cannot fork
             try (var pool = Executors.newSingleThreadExecutor()) {
                 Future<Void> future = pool.submit(() -> {
                     assertThrows(WrongThreadException.class, () -> {
-                        scope1.fork(() -> null);
-                    });
-                    assertThrows(WrongThreadException.class, () -> {
-                        scope2.fork(() -> null);
+                        scope.fork(() -> null);
                     });
                     return null;
                 });
                 future.get();
             }
+
+            // subtask cannot fork
+            Subtask<Boolean> subtask = scope.fork(() -> {
+                assertThrows(WrongThreadException.class, () -> {
+                    scope.fork(() -> null);
+                });
+                return true;
+            });
+            scope.join();
+            assertTrue(subtask.get());
         }
     }
 
     /**
-     * Test fork after join completes.
+     * Test fork after join, no subtasks forked before join.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkAfterJoin(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            // round 1
-            var subtask1 = scope.fork(() -> "foo");
-            assertThrows(IllegalStateException.class, subtask1::get);
-            scope.join();
-            assertEquals("foo", subtask1.get());
-
-            // round 2
-            var subtask2 = scope.fork(() -> "bar");
-            assertEquals("foo", subtask1.get());
-            assertThrows(IllegalStateException.class, subtask2::get);
+    void testForkAfterJoin1(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             scope.join();
-            assertEquals("foo", subtask1.get());
-            assertEquals("bar", subtask2.get());
+            assertThrows(IllegalStateException.class, () -> scope.fork(() -> "bar"));
+        }
+    }
 
-            // round 3
-            var subtask3 = scope.fork(() -> "baz");
-            assertEquals("foo", subtask1.get());
-            assertEquals("bar", subtask2.get());
-            assertThrows(IllegalStateException.class, subtask3::get);
+    /**
+     * Test fork after join, subtasks forked before join.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testForkAfterJoin2(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+            scope.fork(() -> "foo");
             scope.join();
-            assertEquals("foo", subtask1.get());
-            assertEquals("bar", subtask2.get());
-            assertEquals("baz", subtask3.get());
+            assertThrows(IllegalStateException.class, () -> scope.fork(() -> "bar"));
         }
     }
 
@@ -242,7 +237,8 @@ void testForkAfterJoin(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testForkAfterJoinThrows(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             var latch = new CountDownLatch(1);
             var subtask1 = scope.fork(() -> {
                 latch.await();
@@ -253,61 +249,70 @@ void testForkAfterJoinThrows(ThreadFactory factory) throws Exception {
             Thread.currentThread().interrupt();
             assertThrows(InterruptedException.class, scope::join);
 
-            // allow subtask1 to finish
-            latch.countDown();
-
-            // continue to fork
-            var subtask2 = scope.fork(() -> "bar");
-            assertThrows(IllegalStateException.class, subtask1::get);
-            assertThrows(IllegalStateException.class, subtask2::get);
-            scope.join();
-            assertEquals("foo", subtask1.get());
-            assertEquals("bar", subtask2.get());
+            // fork should throw
+            assertThrows(IllegalStateException.class, () -> scope.fork(() -> "bar"));
         }
     }
 
     /**
-     * Test fork after scope is shutdown.
+     * Test fork after task scope is cancelled. This test uses a custom Joiner to
+     * cancel execution.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testForkAfterShutdown(ThreadFactory factory) throws Exception {
-        var executed = new AtomicBoolean();
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            scope.shutdown();
-            Subtask<String> subtask = scope.fork(() -> {
-                executed.set(true);
-                return null;
-            });
+    void testForkAfterCancel2(ThreadFactory factory) throws Exception {
+        var countingThreadFactory = new CountingThreadFactory(factory);
+        var testJoiner = new CancelAfterOneJoiner<String>();
+
+        try (var scope = StructuredTaskScope.open(testJoiner,
+                cf -> cf.withThreadFactory(countingThreadFactory))) {
+
+            // fork subtask, the scope should be cancelled when the subtask completes
+            var subtask1 = scope.fork(() -> "foo");
+            awaitCancelled(scope);
+
+            assertEquals(1, countingThreadFactory.threadCount());
+            assertEquals(1, testJoiner.onForkCount());
+            assertEquals(1, testJoiner.onCompleteCount());
+
+            // fork second subtask, it should not run
+            var subtask2 = scope.fork(() -> "bar");
+
+            // onFork should be invoked, newThread and onComplete should not be invoked
+            assertEquals(1, countingThreadFactory.threadCount());
+            assertEquals(2, testJoiner.onForkCount());
+            assertEquals(1, testJoiner.onCompleteCount());
+
             scope.join();
-            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            assertThrows(IllegalStateException.class, subtask::get);
-            assertThrows(IllegalStateException.class, subtask::exception);
+
+            assertEquals(1, countingThreadFactory.threadCount());
+            assertEquals(2, testJoiner.onForkCount());
+            assertEquals(1, testJoiner.onCompleteCount());
+            assertEquals("foo", subtask1.get());
+            assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
         }
-        assertFalse(executed.get());
     }
 
     /**
-     * Test fork after scope is closed.
+     * Test fork after task scope is closed.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testForkAfterClose(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
+    @Test
+    void testForkAfterClose() {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
             scope.close();
             assertThrows(IllegalStateException.class, () -> scope.fork(() -> null));
         }
     }
 
     /**
-     * Test fork when the thread factory rejects creating a thread.
+     * Test fork with a ThreadFactory that rejects creating a thread.
      */
     @Test
-    void testForkRejectedExecutionException() throws Exception {
+    void testForkRejectedExecutionException() {
         ThreadFactory factory = task -> null;
-        try (var scope = new StructuredTaskScope(null, factory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             assertThrows(RejectedExecutionException.class, () -> scope.fork(() -> null));
-            scope.join();
         }
     }
 
@@ -316,20 +321,21 @@ void testForkRejectedExecutionException() throws Exception {
      */
     @Test
     void testJoinWithNoSubtasks() throws Exception {
-        try (var scope = new StructuredTaskScope()) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
             scope.join();
         }
     }
 
     /**
-     * Test join with unfinished subtasks.
+     * Test join with a remaining subtask.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testJoinWithSubtasks(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope(null, factory)) {
+    void testJoinWithRemainingSubtasks(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             Subtask<String> subtask = scope.fork(() -> {
-                Thread.sleep(Duration.ofMillis(50));
+                Thread.sleep(Duration.ofMillis(100));
                 return "foo";
             });
             scope.join();
@@ -338,22 +344,66 @@ void testJoinWithSubtasks(ThreadFactory factory) throws Exception {
     }
 
     /**
-     * Test join is owner confined.
+     * Test join after join completed with a result.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testJoinConfined(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Boolean>()) {
+    @Test
+    void testJoinAfterJoin1() throws Exception {
+        var results = new LinkedTransferQueue<>(List.of("foo", "bar", "baz"));
+        Joiner<Object, String> joiner = results::take;
+        try (var scope = StructuredTaskScope.open(joiner)) {
+            scope.fork(() -> "foo");
+            assertEquals("foo", scope.join());
 
-            // thread in scope cannot join
-            Subtask<Boolean> subtask = scope.fork(() -> {
-                assertThrows(WrongThreadException.class, () -> { scope.join(); });
-                return true;
-            });
+            // join already called
+            for (int i = 0 ; i < 3; i++) {
+                assertThrows(IllegalStateException.class, scope::join);
+            }
+        }
+    }
 
-            scope.join();
+    /**
+     * Test join after join completed with an exception.
+     */
+    @Test
+    void testJoinAfterJoin2() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow())) {
+            scope.fork(() -> { throw new FooException(); });
+            Throwable ex = assertThrows(FailedException.class, scope::join);
+            assertTrue(ex.getCause() instanceof FooException);
 
-            assertTrue(subtask.get());
+            // join already called
+            for (int i = 0 ; i < 3; i++) {
+                assertThrows(IllegalStateException.class, scope::join);
+            }
+        }
+    }
+
+    /**
+     * Test join after join completed with a timeout.
+     */
+    @Test
+    void testJoinAfterJoin3() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow(),
+                cf -> cf.withTimeout(Duration.ofMillis(100)))) {
+            // wait for scope to be cancelled by timeout
+            awaitCancelled(scope);
+            assertThrows(TimeoutException.class, scope::join);
+
+            // join already called
+            for (int i = 0 ; i < 3; i++) {
+                assertThrows(IllegalStateException.class, scope::join);
+            }
+        }
+    }
+
+    /**
+     * Test join method is owner confined.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testJoinConfined(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<Boolean>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
 
             // random thread cannot join
             try (var pool = Executors.newSingleThreadExecutor()) {
@@ -363,6 +413,14 @@ void testJoinConfined(ThreadFactory factory) throws Exception {
                 });
                 future.get();
             }
+
+            // subtask cannot join
+            Subtask<Boolean> subtask = scope.fork(() -> {
+                assertThrows(WrongThreadException.class, () -> { scope.join(); });
+                return true;
+            });
+            scope.join();
+            assertTrue(subtask.get());
         }
     }
 
@@ -372,11 +430,11 @@ void testJoinConfined(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testInterruptJoin1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope(null, factory)) {
-            var latch = new CountDownLatch(1);
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
 
             Subtask<String> subtask = scope.fork(() -> {
-                latch.await();
+                Thread.sleep(60_000);
                 return "foo";
             });
 
@@ -386,15 +444,8 @@ void testInterruptJoin1(ThreadFactory factory) throws Exception {
                 scope.join();
                 fail("join did not throw");
             } catch (InterruptedException expected) {
-                assertFalse(Thread.interrupted());   // interrupt status should be clear
-            } finally {
-                // let task continue
-                latch.countDown();
+                assertFalse(Thread.interrupted());   // interrupt status should be cleared
             }
-
-            // join should complete
-            scope.join();
-            assertEquals("foo", subtask.get());
         }
     }
 
@@ -404,100 +455,52 @@ void testInterruptJoin1(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testInterruptJoin2(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope(null, factory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+
             var latch = new CountDownLatch(1);
             Subtask<String> subtask = scope.fork(() -> {
-                latch.await();
+                Thread.sleep(60_000);
                 return "foo";
             });
 
-            // join should throw
-            scheduleInterruptAt("java.util.concurrent.StructuredTaskScope.join");
+            // interrupt main thread when it blocks in join
+            scheduleInterruptAt("java.util.concurrent.StructuredTaskScopeImpl.join");
             try {
                 scope.join();
                 fail("join did not throw");
             } catch (InterruptedException expected) {
                 assertFalse(Thread.interrupted());   // interrupt status should be clear
-            } finally {
-                // let task continue
-                latch.countDown();
             }
-
-            // join should complete
-            scope.join();
-            assertEquals("foo", subtask.get());
         }
     }
 
     /**
-     * Test join when scope is shutdown.
+     * Test join when scope is cancelled.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testJoinWithShutdown1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            var interrupted = new CountDownLatch(1);
-            var finish = new CountDownLatch(1);
-
-            Subtask<String> subtask = scope.fork(() -> {
-                try {
-                    Thread.sleep(Duration.ofDays(1));
-                } catch (InterruptedException e) {
-                    interrupted.countDown();
-                }
-                finish.await();
-                return "foo";
-            });
-
-            scope.shutdown();      // should interrupt task
-
-            interrupted.await();
-
-            scope.join();
+    void testJoinWhenCancelled(ThreadFactory factory) throws Exception {
+        var countingThreadFactory = new CountingThreadFactory(factory);
+        var testJoiner = new CancelAfterOneJoiner<String>();
 
-            // signal task to finish
-            finish.countDown();
-        }
-    }
+        try (var scope = StructuredTaskScope.open(testJoiner,
+                    cf -> cf.withThreadFactory(countingThreadFactory))) {
 
-    /**
-     * Test shutdown when owner is blocked in join.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testJoinWithShutdown2(ThreadFactory factory) throws Exception {
-        class MyScope<T> extends StructuredTaskScope<T> {
-            MyScope(ThreadFactory factory) {
-                super(null, factory);
-            }
-            @Override
-            protected void handleComplete(Subtask<? extends T> subtask) {
-                shutdown();
-            }
-        }
+            // fork subtask, the scope should be cancelled when the subtask completes
+            var subtask1 = scope.fork(() -> "foo");
+            awaitCancelled(scope);
 
-        try (var scope = new MyScope<String>(factory)) {
-            Subtask<String> subtask1 = scope.fork(() -> {
-                Thread.sleep(Duration.ofMillis(50));
-                return "foo";
-            });
-            Subtask<String> subtask2 = scope.fork(() -> {
+            // fork second subtask, it should not run
+            var subtask2 = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return "bar";
             });
 
-            // join should wakeup when shutdown is called
             scope.join();
 
-            // task1 should have completed successfully
-            assertEquals(Subtask.State.SUCCESS, subtask1.state());
             assertEquals("foo", subtask1.get());
-            assertThrows(IllegalStateException.class, subtask1::exception);
-
-            // task2 result/exception not available
             assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
-            assertThrows(IllegalStateException.class, subtask2::get);
-            assertThrows(IllegalStateException.class, subtask2::exception);
         }
     }
 
@@ -506,325 +509,151 @@ protected void handleComplete(Subtask<? extends T> subtask) {
      */
     @Test
     void testJoinAfterClose() throws Exception {
-        try (var scope = new StructuredTaskScope()) {
-            scope.join();
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
             scope.close();
             assertThrows(IllegalStateException.class, () -> scope.join());
-            assertThrows(IllegalStateException.class, () -> scope.joinUntil(Instant.now()));
         }
     }
 
     /**
-     * Test joinUntil, subtasks finish before deadline expires.
+     * Test join with timeout, subtasks finish before timeout expires.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testJoinUntil1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
+    void testJoinWithTimeout1(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory)
+                        .withTimeout(Duration.ofDays(1)))) {
+
             Subtask<String> subtask = scope.fork(() -> {
-                try {
-                    Thread.sleep(Duration.ofSeconds(2));
-                } catch (InterruptedException e) { }
+                Thread.sleep(Duration.ofSeconds(1));
                 return "foo";
             });
 
-            long startMillis = millisTime();
-            scope.joinUntil(Instant.now().plusSeconds(30));
-            expectDuration(startMillis, /*min*/1900, /*max*/20_000);
+            scope.join();
+
+            assertFalse(scope.isCancelled());
             assertEquals("foo", subtask.get());
         }
     }
 
     /**
-     * Test joinUntil, deadline expires before subtasks finish.
+     * Test join with timeout, timeout expires before subtasks finish.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testJoinUntil2(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
+    void testJoinWithTimeout2(ThreadFactory factory) throws Exception {
+        long startMillis = millisTime();
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory)
+                        .withTimeout(Duration.ofSeconds(2)))) {
+
             Subtask<Void> subtask = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
             });
 
-            long startMillis = millisTime();
-            try {
-                scope.joinUntil(Instant.now().plusSeconds(2));
-            } catch (TimeoutException e) {
-                expectDuration(startMillis, /*min*/1900, /*max*/20_000);
-            }
+            assertThrows(TimeoutException.class, scope::join);
+            expectDuration(startMillis, /*min*/1900, /*max*/20_000);
+
+            assertTrue(scope.isCancelled());
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
         }
     }
 
     /**
-     * Test joinUntil many times.
+     * Test join with timeout that has already expired.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testJoinUntil3(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            Subtask<String> subtask = scope.fork(() -> {
-                Thread.sleep(Duration.ofDays(1));
-                return null;
-            });
-
-            for (int i = 0; i < 3; i++) {
-                try {
-                    scope.joinUntil(Instant.now().plusMillis(50));
-                    fail("joinUntil did not throw");
-                } catch (TimeoutException expected) {
-                    assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-                }
-            }
-        }
-    }
+    void testJoinWithTimeout3(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory)
+                        .withTimeout(Duration.ofSeconds(-1)))) {
 
-    /**
-     * Test joinUntil with a deadline that has already expired.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testJoinUntil4(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
             Subtask<Void> subtask = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
             });
 
-            // now
-            try {
-                scope.joinUntil(Instant.now());
-                fail("joinUntil did not throw");
-            } catch (TimeoutException expected) {
-                assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            }
+            assertThrows(TimeoutException.class, scope::join);
 
-            // in the past
-            try {
-                scope.joinUntil(Instant.now().minusSeconds(1));
-                fail("joinUntil did not throw");
-            } catch (TimeoutException expected) {
-                assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            }
+            assertTrue(scope.isCancelled());
+            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
         }
     }
 
     /**
-     * Test joinUntil with interrupt status set.
+     * Test that cancelling execution interrupts unfinished threads. This test uses
+     * a custom Joiner to cancel execution.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testInterruptJoinUntil1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            var latch = new CountDownLatch(1);
+    void testCancelInterruptsThreads2(ThreadFactory factory) throws Exception {
+        var testJoiner = new CancelAfterOneJoiner<String>();
 
-            Subtask<String> subtask = scope.fork(() -> {
-                latch.await();
-                return "foo";
+        try (var scope = StructuredTaskScope.open(testJoiner,
+                cf -> cf.withThreadFactory(factory))) {
+
+            // fork subtask1 that runs for a long time
+            var started = new CountDownLatch(1);
+            var interrupted = new CountDownLatch(1);
+            var subtask1 = scope.fork(() -> {
+                started.countDown();
+                try {
+                    Thread.sleep(Duration.ofDays(1));
+                } catch (InterruptedException e) {
+                    interrupted.countDown();
+                }
             });
+            started.await();
 
-            // joinUntil should throw
-            Thread.currentThread().interrupt();
-            try {
-                scope.joinUntil(Instant.now().plusSeconds(30));
-                fail("joinUntil did not throw");
-            } catch (InterruptedException expected) {
-                assertFalse(Thread.interrupted());   // interrupt status should be clear
-            } finally {
-                // let task continue
-                latch.countDown();
-            }
+            // fork subtask2, the scope should be cancelled when the subtask completes
+            var subtask2 = scope.fork(() -> "bar");
+            awaitCancelled(scope);
+
+            // subtask1 should be interrupted
+            interrupted.await();
 
-            // join should complete
             scope.join();
-            assertEquals("foo", subtask.get());
+            assertEquals(Subtask.State.UNAVAILABLE, subtask1.state());
+            assertEquals("bar", subtask2.get());
         }
     }
 
     /**
-     * Test interrupt of thread blocked in joinUntil.
+     * Test that timeout interrupts unfinished threads.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testInterruptJoinUntil2(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope(null, factory)) {
-            var latch = new CountDownLatch(1);
+    void testTimeoutInterruptsThreads(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory)
+                        .withTimeout(Duration.ofSeconds(2)))) {
 
-            Subtask<String> subtask = scope.fork(() -> {
-                latch.await();
-                return "foo";
+            var started = new AtomicBoolean();
+            var interrupted = new CountDownLatch(1);
+            Subtask<Void> subtask = scope.fork(() -> {
+                started.set(true);
+                try {
+                    Thread.sleep(Duration.ofDays(1));
+                } catch (InterruptedException e) {
+                    interrupted.countDown();
+                }
+                return null;
             });
 
-            // joinUntil should throw
-            scheduleInterruptAt("java.util.concurrent.StructuredTaskScope.joinUntil");
-            try {
-                scope.joinUntil(Instant.now().plusSeconds(30));
-                fail("joinUntil did not throw");
-            } catch (InterruptedException expected) {
-                assertFalse(Thread.interrupted());   // interrupt status should be clear
-            } finally {
-                // let task continue
-                latch.countDown();
+            // wait for scope to be cancelled by timeout
+            awaitCancelled(scope);
+
+            // if subtask started then it should be interrupted
+            if (started.get()) {
+                interrupted.await();
             }
 
-            // join should complete
-            scope.join();
-            assertEquals("foo", subtask.get());
-        }
-    }
-
-    /**
-     * Test that shutdown interrupts unfinished subtasks.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testShutdownInterruptsThreads1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            var interrupted = new AtomicBoolean();
-            var latch = new CountDownLatch(1);
-            var subtask = scope.fork(() -> {
-                try {
-                    Thread.sleep(Duration.ofDays(1));
-                } catch (InterruptedException e) {
-                    interrupted.set(true);
-                } finally {
-                    latch.countDown();
-                }
-                return null;
-            });
-
-            scope.shutdown();
-
-            // wait for task to complete
-            latch.await();
-            assertTrue(interrupted.get());
-
-            scope.join();
+            assertThrows(TimeoutException.class, scope::join);
 
-            // subtask result/exception not available
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            assertThrows(IllegalStateException.class, subtask::get);
-            assertThrows(IllegalStateException.class, subtask::exception);
-        }
-    }
-
-    /**
-     * Test that shutdown does not interrupt current thread.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testShutdownInterruptsThreads2(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            var interrupted = new AtomicBoolean();
-            var latch = new CountDownLatch(1);
-            var subtask = scope.fork(() -> {
-                try {
-                    scope.shutdown();
-                    interrupted.set(Thread.currentThread().isInterrupted());
-                } finally {
-                    latch.countDown();
-                }
-                return null;
-            });
-
-            // wait for task to complete
-            latch.await();
-            assertFalse(interrupted.get());
-
-            scope.join();
-        }
-    }
-
-    /**
-     * Test shutdown wakes join.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testShutdownWakesJoin(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            var latch = new CountDownLatch(1);
-            scope.fork(() -> {
-                Thread.sleep(Duration.ofMillis(100));  // give time for join to block
-                scope.shutdown();
-                latch.await();
-                return null;
-            });
-
-            scope.join();
-
-            // join woke up, allow task to complete
-            latch.countDown();
-        }
-    }
-
-    /**
-     * Test shutdown after scope is closed.
-     */
-    @Test
-    void testShutdownAfterClose() throws Exception {
-        try (var scope = new StructuredTaskScope<Object>()) {
-            scope.join();
-            scope.close();
-            assertThrows(IllegalStateException.class, scope::shutdown);
-        }
-    }
-
-    /**
-     * Test shutdown is confined to threads in the scope "tree".
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testShutdownConfined(ThreadFactory factory) throws Exception {
-        try (var scope1 = new StructuredTaskScope<Boolean>();
-             var scope2 = new StructuredTaskScope<Boolean>()) {
-
-            // thread in scope1 cannot shutdown scope2
-            Subtask<Boolean> subtask1 = scope1.fork(() -> {
-                assertThrows(WrongThreadException.class, scope2::shutdown);
-                return true;
-            });
-
-            // wait for task in scope1 to complete to avoid racing with task in scope2
-            while (subtask1.state() == Subtask.State.UNAVAILABLE) {
-                Thread.sleep(10);
-            }
-
-            // thread in scope2 shutdown scope1
-            Subtask<Boolean> subtask2 = scope2.fork(() -> {
-                scope1.shutdown();
-                return true;
-            });
-
-            scope2.join();
-            scope1.join();
-
-            assertTrue(subtask1.get());
-            assertTrue(subtask1.get());
-
-            // random thread cannot shutdown
-            try (var pool = Executors.newSingleThreadExecutor()) {
-                Future<Void> future = pool.submit(() -> {
-                    assertThrows(WrongThreadException.class, scope1::shutdown);
-                    assertThrows(WrongThreadException.class, scope2::shutdown);
-                    return null;
-                });
-                future.get();
-            }
-        }
-    }
-
-    /**
-     * Test isShutdown.
-     */
-    @Test
-    void testIsShutdown() {
-        try (var scope = new StructuredTaskScope<Object>()) {
-            assertFalse(scope.isShutdown());   // before shutdown
-            scope.shutdown();
-            assertTrue(scope.isShutdown());    // after shutdown
-            scope.close();
-            assertTrue(scope.isShutdown());    // after cose
         }
     }
 
@@ -833,47 +662,32 @@ void testIsShutdown() {
      */
     @Test
     void testCloseWithoutJoin1() {
-        try (var scope = new StructuredTaskScope<Object>()) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
             // do nothing
         }
     }
 
     /**
-     * Test close without join, unfinished subtasks.
+     * Test close without join, subtasks forked.
      */
     @ParameterizedTest
     @MethodSource("factories")
     void testCloseWithoutJoin2(ThreadFactory factory) {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             Subtask<String> subtask = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
             });
-            assertThrows(IllegalStateException.class, scope::close);
 
-            // subtask result/exception not available
-            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            assertThrows(IllegalStateException.class, subtask::get);
-            assertThrows(IllegalStateException.class, subtask::exception);
-        }
-    }
-
-    /**
-     * Test close without join, unfinished subtasks forked after join.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testCloseWithoutJoin3(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope(null, factory)) {
-            scope.fork(() -> "foo");
-            scope.join();
-
-            Subtask<String> subtask = scope.fork(() -> {
-                Thread.sleep(Duration.ofDays(1));
-                return null;
-            });
+            // first call to close should throw
             assertThrows(IllegalStateException.class, scope::close);
 
+            // subsequent calls to close should not throw
+            for (int i = 0; i < 3; i++) {
+                scope.close();
+            }
+
             // subtask result/exception not available
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             assertThrows(IllegalStateException.class, subtask::get);
@@ -887,7 +701,8 @@ void testCloseWithoutJoin3(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testCloseAfterJoinThrows(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>()) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
             var subtask = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
@@ -897,43 +712,18 @@ void testCloseAfterJoinThrows(ThreadFactory factory) throws Exception {
             Thread.currentThread().interrupt();
             assertThrows(InterruptedException.class, scope::join);
             assertThrows(IllegalStateException.class, subtask::get);
-        }
-    }
 
-    /**
-     * Test close after joinUntil throws. Close should not throw as join attempted.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testCloseAfterJoinUntilThrows(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>()) {
-            var subtask = scope.fork(() -> {
-                Thread.sleep(Duration.ofDays(1));
-                return null;
-            });
-
-            // joinUntil throws
-            assertThrows(TimeoutException.class, () -> scope.joinUntil(Instant.now()));
-            assertThrows(IllegalStateException.class, subtask::get);
-        }
+        }  // close should not throw
     }
 
     /**
-     * Test close is owner confined.
+     * Test close method is owner confined.
      */
     @ParameterizedTest
     @MethodSource("factories")
     void testCloseConfined(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Boolean>()) {
-
-            // attempt to close from thread in scope
-            Subtask<Boolean> subtask = scope.fork(() -> {
-                assertThrows(WrongThreadException.class, scope::close);
-                return true;
-            });
-
-            scope.join();
-            assertTrue(subtask.get());
+        try (var scope = StructuredTaskScope.open(Joiner.<Boolean>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
 
             // random thread cannot close scope
             try (var pool = Executors.newCachedThreadPool(factory)) {
@@ -943,6 +733,14 @@ void testCloseConfined(ThreadFactory factory) throws Exception {
                 });
                 future.get();
             }
+
+            // subtask cannot close
+            Subtask<Boolean> subtask = scope.fork(() -> {
+                assertThrows(WrongThreadException.class, scope::close);
+                return true;
+            });
+            scope.join();
+            assertTrue(subtask.get());
         }
     }
 
@@ -952,20 +750,30 @@ void testCloseConfined(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testInterruptClose1(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
+        var testJoiner = new CancelAfterOneJoiner<String>();
+        try (var scope = StructuredTaskScope.open(testJoiner,
+                cf -> cf.withThreadFactory(factory))) {
+
+            // fork first subtask, a straggler as it continues after being interrupted
+            var started = new CountDownLatch(1);
             var done = new AtomicBoolean();
             scope.fork(() -> {
+                started.countDown();
                 try {
                     Thread.sleep(Duration.ofDays(1));
                 } catch (InterruptedException e) {
-                    // interrupted by shutdown, expected
+                    // interrupted by cancel, expected
                 }
                 Thread.sleep(Duration.ofMillis(100)); // force close to wait
                 done.set(true);
                 return null;
             });
+            started.await();
+
+            // fork second subtask, the scope should be cancelled when this subtask completes
+            scope.fork(() -> "bar");
+            awaitCancelled(scope);
 
-            scope.shutdown();
             scope.join();
 
             // invoke close with interrupt status set
@@ -985,30 +793,43 @@ void testInterruptClose1(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testInterruptClose2(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            var done = new AtomicBoolean();
+        var testJoiner = new CancelAfterOneJoiner<String>();
+        try (var scope = StructuredTaskScope.open(testJoiner,
+                cf -> cf.withThreadFactory(factory))) {
+
             Thread mainThread = Thread.currentThread();
+
+            // fork first subtask, a straggler as it continues after being interrupted
+            var started = new CountDownLatch(1);
+            var done = new AtomicBoolean();
             scope.fork(() -> {
+                started.countDown();
                 try {
                     Thread.sleep(Duration.ofDays(1));
                 } catch (InterruptedException e) {
-                    // interrupted by shutdown, expected
+                    // interrupted by cancel, expected
                 }
 
                 // interrupt main thread when it blocks in close
-                interruptThreadAt(mainThread, "java.util.concurrent.StructuredTaskScope.close");
+                interruptThreadAt(mainThread, "java.util.concurrent.StructuredTaskScopeImpl.close");
 
                 Thread.sleep(Duration.ofMillis(100)); // force close to wait
                 done.set(true);
                 return null;
             });
+            started.await();
+
+            // fork second subtask, the scope should be cancelled when this subtask completes
+            scope.fork(() -> "bar");
+            awaitCancelled(scope);
 
-            scope.shutdown();   // interrupts task
             scope.join();
+
+            // main thread will be interrupted while blocked in close
             try {
                 scope.close();
             } finally {
-                assertTrue(Thread.interrupted()); // clear interrupt status
+                assertTrue(Thread.interrupted());   // clear interrupt status
                 assertTrue(done.get());
             }
         }
@@ -1019,247 +840,143 @@ void testInterruptClose2(ThreadFactory factory) throws Exception {
      */
     @Test
     void testCloseThrowsStructureViolation() throws Exception {
-        try (var scope1 = new StructuredTaskScope<Object>()) {
-            try (var scope2 = new StructuredTaskScope<Object>()) {
+        try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll())) {
+            try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll())) {
 
-                // join + close enclosing scope
-                scope1.join();
+                // close enclosing scope
                 try {
                     scope1.close();
                     fail("close did not throw");
                 } catch (StructureViolationException expected) { }
 
-                // underlying flock should be closed, fork should return a cancelled task
+                // underlying flock should be closed
                 var executed = new AtomicBoolean();
-                Subtask<Void> subtask = scope2.fork(() -> {
-                    executed.set(true);
-                    return null;
-                });
+                Subtask<?> subtask = scope2.fork(() -> executed.set(true));
                 assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
                 scope2.join();
                 assertFalse(executed.get());
+                assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             }
         }
     }
 
     /**
-     * A StructuredTaskScope that collects the subtasks notified to the handleComplete method.
-     */
-    private static class CollectAll<T> extends StructuredTaskScope<T> {
-        private final Set<Subtask<? extends T>> subtasks = ConcurrentHashMap.newKeySet();
-
-        CollectAll(ThreadFactory factory) {
-            super(null, factory);
-        }
-
-        @Override
-        protected void handleComplete(Subtask<? extends T> subtask) {
-            subtasks.add(subtask);
-        }
-
-        Set<Subtask<? extends T>> subtasks() {
-            return subtasks;
-        }
-
-        Subtask<? extends T> find(Callable<T> task) {
-            return subtasks.stream()
-                    .filter(h -> task.equals(h.task()))
-                    .findAny()
-                    .orElseThrow();
-        }
-    }
-
-    /**
-     * Test that handleComplete method is invoked for tasks that complete before shutdown.
+     * Test that isCancelled returns true after close.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testHandleCompleteBeforeShutdown(ThreadFactory factory) throws Exception {
-        try (var scope = new CollectAll<String>(factory)) {
-            Callable<String> task1 = () -> "foo";
-            Callable<String> task2 = () -> { throw new FooException(); };
-            scope.fork(task1);
-            scope.fork(task2);
-            scope.join();
-
-            var subtask1 = scope.find(task1);
-            assertEquals("foo", subtask1.get());
-
-            var subtask2 = scope.find(task2);
-            assertTrue(subtask2.exception() instanceof FooException);
+    @Test
+    void testIsCancelledAfterClose() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            assertFalse(scope.isCancelled());
+            scope.close();
+            assertTrue(scope.isCancelled());
         }
     }
 
     /**
-     * Test that handleComplete method is not invoked for tasks that finish after shutdown
-     * or are forked after shutdown.
+     * Test Joiner.onFork throwing exception.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testHandleCompleteAfterShutdown(ThreadFactory factory) throws Exception {
-        try (var scope = new CollectAll<String>(factory)) {
-            Callable<String> task1 = () -> {
-                try {
-                    Thread.sleep(Duration.ofDays(1));
-                } catch (InterruptedException ignore) { }
-                return "foo";
-            };
-            Callable<String> task2 = () -> {
-                Thread.sleep(Duration.ofDays(1));
-                return "bar";
-            };
-            Callable<String> task3 = () -> "baz";
-
-            // forked before shutdown, will complete after shutdown
-            var subtask1 = scope.fork(task1);
-            var subtask2 = scope.fork(task2);
-
-            scope.shutdown();
-
-            // forked after shutdown
-            var subtask3 = scope.fork(task3);
-
-            scope.join();
-
-            // handleComplete should not be called
-            for (int i = 0; i < 3; i++) {
-                assertEquals(0, scope.subtasks().size());
-                Thread.sleep(20);
+    @Test
+    void testOnForkThrows() throws Exception {
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public boolean onFork(Subtask<? extends String> subtask) {
+                throw new FooException();
             }
-
-            assertEquals(Subtask.State.UNAVAILABLE, subtask1.state());
-            assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
-            assertEquals(Subtask.State.UNAVAILABLE, subtask3.state());
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+        try (var scope = StructuredTaskScope.open(joiner)) {
+            assertThrows(FooException.class, () -> scope.fork(() -> "foo"));
         }
     }
 
     /**
-     * Test that the default handleComplete throws IllegalArgumentException if called
-     * with a running task.
+     * Test Joiner.onFork returning true to cancel execution.
      */
     @Test
-    void testHandleCompleteThrows() throws Exception {
-        class TestScope<T> extends StructuredTaskScope<T> {
-            protected void handleComplete(Subtask<? extends T> subtask) {
-                super.handleComplete(subtask);
+    void testOnForkCancelsExecution() throws Exception {
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public boolean onFork(Subtask<? extends String> subtask) {
+                return true;
             }
-        }
-
-        try (var scope = new TestScope<String>()) {
-            var subtask = scope.fork(() -> {
-                Thread.sleep(Duration.ofDays(1));
-                return "foo";
-            });
-
-            // running task
-            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
-            assertThrows(IllegalArgumentException.class, () -> scope.handleComplete(subtask));
-            scope.shutdown();
-
-            // null task
-            assertThrows(NullPointerException.class, () -> scope.handleComplete(null));
-
+            @Override
+            public Void result() {
+                return null;
+            }
+        };
+        try (var scope = StructuredTaskScope.open(joiner)) {
+            assertFalse(scope.isCancelled());
+            scope.fork(() -> "foo");
+            assertTrue(scope.isCancelled());
             scope.join();
         }
     }
 
     /**
-     * Test ensureOwnerAndJoined.
+     * Test Joiner.onComplete throwing exception causes UHE to be invoked.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testEnsureOwnerAndJoined(ThreadFactory factory) throws Exception {
-        class MyScope<T> extends StructuredTaskScope<T> {
-            MyScope(ThreadFactory factory) {
-                super(null, factory);
+    @Test
+    void testOnCompleteThrows() throws Exception {
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public boolean onComplete(Subtask<? extends String> subtask) {
+                throw new FooException();
             }
-            void invokeEnsureOwnerAndJoined() {
-                super.ensureOwnerAndJoined();
+            @Override
+            public Void result() {
+                return null;
             }
-        }
-
-        try (var scope = new MyScope<Boolean>(factory)) {
-            // owner thread, before join
-            scope.fork(() -> true);
-            assertThrows(IllegalStateException.class, () -> {
-                scope.invokeEnsureOwnerAndJoined();
-            });
-
-            // owner thread, after join
-            scope.join();
-            scope.invokeEnsureOwnerAndJoined();
-
-            // thread in scope cannot invoke ensureOwnerAndJoined
-            Subtask<Boolean> subtask = scope.fork(() -> {
-                assertThrows(WrongThreadException.class, () -> {
-                    scope.invokeEnsureOwnerAndJoined();
-                });
-                return true;
-            });
+        };
+        var excRef = new AtomicReference<Throwable>();
+        Thread.UncaughtExceptionHandler uhe = (t, e) -> excRef.set(e);
+        ThreadFactory factory = Thread.ofVirtual()
+                .uncaughtExceptionHandler(uhe)
+                .factory();
+        try (var scope = StructuredTaskScope.open(joiner, cf -> cf.withThreadFactory(factory))) {
+            scope.fork(() -> "foo");
             scope.join();
-            assertTrue(subtask.get());
-
-            // random thread cannot invoke ensureOwnerAndJoined
-            try (var pool = Executors.newSingleThreadExecutor()) {
-                Future<Void> future = pool.submit(() -> {
-                    assertThrows(WrongThreadException.class, () -> {
-                        scope.invokeEnsureOwnerAndJoined();
-                    });
-                    return null;
-                });
-                future.get();
-            }
+            assertInstanceOf(FooException.class, excRef.get());
         }
     }
 
     /**
-     * Test ensureOwnerAndJoined after the task scope has been closed.
+     * Test Joiner.onComplete returning true to cancel execution.
      */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testEnsureOwnerAndJoinedAfterClose(ThreadFactory factory) throws Exception {
-        class MyScope<T> extends StructuredTaskScope<T> {
-            MyScope(ThreadFactory factory) {
-                super(null, factory);
+    @Test
+    void testOnCompleteCancelsExecution() throws Exception {
+        var joiner = new Joiner<String, Void>() {
+            @Override
+            public boolean onComplete(Subtask<? extends String> subtask) {
+                return true;
             }
-            public void invokeEnsureOwnerAndJoined() {
-                super.ensureOwnerAndJoined();
+            @Override
+            public Void result() {
+                return null;
             }
-        }
-
-        // ensureOwnerAndJoined after close, join invoked
-        try (var scope = new MyScope<String>(factory)) {
+        };
+        try (var scope = StructuredTaskScope.open(joiner)) {
+            assertFalse(scope.isCancelled());
             scope.fork(() -> "foo");
+            awaitCancelled(scope);
             scope.join();
-            scope.close();
-            scope.invokeEnsureOwnerAndJoined();  // should not throw
-        }
-
-        // ensureOwnerAndJoined after close, join not invoked
-        try (var scope = new MyScope<String>(factory)) {
-            scope.fork(() -> "foo");
-            assertThrows(IllegalStateException.class, scope::close);
-            scope.invokeEnsureOwnerAndJoined();  // should not throw
         }
     }
 
-
     /**
      * Test toString.
      */
     @Test
     void testToString() throws Exception {
-        ThreadFactory factory = Thread.ofVirtual().factory();
-        try (var scope = new StructuredTaskScope<Object>("duke", factory)) {
-            // open
-            assertTrue(scope.toString().contains("duke"));
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withName("duke"))) {
 
-            // shutdown
-            scope.shutdown();
+            // open
             assertTrue(scope.toString().contains("duke"));
 
             // closed
-            scope.join();
             scope.close();
             assertTrue(scope.toString().contains("duke"));
         }
@@ -1271,19 +988,18 @@ void testToString() throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testSubtaskWhenSuccess(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            Callable<String> task = () -> "foo";
-            Subtask<String> subtask = scope.fork(task);
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+
+            Subtask<String> subtask = scope.fork(() -> "foo");
 
-            // before join, owner thread
-            assertEquals(task, subtask.task());
+            // before join
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
             scope.join();
 
             // after join
-            assertEquals(task, subtask.task());
             assertEquals(Subtask.State.SUCCESS, subtask.state());
             assertEquals("foo", subtask.get());
             assertThrows(IllegalStateException.class, subtask::exception);
@@ -1296,19 +1012,18 @@ void testSubtaskWhenSuccess(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testSubtaskWhenFailed(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<String>(null, factory)) {
-            Callable<String> task = () -> { throw new FooException(); };
-            Subtask<String> subtask = scope.fork(task);
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+
+            Subtask<String> subtask = scope.fork(() -> { throw new FooException(); });
 
-            // before join, owner thread
-            assertEquals(task, subtask.task());
+            // before join
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
 
             scope.join();
 
             // after join
-            assertEquals(task, subtask.task());
             assertEquals(Subtask.State.FAILED, subtask.state());
             assertThrows(IllegalStateException.class, subtask::get);
             assertTrue(subtask.exception() instanceof FooException);
@@ -1321,15 +1036,14 @@ void testSubtaskWhenFailed(ThreadFactory factory) throws Exception {
     @ParameterizedTest
     @MethodSource("factories")
     void testSubtaskWhenNotCompleted(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            Callable<Void> task = () -> {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+            Subtask<Void> subtask = scope.fork(() -> {
                 Thread.sleep(Duration.ofDays(1));
                 return null;
-            };
-            Subtask<Void> subtask = scope.fork(task);
+            });
 
             // before join
-            assertEquals(task, subtask.task());
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
@@ -1339,7 +1053,6 @@ void testSubtaskWhenNotCompleted(ThreadFactory factory) throws Exception {
             assertThrows(InterruptedException.class, scope::join);
 
             // after join
-            assertEquals(task, subtask.task());
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
@@ -1347,23 +1060,25 @@ void testSubtaskWhenNotCompleted(ThreadFactory factory) throws Exception {
     }
 
     /**
-     * Test Subtask when forked after shutdown.
+     * Test Subtask forked after execution cancelled.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testSubtaskWhenShutdown(ThreadFactory factory) throws Exception {
-        try (var scope = new StructuredTaskScope<Object>(null, factory)) {
-            Callable<Void> task = () -> {
-                Thread.sleep(Duration.ofDays(1));
-                return null;
-            };
+    void testSubtaskWhenCancelled(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(new CancelAfterOneJoiner<String>())) {
+            scope.fork(() -> "foo");
+            awaitCancelled(scope);
 
-            scope.shutdown();
+            var subtask = scope.fork(() -> "foo");
+
+            // before join
+            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+            assertThrows(IllegalStateException.class, subtask::get);
+            assertThrows(IllegalStateException.class, subtask::exception);
 
-            // fork after shutdown
-            Subtask<Void> subtask = scope.fork(task);
             scope.join();
-            assertEquals(task, subtask.task());
+
+            // after join
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             assertThrows(IllegalStateException.class, subtask::get);
             assertThrows(IllegalStateException.class, subtask::exception);
@@ -1375,221 +1090,466 @@ void testSubtaskWhenShutdown(ThreadFactory factory) throws Exception {
      */
     @Test
     void testSubtaskToString() throws Exception {
-        try (var scope = new StructuredTaskScope<Object>()) {
-            // success
-            var subtask1 = scope.fork(() -> "foo");
-            scope.join();
-            assertTrue(subtask1.toString().contains("Completed successfully"));
-
-            // failed
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            var latch = new CountDownLatch(1);
+            var subtask1 = scope.fork(() -> {
+                latch.await();
+                return "foo";
+            });
             var subtask2 = scope.fork(() -> { throw new FooException(); });
+
+            // subtask1 result is unavailable
+            assertTrue(subtask1.toString().contains("Unavailable"));
+            latch.countDown();
+
             scope.join();
-            assertTrue(subtask2.toString().contains("Failed"));
 
-            // not completed
-            Callable<Void> sleepForDay = () -> {
-                Thread.sleep(Duration.ofDays(1));
-                return null;
-            };
-            var subtask3 = scope.fork(sleepForDay);
-            assertTrue(subtask3.toString().contains("Unavailable"));
+            assertTrue(subtask1.toString().contains("Completed successfully"));
+            assertTrue(subtask2.toString().contains("Failed"));
+        }
+    }
 
-            scope.shutdown();
+    /**
+     * Test Joiner.allSuccessfulOrThrow() with no subtasks.
+     */
+    @Test
+    void testAllSuccessfulOrThrow1() throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.allSuccessfulOrThrow())) {
+            var subtasks = scope.join().toList();
+            assertTrue(subtasks.isEmpty());
+        }
+    }
 
-            // forked after shutdown
-            var subtask4 = scope.fork(sleepForDay);
-            assertTrue(subtask4.toString().contains("Unavailable"));
+    /**
+     * Test Joiner.allSuccessfulOrThrow() with subtasks that complete successfully.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testAllSuccessfulOrThrow2(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> "bar");
+            var subtasks = scope.join().toList();
+            assertEquals(List.of(subtask1, subtask2), subtasks);
+            assertEquals("foo", subtask1.get());
+            assertEquals("bar", subtask2.get());
+        }
+    }
 
-            scope.join();
+    /**
+     * Test Joiner.allSuccessfulOrThrow() with a subtask that complete successfully and
+     * a subtask that fails.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testAllSuccessfulOrThrow3(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allSuccessfulOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
+            scope.fork(() -> "foo");
+            scope.fork(() -> { throw new FooException(); });
+            try {
+                scope.join();
+            } catch (FailedException e) {
+                assertTrue(e.getCause() instanceof FooException);
+            }
         }
     }
 
     /**
-     * Test ShutdownOnSuccess with no completed tasks.
+     * Test Joiner.anySuccessfulResultOrThrow() with no subtasks.
      */
     @Test
-    void testShutdownOnSuccess1() throws Exception {
-        try (var scope = new ShutdownOnSuccess<Object>()) {
-            assertThrows(IllegalStateException.class, () -> scope.result());
-            assertThrows(IllegalStateException.class, () -> scope.result(e -> null));
+    void testAnySuccessfulResultOrThrow1() throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow())) {
+            try {
+                scope.join();
+            } catch (FailedException e) {
+                assertTrue(e.getCause() instanceof NoSuchElementException);
+            }
         }
     }
 
     /**
-     * Test ShutdownOnSuccess with tasks that complete successfully.
+     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that completes successfully.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnSuccess2(ThreadFactory factory) throws Exception {
-        try (var scope = new ShutdownOnSuccess<String>(null, factory)) {
+    void testAnySuccessfulResultOrThrow2(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
-            scope.join();  // ensures foo completes first
-            scope.fork(() -> "bar");
-            scope.join();
-            assertEquals("foo", scope.result());
-            assertEquals("foo", scope.result(e -> null));
+            String result = scope.join();
+            assertEquals("foo", result);
         }
     }
 
     /**
-     * Test ShutdownOnSuccess with a task that completes successfully with a null result.
+     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that completes successfully
+     * with a null result.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnSuccess3(ThreadFactory factory) throws Exception {
-        try (var scope = new ShutdownOnSuccess<Object>(null, factory)) {
+    void testAnySuccessfulResultOrThrow3(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> null);
-            scope.join();
-            assertNull(scope.result());
-            assertNull(scope.result(e -> null));
+            String result = scope.join();
+            assertNull(result);
         }
     }
 
     /**
-     * Test ShutdownOnSuccess with tasks that complete succcessfully and tasks that fail.
+     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that complete succcessfully
+     * and a subtask that fails.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnSuccess4(ThreadFactory factory) throws Exception {
-        try (var scope = new ShutdownOnSuccess<String>(null, factory)) {
+    void testAnySuccessfulResultOrThrow4(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>anySuccessfulResultOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
-            scope.fork(() -> { throw new ArithmeticException(); });
-            scope.join();
-            assertEquals("foo", scope.result());
-            assertEquals("foo", scope.result(e -> null));
+            scope.fork(() -> { throw new FooException(); });
+            String first = scope.join();
+            assertEquals("foo", first);
         }
     }
 
     /**
-     * Test ShutdownOnSuccess with a task that fails.
+     * Test Joiner.anySuccessfulResultOrThrow() with a subtask that fails.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnSuccess5(ThreadFactory factory) throws Exception {
-        try (var scope = new ShutdownOnSuccess<Object>(null, factory)) {
-            scope.fork(() -> { throw new ArithmeticException(); });
-            scope.join();
-            Throwable ex = assertThrows(ExecutionException.class, () -> scope.result());
-            assertTrue(ex.getCause() instanceof ArithmeticException);
-            ex = assertThrows(FooException.class, () -> scope.result(e -> new FooException(e)));
-            assertTrue(ex.getCause() instanceof ArithmeticException);
+    void testAnySuccessfulResultOrThrow5(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.anySuccessfulResultOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
+            scope.fork(() -> { throw new FooException(); });
+            Throwable ex = assertThrows(FailedException.class, scope::join);
+            assertTrue(ex.getCause() instanceof FooException);
+        }
+    }
+
+    /**
+     * Test Joiner.awaitAllSuccessfulOrThrow() with no subtasks.
+     */
+    @Test
+    void testAwaitSuccessfulOrThrow1() throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAllSuccessfulOrThrow())) {
+            var result = scope.join();
+            assertNull(result);
         }
     }
 
     /**
-     * Test ShutdownOnSuccess methods are confined to the owner.
+     * Test Joiner.awaitAllSuccessfulOrThrow() with subtasks that complete successfully.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnSuccessConfined(ThreadFactory factory) throws Exception {
-        // owner before join
-        try (var scope = new ShutdownOnSuccess<Boolean>(null, factory)) {
-            scope.fork(() -> { throw new FooException(); });
-            assertThrows(IllegalStateException.class, scope::result);
-            assertThrows(IllegalStateException.class, () -> {
-                scope.result(e -> new RuntimeException(e));
-            });
-            scope.join();
+    void testAwaitSuccessfulOrThrow2(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAllSuccessfulOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> "bar");
+            var result = scope.join();
+            assertNull(result);
+            assertEquals("foo", subtask1.get());
+            assertEquals("bar", subtask2.get());
         }
+    }
 
-        // non-owner
-        try (var scope = new ShutdownOnSuccess<Boolean>(null, factory)) {
-            Subtask<Boolean> subtask = scope.fork(() -> {
-                assertThrows(WrongThreadException.class, scope::result);
-                assertThrows(WrongThreadException.class, () -> {
-                    scope.result(e -> new RuntimeException(e));
-                });
-                return true;
-            });
-            scope.join();
-            assertTrue(subtask.get());
+    /**
+     * Test Joiner.awaitAllSuccessfulOrThrow() with a subtask that complete successfully and
+     * a subtask that fails.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testAwaitSuccessfulOrThrow3(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAllSuccessfulOrThrow(),
+                cf -> cf.withThreadFactory(factory))) {
+            scope.fork(() -> "foo");
+            scope.fork(() -> { throw new FooException(); });
+            try {
+                scope.join();
+            } catch (FailedException e) {
+                assertTrue(e.getCause() instanceof FooException);
+            }
         }
     }
 
     /**
-     * Test ShutdownOnFailure with no completed tasks.
+     * Test Joiner.awaitAll() with no subtasks.
      */
     @Test
-    void testShutdownOnFailure1() throws Throwable {
-        try (var scope = new ShutdownOnFailure()) {
-            assertTrue(scope.exception().isEmpty());
-            scope.throwIfFailed();
-            scope.throwIfFailed(e -> new FooException(e));
+    void testAwaitAll1() throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            var result = scope.join();
+            assertNull(result);
         }
     }
 
     /**
-     * Test ShutdownOnFailure with tasks that complete successfully.
+     * Test Joiner.awaitAll() with subtasks that complete successfully.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnFailure2(ThreadFactory factory) throws Throwable {
-        try (var scope = new ShutdownOnFailure(null, factory)) {
-            scope.fork(() -> "foo");
-            scope.fork(() -> "bar");
-            scope.join();
+    void testAwaitAll2(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> "bar");
+            var result = scope.join();
+            assertNull(result);
+            assertEquals("foo", subtask1.get());
+            assertEquals("bar", subtask2.get());
+        }
+    }
+
+    /**
+     * Test Joiner.awaitAll() with a subtask that complete successfully and a subtask
+     * that fails.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testAwaitAll3(ThreadFactory factory) throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>awaitAll(),
+                cf -> cf.withThreadFactory(factory))) {
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> { throw new FooException(); });
+            var result = scope.join();
+            assertNull(result);
+            assertEquals("foo", subtask1.get());
+            assertTrue(subtask2.exception() instanceof FooException);
+        }
+    }
 
-            // no exception
-            assertTrue(scope.exception().isEmpty());
-            scope.throwIfFailed();
-            scope.throwIfFailed(e -> new FooException(e));
+    /**
+     * Test Joiner.allUntil(Predicate) with no subtasks.
+     */
+    @Test
+    void testAllUntil1() throws Throwable {
+        try (var scope = StructuredTaskScope.open(Joiner.allUntil(s -> false))) {
+            var subtasks = scope.join();
+            assertEquals(0, subtasks.count());
         }
     }
 
     /**
-     * Test ShutdownOnFailure with tasks that complete succcessfully and tasks that fail.
+     * Test Joiner.allUntil(Predicate) with no cancellation.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnFailure3(ThreadFactory factory) throws Throwable {
-        try (var scope = new ShutdownOnFailure(null, factory)) {
+    void testAllUntil2(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> false),
+                cf -> cf.withThreadFactory(factory))) {
 
-            // one task completes successfully, the other fails
-            scope.fork(() -> "foo");
-            scope.fork(() -> { throw new ArithmeticException(); });
-            scope.join();
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> { throw new FooException(); });
 
-            Throwable ex = scope.exception().orElse(null);
-            assertTrue(ex instanceof ArithmeticException);
+            var subtasks = scope.join().toList();
+            assertEquals(2, subtasks.size());
+
+            assertSame(subtask1, subtasks.get(0));
+            assertSame(subtask2, subtasks.get(1));
+            assertEquals("foo", subtask1.get());
+            assertTrue(subtask2.exception() instanceof FooException);
+        }
+    }
 
-            ex = assertThrows(ExecutionException.class, () -> scope.throwIfFailed());
-            assertTrue(ex.getCause() instanceof ArithmeticException);
+    /**
+     * Test Joiner.allUntil(Predicate) with cancellation after one subtask completes.
+     */
+    @ParameterizedTest
+    @MethodSource("factories")
+    void testAllUntil3(ThreadFactory factory) throws Exception {
+        try (var scope = StructuredTaskScope.open(Joiner.<String>allUntil(s -> true),
+                cf -> cf.withThreadFactory(factory))) {
 
-            ex = assertThrows(FooException.class,
-                              () -> scope.throwIfFailed(e -> new FooException(e)));
-            assertTrue(ex.getCause() instanceof ArithmeticException);
+            var subtask1 = scope.fork(() -> "foo");
+            var subtask2 = scope.fork(() -> {
+                Thread.sleep(Duration.ofDays(1));
+                return "bar";
+            });
+
+            var subtasks = scope.join().toList();
+
+            assertEquals(2, subtasks.size());
+            assertSame(subtask1, subtasks.get(0));
+            assertSame(subtask2, subtasks.get(1));
+            assertEquals("foo", subtask1.get());
+            assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
         }
     }
 
     /**
-     * Test ShutdownOnFailure methods are confined to the owner.
+     * Test Joiner.allUntil(Predicate) with cancellation after serveral subtasks complete.
      */
     @ParameterizedTest
     @MethodSource("factories")
-    void testShutdownOnFailureConfined(ThreadFactory factory) throws Exception {
-        // owner before join
-        try (var scope = new ShutdownOnFailure(null, factory)) {
+    void testAllUntil4(ThreadFactory factory) throws Exception {
+
+        // cancel execution after two or more failures
+        class CancelAfterTwoFailures<T> implements Predicate<Subtask<? extends T>> {
+            final AtomicInteger failedCount = new AtomicInteger();
+            @Override
+            public boolean test(Subtask<? extends T> subtask) {
+                return subtask.state() == Subtask.State.FAILED
+                        && failedCount.incrementAndGet() >= 2;
+            }
+        }
+        var joiner = Joiner.allUntil(new CancelAfterTwoFailures<String>());
+
+        try (var scope = StructuredTaskScope.open(joiner)) {
+            int forkCount = 0;
+
+            // fork subtasks until execution cancelled
+            while (!scope.isCancelled()) {
+                scope.fork(() -> "foo");
+                scope.fork(() -> { throw new FooException(); });
+                forkCount += 2;
+                Thread.sleep(Duration.ofMillis(20));
+            }
+
+            var subtasks = scope.join().toList();
+            assertEquals(forkCount, subtasks.size());
+
+            long failedCount = subtasks.stream()
+                    .filter(s -> s.state() == Subtask.State.FAILED)
+                    .count();
+            assertTrue(failedCount >= 2);
+        }
+    }
+
+    /**
+     * Test Test Joiner.allUntil(Predicate) where the Predicate's test method throws.
+     */
+    @Test
+    void testAllUntil5() throws Exception {
+        var joiner = Joiner.allUntil(_ -> { throw new FooException(); });
+        var excRef = new AtomicReference<Throwable>();
+        Thread.UncaughtExceptionHandler uhe = (t, e) -> excRef.set(e);
+        ThreadFactory factory = Thread.ofVirtual()
+                .uncaughtExceptionHandler(uhe)
+                .factory();
+        try (var scope = StructuredTaskScope.open(joiner, cf -> cf.withThreadFactory(factory))) {
             scope.fork(() -> "foo");
-            assertThrows(IllegalStateException.class, scope::exception);
-            assertThrows(IllegalStateException.class, scope::throwIfFailed);
-            assertThrows(IllegalStateException.class, () -> {
-                scope.throwIfFailed(e -> new RuntimeException(e));
-            });
             scope.join();
+            assertInstanceOf(FooException.class, excRef.get());
         }
+    }
 
-        // non-owner
-        try (var scope = new ShutdownOnFailure(null, factory)) {
-            Subtask<Boolean> subtask = scope.fork(() -> {
-                assertThrows(WrongThreadException.class, scope::exception);
-                assertThrows(WrongThreadException.class, scope::throwIfFailed);
-                assertThrows(WrongThreadException.class, () -> {
-                    scope.throwIfFailed(e -> new RuntimeException(e));
-                });
-                return true;
+    /**
+     * Test Joiner default methods.
+     */
+    @Test
+    void testJoinerDefaultMethods() throws Exception {
+        try (var scope = StructuredTaskScope.open(new CancelAfterOneJoiner<String>())) {
+
+            // need subtasks to test default methods
+            var subtask1 = scope.fork(() -> "foo");
+            awaitCancelled(scope);
+            var subtask2 = scope.fork(() -> "bar");
+            scope.join();
+
+            assertEquals(Subtask.State.SUCCESS, subtask1.state());
+            assertEquals(Subtask.State.UNAVAILABLE, subtask2.state());
+
+            // Joiner that does not override default methods
+            Joiner<Object, Void> joiner = () -> null;
+            assertThrows(NullPointerException.class, () -> joiner.onFork(null));
+            assertThrows(NullPointerException.class, () -> joiner.onComplete(null));
+            assertThrows(IllegalArgumentException.class, () -> joiner.onFork(subtask1));
+            assertFalse(joiner.onFork(subtask2));
+            assertFalse(joiner.onComplete(subtask1));
+            assertThrows(IllegalArgumentException.class, () -> joiner.onComplete(subtask2));
+        }
+    }
+
+    /**
+     * Test Joiners onFork/onComplete methods with a subtask in an unexpected state.
+     */
+    @Test
+    void testJoinersWithUnavailableResult() throws Exception {
+        try (var scope = StructuredTaskScope.open()) {
+            var done = new CountDownLatch(1);
+            var subtask = scope.fork(() -> {
+                done.await();
+                return null;
             });
+
+            // onComplete with uncompleted task should throw IAE
+            assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.allSuccessfulOrThrow().onComplete(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.anySuccessfulResultOrThrow().onComplete(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.awaitAllSuccessfulOrThrow().onComplete(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.awaitAll().onComplete(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.allUntil(_ -> false).onComplete(subtask));
+
+            done.countDown();
             scope.join();
-            assertTrue(subtask.get());
+
+            // onFork with completed task should throw IAE
+            assertEquals(Subtask.State.SUCCESS, subtask.state());
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.allSuccessfulOrThrow().onFork(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.anySuccessfulResultOrThrow().onFork(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.awaitAllSuccessfulOrThrow().onFork(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.awaitAll().onFork(subtask));
+            assertThrows(IllegalArgumentException.class,
+                    () -> Joiner.allUntil(_ -> false).onFork(subtask));
+        }
+
+    }
+
+    /**
+     * Test the Configuration function apply method throwing an exception.
+     */
+    @Test
+    void testConfigFunctionThrows() throws Exception {
+        assertThrows(FooException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(),
+                                               cf -> { throw new FooException(); }));
+    }
+
+    /**
+     * Test Configuration equals/hashCode/toString
+     */
+    @Test
+    void testConfigMethods() throws Exception {
+        Function<Configuration, Configuration> testConfig = cf -> {
+            var name = "duke";
+            var threadFactory = Thread.ofPlatform().factory();
+            var timeout = Duration.ofSeconds(10);
+
+            assertEquals(cf, cf);
+            assertEquals(cf.withName(name), cf.withName(name));
+            assertEquals(cf.withThreadFactory(threadFactory), cf.withThreadFactory(threadFactory));
+            assertEquals(cf.withTimeout(timeout), cf.withTimeout(timeout));
+
+            assertNotEquals(cf, cf.withName(name));
+            assertNotEquals(cf, cf.withThreadFactory(threadFactory));
+            assertNotEquals(cf, cf.withTimeout(timeout));
+
+            assertEquals(cf.withName(name).hashCode(), cf.withName(name).hashCode());
+            assertEquals(cf.withThreadFactory(threadFactory).hashCode(),
+                    cf.withThreadFactory(threadFactory).hashCode());
+            assertEquals(cf.withTimeout(timeout).hashCode(), cf.withTimeout(timeout).hashCode());
+
+            assertTrue(cf.withName(name).toString().contains(name));
+            assertTrue(cf.withThreadFactory(threadFactory).toString().contains(threadFactory.toString()));
+            assertTrue(cf.withTimeout(timeout).toString().contains(timeout.toString()));
+
+            return cf;
+        };
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), testConfig)) {
+            // do nothing
         }
     }
 
@@ -1598,24 +1558,124 @@ void testShutdownOnFailureConfined(ThreadFactory factory) throws Exception {
      */
     @Test
     void testNulls() throws Exception {
-        assertThrows(NullPointerException.class, () -> new StructuredTaskScope("", null));
-        try (var scope = new StructuredTaskScope<Object>()) {
-            assertThrows(NullPointerException.class, () -> scope.fork(null));
-            assertThrows(NullPointerException.class, () -> scope.joinUntil(null));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(null));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(null, cf -> cf));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(), null));
+
+        assertThrows(NullPointerException.class, () -> Joiner.allUntil(null));
+
+        // fork
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            assertThrows(NullPointerException.class, () -> scope.fork((Callable<Object>) null));
+            assertThrows(NullPointerException.class, () -> scope.fork((Runnable) null));
+        }
+
+        // Configuration and withXXX methods
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(), cf -> null));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName(null)));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withThreadFactory(null)));
+        assertThrows(NullPointerException.class,
+                () -> StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withTimeout(null)));
+
+        // Joiner.onFork/onComplete
+        assertThrows(NullPointerException.class,
+                () -> Joiner.awaitAllSuccessfulOrThrow().onFork(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.awaitAllSuccessfulOrThrow().onComplete(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.awaitAll().onFork(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.awaitAll().onComplete(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.allSuccessfulOrThrow().onFork(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.allSuccessfulOrThrow().onComplete(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.anySuccessfulResultOrThrow().onFork(null));
+        assertThrows(NullPointerException.class,
+                () -> Joiner.anySuccessfulResultOrThrow().onComplete(null));
+    }
+
+    /**
+     * ThreadFactory that counts usage.
+     */
+    private static class CountingThreadFactory implements ThreadFactory {
+        final ThreadFactory delegate;
+        final AtomicInteger threadCount = new AtomicInteger();
+        CountingThreadFactory(ThreadFactory delegate) {
+            this.delegate = delegate;
+        }
+        @Override
+        public Thread newThread(Runnable task) {
+            threadCount.incrementAndGet();
+            return delegate.newThread(task);
+        }
+        int threadCount() {
+            return threadCount.get();
         }
+    }
 
-        assertThrows(NullPointerException.class, () -> new ShutdownOnSuccess<Object>("", null));
-        try (var scope = new ShutdownOnSuccess<Object>()) {
-            assertThrows(NullPointerException.class, () -> scope.fork(null));
-            assertThrows(NullPointerException.class, () -> scope.joinUntil(null));
-            assertThrows(NullPointerException.class, () -> scope.result(null));
+    /**
+     * A joiner that counts that counts the number of subtasks that are forked and the
+     * number of subtasks that complete.
+     */
+    private static class CountingJoiner<T> implements Joiner<T, Void> {
+        final AtomicInteger onForkCount = new AtomicInteger();
+        final AtomicInteger onCompleteCount = new AtomicInteger();
+        @Override
+        public boolean onFork(Subtask<? extends T> subtask) {
+            onForkCount.incrementAndGet();
+            return false;
         }
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            onCompleteCount.incrementAndGet();
+            return false;
+        }
+        @Override
+        public Void result() {
+            return null;
+        }
+        int onForkCount() {
+            return onForkCount.get();
+        }
+        int onCompleteCount() {
+            return onCompleteCount.get();
+        }
+    }
 
-        assertThrows(NullPointerException.class, () -> new ShutdownOnFailure("", null));
-        try (var scope = new ShutdownOnFailure()) {
-            assertThrows(NullPointerException.class, () -> scope.fork(null));
-            assertThrows(NullPointerException.class, () -> scope.joinUntil(null));
-            assertThrows(NullPointerException.class, () -> scope.throwIfFailed(null));
+    /**
+     * A joiner that cancels execution when a subtask completes. It also keeps a count
+     * of the number of subtasks that are forked and the number of subtasks that complete.
+     */
+    private static class CancelAfterOneJoiner<T> implements Joiner<T, Void> {
+        final AtomicInteger onForkCount = new AtomicInteger();
+        final AtomicInteger onCompleteCount = new AtomicInteger();
+        @Override
+        public boolean onFork(Subtask<? extends T> subtask) {
+            onForkCount.incrementAndGet();
+            return false;
+        }
+        @Override
+        public boolean onComplete(Subtask<? extends T> subtask) {
+            onCompleteCount.incrementAndGet();
+            return true;
+        }
+        @Override
+        public Void result() {
+            return null;
+        }
+        int onForkCount() {
+            return onForkCount.get();
+        }
+        int onCompleteCount() {
+            return onCompleteCount.get();
         }
     }
 
@@ -1651,6 +1711,15 @@ private long expectDuration(long start, long min, long max) {
         return duration;
     }
 
+    /**
+     * Wait for the given scope to be cancelled.
+     */
+    private static void awaitCancelled(StructuredTaskScope<?, ?> scope) throws InterruptedException {
+        while (!scope.isCancelled()) {
+            Thread.sleep(Duration.ofMillis(20));
+        }
+    }
+
     /**
      * Interrupts a thread when it waits (timed or untimed) at location "{@code c.m}".
      * {@code c} is the fully qualified class name and {@code m} is the method name.
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java
index 99129ae3972..a2de88f329b 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredThreadDumpTest.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/StructuredThreadDumpTest.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
@@ -31,6 +31,7 @@
  */
 
 import java.util.concurrent.StructuredTaskScope;
+import java.util.concurrent.StructuredTaskScope.Joiner;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
@@ -53,8 +54,7 @@ class StructuredThreadDumpTest {
      */
     @Test
     void testTree() throws Exception {
-        ThreadFactory factory = Thread.ofVirtual().factory();
-        try (var scope = new StructuredTaskScope<>("scope", factory)) {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope"))) {
             Thread thread1 = fork(scope, "child-scope-A");
             Thread thread2 = fork(scope, "child-scope-B");
             try {
@@ -83,7 +83,8 @@ void testTree() throws Exception {
                 container1.findThread(thread2.threadId()).orElseThrow();
 
             } finally {
-                scope.shutdown();
+                LockSupport.unpark(thread1);
+                LockSupport.unpark(thread2);
                 scope.join();
             }
         }
@@ -95,11 +96,10 @@ void testTree() throws Exception {
      */
     @Test
     void testNested() throws Exception {
-        ThreadFactory factory = Thread.ofVirtual().factory();
-        try (var scope1 = new StructuredTaskScope<>("scope-A", factory)) {
+        try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope-A"))) {
             Thread thread1 = fork(scope1);
 
-            try (var scope2 = new StructuredTaskScope<>("scope-B", factory)) {
+            try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope-B"))) {
                 Thread thread2 = fork(scope2);
                 try {
                     ThreadDump threadDump = threadDump();
@@ -127,11 +127,11 @@ void testNested() throws Exception {
                     container2.findThread(thread2.threadId()).orElseThrow();
 
                 } finally {
-                    scope2.shutdown();
+                    LockSupport.unpark(thread2);
                     scope2.join();
                 }
             } finally {
-                scope1.shutdown();
+                LockSupport.unpark(thread1);
                 scope1.join();
             }
         }
@@ -160,7 +160,7 @@ private static ThreadDump threadDump() throws IOException {
      * Forks a subtask in the given scope that parks, returning the Thread that executes
      * the subtask.
      */
-    private static Thread fork(StructuredTaskScope<Object> scope) throws Exception {
+    private static Thread fork(StructuredTaskScope<Object, Void> scope) throws Exception {
         var ref = new AtomicReference<Thread>();
         scope.fork(() -> {
             ref.set(Thread.currentThread());
@@ -178,16 +178,15 @@ private static Thread fork(StructuredTaskScope<Object> scope) throws Exception {
      * Forks a subtask in the given scope. The subtask creates a new child scope with
      * the given name, then parks. This method returns Thread that executes the subtask.
      */
-    private static Thread fork(StructuredTaskScope<Object> scope,
+    private static Thread fork(StructuredTaskScope<Object, Void> scope,
                                String childScopeName) throws Exception {
         var ref = new AtomicReference<Thread>();
         scope.fork(() -> {
-            ThreadFactory factory = Thread.ofVirtual().factory();
-            try (var childScope = new StructuredTaskScope<Object>(childScopeName, factory)) {
+            try (var childScope = StructuredTaskScope.open(Joiner.awaitAll(),
+                    cf -> cf.withName(childScopeName))) {
                 ref.set(Thread.currentThread());
                 LockSupport.park();
             }
-            return null;
         });
         Thread thread;
         while ((thread = ref.get()) == null) {
diff --git a/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java b/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java
index dcb375a80a5..61783d3e34b 100644
--- a/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.java
+++ b/test/jdk/java/util/concurrent/StructuredTaskScope/WithScopedValue.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
@@ -31,6 +31,7 @@
 
 import java.util.concurrent.StructuredTaskScope;
 import java.util.concurrent.StructuredTaskScope.Subtask;
+import java.util.concurrent.StructuredTaskScope.Joiner;
 import java.util.concurrent.StructureViolationException;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -55,7 +56,8 @@ private static Stream<ThreadFactory> factories() {
     void testForkInheritsScopedValue1(ThreadFactory factory) throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
         String value = ScopedValue.where(name, "x").call(() -> {
-            try (var scope = new StructuredTaskScope<String>(null, factory)) {
+            try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
+                                                      cf -> cf.withThreadFactory(factory))) {
                 Subtask<String> subtask = scope.fork(() -> {
                     return name.get(); // child should read "x"
                 });
@@ -74,9 +76,11 @@ void testForkInheritsScopedValue1(ThreadFactory factory) throws Exception {
     void testForkInheritsScopedValue2(ThreadFactory factory) throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
         String value = ScopedValue.where(name, "x").call(() -> {
-            try (var scope1 = new StructuredTaskScope<String>(null, factory)) {
+            try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(),
+                                                       cf -> cf.withThreadFactory(factory))) {
                 Subtask<String> subtask1 = scope1.fork(() -> {
-                    try (var scope2 = new StructuredTaskScope<String>(null, factory)) {
+                    try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(),
+                                                               cf -> cf.withThreadFactory(factory))) {
                         Subtask<String> subtask2 = scope2.fork(() -> {
                             return name.get(); // grandchild should read "x"
                         });
@@ -99,13 +103,15 @@ void testForkInheritsScopedValue2(ThreadFactory factory) throws Exception {
     void testForkInheritsScopedValue3(ThreadFactory factory) throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
         String value = ScopedValue.where(name, "x").call(() -> {
-            try (var scope1 = new StructuredTaskScope<String>(null, factory)) {
+            try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(),
+                                                       cf -> cf.withThreadFactory(factory))) {
                 Subtask<String> subtask1 = scope1.fork(() -> {
                     assertEquals(name.get(), "x");  // child should read "x"
 
                     // rebind name to "y"
                     String grandchildValue = ScopedValue.where(name, "y").call(() -> {
-                        try (var scope2 = new StructuredTaskScope<String>(null, factory)) {
+                        try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(),
+                                                                   cf -> cf.withThreadFactory(factory))) {
                             Subtask<String> subtask2 = scope2.fork(() -> {
                                 return name.get(); // grandchild should read "y"
                             });
@@ -131,19 +137,19 @@ void testForkInheritsScopedValue3(ThreadFactory factory) throws Exception {
     void testStructureViolation1() throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
         class Box {
-            StructuredTaskScope<Object> scope;
+            StructuredTaskScope<Object, Void> scope;
         }
         var box = new Box();
         try {
             try {
                 ScopedValue.where(name, "x").run(() -> {
-                    box.scope = new StructuredTaskScope<Object>();
+                    box.scope = StructuredTaskScope.open(Joiner.awaitAll());
                 });
                 fail();
             } catch (StructureViolationException expected) { }
 
             // underlying flock should be closed and fork should fail to start a thread
-            StructuredTaskScope<Object> scope = box.scope;
+            StructuredTaskScope<Object, Void> scope = box.scope;
             AtomicBoolean ran = new AtomicBoolean();
             Subtask<Object> subtask = scope.fork(() -> {
                 ran.set(true);
@@ -153,7 +159,7 @@ class Box {
             assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
             assertFalse(ran.get());
         } finally {
-            StructuredTaskScope<Object> scope = box.scope;
+            StructuredTaskScope<Object, Void> scope = box.scope;
             if (scope != null) {
                 scope.close();
             }
@@ -166,8 +172,8 @@ class Box {
     @Test
     void testStructureViolation2() throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
-        try (var scope = new StructuredTaskScope<String>()) {
-                ScopedValue.where(name, "x").run(() -> {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            ScopedValue.where(name, "x").run(() -> {
                 assertThrows(StructureViolationException.class, scope::close);
             });
         }
@@ -179,8 +185,8 @@ void testStructureViolation2() throws Exception {
     @Test
     void testStructureViolation3() throws Exception {
         ScopedValue<String> name = ScopedValue.newInstance();
-        try (var scope = new StructuredTaskScope<String>()) {
-                ScopedValue.where(name, "x").run(() -> {
+        try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+            ScopedValue.where(name, "x").run(() -> {
                 assertThrows(StructureViolationException.class,
                         () -> scope.fork(() -> "foo"));
             });
@@ -197,8 +203,8 @@ void testStructureViolation4() throws Exception {
 
         // rebind
         ScopedValue.where(name1, "x").run(() -> {
-            try (var scope = new StructuredTaskScope<String>()) {
-                    ScopedValue.where(name1, "y").run(() -> {
+            try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+                ScopedValue.where(name1, "y").run(() -> {
                     assertThrows(StructureViolationException.class,
                             () -> scope.fork(() -> "foo"));
                 });
@@ -207,8 +213,8 @@ void testStructureViolation4() throws Exception {
 
         // new binding
         ScopedValue.where(name1, "x").run(() -> {
-            try (var scope = new StructuredTaskScope<String>()) {
-                    ScopedValue.where(name2, "y").run(() -> {
+            try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
+                ScopedValue.where(name2, "y").run(() -> {
                     assertThrows(StructureViolationException.class,
                             () -> scope.fork(() -> "foo"));
                 });
diff --git a/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java b/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java
index ecf78b5ab7f..5f6533777cf 100644
--- a/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.java
+++ b/test/jdk/javax/security/auth/Subject/CallAsWithScopedValue.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
@@ -65,7 +65,8 @@ public static void main(String[] args) throws Exception {
 
         // Observable in structured concurrency in SV mode, but not in ACC mode
         Subject.callAs(subject, () -> {
-            try (var scope = new StructuredTaskScope<>()) {
+            var joiner = StructuredTaskScope.Joiner.awaitAll();
+            try (var scope = StructuredTaskScope.open(joiner)) {
                 scope.fork(() -> check(3, Subject.current(), usv ? "Duke" : null));
                 scope.join();
             }
diff --git a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
index e6bc191a3ba..ebc718d2203 100644
--- a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
+++ b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.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
@@ -750,51 +750,6 @@ void testWakeupAwaitAll2(ThreadFactory factory) throws Exception {
         }
     }
 
-    /**
-     * Test wakeup is flock confined.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testWakeupConfined(ThreadFactory factory) throws Exception {
-        try (var flock = ThreadFlock.open(null)) {
-            // thread in flock
-            testWakeupConfined(flock, task -> {
-                Thread thread = factory.newThread(task);
-                return flock.start(thread);
-            });
-
-            // thread not in flock
-            testWakeupConfined(flock, task -> {
-                Thread thread = factory.newThread(task);
-                thread.start();
-                return thread;
-            });
-        }
-    }
-
-    /**
-     * Test that a thread created with the given factory cannot wakeup the
-     * given flock.
-     */
-    private void testWakeupConfined(ThreadFlock flock,
-                                    Function<Runnable, Thread> factory) throws Exception {
-        var exception = new AtomicReference<Exception>();
-        Thread thread = factory.apply(() -> {
-            try {
-                flock.wakeup();
-            } catch (Exception e) {
-                exception.set(e);
-            }
-        });
-        thread.join();
-        Throwable cause = exception.get();
-        if (flock.containsThread(thread)) {
-            assertNull(cause);
-        } else {
-            assertTrue(cause instanceof WrongThreadException);
-        }
-    }
-
     /**
      * Test close with no threads running.
      */
@@ -933,59 +888,6 @@ void testInterruptClose2(ThreadFactory factory) {
         assertNull(exception.get());
     }
 
-    /**
-     * Test shutdown is confined to threads in the flock.
-     */
-    @ParameterizedTest
-    @MethodSource("factories")
-    void testShutdownConfined(ThreadFactory factory) throws Exception {
-        try (var flock = ThreadFlock.open(null)) {
-            // thread in flock
-            testShutdownConfined(flock, task -> {
-                Thread thread = factory.newThread(task);
-                return flock.start(thread);
-            });
-
-            // thread in flock
-            try (var flock2 = ThreadFlock.open(null)) {
-                testShutdownConfined(flock, task -> {
-                    Thread thread = factory.newThread(task);
-                    return flock2.start(thread);
-                });
-            }
-
-            // thread not contained in flock
-            testShutdownConfined(flock, task -> {
-                Thread thread = factory.newThread(task);
-                thread.start();
-                return thread;
-            });
-        }
-    }
-
-    /**
-     * Test that a thread created with the given factory cannot shut down the
-     * given flock.
-     */
-    private void testShutdownConfined(ThreadFlock flock,
-                                      Function<Runnable, Thread> factory) throws Exception {
-        var exception = new AtomicReference<Exception>();
-        Thread thread = factory.apply(() -> {
-            try {
-                flock.shutdown();
-            } catch (Exception e) {
-                exception.set(e);
-            }
-        });
-        thread.join();
-        Throwable cause = exception.get();
-        if (flock.containsThread(thread)) {
-            assertNull(cause);
-        } else {
-            assertTrue(cause instanceof WrongThreadException);
-        }
-    }
-
     /**
      * Test that closing an enclosing thread flock closes a nested thread flocks.
      */

From 8ffc121b2fc6353d5419c2437d92911baac16b6b Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Tue, 13 May 2025 09:42:44 +0000
Subject: [PATCH 421/901] 8356774: AArch64: StubGen final stubs buffer too
 small for ZGC on Cavium CPU

Reviewed-by: shade
---
 src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
index 425146e6bf4..e0ca01ba6ce 100644
--- a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
@@ -109,7 +109,7 @@
                                     do_arch_blob,                       \
                                     do_arch_entry,                      \
                                     do_arch_entry_init)                 \
-  do_arch_blob(final, 20000 ZGC_ONLY(+60000))                           \
+  do_arch_blob(final, 20000 ZGC_ONLY(+85000))                           \
   do_stub(final, copy_byte_f)                                           \
   do_arch_entry(aarch64, final, copy_byte_f, copy_byte_f,               \
                 copy_byte_f)                                            \

From 38bb8adf4f632b08af15f2d8530b35f05f86a020 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Tue, 13 May 2025 09:59:49 +0000
Subject: [PATCH 422/901] 8354941: Build failure with glibc 2.42 due to uabs()
 name collision

Reviewed-by: kbarrett, thartmann
---
 src/hotspot/cpu/aarch64/assembler_aarch64.cpp      | 2 +-
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp      | 2 +-
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +-
 src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp  | 4 ++--
 src/hotspot/cpu/riscv/assembler_riscv.hpp          | 2 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp      | 4 ++--
 src/hotspot/share/opto/mulnode.cpp                 | 4 ++--
 src/hotspot/share/opto/subnode.cpp                 | 4 ++--
 src/hotspot/share/utilities/globalDefinitions.hpp  | 8 ++++----
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
index b03344f2d80..ec4f2a0d6c3 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
@@ -456,7 +456,7 @@ void Assembler::bang_stack_with_offset(int offset) { Unimplemented(); }
 
 bool asm_util::operand_valid_for_immediate_bits(int64_t imm, unsigned nbits) {
   guarantee(nbits == 8 || nbits == 12, "invalid nbits value");
-  uint64_t uimm = (uint64_t)uabs((jlong)imm);
+  uint64_t uimm = (uint64_t)g_uabs((jlong)imm);
   if (uimm < (UCONST64(1) << nbits))
     return true;
   if (uimm < (UCONST64(1) << (2 * nbits))
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 5c02e30963e..aee4a30b649 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -932,7 +932,7 @@ class Assembler : public AbstractAssembler {
   static const uint64_t branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
 
   static bool reachable_from_branch_at(address branch, address target) {
-    return uabs(target - branch) < branch_range;
+    return g_uabs(target - branch) < branch_range;
   }
 
   // Unconditional branch (immediate)
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index cf347768de3..967c8710411 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -3277,7 +3277,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im
   if (fits) {
     (this->*insn1)(Rd, Rn, imm);
   } else {
-    if (uabs(imm) < (1 << 24)) {
+    if (g_uabs(imm) < (1 << 24)) {
        (this->*insn1)(Rd, Rn, imm & -(1 << 12));
        (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1));
     } else {
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index f5567dcc03a..0843489900c 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -1162,7 +1162,7 @@ class StubGenerator: public StubCodeGenerator {
 
   void copy_memory_small(DecoratorSet decorators, BasicType type, Register s, Register d, Register count, int step) {
     bool is_backwards = step < 0;
-    size_t granularity = uabs(step);
+    size_t granularity = g_uabs(step);
     int direction = is_backwards ? -1 : 1;
 
     Label Lword, Lint, Lshort, Lbyte;
@@ -1221,7 +1221,7 @@ class StubGenerator: public StubCodeGenerator {
                    Register s, Register d, Register count, int step) {
     copy_direction direction = step < 0 ? copy_backwards : copy_forwards;
     bool is_backwards = step < 0;
-    unsigned int granularity = uabs(step);
+    unsigned int granularity = g_uabs(step);
     const Register t0 = r3, t1 = r4;
 
     // <= 80 (or 96 for SIMD) bytes do inline. Direction doesn't matter because we always
diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index caa465aed67..1495e604086 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -3824,7 +3824,7 @@ enum Nf {
   static const unsigned long branch_range = 1 * M;
 
   static bool reachable_from_branch_at(address branch, address target) {
-    return uabs(target - branch) < branch_range;
+    return g_uabs(target - branch) < branch_range;
   }
 
   // Decode the given instruction, checking if it's a 16-bit compressed
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 7187315f008..e7cae74dab5 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -886,7 +886,7 @@ class StubGenerator: public StubCodeGenerator {
 
   void copy_memory_v(Register s, Register d, Register count, int step) {
     bool is_backward = step < 0;
-    int granularity = uabs(step);
+    int granularity = g_uabs(step);
 
     const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17;
     assert_different_registers(s, d, cnt, vl, tmp1, tmp2);
@@ -948,7 +948,7 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     bool is_backwards = step < 0;
-    int granularity = uabs(step);
+    int granularity = g_uabs(step);
 
     const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17, tmp5 = x14, tmp6 = x13;
     const Register gct1 = x28, gct2 = x29, gct3 = t2;
diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index 72562a657ea..4691c6a45b0 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -258,7 +258,7 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   // Check for negative constant; if so negate the final result
   bool sign_flip = false;
 
-  unsigned int abs_con = uabs(con);
+  unsigned int abs_con = g_uabs(con);
   if (abs_con != (unsigned int)con) {
     sign_flip = true;
   }
@@ -493,7 +493,7 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 
   // Check for negative constant; if so negate the final result
   bool sign_flip = false;
-  julong abs_con = uabs(con);
+  julong abs_con = g_uabs(con);
   if (abs_con != (julong)con) {
     sign_flip = true;
   }
diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index d385e8b41aa..6451d90eee2 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -1943,14 +1943,14 @@ const Type* AbsNode::Value(PhaseGVN* phase) const {
   case Type::Int: {
     const TypeInt* ti = t1->is_int();
     if (ti->is_con()) {
-      return TypeInt::make(uabs(ti->get_con()));
+      return TypeInt::make(g_uabs(ti->get_con()));
     }
     break;
   }
   case Type::Long: {
     const TypeLong* tl = t1->is_long();
     if (tl->is_con()) {
-      return TypeLong::make(uabs(tl->get_con()));
+      return TypeLong::make(g_uabs(tl->get_con()));
     }
     break;
   }
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index cc5f3ebb291..4ec61babec3 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -1118,7 +1118,7 @@ inline bool is_even(intx x) { return !is_odd(x); }
 
 // abs methods which cannot overflow and so are well-defined across
 // the entire domain of integer types.
-static inline unsigned int uabs(unsigned int n) {
+static inline unsigned int g_uabs(unsigned int n) {
   union {
     unsigned int result;
     int value;
@@ -1127,7 +1127,7 @@ static inline unsigned int uabs(unsigned int n) {
   if (value < 0) result = 0-result;
   return result;
 }
-static inline julong uabs(julong n) {
+static inline julong g_uabs(julong n) {
   union {
     julong result;
     jlong value;
@@ -1136,8 +1136,8 @@ static inline julong uabs(julong n) {
   if (value < 0) result = 0-result;
   return result;
 }
-static inline julong uabs(jlong n) { return uabs((julong)n); }
-static inline unsigned int uabs(int n) { return uabs((unsigned int)n); }
+static inline julong g_uabs(jlong n) { return g_uabs((julong)n); }
+static inline unsigned int g_uabs(int n) { return g_uabs((unsigned int)n); }
 
 // "to" should be greater than "from."
 inline size_t byte_size(void* from, void* to) {

From 85db4631ae5208fba74fa8b8638c32d4e42d3268 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Tue, 13 May 2025 10:37:57 +0000
Subject: [PATCH 423/901] 8350203: [macos] Newlines and tabs are not ignored
 when drawing text to a Graphics2D object 8353187: Test
 TextLayout/TestControls fails on macOS: width of 0x9, 0xa, 0xd isn't zero

Reviewed-by: honkar, aivanov, prr
---
 .../classes/sun/font/CCharToGlyphMapper.java  |  10 +-
 .../DrawString/IgnoredWhitespaceTest.java     | 187 ++++++++++++++++++
 2 files changed, 195 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java

diff --git a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
index a919fcbbd88..5eb05a9f93e 100644
--- a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
+++ b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
@@ -92,7 +92,7 @@ public synchronized int charToGlyph(char unicode) {
         int glyph = cache.get(unicode);
         if (glyph != 0) return glyph;
 
-        if (FontUtilities.isDefaultIgnorable(unicode)) {
+        if (FontUtilities.isDefaultIgnorable(unicode) || isIgnorableWhitespace(unicode)) {
             glyph = INVISIBLE_GLYPH_ID;
         } else {
             final char[] unicodeArray = new char[] { unicode };
@@ -130,6 +130,12 @@ public synchronized void charsToGlyphs(int count, int[] unicodes, int[] glyphs)
         }
     }
 
+    // Matches behavior in e.g. CMap.getControlCodeGlyph(int, boolean)
+    // and RasterPrinterJob.removeControlChars(String)
+    private static boolean isIgnorableWhitespace(int code) {
+        return code == 0x0009 || code == 0x000a || code == 0x000d;
+    }
+
     // This mapper returns either the glyph code, or if the character can be
     // replaced on-the-fly using CoreText substitution; the negative unicode
     // value. If this "glyph code int" is treated as an opaque code, it will
@@ -253,7 +259,7 @@ public synchronized void get(int count, char[] indices, int[] values)
                         values[i+1] = INVISIBLE_GLYPH_ID;
                         i++;
                     }
-                } else if (FontUtilities.isDefaultIgnorable(code)) {
+                } else if (FontUtilities.isDefaultIgnorable(code) || isIgnorableWhitespace(code)) {
                     values[i] = INVISIBLE_GLYPH_ID;
                     put(code, INVISIBLE_GLYPH_ID);
                 } else {
diff --git a/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java b/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java
new file mode 100644
index 00000000000..e7c38f1c16e
--- /dev/null
+++ b/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java
@@ -0,0 +1,187 @@
+/*
+ * 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 8350203
+ * @summary Confirm that a few special whitespace characters are ignored.
+ */
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.font.FontRenderContext;
+import java.awt.font.TextAttribute;
+import java.awt.image.BufferedImage;
+import java.text.AttributedString;
+import java.util.Map;
+
+public class IgnoredWhitespaceTest {
+
+    public static void main(String[] args) throws Exception {
+        BufferedImage image = new BufferedImage(600, 600, BufferedImage.TYPE_BYTE_BINARY);
+        Graphics2D g2d = image.createGraphics();
+
+        Font font = new Font(Font.DIALOG, Font.PLAIN, 40);
+        test(image, g2d, font);
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        test(image, g2d, font);
+
+        g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+        test(image, g2d, font);
+
+        Font kerningFont = font.deriveFont(Map.of(TextAttribute.KERNING, TextAttribute.KERNING_ON));
+        test(image, g2d, kerningFont);
+
+        Font physicalFont = getPhysicalFont(40);
+        if (physicalFont != null) {
+            test(image, g2d, physicalFont);
+        }
+
+        g2d.dispose();
+    }
+
+    private static void test(BufferedImage image, Graphics2D g2d, Font font) {
+        test(image, g2d, font, "XXXXX", "\t\t\t\t\tXXXXX");
+        test(image, g2d, font, "XXXXX", "\tX\tX\tX\tX\tX\t");
+        test(image, g2d, font, "XXXXX", "\r\r\r\r\rXXXXX");
+        test(image, g2d, font, "XXXXX", "\rX\rX\rX\rX\rX\r");
+        test(image, g2d, font, "XXXXX", "\n\n\n\n\nXXXXX");
+        test(image, g2d, font, "XXXXX", "\nX\nX\nX\nX\nX\n");
+    }
+
+    private static void test(BufferedImage image, Graphics2D g2d, Font font, String reference, String text) {
+        g2d.setFont(font);
+        FontRenderContext frc = g2d.getFontRenderContext();
+        int w = image.getWidth();
+        int h = image.getHeight();
+        int x = w / 2;
+        int y = h / 2;
+
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        g2d.drawString(reference, x, y);
+        Rectangle expected = findTextBoundingBox(image);
+
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        g2d.drawString(text, x, y);
+        Rectangle actual = findTextBoundingBox(image);
+        assertEqual(expected, actual, text);
+
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        g2d.drawString(new AttributedString(text, Map.of(TextAttribute.FONT, font)).getIterator(), x, y);
+        actual = findTextBoundingBox(image);
+        assertEqual(expected, actual, text);
+
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        g2d.drawChars(text.toCharArray(), 0, text.length(), x, y);
+        actual = findTextBoundingBox(image);
+        assertEqual(expected, actual, text);
+
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        g2d.drawGlyphVector(font.createGlyphVector(frc, text), x, y);
+        actual = findTextBoundingBox(image);
+        assertEqual(expected, actual, text);
+    }
+
+    private static void assertEqual(Rectangle r1, Rectangle r2, String text) {
+        if (!r1.equals(r2)) {
+            String escaped = text.replace("\r", "\\r")
+                                 .replace("\n", "\\n")
+                                 .replace("\t", "\\t");
+            String msg = String.format("for text '%s': %s != %s", escaped, r1.toString(), r2.toString());
+            throw new RuntimeException(msg);
+        }
+    }
+
+    private static Font getPhysicalFont(int size) {
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        String[] names = ge.getAvailableFontFamilyNames();
+        for (String n : names) {
+            switch (n) {
+                case Font.DIALOG:
+                case Font.DIALOG_INPUT:
+                case Font.SERIF:
+                case Font.SANS_SERIF:
+                case Font.MONOSPACED:
+                     continue;
+                default:
+                    Font f = new Font(n, Font.PLAIN, size);
+                    if (f.canDisplayUpTo("AZaz09") == -1) {
+                        return f;
+                    }
+            }
+        }
+        return null;
+    }
+
+    private static Rectangle findTextBoundingBox(BufferedImage image) {
+        int minX = Integer.MAX_VALUE;
+        int minY = Integer.MAX_VALUE;
+        int maxX = Integer.MIN_VALUE;
+        int maxY = Integer.MIN_VALUE;
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        int[] rowPixels = new int[width];
+        for (int y = 0; y < height; y++) {
+            image.getRGB(0, y, width, 1, rowPixels, 0, width);
+            for (int x = 0; x < width; x++) {
+                boolean white = (rowPixels[x] == -1);
+                if (!white) {
+                    if (x < minX) {
+                        minX = x;
+                    }
+                    if (y < minY) {
+                        minY = y;
+                    }
+                    if (x > maxX) {
+                        maxX = x;
+                    }
+                    if (y > maxY) {
+                        maxY = y;
+                    }
+                }
+            }
+        }
+
+        if (minX != Integer.MAX_VALUE) {
+            return new Rectangle(minX, minY, maxX - minX, maxY - minY);
+        } else {
+            return null;
+        }
+    }
+}

From 7dcc386af9831bea21def6763512c9fba13b5064 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Tue, 13 May 2025 11:08:16 +0000
Subject: [PATCH 424/901] 8354024: [JMH] Create ephemeral
 UnixDomainSocketAddress provider with thread-safe close semantics

Reviewed-by: michaelm
---
 .../net/SocketChannelConnectionSetup.java     | 58 ++++++-------------
 .../java/net/UnixSocketChannelReadWrite.java  | 20 +++----
 2 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
index 505e124e43e..652ed134c39 100644
--- a/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
+++ b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
@@ -27,9 +27,9 @@
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.runner.Runner;
@@ -49,55 +49,31 @@
 public class SocketChannelConnectionSetup {
 
     private ServerSocketChannel ssc;
-    private SocketChannel s1, s2;
-
-    private static volatile String tempDir;
-    private static final AtomicInteger count = new AtomicInteger(0);
-    private volatile Path socket;
-
-    @Param({"inet", "unix"})
-    private volatile String family;
 
-    static {
-        try {
-            Path p = Files.createTempDirectory("readWriteTest");
-            tempDir = p.toString();
-        } catch (IOException e) {
-            tempDir = null;
-        }
-    }
+    private Path sscFilePath;
 
-    private ServerSocketChannel getServerSocketChannel() throws IOException {
-        if (family.equals("inet"))
-            return getInetServerSocketChannel();
-        else if (family.equals("unix"))
-            return getUnixServerSocketChannel();
-        throw new InternalError();
-    }
-
-
-    private ServerSocketChannel getInetServerSocketChannel() throws IOException {
-        return ServerSocketChannel.open().bind(null);
-    }
+    private SocketChannel s1, s2;
 
-    private ServerSocketChannel getUnixServerSocketChannel() throws IOException {
-        int next = count.incrementAndGet();
-        socket = Paths.get(tempDir, Integer.toString(next));
-        UnixDomainSocketAddress addr = UnixDomainSocketAddress.of(socket);
-        return ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(addr);
-    }
+    @Param({"INET", "UNIX"})
+    private String family;
 
     @Setup(Level.Trial)
     public void beforeRun() throws IOException {
-        ssc = getServerSocketChannel();
+        StandardProtocolFamily typedFamily = StandardProtocolFamily.valueOf(family);
+        ssc = ServerSocketChannel.open(typedFamily).bind(null);
+        // Record the UDS file path right after binding, as the socket may be
+        // closed later due to a failure, and subsequent calls to `getPath()`
+        // will throw.
+        sscFilePath = ssc.getLocalAddress() instanceof UnixDomainSocketAddress udsChannel
+                ? udsChannel.getPath()
+                : null;
     }
 
     @TearDown(Level.Trial)
-    public void afterRun() throws IOException {
+    public void afterRun() throws Exception {
         ssc.close();
-        if (family.equals("unix")) {
-            Files.deleteIfExists(socket);
-            Files.deleteIfExists(Path.of(tempDir));
+        if (sscFilePath != null) {
+            Files.delete(sscFilePath);
         }
     }
 
diff --git a/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java b/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
index 64b44446bcd..ffcb2739b0d 100644
--- a/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
+++ b/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
@@ -47,23 +47,18 @@
 public class UnixSocketChannelReadWrite {
 
     private ServerSocketChannel ssc;
+    private Path sscFilePath;
     private SocketChannel s1, s2;
     private ReadThread rt;
     private ByteBuffer bb = ByteBuffer.allocate(1);
 
-    private volatile Path socket;
-
-    private ServerSocketChannel getServerSocketChannel() throws IOException {
-        socket = Files.createTempDirectory(UnixSocketChannelReadWrite.class.getSimpleName()).resolve("sock");
-        UnixDomainSocketAddress addr = UnixDomainSocketAddress.of(socket);
-        ServerSocketChannel c = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
-        c.bind(addr);
-        return c;
-    }
-
     @Setup(Level.Trial)
     public void beforeRun() throws IOException {
-        ssc = getServerSocketChannel();
+        ssc = ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(null);
+        // Record the UDS file path right after binding, as the socket may be
+        // closed later due to a failure, and subsequent calls to `getPath()`
+        // will throw.
+        sscFilePath = ((UnixDomainSocketAddress) ssc.getLocalAddress()).getPath();
         s1 = SocketChannel.open(ssc.getLocalAddress());
         s2 = ssc.accept();
 
@@ -79,8 +74,7 @@ public void afterRun() throws IOException, InterruptedException {
         s1.close();
         s2.close();
         ssc.close();
-        Files.delete(socket);
-        Files.delete(socket.getParent());
+        Files.delete(sscFilePath);
         rt.join();
     }
 

From d930dc5df376268d3d96ac5dcddc47496459f5c0 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Tue, 13 May 2025 11:26:36 +0000
Subject: [PATCH 425/901] 8356275: TestCodeEntryAlignment fails with "Alignment
 must be <= CodeEntryAlignment"

Reviewed-by: thartmann
---
 src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
index 432f9277549..9f0232075cd 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
@@ -1511,7 +1511,7 @@ void MacroAssembler::sha512_update_ni_x1(Register arg_hash, Register arg_msg, Re
     //ymm13 = A B E F, ymm14 = C D G H
 
     lea(rax, ExternalAddress(K512_W));
-    align(32);
+    align(CodeEntryAlignment);
     bind(block_loop);
     vmovdqu(xmm11, xmm13);//ABEF
     vmovdqu(xmm12, xmm14);//CDGH

From 14d372b15bb49a98b0fc802e142fc76598123821 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 13 May 2025 12:40:14 +0000
Subject: [PATCH 426/901] 8356816: JFR: Move printing of metadata into separate
 class

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/tool/Metadata.java       |   9 +-
 .../jdk/jfr/internal/tool/MetadataWriter.java | 172 ++++++++++++++++++
 .../jdk/jfr/internal/tool/PrettyWriter.java   | 134 --------------
 3 files changed, 176 insertions(+), 139 deletions(-)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tool/MetadataWriter.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java
index 9d9d14c7e6a..e456b14362f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Metadata.java
@@ -201,8 +201,7 @@ public void execute(Deque<String> options) throws UserSyntaxException, UserDataE
         }
 
         try (PrintWriter pw = new PrintWriter(System.out, false, UTF_8)) {
-            PrettyWriter prettyWriter = new PrettyWriter(pw);
-            prettyWriter.setShowIds(showIds);
+            MetadataWriter metadataWriter = new MetadataWriter(pw, showIds);
             if (!filters.isEmpty()) {
                 filter =  Filters.matchAny(filters);
             }
@@ -215,14 +214,14 @@ public void execute(Deque<String> options) throws UserSyntaxException, UserDataE
                     if (Type.SUPER_TYPE_EVENT.equals(type.getSuperType())) {
                         EventType et = PrivateAccess.getInstance().newEventType((PlatformEventType) type);
                         if (filter.test(et)) {
-                            prettyWriter.printType(type);
+                            metadataWriter.printType(type);
                         }
                     }
                 } else {
-                    prettyWriter.printType(type);
+                    metadataWriter.printType(type);
                 }
             }
-            prettyWriter.flush(true);
+            metadataWriter.flush(true);
             pw.flush();
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/MetadataWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/MetadataWriter.java
new file mode 100644
index 00000000000..4dd76b0312b
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/MetadataWriter.java
@@ -0,0 +1,172 @@
+/*
+ * 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tool;
+
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.StringJoiner;
+import jdk.jfr.AnnotationElement;
+import jdk.jfr.Name;
+import jdk.jfr.ValueDescriptor;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.PrivateAccess;
+
+/**
+* Print event metadata in a human-readable format.
+*/
+final class MetadataWriter extends StructuredWriter {
+    private final boolean showIds;
+
+    public MetadataWriter(PrintWriter p, boolean showIds) {
+        super(p);
+        this.showIds = showIds;
+    }
+
+    public void printType(Type t) {
+        if (showIds) {
+            print("// id: ");
+            println(String.valueOf(t.getId()));
+        }
+        int commentIndex = t.getName().length() + 10;
+        String typeName = t.getName();
+        int index = typeName.lastIndexOf(".");
+        if (index != -1) {
+            println("@Name(\"" + typeName + "\")");
+        }
+        printAnnotations(commentIndex, t.getAnnotationElements());
+        print("class " + typeName.substring(index + 1));
+        String superType = t.getSuperType();
+        if (superType != null) {
+            print(" extends " + superType);
+        }
+        println(" {");
+        indent();
+        boolean first = true;
+        for (ValueDescriptor v : t.getFields()) {
+            printField(commentIndex, v, first);
+            first = false;
+        }
+        retract();
+        println("}");
+        println();
+    }
+
+    private void printField(int commentIndex, ValueDescriptor v, boolean first) {
+        if (!first) {
+            println();
+        }
+        printAnnotations(commentIndex, v.getAnnotationElements());
+        printIndent();
+        Type vType = PrivateAccess.getInstance().getType(v);
+        if (Type.SUPER_TYPE_SETTING.equals(vType.getSuperType())) {
+            print("static ");
+        }
+        print(makeSimpleType(v.getTypeName()));
+        if (v.isArray()) {
+            print("[]");
+        }
+        print(" ");
+        print(v.getName());
+        print(";");
+        printCommentRef(commentIndex, v.getTypeId());
+    }
+
+    private void printCommentRef(int commentIndex, long typeId) {
+        if (showIds) {
+            int column = getColumn();
+            if (column > commentIndex) {
+                print("  ");
+            } else {
+                while (column < commentIndex) {
+                    print(" ");
+                    column++;
+                }
+            }
+            println(" // id=" + typeId);
+        } else {
+            println();
+        }
+    }
+
+    private void printAnnotations(int commentIndex, List<AnnotationElement> annotations) {
+        for (AnnotationElement a : annotations) {
+            if (!Name.class.getName().equals(a.getTypeName())) {
+                printIndent();
+                print("@");
+                print(makeSimpleType(a.getTypeName()));
+                List<ValueDescriptor> vs = a.getValueDescriptors();
+                if (!vs.isEmpty()) {
+                    printAnnotation(a);
+                    printCommentRef(commentIndex, a.getTypeId());
+                } else {
+                    println();
+                }
+            }
+        }
+    }
+
+    private void printAnnotation(AnnotationElement a) {
+        StringJoiner sj = new StringJoiner(", ", "(", ")");
+        List<ValueDescriptor> vs = a.getValueDescriptors();
+        for (ValueDescriptor v : vs) {
+            Object o = a.getValue(v.getName());
+            if (vs.size() == 1 && v.getName().equals("value")) {
+                sj.add(textify(o));
+            } else {
+                sj.add(v.getName() + "=" + textify(o));
+            }
+        }
+        print(sj.toString());
+    }
+
+    private String textify(Object o) {
+        if (o.getClass().isArray()) {
+            Object[] array = (Object[]) o;
+            if (array.length == 1) {
+                return quoteIfNeeded(array[0]);
+            }
+            StringJoiner s = new StringJoiner(", ", "{", "}");
+            for (Object ob : array) {
+                s.add(quoteIfNeeded(ob));
+            }
+            return s.toString();
+        } else {
+            return quoteIfNeeded(o);
+        }
+    }
+
+    private String quoteIfNeeded(Object o) {
+        if (o instanceof String) {
+            return "\"" + o + "\"";
+        } else {
+            return String.valueOf(o);
+        }
+    }
+
+    private String makeSimpleType(String typeName) {
+        int index = typeName.lastIndexOf(".");
+        return typeName.substring(index + 1);
+    }
+}
\ No newline at end of file
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
index a03c2630dd8..faa4a8ec23a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
@@ -33,11 +33,9 @@
 import java.util.List;
 import java.util.StringJoiner;
 
-import jdk.jfr.AnnotationElement;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Frequency;
 import jdk.jfr.MemoryAddress;
-import jdk.jfr.Name;
 import jdk.jfr.Percentage;
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.consumer.RecordedClass;
@@ -48,7 +46,6 @@
 import jdk.jfr.consumer.RecordedObject;
 import jdk.jfr.consumer.RecordedStackTrace;
 import jdk.jfr.consumer.RecordedThread;
-import jdk.jfr.internal.PrivateAccess;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.ValueFormatter;
 
@@ -63,7 +60,6 @@ public final class PrettyWriter extends EventPrintWriter {
     private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss.SSS (yyyy-MM-dd)");
     private static final Long ZERO = 0L;
     private final boolean showExact;
-    private boolean showIds;
     private RecordedEvent currentEvent;
 
     public PrettyWriter(PrintWriter destination, boolean showExact) {
@@ -83,132 +79,6 @@ protected void print(List<RecordedEvent> events) {
         }
     }
 
-    public void printType(Type t) {
-        if (showIds) {
-            print("// id: ");
-            println(String.valueOf(t.getId()));
-        }
-        int commentIndex = t.getName().length() + 10;
-        String typeName = t.getName();
-        int index = typeName.lastIndexOf(".");
-        if (index != -1) {
-            println("@Name(\"" + typeName + "\")");
-        }
-        printAnnotations(commentIndex, t.getAnnotationElements());
-        print("class " + typeName.substring(index + 1));
-        String superType = t.getSuperType();
-        if (superType != null) {
-            print(" extends " + superType);
-        }
-        println(" {");
-        indent();
-        boolean first = true;
-        for (ValueDescriptor v : t.getFields()) {
-            printField(commentIndex, v, first);
-            first = false;
-        }
-        retract();
-        println("}");
-        println();
-    }
-
-    private void printField(int commentIndex, ValueDescriptor v, boolean first) {
-        if (!first) {
-            println();
-        }
-        printAnnotations(commentIndex, v.getAnnotationElements());
-        printIndent();
-        Type vType = PrivateAccess.getInstance().getType(v);
-        if (Type.SUPER_TYPE_SETTING.equals(vType.getSuperType())) {
-            print("static ");
-        }
-        print(makeSimpleType(v.getTypeName()));
-        if (v.isArray()) {
-            print("[]");
-        }
-        print(" ");
-        print(v.getName());
-        print(";");
-        printCommentRef(commentIndex, v.getTypeId());
-    }
-
-    private void printCommentRef(int commentIndex, long typeId) {
-        if (showIds) {
-            int column = getColumn();
-            if (column > commentIndex) {
-                print("  ");
-            } else {
-                while (column < commentIndex) {
-                    print(" ");
-                    column++;
-                }
-            }
-            println(" // id=" + typeId);
-        } else {
-            println();
-        }
-    }
-
-    private void printAnnotations(int commentIndex, List<AnnotationElement> annotations) {
-        for (AnnotationElement a : annotations) {
-            if (!Name.class.getName().equals(a.getTypeName())) {
-                printIndent();
-                print("@");
-                print(makeSimpleType(a.getTypeName()));
-                List<ValueDescriptor> vs = a.getValueDescriptors();
-                if (!vs.isEmpty()) {
-                    printAnnotation(a);
-                    printCommentRef(commentIndex, a.getTypeId());
-                } else {
-                    println();
-                }
-            }
-        }
-    }
-
-    private void printAnnotation(AnnotationElement a) {
-        StringJoiner sj = new StringJoiner(", ", "(", ")");
-        List<ValueDescriptor> vs = a.getValueDescriptors();
-        for (ValueDescriptor v : vs) {
-            Object o = a.getValue(v.getName());
-            if (vs.size() == 1 && v.getName().equals("value")) {
-                sj.add(textify(o));
-            } else {
-                sj.add(v.getName() + "=" + textify(o));
-            }
-        }
-        print(sj.toString());
-    }
-
-    private String textify(Object o) {
-        if (o.getClass().isArray()) {
-            Object[] array = (Object[]) o;
-            if (array.length == 1) {
-                return quoteIfNeeded(array[0]);
-            }
-            StringJoiner s = new StringJoiner(", ", "{", "}");
-            for (Object ob : array) {
-                s.add(quoteIfNeeded(ob));
-            }
-            return s.toString();
-        } else {
-            return quoteIfNeeded(o);
-        }
-    }
-
-    private String quoteIfNeeded(Object o) {
-        if (o instanceof String) {
-            return "\"" + o + "\"";
-        } else {
-            return String.valueOf(o);
-        }
-    }
-
-    private String makeSimpleType(String typeName) {
-        int index = typeName.lastIndexOf(".");
-        return typeName.substring(index + 1);
-    }
-
     public void print(RecordedEvent event) {
         currentEvent = event;
         print(event.getEventType().getName(), " ");
@@ -604,8 +474,4 @@ private void formatMemory(long value, boolean bytesUnit, boolean frequency) {
             println(ValueFormatter.formatBits(value));
         }
     }
-
-    public void setShowIds(boolean showIds) {
-        this.showIds = showIds;
-    }
 }

From de1064472180d06693d742a754a8fdc927d367f5 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 13 May 2025 12:46:52 +0000
Subject: [PATCH 427/901] 8356631: OopHandle replacement methods should not be
 called on empty handles

Reviewed-by: coleenp, eosterlund
---
 src/hotspot/share/oops/oopHandle.inline.hpp  | 4 +++-
 src/hotspot/share/oops/weakHandle.inline.hpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/oops/oopHandle.inline.hpp b/src/hotspot/share/oops/oopHandle.inline.hpp
index be5078704a4..77dd1790159 100644
--- a/src/hotspot/share/oops/oopHandle.inline.hpp
+++ b/src/hotspot/share/oops/oopHandle.inline.hpp
@@ -70,12 +70,13 @@ inline void OopHandle::release(OopStorage* storage) {
 }
 
 inline void OopHandle::replace(oop obj) {
-  assert(!is_empty(), "should not use replace");
+  assert(!is_empty(), "Must not use replace on empty handle");
   assert(oopDesc::is_oop_or_null(obj), "Should be oop: " PTR_FORMAT, p2i(obj));
   NativeAccess<>::oop_store(_obj, obj);
 }
 
 inline oop OopHandle::xchg(oop new_value) {
+  assert(!is_empty(), "Must not use xchg on empty handle");
   assert(oopDesc::is_oop_or_null(new_value), "Should be oop: " PTR_FORMAT, p2i(new_value));
   oop obj = NativeAccess<MO_SEQ_CST>::oop_atomic_xchg(_obj, new_value);
   assert(oopDesc::is_oop_or_null(obj), "Should be oop: " PTR_FORMAT, p2i(obj));
@@ -83,6 +84,7 @@ inline oop OopHandle::xchg(oop new_value) {
 }
 
 inline oop OopHandle::cmpxchg(oop old_value, oop new_value) {
+  assert(!is_empty(), "Must not use cmpxchg on empty handle");
   assert(oopDesc::is_oop_or_null(new_value), "Should be oop: " PTR_FORMAT, p2i(new_value));
   oop obj = NativeAccess<MO_SEQ_CST>::oop_atomic_cmpxchg(_obj, old_value, new_value);
   assert(oopDesc::is_oop_or_null(obj), "Should be oop: " PTR_FORMAT, p2i(obj));
diff --git a/src/hotspot/share/oops/weakHandle.inline.hpp b/src/hotspot/share/oops/weakHandle.inline.hpp
index c23ac273aca..30bdac5a74e 100644
--- a/src/hotspot/share/oops/weakHandle.inline.hpp
+++ b/src/hotspot/share/oops/weakHandle.inline.hpp
@@ -40,6 +40,7 @@ inline oop WeakHandle::peek() const {
 }
 
 inline void WeakHandle::replace(oop with_obj) {
+  assert(!is_empty(), "Must not use replace on empty handle");
   NativeAccess<ON_PHANTOM_OOP_REF>::oop_store(_obj, with_obj);
 }
 

From 48d2acb3860f742eb1c06b89f8a7208d0d7a01e7 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 13 May 2025 13:17:12 +0000
Subject: [PATCH 428/901] 8356783: CompilerTask hot_method is redundant

Reviewed-by: kvn, cslucas
---
 src/hotspot/share/ci/ciReplay.cpp             |  2 +-
 .../share/compiler/compilationPolicy.cpp      |  4 +--
 src/hotspot/share/compiler/compileBroker.cpp  | 25 +++++---------
 src/hotspot/share/compiler/compileBroker.hpp  |  4 ---
 src/hotspot/share/compiler/compileTask.cpp    | 33 +------------------
 src/hotspot/share/compiler/compileTask.hpp    |  5 +--
 src/hotspot/share/jvmci/jvmciCompiler.cpp     |  2 +-
 src/hotspot/share/prims/whitebox.cpp          |  2 +-
 8 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp
index d490b75919d..5ea4336f35e 100644
--- a/src/hotspot/share/ci/ciReplay.cpp
+++ b/src/hotspot/share/ci/ciReplay.cpp
@@ -806,7 +806,7 @@ class CompileReplay : public StackObj {
     }
     replay_state = this;
     CompileBroker::compile_method(methodHandle(THREAD, method), entry_bci, comp_level,
-                                  methodHandle(), 0, CompileTask::Reason_Replay, THREAD);
+                                  0, CompileTask::Reason_Replay, THREAD);
     replay_state = nullptr;
   }
 
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index fa18b3c8ab4..9885136bed2 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -104,7 +104,7 @@ void CompilationPolicy::compile_if_required(const methodHandle& m, TRAPS) {
     if (PrintTieredEvents) {
       print_event(COMPILE, m(), m(), InvocationEntryBci, level);
     }
-    CompileBroker::compile_method(m, InvocationEntryBci, level, methodHandle(), 0, CompileTask::Reason_MustBeCompiled, THREAD);
+    CompileBroker::compile_method(m, InvocationEntryBci, level, 0, CompileTask::Reason_MustBeCompiled, THREAD);
   }
 }
 
@@ -812,7 +812,7 @@ void CompilationPolicy::compile(const methodHandle& mh, int bci, CompLevel level
     }
     int hot_count = (bci == InvocationEntryBci) ? mh->invocation_count() : mh->backedge_count();
     update_rate(nanos_to_millis(os::javaTimeNanos()), mh);
-    CompileBroker::compile_method(mh, bci, level, mh, hot_count, CompileTask::Reason_Tiered, THREAD);
+    CompileBroker::compile_method(mh, bci, level, hot_count, CompileTask::Reason_Tiered, THREAD);
   }
 }
 
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 168679feb9b..6dedc873028 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -398,7 +398,6 @@ CompileTask* CompileQueue::get(CompilerThread* thread) {
   // save methods from RedefineClasses across safepoint
   // across MethodCompileQueue_lock below.
   methodHandle save_method;
-  methodHandle save_hot_method;
 
   MonitorLocker locker(MethodCompileQueue_lock);
   // If _first is null we have no more compile jobs. There are two reasons for
@@ -453,7 +452,6 @@ CompileTask* CompileQueue::get(CompilerThread* thread) {
     // the compilation queue, which is walked during RedefineClasses.
     Thread* thread = Thread::current();
     save_method = methodHandle(thread, task->method());
-    save_hot_method = methodHandle(thread, task->hot_method());
 
     remove(task);
   }
@@ -1154,7 +1152,6 @@ void CompileBroker::mark_on_stack() {
 void CompileBroker::compile_method_base(const methodHandle& method,
                                         int osr_bci,
                                         int comp_level,
-                                        const methodHandle& hot_method,
                                         int hot_count,
                                         CompileTask::CompileReason compile_reason,
                                         bool blocking,
@@ -1173,13 +1170,8 @@ void CompileBroker::compile_method_base(const methodHandle& method,
       tty->print(" osr_bci: %d", osr_bci);
     }
     tty->print(" level: %d comment: %s count: %d", comp_level, CompileTask::reason_name(compile_reason), hot_count);
-    if (!hot_method.is_null()) {
-      tty->print(" hot: ");
-      if (hot_method() != method()) {
-          hot_method->print_short_name(tty);
-      } else {
-        tty->print("yes");
-      }
+    if (hot_count > 0) {
+      tty->print(" hot: yes");
     }
     tty->cr();
   }
@@ -1326,7 +1318,7 @@ void CompileBroker::compile_method_base(const methodHandle& method,
     task = create_compile_task(queue,
                                compile_id, method,
                                osr_bci, comp_level,
-                               hot_method, hot_count, compile_reason,
+                               hot_count, compile_reason,
                                blocking);
   }
 
@@ -1337,7 +1329,7 @@ void CompileBroker::compile_method_base(const methodHandle& method,
 
 nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
                                        int comp_level,
-                                       const methodHandle& hot_method, int hot_count,
+                                       int hot_count,
                                        CompileTask::CompileReason compile_reason,
                                        TRAPS) {
   // Do nothing if compilebroker is not initialized or compiles are submitted on level none
@@ -1357,14 +1349,14 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
 
   DirectiveSet* directive = DirectivesStack::getMatchingDirective(method, comp);
   // CompileBroker::compile_method can trap and can have pending async exception.
-  nmethod* nm = CompileBroker::compile_method(method, osr_bci, comp_level, hot_method, hot_count, compile_reason, directive, THREAD);
+  nmethod* nm = CompileBroker::compile_method(method, osr_bci, comp_level, hot_count, compile_reason, directive, THREAD);
   DirectivesStack::release(directive);
   return nm;
 }
 
 nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
                                          int comp_level,
-                                         const methodHandle& hot_method, int hot_count,
+                                         int hot_count,
                                          CompileTask::CompileReason compile_reason,
                                          DirectiveSet* directive,
                                          TRAPS) {
@@ -1460,7 +1452,7 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
       return nullptr;
     }
     bool is_blocking = !directive->BackgroundCompilationOption || ReplayCompiles;
-    compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, compile_reason, is_blocking, THREAD);
+    compile_method_base(method, osr_bci, comp_level, hot_count, compile_reason, is_blocking, THREAD);
   }
 
   // return requested nmethod
@@ -1607,13 +1599,12 @@ CompileTask* CompileBroker::create_compile_task(CompileQueue*       queue,
                                                 const methodHandle& method,
                                                 int                 osr_bci,
                                                 int                 comp_level,
-                                                const methodHandle& hot_method,
                                                 int                 hot_count,
                                                 CompileTask::CompileReason compile_reason,
                                                 bool                blocking) {
   CompileTask* new_task = CompileTask::allocate();
   new_task->initialize(compile_id, method, osr_bci, comp_level,
-                       hot_method, hot_count, compile_reason,
+                       hot_count, compile_reason,
                        blocking);
   queue->add(new_task);
   return new_task;
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index 77662692f56..a9f90c3e618 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -267,7 +267,6 @@ class CompileBroker: AllStatic {
                                           const methodHandle& method,
                                           int                 osr_bci,
                                           int                 comp_level,
-                                          const methodHandle& hot_method,
                                           int                 hot_count,
                                           CompileTask::CompileReason compile_reason,
                                           bool                blocking);
@@ -288,7 +287,6 @@ class CompileBroker: AllStatic {
   static void compile_method_base(const methodHandle& method,
                                   int osr_bci,
                                   int comp_level,
-                                  const methodHandle& hot_method,
                                   int hot_count,
                                   CompileTask::CompileReason compile_reason,
                                   bool blocking,
@@ -322,7 +320,6 @@ class CompileBroker: AllStatic {
   static nmethod* compile_method(const methodHandle& method,
                                  int osr_bci,
                                  int comp_level,
-                                 const methodHandle& hot_method,
                                  int hot_count,
                                  CompileTask::CompileReason compile_reason,
                                  TRAPS);
@@ -333,7 +330,6 @@ class CompileBroker: AllStatic {
   static nmethod* compile_method(const methodHandle& method,
                                    int osr_bci,
                                    int comp_level,
-                                   const methodHandle& hot_method,
                                    int hot_count,
                                    CompileTask::CompileReason compile_reason,
                                    DirectiveSet* directive,
diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index fd066a9bc87..b6ce7609f63 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -66,13 +66,10 @@ void CompileTask::free(CompileTask* task) {
   MutexLocker locker(CompileTaskAlloc_lock);
   if (!task->is_free()) {
     assert(!task->lock()->is_locked(), "Should not be locked when freed");
-    if ((task->_method_holder != nullptr && JNIHandles::is_weak_global_handle(task->_method_holder)) ||
-        (task->_hot_method_holder != nullptr && JNIHandles::is_weak_global_handle(task->_hot_method_holder))) {
+    if ((task->_method_holder != nullptr && JNIHandles::is_weak_global_handle(task->_method_holder))) {
       JNIHandles::destroy_weak_global(task->_method_holder);
-      JNIHandles::destroy_weak_global(task->_hot_method_holder);
     } else {
       JNIHandles::destroy_global(task->_method_holder);
-      JNIHandles::destroy_global(task->_hot_method_holder);
     }
     if (task->_failure_reason_on_C_heap && task->_failure_reason != nullptr) {
       os::free((void*) task->_failure_reason);
@@ -90,7 +87,6 @@ void CompileTask::initialize(int compile_id,
                              const methodHandle& method,
                              int osr_bci,
                              int comp_level,
-                             const methodHandle& hot_method,
                              int hot_count,
                              CompileTask::CompileReason compile_reason,
                              bool is_blocking) {
@@ -112,8 +108,6 @@ void CompileTask::initialize(int compile_id,
   _is_complete = false;
   _is_success = false;
 
-  _hot_method = nullptr;
-  _hot_method_holder = nullptr;
   _hot_count = hot_count;
   _time_queued = os::elapsed_counter();
   _time_started = 0;
@@ -127,18 +121,6 @@ void CompileTask::initialize(int compile_id,
   _failure_reason_on_C_heap = false;
   _arena_bytes = 0;
 
-  if (LogCompilation) {
-    if (hot_method.not_null()) {
-      if (hot_method == method) {
-        _hot_method = _method;
-      } else {
-        _hot_method = hot_method();
-        // only add loader or mirror if different from _method_holder
-        _hot_method_holder = JNIHandles::make_weak_global(Handle(thread, hot_method->method_holder()->klass_holder()));
-      }
-    }
-  }
-
   _next = nullptr;
 }
 
@@ -159,11 +141,7 @@ CompileTask* CompileTask::select_for_compilation() {
   assert(_method->method_holder()->is_loader_alive(), "should be alive");
   Handle method_holder(thread, _method->method_holder()->klass_holder());
   JNIHandles::destroy_weak_global(_method_holder);
-  JNIHandles::destroy_weak_global(_hot_method_holder);
   _method_holder = JNIHandles::make_global(method_holder);
-  if (_hot_method != nullptr) {
-    _hot_method_holder = JNIHandles::make_global(Handle(thread, _hot_method->method_holder()->klass_holder()));
-  }
   return this;
 }
 
@@ -173,9 +151,6 @@ void CompileTask::mark_on_stack() {
   }
   // Mark these methods as something redefine classes cannot remove.
   _method->set_on_stack(true);
-  if (_hot_method != nullptr) {
-    _hot_method->set_on_stack(true);
-  }
 }
 
 bool CompileTask::is_unloaded() const {
@@ -188,9 +163,6 @@ void CompileTask::metadata_do(MetadataClosure* f) {
     return;
   }
   f->do_metadata(method());
-  if (hot_method() != nullptr && hot_method() != method()) {
-    f->do_metadata(hot_method());
-  }
 }
 
 // ------------------------------------------------------------------
@@ -329,9 +301,6 @@ void CompileTask::log_task_queued() {
   assert(_compile_reason > CompileTask::Reason_None && _compile_reason < CompileTask::Reason_Count, "Valid values");
   xtty->print(" comment='%s'", reason_name(_compile_reason));
 
-  if (_hot_method != nullptr && _hot_method != _method) {
-    xtty->method(_hot_method);
-  }
   if (_hot_count != 0) {
     xtty->print(" hot_count='%d'", _hot_count);
   }
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 04ad7e35a13..4df1533d32a 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -106,8 +106,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
   // Fields used for logging why the compilation was initiated:
   jlong                _time_queued;  // time when task was enqueued
   jlong                _time_started; // time when compilation started
-  Method*              _hot_method;   // which method actually triggered this task
-  jobject              _hot_method_holder;
   int                  _hot_count;    // information about its invocation counter
   CompileReason        _compile_reason;      // more info about the task
   const char*          _failure_reason;
@@ -122,7 +120,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
   }
 
   void initialize(int compile_id, const methodHandle& method, int osr_bci, int comp_level,
-                  const methodHandle& hot_method, int hot_count,
+                  int hot_count,
                   CompileTask::CompileReason compile_reason, bool is_blocking);
 
   static CompileTask* allocate();
@@ -130,7 +128,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
 
   int          compile_id() const                { return _compile_id; }
   Method*      method() const                    { return _method; }
-  Method*      hot_method() const                { return _hot_method; }
   int          osr_bci() const                   { return _osr_bci; }
   bool         is_complete() const               { return _is_complete; }
   bool         is_blocking() const               { return _is_blocking; }
diff --git a/src/hotspot/share/jvmci/jvmciCompiler.cpp b/src/hotspot/share/jvmci/jvmciCompiler.cpp
index 38bf9c438e7..006e76477ae 100644
--- a/src/hotspot/share/jvmci/jvmciCompiler.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompiler.cpp
@@ -89,7 +89,7 @@ void JVMCICompiler::bootstrap(TRAPS) {
     if (!mh->is_native() && !mh->is_static() && !mh->is_object_initializer() && !mh->is_static_initializer()) {
       ResourceMark rm;
       int hot_count = 10; // TODO: what's the appropriate value?
-      CompileBroker::compile_method(mh, InvocationEntryBci, CompLevel_full_optimization, mh, hot_count, CompileTask::Reason_Bootstrap, CHECK);
+      CompileBroker::compile_method(mh, InvocationEntryBci, CompLevel_full_optimization, hot_count, CompileTask::Reason_Bootstrap, CHECK);
     }
   }
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 2e277ffadab..69b1b0a8b97 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1124,7 +1124,7 @@ bool WhiteBox::compile_method(Method* method, int comp_level, int bci, JavaThrea
   DirectivesStack::release(directive);
 
   // Compile method and check result
-  nmethod* nm = CompileBroker::compile_method(mh, bci, comp_level, mh, mh->invocation_count(), CompileTask::Reason_Whitebox, CHECK_false);
+  nmethod* nm = CompileBroker::compile_method(mh, bci, comp_level, mh->invocation_count(), CompileTask::Reason_Whitebox, CHECK_false);
   MutexLocker mu(THREAD, Compile_lock);
   bool is_queued = mh->queued_for_compilation();
   if ((!is_blocking && is_queued) || nm != nullptr) {

From fa419489d3769a989ee5bd948eeda0ed9be071e2 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 13 May 2025 13:35:40 +0000
Subject: [PATCH 429/901] 8350765: Need to pin when accessing thread container
 from virtual thread

Reviewed-by: vklang, jpai
---
 .../share/classes/java/lang/Thread.java       |  8 +--
 .../classes/java/lang/VirtualThread.java      |  4 +-
 .../classes/java/lang/ref/ReferenceQueue.java | 18 +------
 .../jdk/internal/vm/ContinuationSupport.java  | 20 ++++++-
 .../jdk/internal/vm/ThreadContainer.java      | 53 ++++++++++++++-----
 .../classes/sun/nio/fs/WindowsSecurity.java   | 10 ++--
 6 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 7e54d044579..9daae01676f 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1409,7 +1409,7 @@ void start(ThreadContainer container) {
 
             // start thread
             boolean started = false;
-            container.onStart(this);  // may throw
+            container.add(this);  // may throw
             try {
                 // scoped values may be inherited
                 inheritScopedValueBindings(container);
@@ -1418,7 +1418,7 @@ void start(ThreadContainer container) {
                 started = true;
             } finally {
                 if (!started) {
-                    container.onExit(this);
+                    container.remove(this);
                 }
             }
         }
@@ -1487,7 +1487,7 @@ private void exit() {
             // notify container that thread is exiting
             ThreadContainer container = threadContainer();
             if (container != null) {
-                container.onExit(this);
+                container.remove(this);
             }
         }
 
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 964a5360ad6..19465eb32db 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -664,7 +664,7 @@ private void afterDone(boolean notifyContainer) {
 
         // notify container
         if (notifyContainer) {
-            threadContainer().onExit(this);
+            threadContainer().remove(this);
         }
 
         // clear references to thread locals
@@ -692,7 +692,7 @@ void start(ThreadContainer container) {
         boolean addedToContainer = false;
         boolean started = false;
         try {
-            container.onStart(this);  // may throw
+            container.add(this);  // may throw
             addedToContainer = true;
 
             // scoped values may be inherited
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index 4dcaf796e25..9f3fad760ba 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -27,7 +27,6 @@
 
 import java.util.function.Consumer;
 import jdk.internal.misc.VM;
-import jdk.internal.vm.Continuation;
 import jdk.internal.vm.ContinuationSupport;
 
 /**
@@ -145,19 +144,6 @@ boolean enqueue(Reference<? extends T> r) { /* Called only by Reference class */
         }
     }
 
-    private boolean tryDisablePreempt() {
-        if (Thread.currentThread().isVirtual() && ContinuationSupport.isSupported()) {
-            Continuation.pin();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private void enablePreempt() {
-        Continuation.unpin();
-    }
-
     /**
      * Polls this queue to see if a reference object is available.  If one is
      * available without further delay then it is removed from the queue and
@@ -173,13 +159,13 @@ public Reference<? extends T> poll() {
 
         // Prevent a virtual thread from being preempted as this could potentially
         // deadlock with a carrier that is polling the same reference queue.
-        boolean disabled = tryDisablePreempt();
+        ContinuationSupport.pinIfSupported();
         try {
             synchronized (lock) {
                 return poll0();
             }
         } finally {
-            if (disabled) enablePreempt();
+            ContinuationSupport.unpinIfSupported();
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/vm/ContinuationSupport.java b/src/java.base/share/classes/jdk/internal/vm/ContinuationSupport.java
index 92d26b93d53..0a01987abcc 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ContinuationSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ContinuationSupport.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
@@ -50,5 +50,23 @@ public static void ensureSupported() {
         }
     }
 
+    /**
+     * Pins the current continuation if the VM has continuations support.
+     */
+    public static void pinIfSupported() {
+        if (isSupported()) {
+            Continuation.pin();
+        }
+    }
+
+    /**
+     * Unpins the current continuation if the VM has continuations support.
+     */
+    public static void unpinIfSupported() {
+        if (isSupported()) {
+            Continuation.unpin();
+        }
+    }
+
     private static native boolean isSupported0();
 }
diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadContainer.java b/src/java.base/share/classes/jdk/internal/vm/ThreadContainer.java
index 98a6c28496a..e2e91d50ec1 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ThreadContainer.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadContainer.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
@@ -76,24 +76,49 @@ public long threadCount() {
     public abstract Stream<Thread> threads();
 
     /**
-     * Invoked by Thread::start before the given Thread is started.
+     * Invoked by {@code add} to add a thread to this container before it starts.
      */
-    public void onStart(Thread thread) {
-        // do nothing
+    protected void onStart(Thread thread) {
     }
 
     /**
-     * Invoked when a Thread terminates or starting it fails.
-     *
-     * For a platform thread, this method is invoked by the thread itself when it
-     * terminates. For a virtual thread, this method is invoked on its carrier
-     * after the virtual thread has terminated.
-     *
-     * If starting the Thread failed then this method is invoked on the thread
-     * that invoked onStart.
+     * Invoked by {@code remove} to remove a thread from this container when it
+     * terminates (or failed to start).
      */
-    public void onExit(Thread thread) {
-        // do nothing
+    protected void onExit(Thread thread) {
+    }
+
+    /**
+     * Adds a thread to this container. This method should be invoked before the
+     * thread executes.
+     */
+    public final void add(Thread thread) {
+        // Prevent a virtual thread from being preempted as this could potentially
+        // deadlock when scheduled to continue and all carriers are blocked adding
+        // or removing virtual threads.
+        ContinuationSupport.pinIfSupported();
+        try {
+            onStart(thread);
+        } finally {
+            ContinuationSupport.unpinIfSupported();
+        }
+    }
+
+    /**
+     * Remove a thread from this container. This method can be invoked by the thread
+     * itself as it terminates, or it can be invoked by another thread after the given
+     * thread has terminated (or failed to start).
+     */
+    public final void remove(Thread thread) {
+        // Prevent a virtual thread from being preempted as this could potentially
+        // deadlock when scheduled to continue and all carriers are blocked adding
+        // or removing virtual threads.
+        ContinuationSupport.pinIfSupported();
+        try {
+            onExit(thread);
+        } finally {
+            ContinuationSupport.unpinIfSupported();
+        }
     }
 
     /**
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
index 9bcd800e13c..47d8045c00b 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.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,7 +25,6 @@
 
 package sun.nio.fs;
 
-import jdk.internal.vm.Continuation;
 import jdk.internal.vm.ContinuationSupport;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
@@ -106,9 +105,7 @@ static Privilege enablePrivilege(String priv) {
         final boolean needToRevert = elevated;
 
         // prevent yielding with privileges
-        if (ContinuationSupport.isSupported())
-            Continuation.pin();
-
+        ContinuationSupport.pinIfSupported();
         return () -> {
             try {
                 if (token != 0L) {
@@ -126,8 +123,7 @@ else if (needToRevert)
                 }
             } finally {
                 LocalFree(pLuid);
-                if (ContinuationSupport.isSupported())
-                    Continuation.unpin();
+                ContinuationSupport.unpinIfSupported();
             }
         };
     }

From 066477de80fc8719651b7b7bf2d02b1f58135f77 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 13 May 2025 13:40:48 +0000
Subject: [PATCH 430/901] 8356080: Address post-integration comments for Stable
 Values

Reviewed-by: liach
---
 .../share/classes/java/lang/StableValue.java  |  27 +--
 .../java/util/ImmutableCollections.java       | 222 +++++++++++++-----
 .../java/util/ReverseOrderListView.java       |   5 +-
 .../lang/stable/StableEnumFunction.java       |  11 +-
 .../internal/lang/stable/StableFunction.java  |   2 +-
 .../lang/stable/StableIntFunction.java        |   3 -
 .../internal/lang/stable/StableSupplier.java  |   2 +-
 .../jdk/internal/lang/stable/StableUtil.java  |   6 +-
 .../internal/lang/stable/StableValueImpl.java |  28 +--
 .../lang/StableValue/StableFunctionTest.java  |  15 +-
 .../java/lang/StableValue/StableListTest.java | 144 ++++++++++--
 .../java/lang/StableValue/StableMapTest.java  |  31 +++
 .../lang/StableValue/StableValueTest.java     |  10 +-
 .../stable/StableMethodHandleBenchmark.java   |  11 +-
 14 files changed, 387 insertions(+), 130 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StableValue.java b/src/java.base/share/classes/java/lang/StableValue.java
index b12d6f5e921..1815cb1a5b1 100644
--- a/src/java.base/share/classes/java/lang/StableValue.java
+++ b/src/java.base/share/classes/java/lang/StableValue.java
@@ -384,8 +384,8 @@
  * <p>
  * The method {@link #orElseSet(Supplier)} guarantees that the provided
  * {@linkplain Supplier} is invoked successfully at most once, even under race.
- * Invocations of {@link #setOrThrow(Object)} form a total order of zero or more
- * exceptional invocations followed by zero (if the contents were already set) or one
+ * Invocations of {@link #orElseSet(Supplier)} form a total order of zero or
+ * more exceptional invocations followed by zero (if the contents were already set) or one
  * successful invocation. Since stable functions and stable collections are built on top
  * of the same principles as {@linkplain StableValue#orElseSet(Supplier) orElseSet()} they
  * too are thread safe and guarantee at-most-once-per-input invocation.
@@ -444,8 +444,6 @@
 public sealed interface StableValue<T>
         permits StableValueImpl {
 
-    // Principal methods
-
     /**
      * Tries to set the contents of this StableValue to the provided {@code contents}.
      * The contents of this StableValue can only be set once, implying this method only
@@ -509,8 +507,6 @@ public sealed interface StableValue<T>
      */
     T orElseSet(Supplier<? extends T> supplier);
 
-    // Convenience methods
-
     /**
      * Sets the contents of this StableValue to the provided {@code contents}, or, if
      * already set, throws {@code IllegalStateException}.
@@ -519,6 +515,9 @@ public sealed interface StableValue<T>
      *
      * @param contents to set
      * @throws IllegalStateException if the contents was already set
+     * @throws IllegalStateException if a supplier invoked by {@link #orElseSet(Supplier)}
+     *         recursively attempts to set this stable value by calling this method
+     *         directly or indirectly.
      */
     void setOrThrow(T contents);
 
@@ -573,8 +572,8 @@ static <T> StableValue<T> of(T contents) {
      * at most once even in a multi-threaded environment. Competing threads invoking the
      * returned supplier's {@linkplain Supplier#get() get()} method when a value is
      * already under computation will block until a value is computed or an exception is
-     * thrown by the computing thread. The computing threads will then observe the newly
-     * computed value (if any) and will then never execute.
+     * thrown by the computing thread. The competing threads will then observe the newly
+     * computed value (if any) and will then never execute the {@code underlying} supplier.
      * <p>
      * If the provided {@code underlying} supplier throws an exception, it is rethrown
      * to the initial caller and no contents is recorded.
@@ -614,9 +613,9 @@ static <T> Supplier<T> supplier(Supplier<? extends T> underlying) {
      * function for the same input, an {@linkplain IllegalStateException} will
      * be thrown.
      *
-     * @param size       the size of the allowed inputs in the continuous
-     *                   interval {@code [0, size)}
-     * @param underlying IntFunction used to compute cached values
+     * @param size       the upper bound of the range {@code [0, size)} indicating
+     *                   the allowed inputs
+     * @param underlying {@code IntFunction} used to compute cached values
      * @param <R>        the type of results delivered by the returned IntFunction
      * @throws IllegalArgumentException if the provided {@code size} is negative.
      */
@@ -684,7 +683,7 @@ static <T, R> Function<T, R> function(Set<? extends T> inputs,
      * If invoking the provided {@code mapper} function throws an exception, it
      * is rethrown to the initial caller and no value for the element is recorded.
      * <p>
-     * Any direct {@link List#subList(int, int) subList} or {@link List#reversed()} views
+     * Any {@link List#subList(int, int) subList} or {@link List#reversed()} views
      * of the returned list are also stable.
      * <p>
      * The returned list and its {@link List#subList(int, int) subList} or
@@ -727,8 +726,8 @@ static <E> List<E> list(int size,
      * is rethrown to the initial caller and no value associated with the provided key
      * is recorded.
      * <p>
-     * Any direct {@link Map#values()} or {@link Map#entrySet()} views
-     * of the returned map are also stable.
+     * Any {@link Map#values()} or {@link Map#entrySet()} views of the returned map are
+     * also stable.
      * <p>
      * The returned map is unmodifiable and does not implement the
      * {@linkplain Collection##optional-operations optional operations} in the
diff --git a/src/java.base/share/classes/java/util/ImmutableCollections.java b/src/java.base/share/classes/java/util/ImmutableCollections.java
index 9becf167176..38cc45122a2 100644
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java
@@ -47,7 +47,6 @@
 import jdk.internal.lang.stable.StableValueImpl;
 import jdk.internal.misc.CDS;
 import jdk.internal.util.ArraysSupport;
-import jdk.internal.util.NullableKeyValueHolder;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Stable;
 
@@ -137,9 +136,11 @@ public <E> List<E> listFromTrustedArrayNullsAllowed(Object[] array) {
                     return ImmutableCollections.listFromTrustedArrayNullsAllowed(array);
                 }
                 public <E> List<E> stableList(int size, IntFunction<? extends E> mapper) {
-                    return ImmutableCollections.stableList(size, mapper);
+                    // A stable list is not Serializable, so we cannot return `List.of()` if `size == 0`
+                    return new StableList<>(size, mapper);
                 }
                 public <K, V> Map<K, V> stableMap(Set<K> keys, Function<? super K, ? extends V> mapper) {
+                    // A stable map is not Serializable, so we cannot return `Map.of()` if `keys.isEmpty()`
                     return new StableMap<>(keys, mapper);
                 }
             });
@@ -264,11 +265,6 @@ static <E> List<E> listFromTrustedArrayNullsAllowed(Object... input) {
         }
     }
 
-    static <E> List<E> stableList(int size, IntFunction<? extends E> mapper) {
-        // A lazy list is not Serializable so, we cannot return `List.of()` if size == 0
-        return new StableList<>(size, mapper);
-    }
-
     // ---------- List Implementations ----------
 
     @jdk.internal.ValueBased
@@ -454,17 +450,17 @@ public void add(E e) {
         }
     }
 
-    static final class SubList<E> extends AbstractImmutableList<E>
+    static sealed class SubList<E> extends AbstractImmutableList<E>
             implements RandomAccess {
 
         @Stable
-        private final AbstractImmutableList<E> root;
+        final AbstractImmutableList<E> root;
 
         @Stable
-        private final int offset;
+        final int offset;
 
         @Stable
-        private final int size;
+        final int size;
 
         private SubList(AbstractImmutableList<E> root, int offset, int size) {
             assert root instanceof List12 || root instanceof ListN || root instanceof StableList;
@@ -517,9 +513,8 @@ private void rangeCheck(int index) {
             }
         }
 
-        private boolean allowNulls() {
-            return root instanceof ListN<?> listN && listN.allowNulls
-                    || root instanceof StableList<E>;
+        boolean allowNulls() {
+            return root instanceof ListN<?> listN && listN.allowNulls;
         }
 
         @Override
@@ -572,14 +567,6 @@ public <T> T[] toArray(T[] a) {
             return array;
         }
 
-        @Override
-        public String toString() {
-            if (root instanceof StableList<E> stableList) {
-                return StableUtil.renderElements(root, "StableList", stableList.delegates, offset, size);
-            } else {
-                return super.toString();
-            }
-        }
     }
 
     @jdk.internal.ValueBased
@@ -797,8 +784,15 @@ public int lastIndexOf(Object o) {
         }
     }
 
+    @FunctionalInterface
+    interface HasStableDelegates<E> {
+        StableValueImpl<E>[] delegates();
+    }
+
     @jdk.internal.ValueBased
-    static final class StableList<E> extends AbstractImmutableList<E> {
+    static final class StableList<E>
+            extends AbstractImmutableList<E>
+            implements HasStableDelegates<E> {
 
         @Stable
         private final IntFunction<? extends E> mapper;
@@ -878,12 +872,70 @@ public List<E> reversed() {
             return new StableReverseOrderListView<>(this);
         }
 
+        @Override
+        public List<E> subList(int fromIndex, int toIndex) {
+            subListRangeCheck(fromIndex, toIndex, size());
+            return StableSubList.fromStableList(this, fromIndex, toIndex);
+        }
+
         @Override
         public String toString() {
-            return StableUtil.renderElements(this, "StableList", delegates);
+            return StableUtil.renderElements(this, "StableCollection", delegates);
         }
 
-        private static final class StableReverseOrderListView<E> extends ReverseOrderListView.Rand<E> {
+        @Override
+        public StableValueImpl<E>[] delegates() {
+            return delegates;
+        }
+
+        private static final class StableSubList<E> extends SubList<E>
+                implements HasStableDelegates<E> {
+
+            private StableSubList(AbstractImmutableList<E> root, int offset, int size) {
+                super(root, offset, size);
+            }
+
+            @Override
+            public List<E> reversed() {
+                return new StableReverseOrderListView<>(this);
+            }
+
+            @Override
+            public List<E> subList(int fromIndex, int toIndex) {
+                subListRangeCheck(fromIndex, toIndex, size());
+                return StableSubList.fromStableSubList(this, fromIndex, toIndex);
+            }
+
+            @Override
+            public String toString() {
+                return StableUtil.renderElements(this, "StableCollection", delegates());
+            }
+
+            @Override
+            boolean allowNulls() {
+                return true;
+            }
+
+            @Override
+            public StableValueImpl<E>[] delegates() {
+                @SuppressWarnings("unchecked")
+                final var rootDelegates = ((HasStableDelegates<E>) root).delegates();
+                return Arrays.copyOfRange(rootDelegates, offset, offset + size);
+            }
+
+            static <E> SubList<E> fromStableList(StableList<E> list, int fromIndex, int toIndex) {
+                return new StableSubList<>(list, fromIndex, toIndex - fromIndex);
+            }
+
+            static <E> SubList<E> fromStableSubList(StableSubList<E> parent, int fromIndex, int toIndex) {
+                return new StableSubList<>(parent.root, parent.offset + fromIndex, toIndex - fromIndex);
+            }
+
+        }
+
+        private static final class StableReverseOrderListView<E>
+                extends ReverseOrderListView.Rand<E>
+                implements HasStableDelegates<E> {
 
             private StableReverseOrderListView(List<E> base) {
                 super(base, false);
@@ -892,17 +944,23 @@ private StableReverseOrderListView(List<E> base) {
             // This method does not evaluate the elements
             @Override
             public String toString() {
-                final StableValueImpl<E>[] delegates = ((StableList<E>)base).delegates;
-                final StableValueImpl<E>[] reversed = ArraysSupport.reverse(
-                        Arrays.copyOf(delegates, delegates.length));
-                return StableUtil.renderElements(base, "Collection", reversed);
+                return StableUtil.renderElements(this, "StableCollection", delegates());
             }
 
             @Override
-            public List<E> reversed() {
-                return base;
+            public List<E> subList(int fromIndex, int toIndex) {
+                final int size = base.size();
+                subListRangeCheck(fromIndex, toIndex, size);
+                return new StableReverseOrderListView<>(base.subList(size - toIndex, size - fromIndex));
             }
 
+            @Override
+            public StableValueImpl<E>[] delegates() {
+                @SuppressWarnings("unchecked")
+                final var baseDelegates = ((HasStableDelegates<E>) base).delegates();
+                return ArraysSupport.reverse(
+                        Arrays.copyOf(baseDelegates, baseDelegates.length));
+            }
         }
 
     }
@@ -1560,7 +1618,7 @@ static final class StableMap<K, V>
 
         @Override public boolean              containsKey(Object o) { return delegate.containsKey(o); }
         @Override public int                  size() { return delegate.size(); }
-        @Override public Set<Map.Entry<K, V>> entrySet() { return new StableMapEntrySet(); }
+        @Override public Set<Map.Entry<K, V>> entrySet() { return StableMapEntrySet.of(this); }
 
         @ForceInline
         @Override
@@ -1582,32 +1640,49 @@ public V getOrDefault(Object key, V defaultValue) {
         }
 
         @jdk.internal.ValueBased
-        final class StableMapEntrySet extends AbstractImmutableSet<Map.Entry<K, V>> {
+        static final class StableMapEntrySet<K, V> extends AbstractImmutableSet<Map.Entry<K, V>> {
+
+            // Use a separate field for the outer class in order to facilitate
+            // a @Stable annotation.
+            @Stable
+            private final StableMap<K, V> outer;
 
             @Stable
             private final Set<Map.Entry<K, StableValueImpl<V>>> delegateEntrySet;
 
-            StableMapEntrySet() {
-                this.delegateEntrySet = delegate.entrySet();
+            private StableMapEntrySet(StableMap<K, V> outer) {
+                this.outer = outer;
+                this.delegateEntrySet = outer.delegate.entrySet();
             }
 
-            @Override public Iterator<Map.Entry<K, V>> iterator() { return new LazyMapIterator(); }
+            @Override public Iterator<Map.Entry<K, V>> iterator() { return LazyMapIterator.of(this); }
             @Override public int                       size() { return delegateEntrySet.size(); }
-            @Override public int                       hashCode() { return StableMap.this.hashCode(); }
+            @Override public int                       hashCode() { return outer.hashCode(); }
 
             @Override
             public String toString() {
-                return StableUtil.renderMappings(this, "StableSet", delegateEntrySet, false);
+                return StableUtil.renderMappings(this, "StableCollection", delegateEntrySet, false);
+            }
+
+            // For @ValueBased
+            private static <K, V> StableMapEntrySet<K, V> of(StableMap<K, V> outer) {
+                return new StableMapEntrySet<>(outer);
             }
 
             @jdk.internal.ValueBased
-            final class LazyMapIterator implements Iterator<Map.Entry<K, V>> {
+            static final class LazyMapIterator<K, V> implements Iterator<Map.Entry<K, V>> {
+
+                // Use a separate field for the outer class in order to facilitate
+                // a @Stable annotation.
+                @Stable
+                private final StableMapEntrySet<K, V> outer;
 
                 @Stable
                 private final Iterator<Map.Entry<K, StableValueImpl<V>>> delegateIterator;
 
-                LazyMapIterator() {
-                    this.delegateIterator = delegateEntrySet.iterator();
+                private LazyMapIterator(StableMapEntrySet<K, V> outer) {
+                    this.outer = outer;
+                    this.delegateIterator = outer.delegateEntrySet.iterator();
                 }
 
                 @Override public boolean hasNext() { return delegateIterator.hasNext(); }
@@ -1616,8 +1691,8 @@ final class LazyMapIterator implements Iterator<Map.Entry<K, V>> {
                 public Entry<K, V> next() {
                     final Map.Entry<K, StableValueImpl<V>> inner = delegateIterator.next();
                     final K k = inner.getKey();
-                    return new NullableKeyValueHolder<>(k, inner.getValue().orElseSet(new Supplier<V>() {
-                        @Override public V get() { return mapper.apply(k); }}));
+                    return new StableEntry<>(k, inner.getValue(), new Supplier<V>() {
+                        @Override public V get() { return outer.outer.mapper.apply(k); }});
                 }
 
                 @Override
@@ -1627,25 +1702,60 @@ public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
                                 @Override
                                 public void accept(Entry<K, StableValueImpl<V>> inner) {
                                     final K k = inner.getKey();
-                                    action.accept(new NullableKeyValueHolder<>(k, inner.getValue().orElseSet(new Supplier<V>() {
-                                        @Override public V get() { return mapper.apply(k); }})));
+                                    action.accept(new StableEntry<>(k, inner.getValue(), new Supplier<V>() {
+                                        @Override public V get() { return outer.outer.mapper.apply(k); }}));
                                 }
                             };
                     delegateIterator.forEachRemaining(innerAction);
                 }
+
+                // For @ValueBased
+                private static  <K, V> LazyMapIterator<K, V> of(StableMapEntrySet<K, V> outer) {
+                    return new LazyMapIterator<>(outer);
+                }
+
             }
         }
 
+        private record StableEntry<K, V>(K getKey, // trick
+                                         StableValueImpl<V> stableValue,
+                                         Supplier<? extends V> supplier) implements Map.Entry<K, V> {
+
+            @Override public V setValue(V value) { throw uoe(); }
+            @Override public V getValue() { return stableValue.orElseSet(supplier); }
+            @Override public int hashCode() { return hash(getKey()) ^ hash(getValue()); }
+            @Override public String toString() { return getKey() + "=" + stableValue.toString(); }
+            @Override public boolean equals(Object o) {
+                return o instanceof Map.Entry<?, ?> e
+                        && Objects.equals(getKey(), e.getKey())
+                        // Invoke `getValue()` as late as possible to avoid evaluation
+                        && Objects.equals(getValue(), e.getValue());
+            }
+
+            private int hash(Object obj) { return (obj == null) ? 0 : obj.hashCode(); }
+        }
+
         @Override
         public Collection<V> values() {
-            return new StableMapValues();
+            return StableMapValues.of(this);
         }
 
-        final class StableMapValues extends AbstractImmutableCollection<V> {
-            @Override public Iterator<V> iterator() { return new ValueIterator(); }
-            @Override public int size() { return StableMap.this.size(); }
-            @Override public boolean isEmpty() { return StableMap.this.isEmpty();}
-            @Override public boolean contains(Object v) { return StableMap.this.containsValue(v); }
+        @jdk.internal.ValueBased
+        static final class StableMapValues<V> extends AbstractImmutableCollection<V> {
+
+            // Use a separate field for the outer class in order to facilitate
+            // a @Stable annotation.
+            @Stable
+            private final StableMap<?, V> outer;
+
+            private StableMapValues(StableMap<?, V> outer) {
+                this.outer = outer;
+            }
+
+            @Override public Iterator<V> iterator() { return outer.new ValueIterator(); }
+            @Override public int size() { return outer.size(); }
+            @Override public boolean isEmpty() { return outer.isEmpty();}
+            @Override public boolean contains(Object v) { return outer.containsValue(v); }
 
             private static final IntFunction<StableValueImpl<?>[]> GENERATOR = new IntFunction<StableValueImpl<?>[]>() {
                 @Override
@@ -1656,9 +1766,15 @@ public StableValueImpl<?>[] apply(int len) {
 
             @Override
             public String toString() {
-                final StableValueImpl<?>[] values = delegate.values().toArray(GENERATOR);
-                return StableUtil.renderElements(StableMap.this, "StableMap", values);
+                final StableValueImpl<?>[] values = outer.delegate.values().toArray(GENERATOR);
+                return StableUtil.renderElements(this, "StableCollection", values);
+            }
+
+            // For @ValueBased
+            private static <V> StableMapValues<V> of(StableMap<?, V> outer) {
+                return new StableMapValues<>(outer);
             }
+
         }
 
         @Override
diff --git a/src/java.base/share/classes/java/util/ReverseOrderListView.java b/src/java.base/share/classes/java/util/ReverseOrderListView.java
index 9d6d856bdb6..75d69f38aaf 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderListView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderListView.java
@@ -33,14 +33,17 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import jdk.internal.util.ArraysSupport;
+import jdk.internal.vm.annotation.Stable;
 
 /**
  * Provides a reverse-ordered view of a List. Not serializable.
  */
 class ReverseOrderListView<E> implements List<E> {
 
+    @Stable
     final List<E> base;
-    final boolean modifiable;
+    @Stable
+    final Boolean modifiable;
 
     public static <T> List<T> of(List<T> list, boolean modifiable) {
         if (list instanceof RandomAccess) {
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
index 88be2cea1b6..d6893438be5 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableEnumFunction.java
@@ -46,7 +46,10 @@
  * @implNote This implementation can be used early in the boot sequence as it does not
  *           rely on reflection, MethodHandles, Streams etc.
  *
+ * @param enumType     the class type of the Enum
  * @param firstOrdinal the lowest ordinal used
+ * @param member       an int predicate that can be used to test if an enum is a member
+ *                     of the valid inputs (as there might be "holes")
  * @param delegates    a delegate array of inputs to StableValue mappings
  * @param original     the original Function
  * @param <E>          the type of the input to the function
@@ -64,10 +67,8 @@ public R apply(E value) {
             throw new IllegalArgumentException("Input not allowed: " + value);
         }
         final int index = value.ordinal() - firstOrdinal;
-        final StableValueImpl<R> delegate;
         // Since we did the member.test above, we know the index is in bounds
-        delegate = delegates[index];
-        return delegate.orElseSet(new Supplier<R>() {
+        return delegates[index].orElseSet(new Supplier<R>() {
                     @Override public R get() { return original.apply(value); }});
 
     }
@@ -84,8 +85,8 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
+        final Collection<Map.Entry<E, StableValueImpl<R>>> entries = new ArrayList<>(delegates.length);
         final E[] enumElements = enumType.getEnumConstants();
-        final Collection<Map.Entry<E, StableValueImpl<R>>> entries = new ArrayList<>(enumElements.length);
         int ordinal = firstOrdinal;
         for (int i = 0; i < delegates.length; i++, ordinal++) {
             if (member.test(ordinal)) {
@@ -99,7 +100,7 @@ public String toString() {
     public static <T, E extends Enum<E>, R> Function<T, R> of(Set<? extends T> inputs,
                                                               Function<? super T, ? extends R> original) {
         // The input set is not empty
-        final Class<E> enumType = (Class<E>)inputs.iterator().next().getClass();
+        final Class<E> enumType = ((E) inputs.iterator().next()).getDeclaringClass();
         final BitSet bitSet = new BitSet(enumType.getEnumConstants().length);
         int min = Integer.MAX_VALUE;
         int max = Integer.MIN_VALUE;
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
index 1b10593e5e8..e36b4e9b25a 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableFunction.java
@@ -32,7 +32,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-// Note: It would be possible to just use `LazyMap::get` with some additional logic
+// Note: It would be possible to just use `StableMap::get` with some additional logic
 // instead of this class but explicitly providing a class like this provides better
 // debug capability, exception handling, and may provide better performance.
 /**
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
index 8bb046a762d..a921a4de87b 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableIntFunction.java
@@ -31,9 +31,6 @@
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
 
-// Note: It would be possible to just use `LazyList::get` instead of this
-// class but explicitly providing a class like this provides better
-// debug capability, exception handling, and may provide better performance.
 /**
  * Implementation of a stable IntFunction.
  * <p>
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
index bdb40648db6..631a41c5710 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableSupplier.java
@@ -58,7 +58,7 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        final Object t = delegate.wrappedContentAcquire();
+        final Object t = delegate.wrappedContentsAcquire();
         return t == this ? "(this StableSupplier)" : StableValueImpl.renderWrapped(t);
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
index f6f33f9b1e8..74104ddbb49 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableUtil.java
@@ -47,7 +47,7 @@ public static <R> String renderElements(Object self,
                                             int length) {
         final StringJoiner sj = new StringJoiner(", ", "[", "]");
         for (int i = 0; i < length; i++) {
-            final Object value = delegates[i + offset].wrappedContentAcquire();
+            final Object value = delegates[i + offset].wrappedContentsAcquire();
             if (value == self) {
                 sj.add("(this " + selfName + ")");
             } else {
@@ -63,10 +63,10 @@ public static <K, V> String renderMappings(Object self,
                                                boolean curly) {
         final StringJoiner sj = new StringJoiner(", ", curly ? "{" : "[", curly ? "}" : "]");
         for (var e : delegates) {
-            final Object value = e.getValue().wrappedContentAcquire();
+            final Object value = e.getValue().wrappedContentsAcquire();
             final String valueString;
             if (value == self) {
-                valueString = ("(this ") + selfName + ")";
+                valueString = "(this " + selfName + ")";
             } else {
                 valueString = StableValueImpl.renderWrapped(value);
             }
diff --git a/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java b/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
index 88c80eb6b39..1413fd7446e 100644
--- a/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
+++ b/src/java.base/share/classes/jdk/internal/lang/stable/StableValueImpl.java
@@ -51,10 +51,10 @@ public final class StableValueImpl<T> implements StableValue<T> {
 
     // Unsafe offsets for direct field access
 
-    private static final long CONTENT_OFFSET =
+    private static final long CONTENTS_OFFSET =
             UNSAFE.objectFieldOffset(StableValueImpl.class, "contents");
-    // Used to indicate a holder value is `null` (see field `value` below)
-    // A wrapper method `nullSentinel()` is used for generic type conversion.
+
+    // Used to indicate a holder value is `null` (see field `contents` below)
     private static final Object NULL_SENTINEL = new Object();
 
     // Generally, fields annotated with `@Stable` are accessed by the JVM using special
@@ -77,13 +77,13 @@ private StableValueImpl() {}
     @ForceInline
     @Override
     public boolean trySet(T contents) {
-        if (wrappedContentAcquire() != null) {
+        if (wrappedContentsAcquire() != null) {
             return false;
         }
         // Prevent reentry via an orElseSet(supplier)
         preventReentry();
         // Mutual exclusion is required here as `orElseSet` might also
-        // attempt to modify the `wrappedValue`
+        // attempt to modify `this.contents`
         synchronized (this) {
             return wrapAndSet(contents);
         }
@@ -102,7 +102,7 @@ public void setOrThrow(T contents) {
     @ForceInline
     @Override
     public T orElseThrow() {
-        final Object t = wrappedContentAcquire();
+        final Object t = wrappedContentsAcquire();
         if (t == null) {
             throw new NoSuchElementException("No contents set");
         }
@@ -112,21 +112,21 @@ public T orElseThrow() {
     @ForceInline
     @Override
     public T orElse(T other) {
-        final Object t = wrappedContentAcquire();
+        final Object t = wrappedContentsAcquire();
         return (t == null) ? other : unwrap(t);
     }
 
     @ForceInline
     @Override
     public boolean isSet() {
-        return wrappedContentAcquire() != null;
+        return wrappedContentsAcquire() != null;
     }
 
     @ForceInline
     @Override
     public T orElseSet(Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier);
-        final Object t = wrappedContentAcquire();
+        final Object t = wrappedContentsAcquire();
         return (t == null) ? orElseSetSlowPath(supplier) : unwrap(t);
     }
 
@@ -149,7 +149,7 @@ private T orElseSetSlowPath(Supplier<? extends T> supplier) {
 
     @Override
     public String toString() {
-        final Object t = wrappedContentAcquire();
+        final Object t = wrappedContentsAcquire();
         return t == this
                 ? "(this StableValue)"
                 : renderWrapped(t);
@@ -158,8 +158,8 @@ public String toString() {
     // Internal methods shared with other internal classes
 
     @ForceInline
-    public Object wrappedContentAcquire() {
-        return UNSAFE.getReferenceAcquire(this, CONTENT_OFFSET);
+    public Object wrappedContentsAcquire() {
+        return UNSAFE.getReferenceAcquire(this, CONTENTS_OFFSET);
     }
 
     static String renderWrapped(Object t) {
@@ -185,11 +185,11 @@ private void preventReentry() {
      * @return if the contents was set
      */
     @ForceInline
-    private boolean wrapAndSet(Object newValue) {
+    private boolean wrapAndSet(T newValue) {
         assert Thread.holdsLock(this);
         // We know we hold the monitor here so plain semantic is enough
         if (contents == null) {
-            UNSAFE.putReferenceRelease(this, CONTENT_OFFSET, wrap(newValue));
+            UNSAFE.putReferenceRelease(this, CONTENTS_OFFSET, wrap(newValue));
             return true;
         }
         return false;
diff --git a/test/jdk/java/lang/StableValue/StableFunctionTest.java b/test/jdk/java/lang/StableValue/StableFunctionTest.java
index 4476c046957..07f51470a0b 100644
--- a/test/jdk/java/lang/StableValue/StableFunctionTest.java
+++ b/test/jdk/java/lang/StableValue/StableFunctionTest.java
@@ -52,7 +52,13 @@ enum Value {
         ZERO(0),
         ILLEGAL_BEFORE(-1),
         // Valid values
-        THIRTEEN(13),
+        THIRTEEN(13) {
+            @Override
+            public String toString() {
+                // getEnumConstants will be `null` for this enum as it is overridden
+                return super.toString()+" (Overridden)";
+            }
+        },
         ILLEGAL_BETWEEN(-2),
         FORTY_TWO(42),
         // Illegal values (not in the input set)
@@ -196,6 +202,13 @@ void usesOptimizedVersion() {
         assertEquals("jdk.internal.lang.stable.StableFunction", emptyFunction.getClass().getName());
     }
 
+    @Test
+    void overriddenEnum() {
+        final var overridden = Value.THIRTEEN;
+        Function<Value, Integer> enumFunction = StableValue.function(EnumSet.of(overridden), Value::asInt);
+        assertEquals(MAPPER.apply(overridden), enumFunction.apply(overridden));
+    }
+
     private static Stream<Set<Value>> nonEmptySets() {
         return Stream.of(
                 Set.of(Value.FORTY_TWO, Value.THIRTEEN),
diff --git a/test/jdk/java/lang/StableValue/StableListTest.java b/test/jdk/java/lang/StableValue/StableListTest.java
index f0ae081c76c..2abe305b0e7 100644
--- a/test/jdk/java/lang/StableValue/StableListTest.java
+++ b/test/jdk/java/lang/StableValue/StableListTest.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -46,7 +45,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.IntFunction;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -242,18 +243,8 @@ void subList2() {
         assertEquals(eq.toString(), lazy.toString());
     }
 
-    @Test
-    void subListToString() {
-        subListToString0(newList());
-        subListToString0(newList().subList(1, SIZE));
-        subListToString0(newList().subList(1, SIZE).subList(0, SIZE - 2));
-    }
-
-    void subListToString0(List<Integer> subList) {
+    void assertUnevaluated(List<Integer> subList) {
         assertEquals(asString(".unset", subList), subList.toString());
-
-        var first = subList.getFirst();
-        assertEquals(asString(first.toString(), subList), subList.toString());
     }
 
     @Test
@@ -272,17 +263,47 @@ void reversed() {
     }
 
     @Test
-    void reversedToString() {
-        var reversed = newList().reversed();
-        subListToString0(reversed);
+    void sublistReversedToString() {
+        var actual = StableValue.list(4, IDENTITY);
+        var expected = List.of(0, 1, 2, 3);
+        for (UnaryOperation op : List.of(
+                new UnaryOperation("subList", l -> l.subList(1, 3)),
+                new UnaryOperation("reversed", List::reversed))) {
+            actual = op.apply(actual);
+            expected = op.apply(expected);
+        }
+        // Touch one of the elements
+        actual.getLast();
+
+        var actualToString = actual.toString();
+        var expectedToString = expected.toString().replace("2", ".unset");
+        assertEquals(expectedToString, actualToString);
     }
 
+    // This test makes sure successive view operations retains the property
+    // of being a Stable view.
     @Test
-    void subListReversedToString() {
-        var list = newList().subList(1, SIZE - 1).reversed();
-        // This combination is not lazy. There has to be a limit somewhere.
-        var regularList = newRegularList().subList(1, SIZE - 1).reversed();
-        assertEquals(regularList.toString(), list.toString());
+    void viewsStable() {
+        viewOperations().forEach(op0 -> {
+            viewOperations().forEach( op1 -> {
+                viewOperations().forEach(op2 -> {
+                    var list = newList();
+                    var view1 = op0.apply(list);
+                    var view2 = op1.apply(view1);
+                    var view3 = op2.apply(view2);
+                    var className3 = className(view3);
+                    var transitions = className(list) + ", " +
+                            op0 + " -> " + className(view1) + ", " +
+                            op1 + " -> " + className(view2) + ", " +
+                            op2 + " -> " + className3;
+                    assertTrue(className3.contains("Stable"), transitions);
+                    assertUnevaluated(list);
+                    assertUnevaluated(view1);
+                    assertUnevaluated(view2);
+                    assertUnevaluated(view3);
+                });
+            });
+        });
     }
 
     @Test
@@ -294,6 +315,23 @@ void recursiveCall() {
         assertEquals("Recursive initialization of a stable value is illegal", x.getMessage());
     }
 
+    @Test
+    void indexOfNullInViews() {
+        final int size = 5;
+        final int middle = 2;
+        viewOperations().forEach(op0 -> {
+            viewOperations().forEach( op1 -> {
+                viewOperations().forEach(op2 -> {
+                    var list = StableValue.list(size, x -> x == middle ? null : x);;
+                    var view1 = op0.apply(list);
+                    var view2 = op1.apply(view1);
+                    var view3 = op2.apply(view2);
+                    assertEquals(middle, view3.indexOf(null));
+                });
+            });
+        });
+    }
+
     // Immutability
 
     @ParameterizedTest
@@ -362,6 +400,39 @@ void distinct() {
         assertEquals(SIZE, idMap.size());
     }
 
+    @Test
+    void childObjectOpsLazy() {
+        viewOperations().forEach(op0 -> {
+            viewOperations().forEach(op1 -> {
+                viewOperations().forEach(op2 -> {
+                    childOperations().forEach(co -> {
+                        var list = newList();
+                        var view1 = op0.apply(list);
+                        var view2 = op1.apply(view1);
+                        var view3 = op2.apply(view2);
+                        var child = co.apply(view3);
+                        var childClassName = className(child);
+                        var transitions = className(list) + ", " +
+                                op0 + " -> " + className(view1) + ", " +
+                                op1 + " -> " + className(view2) + ", " +
+                                op2 + " -> " + className(view3) + ", " +
+                                co + " -> " + childClassName;
+
+                        // None of these operations should trigger evaluation
+                        var childToString = child.toString();
+                        int childHashCode = child.hashCode();
+                        boolean childEqualToNewObj = child.equals(new Object());
+
+                        assertUnevaluated(list);
+                        assertUnevaluated(view1);
+                        assertUnevaluated(view2);
+                        assertUnevaluated(view3);
+                    });
+                });
+            });
+        });
+    }
+
     // Support constructs
 
     record Operation(String name,
@@ -370,6 +441,36 @@ record Operation(String name,
         @Override public String toString() { return name; }
     }
 
+    record UnaryOperation(String name,
+                     UnaryOperator<List<Integer>> operator) implements UnaryOperator<List<Integer>> {
+        @Override public List<Integer> apply(List<Integer> list) { return operator.apply(list); }
+        @Override public String toString() { return name; }
+    }
+
+    record ListFunction(String name,
+                        Function<List<Integer>, Object> function) implements Function<List<Integer>, Object> {
+        @Override public Object apply(List<Integer> list) { return function.apply(list); }
+        @Override public String toString() { return name; }
+    }
+
+    static Stream<UnaryOperation> viewOperations() {
+        return Stream.of(
+                // We need identity to capture all combinations
+                new UnaryOperation("identity", l -> l),
+                new UnaryOperation("reversed", List::reversed),
+                new UnaryOperation("subList", l -> l.subList(0, l.size()))
+        );
+    }
+
+    static Stream<ListFunction> childOperations() {
+        return Stream.of(
+                // We need identity to capture all combinations
+                new ListFunction("iterator", List::iterator),
+                new ListFunction("listIterator", List::listIterator),
+                new ListFunction("listIterator", List::stream)
+        );
+    }
+
     static Stream<Operation> nullAverseOperations() {
         return Stream.of(
                 new Operation("forEach",     l -> l.forEach(null)),
@@ -433,4 +534,7 @@ static String asString(String first, List<Integer> list) {
                 .collect(Collectors.joining(", ")) + "]";
     }
 
+    static String className(Object o) {
+        return o.getClass().getName();
+    }
 }
diff --git a/test/jdk/java/lang/StableValue/StableMapTest.java b/test/jdk/java/lang/StableValue/StableMapTest.java
index 3133acc2f29..86cf4ab3643 100644
--- a/test/jdk/java/lang/StableValue/StableMapTest.java
+++ b/test/jdk/java/lang/StableValue/StableMapTest.java
@@ -248,6 +248,37 @@ void iteratorForEachRemaining() {
         assertEquals(KEYS, encountered);
     }
 
+    @Test
+    void stableEntry() {
+        var map = newMap();
+        var entry = map.entrySet().stream()
+                .filter(e -> e.getKey().equals(KEY))
+                .findAny()
+                .orElseThrow();
+
+        assertEquals(KEY + "=.unset", entry.toString());
+        var otherDifferent = Map.entry(-1, -1);
+        assertNotEquals(entry, otherDifferent);
+        assertEquals(KEY + "=.unset", entry.toString());
+        var otherEqual = Map.entry(KEY, KEY);
+        assertEquals(entry, otherEqual);
+        assertEquals(KEY + "=" + KEY, entry.toString());
+        assertEquals(entry.hashCode(), otherEqual.hashCode());
+    }
+
+    @Test
+    void stableForEachEntry() {
+        var map = newMap();
+        // Only touch the key.
+        map.entrySet().iterator().forEachRemaining(Map.Entry::getKey);
+        map.entrySet().iterator()
+                .forEachRemaining(e -> assertTrue(e.toString().contains(".unset")));
+        // Only touch the value.
+        map.entrySet().iterator().forEachRemaining(Map.Entry::getValue);
+        map.entrySet().iterator()
+                .forEachRemaining(e -> assertFalse(e.toString().contains(".unset")));
+    }
+
     // Immutability
     @ParameterizedTest
     @MethodSource("unsupportedOperations")
diff --git a/test/jdk/java/lang/StableValue/StableValueTest.java b/test/jdk/java/lang/StableValue/StableValueTest.java
index 0ed68352509..4290c8716a0 100644
--- a/test/jdk/java/lang/StableValue/StableValueTest.java
+++ b/test/jdk/java/lang/StableValue/StableValueTest.java
@@ -29,6 +29,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -355,12 +356,14 @@ void raceMixed() {
 
     void race(BiPredicate<StableValue<Integer>, Integer> winnerPredicate) {
         int noThreads = 10;
-        CountDownLatch starter = new CountDownLatch(1);
+        CountDownLatch starter = new CountDownLatch(noThreads);
         StableValue<Integer> stable = StableValue.of();
         Map<Integer, Boolean> winners = new ConcurrentHashMap<>();
         List<Thread> threads = IntStream.range(0, noThreads).mapToObj(i -> new Thread(() -> {
                     try {
-                        // Ready, set ...
+                        // Ready ...
+                        starter.countDown();
+                        // ... set ...
                         starter.await();
                         // Here we go!
                         winners.put(i, winnerPredicate.test(stable, i));
@@ -370,9 +373,6 @@ void race(BiPredicate<StableValue<Integer>, Integer> winnerPredicate) {
                 }))
                 .toList();
         threads.forEach(Thread::start);
-        LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(1));
-        // Start the race
-        starter.countDown();
         threads.forEach(StableValueTest::join);
         // There can only be one winner
         assertEquals(1, winners.values().stream().filter(b -> b).count());
diff --git a/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
index 5017fb4e11a..95721d88cec 100644
--- a/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/stable/StableMethodHandleBenchmark.java
@@ -65,7 +65,8 @@ public class StableMethodHandleBenchmark {
 
     private static final MethodHandle FINAL_MH = identityHandle();
     private static final StableValue<MethodHandle> STABLE_MH;
-    private static MethodHandle mh = identityHandle();
+
+    private static /* intentionally not final */ MethodHandle mh = identityHandle();
     private static final Dcl<MethodHandle> DCL = new Dcl<>(StableMethodHandleBenchmark::identityHandle);
     private static final AtomicReference<MethodHandle> ATOMIC_REFERENCE = new AtomicReference<>(identityHandle());
     private static final Map<String, MethodHandle> MAP = new ConcurrentHashMap<>();
@@ -112,14 +113,6 @@ public int stableMh() throws Throwable {
         return (int) STABLE_MH.orElseThrow().invokeExact(1);
     }
 
-    Object cp() {
-        CodeBuilder cob = null;
-        ConstantPoolBuilder cp = ConstantPoolBuilder.of();
-        cob.ldc(cp.constantDynamicEntry(cp.bsmEntry(cp.methodHandleEntry(BSM_CLASS_DATA), List.of()),
-                cp.nameAndTypeEntry(DEFAULT_NAME, CD_MethodHandle)));
-        return null;
-    }
-
     static MethodHandle identityHandle() {
         var lookup = MethodHandles.lookup();
         try {

From 64a858c7b832447c3dcf4a39a2b0929bc4d70c39 Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Tue, 13 May 2025 14:04:53 +0000
Subject: [PATCH 431/901] 8355992: Add unsignedMultiplyExact and *powExact
 methods to Math and StrictMath

Reviewed-by: darcy
---
 .../share/classes/java/lang/Math.java         | 225 ++++++++++
 .../share/classes/java/lang/StrictMath.java   | 107 +++++
 test/jdk/java/lang/Math/IntegralPowTest.java  | 392 ++++++++++++++++++
 3 files changed, 724 insertions(+)
 create mode 100644 test/jdk/java/lang/Math/IntegralPowTest.java

diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 5f664b54cdf..9956077bb09 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -3419,4 +3419,229 @@ static float powerOfTwoF(int n) {
                                      (FloatConsts.SIGNIFICAND_WIDTH-1))
                                     & FloatConsts.EXP_BIT_MASK);
     }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code int}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned int
+     * @since 25
+     */
+    public static int unsignedMultiplyExact(int x, int y) {
+        long r = (x & 0xFFFF_FFFFL) * (y & 0xFFFF_FFFFL);
+        if (r >>> 32 != 0) {
+            throw new ArithmeticException("unsigned integer overflow");
+        }
+        return (int)r;
+    }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned long
+     * @since 25
+     */
+    public static long unsignedMultiplyExact(long x, int y) {
+        return unsignedMultiplyExact(x, y & 0xFFFF_FFFFL);
+    }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned long
+     * @since 25
+     */
+    public static long unsignedMultiplyExact(long x, long y) {
+        long l = x * y;
+        long h = unsignedMultiplyHigh(x, y);
+        if (h == 0) {
+            return l;
+        }
+        throw new ArithmeticException("unsigned long overflow");
+    }
+
+    /**
+     * Returns {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an {@code int}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an int.
+     * @since 25
+     */
+    public static int powExact(int x, int n) {
+        /* See the comment in unsignedPowExact(long,int) for the details. */
+        if (n < 0) {
+            throw new ArithmeticException("negative exponent");
+        }
+        if (n == 0) {
+            return 1;
+        }
+        if (x == 0 || x == 1) {
+            return x;
+        }
+        if (x == -1) {
+            return (n & 0b1) == 0 ? 1 : -1;
+        }
+
+        int p = 1;
+        while (n > 1) {
+            if ((n & 0b1) != 0) {
+                p *= x;
+            }
+            x = multiplyExact(x, x);
+            n >>>= 1;
+        }
+        return multiplyExact(p, x);
+    }
+
+    /**
+     * Returns unsigned {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an unsigned {@code int}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the unsigned base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an unsigned int.
+     * @since 25
+     */
+    public static int unsignedPowExact(int x, int n) {
+        /* See the comment in unsignedPowExact(long,int) for the details. */
+        if (n < 0) {
+            throw new ArithmeticException("negative exponent");
+        }
+        if (n == 0) {
+            return 1;
+        }
+        if (x == 0 || x == 1) {
+            return x;
+        }
+
+        int p = 1;
+        while (n > 1) {
+            if ((n & 0b1) != 0) {
+                p *= x;
+            }
+            x = unsignedMultiplyExact(x, x);
+            n >>>= 1;
+        }
+        return unsignedMultiplyExact(p, x);
+    }
+
+    /**
+     * Returns {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows a {@code long}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows a long.
+     * @since 25
+     */
+    public static long powExact(long x, int n) {
+        /* See the comment in unsignedPowExact(long,int) for the details. */
+        if (n < 0) {
+            throw new ArithmeticException("negative exponent");
+        }
+        if (n == 0) {
+            return 1;
+        }
+        if (x == 0 || x == 1) {
+            return x;
+        }
+        if (x == -1) {
+            return (n & 0b1) != 0 ? -1 : 1;
+        }
+
+        long p = 1;
+        while (n > 1) {
+            if ((n & 0b1) != 0) {
+                p *= x;
+            }
+            x = multiplyExact(x, x);
+            n >>>= 1;
+        }
+        return multiplyExact(p, x);
+    }
+
+    /**
+     * Returns unsigned {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the unsigned base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an unsigned long.
+     * @since 25
+     */
+    public static long unsignedPowExact(long x, int n) {
+        if (n < 0) {
+            throw new ArithmeticException("negative exponent");
+        }
+        if (n == 0) {
+            return 1;
+        }
+        /*
+         * To keep the code as simple as possible, there are intentionally
+         * no fast paths, except for |x| <= 1.
+         * The reason is that the number of loop iterations below can be kept
+         * very small when |x| > 1, but not necessarily when |x| <= 1.
+         */
+        if (x == 0 || x == 1) {
+            return x;
+        }
+
+        /*
+         * Let x0 and n0 > 0 be the entry values of x and n, resp.
+         * The useful loop invariants are:
+         *      p * x^n = x0^n0
+         *      |p| < |x|
+         *
+         * Since |x0| >= 2 here, and since |x0|^(2^6) >= 2^Long.SIZE, the squaring
+         * of x in the loop overflows at latest during the 6th iteration,
+         * so by then the method throws.
+         * Thus, the loop executes at most 5 successful iterations, and fails
+         * not later than at the 6th.
+         *
+         * But n is right-shifted at each iteration.
+         * If the method returns, there are thus floor(log2(n0)) iterations.
+         */
+        long p = 1;
+        while (n > 1) {
+            if ((n & 0b1) != 0) {
+                /*
+                 * The invariant |p| < |x| holds, so we have |p*x| < |x*x|.
+                 * That is, if p*x overflows, so does x*x below, which is
+                 * always executed.
+                 * In other words, a plain * can be used here, since we are
+                 * piggybacking on the squaring of x to throw.
+                 */
+                p *= x;
+            }
+            x = unsignedMultiplyExact(x, x);
+            n >>>= 1;
+        }
+        return unsignedMultiplyExact(p, x);
+    }
+
 }
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index e3b51ed752c..266d98e3947 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -2594,4 +2594,111 @@ public static double scalb(double d, int scaleFactor) {
     public static float scalb(float f, int scaleFactor) {
         return Math.scalb(f, scaleFactor);
     }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code int}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned int
+     * @since 25
+     */
+    public static int unsignedMultiplyExact(int x, int y) {
+        return Math.unsignedMultiplyExact(x, y);
+    }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned long
+     * @since 25
+     */
+    public static long unsignedMultiplyExact(long x, int y) {
+        return Math.unsignedMultiplyExact(x, y);
+    }
+
+    /**
+     * Returns the product of the unsigned arguments,
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     *
+     * @param x the first unsigned value
+     * @param y the second unsigned value
+     * @return the result
+     * @throws ArithmeticException if the result overflows an unsigned long
+     * @since 25
+     */
+    public static long unsignedMultiplyExact(long x, long y) {
+        return Math.unsignedMultiplyExact(x, y);
+    }
+
+    /**
+     * Returns {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an {@code int}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an int.
+     * @since 25
+     */
+    public static int powExact(int x, int n) {
+        return Math.powExact(x, n);
+    }
+
+    /**
+     * Returns unsigned {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an unsigned {@code int}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the unsigned base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an unsigned int.
+     * @since 25
+     */
+    public static int unsignedPowExact(int x, int n) {
+        return Math.unsignedPowExact(x, n);
+    }
+
+    /**
+     * Returns {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows a {@code long}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows a long.
+     * @since 25
+     */
+    public static long powExact(long x, int n) {
+        return Math.powExact(x, n);
+    }
+
+    /**
+     * Returns unsigned {@code x} raised to the power of {@code n},
+     * throwing an exception if the result overflows an unsigned {@code long}.
+     * When {@code n} is 0, the returned value is 1.
+     *
+     * @param x the unsigned base.
+     * @param n the exponent.
+     * @return {@code x} raised to the power of {@code n}.
+     * @throws ArithmeticException when {@code n} is negative,
+     *      or when the result overflows an unsigned long.
+     * @since 25
+     */
+    public static long unsignedPowExact(long x, int n) {
+        return Math.unsignedPowExact(x, n);
+    }
+
 }
diff --git a/test/jdk/java/lang/Math/IntegralPowTest.java b/test/jdk/java/lang/Math/IntegralPowTest.java
new file mode 100644
index 00000000000..b0aadcc8d3b
--- /dev/null
+++ b/test/jdk/java/lang/Math/IntegralPowTest.java
@@ -0,0 +1,392 @@
+/*
+ * 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 8355992
+ * @summary Tests for StrictMath.*PowExact and .*unsignedMultiplyExact
+ * @run junit IntegralPowTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+
+import static java.lang.StrictMath.*;
+import static java.math.BigInteger.ONE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class IntegralPowTest {
+
+    private static final long MASK_32 = (1L << Integer.SIZE) - 1;  // 2^32 - 1
+    private static final BigInteger MASK_64 = ONE.shiftLeft(Long.SIZE).subtract(ONE);  // 2^64 - 1
+    private static final double INT_F = Integer.SIZE * Math.log(2);
+    private static final double LONG_F = Long.SIZE * Math.log(2);
+    private static final int INT_XMAX = 0x1_0000;
+    private static final int LONG_XMAX = 0x10_0000;
+
+    private static BigInteger unsignedBigInteger(int x) {
+        return BigInteger.valueOf(x & MASK_32);
+    }
+
+    private static BigInteger unsignedBigInteger(long x) {
+        return BigInteger.valueOf(x).and(MASK_64);
+    }
+
+    private static int slowPowExact(int x, int n) {
+        BigInteger pow = BigInteger.valueOf(x).pow(n);
+        return pow.intValueExact();
+    }
+
+    private static int slowUnsignedPowExact(int x, int n) {
+        BigInteger pow = unsignedBigInteger(x).pow(n);
+        if (pow.bitLength() > Integer.SIZE) {
+            throw new ArithmeticException();
+        }
+        return pow.intValue();
+    }
+
+    private static long slowPowExact(long x, int n) {
+        BigInteger pow = BigInteger.valueOf(x).pow(n);
+        return pow.longValueExact();
+    }
+
+    private static long slowUnsignedPowExact(long x, int n) {
+        BigInteger pow = unsignedBigInteger(x).pow(n);
+        if (pow.bitLength() > Long.SIZE) {
+            throw new ArithmeticException();
+        }
+        return pow.longValue();
+    }
+
+    @Test
+    void testIntUnsignedMultiplyExact() {
+        assertEquals(0, unsignedMultiplyExact(0, 0));
+        assertEquals(0, unsignedMultiplyExact(1, 0));
+        assertEquals(0, unsignedMultiplyExact(-1, 0));
+        assertEquals(1, unsignedMultiplyExact(1, 1));
+        assertEquals(-1, unsignedMultiplyExact(1, -1));
+        assertEquals(1 << 31, unsignedMultiplyExact(1 << 15, 1 << 16));
+        assertEquals(1 << 31, unsignedMultiplyExact(1 << 10, 1 << 21));
+        /* 2^32 - 1 = (2^16 + 1) (2^16 - 1) */
+        assertEquals(-1, unsignedMultiplyExact((1 << 16) + 1, (1 << 16) - 1));
+
+        assertThrows(ArithmeticException.class, () -> unsignedMultiplyExact(-1, -1));
+    }
+
+    @Test
+    void testLongIntUnsignedMultiplyExact() {
+        assertEquals(0L, unsignedMultiplyExact(0L, 0));
+        assertEquals(0L, unsignedMultiplyExact(1L, 0));
+        assertEquals(0L, unsignedMultiplyExact(-1L, 0));
+        assertEquals(1L, unsignedMultiplyExact(1L, 1));
+        assertEquals(-3 & MASK_32, unsignedMultiplyExact(1L, -3));
+        assertEquals(1L << 50, unsignedMultiplyExact(1L << 25, 1 << 25));
+        /* 2^64 - 1 = (2^32 + 1) (2^32 - 1) */
+        assertEquals(-1L, unsignedMultiplyExact((1L << 32) + 1, -1));
+
+        assertThrows(ArithmeticException.class, () -> unsignedMultiplyExact(-1L, -1));
+    }
+
+    @Test
+    void testLongUnsignedMultiplyExact() {
+        assertEquals(0L, unsignedMultiplyExact(0L, 0L));
+        assertEquals(0L, unsignedMultiplyExact(1L, 0L));
+        assertEquals(0L, unsignedMultiplyExact(-1L, 0L));
+        assertEquals(1L, unsignedMultiplyExact(1L, 1L));
+        assertEquals(-1L, unsignedMultiplyExact(1L, -1L));
+        assertEquals(1L << 63, unsignedMultiplyExact(1L << 31, 1L << 32));
+        assertEquals(1L << 63, unsignedMultiplyExact(1L << 25, 1L << 38));
+        /* 2^64 - 1 = (2^32 + 1) (2^32 - 1) */
+        assertEquals(-1L, unsignedMultiplyExact((1L << 32) + 1, (1L << 32) - 1));
+
+        assertThrows(ArithmeticException.class, () -> unsignedMultiplyExact(-1L, -1L));
+    }
+
+    @Test
+    void testIntPowExact() {
+        assertEquals(1, powExact(0, 0));
+        assertEquals(0, powExact(0, 1_000_000));
+        assertEquals(1, powExact(1, 0));
+        assertEquals(1, powExact(1, 1_000_000));
+        assertEquals(1, powExact(-1, 0));
+        assertEquals(1, powExact(-1, 1_000_000));
+        assertEquals(-1, powExact(-1, 1_000_001));
+
+        assertEquals(1 << -2, powExact(2, Integer.SIZE - 2));
+        assertEquals(-1 << -1, powExact(-2, Integer.SIZE - 1));
+        assertEquals(1_000_000_000, powExact(10, 9));
+        assertEquals(-1_000_000_000, powExact(-10, 9));
+
+        assertThrows(ArithmeticException.class, () -> powExact(0, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> powExact(1, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> powExact(2, Integer.SIZE - 1));
+        assertThrows(ArithmeticException.class, () -> powExact(10, 10));
+        assertThrows(ArithmeticException.class, () -> powExact(-10, 10));
+    }
+
+    @Test
+    void testUnsignedIntPowExact() {
+        assertEquals(1, unsignedPowExact(0, 0));
+        assertEquals(0, unsignedPowExact(0, 1_000_000));
+        assertEquals(1, unsignedPowExact(1, 0));
+        assertEquals(1, unsignedPowExact(1, 1_000_000));
+        assertEquals(1, unsignedPowExact(-1, 0));
+        assertEquals(-1, unsignedPowExact(-1, 1));
+
+        assertEquals(1 << -1, unsignedPowExact(2, Integer.SIZE - 1));
+        assertEquals(1_000_000_000, unsignedPowExact(10, 9));
+
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(0, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(1, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(-1, 2));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(2, Integer.SIZE));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(10, 10));
+    }
+
+    @Test
+    void testLongPowExact() {
+        assertEquals(1L, powExact(0L, 0));
+        assertEquals(0L, powExact(0L, 1_000_000));
+        assertEquals(1L, powExact(1L, 0));
+        assertEquals(1L, powExact(1L, 1_000_000));
+        assertEquals(1L, powExact(-1L, 0));
+        assertEquals(1L, powExact(-1L, 1_000_000));
+        assertEquals(-1L, powExact(-1L, 1_000_001));
+
+        assertEquals(1L << -2, powExact(2L, Long.SIZE - 2));
+        assertEquals(-1L << -1, powExact(-2L, Long.SIZE - 1));
+        assertEquals(1_000_000_000_000_000_000L, powExact(10L, 18));
+        assertEquals(-100_000_000_000_000_000L, powExact(-10L, 17));
+        assertEquals(1_000_000_000_000_000_000L, powExact(-10L, 18));
+
+        assertThrows(ArithmeticException.class, () -> powExact(0L, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> powExact(1L, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> powExact(2L, Long.SIZE - 1));
+        assertThrows(ArithmeticException.class, () -> powExact(10L, 19));
+        assertThrows(ArithmeticException.class, () -> powExact(-10L, 19));
+    }
+
+    @Test
+    void testUnsignedLongPowExact() {
+        assertEquals(1L, unsignedPowExact(0L, 0));
+        assertEquals(0L, unsignedPowExact(0L, 1_000_000));
+        assertEquals(1L, unsignedPowExact(1L, 0));
+        assertEquals(1L, unsignedPowExact(1L, 1_000_000));
+        assertEquals(1L, unsignedPowExact(-1L, 0));
+        assertEquals(-1L, unsignedPowExact(-1L, 1));
+
+        assertEquals(1L << -1, unsignedPowExact(2L, Long.SIZE - 1));
+        assertEquals(10 * 1_000_000_000_000_000_000L, unsignedPowExact(10L, 19));
+
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(0L, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(1L, -1_000_000));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(-1L, 2));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(2L, Long.SIZE));
+        assertThrows(ArithmeticException.class, () -> unsignedPowExact(10L, 20));
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static int expected(int x, int n) {
+        try {
+            return powExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static int actual(int x, int n) {
+        try {
+            return slowPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static int expectedUnsigned(int x, int n) {
+        try {
+            return unsignedPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static int actualUnsigned(int x, int n) {
+        try {
+            return slowUnsignedPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static long expected(long x, int n) {
+        try {
+            return powExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static long actual(long x, int n) {
+        try {
+            return slowPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static long expectedUnsigned(long x, int n) {
+        try {
+            return unsignedPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /*
+     * Assumes that x^n != 0
+     * Returns x^n, or 0 on overflow
+     */
+    private static long actualUnsigned(long x, int n) {
+        try {
+            return slowUnsignedPowExact(x, n);
+        } catch (ArithmeticException ignore) {
+            return 0;
+        }
+    }
+
+    /* signed int */
+
+    @Test
+    void testPositiveIntPowExact() {
+        for (int x = 2; x <= INT_XMAX; x += 1) {
+            /* An estimate for the max n such that x^n does not overflow. */
+            int nmax = (int) ceil(INT_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actual(x, n), expected(x, n));
+            }
+            int x0 = x;
+            assertThrows(ArithmeticException.class, () -> powExact(x0, nmax + 1));
+        }
+    }
+
+    @Test
+    void testNegativeIntPowExact() {
+        for (int x = 2; x <= INT_XMAX; x += 1) {
+            /* An estimate for the max n such that (-x)^n does not overflow. */
+            int nmax = (int) ceil(INT_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actual(-x, n), expected(-x, n));
+            }
+            int x0 = x;
+            assertThrows(ArithmeticException.class, () -> powExact(-x0, nmax + 1));
+        }
+    }
+
+    /* unsigned int */
+
+    @Test
+    void testSmallUnsignedIntPowExact() {
+        for (int x = 2; x <= INT_XMAX; x += 1) {
+            /* An estimate for the max n such that x^n does not overflow. */
+            int nmax = (int) ceil(INT_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actualUnsigned(x, n), expectedUnsigned(x, n));
+            }
+            int x0 = x;
+            assertThrows(ArithmeticException.class, () -> unsignedPowExact(x0, nmax + 1));
+        }
+    }
+
+    /* signed long */
+
+    @Test
+    void testPositiveLongPowExact() {
+        for (long x = 2; x <= LONG_XMAX; x += 5) {
+            /* An estimate for the max n such that x^n does not overflow. */
+            int nmax = (int) ceil(LONG_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actual(x, n), expected(x, n));
+            }
+            long x0 = x;
+            assertThrows(ArithmeticException.class, () -> powExact(x0, nmax + 1));
+        }
+    }
+
+    @Test
+    void testNegativeLongPowExact() {
+        for (long x = 2; x <= LONG_XMAX; x += 5) {
+            /* An estimate for the max n such that (-x)^n does not overflow. */
+            int nmax = (int) ceil(LONG_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actual(-x, n), expected(-x, n));
+            }
+            long x0 = x;
+            assertThrows(ArithmeticException.class, () -> powExact(-x0, nmax + 1));
+        }
+    }
+
+    /* unsigned long */
+
+    @Test
+    void testSmallUnsignedLongPowExact() {
+        for (long x = 2; x <= LONG_XMAX; x += 5) {
+            /* An estimate for the max n such that x^n does not overflow. */
+            int nmax = (int) ceil(LONG_F / log(x));
+            for (int n = 0; n <= nmax; ++n) {
+                assertEquals(actualUnsigned(x, n), expectedUnsigned(x, n));
+            }
+            long x0 = x;
+            assertThrows(ArithmeticException.class, () -> unsignedPowExact(x0, nmax + 1));
+        }
+    }
+
+}

From b8c69dfb2adb0eb8cce6b5e81a7388a6430eb8fb Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Tue, 13 May 2025 14:31:17 +0000
Subject: [PATCH 432/901] 8356551: Javac rejects receiver parameter in
 constructor of local class in early construction context

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Attr.java        |  2 +-
 .../com/sun/tools/javac/comp/Resolve.java     | 19 ++++++++++++++-----
 .../tools/javac/SuperInit/SuperInitGood.java  | 17 +++++++++++++++--
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 27dea4d5877..8f955fbb392 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4544,7 +4544,7 @@ private Symbol selectSym(JCFieldAccess tree,
                     return rs.resolveQualifiedMethod(
                         pos, env, location, site, name, resultInfo.pt.getParameterTypes(), resultInfo.pt.getTypeArguments());
                 } else if (name == names._this || name == names._super) {
-                    return rs.resolveSelf(pos, env, site.tsym, name);
+                    return rs.resolveSelf(pos, env, site.tsym, tree);
                 } else if (name == names._class) {
                     // In this case, we have already made sure in
                     // visitSelect that qualifier expression is a type.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 82a419e3265..5719332315f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.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
@@ -3855,13 +3855,14 @@ Symbol findLocalClassOwner(Env<AttrContext> env, TypeSymbol c) {
      * Resolve `c.name' where name == this or name == super.
      * @param pos           The position to use for error reporting.
      * @param env           The environment current at the expression.
-     * @param c             The qualifier.
-     * @param name          The identifier's name.
+     * @param c             The type of the selected expression
+     * @param tree          The expression
      */
     Symbol resolveSelf(DiagnosticPosition pos,
                        Env<AttrContext> env,
                        TypeSymbol c,
-                       Name name) {
+                       JCFieldAccess tree) {
+        Name name = tree.name;
         Assert.check(name == names._this || name == names._super);
         Env<AttrContext> env1 = env;
         boolean staticOnly = false;
@@ -3872,7 +3873,9 @@ Symbol resolveSelf(DiagnosticPosition pos,
                 if (sym != null) {
                     if (staticOnly)
                         sym = new StaticError(sym);
-                    else if (env1.info.ctorPrologue && !isAllowedEarlyReference(pos, env1, (VarSymbol)sym))
+                    else if (env1.info.ctorPrologue &&
+                            !isReceiverParameter(env, tree) &&
+                            !isAllowedEarlyReference(pos, env1, (VarSymbol)sym))
                         sym = new RefBeforeCtorCalledError(sym);
                     return accessBase(sym, pos, env.enclClass.sym.type,
                             name, true);
@@ -3924,6 +3927,12 @@ private List<Type> pruneInterfaces(Type t) {
         }
         return result.toList();
     }
+    private boolean isReceiverParameter(Env<AttrContext> env, JCFieldAccess tree) {
+        if (env.tree.getTag() != METHODDEF)
+            return false;
+        JCMethodDecl method = (JCMethodDecl)env.tree;
+        return method.recvparam != null && tree == method.recvparam.nameexpr;
+    }
 
     /**
      * Determine if an early instance field reference may appear in a constructor prologue.
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitGood.java b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
index 83815f851e3..4521f3395ab 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitGood.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8194743
+ * @bug 8194743 8345438 8356551
  * @summary Test valid placements of super()/this() in constructors
  */
 
@@ -453,7 +453,7 @@ public void bar() {
         }
     }
 
-    // Lambdas within constructors
+    // Lambdas within constructors (JDK-8345438)
     public static class Test22 {
         public Test22() {
             Runnable r = () -> System.out.println();
@@ -489,6 +489,18 @@ class A {
         }
     }
 
+    // Receiver parameter syntax (JDK-8356551)
+    public static class Test23 {
+        public Test23() {
+            class Local {
+                Local(Test23 Test23.this) {
+                }
+            }
+            super();
+            new Local();
+        }
+    }
+
     public static void main(String[] args) {
         new Test0();
         new Test1();
@@ -534,5 +546,6 @@ public static void main(String[] args) {
         new Test21((int)123);
         new Test21((float)123);
         new Test22('x');
+        new Test23();
     }
 }

From 0318e49500edb129159030589472089ec21f2f58 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 13 May 2025 15:21:30 +0000
Subject: [PATCH 433/901] 8351415: (fs) Path::toAbsolutePath should specify if
 an absolute path has a root component

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

diff --git a/src/java.base/share/classes/java/nio/file/Path.java b/src/java.base/share/classes/java/nio/file/Path.java
index 827dd56a6a4..330af173012 100644
--- a/src/java.base/share/classes/java/nio/file/Path.java
+++ b/src/java.base/share/classes/java/nio/file/Path.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 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
@@ -749,7 +749,9 @@ default Path resolveSibling(String other) {
 
     /**
      * Returns a {@code Path} object representing the absolute path of this
-     * path.
+     * path. Where this {@code Path} is associated with the default provider,
+     * then the returned absolute path will have a non-{@code null}
+     * {@linkplain #getRoot root component}.
      *
      * <p> If this path is already {@link Path#isAbsolute absolute} then this
      * method simply returns this path. Otherwise, this method resolves the path

From 08b2df80c68e182fbf6b1fc94e991c02b23040ec Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 13 May 2025 15:58:59 +0000
Subject: [PATCH 434/901] 8356447: Change default for EagerJVMCI to true

Reviewed-by: yzheng, kvn, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp  |  7 ++++++-
 src/hotspot/share/jvmci/jvmci_globals.cpp      |  1 +
 src/hotspot/share/jvmci/jvmci_globals.hpp      |  3 ++-
 .../jdk/vm/ci/hotspot/CompilerToVM.java        |  5 +++++
 .../ci/hotspot/HotSpotJVMCICompilerConfig.java | 18 +++++++++++++++++-
 .../jvmci/TestJVMCIPrintProperties.java        |  1 +
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index a4a8f3bb1d0..b4b8150917d 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -3231,7 +3231,11 @@ C2V_END
 
 C2V_VMENTRY_0(jint, getCompilationActivityMode, (JNIEnv* env, jobject))
   return CompileBroker::get_compilation_activity_mode();
-}
+C2V_END
+
+C2V_VMENTRY_0(jboolean, isCompilerThread, (JNIEnv* env, jobject))
+  return thread->is_Compiler_thread();
+C2V_END
 
 #define CC (char*)  /*cast a literal from (const char*)*/
 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
@@ -3396,6 +3400,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "getOopMapAt",                                  CC "(" HS_METHOD2 "I[J)V",                                                            FN_PTR(getOopMapAt)},
   {CC "updateCompilerThreadCanCallJava",              CC "(Z)Z",                                                                            FN_PTR(updateCompilerThreadCanCallJava)},
   {CC "getCompilationActivityMode",                   CC "()I",                                                                             FN_PTR(getCompilationActivityMode)},
+  {CC "isCompilerThread",                             CC "()Z",                                                                             FN_PTR(isCompilerThread)},
 };
 
 int CompilerToVM::methods_count() {
diff --git a/src/hotspot/share/jvmci/jvmci_globals.cpp b/src/hotspot/share/jvmci/jvmci_globals.cpp
index d4d52afd069..d5a23a59982 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.cpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.cpp
@@ -86,6 +86,7 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
       return false;
     }
     FLAG_SET_DEFAULT(EnableJVMCI, true);
+    FLAG_SET_ERGO_IF_DEFAULT(EagerJVMCI, true);
   }
 
   if (EnableJVMCI) {
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index 5bcead9ff7b..fc1607b8393 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -88,7 +88,8 @@ class fileStream;
           "-XX:-TieredCompilation makes JVMCI compile more of itself.")     \
                                                                             \
   product(bool, EagerJVMCI, false, EXPERIMENTAL,                            \
-          "Force eager JVMCI initialization")                               \
+          "Force eager JVMCI initialization. Defaults to true if "          \
+          "UseJVMCICompiler is true.")                                      \
                                                                             \
   product(bool, PrintBootstrap, true, EXPERIMENTAL,                         \
           "Print JVMCI bootstrap progress and summary")                     \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index 9c64126c62d..d7356659296 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -1528,4 +1528,9 @@ void getOopMapAt(HotSpotResolvedJavaMethodImpl method, int bci, long[] oopMap) {
      * {@code stop_compilation = 0}, {@code run_compilation = 1} or {@code shutdown_compilation = 2}
      */
     native int getCompilationActivityMode();
+
+    /**
+     * Returns whether the current thread is a CompilerThread.
+     */
+    native boolean isCompilerThread();
 }
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 d4c824f6a27..8767531451b 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
@@ -51,11 +51,27 @@ private static class DummyCompilerFactory implements JVMCICompilerFactory, JVMCI
         DummyCompilerFactory(String reason, HotSpotJVMCIRuntime runtime) {
             this.reason = reason;
             this.runtime = runtime;
+            if (runtime.getConfig().getFlag("EagerJVMCI", Boolean.class)) {
+                if (runtime.getCompilerToVM().isCompilerThread()) {
+                    throw noCompilerError();
+                } else {
+                    // This path will be taken when initializing JVMCI on a non-JIT thread.
+                    // Such a usage of JVMCI might never request a compilation so delay the
+                    // noCompilerError until such a request is made.
+                }
+            }
+        }
+
+        /**
+         * Exits the VM due to unavailability of a JVMCI compiler.
+         */
+        Error noCompilerError() {
+            throw runtime.exitHotSpotWithMessage(1, "Cannot use JVMCI compiler: %s%n", reason);
         }
 
         @Override
         public HotSpotCompilationRequestResult compileMethod(CompilationRequest request) {
-            throw runtime.exitHotSpotWithMessage(1, "Cannot use JVMCI compiler: %s%n", reason);
+            throw noCompilerError();
         }
 
         @Override
diff --git a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
index e58bc4df169..1d76655382d 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestJVMCIPrintProperties.java
@@ -45,6 +45,7 @@ static void test(String enableFlag) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
             enableFlag, "-Djvmci.Compiler=null",
+            "-XX:-EagerJVMCI",
             "-XX:+JVMCIPrintProperties");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("[JVMCI properties]"); // expected message

From d1543429ff29ca0d761b8473b3fb8621abcd226d Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Tue, 13 May 2025 17:05:15 +0000
Subject: [PATCH 435/901] 8356107: [java.lang] Use @requires tag instead of
 exiting based on os.name or separatorChar property

Reviewed-by: naoto, bpb
---
 .../lang/ProcessBuilder/SiblingIOEHandle.java |  7 +--
 .../java/lang/RuntimeTests/exec/Space.java    | 11 ++--
 .../java/lang/RuntimeTests/exec/Status.java   |  7 +--
 .../lang/System/NonAnsiFileEncodingTest.java  | 63 -------------------
 4 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 test/jdk/java/lang/System/NonAnsiFileEncodingTest.java

diff --git a/test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.java b/test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.java
index 2e3cc0b78c8..0aecae7dc40 100644
--- a/test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.java
+++ b/test/jdk/java/lang/ProcessBuilder/SiblingIOEHandle.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
@@ -26,6 +26,7 @@
  * @bug 6921885
  * @run main/othervm SiblingIOEHandle
  * @summary inherit IOE handles and MS CreateProcess limitations (kb315939)
+ * @requires (os.family == "windows")
  */
 
 import java.io.BufferedReader;
@@ -58,10 +59,6 @@ private static String[] getCommandArray(String processName) {
     }
 
     public static void main(String[] args) {
-        if (!System.getProperty("os.name").startsWith("Windows")) {
-            return;
-        }
-
         APP app = (args.length > 0) ? APP.valueOf(args[0]) : APP.A;
         switch (app) {
             case A:
diff --git a/test/jdk/java/lang/RuntimeTests/exec/Space.java b/test/jdk/java/lang/RuntimeTests/exec/Space.java
index 02debae3491..ef24376ce19 100644
--- a/test/jdk/java/lang/RuntimeTests/exec/Space.java
+++ b/test/jdk/java/lang/RuntimeTests/exec/Space.java
@@ -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.
  * 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,13 @@
 /* @test 1.4 00/10/18
    @bug 4231349
    @summary test runtime.exec on windows for extra space in cmd
+   @requires (os.family == "windows")
  */
 import java.io.*;
 
 public class Space {
     public static void main(String[] args) throws Exception {
-        if (File.separatorChar == '\\') {
-            try {
+        try {
             Process p = Runtime.getRuntime().exec( "cmd /c echo hello" );
             BufferedReader reader = new BufferedReader(
                                     new InputStreamReader(p.getInputStream()));
@@ -38,10 +38,9 @@ public static void main(String[] args) throws Exception {
             String echo = reader.readLine();
             if (echo.length() == 6)
                 throw new RuntimeException("Extra space in command.");
-            } catch (IOException e) {
-            // not Win NT - cmd doesnt exist
+        } catch (IOException e) {
+            // not Win NT - cmd doesn't exist
             return;
-            }
         }
     }
 }
diff --git a/test/jdk/java/lang/RuntimeTests/exec/Status.java b/test/jdk/java/lang/RuntimeTests/exec/Status.java
index 5a976c98f3d..ab0165c52e2 100644
--- a/test/jdk/java/lang/RuntimeTests/exec/Status.java
+++ b/test/jdk/java/lang/RuntimeTests/exec/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, 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
@@ -25,6 +25,7 @@
  * @bug 4763362
  * @summary Ensure that Process.waitFor returns the correct status code
  *          even for very short-running subprocesses
+ * @requires (os.family == "linux")
  */
 
 
@@ -35,10 +36,6 @@ public class Status {
     public static void main(String args[])
         throws Exception
     {
-        if (!System.getProperty("os.name").equals("Linux")) {
-            System.out.println("Only for Linux");
-            return;
-        }
         UnixCommands.ensureCommandsAvailable("false");
 
         final String falseCmd = UnixCommands.findCommand("false");
diff --git a/test/jdk/java/lang/System/NonAnsiFileEncodingTest.java b/test/jdk/java/lang/System/NonAnsiFileEncodingTest.java
deleted file mode 100644
index 1683e711765..00000000000
--- a/test/jdk/java/lang/System/NonAnsiFileEncodingTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4459099
- * @key i18n
- * @summary Tests non ANSI code page locales set default file encoding
- * to "utf-8".  This test must be run on Windows 2K/XP in one of Armenian,
- * Georgian, Hindi, Punjabi, Gujarati, Tamil, Telugu, Kannada, Marathi,
- * or Sanskrit languages.
- */
-
-public class NonAnsiFileEncodingTest {
-    public static void main(String[] s)  {
-        String OS = System.getProperty("os.name");
-        String lang = System.getProperty("user.language");
-        String fileenc = System.getProperty("file.encoding");
-
-        if (!(OS.equals("Windows 2000") || OS.equals("Windows XP"))) {
-            System.out.println("This test is not meaningful on the platform \"" + OS + "\".");
-            return;
-        }
-
-        if (!(lang.equals("hy") ||      // Armenian
-              lang.equals("ka") ||      // Georgian
-              lang.equals("hi") ||      // Hindi
-              lang.equals("pa") ||      // Punjabi
-              lang.equals("gu") ||      // Gujarati
-              lang.equals("ta") ||      // Tamil
-              lang.equals("te") ||      // Telugu
-              lang.equals("kn") ||      // Kannada
-              lang.equals("mr") ||      // Marathi
-              lang.equals("sa"))) {     // Sanskrit
-            System.out.println("Windows' locale settings for this test is incorrect.  Select one of \"Armenian\", \"Georgian\", \"Hindi\", \"Punjabi\", \"Gujarati\", \"Tamil\", \"Telugu\", \"Kannada\", \"Marathi\", or \"Sanskrit\" for the user locale, and \"English(United States)\" for the system default locale using the Control Panel.");
-            return;
-        }
-
-        if (!fileenc.equals("utf-8")) {
-            throw new RuntimeException("file.encoding is incorrectly set to \"" + fileenc + "\".  Should be \"utf-8\".");
-        }
-    }
-}

From 1569925af49552268c4847bd201fb95e0e3819b7 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Tue, 13 May 2025 18:06:32 +0000
Subject: [PATCH 436/901] 8356819: [macos] MacSign should use "openssl" and
 "faketime" from Homebrew by default

Reviewed-by: asemenyuk
---
 .../jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 67ac921b919..a97969e00b7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -1280,9 +1280,9 @@ static Executor security(String... args) {
     // 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"));
+    private static final Path OPENSSL = Path.of(Optional.ofNullable(TKit.getConfigProperty("openssl")).orElse("/usr/local/bin/openssl"));
 
     // faketime is not a standard macOS command.
     // One way to get it is with Homebrew.
-    private static final Path FAKETIME = Path.of(Optional.ofNullable(TKit.getConfigProperty("faketime")).orElse("faketime"));
+    private static final Path FAKETIME = Path.of(Optional.ofNullable(TKit.getConfigProperty("faketime")).orElse("/usr/local/bin/faketime"));
 }

From e7ce661adb01fba4bb690d51cc2858c822008654 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Tue, 13 May 2025 18:08:10 +0000
Subject: [PATCH 437/901] 8356667: GenShen: Eliminate races with
 ShenandoahFreeSet::available()

Reviewed-by: wkemper
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 21 ++++++++-
 .../share/gc/shenandoah/shenandoahFreeSet.hpp | 47 ++++++++++++++++---
 .../share/gc/shenandoah/shenandoahFullGC.cpp  | 16 +++++--
 .../share/gc/shenandoah/shenandoahFullGC.hpp  |  3 +-
 .../shenandoahGenerationalFullGC.cpp          |  9 +---
 .../shenandoahGenerationalFullGC.hpp          |  3 +-
 .../shenandoah/shenandoahGlobalGeneration.cpp |  5 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  3 +-
 .../share/gc/shenandoah/shenandoahMetrics.cpp |  1 +
 .../share/gc/shenandoah/shenandoahPacer.cpp   |  3 ++
 10 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 9787611d4fb..1acb6a23e7a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -220,6 +220,7 @@ inline idx_t ShenandoahRegionPartitions::rightmost(ShenandoahFreeSetPartitionId
 }
 
 void ShenandoahRegionPartitions::make_all_regions_unavailable() {
+  shenandoah_assert_heaplocked();
   for (size_t partition_id = 0; partition_id < IntNumPartitions; partition_id++) {
     _membership[partition_id].clear_all();
     _leftmosts[partition_id] = _max;
@@ -228,6 +229,7 @@ void ShenandoahRegionPartitions::make_all_regions_unavailable() {
     _rightmosts_empty[partition_id] = -1;;
     _capacity[partition_id] = 0;
     _used[partition_id] = 0;
+    _available[partition_id] = FreeSetUnderConstruction;
   }
   _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
 }
@@ -235,6 +237,8 @@ void ShenandoahRegionPartitions::make_all_regions_unavailable() {
 void ShenandoahRegionPartitions::establish_mutator_intervals(idx_t mutator_leftmost, idx_t mutator_rightmost,
                                                              idx_t mutator_leftmost_empty, idx_t mutator_rightmost_empty,
                                                              size_t mutator_region_count, size_t mutator_used) {
+  shenandoah_assert_heaplocked();
+
   _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost;
   _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_rightmost;
   _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_leftmost_empty;
@@ -243,6 +247,8 @@ void ShenandoahRegionPartitions::establish_mutator_intervals(idx_t mutator_leftm
   _region_counts[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count;
   _used[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_used;
   _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] = mutator_region_count * _region_size_bytes;
+  _available[int(ShenandoahFreeSetPartitionId::Mutator)] =
+    _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - _used[int(ShenandoahFreeSetPartitionId::Mutator)];
 
   _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)] = _max;
   _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)] = -1;
@@ -252,12 +258,15 @@ void ShenandoahRegionPartitions::establish_mutator_intervals(idx_t mutator_leftm
   _region_counts[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
   _used[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
   _capacity[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
+  _available[int(ShenandoahFreeSetPartitionId::Collector)] = 0;
 }
 
 void ShenandoahRegionPartitions::establish_old_collector_intervals(idx_t old_collector_leftmost, idx_t old_collector_rightmost,
                                                                    idx_t old_collector_leftmost_empty,
                                                                    idx_t old_collector_rightmost_empty,
                                                                    size_t old_collector_region_count, size_t old_collector_used) {
+  shenandoah_assert_heaplocked();
+
   _leftmosts[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_leftmost;
   _rightmosts[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_rightmost;
   _leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_leftmost_empty;
@@ -266,11 +275,16 @@ void ShenandoahRegionPartitions::establish_old_collector_intervals(idx_t old_col
   _region_counts[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_region_count;
   _used[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_used;
   _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] = old_collector_region_count * _region_size_bytes;
+  _available[int(ShenandoahFreeSetPartitionId::OldCollector)] =
+    _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] - _used[int(ShenandoahFreeSetPartitionId::OldCollector)];
 }
 
 void ShenandoahRegionPartitions::increase_used(ShenandoahFreeSetPartitionId which_partition, size_t bytes) {
+  shenandoah_assert_heaplocked();
   assert (which_partition < NumPartitions, "Partition must be valid");
+
   _used[int(which_partition)] += bytes;
+  _available[int(which_partition)] -= bytes;
   assert (_used[int(which_partition)] <= _capacity[int(which_partition)],
           "Must not use (%zu) more than capacity (%zu) after increase by %zu",
           _used[int(which_partition)], _capacity[int(which_partition)], bytes);
@@ -366,6 +380,7 @@ void ShenandoahRegionPartitions::retire_from_partition(ShenandoahFreeSetPartitio
 }
 
 void ShenandoahRegionPartitions::make_free(idx_t idx, ShenandoahFreeSetPartitionId which_partition, size_t available) {
+  shenandoah_assert_heaplocked();
   assert (idx < _max, "index is sane: %zu < %zu", idx, _max);
   assert (membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Cannot make free if already free");
   assert (which_partition < NumPartitions, "selected free partition must be valid");
@@ -374,6 +389,7 @@ void ShenandoahRegionPartitions::make_free(idx_t idx, ShenandoahFreeSetPartition
   _membership[int(which_partition)].set_bit(idx);
   _capacity[int(which_partition)] += _region_size_bytes;
   _used[int(which_partition)] += _region_size_bytes - available;
+  _available[int(which_partition)] += available;
   expand_interval_if_boundary_modified(which_partition, idx, available);
   _region_counts[int(which_partition)]++;
 }
@@ -398,6 +414,7 @@ bool ShenandoahRegionPartitions::available_implies_empty(size_t available_in_reg
 void ShenandoahRegionPartitions::move_from_partition_to_partition(idx_t idx, ShenandoahFreeSetPartitionId orig_partition,
                                                                   ShenandoahFreeSetPartitionId new_partition, size_t available) {
   ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(idx);
+  shenandoah_assert_heaplocked();
   assert (idx < _max, "index is sane: %zu < %zu", idx, _max);
   assert (orig_partition < NumPartitions, "Original partition must be valid");
   assert (new_partition < NumPartitions, "New partition must be valid");
@@ -436,10 +453,12 @@ void ShenandoahRegionPartitions::move_from_partition_to_partition(idx_t idx, She
 
   _capacity[int(orig_partition)] -= _region_size_bytes;
   _used[int(orig_partition)] -= used;
+  _available[int(orig_partition)] -= available;
   shrink_interval_if_boundary_modified(orig_partition, idx);
 
   _capacity[int(new_partition)] += _region_size_bytes;;
   _used[int(new_partition)] += used;
+  _available[int(new_partition)] += available;
   expand_interval_if_boundary_modified(new_partition, idx, available);
 
   _region_counts[int(orig_partition)]--;
@@ -1363,11 +1382,11 @@ void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
 }
 
 void ShenandoahFreeSet::clear() {
-  shenandoah_assert_heaplocked();
   clear_internal();
 }
 
 void ShenandoahFreeSet::clear_internal() {
+  shenandoah_assert_heaplocked();
   _partitions.make_all_regions_unavailable();
 
   _alloc_bias_weight = 0;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 902e6547afd..4d22d7aa923 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -80,6 +80,7 @@ class ShenandoahRegionPartitions {
   // and _used[p], even though the region may have been removed from the free set.
   size_t _capacity[UIntNumPartitions];
   size_t _used[UIntNumPartitions];
+  size_t _available[UIntNumPartitions];
   size_t _region_counts[UIntNumPartitions];
 
   // For each partition p, _left_to_right_bias is true iff allocations are normally made from lower indexed regions
@@ -108,6 +109,8 @@ class ShenandoahRegionPartitions {
   ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set);
   ~ShenandoahRegionPartitions() {}
 
+  static const size_t FreeSetUnderConstruction = SIZE_MAX;
+
   // Remove all regions from all partitions and reset all bounds
   void make_all_regions_unavailable();
 
@@ -220,17 +223,43 @@ class ShenandoahRegionPartitions {
 
   inline size_t available_in(ShenandoahFreeSetPartitionId which_partition) const {
     assert (which_partition < NumPartitions, "selected free set must be valid");
-    return _capacity[int(which_partition)] - _used[int(which_partition)];
+    shenandoah_assert_heaplocked();
+    assert(_available[int(which_partition)] == _capacity[int(which_partition)] - _used[int(which_partition)],
+           "Expect available (%zu) equals capacity (%zu) - used (%zu) for partition %s",
+           _available[int(which_partition)], _capacity[int(which_partition)], _used[int(which_partition)],
+           partition_membership_name(ssize_t(which_partition)));
+    return _available[int(which_partition)];
+  }
+
+  // Return available_in assuming caller does not hold the heap lock.  In production builds, available is
+  // returned without acquiring the lock.  In debug builds, the global heap lock is acquired in order to
+  // enforce a consistency assert.
+  inline size_t available_in_not_locked(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    shenandoah_assert_not_heaplocked();
+#ifdef ASSERT
+    ShenandoahHeapLocker locker(ShenandoahHeap::heap()->lock());
+    assert((_available[int(which_partition)] == FreeSetUnderConstruction) ||
+           (_available[int(which_partition)] == _capacity[int(which_partition)] - _used[int(which_partition)]),
+           "Expect available (%zu) equals capacity (%zu) - used (%zu) for partition %s",
+           _available[int(which_partition)], _capacity[int(which_partition)], _used[int(which_partition)],
+           partition_membership_name(ssize_t(which_partition)));
+#endif
+    return _available[int(which_partition)];
   }
 
   inline void set_capacity_of(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    shenandoah_assert_heaplocked();
     assert (which_partition < NumPartitions, "selected free set must be valid");
     _capacity[int(which_partition)] = value;
+    _available[int(which_partition)] = value - _used[int(which_partition)];
   }
 
   inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+    shenandoah_assert_heaplocked();
     assert (which_partition < NumPartitions, "selected free set must be valid");
     _used[int(which_partition)] = value;
+    _available[int(which_partition)] = _capacity[int(which_partition)] - value;
   }
 
   inline size_t count(ShenandoahFreeSetPartitionId which_partition) const { return _region_counts[int(which_partition)]; }
@@ -382,6 +411,8 @@ class ShenandoahFreeSet : public CHeapObj<mtGC> {
   void log_status();
 
 public:
+  static const size_t FreeSetUnderConstruction = ShenandoahRegionPartitions::FreeSetUnderConstruction;
+
   ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions);
 
   // Public because ShenandoahRegionPartitions assertions require access.
@@ -441,13 +472,15 @@ class ShenandoahFreeSet : public CHeapObj<mtGC> {
   // 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);     }
 
-  inline size_t available() const {
-    assert(used() <= capacity(), "must use less than capacity");
-    return capacity() - used();
-  }
+  // All three of the following functions may produce stale data if called without owning the global heap lock.
+  // Changes to the values of these variables are performed with a lock.  A change to capacity or used "atomically"
+  // adjusts available with respect to lock holders.  However, sequential calls to these three functions may produce
+  // inconsistent data: available may not equal capacity - used because the intermediate states of any "atomic"
+  // locked action can be seen by these unlocked functions.
+  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 { return _partitions.available_in_not_locked(ShenandoahFreeSetPartitionId::Mutator); }
 
   HeapWord* allocate(ShenandoahAllocRequest& req, bool& in_new_region);
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index f017b3de962..27ff45e67de 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -239,6 +239,7 @@ void ShenandoahFullGC::do_it(GCCause::Cause gc_cause) {
     worker_slices[i] = new ShenandoahHeapRegionSet();
   }
 
+  ShenandoahGenerationalHeap::TransferResult result;
   {
     // The rest of code performs region moves, where region status is undefined
     // until all phases run together.
@@ -252,7 +253,14 @@ void ShenandoahFullGC::do_it(GCCause::Cause gc_cause) {
 
     phase4_compact_objects(worker_slices);
 
-    phase5_epilog();
+    result = phase5_epilog();
+  }
+  if (heap->mode()->is_generational()) {
+    LogTarget(Info, gc, ergo) lt;
+    if (lt.is_enabled()) {
+      LogStream ls(lt);
+      result.print_on("Full GC", &ls);
+    }
   }
 
   // Resize metaspace
@@ -1120,9 +1128,10 @@ void ShenandoahFullGC::phase4_compact_objects(ShenandoahHeapRegionSet** worker_s
   }
 }
 
-void ShenandoahFullGC::phase5_epilog() {
+ShenandoahGenerationalHeap::TransferResult ShenandoahFullGC::phase5_epilog() {
   GCTraceTime(Info, gc, phases) time("Phase 5: Full GC epilog", _gc_timer);
   ShenandoahHeap* heap = ShenandoahHeap::heap();
+  ShenandoahGenerationalHeap::TransferResult result;
 
   // Reset complete bitmap. We're about to reset the complete-top-at-mark-start pointer
   // and must ensure the bitmap is in sync.
@@ -1168,7 +1177,8 @@ void ShenandoahFullGC::phase5_epilog() {
   // We defer generation resizing actions until after cset regions have been recycled.  We do this even following an
   // abbreviated cycle.
   if (heap->mode()->is_generational()) {
-    ShenandoahGenerationalFullGC::balance_generations_after_rebuilding_free_set();
+    result = ShenandoahGenerationalFullGC::balance_generations_after_rebuilding_free_set();
     ShenandoahGenerationalFullGC::rebuild_remembered_set(heap);
   }
+  return result;
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.hpp
index 6687116b21f..b0b8c7bf0c5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.hpp
@@ -27,6 +27,7 @@
 
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shenandoah/shenandoahGC.hpp"
+#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 
 /**
@@ -81,7 +82,7 @@ class ShenandoahFullGC : public ShenandoahGC {
   void phase2_calculate_target_addresses(ShenandoahHeapRegionSet** worker_slices);
   void phase3_update_references();
   void phase4_compact_objects(ShenandoahHeapRegionSet** worker_slices);
-  void phase5_epilog();
+  ShenandoahGenerationalHeap::TransferResult phase5_epilog();
 
   void distribute_slices(ShenandoahHeapRegionSet** worker_slices);
   void calculate_target_humongous_objects();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
index 142c2d47989..e2e3f0a4677 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
@@ -128,13 +128,8 @@ void ShenandoahGenerationalFullGC::balance_generations_after_gc(ShenandoahHeap*
                PROPERFMTARGS(old_gen->used()));
 }
 
-void ShenandoahGenerationalFullGC::balance_generations_after_rebuilding_free_set() {
-  auto result = ShenandoahGenerationalHeap::heap()->balance_generations();
-  LogTarget(Info, gc, ergo) lt;
-  if (lt.is_enabled()) {
-    LogStream ls(lt);
-    result.print_on("Full GC", &ls);
-  }
+ShenandoahGenerationalHeap::TransferResult ShenandoahGenerationalFullGC::balance_generations_after_rebuilding_free_set() {
+  return ShenandoahGenerationalHeap::heap()->balance_generations();
 }
 
 void ShenandoahGenerationalFullGC::log_live_in_old(ShenandoahHeap* heap) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.hpp
index d74bcefaaf2..9240a056105 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONALFULLGC_HPP
 
 #include "gc/shared/preservedMarks.hpp"
+#include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "memory/iterator.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/growableArray.hpp"
@@ -61,7 +62,7 @@ class ShenandoahGenerationalFullGC {
   // a layer built above it to represent how much young/old memory was available. This layer is
   // redundant and adds complexity. We would like to one day remove it. Until then, we must keep it
   // synchronized with the free set's view of things.
-  static void balance_generations_after_rebuilding_free_set();
+  static ShenandoahGenerationalHeap::TransferResult balance_generations_after_rebuilding_free_set();
 
   // Logs the number of live bytes marked in the old generation. This is _not_ the same
   // value used as the baseline for the old generation _after_ the full gc is complete.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
index a16a71b8175..c6277e3898e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGlobalGeneration.cpp
@@ -55,7 +55,10 @@ size_t ShenandoahGlobalGeneration::soft_max_capacity() const {
 }
 
 size_t ShenandoahGlobalGeneration::available() const {
-  return ShenandoahHeap::heap()->free_set()->available();
+  // The collector reserve may eat into what the mutator is allowed to use. Make sure we are looking
+  // at what is available to the mutator when reporting how much memory is available.
+  size_t available = this->ShenandoahGeneration::available();
+  return MIN2(available, ShenandoahHeap::heap()->free_set()->available());
 }
 
 size_t ShenandoahGlobalGeneration::soft_available() const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 353da67ed88..45fb94817c5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -402,11 +402,10 @@ jint ShenandoahHeap::initialize() {
 
   _regions = NEW_C_HEAP_ARRAY(ShenandoahHeapRegion*, _num_regions, mtGC);
   _affiliations = NEW_C_HEAP_ARRAY(uint8_t, _num_regions, mtGC);
-  _free_set = new ShenandoahFreeSet(this, _num_regions);
 
   {
     ShenandoahHeapLocker locker(lock());
-
+    _free_set = new ShenandoahFreeSet(this, _num_regions);
     for (size_t i = 0; i < _num_regions; i++) {
       HeapWord* start = (HeapWord*)sh_rs.base() + ShenandoahHeapRegion::region_size_words() * i;
       bool is_committed = i < num_committed_regions;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
index edd4f875be4..099a2c57244 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
@@ -59,6 +59,7 @@ bool ShenandoahMetricsSnapshot::is_good_progress(ShenandoahGeneration* generatio
   // Under the critical threshold?
   ShenandoahFreeSet* free_set = _heap->free_set();
   size_t free_actual   = free_set->available();
+  assert(free_actual != ShenandoahFreeSet::FreeSetUnderConstruction, "Avoid this race");
 
   // 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
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
index 06b9d072aeb..0dda69dd1b8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp
@@ -62,6 +62,7 @@ void ShenandoahPacer::setup_for_mark() {
 
   size_t live = update_and_get_progress_history();
   size_t free = _heap->free_set()->available();
+  assert(free != ShenandoahFreeSet::FreeSetUnderConstruction, "Avoid this race");
 
   size_t non_taxable = free * ShenandoahPacingCycleSlack / 100;
   size_t taxable = free - non_taxable;
@@ -86,6 +87,7 @@ void ShenandoahPacer::setup_for_evac() {
 
   size_t used = _heap->collection_set()->used();
   size_t free = _heap->free_set()->available();
+  assert(free != ShenandoahFreeSet::FreeSetUnderConstruction, "Avoid this race");
 
   size_t non_taxable = free * ShenandoahPacingCycleSlack / 100;
   size_t taxable = free - non_taxable;
@@ -111,6 +113,7 @@ void ShenandoahPacer::setup_for_update_refs() {
 
   size_t used = _heap->used();
   size_t free = _heap->free_set()->available();
+  assert(free != ShenandoahFreeSet::FreeSetUnderConstruction, "Avoid this race");
 
   size_t non_taxable = free * ShenandoahPacingCycleSlack / 100;
   size_t taxable = free - non_taxable;

From e149bd3a0c387698fe7b2ff6c373944ded773b8b Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 13 May 2025 20:23:10 +0000
Subject: [PATCH 438/901] 8352755: Misconceptions about j.text.DecimalFormat
 digits during parsing

Reviewed-by: naoto
---
 .../java/text/CompactNumberFormat.java        | 50 +++++--------
 .../classes/java/text/DecimalFormat.java      | 45 +++++------
 .../share/classes/java/text/NumberFormat.java | 74 ++++++++++---------
 3 files changed, 79 insertions(+), 90 deletions(-)

diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index 35464d6ec91..fae11cbdba1 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.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
@@ -2169,14 +2169,10 @@ private void readObject(ObjectInputStream inStream) throws IOException,
     }
 
     /**
-     * Sets the maximum number of digits allowed in the integer portion of a
-     * number.
-     * The maximum allowed integer range is 309, if the {@code newValue} &gt; 309,
-     * then the maximum integer digits count is set to 309. Negative input
-     * values are replaced with 0.
-     *
-     * @param newValue the maximum number of integer digits to be shown
-     * @see #getMaximumIntegerDigits()
+     * {@inheritDoc NumberFormat}
+     * <p>The maximum allowed integer range is 309, if the {@code newValue} &gt;
+     * 309, then the maximum integer digits count is set to 309.
+     * @param newValue the maximum number of integer digits to be shown.
      */
     @Override
     public void setMaximumIntegerDigits(int newValue) {
@@ -2194,14 +2190,10 @@ public void setMaximumIntegerDigits(int newValue) {
     }
 
     /**
-     * Sets the minimum number of digits allowed in the integer portion of a
-     * number.
-     * The maximum allowed integer range is 309, if the {@code newValue} &gt; 309,
-     * then the minimum integer digits count is set to 309. Negative input
-     * values are replaced with 0.
-     *
-     * @param newValue the minimum number of integer digits to be shown
-     * @see #getMinimumIntegerDigits()
+     * {@inheritDoc NumberFormat}
+     * <p>The maximum allowed integer range is 309, if the {@code newValue} &gt;
+     * 309, then the minimum integer digits count is set to 309.
+     * @param newValue the minimum number of integer digits to be shown.
      */
     @Override
     public void setMinimumIntegerDigits(int newValue) {
@@ -2219,14 +2211,10 @@ public void setMinimumIntegerDigits(int newValue) {
     }
 
     /**
-     * Sets the minimum number of digits allowed in the fraction portion of a
-     * number.
-     * The maximum allowed fraction range is 340, if the {@code newValue} &gt; 340,
-     * then the minimum fraction digits count is set to 340. Negative input
-     * values are replaced with 0.
-     *
-     * @param newValue the minimum number of fraction digits to be shown
-     * @see #getMinimumFractionDigits()
+     * {@inheritDoc NumberFormat}
+     * <p>The maximum allowed fraction range is 340, if the {@code newValue} &gt;
+     * 340, then the minimum fraction digits count is set to 340.
+     * @param newValue the minimum number of fraction digits to be shown.
      */
     @Override
     public void setMinimumFractionDigits(int newValue) {
@@ -2245,14 +2233,10 @@ public void setMinimumFractionDigits(int newValue) {
     }
 
     /**
-     * Sets the maximum number of digits allowed in the fraction portion of a
-     * number.
-     * The maximum allowed fraction range is 340, if the {@code newValue} &gt; 340,
-     * then the maximum fraction digits count is set to 340. Negative input
-     * values are replaced with 0.
-     *
-     * @param newValue the maximum number of fraction digits to be shown
-     * @see #getMaximumFractionDigits()
+     * {@inheritDoc NumberFormat}
+     * <p>The maximum allowed fraction range is 340, if the {@code newValue} &gt;
+     * 340, then the maximum fraction digits count is set to 340.
+     * @param newValue the maximum number of fraction digits to be shown.
      */
     @Override
     public void setMaximumFractionDigits(int newValue) {
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index ce2ecfb23a2..3aa42ed8601 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -110,6 +110,10 @@
  * defined by {@link Character#digit Character.digit}, are recognized.
  *
  * <h3 id="digit_limits"> Integer and Fraction Digit Limits </h3>
+ * The integer and fraction digit limits are set by either applying a {@link ##patterns
+ * pattern} or using one of the appropriate {@code DecimalFormat} setter methods,
+ * for example, {@link #setMinimumFractionDigits(int)}. These limits have no impact
+ * on parsing behavior.
  * @implSpec
  * When formatting a {@code Number} other than {@code BigInteger} and
  * {@code BigDecimal}, {@code 309} is used as the upper limit for integer digits,
@@ -3972,9 +3976,9 @@ else if (ch == percent) {
     }
 
     /**
-     * Sets the maximum number of digits allowed in the integer portion of a
-     * number. Negative input values are replaced with 0.
-     * @see NumberFormat#setMaximumIntegerDigits
+     * {@inheritDoc NumberFormat}
+     * @param newValue the maximum number of integer digits to be shown.
+     * @see #getMaximumIntegerDigits()
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
     @Override
@@ -3989,9 +3993,9 @@ public void setMaximumIntegerDigits(int newValue) {
     }
 
     /**
-     * Sets the minimum number of digits allowed in the integer portion of a
-     * number. Negative input values are replaced with 0.
-     * @see NumberFormat#setMinimumIntegerDigits
+     * {@inheritDoc NumberFormat}
+     * @param newValue the minimum number of integer digits to be shown.
+     * @see #getMinimumIntegerDigits()
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
     @Override
@@ -4006,9 +4010,9 @@ public void setMinimumIntegerDigits(int newValue) {
     }
 
     /**
-     * Sets the maximum number of digits allowed in the fraction portion of a
-     * number. Negative input values are replaced with 0.
-     * @see NumberFormat#setMaximumFractionDigits
+     * {@inheritDoc NumberFormat}
+     * @param newValue the maximum number of fraction digits to be shown.
+     * @see #getMaximumFractionDigits()
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
     @Override
@@ -4023,9 +4027,9 @@ public void setMaximumFractionDigits(int newValue) {
     }
 
     /**
-     * Sets the minimum number of digits allowed in the fraction portion of a
-     * number. Negative input values are replaced with 0.
-     * @see NumberFormat#setMinimumFractionDigits
+     * {@inheritDoc NumberFormat}
+     * @param newValue the minimum number of fraction digits to be shown.
+     * @see #getMinimumFractionDigits()
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
     @Override
@@ -4040,11 +4044,11 @@ public void setMinimumFractionDigits(int newValue) {
     }
 
     /**
-     * Gets the maximum number of digits allowed in the integer portion of a
-     * number. The maximum number of integer digits can be set by either {@link #setMaximumIntegerDigits(int)}
-     * or {@link #applyPattern(String)}. See the {@link ##patterns Pattern Section} for
-     * comprehensive rules regarding maximum integer digits in patterns.
+     * {@inheritDoc NumberFormat}
+     * <p>Unlike the other digit limits, {@code maximumIntegerDigits} is not
+     * updated by {@code DecimalFormats} created or updated with a string pattern.
      * @see #setMaximumIntegerDigits
+     * @see ##patterns Pattern Section
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
     @Override
@@ -4053,8 +4057,7 @@ public int getMaximumIntegerDigits() {
     }
 
     /**
-     * Gets the minimum number of digits allowed in the integer portion of a
-     * number.
+     * {@inheritDoc NumberFormat}
      * @see #setMinimumIntegerDigits
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
@@ -4064,8 +4067,7 @@ public int getMinimumIntegerDigits() {
     }
 
     /**
-     * Gets the maximum number of digits allowed in the fraction portion of a
-     * number.
+     * {@inheritDoc NumberFormat}
      * @see #setMaximumFractionDigits
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
@@ -4075,8 +4077,7 @@ public int getMaximumFractionDigits() {
     }
 
     /**
-     * Gets the minimum number of digits allowed in the fraction portion of a
-     * number.
+     * {@inheritDoc NumberFormat}
      * @see #setMinimumFractionDigits
      * @see ##digit_limits Integer and Fraction Digit Limits
      */
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index 710c4e771ff..bd4ec53656a 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -129,9 +129,9 @@
  * <ul>
  * <li> {@link #setParseIntegerOnly(boolean)}; when {@code true}, will only return the
  * integer portion of the number parsed from the String.
- * <li> {@link #setMinimumFractionDigits(int)}; Use to adjust the expected digits when
- * formatting. Use any of the other minimum/maximum or fraction/integer setter methods
- * in the same manner.
+ * <li> {@link #setMinimumFractionDigits(int)}; Use to adjust the expected digits
+ * when formatting. Use any of the other minimum/maximum or fraction/integer
+ * setter methods in the same manner. These methods have no impact on parsing behavior.
  * <li> {@link #setGroupingUsed(boolean)}; when {@code true}, formatted numbers will be displayed
  * with grouping separators. Additionally, when {@code false}, parsing will not expect
  * grouping separators in the parsed String.
@@ -918,7 +918,7 @@ public void setGroupingUsed(boolean newValue) {
 
     /**
      * Returns the maximum number of digits allowed in the integer portion of a
-     * number.
+     * number during formatting.
      *
      * @return the maximum number of digits
      * @see #setMaximumIntegerDigits
@@ -929,14 +929,15 @@ public int getMaximumIntegerDigits() {
 
     /**
      * Sets the maximum number of digits allowed in the integer portion of a
-     * number. maximumIntegerDigits must be &ge; minimumIntegerDigits.  If the
-     * new value for maximumIntegerDigits is less than the current value
-     * of minimumIntegerDigits, then minimumIntegerDigits will also be set to
-     * the new value.
+     * number during formatting. {@code maximumIntegerDigits} must be &ge;
+     * {@code minimumIntegerDigits}. If the new value for {@code
+     * maximumIntegerDigits} is less than the current value of
+     * {@code minimumIntegerDigits}, then {@code minimumIntegerDigits} will
+     * also be set to the new value. Negative input values are replaced with 0.
      *
-     * @param newValue the maximum number of integer digits to be shown; if
-     * less than zero, then zero is used. The concrete subclass may enforce an
-     * upper limit to this value appropriate to the numeric type being formatted.
+     * @param newValue the maximum number of integer digits to be shown. The
+     * concrete subclass may enforce an upper limit to this value appropriate to
+     * the numeric type being formatted.
      * @see #getMaximumIntegerDigits
      */
     public void setMaximumIntegerDigits(int newValue) {
@@ -948,7 +949,7 @@ public void setMaximumIntegerDigits(int newValue) {
 
     /**
      * Returns the minimum number of digits allowed in the integer portion of a
-     * number.
+     * number during formatting.
      *
      * @return the minimum number of digits
      * @see #setMinimumIntegerDigits
@@ -959,14 +960,15 @@ public int getMinimumIntegerDigits() {
 
     /**
      * Sets the minimum number of digits allowed in the integer portion of a
-     * number. minimumIntegerDigits must be &le; maximumIntegerDigits.  If the
-     * new value for minimumIntegerDigits exceeds the current value
-     * of maximumIntegerDigits, then maximumIntegerDigits will also be set to
-     * the new value
+     * number during formatting. {@code minimumIntegerDigits} must be &le;
+     * {@code maximumIntegerDigits}. If the new value for {@code minimumIntegerDigits}
+     * exceeds the current value of {@code maximumIntegerDigits}, then {@code
+     * maximumIntegerDigits} will also be set to the new value. Negative input
+     * values are replaced with 0.
      *
-     * @param newValue the minimum number of integer digits to be shown; if
-     * less than zero, then zero is used. The concrete subclass may enforce an
-     * upper limit to this value appropriate to the numeric type being formatted.
+     * @param newValue the minimum number of integer digits to be shown. The
+     * concrete subclass may enforce an upper limit to this value appropriate to
+     * the numeric type being formatted.
      * @see #getMinimumIntegerDigits
      */
     public void setMinimumIntegerDigits(int newValue) {
@@ -978,7 +980,7 @@ public void setMinimumIntegerDigits(int newValue) {
 
     /**
      * Returns the maximum number of digits allowed in the fraction portion of a
-     * number.
+     * number during formatting.
      *
      * @return the maximum number of digits.
      * @see #setMaximumFractionDigits
@@ -989,14 +991,15 @@ public int getMaximumFractionDigits() {
 
     /**
      * Sets the maximum number of digits allowed in the fraction portion of a
-     * number. maximumFractionDigits must be &ge; minimumFractionDigits.  If the
-     * new value for maximumFractionDigits is less than the current value
-     * of minimumFractionDigits, then minimumFractionDigits will also be set to
-     * the new value.
+     * number during formatting. {@code maximumFractionDigits} must be &ge;
+     * {@code minimumFractionDigits}. If the new value for {@code maximumFractionDigits}
+     * is less than the current value of {@code minimumFractionDigits}, then
+     * {@code minimumFractionDigits} will also be set to the new value. Negative
+     * input values are replaced with 0.
      *
-     * @param newValue the maximum number of fraction digits to be shown; if
-     * less than zero, then zero is used. The concrete subclass may enforce an
-     * upper limit to this value appropriate to the numeric type being formatted.
+     * @param newValue the maximum number of fraction digits to be shown. The
+     * concrete subclass may enforce an upper limit to this value appropriate to
+     * the numeric type being formatted.
      * @see #getMaximumFractionDigits
      */
     public void setMaximumFractionDigits(int newValue) {
@@ -1008,7 +1011,7 @@ public void setMaximumFractionDigits(int newValue) {
 
     /**
      * Returns the minimum number of digits allowed in the fraction portion of a
-     * number.
+     * number during formatting.
      *
      * @return the minimum number of digits
      * @see #setMinimumFractionDigits
@@ -1019,14 +1022,15 @@ public int getMinimumFractionDigits() {
 
     /**
      * Sets the minimum number of digits allowed in the fraction portion of a
-     * number. minimumFractionDigits must be &le; maximumFractionDigits.  If the
-     * new value for minimumFractionDigits exceeds the current value
-     * of maximumFractionDigits, then maximumFractionDigits will also be set to
-     * the new value
+     * number during formatting. {@code minimumFractionDigits} must be &le;
+     * {@code maximumFractionDigits}. If the new value for {@code
+     * minimumFractionDigits} exceeds the current value of {@code
+     * maximumFractionDigits}, then {@code maximumFractionDigits} will also be
+     * set to the new value. Negative input values are replaced with 0.
      *
-     * @param newValue the minimum number of fraction digits to be shown; if
-     * less than zero, then zero is used. The concrete subclass may enforce an
-     * upper limit to this value appropriate to the numeric type being formatted.
+     * @param newValue the minimum number of fraction digits to be shown. The
+     * concrete subclass may enforce an upper limit to this value appropriate to
+     * the numeric type being formatted.
      * @see #getMinimumFractionDigits
      */
     public void setMinimumFractionDigits(int newValue) {

From 89242eecd2f381608f78bd8c431eca389956e79a Mon Sep 17 00:00:00 2001
From: Igor Veresov <iveresov@openjdk.org>
Date: Tue, 13 May 2025 21:49:46 +0000
Subject: [PATCH 439/901] 8356885: Don't emit C1 profiling for casts if
 TypeProfileCasts is off

Reviewed-by: vlivanov, kvn
---
 src/hotspot/share/c1/c1_LIR.cpp               |  6 +-
 .../compiler/tiered/TypeProfileCasts.java     | 87 +++++++++++++++++++
 2 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/tiered/TypeProfileCasts.java

diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index e6ba03554cb..c1c94244fcc 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -1444,7 +1444,7 @@ void LIR_List::checkcast (LIR_Opr result, LIR_Opr object, ciKlass* klass,
                           ciMethod* profiled_method, int profiled_bci) {
   LIR_OpTypeCheck* c = new LIR_OpTypeCheck(lir_checkcast, result, object, klass,
                                            tmp1, tmp2, tmp3, fast_check, info_for_exception, info_for_patch, stub);
-  if (profiled_method != nullptr) {
+  if (profiled_method != nullptr && TypeProfileCasts) {
     c->set_profiled_method(profiled_method);
     c->set_profiled_bci(profiled_bci);
     c->set_should_profile(true);
@@ -1454,7 +1454,7 @@ void LIR_List::checkcast (LIR_Opr result, LIR_Opr object, ciKlass* klass,
 
 void LIR_List::instanceof(LIR_Opr result, LIR_Opr object, ciKlass* klass, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, bool fast_check, CodeEmitInfo* info_for_patch, ciMethod* profiled_method, int profiled_bci) {
   LIR_OpTypeCheck* c = new LIR_OpTypeCheck(lir_instanceof, result, object, klass, tmp1, tmp2, tmp3, fast_check, nullptr, info_for_patch, nullptr);
-  if (profiled_method != nullptr) {
+  if (profiled_method != nullptr && TypeProfileCasts) {
     c->set_profiled_method(profiled_method);
     c->set_profiled_bci(profiled_bci);
     c->set_should_profile(true);
@@ -1466,7 +1466,7 @@ void LIR_List::instanceof(LIR_Opr result, LIR_Opr object, ciKlass* klass, LIR_Op
 void LIR_List::store_check(LIR_Opr object, LIR_Opr array, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3,
                            CodeEmitInfo* info_for_exception, ciMethod* profiled_method, int profiled_bci) {
   LIR_OpTypeCheck* c = new LIR_OpTypeCheck(lir_store_check, object, array, tmp1, tmp2, tmp3, info_for_exception);
-  if (profiled_method != nullptr) {
+  if (profiled_method != nullptr && TypeProfileCasts) {
     c->set_profiled_method(profiled_method);
     c->set_profiled_bci(profiled_bci);
     c->set_should_profile(true);
diff --git a/test/hotspot/jtreg/compiler/tiered/TypeProfileCasts.java b/test/hotspot/jtreg/compiler/tiered/TypeProfileCasts.java
new file mode 100644
index 00000000000..31d5cebf718
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/tiered/TypeProfileCasts.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 TypeProfileCasts
+ * @summary Check that turning of TypeProfileCasts is tolerated
+ * @requires vm.debug == true
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:-TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_instanceof
+ *                   compiler.tiered.TypeProfileCasts
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:+TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_instanceof
+ *                   compiler.tiered.TypeProfileCasts
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:-TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_checkcast
+ *                   compiler.tiered.TypeProfileCasts
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:+TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_checkcast
+ *                   compiler.tiered.TypeProfileCasts
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:-TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_array_store
+ *                   compiler.tiered.TypeProfileCasts
+ * @run main/othervm -XX:+TieredCompilation -XX:-BackgroundCompilation -XX:+TypeProfileCasts
+ *                   -XX:CompileCommand=compileonly,compiler.tiered.TypeProfileCasts::test_array_store
+ *                   compiler.tiered.TypeProfileCasts
+ */
+
+package compiler.tiered;
+
+public class TypeProfileCasts {
+    static class Foo { }
+    public static int sideEffect = 0;
+
+    private static void test_instanceof(Object o) {
+      // instanceof
+      if (o instanceof Foo) {
+        sideEffect++;
+      }
+    }
+
+    private static void test_checkcast(Object o) {
+      // checkcast
+      Foo f = (Foo) o;
+
+      sideEffect++;
+    }
+
+    private static void test_array_store(Object o) {
+      // array store type check
+      Foo[] fs = new Foo[1];
+      Object[] os = fs;
+      os[0] = o;
+
+      sideEffect++;
+    }
+
+    public static void main(String... args) {
+      for (int i = 0; i < 100_000; i++) {
+        test_instanceof(new Foo());
+        test_checkcast(new Foo());
+        test_array_store(new Foo());
+      }
+    }
+}

From 1bded7188f866a61d03936a9537503b31d603dc2 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Tue, 13 May 2025 22:16:42 +0000
Subject: [PATCH 440/901] 8356605: JRSUIControl.hashCode and
 JRSUIState.hashCode can use Long.hashCode

Reviewed-by: prr, serb
---
 .../macosx/classes/apple/laf/JRSUIControl.java             | 2 +-
 src/java.desktop/macosx/classes/apple/laf/JRSUIState.java  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
index c16f956f114..cfe3b916161 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java
@@ -324,7 +324,7 @@ private void sync() {
 
     @Override
     public int hashCode() {
-        int bits = (int)(currentEncodedProperties ^ (currentEncodedProperties >>> 32));
+        int bits = Long.hashCode(currentEncodedProperties);
         bits ^= nativeMap.hashCode();
         bits ^= changes.hashCode();
         return bits;
diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
index 867f93da73c..116e85c3509 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java
@@ -90,7 +90,7 @@ public boolean is(Property property) {
 
     @Override
     public int hashCode() {
-        return (int)(encodedState ^ (encodedState >>> 32)) ^ getClass().hashCode();
+        return Long.hashCode(encodedState) ^ getClass().hashCode();
     }
 
     public static class AnimationFrameState extends JRSUIState {
@@ -183,8 +183,7 @@ public boolean equals(final Object obj) {
 
         @Override
         public int hashCode() {
-            final long bits = Double.doubleToRawLongBits(value);
-            return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32);
+            return super.hashCode() ^ Double.hashCode(value);
         }
     }
 
@@ -258,7 +257,7 @@ public boolean equals(final Object obj) {
         @Override
         public int hashCode() {
             final long bits = Double.doubleToRawLongBits(thumbProportion) ^ Double.doubleToRawLongBits(thumbStart);
-            return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32);
+            return super.hashCode() ^ Long.hashCode(bits);
         }
     }
 }

From 10dcdf1b4738efc6b4deaf96f4d123aff4dab832 Mon Sep 17 00:00:00 2001
From: Ben Perez <bperez@openjdk.org>
Date: Tue, 13 May 2025 22:31:55 +0000
Subject: [PATCH 441/901] 8347606: Optimize Java implementation of ML-DSA

Reviewed-by: weijun
---
 .../classes/sun/security/provider/ML_DSA.java | 84 ++++++++++++-------
 1 file changed, 53 insertions(+), 31 deletions(-)

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 ff25eb527ef..af64ef399a8 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
@@ -541,21 +541,21 @@ public ML_DSA_KeyPair generateKeyPairInternal(byte[] randomBytes) {
         int[][][] keygenA = generateA(rho); //A is in NTT domain
 
         //Sample S1 and S2
-        int[][] s1 = new int[mlDsa_l][ML_DSA_N];
-        int[][] s2 = new int[mlDsa_k][ML_DSA_N];
+        int[][] s1 = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
+        int[][] s2 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         //hash is reset before being used in sampleS1S2
         sampleS1S2(s1, s2, hash, rhoPrime);
 
         //Compute t and tr
         mlDsaVectorNtt(s1); //s1 now in NTT domain
-        int[][] As1 = new int[mlDsa_k][ML_DSA_N];
+        int[][] As1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         matrixVectorPointwiseMultiply(As1, keygenA, s1);
         mlDsaVectorInverseNtt(s1); //take s1 out of NTT domain
 
         mlDsaVectorInverseNtt(As1);
         int[][] t = vectorAddPos(As1, s2);
-        int[][] t0 = new int[mlDsa_k][ML_DSA_N];
-        int[][] t1 = new int[mlDsa_k][ML_DSA_N];
+        int[][] t0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] t1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         power2Round(t, t0, t1);
 
         //Encode PK and SK
@@ -593,19 +593,19 @@ public ML_DSA_Signature signInternal(byte[] message, byte[] rnd, byte[] skBytes)
         hash.reset();
 
         //Initialize vectors used in loop
-        int[][] z = new int[mlDsa_l][ML_DSA_N];
-        boolean[][] h = new boolean[mlDsa_k][ML_DSA_N];
+        int[][] z = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
+        boolean[][] h = booleanMatrixAlloc(mlDsa_k, ML_DSA_N);
         byte[] commitmentHash = new byte[lambda/4];
-        int[][] y = new int[mlDsa_l][ML_DSA_N];
-        int[][] yy = new int[mlDsa_l][ML_DSA_N];
-        int[][] w = new int[mlDsa_k][ML_DSA_N];
-        int[][] w0 = new int[mlDsa_k][ML_DSA_N];
-        int[][] w1 = new int[mlDsa_k][ML_DSA_N];
-        int[][] w_ct0 = new int[mlDsa_k][ML_DSA_N];
+        int[][] y = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
+        int[][] yy = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
+        int[][] w = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] w0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] w1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] w_ct0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         int[] c =  new int[ML_DSA_N];
-        int[][] cs1 = new int[mlDsa_l][ML_DSA_N];
-        int[][] cs2 = new int[mlDsa_k][ML_DSA_N];
-        int[][] ct0 = new int[mlDsa_k][ML_DSA_N];
+        int[][] cs1 = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
+        int[][] cs2 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] ct0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
 
         int kappa = 0;
         while (true) {
@@ -621,7 +621,6 @@ public ML_DSA_Signature signInternal(byte[] message, byte[] rnd, byte[] skBytes)
             matrixVectorPointwiseMultiply(w, aHat, y);
             mlDsaVectorInverseNtt(w); //w is now in normal domain
             decompose(w, w0, w1);
-            //mlDsaVectorInverseNtt(y);
 
             //Get commitment hash
             hash.update(mu);
@@ -693,13 +692,13 @@ public boolean verifyInternal(byte[] pkBytes, byte[] message, byte[] sigBytes)
         mlDsaVectorNtt(sig.response());
 
         //Reconstruct signer's commitment
-        int[][] aHatZ = new int[mlDsa_k][ML_DSA_N];
+        int[][] aHatZ = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         matrixVectorPointwiseMultiply(aHatZ, aHat, sig.response());
 
         int[][] t1Hat = vectorConstMul(1 << ML_DSA_D, pk.t1());
         mlDsaVectorNtt(t1Hat);
 
-        int[][] ct1 = new int[mlDsa_k][ML_DSA_N];
+        int[][] ct1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         nttConstMultiply(ct1, cHat, t1Hat);
 
         int[][] wApprox = vectorSub(aHatZ, ct1, true);
@@ -763,7 +762,7 @@ public void bitPack(int[][] vector, int bitsPerCoeff, int maxValue,
     //This is simpleBitUnpack from FIPS 204. Since it is only called on the
     //vector t1 we can optimize for that case
     public int[][] t1Unpack(byte[] v) {
-        int[][] t1 = new int[mlDsa_k][ML_DSA_N];
+        int[][] t1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         for (int i = 0; i < mlDsa_k; i++) {
             for (int j = 0; j < ML_DSA_N / 4; j++) {
                 int tOffset = j*4;
@@ -872,7 +871,7 @@ private void hintBitPack(boolean[][] h, byte[] buffer, int offset) {
     }
 
     private boolean[][] hintBitUnpack(byte[] y, int offset) {
-        boolean[][] h = new boolean[mlDsa_k][ML_DSA_N];
+        boolean[][] h = booleanMatrixAlloc(mlDsa_k, ML_DSA_N);
         int idx = 0;
         for (int i = 0; i < mlDsa_k; i++) {
             int j = y[offset + omega + i];
@@ -956,18 +955,18 @@ public ML_DSA_PrivateKey skDecode(byte[] sk) {
         //Parse s1
         int start = A_SEED_LEN + K_LEN + TR_LEN;
         int end = start + (32 * mlDsa_l * s1s2CoeffSize);
-        int[][] s1 = new int[mlDsa_l][ML_DSA_N];
+        int[][] s1 = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
         bitUnpack(s1, sk, start, mlDsa_l, eta, s1s2CoeffSize);
 
         //Parse s2
         start = end;
         end += 32 * s1s2CoeffSize * mlDsa_k;
-        int[][] s2 = new int[mlDsa_k][ML_DSA_N];
+        int[][] s2 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         bitUnpack(s2, sk, start, mlDsa_k, eta, s1s2CoeffSize);
 
         //Parse t0
         start = end;
-        int[][] t0 = new int[mlDsa_k][ML_DSA_N];
+        int[][] t0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         bitUnpack(t0, sk, start, mlDsa_k, 1 << 12, T0_COEFF_SIZE);
 
         return new ML_DSA_PrivateKey(rho, k, tr, s1, s2, t0);
@@ -1002,7 +1001,7 @@ public ML_DSA_Signature sigDecode(byte[] sig) throws SignatureException {
         //Decode z
         int start = cSize;
         int end = start + zSize;
-        int[][] z = new int[mlDsa_l][ML_DSA_N];
+        int[][] z = integerMatrixAlloc(mlDsa_l, ML_DSA_N);
         bitUnpack(z, sig, start, mlDsa_l, gamma1, gamma1Bits + 1);
 
         //Decode h
@@ -1092,7 +1091,12 @@ private void sampleInBall(int[] c, byte[] rho) {
     }
 
     private int[][][] generateA(byte[] seed) {
-        int[][][] a = new int[mlDsa_k][mlDsa_l][];
+
+        // Manually do multidimensional array initialization for performance
+        int[][][] a = new int[mlDsa_k][][];
+        for (int i = 0; i < mlDsa_k; i++) {
+            a[i] = new int[mlDsa_l][];
+        }
 
         int nrPar = 2;
         int rhoLen = seed.length;
@@ -1270,8 +1274,8 @@ private void decompose(int[][] input, int[][] lowPart, int[][] highPart) {
     }
 
     private int[][] highBits(int[][] input) {
-        int[][] lowPart = new int[mlDsa_k][ML_DSA_N];
-        int[][] highPart = new int[mlDsa_k][ML_DSA_N];
+        int[][] lowPart = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] highPart = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         decompose(input, lowPart, highPart);
         return highPart;
     }
@@ -1297,7 +1301,7 @@ private int makeHint(boolean[][] res, int[][] z, int[][] r) {
     private int[][] useHint(boolean[][] h, int[][] r) {
         int m = (ML_DSA_Q - 1) / (2*gamma2);
         int[][] lowPart = r;
-        int[][] highPart = new int[mlDsa_k][ML_DSA_N];
+        int[][] highPart = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
         decompose(r, lowPart, highPart);
 
         for (int i = 0; i < mlDsa_k; i++) {
@@ -1482,7 +1486,7 @@ private void nttConstMultiply(int[][] res, int[] a, int[][] b) {
     }
 
     private int[][] vectorConstMul(int c, int[][] vec) {
-        int[][] res = new int[vec.length][vec[0].length];
+        int[][] res = integerMatrixAlloc(vec.length, vec[0].length);
         for (int i = 0; i < vec.length; i++) {
             for (int j = 0; j < vec[0].length; j++) {
                 res[i][j] = montMul(c, toMont(vec[i][j]));
@@ -1496,7 +1500,7 @@ private int[][] vectorConstMul(int c, int[][] vec) {
     // The coefficients in the output will be nonnegative and less than MONT_Q
     int[][] vectorAddPos(int[][] vec1, int[][] vec2) {
         int dim = vec1.length;
-        int[][] result = new int[dim][ML_DSA_N];
+        int[][] result = integerMatrixAlloc(dim, ML_DSA_N);
         for (int i = 0; i < dim; i++) {
             for (int m = 0; m < ML_DSA_N; m++) {
                 int r = vec1[i][m] + vec2[i][m]; // -2 * MONT_Q < r < 2 * MONT_Q
@@ -1568,4 +1572,22 @@ private static int montMul(int b, int c) {
     static int toMont(int a) {
         return montMul(a, MONT_R_SQUARE_MOD_Q);
     }
+
+    // For multidimensional array initialization, manually allocating each entry is
+    // faster than doing the entire initialization in one go
+    static boolean[][] booleanMatrixAlloc(int first, int second) {
+        boolean[][] res = new boolean[first][];
+        for (int i = 0; i < first; i++) {
+            res[i] = new boolean[second];
+        }
+        return res;
+    }
+
+    static int[][] integerMatrixAlloc(int first, int second) {
+        int[][] res = new int[first][];
+        for (int i = 0; i < first; i++) {
+            res[i] = new int[second];
+        }
+        return res;
+    }
 }

From 4c0a0ab6bc765c46d2c4b8320418d30abee24a91 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Tue, 13 May 2025 22:43:31 +0000
Subject: [PATCH 442/901] 8353578: Refactor existing usage of internal HKDF
 impl to use the KDF API

Co-authored-by: Kevin Driver <kdriver@openjdk.org>
Reviewed-by: djelinski, wetmore, mullan, kdriver, weijun
---
 .../com/sun/crypto/provider/DHKEM.java        | 119 +++++---
 .../sun/security/ssl/ChangeCipherSpec.java    |  32 +--
 .../classes/sun/security/ssl/CipherSuite.java |   4 +-
 .../sun/security/ssl/DHClientKeyExchange.java |   8 +-
 .../security/ssl/ECDHClientKeyExchange.java   |  14 +-
 .../classes/sun/security/ssl/Finished.java    |  97 +++----
 .../share/classes/sun/security/ssl/HKDF.java  | 185 -------------
 .../sun/security/ssl/KAKeyDerivation.java     |  62 +++--
 .../classes/sun/security/ssl/KeyUpdate.java   |  18 +-
 .../sun/security/ssl/NewSessionTicket.java    |  16 +-
 .../security/ssl/PreSharedKeyExtension.java   |  64 +++--
 .../security/ssl/RSAClientKeyExchange.java    |   8 +-
 .../sun/security/ssl/RSAKeyExchange.java      |   7 +-
 .../security/ssl/SSLBasicKeyDerivation.java   |  36 ++-
 .../sun/security/ssl/SSLKeyDerivation.java    |   9 +-
 .../security/ssl/SSLMasterKeyDerivation.java  |   6 +-
 .../sun/security/ssl/SSLSecretDerivation.java |  17 +-
 .../security/ssl/SSLSessionContextImpl.java   |  10 +-
 .../security/ssl/SSLTrafficKeyDerivation.java |  71 +++--
 .../classes/sun/security/ssl/ServerHello.java |  51 ++--
 .../classes/sun/security/util/KeyUtil.java    |  21 ++
 .../sun/security/ssl/internal/TEST.properties |   3 -
 .../sun/security/ssl/internal/TestRun.java    |  30 --
 .../java.base/sun/security/ssl/TestHkdf.java  | 260 ------------------
 24 files changed, 367 insertions(+), 781 deletions(-)
 delete mode 100644 src/java.base/share/classes/sun/security/ssl/HKDF.java
 delete mode 100644 test/jdk/sun/security/ssl/internal/TEST.properties
 delete mode 100644 test/jdk/sun/security/ssl/internal/TestRun.java
 delete mode 100644 test/jdk/sun/security/ssl/internal/java.base/sun/security/ssl/TestHkdf.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
index 3fa6b14762a..d86d161370f 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.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
@@ -37,11 +37,13 @@
 import java.util.Objects;
 import javax.crypto.*;
 import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.HKDFParameterSpec;
 
 import sun.security.jca.JCAUtil;
-import sun.security.ssl.HKDF;
 import sun.security.util.*;
 
+import jdk.internal.access.SharedSecrets;
+
 // Implementing DHKEM defined inside https://www.rfc-editor.org/rfc/rfc9180.html,
 // without the AuthEncap and AuthDecap functions
 public class DHKEM implements KEMSpi {
@@ -153,19 +155,19 @@ public KeyPair derive(int kem_id) {
     private enum Params {
 
         P256(0x10, 32, 32, 2 * 32 + 1,
-                "ECDH", "EC", CurveDB.P_256, "SHA-256"),
+                "ECDH", "EC", CurveDB.P_256, "HKDF-SHA256"),
 
         P384(0x11, 48, 48, 2 * 48 + 1,
-                "ECDH", "EC", CurveDB.P_384, "SHA-384"),
+                "ECDH", "EC", CurveDB.P_384, "HKDF-SHA384"),
 
         P521(0x12, 64, 66, 2 * 66 + 1,
-                "ECDH", "EC", CurveDB.P_521, "SHA-512"),
+                "ECDH", "EC", CurveDB.P_521, "HKDF-SHA512"),
 
         X25519(0x20, 32, 32, 32,
-                "XDH", "XDH", NamedParameterSpec.X25519, "SHA-256"),
+                "XDH", "XDH", NamedParameterSpec.X25519, "HKDF-SHA256"),
 
         X448(0x21, 64, 56, 56,
-                "XDH", "XDH", NamedParameterSpec.X448, "SHA-512"),
+                "XDH", "XDH", NamedParameterSpec.X448, "HKDF-SHA512"),
         ;
 
         private final int kem_id;
@@ -247,10 +249,17 @@ private byte[] DH(PrivateKey skE, PublicKey pkR)
 
         private byte[] ExtractAndExpand(byte[] dh, byte[] kem_context)
                 throws NoSuchAlgorithmException, InvalidKeyException {
-            HKDF kdf = new HKDF(hkdfAlgorithm);
-            SecretKey eae_prk = LabeledExtract(kdf, suiteId, null, EAE_PRK, dh);
-            return LabeledExpand(kdf, suiteId, eae_prk, SHARED_SECRET,
-                    kem_context, Nsecret);
+            KDF hkdf = KDF.getInstance(hkdfAlgorithm);
+            SecretKey eae_prk = LabeledExtract(hkdf, suiteId, EAE_PRK, dh);
+            try {
+                return LabeledExpand(hkdf, suiteId, eae_prk, SHARED_SECRET,
+                        kem_context, Nsecret);
+            } finally {
+                if (eae_prk instanceof SecretKeySpec s) {
+                    SharedSecrets.getJavaxCryptoSpecAccess()
+                            .clearSecretKeySpec(s);
+                }
+            }
         }
 
         private PublicKey getPublicKey(PrivateKey sk)
@@ -277,31 +286,41 @@ private PublicKey getPublicKey(PrivateKey sk)
 
         // For KAT tests only. See RFC9180DeriveKeyPairSR.
         public KeyPair deriveKeyPair(byte[] ikm) throws Exception {
-            HKDF kdf = new HKDF(hkdfAlgorithm);
-            SecretKey dkp_prk = LabeledExtract(kdf, suiteId, null, DKP_PRK, ikm);
-            if (isEC()) {
-                NamedCurve curve = (NamedCurve) spec;
-                BigInteger sk = BigInteger.ZERO;
-                int counter = 0;
-                while (sk.signum() == 0 || sk.compareTo(curve.getOrder()) >= 0) {
-                    if (counter > 255) {
-                        throw new RuntimeException();
-                    }
-                    byte[] bytes = LabeledExpand(kdf, suiteId, dkp_prk,
-                            CANDIDATE, I2OSP(counter, 1), Nsk);
-                    // bitmask is defined to be 0xFF for P-256 and P-384, and 0x01 for P-521
-                    if (this == Params.P521) {
-                        bytes[0] = (byte) (bytes[0] & 0x01);
+            KDF hkdf = KDF.getInstance(hkdfAlgorithm);
+            SecretKey dkp_prk = LabeledExtract(hkdf, suiteId, DKP_PRK, ikm);
+            try {
+                if (isEC()) {
+                    NamedCurve curve = (NamedCurve) spec;
+                    BigInteger sk = BigInteger.ZERO;
+                    int counter = 0;
+                    while (sk.signum() == 0 ||
+                            sk.compareTo(curve.getOrder()) >= 0) {
+                        if (counter > 255) {
+                            throw new RuntimeException();
+                        }
+                        byte[] bytes = LabeledExpand(hkdf, suiteId, dkp_prk,
+                                CANDIDATE, I2OSP(counter, 1), Nsk);
+                        // bitmask is defined to be 0xFF for P-256 and P-384,
+                        // and 0x01 for P-521
+                        if (this == Params.P521) {
+                            bytes[0] = (byte) (bytes[0] & 0x01);
+                        }
+                        sk = new BigInteger(1, (bytes));
+                        counter = counter + 1;
                     }
-                    sk = new BigInteger(1, (bytes));
-                    counter = counter + 1;
+                    PrivateKey k = DeserializePrivateKey(sk.toByteArray());
+                    return new KeyPair(getPublicKey(k), k);
+                } else {
+                    byte[] sk = LabeledExpand(hkdf, suiteId, dkp_prk, SK, EMPTY,
+                            Nsk);
+                    PrivateKey k = DeserializePrivateKey(sk);
+                    return new KeyPair(getPublicKey(k), k);
+                }
+            } finally {
+                if (dkp_prk instanceof SecretKeySpec s) {
+                    SharedSecrets.getJavaxCryptoSpecAccess()
+                            .clearSecretKeySpec(s);
                 }
-                PrivateKey k = DeserializePrivateKey(sk.toByteArray());
-                return new KeyPair(getPublicKey(k), k);
-            } else {
-                byte[] sk = LabeledExpand(kdf, suiteId, dkp_prk, SK, EMPTY, Nsk);
-                PrivateKey k = DeserializePrivateKey(sk);
-                return new KeyPair(getPublicKey(k), k);
             }
         }
 
@@ -380,18 +399,32 @@ private static byte[] I2OSP(int n, int w) {
         }
     }
 
-    private static SecretKey LabeledExtract(HKDF kdf, byte[] suite_id,
-            byte[] salt, byte[] label, byte[] ikm) throws InvalidKeyException {
-        return kdf.extract(salt,
-                new SecretKeySpec(concat(HPKE_V1, suite_id, label, ikm), "IKM"),
-                    "HKDF-PRK");
+    private static SecretKey LabeledExtract(KDF hkdf, byte[] suite_id,
+            byte[] label, byte[] ikm) throws InvalidKeyException {
+        SecretKeySpec s = new SecretKeySpec(concat(HPKE_V1, suite_id, label,
+                ikm), "IKM");
+        try {
+            HKDFParameterSpec spec =
+                    HKDFParameterSpec.ofExtract().addIKM(s).extractOnly();
+            return hkdf.deriveKey("Generic", spec);
+        } catch (InvalidAlgorithmParameterException |
+                 NoSuchAlgorithmException e) {
+            throw new InvalidKeyException(e.getMessage(), e);
+        } finally {
+            SharedSecrets.getJavaxCryptoSpecAccess().clearSecretKeySpec(s);
+        }
     }
 
-    private static byte[] LabeledExpand(HKDF kdf, byte[] suite_id,
+    private static byte[] LabeledExpand(KDF hkdf, byte[] suite_id,
             SecretKey prk, byte[] label, byte[] info, int L)
             throws InvalidKeyException {
-        byte[] labeled_info = concat(I2OSP(L, 2), HPKE_V1,
-                suite_id, label, info);
-        return kdf.expand(prk, labeled_info, L, "NONE").getEncoded();
+        byte[] labeled_info = concat(I2OSP(L, 2), HPKE_V1, suite_id, label,
+                info);
+        try {
+            return hkdf.deriveData(HKDFParameterSpec.expandOnly(
+                    prk, labeled_info, L));
+        } catch (InvalidAlgorithmParameterException iape) {
+            throw new InvalidKeyException(iape.getMessage(), iape);
+        }
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
index 8a49a9550f4..6da6f745691 100644
--- a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
+++ b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.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
@@ -77,22 +77,20 @@ public byte[] produce(ConnectionContext context,
                 try {
                     writeAuthenticator = Authenticator.valueOf(
                             hc.negotiatedProtocol, ncs.macAlg,
-                            tkd.getTrafficKey(hc.sslConfig.isClientMode ?
+                            tkd.deriveKey(hc.sslConfig.isClientMode ?
                                     "clientMacKey" : "serverMacKey"));
                 } catch (NoSuchAlgorithmException | InvalidKeyException e) {
                     // unlikely
                     throw new SSLException("Algorithm missing:  ", e);
                 }
             }
-
-            SecretKey writeKey =
-                    tkd.getTrafficKey(hc.sslConfig.isClientMode ?
-                                    "clientWriteKey" : "serverWriteKey");
-            SecretKey writeIv =
-                    tkd.getTrafficKey(hc.sslConfig.isClientMode ?
-                                    "clientWriteIv" : "serverWriteIv");
+            SecretKey writeKey = tkd.deriveKey(hc.sslConfig.isClientMode ?
+                    "clientWriteKey" : "serverWriteKey");
+            byte[] writeIv = tkd.deriveData(hc.sslConfig.isClientMode ?
+                    "clientWriteIv" : "serverWriteIv");
             IvParameterSpec iv = (writeIv == null) ? null :
-                    new IvParameterSpec(writeIv.getEncoded());
+                    new IvParameterSpec(writeIv);
+
             SSLWriteCipher writeCipher;
             try {
                 writeCipher = ncs.bulkCipher.createWriteCipher(
@@ -173,7 +171,7 @@ public void consume(ConnectionContext context,
                     try {
                         readAuthenticator = Authenticator.valueOf(
                                 hc.negotiatedProtocol, ncs.macAlg,
-                                tkd.getTrafficKey(hc.sslConfig.isClientMode ?
+                                tkd.deriveKey(hc.sslConfig.isClientMode ?
                                         "serverMacKey" : "clientMacKey"));
                     } catch (NoSuchAlgorithmException | InvalidKeyException e) {
                         // unlikely
@@ -181,14 +179,12 @@ public void consume(ConnectionContext context,
                     }
                 }
 
-                SecretKey readKey =
-                        tkd.getTrafficKey(hc.sslConfig.isClientMode ?
-                                        "serverWriteKey" : "clientWriteKey");
-                SecretKey readIv =
-                        tkd.getTrafficKey(hc.sslConfig.isClientMode ?
-                                        "serverWriteIv" : "clientWriteIv");
+                SecretKey readKey = tkd.deriveKey(hc.sslConfig.isClientMode ?
+                        "serverWriteKey" : "clientWriteKey");
+                byte[] readIv = tkd.deriveData(hc.sslConfig.isClientMode ?
+                        "serverWriteIv" : "clientWriteIv");
                 IvParameterSpec iv = (readIv == null) ? null :
-                        new IvParameterSpec(readIv.getEncoded());
+                        new IvParameterSpec(readIv);
                 SSLReadCipher readCipher;
                 try {
                     readCipher = ncs.bulkCipher.createReadCipher(
diff --git a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
index 019f1ad34d9..4a2063ded42 100644
--- a/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
+++ b/src/java.base/share/classes/sun/security/ssl/CipherSuite.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
@@ -1199,11 +1199,13 @@ enum HashAlg {
         final String name;
         final int hashLength;
         final int blockSize;
+        final String hkdfAlgorithm;
 
         HashAlg(String hashAlg, int hashLength, int blockSize) {
             this.name = hashAlg;
             this.hashLength = hashLength;
             this.blockSize = blockSize;
+            this.hkdfAlgorithm = "HKDF-" + hashAlg.replace("-", "");
         }
 
         @Override
diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index b8f83102840..fb5d6feef55 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.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
@@ -206,8 +206,7 @@ public byte[] produce(ConnectionContext context,
                         "Not supported key exchange type");
             } else {
                 SSLKeyDerivation masterKD = ke.createKeyDerivation(chc);
-                SecretKey masterSecret =
-                        masterKD.deriveKey("MasterSecret", null);
+                SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
                 chc.handshakeSession.setMasterSecret(masterSecret);
 
                 SSLTrafficKeyDerivation kd =
@@ -302,8 +301,7 @@ public void consume(ConnectionContext context,
 
             // update the states
             SSLKeyDerivation masterKD = ke.createKeyDerivation(shc);
-            SecretKey masterSecret =
-                    masterKD.deriveKey("MasterSecret", null);
+            SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
             shc.handshakeSession.setMasterSecret(masterSecret);
 
             SSLTrafficKeyDerivation kd =
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
index 0dcf5ec27b7..e1c1b1377ad 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.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
@@ -218,8 +218,7 @@ public byte[] produce(ConnectionContext context,
                         "Not supported key exchange type");
             } else {
                 SSLKeyDerivation masterKD = ke.createKeyDerivation(chc);
-                SecretKey masterSecret =
-                        masterKD.deriveKey("MasterSecret", null);
+                SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
                 chc.handshakeSession.setMasterSecret(masterSecret);
 
                 SSLTrafficKeyDerivation kd =
@@ -338,8 +337,7 @@ public void consume(ConnectionContext context,
 
             // update the states
             SSLKeyDerivation masterKD = ke.createKeyDerivation(shc);
-            SecretKey masterSecret =
-                    masterKD.deriveKey("MasterSecret", null);
+            SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
             shc.handshakeSession.setMasterSecret(masterSecret);
 
             SSLTrafficKeyDerivation kd =
@@ -418,8 +416,7 @@ public byte[] produce(ConnectionContext context,
                         "Not supported key exchange type");
             } else {
                 SSLKeyDerivation masterKD = ke.createKeyDerivation(chc);
-                SecretKey masterSecret =
-                        masterKD.deriveKey("MasterSecret", null);
+                SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
                 chc.handshakeSession.setMasterSecret(masterSecret);
 
                 SSLTrafficKeyDerivation kd =
@@ -522,8 +519,7 @@ public void consume(ConnectionContext context,
 
             // update the states
             SSLKeyDerivation masterKD = ke.createKeyDerivation(shc);
-            SecretKey masterSecret =
-                    masterKD.deriveKey("MasterSecret", null);
+            SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
             shc.handshakeSession.setMasterSecret(masterSecret);
 
             SSLTrafficKeyDerivation kd =
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 9afa83a0afc..dcb499b6d0c 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.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
@@ -32,14 +32,14 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.ProviderException;
-import java.security.spec.AlgorithmParameterSpec;
 import java.text.MessageFormat;
 import java.util.Locale;
+import javax.crypto.KDF;
 import javax.crypto.KeyGenerator;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.SSLPeerUnverifiedException;
 
 import jdk.internal.event.EventHelper;
@@ -47,11 +47,11 @@
 import sun.security.internal.spec.TlsPrfParameterSpec;
 import sun.security.ssl.CipherSuite.HashAlg;
 import static sun.security.ssl.CipherSuite.HashAlg.H_NONE;
-import sun.security.ssl.SSLBasicKeyDerivation.SecretSizeSpec;
 import sun.security.ssl.SSLCipher.SSLReadCipher;
 import sun.security.ssl.SSLCipher.SSLWriteCipher;
 import sun.security.ssl.SSLHandshake.HandshakeMessage;
 import sun.security.util.HexDumpEncoder;
+import sun.security.util.KeyUtil;
 
 /**
  * Pack of the Finished handshake message.
@@ -338,12 +338,8 @@ public byte[] createVerifyData(HandshakeContext context,
             SecretKey secret = isValidation ?
                     context.baseReadSecret : context.baseWriteSecret;
             SSLBasicKeyDerivation kdf = new SSLBasicKeyDerivation(
-                    secret, hashAlg.name,
-                    hkdfLabel, hkdfContext, hashAlg.hashLength);
-            AlgorithmParameterSpec keySpec =
-                    new SecretSizeSpec(hashAlg.hashLength);
-            SecretKey finishedSecret =
-                    kdf.deriveKey("TlsFinishedSecret", keySpec);
+                    secret, hashAlg, hkdfLabel, hkdfContext);
+            SecretKey finishedSecret = kdf.deriveKey("TlsFinishedSecret");
 
             String hmacAlg =
                 "Hmac" + hashAlg.name.replace("-", "");
@@ -354,6 +350,8 @@ public byte[] createVerifyData(HandshakeContext context,
             } catch (NoSuchAlgorithmException |InvalidKeyException ex) {
                 throw new ProviderException(
                         "Failed to generate verify_data", ex);
+            } finally {
+                KeyUtil.destroySecretKeys(finishedSecret);
             }
         }
     }
@@ -717,17 +715,14 @@ private byte[] onProduceFinished(ClientHandshakeContext chc,
 
             try {
                 // update the application traffic read keys.
-                SecretKey writeSecret = kd.deriveKey(
-                        "TlsClientAppTrafficSecret", null);
+                SecretKey writeSecret =
+                        kd.deriveKey("TlsClientAppTrafficSecret");
 
                 SSLKeyDerivation writeKD =
                         kdg.createKeyDerivation(chc, writeSecret);
-                SecretKey writeKey = writeKD.deriveKey(
-                        "TlsKey", null);
-                SecretKey writeIvSecret = writeKD.deriveKey(
-                        "TlsIv", null);
+                SecretKey writeKey = writeKD.deriveKey("TlsKey");
                 IvParameterSpec writeIv =
-                        new IvParameterSpec(writeIvSecret.getEncoded());
+                        new IvParameterSpec(writeKD.deriveData("TlsIv"));
                 SSLWriteCipher writeCipher =
                         chc.negotiatedCipherSuite.bulkCipher.createWriteCipher(
                                 Authenticator.valueOf(chc.negotiatedProtocol),
@@ -754,7 +749,7 @@ private byte[] onProduceFinished(ClientHandshakeContext chc,
             // it can be used after the handshake is completed.
             SSLSecretDerivation sd = ((SSLSecretDerivation) kd).forContext(chc);
             SecretKey resumptionMasterSecret = sd.deriveKey(
-                    "TlsResumptionMasterSecret", null);
+                    "TlsResumptionMasterSecret");
             chc.handshakeSession.setResumptionMasterSecret(
                     resumptionMasterSecret);
 
@@ -803,33 +798,29 @@ private byte[] onProduceFinished(ServerHandshakeContext shc,
                         shc.negotiatedProtocol);
             }
 
-            // derive salt secret
+            SecretKey saltSecret = null;
             try {
-                SecretKey saltSecret = kd.deriveKey("TlsSaltSecret", null);
+                // derive salt secret
+                saltSecret = kd.deriveKey("TlsSaltSecret");
 
                 // derive application secrets
                 HashAlg hashAlg = shc.negotiatedCipherSuite.hashAlg;
-                HKDF hkdf = new HKDF(hashAlg.name);
+                KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
                 byte[] zeros = new byte[hashAlg.hashLength];
-                SecretKeySpec sharedSecret =
-                        new SecretKeySpec(zeros, "TlsZeroSecret");
-                SecretKey masterSecret =
-                    hkdf.extract(saltSecret, sharedSecret, "TlsMasterSecret");
-
+                SecretKey masterSecret = hkdf.deriveKey("TlsMasterSecret",
+                        HKDFParameterSpec.ofExtract().addSalt(saltSecret)
+                        .addIKM(zeros).extractOnly());
                 SSLKeyDerivation secretKD =
                         new SSLSecretDerivation(shc, masterSecret);
 
                 // update the handshake traffic write keys.
                 SecretKey writeSecret = secretKD.deriveKey(
-                        "TlsServerAppTrafficSecret", null);
+                        "TlsServerAppTrafficSecret");
                 SSLKeyDerivation writeKD =
                         kdg.createKeyDerivation(shc, writeSecret);
-                SecretKey writeKey = writeKD.deriveKey(
-                        "TlsKey", null);
-                SecretKey writeIvSecret = writeKD.deriveKey(
-                        "TlsIv", null);
+                SecretKey writeKey = writeKD.deriveKey("TlsKey");
                 IvParameterSpec writeIv =
-                        new IvParameterSpec(writeIvSecret.getEncoded());
+                        new IvParameterSpec(writeKD.deriveData("TlsIv"));
                 SSLWriteCipher writeCipher =
                         shc.negotiatedCipherSuite.bulkCipher.createWriteCipher(
                                 Authenticator.valueOf(shc.negotiatedProtocol),
@@ -852,6 +843,8 @@ private byte[] onProduceFinished(ServerHandshakeContext shc,
             } catch (GeneralSecurityException gse) {
                 throw shc.conContext.fatal(Alert.INTERNAL_ERROR,
                         "Failure to derive application secrets", gse);
+            } finally {
+                KeyUtil.destroySecretKeys(saltSecret);
             }
 
             /*
@@ -960,34 +953,31 @@ private void onConsumeFinished(ClientHandshakeContext chc,
                         engineGetClientSessionContext()).
                         put(chc.handshakeSession);
             }
-
-            // derive salt secret
+            SecretKey saltSecret = null;
             try {
-                SecretKey saltSecret = kd.deriveKey("TlsSaltSecret", null);
+                // derive salt secret
+                saltSecret = kd.deriveKey("TlsSaltSecret");
 
                 // derive application secrets
                 HashAlg hashAlg = chc.negotiatedCipherSuite.hashAlg;
-                HKDF hkdf = new HKDF(hashAlg.name);
+                KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
                 byte[] zeros = new byte[hashAlg.hashLength];
-                SecretKeySpec sharedSecret =
-                        new SecretKeySpec(zeros, "TlsZeroSecret");
-                SecretKey masterSecret =
-                    hkdf.extract(saltSecret, sharedSecret, "TlsMasterSecret");
+                SecretKey masterSecret = hkdf.deriveKey("TlsMasterSecret",
+                        HKDFParameterSpec.ofExtract()
+                                         .addSalt(saltSecret)
+                                         .addIKM(zeros).extractOnly());
 
                 SSLKeyDerivation secretKD =
                         new SSLSecretDerivation(chc, masterSecret);
 
                 // update the handshake traffic read keys.
                 SecretKey readSecret = secretKD.deriveKey(
-                        "TlsServerAppTrafficSecret", null);
+                        "TlsServerAppTrafficSecret");
                 SSLKeyDerivation writeKD =
                         kdg.createKeyDerivation(chc, readSecret);
-                SecretKey readKey = writeKD.deriveKey(
-                        "TlsKey", null);
-                SecretKey readIvSecret = writeKD.deriveKey(
-                        "TlsIv", null);
+                SecretKey readKey = writeKD.deriveKey("TlsKey");
                 IvParameterSpec readIv =
-                        new IvParameterSpec(readIvSecret.getEncoded());
+                        new IvParameterSpec(writeKD.deriveData("TlsIv"));
                 SSLReadCipher readCipher =
                         chc.negotiatedCipherSuite.bulkCipher.createReadCipher(
                                 Authenticator.valueOf(chc.negotiatedProtocol),
@@ -1009,6 +999,8 @@ private void onConsumeFinished(ClientHandshakeContext chc,
             } catch (GeneralSecurityException gse) {
                 throw chc.conContext.fatal(Alert.INTERNAL_ERROR,
                         "Failure to derive application secrets", gse);
+            } finally {
+                KeyUtil.destroySecretKeys(saltSecret);
             }
 
             //
@@ -1084,16 +1076,13 @@ private void onConsumeFinished(ServerHandshakeContext shc,
             try {
                 // update the application traffic read keys.
                 SecretKey readSecret = kd.deriveKey(
-                        "TlsClientAppTrafficSecret", null);
+                        "TlsClientAppTrafficSecret");
 
                 SSLKeyDerivation readKD =
                         kdg.createKeyDerivation(shc, readSecret);
-                SecretKey readKey = readKD.deriveKey(
-                        "TlsKey", null);
-                SecretKey readIvSecret = readKD.deriveKey(
-                        "TlsIv", null);
+                SecretKey readKey = readKD.deriveKey("TlsKey");
                 IvParameterSpec readIv =
-                        new IvParameterSpec(readIvSecret.getEncoded());
+                        new IvParameterSpec(readKD.deriveData("TlsIv"));
                 SSLReadCipher readCipher =
                         shc.negotiatedCipherSuite.bulkCipher.createReadCipher(
                                 Authenticator.valueOf(shc.negotiatedProtocol),
@@ -1115,8 +1104,8 @@ private void onConsumeFinished(ServerHandshakeContext shc,
                 shc.handshakeHash.update();
                 SSLSecretDerivation sd =
                         ((SSLSecretDerivation)kd).forContext(shc);
-                SecretKey resumptionMasterSecret = sd.deriveKey(
-                "TlsResumptionMasterSecret", null);
+                SecretKey resumptionMasterSecret =
+                        sd.deriveKey("TlsResumptionMasterSecret");
                 shc.handshakeSession.setResumptionMasterSecret(
                         resumptionMasterSecret);
             } catch (GeneralSecurityException gse) {
diff --git a/src/java.base/share/classes/sun/security/ssl/HKDF.java b/src/java.base/share/classes/sun/security/ssl/HKDF.java
deleted file mode 100644
index 5e5cd144305..00000000000
--- a/src/java.base/share/classes/sun/security/ssl/HKDF.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.ssl;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.ShortBufferException;
-import javax.crypto.spec.SecretKeySpec;
-import java.util.Objects;
-
-/**
- * An implementation of the HKDF key derivation algorithm outlined in RFC 5869,
- * specific to the needs of TLS 1.3 key derivation in JSSE.  This is not a
- * general purpose HKDF implementation and is suited only to single-key output
- * derivations.
- *
- * HKDF objects are created by specifying a message digest algorithm.  That
- * digest algorithm will be used by the HMAC function as part of the HKDF
- * derivation process.
- */
-public final class HKDF {
-    private final Mac hmacObj;
-    private final int hmacLen;
-
-    /**
-     * Create an HDKF object, specifying the underlying message digest
-     * algorithm.
-     *
-     * @param hashAlg a standard name corresponding to a supported message
-     * digest algorithm.
-     *
-     * @throws NoSuchAlgorithmException if that message digest algorithm does
-     * not have an HMAC variant supported on any available provider.
-     */
-    public HKDF(String hashAlg) throws NoSuchAlgorithmException {
-        Objects.requireNonNull(hashAlg,
-                "Must provide underlying HKDF Digest algorithm.");
-        String hmacAlg = "Hmac" + hashAlg.replace("-", "");
-        hmacObj = Mac.getInstance(hmacAlg);
-        hmacLen = hmacObj.getMacLength();
-    }
-
-    /**
-     * Perform the HMAC-Extract derivation.
-     *
-     * @param salt a salt value, implemented as a {@code SecretKey}.  A
-     * {@code null} value is allowed, which will internally use an array of
-     * zero bytes the same size as the underlying hash output length.
-     * @param inputKey the input keying material provided as a
-     * {@code SecretKey}.
-     * @param keyAlg the algorithm name assigned to the resulting
-     * {@code SecretKey} object.
-     *
-     * @return a {@code SecretKey} that is the result of the HKDF extract
-     * operation.
-     *
-     * @throws InvalidKeyException if the {@code salt} parameter cannot be
-     * used to initialize the underlying HMAC.
-     */
-    public SecretKey extract(SecretKey salt, SecretKey inputKey, String keyAlg)
-            throws InvalidKeyException {
-        if (salt == null) {
-            salt = new SecretKeySpec(new byte[hmacLen], "HKDF-Salt");
-        }
-        hmacObj.init(salt);
-
-        return new SecretKeySpec(hmacObj.doFinal(inputKey.getEncoded()),
-                keyAlg);
-    }
-
-    /**
-     * Perform the HMAC-Extract derivation.
-     *
-     * @param salt a salt value as cleartext bytes.  A {@code null} value is
-     * allowed, which will internally use an array of zero bytes the same
-     * size as the underlying hash output length.
-     * @param inputKey the input keying material provided as a
-     * {@code SecretKey}.
-     * @param keyAlg the algorithm name assigned to the resulting
-     * {@code SecretKey} object.
-     *
-     * @return a {@code SecretKey} that is the result of the HKDF extract
-     * operation.
-     *
-     * @throws InvalidKeyException if the {@code salt} parameter cannot be
-     * used to initialize the underlying HMAC.
-     */
-    public SecretKey extract(byte[] salt, SecretKey inputKey, String keyAlg)
-            throws InvalidKeyException {
-        if (salt == null) {
-            salt = new byte[hmacLen];
-        }
-        return extract(new SecretKeySpec(salt, "HKDF-Salt"), inputKey, keyAlg);
-    }
-
-    /**
-     * Perform the HKDF-Expand derivation for a single-key output.
-     *
-     * @param pseudoRandKey the pseudo random key (PRK).
-     * @param info optional context-specific info.  A {@code null} value is
-     * allowed in which case a zero-length byte array will be used.
-     * @param outLen the length of the resulting {@code SecretKey}
-     * @param keyAlg the algorithm name applied to the resulting
-     * {@code SecretKey}
-     *
-     * @return the resulting key derivation as a {@code SecretKey} object
-     *
-     * @throws InvalidKeyException if the underlying HMAC operation cannot
-     * be initialized using the provided {@code pseudoRandKey} object.
-     */
-    public SecretKey expand(SecretKey pseudoRandKey, byte[] info, int outLen,
-            String keyAlg) throws InvalidKeyException {
-        byte[] kdfOutput;
-
-        // Calculate the number of rounds of HMAC that are needed to
-        // meet the requested data.  Then set up the buffers we will need.
-        Objects.requireNonNull(pseudoRandKey, "A null PRK is not allowed.");
-
-        // Output from the expand operation must be <= 255 * hmac length
-        if (outLen > 255 * hmacLen) {
-            throw new IllegalArgumentException("Requested output length " +
-                    "exceeds maximum length allowed for HKDF expansion");
-        }
-        hmacObj.init(pseudoRandKey);
-        if (info == null) {
-            info = new byte[0];
-        }
-        int rounds = (outLen + hmacLen - 1) / hmacLen;
-        kdfOutput = new byte[rounds * hmacLen];
-        int offset = 0;
-        int tLength = 0;
-
-        for (int i = 0; i < rounds ; i++) {
-
-            // Calculate this round
-            try {
-                 // Add T(i).  This will be an empty string on the first
-                 // iteration since tLength starts at zero.  After the first
-                 // iteration, tLength is changed to the HMAC length for the
-                 // rest of the loop.
-                hmacObj.update(kdfOutput,
-                        Math.max(0, offset - hmacLen), tLength);
-                hmacObj.update(info);                       // Add info
-                hmacObj.update((byte)(i + 1));              // Add round number
-                hmacObj.doFinal(kdfOutput, offset);
-
-                tLength = hmacLen;
-                offset += hmacLen;                       // For next iteration
-            } catch (ShortBufferException sbe) {
-                // This really shouldn't happen given that we've
-                // sized the buffers to their largest possible size up-front,
-                // but just in case...
-                throw new RuntimeException(sbe);
-            }
-        }
-
-        return new SecretKeySpec(kdfOutput, 0, outLen, keyAlg);
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
index b76da75c763..623f83f547a 100644
--- a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.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
@@ -24,15 +24,18 @@
  */
 package sun.security.ssl;
 
+import javax.crypto.KDF;
 import javax.crypto.KeyAgreement;
 import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.net.ssl.SSLHandshakeException;
+
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.spec.AlgorithmParameterSpec;
+import sun.security.util.KeyUtil;
 
 /**
  * A common class for creating various KeyDerivation types.
@@ -55,29 +58,26 @@ public class KAKeyDerivation implements SSLKeyDerivation {
     }
 
     @Override
-    public SecretKey deriveKey(String algorithm,
-            AlgorithmParameterSpec params) throws IOException {
+    public SecretKey deriveKey(String type) throws IOException {
         if (!context.negotiatedProtocol.useTLS13PlusSpec()) {
-            return t12DeriveKey(algorithm, params);
+            return t12DeriveKey();
         } else {
-            return t13DeriveKey(algorithm, params);
+            return t13DeriveKey(type);
         }
     }
 
     /**
      * Handle the TLSv1-1.2 objects, which don't use the HKDF algorithms.
      */
-    private SecretKey t12DeriveKey(String algorithm,
-            AlgorithmParameterSpec params) throws IOException {
+    private SecretKey t12DeriveKey() throws IOException {
+        SecretKey preMasterSecret = null;
         try {
             KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
             ka.init(localPrivateKey);
             ka.doPhase(peerPublicKey, true);
-            SecretKey preMasterSecret
-                    = ka.generateSecret("TlsPremasterSecret");
-            SSLMasterKeyDerivation mskd
-                    = SSLMasterKeyDerivation.valueOf(
-                            context.negotiatedProtocol);
+            preMasterSecret = ka.generateSecret("TlsPremasterSecret");
+            SSLMasterKeyDerivation mskd =
+                    SSLMasterKeyDerivation.valueOf(context.negotiatedProtocol);
             if (mskd == null) {
                 // unlikely
                 throw new SSLHandshakeException(
@@ -86,45 +86,55 @@ private SecretKey t12DeriveKey(String algorithm,
             }
             SSLKeyDerivation kd = mskd.createKeyDerivation(
                     context, preMasterSecret);
-            return kd.deriveKey("MasterSecret", params);
+            return kd.deriveKey("MasterSecret");
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
+        } finally {
+            KeyUtil.destroySecretKeys(preMasterSecret);
         }
     }
 
     /**
      * Handle the TLSv1.3 objects, which use the HKDF algorithms.
      */
-    private SecretKey t13DeriveKey(String algorithm,
-            AlgorithmParameterSpec params) throws IOException {
+    private SecretKey t13DeriveKey(String type)
+            throws IOException {
+        SecretKey sharedSecret = null;
+        SecretKey earlySecret = null;
+        SecretKey saltSecret = null;
         try {
             KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
             ka.init(localPrivateKey);
             ka.doPhase(peerPublicKey, true);
-            SecretKey sharedSecret
-                    = ka.generateSecret("TlsPremasterSecret");
+            sharedSecret = ka.generateSecret("TlsPremasterSecret");
 
             CipherSuite.HashAlg hashAlg = context.negotiatedCipherSuite.hashAlg;
             SSLKeyDerivation kd = context.handshakeKeyDerivation;
-            HKDF hkdf = new HKDF(hashAlg.name);
             if (kd == null) {   // No PSK is in use.
-                // If PSK is not in use Early Secret will still be
+                // If PSK is not in use, Early Secret will still be
                 // HKDF-Extract(0, 0).
                 byte[] zeros = new byte[hashAlg.hashLength];
-                SecretKeySpec ikm
-                        = new SecretKeySpec(zeros, "TlsPreSharedSecret");
-                SecretKey earlySecret
-                        = hkdf.extract(zeros, ikm, "TlsEarlySecret");
+                KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+                earlySecret = hkdf.deriveKey("TlsEarlySecret",
+                        HKDFParameterSpec.ofExtract().addSalt(zeros)
+                        .addIKM(zeros).extractOnly());
                 kd = new SSLSecretDerivation(context, earlySecret);
             }
 
             // derive salt secret
-            SecretKey saltSecret = kd.deriveKey("TlsSaltSecret", null);
+            saltSecret = kd.deriveKey("TlsSaltSecret");
 
             // derive handshake secret
-            return hkdf.extract(saltSecret, sharedSecret, algorithm);
+            // NOTE: do not reuse the HKDF object for "TlsEarlySecret" for
+            // the handshake secret key derivation (below) as it may not
+            // work with the "sharedSecret" obj.
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+            return hkdf.deriveKey(type, HKDFParameterSpec.ofExtract()
+                    .addSalt(saltSecret).addIKM(sharedSecret).extractOnly());
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
+        } finally {
+            KeyUtil.destroySecretKeys(sharedSecret, earlySecret, saltSecret);
         }
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
index 49eb0420f47..c4549070f02 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.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
@@ -214,11 +214,11 @@ public void consume(ConnectionContext context,
                         Alert.INTERNAL_ERROR, "no key derivation");
             }
 
-            SecretKey nplus1 = skd.deriveKey("TlsUpdateNplus1", null);
+            SecretKey nplus1 = skd.deriveKey("TlsUpdateNplus1");
             SSLKeyDerivation kd = kdg.createKeyDerivation(hc, nplus1);
-            SecretKey key = kd.deriveKey("TlsKey", null);
-            IvParameterSpec ivSpec = new IvParameterSpec(
-                    kd.deriveKey("TlsIv", null).getEncoded());
+            SecretKey key = kd.deriveKey("TlsKey");
+            IvParameterSpec ivSpec =
+                    new IvParameterSpec(kd.deriveData("TlsIv"));
             try {
                 SSLReadCipher rc =
                     hc.negotiatedCipherSuite.bulkCipher.createReadCipher(
@@ -293,11 +293,11 @@ public byte[] produce(ConnectionContext context,
                         Alert.INTERNAL_ERROR, "no key derivation");
             }
 
-            SecretKey nplus1 = skd.deriveKey("TlsUpdateNplus1", null);
+            SecretKey nplus1 = skd.deriveKey("TlsUpdateNplus1");
             SSLKeyDerivation kd = kdg.createKeyDerivation(hc, nplus1);
-            SecretKey key = kd.deriveKey("TlsKey", null);
-            IvParameterSpec ivSpec = new IvParameterSpec(
-                    kd.deriveKey("TlsIv", null).getEncoded());
+            SecretKey key = kd.deriveKey("TlsKey");
+            IvParameterSpec ivSpec =
+                     new IvParameterSpec(kd.deriveData("TlsIv"));
 
             SSLWriteCipher wc;
             try {
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 8be021b4111..4c879e0dc4d 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.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
@@ -31,7 +31,10 @@
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Locale;
+import javax.crypto.KDF;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.SSLHandshakeException;
 import sun.security.ssl.PskKeyExchangeModesExtension.PskKeyExchangeMode;
 import sun.security.ssl.PskKeyExchangeModesExtension.PskKeyExchangeModesSpec;
@@ -286,11 +289,16 @@ public String toString() {
     private static SecretKey derivePreSharedKey(CipherSuite.HashAlg hashAlg,
             SecretKey resumptionMasterSecret, byte[] nonce) throws IOException {
         try {
-            HKDF hkdf = new HKDF(hashAlg.name);
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+
             byte[] hkdfInfo = SSLSecretDerivation.createHkdfInfo(
                     "tls13 resumption".getBytes(), nonce, hashAlg.hashLength);
-            return hkdf.expand(resumptionMasterSecret, hkdfInfo,
-                    hashAlg.hashLength, "TlsPreSharedKey");
+            // SSLSessionImpl.write() uses the PreSharedKey encoding for
+            // the stateless session ticket; use SecretKeySpec instead of opaque
+            // Key objects
+            return new SecretKeySpec(hkdf.deriveData(
+                    HKDFParameterSpec.expandOnly(resumptionMasterSecret,
+                    hkdfInfo, hashAlg.hashLength)), "TlsPreSharedKey");
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not derive PSK", gse);
         }
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 4751708e5dc..f9c78774bc9 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -29,8 +29,10 @@
 import java.security.*;
 import java.text.MessageFormat;
 import java.util.*;
+import javax.crypto.KDF;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLProtocolException;
 import static sun.security.ssl.ClientAuthType.CLIENT_AUTH_REQUIRED;
@@ -40,6 +42,7 @@
 import sun.security.ssl.SSLHandshake.HandshakeMessage;
 import sun.security.ssl.SessionTicketExtension.SessionTicketSpec;
 import sun.security.util.HexDumpEncoder;
+import sun.security.util.KeyUtil;
 
 import static sun.security.ssl.SSLExtension.*;
 
@@ -559,11 +562,15 @@ private static void checkBinder(ServerHandshakeContext shc,
         }
 
         SecretKey binderKey = deriveBinderKey(shc, psk, session);
-        byte[] computedBinder =
-                computeBinder(shc, binderKey, session, pskBinderHash);
-        if (!MessageDigest.isEqual(binder, computedBinder)) {
-            throw shc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
-                    "Incorrect PSK binder value");
+        try {
+            byte[] computedBinder =
+                    computeBinder(shc, binderKey, session, pskBinderHash);
+            if (!MessageDigest.isEqual(binder, computedBinder)) {
+                throw shc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
+                        "Incorrect PSK binder value");
+            }
+        } finally {
+            KeyUtil.destroySecretKeys(binderKey);
         }
     }
 
@@ -712,21 +719,25 @@ public byte[] produce(ConnectionContext context,
 
             SecretKey binderKey =
                     deriveBinderKey(chc, psk, chc.resumingSession);
-            ClientHelloMessage clientHello = (ClientHelloMessage)message;
-            CHPreSharedKeySpec pskPrototype = createPskPrototype(
-                chc.resumingSession.getSuite().hashAlg.hashLength, identities);
-            HandshakeHash pskBinderHash = chc.handshakeHash.copy();
+            try {
+                ClientHelloMessage clientHello = (ClientHelloMessage)message;
+                CHPreSharedKeySpec pskPrototype = createPskPrototype(
+                    chc.resumingSession.getSuite().hashAlg.hashLength, identities);
+                HandshakeHash pskBinderHash = chc.handshakeHash.copy();
 
-            byte[] binder = computeBinder(chc, binderKey, pskBinderHash,
-                    chc.resumingSession, chc, clientHello, pskPrototype);
+                byte[] binder = computeBinder(chc, binderKey, pskBinderHash,
+                        chc.resumingSession, chc, clientHello, pskPrototype);
 
-            List<byte[]> binders = new ArrayList<>();
-            binders.add(binder);
+                List<byte[]> binders = new ArrayList<>();
+                binders.add(binder);
 
-            CHPreSharedKeySpec pskMessage =
-                    new CHPreSharedKeySpec(identities, binders);
-            chc.handshakeExtensions.put(CH_PRE_SHARED_KEY, pskMessage);
-            return pskMessage.getEncoded();
+                CHPreSharedKeySpec pskMessage =
+                        new CHPreSharedKeySpec(identities, binders);
+                chc.handshakeExtensions.put(CH_PRE_SHARED_KEY, pskMessage);
+                return pskMessage.getEncoded();
+            } finally {
+                KeyUtil.destroySecretKeys(binderKey);
+            }
         }
 
         private CHPreSharedKeySpec createPskPrototype(
@@ -780,12 +791,13 @@ private static byte[] computeBinder(HandshakeContext context,
             SSLSessionImpl session, byte[] digest) throws IOException {
         try {
             CipherSuite.HashAlg hashAlg = session.getSuite().hashAlg;
-            HKDF hkdf = new HKDF(hashAlg.name);
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
             byte[] label = ("tls13 finished").getBytes();
             byte[] hkdfInfo = SSLSecretDerivation.createHkdfInfo(
                     label, new byte[0], hashAlg.hashLength);
-            SecretKey finishedKey = hkdf.expand(
-                    binderKey, hkdfInfo, hashAlg.hashLength, "TlsBinderKey");
+            SecretKey finishedKey = hkdf.deriveKey("TlsBinderKey",
+                    HKDFParameterSpec.expandOnly(binderKey, hkdfInfo,
+                    hashAlg.hashLength));
 
             String hmacAlg =
                 "Hmac" + hashAlg.name.replace("-", "");
@@ -795,6 +807,8 @@ private static byte[] computeBinder(HandshakeContext context,
                 return hmac.doFinal(digest);
             } catch (NoSuchAlgorithmException | InvalidKeyException ex) {
                 throw context.conContext.fatal(Alert.INTERNAL_ERROR, ex);
+            } finally {
+                KeyUtil.destroySecretKeys(finishedKey);
             }
         } catch (GeneralSecurityException ex) {
             throw context.conContext.fatal(Alert.INTERNAL_ERROR, ex);
@@ -805,16 +819,16 @@ private static SecretKey deriveBinderKey(HandshakeContext context,
             SecretKey psk, SSLSessionImpl session) throws IOException {
         try {
             CipherSuite.HashAlg hashAlg = session.getSuite().hashAlg;
-            HKDF hkdf = new HKDF(hashAlg.name);
             byte[] zeros = new byte[hashAlg.hashLength];
-            SecretKey earlySecret = hkdf.extract(zeros, psk, "TlsEarlySecret");
-
             byte[] label = ("tls13 res binder").getBytes();
             MessageDigest md = MessageDigest.getInstance(hashAlg.name);
             byte[] hkdfInfo = SSLSecretDerivation.createHkdfInfo(
                     label, md.digest(new byte[0]), hashAlg.hashLength);
-            return hkdf.expand(earlySecret,
-                    hkdfInfo, hashAlg.hashLength, "TlsBinderKey");
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+            HKDFParameterSpec spec = HKDFParameterSpec.ofExtract()
+                    .addSalt(zeros).addIKM(psk)
+                    .thenExpand(hkdfInfo, hashAlg.hashLength);
+            return hkdf.deriveKey("TlsBinderKey", spec);
         } catch (GeneralSecurityException ex) {
             throw context.conContext.fatal(Alert.INTERNAL_ERROR, ex);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 5189822da30..701ba35174e 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.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
@@ -208,8 +208,7 @@ public byte[] produce(ConnectionContext context,
                         "Not supported key exchange type");
             } else {
                 SSLKeyDerivation masterKD = ke.createKeyDerivation(chc);
-                SecretKey masterSecret =
-                        masterKD.deriveKey("MasterSecret", null);
+                SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
 
                 // update the states
                 chc.handshakeSession.setMasterSecret(masterSecret);
@@ -296,8 +295,7 @@ public void consume(ConnectionContext context,
                         "Not supported key exchange type");
             } else {
                 SSLKeyDerivation masterKD = ke.createKeyDerivation(shc);
-                SecretKey masterSecret =
-                        masterKD.deriveKey("MasterSecret", null);
+                SecretKey masterSecret = masterKD.deriveKey("MasterSecret");
 
                 // update the states
                 shc.handshakeSession.setMasterSecret(masterSecret);
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
index 3ad4a009556..311ac97e744 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, 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
@@ -292,8 +292,7 @@ class RSAKAKeyDerivation implements SSLKeyDerivation {
             }
 
             @Override
-            public SecretKey deriveKey(String algorithm,
-                    AlgorithmParameterSpec params) throws IOException {
+            public SecretKey deriveKey(String typeNotUsed) throws IOException {
                 SSLMasterKeyDerivation mskd =
                         SSLMasterKeyDerivation.valueOf(
                                 context.negotiatedProtocol);
@@ -305,7 +304,7 @@ public SecretKey deriveKey(String algorithm,
                 }
                 SSLKeyDerivation kd = mskd.createKeyDerivation(
                         context, preMasterSecret);
-                return kd.deriveKey("MasterSecret", params);
+                return kd.deriveKey("MasterSecret");
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
index 20fc7112593..58ed20792ad 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.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
@@ -28,29 +28,33 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
-import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.KDF;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.net.ssl.SSLHandshakeException;
 
+import sun.security.ssl.CipherSuite.HashAlg;
+
 final class SSLBasicKeyDerivation implements SSLKeyDerivation {
-    private final String hashAlg;
+    private final String hkdfAlg;
     private final SecretKey secret;
     private final byte[] hkdfInfo;
+    private final int keyLen;
 
-    SSLBasicKeyDerivation(SecretKey secret, String hashAlg,
-            byte[] label, byte[] context, int length) {
-        this.hashAlg = hashAlg.replace("-", "");
+    SSLBasicKeyDerivation(SecretKey secret, HashAlg hashAlg, byte[] label,
+            byte[] context) {
+        this.hkdfAlg = hashAlg.hkdfAlgorithm;
         this.secret = secret;
-        this.hkdfInfo = createHkdfInfo(label, context, length);
+        this.hkdfInfo = createHkdfInfo(label, context, hashAlg.hashLength);
+        this.keyLen = hashAlg.hashLength;
     }
 
     @Override
-    public SecretKey deriveKey(String algorithm,
-            AlgorithmParameterSpec keySpec) throws IOException {
+    public SecretKey deriveKey(String type) throws IOException {
         try {
-            HKDF hkdf = new HKDF(hashAlg);
-            return hkdf.expand(secret, hkdfInfo,
-                    ((SecretSizeSpec)keySpec).length, algorithm);
+            KDF hkdf = KDF.getInstance(hkdfAlg);
+            return hkdf.deriveKey(type,
+                    HKDFParameterSpec.expandOnly(secret, hkdfInfo, keyLen));
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
         }
@@ -69,12 +73,4 @@ private static byte[] createHkdfInfo(
         }
         return info;
     }
-
-    static class SecretSizeSpec implements AlgorithmParameterSpec {
-        final int length;
-
-        SecretSizeSpec(int length) {
-            this.length = length;
-        }
-    }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLKeyDerivation.java
index d132af3b0b0..ab415bdae4b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLKeyDerivation.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
@@ -30,6 +30,9 @@
 import javax.crypto.SecretKey;
 
 interface SSLKeyDerivation {
-    SecretKey deriveKey(String algorithm,
-            AlgorithmParameterSpec params) throws IOException;
+    SecretKey deriveKey(String purpose) throws IOException;
+
+    default byte[] deriveData(String purpose) throws IOException {
+        throw new UnsupportedOperationException("No support for deriveData!");
+    };
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
index b3e60553d55..db5887c5e8e 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.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
@@ -84,9 +84,7 @@ class LegacyMasterKeyDerivation implements SSLKeyDerivation {
 
         @Override
         @SuppressWarnings("deprecation")
-        public SecretKey deriveKey(String algorithm,
-                AlgorithmParameterSpec params) throws IOException {
-
+        public SecretKey deriveKey(String typeNotUsed) throws IOException {
             CipherSuite cipherSuite = context.negotiatedCipherSuite;
             ProtocolVersion protocolVersion = context.negotiatedProtocol;
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
index 0c0dc46d33d..dc3b2bcb4bc 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.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
@@ -29,7 +29,9 @@
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.KDF;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.net.ssl.SSLHandshakeException;
 import sun.security.ssl.CipherSuite.HashAlg;
 
@@ -87,9 +89,8 @@ SSLSecretDerivation forContext(HandshakeContext context) {
     }
 
     @Override
-    public SecretKey deriveKey(String algorithm,
-            AlgorithmParameterSpec params) throws IOException {
-        SecretSchedule ks = SecretSchedule.valueOf(algorithm);
+    public SecretKey deriveKey(String type) throws IOException {
+        SecretSchedule ks = SecretSchedule.valueOf(type);
         try {
             byte[] expandContext;
             if (ks == SecretSchedule.TlsSaltSecret) {
@@ -102,16 +103,16 @@ public SecretKey deriveKey(String algorithm,
                     // get supported in the future.
                     throw new SSLHandshakeException(
                             "Unexpected unsupported hash algorithm: " +
-                            algorithm);
+                            hashAlg);
                 }
             } else {
                 expandContext = transcriptHash;
             }
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
             byte[] hkdfInfo = createHkdfInfo(ks.label,
                     expandContext, hashAlg.hashLength);
-
-            HKDF hkdf = new HKDF(hashAlg.name);
-            return hkdf.expand(secret, hkdfInfo, hashAlg.hashLength, algorithm);
+            return hkdf.deriveKey(type, HKDFParameterSpec.expandOnly(
+                    secret, hkdfInfo, hashAlg.hashLength));
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index 0ff80f0c76c..4baa3304fee 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.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
@@ -37,7 +37,7 @@
 import javax.net.ssl.SSLSessionContext;
 
 import sun.security.util.Cache;
-
+import sun.security.util.KeyUtil;
 
 /**
  * {@systemProperty jdk.tls.server.enableSessionTicketExtension} determines if the
@@ -197,11 +197,7 @@ private void cleanupStatelessKeys() {
             SessionTicketExtension.StatelessKey k = entry.getValue();
             if (k.isInvalid(this)) {
                 it.remove();
-                try {
-                    k.key.destroy();
-                } catch (Exception e) {
-                    // Suppress
-                }
+                KeyUtil.destroySecretKeys(k.key);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
index b17a03f0cb4..1db07c77160 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.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
@@ -30,8 +30,10 @@
 import java.security.GeneralSecurityException;
 import java.security.ProviderException;
 import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.KDF;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.SSLHandshakeException;
@@ -69,7 +71,6 @@ static SSLTrafficKeyDerivation valueOf(ProtocolVersion protocolVersion) {
             case TLS13:
                 return SSLTrafficKeyDerivation.TLS13;
         }
-
         return null;
     }
 
@@ -143,16 +144,29 @@ static final class T13TrafficKeyDerivation implements SSLKeyDerivation {
         }
 
         @Override
-        public SecretKey deriveKey(String algorithm,
-                AlgorithmParameterSpec params) throws IOException {
-            KeySchedule ks = KeySchedule.valueOf(algorithm);
+        public SecretKey deriveKey(String type) throws IOException {
+            KeySchedule ks = KeySchedule.valueOf(type);
+            try {
+                KDF hkdf = KDF.getInstance(cs.hashAlg.hkdfAlgorithm);
+                byte[] hkdfInfo = createHkdfInfo(ks.label, ks.getKeyLength(cs));
+                HKDFParameterSpec spec = HKDFParameterSpec.expandOnly(secret,
+                        hkdfInfo, ks.getKeyLength(cs));
+                return hkdf.deriveKey(ks.getAlgorithm(cs, type), spec);
+            } catch (GeneralSecurityException gse) {
+                throw new SSLHandshakeException(
+                        "Could not generate secret", gse);
+            }
+        }
+
+        @Override
+        public byte[] deriveData(String type) throws IOException {
+            KeySchedule ks = KeySchedule.valueOf(type);
             try {
-                HKDF hkdf = new HKDF(cs.hashAlg.name);
-                byte[] hkdfInfo =
-                        createHkdfInfo(ks.label, ks.getKeyLength(cs));
-                return hkdf.expand(secret, hkdfInfo,
-                        ks.getKeyLength(cs),
-                        ks.getAlgorithm(cs, algorithm));
+                KDF hkdf = KDF.getInstance(cs.hashAlg.hkdfAlgorithm);
+                byte[] hkdfInfo = createHkdfInfo(ks.label, ks.getKeyLength(cs));
+                HKDFParameterSpec spec = HKDFParameterSpec.expandOnly(secret,
+                        hkdfInfo, ks.getKeyLength(cs));
+                return hkdf.deriveData(spec);
             } catch (GeneralSecurityException gse) {
                 throw new SSLHandshakeException(
                         "Could not generate secret", gse);
@@ -171,13 +185,12 @@ private static byte[] createHkdfInfo(
                 // unlikely
                 throw new RuntimeException("Unexpected exception", ioe);
             }
-
             return info;
         }
     }
 
     private enum KeySchedule {
-        // Note that we use enum name as the key/ name.
+        // Note that we use enum name as the key name.
         TlsKey              ("key", false),
         TlsIv               ("iv",  true),
         TlsUpdateNplus1     ("traffic upd", false);
@@ -285,8 +298,9 @@ static final class LegacyTrafficKeyDerivation implements SSLKeyDerivation {
             }
         }
 
-        SecretKey getTrafficKey(String algorithm) {
-            switch (algorithm) {
+        @Override
+        public SecretKey deriveKey(String type) throws IOException {
+            switch (type) {
                 case "clientMacKey":
                     return keyMaterialSpec.getClientMacKey();
                 case "serverMacKey":
@@ -295,24 +309,25 @@ SecretKey getTrafficKey(String algorithm) {
                     return keyMaterialSpec.getClientCipherKey();
                 case "serverWriteKey":
                     return keyMaterialSpec.getServerCipherKey();
+                default:
+                    throw new SSLHandshakeException(
+                            "Cannot deriveKey for " + type);
+            }
+        }
+
+        @Override
+        public byte[] deriveData(String type) throws IOException {
+            switch (type) {
                 case "clientWriteIv":
                     IvParameterSpec cliIvSpec = keyMaterialSpec.getClientIv();
-                    return  (cliIvSpec == null) ? null :
-                            new SecretKeySpec(cliIvSpec.getIV(), "TlsIv");
+                    return  (cliIvSpec == null) ? null : cliIvSpec.getIV();
                 case "serverWriteIv":
                     IvParameterSpec srvIvSpec = keyMaterialSpec.getServerIv();
-                    return  (srvIvSpec == null) ? null :
-                            new SecretKeySpec(srvIvSpec.getIV(), "TlsIv");
+                    return  (srvIvSpec == null) ? null : srvIvSpec.getIV();
+                default:
+                    throw new SSLHandshakeException(
+                            "Cannot deriveData for " + type);
             }
-
-            return null;
-        }
-
-        @Override
-        public SecretKey deriveKey(String algorithm,
-                AlgorithmParameterSpec params) throws IOException {
-            return getTrafficKey(algorithm);
         }
     }
 }
-
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 303095a0722..e38022f1c3e 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -32,7 +32,9 @@
 import java.security.GeneralSecurityException;
 import java.text.MessageFormat;
 import java.util.*;
+import javax.crypto.KDF;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLHandshakeException;
@@ -585,7 +587,7 @@ public byte[] produce(ConnectionContext context,
 
             SSLKeyDerivation handshakeKD = ke.createKeyDerivation(shc);
             SecretKey handshakeSecret = handshakeKD.deriveKey(
-                    "TlsHandshakeSecret", null);
+                    "TlsHandshakeSecret");
 
             SSLTrafficKeyDerivation kdg =
                 SSLTrafficKeyDerivation.valueOf(shc.negotiatedProtocol);
@@ -601,15 +603,12 @@ public byte[] produce(ConnectionContext context,
 
             // update the handshake traffic read keys.
             SecretKey readSecret = kd.deriveKey(
-                    "TlsClientHandshakeTrafficSecret", null);
+                    "TlsClientHandshakeTrafficSecret");
             SSLKeyDerivation readKD =
                     kdg.createKeyDerivation(shc, readSecret);
-            SecretKey readKey = readKD.deriveKey(
-                    "TlsKey", null);
-            SecretKey readIvSecret = readKD.deriveKey(
-                    "TlsIv", null);
+            SecretKey readKey = readKD.deriveKey("TlsKey");
             IvParameterSpec readIv =
-                    new IvParameterSpec(readIvSecret.getEncoded());
+                    new IvParameterSpec(readKD.deriveData("TlsIv"));
             SSLReadCipher readCipher;
             try {
                 readCipher =
@@ -635,15 +634,12 @@ public byte[] produce(ConnectionContext context,
 
             // update the handshake traffic write secret.
             SecretKey writeSecret = kd.deriveKey(
-                    "TlsServerHandshakeTrafficSecret", null);
+                    "TlsServerHandshakeTrafficSecret");
             SSLKeyDerivation writeKD =
                     kdg.createKeyDerivation(shc, writeSecret);
-            SecretKey writeKey = writeKD.deriveKey(
-                    "TlsKey", null);
-            SecretKey writeIvSecret = writeKD.deriveKey(
-                    "TlsIv", null);
+            SecretKey writeKey = writeKD.deriveKey("TlsKey");
             IvParameterSpec writeIv =
-                    new IvParameterSpec(writeIvSecret.getEncoded());
+                    new IvParameterSpec(writeKD.deriveData("TlsIv"));
             SSLWriteCipher writeCipher;
             try {
                 writeCipher =
@@ -1195,12 +1191,13 @@ private static void setUpPskKD(HandshakeContext hc,
 
         try {
             CipherSuite.HashAlg hashAlg = hc.negotiatedCipherSuite.hashAlg;
-            HKDF hkdf = new HKDF(hashAlg.name);
-            byte[] zeros = new byte[hashAlg.hashLength];
-            SecretKey earlySecret = hkdf.extract(zeros, psk, "TlsEarlySecret");
+            KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+            SecretKey earlySecret = hkdf.deriveKey("TlsEarlySecret",
+                    HKDFParameterSpec.ofExtract().addIKM(psk)
+                    .addSalt(new byte[hashAlg.hashLength]).extractOnly());
             hc.handshakeKeyDerivation =
                     new SSLSecretDerivation(hc, earlySecret);
-        } catch  (GeneralSecurityException gse) {
+        } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
         }
     }
@@ -1284,7 +1281,7 @@ public void consume(ConnectionContext context,
 
             SSLKeyDerivation handshakeKD = ke.createKeyDerivation(chc);
             SecretKey handshakeSecret = handshakeKD.deriveKey(
-                    "TlsHandshakeSecret", null);
+                    "TlsHandshakeSecret");
             SSLTrafficKeyDerivation kdg =
                 SSLTrafficKeyDerivation.valueOf(chc.negotiatedProtocol);
             if (kdg == null) {
@@ -1299,16 +1296,13 @@ public void consume(ConnectionContext context,
 
             // update the handshake traffic read keys.
             SecretKey readSecret = secretKD.deriveKey(
-                    "TlsServerHandshakeTrafficSecret", null);
+                    "TlsServerHandshakeTrafficSecret");
 
             SSLKeyDerivation readKD =
                     kdg.createKeyDerivation(chc, readSecret);
-            SecretKey readKey = readKD.deriveKey(
-                    "TlsKey", null);
-            SecretKey readIvSecret = readKD.deriveKey(
-                    "TlsIv", null);
+            SecretKey readKey = readKD.deriveKey("TlsKey");
             IvParameterSpec readIv =
-                    new IvParameterSpec(readIvSecret.getEncoded());
+                    new IvParameterSpec(readKD.deriveData("TlsIv"));
             SSLReadCipher readCipher;
             try {
                 readCipher =
@@ -1334,15 +1328,12 @@ public void consume(ConnectionContext context,
 
             // update the handshake traffic write keys.
             SecretKey writeSecret = secretKD.deriveKey(
-                    "TlsClientHandshakeTrafficSecret", null);
+                    "TlsClientHandshakeTrafficSecret");
             SSLKeyDerivation writeKD =
                     kdg.createKeyDerivation(chc, writeSecret);
-            SecretKey writeKey = writeKD.deriveKey(
-                    "TlsKey", null);
-            SecretKey writeIvSecret = writeKD.deriveKey(
-                    "TlsIv", null);
+            SecretKey writeKey = writeKD.deriveKey("TlsKey");
             IvParameterSpec writeIv =
-                    new IvParameterSpec(writeIvSecret.getEncoded());
+                    new IvParameterSpec(writeKD.deriveData("TlsIv"));
             SSLWriteCipher writeCipher;
             try {
                 writeCipher =
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 95223ec0b12..03768e11450 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -36,6 +36,9 @@
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.spec.DHPublicKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.security.auth.DestroyFailedException;
+import jdk.internal.access.SharedSecrets;
 
 import sun.security.jca.JCAUtil;
 
@@ -457,5 +460,23 @@ public static boolean isSupportedKeyAgreementOutputAlgorithm(String alg) {
         return alg.equalsIgnoreCase("TlsPremasterSecret")
                 || alg.equalsIgnoreCase("Generic");
     }
+
+    // destroy secret keys in a best-effort way
+    public static void destroySecretKeys(SecretKey... keys) {
+        for (SecretKey k : keys) {
+            if (k != null) {
+                if (k instanceof SecretKeySpec sk) {
+                    SharedSecrets.getJavaxCryptoSpecAccess()
+                            .clearSecretKeySpec(sk);
+                } else {
+                    try {
+                        k.destroy();
+                    } catch (DestroyFailedException e) {
+                        // swallow
+                    }
+                }
+            }
+        }
+    }
 }
 
diff --git a/test/jdk/sun/security/ssl/internal/TEST.properties b/test/jdk/sun/security/ssl/internal/TEST.properties
deleted file mode 100644
index c14498c7b24..00000000000
--- a/test/jdk/sun/security/ssl/internal/TEST.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-modules = \
-    java.base/sun.security.ssl
-bootclasspath.dirs=.
diff --git a/test/jdk/sun/security/ssl/internal/TestRun.java b/test/jdk/sun/security/ssl/internal/TestRun.java
deleted file mode 100644
index 27c4e2ba67c..00000000000
--- a/test/jdk/sun/security/ssl/internal/TestRun.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8145255
- * @run main/othervm java.base/sun.security.ssl.TestHkdf
- * @summary HKDF for Sun JSSE
- */
-
diff --git a/test/jdk/sun/security/ssl/internal/java.base/sun/security/ssl/TestHkdf.java b/test/jdk/sun/security/ssl/internal/java.base/sun/security/ssl/TestHkdf.java
deleted file mode 100644
index f3b489206a0..00000000000
--- a/test/jdk/sun/security/ssl/internal/java.base/sun/security/ssl/TestHkdf.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Actual test code for the package private HKDF implementation
- */
-
-package sun.security.ssl;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Objects;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidKeyException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-public class TestHkdf {
-    public static class TestData {
-        public TestData(String name, String algStr, String ikmStr,
-                String saltStr, String infoStr, int oLen, String expPrkStr,
-                String expOkmStr) {
-            testName = Objects.requireNonNull(name);
-            algName = Objects.requireNonNull(algStr);
-            IKM = hex2bin(Objects.requireNonNull(ikmStr));
-            if ((outLen = oLen) <= 0) {
-                throw new IllegalArgumentException(
-                        "Output length must be greater than 0");
-            }
-            expectedPRK = hex2bin(Objects.requireNonNull(expPrkStr));
-            expectedOKM = hex2bin(Objects.requireNonNull(expOkmStr));
-
-            // Non-mandatory fields - may be null
-            salt = (saltStr != null) ? hex2bin(saltStr) : null;
-            info = (infoStr != null) ? hex2bin(infoStr) : null;
-        }
-
-        public final String testName;
-        public final String algName;
-        public final byte[] IKM;
-        public final byte[] salt;
-        public final byte[] info;
-        public final int outLen;
-        public final byte[] expectedPRK;
-        public final byte[] expectedOKM;
-    }
-
-    public static final List<TestData> testList = new LinkedList<TestData>() {{
-        add(new TestData("RFC 5689 Test Case 1", "SHA-256",
-            "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-            "000102030405060708090a0b0c",
-            "f0f1f2f3f4f5f6f7f8f9",
-            42,
-            "077709362c2e32df0ddc3f0dc47bba6390b6c73bb50f9c3122ec844ad7c2b3e5",
-            "3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf" +
-            "34007208d5b887185865"));
-        add(new TestData("RFC 5689 Test Case 2", "SHA-256",
-            "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" +
-            "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f" +
-            "404142434445464748494a4b4c4d4e4f",
-            "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f" +
-            "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f" +
-            "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
-            "b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecf" +
-            "d0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeef" +
-            "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
-            82,
-            "06a6b88c5853361a06104c9ceb35b45cef760014904671014a193f40c15fc244",
-            "b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c" +
-            "59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71" +
-            "cc30c58179ec3e87c14c01d5c1f3434f1d87"));
-        add(new TestData("RFC 5689 Test Case 3", "SHA-256",
-            "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-            null, null, 42,
-            "19ef24a32c717b167f33a91d6f648bdf96596776afdb6377ac434c1c293ccb04",
-            "8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d" +
-            "9d201395faa4b61a96c8"));
-        add(new TestData("RFC 5689 Test Case 4", "SHA-1",
-            "0b0b0b0b0b0b0b0b0b0b0b",
-            "000102030405060708090a0b0c",
-            "f0f1f2f3f4f5f6f7f8f9",
-            42,
-            "9b6c18c432a7bf8f0e71c8eb88f4b30baa2ba243",
-            "085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2" +
-            "c22e422478d305f3f896"));
-        add(new TestData("RFC 5689 Test Case 5", "SHA-1",
-            "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" +
-            "202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f" +
-            "404142434445464748494a4b4c4d4e4f",
-            "606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f" +
-            "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f" +
-            "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
-            "b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecf" +
-            "d0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeef" +
-            "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
-            82,
-            "8adae09a2a307059478d309b26c4115a224cfaf6",
-            "0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe" +
-            "8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e" +
-            "927336d0441f4c4300e2cff0d0900b52d3b4"));
-        add(new TestData("RFC 5689 Test Case 6", "SHA-1",
-            "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-            null, null, 42,
-            "da8c8a73c7fa77288ec6f5e7c297786aa0d32d01",
-            "0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0" +
-            "ea00033de03984d34918"));
-        add(new TestData("RFC 5689 Test Case 7", "SHA-1",
-            "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-            null, null, 42,
-            "2adccada18779e7c2077ad2eb19d3f3e731385dd",
-            "2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5" +
-            "673a081d70cce7acfc48"));
-    }};
-
-    public static void main(String args[]) throws Exception {
-        int testsPassed = 0;
-
-        int testNo = 0;
-        for (TestData test : testList) {
-            System.out.println("*** Test " + ++testNo + ": " +
-                    test.testName);
-            if (runVector(test)) {
-                testsPassed++;
-            }
-        }
-
-        System.out.println("Total tests: " + testList.size() +
-                ", Passed: " + testsPassed + ", Failed: " +
-                (testList.size() - testsPassed));
-        if (testsPassed != testList.size()) {
-            throw new RuntimeException("One or more tests failed.  " +
-                    "Check output for details");
-        }
-    }
-
-    private static boolean runVector(TestData testData)
-            throws NoSuchAlgorithmException, InvalidKeyException {
-        String kdfName, prfName;
-        HKDF kdfHkdf;
-        boolean result = true;
-        SecretKey actualPRK;
-        SecretKey actualOKM;
-        byte[] deriveData;
-
-        // Get an instance of the HKDF derivation engine
-        kdfHkdf = new HKDF(testData.algName);
-
-        // Set up the input keying material and the salt as a secret
-        SecretKey ikmKey = new SecretKeySpec(testData.IKM, "HKDF-IKM");
-        SecretKey saltKey = (testData.salt != null) ?
-                new SecretKeySpec(testData.salt, "HKDF-Salt") : null;
-
-        // *** HKDF-Extract-only testing
-        System.out.println("* HKDF-Extract-Only:");
-        actualPRK = kdfHkdf.extract(saltKey, ikmKey, "HKDF-PRK");
-        result &= compareKeyAndData(actualPRK, testData.expectedPRK);
-
-        // *** HKDF Expand-Only testing
-        // For these tests, we'll use the actualPRK as the input key
-        System.out.println("* HKDF-Expand-Only:");
-        actualOKM = kdfHkdf.expand(actualPRK, testData.info, testData.outLen,
-                "HKDF-OKM");
-        result &= compareKeyAndData(actualOKM, testData.expectedOKM);
-
-        // *** HKDF Extract-then-Expand testing
-        // System.out.println("* HKDF-Extract-then-Expand:");
-        // actualOKM = kdfHkdf.extractExpand(ikmKey, saltKey, testData.info,
-        //         testData.outLen, "HKDF-OKM2");
-        // result &= compareKeyAndData(actualOKM, testData.expectedOKM);
-
-        return result;
-    }
-
-    /**
-     * Compare actual key output from HKDF against an expected output value.
-     *
-     * @param outKey the KDF output in key form
-     * @param expectedOut the expected value
-     *
-     * @return true if the underlying data for outKey, outData and
-     * expectedOut are the same.
-     */
-    private static boolean compareKeyAndData(SecretKey outKey,
-            byte[] expectedOut) {
-        boolean result = false;
-
-        if (Arrays.equals(outKey.getEncoded(), expectedOut)) {
-            System.out.println("\t* Key output: Pass");
-            result = true;
-        } else {
-            System.out.println("\t* Key output: FAIL");
-            System.out.println("Expected:\n" +
-                    dumpHexBytes(expectedOut, 16, "\n", " "));
-            System.out.println("Actual:\n" +
-                    dumpHexBytes(outKey.getEncoded(), 16, "\n", " "));
-            System.out.println();
-        }
-
-        return result;
-    }
-
-    /**
-     * Dump the hex bytes of a buffer into string form.
-     *
-     * @param data The array of bytes to dump to stdout.
-     * @param itemsPerLine The number of bytes to display per line
-     *      if the {@code lineDelim} character is blank then all bytes
-     *      will be printed on a single line.
-     * @param lineDelim The delimiter between lines
-     * @param itemDelim The delimiter between bytes
-     *
-     * @return The hexdump of the byte array
-     */
-    private static String dumpHexBytes(byte[] data, int itemsPerLine,
-            String lineDelim, String itemDelim) {
-        StringBuilder sb = new StringBuilder();
-        if (data != null) {
-            for (int i = 0; i < data.length; i++) {
-                if (i % itemsPerLine == 0 && i != 0) {
-                    sb.append(lineDelim);
-                }
-                sb.append(String.format("%02X", data[i])).append(itemDelim);
-            }
-        }
-
-        return sb.toString();
-    }
-
-    private static byte[] hex2bin(String hex) {
-        int i;
-        int len = hex.length();
-        byte[] data = new byte [len / 2];
-        for (i = 0; i < len; i += 2) {
-            data[i / 2] = (byte)((Character.digit(hex.charAt(i), 16) << 4) +
-                    Character.digit(hex.charAt(i + 1), 16));
-        }
-        return data;
-    }
-}

From a96424b24cc7734f04716a4459e5d5e0a5c73c0d Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 14 May 2025 00:03:20 +0000
Subject: [PATCH 443/901] 8356694: Removed unused subclass audits in
 ObjectInput/OutputStream

Reviewed-by: alanb, rriggs
---
 .../classes/java/io/ObjectInputStream.java    | 35 +----------------
 .../classes/java/io/ObjectOutputStream.java   | 38 +------------------
 2 files changed, 2 insertions(+), 71 deletions(-)

diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index a47d2d5a325..daed5f3cce5 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.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
@@ -255,14 +255,6 @@ public class ObjectInputStream
     private static final Object unsharedMarker = new Object();
 
     private static class Caches {
-        /** cache of subclass security audit results */
-        static final ClassValue<Boolean> subclassAudits =
-            new ClassValue<>() {
-                @Override
-                protected Boolean computeValue(Class<?> type) {
-                    return auditSubclass(type);
-                }
-            };
 
         /**
          * Property to permit setting a filter after objects
@@ -1544,31 +1536,6 @@ public abstract boolean get(String name, boolean val)
         public abstract Object get(String name, Object val) throws IOException, ClassNotFoundException;
     }
 
-    /**
-     * Performs reflective checks on given subclass to verify that it doesn't
-     * override security-sensitive non-final methods.  Returns TRUE if subclass
-     * is "safe", FALSE otherwise.
-     */
-    private static Boolean auditSubclass(Class<?> subcl) {
-        for (Class<?> cl = subcl;
-             cl != ObjectInputStream.class;
-             cl = cl.getSuperclass())
-        {
-            try {
-                cl.getDeclaredMethod(
-                    "readUnshared", (Class[]) null);
-                return Boolean.FALSE;
-            } catch (NoSuchMethodException ex) {
-            }
-            try {
-                cl.getDeclaredMethod("readFields", (Class[]) null);
-                return Boolean.FALSE;
-            } catch (NoSuchMethodException ex) {
-            }
-        }
-        return Boolean.TRUE;
-    }
-
     /**
      * Clears internal data structures.
      */
diff --git a/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java
index 71bda09bd8c..31413bcf8ed 100644
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -174,17 +174,6 @@ public class ObjectOutputStream
 {
     private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 
-    private static class Caches {
-        /** cache of subclass security audit results */
-        static final ClassValue<Boolean> subclassAudits =
-            new ClassValue<>() {
-                @Override
-                protected Boolean computeValue(Class<?> type) {
-                    return auditSubclass(type);
-                }
-            };
-    }
-
     /** filter stream for handling block data conversion */
     private final BlockDataOutputStream bout;
     /** obj -> wire handle map */
@@ -1003,31 +992,6 @@ void writeTypeString(String str) throws IOException {
         }
     }
 
-    /**
-     * Performs reflective checks on given subclass to verify that it doesn't
-     * override security-sensitive non-final methods.  Returns TRUE if subclass
-     * is "safe", FALSE otherwise.
-     */
-    private static Boolean auditSubclass(Class<?> subcl) {
-        for (Class<?> cl = subcl;
-             cl != ObjectOutputStream.class;
-             cl = cl.getSuperclass())
-        {
-            try {
-                cl.getDeclaredMethod(
-                    "writeUnshared", new Class<?>[] { Object.class });
-                return Boolean.FALSE;
-            } catch (NoSuchMethodException ex) {
-            }
-            try {
-                cl.getDeclaredMethod("putFields", (Class<?>[]) null);
-                return Boolean.FALSE;
-            } catch (NoSuchMethodException ex) {
-            }
-        }
-        return Boolean.TRUE;
-    }
-
     /**
      * Clears internal data structures.
      */

From 0c4bc48928cea7ddd48ba84ed09e9e42ffc68da6 Mon Sep 17 00:00:00 2001
From: Chihiro Ito <cito@openjdk.org>
Date: Wed, 14 May 2025 00:25:59 +0000
Subject: [PATCH 444/901] 8356820: fixpath should allow + in paths on Windows

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

diff --git a/make/scripts/fixpath.sh b/make/scripts/fixpath.sh
index 8eaf57d18f3..6a524df4c68 100644
--- a/make/scripts/fixpath.sh
+++ b/make/scripts/fixpath.sh
@@ -157,12 +157,12 @@ function import_path() {
     if [[ $? -eq 0 && -e "$unixpath" ]]; then
       if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
         # If it is not in envroot, it's a generic windows path
-        if [[ ! $winpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then
+        if [[ ! $winpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
           # Path has forbidden characters, rewrite as short name
           # This monster of a command uses the %~s support from cmd.exe to
           # reliably convert to short paths on all winenvs.
           shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)"
-          if [[ ! $shortpath =~ ^[-_.:~\\a-zA-Z0-9]*$ ]] ; then
+          if [[ ! $shortpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
             if [[ $QUIET != true ]]; then
               echo fixpath: failure: Path "'"$path"'" could not be converted to short path >&2
             fi

From dd2aba98f500531130b9dfccd4a4ad6555f1ea5c Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 14 May 2025 00:50:38 +0000
Subject: [PATCH 445/901] 8356689: Make HotSpot Style Guide change process more
 prominent

Reviewed-by: dholmes, shade, stefank, kvn
---
 doc/hotspot-style.html | 38 ++++++++++++++++++++------------------
 doc/hotspot-style.md   | 36 +++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 7e7f4de3629..d4c06fbd6bd 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -32,11 +32,12 @@ <h1 class="title">HotSpot Coding Style</h1>
 <ul>
 <li><a href="#introduction" id="toc-introduction">Introduction</a>
 <ul>
+<li><a href="#changing-this-document"
+id="toc-changing-this-document">Changing this Document</a></li>
 <li><a href="#why-care-about-style" id="toc-why-care-about-style">Why
 Care About Style?</a></li>
-<li><a href="#counterexamples-and-updates"
-id="toc-counterexamples-and-updates">Counterexamples and
-Updates</a></li>
+<li><a href="#counterexamples"
+id="toc-counterexamples">Counterexamples</a></li>
 </ul></li>
 <li><a href="#structure-and-formatting"
 id="toc-structure-and-formatting">Structure and Formatting</a>
@@ -99,6 +100,21 @@ <h2 id="introduction">Introduction</h2>
 existing HotSpot code, making it easier to read and maintain. Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.</p>
+<h3 id="changing-this-document">Changing this Document</h3>
+<p>Proposed changes should be discussed on the <a
+href="/service/mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
+list. Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.</p>
+<p>Substantive changes are approved by <a
+href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
+of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
+Members. The Group Lead determines whether consensus has been
+reached.</p>
+<p>Editorial changes (changes that only affect the description of
+HotSpot style, not its substance) do not require the full consensus
+gathering process. The normal HotSpot pull request process may be used
+for editorial changes, with the additional requirement that the
+requisite reviewers are also HotSpot Group Members.</p>
 <h3 id="why-care-about-style">Why Care About Style?</h3>
 <p>Some programmers seem to have lexers and even C preprocessors
 installed directly behind their eyeballs. The rest of us require code
@@ -124,7 +140,7 @@ <h3 id="why-care-about-style">Why Care About Style?</h3>
 reformatting the whole thing. Also consider separating changes that make
 extensive stylistic updates from those which make functional
 changes.</p>
-<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
+<h3 id="counterexamples">Counterexamples</h3>
 <p>Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
 not sufficient justification for new code to follow the counterexample
@@ -137,20 +153,6 @@ <h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
 of course, is "When in Rome do as the Romans". Sometimes in the suburbs
 of Rome the rules are a little different; these differences can be
 pointed out here.</p>
-<p>Proposed changes should be discussed on the <a
-href="/service/mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
-list. Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.</p>
-<p>Substantive changes are approved by <a
-href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
-of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
-Members. The Group Lead determines whether consensus has been
-reached.</p>
-<p>Editorial changes (changes that only affect the description of
-HotSpot style, not its substance) do not require the full consensus
-gathering process. The normal HotSpot pull request process may be used
-for editorial changes, with the additional requirement that the
-requisite reviewers are also HotSpot Group Members.</p>
 <h2 id="structure-and-formatting">Structure and Formatting</h2>
 <h3 id="factoring-and-class-design">Factoring and Class Design</h3>
 <ul>
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 0a135b2074c..f4348bea51d 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -8,6 +8,24 @@ HotSpot code, making it easier to read and maintain.  Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.
 
+### Changing this Document
+
+Proposed changes should be discussed on the
+[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
+list.  Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.
+
+Substantive changes are approved by
+[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
+the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
+The Group Lead determines whether consensus has been reached.
+
+Editorial changes (changes that only affect the description of HotSpot
+style, not its substance) do not require the full consensus gathering
+process.  The normal HotSpot pull request process may be used for
+editorial changes, with the additional requirement that the requisite
+reviewers are also HotSpot Group Members.
+
 ### Why Care About Style?
 
 Some programmers seem to have lexers and even C preprocessors
@@ -38,7 +56,7 @@ reformatting the whole thing.  Also consider separating changes that
 make extensive stylistic updates from those which make functional
 changes.
 
-### Counterexamples and Updates
+### Counterexamples
 
 Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
@@ -54,22 +72,6 @@ rule, of course, is "When in Rome do as the Romans". Sometimes in the
 suburbs of Rome the rules are a little different; these differences
 can be pointed out here.
 
-Proposed changes should be discussed on the
-[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
-list.  Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.
-
-Substantive changes are approved by
-[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
-the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
-The Group Lead determines whether consensus has been reached.
-
-Editorial changes (changes that only affect the description of HotSpot
-style, not its substance) do not require the full consensus gathering
-process.  The normal HotSpot pull request process may be used for
-editorial changes, with the additional requirement that the requisite
-reviewers are also HotSpot Group Members.
-
 ## Structure and Formatting
 
 ### Factoring and Class Design

From 530d14a16e6b428ca9a21e8e373ee9c32e673c3e Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 14 May 2025 00:51:49 +0000
Subject: [PATCH 446/901] 8356686: doc/building.html is not up to date after
 JDK-8301971

Reviewed-by: jwaters, shade, erikj
---
 doc/building.html | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index fde6cde4c32..da8465bc532 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -282,6 +282,11 @@ <h3 id="special-considerations">Special Considerations</h3>
 having slow disk access will significantly increase build times. If you
 need to use a network share for the source code, see below for
 suggestions on how to keep the build artifacts on a local disk.</p></li>
+<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
+typically means that the <code>C.UTF-8</code> or
+<code>en_US.UTF-8</code> locale needs to be available. For Windows
+users, please see the section on <a href="#locale-requirements">Locale
+Requirements</a> below.</p></li>
 <li><p>On Windows, extra care must be taken to have a smooth building
 experience:</p>
 <ul>
@@ -305,14 +310,6 @@ <h3 id="special-considerations">Special Considerations</h3>
 <li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
 file permissions and attributes between Windows and Cygwin are
 consistent. It is recommended that you follow this procedure:</p>
-<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
-typically means that the <code>C.UTF-8</code> or
-<code>en_US.UTF-8</code> locale needs to be available. For Windows
-users, please see the section on <a href="#locale-requirements">Locale
-Requirements</a> below.</p></li>
-<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
-must be taken to make sure the environment is consistent. It is
-recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin

From 2c4e8d211a030c85488e656a9a851d10dd0f9c11 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 14 May 2025 01:53:19 +0000
Subject: [PATCH 447/901] 8347712: IllegalStateException on multithreaded
 ZipFile access with non-UTF8 charset 8355975: ZipFile uses incorrect Charset
 if another instance for the same ZIP file was constructed with a different
 Charset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eirik Bjørsnøs <eirbjo@openjdk.org>
Reviewed-by: eirbjo, lancea, redestad, alanb
---
 .../share/classes/java/util/zip/ZipCoder.java |  14 +-
 .../share/classes/java/util/zip/ZipFile.java  | 147 +++++++++++-------
 .../util/zip/ZipFile/ZipFileCharsetTest.java  | 125 +++++++++++++++
 .../zip/ZipFile/ZipFileSharedSourceTest.java  | 137 ++++++++++++++++
 4 files changed, 366 insertions(+), 57 deletions(-)
 create mode 100644 test/jdk/java/util/zip/ZipFile/ZipFileCharsetTest.java
 create mode 100644 test/jdk/java/util/zip/ZipFile/ZipFileSharedSourceTest.java

diff --git a/src/java.base/share/classes/java/util/zip/ZipCoder.java b/src/java.base/share/classes/java/util/zip/ZipCoder.java
index 8d4a05389ee..2702b90f4f6 100644
--- a/src/java.base/share/classes/java/util/zip/ZipCoder.java
+++ b/src/java.base/share/classes/java/util/zip/ZipCoder.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
@@ -38,7 +38,10 @@
 import sun.nio.cs.UTF_8;
 
 /**
- * Utility class for ZIP file entry name and comment decoding and encoding
+ * Utility class for ZIP file entry name and comment decoding and encoding.
+ * <p>
+ * The {@code ZipCoder} for UTF-8 charset is thread safe, {@code ZipCoder}
+ * for other charsets require external synchronization.
  */
 class ZipCoder {
 
@@ -174,6 +177,13 @@ protected CharsetDecoder decoder() {
         return dec;
     }
 
+    /**
+     * {@return the {@link Charset} used by this {@code ZipCoder}}
+     */
+    final Charset charset() {
+        return this.cs;
+    }
+
     private CharsetEncoder encoder() {
         if (enc == null) {
             enc = cs.newEncoder()
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index f736a092099..b7d6f1ff714 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.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
@@ -82,6 +82,8 @@ public class ZipFile implements ZipConstants, Closeable {
 
     private final String filePath;     // ZIP file path
     private final String fileName;     // name of the file
+    // Used when decoding entry names and comments
+    private final ZipCoder zipCoder;
     private volatile boolean closeRequested;
 
     // The "resource" used by this ZIP file that needs to be
@@ -198,7 +200,8 @@ public ZipFile(File file, int mode, Charset charset) throws IOException
         this.fileName = file.getName();
         long t0 = System.nanoTime();
 
-        this.res = new CleanableResource(this, ZipCoder.get(charset), file, mode);
+        this.zipCoder = ZipCoder.get(charset);
+        this.res = new CleanableResource(this, zipCoder, file, mode);
 
         PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
         PerfCounter.getZipFileCount().increment();
@@ -265,7 +268,7 @@ public String getComment() {
             // If there is a problem decoding the byte array which represents
             // the ZIP file comment, return null;
             try {
-                return res.zsrc.zc.toString(res.zsrc.comment);
+                return zipCoder.toString(res.zsrc.comment);
             } catch (IllegalArgumentException iae) {
                 return null;
             }
@@ -288,7 +291,7 @@ public ZipEntry getEntry(String name) {
             // Look up the name and CEN header position of the entry.
             // The resolved name may include a trailing slash.
             // See Source::getEntryPos for details.
-            EntryPos pos = res.zsrc.getEntryPos(name, true);
+            EntryPos pos = res.zsrc.getEntryPos(name, true, zipCoder);
             if (pos != null) {
                 entry = getZipEntry(pos.name, pos.pos);
             }
@@ -328,7 +331,7 @@ public InputStream getInputStream(ZipEntry entry) throws IOException {
             if (Objects.equals(lastEntryName, entry.name)) {
                 pos = lastEntryPos;
             } else {
-                EntryPos entryPos = zsrc.getEntryPos(entry.name, false);
+                EntryPos entryPos = zsrc.getEntryPos(entry.name, false, zipCoder);
                 if (entryPos != null) {
                     pos = entryPos.pos;
                 } else {
@@ -363,6 +366,35 @@ public InputStream getInputStream(ZipEntry entry) throws IOException {
         }
     }
 
+    /**
+     * Determines and returns a {@link ZipCoder} to use for decoding
+     * name and comment fields of the ZIP entry identified by the {@code pos}
+     * in the ZIP file's {@code cen}.
+     * <p>
+     * A ZIP entry's name and comment fields may be encoded using UTF-8, in
+     * which case this method returns a UTF-8 capable {@code ZipCoder}. If the
+     * entry doesn't require UTF-8, then this method returns the {@code fallback}
+     * {@code ZipCoder}.
+     *
+     * @param cen the CEN
+     * @param pos the ZIP entry's position in CEN
+     * @param fallback the fallback ZipCoder to return if the entry doesn't require UTF-8
+     */
+    private static ZipCoder zipCoderFor(final byte[] cen, final int pos, final ZipCoder fallback) {
+        if (fallback.isUTF8()) {
+            // the fallback ZipCoder is capable of handling UTF-8,
+            // so no need to parse the entry flags to determine if
+            // the entry has UTF-8 flag.
+            return fallback;
+        }
+        if ((CENFLG(cen, pos) & USE_UTF8) != 0) {
+            // entry requires a UTF-8 ZipCoder
+            return ZipCoder.UTF8;
+        }
+        // entry doesn't require a UTF-8 ZipCoder
+        return fallback;
+    }
+
     private static class InflaterCleanupAction implements Runnable {
         private final Inflater inf;
         private final CleanableResource res;
@@ -561,7 +593,7 @@ public Stream<? extends ZipEntry> stream() {
     private String getEntryName(int pos) {
         byte[] cen = res.zsrc.cen;
         int nlen = CENNAM(cen, pos);
-        ZipCoder zc = res.zsrc.zipCoderForPos(pos);
+        ZipCoder zc = zipCoderFor(cen, pos, zipCoder);
         return zc.toString(cen, pos + CENHDR, nlen);
     }
 
@@ -632,7 +664,7 @@ private ZipEntry getZipEntry(String name, int pos) {
         }
         if (clen != 0) {
             int start = pos + CENHDR + nlen + elen;
-            ZipCoder zc = res.zsrc.zipCoderForPos(pos);
+            ZipCoder zc = zipCoderFor(cen, pos, zipCoder);
             e.comment = zc.toString(cen, start, clen);
         }
         lastEntryName = e.name;
@@ -664,11 +696,12 @@ private static class CleanableResource implements Runnable {
 
         Source zsrc;
 
-        CleanableResource(ZipFile zf, ZipCoder zc, File file, int mode) throws IOException {
+        CleanableResource(ZipFile zf, ZipCoder zipCoder, File file, int mode) throws IOException {
+            assert zipCoder != null : "null ZipCoder";
             this.cleanable = CleanerFactory.cleaner().register(zf, this);
             this.istreams = Collections.newSetFromMap(new WeakHashMap<>());
             this.inflaterCache = new ArrayDeque<>();
-            this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0, zc);
+            this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0, zipCoder);
         }
 
         void clean() {
@@ -1109,6 +1142,7 @@ public void setExternalFileAttributes(ZipEntry ze, int externalFileAttributes) {
     // Represents the resolved name and position of a CEN record
     static record EntryPos(String name, int pos) {}
 
+    // Implementation note: This class is thread safe.
     private static class Source {
         // While this is only used from ZipFile, defining it there would cause
         // a bootstrap cycle that would leave this initialized as null
@@ -1121,7 +1155,6 @@ private static class Source {
         private static final int MAX_CEN_SIZE = ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
 
         private final Key key;               // the key in files
-        private final @Stable ZipCoder zc;   // ZIP coder used to decode/encode
 
         private int refs = 1;
 
@@ -1157,8 +1190,9 @@ private static class Source {
         private int[] entries;                  // array of hashed cen entry
 
         // Checks the entry at offset pos in the CEN, calculates the Entry values as per above,
-        // then returns the length of the entry name.
-        private int checkAndAddEntry(int pos, int index)
+        // then returns the length of the entry name. Uses the given zipCoder for processing the
+        // entry name and the entry comment (if any).
+        private int checkAndAddEntry(final int pos, final int index, final ZipCoder zipCoder)
             throws ZipException
         {
             byte[] cen = this.cen;
@@ -1196,21 +1230,20 @@ private int checkAndAddEntry(int pos, int index)
             }
 
             try {
-                ZipCoder zcp = zipCoderForPos(pos);
-                int hash = zcp.checkedHash(cen, entryPos, nlen);
+                int hash = zipCoder.checkedHash(cen, entryPos, nlen);
                 int hsh = (hash & 0x7fffffff) % tablelen;
                 int next = table[hsh];
                 table[hsh] = index;
                 // Record the CEN offset and the name hash in our hash cell.
-                entries[index++] = hash;
-                entries[index++] = next;
-                entries[index  ] = pos;
+                entries[index] = hash;
+                entries[index + 1] = next;
+                entries[index + 2] = pos;
                 // Validate comment if it exists.
                 // If the bytes representing the comment cannot be converted to
                 // a String via zcp.toString, an Exception will be thrown
                 if (clen > 0) {
                     int start = entryPos + nlen + elen;
-                    zcp.toString(cen, start, clen);
+                    zipCoder.toString(cen, start, clen);
                 }
             } catch (Exception e) {
                 zerror("invalid CEN header (bad entry name or comment)");
@@ -1389,34 +1422,47 @@ private static boolean isZip64ExtBlockSizeValid(int blockSize, long csize,
         private int tablelen;                // number of hash heads
 
         /**
-         * A class representing a key to a ZIP file. A key is based
-         * on the file key if available, or the path value if the
-         * file key is not available. The key is also based on the
-         * file's last modified time to allow for cases where a ZIP
-         * file is re-opened after it has been modified.
+         * A class representing a key to the Source of a ZipFile.
+         * The Key is composed of:
+         * - The BasicFileAttributes.fileKey() if available, or the Path of the ZIP file
+         * if the fileKey() is not available.
+         * - The ZIP file's last modified time (to allow for cases
+         * where a ZIP file is re-opened after it has been modified).
+         * - The Charset that was provided when constructing the ZipFile instance.
+         * The unique combination of these components identifies a Source of a ZipFile.
          */
         private static class Key {
-            final BasicFileAttributes attrs;
-            File file;
-            final boolean utf8;
-
-            public Key(File file, BasicFileAttributes attrs, ZipCoder zc) {
+            private final BasicFileAttributes attrs;
+            private final File file;
+            // the Charset that was provided when constructing the ZipFile instance
+            private final Charset charset;
+
+            /**
+             * Constructs a {@code Key} to a {@code Source} of a {@code ZipFile}
+             *
+             * @param file    the ZIP file
+             * @param attrs   the attributes of the ZIP file
+             * @param charset the Charset that was provided when constructing the ZipFile instance
+             */
+            public Key(File file, BasicFileAttributes attrs, Charset charset) {
                 this.attrs = attrs;
                 this.file = file;
-                this.utf8 = zc.isUTF8();
+                this.charset = charset;
             }
 
+            @Override
             public int hashCode() {
-                long t = utf8 ? 0 : Long.MAX_VALUE;
+                long t = charset.hashCode();
                 t += attrs.lastModifiedTime().toMillis();
                 Object fk = attrs.fileKey();
                 return Long.hashCode(t) +
                         (fk != null ? fk.hashCode() : file.hashCode());
             }
 
+            @Override
             public boolean equals(Object obj) {
                 if (obj instanceof Key key) {
-                    if (key.utf8 != utf8) {
+                    if (!charset.equals(key.charset)) {
                         return false;
                     }
                     if (!attrs.lastModifiedTime().equals(key.attrs.lastModifiedTime())) {
@@ -1440,12 +1486,12 @@ public boolean equals(Object obj) {
         private static final java.nio.file.FileSystem builtInFS =
                 DefaultFileSystemProvider.theFileSystem();
 
-        static Source get(File file, boolean toDelete, ZipCoder zc) throws IOException {
+        static Source get(File file, boolean toDelete, ZipCoder zipCoder) throws IOException {
             final Key key;
             try {
                 key = new Key(file,
                         Files.readAttributes(builtInFS.getPath(file.getPath()),
-                                BasicFileAttributes.class), zc);
+                                BasicFileAttributes.class), zipCoder.charset());
             } catch (InvalidPathException ipe) {
                 throw new IOException(ipe);
             }
@@ -1457,7 +1503,7 @@ static Source get(File file, boolean toDelete, ZipCoder zc) throws IOException {
                     return src;
                 }
             }
-            src = new Source(key, toDelete, zc);
+            src = new Source(key, toDelete, zipCoder);
 
             synchronized (files) {
                 Source prev = files.putIfAbsent(key, src);
@@ -1479,8 +1525,7 @@ static void release(Source src) throws IOException {
             }
         }
 
-        private Source(Key key, boolean toDelete, ZipCoder zc) throws IOException {
-            this.zc = zc;
+        private Source(Key key, boolean toDelete, ZipCoder zipCoder) throws IOException {
             this.key = key;
             if (toDelete) {
                 if (OperatingSystem.isWindows()) {
@@ -1494,7 +1539,7 @@ private Source(Key key, boolean toDelete, ZipCoder zc) throws IOException {
                 this.zfile = new RandomAccessFile(key.file, "r");
             }
             try {
-                initCEN(-1);
+                initCEN(-1, zipCoder);
                 byte[] buf = new byte[4];
                 readFullyAt(buf, 0, 4, 0);
                 this.startsWithLoc = (LOCSIG(buf) == LOCSIG);
@@ -1649,7 +1694,7 @@ private End findEND() throws IOException {
         }
 
         // Reads ZIP file central directory.
-        private void initCEN(int knownTotal) throws IOException {
+        private void initCEN(final int knownTotal, final ZipCoder zipCoder) throws IOException {
             // Prefer locals for better performance during startup
             byte[] cen;
             if (knownTotal == -1) {
@@ -1711,13 +1756,15 @@ private void initCEN(int knownTotal) throws IOException {
                     // This will only happen if the ZIP file has an incorrect
                     // ENDTOT field, which usually means it contains more than
                     // 65535 entries.
-                    initCEN(countCENHeaders(cen));
+                    initCEN(countCENHeaders(cen), zipCoder);
                     return;
                 }
 
                 int entryPos = pos + CENHDR;
+                // the ZipCoder for any non-UTF8 entries
+                final ZipCoder entryZipCoder = zipCoderFor(cen, pos, zipCoder);
                 // Checks the entry and adds values to entries[idx ... idx+2]
-                int nlen = checkAndAddEntry(pos, idx);
+                int nlen = checkAndAddEntry(pos, idx, entryZipCoder);
                 idx += 3;
 
                 // Adds name to metanames.
@@ -1741,7 +1788,7 @@ private void initCEN(int knownTotal) throws IOException {
                             try {
                                 // Compute hash code of name from "META-INF/versions/{version)/{name}
                                 int prefixLen = META_INF_VERSIONS_LEN + DecimalDigits.stringSize(version);
-                                int hashCode = zipCoderForPos(pos).checkedHash(cen,
+                                int hashCode = entryZipCoder.checkedHash(cen,
                                         entryPos + prefixLen,
                                         nlen - prefixLen);
                                 // Register version for this hash code
@@ -1786,9 +1833,10 @@ private static void zerror(String msg) throws ZipException {
 
         /*
          * Returns the resolved name and position of the ZIP cen entry corresponding
-         *  to the specified entry name, or {@code null} if not found.
+         * to the specified entry name, or {@code null} if not found.
          */
-        private EntryPos getEntryPos(String name, boolean addSlash) {
+        private EntryPos getEntryPos(final String name, final boolean addSlash,
+                                     final ZipCoder zipCoder) {
             if (total == 0) {
                 return null;
             }
@@ -1807,8 +1855,7 @@ private EntryPos getEntryPos(String name, boolean addSlash) {
                     int noff = pos + CENHDR;
                     int nlen = CENNAM(cen, pos);
 
-                    ZipCoder zc = zipCoderForPos(pos);
-
+                    final ZipCoder zc = zipCoderFor(cen, pos, zipCoder);
                     // Compare the lookup name with the name encoded in the CEN
                     switch (zc.compare(name, cen, noff, nlen, addSlash)) {
                         case ZipCoder.EXACT_MATCH:
@@ -1834,16 +1881,6 @@ private EntryPos getEntryPos(String name, boolean addSlash) {
             return null;
         }
 
-        private ZipCoder zipCoderForPos(int pos) {
-            if (zc.isUTF8()) {
-                return zc;
-            }
-            if ((CENFLG(cen, pos) & USE_UTF8) != 0) {
-                return ZipCoder.UTF8;
-            }
-            return zc;
-        }
-
         /**
          * Returns true if the bytes represent a non-directory name
          * beginning with "META-INF/", disregarding ASCII case.
diff --git a/test/jdk/java/util/zip/ZipFile/ZipFileCharsetTest.java b/test/jdk/java/util/zip/ZipFile/ZipFileCharsetTest.java
new file mode 100644
index 00000000000..e97088247f4
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/ZipFileCharsetTest.java
@@ -0,0 +1,125 @@
+/*
+ * 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.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import org.junit.jupiter.api.Test;
+import static java.nio.charset.StandardCharsets.ISO_8859_1;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+/*
+ * @test
+ * @bug 8355975
+ * @summary verify that the internal ZIP structure caching in java.util.zip.ZipFile
+ *          uses the correct Charset when parsing the ZIP structure of a ZIP file
+ * @run junit ZipFileCharsetTest
+ */
+public class ZipFileCharsetTest {
+
+    private static final String ISO_8859_15_NAME = "ISO-8859-15";
+
+    /**
+     * The internal implementation of java.util.zip.ZipFile maintains a cache
+     * of the ZIP structure of each ZIP file that's currently open. This cache
+     * helps prevent repeat parsing of the ZIP structure of the same underlying
+     * ZIP file, every time a ZipFile instance is created for the same ZIP file.
+     * The cache uses an internal key to map a ZIP file to the corresponding
+     * ZIP structure that's cached.
+     * A ZipFile can be constructed by passing a Charset which will be used to
+     * decode the entry names (and comment) in a ZIP file.
+     * The test verifies that when multiple ZipFile instances are
+     * constructed using different Charsets but the same underlying ZIP file,
+     * then the internal caching implementation of ZipFile doesn't end up using
+     * a wrong Charset for parsing the ZIP structure of the ZIP file.
+     */
+    @Test
+    void testCachedZipFileSource() throws Exception {
+        // ISO-8859-15 is not a standard charset in Java. We skip this test
+        // when it is unavailable
+        assumeTrue(Charset.availableCharsets().containsKey(ISO_8859_15_NAME),
+                "skipping test since " + ISO_8859_15_NAME + " charset isn't available");
+
+        // We choose the byte 0xA4 for entry name in the ZIP file.
+        // 0xA4 is "Euro sign" in ISO-8859-15 charset and
+        // "Currency sign (generic)" in ISO-8859-1 charset.
+        final byte[] entryNameBytes = new byte[]{(byte) 0xA4}; // intentional cast
+        final Charset euroSignCharset = Charset.forName(ISO_8859_15_NAME);
+        final Charset currencySignCharset = ISO_8859_1;
+
+        final String euroSign = new String(entryNameBytes, euroSignCharset);
+        final String currencySign = new String(entryNameBytes, currencySignCharset);
+
+        // create a ZIP file whose entry name is encoded using ISO-8859-15 charset
+        final Path zip = createZIP("euro", euroSignCharset, entryNameBytes);
+
+        // Construct a ZipFile instance using the (incorrect) charset ISO-8859-1.
+        // While that ZipFile instance is still open (and the ZIP file structure
+        // still cached), construct another instance for the same ZIP file, using
+        // the (correct) charset ISO-8859-15.
+        try (ZipFile incorrect = new ZipFile(zip.toFile(), currencySignCharset);
+             ZipFile correct = new ZipFile(zip.toFile(), euroSignCharset)) {
+
+            // correct encoding should resolve the entry name to euro sign
+            // and the entry should be thus be located
+            assertNotNull(correct.getEntry(euroSign), "euro sign entry missing in " + correct);
+            // correct encoding should not be able to find an entry name
+            // with the currency sign
+            assertNull(correct.getEntry(currencySign), "currency sign entry unexpectedly found in "
+                    + correct);
+
+            // incorrect encoding should resolve the entry name to currency sign
+            // and the entry should be thus be located by the currency sign name
+            assertNotNull(incorrect.getEntry(currencySign), "currency sign entry missing in "
+                    + incorrect);
+            // incorrect encoding should not be able to find an entry name
+            // with the euro sign
+            assertNull(incorrect.getEntry(euroSign), "euro sign entry unexpectedly found in "
+                    + incorrect);
+        }
+    }
+
+    /**
+     * Creates and return ZIP file whose entry names are encoded using the given {@code charset}
+     */
+    private static Path createZIP(final String fileNamePrefix, final Charset charset,
+                                  final byte[] entryNameBytes) throws IOException {
+        final Path zip = Files.createTempFile(Path.of("."), fileNamePrefix, ".zip");
+        // create a ZIP file whose entry name(s) use the given charset
+        try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(zip), charset)) {
+            zos.putNextEntry(new ZipEntry(new String(entryNameBytes, charset)));
+            final byte[] entryContent = "doesnotmatter".getBytes(US_ASCII);
+            zos.write(entryContent);
+            zos.closeEntry();
+        }
+        return zip;
+    }
+}
diff --git a/test/jdk/java/util/zip/ZipFile/ZipFileSharedSourceTest.java b/test/jdk/java/util/zip/ZipFile/ZipFileSharedSourceTest.java
new file mode 100644
index 00000000000..d4d057ede7b
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/ZipFileSharedSourceTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.OutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
+/*
+ * @test
+ * @bug 8347712
+ * @summary verify that different instances of java.util.zip.ZipFile do not share
+ *          the same instance of (non-thread-safe) java.nio.charset.CharsetEncoder/CharsetDecoder
+ * @run junit ZipFileSharedSourceTest
+ */
+public class ZipFileSharedSourceTest {
+
+    static Path createZipFile(final Charset charset) throws Exception {
+        final Path zipFilePath = Files.createTempFile(Path.of("."), "8347712", ".zip");
+        try (OutputStream os = Files.newOutputStream(zipFilePath);
+             ZipOutputStream zos = new ZipOutputStream(os, charset)) {
+            final int numEntries = 10240;
+            for (int i = 1; i <= numEntries; i++) {
+                final ZipEntry entry = new ZipEntry("entry-" + i);
+                zos.putNextEntry(entry);
+                zos.write("foo bar".getBytes(US_ASCII));
+                zos.closeEntry();
+            }
+        }
+        return zipFilePath;
+    }
+
+    static List<Arguments> charsets() {
+        return List.of(
+                Arguments.of(StandardCharsets.UTF_8),
+                Arguments.of(StandardCharsets.ISO_8859_1),
+                Arguments.of(US_ASCII)
+        );
+    }
+
+    /**
+     * In this test, multiple concurrent threads each create an instance of java.util.zip.ZipFile
+     * with the given {@code charset} for the same underlying ZIP file. Each of the threads
+     * then iterate over the entries of their ZipFile instance. The test verifies that such access,
+     * where each thread is accessing an independent ZipFile instance corresponding to the same
+     * underlying ZIP file, doesn't lead to unexpected failures contributed by concurrent
+     * threads.
+     */
+    @ParameterizedTest
+    @MethodSource("charsets")
+    void testMultipleZipFileInstances(final Charset charset) throws Exception {
+        final Path zipFilePath = createZipFile(charset);
+        final int numTasks = 200;
+        final CountDownLatch startLatch = new CountDownLatch(numTasks);
+        final List<Future<Void>> results = new ArrayList<>();
+        try (final ExecutorService executor =
+                     Executors.newThreadPerTaskExecutor(Thread.ofPlatform().factory())) {
+            for (int i = 0; i < numTasks; i++) {
+                final var task = new ZipEntryIteratingTask(zipFilePath, charset,
+                        startLatch);
+                results.add(executor.submit(task));
+            }
+            System.out.println(numTasks + " tasks submitted, waiting for them to complete");
+            for (final Future<Void> f : results) {
+                f.get();
+            }
+        }
+        System.out.println("All " + numTasks + " tasks completed successfully");
+    }
+
+    private static final class ZipEntryIteratingTask implements Callable<Void> {
+        private final Path file;
+        private final Charset charset;
+        private final CountDownLatch startLatch;
+
+        private ZipEntryIteratingTask(final Path file, final Charset charset,
+                                      final CountDownLatch startLatch) {
+            this.file = file;
+            this.charset = charset;
+            this.startLatch = startLatch;
+        }
+
+        @Override
+        public Void call() throws Exception {
+            // let other tasks know we are ready to run
+            this.startLatch.countDown();
+            // wait for other tasks to be ready to run
+            this.startLatch.await();
+            // create a new instance of ZipFile and iterate over the entries
+            try (final ZipFile zf = new ZipFile(this.file.toFile(), this.charset)) {
+                final var entries = zf.entries();
+                while (entries.hasMoreElements()) {
+                    final ZipEntry ze = entries.nextElement();
+                    // additionally exercise the ZipFile.getEntry() method
+                    zf.getEntry(ze.getName());
+                }
+            }
+            return null;
+        }
+    }
+}

From e07c65b892ecb02d6b52877508131de3a2067e23 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Wed, 14 May 2025 04:59:44 +0000
Subject: [PATCH 448/901] 8323545:
 java/awt/GraphicsDevice/CheckDisplayModes.java fails with "exit code: 133"

Reviewed-by: achung, serb
---
 .../awt/GraphicsDevice/CheckDisplayModes.java    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java b/test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java
index 3d909e2185e..2a5feef89fe 100644
--- a/test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java
+++ b/test/jdk/java/awt/GraphicsDevice/CheckDisplayModes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, 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
@@ -35,18 +35,30 @@ public class CheckDisplayModes {
 
     public static void main(String[] args) {
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        for (GraphicsDevice graphicDevice : ge.getScreenDevices()) {
+        GraphicsDevice[] allDevices = ge.getScreenDevices();
+
+        for (GraphicsDevice gd : allDevices) {
+            System.out.println("Available screen device: " + gd.getIDstring());
+        }
+
+        for (GraphicsDevice graphicDevice : allDevices) {
+            System.out.println("On screen device " + graphicDevice.getIDstring());
             if (!graphicDevice.isDisplayChangeSupported()) {
                 System.err.println("Display mode change is not supported on this host. Test is considered passed.");
                 continue;
             }
             DisplayMode defaultDisplayMode = graphicDevice.getDisplayMode();
+            System.out.println("Default display mode: " + defaultDisplayMode);
             checkDisplayMode(defaultDisplayMode);
             graphicDevice.setDisplayMode(defaultDisplayMode);
 
             DisplayMode[] displayModes = graphicDevice.getDisplayModes();
+            for (int i = 0; i < displayModes.length; i++) {
+                System.out.println("displayModes[" + i + "] = " + displayModes[i]);
+            }
             boolean isDefaultDisplayModeIncluded = false;
             for (DisplayMode displayMode : displayModes) {
+                System.out.println("Attempting display mode " + displayMode);
                 checkDisplayMode(displayMode);
                 graphicDevice.setDisplayMode(displayMode);
                 if (defaultDisplayMode.equals(displayMode)) {

From dd2515993bf76f424e4c56d529ae1541f55e3f8b Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 14 May 2025 06:32:54 +0000
Subject: [PATCH 449/901] 8356644: Update encoding declaration to UTF-8

Reviewed-by: prr, naoto
---
 src/demo/share/jfc/CodePointIM/README.html    |   2 +-
 .../Metalworks/resources/HelpFiles/metal.html |  12 +-
 .../resources/HelpFiles/metalworks.html       |   2 +-
 .../share/jfc/SwingSet2/resources/ant.html    | 182 ++++++++--------
 .../share/jfc/SwingSet2/resources/bug.html    | 198 +++++++++---------
 .../share/jfc/SwingSet2/resources/index.html  |  24 +--
 .../share/jfc/SwingSet2/resources/king.html   |  38 ++--
 .../jfc/SwingSet2/resources/preface.html      | 158 +++++++-------
 .../jfc/SwingSet2/resources/seaweed.html      |  82 ++++----
 .../share/jfc/SwingSet2/resources/title.html  |  20 +-
 src/hotspot/share/prims/jvmti.xml             |   4 +-
 .../java/net/doc-files/net-properties.html    |  24 +--
 .../swing/plaf/synth/doc-files/synth.dtd      |   2 +-
 .../javax/xml/transform/xmlfiles/doctest.xsl  |   3 +-
 .../xml/validation/xmlfiles/shiporder11.xml   |   4 +-
 .../xml/validation/xmlfiles/shiporder11.xsd   |   4 +-
 .../xml/validation/xmlfiles/shiporder12.xml   |   4 +-
 .../xml/validation/xmlfiles/shiporder12.xsd   |   4 +-
 .../jaxp/unittest/common/xmlfiles/XSLDTD.xsl  |   2 +-
 .../XMLStreamReaderTest/IssueTracker70.xml    |   4 +-
 .../xml/jaxp/unittest/transform/CR6401137.xsl |   2 +-
 .../IssueTracker30_occurs-error.xml           |   3 +-
 .../validation/IssueTracker30_occurs-ok.xml   |   3 +-
 .../IssueTracker30_occurs-optimize-error.xml  |   3 +-
 .../IssueTracker30_occurs-optimize-ok.xml     |   3 +-
 .../IssueTracker30_occurs-optimize.xsd        |   7 +-
 .../validation/IssueTracker30_occurs.xsd      |   7 +-
 .../validation/multi-occurs-error-max.xml     |   2 +-
 .../validation/multi-occurs-error-min-max.xml |   2 +-
 .../validation/multi-occurs-error-min.xml     |   2 +-
 .../unittest/validation/multi-occurs-ok.xml   |   2 +-
 .../multi-occurs-unbounded-error-min.xml      |   2 +-
 .../validation/multi-occurs-unbounded-ok.xml  |   2 +-
 .../validation/multi-occurs-unbounded.xsd     |   6 +-
 .../jaxp/unittest/validation/multi-occurs.xsd |   6 +-
 .../unittest/validation/occurs-error-max.xml  |   2 +-
 .../validation/occurs-error-min-max.xml       |   2 +-
 .../unittest/validation/occurs-error-min.xml  |   2 +-
 .../jaxp/unittest/validation/occurs-ok.xml    |   2 +-
 .../validation/occurs-unbounded-error-min.xml |   2 +-
 .../validation/occurs-unbounded-ok.xml        |   2 +-
 .../unittest/validation/occurs-unbounded.xsd  |   6 +-
 .../validation/occurs-wildcard-unbounded.xsd  |   6 +-
 .../unittest/validation/occurs-wildcard.xsd   |   6 +-
 .../xml/jaxp/unittest/validation/occurs.xsd   |   6 +-
 .../demos/button/resources/ButtonDemo.html    |  14 +-
 .../swingset3/demos/editorpane/book/ant.html  | 182 ++++++++--------
 .../swingset3/demos/editorpane/book/bug.html  | 198 +++++++++---------
 .../demos/editorpane/book/index.html          |  24 +--
 .../swingset3/demos/editorpane/book/king.html |  38 ++--
 .../demos/editorpane/book/preface.html        | 158 +++++++-------
 .../demos/editorpane/book/seaweed.html        |  82 ++++----
 .../demos/editorpane/book/title.html          |  20 +-
 53 files changed, 785 insertions(+), 792 deletions(-)

diff --git a/src/demo/share/jfc/CodePointIM/README.html b/src/demo/share/jfc/CodePointIM/README.html
index 4860e0f89c2..5d2173e9fdf 100644
--- a/src/demo/share/jfc/CodePointIM/README.html
+++ b/src/demo/share/jfc/CodePointIM/README.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>README - CodePointIM</title>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 <h1>Code Point Input Method</h1>
diff --git a/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html
index 6a42b1539ef..1347dda3fe2 100644
--- a/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html
+++ b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
   <META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
   <TITLE>Java L&amp;F</TITLE>
 </HEAD>
@@ -39,7 +39,7 @@ <H1>
 <P>The theme mechanism is designed to allow developers to create
 their own themes. For an example of this, see the themes
 which are included with Metalworks. Note, like all of the L&amp;F packages,
-the metal package is not yet frozen and the theme mechanism may change as 
+the metal package is not yet frozen and the theme mechanism may change as
 we get developer feedback on how to improve it.</P>
 
 <H1>
@@ -53,7 +53,7 @@ <H1>
 
 <PRE>
 JSlider slider = new JSlider();<BR>
-slider.putClientProperty("JSlider.isFilled", 
+slider.putClientProperty("JSlider.isFilled",
                          Boolean.TRUE);<BR> <BR>
 </PRE>
 
@@ -64,7 +64,7 @@ <H1>
 
 <H1>
 ToolBars</H1>
-<P>Many popular applications support "roll-over" effects on buttons in toolbars. 
+<P>Many popular applications support "roll-over" effects on buttons in toolbars.
 The Java L&amp;F provides an easy way to do this. Here is a code snippit:</P>
 
 <PRE>
@@ -72,7 +72,7 @@ <H1>
 
 // add your buttons here<BR>
 
-toolbar.putClientProperty("JToolBar.isRollover", 
+toolbar.putClientProperty("JToolBar.isRollover",
                           Boolean.TRUE);<BR>
 </PRE>
 
@@ -98,7 +98,7 @@ <H1>
 // This will provide lines separating root notes
 // it is the default setting
 myTree.putClientProperty("JTree.lineStyle",
-                         "Horizontal"); 
+                         "Horizontal");
 </PRE>
 
 <P><A HREF="toc.html"><IMG alt="Back"  SRC="back.gif" BORDER=0 HEIGHT=22 WIDTH=42 ALIGN=BOTTOM>Back</A>
diff --git a/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html
index df9a440b273..f8b9d0cc6e3 100644
--- a/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html
+++ b/src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html
@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
    <META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
    <TITLE>Metalworks</TITLE>
 </HEAD>
diff --git a/src/demo/share/jfc/SwingSet2/resources/ant.html b/src/demo/share/jfc/SwingSet2/resources/ant.html
index eb9619b6825..346678d2de4 100644
--- a/src/demo/share/jfc/SwingSet2/resources/ant.html
+++ b/src/demo/share/jfc/SwingSet2/resources/ant.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,106 +10,106 @@ <h1 align="center"><br>
 </h1>
 <p align="center"><img src="http://github.com/images/Octavo/ant.jpg" width="481" height="325"></p>
 <p align="center">&nbsp;</p>
-<blockquote> 
+<blockquote>
   <blockquote>
-   <p><font size="4">This was a creature, more troublesom to be drawn, then any 
-      of the rest, for I could not, for a good while, think of a way to make it 
+   <p><font size="4">This was a creature, more troublesom to be drawn, then any
+      of the rest, for I could not, for a good while, think of a way to make it
       suffer its body to ly quiet in a natural posture; but whil'st it was alive,
-      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body, 
-      that I could not any wayes get a good view of it; and if I killed it, its 
-      body was so little, that I did often spoile the shape of it, before I could 
-      throughly view it: for this is the nature of these minute Bodies, that as 
-      soon, almost, as ever their life is destroy'd, their parts immediately shrivel, 
-      and lose their beauty; and so is it also with small Plants, as I instanced 
+      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body,
+      that I could not any wayes get a good view of it; and if I killed it, its
+      body was so little, that I did often spoile the shape of it, before I could
+      throughly view it: for this is the nature of these minute Bodies, that as
+      soon, almost, as ever their life is destroy'd, their parts immediately shrivel,
+      and lose their beauty; and so is it also with small Plants, as I instanced
       before, in the description of Moss. </font></p>
-    <p><font size="4">And thence also is the reason of the variations in the beards 
-      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding 
-      small, those small variations which are made in the surfaces of all bodies, 
-      almost upon every change of Air, especially if the body be porous, do here 
-      become sensible, where the whole body is so small, that it is almost nothing 
-      but surface; for as in vegetable substances, I see no great reason to think, 
-      that the moisture of the Aire (that, sticking to a wreath'd beard, does make 
-      it untwist) should evaporate, or exhale away, any faster then the moisture 
-      of other bodies, but rather that the avolation from, or access of moisture 
-      to, the surfaces of bodies being much the same, those bodies become most 
-      sensible of it, which have the least proportion of body to their surface. 
+    <p><font size="4">And thence also is the reason of the variations in the beards
+      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding
+      small, those small variations which are made in the surfaces of all bodies,
+      almost upon every change of Air, especially if the body be porous, do here
+      become sensible, where the whole body is so small, that it is almost nothing
+      but surface; for as in vegetable substances, I see no great reason to think,
+      that the moisture of the Aire (that, sticking to a wreath'd beard, does make
+      it untwist) should evaporate, or exhale away, any faster then the moisture
+      of other bodies, but rather that the avolation from, or access of moisture
+      to, the surfaces of bodies being much the same, those bodies become most
+      sensible of it, which have the least proportion of body to their surface.
       </font></p>
-    <p><font size="4">So is it also with Animal substances; the dead body of an 
-      Ant, or such little creature, does almost instantly shrivel and dry, and 
-      your object shall be quite another thing, before you can half delineate 
-      it, which proceeds not from the extraordinary exhalation, but from the small 
-      proportion of body and juices, to the usual drying of bodies in the Air, 
+    <p><font size="4">So is it also with Animal substances; the dead body of an
+      Ant, or such little creature, does almost instantly shrivel and dry, and
+      your object shall be quite another thing, before you can half delineate
+      it, which proceeds not from the extraordinary exhalation, but from the small
+      proportion of body and juices, to the usual drying of bodies in the Air,
       especially if warm. </font></p>
-    <p><font size="4">For which inconvenience, where I could not otherwise remove 
-      it, I thought of this expedient. I took the creature, I had design'd to delineate, 
-      and put it into a drop of very well rectified spirit of Wine, this I found 
-      would presently dispatch, as it were, the Animal, and being taken out of 
-      it, and lay'd on a paper,the spirit of Wine would immediately fly away, 
-      and leave the Animal dry, in its natural posture, or at least, in a constitution, 
-      that it might easily with a pin be plac'd, in what posture you desired to 
-      draw it, and the limbs would so remain, without either moving, or shriveling. 
+    <p><font size="4">For which inconvenience, where I could not otherwise remove
+      it, I thought of this expedient. I took the creature, I had design'd to delineate,
+      and put it into a drop of very well rectified spirit of Wine, this I found
+      would presently dispatch, as it were, the Animal, and being taken out of
+      it, and lay'd on a paper,the spirit of Wine would immediately fly away,
+      and leave the Animal dry, in its natural posture, or at least, in a constitution,
+      that it might easily with a pin be plac'd, in what posture you desired to
+      draw it, and the limbs would so remain, without either moving, or shriveling.
       </font></p>
-    <p><font size="4">And thus I dealt with this Ant, which I have here delineated, 
-      which was one of many, of a very large kind, that inhabited under the Roots 
-      of a Tree, from whence they would sally out in great parties, and make most 
-      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back 
+    <p><font size="4">And thus I dealt with this Ant, which I have here delineated,
+      which was one of many, of a very large kind, that inhabited under the Roots
+      of a Tree, from whence they would sally out in great parties, and make most
+      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back
       again very expertly, by the same wayes and paths they went. </font></p>
-    <p><font size="4">It was more then half the bigness of an Earwig, of a dark 
-      brown, or reddish colour, with long legs, on the hinder of which it would 
-      stand up, and raise its head as high as it could above the ground, that it 
-      might stare the further about it, just after the same manner as I have also 
-      observ'd a hunting Spider to do: and putting my finger towards them, they 
-      have at first all run towards it, till almost at it; and then they would stand 
-      round about it, at a certain distance, and smell, as it were, and consider 
-      whether they should any of them venture any further, till one more bold then 
-      the rest venturing to climb it, all the rest, if I would have suffered them, 
-      would have immediately followed : much such other seemingly rational actions 
-      I have observ'd in this little Vermine with much pleasure, which would be 
-      too long to be here related; those that desire more of them may satisfie 
+    <p><font size="4">It was more then half the bigness of an Earwig, of a dark
+      brown, or reddish colour, with long legs, on the hinder of which it would
+      stand up, and raise its head as high as it could above the ground, that it
+      might stare the further about it, just after the same manner as I have also
+      observ'd a hunting Spider to do: and putting my finger towards them, they
+      have at first all run towards it, till almost at it; and then they would stand
+      round about it, at a certain distance, and smell, as it were, and consider
+      whether they should any of them venture any further, till one more bold then
+      the rest venturing to climb it, all the rest, if I would have suffered them,
+      would have immediately followed : much such other seemingly rational actions
+      I have observ'd in this little Vermine with much pleasure, which would be
+      too long to be here related; those that desire more of them may satisfie
       their curiosity in Ligons History of the Barbadoes. </font></p>
-    <p><font size="4">Having insnar'd several of these into a small Box, I made 
-      choice of the tallest grown among them, and separating it from the rest, 
-      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd 
-      him down dead drunk, so that he became moveless, though at first putting 
-      in he struggled for a pretty while very much, till at last, certain bubbles 
-      issuing out of his mouth, it ceased to move; this (because I had before found 
-      them quickly to recover again, if they were taken out presently) I suffered 
-      to lye above an hour in the Spirit; and after I had taken it out, and put 
-      its body and legs into a natural posture, remained moveless about an hour; 
-      but then, upon a sudden, as if it had been awaken out of a drunken sleep, 
-      it suddenly reviv'd and ran away; being caught, and serv'd as before, he 
-      for a while continued struggling and striving, till at last there issued 
-      several bubbles out of its mouth, and then, tanquam animam expirasset, he 
-      remained moveless for a good while ; but at length again recovering, it was 
-      again redipt, and suffered to lye some hours in the Spirit; notwithstanding 
-      which, after it had layen dry some three or four hours, it again recovered 
-      life and motion: Which kind of Experiments, if prosecuted, which they highly 
-      deserve, seem to me of no inconsiderable use towards the invention of the 
-      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture 
+    <p><font size="4">Having insnar'd several of these into a small Box, I made
+      choice of the tallest grown among them, and separating it from the rest,
+      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd
+      him down dead drunk, so that he became moveless, though at first putting
+      in he struggled for a pretty while very much, till at last, certain bubbles
+      issuing out of his mouth, it ceased to move; this (because I had before found
+      them quickly to recover again, if they were taken out presently) I suffered
+      to lye above an hour in the Spirit; and after I had taken it out, and put
+      its body and legs into a natural posture, remained moveless about an hour;
+      but then, upon a sudden, as if it had been awaken out of a drunken sleep,
+      it suddenly reviv'd and ran away; being caught, and serv'd as before, he
+      for a while continued struggling and striving, till at last there issued
+      several bubbles out of its mouth, and then, tanquam animam expirasset, he
+      remained moveless for a good while ; but at length again recovering, it was
+      again redipt, and suffered to lye some hours in the Spirit; notwithstanding
+      which, after it had layen dry some three or four hours, it again recovered
+      life and motion: Which kind of Experiments, if prosecuted, which they highly
+      deserve, seem to me of no inconsiderable use towards the invention of the
+      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture
       of Bodies. </font></p>
-    <p><font size="4">Of what Figure this Creature appear'd through the Microscope, 
-      the 32. Scheme (though not so carefully graven as it ought) will represent 
-      to the eye, namely, That it had a large head A A, at the upper end of which 
-      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B; 
-      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently 
-      differing from those of a blew Fly, though indeed they seem to be both the 
-      same kind of Organ, and to serve for a kind of smelling; beyond these were 
-      two indented jaws D D, which he open'd sideways, and was able to gape them 
-      asunder very wide; and the ends of them being armed with teeth, which meeting 
-      went between each other, it was able to grasp and hold a heavy body, three 
-      or four times the bulk and weight of its own body: It had only six legs, 
-      shap'd like those of a Fly, which, as I shewed before, is an Argument that 
-      it is a winged Insect, and though I could not perceive any sign of them in 
-      the middle part of its body (which seem'd to consist of three joints or pieces 
-      E F G, out of which sprung two legs, yet 'tis known that there are of them 
+    <p><font size="4">Of what Figure this Creature appear'd through the Microscope,
+      the 32. Scheme (though not so carefully graven as it ought) will represent
+      to the eye, namely, That it had a large head A A, at the upper end of which
+      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B;
+      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently
+      differing from those of a blew Fly, though indeed they seem to be both the
+      same kind of Organ, and to serve for a kind of smelling; beyond these were
+      two indented jaws D D, which he open'd sideways, and was able to gape them
+      asunder very wide; and the ends of them being armed with teeth, which meeting
+      went between each other, it was able to grasp and hold a heavy body, three
+      or four times the bulk and weight of its own body: It had only six legs,
+      shap'd like those of a Fly, which, as I shewed before, is an Argument that
+      it is a winged Insect, and though I could not perceive any sign of them in
+      the middle part of its body (which seem'd to consist of three joints or pieces
+      E F G, out of which sprung two legs, yet 'tis known that there are of them
       that have long wings, and fly up and down in the air. </font></p>
-    <p><font size="4">The third and last part of its body I I I was bigger and 
-      larger then the other two, unto which it was joyn'd by a very small middle, 
-      and had a kind of loose shell, or another distinct part of its body H, which 
-      seem'd to be interpos'd, and to keep the thorax and belly from touching. 
-      The whole body was cas'd over with a very strong armour, and the belly I 
-      I I was covered likewise with multitudes of small white shining brisles; 
-      the legs, horns, head, and middle parts of its body were bestruck with hairs 
+    <p><font size="4">The third and last part of its body I I I was bigger and
+      larger then the other two, unto which it was joyn'd by a very small middle,
+      and had a kind of loose shell, or another distinct part of its body H, which
+      seem'd to be interpos'd, and to keep the thorax and belly from touching.
+      The whole body was cas'd over with a very strong armour, and the belly I
+      I I was covered likewise with multitudes of small white shining brisles;
+      the legs, horns, head, and middle parts of its body were bestruck with hairs
       also, but smaller and darker. </font></p>
   </blockquote>
   <p>&nbsp;</p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/bug.html b/src/demo/share/jfc/SwingSet2/resources/bug.html
index bf3b159112f..d61cdb9ad25 100644
--- a/src/demo/share/jfc/SwingSet2/resources/bug.html
+++ b/src/demo/share/jfc/SwingSet2/resources/bug.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,113 +10,113 @@ <h1 align="center">Observ. LIV. Of a Louse.<br>
 </h1>
 <p align="center"><img src="http://github.com/images/Octavo/bug.jpg" width="516" height="445"></p>
 <p align="center">&nbsp;</p>
-<blockquote> 
-  <blockquote> 
-    <p><font size="4">This is a Creature so officious, that 'twill be known to 
-      every one at one time or other, so busie, and so impudent, that it will 
-      be intruding it self in every ones company, and so proud and aspiring withall, 
-      that it fears not to trample on the best, and affects nothing so much as 
-      a Crown; feeds and lives very high, and that makes it so saucy, as to pull 
-      any one by the ears that comes in its way, and will never be quiet till 
-      it has drawn blood: it is troubled at nothing so much as at a man that scratches 
-      his head, as knowing that man is plotting and contriving some mischief against 
-      it, and that makes it oftentime sculk into some meaner and lower place, and 
-      run behind a mans back, though it go very much against the hair; which ill 
-      conditions of it having made it better known then trusted, would exempt me 
-      from making any further description of it, did not my faithful Mercury, my 
+<blockquote>
+  <blockquote>
+    <p><font size="4">This is a Creature so officious, that 'twill be known to
+      every one at one time or other, so busie, and so impudent, that it will
+      be intruding it self in every ones company, and so proud and aspiring withall,
+      that it fears not to trample on the best, and affects nothing so much as
+      a Crown; feeds and lives very high, and that makes it so saucy, as to pull
+      any one by the ears that comes in its way, and will never be quiet till
+      it has drawn blood: it is troubled at nothing so much as at a man that scratches
+      his head, as knowing that man is plotting and contriving some mischief against
+      it, and that makes it oftentime sculk into some meaner and lower place, and
+      run behind a mans back, though it go very much against the hair; which ill
+      conditions of it having made it better known then trusted, would exempt me
+      from making any further description of it, did not my faithful Mercury, my
       Microscope, bring me other information of it. </font></p>
-    <p><font size="4">For this has discovered to me, by means of a very bright light 
-      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd 
-      like that exprest in 35. Scheme marked with A, which seems almost Conical, 
-      but is a little flatted on the upper and under sides, at the biggest part 
-      of which, on either side behind the head (as it were, being the place where 
-      other Creatures ears stand) are placed its two black shining goggle eyes 
-      B B, looking backwards, and fenced round with several small cilia or hairs 
-      that incompass it, so that it seems this Creature has no very good foresight: 
-      It does not seem to have any eyelids, and therefore perhaps its eyes were 
-      so placed, that it might the better cleanse them with its forelegs; and perhaps 
-      this may be the reason, why they so much avoid and run from the light behind 
-      them, for being made to live in the shady and dark recesses of the hair, 
-      and thence probably their eye having a great aperture, the open and clear 
-      light, especially that of the Sun, must needs very much offend them; to secure 
-      these eyes from receiving any injury from the hairs through which it passes, 
-      it has two horns that grow before it, in the place where one would have thought 
-      the eyes should be; each of these C C have four joynts, which are fringed, 
-      as 'twere, with small brisles, from which to the tip of its snout D, the 
-      head seems very round and tapering, ending in a very sharp nose D, which 
-      seems to have a small hole, and to be the passage through which he sucks 
+    <p><font size="4">For this has discovered to me, by means of a very bright light
+      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd
+      like that exprest in 35. Scheme marked with A, which seems almost Conical,
+      but is a little flatted on the upper and under sides, at the biggest part
+      of which, on either side behind the head (as it were, being the place where
+      other Creatures ears stand) are placed its two black shining goggle eyes
+      B B, looking backwards, and fenced round with several small cilia or hairs
+      that incompass it, so that it seems this Creature has no very good foresight:
+      It does not seem to have any eyelids, and therefore perhaps its eyes were
+      so placed, that it might the better cleanse them with its forelegs; and perhaps
+      this may be the reason, why they so much avoid and run from the light behind
+      them, for being made to live in the shady and dark recesses of the hair,
+      and thence probably their eye having a great aperture, the open and clear
+      light, especially that of the Sun, must needs very much offend them; to secure
+      these eyes from receiving any injury from the hairs through which it passes,
+      it has two horns that grow before it, in the place where one would have thought
+      the eyes should be; each of these C C have four joynts, which are fringed,
+      as 'twere, with small brisles, from which to the tip of its snout D, the
+      head seems very round and tapering, ending in a very sharp nose D, which
+      seems to have a small hole, and to be the passage through which he sucks
       the blood. </font></p>
     <p>&nbsp;</p>
     <p><img src="http://github.com/images/Octavo/bug2.jpg" width="537" height="348"></p>
-    <p><font size="4">Now whereas it if be plac'd on its back, with its belly 
-      upwards, as it is in the 35. Scheme, it seems in several Positions to have 
-      a resemblance of chaps, or jaws, as is represented in the Figure by E E, 
-      yet in other postures those dark strokes disappear; and having kept several 
-      of them in a box for two or three dayes, so that for all that time they had 
-      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately 
-      fell to sucking, and did neither seem to thrust its nose very deep into the 
-      skin, nor to open any kind of mouth, but I could plainly perceive a small 
-      current of blood, which came directly from its snout, and past into its belly; 
-      and about A there seem'd a contrivance, somewhat resembling a Pump, pair 
-      of Bellows, or Heart, for by a very swift systole and diastole the blood 
+    <p><font size="4">Now whereas it if be plac'd on its back, with its belly
+      upwards, as it is in the 35. Scheme, it seems in several Positions to have
+      a resemblance of chaps, or jaws, as is represented in the Figure by E E,
+      yet in other postures those dark strokes disappear; and having kept several
+      of them in a box for two or three dayes, so that for all that time they had
+      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately
+      fell to sucking, and did neither seem to thrust its nose very deep into the
+      skin, nor to open any kind of mouth, but I could plainly perceive a small
+      current of blood, which came directly from its snout, and past into its belly;
+      and about A there seem'd a contrivance, somewhat resembling a Pump, pair
+      of Bellows, or Heart, for by a very swift systole and diastole the blood
       seem'd drawn from the nose, and forced into the body. </font></p>
-    <p><font size="4">It did not seem at all, though I viewed it a good while as 
-      it was sucking, to thrust more of its nose into the skin then the very snout 
-      D, nor did it cause the least discernable pain, and yet the blood seem'd 
-      to run through its head very quick and freely, so that it seems there is 
-      no part of the skin but the blood is dispers'd into, nay, even into the 
-      cuticula; for had it thrust its whole nose in from D to C C, it would not 
-      have amounted to the supposed thickness of that tegument, the length of 
+    <p><font size="4">It did not seem at all, though I viewed it a good while as
+      it was sucking, to thrust more of its nose into the skin then the very snout
+      D, nor did it cause the least discernable pain, and yet the blood seem'd
+      to run through its head very quick and freely, so that it seems there is
+      no part of the skin but the blood is dispers'd into, nay, even into the
+      cuticula; for had it thrust its whole nose in from D to C C, it would not
+      have amounted to the supposed thickness of that tegument, the length of
       the nose being not more then a three hundredth part of an inch. </font></p>
-    <p><font size="4">It has six legs, covered with a very transparent shell, 
-      and joynted exactly like a Crab's, or Lobster's; each leg is divided into 
-      six parts by these joynts, and those have here and there several small hairs; 
-      and at the end of each leg it has two claws, very properly adapted for its 
-      peculiar use, being thereby inabled to walk very securely both on the skin 
-      and hair; and indeed this contrivance of the feet is very curious, and could 
-      not be made more commodiously and compendiously, for performing both these 
-      requisite motions, of walking and climbing up the hair of a mans head, then 
-      it is : for, by having the lesser claw (a) set so much short of the bigger 
-      (b) when it walks on the skin the shorter touches not, and then the feet 
-      are the same with those of a Mite, and several other small Insects, but by 
-      means of the small joynts of the longer claw it can bend it round, and so 
-      with both claws take hold of a hair, in the manner represented in the Figure, 
+    <p><font size="4">It has six legs, covered with a very transparent shell,
+      and joynted exactly like a Crab's, or Lobster's; each leg is divided into
+      six parts by these joynts, and those have here and there several small hairs;
+      and at the end of each leg it has two claws, very properly adapted for its
+      peculiar use, being thereby inabled to walk very securely both on the skin
+      and hair; and indeed this contrivance of the feet is very curious, and could
+      not be made more commodiously and compendiously, for performing both these
+      requisite motions, of walking and climbing up the hair of a mans head, then
+      it is : for, by having the lesser claw (a) set so much short of the bigger
+      (b) when it walks on the skin the shorter touches not, and then the feet
+      are the same with those of a Mite, and several other small Insects, but by
+      means of the small joynts of the longer claw it can bend it round, and so
+      with both claws take hold of a hair, in the manner represented in the Figure,
       the long transparent Cylinder F F F, being a Man's hair held by it. </font></p>
-    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then 
-      the belly, namely, with a thin transparent horny substance, which upon the fasting 
-      of the Creature did not grow flaccid; through this I could plainly see the 
-      blood, suck'd from my hand, to be variously distributed, and mov'd to and 
-      fro; and about G there seem'd a pretty big white substance, which seem'd 
-      to be moved within its thorax; besides, there appear'd very many small milk-white 
-      vessels, which crost over the breast between the legs, out of which, on 
-      either side, are many small branchings, these seem'd to be the veins and 
-      arteries, for that which is analogus to blood in all Insects is milk-white. 
+    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then
+      the belly, namely, with a thin transparent horny substance, which upon the fasting
+      of the Creature did not grow flaccid; through this I could plainly see the
+      blood, suck'd from my hand, to be variously distributed, and mov'd to and
+      fro; and about G there seem'd a pretty big white substance, which seem'd
+      to be moved within its thorax; besides, there appear'd very many small milk-white
+      vessels, which crost over the breast between the legs, out of which, on
+      either side, are many small branchings, these seem'd to be the veins and
+      arteries, for that which is analogus to blood in all Insects is milk-white.
       </font></p>
-    <p><font size="4">The belly is covered with a transparent substance likewise, 
-      but more resembling a skin then a shell, for 'tis grain'd all over the belly 
-      just like the skin in the palms of a man's hand, and when the belly is empty, 
-      grows very flaccid and wrinkled ; at the upper end of this is placed the 
-      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas, 
-      which by the peristaltick motion of the guts, is a little mov'd to and fro, 
-      not with a systole and diastole, but rather with a thronging or justling 
+    <p><font size="4">The belly is covered with a transparent substance likewise,
+      but more resembling a skin then a shell, for 'tis grain'd all over the belly
+      just like the skin in the palms of a man's hand, and when the belly is empty,
+      grows very flaccid and wrinkled ; at the upper end of this is placed the
+      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas,
+      which by the peristaltick motion of the guts, is a little mov'd to and fro,
+      not with a systole and diastole, but rather with a thronging or justling
       motion. </font></p>
-    <p><font size="4">Viewing one of these Creatures, after it had fasted two 
-      dayes, all the hinder part was lank and flaccid, and the white spot I I 
-      hardly mov'd, most of the white branchings disappear'd, and most also of 
-      the redness or sucked blood in the guts, the peristaltick motion of which 
-      was scarce discernable; but upon the suffering it to suck, it presently 
-      fill'd the skin of the belly, and of the six scolop'd embosments on either side, 
-      as full as it could be stuft ; the stomach and guts were as full as they 
-      could hold; the peristaltick motion of the gut grew quick, and the justling 
-      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly 
-      filled, and turgid, which were perhaps the veins and arteries, and the Creature 
-      was so greedy, that though it could not contain more, yet it continued sucking 
-      as fast as ever, and as fast emptying it self behind : the digestion of this 
-      Creature must needs be very quick, for though I perceiv'd the blood thicker 
-      and blacker when suck'd, yet, when in the guts, it was of a very lovely 
-      ruby colour, and that part of it, which was digested into the veins, seemed 
-      white; whence it appears, that a further digestion of blood may make it 
-      milk, at least of a resembling colour : What is else observable in the figure 
+    <p><font size="4">Viewing one of these Creatures, after it had fasted two
+      dayes, all the hinder part was lank and flaccid, and the white spot I I
+      hardly mov'd, most of the white branchings disappear'd, and most also of
+      the redness or sucked blood in the guts, the peristaltick motion of which
+      was scarce discernable; but upon the suffering it to suck, it presently
+      fill'd the skin of the belly, and of the six scolop'd embosments on either side,
+      as full as it could be stuft ; the stomach and guts were as full as they
+      could hold; the peristaltick motion of the gut grew quick, and the justling
+      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly
+      filled, and turgid, which were perhaps the veins and arteries, and the Creature
+      was so greedy, that though it could not contain more, yet it continued sucking
+      as fast as ever, and as fast emptying it self behind : the digestion of this
+      Creature must needs be very quick, for though I perceiv'd the blood thicker
+      and blacker when suck'd, yet, when in the guts, it was of a very lovely
+      ruby colour, and that part of it, which was digested into the veins, seemed
+      white; whence it appears, that a further digestion of blood may make it
+      milk, at least of a resembling colour : What is else observable in the figure
       of this Creature, maybe seen by the 35. Scheme.</font></p>
     </blockquote>
   <p>&nbsp;</p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/index.html b/src/demo/share/jfc/SwingSet2/resources/index.html
index 0aa73c410ef..ba7d26068a1 100644
--- a/src/demo/share/jfc/SwingSet2/resources/index.html
+++ b/src/demo/share/jfc/SwingSet2/resources/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -20,21 +20,21 @@ <h3><a href="http://github.com/bug.html">Of a Louse</a> <br>
     <br>
     <br>
   </h3>
-  <p><font color="#990000" size="4">Images and text used by permission of Octavo 
+  <p><font color="#990000" size="4">Images and text used by permission of Octavo
     Corporation (www.octavo.com),<br>
-    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All 
+    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All
     rights reserved.</font> <br>
     <br>
     <br>
-    <font size="2">Octavo Corporation is a publisher of rare 
-    books and manuscripts with digital tools and formats through partnerships 
-    with libraries, museums, and individuals. Using high-resolution digital imaging 
-    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files 
-    which can be viewed on and printed from almost any computing platform. You 
-    can view each page and the binding on your computer screen, zoom in to view 
-    detail up to 800% in some cases, and search, copy and paste the "live" text 
-    placed invisibly behind the page images which is available for selected Editions. 
-    Also included in each edition is the work's collation and provenance, as well 
+    <font size="2">Octavo Corporation is a publisher of rare
+    books and manuscripts with digital tools and formats through partnerships
+    with libraries, museums, and individuals. Using high-resolution digital imaging
+    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files
+    which can be viewed on and printed from almost any computing platform. You
+    can view each page and the binding on your computer screen, zoom in to view
+    detail up to 800% in some cases, and search, copy and paste the "live" text
+    placed invisibly behind the page images which is available for selected Editions.
+    Also included in each edition is the work's collation and provenance, as well
     as commentary by a noted expert in its field. </font></p>
 </blockquote>
 <p>&nbsp;</p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/king.html b/src/demo/share/jfc/SwingSet2/resources/king.html
index a6f458af419..b14f2d84b51 100644
--- a/src/demo/share/jfc/SwingSet2/resources/king.html
+++ b/src/demo/share/jfc/SwingSet2/resources/king.html
@@ -1,34 +1,34 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
-<p align="center"><font size="5"><img src="http://github.com/images/Octavo/king.jpg" width="420" height="290"> 
+<p align="center"><font size="5"><img src="http://github.com/images/Octavo/king.jpg" width="420" height="290">
   </font></p>
 <p align="center">&nbsp;</p>
-<blockquote> <font size="4">Do here most humbly lay this small Present at Your 
-  Majesties Royal feet. And though it comes accompany'd with two disadvantages, 
-  the meanness of the Author, and of the Subject; yet in both I am incouraged 
+<blockquote> <font size="4">Do here most humbly lay this small Present at Your
+  Majesties Royal feet. And though it comes accompany'd with two disadvantages,
+  the meanness of the Author, and of the Subject; yet in both I am incouraged
   by the greatness of your Mercy and your Knowledge. </font>
-<p><font size="4">By the one I am taught , that you can forgive the most presumptuous 
-    Offendors: And by the other, that you will not esteem the least work of Nature, 
+<p><font size="4">By the one I am taught , that you can forgive the most presumptuous
+    Offendors: And by the other, that you will not esteem the least work of Nature,
     or Art, unworthy your Observation. </font></p>
-  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties 
-    happy Restauration and Government, it is none of the least considerable, that 
+  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties
+    happy Restauration and Government, it is none of the least considerable, that
     Philosophy and Experimental Learning have prosper'd under your Royal Patronage.</font></p>
-  <p><font size="4">And as the calm prosperity of your Reign has given us the 
-    leisure to follow these Studies of quiet and retirement, so it is just, that 
-    the Fruits of them should, by way of acknowledgement, be return'd to your 
-    Majesty. There are, Sir, several other of your Subjects, of your Royal Society, 
-    now busie about Nobler matters: The Improvement of Manufactures and Agriculture, 
-    the Increase of Commerce, the Advantage of Navigation: In all which they are 
+  <p><font size="4">And as the calm prosperity of your Reign has given us the
+    leisure to follow these Studies of quiet and retirement, so it is just, that
+    the Fruits of them should, by way of acknowledgement, be return'd to your
+    Majesty. There are, Sir, several other of your Subjects, of your Royal Society,
+    now busie about Nobler matters: The Improvement of Manufactures and Agriculture,
+    the Increase of Commerce, the Advantage of Navigation: In all which they are
     assisted by your Majesties Incouragement and Example. </font></p>
-  <p><font size="4">Amidst all those greater Designs, I here presume to bring 
-    in that which is more proportionable to the smalness of my Abilities, and 
-    to offer some of the least of all visible things, to that Mighty King, that 
-    has establisht an Empire over the best of all Invisible things of this World, 
+  <p><font size="4">Amidst all those greater Designs, I here presume to bring
+    in that which is more proportionable to the smalness of my Abilities, and
+    to offer some of the least of all visible things, to that Mighty King, that
+    has establisht an Empire over the best of all Invisible things of this World,
     the Minds o f Men.</font></p>
   <blockquote>
     <p align="right">&nbsp;</p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/preface.html b/src/demo/share/jfc/SwingSet2/resources/preface.html
index 8138b288a18..b7c10d6eec1 100644
--- a/src/demo/share/jfc/SwingSet2/resources/preface.html
+++ b/src/demo/share/jfc/SwingSet2/resources/preface.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -9,101 +9,101 @@
   <p>&nbsp;</p>
   <h1 align="center">THE PREFACE</h1>
   <img src="http://github.com/images/Octavo/micro.jpg" width="381" height="384"> </div>
-<div align="right"> 
+<div align="right">
   <p align="left">&nbsp;</p>
   <p>&nbsp;</p>
 </div>
-<blockquote> 
+<blockquote>
   <div align="left">
-    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above 
-      other Creatures, that we are not only able to behold the works of Nature, 
-      or barely to sustein our lives by them, but we have also the power of considering, 
+    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above
+      other Creatures, that we are not only able to behold the works of Nature,
+      or barely to sustein our lives by them, but we have also the power of considering,
       comparing, altering, assisting, and improving them to various uses. </font></font></p>
-    <p><font size="4">And as this is the peculiar priviledge of humane Nature 
-      in general, so is it capable of being so far advanced by the helps of Art, 
-      and Experience, as to make some Men excel others in their Observations, 
+    <p><font size="4">And as this is the peculiar priviledge of humane Nature
+      in general, so is it capable of being so far advanced by the helps of Art,
+      and Experience, as to make some Men excel others in their Observations,
       and Deductions, almost as much as they do Beasts. </font></p>
-    <p><font size="4">By the addition of such artificial Instruments and methods, 
-      there may be, in some manner, a reparation made for the mischiefs, and imperfection, 
-      mankind has drawn upon itself, by negligence, and intemperance, and a wilful 
-      and superstitious deserting the Prescripts and Rules of Nature, whereby 
-      every man, both from a deriv'd corruption, innate and born with him, and 
-      from his breeding and converse with men, is very subject to slip into all 
+    <p><font size="4">By the addition of such artificial Instruments and methods,
+      there may be, in some manner, a reparation made for the mischiefs, and imperfection,
+      mankind has drawn upon itself, by negligence, and intemperance, and a wilful
+      and superstitious deserting the Prescripts and Rules of Nature, whereby
+      every man, both from a deriv'd corruption, innate and born with him, and
+      from his breeding and converse with men, is very subject to slip into all
       sorts of errors. </font></p>
-    <p><font size="4">The only way which now remains for us to recover some degree 
-      of those former perfections, seems to be, by rectifying the operations of 
-      the Sense, the Memory, and Reason, since upon the evidence, the strength, 
-      the integrity, and the right correspondence of all these, all the light, 
-      by which our actions are to be guided, is to be renewed, and all our command 
+    <p><font size="4">The only way which now remains for us to recover some degree
+      of those former perfections, seems to be, by rectifying the operations of
+      the Sense, the Memory, and Reason, since upon the evidence, the strength,
+      the integrity, and the right correspondence of all these, all the light,
+      by which our actions are to be guided, is to be renewed, and all our command
       over things is to be establisht.</font></p>
-    <p><font size="4"> It is therefore most worthy of our consideration, to recollect 
-      their several defects, that so we may the better understand how to supply 
-      them, and by what assistances we may inlarge their power, and secure them 
+    <p><font size="4"> It is therefore most worthy of our consideration, to recollect
+      their several defects, that so we may the better understand how to supply
+      them, and by what assistances we may inlarge their power, and secure them
       in performing their particular duties.</font></p>
-    <p><font size="4">As for the actions of our Senses, we cannot but observe 
-      them to be in many particulars much outdone by those of other Creatures, 
-      and when at best, to be far short of the perfection they seem capable of 
-      : And these infirmities of the Senses arise from a double cause, either 
-      from the disproportion of the Object to the Organ, whereby an infinite number 
-      of things can never enter into them, or else from error in the Perception, 
-      that many things, which come within their reach, are not received in a right 
+    <p><font size="4">As for the actions of our Senses, we cannot but observe
+      them to be in many particulars much outdone by those of other Creatures,
+      and when at best, to be far short of the perfection they seem capable of
+      : And these infirmities of the Senses arise from a double cause, either
+      from the disproportion of the Object to the Organ, whereby an infinite number
+      of things can never enter into them, or else from error in the Perception,
+      that many things, which come within their reach, are not received in a right
       manner. </font></p>
-    <p><font size="4">The like frailties are to be found in the Memory; we often 
-      let many things slip away from us, which deserve to be retain'd; and of 
-      those which we treasure up, a great part is either frivolous or false ; 
-      and if good, and substantial, either in tract of time obliterated, or at 
-      best so overwhelmed and buried under more frothy notions, that when there 
+    <p><font size="4">The like frailties are to be found in the Memory; we often
+      let many things slip away from us, which deserve to be retain'd; and of
+      those which we treasure up, a great part is either frivolous or false ;
+      and if good, and substantial, either in tract of time obliterated, or at
+      best so overwhelmed and buried under more frothy notions, that when there
       is need of them, they are in vain sought for. </font></p>
-    <p><font size="4">The two main foundations being so deceivable, it is no wonder, 
-      that all the succeeding works which we build upon them, of arguing, concluding, 
-      defining, judging, and all the other degrees of Reason, are lyable to the 
-      same imperfection, being, at best, either vain, or uncertain: So that the 
-      errors of the understanding are answerable to the two other, being defective 
-      both in the quantity and goodness of its knowledge; for the limits, to which 
-      our thoughts are confind, are small in respect of the vast extent of Nature 
-      it self; some parts of it are too large to be comprehended, and some too 
+    <p><font size="4">The two main foundations being so deceivable, it is no wonder,
+      that all the succeeding works which we build upon them, of arguing, concluding,
+      defining, judging, and all the other degrees of Reason, are lyable to the
+      same imperfection, being, at best, either vain, or uncertain: So that the
+      errors of the understanding are answerable to the two other, being defective
+      both in the quantity and goodness of its knowledge; for the limits, to which
+      our thoughts are confind, are small in respect of the vast extent of Nature
+      it self; some parts of it are too large to be comprehended, and some too
       little to be perceived. </font></p>
-    <p><font size="4">And from thence it must follow, that not having a full sensation 
-      of the Object, we must be very lame and imperfect in our conceptions about 
-      it, and in all the propositions which we build upon it; hence we often take 
-      the shadow of things for the substance, small appearances for good similitudes, 
-      similitudes for definitions; and even many of those, which we think to be 
-      the most solid definitions, are rather expressions of our own misguided 
+    <p><font size="4">And from thence it must follow, that not having a full sensation
+      of the Object, we must be very lame and imperfect in our conceptions about
+      it, and in all the propositions which we build upon it; hence we often take
+      the shadow of things for the substance, small appearances for good similitudes,
+      similitudes for definitions; and even many of those, which we think to be
+      the most solid definitions, are rather expressions of our own misguided
       apprehensions then of the true nature of the things themselves. </font></p>
-    <p><font size="4">The effects of these imperfections are manifested in different 
-      ways, according to the temper and disposition of the several minds of men, 
-      some they incline to gross ignorance and stupidity, and others to a presumptuous 
-      imposing on other mens Opinions, and a confident dogmatizing on matters, 
+    <p><font size="4">The effects of these imperfections are manifested in different
+      ways, according to the temper and disposition of the several minds of men,
+      some they incline to gross ignorance and stupidity, and others to a presumptuous
+      imposing on other mens Opinions, and a confident dogmatizing on matters,
       whereof there is no assurance to be given. </font></p>
-    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions, 
-      proceed either from the narrowness and wandring of our Senses, from the 
-      slipperiness or delusion of our Memory, from the confinement or rashness 
-      of our Understanding, so that 'tis no wonder, that our power over natural 
-      causes and effects is so slowly improvd, seeing we are not only to contend 
-      with the obscurity and difficulty of the things whereon we work and think, 
+    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions,
+      proceed either from the narrowness and wandring of our Senses, from the
+      slipperiness or delusion of our Memory, from the confinement or rashness
+      of our Understanding, so that 'tis no wonder, that our power over natural
+      causes and effects is so slowly improvd, seeing we are not only to contend
+      with the obscurity and difficulty of the things whereon we work and think,
       but even the forces of our own minds conspire to betray us. </font></p>
-    <p><font size="4">These being the dangers in the process of humane Reason, 
-      the remedies of them all can only proceed from the real, the mechanical, 
-      the experimental Philosophy, which has this advantage over the Philosophy 
-      of discourse and disputation, that whereas that chiefly aims at the subtilty 
-      of its Deductions and Conclusions, without much regard to the first groundwork, 
-      which ought to be well laid on the Sense and Memory ; so this intends the 
-      right ordering of them all, and the making them serviceable to each other. 
+    <p><font size="4">These being the dangers in the process of humane Reason,
+      the remedies of them all can only proceed from the real, the mechanical,
+      the experimental Philosophy, which has this advantage over the Philosophy
+      of discourse and disputation, that whereas that chiefly aims at the subtilty
+      of its Deductions and Conclusions, without much regard to the first groundwork,
+      which ought to be well laid on the Sense and Memory ; so this intends the
+      right ordering of them all, and the making them serviceable to each other.
       </font></p>
-    <p><font size="4">The first thing to be undertaken in this weighty work, is 
-      a watchfulness over the failings and an inlargement of the dominion, of 
-      the Senses. To which end it is requisite, first, That there should be a 
-      scrupulous choice, and a strict examination, of the reality, constancy, 
-      and certainty of the Particulars that we admit: This is the first rise whereon 
-      truth is to begin, and here the most severe, and most impartial diligence, 
-      must be imployed ; the storing up of all, without any regard to evidence 
+    <p><font size="4">The first thing to be undertaken in this weighty work, is
+      a watchfulness over the failings and an inlargement of the dominion, of
+      the Senses. To which end it is requisite, first, That there should be a
+      scrupulous choice, and a strict examination, of the reality, constancy,
+      and certainty of the Particulars that we admit: This is the first rise whereon
+      truth is to begin, and here the most severe, and most impartial diligence,
+      must be imployed ; the storing up of all, without any regard to evidence
       or use, will only tend to darkness and confusion. </font></p>
-    <p><font size="4">We must not therefore esteem the riches of our Philosophical 
-      treasure by the number only, but chiefly by the weight; the most vulgar 
-      Instances are not to be neglected, but above all, the most instructive are 
-      to be entertain'd: the footsteps of Nature are to be trac'd, not only in 
-      her ordinary course,but when she seems to be put to her shifts, to make 
-      many doublings and turnings, and to use some kind of art in indeavouring 
+    <p><font size="4">We must not therefore esteem the riches of our Philosophical
+      treasure by the number only, but chiefly by the weight; the most vulgar
+      Instances are not to be neglected, but above all, the most instructive are
+      to be entertain'd: the footsteps of Nature are to be trac'd, not only in
+      her ordinary course,but when she seems to be put to her shifts, to make
+      many doublings and turnings, and to use some kind of art in indeavouring
       to avoid our discovery. </font></p>
     <p>&nbsp;</p>
     <p><a href="http://github.com/king.html"><img src="http://github.com/images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="http://github.com/seaweed.html"><img src="http://github.com/images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/seaweed.html b/src/demo/share/jfc/SwingSet2/resources/seaweed.html
index fd2a9433630..f386751dd7c 100644
--- a/src/demo/share/jfc/SwingSet2/resources/seaweed.html
+++ b/src/demo/share/jfc/SwingSet2/resources/seaweed.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -11,47 +11,47 @@ <h1 align="center"><br>
 <p align="center"><img src="http://github.com/images/Octavo/seaweed.jpg" width="316" height="498"></p>
 <p align="center">&nbsp;</p>
 <blockquote>
-  <p><font size="4">For curiosity and beauty, I have not among all the Plants 
-    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed 
-    I have here describ'd, of which I am able to say very little more then what 
-    is represented by the second Figure of the ninth Scheme: Namely, that it is 
-    a Plant which grows upon the Rocks under the water, and increases and spreads 
-    it self into a great tuft, which is not onely handsomely branch'd into several 
-    leaves, but the whole surface of the Plant is cover'd over with a most curious 
-    kind of carv'd work, which consists of a texture much resembling a Honeycomb; 
-    for the whole surface on both sides is cover'd over with a multitude of very 
-    small holes, being no bigger then so many holes made with the point of a small 
-    Pinn, and rang'd in the neatest and most delicate order imaginable, they being 
-    plac'd in the manner of a Quincunx, or very much like the rows of the eyes 
-    of a Fly, the rows or orders being very regular, which way soever they are 
-    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying 
-    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which 
-    round Area A B C D represents a part of the surface about one eighth part 
-    of an Inch in Diameter: Those little holes, which to the eye look'd round, 
-    like so many little spots, here appear'd very regularly shap'd holes, representing 
-    almost the shape of the sole of a round toed shoe, the hinder part of which, 
-    is, as it were, trod on or cover'd by the toe of that next below it; these 
-    holes seem'd wall'd about with a very thin and transparent substance, looking 
-    of a pale straw-colour; from the edge of which, against the middle of each 
-    hole, were sprouted out four small transparent straw-colour'd Thorns, which 
-    seem'd to protect and cover those cavities, from either side two; neer the 
-    root of this Plant, were sprouted out several small branches of a kind of 
+  <p><font size="4">For curiosity and beauty, I have not among all the Plants
+    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed
+    I have here describ'd, of which I am able to say very little more then what
+    is represented by the second Figure of the ninth Scheme: Namely, that it is
+    a Plant which grows upon the Rocks under the water, and increases and spreads
+    it self into a great tuft, which is not onely handsomely branch'd into several
+    leaves, but the whole surface of the Plant is cover'd over with a most curious
+    kind of carv'd work, which consists of a texture much resembling a Honeycomb;
+    for the whole surface on both sides is cover'd over with a multitude of very
+    small holes, being no bigger then so many holes made with the point of a small
+    Pinn, and rang'd in the neatest and most delicate order imaginable, they being
+    plac'd in the manner of a Quincunx, or very much like the rows of the eyes
+    of a Fly, the rows or orders being very regular, which way soever they are
+    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying
+    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which
+    round Area A B C D represents a part of the surface about one eighth part
+    of an Inch in Diameter: Those little holes, which to the eye look'd round,
+    like so many little spots, here appear'd very regularly shap'd holes, representing
+    almost the shape of the sole of a round toed shoe, the hinder part of which,
+    is, as it were, trod on or cover'd by the toe of that next below it; these
+    holes seem'd wall'd about with a very thin and transparent substance, looking
+    of a pale straw-colour; from the edge of which, against the middle of each
+    hole, were sprouted out four small transparent straw-colour'd Thorns, which
+    seem'd to protect and cover those cavities, from either side two; neer the
+    root of this Plant, were sprouted out several small branches of a kind of
     bastard Coralline, curiously branch'd, though small. </font></p>
-  <p><font size="4">And to confirm this, having lately the opportunity of viewing 
-    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made 
-    mention in the last Observation, I found, that each of the Branches or Figures 
-    of it, did, by the range of its pores, exhibit just such a texture, the rows 
-    of pores crossing one another, much after the manner as the rows of eyes do 
-    which are describ'd in the 26. Scheme : Coralline also, and several sorts of 
-    white Coral, I have with a Microscope observ'd very curiously shap'd. And 
-    I doubt not, but that he that shall observe these several kinds of Plants that 
-    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others 
-    which are vomited out of it upon the shore, may find multitudes of little 
-    Plants, and other bodies, which like this will afford very beautifull objects 
-    for the Microscope ; and this Specimen here is adjoin'd onely to excite their 
-    curiosities who have opportunity of observing to examine and collect what 
-    they find worthy their notice; for the Sea, among terrestrial bodies, is also 
-    a prolifick mother, and affords as many Instances of spontaneous generations 
+  <p><font size="4">And to confirm this, having lately the opportunity of viewing
+    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made
+    mention in the last Observation, I found, that each of the Branches or Figures
+    of it, did, by the range of its pores, exhibit just such a texture, the rows
+    of pores crossing one another, much after the manner as the rows of eyes do
+    which are describ'd in the 26. Scheme : Coralline also, and several sorts of
+    white Coral, I have with a Microscope observ'd very curiously shap'd. And
+    I doubt not, but that he that shall observe these several kinds of Plants that
+    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others
+    which are vomited out of it upon the shore, may find multitudes of little
+    Plants, and other bodies, which like this will afford very beautifull objects
+    for the Microscope ; and this Specimen here is adjoin'd onely to excite their
+    curiosities who have opportunity of observing to examine and collect what
+    they find worthy their notice; for the Sea, among terrestrial bodies, is also
+    a prolifick mother, and affords as many Instances of spontaneous generations
     as either the Air or Earth.</font></p>
   <p>&nbsp;</p>
   <p><a href="http://github.com/preface.html"><img src="http://github.com/images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="http://github.com/ant.html"><img src="http://github.com/images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>
diff --git a/src/demo/share/jfc/SwingSet2/resources/title.html b/src/demo/share/jfc/SwingSet2/resources/title.html
index ea13f5cf005..0e99558ccd7 100644
--- a/src/demo/share/jfc/SwingSet2/resources/title.html
+++ b/src/demo/share/jfc/SwingSet2/resources/title.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -14,18 +14,18 @@ <h1 align="center"><font size="+1"><b><font size="+4" color="#990033"><br>
 <p align="center"> <b>MADE BY </b></p>
 <p align="center"><font size="5" color="#9F1040">MAGNIFYING GLASSES. </font></p>
 <p align="center"><b>WITH </b></p>
-<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b> 
+<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b>
   thereupon.</p>
-<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i> 
+<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i>
   ,</i></b> Fellow of the <font color="#990033">ROYAL SOCIETY</font> .</p>
 <p align="center"><img src="http://github.com/images/Octavo/crest.jpg" width="320" height="342"></p>
-<blockquote> 
-  <blockquote> 
-    <blockquote> 
-      <p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo. 
-        Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font> 
-        Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to 
-        be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M 
+<blockquote>
+  <blockquote>
+    <blockquote>
+      <p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo.
+        Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font>
+        Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to
+        be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M
         D C L X V.</font></p>
       <p align="center"><font color="#990000"><br>
         </font></p>
diff --git a/src/hotspot/share/prims/jvmti.xml b/src/hotspot/share/prims/jvmti.xml
index 4bff3230c9e..a15dbb5703a 100644
--- a/src/hotspot/share/prims/jvmti.xml
+++ b/src/hotspot/share/prims/jvmti.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://github.com/jvmti.xsl"?>
 <!--
  Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
@@ -8292,7 +8292,7 @@ class C2 extends C1 implements I2 {
         <field id="entry_count">
           <jint/>
           <description>
-            The number of times the platform thread owning this monitor has entered it, 
+            The number of times the platform thread owning this monitor has entered it,
             or <code>0</code> if owned by a virtual thread or not owned
           </description>
         </field>
diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html
index 4b9b62f1ed8..54d4cd55a9b 100644
--- a/src/java.base/share/classes/java/net/doc-files/net-properties.html
+++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html
@@ -25,7 +25,7 @@
 -->
 <HTML lang="EN">
 <HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
 	<TITLE>Networking Properties</TITLE>
 </HEAD>
 <BODY LANG="en-US" DIR="LTR">
@@ -203,9 +203,9 @@ <H2>Misc HTTP URL stream protocol handler properties</H2>
         <B>{@systemProperty http.keepAlive.time.proxy}</B> </P>
 	<P>These properties modify the behavior of the HTTP keepalive cache in the case
         where the server (or proxy) has not specified a keepalive time. If the
-        property is set in this case, then idle connections will be closed after the 
+        property is set in this case, then idle connections will be closed after the
         specified number of seconds. If the property is set, and the server does
-        specify a keepalive time in a "Keep-Alive" response header, then the time specified 
+        specify a keepalive time in a "Keep-Alive" response header, then the time specified
         by the server is used. If the property is not set and also the server
         does not specify a keepalive time, then connections are kept alive for an
         implementation defined time, assuming {@code http.keepAlive} is {@code true}.</P>
@@ -249,7 +249,7 @@ <H2>Misc HTTP URL stream protocol handler properties</H2>
         {@code SHA-1}. If it is still required to use one of these algorithms, then they can be
         re-enabled by setting this property to a comma separated list of the algorithm names.</P>
 	<LI><P><B>{@systemProperty jdk.https.negotiate.cbt}</B> (default: &lt;never&gt;)<BR>
-	This controls the generation and sending of TLS channel binding tokens (CBT) when Kerberos 
+	This controls the generation and sending of TLS channel binding tokens (CBT) when Kerberos
         or the Negotiate authentication scheme using Kerberos are employed over HTTPS with
         {@code HttpsURLConnection}. There are three possible settings:</P>
         <OL>
@@ -258,8 +258,8 @@ <H2>Misc HTTP URL stream protocol handler properties</H2>
           <LI><P>"always". CBTs are sent for all Kerberos authentication attempts over HTTPS.</P>
           <LI><P>"domain:&lt;comma separated domain list&gt;" Each domain in the list specifies destination
           host or hosts for which a CBT is sent. Domains can be single hosts like foo, or foo.com,
-          or literal IP addresses as specified in RFC 2732, or wildcards like *.foo.com which matches 
-          all hosts under foo.com and its sub-domains. CBTs are not sent to any destinations 
+          or literal IP addresses as specified in RFC 2732, or wildcards like *.foo.com which matches
+          all hosts under foo.com and its sub-domains. CBTs are not sent to any destinations
           that don't match one of the list entries</P>
 	</OL>
 	<P>The channel binding tokens generated are of the type "tls-server-end-point" as defined in
@@ -317,32 +317,32 @@ <H2>Unix domain sockets</H2>
 For Unix domain sockets, this means a unique path in some predefined system temporary directory.
 There are a number of system (and networking) properties that affect this behavior.
 <p>
-Unix domain socket addresses are limited in length to approximately 100 
+Unix domain socket addresses are limited in length to approximately 100
 bytes (depending on the platform), it is important to ensure that the temporary directory's name
 together with the filename used for the socket (currently a name similar to
 {@code socket_1679697142}) does not exceed this limit. The following properties
 can be used to control the selection of this directory:
 <ul>
-	<li><p><b>{@systemProperty jdk.net.unixdomain.tmpdir}</b> This can be set as 
-	a networking property in {@code conf/net.properties} If set, this specifies the 
+	<li><p><b>{@systemProperty jdk.net.unixdomain.tmpdir}</b> This can be set as
+	a networking property in {@code conf/net.properties} If set, this specifies the
 	directory to use for automatically bound server socket addresses. On some platforms,
 	(eg some Unix systems) this will have a predefined default value. On others,
 	(eg Windows) there is no default value. Either way, it is always possible
 	to override the networking property with a system property of the same name
 	set on the command line. If neither of the networking nor system property
-	are set, then some systems (eg Windows)  may check a commonly used environment 
+	are set, then some systems (eg Windows)  may check a commonly used environment
 	variable as temporary directory.
 	<li><p><b>{@systemProperty java.io.tmpdir}</b> If the previous step fails to locate
 	a directory to use, then the directory identified by the system property
 	{@code java.io.tmpdir} is used.
 </ul>
-More information about the platform specific behavior can be seen in the 
+More information about the platform specific behavior can be seen in the
 {@code conf/net.properties} configuration file.
 <p>
 <i>Implicit</i> binding of a {@link java.nio.channels.SocketChannel SocketChannel}
 <p>
 If a client socket is connected to a remote destination without calling {@code bind} first,
-then the socket is <i>implicitly</i> bound. In this case, <i>Unix domain</i> sockets 
+then the socket is <i>implicitly</i> bound. In this case, <i>Unix domain</i> sockets
 are <i>unnamed</i> (ie. their path is empty). This behavior is not affected by any
 system or networking properties.
 <p>
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
index 9653dca129b..3433d48fc39 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd
@@ -1,5 +1,5 @@
 <!ELEMENT defaultsProperty EMPTY>
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
  Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl
index 2c195058636..169442f0f0c 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/transform/xmlfiles/doctest.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" version="4.0" indent="yes" encoding="iso-8859-1"/>
+<xsl:output method="html" version="4.0" indent="yes" encoding="UTF-8"/>
 
 <xsl:template match="/">
 <html>
@@ -13,4 +13,3 @@
 </xsl:template>
 
 </xsl:stylesheet>
-
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml
index 0a00dbdaae0..ea4a3b8bc66 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <shiporder orderid="889923"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,4 +21,4 @@ xsi:noNamespaceSchemaLocation="shiporder.xsd">
 <quantity>1</quantity>
 <price>9.90</price>
 </item>
-</shiporder>
\ No newline at end of file
+</shiporder>
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd
index 7281dbd9698..9b6e9cf63f6 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder11.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 <!-- definition of simple elements -->
@@ -48,4 +48,4 @@
 </xs:complexType>
 </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml
index 0a00dbdaae0..ea4a3b8bc66 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <shiporder orderid="889923"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,4 +21,4 @@ xsi:noNamespaceSchemaLocation="shiporder.xsd">
 <quantity>1</quantity>
 <price>9.90</price>
 </item>
-</shiporder>
\ No newline at end of file
+</shiporder>
diff --git a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd
index 7281dbd9698..9b6e9cf63f6 100644
--- a/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd
+++ b/test/jaxp/javax/xml/jaxp/functional/javax/xml/validation/xmlfiles/shiporder12.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 <!-- definition of simple elements -->
@@ -48,4 +48,4 @@
 </xs:complexType>
 </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/xmlfiles/XSLDTD.xsl b/test/jaxp/javax/xml/jaxp/unittest/common/xmlfiles/XSLDTD.xsl
index b817363284a..14cc5f6569f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/xmlfiles/XSLDTD.xsl
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/xmlfiles/XSLDTD.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE HTMLlat1 SYSTEM "XSLDTD.dtd">
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
diff --git a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
index 2cfeba3fa48..cfaed9d533b 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<element xmlns:space="foo" 
+<?xml version="1.0" encoding="UTF-8"?>
+<element xmlns:space="foo"
     attribute1="value1" space:attribute2="value2" attribute3="value3"/>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl
index 96caed83357..5a1f25250e8 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/CR6401137.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
index b987f12d68d..ddc1da2832d 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
@@ -15,4 +15,3 @@
         <full_name>Stale Refsnes</full_name>
     </person>
 </persons>
-
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
index 1c74eb70f4d..6c80edd852f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
@@ -14,4 +14,3 @@
         <full_name>Stale Refsnes</full_name>
     </person>
 </persons>
-
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
index 5e1b1eac0b2..ced209668be 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <child_name>Hege</child_name>
@@ -7,4 +7,3 @@
         <child_name>Borge</child_name>
     </person>
 </persons>
-
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
index 00cb274e909..8a49186b09f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <child_name>Hege</child_name>
@@ -6,4 +6,3 @@
         <child_name>Jim</child_name>
     </person>
 </persons>
-
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
index e77fc023340..df61306225a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -16,6 +16,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
-</xs:schema>
 
+</xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
index a1a8ca39381..d4ceba15be3 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -17,6 +17,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
-</xs:schema>
 
+</xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
index e3743f1a2fd..cfc2b3c7241 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
index aae039cb5b0..d0bcc93146f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
index e52e5266bf4..06611d5c937 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
index 06f23371e2e..ecafb30e7bb 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
index ba1fc71c28b..68b8ec7ff52 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
index a9d696e18fa..9b4c0ff1e5f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
index d53a8fb98d2..6bbc4a12584 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -17,5 +17,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
index d6cb815d80d..4a60bdb153e 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -17,5 +17,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
index cd6768d7990..86f6f85d0f5 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
index bdda93a7f76..a912f822748 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
index 67948360ff3..f5071dfdc26 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml
index 29d3f37ccf3..e110c224909 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
index ba00d962738..6aeed945cde 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Hege Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
index 177b18b2e09..d7c085a486a 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <persons>
     <person>
         <full_name>Tove Refsnes</full_name>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
index ae39e098efb..d59fc3cb61f 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -16,5 +16,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
index 5c543cadf52..ed854059019 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -16,5 +16,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
index a21f20b064d..3937c6bc316 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -16,5 +16,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd
index 62a7d2f266c..d5805eacfb1 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/occurs.xsd
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified">
-    
+
     <xs:element name="persons">
         <xs:complexType>
             <xs:sequence>
@@ -16,5 +16,5 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
+
 </xs:schema>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
index 866856b9e6a..6e6ff5a21a2 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/button/resources/ButtonDemo.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- 
+<!--
  Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- 
+
  This code is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License version 2 only, as
  published by the Free Software Foundation.
- 
+
  This code is distributed in the hope that it will be useful, but WITHOUT
  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  version 2 for more details (a copy is included in the LICENSE file that
  accompanied this code).
- 
+
  You should have received a copy of the GNU General Public License version
  2 along with this work; if not, write to the Free Software Foundation,
  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- 
+
  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  or visit www.oracle.com if you need additional information or have any
  questions.
@@ -24,9 +24,9 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <body>
-            <p> Today's modern GUIs often use buttons which don't look like the traditional &quot;push&quot; button. Swing's button component, <a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/JButton.html">javax.swing.JButton</a>, 
+            <p> Today's modern GUIs often use buttons which don't look like the traditional &quot;push&quot; button. Swing's button component, <a href="http://docs.oracle.com/javase/8/docs/api/javax/swing/JButton.html">javax.swing.JButton</a>,
                 can be used to create both ordinary and more creative button visuals. In the end, they all perform an action when clicked.
             </p>
             <p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html
index e0186e5589c..575fa38ea4c 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,106 +10,106 @@ <h1 align="center"><br>
   Observ. XLIX. Of an Ant or Pismire.<br>
 </h1>
 <p align="center">&nbsp;</p>
-<blockquote> 
+<blockquote>
   <blockquote>
-   <p><font size="4">This was a creature, more troublesom to be drawn, then any 
-      of the rest, for I could not, for a good while, think of a way to make it 
+   <p><font size="4">This was a creature, more troublesom to be drawn, then any
+      of the rest, for I could not, for a good while, think of a way to make it
       suffer its body to ly quiet in a natural posture; but whil'st it was alive,
-      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body, 
-      that I could not any wayes get a good view of it; and if I killed it, its 
-      body was so little, that I did often spoile the shape of it, before I could 
-      throughly view it: for this is the nature of these minute Bodies, that as 
-      soon, almost, as ever their life is destroy'd, their parts immediately shrivel, 
-      and lose their beauty; and so is it also with small Plants, as I instanced 
+      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body,
+      that I could not any wayes get a good view of it; and if I killed it, its
+      body was so little, that I did often spoile the shape of it, before I could
+      throughly view it: for this is the nature of these minute Bodies, that as
+      soon, almost, as ever their life is destroy'd, their parts immediately shrivel,
+      and lose their beauty; and so is it also with small Plants, as I instanced
       before, in the description of Moss. </font></p>
-    <p><font size="4">And thence also is the reason of the variations in the beards 
-      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding 
-      small, those small variations which are made in the surfaces of all bodies, 
-      almost upon every change of Air, especially if the body be porous, do here 
-      become sensible, where the whole body is so small, that it is almost nothing 
-      but surface; for as in vegetable substances, I see no great reason to think, 
-      that the moisture of the Aire (that, sticking to a wreath'd beard, does make 
-      it untwist) should evaporate, or exhale away, any faster then the moisture 
-      of other bodies, but rather that the avolation from, or access of moisture 
-      to, the surfaces of bodies being much the same, those bodies become most 
-      sensible of it, which have the least proportion of body to their surface. 
+    <p><font size="4">And thence also is the reason of the variations in the beards
+      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding
+      small, those small variations which are made in the surfaces of all bodies,
+      almost upon every change of Air, especially if the body be porous, do here
+      become sensible, where the whole body is so small, that it is almost nothing
+      but surface; for as in vegetable substances, I see no great reason to think,
+      that the moisture of the Aire (that, sticking to a wreath'd beard, does make
+      it untwist) should evaporate, or exhale away, any faster then the moisture
+      of other bodies, but rather that the avolation from, or access of moisture
+      to, the surfaces of bodies being much the same, those bodies become most
+      sensible of it, which have the least proportion of body to their surface.
       </font></p>
-    <p><font size="4">So is it also with Animal substances; the dead body of an 
-      Ant, or such little creature, does almost instantly shrivel and dry, and 
-      your object shall be quite another thing, before you can half delineate 
-      it, which proceeds not from the extraordinary exhalation, but from the small 
-      proportion of body and juices, to the usual drying of bodies in the Air, 
+    <p><font size="4">So is it also with Animal substances; the dead body of an
+      Ant, or such little creature, does almost instantly shrivel and dry, and
+      your object shall be quite another thing, before you can half delineate
+      it, which proceeds not from the extraordinary exhalation, but from the small
+      proportion of body and juices, to the usual drying of bodies in the Air,
       especially if warm. </font></p>
-    <p><font size="4">For which inconvenience, where I could not otherwise remove 
-      it, I thought of this expedient. I took the creature, I had design'd to delineate, 
-      and put it into a drop of very well rectified spirit of Wine, this I found 
-      would presently dispatch, as it were, the Animal, and being taken out of 
-      it, and lay'd on a paper,the spirit of Wine would immediately fly away, 
-      and leave the Animal dry, in its natural posture, or at least, in a constitution, 
-      that it might easily with a pin be plac'd, in what posture you desired to 
-      draw it, and the limbs would so remain, without either moving, or shriveling. 
+    <p><font size="4">For which inconvenience, where I could not otherwise remove
+      it, I thought of this expedient. I took the creature, I had design'd to delineate,
+      and put it into a drop of very well rectified spirit of Wine, this I found
+      would presently dispatch, as it were, the Animal, and being taken out of
+      it, and lay'd on a paper,the spirit of Wine would immediately fly away,
+      and leave the Animal dry, in its natural posture, or at least, in a constitution,
+      that it might easily with a pin be plac'd, in what posture you desired to
+      draw it, and the limbs would so remain, without either moving, or shriveling.
       </font></p>
-    <p><font size="4">And thus I dealt with this Ant, which I have here delineated, 
-      which was one of many, of a very large kind, that inhabited under the Roots 
-      of a Tree, from whence they would sally out in great parties, and make most 
-      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back 
+    <p><font size="4">And thus I dealt with this Ant, which I have here delineated,
+      which was one of many, of a very large kind, that inhabited under the Roots
+      of a Tree, from whence they would sally out in great parties, and make most
+      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back
       again very expertly, by the same wayes and paths they went. </font></p>
-    <p><font size="4">It was more then half the bigness of an Earwig, of a dark 
-      brown, or reddish colour, with long legs, on the hinder of which it would 
-      stand up, and raise its head as high as it could above the ground, that it 
-      might stare the further about it, just after the same manner as I have also 
-      observ'd a hunting Spider to do: and putting my finger towards them, they 
-      have at first all run towards it, till almost at it; and then they would stand 
-      round about it, at a certain distance, and smell, as it were, and consider 
-      whether they should any of them venture any further, till one more bold then 
-      the rest venturing to climb it, all the rest, if I would have suffered them, 
-      would have immediately followed : much such other seemingly rational actions 
-      I have observ'd in this little Vermine with much pleasure, which would be 
-      too long to be here related; those that desire more of them may satisfie 
+    <p><font size="4">It was more then half the bigness of an Earwig, of a dark
+      brown, or reddish colour, with long legs, on the hinder of which it would
+      stand up, and raise its head as high as it could above the ground, that it
+      might stare the further about it, just after the same manner as I have also
+      observ'd a hunting Spider to do: and putting my finger towards them, they
+      have at first all run towards it, till almost at it; and then they would stand
+      round about it, at a certain distance, and smell, as it were, and consider
+      whether they should any of them venture any further, till one more bold then
+      the rest venturing to climb it, all the rest, if I would have suffered them,
+      would have immediately followed : much such other seemingly rational actions
+      I have observ'd in this little Vermine with much pleasure, which would be
+      too long to be here related; those that desire more of them may satisfie
       their curiosity in Ligons History of the Barbadoes. </font></p>
-    <p><font size="4">Having insnar'd several of these into a small Box, I made 
-      choice of the tallest grown among them, and separating it from the rest, 
-      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd 
-      him down dead drunk, so that he became moveless, though at first putting 
-      in he struggled for a pretty while very much, till at last, certain bubbles 
-      issuing out of his mouth, it ceased to move; this (because I had before found 
-      them quickly to recover again, if they were taken out presently) I suffered 
-      to lye above an hour in the Spirit; and after I had taken it out, and put 
-      its body and legs into a natural posture, remained moveless about an hour; 
-      but then, upon a sudden, as if it had been awaken out of a drunken sleep, 
-      it suddenly reviv'd and ran away; being caught, and serv'd as before, he 
-      for a while continued struggling and striving, till at last there issued 
-      several bubbles out of its mouth, and then, tanquam animam expirasset, he 
-      remained moveless for a good while ; but at length again recovering, it was 
-      again redipt, and suffered to lye some hours in the Spirit; notwithstanding 
-      which, after it had layen dry some three or four hours, it again recovered 
-      life and motion: Which kind of Experiments, if prosecuted, which they highly 
-      deserve, seem to me of no inconsiderable use towards the invention of the 
-      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture 
+    <p><font size="4">Having insnar'd several of these into a small Box, I made
+      choice of the tallest grown among them, and separating it from the rest,
+      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd
+      him down dead drunk, so that he became moveless, though at first putting
+      in he struggled for a pretty while very much, till at last, certain bubbles
+      issuing out of his mouth, it ceased to move; this (because I had before found
+      them quickly to recover again, if they were taken out presently) I suffered
+      to lye above an hour in the Spirit; and after I had taken it out, and put
+      its body and legs into a natural posture, remained moveless about an hour;
+      but then, upon a sudden, as if it had been awaken out of a drunken sleep,
+      it suddenly reviv'd and ran away; being caught, and serv'd as before, he
+      for a while continued struggling and striving, till at last there issued
+      several bubbles out of its mouth, and then, tanquam animam expirasset, he
+      remained moveless for a good while ; but at length again recovering, it was
+      again redipt, and suffered to lye some hours in the Spirit; notwithstanding
+      which, after it had layen dry some three or four hours, it again recovered
+      life and motion: Which kind of Experiments, if prosecuted, which they highly
+      deserve, seem to me of no inconsiderable use towards the invention of the
+      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture
       of Bodies. </font></p>
-    <p><font size="4">Of what Figure this Creature appear'd through the Microscope, 
-      the 32. Scheme (though not so carefully graven as it ought) will represent 
-      to the eye, namely, That it had a large head A A, at the upper end of which 
-      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B; 
-      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently 
-      differing from those of a blew Fly, though indeed they seem to be both the 
-      same kind of Organ, and to serve for a kind of smelling; beyond these were 
-      two indented jaws D D, which he open'd sideways, and was able to gape them 
-      asunder very wide; and the ends of them being armed with teeth, which meeting 
-      went between each other, it was able to grasp and hold a heavy body, three 
-      or four times the bulk and weight of its own body: It had only six legs, 
-      shap'd like those of a Fly, which, as I shewed before, is an Argument that 
-      it is a winged Insect, and though I could not perceive any sign of them in 
-      the middle part of its body (which seem'd to consist of three joints or pieces 
-      E F G, out of which sprung two legs, yet 'tis known that there are of them 
+    <p><font size="4">Of what Figure this Creature appear'd through the Microscope,
+      the 32. Scheme (though not so carefully graven as it ought) will represent
+      to the eye, namely, That it had a large head A A, at the upper end of which
+      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B;
+      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently
+      differing from those of a blew Fly, though indeed they seem to be both the
+      same kind of Organ, and to serve for a kind of smelling; beyond these were
+      two indented jaws D D, which he open'd sideways, and was able to gape them
+      asunder very wide; and the ends of them being armed with teeth, which meeting
+      went between each other, it was able to grasp and hold a heavy body, three
+      or four times the bulk and weight of its own body: It had only six legs,
+      shap'd like those of a Fly, which, as I shewed before, is an Argument that
+      it is a winged Insect, and though I could not perceive any sign of them in
+      the middle part of its body (which seem'd to consist of three joints or pieces
+      E F G, out of which sprung two legs, yet 'tis known that there are of them
       that have long wings, and fly up and down in the air. </font></p>
-    <p><font size="4">The third and last part of its body I I I was bigger and 
-      larger then the other two, unto which it was joyn'd by a very small middle, 
-      and had a kind of loose shell, or another distinct part of its body H, which 
-      seem'd to be interpos'd, and to keep the thorax and belly from touching. 
-      The whole body was cas'd over with a very strong armour, and the belly I 
-      I I was covered likewise with multitudes of small white shining brisles; 
-      the legs, horns, head, and middle parts of its body were bestruck with hairs 
+    <p><font size="4">The third and last part of its body I I I was bigger and
+      larger then the other two, unto which it was joyn'd by a very small middle,
+      and had a kind of loose shell, or another distinct part of its body H, which
+      seem'd to be interpos'd, and to keep the thorax and belly from touching.
+      The whole body was cas'd over with a very strong armour, and the belly I
+      I I was covered likewise with multitudes of small white shining brisles;
+      the legs, horns, head, and middle parts of its body were bestruck with hairs
       also, but smaller and darker. </font></p>
   </blockquote>
   <p>&nbsp;</p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
index 5ac05e9f3b6..013ede9be81 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,113 +10,113 @@
 <h1 align="center">Observ. LIV. Of a Louse.<br>
 </h1>
 <p align="center">&nbsp;</p>
-<blockquote> 
-  <blockquote> 
-    <p><font size="4">This is a Creature so officious, that 'twill be known to 
-      every one at one time or other, so busie, and so impudent, that it will 
-      be intruding it self in every ones company, and so proud and aspiring withall, 
-      that it fears not to trample on the best, and affects nothing so much as 
-      a Crown; feeds and lives very high, and that makes it so saucy, as to pull 
-      any one by the ears that comes in its way, and will never be quiet till 
-      it has drawn blood: it is troubled at nothing so much as at a man that scratches 
-      his head, as knowing that man is plotting and contriving some mischief against 
-      it, and that makes it oftentime sculk into some meaner and lower place, and 
-      run behind a mans back, though it go very much against the hair; which ill 
-      conditions of it having made it better known then trusted, would exempt me 
-      from making any further description of it, did not my faithful Mercury, my 
+<blockquote>
+  <blockquote>
+    <p><font size="4">This is a Creature so officious, that 'twill be known to
+      every one at one time or other, so busie, and so impudent, that it will
+      be intruding it self in every ones company, and so proud and aspiring withall,
+      that it fears not to trample on the best, and affects nothing so much as
+      a Crown; feeds and lives very high, and that makes it so saucy, as to pull
+      any one by the ears that comes in its way, and will never be quiet till
+      it has drawn blood: it is troubled at nothing so much as at a man that scratches
+      his head, as knowing that man is plotting and contriving some mischief against
+      it, and that makes it oftentime sculk into some meaner and lower place, and
+      run behind a mans back, though it go very much against the hair; which ill
+      conditions of it having made it better known then trusted, would exempt me
+      from making any further description of it, did not my faithful Mercury, my
       Microscope, bring me other information of it. </font></p>
-    <p><font size="4">For this has discovered to me, by means of a very bright light 
-      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd 
-      like that exprest in 35. Scheme marked with A, which seems almost Conical, 
-      but is a little flatted on the upper and under sides, at the biggest part 
-      of which, on either side behind the head (as it were, being the place where 
-      other Creatures ears stand) are placed its two black shining goggle eyes 
-      B B, looking backwards, and fenced round with several small cilia or hairs 
-      that incompass it, so that it seems this Creature has no very good foresight: 
-      It does not seem to have any eyelids, and therefore perhaps its eyes were 
-      so placed, that it might the better cleanse them with its forelegs; and perhaps 
-      this may be the reason, why they so much avoid and run from the light behind 
-      them, for being made to live in the shady and dark recesses of the hair, 
-      and thence probably their eye having a great aperture, the open and clear 
-      light, especially that of the Sun, must needs very much offend them; to secure 
-      these eyes from receiving any injury from the hairs through which it passes, 
-      it has two horns that grow before it, in the place where one would have thought 
-      the eyes should be; each of these C C have four joynts, which are fringed, 
-      as 'twere, with small brisles, from which to the tip of its snout D, the 
-      head seems very round and tapering, ending in a very sharp nose D, which 
-      seems to have a small hole, and to be the passage through which he sucks 
+    <p><font size="4">For this has discovered to me, by means of a very bright light
+      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd
+      like that exprest in 35. Scheme marked with A, which seems almost Conical,
+      but is a little flatted on the upper and under sides, at the biggest part
+      of which, on either side behind the head (as it were, being the place where
+      other Creatures ears stand) are placed its two black shining goggle eyes
+      B B, looking backwards, and fenced round with several small cilia or hairs
+      that incompass it, so that it seems this Creature has no very good foresight:
+      It does not seem to have any eyelids, and therefore perhaps its eyes were
+      so placed, that it might the better cleanse them with its forelegs; and perhaps
+      this may be the reason, why they so much avoid and run from the light behind
+      them, for being made to live in the shady and dark recesses of the hair,
+      and thence probably their eye having a great aperture, the open and clear
+      light, especially that of the Sun, must needs very much offend them; to secure
+      these eyes from receiving any injury from the hairs through which it passes,
+      it has two horns that grow before it, in the place where one would have thought
+      the eyes should be; each of these C C have four joynts, which are fringed,
+      as 'twere, with small brisles, from which to the tip of its snout D, the
+      head seems very round and tapering, ending in a very sharp nose D, which
+      seems to have a small hole, and to be the passage through which he sucks
       the blood. </font></p>
     <p>&nbsp;</p>
     <p><img src="http://github.com/Octavo/bug2.jpg" width="537" height="348"></p>
-    <p><font size="4">Now whereas it if be plac'd on its back, with its belly 
-      upwards, as it is in the 35. Scheme, it seems in several Positions to have 
-      a resemblance of chaps, or jaws, as is represented in the Figure by E E, 
-      yet in other postures those dark strokes disappear; and having kept several 
-      of them in a box for two or three dayes, so that for all that time they had 
-      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately 
-      fell to sucking, and did neither seem to thrust its nose very deep into the 
-      skin, nor to open any kind of mouth, but I could plainly perceive a small 
-      current of blood, which came directly from its snout, and past into its belly; 
-      and about A there seem'd a contrivance, somewhat resembling a Pump, pair 
-      of Bellows, or Heart, for by a very swift systole and diastole the blood 
+    <p><font size="4">Now whereas it if be plac'd on its back, with its belly
+      upwards, as it is in the 35. Scheme, it seems in several Positions to have
+      a resemblance of chaps, or jaws, as is represented in the Figure by E E,
+      yet in other postures those dark strokes disappear; and having kept several
+      of them in a box for two or three dayes, so that for all that time they had
+      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately
+      fell to sucking, and did neither seem to thrust its nose very deep into the
+      skin, nor to open any kind of mouth, but I could plainly perceive a small
+      current of blood, which came directly from its snout, and past into its belly;
+      and about A there seem'd a contrivance, somewhat resembling a Pump, pair
+      of Bellows, or Heart, for by a very swift systole and diastole the blood
       seem'd drawn from the nose, and forced into the body. </font></p>
-    <p><font size="4">It did not seem at all, though I viewed it a good while as 
-      it was sucking, to thrust more of its nose into the skin then the very snout 
-      D, nor did it cause the least discernable pain, and yet the blood seem'd 
-      to run through its head very quick and freely, so that it seems there is 
-      no part of the skin but the blood is dispers'd into, nay, even into the 
-      cuticula; for had it thrust its whole nose in from D to C C, it would not 
-      have amounted to the supposed thickness of that tegument, the length of 
+    <p><font size="4">It did not seem at all, though I viewed it a good while as
+      it was sucking, to thrust more of its nose into the skin then the very snout
+      D, nor did it cause the least discernable pain, and yet the blood seem'd
+      to run through its head very quick and freely, so that it seems there is
+      no part of the skin but the blood is dispers'd into, nay, even into the
+      cuticula; for had it thrust its whole nose in from D to C C, it would not
+      have amounted to the supposed thickness of that tegument, the length of
       the nose being not more then a three hundredth part of an inch. </font></p>
-    <p><font size="4">It has six legs, covered with a very transparent shell, 
-      and joynted exactly like a Crab's, or Lobster's; each leg is divided into 
-      six parts by these joynts, and those have here and there several small hairs; 
-      and at the end of each leg it has two claws, very properly adapted for its 
-      peculiar use, being thereby inabled to walk very securely both on the skin 
-      and hair; and indeed this contrivance of the feet is very curious, and could 
-      not be made more commodiously and compendiously, for performing both these 
-      requisite motions, of walking and climbing up the hair of a mans head, then 
-      it is : for, by having the lesser claw (a) set so much short of the bigger 
-      (b) when it walks on the skin the shorter touches not, and then the feet 
-      are the same with those of a Mite, and several other small Insects, but by 
-      means of the small joynts of the longer claw it can bend it round, and so 
-      with both claws take hold of a hair, in the manner represented in the Figure, 
+    <p><font size="4">It has six legs, covered with a very transparent shell,
+      and joynted exactly like a Crab's, or Lobster's; each leg is divided into
+      six parts by these joynts, and those have here and there several small hairs;
+      and at the end of each leg it has two claws, very properly adapted for its
+      peculiar use, being thereby inabled to walk very securely both on the skin
+      and hair; and indeed this contrivance of the feet is very curious, and could
+      not be made more commodiously and compendiously, for performing both these
+      requisite motions, of walking and climbing up the hair of a mans head, then
+      it is : for, by having the lesser claw (a) set so much short of the bigger
+      (b) when it walks on the skin the shorter touches not, and then the feet
+      are the same with those of a Mite, and several other small Insects, but by
+      means of the small joynts of the longer claw it can bend it round, and so
+      with both claws take hold of a hair, in the manner represented in the Figure,
       the long transparent Cylinder F F F, being a Man's hair held by it. </font></p>
-    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then 
-      the belly, namely, with a thin transparent horny substance, which upon the fasting 
-      of the Creature did not grow flaccid; through this I could plainly see the 
-      blood, suck'd from my hand, to be variously distributed, and mov'd to and 
-      fro; and about G there seem'd a pretty big white substance, which seem'd 
-      to be moved within its thorax; besides, there appear'd very many small milk-white 
-      vessels, which crost over the breast between the legs, out of which, on 
-      either side, are many small branchings, these seem'd to be the veins and 
-      arteries, for that which is analogus to blood in all Insects is milk-white. 
+    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then
+      the belly, namely, with a thin transparent horny substance, which upon the fasting
+      of the Creature did not grow flaccid; through this I could plainly see the
+      blood, suck'd from my hand, to be variously distributed, and mov'd to and
+      fro; and about G there seem'd a pretty big white substance, which seem'd
+      to be moved within its thorax; besides, there appear'd very many small milk-white
+      vessels, which crost over the breast between the legs, out of which, on
+      either side, are many small branchings, these seem'd to be the veins and
+      arteries, for that which is analogus to blood in all Insects is milk-white.
       </font></p>
-    <p><font size="4">The belly is covered with a transparent substance likewise, 
-      but more resembling a skin then a shell, for 'tis grain'd all over the belly 
-      just like the skin in the palms of a man's hand, and when the belly is empty, 
-      grows very flaccid and wrinkled ; at the upper end of this is placed the 
-      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas, 
-      which by the peristaltick motion of the guts, is a little mov'd to and fro, 
-      not with a systole and diastole, but rather with a thronging or justling 
+    <p><font size="4">The belly is covered with a transparent substance likewise,
+      but more resembling a skin then a shell, for 'tis grain'd all over the belly
+      just like the skin in the palms of a man's hand, and when the belly is empty,
+      grows very flaccid and wrinkled ; at the upper end of this is placed the
+      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas,
+      which by the peristaltick motion of the guts, is a little mov'd to and fro,
+      not with a systole and diastole, but rather with a thronging or justling
       motion. </font></p>
-    <p><font size="4">Viewing one of these Creatures, after it had fasted two 
-      dayes, all the hinder part was lank and flaccid, and the white spot I I 
-      hardly mov'd, most of the white branchings disappear'd, and most also of 
-      the redness or sucked blood in the guts, the peristaltick motion of which 
-      was scarce discernable; but upon the suffering it to suck, it presently 
-      fill'd the skin of the belly, and of the six scolop'd embosments on either side, 
-      as full as it could be stuft ; the stomach and guts were as full as they 
-      could hold; the peristaltick motion of the gut grew quick, and the justling 
-      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly 
-      filled, and turgid, which were perhaps the veins and arteries, and the Creature 
-      was so greedy, that though it could not contain more, yet it continued sucking 
-      as fast as ever, and as fast emptying it self behind : the digestion of this 
-      Creature must needs be very quick, for though I perceiv'd the blood thicker 
-      and blacker when suck'd, yet, when in the guts, it was of a very lovely 
-      ruby colour, and that part of it, which was digested into the veins, seemed 
-      white; whence it appears, that a further digestion of blood may make it 
-      milk, at least of a resembling colour : What is else observable in the figure 
+    <p><font size="4">Viewing one of these Creatures, after it had fasted two
+      dayes, all the hinder part was lank and flaccid, and the white spot I I
+      hardly mov'd, most of the white branchings disappear'd, and most also of
+      the redness or sucked blood in the guts, the peristaltick motion of which
+      was scarce discernable; but upon the suffering it to suck, it presently
+      fill'd the skin of the belly, and of the six scolop'd embosments on either side,
+      as full as it could be stuft ; the stomach and guts were as full as they
+      could hold; the peristaltick motion of the gut grew quick, and the justling
+      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly
+      filled, and turgid, which were perhaps the veins and arteries, and the Creature
+      was so greedy, that though it could not contain more, yet it continued sucking
+      as fast as ever, and as fast emptying it self behind : the digestion of this
+      Creature must needs be very quick, for though I perceiv'd the blood thicker
+      and blacker when suck'd, yet, when in the guts, it was of a very lovely
+      ruby colour, and that part of it, which was digested into the veins, seemed
+      white; whence it appears, that a further digestion of blood may make it
+      milk, at least of a resembling colour : What is else observable in the figure
       of this Creature, maybe seen by the 35. Scheme.</font></p>
     </blockquote>
   <p>&nbsp;</p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
index 72e2c1a85d7..d802ef6cb03 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body bgcolor="#FFFFFF">
 <img src="http://github.com/Octavo/book.jpg" width="550" height="428">
@@ -19,21 +19,21 @@ <h3><a href="http://github.com/bug.html">Of a Louse</a> <br>
     <br>
     <br>
   </h3>
-  <p><font color="#990000" size="4">Images and text used by permission of Octavo 
+  <p><font color="#990000" size="4">Images and text used by permission of Octavo
     Corporation (www.octavo.com),<br>
-    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All 
+    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All
     rights reserved.</font> <br>
     <br>
     <br>
-    <font size="2">Octavo Corporation is a publisher of rare 
-    books and manuscripts with digital tools and formats through partnerships 
-    with libraries, museums, and individuals. Using high-resolution digital imaging 
-    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files 
-    which can be viewed on and printed from almost any computing platform. You 
-    can view each page and the binding on your computer screen, zoom in to view 
-    detail up to 800% in some cases, and search, copy and paste the "live" text 
-    placed invisibly behind the page images which is available for selected Editions. 
-    Also included in each edition is the work's collation and provenance, as well 
+    <font size="2">Octavo Corporation is a publisher of rare
+    books and manuscripts with digital tools and formats through partnerships
+    with libraries, museums, and individuals. Using high-resolution digital imaging
+    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files
+    which can be viewed on and printed from almost any computing platform. You
+    can view each page and the binding on your computer screen, zoom in to view
+    detail up to 800% in some cases, and search, copy and paste the "live" text
+    placed invisibly behind the page images which is available for selected Editions.
+    Also included in each edition is the work's collation and provenance, as well
     as commentary by a noted expert in its field. </font></p>
 </blockquote>
 <p>&nbsp;</p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
index 599606e0ce8..1ae22cd445d 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
@@ -1,33 +1,33 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
-<img src="http://github.com/Octavo/king.jpg" width="420" height="290"> 
+<img src="http://github.com/Octavo/king.jpg" width="420" height="290">
 <p align="center">&nbsp;</p>
-<blockquote> <font size="4">Do here most humbly lay this small Present at Your 
-  Majesties Royal feet. And though it comes accompany'd with two disadvantages, 
-  the meanness of the Author, and of the Subject; yet in both I am incouraged 
+<blockquote> <font size="4">Do here most humbly lay this small Present at Your
+  Majesties Royal feet. And though it comes accompany'd with two disadvantages,
+  the meanness of the Author, and of the Subject; yet in both I am incouraged
   by the greatness of your Mercy and your Knowledge. </font>
-<p><font size="4">By the one I am taught , that you can forgive the most presumptuous 
-    Offendors: And by the other, that you will not esteem the least work of Nature, 
+<p><font size="4">By the one I am taught , that you can forgive the most presumptuous
+    Offendors: And by the other, that you will not esteem the least work of Nature,
     or Art, unworthy your Observation. </font></p>
-  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties 
-    happy Restauration and Government, it is none of the least considerable, that 
+  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties
+    happy Restauration and Government, it is none of the least considerable, that
     Philosophy and Experimental Learning have prosper'd under your Royal Patronage.</font></p>
-  <p><font size="4">And as the calm prosperity of your Reign has given us the 
-    leisure to follow these Studies of quiet and retirement, so it is just, that 
-    the Fruits of them should, by way of acknowledgement, be return'd to your 
-    Majesty. There are, Sir, several other of your Subjects, of your Royal Society, 
-    now busie about Nobler matters: The Improvement of Manufactures and Agriculture, 
-    the Increase of Commerce, the Advantage of Navigation: In all which they are 
+  <p><font size="4">And as the calm prosperity of your Reign has given us the
+    leisure to follow these Studies of quiet and retirement, so it is just, that
+    the Fruits of them should, by way of acknowledgement, be return'd to your
+    Majesty. There are, Sir, several other of your Subjects, of your Royal Society,
+    now busie about Nobler matters: The Improvement of Manufactures and Agriculture,
+    the Increase of Commerce, the Advantage of Navigation: In all which they are
     assisted by your Majesties Incouragement and Example. </font></p>
-  <p><font size="4">Amidst all those greater Designs, I here presume to bring 
-    in that which is more proportionable to the smalness of my Abilities, and 
-    to offer some of the least of all visible things, to that Mighty King, that 
-    has establisht an Empire over the best of all Invisible things of this World, 
+  <p><font size="4">Amidst all those greater Designs, I here presume to bring
+    in that which is more proportionable to the smalness of my Abilities, and
+    to offer some of the least of all visible things, to that Mighty King, that
+    has establisht an Empire over the best of all Invisible things of this World,
     the Minds o f Men.</font></p>
   <blockquote>
     <p align="right">&nbsp;</p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
index 6318c113b2d..5ba2a2e0670 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,101 +10,101 @@
   <p>&nbsp;</p>
   <h1 align="center">THE PREFACE</h1>
  </div>
-<div align="right"> 
+<div align="right">
   <p align="left">&nbsp;</p>
   <p>&nbsp;</p>
 </div>
-<blockquote> 
+<blockquote>
   <div align="left">
-    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above 
-      other Creatures, that we are not only able to behold the works of Nature, 
-      or barely to sustein our lives by them, but we have also the power of considering, 
+    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above
+      other Creatures, that we are not only able to behold the works of Nature,
+      or barely to sustein our lives by them, but we have also the power of considering,
       comparing, altering, assisting, and improving them to various uses. </font></font></p>
-    <p><font size="4">And as this is the peculiar priviledge of humane Nature 
-      in general, so is it capable of being so far advanced by the helps of Art, 
-      and Experience, as to make some Men excel others in their Observations, 
+    <p><font size="4">And as this is the peculiar priviledge of humane Nature
+      in general, so is it capable of being so far advanced by the helps of Art,
+      and Experience, as to make some Men excel others in their Observations,
       and Deductions, almost as much as they do Beasts. </font></p>
-    <p><font size="4">By the addition of such artificial Instruments and methods, 
-      there may be, in some manner, a reparation made for the mischiefs, and imperfection, 
-      mankind has drawn upon itself, by negligence, and intemperance, and a wilful 
-      and superstitious deserting the Prescripts and Rules of Nature, whereby 
-      every man, both from a deriv'd corruption, innate and born with him, and 
-      from his breeding and converse with men, is very subject to slip into all 
+    <p><font size="4">By the addition of such artificial Instruments and methods,
+      there may be, in some manner, a reparation made for the mischiefs, and imperfection,
+      mankind has drawn upon itself, by negligence, and intemperance, and a wilful
+      and superstitious deserting the Prescripts and Rules of Nature, whereby
+      every man, both from a deriv'd corruption, innate and born with him, and
+      from his breeding and converse with men, is very subject to slip into all
       sorts of errors. </font></p>
-    <p><font size="4">The only way which now remains for us to recover some degree 
-      of those former perfections, seems to be, by rectifying the operations of 
-      the Sense, the Memory, and Reason, since upon the evidence, the strength, 
-      the integrity, and the right correspondence of all these, all the light, 
-      by which our actions are to be guided, is to be renewed, and all our command 
+    <p><font size="4">The only way which now remains for us to recover some degree
+      of those former perfections, seems to be, by rectifying the operations of
+      the Sense, the Memory, and Reason, since upon the evidence, the strength,
+      the integrity, and the right correspondence of all these, all the light,
+      by which our actions are to be guided, is to be renewed, and all our command
       over things is to be establisht.</font></p>
-    <p><font size="4"> It is therefore most worthy of our consideration, to recollect 
-      their several defects, that so we may the better understand how to supply 
-      them, and by what assistances we may inlarge their power, and secure them 
+    <p><font size="4"> It is therefore most worthy of our consideration, to recollect
+      their several defects, that so we may the better understand how to supply
+      them, and by what assistances we may inlarge their power, and secure them
       in performing their particular duties.</font></p>
-    <p><font size="4">As for the actions of our Senses, we cannot but observe 
-      them to be in many particulars much outdone by those of other Creatures, 
-      and when at best, to be far short of the perfection they seem capable of 
-      : And these infirmities of the Senses arise from a double cause, either 
-      from the disproportion of the Object to the Organ, whereby an infinite number 
-      of things can never enter into them, or else from error in the Perception, 
-      that many things, which come within their reach, are not received in a right 
+    <p><font size="4">As for the actions of our Senses, we cannot but observe
+      them to be in many particulars much outdone by those of other Creatures,
+      and when at best, to be far short of the perfection they seem capable of
+      : And these infirmities of the Senses arise from a double cause, either
+      from the disproportion of the Object to the Organ, whereby an infinite number
+      of things can never enter into them, or else from error in the Perception,
+      that many things, which come within their reach, are not received in a right
       manner. </font></p>
-    <p><font size="4">The like frailties are to be found in the Memory; we often 
-      let many things slip away from us, which deserve to be retain'd; and of 
-      those which we treasure up, a great part is either frivolous or false ; 
-      and if good, and substantial, either in tract of time obliterated, or at 
-      best so overwhelmed and buried under more frothy notions, that when there 
+    <p><font size="4">The like frailties are to be found in the Memory; we often
+      let many things slip away from us, which deserve to be retain'd; and of
+      those which we treasure up, a great part is either frivolous or false ;
+      and if good, and substantial, either in tract of time obliterated, or at
+      best so overwhelmed and buried under more frothy notions, that when there
       is need of them, they are in vain sought for. </font></p>
-    <p><font size="4">The two main foundations being so deceivable, it is no wonder, 
-      that all the succeeding works which we build upon them, of arguing, concluding, 
-      defining, judging, and all the other degrees of Reason, are lyable to the 
-      same imperfection, being, at best, either vain, or uncertain: So that the 
-      errors of the understanding are answerable to the two other, being defective 
-      both in the quantity and goodness of its knowledge; for the limits, to which 
-      our thoughts are confind, are small in respect of the vast extent of Nature 
-      it self; some parts of it are too large to be comprehended, and some too 
+    <p><font size="4">The two main foundations being so deceivable, it is no wonder,
+      that all the succeeding works which we build upon them, of arguing, concluding,
+      defining, judging, and all the other degrees of Reason, are lyable to the
+      same imperfection, being, at best, either vain, or uncertain: So that the
+      errors of the understanding are answerable to the two other, being defective
+      both in the quantity and goodness of its knowledge; for the limits, to which
+      our thoughts are confind, are small in respect of the vast extent of Nature
+      it self; some parts of it are too large to be comprehended, and some too
       little to be perceived. </font></p>
-    <p><font size="4">And from thence it must follow, that not having a full sensation 
-      of the Object, we must be very lame and imperfect in our conceptions about 
-      it, and in all the propositions which we build upon it; hence we often take 
-      the shadow of things for the substance, small appearances for good similitudes, 
-      similitudes for definitions; and even many of those, which we think to be 
-      the most solid definitions, are rather expressions of our own misguided 
+    <p><font size="4">And from thence it must follow, that not having a full sensation
+      of the Object, we must be very lame and imperfect in our conceptions about
+      it, and in all the propositions which we build upon it; hence we often take
+      the shadow of things for the substance, small appearances for good similitudes,
+      similitudes for definitions; and even many of those, which we think to be
+      the most solid definitions, are rather expressions of our own misguided
       apprehensions then of the true nature of the things themselves. </font></p>
-    <p><font size="4">The effects of these imperfections are manifested in different 
-      ways, according to the temper and disposition of the several minds of men, 
-      some they incline to gross ignorance and stupidity, and others to a presumptuous 
-      imposing on other mens Opinions, and a confident dogmatizing on matters, 
+    <p><font size="4">The effects of these imperfections are manifested in different
+      ways, according to the temper and disposition of the several minds of men,
+      some they incline to gross ignorance and stupidity, and others to a presumptuous
+      imposing on other mens Opinions, and a confident dogmatizing on matters,
       whereof there is no assurance to be given. </font></p>
-    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions, 
-      proceed either from the narrowness and wandring of our Senses, from the 
-      slipperiness or delusion of our Memory, from the confinement or rashness 
-      of our Understanding, so that 'tis no wonder, that our power over natural 
-      causes and effects is so slowly improvd, seeing we are not only to contend 
-      with the obscurity and difficulty of the things whereon we work and think, 
+    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions,
+      proceed either from the narrowness and wandring of our Senses, from the
+      slipperiness or delusion of our Memory, from the confinement or rashness
+      of our Understanding, so that 'tis no wonder, that our power over natural
+      causes and effects is so slowly improvd, seeing we are not only to contend
+      with the obscurity and difficulty of the things whereon we work and think,
       but even the forces of our own minds conspire to betray us. </font></p>
-    <p><font size="4">These being the dangers in the process of humane Reason, 
-      the remedies of them all can only proceed from the real, the mechanical, 
-      the experimental Philosophy, which has this advantage over the Philosophy 
-      of discourse and disputation, that whereas that chiefly aims at the subtilty 
-      of its Deductions and Conclusions, without much regard to the first groundwork, 
-      which ought to be well laid on the Sense and Memory ; so this intends the 
-      right ordering of them all, and the making them serviceable to each other. 
+    <p><font size="4">These being the dangers in the process of humane Reason,
+      the remedies of them all can only proceed from the real, the mechanical,
+      the experimental Philosophy, which has this advantage over the Philosophy
+      of discourse and disputation, that whereas that chiefly aims at the subtilty
+      of its Deductions and Conclusions, without much regard to the first groundwork,
+      which ought to be well laid on the Sense and Memory ; so this intends the
+      right ordering of them all, and the making them serviceable to each other.
       </font></p>
-    <p><font size="4">The first thing to be undertaken in this weighty work, is 
-      a watchfulness over the failings and an inlargement of the dominion, of 
-      the Senses. To which end it is requisite, first, That there should be a 
-      scrupulous choice, and a strict examination, of the reality, constancy, 
-      and certainty of the Particulars that we admit: This is the first rise whereon 
-      truth is to begin, and here the most severe, and most impartial diligence, 
-      must be imployed ; the storing up of all, without any regard to evidence 
+    <p><font size="4">The first thing to be undertaken in this weighty work, is
+      a watchfulness over the failings and an inlargement of the dominion, of
+      the Senses. To which end it is requisite, first, That there should be a
+      scrupulous choice, and a strict examination, of the reality, constancy,
+      and certainty of the Particulars that we admit: This is the first rise whereon
+      truth is to begin, and here the most severe, and most impartial diligence,
+      must be imployed ; the storing up of all, without any regard to evidence
       or use, will only tend to darkness and confusion. </font></p>
-    <p><font size="4">We must not therefore esteem the riches of our Philosophical 
-      treasure by the number only, but chiefly by the weight; the most vulgar 
-      Instances are not to be neglected, but above all, the most instructive are 
-      to be entertain'd: the footsteps of Nature are to be trac'd, not only in 
-      her ordinary course,but when she seems to be put to her shifts, to make 
-      many doublings and turnings, and to use some kind of art in indeavouring 
+    <p><font size="4">We must not therefore esteem the riches of our Philosophical
+      treasure by the number only, but chiefly by the weight; the most vulgar
+      Instances are not to be neglected, but above all, the most instructive are
+      to be entertain'd: the footsteps of Nature are to be trac'd, not only in
+      her ordinary course,but when she seems to be put to her shifts, to make
+      many doublings and turnings, and to use some kind of art in indeavouring
       to avoid our discovery. </font></p>
     <p>&nbsp;</p>
     <p><a href="http://github.com/king.html"><img src="http://github.com/editorpane/back.jpg" width="146" height="40" align="left" border="0"></a><a href="http://github.com/seaweed.html" name="seaweed"><img src="http://github.com/editorpane/forward.jpg" width="196" height="40" align="right" border="0"></a></p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
index 1aeaeadaf6f..bef74bf3979 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -11,47 +11,47 @@ <h1 align="center"><br>
 </h1>
 <p align="center">&nbsp;</p>
 <blockquote>
-  <p><font size="4">For curiosity and beauty, I have not among all the Plants 
-    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed 
-    I have here describ'd, of which I am able to say very little more then what 
-    is represented by the second Figure of the ninth Scheme: Namely, that it is 
-    a Plant which grows upon the Rocks under the water, and increases and spreads 
-    it self into a great tuft, which is not onely handsomely branch'd into several 
-    leaves, but the whole surface of the Plant is cover'd over with a most curious 
-    kind of carv'd work, which consists of a texture much resembling a Honeycomb; 
-    for the whole surface on both sides is cover'd over with a multitude of very 
-    small holes, being no bigger then so many holes made with the point of a small 
-    Pinn, and rang'd in the neatest and most delicate order imaginable, they being 
-    plac'd in the manner of a Quincunx, or very much like the rows of the eyes 
-    of a Fly, the rows or orders being very regular, which way soever they are 
-    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying 
-    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which 
-    round Area A B C D represents a part of the surface about one eighth part 
-    of an Inch in Diameter: Those little holes, which to the eye look'd round, 
-    like so many little spots, here appear'd very regularly shap'd holes, representing 
-    almost the shape of the sole of a round toed shoe, the hinder part of which, 
-    is, as it were, trod on or cover'd by the toe of that next below it; these 
-    holes seem'd wall'd about with a very thin and transparent substance, looking 
-    of a pale straw-colour; from the edge of which, against the middle of each 
-    hole, were sprouted out four small transparent straw-colour'd Thorns, which 
-    seem'd to protect and cover those cavities, from either side two; neer the 
-    root of this Plant, were sprouted out several small branches of a kind of 
+  <p><font size="4">For curiosity and beauty, I have not among all the Plants
+    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed
+    I have here describ'd, of which I am able to say very little more then what
+    is represented by the second Figure of the ninth Scheme: Namely, that it is
+    a Plant which grows upon the Rocks under the water, and increases and spreads
+    it self into a great tuft, which is not onely handsomely branch'd into several
+    leaves, but the whole surface of the Plant is cover'd over with a most curious
+    kind of carv'd work, which consists of a texture much resembling a Honeycomb;
+    for the whole surface on both sides is cover'd over with a multitude of very
+    small holes, being no bigger then so many holes made with the point of a small
+    Pinn, and rang'd in the neatest and most delicate order imaginable, they being
+    plac'd in the manner of a Quincunx, or very much like the rows of the eyes
+    of a Fly, the rows or orders being very regular, which way soever they are
+    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying
+    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which
+    round Area A B C D represents a part of the surface about one eighth part
+    of an Inch in Diameter: Those little holes, which to the eye look'd round,
+    like so many little spots, here appear'd very regularly shap'd holes, representing
+    almost the shape of the sole of a round toed shoe, the hinder part of which,
+    is, as it were, trod on or cover'd by the toe of that next below it; these
+    holes seem'd wall'd about with a very thin and transparent substance, looking
+    of a pale straw-colour; from the edge of which, against the middle of each
+    hole, were sprouted out four small transparent straw-colour'd Thorns, which
+    seem'd to protect and cover those cavities, from either side two; neer the
+    root of this Plant, were sprouted out several small branches of a kind of
     bastard Coralline, curiously branch'd, though small. </font></p>
-  <p><font size="4">And to confirm this, having lately the opportunity of viewing 
-    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made 
-    mention in the last Observation, I found, that each of the Branches or Figures 
-    of it, did, by the range of its pores, exhibit just such a texture, the rows 
-    of pores crossing one another, much after the manner as the rows of eyes do 
-    which are describ'd in the 26. Scheme : Coralline also, and several sorts of 
-    white Coral, I have with a Microscope observ'd very curiously shap'd. And 
-    I doubt not, but that he that shall observe these several kinds of Plants that 
-    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others 
-    which are vomited out of it upon the shore, may find multitudes of little 
-    Plants, and other bodies, which like this will afford very beautifull objects 
-    for the Microscope ; and this Specimen here is adjoin'd onely to excite their 
-    curiosities who have opportunity of observing to examine and collect what 
-    they find worthy their notice; for the Sea, among terrestrial bodies, is also 
-    a prolifick mother, and affords as many Instances of spontaneous generations 
+  <p><font size="4">And to confirm this, having lately the opportunity of viewing
+    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made
+    mention in the last Observation, I found, that each of the Branches or Figures
+    of it, did, by the range of its pores, exhibit just such a texture, the rows
+    of pores crossing one another, much after the manner as the rows of eyes do
+    which are describ'd in the 26. Scheme : Coralline also, and several sorts of
+    white Coral, I have with a Microscope observ'd very curiously shap'd. And
+    I doubt not, but that he that shall observe these several kinds of Plants that
+    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others
+    which are vomited out of it upon the shore, may find multitudes of little
+    Plants, and other bodies, which like this will afford very beautifull objects
+    for the Microscope ; and this Specimen here is adjoin'd onely to excite their
+    curiosities who have opportunity of observing to examine and collect what
+    they find worthy their notice; for the Sea, among terrestrial bodies, is also
+    a prolifick mother, and affords as many Instances of spontaneous generations
     as either the Air or Earth.</font></p>
   <p>&nbsp;</p>
   <p><a href="http://github.com/preface.html"><img src="http://github.com/editorpane/back.jpg" width="146" height="40" align="left" border="0"></a><a href="http://github.com/ant.html" name="ant"><img src="http://github.com/editorpane/forward.jpg" width="196" height="40" align="right" border="0"></a></p>
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
index b83e4d3813f..2e8c6955731 100644
--- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -15,17 +15,17 @@ <h1 align="center"><font size="+1"><b><font size="+4" color="#990033"><br>
 <p align="center"> <b>MADE BY </b></p>
 <p align="center"><font size="5" color="#9F1040">MAGNIFYING GLASSES. </font></p>
 <p align="center"><b>WITH </b></p>
-<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b> 
+<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b>
   thereupon.</p>
-<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i> 
+<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i>
   ,</i></b> Fellow of the <font color="#990033">ROYAL SOCIETY</font> .</p>
-<blockquote> 
-  <blockquote> 
-    <blockquote> 
-      <p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo. 
-        Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font> 
-        Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to 
-        be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M 
+<blockquote>
+  <blockquote>
+    <blockquote>
+      <p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo.
+        Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font>
+        Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to
+        be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M
         D C L X V.</font></p>
       <p align="center"><font color="#990000"><br>
         </font></p>

From a3e094e1a0716adf52dad6407eb7877682beec92 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 14 May 2025 06:42:07 +0000
Subject: [PATCH 450/901] 8354968: Replace unicode sequences in comment text
 with UTF-8 characters

Reviewed-by: naoto
---
 src/java.base/share/classes/java/text/Collator.java       | 2 +-
 .../share/classes/java/text/RuleBasedCollator.java        | 2 +-
 src/java.base/share/classes/java/util/LocaleISOData.java  | 8 ++++----
 .../share/classes/com/sun/tools/javac/api/JavacTool.java  | 2 +-
 .../com/sun/tools/javac/util/PropagatedException.java     | 2 +-
 .../internal/joptsimple/util/InetAddressConverter.java    | 2 +-
 .../java/lang/Class/getEnclosingClass/EnclosingClass.java | 2 +-
 .../lang/Class/getEnclosingClass/EnclosingClassTest.java  | 3 +--
 .../java/lang/Class/getEnclosingClass/common/TestMe.java  | 2 +-
 test/jdk/java/util/Collections/T5078378.java              | 2 +-
 test/langtools/tools/javac/6330920/T6330920.java          | 2 +-
 test/langtools/tools/javac/6457284/T6457284.java          | 2 +-
 .../tools/javac/OverrideChecks/InterfaceImplements.java   | 2 +-
 .../tools/javac/OverrideChecks/InterfaceOverride.java     | 2 +-
 test/langtools/tools/javac/OverrideChecks/Private.java    | 2 +-
 test/langtools/tools/javac/OverrideChecks/T6326485.java   | 2 +-
 test/langtools/tools/javac/T4093617/T4093617.java         | 3 +--
 test/langtools/tools/javac/T4848619/T4848619a.java        | 2 +-
 test/langtools/tools/javac/T4848619/T4848619b.java        | 2 +-
 test/langtools/tools/javac/T4994049/DeprecatedYES.java    | 2 +-
 test/langtools/tools/javac/T4994049/T4994049.java         | 2 +-
 test/langtools/tools/javac/T5003235/T5003235a.java        | 2 +-
 test/langtools/tools/javac/T5003235/T5003235b.java        | 2 +-
 test/langtools/tools/javac/T5003235/T5003235c.java        | 2 +-
 test/langtools/tools/javac/T5092545.java                  | 2 +-
 test/langtools/tools/javac/T5105890.java                  | 2 +-
 test/langtools/tools/javac/T6180021/AbstractSub.java      | 2 +-
 test/langtools/tools/javac/T6180021/Sub.java              | 2 +-
 test/langtools/tools/javac/T6231246/T6231246.java         | 2 +-
 test/langtools/tools/javac/T6231847.java                  | 2 +-
 test/langtools/tools/javac/T6266772.java                  | 2 +-
 test/langtools/tools/javac/T6407257.java                  | 2 +-
 .../tools/javac/annotations/neg/NoAnnotationMethods.java  | 2 +-
 test/langtools/tools/javac/annotations/neg/NoClone.java   | 2 +-
 .../tools/javac/annotations/neg/NoObjectMethods.java      | 2 +-
 .../tools/javac/annotations/pos/AnnotationMethods.java    | 2 +-
 test/langtools/tools/javac/api/6400303/T6400303.java      | 2 +-
 test/langtools/tools/javac/api/6410643/T6410643.java      | 2 +-
 test/langtools/tools/javac/api/6411310/T6411310.java      | 2 +-
 test/langtools/tools/javac/api/6411333/T6411333.java      | 2 +-
 test/langtools/tools/javac/api/6412656/T6412656.java      | 2 +-
 test/langtools/tools/javac/api/6415780/T6415780.java      | 2 +-
 test/langtools/tools/javac/api/6418694/T6418694.java      | 2 +-
 test/langtools/tools/javac/api/6420409/T6420409.java      | 2 +-
 test/langtools/tools/javac/api/6421111/T6421111.java      | 2 +-
 test/langtools/tools/javac/api/6421756/T6421756.java      | 2 +-
 test/langtools/tools/javac/api/6422215/T6422215.java      | 2 +-
 test/langtools/tools/javac/api/6422327/T6422327.java      | 2 +-
 test/langtools/tools/javac/api/6423003/T6423003.java      | 2 +-
 test/langtools/tools/javac/api/6431257/T6431257.java      | 2 +-
 test/langtools/tools/javac/api/6437999/T6437999.java      | 2 +-
 test/langtools/tools/javac/api/6440333/T6440333.java      | 2 +-
 test/langtools/tools/javac/api/6440528/T6440528.java      | 2 +-
 test/langtools/tools/javac/api/6452876/T6452876.java      | 2 +-
 test/langtools/tools/javac/api/6468404/T6468404.java      | 2 +-
 test/langtools/tools/javac/api/6471599/Main.java          | 2 +-
 test/langtools/tools/javac/api/Sibling.java               | 2 +-
 test/langtools/tools/javac/api/T6257235.java              | 2 +-
 test/langtools/tools/javac/api/T6258271.java              | 2 +-
 test/langtools/tools/javac/api/T6265137.java              | 2 +-
 test/langtools/tools/javac/api/T6306137.java              | 2 +-
 test/langtools/tools/javac/api/T6358786.java              | 2 +-
 test/langtools/tools/javac/api/T6397104.java              | 2 +-
 test/langtools/tools/javac/api/T6400205.java              | 2 +-
 test/langtools/tools/javac/api/T6400207.java              | 2 +-
 test/langtools/tools/javac/api/T6407011.java              | 2 +-
 test/langtools/tools/javac/api/TestEvalExpression.java    | 2 +-
 test/langtools/tools/javac/api/TestGetSourceVersions.java | 2 +-
 test/langtools/tools/javac/api/TestGetTree.java           | 2 +-
 test/langtools/tools/javac/api/TestJavacTask.java         | 2 +-
 test/langtools/tools/javac/api/TestJavacTaskScanner.java  | 2 +-
 test/langtools/tools/javac/api/TestOperators.java         | 2 +-
 test/langtools/tools/javac/api/TestResolveIdent.java      | 2 +-
 test/langtools/tools/javac/boxing/T5082929.java           | 2 +-
 test/langtools/tools/javac/boxing/T6348760.java           | 2 +-
 test/langtools/tools/javac/cast/5043020/T5043020.java     | 2 +-
 test/langtools/tools/javac/cast/6302214/T6302214a.java    | 2 +-
 test/langtools/tools/javac/enum/6424358/T6424358.java     | 2 +-
 test/langtools/tools/javac/enum/NoFinal.java              | 2 +-
 test/langtools/tools/javac/enum/NoFinal2.java             | 2 +-
 test/langtools/tools/javac/enum/NoFinal3.java             | 2 +-
 test/langtools/tools/javac/enum/NoFinal4.java             | 2 +-
 test/langtools/tools/javac/enum/NoFinal5.java             | 2 +-
 test/langtools/tools/javac/enum/OkFinal.java              | 2 +-
 test/langtools/tools/javac/enum/T5075242.java             | 2 +-
 test/langtools/tools/javac/enum/T5081785.java             | 2 +-
 test/langtools/tools/javac/enum/forwardRef/T6425594.java  | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum1.java | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum2.java | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum3.java | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum4.java | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum5.java | 2 +-
 test/langtools/tools/javac/enum/forwardRef/TestEnum6.java | 2 +-
 test/langtools/tools/javac/generics/5086027/T5086027.java | 2 +-
 .../tools/javac/generics/5086027/T5086027pos.java         | 2 +-
 test/langtools/tools/javac/generics/6192945/Method.java   | 2 +-
 test/langtools/tools/javac/generics/6207386/Test.java     | 2 +-
 test/langtools/tools/javac/generics/6227936/T6227936.java | 2 +-
 .../langtools/tools/javac/generics/6245699/T6245699c.java | 2 +-
 test/langtools/tools/javac/generics/6292765/T6292765.java | 2 +-
 test/langtools/tools/javac/generics/6332204/T6332204.java | 2 +-
 test/langtools/tools/javac/generics/6413682/TestPos.java  | 2 +-
 test/langtools/tools/javac/generics/T6391995.java         | 2 +-
 .../tools/javac/generics/inference/5073060/Neg.java       | 2 +-
 .../tools/javac/generics/inference/5073060/T5073060a.java | 2 +-
 .../tools/javac/generics/inference/5081782/Neg.java       | 2 +-
 .../tools/javac/generics/inference/5081782/Pos.java       | 2 +-
 .../tools/javac/generics/inference/6215213/T6215213.java  | 2 +-
 .../tools/javac/generics/inference/6278587/T6278587.java  | 2 +-
 .../javac/generics/inference/6278587/T6278587Neg.java     | 2 +-
 .../tools/javac/generics/inference/6302954/T6456971.java  | 2 +-
 .../tools/javac/generics/inference/6359106/T6359106.java  | 2 +-
 .../tools/javac/generics/rawOverride/AttributeSet.java    | 2 +-
 .../langtools/tools/javac/generics/rawOverride/Fail1.java | 2 +-
 .../tools/javac/generics/rawOverride/T6178365.java        | 2 +-
 .../langtools/tools/javac/generics/rawOverride/Warn1.java | 2 +-
 .../langtools/tools/javac/generics/rawOverride/Warn2.java | 2 +-
 .../tools/javac/generics/typevars/4856983/T4856983.java   | 2 +-
 .../tools/javac/generics/typevars/4856983/T4856983a.java  | 2 +-
 .../tools/javac/generics/typevars/4856983/T4856983b.java  | 2 +-
 .../javac/generics/typevars/5060485/Compatibility.java    | 2 +-
 .../tools/javac/generics/typevars/5060485/Method.java     | 2 +-
 .../tools/javac/generics/typevars/5060485/Neg1.java       | 2 +-
 .../tools/javac/generics/typevars/5060485/Neg2.java       | 2 +-
 .../tools/javac/generics/typevars/5060485/Pos.java        | 2 +-
 .../tools/javac/generics/typevars/6182630/T6182630.java   | 2 +-
 .../tools/javac/generics/typevars/6486430/T6486430.java   | 2 +-
 .../tools/javac/generics/typevars/6486430/T6486430a.java  | 2 +-
 .../tools/javac/generics/wildcards/6330931/T6330931.java  | 2 +-
 .../tools/javac/generics/wildcards/6437894/T6437894.java  | 2 +-
 .../tools/javac/generics/wildcards/T5097548.java          | 2 +-
 .../tools/javac/generics/wildcards/T5097548b.java         | 2 +-
 test/langtools/tools/javac/jvm/6397652/T6397652.java      | 2 +-
 test/langtools/tools/javac/nested/5009484/Y.java          | 2 +-
 test/langtools/tools/javac/overload/T4494762.java         | 2 +-
 test/langtools/tools/javac/positions/T6402077.java        | 2 +-
 test/langtools/tools/javac/positions/T6404194.java        | 2 +-
 .../tools/javac/processing/6359313/T6359313.java          | 2 +-
 .../tools/javac/processing/6413690/T6413690.java          | 2 +-
 .../tools/javac/processing/model/6194785/T6194785.java    | 2 +-
 .../javac/processing/model/testgetallmembers/Main.java    | 2 +-
 test/langtools/tools/javac/processing/options/Xprint.java | 2 +-
 test/langtools/tools/javac/scope/6225935/T6214959.java    | 2 +-
 test/langtools/tools/javac/scope/6225935/T6225935.java    | 2 +-
 test/langtools/tools/javac/scope/6225935/T6381787.java    | 2 +-
 test/langtools/tools/javac/scope/6225935/Test.java        | 2 +-
 test/langtools/tools/javac/scope/6392998/T6392998.java    | 2 +-
 test/langtools/tools/javac/unicode/FirstChar.java         | 2 +-
 test/langtools/tools/javac/unit/T6198196.java             | 2 +-
 .../javac/unit/util/convert/EnclosingCandidates.java      | 2 +-
 .../tools/javac/unit/util/list/AbstractList.java          | 2 +-
 test/langtools/tools/javac/unit/util/list/FromArray.java  | 2 +-
 test/langtools/tools/javac/util/filemanager/TestName.java | 2 +-
 153 files changed, 156 insertions(+), 158 deletions(-)

diff --git a/src/java.base/share/classes/java/text/Collator.java b/src/java.base/share/classes/java/text/Collator.java
index 78fb7c654b6..7f6db310366 100644
--- a/src/java.base/share/classes/java/text/Collator.java
+++ b/src/java.base/share/classes/java/text/Collator.java
@@ -138,7 +138,7 @@ public abstract class Collator
      * Collator strength value.  When set, only SECONDARY and above differences are
      * considered significant during comparison. The assignment of strengths
      * to language features is locale dependent. A common example is for
-     * different accented forms of the same base letter ("a" vs "\u00E4") to be
+     * different accented forms of the same base letter ("a" vs "ä" (U+00E9)) to be
      * considered a SECONDARY difference.
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
diff --git a/src/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java
index 045ca6e8e9b..dc45dafb846 100644
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java
@@ -591,7 +591,7 @@ public synchronized CollationKey getCollationKey(String source)
         // Here's a hypothetical example, with the collation element represented as
         // a three-digit number, one digit for primary, one for secondary, etc.
         //
-        // String:              A     a     B   \u00e9 <--(e-acute)
+        // String:              A     a     B   é (U+00E9, e-acute)
         // Collation Elements: 101   100   201  510
         //
         // Collation Key:      1125<null>0001<null>1010
diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java
index d102ad5c87e..403e3f90bea 100644
--- a/src/java.base/share/classes/java/util/LocaleISOData.java
+++ b/src/java.base/share/classes/java/util/LocaleISOData.java
@@ -145,7 +145,7 @@ class LocaleISOData {
         + "mt" + "mlt"  // Maltese
         + "my" + "mya"  // Burmese
         + "na" + "nau"  // Nauru
-        + "nb" + "nob"  // Norwegian Bokm\u00e5l
+        + "nb" + "nob"  // Norwegian Bokmål
         + "nd" + "nde"  // North Ndebele
         + "ne" + "nep"  // Nepali
         + "ng" + "ndo"  // Ndonga
@@ -209,7 +209,7 @@ class LocaleISOData {
         + "uz" + "uzb"  // Uzbek
         + "ve" + "ven"  // Venda
         + "vi" + "vie"  // Vietnamese
-        + "vo" + "vol"  // Volap\u00fck
+        + "vo" + "vol"  // Volapük
         + "wa" + "wln"  // Walloon
         + "wo" + "wol"  // Wolof
         + "xh" + "xho"  // Xhosa
@@ -250,7 +250,7 @@ class LocaleISOData {
         + "BH" + "BHR"  // Bahrain, Kingdom of
         + "BI" + "BDI"  // Burundi, Republic of
         + "BJ" + "BEN"  // Benin, People's Republic of
-        + "BL" + "BLM"  // Saint Barth\u00e9lemy
+        + "BL" + "BLM"  // Saint Barthélemy
         + "BM" + "BMU"  // Bermuda
         + "BN" + "BRN"  // Brunei Darussalam
         + "BO" + "BOL"  // Bolivia, Plurinational State of
@@ -278,7 +278,7 @@ class LocaleISOData {
 //      + "CS" + "SCG"  // Serbia and Montenegro
         + "CU" + "CUB"  // Cuba, Republic of
         + "CV" + "CPV"  // Cape Verde, Republic of
-        + "CW" + "CUW"  // Cura\u00e7ao
+        + "CW" + "CUW"  // Curaçao
         + "CX" + "CXR"  // Christmas Island
         + "CY" + "CYP"  // Cyprus, Republic of
         + "CZ" + "CZE"  // Czech Republic
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
index 13094f927c4..fd5af24e5fd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java
@@ -63,7 +63,7 @@
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
  *
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 public final class JavacTool implements JavaCompiler {
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
index 1df24181b2a..8f5fa83e05a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/PropagatedException.java
@@ -33,7 +33,7 @@
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
  *
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 public class PropagatedException extends RuntimeException {
 
diff --git a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
index 6d7056cd616..46c4b8e3168 100644
--- a/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
+++ b/src/jdk.internal.opt/share/classes/jdk/internal/joptsimple/util/InetAddressConverter.java
@@ -66,7 +66,7 @@
 /**
  * Converts values to {@link java.net.InetAddress} using {@link InetAddress#getByName(String) getByName}.
  *
- * @author <a href="/service/mailto:r@ymund.de">Raymund F\u00FCl\u00F6p</a>
+ * @author <a href="/service/mailto:r@ymund.de">Raymund Fülöp</a>
  */
 public class InetAddressConverter implements ValueConverter<InetAddress> {
     public InetAddress convert( String value ) {
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
index 8b1a905d0a1..f458a0a6b00 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClass.java
@@ -24,7 +24,7 @@
 /*
  *
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * a) Top level classes
  * b) Nested classes (static member classes)
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
index d4c87817ef8..156d42dd6f8 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/EnclosingClassTest.java
@@ -28,7 +28,7 @@
  * @modules jdk.compiler
  * @run testng/othervm EnclosingClassTest
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 import java.io.BufferedReader;
@@ -206,4 +206,3 @@ private void test(Object tests) {
         }
     }
 }
-
diff --git a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
index 046c766d474..220542239a0 100644
--- a/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
+++ b/test/jdk/java/lang/Class/getEnclosingClass/common/TestMe.java
@@ -23,7 +23,7 @@
 
 /*
  * @summary Check getEnclosingClass and other methods
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 package common;
diff --git a/test/jdk/java/util/Collections/T5078378.java b/test/jdk/java/util/Collections/T5078378.java
index 19ffb9471ea..d3c9c198e70 100644
--- a/test/jdk/java/util/Collections/T5078378.java
+++ b/test/jdk/java/util/Collections/T5078378.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5078378
  * @summary REGRESSION: Some calls to Collections.binarySearch no longer compile
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile T5078378.java
  * @compile/fail -Xlint:unchecked -Werror T5078378.java
diff --git a/test/langtools/tools/javac/6330920/T6330920.java b/test/langtools/tools/javac/6330920/T6330920.java
index e9e31577295..39a65954dbc 100644
--- a/test/langtools/tools/javac/6330920/T6330920.java
+++ b/test/langtools/tools/javac/6330920/T6330920.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     6330920
  * @summary Verify that javac doesn't duplicate method error on method with error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6330920.out -XDrawDiagnostics T6330920.java
  */
 
diff --git a/test/langtools/tools/javac/6457284/T6457284.java b/test/langtools/tools/javac/6457284/T6457284.java
index a2a5b8a3f9c..f40d569ad91 100644
--- a/test/langtools/tools/javac/6457284/T6457284.java
+++ b/test/langtools/tools/javac/6457284/T6457284.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6457284
  * @summary Internationalize "unnamed package" when the term is used in diagnostics
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.util
  */
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
index 205ee3fa8a4..bb248b13ea1 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceImplements.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile InterfaceImplements.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
index d985a41fe97..0b7b9de6857 100644
--- a/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
+++ b/test/langtools/tools/javac/OverrideChecks/InterfaceOverride.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile InterfaceOverride.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/Private.java b/test/langtools/tools/javac/OverrideChecks/Private.java
index 1b52fbfe461..b69e3601228 100644
--- a/test/langtools/tools/javac/OverrideChecks/Private.java
+++ b/test/langtools/tools/javac/OverrideChecks/Private.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6399361
  * @summary java.lang.Override specification should be revised
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Private.out -XDrawDiagnostics  Private.java
  */
 
diff --git a/test/langtools/tools/javac/OverrideChecks/T6326485.java b/test/langtools/tools/javac/OverrideChecks/T6326485.java
index 8b4622d8304..76b3e64f954 100644
--- a/test/langtools/tools/javac/OverrideChecks/T6326485.java
+++ b/test/langtools/tools/javac/OverrideChecks/T6326485.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6326485
  * @summary Compiler does not enforce rule that interfaces may not use Override annotation
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6326485.java
  */
 
diff --git a/test/langtools/tools/javac/T4093617/T4093617.java b/test/langtools/tools/javac/T4093617/T4093617.java
index 8fa7dfaca55..35b6dcaadb8 100644
--- a/test/langtools/tools/javac/T4093617/T4093617.java
+++ b/test/langtools/tools/javac/T4093617/T4093617.java
@@ -25,7 +25,6 @@
  * @test
  * @bug     4093617
  * @summary Object has no superclass
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics java/lang/Object.java
  */
-
diff --git a/test/langtools/tools/javac/T4848619/T4848619a.java b/test/langtools/tools/javac/T4848619/T4848619a.java
index 859c3b4e1f7..dd76ff1d4dd 100644
--- a/test/langtools/tools/javac/T4848619/T4848619a.java
+++ b/test/langtools/tools/javac/T4848619/T4848619a.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     4848619
  * @summary static final variable declared after use and self initialized
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4848619a.out -XDrawDiagnostics T4848619a.java
  */
 
diff --git a/test/langtools/tools/javac/T4848619/T4848619b.java b/test/langtools/tools/javac/T4848619/T4848619b.java
index b1677c60091..1db06329796 100644
--- a/test/langtools/tools/javac/T4848619/T4848619b.java
+++ b/test/langtools/tools/javac/T4848619/T4848619b.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     4848619
  * @summary static final variable declared after use and self initialized
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4848619b.out -XDrawDiagnostics T4848619b.java
  */
 
diff --git a/test/langtools/tools/javac/T4994049/DeprecatedYES.java b/test/langtools/tools/javac/T4994049/DeprecatedYES.java
index ec59558dcc7..6812543d904 100644
--- a/test/langtools/tools/javac/T4994049/DeprecatedYES.java
+++ b/test/langtools/tools/javac/T4994049/DeprecatedYES.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6229758
  * @summary deprecatedNOT! is
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Xlint:deprecation DeprecatedYES.java
  * @compile/fail/ref=DeprecatedYES.out -XDrawDiagnostics -Werror -Xlint:deprecation DeprecatedYES.java
  */
diff --git a/test/langtools/tools/javac/T4994049/T4994049.java b/test/langtools/tools/javac/T4994049/T4994049.java
index efbddd2da38..1886b989b9b 100644
--- a/test/langtools/tools/javac/T4994049/T4994049.java
+++ b/test/langtools/tools/javac/T4994049/T4994049.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     4994049
  * @summary Improved diagnostics while parsing enums
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T4994049.out -XDrawDiagnostics T4994049.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235a.java b/test/langtools/tools/javac/T5003235/T5003235a.java
index 3a14d960f5d..c146c964f69 100644
--- a/test/langtools/tools/javac/T5003235/T5003235a.java
+++ b/test/langtools/tools/javac/T5003235/T5003235a.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Private inner class accessible from subclasses
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235a.out -XDrawDiagnostics T5003235a.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235b.java b/test/langtools/tools/javac/T5003235/T5003235b.java
index 8cb9bdaf85f..5d129fe335a 100644
--- a/test/langtools/tools/javac/T5003235/T5003235b.java
+++ b/test/langtools/tools/javac/T5003235/T5003235b.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Accessibility of private inner class
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235b.out -XDrawDiagnostics T5003235b.java
  */
 
diff --git a/test/langtools/tools/javac/T5003235/T5003235c.java b/test/langtools/tools/javac/T5003235/T5003235c.java
index 991c63ac984..38c51457352 100644
--- a/test/langtools/tools/javac/T5003235/T5003235c.java
+++ b/test/langtools/tools/javac/T5003235/T5003235c.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     5003235
  * @summary Access to private inner classes
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5003235c.out -XDrawDiagnostics T5003235c.java
  */
 
diff --git a/test/langtools/tools/javac/T5092545.java b/test/langtools/tools/javac/T5092545.java
index f56677ffc7a..0191c789e6c 100644
--- a/test/langtools/tools/javac/T5092545.java
+++ b/test/langtools/tools/javac/T5092545.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5092545
  * @summary Assertion failed in javac (ClassWriter.java:513)
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 interface A { void g(); }
diff --git a/test/langtools/tools/javac/T5105890.java b/test/langtools/tools/javac/T5105890.java
index 867c5a73fb3..12e579a8349 100644
--- a/test/langtools/tools/javac/T5105890.java
+++ b/test/langtools/tools/javac/T5105890.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5105890
  * @summary (codegen) constant folding broken for conditional operator
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 public class T5105890 {
diff --git a/test/langtools/tools/javac/T6180021/AbstractSub.java b/test/langtools/tools/javac/T6180021/AbstractSub.java
index f5b28abf17f..67334bdfc71 100644
--- a/test/langtools/tools/javac/T6180021/AbstractSub.java
+++ b/test/langtools/tools/javac/T6180021/AbstractSub.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6180021
  * @summary CompletionFailure during TypeTrans
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Super.java
  * @clean   Missing
  * @compile AbstractSub.java
diff --git a/test/langtools/tools/javac/T6180021/Sub.java b/test/langtools/tools/javac/T6180021/Sub.java
index c1ed3e9a704..3233b9a2bf0 100644
--- a/test/langtools/tools/javac/T6180021/Sub.java
+++ b/test/langtools/tools/javac/T6180021/Sub.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6180021
  * @summary CompletionFailure during TypeTrans
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Super.java
  * @clean   Missing
  * @compile Sub.java
diff --git a/test/langtools/tools/javac/T6231246/T6231246.java b/test/langtools/tools/javac/T6231246/T6231246.java
index c2d259ff10c..34835d9e454 100644
--- a/test/langtools/tools/javac/T6231246/T6231246.java
+++ b/test/langtools/tools/javac/T6231246/T6231246.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6231246
  * @summary Javac crash with -g:none
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -g:none T6231246.java
  */
 
diff --git a/test/langtools/tools/javac/T6231847.java b/test/langtools/tools/javac/T6231847.java
index 8d4ef4112e7..fa3102f9afd 100644
--- a/test/langtools/tools/javac/T6231847.java
+++ b/test/langtools/tools/javac/T6231847.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6231847
  * @summary Crash in com.sun.tools.javac.comp.Attr.visitNewClass:1352
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6231847.out -XDdev -XDrawDiagnostics T6231847.java
  */
 
diff --git a/test/langtools/tools/javac/T6266772.java b/test/langtools/tools/javac/T6266772.java
index 8a5e5133766..79ae48a28fc 100644
--- a/test/langtools/tools/javac/T6266772.java
+++ b/test/langtools/tools/javac/T6266772.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6266772
  * @summary javac crashes, assertion failure in Lower.java
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T6266772 {
diff --git a/test/langtools/tools/javac/T6407257.java b/test/langtools/tools/javac/T6407257.java
index 7d5da43cab0..0b6b339fdc2 100644
--- a/test/langtools/tools/javac/T6407257.java
+++ b/test/langtools/tools/javac/T6407257.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6407257
  * @summary javac locks up when encountering cyclic inheritance
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6407257.out -XDrawDiagnostics T6407257.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
index e13c537230d..1f22cefa0cf 100644
--- a/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
+++ b/test/langtools/tools/javac/annotations/neg/NoAnnotationMethods.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoAnnotationMethods.out -XDrawDiagnostics  NoAnnotationMethods.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoClone.java b/test/langtools/tools/javac/annotations/neg/NoClone.java
index 13237fe91a7..8979ca1cdd0 100644
--- a/test/langtools/tools/javac/annotations/neg/NoClone.java
+++ b/test/langtools/tools/javac/annotations/neg/NoClone.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoClone.out -XDrawDiagnostics  NoClone.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
index 8e4df05f7bd..668aa8c47bd 100644
--- a/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
+++ b/test/langtools/tools/javac/annotations/neg/NoObjectMethods.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=NoObjectMethods.out -XDrawDiagnostics  NoObjectMethods.java
  */
 
diff --git a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
index c0f02bf1b82..129fe57b667 100644
--- a/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
+++ b/test/langtools/tools/javac/annotations/pos/AnnotationMethods.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6393539
  * @summary no compile-time error for clone, etc. in annotation type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile AnnotationMethods.java
  */
 
diff --git a/test/langtools/tools/javac/api/6400303/T6400303.java b/test/langtools/tools/javac/api/6400303/T6400303.java
index 06e9b419cfe..c3a01c007b3 100644
--- a/test/langtools/tools/javac/api/6400303/T6400303.java
+++ b/test/langtools/tools/javac/api/6400303/T6400303.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400303
  * @summary REGRESSION: javadoc crashes in b75
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
  *          jdk.compiler/com.sun.tools.javac.comp
diff --git a/test/langtools/tools/javac/api/6410643/T6410643.java b/test/langtools/tools/javac/api/6410643/T6410643.java
index e15a5272152..a551f802d62 100644
--- a/test/langtools/tools/javac/api/6410643/T6410643.java
+++ b/test/langtools/tools/javac/api/6410643/T6410643.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6410643
  * @summary JSR 199: The method JavaCompilerTool.run fails to handle null arguments
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6411310/T6411310.java b/test/langtools/tools/javac/api/6411310/T6411310.java
index 55945e61fbc..2714117962f 100644
--- a/test/langtools/tools/javac/api/6411310/T6411310.java
+++ b/test/langtools/tools/javac/api/6411310/T6411310.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6411310
  * @summary JSR 199: FileObject should support user-friendly names via getName()
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6411333/T6411333.java b/test/langtools/tools/javac/api/6411333/T6411333.java
index f33e6f63a28..83726143964 100644
--- a/test/langtools/tools/javac/api/6411333/T6411333.java
+++ b/test/langtools/tools/javac/api/6411333/T6411333.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6411333 6400208 6400225 6400267
  * @summary Ensure 6400208, 6400225, and 6400267 are tested
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6412656/T6412656.java b/test/langtools/tools/javac/api/6412656/T6412656.java
index 0924d5df55e..b7976e036fd 100644
--- a/test/langtools/tools/javac/api/6412656/T6412656.java
+++ b/test/langtools/tools/javac/api/6412656/T6412656.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6412656 6443062
  * @summary JSR 199: pass annotation processor instances to compiler
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6415780/T6415780.java b/test/langtools/tools/javac/api/6415780/T6415780.java
index dc74aa96fb0..99c0a476bee 100644
--- a/test/langtools/tools/javac/api/6415780/T6415780.java
+++ b/test/langtools/tools/javac/api/6415780/T6415780.java
@@ -26,7 +26,7 @@
  * @bug     6415780
  * @summary JSR 199: javax.tools.JavaFileManager.getClassLoader always fails
  * @author  igor.tseytin@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6418694/T6418694.java b/test/langtools/tools/javac/api/6418694/T6418694.java
index 8eb237586b7..9e8ee8e850b 100644
--- a/test/langtools/tools/javac/api/6418694/T6418694.java
+++ b/test/langtools/tools/javac/api/6418694/T6418694.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6418694
  * @summary JSR 199: JavaFileManager.hasLocation(Location)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6420409/T6420409.java b/test/langtools/tools/javac/api/6420409/T6420409.java
index 60cfc4272d8..d12274f5f3b 100644
--- a/test/langtools/tools/javac/api/6420409/T6420409.java
+++ b/test/langtools/tools/javac/api/6420409/T6420409.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6420409
  * @summary JSR 199: StandardFileManager: cannot set CLASS_PATH location
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/6421111/T6421111.java b/test/langtools/tools/javac/api/6421111/T6421111.java
index 699c771e38e..9497e2ca22f 100644
--- a/test/langtools/tools/javac/api/6421111/T6421111.java
+++ b/test/langtools/tools/javac/api/6421111/T6421111.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6421111
  * @summary NullPointerException thrown when retrieving bounds for the type parameter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6421756/T6421756.java b/test/langtools/tools/javac/api/6421756/T6421756.java
index 9e2cfb8cbc8..00efff6971c 100644
--- a/test/langtools/tools/javac/api/6421756/T6421756.java
+++ b/test/langtools/tools/javac/api/6421756/T6421756.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6421756
  * @summary 6421756 JSR 199: In the method JavaCompilerTool.getTask 'options' can be supplied in the place of 'classes'
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6422215/T6422215.java b/test/langtools/tools/javac/api/6422215/T6422215.java
index 1c25a6e38da..425d47616f0 100644
--- a/test/langtools/tools/javac/api/6422215/T6422215.java
+++ b/test/langtools/tools/javac/api/6422215/T6422215.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6422215
  * @summary JSR 199: What happens if a directory is missing
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6422327/T6422327.java b/test/langtools/tools/javac/api/6422327/T6422327.java
index 5029a199408..94a31101f16 100644
--- a/test/langtools/tools/javac/api/6422327/T6422327.java
+++ b/test/langtools/tools/javac/api/6422327/T6422327.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6422327
  * @summary JSR 199: JavaCompilerTool can compile and generate '.class' of non '.java' files
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6423003/T6423003.java b/test/langtools/tools/javac/api/6423003/T6423003.java
index 810789b93ab..893f2dd6344 100644
--- a/test/langtools/tools/javac/api/6423003/T6423003.java
+++ b/test/langtools/tools/javac/api/6423003/T6423003.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6423003
  * @summary JSR 199: confusing help message with compiler API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6431257/T6431257.java b/test/langtools/tools/javac/api/6431257/T6431257.java
index 291d4222cc0..c772a3c129c 100644
--- a/test/langtools/tools/javac/api/6431257/T6431257.java
+++ b/test/langtools/tools/javac/api/6431257/T6431257.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6431257
  * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6437999/T6437999.java b/test/langtools/tools/javac/api/6437999/T6437999.java
index a44bd2b0d6a..167c7feda11 100644
--- a/test/langtools/tools/javac/api/6437999/T6437999.java
+++ b/test/langtools/tools/javac/api/6437999/T6437999.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6437999
  * @summary Unit test for encoding argument to standard file manager
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6440333/T6440333.java b/test/langtools/tools/javac/api/6440333/T6440333.java
index 21a1247a2b6..5da878273b3 100644
--- a/test/langtools/tools/javac/api/6440333/T6440333.java
+++ b/test/langtools/tools/javac/api/6440333/T6440333.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6440333
  * @summary SimpleJavaFileObject.toString() generates URI with some extra message
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6440528/T6440528.java b/test/langtools/tools/javac/api/6440528/T6440528.java
index ef94ccb96a7..3b72fd39255 100644
--- a/test/langtools/tools/javac/api/6440528/T6440528.java
+++ b/test/langtools/tools/javac/api/6440528/T6440528.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6440528
  * @summary javac deposits package-info.class in bogus directory
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler/com.sun.tools.javac.file
diff --git a/test/langtools/tools/javac/api/6452876/T6452876.java b/test/langtools/tools/javac/api/6452876/T6452876.java
index cab4f118558..49a25a3bd32 100644
--- a/test/langtools/tools/javac/api/6452876/T6452876.java
+++ b/test/langtools/tools/javac/api/6452876/T6452876.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6452876
  * @summary JSR 199: DiagnosticCollector.report(null) should throw NPE
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6468404/T6468404.java b/test/langtools/tools/javac/api/6468404/T6468404.java
index 14580a51be4..c06e37e84b8 100644
--- a/test/langtools/tools/javac/api/6468404/T6468404.java
+++ b/test/langtools/tools/javac/api/6468404/T6468404.java
@@ -26,7 +26,7 @@
  * @bug     6468404
  * @summary ExecutableElement.getParameters() uses raw type for class loaded from -g bytecode
  * @author  jesse.glick@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/6471599/Main.java b/test/langtools/tools/javac/api/6471599/Main.java
index 735cebb4bee..fa66ecc51d3 100644
--- a/test/langtools/tools/javac/api/6471599/Main.java
+++ b/test/langtools/tools/javac/api/6471599/Main.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6471599
  * @summary Type of rhs cannot be obtained when assigning to erroneous symbol
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile Main.java
  * @run main Main
diff --git a/test/langtools/tools/javac/api/Sibling.java b/test/langtools/tools/javac/api/Sibling.java
index b19ba4be7b9..d70548caa63 100644
--- a/test/langtools/tools/javac/api/Sibling.java
+++ b/test/langtools/tools/javac/api/Sibling.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6399602
  * @summary Verify that files are created relative to sibling
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6257235.java b/test/langtools/tools/javac/api/T6257235.java
index 2ced708aa5f..095d2e83d3b 100644
--- a/test/langtools/tools/javac/api/T6257235.java
+++ b/test/langtools/tools/javac/api/T6257235.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6257235
  * @summary setOption() and setExtendedOption() of JavacTool throws NullPointerException for undefined options
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6258271.java b/test/langtools/tools/javac/api/T6258271.java
index 1ceb4becfd6..2092f5825a0 100644
--- a/test/langtools/tools/javac/api/T6258271.java
+++ b/test/langtools/tools/javac/api/T6258271.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6258271
  * @summary DiagnosticMessage exposes internal name __input
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6265137.java b/test/langtools/tools/javac/api/T6265137.java
index c004833963d..2a8a1fcb9ad 100644
--- a/test/langtools/tools/javac/api/T6265137.java
+++ b/test/langtools/tools/javac/api/T6265137.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6265137
  * @summary setOption() and setExtendedOption() of JavacTool will throw exception for some defined options
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6306137.java b/test/langtools/tools/javac/api/T6306137.java
index 2a8a788230a..fe443950e52 100644
--- a/test/langtools/tools/javac/api/T6306137.java
+++ b/test/langtools/tools/javac/api/T6306137.java
@@ -29,7 +29,7 @@
  *          jdk.compiler
  * @compile -encoding utf-8 T6306137.java
  * @run main T6306137
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 import java.io.File;
diff --git a/test/langtools/tools/javac/api/T6358786.java b/test/langtools/tools/javac/api/T6358786.java
index c3e91ccb617..f8ffb829b2a 100644
--- a/test/langtools/tools/javac/api/T6358786.java
+++ b/test/langtools/tools/javac/api/T6358786.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6358786
  * @summary Doccomments are not returned from Tree API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main T6358786 T6358786.java
  */
diff --git a/test/langtools/tools/javac/api/T6397104.java b/test/langtools/tools/javac/api/T6397104.java
index 74b840fa6b7..7d63c322371 100644
--- a/test/langtools/tools/javac/api/T6397104.java
+++ b/test/langtools/tools/javac/api/T6397104.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6397104
  * @summary JSR 199: JavaFileManager.getFileForOutput should have sibling argument
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6400205.java b/test/langtools/tools/javac/api/T6400205.java
index 075ad74cc7c..a942e7c6624 100644
--- a/test/langtools/tools/javac/api/T6400205.java
+++ b/test/langtools/tools/javac/api/T6400205.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400205
  * @summary getClassLoader(location) returns null if getLocation(location) returns null
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6400207.java b/test/langtools/tools/javac/api/T6400207.java
index 7747553d21e..47bf297ce72 100644
--- a/test/langtools/tools/javac/api/T6400207.java
+++ b/test/langtools/tools/javac/api/T6400207.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6400207
  * @summary JSR 199: JavaFileManager.list and unset location
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/T6407011.java b/test/langtools/tools/javac/api/T6407011.java
index d4420cc1623..9991efd1a5d 100644
--- a/test/langtools/tools/javac/api/T6407011.java
+++ b/test/langtools/tools/javac/api/T6407011.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6407011 6407066
  * @summary javac crashes in b78 with NPE in JavacFileManager:293
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/api/TestEvalExpression.java b/test/langtools/tools/javac/api/TestEvalExpression.java
index e627191d868..41e61548d55 100644
--- a/test/langtools/tools/javac/api/TestEvalExpression.java
+++ b/test/langtools/tools/javac/api/TestEvalExpression.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4164450
  * @summary JSR 199: Standard interface for Java compilers
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          java.desktop
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/api/TestGetSourceVersions.java b/test/langtools/tools/javac/api/TestGetSourceVersions.java
index caac5eb2a3d..26892eca0a1 100644
--- a/test/langtools/tools/javac/api/TestGetSourceVersions.java
+++ b/test/langtools/tools/javac/api/TestGetSourceVersions.java
@@ -26,7 +26,7 @@
  * @bug     6395981 6458819 7025784 8028543 8028544 8193291 8193292 8193292 8205393 8245585 8245585 8245585 8286034
  *          8296150 8306585 8319414 8330183 8342982
  * @summary JavaCompilerTool and Tool must specify version of JLS and JVMS
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  * @run main/fail TestGetSourceVersions
diff --git a/test/langtools/tools/javac/api/TestGetTree.java b/test/langtools/tools/javac/api/TestGetTree.java
index 524ad8a1fe2..545645a3541 100644
--- a/test/langtools/tools/javac/api/TestGetTree.java
+++ b/test/langtools/tools/javac/api/TestGetTree.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6344177 6392177
  * @summary Can't get tree from a top level class
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  * @compile TestGetTree.java
  * @compile -processor TestGetTree -proc:only TestGetTree.java
diff --git a/test/langtools/tools/javac/api/TestJavacTask.java b/test/langtools/tools/javac/api/TestJavacTask.java
index c17f7d05777..2d86a732a41 100644
--- a/test/langtools/tools/javac/api/TestJavacTask.java
+++ b/test/langtools/tools/javac/api/TestJavacTask.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4813736 8015073
  * @summary Provide a basic test of access to the Java Model from javac, and error messages
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main TestJavacTask TestJavacTask.java
  */
diff --git a/test/langtools/tools/javac/api/TestJavacTaskScanner.java b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
index 0d09a81cd70..4f920d96fb0 100644
--- a/test/langtools/tools/javac/api/TestJavacTaskScanner.java
+++ b/test/langtools/tools/javac/api/TestJavacTaskScanner.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4813736 8013256
  * @summary Additional functionality test of task and JSR 269
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ./lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
diff --git a/test/langtools/tools/javac/api/TestOperators.java b/test/langtools/tools/javac/api/TestOperators.java
index 91d58bb3657..99448e3e389 100644
--- a/test/langtools/tools/javac/api/TestOperators.java
+++ b/test/langtools/tools/javac/api/TestOperators.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6338064 6346249 6340951 6392177
  * @summary Tree API: can't determine kind of operator
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestOperators
diff --git a/test/langtools/tools/javac/api/TestResolveIdent.java b/test/langtools/tools/javac/api/TestResolveIdent.java
index c72f652ce3e..d5f5a6bb93e 100644
--- a/test/langtools/tools/javac/api/TestResolveIdent.java
+++ b/test/langtools/tools/javac/api/TestResolveIdent.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6374357 6308351
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.code
  *          jdk.compiler/com.sun.tools.javac.comp
diff --git a/test/langtools/tools/javac/boxing/T5082929.java b/test/langtools/tools/javac/boxing/T5082929.java
index 07ea7a37776..0a4be48a89e 100644
--- a/test/langtools/tools/javac/boxing/T5082929.java
+++ b/test/langtools/tools/javac/boxing/T5082929.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5082929
  * @summary Comparing Float and Integer
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5082929.out -XDrawDiagnostics  T5082929.java
  */
 
diff --git a/test/langtools/tools/javac/boxing/T6348760.java b/test/langtools/tools/javac/boxing/T6348760.java
index 98b580fdb90..010bcbfd324 100644
--- a/test/langtools/tools/javac/boxing/T6348760.java
+++ b/test/langtools/tools/javac/boxing/T6348760.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6348760
  * @summary crash: java.lang.AssertionError at com.sun.tools.javac.comp.Lower.abstractLval(Lower.java:1853)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @run main/othervm T6348760
  */
 
diff --git a/test/langtools/tools/javac/cast/5043020/T5043020.java b/test/langtools/tools/javac/cast/5043020/T5043020.java
index da561cef9f8..13152c57a64 100644
--- a/test/langtools/tools/javac/cast/5043020/T5043020.java
+++ b/test/langtools/tools/javac/cast/5043020/T5043020.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5043020
  * @summary Spurious unchecked cast warning
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Werror -Xlint:unchecked T5043020.java
  */
 
diff --git a/test/langtools/tools/javac/cast/6302214/T6302214a.java b/test/langtools/tools/javac/cast/6302214/T6302214a.java
index 605894f6bb0..eeb8735e4a4 100644
--- a/test/langtools/tools/javac/cast/6302214/T6302214a.java
+++ b/test/langtools/tools/javac/cast/6302214/T6302214a.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6302214
  * @summary erroneus "inconvertible types" error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile -Xlint:unchecked -Werror T6302214a.java
  */
 
diff --git a/test/langtools/tools/javac/enum/6424358/T6424358.java b/test/langtools/tools/javac/enum/6424358/T6424358.java
index 9042f65264e..6a5d403ada5 100644
--- a/test/langtools/tools/javac/enum/6424358/T6424358.java
+++ b/test/langtools/tools/javac/enum/6424358/T6424358.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6424358 7025809
  * @summary Synthesized static enum method values() is final
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/enum/NoFinal.java b/test/langtools/tools/javac/enum/NoFinal.java
index e48008e803f..b6babaf9ac9 100644
--- a/test/langtools/tools/javac/enum/NoFinal.java
+++ b/test/langtools/tools/javac/enum/NoFinal.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal.out -XDrawDiagnostics  NoFinal.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal2.java b/test/langtools/tools/javac/enum/NoFinal2.java
index 1c69e0c1e51..372cb7bbab2 100644
--- a/test/langtools/tools/javac/enum/NoFinal2.java
+++ b/test/langtools/tools/javac/enum/NoFinal2.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal2.out -XDrawDiagnostics  NoFinal2.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal3.java b/test/langtools/tools/javac/enum/NoFinal3.java
index 742ad4276f7..114fe3f2304 100644
--- a/test/langtools/tools/javac/enum/NoFinal3.java
+++ b/test/langtools/tools/javac/enum/NoFinal3.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal3.out -XDrawDiagnostics  NoFinal3.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal4.java b/test/langtools/tools/javac/enum/NoFinal4.java
index ee382d3b78e..35d325eeeae 100644
--- a/test/langtools/tools/javac/enum/NoFinal4.java
+++ b/test/langtools/tools/javac/enum/NoFinal4.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal4.out -XDrawDiagnostics  NoFinal4.java
  */
 
diff --git a/test/langtools/tools/javac/enum/NoFinal5.java b/test/langtools/tools/javac/enum/NoFinal5.java
index 6ec5e7c0fcc..c3f3f99813d 100644
--- a/test/langtools/tools/javac/enum/NoFinal5.java
+++ b/test/langtools/tools/javac/enum/NoFinal5.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=NoFinal5.out -XDrawDiagnostics  NoFinal5.java
  */
 
diff --git a/test/langtools/tools/javac/enum/OkFinal.java b/test/langtools/tools/javac/enum/OkFinal.java
index 4f6c2d63abe..a37de61ae5c 100644
--- a/test/langtools/tools/javac/enum/OkFinal.java
+++ b/test/langtools/tools/javac/enum/OkFinal.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097250
  * @summary Finalize methods on enums must be compile time error
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  */
 
 public enum OkFinal {
diff --git a/test/langtools/tools/javac/enum/T5075242.java b/test/langtools/tools/javac/enum/T5075242.java
index 33cf45783da..29e90bd39fd 100644
--- a/test/langtools/tools/javac/enum/T5075242.java
+++ b/test/langtools/tools/javac/enum/T5075242.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5075242
  * @summary Cannot make compound type involving Enums
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile T5075242.java
  */
diff --git a/test/langtools/tools/javac/enum/T5081785.java b/test/langtools/tools/javac/enum/T5081785.java
index 25d40bf5e4a..d4e08431e97 100644
--- a/test/langtools/tools/javac/enum/T5081785.java
+++ b/test/langtools/tools/javac/enum/T5081785.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 5081785
  * @summary enums should be allowed in non-static contexts
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T5081785.out -XDrawDiagnostics --release 15 T5081785.java
  * @compile T5081785.java
  */
diff --git a/test/langtools/tools/javac/enum/forwardRef/T6425594.java b/test/langtools/tools/javac/enum/forwardRef/T6425594.java
index e7a5bc177ba..26613735e70 100644
--- a/test/langtools/tools/javac/enum/forwardRef/T6425594.java
+++ b/test/langtools/tools/javac/enum/forwardRef/T6425594.java
@@ -2,7 +2,7 @@
  * @test  /nodynamiccopyright/
  * @bug     6424491
  * @summary javac accepts illegal forward references
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6425594.out -XDrawDiagnostics -XDuseBeforeDeclarationWarning T6425594.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
index 737ed620eff..658ea56dbc7 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum1.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum1.out -XDrawDiagnostics  TestEnum1.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
index cae8d1e8286..16b5ef9e57f 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum2.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum2.out -XDrawDiagnostics  TestEnum2.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
index 2e22fd5552b..497d4644d40 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum3.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum3.out -XDrawDiagnostics  TestEnum3.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
index 5b863302db0..6acfc3ead5f 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum4.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum4.out -XDrawDiagnostics  TestEnum4.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
index 36928c1ef5f..35ae7244daa 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum5.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6209839
  * @summary Illegal forward reference to enum constants allowed by javac
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum5.out -XDrawDiagnostics  TestEnum5.java
  */
 
diff --git a/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
index ccf003d1694..305a38559fd 100644
--- a/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
+++ b/test/langtools/tools/javac/enum/forwardRef/TestEnum6.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6424491
  * @summary Cannot initialise nested enums
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=TestEnum6.out -XDrawDiagnostics  TestEnum6.java
  */
 
diff --git a/test/langtools/tools/javac/generics/5086027/T5086027.java b/test/langtools/tools/javac/generics/5086027/T5086027.java
index 631550ad7a1..4d6902890be 100644
--- a/test/langtools/tools/javac/generics/5086027/T5086027.java
+++ b/test/langtools/tools/javac/generics/5086027/T5086027.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5086027
  * @summary Inner class of generic class cannot extend Throwable
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T5086027.out -XDrawDiagnostics  T5086027.java
  */
 
diff --git a/test/langtools/tools/javac/generics/5086027/T5086027pos.java b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
index 28e3d482b3d..e1b00372580 100644
--- a/test/langtools/tools/javac/generics/5086027/T5086027pos.java
+++ b/test/langtools/tools/javac/generics/5086027/T5086027pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5086027
  * @summary Inner class of generic class cannot extend Throwable
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T5086027pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6192945/Method.java b/test/langtools/tools/javac/generics/6192945/Method.java
index 9d81bfd2c92..0d3698ad75d 100644
--- a/test/langtools/tools/javac/generics/6192945/Method.java
+++ b/test/langtools/tools/javac/generics/6192945/Method.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6192945
  * @summary Declaration order of interdependent generic types should not matter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Method.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6207386/Test.java b/test/langtools/tools/javac/generics/6207386/Test.java
index 7dcebc7511c..7725abb6ceb 100644
--- a/test/langtools/tools/javac/generics/6207386/Test.java
+++ b/test/langtools/tools/javac/generics/6207386/Test.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6207386
  * @summary Undecidable type system leads to crash
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Test.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6227936/T6227936.java b/test/langtools/tools/javac/generics/6227936/T6227936.java
index 2e0f0b7dc81..8a9b32261a5 100644
--- a/test/langtools/tools/javac/generics/6227936/T6227936.java
+++ b/test/langtools/tools/javac/generics/6227936/T6227936.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6227936
  * @summary Wrong type of inherited method using specialized type parameter
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6227936.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6245699/T6245699c.java b/test/langtools/tools/javac/generics/6245699/T6245699c.java
index fc5f2299587..5105684a7c2 100644
--- a/test/langtools/tools/javac/generics/6245699/T6245699c.java
+++ b/test/langtools/tools/javac/generics/6245699/T6245699c.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6245699
  * @summary Missing bridge for final method (gives AbstractMethodError at runtime)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T6245699c {
diff --git a/test/langtools/tools/javac/generics/6292765/T6292765.java b/test/langtools/tools/javac/generics/6292765/T6292765.java
index 874ff4d02ea..c58127f15f1 100644
--- a/test/langtools/tools/javac/generics/6292765/T6292765.java
+++ b/test/langtools/tools/javac/generics/6292765/T6292765.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6292765
  * @summary NPE at Check.checkCompatibleConcretes
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6292765.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6332204/T6332204.java b/test/langtools/tools/javac/generics/6332204/T6332204.java
index 8e70d592dda..6c61304cc6d 100644
--- a/test/langtools/tools/javac/generics/6332204/T6332204.java
+++ b/test/langtools/tools/javac/generics/6332204/T6332204.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6332204
  * @summary com.sun.tools.javac.code.Types.lub() throws NPE
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6332204.java
  */
 
diff --git a/test/langtools/tools/javac/generics/6413682/TestPos.java b/test/langtools/tools/javac/generics/6413682/TestPos.java
index 4df4d458cfd..1da09adc591 100644
--- a/test/langtools/tools/javac/generics/6413682/TestPos.java
+++ b/test/langtools/tools/javac/generics/6413682/TestPos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6413682
  * @summary Compiler confused about implicit type args and arrays
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/generics/T6391995.java b/test/langtools/tools/javac/generics/T6391995.java
index 6ff82f30cab..ef01a6405b2 100644
--- a/test/langtools/tools/javac/generics/T6391995.java
+++ b/test/langtools/tools/javac/generics/T6391995.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6391995
  * @summary removal of "rvalue conversion" causes problems
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile T6391995.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5073060/Neg.java b/test/langtools/tools/javac/generics/inference/5073060/Neg.java
index 1658e29e23a..6a42c06239b 100644
--- a/test/langtools/tools/javac/generics/inference/5073060/Neg.java
+++ b/test/langtools/tools/javac/generics/inference/5073060/Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5073060
  * @summary Package private members not found for intersection types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg.out -XDrawDiagnostics NegHelper.java Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
index 270daf1bfb7..be3364099b9 100644
--- a/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
+++ b/test/langtools/tools/javac/generics/inference/5073060/T5073060a.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5073060
  * @summary Package private members not found for intersection types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  */
 
 public class T5073060a {
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Neg.java b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
index eedee463f23..1ef3d22a5cc 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Neg.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5081782
  * @summary type arguments to non-generic methods
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg.out -XDrawDiagnostics  Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/5081782/Pos.java b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
index 577f463c04c..5a0b3eb88ee 100644
--- a/test/langtools/tools/javac/generics/inference/5081782/Pos.java
+++ b/test/langtools/tools/javac/generics/inference/5081782/Pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5081782
  * @summary type arguments to non-generic methods
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
index 6736f92ce7a..98dd5ff1e3f 100644
--- a/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
+++ b/test/langtools/tools/javac/generics/inference/6215213/T6215213.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6215213
  * @summary Compiler JDK1.5 crashes with uses of generics
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6215213.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
index 403ca2d63e6..76d7bdb4e8b 100644
--- a/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
+++ b/test/langtools/tools/javac/generics/inference/6278587/T6278587.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6278587
  * @summary Inference broken for subtypes of subtypes of F-bounded types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6278587.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
index 3963c641fa3..02dd1fe25ee 100644
--- a/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
+++ b/test/langtools/tools/javac/generics/inference/6278587/T6278587Neg.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6278587 8007464
  * @summary Inference broken for subtypes of subtypes of F-bounded types
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6278587Neg.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
index d3e195463ae..03ba90132ae 100644
--- a/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
+++ b/test/langtools/tools/javac/generics/inference/6302954/T6456971.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6456971
  * @summary Varargs and inference problem
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6456971.java
  */
 
diff --git a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
index 73c07765311..478cbf465c2 100644
--- a/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
+++ b/test/langtools/tools/javac/generics/inference/6359106/T6359106.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6359106
  * @summary Valid generics code does not compile
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Orig.java T6359106.java
  */
 
diff --git a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
index 664dca0c805..c09dbdb29ff 100644
--- a/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
+++ b/test/langtools/tools/javac/generics/rawOverride/AttributeSet.java
@@ -26,7 +26,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile -Xlint:unchecked -Werror AttributeSet.java
  */
diff --git a/test/langtools/tools/javac/generics/rawOverride/Fail1.java b/test/langtools/tools/javac/generics/rawOverride/Fail1.java
index 1b73b9742fb..e93402d830a 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Fail1.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Fail1.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile/fail/ref=Fail1.out -XDrawDiagnostics  Fail1.java
  */
diff --git a/test/langtools/tools/javac/generics/rawOverride/T6178365.java b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
index dc3afc800ef..9a7a97c76aa 100644
--- a/test/langtools/tools/javac/generics/rawOverride/T6178365.java
+++ b/test/langtools/tools/javac/generics/rawOverride/T6178365.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 6178365
  * @summary REGRESSION: Compile Error - Abstract error in LoginModule
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @run main T6178365
  */
 
diff --git a/test/langtools/tools/javac/generics/rawOverride/Warn1.java b/test/langtools/tools/javac/generics/rawOverride/Warn1.java
index e4fa90a8931..134a43ce460 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Warn1.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Warn1.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile Warn1.java
  * @compile/fail/ref=Warn1.out -XDrawDiagnostics -Xlint:unchecked -Werror Warn1.java
diff --git a/test/langtools/tools/javac/generics/rawOverride/Warn2.java b/test/langtools/tools/javac/generics/rawOverride/Warn2.java
index e4bc3aff0d6..252dcaa32eb 100644
--- a/test/langtools/tools/javac/generics/rawOverride/Warn2.java
+++ b/test/langtools/tools/javac/generics/rawOverride/Warn2.java
@@ -3,7 +3,7 @@
  * @bug 5073079
  * @summary Allow unchecked override of generified methods in
  * parameterless classes
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile Warn2.java
  * @compile/fail/ref=Warn2.out -XDrawDiagnostics -Xlint:unchecked -Werror Warn2.java
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
index c90a2aacf5a..ceac89e0397 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  *
  * @compile  T4856983.java
  */
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
index ff722efe5c7..52a2c02ba81 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T4856983a.out -XDrawDiagnostics T4856983a.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
index ba013aeaf6d..beef1776105 100644
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/fail/ref=T4856983b.out -XDrawDiagnostics T4856983b.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
index 6564a37b367..228d7245eef 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Compatibility.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Compatibility.out -XDrawDiagnostics Compatibility.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Method.java b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
index fc3121e1559..2603727b411 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Method.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Method.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Method.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
index 380ef7501da..58a56c602ac 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Neg1.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg1.out -XDrawDiagnostics  Neg1.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
index c96080d1777..0ea9c2c7ef8 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Neg2.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Neg2.out -XDrawDiagnostics  Neg2.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
index 74017c2ef16..29cc91f0c04 100644
--- a/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
+++ b/test/langtools/tools/javac/generics/typevars/5060485/Pos.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     5060485
  * @summary The scope of a class type parameter is too wide
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Pos.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
index a7a9720467c..e2e51610d4e 100644
--- a/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
+++ b/test/langtools/tools/javac/generics/typevars/6182630/T6182630.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 6182630
  * @summary Method with parameter bound to raw type avoids unchecked warning
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile/ref=T6182630.out -XDrawDiagnostics -Xlint:unchecked T6182630.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
index 5de2ae54da0..dfa0ce443a9 100644
--- a/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
+++ b/test/langtools/tools/javac/generics/typevars/6486430/T6486430.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6486430
  * @summary Compiler fails to reject access to static member in parameterized type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6486430.out -XDrawDiagnostics  T6486430.java
  */
 
diff --git a/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
index 35056db6daa..6b6941055a0 100644
--- a/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
+++ b/test/langtools/tools/javac/generics/typevars/6486430/T6486430a.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6486430
  * @summary Compiler fails to reject access to static member in parameterized type
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6486430a.out -XDrawDiagnostics  T6486430a.java
  */
 
diff --git a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
index 550efc2d54a..db551e72b1e 100644
--- a/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
+++ b/test/langtools/tools/javac/generics/wildcards/6330931/T6330931.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6330931
  * @summary Super wildcard has incorrect upper bound
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6330931.java
  */
 
diff --git a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
index e380be8832a..5e1233442c9 100644
--- a/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
+++ b/test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java
@@ -3,7 +3,7 @@
  * @bug     6437894
  * @summary Javac throws a NullPointerException
  * @author  jan.lahoda@...
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile A.java B.java
  * @clean   a.A
  * @compile/fail/ref=T6437894.out -XDrawDiagnostics T6437894.java
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548.java b/test/langtools/tools/javac/generics/wildcards/T5097548.java
index b8b074fcfd2..46459ffa675 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097548
  * @summary (crash) Stack overflow in capture conversion
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile  T5097548.java
  * @run main T5097548
  */
diff --git a/test/langtools/tools/javac/generics/wildcards/T5097548b.java b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
index d5c1b6586be..2ce974fb2ca 100644
--- a/test/langtools/tools/javac/generics/wildcards/T5097548b.java
+++ b/test/langtools/tools/javac/generics/wildcards/T5097548b.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5097548
  * @summary Stack overflow in capture conversion
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile  T5097548b.java
  */
 
diff --git a/test/langtools/tools/javac/jvm/6397652/T6397652.java b/test/langtools/tools/javac/jvm/6397652/T6397652.java
index f134ed08dfa..3b6c78f4ed5 100644
--- a/test/langtools/tools/javac/jvm/6397652/T6397652.java
+++ b/test/langtools/tools/javac/jvm/6397652/T6397652.java
@@ -26,7 +26,7 @@
  * @bug     6397652
  * @summary javac compilation failure when imported class with $ sign in the name
  * @author  Yuri Gaevsky
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile com/test/Test.java com/test/Test$Test.java com/test/Test$Test$Test.java
  * @compile T6397652.java
  */
diff --git a/test/langtools/tools/javac/nested/5009484/Y.java b/test/langtools/tools/javac/nested/5009484/Y.java
index d56309737ae..98c4b20edec 100644
--- a/test/langtools/tools/javac/nested/5009484/Y.java
+++ b/test/langtools/tools/javac/nested/5009484/Y.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     5009484
  * @summary Compiler fails to resolve appropriate type for outer member
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=Y.out -XDrawDiagnostics  Y.java
  */
 
diff --git a/test/langtools/tools/javac/overload/T4494762.java b/test/langtools/tools/javac/overload/T4494762.java
index 5ca31ecb4f4..bc4c7c7ab62 100644
--- a/test/langtools/tools/javac/overload/T4494762.java
+++ b/test/langtools/tools/javac/overload/T4494762.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     4494762 6491939
  * @summary Request for Clarification of JLS 15.12.2.2
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T4494762.java
  */
 
diff --git a/test/langtools/tools/javac/positions/T6402077.java b/test/langtools/tools/javac/positions/T6402077.java
index 0fb3f89ee81..66caa9c282e 100644
--- a/test/langtools/tools/javac/positions/T6402077.java
+++ b/test/langtools/tools/javac/positions/T6402077.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6402077
  * @summary Start position is wrong for package private constructors
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/positions/T6404194.java b/test/langtools/tools/javac/positions/T6404194.java
index 6b187f58198..18b07ad8af1 100644
--- a/test/langtools/tools/javac/positions/T6404194.java
+++ b/test/langtools/tools/javac/positions/T6404194.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6404194
  * @summary javac parser generates incorrect end position for annotations with parentheses.
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler
  */
 
diff --git a/test/langtools/tools/javac/processing/6359313/T6359313.java b/test/langtools/tools/javac/processing/6359313/T6359313.java
index 3d06d3ecfcb..b3854099075 100644
--- a/test/langtools/tools/javac/processing/6359313/T6359313.java
+++ b/test/langtools/tools/javac/processing/6359313/T6359313.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6359313
  * @summary error compiling annotated package
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/6413690/T6413690.java b/test/langtools/tools/javac/processing/6413690/T6413690.java
index f0a01d599ef..b0945991bd2 100644
--- a/test/langtools/tools/javac/processing/6413690/T6413690.java
+++ b/test/langtools/tools/javac/processing/6413690/T6413690.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6413690 6380018
  * @summary JavacProcessingEnvironment does not enter trees from preceding rounds
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/model/6194785/T6194785.java b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
index d053b9353dd..c8f09ba8c95 100644
--- a/test/langtools/tools/javac/processing/model/6194785/T6194785.java
+++ b/test/langtools/tools/javac/processing/model/6194785/T6194785.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6194785
  * @summary ParameterDeclaration.getSimpleName does not return actual name from class files
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library /tools/javac/lib
  * @modules java.compiler
  *          jdk.compiler
diff --git a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
index 8310a403b14..4d35b9ae747 100644
--- a/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/test/langtools/tools/javac/processing/model/testgetallmembers/Main.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6374357 6308351 6707027
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.model
  * @run main/othervm -Xmx512m Main
  */
diff --git a/test/langtools/tools/javac/processing/options/Xprint.java b/test/langtools/tools/javac/processing/options/Xprint.java
index adf6c20e1ed..51df77afef9 100644
--- a/test/langtools/tools/javac/processing/options/Xprint.java
+++ b/test/langtools/tools/javac/processing/options/Xprint.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6266828
  * @summary JSR 269: Java Language Model API
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/scope/6225935/T6214959.java b/test/langtools/tools/javac/scope/6225935/T6214959.java
index 96a9478f33c..6130a04cc96 100644
--- a/test/langtools/tools/javac/scope/6225935/T6214959.java
+++ b/test/langtools/tools/javac/scope/6225935/T6214959.java
@@ -2,7 +2,7 @@
  * @test    /nodynamiccopyright/
  * @bug     6214959
  * @summary Compiler fails to produce error message with ODD number of import static
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile/fail/ref=T6214959.out -XDrawDiagnostics T6214959.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6225935/T6225935.java b/test/langtools/tools/javac/scope/6225935/T6225935.java
index 4e6e5272c53..555293ca030 100644
--- a/test/langtools/tools/javac/scope/6225935/T6225935.java
+++ b/test/langtools/tools/javac/scope/6225935/T6225935.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6225935
  * @summary "import static" accessibility rules for symbols different for no reason
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile a/Private.java a/Named.java a/Star.java T6225935.java
  * @run main/othervm T6225935
  */
diff --git a/test/langtools/tools/javac/scope/6225935/T6381787.java b/test/langtools/tools/javac/scope/6225935/T6381787.java
index 1e989950d75..7a658b9e5f8 100644
--- a/test/langtools/tools/javac/scope/6225935/T6381787.java
+++ b/test/langtools/tools/javac/scope/6225935/T6381787.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6381787
  * @summary Failing Japanese Calendar regression tests
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6381787.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6225935/Test.java b/test/langtools/tools/javac/scope/6225935/Test.java
index a77c8eebd0c..1efc260c1fc 100644
--- a/test/langtools/tools/javac/scope/6225935/Test.java
+++ b/test/langtools/tools/javac/scope/6225935/Test.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6381787
  * @summary Failing Japanese Calendar regression tests
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile Test.java Bar.java Baz.java
  */
 
diff --git a/test/langtools/tools/javac/scope/6392998/T6392998.java b/test/langtools/tools/javac/scope/6392998/T6392998.java
index 82f188d6391..353d9d56233 100644
--- a/test/langtools/tools/javac/scope/6392998/T6392998.java
+++ b/test/langtools/tools/javac/scope/6392998/T6392998.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6392998
  * @summary Mustang compiler throws AssertionError (beta2-b71 and higher)
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @compile T6392998.java
  */
 
diff --git a/test/langtools/tools/javac/unicode/FirstChar.java b/test/langtools/tools/javac/unicode/FirstChar.java
index 9e7bf473907..261538ab91b 100644
--- a/test/langtools/tools/javac/unicode/FirstChar.java
+++ b/test/langtools/tools/javac/unicode/FirstChar.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 5099360
  * @summary allow unicode escape at start of program
- * @author Peter von der Ah\u00e9
+ * @author Peter von der Ahé
  * @compile FirstChar2.java
  * @run main FirstChar2
  */
diff --git a/test/langtools/tools/javac/unit/T6198196.java b/test/langtools/tools/javac/unit/T6198196.java
index 6c67c513584..3c75cc34477 100644
--- a/test/langtools/tools/javac/unit/T6198196.java
+++ b/test/langtools/tools/javac/unit/T6198196.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6198196 6278523
  * @summary package-info.java: Weird compiler error
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules java.compiler
  *          jdk.compiler
  */
diff --git a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
index 02f7161da03..7a96872f663 100644
--- a/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
+++ b/test/langtools/tools/javac/unit/util/convert/EnclosingCandidates.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6397652
  * @summary javac compilation failure when imported class with $ sign in the name
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
diff --git a/test/langtools/tools/javac/unit/util/list/AbstractList.java b/test/langtools/tools/javac/unit/util/list/AbstractList.java
index daf80486853..38cdd7c5e78 100644
--- a/test/langtools/tools/javac/unit/util/list/AbstractList.java
+++ b/test/langtools/tools/javac/unit/util/list/AbstractList.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6320536
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../..
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/AbstractList.java
diff --git a/test/langtools/tools/javac/unit/util/list/FromArray.java b/test/langtools/tools/javac/unit/util/list/FromArray.java
index 5a4b05fce93..eabdb71e148 100644
--- a/test/langtools/tools/javac/unit/util/list/FromArray.java
+++ b/test/langtools/tools/javac/unit/util/list/FromArray.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6289436
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @library ../..
  * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/FromArray.java
diff --git a/test/langtools/tools/javac/util/filemanager/TestName.java b/test/langtools/tools/javac/util/filemanager/TestName.java
index cb8c77dda93..23bb2b9c781 100644
--- a/test/langtools/tools/javac/util/filemanager/TestName.java
+++ b/test/langtools/tools/javac/util/filemanager/TestName.java
@@ -26,7 +26,7 @@
  * @bug     6409829
  * @summary JSR 199: enforce the use of valid package and class names
  *                   in get{Java,}FileFor{Input,Output}
- * @author  Peter von der Ah\u00e9
+ * @author  Peter von der Ahé
  * @modules jdk.compiler/com.sun.tools.javac.file
  */
 

From 3b271981662df2a7fdf04ffd75d017964425607c Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Wed, 14 May 2025 07:57:53 +0000
Subject: [PATCH 451/901] 8325647: [IR framework] Only prints stdout if
 exitCode is 134

Reviewed-by: chagedorn, thartmann
---
 .../jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 fcdafc9618e..2b7fd2a1eea 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
@@ -259,7 +259,9 @@ private String getExceptionInfo() {
         int exitCode = oa.getExitValue();
         String stdErr = oa.getStderr();
         String stdOut = "";
-        if (exitCode == 134) {
+        boolean osIsWindows = Platform.isWindows();
+        boolean JVMHadError = (!osIsWindows && exitCode == 134) || (osIsWindows && exitCode == -1);
+        if (JVMHadError) {
             // Also dump the stdout if we experience a JVM error (e.g. to show hit assertions etc.).
             stdOut = System.lineSeparator() + System.lineSeparator() + "Standard Output" + System.lineSeparator()
                      + "---------------" + System.lineSeparator() + oa.getOutput();

From d1032d71bfd50ebc4b328ce9b0cc81cbb80554b0 Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Wed, 14 May 2025 07:59:19 +0000
Subject: [PATCH 452/901] 8343829: Unify decimal and hexadecimal parsing in
 FloatingDecimal

Reviewed-by: darcy
---
 .../jdk/internal/math/FloatingDecimal.java    | 1269 ++++++++---------
 1 file changed, 580 insertions(+), 689 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java b/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
index 0c1732956c9..6f59338d4c8 100644
--- a/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
+++ b/src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
@@ -25,8 +25,9 @@
 
 package jdk.internal.math;
 
+import jdk.internal.vm.annotation.Stable;
+
 import java.util.Arrays;
-import java.util.regex.*;
 
 /**
  * A class for converting between ASCII and decimal representations of a single
@@ -48,7 +49,6 @@ public class FloatingDecimal{
     static final int    MAX_DECIMAL_DIGITS = 15;
     static final int    MAX_DECIMAL_EXPONENT = 308;
     static final int    MIN_DECIMAL_EXPONENT = -324;
-    static final int    BIG_DECIMAL_EXPONENT = 324; // i.e. abs(MIN_DECIMAL_EXPONENT)
     static final int    MAX_NDIGITS = 1100;
 
     static final int    SINGLE_EXP_SHIFT  =   FloatConsts.SIGNIFICAND_WIDTH - 1;
@@ -107,7 +107,7 @@ public static void appendTo(float f, Appendable buf) {
      * represent a properly formatted double precision value.
      */
     public static double parseDouble(String s) throws NumberFormatException {
-        return readJavaFormatString(s).doubleValue();
+        return readJavaFormatString(s, BINARY_64_IX).doubleValue();
     }
 
     /**
@@ -119,7 +119,7 @@ public static double parseDouble(String s) throws NumberFormatException {
      * represent a properly formatted single precision value.
      */
     public static float parseFloat(String s) throws NumberFormatException {
-        return readJavaFormatString(s).floatValue();
+        return readJavaFormatString(s, BINARY_32_IX).floatValue();
     }
 
     /**
@@ -188,7 +188,7 @@ public interface BinaryToASCIIConverter {
      */
     private static class ExceptionalBinaryToASCIIBuffer implements BinaryToASCIIConverter {
         private final String image;
-        private boolean isNegative;
+        private final boolean isNegative;
 
         public ExceptionalBinaryToASCIIBuffer(String image, boolean isNegative) {
             this.image = image;
@@ -243,9 +243,7 @@ public boolean decimalDigitsExact() {
     }
 
     private static final String INFINITY_REP = "Infinity";
-    private static final int INFINITY_LENGTH = INFINITY_REP.length();
     private static final String NAN_REP = "NaN";
-    private static final int NAN_LENGTH = NAN_REP.length();
 
     private static final BinaryToASCIIConverter B2AC_POSITIVE_INFINITY = new ExceptionalBinaryToASCIIBuffer(INFINITY_REP, false);
     private static final BinaryToASCIIConverter B2AC_NEGATIVE_INFINITY = new ExceptionalBinaryToASCIIBuffer("-" + INFINITY_REP, true);
@@ -1826,726 +1824,619 @@ private static BinaryToASCIIConverter getBinaryToASCIIConverter(float f) {
         return buf;
     }
 
-    @SuppressWarnings("fallthrough")
-    static ASCIIToBinaryConverter readJavaFormatString( String in ) throws NumberFormatException {
-        boolean isNegative = false;
-        boolean signSeen   = false;
-        int     decExp;
-        char    c;
-
-    parseNumber:
-        try{
-            in = in.trim(); // don't fool around with white space.
-                            // throws NullPointerException if null
-            int len = in.length();
-            if ( len == 0 ) {
-                throw new NumberFormatException("empty String");
-            }
-            int i = 0;
-            switch (in.charAt(i)){
-            case '-':
-                isNegative = true;
-                //FALLTHROUGH
-            case '+':
-                i++;
-                signSeen = true;
-            }
-            c = in.charAt(i);
-            if(c == 'N') { // Check for NaN
-                if((len-i)==NAN_LENGTH && in.indexOf(NAN_REP,i)==i) {
-                    return A2BC_NOT_A_NUMBER;
-                }
-                // something went wrong, throw exception
-                break parseNumber;
-            } else if(c == 'I') { // Check for Infinity strings
-                if((len-i)==INFINITY_LENGTH && in.indexOf(INFINITY_REP,i)==i) {
-                    return isNegative? A2BC_NEGATIVE_INFINITY : A2BC_POSITIVE_INFINITY;
-                }
-                // something went wrong, throw exception
-                break parseNumber;
-            } else if (c == '0')  { // check for hexadecimal floating-point number
-                if (len > i+1 ) {
-                    char ch = in.charAt(i+1);
-                    if (ch == 'x' || ch == 'X' ) { // possible hex string
-                        return parseHexString(in);
-                    }
-                }
-            }  // look for and process decimal floating-point string
-
-            byte[] digits = new byte[len];
-            boolean decSeen = false;
-            int nDigits = 0;
-            int decPt = 0;
-            int nLeadZero = 0;
-            int nTrailZero = 0;
-
-        skipLeadingZerosLoop:
-            while (i < len) {
-                c = in.charAt(i);
-                if (c == '0') {
-                    nLeadZero++;
-                } else if (c == '.') {
-                    if (decSeen) {
-                        // already saw one ., this is the 2nd.
-                        throw new NumberFormatException("multiple points");
-                    }
-                    decPt = i;
-                    if (signSeen) {
-                        decPt -= 1;
-                    }
-                    decSeen = true;
-                } else {
-                    break skipLeadingZerosLoop;
-                }
-                i++;
-            }
-        digitLoop:
-            while (i < len) {
-                c = in.charAt(i);
-                if (c >= '1' && c <= '9') {
-                    digits[nDigits++] = (byte) c;
-                    nTrailZero = 0;
-                } else if (c == '0') {
-                    digits[nDigits++] = (byte) c;
-                    nTrailZero++;
-                } else if (c == '.') {
-                    if (decSeen) {
-                        // already saw one ., this is the 2nd.
-                        throw new NumberFormatException("multiple points");
-                    }
-                    decPt = i;
-                    if (signSeen) {
-                        decPt -= 1;
-                    }
-                    decSeen = true;
-                } else {
-                    break digitLoop;
-                }
-                i++;
+    /**
+     * The input must match the {@link Double#valueOf(String) rules described here},
+     * about leading and trailing whitespaces, and the grammar.
+     *
+     * @param in the non-null input
+     * @param ix one of the {@code BINARY_<S>_IX} constants, where {@code <S>}
+     *          is one of 16, 32, 64
+     * @return an appropriate binary converter
+     * @throws NullPointerException if the input is null
+     * @throws NumberFormatException if the input is malformed
+     */
+    static ASCIIToBinaryConverter readJavaFormatString(String in, int ix) {
+        /*
+         * The scanning proper does not allocate any object,
+         * nor does it perform any costly computation.
+         * This means that all scanning errors are detected without consuming
+         * any heap, before actually throwing.
+         *
+         * Once scanning is complete, the method determines the length
+         * of a prefix of the significand that is sufficient for correct
+         * rounding according to roundTiesToEven.
+         * The actual value of the prefix length might not be optimal,
+         * but is always a safe choice.
+         *
+         * For hexadecimal input, the prefix is processed by this method directly,
+         * without allocating objects before creating the returned instance.
+         *
+         * For decimal input, the prefix is copied to the returned instance,
+         * along with the other information needed for the conversion.
+         * For comparison, the prefix length is at most
+         *       23 for BINARY_16_IX (Float16, once integrated in java.base)
+         *      114 for BINARY_32_IX (float)
+         *      769 for BINARY_64_IX (double)
+         */
+        int len = in.length();  // fail fast on null
+
+        /* Skip leading whitespaces. */
+        int i = skipWhitespaces(in, 0);  // main running index
+        if (i == len) {
+            throw new NumberFormatException("empty String");
+        }
+
+        /* Scan opt significand sign. */
+        int ch;  // running char
+        int ssign = ' ';  // ' ' iff sign is implicit
+        if ((ch = in.charAt(i)) == '-' || ch == '+') {  // i < len
+            ssign = ch;
+            ++i;
+        }
+
+        /*
+         * In some places the idiom
+         *      (ch | 0b10_0000) == lowercase-letter
+         * is used as a shortcut for
+         *      ch == lowercase-letter || ch == that-same-letter-as-uppercase
+         *
+         * Determine whether we are facing a symbolic value or hex notation.
+         */
+        boolean isDec = true;  // decimal input until proven to the contrary
+        if (i < len) {
+            ch = in.charAt(i);
+            if (ch == 'I') {
+                scanSymbolic(in, i, "Infinity");
+                return ssign != '-' ? A2BC_POSITIVE_INFINITY : A2BC_NEGATIVE_INFINITY;
             }
-            nDigits -=nTrailZero;
-            //
-            // At this point, we've scanned all the digits and decimal
-            // point we're going to see. Trim off leading and trailing
-            // zeros, which will just confuse us later, and adjust
-            // our initial decimal exponent accordingly.
-            // To review:
-            // we have seen i total characters.
-            // nLeadZero of them were zeros before any other digits.
-            // nTrailZero of them were zeros after any other digits.
-            // if ( decSeen ), then a . was seen after decPt characters
-            // ( including leading zeros which have been discarded )
-            // nDigits characters were neither lead nor trailing
-            // zeros, nor point
-            //
-            //
-            // special hack: if we saw no non-zero digits, then the
-            // answer is zero!
-            // Unfortunately, we feel honor-bound to keep parsing!
-            //
-            boolean isZero = (nDigits == 0);
-            if ( isZero &&  nLeadZero == 0 ){
-                // we saw NO DIGITS AT ALL,
-                // not even a crummy 0!
-                // this is not allowed.
-                break parseNumber; // go throw exception
+            if (ch == 'N') {
+                scanSymbolic(in, i, "NaN");
+                return A2BC_NOT_A_NUMBER;  // ignore sign
             }
-            //
-            // Our initial exponent is decPt, adjusted by the number of
-            // discarded zeros. Or, if there was no decPt,
-            // then its just nDigits adjusted by discarded trailing zeros.
-            //
-            if ( decSeen ){
-                decExp = decPt - nLeadZero;
-            } else {
-                decExp = nDigits + nTrailZero;
+            if (ch == '0' && i < len - 1 && (in.charAt(i + 1) | 0b10_0000) == 'x') {
+                isDec = false;
+                i += 2;
             }
+        }
 
-            //
-            // Look for 'e' or 'E' and an optionally signed integer.
-            //
-            if ( (i < len) &&  (((c = in.charAt(i) )=='e') || (c == 'E') ) ){
-                int expSign = 1;
-                int expVal  = 0;
-                int reallyBig = Integer.MAX_VALUE / 10;
-                boolean expOverflow = false;
-                switch( in.charAt(++i) ){
-                case '-':
-                    expSign = -1;
-                    //FALLTHROUGH
-                case '+':
-                    i++;
-                }
-                int expAt = i;
-            expLoop:
-                while ( i < len  ){
-                    if ( expVal >= reallyBig ){
-                        // the next character will cause integer
-                        // overflow.
-                        expOverflow = true;
-                    }
-                    c = in.charAt(i++);
-                    if(c>='0' && c<='9') {
-                        expVal = expVal*10 + ( (int)c - (int)'0' );
-                    } else {
-                        i--;           // back up.
-                        break expLoop; // stop parsing exponent.
-                    }
-                }
-                int expLimit = BIG_DECIMAL_EXPONENT + nDigits + nTrailZero;
-                if (expOverflow || (expVal > expLimit)) {
-                    // There is still a chance that the exponent will be safe to
-                    // use: if it would eventually decrease due to a negative
-                    // decExp, and that number is below the limit.  We check for
-                    // that here.
-                    if (!expOverflow && (expSign == 1 && decExp < 0)
-                            && (expVal + decExp) < expLimit) {
-                        // Cannot overflow: adding a positive and negative number.
-                        decExp += expVal;
-                    } else {
-                        //
-                        // The intent here is to end up with
-                        // infinity or zero, as appropriate.
-                        // The reason for yielding such a small decExponent,
-                        // rather than something intuitive such as
-                        // expSign*Integer.MAX_VALUE, is that this value
-                        // is subject to further manipulation in
-                        // doubleValue() and floatValue(), and I don't want
-                        // it to be able to cause overflow there!
-                        // (The only way we can get into trouble here is for
-                        // really outrageous nDigits+nTrailZero, such as 2
-                        // billion.)
-                        //
-                        decExp = expSign * expLimit;
-                    }
-                } else {
-                    // this should not overflow, since we tested
-                    // for expVal > (MAX+N), where N >= abs(decExp)
-                    decExp = decExp + expSign*expVal;
-                }
+        int pt = 0;  // index after point, 0 iff absent
+        int start = i;  // index of start of the significand, excluding opt sign
 
-                // if we saw something not a digit ( or end of string )
-                // after the [Ee][+-], without seeing any digits at all
-                // this is certainly an error. If we saw some digits,
-                // but then some trailing garbage, that might be ok.
-                // so we just fall through in that case.
-                // HUMBUG
-                if ( i == expAt ) {
-                    break parseNumber; // certainly bad
-                }
+        /* Skip opt leading zeros, including an opt point. */
+        while (i < len && ((ch = in.charAt(i)) == '0' || ch == '.')) {
+            ++i;
+            if (ch == '.') {
+                pt = checkMultiplePoints(pt, i);
             }
-            //
-            // We parsed everything we could.
-            // If there are leftovers, then this is not good input!
-            //
-            if ( i < len &&
-                ((i != len - 1) ||
-                (in.charAt(i) != 'f' &&
-                 in.charAt(i) != 'F' &&
-                 in.charAt(i) != 'd' &&
-                 in.charAt(i) != 'D'))) {
-                break parseNumber; // go throw exception
+        }
+        int lz = i;  // index after leading group of zeros or point
+
+        /*
+         * Scan all remaining chars of the significand, including an opt point.
+         * Also locate the index after the end of the trailing group of non-zeros
+         * inside this range of the input.
+         */
+        int tnz = 0;  // index after trailing group of non-zeros, 0 iff absent
+        while (i < len && (isDigit(ch = in.charAt(i), isDec) || ch == '.')) {
+            i++;
+            if (ch == '.') {
+                pt = checkMultiplePoints(pt, i);
+            } else if (ch != '0') {
+                tnz = i;
             }
-            if(isZero) {
-                return isNegative ? A2BC_NEGATIVE_ZERO : A2BC_POSITIVE_ZERO;
+        }
+        check(in, i - start > (pt != 0 ? 1 : 0));  // must have at least one digit
+        int stop = i;  // index after the significand
+
+        /* Scan exponent part, optional for dec, mandatory for hex. */
+        long ep = 0;  // exponent, implicitly 0
+        boolean hasExp = false;
+        if (i < len && ((ch = in.charAt(i) | 0b10_0000) == 'e' && isDec
+                || ch == 'p' && !isDec)) {
+            ++i;
+
+            /* Scan opt exponent sign. */
+            int esign = ' ';  // esign == ' ' iff the sign is implicit
+            if (i < len && ((ch = in.charAt(i)) == '-' || ch == '+')) {
+                esign = ch;
+                ++i;
             }
-            return new ASCIIToBinaryBuffer(isNegative, decExp, digits, nDigits);
-        } catch ( StringIndexOutOfBoundsException e ){ }
-        throw new NumberFormatException("For input string: \"" + in + "\"");
-    }
 
-    private static class HexFloatPattern {
-        /**
-         * Grammar is compatible with hexadecimal floating-point constants
-         * described in section 6.4.4.2 of the C99 specification.
+            /* Scan the exponent digits. Accumulate in ep, clamping at 10^10. */
+            while (i < len && isDigit(ch = in.charAt(i), true)) {  // ep is decimal
+                ++i;
+                ep = appendDecDigit(ep, ch);
+            }
+            check(in, i - stop >= 3  // at least 3 chars after significand
+                    || i - stop == 2 && esign == ' ');  // 2 chars, one is digit
+            if (esign == '-') {
+                ep = -ep;
+            }
+            hasExp = true;
+        }
+        /*
+         * |ep| < 10^10, or |ep| = 10^10 when considered "large".
+         * A "large" ep either generates a zero or an infinity.
          */
-        private static final Pattern VALUE = Pattern.compile(
-                   //1           234                   56                7                   8      9
-                    "([-+])?0[xX](((\\p{XDigit}+)\\.?)|((\\p{XDigit}*)\\.(\\p{XDigit}+)))[pP]([-+])?(\\p{Digit}+)[fFdD]?"
-                    );
-    }
+        check(in, isDec | hasExp);
 
-    /**
-     * Converts string s to a suitable floating decimal; uses the
-     * double constructor and sets the roundDir variable appropriately
-     * in case the value is later converted to a float.
-     *
-     * @param s The <code>String</code> to parse.
-     */
-   static ASCIIToBinaryConverter parseHexString(String s) {
-            // Verify string is a member of the hexadecimal floating-point
-            // string language.
-            Matcher m = HexFloatPattern.VALUE.matcher(s);
-            boolean validInput = m.matches();
-            if (!validInput) {
-                // Input does not match pattern
-                throw new NumberFormatException("For input string: \"" + s + "\"");
-            } else { // validInput
-                //
-                // We must isolate the sign, significand, and exponent
-                // fields.  The sign value is straightforward.  Since
-                // floating-point numbers are stored with a normalized
-                // representation, the significand and exponent are
-                // interrelated.
-                //
-                // After extracting the sign, we normalized the
-                // significand as a hexadecimal value, calculating an
-                // exponent adjust for any shifts made during
-                // normalization.  If the significand is zero, the
-                // exponent doesn't need to be examined since the output
-                // will be zero.
-                //
-                // Next the exponent in the input string is extracted.
-                // Afterwards, the significand is normalized as a *binary*
-                // value and the input value's normalized exponent can be
-                // computed.  The significand bits are copied into a
-                // double significand; if the string has more logical bits
-                // than can fit in a double, the extra bits affect the
-                // round and sticky bits which are used to round the final
-                // value.
-                //
-                //  Extract significand sign
-                String group1 = m.group(1);
-                boolean isNegative = ((group1 != null) && group1.equals("-"));
-
-                //  Extract Significand magnitude
-                //
-                // Based on the form of the significand, calculate how the
-                // binary exponent needs to be adjusted to create a
-                // normalized//hexadecimal* floating-point number; that
-                // is, a number where there is one nonzero hex digit to
-                // the left of the (hexa)decimal point.  Since we are
-                // adjusting a binary, not hexadecimal exponent, the
-                // exponent is adjusted by a multiple of 4.
-                //
-                // There are a number of significand scenarios to consider;
-                // letters are used in indicate nonzero digits:
-                //
-                // 1. 000xxxx       =>      x.xxx   normalized
-                //    increase exponent by (number of x's - 1)*4
-                //
-                // 2. 000xxx.yyyy =>        x.xxyyyy        normalized
-                //    increase exponent by (number of x's - 1)*4
-                //
-                // 3. .000yyy  =>   y.yy    normalized
-                //    decrease exponent by (number of zeros + 1)*4
-                //
-                // 4. 000.00000yyy => y.yy normalized
-                //    decrease exponent by (number of zeros to right of point + 1)*4
-                //
-                // If the significand is exactly zero, return a properly
-                // signed zero.
-                //
-
-                String significandString;
-                int signifLength;
-                int exponentAdjust;
-                {
-                    int leftDigits = 0; // number of meaningful digits to
-                    // left of "decimal" point
-                    // (leading zeros stripped)
-                    int rightDigits = 0; // number of digits to right of
-                    // "decimal" point; leading zeros
-                    // must always be accounted for
-                    //
-                    // The significand is made up of either
-                    //
-                    // 1. group 4 entirely (integer portion only)
-                    //
-                    // OR
-                    //
-                    // 2. the fractional portion from group 7 plus any
-                    // (optional) integer portions from group 6.
-                    //
-                    String group4;
-                    if ((group4 = m.group(4)) != null) {  // Integer-only significand
-                        // Leading zeros never matter on the integer portion
-                        significandString = stripLeadingZeros(group4);
-                        leftDigits = significandString.length();
-                    } else {
-                        // Group 6 is the optional integer; leading zeros
-                        // never matter on the integer portion
-                        String group6 = stripLeadingZeros(m.group(6));
-                        leftDigits = group6.length();
-
-                        // fraction
-                        String group7 = m.group(7);
-                        rightDigits = group7.length();
-
-                        // Turn "integer.fraction" into "integer"+"fraction"
-                        significandString =
-                                ((group6 == null) ? "" : group6) + // is the null
-                                        // check necessary?
-                                        group7;
-                    }
-
-                    significandString = stripLeadingZeros(significandString);
-                    signifLength = significandString.length();
+        /* Skip opt [FfDd]? suffix. */
+        if (i < len && (((ch = in.charAt(i) | 0b10_0000)) == 'f' || ch == 'd')) {
+            ++i;
+        }
 
-                    //
-                    // Adjust exponent as described above
-                    //
-                    if (leftDigits >= 1) {  // Cases 1 and 2
-                        exponentAdjust = 4 * (leftDigits - 1);
-                    } else {                // Cases 3 and 4
-                        exponentAdjust = -4 * (rightDigits - signifLength + 1);
-                    }
+        /* Skip optional trailing whitespaces, then must be at the end of input. */
+        check(in, skipWhitespaces(in, i) == len);
 
-                    // If the significand is zero, the exponent doesn't
-                    // matter; return a properly signed zero.
+        /* By now, the input is syntactically correct. */
+        if (tnz == 0) {  // all zero digits, so ignore ep and point
+            return ssign != '-' ? A2BC_POSITIVE_ZERO : A2BC_NEGATIVE_ZERO;
+        }
 
-                    if (signifLength == 0) { // Only zeros in input
-                        return isNegative ? A2BC_NEGATIVE_ZERO : A2BC_POSITIVE_ZERO;
-                    }
-                }
+        /*
+         * Virtually adjust the point position to be just after
+         * the last non-zero digit by adjusting the exponent accordingly
+         * (without modifying the physical pt, as it is used later on).
+         *
+         * Determine the count of digits, excluding leading and trailing zeros.
+         *
+         * These are the possible situations:
+         *         |lz               |tnz     |stop
+         * 00000000123456000000234567000000000
+         *
+         *  |pt     |lz               |tnz     |stop
+         * .00000000123456000000234567000000000
+         *
+         *    |pt   |lz               |tnz     |stop
+         * 00.000000123456000000234567000000000
+         *
+         *          |pt=lz            |tnz     |stop
+         * 00000000.123456000000234567000000000
+         *
+         *         |lz  |pt           |tnz     |stop
+         * 000000001234.56000000234567000000000
+         *
+         *         |lz      |pt       |tnz     |stop
+         * 0000000012345600.0000234567000000000
+         *
+         *         |lz          |pt   |tnz     |stop
+         * 00000000123456000000.234567000000000
+         *
+         *         |lz            |pt |tnz     |stop
+         * 0000000012345600000023.4567000000000
+         *
+         *         |lz                |pt=tnz  |stop
+         * 00000000123456000000234567.000000000
+         *
+         *         |lz               |tnz  |pt |stop
+         * 0000000012345600000023456700000.0000
+         *
+         *         |lz               |tnz      |pt=stop
+         * 00000000123456000000234567000000000.
+         *
+         * In decimal, moving the point by one position means correcting ep by 1.
+         * In hexadecimal, it means correcting ep by 4.
+         */
+        long emult = isDec ? 1L : 4L;
+        int n = tnz - lz;  // number of significant digits, 1st approximation
+        if (pt == 0) {
+            ep += emult * (stop - tnz);
+        } else {
+            ep += emult * (pt - tnz);
+            if (pt > tnz) {  // '.' was counted as a position, adjust ep
+                ep -= emult;
+            } else if (lz < pt) {  // lz < pt <= tnz
+                n -= 1;
+            }
+        }
+        /*
+         * n = number of significant digits (that is, not counting leading nor
+         * trailing zeros)
+         * |ep| < 10^11
+         *
+         * The magnitude x of the input meets
+         *      x = f 10^ep  (decimal)
+         *      x = f 2^ep  (hexadecimal)
+         * Integer f = <f_1 ... f_n> consists of the n decimal or hexadecimal
+         * digits found in part [lz, tnz) of the input, and f_1 != 0, f_n != 0.
+         */
 
-                //  Extract Exponent
-                //
-                // Use an int to read in the exponent value; this should
-                // provide more than sufficient range for non-contrived
-                // inputs.  If reading the exponent in as an int does
-                // overflow, examine the sign of the exponent and
-                // significand to determine what to do.
-                //
-                String group8 = m.group(8);
-                boolean positiveExponent = (group8 == null) || group8.equals("+");
-                long unsignedRawExponent;
-                try {
-                    unsignedRawExponent = Integer.parseInt(m.group(9));
+        if (!isDec) {  // hexadecimal conversion is performed entirely here
+            /*
+             * Rounding the leftmost P bits +1 rounding bit +1 sticky bit
+             * has the same outcome as rounding all bits.
+             * In terms of hex digits, we need room for HEX_COUNT of them.
+             */
+            int j = 0;
+            i = lz;
+            long c = 0;
+            int le = Math.min(n, HEX_COUNT[ix]);
+            while (j < le) {
+                if ((ch = in.charAt(i++)) != '.') {
+                    ++j;
+                    c = c << 4 | digitFor(ch);
                 }
-                catch (NumberFormatException e) {
-                    // At this point, we know the exponent is
-                    // syntactically well-formed as a sequence of
-                    // digits.  Therefore, if an NumberFormatException
-                    // is thrown, it must be due to overflowing int's
-                    // range.  Also, at this point, we have already
-                    // checked for a zero significand.  Thus the signs
-                    // of the exponent and significand determine the
-                    // final result:
-                    //
-                    //                      significand
-                    //                      +               -
-                    // exponent     +       +infinity       -infinity
-                    //              -       +0.0            -0.0
-                    return isNegative ?
-                              (positiveExponent ? A2BC_NEGATIVE_INFINITY : A2BC_NEGATIVE_ZERO)
-                            : (positiveExponent ? A2BC_POSITIVE_INFINITY : A2BC_POSITIVE_ZERO);
+            }
+            if (n > le) {
+                c |= 0b1;  // force a sticky bit
+                ep += 4L * (n - le);
+            }
 
+            int bl = Long.SIZE - Long.numberOfLeadingZeros(c);  // bit length
+            /*
+             * Let x = c 2^ep, so 2^(ep+bl-1) <= x < 2^(ep+bl)
+             * When ep + bl < Q_MIN then x certainly rounds to zero.
+             * When ep + bl - 1 > E_MAX then x surely rounds to infinity.
+             */
+            if (ep < Q_MIN[ix] - bl) {
+                return buildZero(ix, ssign);
+            }
+            if (ep > E_MAX[ix] - bl + 1) {
+                return buildInfinity(ix, ssign);
+            }
+            int q = (int) ep;  // narrowing conversion is safe
+            int shr;  // (sh)ift to (r)ight iff shr > 0
+            if (q > E_MIN[ix] - bl) {
+                shr = bl - P[ix];
+                q += shr;
+            } else {
+                shr = Q_MIN[ix] - q;
+                q = Q_MIN[ix];
+            }
+            if (shr > 0) {
+                long thr = 1L << shr;
+                long tail = (c & thr - 1) << 1;
+                c >>>= shr;
+                if (tail > thr || tail == thr && (c & 0b1) != 0) {
+                    c += 1;
+                    if (c >= 1L << P[ix]) {  // but in fact it can't be >
+                        c >>>= 1;
+                        q += 1;
+                    }
                 }
+            } else {
+                c <<= -shr;
+            }
 
-                long rawExponent =
-                        (positiveExponent ? 1L : -1L) * // exponent sign
-                                unsignedRawExponent;            // exponent magnitude
-
-                // Calculate partially adjusted exponent
-                long exponent = rawExponent + exponentAdjust;
+            /* For now throw on BINARY_16_IX, until Float16 is integrated in java.base. */
+            return switch (ix) {
+                case BINARY_32_IX ->
+                    new PreparedASCIIToBinaryBuffer(Double.NaN, buildFloat(ssign, q, c));
+                case BINARY_64_IX ->
+                    new PreparedASCIIToBinaryBuffer(buildDouble(ssign, q, c), Float.NaN);
+                default -> throw new AssertionError("unexpected");
+            };
+        }
 
-                // Starting copying non-zero bits into proper position in
-                // a long; copy explicit bit too; this will be masked
-                // later for normal values.
+        /*
+         * For decimal inputs, we copy an appropriate prefix of the input and
+         * rely on another method to do the (sometimes intensive) math conversion.
+         *
+         * Define e' = n + ep, which leads to
+         *      x = <0 . f_1 ... f_n> 10^e', 10^(e'-1) <= x < 10^e'
+         * If e' <= EP_MIN then x rounds to zero.
+         * Similarly, if e' >= EP_MAX then x rounds to infinity.
+         * (See the comments on the fields for their semantics.)
+         * We return immediately in these cases.
+         * Otherwise, e' fits in an int named e.
+         */
+        int e = Math.clamp(ep + n, EP_MIN[ix], EP_MAX[ix]);
+        if (e == EP_MIN[ix]) {  // e' <= E_MIN
+            return ssign != '-' ? A2BC_POSITIVE_ZERO : A2BC_NEGATIVE_ZERO;
+        }
+        if (e == EP_MAX[ix]) {  // e' >= E_MAX
+            return ssign != '-' ? A2BC_POSITIVE_INFINITY : A2BC_NEGATIVE_INFINITY;
+        }
 
-                boolean round = false;
-                boolean sticky = false;
-                int nextShift;
-                long significand = 0L;
-                // First iteration is different, since we only copy
-                // from the leading significand bit; one more exponent
-                // adjust will be needed...
+        /*
+         * For further considerations, x also needs to be seen as
+         *      x = beta 2^q
+         * with real beta and integer q meeting
+         *      2^(P-1) <= beta < 2^P and q >= Q_MIN
+         *      0 < beta < 2^(P-1) and q = Q_MIN
+         * The (unique) solution is
+         *      q = max(floor(log2(x)) - (P-1), Q_MIN), beta = x 2^(-q)
+         * It's usually costly to determine q as here.
+         * However, estimates to q are cheaper and quick to compute.
+         *
+         * Indeed, it's a matter of some simple maths to show that, by defining
+         *      ql = max(floor((e-1) log2(10)) - (P-1), Q_MIN)
+         *      qh = max(floor(e log2(10)) - (P-1), Q_MIN)
+         * then the following hold
+         *      ql <= q <= qh, and qh - ql <= 4
+         * Since by now e is relatively small, we can leverage flog2pow10().
+         *
+         * When q >= Q_MIN, consider the interval [ 2^(P-1+q), 2^(P+q) ).
+         * It contains all floating-point values of the form
+         *      c 2^q, c integer, 2^(P-1) <= c < 2^P (normal values)
+         * When q = Q_MIN also consider the interval [0, 2^(P-1+q) )
+         * which contains all floating-point values of the form
+         *      c 2^q, c integer, 0 <= c < 2^(P-1) (subnormal values and zero)
+         * For these c values, all numbers of the form
+         *      (c + 1/2) 2^q
+         * also belong to the intervals.
+         * These are the boundaries of the rounding intervals and are key for
+         * correct rounding.
+         *
+         * First assume ql > 0, so q > 0.
+         * All rounding boundaries (c + 1/2) 2^q are integers.
+         * Hence, to correctly round x, it's enough to retain its integer part,
+         * +1 non-zero sticky digit iff the fractional part is non-zero.
+         * (Well, the sticky digit is only needed when the integer part
+         * coincides with a boundary, but that's hard to detect at this stage.
+         * Adding the sticky digit is always safe.)
+         * If n > e we pass the digits <f_1 ... f_e 3> (3 is as good as any other
+         * non-zero sticky digit) and the exponent e to the conversion routine.
+         * If n <= e we pass all the digits <f_1 ... f_n> (no sticky digit,
+         * as the fractional part is empty) and the exponent e to the converter.
+         *
+         * Now assume qh <= 0, so q <= 0.
+         * The boundaries (c + 1/2) 2^q = (2c + 1) 2^(q-1) have a fractional part
+         * of 1 - q digits: some (or zero) leading zeros, the rightmost is 5.
+         * A correct rounding needs to retain the integer part of x (if any),
+         * 1 - q digits of the fractional part, +1 non-zero sticky digit iff
+         * the rest of the fractional part beyond the 1 - q digits is non-zero.
+         * (Again, the sticky digit is only needed when the digit in f at the
+         * same position as the last 5 of the rounding boundary is 5 as well.
+         * But let's keep it simple for now.)
+         * However, q is unknown, so use the conservative ql instead.
+         * More precisely, if n > e + 1 - ql we pass the leftmost e + 1 - ql
+         * digits of f, sticky 3, and e.
+         * Otherwise, n <= e + 1 - ql.
+         * We pass all n digits of f, no sticky digit, and e to the converter.
+         *
+         * Otherwise, ql <= 0 < qh, so -4 < q <= 4.
+         * Again, since q is not known exactly, we proceed as in the previous
+         * case, with ql as a safe replacement for q.
+         */
+        int ql = Math.max(MathUtils.flog2pow10(e - 1) - (P[ix] - 1), Q_MIN[ix]);
+        int np = e + Math.max(2 - ql, 1);
+        byte[] digits = new byte[Math.min(n, np)];
+        if (n >= np) {
+            copyDigits(in, digits, np - 1, lz);
+            digits[np - 1] = '3';  // append any non-zero sticky digit
+        } else {
+            copyDigits(in, digits, n, lz);
+        }
+        return new ASCIIToBinaryBuffer(ssign == '-', e, digits, digits.length);
+    }
 
-                // IMPORTANT: make leadingDigit a long to avoid
-                // surprising shift semantics!
-                long leadingDigit = getHexDigit(significandString, 0);
+    private static PreparedASCIIToBinaryBuffer buildZero(int ix, int ssign) {
+        /* For now throw on BINARY_16_IX, until Float16 is integrated in java.base. */
+        return switch (ix) {
+            case BINARY_32_IX ->
+                new PreparedASCIIToBinaryBuffer(
+                        Double.NaN,
+                        ssign != '-' ? 0.0f : -0.0f);
+            case BINARY_64_IX ->
+                new PreparedASCIIToBinaryBuffer(
+                        ssign != '-' ? 0.0d : -0.0d,
+                        Float.NaN);
+            default -> throw new AssertionError("unexpected");
+        };
+    }
 
-                //
-                // Left shift the leading digit (53 - (bit position of
-                // leading 1 in digit)); this sets the top bit of the
-                // significand to 1.  The nextShift value is adjusted
-                // to take into account the number of bit positions of
-                // the leadingDigit actually used.  Finally, the
-                // exponent is adjusted to normalize the significand
-                // as a binary value, not just a hex value.
-                //
-                if (leadingDigit == 1) {
-                    significand |= leadingDigit << 52;
-                    nextShift = 52 - 4;
-                    // exponent += 0
-                } else if (leadingDigit <= 3) { // [2, 3]
-                    significand |= leadingDigit << 51;
-                    nextShift = 52 - 5;
-                    exponent += 1;
-                } else if (leadingDigit <= 7) { // [4, 7]
-                    significand |= leadingDigit << 50;
-                    nextShift = 52 - 6;
-                    exponent += 2;
-                } else if (leadingDigit <= 15) { // [8, f]
-                    significand |= leadingDigit << 49;
-                    nextShift = 52 - 7;
-                    exponent += 3;
-                } else {
-                    throw new AssertionError("Result from digit conversion too large!");
-                }
-                // The preceding if-else could be replaced by a single
-                // code block based on the high-order bit set in
-                // leadingDigit.  Given leadingOnePosition,
+    private static PreparedASCIIToBinaryBuffer buildInfinity(int ix, int ssign) {
+        /* For now throw on BINARY_16_IX, until Float16 is integrated in java.base. */
+        return switch (ix) {
+            case BINARY_32_IX ->
+                new PreparedASCIIToBinaryBuffer(
+                        Double.NaN,
+                        ssign != '-' ? Float.POSITIVE_INFINITY : Float.NEGATIVE_INFINITY);
+            case BINARY_64_IX ->
+                new PreparedASCIIToBinaryBuffer(
+                        ssign != '-' ? Double.POSITIVE_INFINITY : Double.NEGATIVE_INFINITY,
+                        Float.NaN);
+            default -> throw new AssertionError("unexpected");
+        };
+    }
 
-                // significand |= leadingDigit << (SIGNIFICAND_WIDTH - leadingOnePosition);
-                // nextShift = 52 - (3 + leadingOnePosition);
-                // exponent += (leadingOnePosition-1);
+    private static double buildDouble(int ssign, int q, long c) {
+        long be = c < 1L << P[BINARY_64_IX] - 1
+                ? 0
+                : q + ((DoubleConsts.EXP_BIAS - 1) + P[BINARY_64_IX]);
+        long bits = (ssign != '-' ? 0L : 1L << Double.SIZE - 1)
+                | be << P[BINARY_64_IX] - 1
+                | c & DoubleConsts.SIGNIF_BIT_MASK;
+        return Double.longBitsToDouble(bits);
+    }
 
-                //
-                // Now the exponent variable is equal to the normalized
-                // binary exponent.  Code below will make representation
-                // adjustments if the exponent is incremented after
-                // rounding (includes overflows to infinity) or if the
-                // result is subnormal.
-                //
+    private static float buildFloat(int ssign, int q, long c) {
+        int be = c < 1L << P[BINARY_32_IX] - 1
+                ? 0
+                : q + ((FloatConsts.EXP_BIAS - 1) + P[BINARY_32_IX]);
+        int bits = (ssign != '-' ? 0 : 1 << Float.SIZE - 1)
+                | be << P[BINARY_32_IX] - 1
+                | (int) c & FloatConsts.SIGNIF_BIT_MASK;
+        return Float.intBitsToFloat(bits);
+    }
 
-                // Copy digit into significand until the significand can't
-                // hold another full hex digit or there are no more input
-                // hex digits.
-                int i = 0;
-                for (i = 1;
-                     i < signifLength && nextShift >= 0;
-                     i++) {
-                    long currentDigit = getHexDigit(significandString, i);
-                    significand |= (currentDigit << nextShift);
-                    nextShift -= 4;
-                }
+    private static void copyDigits(String in, byte[] digits, int len, int i) {
+        int ch;
+        int j = 0;
+        while (j < len) {
+            if ((ch = in.charAt(i++)) != '.') {
+                digits[j++] = (byte) ch;
+            }
+        }
+    }
 
-                // After the above loop, the bulk of the string is copied.
-                // Now, we must copy any partial hex digits into the
-                // significand AND compute the round bit and start computing
-                // sticky bit.
-
-                if (i < signifLength) { // at least one hex input digit exists
-                    long currentDigit = getHexDigit(significandString, i);
-
-                    // from nextShift, figure out how many bits need
-                    // to be copied, if any
-                    switch (nextShift) { // must be negative
-                        case -1:
-                            // three bits need to be copied in; can
-                            // set round bit
-                            significand |= ((currentDigit & 0xEL) >> 1);
-                            round = (currentDigit & 0x1L) != 0L;
-                            break;
-
-                        case -2:
-                            // two bits need to be copied in; can
-                            // set round and start sticky
-                            significand |= ((currentDigit & 0xCL) >> 2);
-                            round = (currentDigit & 0x2L) != 0L;
-                            sticky = (currentDigit & 0x1L) != 0;
-                            break;
-
-                        case -3:
-                            // one bit needs to be copied in
-                            significand |= ((currentDigit & 0x8L) >> 3);
-                            // Now set round and start sticky, if possible
-                            round = (currentDigit & 0x4L) != 0L;
-                            sticky = (currentDigit & 0x3L) != 0;
-                            break;
-
-                        case -4:
-                            // all bits copied into significand; set
-                            // round and start sticky
-                            round = ((currentDigit & 0x8L) != 0);  // is top bit set?
-                            // nonzeros in three low order bits?
-                            sticky = (currentDigit & 0x7L) != 0;
-                            break;
-
-                        default:
-                            throw new AssertionError("Unexpected shift distance remainder.");
-                            // break;
-                    }
+    /* Arithmetically "appends the dec digit" ch to v >= 0, clamping at 10^10. */
+    private static long appendDecDigit(long v, int ch) {
+        return v < 10_000_000_000L / 10 ? 10 * v + (ch - '0') : 10_000_000_000L;
+    }
 
-                    // Round is set; sticky might be set.
+    /* Whether ch is a digit char '0-9', 'A-F', or 'a-f', depending on isDec. */
+    private static boolean isDigit(int ch, boolean isDec) {
+        int lch;  // lowercase ch
+        return '0' <= ch && ch <= '9' ||
+                !isDec && 'a' <= (lch = ch | 0b10_0000) && lch <= 'f';
+    }
 
-                    // For the sticky bit, it suffices to check the
-                    // current digit and test for any nonzero digits in
-                    // the remaining unprocessed input.
-                    i++;
-                    while (i < signifLength && !sticky) {
-                        currentDigit = getHexDigit(significandString, i);
-                        sticky = sticky || (currentDigit != 0);
-                        i++;
-                    }
+    /* Returns the numeric value of ch, assuming it is a hexdigit. */
+    private static int digitFor(int ch) {
+        return ch <= '9' ? ch - '0' : (ch | 0b10_0000) - ('a' - 10);
+    }
 
-                }
-                // else all of string was seen, round and sticky are
-                // correct as false.
-
-                // Float calculations
-                int floatBits = isNegative ? FloatConsts.SIGN_BIT_MASK : 0;
-                if (exponent >= Float.MIN_EXPONENT) {
-                    if (exponent > Float.MAX_EXPONENT) {
-                        // Float.POSITIVE_INFINITY
-                        floatBits |= FloatConsts.EXP_BIT_MASK;
-                    } else {
-                        int threshShift = DoubleConsts.SIGNIFICAND_WIDTH - FloatConsts.SIGNIFICAND_WIDTH - 1;
-                        boolean floatSticky = (significand & ((1L << threshShift) - 1)) != 0 || round || sticky;
-                        int iValue = (int) (significand >>> threshShift);
-                        if ((iValue & 3) != 1 || floatSticky) {
-                            iValue++;
-                        }
-                        floatBits |= (((((int) exponent) + (FloatConsts.EXP_BIAS - 1))) << SINGLE_EXP_SHIFT) + (iValue >> 1);
-                    }
-                } else {
-                    if (exponent < FloatConsts.MIN_SUB_EXPONENT - 1) {
-                        // 0
-                    } else {
-                        // exponent == -127 ==> threshShift = 53 - 2 + (-149) - (-127) = 53 - 24
-                        int threshShift = (int) ((DoubleConsts.SIGNIFICAND_WIDTH - 2 + FloatConsts.MIN_SUB_EXPONENT) - exponent);
-                        assert threshShift >= DoubleConsts.SIGNIFICAND_WIDTH - FloatConsts.SIGNIFICAND_WIDTH;
-                        assert threshShift < DoubleConsts.SIGNIFICAND_WIDTH;
-                        boolean floatSticky = (significand & ((1L << threshShift) - 1)) != 0 || round || sticky;
-                        int iValue = (int) (significand >>> threshShift);
-                        if ((iValue & 3) != 1 || floatSticky) {
-                            iValue++;
-                        }
-                        floatBits |= iValue >> 1;
-                    }
-                }
-                float fValue = Float.intBitsToFloat(floatBits);
-
-                // Check for overflow and update exponent accordingly.
-                if (exponent > Double.MAX_EXPONENT) {         // Infinite result
-                    // overflow to properly signed infinity
-                    return isNegative ? A2BC_NEGATIVE_INFINITY : A2BC_POSITIVE_INFINITY;
-                } else {  // Finite return value
-                    if (exponent <= Double.MAX_EXPONENT && // (Usually) normal result
-                            exponent >= Double.MIN_EXPONENT) {
-
-                        // The result returned in this block cannot be a
-                        // zero or subnormal; however after the
-                        // significand is adjusted from rounding, we could
-                        // still overflow in infinity.
-
-                        // AND exponent bits into significand; if the
-                        // significand is incremented and overflows from
-                        // rounding, this combination will update the
-                        // exponent correctly, even in the case of
-                        // Double.MAX_VALUE overflowing to infinity.
-
-                        significand = ((( exponent +
-                                (long) DoubleConsts.EXP_BIAS) <<
-                                (DoubleConsts.SIGNIFICAND_WIDTH - 1))
-                                & DoubleConsts.EXP_BIT_MASK) |
-                                (DoubleConsts.SIGNIF_BIT_MASK & significand);
-
-                    } else {  // Subnormal or zero
-                        // (exponent < Double.MIN_EXPONENT)
-
-                        if (exponent < (DoubleConsts.MIN_SUB_EXPONENT - 1)) {
-                            // No way to round back to nonzero value
-                            // regardless of significand if the exponent is
-                            // less than -1075.
-                            return isNegative ? A2BC_NEGATIVE_ZERO : A2BC_POSITIVE_ZERO;
-                        } else { //  -1075 <= exponent <= MIN_EXPONENT -1 = -1023
-                            //
-                            // Find bit position to round to; recompute
-                            // round and sticky bits, and shift
-                            // significand right appropriately.
-                            //
-
-                            sticky = sticky || round;
-                            round = false;
-
-                            // Number of bits of significand to preserve is
-                            // exponent - abs_min_exp +1
-                            // check:
-                            // -1075 +1074 + 1 = 0
-                            // -1023 +1074 + 1 = 52
-
-                            int bitsDiscarded = 53 -
-                                    ((int) exponent - DoubleConsts.MIN_SUB_EXPONENT + 1);
-                            assert bitsDiscarded >= 1 && bitsDiscarded <= 53;
-
-                            // What to do here:
-                            // First, isolate the new round bit
-                            round = (significand & (1L << (bitsDiscarded - 1))) != 0L;
-                            if (bitsDiscarded > 1) {
-                                // create mask to update sticky bits; low
-                                // order bitsDiscarded bits should be 1
-                                long mask = ~((~0L) << (bitsDiscarded - 1));
-                                sticky = sticky || ((significand & mask) != 0L);
-                            }
-
-                            // Now, discard the bits
-                            significand = significand >> bitsDiscarded;
-
-                            significand = ((((long) (Double.MIN_EXPONENT - 1) + // subnorm exp.
-                                    (long) DoubleConsts.EXP_BIAS) <<
-                                    (DoubleConsts.SIGNIFICAND_WIDTH - 1))
-                                    & DoubleConsts.EXP_BIT_MASK) |
-                                    (DoubleConsts.SIGNIF_BIT_MASK & significand);
-                        }
-                    }
+    /*
+     * Starting at i, skips all chars in ['\0', ' '].
+     * Returns the index after the whitespaces.
+     */
+    private static int skipWhitespaces(String in, int i) {
+        int len = in.length();
+        for (; i < len && in.charAt(i) <= ' '; ++i);  // empty body
+        return i;
+    }
 
-                    // The significand variable now contains the currently
-                    // appropriate exponent bits too.
+    /*
+     * Attempts to scan sub and optional trailing whitespaces, starting at index i.
+     * The optional whitespaces must be at the end of in.
+     */
+    private static void scanSymbolic(String in, int i, String sub) {
+        int high = i + sub.length();  // might overflow, checked in next line
+        check(in, i <= high && high <= in.length()
+                        && in.indexOf(sub, i, high) == i
+                        && skipWhitespaces(in, high) == in.length());
+    }
 
-                    //
-                    // Determine if significand should be incremented;
-                    // making this determination depends on the least
-                    // significant bit and the round and sticky bits.
-                    //
-                    // Round to nearest even rounding table, adapted from
-                    // table 4.7 in "Computer Arithmetic" by IsraelKoren.
-                    // The digit to the left of the "decimal" point is the
-                    // least significant bit, the digits to the right of
-                    // the point are the round and sticky bits
-                    //
-                    // Number       Round(x)
-                    // x0.00        x0.
-                    // x0.01        x0.
-                    // x0.10        x0.
-                    // x0.11        x1. = x0. +1
-                    // x1.00        x1.
-                    // x1.01        x1.
-                    // x1.10        x1. + 1
-                    // x1.11        x1. + 1
-                    //
-                    boolean leastZero = ((significand & 1L) == 0L);
-                    if ((leastZero && round && sticky) ||
-                            ((!leastZero) && round)) {
-                        significand++;
-                    }
+    /*
+     * Returns i if this is the first time the scanner detects a point.
+     * Throws otherwise.
+     */
+    private static int checkMultiplePoints(int pt, int i) {
+        if (pt != 0) {
+            throw new NumberFormatException("multiple points");
+        }
+        return i;
+    }
 
-                    double value = isNegative ?
-                            Double.longBitsToDouble(significand | DoubleConsts.SIGN_BIT_MASK) :
-                            Double.longBitsToDouble(significand );
+    private static final int MAX_OUT = 1_000;
+    private static final String OMITTED = " ... ";
+    private static final int L_HALF = (MAX_OUT - OMITTED.length()) / 2;
+    private static final int R_HALF = MAX_OUT - (L_HALF + OMITTED.length());
 
-                    return new PreparedASCIIToBinaryBuffer(value, fValue);
-                }
+    private static void check(String in, boolean expected) {
+        if (!expected) {
+            int len = in.length();
+            if (len > MAX_OUT) {  // discard middle chars to achieve a length of MAX_OUT
+                in = in.substring(0, L_HALF) + OMITTED + in.substring(len - R_HALF);
             }
+            throw new NumberFormatException("For input string: \"" + in + "\"");
+        }
     }
 
-    /**
-     * Returns <code>s</code> with any leading zeros removed.
+    /*
+     * According to IEEE 754-2019, a finite positive binary floating-point
+     * of precision P is (uniquely) expressed as
+     *      c 2^q
+     * where integers c and q meet
+     *      Q_MIN <= q <= Q_MAX
+     *      either      2^(P-1) <= c < 2^P  (normal)
+     *      or          0 < c < 2^(P-1)  &  q = Q_MIN  (subnormal)
+     *      c = <d_0 d_1 ... d_(P-1)>, d_i in [0, 2)
+     *
+     * Equivalently, the fp value can be (uniquely) expressed as
+     *      m 2^ep
+     * where integer ep and real f meet
+     *      ep = q + P - 1
+     *      m = c 2^(1-P)
+     * Hence,
+     *      E_MIN = Q_MIN + P - 1, E_MAX = Q_MAX + P - 1,
+     *      1 <= m < 2      (normal)
+     *      m < 1           (subnormal)
+     *      m = <d_0 . d_1 ... d_(P-1)>
+     * with a (binary) point between d_0 and d_1
      */
-    static String stripLeadingZeros(String s) {
-        if(!s.isEmpty() && s.charAt(0)=='0') {
-            for(int i=1; i<s.length(); i++) {
-                if(s.charAt(i)!='0') {
-                    return s.substring(i);
-                }
-            }
-            return "";
-        }
-        return s;
-    }
 
-    /**
-     * Extracts a hexadecimal digit from position <code>position</code>
-     * of string <code>s</code>.
+    /*
+     * These constants are used to indicate the IEEE binary floating-point format
+     * as an index (ix) to some methods and static arrays in this class.
      */
-    static int getHexDigit(String s, int position) {
-        int value = Character.digit(s.charAt(position), 16);
-        if (value <= -1 || value >= 16) {
-            throw new AssertionError("Unexpected failure of digit conversion of " +
-                                     s.charAt(position));
-        }
-        return value;
-    }
+    private static final int BINARY_16_IX = 0;
+    private static final int BINARY_32_IX = 1;
+    private static final int BINARY_64_IX = 2;
+//    private static final int BINARY_128_IX = 3;
+//    private static final int BINARY_256_IX = 4;
+
+    /* The precision of the format. */
+    @Stable
+    private static final int[] P = {
+            11, 24, 53, // 113, 237,
+    };
+
+    /*
+     * EP_MIN = max{e : 10^e <= MIN_VALUE/2}.
+     * Note that MIN_VALUE/2 is the 0 threshold.
+     * Less or equal values round to 0 when using roundTiesToEven.
+     * Equivalently, EP_MIN = floor(log10(2^(Q_MIN-1))).
+     */
+    @Stable
+    private static final int[] EP_MIN = {
+            -8, -46, -324, // -4_966, -78_985,
+    };
+
+    /*
+     * EP_MAX = min{e : MAX_VALUE + ulp(MAX_VALUE)/2 <= 10^(e-1)}.
+     * Note that MAX_VALUE + ulp(MAX_VALUE)/2 is the infinity threshold.
+     * Greater or equal values round to infinity when using roundTiesToEven.
+     * Equivalently, EP_MAX = ceil(log10((2^P - 1/2) 2^Q_MAX)) + 1.
+     */
+    @Stable
+    private static final int[] EP_MAX = {
+            6, 40, 310, // 4_934, 78_915,
+    };
+
+    /* Exponent width. */
+    @Stable
+    private static final int[] W = {
+            (1 << 4 + BINARY_16_IX) - P[BINARY_16_IX],
+            (1 << 4 + BINARY_32_IX) - P[BINARY_32_IX],
+            (1 << 4 + BINARY_64_IX) - P[BINARY_64_IX],
+//            (1 << 4 + BINARY_128_IX) - P[BINARY_128_IX],
+//            (1 << 4 + BINARY_256_IX) - P[BINARY_256_IX],
+    };
+
+    /* Maximum exponent in the m 2^e representation. */
+    @Stable
+    private static final int[] E_MAX = {
+            (1 << W[BINARY_16_IX] - 1) - 1,
+            (1 << W[BINARY_32_IX] - 1) - 1,
+            (1 << W[BINARY_64_IX] - 1) - 1,
+//            (1 << W[BINARY_128_IX] - 1) - 1,
+//            (1 << W[BINARY_256_IX] - 1) - 1,
+    };
+
+    /* Minimum exponent in the m 2^e representation. */
+    @Stable
+    private static final int[] E_MIN = {
+            1 - E_MAX[BINARY_16_IX],
+            1 - E_MAX[BINARY_32_IX],
+            1 - E_MAX[BINARY_64_IX],
+//            1 - E_MAX[BINARY_128_IX],
+//            1 - E_MAX[BINARY_256_IX],
+    };
+
+    /* Minimum exponent in the c 2^q representation. */
+    @Stable
+    private static final int[] Q_MIN = {
+            E_MIN[BINARY_16_IX] - (P[BINARY_16_IX] - 1),
+            E_MIN[BINARY_32_IX] - (P[BINARY_32_IX] - 1),
+            E_MIN[BINARY_64_IX] - (P[BINARY_64_IX] - 1),
+//            E_MIN[BINARY_128_IX] - (P[BINARY_128_IX] - 1),
+//            E_MIN[BINARY_256_IX] - (P[BINARY_256_IX] - 1),
+    };
+
+    /*
+     * The most significant P +1 rounding bit +1 sticky bit = P + 2 bits in a
+     * hexadecimal string need up to HEX_COUNT = floor(P/4) + 2 hex digits.
+     */
+    @Stable
+    private static final int[] HEX_COUNT = {
+            P[BINARY_16_IX] / 4 + 2,
+            P[BINARY_32_IX] / 4 + 2,
+            P[BINARY_64_IX] / 4 + 2,
+//            P[BINARY_128_IX] / 4 + 2,
+//            P[BINARY_256_IX] / 4 + 2,
+    };
+
 }

From 265bc5f47d4c0b973fd09d3c2d7576f5f786399f Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 14 May 2025 08:21:54 +0000
Subject: [PATCH 453/901] 8353496: SuspendResume1.java and SuspendResume2.java
 timeout after JDK-8319447

Reviewed-by: cjplummer, alanb
---
 .../jvmti/vthread/SuspendResume1/SuspendResume1.java      | 8 ++++----
 .../jvmti/vthread/SuspendResume2/SuspendResume2.java      | 8 ++++----
 .../jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
index e4673c3d017..39f9a1ab2ae 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/SuspendResume1.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
@@ -164,11 +164,11 @@ public void run() {
         // run in a loop
         threadReady = true;
         int i = 0;
-        int n = 1000;
+        int n = 100;
         while (!shouldFinish) {
             if (n <= 0) {
-                n = 1000;
-                SuspendResume1.sleep(10);
+                n = 100;
+                SuspendResume1.sleep(50);
             }
             if (i > n) {
                 i = 0;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
index 7c7d21160ae..b773cf3fa0a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/SuspendResume2.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
@@ -158,11 +158,11 @@ public void run() {
         // run in a loop
         threadReady = true;
         int i = 0;
-        int n = 1000;
+        int n = 100;
         while (!shouldFinish) {
             if (n <= 0) {
-                n = 1000;
-                SuspendResume2.sleep(10);
+                n = 100;
+                SuspendResume2.sleep(50);
             }
             if (i > n) {
                 i = 0;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
index 342ba3ea996..35ea1611453 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/SuspendResumeAll.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
@@ -155,12 +155,12 @@ public void run() {
         // run in a loop
         threadReady = true;
         int i = 0;
-        int n = 1000;
+        int n = 100;
         while (!shouldFinish) {
             breakpointCheck();
             if (n <= 0) {
-                n = 1000;
-                SuspendResumeAll.sleep(1);
+                n = 100;
+                SuspendResumeAll.sleep(50);
             }
             if (i > n) {
                 i = 0;

From b76b610788cea7149a04faeeba01067272b6e046 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Wed, 14 May 2025 08:28:11 +0000
Subject: [PATCH 454/901] 8356869: RISC-V: Improve tail handling of array fill
 stub

Reviewed-by: fyang, fjiang, mli
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 28 +++++++++----------
 .../openjdk/bench/vm/compiler/ArrayFill.java  |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index e7cae74dab5..9fcbcbbf51d 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2122,32 +2122,32 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     // Remaining count is less than 8 bytes and address is heapword aligned.
-    Label L_fill_2, L_fill_4, L_exit1;
+    Label L_fill_1, L_fill_2, L_exit1;
     switch (t) {
       case T_BYTE:
-        __ test_bit(t0, count, 0);
+        __ test_bit(t0, count, 2);
         __ beqz(t0, L_fill_2);
-        __ sb(value, Address(to, 0));
-        __ addi(to, to, 1);
+        __ sw(value, Address(to, 0));
+        __ addi(to, to, 4);
         __ bind(L_fill_2);
         __ test_bit(t0, count, 1);
-        __ beqz(t0, L_fill_4);
+        __ beqz(t0, L_fill_1);
         __ sh(value, Address(to, 0));
         __ addi(to, to, 2);
-        __ bind(L_fill_4);
-        __ test_bit(t0, count, 2);
+        __ bind(L_fill_1);
+        __ test_bit(t0, count, 0);
         __ beqz(t0, L_exit1);
-        __ sw(value, Address(to, 0));
+        __ sb(value, Address(to, 0));
         break;
       case T_SHORT:
-        __ test_bit(t0, count, 0);
-        __ beqz(t0, L_fill_4);
-        __ sh(value, Address(to, 0));
-        __ addi(to, to, 2);
-        __ bind(L_fill_4);
         __ test_bit(t0, count, 1);
-        __ beqz(t0, L_exit1);
+        __ beqz(t0, L_fill_2);
         __ sw(value, Address(to, 0));
+        __ addi(to, to, 4);
+        __ bind(L_fill_2);
+        __ test_bit(t0, count, 0);
+        __ beqz(t0, L_exit1);
+        __ sh(value, Address(to, 0));
         break;
       case T_INT:
         __ beqz(count, L_exit1);
diff --git a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
index c86894a6ee5..90508ec79a9 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
@@ -46,7 +46,7 @@
 @Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
 @Fork(value = 3)
 public class ArrayFill {
-    @Param("65536") private int size;
+    @Param({"7", "15", "65536"}) private int size;
 
     private byte[] ba;
     private short[] sa;

From fc6f4da8e72db4385c96fe0139ce43ec8c8ca2e6 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Wed, 14 May 2025 08:38:01 +0000
Subject: [PATCH 455/901] 8351666: [PPC64] Make non-volatile VectorRegisters
 available for C2 register allocation

Reviewed-by: rrich
---
 src/hotspot/cpu/ppc/assembler_ppc.hpp         |  38 +-
 src/hotspot/cpu/ppc/assembler_ppc.inline.hpp  |  12 +-
 src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp       |   6 +-
 src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp    |  16 +-
 src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp    |   7 +-
 src/hotspot/cpu/ppc/frame_ppc.hpp             |  56 +-
 .../ppc/gc/shared/barrierSetAssembler_ppc.cpp |  19 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    | 170 ++--
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp    |  14 +-
 src/hotspot/cpu/ppc/ppc.ad                    | 735 +++++++++++++-----
 src/hotspot/cpu/ppc/register_ppc.hpp          |  12 +-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  91 ++-
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     | 174 ++---
 .../ppc/templateInterpreterGenerator_ppc.cpp  |   7 +-
 src/hotspot/cpu/ppc/upcallLinker_ppc.cpp      |  93 +--
 src/hotspot/cpu/ppc/vmreg_ppc.cpp             |  12 +-
 src/hotspot/cpu/ppc/vmreg_ppc.hpp             |  13 +-
 src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp      |   7 +-
 18 files changed, 857 insertions(+), 625 deletions(-)

diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index b38c4ac5bae..0b17854a58b 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. 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
@@ -535,8 +535,12 @@ class Assembler : public AbstractAssembler {
 
     // Vector-Scalar (VSX) instruction support.
     LXV_OPCODE     = (61u << OPCODE_SHIFT |    1u     ),
-    LXVL_OPCODE    = (31u << OPCODE_SHIFT |  269u << 1),
     STXV_OPCODE    = (61u << OPCODE_SHIFT |    5u     ),
+    LXVX_OPCODE    = (31u << OPCODE_SHIFT | 4u << 7 | 12u << 1),
+    STXVX_OPCODE   = (31u << OPCODE_SHIFT |  396u << 1),
+    LXVP_OPCODE    = ( 6u << OPCODE_SHIFT             ),
+    STXVP_OPCODE   = ( 6u << OPCODE_SHIFT |    1u     ),
+    LXVL_OPCODE    = (31u << OPCODE_SHIFT |  269u << 1),
     STXVL_OPCODE   = (31u << OPCODE_SHIFT |  397u << 1),
     LXVD2X_OPCODE  = (31u << OPCODE_SHIFT |  844u << 1),
     STXVD2X_OPCODE = (31u << OPCODE_SHIFT |  972u << 1),
@@ -1243,6 +1247,11 @@ class Assembler : public AbstractAssembler {
   static int vsdm(      int         x)  { return  opp_u_field(x,            23, 22); }
   static int vsrs_dq(   int         x)  { return  opp_u_field(x & 0x1F,     10,  6) | opp_u_field((x & 0x20) >> 5, 28, 28); }
   static int vsrt_dq(   int         x)  { return  vsrs_dq(x); }
+  static int vsrtp(     int         x)  {
+    assert((x & 1) == 0, "must be even");
+    return opp_u_field((x & 0x1F) >> 1, 9, 6) | opp_u_field((x & 0x20) >> 5, 10, 10);
+  }
+  static int vsrsp(     int         x)  { return  vsrtp(x); }
 
   static int vsra(   VectorSRegister r)  { return  vsra(r->encoding());}
   static int vsrb(   VectorSRegister r)  { return  vsrb(r->encoding());}
@@ -1251,6 +1260,8 @@ class Assembler : public AbstractAssembler {
   static int vsrt(   VectorSRegister r)  { return  vsrt(r->encoding());}
   static int vsrs_dq(VectorSRegister r)  { return  vsrs_dq(r->encoding());}
   static int vsrt_dq(VectorSRegister r)  { return  vsrt_dq(r->encoding());}
+  static int vsrtp(  VectorSRegister r)  { return  vsrtp(r->encoding());}
+  static int vsrsp(  VectorSRegister r)  { return  vsrsp(r->encoding());}
 
   static int vsplt_uim( int        x)  { return  opp_u_field(x,             15, 12); } // for vsplt* instructions
   static int vsplti_sim(int        x)  { return  opp_u_field(x,             15, 11); } // for vsplti* instructions
@@ -2356,14 +2367,24 @@ class Assembler : public AbstractAssembler {
   inline void mfvscr(   VectorRegister d);
 
   // Vector-Scalar (VSX) instructions.
-  inline void lxv(      VectorSRegister d, int si16, Register a);
-  inline void stxv(     VectorSRegister d, int si16, Register a);
-  inline void lxvl(     VectorSRegister d, Register a, Register b);
-  inline void stxvl(    VectorSRegister d, Register a, Register b);
+  // Power8
   inline void lxvd2x(   VectorSRegister d, Register a);
   inline void lxvd2x(   VectorSRegister d, Register a, Register b);
   inline void stxvd2x(  VectorSRegister d, Register a);
   inline void stxvd2x(  VectorSRegister d, Register a, Register b);
+
+  // Power9
+  inline void lxv(      VectorSRegister d, int si16, Register a);
+  inline void stxv(     VectorSRegister d, int si16, Register a);
+  inline void lxvx(     VectorSRegister d, Register a, Register b);
+  inline void stxvx(    VectorSRegister d, Register a, Register b);
+  inline void lxvl(     VectorSRegister d, Register a, Register b);
+  inline void stxvl(    VectorSRegister d, Register a, Register b);
+
+  // Power10
+  inline void lxvp(     VectorSRegister d, int si16, Register a);
+  inline void stxvp(    VectorSRegister d, int si16, Register a);
+
   inline void mtvrwz(   VectorRegister  d, Register a);
   inline void mfvrwz(   Register        a, VectorRegister d);
   inline void mtvrd(    VectorRegister  d, Register a);
@@ -2480,6 +2501,9 @@ class Assembler : public AbstractAssembler {
   inline void std(  Register d, int si16);
   inline void stdbrx( Register d, Register s2);
 
+  inline void lxvx( VectorSRegister d, Register b);
+  inline void stxvx(VectorSRegister d, Register b);
+
   // PPC 2, section 3.2.1 Instruction Cache Instructions
   inline void icbi(    Register s2);
   // PPC 2, section 3.2.2 Data Cache Instructions
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index 4fb8c5c4198..a9ac76a76db 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -862,8 +862,12 @@ inline void Assembler::lvsl(  VectorRegister d, Register s1, Register s2) { emit
 inline void Assembler::lvsr(  VectorRegister d, Register s1, Register s2) { emit_int32( LVSR_OPCODE   | vrt(d) | ra0mem(s1) | rb(s2)); }
 
 // Vector-Scalar (VSX) instructions.
-inline void Assembler::lxv(     VectorSRegister d, int ui16, Register a)     { assert(is_aligned(ui16, 16), "displacement must be a multiple of 16"); emit_int32( LXV_OPCODE  | vsrt_dq(d) | ra0mem(a) | uimm(ui16, 16)); }
-inline void Assembler::stxv(    VectorSRegister d, int ui16, Register a)     { assert(is_aligned(ui16, 16), "displacement must be a multiple of 16"); emit_int32( STXV_OPCODE  | vsrs_dq(d) | ra0mem(a) | uimm(ui16, 16)); }
+inline void Assembler::lxv(     VectorSRegister d, int si16, Register a)     { assert(is_aligned(si16, 16), "displacement must be a multiple of 16"); emit_int32( LXV_OPCODE   | vsrt_dq(d) | ra0mem(a) | simm(si16, 16)); }
+inline void Assembler::stxv(    VectorSRegister d, int si16, Register a)     { assert(is_aligned(si16, 16), "displacement must be a multiple of 16"); emit_int32( STXV_OPCODE  | vsrs_dq(d) | ra0mem(a) | simm(si16, 16)); }
+inline void Assembler::lxvx(    VectorSRegister d, Register a, Register b)   { emit_int32( LXVX_OPCODE    | vsrt(d) | ra0mem(a)  | rb(b)); }
+inline void Assembler::stxvx(   VectorSRegister d, Register a, Register b)   { emit_int32( STXVX_OPCODE   | vsrs(d) | ra0mem(a)  | rb(b)); }
+inline void Assembler::lxvp(    VectorSRegister d, int si16, Register a)     { assert(is_aligned(si16, 16), "displacement must be a multiple of 16"); emit_int32( LXVP_OPCODE  | vsrtp(d)   | ra0mem(a) | simm(si16, 16)); }
+inline void Assembler::stxvp(   VectorSRegister d, int si16, Register a)     { assert(is_aligned(si16, 16), "displacement must be a multiple of 16"); emit_int32( STXVP_OPCODE | vsrsp(d)   | ra0mem(a) | simm(si16, 16)); }
 inline void Assembler::lxvl(    VectorSRegister d, Register s1, Register b)  { emit_int32( LXVL_OPCODE    | vsrt(d) | ra0mem(s1) | rb(b)); }
 inline void Assembler::stxvl(   VectorSRegister d, Register s1, Register b)  { emit_int32( STXVL_OPCODE   | vsrt(d) | ra0mem(s1) | rb(b)); }
 inline void Assembler::lxvd2x(  VectorSRegister d, Register s1)              { emit_int32( LXVD2X_OPCODE  | vsrt(d) | ra(0) | rb(s1)); }
@@ -1140,6 +1144,10 @@ inline void Assembler::std(  Register d, int si16   ) { emit_int32( STD_OPCODE
 inline void Assembler::stdx( Register d, Register s2) { emit_int32( STDX_OPCODE | rs(d) | rb(s2));}
 inline void Assembler::stdbrx(Register d, Register s2){ emit_int32(STDBRX_OPCODE| rs(d) | rb(s2));}
 
+inline void Assembler::lxvx( VectorSRegister d, Register b) { emit_int32( LXVX_OPCODE  | vsrt(d) | rb(b)); }
+inline void Assembler::stxvx(VectorSRegister d, Register b) { emit_int32( STXVX_OPCODE | vsrs(d) | rb(b)); }
+
+
 // ra0 version
 inline void Assembler::icbi(    Register s2)          { emit_int32( ICBI_OPCODE   | rb(s2)           ); }
 //inline void Assembler::dcba(  Register s2)          { emit_int32( DCBA_OPCODE   | rb(s2)           ); }
diff --git a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
index 79b129c08ae..f1afbdd3a1d 100644
--- a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
@@ -162,8 +162,7 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
     Register r = as_Register(i);
     if (FrameMap::reg_needs_save(r)) {
       int sp_offset = cpu_reg_save_offsets[i];
-      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset>>2), r->as_VMReg());
-      oop_map->set_callee_saved(VMRegImpl::stack2reg((sp_offset>>2) + 1), r->as_VMReg()->next());
+      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset >> 2), r->as_VMReg());
     }
   }
 
@@ -171,8 +170,7 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
     for (i = 0; i < FrameMap::nof_fpu_regs; i++) {
       FloatRegister r = as_FloatRegister(i);
       int sp_offset = fpu_reg_save_offsets[i];
-      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset>>2), r->as_VMReg());
-      oop_map->set_callee_saved(VMRegImpl::stack2reg((sp_offset>>2) + 1), r->as_VMReg()->next());
+      oop_map->set_callee_saved(VMRegImpl::stack2reg(sp_offset >> 2), r->as_VMReg());
     }
   }
 
diff --git a/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
index 4d98b763078..8f5f0ba4955 100644
--- a/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
+++ b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, SAP SE. All rights reserved.
+ * Copyright (c) 2020, 2025, SAP SE. 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.
  *
@@ -35,16 +35,6 @@
 
 #define __ masm->
 
-bool ABIDescriptor::is_volatile_reg(Register reg) const {
-  return _integer_argument_registers.contains(reg)
-    || _integer_additional_volatile_registers.contains(reg);
-}
-
-bool ABIDescriptor::is_volatile_reg(FloatRegister reg) const {
-    return _float_argument_registers.contains(reg)
-        || _float_additional_volatile_registers.contains(reg);
-}
-
 bool ForeignGlobals::is_foreign_linker_supported() {
   return true;
 }
@@ -62,10 +52,6 @@ const ABIDescriptor ForeignGlobals::parse_abi_descriptor(jobject jabi) {
   parse_register_array(outputStorage, StorageType::INTEGER, abi._integer_return_registers, as_Register);
   parse_register_array(outputStorage, StorageType::FLOAT, abi._float_return_registers, as_FloatRegister);
 
-  objArrayOop volatileStorage = jdk_internal_foreign_abi_ABIDescriptor::volatileStorage(abi_oop);
-  parse_register_array(volatileStorage, StorageType::INTEGER, abi._integer_additional_volatile_registers, as_Register);
-  parse_register_array(volatileStorage, StorageType::FLOAT, abi._float_additional_volatile_registers, as_FloatRegister);
-
   abi._stack_alignment_bytes = jdk_internal_foreign_abi_ABIDescriptor::stackAlignment(abi_oop);
   abi._shadow_space_bytes = jdk_internal_foreign_abi_ABIDescriptor::shadowSpace(abi_oop);
 
diff --git a/src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp b/src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp
index baccdf2c9bb..b25ee28f192 100644
--- a/src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -34,9 +34,6 @@ struct ABIDescriptor {
   GrowableArray<FloatRegister> _float_argument_registers;
   GrowableArray<FloatRegister> _float_return_registers;
 
-  GrowableArray<Register> _integer_additional_volatile_registers;
-  GrowableArray<FloatRegister> _float_additional_volatile_registers;
-
   int32_t _stack_alignment_bytes;
   int32_t _shadow_space_bytes;
 
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
index 560615089fe..2fff3fb2e48 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. 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
@@ -134,56 +134,6 @@
   #define _native_abi_reg_args_spill(_component) \
           (offset_of(frame::native_abi_reg_args_spill, _component))
 
-  // non-volatile GPRs:
-
-  struct spill_nonvolatiles {
-    uint64_t r14;
-    uint64_t r15;                                 //_16
-    uint64_t r16;
-    uint64_t r17;                                 //_16
-    uint64_t r18;
-    uint64_t r19;                                 //_16
-    uint64_t r20;
-    uint64_t r21;                                 //_16
-    uint64_t r22;
-    uint64_t r23;                                 //_16
-    uint64_t r24;
-    uint64_t r25;                                 //_16
-    uint64_t r26;
-    uint64_t r27;                                 //_16
-    uint64_t r28;
-    uint64_t r29;                                 //_16
-    uint64_t r30;
-    uint64_t r31;                                 //_16
-
-    double f14;
-    double f15;
-    double f16;
-    double f17;
-    double f18;
-    double f19;
-    double f20;
-    double f21;
-    double f22;
-    double f23;
-    double f24;
-    double f25;
-    double f26;
-    double f27;
-    double f28;
-    double f29;
-    double f30;
-    double f31;
-
-    // aligned to frame::alignment_in_bytes (16)
-  };
-
-  enum {
-    spill_nonvolatiles_size = sizeof(spill_nonvolatiles)
-  };
-
-  #define _spill_nonvolatiles_neg(_component) \
-     (int)(-frame::spill_nonvolatiles_size + offset_of(frame::spill_nonvolatiles, _component))
 
   // Frame layout for the Java template interpreter on PPC64.
   //
@@ -230,6 +180,7 @@
   //            [callee's Java result]
   //            [callee's locals w/o arguments]
   //            [outgoing arguments]
+  //            [non-volatiles]
   //            [ENTRY_FRAME_LOCALS]
 
   // ABI for every Java frame, compiled and interpreted
@@ -292,7 +243,6 @@
     uint64_t result_type;
     uint64_t arguments_tos_address;               //_16
     // aligned to frame::alignment_in_bytes (16)
-    uint64_t r[spill_nonvolatiles_size/sizeof(uint64_t)];
   };
 
   enum {
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index acf916c8c72..32a7011ac26 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -337,15 +337,24 @@ int SaveLiveRegisters::iterate_over_register_mask(IterationAction action, int of
       assert(SuperwordUseVSX, "or should not reach here");
       VectorSRegister vs_reg = vm_reg->as_VectorSRegister();
       if (vs_reg->encoding() >= VSR32->encoding() && vs_reg->encoding() <= VSR51->encoding()) {
-        reg_save_index += 2;
+        reg_save_index += (2 + (reg_save_index & 1)); // 2 slots + alignment if needed
 
         Register spill_addr = R0;
+        int spill_offset = offset - reg_save_index * BytesPerWord;
         if (action == ACTION_SAVE) {
-          _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
-          _masm->stxvd2x(vs_reg, spill_addr);
+          if (PowerArchitecturePPC64 >= 9) {
+            _masm->stxv(vs_reg, spill_offset, R1_SP);
+          } else {
+            _masm->addi(spill_addr, R1_SP, spill_offset);
+            _masm->stxvd2x(vs_reg, spill_addr);
+          }
         } else if (action == ACTION_RESTORE) {
-          _masm->addi(spill_addr, R1_SP, offset - reg_save_index * BytesPerWord);
-          _masm->lxvd2x(vs_reg, spill_addr);
+          if (PowerArchitecturePPC64 >= 9) {
+            _masm->lxv(vs_reg, spill_offset, R1_SP);
+          } else {
+            _masm->addi(spill_addr, R1_SP, spill_offset);
+            _masm->lxvd2x(vs_reg, spill_addr);
+          }
         } else {
           assert(action == ACTION_COUNT_ONLY, "Sanity");
         }
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index ca0a1344d14..19f64a79300 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -774,93 +774,82 @@ void MacroAssembler::clobber_carg_stack_slots(Register tmp) {
   }
 }
 
-// Uses ordering which corresponds to ABI:
-//    _savegpr0_14:  std  r14,-144(r1)
-//    _savegpr0_15:  std  r15,-136(r1)
-//    _savegpr0_16:  std  r16,-128(r1)
-void MacroAssembler::save_nonvolatile_gprs(Register dst, int offset) {
-  std(R14, offset, dst);   offset += 8;
-  std(R15, offset, dst);   offset += 8;
-  std(R16, offset, dst);   offset += 8;
-  std(R17, offset, dst);   offset += 8;
-  std(R18, offset, dst);   offset += 8;
-  std(R19, offset, dst);   offset += 8;
-  std(R20, offset, dst);   offset += 8;
-  std(R21, offset, dst);   offset += 8;
-  std(R22, offset, dst);   offset += 8;
-  std(R23, offset, dst);   offset += 8;
-  std(R24, offset, dst);   offset += 8;
-  std(R25, offset, dst);   offset += 8;
-  std(R26, offset, dst);   offset += 8;
-  std(R27, offset, dst);   offset += 8;
-  std(R28, offset, dst);   offset += 8;
-  std(R29, offset, dst);   offset += 8;
-  std(R30, offset, dst);   offset += 8;
-  std(R31, offset, dst);   offset += 8;
-
-  stfd(F14, offset, dst);   offset += 8;
-  stfd(F15, offset, dst);   offset += 8;
-  stfd(F16, offset, dst);   offset += 8;
-  stfd(F17, offset, dst);   offset += 8;
-  stfd(F18, offset, dst);   offset += 8;
-  stfd(F19, offset, dst);   offset += 8;
-  stfd(F20, offset, dst);   offset += 8;
-  stfd(F21, offset, dst);   offset += 8;
-  stfd(F22, offset, dst);   offset += 8;
-  stfd(F23, offset, dst);   offset += 8;
-  stfd(F24, offset, dst);   offset += 8;
-  stfd(F25, offset, dst);   offset += 8;
-  stfd(F26, offset, dst);   offset += 8;
-  stfd(F27, offset, dst);   offset += 8;
-  stfd(F28, offset, dst);   offset += 8;
-  stfd(F29, offset, dst);   offset += 8;
-  stfd(F30, offset, dst);   offset += 8;
-  stfd(F31, offset, dst);
-}
-
-// Uses ordering which corresponds to ABI:
-//    _restgpr0_14:  ld   r14,-144(r1)
-//    _restgpr0_15:  ld   r15,-136(r1)
-//    _restgpr0_16:  ld   r16,-128(r1)
-void MacroAssembler::restore_nonvolatile_gprs(Register src, int offset) {
-  ld(R14, offset, src);   offset += 8;
-  ld(R15, offset, src);   offset += 8;
-  ld(R16, offset, src);   offset += 8;
-  ld(R17, offset, src);   offset += 8;
-  ld(R18, offset, src);   offset += 8;
-  ld(R19, offset, src);   offset += 8;
-  ld(R20, offset, src);   offset += 8;
-  ld(R21, offset, src);   offset += 8;
-  ld(R22, offset, src);   offset += 8;
-  ld(R23, offset, src);   offset += 8;
-  ld(R24, offset, src);   offset += 8;
-  ld(R25, offset, src);   offset += 8;
-  ld(R26, offset, src);   offset += 8;
-  ld(R27, offset, src);   offset += 8;
-  ld(R28, offset, src);   offset += 8;
-  ld(R29, offset, src);   offset += 8;
-  ld(R30, offset, src);   offset += 8;
-  ld(R31, offset, src);   offset += 8;
-
-  // FP registers
-  lfd(F14, offset, src);   offset += 8;
-  lfd(F15, offset, src);   offset += 8;
-  lfd(F16, offset, src);   offset += 8;
-  lfd(F17, offset, src);   offset += 8;
-  lfd(F18, offset, src);   offset += 8;
-  lfd(F19, offset, src);   offset += 8;
-  lfd(F20, offset, src);   offset += 8;
-  lfd(F21, offset, src);   offset += 8;
-  lfd(F22, offset, src);   offset += 8;
-  lfd(F23, offset, src);   offset += 8;
-  lfd(F24, offset, src);   offset += 8;
-  lfd(F25, offset, src);   offset += 8;
-  lfd(F26, offset, src);   offset += 8;
-  lfd(F27, offset, src);   offset += 8;
-  lfd(F28, offset, src);   offset += 8;
-  lfd(F29, offset, src);   offset += 8;
-  lfd(F30, offset, src);   offset += 8;
-  lfd(F31, offset, src);
+void MacroAssembler::save_nonvolatile_registers(Register dst, int offset, bool include_fp_regs, bool include_vector_regs) {
+  BLOCK_COMMENT("save_nonvolatile_registers {");
+
+  for (int i = 14; i < 32; i++) {
+    std(as_Register(i), offset, dst);
+    offset += 8;
+  }
+
+  if (include_fp_regs) {
+    for (int i = 14; i < 32; i++) {
+      stfd(as_FloatRegister(i), offset, dst);
+      offset += 8;
+    }
+  }
+
+  if (include_vector_regs) {
+    assert(is_aligned(offset, StackAlignmentInBytes), "should be");
+    if (PowerArchitecturePPC64 >= 10) {
+      for (int i = 20; i < 32; i += 2) {
+        stxvp(as_VectorRegister(i)->to_vsr(), offset, dst);
+        offset += 32;
+      }
+    } else {
+      for (int i = 20; i < 32; i++) {
+        if (PowerArchitecturePPC64 >= 9) {
+          stxv(as_VectorRegister(i)->to_vsr(), offset, dst);
+        } else {
+          Register spill_addr = R0;
+          addi(spill_addr, dst, offset);
+          stxvd2x(as_VectorRegister(i)->to_vsr(), spill_addr);
+        }
+        offset += 16;
+      }
+    }
+  }
+
+  BLOCK_COMMENT("} save_nonvolatile_registers ");
+}
+
+void MacroAssembler::restore_nonvolatile_registers(Register src, int offset, bool include_fp_regs, bool include_vector_regs) {
+  BLOCK_COMMENT("restore_nonvolatile_registers {");
+
+  for (int i = 14; i < 32; i++) {
+    ld(as_Register(i), offset, src);
+    offset += 8;
+  }
+
+  if (include_fp_regs) {
+    for (int i = 14; i < 32; i++) {
+      lfd(as_FloatRegister(i), offset, src);
+      offset += 8;
+    }
+  }
+
+  if (include_vector_regs) {
+    assert(is_aligned(offset, StackAlignmentInBytes), "should be");
+    if (PowerArchitecturePPC64 >= 10) {
+      for (int i = 20; i < 32; i += 2) {
+        lxvp(as_VectorRegister(i)->to_vsr(), offset, src);
+        offset += 32;
+      }
+    } else {
+      for (int i = 20; i < 32; i++) {
+        if (PowerArchitecturePPC64 >= 9) {
+          lxv(as_VectorRegister(i)->to_vsr(), offset, src);
+        } else {
+          Register spill_addr = R0;
+          addi(spill_addr, src, offset);
+          lxvd2x(as_VectorRegister(i)->to_vsr(), spill_addr);
+        }
+        offset += 16;
+      }
+    }
+  }
+
+  BLOCK_COMMENT("} restore_nonvolatile_registers");
 }
 
 // For verify_oops.
@@ -1029,13 +1018,6 @@ void MacroAssembler::push_frame_reg_args(unsigned int bytes, Register tmp) {
   push_frame(bytes + frame::native_abi_reg_args_size, tmp);
 }
 
-// Setup up a new C frame with a spill area for non-volatile GPRs and
-// additional space for local variables.
-void MacroAssembler::push_frame_reg_args_nonvolatiles(unsigned int bytes,
-                                                      Register tmp) {
-  push_frame(bytes + frame::native_abi_reg_args_size + frame::spill_nonvolatiles_size, tmp);
-}
-
 // Pop current C frame.
 void MacroAssembler::pop_frame() {
   ld(R1_SP, _abi0(callers_sp), R1_SP);
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 7e2925ace26..3528dbb5591 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -299,8 +299,14 @@ class MacroAssembler: public Assembler {
   void clobber_nonvolatile_registers() NOT_DEBUG_RETURN;
   void clobber_carg_stack_slots(Register tmp);
 
-  void save_nonvolatile_gprs(   Register dst_base, int offset);
-  void restore_nonvolatile_gprs(Register src_base, int offset);
+  int  save_nonvolatile_registers_size(bool include_fp_regs, bool include_vector_regs) {
+    int size = (32 - 14) * 8; // GP regs
+    if (include_fp_regs) size += (32 - 14) * 8;
+    if (include_vector_regs) size += (32 - 20) * 16;
+    return size;
+  }
+  void save_nonvolatile_registers(   Register dst_base, int offset, bool include_fp_regs, bool include_vector_regs);
+  void restore_nonvolatile_registers(Register src_base, int offset, bool include_fp_regs, bool include_vector_regs);
 
   enum {
     num_volatile_gp_regs = 11,
@@ -334,10 +340,6 @@ class MacroAssembler: public Assembler {
   // Push a frame of size `bytes' plus native_abi_reg_args on top.
   void push_frame_reg_args(unsigned int bytes, Register tmp);
 
-  // Setup up a new C frame with a spill area for non-volatile GPRs and additional
-  // space for local variables
-  void push_frame_reg_args_nonvolatiles(unsigned int bytes, Register tmp);
-
   // pop current C frame
   void pop_frame();
 
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 07d681e8982..5c6d9815245 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -258,71 +258,326 @@ register %{
 // Vector-Scalar Registers
 // ----------------------------
   // 1st 32 VSRs are aliases for the FPRs which are already defined above.
-  reg_def VSR0 ( SOC, SOC, Op_VecX, 0, VMRegImpl::Bad());
-  reg_def VSR1 ( SOC, SOC, Op_VecX, 1, VMRegImpl::Bad());
-  reg_def VSR2 ( SOC, SOC, Op_VecX, 2, VMRegImpl::Bad());
-  reg_def VSR3 ( SOC, SOC, Op_VecX, 3, VMRegImpl::Bad());
-  reg_def VSR4 ( SOC, SOC, Op_VecX, 4, VMRegImpl::Bad());
-  reg_def VSR5 ( SOC, SOC, Op_VecX, 5, VMRegImpl::Bad());
-  reg_def VSR6 ( SOC, SOC, Op_VecX, 6, VMRegImpl::Bad());
-  reg_def VSR7 ( SOC, SOC, Op_VecX, 7, VMRegImpl::Bad());
-  reg_def VSR8 ( SOC, SOC, Op_VecX, 8, VMRegImpl::Bad());
-  reg_def VSR9 ( SOC, SOC, Op_VecX, 9, VMRegImpl::Bad());
-  reg_def VSR10 ( SOC, SOC, Op_VecX, 10, VMRegImpl::Bad());
-  reg_def VSR11 ( SOC, SOC, Op_VecX, 11, VMRegImpl::Bad());
-  reg_def VSR12 ( SOC, SOC, Op_VecX, 12, VMRegImpl::Bad());
-  reg_def VSR13 ( SOC, SOC, Op_VecX, 13, VMRegImpl::Bad());
-  reg_def VSR14 ( SOC, SOE, Op_VecX, 14, VMRegImpl::Bad());
-  reg_def VSR15 ( SOC, SOE, Op_VecX, 15, VMRegImpl::Bad());
-  reg_def VSR16 ( SOC, SOE, Op_VecX, 16, VMRegImpl::Bad());
-  reg_def VSR17 ( SOC, SOE, Op_VecX, 17, VMRegImpl::Bad());
-  reg_def VSR18 ( SOC, SOE, Op_VecX, 18, VMRegImpl::Bad());
-  reg_def VSR19 ( SOC, SOE, Op_VecX, 19, VMRegImpl::Bad());
-  reg_def VSR20 ( SOC, SOE, Op_VecX, 20, VMRegImpl::Bad());
-  reg_def VSR21 ( SOC, SOE, Op_VecX, 21, VMRegImpl::Bad());
-  reg_def VSR22 ( SOC, SOE, Op_VecX, 22, VMRegImpl::Bad());
-  reg_def VSR23 ( SOC, SOE, Op_VecX, 23, VMRegImpl::Bad());
-  reg_def VSR24 ( SOC, SOE, Op_VecX, 24, VMRegImpl::Bad());
-  reg_def VSR25 ( SOC, SOE, Op_VecX, 25, VMRegImpl::Bad());
-  reg_def VSR26 ( SOC, SOE, Op_VecX, 26, VMRegImpl::Bad());
-  reg_def VSR27 ( SOC, SOE, Op_VecX, 27, VMRegImpl::Bad());
-  reg_def VSR28 ( SOC, SOE, Op_VecX, 28, VMRegImpl::Bad());
-  reg_def VSR29 ( SOC, SOE, Op_VecX, 29, VMRegImpl::Bad());
-  reg_def VSR30 ( SOC, SOE, Op_VecX, 30, VMRegImpl::Bad());
-  reg_def VSR31 ( SOC, SOE, Op_VecX, 31, VMRegImpl::Bad());
+  reg_def VSR0   (SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
+  reg_def VSR0_H (SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
+  reg_def VSR0_J (SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
+  reg_def VSR0_K (SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
+
+  reg_def VSR1   (SOC, SOC, Op_RegF, 1, VMRegImpl::Bad());
+  reg_def VSR1_H (SOC, SOC, Op_RegF, 1, VMRegImpl::Bad());
+  reg_def VSR1_J (SOC, SOC, Op_RegF, 1, VMRegImpl::Bad());
+  reg_def VSR1_K (SOC, SOC, Op_RegF, 1, VMRegImpl::Bad());
+
+  reg_def VSR2   (SOC, SOC, Op_RegF, 2, VMRegImpl::Bad());
+  reg_def VSR2_H (SOC, SOC, Op_RegF, 2, VMRegImpl::Bad());
+  reg_def VSR2_J (SOC, SOC, Op_RegF, 2, VMRegImpl::Bad());
+  reg_def VSR2_K (SOC, SOC, Op_RegF, 2, VMRegImpl::Bad());
+
+  reg_def VSR3   (SOC, SOC, Op_RegF, 3, VMRegImpl::Bad());
+  reg_def VSR3_H (SOC, SOC, Op_RegF, 3, VMRegImpl::Bad());
+  reg_def VSR3_J (SOC, SOC, Op_RegF, 3, VMRegImpl::Bad());
+  reg_def VSR3_K (SOC, SOC, Op_RegF, 3, VMRegImpl::Bad());
+
+  reg_def VSR4   (SOC, SOC, Op_RegF, 4, VMRegImpl::Bad());
+  reg_def VSR4_H (SOC, SOC, Op_RegF, 4, VMRegImpl::Bad());
+  reg_def VSR4_J (SOC, SOC, Op_RegF, 4, VMRegImpl::Bad());
+  reg_def VSR4_K (SOC, SOC, Op_RegF, 4, VMRegImpl::Bad());
+
+  reg_def VSR5   (SOC, SOC, Op_RegF, 5, VMRegImpl::Bad());
+  reg_def VSR5_H (SOC, SOC, Op_RegF, 5, VMRegImpl::Bad());
+  reg_def VSR5_J (SOC, SOC, Op_RegF, 5, VMRegImpl::Bad());
+  reg_def VSR5_K (SOC, SOC, Op_RegF, 5, VMRegImpl::Bad());
+
+  reg_def VSR6   (SOC, SOC, Op_RegF, 6, VMRegImpl::Bad());
+  reg_def VSR6_H (SOC, SOC, Op_RegF, 6, VMRegImpl::Bad());
+  reg_def VSR6_J (SOC, SOC, Op_RegF, 6, VMRegImpl::Bad());
+  reg_def VSR6_K (SOC, SOC, Op_RegF, 6, VMRegImpl::Bad());
+
+  reg_def VSR7   (SOC, SOC, Op_RegF, 7, VMRegImpl::Bad());
+  reg_def VSR7_H (SOC, SOC, Op_RegF, 7, VMRegImpl::Bad());
+  reg_def VSR7_J (SOC, SOC, Op_RegF, 7, VMRegImpl::Bad());
+  reg_def VSR7_K (SOC, SOC, Op_RegF, 7, VMRegImpl::Bad());
+
+  reg_def VSR8   (SOC, SOC, Op_RegF, 8, VMRegImpl::Bad());
+  reg_def VSR8_H (SOC, SOC, Op_RegF, 8, VMRegImpl::Bad());
+  reg_def VSR8_J (SOC, SOC, Op_RegF, 8, VMRegImpl::Bad());
+  reg_def VSR8_K (SOC, SOC, Op_RegF, 8, VMRegImpl::Bad());
+
+  reg_def VSR9   (SOC, SOC, Op_RegF, 9, VMRegImpl::Bad());
+  reg_def VSR9_H (SOC, SOC, Op_RegF, 9, VMRegImpl::Bad());
+  reg_def VSR9_J (SOC, SOC, Op_RegF, 9, VMRegImpl::Bad());
+  reg_def VSR9_K (SOC, SOC, Op_RegF, 9, VMRegImpl::Bad());
+
+  reg_def VSR10  (SOC, SOC, Op_RegF, 10, VMRegImpl::Bad());
+  reg_def VSR10_H(SOC, SOC, Op_RegF, 10, VMRegImpl::Bad());
+  reg_def VSR10_J(SOC, SOC, Op_RegF, 10, VMRegImpl::Bad());
+  reg_def VSR10_K(SOC, SOC, Op_RegF, 10, VMRegImpl::Bad());
+
+  reg_def VSR11  (SOC, SOC, Op_RegF, 11, VMRegImpl::Bad());
+  reg_def VSR11_H(SOC, SOC, Op_RegF, 11, VMRegImpl::Bad());
+  reg_def VSR11_J(SOC, SOC, Op_RegF, 11, VMRegImpl::Bad());
+  reg_def VSR11_K(SOC, SOC, Op_RegF, 11, VMRegImpl::Bad());
+
+  reg_def VSR12  (SOC, SOC, Op_RegF, 12, VMRegImpl::Bad());
+  reg_def VSR12_H(SOC, SOC, Op_RegF, 12, VMRegImpl::Bad());
+  reg_def VSR12_J(SOC, SOC, Op_RegF, 12, VMRegImpl::Bad());
+  reg_def VSR12_K(SOC, SOC, Op_RegF, 12, VMRegImpl::Bad());
+
+  reg_def VSR13  (SOC, SOC, Op_RegF, 13, VMRegImpl::Bad());
+  reg_def VSR13_H(SOC, SOC, Op_RegF, 13, VMRegImpl::Bad());
+  reg_def VSR13_J(SOC, SOC, Op_RegF, 13, VMRegImpl::Bad());
+  reg_def VSR13_K(SOC, SOC, Op_RegF, 13, VMRegImpl::Bad());
+
+  reg_def VSR14  (SOC, SOC, Op_RegF, 14, VMRegImpl::Bad());
+  reg_def VSR14_H(SOC, SOC, Op_RegF, 14, VMRegImpl::Bad());
+  reg_def VSR14_J(SOC, SOC, Op_RegF, 14, VMRegImpl::Bad());
+  reg_def VSR14_K(SOC, SOC, Op_RegF, 14, VMRegImpl::Bad());
+
+  reg_def VSR15  (SOC, SOC, Op_RegF, 15, VMRegImpl::Bad());
+  reg_def VSR15_H(SOC, SOC, Op_RegF, 15, VMRegImpl::Bad());
+  reg_def VSR15_J(SOC, SOC, Op_RegF, 15, VMRegImpl::Bad());
+  reg_def VSR15_K(SOC, SOC, Op_RegF, 15, VMRegImpl::Bad());
+
+  reg_def VSR16  (SOC, SOC, Op_RegF, 16, VMRegImpl::Bad());
+  reg_def VSR16_H(SOC, SOC, Op_RegF, 16, VMRegImpl::Bad());
+  reg_def VSR16_J(SOC, SOC, Op_RegF, 16, VMRegImpl::Bad());
+  reg_def VSR16_K(SOC, SOC, Op_RegF, 16, VMRegImpl::Bad());
+
+  reg_def VSR17  (SOC, SOC, Op_RegF, 17, VMRegImpl::Bad());
+  reg_def VSR17_H(SOC, SOC, Op_RegF, 17, VMRegImpl::Bad());
+  reg_def VSR17_J(SOC, SOC, Op_RegF, 17, VMRegImpl::Bad());
+  reg_def VSR17_K(SOC, SOC, Op_RegF, 17, VMRegImpl::Bad());
+
+  reg_def VSR18  (SOC, SOC, Op_RegF, 18, VMRegImpl::Bad());
+  reg_def VSR18_H(SOC, SOC, Op_RegF, 18, VMRegImpl::Bad());
+  reg_def VSR18_J(SOC, SOC, Op_RegF, 18, VMRegImpl::Bad());
+  reg_def VSR18_K(SOC, SOC, Op_RegF, 18, VMRegImpl::Bad());
+
+  reg_def VSR19  (SOC, SOC, Op_RegF, 19, VMRegImpl::Bad());
+  reg_def VSR19_H(SOC, SOC, Op_RegF, 19, VMRegImpl::Bad());
+  reg_def VSR19_J(SOC, SOC, Op_RegF, 19, VMRegImpl::Bad());
+  reg_def VSR19_K(SOC, SOC, Op_RegF, 19, VMRegImpl::Bad());
+
+  reg_def VSR20  (SOC, SOC, Op_RegF, 20, VMRegImpl::Bad());
+  reg_def VSR20_H(SOC, SOC, Op_RegF, 20, VMRegImpl::Bad());
+  reg_def VSR20_J(SOC, SOC, Op_RegF, 20, VMRegImpl::Bad());
+  reg_def VSR20_K(SOC, SOC, Op_RegF, 20, VMRegImpl::Bad());
+
+  reg_def VSR21  (SOC, SOC, Op_RegF, 21, VMRegImpl::Bad());
+  reg_def VSR21_H(SOC, SOC, Op_RegF, 21, VMRegImpl::Bad());
+  reg_def VSR21_J(SOC, SOC, Op_RegF, 21, VMRegImpl::Bad());
+  reg_def VSR21_K(SOC, SOC, Op_RegF, 21, VMRegImpl::Bad());
+
+  reg_def VSR22  (SOC, SOC, Op_RegF, 22, VMRegImpl::Bad());
+  reg_def VSR22_H(SOC, SOC, Op_RegF, 22, VMRegImpl::Bad());
+  reg_def VSR22_J(SOC, SOC, Op_RegF, 22, VMRegImpl::Bad());
+  reg_def VSR22_K(SOC, SOC, Op_RegF, 22, VMRegImpl::Bad());
+
+  reg_def VSR23  (SOC, SOC, Op_RegF, 23, VMRegImpl::Bad());
+  reg_def VSR23_H(SOC, SOC, Op_RegF, 23, VMRegImpl::Bad());
+  reg_def VSR23_J(SOC, SOC, Op_RegF, 23, VMRegImpl::Bad());
+  reg_def VSR23_K(SOC, SOC, Op_RegF, 23, VMRegImpl::Bad());
+
+  reg_def VSR24  (SOC, SOC, Op_RegF, 24, VMRegImpl::Bad());
+  reg_def VSR24_H(SOC, SOC, Op_RegF, 24, VMRegImpl::Bad());
+  reg_def VSR24_J(SOC, SOC, Op_RegF, 24, VMRegImpl::Bad());
+  reg_def VSR24_K(SOC, SOC, Op_RegF, 24, VMRegImpl::Bad());
+
+  reg_def VSR25  (SOC, SOC, Op_RegF, 25, VMRegImpl::Bad());
+  reg_def VSR25_H(SOC, SOC, Op_RegF, 25, VMRegImpl::Bad());
+  reg_def VSR25_J(SOC, SOC, Op_RegF, 25, VMRegImpl::Bad());
+  reg_def VSR25_K(SOC, SOC, Op_RegF, 25, VMRegImpl::Bad());
+
+  reg_def VSR26  (SOC, SOC, Op_RegF, 26, VMRegImpl::Bad());
+  reg_def VSR26_H(SOC, SOC, Op_RegF, 26, VMRegImpl::Bad());
+  reg_def VSR26_J(SOC, SOC, Op_RegF, 26, VMRegImpl::Bad());
+  reg_def VSR26_K(SOC, SOC, Op_RegF, 26, VMRegImpl::Bad());
+
+  reg_def VSR27  (SOC, SOC, Op_RegF, 27, VMRegImpl::Bad());
+  reg_def VSR27_H(SOC, SOC, Op_RegF, 27, VMRegImpl::Bad());
+  reg_def VSR27_J(SOC, SOC, Op_RegF, 27, VMRegImpl::Bad());
+  reg_def VSR27_K(SOC, SOC, Op_RegF, 27, VMRegImpl::Bad());
+
+  reg_def VSR28  (SOC, SOC, Op_RegF, 28, VMRegImpl::Bad());
+  reg_def VSR28_H(SOC, SOC, Op_RegF, 28, VMRegImpl::Bad());
+  reg_def VSR28_J(SOC, SOC, Op_RegF, 28, VMRegImpl::Bad());
+  reg_def VSR28_K(SOC, SOC, Op_RegF, 28, VMRegImpl::Bad());
+
+  reg_def VSR29  (SOC, SOC, Op_RegF, 29, VMRegImpl::Bad());
+  reg_def VSR29_H(SOC, SOC, Op_RegF, 29, VMRegImpl::Bad());
+  reg_def VSR29_J(SOC, SOC, Op_RegF, 29, VMRegImpl::Bad());
+  reg_def VSR29_K(SOC, SOC, Op_RegF, 29, VMRegImpl::Bad());
+
+  reg_def VSR30  (SOC, SOC, Op_RegF, 30, VMRegImpl::Bad());
+  reg_def VSR30_H(SOC, SOC, Op_RegF, 30, VMRegImpl::Bad());
+  reg_def VSR30_J(SOC, SOC, Op_RegF, 30, VMRegImpl::Bad());
+  reg_def VSR30_K(SOC, SOC, Op_RegF, 30, VMRegImpl::Bad());
+
+  reg_def VSR31  (SOC, SOC, Op_RegF, 31, VMRegImpl::Bad());
+  reg_def VSR31_H(SOC, SOC, Op_RegF, 31, VMRegImpl::Bad());
+  reg_def VSR31_J(SOC, SOC, Op_RegF, 31, VMRegImpl::Bad());
+  reg_def VSR31_K(SOC, SOC, Op_RegF, 31, VMRegImpl::Bad());
+
   // 2nd 32 VSRs are aliases for the VRs which are only defined here.
-  reg_def VSR32 ( SOC, SOC, Op_VecX, 32, VSR32->as_VMReg());
-  reg_def VSR33 ( SOC, SOC, Op_VecX, 33, VSR33->as_VMReg());
-  reg_def VSR34 ( SOC, SOC, Op_VecX, 34, VSR34->as_VMReg());
-  reg_def VSR35 ( SOC, SOC, Op_VecX, 35, VSR35->as_VMReg());
-  reg_def VSR36 ( SOC, SOC, Op_VecX, 36, VSR36->as_VMReg());
-  reg_def VSR37 ( SOC, SOC, Op_VecX, 37, VSR37->as_VMReg());
-  reg_def VSR38 ( SOC, SOC, Op_VecX, 38, VSR38->as_VMReg());
-  reg_def VSR39 ( SOC, SOC, Op_VecX, 39, VSR39->as_VMReg());
-  reg_def VSR40 ( SOC, SOC, Op_VecX, 40, VSR40->as_VMReg());
-  reg_def VSR41 ( SOC, SOC, Op_VecX, 41, VSR41->as_VMReg());
-  reg_def VSR42 ( SOC, SOC, Op_VecX, 42, VSR42->as_VMReg());
-  reg_def VSR43 ( SOC, SOC, Op_VecX, 43, VSR43->as_VMReg());
-  reg_def VSR44 ( SOC, SOC, Op_VecX, 44, VSR44->as_VMReg());
-  reg_def VSR45 ( SOC, SOC, Op_VecX, 45, VSR45->as_VMReg());
-  reg_def VSR46 ( SOC, SOC, Op_VecX, 46, VSR46->as_VMReg());
-  reg_def VSR47 ( SOC, SOC, Op_VecX, 47, VSR47->as_VMReg());
-  reg_def VSR48 ( SOC, SOC, Op_VecX, 48, VSR48->as_VMReg());
-  reg_def VSR49 ( SOC, SOC, Op_VecX, 49, VSR49->as_VMReg());
-  reg_def VSR50 ( SOC, SOC, Op_VecX, 50, VSR50->as_VMReg());
-  reg_def VSR51 ( SOC, SOC, Op_VecX, 51, VSR51->as_VMReg());
-  reg_def VSR52 ( SOC, SOE, Op_VecX, 52, VSR52->as_VMReg());
-  reg_def VSR53 ( SOC, SOE, Op_VecX, 53, VSR53->as_VMReg());
-  reg_def VSR54 ( SOC, SOE, Op_VecX, 54, VSR54->as_VMReg());
-  reg_def VSR55 ( SOC, SOE, Op_VecX, 55, VSR55->as_VMReg());
-  reg_def VSR56 ( SOC, SOE, Op_VecX, 56, VSR56->as_VMReg());
-  reg_def VSR57 ( SOC, SOE, Op_VecX, 57, VSR57->as_VMReg());
-  reg_def VSR58 ( SOC, SOE, Op_VecX, 58, VSR58->as_VMReg());
-  reg_def VSR59 ( SOC, SOE, Op_VecX, 59, VSR59->as_VMReg());
-  reg_def VSR60 ( SOC, SOE, Op_VecX, 60, VSR60->as_VMReg());
-  reg_def VSR61 ( SOC, SOE, Op_VecX, 61, VSR61->as_VMReg());
-  reg_def VSR62 ( SOC, SOE, Op_VecX, 62, VSR62->as_VMReg());
-  reg_def VSR63 ( SOC, SOE, Op_VecX, 63, VSR63->as_VMReg());
+  reg_def VSR32  (SOC, SOC, Op_RegF, 32, VSR32->as_VMReg()         );
+  reg_def VSR32_H(SOC, SOC, Op_RegF, 32, VSR32->as_VMReg()->next() );
+  reg_def VSR32_J(SOC, SOC, Op_RegF, 32, VSR32->as_VMReg()->next(2));
+  reg_def VSR32_K(SOC, SOC, Op_RegF, 32, VSR32->as_VMReg()->next(3));
+
+  reg_def VSR33  (SOC, SOC, Op_RegF, 33, VSR33->as_VMReg()         );
+  reg_def VSR33_H(SOC, SOC, Op_RegF, 33, VSR33->as_VMReg()->next() );
+  reg_def VSR33_J(SOC, SOC, Op_RegF, 33, VSR33->as_VMReg()->next(2));
+  reg_def VSR33_K(SOC, SOC, Op_RegF, 33, VSR33->as_VMReg()->next(3));
+
+  reg_def VSR34  (SOC, SOC, Op_RegF, 34, VSR34->as_VMReg()         );
+  reg_def VSR34_H(SOC, SOC, Op_RegF, 34, VSR34->as_VMReg()->next() );
+  reg_def VSR34_J(SOC, SOC, Op_RegF, 34, VSR34->as_VMReg()->next(2));
+  reg_def VSR34_K(SOC, SOC, Op_RegF, 34, VSR34->as_VMReg()->next(3));
+
+  reg_def VSR35  (SOC, SOC, Op_RegF, 35, VSR35->as_VMReg()         );
+  reg_def VSR35_H(SOC, SOC, Op_RegF, 35, VSR35->as_VMReg()->next() );
+  reg_def VSR35_J(SOC, SOC, Op_RegF, 35, VSR35->as_VMReg()->next(2));
+  reg_def VSR35_K(SOC, SOC, Op_RegF, 35, VSR35->as_VMReg()->next(3));
+
+  reg_def VSR36  (SOC, SOC, Op_RegF, 36, VSR36->as_VMReg()         );
+  reg_def VSR36_H(SOC, SOC, Op_RegF, 36, VSR36->as_VMReg()->next() );
+  reg_def VSR36_J(SOC, SOC, Op_RegF, 36, VSR36->as_VMReg()->next(2));
+  reg_def VSR36_K(SOC, SOC, Op_RegF, 36, VSR36->as_VMReg()->next(3));
+
+  reg_def VSR37  (SOC, SOC, Op_RegF, 37, VSR37->as_VMReg()         );
+  reg_def VSR37_H(SOC, SOC, Op_RegF, 37, VSR37->as_VMReg()->next() );
+  reg_def VSR37_J(SOC, SOC, Op_RegF, 37, VSR37->as_VMReg()->next(2));
+  reg_def VSR37_K(SOC, SOC, Op_RegF, 37, VSR37->as_VMReg()->next(3));
+
+  reg_def VSR38  (SOC, SOC, Op_RegF, 38, VSR38->as_VMReg()         );
+  reg_def VSR38_H(SOC, SOC, Op_RegF, 38, VSR38->as_VMReg()->next() );
+  reg_def VSR38_J(SOC, SOC, Op_RegF, 38, VSR38->as_VMReg()->next(2));
+  reg_def VSR38_K(SOC, SOC, Op_RegF, 38, VSR38->as_VMReg()->next(3));
+
+  reg_def VSR39  (SOC, SOC, Op_RegF, 39, VSR39->as_VMReg()         );
+  reg_def VSR39_H(SOC, SOC, Op_RegF, 39, VSR39->as_VMReg()->next() );
+  reg_def VSR39_J(SOC, SOC, Op_RegF, 39, VSR39->as_VMReg()->next(2));
+  reg_def VSR39_K(SOC, SOC, Op_RegF, 39, VSR39->as_VMReg()->next(3));
+
+  reg_def VSR40  (SOC, SOC, Op_RegF, 40, VSR40->as_VMReg()         );
+  reg_def VSR40_H(SOC, SOC, Op_RegF, 40, VSR40->as_VMReg()->next() );
+  reg_def VSR40_J(SOC, SOC, Op_RegF, 40, VSR40->as_VMReg()->next(2));
+  reg_def VSR40_K(SOC, SOC, Op_RegF, 40, VSR40->as_VMReg()->next(3));
+
+  reg_def VSR41  (SOC, SOC, Op_RegF, 41, VSR41->as_VMReg()         );
+  reg_def VSR41_H(SOC, SOC, Op_RegF, 41, VSR41->as_VMReg()->next() );
+  reg_def VSR41_J(SOC, SOC, Op_RegF, 41, VSR41->as_VMReg()->next(2));
+  reg_def VSR41_K(SOC, SOC, Op_RegF, 41, VSR41->as_VMReg()->next(3));
+
+  reg_def VSR42  (SOC, SOC, Op_RegF, 42, VSR42->as_VMReg()         );
+  reg_def VSR42_H(SOC, SOC, Op_RegF, 42, VSR42->as_VMReg()->next() );
+  reg_def VSR42_J(SOC, SOC, Op_RegF, 42, VSR42->as_VMReg()->next(2));
+  reg_def VSR42_K(SOC, SOC, Op_RegF, 42, VSR42->as_VMReg()->next(3));
+
+  reg_def VSR43  (SOC, SOC, Op_RegF, 43, VSR43->as_VMReg()         );
+  reg_def VSR43_H(SOC, SOC, Op_RegF, 43, VSR43->as_VMReg()->next() );
+  reg_def VSR43_J(SOC, SOC, Op_RegF, 43, VSR43->as_VMReg()->next(2));
+  reg_def VSR43_K(SOC, SOC, Op_RegF, 43, VSR43->as_VMReg()->next(3));
+
+  reg_def VSR44  (SOC, SOC, Op_RegF, 44, VSR44->as_VMReg()         );
+  reg_def VSR44_H(SOC, SOC, Op_RegF, 44, VSR44->as_VMReg()->next() );
+  reg_def VSR44_J(SOC, SOC, Op_RegF, 44, VSR44->as_VMReg()->next(2));
+  reg_def VSR44_K(SOC, SOC, Op_RegF, 44, VSR44->as_VMReg()->next(3));
+
+  reg_def VSR45  (SOC, SOC, Op_RegF, 45, VSR45->as_VMReg()         );
+  reg_def VSR45_H(SOC, SOC, Op_RegF, 45, VSR45->as_VMReg()->next() );
+  reg_def VSR45_J(SOC, SOC, Op_RegF, 45, VSR45->as_VMReg()->next(2));
+  reg_def VSR45_K(SOC, SOC, Op_RegF, 45, VSR45->as_VMReg()->next(3));
+
+  reg_def VSR46  (SOC, SOC, Op_RegF, 46, VSR46->as_VMReg()         );
+  reg_def VSR46_H(SOC, SOC, Op_RegF, 46, VSR46->as_VMReg()->next() );
+  reg_def VSR46_J(SOC, SOC, Op_RegF, 46, VSR46->as_VMReg()->next(2));
+  reg_def VSR46_K(SOC, SOC, Op_RegF, 46, VSR46->as_VMReg()->next(3));
+
+  reg_def VSR47  (SOC, SOC, Op_RegF, 47, VSR47->as_VMReg()         );
+  reg_def VSR47_H(SOC, SOC, Op_RegF, 47, VSR47->as_VMReg()->next() );
+  reg_def VSR47_J(SOC, SOC, Op_RegF, 47, VSR47->as_VMReg()->next(2));
+  reg_def VSR47_K(SOC, SOC, Op_RegF, 47, VSR47->as_VMReg()->next(3));
+
+  reg_def VSR48  (SOC, SOC, Op_RegF, 48, VSR48->as_VMReg()         );
+  reg_def VSR48_H(SOC, SOC, Op_RegF, 48, VSR48->as_VMReg()->next() );
+  reg_def VSR48_J(SOC, SOC, Op_RegF, 48, VSR48->as_VMReg()->next(2));
+  reg_def VSR48_K(SOC, SOC, Op_RegF, 48, VSR48->as_VMReg()->next(3));
+
+  reg_def VSR49  (SOC, SOC, Op_RegF, 49, VSR49->as_VMReg()         );
+  reg_def VSR49_H(SOC, SOC, Op_RegF, 49, VSR49->as_VMReg()->next() );
+  reg_def VSR49_J(SOC, SOC, Op_RegF, 49, VSR49->as_VMReg()->next(2));
+  reg_def VSR49_K(SOC, SOC, Op_RegF, 49, VSR49->as_VMReg()->next(3));
+
+  reg_def VSR50  (SOC, SOC, Op_RegF, 50, VSR50->as_VMReg()         );
+  reg_def VSR50_H(SOC, SOC, Op_RegF, 50, VSR50->as_VMReg()->next() );
+  reg_def VSR50_J(SOC, SOC, Op_RegF, 50, VSR50->as_VMReg()->next(2));
+  reg_def VSR50_K(SOC, SOC, Op_RegF, 50, VSR50->as_VMReg()->next(3));
+
+  reg_def VSR51  (SOC, SOC, Op_RegF, 51, VSR51->as_VMReg()         );
+  reg_def VSR51_H(SOC, SOC, Op_RegF, 51, VSR51->as_VMReg()->next() );
+  reg_def VSR51_J(SOC, SOC, Op_RegF, 51, VSR51->as_VMReg()->next(2));
+  reg_def VSR51_K(SOC, SOC, Op_RegF, 51, VSR51->as_VMReg()->next(3));
+
+  reg_def VSR52  (SOC, SOE, Op_RegF, 52, VSR52->as_VMReg()         );
+  reg_def VSR52_H(SOC, SOE, Op_RegF, 52, VSR52->as_VMReg()->next() );
+  reg_def VSR52_J(SOC, SOE, Op_RegF, 52, VSR52->as_VMReg()->next(2));
+  reg_def VSR52_K(SOC, SOE, Op_RegF, 52, VSR52->as_VMReg()->next(3));
+
+  reg_def VSR53  (SOC, SOE, Op_RegF, 53, VSR53->as_VMReg()         );
+  reg_def VSR53_H(SOC, SOE, Op_RegF, 53, VSR53->as_VMReg()->next() );
+  reg_def VSR53_J(SOC, SOE, Op_RegF, 53, VSR53->as_VMReg()->next(2));
+  reg_def VSR53_K(SOC, SOE, Op_RegF, 53, VSR53->as_VMReg()->next(3));
+
+  reg_def VSR54  (SOC, SOE, Op_RegF, 54, VSR54->as_VMReg()         );
+  reg_def VSR54_H(SOC, SOE, Op_RegF, 54, VSR54->as_VMReg()->next() );
+  reg_def VSR54_J(SOC, SOE, Op_RegF, 54, VSR54->as_VMReg()->next(2));
+  reg_def VSR54_K(SOC, SOE, Op_RegF, 54, VSR54->as_VMReg()->next(3));
+
+  reg_def VSR55  (SOC, SOE, Op_RegF, 55, VSR55->as_VMReg()         );
+  reg_def VSR55_H(SOC, SOE, Op_RegF, 55, VSR55->as_VMReg()->next() );
+  reg_def VSR55_J(SOC, SOE, Op_RegF, 55, VSR55->as_VMReg()->next(2));
+  reg_def VSR55_K(SOC, SOE, Op_RegF, 55, VSR55->as_VMReg()->next(3));
+
+  reg_def VSR56  (SOC, SOE, Op_RegF, 56, VSR56->as_VMReg()         );
+  reg_def VSR56_H(SOC, SOE, Op_RegF, 56, VSR56->as_VMReg()->next() );
+  reg_def VSR56_J(SOC, SOE, Op_RegF, 56, VSR56->as_VMReg()->next(2));
+  reg_def VSR56_K(SOC, SOE, Op_RegF, 56, VSR56->as_VMReg()->next(3));
+
+  reg_def VSR57  (SOC, SOE, Op_RegF, 57, VSR57->as_VMReg()         );
+  reg_def VSR57_H(SOC, SOE, Op_RegF, 57, VSR57->as_VMReg()->next() );
+  reg_def VSR57_J(SOC, SOE, Op_RegF, 57, VSR57->as_VMReg()->next(2));
+  reg_def VSR57_K(SOC, SOE, Op_RegF, 57, VSR57->as_VMReg()->next(3));
+
+  reg_def VSR58  (SOC, SOE, Op_RegF, 58, VSR58->as_VMReg()         );
+  reg_def VSR58_H(SOC, SOE, Op_RegF, 58, VSR58->as_VMReg()->next() );
+  reg_def VSR58_J(SOC, SOE, Op_RegF, 58, VSR58->as_VMReg()->next(2));
+  reg_def VSR58_K(SOC, SOE, Op_RegF, 58, VSR58->as_VMReg()->next(3));
+
+  reg_def VSR59  (SOC, SOE, Op_RegF, 59, VSR59->as_VMReg()         );
+  reg_def VSR59_H(SOC, SOE, Op_RegF, 59, VSR59->as_VMReg()->next() );
+  reg_def VSR59_J(SOC, SOE, Op_RegF, 59, VSR59->as_VMReg()->next(2));
+  reg_def VSR59_K(SOC, SOE, Op_RegF, 59, VSR59->as_VMReg()->next(3));
+
+  reg_def VSR60  (SOC, SOE, Op_RegF, 60, VSR60->as_VMReg()         );
+  reg_def VSR60_H(SOC, SOE, Op_RegF, 60, VSR60->as_VMReg()->next() );
+  reg_def VSR60_J(SOC, SOE, Op_RegF, 60, VSR60->as_VMReg()->next(2));
+  reg_def VSR60_K(SOC, SOE, Op_RegF, 60, VSR60->as_VMReg()->next(3));
+
+  reg_def VSR61  (SOC, SOE, Op_RegF, 61, VSR61->as_VMReg()         );
+  reg_def VSR61_H(SOC, SOE, Op_RegF, 61, VSR61->as_VMReg()->next() );
+  reg_def VSR61_J(SOC, SOE, Op_RegF, 61, VSR61->as_VMReg()->next(2));
+  reg_def VSR61_K(SOC, SOE, Op_RegF, 61, VSR61->as_VMReg()->next(3));
+
+  reg_def VSR62  (SOC, SOE, Op_RegF, 62, VSR62->as_VMReg()         );
+  reg_def VSR62_H(SOC, SOE, Op_RegF, 62, VSR62->as_VMReg()->next() );
+  reg_def VSR62_J(SOC, SOE, Op_RegF, 62, VSR62->as_VMReg()->next(2));
+  reg_def VSR62_K(SOC, SOE, Op_RegF, 62, VSR62->as_VMReg()->next(3));
+
+  reg_def VSR63  (SOC, SOE, Op_RegF, 63, VSR63->as_VMReg()         );
+  reg_def VSR63_H(SOC, SOE, Op_RegF, 63, VSR63->as_VMReg()->next() );
+  reg_def VSR63_J(SOC, SOE, Op_RegF, 63, VSR63->as_VMReg()->next(2));
+  reg_def VSR63_K(SOC, SOE, Op_RegF, 63, VSR63->as_VMReg()->next(3));
 
 // ----------------------------
 // Specify priority of register selection within phases of register
@@ -441,8 +696,74 @@ alloc_class chunk1 (
 );
 
 alloc_class chunk2 (
-  // Chunk2 contains *all* 8 condition code registers.
+  VSR0 , VSR0_H , VSR0_J , VSR0_K ,
+  VSR1 , VSR1_H , VSR1_J , VSR1_K ,
+  VSR2 , VSR2_H , VSR2_J , VSR2_K ,
+  VSR3 , VSR3_H , VSR3_J , VSR3_K ,
+  VSR4 , VSR4_H , VSR4_J , VSR4_K ,
+  VSR5 , VSR5_H , VSR5_J , VSR5_K ,
+  VSR6 , VSR6_H , VSR6_J , VSR6_K ,
+  VSR7 , VSR7_H , VSR7_J , VSR7_K ,
+  VSR8 , VSR8_H , VSR8_J , VSR8_K ,
+  VSR9 , VSR9_H , VSR9_J , VSR9_K ,
+  VSR10, VSR10_H, VSR10_J, VSR10_K,
+  VSR11, VSR11_H, VSR11_J, VSR11_K,
+  VSR12, VSR12_H, VSR12_J, VSR12_K,
+  VSR13, VSR13_H, VSR13_J, VSR13_K,
+  VSR14, VSR14_H, VSR14_J, VSR14_K,
+  VSR15, VSR15_H, VSR15_J, VSR15_K,
+  VSR16, VSR16_H, VSR16_J, VSR16_K,
+  VSR17, VSR17_H, VSR17_J, VSR17_K,
+  VSR18, VSR18_H, VSR18_J, VSR18_K,
+  VSR19, VSR19_H, VSR19_J, VSR19_K,
+  VSR20, VSR20_H, VSR20_J, VSR20_K,
+  VSR21, VSR21_H, VSR21_J, VSR21_K,
+  VSR22, VSR22_H, VSR22_J, VSR22_K,
+  VSR23, VSR23_H, VSR23_J, VSR23_K,
+  VSR24, VSR24_H, VSR24_J, VSR24_K,
+  VSR25, VSR25_H, VSR25_J, VSR25_K,
+  VSR26, VSR26_H, VSR26_J, VSR26_K,
+  VSR27, VSR27_H, VSR27_J, VSR27_K,
+  VSR28, VSR28_H, VSR28_J, VSR28_K,
+  VSR29, VSR29_H, VSR29_J, VSR29_K,
+  VSR30, VSR30_H, VSR30_J, VSR30_K,
+  VSR31, VSR31_H, VSR31_J, VSR31_K,
+  VSR32, VSR32_H, VSR32_J, VSR32_K,
+  VSR33, VSR33_H, VSR33_J, VSR33_K,
+  VSR34, VSR34_H, VSR34_J, VSR34_K,
+  VSR35, VSR35_H, VSR35_J, VSR35_K,
+  VSR36, VSR36_H, VSR36_J, VSR36_K,
+  VSR37, VSR37_H, VSR37_J, VSR37_K,
+  VSR38, VSR38_H, VSR38_J, VSR38_K,
+  VSR39, VSR39_H, VSR39_J, VSR39_K,
+  VSR40, VSR40_H, VSR40_J, VSR40_K,
+  VSR41, VSR41_H, VSR41_J, VSR41_K,
+  VSR42, VSR42_H, VSR42_J, VSR42_K,
+  VSR43, VSR43_H, VSR43_J, VSR43_K,
+  VSR44, VSR44_H, VSR44_J, VSR44_K,
+  VSR45, VSR45_H, VSR45_J, VSR45_K,
+  VSR46, VSR46_H, VSR46_J, VSR46_K,
+  VSR47, VSR47_H, VSR47_J, VSR47_K,
+  VSR48, VSR48_H, VSR48_J, VSR48_K,
+  VSR49, VSR49_H, VSR49_J, VSR49_K,
+  VSR50, VSR50_H, VSR50_J, VSR50_K,
+  VSR51, VSR51_H, VSR51_J, VSR51_K,
+  VSR52, VSR52_H, VSR52_J, VSR52_K,
+  VSR53, VSR53_H, VSR53_J, VSR53_K,
+  VSR54, VSR54_H, VSR54_J, VSR54_K,
+  VSR55, VSR55_H, VSR55_J, VSR55_K,
+  VSR56, VSR56_H, VSR56_J, VSR56_K,
+  VSR57, VSR57_H, VSR57_J, VSR57_K,
+  VSR58, VSR58_H, VSR58_J, VSR58_K,
+  VSR59, VSR59_H, VSR59_J, VSR59_K,
+  VSR60, VSR60_H, VSR60_J, VSR60_K,
+  VSR61, VSR61_H, VSR61_J, VSR61_K,
+  VSR62, VSR62_H, VSR62_J, VSR62_K,
+  VSR63, VSR63_H, VSR63_J, VSR63_K
+);
 
+alloc_class chunk3 (
+  // Chunk2 contains *all* 8 condition code registers.
   CR0,
   CR1,
   CR2,
@@ -453,73 +774,6 @@ alloc_class chunk2 (
   CR7
 );
 
-alloc_class chunk3 (
-  VSR0,
-  VSR1,
-  VSR2,
-  VSR3,
-  VSR4,
-  VSR5,
-  VSR6,
-  VSR7,
-  VSR8,
-  VSR9,
-  VSR10,
-  VSR11,
-  VSR12,
-  VSR13,
-  VSR14,
-  VSR15,
-  VSR16,
-  VSR17,
-  VSR18,
-  VSR19,
-  VSR20,
-  VSR21,
-  VSR22,
-  VSR23,
-  VSR24,
-  VSR25,
-  VSR26,
-  VSR27,
-  VSR28,
-  VSR29,
-  VSR30,
-  VSR31,
-  VSR32,
-  VSR33,
-  VSR34,
-  VSR35,
-  VSR36,
-  VSR37,
-  VSR38,
-  VSR39,
-  VSR40,
-  VSR41,
-  VSR42,
-  VSR43,
-  VSR44,
-  VSR45,
-  VSR46,
-  VSR47,
-  VSR48,
-  VSR49,
-  VSR50,
-  VSR51,
-  VSR52,
-  VSR53,
-  VSR54,
-  VSR55,
-  VSR56,
-  VSR57,
-  VSR58,
-  VSR59,
-  VSR60,
-  VSR61,
-  VSR62,
-  VSR63
-);
-
 alloc_class chunk4 (
   // special registers
   // These registers are not allocated, but used for nodes generated by postalloc expand.
@@ -910,28 +1164,38 @@ reg_class dbl_reg(
 // ----------------------------
 
 reg_class vs_reg(
-  // Attention: Only these ones are saved & restored at safepoint by RegisterSaver.
-  VSR32,
-  VSR33,
-  VSR34,
-  VSR35,
-  VSR36,
-  VSR37,
-  VSR38,
-  VSR39,
-  VSR40,
-  VSR41,
-  VSR42,
-  VSR43,
-  VSR44,
-  VSR45,
-  VSR46,
-  VSR47,
-  VSR48,
-  VSR49,
-  VSR50,
-  VSR51
-  // VSR52-VSR63 // nv!
+  VSR32, VSR32_H, VSR32_J, VSR32_K,
+  VSR33, VSR33_H, VSR33_J, VSR33_K,
+  VSR34, VSR34_H, VSR34_J, VSR34_K,
+  VSR35, VSR35_H, VSR35_J, VSR35_K,
+  VSR36, VSR36_H, VSR36_J, VSR36_K,
+  VSR37, VSR37_H, VSR37_J, VSR37_K,
+  VSR38, VSR38_H, VSR38_J, VSR38_K,
+  VSR39, VSR39_H, VSR39_J, VSR39_K,
+  VSR40, VSR40_H, VSR40_J, VSR40_K,
+  VSR41, VSR41_H, VSR41_J, VSR41_K,
+  VSR42, VSR42_H, VSR42_J, VSR42_K,
+  VSR43, VSR43_H, VSR43_J, VSR43_K,
+  VSR44, VSR44_H, VSR44_J, VSR44_K,
+  VSR45, VSR45_H, VSR45_J, VSR45_K,
+  VSR46, VSR46_H, VSR46_J, VSR46_K,
+  VSR47, VSR47_H, VSR47_J, VSR47_K,
+  VSR48, VSR48_H, VSR48_J, VSR48_K,
+  VSR49, VSR49_H, VSR49_J, VSR49_K,
+  VSR50, VSR50_H, VSR50_J, VSR50_K,
+  VSR51, VSR51_H, VSR51_J, VSR51_K,
+  VSR52, VSR52_H, VSR52_J, VSR52_K, // non-volatile
+  VSR53, VSR53_H, VSR53_J, VSR53_K, // non-volatile
+  VSR54, VSR54_H, VSR54_J, VSR54_K, // non-volatile
+  VSR55, VSR55_H, VSR55_J, VSR55_K, // non-volatile
+  VSR56, VSR56_H, VSR56_J, VSR56_K, // non-volatile
+  VSR57, VSR57_H, VSR57_J, VSR57_K, // non-volatile
+  VSR58, VSR58_H, VSR58_J, VSR58_K, // non-volatile
+  VSR59, VSR59_H, VSR59_J, VSR59_K, // non-volatile
+  VSR60, VSR60_H, VSR60_J, VSR60_K, // non-volatile
+  VSR61, VSR61_H, VSR61_J, VSR61_K, // non-volatile
+  VSR62, VSR62_H, VSR62_J, VSR62_K, // non-volatile
+  VSR63, VSR63_H, VSR63_J, VSR63_K  // non-volatile
 );
 
  %}
@@ -1656,17 +1920,19 @@ static enum RC rc_class(OptoReg::Name reg) {
   if (reg == OptoReg::Bad) return rc_bad;
 
   // We have 64 integer register halves, starting at index 0.
-  if (reg < 64) return rc_int;
+  STATIC_ASSERT((int)ConcreteRegisterImpl::max_gpr == (int)MachRegisterNumbers::F0_num);
+  if (reg < ConcreteRegisterImpl::max_gpr) return rc_int;
 
   // We have 64 floating-point register halves, starting at index 64.
-  if (reg < 64+64) return rc_float;
+  STATIC_ASSERT((int)ConcreteRegisterImpl::max_fpr == (int)MachRegisterNumbers::VSR0_num);
+  if (reg < ConcreteRegisterImpl::max_fpr) return rc_float;
 
   // We have 64 vector-scalar registers, starting at index 128.
-  if (reg < 64+64+64) return rc_vs;
-
-  // Between float regs & stack are the flags regs.
-  assert(OptoReg::is_stack(reg) || reg < 64+64+64, "blow up if spilling flags");
+  STATIC_ASSERT((int)ConcreteRegisterImpl::max_vsr == (int)MachRegisterNumbers::CR0_num);
+  if (reg < ConcreteRegisterImpl::max_vsr) return rc_vs;
 
+  // Condition and special purpose registers are not allocated. We only accept stack from here.
+  assert(OptoReg::is_stack(reg), "what else is it?");
   return rc_stack;
 }
 
@@ -1743,21 +2009,53 @@ uint MachSpillCopyNode::implementation(C2_MacroAssembler *masm, PhaseRegAlloc *r
     else if (src_lo_rc == rc_vs && dst_lo_rc == rc_stack) {
       VectorSRegister Rsrc = as_VectorSRegister(Matcher::_regEncode[src_lo]);
       int dst_offset = ra_->reg2offset(dst_lo);
-      if (masm) {
-        __ addi(R0, R1_SP, dst_offset);
-        __ stxvd2x(Rsrc, R0);
+      if (PowerArchitecturePPC64 >= 9) {
+        if (is_aligned(dst_offset, 16)) {
+          if (masm) {
+            __ stxv(Rsrc, dst_offset, R1_SP); // matches storeV16_Power9
+          }
+          size += 4;
+        } else {
+          // Other alignment can be used by Vector API (VectorPayload in rearrangeOp,
+          // observed with VectorRearrangeTest.java on Power9).
+          if (masm) {
+            __ addi(R0, R1_SP, dst_offset);
+            __ stxvx(Rsrc, R0); // matches storeV16_Power9 (regarding element ordering)
+          }
+          size += 8;
+        }
+      } else {
+        if (masm) {
+          __ addi(R0, R1_SP, dst_offset);
+          __ stxvd2x(Rsrc, R0); // matches storeV16_Power8
+        }
+        size += 8;
       }
-      size += 8;
     }
     // Memory->VectorSRegister Spill.
     else if (src_lo_rc == rc_stack && dst_lo_rc == rc_vs) {
       VectorSRegister Rdst = as_VectorSRegister(Matcher::_regEncode[dst_lo]);
       int src_offset = ra_->reg2offset(src_lo);
-      if (masm) {
-        __ addi(R0, R1_SP, src_offset);
-        __ lxvd2x(Rdst, R0);
+      if (PowerArchitecturePPC64 >= 9) {
+        if (is_aligned(src_offset, 16)) {
+          if (masm) {
+            __ lxv(Rdst, src_offset, R1_SP);
+          }
+          size += 4;
+        } else {
+          if (masm) {
+            __ addi(R0, R1_SP, src_offset);
+            __ lxvx(Rdst, R0);
+          }
+          size += 8;
+        }
+      } else {
+        if (masm) {
+          __ addi(R0, R1_SP, src_offset);
+          __ lxvd2x(Rdst, R0);
+        }
+        size += 8;
       }
-      size += 8;
     }
     // VectorSRegister->VectorSRegister.
     else if (src_lo_rc == rc_vs && dst_lo_rc == rc_vs) {
@@ -2265,52 +2563,11 @@ bool Matcher::is_generic_vector(MachOper* opnd)  {
   return false;
 }
 
-// Constants for c2c and c calling conventions.
-
-const MachRegisterNumbers iarg_reg[8] = {
-  R3_num, R4_num, R5_num, R6_num,
-  R7_num, R8_num, R9_num, R10_num
-};
-
-const MachRegisterNumbers farg_reg[13] = {
-  F1_num, F2_num, F3_num, F4_num,
-  F5_num, F6_num, F7_num, F8_num,
-  F9_num, F10_num, F11_num, F12_num,
-  F13_num
-};
-
-const MachRegisterNumbers vsarg_reg[64] = {
-  VSR0_num, VSR1_num, VSR2_num, VSR3_num,
-  VSR4_num, VSR5_num, VSR6_num, VSR7_num,
-  VSR8_num, VSR9_num, VSR10_num, VSR11_num,
-  VSR12_num, VSR13_num, VSR14_num, VSR15_num,
-  VSR16_num, VSR17_num, VSR18_num, VSR19_num,
-  VSR20_num, VSR21_num, VSR22_num, VSR23_num,
-  VSR24_num, VSR23_num, VSR24_num, VSR25_num,
-  VSR28_num, VSR29_num, VSR30_num, VSR31_num,
-  VSR32_num, VSR33_num, VSR34_num, VSR35_num,
-  VSR36_num, VSR37_num, VSR38_num, VSR39_num,
-  VSR40_num, VSR41_num, VSR42_num, VSR43_num,
-  VSR44_num, VSR45_num, VSR46_num, VSR47_num,
-  VSR48_num, VSR49_num, VSR50_num, VSR51_num,
-  VSR52_num, VSR53_num, VSR54_num, VSR55_num,
-  VSR56_num, VSR57_num, VSR58_num, VSR59_num,
-  VSR60_num, VSR61_num, VSR62_num, VSR63_num
-};
-
-const int num_iarg_registers = sizeof(iarg_reg) / sizeof(iarg_reg[0]);
-
-const int num_farg_registers = sizeof(farg_reg) / sizeof(farg_reg[0]);
-
-const int num_vsarg_registers = sizeof(vsarg_reg) / sizeof(vsarg_reg[0]);
-
 // 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) {
-  // We return true for all registers contained in iarg_reg[] and
-  // farg_reg[] and their virtual halves.
   // We must include the virtual halves in order to get STDs and LDs
   // instead of STWs and LWs in the trampoline stubs.
 
@@ -4125,6 +4382,15 @@ operand immL16Alg4() %{
   interface(CONST_INTER);
 %}
 
+// Long Immediate: 16-bit, 16-aligned
+operand immL16Alg16() %{
+  predicate(Assembler::is_simm(n->get_long(), 16) && ((n->get_long() & 0xf) == 0));
+  match(ConL);
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
 // Long Immediate: 32-bit, where lowest 16 bits are 0x0000.
 operand immL32hi16() %{
   predicate(Assembler::is_simm(n->get_long(), 32) && ((n->get_long() & 0xffffL) == 0L));
@@ -4643,6 +4909,20 @@ operand indOffset16Alg4(iRegPsrc reg, immL16Alg4 offset) %{
   %}
 %}
 
+// Indirect with 16-aligned Offset
+operand indOffset16Alg16(iRegPsrc reg, immL16Alg16 offset) %{
+  constraint(ALLOC_IN_RC(bits64_reg_ro));
+  match(AddP reg offset);
+  op_cost(100);
+  format %{ "[$reg + $offset]" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0x0);
+    scale(0x0);
+    disp($offset);
+  %}
+%}
+
 //----------Complex Operands for Compressed OOPs-------------------------------
 // Compressed OOPs with narrow_oop_shift == 0.
 
@@ -4852,6 +5132,7 @@ operand cmpOp() %{
 opclass memory(indirect, indOffset16 /*, indIndex, tlsReference*/, indirectNarrow, indirectNarrow_klass, indOffset16Narrow, indOffset16Narrow_klass);
 // Memory operand where offsets are 4-aligned. Required for ld, std.
 opclass memoryAlg4(indirect, indOffset16Alg4, indirectNarrow, indOffset16NarrowAlg4, indOffset16NarrowAlg4_klass);
+opclass memoryAlg16(indirect, indOffset16Alg16);
 opclass indirectMemory(indirect, indirectNarrow);
 
 // Special opclass for I and ConvL2I.
@@ -5392,8 +5673,9 @@ instruct loadV8(iRegLdst dst, memoryAlg4 mem) %{
 %}
 
 // Load Aligned Packed Byte
-instruct loadV16(vecX dst, indirect mem) %{
-  predicate(n->as_LoadVector()->memory_size() == 16);
+// Note: The Power8 instruction loads the contents in a special order in Little Endian mode.
+instruct loadV16_Power8(vecX dst, indirect mem) %{
+  predicate(n->as_LoadVector()->memory_size() == 16 && PowerArchitecturePPC64 == 8);
   match(Set dst (LoadVector mem));
   ins_cost(MEMORY_REF_COST);
 
@@ -5405,6 +5687,19 @@ instruct loadV16(vecX dst, indirect mem) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct loadV16_Power9(vecX dst, memoryAlg16 mem) %{
+  predicate(n->as_LoadVector()->memory_size() == 16 && PowerArchitecturePPC64 >= 9);
+  match(Set dst (LoadVector mem));
+  ins_cost(MEMORY_REF_COST);
+
+  format %{ "LXV      $dst, $mem \t// load 16-byte Vector" %}
+  size(4);
+  ins_encode %{
+    __ lxv($dst$$VectorSRegister, $mem$$disp, $mem$$Register);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // Load Range, range = array length (=jint)
 instruct loadRange(iRegIdst dst, memory mem) %{
   match(Set dst (LoadRange mem));
@@ -6418,8 +6713,9 @@ instruct storeA8B(memoryAlg4 mem, iRegLsrc src) %{
 %}
 
 // Store Packed Byte long register to memory
-instruct storeV16(indirect mem, vecX src) %{
-  predicate(n->as_StoreVector()->memory_size() == 16);
+// Note: The Power8 instruction stores the contents in a special order in Little Endian mode.
+instruct storeV16_Power8(indirect mem, vecX src) %{
+  predicate(n->as_StoreVector()->memory_size() == 16 && PowerArchitecturePPC64 == 8);
   match(Set mem (StoreVector mem src));
   ins_cost(MEMORY_REF_COST);
 
@@ -6431,6 +6727,19 @@ instruct storeV16(indirect mem, vecX src) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct storeV16_Power9(memoryAlg16 mem, vecX src) %{
+  predicate(n->as_StoreVector()->memory_size() == 16 && PowerArchitecturePPC64 >= 9);
+  match(Set mem (StoreVector mem src));
+  ins_cost(MEMORY_REF_COST);
+
+  format %{ "STXV     $mem, $src \t// store 16-byte Vector" %}
+  size(4);
+  ins_encode %{
+    __ stxv($src$$VectorSRegister, $mem$$disp, $mem$$Register);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // Reinterpret: only one vector size used: either L or X
 instruct reinterpretL(iRegLdst dst) %{
   match(Set dst (VectorReinterpret dst));
diff --git a/src/hotspot/cpu/ppc/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp
index 565542ad7c0..2b5b25f449e 100644
--- a/src/hotspot/cpu/ppc/register_ppc.hpp
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp
@@ -99,8 +99,8 @@ class Register {
 
   // testers
   constexpr bool is_valid()       const { return ( 0 <= _encoding && _encoding <  number_of_registers); }
-  constexpr bool is_volatile()    const { return ( 0 <= _encoding && _encoding <= 13 ); }
-  constexpr bool is_nonvolatile() const { return (14 <= _encoding && _encoding <= 31 ); }
+  constexpr bool is_volatile()    const { return ( 0 <= _encoding && _encoding <= 13); }
+  constexpr bool is_nonvolatile() const { return (14 <= _encoding && _encoding <= 31); }
 
   const char* name() const;
 };
@@ -169,7 +169,7 @@ class ConditionRegister {
 
   // testers
   constexpr bool is_valid()       const { return (0 <= _encoding && _encoding <  number_of_registers); }
-  constexpr bool is_nonvolatile() const { return (2 <= _encoding && _encoding <= 4 );  }
+  constexpr bool is_nonvolatile() const { return (2 <= _encoding && _encoding <= 4); }
 
   const char* name() const;
 };
@@ -214,6 +214,7 @@ class FloatRegister {
 
   // testers
   constexpr bool is_valid() const { return (0 <= _encoding && _encoding < number_of_registers); }
+  constexpr bool is_nonvolatile() const { return (14 <= _encoding && _encoding <= 31); }
 
   const char* name() const;
 
@@ -323,6 +324,7 @@ class VectorRegister {
 
   // testers
   constexpr bool is_valid() const { return (0 <= _encoding && _encoding < number_of_registers); }
+  constexpr bool is_nonvolatile() const { return (20 <= _encoding && _encoding <= 31); }
 
   const char* name() const;
 
@@ -372,6 +374,7 @@ constexpr VectorRegister VR31 = as_VectorRegister(31);
 
 
 // The implementation of Vector-Scalar (VSX) registers on POWER architecture.
+// VSR0-31 are aliases for F0-31 and VSR32-63 are aliases for VR0-31.
 class VectorSRegister {
   int _encoding;
  public:
@@ -390,6 +393,7 @@ class VectorSRegister {
   // accessors
   constexpr int encoding() const { assert(is_valid(), "invalid register"); return _encoding; }
   inline VMReg as_VMReg() const;
+  VectorSRegister successor() const { return VectorSRegister(encoding() + 1); }
 
   // testers
   constexpr bool is_valid() const { return (0 <= _encoding && _encoding < number_of_registers); }
@@ -480,7 +484,7 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
   enum {
     max_gpr = Register::number_of_registers * 2,
     max_fpr = max_gpr + FloatRegister::number_of_registers * 2,
-    max_vsr = max_fpr + VectorSRegister::number_of_registers,
+    max_vsr = max_fpr + VectorSRegister::number_of_registers * 4,
     max_cnd = max_vsr + ConditionRegister::number_of_registers,
     max_spr = max_cnd + SpecialRegister::number_of_registers,
     // This number must be large enough to cover REG_COUNT (defined by c2) registers.
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 5a33a14f79e..ebcfaa10f7c 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -243,7 +243,19 @@ static const RegisterSaver::LiveRegType RegisterSaver_LiveVSRegs[] = {
   RegisterSaver_LiveVSReg( VSR48 ),
   RegisterSaver_LiveVSReg( VSR49 ),
   RegisterSaver_LiveVSReg( VSR50 ),
-  RegisterSaver_LiveVSReg( VSR51 )
+  RegisterSaver_LiveVSReg( VSR51 ),
+  RegisterSaver_LiveVSReg( VSR52 ),
+  RegisterSaver_LiveVSReg( VSR53 ),
+  RegisterSaver_LiveVSReg( VSR54 ),
+  RegisterSaver_LiveVSReg( VSR55 ),
+  RegisterSaver_LiveVSReg( VSR56 ),
+  RegisterSaver_LiveVSReg( VSR57 ),
+  RegisterSaver_LiveVSReg( VSR58 ),
+  RegisterSaver_LiveVSReg( VSR59 ),
+  RegisterSaver_LiveVSReg( VSR60 ),
+  RegisterSaver_LiveVSReg( VSR61 ),
+  RegisterSaver_LiveVSReg( VSR62 ),
+  RegisterSaver_LiveVSReg( VSR63 )
 };
 
 
@@ -336,26 +348,50 @@ OopMap* RegisterSaver::push_frame_reg_args_and_save_live_registers(MacroAssemble
     }
 
     if (generate_oop_map) {
-      map->set_callee_saved(VMRegImpl::stack2reg(offset>>2),
+      map->set_callee_saved(VMRegImpl::stack2reg(offset >> 2),
                             RegisterSaver_LiveRegs[i].vmreg);
-      map->set_callee_saved(VMRegImpl::stack2reg((offset + half_reg_size)>>2),
-                            RegisterSaver_LiveRegs[i].vmreg->next());
     }
     offset += reg_size;
   }
 
-  for (int i = 0; i < vsregstosave_num; i++) {
-    int reg_num  = RegisterSaver_LiveVSRegs[i].reg_num;
-    int reg_type = RegisterSaver_LiveVSRegs[i].reg_type;
-
-    __ li(R30, offset);
-    __ stxvd2x(as_VectorSRegister(reg_num), R30, R1_SP);
+  // Note that generate_oop_map in the following loop is only used for the
+  // polling_page_vectors_safepoint_handler_blob.
+  // The order in which the vector contents are stored depends on Endianess and
+  // the utilized instructions (PowerArchitecturePPC64).
+  assert(is_aligned(offset, StackAlignmentInBytes), "should be");
+  if (PowerArchitecturePPC64 >= 10) {
+    assert(is_even(vsregstosave_num), "expectation");
+    for (int i = 0; i < vsregstosave_num; i += 2) {
+      int reg_num = RegisterSaver_LiveVSRegs[i].reg_num;
+      assert(RegisterSaver_LiveVSRegs[i + 1].reg_num == reg_num + 1, "or use other instructions!");
+
+      __ stxvp(as_VectorSRegister(reg_num), offset, R1_SP);
+      // Note: The contents were read in the same order (see loadV16_Power9 node in ppc.ad).
+      if (generate_oop_map) {
+        map->set_callee_saved(VMRegImpl::stack2reg(offset >> 2),
+                              RegisterSaver_LiveVSRegs[i LITTLE_ENDIAN_ONLY(+1) ].vmreg);
+        map->set_callee_saved(VMRegImpl::stack2reg((offset + vs_reg_size) >> 2),
+                              RegisterSaver_LiveVSRegs[i BIG_ENDIAN_ONLY(+1) ].vmreg);
+      }
+      offset += (2 * vs_reg_size);
+    }
+  } else {
+    for (int i = 0; i < vsregstosave_num; i++) {
+      int reg_num = RegisterSaver_LiveVSRegs[i].reg_num;
 
-    if (generate_oop_map) {
-      map->set_callee_saved(VMRegImpl::stack2reg(offset>>2),
-                            RegisterSaver_LiveVSRegs[i].vmreg);
+      if (PowerArchitecturePPC64 >= 9) {
+        __ stxv(as_VectorSRegister(reg_num), offset, R1_SP);
+      } else {
+        __ li(R31, offset);
+        __ stxvd2x(as_VectorSRegister(reg_num), R31, R1_SP);
+      }
+      // Note: The contents were read in the same order (see loadV16_Power8 / loadV16_Power9 node in ppc.ad).
+      if (generate_oop_map) {
+        VMReg vsr = RegisterSaver_LiveVSRegs[i].vmreg;
+        map->set_callee_saved(VMRegImpl::stack2reg(offset >> 2), vsr);
+      }
+      offset += vs_reg_size;
     }
-    offset += vs_reg_size;
   }
 
   assert(offset == frame_size_in_bytes, "consistency check");
@@ -418,14 +454,29 @@ void RegisterSaver::restore_live_registers_and_pop_frame(MacroAssembler* masm,
     offset += reg_size;
   }
 
-  for (int i = 0; i < vsregstosave_num; i++) {
-    int reg_num  = RegisterSaver_LiveVSRegs[i].reg_num;
-    int reg_type = RegisterSaver_LiveVSRegs[i].reg_type;
+  assert(is_aligned(offset, StackAlignmentInBytes), "should be");
+  if (PowerArchitecturePPC64 >= 10) {
+    for (int i = 0; i < vsregstosave_num; i += 2) {
+      int reg_num  = RegisterSaver_LiveVSRegs[i].reg_num;
+      assert(RegisterSaver_LiveVSRegs[i + 1].reg_num == reg_num + 1, "or use other instructions!");
 
-    __ li(R31, offset);
-    __ lxvd2x(as_VectorSRegister(reg_num), R31, R1_SP);
+      __ lxvp(as_VectorSRegister(reg_num), offset, R1_SP);
 
-    offset += vs_reg_size;
+      offset += (2 * vs_reg_size);
+    }
+  } else {
+    for (int i = 0; i < vsregstosave_num; i++) {
+      int reg_num  = RegisterSaver_LiveVSRegs[i].reg_num;
+
+      if (PowerArchitecturePPC64 >= 9) {
+        __ lxv(as_VectorSRegister(reg_num), offset, R1_SP);
+      } else {
+        __ li(R31, offset);
+        __ lxvd2x(as_VectorSRegister(reg_num), R31, R1_SP);
+      }
+
+      offset += vs_reg_size;
+    }
   }
 
   assert(offset == frame_size_in_bytes, "consistency check");
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 4a0ced42ed4..c4e89495503 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -94,10 +94,13 @@ class StubGenerator: public StubCodeGenerator {
 
     address start = __ function_entry();
 
+    int save_nonvolatile_registers_size = __ save_nonvolatile_registers_size(true, SuperwordUseVSX);
+
     // some sanity checks
+    STATIC_ASSERT(StackAlignmentInBytes == 16);
     assert((sizeof(frame::native_abi_minframe) % 16) == 0,    "unaligned");
     assert((sizeof(frame::native_abi_reg_args) % 16) == 0,    "unaligned");
-    assert((sizeof(frame::spill_nonvolatiles) % 16) == 0,     "unaligned");
+    assert((save_nonvolatile_registers_size % 16) == 0,       "unaligned");
     assert((sizeof(frame::parent_ijava_frame_abi) % 16) == 0, "unaligned");
     assert((sizeof(frame::entry_frame_locals) % 16) == 0,     "unaligned");
 
@@ -106,93 +109,72 @@ class StubGenerator: public StubCodeGenerator {
     Register r_arg_result_type              = R5;
     Register r_arg_method                   = R6;
     Register r_arg_entry                    = R7;
+    Register r_arg_argument_addr            = R8;
+    Register r_arg_argument_count           = R9;
     Register r_arg_thread                   = R10;
 
-    Register r_temp                         = R24;
-    Register r_top_of_arguments_addr        = R25;
-    Register r_entryframe_fp                = R26;
+    Register r_entryframe_fp                = R2; // volatile
+    Register r_argument_size                = R11_scratch1; // volatile
+    Register r_top_of_arguments_addr        = R21_tmp1;
 
     {
       // Stack on entry to call_stub:
       //
       //      F1      [C_FRAME]
       //              ...
-
-      Register r_arg_argument_addr          = R8;
-      Register r_arg_argument_count         = R9;
-      Register r_frame_alignment_in_bytes   = R27;
-      Register r_argument_addr              = R28;
-      Register r_argumentcopy_addr          = R29;
-      Register r_argument_size_in_bytes     = R30;
-      Register r_frame_size                 = R23;
-
+      Register r_frame_size  = R12_scratch2; // volatile
       Label arguments_copied;
 
       // Save LR/CR to caller's C_FRAME.
       __ save_LR_CR(R0);
 
-      // Zero extend arg_argument_count.
-      __ clrldi(r_arg_argument_count, r_arg_argument_count, 32);
-
-      // Save non-volatiles GPRs to ENTRY_FRAME (not yet pushed, but it's safe).
-      __ save_nonvolatile_gprs(R1_SP, _spill_nonvolatiles_neg(r14));
-
       // Keep copy of our frame pointer (caller's SP).
       __ mr(r_entryframe_fp, R1_SP);
 
+      // calculate frame size
+      STATIC_ASSERT(Interpreter::logStackElementSize == 3);
+
+      // space for arguments aligned up: ((arg_count + 1) * 8) &~ 15
+      __ addi(r_frame_size, r_arg_argument_count, 1);
+      __ rldicr(r_frame_size, r_frame_size, 3, 63 - 4);
+
+      // this is the pure space for arguments (excluding alignment padding)
+      __ sldi(r_argument_size, r_arg_argument_count, 3);
+
+      __ addi(r_frame_size, r_frame_size,
+              save_nonvolatile_registers_size + frame::entry_frame_locals_size + frame::top_ijava_frame_abi_size);
+
+      // push ENTRY_FRAME
+      __ push_frame(r_frame_size, R0);
+
+      // Save non-volatiles registers to ENTRY_FRAME.
+      __ save_nonvolatile_registers(r_entryframe_fp, -(frame::entry_frame_locals_size + save_nonvolatile_registers_size),
+                                    true, SuperwordUseVSX);
+
       BLOCK_COMMENT("Push ENTRY_FRAME including arguments");
       // Push ENTRY_FRAME including arguments:
       //
       //      F0      [TOP_IJAVA_FRAME_ABI]
       //              alignment (optional)
       //              [outgoing Java arguments]
+      //              [non-volatiles]
       //              [ENTRY_FRAME_LOCALS]
       //      F1      [C_FRAME]
       //              ...
 
-      // calculate frame size
-
-      // unaligned size of arguments
-      __ sldi(r_argument_size_in_bytes,
-                  r_arg_argument_count, Interpreter::logStackElementSize);
-      // arguments alignment (max 1 slot)
-      // FIXME: use round_to() here
-      __ andi_(r_frame_alignment_in_bytes, r_arg_argument_count, 1);
-      __ sldi(r_frame_alignment_in_bytes,
-              r_frame_alignment_in_bytes, Interpreter::logStackElementSize);
-
-      // size = unaligned size of arguments + top abi's size
-      __ addi(r_frame_size, r_argument_size_in_bytes,
-              frame::top_ijava_frame_abi_size);
-      // size += arguments alignment
-      __ add(r_frame_size,
-             r_frame_size, r_frame_alignment_in_bytes);
-      // size += size of call_stub locals
-      __ addi(r_frame_size,
-              r_frame_size, frame::entry_frame_locals_size);
-
-      // push ENTRY_FRAME
-      __ push_frame(r_frame_size, r_temp);
-
       // initialize call_stub locals (step 1)
-      __ std(r_arg_call_wrapper_addr,
-             _entry_frame_locals_neg(call_wrapper_address), r_entryframe_fp);
-      __ std(r_arg_result_addr,
-             _entry_frame_locals_neg(result_address), r_entryframe_fp);
-      __ std(r_arg_result_type,
-             _entry_frame_locals_neg(result_type), r_entryframe_fp);
+      __ std(r_arg_call_wrapper_addr, _entry_frame_locals_neg(call_wrapper_address), r_entryframe_fp);
+      __ std(r_arg_result_addr, _entry_frame_locals_neg(result_address), r_entryframe_fp);
+      __ std(r_arg_result_type, _entry_frame_locals_neg(result_type), r_entryframe_fp);
       // we will save arguments_tos_address later
 
-
       BLOCK_COMMENT("Copy Java arguments");
       // copy Java arguments
 
       // Calculate top_of_arguments_addr which will be R17_tos (not prepushed) later.
-      // FIXME: why not simply use SP+frame::top_ijava_frame_size?
-      __ addi(r_top_of_arguments_addr,
-              R1_SP, frame::top_ijava_frame_abi_size);
-      __ add(r_top_of_arguments_addr,
-             r_top_of_arguments_addr, r_frame_alignment_in_bytes);
+      __ addi(r_top_of_arguments_addr, r_entryframe_fp,
+              -(save_nonvolatile_registers_size + frame::entry_frame_locals_size));
+      __ sub(r_top_of_arguments_addr, r_top_of_arguments_addr, r_argument_size);
 
       // any arguments to copy?
       __ cmpdi(CR0, r_arg_argument_count, 0);
@@ -200,6 +182,8 @@ class StubGenerator: public StubCodeGenerator {
 
       // prepare loop and copy arguments in reverse order
       {
+        Register r_argument_addr     = R22_tmp2;
+        Register r_argumentcopy_addr = R23_tmp3;
         // init CTR with arg_argument_count
         __ mtctr(r_arg_argument_count);
 
@@ -207,8 +191,7 @@ class StubGenerator: public StubCodeGenerator {
         __ mr(r_argumentcopy_addr, r_top_of_arguments_addr);
 
         // let r_argument_addr point to last incoming java argument
-        __ add(r_argument_addr,
-                   r_arg_argument_addr, r_argument_size_in_bytes);
+        __ add(r_argument_addr, r_arg_argument_addr, r_argument_size);
         __ addi(r_argument_addr, r_argument_addr, -BytesPerWord);
 
         // now loop while CTR > 0 and copy arguments
@@ -216,10 +199,10 @@ class StubGenerator: public StubCodeGenerator {
           Label next_argument;
           __ bind(next_argument);
 
-          __ ld(r_temp, 0, r_argument_addr);
+          __ ld(R0, 0, r_argument_addr);
           // argument_addr--;
           __ addi(r_argument_addr, r_argument_addr, -BytesPerWord);
-          __ std(r_temp, 0, r_argumentcopy_addr);
+          __ std(R0, 0, r_argumentcopy_addr);
           // argumentcopy_addr++;
           __ addi(r_argumentcopy_addr, r_argumentcopy_addr, BytesPerWord);
 
@@ -234,11 +217,7 @@ class StubGenerator: public StubCodeGenerator {
     {
       BLOCK_COMMENT("Call frame manager or native entry.");
       // Call frame manager or native entry.
-      Register r_new_arg_entry = R14;
-      assert_different_registers(r_new_arg_entry, r_top_of_arguments_addr,
-                                 r_arg_method, r_arg_thread);
-
-      __ mr(r_new_arg_entry, r_arg_entry);
+      assert_different_registers(r_arg_entry, r_top_of_arguments_addr, r_arg_method, r_arg_thread);
 
       // Register state on entry to frame manager / native entry:
       //
@@ -262,31 +241,32 @@ class StubGenerator: public StubCodeGenerator {
       assert(tos != r_arg_thread && R19_method != r_arg_thread, "trashed r_arg_thread");
 
       // Set R15_prev_state to 0 for simplifying checks in callee.
-      __ load_const_optimized(R25_templateTableBase, (address)Interpreter::dispatch_table((TosState)0), R11_scratch1);
+      __ load_const_optimized(R25_templateTableBase, (address)Interpreter::dispatch_table((TosState)0), R0);
       // Stack on entry to frame manager / native entry:
       //
       //      F0      [TOP_IJAVA_FRAME_ABI]
       //              alignment (optional)
       //              [outgoing Java arguments]
+      //              [non-volatiles]
       //              [ENTRY_FRAME_LOCALS]
       //      F1      [C_FRAME]
       //              ...
       //
 
       // global toc register
-      __ load_const_optimized(R29_TOC, MacroAssembler::global_toc(), R11_scratch1);
+      __ load_const_optimized(R29_TOC, MacroAssembler::global_toc(), R0);
       // Remember the senderSP so we interpreter can pop c2i arguments off of the stack
       // when called via a c2i.
 
       // Pass initial_caller_sp to framemanager.
       __ mr(R21_sender_SP, R1_SP);
 
-      // Do a light-weight C-call here, r_new_arg_entry holds the address
+      // Do a light-weight C-call here, r_arg_entry holds the address
       // of the interpreter entry point (frame manager or native entry)
       // and save runtime-value of LR in return_address.
-      assert(r_new_arg_entry != tos && r_new_arg_entry != R19_method && r_new_arg_entry != R16_thread,
-             "trashed r_new_arg_entry");
-      return_address = __ call_stub(r_new_arg_entry);
+      assert(r_arg_entry != tos && r_arg_entry != R19_method && r_arg_entry != R16_thread,
+             "trashed r_arg_entry");
+      return_address = __ call_stub(r_arg_entry);
     }
 
     {
@@ -298,6 +278,7 @@ class StubGenerator: public StubCodeGenerator {
       //
       //      F0      [ABI]
       //              ...
+      //              [non-volatiles]
       //              [ENTRY_FRAME_LOCALS]
       //      F1      [C_FRAME]
       //              ...
@@ -310,39 +291,38 @@ class StubGenerator: public StubCodeGenerator {
       Label ret_is_float;
       Label ret_is_double;
 
-      Register r_entryframe_fp = R30;
-      Register r_lr            = R7_ARG5;
-      Register r_cr            = R8_ARG6;
+      Register r_lr = R11_scratch1;
+      Register r_cr = R12_scratch2;
 
       // Reload some volatile registers which we've spilled before the call
       // to frame manager / native entry.
       // Access all locals via frame pointer, because we know nothing about
       // the topmost frame's size.
-      __ ld(r_entryframe_fp, _abi0(callers_sp), R1_SP);
+      __ ld(r_entryframe_fp, _abi0(callers_sp), R1_SP); // restore after call
       assert_different_registers(r_entryframe_fp, R3_RET, r_arg_result_addr, r_arg_result_type, r_cr, r_lr);
-      __ ld(r_arg_result_addr,
-            _entry_frame_locals_neg(result_address), r_entryframe_fp);
-      __ ld(r_arg_result_type,
-            _entry_frame_locals_neg(result_type), r_entryframe_fp);
+      __ ld(r_arg_result_addr, _entry_frame_locals_neg(result_address), r_entryframe_fp);
+      __ ld(r_arg_result_type, _entry_frame_locals_neg(result_type), r_entryframe_fp);
       __ ld(r_cr, _abi0(cr), r_entryframe_fp);
       __ ld(r_lr, _abi0(lr), r_entryframe_fp);
-
-      // pop frame and restore non-volatiles, LR and CR
-      __ mr(R1_SP, r_entryframe_fp);
-      __ pop_cont_fastpath();
-      __ mtcr(r_cr);
-      __ mtlr(r_lr);
+      __ mtcr(r_cr); // restore CR
+      __ mtlr(r_lr); // restore LR
 
       // Store result depending on type. Everything that is not
       // T_OBJECT, T_LONG, T_FLOAT, or T_DOUBLE is treated as T_INT.
-      __ cmpwi(CR0, r_arg_result_type, T_OBJECT);
-      __ cmpwi(CR1, r_arg_result_type, T_LONG);
-      __ cmpwi(CR5, r_arg_result_type, T_FLOAT);
-      __ cmpwi(CR6, r_arg_result_type, T_DOUBLE);
+      // Using volatile CRs.
+      __ cmpwi(CR1, r_arg_result_type, T_OBJECT);
+      __ cmpwi(CR5, r_arg_result_type, T_LONG);
+      __ cmpwi(CR6, r_arg_result_type, T_FLOAT);
+      __ cmpwi(CR7, r_arg_result_type, T_DOUBLE);
+
+      __ pop_cont_fastpath(); // kills CR0, uses R16_thread
 
       // restore non-volatile registers
-      __ restore_nonvolatile_gprs(R1_SP, _spill_nonvolatiles_neg(r14));
+      __ restore_nonvolatile_registers(r_entryframe_fp, -(frame::entry_frame_locals_size + save_nonvolatile_registers_size),
+                                       true, SuperwordUseVSX);
 
+      // pop frame
+      __ mr(R1_SP, r_entryframe_fp);
 
       // Stack on exit from call_stub:
       //
@@ -351,24 +331,18 @@ class StubGenerator: public StubCodeGenerator {
       //
       //  no call_stub frames left.
 
-      // All non-volatiles have been restored at this point!!
-      assert(R3_RET == R3, "R3_RET should be R3");
-
-      __ beq(CR0, ret_is_object);
-      __ beq(CR1, ret_is_long);
-      __ beq(CR5, ret_is_float);
-      __ beq(CR6, ret_is_double);
+      __ beq(CR1, ret_is_object);
+      __ beq(CR5, ret_is_long);
+      __ beq(CR6, ret_is_float);
+      __ beq(CR7, ret_is_double);
 
       // default:
       __ stw(R3_RET, 0, r_arg_result_addr);
       __ blr(); // return to caller
 
       // case T_OBJECT:
-      __ bind(ret_is_object);
-      __ std(R3_RET, 0, r_arg_result_addr);
-      __ blr(); // return to caller
-
       // case T_LONG:
+      __ bind(ret_is_object);
       __ bind(ret_is_long);
       __ std(R3_RET, 0, r_arg_result_addr);
       __ blr(); // return to caller
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index a8f5dbda484..b0570101912 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -119,12 +119,13 @@ address TemplateInterpreterGenerator::generate_slow_signature_handler() {
   const FloatRegister floatSlot = F0;
 
   address entry = __ function_entry();
+  int save_nonvolatile_registers_size = __ save_nonvolatile_registers_size(false, false);
 
   __ save_LR(R0);
-  __ save_nonvolatile_gprs(R1_SP, _spill_nonvolatiles_neg(r14));
+  __ save_nonvolatile_registers(R1_SP, -save_nonvolatile_registers_size, false, false);
   // We use target_sp for storing arguments in the C frame.
   __ mr(target_sp, R1_SP);
-  __ push_frame_reg_args_nonvolatiles(0, R11_scratch1);
+  __ push_frame(frame::native_abi_reg_args_size + save_nonvolatile_registers_size, R11_scratch1);
 
   __ mr(arg_java, R3_ARG1);
 
@@ -309,7 +310,7 @@ address TemplateInterpreterGenerator::generate_slow_signature_handler() {
   __ bind(loop_end);
 
   __ pop_frame();
-  __ restore_nonvolatile_gprs(R1_SP, _spill_nonvolatiles_neg(r14));
+  __ restore_nonvolatile_registers(R1_SP, -save_nonvolatile_registers_size, false, false);
   __ restore_LR(R0);
 
   __ blr();
diff --git a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
index 5c7b0067c3a..ae5410b12df 100644
--- a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
+++ b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -35,86 +35,6 @@
 
 #define __ _masm->
 
-// for callee saved regs, according to the caller's ABI
-static int compute_reg_save_area_size(const ABIDescriptor& abi) {
-  int size = 0;
-  for (int i = 0; i < Register::number_of_registers; i++) {
-    Register reg = as_Register(i);
-    // R1 saved/restored by prologue/epilogue, R13 (system thread) won't get modified!
-    if (reg == R1_SP || reg == R13) continue;
-    if (!abi.is_volatile_reg(reg)) {
-      size += 8; // bytes
-    }
-  }
-
-  for (int i = 0; i < FloatRegister::number_of_registers; i++) {
-    FloatRegister reg = as_FloatRegister(i);
-    if (!abi.is_volatile_reg(reg)) {
-      size += 8; // bytes
-    }
-  }
-
-  return size;
-}
-
-static void preserve_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
-  // 1. iterate all registers in the architecture
-  //     - check if they are volatile or not for the given abi
-  //     - if NOT, we need to save it here
-
-  int offset = reg_save_area_offset;
-
-  __ block_comment("{ preserve_callee_saved_regs ");
-  for (int i = 0; i < Register::number_of_registers; i++) {
-    Register reg = as_Register(i);
-    // R1 saved/restored by prologue/epilogue, R13 (system thread) won't get modified!
-    if (reg == R1_SP || reg == R13) continue;
-    if (!abi.is_volatile_reg(reg)) {
-      __ std(reg, offset, R1_SP);
-      offset += 8;
-    }
-  }
-
-  for (int i = 0; i < FloatRegister::number_of_registers; i++) {
-    FloatRegister reg = as_FloatRegister(i);
-    if (!abi.is_volatile_reg(reg)) {
-      __ stfd(reg, offset, R1_SP);
-      offset += 8;
-    }
-  }
-
-  __ block_comment("} preserve_callee_saved_regs ");
-}
-
-static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescriptor& abi, int reg_save_area_offset) {
-  // 1. iterate all registers in the architecture
-  //     - check if they are volatile or not for the given abi
-  //     - if NOT, we need to restore it here
-
-  int offset = reg_save_area_offset;
-
-  __ block_comment("{ restore_callee_saved_regs ");
-  for (int i = 0; i < Register::number_of_registers; i++) {
-    Register reg = as_Register(i);
-    // R1 saved/restored by prologue/epilogue, R13 (system thread) won't get modified!
-    if (reg == R1_SP || reg == R13) continue;
-    if (!abi.is_volatile_reg(reg)) {
-      __ ld(reg, offset, R1_SP);
-      offset += 8;
-    }
-  }
-
-  for (int i = 0; i < FloatRegister::number_of_registers; i++) {
-    FloatRegister reg = as_FloatRegister(i);
-    if (!abi.is_volatile_reg(reg)) {
-      __ lfd(reg, offset, R1_SP);
-      offset += 8;
-    }
-  }
-
-  __ block_comment("} restore_callee_saved_regs ");
-}
-
 static const int upcall_stub_code_base_size = 1024;
 static const int upcall_stub_size_per_arg = 16; // arg save & restore + move
 
@@ -140,13 +60,17 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
   // The Java call uses the JIT ABI, but we also call C.
   int out_arg_area = MAX2(frame::jit_out_preserve_size + out_arg_bytes, (int)frame::native_abi_reg_args_size);
 
-  int reg_save_area_size = compute_reg_save_area_size(abi);
+  MacroAssembler* _masm = new MacroAssembler(&buffer);
+  int reg_save_area_size = __ save_nonvolatile_registers_size(true, SuperwordUseVSX);
   RegSpiller arg_spiller(call_regs._arg_regs);
   RegSpiller result_spiller(call_regs._ret_regs);
 
   int res_save_area_offset   = out_arg_area;
   int arg_save_area_offset   = res_save_area_offset   + result_spiller.spill_size_bytes();
   int reg_save_area_offset   = arg_save_area_offset   + arg_spiller.spill_size_bytes();
+  if (SuperwordUseVSX) { // VectorRegisters want alignment
+    reg_save_area_offset = align_up(reg_save_area_offset, StackAlignmentInBytes);
+  }
   int frame_data_offset      = reg_save_area_offset   + reg_save_area_size;
   int frame_bottom_offset    = frame_data_offset      + sizeof(UpcallStub::FrameData);
 
@@ -201,7 +125,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
   //////////////////////////////////////////////////////////////////////////////
 
-  MacroAssembler* _masm = new MacroAssembler(&buffer);
   address start = __ function_entry(); // called by C
   __ save_LR_CR(R0);
   assert((abi._stack_alignment_bytes % 16) == 0, "must be 16 byte aligned");
@@ -212,7 +135,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
   // (and maybe attach it).
   arg_spiller.generate_spill(_masm, arg_save_area_offset);
   // Java methods won't preserve them, so save them here:
-  preserve_callee_saved_registers(_masm, abi, reg_save_area_offset);
+  __ save_nonvolatile_registers(R1_SP, reg_save_area_offset, true, SuperwordUseVSX);
 
   // Java code uses TOC (pointer to code cache).
   __ load_const_optimized(R29_TOC, MacroAssembler::global_toc(), R0); // reinit
@@ -310,7 +233,7 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
   __ call_c(call_target_address);
   __ block_comment("} on_exit");
 
-  restore_callee_saved_registers(_masm, abi, reg_save_area_offset);
+  __ restore_nonvolatile_registers(R1_SP, reg_save_area_offset, true, SuperwordUseVSX);
 
   result_spiller.generate_fill(_masm, res_save_area_offset);
 
diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.cpp b/src/hotspot/cpu/ppc/vmreg_ppc.cpp
index d8a5c35cac0..2ed68578a80 100644
--- a/src/hotspot/cpu/ppc/vmreg_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.cpp
@@ -32,21 +32,29 @@ void VMRegImpl::set_regName() {
   for (i = 0; i < ConcreteRegisterImpl::max_gpr; ) {
     regName[i++] = reg->name();
     regName[i++] = reg->name();
-    if (reg->encoding() < Register::number_of_registers-1)
+    if (reg->encoding() < Register::number_of_registers - 1) {
       reg = reg->successor();
+    }
   }
 
   FloatRegister freg = ::as_FloatRegister(0);
   for ( ; i < ConcreteRegisterImpl::max_fpr; ) {
     regName[i++] = freg->name();
     regName[i++] = freg->name();
-    if (reg->encoding() < FloatRegister::number_of_registers-1)
+    if (reg->encoding() < FloatRegister::number_of_registers - 1) {
       freg = freg->successor();
+    }
   }
 
   VectorSRegister vsreg = ::as_VectorSRegister(0);
   for ( ; i < ConcreteRegisterImpl::max_vsr; ) {
     regName[i++] = vsreg->name();
+    regName[i++] = vsreg->name();
+    regName[i++] = vsreg->name();
+    regName[i++] = vsreg->name();
+    if (reg->encoding() < VectorSRegister::number_of_registers - 1) {
+      vsreg = vsreg->successor();
+    }
   }
 
   for ( ; i < ConcreteRegisterImpl::number_of_registers; ) {
diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.hpp
index b2d97a6d385..4e25c8b3cea 100644
--- a/src/hotspot/cpu/ppc/vmreg_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. 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
@@ -62,12 +62,17 @@ inline FloatRegister as_FloatRegister() {
 
 inline VectorSRegister as_VectorSRegister() {
   assert(is_VectorSRegister(), "must be");
-  return ::as_VectorSRegister(value() - ConcreteRegisterImpl::max_fpr);
+  return ::as_VectorSRegister((value() - ConcreteRegisterImpl::max_fpr) >> 2);
 }
 
 inline bool is_concrete() {
   assert(is_reg(), "must be");
-  return is_even(value());
+  if (is_Register() || is_FloatRegister()) return is_even(value());
+  if (is_VectorSRegister()) {
+    int base = value() - ConcreteRegisterImpl::max_fpr;
+    return (base & 3) == 0;
+  }
+  return true;
 }
 
 #endif // CPU_PPC_VMREG_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
index afaefe50c97..2424df8da01 100644
--- a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. 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
@@ -41,7 +41,8 @@ inline VMReg FloatRegister::as_VMReg() const {
 }
 
 inline VMReg VectorSRegister::as_VMReg() const {
-  return VMRegImpl::as_VMReg((encoding()) + ConcreteRegisterImpl::max_fpr);
+  // Four halves, multiply by 4.
+  return VMRegImpl::as_VMReg((encoding() << 2) + ConcreteRegisterImpl::max_fpr);
 }
 
 inline VMReg ConditionRegister::as_VMReg() const {

From 86f39ab5bb58a1d1e720badd7261365398134151 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Wed, 14 May 2025 08:39:21 +0000
Subject: [PATCH 456/901] 8249825: Tests
 sun/security/ssl/SSLSocketImpl/SetClientMode.java and NonAutoClose.java
 marked with @ignore

Reviewed-by: abarashev, rhalade
---
 .../ssl/SSLSocketImpl/NonAutoClose.java       | 352 +++++-------------
 .../ssl/SSLSocketImpl/SetClientMode.java      | 173 +++------
 2 files changed, 160 insertions(+), 365 deletions(-)

diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java b/test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
index 2209bd3a648..82f3b7d1537 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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,229 +29,144 @@
 /*
  * @test
  * @bug 4404399
- * @ignore this test does not work any more as the TLS spec changes the
- *         behaviors of close_notify.
+ * @comment this test does not work in TLSv1.3 as the spec changes the
+ *          behaviors of close_notify.
  * @summary When a layered SSL socket is closed, it should wait for close_notify
- * @run main/othervm NonAutoClose
+ * @library /test/lib /javax/net/ssl/templates
+ * @run main/othervm NonAutoClose TLSv1
+ * @run main/othervm NonAutoClose TLSv1.1
+ * @run main/othervm NonAutoClose TLSv1.2
  * @author Brad Wetmore
  */
 
 import java.io.*;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.CountDownLatch;
 import javax.net.ssl.*;
-import java.security.cert.X509Certificate;
-import java.security.cert.CertificateException;
 
+import jdk.test.lib.security.SecurityUtils;
 
-public class NonAutoClose {
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
+import static jdk.test.lib.Asserts.assertEquals;
 
-    /*
-     * Should we run the client or server in a separate thread?
-     * Both sides can throw exceptions, but do you have a preference
-     * as to which side should be the main thread.
-     */
-    private static boolean separateServerThread = true;
-
-    /*
-     * Where do we find the keystores?
-     */
-    private final static String pathToStores = "../../../../javax/net/ssl/etc";
-    private final static String keyStoreFile = "keystore";
-    private final static String trustStoreFile = "truststore";
-    private final static String passwd = "passphrase";
-    private final static char[] cpasswd = "passphrase".toCharArray();
+public class NonAutoClose extends SSLContextTemplate {
 
     /*
      * Is the server ready to serve?
      */
-    volatile static boolean serverReady = false;
+    private static final CountDownLatch SERVER_READY = new CountDownLatch(1);
 
     /*
      * Turn on SSL debugging?
      */
-    private final static boolean DEBUG = false;
-    private final static boolean VERBOSE = true;
-    private final static int NUM_ITERATIONS  = 10;
+    private final static boolean DEBUG = Boolean.getBoolean("test.debug");
+    private final static int NUM_ITERATIONS = 10;
     private final static int PLAIN_SERVER_VAL = 1;
     private final static int PLAIN_CLIENT_VAL = 2;
     private final static int TLS_SERVER_VAL = 3;
     private final static int TLS_CLIENT_VAL = 4;
 
-    /*
-     * If the client or server is doing some kind of object creation
-     * that the other side depends on, and that thread prematurely
-     * exits, you may experience a hang.  The test harness will
-     * terminate all hung threads after its timeout has expired,
-     * currently 3 minutes by default, but you might try to be
-     * smart about it....
-     */
-
-    void expectValue(int got, int expected, String msg) throws IOException {
-        if (VERBOSE) {
-            System.err.println(msg + ": read (" + got + ")");
-        }
-        if (got != expected) {
-            throw new IOException(msg + ": read (" + got
-                + ") but expecting(" + expected + ")");
-        }
-    }
-
-
     /*
      * Define the server side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
      */
+    private void doServerSide() throws Exception {
+        System.out.println("Starting server");
+        SSLSocketFactory sslsf = createServerSSLContext().getSocketFactory();
 
-     void doServerSide() throws Exception {
-        if (VERBOSE) {
-            System.err.println("Starting server");
-        }
+        try (ServerSocket serverSocket = new ServerSocket(SERVER_PORT)) {
+            SERVER_PORT = serverSocket.getLocalPort();
 
-        /*
-         * Setup the SSL stuff
-         */
-        SSLSocketFactory sslsf =
-             (SSLSocketFactory) SSLSocketFactory.getDefault();
+            /*
+             * Signal Client, we're ready for his connect.
+             */
+            System.out.println("Signal server ready");
+            SERVER_READY.countDown();
 
-        ServerSocket serverSocket = new ServerSocket(SERVER_PORT);
+            try (Socket plainSocket = serverSocket.accept();
+                 InputStream is = plainSocket.getInputStream();
+                 OutputStream os = plainSocket.getOutputStream()) {
 
-        SERVER_PORT = serverSocket.getLocalPort();
+                assertEquals(PLAIN_CLIENT_VAL, is.read());
 
-        /*
-         * Signal Client, we're ready for his connect.
-         */
-        serverReady = true;
+                os.write(PLAIN_SERVER_VAL);
+                os.flush();
 
-        Socket plainSocket = serverSocket.accept();
-        InputStream is = plainSocket.getInputStream();
-        OutputStream os = plainSocket.getOutputStream();
-
-        expectValue(is.read(), PLAIN_CLIENT_VAL, "Server");
-
-        os.write(PLAIN_SERVER_VAL);
-        os.flush();
-
-        for (int i = 1; i <= NUM_ITERATIONS; i++) {
-            if (VERBOSE) {
-                System.err.println("=================================");
-                System.err.println("Server Iteration #" + i);
-            }
+                for (int i = 1; i <= NUM_ITERATIONS; i++) {
+                    if (DEBUG) {
+                        System.out.println("=================================");
+                        System.out.println("Server Iteration #" + i);
+                    }
 
-            SSLSocket ssls = (SSLSocket) sslsf.createSocket(plainSocket,
-                SERVER_NAME, plainSocket.getPort(), false);
+                    try (SSLSocket ssls = (SSLSocket) sslsf.createSocket(plainSocket,
+                            plainSocket.getInetAddress().getHostName(),
+                            plainSocket.getPort(), false)) {
 
-            ssls.setUseClientMode(false);
-            InputStream sslis = ssls.getInputStream();
-            OutputStream sslos = ssls.getOutputStream();
+                        ssls.setEnabledProtocols(new String[]{protocol});
+                        ssls.setUseClientMode(false);
+                        try (InputStream sslis = ssls.getInputStream();
+                             OutputStream sslos = ssls.getOutputStream()) {
 
-            expectValue(sslis.read(), TLS_CLIENT_VAL, "Server");
+                            assertEquals(TLS_CLIENT_VAL, sslis.read());
 
-            sslos.write(TLS_SERVER_VAL);
-            sslos.flush();
+                            sslos.write(TLS_SERVER_VAL);
+                            sslos.flush();
+                        }
+                    }
+                }
 
-            sslis.close();
-            sslos.close();
-            ssls.close();
+                assertEquals(PLAIN_CLIENT_VAL, is.read());
 
-            if (VERBOSE) {
-                System.err.println("TLS socket is closed");
+                os.write(PLAIN_SERVER_VAL);
+                os.flush();
             }
         }
-
-        expectValue(is.read(), PLAIN_CLIENT_VAL, "Server");
-
-        os.write(PLAIN_SERVER_VAL);
-        os.flush();
-
-        is.close();
-        os.close();
-        plainSocket.close();
-
-        if (VERBOSE) {
-            System.err.println("Server plain socket is closed");
-        }
     }
 
     /*
      * Define the client side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
      */
     private void doClientSide() throws Exception {
         /*
          * Wait for server to get started.
          */
-        while (!serverReady) {
-            Thread.sleep(50);
-        }
-
-        if (VERBOSE) {
-            System.err.println("Starting client");
-        }
-
-        /*
-         * Setup the SSL stuff
-         */
-        SSLSocketFactory sslsf =
-             (SSLSocketFactory) SSLSocketFactory.getDefault();
-
-        Socket plainSocket = new Socket(SERVER_NAME, SERVER_PORT);
-        InputStream is = plainSocket.getInputStream();
-        OutputStream os = plainSocket.getOutputStream();
-
-        os.write(PLAIN_CLIENT_VAL);
-        os.flush();
+        System.out.println("Waiting for server ready");
+        SERVER_READY.await();
 
-        expectValue(is.read(), PLAIN_SERVER_VAL, "Client");
+        SSLSocketFactory sslsf = createClientSSLContext().getSocketFactory();
 
-        for (int i = 1; i <= NUM_ITERATIONS; i++) {
-            if (VERBOSE) {
-                System.err.println("===================================");
-                System.err.println("Client Iteration #" + i);
-              }
+        try (Socket plainSocket = new Socket(InetAddress.getLocalHost(), SERVER_PORT);
+             InputStream is = plainSocket.getInputStream();
+             OutputStream os = plainSocket.getOutputStream()) {
 
-            SSLSocket ssls = (SSLSocket) sslsf.createSocket(plainSocket,
-               SERVER_NAME, plainSocket.getPort(), false);
+            os.write(PLAIN_CLIENT_VAL);
+            os.flush();
 
-            ssls.setUseClientMode(true);
+            assertEquals(PLAIN_SERVER_VAL, is.read());
 
-            InputStream sslis = ssls.getInputStream();
-            OutputStream sslos = ssls.getOutputStream();
-
-            sslos.write(TLS_CLIENT_VAL);
-            sslos.flush();
+            for (int i = 1; i <= NUM_ITERATIONS; i++) {
+                if (DEBUG) {
+                    System.out.println("===================================");
+                    System.out.println("Client Iteration #" + i);
+                }
+                try (SSLSocket ssls = (SSLSocket) sslsf.createSocket(plainSocket,
+                        plainSocket.getInetAddress().getHostName(),
+                        plainSocket.getPort(), false);
+                     InputStream sslis = ssls.getInputStream();
+                     OutputStream sslos = ssls.getOutputStream()) {
 
-            expectValue(sslis.read(), TLS_SERVER_VAL, "Client");
+                    ssls.setUseClientMode(true);
 
-            sslis.close();
-            sslos.close();
-            ssls.close();
+                    sslos.write(TLS_CLIENT_VAL);
+                    sslos.flush();
 
-            if (VERBOSE) {
-                System.err.println("Client TLS socket is closed");
+                    assertEquals(TLS_SERVER_VAL, sslis.read());
+                }
             }
-        }
 
-        os.write(PLAIN_CLIENT_VAL);
-        os.flush();
-
-        expectValue(is.read(), PLAIN_SERVER_VAL, "Client");
-
-        is.close();
-        os.close();
-        plainSocket.close();
-
-        if (VERBOSE) {
-            System.err.println("Client plain socket is closed");
+            os.write(PLAIN_CLIENT_VAL);
+            os.flush();
+            assertEquals(PLAIN_SERVER_VAL, is.read());
         }
     }
 
@@ -261,25 +176,13 @@ private void doClientSide() throws Exception {
      */
 
     private volatile int SERVER_PORT = 0;
-    private final static String SERVER_NAME = "localhost";
-
-    private volatile Exception serverException = null;
     private volatile Exception clientException = null;
 
-    private final static String keyFilename =
-        System.getProperty("test.src", ".") + "/" + pathToStores +
-        "/" + keyStoreFile;
-    private final static String trustFilename =
-        System.getProperty("test.src", ".") + "/" + pathToStores +
-        "/" + trustStoreFile;
-
-
-   // Used for running test standalone
     public static void main(String[] args) throws Exception {
-        System.setProperty("javax.net.ssl.keyStore", keyFilename);
-        System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-        System.setProperty("javax.net.ssl.trustStore", trustFilename);
-        System.setProperty("javax.net.ssl.trustStorePassword", passwd);
+        String protocol = args[0];
+        if ("TLSv1".equals(protocol) || "TLSv1.1".equals(protocol)) {
+            SecurityUtils.removeFromDisabledTlsAlgs(protocol);
+        }
 
         if (DEBUG)
             System.setProperty("javax.net.debug", "all");
@@ -287,94 +190,45 @@ public static void main(String[] args) throws Exception {
         /*
          * Start the tests.
          */
-        new NonAutoClose();
+        new NonAutoClose(protocol);
     }
 
     private Thread clientThread = null;
-    private Thread serverThread = null;
+    private final String protocol;
 
     /*
      * Primary constructor, used to drive remainder of the test.
      *
      * Fork off the other side, then do your work.
      */
-    NonAutoClose() throws Exception {
-        if (separateServerThread) {
-            startServer(true);
-            startClient(false);
-        } else {
-            startClient(true);
-            startServer(false);
-        }
+    NonAutoClose(String protocol) throws Exception {
+        this.protocol = protocol;
+        startClient();
+        doServerSide();
 
         /*
          * Wait for other side to close down.
          */
-        if (separateServerThread) {
-            serverThread.join();
-        } else {
-            clientThread.join();
-        }
+        clientThread.join();
 
-        /*
-         * When we get here, the test is pretty much over.
-         *
-         * If the main thread excepted, that propagates back
-         * immediately.  If the other thread threw an exception, we
-         * should report back.
-         */
-        if (serverException != null) {
-            System.err.print("Server Exception:");
-            throw serverException;
-        }
         if (clientException != null) {
             System.err.print("Client Exception:");
             throw clientException;
         }
     }
 
-    private void startServer(boolean newThread) throws Exception {
-        if (newThread) {
-            serverThread = new Thread() {
-                public void run() {
-                    try {
-                        doServerSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our server thread just died.
-                         *
-                         * Release the client, if not active already...
-                         */
-                        System.err.println("Server died...");
-                        serverReady = true;
-                        serverException = e;
-                    }
-                }
-            };
-            serverThread.start();
-        } else {
-            doServerSide();
-        }
-    }
-
-    private void startClient(boolean newThread) throws Exception {
-        if (newThread) {
-            clientThread = new Thread() {
-                public void run() {
-                    try {
-                        doClientSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our client thread just died.
-                         */
-                        System.err.println("Client died...");
-                        clientException = e;
-                    }
-                }
-            };
-            clientThread.start();
-        } else {
-            doClientSide();
-        }
+    private void startClient() {
+        clientThread = new Thread(() -> {
+            try {
+                doClientSide();
+            } catch (Exception e) {
+                /*
+                 * Our client thread just died.
+                 */
+                System.err.println("Client died...");
+                clientException = e;
+            }
+        });
+        clientThread.start();
     }
 }
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.java
index 8eed2344bbc..4b55ac6ea90 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SetClientMode.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
@@ -27,11 +27,13 @@
 /*
  * @test
  * @bug 6223624
- * @ignore this test does not grant to work.  The handshake may have completed
- *        when getSession() return.  Please update or remove this test case.
+ * @library /test/lib /javax/net/ssl/templates
  * @summary SSLSocket.setUseClientMode() fails to throw expected
  *        IllegalArgumentException
- * @run main/othervm SetClientMode
+ * @run main/othervm SetClientMode TLSv1
+ * @run main/othervm SetClientMode TLSv1.1
+ * @run main/othervm SetClientMode TLSv1.2
+ * @run main/othervm SetClientMode TLSv1.3
  */
 
 /*
@@ -47,143 +49,82 @@
  * occasionally on the very first iteration.
  */
 
-import java.io.*;
 import java.lang.*;
 import java.net.*;
+import java.util.concurrent.CountDownLatch;
 import javax.net.ssl.*;
-import java.security.*;
-import java.security.cert.*;
+import jdk.test.lib.security.SecurityUtils;
 
-public class SetClientMode {
-    private static String[] algorithms = {"TLS", "SSL", "SSLv3", "TLS"};
-    volatile int serverPort = 0;
+import static jdk.test.lib.Asserts.assertThrows;
 
-    /*
-     * Where do we find the keystores?
-     */
-    static String pathToStores = "../../../../javax/net/ssl/etc";
-    static String keyStoreFile = "keystore";
-    static String trustStoreFile = "truststore";
-    static String passwd = "passphrase";
-
-
-    public SetClientMode() {
-        // trivial constructor
-    }
+public class SetClientMode extends SSLContextTemplate {
+    private volatile int serverPort = 0;
+    private static final CountDownLatch HANDSHAKE_COMPLETE = new CountDownLatch(1);
 
     public static void main(String[] args) throws Exception {
-        String keyFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + keyStoreFile;
-        String trustFilename =
-            System.getProperty("test.src", "./") + "/" + pathToStores +
-                "/" + trustStoreFile;
-
-        System.setProperty("javax.net.ssl.keyStore", keyFilename);
-        System.setProperty("javax.net.ssl.keyStorePassword", passwd);
-        System.setProperty("javax.net.ssl.trustStore", trustFilename);
-        System.setProperty("javax.net.ssl.trustStorePassword", passwd);
-
-        new SetClientMode().run();
-    }
+        String protocol = args[0];
 
-    public void run() throws Exception {
-        for (int i = 0; i < algorithms.length; i++) {
-            testCombo( algorithms[i] );
+        if ("TLSv1".equals(protocol) || "TLSv1.1".equals(protocol)) {
+            SecurityUtils.removeFromDisabledTlsAlgs(protocol);
         }
-    }
 
-    public void testCombo(String algorithm) throws Exception {
-        Exception modeException = null ;
+        new SetClientMode().run(protocol);
+    }
 
+    public void run(String protocol) throws Exception {
         // Create a server socket
-        SSLServerSocketFactory ssf =
-            (SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
-        SSLServerSocket serverSocket =
-            (SSLServerSocket)ssf.createServerSocket(serverPort);
-        serverPort = serverSocket.getLocalPort();
-
-        // Create a client socket
-        SSLSocketFactory sf = (SSLSocketFactory)SSLSocketFactory.getDefault();
-        SSLSocket clientSocket = (SSLSocket)sf.createSocket(
-                                InetAddress.getLocalHost(),
-                                serverPort );
-
-        // Create a client which will use the SSLSocket to talk to the server
-        SocketClient client = new SocketClient(clientSocket);
-
-        // Start the client and then accept any connection
-        client.start();
-
-        SSLSocket connectedSocket = (SSLSocket)serverSocket.accept();
-
-        // force handshaking to complete
-        connectedSocket.getSession();
-
-        try {
-            // Now try invoking setClientMode() on one
-            // or the other of our two sockets. We expect
-            // to see an IllegalArgumentException because
-            // handshaking has begun.
-            clientSocket.setUseClientMode(false);
-
-            modeException = new Exception("no IllegalArgumentException");
-        } catch (IllegalArgumentException iae) {
-            System.out.println("succeeded, we can't set the client mode");
-        } catch (Exception e) {
-            modeException = e;
-        } finally {
-            // Shut down.
-            connectedSocket.close();
-            serverSocket.close();
-
-            if (modeException != null) {
-                throw modeException;
+        SSLServerSocketFactory ssf = createServerSSLContext().getServerSocketFactory();
+
+        try (SSLServerSocket serverSocket =
+                (SSLServerSocket) ssf.createServerSocket(serverPort)) {
+            serverSocket.setEnabledProtocols(new String[]{ protocol });
+            serverPort = serverSocket.getLocalPort();
+
+            // Create a client socket
+            SSLSocketFactory sf = createClientSSLContext().getSocketFactory();
+
+            try (SSLSocket clientSocket = (SSLSocket) sf.createSocket(
+                    InetAddress.getLocalHost(),
+                    serverPort)) {
+
+                // Create a client which will use the SSLSocket to talk to the server
+                Client client = new Client(clientSocket);
+
+                // Start the client and then accept any connection
+                client.start();
+
+                SSLSocket connectedSocket = (SSLSocket) serverSocket.accept();
+
+                // force handshaking to complete
+                connectedSocket.getSession();
+
+                HANDSHAKE_COMPLETE.await();
+
+                // Now try invoking setClientMode() on the client socket.
+                // We expect to see an IllegalArgumentException because
+                // handshaking has begun.
+                assertThrows(IllegalArgumentException.class,
+                        () -> clientSocket.setUseClientMode(false));
             }
         }
-
-        return;
     }
 
     // A thread-based client which does nothing except
     // start handshaking on the socket it's given.
-    class SocketClient extends Thread {
-        SSLSocket clientsideSocket;
-        Exception clientException = null;
-        boolean done = false;
+    static class Client extends Thread {
+        private final SSLSocket socket;
 
-        public SocketClient( SSLSocket s ) {
-            clientsideSocket = s;
+        public Client(SSLSocket s) {
+            socket = s;
         }
 
         public void run() {
             try {
-                clientsideSocket.startHandshake();
-
-                // If we were to invoke setUseClientMode()
-                // here, the expected exception will happen.
-                //clientsideSocket.getSession();
-                //clientsideSocket.setUseClientMode( false );
-            } catch ( Exception e ) {
+                socket.startHandshake();
+                HANDSHAKE_COMPLETE.countDown();
+            } catch (Exception e) {
                 e.printStackTrace();
-                clientException = e;
-            } finally {
-                done = true;
-                try {
-                    clientsideSocket.close();
-                } catch ( IOException e ) {
-                    // eat it
-                }
             }
-            return;
-        }
-
-        boolean isDone() {
-            return done;
-        }
-
-        Exception getException() {
-            return clientException;
         }
     }
 }

From 5c73dfc28cbd6801ac85c6685fb8c77aad3ab0b7 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 14 May 2025 09:05:49 +0000
Subject: [PATCH 457/901] 8352533: Report useful IOExceptions when jspawnhelper
 fails

Reviewed-by: simonis, rriggs, stuefe
---
 .../unix/native/libjava/ProcessImpl_md.c      | 80 ++++++++++++++-----
 test/jdk/java/lang/ProcessBuilder/Basic.java  | 37 +++++++--
 .../ProcessBuilder/JspawnhelperProtocol.java  |  9 ++-
 3 files changed, 100 insertions(+), 26 deletions(-)

diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
index fc97eb187eb..264818360c2 100644
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
@@ -317,12 +317,23 @@ releaseBytes(JNIEnv *env, jbyteArray arr, const char* parr)
         (*env)->ReleaseByteArrayElements(env, arr, (jbyte*) parr, JNI_ABORT);
 }
 
-#define IOE_FORMAT "error=%d, %s"
+#define IOE_FORMAT "%s, error: %d (%s) %s"
+
+#define SPAWN_HELPER_INTERNAL_ERROR_MSG "\n" \
+  "Possible reasons:\n" \
+  "  - Spawn helper ran into JDK version mismatch\n" \
+  "  - Spawn helper ran into unexpected internal error\n" \
+  "  - Spawn helper was terminated by another process\n" \
+  "Possible solutions:\n" \
+  "  - Restart JVM, especially after in-place JDK updates\n" \
+  "  - Check system logs for JDK-related errors\n" \
+  "  - Re-install JDK to fix permission/versioning problems\n" \
+  "  - Switch to legacy launch mechanism with -Djdk.lang.Process.launchMechanism=VFORK\n"
 
 static void
-throwIOException(JNIEnv *env, int errnum, const char *defaultDetail)
+throwIOExceptionImpl(JNIEnv *env, int errnum, const char *externalDetail, const char *internalDetail)
 {
-    const char *detail = defaultDetail;
+    const char *errorDetail;
     char *errmsg;
     size_t fmtsize;
     char tmpbuf[1024];
@@ -330,16 +341,22 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail)
 
     if (errnum != 0) {
         int ret = getErrorString(errnum, tmpbuf, sizeof(tmpbuf));
-        if (ret != EINVAL)
-            detail = tmpbuf;
+        if (ret != EINVAL) {
+            errorDetail = tmpbuf;
+        } else {
+            errorDetail = "unknown";
+        }
+    } else {
+        errorDetail = "none";
     }
+
     /* ASCII Decimal representation uses 2.4 times as many bits as binary. */
-    fmtsize = sizeof(IOE_FORMAT) + strlen(detail) + 3 * sizeof(errnum);
+    fmtsize = sizeof(IOE_FORMAT) + strlen(externalDetail) + 3 * sizeof(errnum) + strlen(errorDetail) +  strlen(internalDetail) + 1;
     errmsg = NEW(char, fmtsize);
     if (errmsg == NULL)
         return;
 
-    snprintf(errmsg, fmtsize, IOE_FORMAT, errnum, detail);
+    snprintf(errmsg, fmtsize, IOE_FORMAT, externalDetail, errnum, errorDetail, internalDetail);
     s = JNU_NewStringPlatform(env, errmsg);
     if (s != NULL) {
         jobject x = JNU_NewObjectByName(env, "java/io/IOException",
@@ -350,14 +367,38 @@ throwIOException(JNIEnv *env, int errnum, const char *defaultDetail)
     free(errmsg);
 }
 
+/**
+ * Throws IOException that signifies an internal error, e.g. spawn helper failure.
+ */
+static void
+throwInternalIOException(JNIEnv *env, int errnum, const char *externalDetail, int mode)
+{
+  switch (mode) {
+    case MODE_POSIX_SPAWN:
+      throwIOExceptionImpl(env, errnum, externalDetail, SPAWN_HELPER_INTERNAL_ERROR_MSG);
+      break;
+    default:
+      throwIOExceptionImpl(env, errnum, externalDetail, "");
+  }
+}
+
+/**
+ * Throws IOException that signifies a normal error.
+ */
+static void
+throwIOException(JNIEnv *env, int errnum, const char *externalDetail)
+{
+  throwIOExceptionImpl(env, errnum, externalDetail, "");
+}
+
 /**
  * Throws an IOException with a message composed from the result of waitpid status.
  */
-static void throwExitCause(JNIEnv *env, int pid, int status) {
+static void throwExitCause(JNIEnv *env, int pid, int status, int mode) {
     char ebuf[128];
     if (WIFEXITED(status)) {
         snprintf(ebuf, sizeof ebuf,
-            "Failed to exec spawn helper: pid: %d, exit value: %d",
+            "Failed to exec spawn helper: pid: %d, exit code: %d",
             pid, WEXITSTATUS(status));
     } else if (WIFSIGNALED(status)) {
         snprintf(ebuf, sizeof ebuf,
@@ -368,7 +409,7 @@ static void throwExitCause(JNIEnv *env, int pid, int status) {
             "Failed to exec spawn helper: pid: %d, status: 0x%08x",
             pid, status);
     }
-    throwIOException(env, 0, ebuf);
+    throwInternalIOException(env, 0, ebuf, mode);
 }
 
 #ifdef DEBUG_PROCESS
@@ -691,7 +732,7 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
         (fds[2] == -1 && pipe(err) < 0) ||
         (pipe(childenv) < 0) ||
         (pipe(fail) < 0)) {
-        throwIOException(env, errno, "Bad file descriptor");
+        throwInternalIOException(env, errno, "Bad file descriptor", c->mode);
         goto Catch;
     }
     c->fds[0] = fds[0];
@@ -725,13 +766,13 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
     if (resultPid < 0) {
         switch (c->mode) {
           case MODE_VFORK:
-            throwIOException(env, errno, "vfork failed");
+            throwInternalIOException(env, errno, "vfork failed", c->mode);
             break;
           case MODE_FORK:
-            throwIOException(env, errno, "fork failed");
+            throwInternalIOException(env, errno, "fork failed", c->mode);
             break;
           case MODE_POSIX_SPAWN:
-            throwIOException(env, errno, "posix_spawn failed");
+            throwInternalIOException(env, errno, "posix_spawn failed", c->mode);
             break;
         }
         goto Catch;
@@ -745,20 +786,21 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
             {
                 int tmpStatus = 0;
                 int p = waitpid(resultPid, &tmpStatus, 0);
-                throwExitCause(env, p, tmpStatus);
+                throwExitCause(env, p, tmpStatus, c->mode);
                 goto Catch;
             }
         case sizeof(errnum):
             if (errnum != CHILD_IS_ALIVE) {
                 /* This can happen if the spawn helper encounters an error
                  * before or during the handshake with the parent. */
-                throwIOException(env, 0, "Bad code from spawn helper "
-                                         "(Failed to exec spawn helper)");
+                throwInternalIOException(env, 0,
+                                         "Bad code from spawn helper (Failed to exec spawn helper)",
+                                         c->mode);
                 goto Catch;
             }
             break;
         default:
-            throwIOException(env, errno, "Read failed");
+          throwInternalIOException(env, errno, "Read failed", c->mode);
             goto Catch;
         }
     }
@@ -770,7 +812,7 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
         throwIOException(env, errnum, "Exec failed");
         goto Catch;
     default:
-        throwIOException(env, errno, "Read failed");
+        throwInternalIOException(env, errno, "Read failed", c->mode);
         goto Catch;
     }
 
diff --git a/test/jdk/java/lang/ProcessBuilder/Basic.java b/test/jdk/java/lang/ProcessBuilder/Basic.java
index b77c292766d..ed9a0f9fb70 100644
--- a/test/jdk/java/lang/ProcessBuilder/Basic.java
+++ b/test/jdk/java/lang/ProcessBuilder/Basic.java
@@ -28,6 +28,7 @@
  *      6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
  *      4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464
  *      8067796 8224905 8263729 8265173 8272600 8231297 8282219 8285517
+ *      8352533
  * @key intermittent
  * @summary Basic tests for Process and Environment Variable code
  * @modules java.base/java.lang:open
@@ -86,6 +87,7 @@ public class Basic {
     /* Used for regex String matching for long error messages */
     static final String PERMISSION_DENIED_ERROR_MSG = "(Permission denied|error=13)";
     static final String NO_SUCH_FILE_ERROR_MSG = "(No such file|error=2)";
+    static final String SPAWNHELPER_FAILURE_MSG = "(Possible reasons:)";
 
     /**
      * Returns the number of milliseconds since time given by
@@ -318,7 +320,9 @@ static void checkPermissionDenied(ProcessBuilder pb) {
         } catch (IOException e) {
             String m = e.getMessage();
             if (EnglishUnix.is() &&
-                ! matches(m, PERMISSION_DENIED_ERROR_MSG))
+                !matches(m, PERMISSION_DENIED_ERROR_MSG))
+                unexpected(e);
+            if (matches(m, SPAWNHELPER_FAILURE_MSG))
                 unexpected(e);
         } catch (Throwable t) { unexpected(t); }
     }
@@ -428,7 +432,9 @@ public static void main(String args[]) throws Throwable {
                         } catch (IOException e) {
                             String m = e.getMessage();
                             if (EnglishUnix.is() &&
-                                ! matches(m, NO_SUCH_FILE_ERROR_MSG))
+                                !matches(m, NO_SUCH_FILE_ERROR_MSG))
+                                unexpected(e);
+                            if (matches(m, SPAWNHELPER_FAILURE_MSG))
                                 unexpected(e);
                         } catch (Throwable t) { unexpected(t); }
 
@@ -441,7 +447,9 @@ public static void main(String args[]) throws Throwable {
                         } catch (IOException e) {
                             String m = e.getMessage();
                             if (EnglishUnix.is() &&
-                                ! matches(m, NO_SUCH_FILE_ERROR_MSG))
+                                !matches(m, NO_SUCH_FILE_ERROR_MSG))
+                                unexpected(e);
+                            if (matches(m, SPAWNHELPER_FAILURE_MSG))
                                 unexpected(e);
                         } catch (Throwable t) { unexpected(t); }
 
@@ -1978,6 +1986,8 @@ public void doIt(Map<String,String> environ) {
             if (EnglishUnix.is() &&
                 ! matches(m, NO_SUCH_FILE_ERROR_MSG))
                 unexpected(e);
+            if (matches(m, SPAWNHELPER_FAILURE_MSG))
+                unexpected(e);
         } catch (Throwable t) { unexpected(t); }
 
         //----------------------------------------------------------------
@@ -1995,6 +2005,8 @@ public void doIt(Map<String,String> environ) {
                     || (EnglishUnix.is() &&
                         ! matches(m, NO_SUCH_FILE_ERROR_MSG)))
                     unexpected(e);
+                if (matches(m, SPAWNHELPER_FAILURE_MSG))
+                    unexpected(e);
             } catch (Throwable t) { unexpected(t); }
 
         //----------------------------------------------------------------
@@ -2011,6 +2023,8 @@ public void doIt(Map<String,String> environ) {
                 || (EnglishUnix.is() &&
                     ! matches(m, NO_SUCH_FILE_ERROR_MSG)))
                 unexpected(e);
+            if (matches(m, SPAWNHELPER_FAILURE_MSG))
+                unexpected(e);
         } catch (Throwable t) { unexpected(t); }
 
         //----------------------------------------------------------------
@@ -2069,8 +2083,9 @@ public void doIt(Map<String,String> environ) {
                         op.f();
                         fail();
                     } catch (IOException expected) {
-                        check(expected.getMessage()
-                              .matches("[Ss]tream [Cc]losed"));
+                        String m = expected.getMessage();
+                        check(m.matches("[Ss]tream [Cc]losed"));
+                        check(!matches(m, SPAWNHELPER_FAILURE_MSG));
                     }
                 }
             }
@@ -2122,10 +2137,14 @@ public void run() {
                             }
                             equal(-1, r);
                         } catch (IOException ioe) {
-                            if (!ioe.getMessage().equals("Stream closed")) {
+                            String m = ioe.getMessage();
+                            if (!m.equals("Stream closed")) {
                                 // BufferedInputStream may throw IOE("Stream closed").
                                 unexpected(ioe);
                             }
+                            if (matches(m, SPAWNHELPER_FAILURE_MSG)) {
+                                unexpected(ioe);
+                            }
                         } catch (Throwable t) { unexpected(t); }}};
 
                 thread.start();
@@ -2179,6 +2198,9 @@ public void run() {
                                 ! (msg.matches(".*Bad file.*") ||
                                         msg.matches(".*Stream closed.*")))
                                 unexpected(e);
+                            if (matches(msg, SPAWNHELPER_FAILURE_MSG)) {
+                                unexpected(e);
+                            }
                         }
                         catch (Throwable t) { unexpected(t); }}};
                 reader.setDaemon(true);
@@ -2271,6 +2293,9 @@ public void run() {
             if (EnglishUnix.is() &&
                 ! matches(m, PERMISSION_DENIED_ERROR_MSG))
                 unexpected(e);
+            if (matches(m, SPAWNHELPER_FAILURE_MSG)) {
+                unexpected(e);
+            }
         } catch (Throwable t) { unexpected(t); }
 
         new File("emptyCommand").delete();
diff --git a/test/jdk/java/lang/ProcessBuilder/JspawnhelperProtocol.java b/test/jdk/java/lang/ProcessBuilder/JspawnhelperProtocol.java
index d31905ccc63..0098bc531fd 100644
--- a/test/jdk/java/lang/ProcessBuilder/JspawnhelperProtocol.java
+++ b/test/jdk/java/lang/ProcessBuilder/JspawnhelperProtocol.java
@@ -49,14 +49,21 @@ public class JspawnhelperProtocol {
     private static final String[] CMD = { "pwd" };
     private static final String ENV_KEY = "JTREG_JSPAWNHELPER_PROTOCOL_TEST";
 
+    private static final String SPAWNHELPER_FAILURE_MSG = "Possible reasons:";
+
     private static void parentCode(String arg) throws IOException, InterruptedException {
         System.out.println("Recursively executing 'JspawnhelperProtocol " + arg + "'");
         Process p = null;
         try {
             p = Runtime.getRuntime().exec(CMD);
         } catch (Exception e) {
+            // Check that exception contains rich message on failure.
             e.printStackTrace(System.out);
-            System.exit(ERROR);
+            if (e instanceof IOException && e.getMessage().contains(SPAWNHELPER_FAILURE_MSG)) {
+                System.exit(ERROR);
+            } else {
+                System.exit(ERROR + 3);
+            }
         }
         if (!p.waitFor(TIMEOUT, TimeUnit.SECONDS)) {
             System.out.println("Child process timed out");

From 3270b00957038e95e3c1632daa9b7227d59f9af7 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 14 May 2025 12:00:23 +0000
Subject: [PATCH 458/901] 8356173: Remove ThreadCritical

Reviewed-by: dholmes, kbarrett, jsjolen
---
 src/hotspot/os/aix/os_aix.cpp                 |  1 -
 src/hotspot/os/bsd/os_bsd.cpp                 |  1 -
 src/hotspot/os/linux/os_linux.cpp             |  1 -
 src/hotspot/os/posix/threadCritical_posix.cpp | 67 ---------------
 src/hotspot/os/windows/os_windows.cpp         |  1 -
 .../os/windows/threadCritical_windows.cpp     | 86 -------------------
 src/hotspot/share/classfile/classLoader.cpp   |  1 -
 src/hotspot/share/gc/parallel/psScavenge.cpp  |  1 -
 .../share/interpreter/interpreterRuntime.cpp  |  1 -
 .../interpreter/zero/bytecodeInterpreter.cpp  |  1 -
 src/hotspot/share/memory/allocation.cpp       |  1 -
 src/hotspot/share/memory/arena.cpp            | 31 +++++--
 src/hotspot/share/memory/arena.hpp            |  7 ++
 src/hotspot/share/nmt/mallocTracker.cpp       |  5 +-
 src/hotspot/share/nmt/mallocTracker.hpp       |  1 -
 src/hotspot/share/nmt/memMapPrinter.cpp       |  2 +-
 src/hotspot/share/nmt/nmtUsage.cpp            | 11 ++-
 src/hotspot/share/opto/idealGraphPrinter.cpp  |  1 -
 src/hotspot/share/opto/runtime.cpp            |  1 -
 src/hotspot/share/runtime/javaThread.cpp      |  1 -
 src/hotspot/share/runtime/threadCritical.hpp  | 55 ------------
 src/hotspot/share/runtime/threads.cpp         |  3 +
 src/hotspot/share/utilities/exceptions.cpp    |  1 -
 23 files changed, 46 insertions(+), 235 deletions(-)
 delete mode 100644 src/hotspot/os/posix/threadCritical_posix.cpp
 delete mode 100644 src/hotspot/os/windows/threadCritical_windows.cpp
 delete mode 100644 src/hotspot/share/runtime/threadCritical.hpp

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 1bbaf29125d..ba245c0b0ca 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -59,7 +59,6 @@
 #include "runtime/safefetch.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 9a9954b3eb9..5ba40651875 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -55,7 +55,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 9bd45b0fec8..4d522e0bf43 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -58,7 +58,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/timer.hpp"
diff --git a/src/hotspot/os/posix/threadCritical_posix.cpp b/src/hotspot/os/posix/threadCritical_posix.cpp
deleted file mode 100644
index 47fe98c7429..00000000000
--- a/src/hotspot/os/posix/threadCritical_posix.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 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 "runtime/javaThread.hpp"
-#include "runtime/threadCritical.hpp"
-#include "utilities/compilerWarnings.hpp"
-
-// put OS-includes here
-# include <pthread.h>
-
-//
-// See threadCritical.hpp for details of this class.
-//
-
-static pthread_t             tc_owner = 0;
-
-PRAGMA_DIAG_PUSH
-PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED
-static pthread_mutex_t       tc_mutex = PTHREAD_MUTEX_INITIALIZER;
-PRAGMA_DIAG_POP
-
-static int                   tc_count = 0;
-
-ThreadCritical::ThreadCritical() {
-  pthread_t self = pthread_self();
-  if (self != tc_owner) {
-    int ret = pthread_mutex_lock(&tc_mutex);
-    guarantee(ret == 0, "fatal error with pthread_mutex_lock()");
-    assert(tc_count == 0, "Lock acquired with illegal reentry count.");
-    tc_owner = self;
-  }
-  tc_count++;
-}
-
-ThreadCritical::~ThreadCritical() {
-  assert(tc_owner == pthread_self(), "must have correct owner");
-  assert(tc_count > 0, "must have correct count");
-
-  tc_count--;
-  if (tc_count == 0) {
-    tc_owner = 0;
-    int ret = pthread_mutex_unlock(&tc_mutex);
-    guarantee(ret == 0, "fatal error with pthread_mutex_unlock()");
-  }
-}
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index c6107b95259..5c941f4be1b 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -63,7 +63,6 @@
 #include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/suspendedThreadTask.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
diff --git a/src/hotspot/os/windows/threadCritical_windows.cpp b/src/hotspot/os/windows/threadCritical_windows.cpp
deleted file mode 100644
index 35aa0839089..00000000000
--- a/src/hotspot/os/windows/threadCritical_windows.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.
- *
- */
-
-#include "runtime/atomic.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/threadCritical.hpp"
-
-// OS-includes here
-# include <windows.h>
-# include <winbase.h>
-
-//
-// See threadCritical.hpp for details of this class.
-//
-
-static INIT_ONCE initialized = INIT_ONCE_STATIC_INIT;
-static int lock_count = 0;
-static HANDLE lock_event;
-static DWORD lock_owner = 0;
-
-//
-// Note that Microsoft's critical region code contains a race
-// condition, and is not suitable for use. A thread holding the
-// critical section cannot safely suspend a thread attempting
-// to enter the critical region. The failure mode is that both
-// threads are permanently suspended.
-//
-// I experiemented with the use of ordinary windows mutex objects
-// and found them ~30 times slower than the critical region code.
-//
-
-static BOOL WINAPI initialize(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context) {
-  lock_event = CreateEvent(nullptr, false, true, nullptr);
-  assert(lock_event != nullptr, "unexpected return value from CreateEvent");
-  return true;
-}
-
-ThreadCritical::ThreadCritical() {
-  InitOnceExecuteOnce(&initialized, &initialize, nullptr, nullptr);
-
-  DWORD current_thread = GetCurrentThreadId();
-  if (lock_owner != current_thread) {
-    // Grab the lock before doing anything.
-    DWORD ret = WaitForSingleObject(lock_event,  INFINITE);
-    assert(ret != WAIT_FAILED,   "WaitForSingleObject failed with error code: %lu", GetLastError());
-    assert(ret == WAIT_OBJECT_0, "WaitForSingleObject failed with return value: %lu", ret);
-    lock_owner = current_thread;
-  }
-  // Atomicity isn't required. Bump the recursion count.
-  lock_count++;
-}
-
-ThreadCritical::~ThreadCritical() {
-  assert(lock_owner == GetCurrentThreadId(), "unlock attempt by wrong thread");
-  assert(lock_count >= 0, "Attempt to unlock when already unlocked");
-
-  lock_count--;
-  if (lock_count == 0) {
-    // We're going to unlock
-    lock_owner = 0;
-    // No lost wakeups, lock_event stays signaled until reset.
-    DWORD ret = SetEvent(lock_event);
-    assert(ret != 0, "unexpected return value from SetEvent");
-  }
-}
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index d7660647fb2..d313c9b4c3b 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -69,7 +69,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 661bc3da3e1..c8996ec6d9d 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -65,7 +65,6 @@
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/vmOperations.hpp"
 #include "runtime/vmThread.hpp"
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 0f16b17e99e..195bf57e055 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -71,7 +71,6 @@
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.inline.hpp"
-#include "runtime/threadCritical.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
index 401953a170f..07ec57a6ffe 100644
--- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
+++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp
@@ -59,7 +59,6 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/threadCritical.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index 13280006fe6..b0837fbc089 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -30,7 +30,6 @@
 #include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
-#include "runtime/threadCritical.hpp"
 #include "utilities/ostream.hpp"
 
 // allocate using malloc; will fail if no memory available
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index d03c0776f61..d29861c69bb 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -31,12 +31,30 @@
 #include "nmt/memTracker.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/trimNativeHeap.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 
+// One global static mutex for chunk pools.
+// It is used very early in the vm initialization, in allocation
+// code and other areas.  For many calls, the current thread has not
+// been created so we cannot use Mutex.
+static PlatformMutex* GlobalChunkPoolMutex = nullptr;
+
+void Arena::initialize_chunk_pool() {
+  GlobalChunkPoolMutex = new PlatformMutex();
+}
+
+ChunkPoolLocker::ChunkPoolLocker() {
+  assert(GlobalChunkPoolMutex != nullptr, "must be initialized");
+  GlobalChunkPoolMutex->lock();
+};
+
+ChunkPoolLocker::~ChunkPoolLocker() {
+  GlobalChunkPoolMutex->unlock();
+};
+
 // Pre-defined default chunk sizes must be arena-aligned, see Chunk::operator new()
 STATIC_ASSERT(is_aligned((int)Chunk::tiny_size, ARENA_AMALLOC_ALIGNMENT));
 STATIC_ASSERT(is_aligned((int)Chunk::init_size, ARENA_AMALLOC_ALIGNMENT));
@@ -68,7 +86,7 @@ class ChunkPool {
 
   // Returns null if pool is empty.
   Chunk* take_from_pool() {
-    ThreadCritical tc;
+    ChunkPoolLocker lock;
     Chunk* c = _first;
     if (_first != nullptr) {
       _first = _first->next();
@@ -77,16 +95,16 @@ class ChunkPool {
   }
   void return_to_pool(Chunk* chunk) {
     assert(chunk->length() == _size, "wrong pool for this chunk");
-    ThreadCritical tc;
+    ChunkPoolLocker lock;
     chunk->set_next(_first);
     _first = chunk;
   }
 
   // Clear this pool of all contained chunks
   void prune() {
-    // Free all chunks while in ThreadCritical lock
+    // Free all chunks with ChunkPoolLocker lock
     // so NMT adjustment is stable.
-    ThreadCritical tc;
+    ChunkPoolLocker lock;
     Chunk* cur = _first;
     Chunk* next = nullptr;
     while (cur != nullptr) {
@@ -198,7 +216,8 @@ void ChunkPool::deallocate_chunk(Chunk* c) {
   if (pool != nullptr) {
     pool->return_to_pool(c);
   } else {
-    ThreadCritical tc;  // Free chunks under TC lock so that NMT adjustment is stable.
+    // Free chunks under a lock so that NMT adjustment is stable.
+    ChunkPoolLocker lock;
     os::free(c);
   }
 }
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index 01b1ae382db..e79e57bd620 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -37,6 +37,11 @@
 #define ARENA_AMALLOC_ALIGNMENT BytesPerLong
 #define ARENA_ALIGN(x) (align_up((x), ARENA_AMALLOC_ALIGNMENT))
 
+class ChunkPoolLocker : public StackObj {
+ public:
+  ChunkPoolLocker();
+  ~ChunkPoolLocker();
+};
 
 // Linked list of raw memory chunks
 class Chunk {
@@ -150,6 +155,8 @@ class Arena : public CHeapObjBase {
   }
 
  public:
+  static void initialize_chunk_pool();
+
   // Start the chunk_pool cleaner task
   static void start_chunk_pool_cleaner_task();
   Arena(MemTag mem_tag, Tag tag = Tag::tag_other, size_t init_size = Chunk::init_size);
diff --git a/src/hotspot/share/nmt/mallocTracker.cpp b/src/hotspot/share/nmt/mallocTracker.cpp
index 3c3236d2cbc..6a2da5f79cd 100644
--- a/src/hotspot/share/nmt/mallocTracker.cpp
+++ b/src/hotspot/share/nmt/mallocTracker.cpp
@@ -28,6 +28,7 @@
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/arena.hpp"
 #include "nmt/mallocHeader.inline.hpp"
 #include "nmt/mallocLimit.hpp"
 #include "nmt/mallocSiteTable.hpp"
@@ -61,10 +62,10 @@ void MemoryCounter::update_peak(size_t size, size_t cnt) {
 }
 
 void MallocMemorySnapshot::copy_to(MallocMemorySnapshot* s) {
-  // Use ThreadCritical to make sure that mtChunks don't get deallocated while the
+  // Use lock to make sure that mtChunks don't get deallocated while the
   // copy is going on, because their size is adjusted using this
   // buffer in make_adjustment().
-  ThreadCritical tc;
+  ChunkPoolLocker lock;
   s->_all_mallocs = _all_mallocs;
   size_t total_size = 0;
   size_t total_count = 0;
diff --git a/src/hotspot/share/nmt/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
index dacec5c6dbf..e71c9374d4b 100644
--- a/src/hotspot/share/nmt/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -30,7 +30,6 @@
 #include "nmt/memTag.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/threadCritical.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 class outputStream;
diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index 2482c84a35b..515d3804638 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -111,7 +111,7 @@ class CachedNMTInformation : public VirtualMemoryWalker {
     if (_count == _capacity) {
       // Enlarge if needed
       const size_t new_capacity = MAX2((size_t)4096, 2 * _capacity);
-      // Unfortunately, we need to allocate manually, raw, since we must prevent NMT deadlocks (ThreadCritical).
+      // Unfortunately, we need to allocate manually, raw, since we must prevent NMT deadlocks.
       _ranges = (Range*)permit_forbidden_function::realloc(_ranges, new_capacity * sizeof(Range));
       _mem_tags = (MemTag*)permit_forbidden_function::realloc(_mem_tags, new_capacity * sizeof(MemTag));
       if (_ranges == nullptr || _mem_tags == nullptr) {
diff --git a/src/hotspot/share/nmt/nmtUsage.cpp b/src/hotspot/share/nmt/nmtUsage.cpp
index b3be01116a5..f8ca1b0e1fa 100644
--- a/src/hotspot/share/nmt/nmtUsage.cpp
+++ b/src/hotspot/share/nmt/nmtUsage.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "memory/arena.hpp"
 #include "nmt/mallocTracker.hpp"
 #include "nmt/memoryFileTracker.hpp"
 #include "nmt/memTracker.hpp"
@@ -29,7 +30,6 @@
 #include "nmt/nmtUsage.hpp"
 #include "nmt/threadStackTracker.hpp"
 #include "nmt/virtualMemoryTracker.hpp"
-#include "runtime/threadCritical.hpp"
 
 // Enabled all options for snapshot.
 const NMTUsageOptions NMTUsage::OptionsAll = { true, true, true };
@@ -52,10 +52,13 @@ void NMTUsage::walk_thread_stacks() {
 }
 
 void NMTUsage::update_malloc_usage() {
-  // Thread critical needed keep values in sync, total area size
+  MallocMemorySnapshot* ms;
+  // Lock needed to keep values in sync, total area size
   // is deducted from mtChunk in the end to give correct values.
-  ThreadCritical tc;
-  const MallocMemorySnapshot* ms = MallocMemorySummary::as_snapshot();
+  {
+    ChunkPoolLocker lock;
+    ms = MallocMemorySummary::as_snapshot();
+  }
 
   size_t total_arena_size = 0;
   for (int i = 0; i < mt_number_of_tags; i++) {
diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 9a337739be5..5154a85b0f8 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -28,7 +28,6 @@
 #include "opto/machnode.hpp"
 #include "opto/parse.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threadSMR.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/stringUtils.hpp"
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index fcb0ac38ace..7f57bff15ed 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -70,7 +70,6 @@
 #include "runtime/signature.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/synchronizer.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 9f5dd07c4dc..6f4d4185956 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -81,7 +81,6 @@
 #include "runtime/stackFrameStream.inline.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/synchronizer.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/threadIdentifier.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/threadStatisticalInfo.hpp"
diff --git a/src/hotspot/share/runtime/threadCritical.hpp b/src/hotspot/share/runtime/threadCritical.hpp
deleted file mode 100644
index c3e2db427c9..00000000000
--- a/src/hotspot/share/runtime/threadCritical.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2001, 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_RUNTIME_THREADCRITICAL_HPP
-#define SHARE_RUNTIME_THREADCRITICAL_HPP
-
-#include "memory/allocation.hpp"
-
-// ThreadCritical is used to protect short non-blocking critical sections.
-// This class must use no vm facilities that require initialization.
-// It is used very early in the vm's initialization, in allocation
-// code and other areas. ThreadCritical regions are reentrant.
-//
-// Due to race conditions during vm exit, some of the os level
-// synchronization primitives may not be deallocated at exit. It
-// is a good plan to implement the platform dependent sections of
-// code with resources that are recoverable during process
-// cleanup by the os. Calling the initialize method before use
-// is also problematic, it is best to use preinitialized primitives
-// if possible. As an example:
-//
-// mutex_t  mp  =  DEFAULTMUTEX;
-//
-// Also note that this class is declared as a StackObj to enforce
-// block structured short locks. It cannot be declared a ResourceObj
-// or CHeapObj, due to initialization issues.
-
-class ThreadCritical : public StackObj {
- public:
-  ThreadCritical();
-  ~ThreadCritical();
-};
-
-#endif // SHARE_RUNTIME_THREADCRITICAL_HPP
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 203062582a0..47c030fdb72 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -459,6 +459,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // Initialize the os module
   os::init();
 
+  // Initialize memory pools
+  Arena::initialize_chunk_pool();
+
   MACOS_AARCH64_ONLY(os::current_thread_enable_wx(WXWrite));
 
   // Record VM creation timing statistics
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index a3ad480f50c..c48b33b1e1f 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -38,7 +38,6 @@
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
-#include "runtime/threadCritical.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"

From a989245a2424d136f5d2a828eda666c3867b0f48 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 14 May 2025 12:38:40 +0000
Subject: [PATCH 459/901] 8327466: ct.sym zip not reproducible across build
 environment timezones

Reviewed-by: erikj, jlahoda
---
 .../tools/symbolgenerator/CreateSymbols.java  |  12 +-
 .../CreateSymbolsReproducibleTest.java        | 176 ++++++++++++++++++
 2 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java

diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index db8924c79fb..1ebd22dc6ab 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -64,6 +64,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.stream.Stream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -101,10 +104,7 @@
 
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.api.JavacTool;
-import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Pair;
 import java.nio.file.DirectoryStream;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -339,10 +339,10 @@ private void stripNonExistentAnnotations(Set<String> allClasses, List<Annotation
                                         !allClasses.contains(ann.annotationType.substring(1, ann.annotationType.length() - 1)));
     }
 
-    private ZipEntry createZipEntry(String name, long timestamp) {
+    private ZipEntry createZipEntry(String name, long timeMillisSinceEpoch) {
+        Instant time = Instant.ofEpochMilli(timeMillisSinceEpoch);
         ZipEntry ze = new ZipEntry(name);
-
-        ze.setTime(timestamp);
+        ze.setTimeLocal(LocalDateTime.ofInstant(time, ZoneOffset.UTC));
         return ze;
     }
 
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java
new file mode 100644
index 00000000000..a6298bfa8ce
--- /dev/null
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.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.
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.lang.model.SourceVersion;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/*
+ * @test
+ * @bug 8327466
+ * @summary verifies that the ct.sym file created by build.tools.symbolgenerator.CreateSymbols
+ *          is reproducible
+ * @library /test/lib
+ * @modules java.compiler
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ *
+ * @compile ${test.root}/../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+ *
+ * @run junit CreateSymbolsReproducibleTest
+ */
+public class CreateSymbolsReproducibleTest {
+
+    // the fully qualified class name of the tool that we launch to generate the ct.sym file
+    private static final String CREATE_SYMBOLS_CLASS_FQN = "build.tools.symbolgenerator.CreateSymbols";
+    // a reproducible timestamp (in seconds) that we pass to "CreateSymbols build-ctsym" as input
+    // when generating the ct.sym file
+    private static final long SOURCE_EPOCH_DATE = Instant.now().getEpochSecond();
+    // arbitrary set of packages that will be included in a include list file
+    // that will be given as input to "CreateSymbols build-description-incremental" command
+    // for generating the symbol text file
+    private static final String INCLUDE_PKGS = """
+            +java/io/
+            +java/lang/
+            +java/lang/annotation/
+            +java/lang/instrument/
+            +java/lang/invoke/
+            """;
+
+    private static Path symTxtFile;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        symTxtFile = createSymTxtFile();
+        System.out.println("created sym.txt file at " + symTxtFile);
+    }
+
+    /*
+     * Launches the "CreateSymbols build-ctsym" tool multiple times to generate ct.sym files.
+     * Each time with the same inputs and the same timestamp. For each of these attempts, we use
+     * a different timezone when launching the tool. The test verifies that irrespective of
+     * what timezone gets used, the generated ct.sym files don't differ.
+     */
+    @Test
+    void testDifferentTimezone() throws Exception {
+        final Path destDir = Files.createTempDirectory(Path.of("."), "").toAbsolutePath();
+        final List<Path> ctSymFiles = new ArrayList<>();
+        final List<Optional<String>> timezones = List.of(
+                Optional.empty(), // no explicit timezone
+                Optional.of("UTC"),
+                Optional.of("America/Los_Angeles"),
+                Optional.of("Asia/Tokyo")
+        );
+        int num = 0;
+        // create several ct.sym files by launching the tool with different timezones
+        // but the same timestamp value as input
+        for (final Optional<String> timezone : timezones) {
+            num++;
+            final String destCtSymFileName = "ct-" + num + ".sym";
+            final Path destCtSym = destDir.resolve(destCtSymFileName);
+            System.out.println("using timezone " + timezone + " to create ct.sym file at "
+                    + destCtSym);
+            createCtSym(destCtSym, symTxtFile, timezone);
+            ctSymFiles.add(destCtSym);
+        }
+        // verify that each of these generated ct.sym files are exactly the same in content
+        for (int i = 0; i < ctSymFiles.size() - 1; i++) {
+            final Path ctSym1 = ctSymFiles.get(i);
+            final Path ctSym2 = ctSymFiles.get(i + 1);
+            final long mismatchOffset = Files.mismatch(ctSym1, ctSym2);
+            if (mismatchOffset != -1) {
+                throw new AssertionError("contents of files " + ctSym1 + " and " + ctSym2
+                        + " unexpectedly differ" + " (at " + mismatchOffset + " offset)");
+            }
+        }
+    }
+
+    private static Path createSymTxtFile() throws Exception {
+        final Path tmpDir = Files.createTempDirectory(Path.of("."), "").toAbsolutePath();
+        final Path destSymTxtFile = tmpDir.resolve("sym.txt");
+        Files.writeString(destSymTxtFile, "");
+        final Path includeList = tmpDir.resolve("include.list");
+        Files.writeString(includeList, INCLUDE_PKGS);
+        final String[] cmd = new String[]{
+                "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+                "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+                CREATE_SYMBOLS_CLASS_FQN,
+                "build-description-incremental",
+                destSymTxtFile.toString(),
+                includeList.toString()
+        };
+        final OutputAnalyzer oa = ProcessTools.executeTestJava(cmd);
+        oa.shouldHaveExitValue(0);
+        // verify the file was created
+        if (Files.notExists(destSymTxtFile)) {
+            oa.reportDiagnosticSummary();
+            throw new AssertionError(CREATE_SYMBOLS_CLASS_FQN
+                    + " build-description-incremental failed to create " + destSymTxtFile);
+        }
+        return destSymTxtFile;
+    }
+
+    private static void createCtSym(final Path destCtSymFile, final Path symTxtFile,
+                                    final Optional<String> timezone) throws Exception {
+        final Path modulesDir = Path.of(".").resolve("modules");
+        Files.createDirectories(modulesDir);
+        final Path modulesList = Path.of(".").resolve("modules-list");
+        // an empty file
+        Files.writeString(modulesList, "");
+
+        final List<String> cmd = new ArrayList<>();
+        timezone.ifPresent((tz) -> {
+            // launch the tool with a specific timezone (if any)
+            cmd.add("-Duser.timezone=" + tz);
+        });
+        cmd.add(CREATE_SYMBOLS_CLASS_FQN);
+        cmd.add("build-ctsym"); // command to CreateSymbols tool
+        cmd.add("non-existent-ct-desc-file");
+        cmd.add(symTxtFile.toString()); // a previously generated a sym.txt file
+        cmd.add(destCtSymFile.toString()); // target ct.sym file to generate
+        cmd.add(Long.toString(SOURCE_EPOCH_DATE)); // reproducible timestamp (in seconds)
+        cmd.add(Integer.toString(SourceVersion.latest().ordinal()));
+        cmd.add("does-not-matter-pre-release-tag");
+        cmd.add(modulesDir.toString());
+        cmd.add(modulesList.toString());
+        final OutputAnalyzer oa = ProcessTools.executeTestJava(cmd);
+        oa.shouldHaveExitValue(0);
+        // verify the ct.sym file was generated
+        if (Files.notExists(destCtSymFile)) {
+            oa.reportDiagnosticSummary();
+            throw new AssertionError("ct.sym file missing at " + destCtSymFile);
+        }
+    }
+}

From 97b0dd2167530b3d237e748cd5da0130e38e8af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Wed, 14 May 2025 14:12:10 +0000
Subject: [PATCH 460/901] 8336906: C2: assert(bb->is_reachable()) failed:
 getting result from unreachable basicblock

Co-authored-by: Emanuel Peter <epeter@openjdk.org>
Co-authored-by: Dean Long <dlong@openjdk.org>
Reviewed-by: epeter, dlong
---
 src/hotspot/share/runtime/deoptimization.cpp  |  15 ++-
 ...estVerifyStackWithUnreachableBytecode.java | 117 ++++++++++++++++++
 ...erifyStackWithUnreachableBytecodeImpl.jasm |  79 ++++++++++++
 3 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecode.java
 create mode 100644 test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.jasm

diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 5e4aaf31a3b..8478cad4df5 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -842,13 +842,24 @@ void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_arr
 }
 
 #ifndef PRODUCT
+// Return true if the execution after the provided bytecode continues at the
+// next bytecode in the code. This is not the case for gotos, returns, and
+// throws.
 static bool falls_through(Bytecodes::Code bc) {
   switch (bc) {
-    // List may be incomplete.  Here we really only care about bytecodes where compiled code
-    // can deoptimize.
     case Bytecodes::_goto:
     case Bytecodes::_goto_w:
     case Bytecodes::_athrow:
+    case Bytecodes::_areturn:
+    case Bytecodes::_dreturn:
+    case Bytecodes::_freturn:
+    case Bytecodes::_ireturn:
+    case Bytecodes::_lreturn:
+    case Bytecodes::_jsr:
+    case Bytecodes::_ret:
+    case Bytecodes::_return:
+    case Bytecodes::_lookupswitch:
+    case Bytecodes::_tableswitch:
       return false;
     default:
       return true;
diff --git a/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecode.java b/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecode.java
new file mode 100644
index 00000000000..1600559a712
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecode.java
@@ -0,0 +1,117 @@
+/*
+ * 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=return
+ * @bug 8336906
+ * @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after return.
+ * @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
+ *      compiler.interpreter.TestVerifyStackWithUnreachableBytecode return
+ */
+
+/*
+ * @test id=areturn
+ * @bug 8336906
+ * @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after areturn.
+ * @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
+ *      compiler.interpreter.TestVerifyStackWithUnreachableBytecode areturn
+ */
+
+/*
+ * @test id=goto
+ * @bug 8336906 8271055
+ * @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after goto.
+ * @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
+ *      compiler.interpreter.TestVerifyStackWithUnreachableBytecode goto
+ */
+
+/*
+ * @test id=gotow
+ * @bug 8336906 8271055
+ * @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after gotow.
+ * @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
+ *      -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
+ *      compiler.interpreter.TestVerifyStackWithUnreachableBytecode gotow
+ */
+
+package compiler.interpreter;
+
+import compiler.interpreter.TestVerifyStackWithUnreachableBytecodeImpl;
+
+public class TestVerifyStackWithUnreachableBytecode {
+    public static void main(String[] args) {
+        TestCase t = testCaseFromString(args[0]);
+
+        // The following is designed to cause a deopt with the reason `null_assert_or_unreached0`
+        // when accessing A.val using getstatic due to the class B not being loaded and the consequent
+        // assumption of A.val == null.
+        TestVerifyStackWithUnreachableBytecodeA.val = null;
+        dispatchTest(t);
+        TestVerifyStackWithUnreachableBytecodeA.val = new TestVerifyStackWithUnreachableBytecodeB(42);
+        dispatchTest(t);
+    }
+
+    private enum TestCase {
+        ARETURN,
+        GOTO,
+        GOTOW,
+        RETURN;
+    }
+
+    private static TestCase testCaseFromString(String s) {
+        return switch (s) {
+            case "areturn" -> TestCase.ARETURN;
+            case "return" -> TestCase.RETURN;
+            case "goto" -> TestCase.GOTO;
+            case "gotow" -> TestCase.GOTOW;
+            default -> throw new RuntimeException("Test argument not recognized: " + s);
+        };
+    }
+
+    private static void dispatchTest(TestCase testCase) {
+        switch (testCase) {
+            case ARETURN -> TestVerifyStackWithUnreachableBytecodeImpl.testAreturn();
+            case RETURN -> TestVerifyStackWithUnreachableBytecodeImpl.testReturn();
+            case GOTO -> TestVerifyStackWithUnreachableBytecodeImpl.testGoto();
+            case GOTOW -> TestVerifyStackWithUnreachableBytecodeImpl.testGotow();
+        }
+    }
+}
+
+class TestVerifyStackWithUnreachableBytecodeA {
+    public static TestVerifyStackWithUnreachableBytecodeB val = null;
+}
+
+class TestVerifyStackWithUnreachableBytecodeB {
+    public int val = 0;
+
+    TestVerifyStackWithUnreachableBytecodeB(int v) { this.val = v; }
+}
diff --git a/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.jasm b/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.jasm
new file mode 100644
index 00000000000..584f697f103
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.jasm
@@ -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 compiler/interpreter;
+
+// We need a class file format version < 50:0 so we do not need to specify a
+// stack map for the unreachable bytecodes, which are the reason this test
+// relies on a JASM implementation.
+super class TestVerifyStackWithUnreachableBytecodeImpl version 49:0
+{
+    public Method "<init>":"()V"
+        stack  1 locals  1
+    {
+           aload_0;
+           invokespecial     Method java/lang/Object."<init>":"()V";
+           return;
+    }
+    public static Method testAreturn:"()Ljava/lang/Object;"
+        stack 1 locals 0
+    {
+        // If A not loaded -> trap for TestVerifyStackWithUnreachableBytecodeA unloaded
+        // If a loaded, but TestVerifyStackWithUnreachableBytecodeB not -> assume TestVerifyStackWithUnreachableBytecodeA.val null, else trap.
+        //   -> "null_assert_or_unreached0"
+        getstatic    Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
+        areturn;
+
+        // some unreachable instruction after return
+        iconst_0;
+    }
+    public static Method testReturn:"()V"
+        stack  1 locals  0
+    {
+        getstatic   Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
+        return;
+        // unreachable
+        iconst_0;
+    }
+    public static Method testGoto:"()V"
+        stack  1 locals  0
+    {
+        getstatic   Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
+        goto There;
+        // unreachable
+        iconst_0;
+    There:
+        return;
+    }
+    public static Method testGotow:"()V"
+        stack  1 locals  0
+    {
+        getstatic   Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
+        goto_w There;
+        // unreachable
+        iconst_0;
+    There:
+        return;
+    }
+}

From 1afd887b138ac2425289b6f863801774f050c23c Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 14 May 2025 14:58:29 +0000
Subject: [PATCH 461/901] 8356102: TestJcmdOutput, JcmdWithNMTDisabled and
 DumpSharedDictionary hs/tier1 tests fail on static-jdk

Reviewed-by: dholmes
---
 .../CommandLine/OptionsValidation/TestJcmdOutput.java     | 1 +
 test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java   | 8 ++++++--
 test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java  | 5 ++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
index b5b15f6d75f..87e59d1c486 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java
@@ -53,6 +53,7 @@ public static void main(String[] args) throws Exception {
         System.out.println("Verify jcmd error message and that jcmd does not write errors to the target process output");
         output = new OutputAnalyzer((ProcessTools.createLimitedTestJavaProcessBuilder(
                 "-Dtest.jdk=" + System.getProperty("test.jdk"),
+                "-Dcompile.jdk=" + System.getProperty("compile.jdk"),
                 "-XX:MinHeapFreeRatio=20", "-XX:MaxHeapFreeRatio=80", runJcmd.class.getName())).start());
 
         output.shouldHaveExitValue(0);
diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
index 3b61a0be383..4e044311bcb 100644
--- a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
@@ -48,16 +48,20 @@ public static void main(String args[]) throws Exception {
       ProcessBuilder pb;
       OutputAnalyzer output;
       String testjdkPath = System.getProperty("test.jdk");
+      String compilejdkPath = System.getProperty("compile.jdk");
 
       // First run without enabling NMT (not in debug, where NMT is by default on)
       if (!Platform.isDebugBuild()) {
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Dtest.jdk=" + testjdkPath, "JcmdWithNMTDisabled");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+          "-Dtest.jdk=" + testjdkPath, "-Dcompile.jdk=" + compilejdkPath, "JcmdWithNMTDisabled");
         output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
       }
 
       // Then run with explicitly disabling NMT, should not be any difference
-      pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Dtest.jdk=" + testjdkPath, "-XX:NativeMemoryTracking=off", "JcmdWithNMTDisabled");
+      pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        "-Dtest.jdk=" + testjdkPath, "-Dcompile.jdk=" + compilejdkPath,
+        "-XX:NativeMemoryTracking=off", "JcmdWithNMTDisabled");
       output = new OutputAnalyzer(pb.start());
       output.shouldHaveExitValue(0);
 
diff --git a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java
index fa1fb884339..afefdaa7448 100644
--- a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java
+++ b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java
@@ -44,12 +44,11 @@ public static void main(String[] args) throws Exception {
                 .setArchiveName("./DumpSharedDictionary.jsa");
             CDSTestUtils.createArchiveAndCheck(opts);
 
-            String testjdkPath = System.getProperty("test.jdk");
-
             opts = (new CDSOptions())
                 .setUseVersion(false)
                 .addSuffix("-XX:SharedArchiveFile=./DumpSharedDictionary.jsa",
-                           "-Dtest.jdk=" + testjdkPath,
+                           "-Dtest.jdk=" + System.getProperty("test.jdk"),
+                           "-Dcompile.jdk=" + System.getProperty("compile.jdk"),
                            "DumpSharedDictionary", "test");
             CDSTestUtils.run(opts)
                         .assertNormalExit();

From 10436c1e1d0a14ef8ba4d58babb23fc47c949a6f Mon Sep 17 00:00:00 2001
From: Srinivas Vamsi Parasa <sparasa@openjdk.org>
Date: Wed, 14 May 2025 15:39:09 +0000
Subject: [PATCH 462/901] 8356281: Fix for TestFPComparison failure due to
 incorrect result

Reviewed-by: sviswanathan, thartmann, jbhateja
---
 src/hotspot/cpu/x86/x86_64.ad | 39 +++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 25cee7a3094..585c1fe938a 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -6267,13 +6267,14 @@ instruct cmovI_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
 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)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpl  $dst, $src1, $src2\n\t"
-            "ecmovnel $dst, $src1, $src2" %}
+            "cmovnel  $dst, $src2" %}
   ins_encode %{
     __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovl(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovl(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}
@@ -6283,6 +6284,7 @@ instruct cmovI_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI s
 instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
   predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveI (Binary cop cr) (Binary src dst)));
+  effect(TEMP dst);
 
   ins_cost(200); // XXX
   format %{ "cmovpl  $dst, $src\n\t"
@@ -6298,14 +6300,15 @@ instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
 // 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)));
+  match(Set dst (CMoveI (Binary cop cr) (Binary src2 src1)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpl  $dst, $src1, $src2\n\t"
-            "ecmovnel $dst, $src1, $src2" %}
+            "cmovnel  $dst, $src2" %}
   ins_encode %{
     __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovl(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovl(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}
@@ -6548,6 +6551,7 @@ instruct cmovP_regU_ndd(rRegP dst, cmpOpU cop, rFlagsRegU cr, rRegP src1, rRegP
 %}
 
 instruct cmovP_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
   ins_cost(200);
   expand %{
@@ -6556,6 +6560,7 @@ 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) %{
+  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" %}
@@ -6582,13 +6587,14 @@ instruct cmovP_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
 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)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "ecmovneq $dst, $src1, $src2" %}
+            "cmovneq  $dst, $src2" %}
   ins_encode %{
     __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}
@@ -6611,14 +6617,15 @@ instruct cmovP_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
 
 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)));
+  match(Set dst (CMoveP (Binary cop cr) (Binary src2 src1)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "ecmovneq $dst, $src1, $src2" %}
+            "cmovneq  $dst, $src2" %}
   ins_encode %{
     __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}
@@ -6781,13 +6788,14 @@ instruct cmovL_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
 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)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "ecmovneq $dst, $src1, $src2" %}
+            "cmovneq  $dst, $src2" %}
   ins_encode %{
     __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}
@@ -6810,14 +6818,15 @@ instruct cmovL_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
 
 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)));
+  match(Set dst (CMoveL (Binary cop cr) (Binary src2 src1)));
+  effect(TEMP dst);
 
   ins_cost(200);
   format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "ecmovneq $dst, $src1, $src2" %}
+            "cmovneq $dst, $src2" %}
   ins_encode %{
     __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
   %}
   ins_pipe(pipe_cmov_reg);
 %}

From a2628357a922b1ea9ba721b1d8b708ff91d46d76 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 14 May 2025 17:07:28 +0000
Subject: [PATCH 463/901] 8356641: Test
 com/sun/jdi/EarlyThreadGroupChildrenTest.java fails sometimes on macOS

Reviewed-by: kevinw, amenkov, sspitsyn
---
 test/jdk/com/sun/jdi/EarlyThreadGroupChildrenTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/jdk/com/sun/jdi/EarlyThreadGroupChildrenTest.java b/test/jdk/com/sun/jdi/EarlyThreadGroupChildrenTest.java
index 158bba347b5..0b62126fd67 100644
--- a/test/jdk/com/sun/jdi/EarlyThreadGroupChildrenTest.java
+++ b/test/jdk/com/sun/jdi/EarlyThreadGroupChildrenTest.java
@@ -101,6 +101,12 @@ public void vmDisconnected(VMDisconnectEvent event) {
     protected void runTests() throws Exception {
         connect(new String[]{"EarlyThreadGroupChildrenTestTarg"});
         System.out.println("Connected: ");
+
+        waitForVMStart();
+        System.out.println("VM Started: ");
+
+        // Do not add until after the VMStartEvent has arrived. Otherwise the debuggee
+        // will be resumed after handling the VMStartEvent, and we don't want it resumed.
         addListener(this);
 
         // Create a ThreadStartRequest for the first ThreadStartEvent. When this event is
@@ -110,9 +116,6 @@ protected void runTests() throws Exception {
         tsRequest.addCountFilter(1);
         tsRequest.enable();
 
-        waitForVMStart();
-        System.out.println("VM Started: ");
-
         resumeToVMDisconnect();
 
         // Failure mode for this test is deadlocking, so there is no error to check for.

From 7c8e273fde644bbc2def4a1134a82b8eb8d33d53 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 14 May 2025 17:41:42 +0000
Subject: [PATCH 464/901] 8356420: Provide examples on wrapping System.in

Reviewed-by: liach, smarks, alanb, bpb, iris
---
 .../classes/java/io/InputStreamReader.java      | 10 +++++++++-
 .../share/classes/java/lang/System.java         | 17 +++++++++++++----
 .../share/classes/java/util/Scanner.java        | 17 +++++++++++++++--
 .../security/auth/callback/CallbackHandler.java |  6 ++++--
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/java/io/InputStreamReader.java b/src/java.base/share/classes/java/io/InputStreamReader.java
index 6d43c4ae0cd..092ee8f3423 100644
--- a/src/java.base/share/classes/java/io/InputStreamReader.java
+++ b/src/java.base/share/classes/java/io/InputStreamReader.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
@@ -50,9 +50,17 @@
  *     BufferedReader in = new BufferedReader(new InputStreamReader(anInputStream));
  * }
  *
+ * <P>To read from {@link System#in}, use the system property value
+ * {@link System##stdin.encoding stdin.encoding} as the {@code Charset}:
+ *
+ * {@snippet lang=java :
+ *     new InputStreamReader(System.in, System.getProperty("stdin.encoding"));
+ * }
+ *
  * @see BufferedReader
  * @see InputStream
  * @see Charset
+ * @see System##stdin.encoding stdin.encoding
  *
  * @author      Mark Reinhold
  * @since       1.1
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index a60958f6f82..42c60ad2162 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -124,10 +124,19 @@ private System() {
      *
      * @apiNote
      * The typical approach to read character data is to wrap {@code System.in}
-     * within an {@link java.io.InputStreamReader InputStreamReader} or other object
-     * that handles character encoding. After this is done, subsequent reading should
-     * use only the wrapper object; operating directly on {@code System.in} results
-     * in unspecified behavior.
+     * within the object that handles character encoding. After this is done,
+     * subsequent reading should use only the wrapper object; continuing to
+     * operate directly on {@code System.in} results in unspecified behavior.
+     * <p>
+     * Here are two common examples. Using an {@link java.io.InputStreamReader
+     * InputStreamReader}:
+     * {@snippet lang=java :
+     *     new InputStreamReader(System.in, System.getProperty("stdin.encoding"));
+     * }
+     * Or using a {@link java.util.Scanner Scanner}:
+     * {@snippet lang=java :
+     *     new Scanner(System.in, System.getProperty("stdin.encoding"));
+     * }
      * <p>
      * For handling interactive input, consider using {@link Console}.
      *
diff --git a/src/java.base/share/classes/java/util/Scanner.java b/src/java.base/share/classes/java/util/Scanner.java
index bb93745bc24..3e27325aa0d 100644
--- a/src/java.base/share/classes/java/util/Scanner.java
+++ b/src/java.base/share/classes/java/util/Scanner.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
@@ -78,7 +78,7 @@
  *     }
  * }
  *
- * <p>As another example, this code allows {@code long} types to be
+ * <p>This code allows {@code long} types to be
  * assigned from entries in a file {@code myNumbers}:
  * {@snippet :
  *      Scanner sc = new Scanner(new File("myNumbers"));
@@ -87,6 +87,19 @@
  *      }
  * }
  *
+ * <p>This code uses a {@code Scanner} to read lines from {@link System#in}. The
+ * {@code Scanner} uses the system property value of
+ * {@link System##stdin.encoding stdin.encoding} as the {@code Charset}. Specifying
+ * the charset explicitly is important when reading from {@code System.in}, as it
+ * may differ from the {@link Charset#defaultCharset() default charset} depending
+ * on the host environment or user configuration:
+ * {@snippet :
+ *      Scanner sc = new Scanner(System.in, System.getProperty("stdin.encoding"));
+ *      while (sc.hasNextLine()) {
+ *          String aLine = sc.nextLine();
+ *      }
+ * }
+ *
  * <p>The scanner can also use delimiters other than whitespace. This
  * example reads several items in from a string:
  * {@snippet :
diff --git a/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java b/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java
index 03e1b14a5ff..5fff3177e4f 100644
--- a/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java
+++ b/src/java.base/share/classes/javax/security/auth/callback/CallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, 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
@@ -113,7 +113,9 @@ public interface CallbackHandler {
      *          System.err.print(nc.getPrompt());
      *          System.err.flush();
      *          nc.setName((new BufferedReader
-     *                  (new InputStreamReader(System.in))).readLine());
+     *                  (new InputStreamReader(
+     *                          System.in,
+     *                          System.getProperty("stdin.encoding")))).readLine());
      *
      *      } else if (callbacks[i] instanceof PasswordCallback) {
      *

From 75504a35ee663625982f8aed508e5ff562643334 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 14 May 2025 18:12:35 +0000
Subject: [PATCH 465/901] 8356588: Some nsk/jdi tests can fetch ThreadReference
 from static field in the debuggee: part 3

Reviewed-by: amenkov, sspitsyn
---
 .../_itself_/breakpoint001.java               | 13 +-----
 .../_itself_/breakpoint001a.java              |  8 +++-
 .../createStepRequest/crstepreq001.java       | 46 ++++++++-----------
 .../createStepRequest/crstepreq001t.java      |  8 ++--
 .../catchLocation/location001.java            | 13 +-----
 .../catchLocation/location001a.java           | 21 +++++----
 .../exception/exception001.java               | 13 +-----
 .../exception/exception001a.java              |  5 +-
 .../LocalVariable/isVisible/isvisible001.java | 20 ++------
 .../isVisible/isvisible001a.java              |  7 ++-
 .../jdi/Locatable/location/location004.java   | 20 ++------
 .../jdi/Locatable/location/location004a.java  |  7 ++-
 .../jdi/Locatable/location/location005.java   | 20 ++------
 .../jdi/Locatable/location/location005a.java  |  7 ++-
 .../MethodEntryEvent/method/method001.java    | 13 +-----
 .../MethodEntryEvent/method/method001a.java   |  9 ++--
 .../invokeMethod/invokemethod001.java         |  4 --
 .../owningThread/owningthread001.java         | 23 ++--------
 .../owningThread/owningthread001a.java        |  5 +-
 .../jdi/StepEvent/_itself_/stepevent001.java  | 13 +-----
 .../jdi/StepEvent/_itself_/stepevent001a.java | 10 ++--
 .../currentContendedMonitor/currentcm001.java | 33 ++-----------
 .../currentcm001a.java                        |  5 +-
 .../ownedMonitors/ownedmonitors001.java       | 29 ++++--------
 .../ownedMonitors/ownedmonitors001a.java      |  5 +-
 .../threadGroup/threadgroup001.java           | 30 ++----------
 .../nsk/jdi/Value/_itself_/value001.java      | 20 +-------
 .../nsk/jdi/Value/type/type002/type002.java   | 20 ++------
 .../nsk/jdi/Value/type/type002/type002a.java  |  8 ++--
 .../VoidValue/equals/equals001/equals001.java | 20 ++------
 .../equals/equals001/equals001a.java          |  8 ++--
 .../hashCode/hashcode001/hashcode001.java     | 20 ++------
 .../hashCode/hashcode001/hashcode001a.java    |  8 ++--
 .../jdi/WatchpointEvent/object/object001.java | 13 +-----
 .../WatchpointEvent/object/object001a.java    |  5 +-
 35 files changed, 156 insertions(+), 353 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java
index 89039659cef..11a502a9a37 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001.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
@@ -117,16 +117,7 @@ public static int run(final String args[], final PrintStream out) {
             checkedClass = (ReferenceType) classes.get(0);
 
             log.display("Getting reference to main thread");
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                     checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to main thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(checkedClass, "mainThread", "main");
 
             log.display("Getting reference to method <foo>");
             List allMethods  = checkedClass.methodsByName("foo");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001a.java
index 167278c5447..0c11c649865 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BreakpointEvent/_itself_/breakpoint001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -40,11 +40,13 @@ public class breakpoint001a {
     static final String COMMAND_GO    = "go";
     static final String COMMAND_DONE  = "done";
 
-    public static final int breakpointLineNumber = 86;
+    public static final int breakpointLineNumber = 90;
 
     static private int counter = 0;
     static private final int LIMIT = 10;
 
+    static Thread mainThread = null;
+
     public static void main(String args[]) {
         breakpoint001a _breakpoint001a = new breakpoint001a();
         System.exit(JCK_STATUS_BASE + _breakpoint001a.run(args));
@@ -54,6 +56,8 @@ int run( String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
 
+        mainThread = Thread.currentThread();
+
         // notify debugger about ready to execute
         pipe.println(COMMAND_READY);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java
index a5c5c88b8fd..d3fe75e835e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.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
@@ -23,6 +23,7 @@
 
 package nsk.jdi.EventRequestManager.createStepRequest;
 
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.ThreadReference;
 import com.sun.jdi.VirtualMachine;
 import com.sun.jdi.request.StepRequest;
@@ -104,35 +105,24 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee(FAILED);
         }
 
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS);
+        thR = debuggee.threadByFieldNameOrThrow(debuggeeClass, "debuggeeThread", DEBUGGEE_THRD);
+        log.display("\nCreating StepRequest for the debuggee's thread \""
+                    + thR.name() + "\"");
         try {
-            threads = vm.allThreads();
-        } catch (Exception e) {
-            log.complain("TEST FAILURE: allThreads: " + e);
+            StepRequest sReq =
+                erManager.createStepRequest(thR, RESTRICTIONS[0][0],RESTRICTIONS[0][1]);
+            sReq.enable();
+            enabledStepRequests.add(sReq);
+        } catch (DuplicateRequestException e) {
+            log.complain("TEST FAILURE: createStepRequest: caught " + e);
+            return quitDebuggee(FAILED);
+        } catch (ObjectCollectedException e) {
+            log.complain("TEST FAILURE: createStepRequest: caught " + e);
+            return quitDebuggee(FAILED);
+        } catch (VMMismatchException e) {
+            log.complain("TEST FAILURE: createStepRequest: caught " + e);
             return quitDebuggee(FAILED);
-        }
-        Iterator iter = threads.iterator();
-        while (iter.hasNext()) {
-            thR = (ThreadReference) iter.next();
-            if (thR.name().equals(DEBUGGEE_THRD)) {
-                log.display("\nCreating StepRequest for the debuggee's thread \""
-                    + thR.name() + "\"");
-                try {
-                    StepRequest sReq = erManager.createStepRequest(thR,
-                        RESTRICTIONS[0][0],RESTRICTIONS[0][1]);
-                    sReq.enable();
-                    enabledStepRequests.add(sReq);
-                } catch (DuplicateRequestException e) {
-                    log.complain("TEST FAILURE: createStepRequest: caught " + e);
-                    return quitDebuggee(FAILED);
-                } catch (ObjectCollectedException e) {
-                    log.complain("TEST FAILURE: createStepRequest: caught " + e);
-                    return quitDebuggee(FAILED);
-                } catch (VMMismatchException e) {
-                    log.complain("TEST FAILURE: createStepRequest: caught " + e);
-                    return quitDebuggee(FAILED);
-                }
-                break;
-            }
         }
 
 // Check that createStepRequest() throws DuplicateRequestException
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001t.java
index ec910b298a7..1ccf2a88c6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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,12 +32,14 @@
  * This is a debuggee class.
  */
 public class crstepreq001t {
+    static Thread debuggeeThread = null;
+
     public static void main(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread  thr = Thread.currentThread();
+        debuggeeThread = Thread.currentThread();
 
-        thr.setName(crstepreq001.DEBUGGEE_THRD);
+        debuggeeThread.setName(crstepreq001.DEBUGGEE_THRD);
         pipe.println(crstepreq001.COMMAND_READY);
         String cmd = pipe.readln();
         if (!cmd.equals(crstepreq001.COMMAND_QUIT)) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java
index ef1e9e1a919..7bf812c53cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001.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
@@ -165,16 +165,7 @@ public static int run(final String args[], final PrintStream out) {
 
             // get mirror of main thread in debuggee
             log.display("Getting reference to main thread");
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                     checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to main thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(checkedClass, "mainThread", "main");
 
             // create ExceptionRequest for all throwable classes (initially disabled)
             log.display("Creating ExceptionRequest");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001a.java
index b4abcc8f0fc..a2aa7d25b42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/catchLocation/location001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -47,16 +47,16 @@ class location001a {
     static final String COMMAND_ERROR = "error";
 
     // line numbers where checked exceptions thrown (for user exceptions only)
-    public static final int userExceptionLocation = 98;
-    public static final int userErrorLocation     = 105;
-    public static final int userThrowableLocation = 112;
+    public static final int userExceptionLocation = 101;
+    public static final int userErrorLocation     = 108;
+    public static final int userThrowableLocation = 115;
 
     // line numbers where checked exceptions caught. Numbers were changed due to 4740123
-    public static final int userExceptionCatchLocation = 99;
-    public static final int userErrorCatchLocation     = 106;
-    public static final int userThrowableCatchLocation = 113;
-    public static final int javaExceptionCatchLocation = 120;
-    public static final int javaErrorCatchLocation     = 127;
+    public static final int userExceptionCatchLocation = 102;
+    public static final int userErrorCatchLocation     = 109;
+    public static final int userThrowableCatchLocation = 116;
+    public static final int javaExceptionCatchLocation = 123;
+    public static final int javaErrorCatchLocation     = 130;
 
     // flags marked all actually thrown exceptions
     private static boolean userExceptionThrown = false;
@@ -65,9 +65,12 @@ class location001a {
     private static boolean javaExceptionThrown = false;
     private static boolean javaErrorThrown     = false;
 
+    static Thread mainThread = null;
+
     // run debuggee from command line
     public static void main(String args[]) throws Throwable {
         location001a _location001a = new location001a();
+        mainThread = Thread.currentThread();
         System.exit(JCK_STATUS_BASE + _location001a.runIt(args, System.err));
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java
index 85d2304d47f..eb071319197 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001.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
@@ -165,16 +165,7 @@ public static int run(final String args[], final PrintStream out) {
 
             // get mirror of main thread in debuggee
             log.display("Getting reference to main thread");
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                     checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to main thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(checkedClass, "mainThread", "main");
 
             // create ExceptionRequest for all throwable classes (initially disabled)
             log.display("Creating ExceptionRequest");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001a.java
index 474d11cf406..b8f691b907f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/exception/exception001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -65,9 +65,12 @@ class exception001a {
     private static boolean javaExceptionThrown = false;
     private static boolean javaErrorThrown     = false;
 
+    static Thread mainThread = null;
+
     // run debuggee from command line
     public static void main(String args[]) throws Throwable {
         exception001a _exception001a = new exception001a();
+        mainThread = Thread.currentThread();
         System.exit(JCK_STATUS_BASE + _exception001a.runIt(args, System.err));
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
index acaca06f4ea..ba6e88d2b5f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.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
@@ -173,6 +173,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -204,8 +205,6 @@ private int runThis (String argv[], PrintStream out) {
 
             BreakpointRequest breakpRequest1 = null;
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             StackFrame stackFrame  = null;
@@ -230,7 +229,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -239,19 +237,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001a.java
index 2a6731e12d1..ba8c1218f90 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread thread2 =
+                         thread2 =
                              JDIThreadFactory.newThread(new Threadisvisible001a("Thread2"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java
index a1110961b70..9030d16c08a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004.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
@@ -162,6 +162,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -195,8 +196,6 @@ private int runThis (String argv[], PrintStream out) {
 
             BreakpointRequest breakpRequest1 = null;
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             StackFrame    stackFrame = null;
@@ -206,7 +205,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -215,19 +213,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004a.java
index 2588fa0c84c..b30f33e730d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location004a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread thread2 =
+                         thread2 =
                              JDIThreadFactory.newThread(new Threadlocation004a("Thread2"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java
index 486697cc1e4..37b4f57b370 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005.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
@@ -162,6 +162,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -195,8 +196,6 @@ private int runThis (String argv[], PrintStream out) {
 
             BreakpointRequest breakpRequest1 = null;
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             StackFrame    stackFrame = null;
@@ -206,7 +205,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -215,19 +213,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005a.java
index 0cdd39951b8..e428485d0f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Locatable/location/location005a.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
@@ -58,6 +58,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Thread thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -93,7 +96,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Thread thread2 =
+                         thread2 =
                              JDIThreadFactory.newThread(new Threadlocation005a("Thread2"));
                          log1("       thread2 is created");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java
index c9d55bf1d25..ab29fdcbdde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001.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
@@ -131,16 +131,7 @@ public static int run(final String args[], final PrintStream out) {
             log.display("Getting loaded class in debuggee");
             checkedClass = debuggee.classByName(DEBUGGEE_NAME);
 
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                    checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to main thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(checkedClass, "mainThread", "main");
 
             log.display("Getting reference to method <foo>");
             checkedMethod = debuggee.methodByName(checkedClass, "foo");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001a.java
index 3a2ec46ebb7..7ed120cac5b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/MethodEntryEvent/method/method001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -45,8 +45,8 @@ public class method001a {
     static final String COMMAND_DONE  = "done";
 
     // line numbers for auxilary breakpoints
-    public static final int STARTING_BREAKPOINT_LINE = 86;
-    public static final int ENDING_BREAKPOINT_LINE = 91;
+    public static final int STARTING_BREAKPOINT_LINE = 89;
+    public static final int ENDING_BREAKPOINT_LINE = 94;
 
     // scaffold objects
     static private ArgumentHandler argHandler;
@@ -58,9 +58,12 @@ public class method001a {
     static private int depth;
     static private boolean methodInvoked;
 
+    static Thread mainThread = null;
+
     // start debuggee
     public static void main(String args[]) {
         method001a _method001a = new method001a();
+        mainThread = Thread.currentThread();
         System.exit(JCK_STATUS_BASE + _method001a.run(args, System.err));
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
index 2fb81d7ddac..d46f3e956c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod001.java
@@ -213,9 +213,6 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             BreakpointRequest breakpRequest1 = null;
@@ -225,7 +222,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java
index f76e238083b..29fb5bc02a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001.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
@@ -105,7 +105,6 @@ private static void log3(String message) {
     static VirtualMachine      vm  = null;
 
     ReferenceType     testedClass  = null;
-    ThreadReference   thread2      = null;
     ThreadReference   mainThread   = null;
 
     static int  testExitCode = PASSED;
@@ -150,6 +149,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -174,11 +174,7 @@ private int runThis (String argv[], PrintStream out) {
 
             int expresult = returnCode0;
 
-            String threadName = "testedThread";
-
-            List            allThreads   = null;
             List            monitors     = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
             ObjectReference objRef       = null;
 
@@ -187,7 +183,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedClass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -196,19 +191,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO 'main' thread  ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
             }
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001a.java
index bdb218114c6..140bf667f6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/owningThread/owningthread001a.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
@@ -60,6 +60,7 @@ private static void logErr(String message) {
     //====================================================== test program
 
     private static Thread thread2 = null;
+    static Thread mainThread = null;
 
     static TestClass  testObj  = new TestClass();
 
@@ -67,6 +68,8 @@ private static void logErr(String message) {
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java
index 7798da0dc73..9905560b5a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001.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
@@ -121,16 +121,7 @@ public static int run(final String args[], final PrintStream out) {
             checkedClass = (ReferenceType) classes.get(0);
 
             log.display("Getting reference to main thread");
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                     checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to main thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(checkedClass, "mainThread", "main");
 
             log.display("Getting reference to method <foo>");
             List allMethods  = checkedClass.methodsByName("foo");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001a.java
index 1ad35224d37..0073a25a44c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepevent001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -41,12 +41,14 @@ public class stepevent001a {
     static final String COMMAND_GO    = "go";
     static final String COMMAND_DONE  = "done";
 
-    public static final int stepLineBegin = 90;
-    public static final int stepLineEnd = 100;
+    public static final int stepLineBegin = 94;
+    public static final int stepLineEnd = 104;
 
     static private int counter;
     static private final int LIMIT = 10;
 
+    static Thread mainThread = null;
+
     static private ArgumentHandler argHandler;
     static private IOPipe pipe;
 
@@ -59,6 +61,8 @@ int run( String args[]) {
         argHandler = new ArgumentHandler(args);
         pipe = argHandler.createDebugeeIOPipe();
 
+        mainThread = Thread.currentThread();
+
         // notify debugger about ready to execute
         pipe.println(COMMAND_READY);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java
index 628dbe17488..a6240045f6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001.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
@@ -158,6 +158,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
 
@@ -196,14 +197,8 @@ private int runThis (String argv[], PrintStream out) {
             //String bpLine2 = "breakpointLineNumber2";
             //String bpLine3 = "breakpointLineNumber3";
 
-
-            List            allThreads   = null;
-
             ObjectReference monitor      = null;
 
-            ListIterator    listIterator = null;
-            List            classes      = null;
-
             //BreakpointRequest breakpRequest1 = null;
             //BreakpointRequest breakpRequest2 = null;
             //BreakpointRequest breakpRequest3 = null;
@@ -212,29 +207,7 @@ private int runThis (String argv[], PrintStream out) {
             label0: {
 
                 log2("getting ThreadReference objects");
-                try {
-                    allThreads  = vm.allThreads();
-//                    classes     = vm.classesByName(testedClassName);
-//                    testedclass = (ReferenceType) classes.get(0);
-                } catch ( Exception e) {
-                    log3("ERROR: Exception at very beginning !? : " + e);
-                    expresult = returnCode1;
-                    break label0;
-                }
-
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        mainThread = (ThreadReference) listIterator.next();
-                        if (mainThread.name().equals("main"))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO 'main' thread  ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                mainThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
             }
 
             label1: {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001a.java
index 376e6c78b7c..a0d9c2c7b40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/currentContendedMonitor/currentcm001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -61,11 +61,14 @@ private static void logErr(String message) {
     //====================================================== test program
 
 //    private static Threadcurrentcm001a thread2 = null;
+    static Thread mainThread = null;
 
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
index 086d5b85909..96afc58dd25 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001.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
@@ -141,6 +141,10 @@ private int runThis (String argv[], PrintStream out) {
                 break label1;
             }
 
+            log1("Getting ThreadReference for main thread");
+            ThreadReference mainThread =
+                debuggee.threadByFieldNameOrThrow(debuggeeRef, "mainThread", "main");
+
             for (int i2 = 0; ; i2++) {
                 if (!vm.canGetOwnedMonitorInfo()) {
                     log1("TEST ABORTED: vm.canGetOwnedMonitorInfo() returned false.");
@@ -163,11 +167,11 @@ private int runThis (String argv[], PrintStream out) {
                 switch (i2) {
 
                     case 0 :
-                        checkMonitors("main", 0);
+                        checkMonitors(mainThread, 0);
                         break;
 
                     case 1 :
-                        checkMonitors("main", monitorCount);
+                        checkMonitors(mainThread, monitorCount);
                         break;
 
                     default:
@@ -210,21 +214,8 @@ private int runThis (String argv[], PrintStream out) {
         return testExitCode;
     }
 
-    private void checkMonitors(String threadName, int expSize) {
-        log1("Getting ThreadReference for " + threadName + " thread");
-        ThreadReference checkedThread = null;
-        Iterator itr = vm.allThreads().listIterator();
-        while (itr.hasNext()) {
-             ThreadReference thread = (ThreadReference) itr.next();
-             if (thread.name().equals(threadName)) {
-                  checkedThread = thread;
-             }
-        }
-        if (checkedThread == null) {
-            log3("Cannot find  " + threadName + "thread in the debuggee");
-            testExitCode = FAILED;
-            return;
-        }
+    private void checkMonitors(ThreadReference checkedThread, int expSize) {
+        String threadName = checkedThread.name();
         log1("Checking up throwing an IncompatibleThreadStateException for not suspended thread");
         List monitors;
         try {
@@ -252,7 +243,7 @@ private void checkMonitors(String threadName, int expSize) {
                 if (expSize > 0) {
                     log1("Checking up items in ownedMonitors() list");
                     getMonitorRefs();
-                    itr = expMonitors.iterator();
+                    Iterator itr = expMonitors.iterator();
                     while (itr.hasNext()) {
                         ObjectReference mon = (ObjectReference) itr.next();
                         if (monitors.contains(mon)) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001a.java
index 4a9a34803cf..5a2b0a0ebc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -62,11 +62,14 @@ private static void logErr(String message) {
 
     public static Object waitnotifyObj = new Object();
     public static Object lockingObject = new Object();
+    static Thread mainThread = null;
 
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
 
+        mainThread = Thread.currentThread();
+
         for (int i=0; i<argv.length; i++) {
             if ( argv[i].equals("-vbs") || argv[i].equals("-verbose") ) {
                 verbMode = true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java
index 54396dd8c24..24b65824a5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/threadGroup/threadgroup001.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
@@ -209,18 +209,10 @@ private int runThis (String argv[], PrintStream out) {
                                       "threadGroup3Obj",
                                       "threadGroup4Obj"  };
 
-            List            threads;
-            ListIterator    iterator;
-            int             flag;
-            String          threadName;
-            ThreadReference thread;
-
             ThreadReference thread2 = null;
             ThreadReference thread3 = null;
             ThreadReference thread4 = null;
 
-            String threadNames [] = { "Thread2", "Thread3", "Thread4" };
-
             ReferenceType mainthreadClass = null;
             ReferenceType thread2Class    = null;
 
@@ -244,24 +236,10 @@ private int runThis (String argv[], PrintStream out) {
                              mainthreadClass.getValue(mainthreadClass.fieldByName(groupNames[i1]));
                 }
 
-                log2("      getting a List of all running threads");
-                threads = vm.allThreads();
-
-
                 log2("      getting Thread 2,3,4 mirror objects");
-
-                iterator = threads.listIterator();
-                for ( int i2 = 0; iterator.hasNext(); i2++ ) {
-                    thread = (ThreadReference) iterator.next();
-                    threadName = thread.name();
-                    if (threadName.equals(threadNames[0]))
-                         thread2 = thread;
-                    else if (threadName.equals(threadNames[1]))
-                         thread3 = thread;
-                    else if (threadName.equals(threadNames[2]))
-                         thread4 = thread;
-                }
-
+                thread2 = debuggee.threadByFieldNameOrThrow(mainthreadClass, "thread2", "Thread2");
+                thread3 = debuggee.threadByFieldNameOrThrow(mainthreadClass, "thread3", "Thread3");
+                thread4 = debuggee.threadByFieldNameOrThrow(mainthreadClass, "thread4", "Thread4");
 
                 log2("......checking up Thread2's group");
                 if (!thread2.threadGroup().equals(groups[1])) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java
index b02ce0515b2..1c433322e98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/_itself_/value001.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
@@ -342,9 +342,6 @@ private int runThis (String argv[], PrintStream out) {
 
             StackFrame      stackFrame   = null;
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
-
 
             int expresult = returnCode0;
 
@@ -353,7 +350,6 @@ private int runThis (String argv[], PrintStream out) {
                 log2("getting ThreadReference object");
 
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -362,19 +358,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up a breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java
index af2fd9d780d..7b36ed4f25d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002.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
@@ -209,6 +209,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -235,8 +236,6 @@ private int runThis (String argv[], PrintStream out) {
             eventRManager = vm.eventRequestManager();
             eventQueue    = vm.eventQueue();
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             String threadName = "Thread2";
@@ -251,7 +250,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -260,19 +258,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002a.java
index 434d759a528..849dd7011a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Value/type/type002/type002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadtype002a thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadtype002a thread2 =
-                             new Threadtype002a("Thread2");
+                         thread2 = new Threadtype002a("Thread2");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java
index 9dc24173080..cff81dd5ecb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001.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
@@ -217,6 +217,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -243,8 +244,6 @@ private int runThis (String argv[], PrintStream out) {
             eventRManager = vm.eventRequestManager();
             eventQueue    = vm.eventQueue();
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             String threadName = "Thread2";
@@ -259,7 +258,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -268,19 +266,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001a.java
index d8f3155f7f5..bc1973ffedb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/equals/equals001/equals001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadequals001a thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                 case 0:
-                         Threadequals001a thread2 =
-                             new Threadequals001a("Thread2");
+                         thread2 = new Threadequals001a("Thread2");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java
index 3bf9632128d..474c3baa3cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001.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
@@ -217,6 +217,7 @@ private int runThis (String argv[], PrintStream out) {
         }
 
         VirtualMachine vm = debuggee.VM();
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
 
     //------------------------------------------------------  testing section
         log1("      TESTING BEGINS");
@@ -243,8 +244,6 @@ private int runThis (String argv[], PrintStream out) {
             eventRManager = vm.eventRequestManager();
             eventQueue    = vm.eventQueue();
 
-            List            allThreads   = null;
-            ListIterator    listIterator = null;
             List            classes      = null;
 
             String threadName = "Thread2";
@@ -259,7 +258,6 @@ private int runThis (String argv[], PrintStream out) {
 
                 log2("getting ThreadReference object");
                 try {
-                    allThreads  = vm.allThreads();
                     classes     = vm.classesByName(testedClassName);
                     testedclass = (ReferenceType) classes.get(0);
                 } catch ( Exception e) {
@@ -268,19 +266,7 @@ private int runThis (String argv[], PrintStream out) {
                     break label0;
                 }
 
-                listIterator = allThreads.listIterator();
-                for (;;) {
-                    try {
-                        thread2 = (ThreadReference) listIterator.next();
-                        if (thread2.name().equals(threadName))
-                            break ;
-                    } catch ( NoSuchElementException e ) {
-                        log3("ERROR: NoSuchElementException for listIterator.next()");
-                        log3("ERROR: NO THREAD2 ?????????!!!!!!!");
-                        expresult = returnCode1;
-                        break label0;
-                    }
-                }
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, "thread2", threadName);
 
                 log2("setting up breakpoint");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001a.java
index 5cee04fa40a..9edd78de4ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/hashCode/hashcode001/hashcode001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, 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
@@ -59,6 +59,9 @@ private static void logErr(String message) {
     }
 
     //====================================================== test program
+
+    static Threadhashcode001a thread2 = null;
+
     //----------------------------------------------------   main method
 
     public static void main (String argv[]) {
@@ -94,8 +97,7 @@ public static void main (String argv[]) {
     //------------------------------------------------------  section tested
 
                  case 0:
-                         Threadhashcode001a thread2 =
-                             new Threadhashcode001a("Thread2");
+                         thread2 = new Threadhashcode001a("Thread2");
                          log1("       thread2 is created");
 
                          label:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java
index 765af72a7a8..5bf6fe2d307 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001.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
@@ -147,16 +147,7 @@ public static int run(final String args[], final PrintStream out) {
             }
 
             log.display("Getting reference to <main> thread");
-            Iterator threadIterator = vm.allThreads().iterator();
-            while (threadIterator.hasNext()) {
-                ThreadReference curThread = (ThreadReference) threadIterator.next();
-                if (curThread.name().equals("main")) {
-                     checkedThread = curThread;
-                }
-            }
-            if (checkedThread == null) {
-                throw new Failure("TEST BUG: unable to find reference to <main> thread");
-            }
+            checkedThread = debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread", "main");
 
             // get object of checked class
             log.display("Getting object of checked class");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001a.java
index 2c38d9325eb..df743abd4fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/WatchpointEvent/object/object001a.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
@@ -48,6 +48,8 @@ class object001a {
 
     public static CheckedClass foo;
 
+    static Thread mainThread = null;
+
     public static void main(String args[]) {
 //        object001a _object001a = new object001a();
         System.exit(JCK_STATUS_BASE + run(args));
@@ -56,6 +58,7 @@ public static void main(String args[]) {
     static int run( String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
+        mainThread = Thread.currentThread();
 
         // create instance of checked class
         foo = new CheckedClass();

From e91088a9e8193b81a1de82d48effd8c8c0f3b45d Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Wed, 14 May 2025 18:47:42 +0000
Subject: [PATCH 466/901] 8343739: Test
 java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java failed:
 Wrong extended key code

Reviewed-by: serb, prr
---
 .../KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
index c76f879446f..fae72f45bfa 100644
--- a/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java
+++ b/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.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
@@ -30,8 +30,7 @@
  * @test
  * @key headful
  * @bug 8007156 8025126
- * @summary Extended key code is not set for a key event
- * @author Alexandr Scherbatiy
+ * @summary Tests that ExtendedKeyCode is set for key events
  * @library /lib/client
  * @build ExtendedRobot
  * @run main ExtendedKeyCodeTest
@@ -75,7 +74,8 @@ public void keyReleased(KeyEvent e) {
         frame.dispose();
 
         if (eventsCount != 2 || !setExtendedKeyCode) {
-            throw new RuntimeException("Wrong extended key code");
+            throw new RuntimeException("Wrong extended key code\n" +
+                    "eventsCount: " + eventsCount);
         }
 
         frame = new Frame();

From ecabea6cd315eaf08571ef61ff267318140d147b Mon Sep 17 00:00:00 2001
From: Ben Perez <bperez@openjdk.org>
Date: Wed, 14 May 2025 19:38:34 +0000
Subject: [PATCH 467/901] 8347608: Optimize Java implementation of ML-KEM

Reviewed-by: weijun
---
 .../com/sun/crypto/provider/ML_KEM.java       | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
index b45b655e1f3..fa461e45d22 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
@@ -703,7 +703,7 @@ private K_PKE_KeyPair generateK_PkeKeyPair(byte[] seed) {
 
     private K_PKE_CipherText kPkeEncrypt(
             K_PKE_EncryptionKey publicKey, byte[] message, byte[] sigma) {
-        short[][] zeroes = new short[mlKem_k][ML_KEM_N];
+        short[][] zeroes = shortMatrixAlloc(mlKem_k, ML_KEM_N);
         byte[] pkBytes = publicKey.keyBytes;
         byte[] rho = Arrays.copyOfRange(pkBytes,
                 pkBytes.length - 32, pkBytes.length);
@@ -792,7 +792,7 @@ private short[][][] generateA(byte[] rho, Boolean transposed) {
         System.arraycopy(rho, 0, seedBuf, 0, rho.length);
         seedBuf[rhoLen + 2] = 0x1F;
         seedBuf[XOF_BLOCK_LEN - 1] = (byte)0x80;
-        byte[][] xofBufArr = new byte[nrPar][XOF_BLOCK_LEN + XOF_PAD];
+        byte[][] xofBufArr = byteMatrixAlloc(nrPar, XOF_BLOCK_LEN + XOF_PAD);
         int[] iIndex = new int[nrPar];
         int[] jIndex = new int[nrPar];
 
@@ -1550,4 +1550,22 @@ private static int montMul(int b, int c) {
 
         return (aHigh - ((m * MONT_Q) >> MONT_R_BITS)); // subtract signed high product
     }
+
+    // For multidimensional array initialization, manually allocating each entry is
+    // faster than doing the entire initialization in one go
+    static short[][] shortMatrixAlloc(int first, int second) {
+        short[][] res = new short[first][];
+        for (int i = 0; i < first; i++) {
+            res[i] = new short[second];
+        }
+        return res;
+    }
+
+    static byte[][] byteMatrixAlloc(int first, int second) {
+        byte[][] res = new byte[first][];
+        for (int i = 0; i < first; i++) {
+            res[i] = new byte[second];
+        }
+        return res;
+    }
 }

From 948ade8e7003a41683600428c8e3155c7ed798db Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Wed, 14 May 2025 19:47:38 +0000
Subject: [PATCH 468/901] 8356971: [JVMCI] Export
 VM_Version::supports_avx512_simd_sort to JVMCI compiler

Reviewed-by: dnsimon
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.hpp     | 1 +
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp | 2 ++
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index f9643c6394e..c71993b7414 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
@@ -118,6 +118,7 @@ class CompilerToVM {
 
 #ifdef X86
     static int L1_line_size;
+    static bool supports_avx512_simd_sort;
 #endif
 
     static address dsin;
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 532f3333a6d..7b28eea59d5 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -125,6 +125,7 @@ int CompilerToVM::Data::cardtable_shift;
 
 #ifdef X86
 int CompilerToVM::Data::L1_line_size;
+bool CompilerToVM::Data::supports_avx512_simd_sort;
 #endif
 
 size_t CompilerToVM::Data::vm_page_size;
@@ -256,6 +257,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
 
 #ifdef X86
   L1_line_size = VM_Version::L1_line_size();
+  supports_avx512_simd_sort = VM_Version::supports_avx512_simd_sort();
 #endif
 
   vm_page_size = os::vm_page_size();
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index e504ee68f84..2beda111284 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -122,6 +122,7 @@
   static_field(CompilerToVM::Data,             cardtable_shift,                        int)                                          \
                                                                                                                                      \
   X86_ONLY(static_field(CompilerToVM::Data,    L1_line_size,                           int))                                         \
+  X86_ONLY(static_field(CompilerToVM::Data,    supports_avx512_simd_sort,              bool))                                        \
                                                                                                                                      \
   static_field(CompilerToVM::Data,             vm_page_size,                           size_t)                                       \
                                                                                                                                      \

From b66ab8ebe254c674ce6a5b731773c41111fa6bc5 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 14 May 2025 22:00:46 +0000
Subject: [PATCH 469/901] 8356693: AOT assembly phase fails with -javaagent

Reviewed-by: asmehra, ccheung, shade
---
 src/hotspot/share/cds/cdsConfig.cpp           |  14 +++
 src/hotspot/share/cds/cds_globals.hpp         |   3 +-
 src/hotspot/share/classfile/klassFactory.cpp  |   4 +
 .../classfile/systemDictionaryShared.cpp      |   5 +
 .../classfile/systemDictionaryShared.hpp      |   1 +
 src/hotspot/share/prims/jvmtiAgent.cpp        |  14 ++-
 src/hotspot/share/prims/jvmtiAgentList.cpp    |  14 ++-
 src/hotspot/share/prims/jvmtiAgentList.hpp    |   3 +-
 .../cds/appcds/aotCache/JavaAgent.java        | 117 ++++++++++++++++++
 .../appcds/aotCache/JavaAgentTransformer.java |  67 ++++++++++
 .../appcds/aotCache/JavaAgentTransformer.mf   |   5 +
 .../jvmti/dumpingWithAgent/SimpleAgent.java   |  11 +-
 12 files changed, 251 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgent.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.mf

diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 463bfe3a98d..d2d1dab95ec 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -32,6 +32,7 @@
 #include "include/jvm_io.h"
 #include "logging/log.hpp"
 #include "memory/universe.hpp"
+#include "prims/jvmtiAgentList.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
@@ -430,6 +431,10 @@ void CDSConfig::check_aot_flags() {
       check_aotmode_create();
     }
   }
+
+  // This is an old flag used by CDS regression testing only. It doesn't apply
+  // to the AOT workflow.
+  FLAG_SET_ERGO(AllowArchivingWithJavaAgent, false);
 }
 
 void CDSConfig::check_aotmode_off() {
@@ -480,6 +485,15 @@ void CDSConfig::check_aotmode_create() {
   }
 
   CDSConfig::enable_dumping_static_archive();
+
+  // We don't load any agents in the assembly phase, so we can ensure that the agents
+  // cannot affect the contents of the AOT cache. E.g., we don't want the agents to
+  // redefine any cached classes. We also don't want the agents to modify heap objects that
+  // are cached.
+  //
+  // Since application is not executed in the assembly phase, there's no need to load
+  // the agents anyway -- no one will notice that the agents are not loaded.
+  JvmtiAgentList::disable_agent_list();
 }
 
 void CDSConfig::ergo_init_aot_paths() {
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index b5657a73ef1..1e58c6a93f8 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -64,7 +64,8 @@
           range(2, 246)                                                     \
                                                                             \
   product(bool, AllowArchivingWithJavaAgent, false, DIAGNOSTIC,             \
-          "Allow Java agent to be run with CDS dumping")                    \
+          "Allow Java agent to be run with CDS dumping (not applicable"     \
+          " to AOT")                                                        \
                                                                             \
   develop(ccstr, ArchiveHeapTestClass, nullptr,                             \
           "For JVM internal testing only. The static field named "          \
diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp
index 28bb176ed0a..a3a4ea061f2 100644
--- a/src/hotspot/share/classfile/klassFactory.cpp
+++ b/src/hotspot/share/classfile/klassFactory.cpp
@@ -31,6 +31,7 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoadInfo.hpp"
 #include "classfile/klassFactory.hpp"
+#include "classfile/systemDictionaryShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "prims/jvmtiEnvBase.hpp"
 #include "prims/jvmtiRedefineClasses.hpp"
@@ -205,6 +206,9 @@ InstanceKlass* KlassFactory::create_from_stream(ClassFileStream* stream,
   const ClassInstanceInfo* cl_inst_info = cl_info.class_hidden_info_ptr();
   InstanceKlass* result = parser.create_instance_klass(old_stream != stream, *cl_inst_info, CHECK_NULL);
   assert(result != nullptr, "result cannot be null with no pending exception");
+  if (CDSConfig::is_dumping_archive() && stream->from_class_file_load_hook()) {
+    SystemDictionaryShared::set_from_class_file_load_hook(result);
+  }
 
   if (cached_class_file != nullptr) {
     // JVMTI: we have an InstanceKlass now, tell it about the cached bytes
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 1f4bf80fbd6..8fcfc2f54be 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -734,6 +734,11 @@ bool SystemDictionaryShared::has_class_failed_verification(InstanceKlass* ik) {
   return (p == nullptr) ? false : p->failed_verification();
 }
 
+void SystemDictionaryShared::set_from_class_file_load_hook(InstanceKlass* ik) {
+  warn_excluded(ik, "From ClassFileLoadHook");
+  set_excluded(ik);
+}
+
 void SystemDictionaryShared::dumptime_classes_do(MetaspaceClosure* it) {
   assert_lock_strong(DumpTimeTable_lock);
 
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index a0019ac0bd8..2b17cae9c36 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -260,6 +260,7 @@ class SystemDictionaryShared: public SystemDictionary {
   static bool is_excluded_class(InstanceKlass* k);
   static void set_excluded(InstanceKlass* k);
   static void set_excluded_locked(InstanceKlass* k);
+  static void set_from_class_file_load_hook(InstanceKlass* k) NOT_CDS_RETURN;
   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);
diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp
index 97883e5c6a4..d26c581a2a5 100644
--- a/src/hotspot/share/prims/jvmtiAgent.cpp
+++ b/src/hotspot/share/prims/jvmtiAgent.cpp
@@ -578,11 +578,20 @@ static bool invoke_Agent_OnAttach(JvmtiAgent* agent, outputStream* st) {
   return true;
 }
 
+#if INCLUDE_CDS
 // CDS dumping does not support native JVMTI agent.
 // CDS dumping supports Java agent if the AllowArchivingWithJavaAgent diagnostic option is specified.
 static void check_cds_dump(JvmtiAgent* agent) {
+  if (CDSConfig::new_aot_flags_used()) { // JEP 483
+    // Agents are allowed with -XX:AOTMode=record and -XX:AOTMode=on/auto.
+    // Agents are completely disabled when -XX:AOTMode=create
+    assert(!CDSConfig::is_dumping_final_static_archive(), "agents should have been disabled with -XX:AOTMode=create");
+    return;
+  }
+
+  // This is classic CDS limitations -- we disallow agents by default. They can be used
+  // with -XX:+AllowArchivingWithJavaAgent, but that should be used for diagnostic purposes only.
   assert(agent != nullptr, "invariant");
-  assert(CDSConfig::is_dumping_archive(), "invariant");
   if (!agent->is_instrument_lib()) {
     vm_exit_during_cds_dumping("CDS dumping does not support native JVMTI agent, name", agent->name());
   }
@@ -591,6 +600,7 @@ static void check_cds_dump(JvmtiAgent* agent) {
       "Must enable AllowArchivingWithJavaAgent in order to run Java agent during CDS dumping");
   }
 }
+#endif // INCLUDE_CDS
 
 // Loading the agent by invoking Agent_OnLoad.
 static bool invoke_Agent_OnLoad(JvmtiAgent* agent) {
@@ -598,9 +608,11 @@ static bool invoke_Agent_OnLoad(JvmtiAgent* agent) {
   assert(!agent->is_xrun(), "invariant");
   assert(!agent->is_dynamic(), "invariant");
   assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_ONLOAD, "invariant");
+#if INCLUDE_CDS
   if (CDSConfig::is_dumping_archive()) {
     check_cds_dump(agent);
   }
+#endif
   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
diff --git a/src/hotspot/share/prims/jvmtiAgentList.cpp b/src/hotspot/share/prims/jvmtiAgentList.cpp
index be497cebf38..a4b7606056d 100644
--- a/src/hotspot/share/prims/jvmtiAgentList.cpp
+++ b/src/hotspot/share/prims/jvmtiAgentList.cpp
@@ -21,6 +21,10 @@
  * questions.
  */
 
+#include "cds/cdsConfig.hpp"
+#include "cds/cds_globals.hpp"
+#include "logging/log.hpp"
+#include "memory/universe.hpp"
 #include "prims/jvmtiAgentList.hpp"
 #include "prims/jvmtiEnvBase.hpp"
 #include "prims/jvmtiExport.hpp"
@@ -62,7 +66,6 @@ static inline JvmtiAgent* head(JvmtiAgent** list) {
   return Atomic::load_acquire(list);
 }
 
-
 // The storage list is a single cas-linked-list, to allow for concurrent iterations.
 // Especially during initial loading of agents, there exist an order requirement to iterate oldest -> newest.
 // Our concurrent storage linked-list is newest -> oldest.
@@ -274,3 +277,12 @@ JvmtiAgent* JvmtiAgentList::lookup(JvmtiEnv* env, void* f_ptr) {
   }
   return nullptr;
 }
+
+void JvmtiAgentList::disable_agent_list() {
+#if INCLUDE_CDS
+  assert(CDSConfig::is_dumping_final_static_archive(), "use this only for -XX:AOTMode=create!");
+  assert(!Universe::is_bootstrapping() && !Universe::is_fully_initialized(), "must do this very early");
+  log_info(aot)("Disabled all JVMTI agents during -XX:AOTMode=create");
+  _list = nullptr; // Pretend that no agents have been added.
+#endif
+}
diff --git a/src/hotspot/share/prims/jvmtiAgentList.hpp b/src/hotspot/share/prims/jvmtiAgentList.hpp
index 9aaa12cdd5c..f8199ddb1a7 100644
--- a/src/hotspot/share/prims/jvmtiAgentList.hpp
+++ b/src/hotspot/share/prims/jvmtiAgentList.hpp
@@ -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
@@ -86,6 +86,7 @@ class JvmtiAgentList : AllStatic {
   static Iterator java_agents();
   static Iterator native_agents();
   static Iterator xrun_agents();
+  static void disable_agent_list() NOT_JVMTI_RETURN;
 };
 
 #endif // SHARE_PRIMS_JVMTIAGENTLIST_HPP
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgent.java
new file mode 100644
index 00000000000..7965be8d00a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgent.java
@@ -0,0 +1,117 @@
+/*
+ * 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 -javaagent should be allowed in AOT workflow. However, classes transformed/redefined by agents will not
+ *          be cached.
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build JavaAgent JavaAgentTransformer Util
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar JavaAgentApp JavaAgentApp$ShouldBeTransformed
+ * @run driver JavaAgent AOT
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class JavaAgent {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "JavaAgentApp";
+
+    public static String agentClasses[] = {
+        "JavaAgentTransformer",
+        "Util",
+    };
+    static String agentJar;
+
+    public static void main(String... args) throws Exception {
+        agentJar = ClassFileInstaller.writeJar("agent.jar",
+                                        ClassFileInstaller.Manifest.fromSourceFile("JavaAgentTransformer.mf"),
+                                        agentClasses);
+
+        new Tester().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[] { "-javaagent:" + agentJar, "-Xlog:aot,cds"};
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            String agentLoadedMsg = "JavaAgentTransformer.premain() is called";
+            if (runMode.isApplicationExecuted()) {
+                out.shouldContain(agentLoadedMsg);
+                out.shouldContain("Transforming: JavaAgentApp$ShouldBeTransformed; Class<?> = null");
+                out.shouldContain("Result: YYYY"); // "XXXX" has been changed to "YYYY" by the agent
+            } else {
+                out.shouldNotContain(agentLoadedMsg);
+            }
+
+            switch (runMode) {
+            case RunMode.TRAINING:
+                out.shouldContain("Skipping JavaAgentApp$ShouldBeTransformed: From ClassFileLoadHook");
+                out.shouldContain("Skipping JavaAgentTransformer: Unsupported location");
+                break;
+            case RunMode.ASSEMBLY:
+                out.shouldContain("Disabled all JVMTI agents during -XX:AOTMode=create");
+                break;
+            }
+        }
+    }
+}
+
+class JavaAgentApp {
+    public static void main(String[] args) {
+        System.out.println("Result: " + (new ShouldBeTransformed()));
+    }
+
+    static class ShouldBeTransformed {
+        public String toString() {
+            return "XXXX"; // Will be changed to YYYY by the agent
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.java
new file mode 100644
index 00000000000..3c19c0e6c5d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.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.
+ *
+ */
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.lang.instrument.Instrumentation;
+import java.security.ProtectionDomain;
+
+// This class is available on the classpath so it can be accessed by JavaAgentApp
+public class JavaAgentTransformer  implements ClassFileTransformer {
+    private static Instrumentation savedInstrumentation;
+
+    public static void premain(String agentArguments, Instrumentation instrumentation) {
+        System.out.println("JavaAgentTransformer.premain() is called");
+        instrumentation.addTransformer(new JavaAgentTransformer(), /*canRetransform=*/true);
+        savedInstrumentation = instrumentation;
+    }
+
+    public static Instrumentation getInstrumentation() {
+        return savedInstrumentation;
+    }
+
+    public static void agentmain(String args, Instrumentation inst) throws Exception {
+        premain(args, inst);
+    }
+
+    public byte[] transform(ClassLoader loader, String name, Class<?> classBeingRedefined,
+                            ProtectionDomain pd, byte[] buffer) throws IllegalClassFormatException {
+        if (name.equals("JavaAgentApp$ShouldBeTransformed")) {
+            System.out.println("Transforming: " + name + "; Class<?> = " + classBeingRedefined);
+            try {
+                replace(buffer, "XXXX", "YYYY");
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+            Thread.dumpStack();
+            return buffer;
+        }
+        return null;
+    }
+
+    static void replace(byte[] buffer, String from, String to) {
+        int n = Util.replace(buffer, from, to);
+        System.out.println("..... replaced " + n + " occurrence(s) of '" + from + "' to '" + to + "'");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.mf b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.mf
new file mode 100644
index 00000000000..f0b18566143
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/JavaAgentTransformer.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Premain-Class: JavaAgentTransformer
+Agent-Class: JavaAgentTransformer
+Can-Retransform-Classes: true
+Can-Redefine-Classes: true
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java
index a63b001863a..d280964c07d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/SimpleAgent.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
@@ -37,8 +37,13 @@ public static void premain(String agentArg, Instrumentation instrumentation) thr
             ClassFileTransformer transformer = new ClassFileTransformer() {
             @Override
             public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
-                 System.out.printf("%n Transforming %s", className);
-                 return Arrays.copyOf(classfileBuffer, classfileBuffer.length);
+                if (loader == SimpleAgent.class.getClassLoader()) {
+                    // Transform only classes loaded by the apploader.
+                    System.out.printf("%n Transforming %s", className);
+                    return Arrays.copyOf(classfileBuffer, classfileBuffer.length);
+                } else {
+                    return null;
+                }
                }
              };
              instrumentation.addTransformer(transformer);

From 5e50a584744d316dd881c9404f75e65f31bb0e75 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 14 May 2025 23:11:46 +0000
Subject: [PATCH 470/901] 8356838: AOT incorrectly sets a cached class's loader
 type to boot

Reviewed-by: ccheung, iveresov
---
 src/hotspot/share/cds/aotClassLocation.cpp    | 35 +++++++++
 src/hotspot/share/cds/aotClassLocation.hpp    |  6 ++
 src/hotspot/share/classfile/classLoader.cpp   | 32 ++++-----
 .../share/classfile/classLoaderExt.cpp        |  8 ++-
 .../share/classfile/classLoaderExt.hpp        |  2 +-
 .../AOTCacheSupportForCustomLoaders.java      | 71 +++++++++++++++++--
 .../modules/com.test/com/test/Foo.java        | 27 +++++++
 .../modules/com.test/module-info.java         | 27 +++++++
 8 files changed, 181 insertions(+), 27 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/com/test/Foo.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/module-info.java

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index 9df28d61bbc..a2a707e2608 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -1035,3 +1035,38 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
   }
   return success;
 }
+
+void AOTClassLocationConfig::print() {
+  if (CDSConfig::is_dumping_archive()) {
+    tty->print_cr("AOTClassLocationConfig::_dumptime_instance = %p", _dumptime_instance);
+    if (_dumptime_instance != nullptr) {
+      _dumptime_instance->print_on(tty);
+    }
+  }
+  if (CDSConfig::is_using_archive()) {
+    tty->print_cr("AOTClassLocationConfig::_runtime_instance = %p", _runtime_instance);
+    if (_runtime_instance != nullptr) {
+      _runtime_instance->print_on(tty);
+    }
+  }
+}
+
+void AOTClassLocationConfig::print_on(outputStream* st) const {
+  int n = class_locations()->length();
+  for (int i = 0; i < n; i++) {
+    const AOTClassLocation* cs = class_location_at(i);
+    const char* path;
+    if (i == 0) {
+      path = ClassLoader::get_jrt_entry()->name();
+    } else {
+      path = cs->path();
+    }
+    st->print_cr("[%d] = %s", i, path);
+    if (i == boot_cp_end_index() && i < n) {
+      st->print_cr("--- end of boot");
+    }
+    if (i == app_cp_end_index() && i < n) {
+      st->print_cr("--- end of app");
+    }
+  }
+}
diff --git a/src/hotspot/share/cds/aotClassLocation.hpp b/src/hotspot/share/cds/aotClassLocation.hpp
index 47f4dc86c98..f93bb899a4c 100644
--- a/src/hotspot/share/cds/aotClassLocation.hpp
+++ b/src/hotspot/share/cds/aotClassLocation.hpp
@@ -31,6 +31,7 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/ostream.hpp"
 
 class AllClassLocationStreams;
 class ClassLocationStream;
@@ -201,6 +202,9 @@ class AOTClassLocationConfig : public CHeapObj<mtClassShared> {
   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;
+
+  void print_on(outputStream* st) const;
+
 public:
   static AOTClassLocationConfig* dumptime() {
     assert(_dumptime_instance != nullptr, "can only be called when dumping an AOT cache");
@@ -268,6 +272,8 @@ class AOTClassLocationConfig : public CHeapObj<mtClassShared> {
   bool validate(bool has_aot_linked_classes, bool* has_extra_module_paths) const;
 
   bool is_valid_classpath_index(int classpath_index, InstanceKlass* ik);
+
+  static void print();
 };
 
 
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index d313c9b4c3b..cf7bca6a17a 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1200,10 +1200,20 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
     return;
   }
 
+  if (!SystemDictionaryShared::is_builtin_loader(ik->class_loader_data())) {
+    // A class loaded by a user-defined classloader.
+    assert(ik->shared_classpath_index() < 0, "not assigned yet");
+    ik->set_shared_classpath_index(UNREGISTERED_INDEX);
+    SystemDictionaryShared::set_shared_class_misc_info(ik, (ClassFileStream*)stream);
+    return;
+  }
+
   assert(has_jrt_entry(), "CDS dumping does not support exploded JDK build");
 
   ResourceMark rm(current);
   int classpath_index = -1;
+  bool found_invalid = false;
+
   PackageEntry* pkg_entry = ik->package();
 
   if (!AOTClassLocationConfig::dumptime_is_ready()) {
@@ -1218,7 +1228,6 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
     // must be valid since the class has been successfully parsed.
     const char* path = ClassLoader::uri_to_path(src);
     assert(path != nullptr, "sanity");
-    bool found_invalid = false;
     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.
@@ -1245,8 +1254,6 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
               if (loader != nullptr) {
                 // Probably loaded by jdk/internal/loader/ClassLoaders$BootClassLoader. Don't archive
                 // such classes.
-                ik->set_shared_classpath_index(-1);
-                ik->set_shared_class_loader_type(ClassLoader::BOOT_LOADER);
                 found_invalid = true;
               } else {
                 classpath_index = i;
@@ -1262,31 +1269,22 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
         }
       }
       if (classpath_index >= 0 || found_invalid) {
-        return false; // quit iterating
+        return false; // Break the AOTClassLocationConfig::dumptime_iterate() loop.
       } else {
         return true; // Keep iterating
       }
     });
+  }
 
-    if (found_invalid) {
-      return;
-    }
-
-    // No path entry found for this class: most likely a shared class loaded by the
-    // user defined classloader.
-    if (classpath_index < 0 && !SystemDictionaryShared::is_builtin_loader(ik->class_loader_data())) {
-      assert(ik->shared_classpath_index() < 0, "not assigned yet");
-      ik->set_shared_classpath_index(UNREGISTERED_INDEX);
-      SystemDictionaryShared::set_shared_class_misc_info(ik, (ClassFileStream*)stream);
-      return;
-    }
+  if (found_invalid) {
+    assert(classpath_index == -1, "sanity");
   }
 
   const char* const class_name = ik->name()->as_C_string();
   const char* const file_name = file_name_for_class_name(class_name,
                                                          ik->name()->utf8_length());
   assert(file_name != nullptr, "invariant");
-  ClassLoaderExt::record_result(checked_cast<s2>(classpath_index), ik, redefined);
+  ClassLoaderExt::record_result_for_builtin_loader(checked_cast<s2>(classpath_index), ik, redefined);
 }
 
 void ClassLoader::record_hidden_class(InstanceKlass* ik) {
diff --git a/src/hotspot/share/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp
index fb635133537..f3f27d7768e 100644
--- a/src/hotspot/share/classfile/classLoaderExt.cpp
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp
@@ -67,18 +67,20 @@ int ClassLoaderExt::compare_module_names(const char** p1, const char** p2) {
   return strcmp(*p1, *p2);
 }
 
-void ClassLoaderExt::record_result(s2 classpath_index, InstanceKlass* result, bool redefined) {
+void ClassLoaderExt::record_result_for_builtin_loader(s2 classpath_index, InstanceKlass* result, bool redefined) {
   assert(CDSConfig::is_dumping_archive(), "sanity");
 
-  // We need to remember where the class comes from during dumping.
   oop loader = result->class_loader();
-  s2 classloader_type = ClassLoader::BOOT_LOADER;
+  s2 classloader_type;
   if (SystemDictionary::is_system_class_loader(loader)) {
     classloader_type = ClassLoader::APP_LOADER;
     AOTClassLocationConfig::dumptime_set_has_app_classes();
   } else if (SystemDictionary::is_platform_class_loader(loader)) {
     classloader_type = ClassLoader::PLATFORM_LOADER;
     AOTClassLocationConfig::dumptime_set_has_platform_classes();
+  } else {
+    precond(loader == nullptr);
+    classloader_type = ClassLoader::BOOT_LOADER;
   }
 
   if (CDSConfig::is_dumping_preimage_static_archive() || CDSConfig::is_dumping_dynamic_archive()) {
diff --git a/src/hotspot/share/classfile/classLoaderExt.hpp b/src/hotspot/share/classfile/classLoaderExt.hpp
index f4a1cf1a9c7..ee6b59bde14 100644
--- a/src/hotspot/share/classfile/classLoaderExt.hpp
+++ b/src/hotspot/share/classfile/classLoaderExt.hpp
@@ -40,7 +40,7 @@ class ClassLoaderExt: public ClassLoader { // AllStatic
   static void append_boot_classpath(ClassPathEntry* new_entry);
 
   static int compare_module_names(const char** p1, const char** p2);
-  static void record_result(s2 classpath_index, InstanceKlass* result, bool redefined);
+  static void record_result_for_builtin_loader(s2 classpath_index, InstanceKlass* result, bool redefined);
 #endif // INCLUDE_CDS
 };
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
index 50505502217..1fec4dc3e23 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
@@ -25,7 +25,7 @@
 /*
  * @test
  * @summary Test AOT cache support for array classes in custom class loaders.
- * @bug 8353298
+ * @bug 8353298 8356838
  * @requires vm.cds.supports.aot.class.linking
  * @comment work around JDK-8345635
  * @requires !vm.jvmci.enabled
@@ -37,20 +37,36 @@
  * @run driver AOTCacheSupportForCustomLoaders AOT
  */
 
+import java.lang.module.Configuration;
+import java.lang.module.ModuleFinder;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Set;
+import jdk.test.lib.cds.CDSJarUtils;
+import jdk.test.lib.cds.CDSModulePackager;
 import jdk.test.lib.cds.SimpleCDSAppTester;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class AOTCacheSupportForCustomLoaders {
+    static final Path SRC = Paths.get(System.getProperty("test.src")).resolve("modules");
+
     public static void main(String... args) throws Exception {
+        CDSModulePackager modulePackager = new CDSModulePackager(SRC);
+        String modulePath = modulePackager.getOutputDir().toString();
+        modulePackager.createModularJar("com.test");
+
         SimpleCDSAppTester.of("AOTCacheSupportForCustomLoaders")
             .classpath("app.jar")
-            .addVmArgs("-Xlog:cds+class=debug", "-Xlog:cds")
-            .appCommandLine("AppWithCustomLoaders")
+            .addVmArgs("-Xlog:cds+class=debug", "-Xlog:cds",
+                       "--module-path=" + modulePath,
+                       "--add-modules=com.test")
+            .appCommandLine("AppWithCustomLoaders", modulePath)
             .setAssemblyChecker((OutputAnalyzer out) -> {
                     out.shouldMatch("cds,class.*unreg AppWithCustomLoaders[$]MyLoadeeA")
+                       .shouldMatch("cds,class.*unreg com.test.Foo")
                        .shouldMatch("cds,class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;")
                        .shouldNotMatch("cds,class.* ReturnIntegerAsString");
                 })
@@ -67,11 +83,21 @@ public static void main(String args[]) throws Exception {
         URL[] urls = new URL[] {custJar.toURI().toURL()};
         MyLoader loader = new MyLoader(urls, AppWithCustomLoaders.class.getClassLoader());
 
-        // Test 1: array class of MyLoadeeA (JDK-8353298)
+        test1(loader);
+        test2(loader);
+        test3(args[0]);
+
+        // TODO: more test cases JDK-8354557
+    }
+
+    // Test 1: array class of MyLoadeeA (JDK-8353298)
+    static void test1(MyLoader loader) throws Exception {
         Class klass = loader.loadClass("AppWithCustomLoaders$MyLoadeeA");
         klass.newInstance();
+    }
 
-        // Test 2: VerificationType::is_reference_assignable_from() cannot be skipped (JDK-8356407)
+    // Test 2: VerificationType::is_reference_assignable_from() cannot be skipped (JDK-8356407)
+    static void test2(MyLoader loader) throws Exception {
         try {
             Class bad = loader.loadClass("ReturnIntegerAsString");
             Object o = bad.newInstance(); // force verification
@@ -80,8 +106,41 @@ public static void main(String args[]) throws Exception {
         } catch (VerifyError ve) {
             System.out.println("Expected: " + ve);
         }
+    }
 
-        // TODO: more test cases JDK-8354557
+    // Test 3: custom loader defines a class from the exact location as a class defined in the boot layer.
+    static void test3(String modulePath) throws Exception {
+        Class<?> c0 = Class.forName("com.test.Foo");
+        System.out.println(c0);
+        System.out.println(System.identityHashCode(c0.getModule()));
+        System.out.println(c0.getModule().getName());
+        System.out.println(c0.getClassLoader());
+
+        // Regression test for JDK-8356838
+        //
+        // We create a new layer that loads the com.test module from the modulePath into
+        // a different class loader.
+        ModuleFinder finder = ModuleFinder.of(Paths.get(modulePath));
+        ModuleLayer parent = ModuleLayer.boot();
+        Configuration cf = parent.configuration().resolve(finder, ModuleFinder.of(), Set.of("com.test"));
+        ClassLoader scl = ClassLoader.getSystemClassLoader();
+        ModuleLayer layer = parent.defineModulesWithOneLoader(cf, scl);
+        Class<?> c1 = layer.findLoader("com.test").loadClass("com.test.Foo");
+
+        System.out.println(c1);
+        System.out.println(System.identityHashCode(c1.getModule()));
+        System.out.println(c1.getModule().getName());
+        System.out.println(c1.getClassLoader());
+
+        if (!c1.getModule().getName().equals("com.test")) {
+            throw new RuntimeException("Unexpected module: " + c1.getModule());
+        }
+        if (c1.getModule() == c0.getModule()) {
+            throw new RuntimeException("Unexpected module: " + c1.getModule());
+        }
+        if (c1.getClassLoader() == c0.getClassLoader()) {
+            throw new RuntimeException("Unexpected class loader: " + c1.getClassLoader());
+        }
     }
 
     public static class MyLoader extends URLClassLoader {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/com/test/Foo.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/com/test/Foo.java
new file mode 100644
index 00000000000..6f36f35d6c8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/com/test/Foo.java
@@ -0,0 +1,27 @@
+/*
+ * 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 com.test;
+
+public class Foo {}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/module-info.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/module-info.java
new file mode 100644
index 00000000000..ac055fbd0e7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/modules/com.test/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ *
+ */
+
+module com.test {
+  exports com.test;
+}

From dc881ee36900bc12bea9616a6078a1f3266c183d Mon Sep 17 00:00:00 2001
From: Arno Zeller <azeller@openjdk.org>
Date: Thu, 15 May 2025 07:50:28 +0000
Subject: [PATCH 471/901] 8354530: AIX: sporadic unexpected errno when calling
 setsockopt in Net.joinOrDrop

Reviewed-by: alanb, clanger
---
 src/java.base/unix/native/libnio/ch/Net.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/java.base/unix/native/libnio/ch/Net.c b/src/java.base/unix/native/libnio/ch/Net.c
index 578c38a3b2f..98445c93731 100644
--- a/src/java.base/unix/native/libnio/ch/Net.c
+++ b/src/java.base/unix/native/libnio/ch/Net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, 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
@@ -671,6 +671,16 @@ Java_sun_nio_ch_Net_joinOrDrop4(JNIEnv *env, jobject this, jboolean join, jobjec
         n = setsockopt(fdval(env,fdo), IPPROTO_IP, opt, optval, optlen);
     }
 #endif
+#ifdef _AIX
+    // workaround AIX bug where IP_ADD_MEMBERSHIP fails intermittently
+    if (n < 0 && errno == EAGAIN) {
+        int countdown = 3;
+        while (n < 0 && errno == EAGAIN && countdown > 0) {
+            n = setsockopt(fdval(env,fdo), IPPROTO_IP, opt, optval, optlen);
+            countdown--;
+        }
+    }
+#endif
 
     if (n < 0) {
         if (join && (errno == ENOPROTOOPT || errno == EOPNOTSUPP))

From e557b6956bdf9b0d89ad69427c7b4a97a65868ea Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 15 May 2025 07:57:14 +0000
Subject: [PATCH 472/901] 8356843: Avoid redundant HashMap.get to obtain old
 value in Toolkit.setDesktopProperty

Reviewed-by: aivanov, serb
---
 src/java.desktop/share/classes/java/awt/Toolkit.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index 3d9d781de33..b93f9e98fde 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 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
@@ -1472,8 +1472,7 @@ protected final void setDesktopProperty(String name, Object newValue) {
         Object oldValue;
 
         synchronized (this) {
-            oldValue = desktopProperties.get(name);
-            desktopProperties.put(name, newValue);
+            oldValue = desktopProperties.put(name, newValue);
         }
 
         // Don't fire change event if old and new values are null.

From b8d2bdb46529f780b4c21d709ca38b489348ee10 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 15 May 2025 08:03:44 +0000
Subject: [PATCH 473/901] 8355743: G1: Collection set clearing is not recorded
 as part of "Free Collection Set Time"

Reviewed-by: iwalulya, shade
---
 src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index 4dfa026e420..3e8f1bbba64 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -881,10 +881,10 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
     }
     FREE_C_HEAP_ARRAY(FreeCSetStats, _worker_stats);
 
+    _g1h->clear_collection_set();
+
     G1GCPhaseTimes* p = _g1h->phase_times();
     p->record_serial_free_cset_time_ms((Ticks::now() - serial_time).seconds() * 1000.0);
-
-    _g1h->clear_collection_set();
   }
 
   double worker_cost() const override { return G1CollectedHeap::heap()->collection_set()->region_length(); }

From 13b3541467aa91c2e0ad4da70efdb25b7334d3fe Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Thu, 15 May 2025 09:20:56 +0000
Subject: [PATCH 474/901] 8356866: Cleanup hotspot/jtreg/ProblemList.txt

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

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index deab959c94e..827b9cf7b7b 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -47,7 +47,8 @@ compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-
 
 compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
 
-compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+compiler/runtime/Test8168712.java#with-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+compiler/runtime/Test8168712.java#without-dtrace 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
 compiler/loopopts/TestUnreachableInnerLoop.java 8288981 linux-s390x
 
 compiler/c2/Test8004741.java 8235801 generic-all
@@ -88,7 +89,6 @@ gc/g1/logging/TestG1LoggingFailure.java 8169634 generic-all
 gc/g1/humongousObjects/TestHeapCounters.java 8178918 generic-all
 gc/TestAllocHumongousFragment.java#adaptive 8298781 generic-all
 gc/TestAllocHumongousFragment.java#aggressive 8298781 generic-all
-gc/TestAllocHumongousFragment.java#iu-aggressive 8298781 generic-all
 gc/TestAllocHumongousFragment.java#g1 8298781 generic-all
 gc/TestAllocHumongousFragment.java#static 8298781 generic-all
 gc/TestAlwaysPreTouchBehavior.java#ParallelCollector 8334513 generic-all

From 883e52aa105727f4bc852d1497e049b689695152 Mon Sep 17 00:00:00 2001
From: Aleksei Voitylov <avoitylov@openjdk.org>
Date: Thu, 15 May 2025 11:06:22 +0000
Subject: [PATCH 475/901] 8353237: [AArch64] Incorrect result of
 VectorizedHashCode intrinsic on Cortex-A53

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp | 8 +++++++-
 src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp     | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 585812a99ee..914967e4009 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -107,7 +107,8 @@ address C2_MacroAssembler::arrays_hashcode(Register ary, Register cnt, Register
   assert(is_power_of_2(unroll_factor), "can't use this value to calculate the jump target PC");
   andr(tmp2, cnt, unroll_factor - 1);
   adr(tmp1, BR_BASE);
-  sub(tmp1, tmp1, tmp2, ext::sxtw, 3);
+  // For Cortex-A53 offset is 4 because 2 nops are generated.
+  sub(tmp1, tmp1, tmp2, ext::sxtw, VM_Version::supports_a53mac() ? 4 : 3);
   movw(tmp2, 0x1f);
   br(tmp1);
 
@@ -115,6 +116,11 @@ address C2_MacroAssembler::arrays_hashcode(Register ary, Register cnt, Register
   for (size_t i = 0; i < unroll_factor; ++i) {
     load(tmp1, Address(post(ary, type2aelembytes(eltype))), eltype);
     maddw(result, result, tmp2, tmp1);
+    // maddw generates an extra nop for Cortex-A53 (see maddw definition in macroAssembler).
+    // Generate 2nd nop to have 4 instructions per iteration.
+    if (VM_Version::supports_a53mac()) {
+      nop();
+    }
   }
   bind(BR_BASE);
   subsw(cnt, cnt, unroll_factor);
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 0843489900c..beaa2510423 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -8109,7 +8109,8 @@ class StubGenerator: public StubCodeGenerator {
     __ andr(rscratch2, cnt, vf - 1);
     __ bind(TAIL_SHORTCUT);
     __ adr(rscratch1, BR_BASE);
-    __ sub(rscratch1, rscratch1, rscratch2, ext::uxtw, 3);
+    // For Cortex-A53 offset is 4 because 2 nops are generated.
+    __ sub(rscratch1, rscratch1, rscratch2, ext::uxtw, VM_Version::supports_a53mac() ? 4 : 3);
     __ movw(rscratch2, 0x1f);
     __ br(rscratch1);
 
@@ -8117,6 +8118,11 @@ class StubGenerator: public StubCodeGenerator {
       __ load(rscratch1, Address(__ post(ary, type2aelembytes(eltype))),
                                    eltype);
       __ maddw(result, result, rscratch2, rscratch1);
+      // maddw generates an extra nop for Cortex-A53 (see maddw definition in macroAssembler).
+      // Generate 2nd nop to have 4 instructions per iteration.
+      if (VM_Version::supports_a53mac()) {
+        __ nop();
+      }
     }
     __ bind(BR_BASE);
 

From 1d36f173c4e924d5049f153eceb13b09e7adebab Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 15 May 2025 12:04:17 +0000
Subject: [PATCH 476/901] 8351232: NPE: Cannot invoke
 "getDeclarationAttributes" because "sym" is null

Reviewed-by: liach
---
 test/langtools/tools/javac/8351232/Anno.java  | 28 +++++++++
 test/langtools/tools/javac/8351232/Cls.java   | 37 +++++++++++
 test/langtools/tools/javac/8351232/Intf1.java | 28 +++++++++
 test/langtools/tools/javac/8351232/Intf2.java | 25 ++++++++
 .../tools/javac/8351232/TestClass.java        | 32 ++++++++++
 .../8351232/TypeAnnotationSymNullTest.java    | 63 +++++++++++++++++++
 6 files changed, 213 insertions(+)
 create mode 100644 test/langtools/tools/javac/8351232/Anno.java
 create mode 100644 test/langtools/tools/javac/8351232/Cls.java
 create mode 100644 test/langtools/tools/javac/8351232/Intf1.java
 create mode 100644 test/langtools/tools/javac/8351232/Intf2.java
 create mode 100644 test/langtools/tools/javac/8351232/TestClass.java
 create mode 100644 test/langtools/tools/javac/8351232/TypeAnnotationSymNullTest.java

diff --git a/test/langtools/tools/javac/8351232/Anno.java b/test/langtools/tools/javac/8351232/Anno.java
new file mode 100644
index 00000000000..592467c13eb
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/Anno.java
@@ -0,0 +1,28 @@
+/*
+ * 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.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE_USE)
+public @interface Anno {}
diff --git a/test/langtools/tools/javac/8351232/Cls.java b/test/langtools/tools/javac/8351232/Cls.java
new file mode 100644
index 00000000000..192f0d156b4
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/Cls.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+public class Cls<K, V> {
+
+  public static Cls<Object, Object> newInstance() {
+    return new Cls<>();
+  }
+
+  public <K1 extends K, V1 extends @Anno V> V1 doSomething(Intf1 arg) {
+      throw new UnsupportedOperationException();
+  }
+
+  public <K1 extends K, V1 extends @Anno V> V1 doSomething(Intf2 arg) {
+      throw new UnsupportedOperationException();
+  }
+}
diff --git a/test/langtools/tools/javac/8351232/Intf1.java b/test/langtools/tools/javac/8351232/Intf1.java
new file mode 100644
index 00000000000..d35841edb8e
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/Intf1.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+public interface Intf1 {
+
+    Object foo(Object bar);
+
+}
diff --git a/test/langtools/tools/javac/8351232/Intf2.java b/test/langtools/tools/javac/8351232/Intf2.java
new file mode 100644
index 00000000000..5fcc5ad008b
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/Intf2.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+public interface Intf2 extends Intf1 {
+}
diff --git a/test/langtools/tools/javac/8351232/TestClass.java b/test/langtools/tools/javac/8351232/TestClass.java
new file mode 100644
index 00000000000..f4fce90bb73
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/TestClass.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+public class TestClass {
+  void test() {
+    Cls.newInstance()
+        .<Void, Void>doSomething(
+            image -> {
+              return;
+            });
+  }
+}
diff --git a/test/langtools/tools/javac/8351232/TypeAnnotationSymNullTest.java b/test/langtools/tools/javac/8351232/TypeAnnotationSymNullTest.java
new file mode 100644
index 00000000000..2c32d599cfe
--- /dev/null
+++ b/test/langtools/tools/javac/8351232/TypeAnnotationSymNullTest.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 8351232
+ * @summary NPE when type annotation missing on classpath
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ */
+
+import java.io.File;
+import com.sun.tools.javac.api.*;
+
+public class TypeAnnotationSymNullTest {
+    public static void main(String[] args) {
+        File testSrc = new File(System.getProperty("test.src", "."));
+
+        File ANNO = new File("ANNO");
+        ANNO.mkdirs();
+
+        // first, compile Anno to the ANNO directory
+        compile(0, "-d", ANNO.getPath(), new File(testSrc, "Anno.java").getPath());
+
+        File CLP = new File("CLP");
+        CLP.mkdirs();
+
+        // second, compile Cls, Intf1 and Intf2 to the CLP directory with ANNO on classpath
+        compile(0, "-cp", ANNO.getPath(), "-d", CLP.getPath(), new File(testSrc, "Cls.java").getPath(),
+                                                            new File(testSrc, "Intf1.java").getPath(),
+                                                            new File(testSrc, "Intf2.java").getPath());
+
+        // now compile TestClass with CLP on classpath (but Anno.class missing)
+        // compilation fails (exit code 1) but should not get NPE from compiler (exit code 4)
+        compile(1, "-cp", CLP.getPath(), "-d", ".", new File(testSrc, "TestClass.java").getPath());
+    }
+
+    private static void compile(int expectedExit, String... args) {
+        int exitCode = JavacTool.create().run(null, null, null, args);
+        if (exitCode != expectedExit) {
+            throw new AssertionError("test compilation failed with exit code: " + exitCode);
+        }
+    }
+}

From 5cb231714f364064bb5a59db8eb07d43823478eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Thu, 15 May 2025 12:54:49 +0000
Subject: [PATCH 477/901] 8351568: Improve source code documentation for
 PhaseCFG::insert_anti_dependences

Reviewed-by: rcastanedalo, chagedorn
---
 src/hotspot/share/adlc/output_h.cpp           |   2 +-
 src/hotspot/share/opto/block.hpp              |   6 +-
 src/hotspot/share/opto/gcm.cpp                | 427 ++++++++++++------
 src/hotspot/share/opto/lcm.cpp                |   4 +-
 .../TestAntiDependenciesHighMemUsage.java     |   2 +-
 .../TestAntiDependenciesHighMemUsage2.java    |   2 +-
 ...TestSplitIfPinnedLoadInStripMinedLoop.java |   4 +-
 7 files changed, 295 insertions(+), 152 deletions(-)

diff --git a/src/hotspot/share/adlc/output_h.cpp b/src/hotspot/share/adlc/output_h.cpp
index dd149064a5a..b62bc43791f 100644
--- a/src/hotspot/share/adlc/output_h.cpp
+++ b/src/hotspot/share/adlc/output_h.cpp
@@ -1962,7 +1962,7 @@ void ArchDesc::declareClasses(FILE *fp) {
     else if( instr->is_ideal_box() ) {
       // BoxNode provides the address of a stack slot.
       // Define its bottom type to be TypeRawPtr::BOTTOM instead of TypePtr::BOTTOM
-      // This prevent s insert_anti_dependencies from complaining. It will
+      // This prevents raise_above_anti_dependences from complaining. It will
       // complain if it sees that the pointer base is TypePtr::BOTTOM since
       // it doesn't understand what that might alias.
       fprintf(fp,"  const Type            *bottom_type() const { return TypeRawPtr::BOTTOM; } // Box?\n");
diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp
index 5baa72dfffb..66ce1f51f24 100644
--- a/src/hotspot/share/opto/block.hpp
+++ b/src/hotspot/share/opto/block.hpp
@@ -210,7 +210,7 @@ class Block : public CFGElement {
   uint _freg_pressure;
   uint _fhrp_index;
 
-  // Mark and visited bits for an LCA calculation in insert_anti_dependences.
+  // Mark and visited bits for an LCA calculation in raise_above_anti_dependences.
   // Since they hold unique node indexes, they do not need reinitialization.
   node_idx_t _raise_LCA_mark;
   void    set_raise_LCA_mark(node_idx_t x)    { _raise_LCA_mark = x; }
@@ -487,10 +487,10 @@ class PhaseCFG : public Phase {
   // Used when building the CFG and creating end nodes for blocks.
   MachNode* _goto;
 
-  Block* insert_anti_dependences(Block* LCA, Node* load, bool verify = false);
+  Block* raise_above_anti_dependences(Block* LCA, Node* load, bool verify = false);
   void verify_anti_dependences(Block* LCA, Node* load) const {
     assert(LCA == get_block_for_node(load), "should already be scheduled");
-    const_cast<PhaseCFG*>(this)->insert_anti_dependences(LCA, load, true);
+    const_cast<PhaseCFG*>(this)->raise_above_anti_dependences(LCA, load, true);
   }
 
   bool move_to_next(Block* bx, uint b_index);
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index a8080d5adb9..6576196268e 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -456,6 +456,7 @@ static Block* raise_LCA_above_use(Block* LCA, Node* use, Node* def, const PhaseC
 // of all marked blocks.  If there are none marked, return the original
 // LCA.
 static Block* raise_LCA_above_marks(Block* LCA, node_idx_t mark, Block* early, const PhaseCFG* cfg) {
+  assert(early->dominates(LCA), "precondition failed");
   Block_List worklist;
   worklist.push(LCA);
   while (worklist.size() > 0) {
@@ -470,7 +471,7 @@ static Block* raise_LCA_above_marks(Block* LCA, node_idx_t mark, Block* early, c
       // Raise the LCA.
       LCA = mid->dom_lca(LCA);
       if (LCA == early)  break;   // stop searching everywhere
-      assert(early->dominates(LCA), "early is high enough");
+      assert(early->dominates(LCA), "unsound LCA update");
       // Resume searching at that point, skipping intermediate levels.
       worklist.push(LCA);
       if (LCA == mid)
@@ -543,7 +544,7 @@ static Block* memory_early_block(Node* load, Block* early, const PhaseCFG* cfg)
   return early;
 }
 
-// This function is used by insert_anti_dependences to find unrelated loads for stores in implicit null checks.
+// This function is used by raise_above_anti_dependences to find unrelated loads for stores in implicit null checks.
 bool PhaseCFG::unrelated_load_in_store_null_block(Node* store, Node* load) {
   // We expect an anti-dependence edge from 'load' to 'store', except when
   // implicit_null_check() has hoisted 'store' above its early block to
@@ -597,7 +598,7 @@ class DefUseMemStatesQueue : public StackObj {
     // def_mem is one of the inputs of use_phi and at least one input of use_phi is
     // not def_mem. It's however possible that use_phi has def_mem as input multiple
     // times. If that happens, use_phi is recorded as a use of def_mem multiple
-    // times as well. When PhaseCFG::insert_anti_dependences() goes over
+    // times as well. When PhaseCFG::raise_above_anti_dependences() goes over
     // uses of def_mem and enqueues them for processing, use_phi would then be
     // enqueued for processing multiple times when it only needs to be
     // processed once. The code below checks if use_phi as a use of def_mem was
@@ -662,23 +663,67 @@ class DefUseMemStatesQueue : public StackObj {
   }
 };
 
-//--------------------------insert_anti_dependences---------------------------
-// A load may need to witness memory that nearby stores can overwrite.
-// For each nearby store, either insert an "anti-dependence" edge
-// from the load to the store, or else move LCA upward to force the
-// load to (eventually) be scheduled in a block above the store.
+// Enforce a scheduling of the given 'load' that ensures anti-dependent stores
+// do not overwrite the load's input memory state before the load executes.
 //
-// Do not add edges to stores on distinct control-flow paths;
-// only add edges to stores which might interfere.
+// The given 'load' has a current scheduling range in the dominator tree that
+// starts at the load's early block (computed in schedule_early) and ends at
+// the given 'LCA' block for the load. However, there may still exist
+// anti-dependent stores between the early block and the LCA that overwrite
+// memory that the load must witness. For such stores, we must
 //
-// Return the (updated) LCA.  There will not be any possibly interfering
-// store between the load's "early block" and the updated LCA.
-// Any stores in the updated LCA will have new precedence edges
-// back to the load.  The caller is expected to schedule the load
-// in the LCA, in which case the precedence edges will make LCM
-// preserve anti-dependences.  The caller may also hoist the load
-// above the LCA, if it is not the early block.
-Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
+//   1. raise the load's LCA to force the load to (eventually) be scheduled at
+//      latest in the store's block, and
+//   2. if the load may get scheduled in the store's block, additionally insert
+//      an anti-dependence edge (i.e., precedence edge) from the load to the
+//      store to ensure LCM schedules the load before the store within the
+//      block.
+//
+// For a given store, we say that the store is on a _distinct_ control-flow
+// path relative to the load if there are no paths from early to LCA that go
+// through the store's block. Such stores are not anti-dependent, and there is
+// no need to update the LCA nor to add anti-dependence edges.
+//
+// Due to the presence of loops, we must also raise the LCA above
+// anti-dependent memory Phis. We defer the details (see later comments in the
+// method) and for now look at an example without loops.
+//
+//          CFG               DOMINATOR TREE
+//
+//       B1 (early,L)              B1
+//       |\________                /\\___
+//       |         \              /  \   \
+//       B2 (L,S)   \            B2  B7  B6
+//      /  \         \           /\\___
+//     B3  B4 (S)    B7 (S)     /  \   \
+//      \  /         /         B3  B4  B5
+//       B5 (LCA,L) /
+//        \    ____/
+//         \  /
+//          B6
+//
+// Here, the load's scheduling range when calling raise_above_anti_dependences
+// is between early and LCA in the dominator tree, i.e., in block B1, B2, or B5
+// (indicated with "L"). However, there are a number of stores (indicated with
+// "S") that overwrite the memory which the load must witness. First, consider
+// the store in B4. We cannot legally schedule the load in B4, so an
+// anti-dependence edge is redundant. However, we must raise the LCA above
+// B4, which means that the updated LCA is B2. Now, consider the store in B2.
+// The LCA is already B2, so we do not need to raise it any further.
+// If we, eventually, decide to schedule the load in B2, it could happen that
+// LCM decides to place the load after the anti-dependent store in B2.
+// Therefore, we now need to add an anti-dependence edge between the load and
+// the B2 store, ensuring that the load is scheduled before the store. Finally,
+// the store in B7 is on a distinct control-flow path. Therefore, B7 requires
+// no action.
+//
+// The raise_above_anti_dependences method returns the updated LCA and ensures
+// there are no anti-dependent stores in any block between the load's early
+// block and the updated LCA. Any stores in the updated LCA will have new
+// anti-dependence edges back to the load. The caller may schedule the load in
+// the updated LCA, or it may hoist the load above the updated LCA, if the
+// updated LCA is not the early block.
+Block* PhaseCFG::raise_above_anti_dependences(Block* LCA, Node* load, const bool verify) {
   ResourceMark rm;
   assert(load->needs_anti_dependence_check(), "must be a load of some sort");
   assert(LCA != nullptr, "");
@@ -711,16 +756,16 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
 
   node_idx_t load_index = load->_idx;
 
-  // Note the earliest legal placement of 'load', as determined by
-  // by the unique point in the dom tree where all memory effects
-  // and other inputs are first available.  (Computed by schedule_early.)
-  // For normal loads, 'early' is the shallowest place (dom graph wise)
-  // to look for anti-deps between this load and any store.
+  // Record the earliest legal placement of 'load', as determined by the unique
+  // point in the dominator tree where all memory effects and other inputs are
+  // first available (computed by schedule_early). For normal loads, 'early' is
+  // the shallowest place (dominator-tree wise) to look for anti-dependences
+  // between this load and any store.
   Block* early = get_block_for_node(load);
 
   // If we are subsuming loads, compute an "early" block that only considers
-  // memory or address inputs. This block may be different than the
-  // schedule_early block in that it could be at an even shallower depth in the
+  // memory or address inputs. This block may be different from the
+  // schedule_early block when it is at an even shallower depth in the
   // dominator tree, and allow for a broader discovery of anti-dependences.
   if (C->subsume_loads()) {
     early = memory_early_block(load, early, this);
@@ -729,29 +774,47 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
     }
   }
 
+  assert(early->dominates(LCA_orig), "precondition failed");
+
   ResourceArea* area = Thread::current()->resource_area();
-  DefUseMemStatesQueue worklist_def_use_mem_states(area); // prior memory state to store and possible-def to explore
-  Node_List non_early_stores(area); // all relevant stores outside of early
-  bool must_raise_LCA = false;
-
-  // 'load' uses some memory state; look for users of the same state.
-  // Recurse through MergeMem nodes to the stores that use them.
-
-  // Each of these stores is a possible definition of memory
-  // that 'load' needs to use.  We need to force 'load'
-  // to occur before each such store.  When the store is in
-  // the same block as 'load', we insert an anti-dependence
-  // edge load->store.
-
-  // The relevant stores "nearby" the load consist of a tree rooted
-  // at initial_mem, with internal nodes of type MergeMem.
-  // Therefore, the branches visited by the worklist are of this form:
-  //    initial_mem -> (MergeMem ->)* Memory state modifying node
-  // Memory state modifying nodes include Store and Phi nodes and any node for which needs_anti_dependence_check()
-  // returns false.
-  // The anti-dependence constraints apply only to the fringe of this tree.
 
+  // Bookkeeping of possibly anti-dependent stores that we find outside the
+  // early block and that may need anti-dependence edges. Note that stores in
+  // non_early_stores are not necessarily dominated by early. The search starts
+  // from initial_mem, which can reside in a block that dominates early, and
+  // therefore, stores we find may be in blocks that are on completely distinct
+  // control-flow paths compared to early. However, in the end, only stores in
+  // blocks dominated by early matter. The reason for bookkeeping not only
+  // relevant stores is efficiency: we lazily record all possible
+  // anti-dependent stores and add anti-dependence edges only to the relevant
+  // ones at the very end of this method when we know the final updated LCA.
+  Node_List non_early_stores(area);
+
+  // Whether we must raise the LCA after the main worklist loop below.
+  bool must_raise_LCA_above_marks = false;
+
+  // The input load uses some memory state (initial_mem).
   Node* initial_mem = load->in(MemNode::Memory);
+  // To find anti-dependences we must look for users of the same memory state.
+  // To do this, we search the memory graph downwards from initial_mem. During
+  // this search, we encounter different types of nodes that we handle
+  // according to the following three categories:
+  //
+  // - MergeMems
+  // - Memory-state-modifying nodes (informally referred to as "stores" above
+  //   and below)
+  // - Memory Phis
+  //
+  // MergeMems do not modify the memory state. Anti-dependent stores or memory
+  // Phis may, however, exist downstream of MergeMems. Therefore, we must
+  // permit the search to continue through MergeMems. Stores may raise the LCA
+  // and may potentially also require an anti-dependence edge. Memory Phis may
+  // raise the LCA but never require anti-dependence edges. See the comments
+  // throughout the worklist loop below for further details.
+  //
+  // It may be useful to think of the anti-dependence search as traversing a
+  // tree rooted at initial_mem, with internal nodes of type MergeMem and
+  // memory Phis and stores as (potentially repeated) leaves.
 
   // We don't optimize the memory graph for pinned loads, so we may need to raise the
   // root of our search tree through the corresponding slices of MergeMem nodes to
@@ -767,14 +830,32 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
       }
     }
   }
-  worklist_def_use_mem_states.push(nullptr, initial_mem);
-  while (worklist_def_use_mem_states.is_nonempty()) {
-    // Examine a nearby store to see if it might interfere with our load.
-    Node* def_mem_state = worklist_def_use_mem_states.top_def();
-    Node* use_mem_state = worklist_def_use_mem_states.top_use();
-    worklist_def_use_mem_states.pop();
-
-    uint op = use_mem_state->Opcode();
+  // To administer the search, we use a worklist consisting of (def,use)-pairs
+  // of memory states, corresponding to edges in the search tree (and edges
+  // in the memory graph). We need to keep track of search tree edges in the
+  // worklist rather than individual nodes due to memory Phis (see details
+  // below).
+  DefUseMemStatesQueue worklist(area);
+  // We start the search at initial_mem and indicate the search root with the
+  // edge (nullptr, initial_mem).
+  worklist.push(nullptr, initial_mem);
+
+  // The worklist loop
+  while (worklist.is_nonempty()) {
+    // Pop the next edge from the worklist
+    Node* def_mem_state = worklist.top_def();
+    Node* use_mem_state = worklist.top_use();
+    worklist.pop();
+
+    // We are either
+    // - at the root of the search with the edge (nullptr, initial_mem),
+    // - just past initial_mem with the edge (initial_mem, use_mem_state), or
+    // - just past a MergeMem with the edge (MergeMem, use_mem_state).
+    assert(def_mem_state == nullptr || def_mem_state == initial_mem ||
+           def_mem_state->is_MergeMem(),
+           "unexpected memory state");
+
+    const uint op = use_mem_state->Opcode();
 
 #ifdef ASSERT
     // CacheWB nodes are peculiar in a sense that they both are anti-dependent and produce memory.
@@ -787,132 +868,179 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
     assert(!use_mem_state->needs_anti_dependence_check() || is_cache_wb, "no loads");
 #endif
 
-    // MergeMems do not directly have anti-deps.
-    // Treat them as internal nodes in a forward tree of memory states,
-    // the leaves of which are each a 'possible-def'.
-    if (use_mem_state == initial_mem    // root (exclusive) of tree we are searching
-        || op == Op_MergeMem    // internal node of tree we are searching
-        ) {
-      def_mem_state = use_mem_state;   // It's not a possibly interfering store.
-      if (use_mem_state == initial_mem)
-        initial_mem = nullptr;  // only process initial memory once
+    // If we are either at the search root or have found a MergeMem, we step
+    // past use_mem_state and populate the search worklist with edges
+    // (use_mem_state, child) for use_mem_state's children.
+    if (def_mem_state == nullptr // root (exclusive) of tree we are searching
+        || op == Op_MergeMem     // internal node of tree we are searching
+    ) {
+      def_mem_state = use_mem_state;
 
       for (DUIterator_Fast imax, i = def_mem_state->fast_outs(imax); i < imax; i++) {
         use_mem_state = def_mem_state->fast_out(i);
         if (use_mem_state->needs_anti_dependence_check()) {
-          // use_mem_state is also a kind of load (i.e. needs_anti_dependence_check), and it is not a memory state
-          // modifying node (store, Phi or MergeMem). Hence, load can't be anti dependent on this node.
+          // use_mem_state is also a kind of load (i.e.,
+          // needs_anti_dependence_check), and it is not a store nor a memory
+          // Phi. Hence, it is not anti-dependent on the load.
           continue;
         }
-        worklist_def_use_mem_states.push(def_mem_state, use_mem_state);
+        worklist.push(def_mem_state, use_mem_state);
       }
+      // Nothing more to do for the current (nullptr, initial_mem) or
+      // (initial_mem/MergeMem, MergeMem) edge, move on.
       continue;
     }
 
+    assert(!use_mem_state->is_MergeMem(),
+           "use_mem_state should be either a store or a memory Phi");
+
     if (op == Op_MachProj || op == Op_Catch)   continue;
 
-    // Compute the alias index.  Loads and stores with different alias
-    // indices do not need anti-dependence edges.  Wide MemBar's are
-    // anti-dependent on everything (except immutable memories).
+    // Compute the alias index. If the use_mem_state has an alias index
+    // different from the load's, it is not anti-dependent. Wide MemBar's
+    // are anti-dependent with everything (except immutable memories).
     const TypePtr* adr_type = use_mem_state->adr_type();
     if (!C->can_alias(adr_type, load_alias_idx))  continue;
 
     // Most slow-path runtime calls do NOT modify Java memory, but
     // they can block and so write Raw memory.
     if (use_mem_state->is_Mach()) {
-      MachNode* mstore = use_mem_state->as_Mach();
+      MachNode* muse = use_mem_state->as_Mach();
       if (load_alias_idx != Compile::AliasIdxRaw) {
         // Check for call into the runtime using the Java calling
         // convention (and from there into a wrapper); it has no
         // _method.  Can't do this optimization for Native calls because
         // they CAN write to Java memory.
-        if (mstore->ideal_Opcode() == Op_CallStaticJava) {
-          assert(mstore->is_MachSafePoint(), "");
-          MachSafePointNode* ms = (MachSafePointNode*) mstore;
+        if (muse->ideal_Opcode() == Op_CallStaticJava) {
+          assert(muse->is_MachSafePoint(), "");
+          MachSafePointNode* ms = (MachSafePointNode*)muse;
           assert(ms->is_MachCallJava(), "");
           MachCallJavaNode* mcj = (MachCallJavaNode*) ms;
           if (mcj->_method == nullptr) {
             // These runtime calls do not write to Java visible memory
-            // (other than Raw) and so do not require anti-dependence edges.
+            // (other than Raw) and so are not anti-dependent.
             continue;
           }
         }
         // Same for SafePoints: they read/write Raw but only read otherwise.
         // This is basically a workaround for SafePoints only defining control
         // instead of control + memory.
-        if (mstore->ideal_Opcode() == Op_SafePoint)
+        if (muse->ideal_Opcode() == Op_SafePoint) {
           continue;
+        }
       } else {
         // Some raw memory, such as the load of "top" at an allocation,
         // can be control dependent on the previous safepoint. See
         // comments in GraphKit::allocate_heap() about control input.
-        // Inserting an anti-dep between such a safepoint and a use
+        // Inserting an anti-dependence edge between such a safepoint and a use
         // creates a cycle, and will cause a subsequent failure in
         // local scheduling.  (BugId 4919904)
         // (%%% How can a control input be a safepoint and not a projection??)
-        if (mstore->ideal_Opcode() == Op_SafePoint && load->in(0) == mstore)
+        if (muse->ideal_Opcode() == Op_SafePoint && load->in(0) == muse) {
           continue;
+        }
       }
     }
 
-    // Identify a block that the current load must be above,
-    // or else observe that 'store' is all the way up in the
-    // earliest legal block for 'load'.  In the latter case,
-    // immediately insert an anti-dependence edge.
-    Block* store_block = get_block_for_node(use_mem_state);
-    assert(store_block != nullptr, "unused killing projections skipped above");
+    // Determine the block of the use_mem_state.
+    Block* use_mem_state_block = get_block_for_node(use_mem_state);
+    assert(use_mem_state_block != nullptr,
+           "unused killing projections skipped above");
+
+    // For efficiency, we take a lazy approach to both raising the LCA and
+    // adding anti-dependence edges. In this worklist loop, we only mark blocks
+    // which we must raise the LCA above (set_raise_LCA_mark), and keep
+    // track of nodes that potentially need anti-dependence edges
+    // (non_early_stores). The only exceptions to this are if we
+    // immediately see that we have to raise the LCA all the way to the early
+    // block, and if we find stores in the early block (which always need
+    // anti-dependence edges).
+    //
+    // After the worklist loop, we perform an efficient combined LCA-raising
+    // operation over all marks and only then add anti-dependence edges where
+    // strictly necessary according to the new raised LCA.
 
     if (use_mem_state->is_Phi()) {
-      // Loop-phis need to raise load before input. (Other phis are treated
-      // as store below.)
+      // We have reached a memory Phi node. On our search from initial_mem to
+      // the Phi, we have found no anti-dependences (otherwise, we would have
+      // already terminated the search along this branch). Consider the example
+      // below, indicating a Phi node and its node inputs (we omit the control
+      // input).
       //
-      // 'load' uses memory which is one (or more) of the Phi's inputs.
-      // It must be scheduled not before the Phi, but rather before
-      // each of the relevant Phi inputs.
+      //    def_mem_state
+      //          |
+      //          | ? ?
+      //          \ | /
+      //           Phi
       //
-      // Instead of finding the LCA of all inputs to a Phi that match 'mem',
-      // we mark each corresponding predecessor block and do a combined
-      // hoisting operation later (raise_LCA_above_marks).
+      // We reached the Phi from def_mem_state and know that, on this
+      // particular input, the memory that the load must witness is not
+      // overwritten. However, for the Phi's other inputs (? in the
+      // illustration), we have no information and must thus conservatively
+      // assume that the load's memory is overwritten at and below the Phi.
       //
-      // Do not assert(store_block != early, "Phi merging memory after access")
+      // It is impossible to schedule the load before the Phi in
+      // the same block as the Phi (use_mem_state_block), and anti-dependence
+      // edges are, therefore, redundant. We must, however, find the
+      // predecessor block of use_mem_state_block that corresponds to
+      // def_mem_state, and raise the LCA above that block. Note that this block
+      // is not necessarily def_mem_state's block! See the continuation of our
+      // previous example below (now illustrating blocks instead of nodes)
+      //
+      //    def_mem_state's block
+      //          |
+      //          |
+      //      pred_block
+      //          |
+      //          |   ?   ?
+      //          |   |   |
+      //      use_mem_state_block
+      //
+      // Here, we must raise the LCA above pred_block rather than
+      // def_mem_state's block.
+      //
+      // Do not assert(use_mem_state_block != early, "Phi merging memory after access")
       // PhiNode may be at start of block 'early' with backedge to 'early'
+      if (LCA == early) {
+        // Don't bother if LCA is already raised all the way
+        continue;
+      }
       DEBUG_ONLY(bool found_match = false);
       for (uint j = PhiNode::Input, jmax = use_mem_state->req(); j < jmax; j++) {
         if (use_mem_state->in(j) == def_mem_state) {   // Found matching input?
           DEBUG_ONLY(found_match = true);
-          Block* pred_block = get_block_for_node(store_block->pred(j));
+          Block* pred_block = get_block_for_node(use_mem_state_block->pred(j));
           if (pred_block != early) {
-            // If any predecessor of the Phi matches the load's "early block",
-            // we do not need a precedence edge between the Phi and 'load'
-            // since the load will be forced into a block preceding the Phi.
+            // Lazily set the LCA mark
             pred_block->set_raise_LCA_mark(load_index);
-            assert(!LCA_orig->dominates(pred_block) ||
-                   early->dominates(pred_block), "early is high enough");
-            must_raise_LCA = true;
-          } else {
-            // anti-dependent upon PHI pinned below 'early', no edge needed
-            LCA = early;             // but can not schedule below 'early'
+            must_raise_LCA_above_marks = true;
+          } else /* if (pred_block == early) */ {
+            // We know already now that we must raise LCA all the way to early.
+            LCA = early;
+            // This turns off the process of gathering non_early_stores.
           }
         }
       }
       assert(found_match, "no worklist bug");
-    } else if (store_block != early) {
-      // 'store' is between the current LCA and earliest possible block.
-      // Label its block, and decide later on how to raise the LCA
-      // to include the effect on LCA of this store.
-      // If this store's block gets chosen as the raised LCA, we
-      // will find him on the non_early_stores list and stick him
-      // with a precedence edge.
-      // (But, don't bother if LCA is already raised all the way.)
-      if (LCA != early && !unrelated_load_in_store_null_block(use_mem_state, load)) {
-        store_block->set_raise_LCA_mark(load_index);
-        must_raise_LCA = true;
-        non_early_stores.push(use_mem_state);
+    } else if (use_mem_state_block != early) {
+      // We found an anti-dependent store outside the load's 'early' block. The
+      // store may be between the current LCA and the earliest possible block
+      // (but it could very well also be on a distinct control-flow path).
+      // Lazily set the LCA mark and push to non_early_stores.
+      if (LCA == early) {
+        // Don't bother if LCA is already raised all the way
+        continue;
       }
-    } else {
-      // Found a possibly-interfering store in the load's 'early' block.
-      // This means 'load' cannot sink at all in the dominator tree.
-      // Add an anti-dep edge, and squeeze 'load' into the highest block.
+      if (unrelated_load_in_store_null_block(use_mem_state, load)) {
+        continue;
+      }
+      use_mem_state_block->set_raise_LCA_mark(load_index);
+      must_raise_LCA_above_marks = true;
+      non_early_stores.push(use_mem_state);
+    } else /* if (use_mem_state_block == early) */ {
+      // We found an anti-dependent store in the load's 'early' block.
+      // Therefore, we know already now that we must raise LCA all the way to
+      // early and that we need to add an anti-dependence edge to the store.
       assert(use_mem_state != load->find_exact_control(load->in(0)), "dependence cycle found");
       if (verify) {
         assert(use_mem_state->find_edge(load) != -1 || unrelated_load_in_store_null_block(use_mem_state, load),
@@ -924,36 +1052,54 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
       // This turns off the process of gathering non_early_stores.
     }
   }
-  // (Worklist is now empty; all nearby stores have been visited.)
+  // Worklist is now empty; we have visited all possible anti-dependences.
 
   // Finished if 'load' must be scheduled in its 'early' block.
   // If we found any stores there, they have already been given
-  // precedence edges.
-  if (LCA == early)  return LCA;
+  // anti-dependence edges.
+  if (LCA == early) {
+    return LCA;
+  }
 
-  // We get here only if there are no possibly-interfering stores
-  // in the load's 'early' block.  Move LCA up above all predecessors
-  // which contain stores we have noted.
-  //
-  // The raised LCA block can be a home to such interfering stores,
-  // but its predecessors must not contain any such stores.
-  //
-  // The raised LCA will be a lower bound for placing the load,
-  // preventing the load from sinking past any block containing
-  // a store that may invalidate the memory state required by 'load'.
-  if (must_raise_LCA)
+  // We get here only if there are no anti-dependent stores in the load's
+  // 'early' block and if no memory Phi has forced LCA to the early block. Now
+  // we must raise the LCA above the blocks for all the anti-dependent stores
+  // and above the predecessor blocks of anti-dependent memory Phis we reached
+  // during the search.
+  if (must_raise_LCA_above_marks) {
     LCA = raise_LCA_above_marks(LCA, load->_idx, early, this);
-  if (LCA == early)  return LCA;
+  }
+
+  // If LCA == early at this point, there were no stores that required
+  // anti-dependence edges in the early block. Otherwise, we would have eagerly
+  // raised the LCA to early already in the worklist loop.
+  if (LCA == early) {
+    return LCA;
+  }
 
-  // Insert anti-dependence edges from 'load' to each store
-  // in the non-early LCA block.
-  // Mine the non_early_stores list for such stores.
+  // The raised LCA block can now be a home to anti-dependent stores for which
+  // we still need to add anti-dependence edges, but no LCA predecessor block
+  // contains any such stores (otherwise, we would have raised the LCA even
+  // higher).
+  //
+  // The raised LCA will be a lower bound for placing the load, preventing the
+  // load from sinking past any block containing a store that may overwrite
+  // memory that the load must witness.
+  //
+  // Now we need to insert the necessary anti-dependence edges from 'load' to
+  // each store in the non-early LCA block. We have recorded all such potential
+  // stores in non_early_stores.
+  //
+  // If LCA->raise_LCA_mark() != load_index, it means that we raised the LCA to
+  // a block in which we did not find any anti-dependent stores. So, no need to
+  // search for any such stores.
   if (LCA->raise_LCA_mark() == load_index) {
     while (non_early_stores.size() > 0) {
       Node* store = non_early_stores.pop();
       Block* store_block = get_block_for_node(store);
       if (store_block == LCA) {
-        // add anti_dependence from store to load in its own block
+        // Add anti-dependence edge from the load to the store in the non-early
+        // LCA.
         assert(store != load->find_exact_control(load->in(0)), "dependence cycle found");
         if (verify) {
           assert(store->find_edge(load) != -1, "missing precedence edge");
@@ -962,15 +1108,12 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
         }
       } else {
         assert(store_block->raise_LCA_mark() == load_index, "block was marked");
-        // Any other stores we found must be either inside the new LCA
-        // or else outside the original LCA.  In the latter case, they
-        // did not interfere with any use of 'load'.
-        assert(LCA->dominates(store_block)
-               || !LCA_orig->dominates(store_block), "no stray stores");
       }
     }
   }
 
+  assert(LCA->dominates(LCA_orig), "unsound updated LCA");
+
   // Return the highest block containing stores; any stores
   // within that block have been given anti-dependence edges.
   return LCA;
@@ -1532,7 +1675,7 @@ void PhaseCFG::schedule_late(VectorSet &visited, Node_Stack &stack) {
     if (self->needs_anti_dependence_check()) {
       // Hoist LCA above possible-defs and insert anti-dependences to
       // defs in new LCA block.
-      LCA = insert_anti_dependences(LCA, self);
+      LCA = raise_above_anti_dependences(LCA, self);
       if (C->failing()) {
         return;
       }
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 8d2809f987c..69732245dcf 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -491,7 +491,7 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
       if (n->needs_anti_dependence_check() &&
           n->in(LoadNode::Memory) == best->in(StoreNode::Memory)) {
         // Found anti-dependent load
-        insert_anti_dependences(block, n);
+        raise_above_anti_dependences(block, n);
         if (C->failing()) {
           return;
         }
@@ -1363,7 +1363,7 @@ void PhaseCFG::call_catch_cleanup(Block* block) {
       sb->insert_node(clone, 1);
       map_node_to_block(clone, sb);
       if (clone->needs_anti_dependence_check()) {
-        insert_anti_dependences(sb, clone);
+        raise_above_anti_dependences(sb, clone);
         if (C->failing()) {
           return;
         }
diff --git a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage.java b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage.java
index b8db6581b61..5ca215d95ef 100644
--- a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage.java
+++ b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8333258
- * @summary C2: high memory usage in PhaseCFG::insert_anti_dependences()
+ * @summary C2: high memory usage in PhaseCFG::raise_above_anti_dependences()
  * @run main/othervm -XX:CompileOnly=TestAntiDependenciesHighMemUsage::test1 -Xcomp TestAntiDependenciesHighMemUsage
  */
 
diff --git a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java
index 3f7dbf9918b..d5f220f4628 100644
--- a/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java
+++ b/test/hotspot/jtreg/compiler/codegen/TestAntiDependenciesHighMemUsage2.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8333258
- * @summary C2: high memory usage in PhaseCFG::insert_anti_dependences()
+ * @summary C2: high memory usage in PhaseCFG::raise_above_anti_dependences()
  * @run main/othervm -XX:CompileOnly=TestAntiDependenciesHighMemUsage2::test1 -XX:-ClipInlining
  *                   -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:-UseOnStackReplacement TestAntiDependenciesHighMemUsage2
  */
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestSplitIfPinnedLoadInStripMinedLoop.java b/test/hotspot/jtreg/compiler/loopopts/TestSplitIfPinnedLoadInStripMinedLoop.java
index 839413fe135..1af24555049 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestSplitIfPinnedLoadInStripMinedLoop.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestSplitIfPinnedLoadInStripMinedLoop.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
@@ -138,7 +138,7 @@ int test3(MyClass obj1, MyClass obj2) {
     }
 
     // Same as test2 but with reference to inner loop induction variable 'j' and different order of instructions.
-    // Triggers an assert in PhaseCFG::insert_anti_dependences if loop strip mining verification is disabled:
+    // Triggers an assert in PhaseCFG::raise_above_anti_dependences if loop strip mining verification is disabled:
     // assert(!LCA_orig->dominates(pred_block) || early->dominates(pred_block)) failed: early is high enough
     int test4(MyClass obj1, MyClass obj2) {
         for (int i = 0; i < 10; ++i) {

From 81e8e670cec4e09502965110a77982f7d2f85ad9 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Thu, 15 May 2025 14:10:16 +0000
Subject: [PATCH 478/901] 8351347: HttpClient Improve logging of response
 headers

Reviewed-by: dfuchs, michaelm
---
 .../jdk/internal/net/http/Http1Request.java   | 23 +++++++++++--------
 .../jdk/internal/net/http/Http1Response.java  |  1 +
 .../internal/net/http/Http2Connection.java    |  4 ++--
 .../classes/jdk/internal/net/http/Stream.java | 13 ++++++-----
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
index 1cfc658c8da..815b6bad20c 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
@@ -81,15 +81,20 @@ class Http1Request {
 
     private void logHeaders(String completeHeaders) {
         if (Log.headers()) {
-            //StringBuilder sb = new StringBuilder(256);
-            //sb.append("REQUEST HEADERS:\n");
-            //Log.dumpHeaders(sb, "    ", systemHeaders);
-            //Log.dumpHeaders(sb, "    ", userHeaders);
-            //Log.logHeaders(sb.toString());
-
-            String s = completeHeaders.replaceAll("\r\n", "\n");
-            if (s.endsWith("\n\n")) s = s.substring(0, s.length() - 2);
-            Log.logHeaders("REQUEST HEADERS:\n{0}\n", s);
+            StringBuilder sb = new StringBuilder(completeHeaders.length());
+            sb.append("REQUEST HEADERS:\n");
+            boolean[] firstLine = {true};
+            completeHeaders.lines().forEach(line -> {
+                // First line contains `GET /foo HTTP/1.1`.
+                // Convert it to look like other `Log.logHeaders()` outputs.
+                if (firstLine[0]) {
+                    sb.append("  ").append(line).append('\n');
+                    firstLine[0] = false;
+                } else if (!line.isBlank()) {
+                    sb.append("    ").append(line).append('\n');
+                }
+            });
+            Log.logHeaders(sb.toString());
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
index d7222067f7e..f9442df9ac4 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java
@@ -224,6 +224,7 @@ public CompletableFuture<Response> readHeadersAsync(Executor executor) {
 
                 if (Log.headers()) {
                     StringBuilder sb = new StringBuilder("RESPONSE HEADERS:\n");
+                    sb.append("  %s %s %s\n".formatted(request.method(), request.uri(), responseCode));
                     Log.dumpHeaders(sb, "    ", headers);
                     Log.logHeaders(sb.toString());
                 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
index 4fa970ee0eb..c33cc93e7dd 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
@@ -1685,8 +1685,8 @@ private List<ByteBuffer> encodeHeadersImpl(int bufferSize, HttpHeaders... header
     private List<ByteBuffer> encodeHeaders(OutgoingHeaders<Stream<?>> oh, Stream<?> stream) {
         oh.streamid(stream.streamid);
         if (Log.headers()) {
-            StringBuilder sb = new StringBuilder("HEADERS FRAME (stream=");
-            sb.append(stream.streamid).append(")\n");
+            StringBuilder sb = new StringBuilder("HEADERS FRAME (streamid=%s):\n".formatted(stream.streamid));
+            sb.append("  %s %s\n".formatted(stream.request.method(), stream.request.uri()));
             Log.dumpHeaders(sb, "    ", oh.getAttachment().getRequestPseudoHeaders());
             Log.dumpHeaders(sb, "    ", oh.getSystemHeaders());
             Log.dumpHeaders(sb, "    ", oh.getUserHeaders());
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
index bfc4e75c021..b5dada882b2 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java
@@ -662,7 +662,8 @@ request, exchange, responseHeaders, connection(),
             responseHeaders.firstValueAsLong("content-length");
 
             if (Log.headers()) {
-                StringBuilder sb = new StringBuilder("RESPONSE HEADERS:\n");
+                StringBuilder sb = new StringBuilder("RESPONSE HEADERS (streamid=%s):\n".formatted(streamid));
+                sb.append("  %s %s %s\n".formatted(request.method(), request.uri(), responseCode));
                 Log.dumpHeaders(sb, "    ", responseHeaders);
                 Log.logHeaders(sb.toString());
             }
@@ -673,7 +674,7 @@ request, exchange, responseHeaders, connection(),
             completeResponse(response);
         } else {
             if (Log.headers()) {
-                StringBuilder sb = new StringBuilder("TRAILING HEADERS:\n");
+                StringBuilder sb = new StringBuilder("TRAILING HEADERS (streamid=%s):\n".formatted(streamid));
                 Log.dumpHeaders(sb, "    ", responseHeaders);
                 Log.logHeaders(sb.toString());
             }
@@ -1770,8 +1771,8 @@ pushReq, exchange, responseHeaders, connection(),
                 responseHeaders.firstValueAsLong("content-length");
 
                 if (Log.headers()) {
-                    StringBuilder sb = new StringBuilder("RESPONSE HEADERS");
-                    sb.append(" (streamid=").append(streamid).append("):\n");
+                    StringBuilder sb = new StringBuilder("RESPONSE HEADERS (streamid=%s):\n".formatted(streamid));
+                    sb.append("  %s %s %s\n".formatted(request.method(), request.uri(), responseCode));
                     Log.dumpHeaders(sb, "    ", responseHeaders);
                     Log.logHeaders(sb.toString());
                 }
@@ -1782,8 +1783,8 @@ pushReq, exchange, responseHeaders, connection(),
                 completeResponse(response);
             } else {
                 if (Log.headers()) {
-                    StringBuilder sb = new StringBuilder("TRAILING HEADERS");
-                    sb.append(" (streamid=").append(streamid).append("):\n");
+                    StringBuilder sb = new StringBuilder("TRAILING HEADERS (streamid=%s):\n".formatted(streamid));
+                    sb.append("  %s %s %s\n".formatted(request.method(), request.uri(), responseCode));
                     Log.dumpHeaders(sb, "    ", responseHeaders);
                     Log.logHeaders(sb.toString());
                 }

From 073af3bbaa3ee81b693136b2de7fee407d8ae04b Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 15 May 2025 14:39:52 +0000
Subject: [PATCH 479/901] 8356892: runtime/jni/CalleeSavedRegisters/FPRegs.java
 fails on static-jdk

Reviewed-by: dholmes, shade
---
 .../hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java b/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java
index f15f8e1dad2..0f83eac4280 100644
--- a/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.java
+++ b/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters/FPRegs.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
@@ -26,6 +26,7 @@
  * @test
  * @bug 8067744
  * @requires vm.flagless
+ * @requires !jdk.static
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @run main/native FPRegs

From 3df8ca1ebaf3539363efd569ba9487f5d985117d Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 15 May 2025 14:47:02 +0000
Subject: [PATCH 480/901] 8356678: (fs) Files.readAttributes should map ENOTDIR
 to NoSuchFileException where possible (unix)

Reviewed-by: alanb, cstein
---
 .../sun/nio/fs/UnixFileAttributeViews.java    |   9 +-
 .../classes/sun/nio/fs/UnixFileSystem.java    |   8 +-
 .../sun/nio/fs/UnixFileSystemProvider.java    |   6 +-
 .../java/nio/file/Files/NotADirectory.java    | 155 ++++++++++++++++++
 4 files changed, 174 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/nio/file/Files/NotADirectory.java

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
index aadef1ea50f..a84a1b4547c 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileAttributeViews.java
@@ -48,10 +48,12 @@ static class Basic extends AbstractBasicFileAttributeView {
         @Override
         public BasicFileAttributes readAttributes() throws IOException {
             try {
-                 UnixFileAttributes attrs =
-                     UnixFileAttributes.get(file, followLinks);
+                 UnixFileAttributes attrs = UnixFileAttributes.get(file, followLinks);
                  return attrs.asBasicFileAttributes();
             } catch (UnixException x) {
+                if (x.errno() == ENOTDIR) {
+                    x.setError(ENOENT);
+                }
                 x.rethrowAsIOException(file);
                 return null;    // keep compiler happy
             }
@@ -209,6 +211,9 @@ public UnixFileAttributes readAttributes() throws IOException {
             try {
                  return UnixFileAttributes.get(file, followLinks);
             } catch (UnixException x) {
+                if (x.errno() == ENOTDIR) {
+                    x.setError(ENOENT);
+                }
                 x.rethrowAsIOException(file);
                 return null;    // keep compiler happy
             }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
index 51ed4211fff..7a2bd71388d 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystem.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
@@ -839,6 +839,9 @@ void move(UnixPath source, UnixPath target, CopyOption... options)
                     new UnixException(errno).rethrowAsIOException(source);
             }
         } catch (UnixException x) {
+            if (x.errno() == ENOTDIR) {
+                x.setError(ENOENT);
+            }
             x.rethrowAsIOException(source);
         }
 
@@ -951,6 +954,9 @@ void copy(final UnixPath source,
         try {
             sourceAttrs = UnixFileAttributes.get(source, flags.followLinks);
         } catch (UnixException x) {
+            if (x.errno() == ENOTDIR) {
+                x.setError(ENOENT);
+            }
             x.rethrowAsIOException(source);
         }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
index ed846354ea0..beb9a1af41b 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
@@ -322,8 +322,12 @@ public void checkAccess(Path obj, AccessMode... modes) throws IOException {
             mode |= X_OK;
         }
         int errno = access(file, mode);
-        if (errno != 0)
+        if (errno != 0) {
+            if (errno == ENOTDIR) {
+                errno = ENOENT;
+            }
             new UnixException(errno).rethrowAsIOException(file);
+        }
     }
 
     @Override
diff --git a/test/jdk/java/nio/file/Files/NotADirectory.java b/test/jdk/java/nio/file/Files/NotADirectory.java
new file mode 100644
index 00000000000..bd561ca5c4b
--- /dev/null
+++ b/test/jdk/java/nio/file/Files/NotADirectory.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.
+ */
+
+/* @test
+ * @bug 8356678
+ * @requires (os.family != "windows")
+ * @summary Test Files operations when a path component is not a directory
+ * @run junit NotADirectory
+ */
+
+import java.io.IOException;
+import java.nio.file.CopyOption;
+import java.nio.file.Files;
+import java.nio.file.FileSystemException;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+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 static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class NotADirectory {
+    private static final Path ROOT      = Path.of(".");
+    private static final Path NOT_EXIST = ROOT.resolve("notExist");
+    private static final Path DIR       = ROOT.resolve("dir");
+    private static final Path FILE      = ROOT.resolve("file");
+    private static final Path BASE      = ROOT.resolve("foo");
+    private static final Path BOGUS     = BASE.resolve("bar");
+
+    private static final Path[] SRCDST = new Path[] {
+        NOT_EXIST, DIR, FILE
+    };
+
+    private static final CopyOption[][] COPY_OPTIONS = new CopyOption[][] {
+        new CopyOption[] {},
+        new CopyOption[] {REPLACE_EXISTING},
+    };
+
+    private static final CopyOption[][] MOVE_OPTIONS = new CopyOption[][] {
+        new CopyOption[] {},
+        new CopyOption[] {ATOMIC_MOVE},
+        new CopyOption[] {REPLACE_EXISTING},
+        new CopyOption[] {ATOMIC_MOVE, REPLACE_EXISTING},
+    };
+
+    @BeforeAll
+    public static void init() throws IOException {
+        Files.createDirectory(DIR);
+        Files.createFile(FILE);
+        Files.createFile(BASE);
+    }
+
+    @AfterAll
+    public static void clean() throws IOException {
+        Files.delete(DIR);
+        Files.delete(FILE);
+        Files.delete(BASE);
+    }
+
+    private static Stream<Arguments> copyMoveParams(CopyOption[][] options) {
+        List<Arguments> list = new ArrayList<Arguments>();
+        for (CopyOption[] opts : options) {
+            for (Path p : SRCDST) {
+                list.add(Arguments.of(p, BOGUS, opts));
+                list.add(Arguments.of(BOGUS, p, opts));
+            }
+        }
+        return list.stream();
+    }
+
+    private static Stream<Arguments> copyParams() {
+        return copyMoveParams(COPY_OPTIONS);
+    }
+
+    private static Stream<Arguments> moveParams() {
+        return copyMoveParams(MOVE_OPTIONS);
+    }
+
+    @ParameterizedTest
+    @MethodSource("copyParams")
+    public void copy(Path src, Path dst, CopyOption[] opts)
+        throws IOException {
+        Class exceptionClass = dst.equals(BOGUS) ?
+            FileSystemException.class : NoSuchFileException.class;
+        assertThrows(exceptionClass,
+                     () -> Files.copy(src, dst, opts));
+    }
+
+    @ParameterizedTest
+    @MethodSource("moveParams")
+    public void move(Path src, Path dst, CopyOption[] opts)
+        throws IOException {
+        Class exceptionClass = src.equals(BOGUS) || dst.equals(BOGUS) ?
+            FileSystemException.class : NoSuchFileException.class;
+        assertThrows(exceptionClass,
+                     () -> Files.move(src, dst, opts));
+    }
+
+    @Test
+    public void readBasic() throws IOException {
+        assertThrows(NoSuchFileException.class,
+                     () -> Files.readAttributes(BOGUS, BasicFileAttributes.class));
+    }
+
+    @Test
+    public void readPosix() throws IOException {
+        assertThrows(NoSuchFileException.class,
+                     () -> Files.readAttributes(BOGUS, PosixFileAttributes.class));
+    }
+
+    @Test
+    public void exists() throws IOException {
+        assertFalse(Files.exists(BOGUS));
+    }
+
+    @Test
+    public void notExists() throws IOException {
+        assertTrue(Files.notExists(BOGUS));
+    }
+}

From 8fcfddb2d202cdb61941efdb3fec5807fee98c33 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Thu, 15 May 2025 14:54:27 +0000
Subject: [PATCH 481/901] 8353197: Document preconditions for JavaLangAccess
 methods

Reviewed-by: pminborg, liach
---
 .../classes/java/io/DataInputStream.java      |  8 +-
 .../classes/java/io/ObjectInputStream.java    |  4 +-
 .../share/classes/java/lang/System.java       | 18 ++---
 .../java/lang/invoke/StringConcatFactory.java |  4 +-
 .../share/classes/java/math/BigDecimal.java   |  2 +-
 .../share/classes/java/nio/file/Files.java    |  4 +-
 .../share/classes/java/util/HexFormat.java    | 14 ++--
 .../share/classes/java/util/UUID.java         |  2 +-
 .../share/classes/java/util/zip/ZipCoder.java |  4 +-
 .../jdk/internal/access/JavaLangAccess.java   | 81 ++++++++++++-------
 .../classfile/impl/AbstractPoolEntry.java     |  4 +-
 .../classes/jdk/internal/math/ToDecimal.java  | 10 +--
 .../jdk/internal/util/ArraysSupport.java      |  4 +-
 .../classes/jdk/internal/util/HexDigits.java  | 10 +--
 .../share/classes/sun/nio/cs/CESU_8.java      |  8 +-
 .../share/classes/sun/nio/cs/DoubleByte.java  | 12 ++-
 .../share/classes/sun/nio/cs/ISO_8859_1.java  |  4 +-
 .../share/classes/sun/nio/cs/SingleByte.java  |  8 +-
 .../share/classes/sun/nio/cs/US_ASCII.java    |  6 +-
 .../share/classes/sun/nio/cs/UTF_8.java       |  7 +-
 .../unix/classes/sun/nio/fs/UnixPath.java     |  4 +-
 .../sun/nio/cs/ext/EUC_JP.java.template       |  4 +-
 22 files changed, 121 insertions(+), 101 deletions(-)

diff --git a/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java
index 59377aca429..fa6fecf83da 100644
--- a/src/java.base/share/classes/java/io/DataInputStream.java
+++ b/src/java.base/share/classes/java/io/DataInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -595,11 +595,11 @@ public static final String readUTF(DataInput in) throws IOException {
         int chararr_count=0;
 
         in.readFully(bytearr, 0, utflen);
-        int ascii = JLA.countPositives(bytearr, 0, utflen);
+        int ascii = JLA.uncheckedCountPositives(bytearr, 0, utflen);
         if (ascii == utflen) {
             String str;
             if (trusted) {
-                str = JLA.newStringNoRepl(bytearr, StandardCharsets.ISO_8859_1);
+                str = JLA.uncheckedNewStringNoRepl(bytearr, StandardCharsets.ISO_8859_1);
             } else {
                 str = new String(bytearr, 0, utflen, StandardCharsets.ISO_8859_1);
             }
@@ -621,7 +621,7 @@ public static final String readUTF(DataInput in) throws IOException {
         }
 
         if (ascii != 0) {
-            JLA.inflateBytesToChars(bytearr, 0, chararr, 0, ascii);
+            JLA.uncheckedInflateBytesToChars(bytearr, 0, chararr, 0, ascii);
             count += ascii;
             chararr_count += ascii;
         }
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index daed5f3cce5..b9593fa2c2f 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -3536,7 +3536,7 @@ private String readUTFBody(long utflen) throws IOException {
             if (utflen > 0 && utflen < Integer.MAX_VALUE) {
                 // Scan for leading ASCII chars
                 int avail = end - pos;
-                int ascii = JLA.countPositives(buf, pos, Math.min(avail, (int)utflen));
+                int ascii = JLA.uncheckedCountPositives(buf, pos, Math.min(avail, (int)utflen));
                 if (ascii == utflen) {
                     // Complete match, consume the buf[pos ... pos + ascii] range and return.
                     // Modified UTF-8 and ISO-8859-1 are both ASCII-compatible encodings bytes
@@ -3549,7 +3549,7 @@ private String readUTFBody(long utflen) throws IOException {
                 // Avoid allocating a StringBuilder if there's enough data in buf and
                 // cbuf is large enough
                 if (avail >= utflen && utflen <= CHAR_BUF_SIZE) {
-                    JLA.inflateBytesToChars(buf, pos, cbuf, 0, ascii);
+                    JLA.uncheckedInflateBytesToChars(buf, pos, cbuf, 0, ascii);
                     pos += ascii;
                     int cbufPos = readUTFSpan(ascii, utflen - ascii);
                     return new String(cbuf, 0, cbufPos);
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 42c60ad2162..882b5f6945f 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2118,22 +2118,22 @@ public Stream<ModuleLayer> layers(ClassLoader loader) {
                 return ModuleLayer.layers(loader);
             }
 
-            public int countPositives(byte[] bytes, int offset, int length) {
+            public int uncheckedCountPositives(byte[] bytes, int offset, int length) {
                 return StringCoding.countPositives(bytes, offset, length);
             }
             public int countNonZeroAscii(String s) {
                 return StringCoding.countNonZeroAscii(s);
             }
-            public String newStringNoRepl(byte[] bytes, Charset cs) throws CharacterCodingException  {
+            public String uncheckedNewStringNoRepl(byte[] bytes, Charset cs) throws CharacterCodingException  {
                 return String.newStringNoRepl(bytes, cs);
             }
-            public char getUTF16Char(byte[] bytes, int index) {
+            public char uncheckedGetUTF16Char(byte[] bytes, int index) {
                 return StringUTF16.getChar(bytes, index);
             }
-            public void putCharUTF16(byte[] bytes, int index, int ch) {
+            public void uncheckedPutCharUTF16(byte[] bytes, int index, int ch) {
                 StringUTF16.putChar(bytes, index, ch);
             }
-            public byte[] getBytesNoRepl(String s, Charset cs) throws CharacterCodingException {
+            public byte[] uncheckedGetBytesNoRepl(String s, Charset cs) throws CharacterCodingException {
                 return String.getBytesNoRepl(s, cs);
             }
 
@@ -2145,15 +2145,15 @@ public byte[] getBytesUTF8NoRepl(String s) {
                 return String.getBytesUTF8NoRepl(s);
             }
 
-            public void inflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+            public void uncheckedInflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
                 StringLatin1.inflate(src, srcOff, dst, dstOff, len);
             }
 
-            public int decodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+            public int uncheckedDecodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
                 return String.decodeASCII(src, srcOff, dst, dstOff, len);
             }
 
-            public int encodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
+            public int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
                 return StringCoding.implEncodeAsciiArray(src, srcOff, dst, dstOff, len);
             }
 
@@ -2189,7 +2189,7 @@ public long stringConcatMix(long lengthCoder, char value) {
                 return StringConcatHelper.mix(lengthCoder, value);
             }
 
-            public Object stringConcat1(String[] constants) {
+            public Object uncheckedStringConcat1(String[] constants) {
                 return new StringConcatHelper.Concat1(constants);
             }
 
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index 7e91057cbf4..ca296e21a26 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1258,7 +1258,7 @@ private static MethodHandle generate(Lookup lookup, MethodType args, String[] co
 
             // 1 argument use built-in method
             if (args.parameterCount() == 1) {
-                Object concat1 = JLA.stringConcat1(constants);
+                Object concat1 = JLA.uncheckedStringConcat1(constants);
                 var handle = lookup.findVirtual(concat1.getClass(), METHOD_NAME, concatArgs);
                 return handle.bindTo(concat1);
             }
diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index dd6253a7132..4304c09630c 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -4142,7 +4142,7 @@ private String layoutChars(boolean sci) {
             buf[highIntSize] = '.';
             DecimalDigits.putPairLatin1(buf, highIntSize + 1, lowInt);
             try {
-                return JLA.newStringNoRepl(buf, StandardCharsets.ISO_8859_1);
+                return JLA.uncheckedNewStringNoRepl(buf, StandardCharsets.ISO_8859_1);
             } catch (CharacterCodingException cce) {
                 throw new AssertionError(cce);
             }
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 2f83f79d4bd..f8278fa2642 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -3043,7 +3043,7 @@ public static String readString(Path path, Charset cs) throws IOException {
         byte[] ba = readAllBytes(path);
         if (path.getClass().getModule() != Object.class.getModule())
             ba = ba.clone();
-        return JLA.newStringNoRepl(ba, cs);
+        return JLA.uncheckedNewStringNoRepl(ba, cs);
     }
 
     /**
@@ -3362,7 +3362,7 @@ public static Path writeString(Path path, CharSequence csq, Charset cs, OpenOpti
         Objects.requireNonNull(csq);
         Objects.requireNonNull(cs);
 
-        byte[] bytes = JLA.getBytesNoRepl(String.valueOf(csq), cs);
+        byte[] bytes = JLA.uncheckedGetBytesNoRepl(String.valueOf(csq), cs);
         if (path.getClass().getModule() != Object.class.getModule())
             bytes = bytes.clone();
         write(path, bytes, options);
diff --git a/src/java.base/share/classes/java/util/HexFormat.java b/src/java.base/share/classes/java/util/HexFormat.java
index cd6cf8af17d..99d047995fd 100644
--- a/src/java.base/share/classes/java/util/HexFormat.java
+++ b/src/java.base/share/classes/java/util/HexFormat.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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -462,7 +462,7 @@ private String formatOptDelimiter(byte[] bytes, int fromIndex, int toIndex) {
         }
         try {
             // Return a new string using the bytes without making a copy
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
@@ -696,7 +696,7 @@ public String toHexDigits(byte value) {
         rep[0] = (byte)toHighHexDigit(value);
         rep[1] = (byte)toLowHexDigit(value);
         try {
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
@@ -732,7 +732,7 @@ public String toHexDigits(short value) {
         rep[3] = (byte)toLowHexDigit((byte)value);
 
         try {
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
@@ -760,7 +760,7 @@ public String toHexDigits(int value) {
         rep[7] = (byte)toLowHexDigit((byte)value);
 
         try {
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
@@ -796,7 +796,7 @@ public String toHexDigits(long value) {
         rep[15] = (byte)toLowHexDigit((byte)value);
 
         try {
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
@@ -824,7 +824,7 @@ public String toHexDigits(long value, int digits) {
             value = value >>> 4;
         }
         try {
-            return jla.newStringNoRepl(rep, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(rep, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
index db0dbe28802..08b9b87b7ca 100644
--- a/src/java.base/share/classes/java/util/UUID.java
+++ b/src/java.base/share/classes/java/util/UUID.java
@@ -481,7 +481,7 @@ public String toString() {
         HexDigits.put4(buf, 28, i3 >> 16);
         HexDigits.put4(buf, 32, i3);
         try {
-            return jla.newStringNoRepl(buf, StandardCharsets.ISO_8859_1);
+            return jla.uncheckedNewStringNoRepl(buf, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
             throw new AssertionError(cce);
         }
diff --git a/src/java.base/share/classes/java/util/zip/ZipCoder.java b/src/java.base/share/classes/java/util/zip/ZipCoder.java
index 2702b90f4f6..bbf1c10112a 100644
--- a/src/java.base/share/classes/java/util/zip/ZipCoder.java
+++ b/src/java.base/share/classes/java/util/zip/ZipCoder.java
@@ -266,7 +266,7 @@ int checkedHash(byte[] a, int off, int len) throws Exception {
                 return 0;
             }
             int end = off + len;
-            int asciiLen = JLA.countPositives(a, off, len);
+            int asciiLen = JLA.uncheckedCountPositives(a, off, len);
             if (asciiLen != len) {
                 // Non-ASCII, fall back to decoding a String
                 // We avoid using decoder() here since the UTF8ZipCoder is
@@ -289,7 +289,7 @@ private boolean hasTrailingSlash(byte[] a, int end) {
         @Override
         byte compare(String str, byte[] b, int off, int len, boolean matchDirectory) {
             try {
-                byte[] encoded = JLA.getBytesNoRepl(str, UTF_8.INSTANCE);
+                byte[] encoded = JLA.uncheckedGetBytesNoRepl(str, UTF_8.INSTANCE);
                 int mismatch = Arrays.mismatch(encoded, 0, encoded.length, b, off, off+len);
                 if (mismatch == -1) {
                     return EXACT_MATCH;
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 20b6cd23682..1f60f85464b 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -302,8 +302,10 @@ public interface JavaLangAccess {
 
     /**
      * Count the number of leading positive bytes in the range.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      */
-    int countPositives(byte[] ba, int off, int len);
+    int uncheckedCountPositives(byte[] ba, int off, int len);
 
     /**
      * Count the number of leading non-zero ascii chars in the String.
@@ -311,37 +313,40 @@ public interface JavaLangAccess {
     int countNonZeroAscii(String s);
 
     /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
-     *
-     * The caller of this method shall relinquish and transfer the ownership of
-     * the byte array to the callee since the later will not make a copy.
+     * Constructs a new {@code String} by decoding the specified byte array
+     * using the specified {@linkplain java.nio.charset.Charset charset}.
+     * <p>
+     * <b>WARNING: The caller of this method shall relinquish and transfer the
+     * ownership of the byte array to the callee</b>, since the latter will not
+     * make a copy.
      *
      * @param bytes the byte array source
      * @param cs the Charset
      * @return the newly created string
      * @throws CharacterCodingException for malformed or unmappable bytes
      */
-    String newStringNoRepl(byte[] bytes, Charset cs) throws CharacterCodingException;
+    String uncheckedNewStringNoRepl(byte[] bytes, Charset cs) throws CharacterCodingException;
 
     /**
-     * Encode the given string into a sequence of bytes using the specified Charset.
-     *
-     * This method avoids copying the String's internal representation if the input
-     * is ASCII.
-     *
-     * This method throws CharacterCodingException instead of replacing when
-     * malformed input or unmappable characters are encountered.
+     * Encode the given string into a sequence of bytes using the specified
+     * {@linkplain java.nio.charset.Charset charset}.
+     * <p>
+     * <b>WARNING: This method returns the {@code byte[]} backing the provided
+     * {@code String}, if the input is ASCII. Hence, the returned byte array
+     * must not be modified.</b>
+     * <p>
+     * This method throws {@code CharacterCodingException} instead of replacing
+     * when malformed input or unmappable characters are encountered.
      *
      * @param s the string to encode
      * @param cs the charset
      * @return the encoded bytes
      * @throws CharacterCodingException for malformed input or unmappable characters
      */
-    byte[] getBytesNoRepl(String s, Charset cs) throws CharacterCodingException;
+    byte[] uncheckedGetBytesNoRepl(String s, Charset cs) throws CharacterCodingException;
 
     /**
-     * Returns a new string by decoding from the given utf8 bytes array.
+     * Returns a new string by decoding from the given UTF-8 bytes array.
      *
      * @param off the index of the first byte to decode
      * @param len the number of bytes to decode
@@ -351,23 +356,27 @@ public interface JavaLangAccess {
     String newStringUTF8NoRepl(byte[] bytes, int off, int len);
 
     /**
-     * Get the char at index in a byte[] in internal UTF-16 representation,
-     * with no bounds checks.
+     * Get the {@code char} at {@code index} in a {@code byte[]} in internal
+     * UTF-16 representation.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @param bytes the UTF-16 encoded bytes
      * @param index of the char to retrieve, 0 <= index < (bytes.length >> 1)
      * @return the char value
      */
-    char getUTF16Char(byte[] bytes, int index);
+    char uncheckedGetUTF16Char(byte[] bytes, int index);
 
     /**
-     * Put the char at index in a byte[] in internal UTF-16 representation,
-     * with no bounds checks.
+     * Put the {@code ch} at {@code index} in a {@code byte[]} in internal
+     * UTF-16 representation.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @param bytes the UTF-16 encoded bytes
      * @param index of the char to retrieve, 0 <= index < (bytes.length >> 1)
      */
-    void putCharUTF16(byte[] bytes, int index, int ch);
+    void uncheckedPutCharUTF16(byte[] bytes, int index, int ch);
 
     /**
      * Encode the given string into a sequence of bytes using utf8.
@@ -379,17 +388,22 @@ public interface JavaLangAccess {
     byte[] getBytesUTF8NoRepl(String s);
 
     /**
-     * Inflated copy from byte[] to char[], as defined by StringLatin1.inflate
+     * Inflated copy from {@code byte[]} to {@code char[]}, as defined by
+     * {@code StringLatin1.inflate}.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      */
-    void inflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len);
+    void uncheckedInflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len);
 
     /**
      * Decodes ASCII from the source byte array into the destination
      * char array.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @return the number of bytes successfully decoded, at most len
      */
-    int decodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len);
+    int uncheckedDecodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len);
 
     /**
      * Returns the initial `System.in` to determine if it is replaced
@@ -403,13 +417,15 @@ public interface JavaLangAccess {
     PrintStream initialSystemErr();
 
     /**
-     * Encodes ASCII codepoints as possible from the source array into
+     * Encodes as many ASCII codepoints as possible from the source array into
      * the destination byte array, assuming that the encoding is ASCII
-     * compatible
+     * compatible.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @return the number of bytes successfully encoded, or 0 if none
      */
-    int encodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len);
+    int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len);
 
     /**
      * Set the cause of Throwable
@@ -442,7 +458,14 @@ public interface JavaLangAccess {
      */
     long stringConcatMix(long lengthCoder, char value);
 
-    Object stringConcat1(String[] constants);
+    /**
+     * Creates helper for string concatenation.
+     * <p>
+     * <b>WARNING: The caller of this method shall relinquish and transfer the
+     * ownership of the string array to the callee</b>, since the latter will not
+     * make a copy.
+     */
+    Object uncheckedStringConcat1(String[] constants);
 
     /**
      * Get the string initial coder, When COMPACT_STRINGS is on, it returns 0, and when it is off, it returns 1.
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index 962a2057585..ab7f0847bbd 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -218,7 +218,7 @@ public int tag() {
          * two-times-three-byte format instead.
          */
         private void inflate() {
-            int singleBytes = JLA.countPositives(rawBytes, offset, rawLen);
+            int singleBytes = JLA.uncheckedCountPositives(rawBytes, offset, rawLen);
             int hash = ArraysSupport.hashCodeOfUnsigned(rawBytes, offset, singleBytes, 0);
             if (singleBytes == rawLen) {
                 this.contentHash = hash;
@@ -233,7 +233,7 @@ private void inflateNonAscii(int singleBytes, int hash) {
             char[] chararr = new char[rawLen];
             int chararr_count = singleBytes;
             // Inflate prefix of bytes to characters
-            JLA.inflateBytesToChars(rawBytes, offset, chararr, 0, singleBytes);
+            JLA.uncheckedInflateBytesToChars(rawBytes, offset, chararr, 0, singleBytes);
 
             int px = offset + singleBytes;
             int utfend = offset + rawLen;
diff --git a/src/java.base/share/classes/jdk/internal/math/ToDecimal.java b/src/java.base/share/classes/jdk/internal/math/ToDecimal.java
index 45d4da25323..22f9e5a338d 100644
--- a/src/java.base/share/classes/jdk/internal/math/ToDecimal.java
+++ b/src/java.base/share/classes/jdk/internal/math/ToDecimal.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.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -58,7 +58,7 @@ final int putChar(byte[] str, int index, int c) {
         if (latin1) {
             str[index] = (byte) c;
         } else {
-            JLA.putCharUTF16(str, index, (char) c);
+            JLA.uncheckedPutCharUTF16(str, index, (char) c);
         }
         return index + 1;
     }
@@ -93,7 +93,7 @@ private static void put8DigitsUTF16(byte[] str, int index, int m) {
         int y = y(m);
         for (int i = 0; i < 8; ++i) {
             int t = 10 * y;
-            JLA.putCharUTF16(str, index + i, '0' + (t >>> 28));
+            JLA.uncheckedPutCharUTF16(str, index + i, '0' + (t >>> 28));
             y = t & MASK_28;
         }
     }
@@ -122,11 +122,11 @@ final int removeTrailingZeroes(byte[] str, int index) {
                 ++index;
             }
         } else {
-            while (JLA.getUTF16Char(str, index - 1) == '0') {
+            while (JLA.uncheckedGetUTF16Char(str, index - 1) == '0') {
                 --index;
             }
             /* ... but do not remove the one directly to the right of '.' */
-            if (JLA.getUTF16Char(str, index - 1) == '.') {
+            if (JLA.uncheckedGetUTF16Char(str, index - 1) == '.') {
                 ++index;
             }
         }
diff --git a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
index 1a56c3c64fd..de7a5e44b91 100644
--- a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
+++ b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
@@ -298,7 +298,7 @@ public static int hashCodeOfUnsigned(byte[] a, int fromIndex, int length, int in
     public static int hashCodeOfUTF16(byte[] a, int fromIndex, int length, int initialValue) {
         return switch (length) {
             case 0 -> initialValue;
-            case 1 -> 31 * initialValue + JLA.getUTF16Char(a, fromIndex);
+            case 1 -> 31 * initialValue + JLA.uncheckedGetUTF16Char(a, fromIndex);
             default -> vectorizedHashCode(a, fromIndex, length, initialValue, T_CHAR);
         };
     }
@@ -420,7 +420,7 @@ private static int hashCode(int result, int[] a, int fromIndex, int length) {
     private static int utf16hashCode(int result, byte[] value, int fromIndex, int length) {
         int end = fromIndex + length;
         for (int i = fromIndex; i < end; i++) {
-            result = 31 * result + JLA.getUTF16Char(value, i);
+            result = 31 * result + JLA.uncheckedGetUTF16Char(value, i);
         }
         return result;
     }
diff --git a/src/java.base/share/classes/jdk/internal/util/HexDigits.java b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
index c08db4f5b48..e014c932f83 100644
--- a/src/java.base/share/classes/jdk/internal/util/HexDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/HexDigits.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
@@ -168,16 +168,16 @@ public static int getCharsLatin1(long value, int index, byte[] buffer) {
     public static int getCharsUTF16(long value, int index, byte[] buffer) {
         while ((value & ~0xFF) != 0) {
             int pair = (int) DIGITS[((int) value) & 0xFF];
-            JLA.putCharUTF16(buffer, --index, pair >> 8);
-            JLA.putCharUTF16(buffer, --index, pair & 0xFF);
+            JLA.uncheckedPutCharUTF16(buffer, --index, pair >> 8);
+            JLA.uncheckedPutCharUTF16(buffer, --index, pair & 0xFF);
             value >>>= 8;
         }
 
         int digits = DIGITS[(int) (value & 0xFF)];
-        JLA.putCharUTF16(buffer, --index, (byte) (digits >> 8));
+        JLA.uncheckedPutCharUTF16(buffer, --index, (byte) (digits >> 8));
 
         if (0xF < value) {
-            JLA.putCharUTF16(buffer, --index, (byte) (digits & 0xFF));
+            JLA.uncheckedPutCharUTF16(buffer, --index, (byte) (digits & 0xFF));
         }
 
         return index;
diff --git a/src/java.base/share/classes/sun/nio/cs/CESU_8.java b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
index f1fc69703c2..a6e233873a8 100644
--- a/src/java.base/share/classes/sun/nio/cs/CESU_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/CESU_8.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
@@ -196,7 +196,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dp = doff + dst.position();
             int dl = doff + dst.limit();
 
-            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
@@ -446,7 +446,7 @@ private CoderResult encodeArrayLoop(CharBuffer src,
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
@@ -551,7 +551,7 @@ public int encode(char[] sa, int sp, int len, byte[] da) {
             int dp = 0;
 
             // Handle ASCII-only prefix
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(len, da.length));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(len, da.length));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
index 2978a6f5dec..c4c9856a60b 100644
--- a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/DoubleByte.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
@@ -35,9 +35,7 @@
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
-import sun.nio.cs.Surrogate;
-import sun.nio.cs.ArrayDecoder;
-import sun.nio.cs.ArrayEncoder;
+
 import static sun.nio.cs.CharsetMapping.*;
 
 /*
@@ -170,7 +168,7 @@ protected CoderResult decodeArrayLoop(ByteBuffer src, CharBuffer dst) {
 
             try {
                 if (isASCIICompatible) {
-                    int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     dp += n;
                     sp += n;
                 }
@@ -602,7 +600,7 @@ protected CoderResult encodeArrayLoop(CharBuffer src, ByteBuffer dst) {
 
             try {
                 if (isASCIICompatible) {
-                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }
@@ -688,7 +686,7 @@ public int encode(char[] src, int sp, int len, byte[] dst) {
             int dp = 0;
             int sl = sp + len;
             if (isASCIICompatible) {
-                int n = JLA.encodeASCII(src, sp, dst, dp, len);
+                int n = JLA.uncheckedEncodeASCII(src, sp, dst, dp, len);
                 sp += n;
                 dp += n;
             }
diff --git a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
index 3e86f104fac..241171d8deb 100644
--- a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.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
@@ -87,7 +87,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dl = doff + dst.limit();
 
             int decodeLen = Math.min(sl - sp, dl - dp);
-            JLA.inflateBytesToChars(sa, sp, da, dp, decodeLen);
+            JLA.uncheckedInflateBytesToChars(sa, sp, da, dp, decodeLen);
             sp += decodeLen;
             dp += decodeLen;
             src.position(sp - soff);
diff --git a/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
index 748659b323f..fe66f3216a4 100644
--- a/src/java.base/share/classes/sun/nio/cs/SingleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, 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
@@ -35,7 +35,7 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
-import java.util.Arrays;
+
 import static sun.nio.cs.CharsetMapping.*;
 
 public class SingleByte
@@ -95,7 +95,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src, CharBuffer dst) {
             }
 
             if (isASCIICompatible) {
-                int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                 sp += n;
                 dp += n;
             }
@@ -217,7 +217,7 @@ private CoderResult encodeArrayLoop(CharBuffer src, ByteBuffer dst) {
             int len = Math.min(dl - dp, sl - sp);
 
             if (isASCIICompatible) {
-                int n = JLA.encodeASCII(sa, sp, da, dp, len);
+                int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, len);
                 sp += n;
                 dp += n;
                 len -= n;
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index 8ff79d497fb..627b1433d61 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.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
@@ -83,7 +83,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dl = doff + dst.limit();
 
             // ASCII only loop
-            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
             src.position(sp - soff);
@@ -159,7 +159,7 @@ private CoderResult encodeArrayLoop(CharBuffer src,
             assert (dp <= dl);
             dp = (dp <= dl ? dp : dl);
 
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
index a27b4690f59..89a199db99b 100644
--- a/src/java.base/share/classes/sun/nio/cs/UTF_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/UTF_8.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
@@ -35,7 +35,6 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
 
 /* Legal UTF-8 Byte Sequences
  *
@@ -228,7 +227,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dp = doff + dst.position();
             int dl = doff + dst.limit();
 
-            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
@@ -453,7 +452,7 @@ private CoderResult encodeArrayLoop(CharBuffer src,
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixPath.java b/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
index e2f52e701cb..5dfc73f57aa 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixPath.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixPath.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
@@ -126,7 +126,7 @@ private static String normalize(String input, int len, int off) {
     private static byte[] encode(UnixFileSystem fs, String input) {
         input = fs.normalizeNativePath(input);
         try {
-            return JLA.getBytesNoRepl(input, Util.jnuEncoding());
+            return JLA.uncheckedGetBytesNoRepl(input, Util.jnuEncoding());
         } catch (CharacterCodingException cce) {
             throw new InvalidPathException(input,
                 "Malformed input or input contains unmappable characters");
diff --git a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
index 56fd7741c5a..4fc0b2796ee 100644
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
@@ -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
@@ -309,7 +309,7 @@ public class EUC_JP
 
             try {
                 if (enc0201.isASCIICompatible()) {
-                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }

From a1c7e494c842e4138f03cffb31448e9e92ba917d Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Thu, 15 May 2025 15:38:56 +0000
Subject: [PATCH 482/901] 8350482: [s390x] Relativize esp in interpreter frames

Reviewed-by: lucy, rrich
---
 .../cpu/s390/abstractInterpreter_s390.cpp        |  4 ++--
 src/hotspot/cpu/s390/frame_s390.hpp              |  8 ++++----
 src/hotspot/cpu/s390/frame_s390.inline.hpp       | 16 +++++++++-------
 src/hotspot/cpu/s390/interp_masm_s390.cpp        | 11 +++++++++--
 src/hotspot/cpu/s390/interp_masm_s390.hpp        |  2 +-
 .../s390/templateInterpreterGenerator_s390.cpp   |  3 ++-
 6 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
index e815542a51e..96990f0ce94 100644
--- a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
+++ b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
@@ -176,7 +176,7 @@ void AbstractInterpreter::layout_activation(Method* method,
   intptr_t* monitor_base = (intptr_t*)((address)interpreter_frame->fp() - frame::z_ijava_state_size);
   intptr_t* monitor      = monitor_base - (moncount * frame::interpreter_frame_monitor_size());
   intptr_t* operand_stack_base = monitor;
-  intptr_t* tos          = operand_stack_base - tempcount - popframe_extra_args;
+  intptr_t* esp          = operand_stack_base - tempcount - popframe_extra_args - 1;
   intptr_t* top_frame_sp =
     operand_stack_base - method->max_stack() - frame::z_top_ijava_frame_abi_size / Interpreter::stackElementSize;
   intptr_t* sender_sp;
@@ -206,7 +206,7 @@ void AbstractInterpreter::layout_activation(Method* method,
   interpreter_frame->interpreter_frame_set_locals(locals_base);
   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_esp(esp);
   if (!is_bottom_frame) {
     interpreter_frame->interpreter_frame_set_sender_sp(sender_sp);
   }
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index ab15e75bc5b..537a3ce5bcc 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -498,12 +498,12 @@
 
   inline z_ijava_state* ijava_state() const;
 
-  // Where z_ijava_state.esp is saved.
-  inline intptr_t** interpreter_frame_esp_addr() const;
-
  public:
+
+  inline intptr_t* interpreter_frame_esp() const;
+  // Where z_ijava_state.esp is saved.
+  inline void interpreter_frame_set_esp(intptr_t* esp);
   inline intptr_t* interpreter_frame_top_frame_sp();
-  inline void interpreter_frame_set_tos_address(intptr_t* x);
   inline void interpreter_frame_set_top_frame_sp(intptr_t* top_frame_sp);
   inline void interpreter_frame_set_sender_sp(intptr_t* sender_sp);
 #ifdef ASSERT
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index 59e23af7f48..5512bed5688 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -226,18 +226,20 @@ inline void frame::interpreter_frame_set_magic() {
 }
 #endif
 
+inline intptr_t* frame::interpreter_frame_esp() const {
+  return (intptr_t*) at_relative(_z_ijava_idx(esp));
+}
+
 // Where z_ijava_state.esp is saved.
-inline intptr_t** frame::interpreter_frame_esp_addr() const {
-  return (intptr_t**) &(ijava_state()->esp);
+inline void frame::interpreter_frame_set_esp(intptr_t* esp) {
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  // set relativized esp
+  ijava_state()->esp = (intptr_t) (esp - fp());
 }
 
 // top of expression stack (lowest address)
 inline intptr_t* frame::interpreter_frame_tos_address() const {
-  return *interpreter_frame_esp_addr() + 1;
-}
-
-inline void frame::interpreter_frame_set_tos_address(intptr_t* x) {
-  *interpreter_frame_esp_addr() = x - 1;
+  return interpreter_frame_esp() + Interpreter::stackElementWords;
 }
 
 // Stack slot needed for native calls and GC.
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index aac130ea66e..b384b24d49b 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -665,13 +665,20 @@ void InterpreterMacroAssembler::restore_bcp() {
   z_lg(Z_bcp, Address(Z_fp, _z_ijava_state_neg(bcp)));
 }
 
-void InterpreterMacroAssembler::save_esp() {
-  z_stg(Z_esp, Address(Z_fp, _z_ijava_state_neg(esp)));
+void InterpreterMacroAssembler::save_esp(Register fp) {
+  if (fp == noreg) {
+    fp = Z_fp;
+  }
+  z_sgrk(Z_R0, Z_esp, fp);
+  z_srag(Z_R0, Z_R0, Interpreter::logStackElementSize);
+  z_stg(Z_R0, Address(fp, _z_ijava_state_neg(esp)));
 }
 
 void InterpreterMacroAssembler::restore_esp() {
   asm_assert_ijava_state_magic(Z_esp);
   z_lg(Z_esp, Address(Z_fp, _z_ijava_state_neg(esp)));
+  z_slag(Z_esp, Z_esp, Interpreter::logStackElementSize);
+  z_agr(Z_esp, Z_fp);
 }
 
 void InterpreterMacroAssembler::get_monitors(Register reg) {
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp
index 2473463219c..94ad63b16c6 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp
@@ -169,7 +169,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void restore_bcp();
 
-  void save_esp();
+  void save_esp(Register fp = noreg);
 
   void restore_esp();
 
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index c3c99d7297d..c953ab38713 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1180,7 +1180,8 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ z_stg(Z_R0, _z_ijava_state_neg(monitors), fp);
 
   __ add2reg(Z_esp, -Interpreter::stackElementSize);
-  __ z_stg(Z_esp, _z_ijava_state_neg(esp), fp);
+
+  __ save_esp(fp);
 
   // z_ijava_state->cpoolCache = Z_R1_scratch (see load above);
   __ z_stg(Z_R1_scratch, _z_ijava_state_neg(cpoolCache), fp);

From b3e856f9b37078969478809207b63fb6bc9c5f13 Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Thu, 15 May 2025 16:03:43 +0000
Subject: [PATCH 483/901] 8356847: Problem list two test cases for JDK-8284234

Reviewed-by: tschatzl
---
 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 827b9cf7b7b..a31376f82f5 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -160,6 +160,9 @@ serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStr
 
 #############################################################################
 
+vmTestbase/gc/gctests/FinalizeTest04/FinalizeTest04.java 8284234 generic-all
+vmTestbase/gc/gctests/PhantomReference/phantom001/phantom001.java 8284234 generic-all
+
 vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all

From e056bbec928e3914a3b5cd14753406619e187178 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 15 May 2025 16:14:13 +0000
Subject: [PATCH 484/901] 8356822: Refactor HTML anchor tags to javadoc in
 Charset

Reviewed-by: iris, liach
---
 src/java.base/share/classes/java/nio/charset/Charset.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
index 4766c907d55..b36e11cdc36 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/src/java.base/share/classes/java/nio/charset/Charset.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
@@ -634,8 +634,8 @@ public static SortedMap<String,Charset> availableCharsets() {
      * upon the locale and charset of the underlying operating system.
      *
      * @return  A charset object for the default charset
-     * @see <a href="http://github.com/lang/System.html#file.encoding">file.encoding</a>
-     * @see <a href="http://github.com/lang/System.html#native.encoding">native.encoding</a>
+     * @see System##file.encoding file.encoding
+     * @see System##native.encoding native.encoding
      *
      * @since 1.5
      */

From 1e61352b54e1ac85fbc6b54a7a29e8782dd42d2c Mon Sep 17 00:00:00 2001
From: Johannes Graham <j3graham@gmail.com>
Date: Thu, 15 May 2025 16:33:35 +0000
Subject: [PATCH 485/901] 8356709: Avoid redundant String formatting in
 BigDecimal.valueOf(double)

Reviewed-by: rgiulietti
---
 .../share/classes/java/math/BigDecimal.java   | 18 +++--
 .../jdk/internal/math/FormattedFPDecimal.java | 73 +++++++++++++++++-
 .../java/math/BigDecimal/ValueOfDouble.java   | 74 +++++++++++++++++++
 .../openjdk/bench/java/math/BigDecimals.java  | 21 +++++-
 4 files changed, 177 insertions(+), 9 deletions(-)
 create mode 100644 test/jdk/java/math/BigDecimal/ValueOfDouble.java

diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index 4304c09630c..eec26ce496d 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -42,6 +42,7 @@
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.math.FormattedFPDecimal;
 import jdk.internal.util.DecimalDigits;
 
 /**
@@ -1393,11 +1394,18 @@ static BigDecimal zeroValueOf(int scale) {
      * @since  1.5
      */
     public static BigDecimal valueOf(double val) {
-        // Reminder: a zero double returns '0.0', so we cannot fastpath
-        // to use the constant ZERO.  This might be important enough to
-        // justify a factory approach, a cache, or a few private
-        // constants, later.
-        return new BigDecimal(Double.toString(val));
+        if (!Double.isFinite(val)) {
+            throw new NumberFormatException("Infinite or NaN");
+        }
+
+        var fmt = FormattedFPDecimal.valueForDoubleToString(Math.abs(val));
+        long s = fmt.getSignificand();
+        if (val < 0) {
+            // Original s is never negative, so no overflow
+            s = -s;
+        }
+
+        return valueOf(s, -fmt.getExp(), fmt.getPrecision());
     }
 
     // Arithmetic Operations
diff --git a/src/java.base/share/classes/jdk/internal/math/FormattedFPDecimal.java b/src/java.base/share/classes/jdk/internal/math/FormattedFPDecimal.java
index ce9b2fc4eea..7bfe63d0507 100644
--- a/src/java.base/share/classes/jdk/internal/math/FormattedFPDecimal.java
+++ b/src/java.base/share/classes/jdk/internal/math/FormattedFPDecimal.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
@@ -57,8 +57,7 @@ private FormattedFPDecimal() {
     }
 
     public static FormattedFPDecimal valueOf(double v, int prec, char form) {
-        FormattedFPDecimal fd = new FormattedFPDecimal();
-        DoubleToDecimal.split(v, fd);
+        FormattedFPDecimal fd = split(v);
         return switch (form) {
             case SCIENTIFIC -> fd.scientific(prec);
             case PLAIN      -> fd.plain(prec);
@@ -69,6 +68,74 @@ public static FormattedFPDecimal valueOf(double v, int prec, char form) {
         };
     }
 
+    private static FormattedFPDecimal split(double v) {
+        FormattedFPDecimal fd = new FormattedFPDecimal();
+        DoubleToDecimal.split(v, fd);
+        return fd;
+    }
+
+    /**
+     * Returns a FormattedFPDecimal with the appropriate precision for
+     * {@link Double#toString(double)}.
+     *
+     * @see java.math.BigDecimal#valueOf(double)
+     */
+    public static FormattedFPDecimal valueForDoubleToString(double v) {
+        final FormattedFPDecimal fd = split(v);
+        final int expR = fd.getExponentRounded();
+
+        // Adjust precision, following rules for Double.toString. There is
+        // always at least one digit and some cases require an extra one to
+        // force a digit after the decimal. No additional rounding is performed;
+        // no significant trailing digits are removed.
+
+        final int targetPrec =
+                // No extra trailing digit needed
+                (-3 <= expR && expR < 0) ? 1
+
+                // Keep digits to left of decimal, plus leave a trailing zero
+                : (0 <= expR && expR < 7) ? expR + 2 :
+
+                // Otherwise, require at least 2 digits, to include trailing
+                // digit when there is a single digit
+                2;
+
+
+        long s = fd.f;
+        int prec = fd.n;
+
+        if (prec < targetPrec) {
+            // Add zeros needed to reach target precision
+            final int addZeros = targetPrec - prec;
+            s *= MathUtils.pow10(addZeros); // addZeros will be at most 8
+            prec = targetPrec;
+        } else {
+            // Remove trailing zeros to try to reach target precision
+            while (prec > targetPrec && s % 10 == 0) {
+                s = s / 10;
+                prec--;
+            }
+        }
+
+        // Calculate new e based on updated precision
+        final int eNew = expR - prec + 1;  // expR is defined as prec + e - 1
+        fd.set(s, eNew, prec);
+
+        return fd;
+    }
+
+    public long getSignificand() {
+        return f;
+    }
+
+    public int getPrecision() {
+        return n;
+    }
+
+    public int getExp() {
+        return e;
+    }
+
     public void set(long f, int e, int n) {
         /* Initially, n = 0 if f = 0, and 10^{n-1} <= f < 10^n if f != 0 */
         this.f = f;
diff --git a/test/jdk/java/math/BigDecimal/ValueOfDouble.java b/test/jdk/java/math/BigDecimal/ValueOfDouble.java
new file mode 100644
index 00000000000..add96f4f030
--- /dev/null
+++ b/test/jdk/java/math/BigDecimal/ValueOfDouble.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.
+ */
+
+/*
+ * @test
+ * @bug 8356709
+ * @summary Test Double.toString(double)
+ * @run junit ValueOfDouble
+ */
+
+
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+
+public class ValueOfDouble {
+    private static final String DIGITS = "1234567000003456789"; // Enough digits to fill a long
+
+    @Test
+    public void testValueOfDouble() {
+        checkValue(0.0);
+        checkValue(-0.0);
+        checkValue(Math.PI);
+        checkValue(-Math.PI);
+        checkValue(Double.MAX_VALUE);
+        checkValue(Double.MIN_VALUE);
+        checkValue(1e-44); // Lots of digits with lots of 9s
+
+        for (int prec = 1; prec < DIGITS.length(); prec++) {
+            String prefix = DIGITS.substring(0, prec);
+            for (int exp = -30; exp < 30; exp++) {
+                double value = Double.parseDouble(prefix + "e" + exp);
+                checkValue(value);
+                checkValue(-value);
+            }
+        }
+    }
+
+    private static void checkValue(double value) {
+        BigDecimal expected = new BigDecimal(Double.toString(value));
+        assertEquals(expected, BigDecimal.valueOf(value));
+    }
+
+    @Test
+    public void testExceptions() {
+        assertThrows(NumberFormatException.class, () -> BigDecimal.valueOf(Double.NaN));
+        assertThrows(NumberFormatException.class, () -> BigDecimal.valueOf(Double.POSITIVE_INFINITY));
+        assertThrows(NumberFormatException.class, () -> BigDecimal.valueOf(Double.NEGATIVE_INFINITY));
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/math/BigDecimals.java b/test/micro/org/openjdk/bench/java/math/BigDecimals.java
index 3c443db013f..e9f5ba90a7b 100644
--- a/test/micro/org/openjdk/bench/java/math/BigDecimals.java
+++ b/test/micro/org/openjdk/bench/java/math/BigDecimals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -227,4 +227,23 @@ public void testCompareTo(Blackhole bh) {
             bh.consume(c.compareTo(s));
         }
     }
+
+
+    /** Invokes the valueOf(double) of BigDecimal with various different values. */
+    @Benchmark
+    @OperationsPerInvocation(TEST_SIZE)
+    public void testValueOfWithDouble(Blackhole bh) {
+        for (double s : doubleInputs) {
+            bh.consume(BigDecimal.valueOf(s));
+        }
+    }
+
+    /** Create BigDecimal from double with Double.toString on different values. */
+    @Benchmark
+    @OperationsPerInvocation(TEST_SIZE)
+    public void testValueOfWithDoubleString(Blackhole bh) {
+        for (double s : doubleInputs) {
+            bh.consume(new BigDecimal(Double.toString(s)));
+        }
+    }
 }

From 850c789a827e21cda3096276d9638f56fae76c3e Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Thu, 15 May 2025 16:35:16 +0000
Subject: [PATCH 486/901] 8349754: Invalid "early reference" error when class
 extends an outer class

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Resolve.java      | 18 +++++++++++++-----
 .../tools/javac/SuperInit/SuperInitGood.java   | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 5719332315f..eea766f57c1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -4008,11 +4008,19 @@ private boolean isAllowedEarlyReference(DiagnosticPosition pos, Env<AttrContext>
      * @param v      The variable
      */
     public boolean isEarlyReference(Env<AttrContext> env, JCTree base, VarSymbol v) {
-        return env.info.ctorPrologue &&
-            (v.flags() & STATIC) == 0 &&
-            v.owner.kind == TYP &&
-            types.isSubtype(env.enclClass.type, v.owner.type) &&
-            (base == null || TreeInfo.isExplicitThisReference(types, (ClassType)env.enclClass.type, base));
+        if (env.info.ctorPrologue &&
+                (v.flags() & STATIC) == 0 &&
+                v.isMemberOf(env.enclClass.sym, types)) {
+
+            // Allow "Foo.this.x" when "Foo" is (also) an outer class, as this refers to the outer instance
+            if (base != null) {
+                return TreeInfo.isExplicitThisReference(types, (ClassType)env.enclClass.type, base);
+            }
+
+            // It's an early reference to an instance field member of the current instance
+            return true;
+        }
+        return false;
     }
 
 /* ***************************************************************************
diff --git a/test/langtools/tools/javac/SuperInit/SuperInitGood.java b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
index 4521f3395ab..5952ecc6615 100644
--- a/test/langtools/tools/javac/SuperInit/SuperInitGood.java
+++ b/test/langtools/tools/javac/SuperInit/SuperInitGood.java
@@ -22,7 +22,7 @@
  */
 /*
  * @test
- * @bug 8194743 8345438 8356551
+ * @bug 8194743 8345438 8356551 8349754
  * @summary Test valid placements of super()/this() in constructors
  */
 
@@ -501,6 +501,17 @@ class Local {
         }
     }
 
+    // Test for JDK-8349754
+    public static class Test24 {
+        private int i;
+        class Sub extends Test24 {
+            Sub() {
+                i = 3;      // here "i" refers to "Test23.this.i", not "this.i" - so it's OK
+                super();
+            }
+        }
+    }
+
     public static void main(String[] args) {
         new Test0();
         new Test1();
@@ -547,5 +558,6 @@ public static void main(String[] args) {
         new Test21((float)123);
         new Test22('x');
         new Test23();
+        new Test24();
     }
 }

From c59debb3844d009ac501a48c31822a07f00521e9 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Thu, 15 May 2025 17:18:56 +0000
Subject: [PATCH 487/901] 8354887: Preserve runtime blobs in AOT code cache

Co-authored-by: Andrew Dinn <adinn@openjdk.org>
Reviewed-by: kvn, adinn
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  63 ++-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |   2 +
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   |  25 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |  48 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  12 +-
 src/hotspot/cpu/x86/runtime_x86_64.cpp        |  25 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |  46 +-
 src/hotspot/cpu/x86/x86_64.ad                 |   3 +-
 src/hotspot/share/asm/codeBuffer.cpp          | 111 +---
 src/hotspot/share/asm/codeBuffer.hpp          | 132 ++++-
 src/hotspot/share/c1/c1_Runtime1.cpp          |  19 +-
 src/hotspot/share/c1/c1_Runtime1.hpp          |   1 +
 src/hotspot/share/cds/archiveBuilder.cpp      |   2 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   3 +
 src/hotspot/share/cds/cds_globals.hpp         |   3 +
 src/hotspot/share/cds/metaspaceShared.cpp     |   2 +-
 src/hotspot/share/code/aotCodeCache.cpp       | 480 ++++++++++++++++--
 src/hotspot/share/code/aotCodeCache.hpp       |  89 +++-
 src/hotspot/share/code/codeBlob.cpp           |  29 +-
 src/hotspot/share/code/codeBlob.hpp           |  17 +-
 src/hotspot/share/oops/compressedKlass.hpp    |   1 +
 src/hotspot/share/oops/method.cpp             |   4 +-
 src/hotspot/share/opto/compile.cpp            |  14 +
 src/hotspot/share/opto/compile.hpp            |   4 +-
 src/hotspot/share/opto/output.cpp             |   2 +
 src/hotspot/share/opto/runtime.cpp            |  31 +-
 src/hotspot/share/opto/runtime.hpp            |   2 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   8 +-
 .../aotCode/AOTCodeCompressedOopsTest.java    | 211 ++++++++
 .../cds/appcds/aotCode/AOTCodeFlags.java      |  97 +++-
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |   9 +-
 31 files changed, 1235 insertions(+), 260 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 967c8710411..f14dda0f812 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -5340,7 +5340,41 @@ bool MacroAssembler::set_klass_decode_mode(address base, int shift, const size_t
   return _klass_decode_mode != KlassDecodeNone;
 }
 
+static Register pick_different_tmp(Register dst, Register src) {
+  auto tmps = RegSet::of(r0, r1, r2) - RegSet::of(src, dst);
+  return *tmps.begin();
+}
+
+void MacroAssembler::encode_klass_not_null_for_aot(Register dst, Register src) {
+  // we have to load the klass base from the AOT constants area but
+  // not the shift because it is not allowed to change
+  int shift = CompressedKlassPointers::shift();
+  assert(shift >= 0 && shift < 4, "unexpected compressd klass shift!");
+  if (dst != src) {
+    // we can load the base into dst, subtract it formthe src and shift down
+    lea(dst, ExternalAddress(CompressedKlassPointers::base_addr()));
+    ldr(dst, dst);
+    sub(dst, src, dst);
+    lsr(dst, dst, shift);
+  } else {
+    // we need an extra register in order to load the coop base
+    Register tmp = pick_different_tmp(dst, src);
+    RegSet regs = RegSet::of(tmp);
+    push(regs, sp);
+    lea(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
+    ldr(tmp, tmp);
+    sub(dst, src, tmp);
+    lsr(dst, dst, shift);
+    pop(regs, sp);
+  }
+}
+
 void MacroAssembler::encode_klass_not_null(Register dst, Register src) {
+  if (AOTCodeCache::is_on_for_dump()) {
+    encode_klass_not_null_for_aot(dst, src);
+    return;
+  }
+
   switch (klass_decode_mode()) {
   case KlassDecodeZero:
     if (CompressedKlassPointers::shift() != 0) {
@@ -5377,9 +5411,36 @@ void MacroAssembler::encode_klass_not_null(Register r) {
   encode_klass_not_null(r, r);
 }
 
+void MacroAssembler::decode_klass_not_null_for_aot(Register dst, Register src) {
+  // we have to load the klass base from the AOT constants area but
+  // not the shift because it is not allowed to change
+  int shift = CompressedKlassPointers::shift();
+  assert(shift >= 0 && shift < 4, "unexpected compressd klass shift!");
+  if (dst != src) {
+    // we can load the base into dst then add the offset with a suitable shift
+    lea(dst, ExternalAddress(CompressedKlassPointers::base_addr()));
+    ldr(dst, dst);
+    add(dst, dst, src, LSL,  shift);
+  } else {
+    // we need an extra register in order to load the coop base
+    Register tmp = pick_different_tmp(dst, src);
+    RegSet regs = RegSet::of(tmp);
+    push(regs, sp);
+    lea(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
+    ldr(tmp, tmp);
+    add(dst, tmp,  src, LSL,  shift);
+    pop(regs, sp);
+  }
+}
+
 void  MacroAssembler::decode_klass_not_null(Register dst, Register src) {
   assert (UseCompressedClassPointers, "should only be used for compressed headers");
 
+  if (AOTCodeCache::is_on_for_dump()) {
+    decode_klass_not_null_for_aot(dst, src);
+    return;
+  }
+
   switch (klass_decode_mode()) {
   case KlassDecodeZero:
     if (CompressedKlassPointers::shift() != 0) {
@@ -6654,7 +6715,7 @@ void MacroAssembler::get_thread(Register dst) {
   protect_return_address();
   push(saved_regs, sp);
 
-  mov(lr, CAST_FROM_FN_PTR(address, JavaThread::aarch64_get_thread_helper));
+  mov(lr, ExternalAddress(CAST_FROM_FN_PTR(address, JavaThread::aarch64_get_thread_helper)));
   blr(lr);
   if (dst != c_rarg0) {
     mov(dst, c_rarg0);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 17ee72a00c0..32506c49cfa 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -935,6 +935,8 @@ class MacroAssembler: public Assembler {
 
   void set_narrow_oop(Register dst, jobject obj);
 
+  void decode_klass_not_null_for_aot(Register dst, Register src);
+  void encode_klass_not_null_for_aot(Register dst, Register src);
   void encode_klass_not_null(Register r);
   void decode_klass_not_null(Register r);
   void encode_klass_not_null(Register dst, Register src);
diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index 2361d584f42..3fcb0e70b57 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -26,6 +26,7 @@
 #ifdef COMPILER2
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/vmreg.hpp"
 #include "interpreter/interpreter.hpp"
 #include "opto/runtime.hpp"
@@ -60,10 +61,15 @@ class SimpleRuntimeFrame {
 
 //------------------------------generate_uncommon_trap_blob--------------------
 UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C2Blob, (uint)OptoStubId::uncommon_trap_id, name);
+  if (blob != nullptr) {
+    return blob->as_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, 2048, 1024);
   if (buffer.blob() == nullptr) {
     return nullptr;
@@ -246,8 +252,10 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Make sure all code is generated
   masm->flush();
 
-  return UncommonTrapBlob::create(&buffer, oop_maps,
-                                                 SimpleRuntimeFrame::framesize >> 1);
+  UncommonTrapBlob *ut_blob = UncommonTrapBlob::create(&buffer, oop_maps,
+                                                       SimpleRuntimeFrame::framesize >> 1);
+  AOTCodeCache::store_code_blob(*ut_blob, AOTCodeEntry::C2Blob, (uint)OptoStubId::uncommon_trap_id, name);
+  return ut_blob;
 }
 
 //------------------------------generate_exception_blob---------------------------
@@ -283,10 +291,15 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
 
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C2Blob, (uint)OptoStubId::exception_id, name);
+  if (blob != nullptr) {
+    return blob->as_exception_blob();
+  }
+
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
   if (buffer.blob() == nullptr) {
     return nullptr;
@@ -384,7 +397,9 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob
-  return ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  ExceptionBlob* ex_blob = ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  AOTCodeCache::store_code_blob(*ex_blob, AOTCodeEntry::C2Blob, (uint)OptoStubId::exception_id, name);
+  return ex_blob;
 }
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 0c3dfabc93e..ed296f60e2d 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -26,6 +26,7 @@
 
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/debugInfoRec.hpp"
@@ -2184,6 +2185,12 @@ void SharedRuntime::generate_deopt_blob() {
   }
 #endif
   const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)SharedStubId::deopt_id, name);
+  if (blob != nullptr) {
+    _deopt_blob = blob->as_deoptimization_blob();
+    return;
+  }
+
   CodeBuffer buffer(name, 2048+pad, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
   int frame_size_in_words;
@@ -2547,6 +2554,8 @@ void SharedRuntime::generate_deopt_blob() {
     _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
   }
 #endif
+
+  AOTCodeCache::store_code_blob(*_deopt_blob, AOTCodeEntry::SharedBlob, (uint)SharedStubId::deopt_id, name);
 }
 
 // Number of stack slots between incoming argument block and the start of
@@ -2575,12 +2584,16 @@ VMReg SharedRuntime::thread_register() {
 SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address call_ptr) {
   assert(is_polling_page_id(id), "expected a polling page stub id");
 
+  // Allocate space for the code.  Setup code generation tools.
+  const char* name = SharedRuntime::stub_name(id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_safepoint_blob();
+  }
+
   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);
 
@@ -2689,7 +2702,10 @@ SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address cal
   masm->flush();
 
   // Fill-out other meta info
-  return SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
+  SafepointBlob* sp_blob = SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
+
+  AOTCodeCache::store_code_blob(*sp_blob, AOTCodeEntry::SharedBlob, (uint)id, name);
+  return sp_blob;
 }
 
 //
@@ -2704,10 +2720,14 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(SharedStubId id, address desti
   assert (StubRoutines::forward_exception_entry() != nullptr, "must be generated before");
   assert(is_resolve_id(id), "expected a resolve stub id");
 
+  const char* name = SharedRuntime::stub_name(id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_runtime_stub();
+  }
+
   // allocate space for the code
   ResourceMark rm;
-
-  const char* name = SharedRuntime::stub_name(id);
   CodeBuffer buffer(name, 1000, 512);
   MacroAssembler* masm                = new MacroAssembler(&buffer);
 
@@ -2780,7 +2800,10 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(SharedStubId id, address desti
 
   // return the  blob
   // frame_size_words or bytes??
-  return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
+  RuntimeStub* rs_blob = RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
+
+  AOTCodeCache::store_code_blob(*rs_blob, AOTCodeEntry::SharedBlob, (uint)id, name);
+  return rs_blob;
 }
 
 // Continuation point for throwing of implicit exceptions that are
@@ -2820,10 +2843,15 @@ RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address ru
   int insts_size = 512;
   int locs_size  = 64;
 
-  ResourceMark rm;
   const char* timer_msg = "SharedRuntime generate_throw_exception";
   TraceTime timer(timer_msg, TRACETIME_LOG(Info, startuptime));
 
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_runtime_stub();
+  }
+
+  ResourceMark rm;
   CodeBuffer code(name, insts_size, locs_size);
   OopMapSet* oop_maps  = new OopMapSet();
   MacroAssembler* masm = new MacroAssembler(&code);
@@ -2850,7 +2878,7 @@ RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address ru
 
   __ mov(c_rarg0, rthread);
   BLOCK_COMMENT("call runtime_entry");
-  __ mov(rscratch1, runtime_entry);
+  __ lea(rscratch1, RuntimeAddress(runtime_entry));
   __ blr(rscratch1);
 
   // Generate oop map
@@ -2883,6 +2911,8 @@ RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address ru
                                   frame_complete,
                                   (framesize >> (LogBytesPerWord - LogBytesPerInt)),
                                   oop_maps, false);
+  AOTCodeCache::store_code_blob(*stub, AOTCodeEntry::SharedBlob, (uint)id, name);
+
   return stub;
 }
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 35e461b601f..30f06533c39 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -5404,7 +5404,11 @@ void  MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
 void MacroAssembler::encode_klass_not_null(Register r, Register tmp) {
   assert_different_registers(r, tmp);
   if (CompressedKlassPointers::base() != nullptr) {
-    mov64(tmp, (int64_t)CompressedKlassPointers::base());
+    if (AOTCodeCache::is_on_for_dump()) {
+      movptr(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
+    } else {
+      mov64(tmp, (int64_t)CompressedKlassPointers::base());
+    }
     subq(r, tmp);
   }
   if (CompressedKlassPointers::shift() != 0) {
@@ -5436,7 +5440,11 @@ void  MacroAssembler::decode_klass_not_null(Register r, Register tmp) {
     shlq(r, CompressedKlassPointers::shift());
   }
   if (CompressedKlassPointers::base() != nullptr) {
-    mov64(tmp, (int64_t)CompressedKlassPointers::base());
+    if (AOTCodeCache::is_on_for_dump()) {
+      movptr(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
+    } else {
+      mov64(tmp, (int64_t)CompressedKlassPointers::base());
+    }
     addq(r, tmp);
   }
 }
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index 027a523b33d..5865bec2e39 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -25,6 +25,7 @@
 #ifdef COMPILER2
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/vmreg.hpp"
 #include "interpreter/interpreter.hpp"
 #include "opto/runtime.hpp"
@@ -56,10 +57,15 @@ class SimpleRuntimeFrame {
 
 //------------------------------generate_uncommon_trap_blob--------------------
 UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C2Blob, (uint)OptoStubId::uncommon_trap_id, name);
+  if (blob != nullptr) {
+    return blob->as_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, 2048, 1024);
   if (buffer.blob() == nullptr) {
     return nullptr;
@@ -228,8 +234,10 @@ UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Make sure all code is generated
   masm->flush();
 
-  return UncommonTrapBlob::create(&buffer, oop_maps,
-                                                 SimpleRuntimeFrame::framesize >> 1);
+  UncommonTrapBlob *ut_blob = UncommonTrapBlob::create(&buffer, oop_maps,
+                                                       SimpleRuntimeFrame::framesize >> 1);
+  AOTCodeCache::store_code_blob(*ut_blob, AOTCodeEntry::C2Blob, (uint)OptoStubId::uncommon_trap_id, name);
+  return ut_blob;
 }
 
 //------------------------------generate_exception_blob---------------------------
@@ -265,10 +273,15 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
 
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C2Blob, (uint)OptoStubId::exception_id, name);
+  if (blob != nullptr) {
+    return blob->as_exception_blob();
+  }
+
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
   CodeBuffer buffer(name, 2048, 1024);
   if (buffer.blob() == nullptr) {
     return nullptr;
@@ -363,6 +376,8 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob
-  return ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  ExceptionBlob* ex_blob = ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  AOTCodeCache::store_code_blob(*ex_blob, AOTCodeEntry::C2Blob, (uint)OptoStubId::exception_id, name);
+  return ex_blob;
 }
 #endif // COMPILER2
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 7811d59d12d..f26d8243ddc 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -27,6 +27,7 @@
 #endif
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/debugInfoRec.hpp"
 #include "code/nativeInst.hpp"
@@ -2600,6 +2601,12 @@ void SharedRuntime::generate_deopt_blob() {
   }
 #endif
   const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)SharedStubId::deopt_id, name);
+  if (blob != nullptr) {
+    _deopt_blob = blob->as_deoptimization_blob();
+    return;
+  }
+
   CodeBuffer buffer(name, 2560+pad, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
   int frame_size_in_words;
@@ -2951,6 +2958,8 @@ void SharedRuntime::generate_deopt_blob() {
     _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset);
   }
 #endif
+
+  AOTCodeCache::store_code_blob(*_deopt_blob, AOTCodeEntry::SharedBlob, (uint)SharedStubId::deopt_id, name);
 }
 
 //------------------------------generate_handler_blob------
@@ -2963,12 +2972,16 @@ SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address cal
          "must be generated before");
   assert(is_polling_page_id(id), "expected a polling page stub id");
 
+  // Allocate space for the code.  Setup code generation tools.
+  const char* name = SharedRuntime::stub_name(id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_safepoint_blob();
+  }
+
   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, 2548, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
@@ -3128,7 +3141,10 @@ SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address cal
   masm->flush();
 
   // Fill-out other meta info
-  return SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
+  SafepointBlob* sp_blob = SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
+
+  AOTCodeCache::store_code_blob(*sp_blob, AOTCodeEntry::SharedBlob, (uint)id, name);
+  return sp_blob;
 }
 
 //
@@ -3143,10 +3159,14 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(SharedStubId id, address desti
   assert (StubRoutines::forward_exception_entry() != nullptr, "must be generated before");
   assert(is_resolve_id(id), "expected a resolve stub id");
 
+  const char* name = SharedRuntime::stub_name(id);
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_runtime_stub();
+  }
+
   // allocate space for the code
   ResourceMark rm;
-
-  const char* name = SharedRuntime::stub_name(id);
   CodeBuffer buffer(name, 1552, 512);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
@@ -3215,7 +3235,10 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(SharedStubId id, address desti
 
   // return the  blob
   // frame_size_words or bytes??
-  return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
+  RuntimeStub* rs_blob = RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
+
+  AOTCodeCache::store_code_blob(*rs_blob, AOTCodeEntry::SharedBlob, (uint)id, name);
+  return rs_blob;
 }
 
 // Continuation point for throwing of implicit exceptions that are
@@ -3253,10 +3276,15 @@ RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address ru
   int insts_size = 512;
   int locs_size  = 64;
 
-  ResourceMark rm;
   const char* timer_msg = "SharedRuntime generate_throw_exception";
   TraceTime timer(timer_msg, TRACETIME_LOG(Info, startuptime));
 
+  CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::SharedBlob, (uint)id, name);
+  if (blob != nullptr) {
+    return blob->as_runtime_stub();
+  }
+
+  ResourceMark rm;
   CodeBuffer code(name, insts_size, locs_size);
   OopMapSet* oop_maps  = new OopMapSet();
   MacroAssembler* masm = new MacroAssembler(&code);
@@ -3314,6 +3342,8 @@ RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address ru
                                   frame_complete,
                                   (framesize >> (LogBytesPerWord - LogBytesPerInt)),
                                   oop_maps, false);
+  AOTCodeCache::store_code_blob(*stub, AOTCodeEntry::SharedBlob, (uint)id, name);
+
   return stub;
 }
 
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 585c1fe938a..751e9bda513 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1859,8 +1859,7 @@ encode %{
   %}
 
   enc_class Java_To_Runtime(method meth) %{
-    // No relocation needed
-    __ mov64(r10, (int64_t) $meth$$method);
+    __ lea(r10, RuntimeAddress((address)$meth$$method));
     __ call(r10);
     __ post_call_nop();
   %}
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index be7a39380d9..ca25cf56be0 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "asm/codeBuffer.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/oopRecorder.inline.hpp"
 #include "compiler/disassembler.hpp"
@@ -1087,104 +1088,10 @@ void CodeBuffer::print_on(outputStream* st) {
   }
 }
 
-// ----- CHeapString -----------------------------------------------------------
-
-class CHeapString : public CHeapObj<mtCode> {
- public:
-  CHeapString(const char* str) : _string(os::strdup(str)) {}
- ~CHeapString() {
-    os::free((void*)_string);
-    _string = nullptr;
-  }
-  const char* string() const { return _string; }
-
- private:
-  const char* _string;
-};
-
-// ----- AsmRemarkCollection ---------------------------------------------------
-
-class AsmRemarkCollection : public CHeapObj<mtCode> {
- public:
-  AsmRemarkCollection() : _ref_cnt(1), _remarks(nullptr), _next(nullptr) {}
- ~AsmRemarkCollection() {
-    assert(is_empty(), "Must 'clear()' before deleting!");
-    assert(_ref_cnt == 0, "No uses must remain when deleting!");
-  }
-  AsmRemarkCollection* reuse() {
-    precond(_ref_cnt > 0);
-    return _ref_cnt++, this;
-  }
-
-  const char* insert(uint offset, const char* remark);
-  const char* lookup(uint offset) const;
-  const char* next(uint offset) const;
-
-  bool is_empty() const { return _remarks == nullptr; }
-  uint clear();
-
- private:
-  struct Cell : CHeapString {
-    Cell(const char* remark, uint offset) :
-        CHeapString(remark), offset(offset), prev(nullptr), next(nullptr) {}
-    void push_back(Cell* cell) {
-      Cell* head = this;
-      Cell* tail = prev;
-      tail->next = cell;
-      cell->next = head;
-      cell->prev = tail;
-      prev = cell;
-    }
-    uint offset;
-    Cell* prev;
-    Cell* next;
-  };
-  uint  _ref_cnt;
-  Cell* _remarks;
-  // Using a 'mutable' iteration pointer to allow 'const' on lookup/next (that
-  // does not change the state of the list per se), supportig a simplistic
-  // iteration scheme.
-  mutable Cell* _next;
-};
-
-// ----- DbgStringCollection ---------------------------------------------------
-
-class DbgStringCollection : public CHeapObj<mtCode> {
- public:
-  DbgStringCollection() : _ref_cnt(1), _strings(nullptr) {}
- ~DbgStringCollection() {
-    assert(is_empty(), "Must 'clear()' before deleting!");
-    assert(_ref_cnt == 0, "No uses must remain when deleting!");
-  }
-  DbgStringCollection* reuse() {
-    precond(_ref_cnt > 0);
-    return _ref_cnt++, this;
-  }
-
-  const char* insert(const char* str);
-  const char* lookup(const char* str) const;
-
-  bool is_empty() const { return _strings == nullptr; }
-  uint clear();
-
- private:
-  struct Cell : CHeapString {
-    Cell(const char* dbgstr) :
-        CHeapString(dbgstr), prev(nullptr), next(nullptr) {}
-    void push_back(Cell* cell) {
-      Cell* head = this;
-      Cell* tail = prev;
-      tail->next = cell;
-      cell->next = head;
-      cell->prev = tail;
-      prev = cell;
-    }
-    Cell* prev;
-    Cell* next;
-  };
-  uint  _ref_cnt;
-  Cell* _strings;
-};
+CHeapString::~CHeapString() {
+  os::free((void*)_string);
+  _string = nullptr;
+}
 
 // ----- AsmRemarks ------------------------------------------------------------
 //
@@ -1210,13 +1117,13 @@ bool AsmRemarks::is_empty() const {
 }
 
 void AsmRemarks::share(const AsmRemarks &src) {
-  precond(is_empty());
+  precond(_remarks == nullptr || is_empty());
   clear();
   _remarks = src._remarks->reuse();
 }
 
 void AsmRemarks::clear() {
-  if (_remarks->clear() == 0) {
+  if (_remarks != nullptr && _remarks->clear() == 0) {
     delete _remarks;
   }
   _remarks = nullptr;
@@ -1262,13 +1169,13 @@ bool DbgStrings::is_empty() const {
 }
 
 void DbgStrings::share(const DbgStrings &src) {
-  precond(is_empty());
+  precond(_strings == nullptr || is_empty());
   clear();
   _strings = src._strings->reuse();
 }
 
 void DbgStrings::clear() {
-  if (_strings->clear() == 0) {
+  if (_strings != nullptr && _strings->clear() == 0) {
     delete _strings;
   }
   _strings = nullptr;
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index 95cd4b7f912..e6dac484649 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -28,6 +28,7 @@
 #include "code/oopRecorder.hpp"
 #include "code/relocInfo.hpp"
 #include "compiler/compiler_globals.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/growableArray.hpp"
@@ -291,8 +292,129 @@ class CodeSection {
 
 #ifndef PRODUCT
 
-class AsmRemarkCollection;
-class DbgStringCollection;
+// ----- CHeapString -----------------------------------------------------------
+
+class CHeapString : public CHeapObj<mtCode> {
+ public:
+  CHeapString(const char* str) : _string(os::strdup(str)) {}
+  ~CHeapString();
+  const char* string() const { return _string; }
+
+ private:
+  const char* _string;
+};
+
+// ----- AsmRemarkCollection ---------------------------------------------------
+
+class AsmRemarkCollection : public CHeapObj<mtCode> {
+ public:
+  AsmRemarkCollection() : _ref_cnt(1), _remarks(nullptr), _next(nullptr) {}
+ ~AsmRemarkCollection() {
+    assert(is_empty(), "Must 'clear()' before deleting!");
+    assert(_ref_cnt == 0, "No uses must remain when deleting!");
+  }
+  AsmRemarkCollection* reuse() {
+    precond(_ref_cnt > 0);
+    return _ref_cnt++, this;
+  }
+
+  const char* insert(uint offset, const char* remark);
+  const char* lookup(uint offset) const;
+  const char* next(uint offset) const;
+
+  bool is_empty() const { return _remarks == nullptr; }
+  uint clear();
+
+  template<typename Function>
+  bool iterate(Function function) const { // lambda enabled API
+    if (_remarks != nullptr) {
+      Cell* tmp = _remarks;
+      do {
+        if(!function(tmp->offset, tmp->string())) {
+          return false;
+        }
+        tmp = tmp->next;
+      } while (tmp != _remarks);
+    }
+    return true;
+  }
+
+ private:
+  struct Cell : CHeapString {
+    Cell(const char* remark, uint offset) :
+        CHeapString(remark), offset(offset), prev(nullptr), next(nullptr) {}
+    void push_back(Cell* cell) {
+      Cell* head = this;
+      Cell* tail = prev;
+      tail->next = cell;
+      cell->next = head;
+      cell->prev = tail;
+      prev = cell;
+    }
+    uint offset;
+    Cell* prev;
+    Cell* next;
+  };
+  uint  _ref_cnt;
+  Cell* _remarks;
+  // Using a 'mutable' iteration pointer to allow 'const' on lookup/next (that
+  // does not change the state of the list per se), supportig a simplistic
+  // iteration scheme.
+  mutable Cell* _next;
+};
+
+// ----- DbgStringCollection ---------------------------------------------------
+
+class DbgStringCollection : public CHeapObj<mtCode> {
+ public:
+  DbgStringCollection() : _ref_cnt(1), _strings(nullptr) {}
+ ~DbgStringCollection() {
+    assert(is_empty(), "Must 'clear()' before deleting!");
+    assert(_ref_cnt == 0, "No uses must remain when deleting!");
+  }
+  DbgStringCollection* reuse() {
+    precond(_ref_cnt > 0);
+    return _ref_cnt++, this;
+  }
+
+  const char* insert(const char* str);
+  const char* lookup(const char* str) const;
+
+  bool is_empty() const { return _strings == nullptr; }
+  uint clear();
+
+  template<typename Function>
+  bool iterate(Function function) const { // lambda enabled API
+    if (_strings != nullptr) {
+      Cell* tmp = _strings;
+      do {
+        if (!function(tmp->string())) {
+          return false;
+        }
+        tmp = tmp->next;
+      } while (tmp != _strings);
+    }
+    return true;
+  }
+
+ private:
+  struct Cell : CHeapString {
+    Cell(const char* dbgstr) :
+        CHeapString(dbgstr), prev(nullptr), next(nullptr) {}
+    void push_back(Cell* cell) {
+      Cell* head = this;
+      Cell* tail = prev;
+      tail->next = cell;
+      cell->next = head;
+      cell->prev = tail;
+      prev = cell;
+    }
+    Cell* prev;
+    Cell* next;
+  };
+  uint  _ref_cnt;
+  Cell* _strings;
+};
 
 // The assumption made here is that most code remarks (or comments) added to
 // the generated assembly code are unique, i.e. there is very little gain in
@@ -315,6 +437,9 @@ class AsmRemarks {
   // For testing purposes only.
   const AsmRemarkCollection* ref() const { return _remarks; }
 
+  template<typename Function>
+  inline bool iterate(Function function) const { return _remarks->iterate(function); }
+
 private:
   AsmRemarkCollection* _remarks;
 };
@@ -337,6 +462,9 @@ class DbgStrings {
   // For testing purposes only.
   const DbgStringCollection* ref() const { return _strings; }
 
+  template<typename Function>
+  bool iterate(Function function) const { return _strings->iterate(function); }
+
 private:
   DbgStringCollection* _strings;
 };
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 0f87a90a417..4bf056fe312 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -31,6 +31,7 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/codeBlob.hpp"
 #include "code/compiledIC.hpp"
 #include "code/scopeDesc.hpp"
@@ -198,6 +199,13 @@ class C1StubIdStubAssemblerCodeGenClosure: public StubAssemblerCodeGenClosure {
 };
 
 CodeBlob* Runtime1::generate_blob(BufferBlob* buffer_blob, C1StubId id, const char* name, bool expect_oop_map, StubAssemblerCodeGenClosure* cl) {
+  if ((int)id >= 0) {
+    CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C1Blob, (uint)id, name, 0, nullptr);
+    if (blob != nullptr) {
+      return blob;
+    }
+  }
+
   ResourceMark rm;
   // create code buffer for code storage
   CodeBuffer code(buffer_blob);
@@ -231,6 +239,9 @@ CodeBlob* Runtime1::generate_blob(BufferBlob* buffer_blob, C1StubId id, const ch
                                                  oop_maps,
                                                  must_gc_arguments,
                                                  false /* alloc_fail_is_fatal */ );
+  if (blob != nullptr && (int)id >= 0) {
+    AOTCodeCache::store_code_blob(*blob, AOTCodeEntry::C1Blob, (uint)id, name, 0, nullptr);
+  }
   return blob;
 }
 
@@ -265,7 +276,13 @@ bool Runtime1::initialize(BufferBlob* blob) {
   initialize_pd();
   // generate stubs
   int limit = (int)C1StubId::NUM_STUBIDS;
-  for (int id = 0; id < limit; id++) {
+  for (int id = 0; id <= (int)C1StubId::forward_exception_id; id++) {
+    if (!generate_blob_for(blob, (C1StubId) id)) {
+      return false;
+    }
+  }
+  AOTCodeCache::init_early_c1_table();
+  for (int id = (int)C1StubId::forward_exception_id+1; id < limit; id++) {
     if (!generate_blob_for(blob, (C1StubId) id)) {
       return false;
     }
diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp
index c09de00ce55..9912b6b515e 100644
--- a/src/hotspot/share/c1/c1_Runtime1.hpp
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp
@@ -54,6 +54,7 @@ enum class C1StubId :int {
 
 class Runtime1: public AllStatic {
   friend class ArrayCopyStub;
+  friend class AOTCodeAddressTable;
 
 public:
   // statistics
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 549b7b3ba6a..a544b4921d4 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -536,7 +536,7 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
              ref->msotype() == MetaspaceObj::MethodCountersType) {
     return set_to_null;
   } else if (ref->msotype() == MetaspaceObj::AdapterHandlerEntryType) {
-    if (AOTCodeCache::is_dumping_adapters()) {
+    if (AOTCodeCache::is_dumping_adapter()) {
       AdapterHandlerEntry* entry = (AdapterHandlerEntry*)ref->obj();
       return AdapterHandlerLibrary::is_abstract_method_adapter(entry) ? set_to_null : make_a_copy;
     } else {
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index d2d1dab95ec..29376e71a93 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -406,6 +406,9 @@ void CDSConfig::check_aot_flags() {
   if (FLAG_IS_DEFAULT(AOTCache) && AOTAdapterCaching) {
     log_debug(aot,codecache,init)("AOTCache is not specified - AOTAdapterCaching is ignored");
   }
+  if (FLAG_IS_DEFAULT(AOTCache) && AOTStubCaching) {
+    log_debug(aot,codecache,init)("AOTCache is not specified - AOTStubCaching is ignored");
+  }
 
   if (FLAG_IS_DEFAULT(AOTCache) && FLAG_IS_DEFAULT(AOTConfiguration) && FLAG_IS_DEFAULT(AOTMode)) {
     // AOTCache/AOTConfiguration/AOTMode not used.
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index 1e58c6a93f8..a7250e9f575 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -135,6 +135,9 @@
   product(bool, AOTAdapterCaching, false, DIAGNOSTIC,                       \
           "Enable saving and restoring i2c2i adapters in AOT cache")        \
                                                                             \
+  product(bool, AOTStubCaching, false, DIAGNOSTIC,                          \
+          "Enable saving and restoring stubs and code blobs in AOT cache")  \
+                                                                            \
   product(uint, AOTCodeMaxSize, 10*M, DIAGNOSTIC,                           \
           "Buffer size in bytes for AOT code caching")                      \
           range(1*M, max_jint)                                              \
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 6ea81c05437..45a41e9f679 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -612,7 +612,7 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
   // Write lambform lines into archive
   LambdaFormInvokers::dump_static_archive_invokers();
 
-  if (AOTCodeCache::is_dumping_adapters()) {
+  if (AOTCodeCache::is_dumping_adapter()) {
     AdapterHandlerLibrary::dump_aot_adapter_table();
   }
 
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index ff9f82f5488..ebd42819375 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+
 #include "asm/macroAssembler.hpp"
 #include "cds/aotCacheAccess.hpp"
 #include "cds/cds_globals.hpp"
@@ -34,6 +35,7 @@
 #include "gc/shared/gcConfig.hpp"
 #include "logging/logStream.hpp"
 #include "memory/memoryReserver.hpp"
+#include "runtime/deoptimization.hpp"
 #include "runtime/flags/flagSetting.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
@@ -42,6 +44,9 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/copy.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
@@ -58,12 +63,19 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+const char* aot_code_entry_kind_name[] = {
+#define DECL_KIND_STRING(kind) XSTR(kind),
+  DO_AOTCODEENTRY_KIND(DECL_KIND_STRING)
+#undef DECL_KIND_STRING
+};
+
 static void report_load_failure() {
   if (AbortVMOnAOTCodeFailure) {
     vm_exit_during_initialization("Unable to use AOT Code Cache.", nullptr);
   }
   log_info(aot, codecache, init)("Unable to use AOT Code Cache.");
   AOTAdapterCaching = false;
+  AOTStubCaching = false;
 }
 
 static void report_store_failure() {
@@ -73,16 +85,41 @@ static void report_store_failure() {
   }
   log_info(aot, codecache, exit)("Unable to create AOT Code Cache.");
   AOTAdapterCaching = false;
+  AOTStubCaching = false;
 }
 
-bool AOTCodeCache::is_dumping_adapters() {
+bool AOTCodeCache::is_dumping_adapter() {
   return AOTAdapterCaching && is_on_for_dump();
 }
 
-bool AOTCodeCache::is_using_adapters()   {
+bool AOTCodeCache::is_using_adapter()   {
   return AOTAdapterCaching && is_on_for_use();
 }
 
+bool AOTCodeCache::is_dumping_stub() {
+  return AOTStubCaching && is_on_for_dump();
+}
+
+bool AOTCodeCache::is_using_stub()   {
+  return AOTStubCaching && is_on_for_use();
+}
+
+static uint32_t encode_id(AOTCodeEntry::Kind kind, int id) {
+  assert(AOTCodeEntry::is_valid_entry_kind(kind), "invalid AOTCodeEntry kind %d", (int)kind);
+  // There can be a conflict of id between an Adapter and *Blob, but that should not cause any functional issue
+  // becasue both id and kind are used to find an entry, and that combination should be unique
+  if (kind == AOTCodeEntry::Adapter) {
+    return id;
+  } else if (kind == AOTCodeEntry::SharedBlob) {
+    return id;
+  } else if (kind == AOTCodeEntry::C1Blob) {
+    return (int)SharedStubId::NUM_STUBIDS + id;
+  } else {
+    // kind must be AOTCodeEntry::C2Blob
+    return (int)SharedStubId::NUM_STUBIDS + COMPILER1_PRESENT((int)C1StubId::NUM_STUBIDS) + id;
+  }
+}
+
 static uint _max_aot_code_size = 0;
 uint AOTCodeCache::max_aot_code_size() {
   return _max_aot_code_size;
@@ -104,15 +141,17 @@ void AOTCodeCache::initialize() {
   bool is_using   = false;
   if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {
     FLAG_SET_ERGO_IF_DEFAULT(AOTAdapterCaching, true);
+    FLAG_SET_ERGO_IF_DEFAULT(AOTStubCaching, true);
     is_dumping = true;
   } else if (CDSConfig::is_using_archive() && CDSConfig::is_using_aot_linked_classes()) {
     FLAG_SET_ERGO_IF_DEFAULT(AOTAdapterCaching, true);
+    FLAG_SET_ERGO_IF_DEFAULT(AOTStubCaching, true);
     is_using = true;
   } else {
     log_info(aot, codecache, init)("AOT Code Cache is not used: AOT Class Linking is not used.");
     return; // nothing to do
   }
-  if (!AOTAdapterCaching) {
+  if (!AOTAdapterCaching && !AOTStubCaching) {
     return; // AOT code caching disabled on command line
   }
   _max_aot_code_size = AOTCodeMaxSize;
@@ -150,9 +189,11 @@ void AOTCodeCache::init2() {
     close();
     report_load_failure();
   }
+
   // initialize the table of external routines so we can save
   // generated code blobs that reference them
   init_extrs_table();
+  init_early_stubs_table();
 }
 
 AOTCodeCache* AOTCodeCache::_cache = nullptr;
@@ -225,7 +266,9 @@ AOTCodeCache::AOTCodeCache(bool is_dumping, bool is_using) :
     }
     log_info (aot, codecache, init)("Loaded %u AOT code entries from AOT Code Cache", _load_header->entries_count());
     log_debug(aot, codecache, init)("  Adapters:  total=%u", _load_header->adapters_count());
-    log_debug(aot, codecache, init)("  All Blobs: total=%u", _load_header->blobs_count());
+    log_debug(aot, codecache, init)("  Shared Blobs: total=%u", _load_header->shared_blobs_count());
+    log_debug(aot, codecache, init)("  C1 Blobs: total=%u", _load_header->C1_blobs_count());
+    log_debug(aot, codecache, init)("  C2 Blobs: total=%u", _load_header->C2_blobs_count());
     log_debug(aot, codecache, init)("  AOT code cache size: %u bytes", _load_header->cache_size());
 
     // Read strings
@@ -248,6 +291,13 @@ void AOTCodeCache::init_extrs_table() {
   }
 }
 
+void AOTCodeCache::init_early_stubs_table() {
+  AOTCodeAddressTable* table = addr_table();
+  if (table != nullptr) {
+    table->init_early_stubs();
+  }
+}
+
 void AOTCodeCache::init_shared_blobs_table() {
   AOTCodeAddressTable* table = addr_table();
   if (table != nullptr) {
@@ -255,6 +305,13 @@ void AOTCodeCache::init_shared_blobs_table() {
   }
 }
 
+void AOTCodeCache::init_early_c1_table() {
+  AOTCodeAddressTable* table = addr_table();
+  if (table != nullptr) {
+    table->init_early_c1();
+  }
+}
+
 AOTCodeCache::~AOTCodeCache() {
   if (_closing) {
     return; // Already closed
@@ -305,6 +362,7 @@ void AOTCodeCache::Config::record() {
     _flags |= restrictContendedPadding;
   }
   _compressedOopShift    = CompressedOops::shift();
+  _compressedOopBase     = CompressedOops::base();
   _compressedKlassShift  = CompressedKlassPointers::shift();
   _contendedPaddingWidth = ContendedPaddingWidth;
   _objectAlignment       = ObjectAlignmentInBytes;
@@ -357,7 +415,7 @@ bool AOTCodeCache::Config::verify() const {
     return false;
   }
   if (_compressedOopShift != (uint)CompressedOops::shift()) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedOops::shift() = %d vs current %d", _compressedOopShift, CompressedOops::shift());
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with different CompressedOops::shift(): %d vs current %d", _compressedOopShift, CompressedOops::shift());
     return false;
   }
   if (_compressedKlassShift != (uint)CompressedKlassPointers::shift()) {
@@ -372,6 +430,13 @@ bool AOTCodeCache::Config::verify() const {
     log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with ObjectAlignmentInBytes = %d vs current %d", _objectAlignment, ObjectAlignmentInBytes);
     return false;
   }
+
+  // This should be the last check as it only disables AOTStubCaching
+  if ((_compressedOopBase == nullptr || CompressedOops::base() == nullptr) && (_compressedOopBase != CompressedOops::base())) {
+    log_debug(aot, codecache, init)("AOTStubCaching is disabled: incompatible CompressedOops::base(): %p vs current %p", _compressedOopBase, CompressedOops::base());
+    AOTStubCaching = false;
+  }
+
   return true;
 }
 
@@ -539,6 +604,31 @@ AOTCodeEntry* AOTCodeCache::find_entry(AOTCodeEntry::Kind kind, uint id) {
       if (check_entry(kind, id, entry)) {
         return entry; // Found
       }
+      // Linear search around to handle id collission
+      for (int i = mid - 1; i >= l; i--) { // search back
+        ix = i * 2;
+        is = _search_entries[ix];
+        if (is != id) {
+          break;
+        }
+        index = _search_entries[ix + 1];
+        AOTCodeEntry* entry = &(_load_entries[index]);
+        if (check_entry(kind, id, entry)) {
+          return entry; // Found
+        }
+      }
+      for (int i = mid + 1; i <= h; i++) { // search forward
+        ix = i * 2;
+        is = _search_entries[ix];
+        if (is != id) {
+          break;
+        }
+        index = _search_entries[ix + 1];
+        AOTCodeEntry* entry = &(_load_entries[index]);
+        if (check_entry(kind, id, entry)) {
+          return entry; // Found
+        }
+      }
       break; // Not found match
     } else if (is < id) {
       l = mid + 1;
@@ -595,7 +685,9 @@ bool AOTCodeCache::finish_write() {
 
     AOTCodeEntry* entries_address = _store_entries; // Pointer to latest entry
     uint adapters_count = 0;
-    uint blobs_count = 0;
+    uint shared_blobs_count = 0;
+    uint C1_blobs_count = 0;
+    uint C2_blobs_count = 0;
     uint max_size = 0;
     // AOTCodeEntry entries were allocated in reverse in store buffer.
     // Process them in reverse order to cache first code first.
@@ -619,8 +711,12 @@ bool AOTCodeCache::finish_write() {
       AOTCodeEntry::Kind kind = entries_address[i].kind();
       if (kind == AOTCodeEntry::Adapter) {
         adapters_count++;
-      } else if (kind == AOTCodeEntry::Blob) {
-        blobs_count++;
+      } else if (kind == AOTCodeEntry::SharedBlob) {
+        shared_blobs_count++;
+      } else if (kind == AOTCodeEntry::C1Blob) {
+        C1_blobs_count++;
+      } else if (kind == AOTCodeEntry::C2Blob) {
+        C2_blobs_count++;
       }
     }
     if (entries_count == 0) {
@@ -652,14 +748,17 @@ bool AOTCodeCache::finish_write() {
     assert(size <= total_size, "%d > %d", size , total_size);
 
     log_debug(aot, codecache, exit)("  Adapters:  total=%u", adapters_count);
-    log_debug(aot, codecache, exit)("  All Blobs: total=%u", blobs_count);
+    log_debug(aot, codecache, exit)("  Shared Blobs:  total=%d", shared_blobs_count);
+    log_debug(aot, codecache, exit)("  C1 Blobs:      total=%d", C1_blobs_count);
+    log_debug(aot, codecache, exit)("  C2 Blobs:      total=%d", C2_blobs_count);
     log_debug(aot, codecache, exit)("  AOT code cache size: %u bytes, max entry's size: %u bytes", size, max_size);
 
     // Finalize header
     AOTCodeCache::Header* header = (AOTCodeCache::Header*)start;
     header->init(size, (uint)strings_count, strings_offset,
                  entries_count, new_entries_offset,
-                 adapters_count, blobs_count);
+                 adapters_count, shared_blobs_count,
+                 C1_blobs_count, C2_blobs_count);
 
     log_info(aot, codecache, exit)("Wrote %d AOT code entries to AOT Code Cache", entries_count);
   }
@@ -675,10 +774,13 @@ bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind
   }
   assert(AOTCodeEntry::is_valid_entry_kind(entry_kind), "invalid entry_kind %d", entry_kind);
 
-  if ((entry_kind == AOTCodeEntry::Adapter) && !AOTAdapterCaching) {
+  if (AOTCodeEntry::is_adapter(entry_kind) && !is_dumping_adapter()) {
+    return false;
+  }
+  if (AOTCodeEntry::is_blob(entry_kind) && !is_dumping_stub()) {
     return false;
   }
-  log_debug(aot, codecache, stubs)("Writing blob '%s' to AOT Code Cache", name);
+  log_debug(aot, codecache, stubs)("Writing blob '%s' (id=%u, kind=%s) to AOT Code Cache", name, id, aot_code_entry_kind_name[entry_kind]);
 
 #ifdef ASSERT
   LogStreamHandle(Trace, aot, codecache, stubs) log;
@@ -728,6 +830,16 @@ bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind
     has_oop_maps = true;
   }
 
+#ifndef PRODUCT
+  // Write asm remarks
+  if (!cache->write_asm_remarks(blob)) {
+    return false;
+  }
+  if (!cache->write_dbg_strings(blob)) {
+    return false;
+  }
+#endif /* PRODUCT */
+
   if (!cache->write_relocations(blob)) {
     return false;
   }
@@ -745,10 +857,10 @@ bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind
     }
   }
   uint entry_size = cache->_write_position - entry_position;
-  AOTCodeEntry* entry = new(cache) AOTCodeEntry(entry_kind, id,
+  AOTCodeEntry* entry = new(cache) AOTCodeEntry(entry_kind, encode_id(entry_kind, id),
                                                 entry_position, entry_size, name_offset, name_size,
                                                 blob_offset, has_oop_maps, blob.content_begin());
-  log_debug(aot, codecache, stubs)("Wrote code blob '%s(id=%d)' to AOT Code Cache", name, id);
+  log_debug(aot, codecache, stubs)("Wrote code blob '%s' (id=%u, kind=%s) to AOT Code Cache", name, id, aot_code_entry_kind_name[entry_kind]);
   return true;
 }
 
@@ -759,17 +871,23 @@ CodeBlob* AOTCodeCache::load_code_blob(AOTCodeEntry::Kind entry_kind, uint id, c
   }
   assert(AOTCodeEntry::is_valid_entry_kind(entry_kind), "invalid entry_kind %d", entry_kind);
 
-  if ((entry_kind == AOTCodeEntry::Adapter) && !AOTAdapterCaching) {
+  if (AOTCodeEntry::is_adapter(entry_kind) && !is_using_adapter()) {
+    return nullptr;
+  }
+  if (AOTCodeEntry::is_blob(entry_kind) && !is_using_stub()) {
     return nullptr;
   }
-  log_debug(aot, codecache, stubs)("Reading blob '%s' from AOT Code Cache", name);
+  log_debug(aot, codecache, stubs)("Reading blob '%s' (id=%u, kind=%s) from AOT Code Cache", name, id, aot_code_entry_kind_name[entry_kind]);
 
-  AOTCodeEntry* entry = cache->find_entry(entry_kind, id);
+  AOTCodeEntry* entry = cache->find_entry(entry_kind, encode_id(entry_kind, id));
   if (entry == nullptr) {
     return nullptr;
   }
   AOTCodeReader reader(cache, entry);
-  return reader.compile_code_blob(name, entry_offset_count, entry_offsets);
+  CodeBlob* blob = reader.compile_code_blob(name, entry_offset_count, entry_offsets);
+
+  log_debug(aot, codecache, stubs)("Read blob '%s' (id=%u, kind=%s) from AOT Code Cache", name, id, aot_code_entry_kind_name[entry_kind]);
+  return blob;
 }
 
 CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_count, int* entry_offsets) {
@@ -802,7 +920,22 @@ CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_co
     oop_maps = read_oop_map_set();
   }
 
-  CodeBlob* code_blob = CodeBlob::create(archived_blob, stored_name, reloc_data, oop_maps);
+#ifndef PRODUCT
+  AsmRemarks asm_remarks;
+  read_asm_remarks(asm_remarks);
+  DbgStrings dbg_strings;
+  read_dbg_strings(dbg_strings);
+#endif // PRODUCT
+
+  CodeBlob* code_blob = CodeBlob::create(archived_blob,
+                                         stored_name,
+                                         reloc_data,
+                                         oop_maps
+#ifndef PRODUCT
+                                         , asm_remarks
+                                         , dbg_strings
+#endif
+                                        );
   if (code_blob == nullptr) { // no space left in CodeCache
     return nullptr;
   }
@@ -824,7 +957,6 @@ CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_co
     entry_offsets[i] = off;
   }
 
-  log_debug(aot, codecache, stubs)("Read blob '%s' from AOT Code Cache", name);
 #ifdef ASSERT
   LogStreamHandle(Trace, aot, codecache, stubs) log;
   if (log.is_enabled()) {
@@ -869,6 +1001,8 @@ bool AOTCodeCache::write_relocations(CodeBlob& code_blob) {
         break;
       case relocInfo::section_word_type:
         break;
+      case relocInfo::post_call_nop_type:
+        break;
       default:
         fatal("relocation %d unimplemented", (int)iter.type());
         break;
@@ -942,6 +1076,8 @@ void AOTCodeReader::fix_relocations(CodeBlob* code_blob) {
         r->fix_relocation_after_aot_load(aot_code_entry()->dumptime_content_start_addr(), code_blob->content_begin());
         break;
       }
+      case relocInfo::post_call_nop_type:
+        break;
       default:
         fatal("relocation %d unimplemented", (int)iter.type());
         break;
@@ -977,6 +1113,88 @@ ImmutableOopMapSet* AOTCodeReader::read_oop_map_set() {
   return oopmaps;
 }
 
+#ifndef PRODUCT
+bool AOTCodeCache::write_asm_remarks(CodeBlob& cb) {
+  // Write asm remarks
+  uint* count_ptr = (uint *)reserve_bytes(sizeof(uint));
+  if (count_ptr == nullptr) {
+    return false;
+  }
+  uint count = 0;
+  bool result = cb.asm_remarks().iterate([&] (uint offset, const char* str) -> bool {
+    log_trace(aot, codecache, stubs)("asm remark offset=%d, str='%s'", offset, str);
+    uint n = write_bytes(&offset, sizeof(uint));
+    if (n != sizeof(uint)) {
+      return false;
+    }
+    const char* cstr = add_C_string(str);
+    int id = _table->id_for_C_string((address)cstr);
+    assert(id != -1, "asm remark string '%s' not found in AOTCodeAddressTable", str);
+    n = write_bytes(&id, sizeof(int));
+    if (n != sizeof(int)) {
+      return false;
+    }
+    count += 1;
+    return true;
+  });
+  *count_ptr = count;
+  return result;
+}
+
+void AOTCodeReader::read_asm_remarks(AsmRemarks& asm_remarks) {
+  // Read asm remarks
+  uint offset = read_position();
+  uint count = *(uint *)addr(offset);
+  offset += sizeof(uint);
+  for (uint i = 0; i < count; i++) {
+    uint remark_offset = *(uint *)addr(offset);
+    offset += sizeof(uint);
+    int remark_string_id = *(uint *)addr(offset);
+    offset += sizeof(int);
+    const char* remark = (const char*)_cache->address_for_C_string(remark_string_id);
+    asm_remarks.insert(remark_offset, remark);
+  }
+  set_read_position(offset);
+}
+
+bool AOTCodeCache::write_dbg_strings(CodeBlob& cb) {
+  // Write dbg strings
+  uint* count_ptr = (uint *)reserve_bytes(sizeof(uint));
+  if (count_ptr == nullptr) {
+    return false;
+  }
+  uint count = 0;
+  bool result = cb.dbg_strings().iterate([&] (const char* str) -> bool {
+    log_trace(aot, codecache, stubs)("dbg string=%s", str);
+    const char* cstr = add_C_string(str);
+    int id = _table->id_for_C_string((address)cstr);
+    assert(id != -1, "db string '%s' not found in AOTCodeAddressTable", str);
+    uint n = write_bytes(&id, sizeof(int));
+    if (n != sizeof(int)) {
+      return false;
+    }
+    count += 1;
+    return true;
+  });
+  *count_ptr = count;
+  return result;
+}
+
+void AOTCodeReader::read_dbg_strings(DbgStrings& dbg_strings) {
+  // Read dbg strings
+  uint offset = read_position();
+  uint count = *(uint *)addr(offset);
+  offset += sizeof(uint);
+  for (uint i = 0; i < count; i++) {
+    int string_id = *(uint *)addr(offset);
+    offset += sizeof(int);
+    const char* str = (const char*)_cache->address_for_C_string(string_id);
+    dbg_strings.insert(str);
+  }
+  set_read_position(offset);
+}
+#endif // PRODUCT
+
 //======================= AOTCodeAddressTable ===============
 
 // address table ids for generated routines, external addresses and C
@@ -986,17 +1204,20 @@ ImmutableOopMapSet* AOTCodeReader::read_oop_map_set() {
 //      [_blobs_base, _blobs_base + _blobs_max -1],
 //      ...
 //      [_c_str_base, _c_str_base + _c_str_max -1],
-#define _extrs_max 13
-#define _blobs_max 10
-#define _all_max   23
 
-#define _extrs_base 0
-#define _blobs_base (_extrs_base + _extrs_max)
-#define _blobs_end  (_blobs_base + _blobs_max)
+#define _extrs_max 100
+#define _stubs_max 3
 
-#if (_blobs_end > _all_max)
-#error AOTCodeAddress table ranges need adjusting
-#endif
+#define _shared_blobs_max 20
+#define _C1_blobs_max 10
+#define _blobs_max (_shared_blobs_max+_C1_blobs_max)
+#define _all_max (_extrs_max+_stubs_max+_blobs_max)
+
+#define _extrs_base 0
+#define _stubs_base (_extrs_base + _extrs_max)
+#define _shared_blobs_base (_stubs_base + _stubs_max)
+#define _C1_blobs_base (_shared_blobs_base + _shared_blobs_max)
+#define _blobs_end  (_shared_blobs_base + _blobs_max)
 
 #define SET_ADDRESS(type, addr)                           \
   {                                                       \
@@ -1008,16 +1229,106 @@ static bool initializing_extrs = false;
 
 void AOTCodeAddressTable::init_extrs() {
   if (_extrs_complete || initializing_extrs) return; // Done already
+
+  assert(_blobs_end <= _all_max, "AOTCodeAddress table ranges need adjusting");
+
   initializing_extrs = true;
   _extrs_addr = NEW_C_HEAP_ARRAY(address, _extrs_max, mtCode);
 
   _extrs_length = 0;
 
-  // Recored addresses of VM runtime methods
+  // Record addresses of VM runtime methods
   SET_ADDRESS(_extrs, SharedRuntime::fixup_callers_callsite);
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method);
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_abstract);
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_ic_miss);
+#if defined(AARCH64)
+  SET_ADDRESS(_extrs, JavaThread::aarch64_get_thread_helper);
+#endif
+  {
+    // Required by Shared blobs
+    SET_ADDRESS(_extrs, Deoptimization::fetch_unroll_info);
+    SET_ADDRESS(_extrs, Deoptimization::unpack_frames);
+    SET_ADDRESS(_extrs, SafepointSynchronize::handle_polling_page_exception);
+    SET_ADDRESS(_extrs, SharedRuntime::resolve_opt_virtual_call_C);
+    SET_ADDRESS(_extrs, SharedRuntime::resolve_virtual_call_C);
+    SET_ADDRESS(_extrs, SharedRuntime::resolve_static_call_C);
+    SET_ADDRESS(_extrs, SharedRuntime::throw_delayed_StackOverflowError);
+    SET_ADDRESS(_extrs, SharedRuntime::throw_AbstractMethodError);
+    SET_ADDRESS(_extrs, SharedRuntime::throw_IncompatibleClassChangeError);
+    SET_ADDRESS(_extrs, SharedRuntime::throw_NullPointerException_at_call);
+  }
+
+#ifdef COMPILER1
+  {
+    // Required by C1 blobs
+    SET_ADDRESS(_extrs, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc));
+    SET_ADDRESS(_extrs, SharedRuntime::exception_handler_for_return_address);
+    SET_ADDRESS(_extrs, SharedRuntime::register_finalizer);
+    SET_ADDRESS(_extrs, Runtime1::is_instance_of);
+    SET_ADDRESS(_extrs, Runtime1::exception_handler_for_pc);
+    SET_ADDRESS(_extrs, Runtime1::check_abort_on_vm_exception);
+    SET_ADDRESS(_extrs, Runtime1::new_instance);
+    SET_ADDRESS(_extrs, Runtime1::counter_overflow);
+    SET_ADDRESS(_extrs, Runtime1::new_type_array);
+    SET_ADDRESS(_extrs, Runtime1::new_object_array);
+    SET_ADDRESS(_extrs, Runtime1::new_multi_array);
+    SET_ADDRESS(_extrs, Runtime1::throw_range_check_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_index_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_div0_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_null_pointer_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_array_store_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_class_cast_exception);
+    SET_ADDRESS(_extrs, Runtime1::throw_incompatible_class_change_error);
+    SET_ADDRESS(_extrs, Runtime1::is_instance_of);
+    SET_ADDRESS(_extrs, Runtime1::monitorenter);
+    SET_ADDRESS(_extrs, Runtime1::monitorexit);
+    SET_ADDRESS(_extrs, Runtime1::deoptimize);
+    SET_ADDRESS(_extrs, Runtime1::access_field_patching);
+    SET_ADDRESS(_extrs, Runtime1::move_klass_patching);
+    SET_ADDRESS(_extrs, Runtime1::move_mirror_patching);
+    SET_ADDRESS(_extrs, Runtime1::move_appendix_patching);
+    SET_ADDRESS(_extrs, Runtime1::predicate_failed_trap);
+    SET_ADDRESS(_extrs, Runtime1::unimplemented_entry);
+    SET_ADDRESS(_extrs, Thread::current);
+    SET_ADDRESS(_extrs, CompressedKlassPointers::base_addr());
+#ifndef PRODUCT
+    SET_ADDRESS(_extrs, os::breakpoint);
+#endif
+  }
+#endif
+
+#ifdef COMPILER2
+  {
+    // Required by C2 blobs
+    SET_ADDRESS(_extrs, Deoptimization::uncommon_trap);
+    SET_ADDRESS(_extrs, OptoRuntime::handle_exception_C);
+    SET_ADDRESS(_extrs, OptoRuntime::new_instance_C);
+    SET_ADDRESS(_extrs, OptoRuntime::new_array_C);
+    SET_ADDRESS(_extrs, OptoRuntime::new_array_nozero_C);
+    SET_ADDRESS(_extrs, OptoRuntime::multianewarray2_C);
+    SET_ADDRESS(_extrs, OptoRuntime::multianewarray3_C);
+    SET_ADDRESS(_extrs, OptoRuntime::multianewarray4_C);
+    SET_ADDRESS(_extrs, OptoRuntime::multianewarray5_C);
+    SET_ADDRESS(_extrs, OptoRuntime::multianewarrayN_C);
+#if INCLUDE_JVMTI
+    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_start);
+    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_end);
+    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_mount);
+    SET_ADDRESS(_extrs, SharedRuntime::notify_jvmti_vthread_unmount);
+#endif
+    SET_ADDRESS(_extrs, OptoRuntime::complete_monitor_locking_C);
+    SET_ADDRESS(_extrs, OptoRuntime::monitor_notify_C);
+    SET_ADDRESS(_extrs, OptoRuntime::monitor_notifyAll_C);
+    SET_ADDRESS(_extrs, OptoRuntime::rethrow_C);
+    SET_ADDRESS(_extrs, OptoRuntime::slow_arraycopy_C);
+    SET_ADDRESS(_extrs, OptoRuntime::register_finalizer_C);
+#if defined(AARCH64)
+    SET_ADDRESS(_extrs, JavaThread::verify_cross_modify_fence_failure);
+#endif // AARCH64
+  }
+#endif // COMPILER2
+
 #if INCLUDE_G1GC
   SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_post_entry);
   SET_ADDRESS(_extrs, G1BarrierSetRuntime::write_ref_field_pre_entry);
@@ -1033,9 +1344,6 @@ void AOTCodeAddressTable::init_extrs() {
   SET_ADDRESS(_extrs, &ZPointerLoadShift);
 #endif
 #endif
-#ifdef COMPILER2
-  SET_ADDRESS(_extrs, OptoRuntime::handle_exception_C);
-#endif
 #ifndef ZERO
 #if defined(AMD64) || defined(AARCH64) || defined(RISCV64)
   SET_ADDRESS(_extrs, MacroAssembler::debug64);
@@ -1046,32 +1354,88 @@ void AOTCodeAddressTable::init_extrs() {
   log_debug(aot, codecache, init)("External addresses recorded");
 }
 
+static bool initializing_early_stubs = false;
+
+void AOTCodeAddressTable::init_early_stubs() {
+  if (_complete || initializing_early_stubs) return; // Done already
+  initializing_early_stubs = true;
+  _stubs_addr = NEW_C_HEAP_ARRAY(address, _stubs_max, mtCode);
+  _stubs_length = 0;
+  SET_ADDRESS(_stubs, StubRoutines::forward_exception_entry());
+
+  {
+    // Required by C1 blobs
+#if defined(AMD64) && !defined(ZERO)
+    SET_ADDRESS(_stubs, StubRoutines::x86::double_sign_flip());
+    SET_ADDRESS(_stubs, StubRoutines::x86::d2l_fixup());
+#endif // AMD64
+  }
+
+  _early_stubs_complete = true;
+  log_info(aot, codecache, init)("Early stubs recorded");
+}
+
 static bool initializing_shared_blobs = false;
 
 void AOTCodeAddressTable::init_shared_blobs() {
   if (_complete || initializing_shared_blobs) return; // Done already
   initializing_shared_blobs = true;
-  _blobs_addr = NEW_C_HEAP_ARRAY(address, _blobs_max, mtCode);
-
-  _blobs_length = 0;       // for shared blobs
-
-  // Recored addresses of generated code blobs
-  SET_ADDRESS(_blobs, SharedRuntime::get_handle_wrong_method_stub());
-  SET_ADDRESS(_blobs, SharedRuntime::get_ic_miss_stub());
+  address* blobs_addr = NEW_C_HEAP_ARRAY(address, _blobs_max, mtCode);
+  _shared_blobs_addr = blobs_addr;
+  _C1_blobs_addr = _shared_blobs_addr + _shared_blobs_max;
+  _shared_blobs_length = _C1_blobs_length = 0;
+
+  // clear the address table
+  memset(blobs_addr, 0, sizeof(address)* _blobs_max);
+
+  // Record addresses of generated code blobs
+  SET_ADDRESS(_shared_blobs, SharedRuntime::get_handle_wrong_method_stub());
+  SET_ADDRESS(_shared_blobs, SharedRuntime::get_ic_miss_stub());
+  SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->unpack());
+  SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->unpack_with_exception());
+  SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->unpack_with_reexecution());
+  SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->unpack_with_exception_in_tls());
+#if INCLUDE_JVMCI
+  if (EnableJVMCI) {
+    SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->uncommon_trap());
+    SET_ADDRESS(_shared_blobs, SharedRuntime::deopt_blob()->implicit_exception_uncommon_trap());
+  }
+#endif
 
   _shared_blobs_complete = true;
   log_debug(aot, codecache, init)("Early shared blobs recorded");
   _complete = true;
 }
 
+void AOTCodeAddressTable::init_early_c1() {
+#ifdef COMPILER1
+  // Runtime1 Blobs
+  for (int i = 0; i <= (int)C1StubId::forward_exception_id; i++) {
+    C1StubId id = (C1StubId)i;
+    if (Runtime1::blob_for(id) == nullptr) {
+      log_info(aot, codecache, init)("C1 blob %s is missing", Runtime1::name_for(id));
+      continue;
+    }
+    if (Runtime1::entry_for(id) == nullptr) {
+      log_info(aot, codecache, init)("C1 blob %s is missing entry", Runtime1::name_for(id));
+      continue;
+    }
+    address entry = Runtime1::entry_for(id);
+    SET_ADDRESS(_C1_blobs, entry);
+  }
+#endif // COMPILER1
+  assert(_C1_blobs_length <= _C1_blobs_max, "increase _C1_blobs_max to %d", _C1_blobs_length);
+  _early_c1_complete = true;
+}
+
 #undef SET_ADDRESS
 
 AOTCodeAddressTable::~AOTCodeAddressTable() {
   if (_extrs_addr != nullptr) {
     FREE_C_HEAP_ARRAY(address, _extrs_addr);
   }
-  if (_blobs_addr != nullptr) {
-    FREE_C_HEAP_ARRAY(address, _blobs_addr);
+  if (_shared_blobs_addr != nullptr) {
+    FREE_C_HEAP_ARRAY(address, _shared_blobs_addr);
   }
 }
 
@@ -1081,7 +1445,7 @@ AOTCodeAddressTable::~AOTCodeAddressTable() {
 #define MAX_STR_COUNT 500
 #endif
 #define _c_str_max  MAX_STR_COUNT
-#define _c_str_base _all_max
+static const int _c_str_base = _all_max;
 
 static const char* _C_strings_in[MAX_STR_COUNT] = {nullptr}; // Incoming strings
 static const char* _C_strings[MAX_STR_COUNT]    = {nullptr}; // Our duplicates
@@ -1237,8 +1601,14 @@ address AOTCodeAddressTable::address_for_id(int idx) {
   if (/* id >= _extrs_base && */ id < _extrs_length) {
     return _extrs_addr[id - _extrs_base];
   }
-  if (id >= _blobs_base && id < _blobs_base + _blobs_length) {
-    return _blobs_addr[id - _blobs_base];
+  if (id >= _stubs_base && id < _stubs_base + _stubs_length) {
+    return _stubs_addr[id - _stubs_base];
+  }
+  if (id >= _shared_blobs_base && id < _shared_blobs_base + _shared_blobs_length) {
+    return _shared_blobs_addr[id - _shared_blobs_base];
+  }
+  if (id >= _C1_blobs_base && id < _C1_blobs_base + _C1_blobs_length) {
+    return _C1_blobs_addr[id - _C1_blobs_base];
   }
   if (id >= _c_str_base && id < (_c_str_base + (uint)_C_strings_count)) {
     return address_for_C_string(id - _c_str_base);
@@ -1262,18 +1632,23 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
   }
   if (StubRoutines::contains(addr)) {
     // Search in stubs
-    StubCodeDesc* desc = StubCodeDesc::desc_for(addr);
-    if (desc == nullptr) {
-      desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
+    id = search_address(addr, _stubs_addr, _stubs_length);
+    if (id < 0) {
+      StubCodeDesc* desc = StubCodeDesc::desc_for(addr);
+      if (desc == nullptr) {
+        desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
+      }
+      const char* sub_name = (desc != nullptr) ? desc->name() : "<unknown>";
+      fatal("Address " INTPTR_FORMAT " for Stub:%s is missing in AOT Code Cache addresses table", p2i(addr), sub_name);
+    } else {
+      return id + _stubs_base;
     }
-    const char* sub_name = (desc != nullptr) ? desc->name() : "<unknown>";
-    fatal("Address " INTPTR_FORMAT " for Stub:%s is missing in AOT Code Cache addresses table", p2i(addr), sub_name);
   } else {
     CodeBlob* cb = CodeCache::find_blob(addr);
     if (cb != nullptr) {
       // Search in code blobs
-      int id_base = _blobs_base;
-      id = search_address(addr, _blobs_addr, _blobs_length);
+      int id_base = _shared_blobs_base;
+      id = search_address(addr, _shared_blobs_addr, _blobs_max);
       if (id < 0) {
         fatal("Address " INTPTR_FORMAT " for Blob:%s is missing in AOT Code Cache addresses table", p2i(addr), cb->name());
       } else {
@@ -1338,4 +1713,3 @@ void AOTCodeCache::print_on(outputStream* st) {
     st->print_cr("failed to map code cache");
   }
 }
-
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
index d5c938e3b8b..0956a37d3b9 100644
--- a/src/hotspot/share/code/aotCodeCache.hpp
+++ b/src/hotspot/share/code/aotCodeCache.hpp
@@ -38,17 +38,27 @@ class AOTCodeCache;
 class AdapterBlob;
 class ExceptionBlob;
 class ImmutableOopMapSet;
+class AsmRemarks;
+class DbgStrings;
 
 enum class vmIntrinsicID : int;
 enum CompLevel : signed char;
 
+#define DO_AOTCODEENTRY_KIND(Fn) \
+  Fn(None) \
+  Fn(Adapter) \
+  Fn(SharedBlob) \
+  Fn(C1Blob) \
+  Fn(C2Blob) \
+
 // Descriptor of AOT Code Cache's entry
 class AOTCodeEntry {
 public:
-  enum Kind {
-    None    = 0,
-    Adapter = 1,
-    Blob    = 2
+  enum Kind : s1 {
+#define DECL_KIND_ENUM(kind) kind,
+    DO_AOTCODEENTRY_KIND(DECL_KIND_ENUM)
+#undef DECL_KIND_ENUM
+    Kind_count
   };
 
 private:
@@ -100,34 +110,49 @@ class AOTCodeEntry {
   bool has_oop_maps() const { return _has_oop_maps; }
   address dumptime_content_start_addr() const { return _dumptime_content_start_addr; }
 
-  static bool is_valid_entry_kind(Kind kind) { return kind == Adapter || kind == Blob; }
+  static bool is_valid_entry_kind(Kind kind) { return kind > None && kind < Kind_count; }
+  static bool is_blob(Kind kind) { return kind == SharedBlob || kind == C1Blob || kind == C2Blob; }
+  static bool is_adapter(Kind kind) { return kind == Adapter; }
 };
 
 // Addresses of stubs, blobs and runtime finctions called from compiled code.
 class AOTCodeAddressTable : public CHeapObj<mtCode> {
 private:
   address* _extrs_addr;
-  address* _blobs_addr;
+  address* _stubs_addr;
+  address* _shared_blobs_addr;
+  address* _C1_blobs_addr;
   uint     _extrs_length;
-  uint     _blobs_length;
+  uint     _stubs_length;
+  uint     _shared_blobs_length;
+  uint     _C1_blobs_length;
 
   bool _extrs_complete;
+  bool _early_stubs_complete;
   bool _shared_blobs_complete;
+  bool _early_c1_complete;
   bool _complete;
 
 public:
   AOTCodeAddressTable() :
     _extrs_addr(nullptr),
-    _blobs_addr(nullptr),
+    _shared_blobs_addr(nullptr),
+    _C1_blobs_addr(nullptr),
     _extrs_length(0),
-    _blobs_length(0),
+    _stubs_length(0),
+    _shared_blobs_length(0),
+    _C1_blobs_length(0),
     _extrs_complete(false),
+    _early_stubs_complete(false),
     _shared_blobs_complete(false),
+    _early_c1_complete(false),
     _complete(false)
   { }
   ~AOTCodeAddressTable();
   void init_extrs();
+  void init_early_stubs();
   void init_shared_blobs();
+  void init_early_c1();
   const char* add_C_string(const char* str);
   int  id_for_C_string(address str);
   address address_for_C_string(int idx);
@@ -140,6 +165,7 @@ class AOTCodeCache : public CHeapObj<mtCode> {
 // Classes used to describe AOT code cache.
 protected:
   class Config {
+    address _compressedOopBase;
     uint _compressedOopShift;
     uint _compressedKlassShift;
     uint _contendedPaddingWidth;
@@ -175,14 +201,17 @@ class AOTCodeCache : public CHeapObj<mtCode> {
     uint   _entries_count;   // number of recorded entries
     uint   _entries_offset;  // offset of AOTCodeEntry array describing entries
     uint   _adapters_count;
-    uint   _blobs_count;
+    uint   _shared_blobs_count;
+    uint   _C1_blobs_count;
+    uint   _C2_blobs_count;
     Config _config;
 
 public:
     void init(uint cache_size,
               uint strings_count,  uint strings_offset,
               uint entries_count,  uint entries_offset,
-              uint adapters_count, uint blobs_count) {
+              uint adapters_count, uint shared_blobs_count,
+              uint C1_blobs_count, uint C2_blobs_count) {
       _version        = AOT_CODE_VERSION;
       _cache_size     = cache_size;
       _strings_count  = strings_count;
@@ -190,8 +219,9 @@ class AOTCodeCache : public CHeapObj<mtCode> {
       _entries_count  = entries_count;
       _entries_offset = entries_offset;
       _adapters_count = adapters_count;
-      _blobs_count    = blobs_count;
-
+      _shared_blobs_count = shared_blobs_count;
+      _C1_blobs_count = C1_blobs_count;
+      _C2_blobs_count = C2_blobs_count;
       _config.record();
     }
 
@@ -202,7 +232,9 @@ class AOTCodeCache : public CHeapObj<mtCode> {
     uint entries_count()  const { return _entries_count; }
     uint entries_offset() const { return _entries_offset; }
     uint adapters_count() const { return _adapters_count; }
-    uint blobs_count()    const { return _blobs_count; }
+    uint shared_blobs_count()    const { return _shared_blobs_count; }
+    uint C1_blobs_count() const { return _C1_blobs_count; }
+    uint C2_blobs_count() const { return _C2_blobs_count; }
 
     bool verify_config(uint load_size)  const;
     bool verify_vm_config() const { // Called after Universe initialized
@@ -267,8 +299,11 @@ class AOTCodeCache : public CHeapObj<mtCode> {
   int store_strings();
 
   static void init_extrs_table() NOT_CDS_RETURN;
+  static void init_early_stubs_table() NOT_CDS_RETURN;
   static void init_shared_blobs_table() NOT_CDS_RETURN;
+  static void init_early_c1_table() NOT_CDS_RETURN;
 
+  address address_for_C_string(int idx) const { return _table->address_for_C_string(idx); }
   address address_for_id(int id) const { return _table->address_for_id(id); }
 
   bool for_use()  const { return _for_use  && !_failed; }
@@ -288,17 +323,21 @@ class AOTCodeCache : public CHeapObj<mtCode> {
 
   bool write_relocations(CodeBlob& code_blob);
   bool write_oop_map_set(CodeBlob& cb);
+#ifndef PRODUCT
+  bool write_asm_remarks(CodeBlob& cb);
+  bool write_dbg_strings(CodeBlob& cb);
+#endif // PRODUCT
 
   static bool store_code_blob(CodeBlob& blob,
                               AOTCodeEntry::Kind entry_kind,
                               uint id, const char* name,
-                              int entry_offset_count,
-                              int* entry_offsets) NOT_CDS_RETURN_(false);
+                              int entry_offset_count = 0,
+                              int* entry_offsets = nullptr) NOT_CDS_RETURN_(false);
 
   static CodeBlob* load_code_blob(AOTCodeEntry::Kind kind,
                                   uint id, const char* name,
-                                  int entry_offset_count,
-                                  int* entry_offsets) NOT_CDS_RETURN_(nullptr);
+                                  int entry_offset_count = 0,
+                                  int* entry_offsets = nullptr) NOT_CDS_RETURN_(nullptr);
 
   static uint store_entries_cnt() {
     if (is_on_for_dump()) {
@@ -328,8 +367,11 @@ class AOTCodeCache : public CHeapObj<mtCode> {
   static bool is_on_for_use()  { return is_on() && _cache->for_use(); }
   static bool is_on_for_dump() { return is_on() && _cache->for_dump(); }
 
-  static bool is_dumping_adapters() NOT_CDS_RETURN_(false);
-  static bool is_using_adapters() NOT_CDS_RETURN_(false);
+  static bool is_dumping_adapter() NOT_CDS_RETURN_(false);
+  static bool is_using_adapter() NOT_CDS_RETURN_(false);
+
+  static bool is_dumping_stub() NOT_CDS_RETURN_(false);
+  static bool is_using_stub() NOT_CDS_RETURN_(false);
 
   static const char* add_C_string(const char* str) NOT_CDS_RETURN_(str);
 
@@ -361,5 +403,10 @@ class AOTCodeReader {
   ImmutableOopMapSet* read_oop_map_set();
 
   void fix_relocations(CodeBlob* code_blob);
+#ifndef PRODUCT
+  void read_asm_remarks(AsmRemarks& asm_remarks);
+  void read_dbg_strings(DbgStrings& dbg_strings);
+#endif // PRODUCT
 };
-#endif // SHARE_CODE_AOTCODECACH_HPP
+
+#endif // SHARE_CODE_AOTCODECACHE_HPP
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 1512f498b37..da0408d1270 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -264,7 +264,11 @@ void CodeBlob::post_restore() {
   vptr(_kind)->post_restore(this);
 }
 
-CodeBlob* CodeBlob::restore(address code_cache_buffer, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps) {
+CodeBlob* CodeBlob::restore(address code_cache_buffer,
+                            const char* name,
+                            address archived_reloc_data,
+                            ImmutableOopMapSet* archived_oop_maps)
+{
   copy_to(code_cache_buffer);
   CodeBlob* code_blob = (CodeBlob*)code_cache_buffer;
   code_blob->set_name(name);
@@ -273,7 +277,16 @@ CodeBlob* CodeBlob::restore(address code_cache_buffer, const char* name, address
   return code_blob;
 }
 
-CodeBlob* CodeBlob::create(CodeBlob* archived_blob, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps) {
+CodeBlob* CodeBlob::create(CodeBlob* archived_blob,
+                           const char* name,
+                           address archived_reloc_data,
+                           ImmutableOopMapSet* archived_oop_maps
+#ifndef PRODUCT
+                           , AsmRemarks& archived_asm_remarks
+                           , DbgStrings& archived_dbg_strings
+#endif // PRODUCT
+                          )
+{
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
 
   CodeCache::gc_on_allocation();
@@ -284,7 +297,17 @@ CodeBlob* CodeBlob::create(CodeBlob* archived_blob, const char* name, address ar
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     address code_cache_buffer = (address)CodeCache::allocate(size, CodeBlobType::NonNMethod);
     if (code_cache_buffer != nullptr) {
-      blob = archived_blob->restore(code_cache_buffer, name, archived_reloc_data, archived_oop_maps);
+      blob = archived_blob->restore(code_cache_buffer,
+                                    name,
+                                    archived_reloc_data,
+                                    archived_oop_maps);
+#ifndef PRODUCT
+      blob->use_remarks(archived_asm_remarks);
+      archived_asm_remarks.clear();
+      blob->use_strings(archived_dbg_strings);
+      archived_dbg_strings.clear();
+#endif // PRODUCT
+
       assert(blob != nullptr, "sanity check");
       // Flush the code block
       ICache::invalidate_range(blob->code_begin(), blob->code_size());
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 37f83824987..f813752e01e 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -99,6 +99,9 @@ class RuntimeStub;     // for as_runtime_stub()
 class JavaFrameAnchor; // for UpcallStub::jfa_for_frame
 class AdapterBlob;
 class ExceptionBlob;
+class DeoptimizationBlob;
+class SafepointBlob;
+class UncommonTrapBlob;
 
 class CodeBlob {
   friend class VMStructs;
@@ -205,8 +208,12 @@ class CodeBlob {
   nmethod* as_nmethod() const                 { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
   CodeBlob* as_codeblob() const               { return (CodeBlob*) this; }
   AdapterBlob* as_adapter_blob() const        { assert(is_adapter_blob(), "must be adapter blob"); return (AdapterBlob*) this; }
+  ExceptionBlob* as_exception_blob() const    { assert(is_exception_stub(), "must be exception stub"); return (ExceptionBlob*) this; }
+  DeoptimizationBlob* as_deoptimization_blob() const { assert(is_deoptimization_stub(), "must be deopt stub"); return (DeoptimizationBlob*) this; }
+  SafepointBlob* as_safepoint_blob() const    { assert(is_safepoint_stub(), "must be safepoint stub"); return (SafepointBlob*) 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; }
+  UncommonTrapBlob* as_uncommon_trap_blob() const { assert(is_uncommon_trap_stub(), "must be uncommon trap stub"); return (UncommonTrapBlob*) this; }
 
   // Boundaries
   address    header_begin() const             { return (address)    this; }
@@ -308,7 +315,15 @@ class CodeBlob {
   // methods to restore a blob from AOT code cache into the CodeCache
   void post_restore();
   CodeBlob* restore(address code_cache_buffer, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps);
-  static CodeBlob* create(CodeBlob* archived_blob, const char* name, address archived_reloc_data, ImmutableOopMapSet* archived_oop_maps);
+  static CodeBlob* create(CodeBlob* archived_blob,
+                          const char* name,
+                          address archived_reloc_data,
+                          ImmutableOopMapSet* archived_oop_maps
+#ifndef PRODUCT
+                          , AsmRemarks& archived_asm_remarks
+                          , DbgStrings& archived_dbg_strings
+#endif // PRODUCT
+                         );
 };
 
 //----------------------------------------------------------------------------------------------------
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index 4ce644d9cef..a07e758be7b 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -213,6 +213,7 @@ class CompressedKlassPointers : public AllStatic {
 
   // Can only be used after initialization
   static address  base()             { check_init(_base); return  _base; }
+  static address  base_addr()        { return  (address)&_base; }
   static int      shift()            { check_init(_shift); return  _shift; }
 
   static address  klass_range_start()  { return  _klass_range_start; }
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index ce7d77a38cc..7496fe7c4e6 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -407,7 +407,7 @@ void Method::metaspace_pointers_do(MetaspaceClosure* it) {
 
 void Method::remove_unshareable_info() {
   unlink_method();
-  if (AOTCodeCache::is_dumping_adapters() && _adapter != nullptr) {
+  if (AOTCodeCache::is_dumping_adapter() && _adapter != nullptr) {
     _adapter->remove_unshareable_info();
   }
   JFR_ONLY(REMOVE_METHOD_ID(this);)
@@ -1146,7 +1146,7 @@ void Method::unlink_code() {
 void Method::unlink_method() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   _code = nullptr;
-  if (!AOTCodeCache::is_dumping_adapters() || AdapterHandlerLibrary::is_abstract_method_adapter(_adapter)) {
+  if (!AOTCodeCache::is_dumping_adapter() || AdapterHandlerLibrary::is_abstract_method_adapter(_adapter)) {
     _adapter = nullptr;
   }
   _i2i_entry = nullptr;
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 10846a32626..64d21a59655 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -26,6 +26,7 @@
 #include "asm/macroAssembler.inline.hpp"
 #include "ci/ciReplay.hpp"
 #include "classfile/javaClasses.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/exceptionHandlerTable.hpp"
 #include "code/nmethod.hpp"
 #include "compiler/compilationFailureInfo.hpp"
@@ -630,6 +631,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _ilt(nullptr),
       _stub_function(nullptr),
       _stub_name(nullptr),
+      _stub_id(-1),
       _stub_entry_point(nullptr),
       _max_node_limit(MaxNodeLimit),
       _post_loop_opts_phase(false),
@@ -899,6 +901,7 @@ Compile::Compile(ciEnv* ci_env,
                  TypeFunc_generator generator,
                  address stub_function,
                  const char* stub_name,
+                 int stub_id,
                  int is_fancy_jump,
                  bool pass_tls,
                  bool return_pc,
@@ -910,6 +913,7 @@ Compile::Compile(ciEnv* ci_env,
       _entry_bci(InvocationEntryBci),
       _stub_function(stub_function),
       _stub_name(stub_name),
+      _stub_id(stub_id),
       _stub_entry_point(nullptr),
       _max_node_limit(MaxNodeLimit),
       _post_loop_opts_phase(false),
@@ -961,6 +965,16 @@ Compile::Compile(ciEnv* ci_env,
       _allowed_reasons(0) {
   C = this;
 
+  // try to reuse an existing stub
+  {
+    CodeBlob* blob = AOTCodeCache::load_code_blob(AOTCodeEntry::C2Blob, _stub_id, stub_name);
+    if (blob != nullptr) {
+      RuntimeStub* rs = blob->as_runtime_stub();
+      _stub_entry_point = rs->entry_point();
+      return;
+    }
+  }
+
   TraceTime t1(nullptr, &_t_totalCompilation, CITime, false);
   TraceTime t2(nullptr, &_t_stubCompilation, CITime, false);
 
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 6d43948964e..f67d2839611 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -308,6 +308,7 @@ class Compile : public Phase {
   InlineTree*           _ilt;                   // Ditto (temporary).
   address               _stub_function;         // VM entry for stub being compiled, or null
   const char*           _stub_name;             // Name of stub or adapter being compiled, or null
+  int                   _stub_id;               // unique id for stub or -1
   address               _stub_entry_point;      // Compile code entry for generated stub, or null
 
   // Control of this compilation.
@@ -570,6 +571,7 @@ class Compile : public Phase {
   InlineTree*       ilt() const                 { return _ilt; }
   address           stub_function() const       { return _stub_function; }
   const char*       stub_name() const           { return _stub_name; }
+  int               stub_id() const             { return _stub_id; }
   address           stub_entry_point() const    { return _stub_entry_point; }
   void          set_stub_entry_point(address z) { _stub_entry_point = z; }
 
@@ -1140,7 +1142,7 @@ class Compile : public Phase {
   // convention.
   Compile(ciEnv* ci_env, const TypeFunc *(*gen)(),
           address stub_function, const char *stub_name,
-          int is_fancy_jump, bool pass_tls,
+          int stub_id, int is_fancy_jump, bool pass_tls,
           bool return_pc, DirectiveSet* directive);
 
   ~Compile();
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 1cd6ebabc4b..930c355fa62 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "asm/assembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
@@ -3487,6 +3488,7 @@ void PhaseOutput::install_stub(const char* stub_name) {
       } else {
         assert(rs->is_runtime_stub(), "sanity check");
         C->set_stub_entry_point(rs->entry_point());
+        AOTCodeCache::store_code_blob(*rs, AOTCodeEntry::C2Blob, C->stub_id(), stub_name);
       }
     }
   }
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 7f57bff15ed..c85bf28e9f3 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -140,6 +140,7 @@ static bool check_compiled_frame(JavaThread* thread) {
 #define C2_STUB_TYPEFUNC(name) name ## _Type
 #define C2_STUB_C_FUNC(name) CAST_FROM_FN_PTR(address, name ## _C)
 #define C2_STUB_NAME(name) stub_name(OptoStubId::name ## _id)
+#define C2_STUB_ID(name) OptoStubId::name ## _id
 
 // Almost all the C functions targeted from the generated stubs are
 // implemented locally to OptoRuntime with names that can be generated
@@ -152,27 +153,29 @@ static bool check_compiled_frame(JavaThread* thread) {
 
 #define GEN_C2_STUB(name, fancy_jump, pass_tls, pass_retpc  )         \
   C2_STUB_FIELD_NAME(name) =                                          \
-    generate_stub(env,                                                  \
+    generate_stub(env,                                                \
                   C2_STUB_TYPEFUNC(name),                             \
                   C2_STUB_C_FUNC(name),                               \
                   C2_STUB_NAME(name),                                 \
-                  fancy_jump,                                           \
-                  pass_tls,                                             \
-                  pass_retpc);                                          \
+                  (int)C2_STUB_ID(name),                              \
+                  fancy_jump,                                         \
+                  pass_tls,                                           \
+                  pass_retpc);                                        \
   if (C2_STUB_FIELD_NAME(name) == nullptr) { return false; }          \
 
 #define C2_JVMTI_STUB_C_FUNC(name) CAST_FROM_FN_PTR(address, SharedRuntime::name)
 
 #define GEN_C2_JVMTI_STUB(name)                                       \
-  STUB_FIELD_NAME(name) =                                               \
-    generate_stub(env,                                                  \
-                  notify_jvmti_vthread_Type,                            \
+  STUB_FIELD_NAME(name) =                                             \
+    generate_stub(env,                                                \
+                  notify_jvmti_vthread_Type,                          \
                   C2_JVMTI_STUB_C_FUNC(name),                         \
                   C2_STUB_NAME(name),                                 \
-                  0,                                                    \
-                  true,                                                 \
-                  false);                                               \
-  if (STUB_FIELD_NAME(name) == nullptr) { return false; }               \
+                  (int)C2_STUB_ID(name),                              \
+                  0,                                                  \
+                  true,                                               \
+                  false);                                             \
+  if (STUB_FIELD_NAME(name) == nullptr) { return false; }             \
 
 bool OptoRuntime::generate(ciEnv* env) {
 
@@ -276,15 +279,15 @@ const TypeFunc* OptoRuntime::_dtrace_object_alloc_Type            = nullptr;
 // Helper method to do generation of RunTimeStub's
 address OptoRuntime::generate_stub(ciEnv* env,
                                    TypeFunc_generator gen, address C_function,
-                                   const char *name, int is_fancy_jump,
-                                   bool pass_tls,
+                                   const char *name, int stub_id,
+                                   int is_fancy_jump, bool pass_tls,
                                    bool return_pc) {
 
   // 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);
+  Compile C(env, gen, C_function, name, stub_id, is_fancy_jump, pass_tls, return_pc, directive);
   DirectivesStack::release(directive);
   return  C.stub_entry_point();
 }
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index 633cced0090..c3550839758 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -217,7 +217,7 @@ class OptoRuntime : public AllStatic {
   static const char *_stub_names[];
 
   // define stubs
-  static address generate_stub(ciEnv* ci_env, TypeFunc_generator gen, address C_function, const char* name, int is_fancy_jump, bool pass_tls, bool return_pc);
+  static address generate_stub(ciEnv* ci_env, TypeFunc_generator gen, address C_function, const char* name, int stub_id, int is_fancy_jump, bool pass_tls, bool return_pc);
 
   //
   // Implementation of runtime methods
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 733e8a78d90..7bfb9c62909 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -2456,7 +2456,7 @@ AdapterHandlerEntry* AdapterHandlerLibrary::lookup(int total_args_passed, BasicT
 #if INCLUDE_CDS
   // if we are building the archive then the archived adapter table is
   // not valid and we need to use the ones added to the runtime table
-  if (!AOTCodeCache::is_dumping_adapters()) {
+  if (!AOTCodeCache::is_dumping_adapter()) {
     // Search archived table first. It is read-only table so can be searched without lock
     entry = _aot_adapter_handler_table.lookup(fp, fp->compute_hash(), 0 /* unused */);
     if (entry != nullptr) {
@@ -2838,7 +2838,7 @@ bool AdapterHandlerLibrary::generate_adapter_code(AdapterBlob*& adapter_blob,
     // and we're some non descript Java thread.
     return false;
   }
-  if (!is_transient && AOTCodeCache::is_dumping_adapters()) {
+  if (!is_transient && AOTCodeCache::is_dumping_adapter()) {
     // try to save generated code
     const char* name = AdapterHandlerLibrary::name(handler->fingerprint());
     const uint32_t id = AdapterHandlerLibrary::id(handler->fingerprint());
@@ -2850,7 +2850,7 @@ bool AdapterHandlerLibrary::generate_adapter_code(AdapterBlob*& adapter_blob,
     entry_offset[2] = handler->get_c2i_unverified_entry() - i2c_entry;
     entry_offset[3] = handler->get_c2i_no_clinit_check_entry() - i2c_entry;
     bool success = AOTCodeCache::store_code_blob(*adapter_blob, AOTCodeEntry::Adapter, id, name, AdapterHandlerEntry::ENTRIES_COUNT, entry_offset);
-    assert(success || !AOTCodeCache::is_dumping_adapters(), "caching of adapter must be disabled");
+    assert(success || !AOTCodeCache::is_dumping_adapter(), "caching of adapter must be disabled");
   }
   handler->relocate(adapter_blob->content_begin());
 #ifndef PRODUCT
@@ -2961,7 +2961,7 @@ void AdapterHandlerEntry::link() {
   // Generate code only if AOTCodeCache is not available, or
   // caching adapters is disabled, or we fail to link
   // the AdapterHandlerEntry to its code in the AOTCodeCache
-  if (AOTCodeCache::is_using_adapters()) {
+  if (AOTCodeCache::is_using_adapter()) {
     adapter_blob = AdapterHandlerLibrary::link_aot_adapter_handler(this);
     if (adapter_blob == nullptr) {
       log_warning(cds)("Failed to link AdapterHandlerEntry (fp=%s) to its code in the AOT code cache", _fingerprint->as_basic_args_string());
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
new file mode 100644
index 00000000000..a65db6956c4
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -0,0 +1,211 @@
+/*
+ * 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 of AOT Code Cache with compressed oops configurations
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.flagless
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/setup_aot
+ * @build AOTCodeCompressedOopsTest JavacBenchApp
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *             JavacBenchApp
+ *             JavacBenchApp$ClassFile
+ *             JavacBenchApp$FileManager
+ *             JavacBenchApp$SourceFile
+ * @run driver AOTCodeCompressedOopsTest
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AOTCodeCompressedOopsTest {
+    public static void main(String... args) throws Exception {
+        {
+            Tester t = new Tester();
+            t.setHeapConfig(Tester.RunMode.ASSEMBLY, true, true);
+            t.runAOTAssemblyWorkflow();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, true);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, false);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, false, false);
+            t.productionRun();
+        }
+        {
+            Tester t = new Tester();
+            t.setHeapConfig(Tester.RunMode.ASSEMBLY, true, false);
+            t.runAOTAssemblyWorkflow();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, true);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, false);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, false, false);
+            t.productionRun();
+        }
+        {
+            Tester t = new Tester();
+            t.setHeapConfig(Tester.RunMode.ASSEMBLY, false, false);
+            t.runAOTAssemblyWorkflow();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, true);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, true, false);
+            t.productionRun();
+            t.setHeapConfig(Tester.RunMode.PRODUCTION, false, false);
+            t.productionRun();
+        }
+    }
+    static class Tester extends CDSAppTester {
+        boolean zeroBaseInAsmPhase, zeroBaseInProdPhase;
+        boolean zeroShiftInAsmPhase, zeroShiftInProdPhase;
+
+        public Tester() {
+            super("AOTCodeCompressedOopsTest");
+        }
+
+        public void setHeapConfig(RunMode runMode, boolean isBaseZero, boolean isShiftZero) {
+            if (runMode == RunMode.ASSEMBLY) {
+                zeroBaseInAsmPhase = isBaseZero;
+                zeroShiftInAsmPhase = isShiftZero;
+            } else if (runMode == RunMode.PRODUCTION) {
+                zeroBaseInProdPhase = isBaseZero;
+                zeroShiftInProdPhase = isShiftZero;
+            }
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return "app.jar";
+        }
+
+        List<String> getVMArgsForHeapConfig(boolean isBaseZero, boolean isShiftZero) {
+            List<String> list = new ArrayList<String>();
+            // Note the VM options used are best-effort to get the desired base and shift,
+            // but it is OS dependent, so we may not get the desired configuration.
+            if (isBaseZero && isShiftZero) {
+                list.add("-Xmx128m"); // Set max heap < 4G;
+            } else if (isBaseZero && !isShiftZero) {
+                list.add("-Xmx6g"); // Set max heap > 4G for shift to be non-zero
+            } else if (!isBaseZero && !isShiftZero) {
+                list.add("-Xmx6g");
+                list.add("-XX:HeapBaseMinAddress=32g");
+            }
+            return list;
+       }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            switch (runMode) {
+            case RunMode.ASSEMBLY: {
+                    List<String> args = getVMArgsForHeapConfig(zeroBaseInAsmPhase, zeroShiftInAsmPhase);
+                    args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
+                                        "-Xlog:cds=info",
+                                        "-Xlog:aot+codecache+init=debug",
+                                        "-Xlog:aot+codecache+exit=debug"));
+                    return args.toArray(new String[0]);
+                }
+            case RunMode.PRODUCTION: {
+                    List<String> args = getVMArgsForHeapConfig(zeroBaseInProdPhase, zeroShiftInProdPhase);
+                    args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
+                                        "-Xlog:cds=info", // we need this to parse CompressedOops settings
+                                        "-Xlog:aot+codecache+init=debug",
+                                        "-Xlog:aot+codecache+exit=debug"));
+                    return args.toArray(new String[0]);
+                }
+            }
+            return new String[] {};
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                "JavacBenchApp", "10"
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.PRODUCTION) {
+                 int aotCacheShift = -1, currentShift = -1;
+                 long aotCacheBase = -1, currentBase = -1;
+                 List<String> list = out.asLines();
+                 /* We tried to have CompressedOops settings as per the test requirement,
+                  * but it ultimately depends on OS and is not guaranteed that we have got the desired settings.
+                  * So we parse the log output from the production run to get the real settings.
+                  *
+                  * Parse the following Xlog:cds output to get the values of CompressedOops::base and CompressedOops::shift
+                  * used during the AOTCache assembly and production run:
+                  *
+                  *    [0.022s][info][cds] CDS archive was created with max heap size = 1024M, and the following configuration:
+                  *    [0.022s][info][cds]     narrow_klass_base at mapping start address, narrow_klass_pointer_bits = 32, narrow_klass_shift = 0
+                  *    [0.022s][info][cds]     narrow_oop_mode = 1, narrow_oop_base = 0x0000000000000000, narrow_oop_shift = 3
+                  *    [0.022s][info][cds] The current max heap size = 31744M, G1HeapRegion::GrainBytes = 16777216
+                  *    [0.022s][info][cds]     narrow_klass_base = 0x000007fc00000000, arrow_klass_pointer_bits = 32, narrow_klass_shift = 0
+                  *    [0.022s][info][cds]     narrow_oop_mode = 3, narrow_oop_base = 0x0000000300000000, narrow_oop_shift = 3
+                  *    [0.022s][info][cds]     heap range = [0x0000000301000000 - 0x0000000ac1000000]
+                  */
+                 Pattern p = Pattern.compile("narrow_oop_base = 0x(\\d+), narrow_oop_shift = (\\d)");
+                 for (int i = 0; i < list.size(); i++) {
+                     String line = list.get(i);
+                     if (line.indexOf("CDS archive was created with max heap size") != -1) {
+                         // Parse AOT Cache CompressedOops settings
+                         line = list.get(i+2);
+                         Matcher m = p.matcher(line);
+                         if (!m.find()) {
+                             throw new RuntimeException("Pattern \"" + p + "\" not found in the output");
+                         }
+                         aotCacheBase = Long.valueOf(m.group(1), 16);
+                         aotCacheShift = Integer.valueOf(m.group(2));
+                         // Parse current CompressedOops settings
+                         line = list.get(i+5);
+                         m = p.matcher(line);
+                         if (!m.find()) {
+                             throw new RuntimeException("Pattern \"" + p + "\" not found in the output");
+                         }
+                         currentBase = Long.valueOf(m.group(1), 16);
+                         currentShift = Integer.valueOf(m.group(2));
+                         break;
+                     }
+                 }
+                 if (aotCacheShift == -1 || currentShift == -1 || aotCacheBase == -1 || currentBase == -1) {
+                     throw new RuntimeException("Failed to find CompressedOops settings");
+                 }
+                 if (aotCacheShift != currentShift) {
+                     out.shouldContain("AOT Code Cache disabled: it was created with different CompressedOops::shift()");
+                 } else if (aotCacheBase != currentBase) {
+                     out.shouldContain("AOTStubCaching is disabled: incompatible CompressedOops::base()");
+                 } else {
+                     out.shouldMatch("Read \\d+ entries table at offset \\d+ from AOT Code Cache");
+                 }
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index 7532db8a1e8..b639855843e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -42,21 +42,45 @@
  * @run driver AOTCodeFlags
  */
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jdk.test.lib.cds.CDSAppTester;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class AOTCodeFlags {
-    public static int flag_sign = 0;
     public static void main(String... args) throws Exception {
         Tester t = new Tester();
-        for (int i = 0; i < 2; i++) {
-            flag_sign = i;
+        for (int mode = 0; mode < 3; mode++) {
+            t.setTestMode(mode);
             t.run(new String[] {"AOT"});
         }
     }
     static class Tester extends CDSAppTester {
+        private int testMode;
+
         public Tester() {
-            super("AOTCodeFlags" + flag_sign);
+            super("AOTCodeFlags");
+            testMode = 0;
+        }
+
+        boolean isAdapterCachingOn() {
+            return (testMode & 0x1) != 0;
+        }
+
+        boolean isStubCachingOn() {
+            return (testMode & 0x2) != 0;
+        }
+
+        public void setTestMode(int mode) {
+            testMode = mode;
+        }
+
+        public List<String> getVMArgsForTestMode() {
+            List<String> list = new ArrayList<String>();
+            list.add(isAdapterCachingOn() ? "-XX:+AOTAdapterCaching" : "-XX:-AOTAdapterCaching");
+            list.add(isStubCachingOn() ? "-XX:+AOTStubCaching" : "-XX:-AOTStubCaching");
+            return list;
         }
 
         @Override
@@ -68,13 +92,13 @@ public String classpath(RunMode runMode) {
         public String[] vmArgs(RunMode runMode) {
             switch (runMode) {
             case RunMode.ASSEMBLY:
-            case RunMode.PRODUCTION:
-                return new String[] {
-                    "-XX:+UnlockDiagnosticVMOptions",
-                    "-XX:" + (flag_sign == 0 ? "-" : "+") + "AOTAdapterCaching",
-                    "-Xlog:aot+codecache+init=debug",
-                    "-Xlog:aot+codecache+exit=debug",
-                };
+            case RunMode.PRODUCTION: {
+                    List<String> args = getVMArgsForTestMode();
+                    args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
+                                        "-Xlog:aot+codecache+init=debug",
+                                        "-Xlog:aot+codecache+exit=debug"));
+                    return args.toArray(new String[0]);
+                }
             }
             return new String[] {};
         }
@@ -88,23 +112,56 @@ public String[] appCommandLine(RunMode runMode) {
 
         @Override
         public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
-            if (flag_sign == 0) {
+            if (!isAdapterCachingOn() && !isStubCachingOn()) { // this is equivalent to completely disable AOT code cache
                 switch (runMode) {
                 case RunMode.ASSEMBLY:
                 case RunMode.PRODUCTION:
-                    out.shouldNotContain("Adapters:  total");
+                    out.shouldNotMatch("Adapters:\\s+total");
+                    out.shouldNotMatch("Shared Blobs:\\s+total");
+                    out.shouldNotMatch("C1 Blobs:\\s+total");
+                    out.shouldNotMatch("C2 Blobs:\\s+total");
                     break;
                 }
-
             } else {
-                switch (runMode) {
-                case RunMode.ASSEMBLY:
-                case RunMode.PRODUCTION:
-                    out.shouldContain("Adapters:  total");
-                    break;
+                if (isAdapterCachingOn()) {
+                    switch (runMode) {
+                    case RunMode.ASSEMBLY:
+                    case RunMode.PRODUCTION:
+                        // AOTAdapterCaching is on, non-zero adapters should be stored/loaded
+                        out.shouldMatch("Adapters:\\s+total=[1-9][0-9]+");
+                        break;
+                    }
+                } else {
+                    switch (runMode) {
+                    case RunMode.ASSEMBLY:
+                    case RunMode.PRODUCTION:
+                        // AOTAdapterCaching is off, no adapters should be stored/loaded
+                        out.shouldMatch("Adapters:\\s+total=0");
+                        break;
+                    }
+                }
+                if (isStubCachingOn()) {
+                    switch (runMode) {
+                    case RunMode.ASSEMBLY:
+                    case RunMode.PRODUCTION:
+                        // AOTStubCaching is on, non-zero stubs should be stored/loaded
+                        out.shouldMatch("Shared Blobs:\\s+total=[1-9][0-9]+");
+                        out.shouldMatch("C1 Blobs:\\s+total=[1-9][0-9]+");
+                        out.shouldMatch("C2 Blobs:\\s+total=[1-9][0-9]+");
+                        break;
+                    }
+                } else {
+                    switch (runMode) {
+                    case RunMode.ASSEMBLY:
+                    case RunMode.PRODUCTION:
+                        // AOTStubCaching is off, no stubs should be stored/loaded
+                        out.shouldMatch("Shared Blobs:\\s+total=0");
+                        out.shouldMatch("C1 Blobs:\\s+total=0");
+                        out.shouldMatch("C2 Blobs:\\s+total=0");
+                        break;
+                    }
                 }
             }
         }
-
     }
 }
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index 6ebf73f5f08..0a21e340cc6 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -347,7 +347,7 @@ private OutputAnalyzer dumpDynamicArchive() throws Exception {
         return executeAndCheck(cmdLine, runMode, dynamicArchiveFile, dynamicArchiveFileLog);
     }
 
-    private OutputAnalyzer productionRun() throws Exception {
+    public OutputAnalyzer productionRun() throws Exception {
         return productionRun(null, null);
     }
 
@@ -431,4 +431,11 @@ public void runAOTWorkflow() throws Exception {
         createAOTCache();
         productionRun();
     }
+
+    // See JEP 483; stop at the assembly run; do not execute production run
+    public void runAOTAssemblyWorkflow() throws Exception {
+        this.workflow = Workflow.AOT;
+        recordAOTConfiguration();
+        createAOTCache();
+    }
 }

From 9223ed788a53820dcc1e285a6e0df0c97b05fb09 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 15 May 2025 20:32:02 +0000
Subject: [PATCH 488/901] 8351996: Behavioral updates for ClassValue::remove

Co-authored-by: John R Rose <jrose@openjdk.org>
Reviewed-by: vklang, jrose
---
 .../share/classes/java/lang/ClassValue.java   | 435 +++++++++---------
 test/jdk/java/lang/invoke/ClassValueTest.java | 333 ++++++++++++--
 2 files changed, 509 insertions(+), 259 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ClassValue.java b/src/java.base/share/classes/java/lang/ClassValue.java
index 07c5f14b1d0..dfbdf3c5bf8 100644
--- a/src/java.base/share/classes/java/lang/ClassValue.java
+++ b/src/java.base/share/classes/java/lang/ClassValue.java
@@ -35,12 +35,37 @@
 import static java.lang.ClassValue.ClassValueMap.probeBackupLocations;
 
 /**
- * Lazily associate a computed value with (potentially) every type.
+ * Lazily associate a computed value with any {@code Class} object.
  * For example, if a dynamic language needs to construct a message dispatch
  * table for each class encountered at a message send call site,
  * it can use a {@code ClassValue} to cache information needed to
  * perform the message send quickly, for each class encountered.
- * @param <T> the type of the derived value
+ * <p>
+ * The basic operation of a {@code ClassValue} is {@link #get get}, which
+ * returns the associated value, initially created by an invocation to {@link
+ * #computeValue computeValue}; multiple invocations may happen under race, but
+ * exactly one value is associated to a {@code Class} and returned.
+ * <p>
+ * Another operation is {@link #remove remove}: it clears the associated value
+ * (if it exists), and ensures the next associated value is computed with input
+ * states up-to-date with the removal.
+ * <p>
+ * For a particular association, there is a total order for accesses to the
+ * associated value.  Accesses are atomic; they include:
+ * <ul>
+ * <li>A read-only access by {@code get}</li>
+ * <li>An attempt to associate the return value of a {@code computeValue} by
+ * {@code get}</li>
+ * <li>Clearing of an association by {@code remove}</li>
+ * </ul>
+ * A {@code get} call always include at least one access; a {@code remove} call
+ * always has exactly one access; a {@code computeValue} call always happens
+ * between two accesses.  This establishes the order of {@code computeValue}
+ * calls with respect to {@code remove} calls and determines whether the
+ * results of a {@code computeValue} can be successfully associated by a {@code
+ * get}.
+ *
+ * @param <T> the type of the associated value
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
@@ -53,48 +78,58 @@ protected ClassValue() {
     }
 
     /**
-     * Computes the given class's derived value for this {@code ClassValue}.
+     * Computes the value to associate to the given {@code Class}.
      * <p>
-     * This method will be invoked within the first thread that accesses
-     * the value with the {@link #get get} method.
+     * This method is invoked when the initial read-only access by {@link #get
+     * get} finds no associated value.
      * <p>
-     * Normally, this method is invoked at most once per class,
-     * but it may be invoked again if there has been a call to
-     * {@link #remove remove}.
+     * If this method throws an exception, the initiating {@code get} call will
+     * not attempt to associate a value, and may terminate by returning the
+     * associated value if it exists, or by propagating that exception otherwise.
      * <p>
-     * If this method throws an exception, the corresponding call to {@code get}
-     * will terminate abnormally with that exception, and no class value will be recorded.
+     * Otherwise, the value is computed and returned.  An attempt to associate
+     * the return value happens, with one of the following outcomes:
+     * <ul>
+     * <li>The associated value is present; it is returned and no association
+     * is done.</li>
+     * <li>The most recent {@link #remove remove} call, if it exists, does not
+     * happen-before (JLS {@jls 17.4.5}) the finish of the {@code computeValue}
+     * that computed the value to associate.  A new invocation to {@code
+     * computeValue}, which that {@code remove} call happens-before, will
+     * re-establish this happens-before relationship.</li>
+     * <li>Otherwise, this value is successfully associated and returned.</li>
+     * </ul>
+     *
+     * @apiNote
+     * A {@code computeValue} call may, due to class loading or other
+     * circumstances, recursively call {@code get} or {@code remove} for the
+     * same {@code type}.  The recursive {@code get}, if the recursion stops,
+     * successfully finishes and this initiating {@code get} observes the
+     * associated value from recursion.  The recursive {@code remove} is no-op,
+     * since being on the same thread, the {@code remove} already happens-before
+     * the finish of this {@code computeValue}; the result from this {@code
+     * computeValue} still may be associated.
      *
-     * @param type the type whose class value must be computed
-     * @return the newly computed value associated with this {@code ClassValue}, for the given class or interface
+     * @param type the {@code Class} to associate a value to
+     * @return the newly computed value to associate
      * @see #get
      * @see #remove
      */
     protected abstract T computeValue(Class<?> type);
 
     /**
-     * Returns the value for the given class.
-     * If no value has yet been computed, it is obtained by
-     * an invocation of the {@link #computeValue computeValue} method.
+     * {@return the value associated to the given {@code Class}}
      * <p>
-     * The actual installation of the value on the class
-     * is performed atomically.
-     * At that point, if several racing threads have
-     * computed values, one is chosen, and returned to
-     * all the racing threads.
+     * This method first performs a read-only access, and returns the associated
+     * value if it exists.  Otherwise, this method tries to associate a value
+     * from a {@link #computeValue computeValue} invocation until the associated
+     * value exists, which could be associated by a competing thread.
      * <p>
-     * The {@code type} parameter is typically a class, but it may be any type,
-     * such as an interface, a primitive type (like {@code int.class}), or {@code void.class}.
-     * <p>
-     * In the absence of {@code remove} calls, a class value has a simple
-     * state diagram:  uninitialized and initialized.
-     * When {@code remove} calls are made,
-     * the rules for value observation are more complex.
-     * See the documentation for {@link #remove remove} for more information.
+     * This method may throw an exception from a {@code computeValue} invocation.
+     * In this case, no association happens.
      *
-     * @param type the type whose class value must be computed or retrieved
-     * @return the current value associated with this {@code ClassValue}, for the given class or interface
-     * @throws NullPointerException if the argument is null
+     * @param type the {@code Class} to retrieve the associated value for
+     * @throws NullPointerException if the argument is {@code null}
      * @see #remove
      * @see #computeValue
      */
@@ -108,7 +143,7 @@ public T get(Class<?> type) {
             // invariant:  No false positive matches.  False negatives are OK if rare.
             // The key fact that makes this work: if this.version == e.version,
             // then this thread has a right to observe (final) e.value.
-            return e.value();
+            return e.value;
         // The fast path can fail for any of these reasons:
         // 1. no entry has been computed yet
         // 2. hash code collision (before or after reduction mod cache.length)
@@ -118,67 +153,24 @@ public T get(Class<?> type) {
     }
 
     /**
-     * Removes the associated value for the given class.
-     * If this value is subsequently {@linkplain #get read} for the same class,
-     * its value will be reinitialized by invoking its {@link #computeValue computeValue} method.
-     * This may result in an additional invocation of the
-     * {@code computeValue} method for the given class.
-     * <p>
-     * In order to explain the interaction between {@code get} and {@code remove} calls,
-     * we must model the state transitions of a class value to take into account
-     * the alternation between uninitialized and initialized states.
-     * To do this, number these states sequentially from zero, and note that
-     * uninitialized (or removed) states are numbered with even numbers,
-     * while initialized (or re-initialized) states have odd numbers.
-     * <p>
-     * When a thread {@code T} removes a class value in state {@code 2N},
-     * nothing happens, since the class value is already uninitialized.
-     * Otherwise, the state is advanced atomically to {@code 2N+1}.
-     * <p>
-     * When a thread {@code T} queries a class value in state {@code 2N},
-     * the thread first attempts to initialize the class value to state {@code 2N+1}
-     * by invoking {@code computeValue} and installing the resulting value.
-     * <p>
-     * When {@code T} attempts to install the newly computed value,
-     * if the state is still at {@code 2N}, the class value will be initialized
-     * with the computed value, advancing it to state {@code 2N+1}.
-     * <p>
-     * Otherwise, whether the new state is even or odd,
-     * {@code T} will discard the newly computed value
-     * and retry the {@code get} operation.
-     * <p>
-     * Discarding and retrying is an important proviso,
-     * since otherwise {@code T} could potentially install
-     * a disastrously stale value.  For example:
-     * <ul>
-     * <li>{@code T} calls {@code CV.get(C)} and sees state {@code 2N}
-     * <li>{@code T} quickly computes a time-dependent value {@code V0} and gets ready to install it
-     * <li>{@code T} is hit by an unlucky paging or scheduling event, and goes to sleep for a long time
-     * <li>...meanwhile, {@code T2} also calls {@code CV.get(C)} and sees state {@code 2N}
-     * <li>{@code T2} quickly computes a similar time-dependent value {@code V1} and installs it on {@code CV.get(C)}
-     * <li>{@code T2} (or a third thread) then calls {@code CV.remove(C)}, undoing {@code T2}'s work
-     * <li> the previous actions of {@code T2} are repeated several times
-     * <li> also, the relevant computed values change over time: {@code V1}, {@code V2}, ...
-     * <li>...meanwhile, {@code T} wakes up and attempts to install {@code V0}; <em>this must fail</em>
-     * </ul>
-     * We can assume in the above scenario that {@code CV.computeValue} uses locks to properly
-     * observe the time-dependent states as it computes {@code V1}, etc.
-     * This does not remove the threat of a stale value, since there is a window of time
-     * between the return of {@code computeValue} in {@code T} and the installation
-     * of the new value.  No user synchronization is possible during this time.
+     * Removes the associated value for the given {@code Class} and invalidates
+     * all out-of-date computations.  If this association is subsequently
+     * {@linkplain #get accessed}, this removal happens-before (JLS {@jls
+     * 17.4.5}) the finish of the {@link #computeValue computeValue} call that
+     * returned the associated value.
      *
      * @param type the type whose class value must be removed
-     * @throws NullPointerException if the argument is null
+     * @throws NullPointerException if the argument is {@code null}
      */
     public void remove(Class<?> type) {
         ClassValueMap map = getMap(type);
-        map.removeEntry(this);
+        map.removeAccess(this);
     }
 
     // Possible functionality for JSR 292 MR 1
     /*public*/ void put(Class<?> type, T value) {
         ClassValueMap map = getMap(type);
-        map.changeEntry(this, value);
+        map.forcedAssociateAccess(this, value);
     }
 
     //| --------
@@ -190,6 +182,7 @@ private static Entry<?>[] getCacheCarefully(Class<?> type) {
         // racing type.classValueMap{.cacheArray} : null => new Entry[X] <=> new Entry[Y]
         ClassValueMap map = type.classValueMap;
         if (map == null)  return EMPTY_CACHE;
+        // reads non-null due to StoreStore barrier in critical section in initializeMap
         Entry<?>[] cache = map.getCache();
         return cache;
         // invariant:  returned value is safe to dereference and check for an Entry
@@ -207,7 +200,7 @@ private static Entry<?>[] getCacheCarefully(Class<?> type) {
     private T getFromBackup(Entry<?>[] cache, Class<?> type) {
         Entry<T> e = probeBackupLocations(cache, this);
         if (e != null)
-            return e.value();
+            return e.value;
         return getFromHashMap(type);
     }
 
@@ -220,21 +213,44 @@ private T getFromBackup(Entry<?>[] cache, Class<?> type) {
     private T getFromHashMap(Class<?> type) {
         // The fail-safe recovery is to fall back to the underlying classValueMap.
         ClassValueMap map = getMap(type);
-        for (;;) {
-            Entry<T> e = map.startEntry(this);
-            if (!e.isPromise())
-                return e.value();
+        var accessed = map.readAccess(this);
+        if (accessed instanceof Entry) {
+            @SuppressWarnings("unchecked")
+            var cast = (Entry<T>) accessed;
+            return cast.value;
+        }
+
+        RemovalToken token = (RemovalToken) accessed; // nullable
+        for (; ; ) {
+            T value;
             try {
-                // Try to make a real entry for the promised version.
-                e = makeEntry(e.version(), computeValue(type));
-            } finally {
-                // Whether computeValue throws or returns normally,
-                // be sure to remove the empty entry.
-                e = map.finishEntry(this, e);
+                value = computeValue(type);
+            } catch (Throwable ex) {
+                // no value is associated, but there may be already associated
+                // value. Return that if it exists.
+                accessed = map.readAccess(this);
+                if (accessed instanceof Entry) {
+                    @SuppressWarnings("unchecked")
+                    var cast = (Entry<T>) accessed;
+                    return cast.value;
+                }
+                // report failure here, but allow other callers to try again
+                if (ex instanceof RuntimeException rte) {
+                    throw rte;
+                } else {
+                    throw ex instanceof Error err ? err : new Error(ex);
+                }
+            }
+            // computeValue succeed, proceed to associate
+            accessed = map.associateAccess(this, token, value);
+            if (accessed instanceof Entry) {
+                @SuppressWarnings("unchecked")
+                var cast = (Entry<T>) accessed;
+                return cast.value;
+            } else {
+                token = (RemovalToken) accessed;
+                // repeat
             }
-            if (e != null)
-                return e.value();
-            // else try again, in case a racing thread called remove (so e == null)
         }
     }
 
@@ -242,7 +258,7 @@ private T getFromHashMap(Class<?> type) {
     boolean match(Entry<?> e) {
         // racing e.version : null (blank) => unique Version token => null (GC-ed version)
         // non-racing this.version : v1 => v2 => ... (updates are read faithfully from volatile)
-        return (e != null && e.get() == this.version);
+        return (e != null && e.version() == this.version);
         // invariant:  No false positives on version match.  Null is OK for false negative.
         // invariant:  If version matches, then e.value is readable (final set in Entry.<init>)
     }
@@ -300,45 +316,63 @@ static class Identity {
      * before this.version.
      */
     private volatile Version<T> version = new Version<>(this);
-    Version<T> version() { return version; }
+
     void bumpVersion() { version = new Version<>(this); }
-    static class Version<T> {
-        private final ClassValue<T> classValue;
-        private final Entry<T> promise = new Entry<>(this);
-        Version(ClassValue<T> classValue) { this.classValue = classValue; }
-        ClassValue<T> classValue() { return classValue; }
-        Entry<T> promise() { return promise; }
-        boolean isLive() { return classValue.version() == this; }
+
+    record Version<T>(/* Object identity, */ClassValue<T> classValue) {
+        boolean isLive() {
+            return classValue.version == this;
+        }
+    }
+
+    /**
+     * Besides a value (represented by an Entry), a "removal token" object,
+     * including the value {@code null}, can be present at a ClassValue-Class
+     * coordinate.  A removal token indicates whether the value from a
+     * computation is up-to-date; the value is up-to-date if the token is the
+     * same before and after computation (no removal during this period), or if
+     * the token is from the same thread (removed during computeValue).
+     * {@code null} is the initial state, meaning all computations are valid.
+     * Later tokens are always non-null, no matter if they replace existing
+     * entries or outdated tokens.
+     */
+    private static final class RemovalToken {
+        // Use thread ID, which presumably don't duplicate and is cheaper than WeakReference
+        private final long actorId;
+
+        private RemovalToken() {
+            this.actorId = Thread.currentThread().threadId();
+        }
+
+        // Arguments are intentionally nullable, to allow initial tokens
+        private static boolean allowsAssociation(RemovalToken current, RemovalToken start) {
+            // No removal token after the initial can be null
+            assert current != null || start == null : current + " : " + start;
+            return current == start || current.actorId == Thread.currentThread().threadId();
+        }
     }
 
     /** One binding of a value to a class via a ClassValue.
+     *  Shared for the map and the cache array.
+     *  The version is only meaningful for the cache array; whatever in the map
+     *  is authentic, but state informs the cache an entry may be out-of-date.
      *  States are:<ul>
-     *  <li> promise if value == Entry.this
-     *  <li> else dead if version == null
-     *  <li> else stale if version != classValue.version
+     *  <li> dead if version == null
+     *  <li> stale if version != classValue.version
      *  <li> else live </ul>
-     *  Promises are never put into the cache; they only live in the
-     *  backing map while a computeValue call is in flight.
      *  Once an entry goes stale, it can be reset at any time
      *  into the dead state.
      */
-    static class Entry<T> extends WeakReference<Version<T>> {
-        final Object value;  // usually of type T, but sometimes (Entry)this
+    static final class Entry<T> {
+        final T value;
+        final WeakReference<Version<T>> version; // The version exists only for cache invalidation
+
         Entry(Version<T> version, T value) {
-            super(version);
-            this.value = value;  // for a regular entry, value is of type T
-        }
-        private void assertNotPromise() { assert(!isPromise()); }
-        /** For creating a promise. */
-        Entry(Version<T> version) {
-            super(version);
-            this.value = this;  // for a promise, value is not of type T, but Entry!
+            this.value = value;
+            this.version = new WeakReference<>(version);
         }
-        /** Fetch the value.  This entry must not be a promise. */
-        @SuppressWarnings("unchecked")  // if !isPromise, type is T
-        T value() { assertNotPromise(); return (T) value; }
-        boolean isPromise() { return value == this; }
-        Version<T> version() { return get(); }
+
+        Version<T> version() { return version.get(); }
         ClassValue<T> classValueOrNull() {
             Version<T> v = version();
             return (v == null) ? null : v.classValue();
@@ -346,17 +380,12 @@ ClassValue<T> classValueOrNull() {
         boolean isLive() {
             Version<T> v = version();
             if (v == null)  return false;
-            if (v.isLive())  return true;
-            clear();
+            if (v.isLive()) return true;
+            version.clear();
             return false;
         }
         Entry<T> refreshVersion(Version<T> v2) {
-            assertNotPromise();
-            @SuppressWarnings("unchecked")  // if !isPromise, type is T
-            Entry<T> e2 = new Entry<>(v2, (T) value);
-            clear();
-            // value = null -- caller must drop
-            return e2;
+            return version.refersTo(v2) ? this : new Entry<>(v2, value);
         }
         static final Entry<?> DEAD_ENTRY = new Entry<>(null, null);
     }
@@ -379,11 +408,12 @@ private static ClassValueMap initializeMap(Class<?> type) {
             // happens about once per type
             if ((map = type.classValueMap) == null) {
                 map = new ClassValueMap();
-                // Place a Store fence after construction and before publishing to emulate
-                // ClassValueMap containing final fields. This ensures it can be
-                // published safely in the non-volatile field Class.classValueMap,
-                // since stores to the fields of ClassValueMap will not be reordered
-                // to occur after the store to the field type.classValueMap
+                // getCacheCarefully anticipates entry array to be non-null when
+                // a ClassValueMap is published to it.  However, ClassValueMap
+                // has no final field, so compiler does not emit a fence, and
+                // we must manually issue a Store-Store barrier to prevent
+                // the assignment below to be reordered with the store to
+                // entry array in the constructor above
                 UNSAFE.storeFence();
 
                 type.classValueMap = map;
@@ -412,9 +442,10 @@ static <T> Entry<T> makeEntry(Version<T> explicitVersion, T value) {
 
     /** A backing map for all ClassValues.
      *  Gives a fully serialized "true state" for each pair (ClassValue cv, Class type).
+     *  The state may be assigned value or unassigned token.
      *  Also manages an unserialized fast-path cache.
      */
-    static class ClassValueMap extends WeakHashMap<ClassValue.Identity, Entry<?>> {
+    static final class ClassValueMap extends WeakHashMap<ClassValue.Identity, Object> {
         private Entry<?>[] cacheArray;
         private int cacheLoad, cacheLoadLimit;
 
@@ -433,106 +464,56 @@ static class ClassValueMap extends WeakHashMap<ClassValue.Identity, Entry<?>> {
 
         Entry<?>[] getCache() { return cacheArray; }
 
-        /** Initiate a query.  Store a promise (placeholder) if there is no value yet. */
-        synchronized
-        <T> Entry<T> startEntry(ClassValue<T> classValue) {
-            @SuppressWarnings("unchecked")  // one map has entries for all value types <T>
-            Entry<T> e = (Entry<T>) get(classValue.identity);
-            Version<T> v = classValue.version();
-            if (e == null) {
-                e = v.promise();
-                // The presence of a promise means that a value is pending for v.
-                // Eventually, finishEntry will overwrite the promise.
-                put(classValue.identity, e);
-                // Note that the promise is never entered into the cache!
-                return e;
-            } else if (e.isPromise()) {
-                // Somebody else has asked the same question.
-                // Let the races begin!
-                if (e.version() != v) {
-                    e = v.promise();
-                    put(classValue.identity, e);
-                }
-                return e;
-            } else {
-                // there is already a completed entry here; report it
-                if (e.version() != v) {
-                    // There is a stale but valid entry here; make it fresh again.
-                    // Once an entry is in the hash table, we don't care what its version is.
-                    e = e.refreshVersion(v);
-                    put(classValue.identity, e);
+        // A simple read access to this map, for the initial step of get or failure recovery.
+        // This may refresh the entry for the cache, but the associated value always stays the same.
+        synchronized <T> Object readAccess(ClassValue<T> classValue) {
+            var item = get(classValue.identity);
+            if (item instanceof Entry) {
+                @SuppressWarnings("unchecked")
+                var entry = (Entry<T>) item;
+                // cache refresh
+                var updated = entry.refreshVersion(classValue.version);
+                if (updated != entry) {
+                    put(classValue.identity, updated);
                 }
-                // Add to the cache, to enable the fast path, next time.
-                checkCacheLoad();
-                addToCache(classValue, e);
-                return e;
             }
+            return item;
         }
 
-        /** Finish a query.  Overwrite a matching placeholder.  Drop stale incoming values. */
-        synchronized
-        <T> Entry<T> finishEntry(ClassValue<T> classValue, Entry<T> e) {
-            @SuppressWarnings("unchecked")  // one map has entries for all value types <T>
-            Entry<T> e0 = (Entry<T>) get(classValue.identity);
-            if (e == e0) {
-                // We can get here during exception processing, unwinding from computeValue.
-                assert(e.isPromise());
-                remove(classValue.identity);
-                return null;
-            } else if (e0 != null && e0.isPromise() && e0.version() == e.version()) {
-                // If e0 matches the intended entry, there has not been a remove call
-                // between the previous startEntry and now.  So now overwrite e0.
-                Version<T> v = classValue.version();
-                if (e.version() != v)
-                    e = e.refreshVersion(v);
-                put(classValue.identity, e);
+        // An association attempt, for when a computeValue returns a value.
+        synchronized <T> Object associateAccess(ClassValue<T> classValue, RemovalToken startToken, T value) {
+            var item = readAccess(classValue);
+            if (item instanceof Entry)
+                return item; // value already associated
+            var currentToken = (RemovalToken) item;
+            if (RemovalToken.allowsAssociation(currentToken, startToken)) {
+                var entry = makeEntry(classValue.version, value);
+                put(classValue.identity, entry);
                 // Add to the cache, to enable the fast path, next time.
                 checkCacheLoad();
-                addToCache(classValue, e);
-                return e;
-            } else {
-                // Some sort of mismatch; caller must try again.
-                return null;
+                addToCache(classValue, entry);
+                return entry;
             }
+            return currentToken;
         }
 
-        /** Remove an entry. */
-        synchronized
-        void removeEntry(ClassValue<?> classValue) {
-            Entry<?> e = remove(classValue.identity);
-            // 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);
-            }
+        // A removal, requiring subsequent associations to be up-to-date with it.
+        synchronized void removeAccess(ClassValue<?> classValue) {
+            // Always put in a token to invalidate ongoing computations
+            put(classValue.identity, new RemovalToken());
+            classValue.bumpVersion();
+            removeStaleEntries(classValue);
         }
 
-        /** Change the value for an entry. */
-        synchronized
-        <T> void changeEntry(ClassValue<T> classValue, T value) {
-            @SuppressWarnings("unchecked")  // one map has entries for all value types <T>
-            Entry<T> e0 = (Entry<T>) get(classValue.identity);
-            Version<T> version = classValue.version();
-            if (e0 != null) {
-                if (e0.version() == version && e0.value() == value)
-                    // no value change => no version change needed
-                    return;
-                classValue.bumpVersion();
-                removeStaleEntries(classValue);
-            }
-            Entry<T> e = makeEntry(version, value);
-            put(classValue.identity, e);
+        // A forced association, requires cache to flush.
+        synchronized <T> void forcedAssociateAccess(ClassValue<T> classValue, T value) {
+            classValue.bumpVersion();
+            removeStaleEntries();
+            var entry = makeEntry(classValue.version, value);
+            put(classValue.identity, entry);
             // Add to the cache, to enable the fast path, next time.
             checkCacheLoad();
-            addToCache(classValue, e);
+            addToCache(classValue, entry);
         }
 
         //| --------
diff --git a/test/jdk/java/lang/invoke/ClassValueTest.java b/test/jdk/java/lang/invoke/ClassValueTest.java
index 79482f4185d..fa026955e25 100644
--- a/test/jdk/java/lang/invoke/ClassValueTest.java
+++ b/test/jdk/java/lang/invoke/ClassValueTest.java
@@ -23,20 +23,37 @@
 
 /*
  * @test
- * @bug 8351045
+ * @bug 8351045 8351996
+ * @enablePreview
+ * @comment Remove preview if ScopedValue is finalized
  * @summary tests for class-specific values
+ * @library /test/lib
  * @run junit ClassValueTest
  */
 
+import java.lang.classfile.ClassFile;
+import java.lang.constant.ClassDesc;
+import java.lang.invoke.MethodHandles;
+import java.lang.ref.WeakReference;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
+import jdk.test.lib.util.ForceGC;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author jrose
@@ -158,56 +175,308 @@ public void testGetMany() {
         }
     }
 
-    private static final int RUNS = 16;
     private static final long COMPUTE_TIME_MILLIS = 100;
+    private static final Duration TIMEOUT = Duration.of(2, ChronoUnit.SECONDS);
 
-    @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));
+    private static void await(CountDownLatch latch) {
+        try {
+            if (!latch.await(2L, TimeUnit.SECONDS)) {
+                fail("No signal received");
             }
-            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);
+        } catch (InterruptedException e) {
+            fail(e);
+        }
+    }
+
+    private static void awaitThreads(Thread... threads) {
+        awaitThreads(Arrays.asList(threads));
+    }
+
+    private static void awaitThreads(Iterable<Thread> threads) {
+        for (var t : threads) {
+            try {
+                if (!t.join(TIMEOUT)) {
+                    fail("Thread not stopping " + t);
                 }
+            } catch (InterruptedException ex) {
+                fail(ex);
             }
         }
     }
 
-    void testRemoveOnCompute() {
+    /**
+     * Tests that get() + remove() can prevent stale value from being installed.
+     * Uses junit to do basic stress.
+     */
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testRemoveStale() throws InterruptedException {
+        CountDownLatch oldInputUsed = new CountDownLatch(1);
+        CountDownLatch inputUpdated = new CountDownLatch(1);
         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);
-                }
+                oldInputUsed.countDown();
+                // ensure input is updated when we return
+                await(inputUpdated);
                 return v;
             }
         };
         var innocuous = Thread.startVirtualThread(() -> cv.get(int.class));
         var refreshInput = Thread.startVirtualThread(() -> {
+            await(oldInputUsed);
             input.incrementAndGet();
             cv.remove(int.class); // Let's recompute with updated inputs!
+            inputUpdated.countDown();
         });
-        try {
-            innocuous.join();
-            refreshInput.join();
-        } catch (InterruptedException ex) {
-            throw new RuntimeException(ex);
-        }
+        awaitThreads(innocuous, refreshInput);
         assertEquals(1, input.get(), "input not updated");
         assertEquals(1, cv.get(int.class), "CV not using up-to-date input");
     }
+
+    /**
+     * Tests that calling get() from computeValue() terminates.
+     */
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testGetInCompute() {
+        ClassValue<Object> cv = new ClassValue<>() {
+            @Override
+            protected Object computeValue(Class<?> type) {
+                get(type);
+                get(type);
+                get(type);
+                return Boolean.TRUE;
+            }
+        };
+        try {
+            cv.get(int.class);
+        } catch (Throwable ex) {
+            // swallow if any
+        }
+    }
+
+    /**
+     * Tests that calling remove() from computeValue() terminates.
+     */
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testRemoveInCompute() {
+        ClassValue<Boolean> cv = new ClassValue<>() {
+            @Override
+            protected Boolean computeValue(Class<?> type) {
+                remove(type);
+                remove(type);
+                remove(type);
+                return Boolean.TRUE;
+            }
+        };
+        assertTrue(cv.get(int.class));
+    }
+
+    private static Class<?> createWeakClass() {
+        var bytes = ClassFile.of().build(ClassDesc.of("WeakTest"), _ -> {});
+        try {
+            return MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass();
+        } catch (IllegalAccessException ex) {
+            return fail(ex);
+        }
+    }
+
+    @Test
+    void testWeakAgainstClass() {
+        Class<?> hidden = createWeakClass();
+        ClassValue<int[]> cv = new ClassValue<>() {
+            @Override
+            protected int[] computeValue(Class<?> type) {
+                return new int[23];
+            }
+        };
+
+        WeakReference<?> ref = new WeakReference<>(cv.get(hidden));
+        hidden = null; // Remove reference for interpreter
+        if (!ForceGC.wait(() -> ref.refersTo(null))) {
+            fail("Timeout");
+        }
+    }
+
+    @Test
+    @Disabled // JDK-8352622
+    void testWeakAgainstClassValue() {
+        ClassValue<int[]> cv = new ClassValue<>() {
+            @Override
+            protected int[] computeValue(Class<?> type) {
+                return new int[23];
+            }
+        };
+
+        WeakReference<?> ref = new WeakReference<>(cv.get(int.class));
+        cv = null; // Remove reference for interpreter
+        if (!ForceGC.wait(() -> ref.refersTo(null))) {
+            fail("Timeout");
+        }
+    }
+
+    @Test
+    void testSingletonWinner() {
+        CountDownLatch raceStart = new CountDownLatch(1);
+        ClassValue<int[]> cv = new ClassValue<>() {
+            @Override
+            protected int[] computeValue(Class<?> type) {
+                await(raceStart);
+                return new int[] {ThreadLocalRandom.current().nextInt()};
+            }
+        };
+        AtomicReference<int[]> truth = new AtomicReference<>(null);
+        AtomicInteger truthSwapCount = new AtomicInteger(0);
+
+        List<Thread> threads = new ArrayList<>(100);
+        Runnable job = () -> {
+            var res = cv.get(ClassValueTest.class);
+            var item = truth.compareAndExchange(null, res);
+            if (item != null) {
+                assertSame(item, res);
+            } else {
+                truthSwapCount.incrementAndGet();
+            }
+        };
+        for (int i = 0; i < 100; i++) {
+            threads.add(Thread.startVirtualThread(job));
+        }
+        raceStart.countDown();
+        awaitThreads(threads);
+        assertEquals(1, truthSwapCount.get());
+    }
+
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testRacyRemoveInCompute() {
+        ClassValue<Object> cv = new ClassValue<>() {
+            @Override
+            protected Object computeValue(Class<?> type) {
+                remove(type);
+                try {
+                    Thread.sleep(COMPUTE_TIME_MILLIS);
+                } catch (InterruptedException ex) {
+                    throw new RuntimeException(ex);
+                }
+                remove(type);
+                return Boolean.TRUE;
+            }
+        };
+
+        var threads = Arrays.stream(CLASSES)
+                .map(clz -> Thread.startVirtualThread(() -> cv.get(clz)))
+                .toList();
+        awaitThreads(threads);
+    }
+
+    @Test
+    void testRecursiveInitialization() {
+        record Holder() {
+            static final ClassValue<Object> clv = new ClassValue<>() {
+                @Override
+                protected Object computeValue(Class<?> type) {
+                    return new One();
+                }
+            };
+
+            record One() {
+                static {
+                    Holder.clv.get(One.class);
+                }
+            }
+
+        }
+
+        Holder.clv.get(Holder.One.class);
+    }
+
+    private static final ScopedValue<Integer> THREAD_ID = ScopedValue.newInstance();
+
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testNoRecomputeOnUnrelatedRemoval() throws InterruptedException {
+        CountDownLatch t1Started = new CountDownLatch(1);
+        CountDownLatch removeTamper = new CountDownLatch(1);
+        CountDownLatch t2Started = new CountDownLatch(1);
+        CountDownLatch t1Returned = new CountDownLatch(1);
+        AtomicInteger t1Tries = new AtomicInteger();
+        ClassValue<Object> clv = new ClassValue<>() {
+            @Override
+            protected Object computeValue(Class<?> type) {
+                int id = THREAD_ID.get();
+                if (id == 1) {
+                    t1Tries.incrementAndGet();
+                    t1Started.countDown();
+                    await(t2Started); // implies unrelated changes
+                } else if (id == 2) {
+                    t2Started.countDown();
+                    // Don't race to install - we want to check computeValue tampers
+                    await(t1Returned);
+                } else if (id != -1) {
+                    fail("Id: " + id);
+                }
+                return "";
+            }
+        };
+
+        ScopedValue.where(THREAD_ID, -1).run(() -> clv.get(long.class)); // set up unrelated class
+        var t1 = Thread.startVirtualThread(() ->
+                ScopedValue.where(THREAD_ID, 1).run(() -> {
+                    clv.get(int.class);
+                    t1Returned.countDown(); // returned after x calls to computeValue
+                }));
+        var t2 = Thread.startVirtualThread(() ->
+                ScopedValue.where(THREAD_ID, 2).run(() -> {
+                    await(removeTamper);
+                    clv.get(int.class); // clv version diff from that of promise
+                }));
+        await(t1Started);
+        clv.remove(long.class);
+        removeTamper.countDown(); // removed unrelated class
+        awaitThreads(t1, t2);
+        assertEquals(1, t1Tries.get(), "Redundant computeValue retries");
+    }
+
+    @Test
+    @Timeout(value = 4, unit = TimeUnit.SECONDS)
+    void testNoObsoleteInstallation() throws InterruptedException {
+        CountDownLatch slowComputationStart = new CountDownLatch(1);
+        CountDownLatch slowComputationContinue = new CountDownLatch(1);
+        ClassValue<Integer> clv = new ClassValue<>() {
+            @Override
+            protected Integer computeValue(Class<?> type) {
+                if (!THREAD_ID.isBound()) {
+                    return 5;
+                }
+                int threadId = THREAD_ID.get();
+                if (threadId == 1) {
+                    if (slowComputationContinue.getCount() == 0) {
+                        return 42;
+                    } else {
+                        // First invocation
+                        slowComputationStart.countDown();
+                        await(slowComputationContinue);
+                        return -1;
+                    }
+                } else {
+                    return fail("Unknown thread " + threadId);
+                }
+            }
+        };
+        var t = Thread.startVirtualThread(() -> ScopedValue.where(THREAD_ID, 1).run(() -> {
+            int v = clv.get(int.class);
+            assertEquals(42, v, "recomputed value");
+        }));
+        await(slowComputationStart);
+        assertEquals(5, clv.get(int.class), "fast computation installed value");
+        clv.remove(int.class);
+        slowComputationContinue.countDown();
+        awaitThreads(t);
+        assertEquals(42, clv.get(int.class), "slow computation reinstalled value");
+    }
 }

From fe790cb319243dc381f5f12f9010e33681ecb17a Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Thu, 15 May 2025 20:39:48 +0000
Subject: [PATCH 489/901] 8356177: Regression after JDK-8352180

Reviewed-by: sspitsyn, cjplummer, lmesnik
---
 .../os/windows/attachListener_windows.cpp     | 17 +++--
 .../attach/FailedDequeueTest.java             | 71 +++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/attach/FailedDequeueTest.java

diff --git a/src/hotspot/os/windows/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp
index 2cc9d192ce5..10873a652f4 100644
--- a/src/hotspot/os/windows/attachListener_windows.cpp
+++ b/src/hotspot/os/windows/attachListener_windows.cpp
@@ -64,6 +64,11 @@
 class PipeChannel : public AttachOperation::RequestReader, public AttachOperation::ReplyWriter {
 private:
   HANDLE _hPipe;
+  void close_impl() {
+    FlushFileBuffers(_hPipe);
+    CloseHandle(_hPipe);
+    _hPipe = INVALID_HANDLE_VALUE;
+  }
 public:
   PipeChannel() : _hPipe(INVALID_HANDLE_VALUE) {}
   ~PipeChannel() {
@@ -92,10 +97,14 @@ class PipeChannel : public AttachOperation::RequestReader, public AttachOperatio
 
   void close() {
     if (opened()) {
-      ThreadBlockInVM tbivm(JavaThread::current());
-      FlushFileBuffers(_hPipe);
-      CloseHandle(_hPipe);
-      _hPipe = INVALID_HANDLE_VALUE;
+      JavaThread* current = JavaThread::current();
+      // if we fail to read/parse request from Win32AttachListener::dequeue, current thread is already blocked
+      if (current->thread_state() == _thread_blocked) {
+        close_impl();
+      } else {
+        ThreadBlockInVM tbivm(current);
+        close_impl();
+      }
     }
   }
 
diff --git a/test/hotspot/jtreg/serviceability/attach/FailedDequeueTest.java b/test/hotspot/jtreg/serviceability/attach/FailedDequeueTest.java
new file mode 100644
index 00000000000..fd1f0c42c42
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/attach/FailedDequeueTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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 verifies that failure in AttachListener::dequeue does not crash the VM
+ * @bug 8356177
+ * @library /test/lib
+ * @modules jdk.attach/sun.tools.attach
+ *
+ * @run driver FailedDequeueTest
+ */
+
+import java.io.IOException;
+
+import com.sun.tools.attach.VirtualMachine;
+import sun.tools.attach.HotSpotVirtualMachine;
+
+import jdk.test.lib.apps.LingeredApp;
+
+public class FailedDequeueTest {
+
+    public static void main(String[] args) throws Exception {
+        LingeredApp app = null;
+        try {
+            app = LingeredApp.startApp("-Xlog:attach=trace");
+            test(app);
+        } finally {
+            LingeredApp.stopApp(app);
+        }
+    }
+
+    // The test uses HotSpotVirtualMachine.setFlag method with long flag value (longer than 256K).
+    private static String flagName = "HeapDumpPath";
+    private static String flagValue = "X" + "A".repeat(256 * 1024) + "X";
+
+    private static void test(LingeredApp app) throws Exception {
+        HotSpotVirtualMachine vm = (HotSpotVirtualMachine)VirtualMachine.attach(String.valueOf(app.getPid()));
+        try {
+            // Should throw IOException and don't crash
+            vm.setFlag(flagName, flagValue);
+
+            throw new RuntimeException("expected IOException is not thrown");
+        } catch (IOException ex) {
+            System.out.println("OK: setFlag thrown expected exception:");
+            ex.printStackTrace(System.out);
+        } finally {
+            vm.detach();
+        }
+    }
+}

From efdbb6afce4116140c066641128264ab42697912 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Thu, 15 May 2025 21:14:42 +0000
Subject: [PATCH 490/901] 8354083: Support --add-reads with
 -XX:+AOTClassLinking

Reviewed-by: iklam, alanb
---
 src/hotspot/share/classfile/modules.cpp       |   1 +
 src/hotspot/share/runtime/arguments.cpp       |   4 +-
 .../jdk/internal/module/ModuleBootstrap.java  |   3 +-
 test/hotspot/jtreg/TEST.groups                |   3 -
 .../AddExports.java                           |   4 +-
 .../cds/appcds/aotClassLinking/AddOpens.java  | 234 ++++++++++++++++++
 .../cds/appcds/aotClassLinking/AddReads.java  | 205 +++++++++++++++
 .../appcds/jigsaw/modulepath/AddOpens.java    | 132 ----------
 .../appcds/jigsaw/modulepath/AddReads.java    | 140 -----------
 9 files changed, 446 insertions(+), 280 deletions(-)
 rename test/hotspot/jtreg/runtime/cds/appcds/{jigsaw/modulepath => aotClassLinking}/AddExports.java (97%)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddOpens.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java

diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 463bd765701..a75c4abd9c5 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -584,6 +584,7 @@ Modules::ArchivedProperty Modules::_archived_props[] = {
   {"jdk.module.addmods", true},                // --add-modules
   {"jdk.module.enable.native.access", true},   // --enable-native-access
   {"jdk.module.addopens", true},               // --add-opens
+  {"jdk.module.addreads", true},               // --add-reads
 };
 
 constexpr size_t Modules::num_archived_props() {
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 69d37a11e45..1461f893f4a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -331,8 +331,7 @@ bool Arguments::is_incompatible_cds_internal_module_property(const char* propert
 bool Arguments::internal_module_property_helper(const char* property, bool check_for_cds) {
   if (strncmp(property, MODULE_PROPERTY_PREFIX, MODULE_PROPERTY_PREFIX_LEN) == 0) {
     const char* property_suffix = property + MODULE_PROPERTY_PREFIX_LEN;
-    if (matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) ||
-        matches_property_suffix(property_suffix, PATCH, PATCH_LEN) ||
+    if (matches_property_suffix(property_suffix, PATCH, PATCH_LEN) ||
         matches_property_suffix(property_suffix, LIMITMODS, LIMITMODS_LEN) ||
         matches_property_suffix(property_suffix, UPGRADE_PATH, UPGRADE_PATH_LEN) ||
         matches_property_suffix(property_suffix, ILLEGAL_NATIVE_ACCESS, ILLEGAL_NATIVE_ACCESS_LEN)) {
@@ -343,6 +342,7 @@ bool Arguments::internal_module_property_helper(const char* property, bool check
       // CDS notes: these properties are supported by CDS archived full module graph.
       if (matches_property_suffix(property_suffix, ADDEXPORTS, ADDEXPORTS_LEN) ||
           matches_property_suffix(property_suffix, ADDOPENS, ADDOPENS_LEN) ||
+          matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) ||
           matches_property_suffix(property_suffix, PATH, PATH_LEN) ||
           matches_property_suffix(property_suffix, ADDMODS, ADDMODS_LEN) ||
           matches_property_suffix(property_suffix, ENABLE_NATIVE_ACCESS, ENABLE_NATIVE_ACCESS_LEN)) {
diff --git a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
index 39c52f25514..45cddc9fb6f 100644
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
@@ -141,8 +141,7 @@ public static ModuleFinder limitedFinder() {
     private static boolean canUseArchivedBootLayer() {
         return getProperty("jdk.module.upgrade.path") == null &&
                getProperty("jdk.module.patch.0") == null &&       // --patch-module
-               getProperty("jdk.module.limitmods") == null &&     // --limit-modules
-               getProperty("jdk.module.addreads.0") == null;      // --add-reads
+               getProperty("jdk.module.limitmods") == null;       // --limit-modules
     }
 
     /**
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 3e2deb640c4..4e1d7601191 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -422,7 +422,6 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/customLoader \
  -runtime/cds/appcds/dynamicArchive \
  -runtime/cds/appcds/jigsaw/ExactOptionMatch.java \
- -runtime/cds/appcds/jigsaw/modulepath/AddExports.java \
  -runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java \
  -runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java \
  -runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java \
@@ -543,8 +542,6 @@ hotspot_aot_classlinking = \
  -runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \
  -runtime/cds/appcds/jigsaw/ExactOptionMatch.java \
  -runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java \
- -runtime/cds/appcds/jigsaw/modulepath/AddExports.java \
- -runtime/cds/appcds/jigsaw/modulepath/AddOpens.java \
  -runtime/cds/appcds/jigsaw/modulepath/AddModules.java \
  -runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java \
  -runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddExports.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
similarity index 97%
rename from test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddExports.java
rename to test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
index 40a9f2cd0a4..fa784162851 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddExports.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
@@ -45,7 +45,9 @@
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class AddExports {
-    static final Path SRC = Paths.get(System.getProperty("test.src")).resolve("src");
+    static final String SEP = File.separator;
+    static final Path SRC = Paths.get(System.getProperty("test.src")).
+        resolve( ".." + SEP + "jigsaw" + SEP + "modulepath" + SEP + "src");
     static final Path nonModuleNeedsJdkAddExportDir = SRC.resolve("com.nomodule.needsjdkaddexport");
     static final String nonModuleNeedsJdkAddExportJar = "nonModuleNeedsJdkAddExport.jar";
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddOpens.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddOpens.java
new file mode 100644
index 00000000000..5ae8c4a6bb8
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddOpens.java
@@ -0,0 +1,234 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @run driver AddOpens
+ * @summary sanity test the --add-opens option
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AddOpens {
+    private static final String SEP = File.separator;
+
+    private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
+
+    private static final Path SRC_DIR = Paths.get(System.getProperty("test.src")).
+        resolve( ".." + SEP + "jigsaw" + SEP + "modulepath" + SEP + "src");
+
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String TEST_MODULE1 = "com.simple";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.simple.Main";
+
+    private static Path moduleDir = null;
+    private static Path moduleDir2 = null;
+    private static Path destJar = null;
+
+    private static String addOpensArg = "java.base/java.lang=" + TEST_MODULE1;
+    private static String addOpensAllUnnamed = "java.base/java.lang=ALL-UNNAMED";
+    private static String extraOpts[][] =
+        {{"-Xlog:cds", "-Xlog:cds"},
+         {"--add-opens", addOpensArg}};
+    private static String expectedOutput[] =
+        { "[class,load] com.simple.Main source: shared objects file",
+          "method.setAccessible succeeded!"};
+
+    public static void buildTestModule() throws Exception {
+
+        // 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");
+        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
+
+        Path srcJar = moduleDir.resolve(TEST_MODULE1 + ".jar");
+        destJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
+        String classes = MODS_DIR.resolve(TEST_MODULE1).toString();
+        JarBuilder.createModularJar(srcJar.toString(), classes, MAIN_CLASS);
+        Files.copy(srcJar, destJar);
+
+    }
+
+    static int testCount = 0;
+    static void printComment(String comment) {
+        testCount ++;
+        System.out.println("======================================================================");
+        System.out.println("TESTCASE " + testCount + ": " + comment);
+        System.out.println("======================================================================");
+    }
+
+    static SimpleCDSAppTester test(String comment, SimpleCDSAppTester tester) throws Exception {
+        printComment(comment);
+        return tester
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Full module graph = enabled");
+                    })
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain(expectedOutput[0]);
+                    out.shouldContain(expectedOutput[1]);
+                    })
+            .runStaticWorkflow()
+            .runAOTWorkflow();
+    }
+
+    static class Tester1 extends CDSAppTester {
+        public Tester1(String testName) {
+            super(testName);
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            if (runMode == RunMode.DUMP_STATIC) {
+                return new String[] { "-Xlog:cds" };
+            } else {
+                return new String[] {
+                    "--add-opens", addOpensArg, "-Xlog:class+load=trace",
+                };
+            }
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return destJar.toString();
+        }
+
+        @Override
+        public String modulepath(RunMode runMode) {
+            return moduleDir.toString();
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            if (runMode == RunMode.TRAINING ||
+                runMode == RunMode.ASSEMBLY ||
+                runMode == RunMode.DUMP_STATIC) {
+                return new String[] {
+                    "-m", TEST_MODULE1,
+                };
+            } else {
+                return new String[] {
+                    "-m", TEST_MODULE1, "with_add_opens",
+                };
+            }
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.PRODUCTION) {
+                out.shouldContain(expectedOutput[0]);
+                out.shouldContain(expectedOutput[1]);
+            } else if (runMode == RunMode.ASSEMBLY) {
+                out.shouldContain("full module graph: enabled");
+            }
+        }
+    }
+
+    static class Tester2 extends CDSAppTester {
+        public Tester2(String testName) {
+            super(testName);
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+                "--add-opens", addOpensAllUnnamed, "-Xlog:class+load=trace",
+            };
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return destJar.toString();
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            if (runMode == RunMode.TRAINING ||
+                runMode == RunMode.ASSEMBLY ||
+                runMode == RunMode.DUMP_STATIC) {
+                return new String[] {
+                    MAIN_CLASS,
+                };
+            } else {
+                return new String[] {
+                    MAIN_CLASS, "with_add_opens",
+                };
+            }
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.PRODUCTION) {
+                out.shouldContain(expectedOutput[0]);
+                out.shouldContain(expectedOutput[1]);
+            } else if (runMode == RunMode.ASSEMBLY) {
+                out.shouldContain("full module graph: enabled");
+            }
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+        String appClasses[] = {MAIN_CLASS};
+        OutputAnalyzer output;
+
+        test("Same --add-opens during ASSEMBLY/DUMP_STATIC and PRODUCTION RunMode",
+            SimpleCDSAppTester.of("same-add-opens")
+                .classpath(destJar.toString())
+                .addVmArgs("--add-opens", addOpensArg, "-Xlog:class+load=trace")
+                .modulepath(moduleDir.toString())
+                .appCommandLine("-m", TEST_MODULE1, "with_add_opens"));
+
+        printComment("no --add-opens during DUMP_STATIC RunMode; --add-opens during PRODUCTION RunMode");
+        Tester1 t1 = new Tester1("no-add-opens-in-DUMP_STATIC");
+        t1.run("AOT");
+        t1.run("STATIC");
+
+        printComment("--add-opens ALL-UNNAMED during ASSEMBLY/DUMP_STATIC and PRODUCTION RunMode");
+        Tester2 t2 = new Tester2("add-opens-ALL-UNNAMED");
+        t2.run("AOT");
+        t2.run("STATIC");
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
new file mode 100644
index 00000000000..75e9da19464
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
@@ -0,0 +1,205 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8354083
+ * @requires vm.cds
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @run driver AddReads
+ * @summary sanity test the --add-reads option
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Asserts;
+
+public class AddReads {
+    private static final String SEP = File.separator;
+
+    private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
+
+    private static final Path SRC_DIR = Paths.get(System.getProperty("test.src")).
+        resolve( ".." + SEP + "jigsaw" + SEP + "modulepath" + SEP + "src");
+
+    private static final Path MODS_DIR = Paths.get("mods");
+
+    // the module name of the test module
+    private static final String MAIN_MODULE = "com.norequires";
+    private static final String SUB_MODULE = "org.astro";
+
+    // the module main class
+    private static final String MAIN_CLASS = "com.norequires.Main";
+    private static final String APP_CLASS = "org.astro.World";
+
+    private static final String sharedClassA =
+        "[class,load] com.norequires.Main source: shared objects file";
+    private static final String sharedClassB =
+        "[class,load] org.astro.World source: shared objects file";
+    private static final String fmgEnabled = "full module graph: enabled";
+    private static final String fmgDisabled = "full module graph: disabled";
+    private static final String cannotAccess =
+        "class com.norequires.Main (in module com.norequires) cannot access class org.astro.World (in module org.astro)";
+
+    private static Path moduleDir = null;
+    private static Path subJar = null;
+    private static Path mainJar = null;
+
+    public static void buildTestModule() throws Exception {
+
+        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+        JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE),
+                                       MODS_DIR.resolve(SUB_MODULE),
+                                       null);
+
+        Asserts.assertTrue(CompilerUtils
+            .compile(SRC_DIR.resolve(MAIN_MODULE),
+                     MODS_DIR.resolve(MAIN_MODULE),
+                     "-cp", MODS_DIR.resolve(SUB_MODULE).toString(),
+                     "--add-reads", "com.norequires=ALL-UNNAMED"));
+
+        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
+        subJar = moduleDir.resolve(SUB_MODULE + ".jar");
+        String classes = MODS_DIR.resolve(SUB_MODULE).toString();
+        JarBuilder.createModularJar(subJar.toString(), classes, null);
+
+        mainJar = moduleDir.resolve(MAIN_MODULE + ".jar");
+        classes = MODS_DIR.resolve(MAIN_MODULE).toString();
+        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
+    }
+
+    static int testCount = 0;
+    static void printComment(String comment) {
+        testCount ++;
+        System.out.println("======================================================================");
+        System.out.println("TESTCASE " + testCount + ": " + comment);
+        System.out.println("======================================================================");
+    }
+
+    static SimpleCDSAppTester test(String comment, SimpleCDSAppTester tester) throws Exception {
+        printComment(comment);
+        return tester
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Full module graph = enabled");
+                    })
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("use_full_module_graph = true; java.base");
+                    })
+            .runStaticWorkflow()
+            .runAOTWorkflow();
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester(String testName) {
+            super(testName);
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            if (runMode == RunMode.TRAINING ||
+                runMode == RunMode.ASSEMBLY ||
+                runMode == RunMode.DUMP_STATIC) {
+                return new String[] {
+                    "--add-modules", SUB_MODULE,
+                    "--add-reads", "com.norequires=" + SUB_MODULE,
+                    "-Xlog:class+load,cds,class+path=info",
+                };
+            } else {
+                return new String[] {
+                    "--add-modules", SUB_MODULE,
+                    "--add-reads", "com.norequires=ALL-UNNAMED",
+                    "-Xlog:class+load,cds,class+path=info",
+                };
+            }
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return subJar.toString();
+        }
+
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                "-m", MAIN_MODULE,
+            };
+        }
+
+        @Override
+        public String modulepath(RunMode runMode) {
+            return moduleDir.toString();
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.PRODUCTION) {
+                out.shouldContain("full module graph: disabled");
+                out.shouldContain("Mismatched values for property jdk.module.addreads: runtime com.norequires=ALL-UNNAMED dump time com.norequires=org.astro");
+            } else if (runMode == RunMode.ASSEMBLY) {
+                out.shouldContain("full module graph: enabled");
+            } else {
+                out.shouldHaveExitValue(0);
+            }
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        // compile the modules and create the modular jar files
+        buildTestModule();
+
+        test("FMG should be enabled with '--add-reads com.norequires=org.astro'",
+             SimpleCDSAppTester.of("add-reads")
+                 .modulepath(moduleDir.toString())
+                 .addVmArgs("--add-modules", SUB_MODULE,
+                            "--add-reads", "com.norequires=" + SUB_MODULE,
+                            "-Xlog:class+load,cds,class+path=info")
+                 .appCommandLine("-m", MAIN_MODULE));
+
+        test("FMG should be enabled with '--add-reads com.norequires=org.astro'",
+             SimpleCDSAppTester.of("add-reads-with-classpath")
+                 .classpath(subJar.toString())
+                 .modulepath(moduleDir.toString())
+                 .addVmArgs("--add-modules", SUB_MODULE,
+                            "--add-reads", "com.norequires=" + SUB_MODULE,
+                            "-Xlog:class+load,cds,class+path=info")
+                 .appCommandLine("-m", MAIN_MODULE));
+
+        printComment("FMG should be enabled with '--add-reads com.norequires=ALL-UNNAMED");
+        Tester t = new Tester("add-reads-ALL-UNNAMED");
+        t.setCheckExitValue(false);
+        t.run("AOT");
+        t.run("STATIC");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
deleted file mode 100644
index b181d23f64c..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * @test
- * @requires vm.cds
- * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @run driver AddOpens
- * @summary sanity test the --add-opens option
- */
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class AddOpens {
-
-    private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
-
-    private static final String TEST_SRC = System.getProperty("test.src");
-
-    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
-    private static final Path MODS_DIR = Paths.get("mods");
-
-    // the module name of the test module
-    private static final String TEST_MODULE1 = "com.simple";
-
-    // the module main class
-    private static final String MAIN_CLASS = "com.simple.Main";
-
-    private static Path moduleDir = null;
-    private static Path moduleDir2 = null;
-    private static Path destJar = null;
-
-    private static String addOpensArg = "java.base/java.lang=" + TEST_MODULE1;
-    private static String addOpensAllUnnamed = "java.base/java.lang=ALL-UNNAMED";
-    private static String extraOpts[][] =
-        {{"-Xlog:cds", "-Xlog:cds"},
-         {"--add-opens", addOpensArg}};
-    private static String expectedOutput[] =
-        { "[class,load] com.simple.Main source: shared objects file",
-          "method.setAccessible succeeded!"};
-
-    public static void buildTestModule() throws Exception {
-
-        // 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");
-        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
-
-        Path srcJar = moduleDir.resolve(TEST_MODULE1 + ".jar");
-        destJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
-        String classes = MODS_DIR.resolve(TEST_MODULE1).toString();
-        JarBuilder.createModularJar(srcJar.toString(), classes, MAIN_CLASS);
-        Files.copy(srcJar, destJar);
-
-    }
-
-    public static void main(String... args) throws Exception {
-        // compile the modules and create the modular jar files
-        buildTestModule();
-        String appClasses[] = {MAIN_CLASS};
-        OutputAnalyzer output;
-
-        for (int i = 0; i < 2; i++) {
-            // create an archive with both -cp and --module-path, and with the
-            // --add-opens option if i == 1, in the command line.
-            // Only the class in the modular jar in the --module-path will be archived;
-            // the class in the modular jar in the -cp won't be archived.
-            output = TestCommon.createArchive(
-                             destJar.toString(), appClasses,
-                             extraOpts[i][0], extraOpts[i][1],
-                             "--module-path", moduleDir.toString(),
-                             "-m", TEST_MODULE1);
-            TestCommon.checkDump(output);
-
-            // run with the archive using the same command line as in dump time
-            // plus the "--add-opens java.base/java.lang=com.simple" option.
-            // The main class should be loaded from the archive.
-            // The setaccessible(true) on the ClassLoader.defineClass method should
-            // be successful.
-            TestCommon.run( "-Xlog:class+load=trace",
-                            "-cp", destJar.toString(),
-                            "--add-opens", addOpensArg,
-                            "--module-path", moduleDir.toString(),
-                            "-m", TEST_MODULE1, "with_add_opens")
-                    .assertNormalExit(expectedOutput[0], expectedOutput[1]);
-        }
-
-        // Test --add-opens to ALL-UNNAMED modules
-        output = TestCommon.createArchive(
-                         destJar.toString(), appClasses,
-                         "--add-opens", addOpensAllUnnamed,
-                         MAIN_CLASS);
-        TestCommon.checkDump(output);
-
-        TestCommon.run( "-Xlog:class+load=trace",
-                        "-cp", destJar.toString(),
-                        "--add-opens", addOpensAllUnnamed,
-                        MAIN_CLASS, "with_add_opens")
-                .assertNormalExit(expectedOutput[0], expectedOutput[1]);
-
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java
deleted file mode 100644
index 8c5f3f087a4..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * @test
- * @requires vm.cds
- * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @run driver AddReads
- * @summary sanity test the --add-reads option
- */
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.Asserts;
-
-public class AddReads {
-
-    private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
-
-    private static final String TEST_SRC = System.getProperty("test.src");
-
-    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
-    private static final Path MODS_DIR = Paths.get("mods");
-
-    // the module name of the test module
-    private static final String MAIN_MODULE = "com.norequires";
-    private static final String SUB_MODULE = "org.astro";
-
-    // the module main class
-    private static final String MAIN_CLASS = "com.norequires.Main";
-    private static final String APP_CLASS = "org.astro.World";
-
-    private static Path moduleDir = null;
-    private static Path subJar = null;
-    private static Path mainJar = null;
-
-    public static void buildTestModule() throws Exception {
-
-        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
-        JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE),
-                                       MODS_DIR.resolve(SUB_MODULE),
-                                       null);
-
-        Asserts.assertTrue(CompilerUtils
-            .compile(SRC_DIR.resolve(MAIN_MODULE),
-                     MODS_DIR.resolve(MAIN_MODULE),
-                     "-cp", MODS_DIR.resolve(SUB_MODULE).toString(),
-                     "--add-reads", "com.norequires=ALL-UNNAMED"));
-
-        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
-        subJar = moduleDir.resolve(SUB_MODULE + ".jar");
-        String classes = MODS_DIR.resolve(SUB_MODULE).toString();
-        JarBuilder.createModularJar(subJar.toString(), classes, null);
-
-        mainJar = moduleDir.resolve(MAIN_MODULE + ".jar");
-        classes = MODS_DIR.resolve(MAIN_MODULE).toString();
-        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
-    }
-
-    public static void main(String... args) throws Exception {
-        // compile the modules and create the modular jar files
-        buildTestModule();
-        String appClasses[] = {MAIN_CLASS, APP_CLASS};
-        // create an archive with the classes in the modules built in the
-        // previous step
-        OutputAnalyzer output = TestCommon.createArchive(
-                                        null, appClasses,
-                                        "--module-path", moduleDir.toString(),
-                                        "--add-modules", SUB_MODULE,
-                                        "--add-reads", "com.norequires=org.astro",
-                                        "-m", MAIN_MODULE);
-        TestCommon.checkDump(output);
-        String prefix[] = {"-Djava.class.path=", "-Xlog:class+load=trace",
-                           "--add-modules", SUB_MODULE,
-                           "--add-reads", "com.norequires=org.astro"};
-
-        // run the com.norequires module with the archive with the same args
-        // used during dump time.
-        // The classes should be loaded from the archive.
-        TestCommon.runWithModules(prefix,
-                                  null, // --upgrade-module-path
-                                  moduleDir.toString(), // --module-path
-                                  MAIN_MODULE) // -m
-            .assertNormalExit(out -> {
-                out.shouldContain("[class,load] com.norequires.Main source: shared objects file")
-                   .shouldContain("[class,load] org.astro.World source: shared objects file");
-            });
-
-        // create an archive with -cp pointing to the jar file containing the
-        // org.astro module and --module-path pointing to the main module
-        output = TestCommon.createArchive(
-                                        subJar.toString(), appClasses,
-                                        "--module-path", moduleDir.toString(),
-                                        "--add-modules", SUB_MODULE,
-                                        "--add-reads", "com.norequires=org.astro",
-                                        "-m", MAIN_MODULE);
-        TestCommon.checkDump(output);
-        // run the com.norequires module with the archive with the sub-module
-        // in the -cp and with -add-reads=com.norequires=ALL-UNNAMED
-        // The main class should be loaded from the archive.
-        // The org.astro.World should be loaded from the jar.
-        String prefix2[] = {"-cp", subJar.toString(), "-Xlog:class+load=trace",
-                           "--add-reads", "com.norequires=ALL-UNNAMED"};
-        TestCommon.runWithModules(prefix2,
-                                  null, // --upgrade-module-path
-                                  moduleDir.toString(), // --module-path
-                                  MAIN_MODULE) // -m
-            .assertNormalExit(out -> {
-                out.shouldContain("[class,load] com.norequires.Main source: shared objects file")
-                   .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar");
-            });
-
-    }
-}

From f6b0f016f6da5d9c96b21c74d3b906ed8e6ae4b4 Mon Sep 17 00:00:00 2001
From: Paul H <p.hayder@icloud.com>
Date: Thu, 15 May 2025 22:35:48 +0000
Subject: [PATCH 491/901] 8332947: [macos] OpenURIHandler events not received
 when AWT is embedded in another toolkit

Reviewed-by: kcr, honkar, prr
---
 .../libawt_lwawt/awt/ApplicationDelegate.m    | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
index 4d8f1c765e6..b256c4121d4 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
@@ -43,6 +43,11 @@
 // The following is a AWT convention?
 #define PREFERENCES_TAG  42
 
+// Custom event that is provided by AWT to allow libraries like
+// JavaFX to forward native events to AWT even if AWT runs in
+// embedded mode.
+static NSString* awtEmbeddedEvent = @"AWTEmbeddedEvent";
+
 static void addMenuItem(NSMenuItem* menuItem, NSInteger index) {
 AWT_ASSERT_APPKIT_THREAD;
 
@@ -125,6 +130,14 @@ + (ApplicationDelegate *)sharedDelegate {
             isApplicationOwner = YES;
         }
     }
+
+    if (!isApplicationOwner) {
+        // Register embedded event listener
+        NSNotificationCenter *ctr = [NSNotificationCenter defaultCenter];
+        Class clz = [ApplicationDelegate class];
+        [ctr addObserver:clz selector:@selector(_embeddedEvent:) name:awtEmbeddedEvent object:nil];
+    }
+
     checked = YES;
     if (!shouldInstall) {
         [ThreadUtilities setApplicationOwner:NO];
@@ -290,11 +303,16 @@ - (void)dealloc {
     GET_CLASS_RETURN(sjc_AppEventHandler, "com/apple/eawt/_AppEventHandler", ret);
 
 - (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
-AWT_ASSERT_APPKIT_THREAD;
     if (!fHandlesURLTypes) return;
 
     NSString *url = [[openURLEvent paramDescriptorForKeyword:keyDirectObject] stringValue];
+    [ApplicationDelegate _openURL:url];
+
+    [replyEvent insertDescriptor:[NSAppleEventDescriptor nullDescriptor] atIndex:0];
+}
 
++ (void)_openURL:(NSString *)url {
+AWT_ASSERT_APPKIT_THREAD;
     //fprintf(stderr,"jm_handleOpenURL\n");
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     jstring jURL = NSStringToJavaString(env, url);
@@ -303,8 +321,6 @@ - (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEven
     (*env)->CallStaticVoidMethod(env, sjc_AppEventHandler, jm_handleOpenURI, jURL);
     CHECK_EXCEPTION();
     (*env)->DeleteLocalRef(env, jURL);
-
-    [replyEvent insertDescriptor:[NSAppleEventDescriptor nullDescriptor] atIndex:0];
 }
 
 // Helper for both open file and print file methods
@@ -475,6 +491,15 @@ + (void)_systemDidWake {
     [self _notifyJava:com_apple_eawt__AppEventHandler_NOTIFY_SYSTEM_WAKE];
 }
 
++ (void)_embeddedEvent:(NSNotification *)notification {
+    NSString *name = notification.userInfo[@"name"];
+
+    if ([name isEqualToString:@"openURL"]) {
+        NSString *url = notification.userInfo[@"url"];
+        [ApplicationDelegate _openURL:url];
+    }
+}
+
 + (void)_registerForNotification:(NSNumber *)notificationTypeNum {
     NSNotificationCenter *ctr = [[NSWorkspace sharedWorkspace] notificationCenter];
     Class clz = [ApplicationDelegate class];

From a8d8ffa8ad63f8f6308e2da224894fb2aded5d5c Mon Sep 17 00:00:00 2001
From: kieran-farrell <kieran.farrell@oracle.com>
Date: Fri, 16 May 2025 07:33:17 +0000
Subject: [PATCH 492/901] 8356395: Spec needs to be clarified for
 InterfaceAddress class level API documentation and getBroadcast() method

Reviewed-by: dfuchs
---
 .../share/classes/java/net/InterfaceAddress.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/net/InterfaceAddress.java b/src/java.base/share/classes/java/net/InterfaceAddress.java
index c0ebae261e8..6df2de353e3 100644
--- a/src/java.base/share/classes/java/net/InterfaceAddress.java
+++ b/src/java.base/share/classes/java/net/InterfaceAddress.java
@@ -28,10 +28,10 @@
 import java.util.Objects;
 
 /**
- * This class represents a Network Interface address. In short it's an
- * IP address, a subnet mask and a broadcast address when the address is
- * an IPv4 one. An IP address and a network prefix length in the case
- * of IPv6 address.
+ * This class represents a Network Interface address. In the case of
+ * IPv4, this comprises the IP address, a subnet mask, and a broadcast
+ * address if the interface supports broadcast. In the case of IPv6,
+ * it comprises the IP address and a network prefix length.
  *
  * @see java.net.NetworkInterface
  * @since 1.6
@@ -62,6 +62,9 @@ public InetAddress getAddress() {
      * <p>
      * Only IPv4 networks have broadcast address therefore, in the case
      * of an IPv6 network, {@code null} will be returned.
+     * <p>
+     * Certain network interfaces, such as the loopback interface, do not support
+     * broadcasting and will also return {@code null}.
      *
      * @return the {@code InetAddress} representing the broadcast
      *         address or {@code null} if there is no broadcast address.

From a6ebcf61eb522a1bcfc9f2169d42974af3883b00 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Fri, 16 May 2025 09:28:35 +0000
Subject: [PATCH 493/901] 8354674: AArch64: Intrinsify Unsafe::setMemory

Reviewed-by: adinn
---
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 122 ++++++++++++++++++
 .../foreign/SegmentBulkOperations.java        |   2 +-
 .../lang/foreign/MemorySegmentFillUnsafe.java |  93 +++++++++++++
 3 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentFillUnsafe.java

diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index beaa2510423..1b6f6d489f3 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -2566,6 +2566,123 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_unsafecopy_common_error_exit() {
+    address start_pc = __ pc();
+      __ leave();
+      __ mov(r0, 0);
+      __ ret(lr);
+    return start_pc;
+  }
+
+  //
+  //  Generate 'unsafe' set memory stub
+  //  Though just as safe as the other stubs, it takes an unscaled
+  //  size_t (# bytes) argument instead of an element count.
+  //
+  //  This fill operation is atomicity preserving: as long as the
+  //  address supplied is sufficiently aligned, all writes of up to 64
+  //  bits in size are single-copy atomic.
+  //
+  //  Input:
+  //    c_rarg0   - destination array address
+  //    c_rarg1   - byte count (size_t)
+  //    c_rarg2   - byte value
+  //
+  address generate_unsafe_setmemory() {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, StubGenStubId::unsafe_setmemory_id);
+    address start = __ pc();
+
+    Register dest = c_rarg0, count = c_rarg1, value = c_rarg2;
+    Label tail;
+
+    UnsafeMemoryAccessMark umam(this, true, false);
+
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    __ dup(v0, __ T16B, value);
+
+    if (AvoidUnalignedAccesses) {
+      __ cmp(count, (u1)16);
+      __ br(__ LO, tail);
+
+      __ mov(rscratch1, 16);
+      __ andr(rscratch2, dest, 15);
+      __ sub(rscratch1, rscratch1, rscratch2);  // Bytes needed to 16-align dest
+      __ strq(v0, Address(dest));
+      __ sub(count, count, rscratch1);
+      __ add(dest, dest, rscratch1);
+    }
+
+    __ subs(count, count, (u1)64);
+    __ br(__ LO, tail);
+    {
+      Label again;
+      __ bind(again);
+      __ stpq(v0, v0, Address(dest));
+      __ stpq(v0, v0, Address(dest, 32));
+
+      __ subs(count, count, 64);
+      __ add(dest, dest, 64);
+      __ br(__ HS, again);
+    }
+
+    __ bind(tail);
+    // The count of bytes is off by 64, but we don't need to correct
+    // it because we're only going to use the least-significant few
+    // count bits from here on.
+    // __ add(count, count, 64);
+
+    {
+      Label dont;
+      __ tbz(count, exact_log2(32), dont);
+      __ stpq(v0, v0, __ post(dest, 32));
+      __ bind(dont);
+    }
+    {
+      Label dont;
+      __ tbz(count, exact_log2(16), dont);
+      __ strq(v0, __ post(dest, 16));
+      __ bind(dont);
+    }
+    {
+      Label dont;
+      __ tbz(count, exact_log2(8), dont);
+      __ strd(v0, __ post(dest, 8));
+      __ bind(dont);
+    }
+
+    Label finished;
+    __ tst(count, 7);
+    __ br(__ EQ, finished);
+
+    {
+      Label dont;
+      __ tbz(count, exact_log2(4), dont);
+      __ strs(v0, __ post(dest, 4));
+      __ bind(dont);
+    }
+    {
+      Label dont;
+      __ tbz(count, exact_log2(2), dont);
+      __ bfi(value, value, 8, 8);
+      __ strh(value, __ post(dest, 2));
+      __ bind(dont);
+    }
+    {
+      Label dont;
+      __ tbz(count, exact_log2(1), dont);
+      __ strb(value, Address(dest));
+      __ bind(dont);
+    }
+
+    __ bind(finished);
+    __ leave();
+    __ ret(lr);
+
+    return start;
+  }
+
   address generate_data_cache_writeback() {
     const Register line        = c_rarg0;  // address of line to write back
 
@@ -2615,6 +2732,9 @@ class StubGenerator: public StubCodeGenerator {
     address entry_jlong_arraycopy;
     address entry_checkcast_arraycopy;
 
+    address ucm_common_error_exit       =  generate_unsafecopy_common_error_exit();
+    UnsafeMemoryAccess::set_common_exit_stub_pc(ucm_common_error_exit);
+
     generate_copy_longs(StubGenStubId::copy_byte_f_id, IN_HEAP | IS_ARRAY, copy_f, r0, r1, r15);
     generate_copy_longs(StubGenStubId::copy_byte_b_id, IN_HEAP | IS_ARRAY, copy_b, r0, r1, r15);
 
@@ -11259,6 +11379,8 @@ class StubGenerator: public StubCodeGenerator {
     }
 #endif
 
+    StubRoutines::_unsafe_setmemory = generate_unsafe_setmemory();
+
     StubRoutines::aarch64::set_completed(); // Inidicate that arraycopy and zero_blocks stubs are generated
   }
 
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
index 5f0794c81d9..76513c6772c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentBulkOperations.java
@@ -53,7 +53,7 @@ private SegmentBulkOperations() {}
 
     // All the threshold values below MUST be a power of two and should preferably be
     // greater or equal to 2^3.
-    private static final int NATIVE_THRESHOLD_FILL = powerOfPropertyOr("fill", Architecture.isAARCH64() ? 18 : 5);
+    private static final int NATIVE_THRESHOLD_FILL = powerOfPropertyOr("fill", 5);
     private static final int NATIVE_THRESHOLD_MISMATCH = powerOfPropertyOr("mismatch", 6);
     private static final int NATIVE_THRESHOLD_COPY = powerOfPropertyOr("copy", 6);
 
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentFillUnsafe.java b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentFillUnsafe.java
new file mode 100644
index 00000000000..18857d4657e
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/MemorySegmentFillUnsafe.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+ package org.openjdk.bench.java.lang.foreign;
+
+import jdk.internal.misc.Unsafe;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Setup;
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(value = 3, jvmArgs = {"--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
+public class MemorySegmentFillUnsafe {
+
+    static final Unsafe UNSAFE = Utils.unsafe;
+    long src;
+
+    @Param({"1", "2", "3", "4", "5", "6", "7", "8", "15", "16", "63", "64", "255", "256"})
+    public int size;
+
+    @Param({"true", "false"})
+    public boolean aligned;
+
+    private MemorySegment segment;
+    private long address;
+
+    @Setup
+    public void setup() throws Throwable {
+        Arena arena = Arena.global();
+        long alignment = 1;
+        // this complex logic is to ensure that if in the future we decide to batch writes with different
+        // batches based on alignment, we would spot it here
+        if (size == 2 || size == 3) {
+            alignment = 2;
+        } else if (size >= 4 && size <= 7) {
+            alignment = 4;
+        } else {
+            alignment = 8;
+        }
+        if (aligned) {
+            segment = arena.allocate(size, alignment);
+        } else {
+            // forcibly misaligned in both address AND size, given that would be the worst case
+            segment = arena.allocate(size + 1, alignment).asSlice(1);
+        }
+        address = segment.address();
+    }
+
+    @Benchmark
+    public void panama() {
+        segment.fill((byte) 99);
+    }
+
+    @Benchmark
+    public void unsafe() {
+        UNSAFE.setMemory(address, size, (byte) 99);
+    }
+}

From a0a3060709473c3ab433fa1485b723ca6c22b7cb Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Fri, 16 May 2025 11:31:37 +0000
Subject: [PATCH 494/901] 8353638: C2: deoptimization and re-execution cycle
 with StringBuilder

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/runtime.cpp    | 2 +-
 src/hotspot/share/runtime/globals.hpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index c85bf28e9f3..c5e15b5f3a6 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -2037,7 +2037,7 @@ static const TypeFunc* make_rethrow_Type() {
 void OptoRuntime::deoptimize_caller_frame(JavaThread *thread, bool doit) {
   // Deoptimize the caller before continuing, as the compiled
   // exception handler table may not be valid.
-  if (!StressCompiledExceptionHandlers && doit) {
+  if (DeoptimizeOnAllocationException && doit) {
     deoptimize_caller_frame(thread);
   }
 }
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 10eecf1f097..3f4dfa10070 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -650,6 +650,10 @@ const int ObjectAlignmentInBytes = 8;
   develop(bool, StressCompiledExceptionHandlers, false,                     \
           "Exercise compiled exception handlers")                           \
                                                                             \
+  product(bool, DeoptimizeOnAllocationException, false, DIAGNOSTIC,         \
+          "Deoptimize on exception during allocation instead of using the " \
+          "compiled exception handlers")                                    \
+                                                                            \
   develop(bool, InterceptOSException, false,                                \
           "Start debugger when an implicit OS (e.g. null pointer) "         \
           "exception happens")                                              \

From 0d8675780f28d25ed538589480cc208b48fe7e93 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Fri, 16 May 2025 11:32:01 +0000
Subject: [PATCH 495/901] 8355488: Add stress mode for C2 loop peeling

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/c2_globals.hpp    |  3 +++
 src/hotspot/share/opto/compile.cpp       |  3 ++-
 src/hotspot/share/opto/loopTransform.cpp | 18 +++++++++++++++++-
 src/hotspot/share/opto/loopnode.hpp      |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 2246bd62f4e..66c9ecd2e0b 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -833,6 +833,9 @@
           "used dead by replacing them with a Halt node. Turning this off " \
           "could corrupt the graph in rare cases and should be used with "  \
           "care.")                                                          \
+                                                                            \
+  develop(bool, StressLoopPeeling, false,                                   \
+          "Randomize loop peeling decision")                                \
 
 // end of C2_FLAGS
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 64d21a59655..eb526fd01bd 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -731,7 +731,8 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
   }
 
   if (StressLCM || StressGCM || StressIGVN || StressCCP ||
-      StressIncrementalInlining || StressMacroExpansion || StressUnstableIfTraps || StressBailout) {
+      StressIncrementalInlining || StressMacroExpansion || StressUnstableIfTraps || StressBailout ||
+      StressLoopPeeling) {
     initialize_stress_seed(directive);
   }
 
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index f7783e19c9c..d4e5ff0bd0a 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -491,7 +491,7 @@ uint IdealLoopTree::estimate_peeling(PhaseIdealLoop *phase) {
   assert(!phase->exceeding_node_budget(), "sanity");
 
   // Peeling does loop cloning which can result in O(N^2) node construction.
-  if (_body.size() > 255) {
+  if (_body.size() > 255 && !StressLoopPeeling) {
     return 0;   // Suppress too large body size.
   }
   // Optimistic estimate that approximates loop body complexity via data and
@@ -506,10 +506,26 @@ uint IdealLoopTree::estimate_peeling(PhaseIdealLoop *phase) {
   if (_head->is_CountedLoop()) {
     CountedLoopNode* cl = _head->as_CountedLoop();
     if (cl->is_unroll_only() || cl->trip_count() == 1) {
+      // Peeling is not legal here (cf. assert in do_peeling), we don't even stress peel!
       return 0;
     }
   }
 
+#ifndef PRODUCT
+  // It is now safe to peel or not.
+  if (StressLoopPeeling) {
+    LoopNode* loop_head = _head->as_Loop();
+    static constexpr uint max_peeling_opportunities = 5;
+    if (loop_head->_stress_peeling_attempts < max_peeling_opportunities) {
+      loop_head->_stress_peeling_attempts++;
+      // In case of stress, let's just pick randomly...
+      return ((phase->C->random() % 2) == 0) ? estimate : 0;
+    }
+    return 0;
+  }
+  // ...otherwise, let's apply our heuristic.
+#endif
+
   Node* test = tail();
 
   while (test != _head) {   // Scan till run off top of loop
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 5a1fceacf9e..84d8fc71f6b 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -133,6 +133,10 @@ class LoopNode : public RegionNode {
   void set_profile_trip_cnt(float ptc) { _profile_trip_cnt = ptc; }
   float profile_trip_cnt()             { return _profile_trip_cnt; }
 
+#ifndef PRODUCT
+  uint _stress_peeling_attempts = 0;
+#endif
+
   LoopNode(Node *entry, Node *backedge)
     : RegionNode(3), _loop_flags(0), _unswitch_count(0),
       _profile_trip_cnt(COUNT_UNKNOWN) {

From 079fccfa9a03b890e698c52c689dea0f19f8fbee Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Fri, 16 May 2025 12:25:04 +0000
Subject: [PATCH 496/901] 8353888: Implement JEP 510: Key Derivation Function
 API

Reviewed-by: valeriep, mullan, liach
---
 .../com/sun/crypto/provider/SunJCE.java       |   3 +-
 .../share/classes/javax/crypto/KDF.java       |  45 ++++++-
 .../classes/javax/crypto/KDFParameters.java   |   7 +-
 .../share/classes/javax/crypto/KDFSpi.java    |   5 +-
 .../javax/crypto/spec/HKDFParameterSpec.java  |  11 +-
 .../jdk/internal/javac/PreviewFeature.java    |   3 +-
 src/java.base/share/classes/module-info.java  |   1 -
 .../share/classes/module-info.java            |   3 -
 .../provider/KDF/HKDFBasicFunctionsTest.java  |   3 +-
 .../crypto/provider/KDF/HKDFDelayedPRK.java   |   1 -
 .../provider/KDF/HKDFExhaustiveTest.java      |   3 +-
 .../provider/KDF/HKDFKnownAnswerTests.java    |   3 +-
 .../crypto/provider/KDF/HKDFSaltIKMTest.java  |   5 +-
 .../KDF/KDFDelayedProviderException.java      | 124 ++++++++++++++++++
 .../KDF/KDFDelayedProviderSyncTest.java       |   3 +-
 .../crypto/KDF/KDFDelayedProviderTest.java    |   3 +-
 .../KDF/KDFDelayedProviderThreadingTest.java  |   5 +-
 .../jdk/sun/security/pkcs11/KDF/TestHKDF.java |   1 -
 18 files changed, 180 insertions(+), 49 deletions(-)
 create mode 100644 test/jdk/javax/crypto/KDF/KDFDelayedProviderException.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
index 4e5bd131311..cc99464dff3 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -78,6 +78,7 @@
  *
  * - ML-KEM
  *
+ * - HKDF-SHA256, HKDF-SHA384, and HKDF-SHA512
  */
 
 public final class SunJCE extends Provider {
@@ -87,7 +88,7 @@ public final class SunJCE extends Provider {
 
     private static final String info = "SunJCE Provider " +
     "(implements RSA, DES, Triple DES, AES, Blowfish, ARCFOUR, RC2, PBE, "
-    + "Diffie-Hellman, HMAC, ChaCha20, DHKEM, and ML-KEM)";
+    + "Diffie-Hellman, HMAC, ChaCha20, DHKEM, ML-KEM, and HKDF)";
 
     /* Are we debugging? -- for developers */
     static final boolean debug = false;
diff --git a/src/java.base/share/classes/javax/crypto/KDF.java b/src/java.base/share/classes/javax/crypto/KDF.java
index 5c9c7e71ce4..ec7bcfa199c 100644
--- a/src/java.base/share/classes/javax/crypto/KDF.java
+++ b/src/java.base/share/classes/javax/crypto/KDF.java
@@ -25,7 +25,6 @@
 
 package javax.crypto;
 
-import jdk.internal.javac.PreviewFeature;
 import sun.security.jca.GetInstance;
 import sun.security.jca.GetInstance.Instance;
 import sun.security.util.Debug;
@@ -98,9 +97,8 @@
  *
  * @see KDFParameters
  * @see SecretKey
- * @since 24
+ * @since 25
  */
-@PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
 public final class KDF {
 
     private static final Debug pdebug = Debug.getInstance("provider",
@@ -479,6 +477,25 @@ private static KDF handleException(NoSuchAlgorithmException e)
         throw e;
     }
 
+    // Rethrows the IAPE thrown by an implementation, adding an explanation
+    // for the situation in which it fails.
+    private void rethrow(InvalidAlgorithmParameterException e)
+            throws InvalidAlgorithmParameterException {
+        var source = serviceIterator == null
+                ? "specified" : "previously selected";
+        if (!skipDebug && pdebug != null) {
+            pdebug.println("A " + this.getAlgorithm()
+                    + " derivation cannot be performed "
+                    + "using the supplied derivation "
+                    + "inputs with the " + source + " "
+                    + theOne.provider().getName()
+                    + " provider.");
+        }
+        throw new InvalidAlgorithmParameterException(
+                "The " + source + " " + theOne.provider.getName()
+                + " provider does not support this input", e);
+    }
+
     /**
      * Derives a key, returned as a {@code SecretKey} object.
      *
@@ -523,7 +540,12 @@ public SecretKey deriveKey(String alg,
         }
         Objects.requireNonNull(derivationSpec);
         if (checkSpiNonNull(theOne)) {
-            return theOne.spi().engineDeriveKey(alg, derivationSpec);
+            try {
+                return theOne.spi().engineDeriveKey(alg, derivationSpec);
+            } catch (InvalidAlgorithmParameterException e) {
+                rethrow(e);
+                return null; // will not be called
+            }
         } else {
             return (SecretKey) chooseProvider(alg, derivationSpec);
         }
@@ -554,7 +576,12 @@ public byte[] deriveData(AlgorithmParameterSpec derivationSpec)
 
         Objects.requireNonNull(derivationSpec);
         if (checkSpiNonNull(theOne)) {
-            return theOne.spi().engineDeriveData(derivationSpec);
+            try {
+                return theOne.spi().engineDeriveData(derivationSpec);
+            } catch (InvalidAlgorithmParameterException e) {
+                rethrow(e);
+                return null; // will not be called
+            }
         } else {
             try {
                 return (byte[]) chooseProvider(null, derivationSpec);
@@ -613,6 +640,11 @@ private Object chooseProvider(String algorithm,
                                         derivationSpec);
                         // found a working KDFSpi
                         this.theOne = currOne;
+                        if (!skipDebug && pdebug != null) {
+                            pdebug.println("The provider "
+                                    + currOne.provider().getName()
+                                    + " is selected");
+                        }
                         return result;
                     } catch (Exception e) {
                         if (!skipDebug && pdebug != null) {
@@ -649,7 +681,8 @@ private Object chooseProvider(String algorithm,
                     e.printStackTrace(pdebug.getPrintStream());
                 }
                 // getNext reached end without finding an implementation
-                throw new InvalidAlgorithmParameterException(lastException);
+                throw new InvalidAlgorithmParameterException(
+                        "No provider supports this input", lastException);
             }
         }
     }
diff --git a/src/java.base/share/classes/javax/crypto/KDFParameters.java b/src/java.base/share/classes/javax/crypto/KDFParameters.java
index 5f83204f3c4..b9bd2765883 100644
--- a/src/java.base/share/classes/javax/crypto/KDFParameters.java
+++ b/src/java.base/share/classes/javax/crypto/KDFParameters.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
@@ -24,8 +24,6 @@
  */
 package javax.crypto;
 
-import jdk.internal.javac.PreviewFeature;
-
 /**
  * A specification of Key Derivation Function ({@link KDF}) parameters.
  * <p>
@@ -44,7 +42,6 @@
  * @see KDF#getInstance(String, KDFParameters)
  * @see KDF#getParameters()
  * @see KDF
- * @since 24
+ * @since 25
  */
-@PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
 public interface KDFParameters {}
diff --git a/src/java.base/share/classes/javax/crypto/KDFSpi.java b/src/java.base/share/classes/javax/crypto/KDFSpi.java
index e2625a1930d..6d0eb90b397 100644
--- a/src/java.base/share/classes/javax/crypto/KDFSpi.java
+++ b/src/java.base/share/classes/javax/crypto/KDFSpi.java
@@ -25,8 +25,6 @@
 
 package javax.crypto;
 
-import jdk.internal.javac.PreviewFeature;
-
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
@@ -69,9 +67,8 @@
  * @see KDFParameters
  * @see KDF#getParameters()
  * @see SecretKey
- * @since 24
+ * @since 25
  */
-@PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
 public abstract class KDFSpi {
 
     /**
diff --git a/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java
index 8f697d12e60..c4ca9e1e183 100644
--- a/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.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,8 +25,6 @@
 
 package javax.crypto.spec;
 
-import jdk.internal.javac.PreviewFeature;
-
 import javax.crypto.SecretKey;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.ArrayList;
@@ -75,9 +73,8 @@
  * @spec https://www.rfc-editor.org/info/rfc5869
  *      RFC 5869: HMAC-based Extract-and-Expand Key Derivation Function (HKDF)
  * @see javax.crypto.KDF
- * @since 24
+ * @since 25
  */
-@PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
 public interface HKDFParameterSpec extends AlgorithmParameterSpec {
 
     /**
@@ -92,7 +89,6 @@ public interface HKDFParameterSpec extends AlgorithmParameterSpec {
      * use-cases respectively. Note that the {@code Builder} is not
      * thread-safe.
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
     final class Builder {
 
         private List<SecretKey> ikms = new ArrayList<>();
@@ -296,7 +292,6 @@ static Expand expandOnly(SecretKey prk, byte[] info, int length) {
      * Defines the input parameters of an Extract operation as defined in <a
      * href="http://tools.ietf.org/html/rfc5869">RFC 5869</a>.
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
     final class Extract implements HKDFParameterSpec {
 
         // HKDF-Extract(salt, IKM) -> PRK
@@ -350,7 +345,6 @@ public List<SecretKey> salts() {
      * Defines the input parameters of an Expand operation as defined in <a
      * href="http://tools.ietf.org/html/rfc5869">RFC 5869</a>.
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
     final class Expand implements HKDFParameterSpec {
 
         // HKDF-Expand(PRK, info, L) -> OKM
@@ -419,7 +413,6 @@ public int length() {
      * Defines the input parameters of an Extract-then-Expand operation as
      * defined in <a href="http://tools.ietf.org/html/rfc5869">RFC 5869</a>.
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.KEY_DERIVATION)
     final class ExtractThenExpand implements HKDFParameterSpec {
         private final Extract ext;
         private final Expand exp;
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 5726671dfd4..80593c5453a 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -76,8 +76,7 @@ public enum Feature {
         CLASSFILE_API,
         STREAM_GATHERERS,
         MODULE_IMPORTS, //remove when the boot JDK is JDK 25
-        @JEP(number=478, title="Key Derivation Function API", status="Preview")
-        KEY_DERIVATION,
+        KEY_DERIVATION, //remove when the boot JDK is JDK 25
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
         LANGUAGE_MODEL,
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 6775dda269a..bbcdfef65ec 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -156,7 +156,6 @@
         java.compiler,
         java.desktop, // for ScopedValue
         jdk.compiler,
-        jdk.crypto.cryptoki, // participates in preview features
         jdk.incubator.vector, // participates in preview features
         jdk.jartool, // participates in preview features
         jdk.jdeps, // participates in preview features
diff --git a/src/jdk.crypto.cryptoki/share/classes/module-info.java b/src/jdk.crypto.cryptoki/share/classes/module-info.java
index 2899bd31f2c..b9800564804 100644
--- a/src/jdk.crypto.cryptoki/share/classes/module-info.java
+++ b/src/jdk.crypto.cryptoki/share/classes/module-info.java
@@ -23,8 +23,6 @@
  * questions.
  */
 
-import jdk.internal.javac.ParticipatesInPreview;
-
 /**
  * Provides the implementation of the SunPKCS11 security provider.
  *
@@ -33,7 +31,6 @@
  * @moduleGraph
  * @since 9
  */
-@ParticipatesInPreview
 module jdk.crypto.cryptoki {
     provides java.security.Provider with sun.security.pkcs11.SunPKCS11;
 }
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFBasicFunctionsTest.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFBasicFunctionsTest.java
index b309d1ce8df..172d4d451ae 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFBasicFunctionsTest.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFBasicFunctionsTest.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,6 @@
  * @bug 8331008
  * @summary basic HKDF operations
  * @library /test/lib
- * @enablePreview
  */
 
 import java.util.HexFormat;
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFDelayedPRK.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFDelayedPRK.java
index 50157723416..f140d3c3f55 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFDelayedPRK.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFDelayedPRK.java
@@ -27,7 +27,6 @@
  * @summary make sure DPS works when non-extractable PRK is provided
  * @library /test/lib /test/jdk/security/unsignedjce
  * @build java.base/javax.crypto.ProviderVerifier
- * @enablePreview
  * @run main/othervm HKDFDelayedPRK
  */
 
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java
index fd33337a3c0..bf444e3cda4 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFExhaustiveTest.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
@@ -27,7 +27,6 @@
  * @summary KDF API tests
  * @library /test/lib
  * @run main/othervm -Djava.security.egd=file:/dev/urandom -Djava.security.debug=provider,engine=kdf HKDFExhaustiveTest
- * @enablePreview
  */
 
 import java.security.InvalidAlgorithmParameterException;
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFKnownAnswerTests.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFKnownAnswerTests.java
index 358ffa794fd..bb6d4febe31 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFKnownAnswerTests.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFKnownAnswerTests.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,6 @@
  * @bug 8331008
  * @run main HKDFKnownAnswerTests
  * @summary Tests for HKDF Expand and Extract Key Derivation Functions
- * @enablePreview
  */
 
 import javax.crypto.KDF;
diff --git a/test/jdk/com/sun/crypto/provider/KDF/HKDFSaltIKMTest.java b/test/jdk/com/sun/crypto/provider/KDF/HKDFSaltIKMTest.java
index 1cd0feab614..0ae0fa23ea7 100644
--- a/test/jdk/com/sun/crypto/provider/KDF/HKDFSaltIKMTest.java
+++ b/test/jdk/com/sun/crypto/provider/KDF/HKDFSaltIKMTest.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,6 @@
  * @bug 8331008
  * @summary addIKM and addSalt consistency checks
  * @library /test/lib
- * @enablePreview
  */
 
 import jdk.test.lib.Asserts;
@@ -89,4 +88,4 @@ public static void main(String[] args) throws Exception {
         }
         System.out.println(atlast);
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/javax/crypto/KDF/KDFDelayedProviderException.java b/test/jdk/javax/crypto/KDF/KDFDelayedProviderException.java
new file mode 100644
index 00000000000..24ee820826a
--- /dev/null
+++ b/test/jdk/javax/crypto/KDF/KDFDelayedProviderException.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.
+ */
+
+/*
+ * @test
+ * @bug 8353888
+ * @library /test/lib /test/jdk/security/unsignedjce
+ * @build java.base/javax.crypto.ProviderVerifier
+ * @run main/othervm KDFDelayedProviderException
+ * @summary check delayed provider selection exception messages
+ */
+
+import jdk.test.lib.Asserts;
+
+import javax.crypto.KDF;
+import javax.crypto.KDFParameters;
+import javax.crypto.KDFSpi;
+import javax.crypto.SecretKey;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.Provider;
+import java.security.Security;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.NamedParameterSpec;
+
+public class KDFDelayedProviderException {
+    public static void main(String[] args) throws Exception {
+
+        Security.addProvider(new P1()); // only accepts NamedParameterSpec.ED25519
+        Security.addProvider(new P2()); // only accepts NamedParameterSpec.ED448
+
+        checkMessage("No provider supports this input",
+                () -> KDF.getInstance("K").deriveData(NamedParameterSpec.X25519));
+
+        checkMessage("The specified P1 provider does not support this input",
+                () -> KDF.getInstance("K", "P1").deriveData(NamedParameterSpec.ED448));
+
+        // ED448 is supported by one provider
+        KDF.getInstance("K").deriveData(NamedParameterSpec.ED448);
+
+        // After P1 has been selected, ED448 is no longer supported
+        var k = KDF.getInstance("K");
+        k.deriveData(NamedParameterSpec.ED25519);
+        checkMessage("The previously selected P1 provider does not support this input",
+                () -> k.deriveData(NamedParameterSpec.ED448));
+
+    }
+
+    public static void checkMessage(String msg, Asserts.TestMethod testMethod) {
+        var exc = Asserts.assertThrows(InvalidAlgorithmParameterException.class, testMethod);
+        Asserts.assertEquals(msg, exc.getMessage());
+    }
+
+    public static class P1 extends Provider {
+        public P1() {
+            super("P1", "1", "");
+            put("KDF.K", K1.class.getName());
+        }
+    }
+
+    public static class P2 extends Provider {
+        public P2() {
+            super("P2", "1", "");
+            put("KDF.K", K2.class.getName());
+        }
+    }
+
+    public static class K1 extends KDFSpi {
+        public K1(KDFParameters p) throws InvalidAlgorithmParameterException {
+            super(p);
+        }
+        protected byte[] engineDeriveData(AlgorithmParameterSpec derivationSpec)
+                throws InvalidAlgorithmParameterException {
+            if (derivationSpec != NamedParameterSpec.ED25519) {
+                throw new InvalidAlgorithmParameterException("Not Ed25519");
+            }
+            return new byte[0];
+        }
+        protected KDFParameters engineGetParameters() {
+            return null;
+        }
+        protected SecretKey engineDeriveKey(String alg, AlgorithmParameterSpec derivationSpec) {
+            return null;
+        }
+    }
+
+    public static class K2 extends KDFSpi {
+        public K2(KDFParameters p) throws InvalidAlgorithmParameterException {
+            super(p);
+        }
+        protected byte[] engineDeriveData(AlgorithmParameterSpec derivationSpec)
+                throws InvalidAlgorithmParameterException {
+            if (derivationSpec != NamedParameterSpec.ED448) {
+                throw new InvalidAlgorithmParameterException("Not Ed448");
+            }
+            return new byte[0];
+        }
+        protected KDFParameters engineGetParameters() {
+            return null;
+        }
+        protected SecretKey engineDeriveKey(String alg, AlgorithmParameterSpec derivationSpec) {
+            return null;
+        }
+    }
+}
diff --git a/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java b/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java
index f4ddd726d0c..6858894d2e9 100644
--- a/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.java
+++ b/test/jdk/javax/crypto/KDF/KDFDelayedProviderSyncTest.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
@@ -27,7 +27,6 @@
  * @library /test/lib
  * @run testng KDFDelayedProviderSyncTest
  * @summary multi-threading test for KDF
- * @enablePreview
  */
 
 import org.testng.annotations.BeforeClass;
diff --git a/test/jdk/javax/crypto/KDF/KDFDelayedProviderTest.java b/test/jdk/javax/crypto/KDF/KDFDelayedProviderTest.java
index edebae217f2..5103a6e5df9 100644
--- a/test/jdk/javax/crypto/KDF/KDFDelayedProviderTest.java
+++ b/test/jdk/javax/crypto/KDF/KDFDelayedProviderTest.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
@@ -28,7 +28,6 @@
  * @build java.base/javax.crypto.ProviderVerifier
  * @run main/othervm KDFDelayedProviderTest
  * @summary delayed provider selection
- * @enablePreview
  */
 
 import jdk.test.lib.Asserts;
diff --git a/test/jdk/javax/crypto/KDF/KDFDelayedProviderThreadingTest.java b/test/jdk/javax/crypto/KDF/KDFDelayedProviderThreadingTest.java
index 7b91badef95..8d7ad058c39 100644
--- a/test/jdk/javax/crypto/KDF/KDFDelayedProviderThreadingTest.java
+++ b/test/jdk/javax/crypto/KDF/KDFDelayedProviderThreadingTest.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
@@ -28,7 +28,6 @@
  * @build java.base/javax.crypto.ProviderVerifier
  * @run main/othervm KDFDelayedProviderThreadingTest
  * @summary delayed provider selection threading test
- * @enablePreview
  */
 
 import jdk.test.lib.Asserts;
@@ -127,4 +126,4 @@ protected byte[] engineDeriveData(AlgorithmParameterSpec derivationSpec)
             throw new InvalidAlgorithmParameterException();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
index 638d4aa2bb1..aaaa8373f44 100644
--- a/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
+++ b/test/jdk/sun/security/pkcs11/KDF/TestHKDF.java
@@ -43,7 +43,6 @@
  * @bug 8328119
  * @summary test HKDF key derivation in SunPKCS11
  * @library /test/lib ..
- * @enablePreview
  * @run main/othervm/timeout=30 TestHKDF
  */
 

From bca293d0124af098d36cdfb18c15df18c8ce53b9 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Fri, 16 May 2025 13:19:01 +0000
Subject: [PATCH 497/901] 8336470: Source launcher should work with service
 loader SPI in unnamed module

Reviewed-by: alanb
---
 make/CompileInterimLangtools.gmk              |  1 +
 .../javac/launcher/MemoryClassLoader.java     | 40 ++++++++++++++----
 .../javac/launcher/MemoryModuleFinder.java    |  8 +++-
 .../tools/javac/launcher/GetResourceTest.java | 10 ++---
 .../services/java.util.spi.ToolProvider       |  1 +
 .../tools/javac/launcher/src/Tool.java        | 41 +++++++++++++++++++
 .../tools/javac/launcher/src/p/q/CLTest.java  | 36 ++++++++++++++--
 7 files changed, 118 insertions(+), 19 deletions(-)
 create mode 100644 test/langtools/tools/javac/launcher/src/META-INF/services/java.util.spi.ToolProvider
 create mode 100644 test/langtools/tools/javac/launcher/src/Tool.java

diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index 4a2bbaec5b8..c7d1c3796f6 100644
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -99,6 +99,7 @@ define SetupInterimModule
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java
index f87fc88fdff..abfa6a58c30 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.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
@@ -27,8 +27,10 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.lang.module.ModuleDescriptor;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -48,6 +50,8 @@
 import java.util.NoSuchElementException;
 import java.util.function.Function;
 
+import jdk.internal.module.Resources;
+
 /**
  * An in-memory classloader, that uses an in-memory cache of classes written by
  * {@link MemoryFileManager}.
@@ -149,13 +153,9 @@ public URL getResource(String name) {
         if (sourceFileClasses.containsKey(toBinaryName(name))) {
             return findResource(name);
         }
-        var programPath = programDescriptor.sourceRootPath().resolve(name);
-        if (Files.exists(programPath)) {
-            try {
-                return programPath.toUri().toURL();
-            } catch (MalformedURLException e) {
-                throw new RuntimeException(e);
-            }
+        URL resource = toResourceInRootPath(name);
+        if (resource != null) {
+            return resource;
         }
         return parentClassLoader.getResource(name);
     }
@@ -233,7 +233,7 @@ protected URL findResource(String moduleName, String name) throws IOException {
     public URL findResource(String name) {
         String binaryName = toBinaryName(name);
         if (binaryName == null || sourceFileClasses.get(binaryName) == null) {
-            return null;
+            return toResourceInRootPath(name);
         }
 
         URLStreamHandler handler = this.handler;
@@ -271,6 +271,28 @@ public URL nextElement() {
         };
     }
 
+    /**
+     * Resolves a "resource name" (as used in the getResource* methods)
+     * to an existing file relative to source root path, or null otherwise.
+     *
+     * @param name the resource name
+     * @return the URL of the resource, or null
+     */
+    private URL toResourceInRootPath(String name) {
+        try {
+            var path = Resources.toFilePath(programDescriptor.sourceRootPath(), name);
+            return path == null ? null : path.toUri().toURL();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        } catch (IOError error) {
+            Throwable cause = error.getCause();
+            if (cause instanceof IOException e) {
+                throw new UncheckedIOException(e);
+            }
+            throw new RuntimeException(cause);
+        }
+    }
+
     /**
      * Converts a "resource name" (as used in the getResource* methods)
      * to a binary name if the name identifies a class, or null otherwise.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java
index d82580c993f..79b0b959c7b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.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
@@ -105,7 +105,11 @@ public Optional<URI> find(String name) throws IOException {
                 try {
                     return Optional.of(path.toUri());
                 } catch (IOError error) {
-                    throw (IOException) error.getCause();
+                    Throwable cause = error.getCause();
+                    if (cause instanceof IOException e) {
+                        throw e;
+                    }
+                    throw new RuntimeException(cause);
                 }
             } else {
                 return Optional.empty();
diff --git a/test/langtools/tools/javac/launcher/GetResourceTest.java b/test/langtools/tools/javac/launcher/GetResourceTest.java
index acdc1e5c429..34bffa5adeb 100644
--- a/test/langtools/tools/javac/launcher/GetResourceTest.java
+++ b/test/langtools/tools/javac/launcher/GetResourceTest.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,8 +23,8 @@
 
 /*
  * @test
- * @bug 8210009 8321739
- * @summary Source Launcher classloader should support getResource and getResourceAsStream
+ * @bug 8210009 8321739 8336470
+ * @summary Source Launcher classloader should support getResource/s and getResourceAsStream
  * @modules jdk.compiler
  * @library /tools/lib
  * @build toolbox.JavaTask toolbox.ToolBox
@@ -44,12 +44,12 @@
  * in order to test the classloader used to launch such programs.
  */
 public class GetResourceTest {
-    public static void main(String... args) throws Exception {
+    public static void main(String... args) {
         GetResourceTest t = new GetResourceTest();
         t.run();
     }
 
-    void run() throws Exception {
+    void run() {
         ToolBox tb = new ToolBox();
         Path file = Paths.get(tb.testSrc).resolve("src/p/q").resolve("CLTest.java");
         new JavaTask(tb)
diff --git a/test/langtools/tools/javac/launcher/src/META-INF/services/java.util.spi.ToolProvider b/test/langtools/tools/javac/launcher/src/META-INF/services/java.util.spi.ToolProvider
new file mode 100644
index 00000000000..a475bbc4127
--- /dev/null
+++ b/test/langtools/tools/javac/launcher/src/META-INF/services/java.util.spi.ToolProvider
@@ -0,0 +1 @@
+Tool
diff --git a/test/langtools/tools/javac/launcher/src/Tool.java b/test/langtools/tools/javac/launcher/src/Tool.java
new file mode 100644
index 00000000000..1082452c113
--- /dev/null
+++ b/test/langtools/tools/javac/launcher/src/Tool.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+// unnamed package
+
+import java.io.PrintWriter;
+import java.util.spi.ToolProvider;
+
+public class Tool implements ToolProvider {
+    @Override
+    public String name() {
+        return "Tool";
+    }
+
+    @Override
+    public int run(PrintWriter out, PrintWriter err, String... args) {
+        out.println("Tool/out");
+        err.println("Tool/err");
+        return 0;
+    }
+}
diff --git a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java b/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
index 71840d3f29d..938512e1501 100644
--- a/test/langtools/tools/javac/launcher/src/p/q/CLTest.java
+++ b/test/langtools/tools/javac/launcher/src/p/q/CLTest.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
@@ -39,23 +39,42 @@
 import java.util.*;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
+import java.util.spi.ToolProvider;
 
 public class CLTest {
     public static void main(String... args) throws Exception {
         try {
-            new CLTest().run();
+            var test = new CLTest();
+            test.loadToolProviderByName(); // run first to create Tool.class
+            test.getGetResources();
         } catch (Throwable t) {
             t.printStackTrace();
             System.exit(1);
         }
     }
 
-    void run() throws Exception {
+    void loadToolProviderByName() {
+        ServiceLoader.load(ToolProvider.class).stream()
+                .map(ServiceLoader.Provider::get)
+                .filter(toolProvider -> toolProvider.name().equals("Tool"))
+                .findFirst()
+                .orElseThrow();
+    }
+
+    void getGetResources() throws Exception {
         String[] names = {
+            // scheme -> file:
+                "Tool.java",
+                "p/q/CLTest.java",
+                "META-INF/services/java.util.spi.ToolProvider",
+            // scheme -> sourcelauncher-memoryclassloaderNNN:
+                "Tool.class",
                 "p/q/CLTest.class",
                 "p/q/CLTest$Inner.class",
                 "p/q/CLTest2.class",
+            // scheme -> jrt:
                 "java/lang/Object.class",
+            // no scheme applicable
                 "UNKNOWN.class",
                 "UNKNOWN"
         };
@@ -102,6 +121,14 @@ void testGetResources(String name) {
                 list.add(e.nextElement());
             }
 
+            if (name.contains("META-INF")) {
+                if (list.size() == 0) {
+                    error("resource not found: " + name);
+                }
+                // one or more resources found, as expected
+                return;
+            }
+
             switch (list.size()) {
                 case 0:
                     if (!name.contains("UNKNOWN")) {
@@ -150,6 +177,9 @@ void checkClass(String name, URL u) throws Exception {
     }
 
     void checkClass(String name, InputStream in) throws Exception {
+        if (!name.endsWith(".class")) {
+            return; // ignore non-class resources
+        }
         ClassModel cf = ClassFile.of().parse(in.readAllBytes());
         System.err.println("    class " + cf.thisClass().asInternalName());
         if (!name.equals(cf.thisClass().asInternalName() + ".class")) {

From 46a12e781edcbe9da7bd39eb9e101fc680053cef Mon Sep 17 00:00:00 2001
From: Timofei Pushkin <tpushkin@openjdk.org>
Date: Fri, 16 May 2025 13:51:58 +0000
Subject: [PATCH 498/901] 8315130: java.lang.IllegalAccessError when processing
 classlist to create CDS archive

Reviewed-by: iklam, ccheung
---
 src/hotspot/share/cds/classListParser.cpp     |  59 ++++--
 src/hotspot/share/cds/classListParser.hpp     |   3 +-
 src/hotspot/share/cds/unregisteredClasses.cpp |  98 ++++------
 src/hotspot/share/cds/unregisteredClasses.hpp |  18 +-
 .../classfile/systemDictionaryShared.cpp      |  21 +-
 .../classfile/systemDictionaryShared.hpp      |   1 +
 .../share/classes/jdk/internal/misc/CDS.java  | 182 +++++++++---------
 .../customLoader/DifferentSourcesTest.java    |  79 ++++++++
 .../customLoader/RegUnregSuperTest.java       |  88 +++++++++
 .../test-classes/CustomLoadee5.java           |  28 +++
 .../test-classes/CustomLoadee5Child.java      |  28 +++
 .../test-classes/DifferentSourcesApp.java     |  41 ++++
 .../test-classes/RegUnregSuperApp.java        | 108 +++++++++++
 13 files changed, 573 insertions(+), 181 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/DifferentSourcesTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/RegUnregSuperTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5Child.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/DifferentSourcesApp.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/RegUnregSuperApp.java

diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 10154265bec..c97357c2614 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -395,17 +395,13 @@ bool ClassListParser::parse_uint_option(const char* option_name, int* value) {
   return false;
 }
 
-objArrayOop ClassListParser::get_specified_interfaces(TRAPS) {
+GrowableArray<InstanceKlass *> ClassListParser::get_specified_interfaces() {
   const int n = _interfaces->length();
-  if (n == 0) {
-    return nullptr;
-  } else {
-    objArrayOop array = oopFactory::new_objArray(vmClasses::Class_klass(), n, CHECK_NULL);
-    for (int i = 0; i < n; i++) {
-      array->obj_at_put(i, lookup_class_by_id(_interfaces->at(i))->java_mirror());
-    }
-    return array;
+  GrowableArray<InstanceKlass *> specified_interfaces(n);
+  for (int i = 0; i < n; i++) {
+    specified_interfaces.append(lookup_class_by_id(_interfaces->at(i)));
   }
+  return specified_interfaces;
 }
 
 void ClassListParser::print_specified_interfaces() {
@@ -509,6 +505,25 @@ void ClassListParser::constant_pool_resolution_warning(const char* msg, ...) {
   va_end(ap);
 }
 
+// If an unregistered class U is specified to have a registered supertype S1
+// named SN but an unregistered class S2 also named SN has already been loaded
+// S2 will be incorrectly used as the supertype of U instead of S1 due to
+// limitations in the loading mechanism of unregistered classes.
+void ClassListParser::check_supertype_obstruction(int specified_supertype_id, const InstanceKlass* specified_supertype, TRAPS) {
+  if (specified_supertype->is_shared_unregistered_class()) {
+    return; // Only registered supertypes can be obstructed
+  }
+  const InstanceKlass* obstructor = SystemDictionaryShared::get_unregistered_class(specified_supertype->name());
+  if (obstructor == nullptr) {
+    return; // No unregistered types with the same name have been loaded, i.e. no obstruction
+  }
+  // 'specified_supertype' is S1, 'obstructor' is S2 from the explanation above
+  ResourceMark rm;
+  THROW_MSG(vmSymbols::java_lang_UnsupportedOperationException(),
+            err_msg("%s (id %d) has super-type %s (id %d) obstructed by another class with the same name",
+                    _class_name, _id, specified_supertype->external_name(), specified_supertype_id));
+}
+
 // This function is used for loading classes for customized class loaders
 // during archive dumping.
 InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS) {
@@ -533,13 +548,18 @@ InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS
   }
 
   ResourceMark rm;
-  char * source_path = os::strdup_check_oom(ClassLoader::uri_to_path(_source));
   InstanceKlass* specified_super = lookup_class_by_id(_super);
-  Handle super_class(THREAD, specified_super->java_mirror());
-  objArrayOop r = get_specified_interfaces(CHECK_NULL);
-  objArrayHandle interfaces(THREAD, r);
-  InstanceKlass* k = UnregisteredClasses::load_class(class_name, source_path,
-                                                     super_class, interfaces, CHECK_NULL);
+  GrowableArray<InstanceKlass*> specified_interfaces = get_specified_interfaces();
+  // Obstruction must be checked before the class loading attempt because it may
+  // cause class loading errors (JVMS 5.3.5.3-5.3.5.4)
+  check_supertype_obstruction(_super, specified_super, CHECK_NULL);
+  for (int i = 0; i < _interfaces->length(); i++) {
+    check_supertype_obstruction(_interfaces->at(i), specified_interfaces.at(i), CHECK_NULL);
+  }
+
+  const char* source_path = ClassLoader::uri_to_path(_source);
+  InstanceKlass* k = UnregisteredClasses::load_class(class_name, source_path, CHECK_NULL);
+
   if (k->java_super() != specified_super) {
     error("The specified super class %s (id %d) does not match actual super class %s",
           specified_super->external_name(), _super,
@@ -551,6 +571,15 @@ InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS
     error("The number of interfaces (%d) specified in class list does not match the class file (%d)",
           _interfaces->length(), k->local_interfaces()->length());
   }
+  for (int i = 0; i < _interfaces->length(); i++) {
+    InstanceKlass* specified_interface = specified_interfaces.at(i);
+    if (!k->local_interfaces()->contains(specified_interface)) {
+      print_specified_interfaces();
+      print_actual_interfaces(k);
+      error("Specified interface %s (id %d) is not directly implemented",
+            specified_interface->external_name(), _interfaces->at(i));
+      }
+  }
 
   assert(k->is_shared_unregistered_class(), "must be");
 
diff --git a/src/hotspot/share/cds/classListParser.hpp b/src/hotspot/share/cds/classListParser.hpp
index 1b059b4d85a..1762c5c6a30 100644
--- a/src/hotspot/share/cds/classListParser.hpp
+++ b/src/hotspot/share/cds/classListParser.hpp
@@ -137,7 +137,8 @@ class ClassListParser : public StackObj {
   void print_diagnostic_info(outputStream* st, const char* msg, ...) ATTRIBUTE_PRINTF(3, 0);
   void constant_pool_resolution_warning(const char* msg, ...) ATTRIBUTE_PRINTF(2, 0);
   void error(const char* msg, ...) ATTRIBUTE_PRINTF(2, 0);
-  objArrayOop get_specified_interfaces(TRAPS);
+  GrowableArray<InstanceKlass*> get_specified_interfaces();
+  void check_supertype_obstruction(int specified_supertype_id, const InstanceKlass* specified_supertype, TRAPS);
 
 public:
   static void parse_classlist(const char* classlist_path, ParseMode parse_mode, TRAPS);
diff --git a/src/hotspot/share/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp
index 2e985b72310..31cfbd15d67 100644
--- a/src/hotspot/share/cds/unregisteredClasses.cpp
+++ b/src/hotspot/share/cds/unregisteredClasses.cpp
@@ -24,37 +24,49 @@
 
 #include "cds/cdsConfig.hpp"
 #include "cds/unregisteredClasses.hpp"
-#include "classfile/classFileStream.hpp"
-#include "classfile/classLoader.inline.hpp"
-#include "classfile/classLoaderExt.hpp"
-#include "classfile/javaClasses.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "memory/oopFactory.hpp"
-#include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
+#include "oops/oopHandle.hpp"
 #include "oops/oopHandle.inline.hpp"
+#include "runtime/handles.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "services/threadService.hpp"
 
-InstanceKlass* UnregisteredClasses::_UnregisteredClassLoader_klass = nullptr;
+static InstanceKlass* _UnregisteredClassLoader_klass;
+static InstanceKlass* _UnregisteredClassLoader_Source_klass;
+static OopHandle _unregistered_class_loader;
 
 void UnregisteredClasses::initialize(TRAPS) {
-  if (_UnregisteredClassLoader_klass == nullptr) {
-    // no need for synchronization as this function is called single-threaded.
-    Symbol* klass_name = SymbolTable::new_symbol("jdk/internal/misc/CDS$UnregisteredClassLoader");
-    Klass* k = SystemDictionary::resolve_or_fail(klass_name, true, CHECK);
-    _UnregisteredClassLoader_klass = InstanceKlass::cast(k);
+  if (_UnregisteredClassLoader_klass != nullptr) {
+    return;
   }
+
+  Symbol* klass_name;
+  Klass* k;
+
+  // no need for synchronization as this function is called single-threaded.
+  klass_name = SymbolTable::new_symbol("jdk/internal/misc/CDS$UnregisteredClassLoader");
+  k = SystemDictionary::resolve_or_fail(klass_name, true, CHECK);
+  _UnregisteredClassLoader_klass = InstanceKlass::cast(k);
+
+  klass_name = SymbolTable::new_symbol("jdk/internal/misc/CDS$UnregisteredClassLoader$Source");
+  k = SystemDictionary::resolve_or_fail(klass_name, true, CHECK);
+  _UnregisteredClassLoader_Source_klass = InstanceKlass::cast(k);
+
+  precond(_unregistered_class_loader.is_empty());
+  HandleMark hm(THREAD);
+  const Handle cl = JavaCalls::construct_new_instance(_UnregisteredClassLoader_klass,
+                                                      vmSymbols::void_method_signature(), CHECK);
+  _unregistered_class_loader = OopHandle(Universe::vm_global(), cl());
 }
 
 // Load the class of the given name from the location given by path. The path is specified by
 // the "source:" in the class list file (see classListParser.cpp), and can be a directory or
 // a JAR file.
-InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path,
-                                               Handle super_class, objArrayHandle interfaces, TRAPS) {
+InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path, TRAPS) {
   assert(name != nullptr, "invariant");
   assert(CDSConfig::is_dumping_static_archive(), "this function is only used with -Xshare:dump");
 
@@ -62,59 +74,33 @@ InstanceKlass* UnregisteredClasses::load_class(Symbol* name, const char* path,
                              THREAD->get_thread_stat()->perf_timers_addr(),
                              PerfClassTraceTime::CLASS_LOAD);
 
-  // Call CDS$UnregisteredClassLoader::load(String name, Class<?> superClass, Class<?>[] interfaces)
+  assert(!_unregistered_class_loader.is_empty(), "not initialized");
+  Handle classloader(THREAD, _unregistered_class_loader.resolve());
+
+  // Call CDS$UnregisteredClassLoader::load(String name, String source)
   Symbol* methodName = SymbolTable::new_symbol("load");
-  Symbol* methodSignature = SymbolTable::new_symbol("(Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/Class;");
-  Symbol* path_symbol = SymbolTable::new_symbol(path);
-  Handle classloader = get_classloader(path_symbol, CHECK_NULL);
+  Symbol* methodSignature = SymbolTable::new_symbol("(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;");
   Handle ext_class_name = java_lang_String::externalize_classname(name, CHECK_NULL);
+  Handle path_string = java_lang_String::create_from_str(path, CHECK_NULL);
 
   JavaValue result(T_OBJECT);
-  JavaCallArguments args(3);
-  args.set_receiver(classloader);
-  args.push_oop(ext_class_name);
-  args.push_oop(super_class);
-  args.push_oop(interfaces);
   JavaCalls::call_virtual(&result,
-                          UnregisteredClassLoader_klass(),
+                          classloader,
+                          _UnregisteredClassLoader_klass,
                           methodName,
                           methodSignature,
-                          &args,
+                          ext_class_name,
+                          path_string,
                           CHECK_NULL);
   assert(result.get_type() == T_OBJECT, "just checking");
-  oop obj = result.get_oop();
-  return InstanceKlass::cast(java_lang_Class::as_Klass(obj));
-}
-
-class UnregisteredClasses::ClassLoaderTable : public ResourceHashtable<
-  Symbol*, OopHandle,
-  137, // prime number
-  AnyObj::C_HEAP> {};
-
-static UnregisteredClasses::ClassLoaderTable* _classloader_table = nullptr;
 
-Handle UnregisteredClasses::create_classloader(Symbol* path, TRAPS) {
-  ResourceMark rm(THREAD);
-  JavaValue result(T_OBJECT);
-  Handle path_string = java_lang_String::create_from_str(path->as_C_string(), CHECK_NH);
-  Handle classloader = JavaCalls::construct_new_instance(
-                           UnregisteredClassLoader_klass(),
-                           vmSymbols::string_void_signature(),
-                           path_string, CHECK_NH);
-  return classloader;
+  return InstanceKlass::cast(java_lang_Class::as_Klass(result.get_oop()));
 }
 
-Handle UnregisteredClasses::get_classloader(Symbol* path, TRAPS) {
-  if (_classloader_table == nullptr) {
-    _classloader_table = new (mtClass)ClassLoaderTable();
-  }
-  OopHandle* classloader_ptr = _classloader_table->get(path);
-  if (classloader_ptr != nullptr) {
-    return Handle(THREAD, (*classloader_ptr).resolve());
-  } else {
-    Handle classloader = create_classloader(path, CHECK_NH);
-    _classloader_table->put(path, OopHandle(Universe::vm_global(), classloader()));
-    path->increment_refcount();
-    return classloader;
+bool UnregisteredClasses::check_for_exclusion(const InstanceKlass* k) {
+  if (_UnregisteredClassLoader_klass == nullptr) {
+    return false; // Uninitialized
   }
+  return k == _UnregisteredClassLoader_klass ||
+         k->implements_interface(_UnregisteredClassLoader_Source_klass);
 }
diff --git a/src/hotspot/share/cds/unregisteredClasses.hpp b/src/hotspot/share/cds/unregisteredClasses.hpp
index ea3a308c2de..d61c3462504 100644
--- a/src/hotspot/share/cds/unregisteredClasses.hpp
+++ b/src/hotspot/share/cds/unregisteredClasses.hpp
@@ -33,22 +33,10 @@ class Symbol;
 
 class UnregisteredClasses: AllStatic {
 public:
-  static InstanceKlass* load_class(Symbol* h_name, const char* path,
-                                   Handle super_class, objArrayHandle interfaces,
-                                   TRAPS);
+  static InstanceKlass* load_class(Symbol* name, const char* path, TRAPS);
   static void initialize(TRAPS);
-  static InstanceKlass* UnregisteredClassLoader_klass() {
-    return _UnregisteredClassLoader_klass;
-  }
-
-  class ClassLoaderTable;
-
-private:
-  // Don't put this in vmClasses as it's used only with CDS dumping.
-  static InstanceKlass* _UnregisteredClassLoader_klass;
-
-  static Handle create_classloader(Symbol* path, TRAPS);
-  static Handle get_classloader(Symbol* path, TRAPS);
+  // Returns true if the class is loaded internally for dumping unregistered classes.
+  static bool check_for_exclusion(const InstanceKlass* k);
 };
 
 #endif // SHARE_CDS_UNREGISTEREDCLASSES_HPP
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 8fcfc2f54be..cb0fac4c90d 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -323,6 +323,12 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
     }
   }
 
+  if (UnregisteredClasses::check_for_exclusion(k)) {
+    ResourceMark rm;
+    log_info(cds)("Skipping %s: used only when dumping CDS archive", k->name()->as_C_string());
+    return true;
+  }
+
   InstanceKlass* super = k->java_super();
   if (super != nullptr && check_for_exclusion(super, nullptr)) {
     ResourceMark rm;
@@ -341,12 +347,6 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
     }
   }
 
-  if (k == UnregisteredClasses::UnregisteredClassLoader_klass()) {
-    ResourceMark rm;
-    log_info(cds)("Skipping %s: used only when dumping CDS archive", k->name()->as_C_string());
-    return true;
-  }
-
   return false; // false == k should NOT be excluded
 }
 
@@ -465,6 +465,15 @@ bool SystemDictionaryShared::add_unregistered_class(Thread* current, InstanceKla
   return (klass == *v);
 }
 
+InstanceKlass* SystemDictionaryShared::get_unregistered_class(Symbol* name) {
+  assert(CDSConfig::is_dumping_archive() || ClassListWriter::is_enabled(), "sanity");
+  if (_unregistered_classes_table == nullptr) {
+    return nullptr;
+  }
+  InstanceKlass** k = _unregistered_classes_table->get(name);
+  return k != nullptr ? *k : nullptr;
+}
+
 void SystemDictionaryShared::copy_unregistered_class_size_and_crc32(InstanceKlass* klass) {
   precond(CDSConfig::is_dumping_final_static_archive());
   precond(klass->is_shared());
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 2b17cae9c36..4343bd5f0e8 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -249,6 +249,7 @@ class SystemDictionaryShared: public SystemDictionary {
     return (k->shared_classpath_index() != UNREGISTERED_INDEX);
   }
   static bool add_unregistered_class(Thread* current, InstanceKlass* k);
+  static InstanceKlass* get_unregistered_class(Symbol* name);
   static void copy_unregistered_class_size_and_crc32(InstanceKlass* klass);
 
   static void finish_exclusion_checks();
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 94696551645..2d8046a75eb 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CDS.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CDS.java
@@ -31,15 +31,15 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.InvalidPathException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.jar.JarFile;
 import java.util.stream.Stream;
 
 import jdk.internal.access.SharedSecrets;
@@ -399,105 +399,111 @@ public static boolean needsClassInitBarrier(Class<?> c) {
      * be loaded by custom class loaders during runtime.
      * See src/hotspot/share/cds/unregisteredClasses.cpp.
      */
-    private static class UnregisteredClassLoader extends URLClassLoader {
-        private String currentClassName;
-        private Class<?> currentSuperClass;
-        private Class<?>[] currentInterfaces;
+    private static class UnregisteredClassLoader extends ClassLoader {
+        static {
+            registerAsParallelCapable();
+        }
 
-        /**
-         * Used only by native code. Construct an UnregisteredClassLoader for loading
-         * unregistered classes from the specified file. If the file doesn't exist,
-         * the exception will be caughted by native code which will print a warning message and continue.
-         *
-         * @param fileName path of the the JAR file to load unregistered classes from.
-         */
-        private UnregisteredClassLoader(String fileName) throws InvalidPathException, IOException {
-            super(toURLArray(fileName), /*parent*/null);
-            currentClassName = null;
-            currentSuperClass = null;
-            currentInterfaces = null;
+        static interface Source {
+            public byte[] readClassFile(String className) throws IOException;
         }
 
-        private static URL[] toURLArray(String fileName) throws InvalidPathException, IOException {
-            if (!((new File(fileName)).exists())) {
-                throw new IOException("No such file: " + fileName);
+        static class JarSource implements Source {
+            private final JarFile jar;
+
+            JarSource(File file) throws IOException {
+                jar = new JarFile(file);
+            }
+
+            @Override
+            public byte[] readClassFile(String className) throws IOException {
+                final var entryName = className.replace('.', '/').concat(".class");
+                final var entry = jar.getEntry(entryName);
+                if (entry == null) {
+                    throw new IOException("No such entry: " + entryName + " in " + jar.getName());
+                }
+                try (final var in = jar.getInputStream(entry)) {
+                    return in.readAllBytes();
+                }
             }
-            return new URL[] {
-                // Use an intermediate File object to construct a URI/URL without
-                // authority component as URLClassPath can't handle URLs with a UNC
-                // server name in the authority component.
-                Path.of(fileName).toRealPath().toFile().toURI().toURL()
-            };
         }
 
+        static class DirSource implements Source {
+            private final String basePath;
 
-        /**
-         * Load the class of the given <code>/name<code> from the JAR file that was given to
-         * the constructor of the current UnregisteredClassLoader instance. This class must be
-         * a direct subclass of <code>superClass</code>. This class must be declared to implement
-         * the specified <code>interfaces</code>.
-         * <p>
-         * This method must be called in a single threaded context. It will never be recursed (thus
-         * the asserts)
-         *
-         * @param name the name of the class to be loaded.
-         * @param superClass must not be null. The named class must have a super class.
-         * @param interfaces could be null if the named class does not implement any interfaces.
-         */
-        private Class<?> load(String name, Class<?> superClass, Class<?>[] interfaces)
-            throws ClassNotFoundException
-        {
-            assert currentClassName == null;
-            assert currentSuperClass == null;
-            assert currentInterfaces == null;
-
-            try {
-                currentClassName = name;
-                currentSuperClass = superClass;
-                currentInterfaces = interfaces;
-
-                return findClass(name);
-            } finally {
-                currentClassName = null;
-                currentSuperClass = null;
-                currentInterfaces = null;
+            DirSource(File dir) {
+                assert dir.isDirectory();
+                basePath = dir.toString();
+            }
+
+            @Override
+            public byte[] readClassFile(String className) throws IOException {
+                final var subPath = className.replace('.', File.separatorChar).concat(".class");
+                final var fullPath = Path.of(basePath, subPath);
+                return Files.readAllBytes(fullPath);
             }
         }
 
-        /**
-         * This method must be called from inside the <code>load()</code> method. The <code>/name<code>
-         * can be only:
-         * <ul>
-         * <li> the <code>name</code> parameter for <code>load()</code>
-         * <li> the name of the <code>superClass</code> parameter for <code>load()</code>
-         * <li> the name of one of the interfaces in <code>interfaces</code> parameter for <code>load()</code>
-         * <ul>
-         *
-         * For all other cases, a <code>ClassNotFoundException</code> will be thrown.
-         */
-        protected Class<?> findClass(final String name)
-            throws ClassNotFoundException
-        {
-            Objects.requireNonNull(currentClassName);
-            Objects.requireNonNull(currentSuperClass);
-
-            if (name.equals(currentClassName)) {
-                // Note: the following call will call back to <code>this.findClass(name)</code> to
-                // resolve the super types of the named class.
-                return super.findClass(name);
+        private final HashMap<String, Source> sources = new HashMap<>();
+
+        private Source resolveSource(String path) throws IOException {
+            Source source = sources.get(path);
+            if (source != null) {
+                return source;
             }
-            if (name.equals(currentSuperClass.getName())) {
-                return currentSuperClass;
+
+            final var file = new File(path);
+            if (!file.exists()) {
+                throw new IOException("No such file: " + path);
             }
-            if (currentInterfaces != null) {
-                for (Class<?> c : currentInterfaces) {
-                    if (name.equals(c.getName())) {
-                        return c;
-                    }
-                }
+            if (file.isFile()) {
+                source = new JarSource(file);
+            } else if (file.isDirectory()) {
+                source = new DirSource(file);
+            } else {
+                throw new IOException("Not a normal file: " + path);
             }
+            sources.put(path, source);
 
-            throw new ClassNotFoundException(name);
+            return source;
+        }
+
+        /**
+         * Load the class of the given <code>name</code> from the given <code>source</code>.
+         * <p>
+         * All super classes and interfaces of the named class must have already been loaded:
+         * either defined by this class loader (unregistered ones) or loaded, possibly indirectly,
+         * by the system class loader (registered ones).
+         * <p>
+         * If the named class has a registered super class or interface named N there should be no
+         * unregistered class or interface named N loaded yet.
+         *
+         * @param name the name of the class to be loaded.
+         * @param source path to a directory or a JAR file from which the named class should be
+         *               loaded.
+         */
+        private Class<?> load(String name, String source) throws IOException {
+            final Source resolvedSource = resolveSource(source);
+            final byte[] bytes = resolvedSource.readClassFile(name);
+            // 'defineClass()' may cause loading of supertypes of this unregistered class by VM
+            // calling 'this.loadClass()'.
+            //
+            // For any supertype S named SN specified in the classlist the following is ensured by
+            // the CDS implementation:
+            // - if S is an unregistered class it must have already been defined by this class
+            //   loader and thus will be found by 'this.findLoadedClass(SN)',
+            // - if S is not an unregistered class there should be no unregistered class named SN
+            //   loaded yet so either S has previously been (indirectly) loaded by this class loader
+            //   and thus it will be found when calling 'this.findLoadedClass(SN)' or it will be
+            //   found when delegating to the system class loader, which must have already loaded S,
+            //   by calling 'this.getParent().loadClass(SN, false)'.
+            // See the implementation of 'ClassLoader.loadClass()' for details.
+            //
+            // Therefore, we should resolve all supertypes to the expected ones as specified by the
+            // "super:" and "interfaces:" attributes in the classlist. This invariant is validated
+            // by the C++ function 'ClassListParser::load_class_from_source()'.
+            assert getParent() == getSystemClassLoader();
+            return defineClass(name, bytes, 0, bytes.length);
         }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/DifferentSourcesTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/DifferentSourcesTest.java
new file mode 100644
index 00000000000..b372c3b7289
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/DifferentSourcesTest.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.
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+/**
+ * @test
+ * @bug 8315130
+ * @summary Tests archiving a hierarchy of package-private classes loaded from
+ * different sources.
+ *
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/DifferentSourcesApp.java test-classes/CustomLoadee5.java test-classes/CustomLoadee5Child.java
+ * @run main DifferentSourcesTest
+ */
+public class DifferentSourcesTest {
+    public static void main(String[] args) throws Exception {
+        // Setup:
+        // - CustomLoadee5 is package-private
+        // - CustomLoadee5Child extends CustomLoadee5
+        //
+        // This setup requires CustomLoadee5 and CustomLoadee5Child to be in the
+        // same run-time package. Since their package name is the same (empty)
+        // this boils down to "be loaded by the same class loader".
+        //
+        // DifferentSourcesApp adheres to this requirement.
+        //
+        // This test checks that CDS adheres to this requirement too when
+        // creating a static app archive, even if CustomLoadee5 and
+        // CustomLoadee5Child are in different sources.
+
+        OutputAnalyzer output;
+
+        // The main check: the archive is created without IllegalAccessError
+        JarBuilder.build("base", "CustomLoadee5");
+        JarBuilder.build("sub", "CustomLoadee5Child");
+        final String classlist[] = new String[] {
+            "java/lang/Object id: 0",
+            "CustomLoadee5 id: 1 super: 0 source: base.jar",
+            "CustomLoadee5Child id: 2 super: 1 source: sub.jar",
+        };
+        output = TestCommon.testDump(null, classlist);
+        output.shouldNotContain("java.lang.IllegalAccessError: class CustomLoadee5Child cannot access its superclass CustomLoadee5");
+        output.shouldNotContain("Cannot find CustomLoadee5Child");
+
+        // Sanity check: the archive is used as expected
+        output = TestCommon.execCommon("-Xlog:class+load", "DifferentSourcesApp");
+        TestCommon.checkExec(
+            output,
+            "CustomLoadee5 source: shared objects file",
+            "CustomLoadee5Child source: shared objects file"
+        );
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/RegUnregSuperTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/RegUnregSuperTest.java
new file mode 100644
index 00000000000..85f1657098e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/RegUnregSuperTest.java
@@ -0,0 +1,88 @@
+/*
+ * 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.process.OutputAnalyzer;
+
+/**
+ * @test id=unreg
+ * @summary Tests that if a super class is listed as unregistered it is archived
+ * as such even if a class with the same name has also been loaded from the
+ * classpath.
+ *
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/RegUnregSuperApp.java test-classes/CustomLoadee3.java test-classes/CustomLoadee3Child.java
+ * @run main RegUnregSuperTest unreg
+ */
+
+/**
+ * @test id=reg
+ * @summary If an unregistered class U is specified to have a registered
+ * supertype S1 named SN but an unregistered class S2 also named SN has already
+ * been loaded S2 will be incorrectly used as the supertype of U instead of S1
+ * due to limitations in the loading mechanism of unregistered classes. For this
+ * reason U should not be loaded at all and an appropriate warning should be
+ * printed.
+ *
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/RegUnregSuperApp.java test-classes/CustomLoadee3.java test-classes/CustomLoadee3Child.java
+ * @run main RegUnregSuperTest reg
+ */
+
+public class RegUnregSuperTest {
+    public static void main(String[] args) throws Exception {
+        final String variant = args[0];
+
+        final String appJar = JarBuilder.build(
+            "app", "RegUnregSuperApp", "DirectClassLoader", "CustomLoadee3", "CustomLoadee3Child"
+        );
+        OutputAnalyzer out;
+
+        final String classlist[] = new String[] {
+            "java/lang/Object id: 0",
+            "CustomLoadee3 id: 1",
+            "CustomLoadee3 id: 2 super: 0 source: " + appJar,
+            "CustomLoadee3Child id: 3 super: " + ("reg".equals(variant) ? "1" : "2") + " source: " + appJar
+        };
+        out = TestCommon.testDump(appJar, classlist, "-Xlog:cds+class=debug");
+        out.shouldContain("app   CustomLoadee3"); // Not using \n as below because it'll be "app   CustomLoadee3 aot-linked" with AOTClassLinking
+        out.shouldNotContain("app   CustomLoadee3Child");
+        out.shouldContain("unreg CustomLoadee3\n"); // Accepts "unreg CustomLoadee3" but not "unreg CustomLoadee3Child"
+        if ("reg".equals(variant)) {
+            out.shouldNotContain("unreg CustomLoadee3Child");
+            out.shouldContain("CustomLoadee3Child (id 3) has super-type CustomLoadee3 (id 1) obstructed by another class with the same name");
+        } else {
+            out.shouldContain("unreg CustomLoadee3Child");
+            out.shouldNotContain("[warning]");
+        }
+
+        out = TestCommon.exec(appJar, "-Xlog:class+load", "RegUnregSuperApp", variant);
+        TestCommon.checkExec(
+            out,
+            "CustomLoadee3Child source: " + ("reg".equals(variant) ? "file:" : "shared objects file")
+        );
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5.java
new file mode 100644
index 00000000000..f3cda51c9fa
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+class CustomLoadee5 {
+    public String toString() {
+        return "this is CustomLoadee5";
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5Child.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5Child.java
new file mode 100644
index 00000000000..82684ce327d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/CustomLoadee5Child.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+class CustomLoadee5Child extends CustomLoadee5 {
+    public String toString() {
+        return "this is CustomLoadee5Child";
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/DifferentSourcesApp.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/DifferentSourcesApp.java
new file mode 100644
index 00000000000..21efd565ce4
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/DifferentSourcesApp.java
@@ -0,0 +1,41 @@
+/*
+ * 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.nio.file.Path;
+import java.nio.file.FileSystems;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * See ../DifferentSourcesTest.java for details.
+ */
+public class DifferentSourcesApp {
+    public static void main(String args[]) throws Exception {
+        Path base = FileSystems.getDefault().getPath("base.jar");
+        Path sub = FileSystems.getDefault().getPath("sub.jar");
+        URL[] urls = new URL[] { base.toUri().toURL(), sub.toUri().toURL() };
+        URLClassLoader cl = new URLClassLoader(urls, /* parent = */ null);
+        Class<?> cls = cl.loadClass("CustomLoadee5Child");
+        System.out.println(cls.getName());
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/RegUnregSuperApp.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/RegUnregSuperApp.java
new file mode 100644
index 00000000000..01581d52db2
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/test-classes/RegUnregSuperApp.java
@@ -0,0 +1,108 @@
+/*
+ * 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.nio.file.FileSystems;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Set;
+
+class DirectClassLoader extends URLClassLoader {
+    private final Set<String> directlyLoadedNames;
+
+    public DirectClassLoader(URL url, String... directlyLoadedNames) {
+        super(new URL[] { url });
+        this.directlyLoadedNames = Set.of(directlyLoadedNames);
+    }
+
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> c = findLoadedClass(name);
+            if (c == null) {
+                if (directlyLoadedNames.contains(name)) {
+                    c = findClass(name);
+                } else {
+                    c = super.loadClass(name);
+                }
+            }
+            return c;
+        }
+    }
+}
+
+/**
+ * See ../RegUnregSuperTest.java for details.
+ */
+public class RegUnregSuperApp {
+    private static final URL APP_JAR;
+    static {
+        final URL appJar;
+        try {
+            appJar = FileSystems.getDefault().getPath("app.jar").toUri().toURL();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        APP_JAR = appJar;
+    }
+
+    public static void main(String args[]) throws Exception {
+        switch (args[0]) {
+            case "reg" -> loadWithRegisteredSuper();
+            case "unreg" -> loadWithUnregisteredSuper();
+            default -> throw new IllegalArgumentException("Unknown variant: " + args[0]);
+        }
+    }
+
+    private static void loadWithRegisteredSuper() throws Exception {
+        // Load unregistered super
+        final var unregisteredBaseCl = new DirectClassLoader(APP_JAR, "CustomLoadee3");
+        Class<?> unregisteredBase = unregisteredBaseCl.loadClass("CustomLoadee3");
+        checkClassLoader(unregisteredBase, unregisteredBaseCl);
+
+        // Load unregistered child with REGISTERED super
+        final var registeredBaseCl = new DirectClassLoader(APP_JAR, "CustomLoadee3Child");
+        Class<?> unregisteredChild = registeredBaseCl.loadClass("CustomLoadee3Child");
+        checkClassLoader(unregisteredChild, registeredBaseCl);
+        checkClassLoader(unregisteredChild.getSuperclass(), ClassLoader.getSystemClassLoader());
+    }
+
+    private static void loadWithUnregisteredSuper() throws Exception {
+        // Load registered super
+        final var systemCl = ClassLoader.getSystemClassLoader();
+        Class<?> registeredBase = systemCl.loadClass("CustomLoadee3");
+        checkClassLoader(registeredBase, systemCl);
+
+        // Load unregistered child with UNREGISTERED super
+        final var unregisteredBaseCl = new DirectClassLoader(APP_JAR, "CustomLoadee3", "CustomLoadee3Child");
+        Class<?> unregisteredChild = unregisteredBaseCl.loadClass("CustomLoadee3Child");
+        checkClassLoader(unregisteredChild, unregisteredBaseCl);
+        checkClassLoader(unregisteredChild.getSuperclass(), unregisteredBaseCl);
+    }
+
+    private static void checkClassLoader(Class<?> c, ClassLoader cl) {
+        ClassLoader realCl = c.getClassLoader();
+        if (realCl != cl) {
+           throw new RuntimeException(c + " has wrong loader: expected " + cl + ", got " + realCl);
+        }
+    }
+}

From 413843cf8eb82b4778e976562e0e11a0ff5e3083 Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Fri, 16 May 2025 16:20:37 +0000
Subject: [PATCH 499/901] 8356649: Update JCStress test suite

Reviewed-by: lmesnik
---
 test/hotspot/jtreg/applications/jcstress/JcstressRunner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java b/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
index 992cf6956c5..a0c9488dfe3 100644
--- a/test/hotspot/jtreg/applications/jcstress/JcstressRunner.java
+++ b/test/hotspot/jtreg/applications/jcstress/JcstressRunner.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
@@ -45,7 +45,7 @@
         revision = JcstressRunner.VERSION, extension = "jar", unpack = false)
 public class JcstressRunner {
 
-    public static final String VERSION = "0.17-SNAPSHOT-20240328";
+    public static final String VERSION = "0.17-SNAPSHOT-20241217";
     public static final String MAIN_CLASS = "org.openjdk.jcstress.Main";
 
     public static final String TIME_BUDGET_PROPERTY = "jcstress.time_budget";

From d5245092249ed400f98711393e25e0ae97990daf Mon Sep 17 00:00:00 2001
From: Evgeny Nikitin <enikitin@openjdk.org>
Date: Fri, 16 May 2025 16:20:52 +0000
Subject: [PATCH 500/901] 8356702: CTW: Update modules

Reviewed-by: lmesnik
---
 .../applications/ctw/modules/generate.bash    | 58 ++++++++++++++++---
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/applications/ctw/modules/generate.bash b/test/hotspot/jtreg/applications/ctw/modules/generate.bash
index 935503484b9..a3d60f7ecfa 100644
--- a/test/hotspot/jtreg/applications/ctw/modules/generate.bash
+++ b/test/hotspot/jtreg/applications/ctw/modules/generate.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  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,13 +24,19 @@
 
 # generates CTW tests for modules passed as argument
 
-for module in $@
-do
-    file=${module//./_}.java
-    echo creating $file for $module...
-    cat > $file <<EOF
+# generates a wrapper file
+# arguments:
+#   $1 - file number. Like '_2' (can be empty)
+#   $2 - classes range in perecents. Like ' 0% 50%' (can be empty)
+generate_file() {
+    local full_name=${file}${1}.java
+    echo creating $full_name for $module...
+
+    [[ -z $2 ]] && scope_str="all" || scope_str="some"
+
+    cat > ${full_name} <<EOF
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, ${YEAR}, Oracle and/or its affiliates. All rights reserved.
  * 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 +60,7 @@ do
 
 /*
  * @test
- * @summary run CTW for all classes from $module module
+ * @summary run CTW for ${scope_str} classes from $module module
  *
  * @library /test/lib / /testlibrary/ctw/src
  * @modules java.base/jdk.internal.access
@@ -65,8 +71,42 @@ do
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:$module
+ * @run driver/timeout=7200 sun.hotspot.tools.ctw.CtwRunner modules:${module}${2}
  */
 EOF
+}
+
+if [ "$#" -eq 0 ]; then
+    echo "No arguments given, scanning open/src for modules"
+    MODULES=$(find ../../../../../../src -name module-info.java | \
+        grep share/classes/module-info.java |                         `# only standard modules are taken` \
+        sed 's/.*src\///' | sed 's/\/.*//')                            # cleaning the module name of leading and trailing paths
+else
+    echo "Using provided arguments as module(s) list"
+    MODULES=$@
+fi
+
+YEAR=$(date +%Y)
+
+for module in $MODULES
+do
+    file=${module//./_}
+
+    case $module in
+        # Those are too large, we split them into 2 wrappers
+        "java.base")      generate_file "" " 0% 50%"; generate_file "_2" " 50% 100%" ;;
+        "java.desktop")   generate_file "" " 0% 50%"; generate_file "_2" " 50% 100%" ;;
+        "jdk.localedata") generate_file "" " 0% 50%"; generate_file "_2" " 50% 100%" ;;
+
+        # Those have no classes (needs to be checked on re-generations)!
+        "jdk.jdwp.agent") ;;
+        "jdk.graal.compiler") ;;
+        "jdk.graal.compiler.management") ;;
+        "jdk.crypto.ec") ;;
+        "java.se") ;;
+
+        # a more-or-less "standard" module
+        *) generate_file "" ""
 
+    esac
 done

From 63ef90be971267a1d3ceb6b7a03b570c34ac4d06 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Fri, 16 May 2025 17:21:16 +0000
Subject: [PATCH 501/901] 8357084: Zero build fails after JDK-8354887

Reviewed-by: ccheung, kvn
---
 src/hotspot/share/code/aotCodeCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index ebd42819375..107ee3c171d 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -1242,7 +1242,7 @@ void AOTCodeAddressTable::init_extrs() {
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method);
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_abstract);
   SET_ADDRESS(_extrs, SharedRuntime::handle_wrong_method_ic_miss);
-#if defined(AARCH64)
+#if defined(AARCH64) && !defined(ZERO)
   SET_ADDRESS(_extrs, JavaThread::aarch64_get_thread_helper);
 #endif
   {

From 3dd34517000e4ce1a21619922c62c025f98aad44 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 16 May 2025 18:02:42 +0000
Subject: [PATCH 502/901] 8357075: Remove leftover COMPAT locale data tests

Reviewed-by: joehw, iris, jlu
---
 test/jdk/sun/text/resources/LocaleData        | 8476 -----------------
 .../sun/text/resources/LocaleDataTest.java    |   32 +-
 2 files changed, 12 insertions(+), 8496 deletions(-)
 delete mode 100644 test/jdk/sun/text/resources/LocaleData

diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData
deleted file mode 100644
index 441d9ee85ac..00000000000
--- a/test/jdk/sun/text/resources/LocaleData
+++ /dev/null
@@ -1,8476 +0,0 @@
-#
-#
-#
-# List of locale data for locale-data test
-#
-
-# bug #4052473
-LocaleNames/en/es=Spanish
-LocaleNames//es=Spanish
-
-# bug #4052679
-LocaleNames/fr/fr=fran\u00e7ais
-
-# bug #4055602, 4290801, 8013836
-CurrencyNames/pt_BR/BRL=R$
-FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840
-FormatData/pt_BR/NumberPatterns/2=#,##0%
-FormatData/pt_BR/TimePatterns/0=HH'h'mm'min'ss's' z
-FormatData/pt_BR/TimePatterns/1=H'h'm'min's's' z
-FormatData/pt_BR/TimePatterns/2=HH:mm:ss
-FormatData/pt_BR/TimePatterns/3=HH:mm
-FormatData/pt_BR/DatePatterns/0=EEEE, d' de 'MMMM' de 'yyyy
-FormatData/pt_BR/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/pt_BR/DatePatterns/2=dd/MM/yyyy
-FormatData/pt_BR/DatePatterns/3=dd/MM/yy
-FormatData/pt_BR/DateTimePatterns/0={1} {0}
-FormatData/pt_BR/NumberElements/0=,
-FormatData/pt_BR/NumberElements/1=.
-FormatData/pt_BR/NumberElements/2=;
-FormatData/pt_BR/DayAbbreviations/0=Dom
-FormatData/pt_BR/DayAbbreviations/1=Seg
-FormatData/pt_BR/DayAbbreviations/2=Ter
-FormatData/pt_BR/DayNames/0=Domingo
-FormatData/pt_BR/DayNames/1=Segunda-feira
-FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira
-CalendarData/pt_BR/firstDayOfWeek=1
-CalendarData/pt_BR/minimalDaysInFirstWeek=1
-FormatData/pt_BR/MonthNames/0=Janeiro
-FormatData/pt_BR/MonthNames/1=Fevereiro
-FormatData/pt_BR/MonthNames/2=Mar\u00e7o
-LocaleNames/pt_BR/pt=portugu\u00eas
-LocaleNames/pt_BR/PT=Portugal
-LocaleNames/pt_BR/BR=Brasil
-
-# bug 6414459: Wrong first day of week for Croatian locale
-CalendarData/hr/firstDayOfWeek=2
-
-# bug #4066550
-FormatData/ja/Eras/0=\u7d00\u5143\u524d
-FormatData/ja/Eras/1=\u897f\u66a6
-
-# bug #4067619
-LocaleNames//LT=Lithuania
-LocaleNames/en/LT=Lithuania
-
-# bug #4068012, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
-FormatData/ru_RU/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
-FormatData/ru_RU/NumberPatterns/2=#,##0%
-
-# bug #4070174
-FormatData/en_CA/NumberElements/1=,
-FormatData/en_CA/NumberElements/2=;
-
-# bug #4070452
-FormatData/de_DE/DatePatterns/3=dd.MM.yy
-
-# bugs #4070178, 4070450, 4070695, 4070725, 6386647
-FormatData/en_GB/TimePatterns/0=HH:mm:ss 'o''clock' z
-FormatData/en_GB/TimePatterns/1=HH:mm:ss z
-FormatData/en_GB/TimePatterns/2=HH:mm:ss
-FormatData/en_GB/TimePatterns/3=HH:mm
-FormatData/en_GB/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/en_GB/DatePatterns/1=dd MMMM yyyy
-FormatData/en_GB/DatePatterns/2=dd-MMM-yyyy
-FormatData/en_GB/DatePatterns/3=dd/MM/yy
-FormatData/en_GB/DateTimePatterns/0={1} {0}
-
-# bug #4070795
-FormatData/fr_FR/DatePatterns/0=EEEE d MMMM yyyy
-
-# bug #4071003
-# FormatData/fr_CA/DatePatterns/0=d MMMM, yyyy # See bug 4103861
-# FormatData/fr_CA/DatePatterns/1=d MMMM, yyyy # See bug 4103861
-
-# bug #4071183
-# FormatData/it_IT/NumberPatterns/1='L.' #,##0;-'L.' #,##0 # Changed; see bug 4122840
-
-# bug #4071782
-FormatData/ru/DayAbbreviations/0=\u0412\u0441
-FormatData/ru/DayAbbreviations/1=\u041f\u043d
-FormatData/ru/DayAbbreviations/2=\u0412\u0442
-FormatData/ru/DayAbbreviations/3=\u0421\u0440
-FormatData/ru/DayAbbreviations/4=\u0427\u0442
-FormatData/ru/DayAbbreviations/5=\u041f\u0442
-FormatData/ru/DayAbbreviations/6=\u0421\u0431
-
-# bug #4072013 - obsoleted by 6386647: Full date format in DateFormat does not include day of the week for UK locale
-#FormatData/en_GB/DatePatterns/0=dd MMMM yyyy
-
-# bug #4072388
-LocaleNames/cs/cs=\u010de\u0161tina
-
-# bug #4072773
-FormatData/ja/DatePatterns/2=yyyy/MM/dd
-FormatData/ja/DatePatterns/3=yy/MM/dd
-
-# bug #4075404, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
-FormatData/ru_RU/TimePatterns/0=H:mm:ss z
-FormatData/ru_RU/TimePatterns/1=H:mm:ss z
-FormatData/ru_RU/TimePatterns/2=H:mm:ss
-FormatData/ru_RU/TimePatterns/3=H:mm
-FormatData/ru_RU/DatePatterns/0=d MMMM yyyy '\u0433.'
-FormatData/ru_RU/DatePatterns/1=d MMMM yyyy '\u0433.'
-FormatData/ru_RU/DatePatterns/2=dd.MM.yyyy
-FormatData/ru_RU/DatePatterns/3=dd.MM.yy
-FormatData/ru_RU/DateTimePatterns/0={1} {0}
-
-# bug #4084356, 4290801
-CurrencyNames/pl_PL/PLN=z\u0142
-FormatData/pl_PL/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/pl_PL/NumberPatterns/1=#,##0.## z\u0142;-#,##0.## z\u0142 # Changed; see bug 4122840
-FormatData/pl_PL/NumberPatterns/2=#,##0%
-FormatData/pl_PL/DayNames/0=niedziela
-FormatData/pl_PL/DayNames/1=poniedzia\u0142ek
-FormatData/pl_PL/DayNames/2=wtorek
-FormatData/pl_PL/DayNames/3=\u015broda
-FormatData/pl_PL/DayNames/4=czwartek
-FormatData/pl_PL/DayNames/5=pi\u0105tek
-FormatData/pl_PL/DayNames/6=sobota
-FormatData/pl_PL/standalone.MonthNames/0=stycze\u0144
-FormatData/pl_PL/standalone.MonthNames/1=luty
-FormatData/pl_PL/standalone.MonthNames/2=marzec
-FormatData/pl_PL/standalone.MonthNames/3=kwiecie\u0144
-FormatData/pl_PL/standalone.MonthNames/4=maj
-FormatData/pl_PL/standalone.MonthNames/5=czerwiec
-FormatData/pl_PL/standalone.MonthNames/6=lipiec
-FormatData/pl_PL/standalone.MonthNames/7=sierpie\u0144
-FormatData/pl_PL/standalone.MonthNames/8=wrzesie\u0144
-FormatData/pl_PL/standalone.MonthNames/9=pa\u017adziernik
-FormatData/pl_PL/standalone.MonthNames/10=listopad
-FormatData/pl_PL/standalone.MonthNames/11=grudzie\u0144
-FormatData/pl_PL/standalone.MonthNames/12=
-LocaleNames/pl_PL/pl=polski
-FormatData/pl_PL/TimePatterns/0=HH:mm:ss z
-FormatData/pl_PL/TimePatterns/1=HH:mm:ss z
-FormatData/pl_PL/TimePatterns/2=HH:mm:ss
-FormatData/pl_PL/TimePatterns/3=HH:mm
-FormatData/pl_PL/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/pl_PL/DatePatterns/1=d MMMM yyyy
-FormatData/pl_PL/DatePatterns/2=yyyy-MM-dd
-# changed for bug 4984277
-FormatData/pl_PL/DatePatterns/3=dd.MM.yy
-FormatData/pl_PL/DateTimePatterns/0={1} {0}
-FormatData/pl_PL/NumberElements/0=,
-FormatData/pl_PL/NumberElements/1=\u00a0
-FormatData/pl_PL/NumberElements/2=;
-FormatData/pl_PL/NumberElements/3=%
-FormatData/pl_PL/NumberElements/4=0
-FormatData/pl_PL/NumberElements/5=#
-FormatData/pl_PL/NumberElements/6=-
-FormatData/pl_PL/NumberElements/7=E
-FormatData/pl_PL/NumberElements/8=\u2030
-FormatData/pl_PL/NumberElements/9=\u221e
-FormatData/pl_PL/NumberElements/10=\ufffd
-FormatData/pl_PL/Eras/0=p.n.e.
-FormatData/pl_PL/Eras/1=n.e.
-LocaleNames/pl_PL/PL=Polska
-FormatData/pl_PL/DayAbbreviations/0=N
-FormatData/pl_PL/DayAbbreviations/1=Pn
-FormatData/pl_PL/DayAbbreviations/2=Wt
-FormatData/pl_PL/DayAbbreviations/3=\u015ar
-FormatData/pl_PL/DayAbbreviations/4=Cz
-FormatData/pl_PL/DayAbbreviations/5=Pt
-FormatData/pl_PL/DayAbbreviations/6=So
-FormatData/pl_PL/MonthAbbreviations/0=sty
-FormatData/pl_PL/MonthAbbreviations/1=lut
-FormatData/pl_PL/MonthAbbreviations/2=mar
-FormatData/pl_PL/MonthAbbreviations/3=kwi
-FormatData/pl_PL/MonthAbbreviations/4=maj
-FormatData/pl_PL/MonthAbbreviations/5=cze
-FormatData/pl_PL/MonthAbbreviations/6=lip
-FormatData/pl_PL/MonthAbbreviations/7=sie
-FormatData/pl_PL/MonthAbbreviations/8=wrz
-FormatData/pl_PL/MonthAbbreviations/9=pa\u017a
-FormatData/pl_PL/MonthAbbreviations/10=lis
-FormatData/pl_PL/MonthAbbreviations/11=gru
-FormatData/pl_PL/MonthAbbreviations/12=
-CalendarData/pl_PL/firstDayOfWeek=2
-CalendarData/pl_PL/minimalDaysInFirstWeek=4
-FormatData/pl_PL/AmPmMarkers/0=AM
-FormatData/pl_PL/AmPmMarkers/1=PM
-
-# bug #4087238, 4290801
-# bug 4156708 - changed currency symbol from 00a5 to ffe5
-CurrencyNames/ja_JP/JPY=\uffe5
-# FormatData/ja_JP/NumberPatterns/1=\u00a5#,##0.00 # Changed; see bug 4122840
-
-# bug #4092361
-FormatData/en_US/TimePatterns/0=h:mm:ss a z
-FormatData/en_US/TimePatterns/1=h:mm:ss a z
-FormatData/en_US/TimePatterns/2=h:mm:ss a
-FormatData/en_US/TimePatterns/3=h:mm a
-FormatData/en_US/DatePatterns/0=EEEE, MMMM d, yyyy
-FormatData/en_US/DatePatterns/1=MMMM d, yyyy
-FormatData/en_US/DatePatterns/2=MMM d, yyyy
-FormatData/en_US/DatePatterns/3=M/d/yy
-FormatData/en_US/DateTimePatterns/0={1} {0}
-
-# bug #4094033, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
-FormatData/ru_RU/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
-FormatData/ru_RU/NumberPatterns/2=#,##0%
-FormatData/ru_RU/MonthNames/0=\u044f\u043d\u0432\u0430\u0440\u044f
-FormatData/ru_RU/MonthNames/1=\u0444\u0435\u0432\u0440\u0430\u043b\u044f
-FormatData/ru_RU/MonthNames/2=\u043c\u0430\u0440\u0442\u0430
-FormatData/ru_RU/MonthNames/3=\u0430\u043f\u0440\u0435\u043b\u044f
-FormatData/ru_RU/MonthNames/4=\u043c\u0430\u044f
-FormatData/ru_RU/MonthNames/5=\u0438\u044e\u043d\u044f
-FormatData/ru_RU/MonthNames/6=\u0438\u044e\u043b\u044f
-FormatData/ru_RU/MonthNames/7=\u0430\u0432\u0433\u0443\u0441\u0442\u0430
-FormatData/ru_RU/MonthNames/8=\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/9=\u043e\u043a\u0442\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/10=\u043d\u043e\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/11=\u0434\u0435\u043a\u0430\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/12=
-FormatData/ru_RU/standalone.MonthNames/0=\u042f\u043d\u0432\u0430\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/1=\u0424\u0435\u0432\u0440\u0430\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/2=\u041c\u0430\u0440\u0442
-FormatData/ru_RU/standalone.MonthNames/3=\u0410\u043f\u0440\u0435\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/4=\u041c\u0430\u0439
-FormatData/ru_RU/standalone.MonthNames/5=\u0418\u044e\u043d\u044c
-FormatData/ru_RU/standalone.MonthNames/6=\u0418\u044e\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/7=\u0410\u0432\u0433\u0443\u0441\u0442
-FormatData/ru_RU/standalone.MonthNames/8=\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/9=\u041e\u043a\u0442\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/10=\u041d\u043e\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/11=\u0414\u0435\u043a\u0430\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/12=
-FormatData/ru_RU/Eras/0=\u0434\u043e \u043d.\u044d.
-FormatData/ru_RU/Eras/1=\u043d.\u044d.
-LocaleNames/ru_RU/ru=\u0440\u0443\u0441\u0441\u043a\u0438\u0439
-FormatData/ru_RU/MonthAbbreviations/0=\u044f\u043d\u0432
-FormatData/ru_RU/MonthAbbreviations/1=\u0444\u0435\u0432
-FormatData/ru_RU/MonthAbbreviations/2=\u043c\u0430\u0440
-FormatData/ru_RU/MonthAbbreviations/3=\u0430\u043f\u0440
-FormatData/ru_RU/MonthAbbreviations/4=\u043c\u0430\u044f
-FormatData/ru_RU/MonthAbbreviations/5=\u0438\u044e\u043d
-FormatData/ru_RU/MonthAbbreviations/6=\u0438\u044e\u043b
-FormatData/ru_RU/MonthAbbreviations/7=\u0430\u0432\u0433
-FormatData/ru_RU/MonthAbbreviations/8=\u0441\u0435\u043d
-FormatData/ru_RU/MonthAbbreviations/9=\u043e\u043a\u0442
-FormatData/ru_RU/MonthAbbreviations/10=\u043d\u043e\u044f
-FormatData/ru_RU/MonthAbbreviations/11=\u0434\u0435\u043a
-FormatData/ru_RU/MonthAbbreviations/12=
-# FormatData/ru_RU/standalone.MonthAbbreviations/0=\u044f\u043d\u0432
-# FormatData/ru_RU/standalone.MonthAbbreviations/1=\u0444\u0435\u0432
-# FormatData/ru_RU/standalone.MonthAbbreviations/2=\u043c\u0430\u0440
-# FormatData/ru_RU/standalone.MonthAbbreviations/3=\u0430\u043f\u0440
-# FormatData/ru_RU/standalone.MonthAbbreviations/4=\u043c\u0430\u0439
-# FormatData/ru_RU/standalone.MonthAbbreviations/5=\u0438\u044e\u043d
-# FormatData/ru_RU/standalone.MonthAbbreviations/6=\u0438\u044e\u043b
-# FormatData/ru_RU/standalone.MonthAbbreviations/7=\u0430\u0432\u0433
-# FormatData/ru_RU/standalone.MonthAbbreviations/8=\u0441\u0435\u043d
-# FormatData/ru_RU/standalone.MonthAbbreviations/9=\u043e\u043a\u0442
-# FormatData/ru_RU/standalone.MonthAbbreviations/10=\u043d\u043e\u044f
-# FormatData/ru_RU/standalone.MonthAbbreviations/11=\u0434\u0435\u043a
-# FormatData/ru_RU/standalone.MonthAbbreviations/12=
-FormatData/ru_RU/standalone.MonthAbbreviations/0=\u042f\u043d\u0432.
-FormatData/ru_RU/standalone.MonthAbbreviations/1=\u0424\u0435\u0432\u0440.
-FormatData/ru_RU/standalone.MonthAbbreviations/2=\u041c\u0430\u0440\u0442
-FormatData/ru_RU/standalone.MonthAbbreviations/3=\u0410\u043f\u0440.
-FormatData/ru_RU/standalone.MonthAbbreviations/4=\u041c\u0430\u0439
-FormatData/ru_RU/standalone.MonthAbbreviations/5=\u0418\u044e\u043d\u044c
-FormatData/ru_RU/standalone.MonthAbbreviations/6=\u0418\u044e\u043b\u044c
-FormatData/ru_RU/standalone.MonthAbbreviations/7=\u0410\u0432\u0433.
-FormatData/ru_RU/standalone.MonthAbbreviations/8=\u0421\u0435\u043d\u0442.
-FormatData/ru_RU/standalone.MonthAbbreviations/9=\u041e\u043a\u0442.
-FormatData/ru_RU/standalone.MonthAbbreviations/10=\u041d\u043e\u044f\u0431.
-FormatData/ru_RU/standalone.MonthAbbreviations/11=\u0414\u0435\u043a.
-FormatData/ru_RU/standalone.MonthAbbreviations/12=
-FormatData/ru_RU/TimePatterns/0=H:mm:ss z
-FormatData/ru_RU/TimePatterns/1=H:mm:ss z
-FormatData/ru_RU/TimePatterns/2=H:mm:ss
-FormatData/ru_RU/TimePatterns/3=H:mm
-FormatData/ru_RU/DatePatterns/0=d MMMM yyyy '\u0433.'
-FormatData/ru_RU/DatePatterns/1=d MMMM yyyy '\u0433.'
-FormatData/ru_RU/DatePatterns/2=dd.MM.yyyy
-FormatData/ru_RU/DatePatterns/3=dd.MM.yy
-FormatData/ru_RU/DateTimePatterns/0={1} {0}
-FormatData/ru_RU/DayNames/0=\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435
-FormatData/ru_RU/DayNames/1=\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a
-FormatData/ru_RU/DayNames/2=\u0432\u0442\u043e\u0440\u043d\u0438\u043a
-FormatData/ru_RU/DayNames/3=\u0441\u0440\u0435\u0434\u0430
-FormatData/ru_RU/DayNames/4=\u0447\u0435\u0442\u0432\u0435\u0440\u0433
-FormatData/ru_RU/DayNames/5=\u043f\u044f\u0442\u043d\u0438\u0446\u0430
-FormatData/ru_RU/DayNames/6=\u0441\u0443\u0431\u0431\u043e\u0442\u0430
-FormatData/ru_RU/NumberElements/0=,
-FormatData/ru_RU/NumberElements/1=\u00a0
-FormatData/ru_RU/NumberElements/2=;
-FormatData/ru_RU/NumberElements/3=%
-FormatData/ru_RU/NumberElements/4=0
-FormatData/ru_RU/NumberElements/5=#
-FormatData/ru_RU/NumberElements/6=-
-FormatData/ru_RU/NumberElements/7=E
-FormatData/ru_RU/NumberElements/8=\u2030
-FormatData/ru_RU/NumberElements/9=\u221e
-FormatData/ru_RU/NumberElements/10=\ufffd
-LocaleNames/ru_RU/RU=\u0420\u043e\u0441\u0441\u0438\u044f
-FormatData/ru_RU/DayAbbreviations/0=\u0412\u0441
-FormatData/ru_RU/DayAbbreviations/1=\u041f\u043d
-FormatData/ru_RU/DayAbbreviations/2=\u0412\u0442
-FormatData/ru_RU/DayAbbreviations/3=\u0421\u0440
-FormatData/ru_RU/DayAbbreviations/4=\u0427\u0442
-FormatData/ru_RU/DayAbbreviations/5=\u041f\u0442
-FormatData/ru_RU/DayAbbreviations/6=\u0421\u0431
-FormatData/ru_RU/AmPmMarkers/0=AM
-FormatData/ru_RU/AmPmMarkers/1=PM
-CalendarData/ru_RU/firstDayOfWeek=2
-CalendarData/ru_RU/minimalDaysInFirstWeek=1
-
-# bug #4094371, 4098518, 4290801, 6558863
-FormatData/en_AU/TimePatterns/0=h:mm:ss a z
-FormatData/en_AU/TimePatterns/1=h:mm:ss a
-FormatData/en_AU/TimePatterns/2=h:mm:ss a
-FormatData/en_AU/TimePatterns/3=h:mm a
-FormatData/en_AU/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/en_AU/DatePatterns/1=d MMMM yyyy
-FormatData/en_AU/DatePatterns/2=dd/MM/yyyy
-FormatData/en_AU/DatePatterns/3=d/MM/yy
-FormatData/en_AU/DateTimePatterns/0={1} {0}
-LocaleNames/en_AU/US=United States
-LocaleNames/en_AU/GB=United Kingdom
-LocaleNames/en_AU/CA=Canada
-LocaleNames/en_AU/IE=Ireland
-LocaleNames/en_AU/AU=Australia
-LocaleNames/en_AU/NZ=New Zealand
-FormatData/en_AU/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/en_AU/NumberPatterns/1=$#,##0.00;-$#,##0.00 # Changed; see bug 4122840
-FormatData/en_AU/NumberPatterns/2=#,##0%
-CurrencyNames/en_AU/AUD=$
-LocaleNames/en_AU/en=English
-FormatData/en_AU/MonthNames/0=January
-FormatData/en_AU/MonthNames/1=February
-FormatData/en_AU/MonthNames/2=March
-# changed, bug 6558863
-FormatData/en_NZ/TimePatterns/0=h:mm:ss a z
-FormatData/en_NZ/TimePatterns/1=h:mm:ss a
-FormatData/en_NZ/TimePatterns/2=h:mm:ss a
-FormatData/en_NZ/TimePatterns/3=h:mm a
-FormatData/en_NZ/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/en_NZ/DatePatterns/1=d MMMM yyyy
-FormatData/en_NZ/DatePatterns/2=d/MM/yyyy
-FormatData/en_NZ/DatePatterns/3=d/MM/yy
-FormatData/en_NZ/DateTimePatterns/0={1} {0}
-LocaleNames/en_NZ/US=United States
-LocaleNames/en_NZ/GB=United Kingdom
-LocaleNames/en_NZ/CA=Canada
-LocaleNames/en_NZ/IE=Ireland
-LocaleNames/en_NZ/AU=Australia
-LocaleNames/en_NZ/NZ=New Zealand
-FormatData/en_NZ/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/en_NZ/NumberPatterns/1=$#,##0.00;-$#,##0.00 # Changed; see bug 4122840
-FormatData/en_NZ/NumberPatterns/2=#,##0%
-CurrencyNames/en_NZ/NZD=$
-LocaleNames/en_NZ/en=English
-FormatData/en_NZ/MonthNames/0=January
-FormatData/en_NZ/MonthNames/1=February
-FormatData/en_NZ/MonthNames/2=March
-#changed, bug 6488119
-FormatData/en_ZA/TimePatterns/0=h:mm:ss a
-FormatData/en_ZA/TimePatterns/1=h:mm:ss a
-FormatData/en_ZA/TimePatterns/2=h:mm:ss a
-FormatData/en_ZA/TimePatterns/3=h:mm a
-FormatData/en_ZA/DatePatterns/0=EEEE dd MMMM yyyy
-FormatData/en_ZA/DatePatterns/1=dd MMMM yyyy
-FormatData/en_ZA/DatePatterns/2=dd MMM yyyy
-FormatData/en_ZA/DatePatterns/3=yyyy/MM/dd
-FormatData/en_ZA/DateTimePatterns/0={1} {0}
-LocaleNames/en_ZA/US=United States
-LocaleNames/en_ZA/GB=United Kingdom
-LocaleNames/en_ZA/CA=Canada
-LocaleNames/en_ZA/IE=Ireland
-LocaleNames/en_ZA/ZA=South Africa
-FormatData/en_ZA/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/en_ZA/NumberPatterns/1=R #,##0.00;R-#,##0.00 # Changed; see bug 4122840
-FormatData/en_ZA/NumberPatterns/2=#,##0%
-CurrencyNames/en_ZA/ZAR=R
-LocaleNames/en_ZA/en=English
-FormatData/en_ZA/MonthNames/0=January
-FormatData/en_ZA/MonthNames/1=February
-FormatData/en_ZA/MonthNames/2=March
-CurrencyNames/es_AR/ARS=$
-FormatData/es_AR/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_AR/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
-FormatData/es_AR/NumberPatterns/2=#,##0%
-FormatData/es_AR/TimePatterns/0=HH'h'''mm z
-FormatData/es_AR/TimePatterns/1=H:mm:ss z
-FormatData/es_AR/TimePatterns/2=HH:mm:ss
-FormatData/es_AR/TimePatterns/3=HH:mm
-FormatData/es_AR/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_AR/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_AR/DatePatterns/2=dd/MM/yyyy
-FormatData/es_AR/DatePatterns/3=dd/MM/yy
-FormatData/es_AR/DateTimePatterns/0={1} {0}
-FormatData/es_AR/NumberElements/0=,
-FormatData/es_AR/NumberElements/1=.
-FormatData/es_AR/NumberElements/2=;
-FormatData/es_BO/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_BO/NumberPatterns/1=B$#,##0.00;(B$#,##0.00) # Changed; see bug 4122840
-FormatData/es_BO/NumberPatterns/2=#,##0%
-CurrencyNames/es_BO/BOB=B$
-FormatData/es_BO/TimePatterns/0=hh:mm:ss a z
-FormatData/es_BO/TimePatterns/1=hh:mm:ss a z
-FormatData/es_BO/TimePatterns/2=hh:mm:ss a
-FormatData/es_BO/TimePatterns/3=hh:mm a
-FormatData/es_BO/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_BO/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_BO/DatePatterns/2=dd-MM-yyyy
-FormatData/es_BO/DatePatterns/3=dd-MM-yy
-FormatData/es_BO/DateTimePatterns/0={1} {0}
-# changed decimal and group separator for 5102005 bugfix
-FormatData/es_BO/NumberElements/0=,
-FormatData/es_BO/NumberElements/1=.
-FormatData/es_BO/NumberElements/2=;
-CurrencyNames/es_CL/CLP=Ch$
-FormatData/es_CL/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_CL/NumberPatterns/1=Ch$#,##0.00;Ch$-#,##0.00 # Changed; see bug 4122840
-FormatData/es_CL/NumberPatterns/2=#,##0%
-FormatData/es_CL/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_CL/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_CL/DatePatterns/2=dd-MM-yyyy
-FormatData/es_CL/DatePatterns/3=dd-MM-yy
-FormatData/es_CL/DateTimePatterns/0={1} {0}
-FormatData/es_CL/NumberElements/0=,
-FormatData/es_CL/NumberElements/1=.
-FormatData/es_CL/NumberElements/2=;
-FormatData/es_CO/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_CO/NumberPatterns/1=C$#,##0.00;(C$#,##0.00) # Changed; see bug 4122840
-FormatData/es_CO/NumberPatterns/2=#,##0%
-# changed currency symbol during 5102005 bugfix
-CurrencyNames/es_CO/COP=$
-FormatData/es_CO/TimePatterns/0=hh:mm:ss a z
-FormatData/es_CO/TimePatterns/1=hh:mm:ss a z
-FormatData/es_CO/TimePatterns/2=hh:mm:ss a
-FormatData/es_CO/TimePatterns/3=hh:mm a
-FormatData/es_CO/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_CO/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_CO/DatePatterns/2=d/MM/yyyy
-FormatData/es_CO/DatePatterns/3=d/MM/yy
-FormatData/es_CO/DateTimePatterns/0={1} {0}
-# changed decimal and group separator for 5102005 bugfix
-FormatData/es_CO/NumberElements/0=,
-FormatData/es_CO/NumberElements/1=.
-FormatData/es_CO/NumberElements/2=;
-FormatData/es_CR/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_CR/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
-FormatData/es_CR/NumberPatterns/2=#,##0%
-CurrencyNames/es_CR/CRC=C
-FormatData/es_CR/TimePatterns/0=hh:mm:ss a z
-FormatData/es_CR/TimePatterns/1=hh:mm:ss a z
-FormatData/es_CR/TimePatterns/2=hh:mm:ss a
-FormatData/es_CR/TimePatterns/3=hh:mm a
-FormatData/es_CR/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_CR/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_CR/DatePatterns/2=dd/MM/yyyy
-FormatData/es_CR/DatePatterns/3=dd/MM/yy
-FormatData/es_CR/DateTimePatterns/0={1} {0}
-FormatData/es_CR/NumberElements/0=.
-FormatData/es_CR/NumberElements/1=,
-FormatData/es_CR/NumberElements/2=;
-FormatData/es_DO/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_DO/NumberPatterns/1=RD$#,##0.00;(RD$#,##0.00) # Changed; see bug 4122840
-FormatData/es_DO/NumberPatterns/2=#,##0%
-CurrencyNames/es_DO/DOP=RD$
-FormatData/es_DO/TimePatterns/0=hh:mm:ss a z
-FormatData/es_DO/TimePatterns/1=hh:mm:ss a z
-FormatData/es_DO/TimePatterns/2=hh:mm:ss a
-FormatData/es_DO/TimePatterns/3=hh:mm a
-FormatData/es_DO/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_DO/DatePatterns/1=d' de 'MMMM' de 'yyyy
-# FormatData/es_DO/DatePatterns/2=MM/dd/yyyy # Changed: see bug 8037343
-# FormatData/es_DO/DatePatterns/3=MM/dd/yy # Changed: see bug 8037343
-FormatData/es_DO/DateTimePatterns/0={1} {0}
-FormatData/es_DO/NumberElements/0=.
-FormatData/es_DO/NumberElements/1=,
-FormatData/es_DO/NumberElements/2=;
-FormatData/es_EC/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_EC/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840
-FormatData/es_EC/NumberPatterns/2=#,##0%
-#changed for 4945388
-CurrencyNames/es_EC/USD=$
-FormatData/es_EC/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_EC/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_EC/DatePatterns/2=dd/MM/yyyy
-FormatData/es_EC/DatePatterns/3=dd/MM/yy
-FormatData/es_EC/DateTimePatterns/0={1} {0}
-# changed decimal and group separator for 5102005 bugfix
-FormatData/es_EC/NumberElements/0=,
-FormatData/es_EC/NumberElements/1=.
-FormatData/es_EC/NumberElements/2=;
-LocaleNames/es/ES=Espa\u00f1a
-LocaleNames/es/AR=Argentina
-LocaleNames/es/BO=Bolivia
-LocaleNames/es/CL=Chile
-LocaleNames/es/CO=Colombia
-LocaleNames/es/CR=Costa Rica
-LocaleNames/es/DO=Rep\u00fablica Dominicana
-LocaleNames/es/EC=Ecuador
-LocaleNames/es/GT=Guatemala
-LocaleNames/es/HN=Honduras
-LocaleNames/es/MX=M\u00e9xico
-LocaleNames/es/NI=Nicaragua
-LocaleNames/es/PA=Panam\u00e1
-LocaleNames/es/PE=Per\u00fa
-LocaleNames/es/PR=Puerto Rico
-LocaleNames/es/PY=Paraguay
-# LocaleNames/es/SV=El SalvadorUY # Changed, see bug 4331446
-LocaleNames/es/UY=Uruguay
-LocaleNames/es/VE=Venezuela
-FormatData/es_GT/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_GT/NumberPatterns/1=Q#,##0.00;(Q#,##0.00) # Changed; see bug 4122840
-FormatData/es_GT/NumberPatterns/2=#,##0%
-CurrencyNames/es_GT/GTQ=Q
-FormatData/es_GT/TimePatterns/0=hh:mm:ss a z
-FormatData/es_GT/TimePatterns/1=hh:mm:ss a z
-FormatData/es_GT/TimePatterns/2=hh:mm:ss a
-FormatData/es_GT/TimePatterns/3=hh:mm a
-FormatData/es_GT/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_GT/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_GT/DatePatterns/2=d/MM/yyyy
-FormatData/es_GT/DatePatterns/3=d/MM/yy
-FormatData/es_GT/DateTimePatterns/0={1} {0}
-FormatData/es_GT/NumberElements/0=.
-FormatData/es_GT/NumberElements/1=,
-FormatData/es_GT/NumberElements/2=;
-FormatData/es_HN/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_HN/NumberPatterns/1=L#,##0.00;(L#,##0.00) # Changed; see bug 4122840
-FormatData/es_HN/NumberPatterns/2=#,##0%
-CurrencyNames/es_HN/HNL=L
-FormatData/es_HN/TimePatterns/0=hh:mm:ss a z
-FormatData/es_HN/TimePatterns/1=hh:mm:ss a z
-FormatData/es_HN/TimePatterns/2=hh:mm:ss a
-FormatData/es_HN/TimePatterns/3=hh:mm a
-FormatData/es_HN/DatePatterns/0=EEEE dd' de 'MMMM' de 'yyyy
-FormatData/es_HN/DatePatterns/1=dd' de 'MMMM' de 'yyyy
-FormatData/es_HN/DatePatterns/2=MM-dd-yyyy
-FormatData/es_HN/DatePatterns/3=MM-dd-yy
-FormatData/es_HN/DateTimePatterns/0={1} {0}
-FormatData/es_HN/NumberElements/0=.
-FormatData/es_HN/NumberElements/1=,
-FormatData/es_HN/NumberElements/2=;
-FormatData/es_MX/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_MX/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
-FormatData/es_MX/NumberPatterns/2=#,##0%
-CurrencyNames/es_MX/MXN=$
-FormatData/es_MX/TimePatterns/0=hh:mm:ss a z
-FormatData/es_MX/TimePatterns/1=hh:mm:ss a z
-FormatData/es_MX/TimePatterns/2=hh:mm:ss a
-FormatData/es_MX/TimePatterns/3=hh:mm a
-FormatData/es_MX/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_MX/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_MX/DatePatterns/2=d/MM/yyyy
-FormatData/es_MX/DatePatterns/3=d/MM/yy
-FormatData/es_MX/DateTimePatterns/0={1} {0}
-FormatData/es_MX/NumberElements/0=.
-FormatData/es_MX/NumberElements/1=,
-FormatData/es_MX/NumberElements/2=;
-FormatData/es_NI/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_NI/NumberPatterns/1=$C#,##0.00;($C#,##0.00) # Changed; see bug 4122840
-FormatData/es_NI/NumberPatterns/2=#,##0%
-CurrencyNames/es_NI/NIO=$C
-FormatData/es_NI/TimePatterns/0=hh:mm:ss a z
-FormatData/es_NI/TimePatterns/1=hh:mm:ss a z
-FormatData/es_NI/TimePatterns/2=hh:mm:ss a
-FormatData/es_NI/TimePatterns/3=hh:mm a
-FormatData/es_NI/DatePatterns/0=EEEE dd' de 'MMMM' de 'yyyy
-FormatData/es_NI/DatePatterns/1=dd' de 'MMMM' de 'yyyy
-FormatData/es_NI/DatePatterns/2=MM-dd-yyyy
-FormatData/es_NI/DatePatterns/3=MM-dd-yy
-FormatData/es_NI/DateTimePatterns/0={1} {0}
-FormatData/es_NI/NumberElements/0=.
-FormatData/es_NI/NumberElements/1=,
-FormatData/es_NI/NumberElements/2=;
-FormatData/es_PA/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_PA/NumberPatterns/1=B#,##0.00;(B#,##0.00) # Changed; see bug 4122840
-FormatData/es_PA/NumberPatterns/2=#,##0%
-CurrencyNames/es_PA/PAB=B
-FormatData/es_PA/TimePatterns/0=hh:mm:ss a z
-FormatData/es_PA/TimePatterns/1=hh:mm:ss a z
-FormatData/es_PA/TimePatterns/2=hh:mm:ss a
-FormatData/es_PA/TimePatterns/3=hh:mm a
-FormatData/es_PA/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_PA/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_PA/DatePatterns/2=MM/dd/yyyy
-FormatData/es_PA/DatePatterns/3=MM/dd/yy
-FormatData/es_PA/DateTimePatterns/0={1} {0}
-FormatData/es_PA/NumberElements/0=.
-FormatData/es_PA/NumberElements/1=,
-FormatData/es_PA/NumberElements/2=;
-FormatData/es_PE/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840
-FormatData/es_PE/NumberPatterns/2=#,##0%
-FormatData/es_PE/TimePatterns/0=hh:mm:ss a z
-FormatData/es_PE/TimePatterns/1=hh:mm:ss a z
-FormatData/es_PE/TimePatterns/2=hh:mm:ss a
-FormatData/es_PE/TimePatterns/3=hh:mm a
-FormatData/es_PE/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_PE/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_PE/DatePatterns/2=dd/MM/yyyy
-FormatData/es_PE/DatePatterns/3=dd/MM/yy
-FormatData/es_PE/DateTimePatterns/0={1} {0}
-FormatData/es_PE/NumberElements/2=;
-FormatData/es_PR/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_PR/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
-FormatData/es_PR/NumberPatterns/2=#,##0%
-CurrencyNames/es_PR/USD=$
-FormatData/es_PR/TimePatterns/0=hh:mm:ss a z
-FormatData/es_PR/TimePatterns/1=hh:mm:ss a z
-FormatData/es_PR/TimePatterns/2=hh:mm:ss a
-FormatData/es_PR/TimePatterns/3=hh:mm a
-FormatData/es_PR/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_PR/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_PR/DatePatterns/2=MM-dd-yyyy
-FormatData/es_PR/DatePatterns/3=MM-dd-yy
-FormatData/es_PR/DateTimePatterns/0={1} {0}
-FormatData/es_PR/NumberElements/0=.
-FormatData/es_PR/NumberElements/1=,
-FormatData/es_PR/NumberElements/2=;
-CurrencyNames/es_PY/PYG=G
-FormatData/es_PY/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_PY/NumberPatterns/1=G#,##0.00;(G#,##0.00) # Changed; see bug 4122840
-FormatData/es_PY/NumberPatterns/2=#,##0%
-FormatData/es_PY/TimePatterns/0=hh:mm:ss a z
-FormatData/es_PY/TimePatterns/1=hh:mm:ss a z
-FormatData/es_PY/TimePatterns/2=hh:mm:ss a
-FormatData/es_PY/TimePatterns/3=hh:mm a
-FormatData/es_PY/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_PY/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_PY/DatePatterns/2=dd/MM/yyyy
-FormatData/es_PY/DatePatterns/3=dd/MM/yy
-FormatData/es_PY/DateTimePatterns/0={1} {0}
-FormatData/es_PY/NumberElements/0=,
-FormatData/es_PY/NumberElements/1=.
-FormatData/es_PY/NumberElements/2=;
-FormatData/es_SV/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_SV/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
-FormatData/es_SV/NumberPatterns/2=#,##0%
-CurrencyNames/es_SV/SVC=C
-FormatData/es_SV/TimePatterns/0=hh:mm:ss a z
-FormatData/es_SV/TimePatterns/1=hh:mm:ss a z
-FormatData/es_SV/TimePatterns/2=hh:mm:ss a
-FormatData/es_SV/TimePatterns/3=hh:mm a
-FormatData/es_SV/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_SV/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_SV/DatePatterns/2=MM-dd-yyyy
-FormatData/es_SV/DatePatterns/3=MM-dd-yy
-FormatData/es_SV/DateTimePatterns/0={1} {0}
-FormatData/es_SV/NumberElements/0=.
-FormatData/es_SV/NumberElements/1=,
-FormatData/es_SV/NumberElements/2=;
-CurrencyNames/es_UY/UYU=NU$
-FormatData/es_UY/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_UY/NumberPatterns/1=NU$ #,##0.00;(NU$#,##0.00) # Changed; see bug 4122840
-FormatData/es_UY/NumberPatterns/2=#,##0%
-FormatData/es_UY/TimePatterns/0=hh:mm:ss a z
-FormatData/es_UY/TimePatterns/1=hh:mm:ss a z
-FormatData/es_UY/TimePatterns/2=hh:mm:ss a
-FormatData/es_UY/TimePatterns/3=hh:mm a
-FormatData/es_UY/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_UY/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_UY/DatePatterns/2=dd/MM/yyyy
-FormatData/es_UY/DatePatterns/3=dd/MM/yy
-FormatData/es_UY/DateTimePatterns/0={1} {0}
-FormatData/es_UY/NumberElements/0=,
-FormatData/es_UY/NumberElements/1=.
-FormatData/es_UY/NumberElements/2=;
-CurrencyNames/es_VE/VEB=Bs
-# bug 6570259
-FormatData/es_VE/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/es_VE/NumberPatterns/1=Bs#,##0.00;Bs -#,##0.00 # Changed; see bug 4122840
-FormatData/es_VE/NumberPatterns/2=#,##0%
-FormatData/es_VE/TimePatterns/0=hh:mm:ss a z
-FormatData/es_VE/TimePatterns/1=hh:mm:ss a z
-FormatData/es_VE/TimePatterns/2=hh:mm:ss a
-FormatData/es_VE/TimePatterns/3=hh:mm a
-FormatData/es_VE/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_VE/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_VE/DatePatterns/2=dd/MM/yyyy
-FormatData/es_VE/DatePatterns/3=dd/MM/yy
-FormatData/es_VE/DateTimePatterns/0={1} {0}
-FormatData/es_VE/NumberElements/0=,
-FormatData/es_VE/NumberElements/1=.
-FormatData/es_VE/NumberElements/2=;
-
-# bug #4099810, 4290801, 6868106, 6916787
-CurrencyNames/uk_UA/UAH=\u0433\u0440\u043d.
-FormatData/uk_UA/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/uk_UA/NumberPatterns/1=#,##0.## '\u0433\u0440\u0432.';-#,##0.## '\u0433\u0440\u0432.' # Changed; see bug 4122840
-FormatData/uk_UA/NumberPatterns/2=#,##0%
-
-# bug 6245766
-FormatData/uk/DatePatterns/0=EEEE, d MMMM yyyy \u0440.
-FormatData/uk/DatePatterns/1=d MMMM yyyy
-FormatData/uk/DatePatterns/2=d MMM yyyy
-FormatData/uk/DatePatterns/3=dd.MM.yy
-
-# bug #4103218
-# FormatData/ko_KR/NumberPatterns/1=\u20a9#,##0;-\u20a9#,##0 # Changed; see bug 4122840
-
-# bug #4103220 should be adequately tested by the above tests, which represent a pretty
-# good cross-section of the locale data
-
-# bug #4103861
-# As far as I can tell, French dates do not use commas at all.  However, we
-# already have a comma after the month in the LONG date format, so we want to be
-# consistent with that.  This is probably taken from the Windows locale data,
-# which does include a comma after month for fr_CA (although not for fr_FR).
-# Hence: No comma after the day of week. ASL 5/12/98
-# Follow-up: Well, a follow-up duplicate bug (4141637) has confirmed that the
-# comma should not be present at all in French.  Removing the comma.
-FormatData/fr_CA/DatePatterns/0=EEEE d MMMM yyyy
-FormatData/fr_CA/DatePatterns/1=d MMMM yyyy
-FormatData/en_CA/DatePatterns/0=EEEE, MMMM d, yyyy
-
-# bug #4112136
-FormatData/fr_CA/TimePatterns/0=H' h 'mm z
-FormatData/fr_CA/TimePatterns/1=HH:mm:ss z
-
-# bug #4113638, 4290801
-CurrencyNames/ar_AE/AED=\u062f.\u0625.\u200f
-FormatData/ar_AE/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_AE/NumberPatterns/1='\u062f.\u0625.\u200f' #,##0.###;'\u062f.\u0625.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_AE/NumberPatterns/2=#,##0%
-FormatData/ar_AE/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_AE/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_AE/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_AE/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_AE/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_AE/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_AE/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_AE/firstDayOfWeek=7
-CalendarData/ar_AE/minimalDaysInFirstWeek=1
-FormatData/ar_AE/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_AE/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_AE/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_AE/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_AE/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_AE/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_AE/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_AE/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_AE/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_AE/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_AE/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_AE/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_AE/MonthAbbreviations/12=
-FormatData/ar_AE/Eras/0=\u0642.\u0645
-FormatData/ar_AE/Eras/1=\u0645
-FormatData/ar_AE/DayAbbreviations/0=\u062d
-FormatData/ar_AE/DayAbbreviations/1=\u0646
-FormatData/ar_AE/DayAbbreviations/2=\u062b
-FormatData/ar_AE/DayAbbreviations/3=\u0631
-FormatData/ar_AE/DayAbbreviations/4=\u062e
-FormatData/ar_AE/DayAbbreviations/5=\u062c
-FormatData/ar_AE/DayAbbreviations/6=\u0633
-LocaleNames/ar_AE/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_AE/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_AE/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_AE/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_AE/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_AE/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_AE/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_AE/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_AE/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_AE/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_AE/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_AE/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_AE/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_AE/MonthNames/12=
-FormatData/ar_AE/AmPmMarkers/0=\u0635
-FormatData/ar_AE/AmPmMarkers/1=\u0645
-FormatData/ar_AE/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_AE/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_AE/TimePatterns/2=hh:mm:ss a
-FormatData/ar_AE/TimePatterns/3=hh:mm a
-FormatData/ar_AE/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_AE/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_AE/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_AE/DatePatterns/3=dd/MM/yy
-FormatData/ar_AE/DateTimePatterns/0={1} {0}
-LocaleNames/ar_AE/EG=\u0645\u0635\u0631
-LocaleNames/ar_AE/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_AE/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_AE/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_AE/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_AE/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_AE/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_AE/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_AE/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_AE/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_AE/QA=\u0642\u0637\u0631
-LocaleNames/ar_AE/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_AE/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_AE/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_AE/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_AE/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_AE/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_AE/NumberElements/0=.
-FormatData/ar_AE/NumberElements/1=,
-FormatData/ar_AE/NumberElements/2=;
-FormatData/ar_AE/NumberElements/3=%
-FormatData/ar_AE/NumberElements/4=0
-FormatData/ar_AE/NumberElements/5=#
-FormatData/ar_AE/NumberElements/6=-
-FormatData/ar_AE/NumberElements/7=E
-FormatData/ar_AE/NumberElements/8=\u2030
-FormatData/ar_AE/NumberElements/9=\u221e
-FormatData/ar_AE/NumberElements/10=\ufffd
-CurrencyNames/ar_BH/BHD=\u062f.\u0628.\u200f
-FormatData/ar_BH/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_BH/NumberPatterns/1='\u062f.\u0628.\u200f' #,##0.###;'\u062f.\u0628.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_BH/NumberPatterns/2=#,##0%
-FormatData/ar_BH/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_BH/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_BH/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_BH/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_BH/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_BH/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_BH/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_BH/firstDayOfWeek=7
-CalendarData/ar_BH/minimalDaysInFirstWeek=1
-FormatData/ar_BH/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_BH/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_BH/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_BH/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_BH/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_BH/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_BH/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_BH/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_BH/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_BH/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_BH/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_BH/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_BH/MonthAbbreviations/12=
-FormatData/ar_BH/Eras/0=\u0642.\u0645
-FormatData/ar_BH/Eras/1=\u0645
-FormatData/ar_BH/DayAbbreviations/0=\u062d
-FormatData/ar_BH/DayAbbreviations/1=\u0646
-FormatData/ar_BH/DayAbbreviations/2=\u062b
-FormatData/ar_BH/DayAbbreviations/3=\u0631
-FormatData/ar_BH/DayAbbreviations/4=\u062e
-FormatData/ar_BH/DayAbbreviations/5=\u062c
-FormatData/ar_BH/DayAbbreviations/6=\u0633
-LocaleNames/ar_BH/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_BH/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_BH/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_BH/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_BH/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_BH/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_BH/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_BH/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_BH/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_BH/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_BH/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_BH/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_BH/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_BH/MonthNames/12=
-FormatData/ar_BH/AmPmMarkers/0=\u0635
-FormatData/ar_BH/AmPmMarkers/1=\u0645
-FormatData/ar_BH/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_BH/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_BH/TimePatterns/2=hh:mm:ss a
-FormatData/ar_BH/TimePatterns/3=hh:mm a
-FormatData/ar_BH/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_BH/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_BH/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_BH/DatePatterns/3=dd/MM/yy
-FormatData/ar_BH/DateTimePatterns/0={1} {0}
-LocaleNames/ar_BH/EG=\u0645\u0635\u0631
-LocaleNames/ar_BH/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_BH/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_BH/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_BH/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_BH/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_BH/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_BH/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_BH/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_BH/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_BH/QA=\u0642\u0637\u0631
-LocaleNames/ar_BH/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_BH/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_BH/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_BH/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_BH/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_BH/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_BH/NumberElements/0=.
-FormatData/ar_BH/NumberElements/1=,
-FormatData/ar_BH/NumberElements/2=;
-FormatData/ar_BH/NumberElements/3=%
-FormatData/ar_BH/NumberElements/4=0
-FormatData/ar_BH/NumberElements/5=#
-FormatData/ar_BH/NumberElements/6=-
-FormatData/ar_BH/NumberElements/7=E
-FormatData/ar_BH/NumberElements/8=\u2030
-FormatData/ar_BH/NumberElements/9=\u221e
-FormatData/ar_BH/NumberElements/10=\ufffd
-CurrencyNames/ar_DZ/DZD=\u062f.\u062c.\u200f
-FormatData/ar_DZ/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_DZ/NumberPatterns/1='\u062f.\u062c.\u200f' #,##0.###;'\u062f.\u062c.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_DZ/NumberPatterns/2=#,##0%
-FormatData/ar_DZ/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_DZ/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_DZ/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_DZ/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_DZ/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_DZ/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_DZ/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_DZ/firstDayOfWeek=7
-CalendarData/ar_DZ/minimalDaysInFirstWeek=1
-FormatData/ar_DZ/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_DZ/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_DZ/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_DZ/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_DZ/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_DZ/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_DZ/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_DZ/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_DZ/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_DZ/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_DZ/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_DZ/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_DZ/MonthAbbreviations/12=
-FormatData/ar_DZ/Eras/0=\u0642.\u0645
-FormatData/ar_DZ/Eras/1=\u0645
-FormatData/ar_DZ/DayAbbreviations/0=\u062d
-FormatData/ar_DZ/DayAbbreviations/1=\u0646
-FormatData/ar_DZ/DayAbbreviations/2=\u062b
-FormatData/ar_DZ/DayAbbreviations/3=\u0631
-FormatData/ar_DZ/DayAbbreviations/4=\u062e
-FormatData/ar_DZ/DayAbbreviations/5=\u062c
-FormatData/ar_DZ/DayAbbreviations/6=\u0633
-LocaleNames/ar_DZ/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_DZ/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_DZ/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_DZ/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_DZ/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_DZ/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_DZ/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_DZ/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_DZ/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_DZ/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_DZ/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_DZ/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_DZ/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_DZ/MonthNames/12=
-FormatData/ar_DZ/AmPmMarkers/0=\u0635
-FormatData/ar_DZ/AmPmMarkers/1=\u0645
-FormatData/ar_DZ/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_DZ/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_DZ/TimePatterns/2=hh:mm:ss a
-FormatData/ar_DZ/TimePatterns/3=hh:mm a
-FormatData/ar_DZ/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_DZ/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_DZ/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_DZ/DatePatterns/3=dd/MM/yy
-FormatData/ar_DZ/DateTimePatterns/0={1} {0}
-LocaleNames/ar_DZ/EG=\u0645\u0635\u0631
-LocaleNames/ar_DZ/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_DZ/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_DZ/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_DZ/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_DZ/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_DZ/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_DZ/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_DZ/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_DZ/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_DZ/QA=\u0642\u0637\u0631
-LocaleNames/ar_DZ/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_DZ/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_DZ/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_DZ/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_DZ/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_DZ/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_DZ/NumberElements/0=.
-FormatData/ar_DZ/NumberElements/1=,
-FormatData/ar_DZ/NumberElements/2=;
-FormatData/ar_DZ/NumberElements/3=%
-FormatData/ar_DZ/NumberElements/4=0
-FormatData/ar_DZ/NumberElements/5=#
-FormatData/ar_DZ/NumberElements/6=-
-FormatData/ar_DZ/NumberElements/7=E
-FormatData/ar_DZ/NumberElements/8=\u2030
-FormatData/ar_DZ/NumberElements/9=\u221e
-FormatData/ar_DZ/NumberElements/10=\ufffd
-CurrencyNames/ar_EG/EGP=\u062c.\u0645.\u200f
-FormatData/ar_EG/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_EG/NumberPatterns/1='\u062c.\u0645.\u200f' #,##0.###;'\u062c.\u0645.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_EG/NumberPatterns/2=#,##0%
-FormatData/ar_EG/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_EG/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_EG/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_EG/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_EG/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_EG/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_EG/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_EG/firstDayOfWeek=7
-CalendarData/ar_EG/minimalDaysInFirstWeek=1
-FormatData/ar_EG/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_EG/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_EG/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_EG/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_EG/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_EG/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_EG/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_EG/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_EG/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_EG/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_EG/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_EG/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_EG/MonthAbbreviations/12=
-FormatData/ar_EG/Eras/0=\u0642.\u0645
-FormatData/ar_EG/Eras/1=\u0645
-FormatData/ar_EG/DayAbbreviations/0=\u062d
-FormatData/ar_EG/DayAbbreviations/1=\u0646
-FormatData/ar_EG/DayAbbreviations/2=\u062b
-FormatData/ar_EG/DayAbbreviations/3=\u0631
-FormatData/ar_EG/DayAbbreviations/4=\u062e
-FormatData/ar_EG/DayAbbreviations/5=\u062c
-FormatData/ar_EG/DayAbbreviations/6=\u0633
-LocaleNames/ar_EG/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_EG/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_EG/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_EG/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_EG/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_EG/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_EG/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_EG/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_EG/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_EG/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_EG/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_EG/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_EG/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_EG/MonthNames/12=
-FormatData/ar_EG/AmPmMarkers/0=\u0635
-FormatData/ar_EG/AmPmMarkers/1=\u0645
-FormatData/ar_EG/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_EG/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_EG/TimePatterns/2=hh:mm:ss a
-FormatData/ar_EG/TimePatterns/3=hh:mm a
-FormatData/ar_EG/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_EG/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_EG/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_EG/DatePatterns/3=dd/MM/yy
-FormatData/ar_EG/DateTimePatterns/0={1} {0}
-LocaleNames/ar_EG/EG=\u0645\u0635\u0631
-LocaleNames/ar_EG/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_EG/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_EG/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_EG/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_EG/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_EG/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_EG/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_EG/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_EG/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_EG/QA=\u0642\u0637\u0631
-LocaleNames/ar_EG/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_EG/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_EG/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_EG/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_EG/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_EG/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_EG/NumberElements/0=.
-FormatData/ar_EG/NumberElements/1=,
-FormatData/ar_EG/NumberElements/2=;
-FormatData/ar_EG/NumberElements/3=%
-FormatData/ar_EG/NumberElements/4=0
-FormatData/ar_EG/NumberElements/5=#
-FormatData/ar_EG/NumberElements/6=-
-FormatData/ar_EG/NumberElements/7=E
-FormatData/ar_EG/NumberElements/8=\u2030
-FormatData/ar_EG/NumberElements/9=\u221e
-FormatData/ar_EG/NumberElements/10=\ufffd
-CurrencyNames/ar_IQ/IQD=\u062f.\u0639.\u200f
-FormatData/ar_IQ/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_IQ/NumberPatterns/1='\u062f.\u0639.\u200f' #,##0.###;'\u062f.\u0639.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_IQ/NumberPatterns/2=#,##0%
-FormatData/ar_IQ/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_IQ/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_IQ/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_IQ/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_IQ/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_IQ/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_IQ/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_IQ/firstDayOfWeek=7
-CalendarData/ar_IQ/minimalDaysInFirstWeek=1
-FormatData/ar_IQ/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_IQ/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_IQ/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_IQ/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_IQ/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_IQ/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_IQ/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_IQ/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_IQ/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_IQ/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_IQ/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_IQ/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_IQ/MonthAbbreviations/12=
-FormatData/ar_IQ/Eras/0=\u0642.\u0645
-FormatData/ar_IQ/Eras/1=\u0645
-FormatData/ar_IQ/DayAbbreviations/0=\u062d
-FormatData/ar_IQ/DayAbbreviations/1=\u0646
-FormatData/ar_IQ/DayAbbreviations/2=\u062b
-FormatData/ar_IQ/DayAbbreviations/3=\u0631
-FormatData/ar_IQ/DayAbbreviations/4=\u062e
-FormatData/ar_IQ/DayAbbreviations/5=\u062c
-FormatData/ar_IQ/DayAbbreviations/6=\u0633
-LocaleNames/ar_IQ/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_IQ/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_IQ/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_IQ/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_IQ/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_IQ/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_IQ/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_IQ/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_IQ/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_IQ/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_IQ/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_IQ/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_IQ/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_IQ/MonthNames/12=
-FormatData/ar_IQ/AmPmMarkers/0=\u0635
-FormatData/ar_IQ/AmPmMarkers/1=\u0645
-FormatData/ar_IQ/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_IQ/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_IQ/TimePatterns/2=hh:mm:ss a
-FormatData/ar_IQ/TimePatterns/3=hh:mm a
-FormatData/ar_IQ/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_IQ/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_IQ/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_IQ/DatePatterns/3=dd/MM/yy
-FormatData/ar_IQ/DateTimePatterns/0={1} {0}
-LocaleNames/ar_IQ/EG=\u0645\u0635\u0631
-LocaleNames/ar_IQ/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_IQ/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_IQ/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_IQ/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_IQ/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_IQ/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_IQ/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_IQ/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_IQ/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_IQ/QA=\u0642\u0637\u0631
-LocaleNames/ar_IQ/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_IQ/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_IQ/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_IQ/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_IQ/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_IQ/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_IQ/NumberElements/0=.
-FormatData/ar_IQ/NumberElements/1=,
-FormatData/ar_IQ/NumberElements/2=;
-FormatData/ar_IQ/NumberElements/3=%
-FormatData/ar_IQ/NumberElements/4=0
-FormatData/ar_IQ/NumberElements/5=#
-FormatData/ar_IQ/NumberElements/6=-
-FormatData/ar_IQ/NumberElements/7=E
-FormatData/ar_IQ/NumberElements/8=\u2030
-FormatData/ar_IQ/NumberElements/9=\u221e
-FormatData/ar_IQ/NumberElements/10=\ufffd
-FormatData/ar_JO/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_JO/NumberPatterns/1='\u062f.\u0623.\u200f' #,##0.###;'\u062f.\u0623.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_JO/NumberPatterns/2=#,##0%
-CurrencyNames/ar_JO/JOD=\u062f.\u0623.\u200f
-FormatData/ar_JO/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_JO/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_JO/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_JO/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_JO/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_JO/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_JO/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_JO/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_JO/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_JO/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_JO/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_JO/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_JO/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_JO/MonthNames/7=\u0622\u0628
-FormatData/ar_JO/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_JO/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthNames/12=
-FormatData/ar_JO/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_JO/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_JO/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_JO/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_JO/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_JO/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_JO/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_JO/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_JO/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthAbbreviations/12=
-FormatData/ar_JO/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_JO/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_JO/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_JO/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_JO/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_JO/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_JO/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_JO/firstDayOfWeek=7
-CalendarData/ar_JO/minimalDaysInFirstWeek=1
-FormatData/ar_JO/Eras/0=\u0642.\u0645
-FormatData/ar_JO/Eras/1=\u0645
-LocaleNames/ar_JO/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_JO/AmPmMarkers/0=\u0635
-FormatData/ar_JO/AmPmMarkers/1=\u0645
-FormatData/ar_JO/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_JO/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_JO/TimePatterns/2=hh:mm:ss a
-FormatData/ar_JO/TimePatterns/3=hh:mm a
-FormatData/ar_JO/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_JO/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_JO/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_JO/DatePatterns/3=dd/MM/yy
-FormatData/ar_JO/DateTimePatterns/0={1} {0}
-LocaleNames/ar_JO/EG=\u0645\u0635\u0631
-LocaleNames/ar_JO/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_JO/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_JO/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_JO/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_JO/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_JO/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_JO/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_JO/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_JO/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_JO/QA=\u0642\u0637\u0631
-LocaleNames/ar_JO/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_JO/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_JO/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_JO/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_JO/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_JO/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_JO/NumberElements/0=.
-FormatData/ar_JO/NumberElements/1=,
-FormatData/ar_JO/NumberElements/2=;
-FormatData/ar_JO/NumberElements/3=%
-FormatData/ar_JO/NumberElements/4=0
-FormatData/ar_JO/NumberElements/5=#
-FormatData/ar_JO/NumberElements/6=-
-FormatData/ar_JO/NumberElements/7=E
-FormatData/ar_JO/NumberElements/8=\u2030
-FormatData/ar_JO/NumberElements/9=\u221e
-FormatData/ar_JO/NumberElements/10=\ufffd
-CurrencyNames/ar_KW/KWD=\u062f.\u0643.\u200f
-FormatData/ar_KW/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_KW/NumberPatterns/1='\u062f.\u0643.\u200f' #,##0.###;'\u062f.\u0643.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_KW/NumberPatterns/2=#,##0%
-FormatData/ar_KW/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_KW/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_KW/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_KW/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_KW/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_KW/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_KW/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_KW/firstDayOfWeek=7
-CalendarData/ar_KW/minimalDaysInFirstWeek=1
-FormatData/ar_KW/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_KW/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_KW/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_KW/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_KW/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_KW/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_KW/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_KW/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_KW/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_KW/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_KW/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_KW/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_KW/MonthAbbreviations/12=
-FormatData/ar_KW/Eras/0=\u0642.\u0645
-FormatData/ar_KW/Eras/1=\u0645
-FormatData/ar_KW/DayAbbreviations/0=\u062d
-FormatData/ar_KW/DayAbbreviations/1=\u0646
-FormatData/ar_KW/DayAbbreviations/2=\u062b
-FormatData/ar_KW/DayAbbreviations/3=\u0631
-FormatData/ar_KW/DayAbbreviations/4=\u062e
-FormatData/ar_KW/DayAbbreviations/5=\u062c
-FormatData/ar_KW/DayAbbreviations/6=\u0633
-LocaleNames/ar_KW/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_KW/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_KW/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_KW/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_KW/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_KW/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_KW/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_KW/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_KW/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_KW/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_KW/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_KW/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_KW/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_KW/MonthNames/12=
-FormatData/ar_KW/AmPmMarkers/0=\u0635
-FormatData/ar_KW/AmPmMarkers/1=\u0645
-FormatData/ar_KW/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_KW/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_KW/TimePatterns/2=hh:mm:ss a
-FormatData/ar_KW/TimePatterns/3=hh:mm a
-FormatData/ar_KW/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_KW/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_KW/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_KW/DatePatterns/3=dd/MM/yy
-FormatData/ar_KW/DateTimePatterns/0={1} {0}
-LocaleNames/ar_KW/EG=\u0645\u0635\u0631
-LocaleNames/ar_KW/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_KW/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_KW/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_KW/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_KW/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_KW/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_KW/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_KW/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_KW/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_KW/QA=\u0642\u0637\u0631
-LocaleNames/ar_KW/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_KW/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_KW/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_KW/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_KW/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_KW/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_KW/NumberElements/0=.
-FormatData/ar_KW/NumberElements/1=,
-FormatData/ar_KW/NumberElements/2=;
-FormatData/ar_KW/NumberElements/3=%
-FormatData/ar_KW/NumberElements/4=0
-FormatData/ar_KW/NumberElements/5=#
-FormatData/ar_KW/NumberElements/6=-
-FormatData/ar_KW/NumberElements/7=E
-FormatData/ar_KW/NumberElements/8=\u2030
-FormatData/ar_KW/NumberElements/9=\u221e
-FormatData/ar_KW/NumberElements/10=\ufffd
-FormatData/ar_LB/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_LB/NumberPatterns/1='\u0644.\u0644.\u200f' #,##0.###;'\u0644.\u0644.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_LB/NumberPatterns/2=#,##0%
-CurrencyNames/ar_LB/LBP=\u0644.\u0644.\u200f
-FormatData/ar_LB/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LB/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LB/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LB/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LB/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LB/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LB/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_LB/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_LB/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_LB/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_LB/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_LB/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_LB/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_LB/MonthNames/7=\u0622\u0628
-FormatData/ar_LB/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_LB/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthNames/12=
-FormatData/ar_LB/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_LB/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_LB/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_LB/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_LB/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_LB/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_LB/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_LB/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_LB/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthAbbreviations/12=
-FormatData/ar_LB/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LB/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LB/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LB/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LB/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LB/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LB/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_LB/firstDayOfWeek=7
-CalendarData/ar_LB/minimalDaysInFirstWeek=1
-FormatData/ar_LB/Eras/0=\u0642.\u0645
-FormatData/ar_LB/Eras/1=\u0645
-LocaleNames/ar_LB/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_LB/AmPmMarkers/0=\u0635
-FormatData/ar_LB/AmPmMarkers/1=\u0645
-FormatData/ar_LB/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_LB/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_LB/TimePatterns/2=hh:mm:ss a
-FormatData/ar_LB/TimePatterns/3=hh:mm a
-FormatData/ar_LB/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_LB/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_LB/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_LB/DatePatterns/3=dd/MM/yy
-FormatData/ar_LB/DateTimePatterns/0={1} {0}
-LocaleNames/ar_LB/EG=\u0645\u0635\u0631
-LocaleNames/ar_LB/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_LB/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_LB/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_LB/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_LB/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_LB/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_LB/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_LB/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_LB/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_LB/QA=\u0642\u0637\u0631
-LocaleNames/ar_LB/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_LB/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_LB/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_LB/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_LB/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_LB/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_LB/NumberElements/0=.
-FormatData/ar_LB/NumberElements/1=,
-FormatData/ar_LB/NumberElements/2=;
-FormatData/ar_LB/NumberElements/3=%
-FormatData/ar_LB/NumberElements/4=0
-FormatData/ar_LB/NumberElements/5=#
-FormatData/ar_LB/NumberElements/6=-
-FormatData/ar_LB/NumberElements/7=E
-FormatData/ar_LB/NumberElements/8=\u2030
-FormatData/ar_LB/NumberElements/9=\u221e
-FormatData/ar_LB/NumberElements/10=\ufffd
-CurrencyNames/ar_LY/LYD=\u062f.\u0644.\u200f
-FormatData/ar_LY/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_LY/NumberPatterns/1='\u062f.\u0644.\u200f' #,##0.###;'\u062f.\u0644.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_LY/NumberPatterns/2=#,##0%
-FormatData/ar_LY/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LY/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LY/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LY/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LY/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LY/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LY/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_LY/firstDayOfWeek=7
-CalendarData/ar_LY/minimalDaysInFirstWeek=1
-FormatData/ar_LY/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_LY/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_LY/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_LY/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_LY/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_LY/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_LY/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_LY/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_LY/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_LY/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_LY/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_LY/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_LY/MonthAbbreviations/12=
-FormatData/ar_LY/Eras/0=\u0642.\u0645
-FormatData/ar_LY/Eras/1=\u0645
-FormatData/ar_LY/DayAbbreviations/0=\u062d
-FormatData/ar_LY/DayAbbreviations/1=\u0646
-FormatData/ar_LY/DayAbbreviations/2=\u062b
-FormatData/ar_LY/DayAbbreviations/3=\u0631
-FormatData/ar_LY/DayAbbreviations/4=\u062e
-FormatData/ar_LY/DayAbbreviations/5=\u062c
-FormatData/ar_LY/DayAbbreviations/6=\u0633
-LocaleNames/ar_LY/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_LY/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_LY/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_LY/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_LY/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_LY/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_LY/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_LY/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_LY/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_LY/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_LY/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_LY/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_LY/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_LY/MonthNames/12=
-FormatData/ar_LY/AmPmMarkers/0=\u0635
-FormatData/ar_LY/AmPmMarkers/1=\u0645
-FormatData/ar_LY/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_LY/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_LY/TimePatterns/2=hh:mm:ss a
-FormatData/ar_LY/TimePatterns/3=hh:mm a
-FormatData/ar_LY/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_LY/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_LY/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_LY/DatePatterns/3=dd/MM/yy
-FormatData/ar_LY/DateTimePatterns/0={1} {0}
-LocaleNames/ar_LY/EG=\u0645\u0635\u0631
-LocaleNames/ar_LY/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_LY/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_LY/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_LY/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_LY/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_LY/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_LY/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_LY/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_LY/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_LY/QA=\u0642\u0637\u0631
-LocaleNames/ar_LY/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_LY/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_LY/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_LY/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_LY/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_LY/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_LY/NumberElements/0=.
-FormatData/ar_LY/NumberElements/1=,
-FormatData/ar_LY/NumberElements/2=;
-FormatData/ar_LY/NumberElements/3=%
-FormatData/ar_LY/NumberElements/4=0
-FormatData/ar_LY/NumberElements/5=#
-FormatData/ar_LY/NumberElements/6=-
-FormatData/ar_LY/NumberElements/7=E
-FormatData/ar_LY/NumberElements/8=\u2030
-FormatData/ar_LY/NumberElements/9=\u221e
-FormatData/ar_LY/NumberElements/10=\ufffd
-CurrencyNames/ar_MA/MAD=\u062f.\u0645.\u200f
-FormatData/ar_MA/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_MA/NumberPatterns/1='\u062f.\u0645.\u200f' #,##0.###;'\u062f.\u0645.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_MA/NumberPatterns/2=#,##0%
-FormatData/ar_MA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_MA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_MA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_MA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_MA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_MA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_MA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_MA/firstDayOfWeek=7
-CalendarData/ar_MA/minimalDaysInFirstWeek=1
-FormatData/ar_MA/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_MA/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_MA/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_MA/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_MA/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_MA/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_MA/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_MA/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_MA/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_MA/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_MA/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_MA/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_MA/MonthAbbreviations/12=
-FormatData/ar_MA/Eras/0=\u0642.\u0645
-FormatData/ar_MA/Eras/1=\u0645
-FormatData/ar_MA/DayAbbreviations/0=\u062d
-FormatData/ar_MA/DayAbbreviations/1=\u0646
-FormatData/ar_MA/DayAbbreviations/2=\u062b
-FormatData/ar_MA/DayAbbreviations/3=\u0631
-FormatData/ar_MA/DayAbbreviations/4=\u062e
-FormatData/ar_MA/DayAbbreviations/5=\u062c
-FormatData/ar_MA/DayAbbreviations/6=\u0633
-LocaleNames/ar_MA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_MA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_MA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_MA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_MA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_MA/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_MA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_MA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_MA/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_MA/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_MA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_MA/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_MA/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_MA/MonthNames/12=
-FormatData/ar_MA/AmPmMarkers/0=\u0635
-FormatData/ar_MA/AmPmMarkers/1=\u0645
-FormatData/ar_MA/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_MA/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_MA/TimePatterns/2=hh:mm:ss a
-FormatData/ar_MA/TimePatterns/3=hh:mm a
-FormatData/ar_MA/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_MA/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_MA/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_MA/DatePatterns/3=dd/MM/yy
-FormatData/ar_MA/DateTimePatterns/0={1} {0}
-LocaleNames/ar_MA/EG=\u0645\u0635\u0631
-LocaleNames/ar_MA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_MA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_MA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_MA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_MA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_MA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_MA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_MA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_MA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_MA/QA=\u0642\u0637\u0631
-LocaleNames/ar_MA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_MA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_MA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_MA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_MA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_MA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_MA/NumberElements/0=.
-FormatData/ar_MA/NumberElements/1=,
-FormatData/ar_MA/NumberElements/2=;
-FormatData/ar_MA/NumberElements/3=%
-FormatData/ar_MA/NumberElements/4=0
-FormatData/ar_MA/NumberElements/5=#
-FormatData/ar_MA/NumberElements/6=-
-FormatData/ar_MA/NumberElements/7=E
-FormatData/ar_MA/NumberElements/8=\u2030
-FormatData/ar_MA/NumberElements/9=\u221e
-FormatData/ar_MA/NumberElements/10=\ufffd
-CurrencyNames/ar_OM/OMR=\u0631.\u0639.\u200f
-FormatData/ar_OM/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_OM/NumberPatterns/1='\u0631.\u0639.\u200f' #,##0.###;'\u0631.\u0639.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_OM/NumberPatterns/2=#,##0%
-FormatData/ar_OM/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_OM/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_OM/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_OM/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_OM/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_OM/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_OM/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_OM/firstDayOfWeek=7
-CalendarData/ar_OM/minimalDaysInFirstWeek=1
-FormatData/ar_OM/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_OM/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_OM/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_OM/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_OM/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_OM/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_OM/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_OM/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_OM/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_OM/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_OM/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_OM/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_OM/MonthAbbreviations/12=
-FormatData/ar_OM/Eras/0=\u0642.\u0645
-FormatData/ar_OM/Eras/1=\u0645
-FormatData/ar_OM/DayAbbreviations/0=\u062d
-FormatData/ar_OM/DayAbbreviations/1=\u0646
-FormatData/ar_OM/DayAbbreviations/2=\u062b
-FormatData/ar_OM/DayAbbreviations/3=\u0631
-FormatData/ar_OM/DayAbbreviations/4=\u062e
-FormatData/ar_OM/DayAbbreviations/5=\u062c
-FormatData/ar_OM/DayAbbreviations/6=\u0633
-LocaleNames/ar_OM/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_OM/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_OM/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_OM/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_OM/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_OM/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_OM/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_OM/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_OM/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_OM/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_OM/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_OM/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_OM/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_OM/MonthNames/12=
-FormatData/ar_OM/AmPmMarkers/0=\u0635
-FormatData/ar_OM/AmPmMarkers/1=\u0645
-FormatData/ar_OM/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_OM/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_OM/TimePatterns/2=hh:mm:ss a
-FormatData/ar_OM/TimePatterns/3=hh:mm a
-FormatData/ar_OM/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_OM/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_OM/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_OM/DatePatterns/3=dd/MM/yy
-FormatData/ar_OM/DateTimePatterns/0={1} {0}
-LocaleNames/ar_OM/EG=\u0645\u0635\u0631
-LocaleNames/ar_OM/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_OM/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_OM/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_OM/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_OM/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_OM/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_OM/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_OM/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_OM/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_OM/QA=\u0642\u0637\u0631
-LocaleNames/ar_OM/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_OM/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_OM/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_OM/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_OM/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_OM/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_OM/NumberElements/0=.
-FormatData/ar_OM/NumberElements/1=,
-FormatData/ar_OM/NumberElements/2=;
-FormatData/ar_OM/NumberElements/3=%
-FormatData/ar_OM/NumberElements/4=0
-FormatData/ar_OM/NumberElements/5=#
-FormatData/ar_OM/NumberElements/6=-
-FormatData/ar_OM/NumberElements/7=E
-FormatData/ar_OM/NumberElements/8=\u2030
-FormatData/ar_OM/NumberElements/9=\u221e
-FormatData/ar_OM/NumberElements/10=\ufffd
-CurrencyNames/ar_QA/QAR=\u0631.\u0642.\u200f
-FormatData/ar_QA/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_QA/NumberPatterns/1='\u0631.\u0642.\u200f' #,##0.###;'\u0631.\u0642.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_QA/NumberPatterns/2=#,##0%
-FormatData/ar_QA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_QA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_QA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_QA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_QA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_QA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_QA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_QA/firstDayOfWeek=7
-CalendarData/ar_QA/minimalDaysInFirstWeek=1
-FormatData/ar_QA/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_QA/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_QA/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_QA/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_QA/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_QA/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_QA/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_QA/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_QA/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_QA/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_QA/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_QA/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_QA/MonthAbbreviations/12=
-FormatData/ar_QA/Eras/0=\u0642.\u0645
-FormatData/ar_QA/Eras/1=\u0645
-FormatData/ar_QA/DayAbbreviations/0=\u062d
-FormatData/ar_QA/DayAbbreviations/1=\u0646
-FormatData/ar_QA/DayAbbreviations/2=\u062b
-FormatData/ar_QA/DayAbbreviations/3=\u0631
-FormatData/ar_QA/DayAbbreviations/4=\u062e
-FormatData/ar_QA/DayAbbreviations/5=\u062c
-FormatData/ar_QA/DayAbbreviations/6=\u0633
-LocaleNames/ar_QA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_QA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_QA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_QA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_QA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_QA/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_QA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_QA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_QA/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_QA/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_QA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_QA/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_QA/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_QA/MonthNames/12=
-FormatData/ar_QA/AmPmMarkers/0=\u0635
-FormatData/ar_QA/AmPmMarkers/1=\u0645
-FormatData/ar_QA/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_QA/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_QA/TimePatterns/2=hh:mm:ss a
-FormatData/ar_QA/TimePatterns/3=hh:mm a
-FormatData/ar_QA/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_QA/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_QA/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_QA/DatePatterns/3=dd/MM/yy
-FormatData/ar_QA/DateTimePatterns/0={1} {0}
-LocaleNames/ar_QA/EG=\u0645\u0635\u0631
-LocaleNames/ar_QA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_QA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_QA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_QA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_QA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_QA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_QA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_QA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_QA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_QA/QA=\u0642\u0637\u0631
-LocaleNames/ar_QA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_QA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_QA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_QA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_QA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_QA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_QA/NumberElements/0=.
-FormatData/ar_QA/NumberElements/1=,
-FormatData/ar_QA/NumberElements/2=;
-FormatData/ar_QA/NumberElements/3=%
-FormatData/ar_QA/NumberElements/4=0
-FormatData/ar_QA/NumberElements/5=#
-FormatData/ar_QA/NumberElements/6=-
-FormatData/ar_QA/NumberElements/7=E
-FormatData/ar_QA/NumberElements/8=\u2030
-FormatData/ar_QA/NumberElements/9=\u221e
-FormatData/ar_QA/NumberElements/10=\ufffd
-CurrencyNames/ar_SA/SAR=\u0631.\u0633.\u200f
-FormatData/ar_SA/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_SA/NumberPatterns/1='\u0631.\u0633.\u200f' #,##0.###;'\u0631.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_SA/NumberPatterns/2=#,##0%
-FormatData/ar_SA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_SA/firstDayOfWeek=7
-CalendarData/ar_SA/minimalDaysInFirstWeek=1
-FormatData/ar_SA/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_SA/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_SA/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_SA/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_SA/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_SA/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_SA/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_SA/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_SA/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_SA/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_SA/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_SA/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_SA/MonthAbbreviations/12=
-FormatData/ar_SA/Eras/0=\u0642.\u0645
-FormatData/ar_SA/Eras/1=\u0645
-FormatData/ar_SA/DayAbbreviations/0=\u062d
-FormatData/ar_SA/DayAbbreviations/1=\u0646
-FormatData/ar_SA/DayAbbreviations/2=\u062b
-FormatData/ar_SA/DayAbbreviations/3=\u0631
-FormatData/ar_SA/DayAbbreviations/4=\u062e
-FormatData/ar_SA/DayAbbreviations/5=\u062c
-FormatData/ar_SA/DayAbbreviations/6=\u0633
-LocaleNames/ar_SA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SA/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SA/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SA/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SA/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SA/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_SA/MonthNames/12=
-FormatData/ar_SA/AmPmMarkers/0=\u0635
-FormatData/ar_SA/AmPmMarkers/1=\u0645
-FormatData/ar_SA/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_SA/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_SA/TimePatterns/2=hh:mm:ss a
-FormatData/ar_SA/TimePatterns/3=hh:mm a
-FormatData/ar_SA/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_SA/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_SA/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_SA/DatePatterns/3=dd/MM/yy
-FormatData/ar_SA/DateTimePatterns/0={1} {0}
-LocaleNames/ar_SA/EG=\u0645\u0635\u0631
-LocaleNames/ar_SA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SA/QA=\u0642\u0637\u0631
-LocaleNames/ar_SA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SA/NumberElements/0=.
-FormatData/ar_SA/NumberElements/1=,
-FormatData/ar_SA/NumberElements/2=;
-FormatData/ar_SA/NumberElements/3=%
-FormatData/ar_SA/NumberElements/4=0
-FormatData/ar_SA/NumberElements/5=#
-FormatData/ar_SA/NumberElements/6=-
-FormatData/ar_SA/NumberElements/7=E
-FormatData/ar_SA/NumberElements/8=\u2030
-FormatData/ar_SA/NumberElements/9=\u221e
-FormatData/ar_SA/NumberElements/10=\ufffd
-# changed for 4945388, removed for 6531591, see bellow
-# CurrencyNames/ar_SD/SDD=\u062c.\u0633.\u200f
-FormatData/ar_SD/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_SD/NumberPatterns/1='\u062c.\u0633.\u200f' #,##0.###;'\u062c.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_SD/NumberPatterns/2=#,##0%
-FormatData/ar_SD/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SD/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SD/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SD/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SD/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SD/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SD/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_SD/firstDayOfWeek=7
-CalendarData/ar_SD/minimalDaysInFirstWeek=1
-FormatData/ar_SD/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_SD/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_SD/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_SD/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_SD/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_SD/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_SD/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_SD/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_SD/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_SD/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_SD/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_SD/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_SD/MonthAbbreviations/12=
-FormatData/ar_SD/Eras/0=\u0642.\u0645
-FormatData/ar_SD/Eras/1=\u0645
-FormatData/ar_SD/DayAbbreviations/0=\u062d
-FormatData/ar_SD/DayAbbreviations/1=\u0646
-FormatData/ar_SD/DayAbbreviations/2=\u062b
-FormatData/ar_SD/DayAbbreviations/3=\u0631
-FormatData/ar_SD/DayAbbreviations/4=\u062e
-FormatData/ar_SD/DayAbbreviations/5=\u062c
-FormatData/ar_SD/DayAbbreviations/6=\u0633
-LocaleNames/ar_SD/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SD/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SD/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SD/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SD/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SD/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SD/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SD/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SD/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SD/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SD/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SD/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SD/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_SD/MonthNames/12=
-FormatData/ar_SD/AmPmMarkers/0=\u0635
-FormatData/ar_SD/AmPmMarkers/1=\u0645
-FormatData/ar_SD/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_SD/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_SD/TimePatterns/2=hh:mm:ss a
-FormatData/ar_SD/TimePatterns/3=hh:mm a
-FormatData/ar_SD/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_SD/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_SD/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_SD/DatePatterns/3=dd/MM/yy
-FormatData/ar_SD/DateTimePatterns/0={1} {0}
-LocaleNames/ar_SD/EG=\u0645\u0635\u0631
-LocaleNames/ar_SD/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SD/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SD/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SD/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SD/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SD/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SD/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SD/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SD/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SD/QA=\u0642\u0637\u0631
-LocaleNames/ar_SD/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SD/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SD/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SD/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SD/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SD/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SD/NumberElements/0=.
-FormatData/ar_SD/NumberElements/1=,
-FormatData/ar_SD/NumberElements/2=;
-FormatData/ar_SD/NumberElements/3=%
-FormatData/ar_SD/NumberElements/4=0
-FormatData/ar_SD/NumberElements/5=#
-FormatData/ar_SD/NumberElements/6=-
-FormatData/ar_SD/NumberElements/7=E
-FormatData/ar_SD/NumberElements/8=\u2030
-FormatData/ar_SD/NumberElements/9=\u221e
-FormatData/ar_SD/NumberElements/10=\ufffd
-FormatData/ar_SY/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_SY/NumberPatterns/1='\u0644.\u0633.\u200f' #,##0.###;'\u0644.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_SY/NumberPatterns/2=#,##0%
-CurrencyNames/ar_SY/SYP=\u0644.\u0633.\u200f
-FormatData/ar_SY/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SY/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SY/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SY/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SY/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SY/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SY/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_SY/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_SY/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_SY/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_SY/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_SY/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_SY/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_SY/MonthNames/7=\u0622\u0628
-FormatData/ar_SY/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_SY/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthNames/12=
-FormatData/ar_SY/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_SY/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_SY/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_SY/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_SY/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_SY/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_SY/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_SY/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_SY/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthAbbreviations/12=
-FormatData/ar_SY/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SY/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SY/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SY/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SY/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SY/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SY/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_SY/firstDayOfWeek=7
-CalendarData/ar_SY/minimalDaysInFirstWeek=1
-FormatData/ar_SY/Eras/0=\u0642.\u0645
-FormatData/ar_SY/Eras/1=\u0645
-LocaleNames/ar_SY/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SY/AmPmMarkers/0=\u0635
-FormatData/ar_SY/AmPmMarkers/1=\u0645
-FormatData/ar_SY/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_SY/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_SY/TimePatterns/2=hh:mm:ss a
-FormatData/ar_SY/TimePatterns/3=hh:mm a
-FormatData/ar_SY/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_SY/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_SY/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_SY/DatePatterns/3=dd/MM/yy
-FormatData/ar_SY/DateTimePatterns/0={1} {0}
-LocaleNames/ar_SY/EG=\u0645\u0635\u0631
-LocaleNames/ar_SY/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SY/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SY/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SY/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SY/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SY/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SY/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SY/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SY/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SY/QA=\u0642\u0637\u0631
-LocaleNames/ar_SY/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SY/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SY/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SY/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SY/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SY/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SY/NumberElements/0=.
-FormatData/ar_SY/NumberElements/1=,
-FormatData/ar_SY/NumberElements/2=;
-FormatData/ar_SY/NumberElements/3=%
-FormatData/ar_SY/NumberElements/4=0
-FormatData/ar_SY/NumberElements/5=#
-FormatData/ar_SY/NumberElements/6=-
-FormatData/ar_SY/NumberElements/7=E
-FormatData/ar_SY/NumberElements/8=\u2030
-FormatData/ar_SY/NumberElements/9=\u221e
-FormatData/ar_SY/NumberElements/10=\ufffd
-CurrencyNames/ar_TN/TND=\u062f.\u062a.\u200f
-FormatData/ar_TN/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_TN/NumberPatterns/1='\u062f.\u062a.\u200f' #,##0.###;'\u062f.\u062a.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_TN/NumberPatterns/2=#,##0%
-FormatData/ar_TN/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_TN/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_TN/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_TN/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_TN/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_TN/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_TN/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_TN/firstDayOfWeek=7
-CalendarData/ar_TN/minimalDaysInFirstWeek=1
-FormatData/ar_TN/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_TN/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_TN/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_TN/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_TN/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_TN/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_TN/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_TN/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_TN/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_TN/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_TN/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_TN/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_TN/MonthAbbreviations/12=
-FormatData/ar_TN/Eras/0=\u0642.\u0645
-FormatData/ar_TN/Eras/1=\u0645
-FormatData/ar_TN/DayAbbreviations/0=\u062d
-FormatData/ar_TN/DayAbbreviations/1=\u0646
-FormatData/ar_TN/DayAbbreviations/2=\u062b
-FormatData/ar_TN/DayAbbreviations/3=\u0631
-FormatData/ar_TN/DayAbbreviations/4=\u062e
-FormatData/ar_TN/DayAbbreviations/5=\u062c
-FormatData/ar_TN/DayAbbreviations/6=\u0633
-LocaleNames/ar_TN/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_TN/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_TN/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_TN/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_TN/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_TN/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_TN/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_TN/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_TN/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_TN/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_TN/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_TN/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_TN/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_TN/MonthNames/12=
-FormatData/ar_TN/AmPmMarkers/0=\u0635
-FormatData/ar_TN/AmPmMarkers/1=\u0645
-FormatData/ar_TN/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_TN/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_TN/TimePatterns/2=hh:mm:ss a
-FormatData/ar_TN/TimePatterns/3=hh:mm a
-FormatData/ar_TN/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_TN/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_TN/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_TN/DatePatterns/3=dd/MM/yy
-FormatData/ar_TN/DateTimePatterns/0={1} {0}
-LocaleNames/ar_TN/EG=\u0645\u0635\u0631
-LocaleNames/ar_TN/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_TN/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_TN/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_TN/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_TN/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_TN/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_TN/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_TN/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_TN/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_TN/QA=\u0642\u0637\u0631
-LocaleNames/ar_TN/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_TN/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_TN/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_TN/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_TN/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_TN/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_TN/NumberElements/0=.
-FormatData/ar_TN/NumberElements/1=,
-FormatData/ar_TN/NumberElements/2=;
-FormatData/ar_TN/NumberElements/3=%
-FormatData/ar_TN/NumberElements/4=0
-FormatData/ar_TN/NumberElements/5=#
-FormatData/ar_TN/NumberElements/6=-
-FormatData/ar_TN/NumberElements/7=E
-FormatData/ar_TN/NumberElements/8=\u2030
-FormatData/ar_TN/NumberElements/9=\u221e
-FormatData/ar_TN/NumberElements/10=\ufffd
-CurrencyNames/ar_YE/YER=\u0631.\u064a.\u200f
-FormatData/ar_YE/NumberPatterns/0=#,##0.###;#,##0.###-
-# FormatData/ar_YE/NumberPatterns/1='\u0631.\u064a.\u200f' #,##0.###;'\u0631.\u064a.\u200f' #,##0.###- # Changed; see bug 4122840
-FormatData/ar_YE/NumberPatterns/2=#,##0%
-FormatData/ar_YE/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_YE/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_YE/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_YE/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_YE/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_YE/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_YE/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-CalendarData/ar_YE/firstDayOfWeek=7
-CalendarData/ar_YE/minimalDaysInFirstWeek=1
-FormatData/ar_YE/MonthAbbreviations/0=\u064a\u0646\u0627
-FormatData/ar_YE/MonthAbbreviations/1=\u0641\u0628\u0631
-FormatData/ar_YE/MonthAbbreviations/2=\u0645\u0627\u0631
-FormatData/ar_YE/MonthAbbreviations/3=\u0623\u0628\u0631
-FormatData/ar_YE/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_YE/MonthAbbreviations/5=\u064a\u0648\u0646
-FormatData/ar_YE/MonthAbbreviations/6=\u064a\u0648\u0644
-FormatData/ar_YE/MonthAbbreviations/7=\u0623\u063a\u0633
-FormatData/ar_YE/MonthAbbreviations/8=\u0633\u0628\u062a
-FormatData/ar_YE/MonthAbbreviations/9=\u0623\u0643\u062a
-FormatData/ar_YE/MonthAbbreviations/10=\u0646\u0648\u0641
-FormatData/ar_YE/MonthAbbreviations/11=\u062f\u064a\u0633
-FormatData/ar_YE/MonthAbbreviations/12=
-FormatData/ar_YE/Eras/0=\u0642.\u0645
-FormatData/ar_YE/Eras/1=\u0645
-FormatData/ar_YE/DayAbbreviations/0=\u062d
-FormatData/ar_YE/DayAbbreviations/1=\u0646
-FormatData/ar_YE/DayAbbreviations/2=\u062b
-FormatData/ar_YE/DayAbbreviations/3=\u0631
-FormatData/ar_YE/DayAbbreviations/4=\u062e
-FormatData/ar_YE/DayAbbreviations/5=\u062c
-FormatData/ar_YE/DayAbbreviations/6=\u0633
-LocaleNames/ar_YE/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_YE/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_YE/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_YE/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_YE/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_YE/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_YE/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_YE/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_YE/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_YE/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_YE/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_YE/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_YE/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
-FormatData/ar_YE/MonthNames/12=
-FormatData/ar_YE/AmPmMarkers/0=\u0635
-FormatData/ar_YE/AmPmMarkers/1=\u0645
-FormatData/ar_YE/TimePatterns/0=z hh:mm:ss a
-FormatData/ar_YE/TimePatterns/1=z hh:mm:ss a
-FormatData/ar_YE/TimePatterns/2=hh:mm:ss a
-FormatData/ar_YE/TimePatterns/3=hh:mm a
-FormatData/ar_YE/DatePatterns/0=dd MMMM, yyyy
-FormatData/ar_YE/DatePatterns/1=dd MMMM, yyyy
-FormatData/ar_YE/DatePatterns/2=dd/MM/yyyy
-FormatData/ar_YE/DatePatterns/3=dd/MM/yy
-FormatData/ar_YE/DateTimePatterns/0={1} {0}
-LocaleNames/ar_YE/EG=\u0645\u0635\u0631
-LocaleNames/ar_YE/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_YE/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_YE/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_YE/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_YE/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_YE/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_YE/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_YE/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_YE/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_YE/QA=\u0642\u0637\u0631
-LocaleNames/ar_YE/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_YE/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_YE/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_YE/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_YE/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_YE/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_YE/NumberElements/0=.
-FormatData/ar_YE/NumberElements/1=,
-FormatData/ar_YE/NumberElements/2=;
-FormatData/ar_YE/NumberElements/3=%
-FormatData/ar_YE/NumberElements/4=0
-FormatData/ar_YE/NumberElements/5=#
-FormatData/ar_YE/NumberElements/6=-
-FormatData/ar_YE/NumberElements/7=E
-FormatData/ar_YE/NumberElements/8=\u2030
-FormatData/ar_YE/NumberElements/9=\u221e
-FormatData/ar_YE/NumberElements/10=\ufffd
-
-# bug #4113654 (this is obviously not an exhaustive test; I'm trying it here for a single
-# inheritance chain only.  This bug fix also gets tested fairly well by the tests for all
-# the other bugs as given above)
-FormatData//NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData//NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00 # Changed; see bug 4122840
-FormatData//NumberPatterns/2=#,##0%
-FormatData/fr/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/fr/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00 # Changed; see bug 4122840
-# FormatData/fr/NumberPatterns/2=#,##0% # changed, see bug 6547501
-CurrencyNames/fr_FR/FRF=F
-CurrencyNames/fr_FR/EUR=\u20ac
-FormatData/fr_FR/NumberPatterns/0=#,##0.###;-#,##0.###
-# FormatData/fr_FR/NumberPatterns/1=#,##0.00 F;-#,##0.00 F # Changed; see bug 4122840
-# FormatData/fr_FR/NumberPatterns/2=#,##0% # changed; see bug 6547501
-FormatData/fr_FR/DayNames/0=dimanche
-FormatData/fr_FR/DayNames/1=lundi
-FormatData/fr_FR/DayNames/2=mardi
-FormatData/fr_FR/DayNames/3=mercredi
-FormatData/fr_FR/DayNames/4=jeudi
-FormatData/fr_FR/DayNames/5=vendredi
-FormatData/fr_FR/DayNames/6=samedi
-FormatData/fr_FR/MonthNames/0=janvier
-FormatData/fr_FR/MonthNames/1=f\u00e9vrier
-FormatData/fr_FR/MonthNames/2=mars
-FormatData/fr_FR/MonthNames/3=avril
-FormatData/fr_FR/MonthNames/4=mai
-FormatData/fr_FR/MonthNames/5=juin
-FormatData/fr_FR/MonthNames/6=juillet
-FormatData/fr_FR/MonthNames/7=ao\u00fbt
-FormatData/fr_FR/MonthNames/8=septembre
-FormatData/fr_FR/MonthNames/9=octobre
-FormatData/fr_FR/MonthNames/10=novembre
-FormatData/fr_FR/MonthNames/11=d\u00e9cembre
-FormatData/fr_FR/MonthNames/12=
-LocaleNames/fr_FR/fr=fran\u00e7ais
-LocaleNames/fr_FR/en=anglais
-LocaleNames/fr_FR/de=allemand
-LocaleNames/fr_FR/da=danois
-LocaleNames/fr_FR/es=espagnol
-LocaleNames/fr_FR/el=grec
-LocaleNames/fr_FR/fi=finnois
-LocaleNames/fr_FR/it=italien
-LocaleNames/fr_FR/ja=japonais
-#bug 4965260
-LocaleNames/fr_FR/nl=n\u00e9erlandais
-LocaleNames/fr_FR/no=norv\u00e9gien
-LocaleNames/fr_FR/pt=portugais
-LocaleNames/fr_FR/sv=su\u00e9dois
-LocaleNames/fr_FR/tr=turc
-FormatData/fr_FR/TimePatterns/0=HH' h 'mm z
-FormatData/fr_FR/TimePatterns/1=HH:mm:ss z
-FormatData/fr_FR/TimePatterns/2=HH:mm:ss
-FormatData/fr_FR/TimePatterns/3=HH:mm
-FormatData/fr_FR/DatePatterns/0=EEEE d MMMM yyyy
-FormatData/fr_FR/DatePatterns/1=d MMMM yyyy
-FormatData/fr_FR/DatePatterns/2=d MMM yyyy
-FormatData/fr_FR/DatePatterns/3=dd/MM/yy
-FormatData/fr_FR/DateTimePatterns/0={1} {0}
-FormatData/fr_FR/NumberElements/0=,
-FormatData/fr_FR/NumberElements/1=\u00a0
-FormatData/fr_FR/NumberElements/2=;
-FormatData/fr_FR/NumberElements/3=%
-FormatData/fr_FR/NumberElements/4=0
-FormatData/fr_FR/NumberElements/5=#
-FormatData/fr_FR/NumberElements/6=-
-FormatData/fr_FR/NumberElements/7=E
-FormatData/fr_FR/NumberElements/8=\u2030
-FormatData/fr_FR/NumberElements/9=\u221e
-FormatData/fr_FR/NumberElements/10=\ufffd
-FormatData/fr_FR/Eras/0=BC
-FormatData/fr_FR/Eras/1=ap. J.-C.
-LocaleNames/fr_FR/FR=France
-LocaleNames/fr_FR/US=\u00c9tats-Unis
-LocaleNames/fr_FR/DK=Danemark
-LocaleNames/fr_FR/DE=Allemagne
-LocaleNames/fr_FR/AT=Autriche
-LocaleNames/fr_FR/GR=Gr\u00e8ce
-LocaleNames/fr_FR/ES=Espagne
-LocaleNames/fr_FR/FI=Finlande
-LocaleNames/fr_FR/IT=Italie
-LocaleNames/fr_FR/CH=Suisse
-LocaleNames/fr_FR/BE=Belgique
-LocaleNames/fr_FR/CA=Canada
-LocaleNames/fr_FR/JP=Japon
-LocaleNames/fr_FR/NL=Pays-Bas
-LocaleNames/fr_FR/NO=Norv\u00e8ge
-LocaleNames/fr_FR/PT=Portugal
-LocaleNames/fr_FR/SE=Su\u00e8de
-LocaleNames/fr_FR/TR=Turquie
-FormatData/fr_FR/DayAbbreviations/0=dim.
-FormatData/fr_FR/DayAbbreviations/1=lun.
-FormatData/fr_FR/DayAbbreviations/2=mar.
-FormatData/fr_FR/DayAbbreviations/3=mer.
-FormatData/fr_FR/DayAbbreviations/4=jeu.
-FormatData/fr_FR/DayAbbreviations/5=ven.
-FormatData/fr_FR/DayAbbreviations/6=sam.
-FormatData/fr_FR/MonthAbbreviations/0=janv.
-FormatData/fr_FR/MonthAbbreviations/1=f\u00e9vr.
-FormatData/fr_FR/MonthAbbreviations/2=mars
-FormatData/fr_FR/MonthAbbreviations/3=avr.
-FormatData/fr_FR/MonthAbbreviations/4=mai
-FormatData/fr_FR/MonthAbbreviations/5=juin
-FormatData/fr_FR/MonthAbbreviations/6=juil.
-FormatData/fr_FR/MonthAbbreviations/7=ao\u00fbt
-FormatData/fr_FR/MonthAbbreviations/8=sept.
-FormatData/fr_FR/MonthAbbreviations/9=oct.
-FormatData/fr_FR/MonthAbbreviations/10=nov.
-FormatData/fr_FR/MonthAbbreviations/11=d\u00e9c.
-FormatData/fr_FR/MonthAbbreviations/12=
-CalendarData/fr_FR/firstDayOfWeek=2
-# next line changed according the 4518811 bug
-CalendarData/fr_FR/minimalDaysInFirstWeek=4
-FormatData/fr_FR/AmPmMarkers/0=AM
-FormatData/fr_FR/AmPmMarkers/1=PM
-
-# bug #4117054
-FormatData/ja_JP/AmPmMarkers/0=\u5348\u524d
-FormatData/ja_JP/AmPmMarkers/1=\u5348\u5f8c
-
-# bug #4122840, 4290801
-FormatData/ar_AE/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_BH/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_DZ/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_EG/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_IQ/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_JO/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_KW/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_LB/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_LY/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_MA/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_OM/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_QA/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_SA/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_SD/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_SY/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_TN/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/ar_YE/NumberPatterns/1=\u00a4 #,##0.###;\u00a4 #,##0.###-
-FormatData/en_AU/NumberPatterns/1=\u00a4#,##0.00;-\u00a4#,##0.00
-FormatData/en_NZ/NumberPatterns/1=\u00a4#,##0.00;-\u00a4#,##0.00
-FormatData/en_ZA/NumberPatterns/1=\u00a4 #,##0.00;\u00a4-#,##0.00
-FormatData/es_AR/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_BO/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_CL/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_CO/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_CR/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_DO/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_EC/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_GT/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_HN/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_MX/NumberPatterns/1=\u00a4#,##0.00;-\u00a4#,##0.00
-FormatData/es_NI/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_PA/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_PE/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_PR/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_PY/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_SV/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_UY/NumberPatterns/1=\u00a4 #,##0.00;(\u00a4#,##0.00)
-FormatData/es_VE/NumberPatterns/1=\u00a4#,##0.00;\u00a4 -#,##0.00
-FormatData/fr_FR/NumberPatterns/1=#,##0.00 \u00a4;-#,##0.00 \u00a4
-FormatData/it_IT/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00
-#FormatData/ja_JP/NumberPatterns/1=\u00a4#,##0.00  #see bug 4175306
-FormatData/ko_KR/NumberPatterns/1=\u00a4#,##0;-\u00a4#,##0
-FormatData/pl_PL/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
-FormatData/pt_BR/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00
-#Changed; see 4936845
-FormatData/ru_RU/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
-FormatData/uk_UA/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
-
-# bug #4122468 # Use common country names
-LocaleNames//CI=C\u00f4te d\u2019Ivoire
-LocaleNames//LY=Libya
-LocaleNames//RU=Russia
-LocaleNames//VN=Vietnam
-
-# bug #4139860
-FormatData/cs/DatePatterns/0=EEEE, d. MMMM yyyy
-FormatData/cs/DatePatterns/1=d. MMMM yyyy
-FormatData/cs/DatePatterns/2=d.M.yyyy
-FormatData/cs/DatePatterns/3=d.M.yy
-FormatData/cs/NumberElements/1=\u00a0
-FormatData/cs_CZ/NumberPatterns/0=#,##0.##;-#,##0.##
-FormatData/cs_CZ/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
-FormatData/cs_CZ/NumberPatterns/2=#,##0%
-
-#bug #4135752
-FormatData/th_TH/NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-CurrencyNames/th_TH/THB=\u0e3f
-
-#bug #4153698
-# TimeZoneNames/zh_HK/zoneStrings/0/1=Hong Kong Standard Time # changed, see bug 4261506
-# TimeZoneNames/zh_HK/zoneStrings/0/2=HKST # changed, see bug 4261506
-LocaleNames/zh/HK=\u4e2d\u56fd\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a
-FormatData/zh_HK/MonthNames/0=\u4e00\u6708
-FormatData/zh_HK/MonthNames/1=\u4e8c\u6708
-FormatData/zh_HK/MonthNames/2=\u4e09\u6708
-FormatData/zh_HK/MonthNames/3=\u56db\u6708
-FormatData/zh_HK/MonthAbbreviations/0=1\u6708
-FormatData/zh_HK/MonthAbbreviations/1=2\u6708
-FormatData/zh_HK/MonthAbbreviations/2=3\u6708
-FormatData/zh_HK/MonthAbbreviations/3=4\u6708
-FormatData/zh_HK/DayNames/0=\u661f\u671f\u65e5
-FormatData/zh_HK/DayNames/1=\u661f\u671f\u4e00
-FormatData/zh_HK/DayNames/2=\u661f\u671f\u4e8c
-FormatData/zh_HK/DayAbbreviations/0=\u65e5
-FormatData/zh_HK/DayAbbreviations/1=\u4e00
-FormatData/zh_HK/DayAbbreviations/2=\u4e8c
-FormatData/zh_HK/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-CurrencyNames/zh_HK/HKD=HK$
-FormatData/zh_HK/TimePatterns/0=ahh'\u6642'mm'\u5206'ss'\u79d2' z
-FormatData/zh_HK/TimePatterns/1=ahh'\u6642'mm'\u5206'ss'\u79d2'
-FormatData/zh_HK/TimePatterns/2=ahh:mm:ss
-FormatData/zh_HK/TimePatterns/3=ah:mm
-FormatData/zh_HK/DatePatterns/0=yyyy'\u5e74'MM'\u6708'dd'\u65e5' EEEE
-FormatData/zh_HK/DatePatterns/1=yyyy'\u5e74'MM'\u6708'dd'\u65e5' EEEE
-FormatData/zh_HK/DatePatterns/2=yyyy'\u5e74'M'\u6708'd'\u65e5'
-FormatData/zh_HK/DatePatterns/3=yy'\u5e74'M'\u6708'd'\u65e5'
-FormatData/zh_HK/DateTimePatterns/0={1} {0}
-
-#bug #4149569
-LocaleNames/tr/TR=T\u00fcrkiye
-
-#bug 4175306
-FormatData/es_ES/NumberPatterns/1=#,##0 \u00a4;-#,##0 \u00a4
-FormatData/ja_JP/NumberPatterns/1=\u00a4#,##0;-\u00a4#,##0
-
-#bug #4215747 - commented out by mfang due to 4900884
-#FormatData/ko/TimePatterns/0=a h'\uc2dc' m'\ubd84' s'\ucd08' z
-#FormatData/ko/TimePatterns/1=a h'\uc2dc' m'\ubd84' s'\ucd08'
-
-#bug 4900884
-FormatData/ko/TimePatterns/0=a h'\uc2dc' mm'\ubd84' ss'\ucd08' z
-FormatData/ko/TimePatterns/1=a h'\uc2dc' mm'\ubd84' ss'\ucd08'
-FormatData/ko/TimePatterns/2=a h:mm:ss
-FormatData/ko/TimePatterns/3=a h:mm
-
-#bug 4209960 Incorrect language display names
-#Updated for bug 4819436 Update language and country data for Locale class
-LocaleNames//fo=Faroese
-LocaleNames//iu=Inuktitut
-LocaleNames//sg=Sango
-LocaleNames//si=Sinhala
-
-#bug 4331446 Localized country and language names for major locales (excerpt only)
-LocaleNames/es/SV=El Salvador
-
-#bug 4261506 (excerpt only)
-TimeZoneNames/en_CA/CTT/1=China Standard Time
-TimeZoneNames/en_CA/CTT/2=CST
-
-#bug nobugid, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u0440\u0443\u0431.
-
-#bug 4826794
-LocaleNames/ru_RU/MM=\u041c\u044c\u044f\u043d\u043c\u0430 (\u0411\u0438\u0440\u043c\u0430)
-
-#bug 4518811
-CalendarData/ca_ES/minimalDaysInFirstWeek=4
-CalendarData/cs_CZ/minimalDaysInFirstWeek=4
-CalendarData/da_DK/minimalDaysInFirstWeek=4
-CalendarData/de_AT/minimalDaysInFirstWeek=4
-CalendarData/el_GR/minimalDaysInFirstWeek=4
-CalendarData/en_IE/minimalDaysInFirstWeek=4
-CalendarData/es_ES/minimalDaysInFirstWeek=4
-CalendarData/et_EE/minimalDaysInFirstWeek=4
-CalendarData/fi_FI/minimalDaysInFirstWeek=4
-CalendarData/is_IS/minimalDaysInFirstWeek=4
-CalendarData/lt_LT/minimalDaysInFirstWeek=4
-CalendarData/pl_PL/minimalDaysInFirstWeek=4
-CalendarData/pt_PT/minimalDaysInFirstWeek=4
-
-#bug 4945388
-CurrencyNames/be_BY/BYR=\u0420\u0443\u0431
-CurrencyNames/bg_BG/BGN=\u043b\u0432.
-
-#bug 4794068
-FormatData/ca_ES/NumberPatterns/0=#,##0.###;-#,##0.###
-
-#bug 5032580
-FormatData/sk/DayNames/0=Nede\u013ea
-FormatData/sk/DayAbbreviations/5=Pi
-
-#bug 5074431
-FormatData/bg/DayNames/4=\u0427\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a
-
-#bug 2121133
-FormatData/sv/NumberElements/1=\u00a0
-
-#bug 6208712
-LocaleNames/zh/tw=\u5951\u7ef4\u8bed
-
-#bug 6277020
-CalendarData/ca_ES/firstDayOfWeek=2
-
-#bug 6277696
-#zh_SG, id, id_ID, en_MT, mt_MT, en_PH, el, el_CY, ms, ms_MY
-#zh_SG
-FormatData/zh_SG/DayAbbreviations/0=\u5468\u65e5
-FormatData/zh_SG/DayAbbreviations/1=\u5468\u4e00
-FormatData/zh_SG/DayAbbreviations/2=\u5468\u4e8c
-FormatData/zh_SG/DayAbbreviations/3=\u5468\u4e09
-FormatData/zh_SG/DayAbbreviations/4=\u5468\u56db
-FormatData/zh_SG/DayAbbreviations/5=\u5468\u4e94
-FormatData/zh_SG/DayAbbreviations/6=\u5468\u516d
-FormatData/zh_SG/NumberPatterns/0=#,##0.###
-FormatData/zh_SG/NumberPatterns/1=\u00a4#,##0.00
-FormatData/zh_SG/NumberPatterns/2=#,##0%
-CurrencyNames/zh_SG/SGD=S$
-FormatData/zh_SG/TimePatterns/0=a hh:mm:ss
-FormatData/zh_SG/TimePatterns/1=a hh:mm:ss
-FormatData/zh_SG/TimePatterns/2=a hh:mm
-FormatData/zh_SG/TimePatterns/3=a hh:mm
-FormatData/zh_SG/DatePatterns/0=dd MMMM yyyy
-FormatData/zh_SG/DatePatterns/1=dd MMM yyyy
-FormatData/zh_SG/DatePatterns/2=dd-MMM-yy
-FormatData/zh_SG/DatePatterns/3=dd/MM/yy
-FormatData/zh_SG/DateTimePatterns/0={1} {0}
-LocaleNames/zh_SG/ae=\u963f\u7ef4\u65af\u5854\u8bed
-LocaleNames/zh_SG/ak=\u963f\u80af\u8bed
-LocaleNames/zh_SG/cr=\u514b\u91cc\u65cf\u8bed
-LocaleNames/zh_SG/cu=\u6559\u4f1a\u65af\u62c9\u592b\u8bed
-LocaleNames/zh_SG/ff=\u5bcc\u62c9\u8bed
-LocaleNames/zh_SG/gv=\u9a6c\u6069\u8bed
-LocaleNames/zh_SG/ig=\u4f0a\u535a\u8bed
-LocaleNames/zh_SG/ii=\u56db\u5ddd\u5f5d\u8bed
-LocaleNames/zh_SG/ko=\u97e9\u8bed
-LocaleNames/zh_SG/kw=\u5eb7\u6c83\u5c14\u8bed
-LocaleNames/zh_SG/lg=\u5362\u5e72\u8fbe\u8bed
-LocaleNames/zh_SG/li=\u6797\u5821\u8bed
-LocaleNames/zh_SG/lu=\u9c81\u5df4\u52a0\u4e39\u52a0\u8bed
-LocaleNames/zh_SG/nd=\u5317\u6069\u5fb7\u8d1d\u52d2\u8bed
-LocaleNames/zh_SG/nr=\u5357\u6069\u5fb7\u8d1d\u52d2\u8bed
-LocaleNames/zh_SG/sc=\u8428\u4e01\u8bed
-LocaleNames/zh_SG/ty=\u5854\u5e0c\u63d0\u8bed
-LocaleNames/zh_SG/AS=\u7f8e\u5c5e\u8428\u6469\u4e9a
-LocaleNames/zh_SG/AU=\u6fb3\u5927\u5229\u4e9a
-LocaleNames/zh_SG/BD=\u5b5f\u52a0\u62c9\u56fd
-LocaleNames/zh_SG/BV=\u5e03\u97e6\u5c9b
-LocaleNames/zh_SG/BZ=\u4f2f\u5229\u5179
-LocaleNames/zh_SG/CZ=\u6377\u514b
-LocaleNames/zh_SG/ER=\u5384\u7acb\u7279\u91cc\u4e9a
-LocaleNames/zh_SG/FK=\u798f\u514b\u5170\u7fa4\u5c9b
-LocaleNames/zh_SG/FM=\u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/GS=\u5357\u4e54\u6cbb\u4e9a\u548c\u5357\u6851\u5a01\u5947\u7fa4\u5c9b
-LocaleNames/zh_SG/GW=\u51e0\u5185\u4e9a\u6bd4\u7ecd
-LocaleNames/zh_SG/HK=\u4e2d\u56fd\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a
-LocaleNames/zh_SG/HM=\u8d6b\u5fb7\u5c9b\u548c\u9ea6\u514b\u5510\u7eb3\u7fa4\u5c9b
-LocaleNames/zh_SG/ID=\u5370\u5ea6\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/KR=\u97e9\u56fd
-LocaleNames/zh_SG/LA=\u8001\u631d
-LocaleNames/zh_SG/MK=\u5317\u9a6c\u5176\u987f
-LocaleNames/zh_SG/MO=\u4e2d\u56fd\u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a
-LocaleNames/zh_SG/MP=\u5317\u9a6c\u91cc\u4e9a\u7eb3\u7fa4\u5c9b
-LocaleNames/zh_SG/NU=\u7ebd\u57c3
-LocaleNames/zh_SG/NZ=\u65b0\u897f\u5170
-LocaleNames/zh_SG/PF=\u6cd5\u5c5e\u6ce2\u5229\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/PM=\u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686\u7fa4\u5c9b
-LocaleNames/zh_SG/PN=\u76ae\u7279\u51ef\u6069\u7fa4\u5c9b
-LocaleNames/zh_SG/PR=\u6ce2\u591a\u9ece\u5404
-LocaleNames/zh_SG/PS=\u5df4\u52d2\u65af\u5766\u9886\u571f
-LocaleNames/zh_SG/RE=\u7559\u5c3c\u6c6a
-LocaleNames/zh_SG/SA=\u6c99\u7279\u963f\u62c9\u4f2f
-LocaleNames/zh_SG/SH=\u5723\u8d6b\u52d2\u62ff
-LocaleNames/zh_SG/SJ=\u65af\u74e6\u5c14\u5df4\u548c\u626c\u9a6c\u5ef6
-LocaleNames/zh_SG/SL=\u585e\u62c9\u5229\u6602
-LocaleNames/zh_SG/TC=\u7279\u514b\u65af\u548c\u51ef\u79d1\u65af\u7fa4\u5c9b
-LocaleNames/zh_SG/TK=\u6258\u514b\u52b3
-LocaleNames/zh_SG/TW=\u53f0\u6e7e
-LocaleNames/zh_SG/UM=\u7f8e\u56fd\u672c\u571f\u5916\u5c0f\u5c9b\u5c7f
-LocaleNames/zh_SG/WF=\u74e6\u5229\u65af\u548c\u5bcc\u56fe\u7eb3
-LocaleNames/zh_SG/WS=\u8428\u6469\u4e9a
-LocaleNames/zh_SG/YT=\u9a6c\u7ea6\u7279
-#en_SG
-FormatData/en_SG/NumberPatterns/0=#,##0.###
-FormatData/en_SG/NumberPatterns/1=\u00a4#,##0.00
-FormatData/en_SG/NumberPatterns/2=#,##0%
-CurrencyNames/en_SG/SGD=$
-LocaleNames/en_SG/kj=Kuanyama
-LocaleNames/en_SG/kl=Kalaallisut
-LocaleNames/en_SG/ny=Nyanja
-LocaleNames/en_SG/oc=Occitan
-LocaleNames/en_SG/os=Ossetic
-LocaleNames/en_SG/pa=Punjabi
-LocaleNames/en_SG/rm=Romansh
-LocaleNames/en_SG/to=Tongan
-LocaleNames/en_SG/CC=Cocos (Keeling) Islands
-LocaleNames/en_SG/CI=C\u00f4te d\u2019Ivoire
-LocaleNames/en_SG/GS=South Georgia & South Sandwich Islands
-LocaleNames/en_SG/HM=Heard & McDonald Islands
-LocaleNames/en_SG/KN=St. Kitts & Nevis
-LocaleNames/en_SG/PM=St. Pierre & Miquelon
-LocaleNames/en_SG/PS=Palestinian Territories
-LocaleNames/en_SG/SJ=Svalbard & Jan Mayen
-LocaleNames/en_SG/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
-LocaleNames/en_SG/TC=Turks & Caicos Islands
-LocaleNames/en_SG/TL=Timor-Leste
-LocaleNames/en_SG/VC=St. Vincent & Grenadines
-LocaleNames/en_SG/WF=Wallis & Futuna
-#in
-FormatData/in/MonthNames/0=Januari
-FormatData/in/MonthNames/1=Februari
-FormatData/in/MonthNames/2=Maret
-FormatData/in/MonthNames/3=April
-FormatData/in/MonthNames/4=Mei
-FormatData/in/MonthNames/5=Juni
-FormatData/in/MonthNames/6=Juli
-FormatData/in/MonthNames/7=Agustus
-FormatData/in/MonthNames/8=September
-FormatData/in/MonthNames/9=Oktober
-FormatData/in/MonthNames/10=November
-FormatData/in/MonthNames/11=Desember
-FormatData/in/MonthNames/12=
-FormatData/in/MonthAbbreviations/0=Jan
-FormatData/in/MonthAbbreviations/1=Feb
-FormatData/in/MonthAbbreviations/2=Mar
-FormatData/in/MonthAbbreviations/3=Apr
-FormatData/in/MonthAbbreviations/4=Mei
-FormatData/in/MonthAbbreviations/5=Jun
-FormatData/in/MonthAbbreviations/6=Jul
-FormatData/in/MonthAbbreviations/7=Agu
-FormatData/in/MonthAbbreviations/8=Sep
-FormatData/in/MonthAbbreviations/9=Okt
-FormatData/in/MonthAbbreviations/10=Nov
-FormatData/in/MonthAbbreviations/11=Des
-FormatData/in/DayNames/0=Minggu
-FormatData/in/DayNames/1=Senin
-FormatData/in/DayNames/2=Selasa
-FormatData/in/DayNames/3=Rabu
-FormatData/in/DayNames/4=Kamis
-FormatData/in/DayNames/5=Jumat
-FormatData/in/DayNames/6=Sabtu
-FormatData/in/DayAbbreviations/0=Min
-FormatData/in/DayAbbreviations/1=Sen
-FormatData/in/DayAbbreviations/2=Sel
-FormatData/in/DayAbbreviations/3=Rab
-FormatData/in/DayAbbreviations/4=Kam
-FormatData/in/DayAbbreviations/5=Jum
-FormatData/in/DayAbbreviations/6=Sab
-FormatData/in/Eras/0=BCE
-FormatData/in/Eras/1=CE
-FormatData/in/NumberPatterns/0=#,##0.###
-FormatData/in/NumberPatterns/1=\u00a4#,##0.00
-FormatData/in/NumberPatterns/2=#,##0%
-FormatData/in/NumberElements/0=,
-FormatData/in/NumberElements/1=.
-FormatData/in/NumberElements/2=;
-FormatData/in/NumberElements/3=%
-FormatData/in/NumberElements/4=0
-FormatData/in/NumberElements/5=#
-FormatData/in/NumberElements/6=-
-FormatData/in/NumberElements/7=E
-FormatData/in/NumberElements/8=\u2030
-FormatData/in/NumberElements/9=\u221e
-FormatData/in/NumberElements/10=NaN
-FormatData/in/TimePatterns/0=HH:mm:ss z
-FormatData/in/TimePatterns/1=HH:mm:ss z
-FormatData/in/TimePatterns/2=HH:mm:ss
-FormatData/in/TimePatterns/3=HH:mm
-FormatData/in/DatePatterns/0=EEEE, yyyy MMMM dd
-FormatData/in/DatePatterns/1=yyyy MMMM d
-FormatData/in/DatePatterns/2=yyyy MMM d
-FormatData/in/DatePatterns/3=yy/MM/dd
-FormatData/in/DateTimePatterns/0={1} {0}
-LocaleNames/in/ab=Abkhaz
-LocaleNames/in/am=Amharik
-LocaleNames/in/ar=Arab
-LocaleNames/in/as=Assam
-LocaleNames/in/av=Avar
-LocaleNames/in/az=Azerbaijani
-LocaleNames/in/be=Belarusia
-LocaleNames/in/bg=Bulgaria
-LocaleNames/in/bn=Bengali
-LocaleNames/in/bo=Tibet
-LocaleNames/in/bs=Bosnia
-LocaleNames/in/co=Korsika
-LocaleNames/in/cs=Cheska
-LocaleNames/in/da=Dansk
-LocaleNames/in/de=Jerman
-LocaleNames/in/el=Yunani
-LocaleNames/in/en=Inggris
-LocaleNames/in/es=Spanyol
-LocaleNames/in/fa=Persia
-LocaleNames/in/fi=Suomi
-LocaleNames/in/fj=Fiji
-LocaleNames/in/fo=Faroe
-LocaleNames/in/fr=Prancis
-LocaleNames/in/fy=Frisia Barat
-LocaleNames/in/ga=Irlandia
-LocaleNames/in/gd=Gaelik Skotlandia
-LocaleNames/in/he=Ibrani
-LocaleNames/in/hr=Kroasia
-LocaleNames/in/hu=Hungaria
-LocaleNames/in/hy=Armenia
-LocaleNames/in/id=Indonesia
-LocaleNames/in/in=Indonesia
-LocaleNames/in/iw=Ibrani
-LocaleNames/in/jv=Jawa
-LocaleNames/in/kj=Kuanyama
-LocaleNames/in/kl=Kalaallisut
-LocaleNames/in/ko=Korea
-LocaleNames/in/ks=Kashmir
-LocaleNames/in/ku=Kurdi
-LocaleNames/in/lb=Luksemburg
-LocaleNames/in/li=Limburgia
-LocaleNames/in/lt=Lituavi
-LocaleNames/in/mg=Malagasi
-LocaleNames/in/mh=Marshall
-LocaleNames/in/my=Burma
-LocaleNames/in/ne=Nepali
-LocaleNames/in/nl=Belanda
-LocaleNames/in/ny=Nyanja
-LocaleNames/in/os=Ossetia
-LocaleNames/in/pa=Punjabi
-LocaleNames/in/ps=Pashto
-LocaleNames/in/pt=Portugis
-LocaleNames/in/rm=Reto-Roman
-LocaleNames/in/su=Sunda
-LocaleNames/in/sv=Swedia
-LocaleNames/in/zh=Tionghoa
-LocaleNames/in/AD=Andorra
-LocaleNames/in/AE=Uni Emirat Arab
-LocaleNames/in/AG=Antigua dan Barbuda
-LocaleNames/in/AN=Antilles Belanda
-LocaleNames/in/AQ=Antarktika
-LocaleNames/in/AS=Samoa Amerika
-LocaleNames/in/BA=Bosnia dan Herzegovina
-LocaleNames/in/BE=Belgia
-LocaleNames/in/BV=Pulau Bouvet
-LocaleNames/in/BY=Belarus
-LocaleNames/in/CA=Kanada
-LocaleNames/in/CC=Kepulauan Cocos (Keeling)
-LocaleNames/in/CD=Kongo - Kinshasa
-LocaleNames/in/CF=Republik Afrika Tengah
-LocaleNames/in/CG=Kongo - Brazzaville
-LocaleNames/in/CH=Swiss
-LocaleNames/in/CI=C\u00f4te d\u2019Ivoire
-LocaleNames/in/CK=Kepulauan Cook
-LocaleNames/in/CL=Cile
-LocaleNames/in/CM=Kamerun
-LocaleNames/in/CN=Tiongkok
-LocaleNames/in/CO=Kolombia
-LocaleNames/in/CR=Kosta Rika
-LocaleNames/in/CU=Kuba
-LocaleNames/in/CV=Tanjung Verde
-LocaleNames/in/CX=Pulau Natal
-LocaleNames/in/CY=Siprus
-LocaleNames/in/CZ=Ceko
-LocaleNames/in/DE=Jerman
-LocaleNames/in/DJ=Jibuti
-LocaleNames/in/DM=Dominika
-LocaleNames/in/DO=Republik Dominika
-LocaleNames/in/EC=Ekuador
-LocaleNames/in/EG=Mesir
-LocaleNames/in/EH=Sahara Barat
-LocaleNames/in/ES=Spanyol
-LocaleNames/in/FI=Finlandia
-LocaleNames/in/FK=Kepulauan Falkland
-LocaleNames/in/FM=Mikronesia
-LocaleNames/in/FO=Kepulauan Faroe
-LocaleNames/in/FR=Prancis
-LocaleNames/in/GB=Inggris Raya
-LocaleNames/in/GF=Guyana Prancis
-LocaleNames/in/GQ=Guinea Ekuatorial
-LocaleNames/in/GR=Yunani
-LocaleNames/in/GS=Georgia Selatan & Kep. Sandwich Selatan
-LocaleNames/in/HK=Hong Kong DAK Tiongkok
-LocaleNames/in/HM=Pulau Heard dan Kepulauan McDonald
-LocaleNames/in/HR=Kroasia
-LocaleNames/in/HU=Hungaria
-LocaleNames/in/IE=Irlandia
-LocaleNames/in/IS=Islandia
-LocaleNames/in/IT=Italia
-LocaleNames/in/JM=Jamaika
-LocaleNames/in/JO=Yordania
-LocaleNames/in/JP=Jepang
-LocaleNames/in/KH=Kamboja
-LocaleNames/in/KM=Komoro
-LocaleNames/in/KN=Saint Kitts dan Nevis
-LocaleNames/in/KP=Korea Utara
-LocaleNames/in/KR=Korea Selatan
-LocaleNames/in/KY=Kepulauan Cayman
-LocaleNames/in/LC=Saint Lucia
-LocaleNames/in/MA=Maroko
-LocaleNames/in/MG=Madagaskar
-LocaleNames/in/MH=Kepulauan Marshall
-LocaleNames/in/MO=Makau DAK Tiongkok
-LocaleNames/in/MP=Kepulauan Mariana Utara
-LocaleNames/in/NC=Kaledonia Baru
-LocaleNames/in/NF=Kepulauan Norfolk
-LocaleNames/in/NO=Norwegia
-LocaleNames/in/NZ=Selandia Baru
-LocaleNames/in/PF=Polinesia Prancis
-LocaleNames/in/PG=Papua Nugini
-LocaleNames/in/PH=Filipina
-LocaleNames/in/PL=Polandia
-LocaleNames/in/PM=Saint Pierre dan Miquelon
-LocaleNames/in/PR=Puerto Riko
-LocaleNames/in/PS=Wilayah Palestina
-LocaleNames/in/PT=Portugal
-LocaleNames/in/RE=R\u00e9union
-LocaleNames/in/RU=Rusia
-LocaleNames/in/SA=Arab Saudi
-LocaleNames/in/SB=Kepulauan Solomon
-LocaleNames/in/SG=Singapura
-LocaleNames/in/SJ=Kepulauan Svalbard dan Jan Mayen
-LocaleNames/in/ST=Sao Tome dan Principe
-LocaleNames/in/TT=Trinidad dan Tobago
-LocaleNames/in/UA=Ukraina
-LocaleNames/in/US=Amerika Serikat
-LocaleNames/in/VA=Vatikan
-LocaleNames/in/VC=Saint Vincent dan Grenadine
-LocaleNames/in/VG=Kepulauan Virgin Britania Raya
-LocaleNames/in/VI=Kepulauan Virgin Amerika Serikat
-LocaleNames/in/WF=Kepulauan Wallis dan Futuna
-LocaleNames/in/YE=Yaman
-LocaleNames/in/ZA=Afrika Selatan
-#in_ID
-FormatData/in_ID/TimePatterns/0=H:mm:ss
-FormatData/in_ID/TimePatterns/1=H:mm:ss
-FormatData/in_ID/TimePatterns/2=H:mm:ss
-FormatData/in_ID/TimePatterns/3=H:mm
-FormatData/in_ID/DatePatterns/0=EEEE dd MMMM yyyy
-FormatData/in_ID/DatePatterns/1=dd MMMM yyyy
-FormatData/in_ID/DatePatterns/2=dd MMM yy
-FormatData/in_ID/DatePatterns/3=dd/MM/yy
-FormatData/in_ID/DateTimePatterns/0={1} {0}
-CurrencyNames/in_ID/IDR/0=Rp
-#en_MT
-FormatData/en_MT/NumberPatterns/0=#,##0.###
-FormatData/en_MT/NumberPatterns/1=\u00a4#,##0.00
-FormatData/en_MT/NumberPatterns/2=#,##0%
-FormatData/en_MT/TimePatterns/0=HH:mm:ss z
-FormatData/en_MT/TimePatterns/1=HH:mm:ss z
-FormatData/en_MT/TimePatterns/2=HH:mm:ss
-FormatData/en_MT/TimePatterns/3=HH:mm
-FormatData/en_MT/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/en_MT/DatePatterns/1=dd MMMM yyyy
-FormatData/en_MT/DatePatterns/2=dd MMM yyyy
-FormatData/en_MT/DatePatterns/3=dd/MM/yyyy
-FormatData/en_MT/DateTimePatterns/0={1} {0}
-CurrencyNames/en_MT/MTL=Lm
-CurrencyNames/en_MT/EUR=\u20ac
-LocaleNames/en_MT/kj=Kuanyama
-LocaleNames/en_MT/kl=Kalaallisut
-LocaleNames/en_MT/ny=Nyanja
-LocaleNames/en_MT/oc=Occitan
-LocaleNames/en_MT/os=Ossetic
-LocaleNames/en_MT/pa=Punjabi
-LocaleNames/en_MT/rm=Romansh
-LocaleNames/en_MT/to=Tongan
-LocaleNames/en_MT/CC=Cocos (Keeling) Islands
-LocaleNames/en_MT/CI=C\u00f4te d\u2019Ivoire
-LocaleNames/en_MT/GS=South Georgia & South Sandwich Islands
-LocaleNames/en_MT/HM=Heard & McDonald Islands
-LocaleNames/en_MT/KN=St. Kitts & Nevis
-LocaleNames/en_MT/PM=St. Pierre & Miquelon
-LocaleNames/en_MT/PS=Palestinian Territories
-LocaleNames/en_MT/SJ=Svalbard & Jan Mayen
-LocaleNames/en_MT/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
-LocaleNames/en_MT/TC=Turks & Caicos Islands
-LocaleNames/en_MT/TL=Timor-Leste
-LocaleNames/en_MT/VC=St. Vincent & Grenadines
-LocaleNames/en_MT/WF=Wallis & Futuna
-#mt_MT
-FormatData/mt_MT/NumberPatterns/0=#,##0.###
-FormatData/mt_MT/NumberPatterns/1=\u00a4#,##0.00
-FormatData/mt_MT/NumberPatterns/2=#,##0%
-CurrencyNames/mt_MT/MTL=Lm
-CurrencyNames/mt_MT/EUR=\u20ac
-#en_PH
-FormatData/en_PH/NumberPatterns/0=#,##0.###
-FormatData/en_PH/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/en_PH/NumberPatterns/2=#,##0%
-FormatData/en_PH/TimePatterns/0=h:mm:ss a z
-FormatData/en_PH/TimePatterns/1=h:mm:ss a z
-FormatData/en_PH/TimePatterns/2=h:mm:ss a
-FormatData/en_PH/TimePatterns/3=h:mm a
-FormatData/en_PH/DatePatterns/0=EEEE, MMMM d, yyyy
-FormatData/en_PH/DatePatterns/1=MMMM d, yyyy
-FormatData/en_PH/DatePatterns/2=MM d, yy
-FormatData/en_PH/DatePatterns/3=M/d/yy
-FormatData/en_PH/DateTimePatterns/0={1} {0}
-LocaleNames/en_PH/kj=Kuanyama
-LocaleNames/en_PH/kl=Kalaallisut
-LocaleNames/en_PH/ny=Nyanja
-LocaleNames/en_PH/oc=Occitan
-LocaleNames/en_PH/os=Ossetic
-LocaleNames/en_PH/pa=Punjabi
-LocaleNames/en_PH/rm=Romansh
-LocaleNames/en_PH/to=Tongan
-LocaleNames/en_PH/CC=Cocos (Keeling) Islands
-LocaleNames/en_PH/CI=C\u00f4te d\u2019Ivoire
-LocaleNames/en_PH/GS=South Georgia & South Sandwich Islands
-LocaleNames/en_PH/HM=Heard & McDonald Islands
-LocaleNames/en_PH/KN=St. Kitts & Nevis
-LocaleNames/en_PH/PM=St. Pierre & Miquelon
-LocaleNames/en_PH/PS=Palestinian Territories
-LocaleNames/en_PH/SJ=Svalbard & Jan Mayen
-LocaleNames/en_PH/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
-#el
-FormatData/el/standalone.MonthNames/0=\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/1=\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/2=\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/3=\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/4=\u039c\u03ac\u03ca\u03bf\u03c2
-FormatData/el/standalone.MonthNames/5=\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/6=\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/7=\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2
-FormatData/el/standalone.MonthNames/8=\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/9=\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/10=\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/11=\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/12=
-FormatData/el/MonthAbbreviations/0=\u0399\u03b1\u03bd
-FormatData/el/MonthAbbreviations/1=\u03a6\u03b5\u03b2
-FormatData/el/MonthAbbreviations/2=\u039c\u03b1\u03c1
-FormatData/el/MonthAbbreviations/3=\u0391\u03c0\u03c1
-FormatData/el/MonthAbbreviations/4=\u039c\u03b1\u03ca
-FormatData/el/MonthAbbreviations/5=\u0399\u03bf\u03c5\u03bd
-FormatData/el/MonthAbbreviations/6=\u0399\u03bf\u03c5\u03bb
-FormatData/el/MonthAbbreviations/7=\u0391\u03c5\u03b3
-FormatData/el/MonthAbbreviations/8=\u03a3\u03b5\u03c0
-FormatData/el/MonthAbbreviations/9=\u039f\u03ba\u03c4
-FormatData/el/MonthAbbreviations/10=\u039d\u03bf\u03b5
-FormatData/el/MonthAbbreviations/11=\u0394\u03b5\u03ba
-FormatData/el/DayNames/0=\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae
-FormatData/el/DayNames/1=\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1
-FormatData/el/DayNames/2=\u03a4\u03c1\u03af\u03c4\u03b7
-FormatData/el/DayNames/3=\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7
-FormatData/el/DayNames/4=\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7
-FormatData/el/DayNames/5=\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae
-FormatData/el/DayNames/6=\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf
-FormatData/el/DayAbbreviations/0=\u039a\u03c5\u03c1
-FormatData/el/DayAbbreviations/1=\u0394\u03b5\u03c5
-FormatData/el/DayAbbreviations/2=\u03a4\u03c1\u03b9
-FormatData/el/DayAbbreviations/3=\u03a4\u03b5\u03c4
-FormatData/el/DayAbbreviations/4=\u03a0\u03b5\u03bc
-FormatData/el/DayAbbreviations/5=\u03a0\u03b1\u03c1
-FormatData/el/DayAbbreviations/6=\u03a3\u03b1\u03b2
-FormatData/el/AmPmMarkers/0=\u03c0\u03bc
-FormatData/el/AmPmMarkers/1=\u03bc\u03bc
-FormatData/el/NumberElements/0=,
-FormatData/el/NumberElements/1=.
-FormatData/el/NumberElements/2=;
-FormatData/el/NumberElements/3=%
-FormatData/el/NumberElements/4=0
-FormatData/el/NumberElements/5=#
-FormatData/el/NumberElements/6=-
-FormatData/el/NumberElements/7=E
-FormatData/el/NumberElements/8=\u2030
-FormatData/el/NumberElements/9=\u221e
-FormatData/el/NumberElements/10=\ufffd
-FormatData/el/TimePatterns/0=h:mm:ss a z
-FormatData/el/TimePatterns/1=h:mm:ss a z
-FormatData/el/TimePatterns/2=h:mm:ss a
-FormatData/el/TimePatterns/3=h:mm a
-FormatData/el/DatePatterns/0=EEEE, d MMMM yyyy
-FormatData/el/DatePatterns/1=d MMMM yyyy
-FormatData/el/DatePatterns/2=d MMM yyyy
-FormatData/el/DatePatterns/3=d/M/yyyy
-FormatData/el/DateTimePatterns/0={1} {0}
-LocaleNames/el/GR=\u0395\u03bb\u03bb\u03ac\u03b4\u03b1
-#el_CY
-#bug 6483191
-FormatData/el_CY/MonthNames/0=\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/1=\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/2=\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/3=\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/4=\u039c\u03ac\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/5=\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/6=\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/7=\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2
-FormatData/el_CY/MonthNames/8=\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/9=\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/10=\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/11=\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el_CY/MonthNames/12=
-FormatData/el_CY/AmPmMarkers/0=\u03a0\u039c
-FormatData/el_CY/AmPmMarkers/1=\u039c\u039c
-FormatData/el_CY/Eras/0=\u03c0.\u03a7.
-FormatData/el_CY/Eras/1=\u03bc.\u03a7.
-FormatData/el_CY/NumberPatterns/0=#,##0.###
-FormatData/el_CY/NumberPatterns/1=\u00a4#,##0.00
-FormatData/el_CY/NumberPatterns/2=#,##0%
-FormatData/el_CY/TimePatterns/0=h:mm:ss a z
-FormatData/el_CY/TimePatterns/1=h:mm:ss a z
-FormatData/el_CY/TimePatterns/2=h:mm:ss a
-FormatData/el_CY/TimePatterns/3=h:mm a
-FormatData/el_CY/DatePatterns/0=EEEE, dd MMMM yyyy
-FormatData/el_CY/DatePatterns/1=dd MMMM yyyy
-FormatData/el_CY/DatePatterns/2=dd MMM yyyy
-FormatData/el_CY/DatePatterns/3=dd/MM/yyyy
-FormatData/el_CY/DateTimePatterns/0={1} {0}
-LocaleNames/el_CY/ar=\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el_CY/be=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/bg=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el_CY/bo=\u0398\u03b9\u03b2\u03b5\u03c4\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el_CY/bs=\u0392\u03bf\u03c3\u03bd\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el_CY/bn=\u0392\u03b5\u03b3\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ca=\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/co=\u039a\u03bf\u03c1\u03c3\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/cs=\u03a4\u03c3\u03b5\u03c7\u03b9\u03ba\u03ac
-LocaleNames/el_CY/cy=\u039f\u03c5\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/da=\u0394\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/de=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/el=\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/en=\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/es=\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/et=\u0395\u03c3\u03b8\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/eu=\u0392\u03b1\u03c3\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fa=\u03a0\u03b5\u03c1\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fi=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fr=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ga=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/gd=\u03a3\u03ba\u03c9\u03c4\u03b9\u03ba\u03ac \u039a\u03b5\u03bb\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/he=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el_CY/hi=\u03a7\u03af\u03bd\u03c4\u03b9
-LocaleNames/el_CY/hr=\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/hu=\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el_CY/hy=\u0391\u03c1\u03bc\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/id=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el_CY/in=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el_CY/is=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/it=\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/iw=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el_CY/ja=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ji=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el_CY/ka=\u0393\u03b5\u03c9\u03c1\u03b3\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el_CY/ko=\u039a\u03bf\u03c1\u03b5\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/la=\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/lt=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/lv=\u039b\u03b5\u03c4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mk=\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mn=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mo=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mt=\u039c\u03b1\u03bb\u03c4\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el_CY/nl=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/no=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/pl=\u03a0\u03bf\u03bb\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/pt=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ro=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ru=\u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sk=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sl=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sq=\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sr=\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sv=\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/th=\u03a4\u03b1\u03ca\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/tr=\u03a4\u03bf\u03c5\u03c1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/uk=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/vi=\u0392\u03b9\u03b5\u03c4\u03bd\u03b1\u03bc\u03b9\u03ba\u03ac
-LocaleNames/el_CY/yi=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el_CY/zh=\u039a\u03b9\u03bd\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el_CY/AD=\u0391\u03bd\u03b4\u03cc\u03c1\u03b1
-LocaleNames/el_CY/AE=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac \u0395\u03bc\u03b9\u03c1\u03ac\u03c4\u03b1
-LocaleNames/el_CY/AF=\u0391\u03c6\u03b3\u03b1\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\u03b1\u03b9 \u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03bf\u03cd\u03bd\u03c4\u03b1
-LocaleNames/el_CY/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
-LocaleNames/el_CY/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el_CY/AN=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03af\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el_CY/AO=\u0391\u03b3\u03ba\u03cc\u03bb\u03b1
-LocaleNames/el_CY/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
-LocaleNames/el_CY/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
-LocaleNames/el_CY/AS=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el_CY/AT=\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1
-LocaleNames/el_CY/AU=\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/AW=\u0391\u03c1\u03bf\u03cd\u03bc\u03c0\u03b1
-LocaleNames/el_CY/AX=\u039d\u03ae\u03c3\u03bf\u03b9 \u038c\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el_CY/AZ=\u0391\u03b6\u03b5\u03c1\u03bc\u03c0\u03b1\u03ca\u03c4\u03b6\u03ac\u03bd
-LocaleNames/el_CY/BA=\u0392\u03bf\u03c3\u03bd\u03af\u03b1 - \u0395\u03c1\u03b6\u03b5\u03b3\u03bf\u03b2\u03af\u03bd\u03b7
-LocaleNames/el_CY/BB=\u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03ad\u03b9\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el_CY/BD=\u039c\u03c0\u03b1\u03bd\u03b3\u03ba\u03bb\u03b1\u03bd\u03c4\u03ad\u03c2
-LocaleNames/el_CY/BE=\u0392\u03ad\u03bb\u03b3\u03b9\u03bf
-LocaleNames/el_CY/BF=\u039c\u03c0\u03bf\u03c5\u03c1\u03ba\u03af\u03bd\u03b1 \u03a6\u03ac\u03c3\u03bf
-LocaleNames/el_CY/BG=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el_CY/BH=\u039c\u03c0\u03b1\u03c7\u03c1\u03ad\u03b9\u03bd
-LocaleNames/el_CY/BI=\u039c\u03c0\u03bf\u03c5\u03c1\u03bf\u03cd\u03bd\u03c4\u03b9
-LocaleNames/el_CY/BJ=\u039c\u03c0\u03b5\u03bd\u03af\u03bd
-LocaleNames/el_CY/BM=\u0392\u03b5\u03c1\u03bc\u03bf\u03cd\u03b4\u03b5\u03c2
-LocaleNames/el_CY/BN=\u039c\u03c0\u03c1\u03bf\u03c5\u03bd\u03ad\u03b9
-LocaleNames/el_CY/BO=\u0392\u03bf\u03bb\u03b9\u03b2\u03af\u03b1
-LocaleNames/el_CY/BR=\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1
-LocaleNames/el_CY/BS=\u039c\u03c0\u03b1\u03c7\u03ac\u03bc\u03b5\u03c2
-LocaleNames/el_CY/BT=\u039c\u03c0\u03bf\u03c5\u03c4\u03ac\u03bd
-LocaleNames/el_CY/BV=\u039d\u03ae\u03c3\u03bf\u03c2 \u039c\u03c0\u03bf\u03c5\u03b2\u03ad
-LocaleNames/el_CY/BW=\u039c\u03c0\u03bf\u03c4\u03c3\u03bf\u03c5\u03ac\u03bd\u03b1
-LocaleNames/el_CY/BY=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el_CY/BZ=\u039c\u03c0\u03b5\u03bb\u03af\u03b6
-LocaleNames/el_CY/CA=\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2
-LocaleNames/el_CY/CC=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03cc\u03ba\u03bf\u03c2 (\u039a\u03af\u03bb\u03b9\u03bd\u03b3\u03ba)
-LocaleNames/el_CY/CD=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039a\u03b9\u03bd\u03c3\u03ac\u03c3\u03b1
-LocaleNames/el_CY/CF=\u039a\u03b5\u03bd\u03c4\u03c1\u03bf\u03b1\u03c6\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/CG=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039c\u03c0\u03c1\u03b1\u03b6\u03b1\u03b2\u03af\u03bb
-LocaleNames/el_CY/CH=\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1
-LocaleNames/el_CY/CI=\u0391\u03ba\u03c4\u03ae \u0395\u03bb\u03b5\u03c6\u03b1\u03bd\u03c4\u03bf\u03c3\u03c4\u03bf\u03cd
-LocaleNames/el_CY/CK=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03bf\u03c5\u03ba
-LocaleNames/el_CY/CL=\u03a7\u03b9\u03bb\u03ae
-LocaleNames/el_CY/CM=\u039a\u03b1\u03bc\u03b5\u03c1\u03bf\u03cd\u03bd
-LocaleNames/el_CY/CN=\u039a\u03af\u03bd\u03b1
-LocaleNames/el_CY/CO=\u039a\u03bf\u03bb\u03bf\u03bc\u03b2\u03af\u03b1
-LocaleNames/el_CY/CR=\u039a\u03cc\u03c3\u03c4\u03b1 \u03a1\u03af\u03ba\u03b1
-LocaleNames/el_CY/CS=\u03a3\u03b5\u03c1\u03b2\u03af\u03b1 \u03ba\u03b1\u03b9 \u039c\u03b1\u03c5\u03c1\u03bf\u03b2\u03bf\u03cd\u03bd\u03b9\u03bf
-LocaleNames/el_CY/CU=\u039a\u03bf\u03cd\u03b2\u03b1
-LocaleNames/el_CY/CV=\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf \u0391\u03ba\u03c1\u03c9\u03c4\u03ae\u03c1\u03b9\u03bf
-LocaleNames/el_CY/CX=\u039d\u03ae\u03c3\u03bf\u03c2 \u03c4\u03c9\u03bd \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03c5\u03b3\u03ad\u03bd\u03bd\u03c9\u03bd
-LocaleNames/el_CY/CY=\u039a\u03cd\u03c0\u03c1\u03bf\u03c2
-LocaleNames/el_CY/CZ=\u03a4\u03c3\u03b5\u03c7\u03af\u03b1
-LocaleNames/el_CY/DE=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/DJ=\u03a4\u03b6\u03b9\u03bc\u03c0\u03bf\u03c5\u03c4\u03af
-LocaleNames/el_CY/DK=\u0394\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/DM=\u039d\u03c4\u03bf\u03bc\u03af\u03bd\u03b9\u03ba\u03b1
-LocaleNames/el_CY/DO=\u0394\u03bf\u03bc\u03b9\u03bd\u03b9\u03ba\u03b1\u03bd\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/DZ=\u0391\u03bb\u03b3\u03b5\u03c1\u03af\u03b1
-LocaleNames/el_CY/EC=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03cc\u03c2
-LocaleNames/el_CY/EE=\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/EG=\u0391\u03af\u03b3\u03c5\u03c0\u03c4\u03bf\u03c2
-LocaleNames/el_CY/EH=\u0394\u03c5\u03c4\u03b9\u03ba\u03ae \u03a3\u03b1\u03c7\u03ac\u03c1\u03b1
-LocaleNames/el_CY/ER=\u0395\u03c1\u03c5\u03b8\u03c1\u03b1\u03af\u03b1
-LocaleNames/el_CY/ES=\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/ET=\u0391\u03b9\u03b8\u03b9\u03bf\u03c0\u03af\u03b1
-LocaleNames/el_CY/FI=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/FJ=\u03a6\u03af\u03c4\u03b6\u03b9
-LocaleNames/el_CY/FK=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03cc\u03ba\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el_CY/FM=\u039c\u03b9\u03ba\u03c1\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/FO=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03b5\u03c1\u03cc\u03b5\u03c2
-LocaleNames/el_CY/FR=\u0393\u03b1\u03bb\u03bb\u03af\u03b1
-LocaleNames/el_CY/GA=\u0393\u03ba\u03b1\u03bc\u03c0\u03cc\u03bd
-LocaleNames/el_CY/GB=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf
-LocaleNames/el_CY/GD=\u0393\u03c1\u03b5\u03bd\u03ac\u03b4\u03b1
-LocaleNames/el_CY/GE=\u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1
-LocaleNames/el_CY/GF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el_CY/GH=\u0393\u03ba\u03ac\u03bd\u03b1
-LocaleNames/el_CY/GI=\u0393\u03b9\u03b2\u03c1\u03b1\u03bb\u03c4\u03ac\u03c1
-LocaleNames/el_CY/GL=\u0393\u03c1\u03bf\u03b9\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/GM=\u0393\u03ba\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/GN=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/GP=\u0393\u03bf\u03c5\u03b1\u03b4\u03b5\u03bb\u03bf\u03cd\u03c0\u03b7
-LocaleNames/el_CY/GQ=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/GS=\u039d\u03ae\u03c3\u03bf\u03b9 \u039d\u03cc\u03c4\u03b9\u03b1 \u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1 \u03ba\u03b1\u03b9 \u039d\u03cc\u03c4\u03b9\u03b5\u03c2 \u03a3\u03ac\u03bd\u03c4\u03bf\u03c5\u03b9\u03c4\u03c2
-LocaleNames/el_CY/GT=\u0393\u03bf\u03c5\u03b1\u03c4\u03b5\u03bc\u03ac\u03bb\u03b1
-LocaleNames/el_CY/GU=\u0393\u03ba\u03bf\u03c5\u03ac\u03bc
-LocaleNames/el_CY/GW=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1 \u039c\u03c0\u03b9\u03c3\u03ac\u03bf\u03c5
-LocaleNames/el_CY/GY=\u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el_CY/HK=\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el_CY/HM=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a7\u03b5\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u039c\u03b1\u03ba\u03bd\u03c4\u03cc\u03bd\u03b1\u03bb\u03bd\u03c4
-LocaleNames/el_CY/HN=\u039f\u03bd\u03b4\u03bf\u03cd\u03c1\u03b1
-LocaleNames/el_CY/HR=\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/HT=\u0391\u03ca\u03c4\u03ae
-LocaleNames/el_CY/HU=\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el_CY/ID=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/IE=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IL=\u0399\u03c3\u03c1\u03b1\u03ae\u03bb
-LocaleNames/el_CY/IN=\u0399\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IO=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7 \u0399\u03bd\u03b4\u03b9\u03ba\u03bf\u03cd \u03a9\u03ba\u03b5\u03b1\u03bd\u03bf\u03cd
-LocaleNames/el_CY/IQ=\u0399\u03c1\u03ac\u03ba
-LocaleNames/el_CY/IR=\u0399\u03c1\u03ac\u03bd
-LocaleNames/el_CY/IS=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IT=\u0399\u03c4\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/JM=\u03a4\u03b6\u03b1\u03bc\u03ac\u03b9\u03ba\u03b1
-LocaleNames/el_CY/JO=\u0399\u03bf\u03c1\u03b4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/JP=\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1
-LocaleNames/el_CY/KE=\u039a\u03ad\u03bd\u03c5\u03b1
-LocaleNames/el_CY/KG=\u039a\u03b9\u03c1\u03b3\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/KH=\u039a\u03b1\u03bc\u03c0\u03cc\u03c4\u03b6\u03b7
-LocaleNames/el_CY/KI=\u039a\u03b9\u03c1\u03b9\u03bc\u03c0\u03ac\u03c4\u03b9
-LocaleNames/el_CY/KM=\u039a\u03bf\u03bc\u03cc\u03c1\u03b5\u03c2
-LocaleNames/el_CY/KN=\u03a3\u03b5\u03bd \u039a\u03b9\u03c4\u03c2 \u03ba\u03b1\u03b9 \u039d\u03ad\u03b2\u03b9\u03c2
-LocaleNames/el_CY/KP=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el_CY/KR=\u039d\u03cc\u03c4\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el_CY/KW=\u039a\u03bf\u03c5\u03b2\u03ad\u03b9\u03c4
-LocaleNames/el_CY/KY=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03ad\u03b9\u03bc\u03b1\u03bd
-LocaleNames/el_CY/KZ=\u039a\u03b1\u03b6\u03b1\u03ba\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/LA=\u039b\u03ac\u03bf\u03c2
-LocaleNames/el_CY/LB=\u039b\u03af\u03b2\u03b1\u03bd\u03bf\u03c2
-LocaleNames/el_CY/LC=\u0391\u03b3\u03af\u03b1 \u039b\u03bf\u03c5\u03ba\u03af\u03b1
-LocaleNames/el_CY/LI=\u039b\u03b9\u03c7\u03c4\u03b5\u03bd\u03c3\u03c4\u03ac\u03b9\u03bd
-LocaleNames/el_CY/LK=\u03a3\u03c1\u03b9 \u039b\u03ac\u03bd\u03ba\u03b1
-LocaleNames/el_CY/LR=\u039b\u03b9\u03b2\u03b5\u03c1\u03af\u03b1
-LocaleNames/el_CY/LS=\u039b\u03b5\u03c3\u03cc\u03c4\u03bf
-LocaleNames/el_CY/LT=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/LU=\u039b\u03bf\u03c5\u03be\u03b5\u03bc\u03b2\u03bf\u03cd\u03c1\u03b3\u03bf
-LocaleNames/el_CY/LV=\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/LY=\u039b\u03b9\u03b2\u03cd\u03b7
-LocaleNames/el_CY/MA=\u039c\u03b1\u03c1\u03cc\u03ba\u03bf
-LocaleNames/el_CY/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
-LocaleNames/el_CY/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
-LocaleNames/el_CY/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
-LocaleNames/el_CY/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el_CY/MK=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/ML=\u039c\u03ac\u03bb\u03b9
-LocaleNames/el_CY/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1 (\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1)
-LocaleNames/el_CY/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
-LocaleNames/el_CY/MO=\u039c\u03b1\u03ba\u03ac\u03bf \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el_CY/MP=\u039d\u03ae\u03c3\u03bf\u03b9 \u0392\u03cc\u03c1\u03b5\u03b9\u03b5\u03c2 \u039c\u03b1\u03c1\u03b9\u03ac\u03bd\u03b5\u03c2
-LocaleNames/el_CY/MQ=\u039c\u03b1\u03c1\u03c4\u03b9\u03bd\u03af\u03ba\u03b1
-LocaleNames/el_CY/MR=\u039c\u03b1\u03c5\u03c1\u03b9\u03c4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/MS=\u039c\u03bf\u03bd\u03c3\u03b5\u03c1\u03ac\u03c4
-LocaleNames/el_CY/MT=\u039c\u03ac\u03bb\u03c4\u03b1
-LocaleNames/el_CY/MU=\u039c\u03b1\u03c5\u03c1\u03af\u03ba\u03b9\u03bf\u03c2
-LocaleNames/el_CY/MV=\u039c\u03b1\u03bb\u03b4\u03af\u03b2\u03b5\u03c2
-LocaleNames/el_CY/MW=\u039c\u03b1\u03bb\u03ac\u03bf\u03c5\u03b9
-LocaleNames/el_CY/MX=\u039c\u03b5\u03be\u03b9\u03ba\u03cc
-LocaleNames/el_CY/MY=\u039c\u03b1\u03bb\u03b1\u03b9\u03c3\u03af\u03b1
-LocaleNames/el_CY/MZ=\u039c\u03bf\u03b6\u03b1\u03bc\u03b2\u03af\u03ba\u03b7
-LocaleNames/el_CY/NA=\u039d\u03b1\u03bc\u03af\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/NC=\u039d\u03ad\u03b1 \u039a\u03b1\u03bb\u03b7\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/NE=\u039d\u03af\u03b3\u03b7\u03c1\u03b1\u03c2
-LocaleNames/el_CY/NF=\u039d\u03ae\u03c3\u03bf\u03c2 \u039d\u03cc\u03c1\u03c6\u03bf\u03bb\u03ba
-LocaleNames/el_CY/NG=\u039d\u03b9\u03b3\u03b7\u03c1\u03af\u03b1
-LocaleNames/el_CY/NI=\u039d\u03b9\u03ba\u03b1\u03c1\u03ac\u03b3\u03bf\u03c5\u03b1
-LocaleNames/el_CY/NL=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/NO=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1
-LocaleNames/el_CY/NP=\u039d\u03b5\u03c0\u03ac\u03bb
-LocaleNames/el_CY/NR=\u039d\u03b1\u03bf\u03c5\u03c1\u03bf\u03cd
-LocaleNames/el_CY/NU=\u039d\u03b9\u03bf\u03cd\u03b5
-LocaleNames/el_CY/NZ=\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/OM=\u039f\u03bc\u03ac\u03bd
-LocaleNames/el_CY/PA=\u03a0\u03b1\u03bd\u03b1\u03bc\u03ac\u03c2
-LocaleNames/el_CY/PE=\u03a0\u03b5\u03c1\u03bf\u03cd
-LocaleNames/el_CY/PF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u03a0\u03bf\u03bb\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/PG=\u03a0\u03b1\u03c0\u03bf\u03cd\u03b1 \u039d\u03ad\u03b1 \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/PH=\u03a6\u03b9\u03bb\u03b9\u03c0\u03c0\u03af\u03bd\u03b5\u03c2
-LocaleNames/el_CY/PK=\u03a0\u03b1\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/PL=\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1
-LocaleNames/el_CY/PM=\u03a3\u03b5\u03bd \u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd
-LocaleNames/el_CY/PN=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a0\u03af\u03c4\u03ba\u03b5\u03c1\u03bd
-LocaleNames/el_CY/PR=\u03a0\u03bf\u03c5\u03ad\u03c1\u03c4\u03bf \u03a1\u03af\u03ba\u03bf
-LocaleNames/el_CY/PS=\u03a0\u03b1\u03bb\u03b1\u03b9\u03c3\u03c4\u03b9\u03bd\u03b9\u03b1\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el_CY/PT=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/PW=\u03a0\u03b1\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el_CY/PY=\u03a0\u03b1\u03c1\u03b1\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el_CY/QA=\u039a\u03b1\u03c4\u03ac\u03c1
-LocaleNames/el_CY/RE=\u03a1\u03b5\u03ca\u03bd\u03b9\u03cc\u03bd
-LocaleNames/el_CY/RO=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/RU=\u03a1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el_CY/RW=\u03a1\u03bf\u03c5\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el_CY/SA=\u03a3\u03b1\u03bf\u03c5\u03b4\u03b9\u03ba\u03ae \u0391\u03c1\u03b1\u03b2\u03af\u03b1
-LocaleNames/el_CY/SB=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a3\u03bf\u03bb\u03bf\u03bc\u03ce\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el_CY/SC=\u03a3\u03b5\u03cb\u03c7\u03ad\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el_CY/SD=\u03a3\u03bf\u03c5\u03b4\u03ac\u03bd
-LocaleNames/el_CY/SE=\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1
-LocaleNames/el_CY/SG=\u03a3\u03b9\u03b3\u03ba\u03b1\u03c0\u03bf\u03cd\u03c1\u03b7
-LocaleNames/el_CY/SH=\u0391\u03b3\u03af\u03b1 \u0395\u03bb\u03ad\u03bd\u03b7
-LocaleNames/el_CY/SI=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1
-LocaleNames/el_CY/SJ=\u03a3\u03b2\u03ac\u03bb\u03bc\u03c0\u03b1\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u0393\u03b9\u03b1\u03bd \u039c\u03b1\u03b3\u03b9\u03ad\u03bd
-LocaleNames/el_CY/SK=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1
-LocaleNames/el_CY/SL=\u03a3\u03b9\u03ad\u03c1\u03b1 \u039b\u03b5\u03cc\u03bd\u03b5
-LocaleNames/el_CY/SM=\u0386\u03b3\u03b9\u03bf\u03c2 \u039c\u03b1\u03c1\u03af\u03bd\u03bf\u03c2
-LocaleNames/el_CY/SN=\u03a3\u03b5\u03bd\u03b5\u03b3\u03ac\u03bb\u03b7
-LocaleNames/el_CY/SO=\u03a3\u03bf\u03bc\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/SR=\u03a3\u03bf\u03c5\u03c1\u03b9\u03bd\u03ac\u03bc
-LocaleNames/el_CY/ST=\u03a3\u03ac\u03bf \u03a4\u03bf\u03bc\u03ad \u03ba\u03b1\u03b9 \u03a0\u03c1\u03af\u03bd\u03c3\u03b9\u03c0\u03b5
-LocaleNames/el_CY/SV=\u0395\u03bb \u03a3\u03b1\u03bb\u03b2\u03b1\u03b4\u03cc\u03c1
-LocaleNames/el_CY/SY=\u03a3\u03c5\u03c1\u03af\u03b1
-LocaleNames/el_CY/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba\u03c2 \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
-LocaleNames/el_CY/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el_CY/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el_CY/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
-LocaleNames/el_CY/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
-LocaleNames/el_CY/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/TK=\u03a4\u03bf\u03ba\u03b5\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el_CY/TL=\u03a4\u03b9\u03bc\u03cc\u03c1-\u039b\u03ad\u03c3\u03c4\u03b5
-LocaleNames/el_CY/TM=\u03a4\u03bf\u03c5\u03c1\u03ba\u03bc\u03b5\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/TN=\u03a4\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/TO=\u03a4\u03cc\u03bd\u03b3\u03ba\u03b1
-LocaleNames/el_CY/TR=\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1
-LocaleNames/el_CY/TT=\u03a4\u03c1\u03b9\u03bd\u03b9\u03bd\u03c4\u03ac\u03bd\u03c4 \u03ba\u03b1\u03b9 \u03a4\u03bf\u03bc\u03c0\u03ac\u03b3\u03ba\u03bf
-LocaleNames/el_CY/TV=\u03a4\u03bf\u03c5\u03b2\u03b1\u03bb\u03bf\u03cd
-LocaleNames/el_CY/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
-LocaleNames/el_CY/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el_CY/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
-LocaleNames/el_CY/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
-LocaleNames/el_CY/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el_CY/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/VA=\u0392\u03b1\u03c4\u03b9\u03ba\u03b1\u03bd\u03cc
-LocaleNames/el_CY/VC=\u0386\u03b3\u03b9\u03bf\u03c2 \u0392\u03b9\u03ba\u03ad\u03bd\u03c4\u03b9\u03bf\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b5\u03bd\u03b1\u03b4\u03af\u03bd\u03b5\u03c2
-LocaleNames/el_CY/VE=\u0392\u03b5\u03bd\u03b5\u03b6\u03bf\u03c5\u03ad\u03bb\u03b1
-LocaleNames/el_CY/VG=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el_CY/VI=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el_CY/VN=\u0392\u03b9\u03b5\u03c4\u03bd\u03ac\u03bc
-LocaleNames/el_CY/VU=\u0392\u03b1\u03bd\u03bf\u03c5\u03ac\u03c4\u03bf\u03c5
-LocaleNames/el_CY/WF=\u0393\u03bf\u03c5\u03ac\u03bb\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03a6\u03bf\u03c5\u03c4\u03bf\u03cd\u03bd\u03b1
-LocaleNames/el_CY/WS=\u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el_CY/YE=\u03a5\u03b5\u03bc\u03ad\u03bd\u03b7
-LocaleNames/el_CY/YT=\u039c\u03b1\u03b3\u03b9\u03cc\u03c4
-LocaleNames/el_CY/ZA=\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae
-LocaleNames/el_CY/ZM=\u0396\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/ZW=\u0396\u03b9\u03bc\u03c0\u03ac\u03bc\u03c0\u03bf\u03c5\u03b5
-CurrencyNames/el_CY/CYP=\u00a3
-CurrencyNames/el_CY/EUR=\u20ac
-CalendarData/el_CY/minimalDaysInFirstWeek=1
-
-#ms_MY and ms
-FormatData/ms_MY/NumberPatterns/0=#,##0.###
-FormatData/ms_MY/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/ms_MY/NumberPatterns/2=#,##0%
-FormatData/ms_MY/TimePatterns/0=h:mm:ss a z
-FormatData/ms_MY/TimePatterns/1=h:mm:ss a z
-FormatData/ms_MY/TimePatterns/2=h:mm:ss a
-FormatData/ms_MY/TimePatterns/3=h:mm
-FormatData/ms_MY/DatePatterns/0=EEEE dd MMM yyyy
-FormatData/ms_MY/DatePatterns/1=dd MMMM yyyy
-FormatData/ms_MY/DatePatterns/2=dd MMMM yyyy
-FormatData/ms_MY/DatePatterns/3=dd/MM/yyyy
-FormatData/ms_MY/DateTimePatterns/0={1} {0}
-CurrencyNames/ms_MY/MYR=RM
-LocaleNames/ms/ms=Melayu
-LocaleNames/ms/AE=Emiriah Arab Bersatu
-LocaleNames/ms/AG=Antigua dan Barbuda
-LocaleNames/ms/BA=Bosnia dan Herzegovina
-LocaleNames/ms/CA=Kanada
-LocaleNames/ms/CC=Kepulauan Cocos (Keeling)
-LocaleNames/ms/CD=Congo - Kinshasa
-LocaleNames/ms/CF=Republik Afrika Tengah
-LocaleNames/ms/CI=Cote d\u2019Ivoire
-LocaleNames/ms/CL=Chile
-LocaleNames/ms/CM=Cameroon
-LocaleNames/ms/CN=China
-LocaleNames/ms/CR=Costa Rica
-LocaleNames/ms/CY=Cyprus
-LocaleNames/ms/CZ=Czechia
-LocaleNames/ms/DE=Jerman
-LocaleNames/ms/DJ=Djibouti
-LocaleNames/ms/DO=Republik Dominica
-LocaleNames/ms/DZ=Algeria
-LocaleNames/ms/EG=Mesir
-LocaleNames/ms/EH=Sahara Barat
-LocaleNames/ms/ES=Sepanyol
-LocaleNames/ms/FR=Perancis
-LocaleNames/ms/GR=Greece
-LocaleNames/ms/GS=Kepulauan Georgia Selatan & Sandwich Selatan
-LocaleNames/ms/GW=Guinea Bissau
-LocaleNames/ms/HK=Hong Kong SAR China
-LocaleNames/ms/HM=Kepulauan Heard & McDonald
-LocaleNames/ms/HU=Hungary
-LocaleNames/ms/IN=India
-LocaleNames/ms/IT=Itali
-LocaleNames/ms/JM=Jamaica
-LocaleNames/ms/JP=Jepun
-LocaleNames/ms/KH=Kemboja
-LocaleNames/ms/KN=Saint Kitts dan Nevis
-LocaleNames/ms/KP=Korea Utara
-LocaleNames/ms/KR=Korea Selatan
-LocaleNames/ms/LB=Lubnan
-LocaleNames/ms/LU=Luxembourg
-LocaleNames/ms/MA=Maghribi
-LocaleNames/ms/MG=Madagaskar
-LocaleNames/ms/MH=Kepulauan Marshall
-LocaleNames/ms/MO=Macau SAR China
-LocaleNames/ms/MV=Maldives
-LocaleNames/ms/MX=Mexico
-LocaleNames/ms/MZ=Mozambique
-LocaleNames/ms/NL=Belanda
-LocaleNames/ms/PH=Filipina
-LocaleNames/ms/PM=Saint Pierre dan Miquelon
-LocaleNames/ms/PS=Wilayah Palestin
-LocaleNames/ms/PT=Portugal
-LocaleNames/ms/RE=Reunion
-LocaleNames/ms/SA=Arab Saudi
-LocaleNames/ms/SB=Kepulauan Solomon
-LocaleNames/ms/SG=Singapura
-LocaleNames/ms/SJ=Svalbard dan Jan Mayen
-LocaleNames/ms/SL=Sierra Leone
-LocaleNames/ms/SR=Surinam
-LocaleNames/ms/ST=Sao Tome dan Principe
-LocaleNames/ms/TC=Kepulauan Turks dan Caicos
-LocaleNames/ms/TD=Chad
-LocaleNames/ms/TJ=Tajikistan
-LocaleNames/ms/TR=Turki
-LocaleNames/ms/TT=Trinidad dan Tobago
-LocaleNames/ms/US=Amerika Syarikat
-LocaleNames/ms/VC=Saint Vincent dan Grenadines
-LocaleNames/ms/WF=Wallis dan Futuna
-LocaleNames/ms/YE=Yaman
-LocaleNames/ms/ZA=Afrika Selatan
-
-# es_US
-FormatData/es_US/Eras/0=a.C.
-FormatData/es_US/Eras/1=d.C.
-FormatData/es_US/NumberPatterns/0=#,##0.###
-FormatData/es_US/NumberPatterns/1=\u00a4#,##0.00;(\u00a4#,##0.00)
-FormatData/es_US/NumberPatterns/2=#,##0%
-FormatData/es_US/TimePatterns/0=h:mm:ss a z
-FormatData/es_US/TimePatterns/1=h:mm:ss a z
-FormatData/es_US/TimePatterns/2=h:mm:ss a
-FormatData/es_US/TimePatterns/3=h:mm a
-FormatData/es_US/DatePatterns/0=EEEE d' de 'MMMM' de 'yyyy
-FormatData/es_US/DatePatterns/1=d' de 'MMMM' de 'yyyy
-FormatData/es_US/DatePatterns/2=MMM d, yyyy
-FormatData/es_US/DatePatterns/3=M/d/yy
-FormatData/es_US/DateTimePatterns/0={1} {0}
-LocaleNames/es_US/aa=afar
-LocaleNames/es_US/ae=av\u00e9stico
-LocaleNames/es_US/ak=akan
-LocaleNames/es_US/an=aragon\u00e9s
-LocaleNames/es_US/av=avar
-LocaleNames/es_US/ay=aimara
-LocaleNames/es_US/az=azerbaiyano
-LocaleNames/es_US/ba=baskir
-LocaleNames/es_US/bh=bihari
-LocaleNames/es_US/bm=bambara
-LocaleNames/es_US/bn=bengal\u00ed
-LocaleNames/es_US/bs=bosnio
-LocaleNames/es_US/ce=checheno
-LocaleNames/es_US/ch=chamorro
-LocaleNames/es_US/cr=cree
-LocaleNames/es_US/cu=eslavo eclesi\u00e1stico
-LocaleNames/es_US/cv=chuvasio
-LocaleNames/es_US/dv=divehi
-LocaleNames/es_US/ee=ew\u00e9
-LocaleNames/es_US/eu=euskera
-LocaleNames/es_US/ff=fula
-LocaleNames/es_US/fo=fero\u00e9s
-LocaleNames/es_US/fy=fris\u00f3n occidental
-LocaleNames/es_US/gu=gurayat\u00ed
-LocaleNames/es_US/gv=man\u00e9s
-LocaleNames/es_US/hi=hindi
-LocaleNames/es_US/ho=hiri motu
-LocaleNames/es_US/ht=criollo haitiano
-LocaleNames/es_US/hz=herero
-LocaleNames/es_US/ie=interlingue
-LocaleNames/es_US/ig=igbo
-LocaleNames/es_US/ii=yi de Sichu\u00e1n
-LocaleNames/es_US/io=ido
-LocaleNames/es_US/jv=javan\u00e9s
-LocaleNames/es_US/kg=kongo
-LocaleNames/es_US/ki=kikuyu
-LocaleNames/es_US/kj=kuanyama
-LocaleNames/es_US/kk=kazajo
-LocaleNames/es_US/km=jemer
-LocaleNames/es_US/kn=canar\u00e9s
-LocaleNames/es_US/kr=kanuri
-LocaleNames/es_US/ks=cachemiro
-LocaleNames/es_US/ku=kurdo
-LocaleNames/es_US/kv=komi
-LocaleNames/es_US/kw=c\u00f3rnico
-LocaleNames/es_US/ky=kirgu\u00eds
-LocaleNames/es_US/lb=luxemburgu\u00e9s
-LocaleNames/es_US/lg=ganda
-LocaleNames/es_US/li=limburgu\u00e9s
-LocaleNames/es_US/lu=luba-katanga
-LocaleNames/es_US/mh=marshal\u00e9s
-LocaleNames/es_US/mr=marat\u00ed
-LocaleNames/es_US/nb=noruego bokmal
-LocaleNames/es_US/nd=ndebele del norte
-LocaleNames/es_US/ng=ndonga
-LocaleNames/es_US/nn=noruego nynorsk
-LocaleNames/es_US/nr=ndebele meridional
-LocaleNames/es_US/nv=navajo
-LocaleNames/es_US/ny=nyanja
-LocaleNames/es_US/oc=occitano
-LocaleNames/es_US/oj=ojibwa
-LocaleNames/es_US/os=os\u00e9tico
-LocaleNames/es_US/pi=pali
-LocaleNames/es_US/rm=romanche
-LocaleNames/es_US/rn=kirundi
-LocaleNames/es_US/rw=kinyarwanda
-LocaleNames/es_US/sc=sardo
-LocaleNames/es_US/sd=sindhi
-LocaleNames/es_US/se=sami del norte
-LocaleNames/es_US/sl=esloveno
-LocaleNames/es_US/sn=shona
-LocaleNames/es_US/ss=siswati
-LocaleNames/es_US/st=sesoto
-LocaleNames/es_US/su=sundan\u00e9s
-LocaleNames/es_US/sw=swahili
-LocaleNames/es_US/tg=tayiko
-LocaleNames/es_US/tn=setchwana
-LocaleNames/es_US/to=tongano
-LocaleNames/es_US/tw=twi
-LocaleNames/es_US/ty=tahitiano
-LocaleNames/es_US/ug=uigur
-LocaleNames/es_US/uk=ucraniano
-LocaleNames/es_US/uz=uzbeko
-LocaleNames/es_US/ve=venda
-LocaleNames/es_US/wa=val\u00f3n
-LocaleNames/es_US/za=zhuang
-LocaleNames/es_US/AN=Antillas Neerlandesas
-LocaleNames/es_US/BA=Bosnia y Herzegovina
-LocaleNames/es_US/CC=Islas Cocos
-LocaleNames/es_US/CX=Isla de Navidad
-LocaleNames/es_US/CZ=Chequia
-LocaleNames/es_US/EH=Sahara Occidental
-LocaleNames/es_US/FK=Islas Malvinas
-LocaleNames/es_US/HK=RAE de Hong Kong (China)
-LocaleNames/es_US/KM=Comoras
-LocaleNames/es_US/LC=Santa Luc\u00eda
-LocaleNames/es_US/LS=Lesoto
-LocaleNames/es_US/MO=RAE de Macao (China)
-LocaleNames/es_US/MW=Malaui
-LocaleNames/es_US/NL=Pa\u00edses Bajos
-LocaleNames/es_US/NU=Niue
-LocaleNames/es_US/PG=Pap\u00faa Nueva Guinea
-LocaleNames/es_US/PK=Pakist\u00e1n
-LocaleNames/es_US/PN=Islas Pitcairn
-LocaleNames/es_US/PS=Territorios Palestinos
-LocaleNames/es_US/PW=Palaos
-LocaleNames/es_US/RO=Ruman\u00eda
-LocaleNames/es_US/SA=Arabia Saud\u00ed
-LocaleNames/es_US/SH=Santa Elena
-LocaleNames/es_US/TF=Territorios Australes Franceses
-LocaleNames/es_US/TK=Tokelau
-LocaleNames/es_US/TT=Trinidad y Tobago
-LocaleNames/es_US/VI=Islas V\u00edrgenes de EE. UU.
-CurrencyNames/es_US/USD=US$
-CalendarData/es_US/firstDayOfWeek=1
-#bug 4400849
-LocaleNames/pt/aa=afar
-LocaleNames/pt/ab=abc\u00e1zio
-LocaleNames/pt/ae=av\u00e9stico
-LocaleNames/pt/af=afric\u00e2ner
-LocaleNames/pt/am=am\u00e1rico
-LocaleNames/pt/an=aragon\u00eas
-LocaleNames/pt/ar=\u00e1rabe
-LocaleNames/pt/as=assam\u00eas
-LocaleNames/pt/av=av\u00e1rico
-LocaleNames/pt/ay=aimar\u00e1
-LocaleNames/pt/az=azerbaijano
-LocaleNames/pt/ba=bashkir
-LocaleNames/pt/be=bielorrusso
-LocaleNames/pt/bg=b\u00falgaro
-LocaleNames/pt/bh=biari
-LocaleNames/pt/bi=bislam\u00e1
-LocaleNames/pt/bm=bambara
-LocaleNames/pt/bn=bengali
-LocaleNames/pt/bo=tibetano
-LocaleNames/pt/br=bret\u00e3o
-LocaleNames/pt/bs=b\u00f3snio
-LocaleNames/pt/ca=catal\u00e3o
-LocaleNames/pt/ce=checheno
-LocaleNames/pt/ch=chamorro
-LocaleNames/pt/co=corso
-LocaleNames/pt/cr=cree
-LocaleNames/pt/cs=tcheco
-LocaleNames/pt/cu=eslavo eclesi\u00e1stico
-LocaleNames/pt/cv=tchuvache
-LocaleNames/pt/cy=gal\u00eas
-LocaleNames/pt/da=dinamarqu\u00eas
-LocaleNames/pt/de=alem\u00e3o
-LocaleNames/pt/dv=divehi
-LocaleNames/pt/dz=dzonga
-LocaleNames/pt/ee=ewe
-LocaleNames/pt/el=grego
-LocaleNames/pt/en=ingl\u00eas
-LocaleNames/pt/eo=esperanto
-LocaleNames/pt/es=espanhol
-LocaleNames/pt/et=estoniano
-LocaleNames/pt/eu=basco
-LocaleNames/pt/fa=persa
-LocaleNames/pt/ff=fula
-LocaleNames/pt/fi=finland\u00eas
-LocaleNames/pt/fj=fijiano
-LocaleNames/pt/fo=fero\u00eas
-LocaleNames/pt/fr=franc\u00eas
-LocaleNames/pt/fy=fr\u00edsio ocidental
-LocaleNames/pt/ga=irland\u00eas
-LocaleNames/pt/gd=ga\u00e9lico escoc\u00eas
-LocaleNames/pt/gl=galego
-LocaleNames/pt/gn=guarani
-LocaleNames/pt/gu=guzerate
-LocaleNames/pt/gv=manx
-LocaleNames/pt/ha=hau\u00e7\u00e1
-LocaleNames/pt/he=hebraico
-LocaleNames/pt/hi=h\u00edndi
-LocaleNames/pt/ho=hiri motu
-LocaleNames/pt/hr=croata
-LocaleNames/pt/ht=haitiano
-LocaleNames/pt/hu=h\u00fangaro
-LocaleNames/pt/hy=arm\u00eanio
-LocaleNames/pt/hz=herero
-LocaleNames/pt/ia=interl\u00edngua
-LocaleNames/pt/id=indon\u00e9sio
-LocaleNames/pt/ie=interlingue
-LocaleNames/pt/ig=igbo
-LocaleNames/pt/ii=sichuan yi
-LocaleNames/pt/in=indon\u00e9sio
-LocaleNames/pt/io=ido
-LocaleNames/pt/is=island\u00eas
-LocaleNames/pt/it=italiano
-LocaleNames/pt/iu=inuktitut
-LocaleNames/pt/iw=hebraico
-LocaleNames/pt/ja=japon\u00eas
-LocaleNames/pt/ji=i\u00eddiche
-LocaleNames/pt/ka=georgiano
-LocaleNames/pt/kg=congol\u00eas
-LocaleNames/pt/ki=quicuio
-LocaleNames/pt/kj=cuanhama
-LocaleNames/pt/kk=cazaque
-LocaleNames/pt/kl=groenland\u00eas
-LocaleNames/pt/km=khmer
-LocaleNames/pt/kn=canarim
-LocaleNames/pt/ko=coreano
-LocaleNames/pt/kr=can\u00fari
-LocaleNames/pt/ks=caxemira
-LocaleNames/pt/ku=curdo
-LocaleNames/pt/kv=komi
-LocaleNames/pt/kw=c\u00f3rnico
-LocaleNames/pt/ky=quirguiz
-LocaleNames/pt/la=latim
-LocaleNames/pt/lb=luxemburgu\u00eas
-LocaleNames/pt/lg=luganda
-LocaleNames/pt/li=limburgu\u00eas
-LocaleNames/pt/ln=lingala
-LocaleNames/pt/lo=laosiano
-LocaleNames/pt/lt=lituano
-LocaleNames/pt/lu=luba-catanga
-LocaleNames/pt/lv=let\u00e3o
-LocaleNames/pt/mg=malgaxe
-LocaleNames/pt/mh=marshal\u00eas
-LocaleNames/pt/mi=maori
-LocaleNames/pt/mk=maced\u00f4nio
-LocaleNames/pt/ml=malaiala
-LocaleNames/pt/mn=mongol
-LocaleNames/pt/mo=mold\u00e1vio
-LocaleNames/pt/mr=marati
-LocaleNames/pt/ms=malaio
-LocaleNames/pt/mt=malt\u00eas
-LocaleNames/pt/my=birman\u00eas
-LocaleNames/pt/na=nauruano
-LocaleNames/pt/nb=bokm\u00e5l noruegu\u00eas
-LocaleNames/pt/nd=ndebele do norte
-LocaleNames/pt/ne=nepal\u00eas
-LocaleNames/pt/ng=dongo
-LocaleNames/pt/nl=holand\u00eas
-LocaleNames/pt/nn=nynorsk noruegu\u00eas
-LocaleNames/pt/no=noruegu\u00eas
-LocaleNames/pt/nr=ndebele do sul
-LocaleNames/pt/nv=navajo
-LocaleNames/pt/ny=nianja
-LocaleNames/pt/oc=occit\u00e2nico
-LocaleNames/pt/oj=ojibwa
-LocaleNames/pt/om=oromo
-LocaleNames/pt/or=ori\u00e1
-LocaleNames/pt/os=osseto
-LocaleNames/pt/pa=panjabi
-LocaleNames/pt/pi=p\u00e1li
-LocaleNames/pt/pl=polon\u00eas
-LocaleNames/pt/ps=pashto
-LocaleNames/pt/pt=portugu\u00eas
-LocaleNames/pt/qu=qu\u00edchua
-LocaleNames/pt/rm=romanche
-LocaleNames/pt/rn=rundi
-LocaleNames/pt/ro=romeno
-LocaleNames/pt/ru=russo
-LocaleNames/pt/rw=quiniaruanda
-LocaleNames/pt/sa=s\u00e2nscrito
-LocaleNames/pt/sc=sardo
-LocaleNames/pt/sd=sindi
-LocaleNames/pt/se=sami setentrional
-LocaleNames/pt/sg=sango
-LocaleNames/pt/si=cingal\u00eas
-LocaleNames/pt/sk=eslovaco
-LocaleNames/pt/sl=esloveno
-LocaleNames/pt/so=somali
-LocaleNames/pt/sq=alban\u00eas
-LocaleNames/pt/sr=s\u00e9rvio
-LocaleNames/pt/ss=su\u00e1zi
-LocaleNames/pt/st=soto do sul
-LocaleNames/pt/su=sundan\u00eas
-LocaleNames/pt/sv=sueco
-LocaleNames/pt/sw=sua\u00edli
-LocaleNames/pt/ta=t\u00e2mil
-LocaleNames/pt/te=t\u00e9lugo
-LocaleNames/pt/tg=tadjique
-LocaleNames/pt/th=tailand\u00eas
-LocaleNames/pt/ti=tigr\u00ednia
-LocaleNames/pt/tk=turcomeno
-LocaleNames/pt/tn=tswana
-LocaleNames/pt/to=tongan\u00eas
-LocaleNames/pt/tr=turco
-LocaleNames/pt/ts=tsonga
-LocaleNames/pt/tt=t\u00e1rtaro
-LocaleNames/pt/tw=twi
-LocaleNames/pt/ty=taitiano
-LocaleNames/pt/ug=uigur
-LocaleNames/pt/uk=ucraniano
-LocaleNames/pt/ur=urdu
-LocaleNames/pt/uz=uzbeque
-LocaleNames/pt/ve=venda
-LocaleNames/pt/vi=vietnamita
-LocaleNames/pt/vo=volapuque
-LocaleNames/pt/wa=val\u00e3o
-LocaleNames/pt/wo=uolofe
-LocaleNames/pt/xh=xhosa
-LocaleNames/pt/yi=i\u00eddiche
-LocaleNames/pt/yo=iorub\u00e1
-LocaleNames/pt/za=zhuang
-LocaleNames/pt/zh=chin\u00eas
-LocaleNames/pt/zu=zulu
-LocaleNames/pt/AE=Emirados \u00c1rabes Unidos
-LocaleNames/pt/AF=Afeganist\u00e3o
-LocaleNames/pt/AG=Ant\u00edgua e Barbuda
-LocaleNames/pt/AL=Alb\u00e2nia
-LocaleNames/pt/AM=Arm\u00eania
-LocaleNames/pt/AN=Antilhas Holandesas
-LocaleNames/pt/AQ=Ant\u00e1rtida
-LocaleNames/pt/AS=Samoa Americana
-LocaleNames/pt/AT=\u00c1ustria
-LocaleNames/pt/AU=Austr\u00e1lia
-LocaleNames/pt/AZ=Azerbaij\u00e3o
-LocaleNames/pt/BA=B\u00f3snia e Herzegovina
-LocaleNames/pt/BE=B\u00e9lgica
-LocaleNames/pt/BF=Burquina Faso
-LocaleNames/pt/BG=Bulg\u00e1ria
-LocaleNames/pt/BH=Barein
-LocaleNames/pt/BM=Bermudas
-LocaleNames/pt/BO=Bol\u00edvia
-LocaleNames/pt/BR=Brasil
-LocaleNames/pt/BT=But\u00e3o
-LocaleNames/pt/BV=Ilha Bouvet
-LocaleNames/pt/BW=Botsuana
-LocaleNames/pt/CA=Canad\u00e1
-LocaleNames/pt/CC=Ilhas Cocos (Keeling)
-LocaleNames/pt/CD=Congo - Kinshasa
-LocaleNames/pt/CF=Rep\u00fablica Centro-Africana
-LocaleNames/pt/CH=Su\u00ed\u00e7a
-LocaleNames/pt/CI=Costa do Marfim
-LocaleNames/pt/CK=Ilhas Cook
-LocaleNames/pt/CM=Camar\u00f5es
-LocaleNames/pt/CO=Col\u00f4mbia
-LocaleNames/pt/CV=Cabo Verde
-LocaleNames/pt/CX=Ilha Christmas
-LocaleNames/pt/CY=Chipre
-LocaleNames/pt/CZ=Tch\u00e9quia
-LocaleNames/pt/DE=Alemanha
-LocaleNames/pt/DJ=Djibuti
-LocaleNames/pt/DK=Dinamarca
-LocaleNames/pt/DO=Rep\u00fablica Dominicana
-LocaleNames/pt/DZ=Arg\u00e9lia
-LocaleNames/pt/EC=Equador
-LocaleNames/pt/EE=Est\u00f4nia
-LocaleNames/pt/EG=Egito
-LocaleNames/pt/EH=Saara Ocidental
-LocaleNames/pt/ER=Eritreia
-LocaleNames/pt/ES=Espanha
-LocaleNames/pt/ET=Eti\u00f3pia
-LocaleNames/pt/FI=Finl\u00e2ndia
-LocaleNames/pt/FK=Ilhas Malvinas
-LocaleNames/pt/FM=Micron\u00e9sia
-LocaleNames/pt/FO=Ilhas Faro\u00e9
-LocaleNames/pt/FR=Fran\u00e7a
-LocaleNames/pt/GA=Gab\u00e3o
-LocaleNames/pt/GB=Reino Unido
-LocaleNames/pt/GD=Granada
-LocaleNames/pt/GE=Ge\u00f3rgia
-LocaleNames/pt/GF=Guiana Francesa
-LocaleNames/pt/GH=Gana
-LocaleNames/pt/GL=Groenl\u00e2ndia
-LocaleNames/pt/GM=G\u00e2mbia
-LocaleNames/pt/GN=Guin\u00e9
-LocaleNames/pt/GP=Guadalupe
-LocaleNames/pt/GQ=Guin\u00e9 Equatorial
-LocaleNames/pt/GR=Gr\u00e9cia
-LocaleNames/pt/GS=Ilhas Ge\u00f3rgia do Sul e Sandwich do Sul
-LocaleNames/pt/GW=Guin\u00e9-Bissau
-LocaleNames/pt/GY=Guiana
-LocaleNames/pt/HK=Hong Kong, RAE da China
-LocaleNames/pt/HM=Ilhas Heard e McDonald
-LocaleNames/pt/HR=Cro\u00e1cia
-LocaleNames/pt/HU=Hungria
-LocaleNames/pt/ID=Indon\u00e9sia
-LocaleNames/pt/IE=Irlanda
-LocaleNames/pt/IN=\u00cdndia
-LocaleNames/pt/IO=Territ\u00f3rio Brit\u00e2nico do Oceano \u00cdndico
-LocaleNames/pt/IQ=Iraque
-LocaleNames/pt/IR=Ir\u00e3
-LocaleNames/pt/IS=Isl\u00e2ndia
-LocaleNames/pt/IT=It\u00e1lia
-LocaleNames/pt/JO=Jord\u00e2nia
-LocaleNames/pt/JP=Jap\u00e3o
-LocaleNames/pt/KE=Qu\u00eania
-LocaleNames/pt/KG=Quirguist\u00e3o
-LocaleNames/pt/KH=Camboja
-LocaleNames/pt/KI=Quiribati
-LocaleNames/pt/KM=Comores
-LocaleNames/pt/KN=S\u00e3o Crist\u00f3v\u00e3o e N\u00e9vis
-LocaleNames/pt/KP=Coreia do Norte
-LocaleNames/pt/KR=Coreia do Sul
-LocaleNames/pt/KY=Ilhas Cayman
-LocaleNames/pt/KZ=Cazaquist\u00e3o
-LocaleNames/pt/LA=Laos
-LocaleNames/pt/LB=L\u00edbano
-LocaleNames/pt/LC=Santa L\u00facia
-LocaleNames/pt/LR=Lib\u00e9ria
-LocaleNames/pt/LS=Lesoto
-LocaleNames/pt/LT=Litu\u00e2nia
-LocaleNames/pt/LU=Luxemburgo
-LocaleNames/pt/LV=Let\u00f4nia
-LocaleNames/pt/LY=L\u00edbia
-LocaleNames/pt/MA=Marrocos
-LocaleNames/pt/MC=M\u00f4naco
-LocaleNames/pt/MD=Mold\u00e1via
-LocaleNames/pt/MH=Ilhas Marshall
-LocaleNames/pt/MK=Maced\u00f4nia do Norte
-LocaleNames/pt/MM=Mianmar (Birm\u00e2nia)
-LocaleNames/pt/MN=Mong\u00f3lia
-LocaleNames/pt/MO=Macau, RAE da China
-LocaleNames/pt/MP=Ilhas Marianas do Norte
-LocaleNames/pt/MQ=Martinica
-LocaleNames/pt/MR=Maurit\u00e2nia
-LocaleNames/pt/MU=Maur\u00edcio
-LocaleNames/pt/MV=Maldivas
-LocaleNames/pt/MX=M\u00e9xico
-LocaleNames/pt/MY=Mal\u00e1sia
-LocaleNames/pt/MZ=Mo\u00e7ambique
-LocaleNames/pt/NA=Nam\u00edbia
-LocaleNames/pt/NC=Nova Caled\u00f4nia
-LocaleNames/pt/NE=N\u00edger
-LocaleNames/pt/NF=Ilha Norfolk
-LocaleNames/pt/NG=Nig\u00e9ria
-LocaleNames/pt/NI=Nicar\u00e1gua
-LocaleNames/pt/NL=Pa\u00edses Baixos
-LocaleNames/pt/NO=Noruega
-LocaleNames/pt/NZ=Nova Zel\u00e2ndia
-LocaleNames/pt/OM=Om\u00e3
-LocaleNames/pt/PA=Panam\u00e1
-LocaleNames/pt/PF=Polin\u00e9sia Francesa
-LocaleNames/pt/PG=Papua-Nova Guin\u00e9
-LocaleNames/pt/PH=Filipinas
-LocaleNames/pt/PK=Paquist\u00e3o
-LocaleNames/pt/PL=Pol\u00f4nia
-LocaleNames/pt/PM=S\u00e3o Pedro e Miquel\u00e3o
-LocaleNames/pt/PR=Porto Rico
-LocaleNames/pt/PS=Territ\u00f3rios palestinos
-LocaleNames/pt/PY=Paraguai
-LocaleNames/pt/QA=Catar
-LocaleNames/pt/RE=Reuni\u00e3o
-LocaleNames/pt/RO=Rom\u00eania
-LocaleNames/pt/RU=R\u00fassia
-LocaleNames/pt/RW=Ruanda
-LocaleNames/pt/SA=Ar\u00e1bia Saudita
-LocaleNames/pt/SB=Ilhas Salom\u00e3o
-LocaleNames/pt/SD=Sud\u00e3o
-LocaleNames/pt/SE=Su\u00e9cia
-LocaleNames/pt/SG=Singapura
-LocaleNames/pt/SH=Santa Helena
-LocaleNames/pt/SI=Eslov\u00eania
-LocaleNames/pt/SJ=Svalbard e Jan Mayen
-LocaleNames/pt/SK=Eslov\u00e1quia
-LocaleNames/pt/SL=Serra Leoa
-LocaleNames/pt/SO=Som\u00e1lia
-LocaleNames/pt/ST=S\u00e3o Tom\u00e9 e Pr\u00edncipe
-LocaleNames/pt/SY=S\u00edria
-LocaleNames/pt/TC=Ilhas Turcas e Caicos
-LocaleNames/pt/TD=Chade
-LocaleNames/pt/TF=Territ\u00f3rios Franceses do Sul
-LocaleNames/pt/TH=Tail\u00e2ndia
-LocaleNames/pt/TJ=Tadjiquist\u00e3o
-LocaleNames/pt/TL=Timor-Leste
-LocaleNames/pt/TM=Turcomenist\u00e3o
-LocaleNames/pt/TN=Tun\u00edsia
-LocaleNames/pt/TR=Turquia
-LocaleNames/pt/TT=Trinidad e Tobago
-LocaleNames/pt/TZ=Tanz\u00e2nia
-LocaleNames/pt/UA=Ucr\u00e2nia
-LocaleNames/pt/UM=Ilhas Menores Distantes dos EUA
-LocaleNames/pt/US=Estados Unidos
-LocaleNames/pt/UY=Uruguai
-LocaleNames/pt/UZ=Uzbequist\u00e3o
-LocaleNames/pt/VA=Cidade do Vaticano
-LocaleNames/pt/VC=S\u00e3o Vicente e Granadinas
-LocaleNames/pt/VG=Ilhas Virgens Brit\u00e2nicas
-LocaleNames/pt/VI=Ilhas Virgens Americanas
-LocaleNames/pt/VN=Vietn\u00e3
-LocaleNames/pt/WF=Wallis e Futuna
-LocaleNames/pt/YE=I\u00eamen
-LocaleNames/pt/ZA=\u00c1frica do Sul
-LocaleNames/pt/ZM=Z\u00e2mbia
-LocaleNames/pt/ZW=Zimb\u00e1bue
-# pt_PT
-LocaleNames/pt_PT/cs=checo
-LocaleNames/pt_PT/et=est\u00f3nio
-LocaleNames/pt_PT/pl=polaco
-LocaleNames/pt_PT/sl=esloveno
-LocaleNames/pt_PT/AE=Emirados \u00c1rabes Unidos
-LocaleNames/pt_PT/AM=Arm\u00e9nia
-LocaleNames/pt_PT/AQ=Ant\u00e1rtida
-LocaleNames/pt_PT/AZ=Azerbaij\u00e3o
-LocaleNames/pt_PT/BA=B\u00f3snia e Herzegovina
-LocaleNames/pt_PT/BJ=Benim
-LocaleNames/pt_PT/BY=Bielorr\u00fassia
-LocaleNames/pt_PT/CM=Camar\u00f5es
-LocaleNames/pt_PT/CX=Ilha do Natal
-LocaleNames/pt_PT/CZ=Ch\u00e9quia
-LocaleNames/pt_PT/EE=Est\u00f3nia
-LocaleNames/pt_PT/EG=Egito
-LocaleNames/pt_PT/EH=Sara Ocidental
-LocaleNames/pt_PT/ER=Eritreia
-LocaleNames/pt_PT/FK=Ilhas Falkland
-LocaleNames/pt_PT/GL=Gronel\u00e2ndia
-LocaleNames/pt_PT/GS=Ilhas Ge\u00f3rgia do Sul e Sandwich do Sul
-LocaleNames/pt_PT/GW=Guin\u00e9-Bissau
-LocaleNames/pt_PT/HK=Hong Kong, RAE da China
-LocaleNames/pt_PT/KE=Qu\u00e9nia
-LocaleNames/pt_PT/KG=Quirguist\u00e3o
-LocaleNames/pt_PT/KN=S\u00e3o Crist\u00f3v\u00e3o e Neves
-LocaleNames/pt_PT/KP=Coreia do Norte
-LocaleNames/pt_PT/KR=Coreia do Sul
-LocaleNames/pt_PT/KY=Ilhas Caim\u00e3o
-LocaleNames/pt_PT/KZ=Cazaquist\u00e3o
-LocaleNames/pt_PT/LA=Laos
-LocaleNames/pt_PT/LV=Let\u00f3nia
-LocaleNames/pt_PT/MC=M\u00f3naco
-LocaleNames/pt_PT/MD=Mold\u00e1via
-LocaleNames/pt_PT/MG=Madag\u00e1scar
-LocaleNames/pt_PT/MK=Maced\u00f3nia do Norte
-LocaleNames/pt_PT/MO=Macau, RAE da China
-LocaleNames/pt_PT/MP=Ilhas Marianas do Norte
-LocaleNames/pt_PT/MU=Maur\u00edcia
-LocaleNames/pt_PT/NC=Nova Caled\u00f3nia
-LocaleNames/pt_PT/PG=Papua-Nova Guin\u00e9
-LocaleNames/pt_PT/PL=Pol\u00f3nia
-LocaleNames/pt_PT/PS=Territ\u00f3rios palestinianos
-LocaleNames/pt_PT/RE=Reuni\u00e3o
-LocaleNames/pt_PT/RO=Rom\u00e9nia
-LocaleNames/pt_PT/SC=Seicheles
-LocaleNames/pt_PT/SG=Singapura
-LocaleNames/pt_PT/SI=Eslov\u00e9nia
-LocaleNames/pt_PT/SM=S\u00e3o Marinho
-LocaleNames/pt_PT/TC=Ilhas Turcas e Caicos
-LocaleNames/pt_PT/TD=Chade
-LocaleNames/pt_PT/TF=Territ\u00f3rios Austrais Franceses
-LocaleNames/pt_PT/TJ=Tajiquist\u00e3o
-LocaleNames/pt_PT/TM=Turquemenist\u00e3o
-LocaleNames/pt_PT/UM=Ilhas Menores Afastadas dos EUA
-LocaleNames/pt_PT/UZ=Usbequist\u00e3o
-LocaleNames/pt_PT/VA=Cidade do Vaticano
-LocaleNames/pt_PT/VC=S\u00e3o Vicente e Granadinas
-LocaleNames/pt_PT/VG=Ilhas Virgens Brit\u00e2nicas
-LocaleNames/pt_PT/VI=Ilhas Virgens dos EUA
-LocaleNames/pt_PT/VN=Vietname
-LocaleNames/pt_PT/YE=I\u00e9men
-#bug 6290792 Gaelic support
-LocaleNames/ga/ab=Abc\u00e1isis
-LocaleNames/ga/ae=Aiv\u00e9istis
-LocaleNames/ga/af=Afrac\u00e1inis
-LocaleNames/ga/ar=Araibis
-LocaleNames/ga/as=Asaimis
-LocaleNames/ga/az=Asarbaise\u00e1inis
-LocaleNames/ga/ba=Baisc\u00edris
-LocaleNames/ga/be=Bealar\u00faisis
-LocaleNames/ga/bg=Bulg\u00e1iris
-LocaleNames/ga/bn=Beang\u00e1ilis
-LocaleNames/ga/bo=Tib\u00e9idis
-LocaleNames/ga/br=Briot\u00e1inis
-LocaleNames/ga/bs=Boisnis
-LocaleNames/ga/ca=Catal\u00f3inis
-LocaleNames/ga/ce=Seisnis
-LocaleNames/ga/co=Corsaicis
-LocaleNames/ga/cr=Cra\u00eds
-LocaleNames/ga/cs=Seicis
-LocaleNames/ga/cu=Slavais na hEaglaise
-LocaleNames/ga/cv=Suvaisis
-LocaleNames/ga/cy=Breatnais
-LocaleNames/ga/da=Danmhairgis
-LocaleNames/ga/de=Gearm\u00e1inis
-LocaleNames/ga/el=Gr\u00e9igis
-LocaleNames/ga/en=B\u00e9arla
-LocaleNames/ga/es=Sp\u00e1innis
-LocaleNames/ga/et=East\u00f3inis
-LocaleNames/ga/eu=Bascais
-LocaleNames/ga/fa=Peirsis
-LocaleNames/ga/fi=Fionlainnis
-LocaleNames/ga/fj=Fidsis
-LocaleNames/ga/fo=Far\u00f3is
-LocaleNames/ga/fr=Fraincis
-LocaleNames/ga/fy=Freaslainnis Iartharach
-LocaleNames/ga/ga=Gaeilge
-LocaleNames/ga/gd=Gaeilge na hAlban
-LocaleNames/ga/gu=G\u00faisear\u00e1itis
-LocaleNames/ga/gv=Manainnis
-LocaleNames/ga/he=Eabhrais
-LocaleNames/ga/hi=Hiond\u00fais
-LocaleNames/ga/hr=Cr\u00f3itis
-LocaleNames/ga/hu=Ung\u00e1iris
-LocaleNames/ga/hy=Airm\u00e9inis
-LocaleNames/ga/id=Indin\u00e9isis
-LocaleNames/ga/in=Indin\u00e9isis
-LocaleNames/ga/is=\u00cdoslainnis
-LocaleNames/ga/it=Iod\u00e1ilis
-LocaleNames/ga/iu=Ion\u00faitis
-LocaleNames/ga/iw=Eabhrais
-LocaleNames/ga/ja=Seap\u00e1inis
-LocaleNames/ga/ji=Gi\u00fadais
-LocaleNames/ga/jv=I\u00e1ivis
-LocaleNames/ga/ka=Seoirsis
-LocaleNames/ga/kk=Casaicis
-LocaleNames/ga/kn=Cannadais
-LocaleNames/ga/ko=C\u00f3ir\u00e9is
-LocaleNames/ga/ks=Caism\u00edris
-LocaleNames/ga/kw=Coirnis
-LocaleNames/ga/ky=Cirgisis
-LocaleNames/ga/la=Laidin
-LocaleNames/ga/lb=Lucsambuirgis
-LocaleNames/ga/lo=Laoisis
-LocaleNames/ga/lt=Liotu\u00e1inis
-LocaleNames/ga/lv=Laitvis
-LocaleNames/ga/mg=Malag\u00e1isis
-LocaleNames/ga/mi=Maorais
-LocaleNames/ga/mk=Macad\u00f3inis
-LocaleNames/ga/ml=Mail\u00e9alaimis
-LocaleNames/ga/mn=Mong\u00f3ilis
-LocaleNames/ga/mo=Mold\u00e1ivis
-LocaleNames/ga/mr=Maraitis
-LocaleNames/ga/mt=M\u00e1ltais
-LocaleNames/ga/my=Burmais
-LocaleNames/ga/na=N\u00e1r\u00fais
-LocaleNames/ga/nb=Bocm\u00e1l
-LocaleNames/ga/ne=Neipeailis
-LocaleNames/ga/nl=Ollainnis
-LocaleNames/ga/nn=Nua-Ioruais
-LocaleNames/ga/no=Ioruais
-LocaleNames/ga/nv=Navach\u00f3is
-LocaleNames/ga/oc=Ocsat\u00e1inis
-LocaleNames/ga/os=Ois\u00e9itis
-LocaleNames/ga/pa=Puinse\u00e1ibis
-LocaleNames/ga/pl=Polainnis
-LocaleNames/ga/ps=Paistis
-LocaleNames/ga/pt=Portaing\u00e9ilis
-LocaleNames/ga/qu=Ceatsuais
-LocaleNames/ga/ro=R\u00f3m\u00e1inis
-LocaleNames/ga/ru=R\u00faisis
-LocaleNames/ga/sa=Sanscrait
-LocaleNames/ga/sc=Saird\u00ednis
-LocaleNames/ga/sd=Sindis
-LocaleNames/ga/se=S\u00e1imis an Tuaiscirt
-LocaleNames/ga/sk=Sl\u00f3vaicis
-LocaleNames/ga/sl=Sl\u00f3iv\u00e9inis
-LocaleNames/ga/sm=Sam\u00f3is
-LocaleNames/ga/so=Som\u00e1ilis
-LocaleNames/ga/sq=Alb\u00e1inis
-LocaleNames/ga/sr=Seirbis
-LocaleNames/ga/sv=Sualainnis
-LocaleNames/ga/sw=Svaha\u00edlis
-LocaleNames/ga/ta=Tamailis
-LocaleNames/ga/th=T\u00e9alainnis
-LocaleNames/ga/tl=Tag\u00e1laigis
-LocaleNames/ga/tr=Tuircis
-LocaleNames/ga/tt=Tatairis
-LocaleNames/ga/ty=Taih\u00edtis
-LocaleNames/ga/uk=\u00dacr\u00e1inis
-LocaleNames/ga/ur=Urd\u00fais
-LocaleNames/ga/uz=\u00daisb\u00e9iceast\u00e1inis
-LocaleNames/ga/vi=V\u00edtneaimis
-LocaleNames/ga/wa=Vall\u00fanais
-LocaleNames/ga/yi=Gi\u00fadais
-LocaleNames/ga/zh=S\u00ednis
-LocaleNames/ga/zu=S\u00fal\u00fais
-LocaleNames/ga/AD=And\u00f3ra
-LocaleNames/ga/AE=Aontas na n\u00c9im\u00edr\u00edochta\u00ed Arabacha
-LocaleNames/ga/AF=an Afganast\u00e1in
-LocaleNames/ga/AG=Antigua agus Barb\u00fada
-LocaleNames/ga/AL=an Alb\u00e1in
-LocaleNames/ga/AM=an Airm\u00e9in
-LocaleNames/ga/AN=Antill\u00ed na h\u00cdsilt\u00edre
-LocaleNames/ga/AO=Ang\u00f3la
-LocaleNames/ga/AQ=Antartaice
-LocaleNames/ga/AR=an Airgint\u00edn
-LocaleNames/ga/AS=Sam\u00f3 Mheirice\u00e1
-LocaleNames/ga/AT=an Ostair
-LocaleNames/ga/AU=an Astr\u00e1il
-LocaleNames/ga/AZ=an Asarbaise\u00e1in
-LocaleNames/ga/BA=an Bhoisnia agus an Heirseagaiv\u00e9in
-LocaleNames/ga/BB=Barbad\u00f3s
-LocaleNames/ga/BD=an Bhanglaid\u00e9is
-LocaleNames/ga/BE=an Bheilg
-LocaleNames/ga/BF=Buirc\u00edne Fas\u00f3
-LocaleNames/ga/BG=an Bhulg\u00e1ir
-LocaleNames/ga/BH=Bair\u00e9in
-LocaleNames/ga/BI=an Bhur\u00fain
-LocaleNames/ga/BJ=Beinin
-LocaleNames/ga/BM=Beirmi\u00fada
-LocaleNames/ga/BN=Br\u00fain\u00e9
-LocaleNames/ga/BO=an Bholaiv
-LocaleNames/ga/BR=an Bhrasa\u00edl
-LocaleNames/ga/BS=na Bah\u00e1ma\u00ed
-LocaleNames/ga/BT=an Bh\u00fat\u00e1in
-LocaleNames/ga/BV=Oile\u00e1n Bouvet
-LocaleNames/ga/BW=an Bhotsu\u00e1in
-LocaleNames/ga/BY=an Bhealar\u00fais
-LocaleNames/ga/BZ=an Bheil\u00eds
-LocaleNames/ga/CA=Ceanada
-LocaleNames/ga/CC=Oile\u00e1in Cocos (Keeling)
-LocaleNames/ga/CD=Poblacht Dhaonlathach an Chong\u00f3
-LocaleNames/ga/CF=Poblacht na hAfraice L\u00e1ir
-LocaleNames/ga/CG=Cong\u00f3-Brazzaville
-LocaleNames/ga/CH=an Eilv\u00e9is
-LocaleNames/ga/CI=an C\u00f3sta Eabhair
-LocaleNames/ga/CK=Oile\u00e1in Cook
-LocaleNames/ga/CL=an tSile
-LocaleNames/ga/CM=Camar\u00fan
-LocaleNames/ga/CN=an tS\u00edn
-LocaleNames/ga/CO=an Chol\u00f3im
-LocaleNames/ga/CR=C\u00f3sta R\u00edce
-LocaleNames/ga/CU=C\u00faba
-LocaleNames/ga/CV=Rinn Verde
-LocaleNames/ga/CX=Oile\u00e1n na Nollag
-LocaleNames/ga/CY=an Chipir
-LocaleNames/ga/CZ=an tSeicia
-LocaleNames/ga/DE=an Ghearm\u00e1in
-LocaleNames/ga/DK=an Danmhairg
-LocaleNames/ga/DM=Doiminice
-LocaleNames/ga/DO=an Phoblacht Dhoiminiceach
-LocaleNames/ga/DZ=an Ailg\u00e9ir
-LocaleNames/ga/EC=Eacuad\u00f3r
-LocaleNames/ga/EE=an East\u00f3in
-LocaleNames/ga/EG=an \u00c9igipt
-LocaleNames/ga/EH=an Sah\u00e1ra Thiar
-LocaleNames/ga/ES=an Sp\u00e1inn
-LocaleNames/ga/ET=an Aet\u00f3ip
-LocaleNames/ga/FI=an Fhionlainn
-LocaleNames/ga/FJ=Fids\u00ed
-LocaleNames/ga/FK=Oile\u00e1in Fh\u00e1clainne
-LocaleNames/ga/FM=an Mhicrin\u00e9is
-LocaleNames/ga/FO=Oile\u00e1in Fhar\u00f3
-LocaleNames/ga/FR=an Fhrainc
-LocaleNames/ga/GA=an Ghab\u00fain
-LocaleNames/ga/GB=an R\u00edocht Aontaithe
-LocaleNames/ga/GE=an tSeoirsia
-LocaleNames/ga/GF=Gu\u00e1in na Fraince
-LocaleNames/ga/GH=G\u00e1na
-LocaleNames/ga/GI=Giobr\u00e1ltar
-LocaleNames/ga/GL=an Ghraonlainn
-LocaleNames/ga/GM=an Ghaimbia
-LocaleNames/ga/GN=an Ghuine
-LocaleNames/ga/GP=Guadal\u00faip
-LocaleNames/ga/GQ=an Ghuine Mhe\u00e1nchiorclach
-LocaleNames/ga/GR=an Ghr\u00e9ig
-LocaleNames/ga/GS=an tSeoirsia Theas agus Oile\u00e1in Sandwich Theas
-LocaleNames/ga/GT=Guatamala
-LocaleNames/ga/GW=Guine Bissau
-LocaleNames/ga/GY=an Ghu\u00e1in
-LocaleNames/ga/HM=Oile\u00e1n Heard agus Oile\u00e1in McDonald
-LocaleNames/ga/HN=Hond\u00faras
-LocaleNames/ga/HR=an Chr\u00f3it
-LocaleNames/ga/HT=H\u00e1\u00edt\u00ed
-LocaleNames/ga/HU=an Ung\u00e1ir
-LocaleNames/ga/ID=an Indin\u00e9is
-LocaleNames/ga/IE=\u00c9ire
-LocaleNames/ga/IL=Iosrael
-LocaleNames/ga/IN=an India
-LocaleNames/ga/IO=Cr\u00edoch Aig\u00e9an Indiach na Breataine
-LocaleNames/ga/IQ=an Iar\u00e1ic
-LocaleNames/ga/IR=an Iar\u00e1in
-LocaleNames/ga/IS=an \u00cdoslainn
-LocaleNames/ga/IT=an Iod\u00e1il
-LocaleNames/ga/JM=Iam\u00e1ice
-LocaleNames/ga/JO=an Iord\u00e1in
-LocaleNames/ga/JP=an tSeap\u00e1in
-LocaleNames/ga/KE=an Ch\u00e9inia
-LocaleNames/ga/KG=an Chirgeast\u00e1in
-LocaleNames/ga/KH=an Chamb\u00f3id
-LocaleNames/ga/KI=Ciribeas
-LocaleNames/ga/KM=Oile\u00e1in Chom\u00f3ra
-LocaleNames/ga/KN=San Cr\u00edost\u00f3ir-Nimheas
-LocaleNames/ga/KP=an Ch\u00f3ir\u00e9 Thuaidh
-LocaleNames/ga/KR=an Ch\u00f3ir\u00e9 Theas
-LocaleNames/ga/KW=Cu\u00e1it
-LocaleNames/ga/KY=Oile\u00e1in Cayman
-LocaleNames/ga/KZ=an Chasacst\u00e1in
-LocaleNames/ga/LB=an Liob\u00e1in
-LocaleNames/ga/LI=Lichtinst\u00e9in
-LocaleNames/ga/LK=Sr\u00ed Lanca
-LocaleNames/ga/LR=an Lib\u00e9ir
-LocaleNames/ga/LS=Leos\u00f3ta
-LocaleNames/ga/LT=an Liotu\u00e1in
-LocaleNames/ga/LU=Lucsamburg
-LocaleNames/ga/LV=an Laitvia
-LocaleNames/ga/LY=an Libia
-LocaleNames/ga/MA=Marac\u00f3
-LocaleNames/ga/MC=Monac\u00f3
-LocaleNames/ga/MD=an Mhold\u00f3iv
-LocaleNames/ga/MH=Oile\u00e1in Marshall
-LocaleNames/ga/MK=an Mhacad\u00f3in Thuaidh
-LocaleNames/ga/ML=Mail\u00ed
-LocaleNames/ga/MM=Maenmar (Burma)
-LocaleNames/ga/MN=an Mhong\u00f3il
-LocaleNames/ga/MP=na hOile\u00e1in Mh\u00e1irianacha Thuaidh
-LocaleNames/ga/MR=an Mh\u00e1rat\u00e1in
-LocaleNames/ga/MS=Montsarat
-LocaleNames/ga/MT=M\u00e1lta
-LocaleNames/ga/MU=Oile\u00e1n Mhuir\u00eds
-LocaleNames/ga/MV=Oile\u00e1in Mhaild\u00edve
-LocaleNames/ga/MW=an Mhal\u00e1iv
-LocaleNames/ga/MX=Meicsiceo
-LocaleNames/ga/MY=an Mhalaeisia
-LocaleNames/ga/MZ=M\u00f3saimb\u00edc
-LocaleNames/ga/NA=an Namaib
-LocaleNames/ga/NC=an Nua-Chalad\u00f3in
-LocaleNames/ga/NE=an N\u00edgir
-LocaleNames/ga/NF=Oile\u00e1n Norfolk
-LocaleNames/ga/NG=an Nig\u00e9ir
-LocaleNames/ga/NI=Nicearagua
-LocaleNames/ga/NL=an \u00cdsilt\u00edr
-LocaleNames/ga/NO=an Iorua
-LocaleNames/ga/NP=Neipeal
-LocaleNames/ga/NR=N\u00e1r\u00fa
-LocaleNames/ga/NZ=an Nua-Sh\u00e9alainn
-LocaleNames/ga/PE=Peiri\u00fa
-LocaleNames/ga/PF=Polain\u00e9is na Fraince
-LocaleNames/ga/PG=Nua-Ghuine Phapua
-LocaleNames/ga/PH=na hOile\u00e1in Fhilip\u00edneacha
-LocaleNames/ga/PK=an Phacast\u00e1in
-LocaleNames/ga/PL=an Pholainn
-LocaleNames/ga/PM=San Pierre agus Miquelon
-LocaleNames/ga/PR=P\u00f3rt\u00f3 R\u00edce
-LocaleNames/ga/PS=na Cr\u00edocha Palaist\u00edneacha
-LocaleNames/ga/PT=an Phortaing\u00e9il
-LocaleNames/ga/PY=Paragua
-LocaleNames/ga/QA=Catar
-LocaleNames/ga/RE=La R\u00e9union
-LocaleNames/ga/RO=an R\u00f3m\u00e1in
-LocaleNames/ga/RU=an R\u00fais
-LocaleNames/ga/RW=Ruanda
-LocaleNames/ga/SA=an Araib Sh\u00e1dach
-LocaleNames/ga/SB=Oile\u00e1in Sholaimh
-LocaleNames/ga/SC=na S\u00e9is\u00e9il
-LocaleNames/ga/SD=an tS\u00fad\u00e1in
-LocaleNames/ga/SE=an tSualainn
-LocaleNames/ga/SG=Singeap\u00f3r
-LocaleNames/ga/SH=San H\u00e9ilin
-LocaleNames/ga/SI=an tSl\u00f3iv\u00e9in
-LocaleNames/ga/SJ=Svalbard agus Jan Mayen
-LocaleNames/ga/SK=an tSl\u00f3vaic
-LocaleNames/ga/SL=Siarra Leon
-LocaleNames/ga/SM=San Mair\u00edne
-LocaleNames/ga/SN=an tSeineag\u00e1il
-LocaleNames/ga/SO=an tSom\u00e1il
-LocaleNames/ga/SR=Suranam
-LocaleNames/ga/ST=S\u00e3o Tom\u00e9 agus Pr\u00edncipe
-LocaleNames/ga/SV=an tSalvad\u00f3ir
-LocaleNames/ga/SY=an tSiria
-LocaleNames/ga/TC=Oile\u00e1in na dTurcach agus Caicos
-LocaleNames/ga/TD=Sead
-LocaleNames/ga/TF=Cr\u00edocha Francacha Dheisceart an Domhain
-LocaleNames/ga/TG=T\u00f3ga
-LocaleNames/ga/TH=an T\u00e9alainn
-LocaleNames/ga/TJ=an T\u00e1ids\u00edceast\u00e1in
-LocaleNames/ga/TK=T\u00f3cal\u00e1
-LocaleNames/ga/TL=T\u00edom\u00f3r Thoir
-LocaleNames/ga/TM=an Tuircm\u00e9anast\u00e1in
-LocaleNames/ga/TN=an T\u00fain\u00e9is
-LocaleNames/ga/TR=an Tuirc
-LocaleNames/ga/TT=Oile\u00e1n na Tr\u00edon\u00f3ide agus Tob\u00e1ga
-LocaleNames/ga/TV=T\u00faval\u00fa
-LocaleNames/ga/TW=an T\u00e9av\u00e1in
-LocaleNames/ga/TZ=an Tans\u00e1in
-LocaleNames/ga/UA=an \u00dacr\u00e1in
-LocaleNames/ga/UM=Oile\u00e1in Imeallacha S.A.M.
-LocaleNames/ga/US=St\u00e1it Aontaithe Mheirice\u00e1
-LocaleNames/ga/UY=Uragua
-LocaleNames/ga/UZ=an \u00daisb\u00e9iceast\u00e1in
-LocaleNames/ga/VA=Cathair na Vatac\u00e1ine
-LocaleNames/ga/VC=San Uinseann agus na Grean\u00e1id\u00edn\u00ed
-LocaleNames/ga/VE=Veinis\u00e9ala
-LocaleNames/ga/VG=Oile\u00e1in Bhriotanacha na Maighdean
-LocaleNames/ga/VI=Oile\u00e1in Mheirice\u00e1nacha na Maighdean
-LocaleNames/ga/VN=V\u00edtneam
-LocaleNames/ga/VU=Vanuat\u00fa
-LocaleNames/ga/WF=Vail\u00eds agus Fut\u00fana
-LocaleNames/ga/WS=Sam\u00f3
-LocaleNames/ga/YE=\u00c9imin
-LocaleNames/ga/ZA=an Afraic Theas
-LocaleNames/ga/ZM=an tSaimbia
-# bug #6277696
-FormatData/sr/MonthNames/0=\u0458\u0430\u043d\u0443\u0430\u0440
-FormatData/sr/MonthNames/1=\u0444\u0435\u0431\u0440\u0443\u0430\u0440
-FormatData/sr/MonthNames/2=\u043c\u0430\u0440\u0442
-FormatData/sr/MonthNames/3=\u0430\u043f\u0440\u0438\u043b
-FormatData/sr/MonthNames/4=\u043c\u0430\u0458
-FormatData/sr/MonthNames/5=\u0458\u0443\u043d
-FormatData/sr/MonthNames/6=\u0458\u0443\u043b
-FormatData/sr/MonthNames/7=\u0430\u0432\u0433\u0443\u0441\u0442
-FormatData/sr/MonthNames/8=\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthNames/9=\u043e\u043a\u0442\u043e\u0431\u0430\u0440
-FormatData/sr/MonthNames/10=\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthNames/11=\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthAbbreviations/0=\u0458\u0430\u043d
-FormatData/sr/MonthAbbreviations/1=\u0444\u0435\u0431
-FormatData/sr/MonthAbbreviations/2=\u043c\u0430\u0440
-FormatData/sr/MonthAbbreviations/3=\u0430\u043f\u0440
-FormatData/sr/MonthAbbreviations/4=\u043c\u0430\u0458
-FormatData/sr/MonthAbbreviations/5=\u0458\u0443\u043d
-FormatData/sr/MonthAbbreviations/6=\u0458\u0443\u043b
-FormatData/sr/MonthAbbreviations/7=\u0430\u0432\u0433
-FormatData/sr/MonthAbbreviations/8=\u0441\u0435\u043f
-FormatData/sr/MonthAbbreviations/9=\u043e\u043a\u0442
-FormatData/sr/MonthAbbreviations/10=\u043d\u043e\u0432
-FormatData/sr/MonthAbbreviations/11=\u0434\u0435\u0446
-FormatData/sr/DayNames/0=\u043d\u0435\u0434\u0435\u0459\u0430
-FormatData/sr/DayNames/1=\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a
-FormatData/sr/DayNames/2=\u0443\u0442\u043e\u0440\u0430\u043a
-FormatData/sr/DayNames/3=\u0441\u0440\u0435\u0434\u0430
-FormatData/sr/DayNames/4=\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a
-FormatData/sr/DayNames/5=\u043f\u0435\u0442\u0430\u043a
-FormatData/sr/DayNames/6=\u0441\u0443\u0431\u043e\u0442\u0430
-FormatData/sr/DayAbbreviations/0=\u043d\u0435\u0434
-FormatData/sr/DayAbbreviations/1=\u043f\u043e\u043d
-FormatData/sr/DayAbbreviations/2=\u0443\u0442\u043e
-FormatData/sr/DayAbbreviations/3=\u0441\u0440\u0435
-FormatData/sr/DayAbbreviations/4=\u0447\u0435\u0442
-FormatData/sr/DayAbbreviations/5=\u043f\u0435\u0442
-FormatData/sr/DayAbbreviations/6=\u0441\u0443\u0431
-FormatData/sr/Eras/0=\u043f. \u043d. \u0435.
-FormatData/sr/Eras/1=\u043d. \u0435
-FormatData/sr/NumberPatterns/0=#,##0.###
-FormatData/sr/NumberPatterns/1=\u00a4 #,##0.00
-FormatData/sr/NumberPatterns/2=#,##0%
-FormatData/sr/NumberElements/0=,
-FormatData/sr/NumberElements/1=.
-FormatData/sr/NumberElements/2=;
-FormatData/sr/NumberElements/3=%
-FormatData/sr/NumberElements/4=0
-FormatData/sr/NumberElements/5=#
-FormatData/sr/NumberElements/6=-
-FormatData/sr/NumberElements/7=E
-FormatData/sr/NumberElements/8=\u2030
-FormatData/sr/NumberElements/9=\u221e
-FormatData/sr/NumberElements/10=NaN
-FormatData/sr/TimePatterns/0=HH.mm.ss z
-FormatData/sr/TimePatterns/1=HH.mm.ss z
-FormatData/sr/TimePatterns/2=HH.mm.ss
-FormatData/sr/TimePatterns/3=HH.mm
-FormatData/sr/DatePatterns/0=EEEE, dd.MMMM.yyyy.
-FormatData/sr/DatePatterns/1=dd.MM.yyyy.
-FormatData/sr/DatePatterns/2=dd.MM.yyyy.
-FormatData/sr/DatePatterns/3=d.M.yy.
-FormatData/sr/DateTimePatterns/0={1} {0}
-LocaleNames/sr/af=\u0430\u0444\u0440\u0438\u043a\u0430\u043d\u0441
-LocaleNames/sr/ar=\u0430\u0440\u0430\u043f\u0441\u043a\u0438
-LocaleNames/sr/be=\u0431\u0435\u043b\u043e\u0440\u0443\u0441\u043a\u0438
-LocaleNames/sr/bg=\u0431\u0443\u0433\u0430\u0440\u0441\u043a\u0438
-LocaleNames/sr/br=\u0431\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/ca=\u043a\u0430\u0442\u0430\u043b\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/co=\u043a\u043e\u0440\u0437\u0438\u043a\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/cs=\u0447\u0435\u0448\u043a\u0438
-LocaleNames/sr/da=\u0434\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/de=\u043d\u0435\u043c\u0430\u0447\u043a\u0438
-LocaleNames/sr/el=\u0433\u0440\u0447\u043a\u0438
-LocaleNames/sr/en=\u0435\u043d\u0433\u043b\u0435\u0441\u043a\u0438
-LocaleNames/sr/eo=\u0435\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e
-LocaleNames/sr/es=\u0448\u043f\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/et=\u0435\u0441\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/eu=\u0431\u0430\u0441\u043a\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/fa=\u043f\u0435\u0440\u0441\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/fi=\u0444\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/fr=\u0444\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0438
-LocaleNames/sr/ga=\u0438\u0440\u0441\u043a\u0438
-LocaleNames/sr/he=\u0445\u0435\u0431\u0440\u0435\u0458\u0441\u043a\u0438
-LocaleNames/sr/hi=\u0445\u0438\u043d\u0434\u0438
-LocaleNames/sr/hr=\u0445\u0440\u0432\u0430\u0442\u0441\u043a\u0438
-LocaleNames/sr/hu=\u043c\u0430\u0452\u0430\u0440\u0441\u043a\u0438
-LocaleNames/sr/hy=\u0458\u0435\u0440\u043c\u0435\u043d\u0441\u043a\u0438
-LocaleNames/sr/id=\u0438\u043d\u0434\u043e\u043d\u0435\u0436\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/in=\u0438\u043d\u0434\u043e\u043d\u0435\u0436\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/is=\u0438\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-LocaleNames/sr/it=\u0438\u0442\u0430\u043b\u0438\u0458\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/iw=\u0445\u0435\u0431\u0440\u0435\u0458\u0441\u043a\u0438
-LocaleNames/sr/ja=\u0458\u0430\u043f\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/ji=\u0458\u0438\u0434\u0438\u0448
-LocaleNames/sr/ka=\u0433\u0440\u0443\u0437\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/km=\u043a\u043c\u0435\u0440\u0441\u043a\u0438
-LocaleNames/sr/ko=\u043a\u043e\u0440\u0435\u0458\u0441\u043a\u0438
-LocaleNames/sr/ku=\u043a\u0443\u0440\u0434\u0441\u043a\u0438
-LocaleNames/sr/ky=\u043a\u0438\u0440\u0433\u0438\u0441\u043a\u0438
-LocaleNames/sr/la=\u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/lt=\u043b\u0438\u0442\u0432\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/lv=\u043b\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/mk=\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/mn=\u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438
-LocaleNames/sr/mo=\u041c\u043e\u043b\u0434\u0430\u0432\u0441\u043a\u0438
-LocaleNames/sr/my=\u0431\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/nl=\u0445\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-LocaleNames/sr/no=\u043d\u043e\u0440\u0432\u0435\u0448\u043a\u0438
-LocaleNames/sr/pl=\u043f\u043e\u0459\u0441\u043a\u0438
-LocaleNames/sr/pt=\u043f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0441\u043a\u0438
-LocaleNames/sr/rm=\u0440\u043e\u043c\u0430\u043d\u0448
-LocaleNames/sr/ro=\u0440\u0443\u043c\u0443\u043d\u0441\u043a\u0438
-LocaleNames/sr/ru=\u0440\u0443\u0441\u043a\u0438
-LocaleNames/sr/sa=\u0441\u0430\u043d\u0441\u043a\u0440\u0438\u0442
-LocaleNames/sr/sk=\u0441\u043b\u043e\u0432\u0430\u0447\u043a\u0438
-LocaleNames/sr/sl=\u0441\u043b\u043e\u0432\u0435\u043d\u0430\u0447\u043a\u0438
-LocaleNames/sr/sq=\u0430\u043b\u0431\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/sr=\u0441\u0440\u043f\u0441\u043a\u0438
-LocaleNames/sr/sv=\u0448\u0432\u0435\u0434\u0441\u043a\u0438
-LocaleNames/sr/sw=\u0441\u0432\u0430\u0445\u0438\u043b\u0438
-LocaleNames/sr/tr=\u0442\u0443\u0440\u0441\u043a\u0438
-LocaleNames/sr/uk=\u0443\u043a\u0440\u0430\u0458\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/vi=\u0432\u0438\u0458\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438
-LocaleNames/sr/yi=\u0458\u0438\u0434\u0438\u0448
-LocaleNames/sr/zh=\u043a\u0438\u043d\u0435\u0441\u043a\u0438
-LocaleNames/sr/AD=\u0410\u043d\u0434\u043e\u0440\u0430
-LocaleNames/sr/AE=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0438 \u0410\u0440\u0430\u043f\u0441\u043a\u0438 \u0415\u043c\u0438\u0440\u0430\u0442\u0438
-LocaleNames/sr/AF=\u0410\u0432\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/AL=\u0410\u043b\u0431\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/AM=\u0408\u0435\u0440\u043c\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/AN=\u0425\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438 \u0410\u043d\u0442\u0438\u043b\u0438
-LocaleNames/sr/AO=\u0410\u043d\u0433\u043e\u043b\u0430
-LocaleNames/sr/AR=\u0410\u0440\u0433\u0435\u043d\u0442\u0438\u043d\u0430
-LocaleNames/sr/AT=\u0410\u0443\u0441\u0442\u0440\u0438\u0458\u0430
-LocaleNames/sr/AU=\u0410\u0443\u0441\u0442\u0440\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/AW=\u0410\u0440\u0443\u0431\u0430
-LocaleNames/sr/AX=\u041e\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/AZ=\u0410\u0437\u0435\u0440\u0431\u0435\u0458\u045f\u0430\u043d
-LocaleNames/sr/BA=\u0411\u043e\u0441\u043d\u0430 \u0438 \u0425\u0435\u0440\u0446\u0435\u0433\u043e\u0432\u0438\u043d\u0430
-LocaleNames/sr/BB=\u0411\u0430\u0440\u0431\u0430\u0434\u043e\u0441
-LocaleNames/sr/BD=\u0411\u0430\u043d\u0433\u043b\u0430\u0434\u0435\u0448
-LocaleNames/sr/BE=\u0411\u0435\u043b\u0433\u0438\u0458\u0430
-LocaleNames/sr/BF=\u0411\u0443\u0440\u043a\u0438\u043d\u0430 \u0424\u0430\u0441\u043e
-LocaleNames/sr/BG=\u0411\u0443\u0433\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/BH=\u0411\u0430\u0445\u0440\u0435\u0438\u043d
-LocaleNames/sr/BI=\u0411\u0443\u0440\u0443\u043d\u0434\u0438
-LocaleNames/sr/BJ=\u0411\u0435\u043d\u0438\u043d
-LocaleNames/sr/BM=\u0411\u0435\u0440\u043c\u0443\u0434\u0430
-LocaleNames/sr/BN=\u0411\u0440\u0443\u043d\u0435\u0458
-LocaleNames/sr/BO=\u0411\u043e\u043b\u0438\u0432\u0438\u0458\u0430
-LocaleNames/sr/BR=\u0411\u0440\u0430\u0437\u0438\u043b
-LocaleNames/sr/BS=\u0411\u0430\u0445\u0430\u043c\u0438
-LocaleNames/sr/BT=\u0411\u0443\u0442\u0430\u043d
-LocaleNames/sr/BV=\u041e\u0441\u0442\u0440\u0432\u043e \u0411\u0443\u0432\u0435
-LocaleNames/sr/BW=\u0411\u043e\u0446\u0432\u0430\u043d\u0430
-LocaleNames/sr/BY=\u0411\u0435\u043b\u043e\u0440\u0443\u0441\u0438\u0458\u0430
-LocaleNames/sr/BZ=\u0411\u0435\u043b\u0438\u0437\u0435
-LocaleNames/sr/CA=\u041a\u0430\u043d\u0430\u0434\u0430
-LocaleNames/sr/CC=\u041a\u043e\u043a\u043e\u0441\u043e\u0432\u0430 (\u041a\u0438\u043b\u0438\u043d\u0433\u043e\u0432\u0430) \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/CD=\u041a\u043e\u043d\u0433\u043e - \u041a\u0438\u043d\u0448\u0430\u0441\u0430
-LocaleNames/sr/CF=\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/sr/CG=\u041a\u043e\u043d\u0433\u043e - \u0411\u0440\u0430\u0437\u0430\u0432\u0438\u043b
-LocaleNames/sr/CH=\u0428\u0432\u0430\u0458\u0446\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/CI=\u041e\u0431\u0430\u043b\u0430 \u0421\u043b\u043e\u043d\u043e\u0432\u0430\u0447\u0435 (\u041a\u043e\u0442 \u0434\u2019\u0418\u0432\u043e\u0430\u0440)
-LocaleNames/sr/CL=\u0427\u0438\u043b\u0435
-LocaleNames/sr/CM=\u041a\u0430\u043c\u0435\u0440\u0443\u043d
-LocaleNames/sr/CN=\u041a\u0438\u043d\u0430
-LocaleNames/sr/CO=\u041a\u043e\u043b\u0443\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/CR=\u041a\u043e\u0441\u0442\u0430\u0440\u0438\u043a\u0430
-LocaleNames/sr/CS=\u0421\u0440\u0431\u0438\u0458\u0430 \u0438 \u0426\u0440\u043d\u0430 \u0413\u043e\u0440\u0430
-LocaleNames/sr/CU=\u041a\u0443\u0431\u0430
-LocaleNames/sr/CV=\u0417\u0435\u043b\u0435\u043d\u043e\u0440\u0442\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/CX=\u0411\u043e\u0436\u0438\u045b\u043d\u043e \u041e\u0441\u0442\u0440\u0432\u043e
-LocaleNames/sr/CY=\u041a\u0438\u043f\u0430\u0440
-LocaleNames/sr/CZ=\u0427\u0435\u0448\u043a\u0430
-LocaleNames/sr/DE=\u041d\u0435\u043c\u0430\u0447\u043a\u0430
-LocaleNames/sr/DJ=\u040f\u0438\u0431\u0443\u0442\u0438
-LocaleNames/sr/DK=\u0414\u0430\u043d\u0441\u043a\u0430
-LocaleNames/sr/DM=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430
-LocaleNames/sr/DO=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/sr/DZ=\u0410\u043b\u0436\u0438\u0440
-LocaleNames/sr/EC=\u0415\u043a\u0432\u0430\u0434\u043e\u0440
-LocaleNames/sr/EE=\u0415\u0441\u0442\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/EG=\u0415\u0433\u0438\u043f\u0430\u0442
-LocaleNames/sr/EH=\u0417\u0430\u043f\u0430\u0434\u043d\u0430 \u0421\u0430\u0445\u0430\u0440\u0430
-LocaleNames/sr/ER=\u0415\u0440\u0438\u0442\u0440\u0435\u0458\u0430
-LocaleNames/sr/ES=\u0428\u043f\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/ET=\u0415\u0442\u0438\u043e\u043f\u0438\u0458\u0430
-LocaleNames/sr/FI=\u0424\u0438\u043d\u0441\u043a\u0430
-LocaleNames/sr/FJ=\u0424\u0438\u045f\u0438
-LocaleNames/sr/FK=\u0424\u043e\u043a\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/FM=\u041c\u0438\u043a\u0440\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/FO=\u0424\u0430\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/FR=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430
-LocaleNames/sr/GA=\u0413\u0430\u0431\u043e\u043d
-LocaleNames/sr/GB=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u043e \u041a\u0440\u0430\u0459\u0435\u0432\u0441\u0442\u0432\u043e
-LocaleNames/sr/GD=\u0413\u0440\u0435\u043d\u0430\u0434\u0430
-LocaleNames/sr/GE=\u0413\u0440\u0443\u0437\u0438\u0458\u0430
-LocaleNames/sr/GF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u0413\u0432\u0430\u0458\u0430\u043d\u0430
-LocaleNames/sr/GH=\u0413\u0430\u043d\u0430
-LocaleNames/sr/GI=\u0413\u0438\u0431\u0440\u0430\u043b\u0442\u0430\u0440
-LocaleNames/sr/GL=\u0413\u0440\u0435\u043d\u043b\u0430\u043d\u0434
-LocaleNames/sr/GM=\u0413\u0430\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/GN=\u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/GP=\u0413\u0432\u0430\u0434\u0435\u043b\u0443\u043f
-LocaleNames/sr/GQ=\u0415\u043a\u0432\u0430\u0442\u043e\u0440\u0438\u0458\u0430\u043b\u043d\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/GR=\u0413\u0440\u0447\u043a\u0430
-LocaleNames/sr/GS=\u0408\u0443\u0436\u043d\u0430 \u040f\u043e\u0440\u045f\u0438\u0458\u0430 \u0438 \u0408\u0443\u0436\u043d\u0430 \u0421\u0435\u043d\u0434\u0432\u0438\u0447\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/GT=\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430
-LocaleNames/sr/GU=\u0413\u0443\u0430\u043c
-LocaleNames/sr/GW=\u0413\u0432\u0438\u043d\u0435\u0458\u0430-\u0411\u0438\u0441\u0430\u043e
-LocaleNames/sr/GY=\u0413\u0432\u0430\u0458\u0430\u043d\u0430
-LocaleNames/sr/HK=\u0421\u0410\u0420 \u0425\u043e\u043d\u0433\u043a\u043e\u043d\u0433 (\u041a\u0438\u043d\u0430)
-LocaleNames/sr/HM=\u041e\u0441\u0442\u0440\u0432\u043e \u0425\u0435\u0440\u0434 \u0438 \u041c\u0435\u043a\u0434\u043e\u043d\u0430\u043b\u0434\u043e\u0432\u0430 \u043e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/HN=\u0425\u043e\u043d\u0434\u0443\u0440\u0430\u0441
-LocaleNames/sr/HR=\u0425\u0440\u0432\u0430\u0442\u0441\u043a\u0430
-LocaleNames/sr/HT=\u0425\u0430\u0438\u0442\u0438
-LocaleNames/sr/HU=\u041c\u0430\u0452\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/ID=\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/IE=\u0418\u0440\u0441\u043a\u0430
-LocaleNames/sr/IL=\u0418\u0437\u0440\u0430\u0435\u043b
-LocaleNames/sr/IN=\u0418\u043d\u0434\u0438\u0458\u0430
-LocaleNames/sr/IQ=\u0418\u0440\u0430\u043a
-LocaleNames/sr/IR=\u0418\u0440\u0430\u043d
-LocaleNames/sr/IS=\u0418\u0441\u043b\u0430\u043d\u0434
-LocaleNames/sr/IT=\u0418\u0442\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/JM=\u0408\u0430\u043c\u0430\u0458\u043a\u0430
-LocaleNames/sr/JO=\u0408\u043e\u0440\u0434\u0430\u043d
-LocaleNames/sr/JP=\u0408\u0430\u043f\u0430\u043d
-LocaleNames/sr/KE=\u041a\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/KG=\u041a\u0438\u0440\u0433\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/KH=\u041a\u0430\u043c\u0431\u043e\u045f\u0430
-LocaleNames/sr/KI=\u041a\u0438\u0440\u0438\u0431\u0430\u0442\u0438
-LocaleNames/sr/KM=\u041a\u043e\u043c\u043e\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/KN=\u0421\u0435\u043d\u0442 \u041a\u0438\u0442\u0441 \u0438 \u041d\u0435\u0432\u0438\u0441
-LocaleNames/sr/KP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-LocaleNames/sr/KR=\u0408\u0443\u0436\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-LocaleNames/sr/KW=\u041a\u0443\u0432\u0430\u0458\u0442
-LocaleNames/sr/KY=\u041a\u0430\u0458\u043c\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/KZ=\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d
-LocaleNames/sr/LA=\u041b\u0430\u043e\u0441
-LocaleNames/sr/LB=\u041b\u0438\u0431\u0430\u043d
-LocaleNames/sr/LC=\u0421\u0432\u0435\u0442\u0430 \u041b\u0443\u0446\u0438\u0458\u0430
-LocaleNames/sr/LI=\u041b\u0438\u0445\u0442\u0435\u043d\u0448\u0442\u0430\u0458\u043d
-LocaleNames/sr/LK=\u0428\u0440\u0438 \u041b\u0430\u043d\u043a\u0430
-LocaleNames/sr/LR=\u041b\u0438\u0431\u0435\u0440\u0438\u0458\u0430
-LocaleNames/sr/LS=\u041b\u0435\u0441\u043e\u0442\u043e
-LocaleNames/sr/LT=\u041b\u0438\u0442\u0432\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/LU=\u041b\u0443\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433
-LocaleNames/sr/LV=\u041b\u0435\u0442\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/LY=\u041b\u0438\u0431\u0438\u0458\u0430
-LocaleNames/sr/MA=\u041c\u0430\u0440\u043e\u043a\u043e
-LocaleNames/sr/MC=\u041c\u043e\u043d\u0430\u043a\u043e
-LocaleNames/sr/MD=\u041c\u043e\u043b\u0434\u0430\u0432\u0438\u0458\u0430
-LocaleNames/sr/MG=\u041c\u0430\u0434\u0430\u0433\u0430\u0441\u043a\u0430\u0440
-LocaleNames/sr/MH=\u041c\u0430\u0440\u0448\u0430\u043b\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/MK=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/ML=\u041c\u0430\u043b\u0438
-LocaleNames/sr/MM=\u041c\u0438\u0458\u0430\u043d\u043c\u0430\u0440 (\u0411\u0443\u0440\u043c\u0430)
-LocaleNames/sr/MN=\u041c\u043e\u043d\u0433\u043e\u043b\u0438\u0458\u0430
-LocaleNames/sr/MO=\u0421\u0410\u0420 \u041c\u0430\u043a\u0430\u043e (\u041a\u0438\u043d\u0430)
-LocaleNames/sr/MP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/MQ=\u041c\u0430\u0440\u0442\u0438\u043d\u0438\u043a
-LocaleNames/sr/MR=\u041c\u0430\u0443\u0440\u0438\u0442\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/MS=\u041c\u043e\u043d\u0441\u0435\u0440\u0430\u0442
-LocaleNames/sr/MT=\u041c\u0430\u043b\u0442\u0430
-LocaleNames/sr/MU=\u041c\u0430\u0443\u0440\u0438\u0446\u0438\u0458\u0443\u0441
-LocaleNames/sr/MV=\u041c\u0430\u043b\u0434\u0438\u0432\u0438
-LocaleNames/sr/MW=\u041c\u0430\u043b\u0430\u0432\u0438
-LocaleNames/sr/MX=\u041c\u0435\u043a\u0441\u0438\u043a\u043e
-LocaleNames/sr/MY=\u041c\u0430\u043b\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/MZ=\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a
-LocaleNames/sr/NA=\u041d\u0430\u043c\u0438\u0431\u0438\u0458\u0430
-LocaleNames/sr/NC=\u041d\u043e\u0432\u0430 \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/NE=\u041d\u0438\u0433\u0435\u0440
-LocaleNames/sr/NF=\u041e\u0441\u0442\u0440\u0432\u043e \u041d\u043e\u0440\u0444\u043e\u043a
-LocaleNames/sr/NG=\u041d\u0438\u0433\u0435\u0440\u0438\u0458\u0430
-LocaleNames/sr/NI=\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0432\u0430
-LocaleNames/sr/NL=\u0425\u043e\u043b\u0430\u043d\u0434\u0438\u0458\u0430
-LocaleNames/sr/NO=\u041d\u043e\u0440\u0432\u0435\u0448\u043a\u0430
-LocaleNames/sr/NP=\u041d\u0435\u043f\u0430\u043b
-LocaleNames/sr/NR=\u041d\u0430\u0443\u0440\u0443
-LocaleNames/sr/NU=\u041d\u0438\u0443\u0435
-LocaleNames/sr/NZ=\u041d\u043e\u0432\u0438 \u0417\u0435\u043b\u0430\u043d\u0434
-LocaleNames/sr/OM=\u041e\u043c\u0430\u043d
-LocaleNames/sr/PA=\u041f\u0430\u043d\u0430\u043c\u0430
-LocaleNames/sr/PE=\u041f\u0435\u0440\u0443
-LocaleNames/sr/PF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u041f\u043e\u043b\u0438\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/PG=\u041f\u0430\u043f\u0443\u0430 \u041d\u043e\u0432\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/PH=\u0424\u0438\u043b\u0438\u043f\u0438\u043d\u0438
-LocaleNames/sr/PK=\u041f\u0430\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/PL=\u041f\u043e\u0459\u0441\u043a\u0430
-LocaleNames/sr/PM=\u0421\u0435\u043d \u041f\u0458\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d
-LocaleNames/sr/PN=\u041f\u0438\u0442\u043a\u0435\u0440\u043d
-LocaleNames/sr/PR=\u041f\u043e\u0440\u0442\u043e\u0440\u0438\u043a\u043e
-LocaleNames/sr/PS=\u041f\u0430\u043b\u0435\u0441\u0442\u0438\u043d\u0441\u043a\u0435 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-LocaleNames/sr/PT=\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/PW=\u041f\u0430\u043b\u0430\u0443
-LocaleNames/sr/PY=\u041f\u0430\u0440\u0430\u0433\u0432\u0430\u0458
-LocaleNames/sr/QA=\u041a\u0430\u0442\u0430\u0440
-LocaleNames/sr/RE=\u0420\u0435\u0438\u043d\u0438\u043e\u043d
-LocaleNames/sr/RO=\u0420\u0443\u043c\u0443\u043d\u0438\u0458\u0430
-LocaleNames/sr/RU=\u0420\u0443\u0441\u0438\u0458\u0430
-LocaleNames/sr/RW=\u0420\u0443\u0430\u043d\u0434\u0430
-LocaleNames/sr/SA=\u0421\u0430\u0443\u0434\u0438\u0458\u0441\u043a\u0430 \u0410\u0440\u0430\u0431\u0438\u0458\u0430
-LocaleNames/sr/SB=\u0421\u043e\u043b\u043e\u043c\u043e\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/SC=\u0421\u0435\u0458\u0448\u0435\u043b\u0438
-LocaleNames/sr/SD=\u0421\u0443\u0434\u0430\u043d
-LocaleNames/sr/SE=\u0428\u0432\u0435\u0434\u0441\u043a\u0430
-LocaleNames/sr/SG=\u0421\u0438\u043d\u0433\u0430\u043f\u0443\u0440
-LocaleNames/sr/SH=\u0421\u0432\u0435\u0442\u0430 \u0408\u0435\u043b\u0435\u043d\u0430
-LocaleNames/sr/SI=\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/SJ=\u0421\u0432\u0430\u043b\u0431\u0430\u0440\u0434 \u0438 \u0408\u0430\u043d \u041c\u0430\u0458\u0435\u043d
-LocaleNames/sr/SK=\u0421\u043b\u043e\u0432\u0430\u0447\u043a\u0430
-LocaleNames/sr/SL=\u0421\u0438\u0458\u0435\u0440\u0430 \u041b\u0435\u043e\u043d\u0435
-LocaleNames/sr/SM=\u0421\u0430\u043d \u041c\u0430\u0440\u0438\u043d\u043e
-LocaleNames/sr/SN=\u0421\u0435\u043d\u0435\u0433\u0430\u043b
-LocaleNames/sr/SO=\u0421\u043e\u043c\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/SR=\u0421\u0443\u0440\u0438\u043d\u0430\u043c
-LocaleNames/sr/ST=\u0421\u0430\u043e \u0422\u043e\u043c\u0435 \u0438 \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0435
-LocaleNames/sr/SV=\u0421\u0430\u043b\u0432\u0430\u0434\u043e\u0440
-LocaleNames/sr/SY=\u0421\u0438\u0440\u0438\u0458\u0430
-LocaleNames/sr/TC=\u041e\u0441\u0442\u0440\u0432\u0430 \u0422\u0443\u0440\u043a\u0441 \u0438 \u041a\u0430\u0438\u043a\u043e\u0441
-LocaleNames/sr/TD=\u0427\u0430\u0434
-LocaleNames/sr/TF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0435 \u0408\u0443\u0436\u043d\u0435 \u0422\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-LocaleNames/sr/TG=\u0422\u043e\u0433\u043e
-LocaleNames/sr/TH=\u0422\u0430\u0458\u043b\u0430\u043d\u0434
-LocaleNames/sr/TJ=\u0422\u0430\u045f\u0438\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/TK=\u0422\u043e\u043a\u0435\u043b\u0430\u0443
-LocaleNames/sr/TL=\u0422\u0438\u043c\u043e\u0440-\u041b\u0435\u0441\u0442\u0435 (\u0418\u0441\u0442\u043e\u0447\u043d\u0438 \u0422\u0438\u043c\u043e\u0440)
-LocaleNames/sr/TM=\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/TN=\u0422\u0443\u043d\u0438\u0441
-LocaleNames/sr/TO=\u0422\u043e\u043d\u0433\u0430
-LocaleNames/sr/TR=\u0422\u0443\u0440\u0441\u043a\u0430
-LocaleNames/sr/TT=\u0422\u0440\u0438\u043d\u0438\u0434\u0430\u0434 \u0438 \u0422\u043e\u0431\u0430\u0433\u043e
-LocaleNames/sr/TV=\u0422\u0443\u0432\u0430\u043b\u0443
-LocaleNames/sr/TW=\u0422\u0430\u0458\u0432\u0430\u043d
-LocaleNames/sr/TZ=\u0422\u0430\u043d\u0437\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/UA=\u0423\u043a\u0440\u0430\u0458\u0438\u043d\u0430
-LocaleNames/sr/UG=\u0423\u0433\u0430\u043d\u0434\u0430
-LocaleNames/sr/UM=\u0423\u0434\u0430\u0459\u0435\u043d\u0430 \u043e\u0441\u0442\u0440\u0432\u0430 \u0421\u0410\u0414
-LocaleNames/sr/US=\u0421\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0435 \u0414\u0440\u0436\u0430\u0432\u0435
-LocaleNames/sr/UY=\u0423\u0440\u0443\u0433\u0432\u0430\u0458
-LocaleNames/sr/UZ=\u0423\u0437\u0431\u0435\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/VA=\u0412\u0430\u0442\u0438\u043a\u0430\u043d
-LocaleNames/sr/VC=\u0421\u0435\u043d\u0442 \u0412\u0438\u043d\u0441\u0435\u043d\u0442 \u0438 \u0413\u0440\u0435\u043d\u0430\u0434\u0438\u043d\u0438
-LocaleNames/sr/VE=\u0412\u0435\u043d\u0435\u0446\u0443\u0435\u043b\u0430
-LocaleNames/sr/VG=\u0411\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/VI=\u0410\u043c\u0435\u0440\u0438\u0447\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/VN=\u0412\u0438\u0458\u0435\u0442\u043d\u0430\u043c
-LocaleNames/sr/VU=\u0412\u0430\u043d\u0443\u0430\u0442\u0443
-LocaleNames/sr/WF=\u0412\u0430\u043b\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043d\u0430
-LocaleNames/sr/WS=\u0421\u0430\u043c\u043e\u0430
-LocaleNames/sr/YE=\u0408\u0435\u043c\u0435\u043d
-LocaleNames/sr/YT=\u041c\u0430\u0458\u043e\u0442
-LocaleNames/sr/ZM=\u0417\u0430\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/ZW=\u0417\u0438\u043c\u0431\u0430\u0431\u0432\u0435
-CalendarData/sr/firstDayOfWeek=2
-CurrencyNames/sr_CS/EUR=\u20ac
-# bug 6498742: data is changed
-CurrencyNames/sr_BA/BAM=\u041a\u041c.
-
-CurrencyNames/sr_BA/EUR=\u20ac
-
-# bug #6351682 Country name for Korean is wrong in Simplified Chinese
-LocaleNames/zh/KP=\u671d\u9c9c
-LocaleNames/zh/KR=\u97e9\u56fd
-
-# bug 6379382: Finnish time of day should be formatted as "H.mm.ss", not "hh:mm:ss"
-FormatData/fi/TimePatterns/0=H.mm.ss z
-FormatData/fi/TimePatterns/1='klo 'H.mm.ss
-
-# bug 6455680 Update locale data derived from CLDR1.3 to CLDR1.4
-LocaleNames/pt/CS=S\u00e9rvia e Montenegro
-
-# bug 6498742: data for IR & ZW changed
-LocaleNames/pt_PT/IR=Ir\u00e3
-LocaleNames/pt_PT/ZW=Zimb\u00e1bue
-
-LocaleNames/el/ar=\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el/be=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/bg=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el/bn=\u0392\u03b5\u03b3\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/bo=\u0398\u03b9\u03b2\u03b5\u03c4\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el/bs=\u0392\u03bf\u03c3\u03bd\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el/ca=\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/co=\u039a\u03bf\u03c1\u03c3\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/cs=\u03a4\u03c3\u03b5\u03c7\u03b9\u03ba\u03ac
-LocaleNames/el/cy=\u039f\u03c5\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/da=\u0394\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/de=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/el=\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/en=\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/es=\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/et=\u0395\u03c3\u03b8\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/eu=\u0392\u03b1\u03c3\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/fa=\u03a0\u03b5\u03c1\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/fi=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/fr=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/ga=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/gd=\u03a3\u03ba\u03c9\u03c4\u03b9\u03ba\u03ac \u039a\u03b5\u03bb\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/he=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el/hi=\u03a7\u03af\u03bd\u03c4\u03b9
-LocaleNames/el/hr=\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/hu=\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el/hy=\u0391\u03c1\u03bc\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/id=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el/in=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el/is=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/it=\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/iw=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el/ja=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/ji=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el/ka=\u0393\u03b5\u03c9\u03c1\u03b3\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el/ko=\u039a\u03bf\u03c1\u03b5\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/la=\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/lt=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/lv=\u039b\u03b5\u03c4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/mk=\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/mn=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/mo=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el/mt=\u039c\u03b1\u03bb\u03c4\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el/no=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac
-LocaleNames/el/pl=\u03a0\u03bf\u03bb\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/pt=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/ro=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/ru=\u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/sk=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/sl=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/sq=\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/sr=\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el/sv=\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/th=\u03a4\u03b1\u03ca\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/tr=\u03a4\u03bf\u03c5\u03c1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/uk=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/vi=\u0392\u03b9\u03b5\u03c4\u03bd\u03b1\u03bc\u03b9\u03ba\u03ac
-LocaleNames/el/yi=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el/zh=\u039a\u03b9\u03bd\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el/AD=\u0391\u03bd\u03b4\u03cc\u03c1\u03b1
-LocaleNames/el/AE=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac \u0395\u03bc\u03b9\u03c1\u03ac\u03c4\u03b1
-LocaleNames/el/AF=\u0391\u03c6\u03b3\u03b1\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\u03b1\u03b9 \u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03bf\u03cd\u03bd\u03c4\u03b1
-LocaleNames/el/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
-LocaleNames/el/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el/AN=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03af\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el/AO=\u0391\u03b3\u03ba\u03cc\u03bb\u03b1
-LocaleNames/el/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
-LocaleNames/el/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
-LocaleNames/el/AS=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el/AT=\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1
-LocaleNames/el/AU=\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/AW=\u0391\u03c1\u03bf\u03cd\u03bc\u03c0\u03b1
-LocaleNames/el/AX=\u039d\u03ae\u03c3\u03bf\u03b9 \u038c\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el/AZ=\u0391\u03b6\u03b5\u03c1\u03bc\u03c0\u03b1\u03ca\u03c4\u03b6\u03ac\u03bd
-LocaleNames/el/BA=\u0392\u03bf\u03c3\u03bd\u03af\u03b1 - \u0395\u03c1\u03b6\u03b5\u03b3\u03bf\u03b2\u03af\u03bd\u03b7
-LocaleNames/el/BB=\u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03ad\u03b9\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el/BD=\u039c\u03c0\u03b1\u03bd\u03b3\u03ba\u03bb\u03b1\u03bd\u03c4\u03ad\u03c2
-LocaleNames/el/BE=\u0392\u03ad\u03bb\u03b3\u03b9\u03bf
-LocaleNames/el/BF=\u039c\u03c0\u03bf\u03c5\u03c1\u03ba\u03af\u03bd\u03b1 \u03a6\u03ac\u03c3\u03bf
-LocaleNames/el/BG=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el/BH=\u039c\u03c0\u03b1\u03c7\u03c1\u03ad\u03b9\u03bd
-LocaleNames/el/BI=\u039c\u03c0\u03bf\u03c5\u03c1\u03bf\u03cd\u03bd\u03c4\u03b9
-LocaleNames/el/BJ=\u039c\u03c0\u03b5\u03bd\u03af\u03bd
-LocaleNames/el/BM=\u0392\u03b5\u03c1\u03bc\u03bf\u03cd\u03b4\u03b5\u03c2
-LocaleNames/el/BN=\u039c\u03c0\u03c1\u03bf\u03c5\u03bd\u03ad\u03b9
-LocaleNames/el/BO=\u0392\u03bf\u03bb\u03b9\u03b2\u03af\u03b1
-LocaleNames/el/BR=\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1
-LocaleNames/el/BS=\u039c\u03c0\u03b1\u03c7\u03ac\u03bc\u03b5\u03c2
-LocaleNames/el/BT=\u039c\u03c0\u03bf\u03c5\u03c4\u03ac\u03bd
-LocaleNames/el/BV=\u039d\u03ae\u03c3\u03bf\u03c2 \u039c\u03c0\u03bf\u03c5\u03b2\u03ad
-LocaleNames/el/BW=\u039c\u03c0\u03bf\u03c4\u03c3\u03bf\u03c5\u03ac\u03bd\u03b1
-LocaleNames/el/BY=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el/BZ=\u039c\u03c0\u03b5\u03bb\u03af\u03b6
-LocaleNames/el/CA=\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2
-LocaleNames/el/CC=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03cc\u03ba\u03bf\u03c2 (\u039a\u03af\u03bb\u03b9\u03bd\u03b3\u03ba)
-LocaleNames/el/CD=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039a\u03b9\u03bd\u03c3\u03ac\u03c3\u03b1
-LocaleNames/el/CF=\u039a\u03b5\u03bd\u03c4\u03c1\u03bf\u03b1\u03c6\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/CG=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039c\u03c0\u03c1\u03b1\u03b6\u03b1\u03b2\u03af\u03bb
-LocaleNames/el/CH=\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1
-LocaleNames/el/CI=\u0391\u03ba\u03c4\u03ae \u0395\u03bb\u03b5\u03c6\u03b1\u03bd\u03c4\u03bf\u03c3\u03c4\u03bf\u03cd
-LocaleNames/el/CK=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03bf\u03c5\u03ba
-LocaleNames/el/CL=\u03a7\u03b9\u03bb\u03ae
-LocaleNames/el/CM=\u039a\u03b1\u03bc\u03b5\u03c1\u03bf\u03cd\u03bd
-LocaleNames/el/CN=\u039a\u03af\u03bd\u03b1
-LocaleNames/el/CO=\u039a\u03bf\u03bb\u03bf\u03bc\u03b2\u03af\u03b1
-LocaleNames/el/CR=\u039a\u03cc\u03c3\u03c4\u03b1 \u03a1\u03af\u03ba\u03b1
-LocaleNames/el/CS=\u03a3\u03b5\u03c1\u03b2\u03af\u03b1 \u03ba\u03b1\u03b9 \u039c\u03b1\u03c5\u03c1\u03bf\u03b2\u03bf\u03cd\u03bd\u03b9\u03bf
-LocaleNames/el/CU=\u039a\u03bf\u03cd\u03b2\u03b1
-LocaleNames/el/CV=\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf \u0391\u03ba\u03c1\u03c9\u03c4\u03ae\u03c1\u03b9\u03bf
-LocaleNames/el/CX=\u039d\u03ae\u03c3\u03bf\u03c2 \u03c4\u03c9\u03bd \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03c5\u03b3\u03ad\u03bd\u03bd\u03c9\u03bd
-LocaleNames/el/CY=\u039a\u03cd\u03c0\u03c1\u03bf\u03c2
-LocaleNames/el/CZ=\u03a4\u03c3\u03b5\u03c7\u03af\u03b1
-LocaleNames/el/DE=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/DJ=\u03a4\u03b6\u03b9\u03bc\u03c0\u03bf\u03c5\u03c4\u03af
-LocaleNames/el/DK=\u0394\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/DM=\u039d\u03c4\u03bf\u03bc\u03af\u03bd\u03b9\u03ba\u03b1
-LocaleNames/el/DO=\u0394\u03bf\u03bc\u03b9\u03bd\u03b9\u03ba\u03b1\u03bd\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/DZ=\u0391\u03bb\u03b3\u03b5\u03c1\u03af\u03b1
-LocaleNames/el/EC=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03cc\u03c2
-LocaleNames/el/EE=\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/EG=\u0391\u03af\u03b3\u03c5\u03c0\u03c4\u03bf\u03c2
-LocaleNames/el/EH=\u0394\u03c5\u03c4\u03b9\u03ba\u03ae \u03a3\u03b1\u03c7\u03ac\u03c1\u03b1
-LocaleNames/el/ER=\u0395\u03c1\u03c5\u03b8\u03c1\u03b1\u03af\u03b1
-LocaleNames/el/ES=\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/ET=\u0391\u03b9\u03b8\u03b9\u03bf\u03c0\u03af\u03b1
-LocaleNames/el/FI=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/FJ=\u03a6\u03af\u03c4\u03b6\u03b9
-LocaleNames/el/FK=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03cc\u03ba\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el/FM=\u039c\u03b9\u03ba\u03c1\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/FO=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03b5\u03c1\u03cc\u03b5\u03c2
-LocaleNames/el/FR=\u0393\u03b1\u03bb\u03bb\u03af\u03b1
-LocaleNames/el/GA=\u0393\u03ba\u03b1\u03bc\u03c0\u03cc\u03bd
-LocaleNames/el/GB=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf
-LocaleNames/el/GD=\u0393\u03c1\u03b5\u03bd\u03ac\u03b4\u03b1
-LocaleNames/el/GE=\u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1
-LocaleNames/el/GF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el/GH=\u0393\u03ba\u03ac\u03bd\u03b1
-LocaleNames/el/GI=\u0393\u03b9\u03b2\u03c1\u03b1\u03bb\u03c4\u03ac\u03c1
-LocaleNames/el/GL=\u0393\u03c1\u03bf\u03b9\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/GM=\u0393\u03ba\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/GN=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/GP=\u0393\u03bf\u03c5\u03b1\u03b4\u03b5\u03bb\u03bf\u03cd\u03c0\u03b7
-LocaleNames/el/GQ=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/GS=\u039d\u03ae\u03c3\u03bf\u03b9 \u039d\u03cc\u03c4\u03b9\u03b1 \u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1 \u03ba\u03b1\u03b9 \u039d\u03cc\u03c4\u03b9\u03b5\u03c2 \u03a3\u03ac\u03bd\u03c4\u03bf\u03c5\u03b9\u03c4\u03c2
-LocaleNames/el/GT=\u0393\u03bf\u03c5\u03b1\u03c4\u03b5\u03bc\u03ac\u03bb\u03b1
-LocaleNames/el/GU=\u0393\u03ba\u03bf\u03c5\u03ac\u03bc
-LocaleNames/el/GW=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1 \u039c\u03c0\u03b9\u03c3\u03ac\u03bf\u03c5
-LocaleNames/el/GY=\u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el/HK=\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el/HM=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a7\u03b5\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u039c\u03b1\u03ba\u03bd\u03c4\u03cc\u03bd\u03b1\u03bb\u03bd\u03c4
-LocaleNames/el/HN=\u039f\u03bd\u03b4\u03bf\u03cd\u03c1\u03b1
-LocaleNames/el/HR=\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/HT=\u0391\u03ca\u03c4\u03ae
-LocaleNames/el/HU=\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el/ID=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/IE=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IL=\u0399\u03c3\u03c1\u03b1\u03ae\u03bb
-LocaleNames/el/IN=\u0399\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IO=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7 \u0399\u03bd\u03b4\u03b9\u03ba\u03bf\u03cd \u03a9\u03ba\u03b5\u03b1\u03bd\u03bf\u03cd
-LocaleNames/el/IQ=\u0399\u03c1\u03ac\u03ba
-LocaleNames/el/IR=\u0399\u03c1\u03ac\u03bd
-LocaleNames/el/IS=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IT=\u0399\u03c4\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/JM=\u03a4\u03b6\u03b1\u03bc\u03ac\u03b9\u03ba\u03b1
-LocaleNames/el/JO=\u0399\u03bf\u03c1\u03b4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/JP=\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1
-LocaleNames/el/KE=\u039a\u03ad\u03bd\u03c5\u03b1
-LocaleNames/el/KG=\u039a\u03b9\u03c1\u03b3\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/KH=\u039a\u03b1\u03bc\u03c0\u03cc\u03c4\u03b6\u03b7
-LocaleNames/el/KI=\u039a\u03b9\u03c1\u03b9\u03bc\u03c0\u03ac\u03c4\u03b9
-LocaleNames/el/KM=\u039a\u03bf\u03bc\u03cc\u03c1\u03b5\u03c2
-LocaleNames/el/KN=\u03a3\u03b5\u03bd \u039a\u03b9\u03c4\u03c2 \u03ba\u03b1\u03b9 \u039d\u03ad\u03b2\u03b9\u03c2
-LocaleNames/el/KP=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el/KR=\u039d\u03cc\u03c4\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el/KW=\u039a\u03bf\u03c5\u03b2\u03ad\u03b9\u03c4
-LocaleNames/el/KY=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03ad\u03b9\u03bc\u03b1\u03bd
-LocaleNames/el/KZ=\u039a\u03b1\u03b6\u03b1\u03ba\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/LA=\u039b\u03ac\u03bf\u03c2
-LocaleNames/el/LB=\u039b\u03af\u03b2\u03b1\u03bd\u03bf\u03c2
-LocaleNames/el/LC=\u0391\u03b3\u03af\u03b1 \u039b\u03bf\u03c5\u03ba\u03af\u03b1
-LocaleNames/el/LI=\u039b\u03b9\u03c7\u03c4\u03b5\u03bd\u03c3\u03c4\u03ac\u03b9\u03bd
-LocaleNames/el/LK=\u03a3\u03c1\u03b9 \u039b\u03ac\u03bd\u03ba\u03b1
-LocaleNames/el/LR=\u039b\u03b9\u03b2\u03b5\u03c1\u03af\u03b1
-LocaleNames/el/LS=\u039b\u03b5\u03c3\u03cc\u03c4\u03bf
-LocaleNames/el/LT=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/LU=\u039b\u03bf\u03c5\u03be\u03b5\u03bc\u03b2\u03bf\u03cd\u03c1\u03b3\u03bf
-LocaleNames/el/LV=\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/LY=\u039b\u03b9\u03b2\u03cd\u03b7
-LocaleNames/el/MA=\u039c\u03b1\u03c1\u03cc\u03ba\u03bf
-LocaleNames/el/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
-LocaleNames/el/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
-LocaleNames/el/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
-LocaleNames/el/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el/MK=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/ML=\u039c\u03ac\u03bb\u03b9
-LocaleNames/el/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1 (\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1)
-LocaleNames/el/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
-LocaleNames/el/MO=\u039c\u03b1\u03ba\u03ac\u03bf \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el/MP=\u039d\u03ae\u03c3\u03bf\u03b9 \u0392\u03cc\u03c1\u03b5\u03b9\u03b5\u03c2 \u039c\u03b1\u03c1\u03b9\u03ac\u03bd\u03b5\u03c2
-LocaleNames/el/MQ=\u039c\u03b1\u03c1\u03c4\u03b9\u03bd\u03af\u03ba\u03b1
-LocaleNames/el/MR=\u039c\u03b1\u03c5\u03c1\u03b9\u03c4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/MS=\u039c\u03bf\u03bd\u03c3\u03b5\u03c1\u03ac\u03c4
-LocaleNames/el/MT=\u039c\u03ac\u03bb\u03c4\u03b1
-LocaleNames/el/MU=\u039c\u03b1\u03c5\u03c1\u03af\u03ba\u03b9\u03bf\u03c2
-LocaleNames/el/MV=\u039c\u03b1\u03bb\u03b4\u03af\u03b2\u03b5\u03c2
-LocaleNames/el/MW=\u039c\u03b1\u03bb\u03ac\u03bf\u03c5\u03b9
-LocaleNames/el/MX=\u039c\u03b5\u03be\u03b9\u03ba\u03cc
-LocaleNames/el/MY=\u039c\u03b1\u03bb\u03b1\u03b9\u03c3\u03af\u03b1
-LocaleNames/el/MZ=\u039c\u03bf\u03b6\u03b1\u03bc\u03b2\u03af\u03ba\u03b7
-LocaleNames/el/NA=\u039d\u03b1\u03bc\u03af\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/NC=\u039d\u03ad\u03b1 \u039a\u03b1\u03bb\u03b7\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/NE=\u039d\u03af\u03b3\u03b7\u03c1\u03b1\u03c2
-LocaleNames/el/NF=\u039d\u03ae\u03c3\u03bf\u03c2 \u039d\u03cc\u03c1\u03c6\u03bf\u03bb\u03ba
-LocaleNames/el/NG=\u039d\u03b9\u03b3\u03b7\u03c1\u03af\u03b1
-LocaleNames/el/NI=\u039d\u03b9\u03ba\u03b1\u03c1\u03ac\u03b3\u03bf\u03c5\u03b1
-LocaleNames/el/NL=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/NO=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1
-LocaleNames/el/NP=\u039d\u03b5\u03c0\u03ac\u03bb
-LocaleNames/el/NR=\u039d\u03b1\u03bf\u03c5\u03c1\u03bf\u03cd
-LocaleNames/el/NU=\u039d\u03b9\u03bf\u03cd\u03b5
-LocaleNames/el/NZ=\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/OM=\u039f\u03bc\u03ac\u03bd
-LocaleNames/el/PA=\u03a0\u03b1\u03bd\u03b1\u03bc\u03ac\u03c2
-LocaleNames/el/PE=\u03a0\u03b5\u03c1\u03bf\u03cd
-LocaleNames/el/PF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u03a0\u03bf\u03bb\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/PG=\u03a0\u03b1\u03c0\u03bf\u03cd\u03b1 \u039d\u03ad\u03b1 \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/PH=\u03a6\u03b9\u03bb\u03b9\u03c0\u03c0\u03af\u03bd\u03b5\u03c2
-LocaleNames/el/PK=\u03a0\u03b1\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/PL=\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1
-LocaleNames/el/PM=\u03a3\u03b5\u03bd \u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd
-LocaleNames/el/PN=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a0\u03af\u03c4\u03ba\u03b5\u03c1\u03bd
-LocaleNames/el/PR=\u03a0\u03bf\u03c5\u03ad\u03c1\u03c4\u03bf \u03a1\u03af\u03ba\u03bf
-LocaleNames/el/PS=\u03a0\u03b1\u03bb\u03b1\u03b9\u03c3\u03c4\u03b9\u03bd\u03b9\u03b1\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el/PT=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/PW=\u03a0\u03b1\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el/PY=\u03a0\u03b1\u03c1\u03b1\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el/QA=\u039a\u03b1\u03c4\u03ac\u03c1
-LocaleNames/el/RE=\u03a1\u03b5\u03ca\u03bd\u03b9\u03cc\u03bd
-LocaleNames/el/RO=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/RU=\u03a1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el/RW=\u03a1\u03bf\u03c5\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el/SA=\u03a3\u03b1\u03bf\u03c5\u03b4\u03b9\u03ba\u03ae \u0391\u03c1\u03b1\u03b2\u03af\u03b1
-LocaleNames/el/SB=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a3\u03bf\u03bb\u03bf\u03bc\u03ce\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el/SC=\u03a3\u03b5\u03cb\u03c7\u03ad\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el/SD=\u03a3\u03bf\u03c5\u03b4\u03ac\u03bd
-LocaleNames/el/SE=\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1
-LocaleNames/el/SG=\u03a3\u03b9\u03b3\u03ba\u03b1\u03c0\u03bf\u03cd\u03c1\u03b7
-LocaleNames/el/SH=\u0391\u03b3\u03af\u03b1 \u0395\u03bb\u03ad\u03bd\u03b7
-LocaleNames/el/SI=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1
-LocaleNames/el/SJ=\u03a3\u03b2\u03ac\u03bb\u03bc\u03c0\u03b1\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u0393\u03b9\u03b1\u03bd \u039c\u03b1\u03b3\u03b9\u03ad\u03bd
-LocaleNames/el/SK=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1
-LocaleNames/el/SL=\u03a3\u03b9\u03ad\u03c1\u03b1 \u039b\u03b5\u03cc\u03bd\u03b5
-LocaleNames/el/SM=\u0386\u03b3\u03b9\u03bf\u03c2 \u039c\u03b1\u03c1\u03af\u03bd\u03bf\u03c2
-LocaleNames/el/SN=\u03a3\u03b5\u03bd\u03b5\u03b3\u03ac\u03bb\u03b7
-LocaleNames/el/SO=\u03a3\u03bf\u03bc\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/SR=\u03a3\u03bf\u03c5\u03c1\u03b9\u03bd\u03ac\u03bc
-LocaleNames/el/ST=\u03a3\u03ac\u03bf \u03a4\u03bf\u03bc\u03ad \u03ba\u03b1\u03b9 \u03a0\u03c1\u03af\u03bd\u03c3\u03b9\u03c0\u03b5
-LocaleNames/el/SV=\u0395\u03bb \u03a3\u03b1\u03bb\u03b2\u03b1\u03b4\u03cc\u03c1
-LocaleNames/el/SY=\u03a3\u03c5\u03c1\u03af\u03b1
-LocaleNames/el/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba\u03c2 \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
-LocaleNames/el/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
-LocaleNames/el/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
-LocaleNames/el/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/TK=\u03a4\u03bf\u03ba\u03b5\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el/TL=\u03a4\u03b9\u03bc\u03cc\u03c1-\u039b\u03ad\u03c3\u03c4\u03b5
-LocaleNames/el/TM=\u03a4\u03bf\u03c5\u03c1\u03ba\u03bc\u03b5\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/TN=\u03a4\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/TO=\u03a4\u03cc\u03bd\u03b3\u03ba\u03b1
-LocaleNames/el/TR=\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1
-LocaleNames/el/TT=\u03a4\u03c1\u03b9\u03bd\u03b9\u03bd\u03c4\u03ac\u03bd\u03c4 \u03ba\u03b1\u03b9 \u03a4\u03bf\u03bc\u03c0\u03ac\u03b3\u03ba\u03bf
-LocaleNames/el/TV=\u03a4\u03bf\u03c5\u03b2\u03b1\u03bb\u03bf\u03cd
-LocaleNames/el/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
-LocaleNames/el/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
-LocaleNames/el/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
-LocaleNames/el/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/VA=\u0392\u03b1\u03c4\u03b9\u03ba\u03b1\u03bd\u03cc
-LocaleNames/el/VC=\u0386\u03b3\u03b9\u03bf\u03c2 \u0392\u03b9\u03ba\u03ad\u03bd\u03c4\u03b9\u03bf\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b5\u03bd\u03b1\u03b4\u03af\u03bd\u03b5\u03c2
-LocaleNames/el/VE=\u0392\u03b5\u03bd\u03b5\u03b6\u03bf\u03c5\u03ad\u03bb\u03b1
-LocaleNames/el/VG=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el/VI=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el/VN=\u0392\u03b9\u03b5\u03c4\u03bd\u03ac\u03bc
-LocaleNames/el/VU=\u0392\u03b1\u03bd\u03bf\u03c5\u03ac\u03c4\u03bf\u03c5
-LocaleNames/el/WF=\u0393\u03bf\u03c5\u03ac\u03bb\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03a6\u03bf\u03c5\u03c4\u03bf\u03cd\u03bd\u03b1
-LocaleNames/el/WS=\u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el/YE=\u03a5\u03b5\u03bc\u03ad\u03bd\u03b7
-LocaleNames/el/YT=\u039c\u03b1\u03b3\u03b9\u03cc\u03c4
-LocaleNames/el/ZA=\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae
-LocaleNames/el/ZM=\u0396\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/ZW=\u0396\u03b9\u03bc\u03c0\u03ac\u03bc\u03c0\u03bf\u03c5\u03b5
-LocaleNames/en_MT/fy=Western Frisian
-LocaleNames/en_MT/gl=Galician
-LocaleNames/en_MT/ps=Pashto
-LocaleNames/en_MT/AX=\u00c5land Islands
-LocaleNames/en_MT/CD=Congo - Kinshasa
-LocaleNames/en_MT/CG=Congo - Brazzaville
-LocaleNames/en_MT/CS=Serbia And Montenegro
-LocaleNames/en_MT/HK=Hong Kong SAR China
-LocaleNames/en_MT/MO=Macao SAR China
-LocaleNames/en_PH/fy=Western Frisian
-LocaleNames/en_PH/gl=Galician
-LocaleNames/en_PH/ps=Pashto
-LocaleNames/en_PH/AX=\u00c5land Islands
-LocaleNames/en_PH/CD=Congo - Kinshasa
-LocaleNames/en_PH/CG=Congo - Brazzaville
-LocaleNames/en_PH/CS=Serbia And Montenegro
-LocaleNames/en_PH/HK=Hong Kong SAR China
-LocaleNames/en_PH/MO=Macao SAR China
-LocaleNames/en_PH/MO=Macao SAR China
-LocaleNames/en_SG/fy=Western Frisian
-LocaleNames/en_SG/gl=Galician
-LocaleNames/en_SG/ps=Pashto
-LocaleNames/en_SG/AX=\u00c5land Islands
-LocaleNames/en_SG/CD=Congo - Kinshasa
-LocaleNames/en_SG/CG=Congo - Brazzaville
-LocaleNames/en_SG/CS=Serbia And Montenegro
-LocaleNames/en_SG/HK=Hong Kong SAR China
-LocaleNames/en_SG/MO=Macao SAR China
-LocaleNames/es_US/ab=abjasio
-LocaleNames/es_US/dz=dzongkha
-LocaleNames/es_US/fj=fiyiano
-LocaleNames/es_US/si=cingal\u00e9s
-LocaleNames/es_US/ti=tigri\u00f1a
-LocaleNames/es_US/vo=volap\u00fck
-LocaleNames/es_US/AX=Islas \u00c5land
-LocaleNames/es_US/BH=Bar\u00e9in
-LocaleNames/es_US/KG=Kirguist\u00e1n
-LocaleNames/mt/ab=Abka\u017cjan
-LocaleNames/mt/af=Afrikans
-LocaleNames/mt/am=Amhariku
-LocaleNames/mt/ar=G\u0127arbi
-LocaleNames/mt/av=Avarik
-LocaleNames/mt/ay=Aymara
-LocaleNames/mt/az=A\u017cerbaj\u0121ani
-LocaleNames/mt/ba=Bashkir
-LocaleNames/mt/be=Belarussu
-LocaleNames/mt/bg=Bulgaru
-LocaleNames/mt/bh=Bi\u0127ari
-LocaleNames/mt/bo=Tibetjan
-LocaleNames/mt/br=Breton
-LocaleNames/mt/bs=Bo\u017cnijaku
-LocaleNames/mt/ca=Katalan
-LocaleNames/mt/ce=Chechen
-LocaleNames/mt/ch=Chamorro
-LocaleNames/mt/co=Korsiku
-LocaleNames/mt/cr=Cree
-LocaleNames/mt/cs=\u010aek
-LocaleNames/mt/cu=Slaviku tal-Knisja
-LocaleNames/mt/cv=Chuvash
-LocaleNames/mt/cy=Welsh
-LocaleNames/mt/da=Dani\u017c
-LocaleNames/mt/de=\u0120ermani\u017c
-LocaleNames/mt/dv=Divehi
-LocaleNames/mt/dz=Dzongkha
-LocaleNames/mt/el=Grieg
-LocaleNames/mt/en=Ingli\u017c
-LocaleNames/mt/es=Spanjol
-LocaleNames/mt/et=Estonjan
-LocaleNames/mt/eu=Bask
-LocaleNames/mt/fa=Persjan
-LocaleNames/mt/ff=Fulah
-LocaleNames/mt/fi=Finlandi\u017c
-LocaleNames/mt/fj=Fi\u0121jan
-LocaleNames/mt/fo=Faroese
-LocaleNames/mt/fr=Fran\u010bi\u017c
-LocaleNames/mt/fy=Frisian tal-Punent
-LocaleNames/mt/ga=Irlandi\u017c
-LocaleNames/mt/gd=Galliku Sko\u010b\u010bi\u017c
-LocaleNames/mt/gl=Gali\u010bjan
-LocaleNames/mt/gn=Guarani
-LocaleNames/mt/gu=Gujarati
-LocaleNames/mt/gv=Manx
-LocaleNames/mt/ha=Hausa
-LocaleNames/mt/he=Ebrajk
-LocaleNames/mt/hi=Hindi
-LocaleNames/mt/ho=Hiri Motu
-LocaleNames/mt/hr=Kroat
-LocaleNames/mt/hu=Ungeri\u017c
-LocaleNames/mt/hy=Armen
-LocaleNames/mt/hz=Herero
-LocaleNames/mt/id=Indone\u017cjan
-LocaleNames/mt/ik=Inupjak
-LocaleNames/mt/in=Indone\u017cjan
-LocaleNames/mt/is=I\u017clandi\u017c
-LocaleNames/mt/it=Taljan
-LocaleNames/mt/iu=Inuktitut
-LocaleNames/mt/iw=Ebrajk
-LocaleNames/mt/ja=\u0120appuni\u017c
-LocaleNames/mt/ji=Yiddish
-LocaleNames/mt/jv=\u0120avani\u017c
-LocaleNames/mt/ka=\u0120or\u0121jan
-LocaleNames/mt/ki=Kikuju
-LocaleNames/mt/kj=Kuanyama
-LocaleNames/mt/kk=Ka\u017cak
-LocaleNames/mt/kl=Kalallisut
-LocaleNames/mt/km=Khmer
-LocaleNames/mt/ko=Korean
-LocaleNames/mt/ks=Kashmiri
-LocaleNames/mt/ku=Kurd
-LocaleNames/mt/kw=Korniku
-LocaleNames/mt/ky=Kirgi\u017c
-LocaleNames/mt/lb=Lussemburgi\u017c
-LocaleNames/mt/ln=Lingaljan
-LocaleNames/mt/lt=Litwan
-LocaleNames/mt/lv=Latvjan
-LocaleNames/mt/mg=Malagasy
-LocaleNames/mt/mh=Marshalljani\u017c
-LocaleNames/mt/mk=Ma\u010bedonjan
-LocaleNames/mt/ml=Malayalam
-LocaleNames/mt/mn=Mongoljan
-LocaleNames/mt/mo=Moldavjan
-LocaleNames/mt/mr=Marathi
-LocaleNames/mt/ms=Malay
-LocaleNames/mt/mt=Malti
-LocaleNames/mt/my=Burmi\u017c
-LocaleNames/mt/na=Naurujan
-LocaleNames/mt/nb=Bokmal Norve\u0121i\u017c
-LocaleNames/mt/nd=Ndebeli tat-Tramuntana
-LocaleNames/mt/ne=Nepali\u017c
-LocaleNames/mt/nl=Olandi\u017c
-LocaleNames/mt/nn=Ninorsk Norve\u0121i\u017c
-LocaleNames/mt/no=Norve\u0121i\u017c
-LocaleNames/mt/nr=Ndebele tan-Nofsinhar
-LocaleNames/mt/nv=Navajo
-LocaleNames/mt/ny=Nyanja
-LocaleNames/mt/oc=O\u010b\u010bitan
-LocaleNames/mt/oj=O\u0121ibwa
-LocaleNames/mt/om=Oromo
-LocaleNames/mt/or=Odia
-LocaleNames/mt/os=Ossettiku
-LocaleNames/mt/pa=Punjabi
-LocaleNames/mt/pl=Pollakk
-LocaleNames/mt/ps=Pashto
-LocaleNames/mt/pt=Portugi\u017c
-LocaleNames/mt/qu=Quechua
-LocaleNames/mt/rm=Romanz
-LocaleNames/mt/ro=Rumen
-LocaleNames/mt/ru=Russu
-LocaleNames/mt/rw=Kinjarwanda
-LocaleNames/mt/sc=Sardinjan
-LocaleNames/mt/sd=Sindhi
-LocaleNames/mt/se=Sami tat-Tramuntana
-LocaleNames/mt/si=Sinhala
-LocaleNames/mt/sk=Slovakk
-LocaleNames/mt/sl=Sloven
-LocaleNames/mt/sm=Samoan
-LocaleNames/mt/sn=Shona
-LocaleNames/mt/sq=Albani\u017c
-LocaleNames/mt/sr=Serb
-LocaleNames/mt/st=Soto tan-Nofsinhar
-LocaleNames/mt/su=Sundani\u017c
-LocaleNames/mt/sv=\u017bvedi\u017c
-LocaleNames/mt/sw=Swahili
-LocaleNames/mt/tg=Ta\u0121ik
-LocaleNames/mt/th=Tajlandi\u017c
-LocaleNames/mt/ti=Tigrinya
-LocaleNames/mt/tk=Turkmeni
-LocaleNames/mt/tn=Tswana
-LocaleNames/mt/to=Tongan
-LocaleNames/mt/tr=Tork
-LocaleNames/mt/ty=Ta\u0127itjan
-LocaleNames/mt/ug=Uyghur
-LocaleNames/mt/uk=Ukren
-LocaleNames/mt/uz=Uzbek
-LocaleNames/mt/vi=Vjetnami\u017c
-LocaleNames/mt/vo=Volapuk
-LocaleNames/mt/xh=Xhosa
-LocaleNames/mt/yi=Yiddish
-LocaleNames/mt/yo=Yoruba
-LocaleNames/mt/za=Zhuang
-LocaleNames/mt/zh=\u010aini\u017c
-LocaleNames/mt/zu=Zulu
-LocaleNames/mt/AE=l-Emirati G\u0127arab Mag\u0127quda
-LocaleNames/mt/AF=l-Afganistan
-LocaleNames/mt/AI=Anguilla
-LocaleNames/mt/AL=l-Albanija
-LocaleNames/mt/AM=l-Armenja
-LocaleNames/mt/AN=Antilles Olandi\u017ci
-LocaleNames/mt/AQ=l-Antartika
-LocaleNames/mt/AR=l-Ar\u0121entina
-LocaleNames/mt/AS=is-Samoa Amerikana
-LocaleNames/mt/AT=l-Awstrija
-LocaleNames/mt/AU=l-Awstralja
-LocaleNames/mt/AZ=l-A\u017cerbaj\u0121an
-LocaleNames/mt/BA=il-Bo\u017cnija-\u0126erzegovina
-LocaleNames/mt/BD=il-Bangladesh
-LocaleNames/mt/BE=il-Bel\u0121ju
-LocaleNames/mt/BG=il-Bulgarija
-LocaleNames/mt/BH=il-Bahrain
-LocaleNames/mt/BN=il-Brunei
-LocaleNames/mt/BO=il-Bolivja
-LocaleNames/mt/BR=Il-Bra\u017cil
-LocaleNames/mt/BS=il-Bahamas
-LocaleNames/mt/BT=il-Bhutan
-LocaleNames/mt/BY=il-Belarussja
-LocaleNames/mt/BZ=il-Belize
-LocaleNames/mt/CA=il-Kanada
-LocaleNames/mt/CC=G\u017cejjer Cocos (Keeling)
-LocaleNames/mt/CD=ir-Repubblika Demokratika tal-Kongo
-LocaleNames/mt/CF=ir-Repubblika \u010aentru-Afrikana
-LocaleNames/mt/CG=il-Kongo - Brazzaville
-LocaleNames/mt/CH=l-I\u017cvizzera
-LocaleNames/mt/CI=il-Kosta tal-Avorju
-LocaleNames/mt/CL=i\u010b-\u010aili
-LocaleNames/mt/CM=il-Kamerun
-LocaleNames/mt/CN=i\u010b-\u010aina
-LocaleNames/mt/CO=il-Kolombja
-LocaleNames/mt/CR=il-Costa Rica
-LocaleNames/mt/CS=Serbja u Montenegro
-LocaleNames/mt/CU=Kuba
-LocaleNames/mt/CV=Cape Verde
-LocaleNames/mt/CY=\u010aipru
-LocaleNames/mt/CZ=ir-Repubblika \u010aeka
-LocaleNames/mt/DE=il-\u0120ermanja
-LocaleNames/mt/DJ=il-Djibouti
-LocaleNames/mt/DK=id-Danimarka
-LocaleNames/mt/DM=Dominica
-LocaleNames/mt/DO=ir-Repubblika Dominicana
-LocaleNames/mt/DZ=l-Al\u0121erija
-LocaleNames/mt/EC=l-Ekwador
-LocaleNames/mt/EE=l-Estonja
-LocaleNames/mt/EG=l-E\u0121ittu
-LocaleNames/mt/EH=is-Sa\u0127ara tal-Punent
-LocaleNames/mt/ER=l-Eritrea
-LocaleNames/mt/ES=Spanja
-LocaleNames/mt/ET=l-Etjopja
-LocaleNames/mt/FI=il-Finlandja
-LocaleNames/mt/FJ=Fi\u0121i
-LocaleNames/mt/FM=il-Mikrone\u017cja
-LocaleNames/mt/FO=il-G\u017cejjer Faeroe
-LocaleNames/mt/FR=Franza
-LocaleNames/mt/GB=ir-Renju Unit
-LocaleNames/mt/GE=il-Georgia
-LocaleNames/mt/GF=il-Guyana Fran\u010bi\u017ca
-LocaleNames/mt/GH=il-Ghana
-LocaleNames/mt/GL=Greenland
-LocaleNames/mt/GM=il-Gambja
-LocaleNames/mt/GN=il-Guinea
-LocaleNames/mt/GP=Guadeloupe
-LocaleNames/mt/GQ=il-Guinea Ekwatorjali
-LocaleNames/mt/GR=il-Gre\u010bja
-LocaleNames/mt/GS=il-Georgia tan-Nofsinhar u l-G\u017cejjer Sandwich tan-Nofsinhar
-LocaleNames/mt/GT=il-Gwatemala
-LocaleNames/mt/GU=Guam
-LocaleNames/mt/GW=il-Guinea-Bissau
-LocaleNames/mt/GY=il-Guyana
-LocaleNames/mt/HK=ir-Re\u0121jun Amministrattiv Spe\u010bjali ta\u2019 Hong Kong tar-Repubblika tal-Poplu ta\u010b-\u010aina
-LocaleNames/mt/HM=il-G\u017cejjer Heard u l-G\u017cejjer McDonald
-LocaleNames/mt/HN=il-Honduras
-LocaleNames/mt/HR=il-Kroazja
-LocaleNames/mt/HT=il-Haiti
-LocaleNames/mt/HU=l-Ungerija
-LocaleNames/mt/ID=l-Indone\u017cja
-LocaleNames/mt/IE=l-Irlanda
-LocaleNames/mt/IL=I\u017crael
-LocaleNames/mt/IN=l-Indja
-LocaleNames/mt/IS=l-I\u017clanda
-LocaleNames/mt/IT=l-Italja
-LocaleNames/mt/JM=il-\u0120amajka
-LocaleNames/mt/JO=il-\u0120ordan
-LocaleNames/mt/JP=il-\u0120appun
-LocaleNames/mt/KE=il-Kenja
-LocaleNames/mt/KG=il-Kirgi\u017cistan
-LocaleNames/mt/KH=il-Kambodja
-LocaleNames/mt/KM=Comoros
-LocaleNames/mt/KN=Saint Kitts u Nevis
-LocaleNames/mt/KP=il-Korea ta\u2019 Fuq
-LocaleNames/mt/KR=il-Korea t\u2019Isfel
-LocaleNames/mt/KW=il-Kuwajt
-LocaleNames/mt/KZ=il-Ka\u017cakistan
-LocaleNames/mt/LB=il-Libanu
-LocaleNames/mt/LC=Saint Lucia
-LocaleNames/mt/LR=il-Liberja
-LocaleNames/mt/LS=il-Lesoto
-LocaleNames/mt/LT=il-Litwanja
-LocaleNames/mt/LU=il-Lussemburgu
-LocaleNames/mt/LV=il-Latvja
-LocaleNames/mt/LY=il-Libja
-LocaleNames/mt/MA=il-Marokk
-LocaleNames/mt/MC=Monaco
-LocaleNames/mt/MD=il-Moldova
-LocaleNames/mt/MG=Madagascar
-LocaleNames/mt/MH=G\u017cejjer Marshall
-LocaleNames/mt/MK=il-Ma\u010bedonja ta\u2019 Fuq
-LocaleNames/mt/MM=il-Myanmar/Burma
-LocaleNames/mt/MN=il-Mongolja
-LocaleNames/mt/MO=ir-Re\u0121jun Amministrattiv Spe\u010bjali tal-Macao tar-Repubblika tal-Poplu ta\u010b-\u010aina
-LocaleNames/mt/MP=\u0120\u017cejjer Mariana tat-Tramuntana
-LocaleNames/mt/MQ=Martinique
-LocaleNames/mt/MR=il-Mauritania
-LocaleNames/mt/MU=Mauritius
-LocaleNames/mt/MX=il-Messiku
-LocaleNames/mt/MY=il-Malasja
-LocaleNames/mt/MZ=il-Mozambique
-LocaleNames/mt/NA=in-Namibja
-LocaleNames/mt/NE=in-Ni\u0121er
-LocaleNames/mt/NG=in-Ni\u0121erja
-LocaleNames/mt/NI=in-Nikaragwa
-LocaleNames/mt/NL=in-Netherlands
-LocaleNames/mt/NO=in-Norve\u0121ja
-LocaleNames/mt/PF=Poline\u017cja Fran\u010bi\u017ca
-LocaleNames/mt/PG=Papua New Guinea
-LocaleNames/mt/PH=il-Filippini
-LocaleNames/mt/PL=il-Polonja
-LocaleNames/mt/PM=Saint Pierre u Miquelon
-LocaleNames/mt/PS=it-Territorji Palestinjani
-LocaleNames/mt/PT=il-Portugall
-LocaleNames/mt/PY=il-Paragwaj
-LocaleNames/mt/RE=R\u00e9union
-LocaleNames/mt/RO=ir-Rumanija
-LocaleNames/mt/RU=ir-Russja
-LocaleNames/mt/SA=l-Arabja Sawdija
-LocaleNames/mt/SE=l-I\u017cvezja
-LocaleNames/mt/SG=Singapore
-LocaleNames/mt/SI=is-Slovenja
-LocaleNames/mt/SJ=Svalbard u Jan Mayen
-LocaleNames/mt/SK=is-Slovakkja
-LocaleNames/mt/SO=is-Somalja
-LocaleNames/mt/SR=is-Suriname
-LocaleNames/mt/ST=S\u00e3o Tom\u00e9 u Pr\u00edncipe
-LocaleNames/mt/SY=is-Sirja
-LocaleNames/mt/TC=il-G\u017cejjer Turks u Caicos
-LocaleNames/mt/TD=i\u010b-Chad
-LocaleNames/mt/TF=It-Territorji Fran\u010bi\u017ci tan-Nofsinhar
-LocaleNames/mt/TH=it-Tajlandja
-LocaleNames/mt/TJ=it-Ta\u0121ikistan
-LocaleNames/mt/TK=it-Tokelau
-LocaleNames/mt/TL=Timor Leste
-LocaleNames/mt/TN=it-Tune\u017cija
-LocaleNames/mt/TR=it-Turkija
-LocaleNames/mt/TT=Trinidad u Tobago
-LocaleNames/mt/TW=it-Tajwan
-LocaleNames/mt/TZ=it-Tanzanija
-LocaleNames/mt/UA=l-Ukrajna
-LocaleNames/mt/US=l-Istati Uniti
-LocaleNames/mt/UY=l-Urugwaj
-LocaleNames/mt/UZ=l-U\u017cbekistan
-LocaleNames/mt/VA=l-Istat tal-Belt tal-Vatikan
-LocaleNames/mt/VC=Saint Vincent u l-Grenadini
-LocaleNames/mt/VE=il-Venezwela
-LocaleNames/mt/VN=il-Vjetnam
-LocaleNames/mt/VU=Vanuatu
-LocaleNames/mt/WF=Wallis u Futuna
-LocaleNames/mt/YE=il-Jemen
-LocaleNames/mt/YT=Mayotte
-LocaleNames/mt/ZA=l-Afrika t\u2019Isfel
-LocaleNames/mt/ZM=i\u017c-\u017bambja
-LocaleNames/mt/ZW=i\u017c-\u017bimbabwe
-LocaleNames/sr/ZA=\u0408\u0443\u0436\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/zh_SG/bo=\u85cf\u8bed
-LocaleNames/zh_SG/gd=\u82cf\u683c\u5170\u76d6\u5c14\u8bed
-LocaleNames/zh_SG/ho=\u5e0c\u91cc\u83ab\u56fe\u8bed
-LocaleNames/zh_SG/ia=\u56fd\u9645\u8bed
-LocaleNames/zh_SG/ie=\u56fd\u9645\u6587\u5b57\uff08E\uff09
-LocaleNames/zh_SG/iu=\u56e0\u7ebd\u7279\u8bed
-LocaleNames/zh_SG/kj=\u5bbd\u4e9a\u739b\u8bed
-LocaleNames/zh_SG/kn=\u5361\u7eb3\u8fbe\u8bed
-LocaleNames/zh_SG/lv=\u62c9\u8131\u7ef4\u4e9a\u8bed
-LocaleNames/zh_SG/ny=\u9f50\u5207\u74e6\u8bed
-LocaleNames/zh_SG/oc=\u5965\u514b\u8bed
-LocaleNames/zh_SG/om=\u5965\u7f57\u83ab\u8bed
-LocaleNames/zh_SG/rm=\u7f57\u66fc\u4ec0\u8bed
-LocaleNames/zh_SG/sd=\u4fe1\u5fb7\u8bed
-LocaleNames/zh_SG/se=\u5317\u65b9\u8428\u7c73\u8bed
-LocaleNames/zh_SG/sn=\u7ecd\u7eb3\u8bed
-LocaleNames/zh_SG/ss=\u65af\u74e6\u8482\u8bed
-LocaleNames/zh_SG/su=\u5dfd\u4ed6\u8bed
-LocaleNames/zh_SG/tl=\u4ed6\u52a0\u7984\u8bed
-LocaleNames/zh_SG/tn=\u8328\u74e6\u7eb3\u8bed
-LocaleNames/zh_SG/ts=\u806a\u52a0\u8bed
-LocaleNames/zh_SG/tt=\u9791\u977c\u8bed
-LocaleNames/zh_SG/tw=\u5951\u7ef4\u8bed
-LocaleNames/zh_SG/wa=\u74e6\u9686\u8bed
-LocaleNames/zh_SG/wo=\u6c83\u6d1b\u592b\u8bed
-LocaleNames/zh_SG/xh=\u79d1\u8428\u8bed
-LocaleNames/zh_SG/za=\u58ee\u8bed
-LocaleNames/zh_SG/BA=\u6ce2\u65af\u5c3c\u4e9a\u548c\u9ed1\u585e\u54e5\u7ef4\u90a3
-LocaleNames/zh_SG/CC=\u79d1\u79d1\u65af\uff08\u57fa\u6797\uff09\u7fa4\u5c9b
-LocaleNames/zh_SG/CD=\u521a\u679c\uff08\u91d1\uff09
-LocaleNames/zh_SG/CG=\u521a\u679c\uff08\u5e03\uff09
-LocaleNames/zh_SG/DM=\u591a\u7c73\u5c3c\u514b
-LocaleNames/zh_SG/KG=\u5409\u5c14\u5409\u65af\u65af\u5766
-LocaleNames/zh_SG/KP=\u671d\u9c9c
-LocaleNames/zh_SG/MQ=\u9a6c\u63d0\u5c3c\u514b
-LocaleNames/zh_SG/MQ=\u9a6c\u63d0\u5c3c\u514b
-LocaleNames/zh_SG/NC=\u65b0\u5580\u91cc\u591a\u5c3c\u4e9a
-LocaleNames/zh_SG/TF=\u6cd5\u5c5e\u5357\u90e8\u9886\u5730
-FormatData/es_US/AmPmMarkers/0=a.m.
-FormatData/es_US/AmPmMarkers/1=p.m.
-FormatData/es_US/NumberElements/0=.
-FormatData/es_US/NumberElements/1=,
-FormatData/es_US/NumberElements/2=;
-FormatData/es_US/NumberElements/3=%
-FormatData/es_US/NumberElements/4=0
-FormatData/es_US/NumberElements/5=#
-FormatData/es_US/NumberElements/6=-
-FormatData/es_US/NumberElements/7=E
-FormatData/es_US/NumberElements/8=\u2030
-FormatData/es_US/NumberElements/9=\u221e
-FormatData/es_US/NumberElements/10=NaN
-FormatData/mt/AmPmMarkers/0=QN
-FormatData/mt/AmPmMarkers/1=WN
-FormatData/mt/DatePatterns/0=EEEE, d 'ta\u2019' MMMM yyyy
-# bug# 6483191
-CalendarData/ga_IE/firstDayOfWeek=1
-CalendarData/en_PH/firstDayOfWeek=1
-CalendarData/en_SG/firstDayOfWeek=1
-CalendarData/zh_SG/firstDayOfWeek=1
-CalendarData/mt_MT/firstDayOfWeek=1
-CalendarData/en_MT/firstDayOfWeek=1
-CalendarData/es_US/firstDayOfWeek=1
-CalendarData/es_CY/firstDayOfWeek=2
-CalendarData/in_ID/firstDayOfWeek=2
-CalendarData/ms_MY/firstDayOfWeek=2
-CalendarData/sr_BA/firstDayOfWeek=2
-CalendarData/sr_CS/firstDayOfWeek=2
-# bug# 6498742
-# make sure that the default en data is used for en_SG : CLDR1.4.1 demoted these data
-FormatData/en_SG/TimePatterns/0=h:mm:ss a z
-FormatData/en_SG/TimePatterns/1=h:mm:ss a z
-FormatData/en_SG/TimePatterns/2=h:mm:ss a
-FormatData/en_SG/TimePatterns/3=h:mm a
-FormatData/en_SG/DateTimePatterns/0={1} {0}
-# bug# 8080774
-# Day should precede month for all date formats in en_SG - CLDR 27.0.0
-FormatData/en_SG/DatePatterns/0=EEEE, d MMMM, yyyy
-FormatData/en_SG/DatePatterns/1=d MMMM, yyyy
-FormatData/en_SG/DatePatterns/2=d MMM, yyyy
-FormatData/en_SG/DatePatterns/3=d/M/yy
-# Use approved data
-FormatData/ms/Eras/0=BCE
-FormatData/ms/Eras/1=CE
-FormatData/sr_BA/MonthNames/5=\u0458\u0443\u043d\u0438
-FormatData/sr_BA/MonthNames/6=\u0458\u0443\u043b\u0438
-FormatData/sr_BA/DayNames/3=\u0441\u0440\u0438\u0458\u0435\u0434\u0430
-FormatData/sr_BA/DayAbbreviations/3=\u0441\u0440\u0438
-FormatData/sr_BA/TimePatterns/0=HH '\u0447\u0430\u0441\u043e\u0432\u0430', mm '\u043c\u0438\u043d\u0443\u0442\u0430', ss' \u0441\u0435\u043a\u0443\u043d\u0434\u0438'
-FormatData/sr_BA/TimePatterns/1=HH.mm.ss z
-FormatData/sr_BA/TimePatterns/2=HH:mm:ss
-FormatData/sr_BA/TimePatterns/3=HH:mm
-FormatData/sr_BA/DatePatterns/0=EEEE, dd. MMMM yyyy.
-FormatData/sr_BA/DatePatterns/1=dd. MMMM yyyy.
-FormatData/sr_BA/DatePatterns/2=yyyy-MM-dd
-FormatData/sr_BA/DatePatterns/3=yy-MM-dd
-FormatData/sr_BA/DateTimePatterns/0={1} {0}
-LocaleNames/pt_BR/ce=checheno
-LocaleNames/pt_BR/ik=inupiaque
-LocaleNames/pt_BR/jv=javan\u00eas
-LocaleNames/pt_BR/nd=ndebele do norte
-LocaleNames/pt_BR/nr=ndebele do sul
-LocaleNames/pt_BR/st=soto do sul
-LocaleNames/pt_BR/AX=Ilhas Aland
-LocaleNames/pt_BR/BA=B\u00f3snia e Herzegovina
-LocaleNames/pt_BR/BH=Barein
-LocaleNames/pt_BR/KP=Coreia do Norte
-LocaleNames/pt_BR/MK=Maced\u00f4nia do Norte
-LocaleNames/pt_BR/ZW=Zimb\u00e1bue
-LocaleNames/pt_PT/ee=ewe
-LocaleNames/pt_PT/fo=fero\u00eas
-LocaleNames/pt_PT/gl=galego
-LocaleNames/pt_PT/ha=hau\u00e7\u00e1
-LocaleNames/pt_PT/hy=arm\u00eanio
-LocaleNames/pt_PT/ig=igbo
-LocaleNames/pt_PT/ki=quicuio
-LocaleNames/pt_PT/kl=groenland\u00eas
-LocaleNames/pt_PT/km=khmer
-LocaleNames/pt_PT/mh=marshal\u00eas
-LocaleNames/pt_PT/mk=maced\u00f4nio
-LocaleNames/pt_PT/nr=ndebele do sul
-LocaleNames/pt_PT/os=osseto
-LocaleNames/pt_PT/st=soto do sul
-LocaleNames/pt_PT/ta=t\u00e2mil
-LocaleNames/pt_PT/AI=Anguilla
-LocaleNames/pt_PT/AX=\u00c5land Islands
-
-# JE, GG, IM (6544471)
-LocaleNames//JE=Jersey
-LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle of Man
-
-# bugs 6497154
-CalendarData/sk/firstDayOfWeek=2
-CalendarData/sk/minimalDaysInFirstWeek=4
-
-# bug 6558856
-LocaleNames/fi/da=tanska
-LocaleNames/fi/DK=Tanska
-LocaleNames/fi_FI/da=tanska
-LocaleNames/fi_FI/DK=Tanska
-
-# bug 6481177
-FormatData/nl/Eras/0=v. Chr.
-FormatData/nl/Eras/1=n. Chr.
-
-# bug 6379214
-LocaleNames/da/da=dansk
-
-# bug 6485516
-LocaleNames/fr/GF=Guyane fran\u00e7aise
-
-# bug 6486607
-LocaleNames/fr/GY=Guyana
-
-# bug 4225362
-FormatData/fr/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-FormatData/fr_BE/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-FormatData/fr_CA/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-FormatData/fr_CH/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-FormatData/fr_FR/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-FormatData/fr_LU/DateTimePatternChars=GaMjkHmsSEDFwWxhKzZ
-
-# bug 6547501
-FormatData/fr/NumberPatterns/2=#,##0 %
-# following two lines are also for bug 4494727
-FormatData/fr_CA/NumberPatterns/2=#,##0 %
-FormatData/fr_CH/NumberPatterns/2=#,##0 %
-
-# bug 4494727
-FormatData/de_CH/NumberPatterns/2=#,##0 %
-FormatData/tr/NumberPatterns/2=% #,##0
-# added to verify propper inheritance
-FormatData/tr_TR/NumberPatterns/2=% #,##0
-
-# bug 6533691
-LocaleNames/de/ME=Montenegro
-LocaleNames/de/RS=Serbien
-LocaleNames/es/ME=Montenegro
-LocaleNames/es/RS=Serbia
-LocaleNames/fr/ME=Mont\u00e9n\u00e9gro
-LocaleNames/fr/RS=Serbie
-LocaleNames/it/ME=Montenegro
-LocaleNames/it/RS=Serbia
-LocaleNames/ja/ME=\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
-LocaleNames/ja/RS=\u30bb\u30eb\u30d3\u30a2
-LocaleNames/ko/ME=\ubaac\ud14c\ub124\uadf8\ub85c
-LocaleNames/ko/RS=\uc138\ub974\ube44\uc544
-LocaleNames/sv/ME=Montenegro
-LocaleNames/sv/RS=Serbien
-LocaleNames/zh/ME=\u9ed1\u5c71
-LocaleNames/zh/RS=\u585e\u5c14\u7ef4\u4e9a
-LocaleNames/zh_TW/ME=\u8499\u7279\u5167\u54e5\u7f85
-LocaleNames/zh_TW/RS=\u585e\u723e\u7dad\u4e9e
-
-# bug 6531591
-CurrencyNames/ar_SD/SDD=\u062f.\u0633.\u200f
-CurrencyNames/ar_SD/SDG=\u062c.\u0633.\u200f
-
-# bug 6531593
-FormatData/is_IS/NumberPatterns/1=#,##0. \u00a4;-#,##0. \u00a4
-
-# bug 6509039
-FormatData/sv/AmPmMarkers/0=fm
-FormatData/sv/AmPmMarkers/1=em
-
-# JE, GG, IM (6544471)
-LocaleNames//JE=Jersey
-LocaleNames//GG=Guernsey
-LocaleNames//IM=Isle of Man
-
-# BL, MF (6627549)
-LocaleNames//BL=St. Barth\u00e9lemy
-LocaleNames//MF=St. Martin
-
-# bug 6609737
-FormatData/de/TimePatterns/0=HH:mm' Uhr 'z
-TimeZoneNames/de/CET/1=Mitteleurop\u00e4ische Zeit
-TimeZoneNames/de/CET/2=MEZ
-TimeZoneNames/de/CET/3=Mitteleurop\u00e4ische Sommerzeit
-TimeZoneNames/de/CET/4=MESZ
-TimeZoneNames/de/EET/2=OEZ
-TimeZoneNames/de/EET/4=OESZ
-TimeZoneNames/de/WET/2=WEZ
-TimeZoneNames/de/WET/4=WESZ
-
-# bug 6610748
-FormatData/fi/AmPmMarkers/0=ap.
-FormatData/fi/AmPmMarkers/1=ip.
-
-# bug 6507067
-TimeZoneNames/zh_TW/Asia\/Taipei/1=\u53f0\u7063\u6a19\u6e96\u6642\u9593
-TimeZoneNames/zh_TW/Asia\/Taipei/2=TST
-
-# bug 6645271
-FormatData/hr_HR/DatePatterns/2=dd.MM.yyyy.
-FormatData/hr_HR/DatePatterns/3=dd.MM.yy.
-
-# bug 6873931
-CurrencyNames/tr_TR/TRY=TL
-
-#bug 6450945
-CalendarData/ro/firstDayOfWeek=2
-CalendarData/ro/minimalDaysInFirstWeek=1
-FormatData/ro/DayNames/6=s\u00e2mb\u0103t\u0103
-
-#bug 6645268
-LocaleNames/fi/fr=ranska
-LocaleNames/fi/FR=Ranska
-LocaleNames/fi_FI/fr=ranska
-LocaleNames/fi_FI/FR=Ranska
-
-# bug 6646611, 6914413
-FormatData/be_BY/MonthNames/10=\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430
-FormatData/be_BY/MonthAbbreviations/10=\u043b\u0456\u0441
-
-# bug 6645405
-FormatData/hu_HU/NumberPatterns/1=#,##0.## \u00a4;-#,##0.## \u00a4
-
-# bug 6650730
-FormatData/lt/NumberElements/1=\u00a0
-FormatData/lt/DatePatterns/2=yyyy-MM-dd
-
-#bug 6910489
-CalendarData/sl/firstDayOfWeek=2
-
-# bug 6573250
-CurrencyNames/en_CA/USD=US$
-
-# bug 6870908
-FormatData/et/MonthNames/0=jaanuar
-FormatData/et/MonthNames/1=veebruar
-FormatData/et/MonthNames/2=m\u00e4rts
-FormatData/et/MonthNames/3=aprill
-FormatData/et/MonthNames/4=mai
-FormatData/et/MonthNames/5=juuni
-FormatData/et/MonthNames/6=juuli
-FormatData/et/MonthNames/7=august
-FormatData/et/MonthNames/8=september
-FormatData/et/MonthNames/9=oktoober
-FormatData/et/MonthNames/10=november
-FormatData/et/MonthNames/11=detsember
-FormatData/et/MonthAbbreviations/0=jaan
-FormatData/et/MonthAbbreviations/1=veebr
-FormatData/et/MonthAbbreviations/2=m\u00e4rts
-FormatData/et/MonthAbbreviations/3=apr
-FormatData/et/MonthAbbreviations/4=mai
-FormatData/et/MonthAbbreviations/5=juuni
-FormatData/et/MonthAbbreviations/6=juuli
-FormatData/et/MonthAbbreviations/7=aug
-FormatData/et/MonthAbbreviations/8=sept
-FormatData/et/MonthAbbreviations/9=okt
-FormatData/et/MonthAbbreviations/10=nov
-FormatData/et/MonthAbbreviations/11=dets
-
-# bug 6585666
-LocaleNames/es/aa=afar
-LocaleNames/es/av=avar
-LocaleNames/es/az=azerbaiyano
-LocaleNames/es/ba=baskir
-LocaleNames/es/bh=bihari
-LocaleNames/es/bn=bengal\u00ed
-LocaleNames/es/cu=eslavo eclesi\u00e1stico
-LocaleNames/es/dz=dzongkha
-LocaleNames/es/eu=euskera
-LocaleNames/es/fa=persa
-LocaleNames/es/ff=fula
-LocaleNames/es/fj=fiyiano
-LocaleNames/es/fo=fero\u00e9s
-LocaleNames/es/fy=fris\u00f3n occidental
-LocaleNames/es/gu=guyarat\u00ed
-LocaleNames/es/gv=man\u00e9s
-LocaleNames/es/hi=hindi
-LocaleNames/es/ho=hiri motu
-LocaleNames/es/ie=interlingue
-LocaleNames/es/ig=igbo
-LocaleNames/es/ii=yi de Sichu\u00e1n
-LocaleNames/es/ik=inupiaq
-LocaleNames/es/kg=kongo
-LocaleNames/es/ki=kikuyu
-LocaleNames/es/kj=kuanyama
-LocaleNames/es/kk=kazajo
-LocaleNames/es/km=jemer
-LocaleNames/es/kn=canar\u00e9s
-LocaleNames/es/ks=cachemir
-LocaleNames/es/ku=kurdo
-LocaleNames/es/ky=kirgu\u00eds
-LocaleNames/es/lu=luba-katanga
-LocaleNames/es/mr=marat\u00ed
-LocaleNames/es/nb=noruego bokmal
-LocaleNames/es/nd=ndebele septentrional
-LocaleNames/es/nn=noruego nynorsk
-LocaleNames/es/nr=ndebele meridional
-LocaleNames/es/os=os\u00e9tico
-LocaleNames/es/rm=romanche
-LocaleNames/es/rn=kirundi
-LocaleNames/es/rw=kinyarwanda
-LocaleNames/es/sd=sindhi
-LocaleNames/es/se=sami septentrional
-LocaleNames/es/sl=esloveno
-LocaleNames/es/sn=shona
-LocaleNames/es/ss=suazi
-LocaleNames/es/st=sotho meridional
-LocaleNames/es/su=sundan\u00e9s
-LocaleNames/es/sw=suajili
-LocaleNames/es/tg=tayiko
-LocaleNames/es/ti=tigri\u00f1a
-LocaleNames/es/tn=setsuana
-LocaleNames/es/to=tongano
-LocaleNames/es/tw=twi
-LocaleNames/es/ty=tahitiano
-LocaleNames/es/ug=uigur
-LocaleNames/es/uk=ucraniano
-LocaleNames/es/uz=uzbeko
-LocaleNames/es/vo=volap\u00fck
-LocaleNames/es/za=zhuang
-
-# bug 6716626 - language
-LocaleNames/nl/aa=Afar
-LocaleNames/nl/ab=Abchazisch
-LocaleNames/nl/ae=Avestisch
-LocaleNames/nl/af=Afrikaans
-LocaleNames/nl/ak=Akan
-LocaleNames/nl/am=Amhaars
-LocaleNames/nl/an=Aragonees
-LocaleNames/nl/ar=Arabisch
-LocaleNames/nl/as=Assamees
-LocaleNames/nl/av=Avarisch
-LocaleNames/nl/ay=Aymara
-LocaleNames/nl/az=Azerbeidzjaans
-LocaleNames/nl/ba=Basjkiers
-LocaleNames/nl/be=Belarussisch
-LocaleNames/nl/bg=Bulgaars
-LocaleNames/nl/bh=Bihari
-LocaleNames/nl/bi=Bislama
-LocaleNames/nl/bm=Bambara
-LocaleNames/nl/bn=Bengaals
-LocaleNames/nl/bo=Tibetaans
-LocaleNames/nl/br=Bretons
-LocaleNames/nl/bs=Bosnisch
-LocaleNames/nl/ca=Catalaans
-LocaleNames/nl/ce=Tsjetsjeens
-LocaleNames/nl/ch=Chamorro
-LocaleNames/nl/co=Corsicaans
-LocaleNames/nl/cr=Cree
-LocaleNames/nl/cs=Tsjechisch
-LocaleNames/nl/cu=Kerkslavisch
-LocaleNames/nl/cv=Tsjoevasjisch
-LocaleNames/nl/cy=Welsh
-LocaleNames/nl/da=Deens
-LocaleNames/nl/de=Duits
-LocaleNames/nl/dv=Divehi
-LocaleNames/nl/dz=Dzongkha
-LocaleNames/nl/ee=Ewe
-LocaleNames/nl/el=Grieks
-LocaleNames/nl/en=Engels
-LocaleNames/nl/eo=Esperanto
-LocaleNames/nl/es=Spaans
-LocaleNames/nl/et=Estisch
-LocaleNames/nl/eu=Baskisch
-LocaleNames/nl/fa=Perzisch
-LocaleNames/nl/ff=Fulah
-LocaleNames/nl/fi=Fins
-LocaleNames/nl/fj=Fijisch
-LocaleNames/nl/fo=Faer\u00f6ers
-LocaleNames/nl/fr=Frans
-LocaleNames/nl/fy=Fries
-LocaleNames/nl/ga=Iers
-LocaleNames/nl/gd=Schots-Gaelisch
-LocaleNames/nl/gl=Galicisch
-LocaleNames/nl/gn=Guaran\u00ed
-LocaleNames/nl/gu=Gujarati
-LocaleNames/nl/gv=Manx
-LocaleNames/nl/ha=Hausa
-LocaleNames/nl/he=Hebreeuws
-LocaleNames/nl/hi=Hindi
-LocaleNames/nl/ho=Hiri Motu
-LocaleNames/nl/hr=Kroatisch
-LocaleNames/nl/ht=Ha\u00eftiaans Creools
-LocaleNames/nl/hu=Hongaars
-LocaleNames/nl/hy=Armeens
-LocaleNames/nl/hz=Herero
-LocaleNames/nl/ia=Interlingua
-LocaleNames/nl/id=Indonesisch
-LocaleNames/nl/ie=Interlingue
-LocaleNames/nl/ig=Igbo
-LocaleNames/nl/ii=Yi
-LocaleNames/nl/ik=Inupiaq
-LocaleNames/nl/io=Ido
-LocaleNames/nl/is=IJslands
-LocaleNames/nl/it=Italiaans
-LocaleNames/nl/iu=Inuktitut
-LocaleNames/nl/ja=Japans
-LocaleNames/nl/jv=Javaans
-LocaleNames/nl/ka=Georgisch
-LocaleNames/nl/kg=Kongo
-LocaleNames/nl/ki=Gikuyu
-LocaleNames/nl/kj=Kuanyama
-LocaleNames/nl/kk=Kazachs
-LocaleNames/nl/kl=Groenlands
-LocaleNames/nl/km=Khmer
-LocaleNames/nl/kn=Kannada
-LocaleNames/nl/ko=Koreaans
-LocaleNames/nl/kr=Kanuri
-LocaleNames/nl/ks=Kasjmiri
-LocaleNames/nl/ku=Koerdisch
-LocaleNames/nl/kv=Komi
-LocaleNames/nl/kw=Cornish
-LocaleNames/nl/ky=Kirgizisch
-LocaleNames/nl/la=Latijn
-LocaleNames/nl/lb=Luxemburgs
-LocaleNames/nl/lg=Luganda
-LocaleNames/nl/li=Limburgs
-LocaleNames/nl/ln=Lingala
-LocaleNames/nl/lo=Laotiaans
-LocaleNames/nl/lt=Litouws
-LocaleNames/nl/lu=Luba-Katanga
-LocaleNames/nl/lv=Lets
-LocaleNames/nl/mg=Malagassisch
-LocaleNames/nl/mh=Marshallees
-LocaleNames/nl/mi=Maori
-LocaleNames/nl/mk=Macedonisch
-LocaleNames/nl/ml=Malayalam
-LocaleNames/nl/mn=Mongools
-LocaleNames/nl/mo=Moldavisch
-LocaleNames/nl/mr=Marathi
-LocaleNames/nl/ms=Maleis
-LocaleNames/nl/mt=Maltees
-LocaleNames/nl/my=Birmaans
-LocaleNames/nl/na=Nauruaans
-LocaleNames/nl/nb=Noors - Bokm\u00e5l
-LocaleNames/nl/nd=Noord-Ndebele
-LocaleNames/nl/ne=Nepalees
-LocaleNames/nl/ng=Ndonga
-LocaleNames/nl/nl=Nederlands
-LocaleNames/nl/nn=Noors - Nynorsk
-LocaleNames/nl/no=Noors
-LocaleNames/nl/nr=Zuid-Ndbele
-LocaleNames/nl/nv=Navajo
-LocaleNames/nl/ny=Nyanja
-LocaleNames/nl/oc=Occitaans
-LocaleNames/nl/oj=Ojibwa
-LocaleNames/nl/om=Afaan Oromo
-LocaleNames/nl/or=Odia
-LocaleNames/nl/os=Ossetisch
-LocaleNames/nl/pa=Punjabi
-LocaleNames/nl/pi=Pali
-LocaleNames/nl/pl=Pools
-LocaleNames/nl/ps=Pasjtoe
-LocaleNames/nl/pt=Portugees
-LocaleNames/nl/qu=Quechua
-LocaleNames/nl/rm=Reto-Romaans
-LocaleNames/nl/rn=Kirundi
-LocaleNames/nl/ro=Roemeens
-LocaleNames/nl/ru=Russisch
-LocaleNames/nl/rw=Kinyarwanda
-LocaleNames/nl/sa=Sanskriet
-LocaleNames/nl/sc=Sardijns
-LocaleNames/nl/sd=Sindhi
-LocaleNames/nl/se=Noord-Samisch
-LocaleNames/nl/sg=Sango
-LocaleNames/nl/si=Singalees
-LocaleNames/nl/sk=Slowaaks
-LocaleNames/nl/sl=Sloveens
-LocaleNames/nl/sm=Samoaans
-LocaleNames/nl/sn=Shona
-LocaleNames/nl/so=Somalisch
-LocaleNames/nl/sq=Albanees
-LocaleNames/nl/sr=Servisch
-LocaleNames/nl/ss=Swazi
-LocaleNames/nl/st=Zuid-Sotho
-LocaleNames/nl/su=Soendanees
-LocaleNames/nl/sv=Zweeds
-LocaleNames/nl/sw=Swahili
-LocaleNames/nl/ta=Tamil
-LocaleNames/nl/te=Telugu
-LocaleNames/nl/tg=Tadzjieks
-LocaleNames/nl/th=Thai
-LocaleNames/nl/ti=Tigrinya
-LocaleNames/nl/tk=Turkmeens
-LocaleNames/nl/tl=Tagalog
-LocaleNames/nl/tn=Tswana
-LocaleNames/nl/to=Tongaans
-LocaleNames/nl/tr=Turks
-LocaleNames/nl/ts=Tsonga
-LocaleNames/nl/tt=Tataars
-LocaleNames/nl/tw=Twi
-LocaleNames/nl/ty=Tahitiaans
-LocaleNames/nl/ug=Oeigoers
-LocaleNames/nl/uk=Oekra\u00efens
-LocaleNames/nl/ur=Urdu
-LocaleNames/nl/uz=Oezbeeks
-LocaleNames/nl/ve=Venda
-LocaleNames/nl/vi=Vietnamees
-LocaleNames/nl/vo=Volap\u00fck
-LocaleNames/nl/wa=Waals
-LocaleNames/nl/wo=Wolof
-LocaleNames/nl/xh=Xhosa
-LocaleNames/nl/yi=Jiddisch
-LocaleNames/nl/yo=Yoruba
-LocaleNames/nl/za=Zhuang
-LocaleNames/nl/zh=Chinees
-LocaleNames/nl/zu=Zoeloe
-
-# bug 6716626 - country
-LocaleNames/nl/AD=Andorra
-LocaleNames/nl/AE=Verenigde Arabische Emiraten
-LocaleNames/nl/AF=Afghanistan
-LocaleNames/nl/AG=Antigua en Barbuda
-LocaleNames/nl/AI=Anguilla
-LocaleNames/nl/AL=Albani\u00eb
-LocaleNames/nl/AM=Armeni\u00eb
-LocaleNames/nl/AN=Nederlandse Antillen
-LocaleNames/nl/AO=Angola
-LocaleNames/nl/AQ=Antarctica
-LocaleNames/nl/AR=Argentini\u00eb
-LocaleNames/nl/AS=Amerikaans-Samoa
-LocaleNames/nl/AT=Oostenrijk
-LocaleNames/nl/AU=Australi\u00eb
-LocaleNames/nl/AW=Aruba
-LocaleNames/nl/AX=\u00c5land
-LocaleNames/nl/AZ=Azerbeidzjan
-LocaleNames/nl/BA=Bosni\u00eb en Herzegovina
-LocaleNames/nl/BB=Barbados
-LocaleNames/nl/BD=Bangladesh
-LocaleNames/nl/BE=Belgi\u00eb
-LocaleNames/nl/BF=Burkina Faso
-LocaleNames/nl/BG=Bulgarije
-LocaleNames/nl/BH=Bahrein
-LocaleNames/nl/BI=Burundi
-LocaleNames/nl/BJ=Benin
-LocaleNames/nl/BM=Bermuda
-LocaleNames/nl/BN=Brunei
-LocaleNames/nl/BO=Bolivia
-LocaleNames/nl/BR=Brazili\u00eb
-LocaleNames/nl/BS=Bahama\u2019s
-LocaleNames/nl/BT=Bhutan
-LocaleNames/nl/BV=Bouveteiland
-LocaleNames/nl/BW=Botswana
-LocaleNames/nl/BY=Belarus
-LocaleNames/nl/BZ=Belize
-LocaleNames/nl/CA=Canada
-LocaleNames/nl/CC=Cocoseilanden
-LocaleNames/nl/CD=Congo-Kinshasa
-LocaleNames/nl/CF=Centraal-Afrikaanse Republiek
-LocaleNames/nl/CG=Congo-Brazzaville
-LocaleNames/nl/CH=Zwitserland
-LocaleNames/nl/CI=Ivoorkust
-LocaleNames/nl/CK=Cookeilanden
-LocaleNames/nl/CL=Chili
-LocaleNames/nl/CM=Kameroen
-LocaleNames/nl/CN=China
-LocaleNames/nl/CO=Colombia
-LocaleNames/nl/CR=Costa Rica
-LocaleNames/nl/CS=Servi\u00eb en Montenegro
-LocaleNames/nl/CU=Cuba
-LocaleNames/nl/CV=Kaapverdi\u00eb
-LocaleNames/nl/CX=Christmaseiland
-LocaleNames/nl/CY=Cyprus
-LocaleNames/nl/CZ=Tsjechi\u00eb
-LocaleNames/nl/DE=Duitsland
-LocaleNames/nl/DJ=Djibouti
-LocaleNames/nl/DK=Denemarken
-LocaleNames/nl/DM=Dominica
-LocaleNames/nl/DO=Dominicaanse Republiek
-LocaleNames/nl/DZ=Algerije
-LocaleNames/nl/EC=Ecuador
-LocaleNames/nl/EE=Estland
-LocaleNames/nl/EG=Egypte
-LocaleNames/nl/EH=Westelijke Sahara
-LocaleNames/nl/ER=Eritrea
-LocaleNames/nl/ES=Spanje
-LocaleNames/nl/ET=Ethiopi\u00eb
-LocaleNames/nl/FI=Finland
-LocaleNames/nl/FJ=Fiji
-LocaleNames/nl/FK=Falklandeilanden
-LocaleNames/nl/FM=Micronesia
-LocaleNames/nl/FO=Faer\u00f6er
-LocaleNames/nl/FR=Frankrijk
-LocaleNames/nl/GA=Gabon
-LocaleNames/nl/GB=Verenigd Koninkrijk
-LocaleNames/nl/GD=Grenada
-LocaleNames/nl/GE=Georgi\u00eb
-LocaleNames/nl/GF=Frans-Guyana
-LocaleNames/nl/GH=Ghana
-LocaleNames/nl/GI=Gibraltar
-LocaleNames/nl/GL=Groenland
-LocaleNames/nl/GM=Gambia
-LocaleNames/nl/GN=Guinee
-LocaleNames/nl/GP=Guadeloupe
-LocaleNames/nl/GQ=Equatoriaal-Guinea
-LocaleNames/nl/GR=Griekenland
-LocaleNames/nl/GS=Zuid-Georgia en Zuidelijke Sandwicheilanden
-LocaleNames/nl/GT=Guatemala
-LocaleNames/nl/GU=Guam
-LocaleNames/nl/GW=Guinee-Bissau
-LocaleNames/nl/GY=Guyana
-LocaleNames/nl/HK=Hongkong SAR van China
-LocaleNames/nl/HM=Heard en McDonaldeilanden
-LocaleNames/nl/HN=Honduras
-LocaleNames/nl/HR=Kroati\u00eb
-LocaleNames/nl/HT=Ha\u00efti
-LocaleNames/nl/HU=Hongarije
-LocaleNames/nl/ID=Indonesi\u00eb
-LocaleNames/nl/IE=Ierland
-LocaleNames/nl/IL=Isra\u00ebl
-LocaleNames/nl/IN=India
-LocaleNames/nl/IO=Brits Indische Oceaanterritorium
-LocaleNames/nl/IQ=Irak
-LocaleNames/nl/IR=Iran
-LocaleNames/nl/IS=IJsland
-LocaleNames/nl/IT=Itali\u00eb
-LocaleNames/nl/JM=Jamaica
-LocaleNames/nl/JO=Jordani\u00eb
-LocaleNames/nl/JP=Japan
-LocaleNames/nl/KE=Kenia
-LocaleNames/nl/KG=Kirgizi\u00eb
-LocaleNames/nl/KH=Cambodja
-LocaleNames/nl/KI=Kiribati
-LocaleNames/nl/KM=Comoren
-LocaleNames/nl/KN=Saint Kitts en Nevis
-LocaleNames/nl/KP=Noord-Korea
-LocaleNames/nl/KR=Zuid-Korea
-LocaleNames/nl/KW=Koeweit
-LocaleNames/nl/KY=Kaaimaneilanden
-LocaleNames/nl/KZ=Kazachstan
-LocaleNames/nl/LA=Laos
-LocaleNames/nl/LB=Libanon
-LocaleNames/nl/LC=Saint Lucia
-LocaleNames/nl/LI=Liechtenstein
-LocaleNames/nl/LK=Sri Lanka
-LocaleNames/nl/LR=Liberia
-LocaleNames/nl/LS=Lesotho
-LocaleNames/nl/LT=Litouwen
-LocaleNames/nl/LU=Luxemburg
-LocaleNames/nl/LV=Letland
-LocaleNames/nl/LY=Libi\u00eb
-LocaleNames/nl/MA=Marokko
-LocaleNames/nl/MC=Monaco
-LocaleNames/nl/MD=Moldavi\u00eb
-LocaleNames/nl/ME=Montenegro
-LocaleNames/nl/MG=Madagaskar
-LocaleNames/nl/MH=Marshalleilanden
-LocaleNames/nl/MK=Noord-Macedoni\u00eb
-LocaleNames/nl/ML=Mali
-LocaleNames/nl/MM=Myanmar (Birma)
-LocaleNames/nl/MN=Mongoli\u00eb
-LocaleNames/nl/MO=Macau SAR van China
-LocaleNames/nl/MP=Noordelijke Marianen
-LocaleNames/nl/MQ=Martinique
-LocaleNames/nl/MR=Mauritani\u00eb
-LocaleNames/nl/MS=Montserrat
-LocaleNames/nl/MT=Malta
-LocaleNames/nl/MU=Mauritius
-LocaleNames/nl/MV=Maldiven
-LocaleNames/nl/MW=Malawi
-LocaleNames/nl/MX=Mexico
-LocaleNames/nl/MY=Maleisi\u00eb
-LocaleNames/nl/MZ=Mozambique
-LocaleNames/nl/NA=Namibi\u00eb
-LocaleNames/nl/NC=Nieuw-Caledoni\u00eb
-LocaleNames/nl/NE=Niger
-LocaleNames/nl/NF=Norfolk
-LocaleNames/nl/NG=Nigeria
-LocaleNames/nl/NI=Nicaragua
-LocaleNames/nl/NL=Nederland
-LocaleNames/nl/NO=Noorwegen
-LocaleNames/nl/NP=Nepal
-LocaleNames/nl/NR=Nauru
-LocaleNames/nl/NU=Niue
-LocaleNames/nl/NZ=Nieuw-Zeeland
-LocaleNames/nl/OM=Oman
-LocaleNames/nl/PA=Panama
-LocaleNames/nl/PE=Peru
-LocaleNames/nl/PF=Frans-Polynesi\u00eb
-LocaleNames/nl/PG=Papoea-Nieuw-Guinea
-LocaleNames/nl/PH=Filipijnen
-LocaleNames/nl/PK=Pakistan
-LocaleNames/nl/PL=Polen
-LocaleNames/nl/PM=Saint-Pierre en Miquelon
-LocaleNames/nl/PN=Pitcairneilanden
-LocaleNames/nl/PR=Puerto Rico
-LocaleNames/nl/PS=Palestijnse gebieden
-LocaleNames/nl/PT=Portugal
-LocaleNames/nl/PW=Palau
-LocaleNames/nl/PY=Paraguay
-LocaleNames/nl/QA=Qatar
-LocaleNames/nl/RE=R\u00e9union
-LocaleNames/nl/RO=Roemeni\u00eb
-LocaleNames/nl/RS=Servi\u00eb
-LocaleNames/nl/RU=Rusland
-LocaleNames/nl/RW=Rwanda
-LocaleNames/nl/SA=Saoedi-Arabi\u00eb
-LocaleNames/nl/SB=Salomonseilanden
-LocaleNames/nl/SC=Seychellen
-LocaleNames/nl/SD=Soedan
-LocaleNames/nl/SE=Zweden
-LocaleNames/nl/SG=Singapore
-LocaleNames/nl/SH=Sint-Helena
-LocaleNames/nl/SI=Sloveni\u00eb
-LocaleNames/nl/SJ=Spitsbergen en Jan Mayen
-LocaleNames/nl/SK=Slowakije
-LocaleNames/nl/SL=Sierra Leone
-LocaleNames/nl/SM=San Marino
-LocaleNames/nl/SN=Senegal
-LocaleNames/nl/SO=Somali\u00eb
-LocaleNames/nl/SR=Suriname
-LocaleNames/nl/ST=Sao Tom\u00e9 en Principe
-LocaleNames/nl/SV=El Salvador
-LocaleNames/nl/SY=Syri\u00eb
-LocaleNames/nl/TC=Turks- en Caicoseilanden
-LocaleNames/nl/TD=Tsjaad
-LocaleNames/nl/TF=Franse Gebieden in de zuidelijke Indische Oceaan
-LocaleNames/nl/TG=Togo
-LocaleNames/nl/TH=Thailand
-LocaleNames/nl/TJ=Tadzjikistan
-LocaleNames/nl/TK=Tokelau
-LocaleNames/nl/TL=Oost-Timor
-LocaleNames/nl/TM=Turkmenistan
-LocaleNames/nl/TN=Tunesi\u00eb
-LocaleNames/nl/TO=Tonga
-LocaleNames/nl/TR=Turkije
-LocaleNames/nl/TT=Trinidad en Tobago
-LocaleNames/nl/TV=Tuvalu
-LocaleNames/nl/TW=Taiwan
-LocaleNames/nl/TZ=Tanzania
-LocaleNames/nl/UA=Oekra\u00efne
-LocaleNames/nl/UG=Oeganda
-LocaleNames/nl/UM=Kleine afgelegen eilanden van de Verenigde Staten
-LocaleNames/nl/US=Verenigde Staten
-LocaleNames/nl/UY=Uruguay
-LocaleNames/nl/UZ=Oezbekistan
-LocaleNames/nl/VA=Vaticaanstad
-LocaleNames/nl/VC=Saint Vincent en de Grenadines
-LocaleNames/nl/VE=Venezuela
-LocaleNames/nl/VG=Britse Maagdeneilanden
-LocaleNames/nl/VI=Amerikaanse Maagdeneilanden
-LocaleNames/nl/VN=Vietnam
-LocaleNames/nl/VU=Vanuatu
-LocaleNames/nl/WF=Wallis en Futuna
-LocaleNames/nl/WS=Samoa
-LocaleNames/nl/YE=Jemen
-LocaleNames/nl/YT=Mayotte
-LocaleNames/nl/ZA=Zuid-Afrika
-LocaleNames/nl/ZM=Zambia
-
-# bug 6919624
-CalendarData/hu/minimalDaysInFirstWeek=4
-
-# bug 6998391
-CalendarData/sr-Latn/firstDayOfWeek=2
-CalendarData/sr-Latn-BA/firstDayOfWeek=2
-CalendarData/sr-Latn-ME/firstDayOfWeek=2
-CalendarData/sr-Latn-RS/firstDayOfWeek=2
-#
-CalendarData/sr-Latn/minimalDaysInFirstWeek=1
-CalendarData/sr-Latn-BA/minimalDaysInFirstWeek=4
-CalendarData/sr-Latn-ME/minimalDaysInFirstWeek=4
-CalendarData/sr-Latn-RS/minimalDaysInFirstWeek=4
-#
-LocaleNames/sr-Latn/SR=Surinam
-LocaleNames/sr-Latn-BA/SR=Surinam
-LocaleNames/sr-Latn-ME/SR=Surinam
-LocaleNames/sr-Latn-RS/SR=Surinam
-#
-FormatData/sr-Latn/MonthNames/2=mart
-FormatData/sr-Latn-BA/MonthNames/4=maj
-FormatData/sr-Latn-ME/MonthNames/7=avgust
-FormatData/sr-Latn-RS/MonthNames/8=septembar
-#
-FormatData/sr-Latn/DayNames/1=ponedeljak
-FormatData/sr-Latn-BA/DayNames/2=utorak
-FormatData/sr-Latn-ME/DayNames/3=sreda
-FormatData/sr-Latn-RS/DayNames/4=\u010detvrtak
-#
-FormatData/sr-Latn/DayAbbreviations/1=pon
-FormatData/sr-Latn-BA/DayAbbreviations/2=uto
-FormatData/sr-Latn-ME/DayAbbreviations/3=sre
-FormatData/sr-Latn-RS/DayAbbreviations/4=\u010det
-#
-CurrencyNames/sr-Latn/EUR=EUR
-CurrencyNames/sr-Latn-BA/EUR=\u20ac
-CurrencyNames/sr-Latn-BA/BAM=KM
-CurrencyNames/sr-Latn-ME/EUR=\u20ac
-CurrencyNames/sr-Latn-RS/EUR=EUR
-#
-FormatData/sr-Latn/TimePatterns/1=HH.mm.ss z
-FormatData/sr-Latn-BA/TimePatterns/2=HH.mm.ss
-FormatData/sr-Latn-ME/DatePatterns/1=d.MM.yyyy.
-FormatData/sr-Latn-RS/DatePatterns/1=dd. MMMM y.
-
-# bug 7019267
-CurrencyNames/pt/adp=Peseta de Andorra
-CurrencyNames/pt/aed=Dirham dos Emirados \u00c1rabes Unidos
-CurrencyNames/pt/afa=Afegane (1927\u20132002)
-CurrencyNames/pt/afn=Afegane afeg\u00e3o
-CurrencyNames/pt/all=Lek alban\u00eas
-CurrencyNames/pt/amd=Dram arm\u00eanio
-CurrencyNames/pt/ang=Florim das Antilhas Holandesas
-CurrencyNames/pt/aoa=Kwanza angolano
-CurrencyNames/pt/ars=Peso argentino
-CurrencyNames/pt/ats=Xelim austr\u00edaco
-CurrencyNames/pt/aud=D\u00f3lar australiano
-CurrencyNames/pt/awg=Florim arubano
-CurrencyNames/pt/azm=Manat azerbaijano (1993\u20132006)
-CurrencyNames/pt/azn=Manat azeri
-CurrencyNames/pt/bam=Marco convers\u00edvel da B\u00f3snia e Herzegovina
-CurrencyNames/pt/bbd=D\u00f3lar barbadense
-CurrencyNames/pt/bdt=Taka bengali
-CurrencyNames/pt/bef=Franco belga
-CurrencyNames/pt/bgl=Lev forte b\u00falgaro
-CurrencyNames/pt/bgn=Lev b\u00falgaro
-CurrencyNames/pt/bhd=Dinar bareinita
-CurrencyNames/pt/bif=Franco burundiano
-CurrencyNames/pt/bmd=D\u00f3lar bermudense
-CurrencyNames/pt/bnd=D\u00f3lar bruneano
-CurrencyNames/pt/bov=Mvdol boliviano
-CurrencyNames/pt/brl=Real brasileiro
-CurrencyNames/pt/bsd=D\u00f3lar bahamense
-CurrencyNames/pt/btn=Ngultrum butan\u00eas
-CurrencyNames/pt/bwp=Pula botsuanesa
-CurrencyNames/pt/byb=Rublo novo bielo-russo (1994\u20131999)
-CurrencyNames/pt/byr=Rublo bielorrusso (2000\u20132016)
-CurrencyNames/pt/bzd=D\u00f3lar belizenho
-CurrencyNames/pt/cad=D\u00f3lar canadense
-CurrencyNames/pt/cdf=Franco congol\u00eas
-CurrencyNames/pt/chf=Franco su\u00ed\u00e7o
-CurrencyNames/pt/clf=Unidades de Fomento chilenas
-CurrencyNames/pt/clp=Peso chileno
-CurrencyNames/pt/cny=Yuan chin\u00eas
-CurrencyNames/pt/cop=Peso colombiano
-CurrencyNames/pt/crc=Col\u00f3n costarriquenho
-CurrencyNames/pt/csd=Dinar s\u00e9rvio (2002\u20132006)
-CurrencyNames/pt/cup=Peso cubano
-CurrencyNames/pt/cve=Escudo cabo-verdiano
-CurrencyNames/pt/cyp=Libra cipriota
-CurrencyNames/pt/czk=Coroa tcheca
-CurrencyNames/pt/dem=Marco alem\u00e3o
-CurrencyNames/pt/djf=Franco djiboutiano
-CurrencyNames/pt/dkk=Coroa dinamarquesa
-CurrencyNames/pt/dop=Peso dominicano
-CurrencyNames/pt/dzd=Dinar argelino
-CurrencyNames/pt/eek=Coroa estoniana
-CurrencyNames/pt/egp=Libra eg\u00edpcia
-CurrencyNames/pt/ern=Nakfa da Eritreia
-CurrencyNames/pt/esp=Peseta espanhola
-CurrencyNames/pt/etb=Birr et\u00edope
-CurrencyNames/pt/fim=Marca finlandesa
-CurrencyNames/pt/fjd=D\u00f3lar fijiano
-CurrencyNames/pt/fkp=Libra malvinense
-CurrencyNames/pt/frf=Franco franc\u00eas
-CurrencyNames/pt/gbp=Libra esterlina
-CurrencyNames/pt/gel=Lari georgiano
-CurrencyNames/pt/ghc=Cedi de Gana (1979\u20132007)
-CurrencyNames/pt/ghs=Cedi gan\u00eas
-CurrencyNames/pt/gip=Libra de Gibraltar
-CurrencyNames/pt/gmd=Dalasi gambiano
-CurrencyNames/pt/gnf=Franco guineano
-CurrencyNames/pt/grd=Dracma grego
-CurrencyNames/pt/gtq=Quetzal guatemalteco
-CurrencyNames/pt/gwp=Peso da Guin\u00e9-Bissau
-CurrencyNames/pt/gyd=D\u00f3lar guianense
-CurrencyNames/pt/hkd=D\u00f3lar de Hong Kong
-CurrencyNames/pt/hnl=Lempira hondurenha
-CurrencyNames/pt/hrk=Kuna croata
-CurrencyNames/pt/htg=Gourde haitiano
-CurrencyNames/pt/huf=Florim h\u00fangaro
-CurrencyNames/pt/idr=Rupia indon\u00e9sia
-CurrencyNames/pt/iep=Libra irlandesa
-CurrencyNames/pt/ils=Novo shekel israelense
-CurrencyNames/pt/inr=Rupia indiana
-CurrencyNames/pt/iqd=Dinar iraquiano
-CurrencyNames/pt/irr=Rial iraniano
-CurrencyNames/pt/isk=Coroa islandesa
-CurrencyNames/pt/itl=Lira italiana
-CurrencyNames/pt/jmd=D\u00f3lar jamaicano
-CurrencyNames/pt/jod=Dinar jordaniano
-CurrencyNames/pt/jpy=Iene japon\u00eas
-CurrencyNames/pt/kes=Xelim queniano
-CurrencyNames/pt/kgs=Som quirguiz
-CurrencyNames/pt/khr=Riel cambojano
-CurrencyNames/pt/kmf=Franco comoriano
-CurrencyNames/pt/kpw=Won norte-coreano
-CurrencyNames/pt/krw=Won sul-coreano
-CurrencyNames/pt/kwd=Dinar kuwaitiano
-CurrencyNames/pt/kyd=D\u00f3lar das Ilhas Cayman
-CurrencyNames/pt/kzt=Tenge cazaque
-CurrencyNames/pt/lak=Kip laosiano
-CurrencyNames/pt/lbp=Libra libanesa
-CurrencyNames/pt/lkr=Rupia cingalesa
-CurrencyNames/pt/lrd=D\u00f3lar liberiano
-CurrencyNames/pt/lsl=Loti lesotiano
-CurrencyNames/pt/ltl=Litas lituano
-CurrencyNames/pt/luf=Franco luxemburgu\u00eas
-CurrencyNames/pt/lvl=Lats let\u00e3o
-CurrencyNames/pt/lyd=Dinar l\u00edbio
-CurrencyNames/pt/mad=Dirham marroquino
-CurrencyNames/pt/mdl=Leu mold\u00e1vio
-CurrencyNames/pt/mga=Ariary malgaxe
-CurrencyNames/pt/mgf=Franco de Madagascar
-CurrencyNames/pt/mkd=Dinar maced\u00f4nio
-CurrencyNames/pt/mmk=Quiate mianmarense
-CurrencyNames/pt/mnt=Tugrik mongol
-CurrencyNames/pt/mop=Pataca macaense
-CurrencyNames/pt/mro=Ouguiya mauritana (1973\u20132017)
-CurrencyNames/pt/mtl=Lira maltesa
-CurrencyNames/pt/mur=Rupia mauriciana
-CurrencyNames/pt/mvr=Rupia maldivana
-CurrencyNames/pt/mwk=Kwacha malauiana
-CurrencyNames/pt/mxn=Peso mexicano
-CurrencyNames/pt/mxv=Unidade Mexicana de Investimento (UDI)
-CurrencyNames/pt/myr=Ringgit malaio
-CurrencyNames/pt/mzm=Metical de Mo\u00e7ambique (1980\u20132006)
-CurrencyNames/pt/mzn=Metical mo\u00e7ambicano
-CurrencyNames/pt/nad=D\u00f3lar namibiano
-CurrencyNames/pt/ngn=Naira nigeriana
-CurrencyNames/pt/nio=C\u00f3rdoba nicaraguense
-CurrencyNames/pt/nlg=Florim holand\u00eas
-CurrencyNames/pt/nok=Coroa norueguesa
-CurrencyNames/pt/npr=Rupia nepalesa
-CurrencyNames/pt/nzd=D\u00f3lar neozeland\u00eas
-CurrencyNames/pt/omr=Rial omanense
-CurrencyNames/pt/pab=Balboa panamenho
-CurrencyNames/pt/pen=Novo sol peruano
-CurrencyNames/pt/pgk=Kina papu\u00e1sia
-CurrencyNames/pt/php=Peso filipino
-CurrencyNames/pt/pkr=Rupia paquistanesa
-CurrencyNames/pt/pln=Zloty polon\u00eas
-CurrencyNames/pt/pte=Escudo portugu\u00eas
-CurrencyNames/pt/pyg=Guarani paraguaio
-CurrencyNames/pt/qar=Rial catariano
-CurrencyNames/pt/rol=Leu romeno (1952\u20132006)
-CurrencyNames/pt/ron=Leu romeno
-CurrencyNames/pt/rsd=Dinar s\u00e9rvio
-CurrencyNames/pt/rub=Rublo russo
-CurrencyNames/pt/rur=Rublo russo (1991\u20131998)
-CurrencyNames/pt/rwf=Franco ruand\u00eas
-CurrencyNames/pt/sar=Riyal saudita
-CurrencyNames/pt/sbd=D\u00f3lar das Ilhas Salom\u00e3o
-CurrencyNames/pt/scr=Rupia seichelense
-CurrencyNames/pt/sdd=Dinar sudan\u00eas (1992\u20132007)
-CurrencyNames/pt/sdg=Libra sudanesa
-CurrencyNames/pt/sek=Coroa sueca
-CurrencyNames/pt/sgd=D\u00f3lar singapuriano
-CurrencyNames/pt/shp=Libra de Santa Helena
-CurrencyNames/pt/sit=Tolar Bons esloveno
-CurrencyNames/pt/skk=Coroa eslovaca
-CurrencyNames/pt/sll=Leone de Serra Leoa
-CurrencyNames/pt/sos=Xelim somali
-CurrencyNames/pt/srd=D\u00f3lar surinam\u00eas
-CurrencyNames/pt/srg=Florim do Suriname
-CurrencyNames/pt/std=Dobra de S\u00e3o Tom\u00e9 e Pr\u00edncipe (1977\u20132017)
-CurrencyNames/pt/svc=Colom salvadorenho
-CurrencyNames/pt/syp=Libra s\u00edria
-CurrencyNames/pt/szl=Lilangeni suazi
-CurrencyNames/pt/thb=Baht tailand\u00eas
-CurrencyNames/pt/tjs=Somoni tadjique
-CurrencyNames/pt/tmm=Manat do Turcomenist\u00e3o (1993\u20132009)
-CurrencyNames/pt/tnd=Dinar tunisiano
-CurrencyNames/pt/top=Pa\u02bbanga tonganesa
-CurrencyNames/pt/tpe=Escudo timorense
-CurrencyNames/pt/trl=Lira turca (1922\u20132005)
-CurrencyNames/pt/try=Lira turca
-CurrencyNames/pt/ttd=D\u00f3lar de Trinidad e Tobago
-CurrencyNames/pt/twd=Novo d\u00f3lar taiwan\u00eas
-CurrencyNames/pt/tzs=Xelim tanzaniano
-CurrencyNames/pt/uah=Hryvnia ucraniano
-CurrencyNames/pt/ugx=Xelim ugandense
-CurrencyNames/pt/usd=D\u00f3lar americano
-CurrencyNames/pt/usn=D\u00f3lar norte-americano (Dia seguinte)
-CurrencyNames/pt/uss=D\u00f3lar norte-americano (Mesmo dia)
-CurrencyNames/pt/uyu=Peso uruguaio
-CurrencyNames/pt/uzs=Som uzbeque
-CurrencyNames/pt/veb=Bol\u00edvar venezuelano (1871\u20132008)
-CurrencyNames/pt/vef=Bol\u00edvar venezuelano (2008\u20132018)
-CurrencyNames/pt/vnd=Dong vietnamita
-CurrencyNames/pt/vuv=Vatu de Vanuatu
-CurrencyNames/pt/wst=Tala samoano
-CurrencyNames/pt/xaf=Franco CFA de BEAC
-CurrencyNames/pt/xag=Prata
-CurrencyNames/pt/xau=Ouro
-CurrencyNames/pt/xba=Unidade Composta Europeia
-CurrencyNames/pt/xbb=Unidade Monet\u00e1ria Europeia
-CurrencyNames/pt/xbc=Unidade de Conta Europeia (XBC)
-CurrencyNames/pt/xbd=Unidade de Conta Europeia (XBD)
-CurrencyNames/pt/xcd=D\u00f3lar do Caribe Oriental
-CurrencyNames/pt/xdr=Direitos Especiais de Giro
-CurrencyNames/pt/xfo=Franco-ouro franc\u00eas
-CurrencyNames/pt/xfu=Franco UIC franc\u00eas
-CurrencyNames/pt/xof=Franco CFA de BCEAO
-CurrencyNames/pt/xpd=Pal\u00e1dio
-CurrencyNames/pt/xpf=Franco CFP
-CurrencyNames/pt/xpt=Platina
-CurrencyNames/pt/xts=C\u00f3digo de Moeda de Teste
-CurrencyNames/pt/xxx=Moeda desconhecida
-CurrencyNames/pt/yer=Rial iemenita
-CurrencyNames/pt/yum=Dinar noviy iugoslavo (1994\u20132002)
-CurrencyNames/pt/zar=Rand sul-africano
-CurrencyNames/pt/zmk=Cuacha zambiano (1968\u20132012)
-CurrencyNames/pt/zwd=D\u00f3lar do Zimb\u00e1bue (1980\u20132008)
-
-# bug 7020960
-CurrencyNames/sr_RS/RSD=\u0434\u0438\u043d.
-
-# bug 7025837
-CurrencyNames/sr-Latn-BA/bam=Bosanskohercegova\u010dka konvertibilna marka
-CurrencyNames/sr-Latn-BA/eur=Evro
-CurrencyNames/sr-Latn-ME/eur=Evro
-CurrencyNames/sr-Latn-RS/rsd=srpski dinar
-
-CurrencyNames//afa=Afghan Afghani (1927-2002)
-CurrencyNames//afn=Afghan Afghani
-CurrencyNames//ang=Netherlands Antillean Guilder
-CurrencyNames//awg=Aruban Florin
-CurrencyNames//azm=Azerbaijani Manat (1993-2006)
-CurrencyNames//bbd=Barbadian Dollar
-CurrencyNames//bdt=Bangladeshi Taka
-CurrencyNames//bgn=Bulgarian Lev
-CurrencyNames//bif=Burundian Franc
-CurrencyNames//bob=Bolivian Boliviano
-CurrencyNames//btn=Bhutanese Ngultrum
-CurrencyNames//byb=Belarusian Ruble (1994-1999)
-CurrencyNames//byr=Belarusian Ruble (2000-2016)
-CurrencyNames//cdf=Congolese Franc
-CurrencyNames//clf=Chilean Unit of Account (UF)
-CurrencyNames//cny=Chinese Yuan
-CurrencyNames//crc=Costa Rican Col\u00f3n
-CurrencyNames//csd=Serbian Dinar (2002-2006)
-CurrencyNames//cve=Cape Verdean Escudo
-CurrencyNames//cyp=Cypriot Pound
-CurrencyNames//dem=German Mark
-CurrencyNames//djf=Djiboutian Franc
-CurrencyNames//fjd=Fijian Dollar
-CurrencyNames//ghc=Ghanaian Cedi (1979-2007)
-CurrencyNames//ghs=Ghanaian Cedi
-CurrencyNames//gmd=Gambian Dalasi
-CurrencyNames//gnf=Guinean Franc
-CurrencyNames//gtq=Guatemalan Quetzal
-CurrencyNames//gyd=Guyanaese Dollar
-CurrencyNames//hnl=Honduran Lempira
-CurrencyNames//isk=Icelandic Kr\u00f3na
-CurrencyNames//kgs=Kyrgystani Som
-CurrencyNames//kmf=Comorian Franc
-CurrencyNames//kzt=Kazakhstani Tenge
-CurrencyNames//lkr=Sri Lankan Rupee
-CurrencyNames//ltl=Lithuanian Litas
-CurrencyNames//luf=Luxembourgian Franc
-CurrencyNames//mga=Malagasy Ariary
-CurrencyNames//mgf=Malagasy Franc
-CurrencyNames//mmk=Myanma Kyat
-CurrencyNames//mop=Macanese Pataca
-CurrencyNames//mro=Mauritanian Ouguiya
-CurrencyNames//mur=Mauritian Rupee
-CurrencyNames//mvr=Maldivian Rufiyaa
-CurrencyNames//mxv=Mexican Investment Unit
-CurrencyNames//mzm=Mozambican Metical (1980-2006)
-CurrencyNames//mzn=Mozambican Metical
-CurrencyNames//nad=Namibian Dollar
-CurrencyNames//nio=Nicaraguan C\u00f3rdoba
-CurrencyNames//nlg=Dutch Guilder
-CurrencyNames//omr=Omani Rial
-CurrencyNames//pgk=Papua New Guinean Kina
-CurrencyNames//pkr=Pakistani Rupee
-CurrencyNames//pyg=Paraguayan Guarani
-CurrencyNames//rol=Romanian Leu (1952-2006)
-CurrencyNames//rsd=Serbian Dinar
-CurrencyNames//scr=Seychellois Rupee
-CurrencyNames//sdd=Sudanese Dinar (1992-2007)
-CurrencyNames//sit=Slovenian Tolar
-CurrencyNames//sle=Sierra Leonean Leone
-CurrencyNames//sll=Sierra Leonean Leone
-CurrencyNames//srd=Surinamese Dollar
-CurrencyNames//srg=Surinamese Guilder
-CurrencyNames//std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
-CurrencyNames//svc=Salvadoran Col\u00f3n
-CurrencyNames//szl=Swazi Lilangeni
-CurrencyNames//tjs=Tajikistani Somoni
-CurrencyNames//tmm=Turkmenistani Manat (1993-2009)
-CurrencyNames//top=Tongan Pa\u02bbanga
-CurrencyNames//tpe=Timorese Escudo
-CurrencyNames//trl=Turkish Lira (1922-2005)
-CurrencyNames//try=Turkish Lira
-CurrencyNames//twd=New Taiwan Dollar
-CurrencyNames//uyu=Uruguayan Peso
-CurrencyNames//uzs=Uzbekistan Som
-CurrencyNames//veb=Venezuelan Bol\u00edvar (1871-2008)
-CurrencyNames//vef=Venezuelan Bol\u00edvar
-CurrencyNames//wst=Samoan Tala
-CurrencyNames//xxx=Unknown Currency
-CurrencyNames//yum=Yugoslavian New Dinar (1994-2002)
-CurrencyNames//zwd=Zimbabwean Dollar (1980-2008)
-
-# bug 7020583
-CurrencyNames/de/azm=Aserbaidschainischer Manat (1993-2006)
-CurrencyNames/de/azn=Aserbaidschainischer Manat
-CurrencyNames/de/csd=Serbischer Dinar (2002-2006)
-CurrencyNames/de/cyp=Zypern-Pfund
-CurrencyNames/de/esp=Spanische Pesete
-CurrencyNames/de/fjd=Fidschi-Dollar
-CurrencyNames/de/fkp=Falklandinseln-Pfund
-CurrencyNames/de/ghs=Ghanaischer Cedi
-CurrencyNames/de/gip=Gibraltar-Pfund
-CurrencyNames/de/gnf=Guinea-Franc
-CurrencyNames/de/gyd=Guyana-Dollar
-CurrencyNames/de/hkd=Hongkong-Dollar
-CurrencyNames/de/itl=Italienische Lire
-CurrencyNames/de/jmd=Jamaikanischer Dollar
-CurrencyNames/de/kes=Kenianischer Schilling
-CurrencyNames/de/mgf=Madagaskar-Franc
-CurrencyNames/de/mur=Mauritius-Rupie
-CurrencyNames/de/mzm=Mosambikanischer Metical (1980-2006)
-CurrencyNames/de/mzn=Mosambikanischer Metical
-CurrencyNames/de/nad=Namibischer Dollar
-CurrencyNames/de/nzd=Neuseel\u00e4ndischer Dollar
-CurrencyNames/de/ron=Rum\u00e4nischer Leu
-CurrencyNames/de/rsd=Serbischer Dinar
-CurrencyNames/de/rwf=Ruanda-Franc
-CurrencyNames/de/sbd=Salomonen-Dollar
-CurrencyNames/de/scr=Seychellen-Rupie
-CurrencyNames/de/sdg=Sudanesisches Pfund
-CurrencyNames/de/sgd=Singapur-Dollar
-CurrencyNames/de/sos=Somalischer Schilling
-CurrencyNames/de/srd=Suriname-Dollar
-CurrencyNames/de/tpe=Escudo (Portugiesisch-Timor)
-CurrencyNames/de/trl=T\u00fcrkische Lira (1922-2005)
-CurrencyNames/de/try=T\u00fcrkische Lira
-CurrencyNames/de/ttd=Trinidad/Tobago-Dollar
-CurrencyNames/de/twd=Neu-Taiwan Dollar
-CurrencyNames/de/tzs=Tansania-Schilling
-CurrencyNames/de/ugx=Uganda-Schilling
-CurrencyNames/de/usd=US-Dollar
-CurrencyNames/de/vef=Venezolanischer Bol\u00edvar Fuerte
-CurrencyNames/de/xag=Silber
-CurrencyNames/de/xau=Gold
-CurrencyNames/de/xbb=European Monetary Unit
-CurrencyNames/de/xpd=Palladium
-CurrencyNames/de/xpt=Platin
-CurrencyNames/de/xts=Testw\u00e4hrungscode
-CurrencyNames/de/xxx=Unbekannte W\u00e4hrung
-CurrencyNames/de/yer=Jemen-Rial
-CurrencyNames/de/zar=S\u00fcdafrikanischer Rand
-CurrencyNames/de/zwd=Simbabwe-Dollar (1980-2008)
-
-CurrencyNames/es/aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
-CurrencyNames/es/azm=manat azer\u00ed (1993\u20132006)
-CurrencyNames/es/azn=manat azerbaiyano
-CurrencyNames/es/csd=antiguo dinar serbio
-CurrencyNames/es/ghc=cedi ghan\u00e9s (1979\u20132007)
-CurrencyNames/es/ghs=cedi
-CurrencyNames/es/mzm=antiguo metical mozambique\u00f1o
-CurrencyNames/es/mzn=metical
-CurrencyNames/es/rsd=dinar serbio
-CurrencyNames/es/sdg=libra sudanesa
-CurrencyNames/es/trl=lira turca (1922\u20132005)
-CurrencyNames/es/vef=bol\u00edvar venezolano (2008\u20132018)
-
-CurrencyNames/fr/afa=afghani (1927\u20132002)
-CurrencyNames/fr/all=lek albanais
-CurrencyNames/fr/ang=florin antillais
-CurrencyNames/fr/awg=florin arubais
-CurrencyNames/fr/azm=manat az\u00e9ri (1993\u20132006)
-CurrencyNames/fr/azn=manat az\u00e9ri
-CurrencyNames/fr/bam=mark convertible bosniaque
-CurrencyNames/fr/bbd=dollar barbadien
-CurrencyNames/fr/bdt=taka bangladeshi
-CurrencyNames/fr/bgl=lev bulgare (1962\u20131999)
-CurrencyNames/fr/bgn=lev bulgare
-CurrencyNames/fr/bhd=dinar bahre\u00efni
-CurrencyNames/fr/bif=franc burundais
-CurrencyNames/fr/bmd=dollar bermudien
-CurrencyNames/fr/bnd=dollar brun\u00e9ien
-CurrencyNames/fr/bov=mvdol bolivien
-CurrencyNames/fr/brl=r\u00e9al br\u00e9silien
-CurrencyNames/fr/bsd=dollar baham\u00e9en
-CurrencyNames/fr/btn=ngultrum bouthanais
-CurrencyNames/fr/bwp=pula botswanais
-CurrencyNames/fr/bzd=dollar b\u00e9liz\u00e9en
-CurrencyNames/fr/cny=yuan renminbi chinois
-CurrencyNames/fr/crc=col\u00f3n costaricain
-CurrencyNames/fr/csd=dinar serbo-mont\u00e9n\u00e9grin
-CurrencyNames/fr/cve=escudo capverdien
-CurrencyNames/fr/cyp=livre chypriote
-CurrencyNames/fr/dem=mark allemand
-CurrencyNames/fr/djf=franc djiboutien
-CurrencyNames/fr/ern=nafka \u00e9rythr\u00e9en
-CurrencyNames/fr/etb=birr \u00e9thiopien
-CurrencyNames/fr/fjd=dollar fidjien
-CurrencyNames/fr/fkp=livre des \u00eeles Malouines
-CurrencyNames/fr/gel=lari g\u00e9orgien
-CurrencyNames/fr/ghs=c\u00e9di ghan\u00e9en
-CurrencyNames/fr/gmd=dalasi gambien
-CurrencyNames/fr/grd=drachme grecque
-CurrencyNames/fr/gtq=quetzal guat\u00e9malt\u00e8que
-CurrencyNames/fr/gwp=peso bissau-guin\u00e9en
-CurrencyNames/fr/hnl=lempira hondurien
-CurrencyNames/fr/hrk=kuna croate
-CurrencyNames/fr/htg=gourde ha\u00eftienne
-CurrencyNames/fr/huf=forint hongrois
-CurrencyNames/fr/idr=roupie indon\u00e9sienne
-CurrencyNames/fr/ils=nouveau shekel isra\u00e9lien
-CurrencyNames/fr/iqd=dinar irakien
-CurrencyNames/fr/jpy=yen japonais
-CurrencyNames/fr/kes=shilling k\u00e9nyan
-CurrencyNames/fr/kgs=som kirghize
-CurrencyNames/fr/khr=riel cambodgien
-CurrencyNames/fr/kmf=franc comorien
-CurrencyNames/fr/kwd=dinar kowe\u00eftien
-CurrencyNames/fr/kzt=tenge kazakh
-CurrencyNames/fr/lak=kip loatien
-CurrencyNames/fr/lkr=roupie srilankaise
-CurrencyNames/fr/lsl=loti lesothan
-CurrencyNames/fr/mga=ariary malgache
-CurrencyNames/fr/mkd=denar mac\u00e9donien
-CurrencyNames/fr/mmk=kyat myanmarais
-CurrencyNames/fr/mnt=tugrik mongol
-CurrencyNames/fr/mop=pataca macanaise
-CurrencyNames/fr/mro=ouguiya mauritanien (1973\u20132017)
-CurrencyNames/fr/mvr=rufiyaa maldivien
-CurrencyNames/fr/mwk=kwacha malawite
-CurrencyNames/fr/myr=ringgit malais
-CurrencyNames/fr/mzn=metical mozambicain
-CurrencyNames/fr/ngn=naira nig\u00e9rian
-CurrencyNames/fr/nio=c\u00f3rdoba oro nicaraguayen
-CurrencyNames/fr/npr=roupie n\u00e9palaise
-CurrencyNames/fr/pab=balboa panam\u00e9en
-CurrencyNames/fr/pgk=kina papouan-n\u00e9o-guin\u00e9en
-CurrencyNames/fr/pkr=roupie pakistanaise
-CurrencyNames/fr/pln=zloty polonais
-CurrencyNames/fr/pyg=guaran\u00ed paraguayen
-CurrencyNames/fr/qar=riyal qatari
-CurrencyNames/fr/ron=leu roumain
-CurrencyNames/fr/rsd=dinar serbe
-CurrencyNames/fr/rub=rouble russe
-CurrencyNames/fr/rur=rouble russe (1991\u20131998)
-CurrencyNames/fr/sbd=dollar des \u00eeles Salomon
-CurrencyNames/fr/sdg=livre soudanaise
-CurrencyNames/fr/sit=tolar slov\u00e8ne
-CurrencyNames/fr/sll=leone sierra-l\u00e9onais
-CurrencyNames/fr/sos=shilling somalien
-CurrencyNames/fr/srg=florin surinamais
-CurrencyNames/fr/std=dobra santom\u00e9en (1977\u20132017)
-CurrencyNames/fr/svc=col\u00f3n salvadorien
-CurrencyNames/fr/szl=lilangeni swazi
-CurrencyNames/fr/thb=baht tha\u00eflandais
-CurrencyNames/fr/tjs=somoni tadjik
-CurrencyNames/fr/tmm=manat turkm\u00e8ne
-CurrencyNames/fr/top=pa\u2019anga tongan
-CurrencyNames/fr/tpe=escudo timorais
-CurrencyNames/fr/ttd=dollar de Trinit\u00e9-et-Tobago
-CurrencyNames/fr/twd=nouveau dollar ta\u00efwanais
-CurrencyNames/fr/tzs=shilling tanzanien
-CurrencyNames/fr/uah=hryvnia ukrainienne
-CurrencyNames/fr/uzs=sum ouzbek
-CurrencyNames/fr/vef=bolivar v\u00e9n\u00e9zu\u00e9lien (2008\u20132018)
-CurrencyNames/fr/vnd=d\u00f4ng vietnamien
-CurrencyNames/fr/vuv=vatu vanuatuan
-CurrencyNames/fr/wst=tala samoan
-CurrencyNames/fr/xts=(devise de test)
-CurrencyNames/fr/xxx=devise inconnue ou non valide
-CurrencyNames/fr/yer=riyal y\u00e9m\u00e9nite
-CurrencyNames/fr/zar=rand sud-africain
-CurrencyNames/fr/zmk=kwacha zambien (1968\u20132012)
-CurrencyNames/fr/zwd=dollar zimbabw\u00e9en
-
-CurrencyNames/it/azm=manat azero (1993\u20132006)
-CurrencyNames/it/ghs=cedi ghanese
-CurrencyNames/it/iep=sterlina irlandese
-CurrencyNames/it/mzn=metical mozambicano
-CurrencyNames/it/rsd=dinaro serbo
-CurrencyNames/it/sdg=sterlina sudanese
-CurrencyNames/it/srd=dollaro del Suriname
-CurrencyNames/it/vef=bol\u00edvar venezuelano (2008\u20132018)
-CurrencyNames/it/xag=argento
-CurrencyNames/it/xpd=palladio
-
-CurrencyNames/ja/azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u30fb\u30de\u30ca\u30c8(1993-2006)
-CurrencyNames/ja/azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u30fb\u30de\u30ca\u30c8
-CurrencyNames/ja/ghc=\u30ac\u30fc\u30ca\u30fb\u30bb\u30c7\u30a3(1979-2007)
-CurrencyNames/ja/ghs=\u30ac\u30fc\u30ca\u30fb\u30bb\u30c7\u30a3
-CurrencyNames/ja/mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af\u30fb\u30e1\u30c6\u30a3\u30ab\u30eb
-CurrencyNames/ja/rol=\u30eb\u30fc\u30de\u30cb\u30a2\u30fb\u30ec\u30a4(1952-2006)
-CurrencyNames/ja/ron=\u30eb\u30fc\u30de\u30cb\u30a2\u30fb\u30ec\u30a4
-CurrencyNames/ja/rsd=\u30bb\u30eb\u30d3\u30a2\u30fb\u30c7\u30a3\u30ca\u30fc\u30eb
-CurrencyNames/ja/sdg=\u30b9\u30fc\u30c0\u30f3\u30fb\u30dd\u30f3\u30c9
-CurrencyNames/ja/srd=\u30b9\u30ea\u30ca\u30e0\u30fb\u30c9\u30eb
-CurrencyNames/ja/vef=\u30d9\u30cd\u30ba\u30a8\u30e9\u30fb\u30dc\u30ea\u30d0\u30eb
-CurrencyNames/ja/xag=\u9280
-CurrencyNames/ja/xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
-CurrencyNames/ja/xpt=\u30d7\u30e9\u30c1\u30ca
-CurrencyNames/ja/xts=\u30c6\u30b9\u30c8\u901a\u8ca8\u30b3\u30fc\u30c9
-CurrencyNames/ja/xxx=\u4e0d\u660e\u306a\u901a\u8ca8
-CurrencyNames/ja/zmk=\u30b6\u30f3\u30d3\u30a2\u30fb\u30af\u30ef\u30c1\u30e3
-
-CurrencyNames/ko/aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
-CurrencyNames/ko/ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
-CurrencyNames/ko/azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8(1993\u20132006)
-CurrencyNames/ko/azn=\uc544\uc81c\ub974\ubc14\uc774\uc794 \ub9c8\ub098\ud2b8
-CurrencyNames/ko/bov=\ubcfc\ub9ac\ube44\uc544\ub178 Mvdol(\uae30\uae08)
-CurrencyNames/ko/chf=\uc2a4\uc704\uc2a4 \ud504\ub791
-CurrencyNames/ko/clf=\uce60\ub808 (UF)
-CurrencyNames/ko/csd=\uace0 \uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-CurrencyNames/ko/ghc=\uac00\ub098 \uc2dc\ub514 (1979\u20132007)
-CurrencyNames/ko/ghs=\uac00\ub098 \uc2dc\ub514
-CurrencyNames/ko/mxv=\uba55\uc2dc\ucf54 (UDI)
-CurrencyNames/ko/myr=\ub9d0\ub808\uc774\uc2dc\uc544 \ub9c1\uae43
-CurrencyNames/ko/mzm=\uace0 \ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-CurrencyNames/ko/mzn=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-CurrencyNames/ko/ron=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc6b0
-CurrencyNames/ko/rsd=\uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-CurrencyNames/ko/sdg=\uc218\ub2e8 \ud30c\uc6b4\ub4dc
-CurrencyNames/ko/srd=\uc218\ub9ac\ub0a8 \ub2ec\ub7ec
-CurrencyNames/ko/top=\ud1b5\uac00 \ud30c\uc559\uac00
-CurrencyNames/ko/trl=\ud130\ud0a4 \ub9ac\ub77c
-CurrencyNames/ko/try=\uc2e0 \ud130\ud0a4 \ub9ac\ub77c
-CurrencyNames/ko/usn=\ubbf8\uad6d \ub2ec\ub7ec(\ub2e4\uc74c\ub0a0)
-CurrencyNames/ko/uss=\ubbf8\uad6d \ub2ec\ub7ec(\ub2f9\uc77c)
-CurrencyNames/ko/vef=\ubca0\ub124\uc218\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 (2008\u20132018)
-CurrencyNames/ko/xaf=\uc911\uc559\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-CurrencyNames/ko/xag=\uc740\ud654
-CurrencyNames/ko/xba=\uc720\ub974\ucf54 (\uc720\ub7fd \ud68c\uacc4 \ub2e8\uc704)
-CurrencyNames/ko/xbb=\uc720\ub7fd \ud1b5\ud654 \ub3d9\ub9f9
-CurrencyNames/ko/xbc=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBC)
-CurrencyNames/ko/xbd=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBD)
-CurrencyNames/ko/xof=\uc11c\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-CurrencyNames/ko/xpd=\ud314\ub77c\ub4d0
-CurrencyNames/ko/xpf=CFP \ud504\ub791
-CurrencyNames/ko/xpt=\ubc31\uae08
-CurrencyNames/ko/xts=\ud14c\uc2a4\ud2b8 \ud1b5\ud654 \ucf54\ub4dc
-CurrencyNames/ko/xxx=\uc54c \uc218 \uc5c6\ub294 \ud1b5\ud654 \ub2e8\uc704
-CurrencyNames/ko/zwd=\uc9d0\ubc14\ube0c\uc6e8 \ub2ec\ub7ec
-
-CurrencyNames/sv/adp=andorransk peseta
-CurrencyNames/sv/aed=emiratisk dirham
-CurrencyNames/sv/afa=afghani (1927\u20132002)
-CurrencyNames/sv/afn=afghansk afghani
-CurrencyNames/sv/all=albansk lek
-CurrencyNames/sv/amd=armenisk dram
-CurrencyNames/sv/ang=antillergulden
-CurrencyNames/sv/aoa=angolansk kwanza
-CurrencyNames/sv/ars=argentinsk peso
-CurrencyNames/sv/ats=\u00f6sterrikisk schilling
-CurrencyNames/sv/aud=australisk dollar
-CurrencyNames/sv/awg=arubansk florin
-CurrencyNames/sv/azm=azerbajdzjansk manat (1993\u20132006)
-CurrencyNames/sv/azn=azerbajdzjansk manat
-CurrencyNames/sv/bam=bosnisk-hercegovinsk mark (konvertibel)
-CurrencyNames/sv/bbd=barbadisk dollar
-CurrencyNames/sv/bdt=bangladeshisk taka
-CurrencyNames/sv/bef=belgisk franc
-CurrencyNames/sv/bgn=bulgarisk lev
-CurrencyNames/sv/bhd=bahrainsk dinar
-CurrencyNames/sv/bif=burundisk franc
-CurrencyNames/sv/bnd=bruneisk dollar
-CurrencyNames/sv/bob=boliviansk boliviano
-CurrencyNames/sv/bov=boliviansk mvdol
-CurrencyNames/sv/brl=brasiliansk real
-CurrencyNames/sv/bsd=bahamansk dollar
-CurrencyNames/sv/btn=bhutanesisk ngultrum
-CurrencyNames/sv/bwp=botswansk pula
-CurrencyNames/sv/byb=vitrysk ny rubel (1994\u20131999)
-CurrencyNames/sv/byr=vitrysk rubel (2000\u20132016)
-CurrencyNames/sv/bzd=belizisk dollar
-CurrencyNames/sv/cad=kanadensisk dollar
-CurrencyNames/sv/cdf=kongolesisk franc
-CurrencyNames/sv/chf=schweizisk franc
-CurrencyNames/sv/clf=chilensk unidad de fomento
-CurrencyNames/sv/clp=chilensk peso
-CurrencyNames/sv/cny=kinesisk yuan
-CurrencyNames/sv/cop=colombiansk peso
-CurrencyNames/sv/crc=costarikansk col\u00f3n
-CurrencyNames/sv/csd=serbisk dinar (2002\u20132006)
-CurrencyNames/sv/cup=kubansk peso
-CurrencyNames/sv/cve=kapverdisk escudo
-CurrencyNames/sv/cyp=cypriotiskt pund
-CurrencyNames/sv/czk=tjeckisk koruna
-CurrencyNames/sv/dem=tysk mark
-CurrencyNames/sv/djf=djiboutisk franc
-CurrencyNames/sv/dkk=dansk krona
-CurrencyNames/sv/dop=dominikansk peso
-CurrencyNames/sv/dzd=algerisk dinar
-CurrencyNames/sv/eek=estnisk krona
-CurrencyNames/sv/egp=egyptiskt pund
-CurrencyNames/sv/ern=eritreansk nakfa
-CurrencyNames/sv/esp=spansk peseta
-CurrencyNames/sv/etb=etiopisk birr
-CurrencyNames/sv/eur=euro
-CurrencyNames/sv/fim=finsk mark
-CurrencyNames/sv/fjd=Fijidollar
-CurrencyNames/sv/frf=fransk franc
-CurrencyNames/sv/gbp=brittiskt pund
-CurrencyNames/sv/gel=georgisk lari
-CurrencyNames/sv/ghc=ghanansk cedi (1979\u20132007)
-CurrencyNames/sv/ghs=ghanansk cedi
-CurrencyNames/sv/gip=gibraltiskt pund
-CurrencyNames/sv/gmd=gambisk dalasi
-CurrencyNames/sv/gnf=guineansk franc
-CurrencyNames/sv/grd=grekisk drachma
-CurrencyNames/sv/gtq=guatemalansk quetzal
-CurrencyNames/sv/gyd=Guyanadollar
-CurrencyNames/sv/hnl=honduransk lempira
-CurrencyNames/sv/hrk=kroatisk kuna
-CurrencyNames/sv/htg=haitisk gourde
-CurrencyNames/sv/huf=ungersk forint
-CurrencyNames/sv/idr=indonesisk rupie
-CurrencyNames/sv/iep=irl\u00e4ndskt pund
-CurrencyNames/sv/ils=israelisk ny shekel
-CurrencyNames/sv/inr=indisk rupie
-CurrencyNames/sv/iqd=irakisk dinar
-CurrencyNames/sv/irr=iransk rial
-CurrencyNames/sv/isk=isl\u00e4ndsk krona
-CurrencyNames/sv/itl=italiensk lire
-CurrencyNames/sv/jmd=jamaicansk dollar
-CurrencyNames/sv/jod=jordansk dinar
-CurrencyNames/sv/jpy=japansk yen
-CurrencyNames/sv/kes=kenyansk shilling
-CurrencyNames/sv/kgs=kirgizisk som
-CurrencyNames/sv/khr=kambodjansk riel
-CurrencyNames/sv/kmf=komorisk franc
-CurrencyNames/sv/kpw=nordkoreansk won
-CurrencyNames/sv/krw=sydkoreansk won
-CurrencyNames/sv/kwd=kuwaitisk dinar
-CurrencyNames/sv/kzt=kazakisk tenge
-CurrencyNames/sv/lak=laotisk kip
-CurrencyNames/sv/lbp=libanesiskt pund
-CurrencyNames/sv/lkr=srilankesisk rupie
-CurrencyNames/sv/lrd=liberiansk dollar
-CurrencyNames/sv/lsl=lesothisk loti
-CurrencyNames/sv/ltl=litauisk litas
-CurrencyNames/sv/luf=luxemburgsk franc
-CurrencyNames/sv/lvl=lettisk lats
-CurrencyNames/sv/lyd=libysk dinar
-CurrencyNames/sv/mad=marockansk dirham
-CurrencyNames/sv/mdl=moldavisk leu
-CurrencyNames/sv/mga=madagaskisk ariary
-CurrencyNames/sv/mgf=madagaskisk franc
-CurrencyNames/sv/mkd=makedonisk denar
-CurrencyNames/sv/mmk=myanmarisk kyat
-CurrencyNames/sv/mnt=mongolisk t\u00f6gr\u00f6g
-CurrencyNames/sv/mop=makanesisk pataca
-CurrencyNames/sv/mro=mauretansk ouguiya (1973\u20132017)
-CurrencyNames/sv/mtl=maltesisk lire
-CurrencyNames/sv/mur=mauritisk rupie
-CurrencyNames/sv/mvr=maldivisk rufiyaa
-CurrencyNames/sv/mwk=malawisk kwacha
-CurrencyNames/sv/mxn=mexikansk peso
-CurrencyNames/sv/mxv=mexikansk unidad de inversion
-CurrencyNames/sv/myr=malaysisk ringgit
-CurrencyNames/sv/mzm=gammal mo\u00e7ambikisk metical
-CurrencyNames/sv/mzn=mo\u00e7ambikisk metical
-CurrencyNames/sv/nad=namibisk dollar
-CurrencyNames/sv/ngn=nigeriansk naira
-CurrencyNames/sv/nio=nicaraguansk c\u00f3rdoba
-CurrencyNames/sv/nlg=nederl\u00e4ndsk gulden
-CurrencyNames/sv/nok=norsk krona
-CurrencyNames/sv/npr=nepalesisk rupie
-CurrencyNames/sv/nzd=nyzeel\u00e4ndsk dollar
-CurrencyNames/sv/omr=omansk rial
-CurrencyNames/sv/pab=panamansk balboa
-CurrencyNames/sv/pen=peruansk sol
-CurrencyNames/sv/pgk=papuansk kina
-CurrencyNames/sv/php=filippinsk peso
-CurrencyNames/sv/pkr=pakistansk rupie
-CurrencyNames/sv/pln=polsk zloty
-CurrencyNames/sv/pte=portugisisk escudo
-CurrencyNames/sv/pyg=paraguayansk guarani
-CurrencyNames/sv/qar=qatarisk rial
-CurrencyNames/sv/rol=rum\u00e4nsk leu (1952\u20132005)
-CurrencyNames/sv/ron=rum\u00e4nsk leu
-CurrencyNames/sv/rsd=serbisk dinar
-CurrencyNames/sv/rub=rysk rubel
-CurrencyNames/sv/rur=rysk rubel (1991\u20131998)
-CurrencyNames/sv/rwf=rwandisk franc
-CurrencyNames/sv/sar=saudisk riyal
-CurrencyNames/sv/scr=seychellisk rupie
-CurrencyNames/sv/sdd=sudansk dinar (1992\u20132007)
-CurrencyNames/sv/sdg=sudanesiskt pund
-CurrencyNames/sv/sek=svensk krona
-CurrencyNames/sv/sgd=singaporiansk dollar
-CurrencyNames/sv/sit=slovensk tolar
-CurrencyNames/sv/skk=slovakisk koruna
-CurrencyNames/sv/sll=sierraleonsk leone
-CurrencyNames/sv/sos=somalisk shilling
-CurrencyNames/sv/srd=surinamesisk dollar
-CurrencyNames/sv/srg=surinamesisk gulden
-CurrencyNames/sv/svc=salvadoransk col\u00f3n
-CurrencyNames/sv/syp=syriskt pund
-CurrencyNames/sv/szl=swazil\u00e4ndsk lilangeni
-CurrencyNames/sv/thb=thail\u00e4ndsk baht
-CurrencyNames/sv/tjs=tadzjikisk somoni
-CurrencyNames/sv/tmm=turkmenistansk manat (1993\u20132009)
-CurrencyNames/sv/tnd=tunisisk dinar
-CurrencyNames/sv/top=tongansk pa\u02bbanga
-CurrencyNames/sv/tpe=\u00f6sttimoresisk escudo
-CurrencyNames/sv/trl=turkisk lire (1922\u20132005)
-CurrencyNames/sv/try=turkisk lira
-CurrencyNames/sv/ttd=Trinidaddollar
-CurrencyNames/sv/twd=taiwanesisk dollar
-CurrencyNames/sv/tzs=tanzanisk shilling
-CurrencyNames/sv/uah=ukrainsk hryvnia
-CurrencyNames/sv/ugx=ugandisk shilling
-CurrencyNames/sv/uyu=uruguayansk peso
-CurrencyNames/sv/uzs=uzbekisk sum
-CurrencyNames/sv/veb=venezuelansk bolivar (1871\u20132008)
-CurrencyNames/sv/vef=venezuelansk bol\u00edvar (2008\u20132018)
-CurrencyNames/sv/vnd=vietnamesisk dong
-CurrencyNames/sv/vuv=vanuatisk vatu
-CurrencyNames/sv/wst=v\u00e4stsamoansk tala
-CurrencyNames/sv/xag=silver
-CurrencyNames/sv/xau=guld
-CurrencyNames/sv/xba=europeisk kompositenhet
-CurrencyNames/sv/xbb=europeisk monet\u00e4r enhet
-CurrencyNames/sv/xbc=europeisk kontoenhet (XBC)
-CurrencyNames/sv/xbd=europeisk kontoenhet (XBD)
-CurrencyNames/sv/xcd=\u00f6stkaribisk dollar
-CurrencyNames/sv/xdr=IMF s\u00e4rskild dragningsr\u00e4tt
-CurrencyNames/sv/xfo=fransk guldfranc
-CurrencyNames/sv/xpd=palladium
-CurrencyNames/sv/xpt=platina
-CurrencyNames/sv/xts=testvalutaenhet
-CurrencyNames/sv/xxx=ok\u00e4nd valuta
-CurrencyNames/sv/yer=jemenitisk rial
-CurrencyNames/sv/yum=jugoslavisk dinar (1994\u20132002)
-CurrencyNames/sv/zar=sydafrikansk rand
-CurrencyNames/sv/zmk=zambisk kwacha (1968\u20132012)
-CurrencyNames/sv/zwd=Zimbabwe-dollar
-
-CurrencyNames/zh_CN/ang=\u8377\u5c5e\u5b89\u7684\u5217\u65af\u76fe
-CurrencyNames/zh_CN/azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993-2006)
-CurrencyNames/zh_CN/azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
-CurrencyNames/zh_CN/csd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14 (2002-2006)
-CurrencyNames/zh_CN/ghs=\u52a0\u7eb3\u585e\u5730
-CurrencyNames/zh_CN/mzm=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361 (1980-2006)
-CurrencyNames/zh_CN/mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-CurrencyNames/zh_CN/ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-CurrencyNames/zh_CN/rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-CurrencyNames/zh_CN/shp=\u5723\u8d6b\u52d2\u62ff\u9551
-CurrencyNames/zh_CN/twd=\u65b0\u53f0\u5e01
-CurrencyNames/zh_CN/vef=\u59d4\u5185\u745e\u62c9\u73bb\u5229\u74e6\u5c14
-CurrencyNames/zh_CN/xxx=\u672a\u77e5\u8d27\u5e01
-
-CurrencyNames/zh_TW/afa=\u963f\u5bcc\u6c57\u5c3c (1927\u20132002)
-CurrencyNames/zh_TW/ang=\u8377\u5c6c\u5b89\u5730\u5217\u65af\u76fe
-CurrencyNames/zh_TW/azm=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279 (1993\u20132006)
-CurrencyNames/zh_TW/azn=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279
-CurrencyNames/zh_TW/bwp=\u6ce2\u672d\u90a3\u666e\u62c9
-CurrencyNames/zh_TW/bzd=\u8c9d\u91cc\u65af\u5143
-CurrencyNames/zh_TW/csd=\u820a\u585e\u723e\u7dad\u4e9e\u7b2c\u7d0d\u723e
-CurrencyNames/zh_TW/cyp=\u8cfd\u666e\u52d2\u65af\u938a
-CurrencyNames/zh_TW/ghc=\u8fe6\u7d0d\u8cfd\u5730 (1979\u20132007)
-CurrencyNames/zh_TW/ghs=\u8fe6\u7d0d\u585e\u5730
-CurrencyNames/zh_TW/gwp=\u5e7e\u5167\u4e9e\u6bd4\u7d22\u62ab\u7d22
-CurrencyNames/zh_TW/huf=\u5308\u7259\u5229\u798f\u6797
-CurrencyNames/zh_TW/idr=\u5370\u5c3c\u76fe
-CurrencyNames/zh_TW/inr=\u5370\u5ea6\u76e7\u6bd4
-CurrencyNames/zh_TW/kpw=\u5317\u97d3\u5143
-CurrencyNames/zh_TW/krw=\u97d3\u5143
-CurrencyNames/zh_TW/lak=\u5bee\u570b\u57fa\u666e
-CurrencyNames/zh_TW/mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
-CurrencyNames/zh_TW/mxn=\u58a8\u897f\u54e5\u62ab\u7d22
-CurrencyNames/zh_TW/mxv=\u58a8\u897f\u54e5\u8f49\u63db\u55ae\u4f4d (UDI)
-CurrencyNames/zh_TW/myr=\u99ac\u4f86\u897f\u4e9e\u4ee4\u5409
-CurrencyNames/zh_TW/mzn=\u83ab\u4e09\u6bd4\u514b\u6885\u8482\u5361\u723e
-CurrencyNames/zh_TW/nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
-CurrencyNames/zh_TW/rol=\u820a\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-CurrencyNames/zh_TW/ron=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-CurrencyNames/zh_TW/rsd=\u585e\u723e\u7dad\u4e9e\u6234\u7d0d
-CurrencyNames/zh_TW/scr=\u585e\u5e2d\u723e\u76e7\u6bd4
-CurrencyNames/zh_TW/sdg=\u8607\u4e39\u938a
-CurrencyNames/zh_TW/shp=\u8056\u8d6b\u52d2\u62ff\u938a
-CurrencyNames/zh_TW/srd=\u8607\u5229\u5357\u5143
-CurrencyNames/zh_TW/srg=\u8607\u5229\u5357\u57fa\u723e
-CurrencyNames/zh_TW/svc=\u85a9\u723e\u74e6\u591a\u79d1\u90ce
-CurrencyNames/zh_TW/szl=\u53f2\u74e6\u6fdf\u862d\u91cc\u6717\u5409\u5c3c
-CurrencyNames/zh_TW/tpe=\u5e1d\u6c76\u57c3\u65af\u5eab\u591a
-CurrencyNames/zh_TW/ttd=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5\u5143
-CurrencyNames/zh_TW/tzs=\u5766\u5c1a\u5c3c\u4e9e\u5148\u4ee4
-CurrencyNames/zh_TW/uzs=\u70cf\u8332\u5225\u514b\u7d22\u59c6
-CurrencyNames/zh_TW/veb=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (1871\u20132008)
-CurrencyNames/zh_TW/vef=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (2008\u20132018)
-CurrencyNames/zh_TW/xaf=\u6cd5\u90ce (CFA\u2013BEAC)
-CurrencyNames/zh_TW/xag=\u767d\u9280
-CurrencyNames/zh_TW/xof=\u6cd5\u90ce (CFA\u2013BCEAO)
-CurrencyNames/zh_TW/xpd=\u5e15\u62c9\u72c4\u6602
-CurrencyNames/zh_TW/xpt=\u767d\u91d1
-CurrencyNames/zh_TW/xts=\u6e2c\u8a66\u7528\u8ca8\u5e63\u4ee3\u78bc
-CurrencyNames/zh_TW/xxx=\u672a\u77e5\u8ca8\u5e63
-CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u4e9e\u723e
-
-# bug 7036905
-CurrencyNames/de/afa=Afghani (1927-2002)
-CurrencyNames/de/afn=Afghani
-CurrencyNames/de/bob=Bolivianischer Boliviano
-CurrencyNames/de/dem=Deutsche Mark
-CurrencyNames/de/mwk=Malawi-Kwacha
-CurrencyNames/de/mxv=Unidad De Inversion (Mexiko)
-CurrencyNames/de/svc=El-Salvador-Col\u00f3n
-
-CurrencyNames/it/bob=boliviano
-
-# bug 7066203
-CurrencyNames//CUC=CUC
-CurrencyNames//TMT=TMT
-CurrencyNames//XSU=XSU
-CurrencyNames//XUA=XUA
-CurrencyNames//ZWL=ZWL
-CurrencyNames//ZWR=ZWR
-CurrencyNames//cuc=Cuban Convertible Peso
-CurrencyNames//tmt=Turkmenistani Manat
-CurrencyNames//zwl=Zimbabwean Dollar (2009)
-CurrencyNames//zwr=Zimbabwean Dollar (2008)
-
-CurrencyNames/de/cuc=Kubanischer konvertibler Peso
-CurrencyNames/de/tmt=Turkmenistan-Manat
-CurrencyNames/de/zwl=Simbabwe-Dollar (2009)
-
-CurrencyNames/es/cuc=peso cubano convertible
-CurrencyNames/es/tmt=manat turcomano
-CurrencyNames/es/zwl=d\u00f3lar zimbabuense
-
-CurrencyNames/es_CU/CUP=CU$
-CurrencyNames/es_CU/CUC=CUC$
-
-CurrencyNames/et_EE/eek=Eesti kroon
-CurrencyNames/et_EE/EUR=\u20ac
-CurrencyNames/et_EE/eur=euro
-
-CurrencyNames/fr/cuc=peso cubain convertible
-CurrencyNames/fr/tmt=nouveau manat turkm\u00e8ne
-
-CurrencyNames/ja/cuc=\u30ad\u30e5\u30fc\u30d0\u514c\u63db\u30da\u30bd
-CurrencyNames/ja/tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u30fb\u30de\u30ca\u30c8
-CurrencyNames/ja/zwl=\u30b8\u30f3\u30d0\u30d6\u30a8\u30fb\u30c9\u30eb(2009)
-
-CurrencyNames/ko/cuc=\ucfe0\ubc14 \ud0dc\ud658 \ud398\uc18c
-
-CurrencyNames/pt/bob=Boliviano da Bol\u00edvia
-CurrencyNames/pt/cuc=Peso cubano convers\u00edvel
-CurrencyNames/pt/tmt=Manat turcomeno
-CurrencyNames/pt/zwl=D\u00f3lar do Zimb\u00e1bue (2009)
-CurrencyNames/pt/zwr=D\u00f3lar do Zimb\u00e1bue (2008)
-
-CurrencyNames/sk_SK/skk=slovensk\u00e1 koruna
-CurrencyNames/sk_SK/EUR=\u20ac
-
-CurrencyNames/zh_CN/cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
-CurrencyNames/zh_CN/tmt=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
-CurrencyNames/zh_CN/zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
-
-CurrencyNames/zh_TW/cuc=\u53e4\u5df4\u53ef\u8f49\u63db\u62ab\u7d22
-CurrencyNames/zh_TW/tmt=\u571f\u5eab\u66fc\u99ac\u7d0d\u7279
-CurrencyNames/zh_TW/zwl=\u8f9b\u5df4\u5a01\u5143 (2009)
-
-# bug 7101495
-CalendarData/lv/firstDayOfWeek=2
-CalendarData/lv/minimalDaysInFirstWeek=4
-
-# bug 7003124
-FormatData/bg/TimePatterns/0=HH:mm:ss zzzz
-FormatData/bg/TimePatterns/2=HH:mm:ss
-FormatData/bg/TimePatterns/3=HH:mm
-FormatData/bg/DatePatterns/0=dd MMMM y, EEEE
-FormatData/bg/DatePatterns/1=dd MMMM y
-FormatData/bg/DatePatterns/2=dd.MM.yyyy
-FormatData/bg/DatePatterns/3=dd.MM.yy
-
-# bug 7085757
-CurrencyNames//SSP=SSP
-CurrencyNames//ssp=South Sudanese Pound
-CurrencyNames//xsu=Sucre
-CurrencyNames//xua=ADB Unit of Account
-LocaleNames//SS=South Sudan
-LocaleNames/en/SS=South Sudan
-
-# bug 7028073
-CurrencyNames/es_PE/PEN=S/.
-
-# bug 7171028
-FormatData/sl/DatePatterns/0=EEEE, dd. MMMM y
-FormatData/sl/DatePatterns/1=dd. MMMM y
-
-# bug 7189611
-CurrencyNames/es_VE/VEF=Bs.F.
-
-# rfe 8000983 (narrow names support)
-FormatData//DayNarrows/0=S
-FormatData//DayNarrows/1=M
-FormatData//DayNarrows/2=T
-FormatData//DayNarrows/3=W
-FormatData//DayNarrows/4=T
-FormatData//DayNarrows/5=F
-FormatData//DayNarrows/6=S
-FormatData//narrow.AmPmMarkers/0=a
-FormatData//narrow.AmPmMarkers/1=p
-FormatData//narrow.Eras/0=B
-FormatData//narrow.Eras/1=A
-FormatData//buddhist.narrow.Eras/0=BC
-FormatData//buddhist.narrow.Eras/1=B.E.
-FormatData//japanese.narrow.Eras/0=
-FormatData//japanese.narrow.Eras/1=M
-FormatData//japanese.narrow.Eras/2=T
-FormatData//japanese.narrow.Eras/3=S
-FormatData//japanese.narrow.Eras/4=H
-
-FormatData/ar/DayNarrows/0=\u062d
-FormatData/ar/DayNarrows/1=\u0646
-FormatData/ar/DayNarrows/2=\u062b
-FormatData/ar/DayNarrows/3=\u0631
-FormatData/ar/DayNarrows/4=\u062e
-FormatData/ar/DayNarrows/5=\u062c
-FormatData/ar/DayNarrows/6=\u0633
-
-FormatData/be/standalone.MonthNarrows/0=\u0441
-FormatData/be/standalone.MonthNarrows/1=\u043b
-FormatData/be/standalone.MonthNarrows/2=\u0441
-FormatData/be/standalone.MonthNarrows/3=\u043a
-FormatData/be/standalone.MonthNarrows/4=\u043c
-FormatData/be/standalone.MonthNarrows/5=\u0447
-FormatData/be/standalone.MonthNarrows/6=\u043b
-FormatData/be/standalone.MonthNarrows/7=\u0436
-FormatData/be/standalone.MonthNarrows/8=\u0432
-FormatData/be/standalone.MonthNarrows/9=\u043a
-FormatData/be/standalone.MonthNarrows/10=\u043b
-FormatData/be/standalone.MonthNarrows/11=\u0441
-FormatData/be/standalone.MonthNarrows/12=
-FormatData/be/DayNarrows/0=\u043d
-FormatData/be/DayNarrows/1=\u043f
-FormatData/be/DayNarrows/2=\u0430
-FormatData/be/DayNarrows/3=\u0441
-FormatData/be/DayNarrows/4=\u0447
-FormatData/be/DayNarrows/5=\u043f
-FormatData/be/DayNarrows/6=\u0441
-
-FormatData/bg/DayNarrows/0=\u043d
-FormatData/bg/DayNarrows/1=\u043f
-FormatData/bg/DayNarrows/2=\u0432
-FormatData/bg/DayNarrows/3=\u0441
-FormatData/bg/DayNarrows/4=\u0447
-FormatData/bg/DayNarrows/5=\u043f
-FormatData/bg/DayNarrows/6=\u0441
-
-FormatData/ca/standalone.MonthNarrows/0=g
-FormatData/ca/standalone.MonthNarrows/1=f
-FormatData/ca/standalone.MonthNarrows/2=m
-FormatData/ca/standalone.MonthNarrows/3=a
-FormatData/ca/standalone.MonthNarrows/4=m
-FormatData/ca/standalone.MonthNarrows/5=j
-FormatData/ca/standalone.MonthNarrows/6=j
-FormatData/ca/standalone.MonthNarrows/7=a
-FormatData/ca/standalone.MonthNarrows/8=s
-FormatData/ca/standalone.MonthNarrows/9=o
-FormatData/ca/standalone.MonthNarrows/10=n
-FormatData/ca/standalone.MonthNarrows/11=d
-FormatData/ca/standalone.MonthNarrows/12=
-FormatData/ca/DayNarrows/0=G
-# Note: "L" is a contribued item in CLDR
-FormatData/ca/DayNarrows/1=L
-FormatData/ca/DayNarrows/2=T
-FormatData/ca/DayNarrows/3=C
-FormatData/ca/DayNarrows/4=J
-FormatData/ca/DayNarrows/5=V
-FormatData/ca/DayNarrows/6=S
-FormatData/ca/standalone.DayNarrows/0=g
-FormatData/ca/standalone.DayNarrows/1=l
-FormatData/ca/standalone.DayNarrows/2=t
-FormatData/ca/standalone.DayNarrows/3=c
-FormatData/ca/standalone.DayNarrows/4=j
-FormatData/ca/standalone.DayNarrows/5=v
-FormatData/ca/standalone.DayNarrows/6=s
-
-FormatData/cs/DayNarrows/0=N
-FormatData/cs/DayNarrows/1=P
-FormatData/cs/DayNarrows/2=\u00da
-FormatData/cs/DayNarrows/3=S
-FormatData/cs/DayNarrows/4=\u010c
-FormatData/cs/DayNarrows/5=P
-FormatData/cs/DayNarrows/6=S
-
-FormatData/da/DayNarrows/0=S
-FormatData/da/DayNarrows/1=M
-FormatData/da/DayNarrows/2=T
-FormatData/da/DayNarrows/3=O
-FormatData/da/DayNarrows/4=T
-FormatData/da/DayNarrows/5=F
-FormatData/da/DayNarrows/6=L
-
-FormatData/de/DayNarrows/0=S
-FormatData/de/DayNarrows/1=M
-FormatData/de/DayNarrows/2=D
-FormatData/de/DayNarrows/3=M
-FormatData/de/DayNarrows/4=D
-FormatData/de/DayNarrows/5=F
-FormatData/de/DayNarrows/6=S
-
-FormatData/el/DayNarrows/0=\u039a
-FormatData/el/DayNarrows/1=\u0394
-FormatData/el/DayNarrows/2=\u03a4
-FormatData/el/DayNarrows/3=\u03a4
-FormatData/el/DayNarrows/4=\u03a0
-FormatData/el/DayNarrows/5=\u03a0
-FormatData/el/DayNarrows/6=\u03a3
-
-FormatData/es/DayNarrows/0=D
-FormatData/es/DayNarrows/1=L
-FormatData/es/DayNarrows/2=M
-FormatData/es/DayNarrows/3=X
-FormatData/es/DayNarrows/4=J
-FormatData/es/DayNarrows/5=V
-FormatData/es/DayNarrows/6=S
-
-FormatData/et/DayNarrows/0=P
-FormatData/et/DayNarrows/1=E
-FormatData/et/DayNarrows/2=T
-FormatData/et/DayNarrows/3=K
-FormatData/et/DayNarrows/4=N
-FormatData/et/DayNarrows/5=R
-FormatData/et/DayNarrows/6=L
-
-FormatData/fi/standalone.MonthNarrows/0=T
-FormatData/fi/standalone.MonthNarrows/1=H
-FormatData/fi/standalone.MonthNarrows/2=M
-FormatData/fi/standalone.MonthNarrows/3=H
-FormatData/fi/standalone.MonthNarrows/4=T
-FormatData/fi/standalone.MonthNarrows/5=K
-FormatData/fi/standalone.MonthNarrows/6=H
-FormatData/fi/standalone.MonthNarrows/7=E
-FormatData/fi/standalone.MonthNarrows/8=S
-FormatData/fi/standalone.MonthNarrows/9=L
-FormatData/fi/standalone.MonthNarrows/10=M
-FormatData/fi/standalone.MonthNarrows/11=J
-FormatData/fi/standalone.MonthNarrows/12=
-FormatData/fi/DayNarrows/0=S
-FormatData/fi/DayNarrows/1=M
-FormatData/fi/DayNarrows/2=T
-FormatData/fi/DayNarrows/3=K
-FormatData/fi/DayNarrows/4=T
-FormatData/fi/DayNarrows/5=P
-FormatData/fi/DayNarrows/6=L
-FormatData/fi/standalone.DayNarrows/0=S
-FormatData/fi/standalone.DayNarrows/1=M
-FormatData/fi/standalone.DayNarrows/2=T
-FormatData/fi/standalone.DayNarrows/3=K
-FormatData/fi/standalone.DayNarrows/4=T
-FormatData/fi/standalone.DayNarrows/5=P
-FormatData/fi/standalone.DayNarrows/6=L
-FormatData/fi/narrow.AmPmMarkers/0=ap.
-FormatData/fi/narrow.AmPmMarkers/1=ip.
-
-FormatData/fr/DayNarrows/0=D
-FormatData/fr/DayNarrows/1=L
-FormatData/fr/DayNarrows/2=M
-FormatData/fr/DayNarrows/3=M
-FormatData/fr/DayNarrows/4=J
-FormatData/fr/DayNarrows/5=V
-FormatData/fr/DayNarrows/6=S
-
-FormatData/hi_IN/DayNarrows/0=\u0930
-FormatData/hi_IN/DayNarrows/1=\u0938\u094b
-FormatData/hi_IN/DayNarrows/2=\u092e\u0902
-FormatData/hi_IN/DayNarrows/3=\u092c\u0941
-FormatData/hi_IN/DayNarrows/4=\u0917\u0941
-FormatData/hi_IN/DayNarrows/5=\u0936\u0941
-FormatData/hi_IN/DayNarrows/6=\u0936
-
-FormatData/hr/standalone.MonthNarrows/0=1.
-FormatData/hr/standalone.MonthNarrows/1=2.
-FormatData/hr/standalone.MonthNarrows/2=3.
-FormatData/hr/standalone.MonthNarrows/3=4.
-FormatData/hr/standalone.MonthNarrows/4=5.
-FormatData/hr/standalone.MonthNarrows/5=6.
-FormatData/hr/standalone.MonthNarrows/6=7.
-FormatData/hr/standalone.MonthNarrows/7=8.
-FormatData/hr/standalone.MonthNarrows/8=9.
-FormatData/hr/standalone.MonthNarrows/9=10.
-FormatData/hr/standalone.MonthNarrows/10=11.
-FormatData/hr/standalone.MonthNarrows/11=12.
-FormatData/hr/standalone.MonthNarrows/12=
-FormatData/hr/DayNarrows/0=N
-FormatData/hr/DayNarrows/1=P
-FormatData/hr/DayNarrows/2=U
-FormatData/hr/DayNarrows/3=S
-FormatData/hr/DayNarrows/4=\u010c
-FormatData/hr/DayNarrows/5=P
-FormatData/hr/DayNarrows/6=S
-FormatData/hr/standalone.DayNarrows/0=n
-FormatData/hr/standalone.DayNarrows/1=p
-FormatData/hr/standalone.DayNarrows/2=u
-FormatData/hr/standalone.DayNarrows/3=s
-FormatData/hr/standalone.DayNarrows/4=\u010d
-FormatData/hr/standalone.DayNarrows/5=p
-FormatData/hr/standalone.DayNarrows/6=s
-
-FormatData/hu/DayNarrows/0=V
-FormatData/hu/DayNarrows/1=H
-FormatData/hu/DayNarrows/2=K
-FormatData/hu/DayNarrows/3=Sz
-FormatData/hu/DayNarrows/4=Cs
-FormatData/hu/DayNarrows/5=P
-FormatData/hu/DayNarrows/6=Sz
-
-FormatData/is/standalone.MonthNarrows/0=j
-FormatData/is/standalone.MonthNarrows/1=f
-FormatData/is/standalone.MonthNarrows/2=m
-FormatData/is/standalone.MonthNarrows/3=a
-FormatData/is/standalone.MonthNarrows/4=m
-FormatData/is/standalone.MonthNarrows/5=j
-FormatData/is/standalone.MonthNarrows/6=j
-FormatData/is/standalone.MonthNarrows/7=\u00e1
-FormatData/is/standalone.MonthNarrows/8=s
-FormatData/is/standalone.MonthNarrows/9=o
-FormatData/is/standalone.MonthNarrows/10=n
-FormatData/is/standalone.MonthNarrows/11=d
-FormatData/is/standalone.MonthNarrows/12=
-FormatData/is/DayNarrows/0=S
-FormatData/is/DayNarrows/1=M
-FormatData/is/DayNarrows/2=\u00de
-FormatData/is/DayNarrows/3=M
-FormatData/is/DayNarrows/4=F
-FormatData/is/DayNarrows/5=F
-FormatData/is/DayNarrows/6=L
-FormatData/is/standalone.DayNarrows/0=s
-FormatData/is/standalone.DayNarrows/1=m
-FormatData/is/standalone.DayNarrows/2=\u00fe
-FormatData/is/standalone.DayNarrows/3=m
-FormatData/is/standalone.DayNarrows/4=f
-FormatData/is/standalone.DayNarrows/5=f
-FormatData/is/standalone.DayNarrows/6=l
-
-FormatData/it/DayNarrows/0=D
-FormatData/it/DayNarrows/1=L
-FormatData/it/DayNarrows/2=M
-FormatData/it/DayNarrows/3=M
-FormatData/it/DayNarrows/4=G
-FormatData/it/DayNarrows/5=V
-FormatData/it/DayNarrows/6=S
-
-FormatData/iw/DayNarrows/0=\u05d0
-FormatData/iw/DayNarrows/1=\u05d1
-FormatData/iw/DayNarrows/2=\u05d2
-FormatData/iw/DayNarrows/3=\u05d3
-FormatData/iw/DayNarrows/4=\u05d4
-FormatData/iw/DayNarrows/5=\u05d5
-FormatData/iw/DayNarrows/6=\u05e9
-FormatData/iw/standalone.DayNarrows/0=\u05d0
-FormatData/iw/standalone.DayNarrows/1=\u05d1
-FormatData/iw/standalone.DayNarrows/2=\u05d2
-FormatData/iw/standalone.DayNarrows/3=\u05d3
-FormatData/iw/standalone.DayNarrows/4=\u05d4
-FormatData/iw/standalone.DayNarrows/5=\u05d5
-FormatData/iw/standalone.DayNarrows/6=\u05e9
-
-FormatData/ja/DayNarrows/0=\u65e5
-FormatData/ja/DayNarrows/1=\u6708
-FormatData/ja/DayNarrows/2=\u706b
-FormatData/ja/DayNarrows/3=\u6c34
-FormatData/ja/DayNarrows/4=\u6728
-FormatData/ja/DayNarrows/5=\u91d1
-FormatData/ja/DayNarrows/6=\u571f
-
-FormatData/ko/DayNarrows/0=\uc77c
-FormatData/ko/DayNarrows/1=\uc6d4
-FormatData/ko/DayNarrows/2=\ud654
-FormatData/ko/DayNarrows/3=\uc218
-FormatData/ko/DayNarrows/4=\ubaa9
-FormatData/ko/DayNarrows/5=\uae08
-FormatData/ko/DayNarrows/6=\ud1a0
-
-FormatData/lt/standalone.MonthNarrows/0=S
-FormatData/lt/standalone.MonthNarrows/1=V
-FormatData/lt/standalone.MonthNarrows/2=K
-FormatData/lt/standalone.MonthNarrows/3=B
-FormatData/lt/standalone.MonthNarrows/4=G
-FormatData/lt/standalone.MonthNarrows/5=B
-FormatData/lt/standalone.MonthNarrows/6=L
-FormatData/lt/standalone.MonthNarrows/7=R
-FormatData/lt/standalone.MonthNarrows/8=R
-FormatData/lt/standalone.MonthNarrows/9=S
-FormatData/lt/standalone.MonthNarrows/10=L
-FormatData/lt/standalone.MonthNarrows/11=G
-FormatData/lt/standalone.MonthNarrows/12=
-
-FormatData/lt/DayNarrows/0=S
-FormatData/lt/DayNarrows/1=P
-FormatData/lt/DayNarrows/2=A
-FormatData/lt/DayNarrows/3=T
-FormatData/lt/DayNarrows/4=K
-FormatData/lt/DayNarrows/5=P
-FormatData/lt/DayNarrows/6=\u0160
-FormatData/lt/standalone.DayNarrows/0=S
-FormatData/lt/standalone.DayNarrows/1=P
-FormatData/lt/standalone.DayNarrows/2=A
-FormatData/lt/standalone.DayNarrows/3=T
-FormatData/lt/standalone.DayNarrows/4=K
-FormatData/lt/standalone.DayNarrows/5=P
-FormatData/lt/standalone.DayNarrows/6=\u0160
-
-FormatData/lv/DayNarrows/0=S
-FormatData/lv/DayNarrows/1=P
-FormatData/lv/DayNarrows/2=O
-FormatData/lv/DayNarrows/3=T
-FormatData/lv/DayNarrows/4=C
-FormatData/lv/DayNarrows/5=P
-FormatData/lv/DayNarrows/6=S
-
-FormatData/mk/DayNarrows/0=\u043d
-FormatData/mk/DayNarrows/1=\u043f
-FormatData/mk/DayNarrows/2=\u0432
-FormatData/mk/DayNarrows/3=\u0441
-FormatData/mk/DayNarrows/4=\u0447
-FormatData/mk/DayNarrows/5=\u043f
-FormatData/mk/DayNarrows/6=\u0441
-
-FormatData/ms/standalone.MonthNarrows/0=J
-FormatData/ms/standalone.MonthNarrows/1=F
-FormatData/ms/standalone.MonthNarrows/2=M
-FormatData/ms/standalone.MonthNarrows/3=A
-FormatData/ms/standalone.MonthNarrows/4=M
-FormatData/ms/standalone.MonthNarrows/5=J
-FormatData/ms/standalone.MonthNarrows/6=J
-FormatData/ms/standalone.MonthNarrows/7=O
-FormatData/ms/standalone.MonthNarrows/8=S
-FormatData/ms/standalone.MonthNarrows/9=O
-FormatData/ms/standalone.MonthNarrows/10=N
-FormatData/ms/standalone.MonthNarrows/11=D
-FormatData/ms/standalone.MonthNarrows/12=
-FormatData/ms/DayNarrows/0=A
-FormatData/ms/DayNarrows/1=I
-FormatData/ms/DayNarrows/2=S
-FormatData/ms/DayNarrows/3=R
-FormatData/ms/DayNarrows/4=K
-FormatData/ms/DayNarrows/5=J
-FormatData/ms/DayNarrows/6=S
-FormatData/ms/standalone.DayNarrows/0=A
-FormatData/ms/standalone.DayNarrows/1=I
-FormatData/ms/standalone.DayNarrows/2=S
-FormatData/ms/standalone.DayNarrows/3=R
-FormatData/ms/standalone.DayNarrows/4=K
-FormatData/ms/standalone.DayNarrows/5=J
-FormatData/ms/standalone.DayNarrows/6=S
-
-FormatData/mt/DayNarrows/0=\u0126
-FormatData/mt/DayNarrows/1=T
-FormatData/mt/DayNarrows/2=T
-FormatData/mt/DayNarrows/3=E
-FormatData/mt/DayNarrows/4=\u0126
-FormatData/mt/DayNarrows/5=\u0120
-FormatData/mt/DayNarrows/6=S
-
-FormatData/nl/DayNarrows/0=Z
-FormatData/nl/DayNarrows/1=M
-FormatData/nl/DayNarrows/2=D
-FormatData/nl/DayNarrows/3=W
-FormatData/nl/DayNarrows/4=D
-FormatData/nl/DayNarrows/5=V
-FormatData/nl/DayNarrows/6=Z
-
-FormatData/pl/DayNarrows/0=N
-FormatData/pl/DayNarrows/1=P
-FormatData/pl/DayNarrows/2=W
-FormatData/pl/DayNarrows/3=\u015a
-FormatData/pl/DayNarrows/4=C
-FormatData/pl/DayNarrows/5=P
-FormatData/pl/DayNarrows/6=S
-
-FormatData/pt/DayNarrows/0=D
-FormatData/pt/DayNarrows/1=S
-FormatData/pt/DayNarrows/2=T
-FormatData/pt/DayNarrows/3=Q
-FormatData/pt/DayNarrows/4=Q
-FormatData/pt/DayNarrows/5=S
-FormatData/pt/DayNarrows/6=S
-
-FormatData/ro/standalone.MonthNarrows/0=I
-FormatData/ro/standalone.MonthNarrows/1=F
-FormatData/ro/standalone.MonthNarrows/2=M
-FormatData/ro/standalone.MonthNarrows/3=A
-FormatData/ro/standalone.MonthNarrows/4=M
-FormatData/ro/standalone.MonthNarrows/5=I
-FormatData/ro/standalone.MonthNarrows/6=I
-FormatData/ro/standalone.MonthNarrows/7=A
-FormatData/ro/standalone.MonthNarrows/8=S
-FormatData/ro/standalone.MonthNarrows/9=O
-FormatData/ro/standalone.MonthNarrows/10=N
-FormatData/ro/standalone.MonthNarrows/11=D
-FormatData/ro/standalone.MonthNarrows/12=
-# commented out DayNarrows due to mostly undefined
-#FormatData/ro/DayNarrows/0=D
-#FormatData/ro/DayNarrows/1=
-#FormatData/ro/DayNarrows/2=
-#FormatData/ro/DayNarrows/3=
-#FormatData/ro/DayNarrows/4=
-#FormatData/ro/DayNarrows/5=
-#FormatData/ro/DayNarrows/6=
-FormatData/ro/standalone.DayNarrows/0=D
-FormatData/ro/standalone.DayNarrows/1=L
-FormatData/ro/standalone.DayNarrows/2=M
-FormatData/ro/standalone.DayNarrows/3=M
-FormatData/ro/standalone.DayNarrows/4=J
-FormatData/ro/standalone.DayNarrows/5=V
-FormatData/ro/standalone.DayNarrows/6=S
-
-FormatData/ru/DayNarrows/0=\u0412
-FormatData/ru/DayNarrows/1=\u041f\u043d
-FormatData/ru/DayNarrows/2=\u0412\u0442
-FormatData/ru/DayNarrows/3=\u0421
-FormatData/ru/DayNarrows/4=\u0427
-FormatData/ru/DayNarrows/5=\u041f
-# Note: "sat" is an contributed item in CLDR.
-FormatData/ru/DayNarrows/6=\u0421
-
-FormatData/ru/standalone.DayNarrows/0=\u0412
-FormatData/ru/standalone.DayNarrows/1=\u041f
-FormatData/ru/standalone.DayNarrows/2=\u0412
-FormatData/ru/standalone.DayNarrows/3=\u0421
-FormatData/ru/standalone.DayNarrows/4=\u0427
-FormatData/ru/standalone.DayNarrows/5=\u041f
-FormatData/ru/standalone.DayNarrows/6=\u0421
-
-FormatData/sk/DayNarrows/0=N
-FormatData/sk/DayNarrows/1=P
-FormatData/sk/DayNarrows/2=U
-FormatData/sk/DayNarrows/3=S
-FormatData/sk/DayNarrows/4=\u0160
-FormatData/sk/DayNarrows/5=P
-FormatData/sk/DayNarrows/6=S
-
-FormatData/sl/DayNarrows/0=n
-FormatData/sl/DayNarrows/1=p
-FormatData/sl/DayNarrows/2=t
-FormatData/sl/DayNarrows/3=s
-FormatData/sl/DayNarrows/4=\u010d
-FormatData/sl/DayNarrows/5=p
-FormatData/sl/DayNarrows/6=s
-
-FormatData/sq/DayNarrows/0=D
-FormatData/sq/DayNarrows/1=H
-FormatData/sq/DayNarrows/2=M
-FormatData/sq/DayNarrows/3=M
-FormatData/sq/DayNarrows/4=E
-FormatData/sq/DayNarrows/5=P
-FormatData/sq/DayNarrows/6=S
-
-FormatData/sr/DayNarrows/0=\u043d
-FormatData/sr/DayNarrows/1=\u043f
-FormatData/sr/DayNarrows/2=\u0443
-FormatData/sr/DayNarrows/3=\u0441
-FormatData/sr/DayNarrows/4=\u0447
-FormatData/sr/DayNarrows/5=\u043f
-FormatData/sr/DayNarrows/6=\u0441
-FormatData/sr/short.Eras/0=\u043f. \u043d. \u0435.
-FormatData/sr/short.Eras/1=\u043d. \u0435.
-FormatData/sr/narrow.Eras/0=\u043f.\u043d.\u0435.
-FormatData/sr/narrow.Eras/1=\u043d.\u0435.
-
-FormatData/sv/standalone.MonthNarrows/0=J
-FormatData/sv/standalone.MonthNarrows/1=F
-FormatData/sv/standalone.MonthNarrows/2=M
-FormatData/sv/standalone.MonthNarrows/3=A
-FormatData/sv/standalone.MonthNarrows/4=M
-FormatData/sv/standalone.MonthNarrows/5=J
-FormatData/sv/standalone.MonthNarrows/6=J
-FormatData/sv/standalone.MonthNarrows/7=A
-FormatData/sv/standalone.MonthNarrows/8=S
-FormatData/sv/standalone.MonthNarrows/9=O
-FormatData/sv/standalone.MonthNarrows/10=N
-FormatData/sv/standalone.MonthNarrows/11=D
-FormatData/sv/standalone.MonthNarrows/12=
-FormatData/sv/DayNarrows/0=S
-FormatData/sv/DayNarrows/1=M
-FormatData/sv/DayNarrows/2=T
-FormatData/sv/DayNarrows/3=O
-FormatData/sv/DayNarrows/4=T
-FormatData/sv/DayNarrows/5=F
-FormatData/sv/DayNarrows/6=L
-FormatData/sv/standalone.DayNarrows/0=S
-FormatData/sv/standalone.DayNarrows/1=M
-FormatData/sv/standalone.DayNarrows/2=T
-FormatData/sv/standalone.DayNarrows/3=O
-FormatData/sv/standalone.DayNarrows/4=T
-FormatData/sv/standalone.DayNarrows/5=F
-FormatData/sv/standalone.DayNarrows/6=L
-FormatData/sv/narrow.Eras/0=f.Kr.
-FormatData/sv/narrow.Eras/1=e.Kr.
-FormatData/sv/narrow.AmPmMarkers/0=f
-FormatData/sv/narrow.AmPmMarkers/1=e
-
-FormatData/th/standalone.MonthNarrows/0=\u0e21.\u0e04.
-FormatData/th/standalone.MonthNarrows/1=\u0e01.\u0e1e.
-FormatData/th/standalone.MonthNarrows/2=\u0e21\u0e35.\u0e04.
-FormatData/th/standalone.MonthNarrows/3=\u0e40\u0e21.\u0e22.
-FormatData/th/standalone.MonthNarrows/4=\u0e1e.\u0e04.
-FormatData/th/standalone.MonthNarrows/5=\u0e21\u0e34.\u0e22.
-FormatData/th/standalone.MonthNarrows/6=\u0e01.\u0e04.
-FormatData/th/standalone.MonthNarrows/7=\u0e2a.\u0e04.
-FormatData/th/standalone.MonthNarrows/8=\u0e01.\u0e22.
-FormatData/th/standalone.MonthNarrows/9=\u0e15.\u0e04.
-FormatData/th/standalone.MonthNarrows/10=\u0e1e.\u0e22.
-FormatData/th/standalone.MonthNarrows/11=\u0e18.\u0e04.
-FormatData/th/standalone.MonthNarrows/12=
-FormatData/th/DayNarrows/0=\u0e2d
-FormatData/th/DayNarrows/1=\u0e08
-FormatData/th/DayNarrows/2=\u0e2d
-FormatData/th/DayNarrows/3=\u0e1e
-FormatData/th/DayNarrows/4=\u0e1e
-FormatData/th/DayNarrows/5=\u0e28
-FormatData/th/DayNarrows/6=\u0e2a
-FormatData/th/narrow.Eras/0=\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.
-FormatData/th/narrow.Eras/1=\u0e04.\u0e28.
-
-FormatData/tr/standalone.MonthNarrows/0=O
-FormatData/tr/standalone.MonthNarrows/1=\u015e
-FormatData/tr/standalone.MonthNarrows/2=M
-FormatData/tr/standalone.MonthNarrows/3=N
-FormatData/tr/standalone.MonthNarrows/4=M
-FormatData/tr/standalone.MonthNarrows/5=H
-FormatData/tr/standalone.MonthNarrows/6=T
-FormatData/tr/standalone.MonthNarrows/7=A
-FormatData/tr/standalone.MonthNarrows/8=E
-FormatData/tr/standalone.MonthNarrows/9=E
-FormatData/tr/standalone.MonthNarrows/10=K
-FormatData/tr/standalone.MonthNarrows/11=A
-FormatData/tr/standalone.MonthNarrows/12=
-FormatData/tr/DayNarrows/0=P
-FormatData/tr/DayNarrows/1=P
-FormatData/tr/DayNarrows/2=S
-FormatData/tr/DayNarrows/3=\u00c7
-FormatData/tr/DayNarrows/4=P
-FormatData/tr/DayNarrows/5=C
-FormatData/tr/DayNarrows/6=C
-
-FormatData/uk/DayNarrows/0=\u041d
-FormatData/uk/DayNarrows/1=\u041f
-FormatData/uk/DayNarrows/2=\u0412
-FormatData/uk/DayNarrows/3=\u0421
-FormatData/uk/DayNarrows/4=\u0427
-FormatData/uk/DayNarrows/5=\u041f
-FormatData/uk/DayNarrows/6=\u0421
-
-FormatData/vi/DayNarrows/0=CN
-FormatData/vi/DayNarrows/1=T2
-FormatData/vi/DayNarrows/2=T3
-FormatData/vi/DayNarrows/3=T4
-FormatData/vi/DayNarrows/4=T5
-FormatData/vi/DayNarrows/5=T6
-FormatData/vi/DayNarrows/6=T7
-
-FormatData/zh/standalone.MonthNarrows/0=1\u6708
-FormatData/zh/standalone.MonthNarrows/1=2\u6708
-FormatData/zh/standalone.MonthNarrows/2=3\u6708
-FormatData/zh/standalone.MonthNarrows/3=4\u6708
-FormatData/zh/standalone.MonthNarrows/4=5\u6708
-FormatData/zh/standalone.MonthNarrows/5=6\u6708
-FormatData/zh/standalone.MonthNarrows/6=7\u6708
-FormatData/zh/standalone.MonthNarrows/7=8\u6708
-FormatData/zh/standalone.MonthNarrows/8=9\u6708
-FormatData/zh/standalone.MonthNarrows/9=10\u6708
-FormatData/zh/standalone.MonthNarrows/10=11\u6708
-FormatData/zh/standalone.MonthNarrows/11=12\u6708
-FormatData/zh/standalone.MonthNarrows/12=
-FormatData/zh/DayNarrows/0=\u65e5
-FormatData/zh/DayNarrows/1=\u4e00
-FormatData/zh/DayNarrows/2=\u4e8c
-FormatData/zh/DayNarrows/3=\u4e09
-FormatData/zh/DayNarrows/4=\u56db
-FormatData/zh/DayNarrows/5=\u4e94
-FormatData/zh/DayNarrows/6=\u516d
-
-# bug 7195759
-CurrencyNames//ZMW=ZMW
-
-# bug 7114053
-LocaleNames/sq/sq=shqip
-
-# bug 7074882
-FormatData/mt/MonthNames/7=Awwissu
-FormatData/mt/MonthAbbreviations/7=Aww
-
-# bug 7040556
-FormatData/pt/MonthAbbreviations/0=jan
-FormatData/pt/MonthAbbreviations/1=fev
-FormatData/pt/MonthAbbreviations/2=mar
-FormatData/pt/MonthAbbreviations/3=abr
-FormatData/pt/MonthAbbreviations/4=mai
-FormatData/pt/MonthAbbreviations/5=jun
-FormatData/pt/MonthAbbreviations/6=jul
-FormatData/pt/MonthAbbreviations/7=ago
-FormatData/pt/MonthAbbreviations/8=set
-FormatData/pt/MonthAbbreviations/9=out
-FormatData/pt/MonthAbbreviations/10=nov
-FormatData/pt/MonthAbbreviations/11=dez
-
-# bug 8021121
-CurrencyNames/lv_LV/EUR=\u20ac
-
-# bug # 6192407
-LocaleNames/ko/PT=\ud3ec\ub974\ud22c\uac08
-
-# bug 6931564
-LocaleNames/sv/ZA=Sydafrika
-
-# bug 8027695
-FormatData/sv_SE/NumberPatterns/2=#,##0 %
-
-# bug 8017142
-FormatData/es_CL/TimePatterns/0=HH:mm:ss zzzz
-FormatData/es_CL/TimePatterns/1=H:mm:ss z
-FormatData/es_CL/TimePatterns/2=H:mm:ss
-FormatData/es_CL/TimePatterns/3=H:mm
-FormatData/es_EC/TimePatterns/0=HH:mm:ss zzzz
-FormatData/es_EC/TimePatterns/1=H:mm:ss z
-FormatData/es_EC/TimePatterns/2=H:mm:ss
-FormatData/es_EC/TimePatterns/3=H:mm
-
-# bug 8037343
-FormatData/es_DO/DatePatterns/2=dd/MM/yyyy
-FormatData/es_DO/DatePatterns/3=dd/MM/yy
-
-# bug 8055222
-CurrencyNames/lt_LT/EUR=\u20ac
-
-# bug 8042126 + missing MonthNarrows data
-FormatData//MonthNarrows/0=1
-FormatData//MonthNarrows/1=2
-FormatData//MonthNarrows/2=3
-FormatData//MonthNarrows/3=4
-FormatData//MonthNarrows/4=5
-FormatData//MonthNarrows/5=6
-FormatData//MonthNarrows/6=7
-FormatData//MonthNarrows/7=8
-FormatData//MonthNarrows/8=9
-FormatData//MonthNarrows/9=10
-FormatData//MonthNarrows/10=11
-FormatData//MonthNarrows/11=12
-FormatData//MonthNarrows/12=
-FormatData/bg/MonthNarrows/0=\u044f
-FormatData/bg/MonthNarrows/1=\u0444
-FormatData/bg/MonthNarrows/2=\u043c
-FormatData/bg/MonthNarrows/3=\u0430
-FormatData/bg/MonthNarrows/4=\u043c
-FormatData/bg/MonthNarrows/5=\u044e
-FormatData/bg/MonthNarrows/6=\u044e
-FormatData/bg/MonthNarrows/7=\u0430
-FormatData/bg/MonthNarrows/8=\u0441
-FormatData/bg/MonthNarrows/9=\u043e
-FormatData/bg/MonthNarrows/10=\u043d
-FormatData/bg/MonthNarrows/11=\u0434
-FormatData/bg/MonthNarrows/12=
-FormatData/zh_TW/MonthNarrows/0=1
-FormatData/zh_TW/MonthNarrows/1=2
-FormatData/zh_TW/MonthNarrows/2=3
-FormatData/zh_TW/MonthNarrows/3=4
-FormatData/zh_TW/MonthNarrows/4=5
-FormatData/zh_TW/MonthNarrows/5=6
-FormatData/zh_TW/MonthNarrows/6=7
-FormatData/zh_TW/MonthNarrows/7=8
-FormatData/zh_TW/MonthNarrows/8=9
-FormatData/zh_TW/MonthNarrows/9=10
-FormatData/zh_TW/MonthNarrows/10=11
-FormatData/zh_TW/MonthNarrows/11=12
-FormatData/zh_TW/MonthNarrows/12=
-FormatData/it/MonthNarrows/0=G
-FormatData/it/MonthNarrows/1=F
-FormatData/it/MonthNarrows/2=M
-FormatData/it/MonthNarrows/3=A
-FormatData/it/MonthNarrows/4=M
-FormatData/it/MonthNarrows/5=G
-FormatData/it/MonthNarrows/6=L
-FormatData/it/MonthNarrows/7=A
-FormatData/it/MonthNarrows/8=S
-FormatData/it/MonthNarrows/9=O
-FormatData/it/MonthNarrows/10=N
-FormatData/it/MonthNarrows/11=D
-FormatData/it/MonthNarrows/12=
-FormatData/ko/MonthNarrows/0=1\uc6d4
-FormatData/ko/MonthNarrows/1=2\uc6d4
-FormatData/ko/MonthNarrows/2=3\uc6d4
-FormatData/ko/MonthNarrows/3=4\uc6d4
-FormatData/ko/MonthNarrows/4=5\uc6d4
-FormatData/ko/MonthNarrows/5=6\uc6d4
-FormatData/ko/MonthNarrows/6=7\uc6d4
-FormatData/ko/MonthNarrows/7=8\uc6d4
-FormatData/ko/MonthNarrows/8=9\uc6d4
-FormatData/ko/MonthNarrows/9=10\uc6d4
-FormatData/ko/MonthNarrows/10=11\uc6d4
-FormatData/ko/MonthNarrows/11=12\uc6d4
-FormatData/ko/MonthNarrows/12=
-FormatData/uk/MonthNarrows/0=\u0421
-FormatData/uk/MonthNarrows/1=\u041b
-FormatData/uk/MonthNarrows/2=\u0411
-FormatData/uk/MonthNarrows/3=\u041a
-FormatData/uk/MonthNarrows/4=\u0422
-FormatData/uk/MonthNarrows/5=\u0427
-FormatData/uk/MonthNarrows/6=\u041b
-FormatData/uk/MonthNarrows/7=\u0421
-FormatData/uk/MonthNarrows/8=\u0412
-FormatData/uk/MonthNarrows/9=\u0416
-FormatData/uk/MonthNarrows/10=\u041b
-FormatData/uk/MonthNarrows/11=\u0413
-FormatData/uk/MonthNarrows/12=
-FormatData/lv/MonthNarrows/0=J
-FormatData/lv/MonthNarrows/1=F
-FormatData/lv/MonthNarrows/2=M
-FormatData/lv/MonthNarrows/3=A
-FormatData/lv/MonthNarrows/4=M
-FormatData/lv/MonthNarrows/5=J
-FormatData/lv/MonthNarrows/6=J
-FormatData/lv/MonthNarrows/7=A
-FormatData/lv/MonthNarrows/8=S
-FormatData/lv/MonthNarrows/9=O
-FormatData/lv/MonthNarrows/10=N
-FormatData/lv/MonthNarrows/11=D
-FormatData/lv/MonthNarrows/12=
-FormatData/pt/MonthNarrows/0=J
-FormatData/pt/MonthNarrows/1=F
-FormatData/pt/MonthNarrows/2=M
-FormatData/pt/MonthNarrows/3=A
-FormatData/pt/MonthNarrows/4=M
-FormatData/pt/MonthNarrows/5=J
-FormatData/pt/MonthNarrows/6=J
-FormatData/pt/MonthNarrows/7=A
-FormatData/pt/MonthNarrows/8=S
-FormatData/pt/MonthNarrows/9=O
-FormatData/pt/MonthNarrows/10=N
-FormatData/pt/MonthNarrows/11=D
-FormatData/pt/MonthNarrows/12=
-FormatData/sk/MonthNarrows/0=j
-FormatData/sk/MonthNarrows/1=f
-FormatData/sk/MonthNarrows/2=m
-FormatData/sk/MonthNarrows/3=a
-FormatData/sk/MonthNarrows/4=m
-FormatData/sk/MonthNarrows/5=j
-FormatData/sk/MonthNarrows/6=j
-FormatData/sk/MonthNarrows/7=a
-FormatData/sk/MonthNarrows/8=s
-FormatData/sk/MonthNarrows/9=o
-FormatData/sk/MonthNarrows/10=n
-FormatData/sk/MonthNarrows/11=d
-FormatData/sk/MonthNarrows/12=
-FormatData/hi_IN/MonthNarrows/0=\u091c
-FormatData/hi_IN/MonthNarrows/1=\u092b\u093c
-FormatData/hi_IN/MonthNarrows/2=\u092e\u093e
-FormatData/hi_IN/MonthNarrows/3=\u0905
-FormatData/hi_IN/MonthNarrows/4=\u092e
-FormatData/hi_IN/MonthNarrows/5=\u091c\u0942
-FormatData/hi_IN/MonthNarrows/6=\u091c\u0941
-FormatData/hi_IN/MonthNarrows/7=\u0905
-FormatData/hi_IN/MonthNarrows/8=\u0938\u093f
-FormatData/hi_IN/MonthNarrows/9=\u0905
-FormatData/hi_IN/MonthNarrows/10=\u0928
-FormatData/hi_IN/MonthNarrows/11=\u0926\u093f
-FormatData/hi_IN/MonthNarrows/12=
-FormatData/ga/MonthNarrows/0=E
-FormatData/ga/MonthNarrows/1=F
-FormatData/ga/MonthNarrows/2=M
-FormatData/ga/MonthNarrows/3=A
-FormatData/ga/MonthNarrows/4=B
-FormatData/ga/MonthNarrows/5=M
-FormatData/ga/MonthNarrows/6=I
-FormatData/ga/MonthNarrows/7=L
-FormatData/ga/MonthNarrows/8=M
-FormatData/ga/MonthNarrows/9=D
-FormatData/ga/MonthNarrows/10=S
-FormatData/ga/MonthNarrows/11=N
-FormatData/ga/MonthNarrows/12=
-FormatData/et/MonthNarrows/0=J
-FormatData/et/MonthNarrows/1=V
-FormatData/et/MonthNarrows/2=M
-FormatData/et/MonthNarrows/3=A
-FormatData/et/MonthNarrows/4=M
-FormatData/et/MonthNarrows/5=J
-FormatData/et/MonthNarrows/6=J
-FormatData/et/MonthNarrows/7=A
-FormatData/et/MonthNarrows/8=S
-FormatData/et/MonthNarrows/9=O
-FormatData/et/MonthNarrows/10=N
-FormatData/et/MonthNarrows/11=D
-FormatData/et/MonthNarrows/12=
-FormatData/sv/MonthNarrows/0=J
-FormatData/sv/MonthNarrows/1=F
-FormatData/sv/MonthNarrows/2=M
-FormatData/sv/MonthNarrows/3=A
-FormatData/sv/MonthNarrows/4=M
-FormatData/sv/MonthNarrows/5=J
-FormatData/sv/MonthNarrows/6=J
-FormatData/sv/MonthNarrows/7=A
-FormatData/sv/MonthNarrows/8=S
-FormatData/sv/MonthNarrows/9=O
-FormatData/sv/MonthNarrows/10=N
-FormatData/sv/MonthNarrows/11=D
-FormatData/sv/MonthNarrows/12=
-FormatData/cs/MonthNarrows/0=l
-FormatData/cs/MonthNarrows/1=\u00fa
-FormatData/cs/MonthNarrows/2=b
-FormatData/cs/MonthNarrows/3=d
-FormatData/cs/MonthNarrows/4=k
-FormatData/cs/MonthNarrows/5=\u010d
-FormatData/cs/MonthNarrows/6=\u010d
-FormatData/cs/MonthNarrows/7=s
-FormatData/cs/MonthNarrows/8=z
-FormatData/cs/MonthNarrows/9=\u0159
-FormatData/cs/MonthNarrows/10=l
-FormatData/cs/MonthNarrows/11=p
-FormatData/cs/MonthNarrows/12=
-FormatData/el/MonthNarrows/0=\u0399
-FormatData/el/MonthNarrows/1=\u03a6
-FormatData/el/MonthNarrows/2=\u039c
-FormatData/el/MonthNarrows/3=\u0391
-FormatData/el/MonthNarrows/4=\u039c
-FormatData/el/MonthNarrows/5=\u0399
-FormatData/el/MonthNarrows/6=\u0399
-FormatData/el/MonthNarrows/7=\u0391
-FormatData/el/MonthNarrows/8=\u03a3
-FormatData/el/MonthNarrows/9=\u039f
-FormatData/el/MonthNarrows/10=\u039d
-FormatData/el/MonthNarrows/11=\u0394
-FormatData/el/MonthNarrows/12=
-FormatData/hu/MonthNarrows/0=J
-FormatData/hu/MonthNarrows/1=F
-FormatData/hu/MonthNarrows/2=M
-FormatData/hu/MonthNarrows/3=\u00c1
-FormatData/hu/MonthNarrows/4=M
-FormatData/hu/MonthNarrows/5=J
-FormatData/hu/MonthNarrows/6=J
-FormatData/hu/MonthNarrows/7=A
-FormatData/hu/MonthNarrows/8=Sz
-FormatData/hu/MonthNarrows/9=O
-FormatData/hu/MonthNarrows/10=N
-FormatData/hu/MonthNarrows/11=D
-FormatData/hu/MonthNarrows/12=
-FormatData/es/MonthNarrows/0=E
-FormatData/es/MonthNarrows/1=F
-FormatData/es/MonthNarrows/2=M
-FormatData/es/MonthNarrows/3=A
-FormatData/es/MonthNarrows/4=M
-FormatData/es/MonthNarrows/5=J
-FormatData/es/MonthNarrows/6=J
-FormatData/es/MonthNarrows/7=A
-FormatData/es/MonthNarrows/8=S
-FormatData/es/MonthNarrows/9=O
-FormatData/es/MonthNarrows/10=N
-FormatData/es/MonthNarrows/11=D
-FormatData/es/MonthNarrows/12=
-FormatData/tr/MonthNarrows/0=O
-FormatData/tr/MonthNarrows/1=\u015e
-FormatData/tr/MonthNarrows/2=M
-FormatData/tr/MonthNarrows/3=N
-FormatData/tr/MonthNarrows/4=M
-FormatData/tr/MonthNarrows/5=H
-FormatData/tr/MonthNarrows/6=T
-FormatData/tr/MonthNarrows/7=A
-FormatData/tr/MonthNarrows/8=E
-FormatData/tr/MonthNarrows/9=E
-FormatData/tr/MonthNarrows/10=K
-FormatData/tr/MonthNarrows/11=A
-FormatData/tr/MonthNarrows/12=
-FormatData/hr/MonthNarrows/0=1.
-FormatData/hr/MonthNarrows/1=2.
-FormatData/hr/MonthNarrows/2=3.
-FormatData/hr/MonthNarrows/3=4.
-FormatData/hr/MonthNarrows/4=5.
-FormatData/hr/MonthNarrows/5=6.
-FormatData/hr/MonthNarrows/6=7.
-FormatData/hr/MonthNarrows/7=8.
-FormatData/hr/MonthNarrows/8=9.
-FormatData/hr/MonthNarrows/9=10.
-FormatData/hr/MonthNarrows/10=11.
-FormatData/hr/MonthNarrows/11=12.
-FormatData/hr/MonthNarrows/12=
-FormatData/lt/MonthNarrows/0=S
-FormatData/lt/MonthNarrows/1=V
-FormatData/lt/MonthNarrows/2=K
-FormatData/lt/MonthNarrows/3=B
-FormatData/lt/MonthNarrows/4=G
-FormatData/lt/MonthNarrows/5=B
-FormatData/lt/MonthNarrows/6=L
-FormatData/lt/MonthNarrows/7=R
-FormatData/lt/MonthNarrows/8=R
-FormatData/lt/MonthNarrows/9=S
-FormatData/lt/MonthNarrows/10=L
-FormatData/lt/MonthNarrows/11=G
-FormatData/lt/MonthNarrows/12=
-FormatData/sq/MonthNarrows/0=J
-FormatData/sq/MonthNarrows/1=S
-FormatData/sq/MonthNarrows/2=M
-FormatData/sq/MonthNarrows/3=P
-FormatData/sq/MonthNarrows/4=M
-FormatData/sq/MonthNarrows/5=Q
-FormatData/sq/MonthNarrows/6=K
-FormatData/sq/MonthNarrows/7=G
-FormatData/sq/MonthNarrows/8=S
-FormatData/sq/MonthNarrows/9=T
-FormatData/sq/MonthNarrows/10=N
-FormatData/sq/MonthNarrows/11=D
-FormatData/sq/MonthNarrows/12=
-FormatData/fr/MonthNarrows/0=J
-FormatData/fr/MonthNarrows/1=F
-FormatData/fr/MonthNarrows/2=M
-FormatData/fr/MonthNarrows/3=A
-FormatData/fr/MonthNarrows/4=M
-FormatData/fr/MonthNarrows/5=J
-FormatData/fr/MonthNarrows/6=J
-FormatData/fr/MonthNarrows/7=A
-FormatData/fr/MonthNarrows/8=S
-FormatData/fr/MonthNarrows/9=O
-FormatData/fr/MonthNarrows/10=N
-FormatData/fr/MonthNarrows/11=D
-FormatData/fr/MonthNarrows/12=
-FormatData/is/MonthNarrows/0=J
-FormatData/is/MonthNarrows/1=F
-FormatData/is/MonthNarrows/2=M
-FormatData/is/MonthNarrows/3=A
-FormatData/is/MonthNarrows/4=M
-FormatData/is/MonthNarrows/5=J
-FormatData/is/MonthNarrows/6=J
-FormatData/is/MonthNarrows/7=\u00c1
-FormatData/is/MonthNarrows/8=L
-FormatData/is/MonthNarrows/9=O
-FormatData/is/MonthNarrows/10=N
-FormatData/is/MonthNarrows/11=D
-FormatData/is/MonthNarrows/12=
-FormatData/de/MonthNarrows/0=J
-FormatData/de/MonthNarrows/1=F
-FormatData/de/MonthNarrows/2=M
-FormatData/de/MonthNarrows/3=A
-FormatData/de/MonthNarrows/4=M
-FormatData/de/MonthNarrows/5=J
-FormatData/de/MonthNarrows/6=J
-FormatData/de/MonthNarrows/7=A
-FormatData/de/MonthNarrows/8=S
-FormatData/de/MonthNarrows/9=O
-FormatData/de/MonthNarrows/10=N
-FormatData/de/MonthNarrows/11=D
-FormatData/de/MonthNarrows/12=
-FormatData/en/MonthNarrows/0=J
-FormatData/en/MonthNarrows/1=F
-FormatData/en/MonthNarrows/2=M
-FormatData/en/MonthNarrows/3=A
-FormatData/en/MonthNarrows/4=M
-FormatData/en/MonthNarrows/5=J
-FormatData/en/MonthNarrows/6=J
-FormatData/en/MonthNarrows/7=A
-FormatData/en/MonthNarrows/8=S
-FormatData/en/MonthNarrows/9=O
-FormatData/en/MonthNarrows/10=N
-FormatData/en/MonthNarrows/11=D
-FormatData/en/MonthNarrows/12=
-FormatData/ca/MonthNarrows/0=G
-FormatData/ca/MonthNarrows/1=F
-FormatData/ca/MonthNarrows/2=M
-FormatData/ca/MonthNarrows/3=A
-FormatData/ca/MonthNarrows/4=M
-FormatData/ca/MonthNarrows/5=J
-FormatData/ca/MonthNarrows/6=G
-FormatData/ca/MonthNarrows/7=A
-FormatData/ca/MonthNarrows/8=S
-FormatData/ca/MonthNarrows/9=O
-FormatData/ca/MonthNarrows/10=N
-FormatData/ca/MonthNarrows/11=D
-FormatData/ca/MonthNarrows/12=
-FormatData/sl/MonthNarrows/0=j
-FormatData/sl/MonthNarrows/1=f
-FormatData/sl/MonthNarrows/2=m
-FormatData/sl/MonthNarrows/3=a
-FormatData/sl/MonthNarrows/4=m
-FormatData/sl/MonthNarrows/5=j
-FormatData/sl/MonthNarrows/6=j
-FormatData/sl/MonthNarrows/7=a
-FormatData/sl/MonthNarrows/8=s
-FormatData/sl/MonthNarrows/9=o
-FormatData/sl/MonthNarrows/10=n
-FormatData/sl/MonthNarrows/11=d
-FormatData/sl/MonthNarrows/12=
-FormatData/fi/MonthNarrows/0=T
-FormatData/fi/MonthNarrows/1=H
-FormatData/fi/MonthNarrows/2=M
-FormatData/fi/MonthNarrows/3=H
-FormatData/fi/MonthNarrows/4=T
-FormatData/fi/MonthNarrows/5=K
-FormatData/fi/MonthNarrows/6=H
-FormatData/fi/MonthNarrows/7=E
-FormatData/fi/MonthNarrows/8=S
-FormatData/fi/MonthNarrows/9=L
-FormatData/fi/MonthNarrows/10=M
-FormatData/fi/MonthNarrows/11=J
-FormatData/fi/MonthNarrows/12=
-FormatData/mk/MonthNarrows/0=\u0458
-FormatData/mk/MonthNarrows/1=\u0444
-FormatData/mk/MonthNarrows/2=\u043c
-FormatData/mk/MonthNarrows/3=\u0430
-FormatData/mk/MonthNarrows/4=\u043c
-FormatData/mk/MonthNarrows/5=\u0458
-FormatData/mk/MonthNarrows/6=\u0458
-FormatData/mk/MonthNarrows/7=\u0430
-FormatData/mk/MonthNarrows/8=\u0441
-FormatData/mk/MonthNarrows/9=\u043e
-FormatData/mk/MonthNarrows/10=\u043d
-FormatData/mk/MonthNarrows/11=\u0434
-FormatData/mk/MonthNarrows/12=
-FormatData/sr-Latn/MonthNarrows/0=j
-FormatData/sr-Latn/MonthNarrows/1=f
-FormatData/sr-Latn/MonthNarrows/2=m
-FormatData/sr-Latn/MonthNarrows/3=a
-FormatData/sr-Latn/MonthNarrows/4=m
-FormatData/sr-Latn/MonthNarrows/5=j
-FormatData/sr-Latn/MonthNarrows/6=j
-FormatData/sr-Latn/MonthNarrows/7=a
-FormatData/sr-Latn/MonthNarrows/8=s
-FormatData/sr-Latn/MonthNarrows/9=o
-FormatData/sr-Latn/MonthNarrows/10=n
-FormatData/sr-Latn/MonthNarrows/11=d
-FormatData/sr-Latn/MonthNarrows/12=
-FormatData/th/MonthNarrows/0=\u0e21.\u0e04.
-FormatData/th/MonthNarrows/1=\u0e01.\u0e1e.
-FormatData/th/MonthNarrows/2=\u0e21\u0e35.\u0e04.
-FormatData/th/MonthNarrows/3=\u0e40\u0e21.\u0e22.
-FormatData/th/MonthNarrows/4=\u0e1e.\u0e04.
-FormatData/th/MonthNarrows/5=\u0e21\u0e34.\u0e22
-FormatData/th/MonthNarrows/6=\u0e01.\u0e04.
-FormatData/th/MonthNarrows/7=\u0e2a.\u0e04.
-FormatData/th/MonthNarrows/8=\u0e01.\u0e22.
-FormatData/th/MonthNarrows/9=\u0e15.\u0e04.
-FormatData/th/MonthNarrows/10=\u0e1e.\u0e22.
-FormatData/th/MonthNarrows/11=\u0e18.\u0e04.
-FormatData/th/MonthNarrows/12=
-FormatData/ar/MonthNarrows/0=\u064a
-FormatData/ar/MonthNarrows/1=\u0641
-FormatData/ar/MonthNarrows/2=\u0645
-FormatData/ar/MonthNarrows/3=\u0623
-FormatData/ar/MonthNarrows/4=\u0648
-FormatData/ar/MonthNarrows/5=\u0646
-FormatData/ar/MonthNarrows/6=\u0644
-FormatData/ar/MonthNarrows/7=\u063a
-FormatData/ar/MonthNarrows/8=\u0633
-FormatData/ar/MonthNarrows/9=\u0643
-FormatData/ar/MonthNarrows/10=\u0628
-FormatData/ar/MonthNarrows/11=\u062f
-FormatData/ar/MonthNarrows/12=
-FormatData/ru/MonthNarrows/0=\u042f
-FormatData/ru/MonthNarrows/1=\u0424
-FormatData/ru/MonthNarrows/2=\u041c
-FormatData/ru/MonthNarrows/3=\u0410
-FormatData/ru/MonthNarrows/4=\u041c
-FormatData/ru/MonthNarrows/5=\u0418
-FormatData/ru/MonthNarrows/6=\u0418
-FormatData/ru/MonthNarrows/7=\u0410
-FormatData/ru/MonthNarrows/8=\u0421
-FormatData/ru/MonthNarrows/9=\u041e
-FormatData/ru/MonthNarrows/10=\u041d
-FormatData/ru/MonthNarrows/11=\u0414
-FormatData/ru/MonthNarrows/12=
-FormatData/ms/MonthNarrows/0=J
-FormatData/ms/MonthNarrows/1=F
-FormatData/ms/MonthNarrows/2=M
-FormatData/ms/MonthNarrows/3=A
-FormatData/ms/MonthNarrows/4=M
-FormatData/ms/MonthNarrows/5=J
-FormatData/ms/MonthNarrows/6=J
-FormatData/ms/MonthNarrows/7=O
-FormatData/ms/MonthNarrows/8=S
-FormatData/ms/MonthNarrows/9=O
-FormatData/ms/MonthNarrows/10=N
-FormatData/ms/MonthNarrows/11=D
-FormatData/ms/MonthNarrows/12=
-FormatData/nl/MonthNarrows/0=J
-FormatData/nl/MonthNarrows/1=F
-FormatData/nl/MonthNarrows/2=M
-FormatData/nl/MonthNarrows/3=A
-FormatData/nl/MonthNarrows/4=M
-FormatData/nl/MonthNarrows/5=J
-FormatData/nl/MonthNarrows/6=J
-FormatData/nl/MonthNarrows/7=A
-FormatData/nl/MonthNarrows/8=S
-FormatData/nl/MonthNarrows/9=O
-FormatData/nl/MonthNarrows/10=N
-FormatData/nl/MonthNarrows/11=D
-FormatData/nl/MonthNarrows/12=
-FormatData/vi/MonthNarrows/0=1
-FormatData/vi/MonthNarrows/1=2
-FormatData/vi/MonthNarrows/2=3
-FormatData/vi/MonthNarrows/3=4
-FormatData/vi/MonthNarrows/4=5
-FormatData/vi/MonthNarrows/5=6
-FormatData/vi/MonthNarrows/6=7
-FormatData/vi/MonthNarrows/7=8
-FormatData/vi/MonthNarrows/8=9
-FormatData/vi/MonthNarrows/9=10
-FormatData/vi/MonthNarrows/10=11
-FormatData/vi/MonthNarrows/11=12
-FormatData/vi/MonthNarrows/12=
-FormatData/sr/MonthNarrows/0=\u0458
-FormatData/sr/MonthNarrows/1=\u0444
-FormatData/sr/MonthNarrows/2=\u043c
-FormatData/sr/MonthNarrows/3=\u0430
-FormatData/sr/MonthNarrows/4=\u043c
-FormatData/sr/MonthNarrows/5=\u0458
-FormatData/sr/MonthNarrows/6=\u0458
-FormatData/sr/MonthNarrows/7=\u0430
-FormatData/sr/MonthNarrows/8=\u0441
-FormatData/sr/MonthNarrows/9=\u043e
-FormatData/sr/MonthNarrows/10=\u043d
-FormatData/sr/MonthNarrows/11=\u0434
-FormatData/sr/MonthNarrows/12=
-FormatData/mt/MonthNarrows/0=J
-FormatData/mt/MonthNarrows/1=F
-FormatData/mt/MonthNarrows/2=M
-FormatData/mt/MonthNarrows/3=A
-FormatData/mt/MonthNarrows/4=M
-FormatData/mt/MonthNarrows/5=\u0120
-FormatData/mt/MonthNarrows/6=L
-FormatData/mt/MonthNarrows/7=A
-FormatData/mt/MonthNarrows/8=S
-FormatData/mt/MonthNarrows/9=O
-FormatData/mt/MonthNarrows/10=N
-FormatData/mt/MonthNarrows/11=D
-FormatData/mt/MonthNarrows/12=
-FormatData/da/MonthNarrows/0=J
-FormatData/da/MonthNarrows/1=F
-FormatData/da/MonthNarrows/2=M
-FormatData/da/MonthNarrows/3=A
-FormatData/da/MonthNarrows/4=M
-FormatData/da/MonthNarrows/5=J
-FormatData/da/MonthNarrows/6=J
-FormatData/da/MonthNarrows/7=A
-FormatData/da/MonthNarrows/8=S
-FormatData/da/MonthNarrows/9=O
-FormatData/da/MonthNarrows/10=N
-FormatData/da/MonthNarrows/11=D
-FormatData/da/MonthNarrows/12=
-FormatData/ro/MonthNarrows/0=I
-FormatData/ro/MonthNarrows/1=F
-FormatData/ro/MonthNarrows/2=M
-FormatData/ro/MonthNarrows/3=A
-FormatData/ro/MonthNarrows/4=M
-FormatData/ro/MonthNarrows/5=I
-FormatData/ro/MonthNarrows/6=I
-FormatData/ro/MonthNarrows/7=A
-FormatData/ro/MonthNarrows/8=S
-FormatData/ro/MonthNarrows/9=O
-FormatData/ro/MonthNarrows/10=N
-FormatData/ro/MonthNarrows/11=D
-FormatData/ro/MonthNarrows/12=
-FormatData/no/MonthNarrows/0=J
-FormatData/no/MonthNarrows/1=F
-FormatData/no/MonthNarrows/2=M
-FormatData/no/MonthNarrows/3=A
-FormatData/no/MonthNarrows/4=M
-FormatData/no/MonthNarrows/5=J
-FormatData/no/MonthNarrows/6=J
-FormatData/no/MonthNarrows/7=A
-FormatData/no/MonthNarrows/8=S
-FormatData/no/MonthNarrows/9=O
-FormatData/no/MonthNarrows/10=N
-FormatData/no/MonthNarrows/11=D
-FormatData/no/MonthNarrows/12=
-FormatData/pl/MonthNarrows/0=s
-FormatData/pl/MonthNarrows/1=l
-FormatData/pl/MonthNarrows/2=m
-FormatData/pl/MonthNarrows/3=k
-FormatData/pl/MonthNarrows/4=m
-FormatData/pl/MonthNarrows/5=c
-FormatData/pl/MonthNarrows/6=l
-FormatData/pl/MonthNarrows/7=s
-FormatData/pl/MonthNarrows/8=w
-FormatData/pl/MonthNarrows/9=p
-FormatData/pl/MonthNarrows/10=l
-FormatData/pl/MonthNarrows/11=g
-FormatData/pl/MonthNarrows/12=
-FormatData/iw/MonthNarrows/0=1
-FormatData/iw/MonthNarrows/1=2
-FormatData/iw/MonthNarrows/2=3
-FormatData/iw/MonthNarrows/3=4
-FormatData/iw/MonthNarrows/4=5
-FormatData/iw/MonthNarrows/5=6
-FormatData/iw/MonthNarrows/6=7
-FormatData/iw/MonthNarrows/7=8
-FormatData/iw/MonthNarrows/8=9
-FormatData/iw/MonthNarrows/9=10
-FormatData/iw/MonthNarrows/10=11
-FormatData/iw/MonthNarrows/11=12
-FormatData/iw/MonthNarrows/12=
-FormatData/zh/MonthNarrows/0=1
-FormatData/zh/MonthNarrows/1=2
-FormatData/zh/MonthNarrows/2=3
-FormatData/zh/MonthNarrows/3=4
-FormatData/zh/MonthNarrows/4=5
-FormatData/zh/MonthNarrows/5=6
-FormatData/zh/MonthNarrows/6=7
-FormatData/zh/MonthNarrows/7=8
-FormatData/zh/MonthNarrows/8=9
-FormatData/zh/MonthNarrows/9=10
-FormatData/zh/MonthNarrows/10=11
-FormatData/zh/MonthNarrows/11=12
-FormatData/zh/MonthNarrows/12=
-
-# bug #8074791
-FormatData/fi/DatePatterns/0=d. MMMM yyyy
-FormatData/fi/DatePatterns/1=d. MMMM yyyy
-FormatData/fi/DatePatterns/2=d.M.yyyy
-FormatData/fi/DatePatterns/3=d.M.yyyy
-
-# bug #8075173
-FormatData/de/standalone.MonthAbbreviations/2=M\u00e4r
-
-# bug #8129361
-CurrencyNames//hrk=Kuna
-
-# bug #7037368
-CurrencyNames/de/sar=Saudischer Rial
-CurrencyNames/de/xpf=CFP-Franc
-CurrencyNames/it/azn=manat azero
-CurrencyNames/it/ron=leu rumeno
-CurrencyNames/it/trl=lira turca (1922\u20132005)
-CurrencyNames/it/try=lira turca
-CurrencyNames/sv/bgl=bulgarisk h\u00e5rd lev (1962\u20131999)
-CurrencyNames/sv/xaf=centralafrikansk franc
-CurrencyNames/sv/xfu=internationella j\u00e4rnv\u00e4gsunionens franc
-CurrencyNames/sv/xof=v\u00e4stafrikansk franc
-CurrencyNames/zh_CN/sdg=\u82cf\u4e39\u9551
-
-# bug #8164784
-CurrencyNames//mwk=Malawian Malawi Kwacha
-CurrencyNames//pen=Peruvian Sol
-
-# bug #8145952
-CurrencyNames//byn=Belarusian Ruble
-CurrencyNames/be_BY/BYN=\u0420\u0443\u0431
-
-# bug #8037111
-FormatData/sv/NumberPatterns/2=#,##0 %
-# bug #8081643
-FormatData/sr-Latin/NumberElements/0=,
-FormatData/sr-Latin/NumberElements/1=.
-
-# bug #8187946
-CurrencyNames//stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
-CurrencyNames//lak=Lao Kip
-CurrencyNames//php=Philippine Peso
-CurrencyNames//azn=Azerbaijan Manat
-
-# bug #8193552
-CurrencyNames//mru=Mauritanian Ouguiya
-
-# bug #8208746, #8274658
-CurrencyNames//ved=Venezuelan Bol\u00edvar Soberano
-CurrencyNames//ves=Venezuelan Bol\u00edvar Soberano
-
-# bug #8206879
-# For Peru decimal separator is changed to dot(.) and grouping separator is changed to comma(,)
-FormatData/es_PE/NumberElements/0=.
-FormatData/es_PE/NumberElements/1=,
-
-# bug #8227127
-FormatData/ja/short.Eras/0=\u7d00\u5143\u524d
-FormatData/ja/short.Eras/1=\u897f\u66a6
-FormatData/zh/short.Eras/0=\u516c\u5143\u524d
-FormatData/zh/short.Eras/1=\u516c\u5143
-FormatData/zh_TW/short.Eras/0=\u897f\u5143\u524d
-FormatData/zh_TW/short.Eras/1=\u897f\u5143
-
-# bug 8234288
-TimeZoneNames/en/Asia\/Istanbul/1=Turkey Time
-TimeZoneNames/en/Asia\/Istanbul/2=TRT
-TimeZoneNames/en/Asia\/Istanbul/3=Turkey Summer Time
-TimeZoneNames/en/Asia\/Istanbul/4=TRST
-TimeZoneNames/en/Europe\/Istanbul/1=Turkey Time
-TimeZoneNames/en/Europe\/Istanbul/2=TRT
-TimeZoneNames/en/Europe\/Istanbul/3=Turkey Summer Time
-TimeZoneNames/en/Europe\/Istanbul/4=TRST
-TimeZoneNames/en/Turkey/1=Turkey Time
-TimeZoneNames/en/Turkey/2=TRT
-TimeZoneNames/en/Turkey/3=Turkey Summer Time
-TimeZoneNames/en/Turkey/4=TRST
-
-# bug 8255086
-LocaleNames//bn=Bangla
-LocaleNames//fy=Western Frisian
-LocaleNames//gl=Galician
-LocaleNames//ht=Haitian Creole
-LocaleNames//kj=Kuanyama
-LocaleNames//kl=Kalaallisut
-LocaleNames//ky=Kyrgyz
-LocaleNames//nb=Norwegian Bokm\u00e5l
-LocaleNames//or=Odia
-LocaleNames//os=Ossetic
-LocaleNames//pa=Punjabi
-LocaleNames//ps=Pashto
-LocaleNames//rm=Romansh
-LocaleNames//si=Sinhala
-LocaleNames//to=Tongan
-LocaleNames//ug=Uyghur
-LocaleNames//vo=Volap\u00fck
-LocaleNames//ang=Old English
-LocaleNames//arc=Aramaic
-LocaleNames//arn=Mapuche
-LocaleNames//bas=Basaa
-LocaleNames//car=Carib
-LocaleNames//chn=Chinook Jargon
-LocaleNames//crh=Crimean Turkish
-LocaleNames//den=Slave
-LocaleNames//dum=Middle Dutch
-LocaleNames//egy=Ancient Egyptian
-LocaleNames//enm=Middle English
-LocaleNames//frm=Middle French
-LocaleNames//fro=Old French
-LocaleNames//gmh=Middle High German
-LocaleNames//goh=Old High German
-LocaleNames//grc=Ancient Greek
-LocaleNames//gwi=Gwich\u02bcin
-LocaleNames//luo=Luo
-LocaleNames//lus=Mizo
-LocaleNames//mga=Middle Irish
-LocaleNames//mul=Multiple languages
-LocaleNames//mus=Muscogee
-LocaleNames//new=Newari
-LocaleNames//nob=Bokm\u00e5l, Norwegian
-LocaleNames//non=Old Norse
-LocaleNames//nqo=N\u2019Ko
-LocaleNames//nso=Northern Sotho
-LocaleNames//ota=Ottoman Turkish
-LocaleNames//peo=Old Persian
-LocaleNames//pro=Old Proven\u00e7al
-LocaleNames//sah=Sakha
-LocaleNames//sga=Old Irish
-LocaleNames//sog=Sogdien
-LocaleNames//tog=Nyasa Tonga
-LocaleNames//und=Unknown language
-LocaleNames//vol=Volap\u00fck
-LocaleNames//wal=Wolaytta
-LocaleNames//Beng=Bangla
-LocaleNames//Geok=Georgian Khutsuri
-LocaleNames//Hans=Simplified
-LocaleNames//Hant=Traditional
-LocaleNames//Hrkt=Japanese syllabaries
-LocaleNames//Lana=Lanna
-LocaleNames//Lisu=Fraser
-LocaleNames//Mand=Mandaean
-LocaleNames//Nkgb=Naxi Geba
-LocaleNames//Orya=Odia
-LocaleNames//Plrd=Pollard Phonetic
-LocaleNames//Sind=Khudawadi
-LocaleNames//Wara=Varang Kshiti
-LocaleNames//Zinh=Inherited
-LocaleNames//Zyyy=Common
-LocaleNames//Zzzz=Unknown Script
-LocaleNames//AG=Antigua & Barbuda
-LocaleNames//AX=\u00c5land Islands
-LocaleNames//BA=Bosnia & Herzegovina
-LocaleNames//BL=St. Barth\u00e9lemy
-LocaleNames//BQ=Caribbean Netherlands
-LocaleNames//CC=Cocos (Keeling) Islands
-LocaleNames//CD=Congo - Kinshasa
-LocaleNames//CG=Congo - Brazzaville
-LocaleNames//CI=C\u00f4te d\u2019Ivoire
-LocaleNames//CW=Cura\u00e7ao
-LocaleNames//CZ=Czechia
-LocaleNames//GS=South Georgia & South Sandwich Islands
-LocaleNames//HK=Hong Kong SAR China
-LocaleNames//HM=Heard & McDonald Islands
-LocaleNames//IM=Isle of Man
-LocaleNames//KN=St. Kitts & Nevis
-LocaleNames//LC=St. Lucia
-LocaleNames//MF=St. Martin
-LocaleNames//MK=North Macedonia
-LocaleNames//MM=Myanmar (Burma)
-LocaleNames//MO=Macao SAR China
-LocaleNames//PM=St. Pierre & Miquelon
-LocaleNames//PN=Pitcairn Islands
-LocaleNames//PS=Palestinian Territories
-LocaleNames//RE=R\u00e9union
-LocaleNames//SH=St. Helena
-LocaleNames//SJ=Svalbard & Jan Mayen
-LocaleNames//ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
-LocaleNames//SX=Sint Maarten
-LocaleNames//SZ=Eswatini
-LocaleNames//TC=Turks & Caicos Islands
-LocaleNames//TT=Trinidad & Tobago
-LocaleNames//UM=U.S. Outlying Islands
-LocaleNames//VA=Vatican City
-LocaleNames//VC=St. Vincent & Grenadines
-LocaleNames//WF=Wallis & Futuna
-LocaleNames//035=Southeast Asia
-LocaleNames//053=Australasia
-LocaleNames//419=Latin America
-
-#bug 8287868
-LocaleNames/ca/SZ=eSwatini
-LocaleNames/el/SZ=\u0395\u03c3\u03bf\u03c5\u03b1\u03c4\u03af\u03bd\u03b9
-LocaleNames/el_CY/SZ=\u0395\u03c3\u03bf\u03c5\u03b1\u03c4\u03af\u03bd\u03b9
-LocaleNames/es/SZ=Esuatini
-LocaleNames/ga/SZ=eSuait\u00edn\u00ed
-LocaleNames/it/SZ=Swaziland
-LocaleNames/ja/SZ=\u30a8\u30b9\u30ef\u30c6\u30a3\u30cb
-LocaleNames/ko/SZ=\uc5d0\uc2a4\uc640\ud2f0\ub2c8
-LocaleNames/mt/SZ=l-Eswatini
-LocaleNames/pt/SZ=Essuat\u00edni
-LocaleNames/ru/SZ=\u042d\u0441\u0432\u0430\u0442\u0438\u043d\u0438
-LocaleNames/sr/SZ=\u0421\u0432\u0430\u0437\u0438\u043b\u0435\u043d\u0434
-LocaleNames/th/SZ=\u0e40\u0e2d\u0e2a\u0e27\u0e32\u0e15\u0e35\u0e19\u0e35
-LocaleNames/zh/SZ=\u65af\u5a01\u58eb\u5170
-LocaleNames/zh_TW/SZ=\u53f2\u74e6\u5e1d\u5c3c
-
-#bug 8303472
-LocaleNames//TR=T\u00fcrkiye
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 9592dfd71c0..40c97d93169 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.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
@@ -41,11 +41,11 @@
  *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
  *      8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715
- *      8301206 8303472 8317979 8306116 8174269 8333582
+ *      8301206 8303472 8317979 8306116 8174269 8333582 8357075
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
- * @run main LocaleDataTest -cldr
+ * @run main LocaleDataTest
  *
  */
 
@@ -118,7 +118,7 @@
  *        FormatData/sr-Latn-BA/DayNames/2=utorak</pre>
  *
  *    The command-line syntax of this test is
- *        <tt>java --add-exports java.base/sun.util.resources=ALL-UNNAMED LocaleDataTest.java [-w] [{ -s | <filename> }] [-cldr]</tt>
+ *        <tt>java --add-exports java.base/sun.util.resources=ALL-UNNAMED LocaleDataTest.java [-w] [{ -s | <filename> }]</tt>
  *
  *    This program always sends its results to standard output.   If -w is not specified,
  *    this program prints out only the differences between the data file and the actual
@@ -130,15 +130,12 @@
  *    The user can specify an optional filename or -s.  If the user specifies a filename,
  *    the program uses that file as the data file.  If the user specifies -s, the program
  *    reads its input from standard input rather than from a file.  If the user specifies
- *    neither, the program reads its input from a file called LocaleData in the same
+ *    neither, the program reads its input from a file called LocaleData.cldr in the same
  *    directory the program itself resides in.
  *
  *    The -nothrow option prevents the program from throwing an exception when it
  *    gets an error.  -w implies -nothrow.
  *
- *    -cldr option specifies to test CLDR locale data. The default data file name for this
- *    option is "LocaleData.cldr".
- *
  *    Other command-line options can be specified, but are ignored.
  *
  *    It's important to note what this test will NOT test.  Certain changes to the locale
@@ -178,10 +175,9 @@
 
 public class LocaleDataTest
 {
-    static final String TEXT_RESOURCES_PACKAGE ="sun.text.resources";
-    static final String UTIL_RESOURCES_PACKAGE ="sun.util.resources";
-    static final String DEFAULT_DATAFILE ="LocaleData";
-    static String cldrSuffix = "";
+    static final String TEXT_RESOURCES_PACKAGE = "sun.text.resources.cldr";
+    static final String UTIL_RESOURCES_PACKAGE = "sun.util.resources.cldr";
+    static final String DEFAULT_DATAFILE = "LocaleData.cldr";
 
     public static void main(String[] args) throws Exception {
 
@@ -202,10 +198,6 @@ public static void main(String[] args) throws Exception {
             else if (args[i].equals("-nothrow"))
                 doThrow = false;
 
-            else if (args[i].equals("-cldr")) {
-                cldrSuffix = ".cldr";
-            }
-
             else if (args[i].equals("-s") && in == null)
                 in = new BufferedReader(new EscapeReader(new InputStreamReader(System.in,
                                 "ISO8859_1")));
@@ -214,7 +206,7 @@ else if (!args[i].startsWith("-") && in == null)
                                 FileInputStream(args[i]), "ISO8859_1")));
         }
         if (in == null) {
-            File localeData = new File(System.getProperty("test.src", "."), DEFAULT_DATAFILE + cldrSuffix);
+            File localeData = new File(System.getProperty("test.src", "."), DEFAULT_DATAFILE);
             in = new BufferedReader(new EscapeReader(new InputStreamReader(new
                             FileInputStream(localeData), "ISO8859_1")));
         }
@@ -315,7 +307,7 @@ static boolean processLine(String key, String expectedValue, PrintWriter out,
             index = key.length();
         resTag = key.substring(oldIndex, index);
 
-        // TimeZone name may have "/" in it, for example "Asia/Taipei", so use "Asia\/Taipei in LocaleData.
+        // TimeZone name may have "/" in it, for example "Asia/Taipei", so use "Asia\/Taipei in LocaleData.cldr.
         if(resTag.endsWith("\\")) {
             resTag = resTag.substring(0, resTag.length() - 1);
             oldIndex = index;
@@ -337,9 +329,9 @@ static boolean processLine(String key, String expectedValue, PrintWriter out,
                     || rbName.equals("CurrencyNames")
                     || rbName.equals("LocaleNames")
                     || rbName.equals("TimeZoneNames")) {
-                fullName = UTIL_RESOURCES_PACKAGE + cldrSuffix + "." + rbName;
+                fullName = UTIL_RESOURCES_PACKAGE + "." + rbName;
             } else {
-                fullName = TEXT_RESOURCES_PACKAGE + cldrSuffix + "." + rbName;
+                fullName = TEXT_RESOURCES_PACKAGE + "." + rbName;
             }
             Locale locale;
             if (use_tag) {

From 10258dc56eb7d5d99ca8ed2579e871de91c74769 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 16 May 2025 20:45:21 +0000
Subject: [PATCH 503/901] 8356811: Some nsk/jdi tests can fetch ThreadReference
 from static field in the debuggee: part 4

Reviewed-by: sspitsyn, amenkov
---
 .../invokeMethod/invokemethod007.java         |  5 +-
 .../invokeMethod/invokemethod007a.java        |  6 +-
 .../invokeMethod/invokemethod009.java         | 15 ++---
 .../invokeMethod/invokemethod009t.java        |  7 ++-
 .../invokeMethod/invokemethod010.java         | 12 ++--
 .../invokeMethod/invokemethod010t.java        |  7 ++-
 .../invokeMethod/invokemethod014.java         | 19 +++---
 .../invokeMethod/invokemethod014t.java        |  6 +-
 .../ClassType/newInstance/newinstance007.java |  5 +-
 .../newInstance/newinstance007a.java          |  8 +--
 .../ClassType/newInstance/newinstance009.java | 17 +++---
 .../newInstance/newinstance009t.java          |  7 ++-
 .../nsk/jdi/Event/equals/equals001.java       |  5 +-
 .../nsk/jdi/Event/equals/equals001a.java      |  5 +-
 .../nsk/jdi/Event/hashCode/hashcode001.java   |  7 ++-
 .../nsk/jdi/Event/hashCode/hashcode001a.java  |  5 +-
 .../invokeMethod/invokemethod002.java         | 13 +++--
 .../invokeMethod/invokemethod002t.java        |  6 +-
 .../invokeMethod/invokemethod003.java         | 19 +++---
 .../invokeMethod/invokemethod003t.java        |  7 ++-
 .../invokeMethod/invokemethod004.java         | 10 ++--
 .../invokeMethod/invokemethod004t.java        |  7 ++-
 .../invokeMethod/invokemethod005.java         | 17 +++---
 .../invokeMethod/invokemethod005t.java        |  7 ++-
 .../invokeMethod/invokemethod006.java         | 17 +++---
 .../invokeMethod/invokemethod006t.java        |  7 ++-
 .../invokeMethod/invokemethod007.java         | 17 +++---
 .../invokeMethod/invokemethod007t.java        |  7 ++-
 .../invokeMethod/invokemethod008.java         | 19 +++---
 .../invokeMethod/invokemethod008t.java        |  6 +-
 .../invokeMethod/invokemethod009.java         | 19 +++---
 .../invokeMethod/invokemethod009t.java        |  6 +-
 .../invokeMethod/invokemethod014.java         | 21 +++----
 .../invokeMethod/invokemethod014t.java        |  6 +-
 .../ObjectReference/setValue/setvalue002.java | 16 +++--
 .../setValue/setvalue002t.java                |  8 ++-
 .../ObjectReference/setValue/setvalue003.java | 10 ++--
 .../setValue/setvalue003t.java                |  8 ++-
 .../ObjectReference/setValue/setvalue004.java | 10 ++--
 .../setValue/setvalue004t.java                |  7 ++-
 .../ObjectReference/setValue/setvalue005.java | 10 ++--
 .../setValue/setvalue005t.java                |  7 ++-
 .../defaultStratum003/defaultStratum003.java  | 10 +++-
 .../defaultStratum004/defaultStratum004.java  | 11 +++-
 .../sourceName/sourcename004.java             | 17 +++---
 .../sourceName/sourcename004t.java            |  7 ++-
 .../sourceNames/sourcenames002.java           | 18 +++---
 .../sourceNames/sourcenames002t.java          |  7 ++-
 .../jdi/StackFrame/getValue/getvalue003.java  | 46 +++++++--------
 .../jdi/StackFrame/getValue/getvalue003t.java | 12 ++--
 .../StackFrame/getValues/getvalues003.java    | 52 ++++++++---------
 .../StackFrame/getValues/getvalues003t.java   | 12 ++--
 .../setValue/setvalue005/setvalue005.java     | 18 +++---
 .../setValue/setvalue005/setvalue005t.java    |  7 ++-
 .../setValue/setvalue006/setvalue006.java     | 18 +++---
 .../setValue/setvalue006/setvalue006t.java    |  7 ++-
 .../_itself_/stepEvent003/stepEvent003.java   | 10 +++-
 .../_itself_/stepEvent004/stepEvent004.java   | 10 +++-
 .../addClassExclusionFilter/filter001.java    |  6 +-
 .../addClassFilter_rt/filter_rt001.java       |  4 +-
 .../addClassFilter_rt/filter_rt003.java       |  6 +-
 .../addClassFilter_s/filter_s001.java         |  6 +-
 .../interrupt/interrupt001.java               |  6 +-
 .../ownedMonitors/ownedmonitors002.java       | 13 +++--
 .../ownedMonitors/ownedmonitors002t.java      |  7 ++-
 .../popFrames/popframes006.java               | 18 +++---
 .../popFrames/popframes006t.java              |  7 ++-
 .../popFrames/popframes007.java               | 58 +++++++++++--------
 .../popFrames/popframes007t.java              | 11 ++--
 .../nsk/jdi/ThreadReference/stop/stop002.java | 14 ++---
 .../jdi/ThreadReference/stop/stop002t.java    |  6 +-
 .../setDefaultStratum003.java                 | 10 +++-
 .../vmTestbase/nsk/share/jdi/Debugee.java     | 18 ++++++
 .../nsk/share/jdi/sde/SDEDebuggee.java        |  6 +-
 74 files changed, 522 insertions(+), 359 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java
index 0458c6dc91c..a5768d19ef3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007.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
@@ -158,7 +158,8 @@ private void execTest() {
 
             thread = brkpEvent.thread();
 
-            suspendedThread = debugee.threadByName(invokemethod007a.testedThread);
+            suspendedThread = debugee.threadByFieldNameOrThrow(testedClass, "thread",
+                                                               invokemethod007a.testedThread);
             switch (i) {
             case 0:
                 suspendedThread.suspend();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007a.java
index 065f8a5be9f..9dc5614a8e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod007a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -40,13 +40,13 @@ public class invokemethod007a {
     public static Log log;
     public static long waitTime;
     private static IOPipe pipe;
+    static Thread thread = null;
 
     public static void main (String argv[]) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(System.err, argHandler);
         waitTime = argHandler.getWaitTime() * 60000;
         pipe = argHandler.createDebugeeIOPipe(log);
-        Thread thread = null;
         pipe.println(invokemethod007.SGNL_READY);
 
         String instr = pipe.readln();
@@ -54,7 +54,7 @@ public static void main (String argv[]) {
 
             // create new thread and start it
             if (instr.equals(invokemethod007.SGNL_STRTHRD)) {
-                thread = JDIThreadFactory.newThread(new im007aThread01("im007aThread01"));
+                thread = JDIThreadFactory.newThread(new im007aThread01(testedThread));
                 synchronized(im007aThread01.waitStarting) {
                     thread.start();
                     try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
index 6e49b05708d..c5e1be8f4a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.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
@@ -55,7 +55,7 @@ public class invokemethod009 {
     static final String DEBUGGEE_THRNAME = "invokemethod009tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 57;
+    static final int DEBUGGEE_STOPATLINE = 60;
 
     // tested debuggee methods, fields and reference types
     static final int METH_NUM = 2;
@@ -112,15 +112,16 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
 
 // Check the tested assersion
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009t.java
index 9198633a83c..6f4bb7f31a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class invokemethod009t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -44,7 +46,8 @@ public static int run(String args[]) {
     private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(invokemethod009.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod009.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod009.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
index 1053f29411a..65621fb712c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.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
@@ -111,9 +111,12 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
@@ -139,7 +142,6 @@ private int runIt(String args[], PrintStream out) {
 
         try {
             // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
             ClassType clsType = (ClassType) rType;
 
             for (int i=0; i<METH_NUM; i++) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010t.java
index 585c5711664..dbb949daa49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is debuggee class.
  */
 public class invokemethod010t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -42,7 +44,8 @@ public static int run(String args[]) {
     private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(invokemethod010.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod010.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod010.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
index 7bab20f5f5e..c1b5a2a64ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.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
@@ -68,7 +68,7 @@ public class invokemethod014 {
     static final String DEBUGGEE_THRNAME = "invokemethod014tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 61;
+    static final int DEBUGGEE_STOPATLINE = 63;
 
     static final int TIMEOUT_DELTA = 1000; // in milliseconds
 
@@ -113,19 +113,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = null;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+        ClassType clsType = (ClassType) rType;
+
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
 
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-            ClassType clsType = (ClassType) rType;
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             for (int i=0; i<METH_NUM; i++) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014t.java
index f482c4c396d..99e17545cf5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -34,6 +34,7 @@
  */
 public class invokemethod014t {
     static {} // force javac to produce <clinit> method
+    static Thread testThread = null;
 
     invokemethod014t() {} // force javac to produce <init> method
 
@@ -48,7 +49,8 @@ public static int run(String args[]) {
     private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(invokemethod014.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod014.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod014.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java
index 7eedc604e75..696aeeb1785 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007.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
@@ -157,7 +157,8 @@ private void execTest() {
 
             thread = brkpEvent.thread();
 
-            suspendedThread = debugee.threadByName(newinstance007a.testedThread);
+            suspendedThread = debugee.threadByFieldNameOrThrow(testedClass, "thread",
+                                                               newinstance007a.testedThread);
             switch (i) {
             case 0:
                 suspendedThread.suspend();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007a.java
index aabb839da7b..6d6a6efaba4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance007a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -34,19 +34,19 @@
 public class newinstance007a {
 
     public final static String brkpMethodName = "main";
-    public final static int brkpLineNumber = 70;
+    public final static int brkpLineNumber = 71;
     public final static String testedThread = "im007aThread01";
 
     public static Log log;
     public static long waitTime;
     private static IOPipe pipe;
+    static Thread thread = null;
 
     public static void main (String argv[]) {
         ArgumentHandler argHandler = new ArgumentHandler(argv);
         log = new Log(System.err, argHandler);
         waitTime = argHandler.getWaitTime() * 60000;
         pipe = argHandler.createDebugeeIOPipe(log);
-        Thread thread = null;
         pipe.println(newinstance007.SGNL_READY);
 
         String instr = pipe.readln();
@@ -54,7 +54,7 @@ public static void main (String argv[]) {
 
             // create new thread and start it
             if (instr.equals(newinstance007.SGNL_STRTHRD)) {
-                thread = JDIThreadFactory.newThread(new im007aThread01("im007aThread01"));
+                thread = JDIThreadFactory.newThread(new im007aThread01(testedThread));
                 synchronized(im007aThread01.waitStarting) {
                     thread.start();
                     try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
index a29b7cb5d7d..d3562902c78 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.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
@@ -95,10 +95,13 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = null;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+        ClassType clsType = (ClassType) rType;
+
+        ThreadReference thrRef = debuggee.threadByFieldName(rType, "thread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
@@ -123,10 +126,6 @@ private int runIt(String args[], PrintStream out) {
         }
 
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-            ClassType clsType = (ClassType) rType;
-
             List methList = rType.methodsByName("<init>");
             if (methList.isEmpty()) {
                 log.complain("TEST FAILURE: the expected constructor "
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009t.java
index 4169ef62e41..8451d39cf58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is debuggee class.
  */
 public class newinstance009t {
+    static Thread thread = null;
+
     // constructor used only to check IncompatibleThreadStateException throwing
     // in the debugger
     newinstance009t() {
@@ -48,7 +50,8 @@ public static int run(String args[]) {
     private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(newinstance009.DEBUGGEE_THRNAME);
+        thread = Thread.currentThread();
+        thread.setName(newinstance009.DEBUGGEE_THRNAME);
 
         pipe.println(newinstance009.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java
index 05f57bffe34..db6b785d468 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001.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
@@ -126,7 +126,8 @@ private static void execTest() {
             switch (i) {
 
                 case 0:
-                       ThreadReference thread = debuggee.threadByName(threadName);
+                       ThreadReference thread =
+                           debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
 
                        display("setting up StepRequest");
                        eventRequest = eventRequestManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001a.java
index 3ae622235b4..6a171fd84fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/equals/equals001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -64,6 +64,7 @@ public static void receiveSignal(String signal) {
 
     static Object lock = new Object();
     static Object wait = new Object();
+    static Thread thread1 = null;
 
     //------------------------------------------------------ mutable common method
 
@@ -73,7 +74,7 @@ public static void main (String argv[]) {
         log = new Log(System.err, argHandler);
         pipe = argHandler.createDebugeeIOPipe(log);
         try {
-            Thread thread1 = JDIThreadFactory.newThread(new equals001aThread("thread1"));
+            thread1 = JDIThreadFactory.newThread(new equals001aThread("thread1"));
 
             synchronized (lock) {
                  synchronized(wait) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java
index 4c15e7cc6bf..d87de5e4a2f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001.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
@@ -64,7 +64,7 @@ public class hashcode001 {
     private final static String threadName = "thread1";
     private final static String methodName = "foo";
     private final static String fieldName = "name";
-    private final static int brkpLineNumber = 145;
+    private final static int brkpLineNumber = 146;
 
     //------------------------------------------------------- immutable common methods
 
@@ -126,7 +126,8 @@ private static void execTest() {
             switch (i) {
 
                 case 0:
-                       ThreadReference thread = debuggee.threadByName(threadName);
+                       ThreadReference thread =
+                           debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName);
 
                        display(".....setting up StepRequest");
                        eventRequest = eventRequestManager.createStepRequest
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001a.java
index 996ccab0b3c..404b93853c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/hashCode/hashcode001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -64,6 +64,7 @@ public static void receiveSignal(String signal) {
 
     static Object lock = new Object();
     static Object wait = new Object();
+    static Thread thread1 = null;
 
     //------------------------------------------------------ mutable common method
 
@@ -73,7 +74,7 @@ public static void main (String argv[]) {
         log = new Log(System.err, argHandler);
         pipe = argHandler.createDebugeeIOPipe(log);
         try {
-            Thread thread1 = JDIThreadFactory.newThread(new hashcode001aThread("thread1"));
+            thread1 = JDIThreadFactory.newThread(new hashcode001aThread("thread1"));
 
             synchronized (lock) {
                  synchronized(wait) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
index a2b18608770..7c43d0b2fa5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.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
@@ -71,7 +71,7 @@ public class invokemethod002 {
     static final String DEBUGGEE_THRNAME = "invokemethod002tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 62;
+    static final int DEBUGGEE_STOPATLINE = 64;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR = "invokemethod002tdummyCls";
@@ -124,14 +124,15 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        rType[0] = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
 // Check the tested assersion
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002t.java
index 67b51b9d710..792ed9b4fb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,7 @@
  */
 public class invokemethod002t {
     static {} // force javac to produce <clinit> method
+    static Thread testThread = null;
 
     invokemethod002t() {} // force javac to produce <init> method
 
@@ -49,7 +50,8 @@ private int runIt(String args[]) {
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod002tDummyClass invokemethod002tdummyCls = new invokemethod002tDummyClass();
 
-        Thread.currentThread().setName(invokemethod002.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod002.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod002.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
index d9b6f4b0ae7..a348f9ff78c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.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
@@ -58,7 +58,7 @@ public class invokemethod003 {
     static final String DEBUGGEE_THRNAME = "invokemethod003tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 59;
+    static final int DEBUGGEE_STOPATLINE = 62;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -135,13 +135,6 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
         ReferenceType[] rType = new ReferenceType[3];
         // debuggee main class
         rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
@@ -150,6 +143,14 @@ private int runIt(String args[], PrintStream out) {
         // debuggee dummy abstract class
         rType[2] = debuggee.classByName(DEBUGGEE_ABSTRACTCLASS);
 
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                + DEBUGGEE_THRNAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
+
 // Check the tested assersion
         try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003t.java
index be465b61070..53f022f9133 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class invokemethod003t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -46,7 +48,8 @@ private int runIt(String args[]) {
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod003tDummyClass invokemethod003tdummyCls = new invokemethod003tDummyClass();
 
-        Thread.currentThread().setName(invokemethod003.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod003.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod003.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
index 12006735008..3b26eb2a010 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.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
@@ -111,9 +111,11 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004t.java
index 2e90c83caad..6d3a4a3ea99 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is a debuggee class.
  */
 public class invokemethod004t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -43,7 +45,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod004tDummyClass invokemethod004tdummyCls = new invokemethod004tDummyClass();
-        Thread.currentThread().setName(invokemethod004.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod004.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod004.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
index 4bcbac5d727..fcc13dc3b10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.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
@@ -51,7 +51,7 @@ public class invokemethod005 {
     static final String DEBUGGEE_THRNAME = "invokemethod005tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 58;
+    static final int DEBUGGEE_STOPATLINE = 61;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -113,16 +113,17 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        ReferenceType[] rType = new ReferenceType[2];
+        // debuggee main class
+        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
 
 // Check the tested assersion
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005t.java
index 4e512eaecc5..8c2662a6d13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class invokemethod005t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -45,7 +47,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod005tDummyClass invokemethod005tdummyCls = new invokemethod005tDummyClass();
-        Thread.currentThread().setName(invokemethod005.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod005.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod005.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
index 40f828a0f3b..0583cf62b53 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.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
@@ -50,7 +50,7 @@ public class invokemethod006 {
     static final String DEBUGGEE_THRNAME = "invokemethod006tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 58;
+    static final int DEBUGGEE_STOPATLINE = 61;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -111,16 +111,17 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        ReferenceType[] rType = new ReferenceType[2];
+        // debuggee main class
+        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
 
 // Check the tested assersion
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006t.java
index 625f6ead77c..bb19378aa19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class invokemethod006t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -45,7 +47,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod006tDummyClass invokemethod006tdummyCls = new invokemethod006tDummyClass();
-        Thread.currentThread().setName(invokemethod006.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod006.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod006.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
index 63be5be365e..fa5c9ec3e17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.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
@@ -51,7 +51,7 @@ public class invokemethod007 {
     static final String DEBUGGEE_THRNAME = "invokemethod007tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 58;
+    static final int DEBUGGEE_STOPATLINE = 61;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -127,16 +127,17 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        ReferenceType[] rType = new ReferenceType[2];
+        // debuggee main class
+        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
 
 // Check the tested assersion
         try {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007t.java
index 1e249de4083..965832e2ab4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class invokemethod007t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -45,7 +47,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         invokemethod007tDummyClass invokemethod007tdummyCls = new invokemethod007tDummyClass();
-        Thread.currentThread().setName(invokemethod007.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod007.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod007.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
index e26550203c4..c0426229e5b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.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
@@ -58,7 +58,7 @@ public class invokemethod008 {
     static final String DEBUGGEE_THRNAME = "invokemethod008tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 69;
+    static final int DEBUGGEE_STOPATLINE = 71;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -120,19 +120,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
         ReferenceType[] rType = new ReferenceType[3];
         // reference types of debuggee main & dummy classes
         rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
         rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
         rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
 
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                + DEBUGGEE_THRNAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
+
 // Check the tested assersion
         try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008t.java
index 9ccff1fa714..a33387ee921 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -34,6 +34,7 @@
  */
 public class invokemethod008t {
     static Log log;
+    static Thread testThread = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -56,7 +57,8 @@ private int runIt(String args[]) {
         invokemethod008tDummySuperSuperClass invokemethod008tdummySSCls =
             new invokemethod008tDummySuperSuperClass();
 
-        Thread.currentThread().setName(invokemethod008.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod008.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod008.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
index 703123ef076..ce3545ac228 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.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
@@ -58,7 +58,7 @@ public class invokemethod009 {
     static final String DEBUGGEE_THRNAME = "invokemethod009tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 69;
+    static final int DEBUGGEE_STOPATLINE = 71;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -120,19 +120,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
         ReferenceType[] rType = new ReferenceType[3];
         // reference types of debuggee main & dummy classes
         rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
         rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
         rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
 
+        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                + DEBUGGEE_THRNAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
+
 // Check the tested assersion
         try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009t.java
index fecd757f4b1..ff217c64866 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -34,6 +34,7 @@
  */
 public class invokemethod009t {
     static Log log;
+    static Thread testThread = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -56,7 +57,8 @@ private int runIt(String args[]) {
         invokemethod009tDummySuperSuperClass invokemethod009tdummySSCls =
             new invokemethod009tDummySuperSuperClass();
 
-        Thread.currentThread().setName(invokemethod009.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod009.DEBUGGEE_THRNAME);
 
         pipe.println(invokemethod009.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
index 5d7d4f3b66e..3005ed87a64 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.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
@@ -55,7 +55,7 @@ public class invokemethod014 {
     static final String DEBUGGEE_THRNAME = "invokemethod014tThr";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 72;
+    static final int DEBUGGEE_STOPATLINE = 74;
 
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR =
@@ -143,20 +143,21 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
         ReferenceType[] rType = new ReferenceType[3];
         // debuggee main & dummy classes
         rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
         rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
         rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
 
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                + DEBUGGEE_THRNAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
+
 // Check the tested assersion
         try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014t.java
index 2196a976b69..97fb155af9c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -34,6 +34,7 @@
  */
 public class invokemethod014t {
     public static Log log;
+    static Thread testThread = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -58,7 +59,8 @@ private int runIt(String args[]) {
 
         log = argHandler.createDebugeeLog();
 
-        Thread.currentThread().setName(invokemethod014.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(invokemethod014.DEBUGGEE_THRNAME);
 
         // Now the debuggee is ready for testing
         pipe.println(invokemethod014.COMMAND_READY);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
index ed2ea7dc525..1c4803cffef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.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
@@ -109,9 +109,11 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee's thread "
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
@@ -208,6 +210,10 @@ private void provokeException(ObjectReference objRef,
         Iterator iter = fields.iterator();
         while (iter.hasNext()) {
             Field fld = (Field) iter.next();
+            if (fld.name().equals("testThread")) {
+                // skip the static testThread field
+                continue;
+            }
             try {
                 log.display("\nTrying to set value for the field \""
                     + fld.name() + "\"\n\tfrom the debuggee's object reference \""
@@ -229,7 +235,7 @@ private void provokeException(ObjectReference objRef,
                 log.complain("TEST FAILED: ObjectReference.setValue(): caught unexpected "
                     + e + "\n\tinstead of expected IllegalArgumentException"
                     + "\n\twhen attempted to set value for the field \""
-                    + fld.name() + "\"\n\tfrom the debuggee's object reference \""
+                    + fld.name() + "\"\n\tfrom the de19buggee's object reference \""
                     + objRef
                     + "\n\tusing not valid Field's value from the other object reference \""
                     + fldObjRef + "\"");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002t.java
index 9737c6bcfbc..ce53ddbb540 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is a debuggee class.
  */
 public class setvalue002t {
+    static Thread testThread = null;
+
     // tested static fields
     static byte    sByteFld = 127;
     static short   sShortFld = -32768;
@@ -53,7 +55,6 @@ public class setvalue002t {
     boolean booleanFld = false;
     String  strFld = "instance field";
 
-
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -67,7 +68,8 @@ private int runIt(String args[]) {
         IOPipe pipe = argHandler.createDebugeeIOPipe();
         setvalue002tDummyClass dummyCls = new setvalue002tDummyClass();
 
-        Thread.currentThread().setName(setvalue002.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(setvalue002.DEBUGGEE_THRNAME);
 
         pipe.println(setvalue002.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
index 1496a672f92..4fbe110ca96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.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
@@ -142,9 +142,11 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee's thread "
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003t.java
index 2a0d1353c87..21666ab6e6e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is a debuggee class.
  */
 public class setvalue003t {
+    static Thread testThread = null;
+
     // tested static fields
     static byte    sByteFld = Byte.MAX_VALUE;
     static short   sShortFld = Short.MAX_VALUE;
@@ -53,7 +55,6 @@ public class setvalue003t {
     boolean booleanFld = false;
     String  strFld = "instance field";
 
-
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -66,7 +67,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe setvalue003tPipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(setvalue003.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(setvalue003.DEBUGGEE_THRNAME);
 
         setvalue003tPipe.println(setvalue003.COMMAND_READY);
         String cmd = setvalue003tPipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
index ab20e5f93e7..0eed84859eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.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
@@ -122,9 +122,11 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee's thread "
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004t.java
index f4214ca1c1e..37a3db0c952 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004t.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
@@ -31,6 +31,8 @@
  * This is a debuggee class.
  */
 public class setvalue004t {
+    static Thread testThread = null;
+
     // tested static final fields
     static final byte    sByteFld = 127;
     static final short   sShortFld = -32768;
@@ -65,7 +67,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe setvalue004tPipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(setvalue004.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(setvalue004.DEBUGGEE_THRNAME);
 
         setvalue004tPipe.println(setvalue004.COMMAND_READY);
         String cmd = setvalue004tPipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
index 3c8525093ad..b77ea99979d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.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
@@ -109,9 +109,11 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByName() returned null for debuggee thread "
+        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+
+        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005t.java
index b3a893c6a17..c9a009ca438 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,6 +31,8 @@
  * This is a debuggee class.
  */
 public class setvalue005t {
+    static Thread testThread = null;
+
     // dummy instance uninitialized fields of reference types
     setvalue005tDummyType dummyType;
     setvalue005tAbsDummyType absDummyType;
@@ -48,7 +50,8 @@ private int runIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe setvalue005tPipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(setvalue005.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(setvalue005.DEBUGGEE_THRNAME);
 
         setvalue005tPipe.println(setvalue005.COMMAND_READY);
         String cmd = setvalue005tPipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java
index 695d813f3b0..c0ec096553b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum003/defaultStratum003.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
@@ -71,7 +71,9 @@
 
 import java.io.*;
 import java.util.*;
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.StepRequest;
+import com.sun.jdi.ThreadReference;
 import nsk.share.Consts;
 import nsk.share.TestBug;
 import nsk.share.jdi.EventHandler;
@@ -166,8 +168,12 @@ public void doTest() {
         StepEventListener stepEventListener = new StepEventListener();
         eventHandler.addListener(stepEventListener);
 
+        ReferenceType debuggeeClass = debuggee.classByName(SDEDebuggee.class.getName());
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread",
+                                              SDEDebuggee.mainThreadName);
         StepRequest stepRequest = debuggee.getEventRequestManager().createStepRequest(
-                debuggee.threadByName(SDEDebuggee.mainThreadName),
+                mainThread,
                 StepRequest.STEP_LINE,
                 StepRequest.STEP_INTO);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java
index bd301a1c018..fe47d1ec137 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/defaultStratum/defaultStratum004/defaultStratum004.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
@@ -61,7 +61,9 @@
 
 import java.io.*;
 import java.util.*;
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.StepRequest;
+import com.sun.jdi.ThreadReference;
 import nsk.share.Consts;
 import nsk.share.TestBug;
 import nsk.share.jdi.EventHandler;
@@ -165,11 +167,16 @@ public void doTest() {
         StepEventListener stepEventListener = new StepEventListener();
         eventHandler.addListener(stepEventListener);
 
+        ReferenceType debuggeeClass = debuggee.classByName(SDEDebuggee.class.getName());
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread",
+                                              SDEDebuggee.mainThreadName);
+
         // perform step events generation 3 times
         for (int i = 0; i < 3; i++) {
             for (String testedClassName : classLocations.keySet()) {
                 StepRequest stepRequest = debuggee.getEventRequestManager().createStepRequest(
-                        debuggee.threadByName(SDEDebuggee.mainThreadName),
+                        mainThread,
                         StepRequest.STEP_LINE,
                         StepRequest.STEP_INTO);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java
index b6f24e04ecc..d1efd919d18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004.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
@@ -60,7 +60,7 @@ public class sourcename004 {
     static final String DEBUGGEE_METHOD = "sourcename004trunIt";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 57;
+    static final int DEBUGGEE_STOPATLINE = 60;
 
     static final int FLD_NUM = 24;
     // tested fields used to provoke the exception
@@ -135,15 +135,18 @@ private int runIt(String args[], PrintStream out) {
         }
 
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
             // debuggee main thread
-            ThreadReference thrRef = null;
-            if ((thrRef =
-                    debuggee.threadByName(DEBUGGEE_THRNAME)) == null)
-                throw new Failure("method Debugee.threadByName() returned null for debuggee thread "
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                throw new Failure("method Debugee.threadByFieldName() returned null for debuggee thread "
                     + DEBUGGEE_THRNAME);
+            }
 
             // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
             Method meth = debuggee.methodByName(rType, DEBUGGEE_METHOD);
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(thrRef, meth);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004t.java
index af2ffc9eeb3..e96ae0ce83c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename004t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is debuggee class.
  */
 public class sourcename004t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -44,7 +46,8 @@ public static int run(String args[]) {
     private int sourcename004trunIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(sourcename004.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(sourcename004.DEBUGGEE_THRNAME);
 
         pipe.println(sourcename004.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java
index d6063179779..e7111a2a8af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002.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
@@ -60,7 +60,7 @@ public class sourcenames002 {
     static final String DEBUGGEE_METHOD = "sourcenames002trunIt";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 57;
+    static final int DEBUGGEE_STOPATLINE = 60;
 
     static final int FLD_NUM = 24;
     // tested fields used to provoke the exception
@@ -135,15 +135,17 @@ private int runIt(String args[], PrintStream out) {
         }
 
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
             // debuggee main thread
-            ThreadReference thrRef = null;
-            if ((thrRef =
-                    debuggee.threadByName(DEBUGGEE_THRNAME)) == null)
-                throw new Failure("method Debugee.threadByName() returned null for debuggee thread "
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                throw new Failure("method Debugee.threadByFieldName() returned null for debuggee thread "
                     + DEBUGGEE_THRNAME);
+            }
 
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
             Method meth = debuggee.methodByName(rType, DEBUGGEE_METHOD);
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(thrRef, meth);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002t.java
index 7ed7f98e706..c5c2af5459c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceNames/sourcenames002t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -33,6 +33,8 @@
  * This is debuggee class.
  */
 public class sourcenames002t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -44,7 +46,8 @@ public static int run(String args[]) {
     private int sourcenames002trunIt(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
         IOPipe pipe = argHandler.createDebugeeIOPipe();
-        Thread.currentThread().setName(sourcenames002.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(sourcenames002.DEBUGGEE_THRNAME);
 
         pipe.println(sourcenames002.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java
index deaef8e96b6..08780fa7274 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003.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
@@ -51,15 +51,14 @@ public class getvalue003 {
         "nsk.jdi.StackFrame.getValue.getvalue003t";
 
     // names of debuggee threads
-    static final String DEBUGGEE_THRDNAMES[] = {
-        "getvalue003tMainThr", "getvalue003tAuxThr"
-    };
+    static final String DEBUGGEE_MAIN_THREAD_NAME = "getvalue003tMainThr";
+    static final String DEBUGGEE_AUX_THREAD_NAME  = "getvalue003tAuxThr";
 
     // debuggee local var used in testing
     static final String DEBUGGEE_LOCALVAR = "getvalue003tFindMe";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 69;
+    static final int DEBUGGEE_STOPATLINE = 72;
 
     static final int DELAY = 500; // in milliseconds
 
@@ -105,33 +104,30 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef[] = new ThreadReference[2];
-        for (int i=0; i<2; i++)
-            if ((thrRef[i] =
-                    debuggee.threadByName(DEBUGGEE_THRDNAMES[i])) == null) {
-                log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
-                    + DEBUGGEE_THRDNAMES[i]);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
-            }
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
 
-        try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(rType, "mainThread",
+                                              DEBUGGEE_MAIN_THREAD_NAME);
+        ThreadReference auxThread =
+            debuggee.threadByFieldNameOrThrow(rType, "auxThr",
+                                              DEBUGGEE_AUX_THREAD_NAME);
 
+        try {
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // get a stack frame which belongs to the "getvalue003tMainThr" thread
-            StackFrame stFrame = findFrame(thrRef[0], DEBUGGEE_LOCALVAR, false);
+            StackFrame stFrame = findFrame(mainThread, DEBUGGEE_LOCALVAR, false);
 
             // store a LocalVariable which belongs to the "getvalue003tAuxThr" thread
-            findFrame(thrRef[1], DEBUGGEE_LOCALVAR, true);
+            findFrame(auxThread, DEBUGGEE_LOCALVAR, true);
 
             log.display("\nTrying to get value of local variable \""
                 + wrongLocVar
-                + "\"\n\tgotten from thread \"" + thrRef[1]
+                + "\"\n\tgotten from thread \"" + auxThread
                 + "\"\n\tusing stack frame \"" + stFrame
-                + "\"\n\tbelongs to thread \"" + thrRef[0]
+                + "\"\n\tbelongs to thread \"" + mainThread
                 + "\" ...");
 
 // Check the tested assersion
@@ -140,9 +136,9 @@ private int runIt(String args[], PrintStream out) {
                 log.complain("TEST FAILED: expected IllegalArgumentException was not thrown"
                     + "\n\twhen attempted to get value of local variable \""
                     + wrongLocVar
-                    + "\"\n\tgotten from thread \"" + thrRef[1]
+                    + "\"\n\tgotten from thread \"" + auxThread
                     + "\"\n\tusing stack frame \"" + stFrame
-                    + "\"\n\tbelongs to thread \"" + thrRef[0] + "\"");
+                    + "\"\n\tbelongs to thread \"" + mainThread + "\"");
                 tot_res = Consts.TEST_FAILED;
             } catch(IllegalArgumentException ee) {
                 log.display("CHECK PASSED: caught expected " + ee);
@@ -152,9 +148,9 @@ private int runIt(String args[], PrintStream out) {
                     + ue + "\n\tinstead of IllegalArgumentException"
                     + "\n\twhen attempted to get value of local variable \""
                     + wrongLocVar
-                    + "\"\n\tgotten from thread \"" + thrRef[1]
+                    + "\"\n\tgotten from thread \"" + auxThread
                     + "\"\n\tusing stack frame \"" + stFrame
-                    + "\"\n\tbelongs to thread \"" + thrRef[0] + "\"");
+                    + "\"\n\tbelongs to thread \"" + mainThread + "\"");
                 tot_res = Consts.TEST_FAILED;
             }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003t.java
index 431641de0ce..6790bc4a382 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValue/getvalue003t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -34,7 +34,9 @@
 public class getvalue003t {
     private Log log;
     private IOPipe pipe;
-    private OtherThr auxThr;
+
+    static Thread mainThread = null;
+    static OtherThr auxThr = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -50,7 +52,8 @@ private int runIt(String args[]) {
         log = argHandler.createDebugeeLog();
         pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(getvalue003.DEBUGGEE_THRDNAMES[0]);
+        mainThread = Thread.currentThread();
+        mainThread.setName(getvalue003.DEBUGGEE_MAIN_THREAD_NAME);
         startThread();
 
         // local var used by debugger to find appropriate stack frame
@@ -81,8 +84,7 @@ private int runIt(String args[]) {
     private void startThread() {
         Object readyObj = new Object();
 
-        auxThr = new OtherThr(readyObj,
-            getvalue003.DEBUGGEE_THRDNAMES[1]);
+        auxThr = new OtherThr(readyObj, getvalue003.DEBUGGEE_AUX_THREAD_NAME);
         auxThr.setDaemon(true);
 
         log.display("Debuggee: starting thread \""
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java
index 6279111d554..e4a64581b30 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003.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
@@ -52,9 +52,8 @@ public class getvalues003 {
         "nsk.jdi.StackFrame.getValues.getvalues003t";
 
     // names of debuggee threads
-    static final String DEBUGGEE_THRDNAMES[] = {
-        "getvalues003tMainThr", "getvalues003tAuxThr"
-    };
+    static final String DEBUGGEE_MAIN_THREAD_NAME = "getvalues003tMainThr";
+    static final String DEBUGGEE_AUX_THREAD_NAME  = "getvalues003tAuxThr";
 
     // tested debuggee local vars
     static final int VAR_NUM = 9;
@@ -65,7 +64,7 @@ public class getvalues003 {
     };
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 78;
+    static final int DEBUGGEE_STOPATLINE = 81;
 
     static final int DELAY = 500; // in milliseconds
 
@@ -111,27 +110,24 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef[] = new ThreadReference[2];
-        for (int i=0; i<2; i++)
-            if ((thrRef[i] =
-                    debuggee.threadByName(DEBUGGEE_THRDNAMES[i])) == null) {
-                log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
-                    + DEBUGGEE_THRDNAMES[i]);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
-            }
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
 
-        try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(rType, "mainThread",
+                                              DEBUGGEE_MAIN_THREAD_NAME);
+        ThreadReference auxThread =
+            debuggee.threadByFieldNameOrThrow(rType, "auxThr",
+                                              DEBUGGEE_AUX_THREAD_NAME);
 
+        try {
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // get a stack frame which belongs to the "getvalue003tMainThr" thread
-            StackFrame stFrame = findFrame(thrRef[0], DEBUGGEE_VARS[0], true);
+            StackFrame stFrame = findFrame(mainThread, DEBUGGEE_VARS[0], true);
 
             // store a LocalVariable which belongs to the "getvalue003tAuxThr" thread
-            StackFrame wrongStFrame = findFrame(thrRef[1], DEBUGGEE_VARS[0], false);
+            StackFrame wrongStFrame = findFrame(auxThread, DEBUGGEE_VARS[0], false);
 
             StringBuffer varNames = new StringBuffer();
             Iterator varIter = locVars.iterator();
@@ -153,13 +149,13 @@ else throw new Failure("needed local variable "
                 log.display("\n" + (i+1)
                     + ") Trying to get values of local variables:"
                     + varNames
-                    + "\n\tgotten from thread \"" + thrRef[0]
+                    + "\n\tgotten from thread \"" + mainThread
                     + "\"\n\tand wrongly, of local variable\n\t\t"
                     + wrongLocVar.typeName() + " " + wrongLocVar.name()
                     + " " + wrongLocVar.signature()
-                    + "\n\tgotten from thread \"" + thrRef[1]
+                    + "\n\tgotten from thread \"" + auxThread
                     + "\"\n\tusing stack frame \"" + stFrame
-                    + "\"\n\tin the thread \"" + thrRef[0]
+                    + "\"\n\tin the thread \"" + mainThread
                     + "\" ...");
 
                 // Check the tested assersion
@@ -168,13 +164,13 @@ else throw new Failure("needed local variable "
                     log.complain("TEST FAILED: expected IllegalArgumentException was not thrown"
                         + "\n\twhen attempted to get values of local variables:"
                         + varNames
-                        + "\"\n\tgotten from thread \"" + thrRef[0]
+                        + "\"\n\tgotten from thread \"" + mainThread
                         + "\"\n\tand wrongly, of local variable\n\t\t"
                         + wrongLocVar.typeName() + " " + wrongLocVar.name()
                         + " " + wrongLocVar.signature()
-                        + "\n\tgotten from thread \"" + thrRef[1]
+                        + "\n\tgotten from thread \"" + auxThread
                         + "\"\n\tusing stack frame \"" + stFrame
-                        + "\"\n\tin the thread \"" + thrRef[0] + "\"");
+                        + "\"\n\tin the thread \"" + mainThread + "\"");
                     tot_res = Consts.TEST_FAILED;
                 } catch(IllegalArgumentException ee) {
                     log.display("CHECK PASSED: caught expected " + ee);
@@ -184,13 +180,13 @@ else throw new Failure("needed local variable "
                         + ue + "\n\tinstead of IllegalArgumentException"
                         + "\n\twhen attempted to get values of local variables:"
                         + varNames
-                        + "\"\n\tgotten from thread \"" + thrRef[0]
+                        + "\"\n\tgotten from thread \"" + mainThread
                         + "\"\n\tand wrongly, of local variable\n\t\t"
                         + wrongLocVar.typeName() + " " + wrongLocVar.name()
                         + " " + wrongLocVar.signature()
-                        + "\"\n\tgotten from thread \"" + thrRef[1]
+                        + "\"\n\tgotten from thread \"" + auxThread
                         + "\"\n\tusing stack frame \"" + stFrame
-                        + "\"\n\tin the thread \"" + thrRef[0] + "\"");
+                        + "\"\n\tin the thread \"" + mainThread + "\"");
                     tot_res = Consts.TEST_FAILED;
                 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003t.java
index c1d5752f22d..1785d21af8c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/getValues/getvalues003t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -35,7 +35,9 @@
 public class getvalues003t {
     private Log log;
     private IOPipe pipe;
-    private OtherThr auxThr;
+
+    static Thread mainThread = null;
+    static OtherThr auxThr = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -51,7 +53,8 @@ private int runIt(String args[]) {
         log = argHandler.createDebugeeLog();
         pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(getvalues003.DEBUGGEE_THRDNAMES[0]);
+        mainThread = Thread.currentThread();
+        mainThread.setName(getvalues003.DEBUGGEE_MAIN_THREAD_NAME);
         startThread();
 
         // dummy local vars used by debugger for testing
@@ -90,8 +93,7 @@ private int runIt(String args[]) {
     private void startThread() {
         Object readyObj = new Object();
 
-        auxThr = new OtherThr(readyObj,
-            getvalues003.DEBUGGEE_THRDNAMES[1]);
+        auxThr = new OtherThr(readyObj, getvalues003.DEBUGGEE_AUX_THREAD_NAME);
         auxThr.setDaemon(true);
 
         log.display("Debuggee: starting thread \""
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
index 561aee37acb..3b8a49ac5d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.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
@@ -111,7 +111,7 @@ public class setvalue005 {
     };
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 67;
+    static final int DEBUGGEE_STOPATLINE = 70;
 
     static final int DELAY = 500; // in milliseconds
 
@@ -156,19 +156,19 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = null;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRDNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_THRDNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRDNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
 
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // find a stack frame which belongs to the "setvalue005tMainThr" thread
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005t.java
index 4eef1bd7f31..460617e300f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class setvalue005t {
+    static Thread mainThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -46,7 +48,8 @@ private int runIt(String args[]) {
         Log log = argHandler.createDebugeeLog();
         IOPipe pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(setvalue005.DEBUGGEE_THRDNAME);
+        mainThread = Thread.currentThread();
+        mainThread.setName(setvalue005.DEBUGGEE_THRDNAME);
 
         // dummy local var used by debugger for stack frame searching
         int setvalue005tFindMe = 0;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java
index 50b92e96944..73c7dd7198e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006.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
@@ -132,7 +132,7 @@ public class setvalue006 {
     };
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 72;
+    static final int DEBUGGEE_STOPATLINE = 75;
 
     static final int DELAY = 500; // in milliseconds
 
@@ -177,19 +177,19 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = null;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRDNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_THRDNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRDNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
         }
 
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // find a stack frame which belongs to the "setvalue006tMainThr" thread
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006t.java
index 58d75773fe8..ffa0e961f3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue006/setvalue006t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class setvalue006t {
+    static Thread mainThread = null;
+
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
     }
@@ -46,7 +48,8 @@ private int runIt(String args[]) {
         Log log = argHandler.createDebugeeLog();
         IOPipe pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(setvalue006.DEBUGGEE_THRDNAME);
+        mainThread = Thread.currentThread();
+        mainThread.setName(setvalue006.DEBUGGEE_THRDNAME);
 
         // dummy local vars used by debugger to provoke InvalidTypeException
         byte    byteVar = Byte.MAX_VALUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java
index 0d77050a222..e512b7db8b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent003/stepEvent003.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
@@ -73,7 +73,9 @@
 
 import java.io.*;
 import java.util.*;
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.StepRequest;
+import com.sun.jdi.ThreadReference;
 import nsk.share.Consts;
 import nsk.share.jdi.EventHandler;
 import nsk.share.jdi.sde.*;
@@ -165,8 +167,12 @@ public void doTest() {
         StepEventListener stepEventListener = new StepEventListener();
         eventHandler.addListener(stepEventListener);
 
+        ReferenceType debuggeeClass = debuggee.classByName(SDEDebuggee.class.getName());
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread",
+                                              SDEDebuggee.mainThreadName);
         StepRequest stepRequest = debuggee.getEventRequestManager().createStepRequest(
-                debuggee.threadByName(SDEDebuggee.mainThreadName),
+                mainThread,
                 StepRequest.STEP_LINE,
                 StepRequest.STEP_INTO);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java
index 9b911c3cf13..ff303d4c52d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepEvent/_itself_/stepEvent004/stepEvent004.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
@@ -79,7 +79,9 @@
 
 import java.io.*;
 import java.util.*;
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.StepRequest;
+import com.sun.jdi.ThreadReference;
 import nsk.share.Consts;
 import nsk.share.jdi.EventHandler;
 import nsk.share.jdi.sde.*;
@@ -230,8 +232,12 @@ public void doTest() {
         StepEventListener stepEventListener = new StepEventListener();
         eventHandler.addListener(stepEventListener);
 
+        ReferenceType debuggeeClass = debuggee.classByName(SDEDebuggee.class.getName());
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread",
+                                              SDEDebuggee.mainThreadName);
         StepRequest stepRequest = debuggee.getEventRequestManager().createStepRequest(
-                debuggee.threadByName(SDEDebuggee.mainThreadName),
+                mainThread,
                 StepRequest.STEP_LINE,
                 StepRequest.STEP_INTO);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java
index 29f656bbd26..746f063ec6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassExclusionFilter/filter001.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
@@ -104,7 +104,7 @@ protected void testRun() {
             switch (i) {
 
                 case 0:
-                thread1 = debuggee.threadByName(threadName1);
+                thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
                 eventRequest1 = setting23StepRequest(thread1, "*" + testedClassName1,
                                          EventRequest.SUSPEND_NONE, property1);
 
@@ -131,7 +131,7 @@ public boolean eventReceived(Event event) {
                 break;
 
                 case 1:
-                thread2 = debuggee.threadByName(threadName2);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName2);
                 eventRequest2 = setting23StepRequest(thread2, testedClassName2 + "*",
                                          EventRequest.SUSPEND_NONE, property2);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java
index c54e6ca4a7a..e357d42b6fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt001.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
@@ -105,7 +105,7 @@ protected void testRun() {
 
                 case 0:
                 testClassReference = (ReferenceType)debuggee.classByName(testedClassName);
-                thread1 = debuggee.threadByName(threadName1);
+                thread1 = debuggee.threadByFieldName(debuggeeClass, threadName1);
                 if (thread1 == null)
                     throw new Failure("Cannot get ThreadReference for " + threadName1);
                 eventRequest1 = setting21StepRequest(thread1, testClassReference,
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java
index 10bbd4c56f3..2b9fa9b7d1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt/filter_rt003.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
@@ -124,8 +124,8 @@ protected void testRun() {
                 testClassReference11 = (ReferenceType)debuggee.classByName(testedClassName11);
                 testClassReference21 = (ReferenceType)debuggee.classByName(testedClassName21);
 
-                thread1 = debuggee.threadByName(threadName1);
-                thread2 = debuggee.threadByName(threadName2);
+                thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName2);
 
                 eventRequest1 = setting21StepRequest(thread1, testClassReference11,
                                              EventRequest.SUSPEND_ALL, property1);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java
index 32d9ad97e89..25ed14376c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StepRequest/addClassFilter_s/filter_s001.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
@@ -105,7 +105,7 @@ protected void testRun() {
             switch (i) {
 
                 case 0:
-                thread1 = debuggee.threadByName(threadName1);
+                thread1 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName1);
                 eventRequest1 = setting23StepRequest(thread1, "*" + testedClassName1,
                                                      EventRequest.SUSPEND_ALL, property1);
 
@@ -131,7 +131,7 @@ protected void testRun() {
                 break;
 
                 case 1:
-                thread2 = debuggee.threadByName(threadName2);
+                thread2 = debuggee.threadByFieldNameOrThrow(debuggeeClass, threadName2);
                 eventRequest2 = setting23StepRequest(thread2, testedClassName2 + "*",
                                                      EventRequest.SUSPEND_ALL, property2);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java
index 34e1b6d6c14..4ab808741d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/interrupt/interrupt001.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
@@ -205,7 +205,9 @@ private int runThis(String argv[], PrintStream out) {
     }
 
     private void executeCase(int testCase, String threadName2) {
-        ThreadReference thread2 = debuggee.threadByName(threadName2);
+        ReferenceType debuggeeClass = debuggee.classByName(debuggeeName);
+        ThreadReference thread2 =
+            debuggee.threadByFieldName(debuggeeClass, "thread2", threadName2);
         if (thread2 == null) {
             debuggee.quit();
             throw new TestBug("ERROR: Not found ThreadReference for name :" + threadName2);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
index 733407a2ac3..068670202c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.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
@@ -91,10 +91,13 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002t.java
index f55817ddcdc..fc79753a2fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -31,13 +31,16 @@
  * This is a debuggee class.
  */
 public class ownedmonitors002t {
+    static Thread testThread = null;
+
     public static void main(String args[]) {
         ArgumentHandler argHandler = new ArgumentHandler(args);
 
         Log log = argHandler.createDebugeeLog();
         IOPipe pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(ownedmonitors002.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(ownedmonitors002.DEBUGGEE_THRNAME);
 
         // Now the debuggee is ready for testing
         pipe.println(ownedmonitors002.COMMAND_READY);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
index 9704684e789..ed60d3abe53 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.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
@@ -59,7 +59,7 @@ public class popframes006 {
     static final String DEBUGGEE_FIELD = "wasPopped";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 80;
+    static final int DEBUGGEE_STOPATLINE = 83;
 
     static final int ATTEMPTS = 5;
     static final int DELAY = 500; // in milliseconds
@@ -106,10 +106,13 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = null;
-        if ((thrRef =
-                debuggee.threadByName(DEBUGGEE_THRNAME)) == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference thrRef =
+            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+        if (thrRef == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
@@ -117,9 +120,6 @@ private int runIt(String args[], PrintStream out) {
 
         Field doExit = null;
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // debuggee field used to indicate that popping has been done
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006t.java
index 73e70052c60..90ad2c0a4f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,6 +33,8 @@
  * This is a debuggee class.
  */
 public class popframes006t {
+    static Thread testThread = null;
+
     private Log log;
     private IOPipe pipe;
     volatile boolean wasPopped = false;
@@ -51,7 +53,8 @@ private int runIt(String args[]) {
         log = argHandler.createDebugeeLog();
         pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(popframes006.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(popframes006.DEBUGGEE_THRNAME);
 
         pipe.println(popframes006.COMMAND_READY);
         String cmd = pipe.readln();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
index 64377a06095..350b89ef4b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.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
@@ -50,16 +50,16 @@ public class popframes007 {
         "nsk.jdi.ThreadReference.popFrames.popframes007t";
 
     // names of debuggee threads
-    static final String DEBUGGEE_THRDS[] = {
-        "popframes007tMainThr", "popframes007tAuxThr"
-    };
+    static final String DEBUGGEE_MAIN_THREAD_NAME = "popframes007tMainThr";
+    static final String DEBUGGEE_AUX_THREAD_NAME  = "popframes007tAuxThr";
+
     // debuggee local var used to find needed stack frame
     static final String DEBUGGEE_LOCALVAR = "popframes007tFindMe";
     // debuggee field used to indicate that popping has been done
     static final String DEBUGGEE_FIELD = "leaveMethod";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 83;
+    static final int DEBUGGEE_STOPATLINE = 86;
 
     static final int ATTEMPTS = 5;
     static final int DELAY = 500; // in milliseconds
@@ -106,44 +106,52 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef[] = new ThreadReference[2];
-        for (int i=0; i<2; i++)
-            if ((thrRef[i] =
-                    debuggee.threadByName(DEBUGGEE_THRDS[i])) == null) {
-                log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
-                    + DEBUGGEE_THRDS[i]);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
-            }
+        // debuggee main class
+        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference mainThread =
+            debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_MAIN_THREAD_NAME);
+        if (mainThread == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                         + DEBUGGEE_MAIN_THREAD_NAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
+
+        ThreadReference auxThread =
+            debuggee.threadByFieldName(rType, "auxThr", DEBUGGEE_AUX_THREAD_NAME);
+        if (auxThread == null) {
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                         + DEBUGGEE_AUX_THREAD_NAME);
+            tot_res = Consts.TEST_FAILED;
+            return quitDebuggee();
+        }
 
         Field doExit = null;
         try {
-            // debuggee main class
-            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // debuggee field used to indicate that popping has been done
             doExit = rType.fieldByName(DEBUGGEE_FIELD);
 
             // debuggee stack frame to be popped which is not on specified thread's call stack
-            StackFrame stFrame = findFrame(thrRef[1], DEBUGGEE_LOCALVAR);
+            StackFrame stFrame = findFrame(auxThread, DEBUGGEE_LOCALVAR);
 
             log.display("\nTrying to pop stack frame \"" + stFrame
                 + "\"\n\tlocation \"" + stFrame.location()
-                + "\"\n\tgot from thread reference \"" + thrRef[1]
+                + "\"\n\tgot from thread reference \"" + auxThread
                 + "\"\n\tand the frame is not on the following thread's call stack: \""
-                + thrRef[0] + "\" ...");
+                + mainThread + "\" ...");
 
 // Check the tested assersion
             try {
-                thrRef[0].popFrames(stFrame);
+                mainThread.popFrames(stFrame);
                 log.complain("TEST FAILED: expected IllegalArgumentException was not thrown"
                     + "\n\twhen attempted to pop stack frame \"" + stFrame
                     + "\"\n\tlocation \"" + stFrame.location()
-                    + "\"\n\tgot from thread reference \"" + thrRef[1]
+                    + "\"\n\tgot from thread reference \"" + auxThread
                     + "\"\n\tand the frame is not on the following thread's call stack: \""
-                    + thrRef[0] + "\"");
+                    + mainThread + "\"");
                 tot_res = Consts.TEST_FAILED;
             } catch(IllegalArgumentException ee) {
                 log.display("CHECK PASSED: caught expected " + ee);
@@ -167,9 +175,9 @@ private int runIt(String args[], PrintStream out) {
                     + ue + "\n\tinstead of IllegalArgumentException"
                     + "\n\twhen attempted to pop stack \"" + stFrame
                     + "\"\n\tlocation \"" + stFrame.location()
-                    + "\"\n\tgot from thread reference \"" + thrRef[1]
+                    + "\"\n\tgot from thread reference \"" + auxThread
                     + "\"\n\tand the frame is not on the following thread's call stack: \""
-                    + thrRef[0] + "\"");
+                    + mainThread + "\"");
                 tot_res = Consts.TEST_FAILED;
             }
         } catch (Exception e) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007t.java
index a6eb18078db..0b462432f98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007t.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, 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
@@ -33,9 +33,11 @@
  * This is a debuggee class.
  */
 public class popframes007t {
+    static Thread mainThread = null;
+    static OtherThr auxThr = null;
+
     private Log log;
     private IOPipe pipe;
-    private OtherThr auxThr;
     volatile boolean leaveMethod = false;
 
     public static void main(String args[]) {
@@ -52,7 +54,8 @@ private int runIt(String args[]) {
         log = argHandler.createDebugeeLog();
         pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(popframes007.DEBUGGEE_THRDS[0]);
+        mainThread = Thread.currentThread();
+        mainThread.setName(popframes007.DEBUGGEE_MAIN_THREAD_NAME);
         startThread();
 
         // Now the debuggee is ready for testing
@@ -93,7 +96,7 @@ private void startThread() {
         Object readyObj = new Object();
 
         auxThr = new OtherThr(readyObj,
-            popframes007.DEBUGGEE_THRDS[1], this);
+            popframes007.DEBUGGEE_AUX_THREAD_NAME, this);
         auxThr.setDaemon(true);
 
         log.display("Debuggee: starting thread \""
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
index 53a607fdc29..fcf38c5c5ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.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
@@ -67,7 +67,7 @@ public class stop002 {
     static final String DEBUGGEE_STOP_LOOP2_FIELD = "stopLooping2";
 
     // debuggee source line where it should be stopped
-    static final int DEBUGGEE_STOPATLINE = 88;
+    static final int DEBUGGEE_STOPATLINE = 90;
 
     static final int DELAY = 500; // in milliseconds
 
@@ -115,9 +115,12 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ThreadReference thrRef = debuggee.threadByName(DEBUGGEE_THRNAME);
+        // debuggee main class
+        mainClass = debuggee.classByName(DEBUGGEE_CLASS);
+
+        ThreadReference thrRef = debuggee.threadByFieldName(mainClass, "testThread", DEBUGGEE_THRNAME);
         if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByName() returned null for debuggee thread "
+            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
                 + DEBUGGEE_THRNAME);
             tot_res = Consts.TEST_FAILED;
             return quitDebuggee();
@@ -128,9 +131,6 @@ private int runIt(String args[], PrintStream out) {
         ObjectReference objRef = null;
         ObjectReference throwableRef = null;
         try {
-            // debuggee main class
-            mainClass = debuggee.classByName(DEBUGGEE_CLASS);
-
             suspendAtBP(mainClass, DEBUGGEE_STOPATLINE);
             objRef = findObjRef(thrRef, DEBUGGEE_NON_THROWABLE_VAR);
             throwableRef = findObjRef(thrRef, DEBUGGEE_THROWABLE_VAR);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002t.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002t.java
index e82b749c905..02d49f76de7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002t.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002t.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
@@ -39,6 +39,7 @@ public class stop002t {
     volatile boolean stopLooping2 = false;
     volatile static int testNumReady = 0;
     static final boolean vthreadMode = "Virtual".equals(System.getProperty("test.thread.factory"));
+    static Thread testThread = null;
 
     public static void main(String args[]) {
         System.exit(run(args) + Consts.JCK_STATUS_BASE);
@@ -54,7 +55,8 @@ private int runIt(String args[]) {
         log = argHandler.createDebugeeLog();
         pipe = argHandler.createDebugeeIOPipe();
 
-        Thread.currentThread().setName(stop002.DEBUGGEE_THRNAME);
+        testThread = Thread.currentThread();
+        testThread.setName(stop002.DEBUGGEE_THRNAME);
 
         // non-throwable object which will be used by debugger
         // as wrong parameter of JDI method ThreadReference.stop()
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java
index b90f926e898..762acc0a556 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/setDefaultStratum/setDefaultStratum003/setDefaultStratum003.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
@@ -75,7 +75,9 @@
 
 import java.io.*;
 import java.util.*;
+import com.sun.jdi.ReferenceType;
 import com.sun.jdi.request.*;
+import com.sun.jdi.ThreadReference;
 import nsk.share.Consts;
 import nsk.share.jdi.EventHandler;
 import nsk.share.jdi.sde.*;
@@ -150,8 +152,12 @@ public void doTest() {
         StepEventListener stepEventListener = new StepEventListener();
         eventHandler.addListener(stepEventListener);
 
+        ReferenceType debuggeeClass = debuggee.classByName(SDEDebuggee.class.getName());
+        ThreadReference mainThread =
+            debuggee.threadByFieldNameOrThrow(debuggeeClass, "mainThread",
+                                              SDEDebuggee.mainThreadName);
         StepRequest stepRequest = debuggee.getEventRequestManager().createStepRequest(
-                debuggee.threadByName(SDEDebuggee.mainThreadName),
+                mainThread,
                 StepRequest.STEP_LINE,
                 StepRequest.STEP_INTO);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 4f2bdd34137..500127d1ac4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -290,6 +290,24 @@ public ThreadReference mainThread() {
     /**
      * Return a debuggee thread by fetching it from a static field in the debuggee.
      */
+
+    public ThreadReference threadByFieldName(ReferenceType debuggeeClass,
+                                             String threadFieldName) {
+        return threadByFieldName(debuggeeClass, threadFieldName, threadFieldName);
+    }
+
+    public ThreadReference threadByFieldName(ReferenceType debuggeeClass,
+                                             String threadFieldName,
+                                             String threadName) {
+        try {
+            return threadByFieldNameOrThrow(debuggeeClass, threadFieldName, threadName);
+        } catch (JDITestRuntimeException e) {
+            log.display("** Unexpected exception trying to find thread \"" + threadName + "\"");
+            e.printStackTrace(log.getOutStream());
+            return null;
+        }
+    }
+
     public ThreadReference threadByFieldNameOrThrow(ReferenceType debuggeeClass,
                                                     String threadFieldName)
             throws JDITestRuntimeException {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/sde/SDEDebuggee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/sde/SDEDebuggee.java
index cafa9d810a8..a17e8e9043b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/sde/SDEDebuggee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/sde/SDEDebuggee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, 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
@@ -28,6 +28,7 @@
 
 public class SDEDebuggee extends AbstractJDIDebuggee {
     public static String mainThreadName = "SDEDebuggee_mainThread";
+    public static Thread mainThread = null;
 
     // command:class_name
     public static String COMMAND_EXECUTE_TEST_METHODS = "executeTestMethods";
@@ -42,7 +43,8 @@ protected String[] doInit(String[] args) {
         if (classpath == null)
             throw new TestBug("Debuggee requires '-testClassPath' parameter");
 
-        Thread.currentThread().setName(mainThreadName);
+        mainThread = Thread.currentThread();
+        mainThread.setName(mainThreadName);
 
         return args;
     }

From 76570c627db527f856f2394fb9ead02939eca621 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 16 May 2025 22:12:59 +0000
Subject: [PATCH 504/901] 8357149: Test
 runtime/cds/appcds/aotCode/AOTCodeFlags.java is broken after JDK-8354887

Reviewed-by: kvn, iklam
---
 .../jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index b639855843e..fd668497b49 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -78,6 +78,7 @@ public void setTestMode(int mode) {
 
         public List<String> getVMArgsForTestMode() {
             List<String> list = new ArrayList<String>();
+            list.add("-XX:+UnlockDiagnosticVMOptions");
             list.add(isAdapterCachingOn() ? "-XX:+AOTAdapterCaching" : "-XX:-AOTAdapterCaching");
             list.add(isStubCachingOn() ? "-XX:+AOTStubCaching" : "-XX:-AOTStubCaching");
             return list;
@@ -94,8 +95,7 @@ public String[] vmArgs(RunMode runMode) {
             case RunMode.ASSEMBLY:
             case RunMode.PRODUCTION: {
                     List<String> args = getVMArgsForTestMode();
-                    args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
-                                        "-Xlog:aot+codecache+init=debug",
+                    args.addAll(List.of("-Xlog:aot+codecache+init=debug",
                                         "-Xlog:aot+codecache+exit=debug"));
                     return args.toArray(new String[0]);
                 }

From 6c42856b8d5039c14ba04a48c60d09039d5030fe Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Sun, 18 May 2025 11:32:37 +0000
Subject: [PATCH 505/901] 8356778: Compiler add event logging in case of
 failures

Reviewed-by: lucy
---
 src/hotspot/share/c1/c1_Compilation.cpp       | 8 ++++++++
 src/hotspot/share/ci/ciEnv.cpp                | 9 +++++++++
 src/hotspot/share/compiler/compilationLog.cpp | 6 +++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp
index 53a97ce1042..cf1f7e50086 100644
--- a/src/hotspot/share/c1/c1_Compilation.cpp
+++ b/src/hotspot/share/c1/c1_Compilation.cpp
@@ -33,6 +33,7 @@
 #include "c1/c1_ValueStack.hpp"
 #include "code/debugInfoRec.hpp"
 #include "compiler/compilationFailureInfo.hpp"
+#include "compiler/compilationLog.hpp"
 #include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileLog.hpp"
 #include "compiler/compiler_globals.hpp"
@@ -646,6 +647,13 @@ void Compilation::notice_inlined_method(ciMethod* method) {
 
 void Compilation::bailout(const char* msg) {
   assert(msg != nullptr, "bailout message must exist");
+  // record the bailout for hserr envlog
+  if (CompilationLog::log() != nullptr) {
+    CompilerThread* thread = CompilerThread::current();
+    CompileTask* task = thread->task();
+    CompilationLog::log()->log_failure(thread, task, msg, nullptr);
+  }
+
   if (!bailed_out()) {
     // keep first bailout message
     if (PrintCompilation || PrintBailouts) tty->print_cr("compilation bailout: %s", msg);
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 3991773d86f..9f6a8d653aa 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1170,6 +1170,15 @@ int ciEnv::num_inlined_bytecodes() const {
 // ------------------------------------------------------------------
 // ciEnv::record_failure()
 void ciEnv::record_failure(const char* reason) {
+  // record the bailout for hserr envlog
+  if (reason != nullptr) {
+    if (CompilationLog::log() != nullptr) {
+      CompilerThread* thread = CompilerThread::current();
+      CompileTask* task = thread->task();
+      CompilationLog::log()->log_failure(thread, task, reason, nullptr);
+    }
+  }
+
   if (_failure_reason.get() == nullptr) {
     // Record the first failure reason.
     _failure_reason.set(reason);
diff --git a/src/hotspot/share/compiler/compilationLog.cpp b/src/hotspot/share/compiler/compilationLog.cpp
index f8dc24d3aaa..e9592415f3d 100644
--- a/src/hotspot/share/compiler/compilationLog.cpp
+++ b/src/hotspot/share/compiler/compilationLog.cpp
@@ -51,7 +51,11 @@ void CompilationLog::log_nmethod(JavaThread* thread, nmethod* nm) {
 
 void CompilationLog::log_failure(JavaThread* thread, CompileTask* task, const char* reason, const char* retry_message) {
   StringLogMessage lm;
-  lm.print("%4d   COMPILE SKIPPED: %s", task->compile_id(), reason);
+  if (task == nullptr) {
+    lm.print("Id not known, task was 0;  COMPILE SKIPPED: %s", reason);
+  } else {
+    lm.print("%4d   COMPILE SKIPPED: %s", task->compile_id(), reason);
+  }
   if (retry_message != nullptr) {
     lm.append(" (%s)", retry_message);
   }

From 9927ec0b91775db342b2bbc1937253325c367a19 Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Sun, 18 May 2025 23:28:01 +0000
Subject: [PATCH 506/901] 8356328: Some C2 IR nodes miss size_of() function

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/intrinsicnode.hpp | 11 ++++++++---
 src/hotspot/share/opto/machnode.hpp      | 14 +++++++++-----
 src/hotspot/share/opto/memnode.hpp       |  5 +++++
 src/hotspot/share/opto/opaquenode.hpp    |  2 ++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp
index bfb200b5e96..3c204f88bc6 100644
--- a/src/hotspot/share/opto/intrinsicnode.hpp
+++ b/src/hotspot/share/opto/intrinsicnode.hpp
@@ -184,12 +184,12 @@ class VectorizedHashCodeNode: public Node {
 //------------------------------EncodeISOArray--------------------------------
 // encode char[] to byte[] in ISO_8859_1 or ASCII
 class EncodeISOArrayNode: public Node {
-  bool ascii;
+  bool _ascii;
  public:
   EncodeISOArrayNode(Node* control, Node* arymem, Node* s1, Node* s2, Node* c, bool ascii)
-    : Node(control, arymem, s1, s2, c), ascii(ascii) {}
+    : Node(control, arymem, s1, s2, c), _ascii(ascii) {}
 
-  bool is_ascii() { return ascii; }
+  bool is_ascii() { return _ascii; }
   virtual int Opcode() const;
   virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
@@ -198,6 +198,11 @@ class EncodeISOArrayNode: public Node {
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
+  virtual uint size_of() const { return sizeof(EncodeISOArrayNode); }
+  virtual uint hash() const { return Node::hash() + _ascii; }
+  virtual bool cmp(const Node& n) const {
+    return Node::cmp(n) && _ascii == ((EncodeISOArrayNode&)n).is_ascii();
+  }
 };
 
 //-------------------------------DigitNode----------------------------------------
diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp
index ac60e7b7312..5fd262d54e1 100644
--- a/src/hotspot/share/opto/machnode.hpp
+++ b/src/hotspot/share/opto/machnode.hpp
@@ -499,6 +499,7 @@ class MachConstantNode : public MachTypeNode {
   int  constant_offset() const { return ((MachConstantNode*) this)->constant_offset(); }
   // Unchecked version to avoid assertions in debug output.
   int  constant_offset_unchecked() const;
+  virtual uint size_of() const { return sizeof(MachConstantNode); }
 };
 
 //------------------------------MachUEPNode-----------------------------------
@@ -533,17 +534,15 @@ class MachPrologNode : public MachIdealNode {
 //------------------------------MachEpilogNode--------------------------------
 // Machine function Epilog Node
 class MachEpilogNode : public MachIdealNode {
+private:
+  bool _do_polling;
 public:
   MachEpilogNode(bool do_poll = false) : _do_polling(do_poll) {}
   virtual void emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const;
   virtual uint size(PhaseRegAlloc *ra_) const;
   virtual int reloc() const;
   virtual const Pipeline *pipeline() const;
-
-private:
-  bool _do_polling;
-
-public:
+  virtual uint size_of() const { return sizeof(MachEpilogNode); }
   bool do_polling() const { return _do_polling; }
 
 #ifndef PRODUCT
@@ -567,6 +566,7 @@ class MachNopNode : public MachIdealNode {
 
   virtual int ideal_Opcode() const { return Op_Con; } // bogus; see output.cpp
   virtual const Pipeline *pipeline() const;
+  virtual uint size_of() const { return sizeof(MachNopNode); }
 #ifndef PRODUCT
   virtual const char *Name() const { return "Nop"; }
   virtual void format( PhaseRegAlloc *, outputStream *st ) const;
@@ -794,6 +794,7 @@ class MachJumpNode : public MachConstantNode {
   MachJumpNode() : MachConstantNode() {
     init_class_id(Class_MachJump);
   }
+  virtual uint size_of() const { return sizeof(MachJumpNode); }
 };
 
 //------------------------------MachGotoNode-----------------------------------
@@ -892,6 +893,7 @@ class MachSafePointNode : public MachReturnNode {
     assert(verify_jvms(jvms), "jvms must match");
     set_req(_jvmadj + jvms->monoff() + idx, c);
   }
+  virtual uint size_of() const { return sizeof(MachSafePointNode); }
 };
 
 //------------------------------MachCallNode----------------------------------
@@ -1006,6 +1008,7 @@ class MachCallDynamicJavaNode : public MachCallJavaNode {
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
+  virtual uint size_of() const { return sizeof(MachCallDynamicJavaNode); }
 };
 
 //------------------------------MachCallRuntimeNode----------------------------
@@ -1039,6 +1042,7 @@ class MachHaltNode : public MachReturnNode {
   bool _reachable;
   const char* _halt_reason;
   virtual JVMState* jvms() const;
+  virtual uint size_of() const { return sizeof(MachHaltNode); }
   bool is_reachable() const {
     return _reachable;
   }
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index a751022f752..810a9fe9445 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -1089,6 +1089,11 @@ class ClearArrayNode: public Node {
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual uint match_edge(uint idx) const;
   bool is_large() const { return _is_large; }
+  virtual uint size_of() const { return sizeof(ClearArrayNode); }
+  virtual uint hash() const { return Node::hash() + _is_large; }
+  virtual bool cmp(const Node& n) const {
+    return Node::cmp(n) && _is_large == ((ClearArrayNode&)n).is_large();
+  }
 
   // Clear the given area of an object or array.
   // The start offset must always be aligned mod BytesPerInt.
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index d3cbbcfafbe..9edfe2a7258 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -124,6 +124,7 @@ class OpaqueMultiversioningNode : public Opaque1Node {
 
   void mark_useless(PhaseIterGVN& igvn);
   NOT_PRODUCT(virtual void dump_spec(outputStream* st) const;)
+  virtual uint size_of() const { return sizeof(OpaqueMultiversioningNode); }
 };
 
 // This node is used in the context of intrinsics. We sometimes implicitly know that an object is non-null even though
@@ -267,6 +268,7 @@ class ProfileBooleanNode : public Node {
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type *bottom_type() const { return TypeInt::BOOL; }
+  virtual uint size_of() const { return sizeof(ProfileBooleanNode); }
 };
 
 #endif // SHARE_OPTO_OPAQUENODE_HPP

From 969708bd8f0de49f641eab3881cb15712aa34f1e Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 19 May 2025 05:17:05 +0000
Subject: [PATCH 507/901] 8356157: Remove retry loop in collect of SerialHeap
 and ParallelScavengeHeap

Reviewed-by: tschatzl, zgu
---
 .../gc/parallel/parallelScavengeHeap.cpp      | 17 ++------------
 src/hotspot/share/gc/serial/serialHeap.cpp    | 23 ++++---------------
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 0e63d760f48..713c738c4f8 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -502,21 +502,8 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
     full_gc_count = total_full_collections();
   }
 
-  while (true) {
-    VM_ParallelGCCollect op(gc_count, full_gc_count, cause);
-    VMThread::execute(&op);
-
-    if (!GCCause::is_explicit_full_gc(cause)) {
-      return;
-    }
-
-    {
-      MutexLocker ml(Heap_lock);
-      if (full_gc_count != total_full_collections()) {
-        return;
-      }
-    }
-  }
+  VM_ParallelGCCollect op(gc_count, full_gc_count, cause);
+  VMThread::execute(&op);
 }
 
 bool ParallelScavengeHeap::must_clear_all_soft_refs() {
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 8d922692e59..fdc710af02f 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -607,24 +607,11 @@ void SerialHeap::collect(GCCause::Cause cause) {
   bool should_run_young_gc =  (cause == GCCause::_wb_young_gc)
                 DEBUG_ONLY(|| (cause == GCCause::_scavenge_alot));
 
-  while (true) {
-    VM_SerialGCCollect op(!should_run_young_gc,
-                          gc_count_before,
-                          full_gc_count_before,
-                          cause);
-    VMThread::execute(&op);
-    if (!GCCause::is_explicit_full_gc(cause)) {
-      return;
-    }
-
-    {
-      MutexLocker ml(Heap_lock);
-      // Read the GC count while holding the Heap_lock
-      if (full_gc_count_before != total_full_collections()) {
-        return;
-      }
-    }
-  }
+  VM_SerialGCCollect op(!should_run_young_gc,
+                        gc_count_before,
+                        full_gc_count_before,
+                        cause);
+  VMThread::execute(&op);
 }
 
 void SerialHeap::do_full_collection(bool clear_all_soft_refs) {

From 77a3e04ffc27554c14e3d45ba16ad0ee8f3c1eb1 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 19 May 2025 07:29:25 +0000
Subject: [PATCH 508/901] 8357016: Candidate main methods not computed properly

Reviewed-by: jpai, vromero
---
 .../jdk/internal/misc/MethodFinder.java       | 17 ++--
 .../classes/sun/launcher/LauncherHelper.java  |  3 +
 .../launcher/resources/launcher.properties    |  5 +-
 .../tools/javac/launcher/SourceLauncher.java  |  6 +-
 .../tools/javac/resources/launcher.properties |  8 +-
 test/jdk/tools/launcher/Arrrghs.java          | 50 ++++++++++-
 test/jdk/tools/launcher/TestHelper.java       | 22 +++--
 .../javac/launcher/SourceLauncherTest.java    | 82 ++++++++++++++++++-
 8 files changed, 167 insertions(+), 26 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java b/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java
index af98e364a77..60895b8115a 100644
--- a/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java
+++ b/src/java.base/share/classes/jdk/internal/misc/MethodFinder.java
@@ -51,7 +51,6 @@ private MethodFinder() {
      * <li>have a single argument of type {@code String[]}, {@code String...} or no argument</li>
      * <li>have the return type of void</li>
      * <li>be public, protected or package private</li>
-     * <li>not be abstract</li>
      *</ul>
      *
      * The method returned would be used by a launcher to initiate the execution of an
@@ -89,23 +88,21 @@ public static Method findMainMethod(Class<?> cls) {
             mainMethod = JLA.findMethod(cls, false, "main", String[].class);
         }
 
-        if (mainMethod == null) {
+        if (mainMethod == null || !isValidMainMethod(mainMethod)) {
             mainMethod = JLA.findMethod(cls, false, "main");
         }
 
-        if (mainMethod == null) {
+        if (mainMethod == null || !isValidMainMethod(mainMethod)) {
             return null;
         }
 
-        int mods = mainMethod.getModifiers();
+        return mainMethod;
+    }
 
-        if (Modifier.isAbstract(mods) ||
-                mainMethod.getReturnType() != void.class ||
-                Modifier.isPrivate(mods)) {
-            return null;
-        }
+    private static boolean isValidMainMethod(Method mainMethodCandidate) {
+        return mainMethodCandidate.getReturnType() == void.class &&
+               !Modifier.isPrivate(mainMethodCandidate.getModifiers());
 
-        return mainMethod;
     }
 
 }
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index e31aca243b3..81a4fe32110 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -948,6 +948,9 @@ private static void validateMainMethod(Class<?> mainClass) {
 
         if (!isStaticMain) {
             String className = mainMethod.getDeclaringClass().getName();
+            if (Modifier.isAbstract(mainClass.getModifiers())) {
+                abort(null, "java.launcher.cls.error8", className);
+            }
             if (mainClass.isMemberClass() && !Modifier.isStatic(mainClass.getModifiers())) {
                 abort(null, "java.launcher.cls.error7", className);
             }
diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
index 5ed1ca2bfbc..83e08a3e11c 100644
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties
@@ -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
@@ -279,6 +279,9 @@ java.launcher.cls.error6=\
 java.launcher.cls.error7=\
     Error: non-static inner class {0} constructor can not be invoked \n\
     make inner class static or move inner class out to separate source file
+java.launcher.cls.error8=\
+    Error: abstract class {0} can not be instantiated\n\
+    please use a concrete class
 java.launcher.jar.error1=\
     Error: An unexpected error occurred while trying to open file {0}
 java.launcher.jar.error2=manifest not found in {0}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
index fe972f267df..ffb47504f24 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.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
@@ -227,6 +227,10 @@ private Class<?> execute(MemoryContext context, String[] mainArgs)
         Object instance = null;
 
         if (!isStatic) {
+            if (Modifier.isAbstract(mainClass.getModifiers())) {
+                throw new Fault(Errors.CantInstantiate(mainClassName));
+            }
+
             Constructor<?> constructor;
             try {
                 constructor = mainClass.getDeclaredConstructor();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
index dddad794427..122e5dca80d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher.properties
@@ -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
@@ -110,7 +110,11 @@ launcher.err.cant.find.class=\
 
 # 0: string
 launcher.err.cant.find.main.method=\
-    can''t find main(String[]) method in class: {0}
+    can''t find main(String[]) or main() method in class: {0}
+
+# 0: string
+launcher.err.cant.instantiate=\
+    abstract class: {0} can not be instantiated
 
 # 0: string
 launcher.err.cant.access.main.method=\
diff --git a/test/jdk/tools/launcher/Arrrghs.java b/test/jdk/tools/launcher/Arrrghs.java
index d922ce7eafc..fe1539ff5a9 100644
--- a/test/jdk/tools/launcher/Arrrghs.java
+++ b/test/jdk/tools/launcher/Arrrghs.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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -601,6 +601,54 @@ void testMainMethod() throws FileNotFoundException {
         tr.checkPositive();
         if (!tr.testStatus)
             System.out.println(tr);
+
+        //private method with parameter, usable method without parameter:
+        createJar(new File("some.jar"), new File("Foo"),
+            "private static void main(String[] args){}",
+            "void main() {System.out.println(\"THE_CHOSEN_ONE\");}");
+        tr = doExec(javaCmd, "-jar", "some.jar");
+        tr.contains("THE_CHOSEN_ONE");
+        if (!tr.testStatus)
+            System.out.println(tr);
+
+        createJar(new File("some.jar"), new File("Foo"),
+            "private void main(String[] args){}",
+            "void main() {System.out.println(\"THE_CHOSEN_ONE\");}");
+        tr = doExec(javaCmd, "-jar", "some.jar");
+        tr.contains("THE_CHOSEN_ONE");
+        if (!tr.testStatus)
+            System.out.println(tr);
+
+        //method with a wrong return type with parameter, usable method without parameter:
+        createJar(new File("some.jar"), new File("Foo"),
+            "public static int main(String[] args){ return -1; }",
+            "void main() {System.out.println(\"THE_CHOSEN_ONE\");}");
+        tr = doExec(javaCmd, "-jar", "some.jar");
+        tr.contains("THE_CHOSEN_ONE");
+        if (!tr.testStatus)
+            System.out.println(tr);
+
+        createJar(new File("some.jar"), new File("Foo"),
+            "public int main(String[] args){ return -1; }",
+            "void main() {System.out.println(\"THE_CHOSEN_ONE\");}");
+        tr = doExec(javaCmd, "-jar", "some.jar");
+        tr.contains("THE_CHOSEN_ONE");
+        if (!tr.testStatus)
+            System.out.println(tr);
+
+        // instance method abstract class:
+        createJarForSource(null, new File("some.jar"), new File("Foo"),
+                """
+                public abstract class Foo {
+                    void main() {
+                        System.out.println("Cannot be called.");
+                    }
+                }
+                """);
+        tr = doExec(javaCmd, "-jar", "some.jar");
+        tr.contains("Error: abstract class Foo can not be instantiated");
+        if (!tr.testStatus)
+            System.out.println(tr);
     }
     /*
      * tests 6968053, ie. we turn on the -Xdiag (for now) flag and check if
diff --git a/test/jdk/tools/launcher/TestHelper.java b/test/jdk/tools/launcher/TestHelper.java
index d5e5f47499b..0dcd6de2a5e 100644
--- a/test/jdk/tools/launcher/TestHelper.java
+++ b/test/jdk/tools/launcher/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, 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
@@ -52,6 +52,7 @@
 import java.util.Map;
 import java.util.Arrays;
 import java.util.spi.ToolProvider;
+import java.util.stream.Collectors;
 
 import static java.nio.file.StandardCopyOption.*;
 import static java.nio.file.StandardOpenOption.*;
@@ -64,6 +65,7 @@ public class TestHelper {
     static final File TEST_CLASSES_DIR;
     static final File TEST_SOURCES_DIR;
 
+    static final String NL = System.getProperty("line.separator");
     static final String JAVAHOME = System.getProperty("java.home");
     static final String JAVA_BIN;
     static final String JAVA_LIB;
@@ -287,17 +289,21 @@ static void compile(String... compilerArgs) {
      */
     static void createJar(String mEntry, File jarName, File mainClass,
             String... mainDefs) throws FileNotFoundException {
+        String source =
+                Arrays.stream(mainDefs != null ? mainDefs : new String[0])
+                      .collect(Collectors.joining(NL,
+                                                  "public class Foo {" + NL,
+                                                  "}" + NL));
+        createJarForSource(mEntry, jarName, mainClass, source);
+    }
+
+    static void createJarForSource(String mEntry, File jarName, File mainClass,
+            String source) throws FileNotFoundException {
         if (jarName.exists()) {
             jarName.delete();
         }
         try (PrintStream ps = new PrintStream(new FileOutputStream(mainClass + ".java"))) {
-            ps.println("public class Foo {");
-            if (mainDefs != null) {
-                for (String x : mainDefs) {
-                    ps.println(x);
-                }
-            }
-            ps.println("}");
+            ps.println(source);
         }
 
         String compileArgs[] = {
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index c81a3f1393f..017abb74456 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -601,7 +601,7 @@ public void testEnablePreviewNoSource(Path base) throws IOException {
     public void testNoMain(Path base) throws IOException {
         tb.writeJavaFiles(base, "class NoMain { }");
         testError(base.resolve("NoMain.java"), "",
-                "error: can't find main(String[]) method in class: NoMain");
+                "error: can't find main(String[]) or main() method in class: NoMain");
     }
 
     @Test
@@ -609,7 +609,7 @@ public void testMainBadParams(Path base) throws IOException {
         tb.writeJavaFiles(base,
                 "class BadParams { public static void main(int n) { } }");
         testError(base.resolve("BadParams.java"), "",
-                "error: can't find main(String[]) method in class: BadParams");
+                "error: can't find main(String[]) or main() method in class: BadParams");
     }
 
     @Test
@@ -617,7 +617,7 @@ public void testMainNotVoid(Path base) throws IOException {
         tb.writeJavaFiles(base,
                 "class NotVoid { public static int main(String... args) { return 0; } }");
         testError(base.resolve("NotVoid.java"), "",
-                "error: can't find main(String[]) method in class: NotVoid");
+                "error: can't find main(String[]) or main() method in class: NotVoid");
     }
 
     @Test
@@ -774,6 +774,82 @@ private static void markModuleAsIncubator(Path moduleInfoFile) throws Exception
             }
         }
 
+    @Test
+    public void testAbstractClassInstanceMain(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                          """
+                          public abstract class AbstractMain {
+                              void main(String[] args) {}
+                          }
+                          """);
+        testError(base.resolve("AbstractMain.java"), "",
+                "error: abstract class: AbstractMain can not be instantiated");
+    }
+
+    @Test
+    public void testWrongMainPrivate(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                          """
+                          public class WrongMainPrivate {
+                              private static void main(String[] args) {}
+                              void main() {
+                                  System.out.println("correct");
+                              }
+                          }
+                          """);
+        testSuccess(base.resolve("WrongMainPrivate.java"),
+                    "correct\n");
+    }
+
+    @Test
+    public void testWrongMainPrivateInstance(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                          """
+                          public class WrongMainPrivate {
+                              private void main(String[] args) {}
+                              void main() {
+                                  System.out.println("correct");
+                              }
+                          }
+                          """);
+        testSuccess(base.resolve("WrongMainPrivate.java"),
+                    "correct\n");
+    }
+
+    @Test
+    public void testWrongMainReturnType(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                          """
+                          public class WrongMainReturnType {
+                              public static int main(String[] args) {
+                                  return -1;
+                              }
+                              void main() {
+                                  System.out.println("correct");
+                              }
+                          }
+                          """);
+        testSuccess(base.resolve("WrongMainReturnType.java"),
+                    "correct\n");
+    }
+
+    @Test
+    public void testWrongMainReturnTypeInstance(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+                          """
+                          public class WrongMainReturnType {
+                              public int main(String[] args) {
+                                  return -1;
+                              }
+                              void main() {
+                                  System.out.println("correct");
+                              }
+                          }
+                          """);
+        testSuccess(base.resolve("WrongMainReturnType.java"),
+                    "correct\n");
+    }
+
     Result run(Path file, List<String> runtimeArgs, List<String> appArgs) {
         List<String> args = new ArrayList<>();
         args.add(file.toString());

From 50a7c61d28b9885ff48f4fcd8bfd460b507bbcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Mon, 19 May 2025 07:39:42 +0000
Subject: [PATCH 509/901] 8355970: C2: Add command line option to print the
 compile phases

Reviewed-by: chagedorn, kvn, mchevalier
---
 .../share/compiler/compilerDirectives.hpp     |  5 +--
 src/hotspot/share/compiler/compilerOracle.hpp |  3 +-
 src/hotspot/share/opto/c2_globals.hpp         |  9 +++++
 src/hotspot/share/opto/compile.cpp            | 35 +++++++++++--------
 src/hotspot/share/opto/compile.hpp            |  9 +++--
 5 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp
index 27c71b1723c..27aafe06919 100644
--- a/src/hotspot/share/compiler/compilerDirectives.hpp
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp
@@ -83,7 +83,8 @@ NOT_PRODUCT(cflags(PrintIdeal,          bool, PrintIdeal, PrintIdeal)) \
     cflags(TraceSpilling,           bool, TraceSpilling, TraceSpilling) \
     cflags(Vectorize,               bool, false, Vectorize) \
     cflags(CloneMapDebug,           bool, false, CloneMapDebug) \
-NOT_PRODUCT(cflags(IGVPrintLevel,       intx, PrintIdealGraphLevel, IGVPrintLevel)) \
+NOT_PRODUCT(cflags(PhasePrintLevel, intx, PrintPhaseLevel, PhasePrintLevel)) \
+NOT_PRODUCT(cflags(IGVPrintLevel,   intx, PrintIdealGraphLevel, IGVPrintLevel)) \
     cflags(IncrementalInlineForceCleanup, bool, IncrementalInlineForceCleanup, IncrementalInlineForceCleanup) \
     cflags(MaxNodeLimit,            intx, MaxNodeLimit, MaxNodeLimit)
 #define compilerdirectives_c2_string_flags(cflags) \
@@ -202,7 +203,7 @@ void set_##name(void* value) {                                      \
   void set_ideal_phase_name_set(const BitMap& set) {
     _ideal_phase_name_set.set_from(set);
   };
-  bool should_print_phase(const CompilerPhaseType cpt) const {
+  bool should_print_ideal_phase(const CompilerPhaseType cpt) const {
     return _ideal_phase_name_set.at(cpt);
   };
   void set_trace_auto_vectorization_tags(const CHeapBitMap& tags) {
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 943cd2c9734..09984705792 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.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
@@ -84,6 +84,7 @@ class methodHandle;
 NOT_PRODUCT(option(TraceEscapeAnalysis, "TraceEscapeAnalysis", Bool)) \
 NOT_PRODUCT(option(PrintIdeal, "PrintIdeal", Bool))  \
 NOT_PRODUCT(option(PrintIdealPhase, "PrintIdealPhase", Ccstrlist)) \
+NOT_PRODUCT(option(PhasePrintLevel, "PhasePrintLevel", Intx)) \
 NOT_PRODUCT(option(IGVPrintLevel, "IGVPrintLevel", Intx)) \
 NOT_PRODUCT(option(TraceAutoVectorization, "TraceAutoVectorization", Ccstrlist)) \
 NOT_PRODUCT(option(TraceMergeStores, "TraceMergeStores", Ccstrlist)) \
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 66c9ecd2e0b..5ee0c82f3ec 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -386,6 +386,15 @@
           "Limit of ops to make speculative when using CMOVE")              \
           range(0, max_jint)                                                \
                                                                             \
+  develop(intx, PrintPhaseLevel, 0,                                         \
+          "Level of detail of the phase trace print. "                      \
+          "System-wide value, -1=printing is disabled, "                    \
+          "0=print nothing except PhasePrintLevel directives, "             \
+          "6=all details printed. "                                         \
+          "Level of detail of printouts can be set on a per-method level "  \
+          "as well by using CompileCommand=PrintPhaseLevel.")                        \
+          range(-1, 6)                                                      \
+                                                                            \
   develop(bool, PrintIdealGraph, false,                                     \
           "Print ideal graph to XML file / network interface. "             \
           "By default attempts to connect to the visualizer on a socket.")  \
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index eb526fd01bd..a5023408cdf 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -33,6 +33,7 @@
 #include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileLog.hpp"
+#include "compiler/compilerDefinitions.hpp"
 #include "compiler/compilerOracle.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
@@ -576,6 +577,10 @@ void Compile::print_compile_messages() {
 }
 
 #ifndef PRODUCT
+void Compile::print_phase(const char* phase_name) {
+  tty->print_cr("%u.\t%s", ++_phase_counter, phase_name);
+}
+
 void Compile::print_ideal_ir(const char* phase_name) {
   // keep the following output all in one block
   // This output goes directly to the tty, not the compiler log.
@@ -1069,6 +1074,7 @@ void Compile::Init(bool aliasing) {
   set_decompile_count(0);
 
 #ifndef PRODUCT
+  _phase_counter = 0;
   Copy::zero_to_bytes(_igv_phase_iter, sizeof(_igv_phase_iter));
 #endif
 
@@ -5149,7 +5155,10 @@ void Compile::print_method(CompilerPhaseType cpt, int level, Node* n) {
   if (should_print_igv(level)) {
     _igv_printer->print_graph(name);
   }
-  if (should_print_phase(cpt)) {
+  if (should_print_phase(level)) {
+    print_phase(name);
+  }
+  if (should_print_ideal_phase(cpt)) {
     print_ideal_ir(CompilerPhaseTypeHelper::to_name(cpt));
   }
 #endif
@@ -5180,26 +5189,26 @@ void Compile::end_method() {
 #endif
 }
 
-bool Compile::should_print_phase(CompilerPhaseType cpt) {
 #ifndef PRODUCT
-  if (_directive->should_print_phase(cpt)) {
-    return true;
-  }
-#endif
-  return false;
+bool Compile::should_print_phase(const int level) const {
+  return PrintPhaseLevel > 0 && directive()->PhasePrintLevelOption >= level &&
+         _method != nullptr; // Do not print phases for stubs.
+}
+
+bool Compile::should_print_ideal_phase(CompilerPhaseType cpt) const {
+  return _directive->should_print_ideal_phase(cpt);
 }
 
-#ifndef PRODUCT
 void Compile::init_igv() {
   if (_igv_printer == nullptr) {
     _igv_printer = IdealGraphPrinter::printer();
     _igv_printer->set_compile(this);
   }
 }
-#endif
 
 bool Compile::should_print_igv(const int level) {
-#ifndef PRODUCT
+  PRODUCT_RETURN_(return false;);
+
   if (PrintIdealGraphLevel < 0) { // disabled by the user
     return false;
   }
@@ -5209,12 +5218,8 @@ bool Compile::should_print_igv(const int level) {
     Compile::init_igv();
   }
   return need;
-#else
-  return false;
-#endif
 }
 
-#ifndef PRODUCT
 IdealGraphPrinter* Compile::_debug_file_printer = nullptr;
 IdealGraphPrinter* Compile::_debug_network_printer = nullptr;
 
@@ -5303,7 +5308,7 @@ void Compile::igv_print_graph_to_network(const char* name, GrowableArray<const N
   tty->print_cr("Method printed over network stream to IGV");
   _debug_network_printer->print(name, C->root(), visible_nodes, fr);
 }
-#endif
+#endif // !PRODUCT
 
 Node* Compile::narrow_value(BasicType bt, Node* value, const Type* type, PhaseGVN* phase, bool transform_res) {
   if (type != nullptr && phase->type(value)->higher_equal(type)) {
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index f67d2839611..9b6d8db05b0 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -347,6 +347,7 @@ class Compile : public Phase {
   bool                  _print_inlining;        // True if we should print inlining for this compilation
   bool                  _print_intrinsics;      // True if we should print intrinsics for this compilation
 #ifndef PRODUCT
+  uint                  _phase_counter;         // Counter for the number of already printed phases
   uint                  _igv_idx;               // Counter for IGV node identifiers
   uint                  _igv_phase_iter[PHASE_NUM_TYPES]; // Counters for IGV phase iterations
   bool                  _trace_opto_output;
@@ -642,13 +643,14 @@ class Compile : public Phase {
   void          set_has_scoped_access(bool v)    { _has_scoped_access = v; }
 
   // check the CompilerOracle for special behaviours for this compile
-  bool          method_has_option(CompileCommandEnum option) {
+  bool          method_has_option(CompileCommandEnum option) const {
     return method() != nullptr && method()->has_option(option);
   }
 
 #ifndef PRODUCT
   uint          next_igv_idx()                  { return _igv_idx++; }
   bool          trace_opto_output() const       { return _trace_opto_output; }
+  void          print_phase(const char* phase_name);
   void          print_ideal_ir(const char* phase_name);
   bool          should_print_ideal() const      { return _directive->PrintIdealOption; }
   bool              parsed_irreducible_loop() const { return _parsed_irreducible_loop; }
@@ -666,12 +668,13 @@ class Compile : public Phase {
 
   void begin_method();
   void end_method();
-  bool should_print_igv(int level);
-  bool should_print_phase(CompilerPhaseType cpt);
 
   void print_method(CompilerPhaseType cpt, int level, Node* n = nullptr);
 
 #ifndef PRODUCT
+  bool should_print_igv(int level);
+  bool should_print_phase(int level) const;
+  bool should_print_ideal_phase(CompilerPhaseType cpt) const;
   void init_igv();
   void dump_igv(const char* graph_name, int level = 3) {
     if (should_print_igv(level)) {

From 67fb1ee7f11c840a28ace21d381c86353fd9b22b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 19 May 2025 08:04:44 +0000
Subject: [PATCH 510/901] 8356946: x86: Optimize interpreter profile updates

Reviewed-by: kvn, jsjolen
---
 src/hotspot/cpu/x86/interp_masm_x86.cpp | 43 +++++--------------------
 src/hotspot/cpu/x86/interp_masm_x86.hpp |  7 ++--
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index d982495d883..bc58b38d18b 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1254,46 +1254,19 @@ void InterpreterMacroAssembler::set_mdp_data_at(Register mdp_in,
 
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      int constant,
-                                                      bool decrement) {
-  // Counter address
-  Address data(mdp_in, constant);
-
-  increment_mdp_data_at(data, decrement);
-}
-
-void InterpreterMacroAssembler::increment_mdp_data_at(Address data,
-                                                      bool decrement) {
+                                                      int constant) {
   assert(ProfileInterpreter, "must be profiling interpreter");
-  // %%% this does 64bit counters at best it is wasting space
-  // at worst it is a rare bug when counters overflow
-
-  if (decrement) {
-    // Decrement the register.  Set condition codes.
-    addptr(data, -DataLayout::counter_increment);
-    // If the decrement causes the counter to overflow, stay negative
-    Label L;
-    jcc(Assembler::negative, L);
-    addptr(data, DataLayout::counter_increment);
-    bind(L);
-  } else {
-    assert(DataLayout::counter_increment == 1,
-           "flow-free idiom only works with 1");
-    // Increment the register.  Set carry flag.
-    addptr(data, DataLayout::counter_increment);
-    // If the increment causes the counter to overflow, pull back by 1.
-    sbbptr(data, 0);
-  }
+  Address data(mdp_in, constant);
+  addptr(data, DataLayout::counter_increment);
 }
 
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      Register reg,
-                                                      int constant,
-                                                      bool decrement) {
-  Address data(mdp_in, reg, Address::times_1, constant);
-
-  increment_mdp_data_at(data, decrement);
+                                                      Register index,
+                                                      int constant) {
+  assert(ProfileInterpreter, "must be profiling interpreter");
+  Address data(mdp_in, index, Address::times_1, constant);
+  addptr(data, DataLayout::counter_increment);
 }
 
 void InterpreterMacroAssembler::set_mdp_flag_at(Register mdp_in,
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 308d700ff4f..6ff3d17ca8b 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -212,11 +212,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void verify_method_data_pointer();
 
   void set_mdp_data_at(Register mdp_in, int constant, Register value);
-  void increment_mdp_data_at(Address data, bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, int constant,
-                             bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, Register reg, int constant,
-                             bool decrement = false);
+  void increment_mdp_data_at(Register mdp_in, int constant);
+  void increment_mdp_data_at(Register mdp_in, Register index, int constant);
   void increment_mask_and_jump(Address counter_addr, Address mask,
                                Register scratch, Label* where);
   void set_mdp_flag_at(Register mdp_in, int flag_constant);

From 2fb3329d71532a4c40dba2e2698572e4ab5ceb19 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Mon, 19 May 2025 08:08:09 +0000
Subject: [PATCH 511/901] 8356846: Remove unnecessary List.contains key from
 TIFFDirectory.removeTagSet

Reviewed-by: aivanov, serb
---
 .../classes/javax/imageio/plugins/tiff/TIFFDirectory.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java
index 2dc3e39e9ba..197b351feb7 100644
--- a/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java
+++ b/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.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
@@ -26,7 +26,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -268,9 +267,7 @@ public void removeTagSet(TIFFTagSet tagSet) {
             throw new NullPointerException("tagSet == null");
         }
 
-        if(tagSets.contains(tagSet)) {
-            tagSets.remove(tagSet);
-        }
+        tagSets.remove(tagSet);
     }
 
     /**

From effe40a24c29dc507eea5efef7b0736a33bc34a7 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Mon, 19 May 2025 09:08:33 +0000
Subject: [PATCH 512/901] 8351843: change
 test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java to a
 manual test

Reviewed-by: dfuchs
---
 test/jdk/TEST.groups                          |  1 +
 ...st.java => DocRootDirPermissionsTest.java} | 55 ++++++++++---------
 .../DocRootDirPermissionsWinTest.java         | 38 +++++++++++++
 3 files changed, 69 insertions(+), 25 deletions(-)
 rename test/jdk/com/sun/net/httpserver/simpleserver/{RootDirPermissionsTest.java => DocRootDirPermissionsTest.java} (87%)
 create mode 100644 test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 7c009f557ad..2912b335d36 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -625,6 +625,7 @@ jdk_core_manual_no_input = \
     java/util/Vector/Bug8148174.java \
     com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java \
     com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \
+    com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java \
     javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java 
 
 jdk_security_manual_no_input = \
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsTest.java
similarity index 87%
rename from test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
rename to test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsTest.java
index 16a5f619c4a..1bc4c11ef01 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/RootDirPermissionsTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsTest.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
@@ -24,10 +24,11 @@
 /*
  * @test
  * @summary Tests file permission checks during the creation of a `FileServerHandler`
+ * @requires (os.family != "windows")
  * @library /test/lib
  * @build jdk.test.lib.net.URIBuilder
- * @run main/othervm -ea RootDirPermissionsTest true
- * @run main/othervm -ea RootDirPermissionsTest false
+ * @run main/othervm -ea DocRootDirPermissionsTest true
+ * @run main/othervm -ea DocRootDirPermissionsTest false
  */
 
 import java.io.IOException;
@@ -73,24 +74,28 @@
  * 2)  reuses the test directory created in the previous run, revoking
  *     read access.
 * */
-public class RootDirPermissionsTest {
+public class DocRootDirPermissionsTest {
 
-    static final Path CWD = Path.of(".").toAbsolutePath().normalize();
-    static final Path TEST_DIR = CWD.resolve("RootDir");
-    static final InetSocketAddress LOOPBACK_ADDR =
+    private static final Path CWD = Path.of(".").toAbsolutePath().normalize();
+    private static final Path TEST_DIR = CWD.resolve("RootDir");
+    private static final InetSocketAddress LOOPBACK_ADDR =
             new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
-    static final boolean ENABLE_LOGGING = true;
-    static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
+    private static final boolean ENABLE_LOGGING = true;
+    private static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
 
-    static boolean readPermitted;
-    static String lastModifiedDir;
-    static String lastModifiedFile;
+    private static boolean readPermitted;
+    private static String lastModifiedDir;
+    private static String lastModifiedFile;
 
-    static Set<PosixFilePermission> posixPermissions;
-    static List<AclEntry> acls;
+    private static Set<PosixFilePermission> posixPermissions;
+    private static List<AclEntry> acls;
 
     public static void main(String[] args) throws Exception {
+        new DocRootDirPermissionsTest().run(args);
+    }
+
+    protected void run(String[] args) throws Exception{
         setupLogging();
         readPermitted = Boolean.parseBoolean(args[0]);
         if (readPermitted) {
@@ -107,7 +112,7 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    private static void revokePermissions() throws IOException {
+    private void revokePermissions() throws IOException {
         if (!Files.isReadable(TEST_DIR)) {
             // good nothing to do:
             System.out.println("File is already not readable: nothing to do");
@@ -164,7 +169,7 @@ private static void revokePermissions() throws IOException {
         System.out.println("File is readable: " + Files.isReadable(TEST_DIR));
     }
 
-    private static void restorePermissions() throws IOException {
+    private void restorePermissions() throws IOException {
         if (Files.getFileStore(TEST_DIR).supportsFileAttributeView("posix")) {
             if (posixPermissions != null) {
                 System.out.println("Restoring original POSIX permissions");
@@ -181,7 +186,7 @@ private static void restorePermissions() throws IOException {
         }
     }
 
-    private static void setupLogging() {
+    private void setupLogging() {
         if (ENABLE_LOGGING) {
             ConsoleHandler ch = new ConsoleHandler();
             LOGGER.setLevel(Level.ALL);
@@ -190,7 +195,7 @@ private static void setupLogging() {
         }
     }
 
-    private static void createTestDir() throws IOException {
+    private void createTestDir() throws IOException {
         if (Files.exists(TEST_DIR)) {
             FileUtils.deleteFileTreeWithRetry(TEST_DIR);
         }
@@ -200,7 +205,7 @@ private static void createTestDir() throws IOException {
         lastModifiedFile = getLastModified(file);
     }
 
-    private static void testDirectoryGET() throws Exception {
+    private void testDirectoryGET() throws Exception {
         var expectedBody = openHTML + """
                 <h1>Directory listing for &#x2F;</h1>
                 <ul>
@@ -225,7 +230,7 @@ private static void testDirectoryGET() throws Exception {
         }
     }
 
-    private static void testFileGET() throws Exception {
+    private void testFileGET() throws Exception {
         var expectedBody = "some text";
         var expectedLength = Integer.toString(expectedBody.getBytes(UTF_8).length);
         var server = SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.VERBOSE);
@@ -245,7 +250,7 @@ private static void testFileGET() throws Exception {
         }
     }
 
-    private static void testCreateHandler(){
+    private void testCreateHandler(){
         try {
             SimpleFileServer.createFileServer(LOOPBACK_ADDR, TEST_DIR, OutputLevel.NONE);
             throw new RuntimeException("Handler creation expected to fail");
@@ -257,7 +262,7 @@ private static void testCreateHandler(){
         } catch (IllegalArgumentException expected) { }
     }
 
-    static final String openHTML = """
+    private static final String openHTML = """
                 <!DOCTYPE html>
                 <html>
                 <head>
@@ -266,12 +271,12 @@ private static void testCreateHandler(){
                 <body>
                 """;
 
-    static final String closeHTML = """
+    private static final String closeHTML = """
                 </body>
                 </html>
                 """;
 
-    static URI uri(HttpServer server, String path) {
+    private URI uri(HttpServer server, String path) {
         return URIBuilder.newBuilder()
                 .host("localhost")
                 .port(server.getAddress().getPort())
@@ -280,7 +285,7 @@ static URI uri(HttpServer server, String path) {
                 .buildUnchecked();
     }
 
-    static String getLastModified(Path path) throws IOException {
+    private String getLastModified(Path path) throws IOException {
         return Files.getLastModifiedTime(path).toInstant().atZone(ZoneId.of("GMT"))
                 .format(DateTimeFormatter.RFC_1123_DATE_TIME);
     }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java
new file mode 100644
index 00000000000..401db2493b6
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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 Tests file permission checks during the creation of a `FileServerHandler`
+ * @requires (os.family == "windows")
+ * @library /test/lib
+ * @build jdk.test.lib.net.URIBuilder
+ * @run main/manual/othervm -ea DocRootDirPermissionsWinTest true
+ * @run main/manual/othervm -ea DocRootDirPermissionsWinTest false
+ */
+
+public class DocRootDirPermissionsWinTest extends DocRootDirPermissionsTest{
+    public static void main(String[] args) throws Exception {
+        new DocRootDirPermissionsWinTest().run(args);
+    }
+}
\ No newline at end of file

From 133c6fb4f34e9de3ffce92e10629c82f6723fcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 19 May 2025 10:04:32 +0000
Subject: [PATCH 513/901] 8355481: Clean up MHN_copyOutBootstrapArguments

Reviewed-by: dholmes, coleenp
---
 src/hotspot/share/prims/methodHandles.cpp | 52 +++--------------------
 1 file changed, 5 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index 1ab5d6ab7f7..16617250198 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -1236,6 +1236,9 @@ JVM_ENTRY(void, MHN_copyOutBootstrapArguments(JNIEnv* env, jobject igcls,
                                               jint start, jint end,
                                               jobjectArray buf_jh, jint pos,
                                               jboolean resolve, jobject ifna_jh)) {
+  // caller->constants->copy_bootstrap_arguments_at performs a runtime
+  // range check, but let's assert earlier as well.
+  assert(start < end && start >= 0, "invariant");
   Klass* caller_k = java_lang_Class::as_Klass(JNIHandles::resolve(caller_jh));
   if (caller_k == nullptr || !caller_k->is_instance_klass()) {
       THROW_MSG(vmSymbols::java_lang_InternalError(), "bad caller");
@@ -1256,54 +1259,9 @@ JVM_ENTRY(void, MHN_copyOutBootstrapArguments(JNIEnv* env, jobject igcls,
       != caller->constants()->bootstrap_argument_count_at(bss_index_in_pool)) {
       THROW_MSG(vmSymbols::java_lang_InternalError(), "bad index info (1)");
   }
-  objArrayHandle buf(THREAD, (objArrayOop) JNIHandles::resolve(buf_jh));
-  if (start < 0) {
-    for (int pseudo_index = -4; pseudo_index < 0; pseudo_index++) {
-      if (start == pseudo_index) {
-        if (start >= end || 0 > pos || pos >= buf->length())  break;
-        oop pseudo_arg = nullptr;
-        switch (pseudo_index) {
-        case -4:  // bootstrap method
-          {
-            int bsm_index = caller->constants()->bootstrap_method_ref_index_at(bss_index_in_pool);
-            pseudo_arg = caller->constants()->resolve_possibly_cached_constant_at(bsm_index, CHECK);
-            break;
-          }
-        case -3:  // name
-          {
-            Symbol* name = caller->constants()->name_ref_at(bss_index_in_pool, Bytecodes::_invokedynamic);
-            Handle str = java_lang_String::create_from_symbol(name, CHECK);
-            pseudo_arg = str();
-            break;
-          }
-        case -2:  // type
-          {
-            Symbol* type = caller->constants()->signature_ref_at(bss_index_in_pool, Bytecodes::_invokedynamic);
-            Handle th;
-            if (type->char_at(0) == JVM_SIGNATURE_FUNC) {
-              th = SystemDictionary::find_method_handle_type(type, caller, CHECK);
-            } else {
-              th = SystemDictionary::find_java_mirror_for_type(type, caller, SignatureStream::NCDFError, CHECK);
-            }
-            pseudo_arg = th();
-            break;
-          }
-        case -1:  // argument count
-          {
-            int argc = caller->constants()->bootstrap_argument_count_at(bss_index_in_pool);
-            jvalue argc_value; argc_value.i = (jint)argc;
-            pseudo_arg = java_lang_boxing_object::create(T_INT, &argc_value, CHECK);
-            break;
-          }
-        }
 
-        // Store the pseudo-argument, and advance the pointers.
-        buf->obj_at_put(pos++, pseudo_arg);
-        ++start;
-      }
-    }
-    // When we are done with this there may be regular arguments to process too.
-  }
+  objArrayHandle buf(THREAD, (objArrayOop)JNIHandles::resolve(buf_jh));
+
   Handle ifna(THREAD, JNIHandles::resolve(ifna_jh));
   caller->constants()->
     copy_bootstrap_arguments_at(bss_index_in_pool,

From 36c9be70e27eccdd2a156931fafa1f55dd3fb022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Mon, 19 May 2025 10:15:56 +0000
Subject: [PATCH 514/901] 8356974: tools/launcher/ToolsOpts.java fails if the
 build id contains "-J"

Reviewed-by: jpai, thartmann
---
 test/jdk/tools/launcher/ToolsOpts.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jdk/tools/launcher/ToolsOpts.java b/test/jdk/tools/launcher/ToolsOpts.java
index 858ba89775b..036e0f3643e 100644
--- a/test/jdk/tools/launcher/ToolsOpts.java
+++ b/test/jdk/tools/launcher/ToolsOpts.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
@@ -128,7 +128,8 @@ static void checkJoptionOutput(TestResult tr, String[] opts) throws IOException
         String jopts = "";
         for (String pat : opts) {
             jopts = jopts.concat(pat + " ");
-            if (tr.contains("-J")) {
+            if (tr.contains(" -J-")) {
+                System.err.println(tr);
                 throw new RuntimeException(
                         "failed: output should not contain option " + pat);
             }

From afcaf84022f165d66068c16460b7666f48e84773 Mon Sep 17 00:00:00 2001
From: Sorna Sarathi N <ssarathi@openjdk.org>
Date: Mon, 19 May 2025 10:17:13 +0000
Subject: [PATCH 515/901] 8357106: Add missing classpath exception copyright
 headers

Reviewed-by: jpai
---
 .../share/classes/jdk/internal/foreign/CaptureStateUtil.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
index a98db6173fd..2f3ba7d9e05 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/CaptureStateUtil.java
@@ -4,7 +4,9 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

From 7f7add1e56c4da18ce8fbbbf6e34e985c3054604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 19 May 2025 10:52:41 +0000
Subject: [PATCH 516/901] 8355608: Async UL should take the file lock of stream
 when outputting

Reviewed-by: aboldtch, iklam
---
 src/hotspot/share/logging/logFileStreamOutput.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/logging/logFileStreamOutput.cpp b/src/hotspot/share/logging/logFileStreamOutput.cpp
index 2464bc806c2..4ade1e100b4 100644
--- a/src/hotspot/share/logging/logFileStreamOutput.cpp
+++ b/src/hotspot/share/logging/logFileStreamOutput.cpp
@@ -168,6 +168,7 @@ int LogFileStreamOutput::write_internal(const LogDecorations& decorations, const
 }
 
 int LogFileStreamOutput::write_blocking(const LogDecorations& decorations, const char* msg) {
+  FileLocker flocker(_stream);
   int written = write_internal(decorations, msg);
   return flush() ? written : -1;
 }
@@ -177,10 +178,7 @@ int LogFileStreamOutput::write(const LogDecorations& decorations, const char* ms
     return 0;
   }
 
-  FileLocker flocker(_stream);
-  int written = write_internal(decorations, msg);
-
-  return flush() ? written : -1;
+  return write_blocking(decorations, msg);
 }
 
 int LogFileStreamOutput::write(LogMessageBuffer::Iterator msg_iterator) {

From 26cb016b750963a4622985399130024792691984 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 19 May 2025 11:06:03 +0000
Subject: [PATCH 517/901] 8350329: C2: Div looses dependency on condition that
 guarantees divisor not zero in counted loop after peeling

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/loopTransform.cpp      |  8 ++-
 .../TestPeeledLoopNoBackedgeFloatingDiv.java  | 58 +++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/controldependency/TestPeeledLoopNoBackedgeFloatingDiv.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index d4e5ff0bd0a..8ae1c6e6e92 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -829,9 +829,13 @@ void PhaseIdealLoop::do_peeling(IdealLoopTree *loop, Node_List &old_new) {
 
   // Step 5: Assertion Predicates initialization
   if (counted_loop) {
-    initialize_assertion_predicates_for_peeled_loop(new_head->as_CountedLoop(), head->as_CountedLoop(),
+    CountedLoopNode* cl = head->as_CountedLoop();
+    Node* init = cl->init_trip();
+    Node* init_ctrl = cl->skip_strip_mined()->in(LoopNode::EntryControl);
+    initialize_assertion_predicates_for_peeled_loop(new_head->as_CountedLoop(), cl,
                                                     first_node_index_in_post_loop_body, old_new);
- }
+    cast_incr_before_loop(init, init_ctrl, cl);
+  }
 
   // Now force out all loop-invariant dominating tests.  The optimizer
   // finds some, but we _know_ they are all useless.
diff --git a/test/hotspot/jtreg/compiler/controldependency/TestPeeledLoopNoBackedgeFloatingDiv.java b/test/hotspot/jtreg/compiler/controldependency/TestPeeledLoopNoBackedgeFloatingDiv.java
new file mode 100644
index 00000000000..389a9b528a6
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/controldependency/TestPeeledLoopNoBackedgeFloatingDiv.java
@@ -0,0 +1,58 @@
+/*
+ * 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 8350329
+ * @summary C2: Div looses dependency on condition that guarantees divisor not zero in counted loop after peeling
+ * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-UseLoopPredicate
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:StressSeed=31780379 TestPeeledLoopNoBackedgeFloatingDiv
+ * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:-UseLoopPredicate
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM TestPeeledLoopNoBackedgeFloatingDiv
+ * @run main/othervm TestPeeledLoopNoBackedgeFloatingDiv
+ */
+
+public class TestPeeledLoopNoBackedgeFloatingDiv {
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+            test1(1000, 0, false, false);
+        }
+        test1(1, 0, false, false);
+    }
+
+    private static int test1(int stop, int res, boolean alwaysTrueInPeeled, boolean alwaysFalse) {
+        stop = Integer.max(stop, 1);
+        for (int i = stop; i >= 1; i--) {
+            res = res / i;
+            if (alwaysFalse) {
+
+            }
+            if (alwaysTrueInPeeled) {
+                break;
+            }
+            alwaysTrueInPeeled = true;
+        }
+        return res;
+    }
+
+}

From 3acfa9e4e7be2f37ac55f97348aad4f74ba802a0 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Mon, 19 May 2025 11:28:54 +0000
Subject: [PATCH 518/901] 8356966:
 java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java fails on Linux
 after JDK-8350203

Reviewed-by: honkar, aivanov
---
 .../share/classes/sun/font/Type1GlyphMapper.java  | 11 +++++++++--
 .../DrawString/IgnoredWhitespaceTest.java         | 15 ++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java b/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
index 8715e300c7d..8325f7d0351 100644
--- a/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
+++ b/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
@@ -78,7 +78,7 @@ public boolean canDisplay(char ch) {
     }
 
     public int charToGlyph(char ch) {
-        if (FontUtilities.isDefaultIgnorable(ch)) {
+        if (FontUtilities.isDefaultIgnorable(ch) || isIgnorableWhitespace(ch)) {
             return INVISIBLE_GLYPH_ID;
         }
         try {
@@ -93,7 +93,7 @@ public int charToGlyph(int ch) {
         if (ch < 0 || ch > 0xffff) {
             return missingGlyph;
         } else {
-            if (FontUtilities.isDefaultIgnorable(ch)) {
+            if (FontUtilities.isDefaultIgnorable(ch) || isIgnorableWhitespace(ch)) {
                 return INVISIBLE_GLYPH_ID;
             }
             try {
@@ -105,6 +105,13 @@ public int charToGlyph(int ch) {
         }
     }
 
+    // Matches behavior in e.g. CMap.getControlCodeGlyph(int, boolean)
+    // and RasterPrinterJob.removeControlChars(String)
+    // and CCharToGlyphMapper.isIgnorableWhitespace(int)
+    private static boolean isIgnorableWhitespace(int code) {
+        return code == 0x0009 || code == 0x000a || code == 0x000d;
+    }
+
     public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
         /* The conversion into surrogates is misleading.
          * The Type1 glyph mapper only accepts 16 bit unsigned shorts.
diff --git a/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java b/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java
index e7c38f1c16e..973f89fc889 100644
--- a/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java
+++ b/test/jdk/java/awt/Graphics2D/DrawString/IgnoredWhitespaceTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8350203
+ * @bug 8350203 8356966
  * @summary Confirm that a few special whitespace characters are ignored.
  */
 
@@ -93,36 +93,37 @@ private static void test(BufferedImage image, Graphics2D g2d, Font font, String
         g2d.setColor(Color.BLACK);
         g2d.drawString(text, x, y);
         Rectangle actual = findTextBoundingBox(image);
-        assertEqual(expected, actual, text);
+        assertEqual(expected, actual, text, font);
 
         g2d.setColor(Color.WHITE);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(Color.BLACK);
         g2d.drawString(new AttributedString(text, Map.of(TextAttribute.FONT, font)).getIterator(), x, y);
         actual = findTextBoundingBox(image);
-        assertEqual(expected, actual, text);
+        assertEqual(expected, actual, text, font);
 
         g2d.setColor(Color.WHITE);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(Color.BLACK);
         g2d.drawChars(text.toCharArray(), 0, text.length(), x, y);
         actual = findTextBoundingBox(image);
-        assertEqual(expected, actual, text);
+        assertEqual(expected, actual, text, font);
 
         g2d.setColor(Color.WHITE);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(Color.BLACK);
         g2d.drawGlyphVector(font.createGlyphVector(frc, text), x, y);
         actual = findTextBoundingBox(image);
-        assertEqual(expected, actual, text);
+        assertEqual(expected, actual, text, font);
     }
 
-    private static void assertEqual(Rectangle r1, Rectangle r2, String text) {
+    private static void assertEqual(Rectangle r1, Rectangle r2, String text, Font font) {
         if (!r1.equals(r2)) {
             String escaped = text.replace("\r", "\\r")
                                  .replace("\n", "\\n")
                                  .replace("\t", "\\t");
-            String msg = String.format("for text '%s': %s != %s", escaped, r1.toString(), r2.toString());
+            String msg = String.format("for text '%s' with font %s: %s != %s",
+                escaped, font.toString(), r1.toString(), r2.toString());
             throw new RuntimeException(msg);
         }
     }

From 2e26b431585129b705f57955b660d155eaf138b8 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 19 May 2025 13:32:03 +0000
Subject: [PATCH 519/901] 8356875: RISC-V: extension flag UseZvfh should
 depends on UseZfh

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 28c32ed33c8..eca1bb83ab6 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -240,9 +240,15 @@ void VM_Version::common_initialize() {
   }
 
   // UseZvfh (depends on RVV)
-  if (UseZvfh && !UseRVV) {
-    warning("Cannot enable UseZvfh on cpu without RVV support.");
-    FLAG_SET_DEFAULT(UseZvfh, false);
+  if (UseZvfh) {
+    if (!UseRVV) {
+      warning("Cannot enable UseZvfh on cpu without RVV support.");
+      FLAG_SET_DEFAULT(UseZvfh, false);
+    }
+    if (!UseZfh) {
+      warning("Cannot enable UseZvfh on cpu without Zfh support.");
+      FLAG_SET_DEFAULT(UseZvfh, false);
+    }
   }
 }
 

From 92fd44992b9326fa10ec8303394dac17bb81b168 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 19 May 2025 13:32:17 +0000
Subject: [PATCH 520/901] 8350960: RISC-V: Add riscv backend for Float16
 operations - vectorization

Reviewed-by: fyang, dzhang, luhenry
---
 src/hotspot/cpu/riscv/riscv.ad                |   2 +-
 src/hotspot/cpu/riscv/riscv_v.ad              | 147 +++++++++++++++++-
 .../TestFloat16VectorOperations.java          |  22 +--
 3 files changed, 156 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 6ba5c79a955..3cc645c8fe6 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1933,8 +1933,8 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_MaxHF:
     case Op_MinHF:
     case Op_MulHF:
-    case Op_SubHF:
     case Op_SqrtHF:
+    case Op_SubHF:
       return UseZfh;
 
     case Op_CMoveF:
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index b6b8395dbb7..0687a025a6d 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -95,9 +95,6 @@ source %{
           return false;
         }
         break;
-      case Op_VectorCastHF2F:
-      case Op_VectorCastF2HF:
-        return UseZvfh;
       case Op_VectorLoadShuffle:
       case Op_VectorRearrange:
         // vlen >= 4 is required, because min vector size for byte is 4 on riscv,
@@ -113,6 +110,18 @@ source %{
         if (vlen < 4) {
           return false;
         }
+      case Op_VectorCastHF2F:
+      case Op_VectorCastF2HF:
+      case Op_AddVHF:
+      case Op_DivVHF:
+      case Op_MaxVHF:
+      case Op_MinVHF:
+      case Op_MulVHF:
+      case Op_SqrtVHF:
+      case Op_SubVHF:
+        return UseZvfh;
+      case Op_FmaVHF:
+        return UseZvfh && UseFMA;
       default:
         break;
     }
@@ -363,6 +372,21 @@ instruct vadd(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vadd_hfp(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVHF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vadd_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfadd_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vadd_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AddVF src1 src2));
   match(Set dst (AddVD src1 src2));
@@ -546,6 +570,20 @@ instruct vsub(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vsub_hfp(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVHF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vsub_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfsub_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vsub_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (SubVF src1 src2));
   match(Set dst (SubVD src1 src2));
@@ -1542,6 +1580,21 @@ instruct vnotL_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
 
 // vector float div
 
+instruct vdiv_hfp(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (DivVHF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vdiv_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfdiv_vv(as_VectorRegister($dst$$reg),
+                as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vdiv_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (DivVF src1 src2));
   match(Set dst (DivVD src1 src2));
@@ -1698,6 +1751,38 @@ instruct vminu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector float-point max/min (half precision)
+
+instruct vmax_hfp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
+  match(Set dst (MaxVHF src1 src2));
+  effect(TEMP_DEF dst, TEMP v0);
+  ins_cost(VEC_COST);
+  format %{ "vmax_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ minmax_fp_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   T_SHORT, false /* is_min */, Matcher::vector_length(this));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmin_hfp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
+  match(Set dst (MinVHF src1 src2));
+  effect(TEMP_DEF dst, TEMP v0);
+  ins_cost(VEC_COST);
+  format %{ "vmin_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ minmax_fp_v(as_VectorRegister($dst$$reg),
+                   as_VectorRegister($src1$$reg), as_VectorRegister($src2$$reg),
+                   T_SHORT, true /* is_min */, Matcher::vector_length(this));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector float-point max/min
 
 instruct vmax_fp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
@@ -1770,6 +1855,22 @@ instruct vmin_fp_masked(vReg dst_src1, vReg src2, vRegMask vmask, vReg tmp1, vRe
 
 // vector fmla
 
+// dst_src1 = src2 * src3 + dst_src1 (half precision)
+instruct vhfmla(vReg dst_src1, vReg src2, vReg src3) %{
+  match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
+  ins_cost(VEC_COST);
+  format %{ "vhfmla $dst_src1, $dst_src1, $src2, $src3" %}
+  ins_encode %{
+    assert(UseFMA, "Needs FMA instructions support.");
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfmacc_vv(as_VectorRegister($dst_src1$$reg),
+                 as_VectorRegister($src2$$reg), as_VectorRegister($src3$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // dst_src1 = src2 * src3 + dst_src1
 instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
@@ -2038,6 +2139,20 @@ instruct vmul(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vmul_hfp(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVHF src1 src2));
+  ins_cost(VEC_COST);
+  format %{ "vmul_hfp $dst, $src1, $src2" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfmul_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                as_VectorRegister($src2$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vmul_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (MulVF src1 src2));
   match(Set dst (MulVD src1 src2));
@@ -2971,6 +3086,19 @@ instruct replicateL_imm5(vReg dst, immL5 con) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct replicateHF(vReg dst, fRegF src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (Replicate src));
+  ins_cost(VEC_COST);
+  format %{ "replicateHF $dst, $src" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfmv_v_f(as_VectorRegister($dst$$reg), $src$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct replicateF(vReg dst, fRegF src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_FLOAT);
   match(Set dst (Replicate src));
@@ -4014,6 +4142,19 @@ instruct vrotate_left_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 // vector sqrt
 
+instruct vsqrt_hfp(vReg dst, vReg src) %{
+  match(Set dst (SqrtVHF src));
+  ins_cost(VEC_COST);
+  format %{ "vsqrt_hfp $dst, $src" %}
+  ins_encode %{
+    assert(UseZvfh, "must");
+    assert(Matcher::vector_element_basic_type(this) == T_SHORT, "must");
+    __ vsetvli_helper(T_SHORT, Matcher::vector_length(this));
+    __ vfsqrt_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vsqrt_fp(vReg dst, vReg src) %{
   match(Set dst (SqrtVF src));
   match(Set dst (SqrtVD src));
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
index d295c3618b9..b95e9749a54 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
@@ -78,7 +78,7 @@ public TestFloat16VectorOperations() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.ADD_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorAddFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(add(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -99,7 +99,7 @@ public void checkResultAdd() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.SUB_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorSubFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(subtract(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -120,7 +120,7 @@ public void checkResultSub() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.MUL_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorMulFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(multiply(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -141,7 +141,7 @@ public void checkResultMul() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.DIV_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorDivFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(divide(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -162,7 +162,7 @@ public void checkResultDiv() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.MIN_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorMinFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(min(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -183,7 +183,7 @@ public void checkResultMin() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.MAX_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorMaxFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(max(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -204,7 +204,7 @@ public void checkResultMax() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.SQRT_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorSqrtFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(sqrt(shortBitsToFloat16(input1[i])));
@@ -225,7 +225,7 @@ public void checkResultSqrt() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.FMA_VHF, ">= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorFmaFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(fma(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i]),
@@ -248,7 +248,7 @@ public void checkResultFma() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.FMA_VHF, " >= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorFmaFloat16ScalarMixedConstants() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(fma(shortBitsToFloat16(input1[i]), shortBitsToFloat16(SCALAR_FP16),
@@ -272,7 +272,7 @@ public void checkResultFmaScalarMixedConstants() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.FMA_VHF, " >= 1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorFmaFloat16MixedConstants() {
         short input3 = floatToFloat16(3.0f);
         for (int i = 0; i < LEN; ++i) {
@@ -295,7 +295,7 @@ public void checkResultFmaMixedConstants() {
     @Test
     @Warmup(10000)
     @IR(counts = {IRNode.FMA_VHF, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
     public void vectorFmaFloat16AllConstants() {
         short input1 = floatToFloat16(1.0f);
         short input2 = floatToFloat16(2.0f);

From 265d630125db448ba0cdc3ab7e938beb50e93ed0 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 19 May 2025 13:38:38 +0000
Subject: [PATCH 521/901] 8357187: JFR: User-defined defaults should be
 respected when an incorrect setting is set

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/EventControl.java        |  8 +++---
 .../jfr/internal/settings/CutoffSetting.java  | 12 +++++---
 .../jfr/internal/settings/PeriodSetting.java  | 20 ++++++++++---
 .../internal/settings/ThresholdSetting.java   | 10 +++++--
 .../internal/settings/ThrottleSetting.java    | 23 +++++++++++----
 .../classes/jdk/jfr/internal/util/Utils.java  | 28 +++++++++++++++++++
 6 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 19e2febf88e..50823951152 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -301,7 +301,7 @@ private static Control defineEnabled(PlatformEventType type) {
     private static Control defineThreshold(PlatformEventType type) {
         String def = type.getAnnotationValue(Threshold.class, ThresholdSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THRESHOLD, Threshold.NAME, def, Collections.emptyList()));
-        return new Control(new ThresholdSetting(type), def);
+        return new Control(new ThresholdSetting(type, def), def);
     }
 
     private static Control defineStackTrace(PlatformEventType type) {
@@ -313,13 +313,13 @@ private static Control defineStackTrace(PlatformEventType type) {
     private static Control defineCutoff(PlatformEventType type) {
         String def = type.getAnnotationValue(Cutoff.class, CutoffSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_CUTOFF, Cutoff.NAME, def, Collections.emptyList()));
-        return new Control(new CutoffSetting(type), def);
+        return new Control(new CutoffSetting(type, def), def);
     }
 
     private static Control defineThrottle(PlatformEventType type) {
         String def = type.getAnnotationValue(Throttle.class, ThrottleSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
-        return new Control(new ThrottleSetting(type), def);
+        return new Control(new ThrottleSetting(type, def), def);
     }
 
     private static Control defineLevel(PlatformEventType type) {
@@ -332,7 +332,7 @@ private static Control defineLevel(PlatformEventType type) {
     private static Control definePeriod(PlatformEventType type) {
         String def = type.getAnnotationValue(Period.class, PeriodSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_PERIOD, PeriodSetting.NAME, def, Collections.emptyList()));
-        return new Control(new PeriodSetting(type), def);
+        return new Control(new PeriodSetting(type, def), def);
     }
 
     void disable() {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
index 2f7d9f8e872..1ba245babcc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
@@ -39,6 +39,7 @@
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.ValueParser;
+import jdk.jfr.internal.util.Utils;
 
 @MetadataDefinition
 @Label("Cutoff")
@@ -47,11 +48,14 @@
 @Timespan
 public final class CutoffSetting extends SettingControl {
     public static final String DEFAULT_VALUE = ValueParser.INFINITY;
-    private String value = DEFAULT_VALUE;
     private final PlatformEventType eventType;
+    private final String defaultValue;
+    private String value;
 
-    public CutoffSetting(PlatformEventType eventType) {
-       this.eventType = Objects.requireNonNull(eventType);
+    public CutoffSetting(PlatformEventType eventType, String defaultValue) {
+        this.eventType = Objects.requireNonNull(eventType);
+        this.defaultValue = Utils.validTimespanInfinity(eventType, "Cutoff", defaultValue, DEFAULT_VALUE);
+        this.value = defaultValue;
     }
 
     @Override
@@ -65,7 +69,7 @@ public String combine(Set<String> values) {
                 max = nanos;
             }
         }
-        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
+        return Objects.requireNonNullElse(text, defaultValue);
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
index 902584a8819..33d79222617 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
@@ -36,6 +36,8 @@
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.ValueParser;
+import jdk.jfr.internal.util.Utils;
+
 import static jdk.jfr.internal.util.ValueParser.MISSING;
 
 @MetadataDefinition
@@ -44,17 +46,27 @@
 @Name(Type.SETTINGS_PREFIX + "Period")
 public final class PeriodSetting extends SettingControl {
     private static final long typeId = Type.getTypeId(PeriodSetting.class);
-
     public static final String EVERY_CHUNK = "everyChunk";
     public static final String BEGIN_CHUNK = "beginChunk";
     public static final String END_CHUNK = "endChunk";
     public static final String DEFAULT_VALUE = EVERY_CHUNK;
     public static final String NAME = "period";
     private final PlatformEventType eventType;
-    private String value = EVERY_CHUNK;
+    private final String defaultValue;
+    private String value;
 
-    public PeriodSetting(PlatformEventType eventType) {
+    public PeriodSetting(PlatformEventType eventType, String defaultValue) {
         this.eventType = Objects.requireNonNull(eventType);
+        this.defaultValue = validPeriod(defaultValue);
+        this.value = defaultValue;
+    }
+
+    private String validPeriod(String userDefault) {
+        return switch (userDefault) {
+            case BEGIN_CHUNK -> BEGIN_CHUNK;
+            case END_CHUNK -> END_CHUNK;
+            default -> Utils.validTimespanInfinity(eventType, "Period", userDefault, DEFAULT_VALUE);
+        };
     }
 
     @Override
@@ -95,7 +107,7 @@ public String combine(Set<String> values) {
         if (!beginChunk && endChunk) {
             return END_CHUNK;
         }
-        return DEFAULT_VALUE; // "everyChunk" is default
+        return defaultValue;
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
index 83a55726707..348830938f4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
@@ -38,6 +38,7 @@
 import jdk.jfr.Timespan;
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
+import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.util.ValueParser;
 
 @MetadataDefinition
@@ -48,11 +49,14 @@
 public final class ThresholdSetting extends SettingControl {
     public static final String DEFAULT_VALUE = "0 ns";
     private static final long typeId = Type.getTypeId(ThresholdSetting.class);
-    private String value = DEFAULT_VALUE;
     private final PlatformEventType eventType;
+    private final String defaultValue;
+    private String value;
 
-    public ThresholdSetting(PlatformEventType eventType) {
+    public ThresholdSetting(PlatformEventType eventType, String defaultValue) {
        this.eventType = Objects.requireNonNull(eventType);
+       this.defaultValue = Utils.validTimespanInfinity(eventType, "Threshold", defaultValue, DEFAULT_VALUE);
+       this.value = defaultValue;
     }
 
     @Override
@@ -68,7 +72,7 @@ public String combine(Set<String> values) {
                 }
             }
         }
-        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
+        return Objects.requireNonNullElse(text, defaultValue);
     }
 
     @Override
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 ab08d2fea1d..800443cfaed 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
@@ -51,10 +51,24 @@
 public final class ThrottleSetting extends SettingControl {
     public static final String DEFAULT_VALUE = Throttle.DEFAULT;
     private final PlatformEventType eventType;
-    private String value = DEFAULT_VALUE;
+    private final String defaultValue;
+    private String value;
 
-    public ThrottleSetting(PlatformEventType eventType) {
-       this.eventType = Objects.requireNonNull(eventType);
+    public ThrottleSetting(PlatformEventType eventType, String defaultValue) {
+        this.eventType = Objects.requireNonNull(eventType);
+        this.defaultValue = validRate(defaultValue);
+        this.value = defaultValue;
+    }
+
+    private String validRate(String defaultValue) {
+        if (DEFAULT_VALUE.equals(defaultValue)) {
+            return DEFAULT_VALUE; // Fast path to avoid parsing
+        }
+        if (Rate.of(defaultValue) == null) {
+            Utils.warnInvalidAnnotation(eventType, "Throttle", defaultValue, DEFAULT_VALUE);
+            return DEFAULT_VALUE;
+        }
+        return defaultValue;
     }
 
     @Override
@@ -70,8 +84,7 @@ public String combine(Set<String> values) {
                 }
             }
         }
-        // "off" is default
-        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
+        return Objects.requireNonNullElse(text, defaultValue);
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index 777725f88d4..7de6617f806 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -55,6 +55,7 @@
 import jdk.jfr.internal.LogTag;
 import jdk.jfr.internal.Logger;
 import jdk.jfr.internal.MirrorEvent;
+import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.management.HiddenWait;
@@ -459,4 +460,31 @@ public static Path getPathInProperty(String prop, String subPath) {
         File file = subPath == null ? new File(path) : new File(path, subPath);
         return file.toPath().toAbsolutePath();
     }
+
+
+    public static String validTimespanInfinity(PlatformEventType type, String annotation, String userDefault, String systemDefault) {
+        if (systemDefault.equals(userDefault)) {
+            return systemDefault; // Fast path to avoid parsing
+        }
+        if (ValueParser.parseTimespanWithInfinity(userDefault, ValueParser.MISSING) != ValueParser.MISSING) {
+            return userDefault;
+        }
+        warnInvalidAnnotation(type, annotation, userDefault, systemDefault);
+        return systemDefault;
+    }
+
+    public static void warnInvalidAnnotation(PlatformEventType type, String annotation, String userDefault, String systemDefault) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Programming error. Event setting ");
+        sb.append("@").append(annotation).append("(\"").append(userDefault).append("\")");
+        sb.append(" is invalid on event ");
+        sb.append(type.getName());
+        sb.append(", using ");
+        sb.append("@").append(annotation).append("(\"").append(systemDefault).append("\")");
+        sb.append( " instead.");
+        if (type.isSystem()) {
+            throw new InternalError(sb.toString()); // Fail fast for JDK and JVM events
+        }
+        Logger.log(LogTag.JFR_SETTING, LogLevel.WARN, sb.toString());
+    }
 }

From fbc12be73217315d66792b6ad3faacab133bb9d5 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Mon, 19 May 2025 14:33:12 +0000
Subject: [PATCH 522/901] 8349151: Refactor
 test/java/security/cert/CertificateFactory/slowstream.sh to java test

Reviewed-by: weijun
---
 .../cert/CertificateFactory/SlowStream.java   | 85 ++++++++++++++-----
 .../cert/CertificateFactory/slowstream.sh     | 54 ------------
 2 files changed, 64 insertions(+), 75 deletions(-)
 delete mode 100644 test/jdk/java/security/cert/CertificateFactory/slowstream.sh

diff --git a/test/jdk/java/security/cert/CertificateFactory/SlowStream.java b/test/jdk/java/security/cert/CertificateFactory/SlowStream.java
index 5de34e21340..ad59c766211 100644
--- a/test/jdk/java/security/cert/CertificateFactory/SlowStream.java
+++ b/test/jdk/java/security/cert/CertificateFactory/SlowStream.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,31 +21,74 @@
  * questions.
  */
 
-import java.io.*;
-import java.security.cert.*;
+/*
+ * @test
+ * @bug 6813340
+ * @summary X509Factory should not depend on is.available()==0
+ */
 
-class SlowStreamReader {
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.security.cert.CertificateFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
 
+public class SlowStream {
     public static void main(String[] args) throws Exception {
-        CertificateFactory factory = CertificateFactory.getInstance("X.509");
-        if (factory.generateCertificates(System.in).size() != 5) {
-            throw new Exception("Not all certs read");
-        }
-    }
-}
+        final var outputStream = new PipedOutputStream();
+        final var inputStream = new PipedInputStream(outputStream);
 
-class SlowStreamWriter {
-    public static void main(String[] args) throws Exception {
-        for (int i=0; i<5; i++) {
-            FileInputStream fin = new FileInputStream(new File(new File(
-                    System.getProperty("test.src", "."), "openssl"), "pem"));
-            byte[] buffer = new byte[4096];
-            while (true) {
-                int len = fin.read(buffer);
-                if (len < 0) break;
-                System.out.write(buffer, 0, len);
+        final var failed = new AtomicBoolean(false);
+
+        final var writer = new Thread(() -> {
+            try {
+                for (int i = 0; i < 5; i++) {
+                    try (final var fin = new FileInputStream(new File(
+                            new File(System.getProperty("test.src", "."),
+                                    "openssl"),
+                            "pem"))) {
+
+                        fin.transferTo(outputStream);
+
+                        Thread.sleep(2000);
+                    }
+                }
+                outputStream.close();
+            } catch (final Exception e) {
+                System.out.println("Writer Thread Error: ");
+                e.printStackTrace(System.out);
+                failed.set(true);
+            }
+        });
+
+        final var reader = new Thread(() -> {
+            try {
+                final var factory = CertificateFactory.getInstance("X.509");
+                final var numOfCerts = factory.generateCertificates(inputStream).size();
+                if (numOfCerts != 5) {
+                    throw new Exception(
+                            String.format("Not all certs read. %d found 5 expected", numOfCerts)
+                    );
+                }
+                inputStream.close();
+            } catch (final Exception e) {
+                System.out.println("Reader Thread Error: ");
+                e.printStackTrace(System.out);
+                failed.set(true);
             }
-            Thread.sleep(2000);
+        });
+
+        writer.start();
+        reader.start();
+
+        writer.join();
+        reader.join();
+
+        if (failed.get()) {
+            throw new RuntimeException(
+                    "The test failed, please check the reader and writer threads output"
+            );
         }
     }
 }
diff --git a/test/jdk/java/security/cert/CertificateFactory/slowstream.sh b/test/jdk/java/security/cert/CertificateFactory/slowstream.sh
deleted file mode 100644
index 8c1cbfed125..00000000000
--- a/test/jdk/java/security/cert/CertificateFactory/slowstream.sh
+++ /dev/null
@@ -1,54 +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 6813340
-# @summary X509Factory should not depend on is.available()==0
-
-if [ "${TESTSRC}" = "" ] ; then
-  TESTSRC="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
-  echo "TESTJAVA not set.  Test cannot execute."
-  echo "FAILED!!!"
-  exit 1
-fi
-if [ "${COMPILEJAVA}" = "" ]; then
-  COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  Windows_* )
-    FS="\\"
-    ;;
-  * )
-    FS="/"
-    ;;
-esac
-
-${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
-        ${TESTSRC}${FS}SlowStream.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \
-        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} SlowStreamReader

From 84a98ab43ff268d0b10926b35320717d691337ae Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 19 May 2025 14:53:52 +0000
Subject: [PATCH 523/901] 8357166: Many AOT tests failed with VM crash

Reviewed-by: thartmann, shade
---
 src/hotspot/share/code/aotCodeCache.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 107ee3c171d..f9e7d330b04 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -129,14 +129,27 @@ void AOTCodeCache::initialize() {
 #if defined(ZERO) || !(defined(AMD64) || defined(AARCH64))
   log_info(aot, codecache, init)("AOT Code Cache is not supported on this platform.");
   AOTAdapterCaching = false;
+  AOTStubCaching = false;
   return;
 #else
   if (FLAG_IS_DEFAULT(AOTCache)) {
     log_info(aot, codecache, init)("AOT Code Cache is not used: AOTCache is not specified.");
     AOTAdapterCaching = false;
+    AOTStubCaching = false;
     return; // AOTCache must be specified to dump and use AOT code
   }
 
+  if (VerifyOops) {
+    // Disable AOT stubs caching when VerifyOops flag is on.
+    // Verify oops code generated a lot of C strings which overflow
+    // AOT C string table (which has fixed size).
+    // AOT C string table will be reworked later to handle such cases.
+    //
+    // Note: AOT adapters are not affected - they don't have oop operations.
+    log_info(aot, codecache, init)("AOT Stubs Caching is not supported with VerifyOops.");
+    FLAG_SET_ERGO(AOTStubCaching, false);
+  }
+
   bool is_dumping = false;
   bool is_using   = false;
   if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {

From 6a58af310ab2b800642f4604ee90cc74981fb9f3 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 19 May 2025 15:00:54 +0000
Subject: [PATCH 524/901] 8357143: New test AOTCodeCompressedOopsTest.java
 fails on platforms without AOT Code Cache support

Reviewed-by: asmehra, fyang, shade, mdoerr
---
 test/hotspot/jtreg/TEST.ROOT                      |  1 +
 .../appcds/aotCode/AOTCodeCompressedOopsTest.java |  4 +---
 .../runtime/cds/appcds/aotCode/AOTCodeFlags.java  |  7 +------
 test/jtreg-ext/requires/VMProps.java              | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index b48a86d4d6d..59dd48e5af7 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -81,6 +81,7 @@ requires.properties= \
     vm.cds \
     vm.cds.custom.loaders \
     vm.cds.supports.aot.class.linking \
+    vm.cds.supports.aot.code.caching \
     vm.cds.write.archived.java.heap \
     vm.continuations \
     vm.jvmti \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
index a65db6956c4..40bd8ee1a88 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -25,10 +25,8 @@
 /**
  * @test
  * @summary Sanity test of AOT Code Cache with compressed oops configurations
- * @requires vm.cds
- * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.cds.supports.aot.code.caching
  * @requires vm.flagless
- * @requires !vm.jvmci.enabled
  * @library /test/lib /test/setup_aot
  * @build AOTCodeCompressedOopsTest JavacBenchApp
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index fd668497b49..d47daaff68c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -25,13 +25,8 @@
 /**
  * @test
  * @summary Sanity test of combinations of the AOT Code Caching diagnostic flags
- * @requires vm.cds
- * @requires vm.cds.supports.aot.class.linking
- * @requires vm.flavor != "zero"
- * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires vm.cds.supports.aot.code.caching
  * @requires vm.flagless
- * @comment work around JDK-8345635
- * @requires !vm.jvmci.enabled
  * @library /test/lib /test/setup_aot
  * @build AOTCodeFlags JavacBenchApp
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 5f74ffa6ea6..360c96c74ef 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -124,6 +124,7 @@ public Map<String, String> call() {
         map.put("vm.cds", this::vmCDS);
         map.put("vm.cds.custom.loaders", this::vmCDSForCustomLoaders);
         map.put("vm.cds.supports.aot.class.linking", this::vmCDSSupportsAOTClassLinking);
+        map.put("vm.cds.supports.aot.code.caching", this::vmCDSSupportsAOTCodeCaching);
         map.put("vm.cds.write.archived.java.heap", this::vmCDSCanWriteArchivedJavaHeap);
         map.put("vm.continuations", this::vmContinuations);
         // vm.graal.enabled is true if Graal is used as JIT
@@ -472,6 +473,20 @@ protected String vmCDSSupportsAOTClassLinking() {
       return vmCDSCanWriteArchivedJavaHeap();
     }
 
+    /**
+     * @return true if this VM can support the AOT Code Caching
+     */
+    protected String vmCDSSupportsAOTCodeCaching() {
+      if ("true".equals(vmCDSSupportsAOTClassLinking()) &&
+          !"zero".equals(vmFlavor()) &&
+          "false".equals(vmJvmciEnabled()) &&
+          (Platform.isX64() || Platform.isAArch64())) {
+        return "true";
+      } else {
+        return "false";
+      }
+    }
+
     /**
      * @return true if the VM options specified via the "test.cds.runtime.options"
      * property is compatible with writing Java heap objects into the CDS archive

From 6818dcc08ed85e220c5206fda5c991b886e35334 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Mon, 19 May 2025 16:53:13 +0000
Subject: [PATCH 525/901] 8351230: Collections.synchronizedList returns a list
 that is not thread-safe

Reviewed-by: jpai
---
 .../share/classes/java/util/Collections.java  | 102 ++++++++++++++--
 .../java/util/Collections/SyncListBash.java   | 110 ++++++++++++++++++
 .../java/util/SequencedCollection/Basic.java  |  52 ++++++++-
 3 files changed, 251 insertions(+), 13 deletions(-)
 create mode 100644 test/jdk/java/util/Collections/SyncListBash.java

diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
index 4dc7edeb852..7d3f4dd8573 100644
--- a/src/java.base/share/classes/java/util/Collections.java
+++ b/src/java.base/share/classes/java/util/Collections.java
@@ -2688,6 +2688,7 @@ public static <T> List<T> synchronizedList(List<T> list) {
                 new SynchronizedList<>(list));
     }
 
+    // used by java.util.Vector
     static <T> List<T> synchronizedList(List<T> list, Object mutex) {
         return (list instanceof RandomAccess ?
                 new SynchronizedRandomAccessList<>(list, mutex) :
@@ -2706,14 +2707,29 @@ static class SynchronizedList<E>
         /** @serial */
         @SuppressWarnings("serial") // Conditionally serializable
         final List<E> list;
+        transient SynchronizedList<E> reversedView = null;
+        transient final boolean isReversed;
 
+        // constructs a forward view, using 'this' as the mutex
         SynchronizedList(List<E> list) {
             super(list);
             this.list = list;
+            this.isReversed = false;
         }
+
+        // constructs a forward view, using 'mutex' as the mutex
         SynchronizedList(List<E> list, Object mutex) {
             super(list, mutex);
             this.list = list;
+            this.isReversed = false;
+        }
+
+        // constructs the reversed view; first arg should be reversed view of backing list
+        SynchronizedList(List<E> revList, Object mutex, SynchronizedList<E> forward) {
+            super(revList, mutex);
+            this.list = revList;
+            this.reversedView = forward;
+            this.isReversed = true;
         }
 
         public boolean equals(Object o) {
@@ -2724,7 +2740,6 @@ public boolean equals(Object o) {
         public int hashCode() {
             synchronized (mutex) {return list.hashCode();}
         }
-
         public E get(int index) {
             synchronized (mutex) {return list.get(index);}
         }
@@ -2737,41 +2752,97 @@ public void add(int index, E element) {
         public E remove(int index) {
             synchronized (mutex) {return list.remove(index);}
         }
-
         public int indexOf(Object o) {
             synchronized (mutex) {return list.indexOf(o);}
         }
         public int lastIndexOf(Object o) {
             synchronized (mutex) {return list.lastIndexOf(o);}
         }
-
         public boolean addAll(int index, Collection<? extends E> c) {
             synchronized (mutex) {return list.addAll(index, c);}
         }
-
         public ListIterator<E> listIterator() {
             return list.listIterator(); // Must be manually synched by user
         }
-
         public ListIterator<E> listIterator(int index) {
             return list.listIterator(index); // Must be manually synched by user
         }
-
         public List<E> subList(int fromIndex, int toIndex) {
             synchronized (mutex) {
                 return new SynchronizedList<>(list.subList(fromIndex, toIndex),
                                             mutex);
             }
         }
-
-        @Override
         public void replaceAll(UnaryOperator<E> operator) {
             synchronized (mutex) {list.replaceAll(operator);}
         }
-        @Override
         public void sort(Comparator<? super E> c) {
             synchronized (mutex) {list.sort(c);}
         }
+        public void addFirst(E element) {
+            synchronized (mutex) {list.addFirst(element);}
+        }
+        public void addLast(E element) {
+            synchronized (mutex) {list.addLast(element);}
+        }
+        public E getFirst() {
+            synchronized (mutex) {return list.getFirst();}
+        }
+        public E getLast() {
+            synchronized (mutex) {return list.getLast();}
+        }
+        public E removeFirst() {
+            synchronized (mutex) {return list.removeFirst();}
+        }
+        public E removeLast() {
+            synchronized (mutex) {return list.removeLast();}
+        }
+
+        /**
+         * Reversed view handling. The reversedView field is transient
+         * and is initialized to null upon construction of the wrapper
+         * and upon deserialization. Reversed views are not serializable.
+         * The reversed view is created on first call to the reversed()
+         * method.
+         *
+         * There are four objects at play here:
+         *
+         * L = original list
+         * Lr = reversed view of original list
+         * S = synchronized forward wrapper: its backing list is L
+         * Sr = synchronized reversed wrapper: its backing list is Lr
+         *
+         * The reversedView field of S points to Sr and vice versa.
+         * This enables the reversed() method always to return the same
+         * object, and for S.reversed().reversed() to return S. This isn't
+         * strictly necessary, because all internal locking is done on S
+         * (which is passed around as mutex). But in the case where the
+         * client does external locking, it's good to minimize the number
+         * of different instances. Note however that external locking on
+         * the reversed wrapper Sr can't be made to work properly with
+         * internal or external locking on the forward wrapper S. (Sublists
+         * of a synchronized wrapper, reversed or not, have the same issue.)
+         *
+         * An alternative would be to have a ReversedSynchronizedList view class. However,
+         * that would require two extra classes (one RandomAccess and one not) and it would
+         * complicate the serialization story.
+         */
+        public List<E> reversed() {
+            synchronized (mutex) {
+                if (reversedView == null) {
+                    reversedView = new SynchronizedList<>(list.reversed(), mutex, this);
+                }
+                return reversedView;
+            }
+        }
+
+        @java.io.Serial
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            if (isReversed) {
+                throw new java.io.NotSerializableException();
+            }
+            out.defaultWriteObject();
+        }
 
         /**
          * SynchronizedRandomAccessList instances are serialized as
@@ -2808,6 +2879,19 @@ static class SynchronizedRandomAccessList<E>
             super(list, mutex);
         }
 
+        SynchronizedRandomAccessList(List<E> list, Object mutex, SynchronizedList<E> forward) {
+            super(list, mutex, forward);
+        }
+
+        public List<E> reversed() {
+            synchronized (mutex) {
+                if (reversedView == null) {
+                    reversedView = new SynchronizedRandomAccessList<>(list.reversed(), mutex, this);
+                }
+                return reversedView;
+            }
+        }
+
         public List<E> subList(int fromIndex, int toIndex) {
             synchronized (mutex) {
                 return new SynchronizedRandomAccessList<>(
diff --git a/test/jdk/java/util/Collections/SyncListBash.java b/test/jdk/java/util/Collections/SyncListBash.java
new file mode 100644
index 00000000000..f8177d5111d
--- /dev/null
+++ b/test/jdk/java/util/Collections/SyncListBash.java
@@ -0,0 +1,110 @@
+/*
+ * 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     8351230
+ * @summary Test that List's new SequencedCollection methods are properly
+ *          synchronized on a synchronized list.
+ * @library /test/lib
+ * @build   jdk.test.lib.Utils
+ * @run     main SyncListBash f
+ * @run     main SyncListBash r
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.*;
+
+import jdk.test.lib.Utils;
+
+public class SyncListBash {
+    static final int LOOP_COUNT = 1000;
+    static final int NUM_WORKERS = 4;
+    static List<Integer> list;
+
+    /**
+     * Test for race conditions with synchronized lists. Several worker threads
+     * add and remove elements from the front of the list, while the main thread
+     * gets the last element. The last element should never change. However, if
+     * the list isn't properly synchronized, getLast() might return the wrong
+     * element or throw IndexOutOfBoundsException.
+     *
+     * On an unsynchronized list, this fails 200-500 out of 1000 times, so this
+     * seems like a fairly reliable way to test for a race condition.
+     *
+     * @param args there must be one arg, "f" or "r", which determines whether the
+     *             forward (original) list or reversed view of the list is tested
+     * @throws InterruptedException if the main thread is interrupted
+     */
+    public static void main(String[] args) throws InterruptedException {
+        int wrongElement = 0;
+        int numExceptions = 0;
+
+        boolean reversed = switch (args[0]) {
+            case "f" -> false;
+            case "r" -> true;
+            default -> throw new IllegalArgumentException();
+        };
+
+        list = IntStream.range(0, 10)
+                        .boxed()
+                        .collect(Collectors.toCollection(ArrayList::new));
+        list = Collections.synchronizedList(list);
+        if (reversed)
+            list = list.reversed();
+        Integer expectedLast = list.getLast();
+
+        ExecutorService pool = Executors.newFixedThreadPool(NUM_WORKERS);
+        for (int i = 0; i < NUM_WORKERS; i++)
+            pool.submit(() -> {
+                while (! Thread.currentThread().isInterrupted()) {
+                    list.add(0, -1);
+                    list.remove(0);
+                }
+            });
+
+        for (int i = 0; i < LOOP_COUNT; i++) {
+            Thread.sleep(1L);
+            try {
+                Integer actualLast = list.getLast();
+                if (! expectedLast.equals(actualLast)) {
+                    ++wrongElement;
+                }
+            } catch (IndexOutOfBoundsException ioobe) {
+                ++numExceptions;
+            }
+        }
+
+        pool.shutdownNow();
+        pool.awaitTermination(Utils.adjustTimeout(60L), TimeUnit.SECONDS);
+
+        System.out.printf("LOOP_COUNT=%d wrongElement=%d numExceptions=%d%n",
+            LOOP_COUNT, wrongElement, numExceptions);
+        if (wrongElement == 0 && numExceptions == 0) {
+            System.out.println("Test passed.");
+        } else {
+            throw new AssertionError("TEST FAILED!");
+        }
+    }
+}
diff --git a/test/jdk/java/util/SequencedCollection/Basic.java b/test/jdk/java/util/SequencedCollection/Basic.java
index 32a5d4e5c91..4845a493d3a 100644
--- a/test/jdk/java/util/SequencedCollection/Basic.java
+++ b/test/jdk/java/util/SequencedCollection/Basic.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
@@ -72,7 +72,11 @@ static SequencedCollection<String> ucoll(SequencedCollection<String> coll) {
         return Collections.unmodifiableSequencedCollection(coll);
     }
 
-    static SequencedCollection<String> ulist(List<String> list) {
+    static List<String> sylist(List<String> list) {
+        return Collections.synchronizedList(list);
+    }
+
+    static List<String> ulist(List<String> list) {
         return Collections.unmodifiableList(list);
     }
 
@@ -116,6 +120,7 @@ public Iterator<Object[]> populated() {
             new Object[] { "SimpleDeque", new SimpleDeque<>(ORIGINAL), ORIGINAL },
             new Object[] { "SimpleList", new SimpleList<>(ORIGINAL), ORIGINAL },
             new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(ORIGINAL), ORIGINAL },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)), ORIGINAL },
             new Object[] { "TreeSet", new TreeSet<>(ORIGINAL), ORIGINAL },
             new Object[] { "UnmodColl", ucoll(new ArrayList<>(ORIGINAL)), ORIGINAL },
             new Object[] { "UnmodSet", uset(new LinkedHashSet<>(ORIGINAL)), ORIGINAL }
@@ -139,6 +144,7 @@ public Iterator<Object[]> empties() {
             new Object[] { "SimpleDeque", new SimpleDeque<>(), List.of() },
             new Object[] { "SimpleList", new SimpleList<>(), List.of() },
             new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(), List.of() },
+            new Object[] { "SynchList", sylist(new ArrayList<>()), List.of() },
             new Object[] { "TreeSet", new TreeSet<>(), List.of() },
             new Object[] { "UnmodColl", ucoll(new ArrayList<>()), List.of() },
             new Object[] { "UnmodSet", uset(new LinkedHashSet<>()), List.of() }
@@ -155,7 +161,8 @@ public Iterator<Object[]> adds() {
             new Object[] { "LinkedList", new LinkedList<>(ORIGINAL), ORIGINAL },
             new Object[] { "SetFromMap", setFromMap(ORIGINAL), ORIGINAL },
             new Object[] { "SimpleDeque", new SimpleDeque<>(ORIGINAL), ORIGINAL },
-            new Object[] { "SimpleList", new SimpleList<>(ORIGINAL), ORIGINAL }
+            new Object[] { "SimpleList", new SimpleList<>(ORIGINAL), ORIGINAL },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)), ORIGINAL }
         ).iterator();
     }
 
@@ -178,6 +185,7 @@ public Iterator<Object[]> removes() {
             new Object[] { "SimpleDeque", new SimpleDeque<>(ORIGINAL), ORIGINAL },
             new Object[] { "SimpleList", new SimpleList<>(ORIGINAL), ORIGINAL },
             new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(ORIGINAL), ORIGINAL },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)), ORIGINAL },
             new Object[] { "TreeSet", new TreeSet<>(ORIGINAL), ORIGINAL }
         ).iterator();
     }
@@ -194,6 +202,7 @@ public Iterator<Object[]> emptyRemoves() {
             new Object[] { "SimpleDeque", new SimpleDeque<>(), List.of() },
             new Object[] { "SimpleList", new SimpleList<>(), List.of() },
             new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(), List.of() },
+            new Object[] { "SynchList", sylist(new ArrayList<>()), List.of() },
             new Object[] { "TreeSet", new TreeSet<>(), List.of() }
         ).iterator();
     }
@@ -209,6 +218,7 @@ public Iterator<Object[]> serializable() {
             new Object[] { "LinkedList", new LinkedList<>(ORIGINAL), ORIGINAL },
             new Object[] { "ListOf", ORIGINAL, ORIGINAL },
             new Object[] { "SetFromMap", setFromMap(ORIGINAL), ORIGINAL },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)), ORIGINAL },
             new Object[] { "TreeSet", new TreeSet<>(ORIGINAL), ORIGINAL },
             new Object[] { "UnmodColl", ucoll(new ArrayList<>(ORIGINAL)), ORIGINAL },
             new Object[] { "UnmodSet", uset(new LinkedHashSet<>(ORIGINAL)), ORIGINAL }
@@ -226,6 +236,7 @@ public Iterator<Object[]> notSerializable() {
             new Object[] { "LinkedList", new LinkedList<>(ORIGINAL).reversed() },
             new Object[] { "ListOf", ORIGINAL.reversed() },
             new Object[] { "SetFromMap", setFromMap(ORIGINAL).reversed() },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)).reversed() },
             new Object[] { "UnmodColl", ucoll(new ArrayList<>(ORIGINAL)).reversed() },
             new Object[] { "UnmodSet", uset(new LinkedHashSet<>(ORIGINAL)).reversed() }
         ).iterator();
@@ -243,7 +254,8 @@ public Iterator<Object[]> doubleReverse() {
             new Object[] { "ListOf", ORIGINAL },
             new Object[] { "SimpleDeque", new SimpleDeque<>(ORIGINAL) },
             new Object[] { "SimpleList", new SimpleList<>(ORIGINAL) },
-            new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(ORIGINAL) }
+            new Object[] { "SimpleSortedSet", new SimpleSortedSet<>(ORIGINAL) },
+            new Object[] { "SynchList", sylist(new ArrayList<>(ORIGINAL)) }
         ).iterator();
     }
 
@@ -282,6 +294,20 @@ public Iterator<Object[]> checkedSortedSet() {
         ).iterator();
     }
 
+    // These Lists don't all implement RandomAccess; they're Lists that should be
+    // tested for proper propagation of the RandomAccess markers.
+    @DataProvider(name="randomAccessLists")
+    public Iterator<Object[]> randomAccessLists() {
+        return Arrays.asList(
+            new Object[] { "ArrayList", new ArrayList<>(ORIGINAL) },
+            new Object[] { "AsList", Arrays.asList(ORIGINAL.toArray()) },
+            new Object[] { "COWAL", new CopyOnWriteArrayList<>(ORIGINAL) },
+            new Object[] { "LinkedList", new LinkedList<>(ORIGINAL) },
+            new Object[] { "ListOf", ORIGINAL },
+            new Object[] { "SimpleList", new SimpleList<>(ORIGINAL) }
+        ).iterator();
+    }
+
     // mode bit tests for subList testing
 
     boolean reverseList(int mode) { return (mode & 1) != 0; }
@@ -854,4 +880,22 @@ public void testSubListIteratorRemove(String label, int mode, List<String> list,
         checkContents(sub, refSub);
         checkContents(list, refList);
     }
+
+    @Test
+    public void testSynchListReversedAlwaysReturnsSameObject() {
+        var list = sylist(ORIGINAL);
+        var rev1 = list.reversed();
+        var rev2 = list.reversed();
+        assertSame(rev1, rev2);
+    }
+
+    @Test(dataProvider="randomAccessLists")
+    public void testRandomAccess(String label, List<String> list) {
+        assertEquals(list.reversed() instanceof RandomAccess, list instanceof RandomAccess);
+
+        // Collections.synchronizedList() preservation of RandomAccess is somewhat
+        // tested by java/util/Collection/MOAT.java but it might not have all these cases.
+        assertEquals(sylist(list) instanceof RandomAccess, list instanceof RandomAccess);
+        assertEquals(sylist(list).reversed() instanceof RandomAccess, sylist(list) instanceof RandomAccess);
+    }
 }

From bd99525633e4d3d3f180a6678eedb8780dbb6139 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Mon, 19 May 2025 17:09:15 +0000
Subject: [PATCH 526/901] 8356193: Remove tests from
 ProblemList-enable-preview.txt fixed by JDK-8344706

Reviewed-by: rriggs
---
 test/hotspot/jtreg/ProblemList-enable-preview.txt | 1 -
 test/jdk/ProblemList-enable-preview.txt           | 2 --
 2 files changed, 3 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt
index a6b922da6a5..31e09d372a8 100644
--- a/test/hotspot/jtreg/ProblemList-enable-preview.txt
+++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt
@@ -27,5 +27,4 @@
 #
 #############################################################################
 
-vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009/TestDescription.java  8351188 generic-all
 
diff --git a/test/jdk/ProblemList-enable-preview.txt b/test/jdk/ProblemList-enable-preview.txt
index 42c3a70db82..31e09d372a8 100644
--- a/test/jdk/ProblemList-enable-preview.txt
+++ b/test/jdk/ProblemList-enable-preview.txt
@@ -27,6 +27,4 @@
 #
 #############################################################################
 
-java/lang/System/SecurityManagerWarnings.java                                        8351188 generic-all
-java/lang/System/LoggerFinder/SignedLoggerFinderTest/SignedLoggerFinderTest.java     8351188 generic-all
 

From 27a4243561e31d6f2858dd0c0bd356e2849ed87c Mon Sep 17 00:00:00 2001
From: Yannik Stradmann <yjs@stradmann.name>
Date: Mon, 19 May 2025 21:28:02 +0000
Subject: [PATCH 527/901] 8354560: Exponentially delay subsequent native thread
 creation in case of EAGAIN

Reviewed-by: dholmes, fbredberg
---
 src/hotspot/os/aix/os_aix.cpp         | 19 ++++++++++++++++---
 src/hotspot/os/bsd/os_bsd.cpp         | 19 ++++++++++++++++---
 src/hotspot/os/linux/os_linux.cpp     | 19 ++++++++++++++++---
 src/hotspot/os/windows/os_windows.cpp | 23 ++++++++++++++++++++---
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index ba245c0b0ca..4937456d09f 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -760,10 +760,23 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   pthread_t tid = 0;
 
   if (ret == 0) {
-    int limit = 3;
-    do {
+    int trials_remaining = 4;
+    useconds_t next_delay = 1000;
+    while (true) {
       ret = pthread_create(&tid, &attr, (void* (*)(void*)) thread_native_entry, thread);
-    } while (ret == EAGAIN && limit-- > 0);
+
+      if (ret != EAGAIN) {
+        break;
+      }
+
+      if (--trials_remaining <= 0) {
+        break;
+      }
+
+      log_debug(os, thread)("Failed to start native thread (%s), retrying after %dus.", os::errno_name(ret), next_delay);
+      ::usleep(next_delay);
+      next_delay *= 2;
+    }
   }
 
   if (ret == 0) {
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 5ba40651875..e517e8f30a0 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -643,10 +643,23 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
     ResourceMark rm;
     pthread_t tid;
     int ret = 0;
-    int limit = 3;
-    do {
+    int trials_remaining = 4;
+    useconds_t next_delay = 1000;
+    while (true) {
       ret = pthread_create(&tid, &attr, (void* (*)(void*)) thread_native_entry, thread);
-    } while (ret == EAGAIN && limit-- > 0);
+
+      if (ret != EAGAIN) {
+        break;
+      }
+
+      if (--trials_remaining <= 0) {
+        break;
+      }
+
+      log_debug(os, thread)("Failed to start native thread (%s), retrying after %dus.", os::errno_name(ret), next_delay);
+      ::usleep(next_delay);
+      next_delay *= 2;
+    }
 
     char buf[64];
     if (ret == 0) {
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 4d522e0bf43..1b48550bfb7 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -1056,10 +1056,23 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
     ResourceMark rm;
     pthread_t tid;
     int ret = 0;
-    int limit = 3;
-    do {
+    int trials_remaining = 4;
+    useconds_t next_delay = 1000;
+    while (true) {
       ret = pthread_create(&tid, &attr, (void* (*)(void*)) thread_native_entry, thread);
-    } while (ret == EAGAIN && limit-- > 0);
+
+      if (ret != EAGAIN) {
+        break;
+      }
+
+      if (--trials_remaining <= 0) {
+        break;
+      }
+
+      log_debug(os, thread)("Failed to start native thread (%s), retrying after %dus.", os::errno_name(ret), next_delay);
+      ::usleep(next_delay);
+      next_delay *= 2;
+    }
 
     char buf[64];
     if (ret == 0) {
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 5c941f4be1b..59c1cae7de2 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -757,8 +757,9 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
 
   const unsigned initflag = CREATE_SUSPENDED | STACK_SIZE_PARAM_IS_A_RESERVATION;
   HANDLE thread_handle;
-  int limit = 3;
-  do {
+  int trials_remaining = 4;
+  DWORD next_delay_ms = 1;
+  while (true) {
     thread_handle =
       (HANDLE)_beginthreadex(nullptr,
                              (unsigned)stack_size,
@@ -766,7 +767,23 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
                              thread,
                              initflag,
                              &thread_id);
-  } while (thread_handle == nullptr && errno == EAGAIN && limit-- > 0);
+
+    if (thread_handle != nullptr) {
+      break;
+    }
+
+    if (errno != EAGAIN) {
+      break;
+    }
+
+    if (--trials_remaining <= 0) {
+      break;
+    }
+
+    log_debug(os, thread)("Failed to start native thread (%s), retrying after %dms.", os::errno_name(errno), next_delay_ms);
+    Sleep(next_delay_ms);
+    next_delay_ms *= 2;
+  }
 
   ResourceMark rm;
   char buf[64];

From fbeea1daef6a65875d713395c489483762d804fe Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 19 May 2025 21:33:22 +0000
Subject: [PATCH 528/901] 8356844: Missing @Serial annotation for
 sun.print.CustomOutputBin#serialVersionUID

Reviewed-by: aivanov, prr
---
 .../share/classes/sun/print/CustomOutputBin.java             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/print/CustomOutputBin.java b/src/java.desktop/share/classes/sun/print/CustomOutputBin.java
index 71c63c91570..1adb7e6212a 100644
--- a/src/java.desktop/share/classes/sun/print/CustomOutputBin.java
+++ b/src/java.desktop/share/classes/sun/print/CustomOutputBin.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.
  * Copyright (c) 2024, BELLSOFT. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,8 +29,6 @@
 import java.io.Serial;
 import java.util.ArrayList;
 
-import javax.print.attribute.EnumSyntax;
-import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.OutputBin;
 
 public final class CustomOutputBin extends OutputBin {
@@ -65,6 +63,7 @@ public static synchronized CustomOutputBin createOutputBin(String name, String c
         return new CustomOutputBin(name, choice);
     }
 
+    @Serial
     private static final long serialVersionUID = 3018751086294120717L;
 
     /**

From 637e9d16ddb21003234abcd32f759aefd91f21f9 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Mon, 19 May 2025 22:47:13 +0000
Subject: [PATCH 529/901] 8354556: Expand value-based class warnings to
 java.lang.ref API

Co-authored-by: Archie Cobbs <acobbs@openjdk.org>
Reviewed-by: jlahoda
---
 .../tools/symbolgenerator/CreateSymbols.java  |  14 +-
 .../share/classes/java/lang/ref/Cleaner.java  |   2 +-
 .../java/lang/ref/PhantomReference.java       |   4 +-
 .../classes/java/lang/ref/Reference.java      |   2 +-
 .../classes/java/lang/ref/ReferenceQueue.java |   2 +-
 .../classes/java/lang/ref/SoftReference.java  |   6 +-
 .../classes/java/lang/ref/WeakReference.java  |   6 +-
 .../share/classes/java/util/WeakHashMap.java  |   4 +-
 .../jdk/internal/RequiresIdentity.java        |  51 +++++
 .../classes/jdk/internal/ValueBased.java      |   1 -
 .../com/sun/tools/javac/code/Lint.java        |  62 +++---
 .../com/sun/tools/javac/code/Symtab.java      |   4 +
 .../com/sun/tools/javac/code/Type.java        |   4 +
 .../com/sun/tools/javac/comp/Attr.java        |  20 +-
 .../com/sun/tools/javac/comp/Check.java       | 178 ++++++++++++++++++
 .../com/sun/tools/javac/comp/Modules.java     |   2 +-
 .../com/sun/tools/javac/main/Arguments.java   |   5 +-
 .../com/sun/tools/javac/main/Option.java      |  48 +++--
 .../tools/javac/resources/compiler.properties |   6 +-
 .../tools/javac/resources/javac.properties    |   8 +-
 .../com/sun/tools/javac/util/Options.java     |  53 ++++++
 .../share/classes/module-info.java            |   7 +-
 src/jdk.compiler/share/man/javac.md           |   7 +-
 .../tools/javac/diags/CheckResourceKeys.java  |  10 +-
 .../AttemptToSynchronizeOnInstanceOfVbc.java  |   2 +-
 .../diags/examples/RequiresIdentity.java      |  29 +++
 .../tools/javac/lint/ExternalAbuseOfVbc.java  |   4 +-
 .../tools/javac/lint/ExternalAbuseOfVbc.out   |   2 +-
 .../javac/lint/RequiresIdentityHelper.java    |  21 +++
 .../javac/lint/RequiresIdentityTest.java      |  90 +++++++++
 .../tools/javac/lint/RequiresIdentityTest.out |  39 ++++
 .../javac/lint/RequiresIdentityTest2.out      |   2 +
 32 files changed, 610 insertions(+), 85 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/RequiresIdentity.java
 create mode 100644 test/langtools/tools/javac/diags/examples/RequiresIdentity.java
 create mode 100644 test/langtools/tools/javac/lint/RequiresIdentityHelper.java
 create mode 100644 test/langtools/tools/javac/lint/RequiresIdentityTest.java
 create mode 100644 test/langtools/tools/javac/lint/RequiresIdentityTest.out
 create mode 100644 test/langtools/tools/javac/lint/RequiresIdentityTest2.out

diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index 1ebd22dc6ab..08d5cb85ef2 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -304,13 +304,18 @@ public void createSymbols(String ctDescriptionFileExtra, String ctDescriptionFil
             "Ljdk/internal/ValueBased;";
     private static final String VALUE_BASED_ANNOTATION_INTERNAL =
             "Ljdk/internal/ValueBased+Annotation;";
+    private static final String REQUIRES_IDENTITY_ANNOTATION =
+            "Ljdk/internal/RequiresIdentity;";
+    private static final String REQUIRES_IDENTITY_ANNOTATION_INTERNAL =
+            "Ljdk/internal/RequiresIdentity+Annotation;";
     public static final Set<String> HARDCODED_ANNOTATIONS = new HashSet<>(
             List.of("Ljdk/Profile+Annotation;",
                     "Lsun/Proprietary+Annotation;",
                     PREVIEW_FEATURE_ANNOTATION_OLD,
                     PREVIEW_FEATURE_ANNOTATION_NEW,
                     VALUE_BASED_ANNOTATION,
-                    RESTRICTED_ANNOTATION));
+                    RESTRICTED_ANNOTATION,
+                    REQUIRES_IDENTITY_ANNOTATION));
 
     private void stripNonExistentAnnotations(LoadDescriptions data) {
         Set<String> allClasses = data.classes.name2Class.keySet();
@@ -1021,6 +1026,12 @@ private Annotation createAnnotation(AnnotationDescription desc) {
             annotationType = VALUE_BASED_ANNOTATION_INTERNAL;
         }
 
+        if (REQUIRES_IDENTITY_ANNOTATION.equals(annotationType)) {
+            //the non-public RequiresIdentity annotation will not be available in ct.sym,
+            //replace with purely synthetic javac-internal annotation:
+            annotationType = REQUIRES_IDENTITY_ANNOTATION_INTERNAL;
+        }
+
         if (RESTRICTED_ANNOTATION.equals(annotationType)) {
             //the non-public Restricted annotation will not be available in ct.sym,
             //replace with purely synthetic javac-internal annotation:
@@ -2202,6 +2213,7 @@ private boolean readAttribute(FeatureDescription feature, Attribute<?> attr) {
                 chd.permittedSubclasses = a.permittedSubclasses().stream().map(ClassEntry::asInternalName).collect(Collectors.toList());
             }
             case ModuleMainClassAttribute a -> ((ModuleHeaderDescription) feature).moduleMainClass = a.mainClass().asInternalName();
+            case RuntimeVisibleTypeAnnotationsAttribute a -> {/* do nothing for now */}
             default -> throw new IllegalArgumentException("Unhandled attribute: " + attr.attributeName()); // Do nothing
         }
 
diff --git a/src/java.base/share/classes/java/lang/ref/Cleaner.java b/src/java.base/share/classes/java/lang/ref/Cleaner.java
index c5a163831c8..20a964be21d 100644
--- a/src/java.base/share/classes/java/lang/ref/Cleaner.java
+++ b/src/java.base/share/classes/java/lang/ref/Cleaner.java
@@ -219,7 +219,7 @@ public static Cleaner create(ThreadFactory threadFactory) {
      * @param action a {@code Runnable} to invoke when the object becomes phantom reachable
      * @return a {@code Cleanable} instance
      */
-    public Cleanable register(Object obj, Runnable action) {
+    public Cleanable register(@jdk.internal.RequiresIdentity Object obj, Runnable action) {
         Objects.requireNonNull(obj, "obj");
         Objects.requireNonNull(action, "action");
         return new CleanerImpl.PhantomCleanableRef(obj, this, action);
diff --git a/src/java.base/share/classes/java/lang/ref/PhantomReference.java b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
index 3f01144afe6..a6e144dc7b6 100644
--- a/src/java.base/share/classes/java/lang/ref/PhantomReference.java
+++ b/src/java.base/share/classes/java/lang/ref/PhantomReference.java
@@ -51,7 +51,7 @@
  * @since    1.2
  */
 
-public non-sealed class PhantomReference<T> extends Reference<T> {
+public non-sealed class PhantomReference<@jdk.internal.RequiresIdentity T> extends Reference<T> {
 
     /**
      * Returns this reference object's referent.  Because the referent of a
@@ -101,7 +101,7 @@ void clearImpl() {
      * @param q the queue with which the reference is to be registered,
      *          or {@code null} if registration is not required
      */
-    public PhantomReference(T referent, ReferenceQueue<? super T> q) {
+    public PhantomReference(@jdk.internal.RequiresIdentity T referent, ReferenceQueue<? super T> q) {
         super(referent, q);
     }
 
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index e3e0258c3c9..c83f197380a 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -44,7 +44,7 @@
  * @sealedGraph
  */
 
-public abstract sealed class Reference<T>
+public abstract sealed class Reference<@jdk.internal.RequiresIdentity T>
     permits PhantomReference, SoftReference, WeakReference, FinalReference {
 
     /* The state of a Reference object is characterized by two attributes.  It
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index 9f3fad760ba..d3879d4a8fc 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -46,7 +46,7 @@
  * @since    1.2
  */
 
-public class ReferenceQueue<T> {
+public class ReferenceQueue<@jdk.internal.RequiresIdentity T> {
     private static class Null extends ReferenceQueue<Object> {
         @Override
         boolean enqueue(Reference<?> r) {
diff --git a/src/java.base/share/classes/java/lang/ref/SoftReference.java b/src/java.base/share/classes/java/lang/ref/SoftReference.java
index 925f894fdab..0bc372eb105 100644
--- a/src/java.base/share/classes/java/lang/ref/SoftReference.java
+++ b/src/java.base/share/classes/java/lang/ref/SoftReference.java
@@ -62,7 +62,7 @@
  * @since    1.2
  */
 
-public non-sealed class SoftReference<T> extends Reference<T> {
+public non-sealed class SoftReference<@jdk.internal.RequiresIdentity T> extends Reference<T> {
 
     /**
      * Timestamp clock, updated by the garbage collector
@@ -82,7 +82,7 @@ public non-sealed class SoftReference<T> extends Reference<T> {
      *
      * @param referent object the new soft reference will refer to
      */
-    public SoftReference(T referent) {
+    public SoftReference(@jdk.internal.RequiresIdentity T referent) {
         super(referent);
         this.timestamp = clock;
     }
@@ -96,7 +96,7 @@ public SoftReference(T referent) {
      *          or {@code null} if registration is not required
      *
      */
-    public SoftReference(T referent, ReferenceQueue<? super T> q) {
+    public SoftReference(@jdk.internal.RequiresIdentity T referent, ReferenceQueue<? super T> q) {
         super(referent, q);
         this.timestamp = clock;
     }
diff --git a/src/java.base/share/classes/java/lang/ref/WeakReference.java b/src/java.base/share/classes/java/lang/ref/WeakReference.java
index 1a733bb32b9..4b4f834485e 100644
--- a/src/java.base/share/classes/java/lang/ref/WeakReference.java
+++ b/src/java.base/share/classes/java/lang/ref/WeakReference.java
@@ -46,7 +46,7 @@
  * @since    1.2
  */
 
-public non-sealed class WeakReference<T> extends Reference<T> {
+public non-sealed class WeakReference<@jdk.internal.RequiresIdentity T> extends Reference<T> {
 
     /**
      * Creates a new weak reference that refers to the given object.  The new
@@ -54,7 +54,7 @@ public non-sealed class WeakReference<T> extends Reference<T> {
      *
      * @param referent object the new weak reference will refer to
      */
-    public WeakReference(T referent) {
+    public WeakReference(@jdk.internal.RequiresIdentity T referent) {
         super(referent);
     }
 
@@ -66,7 +66,7 @@ public WeakReference(T referent) {
      * @param q the queue with which the reference is to be registered,
      *          or {@code null} if registration is not required
      */
-    public WeakReference(T referent, ReferenceQueue<? super T> q) {
+    public WeakReference(@jdk.internal.RequiresIdentity T referent, ReferenceQueue<? super T> q) {
         super(referent, q);
     }
 
diff --git a/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java
index 276e8731d84..7f2960eb2ad 100644
--- a/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -132,7 +132,7 @@
  * @see         java.util.HashMap
  * @see         java.lang.ref.WeakReference
  */
-public class WeakHashMap<K,V>
+public class WeakHashMap<@jdk.internal.RequiresIdentity K,V>
     extends AbstractMap<K,V>
     implements Map<K,V> {
 
@@ -457,7 +457,7 @@ Entry<K,V> getEntry(Object key) {
      *         (A {@code null} return can also indicate that the map
      *         previously associated {@code null} with {@code key}.)
      */
-    public V put(K key, V value) {
+    public V put(@jdk.internal.RequiresIdentity K key, V value) {
         Object k = maskNull(key);
         int h = hash(k);
         Entry<K,V>[] tab = getTable();
diff --git a/src/java.base/share/classes/jdk/internal/RequiresIdentity.java b/src/java.base/share/classes/jdk/internal/RequiresIdentity.java
new file mode 100644
index 00000000000..5b54debd095
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/RequiresIdentity.java
@@ -0,0 +1,51 @@
+/*
+ * 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.internal;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_PARAMETER;
+
+/**
+ * Indicates that the annotated parameter or type parameter is not expected to be a
+ * Value Based class.
+ * Using a parameter or type parameter of a <a href="http://github.com/lang/doc-files/ValueBased.html">value-based classes</a>
+ * should produce warnings about behavior that is inconsistent with identity based semantics.
+ *
+ * Note this internal annotation is handled specially by the javac compiler.
+ * To work properly with {@code --release older-release}, it requires special
+ * handling in {@code make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java}
+ * and {@code src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java}.
+ *
+ * @since 25
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value={PARAMETER, TYPE_PARAMETER})
+public @interface RequiresIdentity {
+}
diff --git a/src/java.base/share/classes/jdk/internal/ValueBased.java b/src/java.base/share/classes/jdk/internal/ValueBased.java
index d27ab73c01f..160ffce874a 100644
--- a/src/java.base/share/classes/jdk/internal/ValueBased.java
+++ b/src/java.base/share/classes/jdk/internal/ValueBased.java
@@ -46,4 +46,3 @@
 @Target(value={TYPE})
 public @interface ValueBased {
 }
-
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
index fb1b782d87e..ede2511f35c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java
@@ -25,11 +25,15 @@
 
 package com.sun.tools.javac.code;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import com.sun.tools.javac.main.Option;
@@ -119,7 +123,7 @@ public Lint suppress(LintCategory... lc) {
     private EnumSet<LintCategory> values;
     private EnumSet<LintCategory> suppressedValues;
 
-    private static final Map<String, LintCategory> map = new ConcurrentHashMap<>(20);
+    private static final Map<String, LintCategory> map = new LinkedHashMap<>(40);
 
     @SuppressWarnings("this-escape")
     protected Lint(Context context) {
@@ -149,10 +153,10 @@ private void initializeRootIfNeeded() {
             return;
 
         // Initialize enabled categories based on "-Xlint" flags
-        if (options.isSet(Option.XLINT) || options.isSet(Option.XLINT_CUSTOM, "all")) {
+        if (options.isSet(Option.XLINT) || options.isSet(Option.XLINT_CUSTOM, Option.LINT_CUSTOM_ALL)) {
             // If -Xlint or -Xlint:all is given, enable all categories by default
             values = EnumSet.allOf(LintCategory.class);
-        } else if (options.isSet(Option.XLINT_CUSTOM, "none")) {
+        } else if (options.isSet(Option.XLINT_CUSTOM, Option.LINT_CUSTOM_NONE)) {
             // if -Xlint:none is given, disable all categories by default
             values = LintCategory.newEmptySet();
         } else {
@@ -173,15 +177,15 @@ private void initializeRootIfNeeded() {
             if (!options.isSet(Option.PREVIEW)) {
                 values.add(LintCategory.PREVIEW);
             }
-            values.add(LintCategory.SYNCHRONIZATION);
+            values.add(LintCategory.IDENTITY);
             values.add(LintCategory.INCUBATING);
         }
 
         // Look for specific overrides
         for (LintCategory lc : LintCategory.values()) {
-            if (options.isSet(Option.XLINT_CUSTOM, lc.option)) {
+            if (options.isExplicitlyEnabled(Option.XLINT, lc)) {
                 values.add(lc);
-            } else if (options.isSet(Option.XLINT_CUSTOM, "-" + lc.option)) {
+            } else if (options.isExplicitlyDisabled(Option.XLINT, lc)) {
                 values.remove(lc);
             }
         }
@@ -261,6 +265,11 @@ public enum LintCategory {
          */
         FINALLY("finally"),
 
+        /**
+         * Warn about uses of @ValueBased classes where an identity class is expected.
+         */
+        IDENTITY("identity", true, "synchronization"),
+
         /**
          * Warn about use of incubating modules.
          *
@@ -363,11 +372,6 @@ public enum LintCategory {
          */
         STRICTFP("strictfp"),
 
-        /**
-         * Warn about synchronization attempts on instances of @ValueBased classes.
-         */
-        SYNCHRONIZATION("synchronization"),
-
         /**
          * Warn about issues relating to use of text blocks
          *
@@ -410,10 +414,14 @@ public enum LintCategory {
             this(option, true);
         }
 
-        LintCategory(String option, boolean annotationSuppression) {
+        LintCategory(String option, boolean annotationSuppression, String... aliases) {
             this.option = option;
             this.annotationSuppression = annotationSuppression;
-            map.put(option, this);
+            ArrayList<String> optionList = new ArrayList<>(1 + aliases.length);
+            optionList.add(option);
+            Collections.addAll(optionList, aliases);
+            this.optionList = Collections.unmodifiableList(optionList);
+            this.optionList.forEach(ident -> map.put(ident, this));
         }
 
         /**
@@ -426,13 +434,23 @@ public static Optional<LintCategory> get(String option) {
             return Optional.ofNullable(map.get(option));
         }
 
+        /**
+         * Get all lint category option strings and aliases.
+         */
+        public static Set<String> options() {
+            return Collections.unmodifiableSet(map.keySet());
+        }
+
         public static EnumSet<LintCategory> newEmptySet() {
             return EnumSet.noneOf(LintCategory.class);
         }
 
-        /** Get the string representing this category in @SuppressAnnotations and -Xlint options. */
+        /** Get the "canonical" string representing this category in @SuppressAnnotations and -Xlint options. */
         public final String option;
 
+        /** Get a list containing "option" followed by zero or more aliases. */
+        public final List<String> optionList;
+
         /** Does this category support being suppressed by the {@code @SuppressWarnings} annotation? */
         public final boolean annotationSuppression;
     }
@@ -496,20 +514,6 @@ public EnumSet<LintCategory> suppressionsFrom(Symbol symbol) {
         return suppressions;
     }
 
-    /**
-     * Retrieve the recognized lint categories suppressed by the given @SuppressWarnings annotation.
-     *
-     * @param annotation @SuppressWarnings annotation, or null
-     * @return set of lint categories, possibly empty but never null
-     */
-    private EnumSet<LintCategory> suppressionsFrom(JCAnnotation annotation) {
-        initializeSymbolsIfNeeded();
-        if (annotation == null)
-            return LintCategory.newEmptySet();
-        Assert.check(annotation.attribute.type.tsym == syms.suppressWarningsType.tsym);
-        return suppressionsFrom(Stream.of(annotation).map(anno -> anno.attribute));
-    }
-
     // Find the @SuppressWarnings annotation in the given stream and extract the recognized suppressions
     private EnumSet<LintCategory> suppressionsFrom(Stream<Attribute.Compound> attributes) {
         initializeSymbolsIfNeeded();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
index 74c740656f4..2079532eb2c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -228,6 +228,8 @@ public static Symtab instance(Context context) {
     public final Type constantBootstrapsType;
     public final Type valueBasedType;
     public final Type valueBasedInternalType;
+    public final Type requiresIdentityType;
+    public final Type requiresIdentityInternalType;
     public final Type classDescType;
     public final Type enumDescType;
 
@@ -610,6 +612,8 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         constantBootstrapsType = enterClass("java.lang.invoke.ConstantBootstraps");
         valueBasedType = enterClass("jdk.internal.ValueBased");
         valueBasedInternalType = enterSyntheticAnnotation("jdk.internal.ValueBased+Annotation");
+        requiresIdentityType = enterClass("jdk.internal.RequiresIdentity");
+        requiresIdentityInternalType = enterSyntheticAnnotation("jdk.internal.RequiresIdentity+Annotation");
         classDescType = enterClass("java.lang.constant.ClassDesc");
         enumDescType = enterClass("java.lang.Enum$EnumDesc");
         // For serialization lint checking
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
index bd2ea704831..fa0220b1e1f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
@@ -665,6 +665,10 @@ public boolean isFinal() {
         return (tsym.flags() & FINAL) != 0;
     }
 
+    public boolean isValueBased() {
+        return tsym != null && (tsym.flags_field & VALUE_BASED) != 0;
+    }
+
     /**
      * Does this type contain occurrences of type t?
      */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 8f955fbb392..b4504502b6f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1047,8 +1047,10 @@ public void visitMethodDef(JCMethodDecl tree) {
             chk.validate(tree.typarams, localEnv);
 
             // Check that result type is well-formed.
-            if (tree.restype != null && !tree.restype.type.hasTag(VOID))
+            if (tree.restype != null && !tree.restype.type.hasTag(VOID)) {
                 chk.validate(tree.restype, localEnv);
+            }
+            chk.checkRequiresIdentity(tree, env.info.lint);
 
             // Check that receiver type is well-formed.
             if (tree.recvparam != null) {
@@ -1328,6 +1330,7 @@ public void visitVarDef(JCVariableDecl tree) {
                     log.error(tree, Errors.IllegalRecordComponentName(v));
                 }
             }
+            chk.checkRequiresIdentity(tree, env.info.lint);
         }
         finally {
             chk.setLint(prevLint);
@@ -1949,17 +1952,12 @@ private Symbol enumConstant(JCTree tree, Type enumType) {
 
     public void visitSynchronized(JCSynchronized tree) {
         chk.checkRefType(tree.pos(), attribExpr(tree.lock, env));
-        if (isValueBased(tree.lock.type)) {
+        if (tree.lock.type != null && tree.lock.type.isValueBased()) {
             env.info.lint.logIfEnabled(tree.pos(), LintWarnings.AttemptToSynchronizeOnInstanceOfValueBasedClass);
         }
         attribStat(tree.body, env);
         result = null;
     }
-        // where
-        private boolean isValueBased(Type t) {
-            return t != null && t.tsym != null && (t.tsym.flags() & VALUE_BASED) != 0;
-        }
-
 
     public void visitTry(JCTry tree) {
         // Create a new local environment with a local
@@ -2672,6 +2670,7 @@ public void visitApply(JCMethodInvocation tree) {
             Type capturedRes = resultInfo.checkContext.inferenceContext().cachedCapture(tree, restype, true);
             result = check(tree, capturedRes, KindSelector.VAL, resultInfo);
         }
+        chk.checkRequiresIdentity(tree, env.info.lint);
         chk.validate(tree.typeargs, localEnv);
     }
     //where
@@ -2914,6 +2913,8 @@ else if (!skipNonDiamondPath) {
                 }
             }
 
+            chk.checkRequiresIdentity(tree, env.info.lint);
+
             if (cdef != null) {
                 visitAnonymousClassDefinition(tree, clazz, clazztype, cdef, localEnv, argtypes, typeargtypes, pkind);
                 return;
@@ -3793,6 +3794,7 @@ public void visitReference(final JCMemberReference that) {
             if (!isSpeculativeRound) {
                 checkAccessibleTypes(that, localEnv, resultInfo.checkContext.inferenceContext(), desc, currentTarget);
             }
+            chk.checkRequiresIdentity(that, localEnv.info.lint);
             result = check(that, currentTarget, KindSelector.VAL, resultInfo);
         } catch (Types.FunctionDescriptorLookupError ex) {
             JCDiagnostic cause = ex.getDiagnostic();
@@ -4096,6 +4098,7 @@ public void visitBinary(JCBinary tree) {
     public void visitTypeCast(final JCTypeCast tree) {
         Type clazztype = attribType(tree.clazz, env);
         chk.validate(tree.clazz, env, false);
+        chk.checkRequiresIdentity(tree, env.info.lint);
         //a fresh environment is required for 292 inference to work properly ---
         //see Infer.instantiatePolymorphicSignatureInstance()
         Env<AttrContext> localEnv = env.dup(tree);
@@ -4237,6 +4240,7 @@ public void visitBindingPattern(JCBindingPattern tree) {
         } else {
             matchBindings = new MatchBindings(List.of(v), List.nil());
         }
+        chk.checkRequiresIdentity(tree, env.info.lint);
     }
 
     @Override
@@ -5590,6 +5594,8 @@ private void attribClassBody(Env<AttrContext> env, ClassSymbol c) {
             chk.validate(tree.implementing, env);
         }
 
+        chk.checkRequiresIdentity(tree, env.info.lint);
+
         c.markAbstractIfNeeded(types);
 
         // If this is a non-abstract class, check that it has no abstract
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 1faa77e88fd..05730e3f257 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
@@ -28,6 +28,7 @@
 import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.function.ToIntBiFunction;
@@ -46,6 +47,7 @@
 import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata;
 import com.sun.tools.javac.jvm.*;
+import com.sun.tools.javac.resources.CompilerProperties;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
@@ -5667,4 +5669,180 @@ private <E extends Element> Void runUnderLint(E symbol, JCClassDecl p, BiConsume
 
     }
 
+    void checkRequiresIdentity(JCTree tree, Lint lint) {
+        switch (tree) {
+            case JCClassDecl classDecl -> {
+                Type st = types.supertype(classDecl.sym.type);
+                if (st != null &&
+                        // no need to recheck j.l.Object, shortcut,
+                        st.tsym != syms.objectType.tsym &&
+                        // this one could be null, no explicit extends
+                        classDecl.extending != null) {
+                    checkIfIdentityIsExpected(classDecl.extending.pos(), st, lint);
+                }
+                for (JCExpression intrface: classDecl.implementing) {
+                    checkIfIdentityIsExpected(intrface.pos(), intrface.type, lint);
+                }
+                for (JCTypeParameter tp : classDecl.typarams) {
+                    checkIfIdentityIsExpected(tp.pos(), tp.type, lint);
+                }
+            }
+            case JCVariableDecl variableDecl -> {
+                if (variableDecl.vartype != null &&
+                        (variableDecl.sym.flags_field & RECORD) == 0 ||
+                        (variableDecl.sym.flags_field & ~(Flags.PARAMETER | RECORD | GENERATED_MEMBER)) != 0) {
+                    /* we don't want to warn twice so if this variable is a compiler generated parameter of
+                     * a canonical record constructor, we don't want to issue a warning as we will warn the
+                     * corresponding compiler generated private record field anyways
+                     */
+                    checkIfIdentityIsExpected(variableDecl.vartype.pos(), variableDecl.vartype.type, lint);
+                }
+            }
+            case JCTypeCast typeCast -> checkIfIdentityIsExpected(typeCast.clazz.pos(), typeCast.clazz.type, lint);
+            case JCBindingPattern bindingPattern -> {
+                if (bindingPattern.var.vartype != null) {
+                    checkIfIdentityIsExpected(bindingPattern.var.vartype.pos(), bindingPattern.var.vartype.type, lint);
+                }
+            }
+            case JCMethodDecl methodDecl -> {
+                for (JCTypeParameter tp : methodDecl.typarams) {
+                    checkIfIdentityIsExpected(tp.pos(), tp.type, lint);
+                }
+                if (methodDecl.restype != null && !methodDecl.restype.type.hasTag(VOID)) {
+                    checkIfIdentityIsExpected(methodDecl.restype.pos(), methodDecl.restype.type, lint);
+                }
+            }
+            case JCMemberReference mref -> {
+                checkIfIdentityIsExpected(mref.expr.pos(), mref.target, lint);
+                checkIfTypeParamsRequiresIdentity(mref.sym.getMetadata(), mref.typeargs, lint);
+            }
+            case JCPolyExpression poly
+                when (poly instanceof JCNewClass || poly instanceof JCMethodInvocation) -> {
+                if (poly instanceof JCNewClass newClass) {
+                    checkIfIdentityIsExpected(newClass.clazz.pos(), newClass.clazz.type, lint);
+                }
+                List<JCExpression> argExps = poly instanceof JCNewClass ?
+                        ((JCNewClass)poly).args :
+                        ((JCMethodInvocation)poly).args;
+                Symbol msym = TreeInfo.symbolFor(poly);
+                if (msym != null) {
+                    if (!argExps.isEmpty() && msym instanceof MethodSymbol ms && ms.params != null) {
+                        VarSymbol lastParam = ms.params.head;
+                        for (VarSymbol param: ms.params) {
+                            if (param.attribute(syms.requiresIdentityType.tsym) != null && argExps.head.type.isValueBased()) {
+                                lint.logIfEnabled(argExps.head.pos(), LintWarnings.AttemptToUseValueBasedWhereIdentityExpected);
+                            }
+                            lastParam = param;
+                            argExps = argExps.tail;
+                        }
+                        while (argExps != null && !argExps.isEmpty() && lastParam != null) {
+                            if (lastParam.attribute(syms.requiresIdentityType.tsym) != null && argExps.head.type.isValueBased()) {
+                                lint.logIfEnabled(argExps.head.pos(), LintWarnings.AttemptToUseValueBasedWhereIdentityExpected);
+                            }
+                            argExps = argExps.tail;
+                        }
+                    }
+                    checkIfTypeParamsRequiresIdentity(
+                            msym.getMetadata(),
+                            poly instanceof JCNewClass ?
+                                ((JCNewClass)poly).typeargs :
+                                ((JCMethodInvocation)poly).typeargs,
+                            lint);
+                }
+            }
+            default -> throw new AssertionError("unexpected tree " + tree);
+        }
+    }
+
+    /** Check if a type required an identity class
+     */
+    private boolean checkIfIdentityIsExpected(DiagnosticPosition pos, Type t, Lint lint) {
+        if (t != null &&
+                lint != null &&
+                lint.isEnabled(LintCategory.IDENTITY)) {
+            RequiresIdentityVisitor requiresIdentityVisitor = new RequiresIdentityVisitor();
+            // we need to avoid recursion due to self referencing type vars or captures, this is why we need a set
+            requiresIdentityVisitor.visit(t, new HashSet<>());
+            if (requiresIdentityVisitor.requiresWarning) {
+                lint.logIfEnabled(pos, LintWarnings.AttemptToUseValueBasedWhereIdentityExpected);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // where
+    private class RequiresIdentityVisitor extends Types.SimpleVisitor<Void, Set<Type>> {
+        boolean requiresWarning = false;
+
+        @Override
+        public Void visitType(Type t, Set<Type> seen) {
+            return null;
+        }
+
+        @Override
+        public Void visitWildcardType(WildcardType t, Set<Type> seen) {
+            return visit(t.type, seen);
+        }
+
+        @Override
+        public Void visitTypeVar(TypeVar t, Set<Type> seen) {
+            if (seen.add(t)) {
+                visit(t.getUpperBound(), seen);
+            }
+            return null;
+        }
+
+        @Override
+        public Void visitCapturedType(CapturedType t, Set<Type> seen) {
+            if (seen.add(t)) {
+                visit(t.getUpperBound(), seen);
+                visit(t.getLowerBound(), seen);
+            }
+            return null;
+        }
+
+        @Override
+        public Void visitArrayType(ArrayType t, Set<Type> seen) {
+            return visit(t.elemtype, seen);
+        }
+
+        @Override
+        public Void visitClassType(ClassType t, Set<Type> seen) {
+            if (t != null && t.tsym != null) {
+                SymbolMetadata sm = t.tsym.getMetadata();
+                if (sm != null && !t.getTypeArguments().isEmpty()) {
+                    if (sm.getTypeAttributes().stream()
+                            .filter(ta -> ta.type.tsym == syms.requiresIdentityType.tsym &&
+                                    t.getTypeArguments().get(ta.position.parameter_index) != null &&
+                                    t.getTypeArguments().get(ta.position.parameter_index).isValueBased()).findAny().isPresent()) {
+                        requiresWarning = true;
+                        return null;
+                    }
+                }
+            }
+            visit(t.getEnclosingType(), seen);
+            for (Type targ : t.getTypeArguments()) {
+                visit(targ, seen);
+            }
+            return null;
+        }
+    } // RequiresIdentityVisitor
+
+    private void checkIfTypeParamsRequiresIdentity(SymbolMetadata sm,
+                                                     List<JCExpression> typeParamTrees,
+                                                     Lint lint) {
+        if (typeParamTrees != null && !typeParamTrees.isEmpty()) {
+            for (JCExpression targ : typeParamTrees) {
+                checkIfIdentityIsExpected(targ.pos(), targ.type, lint);
+            }
+            if (sm != null)
+                sm.getTypeAttributes().stream()
+                        .filter(ta -> (ta.type.tsym == syms.requiresIdentityType.tsym) &&
+                                typeParamTrees.get(ta.position.parameter_index).type != null &&
+                                typeParamTrees.get(ta.position.parameter_index).type.isValueBased())
+                        .forEach(ta -> lint.logIfEnabled(typeParamTrees.get(ta.position.parameter_index).pos(),
+                                CompilerProperties.LintWarnings.AttemptToUseValueBasedWhereIdentityExpected));
+        }
+    }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 596c5704cbe..a159793fe32 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -205,7 +205,7 @@ protected Modules(Context context) {
 
         allowAccessIntoSystem = options.isUnset(Option.RELEASE);
 
-        lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option);
+        lintOptions = !options.isExplicitlyDisabled(Option.XLINT, LintCategory.OPTIONS);
 
         multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH);
         ClassWriter classWriter = ClassWriter.instance(context);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
index 14b42bc01c5..9e3a978c3bc 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
@@ -503,8 +503,7 @@ public boolean validate() {
                     }
                 } else {
                     // single-module or legacy mode
-                    boolean lintPaths = options.isUnset(Option.XLINT_CUSTOM,
-                            "-" + LintCategory.PATH.option);
+                    boolean lintPaths = !options.isExplicitlyDisabled(Option.XLINT, LintCategory.PATH);
                     if (lintPaths) {
                         Path outDirParent = outDir.getParent();
                         if (outDirParent != null && Files.exists(outDirParent.resolve("module-info.class"))) {
@@ -577,7 +576,7 @@ public boolean validate() {
             reportDiag(Errors.SourcepathModulesourcepathConflict);
         }
 
-        boolean lintOptions = options.isUnset(Option.XLINT_CUSTOM, "-" + LintCategory.OPTIONS.option);
+        boolean lintOptions = !options.isExplicitlyDisabled(Option.XLINT, LintCategory.OPTIONS);
         if (lintOptions && source.compareTo(Source.DEFAULT) < 0 && !options.isSet(Option.RELEASE)) {
             if (fm instanceof BaseFileManager baseFileManager) {
                 if (source.compareTo(Source.JDK8) <= 0) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index e0fdd30c242..f4122cebb64 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -46,6 +46,7 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import javax.lang.model.SourceVersion;
@@ -491,18 +492,15 @@ public void process(OptionHelper helper, String option) throws InvalidValueExcep
             log.printRawLines(WriterKind.STDOUT, log.localize(PrefixKind.JAVAC, "opt.help.lint.header"));
             log.printRawLines(WriterKind.STDOUT,
                               String.format(LINT_KEY_FORMAT,
-                                            "all",
+                                            LINT_CUSTOM_ALL,
                                             log.localize(PrefixKind.JAVAC, "opt.Xlint.all")));
-            for (LintCategory lc : LintCategory.values()) {
-                log.printRawLines(WriterKind.STDOUT,
-                                  String.format(LINT_KEY_FORMAT,
-                                                lc.option,
-                                                log.localize(PrefixKind.JAVAC,
-                                                             "opt.Xlint.desc." + lc.option)));
-            }
+            LintCategory.options().forEach(ident -> log.printRawLines(WriterKind.STDOUT,
+                              String.format(LINT_KEY_FORMAT,
+                                            ident,
+                                            log.localize(PrefixKind.JAVAC, "opt.Xlint.desc." + ident))));
             log.printRawLines(WriterKind.STDOUT,
                               String.format(LINT_KEY_FORMAT,
-                                            "none",
+                                            LINT_CUSTOM_NONE,
                                             log.localize(PrefixKind.JAVAC, "opt.Xlint.none")));
             super.process(helper, option);
         }
@@ -835,6 +833,16 @@ private Option[] getSupportedRuntimeOptions() {
         }
     };
 
+    /**
+     * Special lint category key meaning "all lint categories".
+     */
+    public static final String LINT_CUSTOM_ALL = "all";
+
+    /**
+     * Special lint category key meaning "no lint categories".
+     */
+    public static final String LINT_CUSTOM_NONE = "none";
+
     /**
      * This exception is thrown when an invalid value is given for an option.
      * The detail string gives a detailed, localized message, suitable for use
@@ -1081,6 +1089,17 @@ public OptionKind getKind() {
         return kind;
     }
 
+    /**
+     * If this option is named {@code FOO}, obtain the option named {@code FOO_CUSTOM}.
+     *
+     * @param option regular option
+     * @return corresponding custom option
+     * @throws IllegalArgumentException if no such option exists
+     */
+    public Option getCustom() {
+        return Option.valueOf(name() + "_CUSTOM");
+    }
+
     public boolean isInBasicOptionGroup() {
         return group == BASIC;
     }
@@ -1364,12 +1383,11 @@ public static PkgInfo get(Options options) {
 
     private static Set<String> getXLintChoices() {
         Set<String> choices = new LinkedHashSet<>();
-        choices.add("all");
-        for (Lint.LintCategory c : Lint.LintCategory.values()) {
-            choices.add(c.option);
-            choices.add("-" + c.option);
-        }
-        choices.add("none");
+        choices.add(LINT_CUSTOM_ALL);
+        Lint.LintCategory.options().stream()
+          .flatMap(ident -> Stream.of(ident, "-" + ident))
+          .forEach(choices::add);
+        choices.add(LINT_CUSTOM_NONE);
         return choices;
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 46d0438f27d..2fa158565cc 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -4248,10 +4248,14 @@ compiler.err.incorrect.number.of.nested.patterns=\
 compiler.warn.declared.using.preview=\
     {0} {1} is declared using a preview feature, which may be removed in a future release.
 
-# lint: synchronization
+# lint: identity
 compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\
     attempt to synchronize on an instance of a value-based class
 
+# lint: identity
+compiler.warn.attempt.to.use.value.based.where.identity.expected=\
+    use of a value-based class with an operation that expects reliable identity
+
 # 0: type
 compiler.err.enclosing.class.type.non.denotable=\
     enclosing class type: {0}\n\
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index 1a8be506e7f..d74f5f14d15 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -292,7 +292,13 @@ javac.opt.Xlint.desc.restricted=\
     Warn about use of restricted methods.
 
 javac.opt.Xlint.desc.synchronization=\
-    Warn about synchronization attempts on instances of value-based classes.
+    Warn about synchronization attempts on instances of value-based classes.\n\
+\                         This key is a deprecated alias for ''identity'', which has the same uses and\n\
+\                         effects. Users are encouraged to use the ''identity'' category for all future\n\
+\                         and existing uses of ''synchronization''.
+
+javac.opt.Xlint.desc.identity=\
+    Warn about uses of value-based classes where an identity class is expected.
 
 javac.opt.Xdoclint=\
     Enable recommended checks for problems in javadoc comments
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java
index e7a07a57a8f..63f5b0ca75a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java
@@ -29,6 +29,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.main.Option;
 import static com.sun.tools.javac.main.Option.*;
 
@@ -170,6 +171,58 @@ public boolean isUnset(Option option, String value) {
         return !isSet(option, value);
     }
 
+    /**
+     * Check whether the given lint category is explicitly enabled or disabled.
+     *
+     * <p>
+     * If the category is neither enabled nor disabled, return the given default value.
+     *
+     * @param option the plain (non-custom) option
+     * @param lc the {@link LintCategory} in question
+     * @param defaultValue presumed default value
+     * @return true if {@code lc} would be included
+     */
+    public boolean isSet(Option option, LintCategory lc, boolean defaultValue) {
+        Option customOption = option.getCustom();
+        if (lc.optionList.stream().anyMatch(alias -> isSet(customOption, alias))) {
+            return true;
+        }
+        if (lc.optionList.stream().anyMatch(alias -> isSet(customOption, "-" + alias))) {
+            return false;
+        }
+        if (isSet(option) || isSet(customOption, Option.LINT_CUSTOM_ALL)) {
+            return true;
+        }
+        if (isSet(customOption, Option.LINT_CUSTOM_NONE)) {
+            return false;
+        }
+        return defaultValue;
+    }
+
+    /**
+     * Determine if a specific {@link LintCategory} was explicitly enabled via a custom option flag
+     * of the form {@code -Flag:all} or {@code -Flag:key}.
+     *
+     * @param option the option
+     * @param lc the {@link LintCategory} in question
+     * @return true if {@code lc} has been explicitly enabled
+     */
+    public boolean isExplicitlyEnabled(Option option, LintCategory lc) {
+        return isSet(option, lc, false);
+    }
+
+    /**
+     * Determine if a specific {@link LintCategory} was explicitly disabled via a custom option flag
+     * of the form {@code -Flag:none} or {@code -Flag:-key}.
+     *
+     * @param option the option
+     * @param lc the {@link LintCategory} in question
+     * @return true if {@code lc} has been explicitly disabled
+     */
+    public boolean isExplicitlyDisabled(Option option, LintCategory lc) {
+        return !isSet(option, lc, true);
+    }
+
     public void put(String name, String value) {
         values.put(name, value);
         initialized = true;
diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java
index 60a9ae0e476..33cff9379f2 100644
--- a/src/jdk.compiler/share/classes/module-info.java
+++ b/src/jdk.compiler/share/classes/module-info.java
@@ -164,6 +164,7 @@
  * <tr><th scope="row">{@code fallthrough}          <td>falling through from one case of a {@code switch} statement to
  *                                                      the next
  * <tr><th scope="row">{@code finally}              <td>{@code finally} clauses that do not terminate normally
+ * <tr><th scope="row">{@code identity}             <td>use of a value-based class where an identity class is expected
  * <tr><th scope="row">{@code incubating}           <td>use of incubating modules
  * <tr><th scope="row">{@code lossy-conversions}    <td>possible lossy conversions in compound assignment
  * <tr><th scope="row">{@code missing-explicit-ctor} <td>missing explicit constructors in public and protected classes
@@ -186,7 +187,11 @@
  *                                                      and interfaces
  * <tr><th scope="row">{@code static}               <td>accessing a static member using an instance
  * <tr><th scope="row">{@code strictfp}             <td>unnecessary use of the {@code strictfp} modifier
- * <tr><th scope="row">{@code synchronization}      <td>synchronization attempts on instances of value-based classes
+ * <tr><th scope="row">{@code synchronization}      <td>synchronization attempts on instances of value-based classes;
+ *                                                      this key is a deprecated alias for {@code identity}, which has
+ *                                                      the same uses and effects. Users are encouraged to use the
+ *                                                      {@code identity} category for all future and existing uses of
+ *                                                      {@code synchronization}
  * <tr><th scope="row">{@code text-blocks}          <td>inconsistent white space characters in text block indentation
  * <tr><th scope="row">{@code this-escape}          <td>superclass constructor leaking {@code this} before subclass initialized
  * <tr><th scope="row">{@code try}                  <td>issues relating to use of {@code try} blocks
diff --git a/src/jdk.compiler/share/man/javac.md b/src/jdk.compiler/share/man/javac.md
index f951ea0def3..997023487b0 100644
--- a/src/jdk.compiler/share/man/javac.md
+++ b/src/jdk.compiler/share/man/javac.md
@@ -596,6 +596,9 @@ file system locations may be directories, JAR files or JMOD files.
 
     -   `finally`: Warns about `finally` clauses that do not terminate normally.
 
+    -   `identity`: Warns about use of a value-based class where an identity
+        class is expected
+
     -   `incubating`: Warns about the use of incubating modules.
 
     -   `lossy-conversions`: Warns about possible lossy conversions
@@ -646,7 +649,9 @@ file system locations may be directories, JAR files or JMOD files.
     -   `strictfp`: Warns about unnecessary use of the `strictfp` modifier.
 
     -   `synchronization`: Warns about synchronization attempts on instances
-        of value-based classes.
+        of value-based classes. This key is a deprecated alias for `identity`,
+        which has the same uses and effects. Users are encouraged to use the
+        `identity` category for all future and existing uses of `synchronization`.
 
     -   `text-blocks`: Warns about inconsistent white space characters in text
         block indentation.
diff --git a/test/langtools/tools/javac/diags/CheckResourceKeys.java b/test/langtools/tools/javac/diags/CheckResourceKeys.java
index 9f6f37dc23d..1675d99275e 100644
--- a/test/langtools/tools/javac/diags/CheckResourceKeys.java
+++ b/test/langtools/tools/javac/diags/CheckResourceKeys.java
@@ -32,6 +32,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.regex.*;
+import java.util.stream.Stream;
 import javax.tools.*;
 import java.lang.classfile.*;
 import java.lang.classfile.constantpool.*;
@@ -175,14 +176,7 @@ void findDeadKeys(Set<String> codeStrings, Set<String> resourceKeys) {
             //check lint description keys:
             if (s.startsWith("opt.Xlint.desc.")) {
                 String option = s.substring(15);
-                boolean found = false;
-
-                for (LintCategory lc : LintCategory.values()) {
-                    if (option.equals(lc.option))
-                        found = true;
-                }
-
-                if (found)
+                if (LintCategory.options().contains(option))
                     continue;
             }
 
diff --git a/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java b/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
index 9d63a2af0a4..e677c4b3b8a 100644
--- a/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
+++ b/test/langtools/tools/javac/diags/examples/AttemptToSynchronizeOnInstanceOfVbc.java
@@ -22,7 +22,7 @@
  */
 
 // key: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class
-// options: -Xlint:synchronization
+// options: -Xlint:identity
 
 class AttemptToSynchronizeOnInstanceOfVbc {
     void foo(Integer i) {
diff --git a/test/langtools/tools/javac/diags/examples/RequiresIdentity.java b/test/langtools/tools/javac/diags/examples/RequiresIdentity.java
new file mode 100644
index 00000000000..005de46ab7c
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/RequiresIdentity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// key: compiler.warn.attempt.to.use.value.based.where.identity.expected
+// options: -Xlint:identity --add-exports java.base/jdk.internal=ALL-UNNAMED
+
+class RequiresIdentity<@jdk.internal.RequiresIdentity T> {
+    RequiresIdentity<Integer> field; // should warn
+}
diff --git a/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.java b/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.java
index 53de855fb01..d68932774a2 100644
--- a/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.java
+++ b/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.java
@@ -5,8 +5,10 @@
  * @compile/fail/ref=ExternalAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint ExternalAbuseOfVbc.java
  * @compile/fail/ref=ExternalAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint:all ExternalAbuseOfVbc.java
  * @compile/fail/ref=ExternalAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint:synchronization ExternalAbuseOfVbc.java
+ * @compile/fail/ref=ExternalAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint:identity ExternalAbuseOfVbc.java
  * @compile/fail/ref=ExternalAbuseOfVbc.out --release 16 -XDrawDiagnostics -Werror -Xlint:synchronization ExternalAbuseOfVbc.java
- * @compile/ref=LintModeOffAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint:-synchronization ExternalAbuseOfVbc.java
+ * @compile/fail/ref=ExternalAbuseOfVbc.out --release 16 -XDrawDiagnostics -Werror -Xlint:identity ExternalAbuseOfVbc.java
+ * @compile/ref=LintModeOffAbuseOfVbc.out -XDrawDiagnostics -Werror -Xlint:-synchronization,-identity ExternalAbuseOfVbc.java
  */
 
 public final class ExternalAbuseOfVbc {
diff --git a/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.out b/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.out
index b042a2c2139..d03e33e06d5 100644
--- a/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.out
+++ b/test/langtools/tools/javac/lint/ExternalAbuseOfVbc.out
@@ -1,4 +1,4 @@
-ExternalAbuseOfVbc.java:19:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class
+ExternalAbuseOfVbc.java:21:13: compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff --git a/test/langtools/tools/javac/lint/RequiresIdentityHelper.java b/test/langtools/tools/javac/lint/RequiresIdentityHelper.java
new file mode 100644
index 00000000000..abc50d6d446
--- /dev/null
+++ b/test/langtools/tools/javac/lint/RequiresIdentityHelper.java
@@ -0,0 +1,21 @@
+/* /nodynamiccopyright/ */
+
+package java.lang;
+
+public class RequiresIdentityHelper<@jdk.internal.RequiresIdentity T> {
+    public RequiresIdentityHelper() {}
+    public <@jdk.internal.RequiresIdentity TT> RequiresIdentityHelper(@jdk.internal.RequiresIdentity Object o) {}
+
+    class RequiresIdentity2<TT> {
+        public RequiresIdentity2() {}
+        public void foo(@jdk.internal.RequiresIdentity Object o) {}
+        public void bar(@jdk.internal.RequiresIdentity Object... o) {}
+        public void gg(@jdk.internal.RequiresIdentity TT ri) {}
+    }
+
+    interface RequiresIdentityInt<@jdk.internal.RequiresIdentity T> {}
+
+    interface MyIntFunction<@jdk.internal.RequiresIdentity R> {
+        R apply(int value);
+    }
+}
diff --git a/test/langtools/tools/javac/lint/RequiresIdentityTest.java b/test/langtools/tools/javac/lint/RequiresIdentityTest.java
new file mode 100644
index 00000000000..ddc25c8d311
--- /dev/null
+++ b/test/langtools/tools/javac/lint/RequiresIdentityTest.java
@@ -0,0 +1,90 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8354556
+ * @summary Expand value-based class warnings to java.lang.ref API
+ * @compile --patch-module java.base=${test.src} RequiresIdentityHelper.java
+ * @compile/fail/ref=RequiresIdentityTest.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:identity RequiresIdentityTest.java
+ * @compile/fail/ref=RequiresIdentityTest.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:synchronization RequiresIdentityTest.java
+ * @compile/ref=RequiresIdentityTest2.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:-identity RequiresIdentityTest.java
+ * @compile/ref=RequiresIdentityTest2.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:-synchronization RequiresIdentityTest.java
+ * @compile/fail/ref=RequiresIdentityTest.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:identity RequiresIdentityHelper.java RequiresIdentityTest.java
+ * @compile/fail/ref=RequiresIdentityTest.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:synchronization RequiresIdentityHelper.java RequiresIdentityTest.java
+ * @compile/ref=RequiresIdentityTest2.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:-identity RequiresIdentityHelper.java RequiresIdentityTest.java
+ * @compile/ref=RequiresIdentityTest2.out --patch-module java.base=${test.src} -Werror -XDrawDiagnostics -Xlint:-synchronization RequiresIdentityHelper.java RequiresIdentityTest.java
+ */
+
+package java.lang;
+
+@SuppressWarnings("deprecation")
+public class RequiresIdentityTest extends RequiresIdentityHelper<Integer> // should warn
+                                  implements RequiresIdentityHelper.RequiresIdentityInt<Integer> { // should warn
+    class Box<T> {}
+
+    RequiresIdentityHelper<Integer> field;                      // should warn
+    RequiresIdentityHelper<Integer>[] field2;                   // should warn
+    Box<? extends RequiresIdentityHelper<Integer>> field3;      // should warn
+    Box<? super RequiresIdentityHelper<Integer>> field4;        // should warn
+    RequiresIdentityHelper<Integer> field5 = new RequiresIdentityHelper<Integer>(); // two warnings here
+
+    public RequiresIdentityTest() {}
+    public RequiresIdentityTest(Integer i) {
+        super(i); // should warn
+    }
+
+    void test(RequiresIdentity2<Object> ri, Integer i) { // warn on the first argument due to its enclosing type: RequiresIdentityHelper<Integer>
+        RequiresIdentityHelper<Integer> localVar;     // should warn
+        RequiresIdentityHelper<Integer>[] localVar2;  // should warn
+        // there should be warnings for the invocations below
+        ri.foo(i);
+        ri.bar(i,  // warn here
+               i); // and here too
+        ri.gg(i);
+    }
+
+    interface I extends RequiresIdentityHelper.RequiresIdentityInt<Integer> {} // should warn
+
+    void m(Object o) {
+        RequiresIdentityHelper<?> ri = (RequiresIdentityHelper<Integer>) o; // should warn
+    }
+
+    RequiresIdentityHelper<Integer> test() { // warn
+        return null;
+    }
+
+    // two warns here one for the type parameter and one for the result type
+    <T extends RequiresIdentityHelper<Integer>> T test2() { return null; }
+
+    class SomeClass<T extends RequiresIdentityHelper<Integer>> {} // warn
+
+    record R(RequiresIdentityHelper<Integer> c) {} // warn
+    record RR(R r) {}
+
+    void m1(RequiresIdentityInt<Integer> ri) { // warn here
+        if (ri instanceof RequiresIdentityInt<Integer> rii) {} // and here
+    }
+
+    void m2(RR rr) {
+        if (rr instanceof RR(R(RequiresIdentityHelper<Integer> rii))) {}
+    }
+
+    <T> void m3() {}
+    void m4() {
+        this.<RequiresIdentityHelper<Integer>>m3();
+    }
+
+    MyIntFunction<Integer> field6 = Integer::new; // two warnings here
+
+    class Run<T> {
+        public <@jdk.internal.RequiresIdentity K> void run() {}
+    }
+    void m5(Runnable r) {}
+    void m6() {
+        m5(new Run<Object>()::<Integer>run);
+    }
+
+    void m7(Integer i, Object o) {
+        RequiresIdentityHelper<Object> var1 = new <Object>RequiresIdentityHelper<Object>(i);
+        RequiresIdentityHelper<Object> var2 = new <Integer>RequiresIdentityHelper<Object>(o);
+        RequiresIdentityHelper<Integer> var3 = new <Object>RequiresIdentityHelper<Integer>(o);
+    }
+}
diff --git a/test/langtools/tools/javac/lint/RequiresIdentityTest.out b/test/langtools/tools/javac/lint/RequiresIdentityTest.out
new file mode 100644
index 00000000000..ddcd4c91354
--- /dev/null
+++ b/test/langtools/tools/javac/lint/RequiresIdentityTest.out
@@ -0,0 +1,39 @@
+RequiresIdentityTest.java:19:65: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:20:88: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:23:27: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:24:36: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:25:8: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:26:8: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:27:72: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:27:27: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:31:15: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:34:32: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:35:31: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:36:40: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:38:16: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:39:16: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:40:16: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:41:15: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:44:67: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:47:63: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:50:27: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:55:6: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:55:49: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:57:21: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:59:36: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:62:32: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:63:46: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:67:54: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:72:37: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:75:37: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:75:18: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:82:32: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:86:90: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:87:52: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:88:82: compiler.warn.attempt.to.use.value.based.where.identity.expected
+RequiresIdentityTest.java:88:31: compiler.warn.attempt.to.use.value.based.where.identity.expected
+- compiler.err.warnings.and.werror
+- compiler.note.unchecked.filename: RequiresIdentityTest.java
+- compiler.note.unchecked.recompile
+1 error
+34 warnings
diff --git a/test/langtools/tools/javac/lint/RequiresIdentityTest2.out b/test/langtools/tools/javac/lint/RequiresIdentityTest2.out
new file mode 100644
index 00000000000..55a7ccdeb84
--- /dev/null
+++ b/test/langtools/tools/javac/lint/RequiresIdentityTest2.out
@@ -0,0 +1,2 @@
+- compiler.note.unchecked.filename: RequiresIdentityTest.java
+- compiler.note.unchecked.recompile

From 890456f0f78cc37c72b438a50ddf2605e1dfd91b Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 19 May 2025 23:43:19 +0000
Subject: [PATCH 530/901] 8355078: java.awt.Color.createContext() uses
 unnecessary synchronization

Reviewed-by: prr
---
 .../share/classes/java/awt/Color.java         |  11 +-
 .../classes/java/awt/ColorPaintContext.java   |  41 ++--
 .../ColorPaintContextBasicTest.java           | 210 ++++++++++++++++++
 .../ColorPaintContextStateTrackerTest.java    |  55 +++++
 4 files changed, 283 insertions(+), 34 deletions(-)
 create mode 100644 test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextBasicTest.java
 create mode 100644 test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextStateTrackerTest.java

diff --git a/src/java.desktop/share/classes/java/awt/Color.java b/src/java.desktop/share/classes/java/awt/Color.java
index 3b67cd6ee3b..923afb91866 100644
--- a/src/java.desktop/share/classes/java/awt/Color.java
+++ b/src/java.desktop/share/classes/java/awt/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, 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
@@ -1195,11 +1195,10 @@ public ColorSpace getColorSpace() {
      * @see AffineTransform
      * @see RenderingHints
      */
-    public synchronized PaintContext createContext(ColorModel cm, Rectangle r,
-                                                   Rectangle2D r2d,
-                                                   AffineTransform xform,
-                                                   RenderingHints hints) {
-        return new ColorPaintContext(getRGB(), cm);
+    public PaintContext createContext(ColorModel cm, Rectangle r,
+                                      Rectangle2D r2d, AffineTransform xform,
+                                      RenderingHints hints) {
+        return new ColorPaintContext(getRGB());
     }
 
     /**
diff --git a/src/java.desktop/share/classes/java/awt/ColorPaintContext.java b/src/java.desktop/share/classes/java/awt/ColorPaintContext.java
index 15e296cf525..426811bf19e 100644
--- a/src/java.desktop/share/classes/java/awt/ColorPaintContext.java
+++ b/src/java.desktop/share/classes/java/awt/ColorPaintContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, 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
@@ -23,61 +23,46 @@
  * questions.
  */
 
-
-
 package java.awt;
 
 import java.awt.image.ColorModel;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
-import sun.awt.image.IntegerComponentRaster;
 import java.util.Arrays;
 
-class ColorPaintContext implements PaintContext {
-    int color;
-    WritableRaster savedTile;
+import sun.awt.image.IntegerComponentRaster;
+
+final class ColorPaintContext implements PaintContext {
 
-    protected ColorPaintContext(int color, ColorModel cm) {
+    private final int color;
+    private volatile WritableRaster savedTile;
+
+    ColorPaintContext(int color) {
         this.color = color;
     }
 
+    @Override
     public void dispose() {
     }
 
-    /*
-     * Returns the RGB value representing the color in the default sRGB
-     * {@link ColorModel}.
-     * (Bits 24-31 are alpha, 16-23 are red, 8-15 are green, 0-7 are
-     * blue).
-     * @return the RGB value of the color in the default sRGB
-     *         {@code ColorModel}.
-     * @see java.awt.image.ColorModel#getRGBdefault
-     * @see #getRed
-     * @see #getGreen
-     * @see #getBlue
-     */
-    int getRGB() {
-        return color;
-    }
-
+    @Override
     public ColorModel getColorModel() {
         return ColorModel.getRGBdefault();
     }
 
-    public synchronized Raster getRaster(int x, int y, int w, int h) {
+    @Override
+    public Raster getRaster(int x, int y, int w, int h) {
         WritableRaster t = savedTile;
 
         if (t == null || w > t.getWidth() || h > t.getHeight()) {
             t = getColorModel().createCompatibleWritableRaster(w, h);
             IntegerComponentRaster icr = (IntegerComponentRaster) t;
             Arrays.fill(icr.getDataStorage(), color);
-            // Note - markDirty is probably unnecessary since icr is brand new
-            icr.markDirty();
+            // Note - icr.markDirty() is unnecessary since icr is brand new
             if (w <= 64 && h <= 64) {
                 savedTile = t;
             }
         }
-
         return t;
     }
 }
diff --git a/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextBasicTest.java b/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextBasicTest.java
new file mode 100644
index 00000000000..3877642897d
--- /dev/null
+++ b/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextBasicTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.HeadlessException;
+import java.awt.Image;
+import java.awt.Paint;
+import java.awt.PaintContext;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.VolatileImage;
+import java.util.function.Consumer;
+
+/**
+ * @test
+ * @bug 8355078
+ * @summary Checks if different image types (BufferedImage and VolatileImage)
+ *          produce the same results when using different ways to fill the image
+ *          (setColor, setPaint, and custom Paint)
+ */
+public final class ColorPaintContextBasicTest {
+
+    private static final int SIZE = 100;
+
+    private static final int[] TYPES = new int[]{
+            BufferedImage.TYPE_INT_RGB,
+            BufferedImage.TYPE_INT_ARGB,
+            BufferedImage.TYPE_INT_ARGB_PRE,
+            BufferedImage.TYPE_INT_BGR,
+            BufferedImage.TYPE_3BYTE_BGR,
+            BufferedImage.TYPE_4BYTE_ABGR,
+            BufferedImage.TYPE_4BYTE_ABGR_PRE,
+    };
+
+    private static final Color[] COLORS = {
+            Color.RED,
+            Color.GREEN,
+            Color.BLUE,
+            Color.YELLOW,
+            Color.MAGENTA,
+            Color.CYAN,
+            Color.BLACK,
+            Color.WHITE,
+            new Color(255, 165, 0),
+            new Color(128, 0, 128),
+            new Color(255, 0, 0, 128)
+    };
+
+    /**
+     * Custom implementation of Paint that wraps a Color but is intentionally
+     * not a Color. This is used to bypass the "paint instanceof Color"
+     * optimization in Graphics2D#setPaint().
+     */
+    private static final class CustomPaint implements Paint {
+
+        private final Color color;
+
+        private CustomPaint(Color color) {
+            this.color = color;
+        }
+
+        @Override
+        public PaintContext createContext(ColorModel cm,
+                                          Rectangle deviceBounds,
+                                          Rectangle2D userBounds,
+                                          AffineTransform xform,
+                                          RenderingHints hints)
+        {
+            return color.createContext(cm, deviceBounds, userBounds, xform,
+                                       hints);
+        }
+
+        @Override
+        public int getTransparency() {
+            return color.getTransparency();
+        }
+    }
+
+    public static void main(String[] args) {
+        GraphicsConfiguration gc = null;
+        try {
+            gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                                    .getDefaultScreenDevice()
+                                    .getDefaultConfiguration();
+        } catch (HeadlessException ignore) {
+            // skip VolatileImage validation
+        }
+
+        for (Color color : COLORS) {
+            int rgb = color.getRGB();
+            System.err.println("Test color: " + Integer.toHexString(rgb));
+            for (int type : TYPES) {
+                var goldBI = new BufferedImage(SIZE, SIZE, type);
+                var paintBI = new BufferedImage(SIZE, SIZE, type);
+                var customBI = new BufferedImage(SIZE, SIZE, type);
+
+                fill(goldBI, g -> g.setColor(color));
+                fill(paintBI, g -> g.setPaint(color));
+                fill(customBI, g -> g.setPaint(new CustomPaint(color)));
+
+                if (!verify(paintBI, goldBI)) {
+                    throw new RuntimeException("paintBI != goldBI");
+                }
+
+                if (!verify(customBI, goldBI)) {
+                    throw new RuntimeException("customBI != goldBI");
+                }
+
+                if (gc == null) {
+                    continue;
+                }
+
+                int transparency = goldBI.getTransparency();
+                var goldVI = fillVI(gc, transparency, g -> g.setColor(color));
+                var paintVI = fillVI(gc, transparency, g -> g.setPaint(color));
+                var customVI = fillVI(gc, transparency,
+                                      g -> g.setPaint(new CustomPaint(color)));
+
+                if (gc.getColorModel().getPixelSize() >= 24) {
+                    if (color.getAlpha() == 255 && !verify(goldBI, goldVI)) {
+                        throw new RuntimeException("goldBI != goldVI");
+                    }
+                }
+
+                if (!verify(paintVI, goldVI)) {
+                    throw new RuntimeException("paintVI != goldVI");
+                }
+
+                if (!verify(customVI, goldVI)) {
+                    throw new RuntimeException("customVI != goldVI");
+                }
+            }
+        }
+    }
+
+    private static void fill(Image img, Consumer<Graphics2D> action) {
+        Graphics2D g2d = (Graphics2D) img.getGraphics();
+        action.accept(g2d);
+        g2d.fillRect(0, 0, SIZE, SIZE);
+        g2d.dispose();
+    }
+
+    private static BufferedImage fillVI(GraphicsConfiguration gc,
+                                        int transparency,
+                                        Consumer<Graphics2D> action)
+    {
+        var vi = gc.createCompatibleVolatileImage(SIZE, SIZE, transparency);
+        int attempt = 0;
+        while (true) {
+            if (++attempt > 10) {
+                throw new RuntimeException("Too many attempts: " + attempt);
+            }
+
+            int status = vi.validate(gc);
+            if (status == VolatileImage.IMAGE_INCOMPATIBLE) {
+                vi = gc.createCompatibleVolatileImage(SIZE, SIZE, transparency);
+            }
+
+            fill(vi, action);
+
+            BufferedImage snapshot = vi.getSnapshot();
+            if (vi.contentsLost()) {
+                continue;
+            }
+            return snapshot;
+        }
+    }
+
+    private static boolean verify(BufferedImage img1, BufferedImage img2) {
+        for (int y = 0; y < SIZE; y++) {
+            for (int x = 0; x < SIZE; x++) {
+                int rgb1 = img1.getRGB(x, y);
+                int rgb2 = img2.getRGB(x, y);
+                if (rgb1 != rgb2) {
+                    System.err.println("rgb1: " + Integer.toHexString(rgb1));
+                    System.err.println("rgb2: " + Integer.toHexString(rgb2));
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextStateTrackerTest.java b/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextStateTrackerTest.java
new file mode 100644
index 00000000000..629b8a74957
--- /dev/null
+++ b/test/jdk/java/awt/ColorClass/PaintContext/ColorPaintContextStateTrackerTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+
+import sun.awt.image.SurfaceManager;
+import sun.java2d.StateTrackable;
+import sun.java2d.SurfaceData;
+
+/**
+ * @test
+ * @bug 8355078
+ * @summary Checks that ColorPaintContext surface is STABLE and cacheable
+ * @modules java.desktop/sun.awt.image
+ *          java.desktop/sun.java2d
+ */
+public final class ColorPaintContextStateTrackerTest {
+
+    public static void main(String[] args) {
+        var context = Color.RED.createContext(null, null, null, null, null);
+        var cm = context.getColorModel();
+        var raster = (WritableRaster) context.getRaster(0, 0, 1, 1);
+        var bi = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
+
+        SurfaceData sd = SurfaceManager.getManager(bi).getPrimarySurfaceData();
+        StateTrackable.State state = sd.getState();
+        if (state != StateTrackable.State.STABLE) {
+            System.err.println("Actual: " + state);
+            System.err.println("Expected: " + StateTrackable.State.STABLE);
+            throw new RuntimeException("Wrong state");
+        }
+    }
+}

From 39d8d109dd8ab300ff6579f8077468a6b02cfbda Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 20 May 2025 02:40:05 +0000
Subject: [PATCH 531/901] 8348906: InstanceOfTree#getType doesn't specify when
 it returns null

Reviewed-by: liach
---
 .../com/sun/source/tree/InstanceOfTree.java   | 37 ++++++--
 .../javac/patterns/InstanceOfModelTest.java   | 90 +++++++++++++++++++
 2 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/InstanceOfModelTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
index f752f7f3191..793f4be1fc4 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
@@ -31,6 +31,8 @@
  * For example:
  * <pre>
  *   <em>expression</em> instanceof <em>type</em>
+ *
+ *   <em>expression</em> instanceof <em>pattern</em>
  * </pre>
  *
  * @jls 15.20.2 The instanceof Operator
@@ -48,29 +50,50 @@ public interface InstanceOfTree extends ExpressionTree {
     ExpressionTree getExpression();
 
     /**
-     * Returns the type for which to check.
-     * @return the type
+     * Returns the type for which to check, or {@code null} if this {@code instanceof}
+     * uses a pattern other the {@link BindingPatternTree}.
+     *
+     * <p>For {@code instanceof} without a pattern, i.e. in the following form:
+     * <pre>
+     *   <em>expression</em> instanceof <em>type</em>
+     * </pre>
+     * returns the type.
+     *
+     * <p>For {@code instanceof} with a {@link BindingPatternTree}, i.e. in the following form:
+     * <pre>
+     *   <em>expression</em> instanceof <em>type</em> <em>variable_name</em>
+     * </pre>
+     * returns the type.
+     *
+     * <p>For instanceof with a pattern, i.e. in the following form:
+     * <pre>
+     *   <em>expression</em> instanceof <em>pattern</em>
+     * </pre>
+     * returns {@code null}.
+     *
+     * @return the type or {@code null} if this {@code instanceof} uses a pattern other than
+     *         the {@linkplain BindingPatternTree}
      * @see #getPattern()
      */
     Tree getType();
 
     /**
-     * Returns the tested pattern, or null if this instanceof does not use
+     * Returns the tested pattern, or {@code null} if this {@code instanceof} does not use
      * a pattern.
      *
      * <p>For instanceof with a pattern, i.e. in the following form:
      * <pre>
-     *   <em>expression</em> instanceof <em>type</em> <em>variable name</em>
+     *   <em>expression</em> instanceof <em>pattern</em>
      * </pre>
      * returns the pattern.
      *
-     * <p>For instanceof without a pattern, i.e. in the following form:
+     * <p>For {@code instanceof} without a pattern, i.e. in the following form:
      * <pre>
      *   <em>expression</em> instanceof <em>type</em>
      * </pre>
-     * returns null.
+     * returns {@code null}.
      *
-     * @return the tested pattern, or null if this instanceof does not use a pattern
+     * @return the tested pattern, or {@code null} if this {@code instanceof} does not use a pattern
      * @since 16
      */
     PatternTree getPattern();
diff --git a/test/langtools/tools/javac/patterns/InstanceOfModelTest.java b/test/langtools/tools/javac/patterns/InstanceOfModelTest.java
new file mode 100644
index 00000000000..b756c9263bd
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/InstanceOfModelTest.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
+ * @bug 8348906
+ * @summary Verify the InstanceOfTree model
+ */
+
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.InstanceOfTree;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreeScanner;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class InstanceOfModelTest {
+    private final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+
+    public static void main(String... args) throws Exception {
+        new InstanceOfModelTest().run();
+    }
+
+    private void run() throws Exception {
+        JavaFileObject input =
+                SimpleJavaFileObject.forSource(URI.create("mem://Test.java"),
+                                               """
+                                               public class Test {
+                                                   void test(Object o) {
+                                                       boolean _ = o instanceof R;
+                                                       boolean _ = o instanceof R r;
+                                                       boolean _ = o instanceof R(var v);
+                                                   }
+                                                   record R(int i) {}
+                                               }
+                                               """);
+        JavacTask task =
+                (JavacTask) compiler.getTask(null, null, null, null, null, List.of(input));
+        CompilationUnitTree cut = task.parse().iterator().next();
+
+        task.analyze();
+
+        List<String> instanceOf = new ArrayList<>();
+
+        new TreeScanner<Void, Void>() {
+            @Override
+            public Void visitInstanceOf(InstanceOfTree node, Void p) {
+                instanceOf.add(node.getPattern() + ":" + node.getType());
+                return super.visitInstanceOf(node, p);
+            }
+        }.scan(cut, null);
+
+        List<String> expectedInstanceOf = List.of(
+            "null:R",
+            "R r:R",
+            "R(int v):null"
+        );
+
+        if (!Objects.equals(expectedInstanceOf, instanceOf)) {
+            throw new AssertionError("Expected: " + expectedInstanceOf + ",\n" +
+                                     "got: " + instanceOf);
+        }
+    }
+}

From 7077535c0b0a6ea0a2a167f9135b1504a3d71fb3 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 20 May 2025 03:44:25 +0000
Subject: [PATCH 532/901] 8356595: Convert -Xlog:cds to -Xlog:aot (step1)

Reviewed-by: ccheung, dholmes, jsjolen, matsaave
---
 make/GenerateLinkOptData.gmk                  |   4 +
 make/RunTests.gmk                             |   4 +-
 src/hotspot/share/cds/aotArtifactFinder.cpp   |   2 +-
 src/hotspot/share/cds/aotClassLinker.cpp      |   8 +-
 src/hotspot/share/cds/aotClassLocation.cpp    |   3 +-
 .../share/cds/aotLinkedClassBulkLoader.cpp    |  14 +-
 src/hotspot/share/cds/aotLogging.hpp          | 167 +++++++++++++++
 .../share/cds/aotReferenceObjSupport.cpp      |  12 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |  81 +++----
 src/hotspot/share/cds/archiveHeapLoader.cpp   |   4 +-
 src/hotspot/share/cds/archiveHeapWriter.cpp   |   8 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   2 +-
 src/hotspot/share/cds/cdsEnumKlass.cpp        |   6 +-
 src/hotspot/share/cds/cdsHeapVerifier.cpp     |   6 +-
 src/hotspot/share/cds/dumpAllocStats.cpp      |   2 +-
 src/hotspot/share/cds/filemap.cpp             | 201 +++++++++---------
 src/hotspot/share/cds/finalImageRecipes.cpp   |  10 +-
 src/hotspot/share/cds/heapShared.cpp          | 125 +++++------
 src/hotspot/share/cds/lambdaFormInvokers.cpp  |  16 +-
 src/hotspot/share/cds/metaspaceShared.cpp     | 134 ++++++------
 src/hotspot/share/cds/metaspaceShared.hpp     |   2 +-
 src/hotspot/share/classfile/javaClasses.cpp   |   6 +-
 src/hotspot/share/oops/klass.cpp              |  18 +-
 src/hotspot/share/prims/jvmtiTagMap.cpp       |   4 +-
 src/hotspot/share/runtime/arguments.cpp       |   7 +-
 src/hotspot/share/services/heapDumper.cpp     |   8 +-
 .../jtreg/runtime/cds/appcds/AOTFlags.java    |  26 +--
 .../cds/appcds/ArchiveRelocationTest.java     |   2 +-
 .../cds/appcds/ClassListFormatBase.java       |   6 +-
 .../cds/appcds/DumpingWithNoCoops.java        |   4 +-
 .../cds/appcds/LambdaWithJavaAgent.java       |   4 +-
 .../AOTCacheSupportForCustomLoaders.java      |  10 +-
 .../cds/appcds/aotCache/AOTLoggingTag.java    | 114 ++++++++++
 .../cds/appcds/aotCache/VerifierFailOver.java |   2 +-
 .../aotClassLinking/AOTCacheWithZGC.java      |   2 +-
 .../AOTClassLinkingVMOptions.java             |   9 +-
 .../aotClassLinking/BulkLoaderTest.java       |   4 +-
 .../aotClassLinking/FakeCodeLocation.java     |   8 +-
 .../aotCode/AOTCodeCompressedOopsTest.java    |   4 +-
 .../cacheObject/ArchiveHeapTestClass.java     |  12 +-
 .../appcds/dynamicArchive/ArrayKlasses.java   |   4 +-
 .../dynamicArchive/DynamicLotsOfClasses.java  |   4 +-
 .../cds/appcds/jigsaw/ExactOptionMatch.java   |  10 +-
 .../appcds/jigsaw/addmods/AddmodsOption.java  |   4 +-
 .../jigsaw/addopens/AddopensOption.java       |   2 +-
 .../appcds/jigsaw/module/ModuleOption.java    |   4 +-
 .../jvmti/CFLH/ClassFileLoadHookTest.java     |   3 +-
 .../ReplaceCriticalClasses.java               |   5 +-
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |  17 +-
 49 files changed, 710 insertions(+), 404 deletions(-)
 create mode 100644 src/hotspot/share/cds/aotLogging.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 1f52b88e1ef..6f6e1f29b4c 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -76,11 +76,13 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    $(CLASSLIST_FILE_VM_OPTS) \
+	    -Xlog:aot=off \
 	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist $(LOG_DEBUG)
 	$(GREP) -v HelloClasslist $@.raw > $@.interim
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
+	    -Xlog:aot=off \
 	    -Xlog:cds=off \
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
 	    -Xmx128M -Xms128M $(LOG_INFO)
@@ -89,6 +91,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    $(CLASSLIST_FILE_VM_OPTS) \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
+	    -Xlog:aot=off \
 	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.HelloClasslist \
@@ -103,6 +106,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
 	$(GREP) -v @cp $@.raw.3 > $@.raw.4
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
+	    -Xlog:aot=off \
 	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.SortClasslist $@.raw.4 > $@
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 3c0280353a9..95d3dee7013 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -754,7 +754,7 @@ define SetupAOTBody
             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:class+load,cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error \
+	        -Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log -Xlog:cds*=error -Xlog:aot*=error \
 	        -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
 	        TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
 	))
@@ -762,7 +762,7 @@ define SetupAOTBody
 	$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
 	$$(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 \
+	        $$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
 	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
 	        -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
 	))
diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index d87b501150b..f16e0d9e908 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -97,7 +97,7 @@ void AOTArtifactFinder::find_artifacts() {
         oop orig_mirror = Universe::java_mirror(bt);
         oop scratch_mirror = HeapShared::scratch_java_mirror(bt);
         HeapShared::scan_java_mirror(orig_mirror);
-        log_trace(cds, heap, mirror)(
+        log_trace(aot, heap, mirror)(
             "Archived %s mirror object from " PTR_FORMAT,
             type2name(bt), p2i(scratch_mirror));
         Universe::set_archived_basic_type_mirror_index(bt, HeapShared::append_root(scratch_mirror));
diff --git a/src/hotspot/share/cds/aotClassLinker.cpp b/src/hotspot/share/cds/aotClassLinker.cpp
index cd3712f0c65..319c94f553d 100644
--- a/src/hotspot/share/cds/aotClassLinker.cpp
+++ b/src/hotspot/share/cds/aotClassLinker.cpp
@@ -113,9 +113,9 @@ void AOTClassLinker::add_new_candidate(InstanceKlass* ik) {
   _candidates->put_when_absent(ik, true);
   _sorted_candidates->append(ik);
 
-  if (log_is_enabled(Info, cds, aot, link)) {
+  if (log_is_enabled(Info, aot, link)) {
     ResourceMark rm;
-    log_info(cds, aot, link)("%s %s %p", class_category_name(ik), ik->external_name(), ik);
+    log_info(aot, link)("%s %s %p", class_category_name(ik), ik->external_name(), ik);
   }
 }
 
@@ -145,7 +145,7 @@ bool AOTClassLinker::try_add_candidate(InstanceKlass* ik) {
       InstanceKlass* nest_host = ik->nest_host_not_null();
       if (!try_add_candidate(nest_host)) {
         ResourceMark rm;
-        log_warning(cds, aot, link)("%s cannot be aot-linked because it nest host is not aot-linked", ik->external_name());
+        log_warning(aot, link)("%s cannot be aot-linked because it nest host is not aot-linked", ik->external_name());
         return false;
       }
     }
@@ -228,7 +228,7 @@ Array<InstanceKlass*>* AOTClassLinker::write_classes(oop class_loader, bool is_j
     return nullptr;
   } else {
     const char* category = class_category_name(list.at(0));
-    log_info(cds, aot, link)("wrote %d class(es) for category %s", list.length(), category);
+    log_info(aot, link)("wrote %d class(es) for category %s", list.length(), category);
     return ArchiveUtils::archive_array(&list);
   }
 }
diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index a2a707e2608..ae7dcd7ffd4 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -1029,8 +1029,7 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
         MetaspaceShared::unrecoverable_loading_error();
       }
     } else {
-      log_warning(cds)("%s%s", mismatch_msg, hint_msg);
-      MetaspaceShared::report_loading_error(nullptr);
+      MetaspaceShared::report_loading_error("%s%s", mismatch_msg, hint_msg);
     }
   }
   return success;
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
index 31d95024e3b..0c4e07d3328 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
@@ -179,11 +179,11 @@ void AOTLinkedClassBulkLoader::load_classes_impl(AOTLinkedClassCategory class_ca
 
   for (int i = 0; i < classes->length(); i++) {
     InstanceKlass* ik = classes->at(i);
-    if (log_is_enabled(Info, cds, aot, load)) {
+    if (log_is_enabled(Info, aot, load)) {
       ResourceMark rm(THREAD);
-      log_info(cds, aot, load)("%-5s %s%s%s", category_name, ik->external_name(),
-                               ik->is_loaded() ? " (already loaded)" : "",
-                               ik->is_hidden() ? " (hidden)" : "");
+      log_info(aot, load)("%-5s %s%s%s", category_name, ik->external_name(),
+                          ik->is_loaded() ? " (already loaded)" : "",
+                          ik->is_hidden() ? " (hidden)" : "");
     }
 
     if (!ik->is_loaded()) {
@@ -236,11 +236,11 @@ void AOTLinkedClassBulkLoader::initiate_loading(JavaThread* current, const char*
     assert(ik->class_loader() == nullptr ||
            ik->class_loader() == SystemDictionary::java_platform_loader(), "must be");
     if (ik->is_public() && !ik->is_hidden()) {
-      if (log_is_enabled(Info, cds, aot, load)) {
+      if (log_is_enabled(Info, aot, load)) {
         ResourceMark rm(current);
         const char* defining_loader = (ik->class_loader() == nullptr ? "boot" : "plat");
-        log_info(cds, aot, load)("%s %s (initiated, defined by %s)", category_name, ik->external_name(),
-                                 defining_loader);
+        log_info(aot, load)("%s %s (initiated, defined by %s)", category_name, ik->external_name(),
+                            defining_loader);
       }
       SystemDictionary::add_to_initiating_loader(current, ik, loader_data);
     }
diff --git a/src/hotspot/share/cds/aotLogging.hpp b/src/hotspot/share/cds/aotLogging.hpp
new file mode 100644
index 00000000000..f9515341d72
--- /dev/null
+++ b/src/hotspot/share/cds/aotLogging.hpp
@@ -0,0 +1,167 @@
+/*
+ * 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_CDS_AOTLOGGING_HPP
+#define SHARE_CDS_AOTLOGGING_HPP
+
+#include "cds/cds_globals.hpp"
+#include "cds/cdsConfig.hpp"
+#include "logging/log.hpp"
+
+// UL Logging for AOT
+// ==================
+//
+// The old "CDS" feature is rebranded as "AOT" in JEP 483. Therefore, UL logging
+// related to the AOT features should be using the [aot] tag.
+//
+// However, some old scripts may be using -Xlog:cds for diagnostic purposes. To
+// provide a fair amount of backwards compatibility for such scripts, some AOT
+// logs that are likely to be used by such scripts are printed using the macros
+// in this header file.
+//
+// NOTE: MOST of the AOT logs will be using the usual macros such as log_info(aot)(...).
+// The information below does NOT apply to such logs.
+//
+// CDS Compatibility Logs & Compatibility Macros
+// =============================================
+//
+// A subset of the original CDS logs (the "CDS Compatibility Logs") have been
+// chosen in JDK 25. These logs are guarded using the aot_log_xxx compatibility
+// macros. Before JDK 25, such code looked like this:
+//
+//      log_info(cds)("trying to map %s%s", info, _full_path);
+//      log_warning(cds)("Unable to read the file header.");
+//
+// New code since JDK 25:
+//
+//      aot_log_info(aot)("trying to map %s%s", info, _full_path);
+//      aot_log_warning(aot)("Unable to read the file header.");
+//
+// The messages printed with the log_aot_xxx() macros work as if they are
+// using the [cds] tag when running with the "classic" CDS workflow (i.e.,
+// new -XX:AOTxxx flags are not used).
+//
+//      $ java -Xlog:cds -XX:SharedArchiveFile=bad.jsa ...
+//      [0.020s][info][cds] trying to map bad.jsa
+//      [0.020s][warning][cds] Unable to read the file header
+//
+// However, when running new AOT flags such as-XX:AOTCache, these messages are
+// under the [aot] tag:
+//
+//      $ java -Xlog:aot -XX:AOTCache=bad.aot ...
+//      [0.020s][info][aot] trying to map bad.aot
+//      [0.020s][warning][aot] Unable to read the file header
+//
+// Rules on selection and printing
+//
+// [1] When using AOT cache
+//     - These logs are selected via the aot tag, and not the cds tag.
+//       They are always printed with [aot] decoration
+//
+// [2] When using CDS archives
+//     - These logs are selected via the cds tag, and not the aot tag.
+//       They are always printed with [cds] decoration
+//
+// Deprecation Process
+// ===================
+//
+// This is modeled after the deprecate/obsolete/expire process of VM options in arguments.cpp
+//
+// JDK 25 - When no -XX:AOTxxx flags are used, the CDS Compatibility Logs must be selected
+//          with -Xlog:cds
+//
+// JDK 26 - Same as above, except that when -Xlog:cds is specified in the command-line, a warning
+//          message is printed to indicate that -Xlog:cds is deprecated.
+//
+// JDK 27 - The CDS Compatibility Logs must be selected with -Xlog:aot.
+//
+//          When -Xlog:cds is specified in the command-line, a warning message is printed to
+//          indicate that -Xlog:cds is obsolete.
+//
+// JDK 28 - When -Xlog:cds is specified in the command-line, the VM will exit with an error message:
+//
+//          [0.002s][error][logging] Invalid tag 'cds' in log selection.
+//          Invalid -Xlog option '-Xlog:cds', see error log for details.
+//
+
+// The following macros are inspired by the same macros (without the aot_ prefix) in logging/log.hpp
+
+#define aot_log_is_enabled(level, ...) (AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::is_level(LogLevel::level))
+
+#define aot_log_error(...)    (!aot_log_is_enabled(Error, __VA_ARGS__))   ? (void)0 : AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Error>
+#define aot_log_warning(...)  (!aot_log_is_enabled(Warning, __VA_ARGS__)) ? (void)0 : AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Warning>
+#define aot_log_info(...)     (!aot_log_is_enabled(Info, __VA_ARGS__))    ? (void)0 : AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Info>
+#define aot_log_debug(...)    (!aot_log_is_enabled(Debug, __VA_ARGS__))   ? (void)0 : AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Debug>
+#define aot_log_trace(...)    (!aot_log_is_enabled(Trace, __VA_ARGS__))   ? (void)0 : AOTLogImpl<LOG_TAGS(__VA_ARGS__)>::write<LogLevel::Trace>
+
+template <LogTagType IGNORED, LogTagType T1 = LogTag::__NO_TAG, LogTagType T2 = LogTag::__NO_TAG, LogTagType T3 = LogTag::__NO_TAG,
+          LogTagType T4 = LogTag::__NO_TAG, LogTagType GuardTag = LogTag::__NO_TAG>
+class AOTLogImpl {
+ public:
+  // Make sure no more than the maximum number of tags have been given.
+  // The GuardTag allows this to be detected if/when it happens. If the GuardTag
+  // is not __NO_TAG, the number of tags given exceeds the maximum allowed.
+  STATIC_ASSERT(GuardTag == LogTag::__NO_TAG); // Number of logging tags exceeds maximum supported!
+
+  // Empty constructor to avoid warnings on MSVC about unused variables
+  // when the log instance is only used for static functions.
+  AOTLogImpl() {
+  }
+
+  static bool is_level(LogLevelType level) {
+    if (CDSConfig::new_aot_flags_used()) {
+      return LogTagSetMapping<LogTag::_aot, T1, T2, T3, T4>::tagset().is_level(level);
+    } else {
+      return LogTagSetMapping<LogTag::_cds, T1, T2, T3, T4>::tagset().is_level(level);
+    }
+  }
+
+  ATTRIBUTE_PRINTF(2, 3)
+  static void write(LogLevelType level, const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vwrite(level, fmt, args);
+    va_end(args);
+  }
+
+  template <LogLevelType Level>
+  ATTRIBUTE_PRINTF(1, 2)
+  static void write(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vwrite(Level, fmt, args);
+    va_end(args);
+  }
+
+  ATTRIBUTE_PRINTF(2, 0)
+  static void vwrite(LogLevelType level, const char* fmt, va_list args) {
+    if (CDSConfig::new_aot_flags_used()) {
+      LogTagSetMapping<LogTag::_aot, T1, T2, T3, T4>::tagset().vwrite(level, fmt, args);
+    } else {
+      LogTagSetMapping<LogTag::_cds, T1, T2, T3, T4>::tagset().vwrite(level, fmt, args);
+    }
+  }
+};
+
+#endif
diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.cpp b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
index e948a6cefa3..a62e9c7735a 100644
--- a/src/hotspot/share/cds/aotReferenceObjSupport.cpp
+++ b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
@@ -197,24 +197,24 @@ bool AOTReferenceObjSupport::check_if_ref_obj(oop obj) {
     if (needs_special_cleanup && (referent == nullptr || !_keep_alive_objs_table->contains(referent))) {
       ResourceMark rm;
 
-      log_error(cds, heap)("Cannot archive reference object " PTR_FORMAT " of class %s",
+      log_error(aot, heap)("Cannot archive reference object " PTR_FORMAT " of class %s",
                            p2i(obj), obj->klass()->external_name());
-      log_error(cds, heap)("referent = " PTR_FORMAT
+      log_error(aot, heap)("referent = " PTR_FORMAT
                            ", queue = " PTR_FORMAT
                            ", next = " PTR_FORMAT
                            ", discovered = " PTR_FORMAT,
                            p2i(referent), p2i(queue), p2i(next), p2i(discovered));
-      log_error(cds, heap)("This object requires special clean up as its queue is not ReferenceQueue::N" "ULL ("
+      log_error(aot, heap)("This object requires special clean up as its queue is not ReferenceQueue::N" "ULL ("
                            PTR_FORMAT ")", p2i(_null_queue.resolve()));
-      log_error(cds, heap)("%s", (referent == nullptr) ?
+      log_error(aot, heap)("%s", (referent == nullptr) ?
                            "referent cannot be null" : "referent is not registered with CDS.keepAlive()");
       HeapShared::debug_trace();
       MetaspaceShared::unrecoverable_writing_error();
     }
 
-    if (log_is_enabled(Info, cds, ref)) {
+    if (log_is_enabled(Info, aot, ref)) {
       ResourceMark rm;
-      log_info(cds, ref)("Reference obj:"
+      log_info(aot, ref)("Reference obj:"
                          " r=" PTR_FORMAT
                          " q=" PTR_FORMAT
                          " n=" PTR_FORMAT
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index a544b4921d4..aaebf8bef88 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
 #include "cds/aotLinkedClassBulkLoader.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.hpp"
@@ -133,7 +134,7 @@ class RelocateEmbeddedPointers : public BitMapClosure {
     address old_p = *ptr_loc;
     address new_p = _builder->get_buffered_addr(old_p);
 
-    log_trace(cds)("Ref: [" PTR_FORMAT "] -> " PTR_FORMAT " => " PTR_FORMAT,
+    log_trace(aot)("Ref: [" PTR_FORMAT "] -> " PTR_FORMAT " => " PTR_FORMAT,
                    p2i(ptr_loc), p2i(old_p), p2i(new_p));
 
     ArchivePtrMarker::set_and_mark_pointer(ptr_loc, new_p);
@@ -251,7 +252,7 @@ void ArchiveBuilder::gather_klasses_and_symbols() {
   AOTArtifactFinder::initialize();
   AOTArtifactFinder::find_artifacts();
 
-  log_info(cds)("Gathering classes and symbols ... ");
+  aot_log_info(aot)("Gathering classes and symbols ... ");
   GatherKlassesAndSymbols doit(this);
   iterate_roots(&doit);
 #if INCLUDE_CDS_JAVA_HEAP
@@ -281,7 +282,7 @@ void ArchiveBuilder::gather_klasses_and_symbols() {
     // TODO: in the future, if we want to produce deterministic contents in the
     // dynamic archive, we might need to sort the symbols alphabetically (also see
     // DynamicArchiveBuilder::sort_methods()).
-    log_info(cds)("Sorting symbols ... ");
+    aot_log_info(aot)("Sorting symbols ... ");
     _symbols->sort(compare_symbols_by_address);
     sort_klasses();
   }
@@ -303,7 +304,7 @@ int ArchiveBuilder::compare_klass_by_name(Klass** a, Klass** b) {
 }
 
 void ArchiveBuilder::sort_klasses() {
-  log_info(cds)("Sorting classes ... ");
+  aot_log_info(aot)("Sorting classes ... ");
   _klasses->sort(compare_klass_by_name);
 }
 
@@ -315,14 +316,14 @@ address ArchiveBuilder::reserve_buffer() {
                                              os::vm_page_size(),
                                              mtNone);
   if (!rs.is_reserved()) {
-    log_error(cds)("Failed to reserve %zu bytes of output buffer.", buffer_size);
+    aot_log_error(aot)("Failed to reserve %zu bytes of output buffer.", buffer_size);
     MetaspaceShared::unrecoverable_writing_error();
   }
 
   // buffer_bottom is the lowest address of the 2 core regions (rw, ro) when
   // we are copying the class metadata into the buffer.
   address buffer_bottom = (address)rs.base();
-  log_info(cds)("Reserved output buffer space at " PTR_FORMAT " [%zu bytes]",
+  aot_log_info(aot)("Reserved output buffer space at " PTR_FORMAT " [%zu bytes]",
                 p2i(buffer_bottom), buffer_size);
   _shared_rs = rs;
 
@@ -364,9 +365,9 @@ address ArchiveBuilder::reserve_buffer() {
   if (my_archive_requested_bottom <  _requested_static_archive_bottom ||
       my_archive_requested_top    <= _requested_static_archive_bottom) {
     // Size overflow.
-    log_error(cds)("my_archive_requested_bottom = " INTPTR_FORMAT, p2i(my_archive_requested_bottom));
-    log_error(cds)("my_archive_requested_top    = " INTPTR_FORMAT, p2i(my_archive_requested_top));
-    log_error(cds)("SharedBaseAddress (" INTPTR_FORMAT ") is too high. "
+    aot_log_error(aot)("my_archive_requested_bottom = " INTPTR_FORMAT, p2i(my_archive_requested_bottom));
+    aot_log_error(aot)("my_archive_requested_top    = " INTPTR_FORMAT, p2i(my_archive_requested_top));
+    aot_log_error(aot)("SharedBaseAddress (" INTPTR_FORMAT ") is too high. "
                    "Please rerun java -Xshare:dump with a lower value", p2i(_requested_static_archive_bottom));
     MetaspaceShared::unrecoverable_writing_error();
   }
@@ -424,7 +425,7 @@ bool ArchiveBuilder::gather_one_source_obj(MetaspaceClosure::Ref* ref, bool read
   SourceObjInfo* p = _src_obj_table.put_if_absent(src_obj, src_info, &created);
   if (created) {
     if (_src_obj_table.maybe_grow()) {
-      log_info(cds, hashtables)("Expanded _src_obj_table table to %d", _src_obj_table.table_size());
+      log_info(aot, hashtables)("Expanded _src_obj_table table to %d", _src_obj_table.table_size());
     }
   }
 
@@ -503,7 +504,7 @@ void ArchiveBuilder::remember_embedded_pointer_in_enclosing_obj(MetaspaceClosure
 
 void ArchiveBuilder::gather_source_objs() {
   ResourceMark rm;
-  log_info(cds)("Gathering all archivable objects ... ");
+  aot_log_info(aot)("Gathering all archivable objects ... ");
   gather_klasses_and_symbols();
   GatherSortedSourceObjs doit(this);
   iterate_sorted_roots(&doit);
@@ -590,7 +591,7 @@ void ArchiveBuilder::sort_metadata_objs() {
 
 void ArchiveBuilder::dump_rw_metadata() {
   ResourceMark rm;
-  log_info(cds)("Allocating RW objects ... ");
+  aot_log_info(aot)("Allocating RW objects ... ");
   make_shallow_copies(&_rw_region, &_rw_src_objs);
 
 #if INCLUDE_CDS_JAVA_HEAP
@@ -605,7 +606,7 @@ void ArchiveBuilder::dump_rw_metadata() {
 
 void ArchiveBuilder::dump_ro_metadata() {
   ResourceMark rm;
-  log_info(cds)("Allocating RO objects ... ");
+  aot_log_info(aot)("Allocating RO objects ... ");
 
   start_dump_region(&_ro_region);
   make_shallow_copies(&_ro_region, &_ro_src_objs);
@@ -626,7 +627,7 @@ void ArchiveBuilder::make_shallow_copies(DumpRegion *dump_region,
   for (int i = 0; i < src_objs->objs()->length(); i++) {
     make_shallow_copy(dump_region, src_objs->objs()->at(i));
   }
-  log_info(cds)("done (%d objects)", src_objs->objs()->length());
+  aot_log_info(aot)("done (%d objects)", src_objs->objs()->length());
 }
 
 void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* src_info) {
@@ -676,7 +677,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
     _buffered_to_src_table.put_if_absent((address)dest, src, &created);
     assert(created, "must be");
     if (_buffered_to_src_table.maybe_grow()) {
-      log_info(cds, hashtables)("Expanded _buffered_to_src_table table to %d", _buffered_to_src_table.table_size());
+      log_info(aot, hashtables)("Expanded _buffered_to_src_table table to %d", _buffered_to_src_table.table_size());
     }
   }
 
@@ -686,7 +687,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
     ArchivePtrMarker::mark_pointer((address*)dest);
   }
 
-  log_trace(cds)("Copy: " PTR_FORMAT " ==> " PTR_FORMAT " %d", p2i(src), p2i(dest), bytes);
+  log_trace(aot)("Copy: " PTR_FORMAT " ==> " PTR_FORMAT " %d", p2i(src), p2i(dest), bytes);
   src_info->set_buffered_addr((address)dest);
 
   _alloc_stats.record(src_info->msotype(), int(newtop - oldtop), src_info->read_only());
@@ -752,7 +753,7 @@ void ArchiveBuilder::relocate_embedded_pointers(ArchiveBuilder::SourceObjList* s
 }
 
 void ArchiveBuilder::relocate_metaspaceobj_embedded_pointers() {
-  log_info(cds)("Relocating embedded pointers in core regions ... ");
+  aot_log_info(aot)("Relocating embedded pointers in core regions ... ");
   relocate_embedded_pointers(&_rw_src_objs);
   relocate_embedded_pointers(&_ro_src_objs);
 }
@@ -923,9 +924,9 @@ void ArchiveBuilder::make_klasses_shareable() {
       ik->remove_unshareable_info();
     }
 
-    if (log_is_enabled(Debug, cds, class)) {
+    if (aot_log_is_enabled(Debug, aot, class)) {
       ResourceMark rm;
-      log_debug(cds, class)("klasses[%5d] = " PTR_FORMAT " %-5s %s%s%s%s%s%s%s%s", i,
+      aot_log_debug(aot, class)("klasses[%5d] = " PTR_FORMAT " %-5s %s%s%s%s%s%s%s%s", i,
                             p2i(to_requested(k)), type, k->external_name(),
                             kind, hidden, old, unlinked, generated, aotlinked_msg, inited_msg);
     }
@@ -934,21 +935,21 @@ void ArchiveBuilder::make_klasses_shareable() {
 #define STATS_FORMAT    "= %5d, aot-linked = %5d, inited = %5d"
 #define STATS_PARAMS(x) num_ ## x, num_ ## x ## _a, num_ ## x ## _i
 
-  log_info(cds)("Number of classes %d", num_instance_klasses + num_obj_array_klasses + num_type_array_klasses);
-  log_info(cds)("    instance classes   " STATS_FORMAT, STATS_PARAMS(instance_klasses));
-  log_info(cds)("      boot             " STATS_FORMAT, STATS_PARAMS(boot_klasses));
-  log_info(cds)("        vm             " STATS_FORMAT, STATS_PARAMS(vm_klasses));
-  log_info(cds)("      platform         " STATS_FORMAT, STATS_PARAMS(platform_klasses));
-  log_info(cds)("      app              " STATS_FORMAT, STATS_PARAMS(app_klasses));
-  log_info(cds)("      unregistered     " STATS_FORMAT, STATS_PARAMS(unregistered_klasses));
-  log_info(cds)("      (enum)           " STATS_FORMAT, STATS_PARAMS(enum_klasses));
-  log_info(cds)("      (hidden)         " STATS_FORMAT, STATS_PARAMS(hidden_klasses));
-  log_info(cds)("      (old)            " STATS_FORMAT, STATS_PARAMS(old_klasses));
-  log_info(cds)("      (unlinked)       = %5d, boot = %d, plat = %d, app = %d, unreg = %d",
+  aot_log_info(aot)("Number of classes %d", num_instance_klasses + num_obj_array_klasses + num_type_array_klasses);
+  aot_log_info(aot)("    instance classes   " STATS_FORMAT, STATS_PARAMS(instance_klasses));
+  aot_log_info(aot)("      boot             " STATS_FORMAT, STATS_PARAMS(boot_klasses));
+  aot_log_info(aot)("        vm             " STATS_FORMAT, STATS_PARAMS(vm_klasses));
+  aot_log_info(aot)("      platform         " STATS_FORMAT, STATS_PARAMS(platform_klasses));
+  aot_log_info(aot)("      app              " STATS_FORMAT, STATS_PARAMS(app_klasses));
+  aot_log_info(aot)("      unregistered     " STATS_FORMAT, STATS_PARAMS(unregistered_klasses));
+  aot_log_info(aot)("      (enum)           " STATS_FORMAT, STATS_PARAMS(enum_klasses));
+  aot_log_info(aot)("      (hidden)         " STATS_FORMAT, STATS_PARAMS(hidden_klasses));
+  aot_log_info(aot)("      (old)            " STATS_FORMAT, STATS_PARAMS(old_klasses));
+  aot_log_info(aot)("      (unlinked)       = %5d, boot = %d, plat = %d, app = %d, unreg = %d",
                 num_unlinked_klasses, boot_unlinked, platform_unlinked, app_unlinked, unreg_unlinked);
-  log_info(cds)("    obj array classes  = %5d", num_obj_array_klasses);
-  log_info(cds)("    type array classes = %5d", num_type_array_klasses);
-  log_info(cds)("               symbols = %5d", _symbols->length());
+  aot_log_info(aot)("    obj array classes  = %5d", num_obj_array_klasses);
+  aot_log_info(aot)("    type array classes = %5d", num_type_array_klasses);
+  aot_log_info(aot)("               symbols = %5d", _symbols->length());
 
 #undef STATS_FORMAT
 #undef STATS_PARAMS
@@ -1050,7 +1051,7 @@ class RelocateBufferToRequested : public BitMapClosure {
     address top = _builder->buffer_top();
     address new_bottom = bottom + _buffer_to_requested_delta;
     address new_top = top + _buffer_to_requested_delta;
-    log_debug(cds)("Relocating archive from [" INTPTR_FORMAT " - " INTPTR_FORMAT "] to "
+    aot_log_debug(aot)("Relocating archive from [" INTPTR_FORMAT " - " INTPTR_FORMAT "] to "
                    "[" INTPTR_FORMAT " - " INTPTR_FORMAT "]",
                    p2i(bottom), p2i(top),
                    p2i(new_bottom), p2i(new_top));
@@ -1574,8 +1575,8 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
   mapinfo->write_header();
   mapinfo->close();
 
-  if (log_is_enabled(Info, cds)) {
-    log_info(cds)("Full module graph = %s", CDSConfig::is_dumping_full_module_graph() ? "enabled" : "disabled");
+  if (log_is_enabled(Info, aot)) {
+    log_info(aot)("Full module graph = %s", CDSConfig::is_dumping_full_module_graph() ? "enabled" : "disabled");
     print_stats();
   }
 
@@ -1613,12 +1614,12 @@ void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo, ArchiveHeapInfo* h
     print_heap_region_stats(heap_info, total_reserved);
   }
 
-  log_debug(cds)("total   : %9zu [100.0%% of total] out of %9zu bytes [%5.1f%% used]",
+  aot_log_debug(aot)("total   : %9zu [100.0%% of total] out of %9zu bytes [%5.1f%% used]",
                  total_bytes, total_reserved, total_u_perc);
 }
 
 void ArchiveBuilder::print_bitmap_region_stats(size_t size, size_t total_size) {
-  log_debug(cds)("bm space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used]",
+  aot_log_debug(aot)("bm space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used]",
                  size, size/double(total_size)*100.0, size);
 }
 
@@ -1626,7 +1627,7 @@ void ArchiveBuilder::print_heap_region_stats(ArchiveHeapInfo *info, size_t total
   char* start = info->buffer_start();
   size_t size = info->buffer_byte_size();
   char* top = start + size;
-  log_debug(cds)("hp space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used] at " INTPTR_FORMAT,
+  aot_log_debug(aot)("hp space: %9zu [ %4.1f%% of total] out of %9zu bytes [100.0%% used] at " INTPTR_FORMAT,
                      size, size/double(total_size)*100.0, size, p2i(start));
 }
 
@@ -1637,6 +1638,6 @@ void ArchiveBuilder::report_out_of_space(const char* name, size_t needed_bytes)
   _rw_region.print_out_of_space_msg(name, needed_bytes);
   _ro_region.print_out_of_space_msg(name, needed_bytes);
 
-  log_error(cds)("Unable to allocate from '%s' region: Please reduce the number of shared classes.", name);
+  log_error(aot)("Unable to allocate from '%s' region: Please reduce the number of shared classes.", name);
   MetaspaceShared::unrecoverable_writing_error();
 }
diff --git a/src/hotspot/share/cds/archiveHeapLoader.cpp b/src/hotspot/share/cds/archiveHeapLoader.cpp
index 68015e319c3..f604dadf980 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.cpp
+++ b/src/hotspot/share/cds/archiveHeapLoader.cpp
@@ -408,7 +408,7 @@ void ArchiveHeapLoader::finish_loaded_heap() {
 }
 
 void ArchiveHeapLoader::verify_loaded_heap() {
-  log_info(cds, heap)("Verify all oops and pointers in loaded heap");
+  log_info(aot, heap)("Verify all oops and pointers in loaded heap");
 
   ResourceMark rm;
   ResourceHashtable<uintptr_t, bool> table;
@@ -459,7 +459,7 @@ void ArchiveHeapLoader::patch_native_pointers() {
 
   FileMapRegion* r = FileMapInfo::current_info()->region_at(MetaspaceShared::hp);
   if (r->mapped_base() != nullptr && r->has_ptrmap()) {
-    log_info(cds, heap)("Patching native pointers in heap region");
+    log_info(aot, heap)("Patching native pointers in heap region");
     BitMapView bm = FileMapInfo::current_info()->ptrmap_view(MetaspaceShared::hp);
     PatchNativePointers patcher((Metadata**)r->mapped_base() + FileMapInfo::current_info()->heap_ptrmap_start_pos());
     bm.iterate(&patcher);
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index 2b6d403d835..1a6b8b1e488 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -247,7 +247,7 @@ void ArchiveHeapWriter::copy_roots_to_buffer(GrowableArrayCHeap<oop, mtClassShar
       root_segment_at_put(seg_oop, i, roots->at(root_index++));
     }
 
-    log_info(cds, heap)("archived obj root segment [%d] = %zu bytes, obj = " PTR_FORMAT,
+    log_info(aot, heap)("archived obj root segment [%d] = %zu bytes, obj = " PTR_FORMAT,
                         size_elems, size_bytes, p2i(seg_oop));
   }
 
@@ -396,7 +396,7 @@ void ArchiveHeapWriter::maybe_fill_gc_region_gap(size_t required_byte_size) {
     ensure_buffer_space(filler_end);
 
     int array_length = filler_array_length(fill_bytes);
-    log_info(cds, heap)("Inserting filler obj array of %d elements (%zu bytes total) @ buffer offset %zu",
+    log_info(aot, heap)("Inserting filler obj array of %d elements (%zu bytes total) @ buffer offset %zu",
                         array_length, fill_bytes, _buffer_used);
     HeapWord* filler = init_filler_array_at_buffer_top(array_length, fill_bytes);
     _buffer_used = filler_end;
@@ -474,7 +474,7 @@ void ArchiveHeapWriter::set_requested_address(ArchiveHeapInfo* info) {
   if (UseCompressedOops) {
     if (UseG1GC) {
       address heap_end = (address)G1CollectedHeap::heap()->reserved().end();
-      log_info(cds, heap)("Heap end = %p", heap_end);
+      log_info(aot, heap)("Heap end = %p", heap_end);
       _requested_bottom = align_down(heap_end - heap_region_byte_size, G1HeapRegion::GrainBytes);
       _requested_bottom = align_down(_requested_bottom, MIN_GC_REGION_ALIGNMENT);
       assert(is_aligned(_requested_bottom, G1HeapRegion::GrainBytes), "sanity");
@@ -763,7 +763,7 @@ void ArchiveHeapWriter::compute_ptrmap(ArchiveHeapInfo* heap_info) {
   }
 
   heap_info->ptrmap()->resize(max_idx + 1);
-  log_info(cds, heap)("calculate_ptrmap: marked %d non-null native pointers for heap region (%zu bits)",
+  log_info(aot, heap)("calculate_ptrmap: marked %d non-null native pointers for heap region (%zu bits)",
                       num_non_null_ptrs, size_t(heap_info->ptrmap()->size()));
 }
 
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 29376e71a93..52db54e7049 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -411,7 +411,7 @@ void CDSConfig::check_aot_flags() {
   }
 
   if (FLAG_IS_DEFAULT(AOTCache) && FLAG_IS_DEFAULT(AOTConfiguration) && FLAG_IS_DEFAULT(AOTMode)) {
-    // AOTCache/AOTConfiguration/AOTMode not used.
+    // AOTCache/AOTConfiguration/AOTMode not used -> using the "classic CDS" workflow.
     return;
   } else {
     _new_aot_flags_used = true;
diff --git a/src/hotspot/share/cds/cdsEnumKlass.cpp b/src/hotspot/share/cds/cdsEnumKlass.cpp
index ffce9fb269a..fe55c904312 100644
--- a/src/hotspot/share/cds/cdsEnumKlass.cpp
+++ b/src/hotspot/share/cds/cdsEnumKlass.cpp
@@ -99,7 +99,7 @@ void CDSEnumKlass::archive_static_field(int level, KlassSubGraphInfo* subgraph_i
   bool success = HeapShared::archive_reachable_objects_from(level, subgraph_info, oop_field);
   assert(success, "VM should have exited with unarchivable objects for _level > 1");
   int root_index = HeapShared::append_root(oop_field);
-  log_info(cds, heap)("Archived enum obj @%d %s::%s (" INTPTR_FORMAT ")",
+  log_info(aot, heap)("Archived enum obj @%d %s::%s (" INTPTR_FORMAT ")",
                       root_index, ik->external_name(), fd.name()->as_C_string(),
                       p2i((oopDesc*)oop_field));
   SystemDictionaryShared::add_enum_klass_static_field(ik, root_index);
@@ -113,9 +113,9 @@ bool CDSEnumKlass::initialize_enum_klass(InstanceKlass* k, TRAPS) {
   RunTimeClassInfo* info = RunTimeClassInfo::get_for(k);
   assert(info != nullptr, "sanity");
 
-  if (log_is_enabled(Info, cds, heap)) {
+  if (log_is_enabled(Info, aot, heap)) {
     ResourceMark rm;
-    log_info(cds, heap)("Initializing Enum class: %s", k->external_name());
+    log_info(aot, heap)("Initializing Enum class: %s", k->external_name());
   }
 
   oop mirror = k->java_mirror();
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index 2e96f818c14..2f3c2521b22 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -151,10 +151,10 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0)
 
 CDSHeapVerifier::~CDSHeapVerifier() {
   if (_problems > 0) {
-    log_error(cds, heap)("Scanned %d objects. Found %d case(s) where "
+    log_error(aot, heap)("Scanned %d objects. Found %d case(s) where "
                          "an object points to a static field that "
                          "may hold a different value at runtime.", _archived_objs, _problems);
-    log_error(cds, heap)("Please see cdsHeapVerifier.cpp and aotClassInitializer.cpp for details");
+    log_error(aot, heap)("Please see cdsHeapVerifier.cpp and aotClassInitializer.cpp for details");
     MetaspaceShared::unrecoverable_writing_error();
   }
 }
@@ -285,7 +285,7 @@ inline bool CDSHeapVerifier::do_entry(oop& orig_obj, HeapShared::CachedOopInfo&
     ResourceMark rm;
     char* class_name = info->_holder->name()->as_C_string();
     char* field_name = info->_name->as_C_string();
-    LogStream ls(Log(cds, heap)::warning());
+    LogStream ls(Log(aot, heap)::warning());
     ls.print_cr("Archive heap points to a static field that may hold a different value at runtime:");
     ls.print_cr("Field: %s::%s", class_name, field_name);
     ls.print("Value: ");
diff --git a/src/hotspot/share/cds/dumpAllocStats.cpp b/src/hotspot/share/cds/dumpAllocStats.cpp
index 5587ac2fac8..671612ec6b3 100644
--- a/src/hotspot/share/cds/dumpAllocStats.cpp
+++ b/src/hotspot/share/cds/dumpAllocStats.cpp
@@ -52,7 +52,7 @@ void DumpAllocStats::print_stats(int ro_all, int rw_all) {
   const char *sep = "--------------------+---------------------------+---------------------------+--------------------------";
   const char *hdr = "                        ro_cnt   ro_bytes     % |   rw_cnt   rw_bytes     % |  all_cnt  all_bytes     %";
 
-  LogMessage(cds) msg;
+  LogMessage(aot) msg;
 
   msg.debug("Detailed metadata info (excluding heap region):");
   msg.debug("%s", hdr);
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 7414a553a74..1458aee412f 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.inline.hpp"
 #include "cds/archiveHeapWriter.hpp"
@@ -336,13 +337,13 @@ bool FileMapInfo::validate_class_location() {
     // the runtime image and the -cp, dynamic dumping is disabled.
     if (config->num_boot_classpaths() > 0) {
       CDSConfig::disable_dumping_dynamic_archive();
-      log_warning(cds)(
+      aot_log_warning(aot)(
         "Dynamic archiving is disabled because base layer archive has appended boot classpath");
     }
     if (config->num_module_paths() > 0) {
       if (has_extra_module_paths) {
         CDSConfig::disable_dumping_dynamic_archive();
-        log_warning(cds)(
+        aot_log_warning(aot)(
           "Dynamic archiving is disabled because base layer archive has a different module path");
       }
     }
@@ -397,7 +398,7 @@ class FileHeaderHelper {
     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 %s not found (%s)", CDSConfig::type_of_archive_being_loaded(), _archive_name);
+      aot_log_info(aot)("Specified %s not found (%s)", CDSConfig::type_of_archive_being_loaded(), _archive_name);
       return false;
     }
     return initialize(_fd);
@@ -414,31 +415,31 @@ class FileHeaderHelper {
     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 %s", file_type);
+      aot_log_warning(aot)("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 &&
         gen_header._magic != CDS_PREIMAGE_ARCHIVE_MAGIC) {
-      log_warning(cds)("The %s has a bad magic number: %#x", file_type, gen_header._magic);
+      aot_log_warning(aot)("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 %s version 0x%x. Must be at least 0x%x.",
+      aot_log_warning(aot)("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 %s version 0x%x does not match the required version 0x%x.",
+      aot_log_warning(aot)("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);
     if (gen_header._header_size >= filelen) {
-      log_warning(cds)("Archive file header larger than archive file");
+      aot_log_warning(aot)("Archive file header larger than archive file");
       return false;
     }
 
@@ -448,7 +449,7 @@ class FileHeaderHelper {
     os::lseek(fd, 0, SEEK_SET);
     n = ::read(fd, (void*)_header, (unsigned int)size);
     if (n != size) {
-      log_warning(cds)("Unable to read file map header from %s", file_type);
+      aot_log_warning(aot)("Unable to read file map header from %s", file_type);
       return false;
     }
 
@@ -493,9 +494,9 @@ class FileHeaderHelper {
       FileMapHeader* header = (FileMapHeader*)_header;
       int actual_crc = header->compute_crc();
       if (actual_crc != header->crc()) {
-        log_info(cds)("_crc expected: %d", header->crc());
-        log_info(cds)("       actual: %d", actual_crc);
-        log_warning(cds)("Header checksum verification failed.");
+        aot_log_info(aot)("_crc expected: %d", header->crc());
+        aot_log_info(aot)("       actual: %d", actual_crc);
+        aot_log_warning(aot)("Header checksum verification failed.");
         return false;
       }
     }
@@ -508,18 +509,18 @@ class FileHeaderHelper {
     unsigned int header_size = _header->_header_size;
 
     if (name_offset + name_size < name_offset) {
-      log_warning(cds)("base_archive_name offset/size overflow: " UINT32_FORMAT "/" UINT32_FORMAT,
+      aot_log_warning(aot)("base_archive_name offset/size overflow: " UINT32_FORMAT "/" UINT32_FORMAT,
                                  name_offset, name_size);
       return false;
     }
 
     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");
+        aot_log_warning(aot)("static shared archive must have zero _base_archive_name_offset");
         return false;
       }
       if (name_size != 0) {
-        log_warning(cds)("static shared archive must have zero _base_archive_name_size");
+        aot_log_warning(aot)("static shared archive must have zero _base_archive_name_size");
         return false;
       }
     } else {
@@ -527,24 +528,24 @@ class FileHeaderHelper {
       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.
-        log_warning(cds)("Invalid base_archive_name offset/size: " UINT32_FORMAT "/" UINT32_FORMAT,
+        aot_log_warning(aot)("Invalid base_archive_name offset/size: " UINT32_FORMAT "/" UINT32_FORMAT,
                                    name_offset, name_size);
         return false;
       }
       if (name_size > 0) {
         if (name_offset + name_size > header_size) {
-          log_warning(cds)("Invalid base_archive_name offset/size (out of range): "
+          aot_log_warning(aot)("Invalid base_archive_name offset/size (out of range): "
                                      UINT32_FORMAT " + " UINT32_FORMAT " > " UINT32_FORMAT ,
                                      name_offset, name_size, header_size);
           return false;
         }
         const char* name = ((const char*)_header) + _header->_base_archive_name_offset;
         if (name[name_size - 1] != '\0' || strlen(name) != name_size - 1) {
-          log_warning(cds)("Base archive name is damaged");
+          aot_log_warning(aot)("Base archive name is damaged");
           return false;
         }
         if (!os::file_exists(name)) {
-          log_warning(cds)("Base archive %s does not exist", name);
+          aot_log_warning(aot)("Base archive %s does not exist", name);
           return false;
         }
         _base_archive_name = name;
@@ -579,7 +580,7 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name,
   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);
+     aot_log_warning(aot)("AutoCreateSharedArchive is ignored because %s is a static archive", archive_name);
     }
     return true;
   }
@@ -607,7 +608,7 @@ bool FileMapInfo::is_preimage_static_archive(const char* file) {
 bool FileMapInfo::init_from_file(int fd) {
   FileHeaderHelper file_helper(_full_path, _is_static);
   if (!file_helper.initialize(fd)) {
-    log_warning(cds)("Unable to read the file header.");
+    aot_log_warning(aot)("Unable to read the file header.");
     return false;
   }
   GenericCDSFileMapHeader* gen_header = file_helper.get_generic_file_header();
@@ -619,15 +620,15 @@ bool FileMapInfo::init_from_file(int fd) {
       // Good
     } else {
       if (CDSConfig::new_aot_flags_used()) {
-        log_warning(cds)("Not a valid %s (%s)", file_type, _full_path);
+        aot_log_warning(aot)("Not a valid %s (%s)", file_type, _full_path);
       } else {
-        log_warning(cds)("Not a base shared archive: %s", _full_path);
+        aot_log_warning(aot)("Not a base shared archive: %s", _full_path);
       }
       return false;
     }
   } else {
     if (gen_header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) {
-      log_warning(cds)("Not a top shared archive: %s", _full_path);
+      aot_log_warning(aot)("Not a top shared archive: %s", _full_path);
       return false;
     }
   }
@@ -637,14 +638,14 @@ bool FileMapInfo::init_from_file(int fd) {
   size_t size = gen_header->_header_size;
   size_t n = ::read(fd, (void*)_header, (unsigned int)size);
   if (n != size) {
-    log_warning(cds)("Failed to read file header from the top archive file\n");
+    aot_log_warning(aot)("Failed to read file header from the top archive file\n");
     return false;
   }
 
   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 %s has the wrong version.", file_type);
+    aot_log_info(aot)("_version expected: 0x%x", CURRENT_CDS_ARCHIVE_VERSION);
+    aot_log_info(aot)("           actual: 0x%x", header()->version());
+    aot_log_warning(aot)("The %s has the wrong version.", file_type);
     return false;
   }
 
@@ -653,10 +654,10 @@ bool FileMapInfo::init_from_file(int fd) {
   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)("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 %s has an incorrect header size.", file_type);
+      aot_log_info(aot)("_header_size: " UINT32_FORMAT, header_size);
+      aot_log_info(aot)("base_archive_name_size: " UINT32_FORMAT, header()->base_archive_name_size());
+      aot_log_info(aot)("base_archive_name_offset: " UINT32_FORMAT, header()->base_archive_name_offset());
+      aot_log_warning(aot)("The %s has an incorrect header size.", file_type);
       return false;
     }
   }
@@ -664,16 +665,16 @@ bool FileMapInfo::init_from_file(int fd) {
   const char* actual_ident = header()->jvm_ident();
 
   if (actual_ident[JVM_IDENT_MAX-1] != 0) {
-    log_warning(cds)("JVM version identifier is corrupted.");
+    aot_log_warning(aot)("JVM version identifier is corrupted.");
     return false;
   }
 
   char expected_ident[JVM_IDENT_MAX];
   get_header_version(expected_ident);
   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 %s was created by a different"
+    aot_log_info(aot)("_jvm_ident expected: %s", expected_ident);
+    aot_log_info(aot)("             actual: %s", actual_ident);
+    aot_log_warning(aot)("The %s was created by a different"
                   " version or build of HotSpot", file_type);
     return false;
   }
@@ -685,7 +686,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 %s has been truncated.", file_type);
+      aot_log_warning(aot)("The %s has been truncated.", file_type);
       return false;
     }
   }
@@ -695,7 +696,7 @@ bool FileMapInfo::init_from_file(int fd) {
 
 void FileMapInfo::seek_to_position(size_t pos) {
   if (os::lseek(_fd, (long)pos, SEEK_SET) < 0) {
-    log_error(cds)("Unable to seek to position %zu", pos);
+    aot_log_error(aot)("Unable to seek to position %zu", pos);
     MetaspaceShared::unrecoverable_loading_error();
   }
 }
@@ -708,18 +709,18 @@ bool FileMapInfo::open_for_read() {
   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);
+  aot_log_info(aot)("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 %s not found (%s)", file_type, _full_path);
+      aot_log_info(aot)("Specified %s not found (%s)", file_type, _full_path);
     } else {
-      log_warning(cds)("Failed to open %s (%s)", file_type,
+      aot_log_warning(aot)("Failed to open %s (%s)", file_type,
                     os::strerror(errno));
     }
     return false;
   } else {
-    log_info(cds)("Opened %s %s.", file_type, _full_path);
+    aot_log_info(aot)("Opened %s %s.", file_type, _full_path);
   }
 
   _fd = fd;
@@ -730,14 +731,14 @@ bool FileMapInfo::open_for_read() {
 // Write the FileMapInfo information to the file.
 
 void FileMapInfo::open_as_output() {
-  LogMessage(cds) msg;
-  if (msg.is_info()) {
+  if (CDSConfig::new_aot_flags_used()) {
     if (CDSConfig::is_dumping_preimage_static_archive()) {
-      msg.info("Writing binary AOTConfiguration file: ");
+      log_info(aot)("Writing binary AOTConfiguration file: %s",  _full_path);
     } else {
-      msg.info("Dumping shared data to file: ");
+      log_info(aot)("Writing binary AOTConfiguration file: %s",  _full_path);
     }
-    msg.info("   %s", _full_path);
+  } else {
+    log_info(cds)("Dumping shared data to file: %s", _full_path);
   }
 
 #ifdef _WINDOWS  // On Windows, need WRITE permission to remove the file.
@@ -749,7 +750,7 @@ void FileMapInfo::open_as_output() {
   remove(_full_path);
   int fd = os::open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0666);
   if (fd < 0) {
-    log_error(cds)("Unable to create %s %s: (%s).", CDSConfig::type_of_archive_being_written(), _full_path,
+    aot_log_error(aot)("Unable to create %s %s: (%s).", CDSConfig::type_of_archive_being_written(), _full_path,
                    os::strerror(errno));
     MetaspaceShared::writing_error();
     return;
@@ -815,7 +816,7 @@ bool FileMapRegion::check_region_crc(char* base) const {
   assert(base != nullptr, "must be initialized");
   int crc = ClassLoader::crc32(0, base, (jint)sz);
   if (crc != this->crc()) {
-    log_warning(cds)("Checksum verification failed.");
+    aot_log_warning(aot)("Checksum verification failed.");
     return false;
   }
   return true;
@@ -837,7 +838,7 @@ BitMapView FileMapInfo::bitmap_view(int region_index, bool is_oopmap) {
   bitmap_base += is_oopmap ? r->oopmap_offset() : r->ptrmap_offset();
   size_t size_in_bits = is_oopmap ? r->oopmap_size_in_bits() : r->ptrmap_size_in_bits();
 
-  log_debug(cds, reloc)("mapped %s relocation %smap @ " INTPTR_FORMAT " (%zu bits)",
+  aot_log_debug(aot, reloc)("mapped %s relocation %smap @ " INTPTR_FORMAT " (%zu bits)",
                         region_name(region_index), is_oopmap ? "oop" : "ptr",
                         p2i(bitmap_base), size_in_bits);
 
@@ -905,12 +906,12 @@ void FileMapInfo::write_region(int region, char* base, size_t size,
   r->set_file_offset(_file_offset);
   int crc = ClassLoader::crc32(0, base, (jint)size);
   if (size > 0) {
-    log_info(cds)("Shared file region (%s) %d: %8zu"
+    aot_log_info(aot)("Shared file region (%s) %d: %8zu"
                    " bytes, addr " INTPTR_FORMAT " file offset 0x%08" PRIxPTR
                    " crc 0x%08x",
                    region_name(region), region, size, p2i(requested_base), _file_offset, crc);
   } else {
-     log_info(cds)("Shared file region (%s) %d: %8zu"
+     aot_log_info(aot)("Shared file region (%s) %d: %8zu"
                    " bytes", region_name(region), region, size);
   }
 
@@ -1101,11 +1102,11 @@ bool FileMapInfo::remap_shared_readonly_as_readwrite() {
   close();
   // These have to be errors because the shared region is now unmapped.
   if (base == nullptr) {
-    log_error(cds)("Unable to remap shared readonly space (errno=%d).", errno);
+    aot_log_error(aot)("Unable to remap shared readonly space (errno=%d).", errno);
     vm_exit(1);
   }
   if (base != addr) {
-    log_error(cds)("Unable to remap shared readonly space (errno=%d).", errno);
+    aot_log_error(aot)("Unable to remap shared readonly space (errno=%d).", errno);
     vm_exit(1);
   }
   r->set_read_only(false);
@@ -1136,7 +1137,7 @@ MapArchiveResult FileMapInfo::map_regions(int regions[], int num_regions, char*
         assert(r->mapped_base() == last_region->mapped_end(), "must have no gaps");
       }
       last_region = r;)
-    log_info(cds)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)", is_static() ? "static " : "dynamic",
+    aot_log_info(aot)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)", is_static() ? "static " : "dynamic",
                   idx, p2i(r->mapped_base()), p2i(r->mapped_end()),
                   shared_region_name[idx]);
 
@@ -1153,11 +1154,11 @@ MapArchiveResult FileMapInfo::map_regions(int regions[], int num_regions, char*
 bool FileMapInfo::read_region(int i, char* base, size_t size, bool do_commit) {
   FileMapRegion* r = region_at(i);
   if (do_commit) {
-    log_info(cds)("Commit %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)%s",
+    aot_log_info(aot)("Commit %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)%s",
                   is_static() ? "static " : "dynamic", i, p2i(base), p2i(base + size),
                   shared_region_name[i], r->allow_exec() ? " exec" : "");
     if (!os::commit_memory(base, size, r->allow_exec())) {
-      log_error(cds)("Failed to commit %s region #%d (%s)", is_static() ? "static " : "dynamic",
+      aot_log_error(aot)("Failed to commit %s region #%d (%s)", is_static() ? "static " : "dynamic",
                      i, shared_region_name[i]);
       return false;
     }
@@ -1206,7 +1207,7 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
     // can't mmap into a ReservedSpace, so we just ::read() the data. We're going to patch all the
     // regions anyway, so there's no benefit for mmap anyway.
     if (!read_region(i, requested_addr, size, /* do_commit = */ true)) {
-      log_info(cds)("Failed to read %s shared space into reserved space at " INTPTR_FORMAT,
+      aot_log_info(aot)("Failed to read %s shared space into reserved space at " INTPTR_FORMAT,
                     shared_region_name[i], p2i(requested_addr));
       return MAP_ARCHIVE_OTHER_FAILURE; // oom or I/O error.
     } else {
@@ -1220,7 +1221,7 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba
                             requested_addr, size, r->read_only(),
                             r->allow_exec(), mtClassShared);
     if (base != requested_addr) {
-      log_info(cds)("Unable to map %s shared space at " INTPTR_FORMAT,
+      aot_log_info(aot)("Unable to map %s shared space at " INTPTR_FORMAT,
                     shared_region_name[i], p2i(requested_addr));
       _memory_mapping_failed = true;
       return MAP_ARCHIVE_MMAP_FAILURE;
@@ -1260,7 +1261,7 @@ char* FileMapInfo::map_bitmap_region() {
   }
 
   if (VerifySharedSpaces && !r->check_region_crc(bitmap_base)) {
-    log_error(cds)("relocation bitmap CRC error");
+    aot_log_error(aot)("relocation bitmap CRC error");
     if (!os::unmap_memory(bitmap_base, r->used_aligned())) {
       fatal("os::unmap_memory of relocation bitmap failed");
     }
@@ -1269,7 +1270,7 @@ char* FileMapInfo::map_bitmap_region() {
 
   r->set_mapped_from_file(true);
   r->set_mapped_base(bitmap_base);
-  log_info(cds)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
+  aot_log_info(aot)("Mapped %s region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
                 is_static() ? "static " : "dynamic",
                 MetaspaceShared::bm, p2i(r->mapped_base()), p2i(r->mapped_end()),
                 shared_region_name[MetaspaceShared::bm]);
@@ -1286,7 +1287,7 @@ bool FileMapInfo::map_aot_code_region(ReservedSpace rs) {
   char* mapped_base;
   if (MetaspaceShared::use_windows_memory_mapping()) {
     if (!read_region(MetaspaceShared::ac, requested_base, r->used_aligned(), /* do_commit = */ true)) {
-      log_info(cds)("Failed to read aot code shared space into reserved space at " INTPTR_FORMAT,
+      aot_log_info(aot)("Failed to read aot code shared space into reserved space at " INTPTR_FORMAT,
                     p2i(requested_base));
       return false;
     }
@@ -1299,13 +1300,13 @@ bool FileMapInfo::map_aot_code_region(ReservedSpace rs) {
                              requested_base, r->used_aligned(), read_only, allow_exec, mtClassShared);
   }
   if (mapped_base == nullptr) {
-    log_info(cds)("failed to map aot code region");
+    aot_log_info(aot)("failed to map aot code region");
     return false;
   } else {
     assert(mapped_base == requested_base, "must be");
     r->set_mapped_from_file(true);
     r->set_mapped_base(mapped_base);
-    log_info(cds)("Mapped static  region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
+    aot_log_info(aot)("Mapped static  region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT " (%s)",
                   MetaspaceShared::ac, p2i(r->mapped_base()), p2i(r->mapped_end()),
                   shared_region_name[MetaspaceShared::ac]);
     return true;
@@ -1341,7 +1342,7 @@ class SharedDataRelocationTask : public ArchiveWorkerTask {
 // This is called when we cannot map the archive at the requested[ base address (usually 0x800000000).
 // We relocate all pointers in the 2 core regions (ro, rw).
 bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) {
-  log_debug(cds, reloc)("runtime archive relocation start");
+  aot_log_debug(aot, reloc)("runtime archive relocation start");
   char* bitmap_base = map_bitmap_region();
 
   if (bitmap_base == nullptr) {
@@ -1388,7 +1389,7 @@ bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) {
 
     // The MetaspaceShared::bm region will be unmapped in MetaspaceShared::initialize_shared_spaces().
 
-    log_debug(cds, reloc)("runtime archive relocation done");
+    aot_log_debug(aot, reloc)("runtime archive relocation done");
     return true;
   }
 }
@@ -1437,7 +1438,7 @@ MemRegion FileMapInfo::get_heap_region_requested_range() {
 
   address start = heap_region_requested_address();
   address end = start + size;
-  log_info(cds)("Requested heap region [" INTPTR_FORMAT " - " INTPTR_FORMAT "] = %8zu bytes",
+  aot_log_info(aot)("Requested heap region [" INTPTR_FORMAT " - " INTPTR_FORMAT "] = %8zu bytes",
                 p2i(start), p2i(end), size);
 
   return MemRegion((HeapWord*)start, (HeapWord*)end);
@@ -1467,7 +1468,7 @@ void FileMapInfo::map_or_load_heap_region() {
       // all AOT-linked classes are visible.
       //
       // We get here because the heap is too small. The app will fail anyway. So let's quit.
-      log_error(cds)("%s has aot-linked classes but the archived "
+      aot_log_error(aot)("%s has aot-linked classes but the archived "
                      "heap objects cannot be loaded. Try increasing your heap size.",
                      CDSConfig::type_of_archive_being_loaded());
       MetaspaceShared::unrecoverable_loading_error();
@@ -1501,19 +1502,19 @@ bool FileMapInfo::can_use_heap_region() {
   const int archive_narrow_klass_pointer_bits = header()->narrow_klass_pointer_bits();
   const int archive_narrow_klass_shift = header()->narrow_klass_shift();
 
-  log_info(cds)("CDS archive was created with max heap size = %zuM, and the following configuration:",
+  aot_log_info(aot)("CDS archive was created with max heap size = %zuM, and the following configuration:",
                 max_heap_size()/M);
-  log_info(cds)("    narrow_klass_base at mapping start address, narrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
+  aot_log_info(aot)("    narrow_klass_base at mapping start address, narrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
                 archive_narrow_klass_pointer_bits, archive_narrow_klass_shift);
-  log_info(cds)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
+  aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
                 narrow_oop_mode(), p2i(narrow_oop_base()), narrow_oop_shift());
-  log_info(cds)("The current max heap size = %zuM, G1HeapRegion::GrainBytes = %zu",
+  aot_log_info(aot)("The current max heap size = %zuM, G1HeapRegion::GrainBytes = %zu",
                 MaxHeapSize/M, G1HeapRegion::GrainBytes);
-  log_info(cds)("    narrow_klass_base = " PTR_FORMAT ", arrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
+  aot_log_info(aot)("    narrow_klass_base = " PTR_FORMAT ", arrow_klass_pointer_bits = %d, narrow_klass_shift = %d",
                 p2i(CompressedKlassPointers::base()), CompressedKlassPointers::narrow_klass_pointer_bits(), CompressedKlassPointers::shift());
-  log_info(cds)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
+  aot_log_info(aot)("    narrow_oop_mode = %d, narrow_oop_base = " PTR_FORMAT ", narrow_oop_shift = %d",
                 CompressedOops::mode(), p2i(CompressedOops::base()), CompressedOops::shift());
-  log_info(cds)("    heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
+  aot_log_info(aot)("    heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
                 UseCompressedOops ? p2i(CompressedOops::begin()) :
                                     UseG1GC ? p2i((address)G1CollectedHeap::heap()->reserved().start()) : 0L,
                 UseCompressedOops ? p2i(CompressedOops::end()) :
@@ -1631,7 +1632,7 @@ bool FileMapInfo::map_heap_region_impl() {
   size_t word_size = size / HeapWordSize;
   address requested_start = heap_region_requested_address();
 
-  log_info(cds)("Preferred address to map heap data (to avoid relocation) is " INTPTR_FORMAT, p2i(requested_start));
+  aot_log_info(aot)("Preferred address to map heap data (to avoid relocation) is " INTPTR_FORMAT, p2i(requested_start));
 
   // allocate from java heap
   HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size, (HeapWord*)requested_start);
@@ -1652,7 +1653,7 @@ bool FileMapInfo::map_heap_region_impl() {
                      align_up(_mapped_heap_memregion.byte_size(), os::vm_page_size()),
                      /* do_commit = */ true)) {
       dealloc_heap_region();
-      log_error(cds)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
+      aot_log_error(aot)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
       return false;
     }
     // Checks for VerifySharedSpaces is already done inside read_region()
@@ -1663,7 +1664,7 @@ bool FileMapInfo::map_heap_region_impl() {
                       r->allow_exec(), mtJavaHeap);
     if (base == nullptr || base != addr) {
       dealloc_heap_region();
-      log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
+      aot_log_info(aot)("UseSharedSpaces: Unable to map at required address in java heap. "
                     INTPTR_FORMAT ", size = %zu bytes",
                     p2i(addr), _mapped_heap_memregion.byte_size());
       return false;
@@ -1701,9 +1702,9 @@ bool FileMapInfo::map_heap_region_impl() {
       return false;
     }
   }
-  log_info(cds)("Heap data mapped at " INTPTR_FORMAT ", size = %8zu bytes",
+  aot_log_info(aot)("Heap data mapped at " INTPTR_FORMAT ", size = %8zu bytes",
                 p2i(mapped_start), _mapped_heap_memregion.byte_size());
-  log_info(cds)("CDS heap data relocation delta = %zd bytes", delta);
+  aot_log_info(aot)("CDS heap data relocation delta = %zd bytes", delta);
   return true;
 }
 
@@ -1763,12 +1764,12 @@ void FileMapInfo::unmap_region(int i) {
 
   if (mapped_base != nullptr) {
     if (size > 0 && r->mapped_from_file()) {
-      log_info(cds)("Unmapping region #%d at base " INTPTR_FORMAT " (%s)", i, p2i(mapped_base),
+      aot_log_info(aot)("Unmapping region #%d at base " INTPTR_FORMAT " (%s)", i, p2i(mapped_base),
                     shared_region_name[i]);
       if (r->in_reserved_space()) {
         // This region was mapped inside a ReservedSpace. Its memory will be freed when the ReservedSpace
         // is released. Zero it so that we don't accidentally read its content.
-        log_info(cds)("Region #%d (%s) is in a reserved space, it will be freed when the space is released", i, shared_region_name[i]);
+        aot_log_info(aot)("Region #%d (%s) is in a reserved space, it will be freed when the space is released", i, shared_region_name[i]);
       } else {
         if (!os::unmap_memory(mapped_base, size)) {
           fatal("os::unmap_memory failed");
@@ -1835,31 +1836,31 @@ bool FileMapInfo::validate_aot_class_linking() {
     const char* archive_type = CDSConfig::type_of_archive_being_loaded();
     CDSConfig::set_has_aot_linked_classes(true);
     if (JvmtiExport::should_post_class_file_load_hook()) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.",
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used when JVMTI ClassFileLoadHook is in use.",
                      archive_type);
       return false;
     }
     if (JvmtiExport::has_early_vmstart_env()) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used when JVMTI early vm start is in use.",
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used when JVMTI early vm start is in use.",
                      archive_type);
       return false;
     }
     if (!CDSConfig::is_using_full_module_graph()) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used when archived full module graph is not used.",
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used when archived full module graph is not used.",
                      archive_type);
       return false;
     }
 
     const char* prop = Arguments::get_property("java.security.manager");
     if (prop != nullptr && strcmp(prop, "disallow") != 0) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used with -Djava.security.manager=%s.",
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used with -Djava.security.manager=%s.",
                      archive_type, prop);
       return false;
     }
 
 #if INCLUDE_JVMTI
     if (Arguments::has_jdwp_agent()) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used with JDWP agent", archive_type);
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used with JDWP agent", archive_type);
       return false;
     }
 #endif
@@ -1901,13 +1902,13 @@ int FileMapHeader::compute_crc() {
 bool FileMapHeader::validate() {
   const char* file_type = CDSConfig::type_of_archive_being_loaded();
   if (_obj_alignment != ObjectAlignmentInBytes) {
-    log_info(cds)("The %s's ObjectAlignmentInBytes of %d"
+    aot_log_info(aot)("The %s's ObjectAlignmentInBytes of %d"
                   " does not equal the current ObjectAlignmentInBytes of %d.",
                   file_type, _obj_alignment, ObjectAlignmentInBytes);
     return false;
   }
   if (_compact_strings != CompactStrings) {
-    log_info(cds)("The %s's CompactStrings setting (%s)"
+    aot_log_info(aot)("The %s's CompactStrings setting (%s)"
                   " does not equal the current CompactStrings setting (%s).", file_type,
                   _compact_strings ? "enabled" : "disabled",
                   CompactStrings   ? "enabled" : "disabled");
@@ -1919,11 +1920,11 @@ bool FileMapHeader::validate() {
   const char* prop = Arguments::get_property("java.system.class.loader");
   if (prop != nullptr) {
     if (has_aot_linked_classes()) {
-      log_error(cds)("%s has aot-linked classes. It cannot be used when the "
+      aot_log_error(aot)("%s has aot-linked classes. It cannot be used when the "
                      "java.system.class.loader property is specified.", CDSConfig::type_of_archive_being_loaded());
       return false;
     }
-    log_warning(cds)("Archived non-system classes are disabled because the "
+    aot_log_warning(aot)("Archived non-system classes are disabled because the "
             "java.system.class.loader property is specified (value = \"%s\"). "
             "To use archived non-system classes, this property must not be set", prop);
     _has_platform_or_app_classes = false;
@@ -1932,7 +1933,7 @@ 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 %s's BytecodeVerificationLocal setting (%s)"
+    aot_log_info(aot)("The %s's BytecodeVerificationLocal setting (%s)"
                                " does not equal the current BytecodeVerificationLocal setting (%s).", file_type,
                                _verify_local ? "enabled" : "disabled",
                                BytecodeVerificationLocal ? "enabled" : "disabled");
@@ -1944,7 +1945,7 @@ 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 %s was created with less restrictive "
+    aot_log_info(aot)("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.
@@ -1956,26 +1957,26 @@ bool FileMapHeader::validate() {
   // Note: _allow_archiving_with_java_agent is set in the shared archive during dump time
   // 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 "
+    aot_log_warning(aot)("The setting of the AllowArchivingWithJavaAgent is different "
                                "from the setting in the %s.", file_type);
     return false;
   }
 
   if (_allow_archiving_with_java_agent) {
-    log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+    aot_log_warning(aot)("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)("The %s was created with UseCompressedOops = %d, UseCompressedClassPointers = %d, UseCompactObjectHeaders = %d",
+  aot_log_info(aot)("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 %s.\nThe saved state of UseCompressedOops and UseCompressedClassPointers is "
+    aot_log_warning(aot)("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 %s.\nThe %s's UseCompactObjectHeaders setting (%s)"
+    aot_log_warning(aot)("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");
@@ -1984,7 +1985,7 @@ bool FileMapHeader::validate() {
 
   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");
+    aot_log_info(aot)("optimized module handling: disabled because archive was created without optimized module handling");
   }
 
   if (is_static()) {
@@ -2072,7 +2073,7 @@ ClassFileStream* FileMapInfo::open_stream_for_jvmti(InstanceKlass* ik, Handle cl
     cfs = cpe->open_stream_for_loader(THREAD, file_name, loader_data);
   }
   assert(cfs != nullptr, "must be able to read the classfile data of shared classes for built-in loaders.");
-  log_debug(cds, jvmti)("classfile data for %s [%d: %s] = %d bytes", class_name, path_index,
+  log_debug(aot, jvmti)("classfile data for %s [%d: %s] = %d bytes", class_name, path_index,
                         cfs->source(), cfs->length());
   return cfs;
 }
diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp
index f0ce8ceb020..a19adda87fa 100644
--- a/src/hotspot/share/cds/finalImageRecipes.cpp
+++ b/src/hotspot/share/cds/finalImageRecipes.cpp
@@ -181,9 +181,9 @@ void FinalImageRecipes::load_all_classes(TRAPS) {
         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");
+          log_error(aot)("Unable to resolve class from CDS archive: %s", ik->external_name());
+          log_error(aot)("Expected: " INTPTR_FORMAT ", actual: " INTPTR_FORMAT, p2i(ik), p2i(actual));
+          log_error(aot)("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");
@@ -205,9 +205,9 @@ void FinalImageRecipes::apply_recipes(TRAPS) {
   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(),
+      log_error(aot)("%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");
+      log_error(aot)("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");
     }
   }
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 32b4e9e13ed..1bc86248d42 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
@@ -174,9 +175,9 @@ static void reset_states(oop obj, TRAPS) {
     Method* method = klass->find_method(method_name, method_sig);
     if (method != nullptr) {
       assert(method->is_private(), "must be");
-      if (log_is_enabled(Debug, cds)) {
+      if (log_is_enabled(Debug, aot)) {
         ResourceMark rm(THREAD);
-        log_debug(cds)("  calling %s", method->name_and_sig_as_C_string());
+        log_debug(aot)("  calling %s", method->name_and_sig_as_C_string());
       }
       JavaValue result(T_VOID);
       JavaCalls::call_special(&result, h_obj, klass,
@@ -188,9 +189,9 @@ static void reset_states(oop obj, TRAPS) {
 
 void HeapShared::reset_archived_object_states(TRAPS) {
   assert(CDSConfig::is_dumping_heap(), "dump-time only");
-  log_debug(cds)("Resetting platform loader");
+  log_debug(aot)("Resetting platform loader");
   reset_states(SystemDictionary::java_platform_loader(), CHECK);
-  log_debug(cds)("Resetting system loader");
+  log_debug(aot)("Resetting system loader");
   reset_states(SystemDictionary::java_system_loader(), CHECK);
 
   // Clean up jdk.internal.loader.ClassLoaders::bootLoader(), which is not
@@ -200,7 +201,7 @@ void HeapShared::reset_archived_object_states(TRAPS) {
   // Note, this object is non-null, and is not the same as
   // ClassLoaderData::the_null_class_loader_data()->class_loader(),
   // which is null.
-  log_debug(cds)("Resetting boot loader");
+  log_debug(aot)("Resetting boot loader");
   JavaValue result(T_OBJECT);
   JavaCalls::call_static(&result,
                          vmClasses::jdk_internal_loader_ClassLoaders_klass(),
@@ -277,9 +278,9 @@ void HeapShared::clear_root(int index) {
   if (ArchiveHeapLoader::is_in_use()) {
     int seg_idx, int_idx;
     get_segment_indexes(index, seg_idx, int_idx);
-    if (log_is_enabled(Debug, cds, heap)) {
+    if (log_is_enabled(Debug, aot, heap)) {
       oop old = root_segment(seg_idx)->obj_at(int_idx);
-      log_debug(cds, heap)("Clearing root %d: was " PTR_FORMAT, index, p2i(old));
+      log_debug(aot, heap)("Clearing root %d: was " PTR_FORMAT, index, p2i(old));
     }
     root_segment(seg_idx)->obj_at_put(int_idx, nullptr);
   }
@@ -294,7 +295,7 @@ bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgra
   }
 
   if (ArchiveHeapWriter::is_too_large_to_archive(obj->size())) {
-    log_debug(cds, heap)("Cannot archive, object (" PTR_FORMAT ") is too large: %zu",
+    log_debug(aot, heap)("Cannot archive, object (" PTR_FORMAT ") is too large: %zu",
                          p2i(obj), obj->size());
     debug_trace();
     return false;
@@ -342,9 +343,9 @@ bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgra
       }
     }
 
-    if (log_is_enabled(Debug, cds, heap)) {
+    if (log_is_enabled(Debug, aot, heap)) {
       ResourceMark rm;
-      LogTarget(Debug, cds, heap) log;
+      LogTarget(Debug, aot, heap) log;
       LogStream out(log);
       out.print("Archived heap object " PTR_FORMAT " : %s ",
                 p2i(obj), obj->klass()->external_name());
@@ -569,9 +570,9 @@ void HeapShared::copy_and_rescan_aot_inited_mirror(InstanceKlass* ik) {
     assert(success, "sanity");
   }
 
-  if (log_is_enabled(Debug, cds, init)) {
+  if (log_is_enabled(Debug, aot, init)) {
     ResourceMark rm;
-    log_debug(cds, init)("copied %3d field(s) in aot-initialized mirror %s%s%s", nfields, ik->external_name(),
+    log_debug(aot, init)("copied %3d field(s) in aot-initialized mirror %s%s%s", nfields, ik->external_name(),
                          ik->is_hidden() ? " (hidden)" : "",
                          ik->is_enum_subclass() ? " (enum)" : "");
   }
@@ -654,7 +655,7 @@ void HeapShared::start_scanning_for_oops() {
     create_archived_object_cache();
 
     if (UseCompressedOops || UseG1GC) {
-      log_info(cds)("Heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
+      aot_log_info(aot)("Heap range = [" PTR_FORMAT " - "  PTR_FORMAT "]",
                     UseCompressedOops ? p2i(CompressedOops::begin()) :
                                         p2i((address)G1CollectedHeap::heap()->reserved().start()),
                     UseCompressedOops ? p2i(CompressedOops::end()) :
@@ -817,10 +818,10 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
     return;
   }
 
-  if (log_is_enabled(Debug, cds, heap)) {
+  if (log_is_enabled(Debug, aot, heap)) {
     if (!_subgraph_object_klasses->contains(orig_k)) {
       ResourceMark rm;
-      log_debug(cds, heap)("Adding klass %s", orig_k->external_name());
+      log_debug(aot, heap)("Adding klass %s", orig_k->external_name());
     }
   }
 
@@ -863,7 +864,7 @@ void KlassSubGraphInfo::check_allowed_klass(InstanceKlass* ik) {
 #endif
 
   ResourceMark rm;
-  log_error(cds, heap)("Class %s not allowed in archive heap. Must be in java.base%s%s",
+  log_error(aot, heap)("Class %s not allowed in archive heap. Must be in java.base%s%s",
                        ik->external_name(), lambda_msg, testcls_msg);
   MetaspaceShared::unrecoverable_writing_error();
 }
@@ -875,7 +876,7 @@ bool KlassSubGraphInfo::is_non_early_klass(Klass* k) {
   if (k->is_instance_klass()) {
     if (!SystemDictionaryShared::is_early_klass(InstanceKlass::cast(k))) {
       ResourceMark rm;
-      log_info(cds, heap)("non-early: %s", k->external_name());
+      log_info(aot, heap)("non-early: %s", k->external_name());
       return true;
     } else {
       return false;
@@ -903,7 +904,7 @@ void ArchivedKlassSubGraphInfoRecord::init(KlassSubGraphInfo* info) {
 
   if (_has_non_early_klasses) {
     ResourceMark rm;
-    log_info(cds, heap)(
+    log_info(aot, heap)(
           "Subgraph of klass %s has non-early klasses and cannot be used when JVMTI ClassFileLoadHook is enabled",
           _k->external_name());
   }
@@ -942,13 +943,13 @@ void ArchivedKlassSubGraphInfoRecord::init(KlassSubGraphInfo* info) {
       if (subgraph_k->has_aot_initialized_mirror()) {
         continue;
       }
-      if (log_is_enabled(Info, cds, heap)) {
+      if (log_is_enabled(Info, aot, heap)) {
         ResourceMark rm;
         const char* owner_name =  is_special ? "<special>" : _k->external_name();
         if (subgraph_k->is_instance_klass()) {
           InstanceKlass* src_ik = InstanceKlass::cast(ArchiveBuilder::current()->get_source_addr(subgraph_k));
         }
-        log_info(cds, heap)(
+        log_info(aot, heap)(
           "Archived object klass %s (%2d) => %s",
           owner_name, n, subgraph_k->external_name());
       }
@@ -1017,7 +1018,7 @@ void HeapShared::write_subgraph_info_table() {
     _archived_ArchiveHeapTestClass = array;
   }
 #endif
-  if (log_is_enabled(Info, cds, heap)) {
+  if (log_is_enabled(Info, aot, heap)) {
     print_stats();
   }
 }
@@ -1052,7 +1053,7 @@ void HeapShared::serialize_tables(SerializeClosure* soc) {
 static void verify_the_heap(Klass* k, const char* which) {
   if (VerifyArchivedFields > 0) {
     ResourceMark rm;
-    log_info(cds, heap)("Verify heap %s initializing static field(s) in %s",
+    log_info(aot, heap)("Verify heap %s initializing static field(s) in %s",
                         which, k->external_name());
 
     VM_Verify verify_op;
@@ -1066,7 +1067,7 @@ static void verify_the_heap(Klass* k, const char* which) {
       //
       // -XX:VerifyArchivedFields=2 force a GC to happen in such an early stage
       // to check for GC safety.
-      log_info(cds, heap)("Trigger GC %s initializing static field(s) in %s",
+      log_info(aot, heap)("Trigger GC %s initializing static field(s) in %s",
                           which, k->external_name());
       FlagSetting fs1(VerifyBeforeGC, true);
       FlagSetting fs2(VerifyDuringGC, true);
@@ -1185,7 +1186,7 @@ void HeapShared::initialize_from_archived_subgraph(JavaThread* current, Klass* k
       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",
+    log_info(aot, heap)("Skip initializing ArchivedModuleGraph subgraph: is_using_optimized_module_handling=%s num_module_paths=%d",
                         BOOL_TO_STR(CDSConfig::is_using_optimized_module_handling()),
                         AOTClassLocationConfig::runtime()->num_module_paths());
     return;
@@ -1228,34 +1229,34 @@ HeapShared::resolve_or_init_classes_for_subgraph_of(Klass* k, bool do_init, TRAP
   // Initialize from archived data. Currently this is done only
   // during VM initialization time. No lock is needed.
   if (record == nullptr) {
-    if (log_is_enabled(Info, cds, heap)) {
+    if (log_is_enabled(Info, aot, heap)) {
       ResourceMark rm(THREAD);
-      log_info(cds, heap)("subgraph %s is not recorded",
+      log_info(aot, heap)("subgraph %s is not recorded",
                           k->external_name());
     }
     return nullptr;
   } else {
     if (record->is_full_module_graph() && !CDSConfig::is_using_full_module_graph()) {
-      if (log_is_enabled(Info, cds, heap)) {
+      if (log_is_enabled(Info, aot, heap)) {
         ResourceMark rm(THREAD);
-        log_info(cds, heap)("subgraph %s cannot be used because full module graph is disabled",
+        log_info(aot, heap)("subgraph %s cannot be used because full module graph is disabled",
                             k->external_name());
       }
       return nullptr;
     }
 
     if (record->has_non_early_klasses() && JvmtiExport::should_post_class_file_load_hook()) {
-      if (log_is_enabled(Info, cds, heap)) {
+      if (log_is_enabled(Info, aot, heap)) {
         ResourceMark rm(THREAD);
-        log_info(cds, heap)("subgraph %s cannot be used because JVMTI ClassFileLoadHook is enabled",
+        log_info(aot, heap)("subgraph %s cannot be used because JVMTI ClassFileLoadHook is enabled",
                             k->external_name());
       }
       return nullptr;
     }
 
-    if (log_is_enabled(Info, cds, heap)) {
+    if (log_is_enabled(Info, aot, heap)) {
       ResourceMark rm;
-      log_info(cds, heap)("%s subgraph %s ", do_init ? "init" : "resolve", k->external_name());
+      log_info(aot, heap)("%s subgraph %s ", do_init ? "init" : "resolve", k->external_name());
     }
 
     resolve_or_init(k, do_init, CHECK_NULL);
@@ -1327,14 +1328,14 @@ void HeapShared::init_archived_fields_for(Klass* k, const ArchivedKlassSubGraphI
       } else {
         m->obj_field_put(field_offset, v);
       }
-      log_debug(cds, heap)("  " PTR_FORMAT " init field @ %2d = " PTR_FORMAT, p2i(k), field_offset, p2i(v));
+      log_debug(aot, heap)("  " PTR_FORMAT " init field @ %2d = " PTR_FORMAT, p2i(k), field_offset, p2i(v));
     }
 
     // Done. Java code can see the archived sub-graphs referenced from k's
     // mirror after this point.
-    if (log_is_enabled(Info, cds, heap)) {
+    if (log_is_enabled(Info, aot, heap)) {
       ResourceMark rm;
-      log_info(cds, heap)("initialize_from_archived_subgraph %s " PTR_FORMAT "%s%s",
+      log_info(aot, heap)("initialize_from_archived_subgraph %s " PTR_FORMAT "%s%s",
                           k->external_name(), p2i(k), JvmtiExport::is_early_phase() ? " (early)" : "",
                           k->has_aot_initialized_mirror() ? " (aot-inited)" : "");
     }
@@ -1406,13 +1407,13 @@ class HeapShared::OopFieldPusher: public BasicOopIterateClosure {
         return;
       }
 
-      if (!_record_klasses_only && log_is_enabled(Debug, cds, heap)) {
+      if (!_record_klasses_only && log_is_enabled(Debug, aot, heap)) {
         ResourceMark rm;
-        log_debug(cds, heap)("(%d) %s[%d] ==> " PTR_FORMAT " size %zu %s", _level,
+        log_debug(aot, heap)("(%d) %s[%d] ==> " PTR_FORMAT " size %zu %s", _level,
                              _referencing_obj->klass()->external_name(), field_offset,
                              p2i(obj), obj->size() * HeapWordSize, obj->klass()->external_name());
-        if (log_is_enabled(Trace, cds, heap)) {
-          LogTarget(Trace, cds, heap) log;
+        if (log_is_enabled(Trace, aot, heap)) {
+          LogTarget(Trace, aot, heap) log;
           LogStream out(log);
           obj->print_on(&out);
         }
@@ -1499,14 +1500,14 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
     // If you get an error here, you probably made a change in the JDK library that has added
     // these objects that are referenced (directly or indirectly) by static fields.
     ResourceMark rm;
-    log_error(cds, heap)("Cannot archive object " PTR_FORMAT " of class %s", p2i(orig_obj), orig_obj->klass()->external_name());
+    log_error(aot, heap)("Cannot archive object " PTR_FORMAT " of class %s", p2i(orig_obj), orig_obj->klass()->external_name());
     debug_trace();
     MetaspaceShared::unrecoverable_writing_error();
   }
 
-  if (log_is_enabled(Debug, cds, heap) && java_lang_Class::is_instance(orig_obj)) {
+  if (log_is_enabled(Debug, aot, heap) && java_lang_Class::is_instance(orig_obj)) {
     ResourceMark rm;
-    LogTarget(Debug, cds, heap) log;
+    LogTarget(Debug, aot, heap) log;
     LogStream out(log);
     out.print("Found java mirror " PTR_FORMAT " ", p2i(orig_obj));
     Klass* k = java_lang_Class::as_Klass(orig_obj);
@@ -1545,7 +1546,7 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
       // If you get an error here, you probably made a change in the JDK library that has added a Class
       // object that is referenced (directly or indirectly) by an ArchivableStaticFieldInfo
       // defined at the top of this file.
-      log_error(cds, heap)("(%d) Unknown java.lang.Class object is in the archived sub-graph", level);
+      log_error(aot, heap)("(%d) Unknown java.lang.Class object is in the archived sub-graph", level);
       debug_trace();
       MetaspaceShared::unrecoverable_writing_error();
     }
@@ -1565,7 +1566,7 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
     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)(
+      log_error(aot, heap)(
         "Cannot archive the sub-graph referenced from %s object ("
         PTR_FORMAT ") size %zu, skipped.",
         orig_obj->klass()->external_name(), p2i(orig_obj), orig_obj->size() * HeapWordSize);
@@ -1650,25 +1651,25 @@ void HeapShared::archive_reachable_objects_from_static_field(InstanceKlass *k,
   KlassSubGraphInfo* subgraph_info = get_subgraph_info(k);
   oop f = m->obj_field(field_offset);
 
-  log_debug(cds, heap)("Start archiving from: %s::%s (" PTR_FORMAT ")", klass_name, field_name, p2i(f));
+  log_debug(aot, heap)("Start archiving from: %s::%s (" PTR_FORMAT ")", klass_name, field_name, p2i(f));
 
   if (!CompressedOops::is_null(f)) {
-    if (log_is_enabled(Trace, cds, heap)) {
-      LogTarget(Trace, cds, heap) log;
+    if (log_is_enabled(Trace, aot, heap)) {
+      LogTarget(Trace, aot, heap) log;
       LogStream out(log);
       f->print_on(&out);
     }
 
     bool success = archive_reachable_objects_from(1, subgraph_info, f);
     if (!success) {
-      log_error(cds, heap)("Archiving failed %s::%s (some reachable objects cannot be archived)",
+      log_error(aot, heap)("Archiving failed %s::%s (some reachable objects cannot be archived)",
                            klass_name, field_name);
     } else {
       // Note: the field value is not preserved in the archived mirror.
       // Record the field as a new subGraph entry point. The recorded
       // information is restored from the archive at runtime.
       subgraph_info->add_subgraph_entry_field(field_offset, f);
-      log_info(cds, heap)("Archived field %s::%s => " PTR_FORMAT, klass_name, field_name, p2i(f));
+      log_info(aot, heap)("Archived field %s::%s => " PTR_FORMAT, klass_name, field_name, p2i(f));
     }
   } else {
     // The field contains null, we still need to record the entry point,
@@ -1787,7 +1788,7 @@ void HeapShared::set_has_been_seen_during_subgraph_recording(oop obj) {
 }
 
 void HeapShared::start_recording_subgraph(InstanceKlass *k, const char* class_name, bool is_full_module_graph) {
-  log_info(cds, heap)("Start recording subgraph(s) for archived fields in %s", class_name);
+  log_info(aot, heap)("Start recording subgraph(s) for archived fields in %s", class_name);
   init_subgraph_info(k, is_full_module_graph);
   init_seen_objects_table();
   _num_new_walked_objs = 0;
@@ -1798,7 +1799,7 @@ void HeapShared::start_recording_subgraph(InstanceKlass *k, const char* class_na
 void HeapShared::done_recording_subgraph(InstanceKlass *k, const char* class_name) {
   int num_new_recorded_klasses = get_subgraph_info(k)->num_subgraph_object_klasses() -
     _num_old_recorded_klasses;
-  log_info(cds, heap)("Done recording subgraph(s) for archived fields in %s: "
+  log_info(aot, heap)("Done recording subgraph(s) for archived fields in %s: "
                       "walked %d objs, archived %d new objs, recorded %d classes",
                       class_name, _num_new_walked_objs, _num_new_archived_objs,
                       num_new_recorded_klasses);
@@ -1850,7 +1851,7 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
 #endif
 
     if (is_test_class) {
-      log_warning(cds)("Loading ArchiveHeapTestClass %s ...", test_class_name);
+      log_warning(aot)("Loading ArchiveHeapTestClass %s ...", test_class_name);
     }
 
     Klass* k = SystemDictionary::resolve_or_fail(klass_name, true, THREAD);
@@ -1898,7 +1899,7 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
     }
 
     if (is_test_class) {
-      log_warning(cds)("Initializing ArchiveHeapTestClass %s ...", test_class_name);
+      log_warning(aot)("Initializing ArchiveHeapTestClass %s ...", test_class_name);
     }
     ik->initialize(CHECK);
 
@@ -2047,18 +2048,18 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
     done_recording_subgraph(info->klass, klass_name);
   }
 
-  log_info(cds, heap)("Archived subgraph records = %d",
+  log_info(aot, heap)("Archived subgraph records = %d",
                       _num_total_subgraph_recordings);
-  log_info(cds, heap)("  Walked %d objects", _num_total_walked_objs);
-  log_info(cds, heap)("  Archived %d objects", _num_total_archived_objs);
-  log_info(cds, heap)("  Recorded %d klasses", _num_total_recorded_klasses);
+  log_info(aot, heap)("  Walked %d objects", _num_total_walked_objs);
+  log_info(aot, heap)("  Archived %d objects", _num_total_archived_objs);
+  log_info(aot, heap)("  Recorded %d klasses", _num_total_recorded_klasses);
 
 #ifndef PRODUCT
   for (int i = 0; fields[i].valid(); i++) {
     ArchivableStaticFieldInfo* f = &fields[i];
     verify_subgraph_from_static_field(f->klass, f->offset);
   }
-  log_info(cds, heap)("  Verified %d references", _num_total_verifications);
+  log_info(aot, heap)("  Verified %d references", _num_total_verifications);
 #endif
 }
 
@@ -2085,7 +2086,7 @@ void HeapShared::debug_trace() {
   ResourceMark rm;
   oop referrer = _object_being_archived.referrer();
   if (referrer != nullptr) {
-    LogStream ls(Log(cds, heap)::error());
+    LogStream ls(Log(aot, heap)::error());
     ls.print_cr("Reference trace");
     CDSHeapVerifier::trace_to_root(&ls, referrer);
   }
@@ -2158,18 +2159,18 @@ void HeapShared::print_stats() {
     size_t byte_size_limit = (size_t(1) << i) * HeapWordSize;
     size_t count = _alloc_count[i];
     size_t size = _alloc_size[i];
-    log_info(cds, heap)("%8zu objects are <= %-6zu"
+    log_info(aot, heap)("%8zu objects are <= %-6zu"
                         " bytes (total %8zu bytes, avg %8.1f bytes)",
                         count, byte_size_limit, size * HeapWordSize, avg_size(size, count));
     huge_count -= count;
     huge_size -= size;
   }
 
-  log_info(cds, heap)("%8zu huge  objects               (total %8zu bytes"
+  log_info(aot, heap)("%8zu huge  objects               (total %8zu bytes"
                       ", avg %8.1f bytes)",
                       huge_count, huge_size * HeapWordSize,
                       avg_size(huge_size, huge_count));
-  log_info(cds, heap)("%8zu total objects               (total %8zu bytes"
+  log_info(aot, heap)("%8zu total objects               (total %8zu bytes"
                       ", avg %8.1f bytes)",
                       _total_obj_count, _total_obj_size * HeapWordSize,
                       avg_size(_total_obj_size, _total_obj_count));
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index 7832de8c6cc..3ed0daf2c4c 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -83,10 +83,10 @@ void LambdaFormInvokers::append(char* line) {
 class PrintLambdaFormMessage {
  public:
   PrintLambdaFormMessage() {
-    log_info(cds)("Regenerate MethodHandle Holder classes...");
+    log_info(aot)("Regenerate MethodHandle Holder classes...");
   }
   ~PrintLambdaFormMessage() {
-    log_info(cds)("Regenerate MethodHandle Holder classes...done");
+    log_info(aot)("Regenerate MethodHandle Holder classes...done");
   }
 };
 
@@ -114,7 +114,7 @@ void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
 
   PrintLambdaFormMessage plm;
   if (_lambdaform_lines == nullptr || _lambdaform_lines->length() == 0) {
-    log_info(cds)("Nothing to regenerate for holder classes");
+    log_info(aot)("Nothing to regenerate for holder classes");
     return;
   }
 
@@ -153,9 +153,9 @@ void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
       log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
       if (CDSConfig::is_dumping_static_archive()) {
-        log_error(cds)("Failed to generate LambdaForm holder classes. Is your classlist out of date?");
+        log_error(aot)("Failed to generate LambdaForm holder classes. Is your classlist out of date?");
       } else {
-        log_error(cds)("Failed to generate LambdaForm holder classes. Was the base archive generated with an outdated classlist?");
+        log_error(aot)("Failed to generate LambdaForm holder classes. Was the base archive generated with an outdated classlist?");
       }
       CLEAR_PENDING_EXCEPTION;
     }
@@ -226,7 +226,7 @@ void LambdaFormInvokers::regenerate_class(char* class_name, ClassFileStream& st,
   if (!klass->is_shared()) {
     SystemDictionaryShared::set_excluded(InstanceKlass::cast(klass)); // exclude the existing class from dump
   }
-  log_info(cds, lambda)("Regenerated class %s, old: " INTPTR_FORMAT " new: " INTPTR_FORMAT,
+  log_info(aot, lambda)("Regenerated class %s, old: " INTPTR_FORMAT " new: " INTPTR_FORMAT,
                  class_name, p2i(klass), p2i(result));
 }
 
@@ -256,7 +256,7 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
       }
       assert(index == count, "Should match");
     }
-    log_debug(cds)("Total LF lines stored into %s: %d", CDSConfig::type_of_archive_being_written(), count);
+    log_debug(aot)("Total LF lines stored into %s: %d", CDSConfig::type_of_archive_being_written(), count);
   }
 }
 
@@ -268,7 +268,7 @@ void LambdaFormInvokers::read_static_archive_invokers() {
       char* str = line->adr_at(0);
       append(str);
     }
-    log_debug(cds)("Total LF lines read from %s: %d", CDSConfig::type_of_archive_being_loaded(), _static_archive_invokers->length());
+    log_debug(aot)("Total LF lines read from %s: %d", CDSConfig::type_of_archive_being_loaded(), _static_archive_invokers->length());
   }
 }
 
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 45a41e9f679..53d75a3d7ec 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -28,6 +28,7 @@
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotConstantPoolResolver.hpp"
 #include "cds/aotLinkedClassBulkLoader.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
@@ -186,7 +187,7 @@ class DumpClassListCLDClosure : public CLDClosure {
       return;
     }
     if (_dumped_classes.maybe_grow()) {
-      log_info(cds, hashtables)("Expanded _dumped_classes table to %d", _dumped_classes.table_size());
+      log_info(aot, hashtables)("Expanded _dumped_classes table to %d", _dumped_classes.table_size());
     }
     if (ik->java_super()) {
       dump(ik->java_super());
@@ -257,7 +258,7 @@ static char* compute_shared_base(size_t cds_max) {
                            : nullptr;
 
   if (aligned_base != specified_base) {
-    log_info(cds)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
+    aot_log_info(aot)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
                    p2i(specified_base), p2i(aligned_base));
   }
 
@@ -275,7 +276,7 @@ static char* compute_shared_base(size_t cds_max) {
   // Arguments::default_SharedBaseAddress() is hard-coded in cds_globals.hpp. It must be carefully
   // picked that (a) the align_up() below will always return a valid value; (b) none of
   // the following asserts will fail.
-  log_warning(cds)("SharedBaseAddress (" INTPTR_FORMAT ") is %s. Reverted to " INTPTR_FORMAT,
+  aot_log_warning(aot)("SharedBaseAddress (" INTPTR_FORMAT ") is %s. Reverted to " INTPTR_FORMAT,
                    p2i((void*)SharedBaseAddress), err,
                    p2i((void*)Arguments::default_SharedBaseAddress()));
 
@@ -290,7 +291,7 @@ static char* compute_shared_base(size_t cds_max) {
 
 void MetaspaceShared::initialize_for_static_dump() {
   assert(CDSConfig::is_dumping_static_archive(), "sanity");
-  log_info(cds)("Core region alignment: %zu", core_region_alignment());
+  aot_log_info(aot)("Core region alignment: %zu", core_region_alignment());
   // The max allowed size for CDS archive. We use this to limit SharedBaseAddress
   // to avoid address space wrap around.
   size_t cds_max;
@@ -314,7 +315,7 @@ void MetaspaceShared::initialize_for_static_dump() {
                                        os::vm_page_size(),
                                        mtClassShared);
   if (!_symbol_rs.is_reserved()) {
-    log_error(cds)("Unable to reserve memory for symbols: %zu bytes.", symbol_rs_size);
+    aot_log_error(aot)("Unable to reserve memory for symbols: %zu bytes.", symbol_rs_size);
     MetaspaceShared::unrecoverable_writing_error();
   }
   _symbol_region.init(&_symbol_rs, &_symbol_vs);
@@ -350,7 +351,7 @@ void MetaspaceShared::read_extra_data(JavaThread* current, const char* filename)
     ResourceMark rm(current);
     if (utf8_length == 0x7fffffff) {
       // buf_len will overflown 32-bit value.
-      log_error(cds)("string length too large: %d", utf8_length);
+      aot_log_error(aot)("string length too large: %d", utf8_length);
       MetaspaceShared::unrecoverable_loading_error();
     }
     int buf_len = utf8_length+1;
@@ -367,13 +368,13 @@ void MetaspaceShared::read_extra_data(JavaThread* current, const char* filename)
       oop str = StringTable::intern(utf8_buffer, THREAD);
 
       if (HAS_PENDING_EXCEPTION) {
-        log_warning(cds, heap)("[line %d] extra interned string allocation failed; size too large: %d",
+        log_warning(aot, heap)("[line %d] extra interned string allocation failed; size too large: %d",
                                reader.last_line_no(), utf8_length);
         CLEAR_PENDING_EXCEPTION;
       } else {
 #if INCLUDE_CDS_JAVA_HEAP
         if (ArchiveHeapWriter::is_string_too_large_to_archive(str)) {
-          log_warning(cds, heap)("[line %d] extra interned string ignored; size too large: %d",
+          log_warning(aot, heap)("[line %d] extra interned string ignored; size too large: %d",
                                  reader.last_line_no(), utf8_length);
           continue;
         }
@@ -407,7 +408,7 @@ void MetaspaceShared::write_method_handle_intrinsics() {
       word_size += m->constants()->cache()->size();
     }
   }
-  log_info(cds)("Archived %d method handle intrinsics (%d bytes)", len, word_size * BytesPerWord);
+  log_info(aot)("Archived %d method handle intrinsics (%d bytes)", len, word_size * BytesPerWord);
 }
 
 // About "serialize" --
@@ -539,7 +540,7 @@ class VM_PopulateDumpSharedSpace : public VM_Operation {
 
   void dump_java_heap_objects();
   void dump_shared_symbol_table(GrowableArray<Symbol*>* symbols) {
-    log_info(cds)("Dumping symbol table ...");
+    log_info(aot)("Dumping symbol table ...");
     SymbolTable::write_to_archive(symbols);
   }
   char* dump_early_read_only_tables();
@@ -656,7 +657,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   _builder.dump_ro_metadata();
   _builder.relocate_metaspaceobj_embedded_pointers();
 
-  log_info(cds)("Make classes shareable");
+  log_info(aot)("Make classes shareable");
   _builder.make_klasses_shareable();
   MetaspaceShared::make_method_handle_intrinsics_shareable();
 
@@ -668,7 +669,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   char* serialized_data = dump_read_only_tables(cl_config);
 
   if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
-    log_info(cds)("Adjust lambda proxy class dictionary");
+    log_info(aot)("Adjust lambda proxy class dictionary");
     LambdaProxyClassDictionary::adjust_dumptime_table();
   }
 
@@ -794,11 +795,11 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
   preload_and_dump_impl(builder, THREAD);
   if (HAS_PENDING_EXCEPTION) {
     if (PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
-      log_error(cds)("Out of memory. Please run with a larger Java heap, current MaxHeapSize = "
+      aot_log_error(aot)("Out of memory. Please run with a larger Java heap, current MaxHeapSize = "
                      "%zuM", MaxHeapSize/M);
       MetaspaceShared::writing_error();
     } else {
-      log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
+      aot_log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
       MetaspaceShared::writing_error("Unexpected exception, use -Xlog:cds,exceptions=trace for detail");
     }
@@ -837,15 +838,15 @@ void MetaspaceShared::adjust_heap_sizes_for_dumping() {
   julong max_heap_size = (julong)(4 * G);
 
   if (MinHeapSize > max_heap_size) {
-    log_debug(cds)("Setting MinHeapSize to 4G for CDS dumping, original size = %zuM", MinHeapSize/M);
+    log_debug(aot)("Setting MinHeapSize to 4G for CDS dumping, original size = %zuM", MinHeapSize/M);
     FLAG_SET_ERGO(MinHeapSize, max_heap_size);
   }
   if (InitialHeapSize > max_heap_size) {
-    log_debug(cds)("Setting InitialHeapSize to 4G for CDS dumping, original size = %zuM", InitialHeapSize/M);
+    log_debug(aot)("Setting InitialHeapSize to 4G for CDS dumping, original size = %zuM", InitialHeapSize/M);
     FLAG_SET_ERGO(InitialHeapSize, max_heap_size);
   }
   if (MaxHeapSize > max_heap_size) {
-    log_debug(cds)("Setting MaxHeapSize to 4G for CDS dumping, original size = %zuM", MaxHeapSize/M);
+    log_debug(aot)("Setting MaxHeapSize to 4G for CDS dumping, original size = %zuM", MaxHeapSize/M);
     FLAG_SET_ERGO(MaxHeapSize, max_heap_size);
   }
 }
@@ -868,7 +869,7 @@ void MetaspaceShared::preload_classes(TRAPS) {
     classlist_path = SharedClassListFile;
   }
 
-  log_info(cds)("Loading classes to share ...");
+  aot_log_info(aot)("Loading classes to share ...");
   ClassListParser::parse_classlist(classlist_path,
                                    ClassListParser::_parse_all, CHECK);
   if (ExtraSharedClassListFile) {
@@ -889,7 +890,7 @@ void MetaspaceShared::preload_classes(TRAPS) {
   // are archived.
   exercise_runtime_cds_code(CHECK);
 
-  log_info(cds)("Loading classes to share: done.");
+  aot_log_info(aot)("Loading classes to share: done.");
 }
 
 void MetaspaceShared::exercise_runtime_cds_code(TRAPS) {
@@ -907,14 +908,14 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
     preload_classes(CHECK);
 
     if (SharedArchiveConfigFile) {
-      log_info(cds)("Reading extra data from %s ...", SharedArchiveConfigFile);
+      log_info(aot)("Reading extra data from %s ...", SharedArchiveConfigFile);
       read_extra_data(THREAD, SharedArchiveConfigFile);
-      log_info(cds)("Reading extra data: done.");
+      log_info(aot)("Reading extra data: done.");
     }
   }
 
   if (CDSConfig::is_dumping_preimage_static_archive()) {
-    log_info(cds)("Reading lambda form invokers from JDK default classlist ...");
+    log_info(aot)("Reading lambda form invokers from JDK default classlist ...");
     char default_classlist[JVM_MAXPATHLEN];
     get_default_classlist(default_classlist, JVM_MAXPATHLEN);
     struct stat statbuf;
@@ -938,21 +939,21 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
 
   if (CDSConfig::is_dumping_final_static_archive()) {
     if (ExtraSharedClassListFile) {
-      log_info(cds)("Loading extra classes from %s ...", ExtraSharedClassListFile);
+      log_info(aot)("Loading extra classes from %s ...", ExtraSharedClassListFile);
       ClassListParser::parse_classlist(ExtraSharedClassListFile,
                                        ClassListParser::_parse_all, CHECK);
     }
   }
 
   // Rewrite and link classes
-  log_info(cds)("Rewriting and linking classes ...");
+  log_info(aot)("Rewriting and linking classes ...");
 
   // Link any classes which got missed. This would happen if we have loaded classes that
   // were not explicitly specified in the classlist. E.g., if an interface implemented by class K
   // fails verification, all other interfaces that were not specified in the classlist but
   // are implemented by K are not verified.
   link_shared_classes(CHECK);
-  log_info(cds)("Rewriting and linking classes: done");
+  log_info(aot)("Rewriting and linking classes: done");
 
   if (CDSConfig::is_dumping_regenerated_lambdaform_invokers()) {
     LambdaFormInvokers::regenerate_holder_classes(CHECK);
@@ -973,7 +974,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
     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");
+      log_debug(aot)("Resetting Class::reflectionFactory");
       TempNewSymbol method_name = SymbolTable::new_symbol("resetArchivedStates");
       Symbol* method_sig = vmSymbols::void_method_signature();
       JavaValue result(T_VOID);
@@ -988,7 +989,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
     // some new strings may be added to the intern table.
     StringTable::allocate_shared_strings_array(CHECK);
   } else {
-    log_info(cds)("Not dumping heap, reset CDSConfig::_is_using_optimized_module_handling");
+    log_info(aot)("Not dumping heap, reset CDSConfig::_is_using_optimized_module_handling");
     CDSConfig::stop_using_optimized_module_handling();
   }
 #endif
@@ -1024,7 +1025,7 @@ bool MetaspaceShared::write_static_archive(ArchiveBuilder* builder, FileMapInfo*
   builder->write_archive(map_info, heap_info);
 
   if (AllowArchivingWithJavaAgent) {
-    log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+    aot_log_warning(aot)("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;
@@ -1057,7 +1058,7 @@ bool MetaspaceShared::try_link_class(JavaThread* current, InstanceKlass* ik) {
     ik->link_class(THREAD);
     if (HAS_PENDING_EXCEPTION) {
       ResourceMark rm(THREAD);
-      log_warning(cds)("Preload Warning: Verification failed for %s",
+      aot_log_warning(aot)("Preload Warning: Verification failed for %s",
                     ik->external_name());
       CLEAR_PENDING_EXCEPTION;
       SystemDictionaryShared::set_class_has_failed_verification(ik);
@@ -1109,7 +1110,7 @@ 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) {
-  report_loading_error(message);
+  report_loading_error("%s", message);
 
   if (CDSConfig::is_dumping_final_static_archive()) {
     vm_exit_during_initialization("Must be a valid AOT configuration generated by the current JVM", AOTConfiguration);
@@ -1121,27 +1122,30 @@ void MetaspaceShared::unrecoverable_loading_error(const char* message) {
 }
 
 void MetaspaceShared::report_loading_error(const char* format, ...) {
-  // If the user doesn't specify any CDS options, we will try to load the default CDS archive, which
-  // may fail due to incompatible VM options. Print at the info level to avoid excessive verbosity.
+  // When using AOT cache, errors messages are always printed on the error channel.
+  LogStream ls_aot(LogLevel::Error, LogTagSetMapping<LOG_TAGS(aot)>::tagset());
+
+  // If we are loading load the default CDS archive, it may fail due to incompatible VM options.
+  // Print at the info level to avoid excessive verbosity.
   // However, if the user has specified a CDS archive (or AOT cache), they would be interested in
   // knowing that the loading fails, so we print at the error level.
-  Log(cds) log;
-  LogStream ls_error(log.error());
-  LogStream ls_info(log.info());
-  LogStream& ls = (!CDSConfig::is_using_archive()) || CDSConfig::is_using_only_default_archive() ? ls_info : ls_error;
+  LogLevelType level = (!CDSConfig::is_using_archive() || CDSConfig::is_using_only_default_archive()) ?
+                        LogLevel::Info : LogLevel::Error;
+  LogStream ls_cds(level, LogTagSetMapping<LOG_TAGS(cds)>::tagset());
+
+  LogStream& ls = CDSConfig::new_aot_flags_used() ? ls_aot : ls_cds;
+  va_list ap;
+  va_start(ap, format);
 
   static bool printed_error = false;
   if (!printed_error) { // No need for locks. Loading error checks happen only in main thread.
-    ls.print_cr("An error has occurred while processing the %s. Run with -Xlog:cds for details.", CDSConfig::type_of_archive_being_loaded());
+    ls.print_cr("An error has occurred while processing the %s. Run with -Xlog:%s for details.",
+                CDSConfig::type_of_archive_being_loaded(), CDSConfig::new_aot_flags_used() ? "aot" : "aot,cds");
     printed_error = true;
   }
+  ls.vprint_cr(format, ap);
 
-  if (format != nullptr) {
-    va_list ap;
-    va_start(ap, format);
-    ls.vprint_cr(format, ap);
-    va_end(ap);
-  }
+  va_end(ap);
 }
 
 // This function is called when the JVM is unable to write the specified CDS archive due to an
@@ -1154,9 +1158,9 @@ void MetaspaceShared::unrecoverable_writing_error(const char* message) {
 // This function is called when the JVM is unable to write the specified CDS archive due to a
 // an error. The error will be propagated
 void MetaspaceShared::writing_error(const char* message) {
-  log_error(cds)("An error has occurred while writing the shared archive file.");
+  aot_log_error(aot)("An error has occurred while writing the shared archive file.");
   if (message != nullptr) {
-    log_error(cds)("%s", message);
+    aot_log_error(aot)("%s", message);
   }
 }
 
@@ -1168,17 +1172,17 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
   FileMapInfo* dynamic_mapinfo = nullptr;
 
   if (static_mapinfo != nullptr) {
-    log_info(cds)("Core region alignment: %zu", static_mapinfo->core_region_alignment());
+    aot_log_info(aot)("Core region alignment: %zu", static_mapinfo->core_region_alignment());
     dynamic_mapinfo = open_dynamic_archive();
 
-    log_info(cds)("ArchiveRelocationMode: %d", ArchiveRelocationMode);
+    aot_log_info(aot)("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) {
       // Mapping has failed (probably due to ASLR). Let's map at an address chosen
       // by the OS.
-      log_info(cds)("Try to map archive(s) at an alternative address");
+      aot_log_info(aot)("Try to map archive(s) at an alternative address");
       result = map_archives(static_mapinfo, dynamic_mapinfo, false);
     }
   }
@@ -1199,7 +1203,7 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
   } else {
     set_shared_metaspace_range(nullptr, nullptr, nullptr);
     if (CDSConfig::is_dumping_dynamic_archive()) {
-      log_warning(cds)("-XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info.");
+      aot_log_warning(aot)("-XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info.");
     }
     UseSharedSpaces = false;
     // The base archive cannot be mapped. We cannot dump the dynamic shared archive.
@@ -1268,7 +1272,7 @@ FileMapInfo* MetaspaceShared::open_dynamic_archive() {
 MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, FileMapInfo* dynamic_mapinfo,
                                                bool use_requested_addr) {
   if (use_requested_addr && static_mapinfo->requested_base_address() == nullptr) {
-    log_info(cds)("Archive(s) were created with -XX:SharedBaseAddress=0. Always map at os-selected address.");
+    aot_log_info(aot)("Archive(s) were created with -XX:SharedBaseAddress=0. Always map at os-selected address.");
     return MAP_ARCHIVE_MMAP_FAILURE;
   }
 
@@ -1276,12 +1280,12 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
       // For product build only -- this is for benchmarking the cost of doing relocation.
       // For debug builds, the check is done below, after reserving the space, for better test coverage
       // (see comment below).
-      log_info(cds)("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
+      aot_log_info(aot)("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
       return MAP_ARCHIVE_MMAP_FAILURE;
     });
 
   if (ArchiveRelocationMode == 2 && !use_requested_addr) {
-    log_info(cds)("ArchiveRelocationMode == 2: never map archive(s) at an alternative address");
+    aot_log_info(aot)("ArchiveRelocationMode == 2: never map archive(s) at an alternative address");
     return MAP_ARCHIVE_MMAP_FAILURE;
   };
 
@@ -1302,7 +1306,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
                                                                  class_space_rs);
   if (mapped_base_address == nullptr) {
     result = MAP_ARCHIVE_MMAP_FAILURE;
-    log_debug(cds)("Failed to reserve spaces (use_requested_addr=%u)", (unsigned)use_requested_addr);
+    aot_log_debug(aot)("Failed to reserve spaces (use_requested_addr=%u)", (unsigned)use_requested_addr);
   } else {
 
     if (Metaspace::using_class_space()) {
@@ -1332,10 +1336,10 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     }
 #endif // ASSERT
 
-    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes%s",
+    aot_log_info(aot)("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",
+    aot_log_info(aot)("Reserved class_space_rs   [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
                    p2i(class_space_rs.base()), p2i(class_space_rs.end()), class_space_rs.size());
 
     if (MetaspaceShared::use_windows_memory_mapping()) {
@@ -1357,7 +1361,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
       //  pointers anyway so there's no benefit to mmap.
       if (use_requested_addr) {
         assert(!total_space_rs.is_reserved(), "Should not be reserved for Windows");
-        log_info(cds)("Windows mmap workaround: releasing archive space.");
+        aot_log_info(aot)("Windows mmap workaround: releasing archive space.");
         MemoryReserver::release(archive_space_rs);
         // Mark as not reserved
         archive_space_rs = {};
@@ -1374,7 +1378,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
                                                   mtClassShared);
           assert(p == mapped_base_address || p == nullptr, "must be");
           if (p == nullptr) {
-            log_debug(cds)("Failed to re-reserve protection zone");
+            aot_log_debug(aot)("Failed to re-reserve protection zone");
             return MAP_ARCHIVE_MMAP_FAILURE;
           }
         }
@@ -1399,7 +1403,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
       //  debug builds, we do it here (after all archives have possibly been
       //  mapped), so we can thoroughly test the code for failure handling
       //  (releasing all allocated resource, etc).
-      log_info(cds)("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
+      aot_log_info(aot)("ArchiveRelocationMode == 1: always map archive(s) at an alternative address");
       if (static_result == MAP_ARCHIVE_SUCCESS) {
         static_result = MAP_ARCHIVE_MMAP_FAILURE;
       }
@@ -1468,8 +1472,8 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
       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");
+    log_info(aot)("initial optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
+    log_info(aot)("initial full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
   } else {
     unmap_archive(static_mapinfo);
     unmap_archive(dynamic_mapinfo);
@@ -1615,7 +1619,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   const int precomputed_narrow_klass_shift = ArchiveBuilder::precomputed_narrow_klass_shift();
   if (!CompressedKlassPointers::check_klass_decode_mode(base_address, precomputed_narrow_klass_shift,
                                                         total_range_size)) {
-    log_info(cds)("CDS initialization: Cannot use SharedBaseAddress " PTR_FORMAT " with precomputed shift %d.",
+    aot_log_info(aot)("CDS initialization: Cannot use SharedBaseAddress " PTR_FORMAT " with precomputed shift %d.",
                   p2i(base_address), precomputed_narrow_klass_shift);
     use_archive_base_addr = false;
   }
@@ -1699,17 +1703,17 @@ void MetaspaceShared::release_reserved_spaces(ReservedSpace& total_space_rs,
                                               ReservedSpace& archive_space_rs,
                                               ReservedSpace& class_space_rs) {
   if (total_space_rs.is_reserved()) {
-    log_debug(cds)("Released shared space (archive + class) " INTPTR_FORMAT, p2i(total_space_rs.base()));
+    aot_log_debug(aot)("Released shared space (archive + class) " INTPTR_FORMAT, p2i(total_space_rs.base()));
     MemoryReserver::release(total_space_rs);
     total_space_rs = {};
   } else {
     if (archive_space_rs.is_reserved()) {
-      log_debug(cds)("Released shared space (archive) " INTPTR_FORMAT, p2i(archive_space_rs.base()));
+      aot_log_debug(aot)("Released shared space (archive) " INTPTR_FORMAT, p2i(archive_space_rs.base()));
       MemoryReserver::release(archive_space_rs);
       archive_space_rs = {};
     }
     if (class_space_rs.is_reserved()) {
-      log_debug(cds)("Released shared space (classes) " INTPTR_FORMAT, p2i(class_space_rs.base()));
+      aot_log_debug(aot)("Released shared space (classes) " INTPTR_FORMAT, p2i(class_space_rs.base()));
       MemoryReserver::release(class_space_rs);
       class_space_rs = {};
     }
@@ -1819,7 +1823,7 @@ void MetaspaceShared::initialize_shared_spaces() {
     dynamic_mapinfo->unmap_region(MetaspaceShared::bm);
   }
 
-  LogStreamHandle(Info, cds) lsh;
+  LogStreamHandle(Info, aot) lsh;
   if (lsh.is_enabled()) {
     lsh.print("Using AOT-linked classes: %s (static archive: %s aot-linked classes",
               BOOL_TO_STR(CDSConfig::is_using_aot_linked_classes()),
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 8fb92196acc..2423141b8fa 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -110,7 +110,7 @@ class MetaspaceShared : AllStatic {
   static bool is_shared_dynamic(void* p) NOT_CDS_RETURN_(false);
   static bool is_shared_static(void* p) NOT_CDS_RETURN_(false);
 
-  static void unrecoverable_loading_error(const char* message = nullptr) ATTRIBUTE_PRINTF(1, 0);
+  static void unrecoverable_loading_error(const char* message = "unrecoverable error");
   static void report_loading_error(const char* format, ...) ATTRIBUTE_PRINTF(1, 0);
   static void unrecoverable_writing_error(const char* message = nullptr);
   static void writing_error(const char* message = nullptr);
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index c7cca9682fe..3b34edf416e 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1206,7 +1206,7 @@ bool java_lang_Class::restore_archived_mirror(Klass *k,
   k->clear_archived_mirror_index();
 
   // mirror is archived, restore
-  log_debug(cds, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m));
+  log_debug(aot, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m));
   assert(as_Klass(m) == k, "must be");
   Handle mirror(THREAD, m);
 
@@ -1231,9 +1231,9 @@ bool java_lang_Class::restore_archived_mirror(Klass *k,
 
   set_mirror_module_field(THREAD, k, mirror, module);
 
-  if (log_is_enabled(Trace, cds, heap, mirror)) {
+  if (log_is_enabled(Trace, aot, heap, mirror)) {
     ResourceMark rm(THREAD);
-    log_trace(cds, heap, mirror)(
+    log_trace(aot, heap, mirror)(
         "Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror()));
   }
 
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index b0d2e84335e..71f31cef580 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -792,9 +792,9 @@ void Klass::remove_unshareable_info() {
   assert(CDSConfig::is_dumping_archive(),
           "only called during CDS dump time");
   JFR_ONLY(REMOVE_ID(this);)
-  if (log_is_enabled(Trace, cds, unshareable)) {
+  if (log_is_enabled(Trace, aot, unshareable)) {
     ResourceMark rm;
-    log_trace(cds, unshareable)("remove: %s", external_name());
+    log_trace(aot, unshareable)("remove: %s", external_name());
   }
 
   // _secondary_super_cache may be updated by an is_subtype_of() call
@@ -818,9 +818,9 @@ void Klass::remove_unshareable_info() {
 
 void Klass::remove_java_mirror() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
-  if (log_is_enabled(Trace, cds, unshareable)) {
+  if (log_is_enabled(Trace, aot, unshareable)) {
     ResourceMark rm;
-    log_trace(cds, unshareable)("remove java_mirror: %s", external_name());
+    log_trace(aot, unshareable)("remove java_mirror: %s", external_name());
   }
 
 #if INCLUDE_CDS_JAVA_HEAP
@@ -856,10 +856,10 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   assert(is_shared(), "must be set");
   assert(secondary_supers()->length() >= (int)population_count(_secondary_supers_bitmap), "must be");
   JFR_ONLY(RESTORE_ID(this);)
-  if (log_is_enabled(Trace, cds, unshareable)) {
+  if (log_is_enabled(Trace, aot, unshareable)) {
     ResourceMark rm(THREAD);
     oop class_loader = loader_data->class_loader();
-    log_trace(cds, unshareable)("restore: %s with class loader: %s", external_name(),
+    log_trace(aot, unshareable)("restore: %s with class loader: %s", external_name(),
       class_loader != nullptr ? class_loader->klass()->external_name() : "boot");
   }
 
@@ -892,7 +892,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
 
   if (this->has_archived_mirror_index()) {
     ResourceMark rm(THREAD);
-    log_debug(cds, mirror)("%s has raw archived mirror", external_name());
+    log_debug(aot, mirror)("%s has raw archived mirror", external_name());
     if (ArchiveHeapLoader::is_in_use()) {
       bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,
                                                               protection_domain,
@@ -903,7 +903,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
     }
 
     // No archived mirror data
-    log_debug(cds, mirror)("No archived mirror data for %s", external_name());
+    log_debug(aot, mirror)("No archived mirror data for %s", external_name());
     clear_java_mirror_handle();
     this->clear_archived_mirror_index();
   }
@@ -912,7 +912,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec
   // gotten an OOM later but keep the mirror if it was created.
   if (java_mirror() == nullptr) {
     ResourceMark rm(THREAD);
-    log_trace(cds, mirror)("Recreate mirror for %s", external_name());
+    log_trace(aot, mirror)("Recreate mirror for %s", external_name());
     java_lang_Class::create_mirror(this, loader, module_handle, protection_domain, Handle(), CHECK);
   }
 }
diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp
index f6f0e30db34..d3bf8862d37 100644
--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
+++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
@@ -954,7 +954,7 @@ void IterateOverHeapObjectClosure::do_object(oop o) {
 
   // skip if object is a dormant shared object whose mirror hasn't been loaded
   if (o != nullptr && o->klass()->java_mirror() == nullptr) {
-    log_debug(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)", p2i(o),
+    log_debug(aot, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)", p2i(o),
                          o->klass()->external_name());
     return;
   }
@@ -1040,7 +1040,7 @@ void IterateThroughHeapObjectClosure::do_object(oop obj) {
 
   // skip if object is a dormant shared object whose mirror hasn't been loaded
   if (obj != nullptr &&   obj->klass()->java_mirror() == nullptr) {
-    log_debug(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)", p2i(obj),
+    log_debug(aot, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)", p2i(obj),
                          obj->klass()->external_name());
     return;
   }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1461f893f4a..2fa519c5ea5 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotLogging.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "classfile/classLoader.hpp"
@@ -1362,7 +1363,7 @@ void Arguments::set_mode_flags(Mode mode) {
 // incompatible command line options were chosen.
 void Arguments::no_shared_spaces(const char* message) {
   if (RequireSharedSpaces) {
-    log_error(cds)("%s is incompatible with other specified options.",
+    aot_log_error(aot)("%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);
@@ -1371,7 +1372,7 @@ void Arguments::no_shared_spaces(const char* message) {
     }
   } else {
     if (CDSConfig::new_aot_flags_used()) {
-      log_warning(cds)("Unable to use AOT cache: %s", message);
+      log_warning(aot)("Unable to use AOT cache: %s", message);
     } else {
       log_info(cds)("Unable to use shared archive: %s", message);
     }
@@ -1562,7 +1563,7 @@ void Arguments::set_heap_size() {
       // was not specified.
       if (reasonable_max > max_coop_heap) {
         if (FLAG_IS_ERGO(UseCompressedOops) && override_coop_limit) {
-          log_info(cds)("UseCompressedOops and UseCompressedClassPointers have been disabled due to"
+          aot_log_info(aot)("UseCompressedOops and UseCompressedClassPointers have been disabled due to"
             " max heap %zu > compressed oop heap %zu. "
             "Please check the setting of MaxRAMPercentage %5.2f."
             ,(size_t)reasonable_max, (size_t)max_coop_heap, MaxRAMPercentage);
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index a042a390925..7c91bb000aa 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -794,14 +794,14 @@ class DumperSupport : AllStatic {
   }
 
   static void report_dormant_archived_object(oop o, oop ref_obj) {
-    if (log_is_enabled(Trace, cds, heap)) {
+    if (log_is_enabled(Trace, aot, heap)) {
       ResourceMark rm;
       if (ref_obj != nullptr) {
-        log_trace(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s) referenced by " INTPTR_FORMAT " (%s)",
+        log_trace(aot, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s) referenced by " INTPTR_FORMAT " (%s)",
                   p2i(o), o->klass()->external_name(),
                   p2i(ref_obj), ref_obj->klass()->external_name());
       } else {
-        log_trace(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)",
+        log_trace(aot, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)",
                   p2i(o), o->klass()->external_name());
       }
     }
@@ -2677,7 +2677,7 @@ int HeapDumper::dump(const char* path, outputStream* out, int compression, bool
     event.set_compression(compression);
     event.commit();
   } else {
-    log_debug(cds, heap)("Error %s while dumping heap", error());
+    log_debug(aot, heap)("Error %s while dumping heap", error());
   }
 
   // print message in interactive case
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
index 53036071fe3..71f72d6b4e8 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
@@ -56,7 +56,7 @@ static void positiveTests() throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=record",
             "-XX:AOTConfiguration=" + aotConfigFile,
-            "-Xlog:cds=debug",
+            "-Xlog:aot=debug",
             "-cp", appJar, helloClass);
 
         OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "train");
@@ -70,18 +70,18 @@ static void positiveTests() throws Exception {
             "-XX:AOTMode=create",
             "-XX:AOTConfiguration=" + aotConfigFile,
             "-XX:AOTCache=" + aotCacheFile,
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-cp", appJar);
         out = CDSTestUtils.executeAndLog(pb, "asm");
-        out.shouldContain("Dumping shared data to file:");
-        out.shouldMatch("cds.*hello[.]aot");
+        out.shouldContain("AOTCache creation is complete");
+        out.shouldMatch("hello[.]aot");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
         printTestCase("Production Run with AOTCache");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain("Using AOT-linked classes: true (static archive: has aot-linked classes)");
@@ -94,7 +94,7 @@ static void positiveTests() throws Exception {
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-XX:AOTMode=off",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
@@ -108,7 +108,7 @@ static void positiveTests() throws Exception {
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-XX:AOTMode=auto",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
@@ -122,7 +122,7 @@ static void positiveTests() throws Exception {
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-XX:AOTMode=on",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
@@ -138,18 +138,18 @@ static void positiveTests() throws Exception {
             "-XX:-AOTClassLinking",
             "-XX:AOTConfiguration=" + aotConfigFile,
             "-XX:AOTCache=" + aotCacheFile,
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-cp", appJar);
         out = CDSTestUtils.executeAndLog(pb, "asm");
-        out.shouldContain("Dumping shared data to file:");
-        out.shouldMatch("cds.*hello[.]aot");
+        out.shouldContain("AOTCache creation is complete");
+        out.shouldMatch("hello[.]aot");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
         printTestCase("Production Run with AOTCache, which was created with -XX:-AOTClassLinking");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain("Using AOT-linked classes: false (static archive: no aot-linked classes)");
@@ -345,7 +345,7 @@ static void negativeTests() throws Exception {
         out.shouldHaveExitValue(0);
 
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-Xlog:cds",
+            "-Xlog:aot",
             "-XX:AOTMode=on",
             "-XX:AOTCache=" + dynamicArchive,
             "--version");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
index 985fe23fab2..21a43fcf9cb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
@@ -64,7 +64,7 @@ static void test(boolean run_reloc) throws Exception {
         String maybeRelocation = "-XX:ArchiveRelocationMode=0";
         String alwaysRelocation = "-XX:ArchiveRelocationMode=1";
         String runRelocArg  = run_reloc  ? alwaysRelocation : maybeRelocation;
-        String logArg = "-Xlog:cds=debug,cds+reloc=debug,cds+heap";
+        String logArg = "-Xlog:cds=debug,cds+reloc=debug,aot+heap";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
         String nmtArg = "-XX:NativeMemoryTracking=detail";
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ClassListFormatBase.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassListFormatBase.java
index 0fd55b4a4a0..1d224a7765d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassListFormatBase.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassListFormatBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, 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,7 @@ static void dumpShouldFail(String caseHelp, String appJar, String[] appClasses,
         System.out.println("------------------------------");
 
         try {
-            OutputAnalyzer output = TestCommon.dump(appJar, appClasses, "-Xlog:cds+lambda=debug");
+            OutputAnalyzer output = TestCommon.dump(appJar, appClasses, "-Xlog:aot+lambda=debug");
             output.shouldHaveExitValue(1);
             for (String s : expected_errors) {
                 output.shouldContain(s);
@@ -63,7 +63,7 @@ static void dumpShouldPass(String caseHelp, String appJar, String[] appClasses,
         System.out.println("------------------------------");
 
         try {
-            OutputAnalyzer output = TestCommon.dump(appJar, appClasses, "-Xlog:cds", "-Xlog:cds+lambda=debug");
+            OutputAnalyzer output = TestCommon.dump(appJar, appClasses, "-Xlog:cds", "-Xlog:aot", "-Xlog:aot+lambda=debug");
             output.shouldHaveExitValue(0);
             output.shouldContain("Dumping");
             for (String s : expected_msgs) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/DumpingWithNoCoops.java b/test/hotspot/jtreg/runtime/cds/appcds/DumpingWithNoCoops.java
index 479643f8efc..b5fc35ad149 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/DumpingWithNoCoops.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/DumpingWithNoCoops.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
@@ -94,7 +94,7 @@ static void checkExpectedMessages(HeapArgs ha, OutputAnalyzer output) throws Exc
 
     public static void main(String[] args) throws Exception {
         final String noCoops = "-XX:-UseCompressedOops";
-        final String logArg = "-Xlog:gc+heap=trace,cds=debug";
+        final String logArg = "-Xlog:gc+heap=trace,cds=debug,aot=debug";
         JarBuilder.getOrCreateHelloJar();
         String appJar = TestCommon.getTestJar("hello.jar");
         String appClasses[] = TestCommon.list("Hello");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java
index 955c07ac7a6..f92acda4397 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.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
@@ -81,7 +81,7 @@ public static void main(String[] args) throws Exception {
 
         // run with archive
         CDSOptions runOpts = (new CDSOptions())
-            .addPrefix("-cp", appJar, "-Xlog:class+load,cds=debug",
+            .addPrefix("-cp", appJar, "-Xlog:class+load=debug,cds=debug,class+path=debug",
                        "-XX:+UnlockDiagnosticVMOptions",
                        "-XX:+AllowArchivingWithJavaAgent",
                        useJavaAgent)
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
index 1fec4dc3e23..ae00477e67b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTCacheSupportForCustomLoaders.java
@@ -60,15 +60,15 @@ public static void main(String... args) throws Exception {
 
         SimpleCDSAppTester.of("AOTCacheSupportForCustomLoaders")
             .classpath("app.jar")
-            .addVmArgs("-Xlog:cds+class=debug", "-Xlog:cds",
+            .addVmArgs("-Xlog:aot+class=debug", "-Xlog:aot", "-Xlog:cds",
                        "--module-path=" + modulePath,
                        "--add-modules=com.test")
             .appCommandLine("AppWithCustomLoaders", modulePath)
             .setAssemblyChecker((OutputAnalyzer out) -> {
-                    out.shouldMatch("cds,class.*unreg AppWithCustomLoaders[$]MyLoadeeA")
-                       .shouldMatch("cds,class.*unreg com.test.Foo")
-                       .shouldMatch("cds,class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;")
-                       .shouldNotMatch("cds,class.* ReturnIntegerAsString");
+                    out.shouldMatch(",class.*unreg AppWithCustomLoaders[$]MyLoadeeA")
+                       .shouldMatch(",class.*unreg com.test.Foo")
+                       .shouldMatch(",class.*array \\[LAppWithCustomLoaders[$]MyLoadeeA;")
+                       .shouldNotMatch(",class.* ReturnIntegerAsString");
                 })
             .setProductionChecker((OutputAnalyzer out) -> {
                     out.shouldContain("Using AOT-linked classes: true");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
new file mode 100644
index 00000000000..5499063ebbd
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.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.
+ *
+ */
+
+
+/*
+ * @test
+ * @summary when AOT cache options are used, old "cds" logs should be aliased to "aot".
+ * @requires vm.cds
+ * @requires vm.flagless
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build Hello
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello
+ * @run driver AOTLoggingTag
+ */
+
+import java.io.File;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class AOTLoggingTag {
+    static String appJar = ClassFileInstaller.getJarPath("hello.jar");
+    static String aotConfigFile = "hello.aotconfig";
+    static String aotCacheFile = "hello.aot";
+    static String helloClass = "Hello";
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb;
+        OutputAnalyzer out;
+
+        //----------------------------------------------------------------------
+        printTestCase("Training Run");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("[info][aot] Writing binary AOTConfiguration file:");
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Assembly Phase");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot",
+            "-cp", appJar);
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        out.shouldContain("[info][aot] Opened AOT configuration file hello.aotconfig");
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Production Run with AOTCache");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "prod");
+        out.shouldContain("[info][aot] Opened AOT cache hello.aot");
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("All old -Xlog:cds+heap logs have been changed to -Xlog:aot+heap should alias to -Xlog:cds+heap");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot+heap",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "prod");
+        out.shouldNotContain("No tag set matches selection: aot+heap");
+        out.shouldContain("[info][aot,heap] resolve subgraph java.lang.Integer$IntegerCache");
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Production Run: errors should be printed with [aot] decoration");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCache=nosuchfile.aot",
+            "-XX:AOTMode=on",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "prod");
+        out.shouldContain("[error][aot] An error has occurred while processing the AOT cache. Run with -Xlog:aot for details.");
+        out.shouldNotHaveExitValue(0);
+    }
+
+    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/aotCache/VerifierFailOver.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
index e53775a2041..18caa08c117 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/VerifierFailOver.java
@@ -41,7 +41,7 @@
 public class VerifierFailOver {
     public static void main(String... args) throws Exception {
         SimpleCDSAppTester.of("VerifierFailOver")
-            .addVmArgs("-Xlog:cds+class=debug")
+            .addVmArgs("-Xlog:aot+class=debug")
             .classpath("app.jar")
             .appCommandLine("VerifierFailOverApp")
             .setTrainingChecker((OutputAnalyzer out) -> {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
index 5db41236a67..96f08004fb2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTCacheWithZGC.java
@@ -42,7 +42,7 @@
 public class AOTCacheWithZGC {
     public static void main(String... args) throws Exception {
         SimpleCDSAppTester.of("AOTCacheWithZGC")
-            .addVmArgs("-XX:+UseZGC", "-Xlog:cds")
+            .addVmArgs("-XX:+UseZGC", "-Xlog:cds", "-Xlog:aot")
             .classpath("app.jar")
             .appCommandLine("AOTCacheWithZGCApp")
             .setProductionChecker((OutputAnalyzer out) -> {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index 7aef13abac7..bee0fa60f49 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -124,12 +124,14 @@ static void modulePathTests() throws Exception {
                             "--module-path", modulePath,
                             "-XX:+AOTClassLinking",
                             "-m", MAIN_MODULE);
-        TestCommon.run("-Xlog:cds",
+        TestCommon.run("-Xlog:aot",
+                       "-Xlog:cds",
                        "--module-path", modulePath,
                        "-m", MAIN_MODULE)
             .assertNormalExit("Using AOT-linked classes: true");
 
-        TestCommon.run("-Xlog:cds",
+        TestCommon.run("-Xlog:aot",
+                       "-Xlog:cds",
                        "--module-path", modulePath + "/bad",
                        "-m", MAIN_MODULE)
             .assertAbnormalExit("shared archive file has aot-linked classes. It cannot be used when archived full module graph is not used.");
@@ -139,7 +141,8 @@ static void modulePathTests() throws Exception {
                             "--module-path", modulePath,
                             "-XX:+AOTClassLinking",
                             "--add-modules", MAIN_MODULE);
-        TestCommon.run("-Xlog:cds",
+        TestCommon.run("-Xlog:aot",
+                       "-Xlog:cds",
                        "--module-path", modulePath,
                        "--add-modules", MAIN_MODULE,
                        MAIN_CLASS)
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
index aa34f479936..90fd0f33bab 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
@@ -137,7 +137,7 @@ public String classpath(RunMode runMode) {
         @Override
         public String[] vmArgs(RunMode runMode) {
             return new String[] {
-                "-Xlog:cds,cds+aot+load,cds+class=debug",
+                "-Xlog:cds,aot+load,cds+class=debug,aot+class=debug",
                 "-XX:+AOTClassLinking",
             };
         }
@@ -158,7 +158,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception
 
             if (isDumping(runMode)) {
                 // Check that we are archiving classes for custom class loaders.
-                out.shouldMatch("cds,class.* SimpleCusty");
+                out.shouldMatch(",class.* SimpleCusty");
             }
         }
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java
index 5bec6623a08..1ffc904963a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/FakeCodeLocation.java
@@ -73,7 +73,9 @@ public String classpath(RunMode runMode) {
         @Override
         public String[] vmArgs(RunMode runMode) {
             String[] args = new String[] {
+                "-Xlog:aot",
                 "-Xlog:cds",
+                "-Xlog:aot+class=debug",
                 "-Xlog:cds+class=debug",
                 "-Xlog:class+load",
             };
@@ -94,9 +96,9 @@ public String[] appCommandLine(RunMode runMode) {
         @Override
         public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
             if (isDumping(runMode)) {
-                out.shouldMatch("cds,class.* FakeCodeLocationApp");
-                out.shouldNotMatch("cds,class.* ClassNotInJar1");
-                out.shouldNotMatch("cds,class.* ClassNotInJar2");
+                out.shouldMatch(",class.* FakeCodeLocationApp");
+                out.shouldNotMatch(",class.* ClassNotInJar1");
+                out.shouldNotMatch(",class.* ClassNotInJar2");
             }
 
             if (runMode.isProductionRun()) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
index 40bd8ee1a88..524b613b5c3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -125,7 +125,7 @@ public String[] vmArgs(RunMode runMode) {
             case RunMode.ASSEMBLY: {
                     List<String> args = getVMArgsForHeapConfig(zeroBaseInAsmPhase, zeroShiftInAsmPhase);
                     args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
-                                        "-Xlog:cds=info",
+                                        "-Xlog:aot=info",
                                         "-Xlog:aot+codecache+init=debug",
                                         "-Xlog:aot+codecache+exit=debug"));
                     return args.toArray(new String[0]);
@@ -133,7 +133,7 @@ public String[] vmArgs(RunMode runMode) {
             case RunMode.PRODUCTION: {
                     List<String> args = getVMArgsForHeapConfig(zeroBaseInProdPhase, zeroShiftInProdPhase);
                     args.addAll(List.of("-XX:+UnlockDiagnosticVMOptions",
-                                        "-Xlog:cds=info", // we need this to parse CompressedOops settings
+                                        "-Xlog:aot=info", // we need this to parse CompressedOops settings
                                         "-Xlog:aot+codecache+init=debug",
                                         "-Xlog:aot+codecache+exit=debug"));
                     return args.toArray(new String[0]);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
index ca5a08d20af..819db99a549 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchiveHeapTestClass.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
@@ -77,7 +77,7 @@ static OutputAnalyzer dumpBootAndHello(String bootClass, String... extraOpts) th
         extraOpts = TestCommon.concat(extraOpts,
                                       "-Xbootclasspath/a:" + bootJar,
                                       "-XX:ArchiveHeapTestClass=" + bootClass,
-                                      "-Xlog:cds+heap");
+                                      "-Xlog:aot+heap");
         return TestCommon.dump(appJar, classlist, extraOpts);
     }
 
@@ -109,13 +109,13 @@ static void testDebugBuild() throws Exception {
         testCase("Simple positive case");
         output = dumpBootAndHello(CDSTestClassA_name);
         mustSucceed(output, CDSTestClassA.getOutput()); // make sure <clinit> is executed
-        output.shouldMatch("warning.*cds.*Loading ArchiveHeapTestClass " + CDSTestClassA_name);
-        output.shouldMatch("warning.*cds.*Initializing ArchiveHeapTestClass " + CDSTestClassA_name);
+        output.shouldMatch("warning.*aot.*Loading ArchiveHeapTestClass " + CDSTestClassA_name);
+        output.shouldMatch("warning.*aot.*Initializing ArchiveHeapTestClass " + CDSTestClassA_name);
         output.shouldContain("Archived field " + CDSTestClassA_name + "::" + ARCHIVE_TEST_FIELD_NAME);
         output.shouldMatch("Archived object klass CDSTestClassA .*\\[LCDSTestClassA;");
         output.shouldMatch("Archived object klass CDSTestClassA .*CDSTestClassA\\$YY");
 
-        TestCommon.run("-Xbootclasspath/a:" + bootJar, "-cp", appJar, "-Xlog:cds+heap", CDSTestClassA_name)
+        TestCommon.run("-Xbootclasspath/a:" + bootJar, "-cp", appJar, "-Xlog:aot+heap", CDSTestClassA_name)
             .assertNormalExit(CDSTestClassA.getOutput(),
                               "resolve subgraph " + CDSTestClassA_name);
 
@@ -169,7 +169,7 @@ static void testDebugBuild() throws Exception {
         output = dumpBootAndHello(CDSTestClassG_name, "-XX:+AOTClassLinking", "-Xlog:cds+class=debug");
         mustSucceed(output);
 
-        TestCommon.run("-Xbootclasspath/a:" + bootJar, "-cp", appJar, "-Xlog:cds+heap,cds+init",
+        TestCommon.run("-Xbootclasspath/a:" + bootJar, "-cp", appJar, "-Xlog:aot+heap,cds+init",
                        CDSTestClassG_name)
             .assertNormalExit("init subgraph " + CDSTestClassG_name,
                               "Initialized from CDS");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java
index db2b4718fd2..e476382c8c9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArrayKlasses.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
@@ -47,7 +47,7 @@ static void test() throws Exception {
         final String appJar = ClassFileInstaller.getJarPath("ArrayKlasses.jar");
         final String mainClass = "ArrayKlassesApp";
         final String runtimeLogOptions =
-            "-Xlog:class+load,class+load+array=debug,cds+dynamic=debug,cds=debug,cds+unshareable=trace";
+            "-Xlog:class+load,class+load+array=debug,cds+dynamic=debug,cds=debug,aot+unshareable=trace";
 
         // Case 1
         // Create a dynamic archive with the ArrayKlassesApp app class and its
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java
index e7f45766189..f2bff62a812 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.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
@@ -77,7 +77,7 @@ private static void doTest(String topArchiveName) throws Exception {
              "ALL-SYSTEM",
              "-Xlog:hashtables",
              "-Xmx500m",
-             "-Xlog:cds=debug", // test detailed metadata info printing
+             "-Xlog:cds=debug,aot=debug", // test detailed metadata info printing
              "-Xlog:cds+dynamic=info",
              bootClassPath,
              "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
index dd8f186af80..7e4efc70a4e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/ExactOptionMatch.java
@@ -71,7 +71,7 @@ public static void main(String[] args) throws Exception {
             TestCommon.dumpBaseArchive(archiveName, o.cmdLine(), o.valueA())
                 .shouldHaveExitValue(0);
 
-            TestCommon.execCommon("-Xlog:cds", "--version")
+            TestCommon.execCommon("-Xlog:aot", "-Xlog:cds", "--version")
                 .shouldMatch("Mismatched values for property " + o.property() + ": j.*specified during dump time but not during runtime")
                 .shouldContain(FMG_DISABLED);
 
@@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception {
             TestCommon.dumpBaseArchive(archiveName)
                 .shouldHaveExitValue(0);
 
-            TestCommon.execCommon("-Xlog:cds", o.cmdLine(), o.valueA(), "--version")
+            TestCommon.execCommon("-Xlog:aot", "-Xlog:cds", o.cmdLine(), o.valueA(), "--version")
                 .shouldMatch("Mismatched values for property " + o.property() + ": j.*specified during runtime but not during dump time")
                 .shouldContain(FMG_DISABLED);
 
@@ -88,18 +88,18 @@ public static void main(String[] args) throws Exception {
                 .shouldHaveExitValue(0);
 
             // (3.1) Run = specified once
-            TestCommon.execCommon("-Xlog:cds", o.cmdLine(), o.valueA(), "--version")
+            TestCommon.execCommon("-Xlog:aot", "-Xlog:cds", o.cmdLine(), o.valueA(), "--version")
                 .shouldMatch("Mismatched values for property " + o.property() + ": runtime.*dump time")
                 .shouldContain(FMG_DISABLED);
 
             // (3.2) Run = specified twice (same order)
             //       Should still be able to use FMG.
-            TestCommon.execCommon("-Xlog:cds", o.cmdLine(), o.valueA(), o.cmdLine(), o.valueB(), "--version")
+            TestCommon.execCommon("-Xlog:aot", "-Xlog:cds", o.cmdLine(), o.valueA(), o.cmdLine(), o.valueB(), "--version")
                 .shouldContain(FMG_ENABLED);
 
             // (3.3) Run = specified twice (but in different order)
             //       Should still be able to use FMG (values are sorted by CDS).
-            TestCommon.execCommon("-Xlog:cds", o.cmdLine(), o.valueB(), o.cmdLine(), o.valueA(), "--version")
+            TestCommon.execCommon("-Xlog:aot", "-Xlog:cds", o.cmdLine(), o.valueB(), o.cmdLine(), o.valueA(), "--version")
                 .shouldContain(FMG_ENABLED);
         }
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
index 7ce3e37cc8a..d1022fc7956 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.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
@@ -45,7 +45,7 @@ public static void main(String[] args) throws Exception {
         final String multiModules = ",,jdk.jconsole,jdk.compiler,,";
         final String allSystem = "ALL-SYSTEM";
         final String allModulePath = "ALL-MODULE-PATH";
-        final String loggingOption = "-Xlog:cds=debug,cds+module=debug,cds+heap=info,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
         final String versionPattern = "java.[0-9][0-9].*";
         final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled";
         final String warningIncubator = "WARNING: Using incubator modules: jdk.incubator.vector";
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
index 81b24d15f9e..ec41c4ed28b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
@@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception {
         final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
         final String addOpensNio = "java.base/java.nio=ALL-UNNAMED";
         final String addOpensTimeFormat = "java.base/java.time.format=ALL-UNNAMED";
-        final String loggingOption = "-Xlog:cds=debug,cds+module=debug,cds+heap=info,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
         final String versionPattern = "java.[0-9][0-9].*";
         final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled";
         final String warningIncubator = "WARNING: Using incubator modules: jdk.incubator.vector";
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java
index d9dcd593430..861efbf5690 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.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
@@ -37,7 +37,7 @@ public class ModuleOption {
     public static void main(String[] args) throws Exception {
         final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
         final String incubatorModule = "jdk.incubator.vector";
-        final String loggingOption = "-Xlog:cds=debug,cds+module=debug,cds+heap=info,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
         // Pattern of a module version string.
         // e.g. JDK 22:     "java 22"
         //      JDK 22.0.1: "java 22.0.1"
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java
index a49054d10a1..2674793c04a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/ClassFileLoadHookTest.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
@@ -103,6 +103,7 @@ public static void main(String[] args) throws Exception {
                 "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+WhiteBoxAPI", useWb,
                 "-agentlib:SimpleClassFileLoadHook=LoadMe,beforeHook,after_Hook",
+                "-Xlog:aot",
                 "-Xlog:cds",
                 "ClassFileLoadHook",
                 "" + ClassFileLoadHook.TestCaseId.SHARING_ON_CFLH_ON);
diff --git a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java
index 25763e59b1c..5e561ed8b31 100644
--- a/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClasses.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
@@ -166,6 +166,7 @@ static void launchChild(String args[]) throws Throwable {
             .setArchiveName(ReplaceCriticalClasses.class.getName() + ".jsa")
             .setUseVersion(false)
             .addSuffix("-showversion",
+                       "-Xlog:aot",
                        "-Xlog:cds",
                        "-XX:+UnlockDiagnosticVMOptions",
                        agent);
@@ -173,7 +174,7 @@ static void launchChild(String args[]) throws Throwable {
             opts.addSuffix("-XX:+WhiteBoxAPI",
                            "-Xbootclasspath/a:" + ClassFileInstaller.getJarPath("whitebox.jar"));
         }
-        opts.addSuffix("-Xlog:cds,cds+heap");
+        opts.addSuffix("-Xlog:aot,aot+heap,cds");
         opts.addSuffix("ReplaceCriticalClasses",
                        "child",
                        shared,
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index 0a21e340cc6..edda9d45efa 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -242,6 +242,7 @@ private OutputAnalyzer recordAOTConfiguration() throws Exception {
                                                    "-XX:AOTConfiguration=" + aotConfigurationFile,
                                                    logToFile(aotConfigurationFileLog,
                                                              "class+load=debug",
+                                                             "aot=debug",
                                                              "cds=debug",
                                                              "cds+class=debug"));
         cmdLine = addCommonVMArgs(runMode, cmdLine);
@@ -264,15 +265,17 @@ private OutputAnalyzer createClassList() throws Exception {
     private OutputAnalyzer dumpStaticArchive() throws Exception {
         RunMode runMode = RunMode.DUMP_STATIC;
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                                   "-Xlog:aot",
+                                                   "-Xlog:aot+heap=error",
                                                    "-Xlog:cds",
-                                                   "-Xlog:cds+heap=error",
                                                    "-Xshare:dump",
                                                    "-XX:SharedArchiveFile=" + staticArchiveFile,
                                                    "-XX:SharedClassListFile=" + classListFile,
                                                    logToFile(staticArchiveFileLog,
+                                                             "aot=debug",
                                                              "cds=debug",
                                                              "cds+class=debug",
-                                                             "cds+heap=warning",
+                                                             "aot+heap=warning",
                                                              "cds+resolve=debug"));
         cmdLine = addCommonVMArgs(runMode, cmdLine);
         cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
@@ -282,15 +285,17 @@ private OutputAnalyzer dumpStaticArchive() throws Exception {
     private OutputAnalyzer createAOTCache() throws Exception {
         RunMode runMode = RunMode.ASSEMBLY;
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                                   "-Xlog:aot",
+                                                   "-Xlog:aot+heap=error",
                                                    "-Xlog:cds",
-                                                   "-Xlog:cds+heap=error",
                                                    "-XX:AOTMode=create",
                                                    "-XX:AOTConfiguration=" + aotConfigurationFile,
                                                    "-XX:AOTCache=" + aotCacheFile,
                                                    logToFile(aotCacheFileLog,
+                                                             "aot=debug",
                                                              "cds=debug",
                                                              "cds+class=debug",
-                                                             "cds+heap=warning",
+                                                             "aot+heap=warning",
                                                              "cds+resolve=debug"));
         cmdLine = addCommonVMArgs(runMode, cmdLine);
         cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
@@ -331,9 +336,11 @@ private OutputAnalyzer dumpDynamicArchive() throws Exception {
         if (isDynamicWorkflow()) {
           // "classic" dynamic archive
           cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                            "-Xlog:aot",
                                             "-Xlog:cds",
                                             "-XX:ArchiveClassesAtExit=" + dynamicArchiveFile,
                                             logToFile(dynamicArchiveFileLog,
+                                                      "aot=debug",
                                                       "cds=debug",
                                                       "cds+class=debug",
                                                       "cds+resolve=debug",
@@ -362,7 +369,7 @@ public OutputAnalyzer productionRun(String[] extraVmArgs, String[] extraAppArgs)
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                                    "-XX:+UnlockDiagnosticVMOptions",
                                                    "-XX:VerifyArchivedFields=2", // make sure archived heap objects are good.
-                                                   logToFile(productionRunLog(), "cds"));
+                                                   logToFile(productionRunLog(), "aot", "cds"));
         cmdLine = addCommonVMArgs(runMode, cmdLine);
 
         if (isStaticWorkflow()) {

From f8d7f663c1b8f12a69f0ff2ae1f1acb128138b86 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 20 May 2025 05:46:34 +0000
Subject: [PATCH 533/901] 8356998: Convert -Xlog:cds to -Xlog:aot (step 2)

Reviewed-by: ccheung, matsaave
---
 make/Images.gmk                               |  2 +-
 src/hotspot/share/cds/aotArtifactFinder.cpp   |  7 ++--
 src/hotspot/share/cds/aotClassInitializer.cpp |  8 ++--
 src/hotspot/share/cds/aotClassLocation.cpp    | 39 ++++++++++---------
 .../share/cds/aotConstantPoolResolver.cpp     | 34 ++++++++--------
 .../share/cds/aotLinkedClassBulkLoader.cpp    | 10 ++---
 src/hotspot/share/cds/archiveBuilder.cpp      | 28 ++++++-------
 src/hotspot/share/cds/archiveHeapLoader.cpp   | 12 +++---
 src/hotspot/share/cds/archiveHeapWriter.cpp   | 10 ++---
 src/hotspot/share/cds/archiveUtils.cpp        | 15 +++----
 src/hotspot/share/cds/archiveUtils.hpp        | 12 +++---
 src/hotspot/share/cds/archiveUtils.inline.hpp |  3 +-
 src/hotspot/share/cds/cdsConfig.cpp           | 29 +++++++-------
 src/hotspot/share/cds/classListParser.cpp     | 27 ++++++-------
 src/hotspot/share/cds/classListWriter.cpp     |  2 +-
 src/hotspot/share/cds/cppVtables.cpp          |  4 +-
 src/hotspot/share/cds/dumpTimeClassInfo.cpp   |  4 +-
 src/hotspot/share/cds/dynamicArchive.cpp      | 25 ++++++------
 src/hotspot/share/cds/filemap.cpp             | 21 +++++++---
 src/hotspot/share/cds/finalImageRecipes.cpp   |  2 +-
 src/hotspot/share/cds/lambdaFormInvokers.cpp  |  2 +-
 .../share/cds/lambdaProxyClassDictionary.cpp  | 16 ++++----
 src/hotspot/share/cds/metaspaceShared.cpp     |  3 +-
 src/hotspot/share/cds/regeneratedClasses.cpp  |  2 +-
 .../share/classfile/classLoaderDataShared.cpp |  3 +-
 .../share/classfile/classLoaderExt.cpp        |  2 +-
 .../share/classfile/compactHashtable.cpp      |  2 +-
 src/hotspot/share/classfile/moduleEntry.cpp   |  8 ++--
 src/hotspot/share/classfile/modules.cpp       | 13 ++++---
 src/hotspot/share/classfile/stringTable.cpp   | 12 +++---
 .../classfile/systemDictionaryShared.cpp      | 19 ++++-----
 .../share/interpreter/interpreterRuntime.cpp  |  2 +-
 src/hotspot/share/memory/metaspaceClosure.cpp |  2 +-
 src/hotspot/share/memory/metaspaceClosure.hpp | 10 ++---
 src/hotspot/share/oops/annotations.cpp        |  2 +-
 src/hotspot/share/oops/arrayKlass.cpp         |  2 +-
 src/hotspot/share/oops/constMethod.cpp        |  2 +-
 src/hotspot/share/oops/constantPool.cpp       |  6 +--
 src/hotspot/share/oops/cpCache.cpp            |  8 ++--
 src/hotspot/share/oops/instanceKlass.cpp      |  8 ++--
 src/hotspot/share/oops/klass.cpp              |  4 +-
 src/hotspot/share/oops/method.cpp             |  2 +-
 src/hotspot/share/oops/methodData.cpp         |  2 +-
 src/hotspot/share/oops/recordComponent.cpp    |  2 +-
 src/hotspot/share/oops/symbol.cpp             |  4 +-
 src/hotspot/share/prims/jvm.cpp               |  8 ++--
 src/hotspot/share/runtime/arguments.cpp       |  5 ++-
 src/hotspot/share/runtime/sharedRuntime.cpp   | 10 ++---
 .../jtreg/runtime/cds/CDSMapReader.java       |  4 +-
 .../hotspot/jtreg/runtime/cds/CDSMapTest.java |  6 +--
 .../jtreg/runtime/cds/DeterministicDump.java  |  4 +-
 .../jtreg/runtime/cds/SharedStrings.java      |  4 +-
 .../runtime/cds/SpaceUtilizationCheck.java    |  4 +-
 .../jtreg/runtime/cds/appcds/AOTFlags.java    |  2 +-
 .../runtime/cds/appcds/ExtraSymbols.java      |  8 ++--
 .../runtime/cds/appcds/LambdaEagerInit.java   | 12 +++---
 .../cds/appcds/LambdaWithJavaAgent.java       |  6 +--
 .../runtime/cds/appcds/VerifierTest.java      |  2 +-
 .../appcds/aotClassLinking/AddExports.java    |  8 ++--
 .../cds/appcds/aotClassLinking/AddReads.java  |  8 ++--
 .../aotClassLinking/MethodHandleTest.java     |  1 -
 .../aotClassLinking/WeakReferenceTest.java    |  1 -
 .../dynamicArchive/LambdasInTwoArchives.java  |  7 ++--
 .../UsedAllArchivedLambdas.java               |  3 +-
 ...ExceptionDuringDumpAtObjectsInitPhase.java |  4 +-
 .../CheckUnsupportedDumpingOptions.java       |  4 +-
 .../appcds/jigsaw/addmods/AddmodsOption.java  | 14 +++----
 .../jigsaw/addopens/AddopensOption.java       |  6 +--
 .../appcds/jigsaw/module/ModuleOption.java    |  4 +-
 .../resolvedConstants/AOTLinkedLambdas.java   |  5 ++-
 .../AOTLinkedVarHandles.java                  |  4 +-
 .../resolvedConstants/ResolvedConstants.java  |  7 ++--
 .../resolvedConstants/ResolvedPutField.java   |  6 +--
 .../cds/appcds/sharedStrings/ExerciseGC.java  |  4 +-
 .../cds/appcds/sharedStrings/FlagCombo.java   |  4 +-
 .../sharedStrings/IncompatibleOptions.java    |  2 +-
 .../sharedStrings/InternSharedString.java     |  4 +-
 .../cds/appcds/sharedStrings/LargePages.java  |  4 +-
 .../sharedStrings/SharedStringsBasic.java     |  4 +-
 .../sharedStrings/SharedStringsBasicPlus.java |  4 +-
 .../sharedStrings/SharedStringsStress.java    |  5 ++-
 .../sharedStrings/SharedStringsWbTest.java    |  4 +-
 .../appcds/sharedStrings/SysDictCrash.java    |  4 +-
 test/lib/jdk/test/lib/cds/CDSTestUtils.java   |  4 +-
 84 files changed, 328 insertions(+), 304 deletions(-)

diff --git a/make/Images.gmk b/make/Images.gmk
index 3f2b34bc9c6..22e3e43cb1f 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -162,7 +162,7 @@ define CreateCDSArchive
   endif
 
   ifeq ($(DEBUG_CDS_ARCHIVE), true)
-    $1_$2_CDS_DUMP_FLAGS += -Xlog:cds+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
+    $1_$2_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
   endif
 
   $$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jdk, \
diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index f16e0d9e908..d27e75ba0ab 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include "cds/aotClassLinker.hpp"
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
+#include "cds/aotClassLinker.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/dumpTimeClassInfo.inline.hpp"
 #include "cds/heapShared.hpp"
@@ -155,9 +156,9 @@ void AOTArtifactFinder::find_artifacts() {
     if (!info.is_excluded() && _seen_classes->get(k) == nullptr) {
       info.set_excluded();
       info.set_has_checked_exclusion();
-      if (log_is_enabled(Debug, cds)) {
+      if (aot_log_is_enabled(Debug, aot)) {
         ResourceMark rm;
-        log_debug(cds)("Skipping %s: %s class", k->name()->as_C_string(),
+        aot_log_debug(aot)("Skipping %s: %s class", k->name()->as_C_string(),
                       k->is_hidden() ? "Unreferenced hidden" : "AOT tooling");
       }
     }
diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 6f45c979880..46a118c42e9 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -219,7 +219,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
   //
   // Then run the following:
   //    java -XX:AOTMode=record -XX:AOTConfiguration=jc.aotconfig com.sun.tools.javac.Main
-  //    java -XX:AOTMode=create -Xlog:cds -XX:AOTCache=jc.aot -XX:AOTConfiguration=jc.aotconfig
+  //    java -XX:AOTMode=create -Xlog:aot -XX:AOTCache=jc.aot -XX:AOTConfiguration=jc.aotconfig
   //
   // You will see an error like this:
   //
@@ -350,9 +350,9 @@ bool AOTClassInitializer::is_runtime_setup_required(InstanceKlass* ik) {
 void AOTClassInitializer::call_runtime_setup(JavaThread* current, InstanceKlass* ik) {
   assert(ik->has_aot_initialized_mirror(), "sanity");
   if (ik->is_runtime_setup_required()) {
-    if (log_is_enabled(Info, cds, init)) {
+    if (log_is_enabled(Info, aot, init)) {
       ResourceMark rm;
-      log_info(cds, init)("Calling %s::runtimeSetup()", ik->external_name());
+      log_info(aot, init)("Calling %s::runtimeSetup()", ik->external_name());
     }
     JavaValue result(T_VOID);
     JavaCalls::call_static(&result, ik,
@@ -375,7 +375,7 @@ void AOTClassInitializer::init_test_class(TRAPS) {
   // -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);
+    log_info(aot)("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);
diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index ae7dcd7ffd4..cf5d52a5676 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
@@ -250,7 +251,7 @@ AOTClassLocation* AOTClassLocation::allocate(JavaThread* current, const char* pa
     // 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);
+    aot_log_error(aot)("Unable to open file %s.", path);
     MetaspaceShared::unrecoverable_loading_error();
   }
 
@@ -359,7 +360,7 @@ char* AOTClassLocation::get_cpattr() const {
       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"
+        log_warning(aot)("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());
@@ -392,31 +393,31 @@ bool AOTClassLocation::check(const char* runtime_path, bool has_aot_linked_class
   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);
+      aot_log_warning(aot)("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);
+      aot_log_warning(aot)("'%s' must not exist", runtime_path);
       return false;
     }
     if (_file_type == FileType::NORMAL) {
-      log_warning(cds)("'%s' must be a file", runtime_path);
+      aot_log_warning(aot)("'%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);
+      aot_log_warning(aot)("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);
+      aot_log_warning(aot)("'%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 "
+        aot_log_error(aot)("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 "
+        aot_log_warning(aot)("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()) {
@@ -425,13 +426,13 @@ bool AOTClassLocation::check(const char* runtime_path, bool has_aot_linked_class
       }
     }
     if (_file_type == FileType::DIR) {
-      log_warning(cds)("'%s' must be a directory", runtime_path);
+      aot_log_warning(aot)("'%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",
+      aot_log_warning(aot)("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" : "");
@@ -689,7 +690,7 @@ void AOTClassLocationConfig::check_nonempty_dirs() const {
     }
     if (cs->is_dir()) {
       if (!os::dir_is_empty(cs->path())) {
-        log_error(cds)("Error: non-empty directory '%s'", cs->path());
+        aot_log_error(aot)("Error: non-empty directory '%s'", cs->path());
         has_nonempty_dir = true;
       }
     }
@@ -714,7 +715,7 @@ bool AOTClassLocationConfig::is_valid_classpath_index(int classpath_index, Insta
       const char* const file_name = ClassLoader::file_name_for_class_name(class_name,
                                                                           ik->name()->utf8_length());
       if (!zip->has_entry(current, file_name)) {
-        log_warning(cds)("class %s cannot be archived because it was not defined from %s as claimed",
+        aot_log_warning(aot)("class %s cannot be archived because it was not defined from %s as claimed",
                          class_name, zip->name());
         return false;
       }
@@ -776,7 +777,7 @@ bool AOTClassLocationConfig::check_classpaths(bool is_boot_classpath, bool has_a
                           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);
+        aot_log_warning(aot)("%s classpath has fewer elements than expected", which);
         return false;
       }
       const char* runtime_path = runtime_css.get_next();
@@ -784,7 +785,7 @@ bool AOTClassLocationConfig::check_classpaths(bool is_boot_classpath, bool has_a
         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'",
+        aot_log_warning(aot)("The name of %s classpath [%d] does not match: expected '%s', got '%s'",
                          which, runtime_css.current(), effective_dumptime_path, runtime_path);
         return false;
       }
@@ -800,7 +801,7 @@ bool AOTClassLocationConfig::check_classpaths(bool is_boot_classpath, bool has_a
   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");
+      aot_log_warning(aot)("boot classpath is longer than expected");
       return false;
     }
   }
@@ -869,7 +870,7 @@ bool AOTClassLocationConfig::check_module_paths(bool has_aot_linked_classes, int
 
     while (true) {
       if (!runtime_css.has_next()) {
-        log_warning(cds)("module path has fewer elements than expected");
+        aot_log_warning(aot)("module path has fewer elements than expected");
         *has_extra_module_paths = true;
         return true;
       }
@@ -1021,11 +1022,11 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
         "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)";
     if (RequireSharedSpaces && !PrintSharedArchiveAndExit) {
       if (CDSConfig::is_dumping_final_static_archive()) {
-        log_error(cds)("class path and/or module path are not compatible with the "
+        aot_log_error(aot)("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);
+        aot_log_error(aot)("%s%s", mismatch_msg, hint_msg);
         MetaspaceShared::unrecoverable_loading_error();
       }
     } else {
diff --git a/src/hotspot/share/cds/aotConstantPoolResolver.cpp b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
index 6787242adbd..6ab63418e09 100644
--- a/src/hotspot/share/cds/aotConstantPoolResolver.cpp
+++ b/src/hotspot/share/cds/aotConstantPoolResolver.cpp
@@ -204,7 +204,7 @@ void AOTConstantPoolResolver::preresolve_class_cp_entries(JavaThread* current, I
       if (HAS_PENDING_EXCEPTION) {
         CLEAR_PENDING_EXCEPTION; // just ignore
       } else {
-        log_trace(cds, resolve)("Resolved class  [%3d] %s -> %s", cp_index, ik->external_name(),
+        log_trace(aot, resolve)("Resolved class  [%3d] %s -> %s", cp_index, ik->external_name(),
                                 resolved_klass->external_name());
       }
     }
@@ -292,12 +292,12 @@ void AOTConstantPoolResolver::maybe_resolve_fmi_ref(InstanceKlass* ik, Method* m
     ShouldNotReachHere();
   }
 
-  if (log_is_enabled(Trace, cds, resolve)) {
+  if (log_is_enabled(Trace, aot, resolve)) {
     ResourceMark rm(THREAD);
     bool resolved = cp->is_resolved(raw_index, bc);
     Symbol* name = cp->name_ref_at(raw_index, bc);
     Symbol* signature = cp->signature_ref_at(raw_index, bc);
-    log_trace(cds, resolve)("%s %s [%3d] %s -> %s.%s:%s",
+    log_trace(aot, resolve)("%s %s [%3d] %s -> %s.%s:%s",
                             (resolved ? "Resolved" : "Failed to resolve"),
                             Bytecodes::name(bc), cp_index, ik->external_name(),
                             resolved_klass->external_name(),
@@ -326,9 +326,9 @@ void AOTConstantPoolResolver::preresolve_indy_cp_entries(JavaThread* current, In
           CLEAR_PENDING_EXCEPTION; // just ignore
         }
       }
-      if (log_is_enabled(Trace, cds, resolve)) {
+      if (log_is_enabled(Trace, aot, resolve)) {
         ResourceMark rm(THREAD);
-        log_trace(cds, resolve)("%s indy   [%3d] %s",
+        log_trace(aot, resolve)("%s indy   [%3d] %s",
                                 rie->is_resolved() ? "Resolved" : "Failed to resolve",
                                 cp_index, ik->external_name());
       }
@@ -350,9 +350,9 @@ bool AOTConstantPoolResolver::check_methodtype_signature(ConstantPool* cp, Symbo
       }
 
       if (SystemDictionaryShared::should_be_excluded(k)) {
-        if (log_is_enabled(Warning, cds, resolve)) {
+        if (log_is_enabled(Warning, aot, resolve)) {
           ResourceMark rm;
-          log_warning(cds, resolve)("Cannot aot-resolve Lambda proxy because %s is excluded", k->external_name());
+          log_warning(aot, resolve)("Cannot aot-resolve Lambda proxy because %s is excluded", k->external_name());
         }
         return false;
       }
@@ -383,9 +383,9 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_signature(ConstantPool* c
   // as <clinit> can have side effects ==> exclude such cases.
   InstanceKlass* intf = InstanceKlass::cast(k);
   bool exclude = intf->interface_needs_clinit_execution_as_super();
-  if (log_is_enabled(Debug, cds, resolve)) {
+  if (log_is_enabled(Debug, aot, resolve)) {
     ResourceMark rm;
-    log_debug(cds, resolve)("%s aot-resolve Lambda proxy of interface type %s",
+    log_debug(aot, resolve)("%s aot-resolve Lambda proxy of interface type %s",
                             exclude ? "Cannot" : "Can", k->external_name());
   }
   return !exclude;
@@ -399,9 +399,9 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_methodtype_arg(ConstantPo
   }
 
   Symbol* sig = cp->method_type_signature_at(mt_index);
-  if (log_is_enabled(Debug, cds, resolve)) {
+  if (log_is_enabled(Debug, aot, resolve)) {
     ResourceMark rm;
-    log_debug(cds, resolve)("Checking MethodType for LambdaMetafactory BSM arg %d: %s", arg_i, sig->as_C_string());
+    log_debug(aot, resolve)("Checking MethodType for LambdaMetafactory BSM arg %d: %s", arg_i, sig->as_C_string());
   }
 
   return check_methodtype_signature(cp, sig);
@@ -415,9 +415,9 @@ bool AOTConstantPoolResolver::check_lambda_metafactory_methodhandle_arg(Constant
   }
 
   Symbol* sig = cp->method_handle_signature_ref_at(mh_index);
-  if (log_is_enabled(Debug, cds, resolve)) {
+  if (log_is_enabled(Debug, aot, resolve)) {
     ResourceMark rm;
-    log_debug(cds, resolve)("Checking MethodType of MethodHandle for LambdaMetafactory BSM arg %d: %s", arg_i, sig->as_C_string());
+    log_debug(aot, resolve)("Checking MethodType of MethodHandle for LambdaMetafactory BSM arg %d: %s", arg_i, sig->as_C_string());
   }
   return check_methodtype_signature(cp, sig);
 }
@@ -452,9 +452,9 @@ bool AOTConstantPoolResolver::is_indy_resolution_deterministic(ConstantPool* cp,
                              "[Ljava/lang/Object;"
                             ")Ljava/lang/invoke/CallSite;")) {
     Symbol* factory_type_sig = cp->uncached_signature_ref_at(cp_index);
-    if (log_is_enabled(Debug, cds, resolve)) {
+    if (log_is_enabled(Debug, aot, resolve)) {
       ResourceMark rm;
-      log_debug(cds, resolve)("Checking StringConcatFactory callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
+      log_debug(aot, resolve)("Checking StringConcatFactory callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
     }
 
     Klass* k;
@@ -504,9 +504,9 @@ bool AOTConstantPoolResolver::is_indy_resolution_deterministic(ConstantPool* cp,
      *                                {@code interfaceMethodType}.
      */
     Symbol* factory_type_sig = cp->uncached_signature_ref_at(cp_index);
-    if (log_is_enabled(Debug, cds, resolve)) {
+    if (log_is_enabled(Debug, aot, resolve)) {
       ResourceMark rm;
-      log_debug(cds, resolve)("Checking lambda callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
+      log_debug(aot, resolve)("Checking lambda callsite signature [%d]: %s", cp_index, factory_type_sig->as_C_string());
     }
 
     if (!check_lambda_metafactory_signature(cp, factory_type_sig)) {
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
index 0c4e07d3328..77a93ab264b 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
@@ -87,10 +87,10 @@ void AOTLinkedClassBulkLoader::exit_on_exception(JavaThread* current) {
   assert(current->has_pending_exception(), "precondition");
   ResourceMark rm(current);
   if (current->pending_exception()->is_a(vmClasses::OutOfMemoryError_klass())) {
-    log_error(cds)("Out of memory. Please run with a larger Java heap, current MaxHeapSize = "
+    log_error(aot)("Out of memory. Please run with a larger Java heap, current MaxHeapSize = "
                    "%zuM", MaxHeapSize/M);
   } else {
-    log_error(cds)("%s: %s", current->pending_exception()->klass()->external_name(),
+    log_error(aot)("%s: %s", current->pending_exception()->klass()->external_name(),
                    java_lang_String::as_utf8_string(java_lang_Throwable::message(current->pending_exception())));
   }
   vm_exit_during_initialization("Unexpected exception when loading aot-linked classes.");
@@ -199,9 +199,9 @@ void AOTLinkedClassBulkLoader::load_classes_impl(AOTLinkedClassCategory class_ca
 
         if (actual != ik) {
           ResourceMark rm(THREAD);
-          log_error(cds)("Unable to resolve %s class from CDS archive: %s", category_name, ik->external_name());
-          log_error(cds)("Expected: " INTPTR_FORMAT ", actual: " INTPTR_FORMAT, p2i(ik), p2i(actual));
-          log_error(cds)("JVMTI class retransformation is not supported when archive was generated with -XX:+AOTClassLinking.");
+          log_error(aot)("Unable to resolve %s class from %s: %s", category_name, CDSConfig::type_of_archive_being_loaded(), ik->external_name());
+          log_error(aot)("Expected: " INTPTR_FORMAT ", actual: " INTPTR_FORMAT, p2i(ik), p2i(actual));
+          log_error(aot)("JVMTI class retransformation is not supported when archive was generated with -XX:+AOTClassLinking.");
           MetaspaceShared::unrecoverable_loading_error();
         }
         assert(actual->is_loaded(), "must be");
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index aaebf8bef88..5a9ae8f55bc 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -1155,12 +1155,12 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 
   static void log_klass(Klass* k, address runtime_dest, const char* type_name, int bytes, Thread* current) {
     ResourceMark rm(current);
-    log_debug(cds, map)(_LOG_PREFIX " %s",
+    log_debug(aot, map)(_LOG_PREFIX " %s",
                         p2i(runtime_dest), type_name, bytes, k->external_name());
   }
   static void log_method(Method* m, address runtime_dest, const char* type_name, int bytes, Thread* current) {
     ResourceMark rm(current);
-    log_debug(cds, map)(_LOG_PREFIX " %s",
+    log_debug(aot, map)(_LOG_PREFIX " %s",
                         p2i(runtime_dest), type_name, bytes,  m->external_name());
   }
 
@@ -1203,12 +1203,12 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
         {
           ResourceMark rm(current);
           Symbol* s = (Symbol*)src;
-          log_debug(cds, map)(_LOG_PREFIX " %s", p2i(runtime_dest), type_name, bytes,
+          log_debug(aot, map)(_LOG_PREFIX " %s", p2i(runtime_dest), type_name, bytes,
                               s->as_quoted_ascii());
         }
         break;
       default:
-        log_debug(cds, map)(_LOG_PREFIX, p2i(runtime_dest), type_name, bytes);
+        log_debug(aot, map)(_LOG_PREFIX, p2i(runtime_dest), type_name, bytes);
         break;
       }
 
@@ -1218,7 +1218,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 
     log_as_hex(last_obj_base, last_obj_end, last_obj_base + buffer_to_runtime_delta());
     if (last_obj_end < region_end) {
-      log_debug(cds, map)(PTR_FORMAT ": @@ Misc data %zu bytes",
+      log_debug(aot, map)(PTR_FORMAT ": @@ Misc data %zu bytes",
                           p2i(last_obj_end + buffer_to_runtime_delta()),
                           size_t(region_end - last_obj_end));
       log_as_hex(last_obj_end, region_end, last_obj_end + buffer_to_runtime_delta());
@@ -1242,7 +1242,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
     } else {
       top = requested_base + size;
     }
-    log_info(cds, map)("[%-18s " PTR_FORMAT " - " PTR_FORMAT " %9zu bytes]",
+    log_info(aot, map)("[%-18s " PTR_FORMAT " - " PTR_FORMAT " %9zu bytes]",
                        name, p2i(base), p2i(top), size);
   }
 
@@ -1253,7 +1253,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
     address end = address(r.end());
     log_region("heap", start, end, ArchiveHeapWriter::buffered_addr_to_requested_addr(start));
 
-    LogStreamHandle(Info, cds, map) st;
+    LogStreamHandle(Info, aot, map) st;
 
     HeapRootSegments segments = heap_info->heap_root_segments();
     assert(segments.base_offset() == 0, "Sanity");
@@ -1362,7 +1362,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 
   // Print the fields of instanceOops, or the elements of arrayOops
   static void log_oop_details(ArchiveHeapInfo* heap_info, oop source_oop, address buffered_addr) {
-    LogStreamHandle(Trace, cds, map, oops) st;
+    LogStreamHandle(Trace, aot, map, oops) st;
     if (st.is_enabled()) {
       Klass* source_klass = source_oop->klass();
       ArchiveBuilder* builder = ArchiveBuilder::current();
@@ -1430,7 +1430,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   }
 
   static void log_heap_roots() {
-    LogStreamHandle(Trace, cds, map, oops) st;
+    LogStreamHandle(Trace, aot, map, oops) st;
     if (st.is_enabled()) {
       for (int i = 0; i < HeapShared::pending_roots()->length(); i++) {
         st.print("roots[%4d]: ", i);
@@ -1491,7 +1491,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   static void log_as_hex(address base, address top, address requested_base, bool is_heap = false) {
     assert(top >= base, "must be");
 
-    LogStreamHandle(Trace, cds, map) lsh;
+    LogStreamHandle(Trace, aot, map) lsh;
     if (lsh.is_enabled()) {
       int unitsize = sizeof(address);
       if (is_heap && UseCompressedOops) {
@@ -1504,7 +1504,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   }
 
   static void log_header(FileMapInfo* mapinfo) {
-    LogStreamHandle(Info, cds, map) lsh;
+    LogStreamHandle(Info, aot, map) lsh;
     if (lsh.is_enabled()) {
       mapinfo->print(&lsh);
     }
@@ -1514,7 +1514,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
   static void log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
                   ArchiveHeapInfo* heap_info,
                   char* bitmap, size_t bitmap_size_in_bytes) {
-    log_info(cds, map)("%s CDS archive map for %s", CDSConfig::is_dumping_static_archive() ? "Static" : "Dynamic", mapinfo->full_path());
+    log_info(aot, map)("%s CDS archive map for %s", CDSConfig::is_dumping_static_archive() ? "Static" : "Dynamic", mapinfo->full_path());
 
     address header = address(mapinfo->header());
     address header_end = header + mapinfo->header()->header_size();
@@ -1538,7 +1538,7 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
     }
 #endif
 
-    log_info(cds, map)("[End of CDS archive map]");
+    log_info(aot, map)("[End of CDS archive map]");
   }
 }; // end ArchiveBuilder::CDSMapLogger
 
@@ -1580,7 +1580,7 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
     print_stats();
   }
 
-  if (log_is_enabled(Info, cds, map)) {
+  if (log_is_enabled(Info, aot, map)) {
     CDSMapLogger::log(this, mapinfo, heap_info,
                       bitmap, bitmap_size_in_bytes);
   }
diff --git a/src/hotspot/share/cds/archiveHeapLoader.cpp b/src/hotspot/share/cds/archiveHeapLoader.cpp
index f604dadf980..181fa6b2bb4 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.cpp
+++ b/src/hotspot/share/cds/archiveHeapLoader.cpp
@@ -167,7 +167,7 @@ void ArchiveHeapLoader::patch_compressed_embedded_pointers(BitMapView bm,
                                                   MemRegion region) {
   narrowOop dt_encoded_bottom = info->encoded_heap_region_dumptime_address();
   narrowOop rt_encoded_bottom = CompressedOops::encode_not_null(cast_to_oop(region.start()));
-  log_info(cds)("patching heap embedded pointers: narrowOop 0x%8x -> 0x%8x",
+  log_info(aot)("patching heap embedded pointers: narrowOop 0x%8x -> 0x%8x",
                   (uint)dt_encoded_bottom, (uint)rt_encoded_bottom);
 
   // Optimization: if dumptime shift is the same as runtime shift, we can perform a
@@ -175,15 +175,15 @@ void ArchiveHeapLoader::patch_compressed_embedded_pointers(BitMapView bm,
   narrowOop* patching_start = (narrowOop*)region.start() + FileMapInfo::current_info()->heap_oopmap_start_pos();
   if (_narrow_oop_shift == CompressedOops::shift()) {
     uint32_t quick_delta = (uint32_t)rt_encoded_bottom - (uint32_t)dt_encoded_bottom;
-    log_info(cds)("CDS heap data relocation quick delta = 0x%x", quick_delta);
+    log_info(aot)("heap data relocation quick delta = 0x%x", quick_delta);
     if (quick_delta == 0) {
-      log_info(cds)("CDS heap data relocation unnecessary, quick_delta = 0");
+      log_info(aot)("heap data relocation unnecessary, quick_delta = 0");
     } else {
       PatchCompressedEmbeddedPointersQuick patcher(patching_start, quick_delta);
       bm.iterate(&patcher);
     }
   } else {
-    log_info(cds)("CDS heap data quick relocation not possible");
+    log_info(aot)("heap data quick relocation not possible");
     PatchCompressedEmbeddedPointers patcher(patching_start);
     bm.iterate(&patcher);
   }
@@ -301,12 +301,12 @@ bool ArchiveHeapLoader::load_heap_region_impl(FileMapInfo* mapinfo, LoadedArchiv
   if (!mapinfo->read_region(loaded_region->_region_index, (char*)load_address, r->used(), /* do_commit = */ false)) {
     // There's no easy way to free the buffer, so we will fill it with zero later
     // in fill_failed_loaded_heap(), and it will eventually be GC'ed.
-    log_warning(cds)("Loading of heap region %d has failed. Archived objects are disabled", loaded_region->_region_index);
+    log_warning(aot)("Loading of heap region %d has failed. Archived objects are disabled", loaded_region->_region_index);
     _loading_failed = true;
     return false;
   }
   assert(r->mapped_base() == (char*)load_address, "sanity");
-  log_info(cds)("Loaded heap    region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT
+  log_info(aot)("Loaded heap    region #%d at base " INTPTR_FORMAT " top " INTPTR_FORMAT
                 " size %6zu delta %zd",
                 loaded_region->_region_index, load_address, load_address + loaded_region->_region_size,
                 loaded_region->_region_size, loaded_region->_runtime_offset);
diff --git a/src/hotspot/share/cds/archiveHeapWriter.cpp b/src/hotspot/share/cds/archiveHeapWriter.cpp
index 1a6b8b1e488..ee1e334e84b 100644
--- a/src/hotspot/share/cds/archiveHeapWriter.cpp
+++ b/src/hotspot/share/cds/archiveHeapWriter.cpp
@@ -293,7 +293,7 @@ int ArchiveHeapWriter::compare_objs_by_oop_fields(HeapObjOrder* a, HeapObjOrder*
 }
 
 void ArchiveHeapWriter::sort_source_objs() {
-  log_info(cds)("sorting heap objects");
+  log_info(aot)("sorting heap objects");
   int len = _source_objs->length();
   _source_objs_order = new GrowableArrayCHeap<HeapObjOrder, mtClassShared>(len);
 
@@ -303,9 +303,9 @@ void ArchiveHeapWriter::sort_source_objs() {
     HeapObjOrder os = {i, rank};
     _source_objs_order->append(os);
   }
-  log_info(cds)("computed ranks");
+  log_info(aot)("computed ranks");
   _source_objs_order->sort(compare_objs_by_oop_fields);
-  log_info(cds)("sorting heap objects done");
+  log_info(aot)("sorting heap objects done");
 }
 
 void ArchiveHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtClassShared>* roots) {
@@ -330,7 +330,7 @@ void ArchiveHeapWriter::copy_source_objs_to_buffer(GrowableArrayCHeap<oop, mtCla
     }
   }
 
-  log_info(cds)("Size of heap region = %zu bytes, %d objects, %d roots, %d native ptrs",
+  log_info(aot)("Size of heap region = %zu bytes, %d objects, %d roots, %d native ptrs",
                 _buffer_used, _source_objs->length() + 1, roots->length(), _num_native_ptrs);
 }
 
@@ -636,7 +636,7 @@ static void log_bitmap_usage(const char* which, BitMap* bitmap, size_t total_bit
   // The whole heap is covered by total_bits, but there are only non-zero bits within [start ... end).
   size_t start = bitmap->find_first_set_bit(0);
   size_t end = bitmap->size();
-  log_info(cds)("%s = %7zu ... %7zu (%3zu%% ... %3zu%% = %3zu%%)", which,
+  log_info(aot)("%s = %7zu ... %7zu (%3zu%% ... %3zu%% = %3zu%%)", which,
                 start, end,
                 start * 100 / total_bits,
                 end * 100 / total_bits,
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 0b01494574c..9a92c6a8648 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.inline.hpp"
 #include "cds/archiveUtils.hpp"
@@ -168,7 +169,7 @@ class ArchivePtrBitmapCleaner: public BitMapClosure {
       }
     } else {
       _ptrmap->clear_bit(offset);
-      DEBUG_ONLY(log_trace(cds, reloc)("Clearing pointer [" PTR_FORMAT  "] -> null @ %9zu", p2i(ptr_loc), offset));
+      DEBUG_ONLY(log_trace(aot, reloc)("Clearing pointer [" PTR_FORMAT  "] -> null @ %9zu", p2i(ptr_loc), offset));
     }
 
     return true;
@@ -207,7 +208,7 @@ char* DumpRegion::expand_top_to(char* newtop) {
       // This is just a sanity check and should not appear in any real world usage. This
       // happens only if you allocate more than 2GB of shared objects and would require
       // millions of shared classes.
-      log_error(cds)("Out of memory in the CDS archive: Please reduce the number of shared classes.");
+      aot_log_error(aot)("Out of memory in the CDS archive: Please reduce the number of shared classes.");
       MetaspaceShared::unrecoverable_writing_error();
     }
   }
@@ -233,7 +234,7 @@ void DumpRegion::commit_to(char* newtop) {
   assert(commit <= uncommitted, "sanity");
 
   if (!_vs->expand_by(commit, false)) {
-    log_error(cds)("Failed to expand shared space to %zu bytes",
+    aot_log_error(aot)("Failed to expand shared space to %zu bytes",
                     need_committed_size);
     MetaspaceShared::unrecoverable_writing_error();
   }
@@ -244,7 +245,7 @@ void DumpRegion::commit_to(char* newtop) {
   } else {
     which = "shared";
   }
-  log_debug(cds)("Expanding %s spaces by %7zu bytes [total %9zu bytes ending at %p]",
+  log_debug(aot)("Expanding %s spaces by %7zu bytes [total %9zu bytes ending at %p]",
                  which, commit, _vs->actual_committed_size(), _vs->high());
 }
 
@@ -271,16 +272,16 @@ void DumpRegion::append_intptr_t(intptr_t n, bool need_to_mark) {
 
 void DumpRegion::print(size_t total_bytes) const {
   char* base = used() > 0 ? ArchiveBuilder::current()->to_requested(_base) : nullptr;
-  log_debug(cds)("%s space: %9zu [ %4.1f%% of total] out of %9zu bytes [%5.1f%% used] at " INTPTR_FORMAT,
+  log_debug(aot)("%s space: %9zu [ %4.1f%% of total] out of %9zu bytes [%5.1f%% used] at " INTPTR_FORMAT,
                  _name, used(), percent_of(used(), total_bytes), reserved(), percent_of(used(), reserved()),
                  p2i(base));
 }
 
 void DumpRegion::print_out_of_space_msg(const char* failing_region, size_t needed_bytes) {
-  log_error(cds)("[%-8s] " PTR_FORMAT " - " PTR_FORMAT " capacity =%9d, allocated =%9d",
+  aot_log_error(aot)("[%-8s] " PTR_FORMAT " - " PTR_FORMAT " capacity =%9d, allocated =%9d",
                  _name, p2i(_base), p2i(_top), int(_end - _base), int(_top - _base));
   if (strcmp(_name, failing_region) == 0) {
-    log_error(cds)(" required = %d", int(needed_bytes));
+    aot_log_error(aot)(" required = %d", int(needed_bytes));
   }
 }
 
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 836ec93f641..93e84694c35 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -136,12 +136,12 @@ class SharedDataRelocator: public BitMapClosure {
     _valid_old_base(valid_old_base), _valid_old_end(valid_old_end),
     _valid_new_base(valid_new_base), _valid_new_end(valid_new_end),
     _delta(delta) {
-    log_debug(cds, reloc)("SharedDataRelocator::_patch_base     = " PTR_FORMAT, p2i(_patch_base));
-    log_debug(cds, reloc)("SharedDataRelocator::_patch_end      = " PTR_FORMAT, p2i(_patch_end));
-    log_debug(cds, reloc)("SharedDataRelocator::_valid_old_base = " PTR_FORMAT, p2i(_valid_old_base));
-    log_debug(cds, reloc)("SharedDataRelocator::_valid_old_end  = " PTR_FORMAT, p2i(_valid_old_end));
-    log_debug(cds, reloc)("SharedDataRelocator::_valid_new_base = " PTR_FORMAT, p2i(_valid_new_base));
-    log_debug(cds, reloc)("SharedDataRelocator::_valid_new_end  = " PTR_FORMAT, p2i(_valid_new_end));
+    log_debug(aot, reloc)("SharedDataRelocator::_patch_base     = " PTR_FORMAT, p2i(_patch_base));
+    log_debug(aot, reloc)("SharedDataRelocator::_patch_end      = " PTR_FORMAT, p2i(_patch_end));
+    log_debug(aot, reloc)("SharedDataRelocator::_valid_old_base = " PTR_FORMAT, p2i(_valid_old_base));
+    log_debug(aot, reloc)("SharedDataRelocator::_valid_old_end  = " PTR_FORMAT, p2i(_valid_old_end));
+    log_debug(aot, reloc)("SharedDataRelocator::_valid_new_base = " PTR_FORMAT, p2i(_valid_new_base));
+    log_debug(aot, reloc)("SharedDataRelocator::_valid_new_end  = " PTR_FORMAT, p2i(_valid_new_end));
   }
 
   bool do_bit(size_t offset);
diff --git a/src/hotspot/share/cds/archiveUtils.inline.hpp b/src/hotspot/share/cds/archiveUtils.inline.hpp
index 72de48743f3..12c9a0bc705 100644
--- a/src/hotspot/share/cds/archiveUtils.inline.hpp
+++ b/src/hotspot/share/cds/archiveUtils.inline.hpp
@@ -27,6 +27,7 @@
 
 #include "cds/archiveUtils.hpp"
 
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/metaspaceShared.hpp"
@@ -46,7 +47,7 @@ inline bool SharedDataRelocator::do_bit(size_t offset) {
   assert(new_ptr != nullptr, "don't point to the bottom of the archive"); // See ArchivePtrMarker::mark_pointer().
   assert(_valid_new_base <= new_ptr && new_ptr < _valid_new_end, "must be");
 
-  DEBUG_ONLY(log_trace(cds, reloc)("Patch2: @%8d [" PTR_FORMAT "] " PTR_FORMAT " -> " PTR_FORMAT,
+  DEBUG_ONLY(aot_log_trace(aot, reloc)("Patch2: @%8d [" PTR_FORMAT "] " PTR_FORMAT " -> " PTR_FORMAT,
                                    (int)offset, p2i(p), p2i(old_ptr), p2i(new_ptr)));
   *p = new_ptr;
   return true; // keep iterating
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 52db54e7049..dada74c9ec2 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotLogging.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/classListWriter.hpp"
@@ -234,7 +235,7 @@ void CDSConfig::ergo_init_classic_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 archive (%s)", SharedArchiveFile);
+            aot_log_error(aot)("Not a valid %s (%s)", type_of_archive_being_loaded(), SharedArchiveFile);
             Arguments::no_shared_spaces("invalid archive");
           }
         } else if (base_archive_path == nullptr) {
@@ -278,7 +279,7 @@ void CDSConfig::ergo_init_classic_archive_paths() {
 void CDSConfig::check_internal_module_property(const char* key, const char* value) {
   if (Arguments::is_incompatible_cds_internal_module_property(key)) {
     stop_using_optimized_module_handling();
-    log_info(cds)("optimized module handling: disabled due to incompatible property: %s=%s", key, value);
+    aot_log_info(aot)("optimized module handling: disabled due to incompatible property: %s=%s", key, value);
   }
 }
 
@@ -293,7 +294,7 @@ void CDSConfig::check_incompatible_property(const char* key, const char* value)
     if (strcmp(key, property) == 0) {
       stop_dumping_full_module_graph();
       stop_using_full_module_graph();
-      log_info(cds)("full module graph: disabled due to incompatible property: %s=%s", key, value);
+      aot_log_info(aot)("full module graph: disabled due to incompatible property: %s=%s", key, value);
       break;
     }
   }
@@ -359,9 +360,9 @@ bool CDSConfig::has_unsupported_runtime_module_options() {
       warning("CDS is disabled when the %s option is specified.", option);
     } else {
       if (new_aot_flags_used()) {
-        log_warning(cds)("AOT cache is disabled when the %s option is specified.", option);
+        aot_log_warning(aot)("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);
+        aot_log_info(aot)("CDS is disabled when the %s option is specified.", option);
       }
     }
     return true;
@@ -549,7 +550,7 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
     } else if (Arguments::mode() == Arguments::_comp) {
       // -Xcomp may use excessive CPU for the test tiers. Also, -Xshare:dump runs a small and fixed set of
       // Java code, so there's not much benefit in running -Xcomp.
-      log_info(cds)("reduced -Xcomp to -Xmixed for static dumping");
+      aot_log_info(aot)("reduced -Xcomp to -Xmixed for static dumping");
       Arguments::set_mode_flags(Arguments::_mixed);
     }
 
@@ -574,11 +575,11 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
 
   if (AutoCreateSharedArchive) {
     if (SharedArchiveFile == nullptr) {
-      log_warning(cds)("-XX:+AutoCreateSharedArchive requires -XX:SharedArchiveFile");
+      aot_log_warning(aot)("-XX:+AutoCreateSharedArchive requires -XX:SharedArchiveFile");
       return false;
     }
     if (ArchiveClassesAtExit != nullptr) {
-      log_warning(cds)("-XX:+AutoCreateSharedArchive does not work with ArchiveClassesAtExit");
+      aot_log_warning(aot)("-XX:+AutoCreateSharedArchive does not work with ArchiveClassesAtExit");
       return false;
     }
   }
@@ -594,7 +595,7 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
     // Always verify non-system classes during CDS dump
     if (!BytecodeVerificationRemote) {
       BytecodeVerificationRemote = true;
-      log_info(cds)("All non-system classes will be verified (-Xverify:remote) during CDS dump time.");
+      aot_log_info(aot)("All non-system classes will be verified (-Xverify:remote) during CDS dump time.");
     }
   }
 
@@ -615,11 +616,11 @@ void CDSConfig::prepare_for_dumping() {
 
 #define __THEMSG " is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info."
     if (RecordDynamicDumpInfo) {
-      log_error(cds)("-XX:+RecordDynamicDumpInfo%s", __THEMSG);
+      aot_log_error(aot)("-XX:+RecordDynamicDumpInfo%s", __THEMSG);
       MetaspaceShared::unrecoverable_loading_error();
     } else {
       assert(ArchiveClassesAtExit != nullptr, "sanity");
-      log_warning(cds)("-XX:ArchiveClassesAtExit" __THEMSG);
+      aot_log_warning(aot)("-XX:ArchiveClassesAtExit" __THEMSG);
     }
 #undef __THEMSG
     disable_dumping_dynamic_archive();
@@ -766,7 +767,7 @@ void CDSConfig::log_reasons_for_not_dumping_heap() {
   }
 
   assert(reason != nullptr, "sanity");
-  log_info(cds)("Archived java heap is not supported: %s", reason);
+  aot_log_info(aot)("Archived java heap is not supported: %s", reason);
 }
 
 // This is *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
@@ -816,7 +817,7 @@ void CDSConfig::stop_dumping_full_module_graph(const char* reason) {
   if (_is_dumping_full_module_graph) {
     _is_dumping_full_module_graph = false;
     if (reason != nullptr) {
-      log_info(cds)("full module graph cannot be dumped: %s", reason);
+      aot_log_info(aot)("full module graph cannot be dumped: %s", reason);
     }
   }
 }
@@ -826,7 +827,7 @@ void CDSConfig::stop_using_full_module_graph(const char* reason) {
   if (_is_using_full_module_graph) {
     _is_using_full_module_graph = false;
     if (reason != nullptr) {
-      log_info(cds)("full module graph cannot be loaded: %s", reason);
+      aot_log_info(aot)("full module graph cannot be loaded: %s", reason);
     }
   }
 }
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index c97357c2614..43aa0a76d2e 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotConstantPoolResolver.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/lambdaFormInvokers.hpp"
@@ -68,7 +69,7 @@ ClassListParser::ClassListParser(const char* file, ParseMode parse_mode) :
     _file_input(do_open(file), /* need_close=*/true),
     _input_stream(&_file_input),
     _parse_mode(parse_mode) {
-  log_info(cds)("Parsing %s%s", file,
+  aot_log_info(aot)("Parsing %s%s", file,
                 parse_lambda_forms_invokers_only() ? " (lambda form invokers only)" : "");
   if (!_file_input.is_open()) {
     char reason[JVM_MAXPATHLEN];
@@ -163,18 +164,18 @@ void ClassListParser::parse_class_name_and_attributes(TRAPS) {
     if (message != nullptr) {
       ex_msg = java_lang_String::as_utf8_string(message);
     }
-    log_warning(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
+    aot_log_warning(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), ex_msg);
     // We might have an invalid class name or an bad class. Warn about it
     // and keep going to the next line.
     CLEAR_PENDING_EXCEPTION;
-    log_warning(cds)("Preload Warning: Cannot find %s", _class_name);
+    aot_log_warning(aot)("Preload Warning: Cannot find %s", _class_name);
     return;
   }
 
   assert(klass != nullptr, "sanity");
-  if (log_is_enabled(Trace, cds)) {
+  if (aot_log_is_enabled(Trace, aot)) {
     ResourceMark rm(THREAD);
-    log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
+    log_trace(aot)("Shared spaces preloaded: %s", klass->external_name());
   }
 
   if (klass->is_instance_klass()) {
@@ -498,7 +499,7 @@ void ClassListParser::check_class_name(const char* class_name) {
 void ClassListParser::constant_pool_resolution_warning(const char* msg, ...) {
   va_list ap;
   va_start(ap, msg);
-  LogTarget(Warning, cds, resolve) lt;
+  LogTarget(Warning, aot, resolve) lt;
   LogStream ls(lt);
   print_diagnostic_info(&ls, msg, ap);
   ls.print("Your classlist may be out of sync with the JDK or the application.");
@@ -542,7 +543,7 @@ InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS
     error("If source location is specified, id must be also specified");
   }
   if (strncmp(_class_name, "java/", 5) == 0) {
-    log_info(cds)("Prohibited package for non-bootstrap classes: %s.class from %s",
+    aot_log_info(aot)("Prohibited package for non-bootstrap classes: %s.class from %s",
           _class_name, _source);
     THROW_NULL(vmSymbols::java_lang_ClassNotFoundException());
   }
@@ -648,7 +649,7 @@ void ClassListParser::resolve_indy(JavaThread* current, Symbol* class_name_symbo
     if (message != nullptr) {
       ex_msg = java_lang_String::as_utf8_string(message);
     }
-    log_warning(cds)("resolve_indy for class %s has encountered exception: %s %s",
+    aot_log_warning(aot)("resolve_indy for class %s has encountered exception: %s %s",
                      class_name_symbol->as_C_string(),
                      PENDING_EXCEPTION->klass()->external_name(),
                      ex_msg);
@@ -688,7 +689,7 @@ void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
       BootstrapInfo bootstrap_specifier(pool, pool_index, indy_index);
       Handle bsm = bootstrap_specifier.resolve_bsm(CHECK);
       if (!LambdaProxyClassDictionary::is_supported_invokedynamic(&bootstrap_specifier)) {
-        log_debug(cds, lambda)("is_supported_invokedynamic check failed for cp_index %d", pool_index);
+        log_debug(aot, lambda)("is_supported_invokedynamic check failed for cp_index %d", pool_index);
         continue;
       }
       bool matched = is_matching_cp_entry(pool, pool_index, CHECK);
@@ -711,7 +712,7 @@ void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
     }
     if (!found) {
       ResourceMark rm(THREAD);
-      log_warning(cds)("No invoke dynamic constant pool entry can be found for class %s. The classlist is probably out-of-date.",
+      aot_log_warning(aot)("No invoke dynamic constant pool entry can be found for class %s. The classlist is probably out-of-date.",
                      class_name_symbol->as_C_string());
     }
   }
@@ -773,7 +774,7 @@ Klass* ClassListParser::load_current_class(Symbol* class_name_symbol, TRAPS) {
       error("Duplicated ID %d for class %s", id, _class_name);
     }
     if (id2klass_table()->maybe_grow()) {
-      log_info(cds, hashtables)("Expanded id2klass_table() to %d", id2klass_table()->table_size());
+      log_info(aot, hashtables)("Expanded id2klass_table() to %d", id2klass_table()->table_size());
     }
   }
 
@@ -877,9 +878,9 @@ void ClassListParser::parse_constant_pool_tag() {
   }
 
   if (SystemDictionaryShared::should_be_excluded(ik)) {
-    if (log_is_enabled(Warning, cds, resolve)) {
+    if (log_is_enabled(Warning, aot, resolve)) {
       ResourceMark rm;
-      log_warning(cds, resolve)("Cannot aot-resolve constants for %s because it is excluded", ik->external_name());
+      log_warning(aot, resolve)("Cannot aot-resolve constants for %s because it is excluded", ik->external_name());
     }
     return;
   }
diff --git a/src/hotspot/share/cds/classListWriter.cpp b/src/hotspot/share/cds/classListWriter.cpp
index 2a3513c45f5..c1ac1b47b11 100644
--- a/src/hotspot/share/cds/classListWriter.cpp
+++ b/src/hotspot/share/cds/classListWriter.cpp
@@ -57,7 +57,7 @@ void ClassListWriter::write(const InstanceKlass* k, const ClassFileStream* cfs)
   assert(is_enabled(), "must be");
 
   if (!ClassLoader::has_jrt_entry()) {
-    log_warning(cds)("DumpLoadedClassList and CDS are not supported in exploded build");
+    log_warning(aot)("DumpLoadedClassList and CDS are not supported in exploded build");
     DumpLoadedClassList = nullptr;
     return;
   }
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index 7d484c8d327..46dbfd45d46 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -116,7 +116,7 @@ void CppVtableCloner<T>::initialize(const char* name, CppVtableInfo* info) {
 
   // We already checked (and, if necessary, adjusted n) when the vtables were allocated, so we are
   // safe to do memcpy.
-  log_debug(cds, vtables)("Copying %3d vtable entries for %s", n, name);
+  log_debug(aot, vtables)("Copying %3d vtable entries for %s", n, name);
   memcpy(dstvtable, srcvtable, sizeof(intptr_t) * n);
 }
 
@@ -166,7 +166,7 @@ int CppVtableCloner<T>::get_vtable_length(const char* name) {
       break;
     }
   }
-  log_debug(cds, vtables)("Found   %3d vtable entries for %s", vtable_len, name);
+  log_debug(aot, vtables)("Found   %3d vtable entries for %s", vtable_len, name);
 
   return vtable_len;
 }
diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.cpp b/src/hotspot/share/cds/dumpTimeClassInfo.cpp
index 94a0f14ff1f..6a06344fb0d 100644
--- a/src/hotspot/share/cds/dumpTimeClassInfo.cpp
+++ b/src/hotspot/share/cds/dumpTimeClassInfo.cpp
@@ -71,9 +71,9 @@ void DumpTimeClassInfo::add_verification_constraint(InstanceKlass* k, Symbol* na
   c |= from_is_object          ? RunTimeClassInfo::FROM_IS_OBJECT          : 0;
   vcflags_array->append(c);
 
-  if (log_is_enabled(Trace, cds, verification)) {
+  if (log_is_enabled(Trace, aot, verification)) {
     ResourceMark rm;
-    log_trace(cds, verification)("add_verification_constraint: %s: %s must be subclass of %s [0x%x] array len %d flags len %d",
+    log_trace(aot, verification)("add_verification_constraint: %s: %s must be subclass of %s [0x%x] array len %d flags len %d",
                                  k->external_name(), from_name->as_klass_external_name(),
                                  name->as_klass_external_name(), c, vc_array->length(), vcflags_array->length());
   }
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index bf4257253e8..b1072dbce9b 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.inline.hpp"
@@ -101,7 +102,7 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
   // is caused by dynamic dumping.
   void verify_universe(const char* info) {
     if (VerifyBeforeExit) {
-      log_info(cds)("Verify %s", info);
+      log_info(aot)("Verify %s", info);
       // Among other things, this ensures that Eden top is correct.
       Universe::heap()->prepare_for_verify();
       Universe::verify(info);
@@ -120,8 +121,8 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
       return;
     }
 
-    log_info(cds,dynamic)("CDS dynamic dump: clinit = " JLONG_FORMAT "ms)",
-                          ClassLoader::class_init_time_ms());
+    log_info(cds, dynamic)("CDS dynamic dump: clinit = " JLONG_FORMAT "ms)",
+                           ClassLoader::class_init_time_ms());
 
     init_header();
     gather_source_objs();
@@ -136,7 +137,7 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
 
     sort_methods();
 
-    log_info(cds)("Make classes shareable");
+    log_info(aot)("Make classes shareable");
     make_klasses_shareable();
 
     char* serialized_data;
@@ -161,7 +162,7 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
     }
 
     if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
-      log_info(cds)("Adjust lambda proxy class dictionary");
+      log_info(aot)("Adjust lambda proxy class dictionary");
       LambdaProxyClassDictionary::adjust_dumptime_table();
     }
 
@@ -378,7 +379,7 @@ void DynamicArchiveBuilder::gather_array_klasses() {
       }
     }
   }
-  log_debug(cds)("Total array klasses gathered for dynamic archive: %d", DynamicArchive::num_array_klasses());
+  log_debug(aot)("Total array klasses gathered for dynamic archive: %d", DynamicArchive::num_array_klasses());
 }
 
 class VM_PopulateDynamicDumpSharedSpace: public VM_GC_Sync_Operation {
@@ -390,7 +391,7 @@ class VM_PopulateDynamicDumpSharedSpace: public VM_GC_Sync_Operation {
   void doit() {
     ResourceMark rm;
     if (AllowArchivingWithJavaAgent) {
-      log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+      aot_log_warning(aot)("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());
     }
@@ -445,7 +446,7 @@ void DynamicArchive::setup_array_klasses() {
         ArrayKlass::cast(elm)->set_higher_dimension(oak);
       }
     }
-    log_debug(cds)("Total array klasses read from dynamic archive: %d", _dynamic_archive_array_klasses->length());
+    log_debug(aot)("Total array klasses read from dynamic archive: %d", _dynamic_archive_array_klasses->length());
   }
 }
 
@@ -501,8 +502,8 @@ void DynamicArchive::dump_at_exit(JavaThread* current) {
   if (HAS_PENDING_EXCEPTION) {
     // One of the prepatory steps failed
     oop ex = current->pending_exception();
-    log_error(cds)("Dynamic dump has failed");
-    log_error(cds)("%s: %s", ex->klass()->external_name(),
+    aot_log_error(aot)("Dynamic dump has failed");
+    aot_log_error(aot)("%s: %s", ex->klass()->external_name(),
                    java_lang_String::as_utf8_string(java_lang_Throwable::message(ex)));
     CLEAR_PENDING_EXCEPTION;
     CDSConfig::disable_dumping_dynamic_archive();  // Just for good measure
@@ -526,14 +527,14 @@ bool DynamicArchive::validate(FileMapInfo* dynamic_info) {
 
   // Check the header crc
   if (dynamic_header->base_header_crc() != base_info->crc()) {
-    log_warning(cds)("Dynamic archive cannot be used: static archive header checksum verification failed.");
+    aot_log_warning(aot)("Dynamic archive cannot be used: static archive header checksum verification failed.");
     return false;
   }
 
   // Check each space's crc
   for (int i = 0; i < MetaspaceShared::n_regions; i++) {
     if (dynamic_header->base_region_crc(i) != base_info->region_crc(i)) {
-      log_warning(cds)("Dynamic archive cannot be used: static archive region #%d checksum verification failed.", i);
+      aot_log_warning(aot)("Dynamic archive cannot be used: static archive region #%d checksum verification failed.", i);
       return false;
     }
   }
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 1458aee412f..006a0cda59a 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -738,7 +738,7 @@ void FileMapInfo::open_as_output() {
       log_info(aot)("Writing binary AOTConfiguration file: %s",  _full_path);
     }
   } else {
-    log_info(cds)("Dumping shared data to file: %s", _full_path);
+    aot_log_info(aot)("Dumping shared data to file: %s", _full_path);
   }
 
 #ifdef _WINDOWS  // On Windows, need WRITE permission to remove the file.
@@ -1541,11 +1541,20 @@ bool FileMapInfo::can_use_heap_region() {
     default:
       ShouldNotReachHere();
     };
-    LogTarget(Info, cds) lt;
-    if (lt.is_enabled()) {
-      LogStream ls(lt);
-      ls.print_raw(ss.base());
-      header()->print(&ls);
+    if (CDSConfig::new_aot_flags_used()) {
+      LogTarget(Info, aot) lt;
+      if (lt.is_enabled()) {
+        LogStream ls(lt);
+        ls.print_raw(ss.base());
+        header()->print(&ls);
+      }
+    } else {
+      LogTarget(Info, cds) lt;
+      if (lt.is_enabled()) {
+        LogStream ls(lt);
+        ls.print_raw(ss.base());
+        header()->print(&ls);
+      }
     }
     assert(false, "%s", ss.base());
   }
diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp
index a19adda87fa..4605b287a16 100644
--- a/src/hotspot/share/cds/finalImageRecipes.cpp
+++ b/src/hotspot/share/cds/finalImageRecipes.cpp
@@ -208,7 +208,7 @@ void FinalImageRecipes::apply_recipes(TRAPS) {
       log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
       log_error(aot)("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");
+      MetaspaceShared::unrecoverable_writing_error("Unexpected exception, use -Xlog:aot,exceptions=trace for detail");
     }
   }
 
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index 3ed0daf2c4c..d6a51c87513 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -150,7 +150,7 @@ void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
 
   if (HAS_PENDING_EXCEPTION) {
     if (!PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())) {
-      log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
+      log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
       if (CDSConfig::is_dumping_static_archive()) {
         log_error(aot)("Failed to generate LambdaForm holder classes. Is your classlist out of date?");
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index 6b2e432d559..3c2f410f7f1 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -99,7 +99,7 @@ void LambdaProxyClassDictionary::dumptime_init() {
 }
 
 bool LambdaProxyClassDictionary::is_supported_invokedynamic(BootstrapInfo* bsi) {
-  LogTarget(Debug, cds, lambda) log;
+  LogTarget(Debug, aot, lambda) log;
   if (bsi->arg_values() == nullptr || !bsi->arg_values()->is_objArray()) {
     if (log.is_enabled()) {
       LogStream log_stream(log);
@@ -268,9 +268,9 @@ InstanceKlass* LambdaProxyClassDictionary::find_lambda_proxy_class(InstanceKlass
   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)) {
+    if (info != nullptr && log_is_enabled(Debug, aot)) {
       ResourceMark rm;
-      log_debug(cds)("Used all static archived lambda proxy classes for: %s %s%s",
+      log_debug(aot)("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 {
@@ -281,9 +281,9 @@ InstanceKlass* LambdaProxyClassDictionary::find_lambda_proxy_class(InstanceKlass
   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)) {
+    if (info != nullptr && log_is_enabled(Debug, aot)) {
       ResourceMark rm;
-      log_debug(cds)("Used all dynamic archived lambda proxy classes for: %s %s%s",
+      log_debug(aot)("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());
     }
   }
@@ -306,9 +306,9 @@ InstanceKlass* LambdaProxyClassDictionary::find_lambda_proxy_class(const RunTime
       prev_klass->set_next_link(nullptr);
       proxy_klass = curr_klass;
       proxy_klass->clear_lambda_proxy_is_available();
-      if (log_is_enabled(Debug, cds)) {
+      if (log_is_enabled(Debug, aot)) {
         ResourceMark rm;
-        log_debug(cds)("Loaded lambda proxy: %s ", proxy_klass->external_name());
+        log_debug(aot)("Loaded lambda proxy: %s ", proxy_klass->external_name());
       }
     }
   }
@@ -413,7 +413,7 @@ class CopyLambdaProxyClassInfoToArchive : StackObj {
     // 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());
+    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);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 53d75a3d7ec..83c5f254a17 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -801,7 +801,8 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
     } else {
       aot_log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
                      java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
-      MetaspaceShared::writing_error("Unexpected exception, use -Xlog:cds,exceptions=trace for detail");
+      MetaspaceShared::writing_error(err_msg("Unexpected exception, use -Xlog:aot%s,exceptions=trace for detail",
+                                             CDSConfig::new_aot_flags_used() ? "" : ",cds"));
     }
   }
 
diff --git a/src/hotspot/share/cds/regeneratedClasses.cpp b/src/hotspot/share/cds/regeneratedClasses.cpp
index 37d5e89598a..38bf1a11952 100644
--- a/src/hotspot/share/cds/regeneratedClasses.cpp
+++ b/src/hotspot/share/cds/regeneratedClasses.cpp
@@ -57,7 +57,7 @@ void RegeneratedClasses::add_class(InstanceKlass* orig_klass, InstanceKlass* reg
     Method* regen_m = regen_klass->find_method(orig_m->name(), orig_m->signature());
     if (regen_m == nullptr) {
       ResourceMark rm;
-      log_warning(cds)("Method in original class is missing from regenerated class: " INTPTR_FORMAT " %s",
+      log_warning(aot)("Method in original class is missing from regenerated class: " INTPTR_FORMAT " %s",
                        p2i(orig_m), orig_m->external_name());
     } else {
       _renegerated_objs->put((address)orig_m, (address)regen_m);
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.cpp b/src/hotspot/share/classfile/classLoaderDataShared.cpp
index 5cfe2df61b1..94ded38f5da 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotLogging.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/serializeClosure.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -192,7 +193,7 @@ void ClassLoaderDataShared::serialize(SerializeClosure* f) {
     // Must be done before ClassLoader::create_javabase()
     _archived_boot_loader_data.restore(null_class_loader_data(), true, false);
     ModuleEntryTable::set_javabase_moduleEntry(_archived_javabase_moduleEntry);
-    log_info(cds)("use_full_module_graph = true; java.base = " INTPTR_FORMAT,
+    aot_log_info(aot)("use_full_module_graph = true; java.base = " INTPTR_FORMAT,
                   p2i(_archived_javabase_moduleEntry));
   }
 }
diff --git a/src/hotspot/share/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp
index f3f27d7768e..cb20ebb2512 100644
--- a/src/hotspot/share/classfile/classLoaderExt.cpp
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp
@@ -105,7 +105,7 @@ void ClassLoaderExt::record_result_for_builtin_loader(s2 classpath_index, Instan
     // 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.
     ResourceMark rm;
-    log_warning(cds)("CDS heap objects cannot be written because class %s maybe modified by ClassFileLoadHook.",
+    log_warning(aot)("heap objects cannot be written because class %s maybe modified by ClassFileLoadHook.",
                      result->external_name());
     CDSConfig::disable_heap_dumping();
   }
diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 15ae5ba8013..9f7ec6bd118 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -155,7 +155,7 @@ void CompactHashtableWriter::dump(SimpleCompactHashtable *cht, const char* table
   cht->init(base_address,  _num_entries_written, _num_buckets,
             _compact_buckets->data(), _compact_entries->data());
 
-  LogMessage(cds, hashtables) msg;
+  LogMessage(aot, hashtables) msg;
   if (msg.is_info()) {
     double avg_cost = 0.0;
     if (_num_entries_written > 0) {
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 18f2abfd5f4..208c4efe035 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -427,9 +427,9 @@ ModuleEntry* ModuleEntry::allocate_archived_entry() const {
   // For verify_archived_module_entries()
   DEBUG_ONLY(_num_inited_module_entries++);
 
-  if (log_is_enabled(Info, cds, module)) {
+  if (log_is_enabled(Info, aot, module)) {
     ResourceMark rm;
-    LogStream ls(Log(cds, module)::info());
+    LogStream ls(Log(aot, module)::info());
     ls.print("Stored in archive: ");
     archived_entry->print(&ls);
   }
@@ -535,9 +535,9 @@ void ModuleEntry::restore_archived_oops(ClassLoaderData* loader_data) {
   assert(java_lang_Module::loader(module_handle()) == loader_data->class_loader(),
          "must be set in dump time");
 
-  if (log_is_enabled(Info, cds, module)) {
+  if (log_is_enabled(Info, aot, module)) {
     ResourceMark rm;
-    LogStream ls(Log(cds, module)::info());
+    LogStream ls(Log(aot, module)::info());
     ls.print("Restored from archive: ");
     print(&ls);
   }
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index a75c4abd9c5..874dc013217 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -22,6 +22,7 @@
 *
 */
 
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/metaspaceShared.hpp"
@@ -489,13 +490,13 @@ void Modules::check_archived_module_oop(oop orig_module_obj) {
     //     java.lang.Module::ALL_UNNAMED_MODULE
     //     java.lang.Module::EVERYONE_MODULE
     //     jdk.internal.loader.ClassLoaders$BootClassLoader::unnamedModule
-    log_info(cds, module)("Archived java.lang.Module oop " PTR_FORMAT " with no ModuleEntry*", p2i(orig_module_obj));
+    log_info(aot, module)("Archived java.lang.Module oop " PTR_FORMAT " with no ModuleEntry*", p2i(orig_module_obj));
     assert(java_lang_Module::name(orig_module_obj) == nullptr, "must be unnamed");
   } else {
     // This java.lang.Module oop has an ModuleEntry*. Check if the latter is archived.
-    if (log_is_enabled(Info, cds, module)) {
+    if (log_is_enabled(Info, aot, module)) {
       ResourceMark rm;
-      LogStream ls(Log(cds, module)::info());
+      LogStream ls(Log(aot, module)::info());
       ls.print("Archived java.lang.Module oop " PTR_FORMAT " for ", p2i(orig_module_obj));
       orig_module_ent->print(&ls);
     }
@@ -599,7 +600,7 @@ Modules::ArchivedProperty& Modules::archived_prop(size_t i) {
 void Modules::ArchivedProperty::runtime_check() const {
   ResourceMark rm;
   const char* runtime_value = get_flattened_value();
-  log_info(cds)("archived module property %s: %s", _prop,
+  aot_log_info(aot)("archived module property %s: %s", _prop,
                 _archived_value != nullptr ? _archived_value : "(null)");
 
   bool disable = false;
@@ -693,8 +694,8 @@ void Modules::serialize_archived_module_info(SerializeClosure* soc) {
     archived_prop(i).serialize(soc);
   }
   if (soc->reading()) {
-    log_info(cds)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
-    log_info(cds)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
+    aot_log_info(aot)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
+    aot_log_info(aot)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
   }
 }
 
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index b048c531d13..a9d05996ebf 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -955,13 +955,13 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
   int total = (int)_items_count;
   size_t single_array_size = objArrayOopDesc::object_size(total);
 
-  log_info(cds)("allocated string table for %d strings", total);
+  log_info(aot)("allocated string table for %d strings", total);
 
   if (!ArchiveHeapWriter::is_too_large_to_archive(single_array_size)) {
     // The entire table can fit in a single array
     objArrayOop array = oopFactory::new_objArray(vmClasses::Object_klass(), total, CHECK);
     _shared_strings_array = OopHandle(Universe::vm_global(), array);
-    log_info(cds)("string table array (single level) length = %d", total);
+    log_info(aot)("string table array (single level) length = %d", total);
   } else {
     // Split the table in two levels of arrays.
     int primary_array_length = (total + _secondary_array_max_length - 1) / _secondary_array_max_length;
@@ -972,7 +972,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
       // This can only happen if you have an extremely large number of classes that
       // refer to more than 16384 * 16384 = 26M interned strings! Not a practical concern
       // but bail out for safety.
-      log_error(cds)("Too many strings to be archived: %zu", _items_count);
+      log_error(aot)("Too many strings to be archived: %zu", _items_count);
       MetaspaceShared::unrecoverable_writing_error();
     }
 
@@ -980,7 +980,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
     objArrayHandle primaryHandle(THREAD, primary);
     _shared_strings_array = OopHandle(Universe::vm_global(), primary);
 
-    log_info(cds)("string table array (primary) length = %d", primary_array_length);
+    log_info(aot)("string table array (primary) length = %d", primary_array_length);
     for (int i = 0; i < primary_array_length; i++) {
       int len;
       if (total > _secondary_array_max_length) {
@@ -993,7 +993,7 @@ void StringTable::allocate_shared_strings_array(TRAPS) {
       objArrayOop secondary = oopFactory::new_objArray(vmClasses::Object_klass(), len, CHECK);
       primaryHandle()->obj_at_put(i, secondary);
 
-      log_info(cds)("string table array (secondary)[%d] length = %d", i, len);
+      log_info(aot)("string table array (secondary)[%d] length = %d", i, len);
       assert(!ArchiveHeapWriter::is_too_large_to_archive(secondary), "sanity");
     }
 
@@ -1064,7 +1064,7 @@ oop StringTable::init_shared_strings_array() {
   };
 
   _local_table->do_safepoint_scan(copy_into_array);
-  log_info(cds)("Archived %d interned strings", index);
+  log_info(aot)("Archived %d interned strings", index);
   return array;
 };
 
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index cb0fac4c90d..2ac52c4b697 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -24,6 +24,7 @@
 
 #include "cds/aotClassFilter.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotLogging.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
@@ -229,7 +230,7 @@ bool SystemDictionaryShared::check_for_exclusion(InstanceKlass* k, DumpTimeClass
 // Returns true so the caller can do:    return warn_excluded(".....");
 bool SystemDictionaryShared::warn_excluded(InstanceKlass* k, const char* reason) {
   ResourceMark rm;
-  log_warning(cds)("Skipping %s: %s", k->name()->as_C_string(), reason);
+  aot_log_warning(aot)("Skipping %s: %s", k->name()->as_C_string(), reason);
   return true;
 }
 
@@ -273,7 +274,7 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
         k->set_shared_classpath_index(0);
       } else {
         ResourceMark rm;
-        log_info(cds)("Skipping %s because it is dynamically generated", k->name()->as_C_string());
+        aot_log_info(aot)("Skipping %s because it is dynamically generated", k->name()->as_C_string());
         return true; // exclude without warning
       }
     } else {
@@ -325,14 +326,14 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
 
   if (UnregisteredClasses::check_for_exclusion(k)) {
     ResourceMark rm;
-    log_info(cds)("Skipping %s: used only when dumping CDS archive", k->name()->as_C_string());
+    aot_log_info(aot)("Skipping %s: used only when dumping CDS archive", k->name()->as_C_string());
     return true;
   }
 
   InstanceKlass* super = k->java_super();
   if (super != nullptr && check_for_exclusion(super, nullptr)) {
     ResourceMark rm;
-    log_warning(cds)("Skipping %s: super class %s is excluded", k->name()->as_C_string(), super->name()->as_C_string());
+    aot_log_warning(aot)("Skipping %s: super class %s is excluded", k->name()->as_C_string(), super->name()->as_C_string());
     return true;
   }
 
@@ -342,7 +343,7 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
     InstanceKlass* intf = interfaces->at(i);
     if (check_for_exclusion(intf, nullptr)) {
       ResourceMark rm;
-      log_warning(cds)("Skipping %s: interface %s is excluded", k->name()->as_C_string(), intf->name()->as_C_string());
+      aot_log_warning(aot)("Skipping %s: interface %s is excluded", k->name()->as_C_string(), intf->name()->as_C_string());
       return true;
     }
   }
@@ -824,9 +825,9 @@ void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass
       Symbol* name      = vc->name();
       Symbol* from_name = vc->from_name();
 
-      if (log_is_enabled(Trace, cds, verification)) {
+      if (log_is_enabled(Trace, aot, verification)) {
         ResourceMark rm(THREAD);
-        log_trace(cds, verification)("check_verification_constraint: %s: %s must be subclass of %s [0x%x]",
+        log_trace(aot, 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(), record->verifier_constraint_flag(i));
       }
@@ -1042,9 +1043,9 @@ class CopySharedClassInfoToArchive : StackObj {
       } else {
         _writer->add(hash, delta);
       }
-      if (log_is_enabled(Trace, cds, hashtables)) {
+      if (log_is_enabled(Trace, aot, hashtables)) {
         ResourceMark rm;
-        log_trace(cds,hashtables)("%s dictionary: %s", (_is_builtin ? "builtin" : "unregistered"), info._klass->external_name());
+        log_trace(aot, hashtables)("%s dictionary: %s", (_is_builtin ? "builtin" : "unregistered"), info._klass->external_name());
       }
 
       // Save this for quick runtime lookup of InstanceKlass* -> RunTimeClassInfo*
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 195bf57e055..f0b85d9f5d4 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -917,7 +917,7 @@ void InterpreterRuntime::cds_resolve_invoke(Bytecodes::Code bytecode, int method
     // Can't link it here since there are no guarantees it'll be prelinked on the next run.
     ResourceMark rm;
     InstanceKlass* resolved_iklass = InstanceKlass::cast(link_info.resolved_klass());
-    log_info(cds, resolve)("Not resolved: class not linked: %s %s %s",
+    log_info(aot, resolve)("Not resolved: class not linked: %s %s %s",
                            resolved_iklass->is_shared() ? "is_shared" : "",
                            resolved_iklass->init_state_name(),
                            resolved_iklass->external_name());
diff --git a/src/hotspot/share/memory/metaspaceClosure.cpp b/src/hotspot/share/memory/metaspaceClosure.cpp
index 46e80ec3a1f..f3c6e350034 100644
--- a/src/hotspot/share/memory/metaspaceClosure.cpp
+++ b/src/hotspot/share/memory/metaspaceClosure.cpp
@@ -91,7 +91,7 @@ bool UniqueMetaspaceClosure::do_ref(MetaspaceClosure::Ref* ref, bool read_only)
     return false; // Already visited: no need to iterate embedded pointers.
   } else {
     if (_has_been_visited.maybe_grow()) {
-      log_info(cds, hashtables)("Expanded _has_been_visited table to %d", _has_been_visited.table_size());
+      log_info(aot, hashtables)("Expanded _has_been_visited table to %d", _has_been_visited.table_size());
     }
     return do_unique_ref(ref, read_only);
   }
diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp
index 22f8899e2c7..3bec05324e7 100644
--- a/src/hotspot/share/memory/metaspaceClosure.hpp
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp
@@ -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
@@ -200,11 +200,11 @@ class MetaspaceClosure {
 
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
       Array<T>* array = ArrayRef<T>::dereference();
-      log_trace(cds)("Iter(OtherArray): %p [%d]", array, array->length());
+      log_trace(aot)("Iter(OtherArray): %p [%d]", array, array->length());
     }
     virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
       Array<T>* array = (Array<T>*)new_loc;
-      log_trace(cds)("Iter(OtherArray): %p [%d]", array, array->length());
+      log_trace(aot)("Iter(OtherArray): %p [%d]", array, array->length());
     }
   };
 
@@ -222,7 +222,7 @@ class MetaspaceClosure {
     }
   private:
     void metaspace_pointers_do_at_impl(MetaspaceClosure *it, Array<T>* array) const {
-      log_trace(cds)("Iter(MSOArray): %p [%d]", array, array->length());
+      log_trace(aot)("Iter(MSOArray): %p [%d]", array, array->length());
       for (int i = 0; i < array->length(); i++) {
         T* elm = array->adr_at(i);
         elm->metaspace_pointers_do(it);
@@ -244,7 +244,7 @@ class MetaspaceClosure {
     }
   private:
     void metaspace_pointers_do_at_impl(MetaspaceClosure *it, Array<T*>* array) const {
-      log_trace(cds)("Iter(MSOPointerArray): %p [%d]", array, array->length());
+      log_trace(aot)("Iter(MSOPointerArray): %p [%d]", array, array->length());
       for (int i = 0; i < array->length(); i++) {
         T** mpp = array->adr_at(i);
         it->push(mpp);
diff --git a/src/hotspot/share/oops/annotations.cpp b/src/hotspot/share/oops/annotations.cpp
index 606c18b350d..c4e49d52383 100644
--- a/src/hotspot/share/oops/annotations.cpp
+++ b/src/hotspot/share/oops/annotations.cpp
@@ -76,7 +76,7 @@ typeArrayOop Annotations::make_java_array(AnnotationArray* annotations, TRAPS) {
 }
 
 void Annotations::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(Annotations): %p", this);
+  log_trace(aot)("Iter(Annotations): %p", this);
   it->push(&_class_annotations);
   it->push(&_fields_annotations);
   it->push(&_class_type_annotations);
diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp
index 8b6a97fd62d..5f6f6ac674d 100644
--- a/src/hotspot/share/oops/arrayKlass.cpp
+++ b/src/hotspot/share/oops/arrayKlass.cpp
@@ -207,7 +207,7 @@ void ArrayKlass::metaspace_pointers_do(MetaspaceClosure* it) {
   Klass::metaspace_pointers_do(it);
 
   ResourceMark rm;
-  log_trace(cds)("Iter(ArrayKlass): %p (%s)", this, external_name());
+  log_trace(aot)("Iter(ArrayKlass): %p (%s)", this, external_name());
 
   // need to cast away volatile
   it->push((Klass**)&_higher_dimension);
diff --git a/src/hotspot/share/oops/constMethod.cpp b/src/hotspot/share/oops/constMethod.cpp
index 1fed47f7ff2..4048fc82d21 100644
--- a/src/hotspot/share/oops/constMethod.cpp
+++ b/src/hotspot/share/oops/constMethod.cpp
@@ -417,7 +417,7 @@ void ConstMethod::copy_annotations_from(ClassLoaderData* loader_data, ConstMetho
 }
 
 void ConstMethod::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(ConstMethod): %p", this);
+  log_trace(aot)("Iter(ConstMethod): %p", this);
 
   if (!method()->method_holder()->is_rewritten()) {
     it->push(&_constants, MetaspaceClosure::_writable);
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index c02fdaf2dc6..636fbd84487 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -149,7 +149,7 @@ void ConstantPool::release_C_heap_structures() {
 }
 
 void ConstantPool::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(ConstantPool): %p", this);
+  log_trace(aot)("Iter(ConstantPool): %p", this);
 
   it->push(&_tags, MetaspaceClosure::_writable);
   it->push(&_cache);
@@ -501,7 +501,7 @@ static const char* get_type(Klass* k) {
 
 void ConstantPool::remove_unshareable_entries() {
   ResourceMark rm;
-  log_info(cds, resolve)("Archiving CP entries for %s", pool_holder()->name()->as_C_string());
+  log_info(aot, resolve)("Archiving CP entries for %s", pool_holder()->name()->as_C_string());
   for (int cp_index = 1; cp_index < length(); cp_index++) { // cp_index 0 is unused
     int cp_tag = tag_at(cp_index).value();
     switch (cp_tag) {
@@ -560,7 +560,7 @@ void ConstantPool::remove_resolved_klass_if_non_deterministic(int cp_index) {
     resolved_klasses()->at_put(resolved_klass_index, nullptr);
   }
 
-  LogStreamHandle(Trace, cds, resolve) log;
+  LogStreamHandle(Trace, aot, resolve) log;
   if (log.is_enabled()) {
     ResourceMark rm;
     log.print("%s klass  CP entry [%3d]: %s %s",
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index a354e0b07a6..b7c1d445a98 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -437,7 +437,7 @@ void ConstantPoolCache::remove_resolved_field_entries_if_non_deterministic() {
       rfi->remove_unshareable_info();
     }
     if (resolved) {
-      LogStreamHandle(Trace, cds, resolve) log;
+      LogStreamHandle(Trace, aot, resolve) log;
       if (log.is_enabled()) {
         ResourceMark rm;
         int klass_cp_index = cp->uncached_klass_ref_index_at(cp_index);
@@ -477,7 +477,7 @@ void ConstantPoolCache::remove_resolved_method_entries_if_non_deterministic() {
       rme->remove_unshareable_info();
     }
     if (resolved) {
-      LogStreamHandle(Trace, cds, resolve) log;
+      LogStreamHandle(Trace, aot, resolve) log;
       if (log.is_enabled()) {
         ResourceMark rm;
         int klass_cp_index = cp->uncached_klass_ref_index_at(cp_index);
@@ -517,7 +517,7 @@ void ConstantPoolCache::remove_resolved_indy_entries_if_non_deterministic() {
       rei->remove_unshareable_info();
     }
     if (resolved) {
-      LogStreamHandle(Trace, cds, resolve) log;
+      LogStreamHandle(Trace, aot, resolve) log;
       if (log.is_enabled()) {
         ResourceMark rm;
         int bsm = cp->bootstrap_method_ref_index_at(cp_index);
@@ -705,7 +705,7 @@ void ConstantPoolCache::dump_cache() {
 #endif // INCLUDE_JVMTI
 
 void ConstantPoolCache::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(ConstantPoolCache): %p", this);
+  log_trace(aot)("Iter(ConstantPoolCache): %p", this);
   it->push(&_constant_pool);
   it->push(&_reference_map);
   if (_resolved_indy_entries != nullptr) {
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 5bde777c47e..b6f35d889ab 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -866,9 +866,9 @@ void InstanceKlass::initialize_with_aot_initialized_mirror(TRAPS) {
     initialize(CHECK);
     return;
   }
-  if (log_is_enabled(Info, cds, init)) {
+  if (log_is_enabled(Info, aot, init)) {
     ResourceMark rm;
-    log_info(cds, init)("%s (aot-inited)", external_name());
+    log_info(aot, init)("%s (aot-inited)", external_name());
   }
 
   link_class(CHECK);
@@ -2567,9 +2567,9 @@ void InstanceKlass::clean_method_data() {
 void InstanceKlass::metaspace_pointers_do(MetaspaceClosure* it) {
   Klass::metaspace_pointers_do(it);
 
-  if (log_is_enabled(Trace, cds)) {
+  if (log_is_enabled(Trace, aot)) {
     ResourceMark rm;
-    log_trace(cds)("Iter(InstanceKlass): %p (%s)", this, external_name());
+    log_trace(aot)("Iter(InstanceKlass): %p (%s)", this, external_name());
   }
 
   it->push(&_annotations);
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 71f31cef580..a41f3540f39 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -761,9 +761,9 @@ void Klass::clean_weak_klass_links(bool unloading_occurred, bool clean_alive_kla
 }
 
 void Klass::metaspace_pointers_do(MetaspaceClosure* it) {
-  if (log_is_enabled(Trace, cds)) {
+  if (log_is_enabled(Trace, aot)) {
     ResourceMark rm;
-    log_trace(cds)("Iter(Klass): %p (%s)", this, external_name());
+    log_trace(aot)("Iter(Klass): %p (%s)", this, external_name());
   }
 
   it->push(&_name);
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 7496fe7c4e6..84c594b99d9 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -386,7 +386,7 @@ Symbol* Method::klass_name() const {
 }
 
 void Method::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(Method): %p", this);
+  log_trace(aot)("Iter(Method): %p", this);
 
   if (!method_holder()->is_rewritten()) {
     it->push(&_constMethod, MetaspaceClosure::_writable);
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index 280a69df583..a903340f12e 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -1725,7 +1725,7 @@ bool MethodData::profile_parameters_for_method(const methodHandle& m) {
 }
 
 void MethodData::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(MethodData): %p", this);
+  log_trace(aot)("Iter(MethodData): %p", this);
   it->push(&_method);
 }
 
diff --git a/src/hotspot/share/oops/recordComponent.cpp b/src/hotspot/share/oops/recordComponent.cpp
index 176e83820e4..4e33e71e6ef 100644
--- a/src/hotspot/share/oops/recordComponent.cpp
+++ b/src/hotspot/share/oops/recordComponent.cpp
@@ -50,7 +50,7 @@ void RecordComponent::deallocate_contents(ClassLoaderData* loader_data) {
 }
 
 void RecordComponent::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(cds)("Iter(RecordComponent): %p", this);
+  log_trace(aot)("Iter(RecordComponent): %p", this);
   it->push(&_annotations);
   it->push(&_type_annotations);
 }
diff --git a/src/hotspot/share/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp
index 4fc120ff19f..0f2cd8e6e6b 100644
--- a/src/hotspot/share/oops/symbol.cpp
+++ b/src/hotspot/share/oops/symbol.cpp
@@ -367,8 +367,8 @@ void Symbol::make_permanent() {
 }
 
 void Symbol::metaspace_pointers_do(MetaspaceClosure* it) {
-  if (log_is_enabled(Trace, cds)) {
-    LogStream trace_stream(Log(cds)::trace());
+  if (log_is_enabled(Trace, aot)) {
+    LogStream trace_stream(Log(aot)::trace());
     trace_stream.print("Iter(Symbol): %p ", this);
     print_value_on(&trace_stream);
     trace_stream.cr();
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 874473ac9a1..e50318c90b6 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -2767,10 +2767,10 @@ JVM_ENTRY(void, JVM_StartThread(JNIEnv* env, jobject jthread))
     // creates the module graph, etc. It's safe to not start the other
     // threads which are launched by class static initializers
     // (ReferenceHandler, FinalizerThread and CleanerImpl).
-    if (log_is_enabled(Info, cds)) {
+    if (log_is_enabled(Info, aot)) {
       ResourceMark rm;
       oop t = JNIHandles::resolve_non_null(jthread);
-      log_info(cds)("JVM_StartThread() ignored: %s", t->klass()->external_name());
+      log_info(aot)("JVM_StartThread() ignored: %s", t->klass()->external_name());
     }
     return;
   }
@@ -3463,7 +3463,7 @@ JVM_ENTRY_NO_ENV(jlong, JVM_GetRandomSeedForDumping())
     if (seed == 0) { // don't let this ever be zero.
       seed = 0x87654321;
     }
-    log_debug(cds)("JVM_GetRandomSeedForDumping() = " JLONG_FORMAT, seed);
+    log_debug(aot)("JVM_GetRandomSeedForDumping() = " JLONG_FORMAT, seed);
     return seed;
   } else {
     return 0;
@@ -3526,7 +3526,7 @@ JVM_ENTRY(jboolean, JVM_NeedsClassInitBarrierForCDS(JNIEnv* env, jclass cls))
       // 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());
+      log_debug(aot)("NeedsClassInitBarrierForCDS: %s", k->external_name());
       return true;
     }
   }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 2fa519c5ea5..e1fde4803c4 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1374,7 +1374,7 @@ void Arguments::no_shared_spaces(const char* message) {
     if (CDSConfig::new_aot_flags_used()) {
       log_warning(aot)("Unable to use AOT cache: %s", message);
     } else {
-      log_info(cds)("Unable to use shared archive: %s", message);
+      aot_log_info(aot)("Unable to use shared archive: %s", message);
     }
     UseSharedSpaces = false;
   }
@@ -3616,10 +3616,11 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
     return JNI_ERR;
   }
   if ((CDSConfig::is_using_archive() && xshare_auto_cmd_line) ||
-      log_is_enabled(Info, cds)) {
+      log_is_enabled(Info, cds) || log_is_enabled(Info, aot)) {
     warning("Shared spaces are not supported in this VM");
     UseSharedSpaces = false;
     LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(cds));
+    LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(aot));
   }
   no_shared_spaces("CDS Disabled");
 #endif // INCLUDE_CDS
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 7bfb9c62909..a4f5761ae48 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -2898,7 +2898,7 @@ class CopyAdapterTableToArchive : StackObj {
   {}
 
   bool do_entry(AdapterFingerPrint* fp, AdapterHandlerEntry* entry) {
-    LogStreamHandle(Trace, cds) lsh;
+    LogStreamHandle(Trace, aot) lsh;
     if (ArchiveBuilder::current()->has_been_archived((address)entry)) {
       assert(ArchiveBuilder::current()->has_been_archived((address)fp), "must be");
       AdapterFingerPrint* buffered_fp = ArchiveBuilder::current()->get_buffered_addr(fp);
@@ -2912,11 +2912,11 @@ class CopyAdapterTableToArchive : StackObj {
       if (lsh.is_enabled()) {
         address fp_runtime_addr = (address)buffered_fp + ArchiveBuilder::current()->buffer_to_requested_delta();
         address entry_runtime_addr = (address)buffered_entry + ArchiveBuilder::current()->buffer_to_requested_delta();
-        log_trace(cds)("Added fp=%p (%s), entry=%p to the archived adater table", buffered_fp, buffered_fp->as_basic_args_string(), buffered_entry);
+        log_trace(aot)("Added fp=%p (%s), entry=%p to the archived adater table", buffered_fp, buffered_fp->as_basic_args_string(), buffered_entry);
       }
     } else {
       if (lsh.is_enabled()) {
-        log_trace(cds)("Skipping adapter handler %p (fp=%s) as it is not archived", entry, fp->as_basic_args_string());
+        log_trace(aot)("Skipping adapter handler %p (fp=%s) as it is not archived", entry, fp->as_basic_args_string());
       }
     }
     return true;
@@ -2964,7 +2964,7 @@ void AdapterHandlerEntry::link() {
   if (AOTCodeCache::is_using_adapter()) {
     adapter_blob = AdapterHandlerLibrary::link_aot_adapter_handler(this);
     if (adapter_blob == nullptr) {
-      log_warning(cds)("Failed to link AdapterHandlerEntry (fp=%s) to its code in the AOT code cache", _fingerprint->as_basic_args_string());
+      log_warning(aot)("Failed to link AdapterHandlerEntry (fp=%s) to its code in the AOT code cache", _fingerprint->as_basic_args_string());
       generate_code = true;
     }
   } else {
@@ -3052,7 +3052,7 @@ void AdapterHandlerEntry::relocate(address new_base) {
 }
 
 void AdapterHandlerEntry::metaspace_pointers_do(MetaspaceClosure* it) {
-  LogStreamHandle(Trace, cds) lsh;
+  LogStreamHandle(Trace, aot) lsh;
   if (lsh.is_enabled()) {
     lsh.print("Iter(AdapterHandlerEntry): %p(%s)", this, _fingerprint->as_basic_args_string());
     lsh.cr();
diff --git a/test/hotspot/jtreg/runtime/cds/CDSMapReader.java b/test/hotspot/jtreg/runtime/cds/CDSMapReader.java
index f9fc4c222cb..f25455b2f03 100644
--- a/test/hotspot/jtreg/runtime/cds/CDSMapReader.java
+++ b/test/hotspot/jtreg/runtime/cds/CDSMapReader.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
@@ -33,7 +33,7 @@
 
 This is a simple parser for parsing the output of
 
-   java -Xshare:dump -Xlog:cds+map=debug,cds+map+oops=trace:file=cds.map:none:filesize=0
+   java -Xshare:dump -Xlog:aot+map=debug,aot+map+oops=trace:file=cds.map:none:filesize=0
 
 The map file contains patterns like this for the heap objects:
 
diff --git a/test/hotspot/jtreg/runtime/cds/CDSMapTest.java b/test/hotspot/jtreg/runtime/cds/CDSMapTest.java
index fbc98fef1d6..5a5978a8633 100644
--- a/test/hotspot/jtreg/runtime/cds/CDSMapTest.java
+++ b/test/hotspot/jtreg/runtime/cds/CDSMapTest.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,7 +24,7 @@
 /**
  * @test
  * @bug 8308903
- * @summary Test the contents of -Xlog:cds+map
+ * @summary Test the contents of -Xlog:aot+map
  * @requires vm.cds
  * @library /test/lib
  * @run driver CDSMapTest
@@ -67,7 +67,7 @@ static void dump(ArrayList<String> args, String... more) throws Exception {
         String mapName = logName + ".map";
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-Xlog:cds=debug")
-            .addPrefix("-Xlog:cds+map=debug,cds+map+oops=trace:file=" + mapName + ":none:filesize=0")
+            .addPrefix("-Xlog:aot+map=debug,aot+map+oops=trace:file=" + mapName + ":none:filesize=0")
             .setArchiveName(archiveName)
             .addSuffix(args)
             .addSuffix(more);
diff --git a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
index 92643d648b7..202262a8117 100644
--- a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
+++ b/test/hotspot/jtreg/runtime/cds/DeterministicDump.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
@@ -100,7 +100,7 @@ static String dump(ArrayList<String> args, String... more) throws Exception {
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-Xint") // Override any -Xmixed/-Xcomp flags from jtreg -vmoptions
             .addPrefix("-Xlog:cds=debug,gc=debug")
-            .addPrefix("-Xlog:cds+map*=trace:file=" + mapName + ":none:filesize=0")
+            .addPrefix("-Xlog:aot+map*=trace:file=" + mapName + ":none:filesize=0")
             .setArchiveName(archiveName)
             .addSuffix(args)
             .addSuffix(more);
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStrings.java b/test/hotspot/jtreg/runtime/cds/SharedStrings.java
index 33a041bb298..d6741790ff3 100644
--- a/test/hotspot/jtreg/runtime/cds/SharedStrings.java
+++ b/test/hotspot/jtreg/runtime/cds/SharedStrings.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
@@ -47,7 +47,7 @@ public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockDiagnosticVMOptions",
             "-XX:SharedArchiveFile=./SharedStrings.jsa",
-            "-Xlog:cds,cds+hashtables",
+            "-Xlog:cds,aot+hashtables",
             // Needed for bootclasspath match, for CDS to work with WhiteBox API
             "-Xbootclasspath/a:" + ClassFileInstaller.getJarPath("whitebox.jar"),
             "-Xshare:dump");
diff --git a/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java b/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java
index 66cbfbc8d91..8184f272af7 100644
--- a/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java
+++ b/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.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,7 +49,7 @@ public class SpaceUtilizationCheck {
     // [2] There must be no gap between two consecutive regions.
 
     public static void main(String[] args) throws Exception {
-        test("-Xlog:cds=debug");
+        test("-Xlog:aot=debug,cds=debug");
     }
 
     static void test(String... extra_options) throws Exception {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
index 71f72d6b4e8..b760b288808 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
@@ -283,7 +283,7 @@ static void negativeTests() throws Exception {
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "neg");
-        out.shouldContain("Not a valid archive (hello.aotconfig)");
+        out.shouldContain("Not a valid shared archive file (hello.aotconfig)");
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java
index 0f3caa4c36a..f316e6e3fca 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.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
@@ -36,7 +36,7 @@
 import jdk.test.lib.cds.CDSTestUtils;
 
 public class ExtraSymbols {
-    static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables";
+    static final String CDS_LOGGING = "-Xlog:cds,aot+hashtables";
     public static void main(String[] args) throws Exception {
         String appJar = JarBuilder.getOrCreateHelloJar();
 
@@ -75,8 +75,8 @@ public static void main(String[] args) throws Exception {
 
     static int numOfEntries(OutputAnalyzer output) {
         // Look for this pattern:
-        // [4.661s][info][cds,hashtables] Shared symbol table stats -------- base: 0x0000000800000000
-        // [4.661s][info][cds,hashtables] Number of entries       :     50078
+        // [4.661s][info][aot,hashtables] Shared symbol table stats -------- base: 0x0000000800000000
+        // [4.661s][info][aot,hashtables] Number of entries       :     50078
         String s = output.firstMatch("Shared symbol table stats[^\n]*\n[^\n]*Number of entries       : .*");
         String subs[] = s.split("[:]");
         int numEntries = Integer.parseInt(subs[2].trim());
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LambdaEagerInit.java b/test/hotspot/jtreg/runtime/cds/appcds/LambdaEagerInit.java
index 7ead18910ee..c481da44ede 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LambdaEagerInit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LambdaEagerInit.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
@@ -65,7 +65,7 @@ public static void main(String[] args) throws Exception {
         ".class.load. java.util.stream.Collectors[$][$]Lambda.*/0x.*source:.*java.*util.*stream.*Collectors";
     private static final String lambdaLoadedFromArchive =
         ".class.load. java.util.stream.Collectors[$][$]Lambda.*/0x.*source:.*shared.*objects.*file";
-    private static final String cdsLoadedLambdaProxy = ".cds.*Loaded.*lambda.*proxy";
+    private static final String cdsLoadedLambdaProxy = ".aot.*Loaded.*lambda.*proxy";
     private static final String archiveName = mainClass + ".jsa";
     private static String appJar;
 
@@ -75,7 +75,7 @@ static void createArchiveWithEagerInitializationEnabled() throws Exception {
         // create base archive with the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions opts = (new CDSOptions())
             .addPrefix(testProperty,
-                       "-Xlog:class+load,cds")
+                       "-Xlog:class+load,aot,cds")
             .setArchiveName(archiveName);
         CDSTestUtils.createArchiveAndCheck(opts);
     }
@@ -96,7 +96,7 @@ static void testWithEagerInitializationEnabled() throws Exception {
     static void testWithEagerInitializationDisabled() throws Exception {
         // run with custom base archive without the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions runOpts = (new CDSOptions())
-            .addPrefix("-cp", appJar, "-Xlog:class+load,cds=debug")
+            .addPrefix("-cp", appJar, "-Xlog:class+load,aot=debug,cds=debug")
             .setArchiveName(archiveName)
             .setUseVersion(false)
             .addSuffix(mainClass);
@@ -110,7 +110,7 @@ static void testDefaultArchiveWithEagerInitializationEnabled() throws Exception
         // run with default CDS archive with the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions runOpts = (new CDSOptions())
             .setXShareMode("auto")
-            .addPrefix("-cp", appJar, testProperty,  "-Xlog:class+load,cds=debug")
+            .addPrefix("-cp", appJar, testProperty,  "-Xlog:class+load,aot=debug,cds=debug")
             .setUseSystemArchive(true)
             .setUseVersion(false)
             .addSuffix(mainClass);
@@ -124,7 +124,7 @@ static void testDefaultArchiveWithEagerInitializationDisabled() throws Exception
         // run with default CDS archive without the -Djdk.internal.lambda.disableEagerInitialization=true property
         CDSOptions runOpts = (new CDSOptions())
             .setXShareMode("auto")
-            .addPrefix("-cp", appJar, "-Xlog:class+load,cds=debug")
+            .addPrefix("-cp", appJar, "-Xlog:class+load,aot=debug,cds=debug")
             .setUseSystemArchive(true)
             .setUseVersion(false)
             .addSuffix("-showversion", mainClass);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java
index f92acda4397..accb74025ce 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LambdaWithJavaAgent.java
@@ -72,16 +72,16 @@ public static void main(String[] args) throws Exception {
                        "-XX:+UnlockDiagnosticVMOptions",
                        "-XX:+AllowArchivingWithJavaAgent",
                        useJavaAgent,
-                       "-Xlog:class+load,cds+class=debug,cds")
+                       "-Xlog:class+load,cds+class=debug,aot,cds")
             .setArchiveName(archiveName);
         OutputAnalyzer output = CDSTestUtils.createArchiveAndCheck(opts);
-        output.shouldContain("CDS heap objects cannot be written because class jdk.internal.math.FDBigInteger maybe modified by ClassFileLoadHook")
+        output.shouldContain("heap objects cannot be written because class jdk.internal.math.FDBigInteger maybe modified by ClassFileLoadHook")
               .shouldContain("Skipping jdk/internal/math/FDBigInteger: Unsupported location")
               .shouldMatch(".class.load.*jdk.internal.math.FDBigInteger.*source.*modules");
 
         // run with archive
         CDSOptions runOpts = (new CDSOptions())
-            .addPrefix("-cp", appJar, "-Xlog:class+load=debug,cds=debug,class+path=debug",
+            .addPrefix("-cp", appJar, "-Xlog:class+load=debug,aot=debug,cds=debug,class+path=debug",
                        "-XX:+UnlockDiagnosticVMOptions",
                        "-XX:+AllowArchivingWithJavaAgent",
                        useJavaAgent)
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
index c3c50a106e0..3ff5da98b42 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest.java
@@ -48,7 +48,7 @@ public class VerifierTest implements Opcodes {
     static final String PASS_RESULT = "Hi, how are you?";
     static final String VFY_INFO_MESSAGE =
         "All non-system classes will be verified (-Xverify:remote) during CDS dump time.";
-    static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables";
+    static final String CDS_LOGGING = "-Xlog:cds,aot+hashtables";
 
     enum Testset1Part {
         A, B
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
index fa784162851..2a63a4837c2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddExports.java
@@ -99,21 +99,21 @@ public static void main(String... args) throws Exception {
         test("FMG should be enabled with '--add-exports java.base/jdk.internal.misc=ALL-UNNAMED'",
              SimpleCDSAppTester.of("nonModuleNeedsJdkAddExport")
                  .classpath(nonModuleNeedsJdkAddExportJar)
-                 .addVmArgs("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED", "-Xlog:cds")
+                 .addVmArgs("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED", "-Xlog:aot,cds")
                  .appCommandLine("com.nomodule.needsjdkaddexport.Main"));
 
         test("FMG should be enabled with '--add-exports java.base/jdk.internal.misc=com.needsjdkaddexport'",
              SimpleCDSAppTester.of("moduleNeedsJdkAddExport")
                  .modulepath(modulePath)
                  .addVmArgs("--add-modules", "com.needsjdkaddexport",
-                            "--add-exports", "java.base/jdk.internal.misc=com.needsjdkaddexport", "-Xlog:cds")
+                            "--add-exports", "java.base/jdk.internal.misc=com.needsjdkaddexport", "-Xlog:aot,cds")
                  .appCommandLine("-m", "com.needsjdkaddexport/com.needsjdkaddexport.Main"));
 
         test("FMG should be enabled with '--add-exports com.foos/com.foos.internal=com.needsfoosaddexport'",
              SimpleCDSAppTester.of("moduleNeedsFoosAddExport")
                  .modulepath(modulePath)
                  .addVmArgs("--add-modules", "com.needsfoosaddexport",
-                            "--add-exports", "com.foos/com.foos.internal=com.needsfoosaddexport", "-Xlog:cds")
+                            "--add-exports", "com.foos/com.foos.internal=com.needsfoosaddexport", "-Xlog:aot,cds")
                  .appCommandLine("-m", "com.needsfoosaddexport/com.needsfoosaddexport.Main"));
 
         test("FMG should be enabled with multiple --add-exports",
@@ -124,7 +124,7 @@ public static void main(String... args) throws Exception {
                             "--add-exports", "com.foos/com.foos.internal=ALL-UNNAMED",
                             "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
                             "--add-exports", "java.base/jdk.internal.misc=com.foos",
-                            "-Xlog:cds")
+                            "-Xlog:aot,cds")
                  .appCommandLine("-m", "com.needsfoosaddexport/com.needsfoosaddexport.Main"));
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
index 75e9da19464..c1dbc602755 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AddReads.java
@@ -133,13 +133,13 @@ public String[] vmArgs(RunMode runMode) {
                 return new String[] {
                     "--add-modules", SUB_MODULE,
                     "--add-reads", "com.norequires=" + SUB_MODULE,
-                    "-Xlog:class+load,cds,class+path=info",
+                    "-Xlog:class+load,aot,cds,class+path=info",
                 };
             } else {
                 return new String[] {
                     "--add-modules", SUB_MODULE,
                     "--add-reads", "com.norequires=ALL-UNNAMED",
-                    "-Xlog:class+load,cds,class+path=info",
+                    "-Xlog:class+load,aot,cds,class+path=info",
                 };
             }
         }
@@ -184,7 +184,7 @@ public static void main(String... args) throws Exception {
                  .modulepath(moduleDir.toString())
                  .addVmArgs("--add-modules", SUB_MODULE,
                             "--add-reads", "com.norequires=" + SUB_MODULE,
-                            "-Xlog:class+load,cds,class+path=info")
+                            "-Xlog:class+load,aot,cds,class+path=info")
                  .appCommandLine("-m", MAIN_MODULE));
 
         test("FMG should be enabled with '--add-reads com.norequires=org.astro'",
@@ -193,7 +193,7 @@ public static void main(String... args) throws Exception {
                  .modulepath(moduleDir.toString())
                  .addVmArgs("--add-modules", SUB_MODULE,
                             "--add-reads", "com.norequires=" + SUB_MODULE,
-                            "-Xlog:class+load,cds,class+path=info")
+                            "-Xlog:class+load,aot,cds,class+path=info")
                  .appCommandLine("-m", MAIN_MODULE));
 
         printComment("FMG should be enabled with '--add-reads com.norequires=ALL-UNNAMED");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
index bc07991eeb2..6bef9e12e95 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
@@ -75,7 +75,6 @@ public String[] vmArgs(RunMode runMode) {
                 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[] {};
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
index ac6d1188672..e7360a6877c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
@@ -89,7 +89,6 @@ public String[] vmArgs(RunMode runMode) {
                 return new String[] {
                     "-Xlog:gc,cds+class=debug",
                     "-XX:AOTInitTestClass=" + mainClass,
-                    "-Xlog:cds+map,cds+map+oops=trace:file=cds.oops.txt:none:filesize=0",
                 };
             } else {
                 return new String[] {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
index 0c9c2514e40..685fb4bf597 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/LambdasInTwoArchives.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
@@ -90,14 +90,15 @@ static void test() throws Exception {
         String[] launchArgs = {
                 "-Xshare:off",
                 "-XX:DumpLoadedClassList=" + classListFileName,
+                "-Xlog:aot",
+                "-Xlog:aot+lambda",
                 "-Xlog:cds",
-                "-Xlog:cds+lambda",
                 "-cp", appJar, mainClass};
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(launchArgs);
         OutputAnalyzer oa = TestCommon.executeAndLog(pb, "lambda-classes");
         oa.shouldHaveExitValue(0);
 
-        String logOptions = "-Xlog:cds=debug,class+load,cds+class=debug";
+        String logOptions = "-Xlog:aot=debug,cds=debug,class+load,cds+class=debug";
         String baseArchiveName = CDSTestUtils.getOutputFileName("lambda-base.jsa");
         // Static dump based on the class list.
         dumpBaseArchive(baseArchiveName,
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UsedAllArchivedLambdas.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UsedAllArchivedLambdas.java
index 46efaf4893d..737a79348e6 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UsedAllArchivedLambdas.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/UsedAllArchivedLambdas.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
@@ -63,6 +63,7 @@ static void test() throws Exception {
             "-XX:+UnlockDiagnosticVMOptions",
             "-XX:+WhiteBoxAPI",
             use_whitebox_jar,
+            "-Xlog:aot=debug",
             "-Xlog:cds=debug",
             "-cp", appJar, mainClass, "run")
             .assertNormalExit(output -> {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java
index b0a2551f29e..5d9ef9ef760 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/ExceptionDuringDumpAtObjectsInitPhase.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
@@ -69,7 +69,7 @@ public static void main(String[] args) throws Throwable {
                         "-Dtest.with.exception=true",
                         gcLog).shouldNotHaveExitValue(0)
                               .shouldContain("Preload Warning: Cannot find jdk/internal/math/FDBigInteger")
-                              .shouldContain("Unexpected exception, use -Xlog:cds,exceptions=trace for detail");
+                              .shouldContain("Unexpected exception, use -Xlog:aot,cds,exceptions=trace for detail");
 
         // 2. Test with OOM
         System.out.println("2. OOM during dump");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
index 489b47a1d93..426bc1f53fe 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.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
@@ -63,7 +63,7 @@ public static void main(String[] args) throws Exception {
         String appClasses[] = {"Hello"};
         for (int i = 0; i < jigsawOptions.length; i++) {
             OutputAnalyzer output;
-            output = TestCommon.dump(appJar, appClasses, "-Xlog:cds,cds+hashtables",
+            output = TestCommon.dump(appJar, appClasses, "-Xlog:cds,aot+hashtables",
                                      jigsawOptions[i], optionValues[i]);
             output.shouldContain("Cannot use the following option " +
                 "when dumping the shared archive: " + jigsawOptions[i])
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
index d1022fc7956..10e17f2072f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java
@@ -45,7 +45,7 @@ public static void main(String[] args) throws Exception {
         final String multiModules = ",,jdk.jconsole,jdk.compiler,,";
         final String allSystem = "ALL-SYSTEM";
         final String allModulePath = "ALL-MODULE-PATH";
-        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,aot+module=debug,aot+heap=info,cds=debug,module=trace";
         final String versionPattern = "java.[0-9][0-9].*";
         final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled";
         final String warningIncubator = "WARNING: Using incubator modules: jdk.incubator.vector";
@@ -70,8 +70,8 @@ public static void main(String[] args) throws Exception {
         oa.shouldHaveExitValue(0)
           // version of the jdk.httpserver module, e.g. java 22-ea
           .shouldMatch(versionPattern)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.jconsole")
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.jconsole")
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.httpserver");
 
         // different --add-modules specified during runtime
         oa = TestCommon.execCommon(
@@ -161,7 +161,7 @@ public static void main(String[] args) throws Exception {
                 "-version");
             try {
                 oa.shouldHaveExitValue(0)
-                  .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.internal.vm.ci");
+                  .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.internal.vm.ci");
             } catch (RuntimeException re) {
                 // JVMCI compile may not be available
                 oa.shouldHaveExitValue(1)
@@ -188,8 +188,8 @@ public static void main(String[] args) throws Exception {
             "-m", moduleOption,
             "-version");
         oa.shouldHaveExitValue(0)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.compiler")
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.jconsole");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.compiler")
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.jconsole");
 
         // dump an archive with ALL-SYSTEM in -add-modules
         archiveName = TestCommon.getNewArchiveName("muti-modules");
@@ -232,6 +232,6 @@ public static void main(String[] args) throws Exception {
             "-m", moduleOption,
             "-version");
         oa.shouldHaveExitValue(0)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.httpserver");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
index ec41c4ed28b..636169ef3cb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/addopens/AddopensOption.java
@@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception {
         final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
         final String addOpensNio = "java.base/java.nio=ALL-UNNAMED";
         final String addOpensTimeFormat = "java.base/java.time.format=ALL-UNNAMED";
-        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,aot+module=debug,aot+heap=info,cds=debug,module=trace";
         final String versionPattern = "java.[0-9][0-9].*";
         final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled";
         final String warningIncubator = "WARNING: Using incubator modules: jdk.incubator.vector";
@@ -66,7 +66,7 @@ public static void main(String[] args) throws Exception {
         oa.shouldHaveExitValue(0)
           // version of the jdk.httpserver module, e.g. java 22-ea
           .shouldMatch(versionPattern)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.httpserver");
 
         // different --add-opens specified during runtime
         oa = TestCommon.execCommon(
@@ -151,6 +151,6 @@ public static void main(String[] args) throws Exception {
             "-m", moduleOption,
             "-version");
         oa.shouldHaveExitValue(0)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.httpserver");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java
index 861efbf5690..3001b8dd2ca 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java
@@ -37,7 +37,7 @@ public class ModuleOption {
     public static void main(String[] args) throws Exception {
         final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main";
         final String incubatorModule = "jdk.incubator.vector";
-        final String loggingOption = "-Xlog:aot=debug,cds+module=debug,aot+heap=info,cds=debug,module=trace";
+        final String loggingOption = "-Xlog:aot=debug,aot+module=debug,aot+heap=info,cds=debug,module=trace";
         // Pattern of a module version string.
         // e.g. JDK 22:     "java 22"
         //      JDK 22.0.1: "java 22.0.1"
@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {
         oa.shouldHaveExitValue(0)
           // version of the jdk.httpserver module, e.g. java 22-ea
           .shouldMatch(versionPattern)
-          .shouldMatch("cds,module.*Restored from archive: entry.0x.*name jdk.httpserver");
+          .shouldMatch("aot,module.*Restored from archive: entry.0x.*name jdk.httpserver");
 
         // different module specified during runtime
         oa = TestCommon.execCommon(
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.java
index d015498ed04..e187f408fb4 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedLambdas.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
@@ -62,7 +62,8 @@ public static void main(String[] args) throws Exception {
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-XX:ExtraSharedClassListFile=" + classList,
                        "-XX:+AOTClassLinking",
-                       "-Xlog:cds+resolve=trace",
+                       "-Xlog:aot+resolve=trace",
+                       "-Xlog:aot+class=debug",
                        "-Xlog:cds+class=debug",
                        "-cp", appJar);
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
index 886e0424c9a..e262c55beea 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.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
@@ -58,7 +58,7 @@ public static void main(String[] args) throws Exception {
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-XX:ExtraSharedClassListFile=" + classList,
                        "-XX:+AOTClassLinking",
-                       "-Xlog:cds+resolve=trace",
+                       "-Xlog:aot+resolve=trace",
                        "-Xlog:cds+class=debug",
                        "-cp", appJar);
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java
index 8fa86c3f56e..2610dac16c0 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedConstants.java
@@ -81,7 +81,8 @@ static void test(String[] args, boolean testMode) throws Exception {
 
         SimpleCDSAppTester.of("ResolvedConstantsApp" + (aotClassLinking ? "1" : "0"))
             .addVmArgs(aotClassLinking ? "-XX:+AOTClassLinking" : "-XX:-AOTClassLinking",
-                       "-Xlog:cds+resolve=trace",
+                       "-Xlog:aot+resolve=trace",
+                       "-Xlog:aot+class=debug",
                        "-Xlog:cds+class=debug")
             .classpath(appJar)
             .appCommandLine(mainClass)
@@ -183,14 +184,14 @@ static void checkAssemblyOutput(String args[], OutputAnalyzer out) {
     }
 
     static String ALWAYS(String s) {
-        return "cds,resolve.*archived " + s;
+        return ",resolve.*archived " + s;
     }
 
     static String AOTLINK_ONLY(String s) {
         if (aotClassLinking) {
             return ALWAYS(s);
         } else {
-            return "cds,resolve.*reverted " + s;
+            return ",resolve.*reverted " + s;
         }
     }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedPutField.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedPutField.java
index 250ff7d7d6f..f39e64a828f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedPutField.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/ResolvedPutField.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
@@ -52,9 +52,9 @@ public static void main(String[] args) throws Exception {
         CDSOptions opts = (new CDSOptions())
             .addPrefix("-XX:ExtraSharedClassListFile=" + classList,
                        "-cp", appJar,
-                       "-Xlog:cds+resolve=trace");
+                       "-Xlog:aot+resolve=trace");
         CDSTestUtils.createArchiveAndCheck(opts)
-            .shouldMatch("cds,resolve.*Failed to resolve putfield .*ResolvedPutFieldHelper -> ResolvedPutFieldHelper.x:I");
+            .shouldMatch(",resolve.*Failed to resolve putfield .*ResolvedPutFieldHelper -> ResolvedPutFieldHelper.x:I");
     }
 }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
index 045f42edf5e..0668ebfa300 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.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
@@ -40,7 +40,7 @@ public static void test(String[] args) throws Exception {
         SharedStringsUtils.buildJarAndWhiteBox("HelloStringGC");
 
         SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("HelloStringGC"),
-            "SharedStringsBasic.txt", "-Xlog:cds,cds+hashtables");
+            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
 
         SharedStringsUtils.runWithArchiveAndWhiteBox("HelloStringGC",
             "-XX:+UnlockDiagnosticVMOptions", "-XX:+VerifyBeforeGC");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
index e04abbfcd41..18bcf6da79c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.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.
  * 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 static void main(String[] args) throws Exception {
         SharedStringsUtils.buildJar("HelloString");
 
         SharedStringsUtils.dump(TestCommon.list("HelloString"),
-            "SharedStringsBasic.txt", "-Xlog:cds,cds+hashtables");
+            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
 
         SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseG1GC");
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
index 546520c042f..527c0043a6f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java
@@ -157,7 +157,7 @@ static void testDump(int testCaseNr, String collectorOption, String extraOption,
                 "-XX:+UseCompressedOops",
                 collectorOption,
                 "-XX:SharedArchiveConfigFile=" + TestCommon.getSourceFile("SharedStringsBasic.txt"),
-                "-Xlog:cds,cds+hashtables",
+                "-Xlog:cds,aot+hashtables",
                 extraOption));
 
         if (expectedWarning != null) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
index 6c12e1c4d71..615aa1c7e7c 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.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
@@ -45,7 +45,7 @@ public static void test(String[] args) throws Exception {
         SharedStringsUtils.buildJarAndWhiteBox("InternStringTest");
 
         SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("InternStringTest"),
-            "ExtraSharedInput.txt", "-Xlog:cds,cds+hashtables");
+            "ExtraSharedInput.txt", "-Xlog:cds,aot+hashtables");
 
         String[] extraMatches = new String[]   {
             InternStringTest.passed_output1,
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
index 8e72e585195..f431dd6e807 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.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.
  * 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 @@
  * @run driver LargePages
  */
 public class LargePages {
-    static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables";
+    static final String CDS_LOGGING = "-Xlog:cds,aot+hashtables";
 
     public static void main(String[] args) throws Exception {
         SharedStringsUtils.run(args, LargePages::test);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
index 294b01c4c91..f746e2c0e73 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasic.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.
  * 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 static void test(String[] args) throws Exception {
             .addPrefix(vmOptionsPrefix,
             "-cp", appJar,
             "-XX:SharedArchiveConfigFile=" + sharedArchiveConfigFile,
-            "-Xlog:cds,cds+hashtables")
+            "-Xlog:cds,aot+hashtables")
             .setArchiveName("./SharedStringsBasic.jsa");
         CDSTestUtils.createArchiveAndCheck(opts)
             .shouldContain("Shared string table stats");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
index ae4c137a876..dacf74ebe3a 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.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
@@ -42,7 +42,7 @@ public static void test(String[] args) throws Exception {
         SharedStringsUtils.buildJarAndWhiteBox("HelloStringPlus");
 
         SharedStringsUtils.dumpWithWhiteBox( TestCommon.list("HelloStringPlus"),
-            "SharedStringsBasic.txt", "-Xlog:cds,cds+hashtables");
+            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
 
         SharedStringsUtils.runWithArchiveAndWhiteBox("HelloStringPlus");
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
index f941cf3af07..5871305139e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.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
@@ -71,6 +71,7 @@ public static void test(String[] args) throws Exception {
         OutputAnalyzer dumpOutput = TestCommon.dump(appJar, TestCommon.list("HelloString"),
             TestCommon.concat(vmOptionsPrefix,
                 "-XX:SharedArchiveConfigFile=" + sharedArchiveConfigFile,
+                "-Xlog:aot",
                 "-Xlog:gc+region+cds",
                 "-Xlog:gc+region=trace"));
         TestCommon.checkDump(dumpOutput);
@@ -78,7 +79,7 @@ public static void test(String[] args) throws Exception {
         dumpOutput.shouldContain("string table array (secondary)");
 
         OutputAnalyzer execOutput = TestCommon.exec(appJar,
-            TestCommon.concat(vmOptionsPrefix, "-Xlog:cds", "HelloString"));
+            TestCommon.concat(vmOptionsPrefix, "-Xlog:aot,cds", "HelloString"));
         TestCommon.checkExec(execOutput);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
index f2a3cb45e78..95ea1cf9bb0 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.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
@@ -45,7 +45,7 @@ public static void test(String[] args) throws Exception {
         SharedStringsUtils.buildJarAndWhiteBox("SharedStringsWb");
 
         SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("SharedStringsWb"),
-            "SharedStringsBasic.txt", "-Xlog:cds,cds+hashtables");
+            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
 
         SharedStringsUtils.runWithArchiveAndWhiteBox("SharedStringsWb");
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
index 5688d8145b3..219943d28de 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.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.
  * 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 @@ public static void test(String[] args) throws Exception {
                        "-XX:+UseG1GC", "-XX:MaxRAMPercentage=12.5",
                        "-cp", ".",
                        "-XX:SharedBaseAddress=0",
-                       "-showversion", "-Xlog:cds,cds+hashtables")
+                       "-showversion", "-Xlog:cds,aot+hashtables")
             .setArchiveName("./SysDictCrash.jsa");
         OutputAnalyzer output = CDSTestUtils.createArchive(opts);
         try {
diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
index a913f2f9fa2..1cc89737633 100644
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.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
@@ -255,7 +255,7 @@ public static OutputAnalyzer createArchive(CDSOptions opts)
         for (String p : opts.prefix) cmd.add(p);
 
         cmd.add("-Xshare:dump");
-        cmd.add("-Xlog:cds,cds+hashtables");
+        cmd.add("-Xlog:cds,aot+hashtables");
         if (opts.archiveName == null)
             opts.archiveName = getDefaultArchiveName();
         cmd.add("-XX:SharedArchiveFile=" + opts.archiveName);

From e961b13cd68bc352b86af17c7e53df8537519beb Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 20 May 2025 06:04:33 +0000
Subject: [PATCH 534/901] 8356165: System.in in jshell replace supplementary
 characters with ??

Reviewed-by: cstein, asotona
---
 .../jshell/tool/ConsoleIOContext.java         | 17 ++++-
 test/langtools/jdk/jshell/InputUITest.java    | 70 +++++++++++++++++++
 test/langtools/jdk/jshell/UITesting.java      |  9 ++-
 3 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/InputUITest.java

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index c92e6e11f1f..b2edb8851c0 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -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
@@ -977,7 +977,20 @@ public void perform(LineReaderImpl in) throws IOException {
     public synchronized int readUserInput() throws IOException {
         if (pendingBytes == null || pendingBytes.length <= pendingBytesPointer) {
             char userChar = readUserInputChar();
-            pendingBytes = String.valueOf(userChar).getBytes();
+            StringBuilder dataToConvert = new StringBuilder();
+            dataToConvert.append(userChar);
+            if (Character.isHighSurrogate(userChar)) {
+                //surrogates cannot be converted independently,
+                //read the low surrogate and append it to dataToConvert:
+                char lowSurrogate = readUserInputChar();
+                if (Character.isLowSurrogate(lowSurrogate)) {
+                    dataToConvert.append(lowSurrogate);
+                } else {
+                    //if not the low surrogate, rollback the reading of the character:
+                    pendingLinePointer--;
+                }
+            }
+            pendingBytes = dataToConvert.toString().getBytes();
             pendingBytesPointer = 0;
         }
         return pendingBytes[pendingBytesPointer++];
diff --git a/test/langtools/jdk/jshell/InputUITest.java b/test/langtools/jdk/jshell/InputUITest.java
new file mode 100644
index 00000000000..ef4e7fabb9d
--- /dev/null
+++ b/test/langtools/jdk/jshell/InputUITest.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 8356165
+ * @summary Check user input works properly
+ * @modules
+ *     jdk.compiler/com.sun.tools.javac.api
+ *     jdk.compiler/com.sun.tools.javac.main
+ *     jdk.jshell/jdk.internal.jshell.tool:open
+ *     jdk.jshell/jdk.internal.jshell.tool.resources:open
+ *     jdk.jshell/jdk.jshell:open
+ * @library /tools/lib
+ * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
+ * @build Compiler UITesting
+ * @compile InputUITest.java
+ * @run testng InputUITest
+ */
+
+import java.util.function.Function;
+import org.testng.annotations.Test;
+
+@Test
+public class InputUITest extends UITesting {
+
+    static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    static final String LINE_SEPARATOR_ESCAPED = LINE_SEPARATOR.replace("\n", "\\n")
+                                                               .replace("\r", "\\r");
+
+    public InputUITest() {
+        super(true);
+    }
+
+    public void testUserInputWithSurrogates() throws Exception {
+        Function<Integer, String> genSnippet =
+                realCharsToRead -> "new String(System.in.readNBytes(" +
+                                   (realCharsToRead + LINE_SEPARATOR.length()) +
+                                   "))\n";
+        doRunTest((inputSink, out) -> {
+            inputSink.write(genSnippet.apply(4) + "\uD83D\uDE03\n");
+            waitOutput(out, patternQuote("\"\uD83D\uDE03" + LINE_SEPARATOR_ESCAPED + "\""));
+            inputSink.write(genSnippet.apply(1) + "\uD83D\n");
+            waitOutput(out, patternQuote("\"?" + LINE_SEPARATOR_ESCAPED + "\""));
+            inputSink.write(genSnippet.apply(1) + "\uDE03\n");
+            waitOutput(out, patternQuote("\"?" + LINE_SEPARATOR_ESCAPED + "\""));
+        }, false);
+    }
+
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/jshell/UITesting.java b/test/langtools/jdk/jshell/UITesting.java
index 473ba36c5ae..70a1b12a943 100644
--- a/test/langtools/jdk/jshell/UITesting.java
+++ b/test/langtools/jdk/jshell/UITesting.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
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -62,6 +63,10 @@ public UITesting(boolean laxLineEndings) {
     }
 
     protected void doRunTest(Test test) throws Exception {
+        doRunTest(test, true);
+    }
+
+    protected void doRunTest(Test test, boolean setUserInput) throws Exception {
         // turn on logging of launch failures
         Logger.getLogger("jdk.jshell.execution").setLevel(Level.ALL);
 
@@ -87,7 +92,7 @@ protected void doRunTest(Test test) throws Exception {
         Thread runner = new Thread(() -> {
             try {
                 JavaShellToolBuilder.builder()
-                        .in(input, input)
+                        .in(input, setUserInput ? input : null)
                         .out(outS)
                         .err(outS)
                         .promptCapture(true)

From f8fc7eeb24156f9c38ddd478b026074f522e39c4 Mon Sep 17 00:00:00 2001
From: Arno Zeller <azeller@openjdk.org>
Date: Tue, 20 May 2025 10:19:22 +0000
Subject: [PATCH 535/901] 8357052: java/io/File/GetXSpace.java prints wrong
 values in exception

Reviewed-by: bpb
---
 test/jdk/java/io/File/GetXSpace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
index 9142676cedb..246835d03db 100644
--- a/test/jdk/java/io/File/GetXSpace.java
+++ b/test/jdk/java/io/File/GetXSpace.java
@@ -180,7 +180,7 @@ private static void compare(Space s) {
         if (fs > ts)
             throw new RuntimeException(f + " free space " + fs + " > total space " + ts);
         if (us > fs)
-            throw new RuntimeException(f + " usable space " + fs + " > free space " + ts);
+            throw new RuntimeException(f + " usable space " + us + " > free space " + fs);
 
         out.format("%s (%d):%n", s.name(), s.size());
         String fmt = "  %-4s total = %12d free = %12d usable = %12d%n";

From 0db5511ce6b0a5209af6f9a35ac993292b6b0b19 Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Tue, 20 May 2025 10:20:59 +0000
Subject: [PATCH 536/901] 8354969: Add strdup function for ResourceArea

Reviewed-by: dholmes, iklam
---
 src/hotspot/os/windows/perfMemory_windows.cpp |  6 ++----
 src/hotspot/share/classfile/classLoader.cpp   |  3 +--
 src/hotspot/share/classfile/modules.cpp       |  3 +--
 src/hotspot/share/memory/arena.hpp            |  7 +++++++
 src/hotspot/share/memory/resourceArea.hpp     |  8 ++++++++
 src/hotspot/share/prims/jvmtiEnvBase.cpp      |  3 +--
 src/hotspot/share/services/heapDumper.cpp     |  3 +--
 test/hotspot/gtest/memory/test_arena.cpp      | 10 ++++++++++
 8 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index 322b844f413..273814f6572 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -1606,10 +1606,8 @@ static void open_file_mapping(int vmid, char** addrp, size_t* sizep, TRAPS) {
   // using resource arrays for these names prevents the leaks
   // that would otherwise occur.
   //
-  char* rfilename = NEW_RESOURCE_ARRAY(char, strlen(filename) + 1);
-  char* robjectname = NEW_RESOURCE_ARRAY(char, strlen(objectname) + 1);
-  strcpy(rfilename, filename);
-  strcpy(robjectname, objectname);
+  char* rfilename = ResourceArea::strdup(THREAD, filename);
+  char* robjectname = ResourceArea::strdup(THREAD, objectname);
 
   // free the c heap resources that are no longer needed
   FREE_C_HEAP_ARRAY(char, luser);
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index cf7bca6a17a..a3fa2feb792 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1507,8 +1507,7 @@ char* ClassLoader::get_canonical_path(const char* orig, Thread* thread) {
   char* canonical_path = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, JVM_MAXPATHLEN);
   ResourceMark rm(thread);
   // os::native_path writes into orig_copy
-  char* orig_copy = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, strlen(orig)+1);
-  strcpy(orig_copy, orig);
+  char* orig_copy = ResourceArea::strdup(thread, orig);
   if ((CanonicalizeEntry)(os::native_path(orig_copy), canonical_path, JVM_MAXPATHLEN) < 0) {
     return nullptr;
   }
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 874dc013217..4b146abc06b 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -641,8 +641,7 @@ const char* Modules::ArchivedProperty::get_numbered_property_as_sorted_string()
     if (prop_value == nullptr) {
       break;
     }
-    char* p = resource_allocate_bytes(strlen(prop_value) + 1);
-    strcpy(p, prop_value);
+    char* p = ResourceArea::strdup(prop_value);
     while (*p == ',') p++; // skip leading commas
     while (*p) {
       char* next = strchr(p, ',');
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index e79e57bd620..7a17873de93 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -216,6 +216,13 @@ class Arena : public CHeapObjBase {
   MemTag get_mem_tag() const { return _mem_tag; }
   Tag get_tag() const { return _tag; }
 
+  char* strdup(const char* s) {
+    const size_t sz = strlen(s) + 1;
+    char* ptr = (char*)Amalloc(sz);
+    memcpy(ptr, s, sz);
+    return ptr;
+  }
+
 private:
   // Reset this Arena to empty, access will trigger grow if necessary
   void reset(void) {
diff --git a/src/hotspot/share/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp
index 557a3c0a24e..e95f228914f 100644
--- a/src/hotspot/share/memory/resourceArea.hpp
+++ b/src/hotspot/share/memory/resourceArea.hpp
@@ -143,6 +143,14 @@ class ResourceArea: public Arena {
       assert(_max == state._max,     "Sanity check: idempotence");
     }
   }
+
+  static char* strdup(const char* src) {
+    return static_cast<Arena*>(Thread::current()->resource_area())->strdup(src);
+  }
+
+  static char* strdup(Thread* thread, const char* src) {
+    return static_cast<Arena*>(thread->resource_area())->strdup(src);
+  }
 };
 
 
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 3b6602f2420..bbd4f7e1154 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -468,8 +468,7 @@ JvmtiEnvBase::get_all_native_method_prefixes(int* count_ptr) {
       // retrieve a prefix and so that it is safe against asynchronous changes
       // copy it into the resource area
       char* prefix = prefixes[j];
-      char* prefix_copy = NEW_RESOURCE_ARRAY(char, strlen(prefix)+1);
-      strcpy(prefix_copy, prefix);
+      char* prefix_copy = ResourceArea::strdup(prefix);
       prefix_array->at_put_grow(total_count++, prefix_copy);
     }
   }
diff --git a/src/hotspot/share/services/heapDumper.cpp b/src/hotspot/share/services/heapDumper.cpp
index 7c91bb000aa..731a26f7cf1 100644
--- a/src/hotspot/share/services/heapDumper.cpp
+++ b/src/hotspot/share/services/heapDumper.cpp
@@ -2709,8 +2709,7 @@ HeapDumper::~HeapDumper() {
 // returns the error string (resource allocated), or null
 char* HeapDumper::error_as_C_string() const {
   if (error() != nullptr) {
-    char* str = NEW_RESOURCE_ARRAY(char, strlen(error())+1);
-    strcpy(str, error());
+    char* str = ResourceArea::strdup(error());
     return str;
   } else {
     return nullptr;
diff --git a/test/hotspot/gtest/memory/test_arena.cpp b/test/hotspot/gtest/memory/test_arena.cpp
index a07c3adac6b..9773aa2d027 100644
--- a/test/hotspot/gtest/memory/test_arena.cpp
+++ b/test/hotspot/gtest/memory/test_arena.cpp
@@ -381,3 +381,13 @@ TEST_VM(Arena, different_chunk_sizes) {
     Arena ar7(mtTest, Arena::Tag::tag_other, random_arena_chunk_size());
   }
 }
+
+TEST_VM(Arena, string_duplicate)
+{
+  char testString[] = "this is a test string";
+  Arena ar(mtTest);
+  auto copy = ar.strdup(&testString[0]);
+  int result = strcmp(testString, copy);
+  ASSERT_TRUE(0 == result);
+  ASSERT_NE(copy, &testString[0]);
+}

From ab985a7c5d313304e6d601571885dcb871967259 Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Tue, 20 May 2025 10:44:34 +0000
Subject: [PATCH 537/901] 8341544: Restore fence() in Mutex

Reviewed-by: eosterlund, dholmes
---
 src/hotspot/share/runtime/mutex.cpp |  3 +++
 src/hotspot/share/runtime/mutex.hpp | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/hotspot/share/runtime/mutex.cpp b/src/hotspot/share/runtime/mutex.cpp
index 459fee5a411..c455b5f36a2 100644
--- a/src/hotspot/share/runtime/mutex.cpp
+++ b/src/hotspot/share/runtime/mutex.cpp
@@ -119,6 +119,7 @@ void Mutex::lock(Thread* self) {
   check_safepoint_state(self);
   check_rank(self);
 
+  OrderAccess::fence();
   if (!_lock.try_lock()) {
     // The lock is contended, use contended slow-path function to lock
     lock_contended(self);
@@ -144,6 +145,7 @@ void Mutex::lock_without_safepoint_check(Thread * self) {
   check_no_safepoint_state(self);
   check_rank(self);
 
+  OrderAccess::fence();
   _lock.lock();
   assert_owner(nullptr);
   set_owner(self);
@@ -170,6 +172,7 @@ bool Mutex::try_lock_inner(bool do_rank_checks) {
   // safepoint state, but can check blocking state.
   check_block_state(self);
 
+  OrderAccess::fence();
   if (_lock.try_lock()) {
     assert_owner(nullptr);
     set_owner(self);
diff --git a/src/hotspot/share/runtime/mutex.hpp b/src/hotspot/share/runtime/mutex.hpp
index 5ed73507150..c0688c573af 100644
--- a/src/hotspot/share/runtime/mutex.hpp
+++ b/src/hotspot/share/runtime/mutex.hpp
@@ -49,6 +49,16 @@
 // A thread is not allowed to safepoint while holding a mutex whose rank
 // is nosafepoint or lower.
 
+// The Mutex class used to explicitly guarantee fence(); lock(); acquire(); semantics with
+// a hand crafted implementation. That may or may not be a desirable contract for a Mutex,
+// but is nevertheless something that older HotSpot code may or may not rely on for correctness.
+// Newer code is encouraged not to rely more on this feature, but it is not generally safe to
+// remove the fences, until all usages of Mutex have been evaluated on a case-by-case basis, whether
+// they actually rely on this stronger contract, or not.
+
+// Having a fence does not have any significant impact on peformance, as this is an internal VM
+// mutex and is generally not in hot code paths.
+
 class Mutex : public CHeapObj<mtSynchronizer> {
 
   friend class VMStructs;

From 1a97eb429b520b7c4e625b97553c954d065c00cb Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Tue, 20 May 2025 12:06:35 +0000
Subject: [PATCH 538/901] 8355515: Clarify the purpose of forcePass() and
 forceFail() methods

Reviewed-by: aivanov, kizune
---
 .../awt/regtesthelpers/PassFailJFrame.java    | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
index 0c3748bf832..c0a483056df 100644
--- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
+++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
@@ -150,6 +150,17 @@
  * Before returning from {@code awaitAndCheck}, the framework disposes of
  * all the windows and frames.
  *
+ * <p id="forcePassAndFail">
+ * For semi-automatic tests, use {@code forcePass} or
+ * {@code forceFail} methods to forcibly pass or fail the test
+ * when it's determined that the required conditions are already met
+ * or cannot be met correspondingly.
+ * These methods release {@code awaitAndCheck}, and
+ * the test will complete successfully or fail.
+ * <p>
+ * Refer to examples of using these methods in the description of the
+ * {@link #forcePass() forcePass} and {@link #forceFail() forceFail} methods.
+ *
  * <h2 id="sampleManualTest">Sample Manual Test</h2>
  * A simple test would look like this:
  * {@snippet id='sampleManualTestCode' lang='java':
@@ -1310,14 +1321,34 @@ public static void forcePass() {
     }
 
     /**
-     *  Forcibly fail the test.
+     * Forcibly fail the test.
+     * <p>
+     * Use this method in semi-automatic tests when
+     * it is determined that the conditions for passing the test cannot be met.
+     * <p>
+     * <strong>Do not use</strong> this method in cases where a resource is unavailable or a
+     * feature isn't supported, throw {@code jtreg.SkippedException} instead.
+     *
+     * <p>A sample usage can be found in
+     * <a href="https://github.com/openjdk/jdk/blob/0844745e7bd954a96441365f8010741ec1c29dbf/test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java#L180">{@code
+     * HorizScrollers.java}</a>
      */
     public static void forceFail() {
         forceFail("forceFail called");
     }
 
     /**
-     *  Forcibly fail the test and provide a reason.
+     * Forcibly fail the test and provide a reason.
+     * <p>
+     * Use this method in semi-automatic tests when
+     * it is determined that the conditions for passing the test cannot be met.
+     * <p>
+     * <strong>Do not use</strong> this method in cases where a resource is unavailable or a
+     * feature isn't supported, throw {@code jtreg.SkippedException} instead.
+     *
+     * <p>A sample usage can be found in
+     * <a href="https://github.com/openjdk/jdk/blob/7283c8b075aa289dbb9cb80f6937b3349c8d4769/test/jdk/java/awt/FileDialog/SaveFileNameOverrideTest.java#L86">{@code
+     * SaveFileNameOverrideTest.java}</a>
      *
      * @param reason the reason why the test is failed
      */

From e6750a5bb0580733820a0885d40704e050baf97d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 20 May 2025 13:15:43 +0000
Subject: [PATCH 539/901] 8357218: G1: Remove loop in
 G1CollectedHeap::try_collect_fullgc

Reviewed-by: kbarrett, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 30 ++++-----------------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp |  3 ---
 src/hotspot/share/gc/g1/g1VMOperations.cpp  |  4 +--
 src/hotspot/share/gc/g1/g1VMOperations.hpp  |  7 ++---
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 169384c3a37..3c9eaf83cad 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1860,30 +1860,6 @@ bool G1CollectedHeap::try_collect_concurrently(GCCause::Cause cause,
   }
 }
 
-bool G1CollectedHeap::try_collect_fullgc(GCCause::Cause cause,
-                                         const G1GCCounters& counters_before) {
-  assert_heap_not_locked();
-
-  while(true) {
-    VM_G1CollectFull op(counters_before.total_collections(),
-                        counters_before.total_full_collections(),
-                        cause);
-    VMThread::execute(&op);
-
-    // Request is trivially finished.
-    if (!GCCause::is_explicit_full_gc(cause) || op.gc_succeeded()) {
-      return op.gc_succeeded();
-    }
-
-    {
-      MutexLocker ml(Heap_lock);
-      if (counters_before.total_full_collections() != total_full_collections()) {
-        return true;
-      }
-    }
-  }
-}
-
 bool G1CollectedHeap::try_collect(GCCause::Cause cause,
                                   const G1GCCounters& counters_before) {
   if (should_do_concurrent_full_gc(cause)) {
@@ -1902,7 +1878,11 @@ bool G1CollectedHeap::try_collect(GCCause::Cause cause,
     return op.gc_succeeded();
   } else {
     // Schedule a Full GC.
-    return try_collect_fullgc(cause, counters_before);
+    VM_G1CollectFull op(counters_before.total_collections(),
+                        counters_before.total_full_collections(),
+                        cause);
+    VMThread::execute(&op);
+    return op.gc_succeeded();
   }
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 92e08e6fc61..0d5eec940c1 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -280,9 +280,6 @@ class G1CollectedHeap : public CollectedHeap {
                                 uint gc_counter,
                                 uint old_marking_started_before);
 
-  bool try_collect_fullgc(GCCause::Cause cause,
-                          const G1GCCounters& counters_before);
-
   // indicates whether we are in young or mixed GC mode
   G1CollectorState _collector_state;
 
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index 260817f7a57..eec31fafa9c 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -50,8 +50,8 @@ bool VM_G1CollectFull::skip_operation() const {
 void VM_G1CollectFull::doit() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
   GCCauseSetter x(g1h, _gc_cause);
-  _gc_succeeded = g1h->do_full_collection(false /* clear_all_soft_refs */,
-                                          false /* do_maximal_compaction */);
+  g1h->do_full_collection(false /* clear_all_soft_refs */,
+                          false /* do_maximal_compaction */);
 }
 
 VM_G1TryInitiateConcMark::VM_G1TryInitiateConcMark(uint gc_count_before,
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp
index cfca9e21d07..46ef69abbcb 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp
@@ -31,8 +31,6 @@
 // VM_operations for the G1 collector.
 
 class VM_G1CollectFull : public VM_GC_Operation {
-  bool _gc_succeeded;
-
 protected:
   bool skip_operation() const override;
 
@@ -40,11 +38,10 @@ class VM_G1CollectFull : public VM_GC_Operation {
   VM_G1CollectFull(uint gc_count_before,
                    uint full_gc_count_before,
                    GCCause::Cause cause) :
-    VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true),
-    _gc_succeeded(false) { }
+    VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true) { }
   VMOp_Type type() const override { return VMOp_G1CollectFull; }
   void doit() override;
-  bool gc_succeeded() const { return _gc_succeeded; }
+  bool gc_succeeded() const { return prologue_succeeded(); }
 };
 
 class VM_G1TryInitiateConcMark : public VM_GC_Operation {

From 277bb208a2c6de888c57285854b6f5d030021f94 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 20 May 2025 13:51:47 +0000
Subject: [PATCH 540/901] 8355094: Performance drop in auto-vectorized kernel
 due to split store

Reviewed-by: vlivanov, thartmann
---
 src/hotspot/share/opto/c2_globals.hpp         |   8 +
 src/hotspot/share/opto/superword.cpp          |  25 ++-
 .../vm/compiler/VectorAutoAlignment.java      |  99 +++++++++
 .../VectorAutoAlignmentVisualization.java     | 210 ++++++++++++++++++
 4 files changed, 341 insertions(+), 1 deletion(-)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignment.java
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignmentVisualization.java

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 5ee0c82f3ec..0bb842907a3 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -367,6 +367,14 @@
           "loop iterations this detection spans.")                          \
           range(0, 4096)                                                    \
                                                                             \
+  product(uint, SuperWordAutomaticAlignment, 1, DIAGNOSTIC,                 \
+          "0 = Disabled (unless AlignVector is enabled)"                    \
+          "Else: align with a load or store of the largest vector width,"   \
+          "      and if there are loads and stores of the largest width:"   \
+          "1 = Prefer alignment with vector store (default)"                \
+          "2 = Prefer alignment with vector load.")                         \
+          range(0, 2)                                                       \
+                                                                            \
   product(bool, UseCMoveUnconditionally, false,                             \
           "Use CMove (scalar and vector) ignoring profitability test.")     \
                                                                             \
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 5e34249aee8..b663bed3938 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2665,7 +2665,18 @@ void VTransform::determine_mem_ref_and_aw_for_main_loop_alignment() {
     MemNode* p0 = vtn->nodes().at(0)->as_Mem();
 
     int vw = p0->memory_size() * vtn->nodes().length();
-    if (vw > max_aw) {
+    // Generally, we prefer to align with the largest memory op (load or store).
+    // If there are multiple, then SuperWordAutomaticAlignment determines if we
+    // prefer loads or stores.
+    // When a load or store is misaligned, this can lead to the load or store
+    // being split, when it goes over a cache line. Most CPUs can schedule
+    // more loads than stores per cycle (often 2 loads and 1 store). Hence,
+    // it is worse if a store is split, and less bad if a load is split.
+    // By default, we have SuperWordAutomaticAlignment=1, i.e. we align with a
+    // store if possible, to avoid splitting that store.
+    bool prefer_store = mem_ref != nullptr && SuperWordAutomaticAlignment == 1 && mem_ref->is_Load() && p0->is_Store();
+    bool prefer_load  = mem_ref != nullptr && SuperWordAutomaticAlignment == 2 && mem_ref->is_Store() && p0->is_Load();
+    if (vw > max_aw || (vw == max_aw && (prefer_load || prefer_store))) {
       max_aw = vw;
       mem_ref = p0;
     }
@@ -2692,6 +2703,16 @@ void VTransform::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   determine_mem_ref_and_aw_for_main_loop_alignment();
   const MemNode* align_to_ref = _mem_ref_for_main_loop_alignment;
   const int aw                = _aw_for_main_loop_alignment;
+
+  if (!VLoop::vectors_should_be_aligned() && SuperWordAutomaticAlignment == 0) {
+#ifdef ASSERT
+    if (_trace._align_vector) {
+      tty->print_cr("\nVTransform::adjust_pre_loop_limit_to_align_main_loop_vectors: disabled.");
+    }
+#endif
+    return;
+  }
+
   assert(align_to_ref != nullptr && aw > 0, "must have alignment reference and aw");
   assert(cl()->is_main_loop(), "can only do alignment for main loop");
 
@@ -2912,6 +2933,7 @@ void VTransform::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   p.for_each_invar_summand([&] (const MemPointerSummand& s) {
     Node* invar_variable = s.variable();
     jint  invar_scale    = s.scale().value();
+    TRACE_ALIGN_VECTOR_NODE(invar_variable);
     if (igvn().type(invar_variable)->isa_long()) {
       // Computations are done % (vector width/element size) so it's
       // safe to simply convert invar to an int and loose the upper 32
@@ -2921,6 +2943,7 @@ void VTransform::adjust_pre_loop_limit_to_align_main_loop_vectors() {
       TRACE_ALIGN_VECTOR_NODE(invar_variable);
     }
     Node* invar_scale_con = igvn().intcon(invar_scale);
+    TRACE_ALIGN_VECTOR_NODE(invar_scale_con);
     Node* invar_summand = new MulINode(invar_variable, invar_scale_con);
     phase()->register_new_node(invar_summand, pre_ctrl);
     TRACE_ALIGN_VECTOR_NODE(invar_summand);
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignment.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignment.java
new file mode 100644
index 00000000000..ca02736424d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignment.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.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.lang.invoke.*;
+import java.lang.foreign.*;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * The purpose of this benchmark is to see the effect of automatic alignment in auto vectorization.
+ *
+ * Note: If you are interested in a nice visualization of load and store misalignment, please look
+ *       at the benchmark {@link VectorAutoAlignmentVisualization}.
+ */
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 2, time = 2, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 1)
+public abstract class VectorAutoAlignment {
+    @Param({"1024", "1152", "1280", "1408", "1536", "1664", "1792", "1920", "1984", "2048", "2114",
+            "2176", "2304", "2432", "2560", "2688", "2816", "2944", "3072", "3200", "3328", "3456",
+            "3584", "3712", "3840", "3968", "4096", "4224", "4352", "4480"})
+    public int SIZE;
+
+    private MemorySegment ms;
+
+    @Setup
+    public void init() throws Throwable {
+        long totalSize = 4L * SIZE + 4L * SIZE;
+        long alignment = 4 * 1024; // 4k = page size
+        ms = Arena.ofAuto().allocate(totalSize, alignment);
+    }
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void kernel1L1S(int offset_load, int offset_store) {
+        for (int i = 0; i < SIZE - /* slack for offset */ 32; i++) {
+            int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + 4L * offset_load + 4L * SIZE);
+            ms.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + 4L * offset_store, v);
+        }
+    }
+
+    @Benchmark
+    public void bench1L1S() throws Throwable {
+        // Go over all possible offsets, to get an average performance.
+        for (int offset_load = 0; offset_load < 32; offset_load++) {
+            for (int offset_store = 0; offset_store < 32; offset_store++) {
+                kernel1L1S(offset_load, offset_store);
+            }
+        }
+    }
+
+    @Fork(value = 1, jvmArgs = {
+        "-XX:-UseSuperWord"
+    })
+    public static class NoVectorization extends VectorAutoAlignment {}
+
+    @Fork(value = 1, jvmArgs = {
+        "-XX:+UnlockDiagnosticVMOptions", "-XX:SuperWordAutomaticAlignment=0"
+    })
+    public static class NoAutoAlign extends VectorAutoAlignment {}
+
+    @Fork(value = 1, jvmArgs = {
+        "-XX:+UnlockDiagnosticVMOptions", "-XX:SuperWordAutomaticAlignment=1"
+    })
+    public static class AlignStore extends VectorAutoAlignment {}
+
+
+    @Fork(value = 1, jvmArgs = {
+        "-XX:+UnlockDiagnosticVMOptions", "-XX:SuperWordAutomaticAlignment=2"
+    })
+    public static class AlignLoad extends VectorAutoAlignment {}
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignmentVisualization.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignmentVisualization.java
new file mode 100644
index 00000000000..04d04959d65
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAutoAlignmentVisualization.java
@@ -0,0 +1,210 @@
+/*
+ * 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.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.lang.invoke.*;
+import java.lang.foreign.*;
+
+import java.util.concurrent.TimeUnit;
+
+/*
+
+  The purpose of this benchmark is to see the effect of automatic alignment in auto vectorization.
+  It is recommended to view the differing results when using SuperWordAutomaticAlignment.
+
+  Without automatic alignment, i.e. SuperWordAutomaticAlignment=0, we may get a plot like below, for bench1L1S:
+
+  OFFSET_STORE
+  ^
+  | ###############|X
+  | ---------------0-  <--- store aligned
+  | ##############X|#
+  | #############X#|#
+  | ############X##|#
+  | ###########X###|#
+  | ##########X####|#
+  | #########X#####|#
+  | ########X######|#
+  | #######X#######|#
+  | ######X########|#
+  | #####X#########|#
+  | ####X##########|#
+  | ###X###########|#
+  | ##X############|#
+  | #X#############|#
+  | X##############|#
+    ---OFFSET_LOAD ---->
+
+                   ^
+     loads aligned |
+
+  #: lowest performance, both misaligned and also relatively misaligned.
+  X: low performance, both misaligned but relatively aligned.
+  |: medium performance, load aligned, store misaligned.
+  -: good performance, load misaligned, store aligned.
+  0: extreme performance, load and store aligned.
+
+  Why is case "-" better than "|"? I.e. why are misaligned stores worse than misaligned loads?
+  Misalignment means that a load or store goes over a cache line, and is split into two loads
+  or stores. Most CPU's can execute 2 loads and 1 store per cycle, that is at least a partial
+  explanation why we are more limited on stores than loads.
+  No splitting, full alignment -> 1 load  and 1 store
+  Split load, store aligned    -> 2 loads and 1 store
+  Split store, load aligned    -> 1 load  and 2 stores
+
+  The warmup and measurement time is relatively short, but the benchmark already takes 25 min
+  to go over the whole grid. This leads to some noise, but the pattern is very visible visually.
+  Hence: this benchmark is more for visualization than for regression testing.
+  For regression testing, please look at the related VectorAutoAlignment benchmark.
+
+  If you want to turn the JMH results into a table, then you may use this Java code.
+
+    import java.io.*;
+    import java.util.ArrayList;
+
+    public class Extract {
+        record Cell(int x, int y, float t) {}
+
+        public static void main(String[] args) throws Exception {
+            String fileName = args[0];
+            System.out.println("Loading from file: " + fileName);
+
+            ArrayList<Cell> cells = new ArrayList<>();
+
+            try(BufferedReader br = new BufferedReader(new FileReader(fileName))) {
+                for(String line; (line = br.readLine()) != null; ) {
+                    System.out.println(line);
+                    String[] parts = line.split("[ ]+");
+                    if (parts.length != 11) { continue; }
+                    System.out.println(String.join(" ", parts));
+                    int x = Integer.parseInt(parts[2]);
+                    int y = Integer.parseInt(parts[3]);
+                    float t = Float.parseFloat(parts[7]);
+                    System.out.println("x=" + x + ", y=" + y + ", t=" + t);
+                    cells.add(new Cell(x, y, t));
+                }
+            }
+
+            int maxX = cells.stream().mapToInt(c -> c.x).max().getAsInt();
+            int maxY = cells.stream().mapToInt(c -> c.y).max().getAsInt();
+            float[][] grid = new float[maxX + 1][maxY + 1];
+
+            for (Cell c : cells) {
+                grid[c.x][c.y] = c.t;
+            }
+
+            for (int x = maxY; x >= 0; x--) {
+                for (int y = 0; y <= maxY; y++) {
+                    System.out.print(String.format("%.5f ", grid[x][y]));
+                }
+                System.out.println();
+            }
+            System.out.println("x-axis  (->)  LOAD_OFFSET");
+            System.out.println("y-axis  (up)  STORE_OFFSET");
+        }
+    }
+
+ */
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 2, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 3, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 1)
+public class VectorAutoAlignmentVisualization {
+    @Param({"2560"})
+    public int SIZE;
+
+    @Param({  "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"})
+    public int OFFSET_LOAD;
+
+    @Param({  "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"})
+    public int OFFSET_STORE;
+
+    @Param({"2000"})
+    public int DISTANCE;
+
+    // To get compile-time constants for OFFSET_LOAD, OFFSET_STORE, and DISTANCE
+    static final MutableCallSite MUTABLE_CONSTANT_OFFSET_LOAD = new MutableCallSite(MethodType.methodType(int.class));
+    static final MethodHandle MUTABLE_CONSTANT_OFFSET_LOAD_HANDLE = MUTABLE_CONSTANT_OFFSET_LOAD.dynamicInvoker();
+    static final MutableCallSite MUTABLE_CONSTANT_OFFSET_STORE = new MutableCallSite(MethodType.methodType(int.class));
+    static final MethodHandle MUTABLE_CONSTANT_OFFSET_STORE_HANDLE = MUTABLE_CONSTANT_OFFSET_STORE.dynamicInvoker();
+    static final MutableCallSite MUTABLE_CONSTANT_DISTANCE = new MutableCallSite(MethodType.methodType(int.class));
+    static final MethodHandle MUTABLE_CONSTANT_DISTANCE_HANDLE = MUTABLE_CONSTANT_DISTANCE.dynamicInvoker();
+
+    private MemorySegment ms;
+
+    @Setup
+    public void init() throws Throwable {
+        long totalSize = 4L * SIZE + 4L * DISTANCE;
+        long alignment = 4 * 1024; // 4k = page size
+        ms = Arena.ofAuto().allocate(totalSize, alignment);
+
+        MethodHandle offset_load_con = MethodHandles.constant(int.class, OFFSET_LOAD);
+        MUTABLE_CONSTANT_OFFSET_LOAD.setTarget(offset_load_con);
+        MethodHandle offset_store_con = MethodHandles.constant(int.class, OFFSET_STORE);
+        MUTABLE_CONSTANT_OFFSET_STORE.setTarget(offset_store_con);
+        MethodHandle distance_con = MethodHandles.constant(int.class, DISTANCE);
+        MUTABLE_CONSTANT_DISTANCE.setTarget(distance_con);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private int offset_load_con() throws Throwable {
+        return (int) MUTABLE_CONSTANT_OFFSET_LOAD_HANDLE.invokeExact();
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private int offset_store_con() throws Throwable {
+        return (int) MUTABLE_CONSTANT_OFFSET_STORE_HANDLE.invokeExact();
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private int distance_con() throws Throwable {
+        return (int) MUTABLE_CONSTANT_DISTANCE_HANDLE.invokeExact();
+    }
+
+    @Benchmark
+    public void bench1L1S() throws Throwable {
+        int offset_load = offset_load_con();
+        int offset_store = offset_store_con();
+        int distance = distance_con();
+        // Note: the offsets and distance are compile-time constants, which means
+        //       we can already prove non-aliasing of loads and stores at compile
+        //       time, which allows vectorization even without any aliasing runtime
+        //       checks.
+        for (int i = 0; i < SIZE - /* slack for offset */ 32; i++) {
+            int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + 4L * offset_load + 4L * distance);
+            ms.set(ValueLayout.JAVA_INT_UNALIGNED, 4L * i + 4L * offset_store, v);
+        }
+    }
+}

From 62d155e8c3b952ecf1f615666c7d71996ba43d74 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 20 May 2025 14:18:41 +0000
Subject: [PATCH 541/901] 8355230: Crash in fuzzer tests: assert(n != nullptr)
 failed: must not be null

Reviewed-by: thartmann, epeter
---
 src/hotspot/share/opto/node.cpp               |  2 +-
 .../TestNullRegionInputAtPhiMakePathDead.java | 87 +++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestNullRegionInputAtPhiMakePathDead.java

diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 3875c6ce325..7633f68ea1e 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -3120,7 +3120,7 @@ void TypeNode::make_paths_from_here_dead(PhaseIterGVN* igvn, PhaseIdealLoop* loo
         assert(r->is_Region() || r->is_top(), "unexpected Phi's control");
         if (r->is_Region()) {
           for (uint j = 1; j < u->req(); ++j) {
-            if (u->in(j) == n) {
+            if (u->in(j) == n && r->in(j) != nullptr) {
               make_path_dead(igvn, loop, r, j, phase_str);
             }
           }
diff --git a/test/hotspot/jtreg/compiler/c2/TestNullRegionInputAtPhiMakePathDead.java b/test/hotspot/jtreg/compiler/c2/TestNullRegionInputAtPhiMakePathDead.java
new file mode 100644
index 00000000000..722b66d90d7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestNullRegionInputAtPhiMakePathDead.java
@@ -0,0 +1,87 @@
+/*
+ * 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 8355230
+ * @summary Crash in fuzzer tests: assert(n != nullptr) failed: must not be null
+ * @run main/othervm -XX:CompileCommand=compileonly,TestNullRegionInputAtPhiMakePathDead::* -Xcomp TestNullRegionInputAtPhiMakePathDead
+ */
+
+public class TestNullRegionInputAtPhiMakePathDead {
+
+    public static long instanceCount=-37082278491330812L;
+    public static float fFld=1.509F;
+    public static int iFld=89;
+
+    public static long vMeth_check_sum = 0;
+
+    public void mainTest() {
+
+        int i19, i20=13736, i21, i24=5;
+        boolean b2=true;
+
+        double d;
+        int i3;
+
+        for (d = 5; d < 131; ++d) {
+            i3 = 12;
+            while (--i3 > 0) {
+                TestNullRegionInputAtPhiMakePathDead.fFld *= -31237;
+            }
+        }
+        TestNullRegionInputAtPhiMakePathDead.fFld %= 16334;
+        TestNullRegionInputAtPhiMakePathDead.instanceCount = 0;
+        for (i19 = 2; i19 < 281; i19++) {
+            try {
+                TestNullRegionInputAtPhiMakePathDead.iFld = (57 % i20);
+            } catch (ArithmeticException a_e) {}
+            i20 += (((i19 * TestNullRegionInputAtPhiMakePathDead.fFld) + TestNullRegionInputAtPhiMakePathDead.instanceCount) - i19);
+            for (i21 = i19; i21 < 90; i21++) {
+                if (b2) {
+                } else {
+                    // CastII of b2 to false added here becomes top during igvn. It's used by a Phi
+                    // at a Region that merges paths from the switch and if. Some of those paths are
+                    // found unreachable at parse time but added to the Region anyway.
+                    switch ((((i21 >>> 1) % 4) * 5) + 115) {
+                    case 129:
+                        break;
+                    case 135:
+                        i24 |= i24;
+                    }
+                }
+            }
+        }
+
+        System.out.println("vMeth_check_sum: " + vMeth_check_sum);
+    }
+    public static void main(String[] strArr) {
+        try {
+            TestNullRegionInputAtPhiMakePathDead _instance = new TestNullRegionInputAtPhiMakePathDead();
+            for (int i = 0; i < 10; i++ ) {
+                _instance.mainTest();
+            }
+         } catch (Exception ex) {
+         }
+    }
+}

From 6162e2c5213c5dd7c1127fd9616b543efa898962 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Tue, 20 May 2025 14:50:46 +0000
Subject: [PATCH 542/901] 8357062: Update Public Suffix List to 823beb1

Reviewed-by: mullan
---
 .../share/data/publicsuffixlist/VERSION       |    4 +-
 .../publicsuffixlist/public_suffix_list.dat   | 4163 +++++++++--------
 src/java.base/share/legal/public_suffix.md    |    2 +-
 .../util/RegisteredDomain/ParseNames.java     |    4 +-
 .../security/util/RegisteredDomain/tests.dat  |   11 +-
 5 files changed, 2121 insertions(+), 2063 deletions(-)

diff --git a/src/java.base/share/data/publicsuffixlist/VERSION b/src/java.base/share/data/publicsuffixlist/VERSION
index 24f4407cc89..1e136d312da 100644
--- a/src/java.base/share/data/publicsuffixlist/VERSION
+++ b/src/java.base/share/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat
-Date: 2024-05-07
+Github: https://raw.githubusercontent.com/publicsuffix/list/823beb1425def931c8b0b170a6bc33b424c3f9b0/public_suffix_list.dat
+Date: 2025-05-12
diff --git a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
index 34733674ea0..6ebe2dfd632 100644
--- a/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
+++ b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
@@ -14,40 +14,48 @@ ac
 com.ac
 edu.ac
 gov.ac
-net.ac
 mil.ac
+net.ac
 org.ac
 
-// ad : https://en.wikipedia.org/wiki/.ad
+// ad : https://www.iana.org/domains/root/db/ad.html
+// Confirmed by Amadeu Abril i Abril (CORE) <amadeu.abril@corenic.org> 2024-11-17
 ad
-nom.ad
 
-// ae : https://tdra.gov.ae/en/aeda/ae-policies
+// ae : https://www.iana.org/domains/root/db/ae.html
 ae
+ac.ae
 co.ae
+gov.ae
+mil.ae
 net.ae
 org.ae
 sch.ae
-ac.ae
-gov.ae
-mil.ae
 
-// aero : see https://www.information.aero/index.php?id=66
+// aero : https://information.aero/registration/policies/dmp
 aero
+// 2LDs
+airline.aero
+airport.aero
+// 2LDs (currently not accepting registration, seemingly never have)
+// As of 2024-07, these are marked as reserved for potential 3LD
+// registrations (clause 11 "allocated subdomains" in the 2006 TLD
+// policy), but the relevant industry partners have not opened them up
+// for registration. Current status can be determined from the TLD's
+// policy document: 2LDs that are open for registration must list
+// their policy in the TLD's policy. Any 2LD without such a policy is
+// not open for registrations.
 accident-investigation.aero
 accident-prevention.aero
 aerobatic.aero
 aeroclub.aero
 aerodrome.aero
 agents.aero
-aircraft.aero
-airline.aero
-airport.aero
 air-surveillance.aero
-airtraffic.aero
 air-traffic-control.aero
+aircraft.aero
+airtraffic.aero
 ambulance.aero
-amusement.aero
 association.aero
 author.aero
 ballooning.aero
@@ -78,6 +86,7 @@ exchange.aero
 express.aero
 federation.aero
 flight.aero
+freight.aero
 fuel.aero
 gliding.aero
 government.aero
@@ -92,6 +101,7 @@ leasing.aero
 logistics.aero
 magazine.aero
 maintenance.aero
+marketplace.aero
 media.aero
 microlight.aero
 modelling.aero
@@ -114,6 +124,7 @@ show.aero
 skydiving.aero
 software.aero
 student.aero
+taxi.aero
 trader.aero
 trading.aero
 trainer.aero
@@ -121,27 +132,27 @@ union.aero
 workinggroup.aero
 works.aero
 
-// af : http://www.nic.af/help.jsp
+// af : https://www.nic.af/domain-price
 af
-gov.af
 com.af
-org.af
-net.af
 edu.af
+gov.af
+net.af
+org.af
 
 // ag : http://www.nic.ag/prices.htm
 ag
+co.ag
 com.ag
-org.ag
 net.ag
-co.ag
 nom.ag
+org.ag
 
 // ai : http://nic.com.ai/
 ai
-off.ai
 com.ai
 net.ai
+off.ai
 org.ai
 
 // al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
@@ -154,6 +165,7 @@ net.al
 org.al
 
 // am : https://www.amnic.net/policy/en/Policy_EN.pdf
+// Confirmed by ISOC AM <isoc@isoc.am> 2024-11-18
 am
 co.am
 com.am
@@ -161,17 +173,20 @@ commune.am
 net.am
 org.am
 
-// ao : https://en.wikipedia.org/wiki/.ao
-// http://www.dns.ao/REGISTR.DOC
+// ao : https://www.iana.org/domains/root/db/ao.html
+// https://www.dns.ao/ao/
 ao
+co.ao
 ed.ao
+edu.ao
+gov.ao
 gv.ao
+it.ao
 og.ao
-co.ao
+org.ao
 pb.ao
-it.ao
 
-// aq : https://en.wikipedia.org/wiki/.aq
+// aq : https://www.iana.org/domains/root/db/aq.html
 aq
 
 // ar : https://nic.ar/es/nic-argentina/normativa
@@ -188,51 +203,53 @@ musica.ar
 mutual.ar
 net.ar
 org.ar
+seg.ar
 senasa.ar
 tur.ar
 
-// arpa : https://en.wikipedia.org/wiki/.arpa
+// arpa : https://www.iana.org/domains/root/db/arpa.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 arpa
 e164.arpa
+home.arpa
 in-addr.arpa
 ip6.arpa
 iris.arpa
 uri.arpa
 urn.arpa
 
-// as : https://en.wikipedia.org/wiki/.as
+// as : https://www.iana.org/domains/root/db/as.html
 as
 gov.as
 
-// asia : https://en.wikipedia.org/wiki/.asia
+// asia : https://www.iana.org/domains/root/db/asia.html
 asia
 
-// at : https://en.wikipedia.org/wiki/.at
+// at : https://www.iana.org/domains/root/db/at.html
 // Confirmed by registry <it@nic.at> 2008-06-17
 at
 ac.at
+sth.ac.at
 co.at
 gv.at
 or.at
-sth.ac.at
 
-// au : https://en.wikipedia.org/wiki/.au
-// http://www.auda.org.au/
+// au : https://www.iana.org/domains/root/db/au.html
+// https://www.auda.org.au/
+// Confirmed by registry <general@auda.org.au> 2024-11-17
 au
 // 2LDs
+asn.au
 com.au
-net.au
-org.au
 edu.au
 gov.au
-asn.au
 id.au
+net.au
+org.au
 // Historic 2LDs (closed to new registration, but sites still exist)
-info.au
 conf.au
 oz.au
-// CGDNs - http://www.cgdn.org.au/
+// CGDNs : https://www.auda.org.au/au-domain-names/the-different-au-domain-names/state-and-territory-domain-names/
 act.au
 nsw.au
 nt.au
@@ -252,9 +269,9 @@ sa.edu.au
 tas.edu.au
 vic.edu.au
 wa.edu.au
-// act.gov.au  Bug 984824 - Removed at request of Greg Tankard
-// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
-// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
+// act.gov.au - Bug 984824 - Removed at request of Greg Tankard
+// nsw.gov.au - Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
+// nt.gov.au - Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au
@@ -264,29 +281,33 @@ wa.gov.au
 // education.tas.edu.au - Removed at the request of the Department of Education Tasmania
 schools.nsw.edu.au
 
-// aw : https://en.wikipedia.org/wiki/.aw
+// aw : https://www.iana.org/domains/root/db/aw.html
 aw
 com.aw
 
-// ax : https://en.wikipedia.org/wiki/.ax
+// ax : https://www.iana.org/domains/root/db/ax.html
 ax
 
-// az : https://en.wikipedia.org/wiki/.az
+// az : https://www.iana.org/domains/root/db/az.html
+// Confirmed via https://whois.az/?page_id=10 2024-12-11
 az
+biz.az
+co.az
 com.az
-net.az
-int.az
-gov.az
-org.az
 edu.az
+gov.az
 info.az
-pp.az
+int.az
 mil.az
 name.az
+net.az
+org.az
+pp.az
+// No longer available for registration, however domains exist as of 2024-12-11
+// see https://whois.az/?page_id=783
 pro.az
-biz.az
 
-// ba : http://nic.ba/users_data/files/pravilnik_o_registraciji.pdf
+// ba : https://www.iana.org/domains/root/db/ba.html
 ba
 com.ba
 edu.ba
@@ -295,7 +316,7 @@ mil.ba
 net.ba
 org.ba
 
-// bb : https://en.wikipedia.org/wiki/.bb
+// bb : https://www.iana.org/domains/root/db/bb.html
 bb
 biz.bb
 co.bb
@@ -308,21 +329,31 @@ org.bb
 store.bb
 tv.bb
 
-// bd : https://en.wikipedia.org/wiki/.bd
+// bd : https://www.iana.org/domains/root/db/bd.html
 *.bd
 
-// be : https://en.wikipedia.org/wiki/.be
+// be : https://www.iana.org/domains/root/db/be.html
 // Confirmed by registry <tech@dns.be> 2008-06-08
 be
 ac.be
 
-// bf : https://en.wikipedia.org/wiki/.bf
+// bf : https://www.iana.org/domains/root/db/bf.html
 bf
 gov.bf
 
-// bg : https://en.wikipedia.org/wiki/.bg
+// bg : https://www.iana.org/domains/root/db/bg.html
 // https://www.register.bg/user/static/rules/en/index.html
 bg
+0.bg
+1.bg
+2.bg
+3.bg
+4.bg
+5.bg
+6.bg
+7.bg
+8.bg
+9.bg
 a.bg
 b.bg
 c.bg
@@ -349,26 +380,16 @@ w.bg
 x.bg
 y.bg
 z.bg
-0.bg
-1.bg
-2.bg
-3.bg
-4.bg
-5.bg
-6.bg
-7.bg
-8.bg
-9.bg
 
-// bh : https://en.wikipedia.org/wiki/.bh
+// bh : https://www.iana.org/domains/root/db/bh.html
 bh
 com.bh
 edu.bh
+gov.bh
 net.bh
 org.bh
-gov.bh
 
-// bi : https://en.wikipedia.org/wiki/.bi
+// bi : https://www.iana.org/domains/root/db/bi.html
 // http://whois.nic.bi/
 bi
 co.bi
@@ -377,11 +398,11 @@ edu.bi
 or.bi
 org.bi
 
-// biz : https://en.wikipedia.org/wiki/.biz
+// biz : https://www.iana.org/domains/root/db/biz.html
 biz
 
 // bj : https://nic.bj/bj-suffixes.txt
-// submitted by registry <contact@nic.bj>
+// Submitted by registry <contact@nic.bj>
 bj
 africa.bj
 agro.bj
@@ -399,12 +420,12 @@ money.bj
 net.bj
 org.bj
 ote.bj
-resto.bj
 restaurant.bj
+resto.bj
 tourism.bj
 univ.bj
 
-// bm : http://www.bermudanic.bm/dnr-text.txt
+// bm : https://www.bermudanic.bm/domain-registration/index.php
 bm
 com.bm
 edu.bm
@@ -420,15 +441,16 @@ gov.bn
 net.bn
 org.bn
 
-// bo : https://nic.bo/delegacion2015.php#h-1.10
+// bo : https://nic.bo
+// Confirmed by registry <soporte@nic.bo> 2024-11-19
 bo
 com.bo
 edu.bo
 gob.bo
 int.bo
-org.bo
-net.bo
 mil.bo
+net.bo
+org.bo
 tv.bo
 web.bo
 // Social Domains
@@ -454,9 +476,9 @@ natural.bo
 nombre.bo
 noticias.bo
 patria.bo
+plurinacional.bo
 politica.bo
 profesional.bo
-plurinacional.bo
 pueblo.bo
 revista.bo
 salud.bo
@@ -484,6 +506,7 @@ ato.br
 b.br
 barueri.br
 belem.br
+bet.br
 bhz.br
 bib.br
 bio.br
@@ -571,6 +594,7 @@ joinville.br
 jor.br
 jus.br
 leg.br
+leilao.br
 lel.br
 log.br
 londrina.br
@@ -641,12 +665,12 @@ zlg.br
 // bs : http://www.nic.bs/rules.html
 bs
 com.bs
-net.bs
-org.bs
 edu.bs
 gov.bs
+net.bs
+org.bs
 
-// bt : https://en.wikipedia.org/wiki/.bt
+// bt : https://www.iana.org/domains/root/db/bt.html
 bt
 com.bt
 edu.bt
@@ -658,14 +682,16 @@ org.bt
 // Submitted by registry <jarle@uninett.no>
 bv
 
-// bw : https://en.wikipedia.org/wiki/.bw
-// http://www.gobin.info/domainname/bw.doc
-// list of other 2nd level tlds ?
+// bw : https://www.iana.org/domains/root/db/bw.html
+// https://nic.net.bw/bw-name-structure
 bw
+ac.bw
 co.bw
+gov.bw
+net.bw
 org.bw
 
-// by : https://en.wikipedia.org/wiki/.by
+// by : https://www.iana.org/domains/root/db/by.html
 // http://tld.by/rules_2006_en.html
 // list of other 2nd level tlds ?
 by
@@ -675,20 +701,20 @@ mil.by
 // second-level domain, but it's being used as one (see www.google.com.by and
 // www.yahoo.com.by, for example), so we list it here for safety's sake.
 com.by
-
 // http://hoster.by/
 of.by
 
-// bz : https://en.wikipedia.org/wiki/.bz
+// bz : https://www.iana.org/domains/root/db/bz.html
 // http://www.belizenic.bz/
 bz
+co.bz
 com.bz
-net.bz
-org.bz
 edu.bz
 gov.bz
+net.bz
+org.bz
 
-// ca : https://en.wikipedia.org/wiki/.ca
+// ca : https://www.iana.org/domains/root/db/ca.html
 ca
 // ca geographical names
 ab.ca
@@ -709,46 +735,43 @@ yk.ca
 // see also: http://registry.gc.ca/en/SubdomainFAQ
 gc.ca
 
-// cat : https://en.wikipedia.org/wiki/.cat
+// cat : https://www.iana.org/domains/root/db/cat.html
 cat
 
-// cc : https://en.wikipedia.org/wiki/.cc
+// cc : https://www.iana.org/domains/root/db/cc.html
 cc
 
-// cd : https://en.wikipedia.org/wiki/.cd
-// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
+// cd : https://www.iana.org/domains/root/db/cd.html
+// https://www.nic.cd
 cd
 gov.cd
 
-// cf : https://en.wikipedia.org/wiki/.cf
+// cf : https://www.iana.org/domains/root/db/cf.html
 cf
 
-// cg : https://en.wikipedia.org/wiki/.cg
+// cg : https://www.iana.org/domains/root/db/cg.html
 cg
 
-// ch : https://en.wikipedia.org/wiki/.ch
+// ch : https://www.iana.org/domains/root/db/ch.html
 ch
 
-// ci : https://en.wikipedia.org/wiki/.ci
-// http://www.nic.ci/index.php?page=charte
+// ci : https://www.iana.org/domains/root/db/ci.html
 ci
-org.ci
-or.ci
-com.ci
+ac.ci
+aéroport.ci
+asso.ci
 co.ci
-edu.ci
+com.ci
 ed.ci
-ac.ci
-net.ci
+edu.ci
 go.ci
-asso.ci
-aéroport.ci
-int.ci
-presse.ci
-md.ci
 gouv.ci
+int.ci
+net.ci
+or.ci
+org.ci
 
-// ck : https://en.wikipedia.org/wiki/.ck
+// ck : https://www.iana.org/domains/root/db/ck.html
 *.ck
 !www.ck
 
@@ -760,26 +783,26 @@ gob.cl
 gov.cl
 mil.cl
 
-// cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
+// cm : https://www.iana.org/domains/root/db/cm.html plus bug 981927
 cm
 co.cm
 com.cm
 gov.cm
 net.cm
 
-// cn : https://en.wikipedia.org/wiki/.cn
+// cn : https://www.iana.org/domains/root/db/cn.html
 // Submitted by registry <tanyaling@cnnic.cn>
 cn
 ac.cn
 com.cn
 edu.cn
 gov.cn
+mil.cn
 net.cn
 org.cn
-mil.cn
 公司.cn
-网络.cn
 網絡.cn
+网络.cn
 // cn geographic names
 ah.cn
 bj.cn
@@ -787,18 +810,20 @@ cq.cn
 fj.cn
 gd.cn
 gs.cn
-gz.cn
 gx.cn
+gz.cn
 ha.cn
 hb.cn
 he.cn
 hi.cn
+hk.cn
 hl.cn
 hn.cn
 jl.cn
 js.cn
 jx.cn
 ln.cn
+mo.cn
 nm.cn
 nx.cn
 qh.cn
@@ -808,38 +833,31 @@ sh.cn
 sn.cn
 sx.cn
 tj.cn
+tw.cn
 xj.cn
 xz.cn
 yn.cn
 zj.cn
-hk.cn
-mo.cn
-tw.cn
 
-// co : https://en.wikipedia.org/wiki/.co
-// Submitted by registry <tecnico@uniandes.edu.co>
+// co : https://www.iana.org/domains/root/db/co.html
+// https://www.cointernet.com.co/como-funciona-un-dominio-restringido
+// Confirmed by registry <gonzalo@cointernet.com.co> 2024-11-18
 co
-arts.co
 com.co
 edu.co
-firm.co
 gov.co
-info.co
-int.co
 mil.co
 net.co
 nom.co
 org.co
-rec.co
-web.co
 
-// com : https://en.wikipedia.org/wiki/.com
+// com : https://www.iana.org/domains/root/db/com.html
 com
 
-// coop : https://en.wikipedia.org/wiki/.coop
+// coop : https://www.iana.org/domains/root/db/coop.html
 coop
 
-// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
+// cr : https://nic.cr/capitulo-1-registro-de-un-nombre-de-dominio/
 cr
 ac.cr
 co.cr
@@ -849,40 +867,45 @@ go.cr
 or.cr
 sa.cr
 
-// cu : https://en.wikipedia.org/wiki/.cu
+// cu : https://www.iana.org/domains/root/db/cu.html
 cu
 com.cu
 edu.cu
-org.cu
-net.cu
-gov.cu
+gob.cu
 inf.cu
+nat.cu
+net.cu
+org.cu
 
-// cv : https://en.wikipedia.org/wiki/.cv
-// cv : http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100); <- registration rules
+// cv : https://www.iana.org/domains/root/db/cv.html
+// https://ola.cv/domain-extensions-under-cv/
+// Confirmed by registry <support@ola.cv> 2024-11-26
 cv
 com.cv
 edu.cv
+id.cv
 int.cv
+net.cv
 nome.cv
 org.cv
+publ.cv
 
-// cw : http://www.una.cw/cw_registry/
-// Confirmed by registry <registry@una.net> 2013-03-26
+// cw : https://www.uoc.cw/cw-registry
+// Confirmed by registry <registry@uoc.cw> 2024-11-19
 cw
 com.cw
 edu.cw
 net.cw
 org.cw
 
-// cx : https://en.wikipedia.org/wiki/.cx
+// cx : https://www.iana.org/domains/root/db/cx.html
 // list of other 2nd level tlds ?
 cx
 gov.cx
 
 // cy : http://www.nic.cy/
-// Submitted by registry Panayiotou Fotia <cydns@ucy.ac.cy>
-// namespace policies URL https://www.nic.cy/portal//sites/default/files/symfonia_gia_eggrafi.pdf
+// Submitted by Panayiotou Fotia <cydns@ucy.ac.cy>
+// https://nic.cy/wp-content/uploads/2024/01/Create-Request-for-domain-name-registration-1.pdf
 cy
 ac.cy
 biz.cy
@@ -897,30 +920,33 @@ press.cy
 pro.cy
 tm.cy
 
-// cz : https://en.wikipedia.org/wiki/.cz
+// cz : https://www.iana.org/domains/root/db/cz.html
 cz
 
-// de : https://en.wikipedia.org/wiki/.de
+// de : https://www.iana.org/domains/root/db/de.html
 // Confirmed by registry <ops@denic.de> (with technical
 // reservations) 2008-07-01
 de
 
-// dj : https://en.wikipedia.org/wiki/.dj
+// dj : https://www.iana.org/domains/root/db/dj.html
 dj
 
-// dk : https://en.wikipedia.org/wiki/.dk
+// dk : https://www.iana.org/domains/root/db/dk.html
 // Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
 dk
 
-// dm : https://en.wikipedia.org/wiki/.dm
+// dm : https://www.iana.org/domains/root/db/dm.html
+// https://nic.dm/policies/pdf/DMRulesandGuidelines2024v1.pdf
+// Confirmed by registry <admin@dotdm.dm> 2024-11-19
 dm
+co.dm
 com.dm
-net.dm
-org.dm
 edu.dm
 gov.dm
+net.dm
+org.dm
 
-// do : https://en.wikipedia.org/wiki/.do
+// do : https://www.iana.org/domains/root/db/do.html
 do
 art.do
 com.do
@@ -940,88 +966,93 @@ asso.dz
 com.dz
 edu.dz
 gov.dz
-org.dz
 net.dz
+org.dz
 pol.dz
 soc.dz
 tm.dz
 
-// ec : http://www.nic.ec/reg/paso1.asp
+// ec : https://www.nic.ec/
 // Submitted by registry <vabboud@nic.ec>
 ec
 com.ec
-info.ec
-net.ec
+edu.ec
 fin.ec
+gob.ec
+gov.ec
+info.ec
 k12.ec
 med.ec
-pro.ec
-org.ec
-edu.ec
-gov.ec
-gob.ec
 mil.ec
+net.ec
+org.ec
+pro.ec
 
-// edu : https://en.wikipedia.org/wiki/.edu
+// edu : https://www.iana.org/domains/root/db/edu.html
 edu
 
-// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
+// ee : https://www.internet.ee/domains/general-domains-and-procedure-for-registration-of-sub-domains-under-general-domains
 ee
+aip.ee
+com.ee
 edu.ee
+fie.ee
 gov.ee
-riik.ee
 lib.ee
 med.ee
-com.ee
-pri.ee
-aip.ee
 org.ee
-fie.ee
+pri.ee
+riik.ee
 
-// eg : https://en.wikipedia.org/wiki/.eg
+// eg : https://www.iana.org/domains/root/db/eg.html
+// https://domain.eg/en/domain-rules/subdomain-names-types/
 eg
+ac.eg
 com.eg
 edu.eg
 eun.eg
 gov.eg
+info.eg
+me.eg
 mil.eg
 name.eg
 net.eg
 org.eg
 sci.eg
+sport.eg
+tv.eg
 
-// er : https://en.wikipedia.org/wiki/.er
+// er : https://www.iana.org/domains/root/db/er.html
 *.er
 
-// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
+// es : https://www.dominios.es/en
 es
 com.es
+edu.es
+gob.es
 nom.es
 org.es
-gob.es
-edu.es
 
-// et : https://en.wikipedia.org/wiki/.et
+// et : https://www.iana.org/domains/root/db/et.html
 et
+biz.et
 com.et
-gov.et
-org.et
 edu.et
-biz.et
-name.et
+gov.et
 info.et
+name.et
 net.et
+org.et
 
-// eu : https://en.wikipedia.org/wiki/.eu
+// eu : https://www.iana.org/domains/root/db/eu.html
 eu
 
-// fi : https://en.wikipedia.org/wiki/.fi
+// fi : https://www.iana.org/domains/root/db/fi.html
 fi
-// aland.fi : https://en.wikipedia.org/wiki/.ax
+// aland.fi : https://www.iana.org/domains/root/db/ax.html
 // This domain is being phased out in favor of .ax. As there are still many
 // domains under aland.fi, we still keep it on the list until aland.fi is
 // completely removed.
-// TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
 // fj : http://domains.fj/
@@ -1038,17 +1069,17 @@ net.fj
 org.fj
 pro.fj
 
-// fk : https://en.wikipedia.org/wiki/.fk
+// fk : https://www.iana.org/domains/root/db/fk.html
 *.fk
 
-// fm : https://en.wikipedia.org/wiki/.fm
+// fm : https://www.iana.org/domains/root/db/fm.html
+fm
 com.fm
 edu.fm
 net.fm
 org.fm
-fm
 
-// fo : https://en.wikipedia.org/wiki/.fo
+// fo : https://www.iana.org/domains/root/db/fo.html
 fo
 
 // fr : https://www.afnic.fr/ https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
@@ -1065,59 +1096,60 @@ cci.fr
 greta.fr
 huissier-justice.fr
 
-// ga : https://en.wikipedia.org/wiki/.ga
+// ga : https://www.iana.org/domains/root/db/ga.html
 ga
 
 // gb : This registry is effectively dormant
 // Submitted by registry <Damien.Shaw@ja.net>
 gb
 
-// gd : https://en.wikipedia.org/wiki/.gd
+// gd : https://www.iana.org/domains/root/db/gd.html
+gd
 edu.gd
 gov.gd
-gd
 
-// ge : http://www.nic.net.ge/policy_en.pdf
+// ge : https://nic.ge/en/administrator/the-ge-domain-regulations
+// Confirmed by registry <info@nic.ge> 2024-11-20
 ge
 com.ge
 edu.ge
 gov.ge
-org.ge
-mil.ge
 net.ge
+org.ge
 pvt.ge
+school.ge
 
-// gf : https://en.wikipedia.org/wiki/.gf
+// gf : https://www.iana.org/domains/root/db/gf.html
 gf
 
-// gg : http://www.channelisles.net/register-domains/
+// gg : https://www.channelisles.net/register-1/register-direct
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 gg
 co.gg
 net.gg
 org.gg
 
-// gh : https://en.wikipedia.org/wiki/.gh
-// see also: http://www.nic.gh/reg_now.php
+// gh : https://www.iana.org/domains/root/db/gh.html
+// https://www.nic.gh/
 // Although domains directly at second level are not possible at the moment,
 // they have been possible for some time and may come back.
 gh
 com.gh
 edu.gh
 gov.gh
-org.gh
 mil.gh
+org.gh
 
 // gi : http://www.nic.gi/rules.html
 gi
 com.gi
-ltd.gi
+edu.gi
 gov.gi
+ltd.gi
 mod.gi
-edu.gi
 org.gi
 
-// gl : https://en.wikipedia.org/wiki/.gl
+// gl : https://www.iana.org/domains/root/db/gl.html
 // http://nic.gl
 gl
 co.gl
@@ -1136,34 +1168,34 @@ ac.gn
 com.gn
 edu.gn
 gov.gn
-org.gn
 net.gn
+org.gn
 
-// gov : https://en.wikipedia.org/wiki/.gov
+// gov : https://www.iana.org/domains/root/db/gov.html
 gov
 
 // gp : http://www.nic.gp/index.php?lang=en
 gp
+asso.gp
 com.gp
-net.gp
-mobi.gp
 edu.gp
+mobi.gp
+net.gp
 org.gp
-asso.gp
 
-// gq : https://en.wikipedia.org/wiki/.gq
+// gq : https://www.iana.org/domains/root/db/gq.html
 gq
 
-// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
+// gr : https://www.iana.org/domains/root/db/gr.html
 // Submitted by registry <segred@ics.forth.gr>
 gr
 com.gr
 edu.gr
+gov.gr
 net.gr
 org.gr
-gov.gr
 
-// gs : https://en.wikipedia.org/wiki/.gs
+// gs : https://www.iana.org/domains/root/db/gs.html
 gs
 
 // gt : https://www.gt/sitio/registration_policy.php?lang=en
@@ -1189,11 +1221,11 @@ net.gu
 org.gu
 web.gu
 
-// gw : https://en.wikipedia.org/wiki/.gw
+// gw : https://www.iana.org/domains/root/db/gw.html
 // gw : https://nic.gw/regras/
 gw
 
-// gy : https://en.wikipedia.org/wiki/.gy
+// gy : https://www.iana.org/domains/root/db/gy.html
 // http://registry.gy/
 gy
 co.gy
@@ -1212,97 +1244,97 @@ gov.hk
 idv.hk
 net.hk
 org.hk
+个人.hk
+個人.hk
 公司.hk
-教育.hk
-敎育.hk
 政府.hk
-個人.hk
-个人.hk
+敎育.hk
+教育.hk
 箇人.hk
+組織.hk
+組织.hk
+網絡.hk
 網络.hk
-网络.hk
 组織.hk
-網絡.hk
-网絡.hk
 组织.hk
-組織.hk
-組织.hk
+网絡.hk
+网络.hk
 
-// hm : https://en.wikipedia.org/wiki/.hm
+// hm : https://www.iana.org/domains/root/db/hm.html
 hm
 
-// hn : http://www.nic.hn/politicas/ps02,,05.html
+// hn : https://www.iana.org/domains/root/db/hn.html
 hn
 com.hn
 edu.hn
-org.hn
-net.hn
-mil.hn
 gob.hn
+mil.hn
+net.hn
+org.hn
 
 // hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
 hr
-iz.hr
+com.hr
 from.hr
+iz.hr
 name.hr
-com.hr
 
 // ht : http://www.nic.ht/info/charte.cfm
 ht
+adult.ht
+art.ht
+asso.ht
 com.ht
-shop.ht
+coop.ht
+edu.ht
 firm.ht
+gouv.ht
 info.ht
-adult.ht
+med.ht
 net.ht
-pro.ht
 org.ht
-med.ht
-art.ht
-coop.ht
+perso.ht
 pol.ht
-asso.ht
-edu.ht
+pro.ht
 rel.ht
-gouv.ht
-perso.ht
+shop.ht
 
-// hu : http://www.domain.hu/domain/English/sld.html
+// hu : https://www.iana.org/domains/root/db/hu.html
 // Confirmed by registry <pasztor@iszt.hu> 2008-06-12
 hu
-co.hu
-info.hu
-org.hu
-priv.hu
-sport.hu
-tm.hu
 2000.hu
 agrar.hu
 bolt.hu
 casino.hu
 city.hu
+co.hu
 erotica.hu
 erotika.hu
 film.hu
 forum.hu
 games.hu
 hotel.hu
+info.hu
 ingatlan.hu
 jogasz.hu
 konyvelo.hu
 lakas.hu
 media.hu
 news.hu
+org.hu
+priv.hu
 reklam.hu
 sex.hu
 shop.hu
+sport.hu
 suli.hu
 szex.hu
+tm.hu
 tozsde.hu
 utazas.hu
 video.hu
 
-// id : https://pandi.id/en/domain/registration-requirements/
+// id : https://www.iana.org/domains/root/db/id.html
 id
 ac.id
 biz.id
@@ -1317,13 +1349,13 @@ ponpes.id
 sch.id
 web.id
 
-// ie : https://en.wikipedia.org/wiki/.ie
+// ie : https://www.iana.org/domains/root/db/ie.html
 ie
 gov.ie
 
-// il :         http://www.isoc.org.il/domains/
-// see also:    https://en.isoc.org.il/il-cctld/registration-rules
-// ISOC-IL      (operated by .il Registry)
+// il : http://www.isoc.org.il/domains/
+// see also: https://en.isoc.org.il/il-cctld/registration-rules
+// ISOC-IL (operated by .il Registry)
 il
 ac.il
 co.il
@@ -1349,15 +1381,15 @@ org.il
 im
 ac.im
 co.im
-com.im
 ltd.co.im
+plc.co.im
+com.im
 net.im
 org.im
-plc.co.im
 tt.im
 tv.im
 
-// in : https://en.wikipedia.org/wiki/.in
+// in : https://www.iana.org/domains/root/db/in.html
 // see also: https://registry.in/policies
 // Please note, that nic.in is not an official eTLD, but used by most
 // government institutions.
@@ -1404,27 +1436,33 @@ uk.in
 up.in
 us.in
 
-// info : https://en.wikipedia.org/wiki/.info
+// info : https://www.iana.org/domains/root/db/info.html
 info
 
-// int : https://en.wikipedia.org/wiki/.int
+// int : https://www.iana.org/domains/root/db/int.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 int
 eu.int
 
 // io : http://www.nic.io/rules.htm
-// list of other 2nd level tlds ?
 io
+co.io
 com.io
+edu.io
+gov.io
+mil.io
+net.io
+nom.io
+org.io
 
 // iq : http://www.cmc.iq/english/iq/iqregister1.htm
 iq
-gov.iq
+com.iq
 edu.iq
+gov.iq
 mil.iq
-com.iq
-org.iq
 net.iq
+org.iq
 
 // ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
 // Also see http://www.nic.ir/Internationalized_Domain_Names
@@ -1443,22 +1481,16 @@ sch.ir
 ايران.ir
 
 // is : http://www.isnic.is/domain/rules.php
-// Confirmed by registry <marius@isgate.is> 2008-12-06
+// Confirmed by registry <marius@isgate.is> 2024-11-17
 is
-net.is
-com.is
-edu.is
-gov.is
-org.is
-int.is
-
-// it : https://en.wikipedia.org/wiki/.it
+
+// it : https://www.iana.org/domains/root/db/it.html
+// https://www.nic.it/
 it
-gov.it
 edu.it
-// Reserved geo-names (regions and provinces):
-// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
-// Regions
+gov.it
+// Regions (3.3.1)
+// https://www.nic.it/en/manage-your-it/forms-and-docs -> "Assignment and Management of domain names"
 abr.it
 abruzzo.it
 aosta-valley.it
@@ -1517,6 +1549,7 @@ trentin-sudtirol.it
 trentin-südtirol.it
 trentin-sued-tirol.it
 trentin-suedtirol.it
+trentino.it
 trentino-a-adige.it
 trentino-aadige.it
 trentino-alto-adige.it
@@ -1529,7 +1562,6 @@ trentino-sudtirol.it
 trentino-südtirol.it
 trentino-sued-tirol.it
 trentino-suedtirol.it
-trentino.it
 trentinoa-adige.it
 trentinoaadige.it
 trentinoalto-adige.it
@@ -1573,7 +1605,7 @@ vao.it
 vda.it
 ven.it
 veneto.it
-// Provinces
+// Provinces (3.3.2)
 ag.it
 agrigento.it
 al.it
@@ -1601,10 +1633,10 @@ at.it
 av.it
 avellino.it
 ba.it
+balsan.it
 balsan-sudtirol.it
 balsan-südtirol.it
 balsan-suedtirol.it
-balsan.it
 bari.it
 barletta-trani-andria.it
 barlettatraniandria.it
@@ -1618,21 +1650,21 @@ bl.it
 bn.it
 bo.it
 bologna.it
-bolzano-altoadige.it
 bolzano.it
+bolzano-altoadige.it
+bozen.it
 bozen-sudtirol.it
 bozen-südtirol.it
 bozen-suedtirol.it
-bozen.it
 br.it
 brescia.it
 brindisi.it
 bs.it
 bt.it
+bulsan.it
 bulsan-sudtirol.it
 bulsan-südtirol.it
 bulsan-suedtirol.it
-bulsan.it
 bz.it
 ca.it
 cagliari.it
@@ -1734,9 +1766,9 @@ milano.it
 mn.it
 mo.it
 modena.it
+monza.it
 monza-brianza.it
 monza-e-della-brianza.it
-monza.it
 monzabrianza.it
 monzaebrianza.it
 monzaedellabrianza.it
@@ -1815,8 +1847,8 @@ sondrio.it
 sp.it
 sr.it
 ss.it
-suedtirol.it
 südtirol.it
+suedtirol.it
 sv.it
 ta.it
 taranto.it
@@ -1865,7 +1897,7 @@ vs.it
 vt.it
 vv.it
 
-// je : http://www.channelisles.net/register-domains/
+// je : https://www.iana.org/domains/root/db/je.html
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 je
 co.je
@@ -1875,23 +1907,30 @@ org.je
 // jm : http://www.com.jm/register.html
 *.jm
 
-// jo : http://www.dns.jo/Registration_policy.aspx
+// jo : https://www.dns.jo/JoFamily.aspx
+// Confirmed by registry <DNS@modee.gov.jo> 2024-11-17
 jo
+agri.jo
+ai.jo
 com.jo
-org.jo
-net.jo
 edu.jo
-sch.jo
+eng.jo
+fm.jo
 gov.jo
 mil.jo
-name.jo
+net.jo
+org.jo
+per.jo
+phd.jo
+sch.jo
+tv.jo
 
-// jobs : https://en.wikipedia.org/wiki/.jobs
+// jobs : https://www.iana.org/domains/root/db/jobs.html
 jobs
 
-// jp : https://en.wikipedia.org/wiki/.jp
+// jp : https://www.iana.org/domains/root/db/jp.html
 // http://jprs.co.jp/en/jpdomain.html
-// Submitted by registry <info@jprs.jp>
+// Confirmed by registry <info@jprs.jp> 2024-11-22
 jp
 // jp organizational type names
 ac.jp
@@ -1951,26 +1990,14 @@ wakayama.jp
 yamagata.jp
 yamaguchi.jp
 yamanashi.jp
-栃木.jp
-愛知.jp
-愛媛.jp
+三重.jp
+京都.jp
+佐賀.jp
 兵庫.jp
-熊本.jp
-茨城.jp
 北海道.jp
 千葉.jp
 和歌山.jp
-長崎.jp
-長野.jp
-新潟.jp
-青森.jp
-静岡.jp
-東京.jp
-石川.jp
 埼玉.jp
-三重.jp
-京都.jp
-佐賀.jp
 大分.jp
 大阪.jp
 奈良.jp
@@ -1980,39 +2007,54 @@ yamanashi.jp
 山口.jp
 山形.jp
 山梨.jp
-岩手.jp
 岐阜.jp
 岡山.jp
+岩手.jp
 島根.jp
 広島.jp
 徳島.jp
+愛媛.jp
+愛知.jp
+新潟.jp
+東京.jp
+栃木.jp
 沖縄.jp
 滋賀.jp
+熊本.jp
+石川.jp
 神奈川.jp
 福井.jp
 福岡.jp
 福島.jp
 秋田.jp
 群馬.jp
+茨城.jp
+長崎.jp
+長野.jp
+青森.jp
+静岡.jp
 香川.jp
 高知.jp
 鳥取.jp
 鹿児島.jp
 // jp geographic type names
 // http://jprs.jp/doc/rule/saisoku-1.html
+// 2024-11-22: JPRS confirmed that jp geographic type names no longer accept new registrations.
+// Once all existing registrations expire (marking full discontinuation), these suffixes
+// will be removed from the PSL.
 *.kawasaki.jp
-*.kitakyushu.jp
-*.kobe.jp
-*.nagoya.jp
-*.sapporo.jp
-*.sendai.jp
-*.yokohama.jp
 !city.kawasaki.jp
+*.kitakyushu.jp
 !city.kitakyushu.jp
+*.kobe.jp
 !city.kobe.jp
+*.nagoya.jp
 !city.nagoya.jp
+*.sapporo.jp
 !city.sapporo.jp
+*.sendai.jp
 !city.sendai.jp
+*.yokohama.jp
 !city.yokohama.jp
 // 4th level registration
 aisai.aichi.jp
@@ -3703,56 +3745,56 @@ sc.ke
 
 // kg : http://www.domain.kg/dmn_n.html
 kg
-org.kg
-net.kg
 com.kg
 edu.kg
 gov.kg
 mil.kg
+net.kg
+org.kg
 
 // kh : http://www.mptc.gov.kh/dns_registration.htm
 *.kh
 
-// ki : http://www.ki/dns/index.html
+// ki : https://www.iana.org/domains/root/db/ki.html
 ki
-edu.ki
 biz.ki
-net.ki
-org.ki
+com.ki
+edu.ki
 gov.ki
 info.ki
-com.ki
+net.ki
+org.ki
 
-// km : https://en.wikipedia.org/wiki/.km
+// km : https://www.iana.org/domains/root/db/km.html
 // http://www.domaine.km/documents/charte.doc
 km
-org.km
-nom.km
+ass.km
+com.km
+edu.km
 gov.km
+mil.km
+nom.km
+org.km
 prd.km
 tm.km
-edu.km
-mil.km
-ass.km
-com.km
 // These are only mentioned as proposed suggestions at domaine.km, but
-// https://en.wikipedia.org/wiki/.km says they're available for registration:
-coop.km
+// https://www.iana.org/domains/root/db/km.html says they're available for registration:
 asso.km
-presse.km
+coop.km
+gouv.km
 medecin.km
 notaires.km
 pharmaciens.km
+presse.km
 veterinaire.km
-gouv.km
 
-// kn : https://en.wikipedia.org/wiki/.kn
+// kn : https://www.iana.org/domains/root/db/kn.html
 // http://www.dot.kn/domainRules.html
 kn
-net.kn
-org.kn
 edu.kn
 gov.kn
+net.kn
+org.kn
 
 // kp : http://www.kcce.kp/en_index.php
 kp
@@ -3763,15 +3805,19 @@ org.kp
 rep.kp
 tra.kp
 
-// kr : https://en.wikipedia.org/wiki/.kr
-// see also: http://domain.nida.or.kr/eng/registration.jsp
+// kr : https://www.iana.org/domains/root/db/kr.html
+// see also: https://krnic.kisa.or.kr/jsp/infoboard/law/domBylawsReg.jsp
 kr
 ac.kr
+ai.kr
 co.kr
 es.kr
 go.kr
 hs.kr
+io.kr
+it.kr
 kg.kr
+me.kr
 mil.kr
 ms.kr
 ne.kr
@@ -3816,29 +3862,29 @@ edu.ky
 net.ky
 org.ky
 
-// kz : https://en.wikipedia.org/wiki/.kz
+// kz : https://www.iana.org/domains/root/db/kz.html
 // see also: http://www.nic.kz/rules/index.jsp
 kz
-org.kz
+com.kz
 edu.kz
-net.kz
 gov.kz
 mil.kz
-com.kz
+net.kz
+org.kz
 
-// la : https://en.wikipedia.org/wiki/.la
+// la : https://www.iana.org/domains/root/db/la.html
 // Submitted by registry <gavin.brown@nic.la>
 la
-int.la
-net.la
-info.la
+com.la
 edu.la
 gov.la
-per.la
-com.la
+info.la
+int.la
+net.la
 org.la
+per.la
 
-// lb : https://en.wikipedia.org/wiki/.lb
+// lb : https://www.iana.org/domains/root/db/lb.html
 // Submitted by registry <randy@psg.com>
 lb
 com.lb
@@ -3847,36 +3893,36 @@ gov.lb
 net.lb
 org.lb
 
-// lc : https://en.wikipedia.org/wiki/.lc
+// lc : https://www.iana.org/domains/root/db/lc.html
 // see also: http://www.nic.lc/rules.htm
 lc
-com.lc
-net.lc
 co.lc
-org.lc
+com.lc
 edu.lc
 gov.lc
+net.lc
+org.lc
 
-// li : https://en.wikipedia.org/wiki/.li
+// li : https://www.iana.org/domains/root/db/li.html
 li
 
-// lk : https://www.nic.lk/index.php/domain-registration/lk-domain-naming-structure
+// lk : https://www.iana.org/domains/root/db/lk.html
 lk
-gov.lk
-sch.lk
-net.lk
-int.lk
+ac.lk
+assn.lk
 com.lk
-org.lk
 edu.lk
+gov.lk
+grp.lk
+hotel.lk
+int.lk
+ltd.lk
+net.lk
 ngo.lk
+org.lk
+sch.lk
 soc.lk
 web.lk
-ltd.lk
-assn.lk
-grp.lk
-hotel.lk
-ac.lk
 
 // lr : http://psg.com/dns/lr/lr.txt
 // Submitted by registry <randy@psg.com>
@@ -3884,8 +3930,8 @@ lr
 com.lr
 edu.lr
 gov.lr
-org.lr
 net.lr
+org.lr
 
 // ls : http://www.nic.ls/
 // Confirmed by registry <lsadmin@nic.ls>
@@ -3900,7 +3946,7 @@ net.ls
 org.ls
 sc.ls
 
-// lt : https://en.wikipedia.org/wiki/.lt
+// lt : https://www.iana.org/domains/root/db/lt.html
 lt
 // gov.lt : http://www.gov.lt/index_en.php
 gov.lt
@@ -3908,131 +3954,136 @@ gov.lt
 // lu : http://www.dns.lu/en/
 lu
 
-// lv : http://www.nic.lv/DNS/En/generic.php
+// lv : https://www.iana.org/domains/root/db/lv.html
 lv
+asn.lv
 com.lv
+conf.lv
 edu.lv
 gov.lv
-org.lv
-mil.lv
 id.lv
+mil.lv
 net.lv
-asn.lv
-conf.lv
+org.lv
 
 // ly : http://www.nic.ly/regulations.php
 ly
 com.ly
-net.ly
-gov.ly
-plc.ly
 edu.ly
-sch.ly
+gov.ly
+id.ly
 med.ly
+net.ly
 org.ly
-id.ly
+plc.ly
+sch.ly
 
-// ma : https://en.wikipedia.org/wiki/.ma
+// ma : https://www.iana.org/domains/root/db/ma.html
 // http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
 ma
+ac.ma
 co.ma
-net.ma
 gov.ma
+net.ma
 org.ma
-ac.ma
 press.ma
 
 // mc : http://www.nic.mc/
 mc
-tm.mc
 asso.mc
+tm.mc
 
-// md : https://en.wikipedia.org/wiki/.md
+// md : https://www.iana.org/domains/root/db/md.html
 md
 
-// me : https://en.wikipedia.org/wiki/.me
+// me : https://www.iana.org/domains/root/db/me.html
 me
+ac.me
 co.me
-net.me
-org.me
 edu.me
-ac.me
 gov.me
 its.me
+net.me
+org.me
 priv.me
 
-// mg : http://nic.mg/nicmg/?page_id=39
+// mg : https://nic.mg
 mg
-org.mg
-nom.mg
-gov.mg
-prd.mg
-tm.mg
+co.mg
+com.mg
 edu.mg
+gov.mg
 mil.mg
-com.mg
-co.mg
+nom.mg
+org.mg
+prd.mg
 
-// mh : https://en.wikipedia.org/wiki/.mh
+// mh : https://www.iana.org/domains/root/db/mh.html
 mh
 
-// mil : https://en.wikipedia.org/wiki/.mil
+// mil : https://www.iana.org/domains/root/db/mil.html
 mil
 
-// mk : https://en.wikipedia.org/wiki/.mk
+// mk : https://www.iana.org/domains/root/db/mk.html
 // see also: http://dns.marnet.net.mk/postapka.php
 mk
 com.mk
-org.mk
-net.mk
 edu.mk
 gov.mk
 inf.mk
 name.mk
+net.mk
+org.mk
 
-// ml : http://www.gobin.info/domainname/ml-template.doc
-// see also: https://en.wikipedia.org/wiki/.ml
+// ml : https://www.iana.org/domains/root/db/ml.html
+// Confirmed by Boubacar NDIAYE <bndiaye@agetic.gouv.ml> 2024-12-31
 ml
+ac.ml
+art.ml
+asso.ml
 com.ml
 edu.ml
 gouv.ml
 gov.ml
+info.ml
+inst.ml
 net.ml
 org.ml
+pr.ml
 presse.ml
 
-// mm : https://en.wikipedia.org/wiki/.mm
+// mm : https://www.iana.org/domains/root/db/mm.html
 *.mm
 
-// mn : https://en.wikipedia.org/wiki/.mn
+// mn : https://www.iana.org/domains/root/db/mn.html
 mn
-gov.mn
 edu.mn
+gov.mn
 org.mn
 
 // mo : http://www.monic.net.mo/
 mo
 com.mo
-net.mo
-org.mo
 edu.mo
 gov.mo
+net.mo
+org.mo
 
-// mobi : https://en.wikipedia.org/wiki/.mobi
+// mobi : https://www.iana.org/domains/root/db/mobi.html
 mobi
 
 // mp : http://www.dot.mp/
 // Confirmed by registry <dcamacho@saipan.com> 2008-06-17
 mp
 
-// mq : https://en.wikipedia.org/wiki/.mq
+// mq : https://www.iana.org/domains/root/db/mq.html
 mq
 
-// mr : https://en.wikipedia.org/wiki/.mr
+// mr : https://www.iana.org/domains/root/db/mr.html
 mr
 gov.mr
 
-// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf
+// ms : https://www.iana.org/domains/root/db/ms.html
 ms
 com.ms
 edu.ms
@@ -4048,20 +4099,20 @@ edu.mt
 net.mt
 org.mt
 
-// mu : https://en.wikipedia.org/wiki/.mu
+// mu : https://www.iana.org/domains/root/db/mu.html
 mu
-com.mu
-net.mu
-org.mu
-gov.mu
 ac.mu
 co.mu
+com.mu
+gov.mu
+net.mu
 or.mu
+org.mu
 
 // museum : https://welcome.museum/wp-content/uploads/2018/05/20180525-Registration-Policy-MUSEUM-EN_VF-2.pdf https://welcome.museum/buy-your-dot-museum-2/
 museum
 
-// mv : https://en.wikipedia.org/wiki/.mv
+// mv : https://www.iana.org/domains/root/db/mv.html
 // "mv" included because, contra Wikipedia, google.mv exists.
 mv
 aero.mv
@@ -4089,7 +4140,6 @@ coop.mw
 edu.mw
 gov.mw
 int.mw
-museum.mw
 net.mw
 org.mw
 
@@ -4097,10 +4147,10 @@ org.mw
 // Submitted by registry <farias@nic.mx>
 mx
 com.mx
-org.mx
-gob.mx
 edu.mx
+gob.mx
 net.mx
+org.mx
 
 // my : http://www.mynic.my/
 // Available strings: https://mynic.my/resources/domains/buying-a-domain/
@@ -4127,27 +4177,16 @@ net.mz
 org.mz
 
 // na : http://www.na-nic.com.na/
-// http://www.info.na/domain/
 na
-info.na
-pro.na
-name.na
-school.na
-or.na
-dr.na
-us.na
-mx.na
-ca.na
-in.na
-cc.na
-tv.na
-ws.na
-mobi.na
+alt.na
 co.na
 com.na
+gov.na
+net.na
 org.na
 
-// name : has 2nd-level tlds, but there's no list of them
+// name : http://www.nic.name/
+// Regarding 2LDs: https://github.com/publicsuffix/list/issues/2306
 name
 
 // nc : http://www.cctld.nc/
@@ -4155,24 +4194,24 @@ nc
 asso.nc
 nom.nc
 
-// ne : https://en.wikipedia.org/wiki/.ne
+// ne : https://www.iana.org/domains/root/db/ne.html
 ne
 
-// net : https://en.wikipedia.org/wiki/.net
+// net : https://www.iana.org/domains/root/db/net.html
 net
 
-// nf : https://en.wikipedia.org/wiki/.nf
+// nf : https://www.iana.org/domains/root/db/nf.html
 nf
-com.nf
-net.nf
-per.nf
-rec.nf
-web.nf
 arts.nf
+com.nf
 firm.nf
 info.nf
+net.nf
 other.nf
+per.nf
+rec.nf
 store.nf
+web.nf
 
 // ng : http://www.nira.org.ng/index.php/join-us/register-ng-domain/189-nira-slds
 ng
@@ -4204,9 +4243,8 @@ nom.ni
 org.ni
 web.ni
 
-// nl : https://en.wikipedia.org/wiki/.nl
-//      https://www.sidn.nl/
-//      ccTLD for the Netherlands
+// nl : https://www.iana.org/domains/root/db/nl.html
+// https://www.sidn.nl/
 nl
 
 // no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
@@ -4217,18 +4255,18 @@ nl
 no
 // Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
 fhs.no
-vgs.no
-fylkesbibl.no
 folkebibl.no
-museum.no
+fylkesbibl.no
 idrett.no
+museum.no
 priv.no
+vgs.no
 // Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
-mil.no
-stat.no
 dep.no
-kommune.no
 herad.no
+kommune.no
+mil.no
+stat.no
 // Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
 // counties
 aa.no
@@ -4280,10 +4318,10 @@ akrehamn.no
 algard.no
 ålgård.no
 arna.no
-brumunddal.no
-bryne.no
 bronnoysund.no
 brønnøysund.no
+brumunddal.no
+bryne.no
 drobak.no
 drøbak.no
 egersund.no
@@ -4327,27 +4365,32 @@ tananger.no
 tranby.no
 vossevangen.no
 // communities
+aarborte.no
+aejrie.no
 afjord.no
 åfjord.no
 agdenes.no
+nes.akershus.no
+aknoluokta.no
+ákŋoluokta.no
 al.no
 ål.no
+alaheadju.no
+álaheadju.no
 alesund.no
 ålesund.no
 alstahaug.no
 alta.no
 áltá.no
-alaheadju.no
-álaheadju.no
 alvdal.no
 amli.no
 åmli.no
 amot.no
 åmot.no
+andasuolo.no
 andebu.no
 andoy.no
 andøy.no
-andasuolo.no
 ardal.no
 årdal.no
 aremark.no
@@ -4357,9 +4400,9 @@ aseral.no
 åseral.no
 asker.no
 askim.no
-askvoll.no
 askoy.no
 askøy.no
+askvoll.no
 asnes.no
 åsnes.no
 audnedaln.no
@@ -4372,27 +4415,37 @@ austevoll.no
 austrheim.no
 averoy.no
 averøy.no
-balestrand.no
-ballangen.no
+badaddja.no
+bådåddjå.no
+bærum.no
+bahcavuotna.no
+báhcavuotna.no
+bahccavuotna.no
+báhccavuotna.no
+baidar.no
+báidár.no
+bajddar.no
+bájddar.no
 balat.no
 bálát.no
+balestrand.no
+ballangen.no
 balsfjord.no
-bahccavuotna.no
-báhccavuotna.no
 bamble.no
 bardu.no
+barum.no
+batsfjord.no
+båtsfjord.no
+bearalvahki.no
+bearalváhki.no
 beardu.no
 beiarn.no
-bajddar.no
-bájddar.no
-baidar.no
-báidár.no
 berg.no
 bergen.no
 berlevag.no
 berlevåg.no
-bearalvahki.no
-bearalváhki.no
+bievat.no
+bievát.no
 bindal.no
 birkenes.no
 bjarkoy.no
@@ -4401,36 +4454,32 @@ bjerkreim.no
 bjugn.no
 bodo.no
 bodø.no
-badaddja.no
-bådåddjå.no
-budejju.no
 bokn.no
+bomlo.no
+bømlo.no
 bremanger.no
 bronnoy.no
 brønnøy.no
+budejju.no
+nes.buskerud.no
 bygland.no
 bykle.no
-barum.no
-bærum.no
-bo.telemark.no
-bø.telemark.no
-bo.nordland.no
-bø.nordland.no
-bievat.no
-bievát.no
-bomlo.no
-bømlo.no
-batsfjord.no
-båtsfjord.no
-bahcavuotna.no
-báhcavuotna.no
+cahcesuolo.no
+čáhcesuolo.no
+davvenjarga.no
+davvenjárga.no
+davvesiida.no
+deatnu.no
+dielddanuorri.no
+divtasvuodna.no
+divttasvuotna.no
+donna.no
+dønna.no
 dovre.no
 drammen.no
 drangedal.no
 dyroy.no
 dyrøy.no
-donna.no
-dønna.no
 eid.no
 eidfjord.no
 eidsberg.no
@@ -4442,14 +4491,12 @@ enebakk.no
 engerdal.no
 etne.no
 etnedal.no
-evenes.no
 evenassi.no
 evenášši.no
+evenes.no
 evje-og-hornnes.no
 farsund.no
 fauske.no
-fuossko.no
-fuoisku.no
 fedje.no
 fet.no
 finnoy.no
@@ -4457,33 +4504,40 @@ finnøy.no
 fitjar.no
 fjaler.no
 fjell.no
+fla.no
+flå.no
 flakstad.no
 flatanger.no
 flekkefjord.no
 flesberg.no
 flora.no
-fla.no
-flå.no
 folldal.no
+forde.no
+førde.no
 forsand.no
 fosnes.no
+fræna.no
+frana.no
 frei.no
 frogn.no
 froland.no
 frosta.no
-frana.no
-fræna.no
 froya.no
 frøya.no
+fuoisku.no
+fuossko.no
 fusa.no
 fyresdal.no
-forde.no
-førde.no
+gaivuotna.no
+gáivuotna.no
+galsa.no
+gálsá.no
 gamvik.no
 gangaviika.no
 gáŋgaviika.no
 gaular.no
 gausdal.no
+giehtavuoatna.no
 gildeskal.no
 gildeskål.no
 giske.no
@@ -4501,38 +4555,37 @@ granvin.no
 gratangen.no
 grimstad.no
 grong.no
-kraanghke.no
-kråanghke.no
 grue.no
 gulen.no
+guovdageaidnu.no
+ha.no
+hå.no
+habmer.no
+hábmer.no
 hadsel.no
+hægebostad.no
+hagebostad.no
 halden.no
 halsa.no
 hamar.no
 hamaroy.no
-habmer.no
-hábmer.no
-hapmir.no
-hápmir.no
-hammerfest.no
 hammarfeasta.no
 hámmárfeasta.no
+hammerfest.no
+hapmir.no
+hápmir.no
 haram.no
 hareid.no
 harstad.no
 hasvik.no
-aknoluokta.no
-ákŋoluokta.no
 hattfjelldal.no
-aarborte.no
 haugesund.no
+os.hedmark.no
+valer.hedmark.no
+våler.hedmark.no
 hemne.no
 hemnes.no
 hemsedal.no
-heroy.more-og-romsdal.no
-herøy.møre-og-romsdal.no
-heroy.nordland.no
-herøy.nordland.no
 hitra.no
 hjartdal.no
 hjelmeland.no
@@ -4544,96 +4597,95 @@ hole.no
 holmestrand.no
 holtalen.no
 holtålen.no
+os.hordaland.no
 hornindal.no
 horten.no
-hurdal.no
-hurum.no
-hvaler.no
-hyllestad.no
-hagebostad.no
-hægebostad.no
 hoyanger.no
 høyanger.no
 hoylandet.no
 høylandet.no
-ha.no
-hå.no
+hurdal.no
+hurum.no
+hvaler.no
+hyllestad.no
 ibestad.no
 inderoy.no
 inderøy.no
 iveland.no
+ivgu.no
 jevnaker.no
-jondal.no
 jolster.no
 jølster.no
-karasjok.no
+jondal.no
+kafjord.no
+kåfjord.no
 karasjohka.no
 kárášjohka.no
+karasjok.no
 karlsoy.no
-galsa.no
-gálsá.no
 karmoy.no
 karmøy.no
 kautokeino.no
-guovdageaidnu.no
-klepp.no
 klabu.no
 klæbu.no
+klepp.no
 kongsberg.no
 kongsvinger.no
+kraanghke.no
+kråanghke.no
 kragero.no
 kragerø.no
 kristiansand.no
 kristiansund.no
 krodsherad.no
 krødsherad.no
+kvæfjord.no
+kvænangen.no
+kvafjord.no
 kvalsund.no
-rahkkeravju.no
-ráhkkerávju.no
 kvam.no
+kvanangen.no
 kvinesdal.no
 kvinnherad.no
 kviteseid.no
 kvitsoy.no
 kvitsøy.no
-kvafjord.no
-kvæfjord.no
-giehtavuoatna.no
-kvanangen.no
-kvænangen.no
-navuotna.no
-návuotna.no
-kafjord.no
-kåfjord.no
-gaivuotna.no
-gáivuotna.no
+laakesvuemie.no
+lærdal.no
+lahppi.no
+láhppi.no
+lardal.no
 larvik.no
-lavangen.no
 lavagis.no
-loabat.no
-loabát.no
+lavangen.no
+leangaviika.no
+leaŋgaviika.no
 lebesby.no
-davvesiida.no
 leikanger.no
 leirfjord.no
 leka.no
 leksvik.no
 lenvik.no
-leangaviika.no
-leaŋgaviika.no
+lerdal.no
 lesja.no
 levanger.no
 lier.no
 lierne.no
 lillehammer.no
 lillesand.no
-lindesnes.no
 lindas.no
 lindås.no
+lindesnes.no
+loabat.no
+loabát.no
+lodingen.no
+lødingen.no
 lom.no
 loppa.no
-lahppi.no
-láhppi.no
+lorenskog.no
+lørenskog.no
+loten.no
+løten.no
 lund.no
 lunner.no
 luroy.no
@@ -4641,25 +4693,19 @@ lurøy.no
 luster.no
 lyngdal.no
 lyngen.no
-ivgu.no
-lardal.no
-lerdal.no
-lærdal.no
-lodingen.no
-lødingen.no
-lorenskog.no
-lørenskog.no
-loten.no
-løten.no
+malatvuopmi.no
+málatvuopmi.no
+malselv.no
+målselv.no
 malvik.no
-masoy.no
-måsøy.no
-muosat.no
-muosát.no
 mandal.no
 marker.no
 marnardal.no
 masfjorden.no
+masoy.no
+måsøy.no
+matta-varjjat.no
+mátta-várjjat.no
 meland.no
 meldal.no
 melhus.no
@@ -4667,39 +4713,39 @@ meloy.no
 meløy.no
 meraker.no
 meråker.no
-moareke.no
-moåreke.no
 midsund.no
 midtre-gauldal.no
+moareke.no
+moåreke.no
 modalen.no
 modum.no
 molde.no
+heroy.more-og-romsdal.no
+sande.more-og-romsdal.no
+herøy.møre-og-romsdal.no
+sande.møre-og-romsdal.no
 moskenes.no
 moss.no
 mosvik.no
-malselv.no
-målselv.no
-malatvuopmi.no
-málatvuopmi.no
+muosat.no
+muosát.no
+naamesjevuemie.no
+nååmesjevuemie.no
+nærøy.no
 namdalseid.no
-aejrie.no
 namsos.no
 namsskogan.no
-naamesjevuemie.no
-nååmesjevuemie.no
-laakesvuemie.no
 nannestad.no
-narvik.no
+naroy.no
 narviika.no
+narvik.no
 naustdal.no
+navuotna.no
+návuotna.no
 nedre-eiker.no
-nes.akershus.no
-nes.buskerud.no
 nesna.no
 nesodden.no
 nesseby.no
-unjarga.no
-unjárga.no
 nesset.no
 nissedal.no
 nittedal.no
@@ -4708,21 +4754,20 @@ nord-fron.no
 nord-odal.no
 norddal.no
 nordkapp.no
-davvenjarga.no
-davvenjárga.no
+bo.nordland.no
+bø.nordland.no
+heroy.nordland.no
+herøy.nordland.no
 nordre-land.no
 nordreisa.no
-raisa.no
-ráisa.no
 nore-og-uvdal.no
 notodden.no
-naroy.no
-nærøy.no
 notteroy.no
 nøtterøy.no
 odda.no
 oksnes.no
 øksnes.no
+omasvuotna.no
 oppdal.no
 oppegard.no
 oppegård.no
@@ -4733,11 +4778,11 @@ orskog.no
 ørskog.no
 orsta.no
 ørsta.no
-os.hedmark.no
-os.hordaland.no
 osen.no
 osteroy.no
 osterøy.no
+valer.ostfold.no
+våler.østfold.no
 ostre-toten.no
 østre-toten.no
 overhalla.no
@@ -4753,12 +4798,19 @@ porsanger.no
 porsangu.no
 porsáŋgu.no
 porsgrunn.no
+rade.no
+råde.no
 radoy.no
 radøy.no
-rakkestad.no
-rana.no
-ruovat.no
-randaberg.no
+rælingen.no
+rahkkeravju.no
+ráhkkerávju.no
+raisa.no
+ráisa.no
+rakkestad.no
+ralingen.no
+rana.no
+randaberg.no
 rauma.no
 rendalen.no
 rennebu.no
@@ -4768,16 +4820,14 @@ rindal.no
 ringebu.no
 ringerike.no
 ringsaker.no
-rissa.no
 risor.no
 risør.no
+rissa.no
 roan.no
-rollag.no
-rygge.no
-ralingen.no
-rælingen.no
 rodoy.no
 rødøy.no
+rollag.no
+romsa.no
 romskog.no
 rømskog.no
 roros.no
@@ -4788,18 +4838,14 @@ royken.no
 røyken.no
 royrvik.no
 røyrvik.no
-rade.no
-råde.no
+ruovat.no
+rygge.no
 salangen.no
-siellak.no
-saltdal.no
 salat.no
-sálát.no
 sálat.no
+sálát.no
+saltdal.no
 samnanger.no
-sande.more-og-romsdal.no
-sande.møre-og-romsdal.no
-sande.vestfold.no
 sandefjord.no
 sandnes.no
 sandoy.no
@@ -4811,39 +4857,60 @@ sel.no
 selbu.no
 selje.no
 seljord.no
+siellak.no
 sigdal.no
 siljan.no
 sirdal.no
+skanit.no
+skánit.no
+skanland.no
+skånland.no
 skaun.no
 skedsmo.no
 ski.no
 skien.no
-skiptvet.no
-skjervoy.no
-skjervøy.no
 skierva.no
 skiervá.no
+skiptvet.no
 skjak.no
 skjåk.no
+skjervoy.no
+skjervøy.no
 skodje.no
-skanland.no
-skånland.no
-skanit.no
-skánit.no
 smola.no
 smøla.no
-snillfjord.no
+snaase.no
+snåase.no
 snasa.no
 snåsa.no
+snillfjord.no
 snoasa.no
-snaase.no
-snåase.no
 sogndal.no
+sogne.no
+søgne.no
 sokndal.no
 sola.no
 solund.no
+somna.no
+sømna.no
+sondre-land.no
+søndre-land.no
 songdalen.no
+sor-aurdal.no
+sør-aurdal.no
+sor-fron.no
+sør-fron.no
+sor-odal.no
+sør-odal.no
+sor-varanger.no
+sør-varanger.no
+sorfold.no
+sørfold.no
+sorreisa.no
+sørreisa.no
 sortland.no
+sorum.no
+sørum.no
 spydeberg.no
 stange.no
 stavanger.no
@@ -4856,7 +4923,6 @@ stor-elvdal.no
 stord.no
 stordal.no
 storfjord.no
-omasvuotna.no
 strand.no
 stranda.no
 stryn.no
@@ -4868,72 +4934,55 @@ surnadal.no
 sveio.no
 svelvik.no
 sykkylven.no
-sogne.no
-søgne.no
-somna.no
-sømna.no
-sondre-land.no
-søndre-land.no
-sor-aurdal.no
-sør-aurdal.no
-sor-fron.no
-sør-fron.no
-sor-odal.no
-sør-odal.no
-sor-varanger.no
-sør-varanger.no
-matta-varjjat.no
-mátta-várjjat.no
-sorfold.no
-sørfold.no
-sorreisa.no
-sørreisa.no
-sorum.no
-sørum.no
 tana.no
-deatnu.no
+bo.telemark.no
+bø.telemark.no
 time.no
 tingvoll.no
 tinn.no
 tjeldsund.no
-dielddanuorri.no
 tjome.no
 tjøme.no
 tokke.no
 tolga.no
+tonsberg.no
+tønsberg.no
 torsken.no
+træna.no
+trana.no
 tranoy.no
 tranøy.no
+troandin.no
+trogstad.no
+trøgstad.no
+tromsa.no
 tromso.no
 tromsø.no
-tromsa.no
-romsa.no
 trondheim.no
-troandin.no
 trysil.no
-trana.no
-træna.no
-trogstad.no
-trøgstad.no
 tvedestrand.no
 tydal.no
 tynset.no
 tysfjord.no
-divtasvuodna.no
-divttasvuotna.no
 tysnes.no
-tysvar.no
 tysvær.no
-tonsberg.no
-tønsberg.no
+tysvar.no
 ullensaker.no
 ullensvang.no
 ulvik.no
+unjarga.no
+unjárga.no
 utsira.no
+vaapste.no
 vadso.no
 vadsø.no
-cahcesuolo.no
-čáhcesuolo.no
+værøy.no
+vaga.no
+vågå.no
+vagan.no
+vågan.no
+vagsoy.no
+vågsøy.no
 vaksdal.no
 valle.no
 vang.no
@@ -4942,8 +4991,8 @@ vardo.no
 vardø.no
 varggat.no
 várggát.no
+varoy.no
 vefsn.no
-vaapste.no
 vega.no
 vegarshei.no
 vegårshei.no
@@ -4951,6 +5000,7 @@ vennesla.no
 verdal.no
 verran.no
 vestby.no
+sande.vestfold.no
 vestnes.no
 vestre-slidre.no
 vestre-toten.no
@@ -4960,21 +5010,9 @@ vevelstad.no
 vik.no
 vikna.no
 vindafjord.no
+voagat.no
 volda.no
 voss.no
-varoy.no
-værøy.no
-vagan.no
-vågan.no
-voagat.no
-vagsoy.no
-vågsøy.no
-vaga.no
-vågå.no
-valer.ostfold.no
-våler.østfold.no
-valer.hedmark.no
-våler.hedmark.no
 
 // np : http://www.mos.com.np/register.html
 *.np
@@ -4983,17 +5021,17 @@ våler.hedmark.no
 // Submitted by registry <technician@cenpac.net.nr>
 nr
 biz.nr
-info.nr
-gov.nr
+com.nr
 edu.nr
-org.nr
+gov.nr
+info.nr
 net.nr
-com.nr
+org.nr
 
-// nu : https://en.wikipedia.org/wiki/.nu
+// nu : https://www.iana.org/domains/root/db/nu.html
 nu
 
-// nz : https://en.wikipedia.org/wiki/.nz
+// nz : https://www.iana.org/domains/root/db/nz.html
 // Submitted by registry <jay@nzrs.net.nz>
 nz
 ac.nz
@@ -5006,14 +5044,14 @@ health.nz
 iwi.nz
 kiwi.nz
 maori.nz
-mil.nz
 māori.nz
+mil.nz
 net.nz
 org.nz
 parliament.nz
 school.nz
 
-// om : https://en.wikipedia.org/wiki/.om
+// om : https://www.iana.org/domains/root/db/om.html
 om
 co.om
 com.om
@@ -5028,82 +5066,84 @@ pro.om
 // onion : https://tools.ietf.org/html/rfc7686
 onion
 
-// org : https://en.wikipedia.org/wiki/.org
+// org : https://www.iana.org/domains/root/db/org.html
 org
 
 // pa : http://www.nic.pa/
 // Some additional second level "domains" resolve directly as hostnames, such as
 // pannet.pa, so we add a rule for "pa".
 pa
+abo.pa
 ac.pa
-gob.pa
 com.pa
-org.pa
-sld.pa
 edu.pa
-net.pa
+gob.pa
 ing.pa
-abo.pa
 med.pa
+net.pa
 nom.pa
+org.pa
+sld.pa
 
 // pe : https://www.nic.pe/InformeFinalComision.pdf
 pe
+com.pe
 edu.pe
 gob.pe
-nom.pe
 mil.pe
-org.pe
-com.pe
 net.pe
+nom.pe
+org.pe
 
 // pf : http://www.gobin.info/domainname/formulaire-pf.pdf
 pf
 com.pf
-org.pf
 edu.pf
+org.pf
 
-// pg : https://en.wikipedia.org/wiki/.pg
+// pg : https://www.iana.org/domains/root/db/pg.html
 *.pg
 
-// ph : http://www.domains.ph/FAQ2.asp
+// ph : https://www.iana.org/domains/root/db/ph.html
 // Submitted by registry <jed@email.com.ph>
 ph
 com.ph
-net.ph
-org.ph
-gov.ph
 edu.ph
-ngo.ph
-mil.ph
+gov.ph
 i.ph
+mil.ph
+net.ph
+ngo.ph
+org.ph
 
-// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// pk : https://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// Contact Email: staff@pknic.net.pk
 pk
+ac.pk
+biz.pk
 com.pk
-net.pk
 edu.pk
-org.pk
 fam.pk
-biz.pk
-web.pk
-gov.pk
+gkp.pk
 gob.pk
+gog.pk
 gok.pk
-gon.pk
 gop.pk
 gos.pk
-info.pk
+gov.pk
+net.pk
+org.pk
+web.pk
 
-// pl http://www.dns.pl/english/index.html
-// Submitted by registry
+// pl : https://www.dns.pl/en/
+// Confirmed by registry <info@dns.pl> 2024-11-18
 pl
 com.pl
 net.pl
 org.pl
-// pl functional domains (http://www.dns.pl/english/index.html)
-aid.pl
+// pl functional domains : https://www.dns.pl/en/list_of_functional_domain_names
 agro.pl
+aid.pl
 atm.pl
 auto.pl
 biz.pl
@@ -5112,8 +5152,8 @@ gmina.pl
 gsm.pl
 info.pl
 mail.pl
-miasta.pl
 media.pl
+miasta.pl
 mil.pl
 nieruchomosci.pl
 nom.pl
@@ -5132,7 +5172,8 @@ tm.pl
 tourism.pl
 travel.pl
 turystyka.pl
-// Government domains
+// Government domains : https://www.dns.pl/informacje_o_rejestracji_domen_gov_pl
+// In accordance with the .gov.pl Domain Name Regulations : https://www.dns.pl/regulamin_gov_pl
 gov.pl
 ap.gov.pl
 griw.gov.pl
@@ -5189,7 +5230,7 @@ wuoz.gov.pl
 wzmiuw.gov.pl
 zp.gov.pl
 zpisdn.gov.pl
-// pl regional domains (http://www.dns.pl/english/index.html)
+// pl regional domains : https://www.dns.pl/en/list_of_regional_domain_names
 augustow.pl
 babia-gora.pl
 bedzin.pl
@@ -5216,11 +5257,11 @@ jaworzno.pl
 jelenia-gora.pl
 jgora.pl
 kalisz.pl
-kazimierz-dolny.pl
 karpacz.pl
 kartuzy.pl
 kaszuby.pl
 katowice.pl
+kazimierz-dolny.pl
 kepno.pl
 ketrzyn.pl
 klodzko.pl
@@ -5263,8 +5304,8 @@ pisz.pl
 podhale.pl
 podlasie.pl
 polkowice.pl
-pomorze.pl
 pomorskie.pl
+pomorze.pl
 prochowice.pl
 pruszkow.pl
 przeworsk.pl
@@ -5275,11 +5316,11 @@ rybnik.pl
 rzeszow.pl
 sanok.pl
 sejny.pl
+skoczow.pl
 slask.pl
 slupsk.pl
 sosnowiec.pl
 stalowa-wola.pl
-skoczow.pl
 starachowice.pl
 stargard.pl
 suwalki.pl
@@ -5313,33 +5354,33 @@ zgorzelec.pl
 // pm : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 pm
 
-// pn : http://www.government.pn/PnRegistry/policies.htm
+// pn : https://www.iana.org/domains/root/db/pn.html
 pn
-gov.pn
 co.pn
-org.pn
 edu.pn
+gov.pn
 net.pn
+org.pn
 
-// post : https://en.wikipedia.org/wiki/.post
+// post : https://www.iana.org/domains/root/db/post.html
 post
 
 // pr : http://www.nic.pr/index.asp?f=1
 pr
+biz.pr
 com.pr
-net.pr
-org.pr
-gov.pr
 edu.pr
-isla.pr
-pro.pr
-biz.pr
+gov.pr
 info.pr
+isla.pr
 name.pr
-// these aren't mentioned on nic.pr, but on https://en.wikipedia.org/wiki/.pr
+net.pr
+org.pr
+pro.pr
+// these aren't mentioned on nic.pr, but on https://www.iana.org/domains/root/db/pr.html
+ac.pr
 est.pr
 prof.pr
-ac.pr
 
 // pro : http://registry.pro/get-pro
 pro
@@ -5355,38 +5396,34 @@ law.pro
 med.pro
 recht.pro
 
-// ps : https://en.wikipedia.org/wiki/.ps
+// ps : https://www.iana.org/domains/root/db/ps.html
 // http://www.nic.ps/registration/policy.html#reg
 ps
+com.ps
 edu.ps
 gov.ps
-sec.ps
-plo.ps
-com.ps
-org.ps
 net.ps
+org.ps
+plo.ps
+sec.ps
 
 // pt : https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/
 pt
-net.pt
-gov.pt
-org.pt
+com.pt
 edu.pt
+gov.pt
 int.pt
-publ.pt
-com.pt
+net.pt
 nome.pt
+org.pt
+publ.pt
 
-// pw : https://en.wikipedia.org/wiki/.pw
+// pw : https://www.iana.org/domains/root/db/pw.html
+// Confirmed by registry in private correspondence with @dnsguru 2024-12-09
 pw
-co.pw
-ne.pw
-or.pw
-ed.pw
-go.pw
-belau.pw
-
-// py : http://www.nic.py/pautas.html#seccion_9
+gov.pw
+
+// py : https://www.iana.org/domains/root/db/py.html
 // Submitted by registry
 py
 com.py
@@ -5409,10 +5446,11 @@ org.qa
 sch.qa
 
 // re : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
+// Confirmed by registry <support@afnic.fr> 2024-11-18
 re
+// Closed for registration on 2013-03-15 but domains are still maintained
 asso.re
 com.re
-nom.re
 
 // ro : http://www.rotld.ro/
 ro
@@ -5441,7 +5479,7 @@ org.rs
 // Submitted by George Georgievsky <gug@cctld.ru>
 ru
 
-// rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
+// rw : https://www.iana.org/domains/root/db/rw.html
 rw
 ac.rw
 co.rw
@@ -5454,12 +5492,12 @@ org.rw
 // sa : http://www.nic.net.sa/
 sa
 com.sa
-net.sa
-org.sa
+edu.sa
 gov.sa
 med.sa
+net.sa
+org.sa
 pub.sa
-edu.sa
 sch.sa
 
 // sb : http://www.sbnic.net.sb/
@@ -5474,25 +5512,26 @@ org.sb
 // sc : http://www.nic.sc/
 sc
 com.sc
+edu.sc
 gov.sc
 net.sc
 org.sc
-edu.sc
 
-// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
+// sd : https://www.iana.org/domains/root/db/sd.html
 // Submitted by registry <admin@isoc.sd>
 sd
 com.sd
-net.sd
-org.sd
 edu.sd
-med.sd
-tv.sd
 gov.sd
 info.sd
-
-// se : https://en.wikipedia.org/wiki/.se
-// Submitted by registry <patrik.wallstrom@iis.se>
+med.sd
+net.sd
+org.sd
+tv.sd
+
+// se : https://www.iana.org/domains/root/db/se.html
+// https://data.internetstiftelsen.se/barred_domains_list.txt -> Second level domains & Sub-domains
+// Confirmed by Registry Services <registry@internetstiftelsen.se> 2024-11-20
 se
 a.se
 ac.se
@@ -5534,47 +5573,46 @@ x.se
 y.se
 z.se
 
-// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines
+// sg : https://www.sgnic.sg/domain-registration/sg-categories-rules
+// Confirmed by registry <dnq@sgnic.sg> 2024-11-19
 sg
 com.sg
+edu.sg
+gov.sg
 net.sg
 org.sg
-gov.sg
-edu.sg
-per.sg
 
 // sh : http://nic.sh/rules.htm
 sh
 com.sh
-net.sh
 gov.sh
-org.sh
 mil.sh
+net.sh
+org.sh
 
-// si : https://en.wikipedia.org/wiki/.si
+// si : https://www.iana.org/domains/root/db/si.html
 si
 
 // sj : No registrations at this time.
 // Submitted by registry <jarle@uninett.no>
 sj
 
-// sk : https://en.wikipedia.org/wiki/.sk
-// list of 2nd level domains ?
+// sk : https://www.iana.org/domains/root/db/sk.html
 sk
 
 // sl : http://www.nic.sl
 // Submitted by registry <adam@neoip.com>
 sl
 com.sl
-net.sl
 edu.sl
 gov.sl
+net.sl
 org.sl
 
-// sm : https://en.wikipedia.org/wiki/.sm
+// sm : https://www.iana.org/domains/root/db/sm.html
 sm
 
-// sn : https://en.wikipedia.org/wiki/.sn
+// sn : https://www.iana.org/domains/root/db/sn.html
 sn
 art.sn
 com.sn
@@ -5593,13 +5631,14 @@ me.so
 net.so
 org.so
 
-// sr : https://en.wikipedia.org/wiki/.sr
+// sr : https://www.iana.org/domains/root/db/sr.html
 sr
 
 // ss : https://registry.nic.ss/
 // Submitted by registry <technical@nic.ss>
 ss
 biz.ss
+co.ss
 com.ss
 edu.ss
 gov.ss
@@ -5622,10 +5661,10 @@ principe.st
 saotome.st
 store.st
 
-// su : https://en.wikipedia.org/wiki/.su
+// su : https://www.iana.org/domains/root/db/su.html
 su
 
-// sv : http://www.svnet.org.sv/niveldos.pdf
+// sv : https://www.iana.org/domains/root/db/sv.html
 sv
 com.sv
 edu.sv
@@ -5633,46 +5672,45 @@ gob.sv
 org.sv
 red.sv
 
-// sx : https://en.wikipedia.org/wiki/.sx
+// sx : https://www.iana.org/domains/root/db/sx.html
 // Submitted by registry <jcvignes@openregistry.com>
 sx
 gov.sx
 
-// sy : https://en.wikipedia.org/wiki/.sy
-// see also: http://www.gobin.info/domainname/sy.doc
+// sy : https://www.iana.org/domains/root/db/sy.html
 sy
+com.sy
 edu.sy
 gov.sy
-net.sy
 mil.sy
-com.sy
+net.sy
 org.sy
 
-// sz : https://en.wikipedia.org/wiki/.sz
+// sz : https://www.iana.org/domains/root/db/sz.html
 // http://www.sispa.org.sz/
 sz
-co.sz
 ac.sz
+co.sz
 org.sz
 
-// tc : https://en.wikipedia.org/wiki/.tc
+// tc : https://www.iana.org/domains/root/db/tc.html
 tc
 
-// td : https://en.wikipedia.org/wiki/.td
+// td : https://www.iana.org/domains/root/db/td.html
 td
 
-// tel: https://en.wikipedia.org/wiki/.tel
+// tel : https://www.iana.org/domains/root/db/tel.html
 // http://www.telnic.org/
 tel
 
 // tf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 tf
 
-// tg : https://en.wikipedia.org/wiki/.tg
+// tg : https://www.iana.org/domains/root/db/tg.html
 // http://www.nic.tg/
 tg
 
-// th : https://en.wikipedia.org/wiki/.th
+// th : https://www.iana.org/domains/root/db/th.html
 // Submitted by registry <krit@thains.co.th>
 th
 ac.th
@@ -5701,23 +5739,24 @@ org.tj
 test.tj
 web.tj
 
-// tk : https://en.wikipedia.org/wiki/.tk
+// tk : https://www.iana.org/domains/root/db/tk.html
 tk
 
-// tl : https://en.wikipedia.org/wiki/.tl
+// tl : https://www.iana.org/domains/root/db/tl.html
 tl
 gov.tl
 
-// tm : http://www.nic.tm/local.html
+// tm : https://www.nic.tm/local.html
+// Confirmed by registry <admin@nic.TM> 2024-11-19
 tm
-com.tm
 co.tm
-org.tm
-net.tm
-nom.tm
+com.tm
+edu.tm
 gov.tm
 mil.tm
-edu.tm
+net.tm
+nom.tm
+org.tm
 
 // tn : http://www.registre.tn/fr/
 // https://whois.ati.tn/
@@ -5736,15 +5775,15 @@ org.tn
 perso.tn
 tourism.tn
 
-// to : https://en.wikipedia.org/wiki/.to
+// to : https://www.iana.org/domains/root/db/to.html
 // Submitted by registry <egullich@colo.to>
 to
 com.to
+edu.to
 gov.to
+mil.to
 net.to
 org.to
-edu.to
-mil.to
 
 // tr : https://nic.tr/
 // https://nic.tr/forms/eng/policies.pdf
@@ -5760,9 +5799,9 @@ edu.tr
 gen.tr
 gov.tr
 info.tr
-mil.tr
 k12.tr
 kep.tr
+mil.tr
 name.tr
 net.tr
 org.tr
@@ -5776,46 +5815,40 @@ nc.tr
 // Used by government agencies of Northern Cyprus
 gov.nc.tr
 
-// tt : http://www.nic.tt/
+// tt : https://www.nic.tt/
+// Confirmed by registry <admin@nic.tt> 2024-11-19
 tt
+biz.tt
 co.tt
 com.tt
-org.tt
-net.tt
-biz.tt
+edu.tt
+gov.tt
 info.tt
-pro.tt
-int.tt
-coop.tt
-jobs.tt
-mobi.tt
-travel.tt
-museum.tt
-aero.tt
+mil.tt
 name.tt
-gov.tt
-edu.tt
+net.tt
+org.tt
+pro.tt
 
-// tv : https://en.wikipedia.org/wiki/.tv
+// tv : https://www.iana.org/domains/root/db/tv.html
 // Not listing any 2LDs as reserved since none seem to exist in practice,
 // Wikipedia notwithstanding.
 tv
 
-// tw : https://en.wikipedia.org/wiki/.tw
+// tw : https://www.iana.org/domains/root/db/tw.html
+// https://twnic.tw/dnservice_catag.php
+// Confirmed by registry <dns@twnic.tw> 2024-11-26
 tw
+club.tw
+com.tw
+ebiz.tw
 edu.tw
+game.tw
 gov.tw
+idv.tw
 mil.tw
-com.tw
 net.tw
 org.tw
-idv.tw
-game.tw
-ebiz.tw
-club.tw
-網路.tw
-組織.tw
-商業.tw
 
 // tz : http://www.tznic.or.tz/index.php/domains
 // Submitted by registry <manager@tznic.or.tz>
@@ -5920,17 +5953,23 @@ zp.ua
 zt.ua
 
 // ug : https://www.registry.co.ug/
+// https://www.registry.co.ug, https://whois.co.ug
+// Confirmed by registry <support@i3c.co.ug> 2025-01-20
 ug
-co.ug
-or.ug
 ac.ug
-sc.ug
+co.ug
+com.ug
+edu.ug
 go.ug
+gov.ug
+mil.ug
 ne.ug
-com.ug
+or.ug
 org.ug
+sc.ug
+us.ug
 
-// uk : https://en.wikipedia.org/wiki/.uk
+// uk : https://www.iana.org/domains/root/db/uk.html
 // Submitted by registry <Michael.Daly@nominet.org.uk>
 uk
 ac.uk
@@ -5945,14 +5984,13 @@ plc.uk
 police.uk
 *.sch.uk
 
-// us : https://en.wikipedia.org/wiki/.us
+// us : https://www.iana.org/domains/root/db/us.html
+// Confirmed via the .us zone file by William Harrison 2024-12-10
 us
 dni.us
-fed.us
 isa.us
-kids.us
 nsn.us
-// us geographic names
+// Geographic Names
 ak.us
 al.us
 ar.us
@@ -6001,9 +6039,9 @@ sd.us
 tn.us
 tx.us
 ut.us
+va.us
 vi.us
 vt.us
-va.us
 wa.us
 wi.us
 wv.us
@@ -6026,7 +6064,7 @@ k12.dc.us
 k12.fl.us
 k12.ga.us
 k12.gu.us
-// k12.hi.us  Bug 614565 - Hawaii has a state-wide DOE login
+// k12.hi.us - Bug 614565 - Hawaii has a state-wide DOE login
 k12.ia.us
 k12.id.us
 k12.il.us
@@ -6043,7 +6081,7 @@ k12.mo.us
 k12.ms.us
 k12.mt.us
 k12.nc.us
-// k12.nd.us  Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
+// k12.nd.us - Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
 k12.ne.us
 k12.nh.us
 k12.nj.us
@@ -6055,28 +6093,36 @@ k12.ok.us
 k12.or.us
 k12.pa.us
 k12.pr.us
-// k12.ri.us  Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
+// k12.ri.us - Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
 k12.sc.us
-// k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
+// k12.sd.us - Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
 k12.tx.us
 k12.ut.us
+k12.va.us
 k12.vi.us
 k12.vt.us
-k12.va.us
 k12.wa.us
 k12.wi.us
-// k12.wv.us  Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
-k12.wy.us
+// k12.wv.us - Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
 cc.ak.us
+lib.ak.us
 cc.al.us
+lib.al.us
 cc.ar.us
+lib.ar.us
 cc.as.us
+lib.as.us
 cc.az.us
+lib.az.us
 cc.ca.us
+lib.ca.us
 cc.co.us
+lib.co.us
 cc.ct.us
+lib.ct.us
 cc.dc.us
+lib.dc.us
 cc.de.us
 cc.fl.us
 cc.ga.us
@@ -6116,23 +6162,15 @@ cc.sd.us
 cc.tn.us
 cc.tx.us
 cc.ut.us
+cc.va.us
 cc.vi.us
 cc.vt.us
-cc.va.us
 cc.wa.us
 cc.wi.us
 cc.wv.us
 cc.wy.us
-lib.ak.us
-lib.al.us
-lib.ar.us
-lib.as.us
-lib.az.us
-lib.ca.us
-lib.co.us
-lib.ct.us
-lib.dc.us
-// lib.de.us  Issue #243 - Moved to Private section at request of Ed Moore <Ed.Moore@lib.de.us>
+k12.wy.us
+// lib.de.us - Issue #243 - Moved to Private section at request of Ed Moore <Ed.Moore@lib.de.us>
 lib.fl.us
 lib.ga.us
 lib.gu.us
@@ -6171,23 +6209,23 @@ lib.sd.us
 lib.tn.us
 lib.tx.us
 lib.ut.us
+lib.va.us
 lib.vi.us
 lib.vt.us
-lib.va.us
 lib.wa.us
 lib.wi.us
-// lib.wv.us  Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
+// lib.wv.us - Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
 lib.wy.us
 // k12.ma.us contains school districts in Massachusetts. The 4LDs are
-//  managed independently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated directly to the
-//  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
-pvt.k12.ma.us
+// managed independently except for private (PVT), charter (CHTR) and
+// parochial (PAROCH) schools. Those are delegated directly to the
+// 5LD operators. <k12-ma-hostmaster@rsuc.gweep.net>
 chtr.k12.ma.us
 paroch.k12.ma.us
+pvt.k12.ma.us
 // Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following
-//    see also: http://domreg.merit.edu
-//    see also: whois -h whois.domreg.merit.edu help
+// see also: https://domreg.merit.edu : domreg@merit.edu
+// see also: whois -h whois.domreg.merit.edu help
 ann-arbor.mi.us
 cog.mi.us
 dst.mi.us
@@ -6213,18 +6251,18 @@ com.uz
 net.uz
 org.uz
 
-// va : https://en.wikipedia.org/wiki/.va
+// va : https://www.iana.org/domains/root/db/va.html
 va
 
-// vc : https://en.wikipedia.org/wiki/.vc
+// vc : https://www.iana.org/domains/root/db/vc.html
 // Submitted by registry <kshah@ca.afilias.info>
 vc
 com.vc
-net.vc
-org.vc
+edu.vc
 gov.vc
 mil.vc
-edu.vc
+net.vc
+org.vc
 
 // ve : https://registro.nic.ve/
 // Submitted by registry nic@nic.ve and nicve@conatel.gob.ve
@@ -6235,6 +6273,7 @@ co.ve
 com.ve
 e12.ve
 edu.ve
+emprende.ve
 firm.ve
 gob.ve
 gov.ve
@@ -6250,13 +6289,12 @@ store.ve
 tec.ve
 web.ve
 
-// vg : https://en.wikipedia.org/wiki/.vg
+// vg : https://www.iana.org/domains/root/db/vg.html
+// Confirmed by registry <tld.ops@centralnic.com> 2025-01-10
 vg
+edu.vg
 
-// vi : http://www.nic.vi/newdomainform.htm
-// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
-// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
-// are available for registration (which they do not seem to be).
+// vi : https://www.iana.org/domains/root/db/vi.html
 vi
 co.vi
 com.vi
@@ -6348,7 +6386,7 @@ vinhlong.vn
 vinhphuc.vn
 yenbai.vn
 
-// vu : https://en.wikipedia.org/wiki/.vu
+// vu : https://www.iana.org/domains/root/db/vu.html
 // http://www.vunic.vu/
 vu
 com.vu
@@ -6359,14 +6397,14 @@ org.vu
 // wf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 wf
 
-// ws : https://en.wikipedia.org/wiki/.ws
+// ws : https://www.iana.org/domains/root/db/ws.html
 // http://samoanic.ws/index.dhtml
 ws
 com.ws
+edu.ws
+gov.ws
 net.ws
 org.ws
-gov.ws
-edu.ws
 
 // yt : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 yt
@@ -6401,12 +6439,12 @@ yt
 
 // xn--fiqs8s ("Zhongguo/China", Chinese, Simplified) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.cn/11/192/index.html
 中国
 
 // xn--fiqz9s ("Zhongguo/China", Chinese, Traditional) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.com.cn/AU/MediaC/Announcement/201609/t20160905_54470.htm
 中國
 
 // xn--lgbbat1ad8j ("Algeria/Al Jazair", Arabic) : DZ
@@ -6439,12 +6477,12 @@ yt
 // Submitted by registry <hk.tech@hkirc.hk>
 // https://www.hkirc.hk/content.jsp?id=30#!/34
 香港
+個人.香港
 公司.香港
-教育.香港
 政府.香港
-個人.香港
-網絡.香港
+教育.香港
 組織.香港
+網絡.香港
 
 // xn--2scrj9c ("Bharat", Kannada) : IN
 // India
@@ -6575,12 +6613,12 @@ yt
 // xn--90a3ac ("srb", Cyrillic) : RS
 // https://www.rnids.rs/en/domains/national-domains
 срб
-пр.срб
-орг.срб
+ак.срб
 обр.срб
 од.срб
+орг.срб
+пр.срб
 упр.срб
-ак.срб
 
 // xn--p1ai ("rf", Russian-Cyrillic) : RU
 // https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
@@ -6595,7 +6633,7 @@ yt
 // http://www.nic.net.sa/
 السعودية
 
-// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant)  : SA
+// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant): SA
 السعودیة
 
 // xn--mgbqly7c0a67fbc ("AlSaudiah", Arabic, variant) : SA
@@ -6623,11 +6661,11 @@ yt
 // xn--o3cw4h ("Thai", Thai) : TH
 // http://www.thnic.co.th
 ไทย
-ศึกษา.ไทย
-ธุรกิจ.ไทย
-รัฐบาล.ไทย
 ทหาร.ไทย
+ธุรกิจ.ไทย
 เน็ต.ไทย
+รัฐบาล.ไทย
+ศึกษา.ไทย
 องค์กร.ไทย
 
 // xn--pgbs0dh ("Tunisia", Arabic) : TN
@@ -6635,7 +6673,7 @@ yt
 تونس
 
 // xn--kpry57d ("Taiwan", Chinese, Traditional) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
+// https://twnic.tw/dnservice_catag.php
 台灣
 
 // xn--kprw13d ("Taiwan", Chinese, Simplified) : TW
@@ -6659,11 +6697,11 @@ ye
 com.ye
 edu.ye
 gov.ye
-net.ye
 mil.ye
+net.ye
 org.ye
 
-// za : https://www.zadna.org.za/content/page/domain-information/
+// za : https://www.iana.org/domains/root/db/za.html
 ac.za
 agric.za
 alt.za
@@ -6707,10 +6745,9 @@ gov.zw
 mil.zw
 org.zw
 
-
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-05-04T15:12:50Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2025-04-30T15:19:32Z
 // This list is auto-generated, don't edit it manually.
 // aaa : American Automobile Association, Inc.
 // https://www.iana.org/domains/root/db/aaa.html
@@ -6940,7 +6977,7 @@ art
 // https://www.iana.org/domains/root/db/arte.html
 arte
 
-// asda : Wal-Mart Stores, Inc.
+// asda : Asda Stores Limited
 // https://www.iana.org/domains/root/db/asda.html
 asda
 
@@ -7092,10 +7129,6 @@ beauty
 // https://www.iana.org/domains/root/db/beer.html
 beer
 
-// bentley : Bentley Motors Limited
-// https://www.iana.org/domains/root/db/bentley.html
-bentley
-
 // berlin : dotBERLIN GmbH & Co. KG
 // https://www.iana.org/domains/root/db/berlin.html
 berlin
@@ -7656,10 +7689,6 @@ cymru
 // https://www.iana.org/domains/root/db/cyou.html
 cyou
 
-// dabur : Dabur India Limited
-// https://www.iana.org/domains/root/db/dabur.html
-dabur
-
 // dad : Charleston Road Registry Inc.
 // https://www.iana.org/domains/root/db/dad.html
 dad
@@ -8112,7 +8141,7 @@ forex
 // https://www.iana.org/domains/root/db/forsale.html
 forsale
 
-// forum : Fegistry, LLC
+// forum : Waterford Limited
 // https://www.iana.org/domains/root/db/forum.html
 forum
 
@@ -8152,7 +8181,7 @@ ftr
 // https://www.iana.org/domains/root/db/fujitsu.html
 fujitsu
 
-// fun : Radix Technologies Inc.
+// fun : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/fun.html
 fun
 
@@ -8392,11 +8421,11 @@ haus
 // https://www.iana.org/domains/root/db/hbo.html
 hbo
 
-// hdfc : HOUSING DEVELOPMENT FINANCE CORPORATION LIMITED
+// hdfc : HDFC BANK LIMITED
 // https://www.iana.org/domains/root/db/hdfc.html
 hdfc
 
-// hdfcbank : HDFC Bank Limited
+// hdfcbank : HDFC BANK LIMITED
 // https://www.iana.org/domains/root/db/hdfcbank.html
 hdfcbank
 
@@ -8484,7 +8513,7 @@ horse
 // https://www.iana.org/domains/root/db/hospital.html
 hospital
 
-// host : Radix Technologies Inc.
+// host : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/host.html
 host
 
@@ -8724,10 +8753,6 @@ kddi
 // https://www.iana.org/domains/root/db/kerryhotels.html
 kerryhotels
 
-// kerrylogistics : Kerry Trading Co. Limited
-// https://www.iana.org/domains/root/db/kerrylogistics.html
-kerrylogistics
-
 // kerryproperties : Kerry Trading Co. Limited
 // https://www.iana.org/domains/root/db/kerryproperties.html
 kerryproperties
@@ -8808,10 +8833,6 @@ lamborghini
 // https://www.iana.org/domains/root/db/lamer.html
 lamer
 
-// lancaster : LANCASTER
-// https://www.iana.org/domains/root/db/lancaster.html
-lancaster
-
 // land : Binky Moon, LLC
 // https://www.iana.org/domains/root/db/land.html
 land
@@ -8924,10 +8945,6 @@ lincoln
 // https://www.iana.org/domains/root/db/link.html
 link
 
-// lipsy : Lipsy Ltd
-// https://www.iana.org/domains/root/db/lipsy.html
-lipsy
-
 // live : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/live.html
 live
@@ -8976,7 +8993,7 @@ lotte
 // https://www.iana.org/domains/root/db/lotto.html
 lotto
 
-// love : Merchant Law Group LLP
+// love : Waterford Limited
 // https://www.iana.org/domains/root/db/love.html
 love
 
@@ -9024,7 +9041,7 @@ maison
 // https://www.iana.org/domains/root/db/makeup.html
 makeup
 
-// man : MAN SE
+// man : MAN Truck & Bus SE
 // https://www.iana.org/domains/root/db/man.html
 man
 
@@ -9060,7 +9077,7 @@ marriott
 // https://www.iana.org/domains/root/db/marshalls.html
 marshalls
 
-// mattel : Mattel Sites, Inc.
+// mattel : Mattel IT Services, Inc.
 // https://www.iana.org/domains/root/db/mattel.html
 mattel
 
@@ -9104,6 +9121,10 @@ men
 // https://www.iana.org/domains/root/db/menu.html
 menu
 
+// merck : Merck Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/merck.html
+merck
+
 // merckmsd : MSD Registry Holdings, Inc.
 // https://www.iana.org/domains/root/db/merckmsd.html
 merckmsd
@@ -9228,10 +9249,6 @@ nab
 // https://www.iana.org/domains/root/db/nagoya.html
 nagoya
 
-// natura : NATURA COSMÉTICOS S.A.
-// https://www.iana.org/domains/root/db/natura.html
-natura
-
 // navy : Dog Beach, LLC
 // https://www.iana.org/domains/root/db/navy.html
 navy
@@ -9320,7 +9337,7 @@ nissay
 // https://www.iana.org/domains/root/db/nokia.html
 nokia
 
-// norton : NortonLifeLock Inc.
+// norton : Gen Digital Inc.
 // https://www.iana.org/domains/root/db/norton.html
 norton
 
@@ -9328,7 +9345,7 @@ norton
 // https://www.iana.org/domains/root/db/now.html
 now
 
-// nowruz : Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// nowruz
 // https://www.iana.org/domains/root/db/nowruz.html
 nowruz
 
@@ -9396,7 +9413,7 @@ ong
 // https://www.iana.org/domains/root/db/onl.html
 onl
 
-// online : Radix Technologies Inc.
+// online : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/online.html
 online
 
@@ -9452,7 +9469,7 @@ panasonic
 // https://www.iana.org/domains/root/db/paris.html
 paris
 
-// pars : Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// pars
 // https://www.iana.org/domains/root/db/pars.html
 pars
 
@@ -9520,7 +9537,7 @@ physio
 // https://www.iana.org/domains/root/db/pics.html
 pics
 
-// pictet : Pictet Europe S.A.
+// pictet : Banque Pictet & Cie SA
 // https://www.iana.org/domains/root/db/pictet.html
 pictet
 
@@ -9600,7 +9617,7 @@ pramerica
 // https://www.iana.org/domains/root/db/praxi.html
 praxi
 
-// press : Radix Technologies Inc.
+// press : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/press.html
 press
 
@@ -9688,7 +9705,7 @@ realestate
 // https://www.iana.org/domains/root/db/realtor.html
 realtor
 
-// realty : Internet Naming Company LLC
+// realty : Waterford Limited
 // https://www.iana.org/domains/root/db/realty.html
 realty
 
@@ -10004,15 +10021,11 @@ shangrila
 // https://www.iana.org/domains/root/db/sharp.html
 sharp
 
-// shaw : Shaw Cablesystems G.P.
-// https://www.iana.org/domains/root/db/shaw.html
-shaw
-
 // shell : Shell Information Technology International Inc
 // https://www.iana.org/domains/root/db/shell.html
 shell
 
-// shia : Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// shia
 // https://www.iana.org/domains/root/db/shia.html
 shia
 
@@ -10052,7 +10065,7 @@ sina
 // https://www.iana.org/domains/root/db/singles.html
 singles
 
-// site : Radix Technologies Inc.
+// site : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/site.html
 site
 
@@ -10064,7 +10077,7 @@ ski
 // https://www.iana.org/domains/root/db/skin.html
 skin
 
-// sky : Sky International AG
+// sky : Sky UK Limited
 // https://www.iana.org/domains/root/db/sky.html
 sky
 
@@ -10132,7 +10145,7 @@ soy
 // https://www.iana.org/domains/root/db/spa.html
 spa
 
-// space : Radix Technologies Inc.
+// space : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/space.html
 space
 
@@ -10184,7 +10197,7 @@ stockholm
 // https://www.iana.org/domains/root/db/storage.html
 storage
 
-// store : Radix Technologies Inc.
+// store : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/store.html
 store
 
@@ -10288,7 +10301,7 @@ tax
 // https://www.iana.org/domains/root/db/taxi.html
 taxi
 
-// tci : Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// tci
 // https://www.iana.org/domains/root/db/tci.html
 tci
 
@@ -10300,7 +10313,7 @@ tdk
 // https://www.iana.org/domains/root/db/team.html
 team
 
-// tech : Radix Technologies Inc.
+// tech : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/tech.html
 tech
 
@@ -10484,7 +10497,7 @@ unicom
 // https://www.iana.org/domains/root/db/university.html
 university
 
-// uno : Radix Technologies Inc.
+// uno : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/uno.html
 uno
 
@@ -10500,7 +10513,7 @@ ups
 // https://www.iana.org/domains/root/db/vacations.html
 vacations
 
-// vana : Internet Naming Company LLC
+// vana : D3 Registry LLC
 // https://www.iana.org/domains/root/db/vana.html
 vana
 
@@ -10648,7 +10661,7 @@ webcam
 // https://www.iana.org/domains/root/db/weber.html
 weber
 
-// website : Radix Technologies Inc.
+// website : Radix Technologies Inc SEZC
 // https://www.iana.org/domains/root/db/website.html
 website
 
@@ -10772,7 +10785,7 @@ xin
 // https://www.iana.org/domains/root/db/xn--3bst00m.html
 集团
 
-// xn--3ds443g : TLD REGISTRY LIMITED OY
+// xn--3ds443g : Beijing TLD Registry Technology Limited
 // https://www.iana.org/domains/root/db/xn--3ds443g.html
 在线
 
@@ -10996,7 +11009,7 @@ xin
 // https://www.iana.org/domains/root/db/xn--mgbi4ecexp.html
 كاثوليك
 
-// xn--mgbt3dhd : Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// xn--mgbt3dhd
 // https://www.iana.org/domains/root/db/xn--mgbt3dhd.html
 همراه
 
@@ -11128,7 +11141,7 @@ yahoo
 // https://www.iana.org/domains/root/db/yamaxun.html
 yamaxun
 
-// yandex : Yandex Europe B.V.
+// yandex : YANDEX, LLC
 // https://www.iana.org/domains/root/db/yandex.html
 yandex
 
@@ -11180,12 +11193,29 @@ zone
 // https://www.iana.org/domains/root/db/zuerich.html
 zuerich
 
-
 // ===END ICANN DOMAINS===
+
 // ===BEGIN PRIVATE DOMAINS===
+
 // (Note: these are in alphabetical order by company name)
 
-// 12CHARS: https://12chars.com
+// .KRD : https://nic.krd
+co.krd
+edu.krd
+
+// .pl domains (grandfathered)
+art.pl
+gliwice.pl
+krakow.pl
+poznan.pl
+wroc.pl
+zakopane.pl
+
+// .US
+// Submitted by Ed Moore <Ed.Moore@lib.de.us>
+lib.de.us
+
+// 12CHARS : https://12chars.com
 // Submitted by Kenny Niehage <psl@12chars.com>
 12chars.dev
 12chars.it
@@ -11197,31 +11227,19 @@ cc.ua
 inf.ua
 ltd.ua
 
-// 611coin : https://611project.org/
+// 611 blockchain domain name system : https://611project.net/
 611.to
 
-// AAA workspace : https://aaa.vodka
-// Submitted by Kirill Rezraf <admin@aaa.vodka>
-aaa.vodka
-
 // A2 Hosting
 // Submitted by Tyler Hall <sysadmin@a2hosting.com>
 a2hosted.com
 cpserver.com
 
-// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
-// Submitted by Aaron Marais <its_me@aaronleem.co.za>
-graphox.us
-
-// accesso Technology Group, plc. : https://accesso.com/
-// Submitted by accesso Team <accessoecommerce@accesso.com>
-*.devcdnaccesso.com
-
 // Acorn Labs : https://acorn.io
 // Submitted by Craig Jellick <domains@acorn.io>
 *.on-acorn.io
 
-// ActiveTrail: https://www.activetrail.biz/
+// ActiveTrail : https://www.activetrail.biz/
 // Submitted by Ofer Kalaora <postmaster@activetrail.com>
 activetrail.biz
 
@@ -11229,6 +11247,13 @@ activetrail.biz
 // Submitted by Mark Terrel <support@adaptable.io>
 adaptable.app
 
+// addr.tools : https://addr.tools/
+// Submitted by Brian Shea <publicsuffixlist@addr.tools>
+myaddr.dev
+myaddr.io
+dyn.addr.tools
+myaddr.tools
+
 // Adobe : https://www.adobe.com/
 // Submitted by Ian Boston <boston@adobe.com> and Lars Trieloff <trieloff@adobe.com>
 adobeaemcloud.com
@@ -11245,6 +11270,10 @@ hlx3.page
 adobeio-static.net
 adobeioruntime.net
 
+// Africa.com Web Solutions Ltd : https://registry.africa.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+africa.com
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
@@ -11255,8 +11284,9 @@ airkitapps.com
 airkitapps-au.com
 airkitapps.eu
 
-// Aiven: https://aiven.io/
-// Submitted by Etienne Stalmans <security@aiven.io>
+// Aiven : https://aiven.io/
+// Submitted by Aiven Security Team <security+appdomains@aiven.io>
+aiven.app
 aivencloud.com
 
 // Akamai : https://www.akamai.com/
@@ -11286,11 +11316,15 @@ barsy.ca
 *.compute.estate
 *.alces.network
 
+// Alibaba Cloud API Gateway
+// Submitted by Alibaba Cloud Security <cloud_product_security_team@alibaba-inc.com>
+alibabacloudcs.com
+
 // all-inkl.com : https://all-inkl.com
 // Submitted by Werner Kaltofen <wk@all-inkl.com>
 kasserver.com
 
-// Altervista: https://www.altervista.org
+// Altervista : https://www.altervista.org
 // Submitted by Carlo Cannas <tech_staff@altervista.it>
 altervista.org
 
@@ -11308,7 +11342,7 @@ myamaze.net
 
 // Amazon API Gateway
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 9e37648f-a66c-4655-9ab1-5981f8737197
+// Reference: 6a4f5a95-8c7d-4077-a7af-9cf1abec0a53
 execute-api.cn-north-1.amazonaws.com.cn
 execute-api.cn-northwest-1.amazonaws.com.cn
 execute-api.af-south-1.amazonaws.com
@@ -11322,6 +11356,7 @@ execute-api.ap-southeast-1.amazonaws.com
 execute-api.ap-southeast-2.amazonaws.com
 execute-api.ap-southeast-3.amazonaws.com
 execute-api.ap-southeast-4.amazonaws.com
+execute-api.ap-southeast-5.amazonaws.com
 execute-api.ca-central-1.amazonaws.com
 execute-api.ca-west-1.amazonaws.com
 execute-api.eu-central-1.amazonaws.com
@@ -11350,8 +11385,9 @@ cloudfront.net
 
 // Amazon Cognito
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 09588633-91fe-49d8-b4e7-ec36496d11f3
+// Reference: eb4652f0-20f0-43f5-b323-e6cc6ae02ad7
 auth.af-south-1.amazoncognito.com
+auth.ap-east-1.amazoncognito.com
 auth.ap-northeast-1.amazoncognito.com
 auth.ap-northeast-2.amazoncognito.com
 auth.ap-northeast-3.amazoncognito.com
@@ -11361,7 +11397,9 @@ auth.ap-southeast-1.amazoncognito.com
 auth.ap-southeast-2.amazoncognito.com
 auth.ap-southeast-3.amazoncognito.com
 auth.ap-southeast-4.amazoncognito.com
+auth.ap-southeast-5.amazoncognito.com
 auth.ca-central-1.amazoncognito.com
+auth.ca-west-1.amazoncognito.com
 auth.eu-central-1.amazoncognito.com
 auth.eu-central-2.amazoncognito.com
 auth.eu-north-1.amazoncognito.com
@@ -11378,6 +11416,7 @@ auth.us-east-1.amazoncognito.com
 auth-fips.us-east-1.amazoncognito.com
 auth.us-east-2.amazoncognito.com
 auth-fips.us-east-2.amazoncognito.com
+auth-fips.us-gov-east-1.amazoncognito.com
 auth-fips.us-gov-west-1.amazoncognito.com
 auth.us-west-1.amazoncognito.com
 auth-fips.us-west-1.amazoncognito.com
@@ -11387,9 +11426,9 @@ auth-fips.us-west-2.amazoncognito.com
 // Amazon EC2
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
 // Reference: 4c38fa71-58ac-4768-99e5-689c1767e537
+*.compute.amazonaws.com.cn
 *.compute.amazonaws.com
 *.compute-1.amazonaws.com
-*.compute.amazonaws.com.cn
 us-east-1.amazonaws.com
 
 // Amazon EMR
@@ -11497,23 +11536,32 @@ emrstudio-prod.us-west-2.amazonaws.com
 
 // Amazon Managed Workflows for Apache Airflow
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 87f24ece-a77e-40e8-bb4a-f6b74fe9f975
+// Reference: f5ea5d0a-ec6a-4f23-ac1c-553fbff13f5c
 *.cn-north-1.airflow.amazonaws.com.cn
 *.cn-northwest-1.airflow.amazonaws.com.cn
 *.af-south-1.airflow.amazonaws.com
 *.ap-east-1.airflow.amazonaws.com
 *.ap-northeast-1.airflow.amazonaws.com
 *.ap-northeast-2.airflow.amazonaws.com
+*.ap-northeast-3.airflow.amazonaws.com
 *.ap-south-1.airflow.amazonaws.com
+*.ap-south-2.airflow.amazonaws.com
 *.ap-southeast-1.airflow.amazonaws.com
 *.ap-southeast-2.airflow.amazonaws.com
+*.ap-southeast-3.airflow.amazonaws.com
+*.ap-southeast-4.airflow.amazonaws.com
 *.ca-central-1.airflow.amazonaws.com
+*.ca-west-1.airflow.amazonaws.com
 *.eu-central-1.airflow.amazonaws.com
+*.eu-central-2.airflow.amazonaws.com
 *.eu-north-1.airflow.amazonaws.com
 *.eu-south-1.airflow.amazonaws.com
+*.eu-south-2.airflow.amazonaws.com
 *.eu-west-1.airflow.amazonaws.com
 *.eu-west-2.airflow.amazonaws.com
 *.eu-west-3.airflow.amazonaws.com
+*.il-central-1.airflow.amazonaws.com
+*.me-central-1.airflow.amazonaws.com
 *.me-south-1.airflow.amazonaws.com
 *.sa-east-1.airflow.amazonaws.com
 *.us-east-1.airflow.amazonaws.com
@@ -11523,7 +11571,7 @@ emrstudio-prod.us-west-2.amazonaws.com
 
 // Amazon S3
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: cd5c8b3a-67b7-4b40-9236-c87ce81a3d10
+// Reference: ada5c9df-55e1-4195-a1ce-732d6c81e357
 s3.dualstack.cn-north-1.amazonaws.com.cn
 s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn
 s3-website.dualstack.cn-north-1.amazonaws.com.cn
@@ -11581,6 +11629,7 @@ s3-object-lambda.ap-south-1.amazonaws.com
 s3-website.ap-south-1.amazonaws.com
 s3.dualstack.ap-south-2.amazonaws.com
 s3-accesspoint.dualstack.ap-south-2.amazonaws.com
+s3-website.dualstack.ap-south-2.amazonaws.com
 s3.ap-south-2.amazonaws.com
 s3-accesspoint.ap-south-2.amazonaws.com
 s3-object-lambda.ap-south-2.amazonaws.com
@@ -11601,16 +11650,26 @@ s3-object-lambda.ap-southeast-2.amazonaws.com
 s3-website.ap-southeast-2.amazonaws.com
 s3.dualstack.ap-southeast-3.amazonaws.com
 s3-accesspoint.dualstack.ap-southeast-3.amazonaws.com
+s3-website.dualstack.ap-southeast-3.amazonaws.com
 s3.ap-southeast-3.amazonaws.com
 s3-accesspoint.ap-southeast-3.amazonaws.com
 s3-object-lambda.ap-southeast-3.amazonaws.com
 s3-website.ap-southeast-3.amazonaws.com
 s3.dualstack.ap-southeast-4.amazonaws.com
 s3-accesspoint.dualstack.ap-southeast-4.amazonaws.com
+s3-website.dualstack.ap-southeast-4.amazonaws.com
 s3.ap-southeast-4.amazonaws.com
 s3-accesspoint.ap-southeast-4.amazonaws.com
 s3-object-lambda.ap-southeast-4.amazonaws.com
 s3-website.ap-southeast-4.amazonaws.com
+s3.dualstack.ap-southeast-5.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-5.amazonaws.com
+s3-website.dualstack.ap-southeast-5.amazonaws.com
+s3.ap-southeast-5.amazonaws.com
+s3-accesspoint.ap-southeast-5.amazonaws.com
+s3-deprecated.ap-southeast-5.amazonaws.com
+s3-object-lambda.ap-southeast-5.amazonaws.com
+s3-website.ap-southeast-5.amazonaws.com
 s3.dualstack.ca-central-1.amazonaws.com
 s3-accesspoint.dualstack.ca-central-1.amazonaws.com
 s3-accesspoint-fips.dualstack.ca-central-1.amazonaws.com
@@ -11631,6 +11690,7 @@ s3.ca-west-1.amazonaws.com
 s3-accesspoint.ca-west-1.amazonaws.com
 s3-accesspoint-fips.ca-west-1.amazonaws.com
 s3-fips.ca-west-1.amazonaws.com
+s3-object-lambda.ca-west-1.amazonaws.com
 s3-website.ca-west-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
 s3-accesspoint.dualstack.eu-central-1.amazonaws.com
@@ -11641,6 +11701,7 @@ s3-object-lambda.eu-central-1.amazonaws.com
 s3-website.eu-central-1.amazonaws.com
 s3.dualstack.eu-central-2.amazonaws.com
 s3-accesspoint.dualstack.eu-central-2.amazonaws.com
+s3-website.dualstack.eu-central-2.amazonaws.com
 s3.eu-central-2.amazonaws.com
 s3-accesspoint.eu-central-2.amazonaws.com
 s3-object-lambda.eu-central-2.amazonaws.com
@@ -11660,6 +11721,7 @@ s3-object-lambda.eu-south-1.amazonaws.com
 s3-website.eu-south-1.amazonaws.com
 s3.dualstack.eu-south-2.amazonaws.com
 s3-accesspoint.dualstack.eu-south-2.amazonaws.com
+s3-website.dualstack.eu-south-2.amazonaws.com
 s3.eu-south-2.amazonaws.com
 s3-accesspoint.eu-south-2.amazonaws.com
 s3-object-lambda.eu-south-2.amazonaws.com
@@ -11687,12 +11749,14 @@ s3-object-lambda.eu-west-3.amazonaws.com
 s3-website.eu-west-3.amazonaws.com
 s3.dualstack.il-central-1.amazonaws.com
 s3-accesspoint.dualstack.il-central-1.amazonaws.com
+s3-website.dualstack.il-central-1.amazonaws.com
 s3.il-central-1.amazonaws.com
 s3-accesspoint.il-central-1.amazonaws.com
 s3-object-lambda.il-central-1.amazonaws.com
 s3-website.il-central-1.amazonaws.com
 s3.dualstack.me-central-1.amazonaws.com
 s3-accesspoint.dualstack.me-central-1.amazonaws.com
+s3-website.dualstack.me-central-1.amazonaws.com
 s3.me-central-1.amazonaws.com
 s3-accesspoint.me-central-1.amazonaws.com
 s3-object-lambda.me-central-1.amazonaws.com
@@ -11761,6 +11825,7 @@ s3.dualstack.us-east-2.amazonaws.com
 s3-accesspoint.dualstack.us-east-2.amazonaws.com
 s3-accesspoint-fips.dualstack.us-east-2.amazonaws.com
 s3-fips.dualstack.us-east-2.amazonaws.com
+s3-website.dualstack.us-east-2.amazonaws.com
 s3.us-east-2.amazonaws.com
 s3-accesspoint.us-east-2.amazonaws.com
 s3-accesspoint-fips.us-east-2.amazonaws.com
@@ -11875,7 +11940,7 @@ notebook.cn-northwest-1.sagemaker.com.cn
 
 // Amazon SageMaker Studio
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 69c723d9-6e1a-4bff-a203-48eecd203183
+// Reference: 475f237e-ab88-4041-9f41-7cfccdf66aeb
 studio.af-south-1.sagemaker.aws
 studio.ap-east-1.sagemaker.aws
 studio.ap-northeast-1.sagemaker.aws
@@ -11887,6 +11952,7 @@ studio.ap-southeast-2.sagemaker.aws
 studio.ap-southeast-3.sagemaker.aws
 studio.ca-central-1.sagemaker.aws
 studio.eu-central-1.sagemaker.aws
+studio.eu-central-2.sagemaker.aws
 studio.eu-north-1.sagemaker.aws
 studio.eu-south-1.sagemaker.aws
 studio.eu-south-2.sagemaker.aws
@@ -11908,6 +11974,11 @@ studio.us-west-2.sagemaker.aws
 studio.cn-north-1.sagemaker.com.cn
 studio.cn-northwest-1.sagemaker.com.cn
 
+// Amazon SageMaker with MLflow
+// Submited by: AWS Security <psl-maintainers@amazon.com>
+// Reference: c19f92b3-a82a-452d-8189-831b572eea7e
+*.experiments.sagemaker.aws
+
 // Analytics on AWS
 // Submitted by AWS Security <psl-maintainers@amazon.com>
 // Reference: 955f9f40-a495-4e73-ae85-67b77ac9cadd
@@ -11924,8 +11995,8 @@ analytics-gateway.us-west-2.amazonaws.com
 
 // AWS Amplify
 // Submitted by AWS Security <psl-maintainers@amazon.com>
-// Reference: 5ecce854-c033-4fc4-a755-1a9916d9a9bb
-*.amplifyapp.com
+// Reference: c35bed18-6f4f-424f-9298-5756f2f7d72b
+amplifyapp.com
 
 // AWS App Runner
 // Submitted by AWS Security <psl-maintainers@amazon.com>
@@ -12054,6 +12125,19 @@ awsglobalaccelerator.com
 // Reference: 83385945-225f-416e-9aa0-ad0632bfdcee
 *.private.repost.aws
 
+// AWS Transfer Family web apps
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 67e9cfe6-ac57-49c7-b197-6652711c8e8d
+transfer-webapp.ap-northeast-1.on.aws
+transfer-webapp.ap-southeast-1.on.aws
+transfer-webapp.ap-southeast-2.on.aws
+transfer-webapp.eu-central-1.on.aws
+transfer-webapp.eu-north-1.on.aws
+transfer-webapp.eu-west-1.on.aws
+transfer-webapp.us-east-1.on.aws
+transfer-webapp.us-east-2.on.aws
+transfer-webapp.us-west-2.on.aws
+
 // eero
 // Submitted by Yue Kang <eero-dynamic-dns@amazon.com>
 // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461
@@ -12062,16 +12146,11 @@ eero-stage.online
 
 // concludes Amazon
 
-// Amune : https://amune.org/
-// Submitted by Team Amune <cert@amune.org>
-t3l3p0rt.net
-tele.amune.org
-
 // Apigee : https://apigee.com/
 // Submitted by Apigee Security Team <security@apigee.com>
 apigee.io
 
-// Apis Networks: https://apisnetworks.com
+// Apis Networks : https://apisnetworks.com
 // Submitted by Matt Saladna <matt@apisnetworks.com>
 panel.dev
 
@@ -12088,6 +12167,11 @@ appspaceusercontent.com
 // Submitted by Alexander Hochbaum <admin@appudo.com>
 appudo.net
 
+// Appwrite : https://appwrite.io
+// Submitted by Steven Nguyen <security@appwrite.io>
+appwrite.global
+*.appwrite.run
+
 // Aptible : https://www.aptible.com/
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
@@ -12096,6 +12180,10 @@ on-aptible.com
 // Submitted by Aki Ueno <admin@aquapal.net>
 f5.si
 
+// ArvanCloud EdgeCompute
+// Submitted by ArvanCloud CDN <cdn@arvancloud.ir>
+arvanedge.ir
+
 // ASEINet : https://www.aseinet.com/
 // Submitted by Asei SEKIGUCHI <mail@aseinet.com>
 user.aseinet.ne.jp
@@ -12125,10 +12213,6 @@ cdn.prod.atlassian-dev.net
 // Submitted by Lukas Reschke <lukas@authentick.net>
 translated.page
 
-// Autocode : https://autocode.com
-// Submitted by Jacob Lee <jacob@autocode.com>
-autocode.dev
-
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
 myfritz.link
@@ -12143,7 +12227,7 @@ onavstack.net
 *.awdev.ca
 *.advisor.ws
 
-// AZ.pl sp. z.o.o: https://az.pl
+// AZ.pl sp. z.o.o : https://az.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 ecommerce-shop.pl
 
@@ -12151,25 +12235,10 @@ ecommerce-shop.pl
 // Submitted by Olivier Benz <olivier.benz@b-data.ch>
 b-data.io
 
-// backplane : https://www.backplane.io
-// Submitted by Anthony Voutas <anthony@backplane.io>
-backplaneapp.io
-
 // Balena : https://www.balena.io
 // Submitted by Petros Angelatos <petrosagg@balena.io>
 balena-devices.com
 
-// University of Banja Luka : https://unibl.org
-// Domains for Republic of Srpska administrative entity.
-// Submitted by Marko Ivanovic <kormang@hotmail.rs>
-rs.ba
-
-// Banzai Cloud
-// Submitted by Janos Matyas <info@banzaicloud.com>
-*.banzai.cloud
-app.banzaicloud.io
-*.backyards.banzaicloud.io
-
 // BASE, Inc. : https://binc.jp
 // Submitted by Yuya NAGASAWA <public-suffix-list@binc.jp>
 base.ec
@@ -12195,14 +12264,6 @@ beagleboard.io
 // Submitted by Hazel Cora <hazy@besties.house>
 pages.gay
 
-// BetaInABox
-// Submitted by Adrian <adrian@betainabox.com>
-betainabox.com
-
-// University of Bielsko-Biala regional domain: http://dns.bielsko.pl/
-// Submitted by Marcin <dns@ath.bielsko.pl>
-bielsko.pl
-
 // BinaryLane : http://www.binarylane.com
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
 bnr.la
@@ -12219,6 +12280,10 @@ blackbaudcdn.net
 // Submitted by Luke Bratch <luke@bratch.co.uk>
 of.je
 
+// Block, Inc. : https://block.xyz
+// Submitted by Jonathan Boice <security@block.xyz>
+square.site
+
 // Blue Bite, LLC : https://bluebite.com
 // Submitted by Joshua Weiss <admin.engineering@bluebite.com>
 bluebite.io
@@ -12246,6 +12311,9 @@ square7.net
 
 // Brave : https://brave.com
 // Submitted by Andrea Brancaleoni <abrancaleoni@brave.com>
+brave.app
+*.s.brave.app
+brave.io
 *.s.brave.io
 
 // Brendly : https://brendly.rs
@@ -12257,6 +12325,16 @@ shop.brendly.rs
 // Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
 browsersafetymark.io
 
+// BRS Media : https://brsmedia.com/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+radio.am
+radio.fm
+
+// Bubble : https://bubble.io/
+// Submitted by Merlin Zhao <devops@bubble.io>
+cdn.bubble.io
+bubbleapps.io
+
 // Bytemark Hosting : https://www.bytemark.co.uk
 // Submitted by Paul Cammish <paul.cammish@bytemark.co.uk>
 uk0.bigv.io
@@ -12267,10 +12345,6 @@ vm.bytemark.co.uk
 // Submitted by Antonio Lain <antlai@cafjs.com>
 cafjs.com
 
-// callidomus : https://www.callidomus.com/
-// Submitted by Marcus Popp <admin@callidomus.com>
-mycd.eu
-
 // Canva Pty Ltd : https://canva.com/
 // Submitted by Joel Aquilina <publicsuffixlist@canva.com>
 canva-apps.cn
@@ -12286,102 +12360,99 @@ carrd.co
 crd.co
 ju.mp
 
-// CentralNic : http://www.centralnic.com/names/domains
+// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
+// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
+api.gov.uk
+
+// CDN77.com : http://www.cdn77.com
+// Submitted by Jan Krpes <jan.krpes@cdn77.com>
+cdn77-storage.com
+rsc.contentproxy9.cz
+r.cdn77.net
+cdn77-ssl.net
+c.cdn77.org
+rsc.cdn77.org
+ssl.origin.cdn77-secure.org
+
+// CentralNic : https://teaminternet.com/
 // Submitted by registry <gavin.brown@centralnic.com>
-ae.org
+za.bz
 br.com
 cn.com
-com.de
-com.se
 de.com
 eu.com
-gb.net
-hu.net
-jp.net
 jpn.com
 mex.com
 ru.com
 sa.com
-se.net
 uk.com
-uk.net
 us.com
-za.bz
 za.com
+com.de
+gb.net
+hu.net
+jp.net
+se.net
+uk.net
+ae.org
+com.se
 
-// No longer operated by CentralNic, these entries should be adopted and/or removed by current operators
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-ar.com
-hu.com
-kr.com
-no.com
-qc.com
-uy.com
-
-// Africa.com Web Solutions Ltd : https://registry.africa.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-africa.com
+// Cityhost LLC : https://cityhost.ua
+// Submitted by Maksym Rivtin <support@cityhost.net.ua>
+cx.ua
 
-// iDOT Services Limited : http://www.domain.gr.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-gr.com
+// Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
+// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
+discourse.group
+discourse.team
 
-// Radix FZC : http://domains.in.net
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-in.net
-web.in
+// Clerk : https://www.clerk.dev
+// Submitted by Colin Sidoti <systems@clerk.dev>
+clerk.app
+clerkstage.app
+*.lcl.dev
+*.lclstage.dev
+*.stg.dev
+*.stgstage.dev
 
-// US REGISTRY LLC : http://us.org
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-us.org
-
-// co.com Registry, LLC : https://registry.co.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-co.com
-
-// Roar Domains LLC : https://roar.basketball/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-aus.basketball
-nz.basketball
-
-// BRS Media : https://brsmedia.com/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-radio.am
-radio.fm
-
-// c.la : http://www.c.la/
-c.la
-
-// certmgr.org : https://certmgr.org
-// Submitted by B. Blechschmidt <hostmaster@certmgr.org>
-certmgr.org
-
-// Cityhost LLC  : https://cityhost.ua
-// Submitted by Maksym Rivtin <support@cityhost.net.ua>
-cx.ua
-
-// Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
-discourse.group
-discourse.team
-
-// Clever Cloud : https://www.clever-cloud.com/
-// Submitted by Quentin Adam <noc@clever-cloud.com>
-cleverapps.io
-
-// Clerk : https://www.clerk.dev
-// Submitted by Colin Sidoti <systems@clerk.dev>
-clerk.app
-clerkstage.app
-*.lcl.dev
-*.lclstage.dev
-*.stg.dev
-*.stgstage.dev
+// Clever Cloud : https://www.clever-cloud.com/
+// Submitted by Quentin Adam <noc@clever-cloud.com>
+cleverapps.cc
+*.services.clever-cloud.com
+cleverapps.io
+cleverapps.tech
 
 // ClickRising : https://clickrising.com/
 // Submitted by Umut Gumeli <infrastructure-publicsuffixlist@clickrising.com>
 clickrising.net
 
+// Cloud DNS Ltd : http://www.cloudns.net
+// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
+cloudns.asia
+cloudns.be
+cloud-ip.biz
+cloudns.biz
+cloudns.cc
+cloudns.ch
+cloudns.cl
+cloudns.club
+dnsabr.com
+ip-ddns.com
+cloudns.cx
+cloudns.eu
+cloudns.in
+cloudns.info
+ddns-ip.net
+dns-cloud.net
+dns-dynamic.net
+cloudns.nz
+cloudns.org
+ip-dynamic.org
+cloudns.ph
+cloudns.pro
+cloudns.pw
+cloudns.us
+
 // Cloud66 : https://www.cloud66.com/
 // Submitted by Khash Sajadi <khash@cloud66.com>
 c66.me
@@ -12396,10 +12467,9 @@ cloudaccess.host
 freesite.host
 cloudaccess.net
 
-// cloudControl : https://www.cloudcontrol.com/
-// Submitted by Tobias Wilken <tw@cloudcontrol.com>
-cloudcontrolled.com
-cloudcontrolapp.com
+// Cloudbees, Inc. : https://www.cloudbees.com/
+// Submitted by Mohideen Shajith <jaas-sre-infra@cloudbees.com>
+cloudbeesusercontent.io
 
 // Cloudera, Inc. : https://www.cloudera.com/
 // Submitted by Kedarnath Waikar <security@cloudera.com>
@@ -12413,64 +12483,38 @@ trycloudflare.com
 pages.dev
 r2.dev
 workers.dev
+cloudflare.net
+cdn.cloudflare.net
+cdn.cloudflareanycast.net
+cdn.cloudflarecn.net
+cdn.cloudflareglobal.net
 
 // cloudscale.ch AG : https://www.cloudscale.ch/
 // Submitted by Gaudenz Steinlin <support@cloudscale.ch>
 cust.cloudscale.ch
 objects.lpg.cloudscale.ch
 objects.rma.cloudscale.ch
+lpg.objectstorage.ch
+rma.objectstorage.ch
 
 // Clovyr : https://clovyr.io
 // Submitted by Patrick Nielsen <patrick@clovyr.io>
 wnext.app
 
-// co.ca : http://registry.co.ca/
-co.ca
+// CNPY : https://cnpy.gdn
+// Submitted by Angelo Gladding <angelo@lahacker.net>
+cnpy.gdn
 
 // Co & Co : https://co-co.nl/
 // Submitted by Govert Versluis <govert@co-co.nl>
 *.otap.co
 
-// i-registry s.r.o. : http://www.i-registry.cz/
-// Submitted by Martin Semrad <semrad@i-registry.cz>
-co.cz
-
-// CDN77.com : http://www.cdn77.com
-// Submitted by Jan Krpes <jan.krpes@cdn77.com>
-cdn77-storage.com
-rsc.contentproxy9.cz
-cdn77-ssl.net
-r.cdn77.net
-ssl.origin.cdn77-secure.org
-c.cdn77.org
-rsc.cdn77.org
-
-// Cloud DNS Ltd : http://www.cloudns.net
-// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
-cloudns.asia
-cloudns.be
-cloudns.biz
-cloudns.cc
-cloudns.ch
-cloudns.cl
-cloudns.club
-dnsabr.com
-cloudns.cx
-cloudns.eu
-cloudns.in
-cloudns.info
-dns-cloud.net
-dns-dynamic.net
-cloudns.nz
-cloudns.org
-cloudns.ph
-cloudns.pro
-cloudns.pw
-cloudns.us
+// co.ca : http://registry.co.ca/
+co.ca
 
-// CNPY : https://cnpy.gdn
-// Submitted by Angelo Gladding <angelo@lahacker.net>
-cnpy.gdn
+// co.com Registry, LLC : https://registry.co.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+co.com
 
 // Codeberg e. V. : https://codeberg.org
 // Submitted by Moritz Marquardt <git@momar.de>
@@ -12485,13 +12529,23 @@ preview.csb.app
 co.nl
 co.no
 
+// Cognition AI, Inc. : https://cognition.ai
+// Submitted by Philip Papurt <domains@cognition.ai>
+*.devinapps.com
+
 // Combell.com : https://www.combell.com
 // Submitted by Thomas Wouters <thomas.wouters@combellgroup.com>
 webhosting.be
 hosting-cluster.nl
 
+// Contentful GmbH : https://www.contentful.com
+// Submitted by Contentful Developer Experience Team <prd-ecosystem-dx@contentful.com>
+ctfcloud.net
+
 // Convex : https://convex.dev/
 // Submitted by James Cowling <security@convex.dev>
+convex.app
+convex.cloud
 convex.site
 
 // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
@@ -12501,13 +12555,12 @@ edu.ru
 gov.ru
 int.ru
 mil.ru
-test.ru
 
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
-dynamisches-dns.de
 dnsupdater.de
+dynamisches-dns.de
 internet-dns.de
 l-o-g-i-n.de
 dynamic-dns.info
@@ -12515,9 +12568,9 @@ feste-ip.net
 knx-server.net
 static-access.net
 
-// cPanel L.L.C. : https://www.cpanel.net/
-// Submitted by Dustin Scherer <public.suffix@cpanel.net>
-*.cprapid.com
+// Craft Docs Ltd : https://www.craft.do/
+// Submitted by Zsombor Fuszenecker <security@craft.do>
+craft.me
 
 // Craynic, s.r.o. : http://www.craynic.com/
 // Submitted by Ales Krajnik <ales.krajnik@craynic.com>
@@ -12531,54 +12584,15 @@ on.crisp.email
 // Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
 *.cryptonomic.net
 
-// Cupcake : https://cupcake.io/
-// Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
-cupcake.is
-
-// Curv UG : https://curv-labs.de/
-// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
-curv.dev
-
-// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
-// Submitted by Gregory Drake <support@dyn.com>
-// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
-*.customer-oci.com
-*.oci.customer-oci.com
-*.ocp.customer-oci.com
-*.ocs.customer-oci.com
-
-// Cyclic Software : https://www.cyclic.sh
-// Submitted by Kam Lasater <dns-admin@cyclic.sh>
-cyclic.app
-cyclic.cloud
-cyclic-app.com
-cyclic.co.in
+// cyber_Folks S.A. : https://cyberfolks.pl
+// Submitted by Bartlomiej Kida <security@cyberfolks.pl>
+cfolks.pl
 
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
 cyon.site
 
-// Danger Science Group: https://dangerscience.com/
-// Submitted by Skylar MacDonald <skylar@dangerscience.com>
-fnwk.site
-folionetwork.site
-platform0.app
-
-// Daplie, Inc : https://daplie.com
-// Submitted by AJ ONeal <aj@daplie.com>
-daplie.me
-localhost.daplie.me
-
-// Datto, Inc. : https://www.datto.com/
-// Submitted by Philipp Heckel <ph@datto.com>
-dattolocal.com
-dattorelay.com
-dattoweb.com
-mydatto.com
-dattolocal.net
-mydatto.net
-
 // Dansk.net : http://www.dansk.net/
 // Submitted by Anani Voule <digital@digital.co.dk>
 biz.dk
@@ -12591,11 +12605,6 @@ store.dk
 // Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
 dyndns.dappnode.io
 
-// dapps.earth : https://dapps.earth/
-// Submitted by Daniil Burdakov <icqkill@gmail.com>
-*.dapps.earth
-*.bzz.dapps.earth
-
 // Dark, Inc. : https://darklang.com
 // Submitted by Paul Biggar <ops@darklang.com>
 builtwithdark.com
@@ -12610,39 +12619,78 @@ instance.datadetect.com
 // Submitted by Richard Li <secalert@datawire.io>
 edgestack.me
 
-// DDNS5 : https://ddns5.com
-// Submitted by Cameron Elliott <cameron@cameronelliott.com>
-ddns5.com
+// Datto, Inc. : https://www.datto.com/
+// Submitted by Philipp Heckel <ph@datto.com>
+dattolocal.com
+dattorelay.com
+dattoweb.com
+mydatto.com
+dattolocal.net
+mydatto.net
+
+// ddnss.de : https://www.ddnss.de/
+// Submitted by Robert Niedziela <webmaster@ddnss.de>
+ddnss.de
+dyn.ddnss.de
+dyndns.ddnss.de
+dyn-ip24.de
+dyndns1.de
+home-webserver.de
+dyn.home-webserver.de
+myhome-server.de
+ddnss.org
 
 // Debian : https://www.debian.org/
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
 
+// Definima : http://www.definima.com/
+// Submitted by Maxence Bitterli <maxence@definima.com>
+definima.io
+definima.net
+
 // Deno Land Inc : https://deno.com/
 // Submitted by Luca Casonato <hostmaster@deno.com>
 deno.dev
 deno-staging.dev
+deno.net
 
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
 
-// Deta: https://www.deta.sh/
+// Deta : https://www.deta.sh/
 // Submitted by Aavash Shrestha <aavash@deta.sh>
 deta.app
 deta.dev
 
-// Diher Solutions : https://diher.solutions
-// Submitted by Didi Hermawan <mail@diher.solutions>
-*.rss.my.id
-*.diher.solutions
+// dhosting.pl Sp. z o.o. : https://dhosting.pl/
+// Submitted by Michal Kokoszkiewicz <bok@dhosting.pl>
+dfirma.pl
+dkonto.pl
+you2.pl
+
+// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
+// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
+ondigitalocean.app
+
+// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
+// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
+*.digitaloceanspaces.com
+
+// DigitalPlat : https://www.digitalplat.org/
+// Submitted by Edward Hsing <contact@digitalplat.org>
+qzz.io
+us.kg
+xx.kg
+dpdns.org
 
 // Discord Inc : https://discord.com
 // Submitted by Sahn Lam <slam@discordapp.com>
 discordsays.com
 discordsez.com
 
-// DNS Africa Ltd https://dns.business
+// DNS Africa Ltd : https://dns.business
 // Submitted by Calvin Browne <calvin@dns.business>
 jozi.biz
 
@@ -12667,32 +12715,44 @@ shoparena.pl
 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
 dreamhosters.com
 
+// Dreamyoungs, Inc. : https://durumis.com
+// Submitted by Infra Team <infra@durumis.com>
+durumis.com
+
 // Drobo : http://www.drobo.com/
 // Submitted by Ricardo Padilha <rpadilha@drobo.com>
 mydrobo.com
 
-// Drud Holdings, LLC. : https://www.drud.com/
-// Submitted by Kevin Bridges <kevin@drud.com>
-drud.io
-drud.us
-
 // DuckDNS : http://www.duckdns.org/
 // Submitted by Richard Harper <richard@duckdns.org>
 duckdns.org
 
-// Bip : https://bip.sh
-// Submitted by Joel Kennedy <joel@bip.sh>
-bip.sh
-
-// bitbridge.net : Submitted by Craig Welch, abeliidev@gmail.com
-bitbridge.net
-
 // dy.fi : http://dy.fi/
 // Submitted by Heikki Hannikainen <hessu@hes.iki.fi>
 dy.fi
 tunk.org
 
 // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
+dyndns.biz
+for-better.biz
+for-more.biz
+for-some.biz
+for-the.biz
+selfip.biz
+webhop.biz
+ftpaccess.cc
+game-server.cc
+myphotos.cc
+scrapping.cc
+blogdns.com
+cechire.com
+dnsalias.com
+dnsdojo.com
+doesntexist.com
+dontexist.com
+doomdns.com
+dyn-o-saur.com
+dynalias.com
 dyndns-at-home.com
 dyndns-at-work.com
 dyndns-blog.com
@@ -12707,64 +12767,14 @@ dyndns-server.com
 dyndns-web.com
 dyndns-wiki.com
 dyndns-work.com
-dyndns.biz
-dyndns.info
-dyndns.org
-dyndns.tv
-at-band-camp.net
-ath.cx
-barrel-of-knowledge.info
-barrell-of-knowledge.info
-better-than.tv
-blogdns.com
-blogdns.net
-blogdns.org
-blogsite.org
-boldlygoingnowhere.org
-broke-it.net
-buyshouses.net
-cechire.com
-dnsalias.com
-dnsalias.net
-dnsalias.org
-dnsdojo.com
-dnsdojo.net
-dnsdojo.org
-does-it.net
-doesntexist.com
-doesntexist.org
-dontexist.com
-dontexist.net
-dontexist.org
-doomdns.com
-doomdns.org
-dvrdns.org
-dyn-o-saur.com
-dynalias.com
-dynalias.net
-dynalias.org
-dynathome.net
-dyndns.ws
-endofinternet.net
-endofinternet.org
-endoftheinternet.org
 est-a-la-maison.com
 est-a-la-masion.com
 est-le-patron.com
 est-mon-blogueur.com
-for-better.biz
-for-more.biz
-for-our.info
-for-some.biz
-for-the.biz
-forgot.her.name
-forgot.his.name
 from-ak.com
 from-al.com
 from-ar.com
-from-az.net
 from-ca.com
-from-co.net
 from-ct.com
 from-dc.com
 from-de.com
@@ -12777,10 +12787,8 @@ from-il.com
 from-in.com
 from-ks.com
 from-ky.com
-from-la.net
 from-ma.com
 from-md.com
-from-me.org
 from-mi.com
 from-mn.com
 from-mo.com
@@ -12793,7 +12801,6 @@ from-nh.com
 from-nj.com
 from-nm.com
 from-nv.com
-from-ny.net
 from-oh.com
 from-ok.com
 from-or.com
@@ -12811,45 +12818,18 @@ from-wa.com
 from-wi.com
 from-wv.com
 from-wy.com
-ftpaccess.cc
-fuettertdasnetz.de
-game-host.org
-game-server.cc
 getmyip.com
-gets-it.net
-go.dyndns.org
 gotdns.com
-gotdns.org
-groks-the.info
-groks-this.info
-ham-radio-op.net
-here-for-more.info
 hobby-site.com
-hobby-site.org
-home.dyndns.org
-homedns.org
-homeftp.net
-homeftp.org
-homeip.net
 homelinux.com
-homelinux.net
-homelinux.org
 homeunix.com
-homeunix.net
-homeunix.org
 iamallama.com
-in-the-band.net
 is-a-anarchist.com
 is-a-blogger.com
 is-a-bookkeeper.com
-is-a-bruinsfan.org
 is-a-bulls-fan.com
-is-a-candidate.org
 is-a-caterer.com
-is-a-celticsfan.org
 is-a-chef.com
-is-a-chef.net
-is-a-chef.org
 is-a-conservative.com
 is-a-cpa.com
 is-a-cubicle-slave.com
@@ -12858,31 +12838,25 @@ is-a-designer.com
 is-a-doctor.com
 is-a-financialadvisor.com
 is-a-geek.com
-is-a-geek.net
-is-a-geek.org
 is-a-green.com
 is-a-guru.com
 is-a-hard-worker.com
 is-a-hunter.com
-is-a-knight.org
 is-a-landscaper.com
 is-a-lawyer.com
 is-a-liberal.com
 is-a-libertarian.com
-is-a-linux-user.org
 is-a-llama.com
 is-a-musician.com
 is-a-nascarfan.com
 is-a-nurse.com
 is-a-painter.com
-is-a-patsfan.org
 is-a-personaltrainer.com
 is-a-photographer.com
 is-a-player.com
 is-a-republican.com
 is-a-rockstar.com
 is-a-socialist.com
-is-a-soxfan.org
 is-a-student.com
 is-a-teacher.com
 is-a-techie.com
@@ -12894,117 +12868,150 @@ is-an-anarchist.com
 is-an-artist.com
 is-an-engineer.com
 is-an-entertainer.com
-is-by.us
 is-certified.com
-is-found.org
 is-gone.com
 is-into-anime.com
 is-into-cars.com
 is-into-cartoons.com
 is-into-games.com
 is-leet.com
-is-lost.org
 is-not-certified.com
-is-saved.org
 is-slick.com
 is-uberleet.com
-is-very-bad.org
-is-very-evil.org
-is-very-good.org
-is-very-nice.org
-is-very-sweet.org
 is-with-theband.com
 isa-geek.com
-isa-geek.net
-isa-geek.org
 isa-hockeynut.com
 issmarterthanyou.com
+likes-pie.com
+likescandy.com
+neat-url.com
+saves-the-whales.com
+selfip.com
+sells-for-less.com
+sells-for-u.com
+servebbs.com
+simple-url.com
+space-to-rent.com
+teaches-yoga.com
+writesthisblog.com
+ath.cx
+fuettertdasnetz.de
 isteingeek.de
 istmein.de
-kicks-ass.net
-kicks-ass.org
-knowsitall.info
-land-4-sale.us
 lebtimnetz.de
 leitungsen.de
-likes-pie.com
-likescandy.com
+traeumtgerade.de
+barrel-of-knowledge.info
+barrell-of-knowledge.info
+dyndns.info
+for-our.info
+groks-the.info
+groks-this.info
+here-for-more.info
+knowsitall.info
+selfip.info
+webhop.info
+forgot.her.name
+forgot.his.name
+at-band-camp.net
+blogdns.net
+broke-it.net
+buyshouses.net
+dnsalias.net
+dnsdojo.net
+does-it.net
+dontexist.net
+dynalias.net
+dynathome.net
+endofinternet.net
+from-az.net
+from-co.net
+from-la.net
+from-ny.net
+gets-it.net
+ham-radio-op.net
+homeftp.net
+homeip.net
+homelinux.net
+homeunix.net
+in-the-band.net
+is-a-chef.net
+is-a-geek.net
+isa-geek.net
+kicks-ass.net
+office-on-the.net
+podzone.net
+scrapper-site.net
+selfip.net
+sells-it.net
+servebbs.net
+serveftp.net
+thruhere.net
+webhop.net
 merseine.nu
 mine.nu
+shacknet.nu
+blogdns.org
+blogsite.org
+boldlygoingnowhere.org
+dnsalias.org
+dnsdojo.org
+doesntexist.org
+dontexist.org
+doomdns.org
+dvrdns.org
+dynalias.org
+dyndns.org
+go.dyndns.org
+home.dyndns.org
+endofinternet.org
+endoftheinternet.org
+from-me.org
+game-host.org
+gotdns.org
+hobby-site.org
+homedns.org
+homeftp.org
+homelinux.org
+homeunix.org
+is-a-bruinsfan.org
+is-a-candidate.org
+is-a-celticsfan.org
+is-a-chef.org
+is-a-geek.org
+is-a-knight.org
+is-a-linux-user.org
+is-a-patsfan.org
+is-a-soxfan.org
+is-found.org
+is-lost.org
+is-saved.org
+is-very-bad.org
+is-very-evil.org
+is-very-good.org
+is-very-nice.org
+is-very-sweet.org
+isa-geek.org
+kicks-ass.org
 misconfused.org
-mypets.ws
-myphotos.cc
-neat-url.com
-office-on-the.net
-on-the-web.tv
-podzone.net
 podzone.org
 readmyblog.org
-saves-the-whales.com
-scrapper-site.net
-scrapping.cc
-selfip.biz
-selfip.com
-selfip.info
-selfip.net
 selfip.org
-sells-for-less.com
-sells-for-u.com
-sells-it.net
 sellsyourhome.org
-servebbs.com
-servebbs.net
 servebbs.org
-serveftp.net
 serveftp.org
 servegame.org
-shacknet.nu
-simple-url.com
-space-to-rent.com
 stuff-4-sale.org
-stuff-4-sale.us
-teaches-yoga.com
-thruhere.net
-traeumtgerade.de
-webhop.biz
-webhop.info
-webhop.net
 webhop.org
+better-than.tv
+dyndns.tv
+on-the-web.tv
 worse-than.tv
-writesthisblog.com
-
-// ddnss.de : https://www.ddnss.de/
-// Submitted by Robert Niedziela <webmaster@ddnss.de>
-ddnss.de
-dyn.ddnss.de
-dyndns.ddnss.de
-dyndns1.de
-dyn-ip24.de
-home-webserver.de
-dyn.home-webserver.de
-myhome-server.de
-ddnss.org
-
-// Definima : http://www.definima.com/
-// Submitted by Maxence Bitterli <maxence@definima.com>
-definima.net
-definima.io
-
-// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
-// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
-ondigitalocean.app
-
-// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
-// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
-*.digitaloceanspaces.com
-
-// DigitalPlat : https://www.digitalplat.org/
-// Submitted by Edward Hsing <contact@digitalplat.org>
-us.kg
-
-// dnstrace.pro : https://dnstrace.pro/
-// Submitted by Chris Partridge <chris@partridge.tech>
-bci.dnstrace.pro
+is-by.us
+land-4-sale.us
+stuff-4-sale.us
+dyndns.ws
+mypets.ws
 
 // Dynu.com : https://www.dynu.com/
 // Submitted by Sue Ye <sue@dynu.com>
@@ -13024,7 +13031,6 @@ freeddns.org
 mywire.org
 webredirect.org
 myddns.rocks
-blogsite.xyz
 
 // dynv6 : https://dynv6.com
 // Submitted by Dominik Menke <dom@digineo.de>
@@ -13043,6 +13049,14 @@ easypanel.host
 // Submitted by <infracloudteam@namecheap.com>
 *.ewp.live
 
+// eDirect Corp. : https://hosting.url.com.tw/
+// Submitted by C.S. chang <cschang@corp.url.com.tw>
+twmail.cc
+twmail.net
+twmail.org
+mymailer.com.tw
+url.tw
+
 // Electromagnetic Field : https://www.emfcamp.org
 // Submitted by <noc@emfcamp.org>
 at.emf.camp
@@ -13060,26 +13074,22 @@ elementor.cool
 // Submitted by Emmanuel Raviart <emmanuel@raviart.com>
 en-root.fr
 
-// Enalean SAS: https://www.enalean.com
-// Submitted by Thomas Cottier <thomas.cottier@enalean.com>
+// Enalean SAS : https://www.enalean.com
+// Submitted by Enalean Security Team <security@enalean.com>
 mytuleap.com
 tuleap-partners.com
 
-// Encoretivity AB: https://encore.dev
-// Submitted by André Eriksson <andre@encore.dev>
+// Encoretivity AB : https://encore.cloud
+// Submitted by André Eriksson <security@encore.cloud>
 encr.app
 encoreapi.com
-
-// ECG Robotics, Inc: https://ecgrobotics.org
-// Submitted by <frc1533@ecgrobotics.org>
-onred.one
-staging.onred.one
+lp.dev
 
 // encoway GmbH : https://www.encoway.de
 // Submitted by Marcel Daus <cloudops@encoway.de>
 eu.encoway.cloud
 
-// EU.org https://eu.org/
+// EU.org : https://eu.org/
 // Submitted by Pierre Beyssac <hostmaster@eu.org>
 eu.org
 al.eu.org
@@ -13115,7 +13125,6 @@ kr.eu.org
 lt.eu.org
 lu.eu.org
 lv.eu.org
-mc.eu.org
 me.eu.org
 mk.eu.org
 mt.eu.org
@@ -13125,10 +13134,8 @@ ng.eu.org
 nl.eu.org
 no.eu.org
 nz.eu.org
-paris.eu.org
 pl.eu.org
 pt.eu.org
-q-a.eu.org
 ro.eu.org
 ru.eu.org
 se.eu.org
@@ -13153,13 +13160,15 @@ us-2.evennode.com
 us-3.evennode.com
 us-4.evennode.com
 
-// eDirect Corp. : https://hosting.url.com.tw/
-// Submitted by C.S. chang <cschang@corp.url.com.tw>
-twmail.cc
-twmail.net
-twmail.org
-mymailer.com.tw
-url.tw
+// Evervault : https://evervault.com
+// Submitted by Hannah Neary <engineering@evervault.com>
+relay.evervault.app
+relay.evervault.dev
+
+// Expo : https://expo.dev/
+// Submitted by James Ide <psl@expo.dev>
+expo.app
+staging.expo.app
 
 // Fabrica Technologies, Inc. : https://www.fabrica.dev/
 // Submitted by Eric Jiang <eric@fabrica.dev>
@@ -13251,8 +13260,6 @@ u.channelsdvr.net
 edgecompute.app
 fastly-edge.com
 fastly-terrarium.com
-fastlylb.net
-map.fastlylb.net
 freetls.fastly.net
 map.fastly.net
 a.prod.fastly.net
@@ -13260,6 +13267,8 @@ global.prod.fastly.net
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
+fastlylb.net
+map.fastlylb.net
 
 // Fastmail : https://www.fastmail.com/
 // Submitted by Marc Bradshaw <marc@fastmailteam.com>
@@ -13273,74 +13282,68 @@ myfast.host
 fastvps.site
 myfast.space
 
+// FearWorks Media Ltd. : https://fearworksmedia.co.uk
+// Submitted by Keith Fairley <domains@fearworksmedia.co.uk>
+conn.uk
+copro.uk
+hosp.uk
+
 // Fedora : https://fedoraproject.org/
-// submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
+// Submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
 fedorainfracloud.org
 fedorapeople.org
 cloud.fedoraproject.org
 app.os.fedoraproject.org
 app.os.stg.fedoraproject.org
 
-// FearWorks Media Ltd. : https://fearworksmedia.co.uk
-// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
-conn.uk
-copro.uk
-hosp.uk
-
 // Fermax : https://fermax.com/
-// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
+// Submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
 mydobiss.com
 
 // FH Muenster : https://www.fh-muenster.de
 // Submitted by Robin Naundorf <r.naundorf@fh-muenster.de>
 fh-muenster.io
 
+// Figma : https://www.figma.com
+// Submitted by Nick Frost <psl@figma.com>
+figma.site
+preview.site
+
 // Filegear Inc. : https://www.filegear.com
 // Submitted by Jason Zhu <jason@owtware.com>
 filegear.me
-filegear-au.me
-filegear-de.me
-filegear-gb.me
-filegear-ie.me
-filegear-jp.me
-filegear-sg.me
 
 // Firebase, Inc.
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
 
-// Firewebkit : https://www.firewebkit.com
-// Submitted by Majid Qureshi <mqureshi@amrayn.com>
-fireweb.app
-
-// FLAP : https://www.flap.cloud
-// Submitted by Louis Chemineau <louis@chmn.me>
-flap.id
-
 // FlashDrive : https://flashdrive.io
 // Submitted by Eric Chan <support@flashdrive.io>
-onflashdrive.app
 fldrv.com
 
+// Fleek Labs Inc : https://fleek.xyz
+// Submitted by Parsa Ghadimi <dev@fleek.xyz>
+on-fleek.app
+
 // FlutterFlow : https://flutterflow.io
 // Submitted by Anton Emelyanov <anton@flutterflow.io>
 flutterflow.app
 
-// fly.io: https://fly.io
+// fly.io : https://fly.io
 // Submitted by Kurt Mackey <kurt@fly.io>
 fly.dev
-edgeapp.net
 shw.io
-
-// Flynn : https://flynn.io
-// Submitted by Jonathan Rudenberg <jonathan@flynn.io>
-flynnhosting.net
+edgeapp.net
 
 // Forgerock : https://www.forgerock.com
 // Submitted by Roderick Parr <roderick.parr@forgerock.com>
 forgeblocks.com
 id.forgerock.io
 
+// FoundryLabs, Inc : https://e2b.dev/
+// Submitted by Jiri Sveceny <security@e2b.dev>
+e2b.app
+
 // Framer : https://www.framer.com
 // Submitted by Koen Rouwhorst <security@framer.com>
 framer.ai
@@ -13351,17 +13354,9 @@ framer.photos
 framer.website
 framer.wiki
 
-// Frusky MEDIA&PR : https://www.frusky.de
-// Submitted by Victor Pupynin <hallo@frusky.de>
-*.frusky.de
-
-// RavPage : https://www.ravpage.co.il
-// Submitted by Roni Horowitz <roni@responder.co.il>
-ravpage.co.il
-
-// Frederik Braun https://frederik-braun.com
+// Frederik Braun : https://frederik-braun.com
 // Submitted by Frederik Braun <fb@frederik-braun.com>
-0e.vc
+*.0e.vc
 
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
@@ -13380,11 +13375,15 @@ freedesktop.org
 // Submitted by Cadence <contact@freemyip.com>
 freemyip.com
 
+// Frusky MEDIA&PR : https://www.frusky.de
+// Submitted by Victor Pupynin <hallo@frusky.de>
+*.frusky.de
+
 // FunkFeuer - Verein zur Förderung freier Netze : https://www.funkfeuer.at
 // Submitted by Daniel A. Maierhofer <vorstand@funkfeuer.at>
 wien.funkfeuer.at
 
-// Future Versatile Group. ：https://www.fvg-on.net/
+// Future Versatile Group. : https://www.fvg-on.net/
 // T.Kabu <webmaster@fvg-on.net>
 daemon.asia
 dix.asia
@@ -13419,6 +13418,8 @@ aliases121.com
 
 // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
 // Submitted by Stephen Ford <hostmaster@digital.cabinet-office.gov.uk>
+campaign.gov.uk
+service.gov.uk
 independent-commission.uk
 independent-inquest.uk
 independent-inquiry.uk
@@ -13426,12 +13427,6 @@ independent-panel.uk
 independent-review.uk
 public-inquiry.uk
 royal-commission.uk
-campaign.gov.uk
-service.gov.uk
-
-// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
-// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
-api.gov.uk
 
 // Gehirn Inc. : https://www.gehirn.co.jp/
 // Submitted by Kohei YOSHIDA <tech@gehirn.co.jp>
@@ -13442,16 +13437,9 @@ usercontent.jp
 // Submitted by Tom Klein <tom@gentlent.com>
 gentapps.com
 gentlentapis.com
-lab.ms
 cdn-edges.net
 
-// Getlocalcert: https://www.getlocalcert.net
-// Submitted by Robert Alexander <support@getlocalcert.net>
-localcert.net
-localhostcert.net
-corpnet.work
-
-// GignoSystemJapan: http://gsj.bz
+// GignoSystemJapan : http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
 gsj.bz
 
@@ -13461,11 +13449,11 @@ githubusercontent.com
 githubpreview.dev
 github.io
 
-// GitLab, Inc.
+// GitLab, Inc. : https://about.gitlab.com/
 // Submitted by Alex Hanselka <alex@gitlab.com>
 gitlab.io
 
-// Gitplac.si - https://gitplac.si
+// Gitplac.si : https://gitplac.si
 // Submitted by Aljaž Starc <me@aljaxus.eu>
 gitapp.si
 gitpage.si
@@ -13597,35 +13585,23 @@ heteml.net
 // Submitted by Rohan Durrant <tldns@registry.godaddy>
 graphic.design
 
-// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
-// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
-cloudapps.digital
-london.cloudapps.digital
-
-// GOV.UK Pay : https://www.payments.service.gov.uk/
-// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
-pymnt.uk
-
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com>
-ro.im
-
 // GoIP DNS Services : http://www.goip.de
 // Submitted by Christian Poulter <milchstrasse@goip.de>
 goip.de
 
 // Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com>
+// Submitted by Shannon McCabe <public-suffix-editors@google.com>
+*.hosted.app
 *.run.app
 web.app
 *.0emm.com
 appspot.com
 *.r.appspot.com
+blogspot.com
 codespot.com
 googleapis.com
 googlecode.com
 pagespeedmobilizer.com
-publishproxy.com
 withgoogle.com
 withyoutube.com
 *.gateway.dev
@@ -13633,114 +13609,40 @@ cloud.goog
 translate.goog
 *.usercontent.goog
 cloudfunctions.net
-blogspot.ae
-blogspot.al
-blogspot.am
-blogspot.ba
-blogspot.be
-blogspot.bg
-blogspot.bj
-blogspot.ca
-blogspot.cf
-blogspot.ch
-blogspot.cl
-blogspot.co.at
-blogspot.co.id
-blogspot.co.il
-blogspot.co.ke
-blogspot.co.nz
-blogspot.co.uk
-blogspot.co.za
-blogspot.com
-blogspot.com.ar
-blogspot.com.au
-blogspot.com.br
-blogspot.com.by
-blogspot.com.co
-blogspot.com.cy
-blogspot.com.ee
-blogspot.com.eg
-blogspot.com.es
-blogspot.com.mt
-blogspot.com.ng
-blogspot.com.tr
-blogspot.com.uy
-blogspot.cv
-blogspot.cz
-blogspot.de
-blogspot.dk
-blogspot.fi
-blogspot.fr
-blogspot.gr
-blogspot.hk
-blogspot.hr
-blogspot.hu
-blogspot.ie
-blogspot.in
-blogspot.is
-blogspot.it
-blogspot.jp
-blogspot.kr
-blogspot.li
-blogspot.lt
-blogspot.lu
-blogspot.md
-blogspot.mk
-blogspot.mr
-blogspot.mx
-blogspot.my
-blogspot.nl
-blogspot.no
-blogspot.pe
-blogspot.pt
-blogspot.qa
-blogspot.re
-blogspot.ro
-blogspot.rs
-blogspot.ru
-blogspot.se
-blogspot.sg
-blogspot.si
-blogspot.sk
-blogspot.sn
-blogspot.td
-blogspot.tw
-blogspot.ug
-blogspot.vn
 
 // Goupile : https://goupile.fr
 // Submitted by Niels Martignene <hello@goupile.fr>
 goupile.fr
 
-// Government of the Netherlands: https://www.government.nl
+// GOV.UK Pay : https://www.payments.service.gov.uk/
+// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
+pymnt.uk
+
+// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
+// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
+cloudapps.digital
+london.cloudapps.digital
+
+// Government of the Netherlands : https://www.government.nl
 // Submitted by <domeinnaam@minaz.nl>
 gov.nl
 
+// Grafana Labs : https://grafana.com/
+// Submitted by Platform Engineering <info@grafana.com>
+grafana-dev.net
+
 // GrayJay Web Solutions Inc. : https://grayjaysports.ca
 // Submitted by Matt Yamkowy <info@grayjaysports.ca>
 grayjayleagues.com
 
-// Group 53, LLC : https://www.group53.com
-// Submitted by Tyler Todd <noc@nova53.net>
-awsmppl.com
-
 // GünstigBestellen : https://günstigbestellen.de
 // Submitted by Furkan Akkoc <info@hendelzon.de>
 günstigbestellen.de
 günstigliefern.de
 
-// Hakaran group: http://hakaran.cz
-// Submitted by Arseniy Sokolov <security@hakaran.cz>
-fin.ci
-free.hr
-caa.li
-ua.rs
-conf.se
-
-// Handshake : https://handshake.org
-// Submitted by Mike Damm <md@md.vc>
-hs.zone
-hs.run
+// Häkkinen.fi : https://www.häkkinen.fi/
+// Submitted by Eero Häkkinen <Eero+psl@Häkkinen.fi>
+häkkinen.fi
 
 // Hashbang : https://hashbang.sh
 hashbang.sh
@@ -13750,9 +13652,23 @@ hashbang.sh
 hasura.app
 hasura-app.io
 
-// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages): https://www.hs-heilbronn.de
-// Submitted by Richard Zowalla <mi-admin@hs-heilbronn.de>
+// Hatena Co., Ltd. : https://hatena.co.jp
+// Submitted by Masato Nakamura <blog-developers@hatena.ne.jp>
+hatenablog.com
+hatenadiary.com
+hateblo.jp
+hatenablog.jp
+hatenadiary.jp
+hatenadiary.org
+
+// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages) : https://www.hs-heilbronn.de
+// Submitted by Richard Zowalla <it-admin@hs-heilbronn.de>
 pages.it.hs-heilbronn.de
+pages-research.it.hs-heilbronn.de
+
+// HeiyuSpace : https://lazycat.cloud
+// Submitted by Xia Bin <admin@lazycat.cloud>
+heiyu.space
 
 // Helio Networks : https://heliohost.org
 // Submitted by Ben Frede <admin@heliohost.org>
@@ -13764,9 +13680,13 @@ heliohost.us
 hepforge.org
 
 // Heroku : https://www.heroku.com/
-// Submitted by Tom Maher <tmaher@heroku.com>
+// Submitted by Shumon Huque <public-dns@salesforce.com>
 herokuapp.com
-herokussl.com
+
+// Heyflow : https://www.heyflow.com
+// Submitted by Mirko Nitschke <tech@heyflow.com>
+heyflow.page
+heyflow.site
 
 // Hibernating Rhinos
 // Submitted by Oren Eini <oren@ravendb.net>
@@ -13775,7 +13695,7 @@ ravendb.community
 development.run
 ravendb.run
 
-// home.pl S.A.: https://home.pl
+// home.pl S.A. : https://home.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 homesklep.pl
 
@@ -13785,58 +13705,66 @@ homesklep.pl
 *.id.pub
 *.kin.pub
 
-// Hong Kong Productivity Council: https://www.hkpc.org/
-// Submitted by SECaaS Team <summchan@hkpc.org>
-secaas.hk
-
 // Hoplix : https://www.hoplix.com
 // Submitted by Danilo De Franco<info@hoplix.shop>
 hoplix.shop
 
-
 // HOSTBIP REGISTRY : https://www.hostbip.com/
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@hostbip.com>
 orx.biz
 biz.gl
+biz.ng
+co.biz.ng
+dl.biz.ng
+go.biz.ng
+lg.biz.ng
+on.biz.ng
 col.ng
 firm.ng
 gen.ng
 ltd.ng
 ngo.ng
-edu.scot
-sch.so
+plc.ng
 
-// HostFly : https://www.ie.ua
-// Submitted by Bohdan Dub <support@hostfly.com.ua>
-ie.ua
-
-// HostyHosting (hostyhosting.com)
+// HostyHosting : https://hostyhosting.com
 hostyhosting.io
 
-// Häkkinen.fi
-// Submitted by Eero Häkkinen <Eero+psl@Häkkinen.fi>
-häkkinen.fi
+// Hugging Face : https://huggingface.co
+// Submitted by Eliott Coyac <website@huggingface.co>
+hf.space
+static.hf.space
+
+// Hypernode B.V. : https://www.hypernode.com/
+// Submitted by Cipriano Groenendal <security@nl.team.blue>
+hypernode.io
+
+// I-O DATA DEVICE, INC. : http://www.iodata.com/
+// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
+iobb.net
+
+// i-registry s.r.o. : http://www.i-registry.cz/
+// Submitted by Martin Semrad <semrad@i-registry.cz>
+co.cz
 
 // Ici la Lune : http://www.icilalune.com/
 // Submitted by Simon Morvan <simon@icilalune.com>
 *.moonscale.io
 moonscale.net
 
+// iDOT Services Limited : http://www.domain.gr.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+gr.com
+
 // iki.fi
 // Submitted by Hannu Aronsson <haa@iki.fi>
 iki.fi
 
-// iliad italia: https://www.iliad.it
+// iliad italia : https://www.iliad.it
 // Submitted by Marios Makassikis <mmakassikis@freebox.fr>
 ibxos.it
 iliadboxos.it
 
-// Impertrix Solutions : <https://impertrixcdn.com>
-// Submitted by Zhixiang Zhao <csuite@impertrix.com>
-impertrixcdn.com
-impertrix.com
-
-// Incsub, LLC: https://incsub.com/
+// Incsub, LLC : https://incsub.com/
 // Submitted by Aaron Edwards <sysadmins@incsub.com>
 smushcdn.com
 wphostedmail.com
@@ -13851,12 +13779,16 @@ in-berlin.de
 in-brb.de
 in-butter.de
 in-dsl.de
-in-dsl.net
-in-dsl.org
 in-vpn.de
+in-dsl.net
 in-vpn.net
+in-dsl.org
 in-vpn.org
 
+// Inferno Communications : https://inferno.co.uk
+// Submitted by Connor McFarlane <noc@inferno.co.uk>
+oninferno.net
+
 // info.at : http://www.info.at/
 biz.at
 info.at
@@ -13899,26 +13831,54 @@ to.leg.br
 // Submitted by Wolfgang Schwarz <admin@intermetrics.de>
 pixolino.com
 
-// Internet-Pro, LLP: https://netangels.ru/
+// Internet-Pro, LLP : https://netangels.ru/
 // Submitted by Vasiliy Sheredeko <piphon@gmail.com>
 na4u.ru
 
+// Inventor Services : https://inventor.gg/
+// Submitted by Inventor Team <psl@inventor.gg>
+botdash.app
+botdash.dev
+botdash.gg
+botdash.net
+botda.sh
+botdash.xyz
+
+// IONOS SE : https://www.ionos.com/
+// IONOS Group SE : https://www.ionos-group.com/
+// Submitted by Henrik Willert <security@ionos.com>
+apps-1and1.com
+live-website.com
+apps-1and1.net
+websitebuilder.online
+app-ionos.space
+
 // iopsys software solutions AB : https://iopsys.eu/
 // Submitted by Roman Azarenko <roman.azarenko@iopsys.eu>
 iopsys.se
 
+// IPFS Project : https://ipfs.tech/
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+*.inbrowser.dev
+*.dweb.link
+*.inbrowser.link
+
 // IPiFony Systems, Inc. : https://www.ipifony.com/
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
 
-// is-a.dev : https://www.is-a.dev
-// Submitted by William Harrison <admin@maintainers.is-a.dev>
-is-a.dev
-
 // ir.md : https://nic.ir.md
 // Submitted by Ali Soizi <info@nic.ir.md>
 ir.md
 
+// is-a-good.dev : https://is-a-good.dev
+// Submitted by William Harrison <webmaster@is-a-good.dev>
+is-a-good.dev
+
+// is-a.dev : https://is-a.dev
+// Submitted by William Harrison <security@is-a.dev>
+is-a.dev
+
 // IServ GmbH : https://iserv.de
 // Submitted by Mario Hoberg <info@iserv.de>
 iservschule.de
@@ -13928,15 +13888,10 @@ schulserver.de
 test-iserv.de
 iserv.dev
 
-// I-O DATA DEVICE, INC. : http://www.iodata.com/
-// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
-iobb.net
-
 // Jelastic, Inc. : https://jelastic.com/
 // Submitted by Ihor Kolodyuk <ik@jelastic.com>
 mel.cloudlets.com.au
 cloud.interhostsolutions.be
-mycloud.by
 alp1.ae.flow.ch
 appengine.flow.ch
 es-1.axarnet.cloud
@@ -13958,7 +13913,6 @@ us.reclaim.cloud
 ch.trendhosting.cloud
 de.trendhosting.cloud
 jele.club
-amscompute.com
 dopaas.com
 paas.hosted-by-previder.com
 rag-cloud.hosteur.com
@@ -13966,10 +13920,8 @@ rag-cloud-ch.hosteur.com
 jcloud.ik-server.com
 jcloud-ver-jpc.ik-server.com
 demo.jelastic.com
-kilatiron.com
 paas.massivegrid.com
 jed.wafaicloud.com
-lon.wafaicloud.com
 ryd.wafaicloud.com
 j.scaleforce.com.cy
 jelastic.dogado.eu
@@ -13981,18 +13933,14 @@ mircloud.host
 paas.beebyte.io
 sekd1.beebyteapp.io
 jele.io
-cloud-fr1.unispace.io
 jc.neen.it
-cloud.jelastic.open.tim.it
 jcloud.kz
-upaas.kazteleport.kz
 cloudjiffy.net
 fra1-de.cloudjiffy.net
 west1-us.cloudjiffy.net
 jls-sto1.elastx.net
 jls-sto2.elastx.net
 jls-sto3.elastx.net
-faststacks.net
 fr-1.paas.massivegrid.net
 lon-1.paas.massivegrid.net
 lon-2.paas.massivegrid.net
@@ -14002,11 +13950,9 @@ sg-1.paas.massivegrid.net
 jelastic.saveincloud.net
 nordeste-idc.saveincloud.net
 j.scaleforce.net
-jelastic.tsukaeru.net
 sdscloud.pl
 unicloud.pl
 mircloud.ru
-jelastic.regruhosting.ru
 enscaled.sg
 jele.site
 jelastic.team
@@ -14029,13 +13975,13 @@ jotelulu.cloud
 
 // JouwWeb B.V. : https://www.jouwweb.nl
 // Submitted by Camilo Sperberg <tech@webador.com>
-jouwweb.site
 webadorsite.com
+jouwweb.site
 
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
-*.triton.zone
 *.cns.joyent.com
+*.triton.zone
 
 // JS.ORG : http://dns.js.org
 // Submitted by Stefan Keim <admin@js.org>
@@ -14046,14 +13992,15 @@ js.org
 kaas.gg
 khplay.nl
 
-// Kakao : https://www.kakaocorp.com/
-// Submitted by JaeYoong Lee <cec@kakaocorp.com>
-ktistory.com
-
 // Kapsi : https://kapsi.fi
 // Submitted by Tomi Juntunen <erani@kapsi.fi>
 kapsi.fi
 
+// Katholieke Universiteit Leuven : https://www.kuleuven.be
+// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
+ezproxy.kuleuven.be
+kuleuven.cloud
+
 // Keyweb AG : https://www.keyweb.de
 // Submitted by Martin Dannehl <postmaster@keymachine.de>
 keymachine.de
@@ -14067,27 +14014,22 @@ uni5.net
 // Submitted by Roy Keene <rkeene@knightpoint.com>
 knightpoint.systems
 
-// KoobinEvent, SL: https://www.koobin.com
+// KoobinEvent, SL : https://www.koobin.com
 // Submitted by Iván Oliva <ivan.oliva@koobin.com>
 koobin.events
 
+// Krellian Ltd. : https://krellian.com
+// Submitted by Ben Francis <ben@krellian.com>
+webthings.io
+krellian.net
+
 // KUROKU LTD : https://kuroku.ltd/
 // Submitted by DisposaBoy <security@oya.to>
 oya.to
 
-// Katholieke Universiteit Leuven: https://www.kuleuven.be
-// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
-kuleuven.cloud
-ezproxy.kuleuven.be
-
-// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
-co.krd
-edu.krd
-
-// Krellian Ltd. : https://krellian.com
-// Submitted by Ben Francis <ben@krellian.com>
-krellian.net
-webthings.io
+// Laravel Holdings, Inc. : https://laravel.com
+// Submitted by André Valentin <security@laravel.com>
+laravel.cloud
 
 // LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
 // Submitted by Lars Laehn <info@lcube.de>
@@ -14101,9 +14043,14 @@ leadpages.co
 lpages.co
 lpusercontent.com
 
-// Lelux.fi : https://lelux.fi/
-// Submitted by Lelux Admin <publisuffix@lelux.site>
-lelux.site
+// Liara : https://liara.ir
+// Submitted by Amirhossein Badinloo <info@liara.ir>
+liara.run
+iran.liara.run
+
+// libp2p project : https://libp2p.io
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+libp2p.direct
 
 // Libre IT Ltd : https://libre.nz
 // Submitted by Tomas Maggio <support@libre.nz>
@@ -14119,10 +14066,10 @@ co.network
 co.place
 co.technology
 
-// linkyard ldt: https://www.linkyard.ch/
+// linkyard ldt : https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
-linkyard.cloud
 linkyard-cloud.ch
+linkyard.cloud
 
 // Linode : https://linode.com
 // Submitted by <security@linode.com>
@@ -14135,13 +14082,32 @@ ip.linodeusercontent.com
 // Submitted by Victor Velchev <admin@liquidnetlimited.com>
 we.bs
 
+// Listen53 : https://www.l53.net
+// Submitted by Gerry Keh <biz@l53.net>
+filegear-sg.me
+ggff.net
+
 // Localcert : https://localcert.dev
 // Submitted by Lann Martin <security@localcert.dev>
 *.user.localcert.dev
 
-// localzone.xyz
-// Submitted by Kenny Niehage <hello@yahe.sh>
-localzone.xyz
+// LocalCert : https://localcert.net
+// Submitted by William Harrison <security@localcert.net>
+localcert.net
+
+// Localtonet : https://localtonet.com/
+// Submitted by Burak Isleyici <support@localtonet.com>
+localtonet.com
+*.localto.net
+
+// Lodz University of Technology LODMAN regional domains : https://www.man.lodz.pl/dns
+// Submitted by Piotr Wilk <dns@man.lodz.pl>
+lodz.pl
+pabianice.pl
+plock.pl
+sieradz.pl
+skierniewice.pl
+zgierz.pl
 
 // Log'in Line : https://www.loginline.com/
 // Submitted by Rémi Mach <remi.mach@loginline.com>
@@ -14151,13 +14117,18 @@ loginline.io
 loginline.services
 loginline.site
 
+// Lõhmus Family, The : https://lohmus.me/
+// Submitted by Heiki Lõhmus <hostmaster@lohmus.me>
+lohmus.me
+
 // Lokalized : https://lokalized.nl
 // Submitted by Noah Taheij <noah@lokalized.nl>
 servers.run
 
-// Lõhmus Family, The
-// Submitted by Heiki Lõhmus <hostmaster at lohmus dot me>
-lohmus.me
+// Lovable : https://lovable.dev
+// Submitted by Fabian Hedin <security@lovable.dev>
+lovable.app
+lovableproject.com
 
 // LubMAN UMCS Sp. z o.o : https://lubman.pl/
 // Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
@@ -14177,18 +14148,19 @@ lugs.org.uk
 // Lukanet Ltd : https://lukanet.com
 // Submitted by Anton Avramov <register@lukanet.com>
 barsy.bg
-barsy.co.uk
-barsyonline.co.uk
+barsy.club
 barsycenter.com
 barsyonline.com
-barsy.club
 barsy.de
+barsy.dev
 barsy.eu
+barsy.gr
 barsy.in
 barsy.info
 barsy.io
 barsy.me
 barsy.menu
+barsyonline.menu
 barsy.mobi
 barsy.net
 barsy.online
@@ -14196,42 +14168,51 @@ barsy.org
 barsy.pro
 barsy.pub
 barsy.ro
+barsy.rs
 barsy.shop
+barsyonline.shop
 barsy.site
+barsy.store
 barsy.support
 barsy.uk
+barsy.co.uk
+barsyonline.co.uk
+
+// Luyani Inc. : https://luyani.com/
+// Submitted by Umut Gumeli <public-suffix-list@luyani.com>
+luyani.app
+luyani.net
 
 // Magento Commerce
 // Submitted by Damien Tournoud <dtournoud@magento.cloud>
 *.magentosite.cloud
 
-// May First - People Link : https://mayfirst.org/
-// Submitted by Jamie McClelland <info@mayfirst.org>
-mayfirst.info
-mayfirst.org
-
 // Mail.Ru Group : https://hb.cldmail.ru
 // Submitted by Ilya Zaretskiy <zaretskiy@corp.mail.ru>
 hb.cldmail.ru
 
-// Mail Transfer Platform : https://www.neupeer.com
-// Submitted by Li Hui <lihui@neupeer.com>
-cn.vu
+// MathWorks : https://www.mathworks.com/
+// Submitted by Emily Reed <psl-maintainers@groups.mathworks.com>
+matlab.cloud
+modelscape.com
+mwcloudnonprod.com
+polyspace.com
+
+// May First - People Link : https://mayfirst.org/
+// Submitted by Jamie McClelland <info@mayfirst.org>
+mayfirst.info
+mayfirst.org
 
-// Maze Play: https://www.mazeplay.com
+// Maze Play : https://www.mazeplay.com
 // Submitted by Adam Humpherys <adam@mws.dev>
 mazeplay.com
 
-// mcpe.me : https://mcpe.me
-// Submitted by Noa Heyl <hi@noa.dev>
-mcpe.me
-
 // McHost : https://mchost.ru
 // Submitted by Evgeniy Subbotin <e.subbotin@mchost.ru>
 mcdir.me
 mcdir.ru
-mcpre.ru
 vps.mcdir.ru
+mcpre.ru
 
 // Mediatech : https://mediatech.by
 // Submitted by Evgeniy Kozhuhovskiy <ugenk@mediatech.by>
@@ -14242,6 +14223,10 @@ mediatech.dev
 // Submitted by Michael Olson <molson@medicomhealth.com>
 hra.health
 
+// MedusaJS, Inc : https://medusajs.com/
+// Submitted by Stevche Radevski <engineering@medusajs.com>
+medusajs.app
+
 // Memset hosting : https://www.memset.com
 // Submitted by Tom Whitwell <domains@memset.com>
 miniserver.com
@@ -14257,12 +14242,9 @@ atmeta.com
 apps.fbsbx.com
 
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Zdeněk Šustr <zdenek.sustr@cesnet.cz>
+// Submitted by Zdeněk Šustr <zdenek.sustr@cesnet.cz> and Radim Janča <janca@cesnet.cz>
 *.cloud.metacentrum.cz
 custom.metacentrum.cz
-
-// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Radim Janča <janca@cesnet.cz>
 flt.cloud.muni.cz
 usr.cloud.muni.cz
 
@@ -14280,10 +14262,9 @@ co.pl
 // Microsoft Azure : https://home.azure
 *.azurecontainer.io
 azure-api.net
+azure-mobile.net
 azureedge.net
 azurefd.net
-azurewebsites.net
-azure-mobile.net
 azurestaticapps.net
 1.azurestaticapps.net
 2.azurestaticapps.net
@@ -14297,31 +14278,36 @@ eastasia.azurestaticapps.net
 eastus2.azurestaticapps.net
 westeurope.azurestaticapps.net
 westus2.azurestaticapps.net
+azurewebsites.net
 cloudapp.net
 trafficmanager.net
 blob.core.windows.net
 servicebus.windows.net
 
+// MikroTik : https://mikrotik.com
+// Submitted by MikroTik SysAdmin Team <support@mikrotik.com>
+routingthecloud.com
+sn.mynetname.net
+routingthecloud.net
+routingthecloud.org
+
 // minion.systems : http://minion.systems
 // Submitted by Robert Böttinger <r@minion.systems>
 csx.cc
 
-// Mintere : https://mintere.com/
-// Submitted by Ben Aubin <security@mintere.com>
-mintere.site
-
-// MobileEducation, LLC : https://joinforte.com
-// Submitted by Grayson Martin <grayson.martin@mobileeducation.us>
-forte.id
+// Mittwald CM Service GmbH & Co. KG : https://mittwald.de
+// Submitted by Marco Rieger <security@mittwald.de>
+mydbserver.com
+webspaceconfig.de
+mittwald.info
+mittwaldserver.info
+typo3server.info
+project.space
 
 // MODX Systems LLC : https://modx.com
 // Submitted by Elizabeth Southwell <elizabeth@modx.com>
 modx.dev
 
-// Mozilla Corporation : https://mozilla.com
-// Submitted by Ben Francis <bfrancis@mozilla.com>
-mozilla-iot.org
-
 // Mozilla Foundation : https://mozilla.org/
 // Submitted by glob <glob@mozilla.com>
 bmoattachments.org
@@ -14335,8 +14321,8 @@ pp.ru
 // Mythic Beasts : https://www.mythic-beasts.com
 // Submitted by Paul Cammish <kelduum@mythic-beasts.com>
 hostedpi.com
-customer.mythic-beasts.com
 caracal.mythic-beasts.com
+customer.mythic-beasts.com
 fentiger.mythic-beasts.com
 lynx.mythic-beasts.com
 ocelot.mythic-beasts.com
@@ -14355,6 +14341,15 @@ ui.nabu.casa
 // Net at Work Gmbh : https://www.netatwork.de
 // Submitted by Jan Jaeschke <jan.jaeschke@netatwork.de>
 cloud.nospamproxy.com
+o365.cloud.nospamproxy.com
+
+// Net libre : https://www.netlib.re
+// Submitted by Philippe PITTOLI <security@netlib.re>
+netlib.re
+
+// Netfy Domains : https://netfy.domains
+// Submitted by Suranga Ranasinghe <security@mavicsoft.com>
+netfy.app
 
 // Netlify : https://www.netlify.com
 // Submitted by Jessica Parsons <jessica@netlify.com>
@@ -14364,6 +14359,14 @@ netlify.app
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
 
+// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
+// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
+nfshost.com
+
+// NFT.Storage : https://nft.storage/
+// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
+ipfs.nftstorage.link
+
 // NGO.US Registry : https://nic.ngo.us
 // Submitted by Alstra Solutions Ltd. Networking Team <admin@alstra.org>
 ngo.us
@@ -14385,7 +14388,7 @@ us.ngrok.io
 ngrok.pizza
 ngrok.pro
 
-// Nicolaus Copernicus University in Torun - MSK TORMAN (https://www.man.torun.pl)
+// Nicolaus Copernicus University in Torun - MSK TORMAN : https://www.man.torun.pl
 torun.pl
 
 // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
@@ -14393,13 +14396,97 @@ torun.pl
 nh-serv.co.uk
 nimsite.uk
 
-// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
-// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
-nfshost.com
+// No-IP.com : https://noip.com/
+// Submitted by Deven Reza <publicsuffixlist@noip.com>
+mmafan.biz
+myftp.biz
+no-ip.biz
+no-ip.ca
+fantasyleague.cc
+gotdns.ch
+3utilities.com
+blogsyte.com
+ciscofreak.com
+damnserver.com
+ddnsking.com
+ditchyourip.com
+dnsiskinky.com
+dynns.com
+geekgalaxy.com
+health-carereform.com
+homesecuritymac.com
+homesecuritypc.com
+myactivedirectory.com
+mysecuritycamera.com
+myvnc.com
+net-freaks.com
+onthewifi.com
+point2this.com
+quicksytes.com
+securitytactics.com
+servebeer.com
+servecounterstrike.com
+serveexchange.com
+serveftp.com
+servegame.com
+servehalflife.com
+servehttp.com
+servehumour.com
+serveirc.com
+servemp3.com
+servep2p.com
+servepics.com
+servequake.com
+servesarcasm.com
+stufftoread.com
+unusualperson.com
+workisboring.com
+dvrcam.info
+ilovecollege.info
+no-ip.info
+brasilia.me
+ddns.me
+dnsfor.me
+hopto.me
+loginto.me
+noip.me
+webhop.me
+bounceme.net
+ddns.net
+eating-organic.net
+mydissent.net
+myeffect.net
+mymediapc.net
+mypsx.net
+mysecuritycamera.net
+nhlfan.net
+no-ip.net
+pgafan.net
+privatizehealthinsurance.net
+redirectme.net
+serveblog.net
+serveminecraft.net
+sytes.net
+cable-modem.org
+collegefan.org
+couchpotatofries.org
+hopto.org
+mlbfan.org
+myftp.org
+mysecuritycamera.org
+nflfan.org
+no-ip.org
+read-books.org
+ufcfan.org
+zapto.org
+no-ip.co.uk
+golffan.us
+noip.us
+pointto.us
 
-// NFT.Storage : https://nft.storage/
-// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
-ipfs.nftstorage.link
+// NodeArt : https://nodeart.io
+// Submitted by Konstantin Nosov <Nosov@nodeart.io>
+stage.nodeart.io
 
 // Noop : https://noop.app
 // Submitted by Nathaniel Schweinberg <noop@rearc.io>
@@ -14418,18 +14505,16 @@ noop.app
 // Submitted by Laurent Pellegrino <security@noticeable.io>
 noticeable.news
 
+// Notion Labs, Inc : https://www.notion.so/
+// Submitted by Jess Yao <trust-core-team@makenotion.com>
+notion.site
+
 // Now-DNS : https://now-dns.com
 // Submitted by Steve Russell <steve@now-dns.com>
 dnsking.ch
 mypi.co
-n4t.co
-001www.com
-ddnslive.com
 myiphost.com
 forumz.info
-16-b.it
-32-b.it
-64-b.it
 soundcast.me
 tcp4.me
 dnsup.net
@@ -14440,130 +14525,32 @@ vpndns.net
 dynserv.org
 now-dns.org
 x443.pw
-now-dns.top
 ntdll.top
 freeddns.us
-crafting.xyz
-zapto.xyz
 
 // nsupdate.info : https://www.nsupdate.info/
 // Submitted by Thomas Waldmann <info@nsupdate.info>
 nsupdate.info
 nerdpol.ovh
 
-// No-IP.com : https://noip.com/
-// Submitted by Deven Reza <publicsuffixlist@noip.com>
-blogsyte.com
-brasilia.me
-cable-modem.org
-ciscofreak.com
-collegefan.org
-couchpotatofries.org
-damnserver.com
-ddns.me
-ditchyourip.com
-dnsfor.me
-dnsiskinky.com
-dvrcam.info
-dynns.com
-eating-organic.net
-fantasyleague.cc
-geekgalaxy.com
-golffan.us
-health-carereform.com
-homesecuritymac.com
-homesecuritypc.com
-hopto.me
-ilovecollege.info
-loginto.me
-mlbfan.org
-mmafan.biz
-myactivedirectory.com
-mydissent.net
-myeffect.net
-mymediapc.net
-mypsx.net
-mysecuritycamera.com
-mysecuritycamera.net
-mysecuritycamera.org
-net-freaks.com
-nflfan.org
-nhlfan.net
-no-ip.ca
-no-ip.co.uk
-no-ip.net
-noip.us
-onthewifi.com
-pgafan.net
-point2this.com
-pointto.us
-privatizehealthinsurance.net
-quicksytes.com
-read-books.org
-securitytactics.com
-serveexchange.com
-servehumour.com
-servep2p.com
-servesarcasm.com
-stufftoread.com
-ufcfan.org
-unusualperson.com
-workisboring.com
-3utilities.com
-bounceme.net
-ddns.net
-ddnsking.com
-gotdns.ch
-hopto.org
-myftp.biz
-myftp.org
-myvnc.com
-no-ip.biz
-no-ip.info
-no-ip.org
-noip.me
-redirectme.net
-servebeer.com
-serveblog.net
-servecounterstrike.com
-serveftp.com
-servegame.com
-servehalflife.com
-servehttp.com
-serveirc.com
-serveminecraft.net
-servemp3.com
-servepics.com
-servequake.com
-sytes.net
-webhop.me
-zapto.org
-
-// NodeArt : https://nodeart.io
-// Submitted by Konstantin Nosov <Nosov@nodeart.io>
-stage.nodeart.io
-
-// Nucleos Inc. : https://nucleos.com
-// Submitted by Piotr Zduniak <piotr@nucleos.com>
-pcloud.host
-
-// NYC.mn : http://www.information.nyc.mn
-// Submitted by Matthew Brown <mattbrown@nyc.mn>
+// NYC.mn : https://dot.nyc.mn/
+// Submitted by NYC.mn Subdomain Service <nyc.mn@mailfence.com>
 nyc.mn
 
 // O3O.Foundation : https://o3o.foundation/
-// Submitted by the prvcy.page Registry Team <psl@registry.prvcy.page>
+// Submitted by the prvcy.page Registry Team <info@o3o.foundation>
 prvcy.page
 
+// Obl.ong : https://obl.ong
+// Submitted by Reese Armstrong <team@obl.ong>
+obl.ong
+
 // Observable, Inc. : https://observablehq.com
 // Submitted by Mike Bostock <dns@observablehq.com>
+observablehq.cloud
 static.observableusercontent.com
 
-// Octopodal Solutions, LLC. : https://ulterius.io/
-// Submitted by Andrew Sampson <andrew@ulterius.io>
-cya.gg
-
-// OMG.LOL : <https://omg.lol>
+// OMG.LOL : https://omg.lol
 // Submitted by Adam Newbold <adam@omg.lol>
 omg.lol
 
@@ -14571,38 +14558,39 @@ omg.lol
 // Submitted by Cole Estep <cole@omnibond.com>
 cloudycluster.net
 
-// OmniWe Limited: https://omniwe.com
+// OmniWe Limited : https://omniwe.com
 // Submitted by Vicary Archangel <vicary@omniwe.com>
 omniwe.site
 
-// One.com: https://www.one.com/
+// One.com : https://www.one.com/
 // Submitted by Jacob Bunk Nielsen <jbn@one.com>
-123hjemmeside.dk
-123hjemmeside.no
-123homepage.it
-123kotisivu.fi
-123minsida.se
-123miweb.es
-123paginaweb.pt
-123siteweb.fr
 123webseite.at
-123webseite.de
 123website.be
+simplesite.com.br
 123website.ch
+simplesite.com
+123webseite.de
+123hjemmeside.dk
+123miweb.es
+123kotisivu.fi
+123siteweb.fr
+simplesite.gr
+123homepage.it
 123website.lu
 123website.nl
+123hjemmeside.no
 service.one
-simplesite.com
-simplesite.com.br
-simplesite.gr
 simplesite.pl
+123paginaweb.pt
+123minsida.se
 
-// One Fold Media : http://www.onefoldmedia.com/
-// Submitted by Eddie Jones <eddie@onefoldmedia.com>
-nid.io
+// ONID : https://get.onid.ca
+// Submitted by ONID Engineering Team <psl@onid.ca>
+onid.ca
 
 // Open Domains : https://open-domains.net
 // Submitted by William Harrison <admin@open-domains.net>
+is-a-fullstack.dev
 is-cool.dev
 is-not-a.dev
 localplayer.dev
@@ -14616,7 +14604,13 @@ opensocial.site
 // Submitted by Sven Marnach <sven@opencraft.com>
 opencraft.hosting
 
-// OpenResearch GmbH: https://openresearch.com/
+// OpenHost : https://registry.openhost.uk
+// Submitted by OpenHost Registry Team <support@openhost.uk>
+16-b.it
+32-b.it
+64-b.it
+
+// OpenResearch GmbH : https://openresearch.com/
 // Submitted by Philipp Schmid <ops@openresearch.com>
 orsites.com
 
@@ -14624,17 +14618,28 @@ orsites.com
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
 
+// Oracle Dyn : https://cloud.oracle.com/home https://dyn.com/dns/
+// Submitted by Gregory Drake <support@dyn.com>
+// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
+*.customer-oci.com
+*.oci.customer-oci.com
+*.ocp.customer-oci.com
+*.ocs.customer-oci.com
+*.oraclecloudapps.com
+*.oraclegovcloudapps.com
+*.oraclegovcloudapps.uk
+
 // Orange : https://www.orange.com
 // Submitted by Alexandre Linte <alexandre.linte@orange.com>
 tech.orange
 
 // OsSav Technology Ltd. : https://ossav.com/
-// TLD Nic: http://nic.can.re - TLD Whois Server: whois.can.re
 // Submitted by OsSav Technology Ltd. <support@ossav.com>
+// https://nic.can.re
 can.re
 
-// Oursky Limited : https://authgear.com/, https://skygear.io/
-// Submitted by Authgear Team <hello@authgear.com>, Skygear Developer <hello@skygear.io>
+// Oursky Limited : https://authgear.com/
+// Submitted by Authgear Team <hello@authgear.com> & Skygear Developer <hello@skygear.io>
 authgear-staging.com
 authgearapps.com
 skygearapp.com
@@ -14643,12 +14648,12 @@ skygearapp.com
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
 outsystemscloud.com
 
-// OVHcloud: https://ovhcloud.com
+// OVHcloud : https://ovhcloud.com
 // Submitted by Vincent Cassé <vincent.casse@ovhcloud.com>
-*.webpaas.ovh.net
 *.hosting.ovh.net
+*.webpaas.ovh.net
 
-// OwnProvider GmbH: http://www.ownprovider.com
+// OwnProvider GmbH : http://www.ownprovider.com
 // Submitted by Jan Moennich <jan.moennich@ownprovider.com>
 ownprovider.com
 own.pm
@@ -14669,38 +14674,31 @@ oy.lc
 // Submitted by Derek Myers <derek@pagefog.com>
 pgfog.com
 
-// Pagefront : https://www.pagefronthq.com/
-// Submitted by Jason Kriss <jason@pagefronthq.com>
-pagefrontapp.com
-
 // PageXL : https://pagexl.com
 // Submitted by Yann Guichard <yann@pagexl.com>
 pagexl.com
 
+// Pantheon Systems, Inc. : https://pantheon.io/
+// Submitted by Gary Dylina <gary@pantheon.io>
+gotpantheon.com
+pantheonsite.io
+
 // Paywhirl, Inc : https://paywhirl.com/
 // Submitted by Daniel Netzer <dan@paywhirl.com>
 *.paywhirl.com
 
-// pcarrier.ca Software Inc: https://pcarrier.ca/
+// pcarrier.ca Software Inc : https://pcarrier.ca/
 // Submitted by Pierre Carrier <pc@rrier.ca>
 *.xmit.co
 xmit.dev
+madethis.site
 srv.us
 gh.srv.us
 gl.srv.us
 
-// .pl domains (grandfathered)
-art.pl
-gliwice.pl
-krakow.pl
-poznan.pl
-wroc.pl
-zakopane.pl
-
-// Pantheon Systems, Inc. : https://pantheon.io/
-// Submitted by Gary Dylina <gary@pantheon.io>
-pantheonsite.io
-gotpantheon.com
+// PE Ulyanov Kirill Sergeevich : https://airy.host
+// Submitted by Kirill Ulyanov <k.ulyanov@airy.host>
+lk3.ru
 
 // Peplink | Pepwave : http://peplink.com/
 // Submitted by Steve Leung <steveleung@peplink.com>
@@ -14710,10 +14708,6 @@ mypep.link
 // Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
 perspecta.cloud
 
-// PE Ulyanov Kirill Sergeevich : https://airy.host
-// Submitted by Kirill Ulyanov <k.ulyanov@airy.host>
-lk3.ru
-
 // Planet-Work : https://www.planet-work.com/
 // Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
 on-web.fr
@@ -14728,26 +14722,15 @@ us.platform.sh
 *.platformsh.site
 *.tst.site
 
-// Platter: https://platter.dev
+// Platter : https://platter.dev
 // Submitted by Patrick Flor <patrick@platter.dev>
-platter-app.com
 platter-app.dev
 platterp.us
 
-// Plesk : https://www.plesk.com/
-// Submitted by Anton Akhtyamov <program-managers@plesk.com>
-pdns.page
-plesk.page
-pleskns.com
-
 // Pley AB : https://www.pley.com/
 // Submitted by Henning Pohl <infra@pley.com>
 pley.games
 
-// Port53 : https://port53.io/
-// Submitted by Maximilian Schieder <maxi@zeug.co>
-dyn53.io
-
 // Porter : https://porter.run/
 // Submitted by Rudraksh MK <rudi@porter.run>
 onporter.run
@@ -14763,8 +14746,8 @@ pstmn.io
 mock.pstmn.io
 httpbin.org
 
-//prequalifyme.today : https://prequalifyme.today
-//Submitted by DeepakTiwari deepak@ivylead.io
+// prequalifyme.today : https://prequalifyme.today
+// Submitted by DeepakTiwari deepak@ivylead.io
 prequalifyme.today
 
 // prgmr.com : https://prgmr.com/
@@ -14775,64 +14758,37 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
-// Protocol Labs : https://protocol.ai/
-// Submitted by Michael Burns <noc@protocol.ai>
-*.dweb.link
+// PROJECT ELIV : https://eliv.kr/
+// Submitted by PROJECT ELIV Domain Team <team@eliv.kr>
+c01.kr
+eliv-dns.kr
+mmv.kr
+vki.kr
+
+// project-study : https://project-study.com
+// Submitted by yumenewa <admin@project-study.com>
+dev.project-study.com
 
 // Protonet GmbH : http://protonet.io
 // Submitted by Martin Meier <admin@protonet.io>
 protonet.io
 
-// Publication Presse Communication SARL : https://ppcom.fr
-// Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
-chirurgiens-dentistes-en-france.fr
-byen.site
-
-// pubtls.org: https://www.pubtls.org
-// Submitted by Kor Nielsen <kor@pubtls.org>
-pubtls.org
-
-// PythonAnywhere LLP: https://www.pythonanywhere.com
-// Submitted by Giles Thomas <giles@pythonanywhere.com>
-pythonanywhere.com
-eu.pythonanywhere.com
-
-// QOTO, Org.
-// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
-qoto.io
-
-// Qualifio : https://qualifio.com/
-// Submitted by Xavier De Cock <xdecock@gmail.com>
-qualifioapp.com
-
-// Quality Unit: https://qualityunit.com
-// Submitted by Vasyl Tsalko <vtsalko@qualityunit.com>
-ladesk.com
-
-// QuickBackend: https://www.quickbackend.com
-// Submitted by Dani Biro <dani@pymet.com>
-qbuser.com
-
-// Rad Web Hosting: https://radwebhosting.com
-// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
-cloudsite.builders
-myradweb.net
-servername.us
-
-// Redgate Software: https://red-gate.com
-// Submitted by Andrew Farries <andrew.farries@red-gate.com>
-instances.spawn.cc
-
-// Redstar Consultants : https://www.redstarconsultants.com/
-// Submitted by Jons Slemmer <jons@redstarconsultants.com>
-instantcloud.cn
+// Publication Presse Communication SARL : https://ppcom.fr
+// Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
+chirurgiens-dentistes-en-france.fr
+byen.site
 
-// Russian Academy of Sciences
-// Submitted by Tech Support <support@rasnet.ru>
-ras.ru
+// pubtls.org : https://www.pubtls.org
+// Submitted by Kor Nielsen <kor@pubtls.org>
+pubtls.org
+
+// PythonAnywhere LLP : https://www.pythonanywhere.com
+// Submitted by Giles Thomas <giles@pythonanywhere.com>
+pythonanywhere.com
+eu.pythonanywhere.com
 
 // QA2
-// Submitted by Daniel Dent (https://www.danieldent.com/)
+// Submitted by Daniel Dent : https://www.danieldent.com/
 qa2.com
 
 // QCX
@@ -14849,6 +14805,22 @@ mycloudnas.com
 mynascloud.com
 myqnapcloud.com
 
+// QOTO, Org.
+// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
+qoto.io
+
+// Qualifio : https://qualifio.com/
+// Submitted by Xavier De Cock <xdecock@gmail.com>
+qualifioapp.com
+
+// Quality Unit : https://qualityunit.com
+// Submitted by Vasyl Tsalko <vtsalko@qualityunit.com>
+ladesk.com
+
+// QuickBackend : https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
 // Quip : https://quip.com
 // Submitted by Patrick Linehan <plinehan@quip.com>
 *.quipelements.com
@@ -14863,28 +14835,49 @@ vaporcloud.io
 rackmaze.com
 rackmaze.net
 
-// Rakuten Games, Inc : https://dev.viberplay.io
-// Submitted by Joshua Zhang <public-suffix@rgames.jp>
-g.vbrplsbx.io
+// Rad Web Hosting : https://radwebhosting.com
+// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
+cloudsite.builders
+myradweb.net
+servername.us
+
+// Radix FZC : http://domains.in.net
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+web.in
+in.net
+
+// Raidboxes GmbH : https://raidboxes.de
+// Submitted by Auke Tembrink <hostmaster@raidboxes.de>
+myrdbx.io
+site.rb-hosting.io
 
 // Rancher Labs, Inc : https://rancher.com
 // Submitted by Vincent Fiduccia <domains@rancher.com>
-*.on-k3s.io
 *.on-rancher.cloud
+*.on-k3s.io
 *.on-rio.io
 
+// RavPage : https://www.ravpage.co.il
+// Submitted by Roni Horowitz <roni@responder.co.il>
+ravpage.co.il
+
 // Read The Docs, Inc : https://www.readthedocs.org
 // Submitted by David Fischer <team@readthedocs.org>
+readthedocs-hosted.com
 readthedocs.io
 
 // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
 // Submitted by Tim Kramer <tkramer@rhcloud.com>
 rhcloud.com
 
+// Redgate Software : https://red-gate.com
+// Submitted by Andrew Farries <andrew.farries@red-gate.com>
+instances.spawn.cc
+
 // Render : https://render.com
 // Submitted by Anurag Goel <dev@render.com>
-app.render.com
 onrender.com
+app.render.com
 
 // Repl.it : https://repl.it
 // Submitted by Lincoln Bergeson <psl@repl.it>
@@ -14932,11 +14925,6 @@ devices.resinstaging.io
 // Submitted by Chris Kastorff <info@rethinkdb.com>
 hzc.io
 
-// Revitalised Limited : http://www.revitalised.co.uk
-// Submitted by Jack Price <jack@revitalised.co.uk>
-wellbeingzone.eu
-wellbeingzone.co.uk
-
 // Rico Developments Limited : https://adimo.co
 // Submitted by Colin Brown <hello@adimo.co>
 adimo.co.uk
@@ -14945,6 +14933,16 @@ adimo.co.uk
 // Submitted by Micah Anderson <micah@riseup.net>
 itcouldbewor.se
 
+// Roar Domains LLC : https://roar.basketball/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+aus.basketball
+nz.basketball
+
+// ROBOT PAYMENT INC. : https://www.robotpayment.co.jp/
+// Submitted by Kentaro Takamori <takamori.kentaro@robotpayment.co.jp>
+subsc-pay.com
+subsc-pay.net
+
 // Rochester Institute of Technology : http://www.rit.edu/
 // Submitted by Jennifer Herting <jchits@rit.edu>
 git-pages.rit.edu
@@ -14953,7 +14951,13 @@ git-pages.rit.edu
 // Submitted by Neil Hanlon <neil@resf.org>
 rocky.page
 
-// Rusnames Limited: http://rusnames.ru/
+// Ruhr University Bochum : https://www.ruhr-uni-bochum.de/
+// Submitted by Andreas Jobs <noc@ruhr-uni-bochum.de>
+rub.de
+ruhr-uni-bochum.de
+io.noc.ruhr-uni-bochum.de
+
+// Rusnames Limited : http://rusnames.ru/
 // Submitted by Sergey Zotov <admin@rusnames.ru>
 биз.рус
 ком.рус
@@ -14966,6 +14970,14 @@ rocky.page
 спб.рус
 я.рус
 
+// Russian Academy of Sciences
+// Submitted by Tech Support <support@rasnet.ru>
+ras.ru
+
+// Sakura Frp : https://www.natfrp.com
+// Submitted by Bobo Liu <support@natfrp.cloud>
+nyat.app
+
 // SAKURA Internet Inc. : https://www.sakura.ad.jp/
 // Submitted by Internet Service Department <rs-vendor-ml@sakura.ad.jp>
 180r.com
@@ -15016,12 +15028,20 @@ x0.to
 from.tv
 sakura.tv
 
-// Salesforce.com, Inc. https://salesforce.com/
-// Submitted by Michael Biven <mbiven@salesforce.com> and Aaron Romeo <aaron.romeo@salesforce.com>
+// Salesforce.com, Inc. : https://salesforce.com/
+// Submitted by Salesforce Public Suffix List Team <public-suffix-list@salesforce.com>
 *.builder.code.com
 *.dev-builder.code.com
 *.stg-builder.code.com
 *.001.test.code-builder-stg.platform.salesforce.com
+*.d.crm.dev
+*.w.crm.dev
+*.wa.crm.dev
+*.wb.crm.dev
+*.wc.crm.dev
+*.wd.crm.dev
+*.we.crm.dev
+*.wf.crm.dev
 
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
@@ -15029,8 +15049,8 @@ sandcats.io
 
 // SBE network solutions GmbH : https://www.sbe.de/
 // Submitted by Norman Meilick <nm@sbe.de>
-logoip.de
 logoip.com
+logoip.de
 
 // Scaleway : https://www.scaleway.com/
 // Submitted by Rémy Léone <rleone@scaleway.com>
@@ -15067,7 +15087,7 @@ dedibox.fr
 // Submitted by Hanno Böck <hanno@schokokeks.org>
 schokokeks.net
 
-// Scottish Government: https://www.gov.scot
+// Scottish Government : https://www.gov.scot
 // Submitted by Martin Ellis <martin.ellis@gov.scot>
 gov.scot
 service.gov.scot
@@ -15101,17 +15121,17 @@ seidat.net
 // Submitted by Yuriy Romadin <contact@sellfy.com>
 sellfy.store
 
+// Sendmsg : https://www.sendmsg.co.il
+// Submitted by Assaf Stern <domains@comstar.co.il>
+minisite.ms
+
 // Senseering GmbH : https://www.senseering.de
 // Submitted by Felix Mönckemeyer <f.moenckemeyer@senseering.de>
 senseering.net
 
-// Sendmsg: https://www.sendmsg.co.il
-// Submitted by Assaf Stern <domains@comstar.co.il>
-minisite.ms
-
-// Service Magnet : https://myservicemagnet.com
-// Submitted by Dave Sanders <dave@myservicemagnet.com>
-magnet.page
+// Servebolt AS : https://servebolt.com
+// Submitted by Daniel Kjeserud <cloudops@servebolt.com>
+servebolt.cloud
 
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
@@ -15119,19 +15139,14 @@ biz.ua
 co.ua
 pp.ua
 
+// Shanghai Accounting Society : https://www.sasf.org.cn
+// Submitted by Information Administration <info@sasf.org.cn>
+as.sh.cn
+
 // Sheezy.Art : https://sheezy.art
 // Submitted by Nyoom <admin@sheezy.art>
 sheezy.games
 
-// Shift Crypto AG : https://shiftcrypto.ch
-// Submitted by alex <alex@shiftcrypto.ch>
-shiftcrypto.dev
-shiftcrypto.io
-
-// ShiftEdit : https://shiftedit.net/
-// Submitted by Adam Jimenez <adam@shiftcreate.com>
-shiftedit.io
-
 // Shopblocks : http://www.shopblocks.com/
 // Submitted by Alex Bowers <alex@shopblocks.com>
 myshopblocks.com
@@ -15146,6 +15161,7 @@ shopitsite.com
 
 // shopware AG : https://shopware.com
 // Submitted by Jens Küper <cloud@shopware.com>
+shopware.shop
 shopware.store
 
 // Siemens Mobility GmbH
@@ -15164,13 +15180,11 @@ vipsinaapp.com
 // Submitted by Skylar Challand <support@siteleaf.com>
 siteleaf.net
 
-// Skyhat : http://www.skyhat.io
-// Submitted by Shante Adam <shante@skyhat.io>
-bounty-full.com
-alpha.bounty-full.com
-beta.bounty-full.com
+// Small Technology Foundation : https://small-tech.org
+// Submitted by Aral Balkan <aral@small-tech.org>
+small-web.org
 
-// Smallregistry by Promopixel SARL: https://www.smallregistry.net
+// Smallregistry by Promopixel SARL : https://www.smallregistry.net
 // Former AFNIC's SLDs
 // Submitted by Jérôme Lipowicz <support@promopixel.com>
 aeroport.fr
@@ -15184,10 +15198,6 @@ pharmacien.fr
 port.fr
 veterinaire.fr
 
-// Small Technology Foundation : https://small-tech.org
-// Submitted by Aral Balkan <aral@small-tech.org>
-small-web.org
-
 // Smoove.io : https://www.smoove.io/
 // Submitted by Dan Kozak <dan@smoove.io>
 vp4.me
@@ -15203,65 +15213,28 @@ streamlitapp.com
 // Submitted by Ian Streeter <ian@snowplowanalytics.com>
 try-snowplow.com
 
-// SourceHut : https://sourcehut.org
-// Submitted by Drew DeVault <sir@cmpwn.com>
-srht.site
-
-// StackBlitz : https://stackblitz.com
-// Submitted by Dominic Elm <hello@stackblitz.com>
-w-corp-staticblitz.com
-w-credentialless-staticblitz.com
-w-staticblitz.com
-
-// Stackhero : https://www.stackhero.io
-// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
-stackhero-network.com
-
-// STACKIT : https://www.stackit.de/en/
-// Submitted by STACKIT-DNS Team (Simon Stier) <stackit-dns@mail.schwarz>
-runs.onstackit.cloud
-stackit.gg
-stackit.rocks
-stackit.run
-stackit.zone
-
-// Staclar : https://staclar.com
-// Submitted by Q Misell <q@staclar.com>
-musician.io
-// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
-novecore.site
-
-// staticland : https://static.land
-// Submitted by Seth Vincent <sethvincent@gmail.com>
-static.land
-dev.static.land
-sites.static.land
-
-// Storebase : https://www.storebase.io
-// Submitted by Tony Schirmer <tony@storebase.io>
-storebase.store
-
-// Strategic System Consulting (eApps Hosting): https://www.eapps.com/
-// Submitted by Alex Oancea <aoancea@cloudscale365.com>
-vps-host.net
-atl.jelastic.vps-host.net
-njs.jelastic.vps-host.net
-ric.jelastic.vps-host.net
+// Software Consulting Michal Zalewski : https://www.mafelo.com
+// Submitted by Michal Zalewski <security@mafelo.com>
+mafelo.net
 
 // Sony Interactive Entertainment LLC : https://sie.com/
 // Submitted by David Coles <david.coles@sony.com>
 playstation-cloud.com
 
+// SourceHut : https://sourcehut.org
+// Submitted by Drew DeVault <sir@cmpwn.com>
+srht.site
+
 // SourceLair PC : https://www.sourcelair.com
 // Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
 apps.lair.io
 *.stolos.io
 
-// SpaceKit : https://www.spacekit.io/
-// Submitted by Reza Akhavan <spacekit.io@gmail.com>
-spacekit.io
+// SparrowHost : https://sparrowhost.in/
+// Submitted by Anant Pandey <info@sparrowhost.in>
+ind.mom
 
-// SpeedPartner GmbH: https://www.speedpartner.de/
+// SpeedPartner GmbH : https://www.speedpartner.de/
 // Submitted by Stefan Neufeind <info@speedpartner.de>
 customer.speedpartner.de
 
@@ -15287,6 +15260,30 @@ myspreadshop.pl
 myspreadshop.se
 myspreadshop.co.uk
 
+// StackBlitz : https://stackblitz.com
+// Submitted by Dominic Elm <hello@stackblitz.com>
+w-corp-staticblitz.com
+w-credentialless-staticblitz.com
+w-staticblitz.com
+
+// Stackhero : https://www.stackhero.io
+// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
+stackhero-network.com
+
+// STACKIT GmbH & Co. KG : https://www.stackit.de/en/
+// Submitted by STACKIT-DNS Team (Simon Stier) <dns@stackit.cloud>
+runs.onstackit.cloud
+stackit.gg
+stackit.rocks
+stackit.run
+stackit.zone
+
+// Staclar : https://staclar.com
+// Submitted by Q Misell <q@staclar.com>
+// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
+musician.io
+novecore.site
+
 // Standard Library : https://stdlib.com
 // Submitted by Jacob Lee <jacob@stdlib.com>
 api.stdlib.com
@@ -15304,6 +15301,15 @@ researched.cx
 tests.cx
 surveys.so
 
+// Storacha Network : https://storacha.network
+// Submitted by Alan Shaw <support@storacha.network>
+ipfs.storacha.link
+ipfs.w3s.link
+
+// Storebase : https://www.storebase.io
+// Submitted by Tony Schirmer <tony@storebase.io>
+storebase.store
+
 // Storipress : https://storipress.com
 // Submitted by Benno Liu <benno@storipress.com>
 storipress.app
@@ -15312,22 +15318,34 @@ storipress.app
 // Submitted by Philip Hutchins <hostmaster@storj.io>
 storj.farm
 
+// Strapi : https://strapi.io/
+// Submitted by Florent Baldino <security@strapi.io>
+strapiapp.com
+media.strapiapp.com
+
+// Strategic System Consulting (eApps Hosting) : https://www.eapps.com/
+// Submitted by Alex Oancea <aoancea@cloudscale365.com>
+vps-host.net
+atl.jelastic.vps-host.net
+njs.jelastic.vps-host.net
+ric.jelastic.vps-host.net
+
 // Streak : https://streak.com
 // Submitted by Blake Kadatz <eng@streak.com>
 streak-link.com
 streaklinks.com
 streakusercontent.com
 
-// Studenten Net Twente : http://www.snt.utwente.nl/
-// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
-utwente.io
-
 // Student-Run Computing Facility : https://www.srcf.net/
 // Submitted by Edwin Balani <sysadmins@srcf.net>
 soc.srcf.net
 user.srcf.net
 
-// Sub 6 Limited: http://www.sub6.com
+// Studenten Net Twente : http://www.snt.utwente.nl/
+// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
+utwente.io
+
+// Sub 6 Limited : http://www.sub6.com
 // Submitted by Dan Miller <dm@sub6.com>
 temp-dns.com
 
@@ -15336,12 +15354,6 @@ temp-dns.com
 supabase.co
 supabase.in
 supabase.net
-su.paba.se
-
-// Symfony, SAS : https://symfony.com/
-// Submitted by Fabien Potencier <fabien@symfony.com>
-*.s5y.io
-*.sensiosite.cloud
 
 // Syncloud : https://syncloud.org
 // Submitted by Boris Rybalkin <syncloud@syncloud.it>
@@ -15363,33 +15375,41 @@ dsmynas.net
 familyds.net
 dsmynas.org
 familyds.org
-vpnplus.to
 direct.quickconnect.to
+vpnplus.to
 
 // Tabit Technologies Ltd. : https://tabit.cloud/
 // Submitted by Oren Agiv <oren@tabit.cloud>
-tabitorder.co.il
-mytabit.co.il
 mytabit.com
+mytabit.co.il
+tabitorder.co.il
 
 // TAIFUN Software AG : http://taifun-software.de
 // Submitted by Bjoern Henke <dev-server@taifun-software.de>
 taifun-dns.de
 
 // Tailscale Inc. : https://www.tailscale.com
-// Submitted by David Anderson <danderson@tailscale.com>
-beta.tailscale.net
+// Submitted by David Anderson <infra+public-suffix-list@tailscale.com>
 ts.net
 *.c.ts.net
 
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
+// TASK geographical domains : https://task.gda.pl/en/services/for-entrepreneurs/
 gda.pl
 gdansk.pl
 gdynia.pl
 med.pl
 sopot.pl
 
-// team.blue https://team.blue
+// Tave Creative Corp : https://tave.com/
+// Submitted by Adrian Ziemkowski <devops@tave.com>
+taveusercontent.com
+
+// tawk.to, Inc : https://www.tawk.to
+// Submitted by tawk.to developer team <dev-accounts@tawk.to>
+p.tawk.email
+p.tawkto.email
+
+// team.blue : https://team.blue
 // Submitted by Cedric Dubois <cedric.dubois@team.blue>
 site.tb-hosting.com
 
@@ -15411,11 +15431,11 @@ telebit.io
 reservd.com
 thingdustdata.com
 cust.dev.thingdust.io
+reservd.dev.thingdust.io
 cust.disrec.thingdust.io
+reservd.disrec.thingdust.io
 cust.prod.thingdust.io
 cust.testing.thingdust.io
-reservd.dev.thingdust.io
-reservd.disrec.thingdust.io
 reservd.testing.thingdust.io
 
 // ticket i/O GmbH : https://ticket.io
@@ -15429,13 +15449,12 @@ azimuth.network
 tlon.network
 
 // Tor Project, Inc. : https://torproject.org
-// Submitted by Antoine Beaupré <anarcat@torproject.org
+// Submitted by Antoine Beaupré <anarcat@torproject.org>
 torproject.net
 pages.torproject.net
 
 // TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <dward@townnews.com>
-bloxcms.com
 townnews-staging.com
 
 // TrafficPlex GmbH : https://www.trafficplex.de/
@@ -15461,14 +15480,11 @@ webspace.rocks
 lima.zone
 
 // TransIP : https://www.transip.nl
-// Submitted by Rory Breuk <rbreuk@transip.nl>
+// Submitted by Rory Breuk <rbreuk@transip.nl> and Cedric Dubois <cedric.dubois@team.blue>
 *.transurl.be
 *.transurl.eu
-*.transurl.nl
-
-// TransIP: https://www.transip.nl
-// Submitted by Cedric Dubois <cedric.dubois@team.blue>
 site.transip.me
+*.transurl.nl
 
 // TuxFamily : http://tuxfamily.org
 // Submitted by TuxFamily administrators <adm@staff.tuxfamily.org>
@@ -15477,8 +15493,6 @@ tuxfamily.org
 // TwoDNS : https://www.twodns.de/
 // Submitted by TwoDNS-Support <support@two-dns.de>
 dd-dns.de
-diskstation.eu
-diskstation.org
 dray-dns.de
 draydns.de
 dyn-vpn.de
@@ -15489,26 +15503,28 @@ my-wan.de
 syno-ds.de
 synology-diskstation.de
 synology-ds.de
+diskstation.eu
+diskstation.org
 
 // Typedream : https://typedream.com
 // Submitted by Putri Karunia <putri@typedream.com>
 typedream.app
 
 // Typeform : https://www.typeform.com
-// Submitted by Sergi Ferriz <sergi.ferriz@typeform.com>
+// Submitted by Typeform <ops@typeform.com>
 pro.typeform.com
 
 // Uberspace : https://uberspace.de
 // Submitted by Moritz Werner <mwerner@jonaspasche.com>
-uber.space
 *.uberspace.de
+uber.space
 
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
-hk.org
-ltd.hk
 inc.hk
+ltd.hk
+hk.org
 
 // UK Intis Telecom LTD : https://it.com
 // Submitted by ITComdomains <to@it.com>
@@ -15518,6 +15534,15 @@ it.com
 // Submitted by Simon Højberg <security@unison.cloud>
 unison-services.cloud
 
+// United Gameserver GmbH : https://united-gameserver.de
+// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
+virtual-user.de
+virtualuser.de
+
+// United States Writing Corporation : https://uswriting.co
+// Submitted by Andrew Sampson <security@obj.ag>
+obj.ag
+
 // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
 // see also: whois -h whois.udr.org.yt help
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
@@ -15527,50 +15552,57 @@ biz.wf
 sch.wf
 org.yt
 
-// United Gameserver GmbH : https://united-gameserver.de
-// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
-virtualuser.de
-virtual-user.de
+// University of Banja Luka : https://unibl.org
+// Domains for Republic of Srpska administrative entity.
+// Submitted by Marko Ivanovic <kormang@hotmail.rs>
+rs.ba
 
-// Upli : https://upli.io
-// Submitted by Lenny Bakkalian <lenny.bakkalian@gmail.com>
-upli.io
+// University of Bielsko-Biala regional domain : http://dns.bielsko.pl/
+// Submitted by Marcin <dns@ath.bielsko.pl>
+bielsko.pl
 
 // urown.net : https://urown.net
 // Submitted by Hostmaster <hostmaster@urown.net>
 urown.cloud
 dnsupdate.info
 
-// .US
-// Submitted by Ed Moore <Ed.Moore@lib.de.us>
-lib.de.us
+// US REGISTRY LLC : http://us.org
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+us.org
 
-// VeryPositive SIA : http://very.lv
-// Submitted by Danko Aleksejevs <danko@very.lv>
-2038.io
+// V.UA Domain Administrator : https://domain.v.ua/
+// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
+v.ua
+
+// Val Town, Inc : https://val.town/
+// Submitted by Tom MacWright <security@val.town>
+val.run
+web.val.run
 
 // Vercel, Inc : https://vercel.com/
-// Submitted by Connor Davis <security@vercel.com>
+// Submitted by Max Leiter <security@vercel.com>
 vercel.app
+v0.build
 vercel.dev
+vusercontent.net
 now.sh
 
-// Viprinet Europe GmbH : http://www.viprinet.com
-// Submitted by Simon Kissel <hostmaster@viprinet.com>
-router.management
+// VeryPositive SIA : http://very.lv
+// Submitted by Danko Aleksejevs <danko@very.lv>
+2038.io
 
 // Virtual-Info : https://www.virtual-info.info/
 // Submitted by Adnan RIHAN <hostmaster@v-info.info>
 v-info.info
 
-// Voorloper.com: https://voorloper.com
+// Viva Republica, Inc. : https://toss.im/
+// Submitted by Deus Team <deus@toss.im>
+deus-canvas.com
+
+// Voorloper.com : https://voorloper.com
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// V.UA Domain Administrator : https://domain.v.ua/
-// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
-v.ua
-
 // Vultr Objects : https://www.vultr.com/products/object-storage/
 // Submitted by Niels Maumenee <storage@vultr.com>
 *.vultrobjects.com
@@ -15584,46 +15616,72 @@ wafflecell.com
 webflow.io
 webflowtest.io
 
-// WebHare bv: https://www.webhare.com/
+// WebHare bv : https://www.webhare.com/
 // Submitted by Arnold Hendriks <info@webhare.com>
 *.webhare.dev
 
-// WebHotelier Technologies Ltd: https://www.webhotelier.net/
+// WebHotelier Technologies Ltd : https://www.webhotelier.net/
 // Submitted by Apostolos Tsakpinis <apostolos.tsakpinis@gmail.com>
-reserve-online.net
-reserve-online.com
 bookonline.app
 hotelwithflight.com
+reserve-online.com
+reserve-online.net
+
+// WebPros International, LLC : https://webpros.com/
+// Submitted by Nicolas Rochelemagne <public.suffix@webpros.com>
+cprapid.com
+pleskns.com
+wp2.host
+pdns.page
+plesk.page
+cpanel.site
+wpsquared.site
 
-// WebWaddle Ltd: https://webwaddle.com/
+// WebWaddle Ltd : https://webwaddle.com/
 // Submitted by Merlin Glander <hostmaster@webwaddle.com>
 *.wadl.top
 
-// WeDeploy by Liferay, Inc. : https://www.wedeploy.com
-// Submitted by Henrique Vicente <security@wedeploy.com>
-wedeploy.io
-wedeploy.me
-wedeploy.sh
-
 // Western Digital Technologies, Inc : https://www.wdc.com
 // Submitted by Jung Jin <jungseok.jin@wdc.com>
 remotewd.com
 
+// Whatbox Inc. : https://whatbox.ca/
+// Submitted by Anthony Ryan <servers@whatbox.ca>
+box.ca
+
 // WIARD Enterprises : https://wiardweb.com
 // Submitted by Kidd Hustle <kiddhustle@wiardweb.com>
 pages.wiardweb.com
 
 // Wikimedia Labs : https://wikitech.wikimedia.org
 // Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
-wmflabs.org
 toolforge.org
 wmcloud.org
+wmflabs.org
+
+// William Harrison : https://wharrison.com.au
+// Submitted by William Harrison <security@wharrison.com.au>
+wdh.app
+hrsn.dev
+
+// Windsurf : https://windsurf.com
+// Submitted by Douglas Chen <psl@windsurf.com>
+windsurf.app
+windsurf.build
 
 // WISP : https://wisp.gg
 // Submitted by Stepan Fedotov <stepan@wisp.gg>
 panel.gg
 daemon.panel.gg
 
+// Wix.com, Inc. : https://www.wix.com
+// Submitted by Shahar Talmi / Alon Kochba <publicsuffixlist@wix.com>
+wixsite.com
+wixstudio.com
+editorx.io
+wixstudio.io
+wix.run
+
 // Wizard Zines : https://wizardzines.com
 // Submitted by Julia Evans <julia@wizardzines.com>
 messwithdns.com
@@ -15649,14 +15707,7 @@ weeklylottery.org.uk
 wpenginepowered.com
 js.wpenginepowered.com
 
-// Wix.com, Inc. : https://www.wix.com
-// Submitted by Shahar Talmi <shahar@wix.com>
-wixsite.com
-editorx.io
-wixstudio.io
-wix.run
-
-// XenonCloud GbR: https://xenoncloud.net
+// XenonCloud GbR : https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
 half.host
 
@@ -15672,7 +15723,7 @@ cistron.nl
 demon.nl
 xs4all.space
 
-// Yandex.Cloud LLC: https://cloud.yandex.com
+// Yandex.Cloud LLC : https://cloud.yandex.com
 // Submitted by Alexander Lodin <security+psl@yandex-team.ru>
 yandexcloud.net
 storage.yandexcloud.net
@@ -15686,16 +15737,6 @@ official.academy
 // Submitted by Stefano Rivera <stefano@yola.com>
 yolasite.com
 
-// Yombo : https://yombo.net
-// Submitted by Mitch Schwenk <mitch@yombo.net>
-ybo.faith
-yombo.me
-homelink.one
-ybo.party
-ybo.review
-ybo.science
-ybo.trade
-
 // Yunohost : https://yunohost.org
 // Submitted by Valentin Grimaud <security@yunohost.org>
 ynh.fr
@@ -15711,6 +15752,14 @@ za.org
 // Submitted by Julian Alker <security@zap-hosting.com>
 zap.cloud
 
+// Zeabur : https://zeabur.com/
+// Submitted by Zeabur Team <contact@zeabur.com>
+zeabur.app
+
+// Zerops : https://zerops.io/
+// Submitted by Zerops Team <security@zerops.io>
+*.zerops.app
+
 // Zine EOOD : https://zine.bg/
 // Submitted by Martin Angelov <martin@zine.bg>
 bss.design
@@ -15721,4 +15770,8 @@ basicserver.io
 virtualserver.io
 enterprisecloud.nu
 
+// Zone.ID: https://zone.id
+// Submitted by Gx1.org <security@gx1.org>
+zone.id
+
 // ===END PRIVATE DOMAINS===
diff --git a/src/java.base/share/legal/public_suffix.md b/src/java.base/share/legal/public_suffix.md
index 02481558af6..26ab8a69a23 100644
--- a/src/java.base/share/legal/public_suffix.md
+++ b/src/java.base/share/legal/public_suffix.md
@@ -11,7 +11,7 @@ If you do not wish to use the Public Suffix List, you may remove the
 
 The Source Code of this file is available under the
 Mozilla Public License, v. 2.0 and is located at
-https://raw.githubusercontent.com/publicsuffix/list/1cbd6e71a9b83620b1d0b11e49d3d9ff48c27e22/public_suffix_list.dat.
+https://raw.githubusercontent.com/publicsuffix/list/823beb1425def931c8b0b170a6bc33b424c3f9b0/public_suffix_list.dat.
 If a copy of the MPL was not distributed with this file, you can obtain one
 at https://mozilla.org/MPL/2.0/.
 
diff --git a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
index a24b0968f70..f3811511e53 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
+++ b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.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,7 +23,7 @@
 
 /*
  * @test
- * @bug 8228969 8244087 8255266 8302182 8331864
+ * @bug 8228969 8244087 8255266 8302182 8331864 8357062
  * @modules java.base/sun.security.util
  * @summary unit test for RegisteredDomain
  */
diff --git a/test/jdk/sun/security/util/RegisteredDomain/tests.dat b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
index 7fe95c979ea..7d395c62a74 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/tests.dat
+++ b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
@@ -72,9 +72,9 @@ w.foo.公司.cn           公司.cn         foo.公司.cn
 www.foo.com             com             foo.com
 z.www.foo.com           com             foo.com
 com                     com             null
-ar.com                  ar.com          null
-site.ar.com             ar.com          site.ar.com
-w.site.ar.com           ar.com          site.ar.com
+us.com                  us.com          null
+site.us.com             us.com          site.us.com
+w.site.us.com           us.com          site.us.com
 
 # fj (no longer *.fj)
 foo.gov.fj              gov.fj          foo.gov.fj
@@ -109,6 +109,10 @@ p.w.foo.kawasaki.jp        foo.kawasaki.jp    w.foo.kawasaki.jp
 city.kawasaki.jp           kawasaki.jp        city.kawasaki.jp
 w.city.kawasaki.jp         kawasaki.jp        city.kawasaki.jp
 
+# kr
+ai.kr                   ai.kr           null
+foo.ai.kr               ai.kr           foo.ai.kr
+
 # kw
 www.example.kw          kw              example.kw
 www.example.com.kw      com.kw          example.com.kw
@@ -151,6 +155,7 @@ w.s.k12.oh.us           k12.oh.us       s.k12.oh.us
 s.k12.oh.us             k12.oh.us       s.k12.oh.us
 s.pvt.k12.ma.us         pvt.k12.ma.us   s.pvt.k12.ma.us
 w.s.pvt.k12.ma.us       pvt.k12.ma.us   s.pvt.k12.ma.us
+kids.us                 us              kids.us
 
 # vn
 site.com.vn             com.vn          site.com.vn

From bcf5cd69413abd95bf7c3a0249fe1c9b713c85a6 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 20 May 2025 15:49:51 +0000
Subject: [PATCH 543/901] 8355954: File.delete removes read-only files (win)

Reviewed-by: alanb
---
 .../classes/java/io/WinNTFileSystem.java      |  7 +-
 .../native/libjava/WinNTFileSystem_md.c       | 30 +++++---
 test/jdk/java/io/File/DeleteReadOnly.java     | 70 +++++++++++++++++++
 test/jdk/java/io/File/SetAccess.java          | 38 ++++++----
 .../security/HashedPasswordFileTest.java      |  9 ++-
 5 files changed, 128 insertions(+), 26 deletions(-)
 create mode 100644 test/jdk/java/io/File/DeleteReadOnly.java

diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index 3f383187517..56aa27c004d 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -41,6 +41,9 @@ final class WinNTFileSystem extends FileSystem {
 
     private static final String LONG_PATH_PREFIX = "\\\\?\\";
 
+    private static final boolean ALLOW_DELETE_READ_ONLY_FILES =
+        Boolean.getBoolean("jdk.io.File.allowDeleteReadOnlyFiles");
+
     private final char slash;
     private final char altSlash;
     private final char semicolon;
@@ -565,9 +568,9 @@ public boolean setReadOnly(File f) {
 
     @Override
     public boolean delete(File f) {
-        return delete0(f);
+        return delete0(f, ALLOW_DELETE_READ_ONLY_FILES);
     }
-    private native boolean delete0(File f);
+    private native boolean delete0(File f, boolean allowDeleteReadOnlyFiles);
 
     @Override
     public boolean rename(File f1, File f2) {
diff --git a/src/java.base/windows/native/libjava/WinNTFileSystem_md.c b/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
index 2598eaa6fec..ccf89eb71e0 100644
--- a/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
+++ b/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
@@ -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
@@ -649,31 +649,43 @@ Java_java_io_WinNTFileSystem_createFileExclusively0(JNIEnv *env, jclass cls,
 }
 
 static int
-removeFileOrDirectory(const jchar *path)
+removeFileOrDirectory(const jchar *path, jboolean allowDeleteReadOnlyFiles)
 {
     /* Returns 0 on success */
-    DWORD a;
-
-    SetFileAttributesW(path, FILE_ATTRIBUTE_NORMAL);
-    a = GetFileAttributesW(path);
+    DWORD a = GetFileAttributesW(path);
     if (a == INVALID_FILE_ATTRIBUTES) {
         return 1;
     } else if (a & FILE_ATTRIBUTE_DIRECTORY) {
+        // read-only attribute cannot be set on directories
         return !RemoveDirectoryW(path);
     } else {
-        return !DeleteFileW(path);
+        // unset read-only attribute if deleting read-only files is enabled
+        BOOL readOnlyAttrCleared = FALSE;
+        if (allowDeleteReadOnlyFiles && ((a & FILE_ATTRIBUTE_READONLY) != 0)) {
+            DWORD notReadOnlyAttr = a & (~FILE_ATTRIBUTE_READONLY);
+            readOnlyAttrCleared = SetFileAttributesW(path, notReadOnlyAttr);
+        }
+
+        BOOL deleted = !DeleteFileW(path);
+
+        // reinstate the read-only attribute if it was unset but deletion failed
+        if (!deleted && readOnlyAttrCleared)
+            SetFileAttributesW(path, a);
+
+        return deleted;
     }
 }
 
 JNIEXPORT jboolean JNICALL
-Java_java_io_WinNTFileSystem_delete0(JNIEnv *env, jobject this, jobject file)
+Java_java_io_WinNTFileSystem_delete0(JNIEnv *env, jobject this, jobject file,
+                                     jboolean allowDeleteReadOnlyFiles)
 {
     jboolean rv = JNI_FALSE;
     WCHAR *pathbuf = fileToNTPath(env, file, ids.path);
     if (pathbuf == NULL) {
         return JNI_FALSE;
     }
-    if (removeFileOrDirectory(pathbuf) == 0) {
+    if (removeFileOrDirectory(pathbuf, allowDeleteReadOnlyFiles) == 0) {
         rv = JNI_TRUE;
     }
     free(pathbuf);
diff --git a/test/jdk/java/io/File/DeleteReadOnly.java b/test/jdk/java/io/File/DeleteReadOnly.java
new file mode 100644
index 00000000000..a29161b759d
--- /dev/null
+++ b/test/jdk/java/io/File/DeleteReadOnly.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 8355954
+ * @requires (os.family == "windows")
+ * @summary Verify correct behavior of File.delete
+ * @run junit DeleteReadOnly
+ * @run junit/othervm -Djdk.io.File.allowDeleteReadOnlyFiles=true DeleteReadOnly
+ */
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DeleteReadOnly {
+    private static final String PROP = "jdk.io.File.allowDeleteReadOnlyFiles";
+    private static final boolean DELETE_READ_ONLY = Boolean.getBoolean(PROP);
+
+    private static final File ROOT = new File(".");
+
+    @Test
+    void deleteReadOnlyRegularFile() throws IOException {
+        File dir = Files.createTempDirectory(ROOT.toPath(), "dir").toFile();
+        File file = File.createTempFile("tow", "hee", dir);
+
+        file.setReadOnly();
+
+        boolean deleted = file.delete();
+        assertEquals(DELETE_READ_ONLY, deleted);
+
+        if (!deleted) {
+            file.setWritable(true);
+            assertTrue(file.delete());
+        }
+
+        assertTrue(dir.delete());
+    }
+
+    @Test
+    void deleteReadOnlyDirectory() throws IOException {
+        File dir = Files.createTempDirectory(ROOT.toPath(), "dir").toFile();
+        dir.setReadOnly();
+        assertTrue(dir.delete());
+    }
+}
diff --git a/test/jdk/java/io/File/SetAccess.java b/test/jdk/java/io/File/SetAccess.java
index 1fc4e971acd..96d8bf68b57 100644
--- a/test/jdk/java/io/File/SetAccess.java
+++ b/test/jdk/java/io/File/SetAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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
@@ -24,19 +24,25 @@
 /* @test
    @bug 4167472 5097703 6216563 6284003 6728842 6464744
    @summary Basic test for setWritable/Readable/Executable methods
+   @library /test/lib
    @build SetAccess Util
    @run main SetAccess
  */
 
-import java.io.*;
-import java.nio.file.*;
-import java.nio.file.attribute.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.nio.file.attribute.PosixFilePermissions;
+
+import jtreg.SkippedException;
 
 public class SetAccess {
     public static void main(String[] args) throws Exception {
         if (Util.isPrivileged()) {
-            System.out.println("Unable to test file permissions when running with privileges");
-            return;
+            throw new SkippedException("Unable to test file permissions when running with privileges");
         }
 
         File d = new File(System.getProperty("test.dir", "."));
@@ -64,7 +70,7 @@ public static void doTest(File f) throws Exception {
             if (!f.setWritable(true, true) ||
                 !f.canWrite() ||
                 permission(f).charAt(2) != 'w')
-                throw new Exception(f + ": setWritable(true, ture) Failed");
+                throw new Exception(f + ": setWritable(true, true) Failed");
             if (!f.setWritable(false, true) ||
                 f.canWrite() ||
                 permission(f).charAt(2) != '-')
@@ -79,7 +85,7 @@ public static void doTest(File f) throws Exception {
                 throw new Exception(f + ": setWritable(false, true) Failed");
             if (!f.setWritable(true) || !f.canWrite() ||
                 permission(f).charAt(2) != 'w')
-                throw new Exception(f + ": setWritable(true, ture) Failed");
+                throw new Exception(f + ": setWritable(true, true) Failed");
             if (!f.setWritable(false) || f.canWrite() ||
                 permission(f).charAt(2) != '-')
                 throw new Exception(f + ": setWritable(false, true) Failed");
@@ -128,16 +134,16 @@ public static void doTest(File f) throws Exception {
                 permission(f).charAt(1) != '-')
                 throw new Exception(f + ": setReadable(false, true) Failed");
         } else {
-            //Windows platform
+            // Windows platform
             if (f.isFile()) {
                 if (!f.setReadOnly())
                     throw new Exception(f + ": setReadOnly Failed");
                 if (!f.setWritable(true, true) || !f.canWrite())
-                    throw new Exception(f + ": setWritable(true, ture) Failed");
+                    throw new Exception(f + ": setWritable(true, true) Failed");
                 if (!f.setWritable(true, false) || !f.canWrite())
                     throw new Exception(f + ": setWritable(true, false) Failed");
                 if (!f.setWritable(true) || !f.canWrite())
-                    throw new Exception(f + ": setWritable(true, ture) Failed");
+                    throw new Exception(f + ": setWritable(true, true) Failed");
                 if (!f.setExecutable(true, true) || !f.canExecute())
                     throw new Exception(f + ": setExecutable(true, true) Failed");
                 if (!f.setExecutable(true, false) || !f.canExecute())
@@ -152,8 +158,8 @@ public static void doTest(File f) throws Exception {
                     throw new Exception(f + ": setReadable(true, true) Failed");
             }
             if (f.isDirectory()) {
-                // setWritable should fail on directories because the DOS readonly
-                // attribute prevents a directory from being deleted.
+                // setWritable should fail on directories because the DOS
+                // readonly attribute prevents a directory from being deleted.
                 if (f.setWritable(false, true))
                     throw new Exception(f + ": setWritable(false, true) Succeeded");
                 if (f.setWritable(false, false))
@@ -180,6 +186,12 @@ public static void doTest(File f) throws Exception {
                 throw new Exception(f + ": setReadable(false, false) Failed");
             if (f.setReadable(false))
                 throw new Exception(f + ": setReadable(false, true) Failed");
+            if (f.isFile() && !f.canWrite()) {
+                // Files must not be left in a read-only state as the
+                // jdk.io.File.deleteReadOnly property is not set
+                if (!f.setWritable(true))
+                    throw new Exception(f + ": setWritable(true, true) Failed");
+            }
         }
         if (f.exists() && !f.delete())
             throw new Exception("Can't delete test dir: " + f);
diff --git a/test/jdk/javax/management/security/HashedPasswordFileTest.java b/test/jdk/javax/management/security/HashedPasswordFileTest.java
index f84e00abd4e..6cef1df4a0a 100644
--- a/test/jdk/javax/management/security/HashedPasswordFileTest.java
+++ b/test/jdk/javax/management/security/HashedPasswordFileTest.java
@@ -115,8 +115,13 @@ private String getPasswordFilePath() {
 
     private File createNewPasswordFile() throws IOException {
         File file = new File(getPasswordFilePath());
-        if (file.exists()) {
-            file.delete();
+        if (file.exists() && !file.delete()) {
+            // if the password file exists but is not deleted, try to make it
+            // writable then try again to remove it
+            if (!file.canWrite() && file.setWritable(true, true)) {
+                if (!file.delete())
+                    System.err.println("WARNING: Password file not deleted");
+            }
         }
         file.createNewFile();
         return file;

From e9d1d87b34f636747065c01128a12fc057070e09 Mon Sep 17 00:00:00 2001
From: Patrick Strawderman <pstrawderman@netflix.com>
Date: Tue, 20 May 2025 17:20:49 +0000
Subject: [PATCH 544/901] 8357013: HttpURLConnection#getResponseCode can avoid
 substring call when parsing to int

Reviewed-by: dfuchs
---
 src/java.base/share/classes/java/net/HttpURLConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/net/HttpURLConnection.java b/src/java.base/share/classes/java/net/HttpURLConnection.java
index 8ecbb98e7c6..d9e9b738617 100644
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.java
@@ -534,7 +534,7 @@ public int getResponseCode() throws IOException {
 
                 try {
                     responseCode = Integer.parseInt
-                            (statusLine.substring(codePos+1, phrasePos));
+                            (statusLine, codePos+1, phrasePos, 10);
                     return responseCode;
                 } catch (NumberFormatException e) { }
             }

From 972f2ebe978280d22531a70116e79837632f6ebc Mon Sep 17 00:00:00 2001
From: Ferenc Rakoczi <ferenc.r.rakoczi@oracle.com>
Date: Tue, 20 May 2025 19:06:22 +0000
Subject: [PATCH 545/901] 8351412: Add AVX-512 intrinsics for ML-KEM

Reviewed-by: sviswanathan
---
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |   2 +
 src/hotspot/cpu/x86/stubGenerator_x86_64.hpp  |   7 +-
 .../cpu/x86/stubGenerator_x86_64_kyber.cpp    | 952 ++++++++++++++++++
 src/hotspot/cpu/x86/vm_version_x86.cpp        |  14 +
 src/hotspot/share/classfile/vmIntrinsics.cpp  |   1 +
 src/hotspot/share/opto/library_call.cpp       |   1 +
 src/hotspot/share/opto/runtime.cpp            |   2 +
 src/hotspot/share/opto/runtime.hpp            |  14 +-
 src/hotspot/share/runtime/globals.hpp         |   1 +
 .../com/sun/crypto/provider/ML_KEM.java       |   3 +-
 10 files changed, 986 insertions(+), 11 deletions(-)
 create mode 100644 src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp

diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 1a16416787d..413836840c5 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4204,6 +4204,8 @@ void StubGenerator::generate_compiler_stubs() {
 
   generate_chacha_stubs();
 
+  generate_kyber_stubs();
+
   generate_dilithium_stubs();
 
   generate_sha3_stubs();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index c08b0168796..6069c9dbc8e 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -490,10 +490,13 @@ class StubGenerator: public StubCodeGenerator {
   // SHA3 stubs
   void generate_sha3_stubs();
 
-  // Dilithium stubs and helper functions
+  // Kyber stubs
+  void generate_kyber_stubs();
+
+  // Dilithium stubs
   void generate_dilithium_stubs();
-  // BASE64 stubs
 
+  // BASE64 stubs
   address base64_shuffle_addr();
   address base64_avx2_shuffle_addr();
   address base64_avx2_input_mask_addr();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
new file mode 100644
index 00000000000..91c005e92de
--- /dev/null
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
@@ -0,0 +1,952 @@
+/*
+ * 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.
+ *
+ */
+
+#include "asm/assembler.hpp"
+#include "asm/assembler.inline.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "macroAssembler_x86.hpp"
+#include "stubGenerator_x86_64.hpp"
+
+#define __ _masm->
+
+#define xmm(i) as_XMMRegister(i)
+
+#ifdef PRODUCT
+#define BLOCK_COMMENT(str) /* nothing */
+#else
+#define BLOCK_COMMENT(str) __ block_comment(str)
+#endif // PRODUCT
+
+#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+// Constants
+//
+ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512Consts[] = {
+    0xF301, 0xF301, 0xF301, 0xF301, // q^-1 mod montR
+    0x0D01, 0x0D01, 0x0D01, 0x0D01, // q
+    0x4EBF, 0x4EBF, 0x4EBF, 0x4EBF, // Barrett multiplier
+    0x0200, 0x0200, 0x0200, 0x0200, //(dim/2)^-1 mod q
+    0x0549, 0x0549, 0x0549, 0x0549, // montR^2 mod q
+    0x0F00, 0x0F00, 0x0F00, 0x0F00  // mask for kyber12to16
+  };
+
+static int qInvModROffset = 0;
+static int qOffset = 8;
+static int barretMultiplierOffset = 16;
+static int dimHalfInverseOffset = 24;
+static int montRSquareModqOffset = 32;
+static int f00Offset = 40;
+
+static address kyberAvx512ConstsAddr(int offset) {
+  return ((address) kyberAvx512Consts) + offset;
+}
+
+const Register scratch = r10;
+
+ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512NttPerms[] = {
+// 0
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+// 128
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+// 256
+    0x00, 0x01, 0x02, 0x03, 0x20, 0x21, 0x22, 0x23,
+    0x08, 0x09, 0x0A, 0x0B, 0x28, 0x29, 0x2A, 0x2B,
+    0x10, 0x11, 0x12, 0x13, 0x30, 0x31, 0x32, 0x33,
+    0x18, 0x19, 0x1A, 0x1B, 0x38, 0x39, 0x3A, 0x3B,
+    0x04, 0x05, 0x06, 0x07, 0x24, 0x25, 0x26, 0x27,
+    0x0C, 0x0D, 0x0E, 0x0F, 0x2C, 0x2D, 0x2E, 0x2F,
+    0x14, 0x15, 0x16, 0x17, 0x34, 0x35, 0x36, 0x37,
+    0x1C, 0x1D, 0x1E, 0x1F, 0x3C, 0x3D, 0x3E, 0x3F,
+// 384
+    0x00, 0x01, 0x20, 0x21, 0x04, 0x05, 0x24, 0x25,
+    0x08, 0x09, 0x28, 0x29, 0x0C, 0x0D, 0x2C, 0x2D,
+    0x10, 0x11, 0x30, 0x31, 0x14, 0x15, 0x34, 0x35,
+    0x18, 0x19, 0x38, 0x39, 0x1C, 0x1D, 0x3C, 0x3D,
+    0x02, 0x03, 0x22, 0x23, 0x06, 0x07, 0x26, 0x27,
+    0x0A, 0x0B, 0x2A, 0x2B, 0x0E, 0x0F, 0x2E, 0x2F,
+    0x12, 0x13, 0x32, 0x33, 0x16, 0x17, 0x36, 0x37,
+    0x1A, 0x1B, 0x3A, 0x3B, 0x1E, 0x1F, 0x3E, 0x3F,
+// 512
+    0x10, 0x11, 0x30, 0x31, 0x12, 0x13, 0x32, 0x33,
+    0x14, 0x15, 0x34, 0x35, 0x16, 0x17, 0x36, 0x37,
+    0x18, 0x19, 0x38, 0x39, 0x1A, 0x1B, 0x3A, 0x3B,
+    0x1C, 0x1D, 0x3C, 0x3D, 0x1E, 0x1F, 0x3E, 0x3F,
+    0x00, 0x01, 0x20, 0x21, 0x02, 0x03, 0x22, 0x23,
+    0x04, 0x05, 0x24, 0x25, 0x06, 0x07, 0x26, 0x27,
+    0x08, 0x09, 0x28, 0x29, 0x0A, 0x0B, 0x2A, 0x2B,
+    0x0C, 0x0D, 0x2C, 0x2D, 0x0E, 0x0F, 0x2E, 0x2F
+  };
+
+static address kyberAvx512NttPermsAddr() {
+  return (address) kyberAvx512NttPerms;
+}
+
+ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512InverseNttPerms[] = {
+// 0
+    0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
+    0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F,
+    0x22, 0x23, 0x26, 0x27, 0x2A, 0x2B, 0x2E, 0x2F,
+    0x32, 0x33, 0x36, 0x37, 0x3A, 0x3B, 0x3E, 0x3F,
+    0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0C, 0x0D,
+    0x10, 0x11, 0x14, 0x15, 0x18, 0x19, 0x1C, 0x1D,
+    0x20, 0x21, 0x24, 0x25, 0x28, 0x29, 0x2C, 0x2D,
+    0x30, 0x31, 0x34, 0x35, 0x38, 0x39, 0x3C, 0x3D,
+// 128
+    0x00, 0x01, 0x20, 0x21, 0x04, 0x05, 0x24, 0x25,
+    0x08, 0x09, 0x28, 0x29, 0x0C, 0x0D, 0x2C, 0x2D,
+    0x10, 0x11, 0x30, 0x31, 0x14, 0x15, 0x34, 0x35,
+    0x18, 0x19, 0x38, 0x39, 0x1C, 0x1D, 0x3C, 0x3D,
+    0x02, 0x03, 0x22, 0x23, 0x06, 0x07, 0x26, 0x27,
+    0x0A, 0x0B, 0x2A, 0x2B, 0x0E, 0x0F, 0x2E, 0x2F,
+    0x12, 0x13, 0x32, 0x33, 0x16, 0x17, 0x36, 0x37,
+    0x1A, 0x1B, 0x3A, 0x3B, 0x1E, 0x1F, 0x3E, 0x3F,
+// 256
+    0x00, 0x01, 0x02, 0x03, 0x20, 0x21, 0x22, 0x23,
+    0x08, 0x09, 0x0A, 0x0B, 0x28, 0x29, 0x2A, 0x2B,
+    0x10, 0x11, 0x12, 0x13, 0x30, 0x31, 0x32, 0x33,
+    0x18, 0x19, 0x1A, 0x1B, 0x38, 0x39, 0x3A, 0x3B,
+    0x04, 0x05, 0x06, 0x07, 0x24, 0x25, 0x26, 0x27,
+    0x0C, 0x0D, 0x0E, 0x0F, 0x2C, 0x2D, 0x2E, 0x2F,
+    0x14, 0x15, 0x16, 0x17, 0x34, 0x35, 0x36, 0x37,
+    0x1C, 0x1D, 0x1E, 0x1F, 0x3C, 0x3D, 0x3E, 0x3F,
+// 384
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+// 512
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F
+  };
+
+static address kyberAvx512InverseNttPermsAddr() {
+  return (address) kyberAvx512InverseNttPerms;
+}
+
+ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512_nttMultPerms[] = {
+    0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E,
+    0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1C, 0x1E,
+    0x20, 0x22, 0x24, 0x26, 0x28, 0x2A, 0x2C, 0x2E,
+    0x30, 0x32, 0x34, 0x36, 0x38, 0x3A, 0x3C, 0x3E,
+
+    0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
+    0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F,
+    0x21, 0x23, 0x25, 0x27, 0x29, 0x2B, 0x2D, 0x2F,
+    0x31, 0x33, 0x35, 0x37, 0x39, 0x3B, 0x3D, 0x3F,
+
+    0x00, 0x20, 0x01, 0x21, 0x02, 0x22, 0x03, 0x23,
+    0x04, 0x24, 0x05, 0x25, 0x06, 0x26, 0x07, 0x27,
+    0x08, 0x28, 0x09, 0x29, 0x0A, 0x2A, 0x0B, 0x2B,
+    0x0C, 0x2C, 0x0D, 0x2D, 0x0E, 0x2E, 0x0F, 0x2F,
+
+    0x10, 0x30, 0x11, 0x31, 0x12, 0x32, 0x13, 0x33,
+    0x14, 0x34, 0x15, 0x35, 0x16, 0x36, 0x17, 0x37,
+    0x18, 0x38, 0x19, 0x39, 0x1A, 0x3A, 0x1B, 0x3B,
+    0x1C, 0x3C, 0x1D, 0x3D, 0x1E, 0x3E, 0x1F, 0x3F
+  };
+
+static address kyberAvx512_nttMultPermsAddr() {
+  return (address) kyberAvx512_nttMultPerms;
+}
+
+  ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512_12To16Perms[] = {
+// 0
+    0x00, 0x03, 0x06, 0x09, 0x0C, 0x0F, 0x12, 0x15,
+    0x18, 0x1B, 0x1E, 0x21, 0x24, 0x27, 0x2A, 0x2D,
+    0x30, 0x33, 0x36, 0x39, 0x3C, 0x3F, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x04, 0x07, 0x0A, 0x0D, 0x10, 0x13, 0x16,
+    0x19, 0x1C, 0x1F, 0x22, 0x25, 0x28, 0x2B, 0x2E,
+    0x31, 0x34, 0x37, 0x3A, 0x3D, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+// 128
+    0x02, 0x05, 0x08, 0x0B, 0x0E, 0x11, 0x14, 0x17,
+    0x1A, 0x1D, 0x20, 0x23, 0x26, 0x29, 0x2C, 0x2F,
+    0x32, 0x35, 0x38, 0x3B, 0x3E, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x22, 0x25,
+    0x28, 0x2B, 0x2E, 0x31, 0x34, 0x37, 0x3A, 0x3D,
+// 256
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x20, 0x23, 0x26,
+    0x29, 0x2C, 0x2F, 0x32, 0x35, 0x38, 0x3B, 0x3E,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x21, 0x24, 0x27,
+    0x2A, 0x2D, 0x30, 0x33, 0x36, 0x39, 0x3C, 0x3F,
+// 384
+    0x00, 0x20, 0x01, 0x21, 0x02, 0x22, 0x03, 0x23,
+    0x04, 0x24, 0x05, 0x25, 0x06, 0x26, 0x07, 0x27,
+    0x08, 0x28, 0x09, 0x29, 0x0A, 0x2A, 0x0B, 0x2B,
+    0x0C, 0x2C, 0x0D, 0x2D, 0x0E, 0x2E, 0x0F, 0x2F,
+    0x10, 0x30, 0x11, 0x31, 0x12, 0x32, 0x13, 0x33,
+    0x14, 0x34, 0x15, 0x35, 0x16, 0x36, 0x17, 0x37,
+    0x18, 0x38, 0x19, 0x39, 0x1A, 0x3A, 0x1B, 0x3B,
+    0x1C, 0x3C, 0x1D, 0x3D, 0x1E, 0x3E, 0x1F, 0x3F
+  };
+
+static address kyberAvx512_12To16PermsAddr() {
+  return (address) kyberAvx512_12To16Perms;
+}
+
+static void load4regs(int destRegs[], Register address, int offset,
+                      MacroAssembler *_masm) {
+  for (int i = 0; i < 4; i++) {
+    __ evmovdquw(xmm(destRegs[i]), Address(address, offset + i * 64),
+                 Assembler::AVX_512bit);
+  }
+}
+
+// For z = montmul(a,b), z will be  between -q and q and congruent
+// to a * b * R^-1 mod q, where R > 2 * q, R is a power of 2,
+// -R/2 * q <= a * b < R/2 * q.
+// (See e.g. Algorithm 3 in https://eprint.iacr.org/2018/039.pdf)
+// For the Java code, we use R = 2^20 and for the intrinsic, R = 2^16.
+// In our computations, b is always c * R mod q, so the montmul() really
+// computes a * c mod q. In the Java code, we use 32-bit numbers for the
+// computations, and we use R = 2^20 because that way the a * b numbers
+// that occur during all computations stay in the required range.
+// For the intrinsics, we use R = 2^16, because this way we can do twice
+// as much work in parallel, the only drawback is that we should do some Barrett
+// reductions in kyberInverseNtt so that the numbers stay in the required range.
+static void montmul(int outputRegs[], int inputRegs1[], int inputRegs2[],
+             int scratchRegs1[], int scratchRegs2[], MacroAssembler *_masm) {
+   for (int i = 0; i < 4; i++) {
+     __ evpmullw(xmm(scratchRegs1[i]), k0, xmm(inputRegs1[i]),
+                 xmm(inputRegs2[i]), false, Assembler::AVX_512bit);
+   }
+   for (int i = 0; i < 4; i++) {
+     __ evpmulhw(xmm(scratchRegs2[i]), k0, xmm(inputRegs1[i]),
+                 xmm(inputRegs2[i]), false, Assembler::AVX_512bit);
+   }
+   for (int i = 0; i < 4; i++) {
+     __ evpmullw(xmm(scratchRegs1[i]), k0, xmm(scratchRegs1[i]),
+                 xmm31, false, Assembler::AVX_512bit);
+   }
+   for (int i = 0; i < 4; i++) {
+     __ evpmulhw(xmm(scratchRegs1[i]), k0, xmm(scratchRegs1[i]),
+                 xmm30, false, Assembler::AVX_512bit);
+   }
+   for (int i = 0; i < 4; i++) {
+     __ evpsubw(xmm(outputRegs[i]), k0, xmm(scratchRegs2[i]),
+                xmm(scratchRegs1[i]), false, Assembler::AVX_512bit);
+   }
+}
+
+static void sub_add(int subResult[], int addResult[], int input1[], int input2[],
+                    MacroAssembler *_masm) {
+  for (int i = 0; i < 4; i++) {
+    __ evpsubw(xmm(subResult[i]), k0, xmm(input1[i]), xmm(input2[i]),
+               false, Assembler::AVX_512bit);
+    __ evpaddw(xmm(addResult[i]), k0, xmm(input1[i]), xmm(input2[i]),
+               false, Assembler::AVX_512bit);
+  }
+}
+
+// result2 also acts as input1
+// result1 also acts as perm1
+static void permute(int result1[], int result2[], int input2[], int perm2,
+                    MacroAssembler *_masm) {
+
+  for (int i = 1; i < 4; i++) {
+    __ evmovdquw(xmm(result1[i]), xmm(result1[0]), Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 4; i++) {
+    __ evpermi2w(xmm(result1[i]), xmm(result2[i]), xmm(input2[i]),
+                 Assembler::AVX_512bit);
+    __ evpermt2w(xmm(result2[i]), xmm(perm2), xmm(input2[i]),
+                 Assembler::AVX_512bit);
+  }
+}
+
+static void store4regs(Register address, int offset, int sourceRegs[],
+                       MacroAssembler *_masm) {
+  for (int i = 0; i < 4; i++) {
+    __ evmovdquw(Address(address, offset + i * 64), xmm(sourceRegs[i]),
+                 Assembler::AVX_512bit);
+  }
+}
+
+// In all 3 invocations of this function we use the same registers:
+// xmm0-xmm7 for the input and the result,
+// xmm8-xmm15 as scratch registers and
+// xmm16-xmm17 for the constants,
+// so we don't pass register arguments.
+static void barrettReduce(MacroAssembler *_masm) {
+  for (int i = 0; i < 8; i++) {
+    __ evpmulhw(xmm(i + 8), k0, xmm(i), xmm16, false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpsraw(xmm(i + 8), k0, xmm(i + 8), 10, false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpmullw(xmm(i + 8), k0, xmm(i + 8), xmm17, false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpsubw(xmm(i), k0, xmm(i), xmm(i + 8), false, Assembler::AVX_512bit);
+  }
+}
+
+static int xmm0_3[] = {0, 1, 2, 3};
+static int xmm0145[] = {0, 1, 4, 5};
+static int xmm0246[] = {0, 2, 4, 6};
+static int xmm0829[] = {0, 8, 2, 9};
+static int xmm1001[] = {1, 0, 0, 1};
+static int xmm1357[] = {1, 3, 5, 7};
+static int xmm2367[] = {2, 3, 6, 7};
+static int xmm2_0_10_8[] = {2, 0, 10, 8};
+static int xmm3223[] = {3, 2, 2, 3};
+static int xmm4_7[] = {4, 5, 6, 7};
+static int xmm5454[] = {5, 4, 5, 4};
+static int xmm7676[] = {7, 6, 7, 6};
+static int xmm8_11[] = {8, 9, 10, 11};
+static int xmm12_15[] = {12, 13, 14, 15};
+static int xmm16_19[] = {16, 17, 18, 19};
+static int xmm20_23[] = {20, 21, 22, 23};
+static int xmm23_23[] = {23, 23, 23, 23};
+static int xmm24_27[] = {24, 25, 26, 27};
+static int xmm26_29[] = {26, 27, 28, 29};
+static int xmm28_31[] = {28, 29, 30, 31};
+static int xmm29_29[] = {29, 29, 29, 29};
+
+// Kyber NTT function.
+//
+// coeffs (short[256]) = c_rarg0
+// ntt_zetas (short[256]) = c_rarg1
+address generate_kyberNtt_avx512(StubGenerator *stubgen,
+                                 MacroAssembler *_masm) {
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberNtt_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register coeffs = c_rarg0;
+  const Register zetas = c_rarg1;
+
+  const Register perms = r11;
+
+  __ lea(perms, ExternalAddress(kyberAvx512NttPermsAddr()));
+
+  load4regs(xmm4_7, coeffs, 256, _masm);
+  load4regs(xmm20_23, zetas, 0, _masm);
+
+  __ vpbroadcastq(xmm30,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+  __ vpbroadcastq(xmm31,
+                  ExternalAddress(kyberAvx512ConstsAddr(qInvModROffset)),
+                  Assembler::AVX_512bit, scratch); // q^-1 mod montR
+
+  load4regs(xmm0_3, coeffs, 0, _masm);
+
+  // Each level represents one iteration of the outer for loop of the Java version.
+  // level 0
+  montmul(xmm8_11, xmm4_7, xmm20_23, xmm8_11, xmm4_7, _masm);
+  load4regs(xmm20_23, zetas, 256, _masm);
+  sub_add(xmm4_7, xmm0_3, xmm0_3, xmm8_11, _masm);
+
+  //level 1
+  montmul(xmm12_15, xmm2367, xmm20_23, xmm12_15, xmm8_11, _masm);
+  load4regs(xmm20_23, zetas, 512, _masm);
+  sub_add(xmm2367, xmm0145, xmm0145, xmm12_15, _masm);
+
+  // level 2
+  montmul(xmm8_11, xmm1357, xmm20_23, xmm12_15, xmm8_11, _masm);
+  __ evmovdquw(xmm12, Address(perms, 0), Assembler::AVX_512bit);
+  __ evmovdquw(xmm16, Address(perms, 64), Assembler::AVX_512bit);
+  load4regs(xmm20_23, zetas, 768, _masm);
+  sub_add(xmm1357, xmm0246, xmm0246, xmm8_11, _masm);
+
+  //level 3
+  permute(xmm12_15, xmm0246, xmm1357, 16, _masm);
+  montmul(xmm8_11, xmm12_15, xmm20_23, xmm16_19, xmm8_11, _masm);
+  __ evmovdquw(xmm16, Address(perms, 128), Assembler::AVX_512bit);
+  __ evmovdquw(xmm24, Address(perms, 192), Assembler::AVX_512bit);
+  load4regs(xmm20_23, zetas, 1024, _masm);
+  sub_add(xmm1357, xmm0246, xmm0246, xmm8_11, _masm);
+
+  // level 4
+  permute(xmm16_19, xmm0246, xmm1357, 24, _masm);
+  montmul(xmm8_11, xmm0246, xmm20_23, xmm24_27, xmm8_11, _masm);
+  __ evmovdquw(xmm1, Address(perms, 256), Assembler::AVX_512bit);
+  __ evmovdquw(xmm24, Address(perms, 320), Assembler::AVX_512bit);
+  load4regs(xmm20_23, zetas, 1280, _masm);
+  sub_add(xmm12_15, xmm0246, xmm16_19, xmm8_11, _masm);
+
+  // level 5
+  permute(xmm1357, xmm0246, xmm12_15, 24, _masm);
+  montmul(xmm16_19, xmm0246, xmm20_23, xmm16_19, xmm8_11, _masm);
+
+  __ evmovdquw(xmm12, Address(perms, 384), Assembler::AVX_512bit);
+  __ evmovdquw(xmm8, Address(perms, 448), Assembler::AVX_512bit);
+
+  load4regs(xmm20_23, zetas, 1536, _masm);
+  sub_add(xmm24_27, xmm0246, xmm1357, xmm16_19, _masm);
+
+  // level 6
+  permute(xmm12_15, xmm0246, xmm24_27, 8, _masm);
+
+  __ evmovdquw(xmm1, Address(perms, 512), Assembler::AVX_512bit);
+  __ evmovdquw(xmm24, Address(perms, 576), Assembler::AVX_512bit);
+
+  montmul(xmm16_19, xmm0246, xmm20_23, xmm16_19, xmm8_11, _masm);
+  sub_add(xmm20_23, xmm0246, xmm12_15, xmm16_19, _masm);
+
+  permute(xmm1357, xmm0246, xmm20_23, 24, _masm);
+
+  store4regs(coeffs, 0, xmm0_3, _masm);
+  store4regs(coeffs, 256, xmm4_7, _masm);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+// Kyber Inverse NTT function
+//
+// coeffs (short[256]) = c_rarg0
+// ntt_zetas (short[256]) = c_rarg1
+address generate_kyberInverseNtt_avx512(StubGenerator *stubgen,
+                                        MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberInverseNtt_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register coeffs = c_rarg0;
+  const Register zetas = c_rarg1;
+
+  const Register perms = r11;
+
+  __ lea(perms, ExternalAddress(kyberAvx512InverseNttPermsAddr()));
+  __ evmovdquw(xmm12, Address(perms, 0), Assembler::AVX_512bit);
+  __ evmovdquw(xmm16, Address(perms, 64), Assembler::AVX_512bit);
+
+  __ vpbroadcastq(xmm31,
+                  ExternalAddress(kyberAvx512ConstsAddr(qInvModROffset)),
+                  Assembler::AVX_512bit, scratch); // q^-1 mod montR
+  __ vpbroadcastq(xmm30,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+  __ vpbroadcastq(xmm29,
+                  ExternalAddress(kyberAvx512ConstsAddr(dimHalfInverseOffset)),
+                  Assembler::AVX_512bit, scratch); // (dim/2)^-1 mod q
+
+  load4regs(xmm0_3, coeffs, 0, _masm);
+  load4regs(xmm4_7, coeffs, 256, _masm);
+
+  // Each level represents one iteration of the outer for loop of the Java version.
+  // level 0
+  load4regs(xmm8_11, zetas, 0, _masm);
+  permute(xmm12_15, xmm0246, xmm1357, 16, _masm);
+
+  __ evmovdquw(xmm1, Address(perms, 128), Assembler::AVX_512bit);
+  __ evmovdquw(xmm20, Address(perms, 192), Assembler::AVX_512bit);
+
+  sub_add(xmm16_19, xmm0246, xmm0246, xmm12_15, _masm);
+  montmul(xmm12_15, xmm16_19, xmm8_11, xmm12_15, xmm8_11, _masm);
+
+  // level 1
+  load4regs(xmm8_11, zetas, 256, _masm);
+  permute(xmm1357, xmm0246, xmm12_15, 20, _masm);
+  sub_add(xmm16_19, xmm0246, xmm1357, xmm0246, _masm);
+
+  __ evmovdquw(xmm1, Address(perms, 256), Assembler::AVX_512bit);
+  __ evmovdquw(xmm20, Address(perms, 320), Assembler::AVX_512bit);
+
+  montmul(xmm12_15, xmm16_19, xmm8_11, xmm12_15, xmm8_11, _masm);
+
+  // level2
+  load4regs(xmm8_11, zetas, 512, _masm);
+  permute(xmm1357, xmm0246, xmm12_15, 20, _masm);
+  sub_add(xmm16_19, xmm0246, xmm1357,  xmm0246,_masm);
+
+  __ evmovdquw(xmm1, Address(perms, 384), Assembler::AVX_512bit);
+  __ evmovdquw(xmm20, Address(perms, 448), Assembler::AVX_512bit);
+
+  montmul(xmm12_15, xmm16_19, xmm8_11, xmm12_15, xmm8_11, _masm);
+
+  __ vpbroadcastq(xmm16,
+                  ExternalAddress(kyberAvx512ConstsAddr(barretMultiplierOffset)),
+                  Assembler::AVX_512bit, scratch); // Barrett multiplier
+  __ vpbroadcastq(xmm17,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+
+  permute(xmm1357, xmm0246, xmm12_15, 20, _masm);
+  barrettReduce(_masm);
+
+// level 3
+  load4regs(xmm8_11, zetas, 768, _masm);
+  sub_add(xmm16_19, xmm0246, xmm1357, xmm0246, _masm);
+
+  __ evmovdquw(xmm1, Address(perms, 512), Assembler::AVX_512bit);
+  __ evmovdquw(xmm20, Address(perms, 576), Assembler::AVX_512bit);
+
+  montmul(xmm12_15, xmm16_19, xmm8_11, xmm12_15, xmm8_11, _masm);
+  permute(xmm1357, xmm0246, xmm12_15, 20, _masm);
+
+  // level 4
+  load4regs(xmm8_11, zetas, 1024, _masm);
+
+  __ vpbroadcastq(xmm16,
+                  ExternalAddress(kyberAvx512ConstsAddr(barretMultiplierOffset)),
+                  Assembler::AVX_512bit, scratch); // Barrett multiplier
+  __ vpbroadcastq(xmm17,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+
+  sub_add(xmm12_15, xmm0246, xmm0246, xmm1357, _masm);
+  montmul(xmm1357, xmm12_15, xmm8_11, xmm1357, xmm8_11, _masm);
+  barrettReduce(_masm);
+
+  // level 5
+  load4regs(xmm8_11, zetas, 1280, _masm);
+  sub_add(xmm12_15, xmm0145, xmm0145, xmm2367, _masm);
+  montmul(xmm2367, xmm12_15, xmm8_11, xmm2367, xmm8_11, _masm);
+
+  // level 6
+  load4regs(xmm8_11, zetas, 1536, _masm);
+  sub_add(xmm12_15, xmm0_3, xmm0_3, xmm4_7, _masm);
+  montmul(xmm4_7, xmm12_15, xmm8_11, xmm4_7, xmm8_11, _masm);
+
+  montmul(xmm8_11, xmm29_29, xmm0_3, xmm8_11, xmm0_3, _masm);
+  montmul(xmm12_15, xmm29_29, xmm4_7, xmm12_15, xmm4_7, _masm);
+
+  store4regs(coeffs, 0, xmm8_11, _masm);
+  store4regs(coeffs, 256, xmm12_15, _masm);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+// Kyber multiply polynomials in the NTT domain.
+//
+// result (short[256]) = c_rarg0
+// ntta (short[256]) = c_rarg1
+// nttb (short[256]) = c_rarg2
+// zetas (short[128]) = c_rarg3
+address generate_kyberNttMult_avx512(StubGenerator *stubgen,
+                                     MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberNttMult_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register result = c_rarg0;
+  const Register ntta = c_rarg1;
+  const Register nttb = c_rarg2;
+  const Register zetas = c_rarg3;
+
+  const Register perms = r11;
+  const Register loopCnt = r12;
+
+  __ push(r12);
+  __ movl(loopCnt, 2);
+
+  Label Loop;
+
+  __ lea(perms, ExternalAddress(kyberAvx512_nttMultPermsAddr()));
+
+
+  load4regs(xmm26_29, perms, 0, _masm);
+  __ vpbroadcastq(xmm31,
+                  ExternalAddress(kyberAvx512ConstsAddr(qInvModROffset)),
+                  Assembler::AVX_512bit, scratch); // q^-1 mod montR
+  __ vpbroadcastq(xmm30,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+  __ vpbroadcastq(xmm23,
+                  ExternalAddress(kyberAvx512ConstsAddr(montRSquareModqOffset)),
+                  Assembler::AVX_512bit, scratch); // montR^2 mod q
+
+  __ BIND(Loop);
+
+    __ evmovdquw(xmm1, Address(ntta, 0), Assembler::AVX_512bit);
+    __ evmovdquw(xmm8, Address(ntta, 64), Assembler::AVX_512bit);
+    __ evmovdquw(xmm3, Address(ntta, 128), Assembler::AVX_512bit);
+    __ evmovdquw(xmm9, Address(ntta, 192), Assembler::AVX_512bit);
+
+    __ evmovdquw(xmm5, Address(nttb, 0), Assembler::AVX_512bit);
+    __ evmovdquw(xmm10, Address(nttb, 64), Assembler::AVX_512bit);
+    __ evmovdquw(xmm7, Address(nttb, 128), Assembler::AVX_512bit);
+    __ evmovdquw(xmm11, Address(nttb, 192), Assembler::AVX_512bit);
+
+    __ evmovdquw(xmm0, xmm26, Assembler::AVX_512bit);
+    __ evmovdquw(xmm2, xmm26, Assembler::AVX_512bit);
+    __ evmovdquw(xmm4, xmm26, Assembler::AVX_512bit);
+    __ evmovdquw(xmm6, xmm26, Assembler::AVX_512bit);
+
+    __ evpermi2w(xmm0, xmm1, xmm8, Assembler::AVX_512bit);
+    __ evpermt2w(xmm1, xmm27, xmm8, Assembler::AVX_512bit);
+    __ evpermi2w(xmm2, xmm3, xmm9, Assembler::AVX_512bit);
+    __ evpermt2w(xmm3, xmm27, xmm9, Assembler::AVX_512bit);
+
+    __ evpermi2w(xmm4, xmm5, xmm10, Assembler::AVX_512bit);
+    __ evpermt2w(xmm5, xmm27, xmm10, Assembler::AVX_512bit);
+    __ evpermi2w(xmm6, xmm7, xmm11, Assembler::AVX_512bit);
+    __ evpermt2w(xmm7, xmm27, xmm11, Assembler::AVX_512bit);
+
+    __ evmovdquw(xmm24, Address(zetas, 0), Assembler::AVX_512bit);
+    __ evmovdquw(xmm25, Address(zetas, 64), Assembler::AVX_512bit);
+
+    montmul(xmm16_19, xmm1001, xmm5454, xmm16_19, xmm12_15, _masm);
+
+    montmul(xmm0145, xmm3223, xmm7676, xmm0145, xmm12_15, _masm);
+
+    __ evpmullw(xmm2, k0, xmm16, xmm24, false, Assembler::AVX_512bit);
+    __ evpmullw(xmm3, k0, xmm0, xmm25, false, Assembler::AVX_512bit);
+    __ evpmulhw(xmm12, k0, xmm16, xmm24, false, Assembler::AVX_512bit);
+    __ evpmulhw(xmm13, k0, xmm0, xmm25, false, Assembler::AVX_512bit);
+
+    __ evpmullw(xmm2, k0, xmm2, xmm31, false, Assembler::AVX_512bit);
+    __ evpmullw(xmm3, k0, xmm3, xmm31, false, Assembler::AVX_512bit);
+    __ evpmulhw(xmm2, k0, xmm30, xmm2, false, Assembler::AVX_512bit);
+    __ evpmulhw(xmm3, k0, xmm30, xmm3, false, Assembler::AVX_512bit);
+
+    __ evpsubw(xmm2, k0, xmm12, xmm2, false, Assembler::AVX_512bit);
+    __ evpsubw(xmm3, k0, xmm13, xmm3, false, Assembler::AVX_512bit);
+
+    __ evpaddw(xmm0, k0, xmm2, xmm17, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm8, k0, xmm3, xmm1, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm2, k0, xmm18, xmm19, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm9, k0, xmm4, xmm5, false, Assembler::AVX_512bit);
+
+    montmul(xmm1357, xmm0829, xmm23_23, xmm1357, xmm0829, _masm);
+
+    __ evmovdquw(xmm0, xmm28, Assembler::AVX_512bit);
+    __ evmovdquw(xmm2, xmm28, Assembler::AVX_512bit);
+    __ evpermi2w(xmm0, xmm1, xmm5, Assembler::AVX_512bit);
+    __ evpermt2w(xmm1, xmm29, xmm5, Assembler::AVX_512bit);
+    __ evpermi2w(xmm2, xmm3, xmm7, Assembler::AVX_512bit);
+    __ evpermt2w(xmm3, xmm29, xmm7, Assembler::AVX_512bit);
+
+    store4regs(result, 0, xmm0_3, _masm);
+
+    __ addptr(ntta, 256);
+    __ addptr(nttb, 256);
+    __ addptr(result, 256);
+    __ addptr(zetas, 128);
+    __ subl(loopCnt, 1);
+    __ jcc(Assembler::greater, Loop);
+
+  __ pop(r12);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+// Kyber add 2 polynomials.
+//
+// result (short[256]) = c_rarg0
+// a (short[256]) = c_rarg1
+// b (short[256]) = c_rarg2
+address generate_kyberAddPoly_2_avx512(StubGenerator *stubgen,
+                                       MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberAddPoly_2_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register result = c_rarg0;
+  const Register a = c_rarg1;
+  const Register b = c_rarg2;
+
+  __ vpbroadcastq(xmm31,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+
+  for (int i = 0; i < 8; i++) {
+    __ evmovdquw(xmm(i), Address(a, 64 * i), Assembler::AVX_512bit);
+    __ evmovdquw(xmm(i + 8), Address(b, 64 * i), Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpaddw(xmm(i), k0, xmm(i), xmm(i + 8), false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpaddw(xmm(i), k0, xmm(i), xmm31, false, Assembler::AVX_512bit);
+  }
+
+  store4regs(result, 0, xmm0_3, _masm);
+  store4regs(result, 256, xmm4_7, _masm);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+// Kyber add 3 polynomials.
+//
+// result (short[256]) = c_rarg0
+// a (short[256]) = c_rarg1
+// b (short[256]) = c_rarg2
+// c (short[256]) = c_rarg3
+address generate_kyberAddPoly_3_avx512(StubGenerator *stubgen,
+                                       MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberAddPoly_3_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register result = c_rarg0;
+  const Register a = c_rarg1;
+  const Register b = c_rarg2;
+  const Register c = c_rarg3;
+
+  __ vpbroadcastq(xmm31,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+
+  for (int i = 0; i < 8; i++) {
+    __ evmovdquw(xmm(i), Address(a, 64 * i), Assembler::AVX_512bit);
+    __ evmovdquw(xmm(i + 8), Address(b, 64 * i), Assembler::AVX_512bit);
+    __ evmovdquw(xmm(i + 16), Address(c, 64 * i), Assembler::AVX_512bit);
+  }
+
+  __ evpaddw(xmm31, k0, xmm31, xmm31, false, Assembler::AVX_512bit);
+
+  for (int i = 0; i < 8; i++) {
+    __ evpaddw(xmm(i), k0, xmm(i), xmm(i + 8), false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpaddw(xmm(i), k0, xmm(i), xmm(i + 16), false, Assembler::AVX_512bit);
+  }
+
+  for (int i = 0; i < 8; i++) {
+    __ evpaddw(xmm(i), k0, xmm(i), xmm31, false, Assembler::AVX_512bit);
+  }
+
+  store4regs(result, 0, xmm0_3, _masm);
+  store4regs(result, 256, xmm4_7, _masm);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+// Kyber parse XOF output to polynomial coefficient candidates.
+//
+// condensed (byte[168]) = c_rarg0
+// condensedOffs (int) = c_rarg1
+// parsed (short[112]) = c_rarg2
+// parsedLength (int) = c_rarg3
+address generate_kyber12To16_avx512(StubGenerator *stubgen,
+                                    MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyber12To16_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register condensed = c_rarg0;
+  const Register condensedOffs = c_rarg1;
+  const Register parsed = c_rarg2;
+  const Register parsedLength = c_rarg3;
+
+  const Register perms = r11;
+
+  Label Loop;
+
+  __ addptr(condensed, condensedOffs);
+
+  __ lea(perms, ExternalAddress(kyberAvx512_12To16PermsAddr()));
+
+  load4regs(xmm24_27, perms, 0, _masm);
+  load4regs(xmm28_31, perms, 256, _masm);
+  __ vpbroadcastq(xmm23,
+                  ExternalAddress(kyberAvx512ConstsAddr(f00Offset)),
+                  Assembler::AVX_512bit, scratch); // 0xF00
+
+  __ BIND(Loop);
+    __ evmovdqub(xmm0, Address(condensed, 0),Assembler::AVX_256bit);
+    __ evmovdqub(xmm1, Address(condensed, 32),Assembler::AVX_256bit);
+    __ evmovdqub(xmm2, Address(condensed, 64),Assembler::AVX_256bit);
+    __ evmovdqub(xmm8, Address(condensed, 96),Assembler::AVX_256bit);
+    __ evmovdqub(xmm9, Address(condensed, 128),Assembler::AVX_256bit);
+    __ evmovdqub(xmm10, Address(condensed, 160),Assembler::AVX_256bit);
+    __ vpmovzxbw(xmm0, xmm0, Assembler::AVX_512bit);
+    __ vpmovzxbw(xmm1, xmm1, Assembler::AVX_512bit);
+    __ vpmovzxbw(xmm2, xmm2, Assembler::AVX_512bit);
+    __ vpmovzxbw(xmm8, xmm8, Assembler::AVX_512bit);
+    __ vpmovzxbw(xmm9, xmm9, Assembler::AVX_512bit);
+    __ vpmovzxbw(xmm10, xmm10, Assembler::AVX_512bit);
+    __ evmovdquw(xmm3, xmm24, Assembler::AVX_512bit);
+    __ evmovdquw(xmm4, xmm25, Assembler::AVX_512bit);
+    __ evmovdquw(xmm5, xmm26, Assembler::AVX_512bit);
+    __ evmovdquw(xmm11, xmm24, Assembler::AVX_512bit);
+    __ evmovdquw(xmm12, xmm25, Assembler::AVX_512bit);
+    __ evmovdquw(xmm13, xmm26, Assembler::AVX_512bit);
+    __ evpermi2w(xmm3, xmm0, xmm1, Assembler::AVX_512bit);
+    __ evpermi2w(xmm4, xmm0, xmm1, Assembler::AVX_512bit);
+    __ evpermi2w(xmm5, xmm0, xmm1, Assembler::AVX_512bit);
+    __ evpermi2w(xmm11, xmm8, xmm9, Assembler::AVX_512bit);
+    __ evpermi2w(xmm12, xmm8, xmm9, Assembler::AVX_512bit);
+    __ evpermi2w(xmm13, xmm8, xmm9, Assembler::AVX_512bit);
+    __ evpermt2w(xmm3, xmm27, xmm2, Assembler::AVX_512bit);
+    __ evpermt2w(xmm4, xmm28, xmm2, Assembler::AVX_512bit);
+    __ evpermt2w(xmm5, xmm29, xmm2, Assembler::AVX_512bit);
+    __ evpermt2w(xmm11, xmm27, xmm10, Assembler::AVX_512bit);
+    __ evpermt2w(xmm12, xmm28, xmm10, Assembler::AVX_512bit);
+    __ evpermt2w(xmm13, xmm29, xmm10, Assembler::AVX_512bit);
+
+    __ evpsraw(xmm2, k0, xmm4, 4, false, Assembler::AVX_512bit);
+    __ evpsllw(xmm0, k0, xmm4, 8, false, Assembler::AVX_512bit);
+    __ evpsllw(xmm1, k0, xmm5, 4, false, Assembler::AVX_512bit);
+    __ evpsllw(xmm8, k0, xmm12, 8, false, Assembler::AVX_512bit);
+    __ evpsraw(xmm10, k0, xmm12, 4, false, Assembler::AVX_512bit);
+    __ evpsllw(xmm9, k0, xmm13, 4, false, Assembler::AVX_512bit);
+    __ evpandq(xmm0, k0, xmm0, xmm23, false, Assembler::AVX_512bit);
+    __ evpandq(xmm8, k0, xmm8, xmm23, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm1, k0, xmm1, xmm2, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm0, k0, xmm0, xmm3, false, Assembler::AVX_512bit);
+    __ evmovdquw(xmm2, xmm30, Assembler::AVX_512bit);
+    __ evpaddw(xmm9, k0, xmm9, xmm10, false, Assembler::AVX_512bit);
+    __ evpaddw(xmm8, k0, xmm8, xmm11, false, Assembler::AVX_512bit);
+    __ evmovdquw(xmm10, xmm30, Assembler::AVX_512bit);
+    __ evpermi2w(xmm2, xmm0, xmm1, Assembler::AVX_512bit);
+    __ evpermt2w(xmm0, xmm31, xmm1, Assembler::AVX_512bit);
+    __ evpermi2w(xmm10, xmm8, xmm9, Assembler::AVX_512bit);
+    __ evpermt2w(xmm8, xmm31, xmm9, Assembler::AVX_512bit);
+
+    store4regs(parsed, 0, xmm2_0_10_8, _masm);
+
+    __ addptr(condensed, 192);
+    __ addptr(parsed, 256);
+    __ subl(parsedLength, 128);
+    __ jcc(Assembler::greater, Loop);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+
+// Kyber barrett reduce function.
+//
+// coeffs (short[256]) = c_rarg0
+address generate_kyberBarrettReduce_avx512(StubGenerator *stubgen,
+                                           MacroAssembler *_masm) {
+
+  __ align(CodeEntryAlignment);
+  StubGenStubId stub_id = kyberBarrettReduce_id;
+  StubCodeMark mark(stubgen, stub_id);
+  address start = __ pc();
+  __ enter();
+
+  const Register coeffs = c_rarg0;
+
+  __ vpbroadcastq(xmm16,
+                  ExternalAddress(kyberAvx512ConstsAddr(barretMultiplierOffset)),
+                  Assembler::AVX_512bit, scratch); // Barrett multiplier
+  __ vpbroadcastq(xmm17,
+                  ExternalAddress(kyberAvx512ConstsAddr(qOffset)),
+                  Assembler::AVX_512bit, scratch); // q
+
+  load4regs(xmm0_3, coeffs, 0, _masm);
+  load4regs(xmm4_7, coeffs, 256, _masm);
+
+  barrettReduce(_masm);
+
+  store4regs(coeffs, 0, xmm0_3, _masm);
+  store4regs(coeffs, 256, xmm4_7, _masm);
+
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ mov64(rax, 0); // return 0
+  __ ret(0);
+
+  return start;
+}
+
+void StubGenerator::generate_kyber_stubs() {
+  // Generate Kyber intrinsics code
+  if (UseKyberIntrinsics) {
+    if (VM_Version::supports_evex()) {
+      StubRoutines::_kyberNtt = generate_kyberNtt_avx512(this, _masm);
+      StubRoutines::_kyberInverseNtt = generate_kyberInverseNtt_avx512(this, _masm);
+      StubRoutines::_kyberNttMult = generate_kyberNttMult_avx512(this, _masm);
+      StubRoutines::_kyberAddPoly_2 = generate_kyberAddPoly_2_avx512(this, _masm);
+      StubRoutines::_kyberAddPoly_3 = generate_kyberAddPoly_3_avx512(this, _masm);
+      StubRoutines::_kyber12To16 = generate_kyber12To16_avx512(this, _masm);
+      StubRoutines::_kyberBarrettReduce = generate_kyberBarrettReduce_avx512(this, _masm);
+    }
+  }
+}
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index fe59a153413..3f126039684 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1247,6 +1247,20 @@ void VM_Version::get_processor_features() {
       FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
 
+  // Kyber Intrinsics
+  // Currently we only have them for AVX512
+#ifdef _LP64
+  if (supports_evex() && supports_avx512bw()) {
+      if (FLAG_IS_DEFAULT(UseKyberIntrinsics)) {
+          UseKyberIntrinsics = true;
+      }
+  } else
+#endif
+  if (UseKyberIntrinsics) {
+     warning("Intrinsics for ML-KEM are not available on this CPU.");
+     FLAG_SET_DEFAULT(UseKyberIntrinsics, false);
+  }
+
   // Dilithium Intrinsics
   // Currently we only have them for AVX512
   if (supports_evex() && supports_avx512bw()) {
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index e23720f3ae0..f76458b2662 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -496,6 +496,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_kyber12To16:
   case vmIntrinsics::_kyberBarrettReduce:
     if (!UseKyberIntrinsics) return true;
+    break;
   case vmIntrinsics::_dilithiumAlmostNtt:
   case vmIntrinsics::_dilithiumAlmostInverseNtt:
   case vmIntrinsics::_dilithiumNttMult:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 65635001e13..8a31711f85e 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -7741,6 +7741,7 @@ bool LibraryCallKit::inline_kyberNttMult() {
   ntta = must_be_not_null(ntta, true);
   nttb = must_be_not_null(nttb, true);
   zetas = must_be_not_null(zetas, true);
+
   Node* result_start  = array_element_address(result, intcon(0), T_SHORT);
   assert(result_start, "result is null");
   Node* ntta_start  = array_element_address(ntta, intcon(0), T_SHORT);
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index c5e15b5f3a6..bd84b9dbf24 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -1474,6 +1474,7 @@ static const TypeFunc* make_kyberNttMult_Type() {
     const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
     return TypeFunc::make(domain, range);
 }
+
 // Kyber add 2 polynomials function
 static const TypeFunc* make_kyberAddPoly_2_Type() {
     int argcnt = 3;
@@ -1546,6 +1547,7 @@ static const TypeFunc* make_kyberBarrettReduce_Type() {
     const Type** fields = TypeTuple::fields(argcnt);
     int argp = TypeFunc::Parms;
     fields[argp++] = TypePtr::NOTNULL;      // coeffs
+
     assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
     const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
 
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index c3550839758..761527a694b 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -596,37 +596,37 @@ class OptoRuntime : public AllStatic {
     return _chacha20Block_Type;
   }
 
-  static const TypeFunc* kyberNtt_Type() {
+  static inline const TypeFunc* kyberNtt_Type() {
     assert(_kyberNtt_Type != nullptr, "should be initialized");
     return _kyberNtt_Type;
   }
 
-  static const TypeFunc* kyberInverseNtt_Type() {
+  static inline const TypeFunc* kyberInverseNtt_Type() {
     assert(_kyberInverseNtt_Type != nullptr, "should be initialized");
     return _kyberInverseNtt_Type;
   }
 
-  static const TypeFunc* kyberNttMult_Type() {
+  static inline const TypeFunc* kyberNttMult_Type() {
     assert(_kyberNttMult_Type != nullptr, "should be initialized");
     return _kyberNttMult_Type;
   }
 
-  static const TypeFunc* kyberAddPoly_2_Type() {
+  static inline const TypeFunc* kyberAddPoly_2_Type() {
     assert(_kyberAddPoly_2_Type != nullptr, "should be initialized");
     return _kyberAddPoly_2_Type;
   }
 
-  static const TypeFunc* kyberAddPoly_3_Type() {
+  static inline const TypeFunc* kyberAddPoly_3_Type() {
     assert(_kyberAddPoly_3_Type != nullptr, "should be initialized");
     return _kyberAddPoly_3_Type;
   }
 
-  static const TypeFunc* kyber12To16_Type() {
+  static inline const TypeFunc* kyber12To16_Type() {
     assert(_kyber12To16_Type != nullptr, "should be initialized");
     return _kyber12To16_Type;
   }
 
-  static const TypeFunc* kyberBarrettReduce_Type() {
+  static inline const TypeFunc* kyberBarrettReduce_Type() {
     assert(_kyberBarrettReduce_Type != nullptr, "should be initialized");
     return _kyberBarrettReduce_Type;
   }
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 3f4dfa10070..de6e3f6f621 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -327,6 +327,7 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(bool, UseKyberIntrinsics, false, DIAGNOSTIC,                      \
           "Use intrinsics for the vectorized version of Kyber")             \
+                                                                            \
   product(bool, UseDilithiumIntrinsics, false, DIAGNOSTIC,                  \
           "Use intrinsics for the vectorized version of Dilithium")         \
                                                                             \
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
index fa461e45d22..1280ccdad74 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.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
@@ -1181,7 +1181,6 @@ static void implKyberAddPolyJava(short[] result, short[] a, short[] b) {
             int r = a[m] + b[m] + ML_KEM_Q; // This makes r > - ML_KEM_Q
             a[m] = (short) r;
         }
-        mlKemBarrettReduce(a);
     }
 
     // Adds the polynomial b to a in place, i.e. (the modified) a will hold

From cedd1a5343dceb5394b8ed5ea78bb717f05c8caf Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Tue, 20 May 2025 20:11:56 +0000
Subject: [PATCH 546/901] 8357250: assert(shift >= 0 && shift < 4) failed:
 unexpected compressd klass shift!

Reviewed-by: asmehra, mdoerr
---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp  |  4 ++--
 src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp     |  3 ++-
 src/hotspot/share/code/relocInfo.cpp                | 13 ++++++++-----
 .../appcds/aotCode/AOTCodeCompressedOopsTest.java   |  7 +++++--
 .../runtime/cds/appcds/aotCode/AOTCodeFlags.java    |  6 +++++-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index f14dda0f812..a277a689280 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -5349,7 +5349,7 @@ void MacroAssembler::encode_klass_not_null_for_aot(Register dst, Register src) {
   // we have to load the klass base from the AOT constants area but
   // not the shift because it is not allowed to change
   int shift = CompressedKlassPointers::shift();
-  assert(shift >= 0 && shift < 4, "unexpected compressd klass shift!");
+  assert(shift >= 0 && shift <= CompressedKlassPointers::max_shift(), "unexpected compressed klass shift!");
   if (dst != src) {
     // we can load the base into dst, subtract it formthe src and shift down
     lea(dst, ExternalAddress(CompressedKlassPointers::base_addr()));
@@ -5415,7 +5415,7 @@ void MacroAssembler::decode_klass_not_null_for_aot(Register dst, Register src) {
   // we have to load the klass base from the AOT constants area but
   // not the shift because it is not allowed to change
   int shift = CompressedKlassPointers::shift();
-  assert(shift >= 0 && shift < 4, "unexpected compressd klass shift!");
+  assert(shift >= 0 && shift <= CompressedKlassPointers::max_shift(), "unexpected compressed klass shift!");
   if (dst != src) {
     // we can load the base into dst then add the offset with a suitable shift
     lea(dst, ExternalAddress(CompressedKlassPointers::base_addr()));
diff --git a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
index 11ea02621d7..714904ab3df 100644
--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
@@ -25,6 +25,7 @@
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "code/vtableStubs.hpp"
 #include "interp_masm_aarch64.hpp"
@@ -196,7 +197,7 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
                                   temp_reg, temp_reg2, itable_index, L_no_such_interface);
 
   // Reduce "estimate" such that "padding" does not drop below 8.
-  const ptrdiff_t estimate = 144;
+  const ptrdiff_t estimate = AOTCodeCache::is_on_for_dump() ? 148 : 144;
   const ptrdiff_t codesize = __ pc() - start_pc;
   slop_delta  = (int)(estimate - codesize);
   slop_bytes += slop_delta;
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 81fa83dbe8d..8fc22596d01 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -187,14 +187,17 @@ RelocIterator::RelocIterator(CodeBlob* cb) {
     _code = nullptr;
   }
   _current = cb->relocation_begin() - 1;
-  _end = cb->relocation_end();
-  _addr = cb->content_begin();
+  _end     = cb->relocation_end();
+  _addr    = cb->content_begin();
 
   _section_start[CodeBuffer::SECT_CONSTS] = cb->content_begin();
-  _section_start[CodeBuffer::SECT_INSTS] = cb->code_begin();
+  _section_start[CodeBuffer::SECT_INSTS ] = cb->code_begin();
+  _section_start[CodeBuffer::SECT_STUBS ] = cb->code_end();
+
+  _section_end  [CodeBuffer::SECT_CONSTS] = cb->code_begin();
+  _section_end  [CodeBuffer::SECT_INSTS ] = cb->code_end();
+  _section_end  [CodeBuffer::SECT_STUBS ] = cb->code_end();
 
-  _section_end[CodeBuffer::SECT_CONSTS] = cb->code_begin();
-  _section_start[CodeBuffer::SECT_INSTS] = cb->code_end();
   assert(!has_current(), "just checking");
   set_limits(nullptr, nullptr);
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
index 524b613b5c3..267b9a267b2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -26,7 +26,10 @@
  * @test
  * @summary Sanity test of AOT Code Cache with compressed oops configurations
  * @requires vm.cds.supports.aot.code.caching
- * @requires vm.flagless
+ * @requires vm.compMode != "Xcomp"
+ * @comment The test verifies AOT checks during VM startup and not code generation.
+ *          No need to run it with -Xcomp. It takes a lot of time to complete all
+ *          subtests with this flag.
  * @library /test/lib /test/setup_aot
  * @build AOTCodeCompressedOopsTest JavacBenchApp
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
@@ -198,7 +201,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception
                  }
                  if (aotCacheShift != currentShift) {
                      out.shouldContain("AOT Code Cache disabled: it was created with different CompressedOops::shift()");
-                 } else if (aotCacheBase != currentBase) {
+                 } else if ((aotCacheBase == 0 || currentBase == 0) && (aotCacheBase != currentBase)) {
                      out.shouldContain("AOTStubCaching is disabled: incompatible CompressedOops::base()");
                  } else {
                      out.shouldMatch("Read \\d+ entries table at offset \\d+ from AOT Code Cache");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index d47daaff68c..92e0808b4d1 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -26,7 +26,11 @@
  * @test
  * @summary Sanity test of combinations of the AOT Code Caching diagnostic flags
  * @requires vm.cds.supports.aot.code.caching
- * @requires vm.flagless
+ * @requires vm.compiler1.enabled & vm.compiler2.enabled
+ * @comment Both C1 and C2 JIT compilers are required because the test verifies
+ *          compiler's runtime blobs generation.
+ * @requires vm.opt.VerifyOops == null | vm.opt.VerifyOops == false
+ * @comment VerifyOops flag switch off AOT code generation. Skip it.
  * @library /test/lib /test/setup_aot
  * @build AOTCodeFlags JavacBenchApp
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

From 74fc4e4ee7f2e44d9c8339ff6665d4171d298f8f Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 21 May 2025 04:39:35 +0000
Subject: [PATCH 547/901] 8357179: Deprecate VFORK launch mechanism from
 Process implementation (linux)

Reviewed-by: rriggs
---
 .../unix/classes/java/lang/ProcessImpl.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java
index 7b5d27f1cc1..390a4f28477 100644
--- a/src/java.base/unix/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/unix/classes/java/lang/ProcessImpl.java
@@ -100,16 +100,26 @@ private static LaunchMechanism launchMechanism() {
             // Should be value of a LaunchMechanism enum
             LaunchMechanism lm = LaunchMechanism.valueOf(s.toUpperCase(Locale.ROOT));
             switch (OperatingSystem.current()) {
-                case LINUX:
-                    return lm;      // All options are valid for Linux
+                case LINUX: {
+                    // All options are valid for Linux, but VFORK is deprecated and results
+                    // in a warning
+                    if (lm == LaunchMechanism.VFORK) {
+                        System.err.println("VFORK MODE DEPRECATED");
+                        System.err.println("""
+                                          The VFORK launch mechanism has been deprecated for being dangerous.
+                                          It will be removed in a future java version. Either remove the
+                                          jdk.lang.Process.launchMechanism property (preferred) or use FORK mode
+                                          instead (-Djdk.lang.Process.launchMechanism=FORK).
+                                          """);
+                    }
+                    return lm;
+                }
                 case AIX:
                 case MACOS:
                     if (lm != LaunchMechanism.VFORK) {
                         return lm; // All but VFORK are valid
                     }
                     break;
-                case WINDOWS:
-                    // fall through to throw to Error
             }
         } catch (IllegalArgumentException e) {
         }

From 50e873f0e88d6643586907dea5731d739b7826dc Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 21 May 2025 05:59:52 +0000
Subject: [PATCH 548/901] 8356455: ZGC: Replace ZIntrusiveRBTree with
 IntrusiveRBTree

Reviewed-by: stefank, eosterlund, jsikstro
---
 src/hotspot/share/gc/z/zIntrusiveRBTree.hpp   |  293 ----
 .../share/gc/z/zIntrusiveRBTree.inline.hpp    | 1351 -----------------
 src/hotspot/share/gc/z/zMappedCache.cpp       |  187 ++-
 src/hotspot/share/gc/z/zMappedCache.hpp       |   49 +-
 .../gtest/gc/z/test_zIntrusiveRBTree.cpp      |  379 -----
 5 files changed, 183 insertions(+), 2076 deletions(-)
 delete mode 100644 src/hotspot/share/gc/z/zIntrusiveRBTree.hpp
 delete mode 100644 src/hotspot/share/gc/z/zIntrusiveRBTree.inline.hpp
 delete mode 100644 test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp

diff --git a/src/hotspot/share/gc/z/zIntrusiveRBTree.hpp b/src/hotspot/share/gc/z/zIntrusiveRBTree.hpp
deleted file mode 100644
index ff204d86462..00000000000
--- a/src/hotspot/share/gc/z/zIntrusiveRBTree.hpp
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * 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_GC_Z_ZINTRUSIVERBTREE_HPP
-#define SHARE_GC_Z_ZINTRUSIVERBTREE_HPP
-
-#include "metaprogramming/enableIf.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/macros.hpp"
-
-enum class ZIntrusiveRBTreeDirection { LEFT, RIGHT };
-
-class ZIntrusiveRBTreeNode {
-  template <typename Key, typename Compare>
-  friend class ZIntrusiveRBTree;
-
-public:
-  enum Color { RED = 0b0, BLACK = 0b1 };
-
-private:
-  class ColoredNodePtr {
-  private:
-    static constexpr uintptr_t COLOR_MASK = 0b1;
-    static constexpr uintptr_t NODE_MASK = ~COLOR_MASK;
-
-    uintptr_t _value;
-
-  public:
-    ColoredNodePtr(ZIntrusiveRBTreeNode* node = nullptr, Color color = RED);
-
-    constexpr Color color() const;
-    constexpr bool is_black() const;
-    constexpr bool is_red() const;
-
-    ZIntrusiveRBTreeNode* node() const;
-    ZIntrusiveRBTreeNode* red_node() const;
-    ZIntrusiveRBTreeNode* black_node() const;
-  };
-
-private:
-  ColoredNodePtr _colored_parent;
-  ZIntrusiveRBTreeNode* _left;
-  ZIntrusiveRBTreeNode* _right;
-
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  const ZIntrusiveRBTreeNode* find_next_node() const;
-
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  const ZIntrusiveRBTreeNode* child() const;
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  ZIntrusiveRBTreeNode* child();
-
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  ZIntrusiveRBTreeNode* const* child_addr() const;
-
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  bool has_child() const;
-
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  void update_child(ZIntrusiveRBTreeNode* new_child);
-
-  void link_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode** insert_location);
-
-  void copy_parent_and_color(ZIntrusiveRBTreeNode* other);
-  void update_parent_and_color(ZIntrusiveRBTreeNode* parent, Color color);
-
-  void update_parent(ZIntrusiveRBTreeNode* parent);
-  void update_color(Color color);
-
-  void update_left_child(ZIntrusiveRBTreeNode* new_child);
-  void update_right_child(ZIntrusiveRBTreeNode* new_child);
-
-  const ZIntrusiveRBTreeNode* parent() const;
-  ZIntrusiveRBTreeNode* parent();
-  const ZIntrusiveRBTreeNode* red_parent() const;
-  ZIntrusiveRBTreeNode* red_parent();
-  const ZIntrusiveRBTreeNode* black_parent() const;
-  ZIntrusiveRBTreeNode* black_parent();
-
-  bool has_parent() const;
-
-  Color color() const;
-  bool is_black() const;
-  bool is_red() const;
-  static bool is_black(ZIntrusiveRBTreeNode* node);
-
-  ZIntrusiveRBTreeNode* const* left_child_addr() const;
-  ZIntrusiveRBTreeNode* const* right_child_addr() const;
-
-  const ZIntrusiveRBTreeNode* left_child() const;
-  ZIntrusiveRBTreeNode* left_child();
-  const ZIntrusiveRBTreeNode* right_child() const;
-  ZIntrusiveRBTreeNode* right_child();
-
-  bool has_left_child() const;
-  bool has_right_child() const;
-
-public:
-  ZIntrusiveRBTreeNode();
-
-  const ZIntrusiveRBTreeNode* prev() const;
-  ZIntrusiveRBTreeNode* prev();
-  const ZIntrusiveRBTreeNode* next() const;
-  ZIntrusiveRBTreeNode* next();
-};
-
-template <typename Key, typename Compare>
-class ZIntrusiveRBTree {
-public:
-  class FindCursor {
-    friend class ZIntrusiveRBTree<Key, Compare>;
-
-  private:
-    ZIntrusiveRBTreeNode** _insert_location;
-    ZIntrusiveRBTreeNode* _parent;
-    bool _left_most;
-    bool _right_most;
-    DEBUG_ONLY(uintptr_t _sequence_number;)
-
-    FindCursor(ZIntrusiveRBTreeNode** insert_location, ZIntrusiveRBTreeNode* parent, bool left_most, bool right_most DEBUG_ONLY(COMMA uintptr_t sequence_number));
-    FindCursor();
-
-#ifdef ASSERT
-    bool is_valid(uintptr_t sequence_number) const;
-#endif
-
-  public:
-    FindCursor(const FindCursor&) = default;
-    FindCursor& operator=(const FindCursor&) = default;
-
-    bool is_valid() const;
-    bool found() const;
-    ZIntrusiveRBTreeNode* node() const;
-    bool is_left_most() const;
-    bool is_right_most() const;
-    ZIntrusiveRBTreeNode* parent() const;
-    ZIntrusiveRBTreeNode** insert_location() const;
-  };
-
-private:
-  ZIntrusiveRBTreeNode* _root_node;
-  ZIntrusiveRBTreeNode* _left_most;
-  ZIntrusiveRBTreeNode* _right_most;
-  DEBUG_ONLY(uintptr_t _sequence_number;)
-
-  NONCOPYABLE(ZIntrusiveRBTree);
-
-#ifdef ASSERT
-  template <bool swap_left_right>
-  bool verify_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* left_child, ZIntrusiveRBTreeNode* right_child);
-  template <bool swap_left_right>
-  bool verify_node(ZIntrusiveRBTreeNode* parent);
-  template <bool swap_left_right>
-  bool verify_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* left_child);
-  struct any_t {};
-  template <bool swap_left_right>
-  bool verify_node(ZIntrusiveRBTreeNode* parent, any_t, ZIntrusiveRBTreeNode* right_child);
-#endif // ASSERT
-
-  ZIntrusiveRBTreeNode* const* root_node_addr() const;
-
-  void update_child_or_root(ZIntrusiveRBTreeNode* old_node, ZIntrusiveRBTreeNode* new_node, ZIntrusiveRBTreeNode* parent);
-  void rotate_and_update_child_or_root(ZIntrusiveRBTreeNode* old_node, ZIntrusiveRBTreeNode* new_node, ZIntrusiveRBTreeNode::Color color);
-
-  template <ZIntrusiveRBTreeDirection PARENT_SIBLING_DIRECTION>
-  void rebalance_insert_with_sibling(ZIntrusiveRBTreeNode* node, ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* grand_parent);
-  template <ZIntrusiveRBTreeDirection PARENT_SIBLING_DIRECTION>
-  bool rebalance_insert_with_parent_sibling(ZIntrusiveRBTreeNode** node_addr, ZIntrusiveRBTreeNode** parent_addr, ZIntrusiveRBTreeNode* grand_parent);
-  void rebalance_insert(ZIntrusiveRBTreeNode* new_node);
-
-  template <ZIntrusiveRBTreeDirection SIBLING_DIRECTION>
-  bool rebalance_remove_with_sibling(ZIntrusiveRBTreeNode** node_addr, ZIntrusiveRBTreeNode** parent_addr);
-  void rebalance_remove(ZIntrusiveRBTreeNode* rebalance_from);
-
-  FindCursor make_cursor(ZIntrusiveRBTreeNode* const* insert_location, ZIntrusiveRBTreeNode* parent, bool left_most, bool right_most) const;
-  template <ZIntrusiveRBTreeDirection DIRECTION>
-  FindCursor find_next(const FindCursor& cursor) const;
-
-public:
-  ZIntrusiveRBTree();
-
-  ZIntrusiveRBTreeNode* first() const;
-  ZIntrusiveRBTreeNode* last() const;
-
-  FindCursor root_cursor() const;
-  FindCursor get_cursor(const ZIntrusiveRBTreeNode* node) const;
-  FindCursor prev_cursor(const ZIntrusiveRBTreeNode* node) const;
-  FindCursor next_cursor(const ZIntrusiveRBTreeNode* node) const;
-  FindCursor prev(const FindCursor& cursor) const;
-  FindCursor next(const FindCursor& cursor) const;
-  FindCursor find(const Key& key) const;
-
-  void insert(ZIntrusiveRBTreeNode* new_node, const FindCursor& find_cursor);
-  void replace(ZIntrusiveRBTreeNode* new_node, const FindCursor& find_cursor);
-  void remove(const FindCursor& find_cursor);
-
-  void verify_tree();
-
-public:
-  template <bool IsConst, bool Reverse>
-  class IteratorImplementation;
-
-  using Iterator = IteratorImplementation<false, false>;
-  using ConstIterator = IteratorImplementation<true, false>;
-  using ReverseIterator = IteratorImplementation<false, true>;
-  using ConstReverseIterator = IteratorImplementation<true, true>;
-
-  // remove and replace invalidate the iterators
-  // however the iterators provide a remove and replace
-  // function which does not invalidate that iterator nor
-  // any end iterator
-  Iterator begin();
-  Iterator end();
-  ConstIterator begin() const;
-  ConstIterator end() const;
-  ConstIterator cbegin() const;
-  ConstIterator cend() const;
-  ReverseIterator rbegin();
-  ReverseIterator rend();
-  ConstReverseIterator rbegin() const;
-  ConstReverseIterator rend() const;
-  ConstReverseIterator crbegin() const;
-  ConstReverseIterator crend() const;
-};
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-class ZIntrusiveRBTree<Key, Compare>::IteratorImplementation {
-  friend IteratorImplementation<true, Reverse>;
-
-public:
-  using difference_type   = std::ptrdiff_t;
-  using value_type        = const ZIntrusiveRBTreeNode;
-  using pointer           = value_type*;
-  using reference         = value_type&;
-
-private:
-  ZIntrusiveRBTree<Key, Compare>* _tree;
-  const ZIntrusiveRBTreeNode* _node;
-  bool _removed;
-
-  bool at_end() const;
-
-public:
-  IteratorImplementation(ZIntrusiveRBTree<Key, Compare>& tree, pointer node);
-  IteratorImplementation(const IteratorImplementation<IsConst, Reverse>&) = default;
-  template <bool Enable = IsConst, ENABLE_IF(Enable)>
-  IteratorImplementation(const IteratorImplementation<false, Reverse>& other);
-
-  reference operator*() const;
-  pointer operator->();
-  IteratorImplementation& operator--();
-  IteratorImplementation operator--(int);
-  IteratorImplementation& operator++();
-  IteratorImplementation operator++(int);
-
-  template <bool Enable = !IsConst, ENABLE_IF(Enable)>
-  void replace(ZIntrusiveRBTreeNode * new_node);
-  template <bool Enable = !IsConst, ENABLE_IF(Enable)>
-  void remove();
-
-  // Note: friend operator overloads defined inside class declaration because of problems with ADL
-  friend bool operator==(const IteratorImplementation& a, const IteratorImplementation& b) {
-    precond(a._tree == b._tree);
-    return a._node == b._node;
-  }
-  friend bool operator!=(const IteratorImplementation& a, const IteratorImplementation& b) {
-    precond(a._tree == b._tree);
-    return a._node != b._node;
-  }
-};
-
-#endif // SHARE_GC_Z_ZINTRUSIVERBTREE_HPP
diff --git a/src/hotspot/share/gc/z/zIntrusiveRBTree.inline.hpp b/src/hotspot/share/gc/z/zIntrusiveRBTree.inline.hpp
deleted file mode 100644
index b62db5166dd..00000000000
--- a/src/hotspot/share/gc/z/zIntrusiveRBTree.inline.hpp
+++ /dev/null
@@ -1,1351 +0,0 @@
-/*
- * 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_GC_Z_ZINTRUSIVERBTREE_INLINE_HPP
-#define SHARE_GC_Z_ZINTRUSIVERBTREE_INLINE_HPP
-
-#include "gc/z/zIntrusiveRBTree.hpp"
-
-#include "metaprogramming/enableIf.hpp"
-#include "utilities/debug.hpp"
-
-static constexpr ZIntrusiveRBTreeDirection other(const ZIntrusiveRBTreeDirection& direction) {
-  return direction == ZIntrusiveRBTreeDirection::LEFT ? ZIntrusiveRBTreeDirection::RIGHT : ZIntrusiveRBTreeDirection::LEFT;
-}
-
-inline ZIntrusiveRBTreeNode::ColoredNodePtr::ColoredNodePtr(ZIntrusiveRBTreeNode* node, Color color)
-  : _value(reinterpret_cast<uintptr_t>(node) | color) {}
-
-inline constexpr ZIntrusiveRBTreeNode::Color ZIntrusiveRBTreeNode::ColoredNodePtr::color() const {
-  return static_cast<Color>(_value & COLOR_MASK);
-}
-
-inline constexpr bool ZIntrusiveRBTreeNode::ColoredNodePtr::is_black() const {
-  return color() == BLACK;
-}
-
-inline constexpr bool ZIntrusiveRBTreeNode::ColoredNodePtr::is_red() const {
-  return color() == RED;
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::ColoredNodePtr::node() const {
-  return reinterpret_cast<ZIntrusiveRBTreeNode*>(_value & NODE_MASK);
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::ColoredNodePtr::red_node() const {
-  precond(is_red());
-  return reinterpret_cast<ZIntrusiveRBTreeNode*>(_value);
-}
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::ColoredNodePtr::black_node() const {
-  precond(is_black());
-  return reinterpret_cast<ZIntrusiveRBTreeNode*>(_value ^ BLACK);
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::find_next_node() const {
-  constexpr ZIntrusiveRBTreeDirection OTHER_DIRECTION = other(DIRECTION);
-  const ZIntrusiveRBTreeNode* node = this;
-
-  // Down the tree
-  if (node->has_child<DIRECTION>()) {
-    node = node->child<DIRECTION>();
-    while (node->has_child<OTHER_DIRECTION>()) {
-      node = node->child<OTHER_DIRECTION>();
-    }
-    return node;
-  }
-
-  // Up the tree
-  const ZIntrusiveRBTreeNode* parent = node->parent();
-  while (parent != nullptr && node == parent->child<DIRECTION>()) {
-    node = parent;
-    parent = node->parent();
-  }
-  return parent;
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::child() const {
-  if (DIRECTION == ZIntrusiveRBTreeDirection::LEFT) {
-    return _left;
-  }
-  assert(DIRECTION == ZIntrusiveRBTreeDirection::RIGHT, "must be");
-  return _right;
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::child() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->template child<DIRECTION>());
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline ZIntrusiveRBTreeNode* const* ZIntrusiveRBTreeNode::child_addr() const {
-  if (DIRECTION == ZIntrusiveRBTreeDirection::LEFT) {
-    return &_left;
-  }
-  assert(DIRECTION == ZIntrusiveRBTreeDirection::RIGHT, "must be");
-  return &_right;
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline bool ZIntrusiveRBTreeNode::has_child() const {
-  if (DIRECTION == ZIntrusiveRBTreeDirection::LEFT) {
-    return _left != nullptr;
-  }
-  assert(DIRECTION == ZIntrusiveRBTreeDirection::RIGHT, "must be");
-  return _right != nullptr;
-}
-
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline void ZIntrusiveRBTreeNode::update_child(ZIntrusiveRBTreeNode* new_child) {
-  if (DIRECTION == ZIntrusiveRBTreeDirection::LEFT) {
-    _left = new_child;
-    return;
-  }
-  assert(DIRECTION == ZIntrusiveRBTreeDirection::RIGHT, "must be");
-  _right = new_child;
-}
-
-inline void ZIntrusiveRBTreeNode::link_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode** insert_location) {
-  // Newly linked node is always red
-  _colored_parent = ColoredNodePtr(parent, RED);
-  _left = nullptr;
-  _right = nullptr;
-
-  // Link into location
-  *insert_location = this;
-}
-
-inline void ZIntrusiveRBTreeNode::copy_parent_and_color(ZIntrusiveRBTreeNode* other) {
-  _colored_parent = other->_colored_parent;
-}
-
-inline void ZIntrusiveRBTreeNode::update_parent_and_color(ZIntrusiveRBTreeNode* parent, Color color) {
-  _colored_parent = ColoredNodePtr(parent, color);
-}
-
-inline void ZIntrusiveRBTreeNode::update_parent(ZIntrusiveRBTreeNode* parent) {
-  _colored_parent = ColoredNodePtr(parent, color());
-}
-
-inline void ZIntrusiveRBTreeNode::update_color(Color color) {
-  _colored_parent = ColoredNodePtr(parent(), color);
-}
-
-inline void ZIntrusiveRBTreeNode::update_left_child(ZIntrusiveRBTreeNode* new_child) {
-  update_child<ZIntrusiveRBTreeDirection::LEFT>(new_child);
-}
-
-inline void ZIntrusiveRBTreeNode::update_right_child(ZIntrusiveRBTreeNode* new_child) {
-  update_child<ZIntrusiveRBTreeDirection::RIGHT>(new_child);
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::parent() const {
-  return _colored_parent.node();
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::parent() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->parent());
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::red_parent() const {
-  return _colored_parent.red_node();
-}
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::red_parent() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->red_parent());
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::black_parent() const {
-  return _colored_parent.black_node();
-}
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::black_parent() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->black_parent());
-}
-
-inline bool ZIntrusiveRBTreeNode::has_parent() const {
-  return _colored_parent.node() != nullptr;
-}
-
-inline ZIntrusiveRBTreeNode::Color ZIntrusiveRBTreeNode::color() const {
-  return _colored_parent.color();
-}
-
-inline bool ZIntrusiveRBTreeNode::is_black() const {
-  return _colored_parent.is_black();
-}
-
-inline bool ZIntrusiveRBTreeNode::is_red() const {
-  return _colored_parent.is_red();
-}
-
-inline bool ZIntrusiveRBTreeNode::is_black(ZIntrusiveRBTreeNode* node) {
-  return node == nullptr || node->is_black();
-}
-
-inline ZIntrusiveRBTreeNode* const* ZIntrusiveRBTreeNode::left_child_addr() const {
-  return child_addr<ZIntrusiveRBTreeDirection::LEFT>();
-}
-
-inline ZIntrusiveRBTreeNode* const* ZIntrusiveRBTreeNode::right_child_addr() const {
-  return child_addr<ZIntrusiveRBTreeDirection::RIGHT>();
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::left_child() const {
-  return child<ZIntrusiveRBTreeDirection::LEFT>();
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::left_child() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->left_child());
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::right_child() const {
-  return child<ZIntrusiveRBTreeDirection::RIGHT>();
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::right_child() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->right_child());
-}
-
-inline bool ZIntrusiveRBTreeNode::has_left_child() const {
-  return has_child<ZIntrusiveRBTreeDirection::LEFT>();
-}
-
-inline bool ZIntrusiveRBTreeNode::has_right_child() const {
-  return has_child<ZIntrusiveRBTreeDirection::RIGHT>();
-}
-
-inline ZIntrusiveRBTreeNode::ZIntrusiveRBTreeNode() {}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::prev() const {
-  return find_next_node<ZIntrusiveRBTreeDirection::LEFT>();
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::prev() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->prev());
-}
-
-inline const ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::next() const {
-  return find_next_node<ZIntrusiveRBTreeDirection::RIGHT>();
-}
-
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTreeNode::next() {
-  return const_cast<ZIntrusiveRBTreeNode*>(const_cast<const ZIntrusiveRBTreeNode*>(this)->next());
-}
-
-#ifdef ASSERT
-template <typename Key, typename Compare>
-template <bool swap_left_right>
-inline bool ZIntrusiveRBTree<Key, Compare>::verify_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* left_child, ZIntrusiveRBTreeNode* right_child) {
-  if (swap_left_right) {
-    ::swap(left_child, right_child);
-  }
-  assert(parent->left_child() == left_child, swap_left_right ? "Bad child Swapped" : "Bad child");
-  assert(parent->right_child() == right_child, swap_left_right ? "Bad child Swapped" : "Bad child");
-  if (left_child != nullptr) {
-    assert(left_child->parent() == parent, swap_left_right ? "Bad parent Swapped" : "Bad parent");
-  }
-  if (right_child != nullptr) {
-    assert(right_child->parent() == parent, swap_left_right ? "Bad parent Swapped" : "Bad parent");
-  }
-  return true;
-}
-
-template <typename Key, typename Compare>
-template <bool swap_left_right>
-inline bool ZIntrusiveRBTree<Key, Compare>::verify_node(ZIntrusiveRBTreeNode* parent) {
-  if (parent == nullptr) {
-    return true;
-  }
-  if (swap_left_right) {
-    return verify_node<swap_left_right>(parent, parent->right_child());
-  }
-  return verify_node<swap_left_right>(parent, parent->left_child());
-}
-
-template <typename Key, typename Compare>
-template <bool swap_left_right>
-inline bool ZIntrusiveRBTree<Key, Compare>::verify_node(ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* left_child) {
-  if (swap_left_right) {
-    return verify_node<swap_left_right>(parent, left_child, parent->left_child());
-  }
-  return verify_node<swap_left_right>(parent, left_child, parent->right_child());
-}
-
-template <typename Key, typename Compare>
-template <bool swap_left_right>
-inline bool ZIntrusiveRBTree<Key, Compare>::verify_node(ZIntrusiveRBTreeNode* parent, any_t, ZIntrusiveRBTreeNode* right_child) {
-  if (swap_left_right) {
-    return verify_node<swap_left_right>(parent, parent->right_child(), right_child);
-  }
-  return verify_node<swap_left_right>(parent, parent->left_child(), right_child);
-}
-#endif // ASSERT
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode* const* ZIntrusiveRBTree<Key, Compare>::root_node_addr() const {
-  return &_root_node;
-}
-
-template <typename Key, typename Compare>
-void ZIntrusiveRBTree<Key, Compare>::update_child_or_root(ZIntrusiveRBTreeNode* old_node, ZIntrusiveRBTreeNode* new_node, ZIntrusiveRBTreeNode* parent) {
-  if (parent == nullptr) {
-    // Update root
-    _root_node = new_node;
-    return;
-  }
-  if (old_node == parent->left_child()) {
-    parent->update_left_child(new_node);
-    return;
-  }
-  assert(old_node == parent->right_child(), "must be");
-  parent->update_right_child(new_node);
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::rotate_and_update_child_or_root(ZIntrusiveRBTreeNode* old_node, ZIntrusiveRBTreeNode* new_node, ZIntrusiveRBTreeNode::Color color) {
-  ZIntrusiveRBTreeNode* const parent = old_node->parent();
-  new_node->copy_parent_and_color(old_node);
-  old_node->update_parent_and_color(new_node, color);
-  update_child_or_root(old_node, new_node, parent);
-}
-
-template <typename Key, typename Compare>
-template <ZIntrusiveRBTreeDirection PARENT_SIBLING_DIRECTION>
-inline void ZIntrusiveRBTree<Key, Compare>::rebalance_insert_with_sibling(ZIntrusiveRBTreeNode* node, ZIntrusiveRBTreeNode* parent, ZIntrusiveRBTreeNode* grand_parent) {
-  DEBUG_ONLY(const bool swap_left_right = PARENT_SIBLING_DIRECTION == ZIntrusiveRBTreeDirection::LEFT;)
-  constexpr ZIntrusiveRBTreeDirection OTHER_DIRECTION = other(PARENT_SIBLING_DIRECTION);
-  ZIntrusiveRBTreeNode* sibling = parent->template child<PARENT_SIBLING_DIRECTION>();
-  DEBUG_ONLY(bool rotated_parent = false;)
-  if (node == sibling) {
-    DEBUG_ONLY(rotated_parent = true;)
-    // Rotate up node through parent
-    ZIntrusiveRBTreeNode* child = node->template child<OTHER_DIRECTION>();
-
-    //// PRE
-    //
-    //      G          G
-    //     /            \
-    //    p      or      p
-    //     \            /
-    //      n          n
-    //     /            \
-    //   (c)            (c)
-    //
-    ////
-    precond(grand_parent->is_black());
-    precond(parent->is_red());
-    precond(node->is_red());
-    precond(verify_node<swap_left_right>(grand_parent, parent));
-    precond(verify_node<swap_left_right>(parent, any_t{}, node));
-    precond(verify_node<swap_left_right>(node, child));
-    precond(verify_node<swap_left_right>(child));
-
-    // Fix children
-    parent->template update_child<PARENT_SIBLING_DIRECTION>(child);
-    node->template update_child<OTHER_DIRECTION>(parent);
-
-    // Fix parents and colors
-    if (child != nullptr) {
-      child->update_parent_and_color(parent, ZIntrusiveRBTreeNode::BLACK);
-    }
-    parent->update_parent_and_color(node, ZIntrusiveRBTreeNode::RED);
-
-    //// POST
-    //
-    //        G          G
-    //       /            \
-    //      n      or      n
-    //     /                \
-    //    p                  p
-    //     \                /
-    //     (C)            (C)
-    //
-    ////
-    postcond(grand_parent->is_black());
-    postcond(parent->is_red());
-    postcond(node->is_red());
-    postcond(ZIntrusiveRBTreeNode::is_black(child));
-    // The grand_parent is updated in the next rotation
-    // postcond(verify_node<swap_left_right>(grand_parent, node));
-    postcond(verify_node<swap_left_right>(node, parent));
-    postcond(verify_node<swap_left_right>(parent, any_t{}, child));
-    postcond(verify_node<swap_left_right>(child));
-
-    parent = node;
-    sibling = parent->template child<PARENT_SIBLING_DIRECTION>();
-    DEBUG_ONLY(node = parent->template child<OTHER_DIRECTION>();)
-  }
-
-  //// PRE
-  //
-  //        G        G
-  //       /          \
-  //      p     or     p
-  //     / \          / \
-  //    n  (s)      (s)  n
-  //
-  ////
-  precond(grand_parent->is_black());
-  precond(parent->is_red());
-  precond(node->is_red());
-  precond(rotated_parent || verify_node<swap_left_right>(grand_parent, parent));
-  precond(verify_node<swap_left_right>(parent, node, sibling));
-  precond(verify_node<swap_left_right>(node));
-  precond(verify_node<swap_left_right>(sibling));
-
-  // Rotate up parent through grand-parent
-
-  // Fix children
-  grand_parent->template update_child<OTHER_DIRECTION>(sibling);
-  parent->template update_child<PARENT_SIBLING_DIRECTION>(grand_parent);
-
-  // Fix parents and colors
-  if (sibling != nullptr) {
-    sibling->update_parent_and_color(grand_parent, ZIntrusiveRBTreeNode::BLACK);
-  }
-  rotate_and_update_child_or_root(grand_parent, parent, ZIntrusiveRBTreeNode::RED);
-
-  //// POST
-  //
-  //      P          P
-  //     / \        / \
-  //    n   g  or  g   n
-  //       /        \
-  //     (S)        (S)
-  //
-  ////
-  postcond(parent->is_black());
-  postcond(grand_parent->is_red());
-  postcond(node->is_red());
-  postcond(ZIntrusiveRBTreeNode::is_black(sibling));
-  postcond(verify_node<swap_left_right>(parent, node, grand_parent));
-  postcond(verify_node<swap_left_right>(node));
-  postcond(verify_node<swap_left_right>(grand_parent, sibling));
-  postcond(verify_node<swap_left_right>(sibling));
-}
-
-template <typename Key, typename Compare>
-template <ZIntrusiveRBTreeDirection PARENT_SIBLING_DIRECTION>
-inline bool ZIntrusiveRBTree<Key, Compare>::rebalance_insert_with_parent_sibling(ZIntrusiveRBTreeNode** node_addr, ZIntrusiveRBTreeNode** parent_addr, ZIntrusiveRBTreeNode* grand_parent) {
-  DEBUG_ONLY(const bool swap_left_right = PARENT_SIBLING_DIRECTION == ZIntrusiveRBTreeDirection::LEFT;)
-  constexpr ZIntrusiveRBTreeDirection OTHER_DIRECTION = other(PARENT_SIBLING_DIRECTION);
-  ZIntrusiveRBTreeNode* const parent_sibling = grand_parent->template child<PARENT_SIBLING_DIRECTION>();
-  ZIntrusiveRBTreeNode*& node = *node_addr;
-  ZIntrusiveRBTreeNode*& parent = *parent_addr;
-  if (parent_sibling != nullptr && parent_sibling->is_red()) {
-    //// PRE
-    //
-    //       G          G
-    //      / \        / \
-    //     p   u  or  u   p
-    //    / \            / \
-    //   n | n          n | n
-    //
-    ////
-    precond(grand_parent->is_black());
-    precond(parent_sibling->is_red());
-    precond(parent->is_red());
-    precond(node->is_red());
-    precond(verify_node<swap_left_right>(grand_parent, parent, parent_sibling));
-    precond(parent->left_child() == node || parent->right_child() == node);
-    precond(verify_node<swap_left_right>(parent));
-    precond(verify_node<swap_left_right>(parent_sibling));
-    precond(verify_node<swap_left_right>(node));
-
-    // Flip colors of parent, parent sibling and grand parent
-    parent_sibling->update_parent_and_color(grand_parent, ZIntrusiveRBTreeNode::BLACK);
-    parent->update_parent_and_color(grand_parent, ZIntrusiveRBTreeNode::BLACK);
-    ZIntrusiveRBTreeNode* grand_grand_parent = grand_parent->black_parent();
-    grand_parent->update_parent_and_color(grand_grand_parent, ZIntrusiveRBTreeNode::RED);
-
-    //// POST
-    //
-    //       g          g
-    //      / \        / \
-    //     P   U  or  U   P
-    //    / \            / \
-    //   n | n          n | n
-    //
-    ////
-    postcond(grand_parent->is_red());
-    postcond(parent_sibling->is_black());
-    postcond(parent->is_black());
-    postcond(node->is_red());
-    postcond(verify_node<swap_left_right>(grand_parent, parent, parent_sibling));
-    postcond(parent->left_child() == node || parent->right_child() == node);
-    postcond(verify_node<swap_left_right>(parent));
-    postcond(verify_node<swap_left_right>(parent_sibling));
-    postcond(verify_node<swap_left_right>(node));
-
-    // Recurse up the tree
-    node = grand_parent;
-    parent = grand_grand_parent;
-    return false; // Not finished
-  }
-
-  rebalance_insert_with_sibling<PARENT_SIBLING_DIRECTION>(node, parent, grand_parent);
-  return true; // Finished
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::rebalance_insert(ZIntrusiveRBTreeNode* new_node) {
-  ZIntrusiveRBTreeNode* node = new_node;
-  ZIntrusiveRBTreeNode* parent = node->red_parent();
-  for (;;) {
-    precond(node->is_red());
-    if (parent == nullptr) {
-      // Recursive (or root) case
-      node->update_parent_and_color(parent, ZIntrusiveRBTreeNode::BLACK);
-      break;
-    }
-    if (parent->is_black()) {
-      // Tree is balanced
-      break;
-    }
-    ZIntrusiveRBTreeNode* grand_parent = parent->red_parent();
-    if (parent == grand_parent->left_child() ? rebalance_insert_with_parent_sibling<ZIntrusiveRBTreeDirection::RIGHT>(&node, &parent, grand_parent)
-                                            : rebalance_insert_with_parent_sibling<ZIntrusiveRBTreeDirection::LEFT>(&node, &parent, grand_parent)) {
-      break;
-    }
-  }
-}
-
-template <typename Key, typename Compare>
-template <ZIntrusiveRBTreeDirection SIBLING_DIRECTION>
-inline bool ZIntrusiveRBTree<Key, Compare>::rebalance_remove_with_sibling(ZIntrusiveRBTreeNode** node_addr, ZIntrusiveRBTreeNode** parent_addr) {
-  DEBUG_ONLY(const bool swap_left_right = SIBLING_DIRECTION == ZIntrusiveRBTreeDirection::LEFT;)
-  constexpr ZIntrusiveRBTreeDirection OTHER_DIRECTION = other(SIBLING_DIRECTION);
-  ZIntrusiveRBTreeNode*& node = *node_addr;
-  ZIntrusiveRBTreeNode*& parent = *parent_addr;
-  ZIntrusiveRBTreeNode* sibling = parent->template child<SIBLING_DIRECTION>();
-  if (sibling->is_red()) {
-    ZIntrusiveRBTreeNode* sibling_child = sibling->template child<OTHER_DIRECTION>();
-    //// PRE
-    //
-    //     P          P
-    //    / \        / \
-    //   N   s  or  s   N
-    //      /        \
-    //     SC        SC
-    //
-    ////
-    precond(parent->is_black());
-    precond(ZIntrusiveRBTreeNode::is_black(node));
-    precond(sibling->is_red());
-    precond(ZIntrusiveRBTreeNode::is_black(sibling_child));
-    precond(verify_node<swap_left_right>(parent, node, sibling));
-    precond(verify_node<swap_left_right>(node));
-    precond(verify_node<swap_left_right>(sibling, sibling_child));
-    precond(verify_node<swap_left_right>(sibling_child));
-
-    // Rotate sibling up through parent
-
-    // Fix children
-    parent->template update_child<SIBLING_DIRECTION>(sibling_child);
-    sibling->template update_child<OTHER_DIRECTION>(parent);
-
-    // Fix parents and colors
-    sibling_child->update_parent_and_color(parent, ZIntrusiveRBTreeNode::BLACK);
-    rotate_and_update_child_or_root(parent, sibling, ZIntrusiveRBTreeNode::RED);
-
-    //// POST
-    //
-    //       S         S
-    //      /           \
-    //     p             p
-    //    / \           / \
-    //   N   SC        SC  N
-    //
-    ////
-    postcond(sibling->is_black());
-    postcond(parent->is_red());
-    postcond(ZIntrusiveRBTreeNode::is_black(node));
-    postcond(ZIntrusiveRBTreeNode::is_black(sibling_child));
-    postcond(verify_node<swap_left_right>(sibling, parent));
-    postcond(verify_node<swap_left_right>(parent, node, sibling_child));
-    postcond(verify_node<swap_left_right>(node));
-    postcond(verify_node<swap_left_right>(sibling_child));
-
-    // node has a new sibling
-    sibling = sibling_child;
-  }
-
-  ZIntrusiveRBTreeNode* sibling_child = sibling->template child<SIBLING_DIRECTION>();
-  DEBUG_ONLY(bool rotated_parent = false;)
-  if (ZIntrusiveRBTreeNode::is_black(sibling_child)) {
-    DEBUG_ONLY(rotated_parent = true;)
-    ZIntrusiveRBTreeNode* sibling_other_child = sibling->template child<OTHER_DIRECTION>();
-    if (ZIntrusiveRBTreeNode::is_black(sibling_other_child)) {
-      //// PRE
-      //
-      //    (p)        (p)
-      //    / \        / \
-      //   N   S  or  S   N
-      //
-      ////
-      precond(ZIntrusiveRBTreeNode::is_black(node));
-      precond(sibling->is_black());
-      precond(verify_node<swap_left_right>(parent, node, sibling));
-
-      // Flip sibling color to RED
-      sibling->update_parent_and_color(parent, ZIntrusiveRBTreeNode::RED);
-
-      //// POST
-      //
-      //    (p)        (p)
-      //    / \        / \
-      //   N   s  or  s   N
-      //
-      ////
-      postcond(ZIntrusiveRBTreeNode::is_black(node));
-      postcond(sibling->is_red());
-      postcond(verify_node<swap_left_right>(parent, node, sibling));
-
-      if (parent->is_black()) {
-        // We did not introduce a RED-RED edge, if parent is
-        // the root we are done, else recurse up the tree
-        if (parent->parent() != nullptr) {
-          node = parent;
-          parent = node->parent();
-          return false;
-        }
-        return true;
-      }
-      // Change RED-RED edge to BLACK-RED edge
-      parent->update_color(ZIntrusiveRBTreeNode::BLACK);
-      return true;
-    }
-
-    ZIntrusiveRBTreeNode* sibling_grand_child = sibling_other_child->template child<SIBLING_DIRECTION>();
-    //// PRE
-    //
-    //    (p)          (p)
-    //    / \          / \
-    //   N   S        S   N
-    //      /     or   \
-    //    soc          soc
-    //      \          /
-    //     (sgc)     (sgc)
-    //
-    ////
-    precond(ZIntrusiveRBTreeNode::is_black(node));
-    precond(sibling->is_black());
-    precond(sibling_other_child->is_red());
-    precond(verify_node<swap_left_right>(parent, node, sibling));
-    precond(verify_node<swap_left_right>(node));
-    precond(verify_node<swap_left_right>(sibling, sibling_other_child, sibling_child));
-    precond(verify_node<swap_left_right>(sibling_other_child, any_t{}, sibling_grand_child));
-    precond(verify_node<swap_left_right>(sibling_grand_child));
-
-    // Rotate sibling other child through the sibling
-
-    // Fix children
-    sibling->template update_child<OTHER_DIRECTION>(sibling_grand_child);
-    sibling_other_child->template update_child<SIBLING_DIRECTION>(sibling);
-    parent->template update_child<SIBLING_DIRECTION>(sibling_other_child);
-
-    // Fix parents and colors
-    if (sibling_grand_child != nullptr) {
-      sibling_grand_child->update_parent_and_color(sibling, ZIntrusiveRBTreeNode::BLACK);
-    }
-    // Defer updating the sibling and sibling other child parents until
-    // after we rotate below. This will also fix the any potential RED-RED
-    // edge between parent and sibling_other_child
-
-    //// POST
-    //
-    //    (p)            (p)
-    //    / \            / \
-    //   N  soc   or   soc  N
-    //      / \        / \
-    //    SGC  S      S  SGC
-    //
-    ////
-    postcond(ZIntrusiveRBTreeNode::is_black(node));
-    postcond(sibling->is_black());
-    postcond(sibling_other_child->is_red());
-    postcond(ZIntrusiveRBTreeNode::is_black(sibling_grand_child));
-    // Deferred
-    // postcond(verify_node<swap_left_right>(parent, node, sibling_other_child));
-    postcond(verify_node<swap_left_right>(node));
-    // postcond(verify_node<swap_left_right>(sibling_other_child, sibling_grand_child, sibling));
-    postcond(verify_node<swap_left_right>(sibling_grand_child));
-    postcond(verify_node<swap_left_right>(sibling));
-
-    // node has a new sibling
-    sibling_child = sibling;
-    sibling = sibling_other_child;
-  }
-
-  ZIntrusiveRBTreeNode* sibling_other_child = sibling->template child<OTHER_DIRECTION>();
-  //// PRE
-  //
-  //    (p)              (p)
-  //    / \              / \
-  //   N   S     or     S   N
-  //      / \          / \
-  //   (soc)(sc)    (sc)(soc)
-  //
-  ////
-  DEBUG_ONLY(ZIntrusiveRBTreeNode::Color parent_color = parent->color();)
-  precond(ZIntrusiveRBTreeNode::is_black(node));
-  precond(rotated_parent || sibling->is_black());
-  DEBUG_ONLY(bool sibling_other_child_is_black = ZIntrusiveRBTreeNode::is_black(sibling_other_child);)
-  precond(rotated_parent || verify_node<swap_left_right>(parent, node, sibling));
-  precond(verify_node<swap_left_right>(node));
-  precond(rotated_parent || verify_node<swap_left_right>(sibling, sibling_other_child, sibling_child));
-  postcond(verify_node<swap_left_right>(sibling_other_child));
-  postcond(verify_node<swap_left_right>(sibling_child));
-
-  // Rotate sibling through parent and fix colors
-
-  // Fix children
-  parent->template update_child<SIBLING_DIRECTION>(sibling_other_child);
-  sibling->template update_child<OTHER_DIRECTION>(parent);
-
-  // Fix parents and colors
-  sibling_child->update_parent_and_color(sibling, ZIntrusiveRBTreeNode::BLACK);
-  if (sibling_other_child != nullptr) {
-    sibling_other_child->update_parent(parent);
-  }
-  rotate_and_update_child_or_root(parent, sibling, ZIntrusiveRBTreeNode::BLACK);
-
-  //// POST
-  //
-  //      (s)           (s)
-  //      / \           / \
-  //     P   SC  or    SC  P
-  //    / \               / \
-  //   N (soc)         (soc) N
-  //
-  ////
-  postcond(sibling->color() == parent_color);
-  postcond(parent->is_black());
-  postcond(sibling_child->is_black());
-  postcond(ZIntrusiveRBTreeNode::is_black(node));
-  postcond(sibling_other_child_is_black == ZIntrusiveRBTreeNode::is_black(sibling_other_child));
-  postcond(verify_node<swap_left_right>(sibling, parent, sibling_child));
-  postcond(verify_node<swap_left_right>(parent, node, sibling_other_child));
-  postcond(verify_node<swap_left_right>(sibling_child));
-  postcond(verify_node<swap_left_right>(node));
-  postcond(verify_node<swap_left_right>(sibling_other_child));
-  return true;
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::rebalance_remove(ZIntrusiveRBTreeNode* rebalance_from) {
-  ZIntrusiveRBTreeNode* node = nullptr;
-  ZIntrusiveRBTreeNode* parent = rebalance_from;
-
-  for (;;) {
-    precond(ZIntrusiveRBTreeNode::is_black(node));
-    precond(parent != nullptr);
-    if (node == parent->left_child() ? rebalance_remove_with_sibling<ZIntrusiveRBTreeDirection::RIGHT>(&node, &parent)
-                                    : rebalance_remove_with_sibling<ZIntrusiveRBTreeDirection::LEFT>(&node, &parent)) {
-      break;
-    }
-  }
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTree<Key, Compare>::FindCursor::FindCursor(ZIntrusiveRBTreeNode** insert_location, ZIntrusiveRBTreeNode* parent, bool left_most, bool right_most DEBUG_ONLY(COMMA uintptr_t sequence_number))
-  : _insert_location(insert_location),
-    _parent(parent),
-    _left_most(left_most),
-    _right_most(right_most)
-    DEBUG_ONLY(COMMA _sequence_number(sequence_number)) {}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTree<Key, Compare>::FindCursor::FindCursor()
-  : _insert_location(nullptr),
-    _parent(nullptr),
-    _left_most(),
-    _right_most()
-    DEBUG_ONLY(COMMA _sequence_number()) {}
-
-#ifdef ASSERT
-template <typename Key, typename Compare>
-inline bool ZIntrusiveRBTree<Key, Compare>::FindCursor::is_valid(uintptr_t sequence_number) const {
-  return is_valid() && _sequence_number == sequence_number;
-}
-#endif // ASSERT
-
-template <typename Key, typename Compare>
-inline bool ZIntrusiveRBTree<Key, Compare>::FindCursor::is_valid() const {
-  return insert_location() != nullptr;
-}
-
-template <typename Key, typename Compare>
-inline bool ZIntrusiveRBTree<Key, Compare>::FindCursor::found() const {
-  return node() != nullptr;
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTree<Key, Compare>::FindCursor::node() const {
-  precond(is_valid());
-  return *_insert_location == nullptr ? nullptr : *_insert_location;
-}
-
-template <typename Key, typename Compare>
-inline bool ZIntrusiveRBTree<Key, Compare>::FindCursor::is_left_most() const {
-  precond(is_valid());
-  return _left_most;
-}
-
-template <typename Key, typename Compare>
-inline bool ZIntrusiveRBTree<Key, Compare>::FindCursor::is_right_most() const {
-  precond(is_valid());
-  return _right_most;
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTree<Key, Compare>::FindCursor::parent() const {
-  precond(is_valid());
-  return _parent;
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode** ZIntrusiveRBTree<Key, Compare>::FindCursor::insert_location() const {
-  return _insert_location;
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::make_cursor(ZIntrusiveRBTreeNode* const* insert_location, ZIntrusiveRBTreeNode* parent, bool left_most, bool right_most) const {
-  return FindCursor(const_cast<ZIntrusiveRBTreeNode**>(insert_location), parent, left_most, right_most DEBUG_ONLY(COMMA _sequence_number));
-}
-
-template <typename Key, typename Compare>
-template <ZIntrusiveRBTreeDirection DIRECTION>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::find_next(const FindCursor& cursor) const {
-  constexpr ZIntrusiveRBTreeDirection OTHER_DIRECTION = other(DIRECTION);
-  if (cursor.found()) {
-    ZIntrusiveRBTreeNode* const node = cursor.node();
-    const ZIntrusiveRBTreeNode* const next_node = node->template find_next_node<DIRECTION>();
-    if (next_node != nullptr) {
-      return get_cursor(next_node);
-    }
-    const bool is_right_most = DIRECTION == ZIntrusiveRBTreeDirection::RIGHT && node == _right_most;
-    const bool is_left_most = DIRECTION == ZIntrusiveRBTreeDirection::LEFT && node == _left_most;
-    return make_cursor(node->template child_addr<DIRECTION>(), node, is_left_most, is_right_most);
-  }
-  ZIntrusiveRBTreeNode* const parent = cursor.parent();
-  if (parent == nullptr) {
-    assert(&_root_node == cursor.insert_location(), "must be");
-    // tree is empty
-    return FindCursor();
-  }
-  if (parent->template child_addr<OTHER_DIRECTION>() == cursor.insert_location()) {
-    // Cursor at leaf in other direction, parent is next in direction
-    return get_cursor(parent);
-  }
-  assert(parent->template child_addr<DIRECTION>() == cursor.insert_location(), "must be");
-  // Cursor at leaf in direction, parent->next in direction is also cursors next in direction
-  return get_cursor(parent->template find_next_node<DIRECTION>());
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTree<Key, Compare>::ZIntrusiveRBTree()
-  : _root_node(nullptr),
-    _left_most(nullptr),
-    _right_most(nullptr)
-    DEBUG_ONLY(COMMA _sequence_number()) {}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTree<Key, Compare>::first() const {
-  return _left_most;
-}
-
-template <typename Key, typename Compare>
-inline ZIntrusiveRBTreeNode* ZIntrusiveRBTree<Key, Compare>::last() const {
-  return _right_most;
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::root_cursor() const {
-  const bool is_left_most = _root_node == _left_most;
-  const bool is_right_most = _root_node == _right_most;
-  return make_cursor(&_root_node, nullptr, is_left_most, is_right_most);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::get_cursor(const ZIntrusiveRBTreeNode* node) const {
-  if (node == nullptr) {
-    // Return a invalid cursor
-    return FindCursor();
-  }
-  const bool is_left_most = node == _left_most;
-  const bool is_right_most = node == _right_most;
-  if (node->has_parent()) {
-    const ZIntrusiveRBTreeNode* const parent = node->parent();
-    if (parent->left_child() == node) {
-      return make_cursor(parent->left_child_addr(), nullptr, is_left_most, is_right_most);
-    }
-    assert(parent->right_child() == node, "must be");
-      return make_cursor(parent->right_child_addr(), nullptr, is_left_most, is_right_most);
-  }
-  // No parent, root node
-  return make_cursor(&_root_node, nullptr, is_left_most, is_right_most);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::prev_cursor(const ZIntrusiveRBTreeNode* node) const {
-  return prev(get_cursor(node));
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::next_cursor(const ZIntrusiveRBTreeNode* node) const {
-  return next(get_cursor(node));
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::prev(const FindCursor& cursor) const {
-  return find_next<ZIntrusiveRBTreeDirection::LEFT>(cursor);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::next(const FindCursor& cursor) const {
-  return find_next<ZIntrusiveRBTreeDirection::RIGHT>(cursor);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::FindCursor ZIntrusiveRBTree<Key, Compare>::find(const Key& key) const {
-  Compare compare_fn;
-  ZIntrusiveRBTreeNode* const* insert_location = root_node_addr();
-  ZIntrusiveRBTreeNode* parent = nullptr;
-  bool left_most = true;
-  bool right_most = true;
-  while (*insert_location != nullptr) {
-    int result = compare_fn(key, *insert_location);
-    if (result == 0) {
-      assert(*insert_location != _left_most || left_most, "must be");
-      assert(*insert_location != _right_most || right_most, "must be");
-      return make_cursor(insert_location, parent, *insert_location == _left_most, *insert_location == _right_most);
-    }
-    parent = *insert_location;
-    if (result < 0) {
-      insert_location = parent->left_child_addr();
-      // We took one step to the left, cannot be right_most.
-      right_most = false;
-    } else {
-      insert_location = parent->right_child_addr();
-      // We took one step to the right, cannot be left_most.
-      left_most = false;
-    }
-  }
-  return make_cursor(insert_location, parent, left_most, right_most);
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::insert(ZIntrusiveRBTreeNode* new_node, const FindCursor& find_cursor) {
-  precond(find_cursor.is_valid(_sequence_number));
-  precond(!find_cursor.found());
-  DEBUG_ONLY(_sequence_number++;)
-
-  // Link in the new node
-  new_node->link_node(find_cursor.parent(), find_cursor.insert_location());
-
-  // Keep track of first and last node(s)
-  if (find_cursor.is_left_most()) {
-    _left_most = new_node;
-  }
-  if (find_cursor.is_right_most()) {
-    _right_most = new_node;
-  }
-
-  rebalance_insert(new_node);
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::replace(ZIntrusiveRBTreeNode* new_node, const FindCursor& find_cursor) {
-  precond(find_cursor.is_valid(_sequence_number));
-  precond(find_cursor.found());
-  DEBUG_ONLY(_sequence_number++;)
-
-  const ZIntrusiveRBTreeNode* const node = find_cursor.node();
-
-  if (new_node != node) {
-    // Node has changed
-
-    // Copy the node to new location
-    *new_node = *node;
-
-    // Update insert location
-    *find_cursor.insert_location() = new_node;
-
-    // Update children's parent
-    if (new_node->has_left_child()) {
-      new_node->left_child()->update_parent(new_node);
-    }
-    if (new_node->has_right_child()) {
-      new_node->right_child()->update_parent(new_node);
-    }
-
-    // Keep track of first and last node(s)
-    if (find_cursor.is_left_most()) {
-      assert(_left_most == node, "must be");
-      _left_most = new_node;
-    }
-    if (find_cursor.is_right_most()) {
-      assert(_right_most == node, "must be");
-      _right_most = new_node;
-    }
-  }
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::remove(const FindCursor& find_cursor) {
-  precond(find_cursor.is_valid(_sequence_number));
-  precond(find_cursor.found());
-  DEBUG_ONLY(_sequence_number++;)
-
-  ZIntrusiveRBTreeNode* const node = find_cursor.node();
-  ZIntrusiveRBTreeNode* const parent = node->parent();
-
-  // Keep track of first and last node(s)
-  if (find_cursor.is_left_most()) {
-    assert(_left_most == node, "must be");
-    _left_most = _left_most->next();
-  }
-  if (find_cursor.is_right_most()) {
-    assert(_right_most == node, "must be");
-    _right_most = _right_most->prev();
-  }
-
-  ZIntrusiveRBTreeNode* rebalance_from = nullptr;
-
-  if (!node->has_left_child() && !node->has_right_child()) {
-    // No children
-
-    // Remove node
-    update_child_or_root(node, nullptr, parent);
-    if (node->is_black()) {
-      // We unbalanced the tree
-      rebalance_from = parent;
-    }
-  } else if (!node->has_left_child() || !node->has_right_child()) {
-    assert(node->has_right_child() || node->has_left_child(), "must be");
-    // Only one child
-    ZIntrusiveRBTreeNode* child = node->has_left_child() ? node->left_child() : node->right_child();
-
-    // Let child take nodes places
-    update_child_or_root(node, child, parent);
-
-    // And update parent and color
-    child->copy_parent_and_color(node);
-  } else {
-    assert(node->has_left_child() && node->has_right_child(), "must be");
-    // Find next node and let it take the nodes place
-    // This asymmetry always swap next instead of prev,
-    // I wonder how this behaves w.r.t. our mapped cache
-    // strategy of mostly removing from the left side of
-    // the tree
-
-    // This will never walk up the tree, hope the compiler sees this.
-    ZIntrusiveRBTreeNode* next_node = node->next();
-
-    ZIntrusiveRBTreeNode* next_node_parent = next_node->parent();
-    ZIntrusiveRBTreeNode* next_node_child = next_node->right_child();
-    if (next_node_parent != node) {
-      // Not the direct descendant, adopt node's child
-      ZIntrusiveRBTreeNode* node_child = node->right_child();
-      next_node->update_right_child(node_child);
-      node_child->update_parent(next_node);
-
-      // And let parent adopt their grand child
-      next_node_parent->update_left_child(next_node_child);
-    } else {
-      next_node_parent = next_node;
-    }
-    // Adopt node's other child
-    ZIntrusiveRBTreeNode* node_child = node->left_child();
-    next_node->update_left_child(node_child);
-    node_child->update_parent(next_node);
-
-    update_child_or_root(node, next_node, parent);
-
-    // Update parent(s) and colors
-    if (next_node_child != nullptr) {
-      next_node_child->update_parent_and_color(next_node_parent, ZIntrusiveRBTreeNode::BLACK);
-    } else if (next_node->is_black()) {
-      rebalance_from = next_node_parent;
-    }
-    next_node->copy_parent_and_color(node);
-  }
-
-  if (rebalance_from == nullptr) {
-    // Removal did not unbalance the tree
-    return;
-  }
-
-  rebalance_remove(rebalance_from);
-}
-
-template <typename Key, typename Compare>
-inline void ZIntrusiveRBTree<Key, Compare>::verify_tree() {
-  // Properties:
-  //  (a) Node's are either BLACK or RED
-  //  (b) All nullptr children are counted as BLACK
-  //  (c) Compare::operator(Node*, Node*) <=> 0 is transitive
-  // Invariants:
-  //  (1) Root node is BLACK
-  //  (2) All RED nodes only have BLACK children
-  //  (3) Every simple path from the root to a leaf
-  //      contains the same amount of BLACK nodes
-  //  (4) A node's children must have that node as
-  //      its parent
-  //  (5) Each node N in the sub-tree formed from a
-  //      node A's child must:
-  //        if left child:  Compare::operator(A, N) < 0
-  //        if right child: Compare::operator(A, N) > 0
-  //
-  // Note: 1-4 may not hold during a call to insert
-  //       and remove.
-
-  // Helpers
-  const auto is_leaf = [](ZIntrusiveRBTreeNode* node) {
-    return node == nullptr;
-  };
-  const auto is_black = [&](ZIntrusiveRBTreeNode* node) {
-    return is_leaf(node) || node->is_black();
-  };
-  const auto is_red = [&](ZIntrusiveRBTreeNode* node) {
-    return !is_black(node);
-  };
-
-  // Verify (1)
-  ZIntrusiveRBTreeNode* const root_node = _root_node;
-  guarantee(is_black(root_node), "Invariant (1)");
-
-  // Verify (2)
-  const auto verify_2 = [&](ZIntrusiveRBTreeNode* node) {
-    guarantee(!is_red(node) || is_black(node->left_child()), "Invariant (2)");
-    guarantee(!is_red(node) || is_black(node->right_child()), "Invariant (2)");
-  };
-
-  // Verify (3)
-  size_t first_simple_path_black_nodes_traversed = 0;
-  const auto verify_3 = [&](ZIntrusiveRBTreeNode* node, size_t black_nodes_traversed) {
-    if (!is_leaf(node)) { return; }
-    if (first_simple_path_black_nodes_traversed == 0) {
-      first_simple_path_black_nodes_traversed = black_nodes_traversed;
-    }
-    guarantee(first_simple_path_black_nodes_traversed == black_nodes_traversed, "Invariant (3)");
-  };
-
-  // Verify (4)
-  const auto verify_4 = [&](ZIntrusiveRBTreeNode* node) {
-    if (is_leaf(node)) { return; }
-    guarantee(!node->has_left_child() || node->left_child()->parent() == node, "Invariant (4)");
-    guarantee(!node->has_right_child() || node->right_child()->parent() == node, "Invariant (4)");
-  };
-  guarantee(root_node == nullptr || root_node->parent() == nullptr, "Invariant (4)");
-
-  // Verify (5)
-  const auto verify_5 = [&](ZIntrusiveRBTreeNode* node) {
-    // Because of the transitive property of Compare (c) we simply check
-    // this that (5) hold for each parent child pair.
-    if (is_leaf(node)) { return; }
-    Compare compare_fn;
-    guarantee(!node->has_left_child() || compare_fn(node->left_child(), node) < 0, "Invariant (5)");
-    guarantee(!node->has_right_child() || compare_fn(node->right_child(), node) > 0, "Invariant (5)");
-  };
-
-  // Walk every simple path by recursively descending the tree from the root
-  const auto recursive_walk = [&](auto&& recurse, ZIntrusiveRBTreeNode* node, size_t black_nodes_traversed) {
-    if (is_black(node)) { black_nodes_traversed++; }
-    verify_2(node);
-    verify_3(node, black_nodes_traversed);
-    verify_4(node);
-    verify_5(node);
-    if (is_leaf(node)) { return; }
-    recurse(recurse, node->left_child(), black_nodes_traversed);
-    recurse(recurse, node->right_child(), black_nodes_traversed);
-  };
-  recursive_walk(recursive_walk, root_node, 0);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::Iterator ZIntrusiveRBTree<Key, Compare>::begin() {
-  return Iterator(*this, first());
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::Iterator ZIntrusiveRBTree<Key, Compare>::end() {
-  return Iterator(*this, nullptr);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstIterator ZIntrusiveRBTree<Key, Compare>::begin() const {
-  return cbegin();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstIterator ZIntrusiveRBTree<Key, Compare>::end() const {
-  return cend();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstIterator ZIntrusiveRBTree<Key, Compare>::cbegin() const {
-  return const_cast<ZIntrusiveRBTree<Key, Compare>*>(this)->begin();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstIterator ZIntrusiveRBTree<Key, Compare>::cend() const {
-  return const_cast<ZIntrusiveRBTree<Key, Compare>*>(this)->end();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ReverseIterator ZIntrusiveRBTree<Key, Compare>::rbegin() {
-  return ReverseIterator(*this, last());
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ReverseIterator ZIntrusiveRBTree<Key, Compare>::rend() {
-  return ReverseIterator(*this, nullptr);
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstReverseIterator ZIntrusiveRBTree<Key, Compare>::rbegin() const {
-  return crbegin();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstReverseIterator ZIntrusiveRBTree<Key, Compare>::rend() const {
-  return crend();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstReverseIterator ZIntrusiveRBTree<Key, Compare>::crbegin() const {
-  return const_cast<ZIntrusiveRBTree<Key, Compare>*>(this)->rbegin();
-}
-
-template <typename Key, typename Compare>
-inline typename ZIntrusiveRBTree<Key, Compare>::ConstReverseIterator ZIntrusiveRBTree<Key, Compare>::crend() const {
-  return const_cast<ZIntrusiveRBTree<Key, Compare>*>(this)->rend();
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline bool ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::at_end() const {
-  return _node == nullptr;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::IteratorImplementation(ZIntrusiveRBTree<Key, Compare>& tree, pointer node)
-: _tree(&tree),
-  _node(node),
-  _removed(false) {}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-template <bool Enable, ENABLE_IF_SDEFN(Enable)>
-inline ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::IteratorImplementation(const IteratorImplementation<false, Reverse>& other)
-: _tree(other._tree),
-  _node(other._node),
-  _removed(false) {}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse>::reference ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator*() const {
-  precond(!_removed);
-  return *_node;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse>::pointer ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator->() {
-  precond(!_removed);
-  return _node;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse>& ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator--() {
-  if (_removed) {
-    _removed = false;
-  } else if (Reverse) {
-    precond(_node != _tree->last());
-    _node = at_end() ? _tree->first() : _node->next();
-  } else {
-    precond(_node != _tree->first());
-    _node = at_end() ? _tree->last() : _node->prev();
-  }
-  return *this;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse> ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator--(int) {
-  IteratorImplementation tmp = *this;
-  --(*this);
-  return tmp;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse>& ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator++() {
-  if (_removed) {
-    _removed = false;
-  } else if (Reverse) {
-    precond(!at_end());
-    _node = _node->prev();
-  } else {
-    precond(!at_end());
-    _node = _node->next();
-  }
-  return *this;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-inline typename ZIntrusiveRBTree<Key, Compare>::template IteratorImplementation<IsConst, Reverse> ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::operator++(int) {
-  IteratorImplementation tmp = *this;
-  ++(*this);
-  return tmp;
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-template <bool Enable, ENABLE_IF_SDEFN(Enable)>
-void ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::replace(ZIntrusiveRBTreeNode* new_node) {
-  precond(!_removed);
-  precond(!at_end());
-  FindCursor cursor = _tree->get_cursor(_node);
-  _node = new_node;
-  _tree->replace(new_node, cursor);
-}
-
-template <typename Key, typename Compare>
-template <bool IsConst, bool Reverse>
-template <bool Enable, ENABLE_IF_SDEFN(Enable)>
-void ZIntrusiveRBTree<Key, Compare>::IteratorImplementation<IsConst, Reverse>::remove() {
-  precond(!_removed);
-  precond(!at_end());
-  FindCursor cursor = _tree->get_cursor(_node);
-  ++(*this);
-  _removed = true;
-  _tree->remove(cursor);
-}
-
-#endif // SHARE_GC_Z_ZINTRUSIVERBTREE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index 220176b638d..973cff0cfef 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -23,7 +23,6 @@
 
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
-#include "gc/z/zIntrusiveRBTree.inline.hpp"
 #include "gc/z/zList.inline.hpp"
 #include "gc/z/zMappedCache.hpp"
 #include "gc/z/zVirtualMemory.inline.hpp"
@@ -32,6 +31,7 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
+#include "utilities/rbTree.inline.hpp"
 
 class ZMappedCacheEntry {
 private:
@@ -118,7 +118,7 @@ static ZMappedCacheEntry* create_entry(const ZVirtualMemory& vmem) {
   return entry;
 }
 
-int ZMappedCache::EntryCompare::operator()(ZMappedCache::TreeNode* a, ZMappedCache::TreeNode* b) {
+int ZMappedCache::EntryCompare::cmp(const IntrusiveRBNode* a, const IntrusiveRBNode* b) {
   const ZVirtualMemory vmem_a = ZMappedCacheEntry::cast_to_entry(a)->vmem();
   const ZVirtualMemory vmem_b = ZMappedCacheEntry::cast_to_entry(b)->vmem();
 
@@ -128,7 +128,7 @@ int ZMappedCache::EntryCompare::operator()(ZMappedCache::TreeNode* a, ZMappedCac
   return 0; // Overlapping
 }
 
-int ZMappedCache::EntryCompare::operator()(zoffset key, ZMappedCache::TreeNode* node) {
+int ZMappedCache::EntryCompare::cmp(zoffset key, const IntrusiveRBNode* node) {
   const ZVirtualMemory vmem = ZMappedCacheEntry::cast_to_entry(node)->vmem();
 
   if (key < vmem.start()) { return -1; }
@@ -137,6 +137,111 @@ int ZMappedCache::EntryCompare::operator()(zoffset key, ZMappedCache::TreeNode*
   return 0; // Containing
 }
 
+void ZMappedCache::Tree::verify() const {
+#ifdef ASSERT
+  // Verify
+
+  if (size() < 10) {
+    // Only verify whole tree if the node count is low
+    verify_self();
+  }
+
+  // Verify the externally tracked left most and right most nodes
+  verify_left_most();
+  verify_right_most();
+#endif // ASSERT
+}
+
+void ZMappedCache::Tree::verify_left_most() const {
+  assert(leftmost() == _left_most, "must be " PTR_FORMAT " == " PTR_FORMAT,
+          p2i(leftmost()), p2i(this));
+}
+
+void ZMappedCache::Tree::verify_right_most() const {
+  assert(rightmost() == _right_most, "must be " PTR_FORMAT " == " PTR_FORMAT,
+          p2i(rightmost()), p2i(this));
+}
+
+ZMappedCache::Tree::Tree()
+  : TreeImpl(),
+    _left_most(nullptr),
+    _right_most(nullptr) {}
+
+void ZMappedCache::Tree::insert(TreeNode* node, const TreeCursor& cursor) {
+  // Insert in tree
+  TreeImpl::insert_at_cursor(node, cursor);
+
+  if (_left_most == nullptr || EntryCompare::cmp(node, _left_most) < 0) {
+    // Keep track of left most node
+    _left_most = node;
+  }
+
+  if (_right_most == nullptr || EntryCompare::cmp(_right_most, node) < 0) {
+    // Keep track of right most node
+    _right_most = node;
+  }
+
+  // Verify
+  verify();
+}
+
+void ZMappedCache::Tree::remove(TreeNode* node) {
+  if (_left_most == node) {
+    // Keep track of left most node
+    _left_most = node->next();
+  }
+
+  if (_right_most == node) {
+    // Keep track of right most node
+    _right_most = node->prev();
+  }
+
+  // Remove from tree
+  TreeImpl::remove(node);
+}
+
+void ZMappedCache::Tree::replace(TreeNode* old_node, TreeNode* new_node, const TreeCursor& cursor) {
+  if (_left_most == old_node) {
+    // Keep track of left most node
+    _left_most = new_node;
+  }
+
+  if (_right_most == old_node) {
+    // Keep track of right most node
+    _right_most = new_node;
+  }
+
+  // Replace in tree
+  TreeImpl::replace_at_cursor(new_node, cursor);
+
+  // Verify
+  verify();
+}
+
+size_t ZMappedCache::Tree::size_atomic() const {
+  return Atomic::load(&_num_nodes);
+}
+
+const ZMappedCache::TreeNode* ZMappedCache::Tree::left_most() const {
+  verify_left_most();
+  return _left_most;
+}
+
+ZMappedCache::TreeNode* ZMappedCache::Tree::left_most() {
+  verify_left_most();
+  return _left_most;
+}
+
+const ZMappedCache::TreeNode* ZMappedCache::Tree::right_most() const {
+  verify_right_most();
+  return _right_most;
+}
+
+ZMappedCache::TreeNode* ZMappedCache::Tree::right_most() {
+  verify_right_most();
+  return _right_most;
+}
+
 int ZMappedCache::size_class_index(size_t size) {
   // Returns the size class index of for size, or -1 if smaller than the smallest size class.
   const int size_class_power = log2i_graceful(size) - (int)ZGranuleSizeShift;
@@ -162,14 +267,12 @@ int ZMappedCache::guaranteed_size_class_index(size_t size) {
   return MAX2(size_class_power, MinSizeClassShift) - MinSizeClassShift;
 }
 
-void ZMappedCache::tree_insert(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem) {
+void ZMappedCache::cache_insert(const TreeCursor& cursor, const ZVirtualMemory& vmem) {
   ZMappedCacheEntry* const entry = create_entry(vmem);
 
-  // Insert creates a new entry
-  _entry_count += 1;
-
   // Insert in tree
-  _tree.insert(entry->node_addr(), cursor);
+  TreeNode* node = entry->node_addr();
+  _tree.insert(node, cursor);
 
   // Insert in size-class lists
   const size_t size = vmem.size();
@@ -179,16 +282,14 @@ void ZMappedCache::tree_insert(const Tree::FindCursor& cursor, const ZVirtualMem
   }
 }
 
-void ZMappedCache::tree_remove(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem) {
-  ZMappedCacheEntry* entry = ZMappedCacheEntry::cast_to_entry(cursor.node());
-
-  // Remove destroys an old entry
-  _entry_count -= 1;
+void ZMappedCache::cache_remove(const TreeCursor& cursor, const ZVirtualMemory& vmem) {
+  TreeNode* const node = cursor.node();
+  ZMappedCacheEntry* entry = ZMappedCacheEntry::cast_to_entry(node);
 
   // Remove from tree
-  _tree.remove(cursor);
+  _tree.remove(node);
 
-  // Insert in size-class lists
+  // Remove from size-class lists
   const size_t size = vmem.size();
   const int index = size_class_index(size);
   if (index != -1) {
@@ -199,15 +300,16 @@ void ZMappedCache::tree_remove(const Tree::FindCursor& cursor, const ZVirtualMem
   entry->~ZMappedCacheEntry();
 }
 
-void ZMappedCache::tree_replace(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem) {
+void ZMappedCache::cache_replace(const TreeCursor& cursor, const ZVirtualMemory& vmem) {
   ZMappedCacheEntry* const entry = create_entry(vmem);
+  IntrusiveRBNode* const new_node = entry->node_addr();
 
-  ZMappedCache::TreeNode* const node = cursor.node();
-  ZMappedCacheEntry* const old_entry = ZMappedCacheEntry::cast_to_entry(node);
+  ZMappedCache::TreeNode* const old_node = cursor.node();
+  ZMappedCacheEntry* const old_entry = ZMappedCacheEntry::cast_to_entry(old_node);
   assert(old_entry->end() != vmem.end(), "should not replace, use update");
 
   // Replace in tree
-  _tree.replace(entry->node_addr(), cursor);
+  _tree.replace(old_node, new_node, cursor);
 
   // Replace in size-class lists
 
@@ -229,7 +331,7 @@ void ZMappedCache::tree_replace(const Tree::FindCursor& cursor, const ZVirtualMe
   old_entry->~ZMappedCacheEntry();
 }
 
-void ZMappedCache::tree_update(ZMappedCacheEntry* entry, const ZVirtualMemory& vmem) {
+void ZMappedCache::cache_update(ZMappedCacheEntry* entry, const ZVirtualMemory& vmem) {
   assert(entry->end() == vmem.end(), "must be");
 
   // Remove or add to size-class lists if required
@@ -281,7 +383,7 @@ ZVirtualMemory ZMappedCache::remove_vmem(ZMappedCacheEntry* const entry, size_t
     if (strategy == RemovalStrategy::LowestAddress) {
       const size_t unused_size = size - to_remove;
       const ZVirtualMemory unused_vmem = vmem.shrink_from_back(unused_size);
-      tree_update(entry, unused_vmem);
+      cache_update(entry, unused_vmem);
 
     } else {
       assert(strategy == RemovalStrategy::HighestAddress, "must be LowestAddress or HighestAddress");
@@ -289,16 +391,16 @@ ZVirtualMemory ZMappedCache::remove_vmem(ZMappedCacheEntry* const entry, size_t
       const size_t unused_size = size - to_remove;
       const ZVirtualMemory unused_vmem = vmem.shrink_from_front(unused_size);
 
-      auto cursor = _tree.get_cursor(entry->node_addr());
-      assert(cursor.is_valid(), "must be");
-      tree_replace(cursor, unused_vmem);
+      TreeCursor cursor = _tree.cursor(entry->node_addr());
+      assert(cursor.valid(), "must be");
+      cache_replace(cursor, unused_vmem);
     }
 
   } else {
     // Whole removal
-    auto cursor = _tree.get_cursor(entry->node_addr());
-    assert(cursor.is_valid(), "must be");
-    tree_remove(cursor, vmem);
+    TreeCursor cursor = _tree.cursor(entry->node_addr());
+    assert(cursor.valid(), "must be");
+    cache_remove(cursor, vmem);
   }
 
   // Update statistics
@@ -384,7 +486,7 @@ void ZMappedCache::scan_remove_vmem(size_t min_size, SelectFunction select, Cons
 
   if (strategy == RemovalStrategy::HighestAddress) {
     // Scan whole tree starting at the highest address
-    for (ZMappedCache::TreeNode* node = _tree.last(); node != nullptr; node = node->prev()) {
+    for (ZMappedCache::TreeNode* node = _tree.right_most(); node != nullptr; node = node->prev()) {
       ZMappedCacheEntry* const entry = ZMappedCacheEntry::cast_to_entry(node);
 
       const ZVirtualMemory vmem = remove_vmem<RemovalStrategy::HighestAddress>(entry, min_size, select);
@@ -399,7 +501,7 @@ void ZMappedCache::scan_remove_vmem(size_t min_size, SelectFunction select, Cons
     assert(strategy == RemovalStrategy::SizeClasses || strategy == RemovalStrategy::LowestAddress, "unknown strategy");
 
     // Scan whole tree starting at the lowest address
-    for (ZMappedCache::TreeNode* node = _tree.first(); node != nullptr; node = node->next()) {
+    for (ZMappedCache::TreeNode* node = _tree.left_most(); node != nullptr; node = node->next()) {
       ZMappedCacheEntry* const entry = ZMappedCacheEntry::cast_to_entry(node);
 
       const ZVirtualMemory vmem = remove_vmem<RemovalStrategy::LowestAddress>(entry, min_size, select);
@@ -449,7 +551,6 @@ size_t ZMappedCache::remove_discontiguous_with_strategy(size_t size, ZArray<ZVir
 
 ZMappedCache::ZMappedCache()
   : _tree(),
-    _entry_count(0),
     _size_class_lists{},
     _size(0),
     _min(_size) {}
@@ -457,11 +558,11 @@ ZMappedCache::ZMappedCache()
 void ZMappedCache::insert(const ZVirtualMemory& vmem) {
   _size += vmem.size();
 
-  Tree::FindCursor current_cursor = _tree.find(vmem.start());
-  Tree::FindCursor next_cursor = _tree.next(current_cursor);
+  TreeCursor current_cursor = _tree.cursor(vmem.start());
+  TreeCursor next_cursor = _tree.next(current_cursor);
 
   const bool extends_left = current_cursor.found();
-  const bool extends_right = next_cursor.is_valid() && next_cursor.found() &&
+  const bool extends_right = next_cursor.valid() && next_cursor.found() &&
                              ZMappedCacheEntry::cast_to_entry(next_cursor.node())->start() == vmem.end();
 
   if (extends_left && extends_right) {
@@ -477,10 +578,10 @@ void ZMappedCache::insert(const ZVirtualMemory& vmem) {
     new_vmem.grow_from_back(right_vmem.size());
 
     // Remove current (left vmem)
-    tree_remove(current_cursor, left_vmem);
+    cache_remove(current_cursor, left_vmem);
 
     // And update next's start
-    tree_update(next_entry, new_vmem);
+    cache_update(next_entry, new_vmem);
 
     return;
   }
@@ -492,7 +593,7 @@ void ZMappedCache::insert(const ZVirtualMemory& vmem) {
     ZVirtualMemory new_vmem = left_vmem;
     new_vmem.grow_from_back(vmem.size());
 
-    tree_replace(current_cursor, new_vmem);
+    cache_replace(current_cursor, new_vmem);
 
     return;
   }
@@ -507,12 +608,12 @@ void ZMappedCache::insert(const ZVirtualMemory& vmem) {
     new_vmem.grow_from_back(right_vmem.size());
 
     // Update next's start
-    tree_update(next_entry, new_vmem);
+    cache_update(next_entry, new_vmem);
 
     return;
   }
 
-  tree_insert(current_cursor, vmem);
+  cache_insert(current_cursor, vmem);
 }
 
 ZVirtualMemory ZMappedCache::remove_contiguous(size_t size) {
@@ -571,10 +672,10 @@ size_t ZMappedCache::remove_from_min(size_t max_size, ZArray<ZVirtualMemory>* ou
 
 void ZMappedCache::print_on(outputStream* st) const {
   // This may be called from error printing where we may not hold the lock, so
-  // values may be inconsistent. As such we read the _entry_count only once. And
-  // use is_empty_error_reporter_safe and size_error_reporter_safe on the size
-  // class lists.
-  const size_t entry_count = Atomic::load(&_entry_count);
+  // values may be inconsistent. As such we read size using _tree.size_atomic()
+  // only once. And use is_empty_error_reporter_safe and
+  // size_error_reporter_safe on the size class lists.
+  const size_t entry_count = _tree.size_atomic();
 
   st->print("Cache ");
   st->fill_to(17);
@@ -621,7 +722,7 @@ void ZMappedCache::print_on(outputStream* st) const {
 
 void ZMappedCache::print_extended_on(outputStream* st) const {
   // Print the ranges and size of all nodes in the tree
-  for (ZMappedCache::TreeNode* node = _tree.first(); node != nullptr; node = node->next()) {
+  for (const ZMappedCache::TreeNode* node = _tree.left_most(); node != nullptr; node = node->next()) {
     const ZVirtualMemory vmem = ZMappedCacheEntry::cast_to_entry(node)->vmem();
 
     st->print_cr(PTR_FORMAT " " PTR_FORMAT " " EXACTFMT,
diff --git a/src/hotspot/share/gc/z/zMappedCache.hpp b/src/hotspot/share/gc/z/zMappedCache.hpp
index 8d1c90fd003..482f802952a 100644
--- a/src/hotspot/share/gc/z/zMappedCache.hpp
+++ b/src/hotspot/share/gc/z/zMappedCache.hpp
@@ -27,10 +27,10 @@
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zArray.hpp"
 #include "gc/z/zGlobals.hpp"
-#include "gc/z/zIntrusiveRBTree.hpp"
 #include "gc/z/zList.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/rbTree.hpp"
 
 class ZMappedCacheEntry;
 class ZVirtualMemory;
@@ -40,19 +40,49 @@ class ZMappedCache {
 
 private:
   struct EntryCompare {
-    int operator()(ZIntrusiveRBTreeNode* a, ZIntrusiveRBTreeNode* b);
-    int operator()(zoffset key, ZIntrusiveRBTreeNode* node);
+    static int cmp(zoffset a, const IntrusiveRBNode* b);
+    static int cmp(const IntrusiveRBNode*  a, const IntrusiveRBNode* b);
   };
 
   struct ZSizeClassListNode {
     ZListNode<ZSizeClassListNode> _node;
   };
 
-  using Tree              = ZIntrusiveRBTree<zoffset, EntryCompare>;
-  using TreeNode          = ZIntrusiveRBTreeNode;
+  using TreeImpl          = IntrusiveRBTree<zoffset, EntryCompare>;
+  using TreeCursor        = TreeImpl::Cursor;
+  using TreeNode          = IntrusiveRBNode;
   using SizeClassList     = ZList<ZSizeClassListNode>;
   using SizeClassListNode = ZSizeClassListNode;
 
+  class Tree : private TreeImpl {
+  private:
+    TreeNode* _left_most;
+    TreeNode* _right_most;
+
+    void verify() const;
+    void verify_left_most() const;
+    void verify_right_most() const;
+
+  public:
+    Tree();
+
+    void insert(TreeNode* node, const TreeCursor& cursor);
+    void remove(TreeNode* node);
+    void replace(TreeNode* old_node, TreeNode* new_node, const TreeCursor& cursor);
+
+    size_t size_atomic() const;
+    using TreeImpl::size;
+
+    using TreeImpl::cursor;
+    using TreeImpl::next;
+
+    const TreeNode* left_most() const;
+    TreeNode* left_most();
+
+    const TreeNode* right_most() const;
+    TreeNode* right_most();
+  };
+
   // Maintain size class lists from 4MB to 16GB
   static constexpr int MaxLongArraySizeClassShift = 3 /* 8 byte */ + 31 /* max length */;
   static constexpr int MinSizeClassShift = 1;
@@ -60,7 +90,6 @@ class ZMappedCache {
   static constexpr int NumSizeClasses = MaxSizeClassShift - MinSizeClassShift + 1;
 
   Tree          _tree;
-  size_t        _entry_count;
   SizeClassList _size_class_lists[NumSizeClasses];
   size_t        _size;
   size_t        _min;
@@ -68,10 +97,10 @@ class ZMappedCache {
   static int size_class_index(size_t size);
   static int guaranteed_size_class_index(size_t size);
 
-  void tree_insert(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem);
-  void tree_remove(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem);
-  void tree_replace(const Tree::FindCursor& cursor, const ZVirtualMemory& vmem);
-  void tree_update(ZMappedCacheEntry* entry, const ZVirtualMemory& vmem);
+  void cache_insert(const TreeCursor& cursor, const ZVirtualMemory& vmem);
+  void cache_remove(const TreeCursor& cursor, const ZVirtualMemory& vmem);
+  void cache_replace(const TreeCursor& cursor, const ZVirtualMemory& vmem);
+  void cache_update(ZMappedCacheEntry* entry, const ZVirtualMemory& vmem);
 
   enum class RemovalStrategy {
     LowestAddress,
diff --git a/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp b/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp
deleted file mode 100644
index ca38201e53e..00000000000
--- a/test/hotspot/gtest/gc/z/test_zIntrusiveRBTree.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * 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 "gc/z/zIntrusiveRBTree.inline.hpp"
-#include "memory/allocation.hpp"
-#include "memory/arena.hpp"
-#include "nmt/memTag.hpp"
-#include "unittest.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "zunittest.hpp"
-
-#include <limits>
-
-struct ZRBTestEntryCompare {
-  int operator()(const ZIntrusiveRBTreeNode* a, const ZIntrusiveRBTreeNode* b);
-  int operator()(int key, const ZIntrusiveRBTreeNode* entry);
-};
-
-class ZRBTestEntry : public ArenaObj {
-  friend class ZIntrusiveRBTree<int, ZRBTestEntryCompare>;
-
-public:
-  using ZTree = ZIntrusiveRBTree<int, ZRBTestEntryCompare>;
-private:
-  const int   _id;
-  ZIntrusiveRBTreeNode _node;
-
-public:
-  ZRBTestEntry(int id)
-    : _id(id),
-      _node() {}
-
-  int id() const {
-    return _id;
-  }
-
-  static ZIntrusiveRBTreeNode* cast_to_inner(ZRBTestEntry* element) {
-    return &element->_node;
-  }
-  static const ZRBTestEntry* cast_to_outer(const ZIntrusiveRBTreeNode* node) {
-    return (ZRBTestEntry*)((uintptr_t)node - offset_of(ZRBTestEntry, _node));
-  }
-
-};
-
-int ZRBTestEntryCompare::operator()(const ZIntrusiveRBTreeNode* a, const ZIntrusiveRBTreeNode* b) {
-  return ZRBTestEntry::cast_to_outer(a)->id() - ZRBTestEntry::cast_to_outer(b)->id();
-}
-int ZRBTestEntryCompare::operator()(int key, const ZIntrusiveRBTreeNode* entry) {
-  return key - ZRBTestEntry::cast_to_outer(entry)->id();
-}
-
-class ZTreeTest : public ZTest {
-public:
-  void shuffle_array(ZRBTestEntry** beg, ZRBTestEntry** end);
-  void reverse_array(ZRBTestEntry** beg, ZRBTestEntry** end);
-};
-
-class ResettableArena : public Arena {
-public:
-  using Arena::Arena;
-
-  void reset_arena() {
-    if (_chunk != _first) {
-      set_size_in_bytes(_chunk->length());
-      Chunk::next_chop(_first);
-    }
-    _chunk = _first;
-    _hwm = _chunk->bottom();
-    _max = _chunk->top();
-  }
-};
-
-TEST_F(ZTreeTest, test_random) {
-  constexpr size_t sizes[] = {1, 2, 4, 8, 16, 1024, 1024 * 1024};
-  constexpr size_t num_sizes = ARRAY_SIZE(sizes);
-  constexpr size_t iterations_multiplier = 4;
-  constexpr size_t max_allocation_size = sizes[num_sizes - 1] * iterations_multiplier * sizeof(ZRBTestEntry);
-  ResettableArena arena{MemTag::mtTest, Arena::Tag::tag_other, max_allocation_size};
-  for (size_t s : sizes) {
-    ZRBTestEntry::ZTree tree;
-    const size_t num_iterations = s * iterations_multiplier;
-    for (size_t i = 0; i < num_iterations; i++) {
-      if (i % s == 0) {
-        tree.verify_tree();
-      }
-      int id = random() % s;
-      auto cursor = tree.find(id);
-      if (cursor.found()) {
-        // Replace or Remove
-        if (i % 2 == 0) {
-          // Replace
-          if (i % 4 == 0) {
-            // Replace with new
-            tree.replace(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id)), cursor);
-          } else {
-            // Replace with same
-            tree.replace(cursor.node(), cursor);
-          }
-        } else {
-          // Remove
-          tree.remove(cursor);
-        }
-      } else {
-        // Insert
-        tree.insert(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id)), cursor);
-      }
-    }
-    tree.verify_tree();
-    arena.reset_arena();
-  }
-}
-
-void ZTreeTest::reverse_array(ZRBTestEntry** beg, ZRBTestEntry** end) {
-  if (beg == end) {
-    return;
-  }
-
-  ZRBTestEntry** first = beg;
-  ZRBTestEntry** last = end - 1;
-  while (first < last) {
-    ::swap(*first, *last);
-    first++;
-    last--;
-  }
-}
-
-void ZTreeTest::shuffle_array(ZRBTestEntry** beg, ZRBTestEntry** end) {
-  if (beg == end) {
-    return;
-  }
-
-  for (ZRBTestEntry** first = beg + 1; first != end; first++) {
-    const ptrdiff_t distance = first - beg;
-    ASSERT_GE(distance, 0);
-    const ptrdiff_t random_index = random() % (distance + 1);
-    ::swap(*first, *(beg + random_index));
-  }
-}
-
-TEST_F(ZTreeTest, test_insert) {
-  Arena arena(MemTag::mtTest);
-  constexpr size_t num_entries = 1024;
-  ZRBTestEntry* forward[num_entries]{};
-  ZRBTestEntry* reverse[num_entries]{};
-  ZRBTestEntry* shuffle[num_entries]{};
-  for (size_t i = 0; i < num_entries; i++) {
-    const int id = static_cast<int>(i);
-    forward[i] = new (&arena) ZRBTestEntry(id);
-    reverse[i] = new (&arena) ZRBTestEntry(id);
-    shuffle[i] = new (&arena) ZRBTestEntry(id);
-  }
-  reverse_array(reverse, reverse + num_entries);
-  shuffle_array(shuffle, shuffle + num_entries);
-
-  ZRBTestEntry::ZTree forward_tree;
-  auto cursor = forward_tree.root_cursor();
-  for (size_t i = 0; i < num_entries; i++) {
-    ASSERT_TRUE(cursor.is_valid());
-    ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(forward[i]);
-    forward_tree.insert(new_node, cursor);
-    cursor = forward_tree.next_cursor(new_node);
-  }
-  forward_tree.verify_tree();
-
-  ZRBTestEntry::ZTree reverse_tree;
-  cursor = reverse_tree.root_cursor();
-  for (size_t i = 0; i < num_entries; i++) {
-    ASSERT_TRUE(cursor.is_valid());
-    ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(reverse[i]);
-    reverse_tree.insert(new_node, cursor);
-    cursor = reverse_tree.prev_cursor(new_node);
-  }
-  reverse_tree.verify_tree();
-
-  ZRBTestEntry::ZTree shuffle_tree;
-  for (size_t i = 0; i < num_entries; i++) {
-    cursor = shuffle_tree.find(reverse[i]->id());
-    ASSERT_TRUE(cursor.is_valid());
-    ASSERT_FALSE(cursor.found());
-    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(reverse[i]);
-    shuffle_tree.insert(new_node, cursor);
-  }
-  shuffle_tree.verify_tree();
-
-  ZRBTestEntryCompare compare_fn;
-  const ZIntrusiveRBTreeNode* forward_node = forward_tree.first();
-  const ZIntrusiveRBTreeNode* reverse_node = reverse_tree.first();
-  const ZIntrusiveRBTreeNode* shuffle_node = shuffle_tree.first();
-  size_t count = 0;
-  while (true) {
-    count++;
-    ASSERT_EQ(compare_fn(forward_node, reverse_node), 0);
-    ASSERT_EQ(compare_fn(forward_node, shuffle_node), 0);
-    ASSERT_EQ(compare_fn(reverse_node, shuffle_node), 0);
-    const ZIntrusiveRBTreeNode* forward_next_node = forward_node->next();
-    const ZIntrusiveRBTreeNode* reverse_next_node = reverse_node->next();
-    const ZIntrusiveRBTreeNode* shuffle_next_node = shuffle_node->next();
-    if (forward_next_node == nullptr) {
-      ASSERT_EQ(forward_next_node, reverse_next_node);
-      ASSERT_EQ(forward_next_node, shuffle_next_node);
-      ASSERT_EQ(forward_node, forward_tree.last());
-      ASSERT_EQ(reverse_node, reverse_tree.last());
-      ASSERT_EQ(shuffle_node, shuffle_tree.last());
-      break;
-    }
-    ASSERT_LT(compare_fn(forward_node, forward_next_node), 0);
-    ASSERT_LT(compare_fn(reverse_node, reverse_next_node), 0);
-    ASSERT_LT(compare_fn(shuffle_node, shuffle_next_node), 0);
-    forward_node = forward_next_node;
-    reverse_node = reverse_next_node;
-    shuffle_node = shuffle_next_node;
-  }
-  ASSERT_EQ(count, num_entries);
-}
-
-TEST_F(ZTreeTest, test_replace) {
-  Arena arena(MemTag::mtTest);
-  constexpr size_t num_entries = 1024;
-  ZRBTestEntry::ZTree tree;
-  auto cursor = tree.root_cursor();
-  for (size_t i = 0; i < num_entries; i++) {
-    ASSERT_TRUE(cursor.is_valid());
-    ASSERT_FALSE(cursor.found());
-    const int id = static_cast<int>(i) * 2 + 1;
-    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(id));
-    tree.insert(new_node, cursor);
-    cursor = tree.next_cursor(new_node);
-  }
-  tree.verify_tree();
-
-  size_t i = 0;
-  for (auto it = tree.begin(), end = tree.end(); it != end; ++it) {
-    auto& node = *it;
-    if (i % (num_entries / 4)) {
-      tree.verify_tree();
-    }
-    switch (i++ % 4) {
-      case 0: {
-        // Decrement
-        ZRBTestEntry* new_entry = new (&arena) ZRBTestEntry(ZRBTestEntry::cast_to_outer(&node)->id() - 1);
-        it.replace(ZRBTestEntry::cast_to_inner(new_entry));
-      } break;
-      case 1: break;
-      case 2: {
-        // Increment
-        ZRBTestEntry* new_entry = new (&arena) ZRBTestEntry(ZRBTestEntry::cast_to_outer(&node)->id() + 1);
-        it.replace(ZRBTestEntry::cast_to_inner(new_entry));
-      } break;
-      case 3: break;
-      default:
-        ShouldNotReachHere();
-    }
-  }
-  tree.verify_tree();
-
-  int last_id = std::numeric_limits<int>::min();
-  for (auto& node : tree) {
-    int id = ZRBTestEntry::cast_to_outer(&node)->id();
-    ASSERT_LT(last_id, id);
-    last_id = id;
-  }
-  tree.verify_tree();
-
-  last_id = std::numeric_limits<int>::min();
-  for (auto it = tree.begin(), end = tree.end(); it != end; ++it) {
-    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
-    ASSERT_LT(last_id, id);
-    last_id = id;
-  }
-  tree.verify_tree();
-
-  last_id = std::numeric_limits<int>::min();
-  for (auto it = tree.cbegin(), end = tree.cend(); it != end; ++it) {
-    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
-    ASSERT_LT(last_id, id);
-    last_id = id;
-  }
-  tree.verify_tree();
-
-  last_id = std::numeric_limits<int>::max();
-  for (auto it = tree.rbegin(), end = tree.rend(); it != end; ++it) {
-    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
-    ASSERT_GT(last_id, id);
-    last_id = id;
-  }
-  tree.verify_tree();
-
-  last_id = std::numeric_limits<int>::max();
-  for (auto it = tree.crbegin(), end = tree.crend(); it != end; ++it) {
-    int id = ZRBTestEntry::cast_to_outer(&*it)->id();
-    ASSERT_GT(last_id, id);
-    last_id = id;
-  }
-  tree.verify_tree();
-}
-
-TEST_F(ZTreeTest, test_remove) {
-  Arena arena(MemTag::mtTest);
-  constexpr int num_entries = 1024;
-  ZRBTestEntry::ZTree tree;
-  int id = 0;
-  tree.insert(ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(++id)), tree.root_cursor());
-  for (auto& node : tree) {
-    if (ZRBTestEntry::cast_to_outer(&node)->id() == num_entries) {
-      break;
-    }
-    auto cursor = tree.next_cursor(&node);
-    ZIntrusiveRBTreeNode* const new_node = ZRBTestEntry::cast_to_inner(new (&arena) ZRBTestEntry(++id));
-    tree.insert(new_node, cursor);
-  }
-  tree.verify_tree();
-  ASSERT_EQ(ZRBTestEntry::cast_to_outer(tree.last())->id(), num_entries);
-
-  int i = 0;
-  int removed = 0;
-  for (auto it = tree.begin(), end = tree.end(); it != end; ++it) {
-    if (i++ % 2 == 0) {
-      it.remove();
-      ++removed;
-    }
-  }
-  tree.verify_tree();
-
-  int count = 0;
-  for (auto it = tree.cbegin(), end = tree.cend(); it != end; ++it) {
-    ++count;
-  }
-  ASSERT_EQ(count, num_entries - removed);
-  tree.verify_tree();
-
-  for (auto it = tree.rbegin(), end = tree.rend(); it != end; ++it) {
-    if (i++ % 2 == 0) {
-      it.remove();
-      ++removed;
-    }
-  }
-  tree.verify_tree();
-
-  count = 0;
-  for (auto it = tree.cbegin(), end = tree.cend(); it != end; ++it) {
-    ++count;
-  }
-  ASSERT_EQ(count, num_entries - removed);
-  tree.verify_tree();
-
-  for (auto it = tree.begin(), end = tree.end(); it != end; ++it) {
-    it.remove();
-    removed++;
-  }
-  tree.verify_tree();
-
-  ASSERT_EQ(removed, num_entries);
-  ASSERT_EQ(tree.last(), nullptr);
-  ASSERT_EQ(tree.first(), nullptr);
-}

From 50a7755fa45529966373b58652c15975157ab846 Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Wed, 21 May 2025 06:44:54 +0000
Subject: [PATCH 549/901] 8347530: Improve error message with invalid permits
 clauses

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/comp/Attr.java        |  9 ++++--
 .../tools/javac/resources/compiler.properties |  6 +++-
 test/langtools/tools/javac/T8347530.java      | 29 +++++++++++++++++++
 test/langtools/tools/javac/T8347530.out       |  6 ++++
 .../SubtypeDoesntImplementSealed.java         | 29 +++++++++++++++++++
 .../sealed/SealedDiffConfigurationsTest.java  |  2 +-
 .../CyclicHierarchyTest.out                   |  2 +-
 7 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 test/langtools/tools/javac/T8347530.java
 create mode 100644 test/langtools/tools/javac/T8347530.out
 create mode 100644 test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index b4504502b6f..a9293b2d135 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -5475,8 +5475,13 @@ void attribClass(ClassSymbol c) throws CompletionFailure {
                                                         .stream()
                                                         .anyMatch(d -> d.tsym == c);
                             if (!thisIsASuper) {
-                                log.error(TreeInfo.diagnosticPositionFor(subType.tsym, env.tree),
-                                        Errors.InvalidPermitsClause(Fragments.DoesntExtendSealed(subType)));
+                                if(c.isInterface()) {
+                                    log.error(TreeInfo.diagnosticPositionFor(subType.tsym, env.tree),
+                                            Errors.InvalidPermitsClause(Fragments.DoesntImplementSealed(kindName(subType.tsym), subType)));
+                                } else {
+                                    log.error(TreeInfo.diagnosticPositionFor(subType.tsym, env.tree),
+                                            Errors.InvalidPermitsClause(Fragments.DoesntExtendSealed(subType)));
+                                }
                             }
                         }
                     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 2fa158565cc..ead48ee62bf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -3957,7 +3957,11 @@ compiler.misc.is.duplicated=\
 
 # 0: type
 compiler.misc.doesnt.extend.sealed=\
-    subclass {0} must extend sealed class
+    class {0} must extend sealed class
+
+# 0: kind name, 1: type
+compiler.misc.doesnt.implement.sealed=\
+    {0} {1} must extend sealed interface
 
 compiler.misc.must.not.be.same.class=\
     illegal self-reference in permits clause
diff --git a/test/langtools/tools/javac/T8347530.java b/test/langtools/tools/javac/T8347530.java
new file mode 100644
index 00000000000..e4db1eb6031
--- /dev/null
+++ b/test/langtools/tools/javac/T8347530.java
@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8347530
+ * @summary Improve error message with invalid permits clauses
+ * @compile/fail/ref=T8347530.out -XDrawDiagnostics T8347530.java
+ */
+
+class T8347530 {
+    // sealed interfaces
+    sealed interface A0 permits B0 {}
+    class B0 {}     // class {0} must implement sealed interface
+
+    sealed interface A1 permits B1 {}
+    record B1() {}  // record {0} must implement sealed interface
+
+    sealed interface A2 permits B2 {}
+    enum B2 {}      // enum {0} must implement sealed interface
+
+    sealed interface A3 permits B3 {}
+    interface B3 {} // interface {0} must implement sealed interface
+
+    // sealed classes
+    sealed class C0 permits S0 {}
+    class S0 {}     // class {0} must extend sealed class
+
+    // record cannot extend other classes in general
+    // enums cannot extend other classes in general
+    // interfaces cannot extend other classes in general
+}
diff --git a/test/langtools/tools/javac/T8347530.out b/test/langtools/tools/javac/T8347530.out
new file mode 100644
index 00000000000..d1252f39717
--- /dev/null
+++ b/test/langtools/tools/javac/T8347530.out
@@ -0,0 +1,6 @@
+T8347530.java:10:33: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.class, T8347530.B0)
+T8347530.java:13:33: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.record, T8347530.B1)
+T8347530.java:16:33: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.enum, T8347530.B2)
+T8347530.java:19:33: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.interface, T8347530.B3)
+T8347530.java:23:29: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.extend.sealed: T8347530.S0)
+5 errors
diff --git a/test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java b/test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java
new file mode 100644
index 00000000000..223b7dc5ef5
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/SubtypeDoesntImplementSealed.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+// key: compiler.err.invalid.permits.clause
+// key: compiler.misc.doesnt.implement.sealed
+
+sealed interface A3 permits B3 {}
+interface B3 {}
+
diff --git a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
index 30fc23922bb..ddadec7d862 100644
--- a/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
+++ b/test/langtools/tools/javac/sealed/SealedDiffConfigurationsTest.java
@@ -556,7 +556,7 @@ public void testSameModuleSamePkgNeg2(Path base) throws Exception {
                 .getOutputLines(OutputKind.DIRECT);
 
         List<String> expected = List.of(
-                "Sealed.java:1:66: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.extend.sealed: pkg.Sub2)",
+                "Sealed.java:1:66: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.class, pkg.Sub2)",
                 "1 error");
         if (!error.containsAll(expected)) {
             throw new AssertionError("Expected output not found. Found: " + error);
diff --git a/test/langtools/tools/javac/sealed/erroneous_hierarchy/CyclicHierarchyTest.out b/test/langtools/tools/javac/sealed/erroneous_hierarchy/CyclicHierarchyTest.out
index c9420a0dc09..b919e8cce3a 100644
--- a/test/langtools/tools/javac/sealed/erroneous_hierarchy/CyclicHierarchyTest.out
+++ b/test/langtools/tools/javac/sealed/erroneous_hierarchy/CyclicHierarchyTest.out
@@ -1,3 +1,3 @@
-CyclicHierarchyTest.java:9:37: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.extend.sealed: CyclicHierarchyTest.Add)
+CyclicHierarchyTest.java:9:37: compiler.err.invalid.permits.clause: (compiler.misc.doesnt.implement.sealed: kindname.class, CyclicHierarchyTest.Add)
 CyclicHierarchyTest.java:11:55: compiler.err.invalid.permits.clause: (compiler.misc.must.not.be.same.class)
 2 errors

From 91194517c75a96fe7bcc2dcf5e9c42af9cf5975a Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Wed, 21 May 2025 08:07:17 +0000
Subject: [PATCH 550/901] 8355756:
 G1HeapSizingPolicy::full_collection_resize_amount should consider allocation
 size

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 24 +++++++++++--------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  9 ++++---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  2 +-
 src/hotspot/share/gc/g1/g1FullCollector.cpp   |  4 ++--
 src/hotspot/share/gc/g1/g1FullCollector.hpp   |  4 ++--
 .../share/gc/g1/g1HeapSizingPolicy.cpp        | 15 ++++++++++--
 .../share/gc/g1/g1HeapSizingPolicy.hpp        |  4 ++--
 src/hotspot/share/gc/g1/g1VMOperations.cpp    |  3 ++-
 8 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 3c9eaf83cad..6df9383ce22 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -786,12 +786,12 @@ void G1CollectedHeap::verify_before_full_collection() {
   _verifier->verify_bitmap_clear(true /* above_tams_only */);
 }
 
-void G1CollectedHeap::prepare_for_mutator_after_full_collection() {
+void G1CollectedHeap::prepare_for_mutator_after_full_collection(size_t allocation_word_size) {
   // Prepare heap for normal collections.
   assert(num_free_regions() == 0, "we should not have added any free regions");
   rebuild_region_sets(false /* free_list_only */);
   abort_refinement();
-  resize_heap_if_necessary();
+  resize_heap_if_necessary(allocation_word_size);
   uncommit_regions_if_necessary();
 
   // Rebuild the code root lists for each region
@@ -841,7 +841,8 @@ void G1CollectedHeap::verify_after_full_collection() {
 }
 
 bool G1CollectedHeap::do_full_collection(bool clear_all_soft_refs,
-                                         bool do_maximal_compaction) {
+                                         bool do_maximal_compaction,
+                                         size_t allocation_word_size) {
   assert_at_safepoint_on_vm_thread();
 
   const bool do_clear_all_soft_refs = clear_all_soft_refs ||
@@ -853,7 +854,7 @@ bool G1CollectedHeap::do_full_collection(bool clear_all_soft_refs,
 
   collector.prepare_collection();
   collector.collect();
-  collector.complete_collection();
+  collector.complete_collection(allocation_word_size);
 
   // Full collection was successfully completed.
   return true;
@@ -865,25 +866,27 @@ void G1CollectedHeap::do_full_collection(bool clear_all_soft_refs) {
   // out by the GC locker). So, right now, we'll ignore the return value.
 
   do_full_collection(clear_all_soft_refs,
-                     false /* do_maximal_compaction */);
+                     false /* do_maximal_compaction */,
+                     size_t(0) /* allocation_word_size */);
 }
 
 bool G1CollectedHeap::upgrade_to_full_collection() {
   GCCauseSetter compaction(this, GCCause::_g1_compaction_pause);
   log_info(gc, ergo)("Attempting full compaction clearing soft references");
   bool success = do_full_collection(true  /* clear_all_soft_refs */,
-                                    false /* do_maximal_compaction */);
+                                    false /* do_maximal_compaction */,
+                                    size_t(0) /* allocation_word_size */);
   // do_full_collection only fails if blocked by GC locker and that can't
   // be the case here since we only call this when already completed one gc.
   assert(success, "invariant");
   return success;
 }
 
-void G1CollectedHeap::resize_heap_if_necessary() {
+void G1CollectedHeap::resize_heap_if_necessary(size_t allocation_word_size) {
   assert_at_safepoint_on_vm_thread();
 
   bool should_expand;
-  size_t resize_amount = _heap_sizing_policy->full_collection_resize_amount(should_expand);
+  size_t resize_amount = _heap_sizing_policy->full_collection_resize_amount(should_expand, allocation_word_size);
 
   if (resize_amount == 0) {
     return;
@@ -927,8 +930,9 @@ HeapWord* G1CollectedHeap::satisfy_failed_allocation_helper(size_t word_size,
     } else {
       log_info(gc, ergo)("Attempting full compaction");
     }
-    *gc_succeeded = do_full_collection(maximal_compaction /* clear_all_soft_refs */ ,
-                                       maximal_compaction /* do_maximal_compaction */);
+    *gc_succeeded = do_full_collection(maximal_compaction /* clear_all_soft_refs */,
+                                       maximal_compaction /* do_maximal_compaction */,
+                                       word_size /* allocation_word_size */);
   }
 
   return nullptr;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 0d5eec940c1..f9c9525c675 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -477,10 +477,13 @@ class G1CollectedHeap : public CollectedHeap {
   //   cleared during the GC.
   // - if do_maximal_compaction is true, full gc will do a maximally
   //   compacting collection, leaving no dead wood.
+  // - if allocation_word_size is set, then this allocation size will
+  //    be accounted for in case shrinking of the heap happens.
   // - it returns false if it is unable to do the collection due to the
   //   GC locker being active, true otherwise.
   bool do_full_collection(bool clear_all_soft_refs,
-                          bool do_maximal_compaction);
+                          bool do_maximal_compaction,
+                          size_t allocation_word_size);
 
   // Callback from VM_G1CollectFull operation, or collect_as_vm_thread.
   void do_full_collection(bool clear_all_soft_refs) override;
@@ -498,7 +501,7 @@ class G1CollectedHeap : public CollectedHeap {
   bool abort_concurrent_cycle();
   void verify_before_full_collection();
   void prepare_heap_for_full_collection();
-  void prepare_for_mutator_after_full_collection();
+  void prepare_for_mutator_after_full_collection(size_t allocation_word_size);
   void abort_refinement();
   void verify_after_full_collection();
   void print_heap_after_full_collection();
@@ -557,7 +560,7 @@ class G1CollectedHeap : public CollectedHeap {
   void pin_object(JavaThread* thread, oop obj) override;
   void unpin_object(JavaThread* thread, oop obj) override;
 
-  void resize_heap_if_necessary();
+  void resize_heap_if_necessary(size_t allocation_word_size);
 
   // Check if there is memory to uncommit and if so schedule a task to do it.
   void uncommit_regions_if_necessary();
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 07b5afcf987..5daadc18a56 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1461,7 +1461,7 @@ void G1ConcurrentMark::remark() {
     // GC pause.
     _g1h->increment_total_collections();
 
-    _g1h->resize_heap_if_necessary();
+    _g1h->resize_heap_if_necessary(size_t(0) /* allocation_word_size */);
     _g1h->uncommit_regions_if_necessary();
 
     compute_new_sizes();
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
index a1e1d152fd8..9255efa9f2c 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -228,7 +228,7 @@ void G1FullCollector::collect() {
   G1CollectedHeap::finish_codecache_marking_cycle();
 }
 
-void G1FullCollector::complete_collection() {
+void G1FullCollector::complete_collection(size_t allocation_word_size) {
   // Restore all marks.
   restore_marks();
 
@@ -242,7 +242,7 @@ void G1FullCollector::complete_collection() {
   // Prepare the bitmap for the next (potentially concurrent) marking.
   _heap->concurrent_mark()->clear_bitmap(_heap->workers());
 
-  _heap->prepare_for_mutator_after_full_collection();
+  _heap->prepare_for_mutator_after_full_collection(allocation_word_size);
 
   _heap->resize_all_tlabs();
 
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp
index b39acf7c0dd..f1ad57075da 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.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
@@ -107,7 +107,7 @@ class G1FullCollector : StackObj {
 
   void prepare_collection();
   void collect();
-  void complete_collection();
+  void complete_collection(size_t allocation_word_size);
 
   G1FullGCScope*           scope() { return &_scope; }
   uint                     workers() { return _num_workers; }
diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
index c35ce7c356d..71e25177166 100644
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
@@ -220,11 +220,22 @@ static size_t target_heap_capacity(size_t used_bytes, uintx free_ratio) {
   return (size_t) desired_capacity_d;
 }
 
-size_t G1HeapSizingPolicy::full_collection_resize_amount(bool& expand) {
+size_t G1HeapSizingPolicy::full_collection_resize_amount(bool& expand, size_t allocation_word_size) {
+  // If the full collection was triggered by an allocation failure, we should account
+  // for the bytes required for this allocation under used_after_gc. This prevents
+  // unnecessary shrinking that would be followed by an expand call to satisfy the
+  // allocation.
+  size_t allocation_bytes = allocation_word_size * HeapWordSize;
+  if (_g1h->is_humongous(allocation_word_size)) {
+    // Humongous objects are allocated in entire regions, we must calculate
+    // required space in terms of full regions, not just the object size.
+    allocation_bytes = G1HeapRegion::align_up_to_region_byte_size(allocation_bytes);
+  }
+
   // Capacity, free and used after the GC counted as full regions to
   // include the waste in the following calculations.
   const size_t capacity_after_gc = _g1h->capacity();
-  const size_t used_after_gc = capacity_after_gc -
+  const size_t used_after_gc = capacity_after_gc + allocation_bytes -
                                _g1h->unused_committed_regions_in_bytes() -
                                // Discount space used by current Eden to establish a
                                // situation during Remark similar to at the end of full
diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
index 9a0ec12e085..4ee302403ed 100644
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, 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
@@ -58,7 +58,7 @@ class G1HeapSizingPolicy: public CHeapObj<mtGC> {
 
   // Returns the amount of bytes to resize the heap; if expand is set, the heap
   // should by expanded by that amount, shrunk otherwise.
-  size_t full_collection_resize_amount(bool& expand);
+  size_t full_collection_resize_amount(bool& expand, size_t allocation_word_size);
   // Clear ratio tracking data used by expansion_amount().
   void clear_ratio_check_data();
 
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index eec31fafa9c..c1d0e5ab433 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -51,7 +51,8 @@ void VM_G1CollectFull::doit() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
   GCCauseSetter x(g1h, _gc_cause);
   g1h->do_full_collection(false /* clear_all_soft_refs */,
-                          false /* do_maximal_compaction */);
+                          false /* do_maximal_compaction */,
+                          size_t(0) /* allocation_word_size */);
 }
 
 VM_G1TryInitiateConcMark::VM_G1TryInitiateConcMark(uint gc_count_before,

From a0cdf36bdfeca9cd8b669859700d63d5ee627458 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 21 May 2025 08:39:43 +0000
Subject: [PATCH 551/901] 8357224: Avoid redundant WeakHashMap.get in
 Toolkit.removeAWTEventListener

Reviewed-by: liach, aivanov, serb
---
 src/java.desktop/share/classes/java/awt/Toolkit.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index b93f9e98fde..cc664f03cb1 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1632,7 +1632,7 @@ public boolean isAlwaysOnTopSupported() {
     private int[] calls = new int[LONG_BITS];
     private static volatile long enabledOnToolkitMask;
     private AWTEventListener eventListener = null;
-    private WeakHashMap<AWTEventListener, SelectiveAWTEventListener> listener2SelectiveListener = new WeakHashMap<>();
+    private final WeakHashMap<AWTEventListener, SelectiveAWTEventListener> listener2SelectiveListener = new WeakHashMap<>();
 
     /*
      * Extracts a "pure" AWTEventListener from a AWTEventListenerProxy,
@@ -1741,10 +1741,9 @@ public void removeAWTEventListener(AWTEventListener listener) {
 
         synchronized (this) {
             SelectiveAWTEventListener selectiveListener =
-                listener2SelectiveListener.get(localL);
+                listener2SelectiveListener.remove(localL);
 
             if (selectiveListener != null) {
-                listener2SelectiveListener.remove(localL);
                 int[] listenerCalls = selectiveListener.getCalls();
                 for (int i=0; i<LONG_BITS; i++) {
                     calls[i] -= listenerCalls[i];

From 735c7899d124a4e0c9579ea7802c9475eaedda10 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Wed, 21 May 2025 08:54:19 +0000
Subject: [PATCH 552/901] 8334717: Add JVMCI support for APX EGPRs

Reviewed-by: dnsimon
---
 .../classes/jdk/vm/ci/aarch64/AArch64.java    |  28 +----
 .../share/classes/jdk/vm/ci/amd64/AMD64.java  |  75 ++++++++-----
 .../classes/jdk/vm/ci/code/Architecture.java  |  11 +-
 .../jdk/vm/ci/code/CallingConvention.java     |  24 ++--
 .../classes/jdk/vm/ci/code/RegisterArray.java | 106 ------------------
 .../jdk/vm/ci/code/RegisterAttributes.java    |  12 +-
 .../jdk/vm/ci/code/RegisterConfig.java        |  15 +--
 .../AArch64HotSpotJVMCIBackendFactory.java    |  42 ++-----
 .../aarch64/AArch64HotSpotRegisterConfig.java |  56 +++++----
 .../aarch64/AArch64HotSpotVMConfig.java       |  28 +----
 .../AMD64HotSpotJVMCIBackendFactory.java      |  37 ++----
 .../amd64/AMD64HotSpotRegisterConfig.java     |  72 ++++++------
 .../hotspot/amd64/AMD64HotSpotVMConfig.java   |  54 ---------
 .../RISCV64HotSpotJVMCIBackendFactory.java    |  47 ++------
 .../riscv64/RISCV64HotSpotRegisterConfig.java |  56 +++++----
 .../riscv64/RISCV64HotSpotVMConfig.java       |  16 +--
 .../classes/jdk/vm/ci/riscv64/RISCV64.java    |  32 +-----
 .../jvmci/common/CodeInstallerTest.java       |   6 +-
 .../test/aarch64/AArch64TestAssembler.java    |   9 +-
 .../code/test/amd64/AMD64TestAssembler.java   |   9 +-
 .../test/riscv64/RISCV64TestAssembler.java    |   9 +-
 21 files changed, 227 insertions(+), 517 deletions(-)
 delete mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterArray.java

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
index dbd83b314c9..66aed480bbb 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
@@ -24,12 +24,12 @@
 
 import java.nio.ByteOrder;
 import java.util.EnumSet;
+import java.util.List;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CPUFeatureName;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -92,7 +92,7 @@ public class AArch64 extends Architecture {
     public static final Register rscratch2 = r9;
 
     // @formatter:off
-    public static final RegisterArray cpuRegisters = new RegisterArray(
+    public static final List<Register> cpuRegisters = List.of(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
@@ -138,7 +138,7 @@ public class AArch64 extends Architecture {
     public static final Register v31 = new Register(65, 31, "v31", SIMD);
 
     // @formatter:off
-    public static final RegisterArray simdRegisters = new RegisterArray(
+    public static final List<Register> simdRegisters = List.of(
         v0,  v1,  v2,  v3,  v4,  v5,  v6,  v7,
         v8,  v9,  v10, v11, v12, v13, v14, v15,
         v16, v17, v18, v19, v20, v21, v22, v23,
@@ -147,7 +147,7 @@ public class AArch64 extends Architecture {
     // @formatter:on
 
     // @formatter:off
-    public static final RegisterArray allRegisters = new RegisterArray(
+    public static final List<Register> allRegisters = List.of(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
@@ -189,23 +189,9 @@ public enum CPUFeature implements CPUFeatureName {
 
     private final EnumSet<CPUFeature> features;
 
-    /**
-     * Set of flags to control code emission.
-     */
-    public enum Flag {
-        UseCRC32,
-        UseSIMDForMemoryOps,
-        AvoidUnalignedAccesses,
-        UseLSE,
-        UseBlockZeroing
-    }
-
-    private final EnumSet<Flag> flags;
-
-    public AArch64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
+    public AArch64(EnumSet<CPUFeature> features) {
         super("aarch64", AArch64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, 0, 0, 0);
         this.features = features;
-        this.flags = flags;
     }
 
     @Override
@@ -213,10 +199,6 @@ public EnumSet<CPUFeature> getFeatures() {
         return features;
     }
 
-    public EnumSet<Flag> getFlags() {
-        return flags;
-    }
-
     @Override
     public PlatformKind getPlatformKind(JavaKind javaKind) {
         switch (javaKind) {
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
index c75b3d9f9ce..dbb27c7d7ec 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
@@ -29,12 +29,12 @@
 
 import java.nio.ByteOrder;
 import java.util.EnumSet;
+import java.util.List;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CPUFeatureName;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -86,10 +86,17 @@ public class AMD64 extends Architecture {
     public static final Register r31 = new Register(31, 31, "r31", CPU);
 
     // The set of common CPU registers available on all x64 platforms.
-    public static final Register[] cpuRegisters = {
+    public static final List<Register> cpuRegisters = List.of(
         rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi,
         r8, r9, r10, r11, r12, r13, r14, r15
-    };
+    );
+
+    public static final List<Register> cpuRegistersAPX = List.of(
+        rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi,
+         r8,  r9, r10, r11, r12, r13, r14, r15,
+        r16, r17, r18, r19, r20, r21, r22, r23,
+        r24, r25, r26, r27, r28, r29, r30, r31
+    );
 
     public static final RegisterCategory XMM = new RegisterCategory("XMM");
 
@@ -130,17 +137,17 @@ public class AMD64 extends Architecture {
     public static final Register xmm30 = new Register(62, 30, "xmm30", XMM);
     public static final Register xmm31 = new Register(63, 31, "xmm31", XMM);
 
-    public static final Register[] xmmRegistersSSE = {
+    public static final List<Register> xmmRegistersSSE = List.of(
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
-    };
+    );
 
-    public static final Register[] xmmRegistersAVX512 = {
+    public static final List<Register> xmmRegistersAVX512 = List.of(
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
         xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23,
         xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31
-    };
+    );
 
     public static final RegisterCategory MASK = new RegisterCategory("MASK", false);
 
@@ -153,14 +160,14 @@ public class AMD64 extends Architecture {
     public static final Register k6 = new Register(70, 6, "k6", MASK);
     public static final Register k7 = new Register(71, 7, "k7", MASK);
 
-    public static final RegisterArray valueRegistersSSE = new RegisterArray(
+    public static final List<Register> valueRegistersSSE = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
     );
 
-    public static final RegisterArray valueRegistersAVX512 = new RegisterArray(
+    public static final List<Register> valueRegistersAVX512 = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
@@ -170,12 +177,33 @@ public class AMD64 extends Architecture {
         k0, k1, k2, k3, k4, k5, k6, k7
     );
 
+    public static final List<Register> valueRegistersSSEAndAPX = List.of(
+        rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
+        r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
+        r24,  r25,  r26,   r27,   r28,   r29,   r30,   r31,
+        xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
+        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
+    );
+
+    public static final List<Register> valueRegistersAVX512AndAPX = List.of(
+        rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
+        r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
+        r24,  r25,  r26,   r27,   r28,   r29,   r30,   r31,
+        xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
+        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
+        xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23,
+        xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31,
+        k0, k1, k2, k3, k4, k5, k6, k7
+    );
+
     /**
      * Register used to construct an instruction-relative address.
      */
     public static final Register rip = new Register(72, -1, "rip", SPECIAL);
 
-    public static final RegisterArray allRegisters = new RegisterArray(
+    public static final List<Register> allRegisters = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
@@ -264,24 +292,13 @@ public enum CPUFeature implements CPUFeatureName {
 
     private final EnumSet<CPUFeature> features;
 
-    /**
-     * Set of flags to control code emission.
-     */
-    public enum Flag {
-        UseCountLeadingZerosInstruction,
-        UseCountTrailingZerosInstruction
-    }
-
-    private final EnumSet<Flag> flags;
-
     private final AMD64Kind largestKind;
 
     private final AMD64Kind largestMaskKind;
 
-    public AMD64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
+    public AMD64(EnumSet<CPUFeature> features) {
         super("AMD64", AMD64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, LOAD_LOAD | LOAD_STORE | STORE_STORE, 1, 8);
         this.features = features;
-        this.flags = flags;
         assert features.contains(CPUFeature.SSE2) : "minimum config for x64";
 
         if (features.contains(CPUFeature.AVX512F)) {
@@ -305,13 +322,15 @@ public EnumSet<CPUFeature> getFeatures() {
         return features;
     }
 
-    public EnumSet<Flag> getFlags() {
-        return flags;
-    }
-
     @Override
-    public RegisterArray getAvailableValueRegisters() {
-        if (features.contains(CPUFeature.AVX512F)) {
+    public List<Register> getAvailableValueRegisters() {
+        if (features.contains(CPUFeature.APX_F)) {
+            if (features.contains(CPUFeature.AVX512F)) {
+                return valueRegistersAVX512AndAPX;
+            } else {
+                return valueRegistersSSEAndAPX;
+            }
+        } else if (features.contains(CPUFeature.AVX512F)) {
             return valueRegistersAVX512;
         } else {
             return valueRegistersSSE;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
index f8cb10cf29b..187c1d72c61 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.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
@@ -23,6 +23,7 @@
 package jdk.vm.ci.code;
 
 import java.nio.ByteOrder;
+import java.util.List;
 import java.util.Set;
 
 import jdk.vm.ci.code.Register.RegisterCategory;
@@ -50,7 +51,7 @@ public abstract class Architecture {
      * List of all available registers on this architecture. The index of each register in this list
      * is equal to its {@linkplain Register#number number}.
      */
-    private final RegisterArray registers;
+    private final List<Register> registers;
 
     /**
      * The byte ordering can be either little or big endian.
@@ -79,7 +80,7 @@ public abstract class Architecture {
      */
     private final int returnAddressSize;
 
-    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, RegisterArray registers, int implicitMemoryBarriers,
+    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, List<Register> registers, int implicitMemoryBarriers,
                     int nativeCallDisplacementOffset,
                     int returnAddressSize) {
         // registers is expected to mention all registers in order of their encoding.
@@ -144,7 +145,7 @@ public String getName() {
      * this particular architecture instance. The index of each register in this list is equal to
      * its {@linkplain Register#number number}.
      */
-    public RegisterArray getRegisters() {
+    public List<Register> getRegisters() {
         return registers;
     }
 
@@ -152,7 +153,7 @@ public RegisterArray getRegisters() {
      * Gets a list of all registers available for storing values on this architecture. This may be a
      * subset of {@link #getRegisters()}, depending on the capabilities of this particular CPU.
      */
-    public RegisterArray getAvailableValueRegisters() {
+    public List<Register> getAvailableValueRegisters() {
         return getRegisters();
     }
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CallingConvention.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CallingConvention.java
index 1c839e9ba54..df87a5408c0 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CallingConvention.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CallingConvention.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, 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
@@ -27,6 +27,8 @@
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
 
+import java.util.List;
+
 /**
  * A calling convention describes the locations in which the arguments for a call are placed and the
  * location in which the return value is placed if the call is not void.
@@ -49,7 +51,7 @@ public interface Type {
     /**
      * The ordered locations in which the arguments are placed.
      */
-    private final AllocatableValue[] argumentLocations;
+    private final List<AllocatableValue> argumentLocations;
 
     /**
      * Creates a description of the registers and stack locations used by a call.
@@ -63,7 +65,7 @@ public interface Type {
     public CallingConvention(int stackSize, AllocatableValue returnLocation, AllocatableValue... argumentLocations) {
         assert argumentLocations != null;
         assert returnLocation != null;
-        this.argumentLocations = argumentLocations;
+        this.argumentLocations = List.of(argumentLocations);
         this.stackSize = stackSize;
         this.returnLocation = returnLocation;
         assert verify();
@@ -80,7 +82,7 @@ public AllocatableValue getReturn() {
      * Gets the location for the {@code index}'th argument.
      */
     public AllocatableValue getArgument(int index) {
-        return argumentLocations[index];
+        return argumentLocations.get(index);
     }
 
     /**
@@ -94,18 +96,14 @@ public int getStackSize() {
      * Gets the number of locations required for the arguments.
      */
     public int getArgumentCount() {
-        return argumentLocations.length;
+        return argumentLocations.size();
     }
 
     /**
      * Gets the locations required for the arguments.
      */
-    @SuppressFBWarnings(value = "EI_EXPOSE_REP", justification = "FB false positive")
-    public AllocatableValue[] getArguments() {
-        if (argumentLocations.length == 0) {
-            return argumentLocations;
-        }
-        return argumentLocations.clone();
+    public List<AllocatableValue> getArguments() {
+        return argumentLocations;
     }
 
     @Override
@@ -125,8 +123,8 @@ public String toString() {
     }
 
     private boolean verify() {
-        for (int i = 0; i < argumentLocations.length; i++) {
-            Value location = argumentLocations[i];
+        for (int i = 0; i < argumentLocations.size(); i++) {
+            Value location = argumentLocations.get(i);
             assert isStackSlot(location) || isAllocatableValue(location);
         }
         return true;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterArray.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterArray.java
deleted file mode 100644
index c2a9ece3f0b..00000000000
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterArray.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.vm.ci.code;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * An immutable ordered list of registers. Only required because Java lacks immutable arrays.
- */
-public final class RegisterArray implements Iterable<Register> {
-
-    private final Register[] registers;
-    private int hash;
-
-    public RegisterArray(Register... registers) {
-        this.registers = registers;
-    }
-
-    public RegisterArray(Collection<Register> registers) {
-        this.registers = registers.toArray(new Register[registers.size()]);
-    }
-
-    /**
-     * Gets the number of registers.
-     */
-    public int size() {
-        return registers.length;
-    }
-
-    /**
-     * Gets the register at a given index.
-     *
-     * @param index the index of the register to retrieve
-     */
-    public Register get(int index) {
-        return registers[index];
-    }
-
-    public void addTo(Collection<Register> collection) {
-        collection.addAll(Arrays.asList(registers));
-    }
-
-    /**
-     * Gets an immutable view of the registers as a list.
-     */
-    public List<Register> asList() {
-        return Collections.unmodifiableList(Arrays.asList(registers));
-    }
-
-    /**
-     * Gets a copy of the registers as an array.
-     */
-    public Register[] toArray() {
-        return registers.clone();
-    }
-
-    @Override
-    public Iterator<Register> iterator() {
-        return Arrays.asList(registers).iterator();
-    }
-
-    @Override
-    public int hashCode() {
-        if (hash == 0 && registers.length > 0) {
-            hash = Arrays.hashCode(registers);
-        }
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof RegisterArray) {
-            return Arrays.equals(registers, ((RegisterArray) obj).registers);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return Arrays.toString(registers);
-    }
-}
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterAttributes.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterAttributes.java
index cde1df0bfc5..65268774484 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterAttributes.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 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
@@ -55,11 +55,11 @@ public RegisterAttributes(boolean isCallerSave, boolean isCalleeSave, boolean is
      * @return an array whose length is the max register number in {@code registers} plus 1. An
      *         element at index i holds the attributes of the register whose number is i.
      */
-    public static RegisterAttributes[] createMap(RegisterConfig registerConfig, RegisterArray registers) {
+    public static List<RegisterAttributes> createMap(RegisterConfig registerConfig, List<Register> registers) {
         RegisterAttributes[] map = new RegisterAttributes[registers.size()];
-        List<Register> callerSaveRegisters = registerConfig.getCallerSaveRegisters().asList();
-        List<Register> calleeSaveRegisters = registerConfig.getCalleeSaveRegisters() == null ? Collections.emptyList() : registerConfig.getCalleeSaveRegisters().asList();
-        List<Register> allocatableRegisters = registerConfig.getAllocatableRegisters().asList();
+        List<Register> callerSaveRegisters = registerConfig.getCallerSaveRegisters();
+        List<Register> calleeSaveRegisters = registerConfig.getCalleeSaveRegisters() == null ? Collections.emptyList() : registerConfig.getCalleeSaveRegisters();
+        List<Register> allocatableRegisters = registerConfig.getAllocatableRegisters();
         for (Register reg : registers) {
             if (reg != null) {
                 RegisterAttributes attr = new RegisterAttributes(callerSaveRegisters.contains(reg), calleeSaveRegisters.contains(reg), allocatableRegisters.contains(reg));
@@ -74,7 +74,7 @@ public static RegisterAttributes[] createMap(RegisterConfig registerConfig, Regi
                 map[i] = NONE;
             }
         }
-        return map;
+        return List.of(map);
     }
 
     /**
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
index 525930c8f3b..0cc1980b28f 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterConfig.java
@@ -22,6 +22,7 @@
  */
 package jdk.vm.ci.code;
 
+import java.util.List;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
@@ -71,28 +72,28 @@ default int getMaximumFrameSize() {
      * @return the ordered set of registers that may be used to pass parameters in a call conforming
      *         to {@code type}
      */
-    RegisterArray getCallingConventionRegisters(Type type, JavaKind kind);
+    List<Register> getCallingConventionRegisters(Type type, JavaKind kind);
 
     /**
      * Gets the set of all registers that might be used by the register allocator.
      */
-    RegisterArray getAllocatableRegisters();
+    List<Register> getAllocatableRegisters();
 
     /**
      * Filters a set of registers and returns only those that can be used by the register allocator
      * for a value of a particular kind.
      */
-    RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers);
+    List<Register> filterAllocatableRegisters(PlatformKind kind, List<Register> registers);
 
     /**
      * Gets the registers whose values must be preserved by a method across any call it makes.
      */
-    RegisterArray getCallerSaveRegisters();
+    List<Register> getCallerSaveRegisters();
 
     /**
      * Gets the registers whose values must be preserved by the callee.
      */
-    RegisterArray getCalleeSaveRegisters();
+    List<Register> getCalleeSaveRegisters();
 
     /**
      * Returns the storage kind for a callee-save register, which determines how the register is
@@ -108,10 +109,10 @@ default PlatformKind getCalleeSaveRegisterStorageKind(Architecture arch, Registe
      * Gets a map from register {@linkplain Register#number numbers} to register
      * {@linkplain RegisterAttributes attributes} for this register configuration.
      *
-     * @return an array where an element at index i holds the attributes of the register whose
+     * @return a list where an element at index i holds the attributes of the register whose
      *         number is i
      */
-    RegisterAttributes[] getAttributesMap();
+    List<RegisterAttributes> getAttributesMap();
 
     /**
      * Determines if all {@link #getAllocatableRegisters() allocatable} registers are
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
index 890a3357678..19c161d6bde 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.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
@@ -52,33 +52,11 @@ private static EnumSet<AArch64.CPUFeature> computeFeatures(AArch64HotSpotVMConfi
         return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, emptyMap());
     }
 
-    private static EnumSet<AArch64.Flag> computeFlags(AArch64HotSpotVMConfig config) {
-        EnumSet<AArch64.Flag> flags = EnumSet.noneOf(AArch64.Flag.class);
-
-        if (config.useCRC32) {
-            flags.add(AArch64.Flag.UseCRC32);
-        }
-        if (config.useSIMDForMemoryOps) {
-            flags.add(AArch64.Flag.UseSIMDForMemoryOps);
-        }
-        if (config.avoidUnalignedAccesses) {
-            flags.add(AArch64.Flag.AvoidUnalignedAccesses);
-        }
-        if (config.useLSE) {
-            flags.add(AArch64.Flag.UseLSE);
-        }
-        if (config.useBlockZeroing) {
-            flags.add(AArch64.Flag.UseBlockZeroing);
-        }
-
-        return flags;
-    }
-
     private static TargetDescription createTarget(AArch64HotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = true;
-        Architecture arch = new AArch64(computeFeatures(config), computeFlags(config));
+        Architecture arch = new AArch64(computeFeatures(config));
         return new TargetDescription(arch, true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects);
     }
 
@@ -113,9 +91,7 @@ public String toString() {
     }
 
     @Override
-    @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend host) {
-
         assert host == null;
         AArch64HotSpotVMConfig config = new AArch64HotSpotVMConfig(runtime.getConfigStore());
         TargetDescription target = createTarget(config);
@@ -125,24 +101,24 @@ public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend
         ConstantReflectionProvider constantReflection;
         HotSpotMetaAccessProvider metaAccess;
         StackIntrospection stackIntrospection;
-        try (InitTimer t = timer("create providers")) {
-            try (InitTimer rt = timer("create MetaAccess provider")) {
+        try (InitTimer _ = timer("create providers")) {
+            try (InitTimer _ = timer("create MetaAccess provider")) {
                 metaAccess = createMetaAccess(runtime);
             }
-            try (InitTimer rt = timer("create RegisterConfig")) {
+            try (InitTimer _ = timer("create RegisterConfig")) {
                 regConfig = createRegisterConfig(config, target);
             }
-            try (InitTimer rt = timer("create CodeCache provider")) {
+            try (InitTimer _ = timer("create CodeCache provider")) {
                 codeCache = createCodeCache(runtime, target, regConfig);
             }
-            try (InitTimer rt = timer("create ConstantReflection provider")) {
+            try (InitTimer _ = timer("create ConstantReflection provider")) {
                 constantReflection = createConstantReflection(runtime);
             }
-            try (InitTimer rt = timer("create StackIntrospection provider")) {
+            try (InitTimer _ = timer("create StackIntrospection provider")) {
                 stackIntrospection = new HotSpotStackIntrospection(runtime);
             }
         }
-        try (InitTimer rt = timer("instantiate backend")) {
+        try (InitTimer _ = timer("instantiate backend")) {
             return createBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
         }
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
index 0786ddcc087..3ca3ea68edf 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotRegisterConfig.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
@@ -60,7 +60,6 @@
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -79,24 +78,24 @@ public class AArch64HotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final RegisterArray allocatable;
+    private final List<Register> allocatable;
 
     /**
      * The caller saved registers always include all parameter registers.
      */
-    private final RegisterArray callerSaved;
+    private final List<Register> callerSaved;
 
     private final boolean allAllocatableAreCallerSaved;
 
-    private final RegisterAttributes[] attributesMap;
+    private final List<RegisterAttributes> attributesMap;
 
     @Override
-    public RegisterArray getAllocatableRegisters() {
+    public List<Register> getAllocatableRegisters() {
         return allocatable;
     }
 
     @Override
-    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
+    public List<Register> filterAllocatableRegisters(PlatformKind kind, List<Register> registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
@@ -104,17 +103,17 @@ public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray
             }
         }
 
-        return new RegisterArray(list);
+        return List.copyOf(list);
     }
 
     @Override
-    public RegisterAttributes[] getAttributesMap() {
-        return attributesMap.clone();
+    public List<RegisterAttributes> getAttributesMap() {
+        return attributesMap;
     }
 
-    private final RegisterArray javaGeneralParameterRegisters = new RegisterArray(r1, r2, r3, r4, r5, r6, r7, r0);
-    private final RegisterArray nativeGeneralParameterRegisters = new RegisterArray(r0, r1, r2, r3, r4, r5, r6, r7);
-    private final RegisterArray simdParameterRegisters = new RegisterArray(v0, v1, v2, v3, v4, v5, v6, v7);
+    private final List<Register> javaGeneralParameterRegisters = List.of(r1, r2, r3, r4, r5, r6, r7, r0);
+    private final List<Register> nativeGeneralParameterRegisters = List.of(r0, r1, r2, r3, r4, r5, r6, r7);
+    private final List<Register> simdParameterRegisters = List.of(v0, v1, v2, v3, v4, v5, v6, v7);
 
     public static final Register inlineCacheRegister = rscratch2;
 
@@ -133,16 +132,15 @@ public RegisterAttributes[] getAttributesMap() {
     public static final Register threadRegister = r28;
     public static final Register fp = r29;
 
-    private static final RegisterArray reservedRegisters = new RegisterArray(rscratch1, rscratch2, threadRegister, fp, lr, r31, zr, sp);
+    private static final List<Register> reservedRegisters = List.of(rscratch1, rscratch2, threadRegister, fp, lr, r31, zr, sp);
 
-    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase, boolean canUsePlatformRegister) {
-        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+    private static List<Register> initAllocatable(Architecture arch, boolean reserveForHeapBase, boolean canUsePlatformRegister) {
+        List<Register> allRegisters = arch.getAvailableValueRegisters();
         Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0) - (!canUsePlatformRegister ? 1 : 0)];
-        List<Register> reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
-            if (reservedRegistersList.contains(reg)) {
+            if (reservedRegisters.contains(reg)) {
                 // skip reserved registers
                 continue;
             }
@@ -159,7 +157,7 @@ private static RegisterArray initAllocatable(Architecture arch, boolean reserveF
         }
 
         assert idx == registers.length;
-        return new RegisterArray(registers);
+        return List.of(registers);
     }
 
     public AArch64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops, boolean canUsePlatformRegister) {
@@ -167,28 +165,28 @@ public AArch64HotSpotRegisterConfig(TargetDescription target, boolean useCompres
         assert callerSaved.size() >= allocatable.size();
     }
 
-    public AArch64HotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable) {
+    public AArch64HotSpotRegisterConfig(TargetDescription target, List<Register> allocatable) {
         this.target = target;
 
         this.allocatable = allocatable;
         Set<Register> callerSaveSet = new HashSet<>();
-        allocatable.addTo(callerSaveSet);
-        simdParameterRegisters.addTo(callerSaveSet);
-        javaGeneralParameterRegisters.addTo(callerSaveSet);
-        nativeGeneralParameterRegisters.addTo(callerSaveSet);
-        callerSaved = new RegisterArray(callerSaveSet);
+        callerSaveSet.addAll(allocatable);
+        callerSaveSet.addAll(simdParameterRegisters);
+        callerSaveSet.addAll(javaGeneralParameterRegisters);
+        callerSaveSet.addAll(nativeGeneralParameterRegisters);
+        callerSaved = List.copyOf(callerSaveSet);
 
         allAllocatableAreCallerSaved = true;
         attributesMap = RegisterAttributes.createMap(this, AArch64.allRegisters);
     }
 
     @Override
-    public RegisterArray getCallerSaveRegisters() {
+    public List<Register> getCallerSaveRegisters() {
         return callerSaved;
     }
 
     @Override
-    public RegisterArray getCalleeSaveRegisters() {
+    public List<Register> getCalleeSaveRegisters() {
         return null;
     }
 
@@ -209,7 +207,7 @@ public CallingConvention getCallingConvention(Type type, JavaType returnType, Ja
     }
 
     @Override
-    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
+    public List<Register> getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -249,7 +247,7 @@ private int parseDarwinNativeStackArg(ValueKind<?> valueKind, AllocatableValue[]
         return currentStackOffset;
     }
 
-    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+    private CallingConvention callingConvention(List<Register> generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
                     ValueKindFactory<?> valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
index a388687c69a..206909895fa 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotVMConfig.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
@@ -37,31 +37,5 @@ class AArch64HotSpotVMConfig extends HotSpotVMConfigAccess {
     }
 
     final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
-
-    // CPU Capabilities
-
-    /*
-     * These flags are set based on the corresponding command line flags.
-     */
-    final boolean useCRC32 = getFlag("UseCRC32", Boolean.class);
-    final boolean useSIMDForMemoryOps = getFlag("UseSIMDForMemoryOps", Boolean.class);
-    final boolean avoidUnalignedAccesses = getFlag("AvoidUnalignedAccesses", Boolean.class);
-    final boolean useLSE = getFlag("UseLSE", Boolean.class);
-    final boolean useBlockZeroing = getFlag("UseBlockZeroing", Boolean.class);
-
     final long vmVersionFeatures = getFieldValue("Abstract_VM_Version::_features", Long.class, "uint64_t");
-
-    /*
-     * These flags are set if the corresponding support is in the hardware.
-     */
-    final long aarch64FP = getConstant("VM_Version::CPU_FP", Long.class);
-    final long aarch64ASIMD = getConstant("VM_Version::CPU_ASIMD", Long.class);
-    final long aarch64EVTSTRM = getConstant("VM_Version::CPU_EVTSTRM", Long.class);
-    final long aarch64AES = getConstant("VM_Version::CPU_AES", Long.class);
-    final long aarch64PMULL = getConstant("VM_Version::CPU_PMULL", Long.class);
-    final long aarch64SHA1 = getConstant("VM_Version::CPU_SHA1", Long.class);
-    final long aarch64SHA2 = getConstant("VM_Version::CPU_SHA2", Long.class);
-    final long aarch64CRC32 = getConstant("VM_Version::CPU_CRC32", Long.class);
-    final long aarch64LSE = getConstant("VM_Version::CPU_LSE", Long.class);
-    final long aarch64A53MAC = getConstant("VM_Version::CPU_A53MAC", Long.class);
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
index 658bafea36d..040f39e3b8a 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java
@@ -26,7 +26,7 @@
 
 import java.util.EnumSet;
 import java.util.Map;
-
+import jdk.internal.util.OperatingSystem;
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.code.Architecture;
@@ -49,34 +49,22 @@ private static EnumSet<CPUFeature> computeFeatures(AMD64HotSpotVMConfig config)
         // Configure the feature set using the HotSpot flag settings.
         Map<String, Long> constants = config.getStore().getConstants();
         Map<String, String> renaming = Map.of("3DNOW_PREFETCH", "AMD_3DNOW_PREFETCH");
-        assert config.useSSE >= 2 : "minimum config for x64";
         long featuresBitMapAddress = config.vmVersionFeatures + config.vmFeaturesFeaturesOffset;
         EnumSet<CPUFeature> features = HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class,
                                                                                   constants,
                                                                                   featuresBitMapAddress,
                                                                                   config.vmFeaturesFeaturesSize,
                                                                                   renaming);
-        features.add(AMD64.CPUFeature.SSE);
-        features.add(AMD64.CPUFeature.SSE2);
+        assert features.contains(AMD64.CPUFeature.SSE) : "minimum config for x64";
+        assert features.contains(AMD64.CPUFeature.SSE2) : "minimum config for x64";
         return features;
     }
 
-    private static EnumSet<AMD64.Flag> computeFlags(AMD64HotSpotVMConfig config) {
-        EnumSet<AMD64.Flag> flags = EnumSet.noneOf(AMD64.Flag.class);
-        if (config.useCountLeadingZerosInstruction) {
-            flags.add(AMD64.Flag.UseCountLeadingZerosInstruction);
-        }
-        if (config.useCountTrailingZerosInstruction) {
-            flags.add(AMD64.Flag.UseCountTrailingZerosInstruction);
-        }
-        return flags;
-    }
-
     private static TargetDescription createTarget(AMD64HotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = true;
-        Architecture arch = new AMD64(computeFeatures(config), computeFlags(config));
+        Architecture arch = new AMD64(computeFeatures(config));
         return new TargetDescription(arch, true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects);
     }
 
@@ -85,7 +73,7 @@ protected HotSpotConstantReflectionProvider createConstantReflection(HotSpotJVMC
     }
 
     private static RegisterConfig createRegisterConfig(AMD64HotSpotVMConfig config, TargetDescription target) {
-        return new AMD64HotSpotRegisterConfig(target, config.useCompressedOops, config.windowsOs);
+        return new AMD64HotSpotRegisterConfig(target, config.useCompressedOops, OperatingSystem.isWindows());
     }
 
     protected HotSpotCodeCacheProvider createCodeCache(HotSpotJVMCIRuntime runtime, TargetDescription target, RegisterConfig regConfig) {
@@ -107,7 +95,6 @@ public String toString() {
     }
 
     @Override
-    @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend host) {
         assert host == null;
         AMD64HotSpotVMConfig config = new AMD64HotSpotVMConfig(runtime.getConfigStore());
@@ -118,24 +105,24 @@ public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend
         ConstantReflectionProvider constantReflection;
         HotSpotMetaAccessProvider metaAccess;
         StackIntrospection stackIntrospection;
-        try (InitTimer t = timer("create providers")) {
-            try (InitTimer rt = timer("create MetaAccess provider")) {
+        try (InitTimer _ = timer("create providers")) {
+            try (InitTimer _ = timer("create MetaAccess provider")) {
                 metaAccess = createMetaAccess(runtime);
             }
-            try (InitTimer rt = timer("create RegisterConfig")) {
+            try (InitTimer _ = timer("create RegisterConfig")) {
                 regConfig = createRegisterConfig(config, target);
             }
-            try (InitTimer rt = timer("create CodeCache provider")) {
+            try (InitTimer _ = timer("create CodeCache provider")) {
                 codeCache = createCodeCache(runtime, target, regConfig);
             }
-            try (InitTimer rt = timer("create ConstantReflection provider")) {
+            try (InitTimer _ = timer("create ConstantReflection provider")) {
                 constantReflection = createConstantReflection(runtime);
             }
-            try (InitTimer rt = timer("create StackIntrospection provider")) {
+            try (InitTimer _ = timer("create StackIntrospection provider")) {
                 stackIntrospection = new HotSpotStackIntrospection(runtime);
             }
         }
-        try (InitTimer rt = timer("instantiate backend")) {
+        try (InitTimer _ = timer("instantiate backend")) {
             return createBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
         }
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
index 705f0b997bb..3849ac779c4 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotRegisterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, 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,7 +50,6 @@
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -69,24 +68,24 @@ public class AMD64HotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final RegisterArray allocatable;
+    private final List<Register> allocatable;
 
     /**
      * The caller saved registers always include all parameter registers.
      */
-    private final RegisterArray callerSaved;
+    private final List<Register> callerSaved;
 
     private final boolean allAllocatableAreCallerSaved;
 
-    private final RegisterAttributes[] attributesMap;
+    private final List<RegisterAttributes> attributesMap;
 
     @Override
-    public RegisterArray getAllocatableRegisters() {
+    public List<Register> getAllocatableRegisters() {
         return allocatable;
     }
 
     @Override
-    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
+    public List<Register> filterAllocatableRegisters(PlatformKind kind, List<Register> registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
@@ -94,19 +93,19 @@ public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray
             }
         }
 
-        RegisterArray ret = new RegisterArray(list);
+        List<Register> ret = List.copyOf(list);
         return ret;
     }
 
     @Override
-    public RegisterAttributes[] getAttributesMap() {
-        return attributesMap.clone();
+    public List<RegisterAttributes> getAttributesMap() {
+        return attributesMap;
     }
 
-    private final RegisterArray javaGeneralParameterRegisters;
-    private final RegisterArray nativeGeneralParameterRegisters;
-    private final RegisterArray javaXMMParameterRegisters;
-    private final RegisterArray nativeXMMParameterRegisters;
+    private final List<Register> javaGeneralParameterRegisters;
+    private final List<Register> nativeGeneralParameterRegisters;
+    private final List<Register> javaXMMParameterRegisters;
+    private final List<Register> nativeXMMParameterRegisters;
     private final boolean windowsOS;
 
     /*
@@ -115,16 +114,15 @@ public RegisterAttributes[] getAttributesMap() {
      */
     private final boolean needsNativeStackHomeSpace;
 
-    private static final RegisterArray reservedRegisters = new RegisterArray(rsp, r15);
+    private static final List<Register> reservedRegisters = List.of(rsp, r15);
 
-    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) {
-        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+    private static List<Register> initAllocatable(Architecture arch, boolean reserveForHeapBase) {
+        List<Register> allRegisters = arch.getAvailableValueRegisters();
         Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
-        List<Register> reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
-            if (reservedRegistersList.contains(reg)) {
+            if (reservedRegisters.contains(reg)) {
                 // skip reserved registers
                 continue;
             }
@@ -137,7 +135,7 @@ private static RegisterArray initAllocatable(Architecture arch, boolean reserveF
         }
 
         assert idx == registers.length;
-        return new RegisterArray(registers);
+        return List.of(registers);
     }
 
     public AMD64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops, boolean windowsOs) {
@@ -145,42 +143,42 @@ public AMD64HotSpotRegisterConfig(TargetDescription target, boolean useCompresse
         assert callerSaved.size() >= allocatable.size();
     }
 
-    public AMD64HotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable, boolean windowsOS) {
+    public AMD64HotSpotRegisterConfig(TargetDescription target, List<Register> allocatable, boolean windowsOS) {
         this.target = target;
         this.windowsOS = windowsOS;
 
         if (windowsOS) {
-            javaGeneralParameterRegisters = new RegisterArray(rdx, r8, r9, rdi, rsi, rcx);
-            nativeGeneralParameterRegisters = new RegisterArray(rcx, rdx, r8, r9);
-            nativeXMMParameterRegisters = new RegisterArray(xmm0, xmm1, xmm2, xmm3);
+            javaGeneralParameterRegisters = List.of(rdx, r8, r9, rdi, rsi, rcx);
+            nativeGeneralParameterRegisters = List.of(rcx, rdx, r8, r9);
+            nativeXMMParameterRegisters = List.of(xmm0, xmm1, xmm2, xmm3);
             this.needsNativeStackHomeSpace = true;
         } else {
-            javaGeneralParameterRegisters = new RegisterArray(rsi, rdx, rcx, r8, r9, rdi);
-            nativeGeneralParameterRegisters = new RegisterArray(rdi, rsi, rdx, rcx, r8, r9);
-            nativeXMMParameterRegisters = new RegisterArray(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+            javaGeneralParameterRegisters = List.of(rsi, rdx, rcx, r8, r9, rdi);
+            nativeGeneralParameterRegisters = List.of(rdi, rsi, rdx, rcx, r8, r9);
+            nativeXMMParameterRegisters = List.of(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
             this.needsNativeStackHomeSpace = false;
         }
-        javaXMMParameterRegisters = new RegisterArray(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
+        javaXMMParameterRegisters = List.of(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
 
         this.allocatable = allocatable;
         Set<Register> callerSaveSet = new HashSet<>();
-        allocatable.addTo(callerSaveSet);
-        javaXMMParameterRegisters.addTo(callerSaveSet);
-        callerSaveSet.addAll(javaGeneralParameterRegisters.asList());
-        nativeGeneralParameterRegisters.addTo(callerSaveSet);
-        callerSaved = new RegisterArray(callerSaveSet);
+        callerSaveSet.addAll(allocatable);
+        callerSaveSet.addAll(javaXMMParameterRegisters);
+        callerSaveSet.addAll(javaGeneralParameterRegisters);
+        callerSaveSet.addAll(nativeGeneralParameterRegisters);
+        callerSaved = List.copyOf(callerSaveSet);
 
         allAllocatableAreCallerSaved = true;
         attributesMap = RegisterAttributes.createMap(this, target.arch.getRegisters());
     }
 
     @Override
-    public RegisterArray getCallerSaveRegisters() {
+    public List<Register> getCallerSaveRegisters() {
         return callerSaved;
     }
 
     @Override
-    public RegisterArray getCalleeSaveRegisters() {
+    public List<Register> getCalleeSaveRegisters() {
         return null;
     }
 
@@ -201,7 +199,7 @@ public CallingConvention getCallingConvention(Type type, JavaType returnType, Ja
     }
 
     @Override
-    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
+    public List<Register> getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -237,7 +235,7 @@ public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
      * @param valueKindFactory
      * @return the resulting calling convention
      */
-    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, RegisterArray xmmParameterRegisters, boolean unified, JavaType returnType, JavaType[] parameterTypes,
+    private CallingConvention callingConvention(List<Register> generalParameterRegisters, List<Register> xmmParameterRegisters, boolean unified, JavaType returnType, JavaType[] parameterTypes,
                     HotSpotCallingConventionType type,
                     ValueKindFactory<?> valueKindFactory) {
         assert !unified || generalParameterRegisters.size() == xmmParameterRegisters.size() : "must be same size in unified mode";
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
index 05803bdbfc7..1b3a46fc8d7 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java
@@ -24,8 +24,6 @@
 
 import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
 import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
-import jdk.vm.ci.services.Services;
-import jdk.internal.util.OperatingSystem;
 
 /**
  * Used to access AMD64 specific native configuration details.
@@ -36,60 +34,8 @@ class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
         super(config);
     }
 
-    final boolean windowsOs = OperatingSystem.isWindows();
-
-    final boolean useCountLeadingZerosInstruction = getFlag("UseCountLeadingZerosInstruction", Boolean.class);
-    final boolean useCountTrailingZerosInstruction = getFlag("UseCountTrailingZerosInstruction", Boolean.class);
     final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
-
     final long vmVersionFeatures = getFieldAddress("VM_Version::_features", "VM_Version::VM_Features");
     final long vmFeaturesFeaturesOffset = getFieldOffset("VM_Version::VM_Features::_features_bitmap[0]", Long.class, "uint64_t");
     final long vmFeaturesFeaturesSize = getFieldValue("VM_Version::VM_Features::_features_bitmap_size", Long.class, "int");
-
-    // CPU capabilities
-    final int useSSE = getFlag("UseSSE", Integer.class);
-    final int useAVX = getFlag("UseAVX", Integer.class);
-
-    // CPU feature flags
-    final long amd64CX8 = getConstant("VM_Version::CPU_CX8", Long.class);
-    final long amd64CMOV = getConstant("VM_Version::CPU_CMOV", Long.class);
-    final long amd64FXSR = getConstant("VM_Version::CPU_FXSR", Long.class);
-    final long amd64HT = getConstant("VM_Version::CPU_HT", Long.class);
-    final long amd64MMX = getConstant("VM_Version::CPU_MMX", Long.class);
-    final long amd643DNOWPREFETCH = getConstant("VM_Version::CPU_3DNOW_PREFETCH", Long.class);
-    final long amd64SSE = getConstant("VM_Version::CPU_SSE", Long.class);
-    final long amd64SSE2 = getConstant("VM_Version::CPU_SSE2", Long.class);
-    final long amd64SSE3 = getConstant("VM_Version::CPU_SSE3", Long.class);
-    final long amd64SSSE3 = getConstant("VM_Version::CPU_SSSE3", Long.class);
-    final long amd64SSE4A = getConstant("VM_Version::CPU_SSE4A", Long.class);
-    final long amd64SSE41 = getConstant("VM_Version::CPU_SSE4_1", Long.class);
-    final long amd64SSE42 = getConstant("VM_Version::CPU_SSE4_2", Long.class);
-    final long amd64POPCNT = getConstant("VM_Version::CPU_POPCNT", Long.class);
-    final long amd64LZCNT = getConstant("VM_Version::CPU_LZCNT", Long.class);
-    final long amd64TSC = getConstant("VM_Version::CPU_TSC", Long.class);
-    final long amd64TSCINV = getConstant("VM_Version::CPU_TSCINV", Long.class);
-    final long amd64AVX = getConstant("VM_Version::CPU_AVX", Long.class);
-    final long amd64AVX2 = getConstant("VM_Version::CPU_AVX2", Long.class);
-    final long amd64AES = getConstant("VM_Version::CPU_AES", Long.class);
-    final long amd64ERMS = getConstant("VM_Version::CPU_ERMS", Long.class);
-    final long amd64CLMUL = getConstant("VM_Version::CPU_CLMUL", Long.class);
-    final long amd64BMI1 = getConstant("VM_Version::CPU_BMI1", Long.class);
-    final long amd64BMI2 = getConstant("VM_Version::CPU_BMI2", Long.class);
-    final long amd64RTM = getConstant("VM_Version::CPU_RTM", Long.class);
-    final long amd64ADX = getConstant("VM_Version::CPU_ADX", Long.class);
-    final long amd64AVX512F = getConstant("VM_Version::CPU_AVX512F", Long.class);
-    final long amd64AVX512DQ = getConstant("VM_Version::CPU_AVX512DQ", Long.class);
-    final long amd64AVX512PF = getConstant("VM_Version::CPU_AVX512PF", Long.class);
-    final long amd64AVX512ER = getConstant("VM_Version::CPU_AVX512ER", Long.class);
-    final long amd64AVX512CD = getConstant("VM_Version::CPU_AVX512CD", Long.class);
-    final long amd64AVX512BW = getConstant("VM_Version::CPU_AVX512BW", Long.class);
-    final long amd64AVX512VL = getConstant("VM_Version::CPU_AVX512VL", Long.class);
-    final long amd64SHA = getConstant("VM_Version::CPU_SHA", Long.class);
-    final long amd64FMA = getConstant("VM_Version::CPU_FMA", Long.class);
-    final long amd64PKU = getConstant("VM_Version::CPU_PKU", Long.class);
-    final long amd64OSPKE = getConstant("VM_Version::CPU_OSPKE", Long.class);
-    final long amd64CET_IBT = getConstant("VM_Version::CPU_CET_IBT", Long.class);
-    final long amd64CET_SS = getConstant("VM_Version::CPU_CET_SS", Long.class);
-    final long amd64AVX10_1 = getConstant("VM_Version::CPU_AVX10_1", Long.class);
-    final long amd64AVX10_2 = getConstant("VM_Version::CPU_AVX10_2", Long.class);
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java
index 6e0eac91d61..c0e31124500 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotJVMCIBackendFactory.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
@@ -52,39 +52,11 @@ private static EnumSet<RISCV64.CPUFeature> computeFeatures(RISCV64HotSpotVMConfi
         return HotSpotJVMCIBackendFactory.convertFeatures(CPUFeature.class, constants, config.vmVersionFeatures, emptyMap());
     }
 
-    private static EnumSet<RISCV64.Flag> computeFlags(RISCV64HotSpotVMConfig config) {
-        EnumSet<RISCV64.Flag> flags = EnumSet.noneOf(RISCV64.Flag.class);
-
-        if (config.useConservativeFence) {
-            flags.add(RISCV64.Flag.UseConservativeFence);
-        }
-        if (config.avoidUnalignedAccesses) {
-            flags.add(RISCV64.Flag.AvoidUnalignedAccesses);
-        }
-        if (config.traceTraps) {
-            flags.add(RISCV64.Flag.TraceTraps);
-        }
-        if (config.useRVV) {
-            flags.add(RISCV64.Flag.UseRVV);
-        }
-        if (config.useRVC) {
-            flags.add(RISCV64.Flag.UseRVC);
-        }
-        if (config.useZba) {
-            flags.add(RISCV64.Flag.UseZba);
-        }
-        if (config.useZbb) {
-            flags.add(RISCV64.Flag.UseZbb);
-        }
-
-        return flags;
-    }
-
     private static TargetDescription createTarget(RISCV64HotSpotVMConfig config) {
         final int stackFrameAlignment = 16;
         final int implicitNullCheckLimit = 4096;
         final boolean inlineObjects = true;
-        Architecture arch = new RISCV64(computeFeatures(config), computeFlags(config));
+        Architecture arch = new RISCV64(computeFeatures(config));
         return new TargetDescription(arch, true, stackFrameAlignment, implicitNullCheckLimit, inlineObjects);
     }
 
@@ -115,7 +87,6 @@ public String toString() {
     }
 
     @Override
-    @SuppressWarnings("try")
     public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend host) {
         assert host == null;
         RISCV64HotSpotVMConfig config = new RISCV64HotSpotVMConfig(runtime.getConfigStore());
@@ -126,24 +97,24 @@ public JVMCIBackend createJVMCIBackend(HotSpotJVMCIRuntime runtime, JVMCIBackend
         ConstantReflectionProvider constantReflection;
         HotSpotMetaAccessProvider metaAccess;
         StackIntrospection stackIntrospection;
-        try (InitTimer t = timer("create providers")) {
-            try (InitTimer rt = timer("create MetaAccess provider")) {
+        try (InitTimer _ = timer("create providers")) {
+            try (InitTimer _ = timer("create MetaAccess provider")) {
                 metaAccess = createMetaAccess(runtime);
             }
-            try (InitTimer rt = timer("create RegisterConfig")) {
+            try (InitTimer _ = timer("create RegisterConfig")) {
                 regConfig = createRegisterConfig(config, target);
             }
-            try (InitTimer rt = timer("create CodeCache provider")) {
+            try (InitTimer _ = timer("create CodeCache provider")) {
                 codeCache = createCodeCache(runtime, target, regConfig);
             }
-            try (InitTimer rt = timer("create ConstantReflection provider")) {
+            try (InitTimer _ = timer("create ConstantReflection provider")) {
                 constantReflection = createConstantReflection(runtime);
             }
-            try (InitTimer rt = timer("create StackIntrospection provider")) {
+            try (InitTimer _ = timer("create StackIntrospection provider")) {
                 stackIntrospection = new HotSpotStackIntrospection(runtime);
             }
         }
-        try (InitTimer rt = timer("instantiate backend")) {
+        try (InitTimer _ = timer("instantiate backend")) {
             return createBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
         }
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotRegisterConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotRegisterConfig.java
index a27d3dfecfc..80091d71fe9 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotRegisterConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotRegisterConfig.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
@@ -60,7 +60,6 @@
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CallingConvention.Type;
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterAttributes;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
@@ -79,24 +78,24 @@ public class RISCV64HotSpotRegisterConfig implements RegisterConfig {
 
     private final TargetDescription target;
 
-    private final RegisterArray allocatable;
+    private final List<Register> allocatable;
 
     /**
      * The caller saved registers always include all parameter registers.
      */
-    private final RegisterArray callerSaved;
+    private final List<Register> callerSaved;
 
     private final boolean allAllocatableAreCallerSaved;
 
-    private final RegisterAttributes[] attributesMap;
+    private final List<RegisterAttributes> attributesMap;
 
     @Override
-    public RegisterArray getAllocatableRegisters() {
+    public List<Register> getAllocatableRegisters() {
         return allocatable;
     }
 
     @Override
-    public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray registers) {
+    public List<Register> filterAllocatableRegisters(PlatformKind kind, List<Register> registers) {
         ArrayList<Register> list = new ArrayList<>();
         for (Register reg : registers) {
             if (target.arch.canStoreValue(reg.getRegisterCategory(), kind)) {
@@ -104,17 +103,17 @@ public RegisterArray filterAllocatableRegisters(PlatformKind kind, RegisterArray
             }
         }
 
-        return new RegisterArray(list);
+        return List.copyOf(list);
     }
 
     @Override
-    public RegisterAttributes[] getAttributesMap() {
-        return attributesMap.clone();
+    public List<RegisterAttributes> getAttributesMap() {
+        return attributesMap;
     }
 
-    private final RegisterArray javaGeneralParameterRegisters = new RegisterArray(x11, x12, x13, x14, x15, x16, x17, x10);
-    private final RegisterArray nativeGeneralParameterRegisters = new RegisterArray(x10, x11, x12, x13, x14, x15, x16, x17);
-    private final RegisterArray fpParameterRegisters = new RegisterArray(f10, f11, f12, f13, f14, f15, f16, f17);
+    private final List<Register> javaGeneralParameterRegisters = List.of(x11, x12, x13, x14, x15, x16, x17, x10);
+    private final List<Register> nativeGeneralParameterRegisters = List.of(x10, x11, x12, x13, x14, x15, x16, x17);
+    private final List<Register> fpParameterRegisters = List.of(f10, f11, f12, f13, f14, f15, f16, f17);
 
     public static final Register zero = x0;
     public static final Register ra = x1;
@@ -128,16 +127,15 @@ public RegisterAttributes[] getAttributesMap() {
     public static final Register threadRegister = x23;
     public static final Register heapBaseRegister = x27;
 
-    private static final RegisterArray reservedRegisters = new RegisterArray(zero, ra, sp, gp, tp, t0, t1, t2, fp);
+    private static final List<Register> reservedRegisters =List.of(zero, ra, sp, gp, tp, t0, t1, t2, fp);
 
-    private static RegisterArray initAllocatable(Architecture arch, boolean reserveForHeapBase) {
-        RegisterArray allRegisters = arch.getAvailableValueRegisters();
+    private static List<Register> initAllocatable(Architecture arch, boolean reserveForHeapBase) {
+        List<Register> allRegisters = arch.getAvailableValueRegisters();
         Register[] registers = new Register[allRegisters.size() - reservedRegisters.size() - (reserveForHeapBase ? 1 : 0)];
-        List<Register> reservedRegistersList = reservedRegisters.asList();
 
         int idx = 0;
         for (Register reg : allRegisters) {
-            if (reservedRegistersList.contains(reg)) {
+            if (reservedRegisters.contains(reg)) {
                 // skip reserved registers
                 continue;
             }
@@ -152,7 +150,7 @@ private static RegisterArray initAllocatable(Architecture arch, boolean reserveF
         }
 
         assert idx == registers.length;
-        return new RegisterArray(registers);
+        return List.of(registers);
     }
 
     public RISCV64HotSpotRegisterConfig(TargetDescription target, boolean useCompressedOops, boolean linuxOs) {
@@ -160,28 +158,28 @@ public RISCV64HotSpotRegisterConfig(TargetDescription target, boolean useCompres
         assert callerSaved.size() >= allocatable.size();
     }
 
-    public RISCV64HotSpotRegisterConfig(TargetDescription target, RegisterArray allocatable) {
+    public RISCV64HotSpotRegisterConfig(TargetDescription target, List<Register> allocatable) {
         this.target = target;
         this.allocatable = allocatable;
 
         Set<Register> callerSaveSet = new HashSet<>();
-        allocatable.addTo(callerSaveSet);
-        fpParameterRegisters.addTo(callerSaveSet);
-        javaGeneralParameterRegisters.addTo(callerSaveSet);
-        nativeGeneralParameterRegisters.addTo(callerSaveSet);
-        callerSaved = new RegisterArray(callerSaveSet);
+        callerSaveSet.addAll(allocatable);
+        callerSaveSet.addAll(fpParameterRegisters);
+        callerSaveSet.addAll(javaGeneralParameterRegisters);
+        callerSaveSet.addAll(nativeGeneralParameterRegisters);
+        callerSaved = List.copyOf(callerSaveSet);
 
         allAllocatableAreCallerSaved = true;
         attributesMap = RegisterAttributes.createMap(this, RISCV64.allRegisters);
     }
 
     @Override
-    public RegisterArray getCallerSaveRegisters() {
+    public List<Register> getCallerSaveRegisters() {
         return callerSaved;
     }
 
     @Override
-    public RegisterArray getCalleeSaveRegisters() {
+    public List<Register> getCalleeSaveRegisters() {
         return null;
     }
 
@@ -200,7 +198,7 @@ public CallingConvention getCallingConvention(Type type, JavaType returnType, Ja
     }
 
     @Override
-    public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
+    public List<Register> getCallingConventionRegisters(Type type, JavaKind kind) {
         HotSpotCallingConventionType hotspotType = (HotSpotCallingConventionType) type;
         switch (kind) {
             case Boolean:
@@ -219,7 +217,7 @@ public RegisterArray getCallingConventionRegisters(Type type, JavaKind kind) {
         }
     }
 
-    private CallingConvention callingConvention(RegisterArray generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
+    private CallingConvention callingConvention(List<Register> generalParameterRegisters, JavaType returnType, JavaType[] parameterTypes, HotSpotCallingConventionType type,
                     ValueKindFactory<?> valueKindFactory) {
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
index 1d52556522e..6b09f9f0603 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/riscv64/RISCV64HotSpotVMConfig.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
@@ -37,19 +37,5 @@ class RISCV64HotSpotVMConfig extends HotSpotVMConfigAccess {
     }
 
     final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
-
-    // CPU Capabilities
-
-    /*
-     * These flags are set based on the corresponding command line flags.
-     */
-    final boolean useConservativeFence = getFlag("UseConservativeFence", Boolean.class);
-    final boolean avoidUnalignedAccesses = getFlag("AvoidUnalignedAccesses", Boolean.class);
-    final boolean traceTraps = getFlag("TraceTraps", Boolean.class);
-    final boolean useRVV = getFlag("UseRVV", Boolean.class);
-    final boolean useRVC = getFlag("UseRVC", Boolean.class);
-    final boolean useZba = getFlag("UseZba", Boolean.class);
-    final boolean useZbb = getFlag("UseZbb", Boolean.class);
-
     final long vmVersionFeatures = getFieldValue("Abstract_VM_Version::_features", Long.class, "uint64_t");
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
index 976c09cb75b..79491e507fd 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.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
@@ -24,12 +24,12 @@
 
 import java.nio.ByteOrder;
 import java.util.EnumSet;
+import java.util.List;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CPUFeatureName;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -77,7 +77,7 @@ public class RISCV64 extends Architecture {
     public static final Register x31 = new Register(31, 31, "x31", CPU);
 
     // @formatter:off
-    public static final RegisterArray cpuRegisters = new RegisterArray(
+    public static final List<Register> cpuRegisters = List.of(
         x0,  x1,  x2,  x3,  x4,  x5,  x6,  x7,
         x8,  x9,  x10, x11, x12, x13, x14, x15,
         x16, x17, x18, x19, x20, x21, x22, x23,
@@ -122,7 +122,7 @@ public class RISCV64 extends Architecture {
     public static final Register f31 = new Register(63, 31, "f31", FP);
 
     // @formatter:off
-    public static final RegisterArray fpRegisters = new RegisterArray(
+    public static final List<Register> fpRegisters = List.of(
         f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,
         f8,  f9,  f10, f11, f12, f13, f14, f15,
         f16, f17, f18, f19, f20, f21, f22, f23,
@@ -131,7 +131,7 @@ public class RISCV64 extends Architecture {
     // @formatter:on
 
     // @formatter:off
-    public static final RegisterArray allRegisters = new RegisterArray(
+    public static final List<Register> allRegisters = List.of(
         x0,  x1,  x2,  x3,  x4,  x5,  x6,  x7,
         x8,  x9,  x10, x11, x12, x13, x14, x15,
         x16, x17, x18, x19, x20, x21, x22, x23,
@@ -160,25 +160,9 @@ public enum CPUFeature implements CPUFeatureName {
 
     private final EnumSet<CPUFeature> features;
 
-    /**
-     * Set of flags to control code emission.
-     */
-    public enum Flag {
-        UseConservativeFence,
-        AvoidUnalignedAccesses,
-        TraceTraps,
-        UseRVV,
-        UseRVC,
-        UseZba,
-        UseZbb
-    }
-
-    private final EnumSet<Flag> flags;
-
-    public RISCV64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
+    public RISCV64(EnumSet<CPUFeature> features) {
         super("riscv64", RISCV64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, 0, 0, 8);
         this.features = features;
-        this.flags = flags;
     }
 
     @Override
@@ -186,10 +170,6 @@ public EnumSet<CPUFeature> getFeatures() {
         return features;
     }
 
-    public EnumSet<Flag> getFlags() {
-        return flags;
-    }
-
     @Override
     public PlatformKind getPlatformKind(JavaKind javaKind) {
         switch (javaKind) {
diff --git a/test/hotspot/jtreg/compiler/jvmci/common/CodeInstallerTest.java b/test/hotspot/jtreg/compiler/jvmci/common/CodeInstallerTest.java
index c2f55aea39e..c4ce4173282 100644
--- a/test/hotspot/jtreg/compiler/jvmci/common/CodeInstallerTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/common/CodeInstallerTest.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
@@ -26,7 +26,6 @@
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.site.DataPatch;
 import jdk.vm.ci.code.site.Site;
@@ -118,8 +117,7 @@ protected InstalledCode installEmptyCode(Site[] sites,
 
     protected Register getRegister(PlatformKind kind, int index) {
         int idx = index;
-        RegisterArray allRegs = arch.getAvailableValueRegisters();
-        for (Register reg : allRegs) {
+        for (Register reg : arch.getAvailableValueRegisters()) {
             if (arch.canStoreValue(reg.getRegisterCategory(), kind)) {
                 if (idx-- == 0) {
                     return reg;
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
index 89136091b54..d64ca7544e6 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java
@@ -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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,6 +24,7 @@
 
 package jdk.vm.ci.code.test.aarch64;
 
+import java.util.List;
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.CallingConvention;
@@ -367,9 +368,9 @@ public void emitEpilogue() {
     @Override
     public void emitCallPrologue(CallingConvention cc, Object... prim) {
         growFrame(cc.getStackSize());
-        AllocatableValue[] args = cc.getArguments();
-        for (int i = 0; i < args.length; i++) {
-            emitLoad(args[i], prim[i]);
+        List<AllocatableValue> args = cc.getArguments();
+        for (int i = 0; i < args.size(); i++) {
+            emitLoad(args.get(i), prim[i]);
         }
     }
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
index 10b24109d3b..1ca0e9ac879 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java
@@ -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 @@
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 
+import java.util.List;
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.CallingConvention;
@@ -495,11 +496,11 @@ public void emitLoad(AllocatableValue av, Object prim) {
     @Override
     public void emitCallPrologue(CallingConvention cc, Object... prim) {
         growFrame(cc.getStackSize());
-        AllocatableValue[] args = cc.getArguments();
+        List<AllocatableValue> args = cc.getArguments();
         // Do the emission in reverse, this avoids register collisons of xmm0 - which is used a
         // scratch register when putting arguments on the stack.
-        for (int i = args.length - 1; i >= 0; i--) {
-            emitLoad(args[i], prim[i]);
+        for (int i = args.size() - 1; i >= 0; i--) {
+            emitLoad(args.get(i), prim[i]);
         }
     }
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java
index b79fa093e9d..6da2f088b60 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.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,6 +23,7 @@
 
 package jdk.vm.ci.code.test.riscv64;
 
+import java.util.List;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.DebugInfo;
@@ -227,9 +228,9 @@ public void emitEpilogue() {
     @Override
     public void emitCallPrologue(CallingConvention cc, Object... prim) {
         growFrame(cc.getStackSize());
-        AllocatableValue[] args = cc.getArguments();
-        for (int i = 0; i < args.length; i++) {
-            emitLoad(args[i], prim[i]);
+        List<AllocatableValue> args = cc.getArguments();
+        for (int i = 0; i < args.size(); i++) {
+            emitLoad(args.get(i), prim[i]);
         }
     }
 

From 5f38d1bb94d008c33c1a7af12c81ee0e15371e13 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 21 May 2025 08:57:55 +0000
Subject: [PATCH 553/901] 8357193: [VS 2022 17.14] Warning C5287 in
 debugInit.c: enum type mismatch during build

Reviewed-by: sspitsyn
---
 make/modules/jdk.jdwp.agent/Lib.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index 8fe7787d76e..6ae053d4bec 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -68,6 +68,7 @@ $(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, \
+    DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \
     LDFLAGS := $(ICONV_LDFLAGS), \
     EXTRA_HEADER_DIRS := \
         include \

From 7c82e09b509a67cafd67f6d2aa33756bf8755253 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 21 May 2025 09:23:23 +0000
Subject: [PATCH 554/901] 8357048: RunTest variables should always be assigned

Reviewed-by: erikj
---
 make/RunTests.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 95d3dee7013..12e81dba2c8 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -583,6 +583,8 @@ define SetMicroValue
   else
     ifneq ($3, )
       $1_$2 := $3
+    else
+      $1_$2 :=
     endif
   endif
 endef
@@ -709,6 +711,8 @@ define SetJtregValue
     else
       ifneq ($3, )
         $1_$2 := $3
+      else
+        $1_$2 :=
       endif
     endif
   endif
@@ -869,7 +873,7 @@ define SetupRunJtregTestBody
   # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
+      -concurrency:$$($1_JTREG_JOBS) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -994,6 +998,7 @@ define SetupRunJtregTestBody
   endif
 
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
+  $1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
 	$$(call LogWarn, Clean up dirs for $1)

From b8057cf103bff6f8e2600c098519289a43227362 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 21 May 2025 10:54:40 +0000
Subject: [PATCH 555/901] 8357436: Change jspawnhelper warning recommendation
 from VFORK to FORK

Reviewed-by: stuefe, alanb
---
 src/java.base/unix/native/libjava/ProcessImpl_md.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
index 264818360c2..1d0c8d21d37 100644
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
@@ -328,7 +328,7 @@ releaseBytes(JNIEnv *env, jbyteArray arr, const char* parr)
   "  - Restart JVM, especially after in-place JDK updates\n" \
   "  - Check system logs for JDK-related errors\n" \
   "  - Re-install JDK to fix permission/versioning problems\n" \
-  "  - Switch to legacy launch mechanism with -Djdk.lang.Process.launchMechanism=VFORK\n"
+  "  - Switch to legacy launch mechanism with -Djdk.lang.Process.launchMechanism=FORK\n"
 
 static void
 throwIOExceptionImpl(JNIEnv *env, int errnum, const char *externalDetail, const char *internalDetail)

From 2c126f1954435a5b4d6cdc367b7b5e8c91cfae63 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Wed, 21 May 2025 11:11:58 +0000
Subject: [PATCH 556/901] 8357370: Export supported GCs in JVMCI

Reviewed-by: dnsimon
---
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 2beda111284..fc5b80f1d2e 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -496,6 +496,12 @@
 #define VM_INT_CONSTANTS(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
   declare_preprocessor_constant("ASSERT", DEBUG_ONLY(1) NOT_DEBUG(0))     \
                                                                           \
+  declare_preprocessor_constant("INCLUDE_SERIALGC", INCLUDE_SERIALGC)     \
+  declare_preprocessor_constant("INCLUDE_PARALLELGC", INCLUDE_PARALLELGC) \
+  declare_preprocessor_constant("INCLUDE_G1GC", INCLUDE_G1GC)             \
+  declare_preprocessor_constant("INCLUDE_ZGC", INCLUDE_ZGC)               \
+  declare_preprocessor_constant("INCLUDE_SHENANDOAHGC", INCLUDE_SHENANDOAHGC) \
+                                                                          \
   declare_constant(CompLevel_none)                                        \
   declare_constant(CompLevel_simple)                                      \
   declare_constant(CompLevel_limited_profile)                             \

From a4f66f5439f7fe585bd3664b7f2ceec23234e554 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Wed, 21 May 2025 11:27:05 +0000
Subject: [PATCH 557/901] 8325859: Potential information loss during type
 inference

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Infer.java       |  6 ++-
 .../tools/javac/comp/InferenceContext.java    | 28 +++++++++--
 .../SupplementaryInferenceContextTest.java    | 47 +++++++++++++++++++
 3 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 test/langtools/tools/javac/inference_context_min/SupplementaryInferenceContextTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index 137dfa7c3c5..f5e9bfcd7a8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -206,7 +206,11 @@ Type instantiateMethod( Env<AttrContext> env,
                     //propagate outwards if needed
                     if (shouldPropagate) {
                         //propagate inference context outwards and exit
-                        minContext.dupTo(resultInfo.checkContext.inferenceContext());
+                        InferenceContext duppedTo = resultInfo.checkContext.inferenceContext();
+                        minContext.dupTo(duppedTo);
+                        if (minContext != inferenceContext) {
+                            duppedTo.parentIC = inferenceContext;
+                        }
                         deferredAttrContext.complete();
                         return mt;
                     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java
index ea7806ef032..8fc316c8ff6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/InferenceContext.java
@@ -83,6 +83,14 @@ Type update(Type t) {
     Types types;
     Infer infer;
 
+    /* when an inference context (IC) is minimized, the minimized inference context (MIC) contains a
+     * proper subset of IC's inference vars (IC_IV). In other words there will be at least one inference variable T
+     * that belongs to IC_IV which doesn't belong to MIC_IV. We need the field below to, among other things,
+     * check for set membership for cases where the minimized context or any other context derived from it
+     * needs to deal with an inference variable that has been eliminated from IC_IV while minimizing it
+     */
+    InferenceContext parentIC;
+
     public InferenceContext(Infer infer, List<Type> inferencevars) {
         this(infer, inferencevars, inferencevars.map(infer.fromTypeVarFun));
     }
@@ -243,7 +251,17 @@ List<Type> instTypes() {
      * fully instantiated, it will still be available in the resulting type.
      */
     Type asInstType(Type t) {
-        return types.subst(t, inferencevars, instTypes());
+        ListBuffer<Type> from = new ListBuffer<>();
+        ListBuffer<Type> to = new ListBuffer<>();
+        from.addAll(inferencevars);
+        to.addAll(instTypes());
+        InferenceContext next = parentIC;
+        while (next != null) {
+            from.addAll(next.inferencevars);
+            to.addAll(next.instTypes());
+            next = next.parentIC;
+        }
+        return types.subst(t, from.toList(), to.toList());
     }
 
     List<Type> asInstTypes(List<Type> ts) {
@@ -551,8 +569,12 @@ List<Type> solveBasic(List<Type> varsToSolve, EnumSet<InferenceStep> steps) {
 
     @Override
     public String toString() {
-        return "Inference vars: " + inferencevars + '\n' +
-               "Undet vars: " + undetvars;
+        String result = "Inference vars: " + inferencevars + '\n' +
+               "Undet vars: " + undetvars + '\n';
+        if (parentIC != null) {
+            result += "\nParent : " + parentIC.toString();
+        }
+        return result;
     }
 
     /* Method Types.capture() generates a new type every time it's applied
diff --git a/test/langtools/tools/javac/inference_context_min/SupplementaryInferenceContextTest.java b/test/langtools/tools/javac/inference_context_min/SupplementaryInferenceContextTest.java
new file mode 100644
index 00000000000..25605d71c96
--- /dev/null
+++ b/test/langtools/tools/javac/inference_context_min/SupplementaryInferenceContextTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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 8325859
+ * @summary potential information loss during type inference
+ * @modules jdk.compiler/com.sun.tools.javac.util
+ */
+
+import com.sun.tools.javac.util.Assert;
+
+public class SupplementaryInferenceContextTest {
+    static String result;
+    public static void main(String... args) {
+        runT(() -> supplyNull(Integer.valueOf(1)));
+        Assert.check(result.equals("class java.lang.Integer"));
+    }
+
+    static <R, X> R supplyNull(X... varargs) {
+        result = varargs.getClass().getComponentType().toString();
+        System.err.println("result is =" + result);
+        return null;
+    }
+
+    static <T> void runT(Runnable runnable) { runnable.run(); }
+}

From 108e454a042aaca2a36cd0d8087e7668e3cac29c Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dzhang@openjdk.org>
Date: Wed, 21 May 2025 11:43:13 +0000
Subject: [PATCH 558/901] 8356924: RISC-V: Clean up cost for vector
 instructions

Reviewed-by: fjiang, fyang, gcao
---
 src/hotspot/cpu/riscv/riscv_v.ad | 173 -------------------------------
 1 file changed, 173 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 0687a025a6d..de4c2b408d4 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -151,16 +151,11 @@ source %{
   }
 %}
 
-definitions %{
-  int_def VEC_COST             (200, 200);
-%}
-
 // All VEC instructions
 
 // vector load/store
 instruct loadV(vReg dst, vmemA mem) %{
   match(Set dst (LoadVector mem));
-  ins_cost(VEC_COST);
   format %{ "loadV $dst, $mem\t# vector (rvv)" %}
   ins_encode %{
     VectorRegister dst_reg = as_VectorRegister($dst$$reg);
@@ -172,7 +167,6 @@ instruct loadV(vReg dst, vmemA mem) %{
 
 instruct storeV(vReg src, vmemA mem) %{
   match(Set mem (StoreVector mem src));
-  ins_cost(VEC_COST);
   format %{ "storeV $mem, $src\t# vector (rvv)" %}
   ins_encode %{
     VectorRegister src_reg = as_VectorRegister($src$$reg);
@@ -294,7 +288,6 @@ instruct vabs(vReg dst, vReg src, vReg tmp) %{
   match(Set dst (AbsVS src));
   match(Set dst (AbsVI src));
   match(Set dst (AbsVL src));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vabs $dst, $src\t# KILL $tmp" %}
   ins_encode %{
@@ -309,7 +302,6 @@ instruct vabs(vReg dst, vReg src, vReg tmp) %{
 instruct vabs_fp(vReg dst, vReg src) %{
   match(Set dst (AbsVF src));
   match(Set dst (AbsVD src));
-  ins_cost(VEC_COST);
   format %{ "vabs_fp $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -326,7 +318,6 @@ instruct vabs_masked(vReg dst_src, vRegMask_V0 v0, vReg tmp) %{
   match(Set dst_src (AbsVS dst_src v0));
   match(Set dst_src (AbsVI dst_src v0));
   match(Set dst_src (AbsVL dst_src v0));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vabs_masked $dst_src, $dst_src, $v0\t# KILL $tmp" %}
   ins_encode %{
@@ -343,7 +334,6 @@ instruct vabs_masked(vReg dst_src, vRegMask_V0 v0, vReg tmp) %{
 instruct vabs_fp_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (AbsVF dst_src v0));
   match(Set dst_src (AbsVD dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vabs_fp_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -360,7 +350,6 @@ instruct vadd(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AddVS src1 src2));
   match(Set dst (AddVI src1 src2));
   match(Set dst (AddVL src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vadd $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -374,7 +363,6 @@ instruct vadd(vReg dst, vReg src1, vReg src2) %{
 
 instruct vadd_hfp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AddVHF src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vadd_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -390,7 +378,6 @@ instruct vadd_hfp(vReg dst, vReg src1, vReg src2) %{
 instruct vadd_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AddVF src1 src2));
   match(Set dst (AddVD src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vadd_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -409,7 +396,6 @@ instruct vadd_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (AddVS (Binary dst_src1 src2) v0));
   match(Set dst_src1 (AddVI (Binary dst_src1 src2) v0));
   match(Set dst_src1 (AddVL (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vadd_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -424,7 +410,6 @@ instruct vadd_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 instruct vadd_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (AddVF (Binary dst_src1 src2) v0));
   match(Set dst_src1 (AddVD (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vadd_fp_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -559,7 +544,6 @@ instruct vsub(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (SubVS src1 src2));
   match(Set dst (SubVI src1 src2));
   match(Set dst (SubVL src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vsub $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -572,7 +556,6 @@ instruct vsub(vReg dst, vReg src1, vReg src2) %{
 
 instruct vsub_hfp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (SubVHF src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vsub_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -587,7 +570,6 @@ instruct vsub_hfp(vReg dst, vReg src1, vReg src2) %{
 instruct vsub_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (SubVF src1 src2));
   match(Set dst (SubVD src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vsub_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -605,7 +587,6 @@ instruct vsub_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (SubVS (Binary dst_src1 src2) v0));
   match(Set dst_src1 (SubVI (Binary dst_src1 src2) v0));
   match(Set dst_src1 (SubVL (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vsub_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -619,7 +600,6 @@ instruct vsub_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 instruct vsub_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (SubVF (Binary dst_src1 src2) v0));
   match(Set dst_src1 (SubVD (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vsub_fp_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -695,7 +675,6 @@ instruct vsubL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
 instruct vsadd(vReg dst, vReg src1, vReg src2) %{
   predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
   match(Set dst (SaturatingAddV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vsadd $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -712,7 +691,6 @@ instruct vsadd(vReg dst, vReg src1, vReg src2) %{
 instruct vsaddu(vReg dst, vReg src1, vReg src2) %{
   predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
   match(Set dst (SaturatingAddV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vsaddu $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -729,7 +707,6 @@ instruct vsaddu(vReg dst, vReg src1, vReg src2) %{
 instruct vsadd_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
   predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
   match(Set dst_src (SaturatingAddV (Binary dst_src src1) v0));
-  ins_cost(VEC_COST);
   format %{ "vsadd_masked $dst_src, $dst_src, $src1, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -746,7 +723,6 @@ instruct vsadd_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
 instruct vsaddu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
   predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
   match(Set dst_src (SaturatingAddV (Binary dst_src src1) v0));
-  ins_cost(VEC_COST);
   format %{ "vsaddu_masked $dst_src, $dst_src, $src1, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -763,7 +739,6 @@ instruct vsaddu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
 instruct vssub(vReg dst, vReg src1, vReg src2) %{
   predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
   match(Set dst (SaturatingSubV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vssub $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -780,7 +755,6 @@ instruct vssub(vReg dst, vReg src1, vReg src2) %{
 instruct vssubu(vReg dst, vReg src1, vReg src2) %{
   predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
   match(Set dst (SaturatingSubV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vssubu $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -797,7 +771,6 @@ instruct vssubu(vReg dst, vReg src1, vReg src2) %{
 instruct vssub_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
   predicate(n->is_SaturatingVector() && !n->as_SaturatingVector()->is_unsigned());
   match(Set dst_src (SaturatingSubV (Binary dst_src src1) v0));
-  ins_cost(VEC_COST);
   format %{ "vssub_masked $dst_src, $dst_src, $src1, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -814,7 +787,6 @@ instruct vssub_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
 instruct vssubu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
   predicate(n->is_SaturatingVector() && n->as_SaturatingVector()->is_unsigned());
   match(Set dst_src (SaturatingSubV (Binary dst_src src1) v0));
-  ins_cost(VEC_COST);
   format %{ "vssubu_masked $dst_src, $dst_src, $src1, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -830,7 +802,6 @@ instruct vssubu_masked(vReg dst_src, vReg src1, vRegMask_V0 v0) %{
 
 instruct vand(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AndV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vand $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -846,7 +817,6 @@ instruct vand(vReg dst, vReg src1, vReg src2) %{
 
 instruct vand_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (AndV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vand_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -986,7 +956,6 @@ instruct vandL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
 
 instruct vor(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (OrV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vor $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1002,7 +971,6 @@ instruct vor(vReg dst, vReg src1, vReg src2) %{
 
 instruct vor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (OrV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vor_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1142,7 +1110,6 @@ instruct vorL_vx_masked(vReg dst_src, iRegL src, vRegMask_V0 v0) %{
 
 instruct vxor(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (XorV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vxor $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1158,7 +1125,6 @@ instruct vxor(vReg dst, vReg src1, vReg src2) %{
 
 instruct vxor_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (XorV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vxor_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1582,7 +1548,6 @@ instruct vnotL_masked(vReg dst_src, immI_M1 m1, vRegMask_V0 v0) %{
 
 instruct vdiv_hfp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (DivVHF src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vdiv_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -1598,7 +1563,6 @@ instruct vdiv_hfp(vReg dst, vReg src1, vReg src2) %{
 instruct vdiv_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (DivVF src1 src2));
   match(Set dst (DivVD src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vdiv_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1615,7 +1579,6 @@ instruct vdiv_fp(vReg dst, vReg src1, vReg src2) %{
 instruct vdiv_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (DivVF (Binary dst_src1 src2) v0));
   match(Set dst_src1 (DivVD (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vdiv_fp_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1633,7 +1596,6 @@ instruct vmax(vReg dst, vReg src1, vReg src2) %{
   predicate(Matcher::vector_element_basic_type(n) != T_FLOAT &&
             Matcher::vector_element_basic_type(n) != T_DOUBLE);
   match(Set dst (MaxV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmax $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1648,7 +1610,6 @@ instruct vmin(vReg dst, vReg src1, vReg src2) %{
   predicate(Matcher::vector_element_basic_type(n) != T_FLOAT &&
             Matcher::vector_element_basic_type(n) != T_DOUBLE);
   match(Set dst (MinV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmin $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1665,7 +1626,6 @@ instruct vmax_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) != T_FLOAT &&
             Matcher::vector_element_basic_type(n) != T_DOUBLE);
   match(Set dst_src1 (MaxV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vmax_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1680,7 +1640,6 @@ instruct vmin_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   predicate(Matcher::vector_element_basic_type(n) != T_FLOAT &&
             Matcher::vector_element_basic_type(n) != T_DOUBLE);
   match(Set dst_src1 (MinV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vmin_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1695,7 +1654,6 @@ instruct vmin_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 instruct vmaxu(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (UMaxV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmaxu $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1709,7 +1667,6 @@ instruct vmaxu(vReg dst, vReg src1, vReg src2) %{
 
 instruct vminu(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (UMinV src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vminu $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1725,7 +1682,6 @@ instruct vminu(vReg dst, vReg src1, vReg src2) %{
 
 instruct vmaxu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (UMaxV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vmaxu_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1739,7 +1695,6 @@ instruct vmaxu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 
 instruct vminu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (UMinV (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vminu_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1756,7 +1711,6 @@ instruct vminu_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 instruct vmax_hfp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst (MaxVHF src1 src2));
   effect(TEMP_DEF dst, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmax_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -1771,7 +1725,6 @@ instruct vmax_hfp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
 instruct vmin_hfp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst (MinVHF src1 src2));
   effect(TEMP_DEF dst, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmin_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -1790,7 +1743,6 @@ instruct vmax_fp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
             Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst (MaxV src1 src2));
   effect(TEMP_DEF dst, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmax_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1806,7 +1758,6 @@ instruct vmin_fp(vReg dst, vReg src1, vReg src2, vRegMask_V0 v0) %{
             Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst (MinV src1 src2));
   effect(TEMP_DEF dst, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmin_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1824,7 +1775,6 @@ instruct vmax_fp_masked(vReg dst_src1, vReg src2, vRegMask vmask, vReg tmp1, vRe
             Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst_src1 (MaxV (Binary dst_src1 src2) vmask));
   effect(TEMP_DEF dst_src1, TEMP tmp1, TEMP tmp2, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmax_fp_masked $dst_src1, $dst_src1, $src2, $vmask\t# KILL $tmp1, $tmp2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1841,7 +1791,6 @@ instruct vmin_fp_masked(vReg dst_src1, vReg src2, vRegMask vmask, vReg tmp1, vRe
             Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst_src1 (MinV (Binary dst_src1 src2) vmask));
   effect(TEMP_DEF dst_src1, TEMP tmp1, TEMP tmp2, TEMP v0);
-  ins_cost(VEC_COST);
   format %{ "vmin_fp_masked $dst_src1, $dst_src1, $src2, $vmask\t# KILL $tmp1, $tmp2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -1858,7 +1807,6 @@ instruct vmin_fp_masked(vReg dst_src1, vReg src2, vRegMask vmask, vReg tmp1, vRe
 // dst_src1 = src2 * src3 + dst_src1 (half precision)
 instruct vhfmla(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vhfmla $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -1875,7 +1823,6 @@ instruct vhfmla(vReg dst_src1, vReg src2, vReg src3) %{
 instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
   match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vfmla $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -1910,7 +1857,6 @@ instruct vfmadd_masked(vReg dst_src1, vReg src2, vReg src3, vRegMask_V0 v0) %{
 // "(-src2) * src3 + dst_src1" has been idealized to "src3 * (-src2) + dst_src1"
 instruct vfmlsF(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVF dst_src1 (Binary src2 (NegVF src3))));
-  ins_cost(VEC_COST);
   format %{ "vfmlsF $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -1925,7 +1871,6 @@ instruct vfmlsF(vReg dst_src1, vReg src2, vReg src3) %{
 // "(-src2) * src3 + dst_src1" has been idealized to "src3 * (-src2) + dst_src1"
 instruct vfmlsD(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVD dst_src1 (Binary src2 (NegVD src3))));
-  ins_cost(VEC_COST);
   format %{ "vfmlsD $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -1959,7 +1904,6 @@ instruct vfnmsub_masked(vReg dst_src1, vReg src2, vReg src3, vRegMask_V0 v0) %{
 // "(-src2) * src3 - dst_src1" has been idealized to "src3 * (-src2) - dst_src1"
 instruct vfnmlaF(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 (NegVF src3))));
-  ins_cost(VEC_COST);
   format %{ "vfnmlaF $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -1974,7 +1918,6 @@ instruct vfnmlaF(vReg dst_src1, vReg src2, vReg src3) %{
 // "(-src2) * src3 - dst_src1" has been idealized to "src3 * (-src2) - dst_src1"
 instruct vfnmlaD(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 (NegVD src3))));
-  ins_cost(VEC_COST);
   format %{ "vfnmlaD $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -2007,7 +1950,6 @@ instruct vfnmadd_masked(vReg dst_src1, vReg src2, vReg src3, vRegMask_V0 v0) %{
 // dst_src1 = src2 * src3 - dst_src1
 instruct vfnmlsF(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVF (NegVF dst_src1) (Binary src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vfnmlsF $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -2021,7 +1963,6 @@ instruct vfnmlsF(vReg dst_src1, vReg src2, vReg src3) %{
 // dst_src1 = -dst_src1 + src2 * src3
 instruct vfnmlsD(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (FmaVD (NegVD dst_src1) (Binary src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vfnmlsD $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -2057,7 +1998,6 @@ instruct vmla(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (AddVS dst_src1 (MulVS src2 src3)));
   match(Set dst_src1 (AddVI dst_src1 (MulVI src2 src3)));
   match(Set dst_src1 (AddVL dst_src1 (MulVL src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vmla $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2093,7 +2033,6 @@ instruct vmls(vReg dst_src1, vReg src2, vReg src3) %{
   match(Set dst_src1 (SubVS dst_src1 (MulVS src2 src3)));
   match(Set dst_src1 (SubVI dst_src1 (MulVI src2 src3)));
   match(Set dst_src1 (SubVL dst_src1 (MulVL src2 src3)));
-  ins_cost(VEC_COST);
   format %{ "vmls $dst_src1, $dst_src1, $src2, $src3" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2128,7 +2067,6 @@ instruct vmul(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (MulVS src1 src2));
   match(Set dst (MulVI src1 src2));
   match(Set dst (MulVL src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmul $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2141,7 +2079,6 @@ instruct vmul(vReg dst, vReg src1, vReg src2) %{
 
 instruct vmul_hfp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (MulVHF src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmul_hfp $dst, $src1, $src2" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -2156,7 +2093,6 @@ instruct vmul_hfp(vReg dst, vReg src1, vReg src2) %{
 instruct vmul_fp(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (MulVF src1 src2));
   match(Set dst (MulVD src1 src2));
-  ins_cost(VEC_COST);
   format %{ "vmul_fp $dst, $src1, $src2" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2174,7 +2110,6 @@ instruct vmul_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (MulVS (Binary dst_src1 src2) v0));
   match(Set dst_src1 (MulVI (Binary dst_src1 src2) v0));
   match(Set dst_src1 (MulVL (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vmul_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2188,7 +2123,6 @@ instruct vmul_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
 instruct vmul_fp_masked(vReg dst_src1, vReg src2, vRegMask_V0 v0) %{
   match(Set dst_src1 (MulVF (Binary dst_src1 src2) v0));
   match(Set dst_src1 (MulVD (Binary dst_src1 src2) v0));
-  ins_cost(VEC_COST);
   format %{ "vmul_fp_masked $dst_src1, $dst_src1, $src2, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2262,7 +2196,6 @@ instruct vmulL_vx_masked(vReg dst_src, iRegL src2, vRegMask_V0 v0) %{
 instruct vneg(vReg dst, vReg src) %{
   match(Set dst (NegVI src));
   match(Set dst (NegVL src));
-  ins_cost(VEC_COST);
   format %{ "vneg $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2277,7 +2210,6 @@ instruct vneg(vReg dst, vReg src) %{
 instruct vneg_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (NegVI dst_src v0));
   match(Set dst_src (NegVL dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vneg_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2293,7 +2225,6 @@ instruct vneg_masked(vReg dst_src, vRegMask_V0 v0) %{
 instruct vfneg(vReg dst, vReg src) %{
   match(Set dst (NegVF src));
   match(Set dst (NegVD src));
-  ins_cost(VEC_COST);
   format %{ "vfneg $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2308,7 +2239,6 @@ instruct vfneg(vReg dst, vReg src) %{
 instruct vfneg_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (NegVF dst_src v0));
   match(Set dst_src (NegVD dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vfneg_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -2327,7 +2257,6 @@ instruct reduce_and(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AndReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_and $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2342,7 +2271,6 @@ instruct reduce_andL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (AndReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_andL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2361,7 +2289,6 @@ instruct reduce_and_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AndReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_and_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2377,7 +2304,6 @@ instruct reduce_andL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (AndReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_andL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2397,7 +2323,6 @@ instruct reduce_or(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (OrReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_or $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2412,7 +2337,6 @@ instruct reduce_orL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (OrReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_orL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2431,7 +2355,6 @@ instruct reduce_or_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V0
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (OrReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_or_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2447,7 +2370,6 @@ instruct reduce_orL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0,
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (OrReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_orL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2467,7 +2389,6 @@ instruct reduce_xor(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (XorReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_xor $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2482,7 +2403,6 @@ instruct reduce_xorL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (XorReductionV src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_xorL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2501,7 +2421,6 @@ instruct reduce_xor_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (XorReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_xor_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2517,7 +2436,6 @@ instruct reduce_xorL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (XorReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_xorL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2537,7 +2455,6 @@ instruct reduce_add(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AddReductionVI src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_add $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2552,7 +2469,6 @@ instruct reduce_addL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (AddReductionVL src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2575,7 +2491,6 @@ instruct reduce_addF_ordered(fRegF dst, fRegF src1, vReg src2, vReg tmp) %{
   predicate(n->as_Reduction()->requires_strict_order());
   match(Set dst (AddReductionVF src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addF_ordered $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this, $src2));
@@ -2591,7 +2506,6 @@ instruct reduce_addF_unordered(fRegF dst, fRegF src1, vReg src2, vReg tmp) %{
   predicate(!n->as_Reduction()->requires_strict_order());
   match(Set dst (AddReductionVF src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addF_unordered $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this, $src2));
@@ -2607,7 +2521,6 @@ instruct reduce_addD_ordered(fRegD dst, fRegD src1, vReg src2, vReg tmp) %{
   predicate(n->as_Reduction()->requires_strict_order());
   match(Set dst (AddReductionVD src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addD_ordered $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_DOUBLE, Matcher::vector_length(this, $src2));
@@ -2623,7 +2536,6 @@ instruct reduce_addD_unordered(fRegD dst, fRegD src1, vReg src2, vReg tmp) %{
   predicate(!n->as_Reduction()->requires_strict_order());
   match(Set dst (AddReductionVD src1 src2));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addD_unordered $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_DOUBLE, Matcher::vector_length(this, $src2));
@@ -2643,7 +2555,6 @@ instruct reduce_add_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_V
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (AddReductionVI (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_add_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2659,7 +2570,6 @@ instruct reduce_addL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (AddReductionVL (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2674,7 +2584,6 @@ instruct reduce_addL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v0
 instruct reduce_addF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   match(Set dst (AddReductionVF (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addF_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this, $src2));
@@ -2689,7 +2598,6 @@ instruct reduce_addF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, vR
 instruct reduce_addD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, vReg tmp) %{
   match(Set dst (AddReductionVD (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "reduce_addD_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     __ vsetvli_helper(T_DOUBLE, Matcher::vector_length(this, $src2));
@@ -2708,7 +2616,6 @@ instruct vreduce_max(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MaxReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vreduce_max $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
@@ -2723,7 +2630,6 @@ instruct vreduce_max(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
 instruct vreduce_maxL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (MaxReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vreduce_maxL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
@@ -2743,7 +2649,6 @@ instruct vreduce_max_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MaxReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "vreduce_max_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2759,7 +2664,6 @@ instruct vreduce_maxL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (MaxReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "vreduce_maxL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2778,7 +2682,6 @@ instruct vreduce_min(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MinReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vreduce_min $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
@@ -2793,7 +2696,6 @@ instruct vreduce_min(iRegINoSp dst, iRegIorL2I src1, vReg src2, vReg tmp) %{
 instruct vreduce_minL(iRegLNoSp dst, iRegL src1, vReg src2, vReg tmp) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (MinReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP tmp);
   format %{ "vreduce_minL $dst, $src1, $src2\t# KILL $tmp" %}
   ins_encode %{
@@ -2813,7 +2715,6 @@ instruct vreduce_min_masked(iRegINoSp dst, iRegIorL2I src1, vReg src2, vRegMask_
             Matcher::vector_element_basic_type(n->in(2)) == T_INT);
   match(Set dst (MinReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "vreduce_min_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2829,7 +2730,6 @@ instruct vreduce_minL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
   match(Set dst (MinReductionV (Binary src1 src2) v0));
   effect(TEMP tmp);
-  ins_cost(VEC_COST);
   format %{ "vreduce_minL_masked $dst, $src1, $src2, $v0\t# KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this, $src2);
@@ -2846,7 +2746,6 @@ instruct vreduce_minL_masked(iRegLNoSp dst, iRegL src1, vReg src2, vRegMask_V0 v
 instruct vreduce_maxF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT);
   match(Set dst (MaxReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_maxF $dst, $src1, $src2, $tmp1, $tmp2" %}
   ins_encode %{
@@ -2861,7 +2760,6 @@ instruct vreduce_maxF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
 instruct vreduce_maxD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE);
   match(Set dst (MaxReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_maxD $dst, $src1, $src2, $tmp1, $tmp2" %}
   ins_encode %{
@@ -2878,7 +2776,6 @@ instruct vreduce_maxD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
 instruct vreduce_maxF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT);
   match(Set dst (MaxReductionV (Binary src1 src2) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_maxF_masked $dst, $src1, $src2, $v0\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
@@ -2894,7 +2791,6 @@ instruct vreduce_maxF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, v
 instruct vreduce_maxD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE);
   match(Set dst (MaxReductionV (Binary src1 src2) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_maxD_masked $dst, $src1, $src2, $v0\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
@@ -2912,7 +2808,6 @@ instruct vreduce_maxD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, v
 instruct vreduce_minF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT);
   match(Set dst (MinReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_minF $dst, $src1, $src2, $tmp1, $tmp2" %}
   ins_encode %{
@@ -2927,7 +2822,6 @@ instruct vreduce_minF(fRegF dst, fRegF src1, vReg src2, vReg tmp1, vReg tmp2) %{
 instruct vreduce_minD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE);
   match(Set dst (MinReductionV src1 src2));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_minD $dst, $src1, $src2, $tmp1, $tmp2" %}
   ins_encode %{
@@ -2944,7 +2838,6 @@ instruct vreduce_minD(fRegD dst, fRegD src1, vReg src2, vReg tmp1, vReg tmp2) %{
 instruct vreduce_minF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_FLOAT);
   match(Set dst (MinReductionV (Binary src1 src2) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_minF_masked $dst, $src1, $src2, $v0\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
@@ -2960,7 +2853,6 @@ instruct vreduce_minF_masked(fRegF dst, fRegF src1, vReg src2, vRegMask_V0 v0, v
 instruct vreduce_minD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
   predicate(Matcher::vector_element_basic_type(n->in(2)) == T_DOUBLE);
   match(Set dst (MinReductionV (Binary src1 src2) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
   format %{ "vreduce_minD_masked $dst, $src1, $src2, $v0\t# KILL $tmp1, $tmp2" %}
   ins_encode %{
@@ -3039,7 +2931,6 @@ instruct reduce_mulL_masked(iRegLNoSp dst, iRegL isrc, vReg vsrc,
 instruct replicate(vReg dst, iRegIorL2I src) %{
   predicate(Matcher::is_non_long_integral_vector(n));
   match(Set dst (Replicate src));
-  ins_cost(VEC_COST);
   format %{ "replicate $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -3052,7 +2943,6 @@ instruct replicate(vReg dst, iRegIorL2I src) %{
 instruct replicateL(vReg dst, iRegL src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (Replicate src));
-  ins_cost(VEC_COST);
   format %{ "replicateL $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3064,7 +2954,6 @@ instruct replicateL(vReg dst, iRegL src) %{
 instruct replicate_imm5(vReg dst, immI5 con) %{
   predicate(Matcher::is_non_long_integral_vector(n));
   match(Set dst (Replicate con));
-  ins_cost(VEC_COST);
   format %{ "replicate_imm5 $dst, $con" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -3077,7 +2966,6 @@ instruct replicate_imm5(vReg dst, immI5 con) %{
 instruct replicateL_imm5(vReg dst, immL5 con) %{
   predicate(Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst (Replicate con));
-  ins_cost(VEC_COST);
   format %{ "replicateL_imm5 $dst, $con" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3089,7 +2977,6 @@ instruct replicateL_imm5(vReg dst, immL5 con) %{
 instruct replicateHF(vReg dst, fRegF src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
   match(Set dst (Replicate src));
-  ins_cost(VEC_COST);
   format %{ "replicateHF $dst, $src" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -3102,7 +2989,6 @@ instruct replicateHF(vReg dst, fRegF src) %{
 instruct replicateF(vReg dst, fRegF src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_FLOAT);
   match(Set dst (Replicate src));
-  ins_cost(VEC_COST);
   format %{ "replicateF $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_FLOAT, Matcher::vector_length(this));
@@ -3114,7 +3000,6 @@ instruct replicateF(vReg dst, fRegF src) %{
 instruct replicateD(vReg dst, fRegD src) %{
   predicate(Matcher::vector_element_basic_type(n) == T_DOUBLE);
   match(Set dst (Replicate src));
-  ins_cost(VEC_COST);
   format %{ "replicateD $dst, $src" %}
   ins_encode %{
     __ vsetvli_helper(T_DOUBLE, Matcher::vector_length(this));
@@ -3153,7 +3038,6 @@ instruct replicateD(vReg dst, fRegD src) %{
 
 instruct vasrB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (RShiftVB src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vasrB $dst, $src, $shift" %}
   ins_encode %{
@@ -3172,7 +3056,6 @@ instruct vasrB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vasrS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (RShiftVS src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vasrS $dst, $src, $shift" %}
   ins_encode %{
@@ -3191,7 +3074,6 @@ instruct vasrS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vasrI(vReg dst, vReg src, vReg shift) %{
   match(Set dst (RShiftVI src shift));
-  ins_cost(VEC_COST);
   format %{ "vasrI $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3203,7 +3085,6 @@ instruct vasrI(vReg dst, vReg src, vReg shift) %{
 
 instruct vasrL(vReg dst, vReg src, vReg shift) %{
   match(Set dst (RShiftVL src shift));
-  ins_cost(VEC_COST);
   format %{ "vasrL $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3215,7 +3096,6 @@ instruct vasrL(vReg dst, vReg src, vReg shift) %{
 
 instruct vasrB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVB (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vasrB_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3233,7 +3113,6 @@ instruct vasrB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vasrS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVS (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vasrS_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3251,7 +3130,6 @@ instruct vasrS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vasrI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVI (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vasrI_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3264,7 +3142,6 @@ instruct vasrI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vasrL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVL (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vasrL_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3277,7 +3154,6 @@ instruct vasrL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlslB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (LShiftVB src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vlslB $dst, $src, $shift" %}
   ins_encode %{
@@ -3296,7 +3172,6 @@ instruct vlslB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlslS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (LShiftVS src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vlslS $dst, $src, $shift" %}
   ins_encode %{
@@ -3315,7 +3190,6 @@ instruct vlslS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlslI(vReg dst, vReg src, vReg shift) %{
   match(Set dst (LShiftVI src shift));
-  ins_cost(VEC_COST);
   format %{ "vlslI $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3327,7 +3201,6 @@ instruct vlslI(vReg dst, vReg src, vReg shift) %{
 
 instruct vlslL(vReg dst, vReg src, vReg shift) %{
   match(Set dst (LShiftVL src shift));
-  ins_cost(VEC_COST);
   format %{ "vlslL $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3339,7 +3212,6 @@ instruct vlslL(vReg dst, vReg src, vReg shift) %{
 
 instruct vlslB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVB (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vlslB_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3360,7 +3232,6 @@ instruct vlslB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vlslS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVS (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vlslS_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3381,7 +3252,6 @@ instruct vlslS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vlslI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVI (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vlslI_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3394,7 +3264,6 @@ instruct vlslI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlslL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVL (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vlslL_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3407,7 +3276,6 @@ instruct vlslL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlsrB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (URShiftVB src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vlsrB $dst, $src, $shift" %}
   ins_encode %{
@@ -3426,7 +3294,6 @@ instruct vlsrB(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlsrS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst (URShiftVS src shift));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst, TEMP v0);
   format %{ "vlsrS $dst, $src, $shift" %}
   ins_encode %{
@@ -3445,7 +3312,6 @@ instruct vlsrS(vReg dst, vReg src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlsrI(vReg dst, vReg src, vReg shift) %{
   match(Set dst (URShiftVI src shift));
-  ins_cost(VEC_COST);
   format %{ "vlsrI $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_INT, Matcher::vector_length(this));
@@ -3457,7 +3323,6 @@ instruct vlsrI(vReg dst, vReg src, vReg shift) %{
 
 instruct vlsrL(vReg dst, vReg src, vReg shift) %{
   match(Set dst (URShiftVL src shift));
-  ins_cost(VEC_COST);
   format %{ "vlsrL $dst, $src, $shift" %}
   ins_encode %{
     __ vsetvli_helper(T_LONG, Matcher::vector_length(this));
@@ -3469,7 +3334,6 @@ instruct vlsrL(vReg dst, vReg src, vReg shift) %{
 
 instruct vlsrB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVB (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vlsrB_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3490,7 +3354,6 @@ instruct vlsrB_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vlsrS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVS (Binary dst_src shift) vmask));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src, TEMP v0);
   format %{ "vlsrS_masked $dst_src, $dst_src, $shift, $vmask\t# KILL $v0" %}
   ins_encode %{
@@ -3511,7 +3374,6 @@ instruct vlsrS_masked(vReg dst_src, vReg shift, vRegMask vmask, vRegMask_V0 v0)
 
 instruct vlsrI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVI (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vlsrI_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3524,7 +3386,6 @@ instruct vlsrI_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vlsrL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVL (Binary dst_src shift) v0));
-  ins_cost(VEC_COST);
   effect(TEMP_DEF dst_src);
   format %{ "vlsrL_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
@@ -3537,7 +3398,6 @@ instruct vlsrL_masked(vReg dst_src, vReg shift, vRegMask_V0 v0) %{
 
 instruct vasrB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVB src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vasrB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3555,7 +3415,6 @@ instruct vasrB_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vasrS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVS src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vasrS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3573,7 +3432,6 @@ instruct vasrS_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vasrI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (RShiftVI src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vasrI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3591,7 +3449,6 @@ instruct vasrI_vi(vReg dst, vReg src, immI shift) %{
 instruct vasrL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (RShiftVL src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vasrL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3608,7 +3465,6 @@ instruct vasrL_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vasrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVB (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vasrB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3625,7 +3481,6 @@ instruct vasrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vasrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVS (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vasrS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3642,7 +3497,6 @@ instruct vasrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vasrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (RShiftVI (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vasrI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3659,7 +3513,6 @@ instruct vasrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 instruct vasrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (RShiftVL (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vasrL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3675,7 +3528,6 @@ instruct vasrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlsrB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVB src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlsrB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3697,7 +3549,6 @@ instruct vlsrB_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlsrS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVS src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlsrS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3719,7 +3570,6 @@ instruct vlsrS_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlsrI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (URShiftVI src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlsrI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3737,7 +3587,6 @@ instruct vlsrI_vi(vReg dst, vReg src, immI shift) %{
 instruct vlsrL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (URShiftVL src (RShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlsrL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3754,7 +3603,6 @@ instruct vlsrL_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlsrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVB (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlsrB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3775,7 +3623,6 @@ instruct vlsrB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlsrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVS (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlsrS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3796,7 +3643,6 @@ instruct vlsrS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlsrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (URShiftVI (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlsrI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3813,7 +3659,6 @@ instruct vlsrI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 instruct vlsrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (URShiftVL (Binary dst_src (RShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlsrL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3829,7 +3674,6 @@ instruct vlsrL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlslB_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVB src (LShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlslB_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3846,7 +3690,6 @@ instruct vlslB_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlslS_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVS src (LShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlslS_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3863,7 +3706,6 @@ instruct vlslS_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlslI_vi(vReg dst, vReg src, immI shift) %{
   match(Set dst (LShiftVI src (LShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlslI_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3876,7 +3718,6 @@ instruct vlslI_vi(vReg dst, vReg src, immI shift) %{
 instruct vlslL_vi(vReg dst, vReg src, immI shift) %{
   predicate((n->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst (LShiftVL src (LShiftCntV shift)));
-  ins_cost(VEC_COST);
   format %{ "vlslL_vi $dst, $src, $shift" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3888,7 +3729,6 @@ instruct vlslL_vi(vReg dst, vReg src, immI shift) %{
 
 instruct vlslB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVB (Binary dst_src (LShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlslB_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3906,7 +3746,6 @@ instruct vlslB_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlslS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVS (Binary dst_src (LShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlslS_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3924,7 +3763,6 @@ instruct vlslS_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vlslI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   match(Set dst_src (LShiftVI (Binary dst_src (LShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlslI_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -3938,7 +3776,6 @@ instruct vlslI_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 instruct vlslL_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
   predicate((n->in(1)->in(2)->in(1)->get_int() & 0x3f) < 32);
   match(Set dst_src (LShiftVL (Binary dst_src (LShiftCntV shift)) v0));
-  ins_cost(VEC_COST);
   format %{ "vlslL_vi_masked $dst_src, $dst_src, $shift, $v0" %}
   ins_encode %{
     uint32_t con = (unsigned)$shift$$constant & 0x1f;
@@ -4144,7 +3981,6 @@ instruct vrotate_left_vi_masked(vReg dst_src, immI shift, vRegMask_V0 v0) %{
 
 instruct vsqrt_hfp(vReg dst, vReg src) %{
   match(Set dst (SqrtVHF src));
-  ins_cost(VEC_COST);
   format %{ "vsqrt_hfp $dst, $src" %}
   ins_encode %{
     assert(UseZvfh, "must");
@@ -4158,7 +3994,6 @@ instruct vsqrt_hfp(vReg dst, vReg src) %{
 instruct vsqrt_fp(vReg dst, vReg src) %{
   match(Set dst (SqrtVF src));
   match(Set dst (SqrtVD src));
-  ins_cost(VEC_COST);
   format %{ "vsqrt_fp $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -4173,7 +4008,6 @@ instruct vsqrt_fp(vReg dst, vReg src) %{
 instruct vsqrt_fp_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (SqrtVF dst_src v0));
   match(Set dst_src (SqrtVD dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vsqrt_fp_masked $dst_src, $dst_src, $v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -4472,7 +4306,6 @@ instruct vclearArray_reg_reg(iRegL_R29 cnt, iRegP_R28 base, Universe dummy,
 // Vector Load Const
 instruct vloadcon(vReg dst, immI0 src) %{
   match(Set dst (VectorLoadConst src));
-  ins_cost(VEC_COST);
   format %{ "vloadcon $dst\t# generate iota indices" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5341,7 +5174,6 @@ instruct vconvF2HF(vReg dst, vReg src, vReg vtmp, vRegMask_V0 v0, iRegINoSp tmp)
 instruct vpopcount_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (PopCountVI dst_src v0));
   match(Set dst_src (PopCountVL dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vcpop_v $dst_src, $dst_src, $v0\t# vcpop_v with mask" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5355,7 +5187,6 @@ instruct vpopcount_masked(vReg dst_src, vRegMask_V0 v0) %{
 instruct vpopcount(vReg dst, vReg src) %{
   match(Set dst (PopCountVI src));
   match(Set dst (PopCountVL src));
-  ins_cost(VEC_COST);
   format %{ "vcpop_v $dst, $src\t# vcpop_v without mask" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5370,7 +5201,6 @@ instruct vpopcount(vReg dst, vReg src) %{
 
 instruct vcountLeadingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (CountLeadingZerosV dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vcount_leading_zeros_masked $dst_src, $dst_src, v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5383,7 +5213,6 @@ instruct vcountLeadingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
 
 instruct vcountLeadingZeros(vReg dst, vReg src) %{
   match(Set dst (CountLeadingZerosV src));
-  ins_cost(VEC_COST);
   format %{ "vcount_leading_zeros $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5398,7 +5227,6 @@ instruct vcountLeadingZeros(vReg dst, vReg src) %{
 
 instruct vcountTrailingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
   match(Set dst_src (CountTrailingZerosV dst_src v0));
-  ins_cost(VEC_COST);
   format %{ "vcount_trailing_zeros_masked $dst_src, $dst_src, v0" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
@@ -5411,7 +5239,6 @@ instruct vcountTrailingZeros_masked(vReg dst_src, vRegMask_V0 v0) %{
 
 instruct vcountTrailingZeros(vReg dst, vReg src) %{
   match(Set dst (CountTrailingZerosV src));
-  ins_cost(VEC_COST);
   format %{ "vcount_trailing_zeros $dst, $src" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);

From a175767ccfb3dbcc04d1ba97f9fb2f57dc5ab5cf Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 21 May 2025 12:54:05 +0000
Subject: [PATCH 559/901] 8357018: Guidance for ParallelRefProcEnabled is wrong
 in the man pages

Reviewed-by: kbarrett, iwalulya
---
 src/java.base/share/man/java.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 987dbf64159..1dba3c6ba54 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -2701,7 +2701,12 @@ Java HotSpot VM.
     >   `-XX:ParallelGCThreads=2`
 
 `-XX:+ParallelRefProcEnabled`
-:   Enables parallel reference processing. By default, this option is disabled.
+:   Enables parallel reference processing. By default, collectors employing multiple
+    threads perform parallel reference processing if the number of parallel threads
+    to use is larger than one.
+    The option is available only when the throughput or G1 garbage collector is used
+    (`-XX:+UseParallelGC` or `-XX:+UseG1GC`). Other collectors employing multiple
+    threads always perform reference processing in parallel.
 
 `-XX:+PrintAdaptiveSizePolicy`
 :   Enables printing of information about adaptive-generation sizing. By

From a07150af1139b262513a25f4fdd32173af95ff4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 21 May 2025 13:24:39 +0000
Subject: [PATCH 560/901] 8357376: Disable syntax highlighting for JDK API docs

Reviewed-by: erikj
---
 make/Docs.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 4733b22b1ad..9026217fa42 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -98,7 +98,7 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary --syntax-highlight
+    --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.

From b63ec0ab584cb941b44a39b6ff130224ed444b60 Mon Sep 17 00:00:00 2001
From: Chihiro Ito <cito@openjdk.org>
Date: Wed, 21 May 2025 14:05:33 +0000
Subject: [PATCH 561/901] 8356945: jdk/jfr/event/os/TestProcessStart failed on
 Windows Subsystem for Linux

Reviewed-by: egahlin
---
 test/jdk/jdk/jfr/event/os/TestProcessStart.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/os/TestProcessStart.java b/test/jdk/jdk/jfr/event/os/TestProcessStart.java
index 2d1d80f5941..caca8bd443e 100644
--- a/test/jdk/jdk/jfr/event/os/TestProcessStart.java
+++ b/test/jdk/jdk/jfr/event/os/TestProcessStart.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
@@ -51,11 +51,12 @@ public static void main(String[] args) throws Throwable {
             recording.start();
             List<String> commandList = new ArrayList<>();
             if (Platform.isWindows()) {
+                commandList.add("help");
                 commandList.add("dir");
             } else {
                 commandList.add("ls");
+                commandList.add("*.jfr");
             }
-            commandList.add("*.jfr");
             ProcessBuilder pb = new ProcessBuilder(commandList);
             pb.directory(new File(".").getAbsoluteFile());
             Process p = pb.start();

From 21c1282207614e57138b37a7adca4ccf11cf5bef Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 21 May 2025 14:37:14 +0000
Subject: [PATCH 562/901] 8333664: Decouple command line parsing and package
 building in jpackage

Reviewed-by: almatvee
---
 .../jpackage/internal/DesktopIntegration.java | 346 +++----
 .../jpackage/internal/LinuxAppBundler.java    |  11 +-
 .../internal/LinuxAppImageBuilder.java        | 138 ---
 .../internal/LinuxApplicationLayout.java      |  46 +
 .../LinuxApplicationLayoutMixin.java}         |  29 +-
 .../jpackage/internal/LinuxDebBundler.java    | 262 ++---
 .../internal/LinuxDebPackageBuilder.java      |  62 ++
 .../jpackage/internal/LinuxFromParams.java    | 142 +++
 .../internal/LinuxLaunchersAsServices.java    |  44 +-
 .../jpackage/internal/LinuxPackageArch.java   | 105 ++
 .../internal/LinuxPackageBuilder.java         | 185 ++++
 .../internal/LinuxPackageBundler.java         | 310 ++----
 .../internal/LinuxPackagingPipeline.java      |  86 ++
 .../jpackage/internal/LinuxRpmBundler.java    | 232 +----
 .../internal/LinuxRpmPackageBuilder.java      |  62 ++
 .../internal/model/LinuxApplication.java      |  47 +
 .../internal/model/LinuxDebPackage.java       |  79 ++
 .../internal/model/LinuxDebPackageMixin.java  |  44 +
 .../internal/model/LinuxLauncher.java         |  55 +
 .../internal/model/LinuxLauncherMixin.java    |  55 +
 .../jpackage/internal/model/LinuxPackage.java |  90 ++
 .../internal/model/LinuxPackageMixin.java     |  95 ++
 .../internal/model/LinuxRpmPackage.java       |  45 +
 .../internal/model/LinuxRpmPackageMixin.java  |  43 +
 .../resources/LinuxResources.properties       |   4 +-
 .../internal/AppImageInfoPListFile.java       |  67 ++
 .../jdk/jpackage/internal/AppImageSigner.java | 239 +++++
 .../AppImageSigningConfigBuilder.java         |  87 ++
 .../jdk/jpackage/internal/Codesign.java       | 119 +++
 .../jdk/jpackage/internal/CodesignConfig.java | 131 +++
 .../jdk/jpackage/internal/Keychain.java       | 105 ++
 .../jdk/jpackage/internal/MacAppBundler.java  | 139 +--
 .../jpackage/internal/MacAppImageBuilder.java | 942 ------------------
 .../internal/MacAppImageFileExtras.java       |  37 +
 .../internal/MacApplicationBuilder.java       | 236 +++++
 .../internal/MacApplicationLayout.java        |  46 +
 .../internal/MacApplicationLayoutMixin.java   |  39 +
 .../internal/MacBaseInstallerBundler.java     | 145 +--
 .../jdk/jpackage/internal/MacCertificate.java | 335 -------
 .../internal/MacCertificateUtils.java         | 116 +++
 .../jdk/jpackage/internal/MacDmgBundler.java  | 511 +---------
 .../internal/MacDmgPackageBuilder.java        |  75 ++
 .../jdk/jpackage/internal/MacDmgPackager.java | 530 ++++++++++
 .../internal/MacFileAssociationBuilder.java   | 124 +++
 .../jdk/jpackage/internal/MacFromParams.java  | 364 +++++++
 .../internal/MacLaunchersAsServices.java      |  68 +-
 .../jpackage/internal/MacPackageBuilder.java  |  54 +
 .../internal/MacPackagingPipeline.java        | 460 +++++++++
 .../jdk/jpackage/internal/MacPkgBundler.java  | 715 +------------
 .../internal/MacPkgPackageBuilder.java        |  61 ++
 .../jdk/jpackage/internal/MacPkgPackager.java | 564 +++++++++++
 .../internal/SigningIdentityBuilder.java      | 245 +++++
 .../internal/SigningIdentityImpl.java         |  42 +
 .../jdk/jpackage/internal/TempKeychain.java   |  98 ++
 .../internal/model/AppImageSigningConfig.java |  46 +
 .../internal/model/MacApplication.java        | 104 ++
 .../internal/model/MacApplicationMixin.java   |  47 +
 .../internal/model/MacDmgPackage.java         |  34 +
 .../internal/model/MacDmgPackageMixin.java    |  46 +
 .../internal/model/MacFileAssociation.java    |  34 +
 .../model/MacFileAssociationMixin.java        |  60 ++
 .../jpackage/internal/model/MacLauncher.java  |  34 +
 .../jpackage/internal/model/MacPackage.java   |  52 +
 .../internal/model/MacPackageMixin.java       |  49 +
 .../internal/model/MacPkgPackage.java         |  43 +
 .../internal/model/MacPkgPackageMixin.java    |  35 +
 .../internal/model/PkgSigningConfig.java      |  38 +
 .../internal/model/SigningIdentity.java       |  32 +
 .../resources/adjust-component-plist.xsl      |  55 +
 .../jpackage/internal/util/PListWriter.java   | 123 +++
 .../internal/AbstractAppImageBuilder.java     | 168 ----
 .../jpackage/internal/AbstractBundler.java    |  10 +-
 .../jpackage/internal/AppImageBundler.java    |  84 +-
 .../jdk/jpackage/internal/AppImageDesc.java   |  55 +
 .../jdk/jpackage/internal/AppImageFile.java   | 576 +++++------
 .../jpackage/internal/ApplicationBuilder.java | 197 ++++
 .../internal/ApplicationImageUtils.java       | 153 +++
 .../jpackage/internal/ApplicationLayout.java  | 240 -----
 .../internal/ApplicationLayoutUtils.java      |  71 ++
 .../jdk/jpackage/internal/Arguments.java      |   5 +-
 .../jdk/jpackage/internal/BuildEnv.java       |  95 ++
 .../jpackage/internal/BuildEnvBuilder.java    |  98 ++
 .../jpackage/internal/BuildEnvFromParams.java |  63 ++
 .../jpackage/internal/BundlerParamInfo.java   |  93 +-
 .../jdk/jpackage/internal/CfgFile.java        | 115 +--
 .../internal/CompositeProxyTunnel.java        |  45 +
 .../jpackage/internal/FileAssociation.java    | 108 --
 .../internal/FileAssociationGroup.java        | 136 +++
 .../internal/FileAssociationScaner.java       | 100 ++
 .../jdk/jpackage/internal/FromParams.java     | 202 ++++
 .../classes/jdk/jpackage/internal/I18N.java   |  36 +-
 .../jpackage/internal/InstallableFile.java    |  43 +-
 ...erHelper.java => JLinkRuntimeBuilder.java} | 179 ++--
 .../jpackage/internal/LauncherAsService.java  |  24 +-
 .../jpackage/internal/LauncherBuilder.java    | 173 ++++
 .../jdk/jpackage/internal/LauncherData.java   |   2 +-
 .../jpackage/internal/LauncherFromParams.java | 156 +++
 .../internal/LauncherStartupInfoBuilder.java  |  95 ++
 .../internal/OverridableResource.java         |  57 +-
 .../jdk/jpackage/internal/PackageBuilder.java | 249 +++++
 .../jdk/jpackage/internal/PackageFile.java    |  27 +-
 .../jpackage/internal/PackagerBuilder.java    |  75 ++
 .../jpackage/internal/PackagingPipeline.java  | 618 ++++++++++++
 .../internal/RuntimeBuilderBuilder.java       | 186 ++++
 .../jdk/jpackage/internal/ScriptRunner.java   |  14 +-
 .../internal/StandardBundlerParam.java        | 284 ++----
 .../internal/model/AppImageLayout.java        | 121 +++
 .../internal/model/AppImagePackageType.java   |  41 +
 .../jpackage/internal/model/Application.java  | 251 +++++
 .../internal/model/ApplicationLaunchers.java  |  68 ++
 .../internal/model/ApplicationLayout.java     | 198 ++++
 .../model/ApplicationLayoutMixin.java         |  64 ++
 .../internal/model/ApplicationWriter.java     |  49 +
 .../internal/model/ConfigException.java       |  83 +-
 .../internal/model/CustomLauncherIcon.java    |  74 ++
 .../internal/model/DefaultLauncherIcon.java   |  57 ++
 .../internal/model/FileAssociation.java       |  74 ++
 .../jdk/jpackage/internal/model/I18N.java     |  21 +-
 .../jdk/jpackage/internal/model/Launcher.java | 190 ++++
 .../jpackage/internal/model/LauncherIcon.java |  31 +
 .../model/LauncherJarStartupInfo.java         |  49 +
 .../model/LauncherJarStartupInfoMixin.java    |  50 +
 .../model/LauncherModularStartupInfo.java     |  49 +
 .../LauncherModularStartupInfoMixin.java      |  53 +
 .../internal/model/LauncherStartupInfo.java   |  90 ++
 .../jdk/jpackage/internal/model/Package.java  | 331 ++++++
 .../jpackage/internal/model/PackageType.java  |  34 +
 .../internal/model/PackageWriter.java         |  47 +
 .../internal/model/PackagerException.java     |  53 +-
 .../internal/model/RuntimeBuilder.java        |  57 ++
 .../internal/model/RuntimeLayout.java         |  73 ++
 .../internal/model/StandardPackageType.java   |  52 +
 .../jpackage/internal/model/package-info.java |  34 +
 .../internal/pipeline/BinaryMatrix.java       | 256 +++++
 .../internal/pipeline/DirectedEdge.java       |  52 +
 .../jpackage/internal/pipeline/FixedDAG.java  | 352 +++++++
 .../pipeline/TaskPipelineBuilder.java         | 211 ++++
 .../internal/pipeline/TaskSpecBuilder.java    |  88 ++
 .../resources/MainResources.properties        |   5 +-
 .../internal/util/CollectionUtils.java        |  81 ++
 .../internal/util/CompositeProxy.java         | 531 ++++++++++
 .../util/LocalizedExceptionBuilder.java       | 151 +++
 .../jdk/jpackage/internal/util/PathGroup.java |   4 +-
 .../jdk/jpackage/internal/util/PathUtils.java |  18 +-
 .../jpackage/internal/util/StringBundle.java  |  78 ++
 .../share/classes/module-info.java            |   4 +-
 .../jdk/jpackage/internal/PackageScripts.java |   6 +-
 .../jpackage/internal/ShellCustomAction.java  |   5 +-
 .../internal/ShellCustomActionFactory.java    |   7 +-
 .../internal/UnixLaunchersAsServices.java     |  32 +-
 .../internal/ExecutableRebrander.java         | 272 +++--
 .../jpackage/internal/OSVersionCondition.java |  39 +-
 .../jdk/jpackage/internal/WinAppBundler.java  |  11 +-
 .../jdk/jpackage/internal/WinExeBundler.java  |  77 +-
 .../internal/WinExePackageBuilder.java        |  55 +
 .../jdk/jpackage/internal/WinFromParams.java  | 157 +++
 .../jdk/jpackage/internal/WinMsiBundler.java  | 527 +++-------
 .../internal/WinMsiPackageBuilder.java        | 146 +++
 .../internal/WinPackagingPipeline.java        |  85 ++
 .../internal/WindowsAppImageBuilder.java      | 145 ---
 .../internal/WixAppImageFragmentBuilder.java  | 370 +++----
 .../jpackage/internal/WixFragmentBuilder.java |  19 +-
 .../internal/WixLauncherAsService.java        |  13 +-
 .../jpackage/internal/WixSourceConverter.java |   9 +-
 .../internal/WixUiFragmentBuilder.java        |  54 +-
 .../jpackage/internal/model/MsiVersion.java   |  23 +-
 .../internal/model/WinApplication.java        |  34 +
 .../internal/model/WinApplicationMixin.java   |  36 +
 .../internal/model/WinExePackage.java         |  51 +
 .../internal/model/WinExePackageMixin.java    |  37 +
 .../jpackage/internal/model/WinLauncher.java  |  56 ++
 .../internal/model/WinLauncherMixin.java      |  53 +
 .../internal/model/WinMsiPackage.java         |  36 +
 .../internal/model/WinMsiPackageMixin.java    |  57 ++
 .../jdk/tools/jpackage/clean_stashed_files.sh | 196 ++++
 .../jdk/jpackage/test/AdditionalLauncher.java |   8 +-
 .../jdk/jpackage/test/ConfigFilesStasher.java | 392 ++++++++
 .../jdk/jpackage/test/JPackageCommand.java    |   8 +
 .../jdk/jpackage/test/JPackageUserScript.java |  63 +-
 .../helpers/jdk/jpackage/test/TKit.java       |   4 +-
 test/jdk/tools/jpackage/junit/TEST.properties |   5 +-
 .../jpackage/internal/AppImageFileTest.java   | 392 ++++----
 .../internal/ApplicationLayoutTest.java       | 103 --
 .../internal/OverridableResourceTest.java     |  16 +-
 .../internal/model/AppImageLayoutTest.java    |  70 ++
 .../internal/model/ApplicationLayoutTest.java | 112 +++
 .../internal/pipeline/BinaryMatrixTest.java   | 388 ++++++++
 .../internal/pipeline/DirectedEdgeTest.java   |  57 ++
 .../internal/pipeline/FixedDAGTest.java       | 438 ++++++++
 .../pipeline/TaskPipelineBuilderTest.java     | 496 +++++++++
 .../internal/util/CompositeProxyTest.java     | 374 +++++++
 .../jpackage/share/PostImageScriptTest.java   |  10 +-
 .../jpackage/share/RuntimeImageTest.java      |   9 +
 193 files changed, 18051 insertions(+), 6602 deletions(-)
 delete mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java
 rename src/jdk.jpackage/{share/classes/jdk/jpackage/internal/PlatformPackage.java => linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java} (64%)
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageArch.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxApplication.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackage.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackageMixin.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncherMixin.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackage.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackage.java
 create mode 100644 src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackageMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageInfoPListFile.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CodesignConfig.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Keychain.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayout.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayoutMixin.java
 delete mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificateUtils.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/AppImageSigningConfig.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplicationMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackage.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociation.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacLauncher.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackageMixin.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/PkgSigningConfig.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/SigningIdentity.java
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl
 create mode 100644 src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnv.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/CompositeProxyTunnel.java
 delete mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationScaner.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/{JLinkBundlerHelper.java => JLinkRuntimeBuilder.java} (65%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageLayout.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLaunchers.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayout.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayoutMixin.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/CustomLauncherIcon.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/DefaultLauncherIcon.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/FileAssociation.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Launcher.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherIcon.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfo.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfoMixin.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfo.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherStartupInfo.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeLayout.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/package-info.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/BinaryMatrix.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/DirectedEdge.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/FixedDAG.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskPipelineBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskSpecBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/LocalizedExceptionBuilder.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/StringBundle.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
 delete mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackage.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackageMixin.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncherMixin.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java
 create mode 100644 src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java
 create mode 100644 test/jdk/tools/jpackage/clean_stashed_files.sh
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
 delete mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/AppImageLayoutTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/ApplicationLayoutTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/BinaryMatrixTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/DirectedEdgeTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/FixedDAGTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/TaskPipelineBuilderTest.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CompositeProxyTest.java

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java
index a9cf2682cd7..8de462abac7 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.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
@@ -24,10 +24,13 @@
  */
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.LinuxLauncher;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.Launcher;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,24 +41,16 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.imageio.ImageIO;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import jdk.jpackage.internal.Arguments.CLIOptions;
-import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
-import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
+import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.util.CompositeProxy;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.XmlUtils;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
 /**
  * Helper to create files for desktop integration.
@@ -70,116 +65,86 @@ final class DesktopIntegration extends ShellCustomAction {
     private static final List<String> REPLACEMENT_STRING_IDS = List.of(
             COMMANDS_INSTALL, COMMANDS_UNINSTALL, SCRIPTS, COMMON_SCRIPTS);
 
-    private DesktopIntegration(PlatformPackage thePackage,
-            Map<String, ? super Object> params,
-            Map<String, ? super Object> mainParams) throws IOException {
+    private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launcher) throws IOException {
 
-        associations = FileAssociation.fetchFrom(params).stream()
-                .filter(fa -> !fa.mimeTypes.isEmpty())
-                .map(LinuxFileAssociation::new)
-                .collect(Collectors.toUnmodifiableList());
+        associations = launcher.fileAssociations().stream().map(
+                LinuxFileAssociation::create).toList();
 
-        launchers = ADD_LAUNCHERS.fetchFrom(params);
-
-        this.thePackage = thePackage;
+        this.env = env;
+        this.pkg = pkg;
+        this.launcher = launcher;
 
         // Need desktop and icon files if one of conditions is met:
         //  - there are file associations configured
         //  - user explicitly requested to create a shortcut
-        boolean withDesktopFile = !associations.isEmpty() || LINUX_SHORTCUT_HINT.fetchFrom(params);
+        boolean withDesktopFile = !associations.isEmpty() || launcher.shortcut().orElse(false);
+
+        var curIconResource = createLauncherIconResource(pkg.app(), launcher,
+                env::createResource);
 
-        var curIconResource = LinuxAppImageBuilder.createIconResource(DEFAULT_ICON,
-                ICON_PNG, params, mainParams);
-        if (curIconResource == null) {
+        if (curIconResource.isEmpty()) {
             // This is additional launcher with explicit `no icon` configuration.
             withDesktopFile = false;
         } else {
             final Path nullPath = null;
-            if (curIconResource.saveToFile(nullPath)
-                    != OverridableResource.Source.DefaultResource) {
+            if (curIconResource.get().saveToFile(nullPath) != OverridableResource.Source.DefaultResource) {
                 // This launcher has custom icon configured.
                 withDesktopFile = true;
             }
         }
 
-        desktopFileResource = createResource("template.desktop", params)
+        desktopFileResource = env.createResource("template.desktop")
                 .setCategory(I18N.getString("resource.menu-shortcut-descriptor"))
-                .setPublicName(APP_NAME.fetchFrom(params) + ".desktop");
+                .setPublicName(launcher.name() + ".desktop");
 
-        final String escapedAppFileName = APP_NAME.fetchFrom(params).replaceAll("\\s+", "_");
+        final String escapedAppFileName = launcher.name().replaceAll("\\s+", "_");
 
         // XDG recommends to use vendor prefix in desktop file names as xdg
         // commands copy files to system directories.
         // Package name should be a good prefix.
         final String desktopFileName = String.format("%s-%s.desktop",
-                    thePackage.name(), escapedAppFileName);
+                    pkg.packageName(), escapedAppFileName);
         final String mimeInfoFileName = String.format("%s-%s-MimeInfo.xml",
-                    thePackage.name(), escapedAppFileName);
+                    pkg.packageName(), escapedAppFileName);
 
-        mimeInfoFile = new DesktopFile(mimeInfoFileName);
+        mimeInfoFile = createDesktopFile(mimeInfoFileName);
 
         if (withDesktopFile) {
-            desktopFile = new DesktopFile(desktopFileName);
-            iconFile = new DesktopFile(escapedAppFileName
-                    + PathUtils.getSuffix(Path.of(DEFAULT_ICON)));
+            desktopFile = Optional.of(createDesktopFile(desktopFileName));
+            iconFile = Optional.of(createDesktopFile(escapedAppFileName + ".png"));
 
-            if (curIconResource == null) {
+            if (curIconResource.isEmpty()) {
                 // Create default icon.
-                curIconResource = LinuxAppImageBuilder.createIconResource(
-                        DEFAULT_ICON, ICON_PNG, mainParams, null);
+                curIconResource = createLauncherIconResource(pkg.app(), pkg.app().mainLauncher().orElseThrow(), env::createResource);
             }
         } else {
-            desktopFile = null;
-            iconFile = null;
+            desktopFile = Optional.empty();
+            iconFile = Optional.empty();
         }
 
         iconResource = curIconResource;
 
-        desktopFileData = Collections.unmodifiableMap(
-                createDataForDesktopFile(params));
-
-        nestedIntegrations = new ArrayList<>();
-        // Read launchers information from predefine app image
-        if (launchers.isEmpty() &&
-                PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
-            List<AppImageFile.LauncherInfo> launcherInfos =
-                    AppImageFile.getLaunchers(
-                    PREDEFINED_APP_IMAGE.fetchFrom(params), params);
-            if (!launcherInfos.isEmpty()) {
-                launcherInfos.remove(0); // Remove main launcher
-            }
-            for (var launcherInfo : launcherInfos) {
-                Map<String, ? super Object> launcherParams = new HashMap<>();
-                Arguments.putUnlessNull(launcherParams, CLIOptions.NAME.getId(),
-                        launcherInfo.getName());
-                launcherParams = AddLauncherArguments.merge(params,
-                        launcherParams, ICON.getID(), ICON_PNG.getID(),
-                        ADD_LAUNCHERS.getID(), FILE_ASSOCIATIONS.getID(),
-                        PREDEFINED_APP_IMAGE.getID());
-                if (launcherInfo.isShortcut()) {
-                    nestedIntegrations.add(new DesktopIntegration(thePackage,
-                            launcherParams, params));
-                }
-            }
+        desktopFileData = createDataForDesktopFile();
+
+        if (launcher != pkg.app().mainLauncher().orElseThrow()) {
+            nestedIntegrations = List.of();
         } else {
-            for (var launcherParams : launchers) {
-                launcherParams = AddLauncherArguments.merge(params,
-                        launcherParams, ICON.getID(), ICON_PNG.getID(),
-                        ADD_LAUNCHERS.getID(), FILE_ASSOCIATIONS.getID());
-                if (SHORTCUT_HINT.fetchFrom(launcherParams)) {
-                    nestedIntegrations.add(new DesktopIntegration(thePackage,
-                            launcherParams, params));
-                }
-            }
+            nestedIntegrations = pkg.app().additionalLaunchers().stream().map(v -> {
+                return (LinuxLauncher)v;
+            }).filter(l -> {
+                return l.shortcut().orElse(true);
+            }).map(toFunction(l -> {
+                return new DesktopIntegration(env, pkg, l);
+            })).toList();
         }
     }
 
-    static ShellCustomAction create(PlatformPackage thePackage,
-            Map<String, ? super Object> params) throws IOException {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
+    static ShellCustomAction create(BuildEnv env, Package pkg) throws IOException {
+        if (pkg.isRuntimeInstaller()) {
             return ShellCustomAction.nop(REPLACEMENT_STRING_IDS);
         }
-        return new DesktopIntegration(thePackage, params, null);
+        return new DesktopIntegration(env, (LinuxPackage) pkg,
+                (LinuxLauncher) pkg.app().mainLauncher().orElseThrow());
     }
 
     @Override
@@ -196,19 +161,17 @@ protected List<String> replacementStringIds() {
 
     @Override
     protected Map<String, String> createImpl() throws IOException {
-        associations.forEach(assoc -> assoc.data.verify());
-
-        if (iconFile != null) {
+        if (iconFile.isPresent()) {
             // Create application icon file.
-            iconResource.saveToFile(iconFile.srcPath());
+            iconResource.orElseThrow().saveToFile(iconFile.orElseThrow().srcPath());
         }
 
         Map<String, String> data = new HashMap<>(desktopFileData);
 
         final ShellCommands shellCommands;
-        if (desktopFile != null) {
+        if (desktopFile.isPresent()) {
             // Create application desktop description file.
-            createDesktopFile(data);
+            saveDesktopFile(data);
 
             // Shell commands will be created only if desktop file
             // should be installed.
@@ -258,23 +221,19 @@ protected Map<String, String> createImpl() throws IOException {
     }
 
     private List<String> requiredPackagesSelf() {
-        if (desktopFile != null) {
-            return List.of("xdg-utils");
-        }
-        return Collections.emptyList();
+        return desktopFile.map(file -> List.of("xdg-utils")).orElseGet(Collections::emptyList);
     }
 
-    private Map<String, String> createDataForDesktopFile(
-            Map<String, ? super Object> params) {
+    private Map<String, String> createDataForDesktopFile() {
         Map<String, String> data = new HashMap<>();
-        data.put("APPLICATION_NAME", APP_NAME.fetchFrom(params));
-        data.put("APPLICATION_DESCRIPTION", DESCRIPTION.fetchFrom(params));
-        data.put("APPLICATION_ICON", Optional.ofNullable(iconFile).map(
+        data.put("APPLICATION_NAME", launcher.name());
+        data.put("APPLICATION_DESCRIPTION", launcher.description());
+        data.put("APPLICATION_ICON", iconFile.map(
                 f -> f.installPath().toString()).orElse(null));
-        data.put("DEPLOY_BUNDLE_CATEGORY", MENU_GROUP.fetchFrom(params));
+        data.put("DEPLOY_BUNDLE_CATEGORY", pkg.menuGroupName());
         data.put("APPLICATION_LAUNCHER", Enquoter.forPropertyValues().applyTo(
-                thePackage.installedApplicationLayout().launchersDirectory().resolve(
-                        LinuxAppImageBuilder.getLauncherName(params)).toString()));
+                pkg.asInstalledPackageApplicationLayout().orElseThrow().launchersDirectory().resolve(
+                        launcher.executableNameWithSuffix()).toString()));
 
         return data;
     }
@@ -288,12 +247,13 @@ private class ShellCommands {
             registerIconCmds = new ArrayList<>();
             unregisterIconCmds = new ArrayList<>();
 
-            registerDesktopFileCmd = String.join(" ", "xdg-desktop-menu",
-                    "install", desktopFile.installPath().toString());
+            final var desktopFileInstallPath = desktopFile.orElseThrow().installPath().toString();
+
+            registerDesktopFileCmd = String.join(" ",
+                    "xdg-desktop-menu", "install", desktopFileInstallPath);
             unregisterDesktopFileCmd = String.join(" ",
-                    "do_if_file_belongs_to_single_package", desktopFile.
-                            installPath().toString(), "xdg-desktop-menu",
-                    "uninstall", desktopFile.installPath().toString());
+                    "do_if_file_belongs_to_single_package", desktopFileInstallPath,
+                    "xdg-desktop-menu", "uninstall", desktopFileInstallPath);
         }
 
         void setFileAssociations() {
@@ -305,6 +265,8 @@ void setFileAssociations() {
                             installPath().toString(), "xdg-mime", "uninstall",
                     mimeInfoFile.installPath().toString());
 
+            final var desktopFileInstallPath = desktopFile.orElseThrow().installPath();
+
             //
             // Add manual cleanup of system files to get rid of
             // the default mime type handlers.
@@ -319,11 +281,9 @@ void setFileAssociations() {
             // of non-existing desktop file.
             //
             String cleanUpCommand = String.join(" ",
-                    "do_if_file_belongs_to_single_package", desktopFile.
-                            installPath().toString(),
-                    "desktop_uninstall_default_mime_handler", desktopFile.
-                            installPath().getFileName().toString(), String.join(
-                            " ", getMimeTypeNamesFromFileAssociations()));
+                    "do_if_file_belongs_to_single_package", desktopFileInstallPath.toString(),
+                    "desktop_uninstall_default_mime_handler", desktopFileInstallPath.getFileName().toString(),
+                    String.join(" ", getMimeTypeNamesFromFileAssociations()));
 
             unregisterFileAssociationsCmd = stringifyShellCommands(
                     unregisterFileAssociationsCmd, cleanUpCommand);
@@ -367,58 +327,36 @@ void applyTo(Map<String, String> data) {
     }
 
     /**
-     * Desktop integration file. xml, icon, etc.
-     * Resides somewhere in application installation tree.
-     * Has two paths:
-     *  - path where it should be placed at package build time;
-     *  - path where it should be installed by package manager;
+     * Creates desktop integration file. xml, icon, etc.
+     *
+     * Returned instance:
+     *  - srcPath(): path where it should be placed at package build time;
+     *  - installPath(): path where it should be installed by package manager;
      */
-    private class DesktopFile {
-
-        DesktopFile(String fileName) {
-            var installPath = thePackage
-                    .installedApplicationLayout()
-                    .destktopIntegrationDirectory().resolve(fileName);
-            var srcPath = thePackage
-                    .sourceApplicationLayout()
-                    .destktopIntegrationDirectory().resolve(fileName);
-
-            impl = new InstallableFile(srcPath, installPath);
-        }
-
-        Path installPath() {
-            return impl.installPath();
-        }
-
-        Path srcPath() {
-            return impl.srcPath();
-        }
-
-        private final InstallableFile impl;
+    private InstallableFile createDesktopFile(String fileName) {
+        var srcPath = pkg.asPackageApplicationLayout().orElseThrow().resolveAt(env.appImageDir()).desktopIntegrationDirectory().resolve(fileName);
+        var installPath = pkg.asInstalledPackageApplicationLayout().orElseThrow().desktopIntegrationDirectory().resolve(fileName);
+        return new InstallableFile(srcPath, installPath);
     }
 
     private void appendFileAssociation(XMLStreamWriter xml,
-            FileAssociation assoc) throws XMLStreamException {
+            LinuxFileAssociation fa) throws XMLStreamException {
 
-        for (var mimeType : assoc.mimeTypes) {
             xml.writeStartElement("mime-type");
-            xml.writeAttribute("type", mimeType);
+            xml.writeAttribute("type", fa.mimeType());
 
-            final String description = assoc.description;
-            if (description != null && !description.isEmpty()) {
+            final var description = fa.description().orElse(null);
+            if (description != null) {
                 xml.writeStartElement("comment");
                 xml.writeCharacters(description);
                 xml.writeEndElement();
             }
 
-            for (String ext : assoc.extensions) {
-                xml.writeStartElement("glob");
-                xml.writeAttribute("pattern", "*." + ext);
-                xml.writeEndElement();
-            }
+            xml.writeStartElement("glob");
+            xml.writeAttribute("pattern", "*." + fa.extension());
+            xml.writeEndElement();
 
             xml.writeEndElement();
-        }
     }
 
     private void createFileAssociationsMimeInfoFile() throws IOException {
@@ -427,8 +365,8 @@ private void createFileAssociationsMimeInfoFile() throws IOException {
             xml.writeDefaultNamespace(
                     "http://www.freedesktop.org/standards/shared-mime-info");
 
-            for (var assoc : associations) {
-                appendFileAssociation(xml, assoc.data);
+            for (var fa : associations) {
+                appendFileAssociation(xml, fa);
             }
 
             xml.writeEndElement();
@@ -438,53 +376,48 @@ private void createFileAssociationsMimeInfoFile() throws IOException {
     private void addFileAssociationIconFiles(ShellCommands shellCommands)
             throws IOException {
         Set<String> processedMimeTypes = new HashSet<>();
-        for (var assoc : associations) {
-            if (assoc.iconSize <= 0) {
+        for (var fa : associations) {
+            if (!fa.hasIcon()) {
                 // No icon.
                 continue;
             }
 
-            for (var mimeType : assoc.data.mimeTypes) {
-                if (processedMimeTypes.contains(mimeType)) {
-                    continue;
-                }
+            var mimeType = fa.mimeType();
+            if (processedMimeTypes.contains(mimeType)) {
+                continue;
+            }
+
+            processedMimeTypes.add(mimeType);
 
-                processedMimeTypes.add(mimeType);
+            final var faIcon = fa.icon().orElseThrow();
 
-                // Create icon name for mime type from mime type.
-                DesktopFile faIconFile = new DesktopFile(mimeType.replace(
-                        File.separatorChar, '-') + PathUtils.getSuffix(
-                                assoc.data.iconPath));
+            // Create icon name for mime type from mime type.
+            var faIconFile = createDesktopFile(mimeType.replace(File.separatorChar,
+                    '-') + PathUtils.getSuffix(faIcon));
 
-                IOUtils.copyFile(assoc.data.iconPath,
-                        faIconFile.srcPath());
+            IOUtils.copyFile(faIcon, faIconFile.srcPath());
 
-                shellCommands.addIcon(mimeType, faIconFile.installPath(),
-                        assoc.iconSize);
-            }
+            shellCommands.addIcon(mimeType, faIconFile.installPath(), fa.iconSize());
         }
     }
 
-    private void createDesktopFile(Map<String, String> data) throws IOException {
+    private void saveDesktopFile(Map<String, String> data) throws IOException {
         List<String> mimeTypes = getMimeTypeNamesFromFileAssociations();
         data.put("DESKTOP_MIMES", "MimeType=" + String.join(";", mimeTypes));
 
         // prepare desktop shortcut
         desktopFileResource
                 .setSubstitutionData(data)
-                .saveToFile(desktopFile.srcPath());
+                .saveToFile(desktopFile.orElseThrow().srcPath());
     }
 
     private List<String> getMimeTypeNamesFromFileAssociations() {
-        return associations.stream()
-                .map(fa -> fa.data.mimeTypes)
-                .flatMap(List::stream)
-                .collect(Collectors.toUnmodifiableList());
+        return associations.stream().map(FileAssociation::mimeType).toList();
     }
 
-    private static int getSquareSizeOfImage(File f) {
+    private static int getSquareSizeOfImage(Path path) {
         try {
-            BufferedImage bi = ImageIO.read(f);
+            BufferedImage bi = ImageIO.read(path.toFile());
             return Math.max(bi.getWidth(), bi.getHeight());
         } catch (IOException e) {
             Log.verbose(e);
@@ -518,51 +451,48 @@ private static int normalizeIconSize(int iconSize) {
         return commonIconSize;
     }
 
-    private static class LinuxFileAssociation {
-        LinuxFileAssociation(FileAssociation fa) {
-            this.data = fa;
-            if (fa.iconPath != null && Files.isReadable(fa.iconPath)) {
-                iconSize = getSquareSizeOfImage(fa.iconPath.toFile());
-            } else {
-                iconSize = -1;
+    private interface LinuxFileAssociationMixin {
+        int iconSize();
+
+        record Stub(int iconSize) implements LinuxFileAssociationMixin {}
+    }
+
+    private static interface LinuxFileAssociation extends FileAssociation, LinuxFileAssociationMixin {
+        static LinuxFileAssociation create(FileAssociation fa) {
+            var iconSize = getIconSize(fa);
+            if (iconSize <= 0) {
+                // nullify the icon
+                fa = new FileAssociation.Stub(fa.description(), Optional.empty(),
+                        fa.mimeType(), fa.extension());
             }
+            return CompositeProxy.build()
+                    .invokeTunnel(CompositeProxyTunnel.INSTANCE)
+                    .create(LinuxFileAssociation.class, fa,
+                            new LinuxFileAssociationMixin.Stub(iconSize));
         }
 
-        final FileAssociation data;
-        final int iconSize;
+        private static int getIconSize(FileAssociation fa) {
+            return Optional.of(fa)
+                    .flatMap(FileAssociation::icon)
+                    .map(DesktopIntegration::getSquareSizeOfImage)
+                    .orElse(-1);
+        }
     }
 
-    private final PlatformPackage thePackage;
+    private final BuildEnv env;
+    private final LinuxPackage pkg;
+    private final Launcher launcher;
 
     private final List<LinuxFileAssociation> associations;
 
-    private final List<Map<String, ? super Object>> launchers;
-
-    private final OverridableResource iconResource;
+    private final Optional<OverridableResource> iconResource;
     private final OverridableResource desktopFileResource;
 
-    private final DesktopFile mimeInfoFile;
-    private final DesktopFile desktopFile;
-    private final DesktopFile iconFile;
+    private final InstallableFile mimeInfoFile;
+    private final Optional<InstallableFile> desktopFile;
+    private final Optional<InstallableFile> iconFile;
 
     private final List<DesktopIntegration> nestedIntegrations;
 
     private final Map<String, String> desktopFileData;
-
-    private static final BundlerParamInfo<String> MENU_GROUP =
-        new StandardBundlerParam<>(
-                Arguments.CLIOptions.LINUX_MENU_GROUP.getId(),
-                String.class,
-                params -> I18N.getString("param.menu-group.default"),
-                (s, p) -> s
-        );
-
-    private static final StandardBundlerParam<Boolean> LINUX_SHORTCUT_HINT =
-        new StandardBundlerParam<>(
-                Arguments.CLIOptions.LINUX_SHORTCUT_HINT.getId(),
-                Boolean.class,
-                params -> false,
-                (s, p) -> (s == null || "null".equalsIgnoreCase(s))
-                        ? false : Boolean.valueOf(s)
-        );
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
index 9a308155f78..992ec630c0e 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.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
@@ -27,6 +27,13 @@
 
 public class LinuxAppBundler extends AppImageBundler {
     public LinuxAppBundler() {
-        setAppImageSupplier(LinuxAppImageBuilder::new);
+        setAppImageSupplier((params, output) -> {
+            // Order is important!
+            var app = LinuxFromParams.APPLICATION.fetchFrom(params);
+            var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+            LinuxPackagingPipeline.build()
+                    .excludeDirFromCopying(output.getParent())
+                    .create().execute(BuildEnv.withAppImageDir(env, output), app);
+        });
     }
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
deleted file mode 100644
index 7d9dcf4276b..00000000000
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Map;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.PathUtils;
-
-public class LinuxAppImageBuilder extends AbstractAppImageBuilder {
-
-    static final BundlerParamInfo<Path> ICON_PNG =
-            new StandardBundlerParam<>(
-            "icon.png",
-            Path.class,
-            params -> {
-                Path f = ICON.fetchFrom(params);
-                if (f != null && f.getFileName() != null && !f.getFileName()
-                        .toString().toLowerCase().endsWith(".png")) {
-                    Log.error(MessageFormat.format(
-                            I18N.getString("message.icon-not-png"), f));
-                    return null;
-                }
-                return f;
-            },
-            (s, p) -> Path.of(s));
-
-    static final String DEFAULT_ICON = "JavaApp.png";
-
-    LinuxAppImageBuilder(Path imageOutDir) {
-        super(imageOutDir);
-    }
-
-    private void writeEntry(InputStream in, Path dstFile) throws IOException {
-        Files.createDirectories(dstFile.getParent());
-        Files.copy(in, dstFile);
-    }
-
-    public static String getLauncherName(Map<String, ? super Object> params) {
-        return APP_NAME.fetchFrom(params);
-    }
-
-    @Override
-    public void prepareApplicationFiles(Map<String, ? super Object> params)
-            throws IOException {
-        appLayout.roots().stream().forEach(dir -> {
-            try {
-                IOUtils.writableOutputDir(dir);
-            } catch (PackagerException pe) {
-                throw new RuntimeException(pe);
-            }
-        });
-
-        // create the primary launcher
-        createLauncherForEntryPoint(params, null);
-
-        // create app launcher shared library
-        createLauncherLib();
-
-        // create the additional launchers, if any
-        List<Map<String, ? super Object>> entryPoints
-                = ADD_LAUNCHERS.fetchFrom(params);
-        for (Map<String, ? super Object> entryPoint : entryPoints) {
-            createLauncherForEntryPoint(AddLauncherArguments.merge(params,
-                    entryPoint, ICON.getID(), ICON_PNG.getID()), params);
-        }
-
-        // Copy class path entries to Java folder
-        copyApplication(params);
-    }
-
-    private void createLauncherLib() throws IOException {
-        Path path = appLayout.pathGroup().getPath(
-                ApplicationLayout.PathRole.LINUX_APPLAUNCHER_LIB);
-        try (InputStream resource = getResourceAsStream("libjpackageapplauncheraux.so")) {
-            writeEntry(resource, path);
-        }
-
-        path.toFile().setExecutable(true, false);
-        path.toFile().setWritable(true, true);
-    }
-
-    private void createLauncherForEntryPoint(Map<String, ? super Object> params,
-            Map<String, ? super Object> mainParams) throws IOException {
-        // Copy executable to launchers folder
-        Path executableFile = appLayout.launchersDirectory().resolve(getLauncherName(params));
-        try (InputStream is_launcher =
-                getResourceAsStream("jpackageapplauncher")) {
-            writeEntry(is_launcher, executableFile);
-        }
-
-        executableFile.toFile().setExecutable(true, false);
-        executableFile.toFile().setWritable(true, true);
-
-        writeCfgFile(params);
-
-        var iconResource = createIconResource(DEFAULT_ICON, ICON_PNG, params,
-                mainParams);
-        if (iconResource != null) {
-            Path iconTarget = appLayout.destktopIntegrationDirectory().resolve(
-                    APP_NAME.fetchFrom(params) + PathUtils.getSuffix(Path.of(
-                    DEFAULT_ICON)));
-            iconResource.saveToFile(iconTarget);
-        }
-    }
-}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java
new file mode 100644
index 00000000000..ea87363a9bb
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java
@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+interface LinuxApplicationLayout extends ApplicationLayout, LinuxApplicationLayoutMixin {
+
+    static LinuxApplicationLayout create(ApplicationLayout layout, Path libAppLauncher) {
+        return CompositeProxy.build()
+                .invokeTunnel(CompositeProxyTunnel.INSTANCE)
+                .create(LinuxApplicationLayout.class, layout, new LinuxApplicationLayoutMixin.Stub(libAppLauncher));
+    }
+
+    @Override
+    default LinuxApplicationLayout resolveAt(Path root) {
+        return create(ApplicationLayout.super.resolveAt(root),
+                resolveNullablePath(root, libAppLauncher()));
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java
similarity index 64%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java
rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java
index c10f59464a3..a88dbc9e16e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, 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,30 +26,13 @@
 
 import java.nio.file.Path;
 
-/**
- *
- * Platform package of an application.
- */
-interface PlatformPackage {
-
-    /**
-     * Platform-specific package name.
-     */
-    String name();
+// Must be publc to allow access from AppImageLayout.toPathGroup()
+public interface LinuxApplicationLayoutMixin {
 
     /**
-     * Root directory where sources for packaging tool should be stored. On Unix
-     * systems contents of this directory will be installed in "/" directory.
+     * Path to "libapplauncher.so".
      */
-    Path sourceRoot();
+    Path libAppLauncher();
 
-    /**
-     * Source application layout from which to build the package.
-     */
-    ApplicationLayout sourceApplicationLayout();
-
-    /**
-     * Application layout of the installed package.
-     */
-    ApplicationLayout installedApplicationLayout();
+    record Stub(Path libAppLauncher) implements LinuxApplicationLayoutMixin {}
 }
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 1c1c27075c1..1915fd00c0e 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
@@ -25,6 +25,10 @@
 
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxDebPackage;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -34,179 +38,64 @@
 
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
+import jdk.jpackage.internal.model.AppImageLayout;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.internal.model.StandardPackageType.LINUX_DEB;
 
 public class LinuxDebBundler extends LinuxPackageBundler {
 
-    // Debian rules for package naming are used here
-    // https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
-    //
-    // 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.
-    //
-    private static final Pattern DEB_PACKAGE_NAME_PATTERN =
-            Pattern.compile("^[a-z][a-z\\d\\+\\-\\.]+");
-
-    private static final BundlerParamInfo<String> PACKAGE_NAME =
-            new StandardBundlerParam<> (
-            Arguments.CLIOptions.LINUX_BUNDLE_NAME.getId(),
-            String.class,
-            params -> {
-                String nm = INSTALLER_NAME.fetchFrom(params);
-                if (nm == null) return null;
-
-                // make sure to lower case and spaces/underscores become dashes
-                nm = nm.toLowerCase().replaceAll("[ _]", "-");
-                return nm;
-            },
-            (s, p) -> {
-                if (!DEB_PACKAGE_NAME_PATTERN.matcher(s).matches()) {
-                    try {
-                        throw new ConfigException(
-                            MessageFormat.format(I18N.getString(
-                            "error.deb-invalid-value-for-package-name"), s),
-                            I18N.getString(
-                            "error.deb-invalid-value-for-package-name.advice"));
-                    } catch (ConfigException ex) {
-                        throw new IllegalArgumentException(ex);
-                    }
-                }
-
-                return s;
-            });
-
     private static final String TOOL_DPKG_DEB = "dpkg-deb";
     private static final String TOOL_DPKG = "dpkg";
     private static final String TOOL_FAKEROOT = "fakeroot";
 
-    private static final String DEB_ARCH;
-    static {
-        String debArch;
-        try {
-            debArch = Executor.of(TOOL_DPKG, "--print-architecture").saveOutput(
-                    true).executeExpectSuccess().getOutput().get(0);
-        } catch (IOException ex) {
-            debArch = null;
-        }
-        DEB_ARCH = debArch;
-    }
-
-    private static final String releaseSuffix(Map<String, ? super Object> params) {
-        return Optional.ofNullable(RELEASE.fetchFrom(params, false)).map(
-                rel -> "-" + rel).orElse("");
-    }
-
-    private static final BundlerParamInfo<String> FULL_PACKAGE_NAME =
-            new StandardBundlerParam<>(
-                    "linux.deb.fullPackageName", String.class, params -> {
-                        return PACKAGE_NAME.fetchFrom(params)
-                            + "_" + VERSION.fetchFrom(params)
-                            + releaseSuffix(params)
-                            + "_" + DEB_ARCH;
-                    }, (s, p) -> s);
-
-    private static final BundlerParamInfo<String> EMAIL =
-            new StandardBundlerParam<> (
-            Arguments.CLIOptions.LINUX_DEB_MAINTAINER.getId(),
-            String.class,
-            params -> "Unknown",
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> MAINTAINER =
-            new StandardBundlerParam<> (
-            Arguments.CLIOptions.LINUX_DEB_MAINTAINER.getId() + ".internal",
-            String.class,
-            params -> VENDOR.fetchFrom(params) + " <"
-                    + EMAIL.fetchFrom(params) + ">",
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> SECTION =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.LINUX_CATEGORY.getId(),
-            String.class,
-            params -> "misc",
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> LICENSE_TEXT =
-            new StandardBundlerParam<> (
-            "linux.deb.licenseText",
-            String.class,
-            params -> {
-                try {
-                    String licenseFile = LICENSE_FILE.fetchFrom(params);
-                    if (licenseFile != null) {
-                        return Files.readString(Path.of(licenseFile));
-                    }
-                } catch (IOException e) {
-                    Log.verbose(e);
-                }
-                return "Unknown";
-            },
-            (s, p) -> s);
-
     public LinuxDebBundler() {
-        super(PACKAGE_NAME);
+        super(LinuxFromParams.DEB_PACKAGE);
     }
 
     @Override
-    public void doValidate(Map<String, ? super Object> params)
-            throws ConfigException {
+    protected void doValidate(BuildEnv env, LinuxPackage pkg) throws ConfigException {
 
         // Show warning if license file is missing
-        if (LICENSE_FILE.fetchFrom(params) == null) {
+        if (pkg.licenseFile().isEmpty()) {
             Log.verbose(I18N.getString("message.debs-like-licenses"));
         }
     }
 
     @Override
-    protected List<ToolValidator> getToolValidators(
-            Map<String, ? super Object> params) {
+    protected List<ToolValidator> getToolValidators() {
         return Stream.of(TOOL_DPKG_DEB, TOOL_DPKG, TOOL_FAKEROOT).map(
                 ToolValidator::new).toList();
     }
 
     @Override
-    protected Path buildPackageBundle(
-            Map<String, String> replacementData,
-            Map<String, ? super Object> params, Path outputParentDir) throws
-            PackagerException, IOException {
-
-        prepareProjectConfig(replacementData, params);
-        adjustPermissionsRecursive(createMetaPackage(params).sourceRoot());
-        return buildDeb(params, outputParentDir);
+    protected void createConfigFiles(Map<String, String> replacementData,
+            BuildEnv env, LinuxPackage pkg) throws IOException {
+        prepareProjectConfig(replacementData, env, pkg);
+        adjustPermissionsRecursive(env.appImageDir());
+    }
+
+    @Override
+    protected Path buildPackageBundle(BuildEnv env, LinuxPackage pkg,
+            Path outputParentDir) throws PackagerException, IOException {
+        return buildDeb(env, pkg, outputParentDir);
     }
 
     private static final Pattern PACKAGE_NAME_REGEX = Pattern.compile("^(^\\S+):");
 
     @Override
-    protected void initLibProvidersLookup(
-            Map<String, ? super Object> params,
-            LibProvidersLookup libProvidersLookup) {
+    protected void initLibProvidersLookup(LibProvidersLookup libProvidersLookup) {
 
         libProvidersLookup.setPackageLookup(file -> {
             Path realPath = file.toRealPath();
@@ -271,16 +160,18 @@ private static Stream<String> findProvidingPackages(Path file) throws IOExceptio
         Set<String> archPackages = new HashSet<>();
         Set<String> otherPackages = new HashSet<>();
 
+        var debArch = LinuxPackageArch.getValue(LINUX_DEB);
+
         Executor.of(TOOL_DPKG, "-S", file.toString())
                 .saveOutput(true).executeExpectSuccess()
                 .getOutput().forEach(line -> {
                     Matcher matcher = PACKAGE_NAME_REGEX.matcher(line);
                     if (matcher.find()) {
                         String name = matcher.group(1);
-                        if (name.endsWith(":" + DEB_ARCH)) {
+                        if (name.endsWith(":" + debArch)) {
                             // Strip arch suffix
                             name = name.substring(0,
-                                    name.length() - (DEB_ARCH.length() + 1));
+                                    name.length() - (debArch.length() + 1));
                             archPackages.add(name);
                         } else {
                             otherPackages.add(name);
@@ -295,21 +186,19 @@ private static Stream<String> findProvidingPackages(Path file) throws IOExceptio
     }
 
     @Override
-    protected List<ConfigException> verifyOutputBundle(
-            Map<String, ? super Object> params, Path packageBundle) {
+    protected List<ConfigException> verifyOutputBundle(BuildEnv env, LinuxPackage pkg,
+            Path packageBundle) {
         List<ConfigException> errors = new ArrayList<>();
 
         String controlFileName = "control";
 
         List<PackageProperty> properties = List.of(
-                new PackageProperty("Package", PACKAGE_NAME.fetchFrom(params),
+                new PackageProperty("Package", pkg.packageName(),
                         "APPLICATION_PACKAGE", controlFileName),
-                new PackageProperty("Version", String.format("%s%s",
-                        VERSION.fetchFrom(params), releaseSuffix(params)),
+                new PackageProperty("Version", ((LinuxDebPackage)pkg).versionWithRelease(),
                         "APPLICATION_VERSION_WITH_RELEASE",
                         controlFileName),
-                new PackageProperty("Architecture", DEB_ARCH, "APPLICATION_ARCH",
-                        controlFileName));
+                new PackageProperty("Architecture", pkg.arch(), "APPLICATION_ARCH", controlFileName));
 
         List<String> cmdline = new ArrayList<>(List.of(TOOL_DPKG_DEB, "-f",
                 packageBundle.toString()));
@@ -404,10 +293,9 @@ DebianFile setExecutable() {
             return this;
         }
 
-        void create(Map<String, String> data, Map<String, ? super Object> params)
+        void create(Map<String, String> data, Function<String, OverridableResource> resourceFactory)
                 throws IOException {
-            createResource("template." + dstFilePath.getFileName().toString(),
-                    params)
+            resourceFactory.apply("template." + dstFilePath.getFileName().toString())
                     .setCategory(I18N.getString(comment))
                     .setSubstitutionData(data)
                     .saveToFile(dstFilePath);
@@ -421,10 +309,9 @@ void create(Map<String, String> data, Map<String, ? super Object> params)
         private String permissions;
     }
 
-    private void prepareProjectConfig(Map<String, String> data,
-            Map<String, ? super Object> params) throws IOException {
+    private void prepareProjectConfig(Map<String, String> data, BuildEnv env, LinuxPackage pkg) throws IOException {
 
-        Path configDir = createMetaPackage(params).sourceRoot().resolve("DEBIAN");
+        Path configDir = env.appImageDir().resolve("DEBIAN");
         List<DebianFile> debianFiles = new ArrayList<>();
         debianFiles.add(new DebianFile(
                 configDir.resolve("control"),
@@ -442,79 +329,47 @@ private void prepareProjectConfig(Map<String, String> data,
                 configDir.resolve("postrm"),
                 "resource.deb-postrm-script").setExecutable());
 
-        final String installDir = LINUX_INSTALL_DIR.fetchFrom(params);
-
-        if (!StandardBundlerParam.isRuntimeInstaller(params)
-                || (isInstallDirInUsrTree(installDir) || installDir.startsWith("/usr/"))) {
-            debianFiles.add(new DebianFile(
-                    getConfig_CopyrightFile(params),
+        ((LinuxDebPackage)pkg).relativeCopyrightFilePath().ifPresent(copyrightFile -> {
+            debianFiles.add(new DebianFile(env.appImageDir().resolve(copyrightFile),
                     "resource.copyright-file"));
-        }
+        });
 
         for (DebianFile debianFile : debianFiles) {
-            debianFile.create(data, params);
+            debianFile.create(data, env::createResource);
         }
     }
 
     @Override
-    protected Map<String, String> createReplacementData(
-            Map<String, ? super Object> params) throws IOException {
+    protected Map<String, String> createReplacementData(BuildEnv env, LinuxPackage pkg) throws IOException {
         Map<String, String> data = new HashMap<>();
 
-        data.put("APPLICATION_MAINTAINER", MAINTAINER.fetchFrom(params));
-        data.put("APPLICATION_SECTION", SECTION.fetchFrom(params));
-        data.put("APPLICATION_COPYRIGHT", COPYRIGHT.fetchFrom(params));
-        data.put("APPLICATION_LICENSE_TEXT", LICENSE_TEXT.fetchFrom(params));
-        data.put("APPLICATION_ARCH", DEB_ARCH);
+        String licenseText = pkg.licenseFile().map(toFunction(Files::readString)).orElse("Unknown");
+
+        data.put("APPLICATION_MAINTAINER", ((LinuxDebPackage) pkg).maintainer());
+        data.put("APPLICATION_SECTION", pkg.category().orElseThrow());
+        data.put("APPLICATION_COPYRIGHT", pkg.app().copyright());
+        data.put("APPLICATION_LICENSE_TEXT", licenseText);
+        data.put("APPLICATION_ARCH", pkg.arch());
         data.put("APPLICATION_INSTALLED_SIZE", Long.toString(
-                createMetaPackage(params).sourceApplicationLayout().sizeInBytes() >> 10));
-        data.put("APPLICATION_HOMEPAGE", Optional.ofNullable(
-                ABOUT_URL.fetchFrom(params)).map(value -> "Homepage: " + value).orElse(
-                ""));
-        data.put("APPLICATION_VERSION_WITH_RELEASE", String.format("%s%s",
-                VERSION.fetchFrom(params), releaseSuffix(params)));
+                AppImageLayout.toPathGroup(pkg.packageLayout().resolveAt(
+                        env.appImageDir())).sizeInBytes() >> 10));
+        data.put("APPLICATION_HOMEPAGE", pkg.aboutURL().map(
+                value -> "Homepage: " + value).orElse(""));
+        data.put("APPLICATION_VERSION_WITH_RELEASE", ((LinuxDebPackage) pkg).versionWithRelease());
 
         return data;
     }
 
-    private Path getConfig_CopyrightFile(Map<String, ? super Object> params) {
-        final String installDir = LINUX_INSTALL_DIR.fetchFrom(params);
-        final String packageName = PACKAGE_NAME.fetchFrom(params);
-
-        final Path installPath;
-        if (isInstallDirInUsrTree(installDir) || installDir.startsWith("/usr/")) {
-            installPath = Path.of("/usr/share/doc/", packageName, "copyright");
-        } else {
-            installPath = Path.of(installDir, packageName, "share/doc/copyright");
-        }
-
-        return createMetaPackage(params).sourceRoot().resolve(
-                Path.of("/").relativize(installPath));
-    }
-
-    private Path buildDeb(Map<String, ? super Object> params,
-            Path outdir) throws IOException {
-
-        PlatformPackage thePackage = createMetaPackage(params);
-
-        new ScriptRunner()
-              .setDirectory(thePackage.sourceRoot())
-              .setResourceCategoryId("resource.post-app-image-script")
-              .setScriptNameSuffix("post-image")
-              .setEnvironmentVariable("JpAppImageDir", thePackage.sourceRoot().toAbsolutePath().toString())
-              .run(params);
-
-        Path outFile = outdir.resolve(
-                FULL_PACKAGE_NAME.fetchFrom(params)+".deb");
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.outputting-to-location"), outFile.toAbsolutePath().toString()));
+    private Path buildDeb(BuildEnv env, LinuxPackage pkg, Path outdir) throws IOException {
+        Path outFile = outdir.resolve(pkg.packageFileNameWithSuffix());
+        Log.verbose(I18N.format("message.outputting-to-location", outFile.toAbsolutePath()));
 
         List<String> cmdline = new ArrayList<>();
         cmdline.addAll(List.of(TOOL_FAKEROOT, TOOL_DPKG_DEB));
         if (Log.isVerbose()) {
             cmdline.add("--verbose");
         }
-        cmdline.addAll(List.of("-b", thePackage.sourceRoot().toString(),
+        cmdline.addAll(List.of("-b", env.appImageDir().toString(),
                 outFile.toAbsolutePath().toString()));
 
         // run dpkg
@@ -522,8 +377,7 @@ private Path buildDeb(Map<String, ? super Object> params,
                 "semop(1): encountered an error: Invalid argument").execute(
                         cmdline.toArray(String[]::new));
 
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.output-to-location"), outFile.toAbsolutePath().toString()));
+        Log.verbose(I18N.format("message.output-to-location", outFile.toAbsolutePath()));
 
         return outFile;
     }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
new file mode 100644
index 00000000000..50e371d5c76
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
@@ -0,0 +1,62 @@
+/*
+ * 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;
+
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxDebPackage;
+import jdk.jpackage.internal.model.LinuxDebPackageMixin;
+
+final class LinuxDebPackageBuilder {
+
+    LinuxDebPackageBuilder(LinuxPackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    LinuxDebPackage create() throws ConfigException {
+        if (pkgBuilder.category().isEmpty()) {
+            pkgBuilder.category(DEFAULTS.category());
+        }
+        var pkg = pkgBuilder.create();
+        return LinuxDebPackage.create(pkg, new LinuxDebPackageMixin.Stub(
+                Optional.ofNullable(maintainerEmail).orElseGet(
+                        DEFAULTS::maintainerEmail)));
+    }
+
+    LinuxDebPackageBuilder maintainerEmail(String v) {
+        maintainerEmail = v;
+        return this;
+    }
+
+    private record Defaults(String maintainerEmail, String category) {
+    }
+
+    private String maintainerEmail;
+
+    private final LinuxPackageBuilder pkgBuilder;
+
+    private static final Defaults DEFAULTS = new Defaults("Unknown", "misc");
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
new file mode 100644
index 00000000000..7dff3cd73ae
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
@@ -0,0 +1,142 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
+import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
+import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
+import static jdk.jpackage.internal.FromParams.createPackageBuilder;
+import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
+import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
+import static jdk.jpackage.internal.model.StandardPackageType.LINUX_DEB;
+import static jdk.jpackage.internal.model.StandardPackageType.LINUX_RPM;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxApplication;
+import jdk.jpackage.internal.model.LinuxLauncher;
+import jdk.jpackage.internal.model.LinuxLauncherMixin;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.StandardPackageType;
+
+final class LinuxFromParams {
+
+    private static LinuxApplication createLinuxApplication(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+        final var launcherFromParams = new LauncherFromParams();
+        final var app = createApplicationBuilder(params, toFunction(launcherParams -> {
+            final var launcher = launcherFromParams.create(launcherParams);
+            final var shortcut = Stream.of(SHORTCUT_HINT, LINUX_SHORTCUT_HINT).map(param -> {
+                return param.findIn(launcherParams);
+            }).filter(Optional::isPresent).map(Optional::get).findFirst();
+            return LinuxLauncher.create(launcher, new LinuxLauncherMixin.Stub(shortcut));
+        }), APPLICATION_LAYOUT).create();
+        return LinuxApplication.create(app);
+    }
+
+    private static LinuxPackageBuilder createLinuxPackageBuilder(
+            Map<String, ? super Object> params, StandardPackageType type) throws ConfigException, IOException {
+
+        final var app = APPLICATION.fetchFrom(params);
+
+        final var superPkgBuilder = createPackageBuilder(params, app, type);
+
+        final var pkgBuilder = new LinuxPackageBuilder(superPkgBuilder);
+
+        LINUX_PACKAGE_DEPENDENCIES.copyInto(params, pkgBuilder::additionalDependencies);
+        LINUX_CATEGORY.copyInto(params, pkgBuilder::category);
+        LINUX_MENU_GROUP.copyInto(params, pkgBuilder::menuGroupName);
+        RELEASE.copyInto(params, pkgBuilder::release);
+        LINUX_PACKAGE_NAME.copyInto(params, pkgBuilder::literalName);
+
+        return pkgBuilder;
+    }
+
+    private static LinuxPackage createLinuxRpmPackage(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var superPkgBuilder = createLinuxPackageBuilder(params, LINUX_RPM);
+
+        final var pkgBuilder = new LinuxRpmPackageBuilder(superPkgBuilder);
+
+        LICENSE_TYPE.copyInto(params, pkgBuilder::licenseType);
+
+        return pkgBuilder.create();
+    }
+
+    private static LinuxPackage createLinuxDebPackage(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var superPkgBuilder = createLinuxPackageBuilder(params, LINUX_DEB);
+
+        final var pkgBuilder = new LinuxDebPackageBuilder(superPkgBuilder);
+
+        MAINTAINER_EMAIL.copyInto(params, pkgBuilder::maintainerEmail);
+
+        return pkgBuilder.create();
+    }
+
+    static final BundlerParamInfo<LinuxApplication> APPLICATION = createApplicationBundlerParam(
+            LinuxFromParams::createLinuxApplication);
+
+    static final BundlerParamInfo<LinuxPackage> RPM_PACKAGE = createPackageBundlerParam(
+            LinuxFromParams::createLinuxRpmPackage);
+
+    static final BundlerParamInfo<LinuxPackage> DEB_PACKAGE = createPackageBundlerParam(
+            LinuxFromParams::createLinuxDebPackage);
+
+    private static final BundlerParamInfo<Boolean> LINUX_SHORTCUT_HINT = new BundlerParamInfo<>(
+            Arguments.CLIOptions.LINUX_SHORTCUT_HINT.getId(),
+            Boolean.class,
+            params -> false,
+            (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ? false : Boolean.valueOf(s)
+    );
+
+    private static final BundlerParamInfo<String> LINUX_CATEGORY = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_CATEGORY.getId());
+
+    private static final BundlerParamInfo<String> LINUX_PACKAGE_DEPENDENCIES = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_PACKAGE_DEPENDENCIES.getId());
+
+    private static final BundlerParamInfo<String> LINUX_MENU_GROUP = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_MENU_GROUP.getId());
+
+    private static final BundlerParamInfo<String> RELEASE = createStringBundlerParam(
+            Arguments.CLIOptions.RELEASE.getId());
+
+    private static final BundlerParamInfo<String> LINUX_PACKAGE_NAME = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_BUNDLE_NAME.getId());
+
+    private static final BundlerParamInfo<String> LICENSE_TYPE = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_RPM_LICENSE_TYPE.getId());
+
+    private static final BundlerParamInfo<String> MAINTAINER_EMAIL = createStringBundlerParam(
+            Arguments.CLIOptions.LINUX_DEB_MAINTAINER.getId());
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
index 433ea0fbe04..742f87b3a9f 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.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
@@ -30,17 +30,17 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import static jdk.jpackage.internal.OverridableResource.createResource;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.Package;
 
 /**
  * Helper to install launchers as services using "systemd".
  */
 public final class LinuxLaunchersAsServices extends UnixLaunchersAsServices {
 
-    private LinuxLaunchersAsServices(PlatformPackage thePackage,
-            Map<String, Object> params) throws IOException {
-        super(thePackage, REQUIRED_PACKAGES, params, li -> {
-            return new Launcher(thePackage, li.getName(), params);
+    private LinuxLaunchersAsServices(BuildEnv env, Package pkg) throws IOException {
+        super(env.appImageDir(), pkg.app(), REQUIRED_PACKAGES, launcher -> {
+            return new LauncherImpl(env, pkg, launcher);
         });
     }
 
@@ -58,36 +58,30 @@ protected Map<String, String> createImpl() throws IOException {
         return data;
     }
 
-    static ShellCustomAction create(PlatformPackage thePackage,
-            Map<String, Object> params) throws IOException {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
+    static ShellCustomAction create(BuildEnv env, Package pkg) throws IOException {
+        if (pkg.isRuntimeInstaller()) {
             return ShellCustomAction.nop(LINUX_REPLACEMENT_STRING_IDS);
         }
-        return new LinuxLaunchersAsServices(thePackage, params);
+        return new LinuxLaunchersAsServices(env, pkg);
     }
 
-    public static Path getServiceUnitFileName(String packageName,
-            String launcherName) {
+    public static Path getServiceUnitFileName(String packageName, String launcherName) {
         String baseName = launcherName.replaceAll("[\\s]", "_");
         return Path.of(packageName + "-" + baseName + ".service");
     }
 
-    private static class Launcher extends UnixLauncherAsService {
+    private static final class LauncherImpl extends UnixLauncherAsService {
 
-        Launcher(PlatformPackage thePackage, String name,
-                Map<String, Object> mainParams) {
-            super(name, mainParams, createResource("unit-template.service",
-                    mainParams).setCategory(I18N.getString(
-                            "resource.systemd-unit-file")));
+        LauncherImpl(BuildEnv env, Package pkg, Launcher launcher) {
+            super(pkg.app(), launcher, env.createResource("unit-template.service").setCategory(
+                    I18N.getString("resource.systemd-unit-file")));
 
-            unitFilename = getServiceUnitFileName(thePackage.name(), getName());
+            unitFilename = getServiceUnitFileName(pkg.packageName(), launcher.executableName());
 
-            getResource()
-                    .setPublicName(unitFilename)
-                    .addSubstitutionDataEntry("APPLICATION_LAUNCHER",
-                            Enquoter.forPropertyValues().applyTo(
-                                    thePackage.installedApplicationLayout().launchersDirectory().resolve(
-                                            getName()).toString()));
+            getResource().setPublicName(unitFilename).addSubstitutionDataEntry(
+                    "APPLICATION_LAUNCHER",
+                    Enquoter.forPropertyValues().applyTo(
+                            pkg.asInstalledPackageApplicationLayout().orElseThrow().launchersDirectory().resolve(getName()).toString()));
         }
 
         @Override
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageArch.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageArch.java
new file mode 100644
index 00000000000..836d1fb2c37
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageArch.java
@@ -0,0 +1,105 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import jdk.jpackage.internal.model.StandardPackageType;
+
+final class LinuxPackageArch {
+
+    static String getValue(StandardPackageType pkgType) {
+        switch (pkgType) {
+            case LINUX_RPM -> {
+                return RpmPackageArch.VALUE;
+            }
+            case LINUX_DEB -> {
+                return DebPackageArch.VALUE;
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private static class DebPackageArch {
+
+        static final String VALUE = toSupplier(DebPackageArch::getValue).get();
+
+        private static String getValue() throws IOException {
+            return Executor.of("dpkg", "--print-architecture").saveOutput(true)
+                    .executeExpectSuccess().getOutput().get(0);
+        }
+    }
+
+    private static class RpmPackageArch {
+
+        /*
+         * Various ways to get rpm arch. Needed to address JDK-8233143. rpmbuild is mandatory for
+         * rpm packaging, try it first. rpm is optional and may not be available, use as the last
+         * resort.
+         */
+        private static enum RpmArchReader {
+            Rpmbuild("rpmbuild", "--eval=%{_target_cpu}"),
+            Rpm("rpm", "--eval=%{_target_cpu}");
+
+            RpmArchReader(String... cmdline) {
+                this.cmdline = cmdline;
+            }
+
+            String getRpmArch() throws IOException {
+                Executor exec = Executor.of(cmdline).saveOutput(true);
+                switch (this) {
+                    case Rpm -> {
+                        exec.executeExpectSuccess();
+                    }
+                    case Rpmbuild -> {
+                        if (exec.execute() != 0) {
+                            return null;
+                        }
+                    }
+                    default -> {
+                        throw new UnsupportedOperationException();
+                    }
+                }
+                return exec.getOutput().get(0);
+            }
+
+            private final String[] cmdline;
+        }
+
+        static final String VALUE = toSupplier(RpmPackageArch::getValue).get();
+
+        private static String getValue() throws IOException {
+            for (var rpmArchReader : RpmArchReader.values()) {
+                var rpmArchStr = rpmArchReader.getRpmArch();
+                if (rpmArchStr != null) {
+                    return rpmArchStr;
+                }
+            }
+            throw new RuntimeException("error.rpm-arch-not-detected");
+        }
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
new file mode 100644
index 00000000000..4ed84909958
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
@@ -0,0 +1,185 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.LinuxPackageMixin;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.StandardPackageType;
+
+final class LinuxPackageBuilder {
+
+    LinuxPackageBuilder(PackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    LinuxPackage create() throws ConfigException {
+        if (literalName != null) {
+            pkgBuilder.name(literalName);
+        } else {
+            // Lower case and turn spaces/underscores into dashes
+            pkgBuilder.name(pkgBuilder.create().packageName().toLowerCase().replaceAll("[ _]", "-"));
+        }
+
+        final var pkg = pkgBuilder.create();
+
+        final var stdPkgType = pkg.asStandardPackageType();
+        if (stdPkgType.isPresent()) {
+            validatePackageName(pkg.packageName(), stdPkgType.orElseThrow());
+        }
+
+        var reply = create(pkg, pkg.packageLayout());
+        if (reply.isInstallDirInUsrTree()) {
+            reply = create(pkg, usrTreePackageLayout(pkg.relativeInstallDir(), pkg.packageName()));
+        }
+
+        return reply;
+    }
+
+    private LinuxPackage create(Package pkg, AppImageLayout pkgLayout) throws ConfigException {
+        return LinuxPackage.create(pkg, new LinuxPackageMixin.Stub(
+                pkgLayout,
+                Optional.ofNullable(menuGroupName).orElseGet(DEFAULTS::menuGroupName),
+                Optional.ofNullable(category),
+                Optional.ofNullable(additionalDependencies),
+                Optional.ofNullable(release),
+                pkg.asStandardPackageType().map(LinuxPackageArch::getValue).orElseThrow()));
+    }
+
+    LinuxPackageBuilder literalName(String v) {
+        literalName = v;
+        return this;
+    }
+
+    LinuxPackageBuilder menuGroupName(String v) {
+        menuGroupName = v;
+        return this;
+    }
+
+    LinuxPackageBuilder category(String v) {
+        category = v;
+        return this;
+    }
+
+    Optional<String> category() {
+        return Optional.ofNullable(category);
+    }
+
+    LinuxPackageBuilder additionalDependencies(String v) {
+        additionalDependencies = v;
+        return this;
+    }
+
+    LinuxPackageBuilder release(String v) {
+        release = v;
+        return this;
+    }
+
+    Optional<String> release() {
+        return Optional.ofNullable(release);
+    }
+
+    private static LinuxApplicationLayout usrTreePackageLayout(Path prefix, String packageName) {
+        final var lib = prefix.resolve(Path.of("lib", packageName));
+        return LinuxApplicationLayout.create(
+                ApplicationLayout.build()
+                        .launchersDirectory(prefix.resolve("bin"))
+                        .appDirectory(lib.resolve("app"))
+                        .runtimeDirectory(lib.resolve("runtime"))
+                        .desktopIntegrationDirectory(lib)
+                        .appModsDirectory(lib.resolve("app/mods"))
+                        .contentDirectory(lib)
+                        .create(),
+                lib.resolve("lib/libapplauncher.so"));
+    }
+
+    private static void validatePackageName(String packageName,
+            StandardPackageType pkgType) throws ConfigException {
+        switch (pkgType) {
+            case LINUX_DEB -> {
+                //
+                // Debian rules for package naming are used here
+                // https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Source
+                //
+                // 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.
+                //
+                var regexp = Pattern.compile("^[a-z][a-z\\d\\+\\-\\.]+");
+                if (!regexp.matcher(packageName).matches()) {
+                    throw buildConfigException()
+                            .message("error.deb-invalid-value-for-package-name", packageName)
+                            .advice("error.deb-invalid-value-for-package-name.advice")
+                            .create();
+                }
+            }
+            case LINUX_RPM -> {
+                //
+                // Fedora rules for package naming are used here
+                // https://fedoraproject.org/wiki/Packaging:NamingGuidelines?rd=Packaging/NamingGuidelines
+                //
+                // all Fedora packages must be named using only the following ASCII
+                // characters. These characters are displayed here:
+                //
+                // abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+
+                //
+                var regexp = Pattern.compile("[a-z\\d\\+\\-\\.\\_]+", Pattern.CASE_INSENSITIVE);
+                if (!regexp.matcher(packageName).matches()) {
+                    throw buildConfigException()
+                            .message("error.rpm-invalid-value-for-package-name", packageName)
+                            .advice("error.rpm-invalid-value-for-package-name.advice")
+                            .create();
+                }
+            }
+            default -> {
+            }
+        }
+    }
+
+    private record Defaults(String menuGroupName) {
+    }
+
+    private String literalName;
+    private String menuGroupName;
+    private String category;
+    private String additionalDependencies;
+    private String release;
+
+    private final PackageBuilder pkgBuilder;
+
+    private static final Defaults DEFAULTS = new Defaults(I18N.getString(
+            "param.menu-group.default"));
+
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
index dcd8676ec33..2f3e6da1e69 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
@@ -25,35 +25,29 @@
 package jdk.jpackage.internal;
 
 import java.io.IOException;
-import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
-import java.nio.file.Files;
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 import java.util.stream.Stream;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
-
+import jdk.jpackage.internal.PackagingPipeline.PackageBuildEnv;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
+import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxDebPackage;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.FileUtils;
 
 abstract class LinuxPackageBundler extends AbstractBundler {
 
-    LinuxPackageBundler(BundlerParamInfo<String> packageName) {
-        this.packageName = packageName;
-        appImageBundler = new LinuxAppBundler().setDependentTask(true);
+    LinuxPackageBundler(BundlerParamInfo<? extends LinuxPackage> pkgParam) {
+        this.pkgParam = pkgParam;
         customActions = List.of(new CustomActionInstance(
                 DesktopIntegration::create), new CustomActionInstance(
                 LinuxLaunchersAsServices::create));
@@ -63,20 +57,11 @@ abstract class LinuxPackageBundler extends AbstractBundler {
     public final boolean validate(Map<String, ? super Object> params)
             throws ConfigException {
 
-        // run basic validation to ensure requirements are met
-        // we are not interested in return code, only possible exception
-        appImageBundler.validate(params);
-
-        validateInstallDir(LINUX_INSTALL_DIR.fetchFrom(params));
-
-        FileAssociation.verify(FileAssociation.fetchFrom(params));
-
-        // If package name has some restrictions, the string converter will
-        // throw an exception if invalid
-        packageName.getStringConverter().apply(packageName.fetchFrom(params),
-            params);
+        // Order is important!
+        LinuxPackage pkg = pkgParam.fetchFrom(params);
+        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
-        for (var validator: getToolValidators(params)) {
+        for (var validator: getToolValidators()) {
             ConfigException ex = validator.validate();
             if (ex != null) {
                 throw ex;
@@ -104,7 +89,7 @@ public final boolean validate(Map<String, ? super Object> params)
         }
 
         // Packaging specific validation
-        doValidate(params);
+        doValidate(env, pkg);
 
         return true;
     }
@@ -119,73 +104,61 @@ public final Path execute(Map<String, ? super Object> params,
             Path outputParentDir) throws PackagerException {
         IOUtils.writableOutputDir(outputParentDir);
 
-        PlatformPackage thePackage = createMetaPackage(params);
-
-        Function<Path, ApplicationLayout> initAppImageLayout = imageRoot -> {
-            ApplicationLayout layout = appImageLayout(params);
-            layout.pathGroup().setPath(new Object(),
-                    AppImageFile.getPathInAppImage(Path.of("")));
-            return layout.resolveAt(imageRoot);
-        };
-
-        try {
-            Path appImage = StandardBundlerParam.getPredefinedAppImage(params);
-
-            // we either have an application image or need to build one
-            if (appImage != null) {
-                initAppImageLayout.apply(appImage).copy(
-                        thePackage.sourceApplicationLayout());
-            } else {
-                final Path srcAppImageRoot = thePackage.sourceRoot().resolve("src");
-                appImage = appImageBundler.execute(params, srcAppImageRoot);
-                ApplicationLayout srcAppLayout = initAppImageLayout.apply(
-                        appImage);
-                if (appImage.equals(PREDEFINED_RUNTIME_IMAGE.fetchFrom(params))) {
-                    // Application image points to run-time image.
-                    // Copy it.
-                    srcAppLayout.copy(thePackage.sourceApplicationLayout());
-                } else {
-                    // Application image is a newly created directory tree.
-                    // Move it.
-                    srcAppLayout.move(thePackage.sourceApplicationLayout());
-                    FileUtils.deleteRecursive(srcAppImageRoot);
-                }
-            }
+        // Order is important!
+        final LinuxPackage pkg = pkgParam.fetchFrom(params);
+        final var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
-            for (var ca : customActions) {
-                ca.init(thePackage, params);
-            }
+        final var pipelineBuilder = LinuxPackagingPipeline.build()
+                .excludeDirFromCopying(outputParentDir)
+                .task(PackageTaskID.CREATE_PACKAGE_FILE)
+                        .packageAction(this::buildPackage)
+                        .add();
 
-            Map<String, String> data = createDefaultReplacementData(params);
+        final var createConfigFilesTaskBuilder = pipelineBuilder
+                .task(PackageTaskID.CREATE_CONFIG_FILES)
+                .packageAction(this::buildConfigFiles);
 
-            for (var ca : customActions) {
-                ShellCustomAction.mergeReplacementData(data, ca.instance.
-                        create());
-            }
+        if (pkg instanceof LinuxDebPackage) {
+            // Build deb config files after app image contents are ready because
+            // it calculates the size of the image and saves the value in one of the config files.
+            createConfigFilesTaskBuilder.addDependencies(PrimaryTaskID.BUILD_APPLICATION_IMAGE, PrimaryTaskID.COPY_APP_IMAGE);
+        }
+
+        createConfigFilesTaskBuilder.add();
 
-            data.putAll(createReplacementData(params));
+        pipelineBuilder.create().execute(env, pkg, outputParentDir);
 
-            Path packageBundle = buildPackageBundle(Collections.unmodifiableMap(
-                    data), params, outputParentDir);
+        return outputParentDir.resolve(pkg.packageFileNameWithSuffix()).toAbsolutePath();
+    }
+
+    private void buildConfigFiles(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
+        for (var ca : customActions) {
+            ca.init(env.env(), env.pkg());
+        }
 
-            verifyOutputBundle(params, packageBundle).stream()
-                    .filter(Objects::nonNull)
-                    .forEachOrdered(ex -> {
-                Log.verbose(ex.getLocalizedMessage());
-                Log.verbose(ex.getAdvice());
-            });
+        Map<String, String> data = createDefaultReplacementData(env.env(), env.pkg());
 
-            return packageBundle;
-        } catch (IOException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
+        for (var ca : customActions) {
+            ShellCustomAction.mergeReplacementData(data, ca.instance.create());
         }
+
+        data.putAll(createReplacementData(env.env(), env.pkg()));
+
+        createConfigFiles(Collections.unmodifiableMap(data), env.env(), env.pkg());
     }
 
-    private List<String> getListOfNeededPackages(
-            Map<String, ? super Object> params) throws IOException {
+    private void buildPackage(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
+        Path packageBundle = buildPackageBundle(env.env(), env.pkg(), env.outputDir());
+
+        verifyOutputBundle(env.env(), env.pkg(), packageBundle).stream()
+                .filter(Objects::nonNull)
+                .forEachOrdered(ex -> {
+            Log.verbose(ex.getLocalizedMessage());
+            Log.verbose(ex.getAdvice());
+        });
+    }
 
-        PlatformPackage thePackage = createMetaPackage(params);
+    private List<String> getListOfNeededPackages(BuildEnv env) throws IOException {
 
         final List<String> caPackages = customActions.stream()
                 .map(ca -> ca.instance)
@@ -193,16 +166,14 @@ private List<String> getListOfNeededPackages(
                 .flatMap(List::stream).toList();
 
         final List<String> neededLibPackages;
-        if (withFindNeededPackages && Files.exists(thePackage.sourceRoot())) {
+        if (withFindNeededPackages) {
             LibProvidersLookup lookup = new LibProvidersLookup();
-            initLibProvidersLookup(params, lookup);
+            initLibProvidersLookup(lookup);
 
-            neededLibPackages = lookup.execute(thePackage.sourceRoot());
+            neededLibPackages = lookup.execute(env.appImageDir());
         } else {
             neededLibPackages = Collections.emptyList();
-            if (!Files.exists(thePackage.sourceRoot())) {
-                Log.info(I18N.getString("warning.foreign-app-image"));
-            }
+            Log.info(I18N.getString("warning.foreign-app-image"));
         }
 
         // Merge all package lists together.
@@ -215,17 +186,16 @@ private List<String> getListOfNeededPackages(
         return result;
     }
 
-    private Map<String, String> createDefaultReplacementData(
-            Map<String, ? super Object> params) throws IOException {
+    private Map<String, String> createDefaultReplacementData(BuildEnv env, LinuxPackage pkg) throws IOException {
         Map<String, String> data = new HashMap<>();
 
-        data.put("APPLICATION_PACKAGE", createMetaPackage(params).name());
-        data.put("APPLICATION_VENDOR", VENDOR.fetchFrom(params));
-        data.put("APPLICATION_VERSION", VERSION.fetchFrom(params));
-        data.put("APPLICATION_DESCRIPTION", DESCRIPTION.fetchFrom(params));
+        data.put("APPLICATION_PACKAGE", pkg.packageName());
+        data.put("APPLICATION_VENDOR", pkg.app().vendor());
+        data.put("APPLICATION_VERSION", pkg.version());
+        data.put("APPLICATION_DESCRIPTION", pkg.description());
 
-        String defaultDeps = String.join(", ", getListOfNeededPackages(params));
-        String customDeps = LINUX_PACKAGE_DEPENDENCIES.fetchFrom(params).strip();
+        String defaultDeps = String.join(", ", getListOfNeededPackages(env));
+        String customDeps = pkg.additionalDependencies().orElse("");
         if (!customDeps.isEmpty() && !defaultDeps.isEmpty()) {
             customDeps = ", " + customDeps;
         }
@@ -236,117 +206,27 @@ private Map<String, String> createDefaultReplacementData(
     }
 
     protected abstract List<ConfigException> verifyOutputBundle(
-            Map<String, ? super Object> params, Path packageBundle);
+            BuildEnv env, LinuxPackage pkg, Path packageBundle);
 
-    protected abstract void initLibProvidersLookup(
-            Map<String, ? super Object> params,
-            LibProvidersLookup libProvidersLookup);
+    protected abstract void initLibProvidersLookup(LibProvidersLookup libProvidersLookup);
 
-    protected abstract List<ToolValidator> getToolValidators(
-            Map<String, ? super Object> params);
+    protected abstract List<ToolValidator> getToolValidators();
 
-    protected abstract void doValidate(Map<String, ? super Object> params)
+    protected abstract void doValidate(BuildEnv env, LinuxPackage pkg)
             throws ConfigException;
 
     protected abstract Map<String, String> createReplacementData(
-            Map<String, ? super Object> params) throws IOException;
+            BuildEnv env, LinuxPackage pkg) throws IOException;
 
-    protected abstract Path buildPackageBundle(
+    protected abstract void createConfigFiles(
             Map<String, String> replacementData,
-            Map<String, ? super Object> params, Path outputParentDir) throws
-            PackagerException, IOException;
-
-    protected final PlatformPackage createMetaPackage(
-            Map<String, ? super Object> params) {
-
-        Supplier<ApplicationLayout> packageLayout = () -> {
-            String installDir = LINUX_INSTALL_DIR.fetchFrom(params);
-            if (isInstallDirInUsrTree(installDir)) {
-                return ApplicationLayout.linuxUsrTreePackageImage(
-                        Path.of("/").relativize(Path.of(installDir)),
-                        packageName.fetchFrom(params));
-            }
-            return appImageLayout(params);
-        };
-
-        return new PlatformPackage() {
-            @Override
-            public String name() {
-                return packageName.fetchFrom(params);
-            }
-
-            @Override
-            public Path sourceRoot() {
-                return IMAGES_ROOT.fetchFrom(params).toAbsolutePath();
-            }
-
-            @Override
-            public ApplicationLayout sourceApplicationLayout() {
-                return packageLayout.get().resolveAt(
-                        applicationInstallDir(sourceRoot()));
-            }
-
-            @Override
-            public ApplicationLayout installedApplicationLayout() {
-                return packageLayout.get().resolveAt(
-                        applicationInstallDir(Path.of("/")));
-            }
-
-            private Path applicationInstallDir(Path root) {
-                String installRoot = LINUX_INSTALL_DIR.fetchFrom(params);
-                if (isInstallDirInUsrTree(installRoot)) {
-                    return root;
-                }
-
-                Path installDir = Path.of(installRoot, name());
-                if (installDir.isAbsolute()) {
-                    installDir = Path.of("." + installDir.toString()).normalize();
-                }
-                return root.resolve(installDir);
-            }
-        };
-    }
-
-    private ApplicationLayout appImageLayout(
-            Map<String, ? super Object> params) {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            return ApplicationLayout.javaRuntime();
-        }
-        return ApplicationLayout.linuxAppImage();
-    }
+            BuildEnv env, LinuxPackage pkg) throws IOException;
 
-    private static void validateInstallDir(String installDir) throws
-            ConfigException {
-
-        if (installDir.isEmpty()) {
-            throw new ConfigException(MessageFormat.format(I18N.getString(
-                    "error.invalid-install-dir"), "/"), null);
-        }
-
-        boolean valid = false;
-        try {
-            final Path installDirPath = Path.of(installDir);
-            valid = installDirPath.isAbsolute();
-            if (valid && !installDirPath.normalize().toString().equals(
-                    installDirPath.toString())) {
-                // Don't allow '/opt/foo/..' or /opt/.
-                valid = false;
-            }
-        } catch (InvalidPathException ex) {
-        }
-
-        if (!valid) {
-            throw new ConfigException(MessageFormat.format(I18N.getString(
-                    "error.invalid-install-dir"), installDir), null);
-        }
-    }
-
-    protected static boolean isInstallDirInUsrTree(String installDir) {
-        return Set.of("/usr/local", "/usr").contains(installDir);
-    }
+    protected abstract Path buildPackageBundle(
+            BuildEnv env, LinuxPackage pkg, Path outputParentDir) throws
+            PackagerException, IOException;
 
-    private final BundlerParamInfo<String> packageName;
-    private final Bundler appImageBundler;
+    private final BundlerParamInfo<? extends LinuxPackage> pkgParam;
     private boolean withFindNeededPackages;
     private final List<CustomActionInstance> customActions;
 
@@ -356,38 +236,12 @@ private static final class CustomActionInstance {
             this.factory = factory;
         }
 
-        void init(PlatformPackage thePackage, Map<String, ? super Object> params)
-                throws IOException {
-            instance = factory.create(thePackage, params);
+        void init(BuildEnv env, Package pkg) throws IOException {
+            instance = factory.create(env, pkg);
             Objects.requireNonNull(instance);
         }
 
         private final ShellCustomActionFactory factory;
         ShellCustomAction instance;
     }
-
-    private static final BundlerParamInfo<String> LINUX_PACKAGE_DEPENDENCIES =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.LINUX_PACKAGE_DEPENDENCIES.getId(),
-            String.class,
-            params -> "",
-            (s, p) -> s
-    );
-
-    static final BundlerParamInfo<String> LINUX_INSTALL_DIR =
-            new StandardBundlerParam<>(
-            "linux-install-dir",
-            String.class,
-            params -> {
-                 String dir = INSTALL_DIR.fetchFrom(params);
-                 if (dir != null) {
-                     if (dir.endsWith("/")) {
-                         dir = dir.substring(0, dir.length()-1);
-                     }
-                     return dir;
-                 }
-                 return "/opt";
-             },
-            (s, p) -> s
-    );
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
new file mode 100644
index 00000000000..dd29338655d
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
+import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
+import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.resources.ResourceLocator;
+
+final class LinuxPackagingPipeline {
+
+    enum LinuxAppImageTaskID implements TaskID {
+        LAUNCHER_LIB,
+        LAUNCHER_ICONS
+    }
+
+    static PackagingPipeline.Builder build() {
+        return PackagingPipeline.buildStandard()
+                .task(LinuxAppImageTaskID.LAUNCHER_LIB)
+                        .addDependent(PrimaryTaskID.BUILD_APPLICATION_IMAGE)
+                        .applicationAction(LinuxPackagingPipeline::writeLauncherLib).add()
+                .task(LinuxAppImageTaskID.LAUNCHER_ICONS)
+                        .addDependent(BuildApplicationTaskID.CONTENT)
+                        .applicationAction(LinuxPackagingPipeline::writeLauncherIcons).add();
+    }
+
+    private static void writeLauncherLib(
+            AppImageBuildEnv<Application, LinuxApplicationLayout> env) throws IOException {
+
+        final var launcherLib = env.resolvedLayout().libAppLauncher();
+        try (var in = ResourceLocator.class.getResourceAsStream("libjpackageapplauncheraux.so")) {
+            Files.createDirectories(launcherLib.getParent());
+            Files.copy(in, launcherLib);
+        }
+    }
+
+    private static void writeLauncherIcons(
+            AppImageBuildEnv<Application, ApplicationLayout> env) throws IOException {
+
+        for (var launcher : env.app().launchers()) {
+            createLauncherIconResource(env.app(), launcher, env.env()::createResource).ifPresent(iconResource -> {
+                String iconFileName = launcher.executableName() + ".png";
+                Path iconTarget = env.resolvedLayout().desktopIntegrationDirectory().resolve(iconFileName);
+                try {
+                    iconResource.saveToFile(iconTarget);
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            });
+        }
+    }
+
+    static final LinuxApplicationLayout APPLICATION_LAYOUT = LinuxApplicationLayout.create(
+            ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT, Path.of("lib/libapplauncher.so"));
+}
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 ce428d16ff2..350f70f11bc 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
@@ -27,29 +27,22 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.DottedVersion;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.LinuxRpmPackage;
+import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
 
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.RELEASE;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
 
 /**
  * There are two command line options to configure license information for RPM
@@ -64,62 +57,6 @@
  */
 public class LinuxRpmBundler extends LinuxPackageBundler {
 
-    // Fedora rules for package naming are used here
-    // https://fedoraproject.org/wiki/Packaging:NamingGuidelines?rd=Packaging/NamingGuidelines
-    //
-    // all Fedora packages must be named using only the following ASCII
-    // characters. These characters are displayed here:
-    //
-    // abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+
-    //
-    private static final Pattern RPM_PACKAGE_NAME_PATTERN =
-            Pattern.compile("[a-z\\d\\+\\-\\.\\_]+", Pattern.CASE_INSENSITIVE);
-
-    public static final BundlerParamInfo<String> PACKAGE_NAME =
-            new StandardBundlerParam<> (
-            Arguments.CLIOptions.LINUX_BUNDLE_NAME.getId(),
-            String.class,
-            params -> {
-                String nm = INSTALLER_NAME.fetchFrom(params);
-                if (nm == null) return null;
-
-                // make sure to lower case and spaces become dashes
-                nm = nm.toLowerCase().replaceAll("[ ]", "-");
-
-                return nm;
-            },
-            (s, p) -> {
-                if (!RPM_PACKAGE_NAME_PATTERN.matcher(s).matches()) {
-                    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;
-            }
-        );
-
-    public static final BundlerParamInfo<String> LICENSE_TYPE =
-        new StandardBundlerParam<>(
-                Arguments.CLIOptions.LINUX_RPM_LICENSE_TYPE.getId(),
-                String.class,
-                params -> I18N.getString("param.license-type.default"),
-                (s, p) -> s
-        );
-
-    public static final BundlerParamInfo<String> GROUP =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.LINUX_CATEGORY.getId(),
-            String.class,
-            params -> null,
-            (s, p) -> s);
-
     private static final String DEFAULT_SPEC_TEMPLATE = "template.spec";
 
     public static final String TOOL_RPM = "rpm";
@@ -128,12 +65,11 @@ public class LinuxRpmBundler extends LinuxPackageBundler {
             "4.10");
 
     public LinuxRpmBundler() {
-        super(PACKAGE_NAME);
+        super(LinuxFromParams.RPM_PACKAGE);
     }
 
     @Override
-    public void doValidate(Map<String, ? super Object> params)
-            throws ConfigException {
+    protected void doValidate(BuildEnv env, LinuxPackage pkg) throws ConfigException {
     }
 
     private static ToolValidator createRpmbuildToolValidator() {
@@ -151,63 +87,58 @@ private static ToolValidator createRpmbuildToolValidator() {
     }
 
     @Override
-    protected List<ToolValidator> getToolValidators(
-            Map<String, ? super Object> params) {
+    protected List<ToolValidator> getToolValidators() {
         return List.of(createRpmbuildToolValidator());
     }
 
-    @Override
-    protected Path buildPackageBundle(
-            Map<String, String> replacementData,
-            Map<String, ? super Object> params, Path outputParentDir) throws
-            PackagerException, IOException {
-
-        Path specFile = specFile(params);
+    protected void createConfigFiles(Map<String, String> replacementData,
+            BuildEnv env, LinuxPackage pkg) throws IOException {
+        Path specFile = specFile(env, pkg);
 
         // prepare spec file
-        createResource(DEFAULT_SPEC_TEMPLATE, params)
+        env.createResource(DEFAULT_SPEC_TEMPLATE)
                 .setCategory(I18N.getString("resource.rpm-spec-file"))
                 .setSubstitutionData(replacementData)
                 .saveToFile(specFile);
-
-        return buildRPM(params, outputParentDir);
     }
 
     @Override
-    protected Map<String, String> createReplacementData(
-            Map<String, ? super Object> params) throws IOException {
-        Map<String, String> data = new HashMap<>();
-
-        final Path prefix = Path.of(LINUX_INSTALL_DIR.fetchFrom(params));
+    protected Path buildPackageBundle(BuildEnv env, LinuxPackage pkg,
+            Path outputParentDir) throws PackagerException, IOException {
+        return buildRPM(env, pkg, outputParentDir);
+    }
 
-        Path appDirectory = prefix;
-        if (!isInstallDirInUsrTree(prefix.toString())) {
-            appDirectory = appDirectory.resolve(PACKAGE_NAME.fetchFrom(params));
+    private static Path installPrefix(LinuxPackage pkg) {
+        Path path = pkg.relativeInstallDir();
+        if (!pkg.isInstallDirInUsrTree()) {
+            path = path.getParent();
         }
+        return Path.of("/").resolve(path);
+    }
+
+    @Override
+    protected Map<String, String> createReplacementData(BuildEnv env, LinuxPackage pkg) throws IOException {
+        Map<String, String> data = new HashMap<>();
 
-        data.put("APPLICATION_RELEASE", RELEASE.fetchFrom(params));
-        data.put("APPLICATION_PREFIX", prefix.toString());
-        data.put("APPLICATION_DIRECTORY", appDirectory.toString());
-        data.put("APPLICATION_SUMMARY", APP_NAME.fetchFrom(params));
-        data.put("APPLICATION_LICENSE_TYPE", LICENSE_TYPE.fetchFrom(params));
+        data.put("APPLICATION_RELEASE", pkg.release().orElseThrow());
+        data.put("APPLICATION_PREFIX", installPrefix(pkg).toString());
+        data.put("APPLICATION_DIRECTORY", Path.of("/").resolve(pkg.relativeInstallDir()).toString());
+        data.put("APPLICATION_SUMMARY", pkg.app().name());
+        data.put("APPLICATION_LICENSE_TYPE", ((LinuxRpmPackage)pkg).licenseType());
 
-        String licenseFile = LICENSE_FILE.fetchFrom(params);
-        if (licenseFile != null) {
-            licenseFile = Path.of(licenseFile).toAbsolutePath().normalize().toString();
-        }
+        String licenseFile = pkg.licenseFile().map(v -> {
+            return v.toAbsolutePath().normalize().toString();
+        }).orElse(null);
         data.put("APPLICATION_LICENSE_FILE", licenseFile);
-        data.put("APPLICATION_GROUP", GROUP.fetchFrom(params));
+        data.put("APPLICATION_GROUP", pkg.category().orElse(""));
 
-        data.put("APPLICATION_URL", Optional.ofNullable(ABOUT_URL.fetchFrom(
-                params)).orElse(""));
+        data.put("APPLICATION_URL", pkg.aboutURL().orElse(""));
 
         return data;
     }
 
     @Override
-    protected void initLibProvidersLookup(
-            Map<String, ? super Object> params,
-            LibProvidersLookup libProvidersLookup) {
+    protected void initLibProvidersLookup(LibProvidersLookup libProvidersLookup) {
         libProvidersLookup.setPackageLookup(file -> {
             return Executor.of(TOOL_RPM,
                 "-q", "--queryformat", "%{name}\\n",
@@ -217,21 +148,21 @@ protected void initLibProvidersLookup(
     }
 
     @Override
-    protected List<ConfigException> verifyOutputBundle(
-            Map<String, ? super Object> params, Path packageBundle) {
+    protected List<ConfigException> verifyOutputBundle(BuildEnv env, LinuxPackage pkg,
+            Path packageBundle) {
         List<ConfigException> errors = new ArrayList<>();
 
-        String specFileName = specFile(params).getFileName().toString();
+        String specFileName = specFile(env, pkg).getFileName().toString();
 
         try {
             List<PackageProperty> properties = List.of(
-                    new PackageProperty("Name", PACKAGE_NAME.fetchFrom(params),
+                    new PackageProperty("Name", pkg.packageName(),
                             "APPLICATION_PACKAGE", specFileName),
-                    new PackageProperty("Version", VERSION.fetchFrom(params),
+                    new PackageProperty("Version", pkg.version(),
                             "APPLICATION_VERSION", specFileName),
-                    new PackageProperty("Release", RELEASE.fetchFrom(params),
+                    new PackageProperty("Release", pkg.release().orElseThrow(),
                             "APPLICATION_RELEASE", specFileName),
-                    new PackageProperty("Arch", rpmArch(), null, specFileName));
+                    new PackageProperty("Arch", pkg.arch(), null, specFileName));
 
             List<String> actualValues = Executor.of(TOOL_RPM, "-qp", "--queryformat",
                     properties.stream().map(entry -> String.format("%%{%s}",
@@ -249,87 +180,30 @@ protected List<ConfigException> verifyOutputBundle(
         return errors;
     }
 
-    /**
-     * Various ways to get rpm arch. Needed to address JDK-8233143. rpmbuild is
-     * mandatory for rpm packaging, try it first. rpm is optional and may not be
-     * available, use as the last resort.
-     */
-    private enum RpmArchReader {
-        Rpmbuild(TOOL_RPMBUILD, "--eval=%{_target_cpu}"),
-        Rpm(TOOL_RPM, "--eval=%{_target_cpu}");
-
-        RpmArchReader(String... cmdline) {
-            this.cmdline = cmdline;
-        }
-
-        String getRpmArch() throws IOException {
-            Executor exec = Executor.of(cmdline).saveOutput(true);
-            if (this == values()[values().length - 1]) {
-                exec.executeExpectSuccess();
-            } else if (exec.execute() != 0) {
-                return null;
-            }
-
-            return exec.getOutput().get(0);
-        }
-
-        private final String[] cmdline;
+    private Path specFile(BuildEnv env, Package pkg) {
+        return env.buildRoot().resolve(Path.of("SPECS", pkg.packageName() + ".spec"));
     }
 
-    private String rpmArch() throws IOException {
-        if (rpmArch == null) {
-            for (var rpmArchReader : RpmArchReader.values()) {
-                rpmArch = rpmArchReader.getRpmArch();
-                if (rpmArch != null) {
-                    break;
-                }
-            }
-        }
-        return rpmArch;
-    }
+    private Path buildRPM(BuildEnv env, Package pkg, Path outdir) throws IOException {
 
-    private Path specFile(Map<String, ? super Object> params) {
-        return TEMP_ROOT.fetchFrom(params).resolve(Path.of("SPECS",
-                PACKAGE_NAME.fetchFrom(params) + ".spec"));
-    }
-
-    private Path buildRPM(Map<String, ? super Object> params,
-            Path outdir) throws IOException {
-
-        PlatformPackage thePackage = createMetaPackage(params);
+        Path rpmFile = outdir.toAbsolutePath().resolve(pkg.packageFileNameWithSuffix());
 
-        new ScriptRunner()
-                .setDirectory(thePackage.sourceRoot())
-                .setResourceCategoryId("resource.post-app-image-script")
-                .setScriptNameSuffix("post-image")
-                .setEnvironmentVariable("JpAppImageDir", thePackage.sourceRoot().toAbsolutePath().toString())
-                .run(params);
-
-        Path rpmFile = outdir.toAbsolutePath().resolve(String.format(
-                "%s-%s-%s.%s.rpm", PACKAGE_NAME.fetchFrom(params),
-                VERSION.fetchFrom(params), RELEASE.fetchFrom(params), rpmArch()));
-
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.outputting-bundle-location"),
-                rpmFile.getParent()));
+        Log.verbose(I18N.format("message.outputting-bundle-location", rpmFile.getParent()));
 
         //run rpmbuild
-        Executor.of(
-                TOOL_RPMBUILD,
-                "-bb", specFile(params).toAbsolutePath().toString(),
+        Executor.of(TOOL_RPMBUILD,
+                "-bb", specFile(env, pkg).toAbsolutePath().toString(),
                 "--define", String.format("%%_sourcedir %s",
-                        thePackage.sourceRoot()),
+                        env.appImageDir().toAbsolutePath()),
                 // save result to output dir
                 "--define", String.format("%%_rpmdir %s", rpmFile.getParent()),
                 // do not use other system directories to build as current user
                 "--define", String.format("%%_topdir %s",
-                        TEMP_ROOT.fetchFrom(params).toAbsolutePath()),
+                        env.buildRoot().toAbsolutePath()),
                 "--define", String.format("%%_rpmfilename %s", rpmFile.getFileName())
         ).executeExpectSuccess();
 
-        Log.verbose(MessageFormat.format(
-                I18N.getString("message.output-bundle-location"),
-                rpmFile.getParent()));
+        Log.verbose(I18N.format("message.output-bundle-location", rpmFile.getParent()));
 
         return rpmFile;
     }
@@ -353,6 +227,4 @@ public boolean supported(boolean runtimeInstaller) {
     public boolean isDefault() {
         return !LinuxDebBundler.isDebian();
     }
-
-    private String rpmArch;
 }
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
new file mode 100644
index 00000000000..bc361eac759
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
@@ -0,0 +1,62 @@
+/*
+ * 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;
+
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LinuxRpmPackage;
+import jdk.jpackage.internal.model.LinuxRpmPackageMixin;
+
+final class LinuxRpmPackageBuilder {
+
+    LinuxRpmPackageBuilder(LinuxPackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    LinuxRpmPackage create() throws ConfigException {
+        if (pkgBuilder.release().isEmpty()) {
+            pkgBuilder.release("1");
+        }
+        var pkg = pkgBuilder.create();
+        return LinuxRpmPackage.create(pkg, new LinuxRpmPackageMixin.Stub(
+                Optional.ofNullable(licenseType).orElseGet(DEFAULTS::licenseType)));
+    }
+
+    LinuxRpmPackageBuilder licenseType(String v) {
+        licenseType = v;
+        return this;
+    }
+
+    private record Defaults(String licenseType) {
+    }
+
+    private String licenseType;
+
+    private final LinuxPackageBuilder pkgBuilder;
+
+    private static final Defaults DEFAULTS = new Defaults(I18N.getString(
+            "param.license-type.default"));
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxApplication.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxApplication.java
new file mode 100644
index 00000000000..66225948fbb
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxApplication.java
@@ -0,0 +1,47 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Linux application.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ */
+public interface LinuxApplication extends Application {
+
+    /**
+     * Creates {@link LinuxApplication} instance from the given {@link Application}
+     * instance.
+     *
+     * @param app the generic application
+     * @return the proxy dispatching calls to the given {@link Application} instance
+     */
+    public static LinuxApplication create(Application app) {
+        return CompositeProxy.create(LinuxApplication.class, app);
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackage.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackage.java
new file mode 100644
index 00000000000..3a4dc9bf082
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackage.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Linux DEB package.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ *
+ * @see <a href="https://www.debian.org/doc/debian-policy/ch-binary.html#">https://www.debian.org/doc/debian-policy/ch-binary.html#</a>
+ * @see <a href="https://linux.die.net/man/5/deb-control">https://linux.die.net/man/5/deb-control</a>
+ */
+public interface LinuxDebPackage extends LinuxPackage, LinuxDebPackageMixin {
+
+    /**
+     * Gets the value of the maintainer property of this DEB package.
+     *
+     * @see <a href=
+     *      "https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-maintainer">https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-maintainer</a>
+     * @return the maintainer property of this DEB package
+     */
+    default String maintainer() {
+        return String.format("%s <%s>", app().vendor(), maintainerEmail());
+    }
+
+    /**
+     * Gets the relative path to this DEB package's copyright file. Returns empty
+     * {@link Optional} instance if this DEB package has no copyright file.
+     *
+     * @return the relative path to the copyright file of this DEB package
+     */
+    default Optional<Path> relativeCopyrightFilePath() {
+        if (isInstallDirInUsrTree() || Path.of("/").resolve(relativeInstallDir()).startsWith("/usr/")) {
+            return Optional.of(Path.of("usr/share/doc/", packageName(), "copyright"));
+        } else if (!isRuntimeInstaller()) {
+            return Optional.of(relativeInstallDir().resolve("share/doc/copyright"));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Constructs {@link LinuxDebPackage} instance from the given
+     * {@link LinuxPackage} and {@link LinuxDebPackageMixin} instances.
+     *
+     * @param pkg the Linux package
+     * @param mixin DEB-specific details supplementing the Linux package
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LinuxDebPackage create(LinuxPackage pkg, LinuxDebPackageMixin mixin) {
+        return CompositeProxy.create(LinuxDebPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackageMixin.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackageMixin.java
new file mode 100644
index 00000000000..6e3ae466578
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackageMixin.java
@@ -0,0 +1,44 @@
+/*
+ * 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.model;
+
+/**
+ * Details of Linux DEB package.
+ */
+public interface LinuxDebPackageMixin {
+
+    /**
+     * Gets the email of the maintainer of this DEB package.
+     *
+     * @return the email of the maintainer of this DEB package
+     */
+    String maintainerEmail();
+
+    /**
+     * Default implementation of {@link LinuxDebPackageMixin} interface.
+     */
+    record Stub(String maintainerEmail) implements LinuxDebPackageMixin {
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
new file mode 100644
index 00000000000..8970f2198c2
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.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 jdk.jpackage.internal.model;
+
+import java.util.Map;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Linux application launcher.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ */
+public interface LinuxLauncher extends Launcher, LinuxLauncherMixin {
+
+    @Override
+    default Map<String, String> extraAppImageFileData() {
+        return shortcut().map(v -> {
+            return Map.of("shortcut", Boolean.toString(v));
+        }).orElseGet(Map::of);
+    }
+
+    /**
+     * Constructs {@link LinuxLauncher} instance from the given
+     * {@link Launcher} and {@link LinuxLauncherMixin} instances.
+     *
+     * @param launcher the generic application launcher
+     * @param mixin Linux-specific details supplementing the generic application launcher
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LinuxLauncher create(Launcher launcher, LinuxLauncherMixin mixin) {
+        return CompositeProxy.create(LinuxLauncher.class, launcher, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncherMixin.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncherMixin.java
new file mode 100644
index 00000000000..d5e15101c7e
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncherMixin.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 jdk.jpackage.internal.model;
+
+import java.util.Optional;
+
+/**
+ * Details of Linux application launcher.
+ */
+public interface LinuxLauncherMixin {
+
+    /**
+     * Gets the start menu shortcut setting of this application launcher.
+     * <p>
+     * Returns <code>true</code> if this application launcher was requested to have
+     * the start menu shortcut.
+     * <p>
+     * Returns <code>false</code> if this application launcher was requested not to
+     * have the start menu shortcut.
+     * <p>
+     * Returns an empty {@link Optional} instance if there was no request about the
+     * start menu shortcut for this application launcher.
+     *
+     * @return the start menu shortcut setting of this application launcher
+     */
+    Optional<Boolean> shortcut();
+
+    /**
+     * Default implementation of {@link LinuxLauncherMixin} interface.
+     */
+    record Stub(Optional<Boolean> shortcut) implements LinuxLauncherMixin {
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackage.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackage.java
new file mode 100644
index 00000000000..aef1c5eb700
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackage.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Linux package.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ */
+public interface LinuxPackage extends Package, LinuxPackageMixin {
+
+    LinuxApplication app();
+
+    @Override
+    AppImageLayout packageLayout();
+
+    @Override
+    default String packageFileName() {
+        String packageFileNameTemlate = asStandardPackageType().map(stdType -> {
+            switch (stdType) {
+                case LINUX_DEB -> {
+                    return "%s_%s_%s";
+                }
+                case LINUX_RPM -> {
+                    return "%s-%s.%s";
+                }
+                default -> {
+                    throw new IllegalStateException();
+                }
+            }
+        }).orElseThrow(UnsupportedOperationException::new);
+
+        return String.format(packageFileNameTemlate, packageName(), versionWithRelease(), arch());
+    }
+
+    /**
+     * Gets the version with the release component of this Linux package.
+     *
+     * @return the version with the release component of this Linux package
+     */
+    default String versionWithRelease() {
+        return String.format("%s%s", version(), release().map(r -> "-" + r).orElse(""));
+    }
+
+    /**
+     * Returns <code>true</code> in this Linux package installs in "/usr" tree.
+     *
+     * @return <code>true</code> in this Linux package installs in "/usr" tree
+     */
+    default boolean isInstallDirInUsrTree() {
+        return !relativeInstallDir().getFileName().equals(Path.of(packageName()));
+    }
+
+    /**
+     * Constructs {@link LinuxPackage} instance from the given
+     * {@link Package} and {@link LinuxPackageMixin} instances.
+     *
+     * @param pkg the generic package
+     * @param mixin Linux-specific details supplementing the Linux package
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LinuxPackage create(Package pkg, LinuxPackageMixin mixin) {
+        return CompositeProxy.create(LinuxPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
new file mode 100644
index 00000000000..f890aa6ff39
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
@@ -0,0 +1,95 @@
+/*
+ * 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.model;
+
+import java.util.Optional;
+
+/**
+ * Details of Linux package.
+ */
+public interface LinuxPackageMixin {
+
+    /**
+     * Overrides {@link Package#packageLayout()}.
+     */
+    AppImageLayout packageLayout();
+
+    /**
+     * Gets the name of the start menu group where to create shortcuts for
+     * application launchers of this package.
+     *
+     * @return the name of the start menu group where to create shortcuts for
+     *         application launchers of this package
+     *
+     * @see LinuxLauncherMixin#shortcut()
+     */
+    String menuGroupName();
+
+    /**
+     * Gets the category of this package.
+     *
+     * @return the category of this package
+     */
+    Optional<String> category();
+
+    /**
+     * Gets a string with the additional dependencies of this package. Returns an
+     * empty {@link Optional} instance if this package has no additional
+     * dependencies.
+     *
+     * @return a string with the additional dependencies of this package
+     */
+    Optional<String> additionalDependencies();
+
+    /**
+     * Gets the release of this package. Returns an empty {@link Optional} instance
+     * if this package doesn't have a release.
+     * <p>
+     * For RPM packages, this is the value of a "Release" property in spec file. RPM
+     * packages always have a release.
+     * <p>
+     * For DEB packages, this is an optional {@code debian_revision} component of a
+     * package version. See <a href=
+     * "https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-version#">https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-version#</a>.
+     *
+     * @return the release of this package
+     */
+    Optional<String> release();
+
+    /**
+     * Gets the platform architecture of this package.
+     *
+     * @return the platform architecture of this package
+     */
+    String arch();
+
+    /**
+     * Default implementation of {@link LinuxPackageMixin} interface.
+     */
+    record Stub(AppImageLayout packageLayout, String menuGroupName,
+            Optional<String> category, Optional<String> additionalDependencies,
+            Optional<String> release, String arch) implements LinuxPackageMixin {
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackage.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackage.java
new file mode 100644
index 00000000000..15283395ea4
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackage.java
@@ -0,0 +1,45 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Linux RPM package.
+ */
+public interface LinuxRpmPackage extends LinuxPackage, LinuxRpmPackageMixin {
+
+    /**
+     * Constructs {@link LinuxRpmPackage} instance from the given
+     * {@link LinuxPackage} and {@link LinuxRpmPackageMixin} instances.
+     *
+     * @param pkg the Linux package
+     * @param mixin RPM-specific details supplementing the generic package
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LinuxRpmPackage create(LinuxPackage pkg, LinuxRpmPackageMixin mixin) {
+        return CompositeProxy.create(LinuxRpmPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackageMixin.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackageMixin.java
new file mode 100644
index 00000000000..c0e7dd10b01
--- /dev/null
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackageMixin.java
@@ -0,0 +1,43 @@
+/*
+ * 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.model;
+
+/**
+ * Details of Linux RPM package.
+ */
+public interface LinuxRpmPackageMixin {
+
+    /**
+     * Gets type of the license of this RPM package.
+     * @return type of the license of this RPM package
+     */
+    String licenseType();
+
+    /**
+     * Default implementation of {@link LinuxRpmPackageMixin} interface.
+     */
+    record Stub(String licenseType) implements LinuxRpmPackageMixin {
+    }
+}
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 3e60eb48f67..fbc83ba2e10 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
@@ -44,14 +44,14 @@ resource.systemd-unit-file=systemd unit file
 error.tool-not-found.advice=Please install required packages
 error.tool-old-version.advice=Please install required packages
 
-error.invalid-install-dir=Invalid installation directory "{0}"
-
 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.
 
+error.rpm-arch-not-detected="Failed to detect RPM arch"
+
 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}
 message.outputting-to-location=Generating DEB for installer to: {0}.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageInfoPListFile.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageInfoPListFile.java
new file mode 100644
index 00000000000..4787d1297bb
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageInfoPListFile.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import static jdk.jpackage.internal.util.XmlUtils.initDocumentBuilder;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.jpackage.internal.model.DottedVersion;
+import jdk.jpackage.internal.util.PListReader;
+import org.xml.sax.SAXException;
+
+/**
+ * Mandatory elements of Info.plist file of app image.
+ */
+record AppImageInfoPListFile(String bundleIdentifier, String bundleName, String copyright,
+        DottedVersion shortVersion, DottedVersion bundleVersion, String category) {
+
+    static final class InvalidPlistFileException extends Exception {
+        InvalidPlistFileException(Throwable cause) {
+            super(cause);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static AppImageInfoPListFile loadFromInfoPList(Path infoPListFile)
+            throws IOException, InvalidPlistFileException, SAXException {
+
+        final var plistReader = new PListReader(initDocumentBuilder().parse(Files.newInputStream(infoPListFile)));
+
+        try {
+            return new AppImageInfoPListFile(
+                    plistReader.queryValue("CFBundleIdentifier"),
+                    plistReader.queryValue("CFBundleName"),
+                    plistReader.queryValue("NSHumanReadableCopyright"),
+                    DottedVersion.greedy(plistReader.queryValue("CFBundleShortVersionString")),
+                    DottedVersion.greedy(plistReader.queryValue("CFBundleVersion")),
+                    plistReader.queryValue("LSApplicationCategoryType"));
+        } catch (Exception ex) {
+            throw new InvalidPlistFileException(ex);
+        }
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
new file mode 100644
index 00000000000..d7b2431c1d3
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
@@ -0,0 +1,239 @@
+/*
+ * 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;
+
+import static java.util.stream.Collectors.joining;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.Codesign.CodesignException;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.MacApplication;
+import jdk.jpackage.internal.util.PathUtils;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+
+final class AppImageSigner {
+
+    static Consumer<Path> createSigner(MacApplication app, CodesignConfig signingCfg) {
+        return toConsumer(appImage -> {
+            try {
+                new AppImageSigner(Codesigners.create(signingCfg)).sign(app, appImage);
+            } catch (CodesignException ex) {
+                throw handleCodesignException(app, ex);
+            } catch (ExceptionBox ex) {
+                if (ex.getCause() instanceof CodesignException codesignEx) {
+                    handleCodesignException(app, codesignEx);
+                }
+                throw ex;
+            }
+        });
+    }
+
+    private static final class SignFilter implements Predicate<Path> {
+
+        SignFilter(Application app, Path appImage) {
+            Objects.requireNonNull(appImage);
+
+            // Don't explicitly sign main launcher. It will be implicitly signed when the bundle is signed.
+            otherExcludePaths = app.asApplicationLayout().map(appLayout -> {
+                return appLayout.resolveAt(appImage);
+            }).map(ApplicationLayout::launchersDirectory).flatMap(launchersDir -> {
+                return app.mainLauncher().map(Launcher::executableNameWithSuffix).map(launchersDir::resolve);
+            }).map(Set::of).orElseGet(Set::of);
+        }
+
+        @Override
+        public boolean test(Path path) {
+            if (!Files.isRegularFile(path) || otherExcludePaths.contains(path)) {
+                return false;
+            }
+
+            if (Files.isExecutable(path) || path.getFileName().toString().endsWith(".dylib")) {
+                if (path.toString().contains("dylib.dSYM/Contents")) {
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
+
+        private final Set<Path> otherExcludePaths;
+    }
+
+    private void sign(MacApplication app, Path appImage) throws CodesignException, IOException {
+
+        final var fileFilter = new SignFilter(app, appImage);
+
+        try (var content = Files.walk(appImage)) {
+            content.filter(fileFilter).forEach(toConsumer(path -> {
+                final var origPerms = ensureCanWrite(path);
+                try {
+                    unsign(path);
+                    sign(path);
+                } finally {
+                    if (!origPerms.isEmpty()) {
+                        Files.setPosixFilePermissions(path, origPerms);
+                    }
+                }
+            }));
+        }
+
+        // Sign runtime root directory if present
+        app.asApplicationLayout().map(appLayout -> {
+            return appLayout.resolveAt(appImage);
+        }).map(MacApplicationLayout.class::cast).map(MacApplicationLayout::runtimeRootDirectory).ifPresent(codesigners);
+
+        final var frameworkPath = appImage.resolve("Contents/Frameworks");
+        if (Files.isDirectory(frameworkPath)) {
+            try (var content = Files.list(frameworkPath)) {
+                content.forEach(toConsumer(path -> {
+                    codesigners.codesignDir().accept(path);
+                }));
+            }
+        }
+
+        // Sign the app image itself
+        codesigners.accept(appImage);
+    }
+
+    private static Set<PosixFilePermission> ensureCanWrite(Path path) {
+        try {
+            final var origPerms = Files.getPosixFilePermissions(path);
+            if (origPerms.contains(PosixFilePermission.OWNER_WRITE)) {
+                return Set.of();
+            } else {
+                final var newPerms = EnumSet.copyOf(origPerms);
+                newPerms.add(PosixFilePermission.OWNER_WRITE);
+                Files.setPosixFilePermissions(path, newPerms);
+                return origPerms;
+            }
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    private static CodesignException handleCodesignException(MacApplication app, CodesignException ex) {
+        // Log output of "codesign" in case of error. It should help
+        // user to diagnose issues when using --mac-app-image-sign-identity.
+        // In addition add possible reason for failure. For example
+        // "--app-content" can fail "codesign".
+
+        if (!app.contentDirs().isEmpty()) {
+            Log.info(I18N.getString("message.codesign.failed.reason.app.content"));
+        }
+
+        // Signing might not work without Xcode with command line
+        // developer tools. Show user if Xcode is missing as possible
+        // reason.
+        if (!isXcodeDevToolsInstalled()) {
+            Log.info(I18N.getString("message.codesign.failed.reason.xcode.tools"));
+        }
+
+        // Log "codesign" output
+        Log.info(I18N.format("error.tool.failed.with.output", "codesign"));
+        Log.info(Stream.of(ex.getOutput()).collect(joining("\n")).strip());
+
+        return ex;
+    }
+
+    private static boolean isXcodeDevToolsInstalled() {
+        try {
+            return Executor.of("/usr/bin/xcrun", "--help").setQuiet(true).execute() == 0;
+        } catch (IOException ex) {
+            return false;
+        }
+    }
+
+    private static void unsign(Path path) throws IOException {
+        // run quietly
+        Executor.of("/usr/bin/codesign", "--remove-signature", path.toString())
+                .setQuiet(true)
+                .executeExpectSuccess();
+    }
+
+    private void sign(Path path) {
+        codesigners.accept(path);
+    }
+
+    private AppImageSigner(Codesigners codesigners) {
+        this.codesigners = Objects.requireNonNull(codesigners);
+    }
+
+    private record Codesigners(Consumer<Path> codesignFile, Consumer<Path> codesignExecutableFile, Consumer<Path> codesignDir) implements Consumer<Path> {
+        Codesigners {
+            Objects.requireNonNull(codesignFile);
+            Objects.requireNonNull(codesignExecutableFile);
+            Objects.requireNonNull(codesignDir);
+        }
+
+        @Override
+        public void accept(Path path) {
+            findCodesigner(path).orElseThrow(() -> {
+                return new IllegalArgumentException(String.format("No codesigner for %s path", PathUtils.normalizedAbsolutePathString(path)));
+            }).accept(path);
+        }
+
+        private Optional<Consumer<Path>> findCodesigner(Path path) {
+            if (Files.isDirectory(path)) {
+                return Optional.of(codesignDir);
+            } else if (Files.isRegularFile(path)) {
+                if (Files.isExecutable(path)) {
+                    return Optional.of(codesignExecutableFile);
+                } else {
+                    return Optional.of(codesignFile);
+                }
+            }
+            return Optional.empty();
+        }
+
+        static Codesigners create(CodesignConfig signingCfg) {
+            final var signingCfgWithoutEntitlements = CodesignConfig.build().from(signingCfg).entitlements(null).create();
+
+            final var codesignExecutableFile = Codesign.build(signingCfg::toCodesignArgs).quiet(true).create().asConsumer();
+            final var codesignFile = Codesign.build(signingCfgWithoutEntitlements::toCodesignArgs).quiet(true).create().asConsumer();
+            final var codesignDir = Codesign.build(signingCfgWithoutEntitlements::toCodesignArgs).force(true).create().asConsumer();
+
+            return new Codesigners(codesignFile, codesignExecutableFile, codesignDir);
+        }
+    }
+
+    private final Codesigners codesigners;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
new file mode 100644
index 00000000000..bb043830f3c
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.AppImageSigningConfig;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+
+final class AppImageSigningConfigBuilder {
+
+    AppImageSigningConfigBuilder(SigningIdentityBuilder signingIdentityBuilder) {
+        this.signingIdentityBuilder = Objects.requireNonNull(signingIdentityBuilder);
+    }
+
+    AppImageSigningConfigBuilder entitlements(Path v) {
+        entitlements = v;
+        return this;
+    }
+
+    AppImageSigningConfigBuilder entitlementsResourceName(String v) {
+        entitlementsResourceName = v;
+        return this;
+    }
+
+    AppImageSigningConfigBuilder signingIdentifierPrefix(LauncherStartupInfo mainLauncherStartupInfo) {
+        final var pkgName = mainLauncherStartupInfo.packageName();
+        if (!pkgName.isEmpty()) {
+            signingIdentifierPrefix(pkgName + ".");
+        } else {
+            signingIdentifierPrefix(mainLauncherStartupInfo.simpleClassName() + ".");
+        }
+        return this;
+    }
+
+    AppImageSigningConfigBuilder signingIdentifierPrefix(String v) {
+        signingIdentifierPrefix = v;
+        return this;
+    }
+
+    Optional<AppImageSigningConfig> create() throws ConfigException {
+        final var identityCfg = signingIdentityBuilder.create();
+        if (identityCfg.isEmpty()) {
+            return Optional.empty();
+        } else {
+            final var validatedEntitlements = validatedEntitlements();
+            return identityCfg.map(cfg -> {
+                return new AppImageSigningConfig.Stub(cfg.identity(), signingIdentifierPrefix,
+                        validatedEntitlements, cfg.keychain().map(Keychain::name),
+                        Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist"));
+            });
+        }
+    }
+
+    private Optional<Path> validatedEntitlements() throws ConfigException {
+        return Optional.ofNullable(entitlements);
+    }
+
+    private SigningIdentityBuilder signingIdentityBuilder;
+    private Path entitlements;
+    private String entitlementsResourceName;
+    private String signingIdentifierPrefix;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
new file mode 100644
index 00000000000..920b75df398
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
@@ -0,0 +1,119 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+
+public final class Codesign {
+
+    public static final class CodesignException extends Exception {
+
+        CodesignException(String[] output) {
+            this.output = output;
+        }
+
+        String[] getOutput() {
+            return output;
+        }
+
+        private final String[] output;
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    public static final class Builder {
+
+        private Builder(Supplier<List<String>> args) {
+            this.args = Objects.requireNonNull(args);
+        }
+
+        Codesign create() {
+            List<String> cmdline = new ArrayList<>();
+            cmdline.add("/usr/bin/codesign");
+            cmdline.addAll(args.get());
+            if (force) {
+                cmdline.add("--force");
+            }
+
+            return new Codesign(cmdline, quiet ? exec -> {
+                exec.setQuiet(true);
+            } : null);
+        }
+
+        public Builder force(boolean v) {
+            force = v;
+            return this;
+        }
+
+        public Builder quiet(boolean v) {
+            quiet = v;
+            return this;
+        }
+
+        private final Supplier<List<String>> args;
+        private boolean force;
+        private boolean quiet;
+    }
+
+    public static Builder build(Supplier<List<String>> args) {
+        return new Builder(args);
+    }
+
+    public void applyTo(Path path) throws IOException, CodesignException {
+
+        var exec = Executor.of(Stream.concat(
+                cmdline.stream(),
+                Stream.of(path.toString())).toArray(String[]::new)
+        ).saveOutput(true);
+        configureExecutor.ifPresent(configure -> configure.accept(exec));
+
+        if (exec.execute() != 0) {
+            throw new CodesignException(exec.getOutput().toArray(String[]::new));
+        }
+    }
+
+    public Consumer<Path> asConsumer() {
+        return toConsumer(this::applyTo);
+    }
+
+    private Codesign(List<String> cmdline, Consumer<Executor> configureExecutor) {
+        this.cmdline = Objects.requireNonNull(cmdline);
+        this.configureExecutor = Optional.ofNullable(configureExecutor);
+    }
+
+    private final List<String> cmdline;
+    private final Optional<Consumer<Executor>> configureExecutor;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CodesignConfig.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CodesignConfig.java
new file mode 100644
index 00000000000..b59e6c8ad00
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CodesignConfig.java
@@ -0,0 +1,131 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.AppImageSigningConfig;
+import jdk.jpackage.internal.model.SigningIdentity;
+import jdk.jpackage.internal.util.PathUtils;
+
+
+record CodesignConfig(Optional<SigningIdentity> identity, Optional<String> identifierPrefix,
+        Optional<Path> entitlements, Optional<Keychain> keychain) {
+
+    CodesignConfig {
+        Objects.requireNonNull(identity);
+        Objects.requireNonNull(identifierPrefix);
+        Objects.requireNonNull(entitlements);
+        Objects.requireNonNull(keychain);
+
+        if (identity.isPresent() != identifierPrefix.isPresent()) {
+            throw new IllegalArgumentException("Signing identity and identifier prefix mismatch");
+        }
+
+        identifierPrefix.ifPresent(v -> {
+            if (!v.endsWith(".")) {
+                throw new IllegalArgumentException("Invalid identifier prefix");
+            }
+        });
+    }
+
+    static final class Builder {
+
+        private Builder() {
+        }
+
+        CodesignConfig create() {
+            return new CodesignConfig(Optional.ofNullable(identity), Optional.ofNullable(identifierPrefix),
+                    Optional.ofNullable(entitlements), Optional.ofNullable(keychain));
+        }
+
+        Builder entitlements(Path v) {
+            entitlements = v;
+            return this;
+        }
+
+        Builder identity(SigningIdentity v) {
+            identity = v;
+            return this;
+        }
+
+        Builder identifierPrefix(String v) {
+            identifierPrefix = v;
+            return this;
+        }
+
+        Builder keychain(String v) {
+            return keychain(Optional.ofNullable(v).map(Keychain::new).orElse(null));
+        }
+
+        Builder keychain(Keychain v) {
+            keychain = v;
+            return this;
+        }
+
+        Builder from(AppImageSigningConfig v) {
+            return identity(v.identity())
+                    .identifierPrefix(v.identifierPrefix())
+                    .entitlements(v.entitlements().orElse(null))
+                    .keychain(v.keychain().orElse(null));
+        }
+
+        Builder from(CodesignConfig v) {
+            return identity(v.identity().orElse(null))
+                    .identifierPrefix(v.identifierPrefix().orElse(null))
+                    .entitlements(v.entitlements().orElse(null))
+                    .keychain(v.keychain().orElse(null));
+        }
+
+        private SigningIdentity identity;
+        private String identifierPrefix;
+        private Path entitlements;
+        private Keychain keychain;
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    List<String> toCodesignArgs() {
+        List<String> args = new ArrayList<>(List.of("-s", identity.map(SigningIdentity::id).orElse(ADHOC_SIGNING_IDENTITY), "-vvvv"));
+
+        if (identity.isPresent()) {
+            args.addAll(List.of("--timestamp", "--options", "runtime"));
+            identifierPrefix.ifPresent(v -> {
+                args.addAll(List.of("--prefix", v));
+            });
+            keychain.map(Keychain::asCliArg).ifPresent(k -> args.addAll(List.of("--keychain", k)));
+            entitlements.map(PathUtils::normalizedAbsolutePathString).ifPresent(e -> args.addAll(List.of("--entitlements", e)));
+        }
+
+        return args;
+    }
+
+    static final String ADHOC_SIGNING_IDENTITY = "-";
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Keychain.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Keychain.java
new file mode 100644
index 00000000000..8670eff2608
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Keychain.java
@@ -0,0 +1,105 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.PathUtils;
+
+record Keychain(String name) {
+    Keychain {
+        Objects.requireNonNull(name);
+    }
+
+    Path path() {
+        final var path = Path.of(name);
+        if (path.isAbsolute()) {
+            return path;
+        } else {
+            final var dir = Path.of(System.getProperty("user.home")).resolve("Library/Keychains");
+            final var files = filenames(name).map(dir::resolve).toList();
+            return files.stream().filter(Files::exists).findFirst().orElseGet(() -> {
+                // Can't find keychain file in "$HOME/Library/Keychains" folder.
+                // Detect keychain file name from the name of the login keychain file.
+                return files.stream().filter(f -> {
+                    final var loginKeycahinFile = f.getParent().resolve("login.keychain" + f.getFileName().toString().substring(name.length()));
+                    return Files.exists(loginKeycahinFile);
+                }).findFirst().orElseGet(() -> {
+                    // login keychain file doesn't exist, fallback to "$HOME/Library/Keychains/<name>-db" keychain file.
+                    return files.getFirst();
+                });
+            });
+        }
+    }
+
+    String asCliArg() {
+        final var path = Path.of(name);
+        if (path.isAbsolute()) {
+            return PathUtils.normalizedAbsolutePathString(path);
+        } else {
+            return name;
+        }
+    }
+
+    static List<Keychain> listKeychains() {
+        // Get the current keychain list
+        final List<String> cmdOutput;
+        try {
+            cmdOutput = Executor.of("/usr/bin/security", "list-keychains").saveOutput(true).executeExpectSuccess().getOutput();
+        } catch (IOException ex) {
+            throw I18N.buildException().message("message.keychain.error").cause(ex).create(KeychainException::new);
+        }
+
+        // Typical output of /usr/bin/security command is:
+        //        "/Users/foo/Library/Keychains/login.keychain-db"
+        //        "/Library/Keychains/System.keychain"
+        return cmdOutput.stream().map(String::trim).map(str -> {
+            // Strip enclosing double quotes
+            return str.substring(1, str.length() - 1);
+        }).map(Keychain::new).toList();
+    }
+
+    static final class KeychainException extends RuntimeException {
+
+        KeychainException(String msg) {
+            super(msg);
+        }
+
+        KeychainException(String msg, Throwable cause) {
+            super(msg, cause);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    private static Stream<String> filenames(String name) {
+        return Stream.of(name + "-db", name);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
index 733321dec46..30c83bcbeab 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
@@ -25,95 +25,50 @@
 
 package jdk.jpackage.internal;
 
-import java.text.MessageFormat;
+import static jdk.jpackage.internal.StandardBundlerParam.OUTPUT_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
+
 import java.util.Map;
 import java.util.Optional;
 import jdk.jpackage.internal.model.ConfigException;
-
-import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
-import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 
 public class MacAppBundler extends AppImageBundler {
      public MacAppBundler() {
-        setAppImageSupplier(imageOutDir -> {
-            return new MacAppImageBuilder(imageOutDir, isDependentTask());
-        });
-        setParamsValidator(MacAppBundler::doValidate);
-    }
-
-    private static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
-
-    public static final BundlerParamInfo<String> DEFAULT_ICNS_ICON =
-            new StandardBundlerParam<>(
-            ".mac.default.icns",
-            String.class,
-            params -> TEMPLATE_BUNDLE_ICON,
-            (s, p) -> s);
-
-    public static final BundlerParamInfo<String> DEVELOPER_ID_APP_SIGNING_KEY =
-            new StandardBundlerParam<>(
-            "mac.signing-key-developer-id-app",
-            String.class,
-            params -> {
-                    String user = SIGNING_KEY_USER.fetchFrom(params);
-                    String keychain = SIGNING_KEYCHAIN.fetchFrom(params);
-                    String result = null;
-                    if (APP_STORE.fetchFrom(params)) {
-                        result = MacCertificate.findCertificateKey(
-                            "3rd Party Mac Developer Application: ",
-                            user, keychain);
-                    }
-                    // if either not signing for app store or couldn't find
-                    if (result == null) {
-                        result = MacCertificate.findCertificateKey(
-                            "Developer ID Application: ", user, keychain);
-                    }
-
-                    if (result != null) {
-                        MacCertificate certificate = new MacCertificate(result, keychain);
-
-                        if (!certificate.isValid()) {
-                            Log.error(MessageFormat.format(I18N.getString(
-                                    "error.certificate.expired"), result));
-                        }
-                    }
-
-                    return result;
-                },
-            (s, p) -> s);
-
-    public static final BundlerParamInfo<String> APP_IMAGE_SIGN_IDENTITY =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY.getId(),
-            String.class,
-            params -> "",
-            null);
-
-    public static final BundlerParamInfo<String> BUNDLE_ID_SIGNING_PREFIX =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId(),
-            String.class,
-            params -> getIdentifier(params) + ".",
-            (s, p) -> s);
-
-    static String getIdentifier(Map<String, ? super Object> params) {
-        String s = MAIN_CLASS.fetchFrom(params);
-        if (s == null) return null;
-
-        int idx = s.lastIndexOf(".");
-        if (idx >= 1) {
-            return s.substring(0, idx);
-        }
-        return s;
+         setAppImageSupplier((params, output) -> {
+
+             // Order is important!
+             final var app = MacFromParams.APPLICATION.fetchFrom(params);
+             final BuildEnv env;
+
+             if (StandardBundlerParam.hasPredefinedAppImage(params)) {
+                 env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+                 final var pkg = MacPackagingPipeline.createSignAppImagePackage(app, env);
+                 MacPackagingPipeline.build(Optional.of(pkg)).create().execute(env, pkg, output);
+             } else {
+                 env = BuildEnv.withAppImageDir(BuildEnvFromParams.BUILD_ENV.fetchFrom(params), output);
+                 MacPackagingPipeline.build(Optional.empty())
+                         .excludeDirFromCopying(output.getParent())
+                         .excludeDirFromCopying(OUTPUT_DIR.fetchFrom(params)).create().execute(env, app);
+             }
+
+         });
+         setParamsValidator(MacAppBundler::doValidate);
     }
 
     private static void doValidate(Map<String, ? super Object> params)
             throws ConfigException {
 
+        try {
+            MacFromParams.APPLICATION.fetchFrom(params);
+        } catch (ExceptionBox ex) {
+            if (ex.getCause() instanceof ConfigException cfgEx) {
+                throw cfgEx;
+            } else {
+                throw ex;
+            }
+        }
+
         if (StandardBundlerParam.getPredefinedAppImage(params) != null) {
             if (!Optional.ofNullable(
                     SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
@@ -121,34 +76,6 @@ private static void doValidate(Map<String, ? super Object> params)
                         I18N.getString("error.app-image.mac-sign.required"),
                         null);
             }
-        } else {
-            // validate short version
-            try {
-                String version = VERSION.fetchFrom(params);
-                CFBundleVersion.of(version);
-            } catch (IllegalArgumentException ex) {
-                throw new ConfigException(ex.getMessage(), I18N.getString(
-                        "error.invalid-cfbundle-version.advice"), ex);
-            }
-        }
-
-        // reject explicitly set sign to true and no valid signature key
-        if (Optional.ofNullable(
-                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
-            // Validate DEVELOPER_ID_APP_SIGNING_KEY only if user provided
-            // SIGNING_KEY_USER.
-            if (!SIGNING_KEY_USER.getIsDefaultValue(params)) { // --mac-signing-key-user-name
-                String signingIdentity =
-                        DEVELOPER_ID_APP_SIGNING_KEY.fetchFrom(params);
-                if (signingIdentity == null) {
-                    throw new ConfigException(
-                            I18N.getString("error.explicit-sign-no-cert"),
-                            I18N.getString("error.explicit-sign-no-cert.advice"));
-                }
-            }
-
-            // No need to validate --mac-app-image-sign-identity, since it is
-            // pass through option.
         }
     }
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
deleted file mode 100644
index 02860b61e4f..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-import jdk.internal.util.OSVersion;
-import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
-import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
-import static jdk.jpackage.internal.MacAppBundler.APP_IMAGE_SIGN_IDENTITY;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN;
-import static jdk.jpackage.internal.MacBaseInstallerBundler.INSTALLER_SIGN_IDENTITY;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_CONTENT;
-
-public class MacAppImageBuilder extends AbstractAppImageBuilder {
-
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MacResources");
-
-    private static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
-    private static final String OS_TYPE_CODE = "APPL";
-    private static final String TEMPLATE_INFO_PLIST_LITE =
-            "Info-lite.plist.template";
-    private static final String TEMPLATE_RUNTIME_INFO_PLIST =
-            "Runtime-Info.plist.template";
-
-    private final Path root;
-    private final Path contentsDir;
-    private final Path resourcesDir;
-    private final Path macOSDir;
-    private final Path runtimeDir;
-    private final Path runtimeRoot;
-
-    private final boolean withPackageFile;
-
-    private static List<String> keyChains;
-
-    public static final BundlerParamInfo<Boolean>
-            MAC_CONFIGURE_LAUNCHER_IN_PLIST = new StandardBundlerParam<>(
-                    "mac.configure-launcher-in-plist",
-                    Boolean.class,
-                    params -> Boolean.FALSE,
-                    (s, p) -> Boolean.valueOf(s));
-
-    public static final BundlerParamInfo<String> MAC_CF_BUNDLE_NAME =
-            new StandardBundlerParam<>(
-                    Arguments.CLIOptions.MAC_BUNDLE_NAME.getId(),
-                    String.class,
-                    params -> null,
-                    (s, p) -> s);
-
-    public static final BundlerParamInfo<String> APP_CATEGORY =
-            new StandardBundlerParam<>(
-                    Arguments.CLIOptions.MAC_CATEGORY.getId(),
-                    String.class,
-                    params -> "utilities",
-                    (s, p) -> s);
-
-    public static final BundlerParamInfo<String> MAC_CF_BUNDLE_IDENTIFIER =
-            new StandardBundlerParam<>(
-                    Arguments.CLIOptions.MAC_BUNDLE_IDENTIFIER.getId(),
-                    String.class,
-                    params -> {
-                        // Get identifier from app image if user provided
-                        // app image and did not provide the identifier via CLI.
-                        String identifier = extractBundleIdentifier(params);
-                        if (identifier == null) {
-                            identifier =  MacAppBundler.getIdentifier(params);
-                        }
-                        if (identifier == null) {
-                            identifier = APP_NAME.fetchFrom(params);
-                        }
-                        return identifier;
-                    },
-                    (s, p) -> s);
-
-    public static final BundlerParamInfo<Path> ICON_ICNS =
-            new StandardBundlerParam<>(
-            "icon.icns",
-            Path.class,
-            params -> {
-                Path f = ICON.fetchFrom(params);
-                if (f != null && f.getFileName() != null && !f.getFileName()
-                        .toString().toLowerCase().endsWith(".icns")) {
-                    Log.error(MessageFormat.format(
-                            I18N.getString("message.icon-not-icns"), f));
-                    return null;
-                }
-                return f;
-            },
-            (s, p) -> Path.of(s));
-
-    public static final BundlerParamInfo<Path> ENTITLEMENTS =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_ENTITLEMENTS.getId(),
-            Path.class,
-            params -> {
-                try {
-                    Path path = CONFIG_ROOT.fetchFrom(params).resolve(
-                        getLauncherName(params) + ".entitlements");
-                    String defPath = (APP_STORE.fetchFrom(params) ?
-                        "sandbox.plist" : "entitlements.plist");
-                    createResource(defPath, params)
-                        .setCategory(I18N.getString("resource.entitlements"))
-                        .saveToFile(path);
-                    return path;
-                } catch (IOException ioe) {
-                   Log.verbose(ioe);
-                }
-                return null;
-            },
-            (s, p) -> Path.of(s)
-        );
-
-    private static final StandardBundlerParam<String> FA_MAC_CFBUNDLETYPEROLE =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_CFBUNDLETYPEROLE,
-                     String.class,
-                     params -> "Editor",
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_LSHANDLERRANK =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_LSHANDLERRANK,
-                     String.class,
-                     params -> "Owner",
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_NSSTORETYPEKEY =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_NSSTORETYPEKEY,
-                     String.class,
-                     params -> null,
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_NSDOCUMENTCLASS =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_NSDOCUMENTCLASS,
-                     String.class,
-                     params -> null,
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_LSTYPEISPACKAGE =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_LSTYPEISPACKAGE,
-                     String.class,
-                     params -> null,
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_LSDOCINPLACE =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_LSDOCINPLACE,
-                     String.class,
-                     params -> null,
-                     (s, p) -> s
-     );
-
-     private static final StandardBundlerParam<String> FA_MAC_UIDOCBROWSER =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_UIDOCBROWSER,
-                     String.class,
-                     params -> null,
-                     (s, p) -> s
-     );
-
-     @SuppressWarnings("unchecked")
-     private static final StandardBundlerParam<List<String>> FA_MAC_NSEXPORTABLETYPES =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_NSEXPORTABLETYPES,
-                     (Class<List<String>>) (Object) List.class,
-                     params -> null,
-                     (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-             );
-
-     @SuppressWarnings("unchecked")
-     private static final StandardBundlerParam<List<String>> FA_MAC_UTTYPECONFORMSTO =
-             new StandardBundlerParam<>(
-                     Arguments.MAC_UTTYPECONFORMSTO,
-                     (Class<List<String>>) (Object) List.class,
-                     params -> Arrays.asList("public.data"),
-                     (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
-             );
-
-    public MacAppImageBuilder(Path imageOutDir, boolean withPackageFile) {
-        super(imageOutDir);
-
-        this.root = imageOutDir;
-        this.withPackageFile = withPackageFile;
-        this.contentsDir = root.resolve("Contents");
-        this.resourcesDir = appLayout.destktopIntegrationDirectory();
-        this.macOSDir = appLayout.launchersDirectory();
-        this.runtimeDir = appLayout.runtimeDirectory();
-        this.runtimeRoot = appLayout.runtimeHomeDirectory();
-    }
-
-    private void writeEntry(InputStream in, Path dstFile) throws IOException {
-        Files.createDirectories(dstFile.getParent());
-        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 {
-        // If predefined app image is provided, then just sign it and return.
-        Path predefinedAppImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-        if (predefinedAppImage != null) {
-            // Mark app image as signed, before we signing it.
-            AppImageFile appImageFile =
-                AppImageFile.load(predefinedAppImage);
-            if (!appImageFile.isSigned()) {
-                appImageFile.copyAsSigned().save(predefinedAppImage);
-            } else {
-                appImageFile = null;
-            }
-
-            try {
-                doSigning(params);
-            } catch (Exception ex) {
-                // Restore original app image file if signing failed
-                if (appImageFile != null) {
-                    appImageFile.save(predefinedAppImage);
-                }
-
-                throw ex;
-            }
-
-            return;
-        }
-
-        Files.createDirectories(macOSDir);
-
-        Map<String, ? super Object> originalParams = new HashMap<>(params);
-        // Generate PkgInfo
-        Path pkgInfoFile = contentsDir.resolve("PkgInfo");
-        Files.createFile(pkgInfoFile);
-        writePkgInfo(pkgInfoFile);
-
-        Path executable = macOSDir.resolve(getLauncherName(params));
-
-        // create the main app launcher
-        try (InputStream is_launcher =
-                getResourceAsStream("jpackageapplauncher")) {
-            // Copy executable and library to MacOS folder
-            writeEntry(is_launcher, executable);
-        }
-        executable.toFile().setExecutable(true, false);
-        // generate main app launcher config file
-        writeCfgFile(params);
-
-        // create additional app launcher(s) and config file(s)
-        List<Map<String, ? super Object>> entryPoints =
-                ADD_LAUNCHERS.fetchFrom(params);
-        for (Map<String, ? super Object> entryPoint : entryPoints) {
-            Map<String, ? super Object> tmp =
-                    AddLauncherArguments.merge(originalParams, entryPoint);
-
-            // add executable for add launcher
-            Path addExecutable = macOSDir.resolve(getLauncherName(tmp));
-            try (InputStream is = getResourceAsStream("jpackageapplauncher");) {
-                writeEntry(is, addExecutable);
-            }
-            addExecutable.toFile().setExecutable(true, false);
-
-            // add config file for add launcher
-            writeCfgFile(tmp);
-        }
-
-        // Copy class path entries to Java folder
-        copyApplication(params);
-
-        if (withPackageFile) {
-            new PackageFile(APP_NAME.fetchFrom(params)).save(
-                    ApplicationLayout.macAppImage().resolveAt(root));
-        }
-
-        /*********** Take care of "config" files *******/
-
-        createResource(TEMPLATE_BUNDLE_ICON, params)
-                .setCategory("icon")
-                .setExternal(ICON_ICNS.fetchFrom(params))
-                .saveToFile(resourcesDir.resolve(APP_NAME.fetchFrom(params)
-                        + ".icns"));
-
-        // copy file association icons
-        for (Map<String, ?
-                super Object> fa : FILE_ASSOCIATIONS.fetchFrom(params)) {
-            Path f = FA_ICON.fetchFrom(fa);
-            if (IOUtils.exists(f)) {
-                IOUtils.copyFile(f, resourcesDir.resolve(f.getFileName()));
-
-            }
-        }
-
-        copyRuntimeFiles(params);
-
-        doSigning(params);
-    }
-
-    private void copyRuntimeFiles(Map<String, ? super Object> params)
-            throws IOException {
-        // Generate Info.plist
-        writeInfoPlist(contentsDir.resolve("Info.plist"), params);
-
-        // generate java runtime info.plist
-        writeRuntimeInfoPlist(
-                runtimeDir.resolve("Contents/Info.plist"), params);
-
-        // copy library
-        Path runtimeMacOSDir = Files.createDirectories(
-                runtimeDir.resolve("Contents/MacOS"));
-
-        final Path jliName = Path.of("libjli.dylib");
-        try (Stream<Path> walk = Files.walk(runtimeRoot.resolve("lib"))) {
-            final Path jli = walk
-                    .filter(file -> file.getFileName().equals(jliName))
-                    .findFirst()
-                    .get();
-            Files.copy(jli, runtimeMacOSDir.resolve(jliName));
-        }
-    }
-
-    private void doSigning(Map<String, ? super Object> params)
-            throws IOException {
-
-        if (Optional.ofNullable(
-                SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {
-            try {
-                addNewKeychain(params);
-            } catch (InterruptedException e) {
-                Log.error(e.getMessage());
-            }
-            String signingIdentity = null;
-            // Try --mac-app-image-sign-identity first if set
-            if (!APP_IMAGE_SIGN_IDENTITY.getIsDefaultValue(params)) {
-                signingIdentity = APP_IMAGE_SIGN_IDENTITY.fetchFrom(params);
-            } else {
-                // Check if INSTALLER_SIGN_IDENTITY is set and if it is set
-                // then do not sign app image, otherwise use --mac-signing-key-user-name
-                if (INSTALLER_SIGN_IDENTITY.getIsDefaultValue(params)) {
-                    // --mac-sign and/or --mac-signing-key-user-name case
-                    signingIdentity = DEVELOPER_ID_APP_SIGNING_KEY.fetchFrom(params);
-                }
-            }
-            if (signingIdentity != null) {
-                signAppBundle(params, root, signingIdentity,
-                        BUNDLE_ID_SIGNING_PREFIX.fetchFrom(params),
-                        ENTITLEMENTS.fetchFrom(params));
-            } else {
-                // Case when user requested to sign installer only
-                signAppBundle(params, root, "-", null, null);
-            }
-            restoreKeychainList(params);
-        } else {
-            signAppBundle(params, root, "-", null, null);
-        }
-    }
-
-    private static String getLauncherName(Map<String, ? super Object> params) {
-        return APP_NAME.fetchFrom(params);
-    }
-
-    private String getBundleName(Map<String, ? super Object> params) {
-        if (MAC_CF_BUNDLE_NAME.fetchFrom(params) != null) {
-            String bn = MAC_CF_BUNDLE_NAME.fetchFrom(params);
-            if (bn.length() > 16) {
-                Log.error(MessageFormat.format(I18N.getString(
-                        "message.bundle-name-too-long-warning"),
-                        MAC_CF_BUNDLE_NAME.getID(), bn));
-            }
-            return MAC_CF_BUNDLE_NAME.fetchFrom(params);
-        } else if (APP_NAME.fetchFrom(params) != null) {
-            return APP_NAME.fetchFrom(params);
-        } else {
-            String nm = MAIN_CLASS.fetchFrom(params);
-            if (nm.length() > 16) {
-                nm = nm.substring(0, 16);
-            }
-            return nm;
-        }
-    }
-
-    private void writeRuntimeInfoPlist(Path file,
-            Map<String, ? super Object> params) throws IOException {
-        Map<String, String> data = new HashMap<>();
-        String identifier = StandardBundlerParam.isRuntimeInstaller(params) ?
-                MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) :
-                "com.oracle.java." + MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
-        data.put("CF_BUNDLE_IDENTIFIER", identifier);
-        String name = StandardBundlerParam.isRuntimeInstaller(params) ?
-                getBundleName(params): "Java Runtime Image";
-        data.put("CF_BUNDLE_NAME", name);
-        String ver = VERSION.fetchFrom(params);
-        String sver = ver;
-        int index = ver.indexOf(".");
-        if (index > 0 && ((index + 1) < ver.length())) {
-            index = ver.indexOf(".", index + 1);
-            if (index > 0 ) {
-                sver = ver.substring(0, index);
-            }
-        }
-        data.put("CF_BUNDLE_VERSION", ver);
-        data.put("CF_BUNDLE_SHORT_VERSION_STRING", sver);
-
-        createResource(TEMPLATE_RUNTIME_INFO_PLIST, params)
-                .setPublicName("Runtime-Info.plist")
-                .setCategory(I18N.getString("resource.runtime-info-plist"))
-                .setSubstitutionData(data)
-                .saveToFile(file);
-    }
-
-    private void writeStringArrayPlist(StringBuilder sb, String key,
-            List<String> values) {
-        if (values != null && !values.isEmpty()) {
-            sb.append("  <key>").append(key).append("</key>\n").append("   <array>\n");
-            values.forEach((value) -> {
-                sb.append("    <string>").append(value).append("</string>\n");
-            });
-            sb.append("   </array>\n");
-        }
-    }
-
-    private void writeStringPlist(StringBuilder sb, String key, String value) {
-        if (value != null && !value.isEmpty()) {
-            sb.append("  <key>").append(key).append("</key>\n").append("  <string>")
-                    .append(value).append("</string>\n").append("\n");
-         }
-    }
-
-    private void writeBoolPlist(StringBuilder sb, String key, String value) {
-        if (value != null && !value.isEmpty()) {
-            sb.append("  <key>").append(key).append("</key>\n").append("  <")
-                    .append(value).append("/>\n").append("\n");
-         }
-    }
-
-    private void writeInfoPlist(Path file, Map<String, ? super Object> params)
-            throws IOException {
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.preparing-info-plist"), file.toAbsolutePath()));
-
-        //prepare config for exe
-        //Note: do not need CFBundleDisplayName if we don't support localization
-        Map<String, String> data = new HashMap<>();
-        data.put("DEPLOY_ICON_FILE", APP_NAME.fetchFrom(params) + ".icns");
-        data.put("DEPLOY_BUNDLE_IDENTIFIER",
-                MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params));
-        data.put("DEPLOY_BUNDLE_NAME",
-                getBundleName(params));
-        data.put("DEPLOY_BUNDLE_COPYRIGHT", COPYRIGHT.fetchFrom(params));
-        data.put("DEPLOY_LAUNCHER_NAME", getLauncherName(params));
-        data.put("DEPLOY_BUNDLE_SHORT_VERSION", VERSION.fetchFrom(params));
-        data.put("DEPLOY_BUNDLE_CFBUNDLE_VERSION", VERSION.fetchFrom(params));
-        data.put("DEPLOY_APP_CATEGORY", "public.app-category." +
-                APP_CATEGORY.fetchFrom(params));
-
-        StringBuilder bundleDocumentTypes = new StringBuilder();
-        StringBuilder exportedTypes = new StringBuilder();
-        for (Map<String, ? super Object>
-                fileAssociation : FILE_ASSOCIATIONS.fetchFrom(params)) {
-
-            List<String> extensions = FA_EXTENSIONS.fetchFrom(fileAssociation);
-            if (extensions == null) {
-                Log.verbose(I18N.getString(
-                        "message.creating-association-with-null-extension"));
-            }
-
-            String itemContentType = MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params)
-                    + "." + ((extensions == null || extensions.isEmpty())
-                    ? "mime" : extensions.get(0));
-            String description = FA_DESCRIPTION.fetchFrom(fileAssociation);
-            Path icon = FA_ICON.fetchFrom(fileAssociation);
-
-            bundleDocumentTypes.append(" <dict>\n");
-            writeStringArrayPlist(bundleDocumentTypes, "LSItemContentTypes",
-                    Arrays.asList(itemContentType));
-            writeStringPlist(bundleDocumentTypes, "CFBundleTypeName", description);
-            writeStringPlist(bundleDocumentTypes, "LSHandlerRank",
-                    FA_MAC_LSHANDLERRANK.fetchFrom(fileAssociation));
-            writeStringPlist(bundleDocumentTypes, "CFBundleTypeRole",
-                    FA_MAC_CFBUNDLETYPEROLE.fetchFrom(fileAssociation));
-            writeStringPlist(bundleDocumentTypes, "NSPersistentStoreTypeKey",
-                    FA_MAC_NSSTORETYPEKEY.fetchFrom(fileAssociation));
-            writeStringPlist(bundleDocumentTypes, "NSDocumentClass",
-                    FA_MAC_NSDOCUMENTCLASS.fetchFrom(fileAssociation));
-            writeBoolPlist(bundleDocumentTypes, "LSIsAppleDefaultForType",
-                    "true");
-            writeBoolPlist(bundleDocumentTypes, "LSTypeIsPackage",
-                    FA_MAC_LSTYPEISPACKAGE.fetchFrom(fileAssociation));
-            writeBoolPlist(bundleDocumentTypes, "LSSupportsOpeningDocumentsInPlace",
-                    FA_MAC_LSDOCINPLACE.fetchFrom(fileAssociation));
-            writeBoolPlist(bundleDocumentTypes, "UISupportsDocumentBrowser",
-                    FA_MAC_UIDOCBROWSER.fetchFrom(fileAssociation));
-            if (IOUtils.exists(icon)) {
-                writeStringPlist(bundleDocumentTypes, "CFBundleTypeIconFile",
-                        icon.getFileName().toString());
-            }
-            bundleDocumentTypes.append("  </dict>\n");
-
-            exportedTypes.append("  <dict>\n");
-            writeStringPlist(exportedTypes, "UTTypeIdentifier",
-                    itemContentType);
-            writeStringPlist(exportedTypes, "UTTypeDescription",
-                    description);
-            writeStringArrayPlist(exportedTypes, "UTTypeConformsTo",
-                    FA_MAC_UTTYPECONFORMSTO.fetchFrom(fileAssociation));
-
-            if (IOUtils.exists(icon)) {
-                writeStringPlist(exportedTypes, "UTTypeIconFile",
-                        icon.getFileName().toString());
-            }
-            exportedTypes.append("\n")
-                    .append("  <key>UTTypeTagSpecification</key>\n")
-                    .append("  <dict>\n")
-                    .append("\n");
-            writeStringArrayPlist(exportedTypes, "public.filename-extension",
-                    extensions);
-            writeStringArrayPlist(exportedTypes, "public.mime-type",
-                    FA_CONTENT_TYPE.fetchFrom(fileAssociation));
-            writeStringArrayPlist(exportedTypes, "NSExportableTypes",
-                    FA_MAC_NSEXPORTABLETYPES.fetchFrom(fileAssociation));
-            exportedTypes.append("  </dict>\n").append(" </dict>\n");
-        }
-        String associationData;
-        if (bundleDocumentTypes.length() > 0) {
-            associationData =
-                    "\n  <key>CFBundleDocumentTypes</key>\n  <array>\n"
-                    + bundleDocumentTypes.toString()
-                    + "  </array>\n\n"
-                    + "  <key>UTExportedTypeDeclarations</key>\n  <array>\n"
-                    + exportedTypes.toString()
-                    + "  </array>\n";
-        } else {
-            associationData = "";
-        }
-        data.put("DEPLOY_FILE_ASSOCIATIONS", associationData);
-
-        createResource(TEMPLATE_INFO_PLIST_LITE, params)
-                .setCategory(I18N.getString("resource.app-info-plist"))
-                .setSubstitutionData(data)
-                .setPublicName("Info.plist")
-                .saveToFile(file);
-    }
-
-    private void writePkgInfo(Path file) throws IOException {
-        //hardcoded as it does not seem we need to change it ever
-        String signature = "????";
-
-        try (Writer out = Files.newBufferedWriter(file)) {
-            out.write(OS_TYPE_CODE + signature);
-            out.flush();
-        }
-    }
-
-    public static void addNewKeychain(Map<String, ? super Object> params)
-                                    throws IOException, InterruptedException {
-        if (OSVersion.current().compareTo(new OSVersion(10, 12)) < 0) {
-            // we need this for OS X 10.12+
-            return;
-        }
-
-        String keyChain = SIGNING_KEYCHAIN.fetchFrom(params);
-        if (keyChain == null || keyChain.isEmpty()) {
-            return;
-        }
-
-        // get current keychain list
-        String keyChainPath = Path.of(keyChain).toAbsolutePath().toString();
-        List<String> keychainList = new ArrayList<>();
-        int ret = IOUtils.getProcessOutput(
-                keychainList, "security", "list-keychains");
-        if (ret != 0) {
-            Log.error(I18N.getString("message.keychain.error"));
-            return;
-        }
-        boolean contains = keychainList.stream().anyMatch(
-                    str -> str.trim().equals("\""+keyChainPath.trim()+"\""));
-        if (contains) {
-            // keychain is already added in the search list
-            return;
-        }
-
-        keyChains = new ArrayList<>();
-        // remove "
-        keychainList.forEach((String s) -> {
-            String path = s.trim();
-            if (path.startsWith("\"") && path.endsWith("\"")) {
-                path = path.substring(1, path.length()-1);
-            }
-            if (!keyChains.contains(path)) {
-                keyChains.add(path);
-            }
-        });
-
-        List<String> args = new ArrayList<>();
-        args.add("/usr/bin/security");
-        args.add("list-keychains");
-        args.add("-s");
-
-        args.addAll(keyChains);
-        args.add(keyChain);
-
-        ProcessBuilder  pb = new ProcessBuilder(args);
-        IOUtils.exec(pb);
-    }
-
-    public static void restoreKeychainList(Map<String, ? super Object> params)
-            throws IOException{
-        if (OSVersion.current().compareTo(new OSVersion(10, 12)) < 0) {
-            // we need this for OS X 10.12+
-            return;
-        }
-
-        if (keyChains == null || keyChains.isEmpty()) {
-            return;
-        }
-
-        List<String> args = new ArrayList<>();
-        args.add("/usr/bin/security");
-        args.add("list-keychains");
-        args.add("-s");
-
-        args.addAll(keyChains);
-
-        ProcessBuilder  pb = new ProcessBuilder(args);
-        IOUtils.exec(pb);
-    }
-
-    private static List<String> getCodesignArgs(
-            boolean force, Path path, String signingIdentity,
-            String identifierPrefix, Path entitlements, String keyChain) {
-        List<String> args = new ArrayList<>();
-        args.addAll(Arrays.asList("/usr/bin/codesign",
-                    "-s", signingIdentity,
-                    "-vvvv"));
-
-        if (!signingIdentity.equals("-")) {
-            args.addAll(Arrays.asList("--timestamp",
-                    "--options", "runtime",
-                    "--prefix", identifierPrefix));
-            if (keyChain != null && !keyChain.isEmpty()) {
-                args.add("--keychain");
-                args.add(keyChain);
-            }
-            if (Files.isExecutable(path)) {
-                if (entitlements != null) {
-                    args.add("--entitlements");
-                    args.add(entitlements.toString());
-                }
-            }
-        }
-
-        if (force) {
-            args.add("--force");
-        }
-
-        args.add(path.toString());
-
-        return args;
-    }
-
-    private static void runCodesign(
-            ProcessBuilder pb, boolean quiet, Map<String, ? super Object> params)
-            throws IOException {
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             PrintStream ps = new PrintStream(baos)) {
-            try {
-            IOUtils.exec(pb, false, ps, false,
-                         Executor.INFINITE_TIMEOUT, quiet);
-            } catch (IOException ioe) {
-                // Log output of "codesign" in case of error. It should help
-                // user to diagnose issues when using --mac-app-image-sign-identity.
-                // In addition add possible reason for failure. For example
-                // "--app-content" can fail "codesign".
-
-                // APP_CONTENT is never null.
-                if (!APP_CONTENT.fetchFrom(params).isEmpty()) {
-                    Log.info(I18N.getString(
-                        "message.codesign.failed.reason.app.content"));
-                }
-
-                // Signing might not work without Xcode with command line
-                // developer tools. Show user if Xcode is missing as possible
-                // reason.
-                if (!isXcodeDevToolsInstalled()) {
-                    Log.info(I18N.getString(
-                        "message.codesign.failed.reason.xcode.tools"));
-                }
-
-                // Log "codesign" output
-                Log.info(MessageFormat.format(I18N.getString(
-                         "error.tool.failed.with.output"), "codesign"));
-                Log.info(baos.toString().strip());
-
-                throw ioe;
-            }
-        }
-    }
-
-    private static boolean isXcodeDevToolsInstalled() {
-        try {
-            Executor.of("/usr/bin/xcrun", "--help").executeExpectSuccess();
-        } catch (IOException e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    static void signAppBundle(
-            Map<String, ? super Object> params, Path appLocation,
-            String signingIdentity, String identifierPrefix, Path entitlements)
-            throws IOException {
-        AtomicReference<IOException> toThrow = new AtomicReference<>();
-        String appExecutable = "/Contents/MacOS/" + APP_NAME.fetchFrom(params);
-        String keyChain = SIGNING_KEYCHAIN.fetchFrom(params);
-
-        // sign all dylibs and executables
-        try (Stream<Path> stream = Files.walk(appLocation)) {
-            stream.peek(path -> { // fix permissions
-                try {
-                    Set<PosixFilePermission> pfp
-                            = Files.getPosixFilePermissions(path);
-                    if (!pfp.contains(PosixFilePermission.OWNER_WRITE)) {
-                        pfp = EnumSet.copyOf(pfp);
-                        pfp.add(PosixFilePermission.OWNER_WRITE);
-                        Files.setPosixFilePermissions(path, pfp);
-                    }
-                } catch (IOException e) {
-                    Log.verbose(e);
-                }
-            }).filter(p -> Files.isRegularFile(p)
-                    && (Files.isExecutable(p) || p.toString().endsWith(".dylib"))
-                    && !(p.toString().contains("dylib.dSYM/Contents"))
-                    && !(p.toString().endsWith(appExecutable))
-            ).forEach(p -> {
-                // noinspection ThrowableResultOfMethodCallIgnored
-                if (toThrow.get() != null) {
-                    return;
-                }
-
-                // If p is a symlink then skip the signing process.
-                if (Files.isSymbolicLink(p)) {
-                    Log.verbose(MessageFormat.format(I18N.getString(
-                            "message.ignoring.symlink"), p.toString()));
-                } else {
-                    // unsign everything before signing
-                    List<String> args = new ArrayList<>();
-                    args.addAll(Arrays.asList("/usr/bin/codesign",
-                            "--remove-signature", p.toString()));
-                    try {
-                        Set<PosixFilePermission> oldPermissions =
-                                Files.getPosixFilePermissions(p);
-                        p.toFile().setWritable(true, true);
-                        ProcessBuilder pb = new ProcessBuilder(args);
-                        // run quietly
-                        IOUtils.exec(pb, false, null, false,
-                                Executor.INFINITE_TIMEOUT, true);
-                        Files.setPosixFilePermissions(p, oldPermissions);
-                    } catch (IOException ioe) {
-                        Log.verbose(ioe);
-                        toThrow.set(ioe);
-                        return;
-                    }
-
-                    // Sign only if we have identity
-                    if (signingIdentity != null) {
-                        args = getCodesignArgs(false, p, signingIdentity,
-                                identifierPrefix, entitlements, keyChain);
-                        try {
-                            Set<PosixFilePermission> oldPermissions
-                                    = Files.getPosixFilePermissions(p);
-                            p.toFile().setWritable(true, true);
-                            ProcessBuilder pb = new ProcessBuilder(args);
-                            // run quietly
-                            runCodesign(pb, true, params);
-                            Files.setPosixFilePermissions(p, oldPermissions);
-                        } catch (IOException ioe) {
-                            toThrow.set(ioe);
-                        }
-                    }
-                }
-            });
-        }
-        IOException ioe = toThrow.get();
-        if (ioe != null) {
-            throw ioe;
-        }
-
-        // We cannot continue signing without identity
-        if (signingIdentity == null) {
-            return;
-        }
-
-        // sign all runtime and frameworks
-        Consumer<? super Path> signIdentifiedByPList = path -> {
-            //noinspection ThrowableResultOfMethodCallIgnored
-            if (toThrow.get() != null) return;
-
-            try {
-                List<String> args = getCodesignArgs(true, path, signingIdentity,
-                            identifierPrefix, entitlements, keyChain);
-                ProcessBuilder pb = new ProcessBuilder(args);
-                runCodesign(pb, false, params);
-            } catch (IOException e) {
-                toThrow.set(e);
-            }
-        };
-
-        Path javaPath = appLocation.resolve("Contents/runtime");
-        if (Files.isDirectory(javaPath)) {
-            signIdentifiedByPList.accept(javaPath);
-
-            ioe = toThrow.get();
-            if (ioe != null) {
-                throw ioe;
-            }
-        }
-        Path frameworkPath = appLocation.resolve("Contents/Frameworks");
-        if (Files.isDirectory(frameworkPath)) {
-            try (var fileList = Files.list(frameworkPath)) {
-                fileList.forEach(signIdentifiedByPList);
-            }
-
-            ioe = toThrow.get();
-            if (ioe != null) {
-                throw ioe;
-            }
-        }
-
-        // sign the app itself
-        List<String> args = getCodesignArgs(true, appLocation, signingIdentity,
-                identifierPrefix, entitlements, keyChain);
-        ProcessBuilder pb = new ProcessBuilder(args);
-        runCodesign(pb, false, params);
-    }
-
-    private static String extractBundleIdentifier(Map<String, Object> params) {
-        if (PREDEFINED_APP_IMAGE.fetchFrom(params) == null) {
-            return null;
-        }
-
-        try {
-            Path infoPList = PREDEFINED_APP_IMAGE.fetchFrom(params).resolve("Contents").
-                    resolve("Info.plist");
-
-            DocumentBuilderFactory dbf
-                    = DocumentBuilderFactory.newDefaultInstance();
-            dbf.setFeature("http://apache.org/xml/features/" +
-                           "nonvalidating/load-external-dtd", false);
-            DocumentBuilder b = dbf.newDocumentBuilder();
-            org.w3c.dom.Document doc = b.parse(Files.newInputStream(infoPList));
-
-            XPath xPath = XPathFactory.newInstance().newXPath();
-            // Query for the value of <string> element preceding <key>
-            // element with value equal to CFBundleIdentifier
-            String v = (String) xPath.evaluate(
-                    "//string[preceding-sibling::key = \"CFBundleIdentifier\"][1]",
-                    doc, XPathConstants.STRING);
-
-            if (v != null && !v.isEmpty()) {
-                return v;
-            }
-        } catch (Exception ex) {
-            Log.verbose(ex);
-        }
-
-        return null;
-    }
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
new file mode 100644
index 00000000000..d44799e6807
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.AppImageFile.getBooleanExtraFieldValue;
+
+import jdk.jpackage.internal.model.MacApplication.ExtraAppImageFileField;
+
+record MacAppImageFileExtras(boolean signed, boolean appStore) {
+
+    MacAppImageFileExtras(AppImageFile appImageFile) {
+        this(getBooleanExtraFieldValue(ExtraAppImageFileField.SIGNED.fieldName(), appImageFile),
+                getBooleanExtraFieldValue(ExtraAppImageFileField.APP_STORE.fieldName(), appImageFile));
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
new file mode 100644
index 00000000000..ca05be519ff
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.MacApplication;
+import jdk.jpackage.internal.model.MacApplicationMixin;
+import jdk.jpackage.internal.model.AppImageSigningConfig;
+
+final class MacApplicationBuilder {
+
+    MacApplicationBuilder(Application app) {
+        this.app = Objects.requireNonNull(app);
+    }
+
+    private MacApplicationBuilder(MacApplicationBuilder other) {
+        this(other.app);
+        icon = other.icon;
+        bundleName = other.bundleName;
+        bundleIdentifier = other.bundleIdentifier;
+        category = other.category;
+        appStore = other.appStore;
+        externalInfoPlistFile = other.externalInfoPlistFile;
+        signingBuilder = other.signingBuilder;
+    }
+
+    MacApplicationBuilder icon(Path v) {
+        icon = v;
+        return this;
+    }
+
+    MacApplicationBuilder bundleName(String v) {
+        bundleName = v;
+        return this;
+    }
+
+    MacApplicationBuilder bundleIdentifier(String v) {
+        bundleIdentifier = v;
+        return this;
+    }
+
+    MacApplicationBuilder category(String v) {
+        category = v;
+        return this;
+    }
+
+    MacApplicationBuilder appStore(boolean v) {
+        appStore = v;
+        return this;
+    }
+
+    MacApplicationBuilder externalInfoPlistFile(Path v) {
+        externalInfoPlistFile = v;
+        return this;
+    }
+
+    MacApplicationBuilder signingBuilder(AppImageSigningConfigBuilder v) {
+        signingBuilder = v;
+        return this;
+    }
+
+    MacApplication create() throws ConfigException {
+        if (externalInfoPlistFile != null) {
+            return createCopyForExternalInfoPlistFile().create();
+        }
+
+        validateAppVersion(app);
+
+        final var mixin = new MacApplicationMixin.Stub(validatedIcon(), validatedBundleName(),
+                validatedBundleIdentifier(), validatedCategory(), appStore, createSigningConfig());
+
+        return MacApplication.create(app, mixin);
+    }
+
+    static boolean isValidBundleIdentifier(String 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,
+            // check if it is acceptable extended ASCII or unicode character.
+            if ((a >= 'A' && a <= 'Z') || (a >= 'a' && a <= 'z')
+                    || (a >= '0' && a <= '9') || (a == '-' || a == '.')) {
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private static void validateAppVersion(Application app) throws ConfigException {
+        try {
+            CFBundleVersion.of(app.version());
+        } catch (IllegalArgumentException ex) {
+            throw I18N.buildConfigException(ex).advice("error.invalid-cfbundle-version.advice").create();
+        }
+    }
+
+    private MacApplicationBuilder createCopyForExternalInfoPlistFile() throws ConfigException {
+        try {
+            final var plistFile = AppImageInfoPListFile.loadFromInfoPList(externalInfoPlistFile);
+
+            final var builder = new MacApplicationBuilder(this);
+
+            builder.externalInfoPlistFile(null);
+
+            if (builder.bundleName == null) {
+                builder.bundleName(plistFile.bundleName());
+            }
+
+            if (builder.bundleIdentifier == null) {
+                builder.bundleIdentifier(plistFile.bundleIdentifier());
+            }
+
+            if (builder.category == null) {
+                builder.category(plistFile.category());
+            }
+
+            return builder;
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        } catch (Exception ex) {
+            throw I18N.buildConfigException("message.app-image-requires-identifier")
+                    .advice("message.app-image-requires-identifier.advice")
+                    .cause(ex)
+                    .create();
+        }
+    }
+
+    private Optional<AppImageSigningConfig> createSigningConfig() throws ConfigException {
+        if (signingBuilder != null) {
+            return signingBuilder.create();
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private String validatedBundleName() throws ConfigException {
+        final var value = Optional.ofNullable(bundleName).orElseGet(() -> {
+            final var appName = app.name();
+// Commented out for backward compatibility
+//            if (appName.length() > MAX_BUNDLE_NAME_LENGTH) {
+//                return appName.substring(0, MAX_BUNDLE_NAME_LENGTH);
+//            } else {
+//                return appName;
+//            }
+            return appName;
+        });
+
+        if (value.length() > MAX_BUNDLE_NAME_LENGTH && (bundleName != null)) {
+            Log.error(I18N.format("message.bundle-name-too-long-warning", "--mac-package-name", value));
+        }
+
+        return value;
+    }
+
+    private String validatedBundleIdentifier() throws ConfigException {
+        final var value = Optional.ofNullable(bundleIdentifier).orElseGet(() -> {
+            return app.mainLauncher()
+                    .flatMap(Launcher::startupInfo)
+                    .map(li -> {
+                        final var packageName = li.packageName();
+                        if (packageName.isEmpty()) {
+                            return li.simpleClassName();
+                        } else {
+                            return packageName;
+                        }
+                    })
+                    .orElseGet(app::name);
+        });
+
+        if (!isValidBundleIdentifier(value)) {
+            throw I18N.buildConfigException("message.invalid-identifier", value)
+                    .advice("message.invalid-identifier.advice")
+                    .create();
+        }
+
+        return value;
+    }
+
+    private String validatedCategory() throws ConfigException {
+        return "public.app-category." + Optional.ofNullable(category).orElseGet(DEFAULTS::category);
+    }
+
+    private Optional<Path> validatedIcon() throws ConfigException {
+        if (icon != null) {
+            LauncherBuilder.validateIcon(icon);
+        }
+
+        return Optional.ofNullable(icon);
+    }
+
+    private record Defaults(String category) {
+    }
+
+    private Path icon;
+    private String bundleName;
+    private String bundleIdentifier;
+    private String category;
+    private boolean appStore;
+    private Path externalInfoPlistFile;
+    private AppImageSigningConfigBuilder signingBuilder;
+
+    private final Application app;
+
+    private static final Defaults DEFAULTS = new Defaults("utilities");
+
+    private static final int MAX_BUNDLE_NAME_LENGTH = 16;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayout.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayout.java
new file mode 100644
index 00000000000..971548ea4f5
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayout.java
@@ -0,0 +1,46 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+interface MacApplicationLayout extends ApplicationLayout, MacApplicationLayoutMixin {
+
+    static MacApplicationLayout create(ApplicationLayout layout, Path runtimeRootDir) {
+        return CompositeProxy.build()
+                .invokeTunnel(CompositeProxyTunnel.INSTANCE)
+                .create(MacApplicationLayout.class, layout, new MacApplicationLayoutMixin.Stub(runtimeRootDir));
+    }
+
+    @Override
+    default MacApplicationLayout resolveAt(Path root) {
+        return create(ApplicationLayout.super.resolveAt(root),
+                resolveNullablePath(root, runtimeRootDirectory()));
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayoutMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayoutMixin.java
new file mode 100644
index 00000000000..b6342b173dc
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayoutMixin.java
@@ -0,0 +1,39 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+
+// Must be publc to allow access from AppImageLayout.toPathGroup()
+public interface MacApplicationLayoutMixin {
+
+    /**
+     * Path to the root Java runtime directory in the application image.
+     * The root Java runtime directory should have "Contents/Home" subdirectory.
+     */
+    Path runtimeRootDirectory();
+
+    record Stub(Path runtimeRootDirectory) implements MacApplicationLayoutMixin {}
+}
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 ef94a97e22b..f46b5a328fd 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
@@ -25,131 +25,34 @@
 
 package jdk.jpackage.internal;
 
-import java.io.IOException;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
+import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
+
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.Map;
 import java.util.Optional;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-
 import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.FileUtils;
 
 public abstract class MacBaseInstallerBundler extends AbstractBundler {
 
-    private final BundlerParamInfo<Path> APP_IMAGE_TEMP_ROOT =
-            new StandardBundlerParam<>(
-            "mac.app.imageRoot",
-            Path.class,
-            params -> {
-                Path imageDir = IMAGES_ROOT.fetchFrom(params);
-                try {
-                    if (!IOUtils.exists(imageDir)) {
-                        Files.createDirectories(imageDir);
-                    }
-                    return Files.createTempDirectory(
-                            imageDir, "image-");
-                } catch (IOException e) {
-                    return imageDir.resolve(getID()+ ".image");
-                }
-            },
-            (s, p) -> Path.of(s));
-
-    public static final BundlerParamInfo<String> SIGNING_KEY_USER =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_SIGNING_KEY_NAME.getId(),
-            String.class,
-            params -> "",
-            null);
-
-    public static final BundlerParamInfo<String> SIGNING_KEYCHAIN =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_SIGNING_KEYCHAIN.getId(),
-            String.class,
-            params -> "",
-            null);
-
-    public static final BundlerParamInfo<String> INSTALLER_SIGN_IDENTITY =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getId(),
-            String.class,
-            params -> "",
-            null);
-
-    public static final BundlerParamInfo<String> MAC_INSTALLER_NAME =
-            new StandardBundlerParam<> (
-            "mac.installerName",
-            String.class,
-            params -> {
-                String nm = INSTALLER_NAME.fetchFrom(params);
-                if (nm == null) return null;
-
-                String version = VERSION.fetchFrom(params);
-                if (version == null) {
-                    return nm;
-                } else {
-                    return nm + "-" + version;
-                }
-            },
-            (s, p) -> s);
-
-     // Returns full path to installation directory
-     static String getInstallDir(
-            Map<String, ? super Object>  params, boolean defaultOnly) {
-        String returnValue = INSTALL_DIR.fetchFrom(params);
-
-        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) {
-            returnValue = defaultInstallDir;
-        }
-        return returnValue;
-    }
-
-    // Returns display name of installation directory. Display name is used to
-    // show user installation location and for well known (default only) we will
-    // use "Applications" or "JavaVirtualMachines".
-    static String getInstallDirDisplayName(
-            Map<String, ? super Object>  params) {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            return "JavaVirtualMachines";
-        } else {
-            return "Applications";
-        }
-    }
-
     public MacBaseInstallerBundler() {
-        appImageBundler = new MacAppBundler()
-                .setDependentTask(true);
+        appImageBundler = new MacAppBundler();
     }
 
     protected void validateAppImageAndBundeler(
             Map<String, ? super Object> params) throws ConfigException {
         if (PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
             Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-            if (AppImageFile.load(applicationImage).isSigned()) {
+            if (new MacAppImageFileExtras(PREDEFINED_APP_IMAGE_FILE.fetchFrom(params)).signed()) {
+                var appLayout = ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT.resolveAt(applicationImage);
                 if (!Files.exists(
-                        PackageFile.getPathInAppImage(applicationImage))) {
+                        PackageFile.getPathInAppImage(appLayout))) {
                     Log.info(MessageFormat.format(I18N.getString(
                             "warning.per.user.app.image.signed"),
-                            PackageFile.getPathInAppImage(applicationImage)));
+                            PackageFile.getPathInAppImage(appLayout)));
                 }
             } else {
                 if (Optional.ofNullable(
@@ -165,36 +68,6 @@ protected void validateAppImageAndBundeler(
         }
     }
 
-    protected Path prepareAppBundle(Map<String, ? super Object> params)
-            throws PackagerException, IOException {
-        Path appDir;
-        Path appImageRoot = APP_IMAGE_TEMP_ROOT.fetchFrom(params);
-        Path predefinedImage =
-                StandardBundlerParam.getPredefinedAppImage(params);
-        if (predefinedImage != null) {
-            appDir = appImageRoot.resolve(APP_NAME.fetchFrom(params) + ".app");
-            FileUtils.copyRecursive(predefinedImage, appDir,
-                    LinkOption.NOFOLLOW_LINKS);
-
-            // 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
-                // signature are sealed, but without a signing identity, so we
-                // need to re-sign it after modification.
-                MacAppImageBuilder.signAppBundle(params, appDir, "-", null, null);
-            }
-        } else {
-            appDir = appImageBundler.execute(params, appImageRoot);
-        }
-
-        return appDir;
-    }
-
     @Override
     public String getBundleType() {
         return "INSTALLER";
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
deleted file mode 100644
index c9dab481e0e..00000000000
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
+++ /dev/null
@@ -1,335 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HexFormat;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class MacCertificate {
-    private final String certificate;
-    private final Optional<String> keychainName;
-
-    public MacCertificate(String certificate, String keychainName) {
-        this.certificate = Objects.requireNonNull(certificate);
-        this.keychainName = Optional.ofNullable(keychainName);
-    }
-
-    public boolean isValid() {
-        return verifyCertificate();
-    }
-
-    public static String findCertificateKey(String keyPrefix, String teamName,
-                                            String keychainName) {
-
-        String matchedKey = null;
-        boolean useAsIs = (keyPrefix == null)
-                || teamName.startsWith(keyPrefix)
-                || teamName.startsWith("Developer ID")
-                || teamName.startsWith("3rd Party Mac");
-
-        String name = (useAsIs) ? teamName : (keyPrefix + teamName);
-
-        String output = getFindCertificateOutput(name, keychainName);
-        if (output == null) {
-            Log.error(MessageFormat.format(I18N.getString(
-                        "error.cert.not.found"), name, keychainName));
-            return null;
-        }
-
-        // Check and warn user if multiple certificates found
-        // We will use different regex to count certificates.
-        // ASCII case: "alis"<blob>="NAME"
-        // UNICODE case: "alis"<blob>=0xSOMEHEXDIGITS  "NAME (\SOMEDIGITS)"
-        // In UNICODE case name will contain octal sequence representing UTF-8
-        // characters.
-        // Just look for at least two '"alis"<blob>'.
-        Pattern p = Pattern.compile("\"alis\"<blob>");
-        Matcher m = p.matcher(output);
-        if (m.find() && m.find()) {
-            Log.error(MessageFormat.format(I18N.getString(
-                        "error.multiple.certs.found"), name, keychainName));
-        }
-
-        // Try to get ASCII only certificate first. This aproach only works
-        // if certificate name has ASCII only characters in name. For certificates
-        // with UNICODE characters in name we will use combination of "security"
-        // and "openssl". We keeping ASCII only aproach to avoid regressions and
-        // it works for many use cases.
-        p = Pattern.compile("\"alis\"<blob>=\"([^\"]+)\"");
-        m = p.matcher(output);
-        if (m.find()) {
-            matchedKey = m.group(1);;
-        }
-
-        // Maybe it has UNICODE characters in name. In this case use "security"
-        // and "openssl" to exctract name. We cannot use just "security", since
-        // name can be truncated.
-        if (matchedKey == null) {
-            Path  file = null;
-            try {
-                file = getFindCertificateOutputPEM(name, keychainName);
-                if (file != null) {
-                    matchedKey = findCertificateSubject(
-                                    file.toFile().getCanonicalPath());
-                }
-            } catch (IOException ioe) {
-                Log.verbose(ioe);
-            } finally {
-                try {
-                    Files.deleteIfExists(file);
-                } catch (IOException ignored) {}
-            }
-        }
-
-        if (matchedKey == null) {
-            Log.error(MessageFormat.format(I18N.getString(
-                "error.cert.not.found"), name, keychainName));
-        }
-
-        return matchedKey;
-    }
-
-    private static String getFindCertificateOutput(String name,
-                                                   String keychainName) {
-        try (ByteArrayOutputStream baos = getFindCertificateOutput(name,
-                                                                   keychainName,
-                                                                   false)) {
-            if (baos != null) {
-                return baos.toString();
-            }
-        } catch (IOException ioe) {
-            Log.verbose(ioe);
-        }
-
-        return null;
-    }
-
-    private static Path getFindCertificateOutputPEM(String name,
-                                                    String keychainName) {
-        Path output = null;
-        try (ByteArrayOutputStream baos = getFindCertificateOutput(name,
-                                                                   keychainName,
-                                                                   true)) {
-            if (baos != null) {
-                output = Files.createTempFile("tempfile", ".tmp");
-                Files.copy(new ByteArrayInputStream(baos.toByteArray()),
-                        output, StandardCopyOption.REPLACE_EXISTING);
-                return output;
-            }
-        } catch (IOException ioe) {
-            Log.verbose(ioe);
-            try {
-                Files.deleteIfExists(output);
-            } catch (IOException ignored) {}
-        }
-
-        return null;
-    }
-
-    private static ByteArrayOutputStream getFindCertificateOutput(String name,
-                                                                  String keychainName,
-                                                                  boolean isPEMFormat) {
-        List<String> args = new ArrayList<>();
-        args.add("/usr/bin/security");
-        args.add("find-certificate");
-        args.add("-c");
-        args.add(name);
-        args.add("-a");
-        if (isPEMFormat) {
-            args.add("-p");
-        }
-        if (keychainName != null && !keychainName.isEmpty()) {
-            args.add(keychainName);
-        }
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (PrintStream ps = new PrintStream(baos)) {
-            ProcessBuilder pb = new ProcessBuilder(args);
-            IOUtils.exec(pb, false, ps);
-            return baos;
-        } catch (IOException ioe) {
-            Log.verbose(ioe);
-            return null;
-        }
-    }
-
-    private static String findCertificateSubject(String filename) {
-        String result = null;
-
-        List<String> args = new ArrayList<>();
-        args.add("/usr/bin/openssl");
-        args.add("x509");
-        args.add("-noout");
-        args.add("-subject");
-        args.add("-in");
-        args.add(filename);
-
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                PrintStream ps = new PrintStream(baos)) {
-            ProcessBuilder security = new ProcessBuilder(args);
-            IOUtils.exec(security, false, ps);
-            String output = baos.toString().strip();
-            // Example output:
-            // subject= /UID=ABCDABCD/CN=jpackage.openjdk.java.net (\xC3\xB6) (ABCDABCD)/C=US
-            // We need 'CN' value
-            String [] pairs = output.split("/");
-            for (String pair : pairs) {
-                if (pair.startsWith("CN=")) {
-                    result = pair.substring(3);
-                    // Convert escaped UTF-8 code points to characters
-                    result = convertHexToChar(result);
-                    break;
-                }
-            }
-        } catch (IOException ex) {
-            Log.verbose(ex);
-        }
-
-        return result;
-    }
-
-    // Certificate name with Unicode will be:
-    // Developer ID Application: jpackage.openjdk.java.net (\xHH\xHH)
-    // Convert UTF-8 code points '\xHH\xHH' to character.
-    private static String convertHexToChar(String input) {
-        if (input == null || input.isEmpty()) {
-            return input;
-        }
-
-        if (!input.contains("\\x")) {
-            return input;
-        }
-
-        StringBuilder output = new StringBuilder();
-        try {
-            int len = input.length();
-            for (int i = 0; i < len; i++) {
-                if (input.codePointAt(i) == '\\' &&
-                    (i + 8) <= len &&
-                    input.codePointAt(i + 1) == 'x' &&
-                    input.codePointAt(i + 4) == '\\' &&
-                    input.codePointAt(i + 5) == 'x') {
-                        // We found '\xHH\xHH'
-                        // HEX code points to byte array
-                        byte [] bytes = HexFormat.of().parseHex(
-                            input.substring(i + 2, i + 4) + input.substring(i + 6, i + 8));
-                        // Byte array with UTF-8 code points to character
-                        output.append(new String(bytes, "UTF-8"));
-                        i += 7; // Skip '\xHH\xHH'
-                } else {
-                    output.appendCodePoint(input.codePointAt(i));
-                }
-            }
-        } catch (Exception ex) {
-            Log.verbose(ex);
-            // We will consider any excpetions during conversion as
-            // certificate not found.
-            return null;
-        }
-
-        return output.toString();
-    }
-
-    private Date findCertificateDate(String filename) {
-        Date result = null;
-
-        List<String> args = new ArrayList<>();
-        args.add("/usr/bin/openssl");
-        args.add("x509");
-        args.add("-noout");
-        args.add("-enddate");
-        args.add("-in");
-        args.add(filename);
-
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                PrintStream ps = new PrintStream(baos)) {
-            ProcessBuilder security = new ProcessBuilder(args);
-            IOUtils.exec(security, false, ps);
-            String output = baos.toString();
-            output = output.substring(output.indexOf("=") + 1);
-            DateFormat df = new SimpleDateFormat(
-                    "MMM dd kk:mm:ss yyyy z", Locale.ENGLISH);
-            result = df.parse(output);
-        } catch (IOException | ParseException ex) {
-            Log.verbose(ex);
-        }
-
-        return result;
-    }
-
-    private boolean verifyCertificate() {
-        boolean result = false;
-
-        try {
-            Path file = null;
-            Date certificateDate = null;
-
-            try {
-                file = getFindCertificateOutputPEM(certificate, keychainName.orElse(null));
-
-                if (file != null) {
-                    certificateDate = findCertificateDate(
-                            file.toFile().getCanonicalPath());
-                }
-            } finally {
-                if (file != null) {
-                    Files.deleteIfExists(file);
-                }
-            }
-
-            if (certificateDate != null) {
-                Calendar c = Calendar.getInstance();
-                Date today = c.getTime();
-
-                if (certificateDate.after(today)) {
-                    result = true;
-                }
-            }
-        }
-        catch (IOException ignored) {}
-
-        return result;
-    }
-}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificateUtils.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificateUtils.java
new file mode 100644
index 00000000000..fe593e347fc
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificateUtils.java
@@ -0,0 +1,116 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public final class MacCertificateUtils {
+
+    public static Collection<X509Certificate> findCertificates(Optional<Keychain> keychain, Optional<String> certificateNameFilter) {
+        List<String> args = new ArrayList<>();
+        args.add("/usr/bin/security");
+        args.add("find-certificate");
+        args.add("-a");
+        certificateNameFilter.ifPresent(filter -> args.addAll(List.of("-c", filter)));
+        args.add("-p"); // PEM format
+        keychain.map(Keychain::asCliArg).ifPresent(args::add);
+
+        return toSupplier(() -> {
+            final var output = Executor.of(args.toArray(String[]::new))
+                    .setQuiet(true).saveOutput(true).executeExpectSuccess()
+                    .getOutput();
+
+            final byte[] pemCertificatesBuffer = output.stream()
+                    .reduce(new StringBuilder(),
+                            MacCertificateUtils::append,
+                            MacCertificateUtils::append).toString().getBytes(StandardCharsets.US_ASCII);
+
+            final var cf = CertificateFactory.getInstance("X.509");
+
+            Collection<X509Certificate> certs = new ArrayList<>();
+
+            try (var in = new BufferedInputStream(new ByteArrayInputStream(pemCertificatesBuffer))) {
+                while (in.available() > 0) {
+                    final X509Certificate cert;
+                    try {
+                        cert = (X509Certificate)cf.generateCertificate(in);
+                    } catch (CertificateException ex) {
+                        // Not a valid X505 certificate, silently ignore.
+                        continue;
+                    }
+                    certs.add(cert);
+                }
+            }
+            return certs;
+        }).get();
+    }
+
+    record CertificateHash(byte[] value) {
+        CertificateHash {
+            Objects.requireNonNull(value);
+            if (value.length != 20) {
+                throw new IllegalArgumentException("Invalid SHA-1 hash");
+            }
+        }
+
+        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);
+        }
+
+        static CertificateHash fromHexString(String hash) {
+            return new CertificateHash(FORMAT.parseHex(hash));
+        }
+
+        private static final HexFormat FORMAT = HexFormat.of().withUpperCase();
+    }
+
+    private static StringBuilder append(StringBuilder sb, Object v) {
+        return sb.append(v).append('\n');
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
index 3e324573bcf..56aacf6e44a 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
@@ -25,514 +25,15 @@
 
 package jdk.jpackage.internal;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.ResourceBundle;
-import static jdk.jpackage.internal.MacAppImageBuilder.ICON_ICNS;
-import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
-import static jdk.jpackage.internal.StandardBundlerParam.DMG_CONTENT;
-
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.FileUtils;
-import jdk.jpackage.internal.util.PathGroup;
 
 public class MacDmgBundler extends MacBaseInstallerBundler {
 
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MacResources");
-
-    // Background image name in resources
-    static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff";
-    // Background image name and folder under which it will be stored in DMG
-    static final String BACKGROUND_IMAGE_FOLDER =".background";
-    static final String BACKGROUND_IMAGE = "background.tiff";
-    static final String DEFAULT_DMG_SETUP_SCRIPT = "DMGsetup.scpt";
-    static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
-
-    static final String DEFAULT_LICENSE_PLIST="lic_template.plist";
-
-    public Path bundle(Map<String, ? super Object> params,
-            Path outdir) throws PackagerException {
-        Log.verbose(MessageFormat.format(I18N.getString("message.building-dmg"),
-                APP_NAME.fetchFrom(params)));
-
-        IOUtils.writableOutputDir(outdir);
-
-        try {
-            Path appLocation = prepareAppBundle(params);
-
-            if (appLocation != null && prepareConfigFiles(appLocation,params)) {
-                new ScriptRunner()
-                        .setDirectory(appLocation)
-                        .setResourceCategoryId("resource.post-app-image-script")
-                        .setScriptNameSuffix("post-image")
-                        .setEnvironmentVariable("JpAppImageDir", appLocation.toAbsolutePath().toString())
-                        .run(params);
-
-                return buildDMG(params, appLocation, outdir);
-            }
-            return null;
-        } catch (IOException | PackagerException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
-        }
-    }
-
-    private static final String hdiutil = "/usr/bin/hdiutil";
-
-    private void prepareDMGSetupScript(Path appLocation,
-            Map<String, ? super Object> params) throws IOException {
-        Path dmgSetup = getConfig_VolumeScript(params);
-        Log.verbose(MessageFormat.format(
-                I18N.getString("message.preparing-dmg-setup"),
-                dmgSetup.toAbsolutePath().toString()));
-
-        // We need to use URL for DMG to find it. We cannot use volume name, since
-        // user might have open DMG with same volume name already. Url should end with
-        // '/' and it should be real path (no symbolic links).
-        Path imageDir = IMAGES_ROOT.fetchFrom(params);
-        if (!Files.exists(imageDir)) {
-             // Create it, since it does not exist
-             Files.createDirectories(imageDir);
-        }
-        Path rootPath = Path.of(imageDir.toString()).toRealPath();
-        Path volumePath = rootPath.resolve(APP_NAME.fetchFrom(params));
-        String volumeUrl = volumePath.toUri().toString() + File.separator;
-
-        // Provide full path to background image, so we can find it.
-        Path bgFile = Path.of(rootPath.toString(), APP_NAME.fetchFrom(params),
-                              BACKGROUND_IMAGE_FOLDER, BACKGROUND_IMAGE);
-
-        // Prepare DMG setup script
-        Map<String, String> data = new HashMap<>();
-        data.put("DEPLOY_VOLUME_URL", volumeUrl);
-        data.put("DEPLOY_BG_FILE", bgFile.toString());
-        data.put("DEPLOY_VOLUME_PATH", volumePath.toString());
-        data.put("DEPLOY_APPLICATION_NAME", APP_NAME.fetchFrom(params));
-        String targetItem = (StandardBundlerParam.isRuntimeInstaller(params)) ?
-              APP_NAME.fetchFrom(params) : appLocation.getFileName().toString();
-        data.put("DEPLOY_TARGET", targetItem);
-        data.put("DEPLOY_INSTALL_LOCATION", getInstallDir(params, true));
-        data.put("DEPLOY_INSTALL_LOCATION_DISPLAY_NAME",
-                getInstallDirDisplayName(params));
-
-        createResource(DEFAULT_DMG_SETUP_SCRIPT, params)
-                .setCategory(I18N.getString("resource.dmg-setup-script"))
-                .setSubstitutionData(data)
-                .saveToFile(dmgSetup);
-    }
-
-    private Path getConfig_VolumeScript(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-dmg-setup.scpt");
-    }
-
-    private Path getConfig_VolumeBackground(
-            Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-background.tiff");
-    }
-
-    private Path getConfig_VolumeIcon(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-volume.icns");
-    }
-
-    private Path getConfig_LicenseFile(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-license.plist");
-    }
-
-    private void prepareLicense(Map<String, ? super Object> params) {
-        try {
-            String licFileStr = LICENSE_FILE.fetchFrom(params);
-            if (licFileStr == null) {
-                return;
-            }
-
-            Path licFile = Path.of(licFileStr);
-            byte[] licenseContentOriginal =
-                    Files.readAllBytes(licFile);
-            String licenseInBase64 =
-                    Base64.getEncoder().encodeToString(licenseContentOriginal);
-
-            Map<String, String> data = new HashMap<>();
-            data.put("APPLICATION_LICENSE_TEXT", licenseInBase64);
-
-            createResource(DEFAULT_LICENSE_PLIST, params)
-                    .setCategory(I18N.getString("resource.license-setup"))
-                    .setSubstitutionData(data)
-                    .saveToFile(getConfig_LicenseFile(params));
-
-        } catch (IOException ex) {
-            Log.verbose(ex);
-        }
-    }
-
-    private boolean prepareConfigFiles(Path appLocation,
-            Map<String, ? super Object> params) throws IOException {
-
-        createResource(DEFAULT_BACKGROUND_IMAGE, params)
-                    .setCategory(I18N.getString("resource.dmg-background"))
-                    .saveToFile(getConfig_VolumeBackground(params));
-
-        createResource(TEMPLATE_BUNDLE_ICON, params)
-                .setCategory(I18N.getString("resource.volume-icon"))
-                .setExternal(ICON_ICNS.fetchFrom(params))
-                .saveToFile(getConfig_VolumeIcon(params));
-
-        prepareLicense(params);
-
-        prepareDMGSetupScript(appLocation, params);
-
-        return true;
-    }
-
-    // Location of SetFile utility may be different depending on MacOS version
-    // We look for several known places and if none of them work will
-    // try ot find it
-    private String findSetFileUtility() {
-        String typicalPaths[] = {"/Developer/Tools/SetFile",
-                "/usr/bin/SetFile", "/Developer/usr/bin/SetFile"};
-
-        String setFilePath = null;
-        for (String path : typicalPaths) {
-            Path f = Path.of(path);
-            if (Files.exists(f) && Files.isExecutable(f)) {
-                setFilePath = path;
-                break;
-            }
-        }
-
-        // Validate SetFile, if Xcode is not installed it will run, but exit with error
-        // code
-        if (setFilePath != null) {
-            try {
-                ProcessBuilder pb = new ProcessBuilder(setFilePath, "-h");
-                Process p = pb.start();
-                int code = p.waitFor();
-                if (code == 0) {
-                    return setFilePath;
-                }
-            } catch (Exception ignored) {}
-
-            // No need for generic find attempt. We found it, but it does not work.
-            // Probably due to missing xcode.
-            return null;
-        }
-
-        // generic find attempt
-        try {
-            ProcessBuilder pb = new ProcessBuilder("/usr/bin/xcrun", "-find", "SetFile");
-            Process p = pb.start();
-            InputStreamReader isr = new InputStreamReader(p.getInputStream());
-            BufferedReader br = new BufferedReader(isr);
-            String lineRead = br.readLine();
-            if (lineRead != null) {
-                Path f = Path.of(lineRead);
-                if (Files.exists(f) && Files.isExecutable(f)) {
-                    return f.toAbsolutePath().toString();
-                }
-            }
-        } catch (IOException ignored) {}
-
-        return null;
-    }
-
-    private Path buildDMG( Map<String, ? super Object> params,
-            Path appLocation, Path outdir) throws IOException {
-        boolean copyAppImage = false;
-        Path imagesRoot = IMAGES_ROOT.fetchFrom(params);
-        if (!Files.exists(imagesRoot)) {
-            Files.createDirectories(imagesRoot);
-        }
-
-        Path protoDMG = imagesRoot.resolve(APP_NAME.fetchFrom(params)
-                + "-tmp.dmg");
-        Path finalDMG = outdir.resolve(MAC_INSTALLER_NAME.fetchFrom(params)
-                + ".dmg");
-
-        Path srcFolder = appLocation.getParent();
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            Path newRoot = Files.createTempDirectory(TEMP_ROOT.fetchFrom(params),
-                    "root-");
-
-            // first, is this already a runtime with
-            // <runtime>/Contents/Home - if so we need the Home dir
-            Path home = appLocation.resolve("Contents/Home");
-            Path source = (Files.exists(home)) ? home : appLocation;
-
-            // Then we need to put back the <NAME>/Content/Home
-            Path root = newRoot.resolve(
-                    MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params));
-            Path dest = root.resolve("Contents/Home");
-
-            FileUtils.copyRecursive(source, dest);
-
-            srcFolder = newRoot;
-        }
-
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.creating-dmg-file"), finalDMG.toAbsolutePath()));
-
-        Files.deleteIfExists(protoDMG);
-        try {
-            Files.deleteIfExists(finalDMG);
-        } catch (IOException ex) {
-            throw new IOException(MessageFormat.format(I18N.getString(
-                    "message.dmg-cannot-be-overwritten"),
-                    finalDMG.toAbsolutePath()));
-        }
-
-        Files.createDirectories(protoDMG.getParent());
-        Files.createDirectories(finalDMG.getParent());
-
-        String hdiUtilVerbosityFlag = VERBOSE.fetchFrom(params) ?
-                "-verbose" : "-quiet";
-        List <String> dmgContent = DMG_CONTENT.fetchFrom(params);
-        for (String content : dmgContent) {
-            Path path = Path.of(content);
-            FileUtils.copyRecursive(path, srcFolder.resolve(path.getFileName()));
-        }
-        // create temp image
-        ProcessBuilder pb = new ProcessBuilder(
-                hdiutil,
-                "create",
-                hdiUtilVerbosityFlag,
-                "-srcfolder", srcFolder.toAbsolutePath().toString(),
-                "-volname", APP_NAME.fetchFrom(params),
-                "-ov", protoDMG.toAbsolutePath().toString(),
-                "-fs", "HFS+",
-                "-format", "UDRW");
-        try {
-            IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-        } catch (IOException ex) {
-            Log.verbose(ex); // Log exception
-
-            // Creating DMG from entire app image failed, so lets try to create empty
-            // DMG and copy files manually. See JDK-8248059.
-            copyAppImage = true;
-
-            long size = new PathGroup(Map.of(new Object(), srcFolder)).sizeInBytes();
-            size += 50 * 1024 * 1024; // Add extra 50 megabytes. Actually DMG size will
-            // not be bigger, but it will able to hold additional 50 megabytes of data.
-            // We need extra room for icons and background image. When we providing
-            // actual files to hdiutil, it will create DMG with ~50 megabytes extra room.
-            pb = new ProcessBuilder(
-                hdiutil,
-                "create",
-                hdiUtilVerbosityFlag,
-                "-size", String.valueOf(size),
-                "-volname", APP_NAME.fetchFrom(params),
-                "-ov", protoDMG.toAbsolutePath().toString(),
-                "-fs", "HFS+");
-            new RetryExecutor()
-                .setMaxAttemptsCount(10)
-                .setAttemptTimeoutMillis(3000)
-                .setWriteOutputToFile(true)
-                .execute(pb);
-        }
-
-        // mount temp image
-        pb = new ProcessBuilder(
-                hdiutil,
-                "attach",
-                protoDMG.toAbsolutePath().toString(),
-                hdiUtilVerbosityFlag,
-                "-mountroot", imagesRoot.toAbsolutePath().toString());
-        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-
-        Path mountedRoot = imagesRoot.resolve(APP_NAME.fetchFrom(params));
-
-        // Copy app image, since we did not create DMG with it, but instead we created
-        // empty one.
-        if (copyAppImage) {
-            // In case of predefine app image srcFolder will point to app bundle, so if
-            // we use it as is we will copy content of app bundle, but we need app bundle
-            // folder as well.
-            if (srcFolder.toString().toLowerCase().endsWith(".app")) {
-                Path destPath = mountedRoot
-                        .resolve(srcFolder.getFileName());
-                Files.createDirectory(destPath);
-                FileUtils.copyRecursive(srcFolder, destPath);
-            } else {
-                FileUtils.copyRecursive(srcFolder, mountedRoot);
-            }
-        }
-
-        try {
-            // background image
-            Path bgdir = mountedRoot.resolve(BACKGROUND_IMAGE_FOLDER);
-            Files.createDirectories(bgdir);
-            IOUtils.copyFile(getConfig_VolumeBackground(params),
-                    bgdir.resolve(BACKGROUND_IMAGE));
-
-            // We will not consider setting background image and creating link
-            // to install-dir in DMG as critical error, since it can fail in
-            // headless environment.
-            try {
-                pb = new ProcessBuilder("/usr/bin/osascript",
-                        getConfig_VolumeScript(params).toAbsolutePath().toString());
-                IOUtils.exec(pb, 180); // Wait 3 minutes. See JDK-8248248.
-            } catch (IOException ex) {
-                Log.verbose(ex);
-            }
-
-            // volume icon
-            Path volumeIconFile = mountedRoot.resolve(".VolumeIcon.icns");
-            IOUtils.copyFile(getConfig_VolumeIcon(params),
-                    volumeIconFile);
-
-            // Indicate that we want a custom icon
-            // NB: attributes of the root directory are ignored
-            // when creating the volume
-            // Therefore we have to do this after we mount image
-            String setFileUtility = findSetFileUtility();
-            if (setFileUtility != null) {
-                //can not find utility => keep going without icon
-                try {
-                    volumeIconFile.toFile().setWritable(true);
-                    // The "creator" attribute on a file is a legacy attribute
-                    // but it seems Finder excepts these bytes to be
-                    // "icnC" for the volume icon
-                    // (might not work on Mac 10.13 with old XCode)
-                    pb = new ProcessBuilder(
-                            setFileUtility,
-                            "-c", "icnC",
-                            volumeIconFile.toAbsolutePath().toString());
-                    IOUtils.exec(pb);
-                    volumeIconFile.toFile().setReadOnly();
-
-                    pb = new ProcessBuilder(
-                            setFileUtility,
-                            "-a", "C",
-                            mountedRoot.toAbsolutePath().toString());
-                    IOUtils.exec(pb);
-                } catch (IOException ex) {
-                    Log.error(ex.getMessage());
-                    Log.verbose("Cannot enable custom icon using SetFile utility");
-                }
-            } else {
-                Log.verbose(I18N.getString("message.setfile.dmg"));
-            }
-
-        } finally {
-            // Detach the temporary image
-            pb = new ProcessBuilder(
-                    hdiutil,
-                    "detach",
-                    hdiUtilVerbosityFlag,
-                    mountedRoot.toAbsolutePath().toString());
-            // "hdiutil detach" might not work right away due to resource busy error, so
-            // repeat detach several times.
-            RetryExecutor retryExecutor = new RetryExecutor();
-            // Image can get detach even if we got resource busy error, so stop
-            // trying to detach it if it is no longer attached.
-            retryExecutor.setExecutorInitializer(exec -> {
-                if (!Files.exists(mountedRoot)) {
-                    retryExecutor.abort();
-                }
-            });
-            try {
-                // 10 times with 6 second delays.
-                retryExecutor.setMaxAttemptsCount(10).setAttemptTimeoutMillis(6000)
-                        .execute(pb);
-            } catch (IOException ex) {
-                if (!retryExecutor.isAborted()) {
-                    // Now force to detach if it still attached
-                    if (Files.exists(mountedRoot)) {
-                        pb = new ProcessBuilder(
-                                hdiutil,
-                                "detach",
-                                "-force",
-                                hdiUtilVerbosityFlag,
-                                mountedRoot.toAbsolutePath().toString());
-                        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-                    }
-                }
-            }
-        }
-
-        // Compress it to a new image
-        pb = new ProcessBuilder(
-                hdiutil,
-                "convert",
-                protoDMG.toAbsolutePath().toString(),
-                hdiUtilVerbosityFlag,
-                "-format", "UDZO",
-                "-o", finalDMG.toAbsolutePath().toString());
-        try {
-            new RetryExecutor()
-                .setMaxAttemptsCount(10)
-                .setAttemptTimeoutMillis(3000)
-                .execute(pb);
-        } catch (Exception ex) {
-            // Convert might failed if something holds file. Try to convert copy.
-            Path protoDMG2 = imagesRoot
-                    .resolve(APP_NAME.fetchFrom(params) + "-tmp2.dmg");
-            Files.copy(protoDMG, protoDMG2);
-            try {
-                pb = new ProcessBuilder(
-                        hdiutil,
-                        "convert",
-                        protoDMG2.toAbsolutePath().toString(),
-                        hdiUtilVerbosityFlag,
-                        "-format", "UDZO",
-                        "-o", finalDMG.toAbsolutePath().toString());
-                IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-            } finally {
-                Files.deleteIfExists(protoDMG2);
-            }
-        }
-
-        //add license if needed
-        if (Files.exists(getConfig_LicenseFile(params))) {
-            pb = new ProcessBuilder(
-                    hdiutil,
-                    "udifrez",
-                    finalDMG.toAbsolutePath().toString(),
-                    "-xml",
-                    getConfig_LicenseFile(params).toAbsolutePath().toString()
-            );
-            new RetryExecutor()
-                .setMaxAttemptsCount(10)
-                .setAttemptTimeoutMillis(3000)
-                .execute(pb);
-        }
-
-        //Delete the temporary image
-        Files.deleteIfExists(protoDMG);
-
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.output-to-location"),
-                APP_NAME.fetchFrom(params), finalDMG.toAbsolutePath().toString()));
-
-        return finalDMG;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implement Bundler
-    //////////////////////////////////////////////////////////////////////////
-
     @Override
     public String getName() {
         return I18N.getString("dmg.bundler.name");
@@ -549,6 +50,8 @@ public boolean validate(Map<String, ? super Object> params)
         try {
             Objects.requireNonNull(params);
 
+            MacFromParams.DMG_PACKAGE.fetchFrom(params);
+
             //run basic validation to ensure requirements are met
             //we are not interested in return code, only possible exception
             validateAppImageAndBundeler(params);
@@ -566,7 +69,15 @@ public boolean validate(Map<String, ? super Object> params)
     @Override
     public Path execute(Map<String, ? super Object> params,
             Path outputParentDir) throws PackagerException {
-        return bundle(params, outputParentDir);
+
+        final var pkg = MacFromParams.DMG_PACKAGE.fetchFrom(params);
+        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+
+        final var packager = MacDmgPackager.build().outputDir(outputParentDir).pkg(pkg).env(env);
+
+        MacDmgPackager.findSetFileUtility().ifPresent(packager::setFileUtility);
+
+        return packager.execute();
     }
 
     @Override
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
new file mode 100644
index 00000000000..0ee1756b235
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MacDmgPackage;
+import jdk.jpackage.internal.model.MacDmgPackageMixin;
+
+final class MacDmgPackageBuilder {
+
+    MacDmgPackageBuilder(MacPackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    MacDmgPackageBuilder dmgContent(List<Path> v) {
+        dmgContent = v;
+        return this;
+    }
+
+    MacDmgPackageBuilder icon(Path v) {
+        icon = v;
+        return this;
+    }
+
+    List<Path> validatedDmgContent() {
+        return Optional.ofNullable(dmgContent).orElseGet(List::of);
+    }
+
+    MacDmgPackage create() throws ConfigException {
+        final var superPkgBuilder = pkgBuilder.pkgBuilder();
+        superPkgBuilder.installDir().ifPresent(installDir -> {
+            final var defaultInstallDirLocation = superPkgBuilder.defaultInstallDir().map(Path::getParent).orElseThrow();
+            if (!defaultInstallDirLocation.equals(installDir)) {
+                Log.info(I18N.format("message.install-dir-ignored", defaultInstallDirLocation));
+                superPkgBuilder.installDir(defaultInstallDirLocation);
+            }
+        });
+
+        final var pkg = pkgBuilder.create();
+
+        return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
+                Optional.ofNullable(icon).or((pkg.app())::icon),
+                validatedDmgContent()));
+    }
+
+    private Path icon;
+    private List<Path> dmgContent;
+    private final MacPackageBuilder pkgBuilder;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
new file mode 100644
index 00000000000..b37fa6979de
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
@@ -0,0 +1,530 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.PathUtils.normalizedAbsolutePathString;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.text.MessageFormat;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.StartupParameters;
+import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.MacDmgPackage;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.PathGroup;
+
+record MacDmgPackager(MacDmgPackage pkg, BuildEnv env, Path hdiutil, Path outputDir, Optional<Path> setFileUtility) {
+
+    MacDmgPackager {
+        Objects.requireNonNull(pkg);
+        Objects.requireNonNull(env);
+        Objects.requireNonNull(hdiutil);
+        Objects.requireNonNull(outputDir);
+        Objects.requireNonNull(setFileUtility);
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    static final class Builder extends PackagerBuilder<MacDmgPackage, Builder> {
+
+        Builder hdiutil(Path v) {
+            hdiutil = v;
+            return this;
+        }
+
+        Builder setFileUtility(Path v) {
+            setFileUtility = v;
+            return this;
+        }
+
+        Path execute() throws PackagerException {
+            Log.verbose(MessageFormat.format(I18N.getString("message.building-dmg"),
+                    pkg.app().name()));
+
+            IOUtils.writableOutputDir(outputDir);
+
+            return execute(MacPackagingPipeline.build(Optional.of(pkg)));
+        }
+
+        @Override
+        protected void configurePackagingPipeline(PackagingPipeline.Builder pipelineBuilder,
+                StartupParameters startupParameters) {
+            final var packager = new MacDmgPackager(pkg, startupParameters.packagingEnv(),
+                    validatedHdiutil(), outputDir, Optional.ofNullable(setFileUtility));
+            packager.applyToPipeline(pipelineBuilder);
+        }
+
+        private Path validatedHdiutil() {
+            return Optional.ofNullable(hdiutil).orElse(HDIUTIL);
+        }
+
+        private Path hdiutil;
+        private Path setFileUtility;
+    }
+
+    // Location of SetFile utility may be different depending on MacOS version
+    // We look for several known places and if none of them work will
+    // try to find it
+    static Optional<Path> findSetFileUtility() {
+        String typicalPaths[] = {"/Developer/Tools/SetFile",
+                "/usr/bin/SetFile", "/Developer/usr/bin/SetFile"};
+
+        final var setFilePath = Stream.of(typicalPaths).map(Path::of).filter(Files::isExecutable).findFirst();
+        if (setFilePath.isPresent()) {
+            // Validate SetFile, if Xcode is not installed it will run, but exit with error
+            // code
+            try {
+                if (Executor.of(setFilePath.orElseThrow().toString(), "-h").setQuiet(true).execute() == 0) {
+                    return setFilePath;
+                }
+            } catch (Exception ignored) {
+                // No need for generic find attempt. We found it, but it does not work.
+                // Probably due to missing xcode.
+                return Optional.empty();
+            }
+        }
+
+        // generic find attempt
+        try {
+            final var executor = Executor.of("/usr/bin/xcrun", "-find", "SetFile");
+            final var code = executor.setQuiet(true).saveOutput(true).execute();
+            if (code == 0 && executor.getOutput().isEmpty()) {
+                final var firstLine = executor.getOutput().getFirst();
+                Path f = Path.of(firstLine);
+                if (Files.exists(f) && Files.isExecutable(f)) {
+                    return Optional.of(f.toAbsolutePath());
+                }
+            }
+        } catch (IOException ignored) {}
+
+        return Optional.empty();
+    }
+
+    private void applyToPipeline(PackagingPipeline.Builder pipelineBuilder) {
+        pipelineBuilder
+                .excludeDirFromCopying(outputDir)
+                .task(DmgPackageTaskID.COPY_DMG_CONTENT)
+                        .action(this::copyDmgContent)
+                        .addDependent(PackageTaskID.CREATE_PACKAGE_FILE)
+                        .add()
+                .task(PackageTaskID.CREATE_CONFIG_FILES)
+                        .action(this::prepareConfigFiles)
+                        .add()
+                .task(PackageTaskID.CREATE_PACKAGE_FILE)
+                        .action(this::buildDMG)
+                        .add();
+    }
+
+    enum DmgPackageTaskID implements TaskID {
+        COPY_DMG_CONTENT
+    }
+
+    Path volumePath() {
+        return dmgWorkdir().resolve(volumeName());
+    }
+
+    String volumeName() {
+        return pkg.app().name();
+    }
+
+    String createVolumeUrlLocation() throws IOException {
+        final var volumeParentDir = volumePath().getParent();
+        Files.createDirectories(volumeParentDir);
+        // The URL should end with '/' and it should be real path (no symbolic links).
+        return volumeParentDir.toRealPath().resolve(volumePath().getFileName()).toUri().toString() + File.separator;
+    }
+
+    Path volumeScript() {
+        return env.configDir().resolve(pkg.app().name() + "-dmg-setup.scpt");
+    }
+
+    Path volumeBackground() {
+        return env.configDir().resolve(pkg.app().name() + "-background.tiff");
+    }
+
+    Path volumeIcon() {
+        return env.configDir().resolve(pkg.app().name() + "-volume.icns");
+    }
+
+    Path licenseFile() {
+        return env.configDir().resolve(pkg.app().name() + "-license.plist");
+    }
+
+    Path protoDmg() {
+        return dmgWorkdir().resolve("proto.dmg");
+    }
+
+    Path protoCopyDmg() {
+        return dmgWorkdir().resolve("proto-copy.dmg");
+    }
+
+    Path bgImageFileInMountedDmg() {
+        return volumePath().resolve(".background/background.tiff");
+    }
+
+    private Path dmgWorkdir() {
+        return env.buildRoot().resolve("dmg-workdir");
+    }
+
+    private void copyDmgContent() throws IOException {
+        final var srcFolder = env.appImageDir();
+        for (Path path : pkg.content()) {
+            FileUtils.copyRecursive(path, srcFolder.resolve(path.getFileName()));
+        }
+    }
+
+    private void prepareDMGSetupScript() throws IOException {
+        Path dmgSetup = volumeScript();
+        Log.verbose(MessageFormat.format(
+                I18N.getString("message.preparing-dmg-setup"),
+                dmgSetup.toAbsolutePath().toString()));
+
+        // Prepare DMG setup script
+        Map<String, String> data = new HashMap<>();
+
+        // We need to use URL for DMG to find it. We cannot use volume name, since
+        // user might have open DMG with same volume name already.
+        data.put("DEPLOY_VOLUME_URL", createVolumeUrlLocation());
+
+        // Full path to background image, so we can find it.
+        data.put("DEPLOY_BG_FILE", bgImageFileInMountedDmg().toAbsolutePath().toString());
+
+        data.put("DEPLOY_VOLUME_PATH", volumePath().toAbsolutePath().toString());
+        data.put("DEPLOY_APPLICATION_NAME", pkg.app().name());
+
+        String targetItem = pkg.relativeInstallDir().getFileName().toString();
+        data.put("DEPLOY_TARGET", targetItem);
+
+        data.put("DEPLOY_INSTALL_LOCATION", pkg.installDir().getParent().toString());
+
+        // "DEPLOY_INSTALL_LOCATION_DISPLAY_NAME" is the label for the default destination directory
+        // for DMG bundle on the right side from the "copy" arrow in the dialog
+        // that pops up when user clicks on a .dmg file.
+        data.put("DEPLOY_INSTALL_LOCATION_DISPLAY_NAME", getInstallDirDisplayName());
+
+        env.createResource(DEFAULT_DMG_SETUP_SCRIPT)
+                .setCategory(I18N.getString("resource.dmg-setup-script"))
+                .setSubstitutionData(data)
+                .saveToFile(dmgSetup);
+    }
+
+    private void prepareLicense() throws IOException {
+        final var licFile = pkg.licenseFile();
+        if (licFile.isEmpty()) {
+            return;
+        }
+
+        byte[] licenseContentOriginal =
+                Files.readAllBytes(licFile.orElseThrow());
+        String licenseInBase64 =
+                Base64.getEncoder().encodeToString(licenseContentOriginal);
+
+        Map<String, String> data = new HashMap<>();
+        data.put("APPLICATION_LICENSE_TEXT", licenseInBase64);
+
+        env.createResource(DEFAULT_LICENSE_PLIST)
+                .setCategory(I18N.getString("resource.license-setup"))
+                .setSubstitutionData(data)
+                .saveToFile(licenseFile());
+    }
+
+    private void prepareConfigFiles() throws IOException {
+
+        env.createResource(DEFAULT_BACKGROUND_IMAGE)
+                    .setCategory(I18N.getString("resource.dmg-background"))
+                    .saveToFile(volumeBackground());
+
+        env.createResource(TEMPLATE_BUNDLE_ICON)
+                .setCategory(I18N.getString("resource.volume-icon"))
+                .setExternal(pkg.icon().orElse(null))
+                .saveToFile(volumeIcon());
+
+        prepareLicense();
+
+        prepareDMGSetupScript();
+    }
+
+    private String getInstallDirDisplayName() {
+        final var defaultInstallDir = new PackageBuilder(pkg.app(), pkg.type()).defaultInstallDir().orElseThrow();
+        if (defaultInstallDir.equals(pkg.installDir())) {
+            // Return "Applications" for "/Applications/foo.app"
+            return defaultInstallDir.getParent().getFileName().toString();
+        } else {
+            return pkg.installDir().getParent().toString();
+        }
+    }
+
+    private void buildDMG() throws IOException {
+        boolean copyAppImage = false;
+
+        Path protoDMG = protoDmg();
+        Path finalDMG = outputDir.resolve(pkg.packageFileNameWithSuffix());
+
+        Path srcFolder = env.appImageDir();
+
+        Log.verbose(MessageFormat.format(I18N.getString(
+                "message.creating-dmg-file"), finalDMG.toAbsolutePath()));
+
+        try {
+            Files.deleteIfExists(finalDMG);
+        } catch (IOException ex) {
+            throw new IOException(MessageFormat.format(I18N.getString(
+                    "message.dmg-cannot-be-overwritten"),
+                    finalDMG.toAbsolutePath()));
+        }
+
+        Files.createDirectories(protoDMG.getParent());
+        Files.createDirectories(finalDMG.getParent());
+
+        String hdiUtilVerbosityFlag = env.verbose() ?
+                "-verbose" : "-quiet";
+
+        // create temp image
+        ProcessBuilder pb = new ProcessBuilder(
+                hdiutil.toString(),
+                "create",
+                hdiUtilVerbosityFlag,
+                "-srcfolder", normalizedAbsolutePathString(srcFolder),
+                "-volname", volumeName(),
+                "-ov", normalizedAbsolutePathString(protoDMG),
+                "-fs", "HFS+",
+                "-format", "UDRW");
+        try {
+            IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+        } catch (IOException ex) {
+            Log.verbose(ex); // Log exception
+
+            // Creating DMG from entire app image failed, so lets try to create empty
+            // DMG and copy files manually. See JDK-8248059.
+            copyAppImage = true;
+
+            long size = new PathGroup(Map.of(new Object(), srcFolder)).sizeInBytes();
+            size += 50 * 1024 * 1024; // Add extra 50 megabytes. Actually DMG size will
+            // not be bigger, but it will able to hold additional 50 megabytes of data.
+            // We need extra room for icons and background image. When we providing
+            // actual files to hdiutil, it will create DMG with ~50 megabytes extra room.
+            pb = new ProcessBuilder(
+                hdiutil.toString(),
+                "create",
+                hdiUtilVerbosityFlag,
+                "-size", String.valueOf(size),
+                "-volname", volumeName(),
+                "-ov", normalizedAbsolutePathString(protoDMG),
+                "-fs", "HFS+");
+            new RetryExecutor()
+                .setMaxAttemptsCount(10)
+                .setAttemptTimeoutMillis(3000)
+                .setWriteOutputToFile(true)
+                .execute(pb);
+        }
+
+        // mount temp image
+        pb = new ProcessBuilder(
+                hdiutil.toString(),
+                "attach",
+                normalizedAbsolutePathString(protoDMG),
+                hdiUtilVerbosityFlag,
+                "-mountroot", protoDMG.getParent().toString());
+        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+
+        final Path mountedVolume = volumePath();
+
+        // Copy app image, since we did not create DMG with it, but instead we created
+        // empty one.
+        if (copyAppImage) {
+            FileUtils.copyRecursive(srcFolder, mountedVolume);
+        }
+
+        try {
+            // background image
+            final var bgImageFile = bgImageFileInMountedDmg();
+            Files.createDirectories(bgImageFile.getParent());
+            IOUtils.copyFile(volumeBackground(), bgImageFile);
+
+            // We will not consider setting background image and creating link
+            // to install-dir in DMG as critical error, since it can fail in
+            // headless environment.
+            try {
+                pb = new ProcessBuilder("/usr/bin/osascript",
+                        normalizedAbsolutePathString(volumeScript()));
+                IOUtils.exec(pb, 180); // Wait 3 minutes. See JDK-8248248.
+            } catch (IOException ex) {
+                Log.verbose(ex);
+            }
+
+            // volume icon
+            Path volumeIconFile = mountedVolume.resolve(".VolumeIcon.icns");
+            IOUtils.copyFile(volumeIcon(), volumeIconFile);
+
+            // Indicate that we want a custom icon
+            // NB: attributes of the root directory are ignored
+            // when creating the volume
+            // Therefore we have to do this after we mount image
+            if (setFileUtility.isPresent()) {
+                //can not find utility => keep going without icon
+                try {
+                    volumeIconFile.toFile().setWritable(true);
+                    // The "creator" attribute on a file is a legacy attribute
+                    // but it seems Finder excepts these bytes to be
+                    // "icnC" for the volume icon
+                    // (might not work on Mac 10.13 with old XCode)
+                    pb = new ProcessBuilder(
+                            setFileUtility.orElseThrow().toString(),
+                            "-c", "icnC",
+                            normalizedAbsolutePathString(volumeIconFile));
+                    IOUtils.exec(pb);
+                    volumeIconFile.toFile().setReadOnly();
+
+                    pb = new ProcessBuilder(
+                            setFileUtility.orElseThrow().toString(),
+                            "-a", "C",
+                            normalizedAbsolutePathString(mountedVolume));
+                    IOUtils.exec(pb);
+                } catch (IOException ex) {
+                    Log.error(ex.getMessage());
+                    Log.verbose("Cannot enable custom icon using SetFile utility");
+                }
+            } else {
+                Log.verbose(I18N.getString("message.setfile.dmg"));
+            }
+
+        } finally {
+            // Detach the temporary image
+            pb = new ProcessBuilder(
+                    hdiutil.toString(),
+                    "detach",
+                    hdiUtilVerbosityFlag,
+                    normalizedAbsolutePathString(mountedVolume));
+            // "hdiutil detach" might not work right away due to resource busy error, so
+            // repeat detach several times.
+            RetryExecutor retryExecutor = new RetryExecutor();
+            // Image can get detach even if we got resource busy error, so stop
+            // trying to detach it if it is no longer attached.
+            retryExecutor.setExecutorInitializer(exec -> {
+                if (!Files.exists(mountedVolume)) {
+                    retryExecutor.abort();
+                }
+            });
+            try {
+                // 10 times with 6 second delays.
+                retryExecutor.setMaxAttemptsCount(10).setAttemptTimeoutMillis(6000)
+                        .execute(pb);
+            } catch (IOException ex) {
+                if (!retryExecutor.isAborted()) {
+                    // Now force to detach if it still attached
+                    if (Files.exists(mountedVolume)) {
+                        pb = new ProcessBuilder(
+                                hdiutil.toString(),
+                                "detach",
+                                "-force",
+                                hdiUtilVerbosityFlag,
+                                normalizedAbsolutePathString(mountedVolume));
+                        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+                    }
+                }
+            }
+        }
+
+        // Compress it to a new image
+        pb = new ProcessBuilder(
+                hdiutil.toString(),
+                "convert",
+                normalizedAbsolutePathString(protoDMG),
+                hdiUtilVerbosityFlag,
+                "-format", "UDZO",
+                "-o", normalizedAbsolutePathString(finalDMG));
+        try {
+            new RetryExecutor()
+                .setMaxAttemptsCount(10)
+                .setAttemptTimeoutMillis(3000)
+                .execute(pb);
+        } catch (Exception ex) {
+            // Convert might failed if something holds file. Try to convert copy.
+            Path protoCopyDMG = protoCopyDmg();
+            Files.copy(protoDMG, protoCopyDMG);
+            try {
+                pb = new ProcessBuilder(
+                        hdiutil.toString(),
+                        "convert",
+                        normalizedAbsolutePathString(protoCopyDMG),
+                        hdiUtilVerbosityFlag,
+                        "-format", "UDZO",
+                        "-o", normalizedAbsolutePathString(finalDMG));
+                IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+            } finally {
+                Files.deleteIfExists(protoCopyDMG);
+            }
+        }
+
+        //add license if needed
+        if (pkg.licenseFile().isPresent()) {
+            pb = new ProcessBuilder(
+                    hdiutil.toString(),
+                    "udifrez",
+                    normalizedAbsolutePathString(finalDMG),
+                    "-xml",
+                    normalizedAbsolutePathString(licenseFile())
+            );
+            new RetryExecutor()
+                .setMaxAttemptsCount(10)
+                .setAttemptTimeoutMillis(3000)
+                .execute(pb);
+        }
+
+        try {
+            //Delete the temporary image
+            Files.deleteIfExists(protoDMG);
+        } catch (IOException ex) {
+            // Don't care if fails
+        }
+
+        Log.verbose(MessageFormat.format(I18N.getString(
+                "message.output-to-location"),
+                pkg.app().name(), normalizedAbsolutePathString(finalDMG)));
+
+    }
+
+    // Background image name in resources
+    private static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff";
+    private static final String DEFAULT_DMG_SETUP_SCRIPT = "DMGsetup.scpt";
+    private static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
+
+    private static final String DEFAULT_LICENSE_PLIST="lic_template.plist";
+
+    private static final Path HDIUTIL = Path.of("/usr/bin/hdiutil");
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
new file mode 100644
index 00000000000..c86b3a15cbb
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.MacFileAssociation;
+import jdk.jpackage.internal.model.MacFileAssociationMixin;
+
+final class MacFileAssociationBuilder {
+
+    MacFileAssociation create(FileAssociation fa) throws ConfigException {
+        Objects.requireNonNull(fa);
+
+        final var mixin = new MacFileAssociationMixin.Stub(
+                Optional.ofNullable(cfBundleTypeName).orElse(DEFAULTS.cfBundleTypeName),
+                Optional.ofNullable(cfBundleTypeRole).orElse(DEFAULTS.cfBundleTypeRole),
+                Optional.ofNullable(lsHandlerRank).orElse(DEFAULTS.lsHandlerRank),
+                Optional.ofNullable(lsTypeIsPackage),
+                Optional.ofNullable(nsDocumentClass),
+                Optional.ofNullable(nsPersistentStoreTypeKey),
+                Optional.ofNullable(lsSupportsOpeningDocumentsInPlace),
+                Optional.ofNullable(uiSupportsDocumentBrowser),
+                Optional.ofNullable(utTypeConformsTo).orElse(DEFAULTS.utTypeConformsTo),
+                Optional.ofNullable(nsExportableTypes).orElse(DEFAULTS.nsExportableTypes));
+
+        return MacFileAssociation.create(fa, mixin);
+    }
+
+    MacFileAssociationBuilder cfBundleTypeName(String v) {
+        cfBundleTypeName = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder cfBundleTypeRole(String v) {
+        cfBundleTypeRole = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder lsHandlerRank(String v) {
+        lsHandlerRank = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder lsTypeIsPackage(boolean v) {
+        lsTypeIsPackage = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder nsDocumentClass(String v) {
+        nsDocumentClass = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder nsPersistentStoreTypeKey(String v) {
+        nsPersistentStoreTypeKey = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder lsSupportsOpeningDocumentsInPlace(boolean v) {
+        lsSupportsOpeningDocumentsInPlace = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder uiSupportsDocumentBrowser(boolean v) {
+        uiSupportsDocumentBrowser = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder utTypeConformsTo(List<String> v) {
+        utTypeConformsTo = v;
+        return this;
+    }
+
+    MacFileAssociationBuilder nsExportableTypes(List<String> v) {
+        nsExportableTypes = v;
+        return this;
+    }
+
+    private String cfBundleTypeName;
+    private String cfBundleTypeRole;
+    private String lsHandlerRank;
+    private String nsDocumentClass;
+    private String nsPersistentStoreTypeKey;
+    private Boolean lsTypeIsPackage;
+    private Boolean lsSupportsOpeningDocumentsInPlace;
+    private Boolean uiSupportsDocumentBrowser;
+    private List<String> utTypeConformsTo;
+    private List<String> nsExportableTypes;
+
+    private static final MacFileAssociationBuilder DEFAULTS = new MacFileAssociationBuilder()
+            .lsHandlerRank("Owner")
+            .cfBundleTypeRole("Editor")
+            .cfBundleTypeName("")
+            .utTypeConformsTo(List.of("public.data"))
+            .nsExportableTypes(List.of());
+
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
new file mode 100644
index 00000000000..c13b9d939df
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
@@ -0,0 +1,364 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.BundlerParamInfo.createBooleanBundlerParam;
+import static jdk.jpackage.internal.BundlerParamInfo.createPathBundlerParam;
+import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
+import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
+import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
+import static jdk.jpackage.internal.FromParams.createPackageBuilder;
+import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
+import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.StandardBundlerParam.DMG_CONTENT;
+import static jdk.jpackage.internal.StandardBundlerParam.ICON;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
+import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
+import static jdk.jpackage.internal.model.MacPackage.RUNTIME_PACKAGE_LAYOUT;
+import static jdk.jpackage.internal.model.StandardPackageType.MAC_DMG;
+import static jdk.jpackage.internal.model.StandardPackageType.MAC_PKG;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.function.Predicate;
+import jdk.jpackage.internal.ApplicationBuilder.MainLauncherStartupInfo;
+import jdk.jpackage.internal.SigningIdentityBuilder.ExpiredCertificateException;
+import jdk.jpackage.internal.SigningIdentityBuilder.StandardCertificateSelector;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.MacApplication;
+import jdk.jpackage.internal.model.MacDmgPackage;
+import jdk.jpackage.internal.model.MacFileAssociation;
+import jdk.jpackage.internal.model.MacLauncher;
+import jdk.jpackage.internal.model.MacPkgPackage;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+
+final class MacFromParams {
+
+    private static MacApplication createMacApplication(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var predefinedRuntimeLayout = PREDEFINED_RUNTIME_IMAGE.findIn(params).map(predefinedRuntimeImage -> {
+            if (Files.isDirectory(RUNTIME_PACKAGE_LAYOUT.resolveAt(predefinedRuntimeImage).runtimeDirectory())) {
+                return RUNTIME_PACKAGE_LAYOUT;
+            } else {
+                return RuntimeLayout.DEFAULT;
+            }
+        });
+
+        final var launcherFromParams = new LauncherFromParams(Optional.of(MacFromParams::createMacFa));
+
+        final var superAppBuilder = createApplicationBuilder(params, toFunction(launcherParams -> {
+            var launcher = launcherFromParams.create(launcherParams);
+            return MacLauncher.create(launcher);
+        }), APPLICATION_LAYOUT, predefinedRuntimeLayout);
+
+        if (hasPredefinedAppImage(params)) {
+            // Set the main launcher start up info.
+            // AppImageFile assumes the main launcher start up info is available when
+            // it is constructed from Application instance.
+            // This happens when jpackage signs predefined app image.
+            final var mainLauncherStartupInfo = new MainLauncherStartupInfo(PREDEFINED_APP_IMAGE_FILE.fetchFrom(params).getMainClass());
+            final var launchers = superAppBuilder.launchers().orElseThrow();
+            final var mainLauncher = ApplicationBuilder.overrideLauncherStartupInfo(launchers.mainLauncher(), mainLauncherStartupInfo);
+            superAppBuilder.launchers(new ApplicationLaunchers(MacLauncher.create(mainLauncher), launchers.additionalLaunchers()));
+        }
+
+        final var app = superAppBuilder.create();
+
+        final var appBuilder = new MacApplicationBuilder(app);
+
+        if (hasPredefinedAppImage(params)) {
+            appBuilder.externalInfoPlistFile(PREDEFINED_APP_IMAGE.findIn(params).orElseThrow().resolve("Contents/Info.plist"));
+        }
+
+        ICON.copyInto(params, appBuilder::icon);
+        MAC_CF_BUNDLE_NAME.copyInto(params, appBuilder::bundleName);
+        MAC_CF_BUNDLE_IDENTIFIER.copyInto(params, appBuilder::bundleIdentifier);
+        APP_CATEGORY.copyInto(params, appBuilder::category);
+
+        final boolean sign;
+        final boolean appStore;
+
+        if (hasPredefinedAppImage(params) && PACKAGE_TYPE.findIn(params).filter(Predicate.isEqual("app-image")).isEmpty()) {
+            final var appImageFileExtras = new MacAppImageFileExtras(PREDEFINED_APP_IMAGE_FILE.fetchFrom(params));
+            sign = appImageFileExtras.signed();
+            appStore = appImageFileExtras.appStore();
+        } else {
+            sign = SIGN_BUNDLE.findIn(params).orElse(false);
+            appStore = APP_STORE.findIn(params).orElse(false);
+        }
+
+        appBuilder.appStore(appStore);
+
+        if (sign) {
+            final var signingIdentityBuilder = createSigningIdentityBuilder(params);
+            APP_IMAGE_SIGN_IDENTITY.copyInto(params, signingIdentityBuilder::signingIdentity);
+            SIGNING_KEY_USER.findIn(params).ifPresent(userName -> {
+                final StandardCertificateSelector domain;
+                if (appStore) {
+                    domain = StandardCertificateSelector.APP_STORE_APP_IMAGE;
+                } else {
+                    domain = StandardCertificateSelector.APP_IMAGE;
+                }
+
+                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+            });
+
+            final var signingBuilder = new AppImageSigningConfigBuilder(signingIdentityBuilder);
+            if (appStore) {
+                signingBuilder.entitlementsResourceName("sandbox.plist");
+            }
+
+            app.mainLauncher().flatMap(Launcher::startupInfo).ifPresent(signingBuilder::signingIdentifierPrefix);
+            SIGN_IDENTIFIER_PREFIX.copyInto(params, signingBuilder::signingIdentifierPrefix);
+
+            ENTITLEMENTS.copyInto(params, signingBuilder::entitlements);
+
+            appBuilder.signingBuilder(signingBuilder);
+        }
+
+        return appBuilder.create();
+    }
+
+    private static MacPackageBuilder createMacPackageBuilder(
+            Map<String, ? super Object> params, MacApplication app,
+            PackageType type) throws ConfigException {
+        final var builder = new MacPackageBuilder(createPackageBuilder(params, app, type));
+
+        PREDEFINED_APP_IMAGE_FILE.findIn(params)
+                .map(MacAppImageFileExtras::new)
+                .map(MacAppImageFileExtras::signed)
+                .ifPresent(builder::predefinedAppImageSigned);
+
+        return builder;
+    }
+
+    private static MacDmgPackage createMacDmgPackage(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var app = APPLICATION.fetchFrom(params);
+
+        final var superPkgBuilder = createMacPackageBuilder(params, app, MAC_DMG);
+
+        final var pkgBuilder = new MacDmgPackageBuilder(superPkgBuilder);
+
+        DMG_CONTENT.copyInto(params, pkgBuilder::dmgContent);
+
+        return pkgBuilder.create();
+    }
+
+    private record WithExpiredCertificateException<T>(Optional<T> obj, Optional<ExpiredCertificateException> certEx) {
+        WithExpiredCertificateException {
+            if (obj.isEmpty() == certEx.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        static <U> WithExpiredCertificateException<U> of(Callable<U> callable) {
+            try {
+                return new WithExpiredCertificateException<>(Optional.of(callable.call()), Optional.empty());
+            } catch (ExpiredCertificateException ex) {
+                return new WithExpiredCertificateException<>(Optional.empty(), Optional.of(ex));
+            } catch (ExceptionBox ex) {
+                if (ex.getCause() instanceof ExpiredCertificateException certEx) {
+                    return new WithExpiredCertificateException<>(Optional.empty(), Optional.of(certEx));
+                }
+                throw ex;
+            } catch (RuntimeException ex) {
+                throw ex;
+            } catch (Throwable t) {
+                throw ExceptionBox.rethrowUnchecked(t);
+            }
+        }
+    }
+
+    private static MacPkgPackage createMacPkgPackage(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        // This is over complicated to make "MacSignTest.testExpiredCertificate" test pass.
+
+        final boolean sign = SIGN_BUNDLE.findIn(params).orElse(false);
+        final boolean appStore = APP_STORE.findIn(params).orElse(false);
+
+        final var appOrExpiredCertEx = WithExpiredCertificateException.of(() -> {
+            return APPLICATION.fetchFrom(params);
+        });
+
+        final Optional<MacPkgPackageBuilder> pkgBuilder;
+        if (appOrExpiredCertEx.obj().isPresent()) {
+            final var superPkgBuilder = createMacPackageBuilder(params, appOrExpiredCertEx.obj().orElseThrow(), MAC_PKG);
+            pkgBuilder = Optional.of(new MacPkgPackageBuilder(superPkgBuilder));
+        } else {
+            pkgBuilder = Optional.empty();
+        }
+
+        if (sign) {
+            final var signingIdentityBuilder = createSigningIdentityBuilder(params);
+            INSTALLER_SIGN_IDENTITY.copyInto(params, signingIdentityBuilder::signingIdentity);
+            SIGNING_KEY_USER.findIn(params).ifPresent(userName -> {
+                final StandardCertificateSelector domain;
+                if (appStore) {
+                    domain = StandardCertificateSelector.APP_STORE_PKG_INSTALLER;
+                } else {
+                    domain = StandardCertificateSelector.PKG_INSTALLER;
+                }
+
+                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+            });
+
+            if (pkgBuilder.isPresent()) {
+                pkgBuilder.orElseThrow().signingBuilder(signingIdentityBuilder);
+            } else {
+                final var expiredPkgCert = WithExpiredCertificateException.of(() -> {
+                    return signingIdentityBuilder.create();
+                }).certEx();
+                expiredPkgCert.map(ConfigException::getMessage).ifPresent(Log::error);
+                throw appOrExpiredCertEx.certEx().orElseThrow();
+            }
+        }
+
+        return pkgBuilder.orElseThrow().create();
+    }
+
+    private static SigningIdentityBuilder createSigningIdentityBuilder(Map<String, ? super Object> params) {
+        final var builder = new SigningIdentityBuilder();
+        SIGNING_KEYCHAIN.copyInto(params, builder::keychain);
+        return builder;
+    }
+
+    private static MacFileAssociation createMacFa(FileAssociation fa, Map<String, ? super Object> params) {
+
+        final var builder = new MacFileAssociationBuilder();
+
+        FA_MAC_CFBUNDLETYPEROLE.copyInto(params, builder::cfBundleTypeRole);
+        FA_MAC_LSHANDLERRANK.copyInto(params, builder::lsHandlerRank);
+        FA_MAC_NSSTORETYPEKEY.copyInto(params, builder::nsPersistentStoreTypeKey);
+        FA_MAC_NSDOCUMENTCLASS.copyInto(params, builder::nsDocumentClass);
+        FA_MAC_LSTYPEISPACKAGE.copyInto(params, builder::lsTypeIsPackage);
+        FA_MAC_LSDOCINPLACE.copyInto(params, builder::lsSupportsOpeningDocumentsInPlace);
+        FA_MAC_UIDOCBROWSER.copyInto(params, builder::uiSupportsDocumentBrowser);
+        FA_MAC_NSEXPORTABLETYPES.copyInto(params, builder::nsExportableTypes);
+        FA_MAC_UTTYPECONFORMSTO.copyInto(params, builder::utTypeConformsTo);
+
+        return toFunction(builder::create).apply(fa);
+    }
+
+    static final BundlerParamInfo<MacApplication> APPLICATION = createApplicationBundlerParam(
+            MacFromParams::createMacApplication);
+
+    static final BundlerParamInfo<MacDmgPackage> DMG_PACKAGE = createPackageBundlerParam(
+            MacFromParams::createMacDmgPackage);
+
+    static final BundlerParamInfo<MacPkgPackage> PKG_PACKAGE = createPackageBundlerParam(
+            MacFromParams::createMacPkgPackage);
+
+    private static final BundlerParamInfo<String> MAC_CF_BUNDLE_NAME = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_BUNDLE_NAME.getId());
+
+    private static final BundlerParamInfo<String> APP_CATEGORY = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_CATEGORY.getId());
+
+    private static final BundlerParamInfo<Path> ENTITLEMENTS = createPathBundlerParam(
+            Arguments.CLIOptions.MAC_ENTITLEMENTS.getId());
+
+    private static final BundlerParamInfo<String> MAC_CF_BUNDLE_IDENTIFIER = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_BUNDLE_IDENTIFIER.getId());
+
+    private static final BundlerParamInfo<String> SIGN_IDENTIFIER_PREFIX = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_BUNDLE_SIGNING_PREFIX.getId());
+
+    private static final BundlerParamInfo<String> APP_IMAGE_SIGN_IDENTITY = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_APP_IMAGE_SIGN_IDENTITY.getId());
+
+    private static final BundlerParamInfo<String> INSTALLER_SIGN_IDENTITY = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getId());
+
+    private static final BundlerParamInfo<String> SIGNING_KEY_USER = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_SIGNING_KEY_NAME.getId());
+
+    private static final BundlerParamInfo<String> SIGNING_KEYCHAIN = createStringBundlerParam(
+            Arguments.CLIOptions.MAC_SIGNING_KEYCHAIN.getId());
+
+    private static final BundlerParamInfo<String> PACKAGE_TYPE = createStringBundlerParam(
+            Arguments.CLIOptions.PACKAGE_TYPE.getId());
+
+    private static final BundlerParamInfo<Boolean> APP_STORE = createBooleanBundlerParam(
+            Arguments.CLIOptions.MAC_APP_STORE.getId());
+
+    private static final BundlerParamInfo<String> FA_MAC_CFBUNDLETYPEROLE = createStringBundlerParam(
+            Arguments.MAC_CFBUNDLETYPEROLE);
+
+    private static final BundlerParamInfo<String> FA_MAC_LSHANDLERRANK = createStringBundlerParam(
+            Arguments.MAC_LSHANDLERRANK);
+
+    private static final BundlerParamInfo<String> FA_MAC_NSSTORETYPEKEY = createStringBundlerParam(
+            Arguments.MAC_NSSTORETYPEKEY);
+
+    private static final BundlerParamInfo<String> FA_MAC_NSDOCUMENTCLASS = createStringBundlerParam(
+            Arguments.MAC_NSDOCUMENTCLASS);
+
+    private static final BundlerParamInfo<Boolean> FA_MAC_LSTYPEISPACKAGE = createBooleanBundlerParam(
+            Arguments.MAC_LSTYPEISPACKAGE);
+
+    private static final BundlerParamInfo<Boolean> FA_MAC_LSDOCINPLACE = createBooleanBundlerParam(
+            Arguments.MAC_LSDOCINPLACE);
+
+    private static final BundlerParamInfo<Boolean> FA_MAC_UIDOCBROWSER = createBooleanBundlerParam(
+            Arguments.MAC_UIDOCBROWSER);
+
+    @SuppressWarnings("unchecked")
+    private static final BundlerParamInfo<List<String>> FA_MAC_NSEXPORTABLETYPES =
+            new BundlerParamInfo<>(
+                    Arguments.MAC_NSEXPORTABLETYPES,
+                    (Class<List<String>>) (Object) List.class,
+                    null,
+                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
+            );
+
+    @SuppressWarnings("unchecked")
+    private static final BundlerParamInfo<List<String>> FA_MAC_UTTYPECONFORMSTO =
+            new BundlerParamInfo<>(
+                    Arguments.MAC_UTTYPECONFORMSTO,
+                    (Class<List<String>>) (Object) List.class,
+                    null,
+                    (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
+            );
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.java
index 4f069921f45..5ac221c1260 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.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
@@ -24,15 +24,10 @@
  */
 package jdk.jpackage.internal;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Predicate;
-import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.util.PathUtils;
 
 /**
@@ -40,59 +35,25 @@
  */
 public final class MacLaunchersAsServices extends UnixLaunchersAsServices {
 
-    private MacLaunchersAsServices(PlatformPackage thePackage,
-            Map<String, Object> params) throws IOException {
-        super(thePackage, List.of(), params, li -> {
-            return new Launcher(thePackage, li.getName(), params);
+    MacLaunchersAsServices(BuildEnv env, MacPackage pkg) {
+        super(env.appImageDir(), pkg.app(), List.of(), launcher -> {
+            return new MacLauncherAsService(env, pkg, launcher);
         });
     }
 
-    static ShellCustomAction create(Map<String, Object> params,
-            Path outputDir) throws IOException {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            return null;
-        }
-        return Optional.of(new MacLaunchersAsServices(new PlatformPackage() {
-            @Override
-            public String name() {
-                return MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
-            }
-
-            @Override
-            public Path sourceRoot() {
-                return outputDir;
-            }
-
-            @Override
-            public ApplicationLayout sourceApplicationLayout() {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public ApplicationLayout installedApplicationLayout() {
-                return ApplicationLayout.macAppImage().resolveAt(Path.of(
-                        MacBaseInstallerBundler.getInstallDir(params, false),
-                        APP_NAME.fetchFrom(params) + ".app"));
-            }
-        }, params)).filter(Predicate.not(MacLaunchersAsServices::isEmpty)).orElse(
-                null);
-    }
-
-    public static Path getServicePListFileName(String packageName,
+    public static Path getServicePListFileName(String bundleIdentifier,
             String launcherName) {
         String baseName = launcherName.replaceAll("[\\s]", "_");
-        return Path.of(packageName + "-" + baseName + ".plist");
+        return Path.of(bundleIdentifier + "-" + baseName + ".plist");
     }
 
-    private static class Launcher extends UnixLauncherAsService {
+    private static class MacLauncherAsService extends UnixLauncherAsService {
 
-        Launcher(PlatformPackage thePackage, String name,
-                Map<String, Object> mainParams) {
-            super(name, mainParams, createResource("launchd.plist.template",
-                    mainParams).setCategory(I18N.getString(
-                            "resource.launchd-plist-file")));
+        MacLauncherAsService(BuildEnv env, MacPackage pkg, Launcher launcher) {
+            super(pkg.app(), launcher, env.createResource("launchd.plist.template").setCategory(I18N
+                    .getString("resource.launchd-plist-file")));
 
-            plistFilename = getServicePListFileName(thePackage.name(), getName());
+            plistFilename = getServicePListFileName(pkg.app().bundleIdentifier(), getName());
 
             // It is recommended to set value of "label" property in launchd
             // .plist file equal to the name of this .plist file without the suffix.
@@ -102,8 +63,7 @@ private static class Launcher extends UnixLauncherAsService {
                     .setPublicName(plistFilename)
                     .addSubstitutionDataEntry("LABEL", label)
                     .addSubstitutionDataEntry("APPLICATION_LAUNCHER",
-                            thePackage.installedApplicationLayout().launchersDirectory().resolve(
-                                    getName()).toString());
+                            pkg.asInstalledPackageApplicationLayout().orElseThrow().launchersDirectory().resolve(getName()).toString());
         }
 
         @Override
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
new file mode 100644
index 00000000000..a16194a6260
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.util.Objects;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MacPackage;
+import jdk.jpackage.internal.model.MacPackageMixin;
+
+final class MacPackageBuilder {
+
+    MacPackageBuilder(PackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    MacPackageBuilder predefinedAppImageSigned(boolean  v) {
+        predefinedAppImageSigned = v;
+        return this;
+    }
+
+    PackageBuilder pkgBuilder() {
+        return pkgBuilder;
+    }
+
+    MacPackage create() throws ConfigException {
+        final var pkg = pkgBuilder.create();
+        return MacPackage.create(pkg, new MacPackageMixin.Stub(pkg.predefinedAppImage().map(v -> predefinedAppImageSigned)));
+    }
+
+    private final PackageBuilder pkgBuilder;
+    private boolean predefinedAppImageSigned;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
new file mode 100644
index 00000000000..eea69825a49
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
@@ -0,0 +1,460 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.ApplicationImageUtils.createWriteAppImageFileAction;
+import static jdk.jpackage.internal.util.PListWriter.writeArray;
+import static jdk.jpackage.internal.util.PListWriter.writeBoolean;
+import static jdk.jpackage.internal.util.PListWriter.writeBooleanOptional;
+import static jdk.jpackage.internal.util.PListWriter.writeDict;
+import static jdk.jpackage.internal.util.PListWriter.writeKey;
+import static jdk.jpackage.internal.util.PListWriter.writeString;
+import static jdk.jpackage.internal.util.PListWriter.writeStringArray;
+import static jdk.jpackage.internal.util.PListWriter.writeStringOptional;
+import static jdk.jpackage.internal.util.XmlUtils.toXmlConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingBiConsumer.toBiConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
+import jdk.jpackage.internal.PackagingPipeline.ApplicationImageTaskAction;
+import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
+import jdk.jpackage.internal.PackagingPipeline.CopyAppImageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PackageBuildEnv;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
+import jdk.jpackage.internal.PackagingPipeline.TaskAction;
+import jdk.jpackage.internal.PackagingPipeline.TaskContext;
+import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.AppImageSigningConfig;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.MacApplication;
+import jdk.jpackage.internal.model.MacFileAssociation;
+import jdk.jpackage.internal.model.MacPackage;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.util.PathUtils;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
+
+final class MacPackagingPipeline {
+
+    enum MacBuildApplicationTaskID implements TaskID {
+        RUNTIME_INFO_PLIST,
+        COPY_JLILIB,
+        APP_ICON,
+        PKG_INFO_FILE,
+        FA_ICONS,
+        APP_INFO_PLIST,
+        PACKAGE_FILE,
+        SIGN
+    }
+
+    enum MacCopyAppImageTaskID implements TaskID {
+        COPY_PACKAGE_FILE,
+        COPY_RUNTIME_INFO_PLIST,
+        REPLACE_APP_IMAGE_FILE,
+        COPY_SIGN
+    }
+
+    static AppImageLayout packagingLayout(Package pkg) {
+        return pkg.appImageLayout().resolveAt(pkg.relativeInstallDir().getFileName());
+    }
+
+    static PackagingPipeline.Builder build(Optional<Package> pkg) {
+        final var builder = PackagingPipeline.buildStandard()
+                .appContextMapper(appContext -> {
+                    return new TaskContextProxy(appContext, true, false);
+                })
+                .pkgContextMapper(appContext -> {
+                    final var isRuntimeInstaller = pkg.map(Package::isRuntimeInstaller).orElse(false);
+                    final var withPredefinedAppImage = pkg.flatMap(Package::predefinedAppImage).isPresent();
+                    return new TaskContextProxy(appContext, false, isRuntimeInstaller || withPredefinedAppImage);
+                })
+                .appImageLayoutForPackaging(MacPackagingPipeline::packagingLayout)
+                .task(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .packageAction(MacPackagingPipeline::runPostAppImageUserScript).add()
+                .task(CopyAppImageTaskID.COPY)
+                        .copyAction(MacPackagingPipeline::copyAppImage).add()
+                .task(MacBuildApplicationTaskID.RUNTIME_INFO_PLIST)
+                        .applicationAction(MacPackagingPipeline::writeApplicationRuntimeInfoPlist)
+                        .addDependent(BuildApplicationTaskID.CONTENT).add()
+                .task(MacBuildApplicationTaskID.COPY_JLILIB)
+                        .applicationAction(MacPackagingPipeline::copyJliLib)
+                        .addDependency(BuildApplicationTaskID.RUNTIME)
+                        .addDependent(BuildApplicationTaskID.CONTENT).add()
+                .task(MacBuildApplicationTaskID.APP_ICON)
+                        .applicationAction(new ApplicationIcon())
+                        .addDependent(BuildApplicationTaskID.CONTENT).add()
+                .task(MacBuildApplicationTaskID.PKG_INFO_FILE)
+                        .applicationAction(MacPackagingPipeline::writePkgInfoFile)
+                        .addDependent(BuildApplicationTaskID.CONTENT).add()
+                .task(MacBuildApplicationTaskID.PACKAGE_FILE)
+                        .packageAction(MacPackagingPipeline::writePackageFile)
+                        .addDependents(BuildApplicationTaskID.CONTENT).add()
+                .task(MacCopyAppImageTaskID.REPLACE_APP_IMAGE_FILE)
+                        .addDependent(PrimaryTaskID.COPY_APP_IMAGE)
+                        .noaction().add()
+                .task(MacCopyAppImageTaskID.COPY_PACKAGE_FILE)
+                        .packageAction(MacPackagingPipeline::writePackageFile)
+                        .addDependencies(CopyAppImageTaskID.COPY)
+                        .addDependents(PrimaryTaskID.COPY_APP_IMAGE).add()
+                .task(MacCopyAppImageTaskID.COPY_RUNTIME_INFO_PLIST)
+                        .addDependencies(CopyAppImageTaskID.COPY)
+                        .addDependents(PrimaryTaskID.COPY_APP_IMAGE).add()
+                .task(MacBuildApplicationTaskID.FA_ICONS)
+                        .applicationAction(MacPackagingPipeline::writeFileAssociationIcons)
+                        .addDependent(BuildApplicationTaskID.CONTENT).add()
+                .task(MacBuildApplicationTaskID.APP_INFO_PLIST)
+                        .applicationAction(MacPackagingPipeline::writeAppInfoPlist)
+                        .addDependent(BuildApplicationTaskID.CONTENT).add();
+
+        builder.task(MacBuildApplicationTaskID.SIGN)
+                .appImageAction(MacPackagingPipeline::sign)
+                .addDependencies(builder.taskGraphSnapshot().getAllTailsOf(PrimaryTaskID.BUILD_APPLICATION_IMAGE))
+                .addDependent(PrimaryTaskID.BUILD_APPLICATION_IMAGE)
+                .add();
+
+        builder.task(MacCopyAppImageTaskID.COPY_SIGN)
+                .appImageAction(MacPackagingPipeline::sign)
+                .addDependencies(builder.taskGraphSnapshot().getAllTailsOf(PrimaryTaskID.COPY_APP_IMAGE))
+                .addDependent(PrimaryTaskID.COPY_APP_IMAGE)
+                .add();
+
+        pkg.ifPresent(p -> {
+            final List<TaskID> disabledTasks = new ArrayList<>();
+
+            if (p.type() instanceof SignAppImagePackageType) {
+                // This is a phony package signing predefined app image.
+                // Don't create ".package" file.
+                // Don't copy predefined app image, update it in place.
+                // Disable running user script after app image ready.
+                // Replace ".jpackage.xml" file.
+                // Use app image layout.
+                disabledTasks.add(MacCopyAppImageTaskID.COPY_PACKAGE_FILE);
+                disabledTasks.add(CopyAppImageTaskID.COPY);
+                disabledTasks.add(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT);
+                builder.task(MacCopyAppImageTaskID.REPLACE_APP_IMAGE_FILE).applicationAction(createWriteAppImageFileAction()).add();
+                builder.appImageLayoutForPackaging(Package::appImageLayout);
+            } else if (p.isRuntimeInstaller() || ((MacPackage)p).predefinedAppImageSigned().orElse(false)) {
+                // If this is a runtime package or a signed predefined app image,
+                // don't create ".package" file and don't sign it.
+                disabledTasks.add(MacCopyAppImageTaskID.COPY_PACKAGE_FILE);
+                disabledTasks.add(MacCopyAppImageTaskID.COPY_SIGN);
+//                if (p.isRuntimeInstaller()) {
+//                    builder.task(MacCopyAppImageTaskID.COPY_RUNTIME_INFO_PLIST).packageAction(MacPackagingPipeline::writeRuntimeRuntimeInfoPlist).add();
+//                }
+            }
+
+            for (final var taskId : disabledTasks) {
+                builder.task(taskId).noaction().add();
+            }
+        });
+
+        return builder;
+    }
+
+    enum SignAppImagePackageType implements PackageType {
+        VALUE;
+    }
+
+    static Package createSignAppImagePackage(MacApplication app, BuildEnv env) {
+        if (!app.sign()) {
+            throw new IllegalArgumentException();
+        }
+        return toSupplier(() -> {
+            return new PackageBuilder(app, SignAppImagePackageType.VALUE).predefinedAppImage(
+                    Objects.requireNonNull(env.appImageDir())).installDir(Path.of("/foo")).create();
+        }).get();
+    }
+
+    private static void copyAppImage(MacPackage pkg, AppImageDesc srcAppImage,
+            AppImageDesc dstAppImage) throws IOException {
+        PackagingPipeline.copyAppImage(srcAppImage, dstAppImage, !pkg.predefinedAppImageSigned().orElse(false));
+    }
+
+    private static void copyJliLib(
+            AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+
+        final var runtimeMacOSDir = env.resolvedLayout().runtimeRootDirectory().resolve("Contents/MacOS");
+
+        final var jliName = Path.of("libjli.dylib");
+
+        try (var walk = Files.walk(env.resolvedLayout().runtimeDirectory().resolve("lib"))) {
+            final var jli = walk
+                    .filter(file -> file.getFileName().equals(jliName))
+                    .findFirst()
+                    .orElseThrow();
+            Files.createDirectories(runtimeMacOSDir);
+            Files.copy(jli, runtimeMacOSDir.resolve(jliName));
+        }
+    }
+
+    private static void runPostAppImageUserScript(PackageBuildEnv<Package, AppImageLayout> env) throws IOException {
+        PackagingPipeline.runPostAppImageUserScript(new PackageBuildEnv<>(
+                BuildEnv.withAppImageDir(env.env(), env.env().appImageDir().resolve(env.envLayout().rootDirectory())),
+                env.pkg(), env.pkg().appImageLayout(), env.outputDir()));
+    }
+
+    private static void writePackageFile(PackageBuildEnv<Package, ApplicationLayout> env) throws IOException {
+        new PackageFile(env.pkg().packageName()).save(env.resolvedLayout());
+    }
+
+    private static void writePkgInfoFile(
+            AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+
+        final var dir = env.resolvedLayout().contentDirectory();
+        Files.createDirectories(dir);
+        Files.write(dir.resolve("PkgInfo"),
+                "APPL????".getBytes(StandardCharsets.ISO_8859_1));
+    }
+
+    private static void writeRuntimeRuntimeInfoPlist(PackageBuildEnv<MacPackage, AppImageLayout> env) throws IOException {
+        writeRuntimeInfoPlist(env.pkg().app(), env.env(), env.resolvedLayout().rootDirectory());
+    }
+
+    private static void writeApplicationRuntimeInfoPlist(
+            AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+        writeRuntimeInfoPlist(env.app(), env.env(), env.resolvedLayout().runtimeRootDirectory());
+    }
+
+    private static void writeRuntimeInfoPlist(MacApplication app, BuildEnv env, Path runtimeRootDirectory) throws IOException {
+
+        Map<String, String> data = new HashMap<>();
+        data.put("CF_BUNDLE_IDENTIFIER", app.bundleIdentifier());
+        data.put("CF_BUNDLE_NAME", app.bundleName());
+        data.put("CF_BUNDLE_VERSION", app.version());
+        data.put("CF_BUNDLE_SHORT_VERSION_STRING", app.shortVersion().toString());
+
+        env.createResource("Runtime-Info.plist.template")
+                .setPublicName("Runtime-Info.plist")
+                .setCategory(I18N.getString("resource.runtime-info-plist"))
+                .setSubstitutionData(data)
+                .saveToFile(runtimeRootDirectory.resolve("Contents/Info.plist"));
+    }
+
+    private static void writeAppInfoPlist(
+            AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+
+        final var app = env.app();
+
+        final var infoPlistFile = env.resolvedLayout().contentDirectory().resolve("Info.plist");
+
+        Log.verbose(I18N.format("message.preparing-info-plist", PathUtils.normalizedAbsolutePathString(infoPlistFile)));
+
+        final String faXml = toSupplier(() -> {
+            var buf = new StringWriter();
+            var xml = XMLOutputFactory.newInstance().createXMLStreamWriter(buf);
+            writeCFBundleDocumentTypes(xml, app);
+            writeUTExportedTypeDeclarations(xml, app);
+            xml.flush();
+            xml.close();
+            return buf.toString();
+        }).get();
+
+        Map<String, String> data = new HashMap<>();
+        data.put("DEPLOY_ICON_FILE", ApplicationIcon.getPath(app, env.resolvedLayout()).getFileName().toString());
+        data.put("DEPLOY_BUNDLE_COPYRIGHT", app.copyright());
+        data.put("DEPLOY_LAUNCHER_NAME", app.mainLauncher().orElseThrow().executableNameWithSuffix());
+        data.put("DEPLOY_BUNDLE_SHORT_VERSION", app.shortVersion().toString());
+        data.put("DEPLOY_BUNDLE_CFBUNDLE_VERSION", app.version());
+        data.put("DEPLOY_BUNDLE_NAME", app.bundleName());
+        data.put("DEPLOY_BUNDLE_IDENTIFIER", app.bundleIdentifier());
+        data.put("DEPLOY_APP_CATEGORY", app.category());
+        data.put("DEPLOY_FILE_ASSOCIATIONS", faXml);
+
+        env.env().createResource("Info-lite.plist.template")
+                .setCategory(I18N.getString("resource.app-info-plist"))
+                .setSubstitutionData(data)
+                .setPublicName("Info.plist")
+                .saveToFile(infoPlistFile);
+    }
+
+    private static void sign(AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+
+        final var app = env.app();
+
+        final var codesignConfigBuilder = CodesignConfig.build();
+        app.signingConfig().ifPresent(codesignConfigBuilder::from);
+
+        if (app.sign() && app.signingConfig().flatMap(AppImageSigningConfig::entitlements).isEmpty()) {
+            final var entitlementsDefaultResource = app.signingConfig().map(
+                    AppImageSigningConfig::entitlementsResourceName).orElseThrow();
+
+            final var entitlementsFile = env.env().configDir().resolve(app.name() + ".entitlements");
+
+            env.env().createResource(entitlementsDefaultResource)
+                    .setCategory(I18N.getString("resource.entitlements"))
+                    .saveToFile(entitlementsFile);
+
+            codesignConfigBuilder.entitlements(entitlementsFile);
+        }
+
+        final Runnable signAction = () -> {
+            final var appImageDir = env.resolvedLayout().rootDirectory();
+            AppImageSigner.createSigner(app, codesignConfigBuilder.create()).accept(appImageDir);
+        };
+
+        app.signingConfig().flatMap(AppImageSigningConfig::keychain).map(Keychain::new).ifPresentOrElse(keychain -> {
+            toBiConsumer(TempKeychain::withKeychain).accept(unused -> signAction.run(), keychain);
+        }, signAction);
+    }
+
+    private static void writeCFBundleDocumentTypes(XMLStreamWriter xml,
+            MacApplication app) throws XMLStreamException, IOException {
+        final var fas = app.fileAssociations().toList();
+        if (!fas.isEmpty()) {
+            writeKey(xml, "CFBundleDocumentTypes");
+            writeArray(xml, toXmlConsumer(() -> {
+                for (var fa : fas) {
+                    writeDict(xml, toXmlConsumer(() -> {
+                        addFaToCFBundleDocumentTypes(xml, app, (MacFileAssociation) fa);
+                    }));
+                }
+            }));
+        }
+    }
+
+    private static void writeUTExportedTypeDeclarations(XMLStreamWriter xml,
+            MacApplication app) throws XMLStreamException, IOException {
+        final var fas = app.fileAssociations().toList();
+        if (!fas.isEmpty()) {
+            writeKey(xml, "UTExportedTypeDeclarations");
+            writeArray(xml, toXmlConsumer(() -> {
+                for (var fa : fas) {
+                    writeDict(xml, toXmlConsumer(() -> {
+                        addFaToUTExportedTypeDeclarations(xml, app, (MacFileAssociation) fa);
+                    }));
+                }
+            }));
+        }
+    }
+
+    private static String faContentType(MacApplication app, MacFileAssociation fa) {
+        return String.format("%s.%s", app.bundleIdentifier(), fa.extension());
+    }
+
+    private static void faWriteIcon(XMLStreamWriter xml, String key, FileAssociation fa)
+            throws XMLStreamException {
+        fa.icon().ifPresent(ThrowingConsumer.toConsumer(icon -> {
+            writeString(xml, key, icon.getFileName());
+        }));
+    }
+
+    private static void addFaToCFBundleDocumentTypes(XMLStreamWriter xml,
+            MacApplication app, MacFileAssociation fa) throws XMLStreamException, IOException {
+
+        writeStringArray(xml, "LSItemContentTypes", List.of(faContentType(app, fa)));
+        writeStringOptional(xml, "CFBundleTypeName", fa.description());
+        writeString(xml, "LSHandlerRank", fa.lsHandlerRank());
+        writeString(xml, "CFBundleTypeRole", fa.cfBundleTypeRole());
+        writeStringOptional(xml, "NSPersistentStoreTypeKey", fa.nsPersistentStoreTypeKey());
+        writeStringOptional(xml, "NSDocumentClass", fa.nsDocumentClass());
+        writeBoolean(xml, "LSIsAppleDefaultForType", true);
+        writeBooleanOptional(xml, "LSTypeIsPackage", fa.lsTypeIsPackage());
+        writeBooleanOptional(xml, "LSSupportsOpeningDocumentsInPlace", fa.lsSupportsOpeningDocumentsInPlace());
+        writeBooleanOptional(xml, "UISupportsDocumentBrowser", fa.uiSupportsDocumentBrowser());
+        faWriteIcon(xml, "CFBundleTypeIconFile", fa);
+    }
+
+    private static void addFaToUTExportedTypeDeclarations(XMLStreamWriter xml,
+            MacApplication app, MacFileAssociation fa) throws XMLStreamException, IOException {
+        writeString(xml, "UTTypeIdentifier", faContentType(app, fa));
+        writeStringOptional(xml, "UTTypeDescription", fa.description());
+        writeStringArray(xml, "UTTypeConformsTo", fa.utTypeConformsTo());
+        faWriteIcon(xml, "UTTypeIconFile", fa);
+
+        writeKey(xml, "UTTypeTagSpecification");
+        writeDict(xml, toXmlConsumer(() -> {
+            writeStringArray(xml, "public.filename-extension", List.of(fa.extension()));
+            writeStringArray(xml, "public.mime-type", List.of(fa.mimeType()));
+            writeStringArray(xml, "NSExportableTypes", fa.nsExportableTypes());
+        }));
+    }
+
+    private static class ApplicationIcon implements ApplicationImageTaskAction<MacApplication, MacApplicationLayout> {
+        static Path getPath(Application app, ApplicationLayout appLayout) {
+            return appLayout.desktopIntegrationDirectory().resolve(app.name() + ".icns");
+        }
+
+        @Override
+        public void execute(AppImageBuildEnv<MacApplication, MacApplicationLayout> env)
+                throws IOException {
+            final var resource = env.env().createResource("JavaApp.icns").setCategory("icon");
+
+            env.app().icon().ifPresent(resource::setExternal);
+
+            resource.saveToFile(getPath(env.app(), env.resolvedLayout()));
+        }
+    }
+
+    private static void writeFileAssociationIcons(AppImageBuildEnv<MacApplication, MacApplicationLayout> env) throws IOException {
+        for (var faIcon : env.app().fileAssociations()
+                .filter(FileAssociation::hasIcon)
+                .map(FileAssociation::icon)
+                .map(Optional::get).toList()) {
+            Files.copy(faIcon, env.resolvedLayout().desktopIntegrationDirectory().resolve(faIcon.getFileName()));
+        }
+    }
+
+    private record TaskContextProxy(TaskContext delegate, boolean forApp, boolean copyAppImage) implements TaskContext {
+
+        @Override
+        public boolean test(TaskID taskID) {
+            if (!delegate.test(taskID)) {
+                return false;
+            } else if (taskID == MacBuildApplicationTaskID.PACKAGE_FILE) {
+                // Don't create files relevant for package bundling when bundling app image
+                return !forApp;
+            } else {
+                return true;
+            }
+        }
+
+        @Override
+        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+            delegate.execute(taskAction);
+        }
+    }
+
+    static final MacApplicationLayout APPLICATION_LAYOUT = MacApplicationLayout.create(
+            ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT, Path.of("Contents/runtime"));
+}
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 ecd9a94e6c0..f785cc49f67 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
@@ -25,678 +25,14 @@
 
 package jdk.jpackage.internal;
 
-import jdk.internal.util.Architecture;
-import jdk.internal.util.OSVersion;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.ResourceBundle;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import static jdk.jpackage.internal.MacAppBundler.APP_IMAGE_SIGN_IDENTITY;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
-import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.FileUtils;
-import jdk.jpackage.internal.util.XmlUtils;
 
 public class MacPkgBundler extends MacBaseInstallerBundler {
 
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MacResources");
-
-    private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png";
-    private static final String DEFAULT_PDF = "product-def.plist";
-
-    private static final BundlerParamInfo<Path> PACKAGES_ROOT =
-            new StandardBundlerParam<>(
-            "mac.pkg.packagesRoot",
-            Path.class,
-            params -> {
-                Path packagesRoot =
-                        TEMP_ROOT.fetchFrom(params).resolve("packages");
-                try {
-                    Files.createDirectories(packagesRoot);
-                } catch (IOException ioe) {
-                    return null;
-                }
-                return packagesRoot;
-            },
-            (s, p) -> Path.of(s));
-
-
-    protected final BundlerParamInfo<Path> SCRIPTS_DIR =
-            new StandardBundlerParam<>(
-            "mac.pkg.scriptsDir",
-            Path.class,
-            params -> {
-                Path scriptsDir =
-                        CONFIG_ROOT.fetchFrom(params).resolve("scripts");
-                try {
-                    Files.createDirectories(scriptsDir);
-                } catch (IOException ioe) {
-                    return null;
-                }
-                return scriptsDir;
-            },
-            (s, p) -> Path.of(s));
-
-    public static final
-            BundlerParamInfo<String> DEVELOPER_ID_INSTALLER_SIGNING_KEY =
-            new StandardBundlerParam<>(
-            "mac.signing-key-developer-id-installer",
-            String.class,
-            params -> {
-                    String user = SIGNING_KEY_USER.fetchFrom(params);
-                    String keychain = SIGNING_KEYCHAIN.fetchFrom(params);
-                    String result = null;
-                    if (APP_STORE.fetchFrom(params)) {
-                        result = MacCertificate.findCertificateKey(
-                            "3rd Party Mac Developer Installer: ",
-                            user, keychain);
-                    }
-                    // if either not signing for app store or couldn't find
-                    if (result == null) {
-                        result = MacCertificate.findCertificateKey(
-                            "Developer ID Installer: ", user, keychain);
-                    }
-
-                    if (result != null) {
-                        MacCertificate certificate = new MacCertificate(result, keychain);
-
-                        if (!certificate.isValid()) {
-                            Log.error(MessageFormat.format(
-                                    I18N.getString("error.certificate.expired"),
-                                    result));
-                        }
-                    }
-
-                    return result;
-                },
-            (s, p) -> s);
-
-    public Path bundle(Map<String, ? super Object> params,
-            Path outdir) throws PackagerException {
-        Log.verbose(MessageFormat.format(I18N.getString("message.building-pkg"),
-                APP_NAME.fetchFrom(params)));
-
-        IOUtils.writableOutputDir(outdir);
-
-        try {
-            Path appImageDir = prepareAppBundle(params);
-
-            if (appImageDir != null && prepareConfigFiles(params)) {
-                prepareCPLFile(params, appImageDir);
-
-                if (withServicesPkg(params)) {
-                    prepareServicesPkg(params);
-                }
-
-                if (!APP_STORE.fetchFrom(params)) {
-                    preparePackageScripts(params);
-                }
-
-                new ScriptRunner()
-                        .setDirectory(appImageDir)
-                        .setResourceCategoryId("resource.post-app-image-script")
-                        .setScriptNameSuffix("post-image")
-                        .setEnvironmentVariable("JpAppImageDir", appImageDir.toAbsolutePath().toString())
-                        .run(params);
-
-                return createPKG(params, outdir, appImageDir);
-            }
-            return null;
-        } catch (IOException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
-        }
-    }
-
-    private Path getPackages_AppPackage(Map<String, ? super Object> params) {
-        return PACKAGES_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-app.pkg");
-    }
-
-    private Path getPackages_ServicesPackage(Map<String, ? super Object> params) {
-        return PACKAGES_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-services.pkg");
-    }
-
-    private Path getPackages_SupportPackage(Map<String, ? super Object> params) {
-        return PACKAGES_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-support.pkg");
-    }
-
-    private Path getConfig_DistributionXMLFile(
-            Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve("distribution.dist");
-    }
-
-    private Path getConfig_PDF(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve("product-def.plist");
-    }
-
-    private Path getConfig_BackgroundImage(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-background.png");
-    }
-
-    private Path getConfig_BackgroundImageDarkAqua(Map<String, ? super Object> params) {
-        return CONFIG_ROOT.fetchFrom(params).resolve(
-                APP_NAME.fetchFrom(params) + "-background-darkAqua.png");
-    }
-
-    private String getAppIdentifier(Map<String, ? super Object> params) {
-        return MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
-    }
-
-    private String getServicesIdentifier(Map<String, ? super Object> params) {
-        return MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) + ".services";
-    }
-
-    private String getSupportIdentifier(Map<String, ? super Object> params) {
-        return MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) + ".support";
-    }
-
-    private void preparePackageScripts(Map<String, ? super Object> params)
-            throws IOException {
-        Log.verbose(I18N.getString("message.preparing-scripts"));
-
-        Map<String, String> data = new HashMap<>();
-
-        Path appLocation = Path.of(getInstallDir(params, false),
-                         APP_NAME.fetchFrom(params) + ".app", "Contents", "app");
-
-        data.put("INSTALL_LOCATION", getInstallDir(params, false));
-        data.put("APP_LOCATION", appLocation.toString());
-
-        MacPkgInstallerScripts.createAppScripts()
-                .setResourceDir(RESOURCE_DIR.fetchFrom(params))
-                .setSubstitutionData(data)
-                .saveInFolder(SCRIPTS_DIR.fetchFrom(params));
-    }
-
-    private void addPackageToInstallerGuiScript(XMLStreamWriter xml,
-            String pkgId, String pkgName, String pkgVersion) throws IOException,
-            XMLStreamException {
-        xml.writeStartElement("pkg-ref");
-        xml.writeAttribute("id", pkgId);
-        xml.writeEndElement(); // </pkg-ref>
-        xml.writeStartElement("choice");
-        xml.writeAttribute("id", pkgId);
-        xml.writeAttribute("visible", "false");
-        xml.writeStartElement("pkg-ref");
-        xml.writeAttribute("id", pkgId);
-        xml.writeEndElement(); // </pkg-ref>
-        xml.writeEndElement(); // </choice>
-        xml.writeStartElement("pkg-ref");
-        xml.writeAttribute("id", pkgId);
-        xml.writeAttribute("version", pkgVersion);
-        xml.writeAttribute("onConclusion", "none");
-        try {
-            xml.writeCharacters(new URI(null, null, pkgName, null).toASCIIString());
-        } catch (URISyntaxException ex) {
-            throw new RuntimeException(ex);
-        }
-        xml.writeEndElement(); // </pkg-ref>
-    }
-
-    private void prepareDistributionXMLFile(Map<String, ? super Object> params)
-            throws IOException {
-        Path f = getConfig_DistributionXMLFile(params);
-
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.preparing-distribution-dist"), f.toAbsolutePath().toString()));
-
-        XmlUtils.createXml(f, xml -> {
-            xml.writeStartElement("installer-gui-script");
-            xml.writeAttribute("minSpecVersion", "1");
-
-            xml.writeStartElement("title");
-            xml.writeCharacters(APP_NAME.fetchFrom(params));
-            xml.writeEndElement();
-
-            xml.writeStartElement("background");
-            xml.writeAttribute("file",
-                    getConfig_BackgroundImage(params).getFileName().toString());
-            xml.writeAttribute("mime-type", "image/png");
-            xml.writeAttribute("alignment", "bottomleft");
-            xml.writeAttribute("scaling", "none");
-            xml.writeEndElement();
-
-            xml.writeStartElement("background-darkAqua");
-            xml.writeAttribute("file",
-                    getConfig_BackgroundImageDarkAqua(params).getFileName().toString());
-            xml.writeAttribute("mime-type", "image/png");
-            xml.writeAttribute("alignment", "bottomleft");
-            xml.writeAttribute("scaling", "none");
-            xml.writeEndElement();
-
-            String licFileStr = LICENSE_FILE.fetchFrom(params);
-            if (licFileStr != null) {
-                Path licFile = Path.of(licFileStr);
-                xml.writeStartElement("license");
-                xml.writeAttribute("file", licFile.toAbsolutePath().toString());
-                xml.writeAttribute("mime-type", "text/rtf");
-                xml.writeEndElement();
-            }
-
-            /*
-             * Note that the content of the distribution file
-             * below is generated by productbuild --synthesize
-             */
-
-            Map<String, Path> pkgs = new LinkedHashMap<>();
-
-            pkgs.put(getAppIdentifier(params), getPackages_AppPackage(params));
-            if (withServicesPkg(params)) {
-                pkgs.put(getServicesIdentifier(params),
-                        getPackages_ServicesPackage(params));
-                pkgs.put(getSupportIdentifier(params),
-                        getPackages_SupportPackage(params));
-            }
-
-            for (var pkg : pkgs.entrySet()) {
-                addPackageToInstallerGuiScript(xml, pkg.getKey(),
-                        pkg.getValue().getFileName().toString(),
-                        VERSION.fetchFrom(params));
-            }
-
-            xml.writeStartElement("options");
-            xml.writeAttribute("customize", "never");
-            xml.writeAttribute("require-scripts", "false");
-            xml.writeAttribute("hostArchitectures",
-                    Architecture.isAARCH64() ? "arm64" : "x86_64");
-            xml.writeEndElement(); // </options>
-            xml.writeStartElement("choices-outline");
-            xml.writeStartElement("line");
-            xml.writeAttribute("choice", "default");
-            for (var pkgId : pkgs.keySet()) {
-                xml.writeStartElement("line");
-                xml.writeAttribute("choice", pkgId);
-                xml.writeEndElement(); // </line>
-            }
-            xml.writeEndElement(); // </line>
-            xml.writeEndElement(); // </choices-outline>
-            xml.writeStartElement("choice");
-            xml.writeAttribute("id", "default");
-            xml.writeEndElement(); // </choice>
-
-            xml.writeEndElement(); // </installer-gui-script>
-        });
-    }
-
-    private boolean prepareConfigFiles(Map<String, ? super Object> params)
-            throws IOException {
-
-        createResource(DEFAULT_BACKGROUND_IMAGE, params)
-                .setCategory(I18N.getString("resource.pkg-background-image"))
-                .saveToFile(getConfig_BackgroundImage(params));
-
-        createResource(DEFAULT_BACKGROUND_IMAGE, params)
-                .setCategory(I18N.getString("resource.pkg-background-image"))
-                .saveToFile(getConfig_BackgroundImageDarkAqua(params));
-
-        createResource(DEFAULT_PDF, params)
-                .setCategory(I18N.getString("resource.pkg-pdf"))
-                .saveToFile(getConfig_PDF(params));
-
-        prepareDistributionXMLFile(params);
-
-        return true;
-    }
-
-    private void patchCPLFile(Path cpl) throws IOException {
-        String cplData = Files.readString(cpl);
-        String[] lines = cplData.split("\n");
-        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(cpl))) {
-            int skip = 0;
-            // Used to skip Java.runtime bundle, since
-            // pkgbuild with --root will find two bundles app and Java runtime.
-            // We cannot generate component proprty list when using
-            // --component argument.
-            for (int i = 0; i < lines.length; i++) {
-                if (lines[i].trim().equals("<key>BundleIsRelocatable</key>")) {
-                    out.println(lines[i]);
-                    out.println("<false/>");
-                    i++;
-                } else if (lines[i].trim().equals("<key>ChildBundles</key>")) {
-                    ++skip;
-                } else if ((skip > 0) && lines[i].trim().equals("</array>")) {
-                    --skip;
-                } else {
-                    if (skip == 0) {
-                        out.println(lines[i]);
-                    }
-                }
-            }
-        }
-    }
-
-    // pkgbuild includes all components from "--root" and subfolders,
-    // so if we have app image in folder which contains other images, then they
-    // will be included as well. It does have "--filter" option which use regex
-    // to exclude files/folder, but it will overwrite default one which excludes
-    // based on doc "any .svn or CVS directories, and any .DS_Store files".
-    // So easy approach will be to copy user provided app-image into temp folder
-    // if root path contains other files.
-    private String getRoot(Map<String, ? super Object> params,
-            Path appLocation) throws IOException {
-        Path rootDir = appLocation.getParent() == null ?
-                Path.of(".") : appLocation.getParent();
-
-        // Not needed for runtime installer and it might break runtime installer
-        // if parent does not have any other files
-        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
-            try (var fileList = Files.list(rootDir)) {
-                Path[] list = fileList.toArray(Path[]::new);
-                // We should only have app image and/or .DS_Store
-                if (list.length == 1) {
-                    return rootDir.toString();
-                } else if (list.length == 2) {
-                    // Check case with app image and .DS_Store
-                    if (list[0].toString().toLowerCase().endsWith(".ds_store") ||
-                        list[1].toString().toLowerCase().endsWith(".ds_store")) {
-                        return rootDir.toString(); // Only app image and .DS_Store
-                    }
-                }
-            }
-        }
-
-        // Copy to new root
-        Path newRoot = Files.createTempDirectory(
-                TEMP_ROOT.fetchFrom(params), "root-");
-
-        Path source, dest;
-
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            // firs, is this already a runtime with
-            // <runtime>/Contents/Home - if so we need the Home dir
-            Path original = appLocation;
-            Path home = original.resolve("Contents/Home");
-            source = (Files.exists(home)) ? home : original;
-
-            // Then we need to put back the <NAME>/Content/Home
-            dest = newRoot.resolve(
-                MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params) + "/Contents/Home");
-        } else {
-            source = appLocation;
-            dest = newRoot.resolve(appLocation.getFileName());
-        }
-        FileUtils.copyRecursive(source, dest);
-
-        return newRoot.toString();
-    }
-
-    private boolean withServicesPkg(Map<String, Object> params) {
-        try {
-            return !APP_STORE.fetchFrom(params)
-                    && MacLaunchersAsServices.create(params, null) != null;
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private void prepareServicesPkg(Map<String, Object> params) throws IOException {
-        Path root = TEMP_ROOT.fetchFrom(params).resolve("services");
-
-        Path srcRoot = root.resolve("src");
-
-        var services = MacLaunchersAsServices.create(params, srcRoot);
-
-        Path scriptsDir = root.resolve("scripts");
-
-        var data = services.create();
-        data.put("SERVICES_PACKAGE_ID", getServicesIdentifier(params));
-
-        MacPkgInstallerScripts.createServicesScripts()
-                .setResourceDir(RESOURCE_DIR.fetchFrom(params))
-                .setSubstitutionData(data)
-                .saveInFolder(scriptsDir);
-
-        prepareSupportPkg(params, data);
-    }
-
-    private void prepareSupportPkg(Map<String, Object> params,
-            Map<String, String> servicesSubstitutionData) throws IOException {
-        Path root = TEMP_ROOT.fetchFrom(params).resolve("support");
-
-        Path srcRoot = root.resolve("src");
-
-        var enqouter = Enquoter.forShellLiterals().setEnquotePredicate(str -> true);
-
-        Map<String, String> data = new HashMap<>(servicesSubstitutionData);
-        data.put("APP_INSTALLATION_FOLDER", enqouter.applyTo(Path.of(
-                getInstallDir(params, false), APP_NAME.fetchFrom(params)
-                + ".app").toString()));
-        data.put("SUPPORT_INSTALLATION_FOLDER", enqouter.applyTo(Path.of(
-                "/Library/Application Support", APP_NAME.fetchFrom(params)).toString()));
-
-        new ShellScriptResource("uninstall.command")
-                .setResource(createResource("uninstall.command.template", params)
-                        .setCategory(I18N.getString("resource.pkg-uninstall-script"))
-                        .setPublicName("uninstaller")
-                        .setSubstitutionData(data))
-                .saveInFolder(srcRoot.resolve(APP_NAME.fetchFrom(params)));
-    }
-
-    private void createServicesPkg(Map<String, Object> params) throws
-            IOException {
-        Path root = TEMP_ROOT.fetchFrom(params).resolve("services");
-
-        Path srcRoot = root.resolve("src");
-
-        Path scriptsDir = root.resolve("scripts");
-
-        var pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                "--root",
-                srcRoot.toString(),
-                "--install-location",
-                "/",
-                "--scripts",
-                scriptsDir.toString(),
-                "--identifier",
-                getServicesIdentifier(params),
-                getPackages_ServicesPackage(params).toAbsolutePath().toString());
-        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-
-        createSupportPkg(params);
-    }
-
-    private void createSupportPkg(Map<String, Object> params) throws IOException {
-        Path root = TEMP_ROOT.fetchFrom(params).resolve("support");
-
-        Path srcRoot = root.resolve("src");
-
-        var pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                "--root",
-                srcRoot.toString(),
-                "--install-location",
-                "/Library/Application Support",
-                "--identifier",
-                getSupportIdentifier(params),
-                getPackages_SupportPackage(params).toAbsolutePath().toString());
-        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-    }
-
-    private void prepareCPLFile(Map<String, ? super Object> params, Path appLocation) throws IOException {
-        String root = getRoot(params, appLocation);
-        // Generate default CPL file
-        Path cpl = CONFIG_ROOT.fetchFrom(params).resolve("cpl.plist");
-        ProcessBuilder pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                "--root",
-                root,
-                "--install-location",
-                getInstallDir(params, false),
-                "--analyze",
-                cpl.toAbsolutePath().toString());
-
-        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-
-        patchCPLFile(cpl);
-    }
-
-    private Path createPKG(Map<String, ? super Object> params,
-            Path outdir, Path appLocation) {
-        // generic find attempt
-        try {
-            Path appPKG = getPackages_AppPackage(params);
-
-            String root = getRoot(params, appLocation);
-
-            if (withServicesPkg(params)) {
-                createServicesPkg(params);
-            }
-
-            ProcessBuilder pb;
-
-            Path cpl = CONFIG_ROOT.fetchFrom(params).resolve("cpl.plist");
-
-            // build application package
-            if (APP_STORE.fetchFrom(params)) {
-                pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                        "--root",
-                        root,
-                        "--install-location",
-                        getInstallDir(params, false),
-                        "--component-plist",
-                        cpl.toAbsolutePath().toString(),
-                        "--identifier",
-                         MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params),
-                        appPKG.toAbsolutePath().toString());
-                IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-            } else {
-                pb = new ProcessBuilder("/usr/bin/pkgbuild",
-                        "--root",
-                        root,
-                        "--install-location",
-                        getInstallDir(params, false),
-                        "--component-plist",
-                        cpl.toAbsolutePath().toString(),
-                        "--scripts",
-                        SCRIPTS_DIR.fetchFrom(params)
-                        .toAbsolutePath().toString(),
-                        "--identifier",
-                         MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params),
-                        appPKG.toAbsolutePath().toString());
-                IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
-            }
-
-            // build final package
-            Path finalPKG = outdir.resolve(MAC_INSTALLER_NAME.fetchFrom(params)
-                    + ".pkg");
-            Files.createDirectories(outdir);
-
-            List<String> commandLine = new ArrayList<>();
-            commandLine.add("/usr/bin/productbuild");
-
-            commandLine.add("--resources");
-            commandLine.add(CONFIG_ROOT.fetchFrom(params).toAbsolutePath().toString());
-
-            // maybe sign
-            if (Optional.ofNullable(
-                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.TRUE)) {
-                if (OSVersion.current().compareTo(new OSVersion(10, 12)) >= 0) {
-                    // we need this for OS X 10.12+
-                    Log.verbose(I18N.getString("message.signing.pkg"));
-                }
-
-                String signingIdentity = null;
-                // --mac-installer-sign-identity
-                if (!INSTALLER_SIGN_IDENTITY.getIsDefaultValue(params)) {
-                    signingIdentity = INSTALLER_SIGN_IDENTITY.fetchFrom(params);
-                } else {
-                    // Use --mac-signing-key-user-name if user did not request
-                    // to sign just app image using --mac-app-image-sign-identity
-                    if (APP_IMAGE_SIGN_IDENTITY.getIsDefaultValue(params)) {
-                        // --mac-signing-key-user-name
-                        signingIdentity = DEVELOPER_ID_INSTALLER_SIGNING_KEY.fetchFrom(params);
-                    }
-                }
-
-                if (signingIdentity != null) {
-                    commandLine.add("--sign");
-                    commandLine.add(signingIdentity);
-                }
-
-                String keychainName = SIGNING_KEYCHAIN.fetchFrom(params);
-                if (keychainName != null && !keychainName.isEmpty()) {
-                    commandLine.add("--keychain");
-                    commandLine.add(keychainName);
-                }
-            }
-
-            if (APP_STORE.fetchFrom(params)) {
-                commandLine.add("--product");
-                commandLine.add(getConfig_PDF(params)
-                        .toAbsolutePath().toString());
-                commandLine.add("--component");
-                Path p = Path.of(root, APP_NAME.fetchFrom(params) + ".app");
-                commandLine.add(p.toAbsolutePath().toString());
-                commandLine.add(getInstallDir(params, false));
-            } else {
-                commandLine.add("--distribution");
-                commandLine.add(getConfig_DistributionXMLFile(params)
-                        .toAbsolutePath().toString());
-                commandLine.add("--package-path");
-                commandLine.add(PACKAGES_ROOT.fetchFrom(params)
-                        .toAbsolutePath().toString());
-            }
-            commandLine.add(finalPKG.toAbsolutePath().toString());
-
-            pb = new ProcessBuilder(commandLine);
-
-            try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                 PrintStream ps = new PrintStream(baos)) {
-                try {
-                    IOUtils.exec(pb, false, ps, true, Executor.INFINITE_TIMEOUT);
-                } catch (IOException ioe) {
-                    // Log output of "productbuild" in case of
-                    // error. It should help user to diagnose
-                    // issue when using --mac-installer-sign-identity
-                    Log.info(MessageFormat.format(I18N.getString(
-                             "error.tool.failed.with.output"), "productbuild"));
-                    Log.info(baos.toString().strip());
-                    throw ioe;
-                }
-            }
-
-            return finalPKG;
-        } catch (Exception ignored) {
-            Log.verbose(ignored);
-            return null;
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // Implement Bundler
-    //////////////////////////////////////////////////////////////////////////
-
     @Override
     public String getName() {
         return I18N.getString("pkg.bundler.name");
@@ -707,57 +43,18 @@ public String getID() {
         return "pkg";
     }
 
-    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,
-            // check if it is acceptable extended ASCII or unicode character.
-            if ((a >= 'A' && a <= 'Z') || (a >= 'a' && a <= 'z')
-                    || (a >= '0' && a <= '9') || (a == '-' || a == '.')) {
-                continue;
-            }
-            return false;
-        }
-        return true;
-    }
-
     @Override
     public boolean validate(Map<String, ? super Object> params)
             throws ConfigException {
         try {
             Objects.requireNonNull(params);
 
+            final var pkgPkg = MacFromParams.PKG_PACKAGE.fetchFrom(params);
+
             // run basic validation to ensure requirements are met
             // we are not interested in return code, only possible exception
             validateAppImageAndBundeler(params);
 
-            String identifier = MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
-            if (!isValidBundleIdentifier(identifier)) {
-                throw new ConfigException(
-                        MessageFormat.format(I18N.getString(
-                        "message.invalid-identifier"), identifier),
-                        I18N.getString("message.invalid-identifier.advice"));
-            }
-
-            // reject explicitly set sign to true and no valid signature key
-            if (Optional.ofNullable(
-                    SIGN_BUNDLE.fetchFrom(params)).orElse(Boolean.FALSE)) {
-                if (!SIGNING_KEY_USER.getIsDefaultValue(params)) {
-                    String signingIdentity =
-                            DEVELOPER_ID_INSTALLER_SIGNING_KEY.fetchFrom(params);
-                    if (signingIdentity == null) {
-                        throw new ConfigException(
-                                I18N.getString("error.explicit-sign-no-cert"),
-                                I18N.getString(
-                                "error.explicit-sign-no-cert.advice"));
-                    }
-                }
-
-                // No need to validate --mac-installer-sign-identity, since it is
-                // pass through option.
-            }
-
             // hdiutil is always available so there's no need
             // to test for availability.
 
@@ -774,7 +71,13 @@ public boolean validate(Map<String, ? super Object> params)
     @Override
     public Path execute(Map<String, ? super Object> params,
             Path outputParentDir) throws PackagerException {
-        return bundle(params, outputParentDir);
+
+        final var pkg = MacFromParams.PKG_PACKAGE.fetchFrom(params);
+        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+
+        final var packager = MacPkgPackager.build().outputDir(outputParentDir).pkg(pkg).env(env);
+
+        return packager.execute();
     }
 
     @Override
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
new file mode 100644
index 00000000000..131650aebb5
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MacPkgPackage;
+import jdk.jpackage.internal.model.MacPkgPackageMixin;
+import jdk.jpackage.internal.model.PkgSigningConfig;
+
+final class MacPkgPackageBuilder {
+
+    MacPkgPackageBuilder(MacPackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    MacPkgPackageBuilder signingBuilder(SigningIdentityBuilder v) {
+        signingBuilder = v;
+        return this;
+    }
+
+    MacPkgPackage create() throws ConfigException {
+        return MacPkgPackage.create(pkgBuilder.create(), new MacPkgPackageMixin.Stub(createSigningConfig()));
+    }
+
+    private Optional<PkgSigningConfig> createSigningConfig() throws ConfigException {
+        if (signingBuilder != null) {
+            return signingBuilder.create().map(cfg -> {
+                return new PkgSigningConfig.Stub(cfg.identity(), cfg.keychain().map(Keychain::name));
+            });
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private final MacPackageBuilder pkgBuilder;
+    private SigningIdentityBuilder signingBuilder;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
new file mode 100644
index 00000000000..1fb0b9bc160
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
@@ -0,0 +1,564 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.PathUtils.normalizedAbsolutePathString;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import jdk.internal.util.Architecture;
+import jdk.internal.util.OSVersion;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.StartupParameters;
+import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.MacPkgPackage;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.resources.ResourceLocator;
+import jdk.jpackage.internal.util.XmlUtils;
+import org.xml.sax.SAXException;
+
+record MacPkgPackager(MacPkgPackage pkg, BuildEnv env, Optional<Services> services, Path outputDir) {
+
+    enum PkgPackageTaskID implements TaskID {
+        PREPARE_MAIN_SCRIPTS,
+        CREATE_DISTRIBUTION_XML_FILE,
+        CREATE_COMPONENT_PLIST_FILE,
+        PREPARE_SERVICES
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    static final class Builder extends PackagerBuilder<MacPkgPackage, Builder> {
+
+        Path execute() throws PackagerException {
+            Log.verbose(MessageFormat.format(I18N.getString("message.building-pkg"),
+                    pkg.app().name()));
+
+            IOUtils.writableOutputDir(outputDir);
+
+            return execute(MacPackagingPipeline.build(Optional.of(pkg)));
+        }
+
+        @Override
+        protected void configurePackagingPipeline(PackagingPipeline.Builder pipelineBuilder,
+                StartupParameters startupParameters) {
+            final var packager = new MacPkgPackager(pkg, startupParameters.packagingEnv(), createServices(), outputDir);
+            packager.applyToPipeline(pipelineBuilder);
+        }
+
+        private Optional<Services> createServices() {
+            if (pkg.app().isService()) {
+                return Optional.of(Services.create(pkg, env));
+            } else {
+                return Optional.empty();
+            }
+        }
+    }
+
+    record InternalPackage(Path srcRoot, String identifier, Path path, List<String> otherPkgbuildArgs) {
+
+        InternalPackage {
+            Objects.requireNonNull(srcRoot);
+            Objects.requireNonNull(identifier);
+            Objects.requireNonNull(path);
+            Objects.requireNonNull(otherPkgbuildArgs);
+        }
+
+        private List<String> allPkgbuildArgs() {
+            final List<String> args = new ArrayList<>();
+            args.add("--root");
+            args.add(normalizedAbsolutePathString(srcRoot));
+            args.addAll(otherPkgbuildArgs);
+            args.add("--identifier");
+            args.add(identifier);
+            args.add(normalizedAbsolutePathString(path));
+            return args;
+        }
+
+        void build() {
+            final List<String> cmdline = new ArrayList<>();
+            cmdline.add("/usr/bin/pkgbuild");
+            cmdline.addAll(allPkgbuildArgs());
+            try {
+                Files.createDirectories(path.getParent());
+                IOUtils.exec(new ProcessBuilder(cmdline), false, null, true, Executor.INFINITE_TIMEOUT);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+    }
+
+    record Services(InternalPackage servicesPkg, Path servicesScriptsDir, InternalPackage supportPkg) {
+
+        Services {
+            Objects.requireNonNull(servicesPkg);
+            Objects.requireNonNull(servicesScriptsDir);
+            Objects.requireNonNull(supportPkg);
+        }
+
+        static Services create(MacPkgPackage pkg, BuildEnv env) {
+            final var servicesRoot = env.buildRoot().resolve("services");
+            final var supportRoot = env.buildRoot().resolve("support");
+
+            final var servicesScriptsDir = servicesRoot.resolve("scripts");
+
+            final var servicesPkg = InternalPackageType.SERVICES.createInternalPackage(
+                    servicesRoot.resolve("src"), pkg, env, List.of(
+                            "--install-location", "/",
+                            "--scripts", normalizedAbsolutePathString(servicesScriptsDir)));
+
+            final var supportPkg = InternalPackageType.SUPPORT.createInternalPackage(
+                    supportRoot.resolve("src"), pkg, env, List.of(
+                            "--install-location", "/Library/Application Support"));
+
+            return new Services(servicesPkg, servicesScriptsDir, supportPkg);
+        }
+
+        Stream<InternalPackage> asStream() {
+            return Stream.of(servicesPkg, supportPkg);
+        }
+
+        void prepareForPkgbuild(MacPkgPackage pkg, BuildEnv env) throws IOException {
+            prepareSupportForPkgbuild(pkg, env, prepareServicesForPkgbuild(pkg, env));
+        }
+
+        private Map<String, String> prepareServicesForPkgbuild(MacPkgPackage pkg, BuildEnv env) throws IOException {
+            final var services = new MacLaunchersAsServices(BuildEnv.withAppImageDir(env, servicesPkg.srcRoot()), pkg);
+
+            final var data = services.create();
+            data.put("SERVICES_PACKAGE_ID", servicesPkg.identifier());
+
+            MacPkgInstallerScripts.createServicesScripts()
+                    .setResourceDir(env.resourceDir().orElse(null))
+                    .setSubstitutionData(data)
+                    .saveInFolder(servicesScriptsDir);
+
+            return data;
+        }
+
+        private void prepareSupportForPkgbuild(MacPkgPackage pkg, BuildEnv env,
+                Map<String, String> servicesSubstitutionData) throws IOException {
+            final var enqouter = Enquoter.forShellLiterals().setEnquotePredicate(str -> true);
+
+            final var mainInstallDir = Path.of("/").resolve(pkg.relativeInstallDir());
+            final var supportInstallDir = Path.of("/Library/Application Support").resolve(pkg.packageName());
+
+            Map<String, String> data = new HashMap<>(servicesSubstitutionData);
+            data.put("APP_INSTALLATION_FOLDER", enqouter.applyTo(mainInstallDir.toString()));
+            data.put("SUPPORT_INSTALLATION_FOLDER", enqouter.applyTo(supportInstallDir.toString()));
+
+            new ShellScriptResource("uninstall.command")
+                    .setResource(env.createResource("uninstall.command.template")
+                            .setCategory(I18N.getString("resource.pkg-uninstall-script"))
+                            .setPublicName("uninstaller")
+                            .setSubstitutionData(data))
+                    .saveInFolder(supportPkg.srcRoot().resolve(pkg.app().name()));
+        }
+    }
+
+    private enum InternalPackageType implements TaskID {
+        MAIN,
+        SERVICES("services"),
+        SUPPORT("support");
+
+        InternalPackage createInternalPackage(Path srcRoot, MacPkgPackage pkg, BuildEnv env, List<String> otherPkgbuildArgs) {
+            return new InternalPackage(srcRoot, identifier(pkg), env.buildRoot().resolve("packages").resolve(filename(pkg)), otherPkgbuildArgs);
+        }
+
+        private InternalPackageType(String nameSuffix) {
+            this.nameSuffix = Optional.of(nameSuffix);
+        }
+
+        private InternalPackageType() {
+            this.nameSuffix = Optional.empty();
+        }
+
+        private String identifier(MacPkgPackage pkg) {
+            final var baseIdentifier = pkg.app().bundleIdentifier();
+            return nameSuffix.map(v -> baseIdentifier + "." + v).orElse(baseIdentifier);
+        }
+
+        private String filename(MacPkgPackage pkg) {
+            return String.format("%s-%s.pkg", pkg.app().name(), nameSuffix.orElse("app"));
+        }
+
+        private final Optional<String> nameSuffix;
+    }
+
+    private void applyToPipeline(PackagingPipeline.Builder pipelineBuilder) {
+        pipelineBuilder
+                .excludeDirFromCopying(outputDir)
+                .task(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS)
+                        .action(this::prepareMainScripts)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(PkgPackageTaskID.CREATE_DISTRIBUTION_XML_FILE)
+                        .action(this::prepareDistributionXMLFile)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(PkgPackageTaskID.CREATE_COMPONENT_PLIST_FILE)
+                        .action(this::createComponentPlistFile)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(PackageTaskID.CREATE_CONFIG_FILES)
+                        .action(this::prepareConfigFiles)
+                        .add()
+                .task(PackageTaskID.CREATE_PACKAGE_FILE)
+                        .action(this::productbuild)
+                        .addDependencies(InternalPackageType.values())
+                        .addDependencies(PkgPackageTaskID.CREATE_DISTRIBUTION_XML_FILE, PkgPackageTaskID.CREATE_COMPONENT_PLIST_FILE)
+                        .add()
+                .task(PkgPackageTaskID.PREPARE_SERVICES)
+                        .action(this::prepareServicesForBkgbuild)
+                        .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(InternalPackageType.SERVICES)
+                        .action(this::buildServicesPKG)
+                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(InternalPackageType.SUPPORT)
+                        .action(this::buildSupportPKG)
+                        .addDependencies(PkgPackageTaskID.PREPARE_SERVICES, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add()
+                .task(InternalPackageType.MAIN)
+                        .action(this::buildMainPKG)
+                        .addDependencies(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS, PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .add();
+
+        final List<TaskID> disabledTasks = new ArrayList<>();
+
+        if (services.isEmpty()) {
+            disabledTasks.addAll(List.of(PkgPackageTaskID.PREPARE_SERVICES, InternalPackageType.SERVICES, InternalPackageType.SUPPORT));
+        }
+
+        if (scriptsRoot().isEmpty()) {
+            disabledTasks.add(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS);
+        }
+
+        for (final var taskID : disabledTasks) {
+            pipelineBuilder.task(taskID).noaction().add();
+        }
+    }
+
+    List<InternalPackage> internalPackages() {
+        return Stream.concat(Stream.of(mainPkg()),
+                services.map(Services::asStream).orElseGet(Stream::of)).toList();
+    }
+
+    InternalPackage mainPkg() {
+        final List<String> args = new ArrayList<>();
+        args.add("--install-location");
+        args.add(normalizedAbsolutePathString(installLocation()));
+        args.add("--component-plist");
+        args.add(normalizedAbsolutePathString(componentPlistFile()));
+
+        scriptsRoot().ifPresent(scriptsRoot -> {
+            args.add("--scripts");
+            args.add(normalizedAbsolutePathString(scriptsRoot));
+        });
+
+        return InternalPackageType.MAIN.createInternalPackage(env.appImageDir(), pkg, env, args);
+    }
+
+    Optional<Path> scriptsRoot() {
+        if (pkg.app().appStore() || pkg.isRuntimeInstaller()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(env.configDir().resolve("scripts"));
+        }
+    }
+
+    Path componentPlistFile() {
+        return env.configDir().resolve("cpl.plist");
+    }
+
+    Path installLocation() {
+        return Path.of("/").resolve(pkg.relativeInstallDir()).getParent();
+    }
+
+    Path distributionXmlFile() {
+        return env.configDir().resolve("distribution.dist");
+    }
+
+    Path appStoreProductFile() {
+        return env.configDir().resolve("product-def.plist");
+    }
+
+    Path backgroundImage() {
+        return env.configDir().resolve(pkg.app().name() + "-background.png");
+    }
+
+    Path backgroundImageDarkAqua() {
+        return env.configDir().resolve(pkg.app().name() + "-background-darkAqua.png");
+    }
+
+    private void addInternalPackageToInstallerGuiScript(InternalPackage internalPkg,
+            XMLStreamWriter xml) throws IOException, XMLStreamException {
+        xml.writeStartElement("pkg-ref");
+        xml.writeAttribute("id", internalPkg.identifier());
+        xml.writeEndElement(); // </pkg-ref>
+        xml.writeStartElement("choice");
+        xml.writeAttribute("id", internalPkg.identifier());
+        xml.writeAttribute("visible", "false");
+        xml.writeStartElement("pkg-ref");
+        xml.writeAttribute("id", internalPkg.identifier());
+        xml.writeEndElement(); // </pkg-ref>
+        xml.writeEndElement(); // </choice>
+        xml.writeStartElement("pkg-ref");
+        xml.writeAttribute("id", internalPkg.identifier());
+        xml.writeAttribute("version", pkg.version());
+        xml.writeAttribute("onConclusion", "none");
+        try {
+            xml.writeCharacters(new URI(null, null, internalPkg.path().getFileName().toString(), null).toASCIIString());
+        } catch (URISyntaxException ex) {
+            throw new RuntimeException(ex);
+        }
+        xml.writeEndElement(); // </pkg-ref>
+    }
+
+    private void prepareMainScripts() throws IOException {
+        Log.verbose(I18N.getString("message.preparing-scripts"));
+
+        final var scriptsRoot = scriptsRoot().orElseThrow();
+
+        Files.createDirectories(scriptsRoot);
+
+        final Map<String, String> data = new HashMap<>();
+
+        final var appLocation = pkg.asInstalledPackageApplicationLayout().orElseThrow().appDirectory();
+
+        data.put("INSTALL_LOCATION", Path.of("/").resolve(pkg.relativeInstallDir()).toString());
+        data.put("APP_LOCATION", appLocation.toString());
+
+        MacPkgInstallerScripts.createAppScripts()
+                .setResourceDir(env.resourceDir().orElse(null))
+                .setSubstitutionData(data)
+                .saveInFolder(scriptsRoot);
+    }
+
+    private void prepareDistributionXMLFile() throws IOException {
+        final var f = distributionXmlFile();
+
+        Log.verbose(MessageFormat.format(I18N.getString(
+                "message.preparing-distribution-dist"), f.toAbsolutePath().toString()));
+
+        XmlUtils.createXml(f, xml -> {
+            xml.writeStartElement("installer-gui-script");
+            xml.writeAttribute("minSpecVersion", "1");
+
+            xml.writeStartElement("title");
+            xml.writeCharacters(pkg.app().name());
+            xml.writeEndElement();
+
+            xml.writeStartElement("background");
+            xml.writeAttribute("file", backgroundImage().getFileName().toString());
+            xml.writeAttribute("mime-type", "image/png");
+            xml.writeAttribute("alignment", "bottomleft");
+            xml.writeAttribute("scaling", "none");
+            xml.writeEndElement();
+
+            xml.writeStartElement("background-darkAqua");
+            xml.writeAttribute("file", backgroundImageDarkAqua().getFileName().toString());
+            xml.writeAttribute("mime-type", "image/png");
+            xml.writeAttribute("alignment", "bottomleft");
+            xml.writeAttribute("scaling", "none");
+            xml.writeEndElement();
+
+            final var licFile = pkg.licenseFile();
+            if (licFile.isPresent()) {
+                xml.writeStartElement("license");
+                xml.writeAttribute("file", licFile.orElseThrow().toAbsolutePath().toString());
+                xml.writeAttribute("mime-type", "text/rtf");
+                xml.writeEndElement();
+            }
+
+            /*
+             * Note that the content of the distribution file
+             * below is generated by productbuild --synthesize
+             */
+
+            for (final var p : internalPackages()) {
+                addInternalPackageToInstallerGuiScript(p, xml);
+            }
+
+            xml.writeStartElement("options");
+            xml.writeAttribute("customize", "never");
+            xml.writeAttribute("require-scripts", "false");
+            xml.writeAttribute("hostArchitectures", Architecture.isAARCH64() ? "arm64" : "x86_64");
+            xml.writeEndElement(); // </options>
+            xml.writeStartElement("choices-outline");
+            xml.writeStartElement("line");
+            xml.writeAttribute("choice", "default");
+            for (final var p : internalPackages()) {
+                xml.writeStartElement("line");
+                xml.writeAttribute("choice", p.identifier());
+                xml.writeEndElement(); // </line>
+            }
+            xml.writeEndElement(); // </line>
+            xml.writeEndElement(); // </choices-outline>
+            xml.writeStartElement("choice");
+            xml.writeAttribute("id", "default");
+            xml.writeEndElement(); // </choice>
+
+            xml.writeEndElement(); // </installer-gui-script>
+        });
+    }
+
+    private void prepareConfigFiles() throws IOException {
+        env.createResource(DEFAULT_BACKGROUND_IMAGE)
+                .setCategory(I18N.getString("resource.pkg-background-image"))
+                .saveToFile(backgroundImage());
+
+        env.createResource(DEFAULT_BACKGROUND_IMAGE)
+                .setCategory(I18N.getString("resource.pkg-background-image"))
+                .saveToFile(backgroundImageDarkAqua());
+
+        if (pkg.app().appStore()) {
+            env.createResource(DEFAULT_PDF)
+                    .setCategory(I18N.getString("resource.pkg-pdf"))
+                    .saveToFile(appStoreProductFile());
+        }
+    }
+
+    private void patchCPLFile(Path cpl) throws IOException {
+        try (final var xsltResource = ResourceLocator.class.getResourceAsStream("adjust-component-plist.xsl")) {
+            final var srcXml =  new DOMSource(XmlUtils.initDocumentBuilder().parse(
+                    new ByteArrayInputStream(Files.readAllBytes(cpl))));
+            final var dstXml = new StreamResult(cpl.toFile());
+            final var xslt = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltResource));
+            xslt.transform(srcXml, dstXml);
+        } catch (TransformerException|SAXException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private void prepareServicesForBkgbuild() throws IOException {
+        services.orElseThrow().prepareForPkgbuild(pkg, env);
+    }
+
+    private void buildServicesPKG() {
+        services.orElseThrow().servicesPkg().build();
+    }
+
+    private void buildSupportPKG() {
+        services.orElseThrow().supportPkg().build();
+    }
+
+    private void buildMainPKG() throws IOException {
+        mainPkg().build();
+    }
+
+    private void createComponentPlistFile() throws IOException {
+        final var cpl = componentPlistFile();
+
+        Files.createDirectories(cpl.getParent());
+
+        final var pb = new ProcessBuilder("/usr/bin/pkgbuild",
+                "--root",
+                normalizedAbsolutePathString(env.appImageDir()),
+                "--install-location",
+                normalizedAbsolutePathString(installLocation()),
+                "--analyze",
+                normalizedAbsolutePathString(cpl));
+
+        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+
+        patchCPLFile(cpl);
+    }
+
+    private void productbuild() throws IOException {
+        final var finalPkg = outputDir.resolve(pkg.packageFileNameWithSuffix());
+        Files.createDirectories(finalPkg.getParent());
+
+        List<String> commandLine = new ArrayList<>();
+        commandLine.add("/usr/bin/productbuild");
+
+        commandLine.add("--resources");
+        commandLine.add(normalizedAbsolutePathString(env.configDir()));
+
+        // maybe sign
+        if (pkg.sign()) {
+            if (OSVersion.current().compareTo(new OSVersion(10, 12)) >= 0) {
+                // we need this for OS X 10.12+
+                Log.verbose(I18N.getString("message.signing.pkg"));
+            }
+
+            final var pkgSigningConfig = pkg.signingConfig().orElseThrow();
+
+            commandLine.add("--sign");
+            commandLine.add(pkgSigningConfig.identity().id());
+
+            pkgSigningConfig.keychain().map(Keychain::new).ifPresent(keychain -> {
+                commandLine.add("--keychain");
+                commandLine.add(keychain.asCliArg());
+            });
+        }
+
+        if (pkg.app().appStore()) {
+            commandLine.add("--product");
+            commandLine.add(normalizedAbsolutePathString(appStoreProductFile()));
+            commandLine.add("--component");
+            Path p = env.appImageDir().resolve(pkg.app().appImageDirName());
+            commandLine.add(p.toAbsolutePath().toString());
+            commandLine.add(normalizedAbsolutePathString(installLocation()));
+        } else {
+            commandLine.add("--distribution");
+            commandLine.add(normalizedAbsolutePathString(distributionXmlFile()));
+            commandLine.add("--package-path");
+            // Assume all internal .pkg files reside in the same directory.
+            commandLine.add(normalizedAbsolutePathString(mainPkg().path().getParent()));
+        }
+        commandLine.add(normalizedAbsolutePathString(finalPkg));
+
+        final var pb = new ProcessBuilder(commandLine);
+        IOUtils.exec(pb, false, null, true, Executor.INFINITE_TIMEOUT);
+    }
+
+    private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png";
+    private static final String DEFAULT_PDF = "product-def.plist";
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
new file mode 100644
index 00000000000..119d7797453
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -0,0 +1,245 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.MacCertificateUtils.findCertificates;
+
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.security.auth.x500.X500Principal;
+import jdk.jpackage.internal.MacCertificateUtils.CertificateHash;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.SigningIdentity;
+
+final class SigningIdentityBuilder {
+
+    static class SigningConfigException extends ConfigException {
+        SigningConfigException(ConfigException ex) {
+            super(ex.getMessage(), ex.getAdvice(), ex.getCause());
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static class ExpiredCertificateException extends SigningConfigException {
+        ExpiredCertificateException(ConfigException ex) {
+            super(ex);
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    record SigningConfig(SigningIdentity identity, Optional<Keychain> keychain) {
+        SigningConfig {
+            Objects.requireNonNull(identity);
+            Objects.requireNonNull(keychain);
+        }
+    }
+
+    SigningIdentityBuilder signingIdentity(String v) {
+        signingIdentity = v;
+        return this;
+    }
+
+    SigningIdentityBuilder certificateSelector(CertificateSelector v) {
+        certificateSelector = v;
+        return this;
+    }
+
+    SigningIdentityBuilder keychain(String v) {
+        keychain = v;
+        return this;
+    }
+
+    Optional<SigningConfig> create() throws ConfigException {
+        if (signingIdentity == null && certificateSelector == null) {
+            return Optional.empty();
+        } else {
+            return Optional.of(new SigningConfig(validatedSigningIdentity(), validatedKeychain()));
+        }
+    }
+
+    private Optional<Keychain> validatedKeychain() throws ConfigException {
+        return Optional.ofNullable(keychain).map(Keychain::new);
+    }
+
+    private SigningIdentity validatedSigningIdentity() throws ConfigException {
+        if (signingIdentity != null) {
+            return new SigningIdentityImpl(signingIdentity);
+        }
+
+        Objects.requireNonNull(certificateSelector);
+
+        final var validatedKeychain = validatedKeychain();
+
+        final var allCertificates = findCertificates(validatedKeychain, Optional.empty());
+
+        final var mappedCertficates = allCertificates.stream().<Map.Entry<String, X509Certificate>>mapMulti((cert, acc) -> {
+            findSubjectCNs(cert).stream().map(cn -> {
+                return Map.entry(cn, cert);
+            }).forEach(acc::accept);
+        }).toList();
+
+        final var signingIdentityNames = certificateSelector.signingIdentities();
+
+        var matchingCertificates = mappedCertficates.stream().filter(e -> {
+            return signingIdentityNames.contains(e.getKey());
+        }).map(Map.Entry::getValue).toList();
+
+        if (matchingCertificates.isEmpty()) {
+            matchingCertificates = mappedCertficates.stream().filter(e -> {
+                return signingIdentityNames.stream().anyMatch(filter -> {
+                    return filter.startsWith(e.getKey());
+                });
+            }).map(Map.Entry::getValue).toList();
+        }
+
+        final var cert = selectSigningIdentity(matchingCertificates,
+                certificateSelector, validatedKeychain);
+
+        try {
+            cert.checkValidity();
+        } catch (CertificateExpiredException|CertificateNotYetValidException ex) {
+            throw new ExpiredCertificateException(I18N.buildConfigException("error.certificate.expired", findSubjectCNs(cert).getFirst()).create());
+        }
+
+        final var signingIdentityHash = CertificateHash.of(cert);
+
+        return new SigningIdentityImpl(signingIdentityHash.toString());
+    }
+
+    private static X509Certificate selectSigningIdentity(List<X509Certificate> certs,
+            CertificateSelector certificateSelector, Optional<Keychain> keychain) throws ConfigException {
+        Objects.requireNonNull(certificateSelector);
+        Objects.requireNonNull(keychain);
+        switch (certs.size()) {
+            case 0 -> {
+                Log.error(I18N.format("error.cert.not.found", certificateSelector.signingIdentities().getFirst(),
+                        keychain.map(Keychain::name).orElse("")));
+                throw I18N.buildConfigException("error.explicit-sign-no-cert")
+                        .advice("error.explicit-sign-no-cert.advice").create();
+            }
+            case 1 -> {
+                return certs.getFirst();
+            }
+            default -> {
+                Log.error(I18N.format("error.multiple.certs.found", certificateSelector.signingIdentities().getFirst(),
+                        keychain.map(Keychain::name).orElse("")));
+                return certs.getFirst();
+            }
+        }
+    }
+
+    private static List<String> findSubjectCNs(X509Certificate cert) {
+        final LdapName ldapName;
+        try {
+            ldapName = new LdapName(cert.getSubjectX500Principal().getName(X500Principal.RFC2253));
+        } catch (InvalidNameException e) {
+            return List.of();
+        }
+
+        return ldapName.getRdns().stream().filter(rdn -> {
+            return rdn.getType().equalsIgnoreCase("CN");
+        }).map(Rdn::getValue).map(Object::toString).distinct().toList();
+    }
+
+    record CertificateSelector(String name, List<StandardCertificatePrefix> prefixes) {
+        CertificateSelector {
+            Objects.requireNonNull(prefixes);
+            prefixes.forEach(Objects::requireNonNull);
+            Objects.requireNonNull(name);
+        }
+
+        List<String> signingIdentities() {
+            if (prefixes().isEmpty()) {
+                return List.of(name);
+            } else {
+                return prefixes.stream().map(StandardCertificatePrefix::value).map(prefix -> {
+                    return prefix + name;
+                }).toList();
+            }
+        }
+    }
+
+    enum StandardCertificatePrefix {
+        APP_SIGN_APP_STORE("3rd Party Mac Developer Application"),
+        INSTALLER_SIGN_APP_STORE("3rd Party Mac Developer Installer"),
+        APP_SIGN_PERSONAL("Developer ID Application"),
+        INSTALLER_SIGN_PERSONAL("Developer ID Installer");
+
+        StandardCertificatePrefix(String value) {
+            this.value = value + ": ";
+        }
+
+        String value() {
+            return value;
+        }
+
+        static Optional<StandardCertificatePrefix> findStandardCertificatePrefix(String certificateLocator) {
+            Objects.requireNonNull(certificateLocator);
+            return Stream.of(StandardCertificatePrefix.values()).filter(prefix -> {
+                return certificateLocator.startsWith(prefix.value);
+            }).reduce((x, y) -> {
+                throw new UnsupportedOperationException();
+            });
+        }
+
+        private final String value;
+    }
+
+    enum StandardCertificateSelector {
+        APP_IMAGE(StandardCertificatePrefix.APP_SIGN_PERSONAL),
+        PKG_INSTALLER(StandardCertificatePrefix.INSTALLER_SIGN_PERSONAL),
+        APP_STORE_APP_IMAGE(StandardCertificatePrefix.APP_SIGN_PERSONAL, StandardCertificatePrefix.APP_SIGN_APP_STORE),
+        APP_STORE_PKG_INSTALLER(StandardCertificatePrefix.INSTALLER_SIGN_PERSONAL, StandardCertificatePrefix.INSTALLER_SIGN_APP_STORE);
+
+        StandardCertificateSelector(StandardCertificatePrefix ... prefixes) {
+            this.prefixes = List.of(prefixes);
+        }
+
+        static CertificateSelector create(String certificateLocator, StandardCertificateSelector defaultSelector) {
+            return StandardCertificatePrefix.findStandardCertificatePrefix(certificateLocator).map(prefix -> {
+                return new CertificateSelector(certificateLocator, List.of());
+            }).orElseGet(() -> {
+                return new CertificateSelector(certificateLocator, defaultSelector.prefixes);
+            });
+        }
+
+        private final List<StandardCertificatePrefix> prefixes;
+    }
+
+    private String signingIdentity;
+    private CertificateSelector certificateSelector;
+    private String keychain;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
new file mode 100644
index 00000000000..c4377b49f06
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
@@ -0,0 +1,42 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.CodesignConfig.ADHOC_SIGNING_IDENTITY;
+
+import java.util.Objects;
+import jdk.jpackage.internal.model.SigningIdentity;
+
+record SigningIdentityImpl(String id) implements SigningIdentity {
+
+    SigningIdentityImpl {
+        Objects.requireNonNull(id);
+
+        if (ADHOC_SIGNING_IDENTITY.equals(id)) {
+            throw new IllegalArgumentException("Adhoc signing identity not allowed");
+        }
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
new file mode 100644
index 00000000000..97709678c67
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import jdk.internal.util.OSVersion;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
+
+final class TempKeychain implements Closeable {
+
+    static void withKeychains(ThrowingConsumer<List<Keychain>> keychainConsumer, List<Keychain> keychains) throws Throwable {
+        keychains.forEach(Objects::requireNonNull);
+        if (keychains.isEmpty() || OSVersion.current().compareTo(new OSVersion(10, 12)) < 0) {
+            keychainConsumer.accept(keychains);
+        } else {
+            // we need this for OS X 10.12+
+            try (var tempKeychain = new TempKeychain(keychains)) {
+                keychainConsumer.accept(tempKeychain.keychains);
+            }
+        }
+    }
+
+    static void withKeychain(ThrowingConsumer<Keychain> keychainConsumer, Keychain keychain) throws Throwable {
+        Objects.requireNonNull(keychainConsumer);
+        withKeychains(keychains -> {
+            keychainConsumer.accept(keychains.getFirst());
+        }, List.of(keychain));
+    }
+
+    TempKeychain(List<Keychain> keychains) throws IOException {
+        this.keychains = Objects.requireNonNull(keychains);
+
+        final var currentKeychains = Keychain.listKeychains();
+
+        final var currentKeychainPaths = currentKeychains.stream().map(Keychain::path).toList();
+
+        final var missingKeychains = keychains.stream().filter(k -> {
+            return !currentKeychainPaths.contains(k.path());
+        }).toList();
+
+        if (missingKeychains.isEmpty()) {
+            restoreKeychainsCmd = List.of();
+        } else {
+            List<String> args = new ArrayList<>();
+            args.add("/usr/bin/security");
+            args.add("list-keychains");
+            args.add("-s");
+            args.addAll(currentKeychains.stream().map(Keychain::asCliArg).toList());
+
+            restoreKeychainsCmd = List.copyOf(args);
+
+            args.addAll(missingKeychains.stream().map(Keychain::asCliArg).toList());
+
+            Executor.of(args.toArray(String[]::new)).executeExpectSuccess();
+        }
+    }
+
+    List<Keychain> keychains() {
+        return keychains;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (!restoreKeychainsCmd.isEmpty()) {
+            Executor.of(restoreKeychainsCmd.toArray(String[]::new)).executeExpectSuccess();
+        }
+    }
+
+    private final List<Keychain> keychains;
+    private final List<String> restoreKeychainsCmd;
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/AppImageSigningConfig.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/AppImageSigningConfig.java
new file mode 100644
index 00000000000..fc807e21915
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/AppImageSigningConfig.java
@@ -0,0 +1,46 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+public interface AppImageSigningConfig {
+
+    SigningIdentity identity();
+
+    String identifierPrefix();
+
+    Optional<Path> entitlements();
+
+    String entitlementsResourceName();
+
+    Optional<String> keychain();
+
+    record Stub(SigningIdentity identity, String identifierPrefix, Optional<Path> entitlements,
+            Optional<String> keychain, String entitlementsResourceName) implements AppImageSigningConfig {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
new file mode 100644
index 00000000000..a38ac65bbaf
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacApplication extends Application, MacApplicationMixin {
+
+    default DottedVersion shortVersion() {
+        final var verComponents = DottedVersion.lazy(version()).getComponents();
+        // Short version should have exactly three components according to
+        // https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleshortversionstring
+        int maxComponentCount = 3;
+        // However, if the number of components is less than three, historically, jpackage will not add missing components.
+        maxComponentCount = Integer.min(maxComponentCount, verComponents.length);
+        return DottedVersion.greedy(IntStream.range(0, maxComponentCount).mapToObj(idx -> {
+            if (idx < verComponents.length) {
+                return verComponents[idx].toString();
+            } else {
+                return "0";
+            }
+        }).collect(joining(".")));
+    }
+
+    @Override
+    default Path appImageDirName() {
+        if (isRuntime()) {
+            return Application.super.appImageDirName();
+        } else {
+            return Path.of(Application.super.appImageDirName().toString() + ".app");
+        }
+    }
+
+    /**
+     * Returns {@code true} if the application image of this application should be
+     * signed.
+     *
+     * @return {@code true} if the application image of this application should be
+     *         signed
+     */
+    default boolean sign() {
+        return signingConfig().isPresent();
+    }
+
+    @Override
+    default Map<String, String> extraAppImageFileData() {
+        return Stream.of(ExtraAppImageFileField.values()).collect(toMap(ExtraAppImageFileField::fieldName, x -> x.asString(this)));
+    }
+
+    public static MacApplication create(Application app, MacApplicationMixin mixin) {
+        return CompositeProxy.create(MacApplication.class, app, mixin);
+    }
+
+    public enum ExtraAppImageFileField {
+        SIGNED("signed", app -> Boolean.toString(app.sign())),
+        APP_STORE("app-store", app -> Boolean.toString(app.appStore()));
+
+        ExtraAppImageFileField(String fieldName, Function<MacApplication, String> getter) {
+            this.fieldName = fieldName;
+            this.getter = getter;
+        }
+
+        public String fieldName() {
+            return fieldName;
+        }
+
+        String asString(MacApplication app) {
+            return getter.apply(app);
+        }
+
+        private final String fieldName;
+        private final Function<MacApplication, String> getter;
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplicationMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplicationMixin.java
new file mode 100644
index 00000000000..9c954426567
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplicationMixin.java
@@ -0,0 +1,47 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+public interface MacApplicationMixin {
+
+    Optional<Path> icon();
+
+    String bundleName();
+
+    String bundleIdentifier();
+
+    String category();
+
+    boolean appStore();
+
+    Optional<AppImageSigningConfig> signingConfig();
+
+    record Stub(Optional<Path> icon, String bundleName, String bundleIdentifier, String category,
+            boolean appStore, Optional<AppImageSigningConfig> signingConfig) implements MacApplicationMixin {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackage.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackage.java
new file mode 100644
index 00000000000..9efd4d818be
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackage.java
@@ -0,0 +1,34 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacDmgPackage extends MacPackage, MacDmgPackageMixin {
+
+    public static MacDmgPackage create(MacPackage pkg, MacDmgPackageMixin mixin) {
+        return CompositeProxy.create(MacDmgPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
new file mode 100644
index 00000000000..0b502e7ce7e
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
@@ -0,0 +1,46 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+public interface MacDmgPackageMixin {
+
+    Optional<Path> icon();
+
+    /**
+     * Returns additional top=level content for DMG package.
+     * <p>
+     * Each item in the list can be a directory or a file.
+     *
+     * @return the additional top=level content for DMG package
+     */
+    List<Path> content();
+
+    record Stub(Optional<Path> icon, List<Path> content) implements MacDmgPackageMixin {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociation.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociation.java
new file mode 100644
index 00000000000..8cf6aa1dfbe
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociation.java
@@ -0,0 +1,34 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacFileAssociation extends FileAssociation, MacFileAssociationMixin {
+
+    public static MacFileAssociation create(FileAssociation fa, MacFileAssociationMixin mixin) {
+        return CompositeProxy.create(MacFileAssociation.class, fa, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.java
new file mode 100644
index 00000000000..ae7453fccf4
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface MacFileAssociationMixin {
+
+    String cfBundleTypeName();
+
+    String cfBundleTypeRole();
+
+    String lsHandlerRank();
+
+    Optional<Boolean> lsTypeIsPackage();
+
+    Optional<String> nsDocumentClass();
+
+    Optional<String> nsPersistentStoreTypeKey();
+
+    Optional<Boolean> lsSupportsOpeningDocumentsInPlace();
+
+    Optional<Boolean> uiSupportsDocumentBrowser();
+
+    List<String> utTypeConformsTo();
+
+    List<String> nsExportableTypes();
+
+    record Stub(String cfBundleTypeName, String cfBundleTypeRole,
+            String lsHandlerRank, Optional<Boolean> lsTypeIsPackage, Optional<String> nsDocumentClass,
+            Optional<String> nsPersistentStoreTypeKey,
+            Optional<Boolean> lsSupportsOpeningDocumentsInPlace,
+            Optional<Boolean> uiSupportsDocumentBrowser, List<String> utTypeConformsTo,
+            List<String> nsExportableTypes) implements MacFileAssociationMixin {
+
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacLauncher.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacLauncher.java
new file mode 100644
index 00000000000..09ddde8cd15
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacLauncher.java
@@ -0,0 +1,34 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacLauncher extends Launcher {
+
+    public static MacLauncher create(Launcher launcher) {
+        return CompositeProxy.create(MacLauncher.class, launcher);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java
new file mode 100644
index 00000000000..083fc225581
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java
@@ -0,0 +1,52 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacPackage extends Package, MacPackageMixin {
+
+    MacApplication app();
+
+    @Override
+    default AppImageLayout appImageLayout() {
+        if (isRuntimeInstaller()) {
+            return RUNTIME_PACKAGE_LAYOUT;
+        } else {
+            return Package.super.appImageLayout();
+        }
+    }
+
+    default Path installDir() {
+        return Path.of("/").resolve(relativeInstallDir());
+    }
+
+    public static MacPackage create(Package pkg, MacPackageMixin mixin) {
+        return CompositeProxy.create(MacPackage.class, pkg, mixin);
+    }
+
+    public static final RuntimeLayout RUNTIME_PACKAGE_LAYOUT = RuntimeLayout.create(Path.of("Contents/Home"));
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java
new file mode 100644
index 00000000000..a6f6b099764
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java
@@ -0,0 +1,49 @@
+/*
+ * 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.model;
+
+import java.util.Optional;
+
+public interface MacPackageMixin {
+
+    /**
+     * Gets sign status of the predefined app image.
+     * <p>
+     * Returns {@code Optional.of(Boolean.TRUE)} if the predefined app image is
+     * available and is signed.
+     * <p>
+     * Returns {@code Optional.of(Boolean.FALSE)} if the predefined app image is
+     * available and is unsigned.
+     * <p>
+     * Returns any empty {@link Optional} instance if the predefined app image is
+     * unavailable.
+     *
+     * @return sign status of the predefined app image if any
+     */
+    Optional<Boolean> predefinedAppImageSigned();
+
+    record Stub(Optional<Boolean> predefinedAppImageSigned) implements MacPackageMixin {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java
new file mode 100644
index 00000000000..72b442cb38d
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java
@@ -0,0 +1,43 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacPkgPackage extends MacPackage, MacPkgPackageMixin {
+
+    /**
+     * Returns {@code true} if this PKG installer should be signed.
+     *
+     * @return {@code true} if this PKG installer should be signed
+     */
+    default boolean sign() {
+        return signingConfig().isPresent();
+    }
+
+    public static MacPkgPackage create(MacPackage pkg, MacPkgPackageMixin mixin) {
+        return CompositeProxy.create(MacPkgPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackageMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackageMixin.java
new file mode 100644
index 00000000000..3e43961a09a
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackageMixin.java
@@ -0,0 +1,35 @@
+/*
+ * 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.model;
+
+import java.util.Optional;
+
+public interface MacPkgPackageMixin {
+
+    Optional<PkgSigningConfig> signingConfig();
+
+    record Stub(Optional<PkgSigningConfig> signingConfig) implements MacPkgPackageMixin {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/PkgSigningConfig.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/PkgSigningConfig.java
new file mode 100644
index 00000000000..353cd7053c6
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/PkgSigningConfig.java
@@ -0,0 +1,38 @@
+/*
+ * 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.model;
+
+import java.util.Optional;
+
+public interface PkgSigningConfig {
+
+    SigningIdentity identity();
+
+    Optional<String> keychain();
+
+    record Stub(SigningIdentity identity, Optional<String> keychain) implements PkgSigningConfig {
+    }
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/SigningIdentity.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/SigningIdentity.java
new file mode 100644
index 00000000000..6ca6ac29922
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/SigningIdentity.java
@@ -0,0 +1,32 @@
+/*
+ * 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.model;
+
+public interface SigningIdentity {
+
+    String id();
+
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl
new file mode 100644
index 00000000000..94b8a93dc1f
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl
@@ -0,0 +1,55 @@
+<?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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 stylesheet adjusts .plist file produced by `/usr/bin/pkgbuild &#45;&#45;analyze`.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!--
+    Make bundle NOT-relocatable
+  -->
+  <xsl:template match="true[preceding-sibling::key[1] = 'BundleIsRelocatable']">
+    <false/>
+  </xsl:template>
+
+  <!--
+    Remove `ChildBundles` key with value
+  -->
+  <xsl:template match="key[. = 'ChildBundles']|array[preceding-sibling::key[1] = 'ChildBundles']"/>
+
+  <!--
+    Identity transform
+  -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java
new file mode 100644
index 00000000000..381faee3802
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java
@@ -0,0 +1,123 @@
+/*
+ * 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 jdk.jpackage.internal.util.XmlUtils.toXmlConsumer;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+public final class PListWriter {
+
+    public static void writeBoolean(XMLStreamWriter xml, String key, boolean value)
+            throws XMLStreamException {
+        writeKey(xml, key);
+        xml.writeEmptyElement(Boolean.toString(value));
+    }
+
+    public static void writeBooleanOptional(XMLStreamWriter xml, String key, Optional<Boolean> value)
+            throws XMLStreamException {
+        if (value.isPresent()) {
+            writeBoolean(xml, key, value.orElseThrow());
+        }
+    }
+
+    public static void writeString(XMLStreamWriter xml, String key, Object value)
+            throws XMLStreamException {
+        writeKey(xml, key);
+        writeString(xml, value);
+    }
+
+    public static void writeStringOptional(XMLStreamWriter xml, String key, Optional<?> value)
+            throws XMLStreamException {
+        if (value.isPresent()) {
+            writeString(xml, key, value.orElseThrow());
+        }
+    }
+
+    public static void writeStringArray(XMLStreamWriter xml, String key, Collection<?> values)
+            throws XMLStreamException, IOException {
+        if (!values.isEmpty()) {
+            writeKey(xml, key);
+            writeArray(xml, toXmlConsumer(() -> {
+                for (var v : values) {
+                    writeString(xml, v);
+                }
+            }));
+        }
+    }
+
+    public static void writeStringArray(XMLStreamWriter xml, String key, Object... values)
+            throws XMLStreamException, IOException {
+        writeStringArray(xml, key, List.of(values));
+    }
+
+    public static void writeDict(XMLStreamWriter xml, XmlConsumer content)
+            throws XMLStreamException, IOException {
+        writeElement(xml, "dict", content);
+    }
+
+    public static void writeArray(XMLStreamWriter xml, XmlConsumer content)
+            throws XMLStreamException, IOException {
+        writeElement(xml, "array", content);
+    }
+
+    public static void writePList(XMLStreamWriter xml, XmlConsumer content)
+            throws XMLStreamException, IOException {
+        xml.writeDTD("plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"https://www.apple.com/DTDs/PropertyList-1.0.dtd/"");
+        xml.writeStartElement("plist");
+        xml.writeAttribute("version", "1.0");
+        content.accept(xml);
+        xml.writeEndElement();
+    }
+
+    public static void writeKey(XMLStreamWriter xml, String key)
+            throws XMLStreamException {
+        writeElement(xml, "key", key);
+    }
+
+    private static void writeString(XMLStreamWriter xml, Object value)
+            throws XMLStreamException {
+        writeElement(xml, "string", value.toString());
+    }
+
+    private static void writeElement(XMLStreamWriter xml, String name, String value)
+            throws XMLStreamException {
+        xml.writeStartElement(name);
+        xml.writeCharacters(value);
+        xml.writeEndElement();
+    }
+
+    private static void writeElement(XMLStreamWriter xml, String name, XmlConsumer content)
+            throws XMLStreamException, IOException {
+        xml.writeStartElement(name);
+        content.accept(xml);
+        xml.writeEndElement();
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
deleted file mode 100644
index 09d4ca5aefa..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_CONTENT;
-import static jdk.jpackage.internal.StandardBundlerParam.OUTPUT_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import jdk.jpackage.internal.resources.ResourceLocator;
-import jdk.jpackage.internal.util.FileUtils;
-import jdk.jpackage.internal.util.PathUtils;
-
-/*
- * AbstractAppImageBuilder
- *     This is sub-classed by each of the platform dependent AppImageBuilder
- * classes, and contains resource processing code common to all platforms.
- */
-
-public abstract class AbstractAppImageBuilder {
-
-    private final Path root;
-    protected final ApplicationLayout appLayout;
-
-    public AbstractAppImageBuilder(Path root) {
-        this.root = root;
-        appLayout = ApplicationLayout.platformAppImage().resolveAt(root);
-    }
-
-    public InputStream getResourceAsStream(String name) {
-        return ResourceLocator.class.getResourceAsStream(name);
-    }
-
-    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);
-    }
-
-    ApplicationLayout getAppLayout() {
-        return appLayout;
-    }
-
-    protected void copyApplication(Map<String, ? super Object> params)
-            throws IOException {
-        Path inputPath = SOURCE_DIR.fetchFrom(params);
-        if (inputPath != null) {
-            inputPath = inputPath.toAbsolutePath();
-
-            List<Path> excludes = new ArrayList<>();
-
-            for (var path : List.of(TEMP_ROOT.fetchFrom(params), OUTPUT_DIR.fetchFrom(params), root)) {
-                if (Files.isDirectory(path)) {
-                    path = path.toAbsolutePath();
-                    if (path.startsWith(inputPath) && !Files.isSameFile(path, inputPath)) {
-                        excludes.add(path);
-                    }
-                }
-            }
-
-            FileUtils.copyRecursive(inputPath,
-                    appLayout.appDirectory().toAbsolutePath(), excludes);
-        }
-
-        if (withAppImageFile(params)) {
-            AppImageFile.save(root, params);
-        }
-
-        List<String> items = APP_CONTENT.fetchFrom(params);
-        for (String item : items) {
-            FileUtils.copyRecursive(Path.of(item),
-                appLayout.contentDirectory().resolve(Path.of(item).getFileName()),
-                LinkOption.NOFOLLOW_LINKS);
-        }
-    }
-
-    public static OverridableResource createIconResource(String defaultIconName,
-            BundlerParamInfo<Path> iconParam, Map<String, ? super Object> params,
-            Map<String, ? super Object> mainParams) throws IOException {
-
-        if (mainParams != null) {
-            params = AddLauncherArguments.merge(mainParams, params, ICON.getID(),
-                    iconParam.getID());
-        }
-
-        final String resourcePublicName = APP_NAME.fetchFrom(params)
-                + PathUtils.getSuffix(Path.of(defaultIconName));
-
-        IconType iconType = getLauncherIconType(params);
-        if (iconType == IconType.NoIcon) {
-            return null;
-        }
-
-        OverridableResource resource = createResource(defaultIconName, params)
-                .setCategory("icon")
-                .setExternal(iconParam.fetchFrom(params))
-                .setPublicName(resourcePublicName);
-
-        if (iconType == IconType.DefaultOrResourceDirIcon && mainParams != null) {
-            // No icon explicitly configured for this launcher.
-            // Dry-run resource creation to figure out its source.
-            final Path nullPath = null;
-            if (resource.saveToFile(nullPath)
-                    != OverridableResource.Source.ResourceDir) {
-                // No icon in resource dir for this launcher, inherit icon
-                // configured for the main launcher.
-                resource = createIconResource(defaultIconName, iconParam,
-                        mainParams, null).setLogPublicName(resourcePublicName);
-            }
-        }
-
-        return resource;
-    }
-
-    private enum IconType { DefaultOrResourceDirIcon, CustomIcon, NoIcon };
-
-    private static IconType getLauncherIconType(Map<String, ? super Object> params) {
-        Path launcherIcon = ICON.fetchFrom(params);
-        if (launcherIcon == null) {
-            return IconType.DefaultOrResourceDirIcon;
-        }
-
-        if (launcherIcon.toFile().getName().isEmpty()) {
-            return IconType.NoIcon;
-        }
-
-        return IconType.CustomIcon;
-    }
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
index e28a444a045..762b65b530e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.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
@@ -40,14 +40,6 @@
  */
 abstract class AbstractBundler implements Bundler {
 
-    static final BundlerParamInfo<Path> IMAGES_ROOT =
-            new StandardBundlerParam<>(
-            "imagesRoot",
-            Path.class,
-            params ->
-                StandardBundlerParam.TEMP_ROOT.fetchFrom(params).resolve("images"),
-            (s, p) -> null);
-
     @Override
     public String toString() {
         return getName();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
index 39178186e8e..192630a5656 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
@@ -25,20 +25,19 @@
 
 package jdk.jpackage.internal;
 
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
+import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.PackagerException;
 
 
 class AppImageBundler extends AbstractBundler {
@@ -86,15 +85,21 @@ public final boolean validate(Map<String, ? super Object> params)
     @Override
     public final Path execute(Map<String, ? super Object> params,
             Path outputParentDir) throws PackagerException {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            return PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
-        }
+
+        final var predefinedAppImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
 
         try {
-            return createAppBundle(params, outputParentDir);
+            if (predefinedAppImage == null) {
+                Path rootDirectory = createRoot(params, outputParentDir);
+                appImageSupplier.prepareApplicationFiles(params, rootDirectory);
+                return rootDirectory;
+            } else {
+                appImageSupplier.prepareApplicationFiles(params, predefinedAppImage);
+                return predefinedAppImage;
+            }
         } catch (PackagerException pe) {
             throw pe;
-        } catch (RuntimeException|IOException|ConfigException ex) {
+        } catch (RuntimeException|IOException ex) {
             Log.verbose(ex);
             throw new PackagerException(ex);
         }
@@ -110,17 +115,14 @@ public final boolean isDefault() {
         return false;
     }
 
-    final AppImageBundler setDependentTask(boolean v) {
-        dependentTask = v;
-        return this;
-    }
+    @FunctionalInterface
+    static interface AppImageSupplier {
 
-    final boolean isDependentTask() {
-        return dependentTask;
+        void prepareApplicationFiles(Map<String, ? super Object> params,
+                Path root) throws PackagerException, IOException;
     }
 
-    final AppImageBundler setAppImageSupplier(
-            Function<Path, AbstractAppImageBuilder> v) {
+    final AppImageBundler setAppImageSupplier(AppImageSupplier v) {
         appImageSupplier = v;
         return this;
     }
@@ -145,11 +147,9 @@ private Path createRoot(Map<String, ? super Object> params,
             imageName = imageName + ".app";
         }
 
-        if (!dependentTask) {
-            Log.verbose(MessageFormat.format(
-                    I18N.getString("message.creating-app-bundle"),
-                    imageName, outputDirectory.toAbsolutePath()));
-        }
+        Log.verbose(MessageFormat.format(
+                I18N.getString("message.creating-app-bundle"),
+                imageName, outputDirectory.toAbsolutePath()));
 
         // Create directory structure
         Path rootDirectory = outputDirectory.resolve(imageName);
@@ -163,36 +163,6 @@ private Path createRoot(Map<String, ? super Object> params,
         return rootDirectory;
     }
 
-    private Path createAppBundle(Map<String, ? super Object> params,
-            Path outputDirectory) throws PackagerException, IOException,
-            ConfigException {
-
-        boolean hasAppImage =
-                PREDEFINED_APP_IMAGE.fetchFrom(params) != null;
-        boolean hasRuntimeImage =
-                PREDEFINED_RUNTIME_IMAGE.fetchFrom(params) != null;
-
-        Path rootDirectory = hasAppImage ?
-                PREDEFINED_APP_IMAGE.fetchFrom(params) :
-                createRoot(params, outputDirectory);
-
-        AbstractAppImageBuilder appBuilder = appImageSupplier.apply(rootDirectory);
-        if (!hasAppImage) {
-            if (!hasRuntimeImage) {
-                JLinkBundlerHelper.execute(params,
-                        appBuilder.getAppLayout().runtimeHomeDirectory());
-            } else {
-                StandardBundlerParam.copyPredefinedRuntimeImage(
-                        params, appBuilder.getAppLayout());
-            }
-        }
-
-        appBuilder.prepareApplicationFiles(params);
-
-        return rootDirectory;
-    }
-
-    private boolean dependentTask;
     private ParamsValidator paramsValidator;
-    private Function<Path, AbstractAppImageBuilder> appImageSupplier;
+    private AppImageSupplier appImageSupplier;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
new file mode 100644
index 00000000000..f34b10cd0a5
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.ApplicationLayout;
+
+record AppImageDesc(AppImageLayout appImageLayout, Path path) {
+
+    AppImageDesc {
+        Objects.requireNonNull(appImageLayout);
+        Objects.requireNonNull(path);
+    }
+
+    AppImageLayout resolvedAppImagelayout() {
+        return appImageLayout.resolveAt(path);
+    }
+
+    Optional<ApplicationLayout> asResolvedApplicationLayout() {
+        return asApplicationLayout().map(v -> v.resolveAt(path));
+    }
+
+    Optional<ApplicationLayout> asApplicationLayout() {
+        if (appImageLayout instanceof ApplicationLayout layout) {
+            return Optional.of(layout);
+        } else {
+            return Optional.empty();
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
index a8032979bb2..c80549dca89 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.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
@@ -24,123 +24,57 @@
  */
 package jdk.jpackage.internal;
 
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.NoSuchFileException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
+import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
 import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.NamedNodeMap;
 import org.xml.sax.SAXException;
 
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_AS_SERVICE;
-import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
-import static jdk.jpackage.internal.StandardBundlerParam.MENU_HINT;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_STORE;
-import jdk.jpackage.internal.util.XmlUtils;
 
 final class AppImageFile {
 
-    // These values will be loaded from AppImage xml file.
-    private final String appVersion;
-    private final String launcherName;
-    private final String mainClass;
-    private final List<LauncherInfo> addLauncherInfos;
-    private final String creatorVersion;
-    private final String creatorPlatform;
-    private final boolean signed;
-    private final boolean appStore;
-
-    private static final String FILENAME = ".jpackage.xml";
-
-    private static final Map<OperatingSystem, String> PLATFORM_LABELS = Map.of(
-            OperatingSystem.LINUX, "linux",
-            OperatingSystem.WINDOWS, "windows",
-            OperatingSystem.MACOS, "macOS");
-
-    private AppImageFile(Path appImageDir, String appVersion, String launcherName,
-            String mainClass, List<LauncherInfo> launcherInfos,
-            String creatorVersion, String creatorPlatform, String signedStr,
-            String appStoreStr) {
-        boolean isValid = true;
-
-        if (appVersion == null || appVersion.length() == 0) {
-            isValid = false;
-        }
-
-        if (launcherName == null || launcherName.length() == 0) {
-            isValid = false;
-        }
-
-        if (mainClass == null || mainClass.length() == 0) {
-            isValid = false;
-        }
-
-        for (var launcher : launcherInfos) {
-            if ("".equals(launcher.getName())) {
-                isValid = false;
-            }
-        }
-
-        if (!Objects.equals(getVersion(), creatorVersion)) {
-            isValid = false;
-        }
-
-        if (!Objects.equals(getPlatform(), creatorPlatform)) {
-            isValid = false;
-        }
-
-        if (signedStr == null ||
-                !("true".equals(signedStr) || "false".equals(signedStr))) {
-            isValid = false;
-        }
-
-        if (appStoreStr == null ||
-                !("true".equals(appStoreStr) || "false".equals(appStoreStr))) {
-            isValid = false;
-        }
+    AppImageFile(Application app) {
+        this(new ApplicationData(app));
+    }
 
-        if (!isValid) {
-            throw new RuntimeException(MessageFormat.format(I18N.getString(
-                "error.invalid-app-image"), appImageDir,
-                AppImageFile.getPathInAppImage(appImageDir)));
-        }
+    private AppImageFile(ApplicationData app) {
 
-        this.appVersion = appVersion;
-        this.launcherName = launcherName;
-        this.mainClass = mainClass;
-        this.addLauncherInfos = launcherInfos;
-        this.creatorVersion = creatorVersion;
-        this.creatorPlatform = creatorPlatform;
-        this.signed = "true".equals(signedStr);
-        this.appStore = "true".equals(appStoreStr);
+        appVersion = app.version();
+        launcherName = app.mainLauncherName();
+        mainClass = app.mainLauncherMainClassName();
+        extra = app.extra;
+        creatorVersion = getVersion();
+        creatorPlatform = getPlatform();
+        addLauncherInfos = app.additionalLaunchers;
     }
 
     /**
      * Returns list of additional launchers configured for the application.
-     * Each item in the list is not null or empty string.
+     *
      * Returns empty list for application without additional launchers.
      */
     List<LauncherInfo> getAddLaunchers() {
@@ -154,6 +88,13 @@ String getAppVersion() {
         return appVersion;
     }
 
+    /**
+     * Returns application name. Never returns null or empty value.
+     */
+    String getAppName() {
+        return launcherName;
+    }
+
     /**
      * Returns main application launcher name. Never returns null or empty value.
      */
@@ -168,324 +109,279 @@ String getMainClass() {
         return mainClass;
     }
 
-    public boolean isSigned() {
-        return signed;
-    }
-
-    public boolean isAppStore() {
-        return appStore;
-    }
-
     /**
-     * Returns path to application image info file.
-     * @param appImageDir - path to application image
+     * Returns additional properties. Never returns null.
      */
-    public static Path getPathInAppImage(Path appImageDir) {
-        return ApplicationLayout.platformAppImage()
-                .resolveAt(appImageDir)
-                .appDirectory()
-                .resolve(FILENAME);
+    Map<String, String> getExtra() {
+        return extra;
     }
 
     /**
      * Saves file with application image info in application image using values
-     * from current instance.
-     * @param appImageDir - path to application image
-     * @throws IOException
-     */
-    void save(Path appImageDir) throws IOException {
-        AppImageFile.save(appImageDir, null, this);
-    }
-
-    /**
-     * Saves file with application image info in application image.
-     * @param appImageDir - path to application image
-     * @param params - parameters used to generate application image
-     * @throws IOException
+     * from this instance.
      */
-    static void save(Path appImageDir, Map<String, Object> params)
-            throws IOException {
-        AppImageFile.save(appImageDir, params, null);
-    }
-
-    /**
-     * Saves file with application image info in application image using params
-     * or appImage. Both params or appImage cannot be valid.
-     * @param appImageDir - path to application image
-     * @param params - parameters used to generate application image
-     * @param appImage - instance of already existing application image file
-     * @throws IOException
-     * @throws IllegalArgumentException - If both params and appImage are null or
-     *                                    If both params and appImage are not null
-     */
-    private static void save(Path appImageDir,
-            Map<String, Object> params,
-            AppImageFile appImage) throws IOException {
-        if ((params == null && appImage == null) ||
-            (params != null && appImage != null)) {
-                throw new IllegalArgumentException();
-        }
-
-        final String appVersionSave;
-        final String mainLauncherSave;
-        final String mainClassSave;
-        final String signedSave;
-        final String appStoreSave;
-        final List<LauncherInfo> addLauncherInfoSave;
-        if (params != null) {
-            appVersionSave = VERSION.fetchFrom(params);
-            mainLauncherSave = APP_NAME.fetchFrom(params);
-            mainClassSave = MAIN_CLASS.fetchFrom(params);
-            signedSave = SIGN_BUNDLE.fetchFrom(params).toString();
-            appStoreSave = APP_STORE.fetchFrom(params).toString();
-            addLauncherInfoSave = null;
-        } else {
-            appVersionSave = appImage.getAppVersion();
-            mainLauncherSave = appImage.getLauncherName();
-            mainClassSave = appImage.getMainClass();
-            signedSave = String.valueOf(appImage.isSigned());
-            appStoreSave = String.valueOf(appImage.isAppStore());
-            addLauncherInfoSave = appImage.getAddLaunchers();
-        }
-
-        XmlUtils.createXml(getPathInAppImage(appImageDir), xml -> {
+    void save(ApplicationLayout appLayout) throws IOException {
+        XmlUtils.createXml(getPathInAppImage(appLayout), xml -> {
             xml.writeStartElement("jpackage-state");
-            xml.writeAttribute("version", getVersion());
-            xml.writeAttribute("platform", getPlatform());
+            xml.writeAttribute("version", creatorVersion);
+            xml.writeAttribute("platform", creatorPlatform);
 
             xml.writeStartElement("app-version");
-            xml.writeCharacters(appVersionSave);
+            xml.writeCharacters(appVersion);
             xml.writeEndElement();
 
             xml.writeStartElement("main-launcher");
-            xml.writeCharacters(mainLauncherSave);
+            xml.writeCharacters(launcherName);
             xml.writeEndElement();
 
             xml.writeStartElement("main-class");
-            xml.writeCharacters(mainClassSave);
+            xml.writeCharacters(mainClass);
             xml.writeEndElement();
 
-            xml.writeStartElement("signed");
-            xml.writeCharacters(signedSave);
-            xml.writeEndElement();
-
-            xml.writeStartElement("app-store");
-            xml.writeCharacters(appStoreSave);
-            xml.writeEndElement();
-
-            if (addLauncherInfoSave != null) {
-                for (var li : addLauncherInfoSave) {
-                    addLauncherInfo(xml, li);
-                }
-            } else {
-                List<Map<String, ? super Object>> addLaunchers =
-                    ADD_LAUNCHERS.fetchFrom(params);
+            for (var extraKey : extra.keySet().stream().sorted().toList()) {
+                xml.writeStartElement(extraKey);
+                xml.writeCharacters(extra.get(extraKey));
+                xml.writeEndElement();
+            }
 
-                for (var launcherParams : addLaunchers) {
-                    var li = new LauncherInfo(launcherParams);
-                    addLauncherInfo(xml, li);
+            for (var li : addLauncherInfos) {
+                xml.writeStartElement("add-launcher");
+                xml.writeAttribute("name", li.name());
+                xml.writeAttribute("service", Boolean.toString(li.service()));
+                for (var extraKey : li.extra().keySet().stream().sorted().toList()) {
+                    xml.writeStartElement(extraKey);
+                    xml.writeCharacters(li.extra().get(extraKey));
+                    xml.writeEndElement();
                 }
+                xml.writeEndElement();
             }
         });
     }
 
-    static void addLauncherInfo(XMLStreamWriter xml, LauncherInfo li)
-            throws XMLStreamException {
-        xml.writeStartElement("add-launcher");
-        xml.writeAttribute("name", li.getName());
-        xml.writeAttribute("shortcut", Boolean.toString(li.isShortcut()));
-        xml.writeAttribute("menu", Boolean.toString(li.isMenu()));
-        xml.writeAttribute("service", Boolean.toString(li.isService()));
-        xml.writeEndElement();
+    /**
+     * Returns path to application image info file.
+     * @param appLayout - application layout
+     */
+    static Path getPathInAppImage(ApplicationLayout appLayout) {
+        return appLayout.appDirectory().resolve(FILENAME);
     }
 
     /**
      * Loads application image info from application image.
-     * @param appImageDir - path to application image
-     * @return valid info about application image or null
-     * @throws IOException
+     * @param appImageDir - path at which to resolve the given application layout
+     * @param appLayout - application layout
      */
-    public static AppImageFile load(Path appImageDir) {
+    static AppImageFile load(Path appImageDir, ApplicationLayout appLayout) throws ConfigException, IOException {
+        var srcFilePath = getPathInAppImage(appLayout.resolveAt(appImageDir));
         try {
-            Document doc = readXml(appImageDir);
-
-            XPath xPath = XPathFactory.newInstance().newXPath();
-
-            String appVersion = xpathQueryNullable(xPath,
-                    "/jpackage-state/app-version/text()", doc);
-
-            String mainLauncher = xpathQueryNullable(xPath,
-                    "/jpackage-state/main-launcher/text()", doc);
-
-            String mainClass = xpathQueryNullable(xPath,
-                    "/jpackage-state/main-class/text()", doc);
+            final Document doc = XmlUtils.initDocumentBuilder().parse(Files.newInputStream(srcFilePath));
 
-            List<LauncherInfo> launcherInfos = new ArrayList<>();
+            final XPath xPath = XPathFactory.newInstance().newXPath();
 
-            String platform = xpathQueryNullable(xPath,
-                    "/jpackage-state/@platform", doc);
-
-            String version = xpathQueryNullable(xPath,
-                    "/jpackage-state/@version", doc);
+            final var isPlatformValid = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/@platform").findFirst().map(
+                    Node::getNodeValue).map(getPlatform()::equals).orElse(false);
+            if (!isPlatformValid) {
+                throw new InvalidAppImageFileException();
+            }
 
-            String signedStr = xpathQueryNullable(xPath,
-                    "/jpackage-state/signed/text()", doc);
+            final var isVersionValid = XmlUtils.queryNodes(doc, xPath, "/jpackage-state/@version").findFirst().map(
+                    Node::getNodeValue).map(getVersion()::equals).orElse(false);
+            if (!isVersionValid) {
+                throw new InvalidAppImageFileException();
+            }
 
-            String appStoreStr = xpathQueryNullable(xPath,
-                    "/jpackage-state/app-store/text()", doc);
+            final AppImageProperties props;
+            try {
+                props = AppImageProperties.main(doc, xPath);
+            } catch (IllegalArgumentException ex) {
+                throw new InvalidAppImageFileException(ex);
+            }
 
-            NodeList launcherNodes = (NodeList) xPath.evaluate(
-                    "/jpackage-state/add-launcher", doc,
-                    XPathConstants.NODESET);
+            final var additionalLaunchers = AppImageProperties.launchers(doc, xPath).stream().map(launcherProps -> {
+                try {
+                    return new LauncherInfo(launcherProps.get("name"),
+                            launcherProps.find("service").map(Boolean::parseBoolean).orElse(false), launcherProps.getExtra());
+                } catch (IllegalArgumentException ex) {
+                    throw new InvalidAppImageFileException(ex);
+                }
+            }).toList();
 
-            for (int i = 0; i != launcherNodes.getLength(); i++) {
-                 launcherInfos.add(new LauncherInfo(launcherNodes.item(i)));
-            }
+            return new AppImageFile(new ApplicationData(props.get("app-version"), props.get("main-launcher"),
+                    props.get("main-class"), props.getExtra(), additionalLaunchers));
 
-            return new AppImageFile(appImageDir, appVersion, mainLauncher,
-                    mainClass, launcherInfos, version, platform, signedStr,
-                    appStoreStr);
         } catch (XPathExpressionException ex) {
             // This should never happen as XPath expressions should be correct
             throw new RuntimeException(ex);
-        } catch (NoSuchFileException nsfe) {
-            // non jpackage generated app-image (no app/.jpackage.xml)
-            throw new RuntimeException(MessageFormat.format(I18N.getString(
-                    "error.foreign-app-image"), appImageDir));
-        } catch (IOException ioe) {
-            throw new RuntimeException(ioe);
+        } catch (SAXException ex) {
+            // Exception reading input XML (probably malformed XML)
+            throw new IOException(ex);
+        } catch (NoSuchFileException ex) {
+            throw I18N.buildConfigException("error.foreign-app-image", appImageDir).create();
+        } catch (InvalidAppImageFileException ex) {
+            // Invalid input XML
+            throw I18N.buildConfigException("error.invalid-app-image", appImageDir, srcFilePath).create();
         }
     }
 
-    /**
-     * Returns copy of AppImageFile, but with signed set to true if AppImageFile
-     * is not marked as signed. If AppImageFile already signed it will return
-     * instance to itself.
-     */
-    public AppImageFile copyAsSigned() {
-        if (isSigned()) {
-            return this;
-        }
+    static boolean getBooleanExtraFieldValue(String fieldId, AppImageFile appImageFile) {
+        Objects.requireNonNull(fieldId);
+        Objects.requireNonNull(appImageFile);
+        return Optional.ofNullable(appImageFile.getExtra().get(fieldId)).map(Boolean::parseBoolean).orElse(false);
+    }
 
-        // Pass null for appImageDir, it is used only to show location of
-        // .jpackage.xml in case of error. copyAsSigned() should not produce
-        // invalid app image file.
-        return new AppImageFile(null, getAppVersion(),
-                getLauncherName(), getMainClass(), getAddLaunchers(),
-                getVersion(), getPlatform(), "true", String.valueOf(isAppStore()));
+    static String getVersion() {
+        return System.getProperty("java.version");
     }
 
-    public static Document readXml(Path appImageDir) throws IOException {
-        try {
-            Path path = getPathInAppImage(appImageDir);
-
-            DocumentBuilderFactory dbf =
-                    DocumentBuilderFactory.newDefaultInstance();
-            dbf.setFeature(
-                   "http://apache.org/xml/features/nonvalidating/load-external-dtd",
-                    false);
-            DocumentBuilder b = dbf.newDocumentBuilder();
-            return b.parse(Files.newInputStream(path));
-        } catch (ParserConfigurationException | SAXException ex) {
-            // Let caller sort this out
-            throw new IOException(ex);
-        }
+    static String getPlatform() {
+        return PLATFORM_LABELS.get(OperatingSystem.current());
     }
 
-    /**
-     * Returns list of LauncherInfo objects configured for the application.
-     * The first item in the returned list is main launcher.
-     * Following items in the list are names of additional launchers.
-     */
-    static List<LauncherInfo> getLaunchers(Path appImageDir,
-            Map<String, Object> params) {
-        List<LauncherInfo> launchers = new ArrayList<>();
-        if (appImageDir != null) {
-            AppImageFile appImageInfo = AppImageFile.load(appImageDir);
-            launchers.add(new LauncherInfo(
-                    appImageInfo.getLauncherName(), params));
-                    launchers.addAll(appImageInfo.getAddLaunchers());
-            return launchers;
+    private static final class AppImageProperties {
+        private AppImageProperties(Map<String, String> data, Set<String> stdKeys) {
+            this.data = data;
+            this.stdKeys = stdKeys;
         }
 
-        launchers.add(new LauncherInfo(params));
-        ADD_LAUNCHERS.fetchFrom(params).stream()
-                .map(launcherParams -> new LauncherInfo(launcherParams))
-                .forEach(launchers::add);
-        return launchers;
-    }
+        static AppImageProperties main(Document xml, XPath xPath) throws XPathExpressionException {
+            final var data = queryProperties(xml.getDocumentElement(), xPath, MAIN_PROPERTIES_XPATH_QUERY);
+            return new AppImageProperties(data, MAIN_ELEMENT_NAMES);
+        }
 
-    public static String extractAppName(Path appImageDir) {
-        return AppImageFile.load(appImageDir).getLauncherName();
-    }
+        static AppImageProperties launcher(Element addLauncherNode, XPath xPath) throws XPathExpressionException {
+            final var attrData = XmlUtils.toStream(addLauncherNode.getAttributes())
+                    .collect(toMap(Node::getNodeName, Node::getNodeValue));
 
-    public static String extractMainClass(Path appImageDir) {
-        return AppImageFile.load(appImageDir).getMainClass();
-    }
+            final var extraData = queryProperties(addLauncherNode, xPath, LAUNCHER_PROPERTIES_XPATH_QUERY);
 
-    private static String xpathQueryNullable(XPath xPath, String xpathExpr,
-            Document xml) throws XPathExpressionException {
-        NodeList nodes = (NodeList) xPath.evaluate(xpathExpr, xml,
-                XPathConstants.NODESET);
-        if (nodes != null && nodes.getLength() > 0) {
-            return nodes.item(0).getNodeValue();
+            final Map<String, String> data = new HashMap<>(attrData);
+            data.putAll(extraData);
+
+            return new AppImageProperties(data, LAUNCHER_ATTR_NAMES);
         }
-        return null;
-    }
 
-    public static String getVersion() {
-        return System.getProperty("java.version");
-    }
+        static List<AppImageProperties> launchers(Document xml, XPath xPath) throws XPathExpressionException {
+            return XmlUtils.queryNodes(xml, xPath, "/jpackage-state/add-launcher")
+                    .map(Element.class::cast).map(toFunction(e -> {
+                        return launcher(e, xPath);
+                    })).toList();
+        }
 
-    public static String getPlatform() {
-        return PLATFORM_LABELS.get(OperatingSystem.current());
-    }
+        String get(String name) {
+            return find(name).orElseThrow(InvalidAppImageFileException::new);
+        }
 
-    static class LauncherInfo {
-        private final String name;
-        private final boolean shortcut;
-        private final boolean menu;
-        private final boolean service;
+        Optional<String> find(String name) {
+            return Optional.ofNullable(data.get(name));
+        }
 
-        private LauncherInfo(Map<String, Object> params) {
-            this(APP_NAME.fetchFrom(params), params);
+        Map<String, String> getExtra() {
+            Map<String, String> extra = new HashMap<>(data);
+            stdKeys.forEach(extra::remove);
+            return extra;
         }
 
-        private LauncherInfo(String name, Map<String, Object> params) {
-            this.name = name;
-            this.shortcut = SHORTCUT_HINT.fetchFrom(params);
-            this.menu = MENU_HINT.fetchFrom(params);
-            this.service = LAUNCHER_AS_SERVICE.fetchFrom(params);
+        private static  Map<String, String> queryProperties(Element e, XPath xPath, String xpathExpr)
+                throws XPathExpressionException {
+            return XmlUtils.queryNodes(e, xPath, xpathExpr)
+                    .map(Element.class::cast)
+                    .collect(toMap(Node::getNodeName, selectedElement -> {
+                        return selectedElement.getTextContent();
+                    }, (a, b) -> b));
         }
 
-        private LauncherInfo(Node node) {
-            this.name = getAttribute(node, "name");
-            this.shortcut = !"false".equals(getAttribute(node, "shortcut"));
-            this.menu = !"false".equals(getAttribute(node, "menu"));
-            this.service = !"false".equals(getAttribute(node, "service"));
+        private static String xpathQueryForExtraProperties(Set<String> excludeNames) {
+            final String otherElementNames = excludeNames.stream().map(name -> {
+                return String.format("name() != '%s'", name);
+            }).collect(joining(" and "));
+
+            return String.format("*[(%s) and not(*)]", otherElementNames);
         }
 
-        private String getAttribute(Node item, String attr) {
-            NamedNodeMap attrs = item.getAttributes();
-            Node attrNode = attrs.getNamedItem(attr);
-            return ((attrNode == null) ? null : attrNode.getNodeValue());
+        private final Map<String, String> data;
+        private final Set<String> stdKeys;
+
+        private static final Set<String> LAUNCHER_ATTR_NAMES = Set.of("name", "service");
+        private static final String LAUNCHER_PROPERTIES_XPATH_QUERY = xpathQueryForExtraProperties(LAUNCHER_ATTR_NAMES);
+
+        private static final Set<String> MAIN_ELEMENT_NAMES = Set.of("app-version", "main-launcher", "main-class");
+        private static final String MAIN_PROPERTIES_XPATH_QUERY;
+
+        static {
+            final String nonEmptyMainElements = MAIN_ELEMENT_NAMES.stream().map(name -> {
+                return String.format("/jpackage-state/%s[text()]", name);
+            }).collect(joining("|"));
+
+            MAIN_PROPERTIES_XPATH_QUERY = String.format("%s|/jpackage-state/%s", nonEmptyMainElements,
+                    xpathQueryForExtraProperties(Stream.concat(MAIN_ELEMENT_NAMES.stream(),
+                            Stream.of("add-launcher")).collect(toSet())));
+        }
+    }
+
+    record LauncherInfo(String name, boolean service, Map<String, String> extra) {
+        LauncherInfo {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(extra);
+            if (name.isBlank()) {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private record ApplicationData(String version, String mainLauncherName, String mainLauncherMainClassName,
+            Map<String, String> extra, List<LauncherInfo> additionalLaunchers) {
+
+        ApplicationData {
+            Objects.requireNonNull(version);
+            Objects.requireNonNull(mainLauncherName);
+            Objects.requireNonNull(mainLauncherMainClassName);
+            Objects.requireNonNull(extra);
+            Objects.requireNonNull(additionalLaunchers);
+
+            for (final var property : List.of(version, mainLauncherName, mainLauncherMainClassName)) {
+                if (property.isBlank()) {
+                    throw new IllegalArgumentException();
+                }
+            }
         }
 
-        public String getName() {
-            return name;
+        ApplicationData(Application app) {
+            this(app, app.mainLauncher().orElseThrow());
         }
 
-        public boolean isShortcut() {
-            return shortcut;
+        private ApplicationData(Application app, Launcher mainLauncher) {
+            this(app.version(), mainLauncher.name(), mainLauncher.startupInfo().orElseThrow().qualifiedClassName(),
+                    app.extraAppImageFileData(), app.additionalLaunchers().stream().map(launcher -> {
+                        return new LauncherInfo(launcher.name(), launcher.isService(),
+                                launcher.extraAppImageFileData());
+                    }).toList());
         }
+    }
+
+    private static class InvalidAppImageFileException extends RuntimeException {
 
-        public boolean isMenu() {
-            return menu;
+        InvalidAppImageFileException() {
         }
 
-        public boolean isService() {
-            return service;
+        InvalidAppImageFileException(Throwable t) {
+            super(t);
         }
+
+        private static final long serialVersionUID = 1L;
     }
 
+    private final String appVersion;
+    private final String launcherName;
+    private final String mainClass;
+    private final Map<String, String> extra;
+    private final List<LauncherInfo> addLauncherInfos;
+    private final String creatorVersion;
+    private final String creatorPlatform;
+
+    private static final String FILENAME = ".jpackage.xml";
+
+    private static final Map<OperatingSystem, String> PLATFORM_LABELS = Map.of(
+            OperatingSystem.LINUX, "linux",
+            OperatingSystem.WINDOWS, "windows",
+            OperatingSystem.MACOS, "macOS");
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
new file mode 100644
index 00000000000..82b715317b2
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+
+import java.nio.file.Path;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import jdk.jpackage.internal.AppImageFile.LauncherInfo;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+import jdk.jpackage.internal.model.RuntimeBuilder;
+
+final class ApplicationBuilder {
+
+    Application create() throws ConfigException {
+        Objects.requireNonNull(appImageLayout);
+
+        final var launchersAsList = Optional.ofNullable(launchers).map(
+                ApplicationLaunchers::asList).orElseGet(List::of);
+
+        final var launcherCount = launchersAsList.size();
+
+        if (launcherCount != launchersAsList.stream().map(Launcher::name).distinct().count()) {
+            throw buildConfigException("ERR_NoUniqueName").create();
+        }
+
+        final String effectiveName;
+        if (name != null) {
+            effectiveName = name;
+        } else if (!launchersAsList.isEmpty()) {
+            effectiveName = launchers.mainLauncher().name();
+        } else {
+            throw buildConfigException("error.no.name").advice("error.no.name.advice").create();
+        }
+
+        Objects.requireNonNull(launchersAsList);
+
+        return new Application.Stub(
+                effectiveName,
+                Optional.ofNullable(description).orElse(effectiveName),
+                Optional.ofNullable(version).orElseGet(DEFAULTS::version),
+                Optional.ofNullable(vendor).orElseGet(DEFAULTS::vendor),
+                Optional.ofNullable(copyright).orElseGet(DEFAULTS::copyright),
+                Optional.ofNullable(srcDir),
+                Optional.ofNullable(contentDirs).orElseGet(List::of),
+                appImageLayout, Optional.ofNullable(runtimeBuilder), launchersAsList, Map.of());
+    }
+
+    ApplicationBuilder runtimeBuilder(RuntimeBuilder v) {
+        runtimeBuilder = v;
+        return this;
+    }
+
+    ApplicationBuilder initFromAppImage(AppImageFile appImageFile,
+            Function<LauncherInfo, Launcher> mapper) {
+        if (version == null) {
+            version = appImageFile.getAppVersion();
+        }
+        if (name == null) {
+            name = appImageFile.getAppName();
+        }
+        runtimeBuilder = null;
+
+        var mainLauncherInfo = new LauncherInfo(appImageFile.getLauncherName(), false, Map.of());
+
+        launchers = new ApplicationLaunchers(
+                mapper.apply(mainLauncherInfo),
+                appImageFile.getAddLaunchers().stream().map(mapper).toList());
+
+        return this;
+    }
+
+    ApplicationBuilder launchers(ApplicationLaunchers v) {
+        launchers = v;
+        return this;
+    }
+
+    Optional<ApplicationLaunchers> launchers() {
+        return Optional.ofNullable(launchers);
+    }
+
+    ApplicationBuilder appImageLayout(AppImageLayout v) {
+        appImageLayout = v;
+        return this;
+    }
+
+    ApplicationBuilder name(String v) {
+        name = v;
+        return this;
+    }
+
+    ApplicationBuilder description(String v) {
+        description = v;
+        return this;
+    }
+
+    ApplicationBuilder version(String v) {
+        version = v;
+        return this;
+    }
+
+    ApplicationBuilder vendor(String v) {
+        vendor = v;
+        return this;
+    }
+
+    ApplicationBuilder copyright(String v) {
+        copyright = v;
+        return this;
+    }
+
+    ApplicationBuilder srcDir(Path v) {
+        srcDir = v;
+        return this;
+    }
+
+    ApplicationBuilder contentDirs(List<Path> v) {
+        contentDirs = v;
+        return this;
+    }
+
+    static Launcher overrideLauncherStartupInfo(Launcher launcher, LauncherStartupInfo startupInfo) {
+        return new Launcher.Stub(launcher.name(), Optional.of(startupInfo),
+                launcher.fileAssociations(), launcher.isService(), launcher.description(),
+                launcher.icon(), launcher.defaultIconResourceName(), launcher.extraAppImageFileData());
+    }
+
+    record MainLauncherStartupInfo(String qualifiedClassName) implements LauncherStartupInfo {
+        @Override
+        public List<String> javaOptions() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<String> defaultParameters() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public List<Path> classPath() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private record Defaults(String version, String vendor) {
+        String copyright() {
+            return I18N.format("param.copyright.default", new Date());
+        }
+    }
+
+    private String name;
+    private String description;
+    private String version;
+    private String vendor;
+    private String copyright;
+    private Path srcDir;
+    private List<Path> contentDirs;
+    private AppImageLayout appImageLayout;
+    private RuntimeBuilder runtimeBuilder;
+    private ApplicationLaunchers launchers;
+
+    private static final Defaults DEFAULTS = new Defaults(
+            "1.0",
+            I18N.getString("param.vendor.default"));
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
new file mode 100644
index 00000000000..e2686c17128
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
@@ -0,0 +1,153 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.PackagingPipeline.ApplicationImageTaskAction;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.CustomLauncherIcon;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.PathUtils;
+
+
+final class ApplicationImageUtils {
+
+    static Optional<OverridableResource> createLauncherIconResource(Application app,
+            Launcher launcher,
+            Function<String, OverridableResource> resourceSupplier) {
+        final String defaultIconName = launcher.defaultIconResourceName();
+        final String resourcePublicName = launcher.executableName() + PathUtils.getSuffix(Path.of(defaultIconName));
+
+        if (!launcher.hasIcon()) {
+            return Optional.empty();
+        }
+
+        OverridableResource resource = resourceSupplier.apply(defaultIconName)
+                .setCategory("icon")
+                .setPublicName(resourcePublicName);
+
+        launcher.icon().flatMap(CustomLauncherIcon::fromLauncherIcon).map(CustomLauncherIcon::path).ifPresent(resource::setExternal);
+
+        if (launcher.hasDefaultIcon() && app.mainLauncher().orElseThrow() != launcher) {
+            // No icon explicitly configured for this launcher.
+            // Dry-run resource creation to figure out its source.
+            final Path nullPath = null;
+            if (toSupplier(() -> resource.saveToFile(nullPath)).get() != OverridableResource.Source.ResourceDir) {
+                // No icon in resource dir for this launcher, inherit icon
+                // configured for the main launcher.
+                return createLauncherIconResource(
+                        app, app.mainLauncher().orElseThrow(),
+                        resourceSupplier
+                ).map(r -> r.setLogPublicName(resourcePublicName));
+            }
+        }
+
+        return Optional.of(resource);
+    }
+
+    static ApplicationImageTaskAction<Application, ApplicationLayout> createWriteRuntimeAction() {
+        return env -> {
+            env.app().runtimeBuilder().orElseThrow().createRuntime(env.resolvedLayout());
+        };
+    }
+
+    static ApplicationImageTaskAction<Application, ApplicationLayout> createWriteAppImageFileAction() {
+        return env -> {
+            new AppImageFile(env.app()).save(env.resolvedLayout());
+        };
+    }
+
+    static ApplicationImageTaskAction<Application, ApplicationLayout> createCopyContentAction(Supplier<List<Path>> excludeCopyDirs) {
+        return env -> {
+            var excludeCandidates = Stream.concat(
+                    excludeCopyDirs.get().stream(),
+                    Stream.of(env.env().buildRoot(), env.env().appImageDir())
+            ).map(Path::toAbsolutePath).toList();
+
+            env.app().srcDir().ifPresent(toConsumer(srcDir -> {
+                copyRecursive(srcDir, env.resolvedLayout().appDirectory(), excludeCandidates);
+            }));
+
+            for (var srcDir : env.app().contentDirs()) {
+                copyRecursive(srcDir,
+                        env.resolvedLayout().contentDirectory().resolve(srcDir.getFileName()),
+                        excludeCandidates);
+            }
+        };
+    }
+
+    static ApplicationImageTaskAction<Application, ApplicationLayout> createWriteLaunchersAction() {
+        return env -> {
+            for (var launcher : env.app().launchers()) {
+                // Create corresponding .cfg file
+                new CfgFile(env.app(), launcher).create(env.resolvedLayout());
+
+                // Copy executable to launchers folder
+                Path executableFile = env.resolvedLayout().launchersDirectory().resolve(
+                        launcher.executableNameWithSuffix());
+                try (var in = launcher.executableResource()) {
+                    Files.createDirectories(executableFile.getParent());
+                    Files.copy(in, executableFile);
+                }
+
+                // Make it executable for everyone. It is essential to make the launcher executable for others
+                // on macOS. Otherwise, launchers in installed DMG or PKG packages will be
+                // unavailable for anyone but the user who installed them.
+                executableFile.toFile().setExecutable(true, false);
+            }
+        };
+    }
+
+    private static void copyRecursive(Path srcDir, Path dstDir, List<Path> excludeDirs) throws IOException {
+        srcDir = srcDir.toAbsolutePath();
+
+        List<Path> excludes = new ArrayList<>();
+
+        for (var path : excludeDirs) {
+            if (Files.isDirectory(path)) {
+                if (path.startsWith(srcDir) && !Files.isSameFile(path, srcDir)) {
+                    excludes.add(path);
+                }
+            }
+        }
+
+        FileUtils.copyRecursive(srcDir, dstDir.toAbsolutePath(), excludes, LinkOption.NOFOLLOW_LINKS);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
deleted file mode 100644
index 230e4beb49b..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
+++ /dev/null
@@ -1,240 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.util.PathGroup;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * Application directory layout.
- */
-public final class ApplicationLayout {
-    enum PathRole {
-        /**
-         * Java run-time directory.
-         */
-        RUNTIME,
-
-        /**
-         * Java run-time home directory.
-         */
-        RUNTIME_HOME,
-
-        /**
-         * Application data directory.
-         */
-        APP,
-
-        /**
-         * Directory with application launchers.
-         */
-        LAUNCHERS,
-
-        /**
-         * Directory for files for desktop integration.
-         */
-        DESKTOP,
-
-        /**
-         * Directory with application Java modules.
-         */
-        MODULES,
-
-        /**
-         * Linux app launcher shared library.
-         */
-        LINUX_APPLAUNCHER_LIB,
-
-        /**
-         * Location of additional application content
-         */
-        CONTENT
-    }
-
-    ApplicationLayout(Map<Object, Path> paths) {
-        data = new PathGroup(paths);
-    }
-
-    private ApplicationLayout(PathGroup data) {
-        this.data = data;
-    }
-
-    public PathGroup pathGroup() {
-        return data;
-    }
-
-    public ApplicationLayout resolveAt(Path root) {
-        return new ApplicationLayout(pathGroup().resolveAt(root));
-    }
-
-    public List<Path> roots() {
-        return data.roots();
-    }
-
-    public long sizeInBytes() throws IOException {
-        return data.sizeInBytes();
-    }
-
-    public void copy(ApplicationLayout other) throws IOException {
-        data.copy(other.data);
-    }
-
-    public void move(ApplicationLayout other) throws IOException {
-        data.move(other.data);
-    }
-
-    public void transform(ApplicationLayout other, PathGroup.TransformHandler handler) throws IOException {
-        data.transform(other.data, handler);
-    }
-
-    /**
-     * Path to launchers directory.
-     */
-    public Path launchersDirectory() {
-        return pathGroup().getPath(PathRole.LAUNCHERS);
-    }
-
-    /**
-     * Path to application data directory.
-     */
-    public Path appDirectory() {
-        return pathGroup().getPath(PathRole.APP);
-    }
-
-    /**
-     * Path to Java run-time directory.
-     */
-    public Path runtimeDirectory() {
-        return pathGroup().getPath(PathRole.RUNTIME);
-    }
-
-    /**
-     * Path to Java run-time home directory.
-     */
-    public Path runtimeHomeDirectory() {
-        return pathGroup().getPath(PathRole.RUNTIME_HOME);
-    }
-
-    /**
-     * Path to application mods directory.
-     */
-    public Path appModsDirectory() {
-        return pathGroup().getPath(PathRole.MODULES);
-    }
-
-    /**
-     * Path to directory with application's desktop integration files.
-     */
-    public Path destktopIntegrationDirectory() {
-        return pathGroup().getPath(PathRole.DESKTOP);
-    }
-
-    /**
-     * Path to directory with additional application content.
-     */
-    public Path contentDirectory() {
-        return pathGroup().getPath(PathRole.CONTENT);
-    }
-
-    static ApplicationLayout linuxAppImage() {
-        return new ApplicationLayout(Map.of(
-                PathRole.LAUNCHERS, Path.of("bin"),
-                PathRole.APP, Path.of("lib/app"),
-                PathRole.RUNTIME, Path.of("lib/runtime"),
-                PathRole.RUNTIME_HOME, Path.of("lib/runtime"),
-                PathRole.DESKTOP, Path.of("lib"),
-                PathRole.MODULES, Path.of("lib/app/mods"),
-                PathRole.LINUX_APPLAUNCHER_LIB, Path.of("lib/libapplauncher.so"),
-                PathRole.CONTENT, Path.of("lib")
-        ));
-    }
-
-    static ApplicationLayout windowsAppImage() {
-        return new ApplicationLayout(Map.of(
-                PathRole.LAUNCHERS, Path.of(""),
-                PathRole.APP, Path.of("app"),
-                PathRole.RUNTIME, Path.of("runtime"),
-                PathRole.RUNTIME_HOME, Path.of("runtime"),
-                PathRole.DESKTOP, Path.of(""),
-                PathRole.MODULES, Path.of("app/mods"),
-                PathRole.CONTENT, Path.of("")
-        ));
-    }
-
-    static ApplicationLayout macAppImage() {
-        return new ApplicationLayout(Map.of(
-                PathRole.LAUNCHERS, Path.of("Contents/MacOS"),
-                PathRole.APP, Path.of("Contents/app"),
-                PathRole.RUNTIME, Path.of("Contents/runtime"),
-                PathRole.RUNTIME_HOME, Path.of("Contents/runtime/Contents/Home"),
-                PathRole.DESKTOP, Path.of("Contents/Resources"),
-                PathRole.MODULES, Path.of("Contents/app/mods"),
-                PathRole.CONTENT, Path.of("Contents")
-        ));
-    }
-
-    public static ApplicationLayout platformAppImage() {
-        if (OperatingSystem.isWindows()) {
-            return windowsAppImage();
-        }
-
-        if (OperatingSystem.isLinux()) {
-            return linuxAppImage();
-        }
-
-        if (OperatingSystem.isMacOS()) {
-            return macAppImage();
-        }
-
-        throw new IllegalArgumentException("Unknown platform: " + OperatingSystem.current());
-    }
-
-    public static ApplicationLayout javaRuntime() {
-        return new ApplicationLayout(Map.of(PathRole.RUNTIME, Path.of("")));
-    }
-
-    public static ApplicationLayout linuxUsrTreePackageImage(Path prefix,
-            String packageName) {
-        final Path lib = prefix.resolve(Path.of("lib", packageName));
-        return new ApplicationLayout(Map.of(
-                PathRole.LAUNCHERS, prefix.resolve("bin"),
-                PathRole.APP, lib.resolve("app"),
-                PathRole.RUNTIME, lib.resolve("runtime"),
-                PathRole.RUNTIME_HOME, lib.resolve("runtime"),
-                PathRole.DESKTOP, lib,
-                PathRole.MODULES, lib.resolve("app/mods"),
-                PathRole.LINUX_APPLAUNCHER_LIB, lib.resolve(
-                        "lib/libapplauncher.so"),
-                PathRole.CONTENT, lib
-        ));
-    }
-
-    private final PathGroup data;
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
new file mode 100644
index 00000000000..0ea72ae160c
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
@@ -0,0 +1,71 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ApplicationLayout;
+
+
+final class ApplicationLayoutUtils {
+
+    public static final ApplicationLayout PLATFORM_APPLICATION_LAYOUT;
+
+    private static final ApplicationLayout WIN_APPLICATION_LAYOUT = ApplicationLayout.build()
+            .setAll("")
+            .appDirectory("app")
+            .runtimeDirectory("runtime")
+            .appModsDirectory(Path.of("app", "mods"))
+            .create();
+
+    private static final ApplicationLayout MAC_APPLICATION_LAYOUT = ApplicationLayout.build()
+            .launchersDirectory("Contents/MacOS")
+            .appDirectory("Contents/app")
+            .runtimeDirectory("Contents/runtime/Contents/Home")
+            .desktopIntegrationDirectory("Contents/Resources")
+            .appModsDirectory("Contents/app/mods")
+            .contentDirectory("Contents")
+            .create();
+
+    private static final ApplicationLayout LINUX_APPLICATION_LAYOUT = ApplicationLayout.build()
+            .launchersDirectory("bin")
+            .appDirectory("lib/app")
+            .runtimeDirectory("lib/runtime")
+            .desktopIntegrationDirectory("lib")
+            .appModsDirectory("lib/app/mods")
+            .contentDirectory("lib")
+            .create();
+
+    static {
+        switch (OperatingSystem.current()) {
+            case WINDOWS -> PLATFORM_APPLICATION_LAYOUT = WIN_APPLICATION_LAYOUT;
+            case MACOS -> PLATFORM_APPLICATION_LAYOUT = MAC_APPLICATION_LAYOUT;
+            case LINUX -> PLATFORM_APPLICATION_LAYOUT = LINUX_APPLICATION_LAYOUT;
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+}
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 96a6c5f6e00..4700231a162 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -31,7 +31,6 @@
 import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -138,7 +137,9 @@ public Arguments(String[] args) {
     // CLIOptions is public for DeployParamsTest
     public enum CLIOptions {
         PACKAGE_TYPE("type", "t", OptionCategories.PROPERTY, () -> {
-            context().deployParams.setTargetFormat(popArg());
+            var type = popArg();
+            context().deployParams.setTargetFormat(type);
+            setOptionValue("type", type);
         }),
 
         INPUT ("input", "i", OptionCategories.PROPERTY, () -> {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnv.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnv.java
new file mode 100644
index 00000000000..1d2a43bf5d6
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnv.java
@@ -0,0 +1,95 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+interface BuildEnv {
+
+    Path buildRoot();
+
+    boolean verbose();
+
+    Optional<Path> resourceDir();
+
+    /**
+     * Returns path to application image directory.
+     *
+     * The return value is supposed to be used as a parameter for
+     * ApplicationLayout#resolveAt function.
+     */
+    default Path appImageDir() {
+        return buildRoot().resolve("image");
+    }
+
+    default Path configDir() {
+        return buildRoot().resolve("config");
+    }
+
+    OverridableResource createResource(String defaultName);
+
+    static BuildEnv withAppImageDir(BuildEnv env, Path appImageDir) {
+        return ((Internal.DefaultBuildEnv)env).copyWithAppImageDir(appImageDir);
+    }
+
+    static BuildEnv create(Path buildRoot, Optional<Path> resourceDir, boolean verbose, Class<?> resourceLocator) {
+        return new Internal.DefaultBuildEnv(buildRoot, resourceDir, verbose, resourceLocator, Optional.empty());
+    }
+
+    static final class Internal {
+        private static record DefaultBuildEnv(Path buildRoot, Optional<Path> resourceDir,
+                boolean verbose, Class<?> resourceLocator, Optional<Path> optAppImageDir) implements BuildEnv {
+
+            DefaultBuildEnv {
+                Objects.requireNonNull(buildRoot);
+                Objects.requireNonNull(resourceDir);
+                Objects.requireNonNull(resourceLocator);
+                Objects.requireNonNull(optAppImageDir);
+            }
+
+            DefaultBuildEnv copyWithAppImageDir(Path appImageDir) {
+                return new DefaultBuildEnv(buildRoot, resourceDir, verbose, resourceLocator, Optional.of(appImageDir));
+            }
+
+            @Override
+            public Path appImageDir() {
+                return optAppImageDir.orElseGet(BuildEnv.super::appImageDir);
+            }
+
+            @Override
+            public OverridableResource createResource(String defaultName) {
+                final OverridableResource resource;
+                if (defaultName != null) {
+                    resource = new OverridableResource(defaultName, resourceLocator);
+                } else {
+                    resource = new OverridableResource();
+                }
+                return resourceDir.map(resource::setResourceDir).orElse(resource);
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
new file mode 100644
index 00000000000..9974e407ca7
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.resources.ResourceLocator;
+
+final class BuildEnvBuilder {
+
+    BuildEnvBuilder(Path root) {
+        this.root = Objects.requireNonNull(root);
+    }
+
+    BuildEnv create() throws ConfigException {
+        Objects.requireNonNull(appImageDir);
+
+        var exceptionBuilder = I18N.buildConfigException("ERR_BuildRootInvalid", root);
+        if (Files.isDirectory(root)) {
+            try (var rootDirContents = Files.list(root)) {
+                if (rootDirContents.findAny().isPresent()) {
+                    // The root directory is not empty.
+                    throw exceptionBuilder.create();
+                }
+            } catch (IOException ioe) {
+                throw exceptionBuilder.cause(ioe).create();
+            }
+        } else if (Files.exists(root)) {
+            // The root is not a directory.
+            throw exceptionBuilder.create();
+        }
+
+        return BuildEnv.withAppImageDir(BuildEnv.create(root, Optional.ofNullable(resourceDir),
+                verbose, ResourceLocator.class), appImageDir);
+    }
+
+    BuildEnvBuilder verbose(boolean v) {
+        verbose = v;
+        return this;
+    }
+
+    BuildEnvBuilder resourceDir(Path v) {
+        resourceDir = v;
+        return this;
+    }
+
+    BuildEnvBuilder appImageDir(Path v) {
+        appImageDir = v;
+        return this;
+    }
+
+    BuildEnvBuilder appImageDirFor(Application app) {
+        appImageDir = defaultAppImageDir(root).resolve(app.appImageDirName());
+        return this;
+    }
+
+    BuildEnvBuilder appImageDirForPackage() {
+        appImageDir = defaultAppImageDir(root);
+        return this;
+    }
+
+    private static Path defaultAppImageDir(Path root) {
+        return root.resolve("image");
+    }
+
+    private Path appImageDir;
+    private Path resourceDir;
+    private boolean verbose;
+
+    private final Path root;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
new file mode 100644
index 00000000000..cc9b490b188
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
+import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE;
+
+import java.util.Map;
+import jdk.jpackage.internal.model.ConfigException;
+
+final class BuildEnvFromParams {
+
+    static BuildEnv create(Map<String, ? super Object> params) throws ConfigException {
+
+        final var builder = new BuildEnvBuilder(TEMP_ROOT.fetchFrom(params));
+
+        RESOURCE_DIR.copyInto(params, builder::resourceDir);
+        VERBOSE.copyInto(params, builder::verbose);
+
+        final var app = FromParams.APPLICATION.findIn(params).orElseThrow();
+
+        final var pkg = FromParams.getCurrentPackage(params);
+
+        if (app.isRuntime()) {
+            builder.appImageDir(PREDEFINED_RUNTIME_IMAGE.fetchFrom(params));
+        } else if (StandardBundlerParam.hasPredefinedAppImage(params)) {
+            builder.appImageDir(StandardBundlerParam.getPredefinedAppImage(params));
+        } else if (pkg.isPresent()) {
+            builder.appImageDirForPackage();
+        } else {
+            builder.appImageDirFor(app);
+        }
+
+        return builder.create();
+    }
+
+    static final BundlerParamInfo<BuildEnv> BUILD_ENV = BundlerParamInfo.createBundlerParam(
+            BuildEnv.class, BuildEnvFromParams::create);
+}
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 48499dcf29c..81030b18f6d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
@@ -25,37 +25,72 @@
 
 package jdk.jpackage.internal;
 
+import java.nio.file.Path;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import jdk.jpackage.internal.util.function.ThrowingFunction;
 
 /**
  * BundlerParamInfo<T>
  *
  * A BundlerParamInfo encapsulates an individual bundler parameter of type <T>.
+ *
+ * @param id The command line and hashmap name of the parameter
+ *
+ * @param valueType Type of the parameter
+ *
+ * @param defaultValueFunction If the value is not set, and no fallback value is found, the
+ * parameter uses the value returned by the producer.
+ *
+ * @param stringConverter An optional string converter for command line arguments.
  */
-class BundlerParamInfo<T> {
+record BundlerParamInfo<T>(String id, Class<T> valueType,
+        Function<Map<String, ? super Object>, T> defaultValueFunction,
+        BiFunction<String, Map<String, ? super Object>, T> stringConverter) {
 
-    /**
-     * The command line and hashmap name of the parameter
-     */
-    String id;
+    BundlerParamInfo {
+        Objects.requireNonNull(id);
+        Objects.requireNonNull(valueType);
+    }
 
-    /**
-     * Type of the parameter
-     */
-    Class<T> valueType;
+    static BundlerParamInfo<String> createStringBundlerParam(String id) {
+        return new BundlerParamInfo<>(id, String.class, null, null);
+    }
 
-    /**
-     * If the value is not set, and no fallback value is found,
-     * the parameter uses the value returned by the producer.
-     */
-    Function<Map<String, ? super Object>, T> defaultValueFunction;
+    static BundlerParamInfo<Boolean> createBooleanBundlerParam(String id) {
+        return new BundlerParamInfo<>(id, Boolean.class, null, BundlerParamInfo::toBoolean);
+    }
 
-    /**
-     * An optional string converter for command line arguments.
-     */
-    BiFunction<String, Map<String, ? super Object>, T> stringConverter;
+    static BundlerParamInfo<Path> createPathBundlerParam(String id) {
+        return new BundlerParamInfo<>(id, Path.class, null, BundlerParamInfo::toPath);
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    static <U> BundlerParamInfo<U> createBundlerParam(String id, Class<? super U> valueType,
+            ThrowingFunction<Map<String, ? super Object>, U> valueCtor) {
+        return new BundlerParamInfo(id, valueType, ThrowingFunction.toFunction(valueCtor), null);
+    }
+
+    static <U> BundlerParamInfo<U> createBundlerParam(Class<? super U> valueType,
+            ThrowingFunction<Map<String, ? super Object>, U> valueCtor) {
+        return createBundlerParam(valueType.getName(), valueType, valueCtor);
+    }
+
+    static boolean toBoolean(String value, Map<String, ? super Object> params) {
+        if (value == null || "null".equalsIgnoreCase(value)) {
+            return false;
+        } else {
+            return Boolean.valueOf(value);
+        }
+    }
+
+    static Path toPath(String value, Map<String, ? super Object> params) {
+        return Path.of(value);
+    }
 
     String getID() {
         return id;
@@ -66,8 +101,7 @@ Class<T> getValueType() {
     }
 
     /**
-     * Returns true if value was not provided on command line for this
-     * parameter.
+     * Returns true if value was not provided on command line for this parameter.
      *
      * @param params - params from which value will be fetch
      * @return true if value was not provided on command line, false otherwise
@@ -89,8 +123,7 @@ boolean getIsDefaultValue(Map<String, ? super Object> params) {
         return defaultValueFunction;
     }
 
-    BiFunction<String, Map<String, ? super Object>,T>
-            getStringConverter() {
+    BiFunction<String, Map<String, ? super Object>, T> getStringConverter() {
         return stringConverter;
     }
 
@@ -103,7 +136,7 @@ final T fetchFrom(Map<String, ? super Object> params,
             boolean invokeDefault) {
         Object o = params.get(getID());
         if (o instanceof String && getStringConverter() != null) {
-            return getStringConverter().apply((String)o, params);
+            return getStringConverter().apply((String) o, params);
         }
 
         Class<T> klass = getValueType();
@@ -121,7 +154,7 @@ final T fetchFrom(Map<String, ? super Object> params,
         }
 
         if (invokeDefault && (getDefaultValueFunction() != null)) {
-            T result =  getDefaultValueFunction().apply(params);
+            T result = getDefaultValueFunction().apply(params);
             if (result != null) {
                 params.put(getID(), result);
             }
@@ -131,4 +164,16 @@ final T fetchFrom(Map<String, ? super Object> params,
         // ultimate fallback
         return null;
     }
+
+    Optional<T> findIn(Map<String, ? super Object> params) {
+        if (params.containsKey(getID())) {
+            return Optional.of(fetchFrom(params, true));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    void copyInto(Map<String, ? super Object> params, Consumer<T> consumer) {
+        findIn(params).ifPresent(consumer);
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
index 9ab3151121b..6b4ba3c4410 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.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
@@ -25,72 +25,62 @@
 package jdk.jpackage.internal;
 
 import java.io.IOException;
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Stream;
-import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherJarStartupInfo;
+import jdk.jpackage.internal.model.LauncherModularStartupInfo;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+
 
 /**
  * App launcher's config file.
  */
 final class CfgFile {
-    CfgFile() {
-        appLayout = ApplicationLayout.platformAppImage();
-    }
-
-    CfgFile initFromParams(Map<String, ? super Object> params) {
-        launcherData = LAUNCHER_DATA.fetchFrom(params);
-        launcherName = APP_NAME.fetchFrom(params);
-        javaOptions = JAVA_OPTIONS.fetchFrom(params);
-        arguments = ARGUMENTS.fetchFrom(params);
-        version = VERSION.fetchFrom(params);
-        return this;
+    CfgFile(Application app, Launcher launcher) {
+        startupInfo = launcher.startupInfo().orElseThrow();
+        outputFileName = launcher.executableName() + ".cfg";
+        version = app.version();
     }
 
-    void create(Path appImage) throws IOException {
+    void create(ApplicationLayout appLayout) throws IOException {
         List<Map.Entry<String, Object>> content = new ArrayList<>();
 
-        ApplicationLayout appCfgLayout = createAppCfgLayout();
+        final var refs = new Referencies(appLayout);
 
         content.add(Map.entry("[Application]", SECTION_TAG));
 
-        if (launcherData.isModular()) {
-            content.add(Map.entry("app.mainmodule", launcherData.moduleName()
-                    + "/" + launcherData.qualifiedClassName()));
-        } else {
-            if (launcherData.mainJarName() != null) {
-                Path mainJarPath = appCfgLayout.appDirectory().resolve(
-                        launcherData.mainJarName());
-
-                if (launcherData.isClassNameFromMainJar()) {
-                    content.add(Map.entry("app.mainjar", mainJarPath));
-                } else {
-                    content.add(Map.entry("app.classpath", mainJarPath));
-                }
+        if (startupInfo instanceof LauncherModularStartupInfo modularStartupInfo) {
+            content.add(Map.entry("app.mainmodule", modularStartupInfo.moduleName()
+                    + "/" + startupInfo.qualifiedClassName()));
+        } else if (startupInfo instanceof LauncherJarStartupInfo jarStartupInfo) {
+            Path mainJarPath = refs.appDirectory().resolve(jarStartupInfo.jarPath());
+
+            if (jarStartupInfo.isJarWithMainClass()) {
+                content.add(Map.entry("app.mainjar", mainJarPath));
+            } else {
+                content.add(Map.entry("app.classpath", mainJarPath));
             }
 
-            if (!launcherData.isClassNameFromMainJar()) {
-                content.add(Map.entry("app.mainclass",
-                        launcherData.qualifiedClassName()));
+            if (!jarStartupInfo.isJarWithMainClass()) {
+                content.add(Map.entry("app.mainclass", startupInfo.qualifiedClassName()));
             }
+        } else {
+            throw new UnsupportedOperationException();
         }
 
-        for (var value : launcherData.classPath()) {
+        for (var value : Optional.ofNullable(startupInfo.classPath()).orElseGet(List::of)) {
             content.add(Map.entry("app.classpath",
-                    appCfgLayout.appDirectory().resolve(value).toString()));
+                    refs.appDirectory().resolve(value).toString()));
         }
 
-        ApplicationLayout appImagelayout = appLayout.resolveAt(appImage);
-        Path modsDir = appImagelayout.appModsDirectory();
-
         content.add(Map.entry("[JavaOptions]", SECTION_TAG));
 
         // always let app know it's version
@@ -98,17 +88,17 @@ void create(Path appImage) throws IOException {
                 "java-options", "-Djpackage.app-version=" + version));
 
         // add user supplied java options if there are any
-        for (var value : javaOptions) {
+        for (var value : Optional.ofNullable(startupInfo.javaOptions()).orElseGet(List::of)) {
             content.add(Map.entry("java-options", value));
         }
 
         // add module path if there is one
-        if (Files.isDirectory(modsDir)) {
+        if (Files.isDirectory(appLayout.appModsDirectory())) {
             content.add(Map.entry("java-options", "--module-path"));
-            content.add(Map.entry("java-options",
-                    appCfgLayout.appModsDirectory()));
+            content.add(Map.entry("java-options", refs.appModsDirectory()));
         }
 
+        var arguments = Optional.ofNullable(startupInfo.defaultParameters()).orElseGet(List::of);
         if (!arguments.isEmpty()) {
             content.add(Map.entry("[ArgOptions]", SECTION_TAG));
             for (var value : arguments) {
@@ -116,8 +106,8 @@ void create(Path appImage) throws IOException {
             }
         }
 
-        Path cfgFile = appImagelayout.appDirectory().resolve(launcherName + ".cfg");
-        Files.createDirectories(IOUtils.getParent(cfgFile));
+        Path cfgFile = appLayout.appDirectory().resolve(outputFileName);
+        Files.createDirectories(cfgFile.getParent());
 
         boolean[] addLineBreakAtSection = new boolean[1];
         Stream<String> lines = content.stream().map(entry -> {
@@ -133,21 +123,26 @@ void create(Path appImage) throws IOException {
         Files.write(cfgFile, (Iterable<String>) lines::iterator);
     }
 
-    private ApplicationLayout createAppCfgLayout() {
-        ApplicationLayout appCfgLayout = appLayout.resolveAt(Path.of("$ROOTDIR"));
-        appCfgLayout.pathGroup().setPath(ApplicationLayout.PathRole.APP,
-                Path.of("$APPDIR"));
-        appCfgLayout.pathGroup().setPath(ApplicationLayout.PathRole.MODULES,
-                appCfgLayout.appDirectory().resolve(appCfgLayout.appModsDirectory().getFileName()));
-        return appCfgLayout;
+    private record Referencies(Path appModsDirectory) {
+
+        Referencies {
+            if (!appModsDirectory.startsWith(appDirectory())) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        Referencies(ApplicationLayout appLayout) {
+            this(Path.of("$APPDIR").resolve(appLayout.appModsDirectory().getFileName()));
+        }
+
+        Path appDirectory() {
+            return Path.of("$APPDIR");
+        }
     }
 
-    private String launcherName;
-    private String version;
-    private LauncherData launcherData;
-    List<String> arguments;
-    List<String> javaOptions;
-    private final ApplicationLayout appLayout;
+    private final LauncherStartupInfo startupInfo;
+    private final String version;
+    private final String outputFileName;
 
     private static final Object SECTION_TAG = new Object();
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CompositeProxyTunnel.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CompositeProxyTunnel.java
new file mode 100644
index 00000000000..661264a94a4
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CompositeProxyTunnel.java
@@ -0,0 +1,45 @@
+/*
+ * 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;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+final class CompositeProxyTunnel implements CompositeProxy.InvokeTunnel {
+
+    @Override
+    public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
+        return method.invoke(obj, args);
+    }
+
+    @Override
+    public Object invokeDefault(Object proxy, Method method, Object[] args) throws Throwable {
+        return InvocationHandler.invokeDefault(proxy, method, args);
+    }
+
+    static final CompositeProxyTunnel INSTANCE = new CompositeProxyTunnel();
+
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java
deleted file mode 100644
index 36de9bbbe72..00000000000
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java
+++ /dev/null
@@ -1,108 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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;
-
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import jdk.jpackage.internal.model.ConfigException;
-
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
-
-final class FileAssociation {
-    void verify() {
-        if (extensions.isEmpty()) {
-            Log.error(I18N.getString(
-                    "message.creating-association-with-null-extension"));
-        }
-    }
-
-    static void verify(List<FileAssociation> associations) throws ConfigException {
-        // only one mime type per association, at least one file extension
-        int assocIdx = 0;
-        for (var assoc : associations) {
-            ++assocIdx;
-            if (assoc.mimeTypes.isEmpty()) {
-                String msgKey = "error.no-content-types-for-file-association";
-                throw new ConfigException(
-                        MessageFormat.format(I18N.getString(msgKey), assocIdx),
-                        MessageFormat.format(I18N.getString(msgKey + ".advice"), assocIdx));
-            }
-
-            if (assoc.mimeTypes.size() > 1) {
-                String msgKey = "error.too-many-content-types-for-file-association";
-                throw new ConfigException(
-                        MessageFormat.format(I18N.getString(msgKey), assocIdx),
-                        MessageFormat.format(I18N.getString(msgKey + ".advice"), assocIdx));
-            }
-
-            assoc.verify();
-        }
-    }
-
-    static List<FileAssociation> fetchFrom(Map<String, ? super Object> params) {
-        String launcherName = APP_NAME.fetchFrom(params);
-
-        return FILE_ASSOCIATIONS.fetchFrom(params).stream().filter(
-                Objects::nonNull).map(fa -> {
-                    FileAssociation assoc = new FileAssociation();
-
-                    assoc.launcherPath = Path.of(launcherName);
-                    assoc.description = Optional.ofNullable(
-                            FA_DESCRIPTION.fetchFrom(fa))
-                            .orElse(launcherName + " association");
-                    assoc.extensions = Optional.ofNullable(
-                            FA_EXTENSIONS.fetchFrom(fa))
-                            .orElse(Collections.emptyList());
-                    assoc.mimeTypes = Optional.ofNullable(
-                            FA_CONTENT_TYPE.fetchFrom(fa))
-                            .orElse(Collections.emptyList());
-
-                    Path icon = FA_ICON.fetchFrom(fa);
-                    if (icon != null) {
-                        assoc.iconPath = icon;
-                    }
-
-                    return assoc;
-                }).toList();
-    }
-
-    Path launcherPath;
-    Path iconPath;
-    List<String> mimeTypes;
-    List<String> extensions;
-    String description;
-}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
new file mode 100644
index 00000000000..30258e520f8
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.util.CollectionUtils;
+
+final record FileAssociationGroup(List<FileAssociation> items) {
+
+    FileAssociationGroup {
+        Objects.requireNonNull(items);
+    }
+
+    boolean isEmpty() {
+        return items.isEmpty();
+    }
+
+    static Stream<FileAssociation> flatMap(Stream<FileAssociationGroup> groups) {
+        return groups.map(FileAssociationGroup::items).flatMap(List::stream);
+    }
+
+    static UnaryOperator<FileAssociationGroup> map(UnaryOperator<FileAssociation> mapper) {
+        return group -> {
+            return new FileAssociationGroup(group.items.stream().map(mapper).filter(Objects::nonNull).toList());
+        };
+    }
+
+    static UnaryOperator<FileAssociationGroup> filter(Predicate<FileAssociation> filter) {
+        return group -> {
+            return new FileAssociationGroup(group.items.stream().filter(filter).toList());
+        };
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    static class FileAssociationException extends Exception {
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static final class FileAssociationNoMimesException extends FileAssociationException {
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static final class FileAssociationNoExtensionsException extends FileAssociationException {
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    static final class Builder {
+
+        private Builder() {
+        }
+
+        FileAssociationGroup create() throws FileAssociationException {
+            if (mimeTypes == null || mimeTypes.isEmpty()) {
+                throw new FileAssociationNoMimesException();
+            }
+
+            if (extensions == null || extensions.isEmpty()) {
+                throw new FileAssociationNoExtensionsException();
+            }
+
+            return new FileAssociationGroup(mimeTypes.stream().map(mimeType -> {
+                return extensions.stream().map(ext -> {
+                    return createFileAssociation(mimeType, ext);
+                });
+            }).flatMap(x -> x).toList());
+        }
+
+        Builder icon(Path v) {
+            icon = v;
+            return this;
+        }
+
+        Builder description(String v) {
+            description = v;
+            return this;
+        }
+
+        Builder mimeTypes(Collection<String> v) {
+            mimeTypes = CollectionUtils.toSet(v);
+            return this;
+        }
+
+        Builder extensions(Collection<String> v) {
+            extensions = CollectionUtils.toSet(v);
+            return this;
+        }
+
+        private FileAssociation createFileAssociation(String mimeType, String ext) {
+            Objects.requireNonNull(ext);
+            Objects.requireNonNull(mimeType);
+            return new FileAssociation.Stub(Optional.ofNullable(description), Optional.ofNullable(icon), mimeType, ext);
+        }
+
+        private Path icon;
+        private String description;
+        private Set<String> mimeTypes;
+        private Set<String> extensions;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationScaner.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationScaner.java
new file mode 100644
index 00000000000..b8186e8ca66
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationScaner.java
@@ -0,0 +1,100 @@
+/*
+ * 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;
+
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import jdk.jpackage.internal.model.FileAssociation;
+
+final class FileAssociationScaner {
+
+    record Result(Map<MimeType, List<FileAssociation>> mimeTypesWithMultipleExtensions,
+            Map<Extension, List<FileAssociation>> extensionsWithMultipleMimeTypes,
+            Map<MimeTypeWithExtension, List<FileAssociation>> duplicates) {
+    }
+
+    Result scan(Collection<FileAssociation> fileAssociations) {
+        if (fileAssociations.stream().map(Box::new).distinct().count() != fileAssociations.size()) {
+            throw new IllegalArgumentException("Multiple occurrences of the same fa instance in the given container");
+        }
+
+        final var mimeTypesWithMultipleExtensions = fileAssociations.stream().collect(
+                collectingAndThen(groupingBy(MimeType::new), FileAssociationScaner::filterDuplicates));
+        final var extensionsWithMultipleMimeTypes = fileAssociations.stream().collect(
+                collectingAndThen(groupingBy(Extension::new), FileAssociationScaner::filterDuplicates));
+        final var duplicates = fileAssociations.stream().collect(
+                collectingAndThen(groupingBy(MimeTypeWithExtension::new), FileAssociationScaner::filterDuplicates));
+
+        return new Result(mimeTypesWithMultipleExtensions, extensionsWithMultipleMimeTypes, duplicates);
+    }
+
+    private static <T> Map<T, List<FileAssociation>> filterDuplicates(Map<T, List<FileAssociation>> v) {
+        return v.entrySet().stream().filter(e -> {
+            return e.getValue().size() > 1;
+        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    record MimeTypeWithExtension(String mimeType, String extension) {
+        MimeTypeWithExtension(FileAssociation fa) {
+            this(fa.mimeType(), fa.extension());
+        }
+    }
+
+    record MimeType(String value) {
+        MimeType(FileAssociation fa) {
+            this(fa.mimeType());
+        }
+    }
+
+    record Extension(String value) {
+        Extension(FileAssociation fa) {
+            this(fa.extension());
+        }
+    }
+
+    private static class Box {
+        Box(FileAssociation value) {
+            this.value = value;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            return value == ((Box)other).value;
+        }
+
+        @Override
+        public int hashCode() {
+            return value.hashCode();
+        }
+
+        private final FileAssociation value;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
new file mode 100644
index 00000000000..6ce387df692
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
@@ -0,0 +1,202 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
+import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
+import static jdk.jpackage.internal.StandardBundlerParam.ADD_MODULES;
+import static jdk.jpackage.internal.StandardBundlerParam.APP_CONTENT;
+import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
+import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
+import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
+import static jdk.jpackage.internal.StandardBundlerParam.ICON;
+import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
+import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.JLINK_OPTIONS;
+import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
+import static jdk.jpackage.internal.StandardBundlerParam.LIMIT_MODULES;
+import static jdk.jpackage.internal.StandardBundlerParam.MODULE_PATH;
+import static jdk.jpackage.internal.StandardBundlerParam.NAME;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE;
+import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
+import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
+import static jdk.jpackage.internal.StandardBundlerParam.getPredefinedAppImage;
+import static jdk.jpackage.internal.StandardBundlerParam.hasPredefinedAppImage;
+import static jdk.jpackage.internal.StandardBundlerParam.isRuntimeInstaller;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import jdk.jpackage.internal.AppImageFile.LauncherInfo;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.function.ThrowingFunction;
+
+final class FromParams {
+
+    static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
+            Function<Map<String, ? super Object>, Launcher> launcherMapper,
+            ApplicationLayout appLayout) throws ConfigException, IOException {
+        return createApplicationBuilder(params, launcherMapper, appLayout, Optional.of(RuntimeLayout.DEFAULT));
+    }
+
+    static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> params,
+            Function<Map<String, ? super Object>, Launcher> launcherMapper,
+            ApplicationLayout appLayout, Optional<RuntimeLayout> predefinedRuntimeLayout) throws ConfigException, IOException {
+
+        final var appBuilder = new ApplicationBuilder();
+
+        APP_NAME.copyInto(params, appBuilder::name);
+        DESCRIPTION.copyInto(params, appBuilder::description);
+        appBuilder.version(VERSION.fetchFrom(params));
+        VENDOR.copyInto(params, appBuilder::vendor);
+        COPYRIGHT.copyInto(params, appBuilder::copyright);
+        SOURCE_DIR.copyInto(params, appBuilder::srcDir);
+        APP_CONTENT.copyInto(params, appBuilder::contentDirs);
+
+        final var isRuntimeInstaller = isRuntimeInstaller(params);
+
+        final var predefinedRuntimeImage = PREDEFINED_RUNTIME_IMAGE.findIn(params);
+
+        final var predefinedRuntimeDirectory = predefinedRuntimeLayout.flatMap(
+                layout -> predefinedRuntimeImage.map(layout::resolveAt)).map(RuntimeLayout::runtimeDirectory);
+
+        if (isRuntimeInstaller) {
+            appBuilder.appImageLayout(predefinedRuntimeLayout.orElseThrow());
+        } else {
+            appBuilder.appImageLayout(appLayout);
+
+            if (hasPredefinedAppImage(params)) {
+                final var appImageFile = PREDEFINED_APP_IMAGE_FILE.fetchFrom(params);
+                appBuilder.initFromAppImage(appImageFile, launcherInfo -> {
+                    var launcherParams = mapLauncherInfo(launcherInfo);
+                    return launcherMapper.apply(mergeParams(params, launcherParams));
+                });
+            } else {
+                final var launchers = createLaunchers(params, launcherMapper);
+
+                final var runtimeBuilderBuilder = new RuntimeBuilderBuilder();
+
+                MODULE_PATH.copyInto(params, runtimeBuilderBuilder::modulePath);
+
+                predefinedRuntimeDirectory.ifPresentOrElse(runtimeBuilderBuilder::forRuntime, () -> {
+                    final var startupInfos = launchers.asList().stream()
+                            .map(Launcher::startupInfo)
+                            .map(Optional::orElseThrow).toList();
+                    final var jlinkOptionsBuilder = runtimeBuilderBuilder.forNewRuntime(startupInfos);
+                    ADD_MODULES.copyInto(params, jlinkOptionsBuilder::addModules);
+                    LIMIT_MODULES.copyInto(params, jlinkOptionsBuilder::limitModules);
+                    JLINK_OPTIONS.copyInto(params, jlinkOptionsBuilder::options);
+                    jlinkOptionsBuilder.appy();
+                });
+
+                appBuilder.launchers(launchers).runtimeBuilder(runtimeBuilderBuilder.create());
+            }
+        }
+
+        return appBuilder;
+    }
+
+    static PackageBuilder createPackageBuilder(
+            Map<String, ? super Object> params, Application app,
+            PackageType type) throws ConfigException {
+
+        final var builder = new PackageBuilder(app, type);
+
+        builder.name(INSTALLER_NAME.fetchFrom(params));
+        DESCRIPTION.copyInto(params, builder::description);
+        VERSION.copyInto(params, builder::version);
+        ABOUT_URL.copyInto(params, builder::aboutURL);
+        LICENSE_FILE.findIn(params).map(Path::of).ifPresent(builder::licenseFile);
+        builder.predefinedAppImage(getPredefinedAppImage(params));
+        INSTALL_DIR.findIn(params).map(Path::of).ifPresent(builder::installDir);
+
+        return builder;
+    }
+
+    static <T extends Application> BundlerParamInfo<T> createApplicationBundlerParam(
+            ThrowingFunction<Map<String, ? super Object>, T> ctor) {
+        return BundlerParamInfo.createBundlerParam(Application.class, ctor);
+    }
+
+    static <T extends jdk.jpackage.internal.model.Package> BundlerParamInfo<T> createPackageBundlerParam(
+            ThrowingFunction<Map<String, ? super Object>, T> ctor) {
+        return BundlerParamInfo.createBundlerParam(jdk.jpackage.internal.model.Package.class, ctor);
+    }
+
+    static Optional<jdk.jpackage.internal.model.Package> getCurrentPackage(Map<String, ? super Object> params) {
+        return Optional.ofNullable((jdk.jpackage.internal.model.Package)params.get(
+                jdk.jpackage.internal.model.Package.class.getName()));
+    }
+
+    private static ApplicationLaunchers createLaunchers(
+            Map<String, ? super Object> params,
+            Function<Map<String, ? super Object>, Launcher> launcherMapper) {
+        var launchers = ADD_LAUNCHERS.findIn(params).orElseGet(List::of);
+
+        var mainLauncher = launcherMapper.apply(params);
+        var additionalLaunchers = launchers.stream().map(launcherParams -> {
+            return launcherMapper.apply(mergeParams(params, launcherParams));
+        }).toList();
+
+        return new ApplicationLaunchers(mainLauncher, additionalLaunchers);
+    }
+
+    private static Map<String, ? super Object> mapLauncherInfo(LauncherInfo launcherInfo) {
+        Map<String, ? super Object> launcherParams = new HashMap<>();
+        launcherParams.put(NAME.getID(), launcherInfo.name());
+        launcherParams.put(LAUNCHER_AS_SERVICE.getID(), Boolean.toString(launcherInfo.service()));
+        launcherParams.putAll(launcherInfo.extra());
+        return launcherParams;
+    }
+
+    private static Map<String, ? super Object> mergeParams(Map<String, ? super Object> mainParams,
+            Map<String, ? super Object> launcherParams) {
+        if (!launcherParams.containsKey(DESCRIPTION.getID())) {
+            launcherParams = new HashMap<>(launcherParams);
+// FIXME: this is a good improvement but it fails existing tests
+//            launcherParams.put(DESCRIPTION.getID(), String.format("%s (%s)", DESCRIPTION.fetchFrom(
+//                    mainParams), APP_NAME.fetchFrom(launcherParams)));
+            launcherParams.put(DESCRIPTION.getID(), DESCRIPTION.fetchFrom(mainParams));
+        }
+        return AddLauncherArguments.merge(mainParams, launcherParams, ICON.getID(), ADD_LAUNCHERS
+                .getID(), FILE_ASSOCIATIONS.getID());
+    }
+
+    static final BundlerParamInfo<Application> APPLICATION = createApplicationBundlerParam(null);
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
index d3093f77f50..71df0dee8f5 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
@@ -24,39 +24,51 @@
  */
 package jdk.jpackage.internal;
 
-import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.util.LocalizedExceptionBuilder;
 import jdk.jpackage.internal.util.MultiResourceBundle;
+import jdk.jpackage.internal.util.StringBundle;
 
-class I18N {
+final class I18N {
 
     static String getString(String key) {
         return BUNDLE.getString(key);
     }
 
     static String format(String key, Object ... args) {
-        var str = getString(key);
-        if (args.length != 0) {
-            return MessageFormat.format(str, args);
-        } else {
-            return str;
-        }
+        return BUNDLE.format(key, args);
     }
 
-    private static final ResourceBundle BUNDLE;
+    static LocalizedExceptionBuilder<?> buildException() {
+        return LocalizedExceptionBuilder.buildLocalizedException(BUNDLE);
+    }
+
+    static ConfigException.Builder buildConfigException() {
+        return ConfigException.build(BUNDLE);
+    }
+
+    static ConfigException.Builder buildConfigException(String msgId, Object ... args) {
+        return ConfigException.build(BUNDLE, msgId, args);
+    }
+
+    static ConfigException.Builder buildConfigException(Throwable t) {
+        return ConfigException.build(BUNDLE, t);
+    }
+
+    private static final StringBundle BUNDLE;
 
     static {
         var prefix = "jdk.jpackage.internal.resources.";
-        BUNDLE = MultiResourceBundle.create(
+        BUNDLE = StringBundle.fromResourceBundle(MultiResourceBundle.create(
                 prefix + "MainResources",
                 Map.of(
                         OperatingSystem.LINUX, List.of(prefix + "LinuxResources"),
                         OperatingSystem.MACOS, List.of(prefix + "MacResources"),
                         OperatingSystem.WINDOWS, List.of(prefix + "WinResources", prefix + "WinResourcesNoL10N")
                 )
-        );
+        ));
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/InstallableFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/InstallableFile.java
index c5128fa5dd0..0fc547e5393 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/InstallableFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/InstallableFile.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,38 +25,13 @@
 package jdk.jpackage.internal;
 
 import java.nio.file.Path;
-import java.util.Objects;
 
-final class InstallableFile {
-
-    InstallableFile(Path srcPath, Path installPath) {
-        Objects.requireNonNull(srcPath);
-
-        this.srcPath = srcPath;
-        this.installPath = installPath;
-    }
-
-    Path installPath() {
-        return installPath;
-    }
-
-    Path srcPath() {
-        return srcPath;
-    }
-
-    void applyToApplicationLayouts(ApplicationLayout src,
-            ApplicationLayout install) {
-        var key = new Object();
-        src.pathGroup().setPath(key, srcPath);
-        if (installPath != null && install != null) {
-            install.pathGroup().setPath(key, installPath);
-        }
-    }
-
-    void excludeFromApplicationLayout(ApplicationLayout layout) {
-        applyToApplicationLayouts(layout, null);
-    }
-
-    private final Path installPath;
-    private final Path srcPath;
+/**
+ * Source file that should be copied somewhere in application image tree.
+ *
+ * Has two paths:
+ *  - path where it should be picked from;
+ *  - path where it should be copied in application image;
+ */
+record InstallableFile(Path srcPath, Path installPath) {
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
similarity index 65%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
index 3b85bf730fa..c09c1ae4b1f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
@@ -22,11 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package jdk.jpackage.internal;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.module.Configuration;
@@ -35,52 +33,111 @@
 import java.lang.module.ModuleReference;
 import java.lang.module.ResolvedModule;
 import java.nio.file.Path;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.jar.JarFile;
-import java.util.regex.Matcher;
 import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import jdk.internal.module.ModulePath;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LauncherModularStartupInfo;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
 import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.model.RuntimeBuilder;
+
+final class JLinkRuntimeBuilder implements RuntimeBuilder {
+
+    private JLinkRuntimeBuilder(List<String> jlinkCmdLine) {
+        this.jlinkCmdLine = jlinkCmdLine;
+    }
 
+    @Override
+    public void createRuntime(AppImageLayout appImageLayout) throws PackagerException {
+        var args = new ArrayList<String>();
+        args.add("--output");
+        args.add(appImageLayout.runtimeDirectory().toString());
+        args.addAll(jlinkCmdLine);
 
-final class JLinkBundlerHelper {
+        StringWriter writer = new StringWriter();
+        PrintWriter pw = new PrintWriter(writer);
+
+        int retVal = LazyLoad.JLINK_TOOL.run(pw, pw, args.toArray(String[]::new));
+        String jlinkOut = writer.toString();
 
-    static void execute(Map<String, ? super Object> params, Path outputDir)
-            throws IOException, PackagerException {
+        args.add(0, "jlink");
+        Log.verbose(args, List.of(jlinkOut), retVal, -1);
+        if (retVal != 0) {
+            throw new PackagerException("error.jlink.failed", jlinkOut);
+        }
+    }
+
+    static ModuleFinder createModuleFinder(Collection<Path> modulePath) {
+        return ModuleFinder.compose(
+                ModulePath.of(JarFile.runtimeVersion(), true,
+                        modulePath.toArray(Path[]::new)),
+                ModuleFinder.ofSystem());
+    }
 
-        List<Path> modulePath =
-                StandardBundlerParam.MODULE_PATH.fetchFrom(params);
-        Set<String> addModules =
-                StandardBundlerParam.ADD_MODULES.fetchFrom(params);
-        Set<String> limitModules =
-                StandardBundlerParam.LIMIT_MODULES.fetchFrom(params);
-        List<String> options =
-                StandardBundlerParam.JLINK_OPTIONS.fetchFrom(params);
+    static RuntimeBuilder createJLinkRuntimeBuilder(List<Path> modulePath, Set<String> addModules,
+            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) throws ConfigException {
+        return new JLinkRuntimeBuilder(createJLinkCmdline(modulePath, addModules, limitModules,
+                options, startupInfos));
+    }
 
-        LauncherData launcherData = StandardBundlerParam.LAUNCHER_DATA.fetchFrom(
-                params);
+    private static List<String> createJLinkCmdline(List<Path> modulePath, Set<String> addModules,
+            Set<String> limitModules, List<String> options, List<LauncherStartupInfo> startupInfos) throws ConfigException {
+        List<String> launcherModules = startupInfos.stream().map(si -> {
+            if (si instanceof LauncherModularStartupInfo siModular) {
+                return siModular.moduleName();
+            } else {
+                return (String) null;
+            }
+        }).filter(Objects::nonNull).toList();
 
-        // Modules
-        if (!launcherData.isModular() && addModules.isEmpty()) {
-            addModules.add(ALL_DEFAULT);
+        if (launcherModules.isEmpty() && addModules.isEmpty()) {
+            addModules = Set.of(ALL_DEFAULT);
         }
 
-        Set<String> modules = createModuleList(modulePath, addModules, limitModules);
+        var modules = createModuleList(modulePath, addModules, limitModules);
 
-        if (launcherData.isModular()) {
-            modules.add(launcherData.moduleName());
+        modules.addAll(launcherModules);
+
+        var args = new ArrayList<String>();
+        if (!modulePath.isEmpty()) {
+            args.add("--module-path");
+            args.add(getPathList(modulePath));
+        }
+        if (!modules.isEmpty()) {
+            args.add("--add-modules");
+            args.add(getStringList(modules));
+        }
+        if (!limitModules.isEmpty()) {
+            args.add("--limit-modules");
+            args.add(getStringList(limitModules));
+        }
+
+        for (String option : options) {
+            switch (option) {
+                case "--output", "--add-modules", "--module-path" -> {
+                    throw new ConfigException(MessageFormat.format(I18N.getString(
+                            "error.blocked.option"), option), null);
+                }
+                default -> {
+                    args.add(option);
+                }
+            }
         }
 
-        runJLink(outputDir, modulePath, modules, limitModules, options);
+        return args;
     }
 
     /*
@@ -93,11 +150,11 @@ private static Set<String> getDefaultModules(
         // the modules in the run-time image that export an API
         Stream<String> systemRoots = ModuleFinder.ofSystem().findAll().stream()
                 .map(ModuleReference::descriptor)
-                .filter(JLinkBundlerHelper::exportsAPI)
+                .filter(JLinkRuntimeBuilder::exportsAPI)
                 .map(ModuleDescriptor::name);
 
         Set<String> roots = Stream.concat(systemRoots,
-                 addModules.stream()).collect(Collectors.toSet());
+                addModules.stream()).collect(Collectors.toSet());
 
         ModuleFinder finder = createModuleFinder(paths);
 
@@ -120,13 +177,6 @@ private static boolean exportsAPI(ModuleDescriptor descriptor) {
                 .anyMatch(e -> !e.isQualified());
     }
 
-    static ModuleFinder createModuleFinder(Collection<Path> modulePath) {
-        return ModuleFinder.compose(
-                ModulePath.of(JarFile.runtimeVersion(), true,
-                        modulePath.toArray(Path[]::new)),
-                ModuleFinder.ofSystem());
-    }
-
     private static Set<String> createModuleList(List<Path> paths,
             Set<String> addModules, Set<String> limitModules) {
 
@@ -135,11 +185,11 @@ private static Set<String> createModuleList(List<Path> paths,
         final Map<String, Supplier<Collection<String>>> phonyModules = Map.of(
                 ALL_MODULE_PATH,
                 () -> createModuleFinder(paths)
-                            .findAll()
-                            .stream()
-                            .map(ModuleReference::descriptor)
-                            .map(ModuleDescriptor::name)
-                            .collect(Collectors.toSet()),
+                        .findAll()
+                        .stream()
+                        .map(ModuleReference::descriptor)
+                        .map(ModuleDescriptor::name)
+                        .collect(Collectors.toSet()),
                 ALL_DEFAULT,
                 () -> getDefaultModules(paths, modules));
 
@@ -158,64 +208,18 @@ private static Set<String> createModuleList(List<Path> paths,
         return modules;
     }
 
-    private static void runJLink(Path output, List<Path> modulePath,
-            Set<String> modules, Set<String> limitModules,
-            List<String> options)
-            throws PackagerException, IOException {
-
-        ArrayList<String> args = new ArrayList<String>();
-        args.add("--output");
-        args.add(output.toString());
-        if (modulePath != null && !modulePath.isEmpty()) {
-            args.add("--module-path");
-            args.add(getPathList(modulePath));
-        }
-        if (modules != null && !modules.isEmpty()) {
-            args.add("--add-modules");
-            args.add(getStringList(modules));
-        }
-        if (limitModules != null && !limitModules.isEmpty()) {
-            args.add("--limit-modules");
-            args.add(getStringList(limitModules));
-        }
-        if (options != null) {
-            for (String option : options) {
-                if (option.startsWith("--output") ||
-                        option.startsWith("--add-modules") ||
-                        option.startsWith("--module-path")) {
-                    throw new PackagerException("error.blocked.option", option);
-                }
-                args.add(option);
-            }
-        }
-
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-
-        int retVal = LazyLoad.JLINK_TOOL.run(pw, pw, args.toArray(new String[0]));
-        String jlinkOut = writer.toString();
-
-        args.add(0, "jlink");
-        Log.verbose(args, List.of(jlinkOut), retVal, -1);
-
-
-        if (retVal != 0) {
-            throw new PackagerException("error.jlink.failed" , jlinkOut);
-        }
-    }
-
     private static String getPathList(List<Path> pathList) {
         return pathList.stream()
                 .map(Path::toString)
-                .map(Matcher::quoteReplacement)
                 .collect(Collectors.joining(File.pathSeparator));
     }
 
     private static String getStringList(Set<String> strings) {
-        return Matcher.quoteReplacement(strings.stream().collect(
-                Collectors.joining(",")));
+        return strings.stream().collect(Collectors.joining(","));
     }
 
+    private final List<String> jlinkCmdLine;
+
     // The token for "all modules on the module path".
     private static final String ALL_MODULE_PATH = "ALL-MODULE-PATH";
 
@@ -223,6 +227,7 @@ private static String getStringList(Set<String> strings) {
     private static final String ALL_DEFAULT = "ALL-DEFAULT";
 
     private static class LazyLoad {
+
         static final ToolProvider JLINK_TOOL = ToolProvider.findFirst(
                 "jlink").orElseThrow();
     };
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherAsService.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherAsService.java
index bf25fc229e5..b39da55c0f4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherAsService.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherAsService.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
@@ -24,26 +24,24 @@
  */
 package jdk.jpackage.internal;
 
-import java.util.Map;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
+import java.util.Objects;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.Launcher;
 
 class LauncherAsService {
 
-    LauncherAsService(String name, Map<String, Object> mainParams,
-            OverridableResource resource) {
-        if (name == null || APP_NAME.fetchFrom(mainParams).equals(name)) {
+    LauncherAsService(Application app, Launcher launcher, OverridableResource resource) {
+        this.name = launcher.name();
+
+        if (app.mainLauncher().orElseThrow() == launcher) {
             // Main launcher
-            name = APP_NAME.fetchFrom(mainParams);
-            this.description = DESCRIPTION.fetchFrom(mainParams);
+            this.description = launcher.description();
         } else {
             // Additional launcher
-            this.description = String.format("%s (%s)", DESCRIPTION.fetchFrom(
-                    mainParams), name);
+            this.description = String.format("%s (%s)", app.description(), name);
         }
 
-        this.name = name;
-        this.resource = resource;
+        this.resource = Objects.requireNonNull(resource);
         resource.addSubstitutionDataEntry("SERVICE_DESCRIPTION", description);
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
new file mode 100644
index 00000000000..5ce98165a4a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
@@ -0,0 +1,173 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.CustomLauncherIcon;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.Launcher.Stub;
+import jdk.jpackage.internal.model.LauncherIcon;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+
+final class LauncherBuilder {
+
+    Launcher create() throws ConfigException {
+        CustomLauncherIcon.fromLauncherIcon(icon)
+                .map(CustomLauncherIcon::path)
+                .ifPresent(toConsumer(LauncherBuilder::validateIcon));
+
+        final var fa = createFileAssociations(faSources, Optional.ofNullable(faTraits).orElse(DEFAULT_FA_TRAITS));
+
+        Objects.requireNonNull(defaultIconResourceName);
+
+        final var nonNullName = deriveNonNullName();
+
+        return new Stub(nonNullName, Optional.ofNullable(startupInfo), fa,
+                isService, Optional.ofNullable(description).orElse(nonNullName),
+                Optional.ofNullable(icon), defaultIconResourceName,
+                Optional.ofNullable(extraAppImageFileData).orElseGet(Map::of));
+    }
+
+    LauncherBuilder name(String v) {
+        name = v;
+        return this;
+    }
+
+    LauncherBuilder startupInfo(LauncherStartupInfo v) {
+        startupInfo = v;
+        return this;
+    }
+
+    LauncherBuilder faGroups(List<FileAssociationGroup> v) {
+        v.forEach(Objects::requireNonNull);
+        faSources = v;
+        return this;
+    }
+
+    LauncherBuilder faTraits(FileAssociationTraits v) {
+        faTraits = v;
+        return this;
+    }
+
+    LauncherBuilder isService(boolean v) {
+        isService = v;
+        return this;
+    }
+
+    LauncherBuilder description(String v) {
+        description = v;
+        return this;
+    }
+
+    LauncherBuilder icon(LauncherIcon v) {
+        icon = v;
+        return this;
+    }
+
+    LauncherBuilder defaultIconResourceName(String v) {
+        defaultIconResourceName = v;
+        return this;
+    }
+
+    LauncherBuilder extraAppImageFileData(Map<String, String> v) {
+        extraAppImageFileData = v;
+        return this;
+    }
+
+    private String deriveNonNullName() {
+        return Optional.ofNullable(name).orElseGet(() -> startupInfo.simpleClassName());
+    }
+
+    static void validateIcon(Path icon) throws ConfigException {
+        switch (OperatingSystem.current()) {
+            case WINDOWS -> {
+                if (!icon.getFileName().toString().toLowerCase().endsWith(".ico")) {
+                    throw buildConfigException().message("message.icon-not-ico", icon).create();
+                }
+            }
+            case LINUX -> {
+                if (!icon.getFileName().toString().endsWith(".png")) {
+                    throw buildConfigException().message("message.icon-not-png", icon).create();
+                }
+            }
+            case MACOS -> {
+                if (!icon.getFileName().toString().endsWith(".icns")) {
+                    throw buildConfigException().message("message.icon-not-icns", icon).create();
+                }
+            }
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+
+    record FileAssociationTraits() {
+    }
+
+    private static List<FileAssociation> createFileAssociations(
+            List<FileAssociationGroup> groups, FileAssociationTraits faTraits) throws ConfigException {
+
+        Objects.requireNonNull(groups);
+        Objects.requireNonNull(faTraits);
+
+        int faID = 1;
+        for (var group : groups) {
+            final var scanResult = new FileAssociationScaner().scan(group.items());
+
+            if (!scanResult.extensionsWithMultipleMimeTypes().isEmpty()) {
+                throw buildConfigException()
+                        .message("error.too-many-content-types-for-file-association", faID)
+                        .advice("error.too-many-content-types-for-file-association.advice", faID)
+                        .create();
+            }
+
+            faID++;
+        }
+
+        return FileAssociationGroup.flatMap(groups.stream()).toList();
+    }
+
+    private String name;
+    private LauncherStartupInfo startupInfo;
+    private List<FileAssociationGroup> faSources = List.of();
+    private FileAssociationTraits faTraits;
+    private boolean isService;
+    private String description;
+    private LauncherIcon icon;
+    private String defaultIconResourceName;
+    private Map<String, String> extraAppImageFileData;
+
+    private static final FileAssociationTraits DEFAULT_FA_TRAITS = new FileAssociationTraits();
+}
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 aedc8f72d33..d3f1f9d8328 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
@@ -141,7 +141,7 @@ private static LauncherData createModular(String mainModule,
         launcherData.modulePath = getModulePath(params);
 
         // Try to find module in the specified module path list.
-        ModuleReference moduleRef = JLinkBundlerHelper.createModuleFinder(
+        ModuleReference moduleRef = JLinkRuntimeBuilder.createModuleFinder(
                 launcherData.modulePath).find(moduleName).orElse(null);
 
         if (moduleRef != null) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
new file mode 100644
index 00000000000..b4ce1cdb200
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
@@ -0,0 +1,156 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS;
+import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
+import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE;
+import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION;
+import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS;
+import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON;
+import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
+import static jdk.jpackage.internal.StandardBundlerParam.ICON;
+import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS;
+import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_AS_SERVICE;
+import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA;
+import static jdk.jpackage.internal.StandardBundlerParam.NAME;
+import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.CustomLauncherIcon;
+import jdk.jpackage.internal.model.DefaultLauncherIcon;
+import jdk.jpackage.internal.model.FileAssociation;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherIcon;
+
+record LauncherFromParams(Optional<BiFunction<FileAssociation, Map<String, ? super Object>, FileAssociation>> faExtension) {
+
+    LauncherFromParams {
+        Objects.requireNonNull(faExtension);
+    }
+
+    LauncherFromParams() {
+        this(Optional.empty());
+    }
+
+    Launcher create(Map<String, ? super Object> params) throws ConfigException {
+        final var builder = new LauncherBuilder().defaultIconResourceName(defaultIconResourceName());
+
+        DESCRIPTION.copyInto(params, builder::description);
+        builder.icon(toLauncherIcon(ICON.findIn(params).orElse(null)));
+        LAUNCHER_AS_SERVICE.copyInto(params, builder::isService);
+        NAME.copyInto(params, builder::name);
+
+        if (PREDEFINED_APP_IMAGE.findIn(params).isEmpty()) {
+            final var startupInfoBuilder = new LauncherStartupInfoBuilder();
+
+            startupInfoBuilder.launcherData(LAUNCHER_DATA.fetchFrom(params));
+            ARGUMENTS.copyInto(params, startupInfoBuilder::defaultParameters);
+            JAVA_OPTIONS.copyInto(params, startupInfoBuilder::javaOptions);
+
+            builder.startupInfo(startupInfoBuilder.create());
+        }
+
+        final var faParamsList = FILE_ASSOCIATIONS.findIn(params).orElseGet(List::of);
+
+        final var faGroups = IntStream.range(0, faParamsList.size()).mapToObj(idx -> {
+            final var faParams = faParamsList.get(idx);
+            return toSupplier(() -> {
+                final var faGroupBuilder = FileAssociationGroup.build();
+
+                if (OperatingSystem.current() == OperatingSystem.MACOS) {
+                    FA_DESCRIPTION.copyInto(faParams, faGroupBuilder::description);
+                } else {
+                    faGroupBuilder.description(FA_DESCRIPTION.findIn(faParams).orElseGet(() -> {
+                        return String.format("%s association", toSupplier(builder::create).get().name());
+                    }));
+                }
+
+                FA_ICON.copyInto(faParams, faGroupBuilder::icon);
+                FA_EXTENSIONS.copyInto(faParams, faGroupBuilder::extensions);
+                FA_CONTENT_TYPE.copyInto(faParams, faGroupBuilder::mimeTypes);
+
+                final var faID = idx + 1;
+
+                final FileAssociationGroup faGroup;
+                try {
+                    faGroup = faGroupBuilder.create();
+                } catch (FileAssociationGroup.FileAssociationNoMimesException ex) {
+                    throw buildConfigException()
+                            .message("error.no-content-types-for-file-association", faID)
+                            .advice("error.no-content-types-for-file-association.advice", faID)
+                            .create();
+                }
+
+                if (faExtension.isPresent()) {
+                    return new FileAssociationGroup(faGroup.items().stream().map(fa -> {
+                        return faExtension.get().apply(fa, faParams);
+                    }).toList());
+                } else {
+                    return faGroup;
+                }
+            }).get();
+        }).toList();
+
+        return builder.faGroups(faGroups).create();
+    }
+
+    private static LauncherIcon toLauncherIcon(Path launcherIconPath) {
+        if (launcherIconPath == null) {
+            return DefaultLauncherIcon.INSTANCE;
+        } else if (launcherIconPath.toString().isEmpty()) {
+            return null;
+        } else {
+            return CustomLauncherIcon.create(launcherIconPath);
+        }
+    }
+
+    private static String defaultIconResourceName() {
+        switch (OperatingSystem.current()) {
+            case WINDOWS -> {
+                return "JavaApp.ico";
+            }
+            case LINUX -> {
+                return "JavaApp.png";
+            }
+            case MACOS -> {
+                return "JavaApp.icns";
+            }
+            default -> {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
new file mode 100644
index 00000000000..0f3f41a2093
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
@@ -0,0 +1,95 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.function.UnaryOperator;
+import jdk.jpackage.internal.model.LauncherJarStartupInfo;
+import jdk.jpackage.internal.model.LauncherJarStartupInfoMixin;
+import jdk.jpackage.internal.model.LauncherModularStartupInfo;
+import jdk.jpackage.internal.model.LauncherModularStartupInfoMixin;
+import jdk.jpackage.internal.model.LauncherStartupInfo.Stub;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+
+final class LauncherStartupInfoBuilder {
+
+    LauncherStartupInfo create() {
+        return decorator.apply(new Stub(qualifiedClassName, javaOptions,
+                defaultParameters, classPath));
+    }
+
+    LauncherStartupInfoBuilder launcherData(LauncherData launcherData) {
+        if (launcherData.isModular()) {
+            decorator = new ModuleStartupInfo(launcherData.moduleName(),
+                    launcherData.modulePath());
+        } else {
+            decorator = new JarStartupInfo(launcherData.mainJarName(),
+                    launcherData.isClassNameFromMainJar());
+        }
+        classPath = launcherData.classPath();
+        qualifiedClassName = launcherData.qualifiedClassName();
+        return this;
+    }
+
+    LauncherStartupInfoBuilder javaOptions(List<String> v) {
+        javaOptions = v;
+        return this;
+    }
+
+    LauncherStartupInfoBuilder defaultParameters(List<String> v) {
+        defaultParameters = v;
+        return this;
+    }
+
+    private static record ModuleStartupInfo(String moduleName,
+            List<Path> modulePath) implements UnaryOperator<LauncherStartupInfo> {
+
+        @Override
+        public LauncherStartupInfo apply(LauncherStartupInfo base) {
+            return LauncherModularStartupInfo.create(base,
+                    new LauncherModularStartupInfoMixin.Stub(moduleName,
+                            modulePath));
+        }
+    }
+
+    private static record JarStartupInfo(Path jarPath,
+            boolean isClassNameFromMainJar) implements
+            UnaryOperator<LauncherStartupInfo> {
+
+        @Override
+        public LauncherStartupInfo apply(LauncherStartupInfo base) {
+            return LauncherJarStartupInfo.create(base,
+                    new LauncherJarStartupInfoMixin.Stub(jarPath,
+                            isClassNameFromMainJar));
+        }
+    }
+
+    private String qualifiedClassName;
+    private List<String> javaOptions;
+    private List<String> defaultParameters;
+    private List<Path> classPath;
+    private UnaryOperator<LauncherStartupInfo> decorator;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java
index ecd88bb7fb9..019cb08f649 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.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
@@ -35,17 +35,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 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.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-import jdk.jpackage.internal.resources.ResourceLocator;
 
 
 /**
@@ -71,11 +70,25 @@
  */
 final class OverridableResource {
 
-    OverridableResource(String defaultName) {
-        this.defaultName = defaultName;
+    OverridableResource() {
+        defaultName = "";
+        defaultResourceSupplier = null;
+        setSourceOrder(Source.External, Source.ResourceDir);
+    }
+
+    OverridableResource(String defaultName,
+            Supplier<InputStream> defaultResourceSupplier) {
+        this.defaultName = Objects.requireNonNull(defaultName);
+        this.defaultResourceSupplier = Objects.requireNonNull(defaultResourceSupplier);
         setSourceOrder(Source.values());
     }
 
+    OverridableResource(String defaultName, Class<?> resourceLocator) {
+        this(defaultName, () -> {
+            return resourceLocator.getResourceAsStream(defaultName);
+        });
+    }
+
     Path getResourceDir() {
         return resourceDir;
     }
@@ -202,7 +215,7 @@ public Path publicName() {
 
             @Override
             public void consume(InputStream in) throws IOException {
-                Files.createDirectories(IOUtils.getParent(dest));
+                Files.createDirectories(dest.getParent());
                 Files.copy(in, dest, StandardCopyOption.REPLACE_EXISTING);
             }
         });
@@ -212,16 +225,6 @@ Source saveToFile(File dest) throws IOException {
         return saveToFile(toPath(dest));
     }
 
-    static InputStream readDefault(String resourceName) {
-        return ResourceLocator.class.getResourceAsStream(resourceName);
-    }
-
-    static OverridableResource createResource(String defaultName,
-            Map<String, ? super Object> params) {
-        return new OverridableResource(defaultName).setResourceDir(
-                RESOURCE_DIR.fetchFrom(params));
-    }
-
     private Source sendToConsumer(ResourceConsumer consumer) throws IOException {
         for (var source: sources) {
             if (source.getValue().apply(consumer)) {
@@ -241,8 +244,7 @@ private String getPrintableCategory() {
     private boolean useExternal(ResourceConsumer dest) throws IOException {
         boolean used = externalPath != null && Files.exists(externalPath);
         if (used && dest != null) {
-            Log.verbose(MessageFormat.format(I18N.getString(
-                    "message.using-custom-resource-from-file"),
+            Log.verbose(I18N.format("message.using-custom-resource-from-file",
                     getPrintableCategory(),
                     externalPath.toAbsolutePath().normalize()));
 
@@ -270,9 +272,8 @@ private boolean useResourceDir(ResourceConsumer dest) throws IOException {
                 final Path logResourceName = Optional.ofNullable(logPublicName).orElse(
                         resourceName).normalize();
 
-                Log.verbose(MessageFormat.format(I18N.getString(
-                        "message.using-custom-resource"), getPrintableCategory(),
-                        logResourceName));
+                Log.verbose(I18N.format("message.using-custom-resource",
+                        getPrintableCategory(), logResourceName));
 
                 try (InputStream in = Files.newInputStream(customResource)) {
                     processResourceStream(in, dest);
@@ -291,11 +292,10 @@ private boolean useDefault(ResourceConsumer dest) throws IOException {
                     .orElse(Optional
                             .ofNullable(publicName)
                             .orElseGet(() -> dest.publicName()));
-            Log.verbose(MessageFormat.format(
-                    I18N.getString("message.using-default-resource"),
+            Log.verbose(I18N.format("message.using-default-resource",
                     defaultName, getPrintableCategory(), resourceName));
 
-            try (InputStream in = readDefault(defaultName)) {
+            try (InputStream in = defaultResourceSupplier.get()) {
                 processResourceStream(in, dest);
             }
         }
@@ -386,15 +386,16 @@ private SourceHandler getHandler(Source sourceType) {
     private Path logPublicName;
     private Path externalPath;
     private final String defaultName;
+    private final Supplier<InputStream> defaultResourceSupplier;
     private List<Map.Entry<Source, SourceHandler>> sources;
 
     @FunctionalInterface
     private static interface SourceHandler {
-        public boolean apply(ResourceConsumer dest) throws IOException;
+        boolean apply(ResourceConsumer dest) throws IOException;
     }
 
     private static interface ResourceConsumer {
-        public Path publicName();
-        public void consume(InputStream in) throws IOException;
+        Path publicName();
+        void consume(InputStream in) throws IOException;
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
new file mode 100644
index 00000000000..221e0dcac07
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
@@ -0,0 +1,249 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.Package.Stub;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.StandardPackageType;
+
+final class PackageBuilder {
+
+    PackageBuilder(Application app, PackageType type) {
+        this.app = Objects.requireNonNull(app);
+        this.type = Objects.requireNonNull(type);
+    }
+
+    Package create() throws ConfigException {
+        final var validatedName = validatedName();
+
+        Path relativeInstallDir;
+        if (installDir != null) {
+            var normalizedInstallDir = mapInstallDir(installDir, type);
+            if (type instanceof StandardPackageType stdType) {
+                Optional<Path> installDirName = Optional.of(Path.of(validatedName));
+                switch (stdType) {
+                    case LINUX_DEB, LINUX_RPM -> {
+                        switch (normalizedInstallDir.toString()) {
+                            case "/usr", "/usr/local" -> {
+                                installDirName = Optional.empty();
+                            }
+                        }
+                    }
+                    case WIN_EXE, WIN_MSI -> {
+                        installDirName = Optional.empty();
+                    }
+                    case MAC_DMG, MAC_PKG -> {
+                        installDirName = Optional.of(app.appImageDirName());
+                    }
+                }
+                normalizedInstallDir = installDirName.map(normalizedInstallDir::resolve).orElse(normalizedInstallDir);
+            }
+            relativeInstallDir = normalizedInstallDir;
+        } else {
+            relativeInstallDir = defaultInstallDir().orElseThrow(UnsupportedOperationException::new);
+        }
+
+        if (relativeInstallDir.isAbsolute()) {
+            relativeInstallDir = relativeInstallDir.getRoot().relativize(relativeInstallDir);
+        }
+
+        return new Stub(
+                app,
+                type,
+                validatedName,
+                Optional.ofNullable(description).orElseGet(app::description),
+                version = Optional.ofNullable(version).orElseGet(app::version),
+                Optional.ofNullable(aboutURL),
+                Optional.ofNullable(licenseFile),
+                Optional.ofNullable(predefinedAppImage),
+                relativeInstallDir);
+    }
+
+    PackageBuilder name(String v) {
+        name = v;
+        return this;
+    }
+
+    Optional<String> name() {
+        return Optional.ofNullable(name);
+    }
+
+    PackageBuilder fileName(Path v) {
+        fileName = v;
+        return this;
+    }
+
+    Optional<Path> fileName() {
+        return Optional.ofNullable(fileName);
+    }
+
+    PackageBuilder description(String v) {
+        description = v;
+        return this;
+    }
+
+    Optional<String> description() {
+        return Optional.ofNullable(description);
+    }
+
+    PackageBuilder version(String v) {
+        version = v;
+        return this;
+    }
+
+    Optional<String> version() {
+        return Optional.ofNullable(version);
+    }
+
+    PackageBuilder aboutURL(String v) {
+        aboutURL = v;
+        return this;
+    }
+
+    Optional<String> aboutURL() {
+        return Optional.ofNullable(aboutURL);
+    }
+
+    PackageBuilder licenseFile(Path v) {
+        licenseFile = v;
+        return this;
+    }
+
+    Optional<Path> licenseFile() {
+        return Optional.ofNullable(licenseFile);
+    }
+
+    PackageBuilder predefinedAppImage(Path v) {
+        predefinedAppImage = v;
+        return this;
+    }
+
+    Optional<Path> predefinedAppImage() {
+        return Optional.ofNullable(predefinedAppImage);
+    }
+
+    PackageBuilder installDir(Path v) {
+        installDir = v;
+        return this;
+    }
+
+    Optional<Path> installDir() {
+        return Optional.ofNullable(installDir);
+    }
+
+    Optional<Path> defaultInstallDir() {
+        if (type instanceof StandardPackageType stdType) {
+            return defaultInstallDir(stdType, validatedName(), app);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private String validatedName() {
+        return name().orElseGet(app::name);
+    }
+
+    private static Path mapInstallDir(Path installDir, PackageType pkgType)
+            throws ConfigException {
+        var ex = buildConfigException("error.invalid-install-dir", installDir).create();
+
+        if (installDir.getNameCount() == 0) {
+            throw ex;
+        }
+
+        if (installDir.getFileName().equals(Path.of(""))) {
+            // Trailing '/' or '\\'. Strip them away.
+            installDir = installDir.getParent();
+        }
+
+        if (installDir.toString().isEmpty()) {
+            throw ex;
+        }
+
+        switch (pkgType) {
+            case StandardPackageType.WIN_EXE, StandardPackageType.WIN_MSI -> {
+                if (installDir.isAbsolute()) {
+                    throw ex;
+                }
+            }
+            default -> {
+                if (!installDir.isAbsolute()) {
+                    throw ex;
+                }
+            }
+        }
+
+        if (!installDir.normalize().toString().equals(installDir.toString())) {
+            // Don't allow '..' or '.' in path components
+            throw ex;
+        }
+
+        return installDir;
+    }
+
+    private static Optional<Path> defaultInstallDir(StandardPackageType pkgType, String pkgName, Application app) {
+        switch (pkgType) {
+            case WIN_EXE, WIN_MSI -> {
+                return Optional.of(app.appImageDirName());
+            }
+            case LINUX_DEB, LINUX_RPM -> {
+                return Optional.of(Path.of("/opt").resolve(pkgName));
+            }
+            case MAC_DMG, MAC_PKG -> {
+                final Path dirName = app.appImageDirName();
+                final Path base;
+                if (app.isRuntime()) {
+                    base = Path.of("/Library/Java/JavaVirtualMachines");
+                } else {
+                    base = Path.of("/Applications");
+                }
+                return Optional.of(base.resolve(dirName));
+            }
+            default -> {
+                return Optional.empty();
+            }
+        }
+    }
+
+    private String name;
+    private Path fileName;
+    private String description;
+    private String version;
+    private String aboutURL;
+    private Path licenseFile;
+    private Path predefinedAppImage;
+    private Path installDir;
+
+    private final PackageType type;
+    private final Application app;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
index bec8fb86bef..b97fc707f84 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.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,39 +25,30 @@
 
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.ApplicationLayout;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
-import java.util.Optional;
 
 final class PackageFile {
 
     /**
      * Returns path to package file.
-     * @param appImageDir - path to application image
+     * @param appLayout - application layout
      */
-    public static Path getPathInAppImage(Path appImageDir) {
-        return ApplicationLayout.platformAppImage()
-                .resolveAt(appImageDir)
-                .appDirectory()
-                .resolve(FILENAME);
+    static Path getPathInAppImage(ApplicationLayout appLayout) {
+        return appLayout.appDirectory().resolve(FILENAME);
     }
 
     PackageFile(String packageName) {
-        Objects.requireNonNull(packageName);
-        this.packageName = packageName;
+        this.packageName = Objects.requireNonNull(packageName);
     }
 
     void save(ApplicationLayout appLayout) throws IOException {
-        Path dst = Optional.ofNullable(appLayout.appDirectory()).map(appDir -> {
-            return appDir.resolve(FILENAME);
-        }).orElse(null);
-
-        if (dst != null) {
-            Files.createDirectories(dst.getParent());
-            Files.writeString(dst, packageName);
-        }
+        final var dstDir = appLayout.appDirectory();
+        Files.createDirectories(dstDir);
+        Files.writeString(dstDir.resolve(FILENAME), packageName);
     }
 
     private final String packageName;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerBuilder.java
new file mode 100644
index 00000000000..4ba2f0fbda6
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import jdk.jpackage.internal.PackagingPipeline.StartupParameters;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.PackagerException;
+
+abstract class PackagerBuilder<T extends Package, U extends PackagerBuilder<T, U>> {
+
+    U pkg(T v) {
+        pkg = v;
+        return thiz();
+    }
+
+    U env(BuildEnv v) {
+        env = v;
+        return thiz();
+    }
+
+    U outputDir(Path v) {
+        outputDir = v;
+        return thiz();
+    }
+
+    @SuppressWarnings("unchecked")
+    private U thiz() {
+        return (U)this;
+    }
+
+    protected abstract void configurePackagingPipeline(PackagingPipeline.Builder pipelineBuilder,
+            StartupParameters startupParameters);
+
+    Path execute(PackagingPipeline.Builder pipelineBuilder) throws PackagerException {
+        Objects.requireNonNull(pkg);
+        Objects.requireNonNull(env);
+        Objects.requireNonNull(outputDir);
+
+        final var startupParameters = pipelineBuilder.createStartupParameters(env, pkg, outputDir);
+
+        configurePackagingPipeline(pipelineBuilder, startupParameters);
+
+        pipelineBuilder.create().execute(startupParameters);
+
+        return outputDir.resolve(pkg.packageFileNameWithSuffix());
+    }
+
+    protected T pkg;
+    protected BuildEnv env;
+    protected Path outputDir;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
new file mode 100644
index 00000000000..d36aad23886
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
@@ -0,0 +1,618 @@
+/*
+ * 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;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.io.IOException;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.pipeline.DirectedEdge;
+import jdk.jpackage.internal.pipeline.FixedDAG;
+import jdk.jpackage.internal.pipeline.TaskPipelineBuilder;
+import jdk.jpackage.internal.pipeline.TaskSpecBuilder;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+
+final class PackagingPipeline {
+
+    void execute(BuildEnv env, Application app) throws PackagerException {
+        execute(appContextMapper.apply(createTaskContext(env, app)));
+    }
+
+    void execute(BuildEnv env, Package pkg, Path outputDir) throws PackagerException {
+        execute((StartupParameters)createPackagingTaskContext(env, pkg, outputDir,
+                taskConfig, appImageLayoutForPackaging.apply(pkg)));
+    }
+
+    void execute(StartupParameters startupParameters) throws PackagerException {
+        execute(pkgContextMapper.apply(createTaskContext((PackagingTaskContext)startupParameters)));
+    }
+
+    interface StartupParameters {
+        BuildEnv packagingEnv();
+    }
+
+    interface TaskAction {
+    }
+
+    interface TaskID {
+    }
+
+    enum BuildApplicationTaskID implements TaskID {
+        RUNTIME,
+        CONTENT,
+        LAUNCHERS,
+        APP_IMAGE_FILE
+    }
+
+    enum CopyAppImageTaskID implements TaskID {
+        COPY
+    }
+
+    enum PrimaryTaskID implements TaskID {
+        BUILD_APPLICATION_IMAGE,
+        COPY_APP_IMAGE,
+        PACKAGE
+    }
+
+    enum PackageTaskID implements TaskID {
+        RUN_POST_IMAGE_USER_SCRIPT,
+        CREATE_CONFIG_FILES,
+        CREATE_PACKAGE_FILE
+    }
+
+    interface TaskContext extends Predicate<TaskID> {
+        void execute(TaskAction taskAction) throws IOException, PackagerException;
+    }
+
+    record AppImageBuildEnv<T extends Application, U extends AppImageLayout>(BuildEnv env, T app, U envLayout) {
+        @SuppressWarnings("unchecked")
+        U resolvedLayout() {
+            return (U)envLayout.resolveAt(env.appImageDir());
+        }
+    }
+
+    record PackageBuildEnv<T extends Package, U extends AppImageLayout>(BuildEnv env, T pkg, U envLayout, Path outputDir) {
+        @SuppressWarnings("unchecked")
+        U resolvedLayout() {
+            return (U)envLayout.resolveAt(env.appImageDir());
+        }
+
+        AppImageBuildEnv<Application, U> appImageBuildEnv() {
+            return new AppImageBuildEnv<>(env, pkg.app(), envLayout);
+        }
+    }
+
+    @FunctionalInterface
+    interface ApplicationImageTaskAction<T extends Application, U extends ApplicationLayout> extends TaskAction {
+        void execute(AppImageBuildEnv<T, U> env) throws IOException, PackagerException;
+    }
+
+    @FunctionalInterface
+    interface AppImageTaskAction<T extends Application, U extends AppImageLayout> extends TaskAction {
+        void execute(AppImageBuildEnv<T, U> env) throws IOException, PackagerException;
+    }
+
+    @FunctionalInterface
+    interface CopyAppImageTaskAction<T extends Package> extends TaskAction {
+        void execute(T pkg, AppImageDesc srcAppImage, AppImageDesc dstAppImage) throws IOException, PackagerException;
+    }
+
+    @FunctionalInterface
+    interface PackageTaskAction<T extends Package, U extends AppImageLayout> extends TaskAction {
+        void execute(PackageBuildEnv<T, U> env) throws IOException, PackagerException;
+    }
+
+    @FunctionalInterface
+    interface NoArgTaskAction extends TaskAction {
+        void execute() throws IOException, PackagerException;
+    }
+
+    record TaskConfig(Optional<TaskAction> action) {
+        TaskConfig {
+            Objects.requireNonNull(action);
+        }
+    }
+
+    static final class Builder {
+
+        private Builder() {
+        }
+
+        final class TaskBuilder extends TaskSpecBuilder<TaskID> {
+
+            private TaskBuilder(TaskID id) {
+                super(id);
+            }
+
+            private TaskBuilder setAction(TaskAction v) {
+                action = v;
+                return this;
+            }
+
+            TaskBuilder noaction() {
+                action = null;
+                return this;
+            }
+
+            <T extends Application, U extends ApplicationLayout> TaskBuilder applicationAction(ApplicationImageTaskAction<T, U> action) {
+                return setAction(action);
+            }
+
+            <T extends Application, U extends AppImageLayout> TaskBuilder appImageAction(AppImageTaskAction<T, U> action) {
+                return setAction(action);
+            }
+
+            <T extends Package> TaskBuilder copyAction(CopyAppImageTaskAction<T> action) {
+                return setAction(action);
+            }
+
+            <T extends Package, U extends AppImageLayout> TaskBuilder packageAction(PackageTaskAction<T, U> action) {
+                return setAction(action);
+            }
+
+            TaskBuilder action(NoArgTaskAction action) {
+                return setAction(action);
+            }
+
+            @Override
+            public TaskBuilder addDependent(TaskID v) {
+                super.addDependent(v);
+                return this;
+            }
+
+            @Override
+            public TaskBuilder addDependency(TaskID v) {
+                super.addDependency(v);
+                return this;
+            }
+
+            @Override
+            public TaskBuilder addDependencies(Collection<? extends TaskID> tasks) {
+                super.addDependencies(tasks);
+                return this;
+            }
+
+            @Override
+            public TaskBuilder addDependents(Collection<? extends TaskID> tasks) {
+                super.addDependents(tasks);
+                return this;
+            }
+
+            public TaskBuilder addDependencies(TaskID ... tasks) {
+                return addDependencies(List.of(tasks));
+            }
+
+            public TaskBuilder addDependents(TaskID ... tasks) {
+                return addDependents(List.of(tasks));
+            }
+
+            Builder add() {
+                final var config = new TaskConfig(Optional.ofNullable(action));
+                taskConfig.put(task(), config);
+                createLinks().forEach(Builder.this::linkTasks);
+                return Builder.this;
+            }
+
+            private TaskAction action;
+        }
+
+        Builder linkTasks(DirectedEdge<TaskID> edge) {
+            taskGraphBuilder.addEdge(edge);
+            if (taskGraphSnapshot != null) {
+                taskGraphSnapshot = null;
+            }
+            return this;
+        }
+
+        Builder linkTasks(TaskID tail, TaskID head) {
+            return linkTasks(DirectedEdge.create(tail, head));
+        }
+
+        TaskBuilder task(TaskID id) {
+            return new TaskBuilder(id);
+        }
+
+        Builder excludeDirFromCopying(Path path) {
+            Objects.requireNonNull(path);
+            excludeCopyDirs.add(path);
+            return this;
+        }
+
+        Builder contextMapper(UnaryOperator<TaskContext> v) {
+            appContextMapper(v);
+            pkgContextMapper(v);
+            return this;
+        }
+
+        Builder appContextMapper(UnaryOperator<TaskContext> v) {
+            appContextMapper = v;
+            return this;
+        }
+
+        Builder pkgContextMapper(UnaryOperator<TaskContext> v) {
+            pkgContextMapper = v;
+            return this;
+        }
+
+        Builder appImageLayoutForPackaging(Function<Package, AppImageLayout> v) {
+            appImageLayoutForPackaging = v;
+            return this;
+        }
+
+        FixedDAG<TaskID> taskGraphSnapshot() {
+            if (taskGraphSnapshot == null) {
+                taskGraphSnapshot = taskGraphBuilder.create();
+            }
+            return taskGraphSnapshot;
+        }
+
+        StartupParameters createStartupParameters(BuildEnv env, Package pkg, Path outputDir) {
+            return createPackagingTaskContext(env, pkg, outputDir, taskConfig,
+                    validatedAppImageLayoutForPackaging().apply(pkg));
+        }
+
+        private Function<Package, AppImageLayout> validatedAppImageLayoutForPackaging() {
+            return Optional.ofNullable(appImageLayoutForPackaging).orElse(Package::packageLayout);
+        }
+
+        PackagingPipeline create() {
+            return new PackagingPipeline(taskGraphSnapshot(), taskConfig,
+                    Optional.ofNullable(appContextMapper).orElse(UnaryOperator.identity()),
+                    Optional.ofNullable(pkgContextMapper).orElse(UnaryOperator.identity()),
+                    validatedAppImageLayoutForPackaging());
+        }
+
+        private final FixedDAG.Builder<TaskID> taskGraphBuilder = FixedDAG.build();
+        private final List<Path> excludeCopyDirs = new ArrayList<>();
+        private final Map<TaskID, TaskConfig> taskConfig = new HashMap<>();
+        private UnaryOperator<TaskContext> appContextMapper;
+        private UnaryOperator<TaskContext> pkgContextMapper;
+        private Function<Package, AppImageLayout> appImageLayoutForPackaging;
+        private FixedDAG<TaskID> taskGraphSnapshot;
+    }
+
+    static Builder build() {
+        return new Builder();
+    }
+
+    static Builder buildStandard() {
+        final var builder = build();
+
+        configureApplicationTasks(builder);
+        configurePackageTasks(builder);
+
+        return builder;
+    }
+
+    static Builder configureApplicationTasks(Builder builder) {
+        builder.task(BuildApplicationTaskID.RUNTIME)
+                .addDependent(BuildApplicationTaskID.CONTENT)
+                .applicationAction(ApplicationImageUtils.createWriteRuntimeAction()).add();
+
+        builder.task(BuildApplicationTaskID.LAUNCHERS)
+                .addDependent(BuildApplicationTaskID.CONTENT)
+                .applicationAction(ApplicationImageUtils.createWriteLaunchersAction()).add();
+
+        builder.task(BuildApplicationTaskID.APP_IMAGE_FILE)
+                .addDependent(PrimaryTaskID.BUILD_APPLICATION_IMAGE)
+                .applicationAction(ApplicationImageUtils.createWriteAppImageFileAction()).add();
+
+        builder.task(BuildApplicationTaskID.CONTENT)
+                .addDependent(BuildApplicationTaskID.APP_IMAGE_FILE)
+                .applicationAction(ApplicationImageUtils.createCopyContentAction(() -> builder.excludeCopyDirs)).add();
+
+        return builder;
+    }
+
+    static Builder configurePackageTasks(Builder builder) {
+        builder.task(CopyAppImageTaskID.COPY)
+                .copyAction(PackagingPipeline::copyAppImage)
+                .addDependent(PrimaryTaskID.COPY_APP_IMAGE)
+                .add();
+
+        builder.task(PrimaryTaskID.COPY_APP_IMAGE).add();
+
+        builder.task(PrimaryTaskID.BUILD_APPLICATION_IMAGE).add();
+
+        builder.task(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                .addDependencies(PrimaryTaskID.BUILD_APPLICATION_IMAGE, PrimaryTaskID.COPY_APP_IMAGE)
+                .addDependency(PackageTaskID.CREATE_CONFIG_FILES)
+                .addDependent(PackageTaskID.CREATE_PACKAGE_FILE)
+                .packageAction(PackagingPipeline::runPostAppImageUserScript).add();
+
+        builder.task(PackageTaskID.CREATE_CONFIG_FILES)
+                .addDependent(PackageTaskID.CREATE_PACKAGE_FILE)
+                .add();
+
+        builder.task(PackageTaskID.CREATE_PACKAGE_FILE)
+                .addDependent(PrimaryTaskID.PACKAGE)
+                .add();
+
+        builder.task(PrimaryTaskID.PACKAGE).add();
+
+        return builder;
+    }
+
+    static void copyAppImage(Package pkg, AppImageDesc srcAppImage, AppImageDesc dstAppImage) throws IOException {
+        copyAppImage(srcAppImage, dstAppImage, true);
+    }
+
+    static void copyAppImage(AppImageDesc srcAppImage, AppImageDesc dstAppImage,
+            boolean removeAppImageFile) throws IOException {
+        final var srcLayout = srcAppImage.resolvedAppImagelayout();
+        final var srcLayoutPathGroup = AppImageLayout.toPathGroup(srcLayout);
+
+        if (removeAppImageFile && srcLayout instanceof ApplicationLayout appLayout) {
+            // Copy app layout omitting application image info file.
+            srcLayoutPathGroup.ghostPath(AppImageFile.getPathInAppImage(appLayout));
+        }
+
+        srcLayoutPathGroup.copy(AppImageLayout.toPathGroup(dstAppImage.resolvedAppImagelayout()), LinkOption.NOFOLLOW_LINKS);
+    }
+
+    static void runPostAppImageUserScript(PackageBuildEnv<Package, AppImageLayout> env) throws IOException {
+        final var appImageDir = env.env().appImageDir();
+        new ScriptRunner()
+                .setDirectory(appImageDir)
+                .setResourceCategoryId("resource.post-app-image-script")
+                .setScriptNameSuffix("post-image")
+                .setEnvironmentVariable("JpAppImageDir", appImageDir.toAbsolutePath().toString())
+                .run(env.env(), env.pkg().app().name());
+    }
+
+    private PackagingPipeline(FixedDAG<TaskID> taskGraph, Map<TaskID, TaskConfig> taskConfig,
+            UnaryOperator<TaskContext> appContextMapper, UnaryOperator<TaskContext> pkgContextMapper,
+            Function<Package, AppImageLayout> appImageLayoutForPackaging) {
+        this.taskGraph = Objects.requireNonNull(taskGraph);
+        this.taskConfig = Objects.requireNonNull(taskConfig);
+        this.appContextMapper = Objects.requireNonNull(appContextMapper);
+        this.pkgContextMapper = Objects.requireNonNull(pkgContextMapper);
+        this.appImageLayoutForPackaging = Objects.requireNonNull(appImageLayoutForPackaging);
+    }
+
+    private TaskContext createTaskContext(BuildEnv env, Application app) {
+        return new DefaultTaskContext(taskGraph, env, app, app.asApplicationLayout(), Optional.empty());
+    }
+
+    private TaskContext createTaskContext(PackagingTaskContext packagingContext) {
+        final var pkgEnv = BuildEnv.withAppImageDir(packagingContext.env.env(), packagingContext.srcAppImage.path());
+        return new DefaultTaskContext(taskGraph, pkgEnv, packagingContext.env.pkg.app(),
+                packagingContext.srcAppImage.asApplicationLayout(), Optional.of(packagingContext));
+    }
+
+    private static PackagingTaskContext createPackagingTaskContext(BuildEnv env, Package pkg,
+            Path outputDir, Map<TaskID, TaskConfig> taskConfig, AppImageLayout appImageLayoutForPackaging) {
+
+        Objects.requireNonNull(env);
+        Objects.requireNonNull(outputDir);
+        Objects.requireNonNull(taskConfig);
+        Objects.requireNonNull(appImageLayoutForPackaging);
+
+        final AppImageDesc srcAppImageDesc;
+        final AppImageDesc dstAppImageDesc;
+        if (pkg.app().runtimeBuilder().isPresent()) {
+            // Runtime builder is present, will build application image.
+            // appImageDir() should point to a directory where the application image will be created.
+            srcAppImageDesc = new AppImageDesc(appImageLayoutForPackaging, env.appImageDir());
+            dstAppImageDesc = srcAppImageDesc;
+        } else {
+            srcAppImageDesc = new AppImageDesc(pkg.app().imageLayout(), pkg.predefinedAppImage().orElseGet(() -> {
+                // No predefined app image and no runtime builder.
+                // This should be runtime packaging.
+                if (pkg.isRuntimeInstaller()) {
+                    return env.appImageDir();
+                } else {
+                    // Can't create app image without runtime builder.
+                    throw new UnsupportedOperationException();
+                }
+            }));
+
+            if (taskConfig.get(CopyAppImageTaskID.COPY).action().isEmpty()) {
+                // "copy app image" task action is undefined indicating
+                // the package will use provided app image as-is.
+                dstAppImageDesc = srcAppImageDesc;
+            } else {
+                dstAppImageDesc = new AppImageDesc(appImageLayoutForPackaging, env.buildRoot().resolve("image"));
+            }
+        }
+
+        final var pkgEnv = new PackageBuildEnv<>(
+                BuildEnv.withAppImageDir(env, dstAppImageDesc.path()), pkg, dstAppImageDesc.appImageLayout(), outputDir);
+
+        return new PackagingTaskContext(pkgEnv, srcAppImageDesc);
+    }
+
+    private void execute(TaskContext context) throws PackagerException {
+        final Map<TaskID, Callable<Void>> tasks = taskConfig.entrySet().stream().collect(toMap(Map.Entry::getKey, task -> {
+            return createTask(context, task.getKey(), task.getValue());
+        }));
+
+        final var builder = new TaskPipelineBuilder();
+
+        for (final var tail : taskGraph.nodes()) {
+            for (final var head : taskGraph.getHeadsOf(tail)) {
+                builder.linkTasks(tasks.get(tail), tasks.get(head));
+            }
+        }
+
+        try {
+            builder.create().call();
+        } catch (Exception ex) {
+            if (ex instanceof PackagerException pex) {
+                throw pex;
+            } else if (ex instanceof ExceptionBox bex) {
+                throw new PackagerException(bex.getCause());
+            } else {
+                throw new PackagerException(ex);
+            }
+        }
+    }
+
+    private record PackagingTaskContext(PackageBuildEnv<Package, AppImageLayout> env,
+            AppImageDesc srcAppImage) implements TaskContext, StartupParameters {
+
+        PackagingTaskContext {
+            Objects.requireNonNull(env);
+            Objects.requireNonNull(srcAppImage);
+        }
+
+        @Override
+        public BuildEnv packagingEnv() {
+            return env.env;
+        }
+
+        @Override
+        public boolean test(TaskID taskID) {
+            if (taskID == BuildApplicationTaskID.APP_IMAGE_FILE) {
+                // Application image for packaging, skip adding application image info file.
+                return false;
+            }
+
+            return true;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+            if (taskAction instanceof PackageTaskAction<?, ?>) {
+                ((PackageTaskAction<Package, AppImageLayout>)taskAction).execute(env);
+            } else if (taskAction instanceof CopyAppImageTaskAction<?>) {
+                ((CopyAppImageTaskAction<Package>)taskAction).execute(env.pkg(),
+                        srcAppImage, new AppImageDesc(env.envLayout(), env.env().appImageDir()));
+            } else {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        AppImageBuildEnv<Application, AppImageLayout> appImageBuildEnv() {
+            return env.appImageBuildEnv();
+        }
+    }
+
+    private record DefaultTaskContext(FixedDAG<TaskID> taskGraph, BuildEnv env, Application app,
+            Optional<ApplicationLayout> appLayout, Optional<PackagingTaskContext> pkg) implements TaskContext {
+
+        DefaultTaskContext {
+            Objects.requireNonNull(taskGraph);
+            Objects.requireNonNull(env);
+            Objects.requireNonNull(app);
+            Objects.requireNonNull(appLayout);
+            Objects.requireNonNull(pkg);
+        }
+
+        @Override
+        public boolean test(TaskID taskID) {
+            final var isBuildApplicationImageTask = isBuildApplicationImageTask(taskID);
+            final var isCopyAppImageTask = isCopyAppImageTask(taskID);
+            final var isPackageTask = !isBuildApplicationImageTask && !isCopyAppImageTask;
+
+            if (pkg.isPresent() && !pkg.orElseThrow().test(taskID)) {
+                return false;
+            } else if (pkg.isEmpty() && isPackageTask) {
+                // Building application image, skip packaging tasks.
+                return false;
+            } else if (app.runtimeBuilder().isEmpty() && isBuildApplicationImageTask && !isCopyAppImageTask) {
+                // Runtime builder is not present, skip building application image tasks.
+                return false;
+            } else if (app.runtimeBuilder().isPresent() && isCopyAppImageTask && !isBuildApplicationImageTask) {
+                // Runtime builder is present, skip copying app image tasks.
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void execute(TaskAction taskAction) throws IOException, PackagerException {
+            if (taskAction instanceof AppImageTaskAction<?, ?>) {
+                final var taskEnv = pkg.map(PackagingTaskContext::appImageBuildEnv).orElseGet(this::appBuildEnv);
+                ((AppImageTaskAction<Application, AppImageLayout>)taskAction).execute(taskEnv);
+            } else if (taskAction instanceof ApplicationImageTaskAction<?, ?>) {
+                ((ApplicationImageTaskAction<Application, ApplicationLayout>)taskAction).execute(appBuildEnv());
+            } else if (taskAction instanceof NoArgTaskAction noArgAction) {
+                noArgAction.execute();
+            } else {
+                pkg.orElseThrow().execute(taskAction);
+            }
+        }
+
+        private boolean isBuildApplicationImageTask(TaskID taskID) {
+            return (taskID == PrimaryTaskID.BUILD_APPLICATION_IMAGE
+                    || taskGraph.getAllHeadsOf(taskID).contains(PrimaryTaskID.BUILD_APPLICATION_IMAGE));
+        }
+
+        private boolean isCopyAppImageTask(TaskID taskID) {
+            return (taskID == PrimaryTaskID.COPY_APP_IMAGE
+                    || taskGraph.getAllHeadsOf(taskID).contains(PrimaryTaskID.COPY_APP_IMAGE));
+        }
+
+        @SuppressWarnings("unchecked")
+        private <T extends AppImageLayout> AppImageBuildEnv<Application, T> appBuildEnv() {
+            return new AppImageBuildEnv<>(env, app, (T)appLayout.orElseThrow());
+        }
+    }
+
+    private static Callable<Void> createTask(TaskContext context, TaskID id, TaskConfig config) {
+        Objects.requireNonNull(context);
+        Objects.requireNonNull(id);
+        Objects.requireNonNull(config);
+        return () -> {
+            if (config.action.isPresent() && context.test(id)) {
+                try {
+                    context.execute(config.action.orElseThrow());
+                } catch (ExceptionBox ex) {
+                    throw ExceptionBox.rethrowUnchecked(ex);
+                }
+            }
+            return null;
+        };
+    }
+
+    private final FixedDAG<TaskID> taskGraph;
+    private final Map<TaskID, TaskConfig> taskConfig;
+    private final Function<Package, AppImageLayout> appImageLayoutForPackaging;
+    private final UnaryOperator<TaskContext> appContextMapper;
+    private final UnaryOperator<TaskContext> pkgContextMapper;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
new file mode 100644
index 00000000000..ec27b1fac5c
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
@@ -0,0 +1,186 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+import static jdk.jpackage.internal.model.RuntimeBuilder.getDefaultModulePath;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+import jdk.jpackage.internal.model.RuntimeBuilder;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.PathGroup;
+
+final class RuntimeBuilderBuilder {
+
+    RuntimeBuilder create() {
+        return impl.get();
+    }
+
+    RuntimeBuilderBuilder modulePath(List<Path> v) {
+        modulePath = v;
+        return this;
+    }
+
+    RuntimeBuilderBuilder forRuntime(Path predefinedRuntimeImage) {
+        impl = new CopyingRuntime(this, predefinedRuntimeImage);
+        return this;
+    }
+
+    RuntimeBuilderConfigBuilder forNewRuntime(List<LauncherStartupInfo> startupInfos) {
+        return new RuntimeBuilderConfigBuilder(startupInfos);
+    }
+
+    final class RuntimeBuilderConfigBuilder {
+
+        RuntimeBuilderConfigBuilder(List<LauncherStartupInfo> startupInfos) {
+            Objects.requireNonNull(startupInfos);
+            if (startupInfos.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+            this.startupInfos = startupInfos;
+        }
+
+        RuntimeBuilderBuilder appy() {
+            impl = new BuildingRuntime(RuntimeBuilderBuilder.this, addModules,
+                    limitModules, validatedOptions(), startupInfos);
+            return RuntimeBuilderBuilder.this;
+        }
+
+        RuntimeBuilderConfigBuilder addModules(Set<String> v) {
+            addModules = v;
+            return this;
+        }
+
+        RuntimeBuilderConfigBuilder limitModules(Set<String> v) {
+            limitModules = v;
+            return this;
+        }
+
+        RuntimeBuilderConfigBuilder options(List<String> v) {
+            options = v;
+            return this;
+        }
+
+        private List<String> validatedOptions() {
+            return Optional.ofNullable(options).orElse(DEFAULT_JLINK_OPTIONS);
+        }
+
+        private Set<String> addModules;
+        private Set<String> limitModules;
+        private List<String> options;
+        private final List<LauncherStartupInfo> startupInfos;
+
+        private static final List<String> DEFAULT_JLINK_OPTIONS = List.of(
+                "--strip-native-commands",
+                "--strip-debug",
+                "--no-man-pages",
+                "--no-header-files"
+        );
+    }
+
+    private static RuntimeBuilder createCopyingRuntimeBuilder(Path runtimeDir,
+            Path... modulePath) throws ConfigException {
+        if (!Files.exists(runtimeDir)) {
+            throw buildConfigException()
+                    .message("message.runtime-image-dir-does-not-exist",
+                            "--runtime-image", runtimeDir)
+                    .advice("message.runtime-image-dir-does-not-exist.advice",
+                            "--runtime-image")
+                    .create();
+        }
+
+        return appImageLayout -> {
+            try {
+                // copy whole runtime, skipping jmods and src.zip
+                final var srcPathGroup = new PathGroup(Map.of("root", runtimeDir));
+                // JDK8
+                srcPathGroup.ghostPath(runtimeDir.resolve("src.zip"));
+                // Newer JDKs
+                srcPathGroup.ghostPath(runtimeDir.resolve("lib/src.zip"));
+                srcPathGroup.ghostPath(runtimeDir.resolve("jmods"));
+
+                srcPathGroup.copy(new PathGroup(Map.of("root", appImageLayout.runtimeDirectory())),
+                        LinkOption.NOFOLLOW_LINKS);
+
+                // if module-path given - copy modules to appDir/mods
+                List<Path> defaultModulePath = getDefaultModulePath();
+                Path dest = ((ApplicationLayout)appImageLayout).appModsDirectory();
+
+                for (Path mp : modulePath) {
+                    if (!defaultModulePath.contains(mp.toAbsolutePath())) {
+                        FileUtils.copyRecursive(mp, dest);
+                    }
+                }
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        };
+    }
+
+    private record CopyingRuntime(RuntimeBuilderBuilder thiz, Path predefinedRuntimeImage)
+            implements Supplier<RuntimeBuilder> {
+
+        @Override
+        public RuntimeBuilder get() {
+            return toSupplier(() -> createCopyingRuntimeBuilder(
+                    predefinedRuntimeImage,
+                    Optional.ofNullable(thiz.modulePath).orElseGet(List::of).toArray(Path[]::new))
+            ).get();
+        }
+    }
+
+    private record BuildingRuntime(RuntimeBuilderBuilder thiz, Set<String> addModules,
+            Set<String> limitModules, List<String> options,
+            List<LauncherStartupInfo> startupInfos) implements Supplier<RuntimeBuilder> {
+
+        @Override
+        public RuntimeBuilder get() {
+            return toSupplier(() -> JLinkRuntimeBuilder.createJLinkRuntimeBuilder(
+                    Optional.ofNullable(thiz.modulePath).orElseGet(List::of),
+                    Optional.ofNullable(addModules).orElseGet(Set::of),
+                    Optional.ofNullable(limitModules).orElseGet(Set::of),
+                    Optional.ofNullable(options).orElseGet(List::of),
+                    startupInfos)
+            ).get();
+        }
+    }
+
+    private List<Path> modulePath;
+    private Supplier<RuntimeBuilder> impl;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java
index a43a195cd86..caa3674b67e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.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
@@ -33,9 +33,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
 
 /**
  * Runs custom script from resource directory.
@@ -75,12 +72,11 @@ ScriptRunner setEnvironmentVariable(String envVarName, String envVarValue) {
         return this;
     }
 
-    public void run(Map<String, ? super Object> params) throws IOException {
-        String scriptName = String.format("%s-%s%s", APP_NAME.fetchFrom(params),
+    public void run(BuildEnv env, String name) throws IOException {
+        String scriptName = String.format("%s-%s%s", name,
                 scriptNameSuffix, scriptSuffix());
-        Path scriptPath = CONFIG_ROOT.fetchFrom(params).resolve(
-                scriptName);
-        createResource(null, params)
+        Path scriptPath = env.configDir().resolve(scriptName);
+        env.createResource(null)
                 .setCategory(I18N.getString(resourceCategoryId))
                 .saveToFile(scriptPath);
         if (!Files.exists(scriptPath)) {
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 21d710b631c..cdb6e7f986e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
@@ -25,12 +25,10 @@
 
 package jdk.jpackage.internal;
 
-import jdk.internal.util.OperatingSystem;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -41,24 +39,21 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.util.FileUtils;
+import static jdk.jpackage.internal.ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.model.RuntimeBuilder.getDefaultModulePath;
 
 /**
- * StandardBundlerParam
+ * Standard bundler parameters.
  *
- * A parameter to a bundler.
- *
- * Also contains static definitions of all of the common bundler parameters.
+ * Contains static definitions of all of the common bundler parameters.
  * (additional platform specific and mode specific bundler parameters
  * are defined in each of the specific bundlers)
  *
  * Also contains static methods that operate on maps of parameters.
  */
-class StandardBundlerParam<T> extends BundlerParamInfo<T> {
+final class StandardBundlerParam {
 
     private static final String JAVABASEJMOD = "java.base.jmod";
     private static final String DEFAULT_VERSION = "1.0";
@@ -69,40 +64,19 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             "--no-man-pages",
             "--no-header-files"};
 
-    StandardBundlerParam(String id, Class<T> valueType,
-            Function<Map<String, ? super Object>, T> defaultValueFunction,
-            BiFunction<String, Map<String, ? super Object>, T> stringConverter)
-    {
-        this.id = id;
-        this.valueType = valueType;
-        this.defaultValueFunction = defaultValueFunction;
-        this.stringConverter = stringConverter;
-    }
-
-    static final StandardBundlerParam<LauncherData> LAUNCHER_DATA =
-            new StandardBundlerParam<>(
-                    "launcherData",
-                    LauncherData.class,
-                    params -> {
-                        try {
-                            return LauncherData.create(params);
-                        } catch (ConfigException | IOException ex) {
-                            throw new RuntimeException(ex);
-                        }
-                    },
-                    null
-            );
+    static final BundlerParamInfo<LauncherData> LAUNCHER_DATA = BundlerParamInfo.createBundlerParam(
+            LauncherData.class, LauncherData::create);
 
-    static final StandardBundlerParam<Path> SOURCE_DIR =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> SOURCE_DIR =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.INPUT.getId(),
                     Path.class,
                     p -> null,
                     (s, p) -> Path.of(s)
             );
 
-    static final StandardBundlerParam<Path> OUTPUT_DIR =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> OUTPUT_DIR =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.OUTPUT.getId(),
                     Path.class,
                     p -> Path.of("").toAbsolutePath(),
@@ -111,48 +85,57 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
 
     // note that each bundler is likely to replace this one with
     // their own converter
-    static final StandardBundlerParam<Path> MAIN_JAR =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> MAIN_JAR =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.MAIN_JAR.getId(),
                     Path.class,
                     params -> LAUNCHER_DATA.fetchFrom(params).mainJarName(),
                     null
             );
 
-    static final StandardBundlerParam<String> MAIN_CLASS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<AppImageFile> PREDEFINED_APP_IMAGE_FILE = BundlerParamInfo.createBundlerParam(
+            AppImageFile.class, params -> {
+                if (hasPredefinedAppImage(params)) {
+                    var appImage = getPredefinedAppImage(params);
+                    return AppImageFile.load(appImage, PLATFORM_APPLICATION_LAYOUT);
+                } else {
+                    return null;
+                }
+            });
+
+    static final BundlerParamInfo<String> MAIN_CLASS =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.APPCLASS.getId(),
                     String.class,
                     params -> {
                         if (isRuntimeInstaller(params)) {
                             return null;
                         } else if (hasPredefinedAppImage(params)) {
-                            return AppImageFile.extractMainClass(
-                                    getPredefinedAppImage(params));
+                            PREDEFINED_APP_IMAGE_FILE.fetchFrom(params).getMainClass();
                         }
                         return LAUNCHER_DATA.fetchFrom(params).qualifiedClassName();
                     },
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<Path> PREDEFINED_RUNTIME_IMAGE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> PREDEFINED_RUNTIME_IMAGE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.PREDEFINED_RUNTIME_IMAGE.getId(),
                     Path.class,
                     params -> null,
                     (s, p) -> Path.of(s)
             );
 
-    static final StandardBundlerParam<Path> PREDEFINED_APP_IMAGE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> PREDEFINED_APP_IMAGE =
+            new BundlerParamInfo<>(
             Arguments.CLIOptions.PREDEFINED_APP_IMAGE.getId(),
             Path.class,
             params -> null,
             (s, p) -> Path.of(s));
 
     // this is the raw --app-name arg - used in APP_NAME and INSTALLER_NAME
-    static final StandardBundlerParam<String> NAME =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> NAME =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.NAME.getId(),
                     String.class,
                     params -> null,
@@ -161,16 +144,14 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
 
     // this is the application name, either from the app-image (if given),
     // the name (if given) derived from the main-class, or the runtime image
-    static final StandardBundlerParam<String> APP_NAME =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> APP_NAME =
+            new BundlerParamInfo<>(
                     "application-name",
                     String.class,
                     params -> {
-                        Path appImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
                         String appName = NAME.fetchFrom(params);
-                        if (appImage != null) {
-                            String name = AppImageFile.extractAppName(appImage);
-                            appName  = (name != null) ? name : appName;
+                        if (hasPredefinedAppImage(params)) {
+                            appName = PREDEFINED_APP_IMAGE_FILE.fetchFrom(params).getLauncherName();
                         } else if (appName == null) {
                             String s = MAIN_CLASS.fetchFrom(params);
                             if (s != null) {
@@ -188,8 +169,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<String> INSTALLER_NAME =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> INSTALLER_NAME =
+            new BundlerParamInfo<>(
                     "installer-name",
                     String.class,
                     params -> {
@@ -200,32 +181,32 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<Path> ICON =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> ICON =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.ICON.getId(),
                     Path.class,
                     params -> null,
                     (s, p) -> Path.of(s)
             );
 
-    static final StandardBundlerParam<String> ABOUT_URL =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> ABOUT_URL =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.ABOUT_URL.getId(),
                     String.class,
                     params -> null,
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<String> VENDOR =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> VENDOR =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.VENDOR.getId(),
                     String.class,
                     params -> I18N.getString("param.vendor.default"),
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<String> DESCRIPTION =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> DESCRIPTION =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.DESCRIPTION.getId(),
                     String.class,
                     params -> params.containsKey(APP_NAME.getID())
@@ -234,8 +215,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<String> COPYRIGHT =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> COPYRIGHT =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.COPYRIGHT.getId(),
                     String.class,
                     params -> MessageFormat.format(I18N.getString(
@@ -244,8 +225,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> ARGUMENTS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<String>> ARGUMENTS =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.ARGUMENTS.getId(),
                     (Class<List<String>>) (Object) List.class,
                     params -> Collections.emptyList(),
@@ -253,40 +234,40 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> JAVA_OPTIONS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<String>> JAVA_OPTIONS =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.JAVA_OPTIONS.getId(),
                     (Class<List<String>>) (Object) List.class,
                     params -> Collections.emptyList(),
                     (s, p) -> Arrays.asList(s.split("\n\n"))
             );
 
-    static final StandardBundlerParam<String> VERSION =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> VERSION =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.VERSION.getId(),
                     String.class,
                     StandardBundlerParam::getDefaultAppVersion,
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<String> RELEASE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> RELEASE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.RELEASE.getId(),
                     String.class,
                     params -> DEFAULT_RELEASE,
                     (s, p) -> s
             );
 
-    public static final StandardBundlerParam<String> LICENSE_FILE =
-            new StandardBundlerParam<>(
+    public static final BundlerParamInfo<String> LICENSE_FILE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.LICENSE_FILE.getId(),
                     String.class,
                     params -> null,
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<Path> TEMP_ROOT =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> TEMP_ROOT =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.TEMP_ROOT.getId(),
                     Path.class,
                     params -> {
@@ -299,8 +280,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> Path.of(s)
             );
 
-    public static final StandardBundlerParam<Path> CONFIG_ROOT =
-            new StandardBundlerParam<>(
+    public static final BundlerParamInfo<Path> CONFIG_ROOT =
+            new BundlerParamInfo<>(
                 "configRoot",
                 Path.class,
                 params -> {
@@ -315,8 +296,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                 (s, p) -> null
             );
 
-    static final StandardBundlerParam<Boolean> VERBOSE  =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Boolean> VERBOSE  =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.VERBOSE.getId(),
                     Boolean.class,
                     params -> false,
@@ -325,8 +306,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                             true : Boolean.valueOf(s)
             );
 
-    static final StandardBundlerParam<Boolean> SHORTCUT_HINT  =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Boolean> SHORTCUT_HINT  =
+            new BundlerParamInfo<>(
                     "shortcut-hint", // not directly related to a CLI option
                     Boolean.class,
                     params -> true,  // defaults to true
@@ -334,8 +315,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                             true : Boolean.valueOf(s)
             );
 
-    static final StandardBundlerParam<Boolean> MENU_HINT  =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Boolean> MENU_HINT  =
+            new BundlerParamInfo<>(
                     "menu-hint", // not directly related to a CLI option
                     Boolean.class,
                     params -> true,  // defaults to true
@@ -343,8 +324,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                             true : Boolean.valueOf(s)
             );
 
-    static final StandardBundlerParam<Path> RESOURCE_DIR =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> RESOURCE_DIR =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.RESOURCE_DIR.getId(),
                     Path.class,
                     params -> null,
@@ -352,15 +333,15 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     static final BundlerParamInfo<String> INSTALL_DIR =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.INSTALL_DIR.getId(),
                     String.class,
                      params -> null,
                     (s, p) -> s
     );
 
-    static final StandardBundlerParam<Boolean> LAUNCHER_AS_SERVICE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Boolean> LAUNCHER_AS_SERVICE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.LAUNCHER_AS_SERVICE.getId(),
                     Boolean.class,
                     params -> false,
@@ -371,8 +352,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
 
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<Map<String, ? super Object>>> ADD_LAUNCHERS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<Map<String, ? super Object>>> ADD_LAUNCHERS =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.ADD_LAUNCHER.getId(),
                     (Class<List<Map<String, ? super Object>>>) (Object)
                             List.class,
@@ -382,9 +363,9 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam
+    static final BundlerParamInfo
             <List<Map<String, ? super Object>>> FILE_ASSOCIATIONS =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.FILE_ASSOCIATIONS.getId(),
                     (Class<List<Map<String, ? super Object>>>) (Object)
                             List.class,
@@ -394,8 +375,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> FA_EXTENSIONS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<String>> FA_EXTENSIONS =
+            new BundlerParamInfo<>(
                     "fileAssociation.extension",
                     (Class<List<String>>) (Object) List.class,
                     params -> null, // null means not matched to an extension
@@ -403,8 +384,8 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> FA_CONTENT_TYPE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<String>> FA_CONTENT_TYPE =
+            new BundlerParamInfo<>(
                     "fileAssociation.contentType",
                     (Class<List<String>>) (Object) List.class,
                     params -> null,
@@ -412,16 +393,16 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> Arrays.asList(s.split("(,|\\s)+"))
             );
 
-    static final StandardBundlerParam<String> FA_DESCRIPTION =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<String> FA_DESCRIPTION =
+            new BundlerParamInfo<>(
                     "fileAssociation.description",
                     String.class,
                     p -> null,
                     (s, p) -> s
             );
 
-    static final StandardBundlerParam<Path> FA_ICON =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Path> FA_ICON =
+            new BundlerParamInfo<>(
                     "fileAssociation.icon",
                     Path.class,
                     ICON::fetchFrom,
@@ -429,26 +410,26 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
             );
 
     @SuppressWarnings("unchecked")
-    static final BundlerParamInfo<List<String>> DMG_CONTENT =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<Path>> DMG_CONTENT =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.DMG_CONTENT.getId(),
-                    (Class<List<String>>) (Object)List.class,
+                    (Class<List<Path>>) (Object)List.class,
                     p -> Collections.emptyList(),
-                    (s, p) -> Arrays.asList(s.split(","))
+                    (s, p) -> Stream.of(s.split(",")).map(Path::of).toList()
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> APP_CONTENT =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<Path>> APP_CONTENT =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.APP_CONTENT.getId(),
-                    (Class<List<String>>) (Object)List.class,
+                    (Class<List<Path>>) (Object)List.class,
                     p->Collections.emptyList(),
-                    (s, p) -> Arrays.asList(s.split(","))
+                    (s, p) -> Stream.of(s.split(",")).map(Path::of).toList()
             );
 
     @SuppressWarnings("unchecked")
     static final BundlerParamInfo<List<Path>> MODULE_PATH =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.MODULE_PATH.getId(),
                     (Class<List<Path>>) (Object)List.class,
                     p -> getDefaultModulePath(),
@@ -493,7 +474,7 @@ private static Path findPathOfModule( List<Path> modulePath, String moduleName)
     }
 
     static final BundlerParamInfo<String> MODULE =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.MODULE.getId(),
                     String.class,
                     p -> null,
@@ -503,7 +484,7 @@ private static Path findPathOfModule( List<Path> modulePath, String moduleName)
 
     @SuppressWarnings("unchecked")
     static final BundlerParamInfo<Set<String>> ADD_MODULES =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.ADD_MODULES.getId(),
                     (Class<Set<String>>) (Object) Set.class,
                     p -> new LinkedHashSet<String>(),
@@ -511,8 +492,8 @@ private static Path findPathOfModule( List<Path> modulePath, String moduleName)
             );
 
     @SuppressWarnings("unchecked")
-    static final StandardBundlerParam<List<String>> JLINK_OPTIONS =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<List<String>> JLINK_OPTIONS =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.JLINK_OPTIONS.getId(),
                     (Class<List<String>>) (Object) List.class,
                     p -> Arrays.asList(DEFAULT_JLINK_OPTIONS),
@@ -520,15 +501,15 @@ private static Path findPathOfModule( List<Path> modulePath, String moduleName)
 
     @SuppressWarnings("unchecked")
     static final BundlerParamInfo<Set<String>> LIMIT_MODULES =
-            new StandardBundlerParam<>(
+            new BundlerParamInfo<>(
                     "limit-modules",
                     (Class<Set<String>>) (Object) Set.class,
                     p -> new LinkedHashSet<String>(),
                     (s, p) -> new LinkedHashSet<>(Arrays.asList(s.split(",")))
             );
 
-    static final StandardBundlerParam<Boolean> SIGN_BUNDLE =
-            new StandardBundlerParam<>(
+    static final BundlerParamInfo<Boolean> SIGN_BUNDLE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.MAC_SIGN.getId(),
                     Boolean.class,
                     params -> false,
@@ -536,22 +517,6 @@ private static Path findPathOfModule( List<Path> modulePath, String moduleName)
                     null : Boolean.valueOf(s)
         );
 
-    static final StandardBundlerParam<Boolean> APP_STORE =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.MAC_APP_STORE.getId(),
-            Boolean.class,
-            params -> {
-                if (hasPredefinedAppImage(params)) {
-                    return AppImageFile.load(getPredefinedAppImage(params))
-                            .isAppStore();
-                }
-                return false;
-            },
-            // valueOf(null) is false, we actually do want null in some cases
-            (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ?
-                    null : Boolean.valueOf(s)
-        );
-
     static boolean isRuntimeInstaller(Map<String, ? super Object> params) {
         if (params.containsKey(MODULE.getID()) ||
                 params.containsKey(MAIN_JAR.getID()) ||
@@ -568,46 +533,15 @@ static boolean hasPredefinedAppImage(Map<String, ? super Object> params) {
     }
 
     static Path getPredefinedAppImage(Map<String, ? super Object> params) {
-        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 (OperatingSystem.isMacOS()) {
-            // On Mac topImage can be runtime root or runtime home.
-            Path runtimeHome = topImage.resolve("Contents/Home");
-            if (Files.isDirectory(runtimeHome)) {
-                // topImage references runtime root, adjust it to pick data from
-                // runtime home
-                topImage = runtimeHome;
-            }
+        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()));
         }
-
-        // copy whole runtime, need to skip jmods and src.zip
-        final List<Path> excludes = Arrays.asList(Path.of("jmods"), Path.of("src.zip"));
-        FileUtils.copyRecursive(topImage, appLayout.runtimeHomeDirectory(),
-                        excludes, LinkOption.NOFOLLOW_LINKS);
-
-        // if module-path given - copy modules to appDir/mods
-        List<Path> modulePath = MODULE_PATH.fetchFrom(params);
-        List<Path> defaultModulePath = getDefaultModulePath();
-        Path dest = appLayout.appModsDirectory();
-
-        if (dest != null) {
-            for (Path mp : modulePath) {
-                if (!defaultModulePath.contains(mp)) {
-                    Files.createDirectories(dest);
-                    FileUtils.copyRecursive(mp, dest);
-                }
-            }
-        }
-    }
-
-    private static List<Path> getDefaultModulePath() {
-        return List.of(
-                Path.of(System.getProperty("java.home"), "jmods").toAbsolutePath());
+        return applicationImage;
     }
 
     private static String getDefaultAppVersion(Map<String, ? super Object> params) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageLayout.java
new file mode 100644
index 00000000000..1cd0e0f6c2e
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageLayout.java
@@ -0,0 +1,121 @@
+/*
+ * 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.model;
+
+
+import java.lang.reflect.Modifier;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.PathGroup;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+
+/**
+ * Generic app image directory layout.
+ *
+ * App image layout is a collection of files and directories with specific roles
+ * (executables, configuration files, etc.) sharing the same root directory.
+ *
+ * The layout is "unresolved" if the root directory is an empty string and
+ * "resolved" otherwise.
+ */
+public interface AppImageLayout {
+
+    /**
+     * A path to Java runtime directory.
+     * The directory should have standard JDK subdirectories like "bin", "lib", etc.
+     *
+     * @return Java runtime sub-directory within this app image
+     */
+    Path runtimeDirectory();
+
+    /**
+     * Root directory of this app image.
+     * It should normally be equal to <code>Path.of("")</code> for unresolved layout.
+     *
+     * @return the root directory of this app image
+     */
+    Path rootDirectory();
+
+    /**
+     * Creates a copy of this app image resolved at the given root directory.
+     *
+     * @param root path to a directory at which to resolve the layout
+     * @return a copy of this app image resolved at the given root directory
+     */
+    AppImageLayout resolveAt(Path root);
+
+    /**
+     * Default implementation of {@link AppImageLayout} interface.
+    */
+    record Stub(Path rootDirectory, Path runtimeDirectory) implements AppImageLayout {
+
+        @Override
+        public AppImageLayout resolveAt(Path base) {
+            return new Stub(resolveNullablePath(base, rootDirectory), resolveNullablePath(base, runtimeDirectory));
+        }
+    }
+
+    /**
+     * Creates {@link PathGroup} object from the given {@link AppImageLayout}
+     * instance.
+     *
+     * It will call every non-static accessible method without parameters and with
+     * {@link Path} return type of the given {@link AppImageLayout} instance except
+     * {@link #rootDirectory()} method.
+     * <p>
+     * For every call, it will save the return value in the output {@link PathGroup}
+     * object under the key equals the name of a function used in the call.
+     *
+     * @param appImageLayout source layout object
+     * @return {@link PathGroup} object constructed from the given source layout
+     *         object
+     */
+    public static PathGroup toPathGroup(AppImageLayout appImageLayout) {
+        return new PathGroup(Stream.of(appImageLayout.getClass().getInterfaces())
+                // For all interfaces (it should be one, but multiple is OK)
+                // extending AppImageLayout interface call all non-static methods
+                // without parameters and with java.nio.file.Path return type.
+                // Create a map from the names of methods called and return values.
+                .filter(AppImageLayout.class::isAssignableFrom)
+                .map(Class::getMethods)
+                .flatMap(Stream::of)
+                .filter(m -> !Modifier.isStatic(m.getModifiers()))
+                .filter(m -> !"rootDirectory".equals(m.getName()))
+                .filter(m -> {
+                    return m.getReturnType().isAssignableFrom(Path.class) && m.getParameterCount() == 0;
+                }).<Map.Entry<String, Path>>mapMulti((m, consumer) -> {
+                    Optional.ofNullable(toFunction(m::invoke).apply(appImageLayout)).ifPresent(path -> {
+                        consumer.accept(Map.entry(m.getName(), (Path)path));
+                    });
+                }).collect(HashMap::new, (ctnr, e) -> {
+                    ctnr.put(e.getKey(), e.getValue());
+                }, Map::putAll));
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
new file mode 100644
index 00000000000..4e28bb05aef
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
@@ -0,0 +1,41 @@
+/*
+ * 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.model;
+
+/**
+ * App image packaging type.
+ *
+ * @see StandardPackageType
+ */
+public final class AppImagePackageType implements PackageType {
+
+    private AppImagePackageType() {
+    }
+
+    /**
+     * Singleton
+     */
+    public static final AppImagePackageType APP_IMAGE = new AppImagePackageType();
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
new file mode 100644
index 00000000000..019ea060e79
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
@@ -0,0 +1,251 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * A generic application for packaging.
+ *
+ * @apiNote All paths of startup configurations of application launchers
+ *          returned by {@link #launchers()} call must be relative to the path
+ *          returned by {@link #srcDir()} call.
+ *
+ * @see Package
+ */
+public interface Application {
+
+    /**
+     * Gets the name of this application.
+     *
+     * @return the name of this application
+     */
+    String name();
+
+    /**
+     * Gets the description of this application.
+     *
+     * @return the description of this application
+     */
+    String description();
+
+    /**
+     * Gets the version of this application.
+     *
+     * @return the version of this application
+     */
+    String version();
+
+    /**
+     * Gets the vendor of this application.
+     *
+     * @return the vendor of this application
+     */
+    String vendor();
+
+    /**
+     * Gets the copyright of this application.
+     *
+     * @return the copyright of this application
+     */
+    String copyright();
+
+    /**
+     * Gets the source directory of this application if available or an empty
+     * {@link Optional} instance.
+     * <p>
+     * Source directory is a directory with the applications's classes and other
+     * resources.
+     *
+     * @return the source directory of this application
+     */
+    Optional<Path> srcDir();
+
+    /**
+     * Gets the input content directories of this application.
+     * <p>
+     * Contents of the content directories will be copied as-is into the dedicated
+     * location of the application image.
+     *
+     * @see ApplicationLayout#contentDirectory
+     *
+     * @return the input content directories of this application
+     */
+    List<Path> contentDirs();
+
+    /**
+     * Gets the unresolved app image layout of this application.
+     *
+     * @return the unresolved app image layout of this application
+     */
+    AppImageLayout imageLayout();
+
+    /**
+     * Gets the unresolved app image layout of this application as
+     * {@link ApplicationLayout} type or an empty {@link Optional} instance if the
+     * return value of {@link #imageLayout()} call is not an instance of
+     * {@link ApplicationLayout} type.
+     * <p>
+     * Returns an empty {@link Optional} instance if {@link #isRuntime()} returns
+     * <code>true</code>.
+     *
+     * @see #isRuntime
+     *
+     * @return the unresolved app image layout of this application as
+     *         {@link ApplicationLayout}
+     */
+    default Optional<ApplicationLayout> asApplicationLayout() {
+        if (imageLayout() instanceof ApplicationLayout layout) {
+            return Optional.of(layout);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Gets the runtime builder of this application if available or an empty
+     * {@link Optional} instance.
+     *
+     * @return the runtime builder of this application
+     */
+    Optional<RuntimeBuilder> runtimeBuilder();
+
+    /**
+     * Gets the name of the root app image directory of this application.
+     *
+     * @return the name of the root app image directory of this application
+     */
+    default Path appImageDirName() {
+        return Path.of(name());
+    }
+
+    /**
+     * Gets the application launchers of this application.
+     * <p>
+     * If the returned list is not empty, the first element in the list is the main
+     * launcher.
+     * <p>
+     * Returns an empty list if {@link #isRuntime()} returns <code>true</code>.
+     *
+     * @see #mainLauncher()
+     * @see #additionalLaunchers()
+     * @see #isRuntime()
+     *
+     * @return the application launchers of this application
+     */
+    List<Launcher> launchers();
+
+    /**
+     * Returns the main application launcher of this application or an empty
+     * {@link Optional} instance if the application doesn't have launchers.
+     * <p>
+     * Returns an empty {@link Optional} instance if {@link #isRuntime()} returns
+     * <code>true</code>.
+     *
+     * @see #launchers()
+     * @see #additionalLaunchers()
+     * @see #isRuntime()
+     *
+     * @return the main application launcher of this application
+     */
+    default Optional<Launcher> mainLauncher() {
+        return ApplicationLaunchers.fromList(launchers()).map(ApplicationLaunchers::mainLauncher);
+    }
+
+    /**
+     * Gets the additional application launchers of this application.
+     * <p>
+     * Returns an empty list if this application doesn't have additional launchers.
+     * <p>
+     * Returns an empty list if {@link #isRuntime()} returns <code>true</code>.
+     *
+     * @see #launchers()
+     * @see #mainLauncher()
+     * @see #isRuntime()
+     *
+     * @return the additional application launchers of this application
+     */
+    default List<Launcher> additionalLaunchers() {
+        return ApplicationLaunchers.fromList(launchers()).map(ApplicationLaunchers::additionalLaunchers)
+                .orElseGet(Collections::emptyList);
+    }
+
+    /**
+     * Returns <code>true</code> if this application is Java runtime.
+     *
+     * @return <code>true</code> if this application is Java runtime
+     */
+    default boolean isRuntime() {
+        return imageLayout() instanceof RuntimeLayout;
+    }
+
+    /**
+     * Returns <code>true</code> if any of application launchers of this application
+     * are configured as services.
+     *
+     * @see Launcher#isService
+     *
+     * @return <code>true</code> if any of application launchers of this application
+     *         are configured as services
+     */
+    default boolean isService() {
+        return Optional.ofNullable(launchers()).orElseGet(List::of).stream()
+                .filter(Launcher::isService).findAny().isPresent();
+    }
+
+    /**
+     * Gets the additional properties of this application for the application entry
+     * in the app image (".jpackage") file.
+     *
+     * @return the additional properties of this application for the application
+     *         entry in ".jpackage" file
+     */
+    Map<String, String> extraAppImageFileData();
+
+    /**
+     * Gets the file associations of all application launchers of this application.
+     *
+     * @return the file associations of all application launchers of this
+     *         application
+     *
+     * @see Launcher#fileAssociations
+     */
+    default Stream<FileAssociation> fileAssociations() {
+        return launchers().stream().map(Launcher::fileAssociations).flatMap(List::stream);
+    }
+
+    /**
+     * Default implementation of {@link Application} interface.
+     */
+    record Stub(String name, String description, String version, String vendor, String copyright, Optional<Path> srcDir,
+            List<Path> contentDirs, AppImageLayout imageLayout, Optional<RuntimeBuilder> runtimeBuilder,
+            List<Launcher> launchers,  Map<String, String> extraAppImageFileData) implements Application {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLaunchers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLaunchers.java
new file mode 100644
index 00000000000..af52696a546
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLaunchers.java
@@ -0,0 +1,68 @@
+/*
+ * 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.model;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * Utility class to manage application launchers.
+ * <p>
+ * Use {@link #asList} to get application launchers as a list.
+ * <p>
+ * Use {@link #mainLauncher()} to get the main application launcher.
+ * <p>
+ * Use {@link #additionalLaunchers()} to get additional application launchers.
+ * <p>
+ * Use {@link #fromList} to convert the list of application launchers into {@link ApplicationLaunchers} instance.
+ */
+public record ApplicationLaunchers(Launcher mainLauncher, List<Launcher> additionalLaunchers) {
+
+    public ApplicationLaunchers {
+        Objects.requireNonNull(mainLauncher);
+        Objects.requireNonNull(additionalLaunchers);
+    }
+
+    public ApplicationLaunchers(Launcher mainLauncher) {
+        this(mainLauncher, List.of());
+    }
+
+    public List<Launcher> asList() {
+        return Optional.ofNullable(mainLauncher).map(v -> {
+            return Stream.concat(Stream.of(v), additionalLaunchers.stream()).toList();
+        }).orElseGet(List::of);
+    }
+
+    public static Optional<ApplicationLaunchers> fromList(List<Launcher> launchers) {
+        if (launchers == null || launchers.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(new ApplicationLaunchers(launchers.getFirst(),
+                    launchers.subList(1, launchers.size())));
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayout.java
new file mode 100644
index 00000000000..b8b2eda4437
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayout.java
@@ -0,0 +1,198 @@
+/*
+ * 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.model;
+
+import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Application app image layout.
+ * <p>
+ * Application is comprised from application files and Java runtime.
+ * <p>
+ * Use {@link #build()} or {@link #buildFrom(ApplicationLayout)} methods to
+ * configure and construct instances of this interface.
+ */
+public interface ApplicationLayout extends AppImageLayout, ApplicationLayoutMixin {
+
+    @Override
+    default ApplicationLayout resolveAt(Path root) {
+        return buildFrom(this).resolveAt(root).create();
+    }
+
+    /**
+     * Creates an object implementing {@link ApplicationLayout} interface from
+     * {@link AppImageLayout} and {@link ApplicationLayoutMixin} instances.
+     *
+     * @param appImage app image layout object
+     * @param mixin application layout mixin for the app image layout
+     * @return new object implementing {@link ApplicationLayout} interface
+     */
+    static ApplicationLayout create(AppImageLayout appImage, ApplicationLayoutMixin mixin) {
+        return CompositeProxy.create(ApplicationLayout.class, appImage, mixin);
+    }
+
+    public static Builder build() {
+        return new Builder();
+    }
+
+    public static Builder buildFrom(ApplicationLayout appLayout) {
+        return new Builder(appLayout);
+    }
+
+    /**
+     * Builds {@link ApplicationLayout} instances.
+     */
+    final class Builder {
+        private Builder() {
+        }
+
+        private Builder(ApplicationLayout appLayout) {
+            rootDirectory = appLayout.rootDirectory();
+            launchersDirectory = appLayout.launchersDirectory();
+            appDirectory = appLayout.appDirectory();
+            runtimeDirectory = appLayout.runtimeDirectory();
+            appModsDirectory = appLayout.appModsDirectory();
+            desktopIntegrationDirectory = appLayout.desktopIntegrationDirectory();
+            contentDirectory = appLayout.contentDirectory();
+        }
+
+        public ApplicationLayout create() {
+
+            Objects.requireNonNull(rootDirectory);
+            Objects.requireNonNull(runtimeDirectory);
+            Objects.requireNonNull(launchersDirectory);
+            Objects.requireNonNull(appDirectory);
+            Objects.requireNonNull(appModsDirectory);
+            Objects.requireNonNull(desktopIntegrationDirectory);
+            Objects.requireNonNull(contentDirectory);
+
+            return ApplicationLayout.create(new AppImageLayout.Stub(
+                    rootDirectory, runtimeDirectory), new ApplicationLayoutMixin.Stub(
+                    launchersDirectory, appDirectory, appModsDirectory,
+                    desktopIntegrationDirectory, contentDirectory));
+        }
+
+        public Builder setAll(String path) {
+            return setAll(Path.of(path));
+        }
+
+        public Builder setAll(Path path) {
+            rootDirectory(path);
+            launchersDirectory(path);
+            appDirectory(path);
+            runtimeDirectory(path);
+            appModsDirectory(path);
+            desktopIntegrationDirectory(path);
+            contentDirectory(path);
+            return this;
+        }
+
+        public Builder resolveAt(Path base) {
+            rootDirectory(resolveNullablePath(base, rootDirectory));
+            launchersDirectory(resolveNullablePath(base, launchersDirectory));
+            appDirectory(resolveNullablePath(base, appDirectory));
+            runtimeDirectory(resolveNullablePath(base, runtimeDirectory));
+            appModsDirectory(resolveNullablePath(base, appModsDirectory));
+            desktopIntegrationDirectory(resolveNullablePath(base, desktopIntegrationDirectory));
+            contentDirectory(resolveNullablePath(base, contentDirectory));
+            return this;
+        }
+
+        public Builder rootDirectory(String v) {
+            return rootDirectory(Path.of(v));
+        }
+
+        public Builder rootDirectory(Path v) {
+            rootDirectory = v;
+            return this;
+        }
+
+        public Builder launchersDirectory(String v) {
+            return launchersDirectory(Path.of(v));
+        }
+
+        public Builder launchersDirectory(Path v) {
+            launchersDirectory = v;
+            return this;
+        }
+
+        public Builder appDirectory(String v) {
+            return appDirectory(Path.of(v));
+        }
+
+        public Builder appDirectory(Path v) {
+            appDirectory = v;
+            return this;
+        }
+
+        public Builder runtimeDirectory(String v) {
+            return runtimeDirectory(Path.of(v));
+        }
+
+        public Builder runtimeDirectory(Path v) {
+            runtimeDirectory = v;
+            return this;
+        }
+
+        public Builder appModsDirectory(String v) {
+            return appModsDirectory(Path.of(v));
+        }
+
+        public Builder appModsDirectory(Path v) {
+            appModsDirectory = v;
+            return this;
+        }
+
+        public Builder desktopIntegrationDirectory(String v) {
+            return desktopIntegrationDirectory(Path.of(v));
+        }
+
+        public Builder desktopIntegrationDirectory(Path v) {
+            desktopIntegrationDirectory = v;
+            return this;
+        }
+
+        public Builder contentDirectory(String v) {
+            return contentDirectory(Path.of(v));
+        }
+
+        public Builder contentDirectory(Path v) {
+            contentDirectory = v;
+            return this;
+        }
+
+        private Path rootDirectory = Path.of("");
+        private Path launchersDirectory;
+        private Path appDirectory;
+        private Path runtimeDirectory;
+        private Path appModsDirectory;
+        private Path desktopIntegrationDirectory;
+        private Path contentDirectory;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayoutMixin.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayoutMixin.java
new file mode 100644
index 00000000000..10528b7bd6a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayoutMixin.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.jpackage.internal.model;
+
+import java.nio.file.Path;
+
+/**
+ * App image directory contents specific to application packaging.
+ */
+public interface ApplicationLayoutMixin {
+
+    /**
+     * Path to launchers directory.
+     */
+    Path launchersDirectory();
+
+    /**
+     * Path to application data directory.
+     */
+    Path appDirectory();
+
+    /**
+     * Path to directory with application's Java modules.
+     */
+    Path appModsDirectory();
+
+    /**
+     * Path to directory with application's desktop integration files.
+     */
+    Path desktopIntegrationDirectory();
+
+    /**
+     * Path to directory with additional application content.
+     */
+    Path contentDirectory();
+
+    /**
+     * Default implementation of {@link ApplicationLayoutMixin} interface.
+     */
+    record Stub(Path launchersDirectory, Path appDirectory, Path appModsDirectory, Path desktopIntegrationDirectory, Path contentDirectory) implements ApplicationLayoutMixin {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
new file mode 100644
index 00000000000..14827a50729
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
@@ -0,0 +1,49 @@
+/*
+ * 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.model;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+
+/**
+ * Creates app image directory from the given {@link Application} object.
+ *
+ *  @ see PackageWriter
+ */
+@FunctionalInterface
+public interface ApplicationWriter {
+
+    /**
+     * Creates app image directory from the given {@link Application} object in the given directory.
+     *
+     * @param app the source application
+     * @param dst the directory where to create app image of the source application
+     * @throws PackagerException if packaging error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    void write(Application app, Path dst) throws PackagerException, IOException;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
index fbc856b9a30..a2a799d7f1b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
@@ -25,21 +25,42 @@
 
 package jdk.jpackage.internal.model;
 
+import jdk.jpackage.internal.util.LocalizedExceptionBuilder;
+import jdk.jpackage.internal.util.StringBundle;
+
+/**
+ * Signals that error has occurred at configuration phase.
+ * <p>
+ * It contains an error message and an optional advice message on how to correct the error.
+ * <p>
+ * The preferred way to construct instances of this class is to use
+ * {@link #build(StringBundle)}, or {@link #build(StringBundle, Throwable)},
+ * or {@link #build(StringBundle, String, Object...)} methods.
+ *
+ * {@snippet :
+ * StringBundle i18n = getStringBundle(); // Some way to obtain a string bundle with localized messages
+ *
+ * throw ConfigException.build(i18n)
+ *         .message("error.no.name")
+ *         .advice("error.no.name.advice")
+ *         .create();
+ * }
+ */
 public class ConfigException extends Exception {
     private static final long serialVersionUID = 1L;
-    final String advice;
+    private final String advice;
 
     public ConfigException(String msg, String advice) {
         super(msg);
         this.advice = advice;
     }
 
-    public ConfigException(String msg, String advice, Exception cause) {
+    public ConfigException(String msg, String advice, Throwable cause) {
         super(msg, cause);
         this.advice = advice;
     }
 
-    public ConfigException(Exception cause) {
+    public ConfigException(Throwable cause) {
         super(cause);
         this.advice = null;
     }
@@ -47,4 +68,60 @@ public ConfigException(Exception cause) {
     public String getAdvice() {
         return advice;
     }
+
+    public static Builder build(StringBundle i18n) {
+        return new Builder(i18n);
+    }
+
+    public static Builder build(StringBundle i18n, String msgId, Object ... args) {
+        return build(i18n).message(msgId, args);
+    }
+
+    public static Builder build(StringBundle i18n, Throwable t) {
+        return build(i18n).causeAndMessage(t);
+    }
+
+    /**
+     * Builds {@link ConfigException} instances.
+     */
+    public static class Builder extends LocalizedExceptionBuilder<Builder> {
+
+        public Builder advice(String adviceId, Object ... args) {
+            advice = formatString(adviceId, args);
+            return this;
+        }
+
+        private Builder(StringBundle i18n) {
+            super(i18n);
+        }
+
+        public ConfigException create() {
+            return create(this::create);
+        }
+
+        private ConfigException create(String msg, Throwable cause) {
+            return new ConfigException(msg, advice, cause);
+        }
+
+        private String advice;
+    }
+
+    /**
+     * Throws the cause of the given {@link RuntimeException} exception
+     * as {@link ConfigException} if the cause is of this type or re-throws the given
+     * {@link RuntimeException} exception as-is otherwise.
+     * <p>
+     * Never return a value. It always throws some exception object.
+     *
+     * @param ex exception to re-throw
+     * @return doesn't return value
+     * @throws ConfigException
+     */
+    public static RuntimeException rethrowConfigException(RuntimeException ex) throws ConfigException {
+        if (ex.getCause() instanceof ConfigException configEx) {
+            throw configEx;
+        } else {
+            throw ex;
+        }
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/CustomLauncherIcon.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/CustomLauncherIcon.java
new file mode 100644
index 00000000000..13216535680
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/CustomLauncherIcon.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Custom application launcher icon.
+ * <p>
+ * Use {@link #create(Path)} method to create an instance of this type.
+ */
+public interface CustomLauncherIcon extends LauncherIcon {
+
+    /**
+     * Returns path to icon file.
+     * @return path to icon file
+     */
+    Path path();
+
+    /**
+     * Returns the given icon as {@link CustomLauncherIcon} type or an empty {@link Optional} instance
+     * if the given icon object is not an instance of {@link CustomLauncherIcon} type.
+     *
+     * @param icon application launcher icon object or <code>null</null>
+     * @return the given icon as {@link CustomLauncherIcon} type or an empty {@link Optional} instance
+     */
+    public static Optional<CustomLauncherIcon> fromLauncherIcon(LauncherIcon icon) {
+        if (icon instanceof CustomLauncherIcon customIcon) {
+            return Optional.of(customIcon);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Creates object of type {@link CustomLauncherIcon} from the path to icon file.
+     * @param path path to icon file
+     * @return {@link CustomLauncherIcon} instance
+     */
+    public static CustomLauncherIcon create(Path path) {
+        Objects.requireNonNull(path);
+        return new Stub(path);
+    }
+
+    /**
+     * Default implementation of {@link CustomLauncherIcon} type.
+     */
+    record Stub(Path path) implements CustomLauncherIcon {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/DefaultLauncherIcon.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/DefaultLauncherIcon.java
new file mode 100644
index 00000000000..6e36949190e
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/DefaultLauncherIcon.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.util.Optional;
+
+/**
+ * Default application launcher icon.
+ * <p>
+ * Default icon is either loaded from the resources of {@link jdk.jpackage/} module or picked from the resource directory.
+ * <p>
+ * Use {@link #INSTANCE} field to get an instance of this type.
+ */
+public interface DefaultLauncherIcon extends LauncherIcon {
+
+    /**
+     * Returns the given icon as {@link DefaultLauncherIcon} type or an empty {@link Optional} instance
+     * if the given icon object is not an instance of {@link DefaultLauncherIcon} type.
+     *
+     * @param icon application launcher icon object or <code>null</null>
+     * @return the given icon as {@link DefaultLauncherIcon} type or an empty {@link Optional} instance
+     */
+    public static Optional<DefaultLauncherIcon> fromLauncherIcon(LauncherIcon icon) {
+        if (icon instanceof DefaultLauncherIcon defaultIcon) {
+            return Optional.of(defaultIcon);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Singleton.
+     */
+    public static DefaultLauncherIcon INSTANCE = new DefaultLauncherIcon() {};
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/FileAssociation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/FileAssociation.java
new file mode 100644
index 00000000000..8f4bea661df
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/FileAssociation.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+/**
+ * File association.
+ */
+public interface FileAssociation {
+
+    /**
+     * Returns file association description if available or an empty {@link Optional} instance.
+     * @return file association description
+     */
+    Optional<String> description();
+
+    /**
+     * Returns file association icon if available or an empty {@link Optional} instance.
+     * @see {@link #hasIcon()}
+     * @return file association icon
+     */
+    Optional<Path> icon();
+
+    /**
+     * Returns <code>true</code> if the file association has an icon.
+     * @see {@link #icon()}
+     * @return <code>true</code> if the file association has an icon
+     */
+    default boolean hasIcon() {
+        return icon().isPresent();
+    }
+
+    /**
+     * Returns file association MIME type. E.g.: <code>application/foo</code>, <code>text/plain<code>.
+     * @return file association MIME type
+     */
+    String mimeType();
+
+    /**
+     * Returns file association extension. E.g.: <code>.txt</code>
+     * @return file association extension
+     */
+    String extension();
+
+    /**
+     * Default implementation of {@link FileAssociation} interface
+     */
+    record Stub(Optional<String> description, Optional<Path> icon, String mimeType, String extension) implements FileAssociation {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/I18N.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/I18N.java
index 6a9f8074e08..2a87c53ca44 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/I18N.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/I18N.java
@@ -24,12 +24,12 @@
  */
 package jdk.jpackage.internal.model;
 
-import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.util.LocalizedExceptionBuilder;
 import jdk.jpackage.internal.util.MultiResourceBundle;
+import jdk.jpackage.internal.util.StringBundle;
 
 final class I18N {
 
@@ -38,25 +38,24 @@ static String getString(String key) {
     }
 
     static String format(String key, Object ... args) {
-        var str = getString(key);
-        if (args.length != 0) {
-            return MessageFormat.format(str, args);
-        } else {
-            return str;
-        }
+        return BUNDLE.format(key, args);
     }
 
-    private static final ResourceBundle BUNDLE;
+    static LocalizedExceptionBuilder<?> buildLocalizedException() {
+        return LocalizedExceptionBuilder.buildLocalizedException(BUNDLE);
+    }
+
+    private static final StringBundle BUNDLE;
 
     static {
         var prefix = "jdk.jpackage.internal.resources.";
-        BUNDLE = MultiResourceBundle.create(
+        BUNDLE = StringBundle.fromResourceBundle(MultiResourceBundle.create(
                 prefix + "MainResources",
                 Map.of(
                         OperatingSystem.LINUX, List.of(prefix + "LinuxResources"),
                         OperatingSystem.MACOS, List.of(prefix + "MacResources"),
                         OperatingSystem.WINDOWS, List.of(prefix + "WinResources")
                 )
-        );
+        ));
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Launcher.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Launcher.java
new file mode 100644
index 00000000000..9c20d5432ee
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Launcher.java
@@ -0,0 +1,190 @@
+/*
+ * 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.model;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import jdk.jpackage.internal.resources.ResourceLocator;
+
+/**
+ * Application launcher.
+ *
+ * @see Application#launchers()
+ */
+public interface Launcher {
+
+    /**
+     * Gets the name of this launcher.
+     *
+     * @return the name of this launcher
+     */
+    String name();
+
+    /**
+     * Gets the name of the executable file of this launcher without file extension.
+     *
+     * @return the name of the executable file of this launcher
+     */
+    default String executableName() {
+        return name();
+    }
+
+    /**
+     * Gets extension of the executable file of this launcher if available or an
+     * empty {@link Optional} instance otherwise.
+     *
+     * @return the extension of the executable file of this launcher
+     */
+    default Optional<String> executableSuffix() {
+        return Optional.empty();
+    }
+
+    /**
+     * Gets the full name of the executable file of this launcher. The full name
+     * consists of the name and the extension.
+     *
+     * @return the full name of the executable file of this launcher
+     */
+    default String executableNameWithSuffix() {
+        return executableName() + executableSuffix().orElse("");
+    }
+
+    /**
+     * Gets the startup information of this launcher if available or an empty
+     * {@link Optional} instance otherwise.
+     *
+     * @apiNote Launchers from an external application image may not have startup
+     *          information.
+     * @return the startup information of this launcher
+     */
+    Optional<LauncherStartupInfo> startupInfo();
+
+    /**
+     * Gets the file associations of this launcher.
+     *
+     * @return the file associations of this launcher
+     */
+    List<FileAssociation> fileAssociations();
+
+    /**
+     * Returns <code>true</code> if this launcher should be installed as a service.
+     *
+     * @return <code>true</code> if this launcher should be installed as a service
+     */
+    boolean isService();
+
+    /**
+     * Gets the description of this launcher.
+     *
+     * @return the description of this launcher
+     */
+    String description();
+
+    /**
+     * Opens a stream with the template executable file for this launcher. Caller is
+     * responsible for close the stream.
+     *
+     * @return a stream with the template executable file for this launcher
+     */
+    default InputStream executableResource() {
+        return ResourceLocator.class.getResourceAsStream("jpackageapplauncher");
+    }
+
+    /**
+     * Gets the icon for this launcher or an empty {@link Optional} instance if the
+     * launcher is requested to have no icon.
+     *
+     * @return the icon for this launcher
+     * @see #hasIcon()
+     * @see #hasDefaultIcon()
+     * @see #hasCustomIcon()
+     */
+    Optional<LauncherIcon> icon();
+
+    /**
+     * Returns <code>true</code> if this launcher is requested to have an icon.
+     *
+     * @return <code>true</code> if this launcher is requested to have an icon
+     * @see #icon()
+     * @see #hasDefaultIcon()
+     * @see #hasCustomIcon()
+     */
+    default boolean hasIcon() {
+        return icon().isPresent();
+    }
+
+    /**
+     * Returns <code>true</code> if this launcher has a default icon.
+     *
+     * @return <code>true</code> if this launcher has a default icon
+     * @see DefaultLauncherIcon
+     * @see #icon()
+     * @see #hasIcon()
+     * @see #hasCustomIcon()
+     */
+    default boolean hasDefaultIcon() {
+        return icon().flatMap(DefaultLauncherIcon::fromLauncherIcon).isPresent();
+    }
+
+    /**
+     * Returns <code>true</code> if this launcher has a custom icon.
+     *
+     * @return <code>true</code> if this launcher has a custom icon
+     * @see CustomLauncherIcon
+     * @see #icon()
+     * @see #hasDefaultIcon()
+     * @see #hasIcon()
+     */
+    default boolean hasCustomIcon() {
+        return icon().flatMap(CustomLauncherIcon::fromLauncherIcon).isPresent();
+    }
+
+    /**
+     * Gets key in the resource bundle of {@link jdk.jpackage/} module referring to
+     * the default launcher icon.
+     *
+     * @return the key in the resource bundle referring to the default launcher icon
+     */
+    String defaultIconResourceName();
+
+    /**
+     * Gets the additional properties for application launcher entries in the app
+     * image (".jpackage") file.
+     *
+     * @return the additional properties for application launcher entries in
+     *         ".jpackage" file
+     */
+    Map<String, String> extraAppImageFileData();
+
+    /**
+     * Default implementation of {@link Launcher} interface.
+     */
+    record Stub(String name, Optional<LauncherStartupInfo> startupInfo, List<FileAssociation> fileAssociations,
+            boolean isService, String description, Optional<LauncherIcon> icon, String defaultIconResourceName,
+            Map<String, String> extraAppImageFileData) implements Launcher {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherIcon.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherIcon.java
new file mode 100644
index 00000000000..bd7a9955b90
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherIcon.java
@@ -0,0 +1,31 @@
+/*
+ * 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.model;
+
+/**
+ * Application launcher icon.
+ */
+public interface LauncherIcon {
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfo.java
new file mode 100644
index 00000000000..5dd747c92a9
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfo.java
@@ -0,0 +1,49 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Application launcher startup configuration using non-modular jar file.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ */
+public interface LauncherJarStartupInfo extends LauncherStartupInfo,
+        LauncherJarStartupInfoMixin {
+
+    /**
+     * Constructs {@link LauncherJarStartupInfo} instance from the given
+     * {@link LauncherJarStartupInfo} and {@link LauncherJarStartupInfoMixin} instances.
+     *
+     * @param info the generic launcher startup information
+     * @param mixin the supplementary launcher startup information
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LauncherJarStartupInfo create(LauncherStartupInfo info,
+            LauncherJarStartupInfoMixin mixin) {
+        return CompositeProxy.create(LauncherJarStartupInfo.class, info, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfoMixin.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfoMixin.java
new file mode 100644
index 00000000000..c8ead435146
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfoMixin.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+
+/**
+ * Details of Linux application launcher startup configuration using non-modular jar file.
+ */
+public interface LauncherJarStartupInfoMixin {
+
+    /**
+     * Gets the path to the input jar file.
+     * @return the path to the input jar file
+     */
+    Path jarPath();
+
+    /**
+     * Returns <code>true</code> if the input jar file has <code>Main-Class</code> entry in the manifest.
+     * @return <code>true</code> if the input jar file has <code>Main-Class</code> entry in the manifest
+     */
+    boolean isJarWithMainClass();
+
+    /**
+     * Default implementation of {@link LauncherJarStartupInfoMixin} interface.
+     */
+    record Stub(Path jarPath, boolean isJarWithMainClass) implements LauncherJarStartupInfoMixin {}
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfo.java
new file mode 100644
index 00000000000..b151b56a59b
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfo.java
@@ -0,0 +1,49 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Application launcher startup configuration using Java module.
+ * <p>
+ * Use {@link #create} method to create objects implementing this interface.
+ */
+public interface LauncherModularStartupInfo extends LauncherStartupInfo,
+        LauncherModularStartupInfoMixin {
+
+    /**
+     * Constructs {@link LauncherModularStartupInfo} instance from the given
+     * {@link LauncherJarStartupInfo} and {@link LauncherModularStartupInfoMixin} instances.
+     *
+     * @param info the generic launcher startup information
+     * @param mixin the supplementary launcher startup information
+     * @return the proxy dispatching calls to the given objects
+     */
+    public static LauncherModularStartupInfo create(LauncherStartupInfo info,
+            LauncherModularStartupInfoMixin mixin) {
+        return CompositeProxy.create(LauncherModularStartupInfo.class, info, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
new file mode 100644
index 00000000000..4f57975f710
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Details of application launcher startup configuration using Java module.
+ */
+public interface LauncherModularStartupInfoMixin {
+
+    /**
+     * Gets the main module name.
+     * @return the main module name
+     */
+    String moduleName();
+
+    /**
+     * Gets the path to the input module location.
+     * @return the path to the input module location
+     */
+    List<Path> modulePath();
+
+    /**
+     * Default implementation of {@link LauncherModularStartupInfoMixin} interface.
+     */
+    record Stub(String moduleName, List<Path> modulePath) implements LauncherModularStartupInfoMixin {
+    }
+
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherStartupInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherStartupInfo.java
new file mode 100644
index 00000000000..dd62c5a7a71
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherStartupInfo.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.lang.constant.ClassDesc;
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Generic startup configuration of an application launcher.
+ *
+ * @see Launcher#startupInfo()
+ */
+public interface LauncherStartupInfo {
+
+    /**
+     * Gets the qualified name of the main class of this launcher startup configuration.
+     * @return the qualified name of the main class of this launcher startup configuration
+     */
+    String qualifiedClassName();
+
+    /**
+     * Returns the simple name of the main class of this launcher startup configuration as given in the source code.
+     * @return the simple name of the main class of this launcher startup configuration as given in the source code
+     */
+    default String simpleClassName() {
+        return ClassDesc.of(qualifiedClassName()).displayName();
+    }
+
+    /**
+     * Gets the package name of the main class of this launcher startup configuration.
+     * @return the package name of the main class of this launcher startup configuration
+     */
+    default String packageName() {
+        return ClassDesc.of(qualifiedClassName()).packageName();
+    }
+
+    /**
+     * Gets JVM options of this launcher startup configuration.
+     * @return the JVM options of this launcher startup configuration
+     */
+    List<String> javaOptions();
+
+    /**
+     * Gets the default parameters for the <code>main(String[] args)</code>
+     * method of the main class of this launcher startup configuration.
+     *
+     * @return the default parameters for the <code>main(String[] args)</code>
+     * method of the main class of this launcher startup configuration
+     */
+    List<String> defaultParameters();
+
+    /**
+     * Gets the files and directories that should be put on a classpath for
+     * an application launcher this launcher startup configuration applies to.
+     * @return the classpath of this launcher startup configuration
+     */
+    List<Path> classPath();
+
+    /**
+     * Default implementation of {@link LauncherStartupInfo} interface.
+     */
+    record Stub(String qualifiedClassName, List<String> javaOptions,
+            List<String> defaultParameters, List<Path> classPath)
+            implements LauncherStartupInfo {
+
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
new file mode 100644
index 00000000000..7a0be535a1a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
@@ -0,0 +1,331 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+/**
+ * Native application package.
+ *
+ * The interface specifies the source app image layout with two transformations:
+ * package app image layout and installed app image layout.
+ * <p>
+ * Use {@link #appImageLayout()} or {@link #asApplicationLayout()} to get the
+ * unresolved source app image layout.
+ * <p>
+ * Package app image layout is the source app image layout resolved at the
+ * relative installation directory of the package. Additionally, to resolve the
+ * source layout, some packages may transform the source layout.
+ * <p>
+ * Use {@link #packageLayout()} or {@link #asPackageApplicationLayout()} to get
+ * the package app image layout.
+ * <p>
+ * Installed app image layout is the layout of the installed app image.
+ * <p>
+ * Use {@link #installedPackageLayout()} or
+ * {@link #asInstalledPackageApplicationLayout()} to get the installed app image
+ * layout.
+ * <p>
+ * The following table shows app image layouts of the application named "Duke"
+ * on different platforms:
+ * <table border="1">
+ * <tr>
+ * <th></th>
+ * <th>Source app image layout</th>
+ * <th>Package app image layout</th>
+ * <th>Installed app image layout</th>
+ * </tr>
+ * <tr>
+ * <th>Windows</th>
+ * <td>bin/foo.exe app/foo.jar</td>
+ * <td>Duke/bin/foo.exe Duke/app/foo.jar</td>
+ * <td>Duke/bin/foo.exe Duke/app/foo.jar</td>
+ * </tr>
+ * <tr>
+ * <th>Linux</th>
+ * <td>bin/foo lib/app/foo.jar</td>
+ * <td>opt/duke/bin/foo opt/duke/lib/app/foo.jar</td>
+ * <td>/opt/duke/bin/foo /opt/duke/lib/app/foo.jar</td>
+ * </tr>
+ * <tr>
+ * <th>OSX</th>
+ * <td>Contents/MacOS/foo Contents/app/foo.jar</td>
+ * <td>Applications/Duke.app/Contents/MacOS/foo Applications/Duke.app/Contents/app/foo.jar</td>
+ * <td>/Applications/Duke.app/Contents/MacOS/foo /Applications/Duke.app/Contents/app/foo.jar</td>
+ * </tr>
+ * </table>
+ */
+public interface Package {
+
+    /**
+     * Gets the application of this package.
+     *
+     * @return the application of this package
+     */
+    Application app();
+
+    /**
+     * Gets the type of this package.
+     *
+     * @return the type of this package
+     */
+    PackageType type();
+
+    /**
+     * Gets the type of this package as {@link StandardPackageType} type or an empty
+     * {@link Optional} instance if the return value of {@link #type()} call is not
+     * an instance of {@link StandardPackageType} type.
+     *
+     * @return the type of this package as {@link StandardPackageType} type
+     */
+    default Optional<StandardPackageType> asStandardPackageType() {
+        if (type() instanceof StandardPackageType stdType) {
+            return Optional.of(stdType);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Gets the name of the native package of this package.
+     * <p>
+     * The value is a valid file system name and can be safely used to name
+     * files/directories in the file system.
+     *
+     * @return the name of the native package of this package
+     */
+    String packageName();
+
+    /**
+     * Gets the description of this package.
+     * @return the description of this package
+     */
+    String description();
+
+    /**
+     * Gets the version of this package.
+     * @return the version of this package
+     */
+    String version();
+
+    /**
+     * Gets the "About" URL of this package if available or an empty
+     * {@link Optional} instance otherwise.
+     *
+     * @return the "About" URL of this package
+     */
+    Optional<String> aboutURL();
+
+    /**
+     * Gets the path to a license file of this package if available or an empty
+     * {@link Optional} instance otherwise.
+     *
+     * @return the path to a license file of this package
+     */
+    Optional<Path> licenseFile();
+
+    /**
+     * Gets the path to a directory with the application app image of this package
+     * if available or an empty {@link Optional} instance otherwise.
+     *
+     * @return the path to a directory with the application app image of this
+     *         package
+     */
+    Optional<Path> predefinedAppImage();
+
+    /**
+     * Gets the unresolved source app image layout of the application of this package.
+     *
+     * @return the unresolved app image layout of the application of this package
+     *
+     * @see #packageLayout
+     * @see #installedPackageLayout
+     */
+    default AppImageLayout appImageLayout() {
+        return app().imageLayout();
+    }
+
+    /**
+     * Returns the unresolved source app image layout of the application of this
+     * package as {@link ApplicationLayout} type or an empty {@link Optional}
+     * instance if the layout object is of incompatible type.
+     * <p>
+     * Returns an empty {@link Optional} instance if {@link #isRuntimeInstaller()}
+     * returns <code>true</code>.
+     *
+     * @return the unresolved source app image layout of the application of this
+     *         package as {@link ApplicationLayout} type
+     *
+     * @see #appImageLayout
+     */
+    default Optional<ApplicationLayout> asApplicationLayout() {
+        return app().asApplicationLayout();
+    }
+
+    /**
+     * Gets the layout of the installed app image of the application resolved at the
+     * relative installation directory of this package.
+     *
+     * @return the layout of the installed app image of the application resolved at
+     *         the relative installation directory of this package
+     *
+     * @see #relativeInstallDir
+     * @see #appImageLayout
+     * @see #installedPackageLayout
+     */
+    default AppImageLayout packageLayout() {
+        return appImageLayout().resolveAt(relativeInstallDir());
+    }
+
+    /**
+     * Returns the layout of the installed app image of the application resolved at
+     * the relative installation directory of this package as
+     * {@link ApplicationLayout} type or an empty {@link Optional} instance if the
+     * layout object is of incompatible type.
+     * <p>
+     * Returns an empty {@link Optional} instance if {@link #isRuntimeInstaller()}
+     * returns <code>true</code>.
+     *
+     * @return the layout of the installed app image of the application resolved at
+     *         the relative installation directory of this package as
+     *         {@link ApplicationLayout} type
+     *
+     * @see #packageLayout
+     */
+    default Optional<ApplicationLayout> asPackageApplicationLayout() {
+        if (packageLayout() instanceof ApplicationLayout layout) {
+            return Optional.of(layout);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Gets the layout of the installed app image of this package.
+     *
+     * @return the layout of the installed app image of this package
+     *
+     * @see #appImageLayout
+     * @see #packageLayout
+     */
+    default AppImageLayout installedPackageLayout() {
+        return asStandardPackageType().map(stdType -> {
+            switch (stdType) {
+                case LINUX_DEB, LINUX_RPM, MAC_DMG, MAC_PKG -> {
+                    return packageLayout().resolveAt(Path.of("/"));
+                }
+                case WIN_EXE, WIN_MSI -> {
+                    return packageLayout();
+                }
+                default -> {
+                    // Should never get here
+                    throw new IllegalStateException();
+                }
+            }
+        }).orElseThrow(UnsupportedOperationException::new);
+    }
+
+    /**
+     * Returns the layout of the installed app image of this package as
+     * {@link ApplicationLayout} type or an empty {@link Optional} instance if the
+     * layout object is of incompatible type.
+     * <p>
+     * Returns an empty {@link Optional} instance if {@link #isRuntimeInstaller()}
+     * returns <code>true</code>.
+     *
+     * @return the layout of the installed app image of this package as
+     *         {@link ApplicationLayout} type
+     *
+     * @see #installedPackageLayout
+     */
+    default Optional<ApplicationLayout> asInstalledPackageApplicationLayout() {
+        if (installedPackageLayout() instanceof ApplicationLayout layout) {
+            return Optional.of(layout);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Get the name without an extension of the package file of this package.
+     *
+     * @return the name without an extension of the package file of this package
+     */
+    default String packageFileName() {
+        return String.format("%s-%s", packageName(), version());
+    }
+
+    /**
+     * Gets the extension of the package file of this package if available or an
+     * empty {@link Optional} instance otherwise.
+     *
+     * @return the extension of the package file of this package
+     */
+    default Optional<String> packageFileSuffix() {
+        return asStandardPackageType().map(StandardPackageType::suffix);
+    }
+
+    /**
+     * Gets the full name of the package file of this package. The full name
+     * consists of the name and the extension.
+     *
+     * @return the full name of the package file of this package
+     */
+    default String packageFileNameWithSuffix() {
+        return packageFileName() + packageFileSuffix().orElse("");
+    }
+
+    /**
+     * Returns <code>true</code> if the application of this package is Java runtime.
+     *
+     * @return <code>true</code> if the application of this package is Java runtime
+     *
+     * @see Application#isRuntime()
+     */
+    default boolean isRuntimeInstaller() {
+        return app().isRuntime();
+    }
+
+    /**
+     * Gets the relative path to the package installation directory of this package.
+     *
+     * On Windows it is relative to the program files directory
+     * (<code>"%ProgramFiles%"</code>) and to the system root (<code>"/"</code>) on
+     * other platforms.
+     *
+     * @return the relative path to the package installation directory of this
+     *         package
+     */
+    Path relativeInstallDir();
+
+    /**
+     * Default implementation of {@link Package} interface.
+     */
+    record Stub(Application app, PackageType type, String packageName, String description, String version,
+            Optional<String> aboutURL, Optional<Path> licenseFile, Optional<Path> predefinedAppImage,
+            Path relativeInstallDir) implements Package {
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
new file mode 100644
index 00000000000..d0a4fd010e6
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
@@ -0,0 +1,34 @@
+/*
+ * 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.model;
+
+
+/**
+ * Generic package type. E.g.: application image, rpm, msi are all package types.
+ *
+ * @see jdk.jpackage.internal.model.Package
+ */
+public interface PackageType {}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
new file mode 100644
index 00000000000..79f0b488363
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
@@ -0,0 +1,47 @@
+/*
+ * 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.model;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+
+/**
+ * Creates native package from the given {@link jdk.jpackage.internal.model.Package} object.
+ *
+ * @ see ApplicationWriter
+ */
+@FunctionalInterface
+public interface PackageWriter {
+    /**
+     * Creates native package from the given {@link jdk.jpackage.internal.model.Package} object in the given directory.
+     * @param pkg the source package
+     * @param dst the directory where to create a native package
+     * @throws PackagerException if packaging error occurs
+     * @throws IOException if an I/O error occurs
+     */
+    void write(Package pkg, Path dst) throws PackagerException, IOException;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
index 31f25b98745..4ac2599a381 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
@@ -22,38 +22,63 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package jdk.jpackage.internal.model;
 
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
+import jdk.jpackage.internal.util.StringBundle;
 
+/**
+ * Signals that error has occurred at packaging phase.
+ * <p>
+ * The preferred way to construct instances of this class is to use
+ * {@link jdk.jpackage.internal.util.LocalizedExceptionBuilder#buildLocalizedException(StringBundle)} methods
+ *
+ * {@snippet :
+ * StringBundle i18n = getStringBundle(); // Some way to obtain a string bundle with localized messages
+ *
+ * throw buildLocalizedException(i18n).message("error.no.name").create();
+ * }
+ */
 public class PackagerException extends Exception {
+
     private static final long serialVersionUID = 1L;
-    private static final ResourceBundle bundle = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.MainResources");
 
     public PackagerException(Throwable cause) {
         super(cause);
     }
 
     public PackagerException(String key, Throwable cause) {
-        super(bundle.getString(key), cause);
+        super(I18N.getString(key), cause);
     }
 
     public PackagerException(String key) {
-        super(bundle.getString(key));
+        super(I18N.getString(key));
+    }
+
+    public PackagerException(String key, Object... arguments) {
+        super(I18N.format(key, arguments));
     }
 
-    public PackagerException(String key, String ... arguments) {
-        super(MessageFormat.format(
-                bundle.getString(key), (Object[]) arguments));
+    public PackagerException(Throwable cause, String key, Object... arguments) {
+        super(I18N.format(key, arguments), cause);
     }
 
-    public PackagerException(
-            Throwable cause, String key, String ... arguments) {
-        super(MessageFormat.format(bundle.getString(key),
-                (Object[]) arguments), cause);
+    /**
+     * Throws the cause of the given {@link RuntimeException} exception
+     * as {@link PackagerException} if the cause is of this type or re-throws the given
+     * {@link RuntimeException} exception as-is otherwise.
+     * <p>
+     * Never return a value. It always throws some exception object.
+     *
+     * @param ex exception to re-throw
+     * @return doesn't return value
+     * @throws PackagerException
+     */
+    public static RuntimeException rethrowPackagerException(RuntimeException ex) throws PackagerException {
+        if (ex.getCause() instanceof PackagerException pkgEx) {
+            throw pkgEx;
+        } else {
+            throw ex;
+        }
     }
 
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
new file mode 100644
index 00000000000..bce3b417b7c
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Creates Java runtime.
+ */
+@FunctionalInterface
+public interface RuntimeBuilder {
+
+    /**
+     * Creates Java runtime in the given app image.
+     *
+     * @implNote Java runtime should be created in the directory returned by
+     *           {@link AppImageLayout#runtimeDirectory()} method called on the
+     *           given app image layout object.
+     *
+     * @param appImageLayout the app image where to create Java runtime.
+     * @throws PackagerException if packaging error occurs
+     */
+    void createRuntime(AppImageLayout appImageLayout) throws PackagerException;
+
+    /**
+     * Gets the default set of paths where to find Java modules.
+     *
+     * @return the default set of paths where to find Java modules
+     */
+    public static List<Path> getDefaultModulePath() {
+        return List.of(
+                Path.of(System.getProperty("java.home"), "jmods").toAbsolutePath());
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeLayout.java
new file mode 100644
index 00000000000..733fc7a74c3
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeLayout.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import static jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+/**
+ * Java runtime app image layout.
+ * <p>
+ * Use {@link #DEFAULT} field to get the default runtime app image layout or
+ * {@link #create(Path)} method to create custom runtime app image layout.
+ */
+public interface RuntimeLayout extends AppImageLayout {
+
+    @Override
+    default RuntimeLayout resolveAt(Path root) {
+        return create(new AppImageLayout.Stub(resolveNullablePath(root, rootDirectory()),
+                resolveNullablePath(root, runtimeDirectory())));
+    }
+
+    /**
+     * Creates Java runtime app image layout.
+     * <p>
+     * {@link #runtimeDirectory()} method
+     * called on the created object will return the value of the
+     * <code>runtimeDirectory<code> parameter. {@link #rootDirectory()} method
+     * called on the created object will return <code>Path.of("")<code> value.
+     *
+     * @param runtimeDirectory Java runtime directory
+     * @return Java runtime app image layout
+     */
+    static RuntimeLayout create(Path runtimeDirectory) {
+        return create(new AppImageLayout.Stub(Path.of(""), runtimeDirectory));
+    }
+
+    private static RuntimeLayout create(AppImageLayout layout) {
+        return CompositeProxy.create(RuntimeLayout.class, layout);
+    }
+
+    /**
+     * Singleton.
+     * <p>
+     * {@link #runtimeDirectory()} of the singleton returns empty string (""), i.e.
+     * the runtime directory is the same as the directory at which the layout is
+     * resolved.
+     */
+    static final RuntimeLayout DEFAULT = create(Path.of(""));
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
new file mode 100644
index 00000000000..ccdeceb4a04
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
@@ -0,0 +1,52 @@
+/*
+ * 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.model;
+
+/**
+ * Standard native package types.
+ */
+public enum StandardPackageType implements PackageType {
+    WIN_MSI(".msi"),
+    WIN_EXE(".exe"),
+    LINUX_DEB(".deb"),
+    LINUX_RPM(".rpm"),
+    MAC_PKG(".pkg"),
+    MAC_DMG(".dmg");
+
+    StandardPackageType(String suffix) {
+        this.suffix = suffix;
+    }
+
+    /**
+     * Gets file extension of this package type.
+     * E.g.: <code>.msi</code>, <code>.dmg</code>, <code>.deb</code>.
+     * @return file extension of this package type
+     */
+    public String suffix() {
+        return suffix;
+    }
+
+    private final String suffix;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/package-info.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/package-info.java
new file mode 100644
index 00000000000..ec1c0bbf078
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+/**
+ * Classes and interfaces of the internal application packaging model.
+ *
+ * Primary entities are: {@link Application}, {@link jdk.jpackage.internal.model.Package}, and {@link Launcher}.
+ *
+ * @apiNote
+ * All methods of all interfaces and classes in this package return non-null values unless stated otherwise.
+ */
+package jdk.jpackage.internal.model;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/BinaryMatrix.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/BinaryMatrix.java
new file mode 100644
index 00000000000..7b9aa5cfc98
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/BinaryMatrix.java
@@ -0,0 +1,256 @@
+/*
+ * 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.pipeline;
+
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public final class BinaryMatrix {
+
+    BinaryMatrix(BinaryMatrix other) {
+        rows = other.rows;
+        columns = other.columns;
+        size = other.size;
+        values = (BitSet)other.values.clone();
+    }
+
+    BinaryMatrix(int dimension) {
+        this(dimension, dimension);
+    }
+
+    BinaryMatrix(int rows, int columns) {
+        this(rows, columns, null);
+    }
+
+    BinaryMatrix(int rows, int columns, BitSet values) {
+        this.rows = requirePositiveInteger(rows, "Number of rows must be positive integer");
+        this.columns = requirePositiveInteger(columns, "Number of columns must be positive integer");
+        size = rows * columns;
+        this.values = Optional.ofNullable(values).orElseGet(() -> new BitSet(size));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(columns, rows, values);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        BinaryMatrix other = (BinaryMatrix) obj;
+        return columns == other.columns && rows == other.rows && Objects.equals(values, other.values);
+    }
+
+    interface Cursor {
+        int row();
+
+        int column();
+
+        boolean value();
+
+        void value(boolean value);
+    }
+
+    boolean isSquare() {
+        return columns == rows;
+    }
+
+    boolean isEmpty() {
+        return values.isEmpty();
+    }
+
+    int getRowCount() {
+        return rows;
+    }
+
+    int getColumnCount() {
+        return columns;
+    }
+
+    Iterator<Cursor> getRowIterator(int row) {
+        return new RowIterator(row);
+    }
+
+    Iterator<Cursor> getColumnIterator(int column) {
+        return new ColumnIterator(column);
+    }
+
+    Spliterator<Cursor> getRowSpliterator(int row) {
+        return Spliterators.spliterator(getRowIterator(row), columns, Spliterator.ORDERED);
+    }
+
+    Spliterator<Cursor> getColumnSpliterator(int column) {
+        return Spliterators.spliterator(getColumnIterator(column), rows, Spliterator.ORDERED);
+    }
+
+    Stream<Cursor> getRowAsStream(int row) {
+        return toStream(getRowSpliterator(row));
+    }
+
+    Stream<Cursor> getColumnAsStream(int column) {
+        return toStream(getColumnSpliterator(column));
+    }
+
+    boolean isSet(int row, int column) {
+        return values.get(toIndex(row, column));
+    }
+
+    void set(int row, int column, boolean value) {
+        values.set(toIndex(row, column), value);
+    }
+
+    void set(int row, int column) {
+        set(row, column, true);
+    }
+
+    void unset(int row, int column) {
+        set(row, column, false);
+    }
+
+    private int toIndex(int row, int column) {
+        Objects.checkIndex(row, rows);
+        Objects.checkIndex(column, columns);
+        return row * columns + column;
+    }
+
+    private static int requirePositiveInteger(int value, String message) {
+        Objects.requireNonNull(message);
+        if (value <= 0) {
+            throw new IllegalArgumentException(message);
+        }
+        return value;
+    }
+
+    private static Stream<Cursor> toStream(Spliterator<Cursor> split) {
+        return StreamSupport.stream(split, false);
+    }
+
+    /**
+     * Iterator over values of some selection.
+     */
+    private abstract class SelectionIterator implements Iterator<Cursor> {
+        SelectionIterator(int index, int limit) {
+            this.limit = Objects.checkIndex(limit, size + 1);
+            this.index = Objects.checkIndex(index, limit);
+        }
+
+        @Override
+        public final boolean hasNext() {
+            return index < limit;
+        }
+
+        @Override
+        public final Cursor next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+
+            final var value = new CursorImpl(index, BinaryMatrix.this);
+
+            index = nextIndex(index);
+
+            return value;
+        }
+
+        protected abstract int nextIndex(int idx);
+
+        private final int limit;
+
+        private int index;
+    }
+
+    /**
+     * Iterator over values of some column.
+     */
+    private class ColumnIterator extends SelectionIterator {
+        ColumnIterator(int column) {
+            super(toIndex(0, column), size);
+        }
+
+        @Override
+        protected int nextIndex(int idx) {
+            return idx + columns;
+        }
+    }
+
+    /**
+     * Iterator over values of some row.
+     */
+    private class RowIterator extends SelectionIterator {
+        RowIterator(int row) {
+            super(toIndex(row, 0), (row + 1) * columns);
+        }
+
+        @Override
+        protected int nextIndex(int idx) {
+            return idx + 1;
+        }
+    }
+
+    private record CursorImpl(int index, BinaryMatrix matrix) implements Cursor {
+
+        CursorImpl {
+            Objects.checkIndex(index, matrix.size);
+        }
+
+        @Override
+        public int row() {
+            return index / matrix.columns;
+        }
+
+        @Override
+        public int column() {
+            return index % matrix.columns;
+        }
+
+        @Override
+        public boolean value() {
+            return matrix.values.get(index);
+        }
+
+        @Override
+        public void value(boolean value) {
+            matrix.values.set(index, value);
+        }
+
+    }
+
+    private final int rows;
+    private final int columns;
+    private final int size;
+    private final BitSet values;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/DirectedEdge.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/DirectedEdge.java
new file mode 100644
index 00000000000..349696ebe26
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/DirectedEdge.java
@@ -0,0 +1,52 @@
+/*
+ * 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.pipeline;
+
+import java.util.Objects;
+
+public record DirectedEdge<T>(T tail, T head) {
+
+    public DirectedEdge {
+        Objects.requireNonNull(tail);
+        Objects.requireNonNull(head);
+
+        if (tail.equals(head)) {
+            throw new IllegalArgumentException("Loop edge");
+        }
+    }
+
+    public T from() {
+        return tail;
+    }
+
+    public T to() {
+        return head;
+    }
+
+    public static <U> DirectedEdge<U> create(U tail, U head) {
+        return new DirectedEdge<>(tail, head);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/FixedDAG.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/FixedDAG.java
new file mode 100644
index 00000000000..24ac187ea3a
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/FixedDAG.java
@@ -0,0 +1,352 @@
+/*
+ * 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.pipeline;
+
+import static java.util.stream.Collectors.toCollection;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+/**
+ * Fixed directed acyclic graph (DAG).
+ * <p>
+ * Number of nodes is fixed, links between nodes can be added or removed.
+ *
+ * @param edgeMatrix the edge matrix. [i,j] addresses an edge, where 'i' is the
+ *                   index of the head node of the edge in the node container
+ *                   and 'j' is the index of the tail node of the edge in the
+ *                   node container
+ * @param nodes      the node container
+ */
+public record FixedDAG<T>(BinaryMatrix edgeMatrix, Nodes<T> nodes) {
+
+    public static <U> Builder<U> build() {
+        return new Builder<>();
+    }
+
+    public static final class Builder<U> {
+
+        public Builder<U> addNode(U node) {
+            Objects.requireNonNull(node);
+            if (!nodes.contains(node)) {
+                nodes.add(node);
+            }
+            return this;
+        }
+
+        public Builder<U> addEdge(U tail, U head) {
+            return addEdge(DirectedEdge.create(tail, head));
+        }
+
+        public Builder<U> addEdge(DirectedEdge<U> edge) {
+            addNode(edge.tail());
+            addNode(edge.head());
+            edges.add(edge);
+            return this;
+        }
+
+        public FixedDAG<U> create() {
+            return FixedDAG.create(edges, nodes);
+        }
+
+        private final List<U> nodes = new ArrayList<>();
+        private final List<DirectedEdge<U>> edges = new ArrayList<>();
+    }
+
+    public interface Nodes<U> extends Iterable<U> {
+        int size();
+        int indexOf(U node);
+        U get(int index);
+
+        static <V> Nodes<V> ofList(List<V> list) {
+            return new Nodes<>() {
+
+                @Override
+                public int size() {
+                    return list.size();
+                }
+
+                @Override
+                public int indexOf(V node) {
+                    final int index = list.indexOf(node);
+                    if (index < 0) {
+                        throw new NoSuchElementException();
+                    }
+                    return index;
+                }
+
+                @Override
+                public V get(int index) {
+                    return list.get(index);
+                }
+
+                @Override
+                public Iterator<V> iterator() {
+                    return list.iterator();
+                }
+
+            };
+        }
+    }
+
+    public FixedDAG {
+        Objects.requireNonNull(nodes);
+
+        Objects.requireNonNull(edgeMatrix);
+        if (!edgeMatrix.isSquare()) {
+            throw new IllegalArgumentException("Matrix must be square");
+        }
+
+        if (edgeMatrix.getColumnCount() != nodes.size()) {
+            throw new IllegalArgumentException("Matrix must have number of columns equal to the number of nodes");
+        }
+    }
+
+    public static <U> FixedDAG<U> create(Collection<DirectedEdge<U>> edges, List<U> nodes) {
+        return create(edges, Nodes.ofList(nodes));
+    }
+
+    static <U> FixedDAG<U> create(Collection<DirectedEdge<U>> edges, Nodes<U> nodes) {
+        final var edgeMatrix = new BinaryMatrix(nodes.size());
+        for (final var edge : edges) {
+            final int row = nodes.indexOf(edge.tail());
+            final int column = nodes.indexOf(edge.head());
+            edgeMatrix.set(row, column);
+        }
+
+        if (isCyclic(edgeMatrix, null)) {
+            throw new UnsupportedOperationException("Cyclic edges not allowed");
+        }
+
+        return new FixedDAG<>(edgeMatrix, nodes);
+    }
+
+    /**
+     * Returns topologically ordered nodes of this graph.
+     * <p>
+     * For every directed edge ("tail", "head") from "tail" to "head", "tail" comes before "head".
+     *
+     * @return topologically ordered nodes of this graph
+     */
+    public List<T> topologicalSort() {
+        final List<T> result = new ArrayList<>();
+        isCyclic(edgeMatrix, index -> {
+            result.add(nodes.get(index));
+        });
+        return result;
+    }
+
+    public List<T> getAllHeadsOf(T node) {
+        return getAllNodesOf(node, true);
+    }
+
+    public List<T> getAllTailsOf(T node) {
+        return getAllNodesOf(node, false);
+    }
+
+    /**
+     * Gets the list of nodes that are heads of the edges sharing the same tail,
+     * which is the given node.
+     * <p>
+     * The returned list is ordered by the indexes of the nodes in the node
+     * container of this graph.
+     *
+     * @param node a node
+     * @return the list of nodes that are heads of the edges sharing the same tail,
+     *         which is the given node
+     *
+     * @see Nodes
+     */
+    public List<T> getHeadsOf(T node) {
+        final int tail = nodes.indexOf(node);
+        return getOutgoingEdges(tail, edgeMatrix).map(BinaryMatrix.Cursor::column).map(nodes::get).toList();
+    }
+
+    /**
+     * Gets the list of nodes that are tails of the edges sharing the same head,
+     * which is the given node.
+     * <p>
+     * The returned list is ordered by the indexes of the nodes in the node
+     * container of this graph.
+     *
+     * @param node a node
+     * @return the list of nodes that are tails of the edges sharing the same head,
+     *         which is the given node
+     *
+     * @see Nodes
+     */
+    public List<T> getTailsOf(T node) {
+        final int head = nodes.indexOf(node);
+        return getIncomingEdges(head, edgeMatrix).map(BinaryMatrix.Cursor::row).map(nodes::get).toList();
+    }
+
+    /**
+     * Get the list of nodes without incoming edges.
+     * <p>
+     * A node without incoming edges is a node that is not a head of any of the edges in the graph.
+     * <p>
+     * The returned list is ordered by the indexes of the nodes in the node
+     * container of this graph.
+     *
+     * @return the list of nodes without incoming edges
+     */
+    public List<T> getNoIncomingEdges() {
+        return getNoIncomingEdges(edgeMatrix).mapToObj(nodes::get).toList();
+    }
+
+    /**
+     * Get the list of nodes without outgoing edges.
+     * <p>
+     * A node without outgoing edges is a node that is not a tail of any of the edges in the graph.
+     * <p>
+     * The returned list is ordered by the indexes of the nodes in the node
+     * container of this graph.
+     *
+     * @return the list of nodes without outgoing edges
+     */
+    public List<T> getNoOutgoingEdges() {
+        return getNoOutgoingEdges(edgeMatrix).mapToObj(nodes::get).toList();
+    }
+
+    public void dumpToStdout() {
+        dump(System.out::println);
+    }
+
+    public void dump(Consumer<String> sink) {
+        sink.accept("graph LR;"); // mermaid "left-to-right" graph format
+        StreamSupport.stream(nodes.spliterator(), true).map(tail -> {
+            return getHeadsOf(tail).stream().map(head -> tail + "-->" + head);
+        }).flatMap(x -> x).toList().forEach(sink);
+    }
+
+    private List<T> getAllNodesOf(T node, boolean heads) {
+        final Set<Integer> nodeIndexes = new TreeSet<>();
+        traverseNodes(nodes.indexOf(node), edgeMatrix, heads, nodeIndex -> {
+            return nodeIndexes.add(nodeIndex);
+        });
+
+        return nodeIndexes.stream().map(nodes::get).toList();
+    }
+
+    static void traverseNodes(int nodeIndex, BinaryMatrix edgeMatrix, boolean heads, Function<Integer, Boolean> nodeAccumulator) {
+        final Stream<Integer> nodes;
+        if (heads) {
+            nodes = getOutgoingEdges(nodeIndex, edgeMatrix).map(BinaryMatrix.Cursor::column);
+        } else {
+            nodes = getIncomingEdges(nodeIndex, edgeMatrix).map(BinaryMatrix.Cursor::row);
+        }
+        nodes.forEach(n -> {
+            if (nodeAccumulator.apply(n)) {
+                traverseNodes(n, edgeMatrix, heads, nodeAccumulator);
+            }
+        });
+    }
+
+    static Stream<BinaryMatrix.Cursor> getOutgoingEdges(int node, BinaryMatrix edgeMatrix) {
+        return edgeMatrix.getRowAsStream(node).filter(BinaryMatrix.Cursor::value);
+    }
+
+    static Stream<BinaryMatrix.Cursor> getIncomingEdges(int node, BinaryMatrix edgeMatrix) {
+        return edgeMatrix.getColumnAsStream(node).filter(BinaryMatrix.Cursor::value);
+    }
+
+    static IntStream getNoIncomingEdges(BinaryMatrix edgeMatrix) {
+        return IntStream.range(0, edgeMatrix.getColumnCount()).filter(column -> {
+            return getIncomingEdges(column, edgeMatrix).findAny().isEmpty();
+        });
+    }
+
+    static IntStream getNoOutgoingEdges(BinaryMatrix edgeMatrix) {
+        return IntStream.range(0, edgeMatrix.getRowCount()).filter(row -> {
+            return getOutgoingEdges(row, edgeMatrix).findAny().isEmpty();
+        });
+    }
+
+    private static boolean isCyclic(BinaryMatrix edgeMatrix, Consumer<Integer> topologicalOrderAccumulator) {
+
+        final var edgeMatrixCopy = new BinaryMatrix(edgeMatrix);
+
+        // Use Kahn's algorithm from https://en.wikipedia.org/wiki/Topological_sorting#Kahn's_algorithm to find cyclic edges
+        // Variable names picked from the algorithm pseudo-code.
+
+        // Nodes with no incoming edges.
+        List<Integer> S = getNoIncomingEdges(edgeMatrix).mapToObj(Integer::valueOf).collect(toCollection(ArrayList::new));
+
+        for (var i = 0; i != S.size(); ++i) {
+            final var n = S.get(i);
+
+            if (topologicalOrderAccumulator != null) {
+                topologicalOrderAccumulator.accept(n);
+            }
+
+            for (final var e : getOutgoingEdges(n, edgeMatrixCopy).toList()) {
+                e.value(false); // remove the edge
+
+                final var m = e.column();
+
+                if (getIncomingEdges(m, edgeMatrixCopy).findAny().isEmpty()) {
+                    // No incoming edges to 'm' node.
+                    if (topologicalOrderAccumulator != null) {
+                        if (i > 0) {
+                            S = S.subList(i, S.size());
+                            i = 0;
+                        }
+
+                        final var insertAtIndex = Math.abs((Collections.binarySearch(S, m) + 1));
+                        if (insertAtIndex == 0) {
+                            if (i == -1) {
+                                S.add(0, m);
+                            } else {
+                                S.set(0, m);
+                                i = -1;
+                            }
+                        } else {
+                            S.add(insertAtIndex, m);
+                        }
+                    } else if (i >= 0) {
+                        S.set(i, m);
+                        i--;
+                    } else {
+                        S.add(m);
+                    }
+                }
+            }
+        }
+
+        return !edgeMatrixCopy.isEmpty();
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskPipelineBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskPipelineBuilder.java
new file mode 100644
index 00000000000..1cb14bae1b7
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskPipelineBuilder.java
@@ -0,0 +1,211 @@
+/*
+ * 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.pipeline;
+
+import static jdk.jpackage.internal.pipeline.FixedDAG.getIncomingEdges;
+import static jdk.jpackage.internal.pipeline.FixedDAG.getNoOutgoingEdges;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+
+public final class TaskPipelineBuilder {
+
+    public final class TaskBuilder extends TaskSpecBuilder<Callable<Void>> {
+
+        TaskBuilder(Callable<Void> task) {
+            super(task);
+        }
+
+        @Override
+        public TaskBuilder addDependent(Callable<Void> v) {
+            super.addDependent(v);
+            return this;
+        }
+
+        @Override
+        public TaskBuilder addDependency(Callable<Void> v) {
+            super.addDependency(v);
+            return this;
+        }
+
+        @Override
+        public TaskBuilder addDependencies(Collection<? extends Callable<Void>> v) {
+            super.addDependencies(v);
+            return this;
+        }
+
+        @Override
+        public TaskBuilder addDependents(Collection<? extends Callable<Void>> v) {
+            super.addDependents(v);
+            return this;
+        }
+
+        public TaskPipelineBuilder add() {
+            final var links = createLinks();
+            if (links.isEmpty()) {
+                return addTask(task());
+            } else {
+                links.forEach(TaskPipelineBuilder.this::linkTasks);
+                return TaskPipelineBuilder.this;
+            }
+        }
+    }
+
+    public TaskBuilder task(Callable<Void> task) {
+        return new TaskBuilder(task);
+    }
+
+    public TaskPipelineBuilder executor(Executor v) {
+        executor = v;
+        return this;
+    }
+
+    public TaskPipelineBuilder sequentialExecutor() {
+        executor = null;
+        return this;
+    }
+
+    public TaskPipelineBuilder addTask(Callable<Void> task) {
+        taskGraphBuilder.addNode(task);
+        return this;
+    }
+
+    public TaskPipelineBuilder linkTasks(Callable<Void> tail, Callable<Void> head) {
+        return linkTasks(DirectedEdge.create(tail, head));
+    }
+
+    public TaskPipelineBuilder linkTasks(DirectedEdge<Callable<Void>> edge) {
+        taskGraphBuilder.addEdge(edge);
+        return this;
+    }
+
+    public Callable<Void> create() {
+        final var taskGraph = taskGraphBuilder.create();
+        if (executor == null) {
+            final var tasks = taskGraph.topologicalSort();
+            return new SequentialWrapperTask(tasks);
+        } else {
+            return new ParallelWrapperTask(taskGraph, executor);
+        }
+    }
+
+    private record SequentialWrapperTask(List<Callable<Void>> tasks) implements Callable<Void> {
+
+        SequentialWrapperTask {
+            Objects.requireNonNull(tasks);
+        }
+
+        @Override
+        public Void call() throws Exception {
+            for (final var task : tasks) {
+                task.call();
+            }
+            return null;
+        }
+
+    }
+
+    private record ParallelWrapperTask(FixedDAG<Callable<Void>> taskGraph, Executor executor) implements Callable<Void> {
+
+        ParallelWrapperTask {
+            Objects.requireNonNull(taskGraph);
+            Objects.requireNonNull(executor);
+        }
+
+        @Override
+        public Void call() throws Exception {
+
+            final var taskFutures = new CompletableFuture<?>[taskGraph.nodes().size()];
+
+            // Schedule tasks in the order they should be executed: dependencies before dependents.
+            for (final var task : taskGraph.topologicalSort()) {
+                final var taskIndex = taskGraph.nodes().indexOf(task);
+
+                final var dependencyTaskFutures = getIncomingEdges(taskIndex, taskGraph.edgeMatrix())
+                        .map(BinaryMatrix.Cursor::row)
+                        .map(dependencyTaskIndex -> {
+                            return taskFutures[dependencyTaskIndex];
+                        }).toArray(CompletableFuture<?>[]::new);
+
+                final CompletableFuture<?> f;
+                if (dependencyTaskFutures.length == 0) {
+                    f = CompletableFuture.runAsync(toRunnable(task), executor);
+                } else {
+                    f = CompletableFuture.allOf(dependencyTaskFutures).thenRun(toRunnable(task));
+                }
+
+                taskFutures[taskIndex] = f;
+            }
+
+            final var rootFutures = getNoOutgoingEdges(taskGraph.edgeMatrix()).mapToObj(taskIndex -> {
+                return taskFutures[taskIndex];
+            }).toArray(CompletableFuture[]::new);
+
+            final CompletableFuture <?> rootFuture;
+            if (rootFutures.length == 1) {
+                rootFuture = rootFutures[0];
+            } else {
+                rootFuture = CompletableFuture.allOf(rootFutures);
+            }
+
+            try {
+                rootFuture.get();
+            } catch (ExecutionException ee) {
+                if (ee.getCause() instanceof Exception ex) {
+                    throw ex;
+                } else {
+                    throw ee;
+                }
+            }
+
+            return null;
+        }
+
+        private static Runnable toRunnable(Callable<Void> callable) {
+            return () -> {
+                try {
+                    callable.call();
+                } catch (Error er) {
+                    throw er;
+                } catch (RuntimeException ex) {
+                    throw ex;
+                } catch (Throwable t) {
+                    throw new CompletionException(t);
+                }
+            };
+        }
+
+    }
+
+    private final FixedDAG.Builder<Callable<Void>> taskGraphBuilder = new FixedDAG.Builder<>();
+    private Executor executor;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskSpecBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskSpecBuilder.java
new file mode 100644
index 00000000000..e6b4457317f
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskSpecBuilder.java
@@ -0,0 +1,88 @@
+/*
+ * 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.pipeline;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+public class TaskSpecBuilder<T> {
+
+    public TaskSpecBuilder(T task) {
+        this.task = Objects.requireNonNull(task);
+    }
+
+    public T task() {
+        return task;
+    }
+
+    public TaskSpecBuilder<T> addDependent(T v) {
+        Objects.requireNonNull(v);
+        dependents.add(v);
+        return this;
+    }
+
+    public TaskSpecBuilder<T> addDependency(T v) {
+        Objects.requireNonNull(v);
+        dependencies.add(v);
+        return this;
+    }
+
+    public TaskSpecBuilder<T> addDependencies(Collection<? extends T> v) {
+        Objects.requireNonNull(v);
+        v.forEach(Objects::requireNonNull);
+        dependencies.addAll(v);
+        return this;
+    }
+
+    public TaskSpecBuilder<T> addDependents(Collection<? extends T> v) {
+        Objects.requireNonNull(v);
+        v.forEach(Objects::requireNonNull);
+        dependents.addAll(v);
+        return this;
+    }
+
+    public List<DirectedEdge<T>> createLinks() {
+        List<DirectedEdge<T>> edges = new ArrayList<>();
+
+        for (var dependency : dependencies) {
+            edges.add(DirectedEdge.create(dependency, task));
+        }
+
+        for (var dependent : dependents) {
+            edges.add(DirectedEdge.create(task, dependent));
+        }
+
+        return edges;
+    }
+
+    private final Set<T> dependencies = new LinkedHashSet<>();
+    private final Set<T> dependents = new LinkedHashSet<>();
+    private final T task;
+}
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 148eb375e84..e3120f8507a 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
@@ -73,11 +73,14 @@ error.tool-old-version.advice=Please install {0} {1} or newer
 error.jlink.failed=jlink failed with: {0}
 error.blocked.option=jlink option [{0}] is not permitted in --jlink-options
 error.no.name=Name not specified with --name and cannot infer one from app-image
+error.no.name.advice=Specify name with --name
 
 warning.no.jdk.modules.found=Warning: No JDK Modules found
 
 error.foreign-app-image=Error: Missing .jpackage.xml file in app-image dir "{0}"
-error.invalid-app-image=Error: app-image dir "{0}" generated by another jpackage version or malformed "{1}"
+error.invalid-app-image=Error: app-image dir "{0}" generated by another jpackage version or malformed "{1}" file
+
+error.invalid-install-dir=Invalid installation directory "{0}"
 
 MSG_BundlerFailed=Error: Bundler "{1}" ({0}) failed to produce a package
 MSG_BundlerConfigException=Bundler {0} skipped because of a configuration problem: {1} \n\
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
new file mode 100644
index 00000000000..7f8b67ccde4
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
@@ -0,0 +1,81 @@
+/*
+ * 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 java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * This class consists exclusively of static methods that operate on or return collections.
+ */
+public final class CollectionUtils {
+
+    /**
+     * Casts the given collection to the requested type.
+     *
+     * @param <T> the type of elements in this output collection
+     * @param <B> the type of elements in this input collection
+     * @param <C> the output collection type
+     * @param v the input collection. Null is permitted.
+     * @return the input collection cast to the requested type
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends B, B, C extends Collection<T>> C toCollection(Collection<B> v) {
+        Collection<?> tmp = v;
+        return (C) tmp;
+    }
+
+    /**
+     * Casts the given collection to the requested upper bounded wildcard (UBW) type.
+     *
+     * @param <T> the type of elements in this output collection
+     * @param <B> the upper bound type of elements in this input collection
+     * @param <C> the output collection type
+     * @param v the input collection. Null is permitted.
+     * @return the input collection cast to the requested type
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends B, B, C extends Collection<T>> C toCollectionUBW(Collection<? extends B> v) {
+        Collection<?> tmp = v;
+        return (C) tmp;
+    }
+
+    /**
+     * Converts the given collection to {@link Set}.
+     *
+     * @param <T> the type of elements in this output collection
+     * @param col the input collection. Null is permitted.
+     * @return the input collection if it is of type {@link Set} or a new
+     *         {@link Set} instance created from the input collection
+     */
+    public static <T> Set<T> toSet(Collection<T> col) {
+        if (col instanceof Set<T> set) {
+            return set;
+        } else {
+            return Optional.ofNullable(col).map(Collection::stream).orElseGet(Stream::of).collect(Collectors.toSet());
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
new file mode 100644
index 00000000000..5d6dba2abd4
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
@@ -0,0 +1,531 @@
+/*
+ * 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 java.util.stream.Collectors.toMap;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BinaryOperator;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * Dynamic proxy dispatching method calls to multiple objects. It is aimed at
+ * creating objects from mixins. The class provides functionality similar to
+ * that of <code>net.sf.cglib.proxy.Mixin</code> class from the cglib library.
+ *
+ * Sample usage:
+ * {@snippet :
+ * interface Sailboat {
+ *     default void trimSails() {
+ *     }
+ * }
+ *
+ * interface WithMain {
+ *     void trimMain();
+ * }
+ *
+ * interface WithJib {
+ *     void trimJib();
+ * }
+ *
+ * interface Sloop extends Sailboat, WithMain, WithJib {
+ *     @Override
+ *     public default void trimSails() {
+ *         System.out.println("On the sloop:");
+ *         trimMain();
+ *         trimJib();
+ *     }
+ * }
+ *
+ * interface Catboat extends Sailboat, WithMain {
+ *     @Override
+ *     public default void trimSails() {
+ *         System.out.println("On the catboat:");
+ *         trimMain();
+ *     }
+ * }
+ *
+ * final var withMain = new WithMain() {
+ *     @Override
+ *     public void trimMain() {
+ *         System.out.println("  trim the main");
+ *     }
+ * };
+ *
+ * final var withJib = new WithJib() {
+ *     @Override
+ *     public void trimJib() {
+ *         System.out.println("  trim the jib");
+ *     }
+ * };
+ *
+ * Sloop sloop = CompositeProxy.create(Sloop.class, new Sailboat() {
+ * }, withMain, withJib);
+ *
+ * Catboat catboat = CompositeProxy.create(Catboat.class, new Sailboat() {
+ * }, withMain);
+ *
+ * sloop.trimSails();
+ * catboat.trimSails();
+ * }
+ *
+ * Output:
+ *
+ * <pre>
+ * On the sloop:
+ *   trim the main
+ *   trim the jib
+ * On the cat:
+ *   trim the main
+ * </pre>
+ *
+ * @see Proxy
+ */
+public final class CompositeProxy {
+
+    /**
+     * Builder of {@link CompositeProxy} instances.
+     */
+    public static final class Builder {
+
+        /**
+         * Returns a proxy instance for the specified interface that dispatches method
+         * invocations to the specified handlers. Uses previously configured invocation
+         * tunnel and conflict resolver objects with the created proxy object.
+         *
+         * @param <T>           the interface type
+         * @param interfaceType the interface class composite proxy instance should
+         *                      implement
+         * @param slices        handlers for the method calls of the interface
+         * @return a new instance of {@link Proxy} implementing the given interface and
+         *         dispatching the interface method invocations to the given handlers
+         */
+        public <T> T create(Class<T> interfaceType, Object... slices) {
+            return CompositeProxy.createCompositeProxy(interfaceType, conflictResolver, invokeTunnel, slices);
+        }
+
+        /**
+         * Sets the method dispatch conflict resolver for this builder. The conflict
+         * resolver is used by composite proxy to select a method call handler from
+         * multiple candidates.
+         *
+         * @param v the conflict resolver for this builder or <code>null</code> if the
+         *          default conflict resolver should be used
+         * @return this
+         */
+        public Builder conflictResolver(BinaryOperator<Method> v) {
+            conflictResolver = v;
+            return this;
+        }
+
+        /**
+         * Sets the invocation tunnel for this builder.
+         *
+         * @param v the invocation tunnel for this builder or <code>null</code> if no
+         *          invocation tunnel should be used
+         * @return this
+         */
+        public Builder invokeTunnel(InvokeTunnel v) {
+            invokeTunnel = v;
+            return this;
+        }
+
+        private Builder() {}
+
+        private BinaryOperator<Method> conflictResolver = STANDARD_CONFLICT_RESOLVER;
+        private InvokeTunnel invokeTunnel;
+    }
+
+    /**
+     * Invocation tunnel. Must be used when building a composite proxy from objects
+     * that implement package-private interfaces to prevent
+     * {@link IllegalAccessException} exceptions being thrown by {@link Proxy}
+     * instances. Must be implemented by classes from packages with package-private
+     * interfaces used with {@link CompositeProxy} class.
+     *
+     * Assumed implementation:
+     * {@snippet :
+     *
+     * package org.foo;
+     *
+     * import java.lang.reflect.InvocationHandler;
+     * import java.lang.reflect.Method;
+     * import jdk.jpackage.internal.util.CompositeProxy;
+     *
+     * final class CompositeProxyTunnel implements CompositeProxy.InvokeTunnel {
+     *
+     *     @Override
+     *     public Object invoke(Object obj, Method method, Object[] args) throws Throwable {
+     *         return method.invoke(obj, args);
+     *     }
+     *
+     *     @Override
+     *     public Object invokeDefault(Object proxy, Method method, Object[] args) throws Throwable {
+     *         return InvocationHandler.invokeDefault(proxy, method, args);
+     *     }
+     *
+     *     static final CompositeProxyTunnel INSTANCE = new CompositeProxyTunnel();
+     * }
+     */
+    public interface InvokeTunnel {
+        /**
+         * Processes a method invocation on an object of composite proxy and returns the result.
+         *
+         * @implNote Implementation should call the given method on the given object
+         *           with the given arguments and return the result of the call.
+         * @param obj    the object on which to invoke the method
+         * @param method the method to invoke
+         * @param args   the arguments to use in the method call
+         * @return the result of the method call
+         * @throws Throwable if the method throws
+         */
+        Object invoke(Object obj, Method method, Object[] args) throws Throwable;
+
+        /**
+         * Processes a default interface method invocation on a composite proxy and
+         * returns the result.
+         *
+         * @implNote Implementation should call
+         *           {@link InvocationHandler#invokeDefault(Object, Method, Object...)}
+         *           method on the given proxy object with the given arguments and
+         *           return the result of the call.
+         * @param proxy  the <code>proxy</code> parameter for
+         *               {@link InvocationHandler#invokeDefault(Object, Method, Object...)}
+         *               call
+         * @param method the <code>method</code> parameter for
+         *               {@link InvocationHandler#invokeDefault(Object, Method, Object...)}
+         *               call
+         * @param args   the <code>args</code> parameter for
+         *               {@link InvocationHandler#invokeDefault(Object, Method, Object...)}
+         *               call
+         * @return the result of the
+         *         {@link InvocationHandler#invokeDefault(Object, Method, Object...)}
+         *         call
+         * @throws Throwable if the {@link InvocationHandler#invokeDefault(Object, Method, Object...)} call throws
+         */
+        Object invokeDefault(Object proxy, Method method, Object[] args) throws Throwable;
+    }
+
+    /**
+     * Creates a new proxy builder.
+     * @return a new proxy builder
+     */
+    public static Builder build() {
+        return new Builder();
+    }
+
+    /**
+     * Shortcut for
+     * <code>CompositeProxy.build().create(interfaceType, slices)</code>.
+     *
+     * @see Builder#create(Class, Object...)
+     */
+    public static <T> T create(Class<T> interfaceType, Object... slices) {
+        return build().create(interfaceType, slices);
+    }
+
+    private CompositeProxy() {
+    }
+
+    private static <T> T createCompositeProxy(Class<T> interfaceType, BinaryOperator<Method> conflictResolver,
+            InvokeTunnel invokeTunnel, Object... slices) {
+
+        validateTypeIsInterface(interfaceType);
+
+        final var interfaces = interfaceType.getInterfaces();
+        List.of(interfaces).forEach(CompositeProxy::validateTypeIsInterface);
+
+        if (interfaces.length != slices.length) {
+            throw new IllegalArgumentException(
+                    String.format("type %s must extend %d interfaces", interfaceType.getName(), slices.length));
+        }
+
+        final Map<Class<?>, Object> interfaceDispatch = createInterfaceDispatch(interfaces, slices);
+
+        final Map<Method, Handler> methodDispatch = getProxyableMethods(interfaceType).map(method -> {
+            var handler = createHandler(interfaceType, method, interfaceDispatch, conflictResolver, invokeTunnel);
+            if (handler != null) {
+                return Map.entry(method, handler);
+            } else {
+                return null;
+            }
+        }).filter(Objects::nonNull).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        @SuppressWarnings("unchecked")
+        T proxy = (T) Proxy.newProxyInstance(interfaceType.getClassLoader(), new Class<?>[] { interfaceType },
+                new CompositeProxyInvocationHandler(methodDispatch));
+
+        return proxy;
+    }
+
+    private static Map<Class<?>, Object> createInterfaceDispatch(Class<?>[] interfaces, Object[] slices) {
+
+        final Map<Class<?>, Object> interfaceDispatch = Stream.of(interfaces).collect(toMap(x -> x, iface -> {
+            return Stream.of(slices).filter(obj -> {
+                return Set.of(obj.getClass().getInterfaces()).contains(iface);
+            }).reduce((a, b) -> {
+                throw new IllegalArgumentException(
+                        String.format("both [%s] and [%s] slices implement %s", a, b, iface));
+            }).orElseThrow(() -> createInterfaceNotImplementedException(List.of(iface)));
+        }));
+
+        if (interfaceDispatch.size() != interfaces.length) {
+            final List<Class<?>> missingInterfaces = new ArrayList<>(Set.of(interfaces));
+            missingInterfaces.removeAll(interfaceDispatch.keySet());
+            throw createInterfaceNotImplementedException(missingInterfaces);
+        }
+
+        return Stream.of(interfaces).flatMap(iface -> {
+            return unfoldInterface(iface).map(unfoldedIface -> {
+                return Map.entry(unfoldedIface, interfaceDispatch.get(iface));
+            });
+        }).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private static Stream<Class<?>> unfoldInterface(Class<?> interfaceType) {
+        return Stream.concat(Stream.of(interfaceType),
+                Stream.of(interfaceType.getInterfaces()).flatMap(CompositeProxy::unfoldInterface));
+    }
+
+    private static IllegalArgumentException createInterfaceNotImplementedException(
+            Collection<Class<?>> missingInterfaces) {
+        return new IllegalArgumentException(String.format("none of the slices implement %s", missingInterfaces));
+    }
+
+    private static void validateTypeIsInterface(Class<?> type) {
+        if (!type.isInterface()) {
+            throw new IllegalArgumentException(String.format("type %s must be an interface", type.getName()));
+        }
+    }
+
+    private static Handler createHandler(Class<?> interfaceType, Method method, Map<Class<?>, Object> interfaceDispatch,
+            BinaryOperator<Method> conflictResolver, InvokeTunnel invokeTunnel) {
+
+        final var methodDeclaringClass = method.getDeclaringClass();
+
+        if (!methodDeclaringClass.equals(interfaceType)) {
+            // The method is declared in one of the superinterfaces.
+            final var slice = interfaceDispatch.get(methodDeclaringClass);
+
+            if (isInvokeDefault(method, slice)) {
+                return createHandlerForDefaultMethod(method, invokeTunnel);
+            } else {
+                return createHandlerForMethod(slice, method, invokeTunnel);
+            }
+        } else if (method.isDefault()) {
+            return createHandlerForDefaultMethod(method, invokeTunnel);
+        } else {
+            // Find a slice handling the method.
+            var handler = interfaceDispatch.entrySet().stream().map(e -> {
+                try {
+                    Class<?> iface = e.getKey();
+                    Object slice = e.getValue();
+                    return createHandlerForMethod(slice, iface.getMethod(method.getName(), method.getParameterTypes()),
+                            invokeTunnel);
+                } catch (NoSuchMethodException ex) {
+                    return null;
+                }
+            }).filter(Objects::nonNull).reduce(new ConflictResolverAdapter(conflictResolver)).orElseThrow(() -> {
+                return new IllegalArgumentException(String.format("none of the slices can handle %s", method));
+            });
+
+            return handler;
+        }
+    }
+
+    private static Stream<Method> getProxyableMethods(Class<?> interfaceType) {
+        return Stream.of(interfaceType.getMethods()).filter(method -> !Modifier.isStatic(method.getModifiers()));
+    }
+
+    private static boolean isInvokeDefault(Method method, Object slice) {
+        if (!method.isDefault()) {
+            return false;
+        }
+
+        // The "method" is default.
+        // See if is overridden by any non-abstract method in the "slice".
+        // If it is, InvocationHandler.invokeDefault() should not be used to call it.
+
+        final var sliceClass = slice.getClass();
+
+        final var methodOverriden = Stream.of(sliceClass.getMethods()).filter(Predicate.not(Predicate.isEqual(method)))
+                .filter(sliceMethod -> !Modifier.isAbstract(sliceMethod.getModifiers()))
+                .anyMatch(sliceMethod -> signatureEquals(sliceMethod, method));
+
+        return !methodOverriden;
+    }
+
+    private static boolean signatureEquals(Method a, Method b) {
+        if (!Objects.equals(a.getName(), b.getName()) || !Arrays.equals(a.getParameterTypes(), b.getParameterTypes())) {
+            return false;
+        }
+
+        return Objects.equals(a.getReturnType(), b.getReturnType());
+    }
+
+    private record CompositeProxyInvocationHandler(Map<Method, Handler> dispatch) implements InvocationHandler {
+
+        @Override
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            var handler = dispatch.get(method);
+            if (handler != null) {
+                return handler.invoke(proxy, args);
+            } else if (method.isDefault()) {
+                return InvocationHandler.invokeDefault(proxy, method, args);
+            } else {
+                handler = OBJECT_METHOD_DISPATCH.get(method);
+                if (handler != null) {
+                    return handler.invoke(proxy, args);
+                } else {
+                    throw new UnsupportedOperationException(String.format("No handler for %s", method));
+                }
+            }
+        }
+
+        private static String objectToString(Object obj) {
+            return obj.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(obj));
+        }
+
+        private static boolean objectEquals(Object obj, Object other) {
+            return obj == other;
+        }
+
+        private static Method getMethod(Class<?> type, String methodName, Class<?>...paramaterTypes) {
+            try {
+                return type.getDeclaredMethod(methodName, paramaterTypes);
+            } catch (NoSuchMethodException|SecurityException ex) {
+                throw new InternalError(ex);
+            }
+        }
+
+        static class ObjectMethodHandler extends HandlerOfMethod {
+
+            ObjectMethodHandler(Method method) {
+                super(method);
+            }
+
+            @Override
+            public Object invoke(Object proxy, Object[] args) throws Throwable {
+                if (args == null) {
+                    return method.invoke(null, proxy);
+                } else {
+                    final var newArgs = new Object[args.length + 1];
+                    newArgs[0] = proxy;
+                    System.arraycopy(args, 0, newArgs, 1, args.length);
+                    return method.invoke(null, newArgs);
+                }
+            }
+        }
+
+        private static final Map<Method, Handler> OBJECT_METHOD_DISPATCH = Map.of(
+                getMethod(Object.class, "toString"),
+                new ObjectMethodHandler(getMethod(CompositeProxyInvocationHandler.class, "objectToString", Object.class)),
+                getMethod(Object.class, "equals", Object.class),
+                new ObjectMethodHandler(getMethod(CompositeProxyInvocationHandler.class, "objectEquals", Object.class, Object.class)),
+                getMethod(Object.class, "hashCode"),
+                new ObjectMethodHandler(getMethod(System.class, "identityHashCode", Object.class))
+        );
+    }
+
+    private static HandlerOfMethod createHandlerForDefaultMethod(Method method, InvokeTunnel invokeTunnel) {
+        if (invokeTunnel != null) {
+            return new HandlerOfMethod(method) {
+                @Override
+                public Object invoke(Object proxy, Object[] args) throws Throwable {
+                    return invokeTunnel.invokeDefault(proxy, this.method, args);
+                }
+            };
+        } else {
+            return null;
+        }
+    }
+
+    private static HandlerOfMethod createHandlerForMethod(Object obj, Method method, InvokeTunnel invokeTunnel) {
+        if (invokeTunnel != null) {
+            return new HandlerOfMethod(method) {
+                @Override
+                public Object invoke(Object proxy, Object[] args) throws Throwable {
+                    return invokeTunnel.invoke(obj, this.method, args);
+                }
+            };
+        } else {
+            return new HandlerOfMethod(method) {
+                @Override
+                public Object invoke(Object proxy, Object[] args) throws Throwable {
+                    return this.method.invoke(obj, args);
+                }
+            };
+        }
+    }
+
+    @FunctionalInterface
+    private interface Handler {
+
+        Object invoke(Object proxy, Object[] args) throws Throwable;
+    }
+
+    private abstract static class HandlerOfMethod implements Handler {
+        HandlerOfMethod(Method method) {
+            this.method = method;
+        }
+
+        protected final Method method;
+    }
+
+    private record ConflictResolverAdapter(BinaryOperator<Method> conflictResolver)
+            implements BinaryOperator<HandlerOfMethod> {
+
+        @Override
+        public HandlerOfMethod apply(HandlerOfMethod a, HandlerOfMethod b) {
+            var m = conflictResolver.apply(a.method, b.method);
+            if (m == a.method) {
+                return a;
+            } else if (m == b.method) {
+                return b;
+            } else {
+                throw new UnsupportedOperationException();
+            }
+        }
+    }
+
+    private static final BinaryOperator<Method> STANDARD_CONFLICT_RESOLVER = (a, b) -> {
+        if (a.isDefault() == b.isDefault()) {
+            throw new IllegalArgumentException(String.format("ambiguous choice between %s and %s", a, b));
+        } else if (!a.isDefault()) {
+            return a;
+        } else {
+            return b;
+        }
+    };
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/LocalizedExceptionBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/LocalizedExceptionBuilder.java
new file mode 100644
index 00000000000..965988a0d9f
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/LocalizedExceptionBuilder.java
@@ -0,0 +1,151 @@
+/*
+ * 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 java.util.function.BiFunction;
+
+/**
+ * Builder of exceptions with localized messages.
+ * @param <T> Subclass extending {@link LocalizedExceptionBuilder} class.
+ */
+public class LocalizedExceptionBuilder<T extends LocalizedExceptionBuilder<T>> {
+
+    protected LocalizedExceptionBuilder(StringBundle i18n) {
+        this.i18n = i18n;
+    }
+
+    /**
+     * Creates an exception builder with the given source of error messages.
+     *
+     * @param i18n the source of error messages
+     * @return the exception builder
+     */
+    public static LocalizedExceptionBuilder<?> buildLocalizedException(StringBundle i18n) {
+        return new LocalizedExceptionBuilder<>(i18n);
+    }
+
+    /**
+     * Creates an instance of type extending {@link Exception} class from the
+     * configured message and cause.
+     * <p>
+     * Use {@link #message(String, Object...)}, {@link #causeAndMessage(Throwable)},
+     * and {@link #cause(Throwable)} methods to initialize message and/or cause.
+     *
+     * @param <U>           the exception class
+     * @param exceptionCtor the exception constructor
+     * @return the exception
+     */
+    public final <U extends Exception> U create(BiFunction<String, Throwable, U> exceptionCtor) {
+        return exceptionCtor.apply(msg, cause);
+    }
+
+    /**
+     * Configures this builder if strings from the associated string bundle should
+     * be used as patterns for message formatting or not.
+     *
+     * Affects the behavior of the subsequent {@link #message(String, Object...)}
+     * calls.
+     *
+     * @param v <code>true</code> if strings from the associated string bundle
+     *          should be used as patterns for message formatting by this builder or
+     *          <code>false</code> otherwise
+     * @return this
+     *
+     * @see #noformat()
+     */
+    public final T format(boolean v) {
+        format = v;
+        return thiz();
+    }
+
+    /**
+     * A shortcut for <code>format(false)</code> call.
+     *
+     * @return this
+     *
+     * @see #format(boolean)
+     */
+    public final T noformat() {
+        return format(false);
+    }
+
+    /**
+     * Sets the message.
+     *
+     * @param msgId key of the string in the associated string bundle for the
+     *              formatting pattern
+     * @param args  the arguments for formatting message
+     * @return this
+     */
+    public final T message(String msgId, Object... args) {
+        msg = formatString(msgId, args);
+        return thiz();
+    }
+
+    /**
+     * Sets the cause.
+     *
+     * @param v the cause. A null value is permitted, and indicates that the cause
+     *          is nonexistent or unknown.
+     * @return this
+     */
+    public final T cause(Throwable v) {
+        cause = v;
+        return thiz();
+    }
+
+    /**
+     * Sets the cause and the message. The message is copied from the given
+     * {@link Throwable} object as is.
+     *
+     * @param t the cause. Must not be null.
+     * @return this
+     */
+    public final T causeAndMessage(Throwable t) {
+        boolean oldformat = format;
+        return noformat().message(t.getMessage()).cause(t).format(oldformat);
+    }
+
+    protected final String formatString(String keyId, Object... args) {
+        if (format) {
+            return i18n.format(keyId, args);
+        } else if (args.length == 0) {
+            return keyId;
+        } else {
+            throw new IllegalArgumentException("Formatting arguments not allowed in no format mode");
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private T thiz() {
+        return (T)this;
+    }
+
+    private boolean format = true;
+    private String msg;
+    private Throwable cause;
+
+    private final StringBundle i18n;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
index bad4bc3069f..08a91175c1e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
@@ -242,7 +242,7 @@ public void copy(PathGroup dst, CopyOption ...options) throws IOException {
     }
 
     /**
-     * Similar to {@link #copy(PathGroup)} but moves files/directories instead of
+     * Similar to {@link #copy(PathGroup, CopyOption...)} but moves files/directories instead of
      * copying.
      *
      * @param dst the destination path group
@@ -255,7 +255,7 @@ public void move(PathGroup dst, CopyOption ...options) throws IOException {
     }
 
     /**
-     * Similar to {@link #copy(PathGroup)} but uses the given handler to transform
+     * Similar to {@link #copy(PathGroup, CopyOption...)} but uses the given handler to transform
      * paths instead of coping.
      *
      * @param dst the destination path group
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathUtils.java
index 26d49519291..31019832b73 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathUtils.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
@@ -50,4 +50,20 @@ public static Path replaceSuffix(Path path, String suffix) {
     public static Path resolveNullablePath(Path base, Path path) {
         return Optional.ofNullable(path).map(base::resolve).orElse(null);
     }
+
+    public static Path normalizedAbsolutePath(Path path) {
+        if (path != null) {
+            return path.normalize().toAbsolutePath();
+        } else {
+            return null;
+        }
+    }
+
+    public static String normalizedAbsolutePathString(Path path) {
+        if (path != null) {
+            return normalizedAbsolutePath(path).toString();
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/StringBundle.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/StringBundle.java
new file mode 100644
index 00000000000..2dd79a5abe4
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/StringBundle.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+
+/**
+ * String bundle contains locale-specific strings.
+ * It can be viewed a specialized variant of {@link ResourceBundle}.
+ * <p>
+ * Use {@link #fromResourceBundle(ResourceBundle)} to obtain {@link StringBundle}
+ * instance from {@link ResourceBundle} object.
+ */
+@FunctionalInterface
+public interface StringBundle {
+
+    /**
+     * Gets a string for the given key from this string bundle.
+     * @param key the key for the desired string
+     * @return the string for the given key
+     *
+     * @see ResourceBundle#getString(String)
+     */
+    String getString(String key);
+
+    /**
+     * Gets a formatted message built from the pattern string matching
+     * the given key in this string bundle and the given arguments.
+     * <p>
+     * If non-empty list of arguments provided the function calls {@link MessageFormat#format(String, Object...)}.
+     * Otherwise, it returns the result of {@link #getString(String)} method call.
+     *
+     * @param key the key for the desired pattern
+     * @param args the array of arguments for formatting or an empty array for no formatting
+     * @return the formatted message
+     */
+    default String format(String key, Object ... args) {
+        var str = getString(key);
+        if (args.length != 0) {
+            return MessageFormat.format(str, args);
+        } else {
+            return str;
+        }
+    }
+
+    /**
+     * Gets {@link StringBundle} instance from the given {@link ResourceBundle} object.
+     * @param bundle the resource bundle
+     * @return the string bundle
+     */
+    public static StringBundle fromResourceBundle(ResourceBundle bundle) {
+        return bundle::getString;
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/module-info.java b/src/jdk.jpackage/share/classes/module-info.java
index ea41abd75d8..5536e9be75b 100644
--- a/src/jdk.jpackage/share/classes/module-info.java
+++ b/src/jdk.jpackage/share/classes/module-info.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
@@ -53,7 +53,7 @@
 module jdk.jpackage {
     requires jdk.internal.opt;
     requires jdk.jlink;
-
+    requires java.naming;
     requires java.desktop;
 
     uses jdk.jpackage.internal.Bundler;
diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/PackageScripts.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/PackageScripts.java
index f2fa5443bf5..74220c0d2af 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/PackageScripts.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/PackageScripts.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
@@ -32,6 +32,7 @@
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
+import jdk.jpackage.internal.resources.ResourceLocator;
 
 /**
  * Shell scripts of a package.
@@ -83,7 +84,8 @@ static class ResourceConfig {
         }
 
         OverridableResource createResource() {
-            var resource = new OverridableResource(defaultName).setCategory(category);
+            var resource = new OverridableResource(defaultName,
+                    ResourceLocator.class).setCategory(category);
             return getDefaultPublicName().map(resource::setPublicName).orElse(
                     resource);
         }
diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomAction.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomAction.java
index 64afc95516d..55068a571f8 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomAction.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomAction.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
@@ -36,6 +36,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import jdk.jpackage.internal.resources.ResourceLocator;
 
 /**
  * Interface to add custom actions composed of shell commands to installers.
@@ -105,7 +106,7 @@ protected static String stringifyShellCommands(List<String> commands) {
     }
 
     protected static String stringifyTextFile(String resourceName) throws IOException {
-        try ( InputStream is = OverridableResource.readDefault(resourceName);
+        try ( InputStream is = ResourceLocator.class.getResourceAsStream(resourceName);
                 InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
                 BufferedReader reader = new BufferedReader(isr)) {
             return reader.lines().collect(Collectors.joining("\n"));
diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomActionFactory.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomActionFactory.java
index defb76d837c..972e896b797 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomActionFactory.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomActionFactory.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
@@ -24,11 +24,10 @@
  */
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.Package;
 import java.io.IOException;
-import java.util.Map;
 
 interface ShellCustomActionFactory {
 
-    ShellCustomAction create(PlatformPackage thePackage,
-            Map<String, ? super Object> params) throws IOException;
+    ShellCustomAction create(BuildEnv env, Package pkg) throws IOException;
 }
diff --git a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
index cbe772a3ae4..e1e02ba7850 100644
--- a/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
+++ b/src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.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
@@ -24,35 +24,33 @@
  */
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.Application;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
-import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
 
 /**
  * Helper to install launchers as services for Unix installers.
  */
 class UnixLaunchersAsServices extends ShellCustomAction {
 
-    UnixLaunchersAsServices(PlatformPackage thePackage,
-            List<String> requiredPackages, Map<String, Object> params,
-            Function<LauncherInfo, UnixLauncherAsService> factory) throws
-            IOException {
+    UnixLaunchersAsServices(Path outputRoot, Application app, List<String> requiredPackages,
+            Function<Launcher, UnixLauncherAsService> factory) {
 
-        this.thePackage = thePackage;
-        this.requiredPackages = requiredPackages;
+        Objects.requireNonNull(factory);
+        this.outputRoot = Objects.requireNonNull(outputRoot);
+        this.requiredPackages = Objects.requireNonNull(requiredPackages);
 
         // Read launchers information
-        launchers = AppImageFile.getLaunchers(PREDEFINED_APP_IMAGE.fetchFrom(
-                params), params).stream().filter(LauncherInfo::isService).map(
-                factory::apply).toList();
+        launchers = app.launchers().stream().filter(Launcher::isService).map(factory::apply).toList();
     }
 
     @Override
@@ -93,8 +91,7 @@ protected Map<String, String> createImpl() throws IOException {
         data.put(COMMANDS_UNINSTALL, strigifier.apply("unregister_services"));
 
         for (var launcher : launchers) {
-            launcher.getResource().saveToFile(launcher.descriptorFilePath(
-                    thePackage.sourceRoot()));
+            launcher.getResource().saveToFile(launcher.descriptorFilePath(outputRoot));
         }
 
         return data;
@@ -106,15 +103,14 @@ boolean isEmpty() {
 
     abstract static class UnixLauncherAsService extends LauncherAsService {
 
-        UnixLauncherAsService(String name, Map<String, Object> mainParams,
-                OverridableResource resource) {
-            super(name, mainParams, resource);
+        UnixLauncherAsService(Application app, Launcher launcher, OverridableResource resource) {
+            super(app, launcher, resource);
         }
 
         abstract Path descriptorFilePath(Path root);
     }
 
-    private final PlatformPackage thePackage;
+    private final Path outputRoot;
     private final List<String> requiredPackages;
     private final List<UnixLauncherAsService> launchers;
     private final Enquoter enqouter = Enquoter.forShellLiterals();
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
index 7a85687a121..913a44dbe18 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
@@ -29,102 +29,101 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.function.Supplier;
+import java.util.function.Function;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.model.DottedVersion;
-
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.ShortPathUtils.adjustPath;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.WindowsAppImageBuilder.ICON_ICO;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinExePackage;
+import jdk.jpackage.internal.model.WinLauncher;
 
 @SuppressWarnings("restricted")
 final class ExecutableRebrander {
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.WinResources");
 
-    private static final String LAUNCHER_PROPERTIES_TEMPLATE =
-            "WinLauncher.template";
+    ExecutableRebrander(WinExePackage pkg,
+            Function<String, OverridableResource> resourceSupplier,
+            UpdateResourceAction... extraActions) {
+        this(ExecutableProperties.create(pkg), resourceSupplier.apply(
+                "WinInstaller.template").setPublicName("WinInstaller.properties"),
+                extraActions);
+    }
 
-    private static final String INSTALLER_PROPERTIES_TEMPLATE =
-            "WinInstaller.template";
+    ExecutableRebrander(WinApplication app, WinLauncher launcher,
+            Function<String, OverridableResource> resourceSupplier,
+            UpdateResourceAction... extraActions) {
+        this(ExecutableProperties.create(app, launcher), resourceSupplier.apply(
+                "WinLauncher.template").setPublicName(launcher.executableName() + ".properties"),
+                extraActions);
+    }
 
-    private static final String INSTALLER_PROPERTIES_RESOURE_DIR_ID =
-            "WinInstaller.properties";
+    private ExecutableRebrander(ExecutableProperties props,
+            OverridableResource propertiesFileResource,
+            UpdateResourceAction... extraActions) {
+        this.extraActions = List.of(extraActions);
+        this.propertiesFileResource = Objects.requireNonNull(propertiesFileResource);
 
+        this.props = new HashMap<>();
 
-    void rebrandInstaller(Map<String, ? super Object> params, Path target)
-            throws IOException {
-        Path icon = ICON_ICO.fetchFrom(params);
-        rebrandExecutable(params, icon, () -> {
-            return createResource(INSTALLER_PROPERTIES_TEMPLATE, params).setPublicName(
-                    INSTALLER_PROPERTIES_RESOURE_DIR_ID);
-        }, target);
-    }
+        validateValueAndPut(this.props, Map.entry("COMPANY_NAME", props.vendor), "vendor");
+        validateValueAndPut(this.props, Map.entry("FILE_DESCRIPTION",props.description), "description");
+        validateValueAndPut(this.props, Map.entry("FILE_VERSION", props.version.toString()), "version");
+        validateValueAndPut(this.props, Map.entry("LEGAL_COPYRIGHT", props.copyright), "copyright");
+        validateValueAndPut(this.props, Map.entry("PRODUCT_NAME", props.name), "name");
 
-    void rebrandLauncher(Map<String, ? super Object> params, Path icon,
-            Path target) throws IOException {
-        rebrandExecutable(params, icon, () -> {
-            return createResource(
-                    LAUNCHER_PROPERTIES_TEMPLATE, params).setPublicName(
-                            APP_NAME.fetchFrom(params) + ".properties");
-        }, target);
+        this.props.put("FIXEDFILEINFO_FILE_VERSION", toFixedFileVersion(props.version));
+        this.props.put("INTERNAL_NAME", props.executableName);
+        this.props.put("ORIGINAL_FILENAME", props.executableName);
     }
 
-    private void rebrandExecutable(Map<String, ? super Object> params, Path icon,
-            Supplier<OverridableResource> resourceSupplier, Path target) throws
-            IOException {
-        if (!target.isAbsolute() || (icon != null && !icon.isAbsolute())) {
-            Path absIcon = null;
-            if (icon != null) {
-                absIcon = icon.toAbsolutePath();
-            }
-            rebrandExecutable(params, absIcon, resourceSupplier,
-                    target.toAbsolutePath());
-            return;
-        }
-        rebrandExecutable(params, target, (resourceLock) -> {
-            rebrandProperties(resourceLock, resourceSupplier.get(),
-                    createSubstituteData(
-                            params), target);
-            if (icon != null) {
-                iconSwapWrapper(resourceLock, icon.toString());
+    void execute(BuildEnv env, Path target, Optional<Path> icon) {
+        String[] propsArray = toStringArray(propertiesFileResource, props);
+
+        UpdateResourceAction versionSwapper = resourceLock -> {
+            if (versionSwap(resourceLock, propsArray) != 0) {
+                throw I18N.buildException().message("error.version-swap", target).create(RuntimeException::new);
             }
-        });
-    }
+        };
+
+        Optional<UpdateResourceAction> updateIcon = icon
+                .map(Path::toAbsolutePath)
+                .map(ShortPathUtils::adjustPath)
+                .map(absIcon -> {
+                    return resourceLock -> {
+                        if (iconSwap(resourceLock, absIcon.toString()) != 0) {
+                            throw I18N.buildException().message("error.icon-swap", absIcon).create(RuntimeException::new);
+                        }
+                    };
+                });
 
-    ExecutableRebrander addAction(UpdateResourceAction action) {
-        if (extraActions == null) {
-            extraActions = new ArrayList<>();
+        try {
+            final List<UpdateResourceAction> actions = new ArrayList<>();
+            actions.add(versionSwapper);
+            updateIcon.ifPresent(actions::add);
+            actions.addAll(extraActions);
+            rebrandExecutable(env, target, actions);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
         }
-        extraActions.add(action);
-        return this;
     }
 
-    private void rebrandExecutable(Map<String, ? super Object> params,
-            final Path target, UpdateResourceAction action) throws IOException {
+    private static void rebrandExecutable(BuildEnv env, final Path target,
+            List<UpdateResourceAction> actions) throws IOException {
+        Objects.requireNonNull(actions);
+        actions.forEach(Objects::requireNonNull);
         try {
-            String tempDirectory = TEMP_ROOT.fetchFrom(params)
-                    .toAbsolutePath().toString();
-            if (WindowsDefender.isThereAPotentialWindowsDefenderIssue(
-                    tempDirectory)) {
-                Log.verbose(MessageFormat.format(I18N.getString(
-                        "message.potential.windows.defender.issue"),
-                        tempDirectory));
+            String tempDirectory = env.buildRoot().toAbsolutePath().toString();
+            if (WindowsDefender.isThereAPotentialWindowsDefenderIssue(tempDirectory)) {
+                Log.verbose(I18N.format("message.potential.windows.defender.issue", tempDirectory));
             }
 
             target.toFile().setWritable(true, true);
@@ -132,17 +131,13 @@ private void rebrandExecutable(Map<String, ? super Object> params,
             var shortTargetPath = ShortPathUtils.toShortPath(target);
             long resourceLock = lockResource(shortTargetPath.orElse(target).toString());
             if (resourceLock == 0) {
-                throw new RuntimeException(MessageFormat.format(
-                    I18N.getString("error.lock-resource"), shortTargetPath.orElse(target)));
+                throw I18N.buildException().message("error.lock-resource", shortTargetPath.orElse(target)).create(RuntimeException::new);
             }
 
             final boolean resourceUnlockedSuccess;
             try {
-                action.editResource(resourceLock);
-                if (extraActions != null) {
-                    for (UpdateResourceAction extraAction : extraActions) {
-                        extraAction.editResource(resourceLock);
-                    }
+                for (var action : actions) {
+                    action.editResource(resourceLock);
                 }
             } finally {
                 if (resourceLock == 0) {
@@ -161,110 +156,87 @@ private void rebrandExecutable(Map<String, ? super Object> params,
             }
 
             if (!resourceUnlockedSuccess) {
-                throw new RuntimeException(MessageFormat.format(I18N.getString(
-                        "error.unlock-resource"), target));
+                throw I18N.buildException().message("error.unlock-resource", target).create(RuntimeException::new);
             }
         } finally {
             target.toFile().setReadOnly();
         }
     }
 
-    @FunctionalInterface
-    static interface UpdateResourceAction {
-        public void editResource(long resourceLock) throws IOException;
-    }
-
-    private static String getFixedFileVersion(String value) {
-        int addComponentsCount = 4
-                - DottedVersion.greedy(value).getComponents().length;
+    private static String toFixedFileVersion(DottedVersion value) {
+        int addComponentsCount = 4 - value.getComponents().length;
         if (addComponentsCount > 0) {
-            StringBuilder sb = new StringBuilder(value);
+            StringBuilder sb = new StringBuilder(value.toComponentsString());
             do {
                 sb.append('.');
                 sb.append(0);
             } while (--addComponentsCount > 0);
             return sb.toString();
         }
-        return value;
+        return value.toComponentsString();
     }
 
-    private Map<String, String> createSubstituteData(
-            Map<String, ? super Object> params) {
-        Map<String, String> data = new HashMap<>();
-
-        String fixedFileVersion = getFixedFileVersion(VERSION.fetchFrom(params));
-
-        // mapping Java parameters in strings for version resource
-        validateValueAndPut(data, "COMPANY_NAME", VENDOR, params);
-        validateValueAndPut(data, "FILE_DESCRIPTION", DESCRIPTION, params);
-        validateValueAndPut(data, "FILE_VERSION", VERSION, params);
-        validateValueAndPut(data, "LEGAL_COPYRIGHT", COPYRIGHT, params);
-        validateValueAndPut(data, "PRODUCT_NAME", APP_NAME, params);
-        data.put("FIXEDFILEINFO_FILE_VERSION", fixedFileVersion);
-
-        return data;
-    }
-
-    private void rebrandProperties(long resourceLock, OverridableResource properties,
-            Map<String, String> data, Path target) throws IOException {
-
-        String targetExecutableName = IOUtils.getFileName(target).toString();
-        data.put("INTERNAL_NAME", targetExecutableName);
-        data.put("ORIGINAL_FILENAME", targetExecutableName);
-
+    private static String[] toStringArray(
+            OverridableResource propertiesFileResource,
+            Map<String, String> props) {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        properties
-            .setSubstitutionData(data)
-            .setCategory(I18N.getString("resource.executable-properties-template"))
-            .saveToStream(buffer);
+        try {
+            propertiesFileResource
+                    .setSubstitutionData(props)
+                    .setCategory(I18N.getString(
+                            "resource.executable-properties-template"))
+                    .saveToStream(buffer);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
 
-        final List<String> propList = new ArrayList<>();
         try (Reader reader = new InputStreamReader(new ByteArrayInputStream(
                 buffer.toByteArray()), StandardCharsets.UTF_8)) {
-            final Properties configProp = new Properties();
+            var configProp = new Properties();
             configProp.load(reader);
-            configProp.forEach((k, v) -> {
-                propList.add(k.toString());
-                propList.add(v.toString());
-            });
+            return configProp.entrySet().stream().flatMap(e -> Stream.of(
+                    e.getKey().toString(), e.getValue().toString())).toArray(
+                    String[]::new);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
         }
-
-        versionSwapWrapper(resourceLock, propList.toArray(String[]::new),
-                target.toString());
     }
 
-    private static void validateValueAndPut(
-            Map<String, String> data, String key,
-            BundlerParamInfo<String> param,
-            Map<String, ? super Object> params) {
-        String value = param.fetchFrom(params);
-        if (value.contains("\r") || value.contains("\n")) {
-            Log.error("Configuration Parameter " + param.getID()
+    private static void validateValueAndPut(Map<String, String> target,
+            Map.Entry<String, String> e, String label) {
+        if (e.getValue().contains("\r") || e.getValue().contains("\n")) {
+            Log.error("Configuration parameter " + label
                     + " contains multiple lines of text, ignore it");
-            data.put(key, "");
-            return;
+            e = Map.entry(e.getKey(), "");
         }
-        data.put(key, value);
+        target.put(e.getKey(), e.getValue());
     }
 
-    private static void iconSwapWrapper(long resourceLock,
-            String iconTarget) {
-        iconTarget = adjustPath(iconTarget);
-        if (iconSwap(resourceLock, iconTarget) != 0) {
-            throw new RuntimeException(MessageFormat.format(I18N.getString(
-                    "error.icon-swap"), iconTarget));
-        }
+    @FunctionalInterface
+    static interface UpdateResourceAction {
+        public void editResource(long resourceLock) throws IOException;
     }
 
-    private static void versionSwapWrapper(long resourceLock,
-            String[] executableProperties, String target) {
-        if (versionSwap(resourceLock, executableProperties) != 0) {
-            throw new RuntimeException(MessageFormat.format(I18N.getString(
-                    "error.version-swap"), target));
+    private static record ExecutableProperties(String vendor, String description,
+            DottedVersion version, String copyright, String name, String executableName) {
+        static ExecutableProperties create(WinApplication app,
+                WinLauncher launcher) {
+            return new ExecutableProperties(app.vendor(), launcher.description(),
+                    app.winVersion(), app.copyright(), launcher.name(),
+                    launcher.executableNameWithSuffix());
+        }
+
+        static ExecutableProperties create(WinExePackage pkg) {
+            return new ExecutableProperties(pkg.app().vendor(),
+                    pkg.description(), DottedVersion.lazy(pkg.version()),
+                    pkg.app().copyright(), pkg.packageName(),
+                    pkg.packageFileNameWithSuffix());
         }
     }
 
-    private List<UpdateResourceAction> extraActions;
+    private final Map<String, String> props;
+    private final List<UpdateResourceAction> extraActions;
+    private final OverridableResource propertiesFileResource;
 
     static {
         System.loadLibrary("jpackage");
@@ -274,7 +246,7 @@ private static void versionSwapWrapper(long resourceLock,
 
     private static native boolean unlockResource(long resourceLock);
 
-    private static native int iconSwap(long resourceLock, String iconTarget);
+    private static native int iconSwap(long resourceLock, String newIcon);
 
     private static native int versionSwap(long resourceLock, String[] executableProperties);
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java
index 80bb0c77625..284022db0da 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.WinMsiBundler.WIN_APP_IMAGE;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,8 +36,10 @@
 import java.util.Comparator;
 import java.util.HexFormat;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.WinMsiPackage;
 import jdk.jpackage.internal.util.XmlConsumer;
 
 
@@ -48,17 +48,19 @@
  */
 record OSVersionCondition(WindowsVersion version) {
 
-    static OSVersionCondition createFromAppImage(ApplicationLayout appLayout, Map<String, ? super Object> params) {
-        Objects.requireNonNull(appLayout);
+    static OSVersionCondition createFromAppImage(BuildEnv env, Application app) {
+        Objects.requireNonNull(env);
+        Objects.requireNonNull(app);
 
         final List<Path> executables = new ArrayList<>();
 
-        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
-            final var launcherName = StandardBundlerParam.APP_NAME.fetchFrom(params);
-            executables.add(appLayout.launchersDirectory().resolve(launcherName + ".exe"));
-        }
+        final var appImageLayout = app.imageLayout().resolveAt(env.appImageDir());
 
-        executables.add(appLayout.runtimeDirectory().resolve("bin\\java.dll"));
+        app.mainLauncher().map(mainLauncher -> {
+            return ((ApplicationLayout)appImageLayout).launchersDirectory().resolve(mainLauncher.executableNameWithSuffix());
+        }).ifPresent(executables::add);
+
+        executables.add(appImageLayout.runtimeDirectory().resolve("bin\\java.dll"));
 
         final var lowestOsVersion = executables.stream()
                 .filter(Files::isRegularFile)
@@ -176,21 +178,10 @@ protected Collection<XmlConsumer> getFragmentWriters() {
             }
 
             @Override
-            void initFromParams(Map<String, ? super Object> params) {
-                super.initFromParams(params);
-
-                final Path appImageRoot = WIN_APP_IMAGE.fetchFrom(params);
-
-                ApplicationLayout appImageLayout;
-                if (StandardBundlerParam.isRuntimeInstaller(params)) {
-                    appImageLayout = ApplicationLayout.javaRuntime();
-                } else {
-                    appImageLayout = ApplicationLayout.platformAppImage();
-                }
-
-                appImageLayout = appImageLayout.resolveAt(appImageRoot);
+            void initFromParams(BuildEnv env, WinMsiPackage pkg) {
+                super.initFromParams(env, pkg);
 
-                final var cond = OSVersionCondition.createFromAppImage(appImageLayout, params);
+                final var cond = OSVersionCondition.createFromAppImage(env, pkg.app());
 
                 setWixVariable("JpExecutableMajorOSVersion", String.valueOf(cond.version().majorOSVersion));
                 setWixVariable("JpExecutableMinorOSVersion", String.valueOf(cond.version().minorOSVersion));
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
index 16ae11e1f4a..7bd799b8788 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.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
@@ -27,6 +27,13 @@
 
 public class WinAppBundler extends AppImageBundler {
     public WinAppBundler() {
-        setAppImageSupplier(WindowsAppImageBuilder::new);
+        setAppImageSupplier((params, output) -> {
+            // Order is important!
+            var app = WinFromParams.APPLICATION.fetchFrom(params);
+            var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+            WinPackagingPipeline.build()
+                    .excludeDirFromCopying(output.getParent())
+                    .create().execute(BuildEnv.withAppImageDir(env, output), app);
+        });
     }
 }
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 f411cdc3b3f..54f43f05715 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
@@ -24,17 +24,17 @@
  */
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.OverridableResource.createResource;
+import static jdk.jpackage.internal.StandardBundlerParam.ICON;
+import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.text.MessageFormat;
+import java.nio.file.StandardCopyOption;
 import java.util.Map;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.PackagerException;
-import jdk.jpackage.internal.util.PathUtils;
+import jdk.jpackage.internal.model.WinExePackage;
 
 @SuppressWarnings("restricted")
 public class WinExeBundler extends AbstractBundler {
@@ -43,25 +43,6 @@ public class WinExeBundler extends AbstractBundler {
         System.loadLibrary("jpackage");
     }
 
-    public static final BundlerParamInfo<Path> EXE_IMAGE_DIR
-            = new StandardBundlerParam<>(
-                    "win.exe.imageDir",
-                    Path.class,
-                    params -> {
-                        Path imagesRoot = IMAGES_ROOT.fetchFrom(params);
-                        if (!Files.exists(imagesRoot)) {
-                            try {
-                                Files.createDirectories(imagesRoot);
-                            } catch (IOException ioe) {
-                                return null;
-                            }
-                        }
-                        return imagesRoot.resolve("win-exe.image");
-                    },
-                    (s, p) -> null);
-
-    private static final String EXE_WRAPPER_NAME = "msiwrapper.exe";
-
     @Override
     public String getName() {
         return I18N.getString("exe.bundler.name");
@@ -77,12 +58,6 @@ public String getBundleType() {
         return "INSTALLER";
     }
 
-    @Override
-    public Path execute(Map<String, ? super Object> params,
-            Path outputParentDir) throws PackagerException {
-        return bundle(params, outputParentDir);
-    }
-
     @Override
     public boolean supported(boolean platformInstaller) {
         return msiBundler.supported(platformInstaller);
@@ -99,15 +74,21 @@ public boolean validate(Map<String, ? super Object> params)
         return msiBundler.validate(params);
     }
 
-    public Path bundle(Map<String, ? super Object> params, Path outdir)
+    @Override
+    public Path execute(Map<String, ? super Object> params, Path outdir)
             throws PackagerException {
 
+        // Order is important!
+        var pkg = WinFromParams.MSI_PACKAGE.fetchFrom(params);
+        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+
         IOUtils.writableOutputDir(outdir);
 
-        Path exeImageDir = EXE_IMAGE_DIR.fetchFrom(params);
+        Path msiDir = env.buildRoot().resolve("msi");
+        toRunnable(() -> Files.createDirectories(msiDir)).run();
 
         // Write msi to temporary directory.
-        Path msi = msiBundler.execute(params, exeImageDir);
+        Path msi = msiBundler.execute(params, msiDir);
 
         try {
             new ScriptRunner()
@@ -115,45 +96,41 @@ public Path bundle(Map<String, ? super Object> params, Path outdir)
             .setResourceCategoryId("resource.post-msi-script")
             .setScriptNameSuffix("post-msi")
             .setEnvironmentVariable("JpMsiFile", msi.toAbsolutePath().toString())
-            .run(params);
+            .run(env, pkg.packageName());
 
-            return buildEXE(params, msi, outdir);
-        } catch (IOException ex) {
+            var exePkg = new WinExePackageBuilder(pkg).icon(ICON.fetchFrom(params)).create();
+            return buildEXE(env, exePkg, msi, outdir);
+        } catch (IOException|ConfigException ex) {
             Log.verbose(ex);
             throw new PackagerException(ex);
         }
     }
 
-    private Path buildEXE(Map<String, ? super Object> params, Path msi,
+    private Path buildEXE(BuildEnv env, WinExePackage pkg, Path msi,
             Path outdir) throws IOException {
 
-        Log.verbose(MessageFormat.format(
-                I18N.getString("message.outputting-to-location"),
-                outdir.toAbsolutePath().toString()));
+        Log.verbose(I18N.format("message.outputting-to-location", outdir.toAbsolutePath()));
 
         // Copy template msi wrapper next to msi file
-        final Path exePath = PathUtils.replaceSuffix(msi, ".exe");
+        final Path exePath = msi.getParent().resolve(pkg.packageFileNameWithSuffix());
 
-        createResource(EXE_WRAPPER_NAME, params)
+        env.createResource("msiwrapper.exe")
                 .setCategory(I18N.getString("resource.installer-exe"))
                 .setPublicName("installer.exe")
                 .saveToFile(exePath);
 
-        new ExecutableRebrander().addAction((resourceLock) -> {
+        new ExecutableRebrander(pkg, env::createResource, resourceLock -> {
             // Embed msi in msi wrapper exe.
             embedMSI(resourceLock, msi.toAbsolutePath().toString());
-        }).rebrandInstaller(params, exePath);
+        }).execute(env, exePath, pkg.icon());
 
-        Path dstExePath = outdir.toAbsolutePath().resolve(exePath.getFileName());
-        Files.deleteIfExists(dstExePath);
+        Path dstExePath = outdir.resolve(exePath.getFileName());
 
-        Files.copy(exePath, dstExePath);
+        Files.copy(exePath, dstExePath, StandardCopyOption.REPLACE_EXISTING);
 
-        dstExePath.toFile().setWritable(true, true);
+        dstExePath.toFile().setExecutable(true);
 
-        Log.verbose(MessageFormat.format(
-                I18N.getString("message.output-location"),
-                outdir.toAbsolutePath().toString()));
+        Log.verbose(I18N.format("message.output-location", outdir.toAbsolutePath()));
 
         return dstExePath;
     }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
new file mode 100644
index 00000000000..28d1c3b6ff1
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.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 jdk.jpackage.internal;
+
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.WinExePackage;
+import jdk.jpackage.internal.model.WinMsiPackage;
+
+final class WinExePackageBuilder {
+
+    WinExePackageBuilder(WinMsiPackage pkg) {
+        this.pkg = Objects.requireNonNull(pkg);
+    }
+
+    WinExePackage create() throws ConfigException {
+        if (icon != null) {
+            LauncherBuilder.validateIcon(icon);
+        }
+        return WinExePackage.create(pkg, Optional.ofNullable(icon));
+    }
+
+    WinExePackageBuilder icon(Path v) {
+        icon = v;
+        return this;
+    }
+
+    private Path icon;
+
+    private final WinMsiPackage pkg;
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
new file mode 100644
index 00000000000..95f16d09575
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
@@ -0,0 +1,157 @@
+/*
+ * 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;
+
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.BundlerParamInfo.createBooleanBundlerParam;
+import static jdk.jpackage.internal.BundlerParamInfo.createStringBundlerParam;
+import static jdk.jpackage.internal.FromParams.createApplicationBuilder;
+import static jdk.jpackage.internal.FromParams.createApplicationBundlerParam;
+import static jdk.jpackage.internal.FromParams.createPackageBuilder;
+import static jdk.jpackage.internal.FromParams.createPackageBundlerParam;
+import static jdk.jpackage.internal.StandardBundlerParam.MENU_HINT;
+import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.SHORTCUT_HINT;
+import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.model.StandardPackageType.WIN_MSI;
+import static jdk.jpackage.internal.model.WinLauncherMixin.WinShortcut.WIN_SHORTCUT_DESKTOP;
+import static jdk.jpackage.internal.model.WinLauncherMixin.WinShortcut.WIN_SHORTCUT_START_MENU;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinLauncher;
+import jdk.jpackage.internal.model.WinLauncherMixin;
+import jdk.jpackage.internal.model.WinMsiPackage;
+
+final class WinFromParams {
+
+    private static WinApplication createWinApplication(
+            Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var launcherFromParams = new LauncherFromParams();
+
+        final var app = createApplicationBuilder(params, toFunction(launcherParams -> {
+
+            final var launcher = launcherFromParams.create(launcherParams);
+
+            final boolean isConsole = CONSOLE_HINT.findIn(launcherParams).orElse(false);
+
+            final var shortcuts = Map.of(WIN_SHORTCUT_DESKTOP, List.of(SHORTCUT_HINT,
+                WIN_SHORTCUT_HINT), WIN_SHORTCUT_START_MENU, List.of(MENU_HINT,
+                        WIN_MENU_HINT)).entrySet().stream().filter(e -> {
+
+                    final var shortcutParams = e.getValue();
+
+                    return shortcutParams.get(0).findIn(launcherParams).orElseGet(() -> {
+                        return shortcutParams.get(1).findIn(launcherParams).orElse(false);
+                    });
+                }).map(Map.Entry::getKey).collect(toSet());
+
+            return WinLauncher.create(launcher, new WinLauncherMixin.Stub(isConsole, shortcuts));
+
+        }), APPLICATION_LAYOUT).create();
+
+        return WinApplication.create(app);
+    }
+
+    private static WinMsiPackage createWinMsiPackage(Map<String, ? super Object> params) throws ConfigException, IOException {
+
+        final var app = APPLICATION.fetchFrom(params);
+
+        final var superPkgBuilder = createPackageBuilder(params, app, WIN_MSI);
+
+        final var pkgBuilder = new WinMsiPackageBuilder(superPkgBuilder);
+
+        HELP_URL.copyInto(params, pkgBuilder::helpURL);
+        MSI_SYSTEM_WIDE.copyInto(params, pkgBuilder::isSystemWideInstall);
+        MENU_GROUP.copyInto(params, pkgBuilder::startMenuGroupName);
+        UPDATE_URL.copyInto(params, pkgBuilder::updateURL);
+        INSTALLDIR_CHOOSER.copyInto(params, pkgBuilder::withInstallDirChooser);
+        SHORTCUT_PROMPT.copyInto(params, pkgBuilder::withShortcutPrompt);
+
+        if (app.isService()) {
+            RESOURCE_DIR.copyInto(params, resourceDir -> {
+                pkgBuilder.serviceInstaller(resourceDir.resolve("service-installer.exe"));
+            });
+        }
+
+        try {
+            UPGRADE_UUID.findIn(params).map(UUID::fromString).ifPresent(pkgBuilder::upgradeCode);
+        } catch (IllegalArgumentException ex) {
+            throw new ConfigException(ex);
+        }
+
+        return pkgBuilder.create();
+    }
+
+    static final BundlerParamInfo<WinApplication> APPLICATION = createApplicationBundlerParam(
+            WinFromParams::createWinApplication);
+
+    static final BundlerParamInfo<WinMsiPackage> MSI_PACKAGE = createPackageBundlerParam(
+            WinFromParams::createWinMsiPackage);
+
+    private static final BundlerParamInfo<Boolean> WIN_MENU_HINT = createBooleanBundlerParam(
+            Arguments.CLIOptions.WIN_MENU_HINT.getId());
+
+    private static final BundlerParamInfo<Boolean> WIN_SHORTCUT_HINT = createBooleanBundlerParam(
+            Arguments.CLIOptions.WIN_SHORTCUT_HINT.getId());
+
+    public static final BundlerParamInfo<Boolean> CONSOLE_HINT = createBooleanBundlerParam(
+            Arguments.CLIOptions.WIN_CONSOLE_HINT.getId());
+
+    private static final BundlerParamInfo<Boolean> INSTALLDIR_CHOOSER = new BundlerParamInfo<>(
+            Arguments.CLIOptions.WIN_DIR_CHOOSER.getId(),
+            Boolean.class,
+            null,
+            (s, p) -> Boolean.valueOf(s)
+    );
+
+    private static final BundlerParamInfo<Boolean> SHORTCUT_PROMPT = new BundlerParamInfo<>(
+            Arguments.CLIOptions.WIN_SHORTCUT_PROMPT.getId(),
+            Boolean.class,
+            null,
+            (s, p) -> Boolean.valueOf(s)
+    );
+
+    private static final BundlerParamInfo<String> MENU_GROUP = createStringBundlerParam(
+            Arguments.CLIOptions.WIN_MENU_GROUP.getId());
+
+    private static final BundlerParamInfo<Boolean> MSI_SYSTEM_WIDE = createBooleanBundlerParam(
+            Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId());
+
+    private static final BundlerParamInfo<String> HELP_URL = createStringBundlerParam(
+            Arguments.CLIOptions.WIN_HELP_URL.getId());
+
+    private static final BundlerParamInfo<String> UPDATE_URL = createStringBundlerParam(
+            Arguments.CLIOptions.WIN_UPDATE_URL.getId());
+
+    private static final BundlerParamInfo<String> UPGRADE_UUID = createStringBundlerParam(
+            Arguments.CLIOptions.WIN_UPGRADE_UUID.getId());
+}
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 c95449a81e1..9bd0c679146 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -25,26 +25,24 @@
 
 package jdk.jpackage.internal;
 
+import static jdk.jpackage.internal.model.ConfigException.rethrowConfigException;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 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;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.xml.parsers.DocumentBuilder;
@@ -54,23 +52,14 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
+import jdk.jpackage.internal.PackagingPipeline.PackageBuildEnv;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.MsiVersion;
+import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
-
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.ABOUT_URL;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
-import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.model.WinMsiPackage;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -138,97 +127,7 @@
  */
 public class WinMsiBundler  extends AbstractBundler {
 
-    public static final BundlerParamInfo<Path> MSI_IMAGE_DIR =
-            new StandardBundlerParam<>(
-            "win.msi.imageDir",
-            Path.class,
-            params -> {
-                Path imagesRoot = IMAGES_ROOT.fetchFrom(params);
-                if (!Files.exists(imagesRoot)) {
-                    try {
-                        Files.createDirectories(imagesRoot);
-                    } catch (IOException ioe) {
-                        return null;
-                    }
-                }
-                return imagesRoot.resolve("win-msi.image");
-            },
-            (s, p) -> null);
-
-    public static final BundlerParamInfo<Path> WIN_APP_IMAGE =
-            new StandardBundlerParam<>(
-            "win.app.image",
-            Path.class,
-            null,
-            (s, p) -> null);
-
-    static final StandardBundlerParam<InstallableFile> SERVICE_INSTALLER
-            = new StandardBundlerParam<>(
-                    "win.msi.serviceInstaller",
-                    InstallableFile.class,
-                    null,
-                    null
-            );
-
-    public static final StandardBundlerParam<Boolean> MSI_SYSTEM_WIDE  =
-            new StandardBundlerParam<>(
-                    Arguments.CLIOptions.WIN_PER_USER_INSTALLATION.getId(),
-                    Boolean.class,
-                    params -> true, // MSIs default to system wide
-                    // valueOf(null) is false,
-                    // and we actually do want null
-                    (s, p) -> (s == null || "null".equalsIgnoreCase(s))? null
-                            : Boolean.valueOf(s)
-            );
-
-    public static final StandardBundlerParam<String> PRODUCT_VERSION =
-            new StandardBundlerParam<>(
-                    "win.msi.productVersion",
-                    String.class,
-                    VERSION::fetchFrom,
-                    (s, p) -> s
-            );
-
-    private static final BundlerParamInfo<String> HELP_URL =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.WIN_HELP_URL.getId(),
-            String.class,
-            null,
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> UPDATE_URL =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.WIN_UPDATE_URL.getId(),
-            String.class,
-            null,
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> UPGRADE_UUID =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.WIN_UPGRADE_UUID.getId(),
-            String.class,
-            null,
-            (s, p) -> s);
-
-    private static final BundlerParamInfo<String> INSTALLER_FILE_NAME =
-            new StandardBundlerParam<> (
-            "win.installerName",
-            String.class,
-            params -> {
-                String nm = INSTALLER_NAME.fetchFrom(params);
-                if (nm == null) return null;
-
-                String version = VERSION.fetchFrom(params);
-                if (version == null) {
-                    return nm;
-                } else {
-                    return nm + "-" + version;
-                }
-            },
-            (s, p) -> s);
-
     public WinMsiBundler() {
-        appImageBundler = new WinAppBundler().setDependentTask(true);
         wixFragments = Stream.of(
                 Map.entry("bundle.wxf", new WixAppImageFragmentBuilder()),
                 Map.entry("ui.wxf", new WixUiFragmentBuilder()),
@@ -277,47 +176,22 @@ public boolean isDefault() {
         return false;
     }
 
-    private static UUID getUpgradeCode(Map<String, ? super Object> params) {
-        String upgradeCode = UPGRADE_UUID.fetchFrom(params);
-        if (upgradeCode != null) {
-            return UUID.fromString(upgradeCode);
-        }
-        return createNameUUID("UpgradeCode", params, List.of(VENDOR, APP_NAME));
-    }
-
-    private static UUID getProductCode(Map<String, ? super Object> params) {
-        return createNameUUID("ProductCode", params, List.of(VENDOR, APP_NAME,
-                VERSION));
-    }
-
-    private static UUID createNameUUID(String prefix,
-            Map<String, ? super Object> params,
-            List<StandardBundlerParam<String>> components) {
-        String key = Stream.concat(Stream.of(prefix), components.stream().map(
-                c -> c.fetchFrom(params))).collect(Collectors.joining("/"));
-        return UUID.nameUUIDFromBytes(key.getBytes(StandardCharsets.UTF_8));
-    }
-
     @Override
     public boolean validate(Map<String, ? super Object> params)
             throws ConfigException {
         try {
-            appImageBundler.validate(params);
+            // Order is important!
+            WinFromParams.APPLICATION.fetchFrom(params);
+            BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
             if (wixToolset == null) {
                 wixToolset = WixTool.createToolset();
             }
 
-            try {
-                getUpgradeCode(params);
-            } catch (IllegalArgumentException ex) {
-                throw new ConfigException(ex);
-            }
-
             for (var tool : wixToolset.getType().getTools()) {
-                Log.verbose(MessageFormat.format(I18N.getString(
-                        "message.tool-version"), wixToolset.getToolPath(tool).
-                                getFileName(), wixToolset.getVersion()));
+                Log.verbose(I18N.format("message.tool-version",
+                        wixToolset.getToolPath(tool).getFileName(),
+                        wixToolset.getVersion()));
             }
 
             wixFragments.forEach(wixFragment -> wixFragment.setWixVersion(wixToolset.getVersion(),
@@ -326,91 +200,41 @@ public boolean validate(Map<String, ? super Object> params)
             wixFragments.stream().map(WixFragmentBuilder::getLoggableWixFeatures).flatMap(
                     List::stream).distinct().toList().forEach(Log::verbose);
 
-            /********* validate bundle parameters *************/
-
-            try {
-                String version = PRODUCT_VERSION.fetchFrom(params);
-                MsiVersion.of(version);
-            } catch (IllegalArgumentException ex) {
-                throw new ConfigException(ex.getMessage(), I18N.getString(
-                        "error.version-string-wrong-format.advice"), ex);
-            }
-
-            FileAssociation.verify(FileAssociation.fetchFrom(params));
-
-            initServiceInstallerResource(params);
-
             return true;
         } catch (RuntimeException re) {
-            if (re.getCause() instanceof ConfigException) {
-                throw (ConfigException) re.getCause();
-            } else {
-                throw new ConfigException(re);
-            }
+            throw rethrowConfigException(re);
         }
     }
 
-    private void prepareProto(Map<String, ? super Object> params)
-                throws PackagerException, IOException {
-        Path appImage = StandardBundlerParam.getPredefinedAppImage(params);
-        String appName = Objects.requireNonNull(APP_NAME.fetchFrom(params));
-        Path appDir;
-
-        // we either have an application image or need to build one
-        if (appImage != null) {
-            appDir = MSI_IMAGE_DIR.fetchFrom(params).resolve(appName);
-            // copy everything from appImage dir into appDir/name
-            FileUtils.copyRecursive(appImage, appDir);
-        } else {
-            appDir = appImageBundler.execute(params, MSI_IMAGE_DIR.fetchFrom(
-                    params));
-        }
+    private void prepareProto(Package pkg, BuildEnv env, AppImageLayout appImageLayout) throws
+            PackagerException, IOException {
 
         // Configure installer icon
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
+        if (appImageLayout instanceof RuntimeLayout runtimeLayout) {
             // Use icon from java launcher.
             // Assume java.exe exists in Java Runtime being packed.
             // Ignore custom icon if any as we don't want to copy anything in
             // Java Runtime image.
-            installerIcon = ApplicationLayout.javaRuntime()
-                    .resolveAt(appDir)
-                    .runtimeDirectory()
-                    .resolve(Path.of("bin", "java.exe"));
-        } else {
-            var appLayout = ApplicationLayout.windowsAppImage().resolveAt(appDir);
-
-            installerIcon = appLayout.launchersDirectory()
-                    .resolve(appName + ".exe");
-
-            new PackageFile(appName).save(appLayout);
+            installerIcon = runtimeLayout.runtimeDirectory().resolve(Path.of("bin", "java.exe"));
+        } else if (appImageLayout instanceof ApplicationLayout appLayout) {
+            installerIcon = appLayout.launchersDirectory().resolve(
+                    pkg.app().mainLauncher().orElseThrow().executableNameWithSuffix());
         }
         installerIcon = installerIcon.toAbsolutePath();
 
-        params.put(WIN_APP_IMAGE.getID(), appDir);
-
-        String licenseFile = LICENSE_FILE.fetchFrom(params);
-        if (licenseFile != null) {
+        pkg.licenseFile().ifPresent(licenseFile -> {
             // need to copy license file to the working directory
             // and convert to rtf if needed
-            Path lfile = Path.of(licenseFile);
-            Path destFile = CONFIG_ROOT.fetchFrom(params)
-                    .resolve(lfile.getFileName());
+            Path destFile = env.configDir().resolve(licenseFile.getFileName());
 
-            IOUtils.copyFile(lfile, destFile);
+            try {
+                IOUtils.copyFile(licenseFile, destFile);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
             destFile.toFile().setWritable(true);
             ensureByMutationFileIsRTF(destFile);
-        }
-
-        try {
-            var serviceInstallerResource = initServiceInstallerResource(params);
-            if (serviceInstallerResource != null) {
-                var serviceInstallerPath = serviceInstallerResource.getExternalPath();
-                params.put(SERVICE_INSTALLER.getID(), new InstallableFile(
-                        serviceInstallerPath, serviceInstallerPath.getFileName()));
-            }
-        } catch (ConfigException ex) {
-            throw new PackagerException(ex);
-        }
+        });
     }
 
     @Override
@@ -419,124 +243,55 @@ public Path execute(Map<String, ? super Object> params,
 
         IOUtils.writableOutputDir(outputParentDir);
 
-        Path imageDir = MSI_IMAGE_DIR.fetchFrom(params);
-        try {
-            Files.createDirectories(imageDir);
-
-            prepareProto(params);
-
-            for (var wixFragment : wixFragments) {
-                wixFragment.initFromParams(params);
-                wixFragment.addFilesToConfigRoot();
-            }
-
-            Map<String, String> wixVars = prepareMainProjectFile(params);
-            return buildMSI(params, wixVars, outputParentDir);
-        } catch (IOException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
-        }
-    }
-
-    private long getAppImageSizeKb(Map<String, ? super Object> params) throws
-            IOException {
-        ApplicationLayout appLayout;
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            appLayout = ApplicationLayout.javaRuntime();
-        } else {
-            appLayout = ApplicationLayout.windowsAppImage();
-        }
-        appLayout = appLayout.resolveAt(WIN_APP_IMAGE.fetchFrom(params));
-
-        long size = appLayout.sizeInBytes() >> 10;
-
-        return size;
+        // Order is important!
+        var pkg = WinFromParams.MSI_PACKAGE.fetchFrom(params);
+        var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+
+        WinPackagingPipeline.build()
+                .excludeDirFromCopying(outputParentDir)
+                .task(PackagingPipeline.PackageTaskID.CREATE_CONFIG_FILES)
+                        .packageAction(this::prepareConfigFiles)
+                        .add()
+                .task(PackagingPipeline.PackageTaskID.CREATE_PACKAGE_FILE)
+                        .packageAction(this::buildPackage)
+                        .add()
+                .create().execute(env, pkg, outputParentDir);
+
+        return outputParentDir.resolve(pkg.packageFileNameWithSuffix()).toAbsolutePath();
     }
 
-    private Map<String, String> prepareMainProjectFile(
-            Map<String, ? super Object> params) throws IOException {
-        Map<String, String> data = new HashMap<>();
-
-        final UUID productCode = getProductCode(params);
-        final UUID upgradeCode = getUpgradeCode(params);
-
-        data.put("JpProductCode", productCode.toString());
-        data.put("JpProductUpgradeCode", upgradeCode.toString());
-
-        Log.verbose(MessageFormat.format(I18N.getString("message.product-code"),
-                productCode));
-        Log.verbose(MessageFormat.format(I18N.getString("message.upgrade-code"),
-                upgradeCode));
-
-        data.put("JpAllowUpgrades", "yes");
-        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
-            data.put("JpAllowDowngrades", "yes");
-        }
-
-        data.put("JpAppName", APP_NAME.fetchFrom(params));
-        data.put("JpAppDescription", DESCRIPTION.fetchFrom(params));
-        data.put("JpAppVendor", VENDOR.fetchFrom(params));
-        data.put("JpAppVersion", PRODUCT_VERSION.fetchFrom(params));
-        if (Files.exists(installerIcon)) {
-            data.put("JpIcon", installerIcon.toString());
-        }
-
-        Optional.ofNullable(HELP_URL.fetchFrom(params)).ifPresent(value -> {
-            data.put("JpHelpURL", value);
-        });
-
-        Optional.ofNullable(UPDATE_URL.fetchFrom(params)).ifPresent(value -> {
-            data.put("JpUpdateURL", value);
-        });
-
-        Optional.ofNullable(ABOUT_URL.fetchFrom(params)).ifPresent(value -> {
-            data.put("JpAboutURL", value);
-        });
-
-        data.put("JpAppSizeKb", Long.toString(getAppImageSizeKb(params)));
-
-        final Path configDir = CONFIG_ROOT.fetchFrom(params);
-
-        data.put("JpConfigDir", configDir.toAbsolutePath().toString());
-
-        if (MSI_SYSTEM_WIDE.fetchFrom(params)) {
-            data.put("JpIsSystemWide", "yes");
+    private void prepareConfigFiles(PackageBuildEnv<WinMsiPackage, AppImageLayout> env) throws PackagerException, IOException {
+        prepareProto(env.pkg(), env.env(), env.resolvedLayout());
+        for (var wixFragment : wixFragments) {
+            wixFragment.initFromParams(env.env(), env.pkg());
+            wixFragment.addFilesToConfigRoot();
         }
 
-        return data;
-    }
+        final var msiOut = env.outputDir().resolve(env.pkg().packageFileNameWithSuffix());
 
-    private Path buildMSI(Map<String, ? super Object> params,
-            Map<String, String> wixVars, Path outdir)
-            throws IOException {
+        Log.verbose(I18N.format("message.preparing-msi-config", msiOut.toAbsolutePath()));
 
-        Path msiOut = outdir.resolve(INSTALLER_FILE_NAME.fetchFrom(params) + ".msi");
+        final var wixVars = createWixVars(env);
 
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.preparing-msi-config"), msiOut.toAbsolutePath()
-                        .toString()));
+        final var wixObjDir = env.env().buildRoot().resolve("wixobj");
 
-        var wixObjDir = TEMP_ROOT.fetchFrom(params).resolve("wixobj");
+        final var configDir = env.env().configDir();
 
-        var wixPipeline = WixPipeline.build()
+        final var wixPipelineBuilder = WixPipeline.build()
                 .setWixObjDir(wixObjDir)
-                .setWorkDir(WIN_APP_IMAGE.fetchFrom(params))
-                .addSource(CONFIG_ROOT.fetchFrom(params).resolve("main.wxs"),
-                        wixVars);
+                .setWorkDir(env.env().appImageDir())
+                .addSource(configDir.resolve("main.wxs"), wixVars);
 
         for (var wixFragment : wixFragments) {
-            wixFragment.configureWixPipeline(wixPipeline);
+            wixFragment.configureWixPipeline(wixPipelineBuilder);
         }
 
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.generating-msi"), msiOut.toAbsolutePath().toString()));
-
         switch (wixToolset.getType()) {
             case Wix3 -> {
-                wixPipeline.addLightOptions("-sice:ICE27");
+                wixPipelineBuilder.addLightOptions("-sice:ICE27");
 
-                if (!MSI_SYSTEM_WIDE.fetchFrom(params)) {
-                    wixPipeline.addLightOptions("-sice:ICE91");
+                if (!env.pkg().isSystemWideInstall()) {
+                    wixPipelineBuilder.addLightOptions("-sice:ICE91");
                 }
             }
             case Wix4 -> {
@@ -546,8 +301,6 @@ private Path buildMSI(Map<String, ? super Object> params,
             }
         }
 
-        final Path configDir = CONFIG_ROOT.fetchFrom(params);
-
         var primaryWxlFiles = Stream.of("de", "en", "ja", "zh_CN").map(loc -> {
             return configDir.resolve("MsiInstallerStrings_" + loc + ".wxl");
         }).toList();
@@ -557,34 +310,36 @@ private Path buildMSI(Map<String, ? super Object> params,
         // Copy standard l10n files.
         for (var path : primaryWxlFiles) {
             var name = path.getFileName().toString();
-            wixResources.addResource(createResource(name, params).setPublicName(name).setCategory(
+            wixResources.addResource(env.env().createResource(name).setPublicName(name).setCategory(
                     I18N.getString("resource.wxl-file")), path);
         }
 
-        wixResources.addResource(createResource("main.wxs", params).setPublicName("main.wxs").
+        wixResources.addResource(env.env().createResource("main.wxs").setPublicName("main.wxs").
                 setCategory(I18N.getString("resource.main-wix-file")), configDir.resolve("main.wxs"));
 
-        wixResources.addResource(createResource("overrides.wxi", params).setPublicName(
+        wixResources.addResource(env.env().createResource("overrides.wxi").setPublicName(
                 "overrides.wxi").setCategory(I18N.getString("resource.overrides-wix-file")),
                 configDir.resolve("overrides.wxi"));
 
         // Filter out custom l10n files that were already used to
         // override primary l10n files. Ignore case filename comparison,
         // both lists are expected to be short.
-        List<Path> customWxlFiles = getWxlFilesFromDir(params, RESOURCE_DIR).stream()
+        List<Path> customWxlFiles = env.env().resourceDir()
+                .map(WinMsiBundler::getWxlFilesFromDir)
+                .orElseGet(Collections::emptyList)
+                .stream()
                 .filter(custom -> primaryWxlFiles.stream().noneMatch(primary ->
                         primary.getFileName().toString().equalsIgnoreCase(
                                 custom.getFileName().toString())))
-                .peek(custom -> Log.verbose(MessageFormat.format(
-                        I18N.getString("message.using-custom-resource"),
-                                String.format("[%s]", I18N.getString("resource.wxl-file")),
-                                custom.getFileName().toString())))
-                .toList();
+                .peek(custom -> Log.verbose(I18N.format(
+                        "message.using-custom-resource", String.format("[%s]",
+                                I18N.getString("resource.wxl-file")),
+                        custom.getFileName()))).toList();
 
         // Copy custom l10n files.
         for (var path : customWxlFiles) {
             var name = path.getFileName().toString();
-            wixResources.addResource(createResource(name, params).setPublicName(name).
+            wixResources.addResource(env.env().createResource(name).setPublicName(name).
                     setSourceOrder(OverridableResource.Source.ResourceDir).setCategory(I18N.
                     getString("resource.wxl-file")), configDir.resolve(name));
         }
@@ -592,31 +347,22 @@ private Path buildMSI(Map<String, ? super Object> params,
         // Save all WiX resources into config dir.
         wixResources.saveResources();
 
-        final var imageDir = WIN_APP_IMAGE.fetchFrom(params);
-
-        new ScriptRunner()
-                .setDirectory(imageDir)
-                .setResourceCategoryId("resource.post-app-image-script")
-                .setScriptNameSuffix("post-image")
-                .setEnvironmentVariable("JpAppImageDir", imageDir.toAbsolutePath().toString())
-                .run(params);
-
         // All l10n files are supplied to WiX with "-loc", but only
         // Cultures from custom files and a single primary Culture are
         // included into "-cultures" list
         for (var wxl : primaryWxlFiles) {
-            wixPipeline.addLightOptions("-loc", wxl.toString());
+            wixPipelineBuilder.addLightOptions("-loc", wxl.toString());
         }
 
         List<String> cultures = new ArrayList<>();
         for (var wxl : customWxlFiles) {
             wxl = configDir.resolve(wxl.getFileName());
-            wixPipeline.addLightOptions("-loc", wxl.toString());
+            wixPipelineBuilder.addLightOptions("-loc", wxl.toString());
             cultures.add(getCultureFromWxlFile(wxl));
         }
 
         // Append a primary culture bases on runtime locale.
-        final Path primaryWxlFile = CONFIG_ROOT.fetchFrom(params).resolve(
+        final Path primaryWxlFile = configDir.resolve(
                 I18N.getString("resource.wxl-file-name"));
         cultures.add(getCultureFromWxlFile(primaryWxlFile));
 
@@ -625,12 +371,12 @@ private Path buildMSI(Map<String, ? super Object> params,
         uniqueCultures.addAll(cultures);
         switch (wixToolset.getType()) {
             case Wix3 -> {
-                wixPipeline.addLightOptions(uniqueCultures.stream().collect(Collectors.joining(";",
+                wixPipelineBuilder.addLightOptions(uniqueCultures.stream().collect(Collectors.joining(";",
                         "-cultures:", "")));
             }
             case Wix4 -> {
                 uniqueCultures.forEach(culture -> {
-                    wixPipeline.addLightOptions("-culture", culture);
+                    wixPipelineBuilder.addLightOptions("-culture", culture);
                 });
             }
             default -> {
@@ -639,18 +385,64 @@ private Path buildMSI(Map<String, ? super Object> params,
         }
 
         Files.createDirectories(wixObjDir);
-        wixPipeline.create(wixToolset).buildMsi(msiOut.toAbsolutePath());
+        wixPipeline = wixPipelineBuilder.create(wixToolset);
+    }
 
-        return msiOut;
+    private void buildPackage(PackageBuildEnv<WinMsiPackage, AppImageLayout> env) throws PackagerException, IOException {
+        final var msiOut = env.outputDir().resolve(env.pkg().packageFileNameWithSuffix());
+        Log.verbose(I18N.format("message.generating-msi", msiOut.toAbsolutePath()));
+        wixPipeline.buildMsi(msiOut.toAbsolutePath());
     }
 
-    private static List<Path> getWxlFilesFromDir(Map<String, ? super Object> params,
-            StandardBundlerParam<Path> pathParam) throws IOException {
-        Path dir = pathParam.fetchFrom(params);
-        if (dir == null) {
-            return Collections.emptyList();
+    private Map<String, String> createWixVars(PackageBuildEnv<WinMsiPackage, AppImageLayout> env) throws IOException {
+        Map<String, String> data = new HashMap<>();
+
+        final var pkg = env.pkg();
+
+        data.put("JpProductCode", pkg.productCode().toString());
+        data.put("JpProductUpgradeCode", pkg.upgradeCode().toString());
+
+        Log.verbose(I18N.format("message.product-code", pkg.productCode()));
+        Log.verbose(I18N.format("message.upgrade-code", pkg.upgradeCode()));
+
+        data.put("JpAllowUpgrades", "yes");
+        if (!pkg.isRuntimeInstaller()) {
+            data.put("JpAllowDowngrades", "yes");
         }
 
+        data.put("JpAppName", pkg.packageName());
+        data.put("JpAppDescription", pkg.description());
+        data.put("JpAppVendor", pkg.app().vendor());
+        data.put("JpAppVersion", pkg.version());
+        if (Files.exists(installerIcon)) {
+            data.put("JpIcon", installerIcon.toString());
+        }
+
+        pkg.helpURL().ifPresent(value -> {
+            data.put("JpHelpURL", value);
+        });
+
+        pkg.updateURL().ifPresent(value -> {
+            data.put("JpUpdateURL", value);
+        });
+
+        pkg.aboutURL().ifPresent(value -> {
+            data.put("JpAboutURL", value);
+        });
+
+        data.put("JpAppSizeKb", Long.toString(AppImageLayout.toPathGroup(
+                env.resolvedLayout()).sizeInBytes() >> 10));
+
+        data.put("JpConfigDir", env.env().configDir().toAbsolutePath().toString());
+
+        if (pkg.isSystemWideInstall()) {
+            data.put("JpIsSystemWide", "yes");
+        }
+
+        return data;
+    }
+
+    private static List<Path> getWxlFilesFromDir(Path dir) {
         final String glob = "glob:**/*.wxl";
         final PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher(
                 glob);
@@ -661,10 +453,12 @@ private static List<Path> getWxlFilesFromDir(Map<String, ? super Object> params,
                     .filter(pathMatcher::matches)
                     .sorted((a, b) -> a.getFileName().toString().compareToIgnoreCase(b.getFileName().toString()))
                     .toList();
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
         }
     }
 
-    private static String getCultureFromWxlFile(Path wxlPath) throws IOException {
+    private static String getCultureFromWxlFile(Path wxlPath) {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(false);
@@ -674,25 +468,24 @@ private static String getCultureFromWxlFile(Path wxlPath) throws IOException {
 
             XPath xPath = XPathFactory.newInstance().newXPath();
             NodeList nodes = (NodeList) xPath.evaluate(
-                    "//WixLocalization/@Culture", doc,
-                    XPathConstants.NODESET);
+                    "//WixLocalization/@Culture", doc, XPathConstants.NODESET);
             if (nodes.getLength() != 1) {
-                throw new IOException(MessageFormat.format(I18N.getString(
-                        "error.extract-culture-from-wix-l10n-file"),
+                throw new IOException(I18N.format(
+                        "error.extract-culture-from-wix-l10n-file",
                         wxlPath.toAbsolutePath().normalize()));
             }
 
             return nodes.item(0).getNodeValue();
         } catch (XPathExpressionException | ParserConfigurationException
                 | SAXException ex) {
-            throw new IOException(MessageFormat.format(I18N.getString(
-                    "error.read-wix-l10n-file"), wxlPath.toAbsolutePath().normalize()), ex);
+            throw new UncheckedIOException(new IOException(
+                    I18N.format("error.read-wix-l10n-file", wxlPath.toAbsolutePath().normalize()), ex));
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
         }
     }
 
     private static void ensureByMutationFileIsRTF(Path f) {
-        if (f == null || !Files.isRegularFile(f)) return;
-
         try {
             boolean existingLicenseIsRTF = false;
 
@@ -758,42 +551,10 @@ private static void ensureByMutationFileIsRTF(Path f) {
         } catch (IOException e) {
             Log.verbose(e);
         }
-
-    }
-
-    private static OverridableResource initServiceInstallerResource(
-            Map<String, ? super Object> params) throws ConfigException {
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            // Runtime installer doesn't install launchers,
-            // service installer not needed
-            return null;
-        }
-
-        if (!AppImageFile.getLaunchers(
-                StandardBundlerParam.getPredefinedAppImage(params), params).stream().anyMatch(
-                LauncherInfo::isService)) {
-            // Not a single launcher is requested to be installed as a service,
-            // service installer not needed
-            return null;
-        }
-
-        var result = createResource(null, params)
-                .setPublicName("service-installer.exe")
-                .setSourceOrder(OverridableResource.Source.External);
-        if (result.getResourceDir() != null) {
-            result.setExternal(result.getResourceDir().resolve(result.getPublicName()));
-
-            if (Files.exists(result.getExternalPath())) {
-                return result;
-            }
-        }
-
-        throw new ConfigException(I18N.getString("error.missing-service-installer"),
-                I18N.getString("error.missing-service-installer.advice"));
     }
 
     private Path installerIcon;
     private WixToolset wixToolset;
-    private AppImageBundler appImageBundler;
+    private WixPipeline wixPipeline;
     private final List<WixFragmentBuilder> wixFragments;
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
new file mode 100644
index 00000000000..9d52d0a47ad
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
@@ -0,0 +1,146 @@
+/*
+ * 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;
+
+import static jdk.jpackage.internal.I18N.buildConfigException;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MsiVersion;
+import jdk.jpackage.internal.model.WinMsiPackage;
+import jdk.jpackage.internal.model.WinMsiPackageMixin;
+
+final class WinMsiPackageBuilder {
+
+    WinMsiPackageBuilder(PackageBuilder pkgBuilder) {
+        this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
+    }
+
+    WinMsiPackage create() throws ConfigException {
+        var pkg = pkgBuilder.create();
+
+        try {
+            MsiVersion.of(pkg.version());
+        } catch (IllegalArgumentException ex) {
+            throw buildConfigException(ex)
+                    .advice("error.version-string-wrong-format.advice")
+                    .create();
+        }
+
+        if (pkg.app().isService() && (serviceInstaller == null || !Files.exists(serviceInstaller))) {
+            throw buildConfigException()
+                    .message("error.missing-service-installer")
+                    .advice("error.missing-service-installer.advice")
+                    .create();
+        }
+
+        return WinMsiPackage.create(pkg, new WinMsiPackageMixin.Stub(
+                MsiVersion.of(pkg.version()),
+                withInstallDirChooser,
+                withShortcutPrompt,
+                Optional.ofNullable(helpURL),
+                Optional.ofNullable(updateURL),
+                Optional.ofNullable(startMenuGroupName).orElseGet(DEFAULTS::startMenuGroupName),
+                isSystemWideInstall,
+                Optional.ofNullable(upgradeCode).orElseGet(() -> upgradeCode(pkg.app())),
+                productCode(pkg.app(), pkg.version()),
+                Optional.ofNullable(serviceInstaller)));
+    }
+
+    private static UUID upgradeCode(Application app) {
+        return createNameUUID("UpgradeCode", app.vendor(), app.name());
+    }
+
+    private static UUID productCode(Application app, String pkgVersion) {
+        return createNameUUID("ProductCode", app.vendor(), app.name(), pkgVersion);
+    }
+
+    WinMsiPackageBuilder withInstallDirChooser(boolean v) {
+        withInstallDirChooser = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder withShortcutPrompt(boolean v) {
+        withShortcutPrompt = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder helpURL(String v) {
+        helpURL = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder updateURL(String v) {
+        updateURL = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder startMenuGroupName(String v) {
+        startMenuGroupName = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder isSystemWideInstall(boolean v) {
+        isSystemWideInstall = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder serviceInstaller(Path v) {
+        serviceInstaller = v;
+        return this;
+    }
+
+    WinMsiPackageBuilder upgradeCode(UUID v) {
+        upgradeCode = v;
+        return this;
+    }
+
+    private static UUID createNameUUID(String... components) {
+        String key = String.join("/", components);
+        return UUID.nameUUIDFromBytes(key.getBytes(StandardCharsets.UTF_8));
+    }
+
+    record Defaults(String startMenuGroupName) {}
+
+    private boolean withInstallDirChooser;
+    private boolean withShortcutPrompt;
+    private String helpURL;
+    private String updateURL;
+    private String startMenuGroupName;
+    private boolean isSystemWideInstall = true;
+    private Path serviceInstaller;
+    private UUID upgradeCode;
+
+    private final PackageBuilder pkgBuilder;
+
+    private static final Defaults DEFAULTS = new Defaults(I18N.getString("param.menu-group.default"));
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
new file mode 100644
index 00000000000..be529bdc19e
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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;
+
+import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
+import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
+import jdk.jpackage.internal.PackagingPipeline.CopyAppImageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
+import jdk.jpackage.internal.PackagingPipeline.TaskID;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.Package;
+import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinLauncher;
+
+final class WinPackagingPipeline {
+
+    enum WinAppImageTaskID implements TaskID {
+        REBRAND_LAUNCHERS
+    }
+
+    static PackagingPipeline.Builder build() {
+        return PackagingPipeline.buildStandard()
+                .appImageLayoutForPackaging(Package::appImageLayout)
+                .task(CopyAppImageTaskID.COPY).noaction().add()
+                .task(WinAppImageTaskID.REBRAND_LAUNCHERS)
+                        .addDependency(BuildApplicationTaskID.LAUNCHERS)
+                        .addDependent(PrimaryTaskID.BUILD_APPLICATION_IMAGE)
+                        .applicationAction(WinPackagingPipeline::rebrandLaunchers).add();
+    }
+
+    private static void rebrandLaunchers(AppImageBuildEnv<WinApplication, ApplicationLayout> env)
+            throws IOException, PackagerException {
+        for (var launcher : env.app().launchers()) {
+            final var iconTarget = createLauncherIconResource(env.app(), launcher, env.env()::createResource).map(iconResource -> {
+                var iconDir = env.env().buildRoot().resolve("icons");
+                var theIconTarget = iconDir.resolve(launcher.executableName() + ".ico");
+                try {
+                    if (null == iconResource.saveToFile(theIconTarget)) {
+                        theIconTarget = null;
+                    }
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+                return theIconTarget;
+            });
+
+            var launcherExecutable = env.resolvedLayout().launchersDirectory().resolve(
+                    launcher.executableNameWithSuffix());
+
+            // Update branding of launcher executable
+            new ExecutableRebrander(env.app(),
+                    (WinLauncher) launcher, env.env()::createResource).execute(
+                            env.env(), launcherExecutable, iconTarget);
+        }
+    }
+
+    static final ApplicationLayout APPLICATION_LAYOUT = ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
deleted file mode 100644
index 9a9a7006550..00000000000
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jpackage.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.ICON;
-import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
-
-public class WindowsAppImageBuilder extends AbstractAppImageBuilder {
-    private static final ResourceBundle I18N = ResourceBundle.getBundle(
-            "jdk.jpackage.internal.resources.WinResources");
-
-    private static final String TEMPLATE_APP_ICON ="JavaApp.ico";
-
-    public static final BundlerParamInfo<Path> ICON_ICO =
-            new StandardBundlerParam<>(
-            "icon.ico",
-            Path.class,
-            params -> {
-                Path f = ICON.fetchFrom(params);
-                if (f != null && f.getFileName() != null && !f.getFileName()
-                        .toString().toLowerCase().endsWith(".ico")) {
-                    Log.error(MessageFormat.format(
-                            I18N.getString("message.icon-not-ico"), f));
-                    return null;
-                }
-                return f;
-            },
-            (s, p) -> Path.of(s));
-
-    public static final StandardBundlerParam<Boolean> CONSOLE_HINT =
-            new StandardBundlerParam<>(
-            Arguments.CLIOptions.WIN_CONSOLE_HINT.getId(),
-            Boolean.class,
-            params -> false,
-            // valueOf(null) is false,
-            // and we actually do want null in some cases
-            (s, p) -> (s == null
-            || "null".equalsIgnoreCase(s)) ? true : Boolean.valueOf(s));
-
-    WindowsAppImageBuilder(Path imageOutDir) {
-        super(imageOutDir);
-    }
-
-    private void writeEntry(InputStream in, Path dstFile) throws IOException {
-        Files.createDirectories(IOUtils.getParent(dstFile));
-        Files.copy(in, dstFile);
-    }
-
-    private static String getLauncherName(Map<String, ? super Object> params) {
-        return APP_NAME.fetchFrom(params) + ".exe";
-    }
-
-    // Returns launcher resource name for launcher we need to use.
-    public static String getLauncherResourceName(
-            Map<String, ? super Object> params) {
-        if (CONSOLE_HINT.fetchFrom(params)) {
-            return "jpackageapplauncher.exe";
-        } else {
-            return "jpackageapplauncherw.exe";
-        }
-    }
-
-    @Override
-    public void prepareApplicationFiles(Map<String, ? super Object> params)
-            throws IOException {
-        // create the .exe launchers
-        createLauncherForEntryPoint(params, null);
-
-        // copy the jars
-        copyApplication(params);
-
-        // create the additional launcher(s), if any
-        List<Map<String, ? super Object>> entryPoints = ADD_LAUNCHERS.fetchFrom(params);
-        for (Map<String, ? super Object> entryPoint : entryPoints) {
-            createLauncherForEntryPoint(AddLauncherArguments.merge(params,
-                    entryPoint, ICON.getID(), ICON_ICO.getID()), params);
-        }
-    }
-
-    private void createLauncherForEntryPoint(Map<String, ? super Object> params,
-            Map<String, ? super Object> mainParams) throws IOException {
-
-        var iconResource = createIconResource(TEMPLATE_APP_ICON, ICON_ICO, params,
-                mainParams);
-        Path iconTarget = null;
-        if (iconResource != null) {
-            Path iconDir = StandardBundlerParam.TEMP_ROOT.fetchFrom(params).resolve(
-                    "icons");
-            iconTarget = iconDir.resolve(APP_NAME.fetchFrom(params) + ".ico");
-            if (null == iconResource.saveToFile(iconTarget)) {
-                iconTarget = null;
-            }
-        }
-
-        writeCfgFile(params);
-
-        // Copy executable to bin folder
-        Path executableFile = appLayout.launchersDirectory().resolve(
-                getLauncherName(params));
-
-        try (InputStream is_launcher =
-                getResourceAsStream(getLauncherResourceName(params))) {
-            writeEntry(is_launcher, executableFile);
-        }
-
-        // Update branding of launcher executable
-        new ExecutableRebrander().rebrandLauncher(params, iconTarget, executableFile);
-
-        executableFile.toFile().setExecutable(true);
-        executableFile.toFile().setReadOnly();
-    }
-}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
index 1b6c2178ca2..7e400c5be29 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
@@ -25,14 +25,18 @@
 
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.WinLauncher;
+import jdk.jpackage.internal.model.WinMsiPackage;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.DottedVersion;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.util.PathGroup;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.nio.file.Files;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -42,9 +46,11 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toMap;
 import java.util.stream.Stream;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -54,105 +60,85 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
-import jdk.jpackage.internal.util.XmlConsumer;
-import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
-import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
-import static jdk.jpackage.internal.StandardBundlerParam.VENDOR;
-import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
-import static jdk.jpackage.internal.WinMsiBundler.MSI_SYSTEM_WIDE;
-import static jdk.jpackage.internal.WinMsiBundler.SERVICE_INSTALLER;
-import static jdk.jpackage.internal.WinMsiBundler.WIN_APP_IMAGE;
+import static jdk.jpackage.internal.util.CollectionUtils.toCollection;
+import jdk.jpackage.internal.model.WinLauncherMixin.WinShortcut;
 import jdk.jpackage.internal.WixToolset.WixToolsetType;
-import jdk.jpackage.internal.model.DottedVersion;
-import jdk.jpackage.internal.util.PathGroup;
+import jdk.jpackage.internal.model.AppImageLayout;
+import jdk.jpackage.internal.model.FileAssociation;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.XmlUtils;
+import jdk.jpackage.internal.util.XmlConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import org.w3c.dom.NodeList;
 
 /**
  * Creates WiX fragment with components for contents of app image.
  */
-class WixAppImageFragmentBuilder extends WixFragmentBuilder {
+final class WixAppImageFragmentBuilder extends WixFragmentBuilder {
 
     @Override
-    void initFromParams(Map<String, ? super Object> params) {
-        super.initFromParams(params);
-
-        Path appImageRoot = WIN_APP_IMAGE.fetchFrom(params);
+    void initFromParams(BuildEnv env, WinMsiPackage pkg) {
+        super.initFromParams(env, pkg);
 
-        Supplier<ApplicationLayout> appImageSupplier = () -> {
-            if (StandardBundlerParam.isRuntimeInstaller(params)) {
-                return ApplicationLayout.javaRuntime();
-            } else {
-                return ApplicationLayout.platformAppImage();
-            }
-        };
+        Path appImageRoot = env.appImageDir();
 
-        systemWide = MSI_SYSTEM_WIDE.fetchFrom(params);
+        systemWide = pkg.isSystemWideInstall();
 
         registryKeyPath = Path.of("Software",
-                VENDOR.fetchFrom(params),
-                APP_NAME.fetchFrom(params),
-                VERSION.fetchFrom(params)).toString();
+                pkg.app().vendor(),
+                pkg.app().name(),
+                pkg.version()).toString();
 
         installDir = (systemWide ? PROGRAM_FILES : LOCAL_PROGRAM_FILES).resolve(
-                WINDOWS_INSTALL_DIR.fetchFrom(params));
-
-        do {
-            ApplicationLayout layout = appImageSupplier.get();
-            // Don't want AppImageFile.FILENAME in installed application.
-            new InstallableFile(AppImageFile.getPathInAppImage(Path.of("")),
-                    null).excludeFromApplicationLayout(layout);
+                pkg.relativeInstallDir());
 
-            // Want absolute paths to source files in generated WiX sources.
-            // This is to handle scenario if sources would be processed from
-            // different current directory.
-            appImage = layout.resolveAt(appImageRoot.toAbsolutePath().normalize());
-        } while (false);
+        // Want absolute paths to source files in generated WiX sources.
+        // This is to handle scenario if sources would be processed from
+        // different current directory.
+        initAppImageLayouts(pkg.appImageLayout(), appImageRoot.toAbsolutePath().normalize());
 
-        installedAppImage = appImageSupplier.get().resolveAt(INSTALLDIR);
+        launchers = toCollection(pkg.app().launchers());
 
-        shortcutFolders = Stream.of(ShortcutsFolder.values()).filter(
-                shortcutFolder -> shortcutFolder.requested(params)).collect(
-                        Collectors.toSet());
-
-        if (StandardBundlerParam.isRuntimeInstaller(params)) {
-            launchers = Collections.emptyList();
-        } else {
-            launchers = AppImageFile.getLaunchers(appImageRoot, params);
-        }
+        shortcutFolders = ShortcutsFolder.getForPackage(pkg);
 
         launchersAsServices = launchers.stream()
-                .filter(LauncherInfo::isService)
+                .filter(Launcher::isService)
                 .map(launcher -> {
-                    var launcherPath = addExeSuffixToPath(
-                    installedAppImage.launchersDirectory().resolve(
-                            launcher.getName()));
+                    var launcherPath = installedAppImage.launchersDirectory().resolve(
+                            launcher.executableNameWithSuffix());
                     var id = Id.File.of(launcherPath);
-                    return new WixLauncherAsService(launcher.getName(), params)
+                    return new WixLauncherAsService(pkg.app(), launcher, env::createResource)
                             .setLauncherInstallPath(toWixPath(launcherPath))
                             .setLauncherInstallPathId(id);
                 }).toList();
 
         if (!launchersAsServices.isEmpty()) {
-            serviceInstaller = SERVICE_INSTALLER.fetchFrom(params);
             // Service installer tool will be installed in launchers directory
+            final var serviceInstallerPath = pkg.serviceInstaller().orElseThrow();
             serviceInstaller = new InstallableFile(
-                    serviceInstaller.srcPath().toAbsolutePath().normalize(),
+                    serviceInstallerPath.toAbsolutePath().normalize(),
                     installedAppImage.launchersDirectory().resolve(
-                            serviceInstaller.installPath()));
+                            serviceInstallerPath.getFileName()));
         }
 
-        programMenuFolderName = MENU_GROUP.fetchFrom(params);
+        programMenuFolderName = pkg.startMenuGroupName();
 
-        initFileAssociations(params);
+        if (!pkg.isRuntimeInstaller()) {
+            packageFile = new PackageFile(pkg.packageName());
+        } else {
+            packageFile = null;
+        }
+
+        initFileAssociations();
     }
 
     @Override
     void addFilesToConfigRoot() throws IOException {
         removeFolderItems = new HashMap<>();
         defaultedMimes = new HashSet<>();
+        if (packageFile != null) {
+            packageFile.save(ApplicationLayout.build().setAll(getConfigRoot()).create());
+        }
         super.addFilesToConfigRoot();
     }
 
@@ -187,47 +173,43 @@ protected Collection<XmlConsumer> getFragmentWriters() {
         );
     }
 
-    private void normalizeFileAssociation(FileAssociation fa) {
-        fa.launcherPath = addExeSuffixToPath(
-                installedAppImage.launchersDirectory().resolve(fa.launcherPath));
-
-        if (fa.iconPath != null && !Files.exists(fa.iconPath)) {
-            fa.iconPath = null;
-        }
-
-        if (fa.iconPath != null) {
-            fa.iconPath = fa.iconPath.toAbsolutePath();
-        }
-
-        // Filter out empty extensions.
-        fa.extensions = fa.extensions.stream().filter(Predicate.not(
-                String::isEmpty)).toList();
-    }
-
-    private static Path addExeSuffixToPath(Path path) {
-        return PathUtils.addSuffix(path, ".exe");
-    }
-
     private Path getInstalledFaIcoPath(FileAssociation fa) {
-        String fname = String.format("fa_%s.ico", String.join("_", fa.extensions));
-        return installedAppImage.destktopIntegrationDirectory().resolve(fname);
+        String fname = String.format("fa_%s.ico", fa.extension());
+        return installedAppImage.desktopIntegrationDirectory().resolve(fname);
     }
 
-    private void initFileAssociations(Map<String, ? super Object> params) {
-        associations = FileAssociation.fetchFrom(params).stream()
-                .peek(this::normalizeFileAssociation)
-                // Filter out file associations without extensions.
-                .filter(fa -> !fa.extensions.isEmpty())
-                .toList();
+    private void initFileAssociations() {
+        associations = launchers.stream().collect(toMap(
+                Launcher::executableNameWithSuffix,
+                WinLauncher::fileAssociations));
 
-        associations.stream().filter(fa -> fa.iconPath != null).forEach(fa -> {
+        associations.values().stream().flatMap(List::stream).filter(FileAssociation::hasIcon).toList().forEach(fa -> {
             // Need to add fa icon in the image.
             Object key = new Object();
-            appImage.pathGroup().setPath(key, fa.iconPath);
-            installedAppImage.pathGroup().setPath(key, getInstalledFaIcoPath(fa));
+            appImagePathGroup.setPath(key, fa.icon().orElseThrow().toAbsolutePath().normalize());
+            installedAppImagePathGroup.setPath(key, getInstalledFaIcoPath(fa));
         });
     }
 
+    private void initAppImageLayouts(AppImageLayout appImageLayout, Path appImageRoot) {
+        var srcAppImageLayout = appImageLayout.resolveAt(appImageRoot);
+
+        var installedAppImageLayout = appImageLayout.resolveAt(INSTALLDIR);
+
+        appImagePathGroup = AppImageLayout.toPathGroup(srcAppImageLayout);
+        installedAppImagePathGroup = AppImageLayout.toPathGroup(installedAppImageLayout);
+
+        if (srcAppImageLayout instanceof ApplicationLayout appLayout) {
+            // Don't want app image info file in installed application.
+            var appImageFile = AppImageFile.getPathInAppImage(appLayout);
+            appImagePathGroup.ghostPath(appImageFile);
+
+            installedAppImage = (ApplicationLayout)installedAppImageLayout;
+        } else {
+            installedAppImage = null;
+        }
+    }
+
     private static UUID createNameUUID(String str) {
         return UUID.nameUUIDFromBytes(str.getBytes(StandardCharsets.UTF_8));
     }
@@ -376,8 +358,7 @@ private static void addComponentGroup(XMLStreamWriter xml, String id,
             List<String> componentIds) throws XMLStreamException, IOException {
         xml.writeStartElement("ComponentGroup");
         xml.writeAttribute("Id", id);
-        componentIds = componentIds.stream().filter(Objects::nonNull).collect(
-                Collectors.toList());
+        componentIds = componentIds.stream().filter(Objects::nonNull).toList();
         for (var componentId : componentIds) {
             xml.writeStartElement("ComponentRef");
             xml.writeAttribute("Id", componentId);
@@ -469,8 +450,11 @@ private void addFaComponentGroup(XMLStreamWriter xml)
             throws XMLStreamException, IOException {
 
         List<String> componentIds = new ArrayList<>();
-        for (var fa : associations) {
-            componentIds.addAll(addFaComponents(xml, fa));
+        for (var entry : associations.entrySet()) {
+            var launcherExe = entry.getKey();
+            for (var fa : entry.getValue()) {
+                componentIds.add(addFaComponent(xml, launcherExe, fa));
+            }
         }
         addComponentGroup(xml, "FileAssociations", componentIds);
     }
@@ -481,16 +465,11 @@ private void addShortcutComponentGroup(XMLStreamWriter xml) throws
         Set<Path> defineShortcutFolders = new HashSet<>();
         for (var launcher : launchers) {
             for (var folder : shortcutFolders) {
-                Path launcherPath = addExeSuffixToPath(installedAppImage
-                        .launchersDirectory().resolve(launcher.getName()));
-
-                if ((launcher.isMenu() &&
-                        (folder.equals(ShortcutsFolder.ProgramMenu))) ||
-                    (launcher.isShortcut() &&
-                        (folder.equals(ShortcutsFolder.Desktop)))) {
+                Path launcherPath = installedAppImage.launchersDirectory().resolve(
+                        launcher.executableNameWithSuffix());
 
-                    String componentId = addShortcutComponent(xml, launcherPath,
-                            folder);
+                if (folder.isRequestedFor(launcher)) {
+                    String componentId = addShortcutComponent(xml, launcherPath, folder);
 
                     if (componentId != null) {
                         Path folderPath = folder.getPath(this);
@@ -540,51 +519,44 @@ private String addShortcutComponent(XMLStreamWriter xml, Path launcherPath,
         });
     }
 
-    private List<String> addFaComponents(XMLStreamWriter xml,
-            FileAssociation fa) throws XMLStreamException, IOException {
-        List<String> components = new ArrayList<>();
-        for (var extension: fa.extensions) {
-            Path path = INSTALLDIR.resolve(String.format("%s_%s", extension,
-                    fa.launcherPath.getFileName()));
-            components.add(addComponent(xml, path, Component.ProgId, unused -> {
-                xml.writeAttribute("Description", fa.description);
-
-                if (fa.iconPath != null) {
-                    xml.writeAttribute("Icon", Id.File.of(getInstalledFaIcoPath(
-                            fa)));
-                    xml.writeAttribute("IconIndex", "0");
-                }
+    private String addFaComponent(XMLStreamWriter xml,
+            String launcherExe, FileAssociation fa) throws
+            XMLStreamException, IOException {
 
-                xml.writeStartElement("Extension");
-                xml.writeAttribute("Id", extension);
-                xml.writeAttribute("Advertise", "no");
+        Path path = INSTALLDIR.resolve(String.format("%s_%s", fa.extension(), launcherExe));
+        return addComponent(xml, path, Component.ProgId, unused -> {
+            xml.writeAttribute("Description", fa.description().orElseThrow());
 
-                var mimeIt = fa.mimeTypes.iterator();
-                if (mimeIt.hasNext()) {
-                    String mime = mimeIt.next();
-                    xml.writeAttribute("ContentType", mime);
+            if (fa.hasIcon()) {
+                xml.writeAttribute("Icon", Id.File.of(getInstalledFaIcoPath(fa)));
+                xml.writeAttribute("IconIndex", "0");
+            }
 
-                    if (!defaultedMimes.contains(mime)) {
-                        xml.writeStartElement("MIME");
-                        xml.writeAttribute("ContentType", mime);
-                        xml.writeAttribute("Default", "yes");
-                        xml.writeEndElement();
-                        defaultedMimes.add(mime);
-                    }
-                }
+            xml.writeStartElement("Extension");
+            xml.writeAttribute("Id", fa.extension());
+            xml.writeAttribute("Advertise", "no");
 
-                xml.writeStartElement("Verb");
-                xml.writeAttribute("Id", "open");
-                xml.writeAttribute("Command", "!(loc.ContextMenuCommandLabel)");
-                xml.writeAttribute("Argument", "\"%1\" %*");
-                xml.writeAttribute("TargetFile", Id.File.of(fa.launcherPath));
-                xml.writeEndElement(); // <Verb>
+            var mime = fa.mimeType();
+            xml.writeAttribute("ContentType", mime);
 
-                xml.writeEndElement(); // <Extension>
-            }));
-        }
+            if (!defaultedMimes.contains(mime)) {
+                xml.writeStartElement("MIME");
+                xml.writeAttribute("ContentType", mime);
+                xml.writeAttribute("Default", "yes");
+                xml.writeEndElement();
+                defaultedMimes.add(mime);
+            }
 
-        return components;
+            xml.writeStartElement("Verb");
+            xml.writeAttribute("Id", "open");
+            xml.writeAttribute("Command", "!(loc.ContextMenuCommandLabel)");
+            xml.writeAttribute("Argument", "\"%1\" %*");
+            xml.writeAttribute("TargetFile", Id.File.of(
+                    installedAppImage.launchersDirectory().resolve(launcherExe)));
+            xml.writeEndElement(); // <Verb>
+
+            xml.writeEndElement(); // <Extension>
+        });
     }
 
     private List<String> addRootBranch(XMLStreamWriter xml, Path path)
@@ -629,7 +601,8 @@ private List<String> addRootBranch(XMLStreamWriter xml, Path path)
         return List.of();
     }
 
-    private void startDirectoryElement(XMLStreamWriter xml, String wix3ElementName, Path path) throws XMLStreamException {
+    private void startDirectoryElement(XMLStreamWriter xml,
+            String wix3ElementName, Path path) throws XMLStreamException {
         final String elementName;
         switch (getWixType()) {
             case Wix3 -> {
@@ -670,7 +643,7 @@ private List<String> addDirectoryHierarchy(XMLStreamWriter xml)
 
         Set<Path> allDirs = new HashSet<>();
         Set<Path> emptyDirs = new HashSet<>();
-        appImage.transform(installedAppImage, new PathGroup.TransformHandler() {
+        appImagePathGroup.transform(installedAppImagePathGroup, new PathGroup.TransformHandler() {
             @Override
             public void copyFile(Path src, Path dst) throws IOException {
                 Path dir = dst.getParent();
@@ -694,6 +667,11 @@ public void createDirectory(final Path dir) throws IOException {
             }
         });
 
+        // The installed "app" directory is never empty as it contains at least ".package" file.
+        // However, the "app" directory in the source app image can be empty because the ".package"
+        // file is picked from the build config directory, not from the source app image.
+        Optional.ofNullable(installedAppImage).map(ApplicationLayout::appDirectory).ifPresent(emptyDirs::remove);
+
         List<String> componentIds = new ArrayList<>();
         for (var dir : emptyDirs) {
             componentIds.add(addComponent(xml, dir, Component.CreateFolder,
@@ -731,15 +709,11 @@ private void addFilesComponentGroup(XMLStreamWriter xml)
             throws XMLStreamException, IOException {
 
         List<Map.Entry<Path, Path>> files = new ArrayList<>();
-        appImage.transform(installedAppImage, new PathGroup.TransformHandler() {
+        appImagePathGroup.transform(installedAppImagePathGroup, new PathGroup.TransformHandler() {
             @Override
             public void copyFile(Path src, Path dst) throws IOException {
                 files.add(Map.entry(src, dst));
             }
-
-            @Override
-            public void createDirectory(final Path dir) throws IOException {
-            }
         });
 
         if (serviceInstaller != null) {
@@ -747,6 +721,14 @@ public void createDirectory(final Path dir) throws IOException {
                     serviceInstaller.installPath()));
         }
 
+        if (packageFile != null) {
+            files.add(Map.entry(
+                    PackageFile.getPathInAppImage(
+                            ApplicationLayout.build().setAll(
+                                    getConfigRoot().toAbsolutePath().normalize()).create()),
+                    PackageFile.getPathInAppImage(installedAppImage)));
+        }
+
         List<String> componentIds = new ArrayList<>();
         for (var file : files) {
             Path src = file.getKey();
@@ -814,22 +796,15 @@ private List<String> addServiceConfigs(XMLStreamWriter xml) throws
     private void addIcons(XMLStreamWriter xml) throws
             XMLStreamException, IOException {
 
-        PathGroup srcPathGroup = appImage.pathGroup();
-        PathGroup dstPathGroup = installedAppImage.pathGroup();
-
         // Build list of copy operations for all .ico files in application image
         List<Map.Entry<Path, Path>> icoFiles = new ArrayList<>();
-        srcPathGroup.transform(dstPathGroup, new PathGroup.TransformHandler() {
+        appImagePathGroup.transform(installedAppImagePathGroup, new PathGroup.TransformHandler() {
             @Override
             public void copyFile(Path src, Path dst) throws IOException {
                 if (IOUtils.getFileName(src).toString().endsWith(".ico")) {
                     icoFiles.add(Map.entry(src, dst));
                 }
             }
-
-            @Override
-            public void createDirectory(Path dst) throws IOException {
-            }
         });
 
         for (var icoFile : icoFiles) {
@@ -931,22 +906,15 @@ private static IllegalArgumentException throwInvalidPathException(Path v) {
     }
 
     enum ShortcutsFolder {
-        ProgramMenu(PROGRAM_MENU_PATH, Arguments.CLIOptions.WIN_MENU_HINT,
+        ProgramMenu(PROGRAM_MENU_PATH, WinShortcut.WIN_SHORTCUT_START_MENU,
                 "JP_INSTALL_STARTMENU_SHORTCUT", "JpStartMenuShortcutPrompt"),
-        Desktop(DESKTOP_PATH, Arguments.CLIOptions.WIN_SHORTCUT_HINT,
+        Desktop(DESKTOP_PATH, WinShortcut.WIN_SHORTCUT_DESKTOP,
                 "JP_INSTALL_DESKTOP_SHORTCUT", "JpDesktopShortcutPrompt");
 
-        private ShortcutsFolder(Path root, Arguments.CLIOptions cliOption,
+        private ShortcutsFolder(Path root, WinShortcut shortcutId,
                 String property, String wixVariableName) {
             this.root = root;
-            this.bundlerParam = new StandardBundlerParam<>(
-                    cliOption.getId(),
-                    Boolean.class,
-                    params -> false,
-                    // valueOf(null) is false,
-                    // and we actually do want null in some cases
-                    (s, p) -> (s == null || "null".equalsIgnoreCase(s)) ? false : Boolean.valueOf(s)
-            );
+            this.shortcutId = shortcutId;
             this.wixVariableName = wixVariableName;
             this.property = property;
         }
@@ -958,18 +926,28 @@ Path getPath(WixAppImageFragmentBuilder outer) {
             return root;
         }
 
-        boolean requested(Map<String, ? super Object> params) {
-            return bundlerParam.fetchFrom(params);
+        boolean isRequestedFor(WinLauncher launcher) {
+            return launcher.shortcuts().contains(shortcutId);
         }
 
         String getWixVariableName() {
             return wixVariableName;
         }
 
+        static Set<ShortcutsFolder> getForPackage(WinMsiPackage pkg) {
+            var launchers = Optional.ofNullable(pkg.app().launchers()).map(
+                    List::stream).orElseGet(Stream::of);
+            return launchers.map(launcher -> {
+                return Stream.of(ShortcutsFolder.values()).filter(shortcutsFolder -> {
+                    return shortcutsFolder.isRequestedFor((WinLauncher)launcher);
+                });
+            }).flatMap(Function.identity()).collect(Collectors.toSet());
+        }
+
         private final Path root;
         private final String property;
         private final String wixVariableName;
-        private final StandardBundlerParam<Boolean> bundlerParam;
+        private final WinShortcut shortcutId;
     }
 
     private boolean systemWide;
@@ -980,22 +958,26 @@ String getWixVariableName() {
 
     private String programMenuFolderName;
 
-    private List<FileAssociation> associations;
+    private Map<String, List<FileAssociation>> associations;
 
     private Set<ShortcutsFolder> shortcutFolders;
 
-    private List<LauncherInfo> launchers;
+    private List<WinLauncher> launchers;
 
     private List<WixLauncherAsService> launchersAsServices;
 
     private InstallableFile serviceInstaller;
 
-    private ApplicationLayout appImage;
     private ApplicationLayout installedAppImage;
 
+    private PathGroup appImagePathGroup;
+    private PathGroup installedAppImagePathGroup;
+
     private Map<Path, Integer> removeFolderItems;
     private Set<String> defaultedMimes;
 
+    private PackageFile packageFile;
+
     private static final Path TARGETDIR = Path.of("TARGETDIR");
 
     private static final Path INSTALLDIR = Path.of("INSTALLDIR");
@@ -1020,38 +1002,4 @@ String getWixVariableName() {
 
     private static final Set<Path> USER_PROFILE_DIRS = Set.of(LOCAL_PROGRAM_FILES,
             PROGRAM_MENU_PATH, DESKTOP_PATH);
-
-    private static final StandardBundlerParam<String> MENU_GROUP =
-            new StandardBundlerParam<>(
-                    Arguments.CLIOptions.WIN_MENU_GROUP.getId(),
-                    String.class,
-                    params -> I18N.getString("param.menu-group.default"),
-                    (s, p) -> s
-            );
-
-    private static final BundlerParamInfo<String> WINDOWS_INSTALL_DIR =
-            new StandardBundlerParam<>(
-            "windows-install-dir",
-            String.class,
-            params -> {
-                 String dir = INSTALL_DIR.fetchFrom(params);
-                 if (dir != null) {
-                     if (dir.contains(":") || dir.contains("..")) {
-                         Log.error(MessageFormat.format(I18N.getString(
-                                "message.invalid.install.dir"), dir,
-                                APP_NAME.fetchFrom(params)));
-                     } else {
-                        if (dir.startsWith("\\")) {
-                             dir = dir.substring(1);
-                        }
-                        if (dir.endsWith("\\")) {
-                             dir = dir.substring(0, dir.length() - 1);
-                        }
-                        return dir;
-                     }
-                 }
-                 return APP_NAME.fetchFrom(params); // Default to app name
-             },
-            (s, p) -> s
-    );
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java
index 8b230776822..4d180a94871 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java
@@ -38,12 +38,11 @@
 import java.util.regex.Pattern;
 import javax.xml.stream.XMLStreamWriter;
 import jdk.jpackage.internal.util.XmlConsumer;
-import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT;
 import jdk.internal.util.Architecture;
-import static jdk.jpackage.internal.OverridableResource.createResource;
 import jdk.jpackage.internal.WixSourceConverter.ResourceGroup;
 import jdk.jpackage.internal.WixToolset.WixToolsetType;
 import jdk.jpackage.internal.model.DottedVersion;
+import jdk.jpackage.internal.model.WinMsiPackage;
 import jdk.jpackage.internal.util.XmlUtils;
 
 /**
@@ -66,11 +65,11 @@ final void setDefaultResourceName(String v) {
         defaultResourceName = v;
     }
 
-    void initFromParams(Map<String, ? super Object> params) {
+    void initFromParams(BuildEnv env, WinMsiPackage pkg) {
         wixVariables = null;
         additionalResources = null;
-        configRoot = CONFIG_ROOT.fetchFrom(params);
-        fragmentResource = createResource(defaultResourceName, params).setPublicName(outputFileName);
+        configRoot = env.configDir();
+        fragmentResource = env.createResource(defaultResourceName).setPublicName(outputFileName);
     }
 
     List<String> getLoggableWixFeatures() {
@@ -121,7 +120,7 @@ protected static enum WixNamespace {
         Util;
     }
 
-    final protected Map<WixNamespace, String> getWixNamespaces() {
+    protected final Map<WixNamespace, String> getWixNamespaces() {
         switch (wixType) {
             case Wix3 -> {
                 return Map.of(WixNamespace.Default,
@@ -146,24 +145,24 @@ static boolean is64Bit() {
         return Architecture.is64bit();
     }
 
-    final protected Path getConfigRoot() {
+    protected final Path getConfigRoot() {
         return configRoot;
     }
 
     protected abstract Collection<XmlConsumer> getFragmentWriters();
 
-    final protected void defineWixVariable(String variableName) {
+    protected final void defineWixVariable(String variableName) {
         setWixVariable(variableName, "yes");
     }
 
-    final protected void setWixVariable(String variableName, String variableValue) {
+    protected final void setWixVariable(String variableName, String variableValue) {
         if (wixVariables == null) {
             wixVariables = new WixVariables();
         }
         wixVariables.setWixVariable(variableName, variableValue);
     }
 
-    final protected void addResource(OverridableResource resource, String saveAsName) {
+    protected final void addResource(OverridableResource resource, String saveAsName) {
         if (additionalResources == null) {
             additionalResources = new ResourceGroup(getWixType());
         }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
index ffd5e35b15c..3d990b990c2 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.function.Function;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
@@ -38,7 +38,8 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import static jdk.jpackage.internal.OverridableResource.createResource;
+import jdk.jpackage.internal.model.WinApplication;
+import jdk.jpackage.internal.model.WinLauncher;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -47,12 +48,12 @@
 
 class WixLauncherAsService extends LauncherAsService {
 
-    WixLauncherAsService(String name, Map<String, ? super Object> mainParams) {
-        super(name, mainParams,
-                createResource("service-install.wxi", mainParams).setCategory(
+    WixLauncherAsService(WinApplication app, WinLauncher launcher, Function<String, OverridableResource> createResource) {
+        super(app, launcher,
+                createResource.apply("service-install.wxi").setCategory(
                         I18N.getString("resource.launcher-as-service-wix-file")));
 
-        serviceConfigResource = createResource("service-config.wxi", mainParams).setCategory(
+        serviceConfigResource = createResource.apply("service-config.wxi").setCategory(
                 I18N.getString("resource.launcher-as-service-wix-file"));
 
         addSubstitutionDataEntry("SERVICE_NAME", getName());
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourceConverter.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourceConverter.java
index 86ef70442dc..e8f0eef5e6e 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourceConverter.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourceConverter.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
@@ -52,6 +52,7 @@
 import javax.xml.transform.stax.StAXResult;
 import javax.xml.transform.stream.StreamSource;
 import jdk.jpackage.internal.WixToolset.WixToolsetType;
+import jdk.jpackage.internal.resources.ResourceLocator;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -70,7 +71,7 @@ enum Status {
     WixSourceConverter(Path resourceDir) throws IOException {
         var buf = new ByteArrayOutputStream();
 
-        new OverridableResource("wix3-to-wix4-conv.xsl")
+        new OverridableResource("wix3-to-wix4-conv.xsl", ResourceLocator.class)
                 .setPublicName("wix-conv.xsl")
                 .setResourceDir(resourceDir)
                 .setCategory(I18N.getString("resource.wix-src-conv"))
@@ -160,7 +161,7 @@ private static byte[] saveResourceInMemory(OverridableResource resource) throws
         return buf.toByteArray();
     }
 
-    final static class ResourceGroup {
+    static final class ResourceGroup {
 
         ResourceGroup(WixToolsetType wixToolsetType) {
             this.wixToolsetType = wixToolsetType;
@@ -415,7 +416,7 @@ private Map.Entry<String, Boolean> createValue(Object prefix) {
     private final XMLOutputFactory outputFactory;
 
     // The list of WiX v3 namespaces this converter can handle
-    private final static Set<String> KNOWN_NAMESPACES = Set.of(
+    private static final Set<String> KNOWN_NAMESPACES = Set.of(
             "http://schemas.microsoft.com/wix/2006/localization",
             "http://schemas.microsoft.com/wix/2006/wi");
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java
index 25db6e6ab0b..a00eb16a4a9 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.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
@@ -24,6 +24,7 @@
  */
 package jdk.jpackage.internal;
 
+import jdk.jpackage.internal.model.WinMsiPackage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -36,14 +37,12 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Stream;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
-import jdk.jpackage.internal.util.XmlConsumer;
-import static jdk.jpackage.internal.OverridableResource.createResource;
-import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE;
 import jdk.jpackage.internal.WixAppImageFragmentBuilder.ShortcutsFolder;
 import jdk.jpackage.internal.WixToolset.WixToolsetType;
+import jdk.jpackage.internal.resources.ResourceLocator;
+import jdk.jpackage.internal.util.XmlConsumer;
 
 /**
  * Creates UI WiX fragment.
@@ -51,31 +50,26 @@
 final class WixUiFragmentBuilder extends WixFragmentBuilder {
 
     @Override
-    void initFromParams(Map<String, ? super Object> params) {
-        super.initFromParams(params);
+    void initFromParams(BuildEnv env, WinMsiPackage pkg) {
+        super.initFromParams(env, pkg);
 
-        String licenseFile = LICENSE_FILE.fetchFrom(params);
-        withLicenseDlg = licenseFile != null;
+        withLicenseDlg = pkg.licenseFile().isPresent();
         if (withLicenseDlg) {
-            Path licenseFileName = IOUtils.getFileName(Path.of(licenseFile));
+            Path licenseFileName = pkg.licenseFile().orElseThrow().getFileName();
             Path destFile = getConfigRoot().resolve(licenseFileName);
             setWixVariable("JpLicenseRtf", destFile.toAbsolutePath().toString());
         }
 
-        withInstallDirChooserDlg = INSTALLDIR_CHOOSER.fetchFrom(params);
+        withInstallDirChooserDlg = pkg.withInstallDirChooser();
 
-        List<ShortcutsFolder> shortcutFolders = Stream.of(
-                ShortcutsFolder.values()).filter(shortcutFolder -> {
-            return shortcutFolder.requested(params)
-                    && SHORTCUT_PROMPT.fetchFrom(params);
-        }).toList();
+        final var shortcutFolders = ShortcutsFolder.getForPackage(pkg);
 
-        withShortcutPromptDlg = !shortcutFolders.isEmpty();
+        withShortcutPromptDlg = !shortcutFolders.isEmpty() && pkg.withShortcutPrompt();
 
         customDialogs = new ArrayList<>();
 
         if (withShortcutPromptDlg) {
-            CustomDialog dialog = new CustomDialog(params, I18N.getString(
+            CustomDialog dialog = new CustomDialog(env::createResource, I18N.getString(
                     "resource.shortcutpromptdlg-wix-file"),
                     "ShortcutPromptDlg.wxs");
             for (var shortcutFolder : shortcutFolders) {
@@ -86,7 +80,7 @@ void initFromParams(Map<String, ? super Object> params) {
         }
 
         if (withInstallDirChooserDlg) {
-            CustomDialog dialog = new CustomDialog(params, I18N.getString(
+            CustomDialog dialog = new CustomDialog(env::createResource, I18N.getString(
                     "resource.installdirnotemptydlg-wix-file"),
                     "InstallDirNotEmptyDlg.wxs");
             List<Dialog> dialogIds = getUI().dialogIdsSupplier.apply(this);
@@ -127,7 +121,7 @@ void addFilesToConfigRoot() throws IOException {
 
         if (withCustomActionsDll) {
             String fname = "wixhelper.dll"; // CA dll
-            try (InputStream is = OverridableResource.readDefault(fname)) {
+            try (InputStream is = ResourceLocator.class.getResourceAsStream(fname)) {
                 Files.copy(is, getConfigRoot().resolve(fname));
             }
         }
@@ -509,12 +503,12 @@ private static void writePublishDialogPair(WixToolsetType wixType, XMLStreamWrit
 
     private final class CustomDialog {
 
-        CustomDialog(Map<String, ? super Object> params, String category,
+        CustomDialog(Function<String, OverridableResource> createResource, String category,
                 String wxsFileName) {
             this.wxsFileName = wxsFileName;
             this.wixVariables = new WixVariables();
 
-            addResource(createResource(wxsFileName, params).setCategory(category).setPublicName(
+            addResource(createResource.apply(wxsFileName).setCategory(category).setPublicName(
                     wxsFileName), wxsFileName);
         }
 
@@ -532,20 +526,4 @@ void addToWixPipeline(WixPipeline.Builder wixPipeline) {
     private boolean withLicenseDlg;
     private boolean withCustomActionsDll = true;
     private List<CustomDialog> customDialogs;
-
-    private static final BundlerParamInfo<Boolean> INSTALLDIR_CHOOSER
-            = new StandardBundlerParam<>(
-                    Arguments.CLIOptions.WIN_DIR_CHOOSER.getId(),
-                    Boolean.class,
-                    params -> false,
-                    (s, p) -> Boolean.valueOf(s)
-            );
-
-    private static final StandardBundlerParam<Boolean> SHORTCUT_PROMPT
-            = new StandardBundlerParam<>(
-                    Arguments.CLIOptions.WIN_SHORTCUT_PROMPT.getId(),
-                    Boolean.class,
-                    params -> false,
-                    (s, p) -> Boolean.valueOf(s)
-            );
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/MsiVersion.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/MsiVersion.java
index f6e0b0f3489..a57ee495ec1 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/MsiVersion.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/MsiVersion.java
@@ -25,7 +25,7 @@
 package jdk.jpackage.internal.model;
 
 import java.math.BigInteger;
-import java.text.MessageFormat;
+import static jdk.jpackage.internal.model.I18N.buildLocalizedException;
 
 
 public final class MsiVersion {
@@ -45,26 +45,29 @@ public static DottedVersion of(String value) {
         BigInteger[] components = ver.getComponents();
 
         if (components.length < 2 || components.length > 4) {
-            throw new IllegalArgumentException(MessageFormat.format(
-                    I18N.getString("error.msi-product-version-components"),
-                    value));
+            throw buildLocalizedException()
+                    .message("error.msi-product-version-components", value)
+                    .create(IllegalArgumentException::new);
         }
 
         if (BigInteger.valueOf(255).compareTo(components[0]) < 0) {
-            throw new IllegalArgumentException(I18N.getString(
-                    "error.msi-product-version-major-out-of-range"));
+            throw buildLocalizedException()
+                    .message("error.msi-product-version-major-out-of-range")
+                    .create(IllegalArgumentException::new);
         }
 
         if (components.length > 1 && BigInteger.valueOf(255).compareTo(
                 components[1]) < 0) {
-            throw new IllegalArgumentException(I18N.getString(
-                    "error.msi-product-version-minor-out-of-range"));
+            throw buildLocalizedException()
+                    .message("error.msi-product-version-minor-out-of-range")
+                    .create(IllegalArgumentException::new);
         }
 
         if (components.length > 2 && BigInteger.valueOf(65535).compareTo(
                 components[2]) < 0) {
-            throw new IllegalArgumentException(I18N.getString(
-                    "error.msi-product-version-build-out-of-range"));
+            throw buildLocalizedException()
+                    .message("error.msi-product-version-build-out-of-range")
+                    .create(IllegalArgumentException::new);
         }
 
         return ver;
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java
new file mode 100644
index 00000000000..65f0f563ee1
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java
@@ -0,0 +1,34 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface WinApplication extends Application, WinApplicationMixin {
+
+    public static WinApplication create(Application app) {
+        return CompositeProxy.create(WinApplication.class, app, new WinApplicationMixin.Stub(app));
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
new file mode 100644
index 00000000000..283b5d84ae3
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
@@ -0,0 +1,36 @@
+/*
+ * 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.model;
+
+public interface WinApplicationMixin {
+
+    DottedVersion winVersion();
+
+    record Stub(DottedVersion winVersion) implements WinApplicationMixin {
+        public Stub(Application app) {
+            this(DottedVersion.greedy(app.version()));
+        }
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackage.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackage.java
new file mode 100644
index 00000000000..6244090b71f
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackage.java
@@ -0,0 +1,51 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+import static jdk.jpackage.internal.model.StandardPackageType.WIN_EXE;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface WinExePackage extends Package, WinExePackageMixin {
+
+    public static WinExePackage create(WinMsiPackage msiPackage, Optional<Path> icon) {
+        return CompositeProxy.create(WinExePackage.class, createExePackage(
+                msiPackage), new WinExePackageMixin.Stub(msiPackage, icon));
+    }
+
+    private static Package createExePackage(WinMsiPackage pkg) {
+        return new Package.Stub(
+                pkg.app(),
+                WIN_EXE,
+                pkg.packageName(),
+                pkg.description(),
+                pkg.version(),
+                pkg.aboutURL(),
+                pkg.licenseFile(),
+                pkg.predefinedAppImage(),
+                pkg.relativeInstallDir());
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackageMixin.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackageMixin.java
new file mode 100644
index 00000000000..766caf1e75d
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackageMixin.java
@@ -0,0 +1,37 @@
+/*
+ * 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+public interface WinExePackageMixin {
+
+    WinMsiPackage msiPackage();
+
+    Optional<Path> icon();
+
+    record Stub(WinMsiPackage msiPackage, Optional<Path> icon) implements WinExePackageMixin {}
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
new file mode 100644
index 00000000000..b10ca99d483
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import static java.util.stream.Collectors.toMap;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Optional;
+import jdk.jpackage.internal.resources.ResourceLocator;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface WinLauncher extends Launcher, WinLauncherMixin {
+
+    @Override
+    default Optional<String> executableSuffix() {
+        return Optional.of(".exe");
+    }
+
+    @Override
+    default InputStream executableResource() {
+        return ResourceLocator.class.getResourceAsStream(
+                isConsole() ? "jpackageapplauncher.exe" : "jpackageapplauncherw.exe");
+    }
+
+    @Override
+    default Map<String, String> extraAppImageFileData() {
+        return shortcuts().stream().collect(toMap(WinShortcut::name, v -> Boolean.toString(true)));
+    }
+
+    public static WinLauncher create(Launcher launcher, WinLauncherMixin mixin) {
+        return CompositeProxy.create(WinLauncher.class, launcher, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncherMixin.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncherMixin.java
new file mode 100644
index 00000000000..65b6a1bab46
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncherMixin.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.util.Set;
+
+public interface WinLauncherMixin {
+
+    boolean isConsole();
+
+    enum WinShortcut {
+        WIN_SHORTCUT_DESKTOP("shortcut"),
+        WIN_SHORTCUT_START_MENU("menu"),
+        ;
+
+        WinShortcut(String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        private final String name;
+    }
+
+    Set<WinShortcut> shortcuts();
+
+    record Stub(boolean isConsole, Set<WinShortcut> shortcuts) implements WinLauncherMixin {
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java
new file mode 100644
index 00000000000..f81cc5eb363
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java
@@ -0,0 +1,36 @@
+/*
+ * 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.model;
+
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface WinMsiPackage extends Package, WinMsiPackageMixin {
+
+    WinApplication app();
+
+    public static WinMsiPackage create(Package pkg, WinMsiPackageMixin mixin) {
+        return CompositeProxy.create(WinMsiPackage.class, pkg, mixin);
+    }
+}
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java
new file mode 100644
index 00000000000..94d7c30fe57
--- /dev/null
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.UUID;
+
+public interface WinMsiPackageMixin {
+
+    DottedVersion msiVersion();
+
+    boolean withInstallDirChooser();
+
+    boolean withShortcutPrompt();
+
+    Optional<String> helpURL();
+
+    Optional<String> updateURL();
+
+    String startMenuGroupName();
+
+    boolean isSystemWideInstall();
+
+    UUID upgradeCode();
+
+    UUID productCode();
+
+    Optional<Path> serviceInstaller();
+
+    record Stub(DottedVersion msiVersion, boolean withInstallDirChooser, boolean withShortcutPrompt,
+            Optional<String> helpURL, Optional<String> updateURL, String startMenuGroupName,
+            boolean isSystemWideInstall, UUID upgradeCode, UUID productCode,
+            Optional<Path> serviceInstaller) implements WinMsiPackageMixin {}
+}
diff --git a/test/jdk/tools/jpackage/clean_stashed_files.sh b/test/jdk/tools/jpackage/clean_stashed_files.sh
new file mode 100644
index 00000000000..28ad42048ac
--- /dev/null
+++ b/test/jdk/tools/jpackage/clean_stashed_files.sh
@@ -0,0 +1,196 @@
+#!/bin/bash
+
+# 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.
+
+#
+# Filters output produced by running jpackage with "jpackage.test.stash-root=<PATH>" property.
+#
+
+set -e
+set -o pipefail
+
+
+declare -a stash_dirs
+if [ $# -eq 0 ]; then
+  stash_dirs=(${0%/*})
+else
+  stash_dirs=($@)
+fi
+
+
+sed_inplace_option=-i
+sed_version_string=$(sed --version 2>&1 | head -1 || true)
+if [ "${sed_version_string#sed (GNU sed)}" != "$sed_version_string" ]; then
+  # GNU sed, the default
+  :
+elif [ "${sed_version_string#sed: illegal option}" != "$sed_version_string" ]; then
+  # Macos sed
+  sed_inplace_option="-i ''"
+else
+  echo 'WARNING: Unknown sed variant, assume it is GNU compatible'
+fi
+
+
+winActions='
+'
+winMsiActions='
+  winMsiRmDotPackage
+  winMsiFilterAppImageListing
+  winMsiFilterUiWxf
+  winMsiFilterBundleWxf
+'
+winAllActions="${winActions} ${winMsiActions}"
+
+macActions='
+  macFormatInfoPlist
+  macFormatEntitlements
+'
+macPkgActions='
+  macPkgFormatCplPlist
+'
+macDmgActions='
+  macDmgFilterScpt
+'
+macAllActions="${macActions} ${macDmgActions} ${macPkgActions}"
+
+linuxActions=
+linuxRpmActions=
+linuxDebActions=
+linuxAllActions="${linuxActions} ${linuxRpmActions} ${linuxDebActions}"
+
+actions='
+  rmPostImageScript
+  sortAppImageListing
+'
+allActions="${actions} ${winAllActions} ${macAllActions} ${linuxAllActions}"
+
+
+rmPostImageScript() {
+  # Remove post-image scripts
+  find "$stash_dir" '(' -name '*-post-image.sh' -o -name '*-post-image.wsf' ')' -type f -exec rm -f {} \;
+}
+
+sortAppImageListing() {
+  # Sort app image listings
+  find "$stash_dir" -name 'app-image-listing.txt' -type f -exec sort -o {} {} \;
+}
+
+
+#
+# MAC:
+#
+
+macFormatInfoPlist() {
+  # Info.plist
+  # - Format
+  find "$stash_dir" -name 'Info.plist' -type f -exec xmllint --output '{}' --format '{}' \;
+}
+
+macFormatEntitlements() {
+  # *.entitlements
+  # - Format
+  find "$stash_dir" -name '*.entitlements' -type f -exec xmllint --output '{}' --format '{}' \;
+}
+
+#
+# DMG:
+#
+
+macDmgFilterScpt() {
+  # *.scpt
+  #  - Trim random absolute temp path
+  #  - Replace "/dmg-workdir/" (new) with "/images/" (old)
+  find "$stash_dir" -name '*.scpt' -type f | xargs -I {} sed $sed_inplace_option \
+      -e 's|"/.*/jdk.jpackage[0-9]\{1,\}/|"/jdk.jpackage/|' \
+      -e 's|"file:///.*/jdk.jpackage[0-9]\{1,\}/|"file:///jdk.jpackage/|' \
+      -e 's|/dmg-workdir/|/images/|' \
+      '{}'
+}
+
+#
+# PKG:
+#
+
+macPkgFormatCplPlist() {
+  # cpl.plist:
+  # - Format and strip <!DOCTYPE ...> (old)
+  find "$stash_dir" -name 'cpl.plist' -type f -exec xmllint --output '{}' --dropdtd --format '{}' \;
+}
+
+
+#
+# WIN:
+#
+
+#
+# MSI:
+#
+
+winMsiRmDotPackage() {
+  # .package
+  # - Strip it. Old jpackage created this file in the app image.
+  #   New jpackage creates it in the "config" directory.
+  #   Value is verified in tests, can ignore it here.
+  find "$stash_dir" -name '.package' -type f -exec rm -f {} \;
+}
+
+winMsiFilterAppImageListing() {
+  # app-image-listing.txt:
+  # - Remove "app\.jpackage.xml" and "app\.package" entries. The new jpackage doesn't create them in the app image
+  find "$stash_dir" -path '*msi/*/app-image-listing.txt' -type f | xargs -I {} sed $sed_inplace_option \
+      -e '/^app\\\.package[\r]\{0,\}$/d' \
+      -e '/^app\\\.jpackage\.xml[\r]\{0,\}$/d' \
+      '{}'
+}
+
+winMsiFilterUiWxf() {
+  # ui.wxf:
+  # - Order of namespaces is undefined, strip them for simplicity
+  find "$stash_dir" -name 'ui.wxf' -type f | xargs -I {} sed $sed_inplace_option \
+      -e 's|^<Wix[^>]*>|<Wix>|' \
+      '{}'
+}
+
+winMsiFilterBundleWxf() {
+  # bundle.wxf:
+  # - Order of namespaces is undefined, strip them for simplicity (same as with ui.wxf)
+  # - Trim paths down to file names in "Source" attributes.
+  #   They all are different because the new jpackage doesn't copy app images.
+  # - Order of files and directories is undefined, sort xml.
+  #   It turns the file into garbage, but all that matters is that the
+  #   old and the new jpackage variants should produce the same "garbage"
+  find "$stash_dir" -name 'bundle.wxf' -type f | xargs -I {} sed $sed_inplace_option \
+      -e 's|^<Wix[^>]*>|<Wix>|' \
+      -e 's|Source=".*\\\([^\\]\{1,\}\)"|Source="\1"|' \
+      -e 's|Source="\\jdk.jpackage\\images\\win-msi.image\\.*\\app\\\.package"|Source="\\jdk.jpackage\\config\\\.package"|' \
+      '{}'
+  find "$stash_dir" -name 'bundle.wxf' -type f -exec sort -o {} {} \;
+}
+
+
+for stash_dir in "${stash_dirs[@]}"; do
+  printf "In %s:\n" "$stash_dir"
+  for a in ${allActions}; do
+    echo "  $a..."
+    $a
+  done
+done
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 5c89ffdf1f2..801df8624c4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -393,7 +393,13 @@ public static final class PropertyFile {
         PropertyFile(Path path) throws IOException {
             data = Files.readAllLines(path).stream().map(str -> {
                 return str.split("=", 2);
-            }).collect(toMap(tokens -> tokens[0], tokens -> tokens[1], (oldValue, newValue) -> {
+            }).collect(toMap(tokens -> tokens[0], tokens -> {
+                if (tokens.length == 1) {
+                    return "";
+                } else {
+                    return tokens[1];
+                }
+            }, (oldValue, newValue) -> {
                 return newValue;
             }));
         }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
new file mode 100644
index 00000000000..98c79131045
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
@@ -0,0 +1,392 @@
+/*
+ * 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.joining;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+import static jdk.jpackage.test.ApplicationLayout.linuxUsrTreePackageImage;
+import static jdk.jpackage.test.ApplicationLayout.platformAppImage;
+
+import java.io.File;
+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.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.test.JPackageUserScript.WinGlobals;
+
+final class ConfigFilesStasher {
+
+    private enum RootDirExpr {
+        CONFIG_DIR("fs.GetFolder(fs.GetParentFolderName(WScript.ScriptFullName))", "${0%/*}"),
+        IMAGE_DIR("fs.GetFolder(shell.CurrentDirectory)", "${PWD}");
+
+        private RootDirExpr(String jsExpr, String shellExpr) {
+            this.expr = TKit.isWindows() ? jsExpr : shellExpr;
+        }
+
+        String expr() {
+            return expr;
+        }
+
+        SrcPath srcPath(WildcardPath path) {
+            return new SrcPath(this, path);
+        }
+
+        SrcPath srcPath(Path path) {
+            return srcPath(WildcardPath.create(path));
+        }
+
+        private final String expr;
+    }
+
+    private static Path prepareStashDir(JPackageCommand cmd, Path stashRoot) throws IOException {
+        final var pwd = Path.of("").toAbsolutePath();
+        final var absTestWorkDir = TKit.workDir().toAbsolutePath();
+        final var relativeTestWorkDir = pwd.relativize(absTestWorkDir).normalize();
+        if (relativeTestWorkDir.getNameCount() >= absTestWorkDir.getNameCount()) {
+            throw new UnsupportedOperationException();
+        }
+
+        final var stashTestRoot = stashRoot.resolve(relativeTestWorkDir);
+
+        if (!absTestWorkDir.equals(currentTestWorkDir)) {
+            currentTestWorkDir = absTestWorkDir;
+            TKit.deleteDirectoryContentsRecursive(stashTestRoot);
+        }
+
+        final var stashTestBasedir = stashTestRoot.resolve(stashDirBasedir(cmd));
+        Files.createDirectories(stashTestBasedir);
+
+        final var stashDir = TKit.createUniquePath(stashTestBasedir.resolve("item"));
+
+        Files.createDirectories(stashDir);
+
+        return stashDir;
+    }
+
+    private static Path stashDirBasedir(JPackageCommand cmd) {
+        if (cmd.isImagePackageType()) {
+            return Path.of("app-image", OperatingSystem.current().name().toLowerCase());
+        } else {
+            return Path.of(cmd.packageType().getType());
+        }
+    }
+
+    private static void stash(JPackageCommand cmd, Path stashRoot) throws IOException {
+        final var script = createStashScript(cmd,  stashRoot);
+        if (!script.isEmpty()) {
+            if (cmd.isImagePackageType()) {
+                final var stashScript = TKit.createTempFile("stash-script" + JPackageUserScript.scriptFilenameExtension());
+                JPackageUserScript.create(stashScript, script);
+                var pwd = cmd.outputBundle();
+                if (TKit.isWindows()) {
+                    pwd = WindowsHelper.toShortPath(pwd.toAbsolutePath()).orElse(pwd);
+                }
+                Executor.of(shell(), stashScript.toAbsolutePath().toString()).setDirectory(pwd).dumpOutput().execute();
+            } else {
+                JPackageUserScript.POST_IMAGE.create(cmd, script);
+            }
+        }
+    }
+
+    private static List<String> createStashScript(JPackageCommand cmd, Path stashRoot) throws IOException {
+        if ((cmd.packageType() == PackageType.WIN_EXE)) {
+            // Skip for exe, msi is sufficient.
+            return List.of();
+        }
+
+        if (!cmd.isImagePackageType() && Files.exists(setupDirectory(cmd, "--resource-dir").resolve(JPackageUserScript.POST_IMAGE.scriptName(cmd)))) {
+            // The command already has a "post-image" script configured, don't disturb it.
+            return List.of();
+        }
+
+        final var stashDir = prepareStashDir(cmd, stashRoot);
+
+        final List<String> script = new ArrayList<>();
+        if (TKit.isWindows()) {
+            List.of(WinGlobals.JS_LIST_DIR_RECURSIVE, WinGlobals.JS_SHELL, WinGlobals.JS_FS).forEach(v -> {
+                v.appendTo(script::addAll);
+            });
+        } else {
+            script.addAll(List.of("set -e", "set -o pipefail"));
+        }
+
+        script.addAll(listAppImage(stashDir.resolve("app-image-listing.txt")));
+
+        if (!cmd.isImagePackageType()) {
+            script.addAll(copyDirExpr(RootDirExpr.CONFIG_DIR, Path.of(""), stashDir.resolve("config")));
+        }
+
+        if (cmd.packageType() == PackageType.LINUX_DEB) {
+            script.addAll(copyDirExpr(RootDirExpr.IMAGE_DIR, Path.of("DEBIAN"), stashDir.resolve("DEBIAN")));
+        }
+
+        if (cmd.packageType() == PackageType.LINUX_RPM) {
+            script.addAll(copyDirExpr(RootDirExpr.CONFIG_DIR, Path.of("../SPECS"), stashDir.resolve("SPECS")));
+        }
+
+        if (cmd.isRuntime()) {
+            // Runtume packages don't have "Info.plist", though they should. See JDK-8351073
+            return script;
+        }
+
+        final var appLayout = appImageAppLayout(cmd);
+
+        script.addAll(copyFileExpr(RootDirExpr.IMAGE_DIR, WildcardPath.create(appLayout.appDirectory(), "*.cfg"), stashDir.resolve("cfg-files")));
+
+        if (TKit.isLinux()) {
+            for (final var wildcard : List.of("*.desktop", "*-MimeInfo.xml")) {
+                script.addAll(copyFileExpr(RootDirExpr.IMAGE_DIR, WildcardPath.create(appLayout.desktopIntegrationDirectory(), wildcard), stashDir.resolve("desktop")));
+            }
+            if (isWithServices(cmd)) {
+                script.addAll(copyDirExpr(RootDirExpr.IMAGE_DIR, Path.of("lib/systemd/system"), stashDir.resolve("systemd")));
+            }
+        }
+
+        if (cmd.packageType() == PackageType.MAC_PKG) {
+            if (isWithServices(cmd)) {
+                script.addAll(copyDirExpr(RootDirExpr.CONFIG_DIR, Path.of("../services"), stashDir.resolve("services")));
+                script.addAll(copyDirExpr(RootDirExpr.CONFIG_DIR, Path.of("../support"), stashDir.resolve("support")));
+            }
+        }
+
+        if (TKit.isOSX()) {
+            script.addAll(copyFileExpr(RootDirExpr.IMAGE_DIR, WildcardPath.create(appLayout.contentDirectory().resolve("Info.plist")), stashDir.resolve("Info.plist")));
+        }
+
+        return script;
+    }
+
+    private static String shell() {
+        if (OperatingSystem.isWindows()) {
+            return "cscript";
+        }
+        return Optional.ofNullable(System.getenv("SHELL")).orElseGet(() -> "sh");
+    }
+
+    private static ApplicationLayout appImageAppLayout(JPackageCommand cmd) {
+        if (cmd.isRuntime()) {
+            throw new UnsupportedOperationException();
+        }
+
+        if (cmd.isImagePackageType()) {
+            return platformAppImage();
+        }
+
+        if (PackageType.LINUX.contains(cmd.packageType())) {
+            final var installDir = cmd.getArgumentValue("--install-dir");
+            if (Optional.ofNullable(installDir).map(Set.of("/usr", "/usr/local")::contains).orElse(false)) {
+                return linuxUsrTreePackageImage(Path.of("/").relativize(Path.of(installDir)), LinuxHelper.getPackageName(cmd));
+            } else {
+                return platformAppImage().resolveAt(Path.of("/").relativize(cmd.appInstallationDirectory()));
+            }
+        } else {
+            return platformAppImage();
+        }
+    }
+
+    private static boolean isWithServices(JPackageCommand cmd) {
+        boolean[] withServices = new boolean[1];
+        withServices[0] = cmd.hasArgument("--launcher-as-service");
+        if (!withServices[0]) {
+            AdditionalLauncher.forEachAdditionalLauncher(cmd, (launcherName, propertyFilePath) -> {
+                try {
+                    final var launcherAsService = new AdditionalLauncher.PropertyFile(propertyFilePath)
+                            .getPropertyBooleanValue("launcher-as-service").orElse(false);
+                    if (launcherAsService) {
+                        withServices[0] = true;
+                    }
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            });
+        }
+        return withServices[0];
+    }
+
+    private static List<String> listAppImage(Path to) {
+        final var fromPath = RootDirExpr.IMAGE_DIR.srcPath(Path.of(""));
+        if (TKit.isWindows()) {
+            final String toStr = to.toString().replace('\\', '/');
+            return List.of(
+                    String.format("WScript.Echo('Save listing of %s into [%s]')",
+                            fromPath.label(), toStr),
+                    String.format("var o = fs.CreateTextFile('%s', true)", toStr),
+                    String.format("listDir(fs.GetFolder(%s), fs.GetFolder(%s))", fromPath.expr(), fromPath.expr()),
+                    "o.Close()"
+            );
+        } else {
+            return List.of(
+                    String.format("printf 'Save listing of %%s into [%%s]\\n' '%s' '%s'",
+                            fromPath.label(), to),
+                    String.format("(cd %s; find . > '%s')", fromPath.expr(), to)
+            );
+        }
+    }
+
+    private static List<String> copyDirExpr(RootDirExpr root, Path from, Path to) {
+        return copyExpr(root, WildcardPath.create(from), to, new Expr("fs.CopyFolder(%s, '%s')", "cp -R %s '%s'"));
+    }
+
+    private static List<String> copyFileExpr(RootDirExpr root, WildcardPath from, Path to) {
+        return copyExpr(root, from, to, new Expr("fs.CopyFile(%s, '%s')", "cp %s '%s'"));
+    }
+
+    private static List<String> copyExpr(RootDirExpr root, WildcardPath from, Path to, Expr copyFormatExpr) {
+        final String format = new Expr(
+                "WScript.Echo('Copy %s into [%s]')\n%s",
+                "printf 'Copy %%s into [%%s]\\n' '%s' '%s'\n%s"
+        ).value();
+
+        final var toStr = to.toString().replace('\\', '/');
+        final var fromPath = root.srcPath(from);
+
+        final String copyExpr;
+        if (from.wildcardName().isEmpty()) {
+            copyExpr = String.format(copyFormatExpr.value(), fromPath.expr(), toStr);
+        } else {
+            // To copy wildcard names, the destination directory must exist.
+            final var mkdirExpr = (new Expr(
+                    String.format("if (!fs.FolderExists('%s')) fs.CreateFolder('%s')", toStr, toStr),
+                    String.format("mkdir -p '%s'", toStr)
+            ).value());
+
+            final var copyExprBody = Stream.of(
+                    mkdirExpr,
+                    String.format(copyFormatExpr.value(), fromPath.expr(), toStr + '/')
+            ).map(str -> {
+                return "  " + str;
+            }).collect(joining("\n"));
+
+            // Copying will fail for a wildcard expression without matches, make it conditional.
+            copyExpr = new Expr(
+                    String.format("if (fs.FolderExists(%s) || fs.FileExists(%s)) {\n%s\n}", fromPath.expr(), fromPath.expr(), copyExprBody),
+                    String.format("v=$(printf '%%s' %s)\nif [ \"${v%%/'%s'}\" = \"$v\" ]; then\n%s\nfi", fromPath.expr(), from.wildcardName(), copyExprBody)
+            ).value();
+        }
+
+        return List.of(String.format(format, fromPath.label(), toStr, copyExpr));
+    }
+
+    private record WildcardPath(Path basedir, String wildcardName) {
+        WildcardPath {
+            Objects.requireNonNull(basedir);
+            Objects.requireNonNull(wildcardName);
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append(basedir);
+            if (!wildcardName.isEmpty()) {
+                sb.append(File.separator);
+                sb.append(wildcardName);
+            }
+            return sb.toString();
+        }
+
+        static WildcardPath create(Path path) {
+            return new WildcardPath(path, "");
+        }
+
+        static WildcardPath create(Path basedir, String wildcardName) {
+            return new WildcardPath(basedir, wildcardName);
+        }
+    }
+
+    private record Expr(String jsValue, String shellValue) {
+        Expr {
+            Objects.requireNonNull(jsValue);
+            Objects.requireNonNull(shellValue);
+        }
+
+        String value() {
+            if (TKit.isWindows()) {
+                return jsValue;
+            } else {
+                return shellValue;
+            }
+        }
+    }
+
+    private record SrcPath(RootDirExpr root, WildcardPath path) {
+        SrcPath {
+            Objects.requireNonNull(root);
+            if (path.basedir().isAbsolute()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        String label() {
+            if (isPathEmpty()) {
+                return String.format("${%s}", root.name());
+            } else {
+                return String.format("${%s}/%s", root.name(), path.toString().replace('\\', '/'));
+            }
+        }
+
+        String expr() {
+            if (isPathEmpty()) {
+                return new Expr(root.expr(), String.format("\"%s\"", root.expr())).value();
+            } else {
+                final String shellExpr;
+                if (path.wildcardName().isEmpty()) {
+                    shellExpr = String.format("\"%s/%s\"", root.expr(), path);
+                } else {
+                    shellExpr = String.format("\"%s/%s\"/%s", root.expr(), path.basedir(), path.wildcardName());
+                }
+                return new Expr(String.format("%s + '/%s'", root.expr(), path.toString().replace('\\', '/')), shellExpr).value();
+            }
+        }
+
+        private boolean isPathEmpty() {
+            return path.toString().isEmpty();
+        }
+    }
+
+    private static Path setupDirectory(JPackageCommand cmd, String argName) {
+        if (!cmd.hasArgument(argName)) {
+            // Use absolute path as jpackage can be executed in another directory
+            cmd.setArgumentValue(argName, TKit.createTempDirectory("stash-script-resource-dir").toAbsolutePath());
+        }
+
+        return Path.of(cmd.getArgumentValue(argName));
+    }
+
+    private static Path currentTestWorkDir;
+
+    static final Consumer<JPackageCommand> INSTANCE = Optional.ofNullable(TKit.getConfigProperty("stash-root"))
+            .map(Path::of).map(Path::toAbsolutePath).<Consumer<JPackageCommand>>map(stashRoot -> {
+                return toConsumer(cmd -> {
+                    stash(cmd, stashRoot);
+                });
+            }).orElse(cmd -> {});
+}
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 476b6a3ef74..bab752affb8 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -851,6 +851,10 @@ public Executor.Result execute(int expectedExitCode) {
             }
         }
 
+        if (expectedExitCode == 0 && !isImagePackageType()) {
+            ConfigFilesStasher.INSTANCE.accept(this);
+        }
+
         final var copy = new JPackageCommand(this).adjustArgumentsBeforeExecution();
 
         final var directoriesAssert = new ReadOnlyPathsAssert(copy);
@@ -859,6 +863,10 @@ public Executor.Result execute(int expectedExitCode) {
 
         directoriesAssert.updateAndAssert();
 
+        if (expectedExitCode == 0 && isImagePackageType()) {
+            ConfigFilesStasher.INSTANCE.accept(this);
+        }
+
         for (final var outputValidator: outputValidators) {
             outputValidator.accept(result.getOutput().iterator());
         }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
index 8bf4218dd4a..35f1cc7cac5 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
@@ -27,6 +27,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -34,6 +35,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -44,26 +46,48 @@ public enum JPackageUserScript {
     POST_MSI("post-msi");
 
     JPackageUserScript(String suffix) {
+        this.suffix = suffix + scriptFilenameExtension();
+    }
+
+    static String scriptFilenameExtension() {
         if (TKit.isWindows()) {
-            this.suffix = suffix + ".wsf";
+            return ".wsf";
         } else {
-            this.suffix = suffix + ".sh";
+            return ".sh";
         }
     }
 
     public enum WinGlobals {
         JS_SHELL("var shell = new ActiveXObject('WScript.Shell')"),
-        JS_FS("var fs = new ActiveXObject('Scripting.FileSystemObject')");
+        JS_FS("var fs = new ActiveXObject('Scripting.FileSystemObject')"),
+        JS_LIST_DIR_RECURSIVE(List.of(
+                "function listDir (dir, root) {",
+                "    o.WriteLine((root === undefined) ? dir.Path : dir.Path.substring(1 + root.Path.length))",
+                "    for(var e = new Enumerator(dir.Files); !e.atEnd(); e.moveNext()) {",
+                "        o.WriteLine((root === undefined) ? e.item().Path : e.item().Path.substring(1 + root.Path.length))",
+                "    }",
+                "    for(var e = new Enumerator(dir.SubFolders); !e.atEnd(); e.moveNext()) {",
+                "        listDir(e.item(), root)",
+                "    }",
+                "}"));
 
         WinGlobals(String expr) {
+            this(List.of(expr));
+        }
+
+        WinGlobals(List<String> expr) {
             this.expr = expr;
         }
 
-        public String expr() {
+        public List<String> expr() {
             return expr;
         }
 
-        private final String expr;
+        public void appendTo(Consumer<Collection<String>> acc) {
+            acc.accept(expr);
+        }
+
+        private final List<String> expr;
     }
 
     public void create(JPackageCommand cmd, List<String> script) {
@@ -193,8 +217,8 @@ public List<String> createScript() {
             final List<String> script = new ArrayList<>();
 
             if (TKit.isWindows()) {
-                script.add(WinGlobals.JS_SHELL.expr());
-                script.add(WinGlobals.JS_FS.expr());
+                script.addAll(WinGlobals.JS_SHELL.expr());
+                script.addAll(WinGlobals.JS_FS.expr());
             }
 
             script.addAll(envVarNames.stream().sorted().map(envVarName -> {
@@ -240,7 +264,7 @@ public void verify(Map<String, Object> envVarsWithExpectedValues) {
         }
     }
 
-    private void create(Path scriptFilePath, List<String> script) {
+    static void create(Path scriptFilePath, List<String> script) {
         try {
             if (TKit.isWindows()) {
                 XmlUtils.createXml(scriptFilePath, xml -> {
@@ -255,14 +279,18 @@ private void create(Path scriptFilePath, List<String> script) {
             } else {
                 Files.write(scriptFilePath, script);
             }
-            TKit.traceFileContents(scriptFilePath, String.format("[%s] script", name()));
+            TKit.traceFileContents(scriptFilePath, String.format("[%s] script", scriptFilePath.getFileName()));
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
         }
     }
 
+    String scriptName(JPackageCommand cmd) {
+        return String.format("%s-%s", cmd.name(), suffix);
+    }
+
     private Path scriptPath(JPackageCommand cmd) {
-        return Path.of(cmd.getArgumentValue("--resource-dir"), String.format("%s-%s", cmd.name(), suffix));
+        return Path.of(cmd.getArgumentValue("--resource-dir"), scriptName(cmd));
     }
 
     private static PackageTest verifyPackagingDirectories(PackageTest test,
@@ -295,18 +323,11 @@ private static PackageTest verifyPackagingDirectories(PackageTest test,
 
             final List<String> script = new ArrayList<>();
             if (TKit.isWindows()) {
+                List.of(WinGlobals.JS_LIST_DIR_RECURSIVE, WinGlobals.JS_SHELL, WinGlobals.JS_FS).forEach(v -> {
+                    v.appendTo(script::addAll);
+                });
+
                 script.addAll(List.of(
-                        "function listDir (dir) {",
-                        "    o.WriteLine(dir.Path)",
-                        "    for(var e = new Enumerator(dir.Files); !e.atEnd(); e.moveNext()) {",
-                        "        o.WriteLine(e.item().Path)",
-                        "    }",
-                        "    for(var e = new Enumerator(dir.SubFolders); !e.atEnd(); e.moveNext()) {",
-                        "        listDir(e.item())",
-                        "    }",
-                        "}",
-                        WinGlobals.JS_FS.expr(),
-                        WinGlobals.JS_SHELL.expr(),
                         String.format("var o = fs.CreateTextFile('%s', true)", configDirContets.toString().replace('\\', '/')),
                         "var configDir = fs.GetFolder(fs.GetParentFolderName(WScript.ScriptFullName))",
                         "listDir(configDir)",
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 cfed969f4b0..6c424e21d5f 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -293,8 +293,8 @@ static void assertAssert(boolean expectedSuccess, Runnable runnable) {
         }
     }
 
-    private static Path createUniquePath(String defaultName) {
-        return createUniquePath(defaultName, workDir());
+    static Path createUniquePath(Path pathTemplate) {
+        return createUniquePath(pathTemplate.getFileName().toString(), pathTemplate.getParent());
     }
 
     private static Path createUniquePath(String defaultName, Path basedir) {
diff --git a/test/jdk/tools/jpackage/junit/TEST.properties b/test/jdk/tools/jpackage/junit/TEST.properties
index 28bac6ffe4c..34d66c3b8d7 100644
--- a/test/jdk/tools/jpackage/junit/TEST.properties
+++ b/test/jdk/tools/jpackage/junit/TEST.properties
@@ -2,7 +2,6 @@ JUnit.dirs = share
 
 modules=jdk.jpackage/jdk.jpackage.internal:+open \
         jdk.jpackage/jdk.jpackage.internal.model:+open \
+        jdk.jpackage/jdk.jpackage.internal.pipeline:+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
+        jdk.jpackage/jdk.jpackage.internal.util.function:+open
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index 64acd24040e..22c6b09a4a0 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.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,253 +23,259 @@
 
 package jdk.jpackage.internal;
 
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.LinkedHashMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import jdk.jpackage.internal.AppImageFile.LauncherInfo;
+import jdk.jpackage.internal.model.Application;
+import jdk.jpackage.internal.model.ApplicationLaunchers;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.Launcher;
+import jdk.jpackage.internal.model.LauncherStartupInfo;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 
 public class AppImageFileTest {
 
+    static AppImageBuilder build() {
+        return new AppImageBuilder();
+    }
+
+    static class AppImageBuilder {
+
+        AppImageBuilder version(String v) {
+            version = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppImageBuilder launcherName(String v) {
+            launcherName = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppImageBuilder mainClass(String v) {
+            mainClass = Objects.requireNonNull(v);
+            return this;
+        }
+
+        AppImageBuilder addExtra(Map<String, String> v) {
+            extra.putAll(v);
+            return this;
+        }
+
+        AppImageBuilder addExtra(String key, String value) {
+            extra.putAll(Map.of(key, value));
+            return this;
+        }
+
+        AppImageBuilder addlauncher(String name) {
+            return addlauncher(name, false);
+        }
+
+        AppImageBuilder addlauncher(String name, boolean isService) {
+            return addlauncher(name, isService, Map.of());
+        }
+
+        AppImageBuilder addlauncher(String name, boolean isService, Map<String, String> extra) {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(extra);
+            addLauncherInfos.add(new LauncherInfo(name, isService, extra));
+            return this;
+        }
+
+        AppImageBuilder addlauncher(String name, Map<String, String> extra) {
+            return addlauncher(name, false, extra);
+        }
+
+        AppImageFile create() {
+            final var additionalLaunchers = addLauncherInfos.stream().map(li -> {
+                return (Launcher)new Launcher.Stub(li.name(), Optional.empty(),
+                        List.of(), li.service(), null, Optional.empty(), null, li.extra());
+            }).toList();
+
+            final var startupInfo = new LauncherStartupInfo.Stub(mainClass, List.of(), List.of(), List.of());
+            final var mainLauncher = new Launcher.Stub(launcherName, Optional.of(startupInfo),
+                    List.of(), false, null, Optional.empty(), null, Map.of());
+
+            final var app = new Application.Stub(null, null, version, null, null,
+                    Optional.empty(), List.of(), null, Optional.empty(),
+                    new ApplicationLaunchers(mainLauncher, additionalLaunchers).asList(), extra);
+
+            return new AppImageFile(app);
+        }
+
+        void createInDir(Path dir) {
+            final var file = create();
+            final var copy = toSupplier(() -> {
+                file.save(DUMMY_LAYOUT.resolveAt(dir));
+                return AppImageFile.load(dir, DUMMY_LAYOUT);
+            }).get();
+
+            assertEquals(file, copy);
+        }
+
+        private String version = "1.0";
+        private String launcherName = "Foo";
+        private String mainClass = "Main";
+        private Map<String, String> extra = new HashMap<>();
+        private List<LauncherInfo> addLauncherInfos = new ArrayList<>();
+    }
+
     @Test
-    public void testIdentity() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put(Arguments.CLIOptions.NAME.getId(), "Foo");
-        params.put(Arguments.CLIOptions.APPCLASS.getId(), "TestClass");
-        params.put(Arguments.CLIOptions.VERSION.getId(), "2.3");
-        params.put(Arguments.CLIOptions.DESCRIPTION.getId(), "Duck is the King");
-        AppImageFile aif = create(params);
-
-        assertEquals("Foo", aif.getLauncherName());
+    public void testSimple() {
+        build().createInDir(tempFolder);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testExtra(Map<String, String> extra) {
+        build().addExtra(extra).createInDir(tempFolder);
+    }
+
+    private static Stream<Map<String, String>> testExtra() {
+        return Stream.of(Map.of("a", "b"), Map.of("foo", ""));
     }
 
     @Test
-    public void testInvalidCommandLine() throws IOException {
-        // Just make sure AppImageFile will tolerate jpackage params that would
-        // never create app image at both load/save phases.
-        // People would edit this file just because they can.
-        // We should be ready to handle curious minds.
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("invalidParamName", "randomStringValue");
-        params.put(Arguments.CLIOptions.APPCLASS.getId(), "TestClass");
-        params.put(Arguments.CLIOptions.MAIN_JAR.getId(), "test.jar");
-        create(params);
-
-        params = new LinkedHashMap<>();
-        params.put(Arguments.CLIOptions.NAME.getId(), "foo");
-        params.put(Arguments.CLIOptions.APPCLASS.getId(), "TestClass");
-        params.put(Arguments.CLIOptions.VERSION.getId(), "1.0");
-        create(params);
+    public void testAdditionalLaunchers() {
+        build().addlauncher("T")
+                .addlauncher("U", true)
+                .addlauncher("F", Map.of("prop", "one", "prop2", "two", "prop3", ""))
+                .createInDir(tempFolder);
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testInavlidXml(String[] xmlData) throws IOException {
-        Exception ex = assertThrowsExactly(RuntimeException.class, () -> createFromXml(xmlData));
-        assertTrue(ex.getMessage().contains("generated by another jpackage version or malformed"));
-        assertTrue(ex.getMessage().endsWith(".jpackage.xml\""));
+    public void testInavlidXml(List<String> xmlData) throws IOException {
+        assertThrowsExactly(ConfigException.class, () -> createFromXml(xmlData), () -> {
+            return I18N.format("error.invalid-app-image", tempFolder, ".jpackage.xml");
+        });
     }
 
-    private static Stream<org.junit.jupiter.params.provider.Arguments> testInavlidXml() {
-        return Stream.of(
-                makeArguments((Object)new String[] {"<foo/>"}),
-                makeArguments((Object)new String[] {"<jpackage-state/>"}),
-                makeArguments((Object)new String[] {JPACKAGE_STATE_OPEN, "</jpackage-state>"}),
-                makeArguments((Object)new String[] {
-                        JPACKAGE_STATE_OPEN,
-                        "<main-launcher></main-launcher>",
-                        "</jpackage-state>"
-                }),
-                makeArguments((Object)new String[] {
-                        JPACKAGE_STATE_OPEN,
-                        "<main-launcher>Foo</main-launcher>",
-                        "<main-class></main-class>",
-                        "</jpackage-state>"
-                }),
-                makeArguments((Object)new String[] {
-                        JPACKAGE_STATE_OPEN,
-                        "<launcher>A</launcher>",
-                        "<launcher>B</launcher>",
-                        "</jpackage-state>"
-                })
+    private static Stream<List<String>> testInavlidXml() {
+        return Stream.of(List.of("<foo/>"),
+                List.of("<jpackage-state/>"),
+                createXml(),
+                createXml("<main-launcher></main-launcher>"),
+                createXml("<main-launcher>Foo</main-launcher>", "<main-class></main-class>"),
+                createXml("<add-launcher>A</add-launcher>")
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testValidXml(String expectedLauncherName, String xmlData[]) throws IOException {
-        var file = createFromXml(xmlData);
-        assertEquals(expectedLauncherName, file.getLauncherName());
-        assertTrue(file.getAddLaunchers().isEmpty());
+    public void testValidXml(AppImageFile expected, List<String> xmlData) throws IOException, ConfigException {
+        final var actual = createFromXml(xmlData);
+        assertEquals(expected, actual);
     }
 
-    private static Stream<org.junit.jupiter.params.provider.Arguments> testValidXml() {
+    private static Stream<Arguments> testValidXml() {
         return Stream.of(
-                makeArguments("Foo", List.of(
-                        JPACKAGE_STATE_OPEN,
-                                "<app-version>1.0</app-version>",
-                                "<main-launcher>Foo</main-launcher>",
-                                "<main-class>main.Class</main-class>",
-                                "<signed>false</signed>",
-                                "<app-store>false</app-store>",
-                        "</jpackage-state>").toArray(String[]::new)
+                Arguments.of(build().version("72").launcherName("Y").mainClass("main.Class").create(), createXml(
+                        "<main-launcher>Y</main-launcher>",
+                        "<app-version>72</app-version>",
+                        "<main-class>main.Class</main-class>")
                 ),
-                makeArguments("Boo", List.of(
-                        JPACKAGE_STATE_OPEN,
-                                "<app-version>1.0</app-version>",
-                                "<main-launcher>Boo</main-launcher>",
-                                "<main-launcher>Bar</main-launcher>",
-                                "<main-class>main.Class</main-class>",
-                                "<signed>false</signed>",
-                                "<app-store>false</app-store>",
-                            "</jpackage-state>").toArray(String[]::new)
+                Arguments.of(build().addExtra("x", "property-x").addExtra("signed", "false")
+                        .addExtra("y", "").addlauncher("another-launcher").addlauncher("service-launcher", true)
+                        .addlauncher("launcher-with-extra", Map.of("a", "", "b", "", "c", "Q"))
+                        .addlauncher("service-launcher-with-extra", true, Map.of("h", "F")).create(), createXml(
+                        "<app-version>1.0</app-version>",
+                        "<main-class>Main</main-class>",
+                        "<y/>",
+                        "<x>property-x</x>",
+                        "<signed>false</signed>",
+                        "<add-launcher name='service-launcher' service='true'/>",
+                        "<add-launcher name='another-launcher'></add-launcher>",
+                        "<add-launcher name='launcher-with-extra'><a></a><b/><c>Q</c></add-launcher>",
+                        "<add-launcher name='service-launcher-with-extra' service='true'><h>F</h></add-launcher>",
+                        "<main-launcher>Foo</main-launcher>")
                 ),
-                makeArguments("duke", List.of(
-                        JPACKAGE_STATE_OPEN,
-                                "<app-version>1.0</app-version>",
-                                "<main-launcher>duke</main-launcher>",
-                                "<main-class>main.Class</main-class>",
-                                "<signed>false</signed>",
-                                "<app-store>false</app-store>",
-                                "<launcher></launcher>",
-                        "</jpackage-state>").toArray(String[]::new)
+                Arguments.of(build().addExtra("signed", "FalsE").create(), createXml(
+                        "<app-version>1.2</app-version>",
+                        "<app-version>1.0</app-version>",
+                        "<main-class>OverwrittenMain</main-class>",
+                        "<main-class>Main</main-class>",
+                        "<main-launcher>Bar</main-launcher>",
+                        "<main-launcher>Foo</main-launcher>",
+                        "<signed>false</signed>",
+                        "<signed>FalsE</signed>")
+                ),
+                Arguments.of(build().addExtra("signed", "true").addExtra("with-comment", "ab")
+                        .addlauncher("a", Map.of("bar", "foo")).create(), createXml(
+                        "<app-version>1.0</app-version>",
+                        "<main-class>Main</main-class>",
+                        "<main-launcher>Foo</main-launcher>",
+                        "<signed>true</signed>",
+                        "<with-comment>a<!-- This is a comment -->b</with-comment>",
+                        "<add-launcher name='a'><name>foo</name><bar>foo</bar><service>true</service></add-launcher>",
+                        "<other><nested>false</nested></other>",
+                        "<another-other>A<child/>B</another-other>")
                 )
         );
     }
 
-    @Test
-    public void testMainLauncherName() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("name", "Foo");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duck App Description");
-        AppImageFile aif = create(params);
-
-        assertEquals("Foo", aif.getLauncherName());
-    }
-
-    @Test
-    public void testMainClass() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("name", "Foo");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duck App Description");
-        AppImageFile aif = create(params);
-
-        assertEquals("main.Class", aif.getMainClass());
-    }
-
-    @Test
-    public void testMacSign() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("name", "Foo");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duck App Description");
-        params.put("mac-sign", Boolean.TRUE);
-        AppImageFile aif = create(params);
-
-        assertTrue(aif.isSigned());
-    }
-
-    @Test
-    public void testCopyAsSigned() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("name", "Foo");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duck App Description");
-        params.put("mac-sign", Boolean.FALSE);
-
-        AppImageFile aif = create(params);
-        assertFalse(aif.isSigned());
-
-        aif = aif.copyAsSigned();
-        assertTrue(aif.isSigned());
-    }
-
-    @Test
-    public void testMacAppStore() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        params.put("name", "Foo");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duck App Description");
-        params.put("mac-app-store", Boolean.TRUE);
-        AppImageFile aif = create(params);
-
-        assertTrue(aif.isAppStore());
-    }
-
-    @Test
-    public void testAddLaunchers() throws IOException {
-        Map<String, Object> params = new LinkedHashMap<>();
-        List<Map<String, Object>> launchersAsMap = new ArrayList<>();
-
-        Map<String, Object> addLauncher2Params = new LinkedHashMap<>();
-        addLauncher2Params.put("name", "Launcher2Name");
-        launchersAsMap.add(addLauncher2Params);
-
-        Map<String, Object> addLauncher3Params = new LinkedHashMap<>();
-        addLauncher3Params.put("name", "Launcher3Name");
-        launchersAsMap.add(addLauncher3Params);
-
-        params.put("name", "Duke App");
-        params.put("main-class", "main.Class");
-        params.put("description", "Duke App Description");
-        params.put("add-launcher", launchersAsMap);
-        AppImageFile aif = create(params);
-
-        List<AppImageFile.LauncherInfo> addLaunchers = aif.getAddLaunchers();
-        assertEquals(2, addLaunchers.size());
-        List<String> names = new ArrayList<>();
-        names.add(addLaunchers.get(0).getName());
-        names.add(addLaunchers.get(1).getName());
-
-        assertTrue(names.contains("Launcher2Name"));
-        assertTrue(names.contains("Launcher3Name"));
-    }
-
-    private AppImageFile create(Map<String, Object> params) throws IOException {
-        AppImageFile.save(tempFolder, params);
-        return AppImageFile.load(tempFolder);
-    }
-
-    private AppImageFile createFromXml(String... xmlData) throws IOException {
-        Path path = AppImageFile.getPathInAppImage(tempFolder);
+    private AppImageFile createFromXml(List<String> xmlData) throws IOException, ConfigException {
+        Path path = AppImageFile.getPathInAppImage(DUMMY_LAYOUT.resolveAt(tempFolder));
         path.toFile().mkdirs();
         Files.delete(path);
 
         List<String> data = new ArrayList<>();
         data.add("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>");
-        data.addAll(List.of(xmlData));
+        data.addAll(xmlData);
 
         Files.write(path, data, StandardOpenOption.CREATE,
                     StandardOpenOption.TRUNCATE_EXISTING);
 
-        AppImageFile image = AppImageFile.load(tempFolder);
+        AppImageFile image = AppImageFile.load(tempFolder, DUMMY_LAYOUT);
         return image;
     }
 
-    static org.junit.jupiter.params.provider.Arguments makeArguments(Object ... args) {
-        return org.junit.jupiter.params.provider.Arguments.of(args);
+    private static void assertEquals(AppImageFile expected, AppImageFile actual) {
+        assertPropertyEquals(expected, actual, AppImageFile::getAppVersion);
+        assertPropertyEquals(expected, actual, AppImageFile::getLauncherName);
+        assertPropertyEquals(expected, actual, AppImageFile::getMainClass);
+        assertPropertyEquals(expected, actual, AppImageFile::getExtra);
+        Assertions.assertEquals(additionaLaunchersAsMap(expected), additionaLaunchersAsMap(actual));
+    }
+
+    private static Map<String, AppImageFile.LauncherInfo> additionaLaunchersAsMap(AppImageFile file) {
+        return file.getAddLaunchers().stream().collect(Collectors.toMap(AppImageFile.LauncherInfo::name, x -> x));
+    }
+
+    private static <T, U> void assertPropertyEquals(T expected, T actual, Function<T, U> getProperty) {
+        Assertions.assertEquals(getProperty.apply(expected), getProperty.apply(actual));
+    }
+
+    private static final List<String> createXml(String ...xml) {
+        final List<String> content = new ArrayList<>();
+        content.add(String.format("<jpackage-state platform=\"%s\" version=\"%s\">", AppImageFile.getPlatform(), AppImageFile.getVersion()));
+        content.addAll(List.of(xml));
+        content.add("</jpackage-state>");
+        return content;
     }
 
     @TempDir
     private Path tempFolder;
 
-    private static final String JPACKAGE_STATE_OPEN = String.format(
-            "<jpackage-state platform=\"%s\" version=\"%s\">",
-            AppImageFile.getPlatform(), AppImageFile.getVersion());
-
+    private static final ApplicationLayout DUMMY_LAYOUT = ApplicationLayout.build().setAll("").create();
 }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
deleted file mode 100644
index 58bf733c855..00000000000
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
+++ /dev/null
@@ -1,103 +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 jdk.jpackage.internal;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class ApplicationLayoutTest {
-
-    private Path newFolder(Path folderName, String ... extraFolderNames) throws IOException {
-        var path = tempFolder.resolve(folderName);
-        Files.createDirectories(path);
-        for (var extraFolderName : extraFolderNames) {
-            path = path.resolve(extraFolderName);
-            Files.createDirectories(path);
-        }
-        return path;
-    }
-
-    private Path newFile(Path fileName) throws IOException {
-        var path = tempFolder.resolve(fileName);
-        Files.createDirectories(path.getParent());
-        Files.createFile(path);
-        return path;
-    }
-
-    private void fillLinuxAppImage() throws IOException {
-        appImage = newFolder(Path.of("Foo"));
-
-        Path base = appImage.getFileName();
-
-        newFolder(base, "bin");
-        newFolder(base, "lib", "app", "mods");
-        newFolder(base, "lib", "runtime", "bin");
-        newFile(base.resolve("bin/Foo"));
-        newFile(base.resolve("lib/app/Foo.cfg"));
-        newFile(base.resolve("lib/app/hello.jar"));
-        newFile(base.resolve("lib/Foo.png"));
-        newFile(base.resolve("lib/libapplauncher.so"));
-        newFile(base.resolve("lib/runtime/bin/java"));
-    }
-
-    @Test
-    public void testLinux() throws IOException {
-        fillLinuxAppImage();
-        testApplicationLayout(ApplicationLayout.linuxAppImage());
-    }
-
-    private void testApplicationLayout(ApplicationLayout layout) throws IOException {
-        ApplicationLayout srcLayout = layout.resolveAt(appImage);
-        assertApplicationLayout(srcLayout);
-
-        ApplicationLayout dstLayout = layout.resolveAt(
-                appImage.getParent().resolve(
-                        "Copy" + appImage.getFileName().toString()));
-        srcLayout.move(dstLayout);
-        Files.deleteIfExists(appImage);
-        assertApplicationLayout(dstLayout);
-
-        dstLayout.copy(srcLayout);
-        assertApplicationLayout(srcLayout);
-        assertApplicationLayout(dstLayout);
-    }
-
-    private void assertApplicationLayout(ApplicationLayout layout) throws IOException {
-        assertTrue(Files.isRegularFile(layout.appDirectory().resolve("Foo.cfg")));
-        assertTrue(Files.isRegularFile(layout.appDirectory().resolve("hello.jar")));
-        assertTrue(Files.isDirectory(layout.appModsDirectory()));
-        assertTrue(Files.isRegularFile(layout.launchersDirectory().resolve("Foo")));
-        assertTrue(Files.isRegularFile(layout.destktopIntegrationDirectory().resolve("Foo.png")));
-        assertTrue(Files.isRegularFile(layout.runtimeDirectory().resolve("bin/java")));
-    }
-
-    @TempDir
-    private Path tempFolder;
-    private Path appImage;
-}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
index a45d6e8c5a3..6a84c8ea354 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
@@ -97,7 +97,7 @@ private static List<Object[]> data() {
     public void testDefault(Path dstPath, boolean dstFileOverwrite,
             @TempDir Path tempFolder) throws IOException {
         final String[] content = saveResource(
-                new OverridableResource(DEFAULT_NAME), tempFolder.resolve(
+                new OverridableResource(DEFAULT_NAME, ResourceLocator.class), tempFolder.resolve(
                         dstPath), dstFileOverwrite);
 
         try (var resource = ResourceLocator.class.getResourceAsStream(DEFAULT_NAME);
@@ -117,7 +117,7 @@ public void testDefaultWithSubstitution(Path dstPath, boolean dstFileOverwrite,
                     "Substitution map should contain only a single entry");
         }
 
-        OverridableResource resource = new OverridableResource(DEFAULT_NAME);
+        OverridableResource resource = new OverridableResource(DEFAULT_NAME, ResourceLocator.class);
 
         var linesBeforeSubstitution = List.of(saveResource(resource, tempFolder.resolve(dstPath), dstFileOverwrite));
 
@@ -170,7 +170,7 @@ public void testResourceDir(ResourceName defaultName, Path dstPath,
         Files.write(customFile, expectedResourceData);
 
         final var actualResourceData = saveResource(buildResourceWriter(
-                new OverridableResource(defaultName.value)
+                new OverridableResource(defaultName.value, ResourceLocator.class)
                         .setPublicName(customFile.getFileName())
                         .setResourceDir(customFile.getParent())
                 ).dstFileOverwrite(dstFileOverwrite).expectedSource(ResourceDir),
@@ -199,7 +199,7 @@ public void testResourceDirWithSubstitution(ResourceName defaultName, Path dstPa
                 "Bar", "Bar", "Goodbye", "JJ");
 
         final var actualResourceData = saveResource(buildResourceWriter(
-                new OverridableResource(defaultName.value)
+                new OverridableResource(defaultName.value, ResourceLocator.class)
                         .setSubstitutionData(substitutionData)
                         .setPublicName(customFile.getFileName())
                         .setResourceDir(customFile.getParent())
@@ -221,7 +221,7 @@ public void testPublicNameNotSet(boolean namesMatch, @TempDir Path tempFolder) t
         final Path outputDir = tempFolder.resolve("output");
 
         var resourceWriter = buildResourceWriter(
-                new OverridableResource(null).setResourceDir(customFile.getParent()));
+                new OverridableResource().setResourceDir(customFile.getParent()));
 
         if (namesMatch) {
             final var actualResourceData = resourceWriter
@@ -244,7 +244,7 @@ public void testSubstitutionDataCopied(@TempDir Path tempFolder) throws IOExcept
 
         final Map<String, String> substitutionData = new HashMap<>(Map.of("Hello", "Goodbye"));
 
-        var resource = new OverridableResource(null)
+        var resource = new OverridableResource()
                 .setSubstitutionData(substitutionData)
                 .setPublicName(customFile.getFileName())
                 .setResourceDir(customFile.getParent());
@@ -265,7 +265,7 @@ public void testSubstitutionDataCopied(@TempDir Path tempFolder) throws IOExcept
 
     @Test
     public void testNoDefault(@TempDir Path tempFolder) throws IOException {
-        var resourceWriter = buildResourceWriter(new OverridableResource(null)).expectedSource(null);
+        var resourceWriter = buildResourceWriter(new OverridableResource()).expectedSource(null);
         assertEquals(null, resourceWriter.saveInDir(tempFolder));
 
         var dstDir = tempFolder.resolve("foo");
@@ -275,7 +275,7 @@ public void testNoDefault(@TempDir Path tempFolder) throws IOException {
 
     enum ResourceName {
         DEFAULT_NAME(OverridableResourceTest.DEFAULT_NAME),
-        NULL_NAME(null);
+        NO_NAME("");
 
         ResourceName(String value) {
             this.value = value;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/AppImageLayoutTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/AppImageLayoutTest.java
new file mode 100644
index 00000000000..1c863b653b1
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/AppImageLayoutTest.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.
+ */
+
+package jdk.jpackage.internal.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+
+
+public class AppImageLayoutTest {
+
+    @Test
+    public void testStub() {
+        final var root = Path.of("root");
+        final var runtime = Path.of("runtime");
+        final var layout = new AppImageLayout.Stub(root, runtime);
+
+        assertEquals(root, layout.rootDirectory());
+        assertEquals(runtime, layout.runtimeDirectory());
+    }
+
+    @Test
+    public void testPathGroup() {
+        final var layout = new AppImageLayout.Stub(Path.of("root"), Path.of("runtime"));
+
+        final var pathGroup = AppImageLayout.toPathGroup(layout);
+
+        assertEquals(Set.of("runtimeDirectory"), pathGroup.keys());
+        assertEquals(List.of(layout.runtimeDirectory()), pathGroup.paths());
+    }
+
+    @Test
+    public void testResolveAt() {
+        final var dir = Path.of("foo/bar");
+
+        final var layout = new AppImageLayout.Stub(Path.of(""), Path.of("runtime"));
+
+        final var resolvedLayout = layout.resolveAt(dir);
+
+        assertNotSame(layout, resolvedLayout);
+
+        assertEquals(dir.resolve(layout.rootDirectory()), resolvedLayout.rootDirectory());
+        assertEquals(dir.resolve(layout.runtimeDirectory()), resolvedLayout.runtimeDirectory());
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/ApplicationLayoutTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/ApplicationLayoutTest.java
new file mode 100644
index 00000000000..089a363e0e4
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/ApplicationLayoutTest.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.
+ */
+
+package jdk.jpackage.internal.model;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+
+public class ApplicationLayoutTest {
+
+    public void test(boolean move, Path tempDir) throws IOException {
+        final var srcAppImageRoot = tempDir.resolve("src");
+        Files.createDirectories(srcAppImageRoot);
+
+        final var appImageCopyFiles = List.of("bin/Foo", "lib/app/Foo.cfg", "lib/app/hello.jar", "runtime/bin/java");
+        final var appImageCopyDirs = List.of("lib/app/hello");
+
+        final var appImageNoCopyFiles = List.of("lib/Foo.cfg", "Foo");
+        final var appImageNoCopyDirs = List.of("lib/hello", "a/b/c");
+
+        for (var path : Stream.concat(appImageCopyFiles.stream(), appImageNoCopyFiles.stream()).map(srcAppImageRoot::resolve).toList()) {
+            Files.createDirectories(path.getParent());
+            Files.createFile(path);
+        }
+
+        for (var path : Stream.concat(appImageCopyDirs.stream(), appImageNoCopyDirs.stream()).map(srcAppImageRoot::resolve).toList()) {
+            Files.createDirectories(path);
+        }
+
+        final var layout = ApplicationLayout.build()
+                .launchersDirectory("bin")
+                .appDirectory("lib/app")
+                .runtimeDirectory("runtime")
+                .appModsDirectory("mods")
+                .contentDirectory("content")
+                .desktopIntegrationDirectory("lib/apps")
+                .create();
+
+        final var dstAppImageRoot = tempDir.resolve("dst");
+        Files.createDirectories(dstAppImageRoot);
+
+        final var srcPathGroup = AppImageLayout.toPathGroup(layout.resolveAt(srcAppImageRoot));
+        final var dstPathGroup = AppImageLayout.toPathGroup(layout.resolveAt(dstAppImageRoot));
+        if (move) {
+            srcPathGroup.move(dstPathGroup);
+        } else {
+            srcPathGroup.copy(dstPathGroup);
+        }
+
+        for (var path : Stream.concat(appImageNoCopyDirs.stream(), appImageNoCopyFiles.stream()).map(srcAppImageRoot::resolve).toList()) {
+            assertTrue(Files.exists(path));
+        }
+
+        for (var path : appImageCopyDirs) {
+            var srcPath = srcAppImageRoot.resolve(path);
+            if (move) {
+                assertFalse(Files.exists(srcPath));
+            } else {
+                assertTrue(Files.isDirectory(srcPath));
+            }
+            assertTrue(Files.isDirectory(dstAppImageRoot.resolve(path)));
+        }
+
+        for (var path : appImageCopyFiles) {
+            var srcPath = srcAppImageRoot.resolve(path);
+            if (move) {
+                assertFalse(Files.exists(srcPath));
+            } else {
+                assertTrue(Files.isRegularFile(srcPath));
+            }
+            assertTrue(Files.isRegularFile(dstAppImageRoot.resolve(path)));
+        }
+    }
+
+    @Test
+    public void testMove(@TempDir Path tempDir) throws IOException {
+        test(true, tempDir);
+    }
+
+    @Test
+    public void testCopy(@TempDir Path tempDir) throws IOException {
+        test(false, tempDir);
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/BinaryMatrixTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/BinaryMatrixTest.java
new file mode 100644
index 00000000000..5de201af4f1
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/BinaryMatrixTest.java
@@ -0,0 +1,388 @@
+/*
+ * 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.pipeline;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.function.Consumer;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+final class BinaryMatrixTest {
+
+    record CtorTest(int rows, int columns, boolean isSquare, boolean fail) {
+
+        static CtorTest create(int rows, int columns) {
+            return new CtorTest(rows, columns, rows == columns, false);
+        }
+
+        static CtorTest createFail(int rows, int columns) {
+            return new CtorTest(rows, columns, false, true);
+        }
+
+        void test() {
+            if (fail) {
+                assertThrows(IllegalArgumentException.class, () -> new BinaryMatrix(rows, columns));
+            } else {
+                final var matrix = new BinaryMatrix(rows, columns);
+                assertEquals(rows, matrix.getRowCount());
+                assertEquals(columns, matrix.getColumnCount());
+                assertEquals(isSquare, matrix.isSquare());
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testCtor(CtorTest testSpec) {
+        testSpec.test();
+    }
+
+    private static Stream<CtorTest> testCtor() {
+        return Stream.of(
+                CtorTest.create(1, 2),
+                CtorTest.create(2, 2),
+                CtorTest.create(7, 4),
+                CtorTest.createFail(0, 1),
+                CtorTest.createFail(1, 0),
+                CtorTest.createFail(-1, 1),
+                CtorTest.createFail(1, -1),
+                CtorTest.createFail(0, 0),
+                CtorTest.createFail(-3, -9)
+        );
+    }
+
+    record MatrixSpec(int rows, int columns, String encodedMatrixData) {
+
+        MatrixSpec(int rows, int columns) {
+            this(rows, columns, null);
+        }
+
+        BinaryMatrix createMatrix() {
+            if (encodedMatrixData == null) {
+                return new BinaryMatrix(rows, columns);
+            }
+
+            final var charArray = encodedMatrixData.toCharArray();
+
+            if (charArray.length != rows * columns) {
+                throw new IllegalArgumentException("Matrix data is not matching matrix dimensions");
+            }
+
+            final var matrixData = new BitSet(charArray.length);
+
+            IntStream.range(0, charArray.length).forEach(index -> {
+                final var chr = charArray[index];
+                switch (chr) {
+                    case '0' -> {
+                        break;
+                    }
+
+                    case '1' -> {
+                        matrixData.set(index);
+                        break;
+                    }
+
+                    default -> {
+                        throw new IllegalArgumentException(String.format("Unrecognized character: %c", chr));
+                    }
+                }
+            });
+
+            return new BinaryMatrix(rows, columns, matrixData);
+        }
+    }
+
+    enum Selection {
+        ROW,
+        COLUMN
+    }
+
+    record SelectionTest(MatrixSpec matrixSpec, Selection type, int index, List<Boolean> expected) {
+
+        static SelectionTest createRow(int rows, int columns, String encodedMatrixData, int row, int ... expected) {
+            return new SelectionTest(new MatrixSpec(rows, columns, encodedMatrixData), Selection.ROW, row, conv(expected));
+        }
+
+        static SelectionTest createColumn(int rows, int columns, String encodedMatrixData, int column, int ... expected) {
+            return new SelectionTest(new MatrixSpec(rows, columns, encodedMatrixData), Selection.COLUMN, column, conv(expected));
+        }
+
+        static SelectionTest createRow(int rows, int columns, int row) {
+            return new SelectionTest(new MatrixSpec(rows, columns), Selection.ROW, row, null);
+        }
+
+        static SelectionTest createColumn(int rows, int columns, int column) {
+            return new SelectionTest(new MatrixSpec(rows, columns), Selection.COLUMN, column, null);
+        }
+
+        void test() {
+            final var matrix = matrixSpec.createMatrix();
+            if (expected == null) {
+                assertThrows(IndexOutOfBoundsException.class, () -> getIterator(matrix));
+                assertThrows(IndexOutOfBoundsException.class, () -> getSpliterator(matrix));
+            } else {
+                final var it = getIterator(matrix);
+                assertEquals(expected, readSelection(it::forEachRemaining));
+
+                final var split = getSpliterator(matrix);
+                assertEquals(expected, readSelection(split::forEachRemaining));
+
+                assertThrows(NoSuchElementException.class, it::next);
+            }
+        }
+
+        List<Boolean> readSelection(Consumer<Consumer<BinaryMatrix.Cursor>> forEach) {
+            final List<Boolean> actualData = new ArrayList<>();
+            final int[] variableIndexValue = new int[] { -1 };
+
+            forEach.accept(cursor -> {
+                final int fixedIndex;
+                final int variableIndex;
+                switch (type) {
+                    case ROW -> {
+                        fixedIndex = cursor.row();
+                        variableIndex = cursor.column();
+                    }
+                    case COLUMN -> {
+                        fixedIndex = cursor.column();
+                        variableIndex = cursor.row();
+                    }
+                    default -> {
+                        throw new IllegalArgumentException();
+                    }
+                }
+
+                assertEquals(index, fixedIndex);
+                assertEquals(variableIndexValue[0] + 1, variableIndex);
+                variableIndexValue[0] = variableIndex;
+
+                actualData.add(cursor.value());
+            });
+
+            return actualData;
+        }
+
+        Iterator<BinaryMatrix.Cursor> getIterator(BinaryMatrix matrix) {
+            switch (type) {
+                case ROW -> {
+                    return matrix.getRowIterator(index);
+                }
+                case COLUMN -> {
+                    return matrix.getColumnIterator(index);
+                }
+                default -> {
+                    throw new IllegalArgumentException();
+                }
+            }
+        }
+
+        Spliterator<BinaryMatrix.Cursor> getSpliterator(BinaryMatrix matrix) {
+            switch (type) {
+                case ROW -> {
+                    return matrix.getRowSpliterator(index);
+                }
+                case COLUMN -> {
+                    return matrix.getColumnSpliterator(index);
+                }
+                default -> {
+                    throw new IllegalArgumentException();
+                }
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testSelection(SelectionTest testSpec) {
+        testSpec.test();
+    }
+
+    private static Stream<SelectionTest> testSelection() {
+        return Stream.of(
+                SelectionTest.createRow(1, 1, "0", 0, 0),
+                SelectionTest.createColumn(1, 1, "0", 0, 0),
+                SelectionTest.createRow(1, 1, "1", 0, 1),
+                SelectionTest.createColumn(1, 1, "1", 0, 1),
+
+                SelectionTest.createRow(3, 2, "00" + "01" + "10", 0, 0, 0),
+                SelectionTest.createRow(3, 2, "00" + "01" + "10", 1, 0, 1),
+                SelectionTest.createRow(3, 2, "00" + "01" + "10", 2, 1, 0),
+                SelectionTest.createColumn(3, 2, "00" + "01" + "10", 0, 0, 0, 1),
+                SelectionTest.createColumn(3, 2, "00" + "01" + "10", 1, 0, 1, 0),
+
+                SelectionTest.createRow(3, 2, -1),
+                SelectionTest.createRow(3, 2, 3),
+                SelectionTest.createRow(3, 2, 12),
+
+                SelectionTest.createColumn(3, 2, -1),
+                SelectionTest.createColumn(3, 2, 2),
+                SelectionTest.createColumn(3, 2, 12)
+        );
+    }
+
+    record SetValueTest(MatrixSpec matrixSpec, int row, int column, Boolean expected) {
+
+        static SetValueTest create(int rows, int columns, String encodedMatrixData, int row, int column, boolean expected) {
+            return new SetValueTest(new MatrixSpec(rows, columns, encodedMatrixData), row, column, expected);
+        }
+
+        static SetValueTest create(int rows, int columns, int row, int column) {
+            return new SetValueTest(new MatrixSpec(rows, columns), row, column, null);
+        }
+
+        void test() {
+            final var matrix = matrixSpec.createMatrix();
+            final var matrixCopy = matrixSpec.createMatrix();
+            if (expected == null) {
+                assertThrows(IndexOutOfBoundsException.class, () -> matrix.set(row, column));
+                assertEquals(matrixCopy, matrix);
+
+                assertThrows(IndexOutOfBoundsException.class, () -> matrix.set(row, column, true));
+                assertEquals(matrixCopy, matrix);
+
+                assertThrows(IndexOutOfBoundsException.class, () -> matrix.set(row, column, false));
+                assertEquals(matrixCopy, matrix);
+
+                assertThrows(IndexOutOfBoundsException.class, () -> matrix.unset(row, column));
+                assertEquals(matrixCopy, matrix);
+
+                assertThrows(IndexOutOfBoundsException.class, () -> matrix.isSet(row, column));
+                assertEquals(matrixCopy, matrix);
+            } else {
+                assertEquals(expected, matrix.isSet(row, column));
+
+                matrix.set(row, column, expected);
+                assertEquals(expected, matrix.isSet(row, column));
+                assertEquals(matrixCopy, matrix);
+
+                if (expected) {
+                    matrix.set(row, column);
+                } else {
+                    matrix.unset(row, column);
+                }
+                assertEquals(expected, matrix.isSet(row, column));
+                assertEquals(matrixCopy, matrix);
+
+                matrix.set(row, column, !expected);
+                assertNotEquals(expected, matrix.isSet(row, column));
+                assertNotEquals(matrixCopy, matrix);
+
+                if (expected) {
+                    matrix.set(row, column);
+                } else {
+                    matrix.unset(row, column);
+                }
+                assertEquals(expected, matrix.isSet(row, column));
+                assertEquals(matrixCopy, matrix);
+            }
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testSetValue(SetValueTest testSpec) {
+        testSpec.test();
+    }
+
+    private static List<SetValueTest> testSetValue() {
+        final List<SetValueTest> data = new ArrayList<>();
+
+        data.addAll(List.of(
+                SetValueTest.create(1, 1, "0", 0, 0, false),
+                SetValueTest.create(1, 1, "1", 0, 0, true),
+
+                SetValueTest.create(3, 2, -1, 0),
+                SetValueTest.create(3, 2, 3, 0),
+                SetValueTest.create(3, 2, 12, 0),
+
+                SetValueTest.create(3, 2, 0, -1),
+                SetValueTest.create(3, 2, 0, 2),
+                SetValueTest.create(3, 2, 0, 12),
+
+                SetValueTest.create(3, 2, 3, 2)
+        ));
+
+        final var matrixData = new boolean[3][5];
+        matrixData[0] = new boolean[] { false, true, false, true, true };
+        matrixData[1] = new boolean[] { true, false, true, false, true };
+        matrixData[2] = new boolean[] { false, false, true, false, false };
+
+        final var sb = new StringBuilder();
+        for (int i = 0; i != 3; ++i) {
+            for (int j = 0; j != 5; ++j) {
+                sb.append(matrixData[i][j] ? '1' : '0');
+            }
+        }
+
+        final var encodedMatrixData = sb.toString();
+        for (int i = 0; i != 3; ++i) {
+            for (int j = 0; j != 5; ++j) {
+                data.add(SetValueTest.create(3, 5, encodedMatrixData, i, j, matrixData[i][j]));
+            }
+        }
+
+        return data;
+    }
+
+    @Test
+    public void testEquals() {
+        final var matrixSpec = new MatrixSpec(2, 3, "001" + "101");
+
+        final var a = matrixSpec.createMatrix();
+        final var b = matrixSpec.createMatrix();
+
+        assertTrue(a.equals(b));
+        assertTrue(a.equals(a));
+        assertFalse(a.equals(null));
+        assertFalse(a.equals(matrixSpec));
+    }
+
+    @Test
+    public void testHashCode() {
+        final var matrixSpec2x3 = new MatrixSpec(2, 3);
+
+        assertEquals(matrixSpec2x3.createMatrix().hashCode(), matrixSpec2x3.createMatrix().hashCode());
+
+        final var matrixSpec3x2 = new MatrixSpec(3, 2);
+        assertNotEquals(matrixSpec2x3.createMatrix().hashCode(), matrixSpec3x2.createMatrix().hashCode());
+    }
+
+    private static List<Boolean> conv(int... values) {
+        return IntStream.of(values).mapToObj(v -> v != 0).toList();
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/DirectedEdgeTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/DirectedEdgeTest.java
new file mode 100644
index 00000000000..c7dedd4ae46
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/DirectedEdgeTest.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.
+ */
+
+package jdk.jpackage.internal.pipeline;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.List;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+final class DirectedEdgeTest {
+
+    @ParameterizedTest
+    @MethodSource
+    public void testCtor(String tail, String head, Class<? extends Exception> expectedExceptionType) {
+        if (expectedExceptionType != null) {
+            assertThrows(expectedExceptionType, () -> DirectedEdge.create(tail, head));
+        } else {
+            final var edge = DirectedEdge.create(tail, head);
+            assertSame(tail, edge.from());
+            assertSame(head, edge.head());
+            assertSame(head, edge.to());
+        }
+    }
+
+    private static List<Object[]> testCtor() {
+        return List.<Object[]>of(
+                new Object[] { "a", "b", null },
+                new Object[] { "a", "a", IllegalArgumentException.class },
+                new Object[] { "a", null, NullPointerException.class },
+                new Object[] { null, "b", NullPointerException.class },
+                new Object[] { null, null, NullPointerException.class }
+        );
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/FixedDAGTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/FixedDAGTest.java
new file mode 100644
index 00000000000..ea3710b98dd
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/FixedDAGTest.java
@@ -0,0 +1,438 @@
+/*
+ * 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.pipeline;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+final class FixedDAGTest {
+
+    @Test
+    public void testInvalidCtorArgs() {
+        final var matrix1x2 = new BinaryMatrix(1, 2);
+        final var nodes = FixedDAG.Nodes.<String>ofList(List.of(A, B));
+
+        assertThrows(IllegalArgumentException.class, () -> new FixedDAG<>(matrix1x2, nodes));
+
+        final var matrix3x3 = new BinaryMatrix(3, 3);
+        assertThrows(IllegalArgumentException.class, () -> new FixedDAG<>(matrix3x3, nodes));
+    }
+
+    @Test
+    public void testNodesToList() {
+        final var nodes = FixedDAG.Nodes.<String>ofList(List.of(A, B));
+
+        assertEquals(2, nodes.size());
+
+        assertEquals(A, nodes.get(0));
+        assertEquals(B, nodes.get(1));
+        assertThrows(IndexOutOfBoundsException.class, () -> nodes.get(2));
+
+        assertEquals(0, nodes.indexOf(A));
+        assertEquals(1, nodes.indexOf(B));
+        assertThrows(NoSuchElementException.class, () -> nodes.indexOf(C));
+
+        final var copy = new ArrayList<String>();
+        for (var n : nodes) {
+            copy.add(n);
+        }
+        assertEquals(copy, List.of(A, B));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testCyclic(List<DirectedEdge<String>> edges) {
+        assertThrows(UnsupportedOperationException.class, () -> create(edges));
+    }
+
+    private static Stream<List<DirectedEdge<String>>> testCyclic() {
+        return Stream.of(
+                List.of(edge(A, B), edge(B, A)),
+
+                List.of(edge(A, B), edge(B, C), edge(C, D), edge(D, A)),
+
+                List.of(edge(A, B), edge(B, C), edge(C, D), edge(D, B)),
+
+                // A <- B -> L
+                // |    ^    |
+                // |    |    |
+                // + <- D <- +
+                //      |
+                //      + <- C
+                List.of(edge(B, A), edge(D, B), edge(D, A), edge(C, D), edge(L, D), edge(B, L)),
+                List.of(edge(C, D), edge(B, A), edge(D, B), edge(D, A), edge(L, D), edge(B, L))
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testGetNoIncomingEdges(List<DirectedEdge<String>> edges, List<String> expectedNodes) {
+        final var actualNodes = create(edges).getNoIncomingEdges();
+        assertEquals(expectedNodes, actualNodes);
+    }
+
+    private static Stream<Object[]> testGetNoIncomingEdges() {
+        return Stream.<Object[]>of(
+                new Object[] { List.of(edge(A, B)), List.of(A) },
+                new Object[] { List.of(edge(A, B), edge(A, B)), List.of(A) },
+                new Object[] { List.of(edge(A, B), edge(D, B)), List.of(A, D) },
+                new Object[] { List.of(edge(D, B), edge(A, B)), List.of(D, A) },
+
+                new Object[] { List.of(edge(A, B), edge(C, D)), List.of(A, C) },
+
+                // A <- B
+                // ^    ^
+                // |    |
+                // + -- D <- L
+                //      |
+                //      + <- C
+                new Object[] { List.of(edge(B, A), edge(D, B), edge(D, A), edge(C, D), edge(L, D)), List.of(C, L) },
+                new Object[] { List.of(edge(B, A), edge(L, D), edge(D, B), edge(D, A), edge(C, D)), List.of(L, C) }
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testGetNoOutgoingEdges(List<DirectedEdge<String>> edges, List<String> expectedNodes) {
+        final var actualNodes = create(edges).getNoOutgoingEdges();
+        assertEquals(expectedNodes, actualNodes);
+    }
+
+    private static Stream<Object[]> testGetNoOutgoingEdges() {
+        return Stream.<Object[]>of(
+                new Object[] { List.of(edge(A, B)), List.of(B) },
+                new Object[] { List.of(edge(A, B), edge(C, D)), List.of(B, D) }
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testGetTailsOf(String node, List<DirectedEdge<String>> edges, List<String> expectedNodes) {
+        final var actualNodes = create(edges).getTailsOf(node);
+        assertEquals(actualNodes, expectedNodes);
+
+    }
+
+    private static Stream<Object[]> testGetTailsOf() {
+        return Stream.<Object[]>of(
+                new Object[] { A, List.of(edge(A, B)), List.of() },
+                new Object[] { B, List.of(edge(A, B)), List.of(A) },
+                new Object[] { B, List.of(edge(A, B), edge(A, B)), List.of(A) },
+                new Object[] { B, List.of(edge(A, B), edge(B, C)), List.of(A) },
+                new Object[] { B, List.of(edge(A, B), edge(B, C), edge(C, D)), List.of(A) },
+                new Object[] { B, List.of(edge(A, B), edge(A, C), edge(D, B)), List.of(A, D) },
+                new Object[] { B, List.of(edge(D, B), edge(A, B), edge(A, C)), List.of(D, A) }
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testGetHeadsOf(String node, List<DirectedEdge<String>> edges, List<String> expectedNodes) {
+        final var actualNodes = create(edges).getHeadsOf(node);
+        assertEquals(actualNodes, expectedNodes);
+    }
+
+    private static Stream<Object[]> testGetHeadsOf() {
+        return Stream.<Object[]>of(
+                new Object[] { A, List.of(edge(A, B)), List.of(B) },
+                new Object[] { B, List.of(edge(A, B)), List.of() },
+                new Object[] { A, List.of(edge(A, B), edge(A, B)), List.of(B) },
+                new Object[] { B, List.of(edge(A, B), edge(B, C)), List.of(C) },
+                new Object[] { B, List.of(edge(A, B), edge(B, C), edge(C, D)), List.of(C) },
+                new Object[] { D, List.of(edge(D, B), edge(D, A), edge(C, D)), List.of(B, A) },
+                new Object[] { D, List.of(edge(D, A), edge(D, B), edge(C, D)), List.of(A, B) }
+        );
+    }
+
+    @Test
+    public void testSome() {
+        // A <- B <--- D
+        // ^    ^      |
+        // |    |      |
+        // +--- C -> L |
+        // |    ^      |
+        // |    |      |
+        // +----+------+
+
+        final var graphBuilder = FixedDAG.<String>build();
+
+        graphBuilder.addEdge(edge(C, L));
+        graphBuilder.addEdge(edge(D, B));
+        graphBuilder.addEdge(edge(B, A));
+        graphBuilder.addEdge(edge(D, A));
+        graphBuilder.addEdge(edge(C, A));
+        graphBuilder.addEdge(edge(D, C));
+        graphBuilder.addEdge(edge(C, B));
+
+        final var graph = graphBuilder.create();
+
+        assertEquals(graph.getNoIncomingEdges(), List.of(D));
+        assertEquals(graph.getNoOutgoingEdges(), List.of(L, A));
+
+        assertEquals(graph.getHeadsOf(A), List.of());
+        assertEquals(graph.getTailsOf(A), List.of(C, D, B));
+
+        assertEquals(graph.getHeadsOf(B), List.of(A));
+        assertEquals(graph.getTailsOf(B), List.of(C, D));
+
+        assertEquals(graph.getHeadsOf(C), List.of(L, B, A));
+        assertEquals(graph.getTailsOf(C), List.of(D));
+
+        assertEquals(graph.getHeadsOf(D), List.of(C, B, A));
+        assertEquals(graph.getTailsOf(D), List.of());
+
+        assertEquals(graph.getHeadsOf(L), List.of());
+        assertEquals(graph.getTailsOf(L), List.of(C));
+    }
+
+    @Test
+    public void testSome2() {
+        // B -> A <- C
+        // ^         ^
+        // |         |
+        // +--- D ---+
+        //      ^
+        //      |
+        // K -> N <- M <- P
+        // ^         ^
+        // |    O    |
+        // |    ^    |
+        // |    |    |
+        // +--- L ---+
+        //
+
+        final var graphBuilder = FixedDAG.<String>build();
+
+        graphBuilder.addEdge(edge(B, A));
+        graphBuilder.addEdge(edge(C, A));
+        graphBuilder.addEdge(edge(D, B));
+        graphBuilder.addEdge(edge(D, C));
+        graphBuilder.addEdge(edge(N, D));
+        graphBuilder.addEdge(edge(M, N));
+        graphBuilder.addEdge(edge(K, N));
+        graphBuilder.addEdge(edge(L, K));
+        graphBuilder.addEdge(edge(L, M));
+        graphBuilder.addEdge(edge(P, M));
+        graphBuilder.addEdge(edge(L, O));
+
+        final var graph = graphBuilder.create();
+
+        assertEquals(graph.getNoIncomingEdges(), List.of(L, P));
+        assertEquals(graph.getNoOutgoingEdges(), List.of(A, O));
+
+        assertEquals(graph.getHeadsOf(A), List.of());
+        assertEquals(graph.getTailsOf(A), List.of(B, C));
+        assertEquals(graph.getAllHeadsOf(A), List.of());
+        assertEquals(graph.getAllTailsOf(A), List.of(B, C, D, N, M, K, L, P));
+
+        assertEquals(graph.getHeadsOf(B), List.of(A));
+        assertEquals(graph.getTailsOf(B), List.of(D));
+        assertEquals(graph.getAllHeadsOf(B), List.of(A));
+        assertEquals(graph.getAllTailsOf(B), List.of(D, N, M, K, L, P));
+
+        assertEquals(graph.getHeadsOf(C), List.of(A));
+        assertEquals(graph.getTailsOf(C), List.of(D));
+        assertEquals(graph.getAllHeadsOf(C), List.of(A));
+        assertEquals(graph.getAllTailsOf(C), List.of(D, N, M, K, L, P));
+
+        assertEquals(graph.getHeadsOf(D), List.of(B, C));
+        assertEquals(graph.getTailsOf(D), List.of(N));
+        assertEquals(graph.getAllHeadsOf(D), List.of(B, A, C));
+        assertEquals(graph.getAllTailsOf(D), List.of(N, M, K, L, P));
+
+        assertEquals(graph.getHeadsOf(K), List.of(N));
+        assertEquals(graph.getTailsOf(K), List.of(L));
+        assertEquals(graph.getAllHeadsOf(K), List.of(B, A, C, D, N));
+        assertEquals(graph.getAllTailsOf(K), List.of(L));
+
+        assertEquals(graph.getHeadsOf(L), List.of(M, K, O));
+        assertEquals(graph.getTailsOf(L), List.of());
+        assertEquals(graph.getAllHeadsOf(L), List.of(B, A, C, D, N, M, K, O));
+        assertEquals(graph.getAllTailsOf(L), List.of());
+
+        assertEquals(graph.getHeadsOf(M), List.of(N));
+        assertEquals(graph.getTailsOf(M), List.of(L, P));
+        assertEquals(graph.getAllHeadsOf(M), List.of(B, A, C, D, N));
+        assertEquals(graph.getAllTailsOf(M), List.of(L, P));
+
+        assertEquals(graph.getHeadsOf(N), List.of(D));
+        assertEquals(graph.getTailsOf(N), List.of(M, K));
+        assertEquals(graph.getAllHeadsOf(N), List.of(B, A, C, D));
+        assertEquals(graph.getAllTailsOf(N), List.of(M, K, L, P));
+
+        assertEquals(graph.getHeadsOf(O), List.of());
+        assertEquals(graph.getTailsOf(O), List.of(L));
+        assertEquals(graph.getAllHeadsOf(O), List.of());
+        assertEquals(graph.getAllTailsOf(O), List.of(L));
+
+        assertEquals(graph.getHeadsOf(P), List.of(M));
+        assertEquals(graph.getTailsOf(P), List.of());
+        assertEquals(graph.getAllHeadsOf(P), List.of(B, A, C, D, N, M));
+        assertEquals(graph.getAllTailsOf(P), List.of());
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void testTopologicalSort(List<DirectedEdge<Integer>> edges, int[] expectedNodes) {
+
+        final var nodes = edges.stream().map(edge -> {
+            return Stream.of(edge.tail(), edge.head());
+        }).flatMap(x -> x).sorted().distinct().toList();
+
+        assertArrayEquals(expectedNodes, FixedDAG.create(edges, nodes).topologicalSort().stream().mapToInt(x -> x).toArray());
+    }
+
+    private static List<Object[]> testTopologicalSort() {
+        return List.<Object[]>of(
+                new Object[] { List.of(
+                        edge(11, 15),
+                        edge(12, 16),
+                        edge(13, 17),
+                        edge(14, 15),
+                        edge(14, 16),
+                        edge(14, 17),
+                        edge(14, 18)), IntStream.rangeClosed(11, 18).toArray()
+                },
+
+                new Object[] { List.of(
+                        edge(5, 2),
+                        edge(5, 0),
+                        edge(4, 0),
+                        edge(2, 3),
+                        edge(3, 1)), new int[] {4, 5, 0, 2, 3, 1}
+                },
+
+                new Object[] { List.of(
+                        edge(0, 1),
+                        edge(0, 4),
+                        edge(0, 7),
+                        edge(0, 14),
+                        edge(1, 5),
+                        edge(2, 3),
+                        edge(2, 5),
+                        edge(2, 6),
+                        edge(3, 10),
+                        edge(4, 5),
+                        edge(4, 8),
+                        edge(5, 9),
+                        edge(6, 10),
+                        edge(7, 8),
+                        edge(7, 11),
+                        edge(10, 13),
+                        edge(11, 12),
+                        edge(13, 16),
+                        edge(14, 15)), IntStream.rangeClosed(0, 16).toArray()
+                },
+
+                new Object[] { List.of(
+                        edge(0, 2),
+                        edge(0, 4),
+                        edge(1, 4),
+                        edge(1, 5),
+                        edge(2, 5),
+                        edge(3, 2)), new int[] {0, 1, 3, 2, 4, 5}
+                },
+
+                new Object[] { List.of(
+                        edge(0, 1),
+                        edge(0, 2),
+                        edge(1, 3),
+                        edge(2, 3),
+                        edge(3, 4)), IntStream.rangeClosed(0, 4).toArray()
+                },
+
+                new Object[] { List.of(
+                        edge(1, 2),
+                        edge(1, 3),
+                        edge(2, 4),
+                        edge(3, 4),
+                        edge(4, 5)), IntStream.rangeClosed(1, 5).toArray()
+                }
+        );
+    }
+
+    @Test
+    public void testEmptyBuilder() {
+        assertThrows(IllegalArgumentException.class, FixedDAG.<String>build()::create);
+    }
+
+    @Test
+    public void testSingleNodeBuilder() {
+        final var graphBuilder = FixedDAG.<String>build();
+        graphBuilder.addNode(A);
+        assertNodesEquals(graphBuilder.create().nodes(), A);
+    }
+
+    @Test
+    public void testIsolatedNodesBuilder() {
+        final var graphBuilder = FixedDAG.<String>build();
+        graphBuilder.addNode(A);
+        graphBuilder.addNode(B);
+        assertNodesEquals(graphBuilder.create().nodes(), A, B);
+        assertEquals(graphBuilder.create().getNoOutgoingEdges(), List.of(A, B));
+        assertEquals(graphBuilder.create().getNoIncomingEdges(), List.of(A, B));
+
+        graphBuilder.addEdge(edge(A, C));
+        assertNodesEquals(graphBuilder.create().nodes(), A, B, C);
+        assertEquals(graphBuilder.create().getNoOutgoingEdges(), List.of(B, C));
+        assertEquals(graphBuilder.create().getNoIncomingEdges(), List.of(A, B));
+    }
+
+    private static void assertNodesEquals(FixedDAG.Nodes<String> actual, String... expected) {
+        assertEquals(List.of(expected), StreamSupport.stream(actual.spliterator(), false).toList());
+    }
+
+    private static FixedDAG<String> create(Collection<DirectedEdge<String>> edges) {
+        final var graphBuilder = FixedDAG.<String>build();
+        edges.forEach(graphBuilder::addEdge);
+        return graphBuilder.create();
+    }
+
+    private static <T> DirectedEdge<T> edge(T tail, T head) {
+        return DirectedEdge.create(tail, head);
+    }
+
+    private static final String A = "A";
+    private static final String B = "B";
+    private static final String C = "C";
+    private static final String D = "D";
+    private static final String K = "K";
+    private static final String L = "L";
+    private static final String M = "M";
+    private static final String N = "N";
+    private static final String O = "O";
+    private static final String P = "P";
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/TaskPipelineBuilderTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/TaskPipelineBuilderTest.java
new file mode 100644
index 00000000000..8d34c1be155
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/TaskPipelineBuilderTest.java
@@ -0,0 +1,496 @@
+/*
+ * 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.pipeline;
+
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.locks.LockSupport;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+final class TaskPipelineBuilderTest {
+
+    private static final class TestException extends Exception {
+
+        TestException(TestTask sender) {
+            super(makeMessage(sender));
+        }
+
+        static String makeMessage(TestTask sender) {
+            return "Thrown by " + sender.name();
+        }
+
+        private static final long serialVersionUID = 1L;
+    }
+
+    private enum TestTask implements Consumer<StringBuffer> {
+        A,
+        B,
+        C,
+        D,
+        K,
+        L,
+        M,
+        N,
+        THROW_1(true);
+
+        TestTask(boolean fail) {
+            this.fail = fail;
+        }
+
+        TestTask() {
+            fail = false;
+        }
+
+        @Override
+        public void accept(StringBuffer sb) {
+            LockSupport.parkNanos(Duration.ofMillis(1).toNanos());
+            System.out.println(String.format("[%s] result before append: [%s]; append %s", Thread.currentThread(), sb, name()));
+            sb.append(name());
+        }
+
+        Callable<Void> toCallable(StringBuffer sb) {
+            return new Callable<> () {
+
+                @Override
+                public Void call() throws Exception {
+                    if (isThrowing()) {
+                        throw new TestException(TestTask.this);
+                    }
+                    accept(sb);
+                    return null;
+                }
+
+                @Override
+                public String toString() {
+                    return TestTask.this.toString();
+                }
+
+            };
+        }
+
+        private boolean isThrowing() {
+            return fail;
+        }
+
+        static Stream<TestTask> nonThrowingTasks() {
+            return Stream.of(values()).filter(Predicate.not(TestTask::isThrowing));
+        }
+
+        private final boolean fail;
+    }
+
+    private record TaskSpec(TestTask task, List<TestTask> dependencies, TestTask dependent) {
+
+        TaskSpec {
+            Objects.requireNonNull(task);
+            Objects.requireNonNull(dependencies);
+        }
+
+        static final class Builder {
+
+            Builder(TestTask task) {
+                this.task = Objects.requireNonNull(task);
+            }
+
+            Builder to(TestTask task) {
+                dependent = task;
+                return this;
+            }
+
+            Builder from(TestTask ... tasks) {
+                dependencies.addAll(List.of(tasks));
+                return this;
+            }
+
+            TaskSpec create() {
+                return new TaskSpec(task, dependencies, dependent);
+            }
+
+            private final TestTask task;
+            private final List<TestTask> dependencies = new ArrayList<>();
+            private TestTask dependent;
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("testIt")
+    public void testIt(TestSpec testSpec) throws Exception {
+        testSpec.test();
+    }
+
+    public record TestSpec(List<TaskSpec> taskSpecs, Object expectedString, Set<TestTask> expectedAnyFailures, Executor executor) {
+
+        public TestSpec {
+            Objects.requireNonNull(taskSpecs);
+            Objects.requireNonNull(expectedString);
+            Objects.requireNonNull(expectedAnyFailures);
+        }
+
+        static final class Builder {
+
+            Builder taskSpecs(TaskSpec ...specs) {
+                taskSpecs.addAll(List.of(specs));
+                return this;
+            }
+
+            Builder expected(Pattern v) {
+                expectedRegexp = v;
+                return this;
+            }
+
+            Builder expected(Predicate<String> v) {
+                expectedPredicate = v;
+                return this;
+            }
+
+            Builder expected(String v) {
+                expectedString = v;
+                return this;
+            }
+
+            Builder expectedAnyFailure(TestTask... v) {
+                expectedAnyFailures.addAll(List.of(v));
+                return this;
+            }
+
+            Builder executor(Executor v) {
+                executor = v;
+                return this;
+            }
+
+            TestSpec create() {
+                final Object expectedObject;
+                if (!isParallel()) {
+                    expectedObject = expectedString;
+                } else if (expectedRegexp != null) {
+                    expectedObject = expectedRegexp;
+                } else if (expectedPredicate != null) {
+                    expectedObject = expectedPredicate;
+                } else {
+                    expectedObject = expectedString;
+                }
+
+                if (expectedPredicate != null && expectedRegexp != null) {
+                    throw new IllegalStateException();
+                }
+
+                return new TestSpec(taskSpecs, expectedObject, expectedAnyFailures, executor);
+            }
+
+            private boolean isParallel() {
+                return executor != null;
+            }
+
+            private final List<TaskSpec> taskSpecs = new ArrayList<>();
+            private String expectedString;
+            private Pattern expectedRegexp;
+            private Predicate<String> expectedPredicate;
+            private Set<TestTask> expectedAnyFailures = new HashSet<>();
+            private Executor executor;
+        }
+
+        @SuppressWarnings("unchecked")
+        void test() {
+            final var builder = new TaskPipelineBuilder();
+            builder.executor(executor);
+
+            final var sb = new StringBuffer();
+
+            final var taskMap = Stream.of(TestTask.values()).collect(toMap(x -> x, x -> {
+                return x.toCallable(sb);
+            }));
+
+            taskSpecs.forEach(taskSpec -> {
+                final var taskBuilder = builder.task(taskMap.get(taskSpec.task))
+                        .addDependencies(taskSpec.dependencies.stream().map(taskMap::get).toList());
+                if (taskSpec.dependent != null) {
+                    taskBuilder.addDependent(taskMap.get(taskSpec.dependent));
+                }
+                taskBuilder.add();
+            });
+
+            if (expectedAnyFailures.isEmpty()) {
+                System.out.println(String.format("start for %s", expectedString));
+                assertDoesNotThrow(builder.create()::call);
+            } else {
+                System.out.println(String.format("start for %s throws %s", expectedString, expectedAnyFailures));
+                final var ex = assertThrows(TestException.class, builder.create()::call);
+                assertTrue(expectedAnyFailures.stream().map(TestException::makeMessage).anyMatch(Predicate.isEqual(ex.getMessage())), () -> {
+                    return String.format("Exception message '%s' doesn't match any of failed tasks %s", ex.getMessage(), expectedAnyFailures);
+                });
+            }
+            System.out.println("end");
+
+            final var actualString = sb.toString();
+
+            assertEquals(actualString.length(), actualString.chars().distinct().count());
+
+            if (expectedString instanceof Pattern expectedRegexp) {
+                assertTrue(expectedRegexp.matcher(actualString).matches(), () -> {
+                    return String.format("Regexp %s doesn't match string %s", expectedRegexp, actualString);
+                });
+            } else if (expectedString instanceof Predicate<?> expectedPredicate) {
+                assertTrue(((Predicate<String>)expectedPredicate).test(actualString), () -> {
+                    return String.format("Predicate %s failed for string %s", expectedString, actualString);
+                });
+            } else {
+                assertEquals(expectedString.toString(), actualString);
+            }
+        }
+    }
+
+    private static List<TestSpec> testIt() {
+        final List<TestSpec> data = new ArrayList<>();
+
+        data.add(test().taskSpecs(task(A).create()).expected("A").create());
+
+        data.add(test().taskSpecs(task(B).from(A).create()).expected("AB").create());
+
+        // D <- C <- B
+        // ^         ^
+        // |         |
+        // +--- A ---+
+        data.add(test().taskSpecs(
+                task(D).create(),
+                task(C).from(B).to(D).create(),
+                task(A).to(B).create(),
+                task(A).to(D).create()
+        ).expected("ABCD").create());
+
+        // A <- THROW_1 <- B
+        data.add(test().taskSpecs(
+                task(A).create(),
+                task(THROW_1).from(B).to(A).create()
+        ).expected("B").expectedAnyFailure(THROW_1).create());
+
+        data.addAll(testData(ForkJoinPool.commonPool()));
+        data.addAll(testData(Executors.newSingleThreadExecutor()));
+        data.addAll(testData(Executors.newFixedThreadPool(5)));
+
+        data.addAll(testData(null));
+
+        return data;
+    }
+
+    private static List<TestSpec> testData(Executor executor) {
+        final List<TestSpec> data = new ArrayList<>();
+
+        final var allValuesRegexp = Pattern.compile(String.format("[%s]{%d}",
+                TestTask.nonThrowingTasks().map(Enum::name).collect(joining()), TestTask.nonThrowingTasks().count()));
+
+        data.add(test().executor(executor).taskSpecs(
+                task(D).create(),
+                task(C).from(B).to(D).create(),
+                task(A).to(B).create(),
+                task(A).to(D).create()
+        ).expected("ABCD").create());
+
+        data.add(test().executor(executor).taskSpecs(TestTask.nonThrowingTasks()
+                .map(TaskPipelineBuilderTest::task)
+                .map(TaskSpec.Builder::create)
+                .toArray(TaskSpec[]::new)
+        ).expected(allValuesRegexp).expected(TestTask.nonThrowingTasks().map(Enum::name).collect(joining())).create());
+
+        data.add(test().executor(executor).taskSpecs(TestTask.nonThrowingTasks()
+                .sorted(Comparator.reverseOrder())
+                .map(TaskPipelineBuilderTest::task)
+                .map(TaskSpec.Builder::create)
+                .toArray(TaskSpec[]::new)
+        ).expected(allValuesRegexp).expected(TestTask.nonThrowingTasks().sorted(Comparator.reverseOrder()).map(Enum::name).collect(joining())).create());
+
+        // B -> A <- C
+        // ^         ^
+        // |         |
+        // +--- D ---+
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(C).from(D).to(A).create(),
+                task(B).from(D).to(A).create()
+        ).expected(Pattern.compile("D(BC|CB)A")).expected("DCBA").create());
+
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(B).from(D).to(A).create(),
+                task(C).from(D).to(A).create()
+        ).expected(Pattern.compile("D(BC|CB)A")).expected("DBCA").create());
+
+        // B -> A <- C
+        // ^         ^
+        // |         |
+        // +--- D ---+
+        //      ^
+        //      |
+        //      N
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(C).from(D).to(A).create(),
+                task(N).to(D).create(),
+                task(B).from(D).to(A).create()
+        ).expected(Pattern.compile("ND(BC|CB)A")).expected("NDCBA").create());
+
+        // B -> A <- C
+        // ^         ^
+        // |         |
+        // +--- D ---+
+        //      ^
+        //      |
+        // K -> N <- M
+        // ^         ^
+        // |         |
+        // +--- L ---+
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(C).from(D).to(A).create(),
+                task(N).to(D).create(),
+                task(B).from(D).to(A).create(),
+                task(K).from(L).to(N).create(),
+                task(M).from(L).to(N).create()
+        ).expected(Pattern.compile("L(KM|MK)ND(BC|CB)A")).expected("LKMNDCBA").create());
+
+        // +-> A <-+
+        // |       |
+        // B    THROW_1 <- D
+        // ^       ^
+        // |       |
+        // K       C
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(B).from(K).to(A).create(),
+                task(THROW_1).from(D).to(A).create(),
+                task(C).to(THROW_1).create()
+        ).expected(c('K').before('B').and(onlyChars("KBDC"))).expected("KBDC").expectedAnyFailure(THROW_1).create());
+
+        // +--> A <--+
+        // |    ^    |
+        // |    |    |
+        // B    C  THROW_1
+        data.add(test().executor(executor).taskSpecs(
+                task(A).create(),
+                task(B).to(A).create(),
+                task(C).to(A).create(),
+                task(THROW_1).to(A).create()
+        ).expected(onlyChars("BC")).expected("BC").expectedAnyFailure(THROW_1).create());
+
+        return data;
+    }
+
+    private static TaskSpec.Builder task(TestTask task) {
+        return new TaskSpec.Builder(task);
+    }
+
+    private static TestSpec.Builder test() {
+        return new TestSpec.Builder();
+    }
+
+    private record PredicateWithDescritpion<T>(Predicate<T> predicate, String description) implements Predicate<T> {
+
+        PredicateWithDescritpion {
+            Objects.requireNonNull(predicate);
+            Objects.requireNonNull(description);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("(%s)",  description);
+        }
+
+        @Override
+        public Predicate<T> and(Predicate<? super T> other) {
+            return new PredicateWithDescritpion<>(predicate.and(other), String.format("%s and %s", toString(), other));
+        }
+
+        @Override
+        public Predicate<T> or(Predicate<? super T> other) {
+            return new PredicateWithDescritpion<>(predicate.or(other), String.format("%s or %s", toString(), other));
+        }
+
+        @Override
+        public Predicate<T> negate() {
+            return new PredicateWithDescritpion<>(predicate, String.format("!%s", toString()));
+        }
+
+        @Override
+        public boolean test(T t) {
+            return predicate.test(t);
+        }
+    }
+
+    private record StringPredicateBuilder(char ch) {
+        Predicate<String> before(char other) {
+            return new PredicateWithDescritpion<>(str -> {
+                return str.indexOf(ch) < str.indexOf(other);
+            }, String.format("%s before %s",  ch, other));
+        }
+
+        Predicate<String> after(char other) {
+            return new StringPredicateBuilder(other).before(ch);
+        }
+    }
+
+    private static StringPredicateBuilder c(char ch) {
+        return new StringPredicateBuilder(ch);
+    }
+
+    private static Predicate<String> onlyChars(String chars) {
+        return onlyChars(chars.chars().mapToObj(v -> (char)v).toArray(Character[]::new));
+    }
+
+    private static Predicate<String> onlyChars(Character... chars) {
+        return new PredicateWithDescritpion<>(str -> {
+            final Set<Character> set = Set.of(chars);
+            return str.chars().mapToObj(v -> (char)v).allMatch(set::contains);
+        }, String.format("only %s", List.of(chars)));
+    }
+
+    private static final TestTask A = TestTask.A;
+    private static final TestTask B = TestTask.B;
+    private static final TestTask C = TestTask.C;
+    private static final TestTask D = TestTask.D;
+    private static final TestTask K = TestTask.K;
+    private static final TestTask L = TestTask.L;
+    private static final TestTask M = TestTask.M;
+    private static final TestTask N = TestTask.N;
+    private static final TestTask THROW_1 = TestTask.THROW_1;
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CompositeProxyTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CompositeProxyTest.java
new file mode 100644
index 00000000000..1ece83be0a6
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CompositeProxyTest.java
@@ -0,0 +1,374 @@
+/*
+ * 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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+
+public class CompositeProxyTest {
+
+    static interface Smalltalk {
+
+        default String sayHello() {
+            return "Hello";
+        }
+
+        default String sayBye() {
+            return "Bye";
+        }
+    }
+
+    static interface ConvoMixin {
+
+        String sayThings();
+
+        record Stub(String sayThings) implements ConvoMixin {
+        }
+    }
+
+    static interface Convo extends Smalltalk, ConvoMixin {
+    }
+
+    static interface ConvoMixinWithOverrideSayBye {
+
+        String sayThings();
+
+        String sayBye();
+
+        record Stub(String sayThings, String sayBye) implements ConvoMixinWithOverrideSayBye {
+        }
+    }
+
+    static interface ConvoWithOverrideSayBye extends Smalltalk, ConvoMixinWithOverrideSayBye {
+        @Override
+        String sayBye();
+    }
+
+    static interface ConvoWithDefaultSayHelloWithOverrideSayBye extends Smalltalk, ConvoMixinWithOverrideSayBye {
+        @Override
+        String sayBye();
+
+        @Override
+        default String sayHello() {
+            return "Ciao";
+        }
+
+        static String saySomething() {
+            return "blah";
+        }
+    }
+
+    @Test
+    public void testSmalltalk() {
+        var convo = CompositeProxy.create(Smalltalk.class);
+        assertEquals("Hello", convo.sayHello());
+        assertEquals("Bye", convo.sayBye());
+    }
+
+    @Test
+    public void testConvo() {
+        final var otherThings = "How is your day?";
+        var convo = CompositeProxy.create(Convo.class,
+                new Smalltalk() {}, new ConvoMixin.Stub(otherThings));
+        assertEquals("Hello", convo.sayHello());
+        assertEquals("Bye", convo.sayBye());
+        assertEquals(otherThings, convo.sayThings());
+    }
+
+    @Test
+    public void testConvoWithDuke() {
+        final var otherThings = "How is your day?";
+        var convo = CompositeProxy.create(Convo.class, new Smalltalk() {
+            @Override
+            public String sayHello() {
+                return "Hello, Duke";
+            }
+        }, new ConvoMixin.Stub(otherThings));
+        assertEquals("Hello, Duke", convo.sayHello());
+        assertEquals("Bye", convo.sayBye());
+        assertEquals(otherThings, convo.sayThings());
+    }
+
+    @Test
+    public void testConvoWithCustomSayBye() {
+        var mixin = new ConvoMixinWithOverrideSayBye.Stub("How is your day?", "See you");
+
+        var convo = CompositeProxy.create(ConvoWithOverrideSayBye.class, new Smalltalk() {}, mixin);
+
+        var expectedConvo = new ConvoWithOverrideSayBye() {
+            @Override
+            public String sayBye() {
+                return mixin.sayBye;
+            }
+
+            @Override
+            public String sayThings() {
+                return mixin.sayThings;
+            }
+        };
+
+        assertEquals(expectedConvo.sayHello(), convo.sayHello());
+        assertEquals(expectedConvo.sayBye(), convo.sayBye());
+        assertEquals(expectedConvo.sayThings(), convo.sayThings());
+    }
+
+    @Test
+    public void testConvoWithCustomSayHelloAndSayBye() {
+        var mixin = new ConvoMixinWithOverrideSayBye.Stub("How is your day?", "See you");
+
+        var convo = CompositeProxy.create(ConvoWithDefaultSayHelloWithOverrideSayBye.class, new Smalltalk() {}, mixin);
+
+        var expectedConvo = new ConvoWithDefaultSayHelloWithOverrideSayBye() {
+            @Override
+            public String sayBye() {
+                return mixin.sayBye;
+            }
+
+            @Override
+            public String sayThings() {
+                return mixin.sayThings;
+            }
+        };
+
+        assertEquals("Ciao", expectedConvo.sayHello());
+        assertEquals(expectedConvo.sayHello(), convo.sayHello());
+        assertEquals(expectedConvo.sayBye(), convo.sayBye());
+        assertEquals(expectedConvo.sayThings(), convo.sayThings());
+    }
+
+    @Test
+    public void testInherited() {
+        interface Base {
+            String doSome();
+        }
+
+        interface Next extends Base {
+            String doNext();
+        }
+
+        interface Last extends Next {
+        }
+
+        var last = CompositeProxy.create(Last.class, new Next() {
+            @Override
+            public String doNext() {
+                return "next";
+            }
+
+            @Override
+            public String doSome() {
+                return "some";
+            }
+        });
+
+        assertEquals("next", last.doNext());
+        assertEquals("some", last.doSome());
+    }
+
+    @Test
+    public void testNestedProxy() {
+        interface AddM {
+            String m();
+        }
+
+        interface AddN {
+            String n();
+        }
+
+        interface A extends AddM {
+        }
+
+        interface B extends AddN  {
+        }
+
+        interface C extends A, B {
+        }
+
+        var proxyA = CompositeProxy.create(A.class, new AddM() {
+            @Override
+            public String m() {
+                return "hello";
+            }
+        });
+        var proxyB = CompositeProxy.create(B.class, new AddN() {
+            @Override
+            public String n() {
+                return "bye";
+            }
+
+        });
+        var proxyC = CompositeProxy.create(C.class, proxyA, proxyB);
+
+        assertEquals("hello", proxyC.m());
+        assertEquals("bye", proxyC.n());
+    }
+
+    @Test
+    public void testComposite() {
+        interface A {
+            String sayHello();
+            String sayBye();
+            default String talk() {
+                return String.join(",", sayHello(), sayBye());
+            }
+        }
+
+        interface B extends A {
+            @Override
+            default String sayHello() {
+                return "ciao";
+            }
+        }
+
+        var proxy = CompositeProxy.create(B.class, new A() {
+            @Override
+            public String sayHello() {
+                return "hello";
+            }
+
+            @Override
+            public String sayBye() {
+                return "bye";
+            }
+        });
+
+        assertEquals("ciao,bye", proxy.talk());
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void testBasicObjectMethods(boolean withOverrides) {
+        interface A {
+            default void foo() {}
+        }
+
+        interface B {
+            default void bar() {}
+        }
+
+        interface C extends A, B {
+        }
+
+        final A aImpl;
+        final B bImpl;
+
+        if (withOverrides) {
+            aImpl = new A() {
+                @Override
+                public String toString() {
+                    return "theA";
+                }
+
+                @Override
+                public boolean equals(Object other) {
+                    return true;
+                }
+
+                @Override
+                public int hashCode() {
+                    return 7;
+                }
+            };
+
+            bImpl = new B() {
+                @Override
+                public String toString() {
+                    return "theB";
+                }
+            };
+        } else {
+            aImpl = new A() {};
+            bImpl = new B() {};
+        }
+
+        var proxy = CompositeProxy.create(C.class, aImpl, bImpl);
+        var proxy2 = CompositeProxy.create(C.class, aImpl, bImpl);
+
+        assertNotEquals(proxy.toString(), proxy2.toString());
+        assertNotEquals(proxy.hashCode(), proxy2.hashCode());
+        assertFalse(proxy.equals(proxy2));
+        assertFalse(proxy2.equals(proxy));
+        assertTrue(proxy.equals(proxy));
+        assertTrue(proxy2.equals(proxy2));
+    }
+
+    @Test
+    public void testJavadocExample() {
+        interface Sailboat {
+            default void trimSails() {}
+        }
+
+        interface WithMain {
+            void trimMain();
+        }
+
+        interface WithJib {
+            void trimJib();
+        }
+
+        interface Sloop extends Sailboat, WithMain, WithJib {
+            @Override
+            public default void trimSails() {
+                System.out.println("On the sloop:");
+                trimMain();
+                trimJib();
+            }
+        }
+
+        interface Catboat extends Sailboat, WithMain {
+            @Override
+            public default void trimSails() {
+                System.out.println("On the catboat:");
+                trimMain();
+            }
+        }
+
+        final var withMain = new WithMain() {
+            @Override
+            public void trimMain() {
+                System.out.println("  trim the main");
+            }
+        };
+
+        final var withJib = new WithJib() {
+            @Override
+            public void trimJib() {
+                System.out.println("  trim the jib");
+            }
+        };
+
+        Sloop sloop = CompositeProxy.create(Sloop.class, new Sailboat() {}, withMain, withJib);
+
+        Catboat catboat = CompositeProxy.create(Catboat.class, new Sailboat() {}, withMain);
+
+        sloop.trimSails();
+        catboat.trimSails();
+    }
+}
diff --git a/test/jdk/tools/jpackage/share/PostImageScriptTest.java b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
index 1bb1d5dc78b..bbdd0b7c581 100644
--- a/test/jdk/tools/jpackage/share/PostImageScriptTest.java
+++ b/test/jdk/tools/jpackage/share/PostImageScriptTest.java
@@ -146,13 +146,15 @@ PackageTest initTest(PackageTest test) {
                     final Path runtimeBinDir = runtimeDir.resolve("bin");
 
                     if (TKit.isWindows()) {
-                        JPackageUserScript.POST_IMAGE.create(cmd, List.of(
-                                WinGlobals.JS_SHELL.expr(),
-                                WinGlobals.JS_FS.expr(),
+                        final List<String> script = new ArrayList<>();
+                        script.addAll(WinGlobals.JS_SHELL.expr());
+                        script.addAll(WinGlobals.JS_FS.expr());
+                        script.addAll(List.of(
                                 "WScript.Echo('PWD: ' + fs.GetFolder(shell.CurrentDirectory).Path)",
                                 String.format("WScript.Echo('Probe directory: %s')", runtimeBinDir),
                                 String.format("fs.GetFolder('%s')", runtimeBinDir.toString().replace('\\', '/'))
                         ));
+                        JPackageUserScript.POST_IMAGE.create(cmd, script);
                     } else {
                         JPackageUserScript.POST_IMAGE.create(cmd, List.of(
                                 "set -e",
@@ -203,7 +205,7 @@ public static void testWithServices(Mode mode) {
         JPackageUserScript.verifyPackagingDirectories()
                 .withUnchangedDirectory("../services")
                 .withUnchangedDirectory("../support")
-                .withEmptyDirectory("../packages")
+                .withNonexistantPath("../packages")
                 .apply(test).run(Action.CREATE);
     }
 
diff --git a/test/jdk/tools/jpackage/share/RuntimeImageTest.java b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
index 6ed38f2c5c1..1110a813cde 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
@@ -82,11 +82,20 @@ public static void testStrippedFiles() throws IOException {
         Files.createFile(runtimePath.resolve("lib/src.zip"));
         Files.createFile(runtimePath.resolve("src.zip"));
 
+        Files.createDirectories(runtimePath.resolve("foo/bar/src.zip"));
+        Files.createFile(runtimePath.resolve("foo/jmods"));
+        Files.createFile(runtimePath.resolve("foo/src.zip"));
+        Files.createDirectories(runtimePath.resolve("custom/jmods"));
+
         (new JPackageCommand()).addArguments(cmd.getAllArguments()).executeAndAssertHelloAppImageCreated();
 
         final var appRuntimeDir = cmd.appLayout().runtimeHomeDirectory();
         TKit.assertPathExists(appRuntimeDir.resolve("jmods"), false);
         TKit.assertPathExists(appRuntimeDir.resolve("lib/src.zip"), false);
         TKit.assertPathExists(appRuntimeDir.resolve("src.zip"), false);
+        TKit.assertDirectoryExists(appRuntimeDir.resolve("foo/bar/src.zip"));
+        TKit.assertDirectoryExists(appRuntimeDir.resolve("custom/jmods"));
+        TKit.assertFileExists(appRuntimeDir.resolve("foo/jmods"));
+        TKit.assertFileExists(appRuntimeDir.resolve("foo/src.zip"));
     }
 }

From 254713ab598f186fd31484a48a6dfebaeb752920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 21 May 2025 14:37:30 +0000
Subject: [PATCH 563/901] 8338833: Error on reference not found for a snippet
 target

Reviewed-by: prappo
---
 .../formats/html/taglets/SnippetTaglet.java   | 15 +++---
 .../testSnippetTag/TestSnippetMarkup.java     | 48 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 9 deletions(-)

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 b166f4588ce..32bcab0eef5 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
@@ -136,7 +136,7 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
             if (styles.isEmpty()) {
                 code.add(text);
             } else {
-                Element e = null;
+                Element ref = null;
                 String linkTarget = null;
                 boolean markupEncountered = false;
                 Set<String> classes = new HashSet<>();
@@ -152,9 +152,11 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
                                         content.asCharSequence().toString().trim());
                             }
                             linkTarget = l.target();
-                            e = getLinkedElement(element, linkTarget);
-                            if (e == null) {
-                                // TODO: diagnostic output
+                            ref = getLinkedElement(element, linkTarget);
+                            if (ref == null) {
+                                messages.error(utils.getCommentHelper(element).getDocTreePath(tag),
+                                        "doclet.link.see.reference_not_found",
+                                        linkTarget);
                             }
                         }
                         case Style.Markup m -> markupEncountered = true;
@@ -164,7 +166,6 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
                 if (markupEncountered) {
                     return;
                 } else if (linkTarget != null) {
-                    assert e != null;
                     //disable preview tagging inside the snippets:
                     Utils.PreviewFlagProvider prevPreviewProvider = utils.setPreviewFlagProvider(el -> false);
                     try {
@@ -172,10 +173,10 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
                         c = lt.linkSeeReferenceOutput(element,
                                 null,
                                 linkTarget,
-                                e,
+                                ref,
                                 false, // TODO: for now
                                 Text.of(sequence.toString()),
-                                (key, args) -> { /* TODO: report diagnostic */ },
+                                (key, args) -> { /* Error has already been reported above */ },
                                 tagletWriter);
                     } finally {
                         utils.setPreviewFlagProvider(prevPreviewProvider);
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
index 62782758215..a3e92584ae2 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8266666 8281969 8319339
+ * @bug 8266666 8281969 8319339 8338833
  * @summary Implementation for snippets
  * @library /tools/lib ../../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -206,6 +206,50 @@ public void testLink(Path base) throws Exception {
         testPositive(base, testCases);
     }
 
+    /*
+     * Make sure an error is generated for links with invalid reference.
+     */
+    @Test
+    public void testLinkReferenceNotFound(Path base) throws Exception {
+        Path srcDir = base.resolve("src");
+        Path outDir = base.resolve("out");
+
+        new ClassBuilder(tb, "pkg.A")
+                .setModifiers("public", "class")
+                .addMembers(
+                        ClassBuilder.MethodBuilder
+                                .parse("public void inline() { }")
+                                .setComments("""
+                                    First sentence.
+                                    {@snippet :
+                                        First line  // @link substring="First" target="String"
+                                        Second line // @link substring="Second" target="StringReader"
+                                    }
+                                """))
+                .write(srcDir);
+
+        javadoc("-d", outDir.toString(),
+                "-sourcepath", srcDir.toString(),
+                "pkg");
+
+        checkExit(Exit.ERROR);
+        checkOutput(Output.OUT, false,
+                """
+                        error: reference not found: String
+                        """);
+        checkOutput(Output.OUT, true,
+                """
+                        A.java:5: error: reference not found: StringReader
+                        """);
+        checkOutput("pkg/A.html", true,
+                """
+                        <details class="invalid-tag">
+                        <summary>invalid reference</summary>
+                        <pre><code>Second</code></pre>
+                        </details>""");
+        checkNoCrashes();
+    }
+
     @Test
     public void testCornerCases(Path base) throws Exception {
         var testCases = List.of(

From 275cfd323b1b7b5e8927e7be2f229d200bac9980 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 21 May 2025 15:21:49 +0000
Subject: [PATCH 564/901] 8357280: (bf) Remove @requires tags from
 java/nio/Buffer/LimitDirectMemory[NegativeTest].java

Reviewed-by: alanb
---
 test/jdk/java/nio/Buffer/LimitDirectMemory.java             | 3 +--
 test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/nio/Buffer/LimitDirectMemory.java b/test/jdk/java/nio/Buffer/LimitDirectMemory.java
index 49ac8c18469..353044bc454 100644
--- a/test/jdk/java/nio/Buffer/LimitDirectMemory.java
+++ b/test/jdk/java/nio/Buffer/LimitDirectMemory.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
@@ -25,7 +25,6 @@
  * @test
  * @bug 4627316 6743526
  * @summary Test option to limit direct memory allocation
- * @requires (os.arch == "x86_64") | (os.arch == "amd64") | (os.arch == "aarch64")
  * @library /test/lib
  *
  * @summary Test: memory is properly limited using multiple buffers
diff --git a/test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java b/test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java
index 0d6666cc2e3..9b0fc9fec0d 100644
--- a/test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.java
+++ b/test/jdk/java/nio/Buffer/LimitDirectMemoryNegativeTest.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
@@ -26,7 +26,6 @@
  * @bug 4627316 6743526
  * @summary Test option to limit direct memory allocation,
  *          various bad values fail to launch the VM
- * @requires (os.arch == "x86_64") | (os.arch == "amd64")
  * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.Asserts

From 6546de1d3adb8c4755950ee6fb858ec9ee1c5294 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 21 May 2025 16:32:36 +0000
Subject: [PATCH 565/901] 8357478: Fix copyright header in
 src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java

Reviewed-by: jpai
---
 .../share/classes/jdk/jpackage/internal/AppImageDesc.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
index f34b10cd0a5..fafcb7777a6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
@@ -1,5 +1,6 @@
 /*
  * 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

From f1eead60358fb919a94c7a91e61d1e54f04e584a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 21 May 2025 17:20:46 +0000
Subject: [PATCH 566/901] 8357452: Remove code span highlight in JavaDoc
 default stylesheet

Reviewed-by: nbenalla, jjg, liach
---
 .../doclets/formats/html/resources/stylesheet.css     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index c2351d113cc..08cd78dad78 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
@@ -167,9 +167,6 @@ tt {
 code {
     font-family:var(--code-font-family);
     font-size:var(--code-font-size);
-    background-color: var(--code-background-color);
-    padding: 1px 2px;
-    border-radius: 3px;
 }
 button {
     font-family: var(--body-font-family);
@@ -846,12 +843,6 @@ div.block {
 [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);
@@ -912,8 +903,6 @@ sup.restricted-mark > a:link {
 }
 .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;

From 2dfbf41d2a3dbcd44f9ed9a58a1b0932d7536977 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Wed, 21 May 2025 17:21:05 +0000
Subject: [PATCH 567/901] 8351907: [XWayland] [OL10] Robot.mousePress() is
 delivered to wrong place

Reviewed-by: honkar, prr
---
 .../unix/classes/sun/awt/UNIXToolkit.java     |   7 +-
 .../unix/classes/sun/awt/X11/XRobotPeer.java  |  63 ++-
 .../unix/classes/sun/awt/X11/XToolkit.java    |  27 +-
 .../sun/awt/screencast/ScreencastHelper.java  |  85 ++-
 .../sun/awt/screencast/TokenStorage.java      |  22 +-
 .../sun/awt/screencast/XdgDesktopPortal.java  |  90 +++
 .../native/libawt_xawt/awt/gtk3_interface.c   |   7 +-
 .../native/libawt_xawt/awt/gtk3_interface.h   |   5 +-
 .../native/libawt_xawt/awt/gtk_interface.h    |   5 +-
 .../libawt_xawt/awt/screencast_pipewire.c     | 167 +++++-
 .../libawt_xawt/awt/screencast_pipewire.h     |   4 +-
 .../libawt_xawt/awt/screencast_portal.c       | 511 ++++++++++++++++--
 .../libawt_xawt/awt/screencast_portal.h       |  31 +-
 13 files changed, 887 insertions(+), 137 deletions(-)
 create mode 100644 src/java.desktop/unix/classes/sun/awt/screencast/XdgDesktopPortal.java

diff --git a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
index 053684423de..7e27248ebae 100644
--- a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
@@ -50,7 +50,6 @@
 import java.awt.image.WritableRaster;
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 
 import sun.awt.X11.XBaseWindow;
 import com.sun.java.swing.plaf.gtk.GTKConstants.TextDirection;
@@ -254,14 +253,12 @@ public boolean shouldDisableSystemTray() {
         return result;
     }
 
-    private Integer getGnomeShellMajorVersion() {
+    public Integer getGnomeShellMajorVersion() {
         try {
             Process process =
                 new ProcessBuilder("/usr/bin/gnome-shell", "--version")
                         .start();
-            try (InputStreamReader isr = new InputStreamReader(process.getInputStream());
-                 BufferedReader reader = new BufferedReader(isr)) {
-
+            try (BufferedReader reader = process.inputReader()) {
                 if (process.waitFor(2, SECONDS) &&  process.exitValue() == 0) {
                     String line = reader.readLine();
                     if (line != null) {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
index fa0bdbed68c..f53e521d81a 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.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
@@ -35,13 +35,11 @@
 import sun.awt.X11GraphicsConfig;
 import sun.awt.X11GraphicsDevice;
 import sun.awt.screencast.ScreencastHelper;
+import sun.awt.screencast.XdgDesktopPortal;
 
 final class XRobotPeer implements RobotPeer {
 
     private static final boolean tryGtk;
-    private static final String screenshotMethod;
-    private static final String METHOD_X11 = "x11";
-    private static final String METHOD_SCREENCAST = "dbusScreencast";
 
     static {
         loadNativeLibraries();
@@ -49,19 +47,6 @@ final class XRobotPeer implements RobotPeer {
         tryGtk = Boolean.parseBoolean(
                             System.getProperty("awt.robot.gtk", "true")
                  );
-
-        boolean isOnWayland = false;
-
-        if (Toolkit.getDefaultToolkit() instanceof SunToolkit sunToolkit) {
-            isOnWayland = sunToolkit.isRunningOnWayland();
-        }
-
-        screenshotMethod = System.getProperty(
-                        "awt.robot.screenshotMethod",
-                        isOnWayland
-                            ? METHOD_SCREENCAST
-                            : METHOD_X11
-                );
     }
 
     private static volatile boolean useGtk;
@@ -86,39 +71,63 @@ final class XRobotPeer implements RobotPeer {
     @Override
     public void mouseMove(int x, int y) {
         mouseMoveImpl(xgc, xgc.scaleUp(x), xgc.scaleUp(y));
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            // We still call mouseMoveImpl on purpose to change the mouse position
+            // within the XWayland server so that we can retrieve it later.
+            ScreencastHelper.remoteDesktopMouseMove(xgc.scaleUp(x), xgc.scaleUp(y));
+        }
     }
 
     @Override
     public void mousePress(int buttons) {
-        mousePressImpl(buttons);
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            ScreencastHelper.remoteDesktopMouseButton(true, buttons);
+        } else {
+            mousePressImpl(buttons);
+        }
     }
 
     @Override
     public void mouseRelease(int buttons) {
-        mouseReleaseImpl(buttons);
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            ScreencastHelper.remoteDesktopMouseButton(false, buttons);
+        } else {
+            mouseReleaseImpl(buttons);
+        }
     }
 
     @Override
     public void mouseWheel(int wheelAmt) {
-        mouseWheelImpl(wheelAmt);
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            ScreencastHelper.remoteDesktopMouseWheel(wheelAmt);
+        } else {
+            mouseWheelImpl(wheelAmt);
+        }
     }
 
     @Override
     public void keyPress(int keycode) {
-        keyPressImpl(keycode);
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            ScreencastHelper.remoteDesktopKey(true, keycode);
+        } else {
+            keyPressImpl(keycode);
+        }
     }
 
     @Override
     public void keyRelease(int keycode) {
-        keyReleaseImpl(keycode);
+        if (XdgDesktopPortal.isRemoteDesktop() && ScreencastHelper.isAvailable()) {
+            ScreencastHelper.remoteDesktopKey(false, keycode);
+        } else {
+            keyReleaseImpl(keycode);
+        }
     }
 
     @Override
     public int getRGBPixel(int x, int y) {
         int[] pixelArray = new int[1];
-        if (screenshotMethod.equals(METHOD_SCREENCAST)
-            && ScreencastHelper.isAvailable()) {
-
+        if ((XdgDesktopPortal.isScreencast()
+                || XdgDesktopPortal.isRemoteDesktop()) && ScreencastHelper.isAvailable()) {
             ScreencastHelper.getRGBPixels(x, y, 1, 1, pixelArray);
         } else {
             getRGBPixelsImpl(xgc, x, y, 1, 1, pixelArray, useGtk);
@@ -129,8 +138,8 @@ public int getRGBPixel(int x, int y) {
     @Override
     public int[] getRGBPixels(Rectangle bounds) {
         int[] pixelArray = new int[bounds.width * bounds.height];
-        if (screenshotMethod.equals(METHOD_SCREENCAST)
-            && ScreencastHelper.isAvailable()) {
+        if ((XdgDesktopPortal.isScreencast()
+                || XdgDesktopPortal.isRemoteDesktop()) && ScreencastHelper.isAvailable()) {
 
             ScreencastHelper.getRGBPixels(bounds.x, bounds.y,
                                           bounds.width, bounds.height,
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
index 3a7ea1e40ed..eab0817af23 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.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
@@ -138,6 +138,8 @@
 import sun.awt.X11GraphicsEnvironment;
 import sun.awt.XSettings;
 import sun.awt.datatransfer.DataTransferer;
+import sun.awt.screencast.ScreencastHelper;
+import sun.awt.screencast.XdgDesktopPortal;
 import sun.awt.util.PerformanceLogger;
 import sun.awt.util.ThreadGroupUtils;
 import sun.font.FontConfigManager;
@@ -1521,16 +1523,21 @@ public int getNumberOfButtons(){
         awtLock();
         try {
             if (numberOfButtons == 0) {
-                numberOfButtons = getNumberOfButtonsImpl();
-                numberOfButtons = (numberOfButtons > MAX_BUTTONS_SUPPORTED)? MAX_BUTTONS_SUPPORTED : numberOfButtons;
-                //4th and 5th buttons are for wheel and shouldn't be reported as buttons.
-                //If we have more than 3 physical buttons and a wheel, we report N-2 buttons.
-                //If we have 3 physical buttons and a wheel, we report 3 buttons.
-                //If we have 1,2,3 physical buttons, we report it as is i.e. 1,2 or 3 respectively.
-                if (numberOfButtons >=5) {
-                    numberOfButtons -= 2;
-                } else if (numberOfButtons == 4 || numberOfButtons ==5){
+                if (XdgDesktopPortal.isRemoteDesktop()
+                        && ScreencastHelper.isAvailable()) {
                     numberOfButtons = 3;
+                } else {
+                    numberOfButtons = getNumberOfButtonsImpl();
+                    numberOfButtons = (numberOfButtons > MAX_BUTTONS_SUPPORTED) ? MAX_BUTTONS_SUPPORTED : numberOfButtons;
+                    //4th and 5th buttons are for wheel and shouldn't be reported as buttons.
+                    //If we have more than 3 physical buttons and a wheel, we report N-2 buttons.
+                    //If we have 3 physical buttons and a wheel, we report 3 buttons.
+                    //If we have 1,2,3 physical buttons, we report it as is i.e. 1,2 or 3 respectively.
+                    if (numberOfButtons >= 5) {
+                        numberOfButtons -= 2;
+                    } else if (numberOfButtons == 4 || numberOfButtons == 5) {
+                        numberOfButtons = 3;
+                    }
                 }
             }
             //Assume don't have to re-query the number again and again.
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
index 4065fd04b93..33af39810d5 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/ScreencastHelper.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
@@ -38,6 +38,7 @@
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.function.Function;
 import java.util.stream.IntStream;
 
 /**
@@ -51,10 +52,13 @@ public final class ScreencastHelper {
     static final boolean SCREENCAST_DEBUG;
     private static final boolean IS_NATIVE_LOADED;
 
-
     private static final int ERROR = -1;
     private static final int DENIED = -11;
     private static final int OUT_OF_BOUNDS = -12;
+    private static final int NO_STREAMS = -13;
+
+    private static final int XDG_METHOD_SCREENCAST = 0;
+    private static final int XDG_METHOD_REMOTE_DESKTOP = 1;
 
     private static final int DELAY_BEFORE_SESSION_CLOSE = 2000;
 
@@ -63,17 +67,23 @@ public final class ScreencastHelper {
             = new Timer("auto-close screencast session", true);
 
 
-    private ScreencastHelper() {
-    }
+    private ScreencastHelper() {}
 
     static {
         SCREENCAST_DEBUG = Boolean.getBoolean("awt.robot.screenshotDebug");
 
         boolean loadFailed = false;
 
+        boolean shouldLoadNative = XdgDesktopPortal.isRemoteDesktop()
+                || XdgDesktopPortal.isScreencast();
+
+        int methodId = XdgDesktopPortal.isScreencast()
+                ? XDG_METHOD_SCREENCAST
+                : XDG_METHOD_REMOTE_DESKTOP;
+
         if (!(Toolkit.getDefaultToolkit() instanceof UNIXToolkit tk
               && tk.loadGTK())
-              || !loadPipewire(SCREENCAST_DEBUG)) {
+              || !(shouldLoadNative && loadPipewire(methodId, SCREENCAST_DEBUG))) {
 
             System.err.println(
                     "Could not load native libraries for ScreencastHelper"
@@ -89,7 +99,7 @@ public static boolean isAvailable() {
         return IS_NATIVE_LOADED;
     }
 
-    private static native boolean loadPipewire(boolean screencastDebug);
+    private static native boolean loadPipewire(int method, boolean isDebug);
 
     private static native int getRGBPixelsImpl(
             int x, int y, int width, int height,
@@ -186,7 +196,7 @@ public static synchronized void getRGBPixels(
 
             if (retVal >= 0) { // we have received a screen data
                 return;
-            } else if (!checkReturnValue(retVal)) {
+            } else if (!checkReturnValue(retVal, true)) {
                 return;
             } // else, try other tokens
         }
@@ -200,25 +210,72 @@ public static synchronized void getRGBPixels(
                 null
         );
 
-        checkReturnValue(retVal);
+        checkReturnValue(retVal, true);
     }
 
-    private static boolean checkReturnValue(int retVal) {
+    private static boolean checkReturnValue(int retVal,
+                                            boolean throwException) {
         if (retVal == DENIED) {
-            // user explicitly denied the capture, no more tries.
-            throw new SecurityException(
-                    "Screen Capture in the selected area was not allowed"
-            );
+            if (SCREENCAST_DEBUG) {
+                System.err.println("robot action: access denied by user.");
+            }
+            if (throwException) {
+                // user explicitly denied the capture, no more tries.
+                throw new SecurityException(
+                        "Screen Capture in the selected area was not allowed"
+                );
+            }
         } else if (retVal == ERROR) {
             if (SCREENCAST_DEBUG) {
-                System.err.println("Screen capture failed.");
+                System.err.println("robot action: failed.");
             }
         } else if (retVal == OUT_OF_BOUNDS) {
             if (SCREENCAST_DEBUG) {
                 System.err.println(
                         "Token does not provide access to requested area.");
             }
+        } else if (retVal == NO_STREAMS) {
+            if (SCREENCAST_DEBUG) {
+                System.err.println("robot action: no streams available");
+            }
         }
         return retVal != ERROR;
     }
+
+    private static void performWithToken(Function<String, Integer> func) {
+        if (!XdgDesktopPortal.isRemoteDesktop() || !IS_NATIVE_LOADED) return;
+
+        timerCloseSessionRestart();
+
+        for (TokenItem tokenItem : TokenStorage.getTokens(getSystemScreensBounds())) {
+            int retVal = func.apply(tokenItem.token);
+
+            if (retVal >= 0 || !checkReturnValue(retVal, false)) {
+                return;
+            }
+        }
+
+        checkReturnValue(func.apply(null), false);
+    }
+
+    public static synchronized void remoteDesktopMouseMove(int x, int y) {
+        performWithToken((token) -> remoteDesktopMouseMoveImpl(x, y, token));
+    }
+
+    public static synchronized void remoteDesktopMouseButton(boolean isPress, int buttons) {
+        performWithToken((token) -> remoteDesktopMouseButtonImpl(isPress, buttons, token));
+    }
+
+    public static synchronized void remoteDesktopMouseWheel(int wheel) {
+        performWithToken((token) -> remoteDesktopMouseWheelImpl(wheel, token));
+    }
+
+    public static synchronized void remoteDesktopKey(boolean isPress, int key) {
+        performWithToken((token) -> remoteDesktopKeyImpl(isPress, key, token));
+    }
+
+    private static synchronized native int remoteDesktopMouseMoveImpl(int x, int y, String token);
+    private static synchronized native int remoteDesktopMouseButtonImpl(boolean isPress, int buttons, String token);
+    private static synchronized native int remoteDesktopMouseWheelImpl(int wheelAmt, String token);
+    private static synchronized native int remoteDesktopKeyImpl(boolean isPress, int key, String token);
 }
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
index 8f712e1d192..9db64725048 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -67,14 +67,15 @@ private TokenStorage() {}
     private static final String REL_NAME_SECONDARY =
             ".awt/robot/screencast-tokens.properties";
 
+    private static final String REL_RD_NAME =
+            ".java/robot/remote-desktop-tokens.properties";
+
     private static final Properties PROPS = new Properties();
     private static final Path PROPS_PATH;
     private static final Path PROP_FILENAME;
 
     static {
-        Path propsPath = setupPath();
-
-        PROPS_PATH = propsPath;
+        PROPS_PATH = setupPath();
 
         if (PROPS_PATH != null) {
             PROP_FILENAME = PROPS_PATH.getFileName();
@@ -95,11 +96,18 @@ private static Path setupPath() {
             return null;
         }
 
-        Path path = Path.of(userHome, REL_NAME);
-        Path secondaryPath = Path.of(userHome, REL_NAME_SECONDARY);
+        Path path;
+        Path secondaryPath = null;
+
+        if (XdgDesktopPortal.isRemoteDesktop()) {
+            path = Path.of(userHome, REL_RD_NAME);
+        } else {
+            path = Path.of(userHome, REL_NAME);
+            secondaryPath = Path.of(userHome, REL_NAME_SECONDARY);
+        }
 
         boolean copyFromSecondary = !Files.isWritable(path)
-                && Files.isWritable(secondaryPath);
+                && secondaryPath != null && Files.isWritable(secondaryPath);
 
         Path workdir = path.getParent();
 
diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/XdgDesktopPortal.java b/src/java.desktop/unix/classes/sun/awt/screencast/XdgDesktopPortal.java
new file mode 100644
index 00000000000..6170c9222a3
--- /dev/null
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/XdgDesktopPortal.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.awt.screencast;
+
+import sun.awt.SunToolkit;
+import sun.awt.UNIXToolkit;
+
+import java.awt.Toolkit;
+
+public class XdgDesktopPortal {
+    private static final String METHOD_X11 = "x11";
+    private static final String METHOD_SCREENCAST = "dbusScreencast";
+    private static final String METHOD_REMOTE_DESKTOP = "dbusRemoteDesktop";
+
+    private static final String method;
+    private static final boolean isRemoteDesktop;
+    private static final boolean isScreencast;
+
+    private XdgDesktopPortal() {}
+
+    static {
+        boolean isOnWayland = false;
+
+        if (Toolkit.getDefaultToolkit() instanceof SunToolkit sunToolkit) {
+            isOnWayland = sunToolkit.isRunningOnWayland();
+        }
+
+        String defaultMethod = METHOD_X11;
+        if (isOnWayland) {
+            Integer gnomeShellVersion = null;
+
+            UNIXToolkit toolkit = (UNIXToolkit) Toolkit.getDefaultToolkit();
+            if ("gnome".equals(toolkit.getDesktop())) {
+                gnomeShellVersion = toolkit.getGnomeShellMajorVersion();
+            }
+
+            defaultMethod = (gnomeShellVersion != null && gnomeShellVersion >= 47)
+                    ? METHOD_REMOTE_DESKTOP
+                    : METHOD_SCREENCAST;
+        }
+
+        String m = System.getProperty("awt.robot.screenshotMethod", defaultMethod);
+
+        if (!METHOD_REMOTE_DESKTOP.equals(m)
+                && !METHOD_SCREENCAST.equals(m)
+                && !METHOD_X11.equals(m)) {
+            m = defaultMethod;
+        }
+
+        isRemoteDesktop = METHOD_REMOTE_DESKTOP.equals(m);
+        isScreencast = METHOD_SCREENCAST.equals(m);
+        method = m;
+
+    }
+
+    public static String getMethod() {
+        return method;
+    }
+
+    public static boolean isRemoteDesktop() {
+        return isRemoteDesktop;
+    }
+
+    public static boolean isScreencast() {
+        return isScreencast;
+    }
+}
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
index 3b115780acf..916880873c6 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
@@ -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
@@ -617,11 +617,14 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
 
         glib_version_2_68 = !fp_glib_check_version(2, 68, 0);
         if (glib_version_2_68) {
+            // those function are called only by Screencast / Remote desktop
             fp_g_string_replace = dl_symbol("g_string_replace"); //since: 2.68
             fp_g_uuid_string_is_valid = //since: 2.52
                     dl_symbol("g_uuid_string_is_valid");
+            fp_g_variant_print = dl_symbol("g_variant_print"); // since 2.24
         }
         fp_g_string_printf = dl_symbol("g_string_printf");
+        fp_g_strconcat = dl_symbol("g_strconcat");
 
         fp_g_error_free = dl_symbol("g_error_free");
         fp_g_unix_fd_list_get = dl_symbol("g_unix_fd_list_get");
@@ -3102,6 +3105,7 @@ static void gtk3_init(GtkApi* gtk) {
     gtk->g_variant_new_string = fp_g_variant_new_string;
     gtk->g_variant_new_boolean = fp_g_variant_new_boolean;
     gtk->g_variant_new_uint32 = fp_g_variant_new_uint32;
+    gtk->g_variant_print = fp_g_variant_print;
 
     gtk->g_variant_get = fp_g_variant_get;
     gtk->g_variant_get_string = fp_g_variant_get_string;
@@ -3126,6 +3130,7 @@ static void gtk3_init(GtkApi* gtk) {
     gtk->g_string_free = fp_g_string_free;
     gtk->g_string_replace = fp_g_string_replace;
     gtk->g_string_printf = fp_g_string_printf;
+    gtk->g_strconcat = fp_g_strconcat;
     gtk->g_uuid_string_is_valid = fp_g_uuid_string_is_valid;
 
     gtk->g_main_context_iteration = fp_g_main_context_iteration;
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
index 6849645784d..d3a83677dd6 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
@@ -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
@@ -399,6 +399,7 @@ static gboolean (*fp_g_str_has_prefix)(const gchar *str, const gchar *prefix);
 static gchar** (*fp_g_strsplit)(const gchar *string, const gchar *delimiter,
            gint max_tokens);
 static void (*fp_g_strfreev)(gchar **str_array);
+static gchar* (*fp_g_strconcat)(const gchar* string1, ...);
 
 
 static cairo_surface_t* (*fp_cairo_image_surface_create)(cairo_format_t format,
@@ -738,6 +739,8 @@ static GVariant *(*fp_g_variant_new_boolean)(gboolean value);
 
 static GVariant *(*fp_g_variant_new_uint32)(guint32 value);
 
+static gchar *(*fp_g_variant_print) (GVariant* value, gboolean type_annotate);
+
 static void (*fp_g_variant_get)(GVariant *value,
                                 const gchar *format_string,
                                 ...);
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
index ac6d2d7fdf6..11ec245ce8b 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
@@ -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
@@ -678,6 +678,7 @@ typedef struct GtkApi {
     GVariant *(*g_variant_new_boolean)(gboolean value);
     GVariant *(*g_variant_new_uint32)(guint32 value);
 
+    gchar *(*g_variant_print)(GVariant* value, gboolean type_annotate);
 
     void (*g_variant_get)(GVariant *value,
                                     const gchar *format_string,
@@ -734,6 +735,8 @@ typedef struct GtkApi {
                              const gchar *format,
                              ...);
 
+    gchar* (*g_strconcat)(const gchar* string1, ...);
+
     gboolean (*g_uuid_string_is_valid)(const gchar *str);
 
 
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 62d9e358173..ec12445c87b 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
@@ -94,6 +94,7 @@ struct pw_properties * (*fp_pw_properties_new)(const char *key, ...);
 
 #include "gtk_interface.h"
 #include "gtk3_interface.h"
+#include "canvas.h"
 
 int DEBUG_SCREENCAST_ENABLED = FALSE;
 
@@ -108,6 +109,7 @@ static GString *activeSessionToken;
 struct ScreenSpace screenSpace = {0};
 static struct PwLoopData pw = {0};
 volatile bool isGtkMainThread = FALSE;
+gboolean isRemoteDesktop = FALSE;
 
 jclass tokenStorageClass = NULL;
 jmethodID storeTokenMethodID = NULL;
@@ -198,7 +200,7 @@ static void doCleanup() {
 /**
  * @return TRUE on success
  */
-static gboolean initScreencast(const gchar *token,
+static gboolean initPortal(const gchar *token,
                                GdkRectangle *affectedBounds,
                                gint affectedBoundsLength) {
     gboolean isSameToken = !token
@@ -225,8 +227,8 @@ static gboolean initScreencast(const gchar *token,
 
     if (!initScreenSpace()
         || !initXdgDesktopPortal()
-        || (pw.pwFd = getPipewireFd(token,
-                                    affectedBounds,
+        || !initAndStartSession(token, &pw.pwFd)
+        || (pw.pwFd = getPipewireFd(affectedBounds,
                                     affectedBoundsLength)) < 0) {
         doCleanup();
         return FALSE;
@@ -858,10 +860,19 @@ void storeRestoreToken(const gchar* oldToken, const gchar* newToken) {
  * Signature: (IZ)Z
  */
 JNIEXPORT jboolean JNICALL Java_sun_awt_screencast_ScreencastHelper_loadPipewire(
-        JNIEnv *env, jclass cls, jboolean screencastDebug
+        JNIEnv *env, jclass cls, jint method, jboolean screencastDebug
 ) {
     DEBUG_SCREENCAST_ENABLED = screencastDebug;
 
+    if (method != XDG_METHOD_SCREENCAST
+        && method != XDG_METHOD_REMOTE_DESKTOP) {
+        return JNI_FALSE;
+    }
+
+    isRemoteDesktop = method == XDG_METHOD_REMOTE_DESKTOP;
+
+    DEBUG_SCREENCAST("method %d\n", method)
+
     if (!loadSymbols()) {
         return JNI_FALSE;
     }
@@ -934,7 +945,7 @@ static int makeScreencast(
         GdkRectangle *affectedScreenBounds,
         gint affectedBoundsLength
 ) {
-    if (!initScreencast(token, affectedScreenBounds, affectedBoundsLength)) {
+    if (!initPortal(token, affectedScreenBounds, affectedBoundsLength)) {
         return pw.pwFd;
     }
 
@@ -1097,10 +1108,130 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl
     releaseToken(env, jtoken, token);
     return 0;
 }
+
+/*
+ * Class:     sun_awt_screencast_ScreencastHelper
+ * Method:    remoteDesktopMouseMove
+ * Signature: (IILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseMoveImpl
+        (JNIEnv *env, jclass cls, jint jx, jint jy, jstring jtoken) {
+
+
+    const gchar *token = jtoken
+                         ? (*env)->GetStringUTFChars(env, jtoken, NULL)
+                         : NULL;
+
+
+    DEBUG_SCREENCAST("moving mouse to\n\t%d %d\n\twith token |%s|\n", jx, jy, token);
+
+    gboolean result = initPortal(token, NULL, 0);
+    DEBUG_SCREENCAST("init result %b, moving to %d %d\n", result, jx, jy)
+
+    if (result) {
+        if (!remoteDesktopMouseMove(jx, jy)) {
+            releaseToken(env, jtoken, token);
+            return RESULT_DENIED;
+        }
+    }
+
+    releaseToken(env, jtoken, token);
+
+    return result ? RESULT_OK : pw.pwFd;
+}
+
+/*
+ * Class:     sun_awt_screencast_ScreencastHelper
+ * Method:    remoteDesktopMouseButtonImpl
+ * Signature: (ZILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseButtonImpl
+        (JNIEnv *env, jclass cls, jboolean isPress, jint buttons, jstring jtoken) {
+
+    const gchar *token = jtoken
+                         ? (*env)->GetStringUTFChars(env, jtoken, NULL)
+                         : NULL;
+
+    gboolean result = initPortal(token, NULL, 0);
+    DEBUG_SCREENCAST("init result %b, mouse pressing %d\n", result, buttons)
+
+    if (result) {
+        if (!remoteDesktopMouse(isPress, buttons)) {
+            releaseToken(env, jtoken, token);
+            return RESULT_DENIED;
+        }
+    }
+
+    releaseToken(env, jtoken, token);
+
+    return result ? RESULT_OK : pw.pwFd;
+}
+
+/*
+ * Class:     sun_awt_screencast_ScreencastHelper
+ * Method:    remoteDesktopMouseWheelImpl
+ * Signature: (ILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseWheelImpl
+        (JNIEnv *env, jclass cls, jint jWheelAmt, jstring jtoken) {
+
+    const gchar *token = jtoken
+                         ? (*env)->GetStringUTFChars(env, jtoken, NULL)
+                         : NULL;
+
+    gboolean result = initPortal(token, NULL, 0);
+    DEBUG_SCREENCAST("init result %b, mouse wheel %d\n", result, jWheelAmt)
+
+    if (result) {
+        if (!remoteDesktopMouseWheel(jWheelAmt)) {
+            releaseToken(env, jtoken, token);
+            return RESULT_DENIED;
+        }
+    }
+
+    releaseToken(env, jtoken, token);
+
+    return result ? RESULT_OK : pw.pwFd;
+}
+
+/*
+ * Class:     sun_awt_screencast_ScreencastHelper
+ * Method:    remoteDesktopKeyImpl
+ * Signature: (ZILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopKeyImpl
+        (JNIEnv *env, jclass cls, jboolean isPress, jint jkey, jstring jtoken) {
+
+    AWT_LOCK();
+    int key = awt_getX11KeySym(jkey);
+    AWT_UNLOCK();
+
+    if (key == NoSymbol) {
+        return RESULT_ERROR;
+    }
+
+    const gchar *token = jtoken
+                         ? (*env)->GetStringUTFChars(env, jtoken, NULL)
+                         : NULL;
+
+    gboolean result = initPortal(token, NULL, 0);
+    DEBUG_SCREENCAST("init result %b, key %d -> %d isPress %b\n", result, jkey, key, isPress)
+
+    if (result) {
+        if (!remoteDesktopKey(isPress, key)) {
+            releaseToken(env, jtoken, token);
+            return RESULT_DENIED;
+        }
+    }
+
+    releaseToken(env, jtoken, token);
+
+    return result ? RESULT_OK : pw.pwFd;
+}
+
 #else
 JNIEXPORT void JNICALL
-Java_sun_awt_screencast_ScreencastHelper_closeSession(JNIEnv *env, jclass cls) {
-}
+Java_sun_awt_screencast_ScreencastHelper_closeSession(JNIEnv *env, jclass cls) {}
 
 JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl(
         JNIEnv *env,
@@ -1117,8 +1248,28 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl
 }
 
 JNIEXPORT jboolean JNICALL Java_sun_awt_screencast_ScreencastHelper_loadPipewire(
-        JNIEnv *env, jclass cls, jboolean screencastDebug
+        JNIEnv *env, jclass cls, jint method, jboolean screencastDebug
 ) {
     return JNI_FALSE;
 }
+
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseMoveImpl
+        (JNIEnv *env, jclass cls, jint jx, jint jy, jstring token) {
+    return -1;
+}
+
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseButtonImpl
+        (JNIEnv *env, jclass cls, jboolean isPress, jint buttons, jstring jtoken) {
+    return -1;
+}
+
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseWheelImpl
+        (JNIEnv *env, jclass cls, jint jWheelAmt, jstring jtoken) {
+    return -1;
+}
+
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_remoteDesktopKeyImpl
+        (JNIEnv *env, jclass cls, jboolean isPress, jint jkey, jstring jtoken) {
+    return -1;
+}
 #endif
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.h b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.h
index 07a7e91304c..30ac0f3582a 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.h
@@ -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
@@ -41,6 +41,8 @@
 
 void storeRestoreToken(const gchar* oldToken, const gchar* newToken);
 
+void print_gvariant_content(gchar *caption, GVariant *response);
+
 struct ScreenProps {
     guint32 id;
     GdkRectangle bounds;
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 4d99b90ba08..fad2cab1696 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
@@ -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
@@ -24,11 +24,9 @@
  */
 
 #include "stdlib.h"
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <string.h>
-#include <pwd.h>
-#include <unistd.h>
+
+#include "java_awt_event_InputEvent.h"
 
 #ifndef _AIX
 #include "screencast_pipewire.h"
@@ -36,10 +34,16 @@
 #include "screencast_portal.h"
 
 extern volatile bool isGtkMainThread;
+extern gboolean isRemoteDesktop;
 
 extern struct ScreenSpace screenSpace;
 
 struct XdgDesktopPortalApi *portal = NULL;
+extern int DEBUG_SCREENCAST_ENABLED;
+
+GDBusProxy *getProxy() {
+    return isRemoteDesktop ? portal->remoteDesktopProxy : portal->screenCastProxy;
+}
 
 void errHandle(
         GError *error,
@@ -170,26 +174,38 @@ gboolean rebuildScreenData(GVariantIter *iterStreams, gboolean isTheOnlyMon) {
 }
 
 /**
- * Checks screencast protocol version
- * @return FALSE if version < 4, or could not be determined
+ * Checks the version of the Screencast/Remote Desktop protocol
+ * to determine whether it supports the restore_token.
+ * @return FALSE if version is below required, or could not be determined
  */
 gboolean checkVersion() {
     static guint32 version = 0;
+
+    const gchar *interface = isRemoteDesktop
+            ? PORTAL_IFACE_REMOTE_DESKTOP
+            : PORTAL_IFACE_SCREENCAST;
+
     if (version == 0) {
         GError *error = NULL;
+
         GVariant *retVersion = gtk->g_dbus_proxy_call_sync(
-                portal->screenCastProxy,
+                getProxy(),
                 "org.freedesktop.DBus.Properties.Get",
                 gtk->g_variant_new("(ss)",
-                                   "org.freedesktop.portal.ScreenCast",
+                                   interface,
                                    "version"),
                 G_DBUS_CALL_FLAGS_NONE,
                 -1, NULL, NULL
         );
 
+        if (isRemoteDesktop) {
+            print_gvariant_content("checkVersion Remote Desktop", retVersion);
+        } else {
+            print_gvariant_content("checkVersion ScreenCast", retVersion);
+        }
+
         if (!retVersion) { //no backend on system
-            DEBUG_SCREENCAST("!!! could not detect the screencast version\n",
-                             NULL);
+            DEBUG_SCREENCAST("!!! could not detect the %s version\n", interface);
             return FALSE;
         }
 
@@ -200,8 +216,7 @@ gboolean checkVersion() {
 
         if (!varVersion){
             gtk->g_variant_unref(retVersion);
-            DEBUG_SCREENCAST("!!! could not get the screencast version\n",
-                             NULL);
+            DEBUG_SCREENCAST("!!! could not get the %s version\n", interface);
             return FALSE;
         }
 
@@ -212,16 +227,22 @@ gboolean checkVersion() {
 
     }
 
-    DEBUG_SCREENCAST("ScreenCast protocol version %d\n", version);
-    if (version < 4) {
-        DEBUG_SCREENCAST("!!! ScreenCast protocol version %d < 4,"
+    gboolean isVersionOk = isRemoteDesktop
+            ? version >= PORTAL_MIN_VERSION_REMOTE_DESKTOP
+            : version >= PORTAL_MIN_VERSION_SCREENCAST;
+
+    if (!isVersionOk) {
+        DEBUG_SCREENCAST("!!! %s protocol version %d < %d,"
                          " session restore is not available\n",
-                         version);
+                         interface,
+                         version,
+                         isRemoteDesktop
+                             ? PORTAL_MIN_VERSION_REMOTE_DESKTOP
+                             : PORTAL_MIN_VERSION_SCREENCAST
+                         );
     }
 
-    // restore_token was added in version 4, without it,
-    // user confirmation is required for every screenshot.
-    return version >= 4;
+    return isVersionOk;
 }
 
 /**
@@ -266,9 +287,9 @@ gboolean initXdgDesktopPortal() {
             portal->connection,
             G_DBUS_PROXY_FLAGS_NONE,
             NULL,
-            "org.freedesktop.portal.Desktop",
-            "/org/freedesktop/portal/desktop",
-            "org.freedesktop.portal.ScreenCast",
+            PORTAL_DESKTOP_BUS_NAME,
+            PORTAL_DESKTOP_OBJECT_PATH,
+            PORTAL_IFACE_SCREENCAST,
             NULL,
             &err
     );
@@ -277,6 +298,29 @@ gboolean initXdgDesktopPortal() {
         DEBUG_SCREENCAST("Failed to get ScreenCast portal: %s", err->message);
         ERR_HANDLE(err);
         return FALSE;
+    } else {
+        DEBUG_SCREENCAST("%s: connection/sender name %s / %s\n",
+                         "ScreenCast", name,
+                         portal->senderName);
+    }
+
+    if (isRemoteDesktop) {
+        portal->remoteDesktopProxy = gtk->g_dbus_proxy_new_sync(
+                portal->connection,
+                G_DBUS_PROXY_FLAGS_NONE,
+                NULL,
+                PORTAL_DESKTOP_BUS_NAME,
+                PORTAL_DESKTOP_OBJECT_PATH,
+                PORTAL_IFACE_REMOTE_DESKTOP,
+                NULL,
+                &err
+        );
+
+        if (err) {
+            DEBUG_SCREENCAST("Failed to get Remote Desktop portal: %s", err->message);
+            ERR_HANDLE(err);
+            return FALSE;
+        }
     }
 
     return checkVersion();
@@ -337,8 +381,8 @@ static void registerScreenCastCallback(
 ) {
     helper->id = gtk->g_dbus_connection_signal_subscribe(
             portal->connection,
-            "org.freedesktop.portal.Desktop",
-            "org.freedesktop.portal.Request",
+            PORTAL_DESKTOP_BUS_NAME,
+            PORTAL_IFACE_REQUEST,
             "Response",
             path,
             NULL,
@@ -383,7 +427,8 @@ static void callbackScreenCastCreateSession(
     if (status != 0) {
         DEBUG_SCREENCAST("Failed to create ScreenCast: %u\n", status);
     } else {
-        gtk->g_variant_lookup(result, "session_handle", "s", helper->data);
+        gboolean returned = gtk->g_variant_lookup(result, "session_handle", "s", helper->data);
+        DEBUG_SCREENCAST("session_handle returned %b %p\n", returned, helper->data)
     }
 
     helper->isDone = TRUE;
@@ -430,6 +475,9 @@ gboolean portalScreenCastCreateSession() {
             gtk->g_variant_new_string(requestToken)
     );
 
+
+    DEBUG_SCREENCAST("sessionToken %s \n", sessionToken)
+
     gtk->g_variant_builder_add(
             &builder,
             "{sv}",
@@ -437,8 +485,14 @@ gboolean portalScreenCastCreateSession() {
             gtk->g_variant_new_string(sessionToken)
     );
 
+    DEBUG_SCREENCAST("portalScreenCastCreateSession: proxy %s %p (rd: %p / sc: %p)\n",
+                     isRemoteDesktop ? "remoteDesktop" : "screencast",
+                     getProxy(),
+                     portal->remoteDesktopProxy,
+                     portal->screenCastProxy);
+
     GVariant *response = gtk->g_dbus_proxy_call_sync(
-            portal->screenCastProxy,
+            getProxy(),
             "CreateSession",
             gtk->g_variant_new("(a{sv})", &builder),
             G_DBUS_CALL_FLAGS_NONE,
@@ -447,6 +501,8 @@ gboolean portalScreenCastCreateSession() {
             &err
     );
 
+    print_gvariant_content("CreateSession", response);
+
     if (err) {
         DEBUG_SCREENCAST("Failed to create ScreenCast session: %s\n",
                          err->message);
@@ -455,6 +511,8 @@ gboolean portalScreenCastCreateSession() {
         waitForCallback(&helper);
     }
 
+    DEBUG_SCREENCAST("portal->screenCastSessionHandle %s\n", portal->screenCastSessionHandle);
+
     unregisterScreenCastCallback(&helper);
     if (response) {
         gtk->g_variant_unref(response);
@@ -500,6 +558,39 @@ static void callbackScreenCastSelectSources(
     callbackEnd();
 }
 
+static void callbackRemoteDesktopSelectDevices(
+        GDBusConnection *connection,
+        const char *senderName,
+        const char *objectPath,
+        const char *interfaceName,
+        const char *signalName,
+        GVariant *parameters,
+        void *data
+) {
+    struct DBusCallbackHelper *helper = data;
+
+    helper->data = (void *) 0;
+
+    uint32_t status;
+    GVariant* result = NULL;
+
+    gtk->g_variant_get(parameters, "(u@a{sv})", &status, &result);
+
+    if (status != 0) {
+        DEBUG_SCREENCAST("Failed select devices: %u\n", status);
+    } else {
+        helper->data = (void *) 1;
+    }
+
+    helper->isDone = TRUE;
+
+    if (result) {
+        gtk->g_variant_unref(result);
+    }
+
+    callbackEnd();
+}
+
 gboolean portalScreenCastSelectSources(const gchar *token) {
     GError* err = NULL;
 
@@ -545,25 +636,33 @@ gboolean portalScreenCastSelectSources(const gchar *token) {
             gtk->g_variant_new_uint32(1)
     );
 
+    // In the case of Remote Desktop,
+    // we add the restore_token and persist_mode to the SelectDevices call.
+
     // 0: Do not persist (default)
     // 1: Permissions persist as long as the application is running
     // 2: Permissions persist until explicitly revoked
-    gtk->g_variant_builder_add(
-            &builder,
-            "{sv}",
-            "persist_mode",
-            gtk->g_variant_new_uint32(2)
-    );
-
-    if (validateToken(token)) {
+    if (!isRemoteDesktop) {
         gtk->g_variant_builder_add(
                 &builder,
                 "{sv}",
-                "restore_token",
-                gtk->g_variant_new_string(token)
+                "persist_mode",
+                gtk->g_variant_new_uint32(2)
         );
     }
 
+    if (!isRemoteDesktop) {
+        if (validateToken(token)) {
+            DEBUG_SCREENCAST(">>> adding token %s\n", token);
+            gtk->g_variant_builder_add(
+                    &builder,
+                    "{sv}",
+                    "restore_token",
+                    gtk->g_variant_new_string(token)
+            );
+        }
+    }
+
     GVariant *response = gtk->g_dbus_proxy_call_sync(
             portal->screenCastProxy,
             "SelectSources",
@@ -574,6 +673,8 @@ gboolean portalScreenCastSelectSources(const gchar *token) {
             &err
     );
 
+    print_gvariant_content("SelectSources", response);
+
     if (err) {
         DEBUG_SCREENCAST("Failed to call SelectSources: %s\n", err->message);
         ERR_HANDLE(err);
@@ -624,6 +725,15 @@ static void callbackScreenCastStart(
             G_VARIANT_TYPE_ARRAY
     );
 
+    print_gvariant_content("Streams", streams);
+
+    if (!streams) {
+        DEBUG_SCREENCAST("No streams available with current token\n",  NULL);
+        startHelper->result = RESULT_NO_STREAMS;
+        helper->isDone = TRUE;
+        return;
+    }
+
     GVariantIter iter;
     gtk->g_variant_iter_init(
             &iter,
@@ -661,9 +771,7 @@ static void callbackScreenCastStart(
 
     helper->isDone = TRUE;
 
-    if (streams) {
-        gtk->g_variant_unref(streams);
-    }
+    gtk->g_variant_unref(streams);
 
     callbackEnd();
 }
@@ -706,7 +814,7 @@ ScreenCastResult portalScreenCastStart(const gchar *token) {
     );
 
     GVariant *response = gtk->g_dbus_proxy_call_sync(
-            portal->screenCastProxy,
+            getProxy(),
             "Start",
             gtk->g_variant_new("(osa{sv})", portal->screenCastSessionHandle, "", &builder),
             G_DBUS_CALL_FLAGS_NONE,
@@ -715,6 +823,8 @@ ScreenCastResult portalScreenCastStart(const gchar *token) {
             &err
     );
 
+    print_gvariant_content("Start", response);
+
     if (err) {
         DEBUG_SCREENCAST("Failed to start session: %s\n", err->message);
         ERR_HANDLE(err);
@@ -808,9 +918,9 @@ void portalScreenCastCleanup() {
     if (portal->screenCastSessionHandle) {
         gtk->g_dbus_connection_call_sync(
                 portal->connection,
-                "org.freedesktop.portal.Desktop",
+                PORTAL_DESKTOP_BUS_NAME,
                 portal->screenCastSessionHandle,
-                "org.freedesktop.portal.Session",
+                PORTAL_IFACE_SESSION,
                 "Close",
                 NULL,
                 NULL,
@@ -889,33 +999,140 @@ gboolean checkCanCaptureAllRequiredScreens(GdkRectangle *affectedBounds,
     return true;
 }
 
+gboolean remoteDesktopSelectDevicesIfNeeded(const gchar* token) {
+    if (!isRemoteDesktop || !portal->remoteDesktopProxy) {
+        DEBUG_SCREENCAST("Skipping, remote desktop is not selected \n", NULL);
+        return TRUE;
+    }
+
+    GError* err = NULL;
+
+    gchar *requestPath = NULL;
+    gchar *requestToken = NULL;
+
+    struct DBusCallbackHelper helper = {0};
+
+
+    updateRequestPath(
+            &requestPath,
+            &requestToken
+    );
+
+    registerScreenCastCallback(
+            requestPath,
+            &helper,
+            callbackRemoteDesktopSelectDevices
+    );
+
+    GVariantBuilder builder;
+
+    gtk->g_variant_builder_init(
+            &builder,
+            G_VARIANT_TYPE_VARDICT
+    );
+
+    gtk->g_variant_builder_add(
+            &builder,
+            "{sv}", "handle_token",
+            gtk->g_variant_new_string(requestToken)
+    );
+
+    // 1: KEYBOARD
+    // 2: POINTER
+    // 4: TOUCHSCREEN
+    gtk->g_variant_builder_add(
+            &builder, "{sv}", "types",
+            gtk->g_variant_new_uint32(1 | 2)
+    );
+
+    // 0: Do not persist (default)
+    // 1: Permissions persist as long as the application is running
+    // 2: Permissions persist until explicitly revoked
+    gtk->g_variant_builder_add(
+            &builder,
+            "{sv}",
+            "persist_mode",
+            gtk->g_variant_new_uint32(2)
+    );
+
+    if (validateToken(token)) {
+        gtk->g_variant_builder_add(
+                &builder,
+                "{sv}",
+                "restore_token",
+                gtk->g_variant_new_string(token)
+        );
+    }
+
+    GVariant *response = gtk->g_dbus_proxy_call_sync(
+            portal->remoteDesktopProxy,
+            "SelectDevices",
+            gtk->g_variant_new("(oa{sv})", portal->screenCastSessionHandle, &builder),
+            G_DBUS_CALL_FLAGS_NONE,
+            -1,
+            NULL,
+            &err
+    );
+
+    print_gvariant_content("SelectDevices", response);
+
+    if (err) {
+        DEBUG_SCREENCAST("Failed to call SelectDevices: %s\n", err->message);
+        ERR_HANDLE(err);
+    } else {
+        waitForCallback(&helper);
+    }
+
+    unregisterScreenCastCallback(&helper);
+    if (response) {
+        gtk->g_variant_unref(response);
+    }
+
+    free(requestPath);
+    free(requestToken);
+
+    return helper.data != NULL;
+}
+
+gboolean initAndStartSession(const gchar *token, int *retVal) {
+
+    *retVal = RESULT_ERROR;
 
-int getPipewireFd(const gchar *token,
-                  GdkRectangle *affectedBounds,
-                  gint affectedBoundsLength) {
     if (!portalScreenCastCreateSession())  {
         DEBUG_SCREENCAST("Failed to create ScreenCast session\n", NULL);
-        return RESULT_ERROR;
+        return FALSE;
     }
 
     if (!portalScreenCastSelectSources(token)) {
         DEBUG_SCREENCAST("Failed to select sources\n", NULL);
-        return RESULT_ERROR;
+        return FALSE;
+    }
+
+    if (!remoteDesktopSelectDevicesIfNeeded(token)) {
+        return FALSE;
     }
 
     ScreenCastResult startResult = portalScreenCastStart(token);
     DEBUG_SCREENCAST("portalScreenCastStart result |%i|\n", startResult);
+
     if (startResult != RESULT_OK) {
-        DEBUG_SCREENCAST("Failed to start\n", NULL);
-        return startResult;
-    } else {
-        if (!checkCanCaptureAllRequiredScreens(affectedBounds,
-                                               affectedBoundsLength)) {
-            DEBUG_SCREENCAST("The location of the screens has changed, "
-                             "the capture area is outside the allowed "
-                             "area.\n", NULL)
-            return RESULT_OUT_OF_BOUNDS;
-        }
+        DEBUG_SCREENCAST("Failed to start %d\n", startResult);
+        *retVal = startResult;
+        return FALSE;
+    }
+
+    *retVal = RESULT_OK;
+    return TRUE;
+}
+
+int getPipewireFd(GdkRectangle *affectedBounds,
+                  gint affectedBoundsLength) {
+    if (!checkCanCaptureAllRequiredScreens(affectedBounds,
+                                           affectedBoundsLength)) {
+        DEBUG_SCREENCAST("The location of the screens has changed, "
+                         "the capture area is outside the allowed "
+                         "area.\n", NULL)
+        return RESULT_OUT_OF_BOUNDS;
     }
 
     DEBUG_SCREENCAST("--- portalScreenCastStart\n", NULL);
@@ -928,4 +1145,182 @@ int getPipewireFd(const gchar *token,
     DEBUG_SCREENCAST("pwFd %i\n", pipewireFd);
     return pipewireFd;
 }
+
+
+void print_gvariant_content(gchar *caption, GVariant *response) {
+    if (!DEBUG_SCREENCAST_ENABLED) {
+        return;
+    }
+
+    gchar *str = NULL;
+    if (response != NULL) {
+        str = gtk->g_variant_print(response, TRUE);
+    }
+
+    DEBUG_SCREENCAST("%s response:\n\t%s\n",
+                     caption, str);
+
+    gtk->g_free(str);
+}
+
+static gboolean callRemoteDesktop(const gchar* methodName, GVariant *params) {
+    GError *err = NULL;
+    GVariantBuilder builder;
+    gtk->g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+
+    GVariant *response = gtk->g_dbus_proxy_call_sync(
+            portal->remoteDesktopProxy,
+            methodName,
+            params,
+            G_DBUS_CALL_FLAGS_NONE,
+            -1,
+            NULL,
+            &err
+    );
+
+    gchar * caption = gtk->g_strconcat("callRemoteDesktop ", methodName, NULL);
+    print_gvariant_content(caption, response);
+    gtk->g_free(caption);
+
+    DEBUG_SCREENCAST("%s: response %p err %p\n", methodName, response, err);
+
+    if (err) {
+        DEBUG_SCREENCAST("Failed to call %s: %s\n", methodName, err->message);
+        ERR_HANDLE(err);
+
+        // e.g. user denied mouse keyboard/interaction
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+void clampCoordsIfNeeded(int *x, int *y) {
+    if (screenSpace.screenCount <= 0 || x == NULL || y == NULL) {
+        return;
+    }
+
+    GdkRectangle s0 = screenSpace.screens[0].bounds;
+    int minX = s0.x;
+    int minY = s0.y;
+    int maxX = s0.x + s0.width;
+    int maxY = s0.y + s0.height;
+
+    for (int i = 1; i < screenSpace.screenCount; ++i) {
+        GdkRectangle s = screenSpace.screens[i].bounds;
+        if (s.x < minX) minX = s.x;
+        if (s.y < minY) minY = s.y;
+        if (s.x + s.width > maxX) maxX = s.x + s.width;
+        if (s.y + s.height > maxY) maxY = s.y + s.height;
+    }
+
+    if (*x < minX) {
+        *x = minX;
+    } else if (*x > maxX) {
+        *x = maxX - 1;
+    }
+
+    if (*y < minY) {
+        *y = minY;
+    } else if (*y > maxY) {
+        *y = maxY - 1;
+    }
+}
+
+gboolean remoteDesktopMouseMove(int x, int y) {
+    guint32 streamId = 0;
+    int relX = -1;
+    int relY = -1;
+
+    DEBUG_SCREENCAST("mouseMove %d %d\n", x, y);
+    clampCoordsIfNeeded(&x, &y);
+    DEBUG_SCREENCAST("after clamping %d %d\n", x, y);
+
+    for (int i = 0; i < screenSpace.screenCount; ++i) {
+        struct ScreenProps *screenProps = &screenSpace.screens[i];
+        GdkRectangle rect = screenProps->bounds;
+
+        if (x >= rect.x &&
+             y >= rect.y &&
+             x <  rect.x + rect.width &&
+             y <  rect.y + rect.height) {
+            streamId = screenProps->id;
+            relX = x - rect.x;
+            relY = y - rect.y;
+
+            DEBUG_SCREENCAST("screenId#%i point %dx%d (rel %i %i) inside of screen (%d, %d, %d, %d)\n",
+                             streamId,
+                             x, y, relX, relY,
+                             rect.x, rect.y, rect.width, rect.height);
+
+            break;
+        }
+    }
+
+    if (streamId == 0) {
+        DEBUG_SCREENCAST("outside of available screens\n", NULL);
+        return TRUE;
+    }
+
+    GVariantBuilder builder;
+    gtk->g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+    GVariant *params = gtk->g_variant_new("(oa{sv}udd)", portal->screenCastSessionHandle, &builder,
+                                          streamId, (double) relX, (double) relY);
+    return callRemoteDesktop("NotifyPointerMotionAbsolute", params);
+}
+
+gboolean callRemoteDesktopNotifyPointerButton(gboolean isPress, int evdevButton) {
+    DEBUG_SCREENCAST("isPress %d evdevButton %d\n", isPress, evdevButton);
+
+    GVariantBuilder builder;
+    gtk->g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    GVariant *params = gtk->g_variant_new("(oa{sv}iu)",
+                                          portal->screenCastSessionHandle, &builder, evdevButton, isPress);
+    return callRemoteDesktop("NotifyPointerButton", params);
+}
+
+gboolean remoteDesktopMouse(gboolean isPress, int buttons) {
+    DEBUG_SCREENCAST("isPress %d awt buttons mask %d\n", isPress, buttons);
+
+    if (buttons & java_awt_event_InputEvent_BUTTON1_MASK
+        || buttons & java_awt_event_InputEvent_BUTTON1_DOWN_MASK) {
+        if (!callRemoteDesktopNotifyPointerButton(isPress, 0x110)) { // BTN_LEFT
+            return FALSE;
+        }
+    }
+    if (buttons & java_awt_event_InputEvent_BUTTON2_MASK
+        || buttons & java_awt_event_InputEvent_BUTTON2_DOWN_MASK) {
+        if (!callRemoteDesktopNotifyPointerButton(isPress, 0x112)) { // BTN_MIDDLE
+            return FALSE;
+        }
+
+    }
+    if (buttons & java_awt_event_InputEvent_BUTTON3_MASK
+        || buttons & java_awt_event_InputEvent_BUTTON3_DOWN_MASK) {
+        if (!callRemoteDesktopNotifyPointerButton(isPress, 0x111)) { // BTN_RIGHT
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+gboolean remoteDesktopMouseWheel(int wheelAmt) {
+    DEBUG_SCREENCAST("MouseWheel %d\n", wheelAmt);
+
+    GVariantBuilder builder;
+    gtk->g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    GVariant *params = gtk->g_variant_new("(oa{sv}ui)", portal->screenCastSessionHandle, &builder, 0, wheelAmt);
+    return callRemoteDesktop("NotifyPointerAxisDiscrete", params);
+}
+
+gboolean remoteDesktopKey(gboolean isPress, int key) {
+    DEBUG_SCREENCAST("Key%s key %d -> \n", isPress ? "Press" : "Release", key);
+
+    GVariantBuilder builder;
+    gtk->g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    GVariant *params = gtk->g_variant_new ("(oa{sv}iu)", portal->screenCastSessionHandle, &builder, key, isPress);
+    return callRemoteDesktop("NotifyKeyboardKeysym", params);
+}
+
 #endif
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.h b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.h
index 9ac210217ff..706337610f1 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.h
@@ -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
@@ -36,11 +36,21 @@
 #define PORTAL_REQUEST_TEMPLATE "/org/freedesktop/portal/desktop/" \
                                 "request/%s/awtPipewire%lu"
 
+#define PORTAL_DESKTOP_BUS_NAME "org.freedesktop.portal.Desktop"
+#define PORTAL_DESKTOP_OBJECT_PATH "/org/freedesktop/portal/desktop"
+
+#define PORTAL_IFACE_REQUEST "org.freedesktop.portal.Request"
+#define PORTAL_IFACE_SESSION "org.freedesktop.portal.Session"
+#define PORTAL_IFACE_SCREENCAST "org.freedesktop.portal.ScreenCast"
+#define PORTAL_IFACE_REMOTE_DESKTOP "org.freedesktop.portal.RemoteDesktop"
+
+#define PORTAL_MIN_VERSION_SCREENCAST 4
+#define PORTAL_MIN_VERSION_REMOTE_DESKTOP 2
+
 void debug_screencast(const char *__restrict fmt, ...);
 
-int getPipewireFd(const gchar *token,
-                  GdkRectangle *affectedBounds,
-                  gint affectedBoundsLength);
+gboolean initAndStartSession(const gchar *token, int *retVal);
+int getPipewireFd(GdkRectangle *affectedBounds, gint affectedBoundsLength);
 
 void portalScreenCastCleanup();
 
@@ -48,8 +58,14 @@ gboolean initXdgDesktopPortal();
 
 void errHandle(GError *error, const gchar *functionName, int lineNum);
 
+gboolean remoteDesktopMouseMove(int x, int y);
+gboolean remoteDesktopMouseWheel(int wheelAmt);
+gboolean remoteDesktopMouse(gboolean isPress, int buttons);
+gboolean remoteDesktopKey(gboolean isPress, int key);
+
 struct XdgDesktopPortalApi {
     GDBusConnection *connection;
+    GDBusProxy *remoteDesktopProxy;
     GDBusProxy *screenCastProxy;
     gchar *senderName;
     char *screenCastSessionHandle;
@@ -66,8 +82,15 @@ typedef enum {
     RESULT_ERROR = -1,
     RESULT_DENIED = -11,
     RESULT_OUT_OF_BOUNDS = -12,
+    RESULT_NO_STREAMS = -13,
 } ScreenCastResult;
 
+typedef enum {
+    XDG_METHOD_SCREENCAST = 0,
+    XDG_METHOD_REMOTE_DESKTOP = 1,
+} XdgPortalMethod;
+
+
 struct StartHelper {
     const gchar *token;
     ScreenCastResult result;

From 400c935082a0d4d843cf369af6fefde12d637438 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 21 May 2025 18:55:56 +0000
Subject: [PATCH 568/901] 8356904: Skip
 jdk/test/lib/process/TestNativeProcessBuilder on static-jdk

Reviewed-by: henryjen, rriggs
---
 test/lib-test/TEST.ROOT                         | 17 +++++++++++++++++
 .../lib/process/TestNativeProcessBuilder.java   |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT
index 5908b50cb17..21b6fba41f2 100644
--- a/test/lib-test/TEST.ROOT
+++ b/test/lib-test/TEST.ROOT
@@ -31,6 +31,23 @@ keys=randomness
 # Minimum jtreg version
 requiredVersion=7.5.1+1
 
+# Allow querying of various System properties in @requires clauses
+requires.extraPropDefns = ../jtreg-ext/requires/VMProps.java
+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 \
+    --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 \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+requires.properties= \
+    jdk.static
+
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
 external.lib.roots = ../../
diff --git a/test/lib-test/jdk/test/lib/process/TestNativeProcessBuilder.java b/test/lib-test/jdk/test/lib/process/TestNativeProcessBuilder.java
index 6c2f53d31eb..926a5200936 100644
--- a/test/lib-test/jdk/test/lib/process/TestNativeProcessBuilder.java
+++ b/test/lib-test/jdk/test/lib/process/TestNativeProcessBuilder.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
@@ -25,6 +25,7 @@
  * @test
  * @summary Test the native process builder API.
  * @library /test/lib
+ * @requires !jdk.static
  * @run main/native TestNativeProcessBuilder
  */
 

From 81536830ed096005c4f09ab446238ce50989cea9 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 21 May 2025 19:21:20 +0000
Subject: [PATCH 569/901] 8345826: Do not automatically resolve
 jdk.internal.vm.ci when libgraal is used

Reviewed-by: iklam, never, kvn
---
 src/hotspot/share/jvmci/jvmciCompiler.cpp     |  2 +-
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  6 ++---
 src/hotspot/share/jvmci/jvmciRuntime.hpp      |  2 ++
 src/hotspot/share/jvmci/jvmci_globals.hpp     | 11 +++++++++-
 src/hotspot/share/runtime/arguments.cpp       | 22 ++++++++++++++++---
 src/hotspot/share/runtime/arguments.hpp       |  4 ++++
 .../vm/ci/services/JVMCIServiceLocator.java   |  2 --
 .../classes/jdk/vm/ci/services/Services.java  | 13 -----------
 8 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompiler.cpp b/src/hotspot/share/jvmci/jvmciCompiler.cpp
index 006e76477ae..924add42f99 100644
--- a/src/hotspot/share/jvmci/jvmciCompiler.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompiler.cpp
@@ -48,7 +48,7 @@ JVMCICompiler::JVMCICompiler() : AbstractCompiler(compiler_jvmci) {
 
 JVMCICompiler* JVMCICompiler::instance(bool require_non_null, TRAPS) {
   if (!EnableJVMCI) {
-    THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "JVMCI is not enabled")
+    THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), JVMCI_NOT_ENABLED_ERROR_MESSAGE)
   }
   if (_instance == nullptr && require_non_null) {
     THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "The JVMCI compiler instance has not been created");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 6f1fa52576e..f02ef57de34 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -720,7 +720,7 @@ JRT_END
 JVM_ENTRY_NO_ENV(jobject, JVM_GetJVMCIRuntime(JNIEnv *libjvmciOrHotspotEnv, jclass c))
   JVMCIENV_FROM_JNI(thread, libjvmciOrHotspotEnv);
   if (!EnableJVMCI) {
-    JVMCI_THROW_MSG_NULL(InternalError, "JVMCI is not enabled");
+    JVMCI_THROW_MSG_NULL(InternalError, JVMCI_NOT_ENABLED_ERROR_MESSAGE);
   }
   JVMCIENV->runtime()->initialize_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
   JVMCIObject runtime = JVMCIENV->runtime()->get_HotSpotJVMCIRuntime(JVMCI_CHECK_NULL);
@@ -732,7 +732,7 @@ JVM_END
 JVM_ENTRY_NO_ENV(jlong, JVM_ReadSystemPropertiesInfo(JNIEnv *env, jclass c, jintArray offsets_handle))
   JVMCIENV_FROM_JNI(thread, env);
   if (!EnableJVMCI) {
-    JVMCI_THROW_MSG_0(InternalError, "JVMCI is not enabled");
+    JVMCI_THROW_MSG_0(InternalError, JVMCI_NOT_ENABLED_ERROR_MESSAGE);
   }
   JVMCIPrimitiveArray offsets = JVMCIENV->wrap(offsets_handle);
   JVMCIENV->put_int_at(offsets, 0, SystemProperty::next_offset_in_bytes());
@@ -1515,7 +1515,7 @@ JVM_ENTRY_NO_ENV(void, JVM_RegisterJVMCINatives(JNIEnv *libjvmciOrHotspotEnv, jc
   JVMCIENV_FROM_JNI(thread, libjvmciOrHotspotEnv);
 
   if (!EnableJVMCI) {
-    JVMCI_THROW_MSG(InternalError, "JVMCI is not enabled");
+    JVMCI_THROW_MSG(InternalError, JVMCI_NOT_ENABLED_ERROR_MESSAGE);
   }
 
   JVMCIENV->runtime()->initialize(JVMCIENV);
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index 884d11f792e..c35813eb16f 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -35,6 +35,8 @@
 #include "gc/g1/g1CardTable.hpp"
 #endif // INCLUDE_G1GC
 
+#define JVMCI_NOT_ENABLED_ERROR_MESSAGE "JVMCI is not enabled. Must specify '-XX:+EnableJVMCI' or '--add-modules=jdk.internal.vm.ci' to the java launcher."
+
 class JVMCIEnv;
 class JVMCICompiler;
 class JVMCICompileState;
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index fc1607b8393..05bc9a134c7 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -45,7 +45,16 @@ class fileStream;
                     constraint)                                             \
                                                                             \
   product(bool, EnableJVMCI, false, EXPERIMENTAL,                           \
-          "Enable JVMCI. Defaults to true if UseJVMCICompiler is true.")    \
+          "Enable JVMCI support in the VM. "                                \
+          "Defaults to true if UseJVMCICompiler is true or "                \
+          "--add-modules=jdk.internal.vm.ci was specified. "                \
+          "The behavior of --add-modules=jdk.internal.vm.ci is triggered "  \
+          "if any of the following is true: "                               \
+          "1. -XX:+EnableJVMCI is set to true on the command line. "        \
+          "2. -XX:+EnableJVMCI is set to true by jdk/internal/vm/options "  \
+          "   in the java.base module. "                                    \
+          "3. EnableJVMCI is defaulted to true by UseJVMCICompiler and "    \
+          "   libjvmci is not enabled")                                     \
                                                                             \
   product(bool, UseGraalJIT, false, EXPERIMENTAL,                           \
           "Select the Graal JVMCI compiler. This is an alias for: "         \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index e1fde4803c4..8b1f5e645d4 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -86,6 +86,9 @@ int    Arguments::_num_jvm_flags                = 0;
 char** Arguments::_jvm_args_array               = nullptr;
 int    Arguments::_num_jvm_args                 = 0;
 unsigned int Arguments::_addmods_count          = 0;
+#if INCLUDE_JVMCI
+bool   Arguments::_jvmci_module_added           = false;
+#endif
 char*  Arguments::_java_command                 = nullptr;
 SystemProperty* Arguments::_system_properties   = nullptr;
 size_t Arguments::_conservative_max_heap_alignment = 0;
@@ -1799,9 +1802,9 @@ bool Arguments::check_vm_args_consistency() {
   status = CompilerConfig::check_args_consistency(status);
 #if INCLUDE_JVMCI
   if (status && EnableJVMCI) {
-    PropertyList_unique_add(&_system_properties, "jdk.internal.vm.ci.enabled", "true",
-        AddProperty, UnwriteableProperty, InternalProperty);
-    if (ClassLoader::is_module_observable("jdk.internal.vm.ci")) {
+    // Add the JVMCI module if not using libjvmci or EnableJVMCI
+    // was explicitly set on the command line or in the jimage.
+    if ((!UseJVMCINativeLibrary || FLAG_IS_CMDLINE(EnableJVMCI) || FLAG_IS_JIMAGE_RESOURCE(EnableJVMCI)) && ClassLoader::is_module_observable("jdk.internal.vm.ci") && !_jvmci_module_added) {
       if (!create_numbered_module_property("jdk.module.addmods", "jdk.internal.vm.ci", _addmods_count++)) {
         return false;
       }
@@ -2248,6 +2251,19 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
       if (!create_numbered_module_property("jdk.module.addmods", tail, _addmods_count++)) {
         return JNI_ENOMEM;
       }
+#if INCLUDE_JVMCI
+      if (!_jvmci_module_added) {
+        const char *jvmci_module = strstr(tail, "jdk.internal.vm.ci");
+        if (jvmci_module != nullptr) {
+          char before = *(jvmci_module - 1);
+          char after  = *(jvmci_module + strlen("jdk.internal.vm.ci"));
+          if ((before == '=' || before == ',') && (after == '\0' || after == ',')) {
+            FLAG_SET_DEFAULT(EnableJVMCI, true);
+            _jvmci_module_added = true;
+          }
+        }
+      }
+#endif
     } else if (match_option(option, "--enable-native-access=", &tail)) {
       if (!create_numbered_module_property("jdk.module.enable.native.access", tail, enable_native_access_count++)) {
         return JNI_ENOMEM;
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index a18996f85e8..55667df2c59 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -197,6 +197,10 @@ class Arguments : AllStatic {
   static char* _java_command;
   // number of unique modules specified in the --add-modules option
   static unsigned int _addmods_count;
+#if INCLUDE_JVMCI
+  // was jdk.internal.vm.ci module specified in the --add-modules option?
+  static bool _jvmci_module_added;
+#endif
 
   // Property list
   static SystemProperty* _system_properties;
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 265b8c24f3e..d5ff0bba9b3 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
@@ -59,7 +59,6 @@ private JVMCIServiceLocator(Void ignore) {
      */
     protected JVMCIServiceLocator() {
         this(checkPermission());
-        Services.checkJVMCIEnabled();
         Services.openJVMCITo(getClass().getModule());
     }
 
@@ -85,7 +84,6 @@ protected JVMCIServiceLocator() {
      *             {@link JVMCIPermission}
      */
     public static <S> List<S> getProviders(Class<S> service) {
-        Services.checkJVMCIEnabled();
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
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 d16a788eb14..22f8eec7d12 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
@@ -64,17 +64,6 @@ private Services() {
      */
     private static volatile Map<String, String> savedProperties;
 
-    static final boolean JVMCI_ENABLED = Boolean.parseBoolean(VM.getSavedProperties().get("jdk.internal.vm.ci.enabled"));
-
-    /**
-     * Checks that JVMCI is enabled in the VM and throws an error if it isn't.
-     */
-    static void checkJVMCIEnabled() {
-        if (!JVMCI_ENABLED) {
-            throw new Error("The EnableJVMCI VM option must be true (i.e., -XX:+EnableJVMCI) to use JVMCI");
-        }
-    }
-
     /**
      * Gets an unmodifiable copy of the system properties as of VM startup.
      *
@@ -84,7 +73,6 @@ static void checkJVMCIEnabled() {
      * on the command line are ignored.
      */
     public static Map<String, String> getSavedProperties() {
-        checkJVMCIEnabled();
         if (savedProperties == null) {
             synchronized (Services.class) {
                 if (savedProperties == null) {
@@ -113,7 +101,6 @@ public static String getSavedProperty(String name) {
      * Causes the JVMCI subsystem to be initialized if it isn't already initialized.
      */
     public static void initializeJVMCI() {
-        checkJVMCIEnabled();
         try {
             Class.forName("jdk.vm.ci.runtime.JVMCI");
         } catch (ClassNotFoundException e) {

From afcbf6b2f49c00a544e6db5b4ed9da76c0bdcba4 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Wed, 21 May 2025 19:49:51 +0000
Subject: [PATCH 570/901] 8357173: Split jtreg test group jdk tier3

Reviewed-by: mikael
---
 test/jdk/TEST.groups | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 2912b335d36..bd50b583c13 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -1,4 +1,4 @@
-#  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
@@ -83,7 +83,14 @@ tier2_part2 = \
 tier2_part3 = \
     :jdk_net
 
+# These sub groups of tier3 allow for running certain tests separately from the
+# rest. When adding tests to tier3, in most cases they should be added to
+# tier3_part1.
 tier3 = \
+    :tier3_part1 \
+    :tier3_jpackage
+
+tier3_part1 = \
     :build \
     :jdk_vector \
     -:jdk_vector_sanity \
@@ -91,9 +98,12 @@ tier3 = \
     :jdk_svc \
     -:jdk_svc_sanity \
     -:svc_tools \
-    :jdk_jpackage \
     :jdk_since_checks
 
+# The jpackage tests on Windows require permissions that aren't always present
+tier3_jpackage = \
+    :jdk_jpackage
+
 # Everything not in other tiers
 tier4 = \
     / \

From 4d7068923cd87fbfc2edee25406521b11580d153 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Wed, 21 May 2025 21:11:34 +0000
Subject: [PATCH 571/901] 8351993: VectorShuffle access to and from
 MemorySegments

Reviewed-by: psandoz
---
 .../jdk/incubator/vector/AbstractShuffle.java |   2 +-
 .../jdk/incubator/vector/Byte128Vector.java   |  23 ++-
 .../jdk/incubator/vector/Byte256Vector.java   |  23 ++-
 .../jdk/incubator/vector/Byte512Vector.java   |  23 ++-
 .../jdk/incubator/vector/Byte64Vector.java    |  23 ++-
 .../jdk/incubator/vector/ByteMaxVector.java   |  23 ++-
 .../jdk/incubator/vector/Double128Vector.java |  37 +++-
 .../jdk/incubator/vector/Double256Vector.java |  37 +++-
 .../jdk/incubator/vector/Double512Vector.java |  37 +++-
 .../jdk/incubator/vector/Double64Vector.java  |  37 +++-
 .../jdk/incubator/vector/DoubleMaxVector.java |  37 +++-
 .../jdk/incubator/vector/Float128Vector.java  |  10 +-
 .../jdk/incubator/vector/Float256Vector.java  |  10 +-
 .../jdk/incubator/vector/Float512Vector.java  |  10 +-
 .../jdk/incubator/vector/Float64Vector.java   |  10 +-
 .../jdk/incubator/vector/FloatMaxVector.java  |  10 +-
 .../jdk/incubator/vector/Int128Vector.java    |  10 +-
 .../jdk/incubator/vector/Int256Vector.java    |  10 +-
 .../jdk/incubator/vector/Int512Vector.java    |  10 +-
 .../jdk/incubator/vector/Int64Vector.java     |  10 +-
 .../jdk/incubator/vector/IntMaxVector.java    |  10 +-
 .../jdk/incubator/vector/Long128Vector.java   |  37 +++-
 .../jdk/incubator/vector/Long256Vector.java   |  37 +++-
 .../jdk/incubator/vector/Long512Vector.java   |  37 +++-
 .../jdk/incubator/vector/Long64Vector.java    |  37 +++-
 .../jdk/incubator/vector/LongMaxVector.java   |  37 +++-
 .../jdk/incubator/vector/Short128Vector.java  |  17 +-
 .../jdk/incubator/vector/Short256Vector.java  |  17 +-
 .../jdk/incubator/vector/Short512Vector.java  |  17 +-
 .../jdk/incubator/vector/Short64Vector.java   |  17 +-
 .../jdk/incubator/vector/ShortMaxVector.java  |  17 +-
 .../jdk/incubator/vector/VectorShuffle.java   |  91 ++++++++-
 .../vector/X-VectorBits.java.template         |  68 ++++++-
 .../vector/AbstractVectorLoadStoreTest.java   | 167 +++++++++++++---
 .../incubator/vector/AbstractVectorTest.java  |  23 ++-
 .../vector/Byte128VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Byte256VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Byte512VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Byte64VectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/ByteMaxVectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Double128VectorLoadStoreTests.java | 183 +++++++++++++++++-
 .../vector/Double256VectorLoadStoreTests.java | 183 +++++++++++++++++-
 .../vector/Double512VectorLoadStoreTests.java | 183 +++++++++++++++++-
 .../vector/Double64VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/DoubleMaxVectorLoadStoreTests.java | 183 +++++++++++++++++-
 .../vector/Float128VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Float256VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Float512VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Float64VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/FloatMaxVectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Int128VectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/Int256VectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/Int512VectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/Int64VectorLoadStoreTests.java     | 183 +++++++++++++++++-
 .../vector/IntMaxVectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/Long128VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Long256VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Long512VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Long64VectorLoadStoreTests.java    | 183 +++++++++++++++++-
 .../vector/LongMaxVectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/Short128VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Short256VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Short512VectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../vector/Short64VectorLoadStoreTests.java   | 183 +++++++++++++++++-
 .../vector/ShortMaxVectorLoadStoreTests.java  | 183 +++++++++++++++++-
 .../templates/X-LoadStoreTest.java.template   | 183 +++++++++++++++++-
 66 files changed, 6307 insertions(+), 387 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
index 155853a86f9..19ee4bb0074 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.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
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 ae64fb83be3..3569ed00f1f 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -895,6 +897,25 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length() * 3);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_128;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+         }
+
         @Override
         @ForceInline
         public final Byte128Mask laneIsValid() {
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 f2847f0bc20..70a3306731e 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -927,6 +929,25 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length() * 3);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_256;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+         }
+
         @Override
         @ForceInline
         public final Byte256Mask laneIsValid() {
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 192013ef5a5..a093fe18289 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -991,6 +993,25 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length() * 3);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_512;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+         }
+
         @Override
         @ForceInline
         public final Byte512Mask laneIsValid() {
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 d99112d5e13..cd75ee9f610 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -879,6 +881,25 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length() * 3);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_64;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+         }
+
         @Override
         @ForceInline
         public final Byte64Mask laneIsValid() {
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 e59470ecc31..3ac62409a95 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -865,6 +867,25 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length() * 3);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_MAX;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+         }
+
         @Override
         @ForceInline
         public final ByteMaxMask laneIsValid() {
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 8b4285d50df..eaf77d59a23 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -864,9 +866,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Double128Mask laneIsValid() {
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 c5a373b6098..cf9c8794ce4 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -868,9 +870,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Double256Mask laneIsValid() {
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 1f71c257d18..a7a86c25841 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -876,9 +878,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Double512Mask laneIsValid() {
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 6acb6f1b314..df6b627cc18 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -862,9 +864,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Double64Mask laneIsValid() {
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 7c5d2be9ab5..47be1f609d8 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -861,9 +863,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final DoubleMaxMask laneIsValid() {
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 12119bb1198..fdfd234cb47 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -847,6 +849,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Float128Mask laneIsValid() {
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 2d150961f48..2543382ca14 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -855,6 +857,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Float256Mask laneIsValid() {
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 519bf552868..627b1e0a237 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -871,6 +873,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Float512Mask laneIsValid() {
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 3f1dad82b8b..3360fdb537a 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -843,6 +845,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Float64Mask laneIsValid() {
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 f4bedec2f48..4a72661ce8b 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -840,6 +842,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final FloatMaxMask laneIsValid() {
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 11b45f48e35..edf45b8772a 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -858,6 +860,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Int128Mask laneIsValid() {
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 a6a59207a04..bb86ede05e1 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -866,6 +868,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Int256Mask laneIsValid() {
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 f9a1c4413e7..16d3b673da0 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -882,6 +884,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Int512Mask laneIsValid() {
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 6099077cda9..d55364a8d67 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -854,6 +856,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final Int64Mask laneIsValid() {
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 fa9eadfdc71..0a1cd45eb93 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -863,6 +865,12 @@ public void intoArray(int[] a, int offset) {
             toBitsVector().intoArray(a, offset);
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+         }
+
         @Override
         @ForceInline
         public final IntMaxMask laneIsValid() {
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 8db20c774b6..5a47153837a 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -865,9 +867,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Long128Mask laneIsValid() {
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 8ca688424d0..9c3ff7627cc 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -869,9 +871,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Long256Mask laneIsValid() {
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 9abf3a50561..30d29c3cd03 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -877,9 +879,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Long512Mask laneIsValid() {
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 234bf839816..518baa168ec 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -863,9 +865,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final Long64Mask laneIsValid() {
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 71e490e6a92..3d981c37ae2 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -863,9 +865,40 @@ public void intoArray(int[] a, int offset) {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+         }
+
         @Override
         @ForceInline
         public final LongMaxMask laneIsValid() {
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 c133d175648..60f22eb5fb9 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -873,6 +875,19 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length());
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_128;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+         }
+
         @Override
         @ForceInline
         public final Short128Mask laneIsValid() {
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 16cbef3eda3..14c415afac2 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -889,6 +891,19 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length());
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_256;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+         }
+
         @Override
         @ForceInline
         public final Short256Mask laneIsValid() {
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 81ee0280f47..c92979302a6 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -921,6 +923,19 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length());
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_512;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+         }
+
         @Override
         @ForceInline
         public final Short512Mask laneIsValid() {
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 fe92dd7d3f6..b454989b45f 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -865,6 +867,19 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length());
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_64;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+         }
+
         @Override
         @ForceInline
         public final Short64Mask laneIsValid() {
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 96369ea18d2..bea14b7d5fd 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -859,6 +861,19 @@ public void intoArray(int[] a, int offset) {
                     .intoArray(a, offset + species.length());
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+            VectorSpecies<Integer> species = IntVector.SPECIES_MAX;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+         }
+
         @Override
         @ForceInline
         public final ShortMaxMask laneIsValid() {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
index bc1780a81ac..9cde9d2315c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java
@@ -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
@@ -25,6 +25,10 @@
 package jdk.incubator.vector;
 
 import jdk.internal.vm.annotation.ForceInline;
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Objects;
 import java.util.Arrays;
 import java.util.function.IntUnaryOperator;
@@ -314,6 +318,52 @@ public static <E> VectorShuffle<E> fromArray(VectorSpecies<E> species, int[] sou
         return vsp.shuffleFromArray(sourceIndexes, offset);
     }
 
+    /**
+     * Loads a shuffle from a {@linkplain MemorySegment memory segment}
+     * starting at an offset into the memory segment.
+     * Bytes are composed into shuffle lanes according
+     * to the specified byte order.
+     * The shuffle is arranged into lanes according to
+     * <a href="http://github.com/Vector.html#lane-order">memory ordering</a>.
+     * <p>
+     * The following pseudocode illustrates the behavior:
+     * <pre>{@code
+     * var slice = ms.asSlice(offset);
+     * int[] ar = new int[species.length()];
+     * for (int n = 0; n < ar.length; n++) {
+     *     ar[n] = slice.getAtIndex(ValuaLayout.JAVA_INT_UNALIGNED, n);
+     * }
+     * VectorShuffle<E> r = VectorShuffle.fromArray(species, ar, 0);
+     * }</pre>
+     *
+     * @implNote
+     * This operation is likely to be more efficient if
+     * the specified byte order is the same as
+     * {@linkplain ByteOrder#nativeOrder()
+     * the platform native order},
+     * since this method will not need to reorder
+     * the bytes of lane values.
+     *
+     * @param species the shuffle species
+     * @param ms the source indexes in memory which the shuffle will draw from
+     * @param offset the offset into the segment
+     * @param bo the byte order
+     * @param <E> the boxed element type
+     * @return a shuffle where each lane's source index is set to the given
+     *         {@code int} value, partially wrapped if exceptional
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     *         {@code offset > sourceIndexes.byteSize() - VLENGTH * 4}
+     * @since 25
+     */
+    @ForceInline
+    public static final <E> VectorShuffle<E> fromMemorySegment(VectorSpecies<E> species, MemorySegment ms,
+                                                               long offset, ByteOrder bo) {
+        long memsize = species.length() * 4;
+        MemorySegment arraySlice = ms.asSlice(offset, memsize);
+        int[] indices = arraySlice.toArray(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo));
+        return species.shuffleFromArray(indices,0);
+    }
+
     /**
      * Creates a shuffle for a given species from
      * the successive values of an operator applied to
@@ -523,6 +573,45 @@ private static int unzipIndex(int i, int vlen, int part) {
      */
     public abstract void intoArray(int[] a, int offset);
 
+    /**
+     * Stores this shuffle into a {@linkplain MemorySegment memory segment}
+     * starting at an offset using explicit byte order.
+     * <p>
+     * Bytes are extracted from shuffle lanes according
+     * to the specified byte ordering.
+     * The shuffle lanes are stored according to their
+     * <a href="http://github.com/Vector.html#lane-order">memory ordering</a>.
+     * <p>
+     * The following pseudocode illustrates the behavior:
+     * <pre>{@code
+     * int[] a = this.toArray();
+     * var slice = ms.asSlice(offset)
+     * for (int n = 0; n < a.length; n++) {
+     *     slice.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, n, a[n]);
+     * }
+     * }</pre>
+     *
+     * @implNote
+     * This operation is likely to be more efficient if
+     * the specified byte order is the same as
+     * {@linkplain ByteOrder#nativeOrder()
+     * the platform native order},
+     * since this method will not need to reorder
+     * the bytes of lane values.
+     *
+     * @apiNote Shuffle source indexes are always in the
+     * range from {@code -VLENGTH} to {@code VLENGTH-1}.
+     * @param ms the memory segment
+     * @param offset the offset into the segment
+     * @param bo the byte order
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
+     *        {@code offset > a.byteSize() - this.length() * 4}
+     * @throws IllegalArgumentException if the segment {@code ms} is read-only
+     * @since 25
+     */
+    public abstract void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo);
+
+
     /**
      * Converts this shuffle into a vector, creating a vector
      * of integral values corresponding to the lane source
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 309c9bbf73d..fa502e3f29a 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
@@ -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 jdk.incubator.vector;
 
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.IntUnaryOperator;
@@ -1213,10 +1215,72 @@ final class $vectortype$ extends $abstractvectortype$ {
                         a[offset + i] = laneSource(i);
                     }
                 }
-            }
+           }
+
 #end[longOrDouble]
         }
 
+        @Override
+        @ForceInline
+        public void intoMemorySegment(MemorySegment ms, long offset, ByteOrder bo) {
+#if[byte]
+            VectorSpecies<Integer> species = IntVector.SPECIES_$BITS$;
+            Vector<Byte> v = toBitsVector();
+            v.convertShape(VectorOperators.B2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.B2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+            v.convertShape(VectorOperators.B2I, species, 2)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 2, bo);
+            v.convertShape(VectorOperators.B2I, species, 3)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize() * 3, bo);
+#end[byte]
+#if[short]
+            VectorSpecies<Integer> species = IntVector.SPECIES_$BITS$;
+            Vector<Short> v = toBitsVector();
+            v.convertShape(VectorOperators.S2I, species, 0)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset, bo);
+            v.convertShape(VectorOperators.S2I, species, 1)
+                    .reinterpretAsInts()
+                    .intoMemorySegment(ms, offset + species.vectorByteSize(), bo);
+#end[short]
+#if[intOrFloat]
+            toBitsVector().intoMemorySegment(ms, offset, bo);
+#end[intOrFloat]
+#if[longOrDouble]
+            switch (length()) {
+                case 1 -> ms.set(ValueLayout.OfInt.JAVA_INT_UNALIGNED, offset, laneSource(0));
+                case 2 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_64, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 4 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_128, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 8 -> toBitsVector()
+                       .convertShape(VectorOperators.L2I, IntVector.SPECIES_256, 0)
+                       .reinterpretAsInts()
+                       .intoMemorySegment(ms, offset, bo);
+                case 16 -> toBitsVector()
+                        .convertShape(VectorOperators.L2I, IntVector.SPECIES_512, 0)
+                        .reinterpretAsInts()
+                        .intoMemorySegment(ms, offset, bo);
+                default -> {
+                    VectorIntrinsics.checkFromIndexSize(offset, length(), ms.byteSize() / 4);
+                    for (int i = 0; i < length(); i++) {
+                        ms.setAtIndex(ValueLayout.JAVA_INT_UNALIGNED, offset + (i << 2), laneSource(i));
+                    }
+                }
+            }
+#end[longOrDouble]
+         }
+
         @Override
         @ForceInline
         public final $masktype$ laneIsValid() {
diff --git a/test/jdk/jdk/incubator/vector/AbstractVectorLoadStoreTest.java b/test/jdk/jdk/incubator/vector/AbstractVectorLoadStoreTest.java
index 01d4951aaa2..46acd611ba3 100644
--- a/test/jdk/jdk/incubator/vector/AbstractVectorLoadStoreTest.java
+++ b/test/jdk/jdk/incubator/vector/AbstractVectorLoadStoreTest.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
@@ -21,6 +21,9 @@
  * questions.
  */
 
+import jdk.incubator.vector.VectorSpecies;
+import org.testng.annotations.DataProvider;
+
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.ValueLayout;
@@ -32,28 +35,104 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.IntFunction;
+import java.util.function.IntUnaryOperator;
+import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 public class AbstractVectorLoadStoreTest extends AbstractVectorTest {
 
+    static final ValueLayout.OfInt SHUFFLE_ELEMENT_LAYOUT = ValueLayout.JAVA_INT.withByteAlignment(1);
+
     static final Collection<ByteOrder> BYTE_ORDER_VALUES = Set.of(
             ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN);
 
-    static final List<IntFunction<ByteBuffer>> BYTE_BUFFER_GENERATORS = List.of(
-            withToString("HB:RW:NE", (int s) ->
-                    ByteBuffer.allocate(s)
-                        .order(ByteOrder.nativeOrder())),
-            withToString("DB:RW:NE", (int s) ->
-                    ByteBuffer.allocateDirect(s)
-                        .order(ByteOrder.nativeOrder())),
-            withToString("MS:RW:NE", (int s) ->
-                    Arena.ofAuto().allocate(s)
-                        .asByteBuffer()
-                        .order(ByteOrder.nativeOrder())
-            )
+    static final int SHUFFLE_BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
+
+    static final List<IntFunction<int[]>> SHUFFLE_INT_GENERATORS = List.of(
+            withToString("int[i * 5]", (int s) -> {
+                return fill(s * SHUFFLE_BUFFER_REPS,
+                        i -> (int)(i * 5));
+            }),
+            withToString("int[i + 1]", (int s) -> {
+                return fill(s * SHUFFLE_BUFFER_REPS,
+                        i -> (((int)(i + 1) == 0) ? 1 : (int)(i + 1)));
+            })
+    );
+
+    static final List<IntFunction<Integer>> SHUFFLE_INDEX_GENERATORS = List.of(
+            withToString("-1", (int l) -> {
+                return -1;
+            }),
+            withToString("l", (int l) -> {
+                return l;
+            }),
+            withToString("l - 1", (int l) -> {
+                return l - 1;
+            }),
+            withToString("l + 1", (int l) -> {
+                return l + 1;
+            })
+    );
+
+    // Relative to byte[] array.length or MemorySegment.byteSize()
+    static final List<IntFunction<Integer>> SHUFFLE_BYTE_INDEX_GENERATORS = List.of(
+            withToString("-1", (int l) -> {
+                return -1;
+            }),
+            withToString("l", (int l) -> {
+                return l;
+            }),
+            withToString("l - 1", (int l) -> {
+                return l - 1;
+            }),
+            withToString("l + 1", (int l) -> {
+                return l + 1;
+            })
     );
 
-    static final List<IntFunction<MemorySegment>> MEMORY_SEGMENT_GENERATORS = List.of(
+    @DataProvider
+    public Object[][] shuffleIntProvider() {
+        return SHUFFLE_INT_GENERATORS.stream()
+                .map(f -> new Object[]{f})
+                .toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] shuffleIntProviderForIOOBE() {
+        var f = SHUFFLE_INT_GENERATORS.get(0);
+        return SHUFFLE_INDEX_GENERATORS.stream()
+                .map(fi -> {
+                    return new Object[] {f, fi};
+                })
+                .toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] shuffleIntMemorySegmentProvider() {
+        return SHUFFLE_INT_GENERATORS.stream().
+                flatMap(fa -> SHUFFLE_MEMORY_SEGMENT_GENERATORS.stream().
+                        flatMap(fb -> BYTE_ORDER_VALUES.stream().map(bo -> {
+                            return new Object[]{fa, fb, bo};
+                        }))).
+                toArray(Object[][]::new);
+    }
+
+    @DataProvider
+    public Object[][] shuffleIntByteProviderForIOOBE() {
+        var f = SHUFFLE_INT_GENERATORS.get(0);
+        return SHUFFLE_BYTE_INDEX_GENERATORS.stream().map(fi -> {
+                    return new Object[] {f, fi};
+                }).toArray(Object[][]::new);
+    }
+
+    static MemorySegment toShuffleSegment(VectorSpecies<?> vsp, int[] a, IntFunction<MemorySegment> fb) {
+        MemorySegment ms = fb.apply(a.length * 4);
+        return ms.copyFrom(MemorySegment.ofArray(a));
+    }
+
+    private static final List<IntFunction<MemorySegment>> SHARED_MEMORY_SEGMENT_GENERATORS = List.of(
             withToString("DMS", (int s) ->
                     Arena.ofAuto().allocate(s)
             ),
@@ -73,14 +152,6 @@ public class AbstractVectorLoadStoreTest extends AbstractVectorTest {
                 float[] b = new float[s / Float.BYTES];
                 return MemorySegment.ofArray(b);
             }),
-            withToString("HMS:long[]", (int s) -> {
-                long[] b = new long[s / Long.BYTES];
-                return MemorySegment.ofArray(b);
-            }),
-            withToString("HMS:double[]", (int s) -> {
-                double[] b = new double[s / Double.BYTES];
-                return MemorySegment.ofArray(b);
-            }),
             withToString("HMS:ByteBuffer.wrap", (int s) -> {
                 byte[] b = new byte[s];
                 ByteBuffer buff = ByteBuffer.wrap(b);
@@ -100,12 +171,54 @@ public class AbstractVectorLoadStoreTest extends AbstractVectorTest {
             withToString("HMS:IntBuffer.allocate", (int s) -> {
                 IntBuffer buff = IntBuffer.allocate(s / Integer.BYTES);
                 return MemorySegment.ofBuffer(buff);
-            }),
-            // Slice
-            withToString("HMS:long[].asSlice", (int s) -> {
-                long[] b = new long[s / Long.BYTES + 1];
-                return MemorySegment.ofArray(b).asSlice(Long.BYTES);
             })
     );
 
+
+    //These tests are adjusted to ensure we allocate enough memory for ints because we're passing
+    //a memory segment size of an int array in bytes, but it's subject to integer division of a longer
+    //array element.
+    static final List<IntFunction<MemorySegment>> SHUFFLE_MEMORY_SEGMENT_GENERATORS = Stream.concat(
+            SHARED_MEMORY_SEGMENT_GENERATORS.stream(),
+            Stream.of(
+                withToString("HMS:long[]:shuffle", (int s) -> {
+                    long[] b = new long[(s + Long.BYTES- 1) / Long.BYTES];
+                    return MemorySegment.ofArray(b);
+                }),
+
+                withToString("HMS:double[]:shuffle", (int s) -> {
+                    double[] b = new double[(s  + Double.BYTES - 1)/ Double.BYTES];
+                    return MemorySegment.ofArray(b);
+                }),
+                // Slice
+                withToString("HMS:long[].asSlice:shuffle", (int s) -> {
+                    long[] b = new long[(s + Long.BYTES - 1) / Long.BYTES + 1];
+                    return MemorySegment.ofArray(b).asSlice(Long.BYTES);
+                })
+            )
+    ).toList();
+
+    static final List<IntFunction<MemorySegment>> MEMORY_SEGMENT_GENERATORS = Stream.concat(
+            SHARED_MEMORY_SEGMENT_GENERATORS.stream(),
+            Stream.of(
+                    withToString("HMS:long[]", (int s) -> {
+                        long[] b = new long[s / Long.BYTES];
+                        return MemorySegment.ofArray(b);
+                    }),
+                    withToString("HMS:double[]", (int s) -> {
+                        double[] b = new double[s / Double.BYTES];
+                        return MemorySegment.ofArray(b);
+                    }),
+                    // Slice
+                    withToString("HMS:long[].asSlice", (int s) -> {
+                        long[] b = new long[s / Long.BYTES + 1];
+                        return MemorySegment.ofArray(b).asSlice(Long.BYTES);
+                    })
+            )
+    ).toList();
+
+    private static final int[] fill(int s, IntUnaryOperator f) {
+        return IntStream.range(0, s).map(f).toArray();
+    }
+
 }
diff --git a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java b/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
index 9352091bafc..71cabe75b76 100644
--- a/test/jdk/jdk/incubator/vector/AbstractVectorTest.java
+++ b/test/jdk/jdk/incubator/vector/AbstractVectorTest.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
@@ -22,19 +22,16 @@
  */
 
 import java.lang.Integer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
 import java.util.Random;
-import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.IntFunction;
 import java.util.function.IntUnaryOperator;
 import java.util.stream.Stream;
+import java.util.List;
 import java.util.stream.Collectors;
 
+import jdk.incubator.vector.VectorSpecies;
 import jdk.test.lib.Utils;
 
 import org.testng.Assert;
@@ -227,4 +224,18 @@ static void assertArraysEquals(boolean[] r, boolean[] a, boolean[] b, FBooleanBi
             Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
+
+    // Non-optimized test partial wrap derived from the Spec:
+    // Validation function for lane indexes which may be out of the valid range of [0..VLENGTH-1].
+    // The index is forced into this range by adding or subtracting a suitable multiple of VLENGTH.
+    // Specifically, the index is reduced into the required range by computing the value of length-floor, where
+    // floor=vectorSpecies().loopBound(length) is the next lower multiple of VLENGTH.
+    // As long as VLENGTH is a power of two, then the reduced index also equal to index & (VLENGTH - 1).
+    static int testPartiallyWrapIndex(VectorSpecies<?> vsp, int index) {
+        if (index >= 0 && index < vsp.length()) {
+            return index;
+        }
+        int wrapped = Math.floorMod(index, vsp.length());
+        return wrapped - vsp.length();
+    }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
index ee428120d9d..e450e3ead7e 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static byte[] fill(byte[] a, ToByteF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Byte> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Byte> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ByteVector fromArray(byte[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Byte> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Byte> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
     static void assertArraysEquals(boolean[] r, byte[] a) {
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
index 45d7b914776..a818043aedc 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static byte[] fill(byte[] a, ToByteF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Byte> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Byte> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ByteVector fromArray(byte[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Byte> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Byte> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
     static void assertArraysEquals(boolean[] r, byte[] a) {
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
index ddbe78b7099..7df9c1fbf10 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static byte[] fill(byte[] a, ToByteF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Byte> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Byte> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ByteVector fromArray(byte[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Byte> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Byte> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
     static void assertArraysEquals(boolean[] r, byte[] a) {
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
index 139ed113963..870b9f9b8fb 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static byte[] fill(byte[] a, ToByteF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Byte> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Byte> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ByteVector fromArray(byte[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Byte> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Byte> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
     static void assertArraysEquals(boolean[] r, byte[] a) {
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
index 3ea2205f515..bd5afc3f05a 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static byte[] fill(byte[] a, ToByteF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Byte> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Byte> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Byte> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ByteVector fromArray(byte[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Byte> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Byte> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Byte> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Byte> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
     static void assertArraysEquals(boolean[] r, byte[] a) {
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
index b1b5726c8cc..fed75349f68 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static double[] fill(double[] a, ToDoubleF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Double> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Double> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Double> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Double> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static DoubleVector fromArray(double[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Double> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Double> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
index 96f7602c7c4..d8a7eca2bda 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static double[] fill(double[] a, ToDoubleF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Double> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Double> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Double> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Double> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static DoubleVector fromArray(double[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Double> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Double> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
index 85d41b4ea3d..ddf76df1f3a 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static double[] fill(double[] a, ToDoubleF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Double> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Double> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Double> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Double> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static DoubleVector fromArray(double[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Double> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Double> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
index c197ecef8c0..e2c48d84529 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static double[] fill(double[] a, ToDoubleF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Double> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Double> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Double> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Double> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static DoubleVector fromArray(double[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Double> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Double> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
index 1b7868a3e3b..f8ea6d7c4a2 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static double[] fill(double[] a, ToDoubleF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Double> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Double> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Double> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Double> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static DoubleVector fromArray(double[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Double> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Double> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Double> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Double> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
index 7a9de397eee..4421c355c14 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static float[] fill(float[] a, ToFloatF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Float> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Float> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Float> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Float> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static FloatVector fromArray(float[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Float> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Float> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
index 511674f7a2a..0ad426d9954 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static float[] fill(float[] a, ToFloatF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Float> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Float> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Float> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Float> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static FloatVector fromArray(float[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Float> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Float> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
index 9efcfe31fc7..56da27f1149 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static float[] fill(float[] a, ToFloatF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Float> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Float> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Float> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Float> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static FloatVector fromArray(float[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Float> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Float> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
index e1aa2f34cb1..b3ee68a4aca 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static float[] fill(float[] a, ToFloatF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Float> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Float> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Float> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Float> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static FloatVector fromArray(float[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Float> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Float> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
index ff9d0e67202..5c86ab350d2 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static float[] fill(float[] a, ToFloatF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Float> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Float> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Float> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Float> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static FloatVector fromArray(float[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Float> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Float> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Float> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Float> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
index fc678965d0f..f2448365138 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static int[] fill(int[] a, ToIntF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Integer> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Integer> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static IntVector fromArray(int[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Integer> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Integer> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
index 85027d700d2..1a8c113d3b9 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static int[] fill(int[] a, ToIntF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Integer> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Integer> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static IntVector fromArray(int[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Integer> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Integer> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
index f9b72103107..4c4ab6c4bc5 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static int[] fill(int[] a, ToIntF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Integer> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Integer> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static IntVector fromArray(int[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Integer> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Integer> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
index 6dc2bb1a504..a1fa9a8b16c 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static int[] fill(int[] a, ToIntF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Integer> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Integer> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static IntVector fromArray(int[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Integer> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Integer> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
index cc4aef80f6f..564849e22fd 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static int[] fill(int[] a, ToIntF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Integer> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Integer> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Integer> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static IntVector fromArray(int[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Integer> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Integer> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Integer> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Integer> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
index f9fb3a452a1..57a0880aed3 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static long[] fill(long[] a, ToLongF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Long> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Long> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Long> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Long> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static LongVector fromArray(long[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Long> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Long> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
index 73e81a2635f..f07cf3e68b7 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static long[] fill(long[] a, ToLongF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Long> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Long> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Long> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Long> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static LongVector fromArray(long[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Long> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Long> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
index 7f38adb46a1..1b70f8d1ba4 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static long[] fill(long[] a, ToLongF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Long> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Long> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Long> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Long> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static LongVector fromArray(long[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Long> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Long> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
index 398aec1981a..53df5e4e092 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static long[] fill(long[] a, ToLongF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Long> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Long> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Long> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Long> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static LongVector fromArray(long[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Long> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Long> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
index 48c2534b66c..e0f8b548228 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static long[] fill(long[] a, ToLongF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Long> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Long> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Long> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Long> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static LongVector fromArray(long[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Long> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Long> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Long> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Long> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 
 
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
index 400b3c376a1..5a71c5550f3 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static short[] fill(short[] a, ToShortF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Short> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Short> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Short> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Short> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ShortVector fromArray(short[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Short> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Short> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {
         int i = 0;
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
index 92cecf534b5..335d51add59 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static short[] fill(short[] a, ToShortF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Short> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Short> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Short> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Short> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ShortVector fromArray(short[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Short> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Short> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {
         int i = 0;
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
index a3d577afcdc..7a273986bef 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static short[] fill(short[] a, ToShortF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Short> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Short> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Short> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Short> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ShortVector fromArray(short[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Short> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Short> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {
         int i = 0;
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
index dd420fd3613..952d71c80a6 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.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
@@ -249,6 +249,26 @@ static short[] fill(short[] a, ToShortF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Short> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Short> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Short> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Short> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ShortVector fromArray(short[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -682,18 +702,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Short> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Short> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {
         int i = 0;
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
index 90070d44389..91db367808a 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.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
@@ -256,6 +256,26 @@ static short[] fill(short[] a, ToShortF f) {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<Short> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<Short> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<Short> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<Short> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static ShortVector fromArray(short[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -689,18 +709,161 @@ static void loadStoreMask(IntFunction<boolean[]> fm) {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<Short> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<Short> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<Short> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<Short> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {
         int i = 0;
diff --git a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
index 6473016a9a0..a68103e1060 100644
--- a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
+++ b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
@@ -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
@@ -269,6 +269,26 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
         return a;
     }
 
+    @DontInline
+    static VectorShuffle<$Boxtype$> shuffleFromArray(int[] a, int i) {
+        return SPECIES.shuffleFromArray(a, i);
+    }
+
+    @DontInline
+    static void shuffleIntoArray(VectorShuffle<$Boxtype$> s, int[] a, int i) {
+        s.intoArray(a, i);
+    }
+
+    @DontInline
+    static VectorShuffle<$Boxtype$> shuffleFromMemorySegment(MemorySegment mem, int i, ByteOrder bo) {
+        return VectorShuffle.fromMemorySegment(SPECIES, mem, i, bo);
+    }
+
+    @DontInline
+    static void shuffleIntoMemorySegment(VectorShuffle<$Boxtype$> s, MemorySegment mem, int i, ByteOrder bo) {
+        s.intoMemorySegment(mem, i, bo);
+    }
+
     @DontInline
     static $abstractvectortype$ fromArray($type$[] a, int i) {
         // Tests the species method and the equivalent vector method it defers to
@@ -702,18 +722,161 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
     }
 
 
-    @Test
-    static void loadStoreShuffle() {
-        IntUnaryOperator fn = a -> a + 5;
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            var shuffle = VectorShuffle.fromOp(SPECIES, fn);
-            int [] r = shuffle.toArray();
+   @Test(dataProvider = "shuffleIntProvider")
+   static void loadStoreShuffleArray(IntFunction<int[]> fa) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
 
-            int [] a = expectedShuffle(SPECIES.length(), fn);
-            Assert.assertEquals(r, a);
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<$Boxtype$> shuffle = VectorShuffle.fromArray(SPECIES, a, i);
+               shuffle.intoArray(r, i);
+           }
        }
-    }
 
+       for (int i = 0; i < a.length; i++) {
+          Assert.assertEquals(testPartiallyWrapIndex(SPECIES, a[i]), r[i]);
+       }
+
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void storeShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<$Boxtype$> shuffle = shuffleFromArray(a, i);
+               shuffleIntoArray(shuffle, r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           VectorShuffle<$Boxtype$> shuffle = shuffleFromArray(a, index);
+           shuffleIntoArray(shuffle, r, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntProviderForIOOBE")
+   static void loadShuffleArrayIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       int[] a = fa.apply(SPECIES.length());
+       int[] r = new int[a.length];
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < a.length; i += SPECIES.length()) {
+               VectorShuffle<$Boxtype$> shuffle = shuffleFromArray(a, i);
+               shuffle.intoArray(r, i);
+           }
+       }
+
+       int index = fi.apply(a.length);
+       boolean shouldFail = isIndexOutOfBounds(SPECIES.length(), index, a.length);
+       try {
+           shuffleFromArray(a, index);
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntMemorySegmentProvider")
+   static void loadStoreShuffleMemorySegment(IntFunction<int[]> fa,
+                                      IntFunction<MemorySegment> fb,
+                                      ByteOrder bo) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), fb);
+       MemorySegment r = fb.apply((int) a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4; //An integer for every lane is read out. So 4 bytes per lane
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<$Boxtype$> shuffle = VectorShuffle.fromMemorySegment(SPECIES, a, i, bo);
+               shuffle.intoMemorySegment(r, i, bo);
+           }
+       }
+
+       for (int i = 0; i < l / 4; i++) {
+           int ai = a.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           int ri = r.getAtIndex(ValueLayout.JAVA_INT_UNALIGNED.withOrder(bo), i);
+           Assert.assertEquals(testPartiallyWrapIndex(SPECIES, ai), ri);
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleLoadMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<$Boxtype$> shuffle = shuffleFromMemorySegment(a, i, ByteOrder.nativeOrder());
+               shuffle.intoMemorySegment(r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           shuffleFromMemorySegment(a, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
+
+   @Test(dataProvider = "shuffleIntByteProviderForIOOBE")
+   static void shuffleStoreMemorySegmentIOOBE(IntFunction<int[]> fa, IntFunction<Integer> fi) {
+       MemorySegment a = toShuffleSegment(SPECIES, fa.apply(SPECIES.length()), i -> Arena.ofAuto().allocate(i));
+       MemorySegment r = Arena.ofAuto().allocate(a.byteSize());
+
+       int l = (int) a.byteSize();
+       int s = SPECIES.length() * 4;
+
+       for (int ic = 0; ic < INVOC_COUNT; ic++) {
+           for (int i = 0; i < l; i += s) {
+               VectorShuffle<$Boxtype$> shuffle =
+                       VectorShuffle.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+               shuffleIntoMemorySegment(shuffle, r, i, ByteOrder.nativeOrder());
+           }
+       }
+
+       int index = fi.apply((int) a.byteSize());
+       boolean shouldFail = isIndexOutOfBounds(s, index, (int) a.byteSize());
+       try {
+           VectorShuffle<$Boxtype$> shuffle =
+                   VectorShuffle.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+           shuffleIntoMemorySegment(shuffle, r, index, ByteOrder.nativeOrder());
+           if (shouldFail) {
+               Assert.fail("Failed to throw IndexOutOfBoundsException");
+           }
+       } catch (IndexOutOfBoundsException e) {
+           if (!shouldFail) {
+               Assert.fail("Unexpected IndexOutOfBoundsException");
+           }
+       }
+   }
 
 #if[short]
     static void assertArraysEquals(char[] a, char[] r, boolean[] mask) {

From 3ee14471e10ca83fe96b7ee1d80a67a1f8c7f4ec Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 21 May 2025 21:56:41 +0000
Subject: [PATCH 572/901] 8357503: gcbasher fails with
 java.lang.IllegalArgumentException: Unknown constant pool type

Reviewed-by: dholmes
---
 test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java b/test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java
index a6b399bc013..446d9398d14 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/Decompiler.java
@@ -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.
  * 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,7 @@ private ConstantPoolEntry[] decodeConstantPool() {
         final int CONSTANT_NameAndType = 12;
         final int CONSTANT_MethodHandle = 15;
         final int CONSTANT_MethodType = 16;
+        final int CONSTANT_Dynamic = 17;
         final int CONSTANT_InvokeDynamic = 18;
 
         ConstantPoolEntry[] constantPool = new ConstantPoolEntry[cursor.readUnsignedShort()];
@@ -319,6 +320,11 @@ private ConstantPoolEntry[] decodeConstantPool() {
                     cursor.readUnsignedShort(); // descriptor_index
                     break;
 
+                case CONSTANT_Dynamic:
+                    cursor.readUnsignedShort(); // bootstrap_method_attr_index
+                    cursor.readUnsignedShort(); // name_and_type_index
+                    break;
+
                 case CONSTANT_InvokeDynamic:
                     cursor.readUnsignedShort(); // bootstrap_method_attr_index
                     cursor.readUnsignedShort(); // name_and_type_index

From f687cac88946b397d043e16ce3adc7b66a205af8 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Wed, 21 May 2025 22:13:07 +0000
Subject: [PATCH 573/901] 8353504: CDS archives are not found when JVM is in
 non-variant location

Reviewed-by: iklam, shade
---
 src/hotspot/share/cds/cdsConfig.cpp           |  8 +-
 .../runtime/cds/NonJVMVariantLocation.java    | 89 +++++++++++++++++++
 test/lib/jdk/test/lib/cds/CDSTestUtils.java   |  6 +-
 3 files changed, 98 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/NonJVMVariantLocation.java

diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index dada74c9ec2..bdbd7563cc4 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -108,10 +108,12 @@ const char* CDSConfig::default_archive_path() {
   // before CDSConfig::ergo_initialize() is called.
   assert(_cds_ergo_initialize_started, "sanity");
   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;
-    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());
+    tmp.print("%s%sclasses", jvm_path, os::file_separator());
 #ifdef _LP64
     if (!UseCompressedOops) {
       tmp.print_raw("_nocoops");
diff --git a/test/hotspot/jtreg/runtime/cds/NonJVMVariantLocation.java b/test/hotspot/jtreg/runtime/cds/NonJVMVariantLocation.java
new file mode 100644
index 00000000000..81e931e450e
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/NonJVMVariantLocation.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 CDS archive can be loaded if the archive is in a non-JVM variant directory.
+ * @bug 8353504
+ * @requires vm.cds
+ * @requires vm.flagless
+ * @requires vm.flavor == "server"
+ * @comment This test doesn't work on Windows because it depends on symlinks
+ * @requires os.family != "windows"
+ * @library /test/lib appcds
+ * @run driver NonJVMVariantLocation
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class NonJVMVariantLocation {
+    public static void main(String[] args) throws Exception {
+        String java_home_src = System.getProperty("java.home");
+        String java_home_dst = CDSTestUtils.getOutputDir() + File.separator + "moved_jdk";
+        String homeJava = java_home_src + File.separator + "bin" + File.separator + "java";
+        String dstJava  = java_home_dst + File.separator + "bin" + File.separator + "java";
+
+        CDSTestUtils.clone(new File(java_home_src), new File(java_home_dst));
+        System.out.println("============== Cloned JDK at " + java_home_dst);
+
+        // Replace "server" with "release" in jvm.cfg.
+        // The jvm.cfg is parsed by the java launcher in java.c.
+        String locDir = java_home_dst + File.separator + "lib";
+        String jvmCfg = locDir + File.separator + "jvm.cfg";
+        String serverDir = "server";
+        String releaseDir = "release";
+        replaceTextInFile(jvmCfg, serverDir, releaseDir);
+
+        // Rename "server" dir to "release" dir.
+        CDSTestUtils.rename(new File(locDir + File.separator + serverDir),
+                            new File(locDir + File.separator + releaseDir));
+
+        // Test runtime with cloned JDK
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xshare:on",
+                                                         "-Xlog:cds",
+                                                         "-version");
+            OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
+            out.shouldHaveExitValue(0)
+               .shouldMatch(".info..cds. Opened shared archive file.*classes.*\\.jsa");
+        }
+    }
+
+    private static void replaceTextInFile(String filePath, String oldText, String newText) {
+        try {
+            List<String> lines = Files.readAllLines(Paths.get(filePath));
+            lines.replaceAll(line -> line.replace(oldText, newText));
+            Files.write(Paths.get(filePath), lines);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
index 1cc89737633..be6fddc17aa 100644
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
@@ -778,8 +778,10 @@ private static boolean isAsciiPrintable(char ch) {
 
     // Do a cheap clone of the JDK. Most files can be sym-linked. However, $JAVA_HOME/bin/java and $JAVA_HOME/lib/.../libjvm.so"
     // must be copied, because the java.home property is derived from the canonicalized paths of these 2 files.
-    // Set a list of {jvm, "java"} which will be physically copied. If a file needs copied physically, add it to the list.
-    private static String[] phCopied = {System.mapLibraryName("jvm"), "java"};
+    // The jvm.cfg file must be copied because the cds/NonJVMVariantLocation.java
+    // test is testing a CDS archive can be loaded from a non-JVM variant directory.
+    // Set a list of {jvm, "java", "jvm.cfg"} which will be physically copied. If a file needs copied physically, add it to the list.
+    private static String[] phCopied = {System.mapLibraryName("jvm"), "java", "jvm.cfg"};
     public static void clone(File src, File dst) throws Exception {
         if (dst.exists()) {
             if (!dst.isDirectory()) {

From 07871cd78aa7ee35762234112dfe46fe3ebc9a57 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Wed, 21 May 2025 22:39:11 +0000
Subject: [PATCH 574/901] 8357063: Document preconditions for DecimalDigits
 methods

Reviewed-by: vyazici, liach, rriggs
---
 .../java/lang/AbstractStringBuilder.java      |  8 +-
 .../share/classes/java/lang/Integer.java      |  4 +-
 .../share/classes/java/lang/Long.java         |  4 +-
 .../classes/java/lang/StringConcatHelper.java | 16 ++--
 .../share/classes/java/math/BigDecimal.java   |  4 +-
 .../jdk/internal/util/DecimalDigits.java      | 87 +++++++++++--------
 .../patches/java.base/java/lang/Helper.java   |  4 +-
 7 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index b63e9d09210..d317557cbb1 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -924,9 +924,9 @@ public AbstractStringBuilder append(int i) {
         int spaceNeeded = count + DecimalDigits.stringSize(i);
         byte[] value = ensureCapacitySameCoder(this.value, coder, spaceNeeded);
         if (isLatin1(coder)) {
-            DecimalDigits.getCharsLatin1(i, spaceNeeded, value);
+            DecimalDigits.uncheckedGetCharsLatin1(i, spaceNeeded, value);
         } else {
-            DecimalDigits.getCharsUTF16(i, spaceNeeded, value);
+            DecimalDigits.uncheckedGetCharsUTF16(i, spaceNeeded, value);
         }
         this.value = value;
         this.count = spaceNeeded;
@@ -951,9 +951,9 @@ public AbstractStringBuilder append(long l) {
         int spaceNeeded = count + DecimalDigits.stringSize(l);
         byte[] value = ensureCapacitySameCoder(this.value, coder, spaceNeeded);
         if (isLatin1(coder)) {
-            DecimalDigits.getCharsLatin1(l, spaceNeeded, value);
+            DecimalDigits.uncheckedGetCharsLatin1(l, spaceNeeded, value);
         } else {
-            DecimalDigits.getCharsUTF16(l, spaceNeeded, value);
+            DecimalDigits.uncheckedGetCharsUTF16(l, spaceNeeded, value);
         }
         this.value = value;
         this.count = spaceNeeded;
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 1350a66b66c..a95149a3edd 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -432,11 +432,11 @@ public static String toString(int i) {
         int size = DecimalDigits.stringSize(i);
         if (COMPACT_STRINGS) {
             byte[] buf = new byte[size];
-            DecimalDigits.getCharsLatin1(i, size, buf);
+            DecimalDigits.uncheckedGetCharsLatin1(i, size, buf);
             return new String(buf, LATIN1);
         } else {
             byte[] buf = new byte[size * 2];
-            DecimalDigits.getCharsUTF16(i, size, buf);
+            DecimalDigits.uncheckedGetCharsUTF16(i, size, buf);
             return new String(buf, UTF16);
         }
     }
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 3093f37e99a..20e07f41b9e 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -462,11 +462,11 @@ public static String toString(long i) {
         int size = DecimalDigits.stringSize(i);
         if (COMPACT_STRINGS) {
             byte[] buf = new byte[size];
-            DecimalDigits.getCharsLatin1(i, size, buf);
+            DecimalDigits.uncheckedGetCharsLatin1(i, size, buf);
             return new String(buf, LATIN1);
         } else {
             byte[] buf = new byte[size * 2];
-            DecimalDigits.getCharsUTF16(i, size, buf);
+            DecimalDigits.uncheckedGetCharsUTF16(i, size, buf);
             return new String(buf, UTF16);
         }
     }
diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index f82e392a1fb..a5f6abbfdf1 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -315,12 +315,12 @@ static long prepend(long indexCoder, byte[] buf, char value, String prefix) {
     static long prepend(long indexCoder, byte[] buf, int value, String prefix) {
         int index = (int)indexCoder;
         if (indexCoder < UTF16) {
-            index = DecimalDigits.getCharsLatin1(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsLatin1(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
             return index;
         } else {
-            index = DecimalDigits.getCharsUTF16(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsUTF16(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
             return index | UTF16;
@@ -341,12 +341,12 @@ static long prepend(long indexCoder, byte[] buf, int value, String prefix) {
     static long prepend(long indexCoder, byte[] buf, long value, String prefix) {
         int index = (int)indexCoder;
         if (indexCoder < UTF16) {
-            index = DecimalDigits.getCharsLatin1(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsLatin1(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
             return index;
         } else {
-            index = DecimalDigits.getCharsUTF16(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsUTF16(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
             return index | UTF16;
@@ -713,11 +713,11 @@ static int prepend(int index, byte coder, byte[] buf, char value, String prefix)
      */
     static int prepend(int index, byte coder, byte[] buf, int value, String prefix) {
         if (coder == String.LATIN1) {
-            index = DecimalDigits.getCharsLatin1(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsLatin1(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
         } else {
-            index = DecimalDigits.getCharsUTF16(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsUTF16(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
         }
@@ -737,11 +737,11 @@ static int prepend(int index, byte coder, byte[] buf, int value, String prefix)
      */
     static int prepend(int index, byte coder, byte[] buf, long value, String prefix) {
         if (coder == String.LATIN1) {
-            index = DecimalDigits.getCharsLatin1(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsLatin1(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.LATIN1);
         } else {
-            index = DecimalDigits.getCharsUTF16(value, index, buf);
+            index = DecimalDigits.uncheckedGetCharsUTF16(value, index, buf);
             index -= prefix.length();
             prefix.getBytes(buf, index, String.UTF16);
         }
diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index eec26ce496d..d40ec0b705a 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -4146,9 +4146,9 @@ private String layoutChars(boolean sci) {
             int highInt = (int)intCompact / 100;
             int highIntSize = DecimalDigits.stringSize(highInt);
             byte[] buf = new byte[highIntSize + 3];
-            DecimalDigits.getCharsLatin1(highInt, highIntSize, buf);
+            DecimalDigits.uncheckedGetCharsLatin1(highInt, highIntSize, buf);
             buf[highIntSize] = '.';
-            DecimalDigits.putPairLatin1(buf, highIntSize + 1, lowInt);
+            DecimalDigits.uncheckedPutPairLatin1(buf, highIntSize + 1, lowInt);
             try {
                 return JLA.uncheckedNewStringNoRepl(buf, StandardCharsets.ISO_8859_1);
             } catch (CharacterCodingException cce) {
diff --git a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
index d3df46dcd3c..6c0c745651e 100644
--- a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
@@ -143,14 +143,15 @@ public static int stringSize(long x) {
      * values, to cover the Integer.MIN_VALUE case. Converting otherwise
      * (negative to positive) will expose -Integer.MIN_VALUE that overflows
      * integer.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks. </b>
      *
      * @param i     value to convert
      * @param index next index, after the least significant digit
      * @param buf   target buffer, Latin1-encoded
      * @return index of the most significant digit or minus sign, if present
      */
-    public static int getCharsLatin1(int i, int index, byte[] buf) {
-        // Used by trusted callers.  Assumes all necessary bounds checks have been done by the caller.
+    public static int uncheckedGetCharsLatin1(int i, int index, byte[] buf) {
         int q;
         int charPos = index;
 
@@ -163,20 +164,20 @@ public static int getCharsLatin1(int i, int index, byte[] buf) {
         while (i <= -100) {
             q = i / 100;
             charPos -= 2;
-            putPairLatin1(buf, charPos, (q * 100) - i);
+            uncheckedPutPairLatin1(buf, charPos, (q * 100) - i);
             i = q;
         }
 
         // We know there are at most two digits left at this point.
         if (i <= -10) {
             charPos -= 2;
-            putPairLatin1(buf, charPos, -i);
+            uncheckedPutPairLatin1(buf, charPos, -i);
         } else {
-            putCharLatin1(buf, --charPos, '0' - i);
+            uncheckedPutCharLatin1(buf, --charPos, '0' - i);
         }
 
         if (negative) {
-            putCharLatin1(buf, --charPos, '-');
+            uncheckedPutCharLatin1(buf, --charPos, '-');
         }
         return charPos;
     }
@@ -193,14 +194,15 @@ public static int getCharsLatin1(int i, int index, byte[] buf) {
      * values, to cover the Long.MIN_VALUE case. Converting otherwise
      * (negative to positive) will expose -Long.MIN_VALUE that overflows
      * long.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks. </b>
      *
      * @param i     value to convert
      * @param index next index, after the least significant digit
      * @param buf   target buffer, Latin1-encoded
      * @return index of the most significant digit or minus sign, if present
      */
-    public static int getCharsLatin1(long i, int index, byte[] buf) {
-        // Used by trusted callers.  Assumes all necessary bounds checks have been done by the caller.
+    public static int uncheckedGetCharsLatin1(long i, int index, byte[] buf) {
         long q;
         int charPos = index;
 
@@ -213,7 +215,7 @@ public static int getCharsLatin1(long i, int index, byte[] buf) {
         while (i < Integer.MIN_VALUE) {
             q = i / 100;
             charPos -= 2;
-            putPairLatin1(buf, charPos, (int)((q * 100) - i));
+            uncheckedPutPairLatin1(buf, charPos, (int)((q * 100) - i));
             i = q;
         }
 
@@ -223,36 +225,37 @@ public static int getCharsLatin1(long i, int index, byte[] buf) {
         while (i2 <= -100) {
             q2 = i2 / 100;
             charPos -= 2;
-            putPairLatin1(buf, charPos, (q2 * 100) - i2);
+            uncheckedPutPairLatin1(buf, charPos, (q2 * 100) - i2);
             i2 = q2;
         }
 
         // We know there are at most two digits left at this point.
         if (i2 <= -10) {
             charPos -= 2;
-            putPairLatin1(buf, charPos, -i2);
+            uncheckedPutPairLatin1(buf, charPos, -i2);
         } else {
-            putCharLatin1(buf, --charPos, '0' - i2);
+            uncheckedPutCharLatin1(buf, --charPos, '0' - i2);
         }
 
         if (negative) {
-            putCharLatin1(buf, --charPos, '-');
+            uncheckedPutCharLatin1(buf, --charPos, '-');
         }
         return charPos;
     }
 
 
     /**
-     * This is a variant of {@link DecimalDigits#getCharsLatin1(int, int, byte[])}, but for
+     * This is a variant of {@link DecimalDigits#uncheckedGetCharsLatin1(int, int, byte[])}, but for
      * UTF-16 coder.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @param i     value to convert
      * @param index next index, after the least significant digit
      * @param buf   target buffer, UTF16-coded.
      * @return index of the most significant digit or minus sign, if present
      */
-    public static int getCharsUTF16(int i, int index, byte[] buf) {
-        // Used by trusted callers.  Assumes all necessary bounds checks have been done by the caller.
+    public static int uncheckedGetCharsUTF16(int i, int index, byte[] buf) {
         int q;
         int charPos = index;
 
@@ -265,36 +268,37 @@ public static int getCharsUTF16(int i, int index, byte[] buf) {
         while (i <= -100) {
             q = i / 100;
             charPos -= 2;
-            putPairUTF16(buf, charPos, (q * 100) - i);
+            uncheckedPutPairUTF16(buf, charPos, (q * 100) - i);
             i = q;
         }
 
         // We know there are at most two digits left at this point.
         if (i <= -10) {
             charPos -= 2;
-            putPairUTF16(buf, charPos, -i);
+            uncheckedPutPairUTF16(buf, charPos, -i);
         } else {
-            putCharUTF16(buf, --charPos, '0' - i);
+            uncheckedPutCharUTF16(buf, --charPos, '0' - i);
         }
 
         if (negative) {
-            putCharUTF16(buf, --charPos, '-');
+            uncheckedPutCharUTF16(buf, --charPos, '-');
         }
         return charPos;
     }
 
 
     /**
-     * This is a variant of {@link DecimalDigits#getCharsLatin1(long, int, byte[])}, but for
+     * This is a variant of {@link DecimalDigits#uncheckedGetCharsLatin1(long, int, byte[])}, but for
      * UTF-16 coder.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
      *
      * @param i     value to convert
      * @param index next index, after the least significant digit
      * @param buf   target buffer, UTF16-coded.
      * @return index of the most significant digit or minus sign, if present
      */
-    public static int getCharsUTF16(long i, int index, byte[] buf) {
-        // Used by trusted callers.  Assumes all necessary bounds checks have been done by the caller.
+    public static int uncheckedGetCharsUTF16(long i, int index, byte[] buf) {
         long q;
         int charPos = index;
 
@@ -307,7 +311,7 @@ public static int getCharsUTF16(long i, int index, byte[] buf) {
         while (i < Integer.MIN_VALUE) {
             q = i / 100;
             charPos -= 2;
-            putPairUTF16(buf, charPos, (int)((q * 100) - i));
+            uncheckedPutPairUTF16(buf, charPos, (int)((q * 100) - i));
             i = q;
         }
 
@@ -317,26 +321,26 @@ public static int getCharsUTF16(long i, int index, byte[] buf) {
         while (i2 <= -100) {
             q2 = i2 / 100;
             charPos -= 2;
-            putPairUTF16(buf, charPos, (q2 * 100) - i2);
+            uncheckedPutPairUTF16(buf, charPos, (q2 * 100) - i2);
             i2 = q2;
         }
 
         // We know there are at most two digits left at this point.
         if (i2 <= -10) {
             charPos -= 2;
-            putPairUTF16(buf, charPos, -i2);
+            uncheckedPutPairUTF16(buf, charPos, -i2);
         } else {
-            putCharUTF16(buf, --charPos, '0' - i2);
+            uncheckedPutCharUTF16(buf, --charPos, '0' - i2);
         }
 
         if (negative) {
-            putCharUTF16(buf, --charPos, '-');
+            uncheckedPutCharUTF16(buf, --charPos, '-');
         }
         return charPos;
     }
 
     /**
-     * This is a variant of {@link DecimalDigits#getCharsUTF16(long, int, byte[])}, but for
+     * This is a variant of {@link DecimalDigits#uncheckedGetCharsUTF16(long, int, byte[])}, but for
      * UTF-16 coder.
      *
      * @param i     value to convert
@@ -345,7 +349,6 @@ public static int getCharsUTF16(long i, int index, byte[] buf) {
      * @return index of the most significant digit or minus sign, if present
      */
     public static int getChars(long i, int index, char[] buf) {
-        // Used by trusted callers.  Assumes all necessary bounds checks have been done by the caller.
         long q;
         int charPos = index;
 
@@ -402,34 +405,42 @@ public static void putPair(char[] buf, int charPos, int v) {
     /**
      * Insert the 2-bytes integer into the buf as 2 decimal digit ASCII bytes,
      * only least significant 16 bits of {@code v} are used.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
+     *
      * @param buf byte buffer to copy into
      * @param charPos insert point
      * @param v to convert
      */
-    public static void putPairLatin1(byte[] buf, int charPos, int v) {
+    public static void uncheckedPutPairLatin1(byte[] buf, int charPos, int v) {
         int packed = DIGITS[v & 0x7f];
-        putCharLatin1(buf, charPos, packed & 0xFF);
-        putCharLatin1(buf, charPos + 1, packed >> 8);
+        uncheckedPutCharLatin1(buf, charPos, packed & 0xFF);
+        uncheckedPutCharLatin1(buf, charPos + 1, packed >> 8);
     }
 
     /**
      * Insert the 2-chars integer into the buf as 2 decimal digit UTF16 bytes,
      * only least significant 16 bits of {@code v} are used.
+     * <p>
+     * <b>WARNING: This method does not perform any bound checks.</b>
+     *
      * @param buf byte buffer to copy into
      * @param charPos insert point
      * @param v to convert
      */
-    public static void putPairUTF16(byte[] buf, int charPos, int v) {
+    public static void uncheckedPutPairUTF16(byte[] buf, int charPos, int v) {
         int packed = DIGITS[v & 0x7f];
-        putCharUTF16(buf, charPos, packed & 0xFF);
-        putCharUTF16(buf, charPos + 1, packed >> 8);
+        uncheckedPutCharUTF16(buf, charPos, packed & 0xFF);
+        uncheckedPutCharUTF16(buf, charPos + 1, packed >> 8);
     }
 
-    private static void putCharLatin1(byte[] buf, int charPos, int c) {
+    private static void uncheckedPutCharLatin1(byte[] buf, int charPos, int c) {
+        assert charPos >= 0 && charPos < buf.length;
         UNSAFE.putByte(buf, ARRAY_BYTE_BASE_OFFSET + charPos, (byte) c);
     }
 
-    private static void putCharUTF16(byte[] buf, int charPos, int c) {
+    private static void uncheckedPutCharUTF16(byte[] buf, int charPos, int c) {
+        assert charPos >= 0 && charPos < (buf.length >> 1);
         UNSAFE.putCharUnaligned(buf, ARRAY_BYTE_BASE_OFFSET + ((long) charPos << 1), (char) c);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
index aef27bfb9a4..e6c8b68fc6f 100644
--- a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
+++ b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
@@ -120,14 +120,14 @@ public static int codePointCountSB(byte[] val, int beginIndex, int endIndex) {
 
     public static int getChars(int i, int begin, int end, byte[] value) {
         StringUTF16.checkBoundsBeginEnd(begin, end, value);
-        int pos = DecimalDigits.getCharsUTF16(i, end, value);
+        int pos = DecimalDigits.uncheckedGetCharsUTF16(i, end, value);
         assert begin == pos;
         return pos;
     }
 
     public static int getChars(long l, int begin, int end, byte[] value) {
         StringUTF16.checkBoundsBeginEnd(begin, end, value);
-        int pos = DecimalDigits.getCharsUTF16(l, end, value);
+        int pos = DecimalDigits.uncheckedGetCharsUTF16(l, end, value);
         assert begin == pos;
         return pos;
     }

From b685ea54081fcf54a6567dddb49b63435a6e1ea4 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Thu, 22 May 2025 00:37:54 +0000
Subject: [PATCH 575/901] 8357511: [BACKOUT] 8357048: RunTest variables should
 always be assigned

Reviewed-by: dholmes, erikj
---
 make/RunTests.gmk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 12e81dba2c8..95d3dee7013 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -583,8 +583,6 @@ define SetMicroValue
   else
     ifneq ($3, )
       $1_$2 := $3
-    else
-      $1_$2 :=
     endif
   endif
 endef
@@ -711,8 +709,6 @@ define SetJtregValue
     else
       ifneq ($3, )
         $1_$2 := $3
-      else
-        $1_$2 :=
       endif
     endif
   endif
@@ -873,7 +869,7 @@ define SetupRunJtregTestBody
   # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) \
+      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -998,7 +994,6 @@ define SetupRunJtregTestBody
   endif
 
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
-  $1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
 	$$(call LogWarn, Clean up dirs for $1)

From ee6891456ed672305d9b48846b5a7977373e1284 Mon Sep 17 00:00:00 2001
From: Zdenek Zambersky <zzambers@openjdk.org>
Date: Thu, 22 May 2025 03:39:47 +0000
Subject: [PATCH 576/901] 8343618: Stack smashing in awt_InputMethod.c on Linux
 s390x

Co-authored-by: Ichiroh Takiguchi <itakiguchi@openjdk.org>
Reviewed-by: prr, aph, amitkumar
---
 .../native/libawt_xawt/awt/awt_InputMethod.c  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
index 7bfb858616a..fc2dece1919 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
@@ -1618,14 +1618,14 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_setCompositionEnabled
     if (NULL != pX11IMData->statusWindow) {
         Window focus = 0;
         int revert_to;
-#if defined(_LP64) && !defined(_LITTLE_ENDIAN)
-        // The Window value which is used for XGetICValues must be 32bit on BigEndian XOrg's xlib
-        unsigned int w = 0;
-#else
         Window w = 0;
-#endif
         XGetInputFocus(awt_display, &focus, &revert_to);
         XGetICValues(pX11IMData->current_ic, XNFocusWindow, &w, NULL);
+#if defined(_LP64) && !defined(_LITTLE_ENDIAN)
+        // On 64bit BigEndian,
+        // Window value may be stored on high 32bit by XGetICValues via XIM
+        if (w > 0xffffffffUL) w = w >> 32;
+#endif
         if (RevertToPointerRoot == revert_to
                 && pX11IMData->ic_active != pX11IMData->ic_passive) {
             if (pX11IMData->current_ic == pX11IMData->ic_active) {
@@ -1674,12 +1674,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_isCompositionEnabledN
 {
     X11InputMethodData *pX11IMData = NULL;
     char * ret = NULL;
-#if defined(__linux__) && defined(_LP64) && !defined(_LITTLE_ENDIAN)
-    // XIMPreeditState value which is used for XGetICValues must be 32bit on BigEndian XOrg's xlib
-    unsigned int state = XIMPreeditUnKnown;
-#else
     XIMPreeditState state = XIMPreeditUnKnown;
-#endif
 
     XVaNestedList   pr_atrb;
 
@@ -1695,6 +1690,11 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethodBase_isCompositionEnabledN
     ret = XGetICValues(pX11IMData->current_ic, XNPreeditAttributes, pr_atrb, NULL);
     XFree((void *)pr_atrb);
     AWT_UNLOCK();
+#if defined(__linux__) && defined(_LP64) && !defined(_LITTLE_ENDIAN)
+    // On 64bit BigEndian,
+    // XIMPreeditState value may be stored on high 32bit by XGetICValues via XIM
+    if (state > 0xffffffffUL) state = state >> 32;
+#endif
 
     if ((ret != 0)
             && ((strcmp(ret, XNPreeditAttributes) == 0)

From 3bebb1fa76da863a24645e3057e0f8d500ef2a41 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 22 May 2025 04:04:54 +0000
Subject: [PATCH 577/901] 8357504: Refactor the assignment of loader bits in
 InstanceKlassFlags

Reviewed-by: matsaave, ccheung
---
 src/hotspot/share/cds/aotArtifactFinder.cpp   |  2 +-
 src/hotspot/share/cds/aotClassLinker.cpp      |  2 +-
 .../share/cds/aotLinkedClassBulkLoader.cpp    |  6 ++---
 src/hotspot/share/cds/archiveBuilder.cpp      | 18 +++++--------
 src/hotspot/share/cds/cdsProtectionDomain.cpp |  2 +-
 src/hotspot/share/cds/classListParser.cpp     |  4 +--
 .../share/cds/dumpTimeClassInfo.inline.hpp    |  2 +-
 src/hotspot/share/cds/finalImageRecipes.cpp   |  2 +-
 src/hotspot/share/cds/heapShared.cpp          | 12 ++++-----
 .../share/cds/lambdaProxyClassDictionary.cpp  |  1 -
 src/hotspot/share/cds/metaspaceShared.cpp     |  4 +--
 .../share/classfile/classFileParser.cpp       |  1 +
 src/hotspot/share/classfile/classLoader.cpp   | 24 +++--------------
 .../share/classfile/classLoaderExt.cpp        |  7 +----
 src/hotspot/share/classfile/klassFactory.cpp  |  1 -
 .../share/classfile/systemDictionary.cpp      | 12 ++++-----
 .../classfile/systemDictionaryShared.cpp      | 26 +++++++++---------
 src/hotspot/share/classfile/vmClasses.cpp     |  2 +-
 src/hotspot/share/oops/constantPool.cpp       |  2 +-
 src/hotspot/share/oops/cpCache.cpp            |  3 +--
 src/hotspot/share/oops/instanceKlass.cpp      | 13 +--------
 src/hotspot/share/oops/instanceKlass.hpp      | 18 +++++--------
 src/hotspot/share/oops/instanceKlassFlags.cpp | 27 ++++---------------
 src/hotspot/share/oops/instanceKlassFlags.hpp | 19 +++++++------
 src/hotspot/share/oops/klass.cpp              |  4 +--
 25 files changed, 76 insertions(+), 138 deletions(-)

diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index d27e75ba0ab..732d898e808 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -240,7 +240,7 @@ void AOTArtifactFinder::add_cached_instance_class(InstanceKlass* ik) {
       add_cached_instance_class(intf);
     }
 
-    if (CDSConfig::is_dumping_final_static_archive() && ik->is_shared_unregistered_class()) {
+    if (CDSConfig::is_dumping_final_static_archive() && ik->defined_by_other_loaders()) {
       // The following are not appliable to unregistered classes
       return;
     }
diff --git a/src/hotspot/share/cds/aotClassLinker.cpp b/src/hotspot/share/cds/aotClassLinker.cpp
index 319c94f553d..47c7f6e3bf8 100644
--- a/src/hotspot/share/cds/aotClassLinker.cpp
+++ b/src/hotspot/share/cds/aotClassLinker.cpp
@@ -137,7 +137,7 @@ bool AOTClassLinker::try_add_candidate(InstanceKlass* ik) {
   }
 
   if (ik->is_hidden()) {
-    assert(ik->shared_class_loader_type() != ClassLoader::OTHER, "must have been set");
+    assert(!ik->defined_by_other_loaders(), "hidden classes are archived only for builtin loaders");
     if (!CDSConfig::is_dumping_method_handles()) {
       return false;
     }
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
index 77a93ab264b..70339a12110 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
@@ -372,7 +372,7 @@ bool AOTLinkedClassBulkLoader::is_pending_aot_linked_class(Klass* k) {
   // the four AOTLinkedClassCategory of classes that can be aot-linked.
 
   InstanceKlass* ik = InstanceKlass::cast(k);
-  if (ik->is_shared_boot_class()) {
+  if (ik->defined_by_boot_loader()) {
     if (ik->module() != nullptr && ik->in_javabase_module()) {
       // AOTLinkedClassCategory::BOOT1 -- all aot-linked classes in
       // java.base must have been loaded before a GC can ever happen.
@@ -382,11 +382,11 @@ bool AOTLinkedClassBulkLoader::is_pending_aot_linked_class(Klass* k) {
       // module system is ready.
       return !_boot2_completed;
     }
-  } else if (ik->is_shared_platform_class()) {
+  } else if (ik->defined_by_platform_loader()) {
     // AOTLinkedClassCategory::PLATFORM classes cannot be loaded until
     // the platform class loader is initialized.
     return !_platform_completed;
-  } else if (ik->is_shared_app_class()) {
+  } else if (ik->defined_by_app_loader()) {
     // AOTLinkedClassCategory::APP cannot be loaded until the app class loader
     // is initialized.
     return !_app_completed;
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 5a9ae8f55bc..1ccc7712a30 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -834,10 +834,6 @@ void ArchiveBuilder::make_klasses_shareable() {
       bool aotlinked = AOTClassLinker::is_candidate(src_ik);
       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.
-        ik->assign_class_loader_type();
-      }
       if (ik->is_hidden()) {
         ADD_COUNT(num_hidden_klasses);
         hidden = " hidden";
@@ -861,17 +857,17 @@ void ArchiveBuilder::make_klasses_shareable() {
           // Legacy CDS support for lambda proxies
           CDS_JAVA_HEAP_ONLY(assert(HeapShared::is_lambda_proxy_klass(ik), "sanity");)
         }
-      } else if (ik->is_shared_boot_class()) {
+      } else if (ik->defined_by_boot_loader()) {
         type = "boot";
         ADD_COUNT(num_boot_klasses);
-      } else if (ik->is_shared_platform_class()) {
+      } else if (ik->defined_by_platform_loader()) {
         type = "plat";
         ADD_COUNT(num_platform_klasses);
-      } else if (ik->is_shared_app_class()) {
+      } else if (ik->defined_by_app_loader()) {
         type = "app";
         ADD_COUNT(num_app_klasses);
       } else {
-        assert(ik->is_shared_unregistered_class(), "must be");
+        assert(ik->defined_by_other_loaders(), "must be");
         type = "unreg";
         ADD_COUNT(num_unregistered_klasses);
       }
@@ -883,11 +879,11 @@ void ArchiveBuilder::make_klasses_shareable() {
       if (!ik->is_linked()) {
         num_unlinked_klasses ++;
         unlinked = " unlinked";
-        if (ik->is_shared_boot_class()) {
+        if (ik->defined_by_boot_loader()) {
           boot_unlinked ++;
-        } else if (ik->is_shared_platform_class()) {
+        } else if (ik->defined_by_platform_loader()) {
           platform_unlinked ++;
-        } else if (ik->is_shared_app_class()) {
+        } else if (ik->defined_by_app_loader()) {
           app_unlinked ++;
         } else {
           unreg_unlinked ++;
diff --git a/src/hotspot/share/cds/cdsProtectionDomain.cpp b/src/hotspot/share/cds/cdsProtectionDomain.cpp
index dc3d8621db1..e743df67796 100644
--- a/src/hotspot/share/cds/cdsProtectionDomain.cpp
+++ b/src/hotspot/share/cds/cdsProtectionDomain.cpp
@@ -120,7 +120,7 @@ PackageEntry* CDSProtectionDomain::get_package_entry_from_class(InstanceKlass* i
   PackageEntry* pkg_entry = ik->package();
   if (CDSConfig::is_using_full_module_graph() && ik->is_shared() && pkg_entry != nullptr) {
     assert(MetaspaceShared::is_in_shared_metaspace(pkg_entry), "must be");
-    assert(!ik->is_shared_unregistered_class(), "unexpected archived package entry for an unregistered class");
+    assert(!ik->defined_by_other_loaders(), "unexpected archived package entry for an unregistered class");
     assert(ik->module()->is_named(), "unexpected archived package entry for a class in an unnamed module");
     return pkg_entry;
   }
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 43aa0a76d2e..9cf703c627f 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -511,7 +511,7 @@ void ClassListParser::constant_pool_resolution_warning(const char* msg, ...) {
 // S2 will be incorrectly used as the supertype of U instead of S1 due to
 // limitations in the loading mechanism of unregistered classes.
 void ClassListParser::check_supertype_obstruction(int specified_supertype_id, const InstanceKlass* specified_supertype, TRAPS) {
-  if (specified_supertype->is_shared_unregistered_class()) {
+  if (specified_supertype->defined_by_other_loaders()) {
     return; // Only registered supertypes can be obstructed
   }
   const InstanceKlass* obstructor = SystemDictionaryShared::get_unregistered_class(specified_supertype->name());
@@ -582,7 +582,7 @@ InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS
       }
   }
 
-  assert(k->is_shared_unregistered_class(), "must be");
+  assert(k->defined_by_other_loaders(), "must be");
 
   bool added = SystemDictionaryShared::add_unregistered_class(THREAD, k);
   if (!added) {
diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp b/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp
index 6f5ca6d7915..2d1f57175a0 100644
--- a/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp
+++ b/src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp
@@ -46,7 +46,7 @@ void DumpTimeSharedClassTable::iterate_all_live_classes(Function function) const
     assert(SafepointSynchronize::is_at_safepoint(), "invariant");
     assert_lock_strong(DumpTimeTable_lock);
     if (CDSConfig::is_dumping_final_static_archive() && !k->is_loaded()) {
-      assert(k->is_shared_unregistered_class(), "must be");
+      assert(k->defined_by_other_loaders(), "must be");
       function(k, info);
     } else if (k->is_loader_alive()) {
       function(k, info);
diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp
index 4605b287a16..8fc01220a6f 100644
--- a/src/hotspot/share/cds/finalImageRecipes.cpp
+++ b/src/hotspot/share/cds/finalImageRecipes.cpp
@@ -173,7 +173,7 @@ void FinalImageRecipes::load_all_classes(TRAPS) {
     Klass* k = _all_klasses->at(i);
     if (k->is_instance_klass()) {
       InstanceKlass* ik = InstanceKlass::cast(k);
-      if (ik->is_shared_unregistered_class()) {
+      if (ik->defined_by_other_loaders()) {
         SystemDictionaryShared::init_dumptime_info(ik);
         SystemDictionaryShared::add_unregistered_class(THREAD, ik);
         SystemDictionaryShared::copy_unregistered_class_size_and_crc32(ik);
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 1bc86248d42..06cbaf1dbe7 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -803,7 +803,7 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
   } else if (orig_k->is_objArray_klass()) {
     Klass* abk = ObjArrayKlass::cast(orig_k)->bottom_klass();
     if (abk->is_instance_klass()) {
-      assert(InstanceKlass::cast(abk)->is_shared_boot_class(),
+      assert(InstanceKlass::cast(abk)->defined_by_boot_loader(),
             "must be boot class");
       check_allowed_klass(InstanceKlass::cast(ObjArrayKlass::cast(orig_k)->bottom_klass()));
     }
@@ -1097,7 +1097,7 @@ void HeapShared::resolve_classes_for_subgraphs(JavaThread* current, ArchivableSt
     ArchivableStaticFieldInfo* info = &fields[i];
     TempNewSymbol klass_name = SymbolTable::new_symbol(info->klass_name);
     InstanceKlass* k = SystemDictionaryShared::find_builtin_class(klass_name);
-    assert(k != nullptr && k->is_shared_boot_class(), "sanity");
+    assert(k != nullptr && k->defined_by_boot_loader(), "sanity");
     resolve_classes_for_subgraph_of(current, k);
   }
 }
@@ -1284,7 +1284,7 @@ void HeapShared::resolve_or_init(const char* klass_name, bool do_init, TRAPS) {
   if (k == nullptr) {
     return;
   }
-  assert(k->is_shared_boot_class(), "sanity");
+  assert(k->defined_by_boot_loader(), "sanity");
   resolve_or_init(k, false, CHECK);
   if (do_init) {
     resolve_or_init(k, true, CHECK);
@@ -1644,7 +1644,7 @@ void HeapShared::archive_reachable_objects_from_static_field(InstanceKlass *k,
                                                              int field_offset,
                                                              const char* field_name) {
   assert(CDSConfig::is_dumping_heap(), "dump time only");
-  assert(k->is_shared_boot_class(), "must be boot class");
+  assert(k->defined_by_boot_loader(), "must be boot class");
 
   oop m = k->java_mirror();
 
@@ -1695,7 +1695,7 @@ class VerifySharedOopClosure: public BasicOopIterateClosure {
 
 void HeapShared::verify_subgraph_from_static_field(InstanceKlass* k, int field_offset) {
   assert(CDSConfig::is_dumping_heap(), "dump time only");
-  assert(k->is_shared_boot_class(), "must be boot class");
+  assert(k->defined_by_boot_loader(), "must be boot class");
 
   oop m = k->java_mirror();
   oop f = m->obj_field(field_offset);
@@ -1869,7 +1869,7 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
     }
 
     InstanceKlass* ik = InstanceKlass::cast(k);
-    assert(InstanceKlass::cast(ik)->is_shared_boot_class(),
+    assert(InstanceKlass::cast(ik)->defined_by_boot_loader(),
            "Only support boot classes");
 
     if (is_test_class) {
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index 3c2f410f7f1..a812af18ba7 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -170,7 +170,6 @@ void LambdaProxyClassDictionary::add_lambda_proxy_class(InstanceKlass* caller_ik
 
   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");
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 83c5f254a17..e95381a34b7 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -733,7 +733,7 @@ bool MetaspaceShared::may_be_eagerly_linked(InstanceKlass* ik) {
     // linked/verified at runtime.
     return false;
   }
-  if (CDSConfig::is_dumping_dynamic_archive() && ik->is_shared_unregistered_class()) {
+  if (CDSConfig::is_dumping_dynamic_archive() && ik->defined_by_other_loaders()) {
     // Linking of unregistered classes at this stage may cause more
     // classes to be resolved, resulting in calls to ClassLoader.loadClass()
     // that may not be expected by custom class loaders.
@@ -1046,7 +1046,7 @@ bool MetaspaceShared::try_link_class(JavaThread* current, InstanceKlass* ik) {
   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) {
+    if (ik->defined_by_other_loaders() && ik->class_loader() == nullptr) {
       // The verification decision is based on BytecodeVerificationRemote
       // for non-system classes. Since we are using the null classloader
       // to load non-system classes for customized class loaders during dumping,
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 757f0e72c8c..0f021c0ef4d 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -5015,6 +5015,7 @@ void ClassFileParser::fill_instance_klass(InstanceKlass* ik,
 
   // Set name and CLD before adding to CLD
   ik->set_class_loader_data(_loader_data);
+  ik->set_class_loader_type();
   ik->set_name(_class_name);
 
   // Add all classes to our internal class loader list here,
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index a3fa2feb792..e6c10859371 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -1195,7 +1195,6 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
     if (loader == nullptr) {
       // JFR classes
       ik->set_shared_classpath_index(0);
-      ik->set_shared_class_loader_type(ClassLoader::BOOT_LOADER);
     }
     return;
   }
@@ -1290,25 +1289,10 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
 void ClassLoader::record_hidden_class(InstanceKlass* ik) {
   assert(ik->is_hidden(), "must be");
 
-  s2 classloader_type;
-  if (HeapShared::is_lambda_form_klass(ik)) {
-    classloader_type = ClassLoader::BOOT_LOADER;
-  } else {
-    oop loader = ik->class_loader();
-
-    if (loader == nullptr) {
-      classloader_type = ClassLoader::BOOT_LOADER;
-    } else if (SystemDictionary::is_platform_class_loader(loader)) {
-      classloader_type = ClassLoader::PLATFORM_LOADER;
-    } else if (SystemDictionary::is_system_class_loader(loader)) {
-      classloader_type = ClassLoader::APP_LOADER;
-    } else {
-      // This class won't be archived, so no need to update its
-      // classloader_type/classpath_index.
-      return;
-    }
+  if (ik->defined_by_other_loaders()) {
+    // We don't archive hidden classes for non-builtin loaders.
+    return;
   }
-  ik->set_shared_class_loader_type(classloader_type);
 
   if (HeapShared::is_lambda_proxy_klass(ik)) {
     InstanceKlass* nest_host = ik->nest_host_not_null();
@@ -1317,7 +1301,7 @@ void ClassLoader::record_hidden_class(InstanceKlass* ik) {
     ik->set_shared_classpath_index(0);
   } else {
     // Generated invoker classes.
-    if (classloader_type == ClassLoader::APP_LOADER) {
+    if (ik->defined_by_app_loader()) {
       ik->set_shared_classpath_index(AOTClassLocationConfig::dumptime()->app_cp_start_index());
     } else {
       ik->set_shared_classpath_index(0);
diff --git a/src/hotspot/share/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp
index cb20ebb2512..cd57f4e5e25 100644
--- a/src/hotspot/share/classfile/classLoaderExt.cpp
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp
@@ -71,16 +71,12 @@ void ClassLoaderExt::record_result_for_builtin_loader(s2 classpath_index, Instan
   assert(CDSConfig::is_dumping_archive(), "sanity");
 
   oop loader = result->class_loader();
-  s2 classloader_type;
   if (SystemDictionary::is_system_class_loader(loader)) {
-    classloader_type = ClassLoader::APP_LOADER;
     AOTClassLocationConfig::dumptime_set_has_app_classes();
   } else if (SystemDictionary::is_platform_class_loader(loader)) {
-    classloader_type = ClassLoader::PLATFORM_LOADER;
     AOTClassLocationConfig::dumptime_set_has_platform_classes();
   } else {
     precond(loader == nullptr);
-    classloader_type = ClassLoader::BOOT_LOADER;
   }
 
   if (CDSConfig::is_dumping_preimage_static_archive() || CDSConfig::is_dumping_dynamic_archive()) {
@@ -91,10 +87,9 @@ void ClassLoaderExt::record_result_for_builtin_loader(s2 classpath_index, Instan
 
   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
-  if (CDSConfig::is_dumping_heap() && AllowArchivingWithJavaAgent && classloader_type == ClassLoader::BOOT_LOADER &&
+  if (CDSConfig::is_dumping_heap() && AllowArchivingWithJavaAgent && result->defined_by_boot_loader() &&
       classpath_index < 0 && redefined) {
     // When dumping the heap (which happens only during static dump), classes for the built-in
     // loaders are always loaded from known locations (jimage, classpath or modulepath),
diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp
index a3a4ea061f2..f2f31de4a37 100644
--- a/src/hotspot/share/classfile/klassFactory.cpp
+++ b/src/hotspot/share/classfile/klassFactory.cpp
@@ -98,7 +98,6 @@ InstanceKlass* KlassFactory::check_shared_class_file_load_hook(
 
       if (class_loader.is_null()) {
         new_ik->set_classpath_index(path_index);
-        new_ik->assign_class_loader_type();
       }
 
       return new_ik;
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 0ef4f0dcd18..b1abb2ab0fe 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -923,15 +923,15 @@ bool SystemDictionary::is_shared_class_visible(Symbol* class_name,
 
   // (1) Check if we are loading into the same loader as in dump time.
 
-  if (ik->is_shared_boot_class()) {
+  if (ik->defined_by_boot_loader()) {
     if (class_loader() != nullptr) {
       return false;
     }
-  } else if (ik->is_shared_platform_class()) {
+  } else if (ik->defined_by_platform_loader()) {
     if (class_loader() != java_platform_loader()) {
       return false;
     }
-  } else if (ik->is_shared_app_class()) {
+  } else if (ik->defined_by_app_loader()) {
     if (class_loader() != java_system_loader()) {
       return false;
     }
@@ -961,7 +961,7 @@ bool SystemDictionary::is_shared_class_visible_impl(Symbol* class_name,
                                                     PackageEntry* pkg_entry,
                                                     Handle class_loader) {
   int scp_index = ik->shared_classpath_index();
-  assert(!ik->is_shared_unregistered_class(), "this function should be called for built-in classes only");
+  assert(!ik->defined_by_other_loaders(), "this function should be called for built-in classes only");
   assert(scp_index >= 0, "must be");
   const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(scp_index);
   if (!Universe::is_module_initialized()) {
@@ -1023,7 +1023,7 @@ bool SystemDictionary::check_shared_class_super_type(InstanceKlass* klass, Insta
   // + Don't do it for unregistered classes -- they can be unloaded so
   //   super_type->class_loader_data() could be stale.
   // + Don't check if loader data is null, ie. the super_type isn't fully loaded.
-  if (!super_type->is_shared_unregistered_class() && super_type->class_loader_data() != nullptr) {
+  if (!super_type->defined_by_other_loaders() && super_type->class_loader_data() != nullptr) {
     // Check if the superclass is loaded by the current class_loader
     Symbol* name = super_type->name();
     InstanceKlass* check = find_instance_klass(THREAD, name, class_loader);
@@ -1226,7 +1226,7 @@ InstanceKlass* SystemDictionary::load_instance_class_impl(Symbol* class_name, Ha
     {
       PerfTraceTime vmtimer(ClassLoader::perf_shared_classload_time());
       InstanceKlass* ik = SystemDictionaryShared::find_builtin_class(class_name);
-      if (ik != nullptr && ik->is_shared_boot_class() && !ik->shared_loading_failed()) {
+      if (ik != nullptr && ik->defined_by_boot_loader() && !ik->shared_loading_failed()) {
         SharedClassLoadingMark slm(THREAD, ik);
         k = load_shared_class(ik, class_loader, Handle(), nullptr,  pkg_entry, CHECK_NULL);
       }
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 2ac52c4b697..bf29dcf70e5 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -103,8 +103,8 @@ InstanceKlass* SystemDictionaryShared::load_shared_class_for_builtin_loader(
   InstanceKlass* ik = find_builtin_class(class_name);
 
   if (ik != nullptr && !ik->shared_loading_failed()) {
-    if ((SystemDictionary::is_system_class_loader(class_loader()) && ik->is_shared_app_class())  ||
-        (SystemDictionary::is_platform_class_loader(class_loader()) && ik->is_shared_platform_class())) {
+    if ((SystemDictionary::is_system_class_loader(class_loader()) && ik->defined_by_app_loader())  ||
+        (SystemDictionary::is_platform_class_loader(class_loader()) && ik->defined_by_platform_loader())) {
       SharedClassLoadingMark slm(THREAD, ik);
       PackageEntry* pkg_entry = CDSProtectionDomain::get_package_entry_from_class(ik, class_loader);
       Handle protection_domain =
@@ -250,7 +250,7 @@ bool SystemDictionaryShared::is_early_klass(InstanceKlass* ik) {
 }
 
 bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
-  if (CDSConfig::is_dumping_final_static_archive() && k->is_shared_unregistered_class()
+  if (CDSConfig::is_dumping_final_static_archive() && k->defined_by_other_loaders()
       && k->is_shared()) {
     return false; // Do not exclude: unregistered classes are passed from preimage to final image.
   }
@@ -592,11 +592,11 @@ void SystemDictionaryShared::validate_before_archiving(InstanceKlass* k) {
         assert(LambdaProxyClassDictionary::is_registered_lambda_proxy_class(k), "unexpected hidden class %s", name);
       }
     }
-    guarantee(!k->is_shared_unregistered_class(),
+    guarantee(!k->defined_by_other_loaders(),
               "Class loader type must be set for BUILTIN class %s", name);
 
   } else {
-    guarantee(k->is_shared_unregistered_class(),
+    guarantee(k->defined_by_other_loaders(),
               "Class loader type must not be set for UNREGISTERED class %s", name);
   }
 }
@@ -754,7 +754,7 @@ void SystemDictionaryShared::dumptime_classes_do(MetaspaceClosure* it) {
 
   auto do_klass = [&] (InstanceKlass* k, DumpTimeClassInfo& info) {
     if (CDSConfig::is_dumping_final_static_archive() && !k->is_loaded()) {
-      assert(k->is_shared_unregistered_class(), "must be");
+      assert(k->defined_by_other_loaders(), "must be");
       info.metaspace_pointers_do(it);
     } else if (k->is_loader_alive() && !info.is_excluded()) {
       info.metaspace_pointers_do(it);
@@ -940,11 +940,11 @@ void SystemDictionaryShared::record_linking_constraint(Symbol* name, InstanceKla
 bool SystemDictionaryShared::check_linking_constraints(Thread* current, InstanceKlass* klass) {
   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()) {
+  if (klass->defined_by_boot_loader()) {
     // No class loader constraint check performed for boot classes.
     return true;
   }
-  if (klass->is_shared_platform_class() || klass->is_shared_app_class()) {
+  if (klass->defined_by_platform_loader() || klass->defined_by_app_loader()) {
     RunTimeClassInfo* info = RunTimeClassInfo::get_for(klass);
     assert(info != nullptr, "Sanity");
     if (info->num_loader_constraints() > 0) {
@@ -987,7 +987,7 @@ bool SystemDictionaryShared::check_linking_constraints(Thread* current, Instance
 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()) {
+  if (klass->defined_by_platform_loader() || klass->defined_by_app_loader()) {
     RunTimeClassInfo* rt_info = RunTimeClassInfo::get_for(klass); // from preimage
 
     if (rt_info->num_loader_constraints() > 0) {
@@ -1155,13 +1155,13 @@ const char* SystemDictionaryShared::loader_type_for_shared_class(Klass* k) {
   assert(k->is_shared(), "Must be");
   assert(k->is_instance_klass(), "Must be");
   InstanceKlass* ik = InstanceKlass::cast(k);
-  if (ik->is_shared_boot_class()) {
+  if (ik->defined_by_boot_loader()) {
     return "boot_loader";
-  } else if (ik->is_shared_platform_class()) {
+  } else if (ik->defined_by_platform_loader()) {
     return "platform_loader";
-  } else if (ik->is_shared_app_class()) {
+  } else if (ik->defined_by_app_loader()) {
     return "app_loader";
-  } else if (ik->is_shared_unregistered_class()) {
+  } else if (ik->defined_by_other_loaders()) {
     return "unregistered_loader";
   } else {
     return "unknown loader";
diff --git a/src/hotspot/share/classfile/vmClasses.cpp b/src/hotspot/share/classfile/vmClasses.cpp
index ac359d4cacb..813926e51a2 100644
--- a/src/hotspot/share/classfile/vmClasses.cpp
+++ b/src/hotspot/share/classfile/vmClasses.cpp
@@ -81,7 +81,7 @@ bool vmClasses::resolve(vmClassID id, TRAPS) {
 #if INCLUDE_CDS
   if (CDSConfig::is_using_archive() && !JvmtiExport::should_post_class_prepare()) {
     InstanceKlass* k = *klassp;
-    assert(k->is_shared_boot_class(), "must be");
+    assert(k->defined_by_boot_loader(), "must be");
 
     ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
     resolve_shared_class(k, loader_data, Handle(), CHECK_false);
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 636fbd84487..e2a7850fb77 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -446,7 +446,7 @@ void ConstantPool::remove_unshareable_info() {
   if (CDSConfig::is_dumping_final_static_archive()) {
     ConstantPool* src_cp = ArchiveBuilder::current()->get_source_addr(this);
     InstanceKlass* src_holder = src_cp->pool_holder();
-    if (src_holder->is_shared_unregistered_class()) {
+    if (src_holder->defined_by_other_loaders()) {
       // Unregistered classes are not loaded in the AOT assembly phase. The resolved reference length
       // is already saved during the training run.
       precond(!src_holder->is_loaded());
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index b7c1d445a98..a855639e74b 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -538,8 +538,7 @@ void ConstantPoolCache::remove_resolved_indy_entries_if_non_deterministic() {
 
 bool ConstantPoolCache::can_archive_resolved_method(ConstantPool* src_cp, ResolvedMethodEntry* method_entry) {
   InstanceKlass* pool_holder = constant_pool()->pool_holder();
-  if (!(pool_holder->is_shared_boot_class() || pool_holder->is_shared_platform_class() ||
-        pool_holder->is_shared_app_class())) {
+  if (pool_holder->defined_by_other_loaders()) {
     // Archiving resolved cp entries for classes from non-builtin loaders
     // is not yet supported.
     return false;
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index b6f35d889ab..124193c5a82 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2734,7 +2734,7 @@ void InstanceKlass::init_shared_package_entry() {
   _package_entry = nullptr;
 #else
   if (CDSConfig::is_dumping_full_module_graph()) {
-    if (is_shared_unregistered_class()) {
+    if (defined_by_other_loaders()) {
       _package_entry = nullptr;
     } else {
       _package_entry = PackageEntry::get_archived_entry(_package_entry);
@@ -2842,17 +2842,6 @@ bool InstanceKlass::can_be_verified_at_dumptime() const {
   return true;
 }
 
-int InstanceKlass::shared_class_loader_type() const {
-  if (is_shared_boot_class()) {
-    return ClassLoader::BOOT_LOADER;
-  } else if (is_shared_platform_class()) {
-    return ClassLoader::PLATFORM_LOADER;
-  } else if (is_shared_app_class()) {
-    return ClassLoader::APP_LOADER;
-  } else {
-    return ClassLoader::OTHER;
-  }
-}
 #endif // INCLUDE_CDS
 
 #if INCLUDE_JVMTI
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index cedc17e9baf..0c211c8c14b 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -306,12 +306,12 @@ class InstanceKlass: public Klass {
   // Sets finalization state
   static void set_finalization_enabled(bool val) { _finalization_enabled = val; }
 
-  // The three BUILTIN class loader types
-  bool is_shared_boot_class() const { return _misc_flags.is_shared_boot_class(); }
-  bool is_shared_platform_class() const { return _misc_flags.is_shared_platform_class(); }
-  bool is_shared_app_class() const {  return _misc_flags.is_shared_app_class(); }
-  // The UNREGISTERED class loader type
-  bool is_shared_unregistered_class() const { return _misc_flags.is_shared_unregistered_class(); }
+  // Quick checks for the loader that defined this class (without switching on this->class_loader())
+  bool defined_by_boot_loader() const      { return _misc_flags.defined_by_boot_loader(); }
+  bool defined_by_platform_loader() const  { return _misc_flags.defined_by_platform_loader(); }
+  bool defined_by_app_loader() const       { return _misc_flags.defined_by_app_loader(); }
+  bool defined_by_other_loaders() const    { return _misc_flags.defined_by_other_loaders(); }
+  void set_class_loader_type()             { _misc_flags.set_class_loader_type(_class_loader_data); }
 
   // Check if the class can be shared in CDS
   bool is_shareable() const;
@@ -320,12 +320,6 @@ class InstanceKlass: public Klass {
 
   void set_shared_loading_failed() { _misc_flags.set_shared_loading_failed(true); }
 
-#if INCLUDE_CDS
-  int  shared_class_loader_type() const;
-  void set_shared_class_loader_type(s2 loader_type) { _misc_flags.set_shared_class_loader_type(loader_type); }
-  void assign_class_loader_type() { _misc_flags.assign_class_loader_type(_class_loader_data); }
-#endif
-
   bool has_nonstatic_fields() const        { return _misc_flags.has_nonstatic_fields(); }
   void set_has_nonstatic_fields(bool b)    { _misc_flags.set_has_nonstatic_fields(b); }
 
diff --git a/src/hotspot/share/oops/instanceKlassFlags.cpp b/src/hotspot/share/oops/instanceKlassFlags.cpp
index 8d2adfba904..8939eb9e4ea 100644
--- a/src/hotspot/share/oops/instanceKlassFlags.cpp
+++ b/src/hotspot/share/oops/instanceKlassFlags.cpp
@@ -37,36 +37,19 @@ void InstanceKlassFlags::print_on(outputStream* st) const {
 #undef IK_FLAGS_PRINT
 }
 
-#if INCLUDE_CDS
-void InstanceKlassFlags::set_shared_class_loader_type(s2 loader_type) {
-  switch (loader_type) {
-  case ClassLoader::BOOT_LOADER:
-    _flags |= _misc_is_shared_boot_class;
-    break;
-  case ClassLoader::PLATFORM_LOADER:
-    _flags |= _misc_is_shared_platform_class;
-    break;
-  case ClassLoader::APP_LOADER:
-    _flags |= _misc_is_shared_app_class;
-    break;
-  default:
-    ShouldNotReachHere();
-    break;
-  }
-}
+void InstanceKlassFlags::set_class_loader_type(const ClassLoaderData* cld) {
+  assert((_flags & builtin_loader_type_bits()) == 0, "set only once");
 
-void InstanceKlassFlags::assign_class_loader_type(const ClassLoaderData* cld) {
   if (cld->is_boot_class_loader_data()) {
-    set_shared_class_loader_type(ClassLoader::BOOT_LOADER);
+    _flags |= _misc_defined_by_boot_loader;
   }
   else if (cld->is_platform_class_loader_data()) {
-    set_shared_class_loader_type(ClassLoader::PLATFORM_LOADER);
+    _flags |= _misc_defined_by_platform_loader;
   }
   else if (cld->is_system_class_loader_data()) {
-    set_shared_class_loader_type(ClassLoader::APP_LOADER);
+    _flags |= _misc_defined_by_app_loader;
   }
 }
-#endif // INCLUDE_CDS
 
 #ifdef ASSERT
 void InstanceKlassFlags::assert_is_safe(bool set) {
diff --git a/src/hotspot/share/oops/instanceKlassFlags.hpp b/src/hotspot/share/oops/instanceKlassFlags.hpp
index ae70f3019e7..548cb78333b 100644
--- a/src/hotspot/share/oops/instanceKlassFlags.hpp
+++ b/src/hotspot/share/oops/instanceKlassFlags.hpp
@@ -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
@@ -47,9 +47,9 @@ class InstanceKlassFlags {
     flag(has_nonstatic_concrete_methods     , 1 << 4) /* class/superclass/implemented interfaces has non-static, concrete methods */ \
     flag(declares_nonstatic_concrete_methods, 1 << 5) /* directly declares non-static, concrete methods */ \
     flag(shared_loading_failed              , 1 << 6) /* class has been loaded from shared archive */ \
-    flag(is_shared_boot_class               , 1 << 7) /* defining class loader is boot class loader */ \
-    flag(is_shared_platform_class           , 1 << 8) /* defining class loader is platform class loader */ \
-    flag(is_shared_app_class                , 1 << 9) /* defining class loader is app class loader */ \
+    flag(defined_by_boot_loader             , 1 << 7) /* defining class loader is boot class loader */ \
+    flag(defined_by_platform_loader         , 1 << 8) /* defining class loader is platform class loader */ \
+    flag(defined_by_app_loader              , 1 << 9) /* defining class loader is app class loader */ \
     flag(has_contended_annotations          , 1 << 10) /* has @Contended annotation */ \
     flag(has_localvariable_table            , 1 << 11) /* has localvariable information */ \
     flag(has_miranda_methods                , 1 << 12) /* True if this class has miranda methods in it's vtable */ \
@@ -76,8 +76,8 @@ class InstanceKlassFlags {
   };
 #undef IK_STATUS_ENUM_NAME
 
-  u2 shared_loader_type_bits() const {
-    return _misc_is_shared_boot_class|_misc_is_shared_platform_class|_misc_is_shared_app_class;
+  u2 builtin_loader_type_bits() const {
+    return _misc_defined_by_boot_loader|_misc_defined_by_platform_loader|_misc_defined_by_app_loader;
   }
 
   // These flags are write-once before the class is published and then read-only so don't require atomic updates.
@@ -100,13 +100,12 @@ class InstanceKlassFlags {
   IK_FLAGS_DO(IK_FLAGS_GET_SET)
 #undef IK_FLAGS_GET_SET
 
-  bool is_shared_unregistered_class() const {
-    return (_flags & shared_loader_type_bits()) == 0;
+  bool defined_by_other_loaders() const {
+    return (_flags & builtin_loader_type_bits()) == 0;
   }
 
-  void set_shared_class_loader_type(s2 loader_type);
+  void set_class_loader_type(const ClassLoaderData* cld);
 
-  void assign_class_loader_type(const ClassLoaderData* cld);
   void assert_is_safe(bool set) NOT_DEBUG_RETURN;
 
   // Create getters and setters for the status values.
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index a41f3540f39..54a4bf89e72 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -831,12 +831,12 @@ void Klass::remove_java_mirror() {
     if (orig_mirror == nullptr) {
       assert(CDSConfig::is_dumping_final_static_archive(), "sanity");
       if (is_instance_klass()) {
-        assert(InstanceKlass::cast(this)->is_shared_unregistered_class(), "sanity");
+        assert(InstanceKlass::cast(this)->defined_by_other_loaders(), "sanity");
       } else {
         precond(is_objArray_klass());
         Klass *k = ObjArrayKlass::cast(this)->bottom_klass();
         precond(k->is_instance_klass());
-        assert(InstanceKlass::cast(k)->is_shared_unregistered_class(), "sanity");
+        assert(InstanceKlass::cast(k)->defined_by_other_loaders(), "sanity");
       }
     } else {
       oop scratch_mirror = HeapShared::scratch_java_mirror(orig_mirror);

From 68c1d305e726f3f4d7209b857f58cc10de5c0132 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 22 May 2025 04:31:46 +0000
Subject: [PATCH 578/901] 8357287: Unify usage of ICC profile "header size"
 constants in CMM-related code

Reviewed-by: honkar, prr
---
 .../share/classes/java/awt/color/ICC_Profile.java    | 12 ++++++------
 .../classes/sun/java2d/cmm/ProfileDataVerifier.java  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
index 5574b3c01f8..a3e60217d15 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -57,6 +57,8 @@
 import sun.java2d.cmm.ProfileDataVerifier;
 import sun.java2d.cmm.ProfileDeferralInfo;
 
+import static sun.java2d.cmm.ProfileDataVerifier.HEADER_SIZE;
+
 /**
  * A representation of color profile data for device independent and device
  * dependent color spaces based on the International Color Consortium
@@ -764,8 +766,6 @@ private interface BuiltInProfile {
      */
     public static final int icXYZNumberX = 8;
 
-    private static final int HEADER_SIZE = 128;
-
     /**
      * Constructs an {@code ICC_Profile} object with a given ID.
      */
@@ -913,11 +913,11 @@ public static ICC_Profile getInstance(InputStream s) throws IOException {
 
     static byte[] getProfileDataFromStream(InputStream s) throws IOException {
         BufferedInputStream bis = new BufferedInputStream(s);
-        bis.mark(128); // 128 is the length of the ICC profile header
+        bis.mark(HEADER_SIZE);
 
-        byte[] header = bis.readNBytes(128);
-        if (header.length < 128 || header[36] != 0x61 || header[37] != 0x63 ||
-            header[38] != 0x73 || header[39] != 0x70) {
+        byte[] header = bis.readNBytes(HEADER_SIZE);
+        if (header.length < HEADER_SIZE || header[36] != 0x61 ||
+            header[37] != 0x63 || header[38] != 0x73 || header[39] != 0x70) {
             return null;   /* not a valid profile */
         }
         int profileSize = intFromBigEndian(header, 0);
diff --git a/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
index e6100bbefd4..0992bf3577c 100644
--- a/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
+++ b/src/java.desktop/share/classes/sun/java2d/cmm/ProfileDataVerifier.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
@@ -106,7 +106,7 @@ private static int readInt32(byte[] data, int off) {
      */
     private static final int MAX_TAG_COUNT = 100;
 
-    private static final int HEADER_SIZE = 128;
+    public static final int HEADER_SIZE = 128;
     private static final int TOC_OFFSET = HEADER_SIZE + 4;
     private static final int TOC_RECORD_SIZE = 12;
 

From ec6706520b87eff3d87b3b65f3caa39db2d96581 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 22 May 2025 05:56:17 +0000
Subject: [PATCH 579/901] 8357361: Exception when compiling switch expression
 with inferred type

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/TransTypes.java  |  8 +-----
 .../switchexpr/ExpressionSwitchBugsInGen.java | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
index fe4d3d62f3b..675809db7ba 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -810,9 +810,6 @@ private VarSymbol addParameter(String name, Type p, boolean genArg) {
     }
 
     public void visitSwitch(JCSwitch tree) {
-        Type selsuper = types.supertype(tree.selector.type);
-        boolean enumSwitch = selsuper != null &&
-            selsuper.tsym == syms.enumSym;
         tree.selector = translate(tree.selector, erasure(tree.selector.type));
         tree.cases = translateCases(tree.cases);
         result = tree;
@@ -848,11 +845,8 @@ public void visitPatternCaseLabel(JCPatternCaseLabel tree) {
     }
 
     public void visitSwitchExpression(JCSwitchExpression tree) {
-        Type selsuper = types.supertype(tree.selector.type);
-        boolean enumSwitch = selsuper != null &&
-            selsuper.tsym == syms.enumSym;
         tree.selector = translate(tree.selector, erasure(tree.selector.type));
-        tree.cases = translate(tree.cases, tree.type);
+        tree.cases = translate(tree.cases, erasure(tree.type));
         tree.type = erasure(tree.type);
         result = retype(tree, tree.type, pt);
     }
diff --git a/test/langtools/tools/javac/switchexpr/ExpressionSwitchBugsInGen.java b/test/langtools/tools/javac/switchexpr/ExpressionSwitchBugsInGen.java
index c0ec0511ecc..28e8518a5a0 100644
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchBugsInGen.java
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchBugsInGen.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
@@ -23,12 +23,14 @@
 
 /*
  * @test
- * @bug 8214031
+ * @bug 8214031 8357361
  * @summary Verify various corner cases with nested switch expressions.
  * @compile ExpressionSwitchBugsInGen.java
  * @run main ExpressionSwitchBugsInGen
  */
 
+import java.util.Objects;
+
 public class ExpressionSwitchBugsInGen {
     public static void main(String... args) {
         new ExpressionSwitchBugsInGen().test(0, 0, 0, false);
@@ -43,6 +45,8 @@ public static void main(String... args) {
         new ExpressionSwitchBugsInGen().testSwitchExpressionInConditional(1, 1, 1);
         new ExpressionSwitchBugsInGen().testIntBoxing(0, 10, 10);
         new ExpressionSwitchBugsInGen().testIntBoxing(1, 10, -1);
+        new ExpressionSwitchBugsInGen().testSwitchExpressionTypeErased(0);
+        new ExpressionSwitchBugsInGen().testSwitchExpressionTypeErased(1);
     }
 
     private void test(int a, int b, int c, boolean expected) {
@@ -91,4 +95,21 @@ private void testIntBoxing(int a, Integer res, int expected) {
         }
     }
 
+    //JDK-8357361:
+    private void testSwitchExpressionTypeErased(int i) {
+        interface Readable<R extends String> {
+            R getReader();
+        }
+        Readable<?> readable = () -> "";
+        var v = switch (i) {
+            case 0 -> readable.getReader();
+            default -> null;
+        };
+        var expected = i == 0 ? "" : null;
+        if (!Objects.equals(v, expected)) {
+            throw new IllegalStateException("Expected: " + expected +
+                                            ", got: " + v);
+        }
+    }
+
 }

From 061b5cc6b9939e182f3b2063ad86d042e35f0a91 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 22 May 2025 05:59:19 +0000
Subject: [PATCH 580/901] 8347050: Console.readLine() drops '\' when reading
 through JLine

Reviewed-by: naoto
---
 .../org/jline/JdkConsoleProviderImpl.java        |  5 ++++-
 .../internal/jline/JLineConsoleProviderTest.java | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index 03a9da22771..a4d1e89c399 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -273,7 +273,10 @@ private void initJLineIfNeeded() {
                 synchronized (this) {
                     jline = this.jline;
                     if (jline == null) {
-                        jline = LineReaderBuilder.builder().terminal(terminal).build();
+                        jline = LineReaderBuilder.builder()
+                                                 .option(LineReader.Option.DISABLE_EVENT_EXPANSION, true)
+                                                 .terminal(terminal)
+                                                 .build();
                         this.jline = jline;
                     }
                 }
diff --git a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
index a32f81b7a97..71590040685 100644
--- a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
+++ b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8331535 8351435
+ * @bug 8331535 8351435 8347050
  * @summary Verify the jdk.internal.le's console provider works properly.
  * @modules jdk.internal.le
  * @library /test/lib
@@ -38,6 +38,8 @@
 
 public class JLineConsoleProviderTest {
 
+    private static final String NL = System.getProperty("line.separator");
+
     public static void main(String... args) throws Throwable {
         for (Method m : JLineConsoleProviderTest.class.getDeclaredMethods()) {
             if (m.getName().startsWith("test")) {
@@ -54,6 +56,12 @@ void testCorrectOutputReadPassword() throws Exception {
         doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
     }
 
+    void testEvenExpansionDisabled() throws Exception {
+        doRunConsoleTest("readAndPrint", "a\\b\n", "'a\\b'" + NL);
+        doRunConsoleTest("readAndPrint2", "a\n!!\n", "1: 'a'" + NL +
+                                                     "2: '!!'" + NL);
+    }
+
     void doRunConsoleTest(String testName,
                           String input,
                           String expectedOut) throws Exception {
@@ -95,6 +103,12 @@ public static void main(String... args) {
                     System.console().readLine("%%s");
                 case "testCorrectOutputReadPassword" ->
                     System.console().readPassword("%%s");
+                case "readAndPrint" ->
+                    System.out.println("'" + System.console().readLine() + "'");
+                case "readAndPrint2" -> {
+                    System.out.println("1: '" +System.console().readLine() + "'");
+                    System.out.println("2: '" + System.console().readLine() + "'");
+                }
                 default -> throw new UnsupportedOperationException(args[0]);
             }
 

From 8184ce39a8a732352ee841fed09cae905d27643c Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 22 May 2025 06:09:34 +0000
Subject: [PATCH 581/901] 8357514: Disable AOT caching for runtime stubs

Reviewed-by: iveresov, iklam
---
 src/hotspot/share/code/aotCodeCache.cpp                        | 3 +++
 .../hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index f9e7d330b04..2ae5e763968 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -139,6 +139,9 @@ void AOTCodeCache::initialize() {
     return; // AOTCache must be specified to dump and use AOT code
   }
 
+  // Disable stubs caching until JDK-8357398 is fixed.
+  FLAG_SET_ERGO(AOTStubCaching, false);
+
   if (VerifyOops) {
     // Disable AOT stubs caching when VerifyOops flag is on.
     // Verify oops code generated a lot of C strings which overflow
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index 92e0808b4d1..0e70638b8d4 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -50,7 +50,8 @@
 public class AOTCodeFlags {
     public static void main(String... args) throws Exception {
         Tester t = new Tester();
-        for (int mode = 0; mode < 3; mode++) {
+        // Run only 2 modes (0 - no AOT code, 1 - AOT adapters) until JDK-8357398 is fixed
+        for (int mode = 0; mode < 2; mode++) {
             t.setTestMode(mode);
             t.run(new String[] {"AOT"});
         }

From a919f6d04e5e1e3ccb123132ad945b240345dcaf Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 22 May 2025 06:39:55 +0000
Subject: [PATCH 582/901] 8356372: JVMTI heap sampling not working properly
 with outside TLAB allocations

Co-authored-by: Stefan Johansson <sjohanss@openjdk.org>
Reviewed-by: sjohanss, sspitsyn
---
 .../share/gc/g1/g1YoungGCPreEvacuateTasks.cpp |  2 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp |  4 +-
 src/hotspot/share/gc/shared/memAllocator.cpp  | 65 +++++++-------
 .../gc/shared/threadLocalAllocBuffer.cpp      | 37 +++-----
 .../gc/shared/threadLocalAllocBuffer.hpp      |  9 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  8 +-
 .../shenandoah/shenandoahStackWatermark.cpp   |  2 +-
 .../share/gc/z/zThreadLocalAllocBuffer.cpp    |  2 +-
 src/hotspot/share/runtime/javaThread.cpp      |  4 +-
 src/hotspot/share/runtime/thread.cpp          | 19 +++++
 src/hotspot/share/runtime/thread.hpp          |  2 +
 .../share/runtime/threadHeapSampler.cpp       | 33 +++++---
 .../share/runtime/threadHeapSampler.hpp       | 84 +++++++++++++++++--
 test/hotspot/jtreg/ProblemList-zgc.txt        |  3 -
 .../HeapMonitor/MyPackage/HeapMonitor.java    |  3 +
 15 files changed, 184 insertions(+), 93 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
index 839b70d93af..7214d624def 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
@@ -59,7 +59,7 @@ class G1PreEvacuateCollectionSetBatchTask::JavaThreadRetireTLABAndFlushLogs : pu
       BarrierSet::barrier_set()->make_parsable((JavaThread*)thread);
       // Retire TLABs.
       if (UseTLAB) {
-        thread->tlab().retire(&_tlab_stats);
+        thread->retire_tlab(&_tlab_stats);
       }
       // Concatenate logs.
       G1DirtyCardQueueSet& qset = G1BarrierSet::dirty_card_queue_set();
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 07015d836ca..11fb3e2d40b 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -517,8 +517,8 @@ void CollectedHeap::ensure_parsability(bool retire_tlabs) {
   for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next();) {
     BarrierSet::barrier_set()->make_parsable(thread);
     if (UseTLAB) {
-      if (retire_tlabs) {
-        thread->tlab().retire(&stats);
+      if (retire_tlabs || ZeroTLAB) {
+        thread->retire_tlab(&stats);
       } else {
         thread->tlab().make_parsable();
       }
diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index a8ba2074cd1..741b0ffb020 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -51,7 +51,6 @@ class MemAllocator::Allocation: StackObj {
   bool                _overhead_limit_exceeded;
   bool                _allocated_outside_tlab;
   size_t              _allocated_tlab_size;
-  bool                _tlab_end_reset_for_sample;
 
   bool check_out_of_memory();
   void verify_before();
@@ -74,8 +73,7 @@ class MemAllocator::Allocation: StackObj {
       _obj_ptr(obj_ptr),
       _overhead_limit_exceeded(false),
       _allocated_outside_tlab(false),
-      _allocated_tlab_size(0),
-      _tlab_end_reset_for_sample(false)
+      _allocated_tlab_size(0)
   {
     assert(Thread::current() == allocator._thread, "do not pass MemAllocator across threads");
     verify_before();
@@ -174,33 +172,31 @@ void MemAllocator::Allocation::notify_allocation_jvmti_sampler() {
     return;
   }
 
-  if (!_allocated_outside_tlab && _allocated_tlab_size == 0 && !_tlab_end_reset_for_sample) {
-    // Sample if it's a non-TLAB allocation, or a TLAB allocation that either refills the TLAB
-    // or expands it due to taking a sampler induced slow path.
-    return;
-  }
+  ThreadHeapSampler& heap_sampler = _thread->heap_sampler();
+  ThreadLocalAllocBuffer& tlab = _thread->tlab();
 
-  // If we want to be sampling, protect the allocated object with a Handle
-  // before doing the callback. The callback is done in the destructor of
-  // the JvmtiSampledObjectAllocEventCollector.
-  size_t bytes_since_last = 0;
+  // Log sample decision
+  heap_sampler.log_sample_decision(tlab.top());
 
-  {
+  if (heap_sampler.should_sample(tlab.top())) {
+    // If we want to be sampling, protect the allocated object with a Handle
+    // before doing the callback. The callback is done in the destructor of
+    // the JvmtiSampledObjectAllocEventCollector.
     PreserveObj obj_h(_thread, _obj_ptr);
     JvmtiSampledObjectAllocEventCollector collector;
-    size_t size_in_bytes = _allocator._word_size * HeapWordSize;
-    ThreadLocalAllocBuffer& tlab = _thread->tlab();
 
-    if (!_allocated_outside_tlab) {
-      bytes_since_last = tlab.bytes_since_last_sample_point();
-    }
+    // Perform the sampling
+    heap_sampler.sample(obj_h(), tlab.top());
 
-    _thread->heap_sampler().check_for_sampling(obj_h(), size_in_bytes, bytes_since_last);
+    // Note that after this point all the TLAB can have been retired, and agent
+    // code can run and allocate, don't rely on earlier calculations involving
+    // the TLAB.
   }
 
-  if (_tlab_end_reset_for_sample || _allocated_tlab_size != 0) {
-    // Tell tlab to forget bytes_since_last if we passed it to the heap sampler.
-    _thread->tlab().set_sample_end(bytes_since_last != 0);
+  // Set a new sampling point in the TLAB if it fits in the current TLAB
+  const size_t words_until_sample = heap_sampler.bytes_until_sample(tlab.top()) / HeapWordSize;
+  if (words_until_sample <= tlab.free()) {
+    tlab.set_sampling_point(tlab.top() + words_until_sample);
   }
 }
 
@@ -249,6 +245,7 @@ HeapWord* MemAllocator::mem_allocate_outside_tlab(Allocation& allocation) const
 
   size_t size_in_bytes = _word_size * HeapWordSize;
   _thread->incr_allocated_bytes(size_in_bytes);
+  _thread->heap_sampler().inc_outside_tlab_bytes(size_in_bytes);
 
   return mem;
 }
@@ -262,12 +259,16 @@ HeapWord* MemAllocator::mem_allocate_inside_tlab_slow(Allocation& allocation) co
   ThreadLocalAllocBuffer& tlab = _thread->tlab();
 
   if (JvmtiExport::should_post_sampled_object_alloc()) {
+    // When sampling we artificially set the TLAB end to the sample point.
+    // When we hit that point it looks like the TLAB is full, but it's
+    // not necessarily the case. Set the real end and retry the allocation.
+
+    // Undo previous adjustment of end.
+    // Note that notify_allocation_jvmti_sampler will set a new sample point.
     tlab.set_back_allocation_end();
-    mem = tlab.allocate(_word_size);
 
-    // We set back the allocation sample point to try to allocate this, reset it
-    // when done.
-    allocation._tlab_end_reset_for_sample = true;
+    // Retry the TLAB allocation with the proper end
+    mem = tlab.allocate(_word_size);
 
     if (mem != nullptr) {
       return mem;
@@ -282,11 +283,16 @@ HeapWord* MemAllocator::mem_allocate_inside_tlab_slow(Allocation& allocation) co
   }
 
   // Discard tlab and allocate a new one.
+
+  // Record the amount wasted
+  tlab.record_refill_waste();
+
+  // Retire the current TLAB
+  _thread->retire_tlab();
+
   // To minimize fragmentation, the last TLAB may be smaller than the rest.
   size_t new_tlab_size = tlab.compute_size(_word_size);
 
-  tlab.retire_before_allocation();
-
   if (new_tlab_size == 0) {
     return nullptr;
   }
@@ -317,7 +323,8 @@ HeapWord* MemAllocator::mem_allocate_inside_tlab_slow(Allocation& allocation) co
     Copy::fill_to_words(mem + hdr_size, allocation._allocated_tlab_size - hdr_size, badHeapWordVal);
   }
 
-  tlab.fill(mem, mem + _word_size, allocation._allocated_tlab_size);
+  _thread->fill_tlab(mem, _word_size, allocation._allocated_tlab_size);
+
   return mem;
 }
 
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index aa0079d814d..168b4398240 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -49,7 +49,6 @@ ThreadLocalAllocBuffer::ThreadLocalAllocBuffer() :
   _desired_size(0),
   _refill_waste_limit(0),
   _allocated_before_last_gc(0),
-  _bytes_since_last_sample_point(0),
   _number_of_refills(0),
   _refill_waste(0),
   _gc_waste(0),
@@ -125,11 +124,7 @@ void ThreadLocalAllocBuffer::insert_filler() {
 void ThreadLocalAllocBuffer::make_parsable() {
   if (end() != nullptr) {
     invariants();
-    if (ZeroTLAB) {
-      retire();
-    } else {
-      insert_filler();
-    }
+    insert_filler();
   }
 }
 
@@ -140,15 +135,13 @@ void ThreadLocalAllocBuffer::retire(ThreadLocalAllocStats* stats) {
 
   if (end() != nullptr) {
     invariants();
-    thread()->incr_allocated_bytes(used_bytes());
     insert_filler();
     initialize(nullptr, nullptr, nullptr);
   }
 }
 
-void ThreadLocalAllocBuffer::retire_before_allocation() {
+void ThreadLocalAllocBuffer::record_refill_waste() {
   _refill_waste += (unsigned int)remaining();
-  retire();
 }
 
 void ThreadLocalAllocBuffer::resize() {
@@ -312,24 +305,6 @@ void ThreadLocalAllocBuffer::print_stats(const char* tag) {
             _refill_waste * HeapWordSize);
 }
 
-void ThreadLocalAllocBuffer::set_sample_end(bool reset_byte_accumulation) {
-  size_t heap_words_remaining = pointer_delta(_end, _top);
-  size_t bytes_until_sample = thread()->heap_sampler().bytes_until_sample();
-  size_t words_until_sample = bytes_until_sample / HeapWordSize;
-
-  if (reset_byte_accumulation) {
-    _bytes_since_last_sample_point = 0;
-  }
-
-  if (heap_words_remaining > words_until_sample) {
-    HeapWord* new_end = _top + words_until_sample;
-    set_end(new_end);
-    _bytes_since_last_sample_point += bytes_until_sample;
-  } else {
-    _bytes_since_last_sample_point += heap_words_remaining * HeapWordSize;
-  }
-}
-
 Thread* ThreadLocalAllocBuffer::thread() {
   return (Thread*)(((char*)this) + in_bytes(start_offset()) - in_bytes(Thread::tlab_start_offset()));
 }
@@ -338,6 +313,14 @@ void ThreadLocalAllocBuffer::set_back_allocation_end() {
   _end = _allocation_end;
 }
 
+void ThreadLocalAllocBuffer::set_sampling_point(HeapWord* sampling_point) {
+  precond(sampling_point >= _top);
+  precond(sampling_point <= _allocation_end);
+
+  // This will trigger a slow-path, which in turn might take a sample.
+  _end = sampling_point;
+}
+
 HeapWord* ThreadLocalAllocBuffer::hard_end() {
   return _allocation_end + alignment_reserve();
 }
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index 7675957ab8b..59979646395 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -56,7 +56,6 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   size_t    _desired_size;                       // desired size   (including alignment_reserve)
   size_t    _refill_waste_limit;                 // hold onto tlab if free() is larger than this
   size_t    _allocated_before_last_gc;           // total bytes allocated up until the last gc
-  size_t    _bytes_since_last_sample_point;      // bytes since last sample point.
 
   static size_t   _max_size;                          // maximum size of any TLAB
   static int      _reserve_for_allocation_prefetch;   // Reserve at the end of the TLAB
@@ -124,7 +123,6 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   size_t free() const                            { return pointer_delta(end(), top()); }
   // Don't discard tlab if remaining space is larger than this.
   size_t refill_waste_limit() const              { return _refill_waste_limit; }
-  size_t bytes_since_last_sample_point() const   { return _bytes_since_last_sample_point; }
 
   // For external inspection.
   const HeapWord* start_relaxed() const;
@@ -158,8 +156,8 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   // Retire an in-use tlab and optionally collect statistics.
   void retire(ThreadLocalAllocStats* stats = nullptr);
 
-  // Retire in-use tlab before allocation of a new tlab
-  void retire_before_allocation();
+  // Record refill waste before allocating (refilling) with a new TLAB.
+  void record_refill_waste();
 
   // Resize based on amount of allocation, etc.
   void resize();
@@ -167,8 +165,9 @@ class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   void fill(HeapWord* start, HeapWord* top, size_t new_size);
   void initialize();
 
+  // Support for TLAB sampling
   void set_back_allocation_end();
-  void set_sample_end(bool reset_byte_accumulation);
+  void set_sampling_point(HeapWord* sampling_point);
 
   static size_t refill_waste_limit_increment();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 45fb94817c5..55dfb2e8de4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1499,6 +1499,9 @@ void ShenandoahHeap::labs_make_parsable() {
   for (JavaThreadIteratorWithHandle jtiwh; JavaThread *t = jtiwh.next(); ) {
     ThreadLocalAllocBuffer& tlab = t->tlab();
     tlab.make_parsable();
+    if (ZeroTLAB) {
+      t->retire_tlab();
+    }
     cl.do_thread(t);
   }
 
@@ -1516,10 +1519,9 @@ void ShenandoahHeap::tlabs_retire(bool resize) {
   ThreadLocalAllocStats stats;
 
   for (JavaThreadIteratorWithHandle jtiwh; JavaThread *t = jtiwh.next(); ) {
-    ThreadLocalAllocBuffer& tlab = t->tlab();
-    tlab.retire(&stats);
+    t->retire_tlab(&stats);
     if (resize) {
-      tlab.resize();
+      t->tlab().resize();
     }
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
index 73449bdae54..81c584dfa37 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStackWatermark.cpp
@@ -119,7 +119,7 @@ void ShenandoahStackWatermark::retire_tlab() {
   // Retire TLAB
   if (UseTLAB) {
     _stats.reset();
-    _jt->tlab().retire(&_stats);
+    _jt->retire_tlab(&_stats);
     if (ResizeTLAB) {
       _jt->tlab().resize();
     }
diff --git a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
index f0261f51d3c..ac6b818e36c 100644
--- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp
@@ -65,7 +65,7 @@ void ZThreadLocalAllocBuffer::publish_statistics() {
 void ZThreadLocalAllocBuffer::retire(JavaThread* thread, ThreadLocalAllocStats* stats) {
   if (UseTLAB) {
     stats->reset();
-    thread->tlab().retire(stats);
+    thread->retire_tlab(stats);
     if (ResizeTLAB) {
       thread->tlab().resize();
     }
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 6f4d4185956..0d3209e2d6c 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -968,7 +968,7 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
   _stack_overflow_state.remove_stack_guard_pages();
 
   if (UseTLAB) {
-    tlab().retire();
+    retire_tlab();
   }
 
   if (JvmtiEnv::environments_might_exist()) {
@@ -1042,7 +1042,7 @@ void JavaThread::cleanup_failed_attach_current_thread(bool is_daemon) {
   _stack_overflow_state.remove_stack_guard_pages();
 
   if (UseTLAB) {
-    tlab().retire();
+    retire_tlab();
   }
 
   Threads::remove(this, is_daemon);
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 0d245dae857..ed1c8c2508f 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -154,6 +154,25 @@ void Thread::initialize_tlab() {
   }
 }
 
+void Thread::retire_tlab(ThreadLocalAllocStats* stats) {
+  // Sampling and serviceability support
+  if (tlab().end() != nullptr) {
+    incr_allocated_bytes(tlab().used_bytes());
+    heap_sampler().retire_tlab(tlab().top());
+  }
+
+  // Retire the TLAB
+  tlab().retire(stats);
+}
+
+void Thread::fill_tlab(HeapWord* start, size_t pre_reserved, size_t new_size) {
+  // Thread allocation sampling support
+  heap_sampler().set_tlab_top_at_sample_start(start);
+
+  // Fill the TLAB
+  tlab().fill(start, start + pre_reserved, new_size);
+}
+
 void Thread::initialize_thread_current() {
   assert(_thr_current == nullptr, "Thread::current already initialized");
   _thr_current = this;
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 7ab86121b89..354461b8f04 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -402,6 +402,8 @@ class Thread: public ThreadShadow {
   // Thread-Local Allocation Buffer (TLAB) support
   ThreadLocalAllocBuffer& tlab()                 { return _tlab; }
   void initialize_tlab();
+  void retire_tlab(ThreadLocalAllocStats* stats = nullptr);
+  void fill_tlab(HeapWord* start, size_t pre_reserved, size_t new_size);
 
   jlong allocated_bytes()               { return _allocated_bytes; }
   void set_allocated_bytes(jlong value) { _allocated_bytes = value; }
diff --git a/src/hotspot/share/runtime/threadHeapSampler.cpp b/src/hotspot/share/runtime/threadHeapSampler.cpp
index 04f3f8b220a..d6271a690d6 100644
--- a/src/hotspot/share/runtime/threadHeapSampler.cpp
+++ b/src/hotspot/share/runtime/threadHeapSampler.cpp
@@ -396,10 +396,10 @@ void ThreadHeapSampler::pick_next_geometric_sample() {
       (0.0 < log_val ? 0.0 : log_val) * (-log(2.0) * (get_sampling_interval())) + 1;
   assert(result > 0 && result < static_cast<double>(SIZE_MAX), "Result is not in an acceptable range.");
   size_t interval = static_cast<size_t>(result);
-  _bytes_until_sample = interval;
+  _sample_threshold = interval;
 }
 
-void ThreadHeapSampler::pick_next_sample(size_t overflowed_bytes) {
+void ThreadHeapSampler::pick_next_sample() {
 #ifndef PRODUCT
   if (!log_table_checked) {
     verify_or_generate_log_table();
@@ -408,26 +408,35 @@ void ThreadHeapSampler::pick_next_sample(size_t overflowed_bytes) {
   // Explicitly test if the sampling interval is 0, return 0 to sample every
   // allocation.
   if (get_sampling_interval() == 0) {
-    _bytes_until_sample = 0;
+    _sample_threshold = 0;
     return;
   }
 
   pick_next_geometric_sample();
 }
 
-void ThreadHeapSampler::check_for_sampling(oop obj, size_t allocation_size, size_t bytes_since_allocation) {
-  size_t total_allocated_bytes = bytes_since_allocation + allocation_size;
-
-  // If not yet time for a sample, skip it.
-  if (total_allocated_bytes < _bytes_until_sample) {
-    _bytes_until_sample -= total_allocated_bytes;
-    return;
+#ifndef PRODUCT
+void ThreadHeapSampler::log_sample_decision(HeapWord* tlab_top) {
+  LogTarget(Debug, gc, tlab) log;
+  if (log.is_enabled()) {
+    const bool should_sample = bytes_since_last_sample(tlab_top) >= _sample_threshold;
+    log_debug(gc, tlab)("Should sample: %s sample threshold: %zu total: %zu tlab: %zu current tlab: %zu outside tlab: %zu",
+                        should_sample ? "yes" : "no ",
+                        _sample_threshold,
+                        bytes_since_last_sample(tlab_top),
+                        tlab_bytes_since_last_sample(tlab_top),
+                        current_tlab_bytes_since_last_sample(tlab_top),
+                        outside_tlab_bytes_since_last_sample());
   }
+}
+#endif
 
+void ThreadHeapSampler::sample(oop obj, HeapWord* tlab_top) {
   JvmtiExport::sampled_object_alloc_event_collector(obj);
 
-  size_t overflow_bytes = total_allocated_bytes - _bytes_until_sample;
-  pick_next_sample(overflow_bytes);
+  pick_next_sample();
+
+  reset_after_sample(tlab_top);
 }
 
 int ThreadHeapSampler::get_sampling_interval() {
diff --git a/src/hotspot/share/runtime/threadHeapSampler.hpp b/src/hotspot/share/runtime/threadHeapSampler.hpp
index 6f77547fc83..29370777704 100644
--- a/src/hotspot/share/runtime/threadHeapSampler.hpp
+++ b/src/hotspot/share/runtime/threadHeapSampler.hpp
@@ -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.
  * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,35 +27,105 @@
 #define SHARE_RUNTIME_THREADHEAPSAMPLER_HPP
 
 #include "memory/allocation.hpp"
+#include "oops/oopsHierarchy.hpp"
 
 class ThreadHeapSampler {
  private:
-  size_t _bytes_until_sample;
+  // Amount of bytes to allocate before taking the next sample
+  size_t _sample_threshold;
+
+  // The TLAB top address when the last sampling happened, or
+  // TLAB start if a new TLAB is allocated
+  HeapWord* _tlab_top_at_sample_start;
+
+  // The accumulated amount of allocated bytes in a TLAB since the last sampling
+  // excluding the amount between _tlab_sample_start and top
+  size_t _accumulated_tlab_bytes_since_sample;
+
+  // The accumulated amount of allocated bytes outside TLABs since last sample point
+  size_t _accumulated_outside_tlab_bytes_since_sample;
+
   // Cheap random number generator
   static uint64_t _rnd;
 
   static volatile int _sampling_interval;
 
   void pick_next_geometric_sample();
-  void pick_next_sample(size_t overflowed_bytes = 0);
+  void pick_next_sample();
 
   static double fast_log2(const double& d);
   uint64_t next_random(uint64_t rnd);
 
+  size_t current_tlab_bytes_since_last_sample(HeapWord* tlab_top)  const {
+    // Both can be nullptr if there's not active TLAB, but otherwise
+    // they both should be non-null.
+    assert((tlab_top != nullptr) == (_tlab_top_at_sample_start != nullptr),
+           "Both should either be uninitialized or initialized "
+           "tlab_top: " PTR_FORMAT " _tlab_top_at_sample_start: " PTR_FORMAT,
+           p2i(tlab_top), p2i(_tlab_top_at_sample_start));
+
+    return pointer_delta(tlab_top, _tlab_top_at_sample_start, 1);
+  }
+
+  size_t tlab_bytes_since_last_sample(HeapWord* tlab_top) const {
+    return _accumulated_tlab_bytes_since_sample + current_tlab_bytes_since_last_sample(tlab_top);
+  }
+
+  size_t outside_tlab_bytes_since_last_sample() const {
+    return _accumulated_outside_tlab_bytes_since_sample;
+  }
+
  public:
-  ThreadHeapSampler() {
+  ThreadHeapSampler() :
+      _sample_threshold(0),
+      _tlab_top_at_sample_start(nullptr),
+      _accumulated_tlab_bytes_since_sample(0),
+      _accumulated_outside_tlab_bytes_since_sample(0) {
     _rnd = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(this));
     if (_rnd == 0) {
       _rnd = 1;
     }
 
-    // Call this after _rnd is initialized to initialize _bytes_until_sample.
+    // Call this after _rnd is initialized to initialize _sample_threshold.
     pick_next_sample();
   }
 
-  size_t bytes_until_sample()                    { return _bytes_until_sample;   }
+  size_t bytes_since_last_sample(HeapWord* tlab_top) const {
+    return tlab_bytes_since_last_sample(tlab_top) +
+           outside_tlab_bytes_since_last_sample();
+  }
+
+  size_t bytes_until_sample(HeapWord* tlab_top) const {
+    const size_t since_last_sample = bytes_since_last_sample(tlab_top);
+    return _sample_threshold - MIN2(since_last_sample, _sample_threshold);
+  }
+
+  bool should_sample(HeapWord* tlab_top) const {
+    return bytes_until_sample(tlab_top) == 0;
+  }
+
+  void set_tlab_top_at_sample_start(HeapWord* tlab_top) {
+    _tlab_top_at_sample_start = tlab_top;
+  }
+
+  void reset_after_sample(HeapWord* tlab_top) {
+    _tlab_top_at_sample_start = tlab_top;
+    _accumulated_tlab_bytes_since_sample = 0;
+    _accumulated_outside_tlab_bytes_since_sample = 0;
+  }
+
+  void retire_tlab(HeapWord* tlab_top) {
+    _accumulated_tlab_bytes_since_sample += current_tlab_bytes_since_last_sample(tlab_top);
+    _tlab_top_at_sample_start = nullptr;
+  }
+
+  void inc_outside_tlab_bytes(size_t size) {
+    _accumulated_outside_tlab_bytes_since_sample += size;
+  }
+
+  void log_sample_decision(HeapWord* tlab_top) PRODUCT_RETURN;
 
-  void check_for_sampling(oop obj, size_t size_in_bytes, size_t bytes_allocated_before);
+  void sample(oop obj, HeapWord* tlab_top);
 
   static void set_sampling_interval(int sampling_interval);
   static int get_sampling_interval();
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 2706e1a3e63..9571c717641 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -116,9 +116,6 @@ serviceability/sa/sadebugd/PmapOnDebugdTest.java              8307393   generic-
 serviceability/sa/sadebugd/RunCommandOnServerTest.java        8307393   generic-all
 serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-all
 
-serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorInterpreterObjectTest.java                8356372 generic-all
-serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java	          8356372 generic-all
-
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
 
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java                   8343233 generic-all
diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
index 0a3761f32f4..4ea84def6d9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
@@ -277,6 +277,9 @@ public static boolean statsHaveExpectedNumberSamples(int expected, int acceptedE
     if (diffPercentage >= acceptedErrorPercentage) {
       System.err.println("Unexpected high difference percentage: " + diffPercentage
           + " due to the count being " + actual + " instead of " + expected);
+    } else {
+      System.out.println("OK difference percentage: " + diffPercentage
+          + " due to the count being " + actual + " instead of " + expected);
     }
     return diffPercentage < acceptedErrorPercentage;
   }

From e348aa071d7d20300062de5830e74fc78143c662 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Thu, 22 May 2025 06:55:48 +0000
Subject: [PATCH 583/901] 8351958: Some compile commands should be made
 diagnostic

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/compiler/compilerOracle.cpp | 97 +++++++++++--------
 .../compilercontrol/commands/OptionTest.java  | 12 +--
 .../bigInteger/TestMultiplyToLen.java         |  1 +
 .../intrinsics/bigInteger/TestShift.java      |  2 +
 .../bigInteger/TestSquareToLen.java           |  1 +
 .../runtime/CommandLine/VMOptionWarning.java  | 24 ++++-
 6 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index e7ef9703191..868ae8bfa41 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -317,8 +317,10 @@ TypedMethodOptionMatcher* TypedMethodOptionMatcher::match(const methodHandle& me
 }
 
 template<typename T>
-static void register_command(TypedMethodOptionMatcher* matcher,
+static bool register_command(TypedMethodOptionMatcher* matcher,
                              CompileCommandEnum option,
+                             char* errorbuf,
+                             const int buf_size,
                              T value) {
   assert(matcher != option_list, "No circular lists please");
   if (option == CompileCommandEnum::Log && !LogCompilation) {
@@ -331,7 +333,17 @@ static void register_command(TypedMethodOptionMatcher* matcher,
     warning("Blackhole compile option is experimental and must be enabled via -XX:+UnlockExperimentalVMOptions");
     // Delete matcher as we don't keep it
     delete matcher;
-    return;
+    return true;
+  }
+
+  if (!UnlockDiagnosticVMOptions) {
+    const char* name = option2name(option);
+    JVMFlag* flag = JVMFlag::find_declared_flag(name);
+    if (flag != nullptr && flag->is_diagnostic()) {
+      jio_snprintf(errorbuf, buf_size, "VM option '%s' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions.", name);
+      delete matcher;
+      return false;
+    }
   }
 
   matcher->init(option, option_list);
@@ -346,7 +358,7 @@ static void register_command(TypedMethodOptionMatcher* matcher,
     matcher->print();
   }
 
-  return;
+  return true;
 }
 
 template<typename T>
@@ -714,7 +726,7 @@ static bool parseMemStat(const char* line, uintx& value, int& bytes_read, char*
   return false;
 }
 
-static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
+static bool scan_value(enum OptionType type, char* line, int& total_bytes_read,
         TypedMethodOptionMatcher* matcher, CompileCommandEnum option, char* errorbuf, const int buf_size) {
   int bytes_read = 0;
   const char* ccname = option2name(option);
@@ -733,11 +745,10 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
     }
     if (success) {
       total_bytes_read += bytes_read;
-      line += bytes_read;
-      register_command(matcher, option, value);
-      return;
+      return register_command(matcher, option, errorbuf, buf_size, value);
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else if (type == OptionType::Uintx) {
     uintx value;
@@ -751,21 +762,20 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
     }
     if (success) {
       total_bytes_read += bytes_read;
-      line += bytes_read;
-      register_command(matcher, option, value);
+      return register_command(matcher, option, errorbuf, buf_size, value);
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else if (type == OptionType::Ccstr) {
     ResourceMark rm;
     char* value = NEW_RESOURCE_ARRAY(char, strlen(line) + 1);
     if (sscanf(line, "%255[_a-zA-Z0-9]%n", value, &bytes_read) == 1) {
       total_bytes_read += bytes_read;
-      line += bytes_read;
-      register_command(matcher, option, (ccstr) value);
-      return;
+      return register_command(matcher, option, errorbuf, buf_size, (ccstr) value);
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else if (type == OptionType::Ccstrlist) {
     // Accumulates several strings into one. The internal type is ccstr.
@@ -790,6 +800,7 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized intrinsic detected in %s: %s", option2name(option), validator.what());
+          return false;
         }
       }
 #if !defined(PRODUCT) && defined(COMPILER2)
@@ -798,18 +809,21 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized tag name in %s: %s", option2name(option), validator.what());
+          return false;
         }
       } else if (option == CompileCommandEnum::TraceMergeStores) {
         TraceMergeStores::TagValidator validator(value, true);
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized tag name in %s: %s", option2name(option), validator.what());
+          return false;
         }
       } else if (option == CompileCommandEnum::PrintIdealPhase) {
         PhaseNameValidator validator(value);
 
         if (!validator.is_valid()) {
           jio_snprintf(errorbuf, buf_size, "Unrecognized phase name in %s: %s", option2name(option), validator.what());
+          return false;
         }
       } else if (option == CompileCommandEnum::TestOptionList) {
         // all values are ok
@@ -819,35 +833,32 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
         assert(false, "Ccstrlist type option missing validator");
       }
 
-      register_command(matcher, option, (ccstr) value);
-      return;
+      return register_command(matcher, option, errorbuf, buf_size, (ccstr) value);
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else if (type == OptionType::Bool) {
     char value[256];
     if (*line == '\0') {
       // Short version of a CompileCommand sets a boolean Option to true
       // -XXCompileCommand=<Option>,<method pattern>
-      register_command(matcher, option, true);
-      return;
+      return register_command(matcher, option, errorbuf, buf_size,true);
     }
     if (sscanf(line, "%255[a-zA-Z]%n", value, &bytes_read) == 1) {
       if (strcasecmp(value, "true") == 0) {
         total_bytes_read += bytes_read;
-        line += bytes_read;
-        register_command(matcher, option, true);
-        return;
+        return register_command(matcher, option, errorbuf, buf_size,true);
       } else if (strcasecmp(value, "false") == 0) {
         total_bytes_read += bytes_read;
-        line += bytes_read;
-        register_command(matcher, option, false);
-        return;
+        return register_command(matcher, option, errorbuf, buf_size,false);
       } else {
         jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+        return false;
       }
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else if (type == OptionType::Double) {
     char buffer[2][256];
@@ -857,21 +868,21 @@ static void scan_value(enum OptionType type, char* line, int& total_bytes_read,
       char value[512] = "";
       jio_snprintf(value, sizeof(value), "%s.%s", buffer[0], buffer[1]);
       total_bytes_read += bytes_read;
-      line += bytes_read;
-      register_command(matcher, option, atof(value));
-      return;
+      return register_command(matcher, option, errorbuf, buf_size, atof(value));
     } else {
       jio_snprintf(errorbuf, buf_size, "Value cannot be read for option '%s' of type '%s'", ccname, type_str);
+      return false;
     }
   } else {
     jio_snprintf(errorbuf, buf_size, "Type '%s' not supported ", type_str);
+    return false;
   }
 }
 
 // Scan next option and value in line, return MethodMatcher object on success, nullptr on failure.
 // On failure, error_msg contains description for the first error.
 // For future extensions: set error_msg on first error.
-static void scan_option_and_value(enum OptionType type, char* line, int& total_bytes_read,
+static bool scan_option_and_value(enum OptionType type, char* line, int& total_bytes_read,
                                 TypedMethodOptionMatcher* matcher,
                                 char* errorbuf, const int buf_size) {
   total_bytes_read = 0;
@@ -887,21 +898,21 @@ static void scan_option_and_value(enum OptionType type, char* line, int& total_b
     CompileCommandEnum option = match_option_name(option_buf, &bytes_read2, errorbuf, buf_size);
     if (option == CompileCommandEnum::Unknown) {
       assert(*errorbuf != '\0', "error must have been set");
-      return;
+      return false;
     }
     enum OptionType optiontype = option2type(option);
     if (option2type(option) != type) {
       const char* optiontype_name = optiontype2name(optiontype);
       const char* type_name = optiontype2name(type);
       jio_snprintf(errorbuf, buf_size, "Option '%s' with type '%s' doesn't match supplied type '%s'", option_buf, optiontype_name, type_name);
-      return;
+      return false;
     }
-    scan_value(type, line, total_bytes_read, matcher, option, errorbuf, buf_size);
+    return scan_value(type, line, total_bytes_read, matcher, option, errorbuf, buf_size);
   } else {
     const char* type_str = optiontype2name(type);
     jio_snprintf(errorbuf, buf_size, "Option name for type '%s' should be alphanumeric ", type_str);
+    return false;
   }
-  return;
 }
 
 void CompilerOracle::print_parse_error(char* error_msg, char* original_line) {
@@ -996,8 +1007,7 @@ bool CompilerOracle::parse_from_line(char* line) {
       enum OptionType type = parse_option_type(option_type);
       if (type != OptionType::Unknown) {
         // Type (2) option: parse option name and value.
-        scan_option_and_value(type, line, bytes_read, typed_matcher, error_buf, sizeof(error_buf));
-        if (*error_buf != '\0') {
+        if (!scan_option_and_value(type, line, bytes_read, typed_matcher, error_buf, sizeof(error_buf))) {
           print_parse_error(error_buf, original.get());
           return false;
         }
@@ -1011,7 +1021,10 @@ bool CompilerOracle::parse_from_line(char* line) {
           return false;
         }
         if (option2type(option) == OptionType::Bool) {
-          register_command(typed_matcher, option, true);
+          if (!register_command(typed_matcher, option, error_buf, sizeof(error_buf), true)) {
+            print_parse_error(error_buf, original.get());
+            return false;
+          }
         } else {
           jio_snprintf(error_buf, sizeof(error_buf), "  Missing type '%s' before option '%s'",
                        optiontype2name(option2type(option)), option2name(option));
@@ -1041,11 +1054,17 @@ bool CompilerOracle::parse_from_line(char* line) {
     if (*line == '\0') {
       if (option2type(option) == OptionType::Bool) {
         // if this is a bool option this implies true
-        register_command(matcher, option, true);
+        if (!register_command(matcher, option, error_buf, sizeof(error_buf), true)) {
+          print_parse_error(error_buf, original.get());
+          return false;
+        }
         return true;
       } else if (option == CompileCommandEnum::MemStat) {
         // MemStat default action is to collect data but to not print
-        register_command(matcher, option, (uintx)MemStatAction::collect);
+        if (!register_command(matcher, option, error_buf, sizeof(error_buf), (uintx)MemStatAction::collect)) {
+          print_parse_error(error_buf, original.get());
+          return false;
+        }
         return true;
       } else {
         jio_snprintf(error_buf, sizeof(error_buf), "  Option '%s' is not followed by a value", option2name(option));
@@ -1053,8 +1072,7 @@ bool CompilerOracle::parse_from_line(char* line) {
         return false;
       }
     }
-    scan_value(type, line, bytes_read, matcher, option, error_buf, sizeof(error_buf));
-    if (*error_buf != '\0') {
+    if (!scan_value(type, line, bytes_read, matcher, option, error_buf, sizeof(error_buf))) {
       print_parse_error(error_buf, original.get());
       return false;
     }
@@ -1161,8 +1179,9 @@ bool CompilerOracle::parse_compile_only(char* line) {
     if (method_pattern != nullptr) {
       TypedMethodOptionMatcher* matcher = TypedMethodOptionMatcher::parse_method_pattern(method_pattern, error_buf, sizeof(error_buf));
       if (matcher != nullptr) {
-        register_command(matcher, CompileCommandEnum::CompileOnly, true);
-        continue;
+        if (register_command(matcher, CompileCommandEnum::CompileOnly, error_buf, sizeof(error_buf), true)) {
+          continue;
+        }
       }
     }
     ttyLocker ttyl;
diff --git a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
index d00b0a57b36..aeeceac4ee2 100644
--- a/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
+++ b/test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java
@@ -37,13 +37,13 @@
 
 public class OptionTest {
     public static void main(String[] args) throws Exception {
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,package/class,ccstrlist,ControlIntrinsic,+_getClass", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,package/class,ccstrlist,ControlIntrinsic,+_getClass", "-version")
                     .shouldHaveExitValue(1)
                     .shouldContain("CompileCommand: An error occurred during parsing")
                     .shouldContain("Error: Did not specify any method name")
                     .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
 
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,*,ccstrlist,ControlIntrinsic,+_getClass", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,*,ccstrlist,ControlIntrinsic,+_getClass", "-version")
                     .shouldHaveExitValue(1)
                     .shouldContain("CompileCommand: An error occurred during parsing")
                     .shouldContain("Error: Did not specify any method name")
@@ -51,24 +51,24 @@ public static void main(String[] args) throws Exception {
 
         // corner case:
         // ccstrlist could be a valid method name, so it is accepted in the well-formed case.
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,*.ccstrlist,ccstrlist,ControlIntrinsic,+_getClass", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,*.ccstrlist,ccstrlist,ControlIntrinsic,+_getClass", "-version")
                     .shouldContain("CompileCommand: ControlIntrinsic *.ccstrlist const char* ControlIntrinsic")
                     .shouldHaveExitValue(0)
                     .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
 
 
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,*.*,ccstrlist,ControlIntrinsic,+_getClass", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,*.*,ccstrlist,ControlIntrinsic,+_getClass", "-version")
                     .shouldContain("CompileCommand: ControlIntrinsic *.* const char* ControlIntrinsic")
                     .shouldHaveExitValue(0)
                     .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
 
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,class,PrintIntrinsics", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,class,PrintIntrinsics", "-version")
                     .shouldHaveExitValue(0)
                     .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
 
         // corner case:
         // PrintIntrinsics could be a valid method name, so it is accepted in the well-formed case.
-        ProcessTools.executeTestJava("-XX:CompileCommand=option,class.PrintIntrinsics,PrintIntrinsics", "-version")
+        ProcessTools.executeTestJava("-XX:+UnlockDiagnosticVMOptions", "-XX:CompileCommand=option,class.PrintIntrinsics,PrintIntrinsics", "-version")
                     .shouldContain("CompileCommand: PrintIntrinsics class.PrintIntrinsics bool PrintIntrinsics = true")
                     .shouldHaveExitValue(0)
                     .shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
index 439fb9bf17a..25f0941ec68 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestMultiplyToLen.java
@@ -29,6 +29,7 @@
  *
  * @library /test/lib
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:CompileCommand=exclude,compiler.intrinsics.bigInteger.TestMultiplyToLen::main
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestMultiplyToLen::base_multiply,ccstrlist,DisableIntrinsic,_multiplyToLen
  *      -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstrlist,DisableIntrinsic,_multiplyToLen
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
index fe27cebc8f5..61edf1e583b 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestShift.java
@@ -30,6 +30,7 @@
  * @requires vm.compiler2.enabled
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:CompileCommand=exclude,compiler.intrinsics.bigInteger.TestShift::main
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestShift::base_left_shift,ccstrlist,DisableIntrinsic,_bigIntegerLeftShiftWorker
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestShift::base_right_shift,ccstrlist,DisableIntrinsic,_bigIntegerRightShiftWorker
@@ -38,6 +39,7 @@
  *      compiler.intrinsics.bigInteger.TestShift
  *
  * @run main/othervm/timeout=600
+ *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:CompileCommand=exclude,compiler.intrinsics.bigInteger.TestShift::main
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestShift::base_left_shift,ccstrlist,DisableIntrinsic,_bigIntegerLeftShiftWorker
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestShift::base_right_shift,ccstrlist,DisableIntrinsic,_bigIntegerRightShiftWorker
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
index a6c8ead2801..b3d7518a204 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bigInteger/TestSquareToLen.java
@@ -29,6 +29,7 @@
  * @library /test/lib
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
  *      -XX:CompileCommand=exclude,compiler.intrinsics.bigInteger.TestSquareToLen::main
  *      -XX:CompileCommand=option,compiler.intrinsics.bigInteger.TestSquareToLen::base_multiply,ccstrlist,DisableIntrinsic,_squareToLen
  *      -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstrlist,DisableIntrinsic,_squareToLen
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java b/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
index 90b309069ac..ccc998bb7e0 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java
@@ -26,7 +26,7 @@
  * @bug 8027314
  * @summary Warn if experimental vm option is used and -XX:+UnlockExperimentalVMOptions isn't specified.
  * @requires vm.flagless
- * @requires ! vm.opt.final.UnlockExperimentalVMOptions
+ * @requires !vm.opt.final.UnlockExperimentalVMOptions
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -37,18 +37,29 @@
  * @bug 8027314
  * @summary Warn if diagnostic vm option is used and -XX:+UnlockDiagnosticVMOptions isn't specified.
  * @requires vm.flagless
- * @requires ! vm.debug
+ * @requires !vm.debug
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @run driver VMOptionWarning Diagnostic
  */
 
+/* @test VMCompileCommandWarningDiagnostic
+ * @bug 8351958
+ * @summary Warn if compile command that is an alias for a diagnostic vm option is used and -XX:+UnlockDiagnosticVMOptions isn't specified.
+ * @requires vm.flagless
+ * @requires !vm.debug
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver VMOptionWarning DiagnosticCompileCommand
+ */
+
 /* @test VMOptionWarningDevelop
  * @bug 8027314
  * @summary Warn if develop vm option is used with product version of VM.
  * @requires vm.flagless
- * @requires ! vm.debug
+ * @requires !vm.debug
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -82,6 +93,13 @@ public static void main(String[] args) throws Exception {
                 output.shouldContain("Error: VM option 'PrintInlining' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions.");
                 break;
             }
+            case "DiagnosticCompileCommand": {
+                pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:CompileCommand=PrintAssembly,MyClass::myMethod", "-version");
+                output = new OutputAnalyzer(pb.start());
+                output.shouldNotHaveExitValue(0);
+                output.shouldContain("Error: VM option 'PrintAssembly' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions.");
+                break;
+            }
             case "Develop": {
                 pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:+VerifyStack", "-version");
                 output = new OutputAnalyzer(pb.start());

From d9b6e4b13200684b69a161e288b9883ff0d96bec Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@openjdk.org>
Date: Thu, 22 May 2025 07:25:43 +0000
Subject: [PATCH 584/901] 8352642: Set zipinfo-time=false when constructing
 zipfs FileSystem in
 com.sun.tools.javac.file.JavacFileManager$ArchiveContainer for better
 performance

Reviewed-by: liach, jpai, jlahoda, lancea
---
 .../com/sun/tools/javac/file/JavacFileManager.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index f4b94d4bb7a..28274d26542 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.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
@@ -561,8 +561,13 @@ private final class ArchiveContainer implements Container {
 
         public ArchiveContainer(Path archivePath) throws IOException, ProviderNotFoundException {
             this.archivePath = archivePath;
+            Map<String,String> env = new HashMap<>();
+            // ignores timestamps not stored in ZIP central directory, reducing I/O
+            // This key is handled by ZipFileSystem only.
+            env.put("zipinfo-time", "false");
+
             if (multiReleaseValue != null && archivePath.toString().endsWith(".jar")) {
-                Map<String,String> env = Collections.singletonMap("multi-release", multiReleaseValue);
+                env.put("multi-release", multiReleaseValue);
                 FileSystemProvider jarFSProvider = fsInfo.getJarFSProvider();
                 Assert.checkNonNull(jarFSProvider, "should have been caught before!");
                 try {
@@ -571,7 +576,9 @@ public ArchiveContainer(Path archivePath) throws IOException, ProviderNotFoundEx
                     throw new IOException("ZipException opening \"" + archivePath.getFileName() + "\": " + ze.getMessage(), ze);
                 }
             } else {
-                this.fileSystem = FileSystems.newFileSystem(archivePath, (ClassLoader)null);
+                // Less common case is possible if the file manager was not initialized in JavacTask,
+                // or if non "*.jar" files are on the classpath.
+                this.fileSystem = FileSystems.newFileSystem(archivePath, env, (ClassLoader)null);
             }
             packages = new HashMap<>();
             for (Path root : fileSystem.getRootDirectories()) {

From 85b24c3c4e93d0203a8cfcd5f029e18eebc93f47 Mon Sep 17 00:00:00 2001
From: Anton Artemov <anton.artemov@oracle.com>
Date: Thu, 22 May 2025 07:56:34 +0000
Subject: [PATCH 585/901] 8350869: os::stat doesn't follow symlinks on Windows

Reviewed-by: dholmes, mgronlun
---
 src/hotspot/os/windows/os_windows.cpp         | 103 +++++++++++++++++-
 .../runtime/LoadClass/TestSymlinkLoad.java    | 102 +++++++++++++++++
 2 files changed, 201 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/LoadClass/TestSymlinkLoad.java

diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 59c1cae7de2..b6771719427 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -4626,6 +4626,63 @@ static void set_path_prefix(char* buf, LPCWSTR* prefix, int* prefix_off, bool* n
   }
 }
 
+// This method checks if a wide path is actually a symbolic link
+static bool is_symbolic_link(const wchar_t* wide_path) {
+  WIN32_FIND_DATAW fd;
+  HANDLE f = ::FindFirstFileW(wide_path, &fd);
+  if (f != INVALID_HANDLE_VALUE) {
+    const bool result = fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && fd.dwReserved0 == IO_REPARSE_TAG_SYMLINK;
+    if (::FindClose(f) == 0) {
+      errno = ::GetLastError();
+      log_debug(os)("is_symbolic_link() failed to FindClose: GetLastError->%ld.", errno);
+    }
+    return result;
+  } else {
+    errno = ::GetLastError();
+    log_debug(os)("is_symbolic_link() failed to FindFirstFileW: GetLastError->%ld.", errno);
+    return false;
+  }
+}
+
+// This method dereferences a symbolic link
+static WCHAR* get_path_to_target(const wchar_t* wide_path) {
+  HANDLE hFile = CreateFileW(wide_path, GENERIC_READ, FILE_SHARE_READ, nullptr,
+                             OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+  if (hFile == INVALID_HANDLE_VALUE) {
+    errno = ::GetLastError();
+    log_debug(os)("get_path_to_target() failed to CreateFileW: GetLastError->%ld.", errno);
+    return nullptr;
+  }
+
+  // Returned value includes the terminating null character.
+  const size_t target_path_size = ::GetFinalPathNameByHandleW(hFile, nullptr, 0,
+                                                              FILE_NAME_NORMALIZED);
+  if (target_path_size == 0) {
+    errno = ::GetLastError();
+    log_debug(os)("get_path_to_target() failed to GetFinalPathNameByHandleW: GetLastError->%ld.", errno);
+    return nullptr;
+  }
+
+  WCHAR* path_to_target = NEW_C_HEAP_ARRAY(WCHAR, target_path_size, mtInternal);
+
+  // The returned size is the length excluding the terminating null character.
+  const size_t res = ::GetFinalPathNameByHandleW(hFile, path_to_target, static_cast<DWORD>(target_path_size),
+                                                 FILE_NAME_NORMALIZED);
+  if (res != target_path_size - 1) {
+    errno = ::GetLastError();
+    log_debug(os)("get_path_to_target() failed to GetFinalPathNameByHandleW: GetLastError->%ld.", errno);
+    return nullptr;
+  }
+
+  if (::CloseHandle(hFile) == 0) {
+    errno = ::GetLastError();
+    log_debug(os)("get_path_to_target() failed to CloseHandle: GetLastError->%ld.", errno);
+    return nullptr;
+  }
+
+  return path_to_target;
+}
+
 // Returns the given path as an absolute wide path in unc format. The returned path is null
 // on error (with err being set accordingly) and should be freed via os::free() otherwise.
 // additional_space is the size of space, in wchar_t, the function will additionally add to
@@ -4694,15 +4751,35 @@ int os::stat(const char *path, struct stat *sbuf) {
     return -1;
   }
 
+  const bool is_symlink = is_symbolic_link(wide_path);
+  WCHAR* path_to_target = nullptr;
+
+  if (is_symlink) {
+    path_to_target = get_path_to_target(wide_path);
+    if (path_to_target == nullptr) {
+      // it is a symbolic link, but we failed to resolve it,
+      // errno has been set in the call to get_path_to_target(),
+      // no need to overwrite it
+      os::free(wide_path);
+      return -1;
+    }
+  }
+
   WIN32_FILE_ATTRIBUTE_DATA file_data;;
-  BOOL bret = ::GetFileAttributesExW(wide_path, GetFileExInfoStandard, &file_data);
-  os::free(wide_path);
+  BOOL bret = ::GetFileAttributesExW(is_symlink ? path_to_target : wide_path, GetFileExInfoStandard, &file_data);
 
+  // if getting attributes failed, GetLastError should be called immediately after that
   if (!bret) {
     errno = ::GetLastError();
+    log_debug(os)("os::stat() failed to GetFileAttributesExW: GetLastError->%ld.", errno);
+    os::free(wide_path);
+    os::free(path_to_target);
     return -1;
   }
 
+  os::free(wide_path);
+  os::free(path_to_target);
+
   file_attribute_data_to_stat(sbuf, file_data);
   return 0;
 }
@@ -4887,12 +4964,30 @@ int os::open(const char *path, int oflag, int mode) {
     errno = err;
     return -1;
   }
-  int fd = ::_wopen(wide_path, oflag | O_BINARY | O_NOINHERIT, mode);
-  os::free(wide_path);
 
+  const bool is_symlink = is_symbolic_link(wide_path);
+  WCHAR* path_to_target = nullptr;
+
+  if (is_symlink) {
+    path_to_target = get_path_to_target(wide_path);
+    if (path_to_target == nullptr) {
+      // it is a symbolic link, but we failed to resolve it,
+      // errno has been set in the call to get_path_to_target(),
+      // no need to overwrite it
+      os::free(wide_path);
+      return -1;
+    }
+  }
+
+  int fd = ::_wopen(is_symlink ? path_to_target : wide_path, oflag | O_BINARY | O_NOINHERIT, mode);
+
+  // if opening files failed, GetLastError should be called immediately after that
   if (fd == -1) {
     errno = ::GetLastError();
+    log_debug(os)("os::open() failed to _wopen: GetLastError->%ld.", errno);
   }
+  os::free(wide_path);
+  os::free(path_to_target);
 
   return fd;
 }
diff --git a/test/hotspot/jtreg/runtime/LoadClass/TestSymlinkLoad.java b/test/hotspot/jtreg/runtime/LoadClass/TestSymlinkLoad.java
new file mode 100644
index 00000000000..0be00658973
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/LoadClass/TestSymlinkLoad.java
@@ -0,0 +1,102 @@
+/*
+ * 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 JVM should be able to handle loading class via symlink on windows
+ * @requires vm.flagless
+ * @library /test/lib
+ * @run testng/othervm TestSymlinkLoad
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+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 org.testng.SkipException;
+import org.testng.annotations.Test;
+
+public class TestSymlinkLoad {
+
+    @Test
+    public void testSymlinkClassLoading() throws Exception {
+        Path sourceDir = Paths.get(System.getProperty("test.src"), "test-classes");
+
+        String subPath = "compiled";
+        Path destDir = Paths.get(System.getProperty("test.classes"), subPath);
+
+        CompilerUtils.compile(sourceDir, destDir);
+
+        String bootCP = "-Xbootclasspath/a:" + destDir.toString();
+
+        String className = "Hello";
+
+        // try to load a class itself directly, i.e. not via a symlink
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+                bootCP, className);
+
+        // make sure it runs as expected
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldContain("Hello World")
+              .shouldHaveExitValue(0);
+
+        // create a symlink to the classfile in a subdir with a given name
+        Path classFile = Path.of(destDir + File.separator + className + ".class");
+        final String subdir = "remote";
+        final String pathToFolderForSymlink = destDir + File.separator + subdir + File.separator;
+        createLinkInSeparateFolder(pathToFolderForSymlink, classFile, className);
+
+        // try to load class via its symlink, which is in a different directory
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+                bootCP + File.separator + subdir, className);
+        output = new OutputAnalyzer(pb.start());
+        output.shouldContain("Hello World")
+              .shouldHaveExitValue(0);
+
+        // remove the subdir
+        FileUtils.deleteFileTreeWithRetry(Path.of(pathToFolderForSymlink));
+    }
+
+    public static void createLinkInSeparateFolder(final String pathToFolderForSymlink, final Path target, final String className) throws IOException {
+        File theDir = new File(pathToFolderForSymlink);
+        if (!theDir.exists()) {
+            theDir.mkdirs();
+        }
+        Path link = Paths.get(pathToFolderForSymlink, className + ".class");
+        if (Files.exists(link)) {
+            Files.delete(link);
+        }
+        try {
+            Files.createSymbolicLink(link, target);
+        } catch (UnsupportedOperationException uoe) {
+            throw new SkipException("Symbolic link creation not supported.", uoe);
+        } catch (IOException ioe) {
+            throw new SkipException("Probably insufficient privileges to create symbolic links (Windows)", ioe);
+        }
+    }
+}

From c0665efd4f7f43c567393570ba6872838debd77f Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Thu, 22 May 2025 08:36:47 +0000
Subject: [PATCH 586/901] 8354323: Safeguard SwitchBootstraps.typeSwitch when
 used outside the compiler

Reviewed-by: jlahoda, liach
---
 .../java/lang/runtime/SwitchBootstraps.java   | 21 +++++++++++++------
 .../com/sun/tools/javac/code/Types.java       | 16 ++++++--------
 .../lang/runtime/SwitchBootstrapsTest.java    | 18 ++++++++++++++++
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index f724d7355b0..f4d82595842 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -546,7 +546,11 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
                 Object caseLabel = caseLabels[idx];
                 cb.labelBinding(caseTargets[idx]);
                 if (caseLabel instanceof Class<?> classLabel) {
-                    if (unconditionalExactnessCheck(selectorType, classLabel)) {
+                    if (isNotValidPair(selectorType, caseLabel)){
+                        cb.goto_(next);
+                        continue;
+                    }
+                    else if (unconditionalExactnessCheck(selectorType, classLabel)) {
                         //nothing - unconditionally use this case
                     } else if (classLabel.isPrimitive()) {
                         if (!selectorType.isPrimitive() && !Wrapper.isWrapperNumericOrBooleanType(selectorType)) {
@@ -717,6 +721,11 @@ private static Consumer<CodeBuilder> generateTypeSwitchSkeleton(Class<?> selecto
         };
     }
 
+    private static boolean isNotValidPair(Class<?> selectorType, Object caseLabel) {
+        return (selectorType == boolean.class && caseLabel != boolean.class && caseLabel != Boolean.class) ||
+               (selectorType != boolean.class && selectorType.isPrimitive() && (caseLabel == boolean.class || caseLabel == Boolean.class));
+    }
+
     /*
      * Construct the method handle that represents the method int typeSwitch(Object, int, BiPredicate, List)
      */
@@ -769,11 +778,11 @@ private static boolean unconditionalExactnessCheck(Class<?> selectorType, Class<
             return true;
         }
         else if (selectorType.equals(targetType) ||
-                ((selectorType.equals(byte.class) && !targetType.equals(char.class)) ||
-                 (selectorType.equals(short.class) && (selectorWrapper.isStrictSubRangeOf(targetWrapper))) ||
-                 (selectorType.equals(char.class)  && (selectorWrapper.isStrictSubRangeOf(targetWrapper)))  ||
-                 (selectorType.equals(int.class)   && (targetType.equals(double.class) || targetType.equals(long.class))) ||
-                 (selectorType.equals(float.class) && (selectorWrapper.isStrictSubRangeOf(targetWrapper))))) return true;
+                (targetType.isPrimitive() && selectorType.isPrimitive() &&
+                    (selectorWrapper.isStrictSubRangeOf(targetWrapper) &&
+                            !((selectorType.equals(byte.class) && targetType.equals(char.class)) ||
+                              (selectorType.equals(int.class)  && targetType.equals(float.class)) ||
+                              (selectorType.equals(long.class) && (targetType.equals(double.class) || targetType.equals(float.class))))))) return true;
         return false;
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 1bc1e078c1a..417b54ca50c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -5085,16 +5085,12 @@ public boolean isUnconditionallyExact(Type source, Type target) {
      *  @param targetType       Target type
      */
     public boolean isUnconditionallyExactPrimitives(Type selectorType, Type targetType) {
-        if (isSameType(selectorType, targetType)) {
-            return true;
-        }
-
-        return (selectorType.isPrimitive() && targetType.isPrimitive()) &&
-                ((selectorType.hasTag(BYTE) && !targetType.hasTag(CHAR)) ||
-                 (selectorType.hasTag(SHORT) && (selectorType.getTag().isStrictSubRangeOf(targetType.getTag()))) ||
-                 (selectorType.hasTag(CHAR)  && (selectorType.getTag().isStrictSubRangeOf(targetType.getTag())))  ||
-                 (selectorType.hasTag(INT)   && (targetType.hasTag(DOUBLE) || targetType.hasTag(LONG))) ||
-                 (selectorType.hasTag(FLOAT) && (selectorType.getTag().isStrictSubRangeOf(targetType.getTag()))));
+        return isSameType(selectorType, targetType) ||
+                (selectorType.isPrimitive() && targetType.isPrimitive()) &&
+                ((selectorType.getTag().isStrictSubRangeOf(targetType.getTag())) &&
+                        !((selectorType.hasTag(BYTE) && targetType.hasTag(CHAR)) ||
+                          (selectorType.hasTag(INT)  && targetType.hasTag(FLOAT)) ||
+                          (selectorType.hasTag(LONG) && (targetType.hasTag(DOUBLE) || targetType.hasTag(FLOAT)))));
     }
     // </editor-fold>
 
diff --git a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
index b21c16c4ba0..a231501894f 100644
--- a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
+++ b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
@@ -74,6 +74,12 @@ private void testType(Object target, int start, int result, Object... labels) th
         assertEquals(-1, (int) indy.invoke(null, start));
     }
 
+    private void testPrimitiveType(Object target, Class<?> targetType, int start, int result, Object... labels) throws Throwable {
+        MethodType switchType = MethodType.methodType(int.class, targetType, int.class);
+        MethodHandle indy = ((CallSite) BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, labels)).dynamicInvoker();
+        assertEquals((int) indy.invoke(target, start), result);
+    }
+
     private void testEnum(Enum<?> target, int start, int result, Object... labels) throws Throwable {
         testEnum(target.getClass(), target, start, result, labels);
     }
@@ -132,6 +138,18 @@ public boolean equals(Object obj) {
         }, 0, 1, 1L);
     }
 
+    public void testPrimitiveTypes() throws Throwable {
+        testPrimitiveType((short) 1, short.class, 0, 1, String.class);
+        testPrimitiveType((byte) 1, byte.class,0, 1, String.class, byte.class);
+        testPrimitiveType(true, boolean.class,0, 1, false, boolean.class);
+        testPrimitiveType(1, int.class,0, 1, String.class);
+        testPrimitiveType(1, int.class,0, 1, true);
+        testPrimitiveType(true, boolean.class,0, 1, false);
+        testPrimitiveType((byte) 1, byte.class,0, 1, boolean.class, byte.class);
+        testPrimitiveType((byte) 1, byte.class,0, 1, Boolean.class, byte.class);
+        testPrimitiveType(true, boolean.class,0, 1, String.class, boolean.class);
+    }
+
     public void testEnums() throws Throwable {
         testEnum(E1.A, 0, 2, "B", "C", "A", E1.class);
         testEnum(E1.B, 0, 0, "B", "C", "A", E1.class);

From 26053fe78322940113629ee1bd72077f25e4be3e Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 22 May 2025 10:44:21 +0000
Subject: [PATCH 587/901] 8357406: Remove usages of jdk.tracePinnedThreads
 system property from httpclient tests

Reviewed-by: vyazici, djelinski, dfuchs, syan
---
 .../java/net/httpclient/AuthFilterCacheTest.java   |  5 ++---
 .../java/net/httpclient/ConcurrentResponses.java   |  3 +--
 .../net/httpclient/HttpClientLocalAddrTest.java    |  3 +--
 .../net/httpclient/HttpGetInCancelledFuture.java   |  8 +++-----
 test/jdk/java/net/httpclient/ManyRequests.java     | 14 +++++---------
 test/jdk/java/net/httpclient/ManyRequests2.java    |  6 +-----
 .../net/httpclient/PlainProxyConnectionTest.java   |  7 +++----
 7 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java b/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
index 5c322940ea5..e819f96d947 100644
--- a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
+++ b/test/jdk/java/net/httpclient/AuthFilterCacheTest.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
@@ -46,7 +46,7 @@
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
-/**
+/*
  * @test
  * @bug 8232853
  * @summary AuthenticationFilter.Cache::remove may throw ConcurrentModificationException
@@ -54,7 +54,6 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DigestEchoServer jdk.httpclient.test.lib.common.TestServerConfigurator
  * @run testng/othervm -Dtest.requiresHost=true
- * -Djdk.tracePinnedThreads=full
  * -Djdk.httpclient.HttpClient.log=headers
  * -Djdk.internal.httpclient.debug=false
  * AuthFilterCacheTest
diff --git a/test/jdk/java/net/httpclient/ConcurrentResponses.java b/test/jdk/java/net/httpclient/ConcurrentResponses.java
index 40ee984d09b..c68ebd0975c 100644
--- a/test/jdk/java/net/httpclient/ConcurrentResponses.java
+++ b/test/jdk/java/net/httpclient/ConcurrentResponses.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
@@ -30,7 +30,6 @@
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
  * @run testng/othervm
- *      -Djdk.tracePinnedThreads=full
  *      -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *      ConcurrentResponses
  */
diff --git a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
index a48614c3a48..e9d5fe6bffe 100644
--- a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.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
@@ -64,7 +64,6 @@
  *      -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
  *      -Djdk.internal.httpclient.debug=true
  *      -Dsun.net.httpserver.idleInterval=50000
- *      -Djdk.tracePinnedThreads=full
  *      HttpClientLocalAddrTest
  *
  */
diff --git a/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java b/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java
index 5efc50138d6..baa64356fa7 100644
--- a/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.java
+++ b/test/jdk/java/net/httpclient/HttpGetInCancelledFuture.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
@@ -61,11 +61,9 @@
  * @test
  * @bug 8316580
  * @library /test/lib
- * @run junit/othervm -Djdk.tracePinnedThreads=full
- *                   -DuseReferenceTracker=false
+ * @run junit/othervm -DuseReferenceTracker=false
  *                   HttpGetInCancelledFuture
- * @run junit/othervm -Djdk.tracePinnedThreads=full
- *                   -DuseReferenceTracker=true
+ * @run junit/othervm -DuseReferenceTracker=true
  *                   HttpGetInCancelledFuture
  * @summary This test verifies that cancelling a future that
  * does an HTTP request using the HttpClient doesn't cause
diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java
index 89f26d3a761..5d698d60ee5 100644
--- a/test/jdk/java/net/httpclient/ManyRequests.java
+++ b/test/jdk/java/net/httpclient/ManyRequests.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
@@ -32,14 +32,10 @@
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
- * @run main/othervm/timeout=40 -Djdk.tracePinnedThreads=full
- *                              -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests
- * @run main/othervm/timeout=40 -Djdk.tracePinnedThreads=full
- *                              -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true ManyRequests
- * @run main/othervm/timeout=40 -Djdk.tracePinnedThreads=full
- *                              -Djdk.httpclient.HttpClient.log=channel -Dtest.chunkSize=64 ManyRequests
- * @run main/othervm/timeout=40 -Djdk.tracePinnedThreads=full
- *                              -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequests
+ * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests
+ * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true ManyRequests
+ * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.chunkSize=64 ManyRequests
+ * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequests
  * @summary Send a large number of requests asynchronously
  */
  // * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests
diff --git a/test/jdk/java/net/httpclient/ManyRequests2.java b/test/jdk/java/net/httpclient/ManyRequests2.java
index 69ce475eca2..e6aa5ffa83f 100644
--- a/test/jdk/java/net/httpclient/ManyRequests2.java
+++ b/test/jdk/java/net/httpclient/ManyRequests2.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
@@ -34,16 +34,12 @@
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
  * @build ManyRequests ManyRequests2
  * @run main/othervm/timeout=400 -Dsun.net.httpserver.idleInterval=400 -Dtest.XFixed=true
- *                              -Djdk.tracePinnedThreads=full
  *                              -Djdk.httpclient.HttpClient.log=channel ManyRequests2
  * @run main/othervm/timeout=400 -Dsun.net.httpserver.idleInterval=400 -Dtest.XFixed=true -Dtest.insertDelay=true
- *                              -Djdk.tracePinnedThreads=full
  *                              -Djdk.httpclient.HttpClient.log=channel ManyRequests2
  * @run main/othervm/timeout=400 -Dsun.net.httpserver.idleInterval=400 -Dtest.XFixed=true -Dtest.chunkSize=64
- *                              -Djdk.tracePinnedThreads=full
  *                              -Djdk.httpclient.HttpClient.log=channel ManyRequests2
  * @run main/othervm/timeout=400 -Dsun.net.httpserver.idleInterval=400 -Djdk.internal.httpclient.debug=true
- *                              -Djdk.tracePinnedThreads=full
  *                              -Djdk.httpclient.HttpClient.log=channel
  *                              -Dtest.XFixed=true -Dtest.insertDelay=true
  *                              -Dtest.chunkSize=64 ManyRequests2
diff --git a/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java b/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java
index f8671103ec4..c2fab85f8ff 100644
--- a/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java
+++ b/test/jdk/java/net/httpclient/PlainProxyConnectionTest.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
@@ -51,7 +51,7 @@
 import java.util.stream.Collectors;
 import static java.net.Proxy.NO_PROXY;
 
-/**
+/*
  * @test
  * @bug 8230526
  * @summary Verifies that PlainProxyConnections are cached and reused properly. We do this by
@@ -60,8 +60,7 @@
  *          diagnosis of intermittent failures.
  * @library /test/lib
  *          /test/jdk/java/net/httpclient/lib
- * @run main/othervm -Djdk.tracePinnedThreads=full
- *      -Djdk.httpclient.HttpClient.log=headers,requests,trace
+ * @run main/othervm -Djdk.httpclient.HttpClient.log=headers,requests,trace
  *      -Djdk.internal.httpclient.debug=true
  *      PlainProxyConnectionTest
  */

From 1e57648abd569295f42dc19c00edfcc90c00b1d3 Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Thu, 22 May 2025 10:48:50 +0000
Subject: [PATCH 588/901] 8350457: Implement JEP 519: Compact Object Headers

Reviewed-by: mdoerr, coleenp, zgu
---
 make/conf/jib-profiles.js                            |  1 -
 src/hotspot/share/runtime/globals.hpp                |  2 +-
 .../compiler/arraycopy/TestArrayCopyNoInit.java      |  2 +-
 .../compiler/c2/TestCastX2NotProcessedIGVN.java      |  8 ++++----
 .../c2/irTests/TestVectorConditionalMove.java        |  8 ++++----
 .../irTests/TestVectorizationMismatchedAccess.java   |  8 ++++----
 .../compiler/c2/irTests/TestVectorizationNotRun.java |  8 ++++----
 .../compiler/loopopts/superword/TestAlignVector.java | 10 +++++-----
 .../TestIndependentPacksWithCyclicDependency.java    |  8 ++++----
 .../compiler/loopopts/superword/TestMulAddS2I.java   |  8 ++++----
 .../superword/TestScheduleReordersScalarMemops.java  |  8 ++++----
 .../compiler/loopopts/superword/TestSplitPacks.java  |  8 ++++----
 .../TestUnorderedReductionPartialVectorization.java  |  8 ++++----
 .../vectorization/TestFloatConversionsVector.java    |  8 ++++----
 .../vectorization/TestFloatConversionsVectorNaN.java |  8 ++++----
 .../vectorization/runner/ArrayTypeConvertTest.java   |  8 ++++----
 .../vectorization/runner/LoopCombinedOpTest.java     |  8 ++++----
 test/hotspot/jtreg/gtest/CompressedKlassGtest.java   |  6 +++---
 test/hotspot/jtreg/gtest/MetaspaceGtests.java        |  2 +-
 .../CompressedCPUSpecificClassSpaceReservation.java  |  2 +-
 .../AccessZeroNKlassHitsProtectionZone.java          |  1 -
 .../jtreg/runtime/FieldLayout/BaseOffsets.java       | 12 ++++++------
 .../jtreg/runtime/cds/TestDefaultArchiveLoading.java |  1 -
 .../jtreg/runtime/cds/appcds/TestZGCWithCDS.java     |  9 ---------
 .../jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java |  1 -
 25 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index c2ae584c417..9bedc77cc28 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -254,7 +254,6 @@ var getJibProfilesCommon = function (input, data) {
         configure_args: concat(
             "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
             "--disable-jvm-feature-shenandoahgc",
-            "--disable-cds-archive-coh",
             versionArgs(input, common))
     };
 
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index de6e3f6f621..2b07f9d47e1 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -128,7 +128,7 @@ const size_t minimumSymbolTableSize = 1024;
           "(Deprecated) Use 32-bit class pointers in 64-bit VM. "           \
           "lp64_product means flag is always constant in 32 bit VM")        \
                                                                             \
-  product(bool, UseCompactObjectHeaders, false, EXPERIMENTAL,               \
+  product(bool, UseCompactObjectHeaders, false,                             \
           "Use compact 64-bit object headers in 64-bit VM")                 \
                                                                             \
   product(int, ObjectAlignmentInBytes, 8,                                   \
diff --git a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java
index c85a0d6ac1c..2006629fb87 100644
--- a/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java
+++ b/test/hotspot/jtreg/compiler/arraycopy/TestArrayCopyNoInit.java
@@ -29,7 +29,7 @@
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
  *                   compiler.arraycopy.TestArrayCopyNoInit
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -XX:-UseTLAB
+ *                   -XX:+UseCompactObjectHeaders -XX:-UseTLAB
  *                   compiler.arraycopy.TestArrayCopyNoInit
  */
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java b/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
index dab2585c500..0d587f54b09 100644
--- a/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
+++ b/test/hotspot/jtreg/compiler/c2/TestCastX2NotProcessedIGVN.java
@@ -45,16 +45,16 @@ public class TestCastX2NotProcessedIGVN {
     public static void main(String[] args) {
         // Cross-product: +-AlignVector and +-UseCompactObjectHeaders
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
     }
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorConditionalMove.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorConditionalMove.java
index c8b3e5a3aa6..ade409d01e5 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorConditionalMove.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorConditionalMove.java
@@ -45,13 +45,13 @@ public class TestVectorConditionalMove {
     public static void main(String[] args) {
         // Cross-product: +-AlignVector and +-UseCompactObjectHeaders
         TestFramework.runWithFlags("-XX:+UseCMoveUnconditionally", "-XX:+UseVectorCmov",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector");
+                                   "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector");
         TestFramework.runWithFlags("-XX:+UseCMoveUnconditionally", "-XX:+UseVectorCmov",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector");
+                                   "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector");
         TestFramework.runWithFlags("-XX:+UseCMoveUnconditionally", "-XX:+UseVectorCmov",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector");
+                                   "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector");
         TestFramework.runWithFlags("-XX:+UseCMoveUnconditionally", "-XX:+UseVectorCmov",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector");
+                                   "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector");
     }
 
     // Compare 2 values, and pick one of them
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
index 2a48e76ee67..20e6d631ffd 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
@@ -52,16 +52,16 @@ public class TestVectorizationMismatchedAccess {
     public static void main(String[] args) {
         // Cross-product: +-AlignVector and +-UseCompactObjectHeaders
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
     }
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
index a69fdf76bb2..8d477b89e11 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
@@ -43,16 +43,16 @@ public class TestVectorizationNotRun {
     public static void main(String[] args) {
         // Cross-product: +-AlignVector and +-UseCompactObjectHeaders
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                                   "-XX:-UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:-AlignVector");
         TestFramework.runWithFlags("--add-modules", "java.base", "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
-                                   "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders",
+                                   "-XX:+UseCompactObjectHeaders",
                                    "-XX:+AlignVector");
     }
 
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
index 3b0489328d1..97a3c4ed037 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
@@ -114,11 +114,11 @@ public static void main(String[] args) {
                            "-XX:+IgnoreUnrecognizedVMOptions", "-XX:LoopUnrollLimit=250");
 
         switch (args[0]) {
-            case "NoAlignVector"         -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "AlignVector"           -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "VerifyAlignVector"     -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyAlignVector"); }
-            case "NoAlignVector-COH"     -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "VerifyAlignVector-COH" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyAlignVector"); }
+            case "NoAlignVector"         -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "AlignVector"           -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "VerifyAlignVector"     -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyAlignVector"); }
+            case "NoAlignVector-COH"     -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "VerifyAlignVector-COH" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyAlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         }
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
index f0d85c70b04..d49eab4f62a 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
@@ -82,10 +82,10 @@ public static void main(String args[]) {
                            "-XX:CompileCommand=compileonly,compiler.loopopts.superword.TestIndependentPacksWithCyclicDependency::init",
                            "-XX:+IgnoreUnrecognizedVMOptions", "-XX:LoopUnrollLimit=1000");
         switch (args[0]) {
-            case "nCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "nCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "yCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "yCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "nCOH_nAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "nCOH_yAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "yCOH_nAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "yCOH_yAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
index 5c7ff6c524d..e178d831938 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
@@ -77,10 +77,10 @@ public class TestMulAddS2I {
 
 
     public static void main(String[] args) {
-        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-AlignVector", "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaers");
-        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AlignVector", "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaers");
-        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-AlignVector", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaers");
-        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AlignVector", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaers");
+        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-AlignVector", "-XX:-UseCompactObjectHeaers");
+        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AlignVector", "-XX:-UseCompactObjectHeaers");
+        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-AlignVector", "-XX:+UseCompactObjectHeaers");
+        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AlignVector", "-XX:+UseCompactObjectHeaers");
     }
 
     @Run(test = {"testa", "testb", "testc", "testd", "teste", "testf", "testg", "testh",
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
index 338e0dea59d..a837136218d 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestScheduleReordersScalarMemops.java
@@ -61,10 +61,10 @@ public static void main(String args[]) {
                            "-XX:-TieredCompilation", "-Xbatch",
                            "-XX:+IgnoreUnrecognizedVMOptions", "-XX:LoopUnrollLimit=1000");
         switch (args[0]) {
-            case "nCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "nCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "yCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "yCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "nCOH_nAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "nCOH_yAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "yCOH_nAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "yCOH_yAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
index 7281ed945da..80a877bfce5 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
@@ -76,10 +76,10 @@ public static void main(String[] args) {
         TestFramework framework = new TestFramework(TestSplitPacks.class);
         framework.addFlags("-XX:+IgnoreUnrecognizedVMOptions", "-XX:LoopUnrollLimit=1000");
         switch (args[0]) {
-            case "nCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "nCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "yCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "yCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "nCOH_nAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "nCOH_yAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "yCOH_nAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "yCOH_yAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
index 07ea005c27b..0a0f0c3114e 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
@@ -39,10 +39,10 @@ public class TestUnorderedReductionPartialVectorization {
     static final int ITER  = 10;
 
     public static void main(String[] args) {
-        TestFramework.runWithFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector");
-        TestFramework.runWithFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector");
-        TestFramework.runWithFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector");
-        TestFramework.runWithFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector");
+        TestFramework.runWithFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector");
+        TestFramework.runWithFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector");
+        TestFramework.runWithFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector");
+        TestFramework.runWithFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector");
     }
 
     @Run(test = {"test1"})
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVector.java b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVector.java
index 3eb3f3eebe9..f777206bab5 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVector.java
@@ -50,10 +50,10 @@ public static void main(String args[]) {
         TestFramework framework = new TestFramework(TestFloatConversionsVector.class);
         framework.addFlags("-XX:-TieredCompilation", "-XX:CompileThresholdScaling=0.3");
         switch (args[0]) {
-            case "nCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "nCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "yCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "yCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "nCOH_nAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "nCOH_yAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "yCOH_nAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "yCOH_yAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
index a4acd9b5ebd..6f76defa279 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVectorNaN.java
@@ -53,10 +53,10 @@ public static void main(String args[]) {
         TestFramework framework = new TestFramework(TestFloatConversionsVectorNaN.class);
         framework.addFlags("-XX:-TieredCompilation", "-XX:CompileThresholdScaling=0.3");
         switch (args[0]) {
-            case "nCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "nCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
-            case "yCOH_nAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
-            case "yCOH_yAV" -> { framework.addFlags("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "nCOH_nAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "nCOH_yAV" -> { framework.addFlags("-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"); }
+            case "yCOH_nAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"); }
+            case "yCOH_yAV" -> { framework.addFlags("-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
index 0deec2627d8..11b07d57dd9 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
@@ -69,10 +69,10 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     @Override
     protected String[] testVMFlags(String[] args) {
         return switch (args[0]) {
-            case "nCOH_nAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"};
-            case "nCOH_yAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"};
-            case "yCOH_nAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"};
-            case "yCOH_yAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"};
+            case "nCOH_nAV" -> new String[]{"-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"};
+            case "nCOH_yAV" -> new String[]{"-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"};
+            case "yCOH_nAV" -> new String[]{"-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"};
+            case "yCOH_yAV" -> new String[]{"-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"};
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
     }
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
index 872a2e4d7e7..32b660d7de7 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
@@ -67,10 +67,10 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     @Override
     protected String[] testVMFlags(String[] args) {
         return switch (args[0]) {
-            case "nCOH_nAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"};
-            case "nCOH_yAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"};
-            case "yCOH_nAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"};
-            case "yCOH_yAV" -> new String[]{"-XX:+UnlockExperimentalVMOptions", "-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"};
+            case "nCOH_nAV" -> new String[]{"-XX:-UseCompactObjectHeaders", "-XX:-AlignVector"};
+            case "nCOH_yAV" -> new String[]{"-XX:-UseCompactObjectHeaders", "-XX:+AlignVector"};
+            case "yCOH_nAV" -> new String[]{"-XX:+UseCompactObjectHeaders", "-XX:-AlignVector"};
+            case "yCOH_yAV" -> new String[]{"-XX:+UseCompactObjectHeaders", "-XX:+AlignVector"};
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         };
     }
diff --git a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
index fce30285312..8ad200842d4 100644
--- a/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
+++ b/test/hotspot/jtreg/gtest/CompressedKlassGtest.java
@@ -35,7 +35,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:-UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:-UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
  */
 
 /* @test id=ccp_off
@@ -49,12 +49,12 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=128m
  */
 
 /* @test id=use-zero-based-encoding-coh-large-class-space
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=4g
+ * @run main/native GTestWrapper --gtest_filter=CompressedKlass* -XX:+UseCompactObjectHeaders -Xlog:metaspace* -Xmx6g -Xms128m -Xshare:off -XX:CompressedClassSpaceSize=4g
  */
diff --git a/test/hotspot/jtreg/gtest/MetaspaceGtests.java b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
index fac88588e31..1379fa05a1c 100644
--- a/test/hotspot/jtreg/gtest/MetaspaceGtests.java
+++ b/test/hotspot/jtreg/gtest/MetaspaceGtests.java
@@ -58,5 +58,5 @@
  * @requires vm.bits == 64
  * @requires vm.flagless
  * @requires vm.debug
- * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders
+ * @run main/native GTestWrapper --gtest_filter=metaspace* -XX:+UseCompactObjectHeaders
  */
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
index 48fc6699fa2..edb5ab9af06 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
@@ -56,7 +56,7 @@ private static void do_test(boolean CDS) throws IOException {
                 "-Xshare:" + (CDS ? "on" : "off"),
                 "-Xmx128m",
                 "-XX:CompressedClassSpaceSize=128m",
-                "-XX:+UnlockExperimentalVMOptions", "-XX:-UseCompactObjectHeaders",
+                "-XX:-UseCompactObjectHeaders",
                 "-Xlog:metaspace*", "-Xlog:metaspace+map=trace", "-Xlog:os+map=trace",
                 "-XX:+SimulateFullAddressSpace", // So that no resevation attempt will succeed
                 "-version");
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
index fde81148a02..0e36fdce7d8 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
@@ -99,7 +99,6 @@ private static OutputAnalyzer run_test(boolean COH, boolean CDS, String forceBas
         args.add("-Xlog:metaspace*");
         args.add("-Xlog:cds");
         if (COH) {
-            args.add("-XX:+UnlockExperimentalVMOptions");
             args.add("-XX:+UseCompactObjectHeaders");
         }
         if (CDS) {
diff --git a/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java b/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java
index b2a6a22fb17..73f5a1c6137 100644
--- a/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java
+++ b/test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java
@@ -29,7 +29,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=no-coops-with-ccp
@@ -39,7 +39,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCompressedOops -XX:+UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=with-coops-no-ccp
@@ -49,7 +49,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=no-coops-no-ccp
@@ -59,7 +59,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:-UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=with-coop--with-coh
@@ -69,7 +69,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=no-coops-with-coh
@@ -79,7 +79,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:-UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCompressedOops -XX:+UseCompactObjectHeaders BaseOffsets
  */
 /*
  * @test id=32bit
diff --git a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
index 192f7ca42a8..ddc3603b16d 100644
--- a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
+++ b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
@@ -132,7 +132,6 @@ public static void main(String[] args) throws Exception {
         }
 
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-                "-XX:+UnlockExperimentalVMOptions",
                 "-XX:" + coh + "UseCompactObjectHeaders",
                 "-XX:" + coops + "UseCompressedOops",
                 "-Xlog:cds",
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
index e2e0f1bdf77..83840422b58 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
@@ -49,7 +49,6 @@ public static void main(String... args) throws Exception {
                                   .dump(helloJar,
                                         new String[] {"Hello"},
                                         "-XX:+UseZGC",
-                                        "-XX:+UnlockExperimentalVMOptions",
                                         compactHeaders,
                                         "-Xlog:cds");
          out.shouldContain("Dumping shared data to file:");
@@ -59,7 +58,6 @@ public static void main(String... args) throws Exception {
          out = TestCommon
                    .exec(helloJar,
                          "-XX:+UseZGC",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -72,7 +70,6 @@ public static void main(String... args) throws Exception {
                          "-XX:-UseZGC",
                          "-XX:+UseCompressedOops",           // in case turned off by vmoptions
                          "-XX:+UseCompressedClassPointers",  // by jtreg
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -86,7 +83,6 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:-UseCompressedClassPointers",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -100,7 +96,6 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -113,7 +108,6 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:+UseCompressedOops",
                          "-XX:-UseCompressedClassPointers",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -127,7 +121,6 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:+UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
@@ -142,7 +135,6 @@ public static void main(String... args) throws Exception {
                          "-XX:+UseSerialGC",
                          "-XX:-UseCompressedOops",
                          "-XX:+UseCompressedClassPointers",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds");
          out.shouldContain("Dumping shared data to file:");
@@ -152,7 +144,6 @@ public static void main(String... args) throws Exception {
          out = TestCommon
                    .exec(helloJar,
                          "-XX:+UseZGC",
-                         "-XX:+UnlockExperimentalVMOptions",
                          compactHeaders,
                          "-Xlog:cds",
                          "Hello");
diff --git a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
index 2004b3599c4..56bb705a0b2 100644
--- a/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
+++ b/test/hotspot/jtreg/runtime/vthread/JNIMonitor/JNIMonitor.java
@@ -122,7 +122,6 @@ public static void main(String[] args) throws Exception {
             // We only count monitors in LM_LEGACY mode
             "-XX:LockingMode=1",
             // Disable compact headers since that switches locking mode to LM_LIGHTWEIGHT
-            "-XX:+UnlockExperimentalVMOptions",
             "-XX:-UseCompactObjectHeaders",
             "JNIMonitor$" + test,
         };

From 428d33ef3ca0af34d8f164fe9d9b722e81e866a7 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Thu, 22 May 2025 12:30:26 +0000
Subject: [PATCH 589/901] 8357462: Amend
 open/test/jdk//java/foreign/TestMatrix.java test scenario to run as manual

Reviewed-by: jvernee, syan
---
 test/jdk/java/foreign/TestMatrix.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/foreign/TestMatrix.java b/test/jdk/java/foreign/TestMatrix.java
index 2767ca7bde2..4b2885da7ce 100644
--- a/test/jdk/java/foreign/TestMatrix.java
+++ b/test/jdk/java/foreign/TestMatrix.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
@@ -35,7 +35,7 @@
  * @modules java.base/jdk.internal.foreign
  * @build NativeTestHelper CallGeneratorHelper TestUpcallHighArity
  *
- * @run testng/othervm/native
+ * @run testng/othervm/native/manual
  *   --enable-native-access=ALL-UNNAMED
  *   -Djdk.internal.foreign.DowncallLinker.USE_SPEC=false
  *   -Djdk.internal.foreign.UpcallLinker.USE_SPEC=false

From 12efc1fe3322d16f0e703b334912241d80dbaba9 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 22 May 2025 14:24:59 +0000
Subject: [PATCH 590/901] 8357165: test java/lang/invoke/ClassValueTest.java
 fails intermittently

Reviewed-by: jpai
---
 test/jdk/java/lang/invoke/ClassValueTest.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/jdk/java/lang/invoke/ClassValueTest.java b/test/jdk/java/lang/invoke/ClassValueTest.java
index fa026955e25..856653b3f92 100644
--- a/test/jdk/java/lang/invoke/ClassValueTest.java
+++ b/test/jdk/java/lang/invoke/ClassValueTest.java
@@ -176,11 +176,14 @@ public void testGetMany() {
     }
 
     private static final long COMPUTE_TIME_MILLIS = 100;
-    private static final Duration TIMEOUT = Duration.of(2, ChronoUnit.SECONDS);
+    // Adjust this timeout to fail faster for test stalls
+    private static final Duration TIMEOUT = Duration.ofNanos((long) (
+            Duration.of(1, ChronoUnit.MINUTES).toNanos()
+                    * Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"))));
 
     private static void await(CountDownLatch latch) {
         try {
-            if (!latch.await(2L, TimeUnit.SECONDS)) {
+            if (!latch.await(TIMEOUT.toNanos(), TimeUnit.NANOSECONDS)) {
                 fail("No signal received");
             }
         } catch (InterruptedException e) {
@@ -209,7 +212,6 @@ private static void awaitThreads(Iterable<Thread> threads) {
      * Uses junit to do basic stress.
      */
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testRemoveStale() throws InterruptedException {
         CountDownLatch oldInputUsed = new CountDownLatch(1);
         CountDownLatch inputUpdated = new CountDownLatch(1);
@@ -241,7 +243,6 @@ protected Integer computeValue(Class<?> type) {
      * Tests that calling get() from computeValue() terminates.
      */
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testGetInCompute() {
         ClassValue<Object> cv = new ClassValue<>() {
             @Override
@@ -263,7 +264,6 @@ protected Object computeValue(Class<?> type) {
      * Tests that calling remove() from computeValue() terminates.
      */
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testRemoveInCompute() {
         ClassValue<Boolean> cv = new ClassValue<>() {
             @Override
@@ -315,7 +315,10 @@ protected int[] computeValue(Class<?> type) {
 
         WeakReference<?> ref = new WeakReference<>(cv.get(int.class));
         cv = null; // Remove reference for interpreter
-        if (!ForceGC.wait(() -> ref.refersTo(null))) {
+        if (!ForceGC.wait(() -> {
+            CV1.get(int.class); // flush the weak maps
+            return ref.refersTo(null);
+        })) {
             fail("Timeout");
         }
     }
@@ -352,7 +355,6 @@ protected int[] computeValue(Class<?> type) {
     }
 
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testRacyRemoveInCompute() {
         ClassValue<Object> cv = new ClassValue<>() {
             @Override
@@ -398,7 +400,6 @@ record One() {
     private static final ScopedValue<Integer> THREAD_ID = ScopedValue.newInstance();
 
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testNoRecomputeOnUnrelatedRemoval() throws InterruptedException {
         CountDownLatch t1Started = new CountDownLatch(1);
         CountDownLatch removeTamper = new CountDownLatch(1);
@@ -443,7 +444,6 @@ protected Object computeValue(Class<?> type) {
     }
 
     @Test
-    @Timeout(value = 4, unit = TimeUnit.SECONDS)
     void testNoObsoleteInstallation() throws InterruptedException {
         CountDownLatch slowComputationStart = new CountDownLatch(1);
         CountDownLatch slowComputationContinue = new CountDownLatch(1);

From 72e440d06e6a93141e8943f1a62610cd951e22c4 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 22 May 2025 15:17:34 +0000
Subject: [PATCH 591/901] 8357303: (fs) UnixSecureDirectoryStream.implDelete
 has unused haveFlags parameter

Reviewed-by: alanb, shade
---
 .../sun/nio/fs/UnixSecureDirectoryStream.java | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
index ce04f49a9e2..c583afb588a 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.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
@@ -158,7 +158,7 @@ public SeekableByteChannel newByteChannel(Path obj,
      * Deletes file/directory in this directory. Works in a race-free manner
      * when invoked with flags.
      */
-    private void implDelete(Path obj, boolean haveFlags, int flags)
+    private void implDelete(Path obj, int flags)
         throws IOException
     {
         UnixPath file = getName(obj);
@@ -168,20 +168,6 @@ private void implDelete(Path obj, boolean haveFlags, int flags)
             if (!ds.isOpen())
                 throw new ClosedDirectoryStreamException();
 
-            if (!haveFlags) {
-                // need file attribute to know if file is directory. This creates
-                // a race in that the file may be replaced by a directory or a
-                // directory replaced by a file between the time we query the
-                // file type and unlink it.
-                UnixFileAttributes attrs = null;
-                try {
-                    attrs = UnixFileAttributes.get(dfd, file, false);
-                } catch (UnixException x) {
-                    x.rethrowAsIOException(file);
-                }
-                flags = (attrs.isDirectory()) ? AT_REMOVEDIR : 0;
-            }
-
             try {
                 unlinkat(dfd, file.asByteArray(), flags);
             } catch (UnixException x) {
@@ -199,12 +185,12 @@ private void implDelete(Path obj, boolean haveFlags, int flags)
 
     @Override
     public void deleteFile(Path file) throws IOException {
-        implDelete(file, true, 0);
+        implDelete(file, 0);
     }
 
     @Override
     public void deleteDirectory(Path dir) throws IOException {
-        implDelete(dir, true, AT_REMOVEDIR);
+        implDelete(dir, AT_REMOVEDIR);
     }
 
     /**

From 16d45511342c32ac8e8f72fb68dc21ce13339dbe Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 22 May 2025 15:34:12 +0000
Subject: [PATCH 592/901] 8355452: GHA: Test jtreg tier1 on linux-x64
 static-jdk

Reviewed-by: ihse, shade
---
 .github/actions/get-bundles/action.yml    | 37 +++++++++++++++++++
 .github/actions/upload-bundles/action.yml | 15 ++++++--
 .github/workflows/build-linux.yml         |  4 +++
 .github/workflows/main.yml                | 21 ++++++++---
 .github/workflows/test.yml                | 44 +++++++++++++++++------
 5 files changed, 105 insertions(+), 16 deletions(-)

diff --git a/.github/actions/get-bundles/action.yml b/.github/actions/get-bundles/action.yml
index aaec9a6d19f..270d15159a0 100644
--- a/.github/actions/get-bundles/action.yml
+++ b/.github/actions/get-bundles/action.yml
@@ -32,10 +32,16 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
+  static-suffix:
+    description: 'Static bundle file name suffix'
+    required: false
 outputs:
   jdk-path:
     description: 'Path to the installed JDK bundle'
     value: ${{ steps.path-name.outputs.jdk }}
+  static-jdk-path:
+    description: 'Path to the installed static JDK bundle'
+    value: ${{ steps.path-name.outputs.static_jdk }}
   symbols-path:
     description: 'Path to the installed symbols bundle'
     value: ${{ steps.path-name.outputs.symbols }}
@@ -61,6 +67,15 @@ runs:
         path: bundles
       if: steps.download-bundles.outcome == 'failure'
 
+    - name: 'Download static bundles artifact'
+      id: download-static-bundles
+      uses: actions/download-artifact@v4
+      with:
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
+        path: bundles
+      continue-on-error: true
+      if: ${{ inputs.static-suffix == '-static' }}
+
     - name: 'Unpack bundles'
       run: |
         if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
@@ -75,6 +90,20 @@ runs:
           tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
         fi
 
+        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip ]]; then
+            echo 'Unpacking static jdk bundle...'
+            mkdir -p bundles/static-jdk
+            unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip -d bundles/static-jdk
+          fi
+
+          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz ]]; then
+            echo 'Unpacking static jdk bundle...'
+            mkdir -p bundles/static-jdk
+            tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz -C bundles/static-jdk
+          fi
+        fi
+
         if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
           echo 'Unpacking symbols bundle...'
           mkdir -p bundles/symbols
@@ -106,4 +135,12 @@ runs:
         echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
         echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
         echo "tests=$tests_dir" >> $GITHUB_OUTPUT
+
+        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+          static_jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/static-jdk -name bin -type d))"
+          if [[ '${{ runner.os }}' == 'Windows' ]]; then
+            static_jdk_dir="$(cygpath $static_jdk_dir)"
+          fi
+          echo "static_jdk=$static_jdk_dir" >> $GITHUB_OUTPUT
+        fi
       shell: bash
diff --git a/.github/actions/upload-bundles/action.yml b/.github/actions/upload-bundles/action.yml
index 30f4ac03c1e..dfa994baac0 100644
--- a/.github/actions/upload-bundles/action.yml
+++ b/.github/actions/upload-bundles/action.yml
@@ -35,6 +35,9 @@ inputs:
   bundle-suffix:
     description: 'Bundle name suffix, possibly empty'
     required: false
+  static-suffix:
+    description: 'Static JDK bundle name suffix, possibly empty'
+    required: false
 
 runs:
   using: composite
@@ -46,6 +49,8 @@ runs:
         # Rename bundles to consistent names
         jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
         jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
+        static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
+        static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
         tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
@@ -58,6 +63,12 @@ runs:
         if [[ "$jdk_bundle_tar_gz" != "" ]]; then
           mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
+        if [[ "$static_jdk_bundle_zip" != "" ]]; then
+          mv "$static_jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip"
+        fi
+        if [[ "$static_jdk_bundle_tar_gz" != "" ]]; then
+          mv "$static_jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz"
+        fi
         if [[ "$symbols_bundle" != "" ]]; then
           mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
@@ -68,7 +79,7 @@ runs:
           mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
 
-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
+        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$static_jdk_bundle_zip$static_jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
           echo 'bundles-found=true' >> $GITHUB_OUTPUT
         else
           echo 'bundles-found=false' >> $GITHUB_OUTPUT
@@ -78,7 +89,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-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 101668b2bd5..9c991eed419 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -64,6 +64,9 @@ on:
       bundle-suffix:
         required: false
         type: string
+      static-suffix:
+        required: false
+        type: string
 
 jobs:
   build-linux:
@@ -143,3 +146,4 @@ jobs:
           platform: ${{ inputs.platform }}
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
           bundle-suffix: ${{ inputs.bundle-suffix }}
+          static-suffix: ${{ inputs.static-suffix }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8dce1d214dc..6ca64bb82d0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -231,16 +231,14 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
-      make-target: 'static-jdk-image'
+      make-target: 'static-jdk-bundles'
       # 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"
+      static-suffix: "-static"
     if: needs.prepare.outputs.linux-x64 == 'true'
 
   build-linux-x64-static-libs:
@@ -361,6 +359,19 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
+      debug-suffix: -debug
+
+  test-linux-x64-static:
+    name: linux-x64-static
+    needs:
+      - build-linux-x64
+      - build-linux-x64-static
+    uses: ./.github/workflows/test.yml
+    with:
+      platform: linux-x64
+      bootjdk-platform: linux-x64
+      runs-on: ubuntu-22.04
+      static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
@@ -372,6 +383,7 @@ jobs:
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
       xcode-toolset-version: '15.4'
+      debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
@@ -382,3 +394,4 @@ jobs:
       platform: windows-x64
       bootjdk-platform: windows-x64
       runs-on: windows-2019
+      debug-suffix: -debug
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99aaf9650a0..665ae224372 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,6 +40,12 @@ on:
       xcode-toolset-version:
         required: false
         type: string
+      debug-suffix:
+        required: false
+        type: string
+      static-suffix:
+        required: false
+        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -86,35 +92,35 @@ jobs:
 
           - test-name: 'hs/tier1 common'
             test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 1'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 2'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 compiler part 3'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 gc'
             test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 runtime'
             test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'hs/tier1 serviceability'
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
           - test-name: 'lib-test/tier1'
             test-suite: 'test/lib-test/:tier1'
-            debug-suffix: -debug
+            debug-suffix: ${{ inputs.debug-suffix }}
 
     steps:
       - name: 'Checkout the JDK source'
@@ -140,6 +146,7 @@ jobs:
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: ${{ matrix.debug-suffix }}
+          static-suffix: ${{ inputs.static-suffix }}
 
       - name: 'Install dependencies'
         run: |
@@ -160,6 +167,21 @@ jobs:
           else
             echo "value=$PATH" >> $GITHUB_OUTPUT
           fi
+          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+            echo "static-hotspot-problemlist-path=`pwd`/test/hotspot/jtreg/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-jdk-problemlist-path=`pwd`/test/jdk/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-langtools-problemlist-path=`pwd`/test/langtools/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+            echo "static-lib-test-problemlist-path=`pwd`/test/lib-test/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
+          fi
+
+      - name: 'Set Extra Options'
+        id: extra-options
+        run: |
+          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
+            echo "test-jdk=JDK_UNDER_TEST=${{ steps.bundles.outputs.static-jdk-path }}" >> $GITHUB_OUTPUT
+            echo "compile-jdk=JDK_FOR_COMPILE=${{ steps.bundles.outputs.jdk-path }}" >> $GITHUB_OUTPUT
+            echo "extra-problem-lists=EXTRA_PROBLEM_LISTS=${{ steps.path.outputs.static-hotspot-problemlist-path }}%20${{ steps.path.outputs.static-jdk-problemlist-path }}%20${{ steps.path.outputs.static-langtools-problemlist-path }}%20${{ steps.path.outputs.static-lib-test-problemlist-path }}" >> $GITHUB_OUTPUT
+          fi
 
       - name: 'Run tests'
         id: run-tests
@@ -171,7 +193,9 @@ jobs:
           JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
           SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
           TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
-          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
+          ${{ steps.extra-options.outputs.test-jdk }}
+          ${{ steps.extra-options.outputs.compile-jdk }}
+          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful;${{ steps.extra-options.outputs.extra-problem-lists }}'
           && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
         env:
           PATH: ${{ steps.path.outputs.value }}
@@ -204,7 +228,7 @@ jobs:
             echo '::warning ::Missing test-support directory'
           fi
 
-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
+          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }}${{ inputs.static-suffix }} | tr '/ ' '__')"
           echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
         if: always()
 

From 1258af42bec92a2797897cb6126b60b582a29d76 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Thu, 22 May 2025 17:01:48 +0000
Subject: [PATCH 593/901] 8357135: java.lang.OutOfMemoryError: Error creating
 or attaching to libjvmci after JDK-8356447

Reviewed-by: never, yzheng
---
 .../gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java   | 5 +++++
 .../vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java     | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
index 9cacff389b6..40d83739ef5 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
@@ -54,6 +54,11 @@ private static void checkFlag(long ulimit, long maxram, int maxrampercent, boole
     args.add("-XX:MaxRAM=" + maxram);
     args.add("-XX:MaxRAMPercentage=" + maxrampercent);
     args.add("-XX:+PrintFlagsFinal");
+
+    // Avoid issues with libjvmci failing to reserve
+    // a large virtual address space for its heap
+    args.add("-Xint");
+
     args.add("-version");
 
     // Convert bytes to kbytes for ulimit -v
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java
index f81acedbaec..eafbbf8b05f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java
@@ -85,6 +85,8 @@ public static void main(String[] args) throws Throwable {
                 "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
                 "-agentpath:" + Utils.TEST_NATIVE_PATH + File.separator + System.mapLibraryName("alloc001"),
                 "-XX:CompressedClassSpaceSize=64m",
+                "-Xint", // Avoids issues with libjvmci failing to reserve
+                         // a large virtual address space for its heap
                 Test.class.getName()
         ));
         cmd = escapeCmd(cmd);

From 9ca1004e76a614328cd2eb7546143839c4d2f810 Mon Sep 17 00:00:00 2001
From: pawan chawdhary <pawan@dhcp-10-48-118-86.wifi.oracle.com>
Date: Thu, 22 May 2025 17:08:08 +0000
Subject: [PATCH 594/901] 8352926: New test
 TestDockerMemoryMetricsSubgroup.java fails

Reviewed-by: mseledtsov, lmesnik
---
 .../docker/TestMemoryWithSubgroups.java       |   7 +-
 .../TestDockerMemoryMetricsSubgroup.java      |   4 +
 .../ContainerRuntimeVersionTestUtils.java     | 107 ++++++++++++++++++
 3 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java

diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
index 2245090ac55..a75f314b53d 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
@@ -24,9 +24,8 @@
 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.ContainerRuntimeVersionTestUtils;
 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;
@@ -44,7 +43,6 @@
  * @run main TestMemoryWithSubgroups
  */
 public class TestMemoryWithSubgroups {
-
     private static final String imageName = Common.imageName("subgroup");
 
     static String getEngineInfo(String format) throws Exception {
@@ -70,6 +68,9 @@ public static void main(String[] args) throws Exception {
             System.out.println("Unable to run docker tests.");
             return;
         }
+
+        ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
+
         if (isRootless()) {
             throw new SkippedException("Test skipped in rootless mode");
         }
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
index 2ac79c173ef..57df7b1adbb 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -27,6 +27,7 @@
 import jdk.test.lib.containers.docker.DockerfileConfig;
 import jdk.test.lib.containers.docker.DockerRunOptions;
 import jdk.test.lib.containers.docker.DockerTestUtils;
+import jdk.test.lib.containers.docker.ContainerRuntimeVersionTestUtils;
 
 import java.util.ArrayList;
 
@@ -59,6 +60,9 @@ public static void main(String[] args) throws Exception {
             System.out.println("Unable to run docker tests.");
             return;
         }
+
+        ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
+
         if ("cgroupv1".equals(metrics.getProvider())) {
             testMemoryLimitSubgroupV1("200m", "400m", false);
             testMemoryLimitSubgroupV1("500m", "1G", false);
diff --git a/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java b/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java
new file mode 100644
index 00000000000..88538e7e780
--- /dev/null
+++ b/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.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.
+ */
+
+/*
+ * Methods and definitions related to container runtime version to test container in this directory
+ */
+
+package jdk.test.lib.containers.docker;
+
+import jdk.test.lib.Container;
+import jdk.test.lib.process.OutputAnalyzer;
+import jtreg.SkippedException;
+
+public class ContainerRuntimeVersionTestUtils implements Comparable<ContainerRuntimeVersionTestUtils> {
+    private final int major;
+    private final int minor;
+    private final int micro;
+    private static final boolean IS_DOCKER = Container.ENGINE_COMMAND.contains("docker");
+    private static final boolean IS_PODMAN = Container.ENGINE_COMMAND.contains("podman");
+    public static final ContainerRuntimeVersionTestUtils DOCKER_MINIMAL_SUPPORTED_VERSION_CGROUPNS = new ContainerRuntimeVersionTestUtils(20, 10, 0);
+    public static final ContainerRuntimeVersionTestUtils PODMAN_MINIMAL_SUPPORTED_VERSION_CGROUPNS = new ContainerRuntimeVersionTestUtils(1, 5, 0);
+
+    private ContainerRuntimeVersionTestUtils(int major, int minor, int micro) {
+        this.major = major;
+        this.minor = minor;
+        this.micro = micro;
+    }
+
+    public static void checkContainerVersionSupported() {
+        if (IS_DOCKER && ContainerRuntimeVersionTestUtils.DOCKER_MINIMAL_SUPPORTED_VERSION_CGROUPNS.compareTo(ContainerRuntimeVersionTestUtils.getContainerRuntimeVersion()) > 0) {
+            throw new SkippedException("Docker version too old for this test. Expected >= 20.10.0");
+        }
+        if (IS_PODMAN && ContainerRuntimeVersionTestUtils.PODMAN_MINIMAL_SUPPORTED_VERSION_CGROUPNS.compareTo(ContainerRuntimeVersionTestUtils.getContainerRuntimeVersion()) > 0) {
+            throw new SkippedException("Podman version too old for this test. Expected >= 1.5.0");
+        }
+    }
+
+    @Override
+    public int compareTo(ContainerRuntimeVersionTestUtils other) {
+        if (this.major > other.major) {
+            return 1;
+        } else if (this.major < other.major) {
+            return -1;
+        } else if (this.minor > other.minor) {
+            return 1;
+        } else if (this.minor < other.minor) {
+            return -1;
+        } else if (this.micro > other.micro) {
+            return 1;
+        } else if (this.micro < other.micro) {
+            return -1;
+        } else {
+            // equal majors, minors, micro
+            return 0;
+        }
+    }
+
+    public static ContainerRuntimeVersionTestUtils fromVersionString(String version) {
+        try {
+            // Example 'docker version 20.10.0 or podman version 4.9.4-rhel'
+            String versNums = version.split("\\s+", 3)[2];
+            String[] numbers = versNums.split("-")[0].split("\\.", 3);
+            return new ContainerRuntimeVersionTestUtils(Integer.parseInt(numbers[0]),
+                    Integer.parseInt(numbers[1]),
+                    Integer.parseInt(numbers[2]));
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to parse container runtime version: " + version);
+        }
+    }
+
+    public static String getContainerRuntimeVersionStr() {
+        try {
+            ProcessBuilder pb = new ProcessBuilder(Container.ENGINE_COMMAND, "--version");
+            OutputAnalyzer out = new OutputAnalyzer(pb.start())
+                    .shouldHaveExitValue(0);
+            String result = out.asLines().get(0);
+            System.out.println(Container.ENGINE_COMMAND + " --version returning: " + result);
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException(Container.ENGINE_COMMAND + " --version command failed.");
+        }
+    }
+
+    public static ContainerRuntimeVersionTestUtils getContainerRuntimeVersion() {
+        return ContainerRuntimeVersionTestUtils.fromVersionString(getContainerRuntimeVersionStr());
+    }
+}
\ No newline at end of file

From b1b786a3be9774662424a629c0ad5d1260efc597 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 22 May 2025 18:59:37 +0000
Subject: [PATCH 595/901] 8357402: Crash in AdapterHandlerLibrary::lookup

Reviewed-by: shade, iveresov
---
 src/hotspot/share/cds/archiveBuilder.cpp    |  2 +-
 src/hotspot/share/cds/cdsConfig.cpp         |  4 +++
 src/hotspot/share/cds/cdsConfig.hpp         |  1 +
 src/hotspot/share/cds/metaspaceShared.cpp   |  2 +-
 src/hotspot/share/code/aotCodeCache.cpp     |  6 ++--
 src/hotspot/share/oops/method.cpp           |  6 ++--
 src/hotspot/share/runtime/sharedRuntime.cpp | 40 +++++++++++----------
 7 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 1ccc7712a30..4dadae6ca39 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -537,7 +537,7 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
              ref->msotype() == MetaspaceObj::MethodCountersType) {
     return set_to_null;
   } else if (ref->msotype() == MetaspaceObj::AdapterHandlerEntryType) {
-    if (AOTCodeCache::is_dumping_adapter()) {
+    if (CDSConfig::is_dumping_adapters()) {
       AdapterHandlerEntry* entry = (AdapterHandlerEntry*)ref->obj();
       return AdapterHandlerLibrary::is_abstract_method_adapter(entry) ? set_to_null : make_a_copy;
     } else {
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index bdbd7563cc4..c8b6be2142f 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -895,3 +895,7 @@ void CDSConfig::disable_dumping_aot_code() {
 void CDSConfig::enable_dumping_aot_code() {
   _is_dumping_aot_code = true;
 }
+
+bool CDSConfig::is_dumping_adapters() {
+  return (AOTAdapterCaching && is_dumping_final_static_archive());
+}
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index 0fb6cc1ec6a..b3b504997ff 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -187,6 +187,7 @@ class CDSConfig : public AllStatic {
   static bool is_dumping_aot_code()                          NOT_CDS_RETURN_(false);
   static void disable_dumping_aot_code()                     NOT_CDS_RETURN;
   static void enable_dumping_aot_code()                      NOT_CDS_RETURN;
+  static bool is_dumping_adapters()                          NOT_CDS_RETURN_(false);
 
   // Some CDS functions assume that they are called only within a single-threaded context. I.e.,
   // they are called from:
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index e95381a34b7..be7fa383263 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -613,7 +613,7 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
   // Write lambform lines into archive
   LambdaFormInvokers::dump_static_archive_invokers();
 
-  if (AOTCodeCache::is_dumping_adapter()) {
+  if (CDSConfig::is_dumping_adapters()) {
     AdapterHandlerLibrary::dump_aot_adapter_table();
   }
 
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 2ae5e763968..4db16fdbc70 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -902,7 +902,8 @@ CodeBlob* AOTCodeCache::load_code_blob(AOTCodeEntry::Kind entry_kind, uint id, c
   AOTCodeReader reader(cache, entry);
   CodeBlob* blob = reader.compile_code_blob(name, entry_offset_count, entry_offsets);
 
-  log_debug(aot, codecache, stubs)("Read blob '%s' (id=%u, kind=%s) from AOT Code Cache", name, id, aot_code_entry_kind_name[entry_kind]);
+  log_debug(aot, codecache, stubs)("%sRead blob '%s' (id=%u, kind=%s) from AOT Code Cache",
+                                   (blob == nullptr? "Failed to " : ""), name, id, aot_code_entry_kind_name[entry_kind]);
   return blob;
 }
 
@@ -917,8 +918,7 @@ CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_co
   if (strncmp(stored_name, name, (name_size - 1)) != 0) {
     log_warning(aot, codecache, stubs)("Saved blob's name '%s' is different from the expected name '%s'",
                                        stored_name, name);
-    ((AOTCodeCache*)_cache)->set_failed();
-    report_load_failure();
+    set_lookup_failed(); // Skip this blob
     return nullptr;
   }
 
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 84c594b99d9..f14a351ef48 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -135,6 +135,7 @@ void Method::deallocate_contents(ClassLoaderData* loader_data) {
   clear_method_data();
   MetadataFactory::free_metadata(loader_data, method_counters());
   clear_method_counters();
+  set_adapter_entry(nullptr);
   // The nmethod will be gone when we get here.
   if (code() != nullptr) _code = nullptr;
 }
@@ -407,8 +408,9 @@ void Method::metaspace_pointers_do(MetaspaceClosure* it) {
 
 void Method::remove_unshareable_info() {
   unlink_method();
-  if (AOTCodeCache::is_dumping_adapter() && _adapter != nullptr) {
+  if (CDSConfig::is_dumping_adapters() && _adapter != nullptr) {
     _adapter->remove_unshareable_info();
+    _adapter = nullptr;
   }
   JFR_ONLY(REMOVE_METHOD_ID(this);)
 }
@@ -1146,7 +1148,7 @@ void Method::unlink_code() {
 void Method::unlink_method() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   _code = nullptr;
-  if (!AOTCodeCache::is_dumping_adapter() || AdapterHandlerLibrary::is_abstract_method_adapter(_adapter)) {
+  if (!CDSConfig::is_dumping_adapters() || AdapterHandlerLibrary::is_abstract_method_adapter(_adapter)) {
     _adapter = nullptr;
   }
   _i2i_entry = nullptr;
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index a4f5761ae48..ab31f093146 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -2456,7 +2456,7 @@ AdapterHandlerEntry* AdapterHandlerLibrary::lookup(int total_args_passed, BasicT
 #if INCLUDE_CDS
   // if we are building the archive then the archived adapter table is
   // not valid and we need to use the ones added to the runtime table
-  if (!AOTCodeCache::is_dumping_adapter()) {
+  if (AOTCodeCache::is_using_adapter()) {
     // Search archived table first. It is read-only table so can be searched without lock
     entry = _aot_adapter_handler_table.lookup(fp, fp->compute_hash(), 0 /* unused */);
     if (entry != nullptr) {
@@ -2566,7 +2566,7 @@ void AdapterHandlerLibrary::initialize() {
 
 #if INCLUDE_CDS
   // Link adapters in AOT Cache to their code in AOT Code Cache
-  if (!_aot_adapter_handler_table.empty()) {
+  if (AOTCodeCache::is_using_adapter() && !_aot_adapter_handler_table.empty()) {
     link_aot_adapters();
     lookup_simple_adapters();
     return;
@@ -2988,6 +2988,7 @@ void AdapterHandlerEntry::link() {
 }
 
 void AdapterHandlerLibrary::link_aot_adapters() {
+  assert(AOTCodeCache::is_using_adapter(), "AOT adapters code should be available");
   _aot_adapter_handler_table.iterate([](AdapterHandlerEntry* entry) {
     assert(!entry->is_linked(), "AdapterHandlerEntry is already linked!");
     entry->link();
@@ -3374,10 +3375,12 @@ JRT_END
 bool AdapterHandlerLibrary::contains(const CodeBlob* b) {
   bool found = false;
 #if INCLUDE_CDS
-  auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
-    return (found = (b == CodeCache::find_blob(handler->get_i2c_entry())));
-  };
-  _aot_adapter_handler_table.iterate(findblob_archived_table);
+  if (AOTCodeCache::is_using_adapter()) {
+    auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
+      return (found = (b == CodeCache::find_blob(handler->get_i2c_entry())));
+    };
+    _aot_adapter_handler_table.iterate(findblob_archived_table);
+  }
 #endif // INCLUDE_CDS
   if (!found) {
     auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {
@@ -3401,18 +3404,19 @@ uint32_t AdapterHandlerLibrary::id(AdapterFingerPrint* fingerprint) {
 void AdapterHandlerLibrary::print_handler_on(outputStream* st, const CodeBlob* b) {
   bool found = false;
 #if INCLUDE_CDS
-  auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
-    if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
-      found = true;
-      st->print("Adapter for signature: ");
-      handler->print_adapter_on(st);
-      return true;
-    } else {
-      return false; // keep looking
-
-    }
-  };
-  _aot_adapter_handler_table.iterate(findblob_archived_table);
+  if (AOTCodeCache::is_using_adapter()) {
+    auto findblob_archived_table = [&] (AdapterHandlerEntry* handler) {
+      if (b == CodeCache::find_blob(handler->get_i2c_entry())) {
+        found = true;
+        st->print("Adapter for signature: ");
+        handler->print_adapter_on(st);
+        return true;
+      } else {
+        return false; // keep looking
+      }
+    };
+    _aot_adapter_handler_table.iterate(findblob_archived_table);
+  }
 #endif // INCLUDE_CDS
   if (!found) {
     auto findblob_runtime_table = [&] (AdapterFingerPrint* key, AdapterHandlerEntry* a) {

From 139a05d05959a84541a29dfae6151f92ce579ae6 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 22 May 2025 19:19:45 +0000
Subject: [PATCH 596/901] 8357176: java.awt javadoc code examples still use
 Applet API

Reviewed-by: aivanov, serb
---
 .../share/classes/java/awt/BorderLayout.java  |  44 ++++----
 .../share/classes/java/awt/FlowLayout.java    |  39 ++++---
 .../share/classes/java/awt/GridBagLayout.java | 101 ++++++++----------
 .../share/classes/java/awt/GridLayout.java    |  44 ++++----
 .../share/classes/java/awt/MediaTracker.java  |  46 ++++----
 .../java/awt/doc-files/BorderLayout-1.gif     | Bin 2716 -> 0 bytes
 .../java/awt/doc-files/BorderLayout-1.png     | Bin 0 -> 11081 bytes
 .../java/awt/doc-files/FlowLayout-1.gif       | Bin 1918 -> 0 bytes
 .../java/awt/doc-files/FlowLayout-1.png       | Bin 0 -> 6030 bytes
 .../java/awt/doc-files/GridBagLayout-1.gif    | Bin 2608 -> 0 bytes
 .../java/awt/doc-files/GridBagLayout-1.png    | Bin 0 -> 13808 bytes
 .../java/awt/doc-files/GridBagLayout-2.gif    | Bin 2592 -> 0 bytes
 .../java/awt/doc-files/GridBagLayout-2.png    | Bin 0 -> 13828 bytes
 .../java/awt/doc-files/GridLayout-1.gif       | Bin 1764 -> 0 bytes
 .../java/awt/doc-files/GridLayout-1.png       | Bin 0 -> 7888 bytes
 .../java/awt/doc-files/GridLayout-2.gif       | Bin 1776 -> 0 bytes
 .../java/awt/doc-files/GridLayout-2.png       | Bin 0 -> 7846 bytes
 17 files changed, 148 insertions(+), 126 deletions(-)
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.png
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.png
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.png
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.png
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.png
 delete mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif
 create mode 100644 src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.png

diff --git a/src/java.desktop/share/classes/java/awt/BorderLayout.java b/src/java.desktop/share/classes/java/awt/BorderLayout.java
index c5bb016b944..f48e3119abc 100644
--- a/src/java.desktop/share/classes/java/awt/BorderLayout.java
+++ b/src/java.desktop/share/classes/java/awt/BorderLayout.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
@@ -89,31 +89,39 @@
  * the {@code CENTER} component may stretch both horizontally
  * and vertically to fill any space left over.
  * <p>
- * Here is an example of five buttons in an applet laid out using
+ * Here is an example of five buttons in a window laid out using
  * the {@code BorderLayout} layout manager:
  * <p>
- * <img src="http://github.com/doc-files/BorderLayout-1.gif" alt="Diagram of an applet
+ * <img src="http://github.com/doc-files/BorderLayout-1.png" alt="Diagram of a window
  * demonstrating BorderLayout. Each section of the BorderLayout contains a
  * Button corresponding to its position in the layout, one of: North, West,
- * Center, East, or South." style="margin: 7px 10px;">
+ * Center, East, or South.">
  * <p>
- * The code for this applet is as follows:
+ * The code for this program is as follows:
  *
- * <hr><blockquote><pre>
- * import java.awt.*;
- * import java.applet.Applet;
+ * {@snippet lang='java':
+ * import java.awt.BorderLayout;
+ * import java.awt.Button;
+ * import java.awt.EventQueue;
+ * import java.awt.Frame;
  *
- * public class buttonDir extends Applet {
- *   public void init() {
- *     setLayout(new BorderLayout());
- *     add(new Button("North"), BorderLayout.NORTH);
- *     add(new Button("South"), BorderLayout.SOUTH);
- *     add(new Button("East"), BorderLayout.EAST);
- *     add(new Button("West"), BorderLayout.WEST);
- *     add(new Button("Center"), BorderLayout.CENTER);
- *   }
+ * public class BorderLayoutExample {
+ *
+ *     public static void main(String[] args) throws Exception {
+ *         EventQueue.invokeAndWait(() -> {
+ *             Frame frame = new Frame("BorderLayout");
+ *             frame.setLayout(new BorderLayout());
+ *             frame.add(new Button("North"), BorderLayout.NORTH);
+ *             frame.add(new Button("South"), BorderLayout.SOUTH);
+ *             frame.add(new Button("East"), BorderLayout.EAST);
+ *             frame.add(new Button("West"), BorderLayout.WEST);
+ *             frame.add(new Button("Center"), BorderLayout.CENTER);
+ *             frame.setSize(300, 300);
+ *             frame.setVisible(true);
+ *         });
+ *     }
+ * }
  * }
- * </pre></blockquote><hr>
  *
  * @author      Arthur van Hoff
  * @see         java.awt.Container#add(String, Component)
diff --git a/src/java.desktop/share/classes/java/awt/FlowLayout.java b/src/java.desktop/share/classes/java/awt/FlowLayout.java
index 18f46c54c0c..1e9f3dfd2a2 100644
--- a/src/java.desktop/share/classes/java/awt/FlowLayout.java
+++ b/src/java.desktop/share/classes/java/awt/FlowLayout.java
@@ -51,31 +51,36 @@
  * <li>{@link #TRAILING TRAILING}
  * </ul>
  * <p>
- * For example, the following picture shows an applet using the flow
+ * For example, the following picture shows a window using the flow
  * layout manager (its default layout manager) to position three buttons:
  * <p>
- * <img src="http://github.com/doc-files/FlowLayout-1.gif"
+ * <img src="http://github.com/doc-files/FlowLayout-1.png"
  * ALT="Graphic of Layout for Three Buttons"
- * style="margin: 7px 10px;">
+ * >
  * <p>
- * Here is the code for this applet:
+ * Here is the code for this program:
  *
- * <hr><blockquote><pre>
- * import java.awt.*;
- * import java.applet.Applet;
+ * {@snippet lang='java':
+ * import java.awt.Button;
+ * import java.awt.EventQueue;
+ * import java.awt.FlowLayout;
+ * import java.awt.Frame;
  *
- * public class myButtons extends Applet {
- *     Button button1, button2, button3;
- *     public void init() {
- *         button1 = new Button("Ok");
- *         button2 = new Button("Open");
- *         button3 = new Button("Close");
- *         add(button1);
- *         add(button2);
- *         add(button3);
+ * public class FlowLayoutExample {
+ *
+ *     public static void main(String[] args) throws Exception {
+ *         EventQueue.invokeAndWait(() -> {
+ *             Frame frame = new Frame("FlowLayout");
+ *             frame.setLayout(new FlowLayout());
+ *             frame.add(new Button("OK"));
+ *             frame.add(new Button("Open"));
+ *             frame.add(new Button("Close"));
+ *             frame.pack();
+ *             frame.setVisible(true);
+ *         });
  *     }
  * }
- * </pre></blockquote><hr>
+ * }
  * <p>
  * A flow layout lets each component assume its natural (preferred) size.
  *
diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
index 2dc65ab1265..03d6b8b2680 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
@@ -240,15 +240,15 @@
  * left-to-right container and Figure 3 shows the layout for a horizontal,
  * right-to-left container.
  *
- * <div style="margin:0 auto;width:680px;text-align:center;font-weight:bold">
+ * <div style="margin:0 auto;width:850px;text-align:center;font-weight:bold">
  *   <div style="float:left">
- *     <p><img src="http://github.com/doc-files/GridBagLayout-1.gif"
+ *     <p><img src="http://github.com/doc-files/GridBagLayout-1.png"
  *        alt="The preceding text describes this graphic (Figure 2)."
  *        style="margin: 7px 10px;">
  *     <p>Figure 2: Horizontal, Left-to-Right
  *   </div>
  *   <div style="float:right">
- *     <p><img src="http://github.com/doc-files/GridBagLayout-2.gif"
+ *     <p><img src="http://github.com/doc-files/GridBagLayout-2.png"
  *        alt="The preceding text describes this graphic (Figure 3)."
  *        style="margin: 7px 10px;">
  *     <p>Figure 3: Horizontal, Right-to-Left
@@ -276,73 +276,66 @@
  * <p>
  * Here is the code that implements the example shown above:
  *
- * <hr><blockquote><pre>
- * import java.awt.*;
- * import java.util.*;
- * import java.applet.Applet;
+ * {@snippet lang='java':
+ * import java.awt.Button;
+ * import java.awt.EventQueue;
+ * import java.awt.Frame;
+ * import java.awt.GridBagConstraints;
+ * import java.awt.GridBagLayout;
  *
- * public class GridBagEx1 extends Applet {
+ * public class GridBagLayoutExample {
  *
- *     protected void makebutton(String name,
- *                               GridBagLayout gridbag,
- *                               GridBagConstraints c) {
+ *     private static void addButton(String name,
+ *                                   GridBagLayout gridbag,
+ *                                   GridBagConstraints c,
+ *                                   Frame frame) {
  *         Button button = new Button(name);
  *         gridbag.setConstraints(button, c);
- *         add(button);
+ *         frame.add(button);
  *     }
  *
- *     public void init() {
- *         GridBagLayout gridbag = new GridBagLayout();
- *         GridBagConstraints c = new GridBagConstraints();
+ *     public static void main(String[] args) throws Exception {
+ *         EventQueue.invokeAndWait(() -> {
+ *             Frame frame = new Frame("GridBagLayout");
+ *             GridBagLayout gridbag = new GridBagLayout();
+ *             GridBagConstraints c = new GridBagConstraints();
+ *             frame.setLayout(gridbag);
  *
- *         setFont(new Font("SansSerif", Font.PLAIN, 14));
- *         setLayout(gridbag);
+ *             c.fill = GridBagConstraints.BOTH;
+ *             c.weightx = 1.0;
+ *             addButton("Button1", gridbag, c, frame);
+ *             addButton("Button2", gridbag, c, frame);
+ *             addButton("Button3", gridbag, c, frame);
  *
- *         c.fill = GridBagConstraints.BOTH;
- *         c.weightx = 1.0;
- *         makebutton("Button1", gridbag, c);
- *         makebutton("Button2", gridbag, c);
- *         makebutton("Button3", gridbag, c);
+ *             c.gridwidth = GridBagConstraints.REMAINDER; //end row
+ *             addButton("Button4", gridbag, c, frame);
  *
- *         c.gridwidth = GridBagConstraints.REMAINDER; //end row
- *         makebutton("Button4", gridbag, c);
+ *             c.weightx = 0.0;                //reset to the default
+ *             addButton("Button5", gridbag, c, frame); //another row
  *
- *         c.weightx = 0.0;                //reset to the default
- *         makebutton("Button5", gridbag, c); //another row
+ *             c.gridwidth = GridBagConstraints.RELATIVE; //next-to-last in row
+ *             addButton("Button6", gridbag, c, frame);
  *
- *         c.gridwidth = GridBagConstraints.RELATIVE; //next-to-last in row
- *         makebutton("Button6", gridbag, c);
+ *             c.gridwidth = GridBagConstraints.REMAINDER; //end row
+ *             addButton("Button7", gridbag, c, frame);
  *
- *         c.gridwidth = GridBagConstraints.REMAINDER; //end row
- *         makebutton("Button7", gridbag, c);
+ *             c.gridwidth = 1;                //reset to the default
+ *             c.gridheight = 2;
+ *             c.weighty = 1.0;
+ *             addButton("Button8", gridbag, c, frame);
  *
- *         c.gridwidth = 1;                //reset to the default
- *         c.gridheight = 2;
- *         c.weighty = 1.0;
- *         makebutton("Button8", gridbag, c);
+ *             c.weighty = 0.0;                //reset to the default
+ *             c.gridwidth = GridBagConstraints.REMAINDER; //end row
+ *             c.gridheight = 1;               //reset to the default
+ *             addButton("Button9", gridbag, c, frame);
+ *             addButton("Button10", gridbag, c, frame);
  *
- *         c.weighty = 0.0;                //reset to the default
- *         c.gridwidth = GridBagConstraints.REMAINDER; //end row
- *         c.gridheight = 1;               //reset to the default
- *         makebutton("Button9", gridbag, c);
- *         makebutton("Button10", gridbag, c);
- *
- *         setSize(300, 100);
- *     }
- *
- *     public static void main(String args[]) {
- *         Frame f = new Frame("GridBag Layout Example");
- *         GridBagEx1 ex1 = new GridBagEx1();
- *
- *         ex1.init();
- *
- *         f.add("Center", ex1);
- *         f.pack();
- *         f.setSize(f.getPreferredSize());
- *         f.show();
+ *             frame.pack();
+ *             frame.setVisible(true);
+ *         });
  *     }
  * }
- * </pre></blockquote><hr>
+ * }
  *
  * @author Doug Stein
  * @author Bill Spitzak (original NeWS &amp; OLIT implementation)
diff --git a/src/java.desktop/share/classes/java/awt/GridLayout.java b/src/java.desktop/share/classes/java/awt/GridLayout.java
index b205aa569b3..6beb92194f7 100644
--- a/src/java.desktop/share/classes/java/awt/GridLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, 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
@@ -32,25 +32,33 @@
  * lays out a container's components in a rectangular grid.
  * The container is divided into equal-sized rectangles,
  * and one component is placed in each rectangle.
- * For example, the following is an applet that lays out six buttons
+ * For example, the following is a window that lays out six buttons
  * into three rows and two columns:
  *
- * <hr><blockquote>
- * <pre>
- * import java.awt.*;
- * import java.applet.Applet;
- * public class ButtonGrid extends Applet {
- *     public void init() {
- *         setLayout(new GridLayout(3,2));
- *         add(new Button("1"));
- *         add(new Button("2"));
- *         add(new Button("3"));
- *         add(new Button("4"));
- *         add(new Button("5"));
- *         add(new Button("6"));
+ * {@snippet lang='java':
+ * import java.awt.Button;
+ * import java.awt.EventQueue;
+ * import java.awt.Frame;
+ * import java.awt.GridLayout;
+ *
+ * public class GridLayoutExample {
+ *
+ *     public static void main(String[] args) throws Exception {
+ *         EventQueue.invokeAndWait(() -> {
+ *             Frame frame = new Frame("GridLayout");
+ *             frame.setLayout(new GridLayout(3, 2));
+ *             frame.add(new Button("1"));
+ *             frame.add(new Button("2"));
+ *             frame.add(new Button("3"));
+ *             frame.add(new Button("4"));
+ *             frame.add(new Button("5"));
+ *             frame.add(new Button("6"));
+ *             frame.setSize(200, 200);
+ *             frame.setVisible(true);
+ *         });
  *     }
  * }
- * </pre></blockquote><hr>
+ * }
  * <p>
  * If the container's {@code ComponentOrientation} property is horizontal
  * and left-to-right, the above example produces the output shown in Figure 1.
@@ -59,13 +67,13 @@
  *
  * <div style="margin:0 auto;width:600px;text-align:center;font-weight:bold">
  *   <div style="float:left">
- *     <p><img SRC="doc-files/GridLayout-1.gif"
+ *     <p><img SRC="doc-files/GridLayout-1.png"
  *        alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 1 then 2.
  *        Row 2 shows buttons 3 then 4. Row 3 shows buttons 5 then 6.">
  *     <p>Figure 1: Horizontal, Left-to-Right
  *   </div>
  *   <div style="float:right">
- *     <p><img SRC="doc-files/GridLayout-2.gif"
+ *     <p><img SRC="doc-files/GridLayout-2.png"
  *        alt="Shows 6 buttons in rows of 2. Row 1 shows buttons 2 then 1.
  *        Row 2 shows buttons 4 then 3. Row 3 shows buttons 6 then 5.">
  *     <p>Figure 2: Horizontal, Right-to-Left
diff --git a/src/java.desktop/share/classes/java/awt/MediaTracker.java b/src/java.desktop/share/classes/java/awt/MediaTracker.java
index 408d68ffe14..f77816dc2e7 100644
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.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
@@ -67,14 +67,17 @@
  * <p>
  * Here is an example of using {@code MediaTracker}:
  *
- * <hr><blockquote><pre>{@code
- * import java.applet.Applet;
+ * {@snippet lang='java':
  * import java.awt.Color;
+ * import java.awt.EventQueue;
+ * import java.awt.Frame;
  * import java.awt.Image;
  * import java.awt.Graphics;
  * import java.awt.MediaTracker;
+ * import java.awt.Panel;
+ * import java.awt.Toolkit;
  *
- * public class ImageBlaster extends Applet implements Runnable {
+ * public class MediaTrackerExample extends Panel implements Runnable {
  *      MediaTracker tracker;
  *      Image bg;
  *      Image anim[] = new Image[5];
@@ -84,29 +87,34 @@
  *      // Get the images for the background (id == 0)
  *      // and the animation frames (id == 1)
  *      // and add them to the MediaTracker
- *      public void init() {
+ *      public static void main(String[] args) throws Exception {
+ *          MediaTrackerExample mte = new MediaTrackerExample();
+ *          EventQueue.invokeAndWait(() -> {
+ *              Frame frame = new Frame("MediaTrackerExample");
+ *              frame.setSize(400, 400);
+ *              frame.add(mte);
+ *              frame.setVisible(true);
+ *          });
+ *          mte.startAnimation();
+ *      }
+ *
+ *      public MediaTrackerExample() {
+ *          Toolkit tk = Toolkit.getDefaultToolkit();
  *          tracker = new MediaTracker(this);
- *          bg = getImage(getDocumentBase(),
- *                  "images/background.gif");
+ *          // Note : actual images not provided as part of this code example
+ *          bg = tk.getImage("background.gif");
  *          tracker.addImage(bg, 0);
  *          for (int i = 0; i < 5; i++) {
- *              anim[i] = getImage(getDocumentBase(),
- *                      "images/anim"+i+".gif");
+ *              anim[i] = tk.getImage("anim" + i + ".gif");
  *              tracker.addImage(anim[i], 1);
  *          }
  *      }
  *
- *      // Start the animation thread.
- *      public void start() {
+ *      public void startAnimation() {
  *          animator = new Thread(this);
  *          animator.start();
  *      }
  *
- *      // Stop the animation thread.
- *      public void stop() {
- *          animator = null;
- *      }
- *
  *      // Run the animation thread.
  *      // First wait for the background image to fully load
  *      // and paint.  Then wait for all of the animation
@@ -137,7 +145,7 @@
  *      }
  *
  *      // The background image fills the frame so we
- *      // don't need to clear the applet on repaints.
+ *      // don't need to clear the component background on repaints.
  *      // Just call the paint method.
  *      public void update(Graphics g) {
  *          paint(g);
@@ -152,7 +160,7 @@
  *      public void paint(Graphics g) {
  *          if ((tracker.statusAll(false) & MediaTracker.ERRORED) != 0) {
  *              g.setColor(Color.red);
- *              g.fillRect(0, 0, size().width, size().height);
+ *              g.fillRect(0, 0, getSize().width, getSize().height);
  *              return;
  *          }
  *          g.drawImage(bg, 0, 0, this);
@@ -161,7 +169,7 @@
  *          }
  *      }
  * }
- * } </pre></blockquote><hr>
+ * }
  *
  * @author      Jim Graham
  * @since       1.0
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.gif
deleted file mode 100644
index 8a1a2bb670f2c5443fc1e0f5a1fa505b5ef93927..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2716
zcmV;N3S;$0Nk%w1VQK*`0igf@0002Mz`+0i{{R30A^8LW00062EC2ui0BQj)0RRI2
zgpaAq?GK}zwAzca-n{z{hT=$;=82~2%C_zc$1)?-_KoNI&iDQg3<`(DqVb4KDwoXW
zZ4rn{r_`$Tip^@b+^+Wv4vWX+viXcoOBw36`wfrF=k&Tg%D(IO{J#GWNR}5!SZH{N
zn20r~*y#8O85zbXS!sER2}qgA+3EQywh1~)TG}aUnyR{Lh|2m38yn{;TWfpkMT@)3
zyQ|v^9K8B#1#osCoU9B-JY^8@To%n`ylj0<)x2grJ=U#NjV->c4V^6=zLh@C-dnz2
zt+0)py$(%(kI=r4`+lB}FF}=W0O#T3hwzm@XL$al>jv>*IC}{zrg|sO97Fz%cqBT5
z($JzvRTu?w4C!&($BZXOy8N_oO-Pw1BYs@;GAB%sUEp=p_miMal`|>oJgO)r$}2_-
zuC#X$snn!AsX1i2C@RpEQ@c`SDGjUFv9QYFEJil%u&RQ@s(m}kEZn)i*wVdA&Mw})
zz~u7%YsxR+!8^ecK3rBW;>D!|Gk)yIG33dIBvZbuX@=&_oI88|3_7&v(WFb8K8-rH
z>eV5fxPA>gw(QxoYumnUV*&2nynFlp4LrCK-NK6-KaM=PavzE@JCEG_x%A4>r(4f#
z_`3E$mbd5f&a^ssG)=d62mFm7wTI&eipP8~qEC$`<FyaE)q8x2^Zw%jwSV7ve?1e;
zG!q?YAb<C?Cm>%2E?Cq=?rj7icn$9L;Da5}bQ6c_S$82`8A`a}OhiS<;Cq+J=OKw5
zqBvfNccrHwh4sK_p^B8z$d!#99++Zw_YKL6jzk_giIGSyxt@?rKAEJGP)^yTNmO2$
zi;`GQ$y%3QehFrnVvb2>nP#4eW}0a($7Y*uz6oa%#2sfqoOa%cCl7TRHz%I}<Oyh?
zaqd~1ma`DL<ywE%fSr|u9AHDDBq92TjNVWxX=9l7VQDCvW(o?Vj8<xBk&6lds-~wl
znjd$crh3Y&dUP6Pq_Bo6>m9U$Au6i37G|p-yMEE@ufUEf{%oml6l-j(tCA`uAIvtJ
z$+Vm*>xQ+|TB7Y9!)E#HwwH7}E4FQrEAAuc+VO2qxu)C5x^=YMWU%l?A}<~Es`Ku>
zh~zuRzTouhZz}``Y_1vr7wl@d*GB8@!3<+(ue1rLvGBynI&3k-<#Mbsbs&H2Xu}nU
zZ1BjsUQC|EC`YU^yDT5$^2;m7JnzhAWNfp{IP0r3IzRXP@yR5&N-?rTo2+!lB`59c
z(o9GF@YB#5Ej7$o`)u{bTW9U_*FbxGv)EuGJhU7FXTkH?+19*l(1O72w!(CuEBB>o
z*Zub1rgr_X*?jjc_@QKn-SpsN7ydWWS0}Ex+IQRjeR$4(N51pq80YQj<(SXyIo_2o
z4*BPVm(I20UZZaM=Aly#c*l&l-udi($F4Q&v}gXh>$n%K`|hCIF8c3f2QPf>$Qy1v
z;#4Q^I`Ocp9{BRmgDbu7)XQ%D_4Rgt`}Vm%@4e93w>&!9=a*kk@8~yg`TFe7Bfrq_
zlTQBpwSr%~_`v6{KVoU_ef~Qh00ZbQ_t7kUl2c#++ZMj4Kn;Pz<KOfo__za7a9|F!
zUjd!BLFH+1Z1+>21vd!6{$X%+BMf0N2DrcyHn4v4OW_4SRJ|6uuzfVtn+y%t!}8fs
zdn?T04h7gj(EZR<LG<1b30Oq#>F|g@X(IlwIJdtkQt^o~{9yb}NI@?0Zi#VABKySX
z!6=T8iV3tL63KWvEglh#O7tTB*!Vp;Mi7Tm#3R4V*f}_g&W*{VqYv$9LOr_Bkb$Hg
zMfiA@tN>C`<pD=m(8a(Cy--RnVp03>6P`&1#wc2e&{p=N$!lP;DH1G@)m+iZSaN8V
zn<QkYBAFm=xTr!1f@EKE<x3#FXp?}GC61uNL0iHEmk8qJi+WkfU#cvaCn`}Wi`ftY
zL9>~(bdM-W!AdI$vnJw<rZ867%76^zn%jfOKQ`G-9)htfk$k6ytU1hatn!7lOc2|m
z<4zy-s3qQ1rYBhGmV2fWpZWymBmQ^E%kt17pz)+oB^h~<M<#Ta>ha|{9m-D=;fR>+
zWKa8Y`N>+&Qx^FVXEoL7&wZd%E85J5H%S^riW-EQ^9ZFuaV4L7deSKi#l}o&q)VHo
z^rVQK;Y#&~(JN+>iBGK|49D11AXfE^S52cwLFmVSeiK}Rq})$U7u7drm8yyiVOq($
z)-s;;b8k&xS);dAA$GNnYW!bV#X47Z_SJxYm1JOX`qeMC6@_~}<Y2*C*n;LYN_R!y
zVHH=`D#bO9kyYtpp_te^c2=IB?c!q<J6h7R>a?OwZ51ag)ygjLvV+U)A7#rs+Vah|
z9K@~pU<*Coiq*FjEbRju{@X~_CepR^11?;Z>r~@H6}gn%>>!;hJmE@`xO&rV-Lxy%
z&@Pv``S31&psQ8sT6L^;wXRvQyF2hA)|`-at$e-7T@jMEyzsrPd-1AXuCiCN=w<7E
z@5|Hz%eB9)L-14nYgq=PmAbKo@N6YaR|>0D!JH+pgLlf|>jqe_1NLu--#cO_YWTV0
zjqZV0+};xd_{Amet%Y-oVa$E_ye&>Ijm-;?8~--N*V}QBWgKB52N%W!?y-SA%w!Wg
zdBI99WRz`;<O^3hyH_5rkc<1{9M4x|Kn9zU*JfBTW46oN{c?BJTw6AWm%gZla*e&5
zWgKrgzH%OO%F3MnwKHQ;s(_Z7pr=aZFz;E)bZ)JE`;1>V>(|aeMzc@hyjw^oc*-4S
z?xFLWMMbZc(;^l%v_MU0On+C?56<(DO}#NxBeBp+`?RD(O=(s0xY6VFG^;^OY81n|
zYPU}Hq8t3{U6WbYXS21d!JO-3<2l$fj`pZ|?P6=6y4bU3wwaTCWNIgQ*iIWwZq$VC
zbSvQ8>dpYW+YN6ty*u6%5CFaJeI|Q@Mo|3jx4-`_ggya$-~=!Dodj<1ge!dEz!~&@
zM~Uc%_ru{5j|;^sUKm+pJmcKf54PcR@wCJ>B}cOKQ9e}44auXXLo&HeP@W!@tUReL
z54l%5dZPYu*68Dparwz9DpZa_)Z-CHOnh>V^rQz#<8v`4M--~i92K20PWO+{D|#KD
zOQq^RnPt?8&h)XAES;J}#@Eeb^NnLd>uQfz+S^_Uw!{5jZ=X9P<Zkyu;63jR!?)l6
z4*0+ee(;1Zyx|W&8osM?>WT*^;~Njujzj+LkDt7=ByV}QhduL&s5|E$Re6GPg6C}1
zSu}Y~dTf(^i=jU~uiEl@wetj({ds5Cj~q(e-(KaqJf%>cJ>91@6Qx1-P*w)Q%z)Ta
z=@_5AI<2X55Mw>%PpPIz%ZYVgmouitH>L7(FHqkj|G~_!I25|y{ikbGtX_9|KSL^d
z8h7gh{ak0LNa0WNalU^-z+dnDjhTM>mwnLpOxD*D52aKa=X^=kDh+s21JzSYWp*?t
zfho6oa}+H&_jw1Ef$O({qt}6G@qr+?c_Y|&{bz!m7kViO9VN(u#3pVp*n)^hgEeS_
WH;98dsDnGmgFWbjKNuzj002AqX@<K1

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.png b/src/java.desktop/share/classes/java/awt/doc-files/BorderLayout-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..894b3e172211f0729c64a45e1f50d7908b2ba9e6
GIT binary patch
literal 11081
zcmeHtg;!M3+Wr88(kX&cLwA?-P|_g?3^25`gmiZ(AWElzAc8Z*03uzA(hU;QEeH(V
z@EyGO`|e%eZ~gv(Z{1nztbJzhch`H)+535(cfZonQYOTEhzA0J2vt=SbwMBu?%NCJ
z4v^y)l;8y<7#_OH@}Tkon%}@5D;t=qt)?c36S&6#VZ=Cqz_%vA^$@r~AaGJN=q`|w
z0hdlb1_%pCF>cHAG5^~VgF7GVU-v*cNKQ{dRTW6}tle#FTs-VuJ?FX<#ej-G9iGBG
zVVW8e)~?RHmd{+RY<PX0-EOOZq<kfSTW1?jONg)Ya~BT@Uunj_781byZ8jex<gbaR
zlQbhtQwO5p>TUxO<>lw)XOzK%Kp;}?&uk@h6(9ezI`B`L(caV3O@fcl$H#})M~K(e
z-HuN{TwI)wUyx5wkO#2f@$hr;wDje1@nHH#BmdowqK${OyMvpjgR2YVwp~jrS1(U#
zM#kHY{^$3PaoYGg{HrGykAF@Jm>}P637-HjKi~hf4OEr7&6Ut`@U?kvr0C!bxCiJ%
zMu?wZ>aYF(Q}VAK|E(tM|6B9lO8$3EeGeOV1y^UFOHY}9J(+)Y`|pMStSH5IJM(|@
z#6R5pHy7};44xF<|2#7pyyGud-XIWrwW^}rQ(uhjcetMV<Mo}bP)t=wB(p{$2PT=V
zBJ_P|Y^W}!5_%i~JvuAJ(m{LG8z6&pxQ*}pmdE=Uj&(FuaF2wpL|<-8=dIjRXf#N$
zM+%Gy76kcSv|5_Gx(v{|Yq@JBUCbMa*-g*StzQn*-&}0F?s{m&!#)%g6lBCv@*V4E
z-}&CrF_WKWf;cnYOtwmVhg1m#tF+;U>GeD^bm-?T5-~@f`B+<9%RcE<3XA#yE@$WF
zrpf<#r5ZHNx!l$dXT>0cgt@ciN8+v8eHxsstE;29PSqE}M<Y^Tn!2N_n+lbJ7LQmk
z$lOvvG%QCBSUe2~RhdrCpMPFCV#=513ijqCfpFi3PJmNbrOQ6!h93zZD{-akR{k1~
zCT^Y+|EZ1148=46KNZ>|8kd686-MG|w)1f6nIPlg%C|)np>3ipux$o|t5kam{O9_i
z@0NMr0xd!XFnf9*>S(?ie-l@>iir#4J%wTpae`+Xm8x8oqN3b`r>wd!HWWA}n@zIE
z?1$x-F6J3tMeL?!)YYlP?yYh(z#;3kt(=tJd@132CKV~^BU)s}Gfb~CTi<3liUj&G
zWpdQP+4**_voDt~Y^qidy`4u|Tt3eH@<d5ZFRkkq8vj1#OOlu!DAdY;w*(p?^czR&
z18Od6`+SyX>OHC~+A%-rBhzLAcALNSc3v~4P6SWS2|P3~z?`+h!^1l+X&%J!0;g-!
zr2m<}R9hMs<`6fsa)Og4$6;f;i?S*2Z;q#red1FQ5qZsQ+TsS&Dz7tH;-h{0L86<?
zu<)ZO7k5{BwcS&{@obgp(C@lD4AMzUD>`#e>Yc_Ts#-Tt%xo;`{m9i-<i7jBno4zs
zr_uCQ$ZFPUG-;~g6QNm;LFs}lbjz%|iptxq@<uJXfIk8bGj)}&&7+ytoeABAZ)7-+
zHpi0<&4b3hU&vle4Jw+N3;OK9RW&thOtp-t=_EW=WNt1!RJFC!O<d}WO5^POR+TOI
zf)NS{W-)fyl?bo%ln=ts*(*g->ntqN&n@V-P&^kCH#|yF*p@yNxfC6UG@8V*^Vcb`
z?_AWL20u3ZO22(c=89GuF1kdmwpWM4Xye6s3AaR&eD%%x#%24gX}=Jfo#n3}8<6tn
z!*7C_vF;M3NO)~_ebmf;HvQRw;v5xUtpCJ&zby<)FyuP$>~K_@tB3c6EF;s~a8^tA
zk|xSDp5a`5S{4mQVZ-iHN7Hwoh3h>JOW?5Mkfc+3S+2}Z*Zwow3Wq^XBV6(xd~U(V
zvCQH%xp0YKoq^pPuA1ri!)jjfi=Nz8r$L0}bn1SJACxo6AJMd{O_OGL(w98ULytFU
z=67FnbaOF=K27-h<;8Amx`6eMuJ(w#L7Lx>wkCS3Y<i!q54_WD4G#J}U4x9L5|Bq2
zR`Bk&-n29w3`n|<YKr~d4mkdkm~Q5;`gAw0X}^c7>c#ToS%S;GH|o(M6J;jFy;nPp
zyPw4-YF*7A2;0AnK8caNl-pIfxxQLmej}Uq`1Ql?)4gSd@Mh27N!(^lFqw-#LgI+>
zcXtRMb~)G1vii&i)i#~2Wmh?lbJhdtYRkpW=xSevfP(j*Nd{smbm&|N&cJky(`r{D
z(+EPJt6k<~b6kC$R?H>mnVns4^`Hz=yv(Tj@tp56p>uj>CI?^ZWz|5fP4E2&B91AS
zJ3g(W7c}lM^_7eyD#x!qiNA<Z%A7;Ru+-V(TElc{g((un;0-9JFqb>VuPC0^gua&=
zf2ug==5T#o)bOB$Q2iwZUXw0+R&19^X7b+Cmg{q;v!yt`LrUsSA&WK;?ZkAGU$sWA
zl+hQLS<cx8uhITa7WK5QyqinApvjk-@5Lj%NM5b=XFD}gng>3SIa?v`9vn=6=0$gN
zKGAyrTcmrj);rFN<8AVnWLbXpoYx0=H)CfB^s?o>QS2R^Tow0aT`b8qv&CF<2gWPR
zWyJ%IOE0%wLz016>H=OV?v2P`SY2K1?n&i3lCl2fRME_ObJ{7(EGA~?(zN%OrzPZa
znI5|!Hq!dr3j{`t|Jm0leE+ktPkPf_&1+dshvz^e_~24jV?vG8@KDze0jTEw`ASnO
zeK%>i`~koD6=t;h8JnmIyf;nPQ`}eUr2)L(w_CPO!1p84q^0}X!1zN+K(#{3-Qifn
zRp&=2@#lUN;t{0WOwdWgj%W$bjeH+!b2ndJbV=~}XkJfuGTUmRGTrcARw7df`suIF
z4orj6Cpjh58eYLK!DLcJ@$m%Pulh5Elq<f;>hVfJe5FfVdr~-zS9Y2Xw9H%X(g*59
z6VYy(5Q$*PeSg8s%Iat-9d!P=jXeBr3^YVdEtW<m5EinaDj(S3v&*Zhs@h<dBK=}X
zkv7JExB29A%*(6D&?q&MCg3Z;SELHR>LAyS>=|&Th=;=3V|_zXdpb(^pqVTwhSAai
zr&XP)mVP$gIYsPU!nk$=IUHVFKU1$RPPR_R4+do`r1P5tPBur35%geYVQL0@Hm#f?
zx@fac*EO#5W^oj0m4sn|hdA=3Zza6{loYS!arpcmDGGn1S~4%|wK>)uBCsL_#tX*|
z6O<>w>MK0MvjkSQprcgCT4babdTqf-Zi7TvSw5Krmky#g&Prln>G)+JC9ZzG9Q;cG
z1%1O1Egq>ZvSrE_b=K(>YHFID#=-g+EFCQ}#vkMMN!?LdJS(p(Vw+{z(6CJ3Z$qGi
zKc*)q-a-ye;ucek^`z&CbWNl8_DCg5NBI!V=15W8wN>GRNK2CIeqlW#7<6dCK@L15
z`4UEEWpa(H$)0k7G`~^{5TEqEzVw?%<0VfJ)bjVf|5(v_-N5T{ie4Nk)~2VW7t++2
zWO#h1U0#DoKtfn#QQFdcI8x#2k*KfLBQs_u3tL&pk4G*Y)ul-eg2v9v4Y8__QVYwR
z@hP#j&AB!%4AwZTCwLKygnK?$G2eeIA^8V3pZ|O|u8@&`zRw-LqXr+sdbLQ1>-?BP
z><jGcBc$EQwd&FqOG%j;29^@q(T{45UvycPN3BE(8P66DBev2+Yk4CDUXVb1#ZLDN
z*74<>gzu8}%9E3Z`2;SOkzwwjOIps>sA<_<e|;$<vb|W}9xjY=xqp4N8<H+$H()>L
z@;#Qq_#T@^#zNk>J6-O*O#$3@cc`?Z!4)`|<dfFviHQuS&nHoG>y1Z0O@b;}g$YSV
z<*Sd+w<;+A;FBGbe^O0ml}L!1r1^5QWqvcV)i3Lb2eGlS`TdbOI<C#y25|~TME&~S
z(XPP4SC*Ue#2h4@!!QI5GD2;KpBE|5xp7n;eRIswx9;widEcwI*79L}T=sb{()%^U
zweC<Qj&$Vd$ZE&<ehS|8TmFikZ(mqPRNmHdG6&W#20>9IZ{*+5w0w{bI38Or=9j^j
zc0;EOF`cd?Yj1uN%}vdGcpunh$HQENYlkH5{Bbp9QsQ7#U~&vsCIeI)^ZR6wwEtQJ
z<dGDYZwv|DA-o{-VFpB(_3TZ$d^5Ud!LRx1_}BE7{3Stq0CNXggMeVUjGv%GR>bM2
zhR@RlUy>VnJFwm=Bs8orOh)yUG_j=HQ(WWC1EHR03mXqsjaIqj)TvP)H0~ti8mw9_
zY*fvqhAh~>A}6<s`c0}J#Xb^gYw-G^NZ=k1m!xn7i7eh)rO{NR@!d+O-^T}b`|?ur
z{#!iTv~uyJwfKElyQFmV9o?Mmy^5n#^Nsj@>mlpV1yNo@DNIt_``#w=S=EQm^{C4r
zj>%d>dezr!50cz2-mp9o!QP(DI*84g7crmBs=iY5<H$^!+?Vlk8esb3(w|v<LFngk
zL)P7Mrj<UyTAxbbB>I%jX%CuOC!$RMH0AP}FZWB_rtihM{%R6FJ2WiH1K$XgAXe>o
z`Z%?TP$P0^GUW>v0);jZjFk+8fp@<G3&65!3XtbR%_B6pJ}F?8{2uar3;i>_J}l-i
zghFVzzSjWDn@BK13Iop|Rrb3Sl&nMo%ns9EhwrQWFJs94T221MTOeu!At`jJ!3l8E
zvUx<Z!vy4vvymJ-5Y|)f+x#kza9>$*5Km3!iZaYwf*lQ`aa2RWJ=xG4f4GjCJC8%k
z#~nxeDHs{KyzG_8hnSj^g%?x%vnTE=9S%X}6GiIjN3<7f0&J^6{M>oKfH%q7Mxp3W
zX3beGmCa9@8%A36^}6k8E)7ca>C#A%5z5syDvP|=k&$&|K7EF!IZ}eaocCEnsb}^&
zOq$q0#@4$0!&UdVg|QZmGBMFK+kH+Ii3w%d>W;I_ui{=`CbHPxy@m4-j1bHyN<P)&
z-_`ru30GA?gK}4J!9wvPy)6}<xV8617QZvb$890GY-7bHlD|`?W?Fd%l5ded6Q*0>
zLxe3vhHxZlb$+XMvzCnkj7_-t^S#omeV$Is%nXXGFlS@okFeCX9~3sKAinB0tc#3-
zbPx@rJt5tfm$r<;U7SXE2HpeW<K;~yc`~nTA$p#qZR+~{l2})7Xm+`Tcdrl3cRhm-
zH--fRj-MBQA8JV=5B=Gu8h#9oC{40SMi=-Wmil=<cbuIz@P->k;c~<4bXx5h6`H|c
zn=~K9#I1KMYYHvST~Xro1JLnsZKR2e`>EfIffo+c2~G9fp7?eM{;)3lXx@&rrOX8b
z3OCbLmQcgG<tS2{OjgaT4|(HeX*N}*2)Q=<*TZzkLOf2GL1sO#KhBKXH^TEW;n8Ak
zV*erK1e!zu``N$2H=~@hjqst)imcTf1VC16&D~v98URZLA5HGB_S!78g`Jy5vhoG%
z-{KNrdrM<bi0;}PNA|O7skSMHhOa8LKM29}9j8>puH-&&f!=KUTKAVcDLf1yWz){(
zM(3af4PV~txQpxh{0G-AsY=jd6y?hM7&<axp}nkghtZD|PA<GK6topau`8}fgXP+7
z$ruL3OcN+=(|{*vVcL^1b`cHQcPFuYhdiHaG73;9XVW@tCMIz;4qnT&JM?c#eTYjp
zn!=$M_{Fz~a!&MhdhI!zuLVxia{qvD-jX_B^Ga*x0dqd?(6^;1k`z!RHXX6q<ip9h
znDh+B2bTMJV!u#Cd_1q2ZES7N=VD$O4htoQQefbvQBag0kk&0HNUjV>?v80n3h!w+
z4&{gC&enSr8?i`w{~0<Uq!v9atIiV8e2jDkXyJPt9hCg=qNt|D<>_8hP7b`ZljIv&
zmZ&r5OX+s3-kzS3gZ^x>iCr>+Xd*gFD=S}XA#&W5G!QoOb4LNQ>`s9gZbi8AbG+_S
zWsAU{rAA4~$xIP<2uGv?{QUeRU<uBw72OqvB_ZFU2}i{mkN-^R-RCiWmPsrc=KUjg
zbc5C6%r~<>PBw97<{&98jrGl}Ph-X&>G11VW%~F~f1D3==om2(<s|-rI|__LrKJNe
zf)gQeu~Jmr5_Z?_;(q%d#t^COH(oyTWS!1a>NsIv`Dm;NiwASk{W(-w2<pSZ1Q_6T
z^<+2aqT=H8ACZ2Ap`g!qvLd#aGLoN7F>7e4J(U(6_v*9ywL_0t_M|O7Mg^03ffU1@
zaHll%?-x*HvDh6#MeG3phN+YqL+>5wXEwcF0GnpkVFl+43_Y|b`U)O`Ac5AJ%Kezc
zbKfxq9PA%i%cfOKm+SzDmv~Pdk(y8M;HXbE@pqB?07iEmRo7EKYa~M+%?B6P+_6eE
zlU2%>Gw9Yu=_Wg=BW(?>2pW%RM`~gD)c)H)wv*-{M`{=QF<Q(>_xc1dpgV+<vy)vZ
zMt|$9(!Xn79_&W%pDvUoJT{F*Sf!R09u@Cw3}5cOxmsLKO81c)qK^E<nsKXE<a6Ud
z4pTBRAT>@CNgsb7)xgf2v@K}mu<;*Q!fLe&#xxN{c_5sV?U8Y66D<5C!CNgLB@OCz
zbjcN&NmAXw%Vhcxq0ADambQ!vf3Uz2daiHYF6btGYp19JdcxAQ#05JTL}a|BGsu^7
zz$5y+`nQcoEEeLW?GEohv)zgy`w(b5CozIM85j{92kcCiwa%ICP(NnYjwd2EljZQC
z(T*z9;e&S{B`vt`=-J0ax|;gjK4IO)o}58`!O=Er4hC3V`d!z@?M!Y0-`#~lSdgYl
ztl3hkrf7~dg(7<!idfuQ3bwW_#G^Ml>WL^$R@f=#+WNXv*w?M!dyh;4Ulg*)<-c%h
zo2s^}u~_a-Z&&1+Hd5*pd2+wAdyCUOb`f?KEt0_p0ryC03hp~1%(R-Wu+gQ8aixg4
zGw-dJzNSiA)3K=){Ska@Sz-5(T+numuVCJ=SEZP*+{AS;o5~qkSd8N^TO*87B!yqo
zQCjaL64UQviw|?(p}e7@Gg4}Q#ka1o;zc3805y;yM&{>3$;ikU`8e?0!|&FCS*!4v
zzpjpuEC2>&e+^J5oz^zN{Q^X=){Ha}Zy4QuBmFB6^IYXFV7v`srGaz?D@y!qx6i>B
z*nL+CeSWH8GFwD|uzT+aXZ<JlKYsYn`|yA7yMUGwW}{fsc}<gkj~1)Xw*(cL)VfH7
zczb_oI^RUPUu@U*9!;26OsuY~bmfS9tn78trvn;aBv1N-o;;|FOL<?mn08fF)k?=J
z@{zh1)($^QGcQ-zWD@~cmU2Ucigsr}_i$BoebOtAO$`FHv~Hf-8QtfmO6Kg8#7O_6
z&HX96yzX#p{J_pumsyESNuP3VlP`U>JM%Z!wcJKkijEWI+a`w7nVQ+6xH1|8xPRuF
zP3{oWao5%9>FFI2Yr)|;f0Z-81KUmtG+g|#ePd`8K4nh~eK5Q78@i*Qfp?O2jZ#$p
zFJyYZfBV`FZ8j{0g&Dp3Sz%sLJRf+_KQ6*ZQfk)huUg|MyJ7p}Nn%Gw$LW4#cBZgH
z5<FnLW&{|zn^C<q0R}2^LK4t19mWx<d?%~D=|w2iP;GqXNG{uCq=cb&k3yzKB6*t+
z*?NAdZpnd>ffqRKAVL@H@}h30P?=cV`%lK7scPl)!*N4%Re%46Ka-UTLx0+^8vxM{
zaQ>UQ;Ef>$zthDSFON#|*5LhNW%{$@g;8zUR8pqLDxC?mHTaD_yJpSKfVNuYwPj$`
z5?D__^9Yr3vL>{qp$I<S{>8>+Se~-@Erybui)#69k!^ogLype6!%A1;J|Nfi0D@PM
z&+eSyvn~>&X8)Qm_}=ATQ^l-*5cutPvjOae*L|T4!}R`5Do<GJ<tm>$pcQS>Up4MD
zsJEOh;hSSqY&ROZgky_zMzz@XKMdQd54!Mf$9{eK^T%syulSXf?&R~YKln}oApH5|
z`?Ijg386u$!uJd}t|1pD4pUV{f#~+Tf;K((RMpi-f9<s11b26J4ZRQyWLPK@m}0UB
zhPlm!7wN3yijv%eUrPGyq~MaXssP0I*;-#_!y}{zg{t4n7X?P=U-9`=n*EQ$w;xU@
zLqY4O+qLsQ^G@ah2JON~h;pL7$5C#f2{M@UJ9f?Laqow303I6-kFtfN?Zw5JJ8~C_
zPkwPW;gOjSz9_rT?`wmNjcpuCf>v6fETE*OMq0Du%$xu)Gbt%aSO*+NPEPLCgguu|
zD%hNOqoxFsrBmtd?v~q@f5&DG*0u)#sURSM{+@4beg5l<rfZdiVPeW%Z9-Yy+Btt@
zM`vfY<D(k6g@yKrb7gwjOLUHg|KYH*mmQS^Y)I91DV1Um@TmZITPTR3#H9&xxy1Mr
z+}<-dcp`EagA6xJjyy$~zy=VKjSqpR$<lh(@4Av3uro}_J3WAdCzMKy0WVc~M7jN|
zwwC+Rj9>T@TicJ<VeL&0kFDl7m2~O+*)w~hK^^m)(SR)D+TF|7TDqKqi;LURL!w@8
zKi}+rfN~on;r1+IeEF+6z=v=tn%afrkSh4<Xre*<W$IclW>Lt=tWOX<K^Sy%roOuA
z=K3Ps_s6Xi4Xg_jfQ%!|laWIjI@A`?{+*gTN>aQ1&*j8L9<qvku=V*sdTv{~c`!%o
z&DE|AKoBLOUwv#0LEQFB!CjYbPhYs+jbkuTZt7J{tVXmazd7_i!iBEoc-l#V<c%#u
zRzwUjeOgnK)V3e3xVz$sRDpxvTHgbDy-Q5jN!0sEiTTF^iW(3W7Ny|5IP(q2nVz<E
zku;BQJ5C!A3pohKmmKqp{ZP>6vHH15W%F4sJq{!-{!!ssz8=B6CUZ{6;Y!HmUgx=F
zOhRSs=`5FFyL=!nAOz-+49d&LV>w&<nv)1IYYaC&1!4oVmk|hAbQ_k$b=Zz47{j%3
zTXa_8<-!GD$eFrx%wKj=&TVB9cb{j!Y+d6wZvOJ}@8Z0l(w{dzefOi1^e!bTur7s{
z97IkJMWX4G$m(c(%hgQGe!qEn{~A1$olsYBX3-`pQHP!li-}szc5N~8NrPPKlC}m2
zaK1GKi_ywW{46uMpwDAFIHjm_TMWO?cS9R$i2c6$;j>r<GIZNRVfzJgxeyb!1FGmS
z3z^Nw2$j+t8bfvybcY*OP7FYrP7`M5SttGW2dzcu|G=ks1`!E8sPY0+!_#XZh+!BK
z(uZO?Fg@68v>PatMY<C<WaFs|VKZa(%=3<wNuIKFQt^GPVgTi`w%jZ2uvq7S1y{>V
z)>oP2a-{3ofiD9loyHORrKs4$S*{6I%gVyFzk$F<%+PjsoVRNL;n^Y0x2W&T5&=le
ze{%ohhyT0}|Hr<Ip>PUva;DRJ_wLmhda#sy0w|{k26b{*&)bDDUJNtC#AN(us|Tp1
zr6p!IHn#nw0?0Z5e6Zn|<VM(Ji|!6M=!V!F0|-}MjDEGPCIFaVD=bQKT4(@JL?2i6
zEq?vR$fXdWCkeh~&pdDS1&Hx;zkPB3#mHBNw+_CG4z<8$EoDPOIpGPBpbDf4yJ@%e
zcTQGG$;PgGVaH2*%blwL0{aV7$4U}ylDk$a9Q9~!5}A}&fc-fsC50IX2ow8X4i6v@
z?=JSG=zt-Q5_TdoEZ)PYawL7UhP*r2WM$2H&0A>vUZ)D%)i{oO>Q%VRHiT<$PuE1m
zriypi+t?)JjiP}eM%g`cSNw{Iv}mWo^!h!*BF)3OFK+R1hEq~05N`;GF_#x7(%65l
zij5>ZfHSmhaqe?5&>&&R0(8;$7!E0nD!jp$;%eHV6R9FXh$IopazF_#2?Z2z3iJoJ
zbU=(L#nnNT*1PclA~!a(#e;8E)7s>LVtPoae;n2*VhDvuCS^uf6LP^eup52%3U)*~
z?)Ba)bA#2t1FJx2Fh-fE0K5~hCO|kbMX8H|Xi>#rhkb?ibaW`nz1R4wP~8VFfZxf6
zm=POv>Tu2+-&gz0-Dzp591oMr2R0m?`xie1Z)G6}JI0I{4hBApv0TK?#|J8vcs=RV
zKta!2(B~hK`Qa2!958!KdDQ0EC-T08E!F%!oImre=JVf-ZLzEJ)zm@n+3dAZkNk#0
z@6oNLzkRFYK%67#k_U1D-J%a0U|$(QSt|Sn0LV<p&DAkJfwj2*p?&?{4{94gb+mMM
z_t0kp^*<qghJ%onljfe8bULz6MG$dMzai#5iy)R^2M*w*m76whT5J?3#q|*M0zxyG
zo|O#62<i_zPMQ8z#TmbakO>=<y@B82XnacElmuGIO)Mhsy~+0i4kOI<04OQaE7tPv
zb0A*@b4!=9+mVgO<mKd)z6k+NX2=j-N1PAAX@qR!UB145AO^(kt+WxeGJ$mfK^nBX
z_(AR3H5hX3(JbXWEj-oWh2%DGf!`sbVed`jIarOb6Z6`9`g^vqmf(S);^o$f&636#
z5DihfV$q?20_^OAcAku2(7C4{fLE|FUL^Bt*^ZSwsR}r8$&~V|YBK@wSb98-xbDdg
zgnmCy!mB4^;|w^Cv0>BEE+{DY0pN6)dw_nO&NmNGt=r=cf|g&ww6PiD9v@w)?Nr)G
z@+}^a<(%X60Ws%X-z8k5YTMTYbW*T6zjfMX=YzHWX$ARsB*02WT0=s%rJbj$lqyar
zNS=KJqI&-57mkhy7nhGkMQ85v>~@2>JXm)KhF15V%*qJo>@h*x_aoY;xWN1)RA%H^
z&&!N!lFWg)zxyfL@@m6=Wdp!`#HpE`)<y3=^z~`Xo8F^()TIcVLSly*Jgw6rw+9$y
zJhhnC$z&<Ke#EB}E6as-8=y{uR;LlF8><4{!gu=xKfW{+NDQULl<Tyd;)oYb&1(ZZ
z;>E|Xq;B631h5W?k7ED@lV(K%+IzUK9&ps)2qfDl<~j!l?23u$1Q0+_Th+iIjoY;0
zsTkYn=xC4yB%E6G`CB0P>1I*&2G5R>1xn1NtNSF0ShI0GH$bbi<TkcWf_g>Hh8Kxv
z{S1KTMdo#q_Ct`_?DX_>Hk`NF0s+L*hi{3Rh-oFBesP`WWqKUX{@7&_W$B-zIhZT`
zJ$_f7??Z_8vjz7`%sP^Bu-n0bgVKVU`LX^zw<+yhDULFe+62c(!~W<ELPb~ez`&-{
z0Oe~b{)Z1Ld7CWR`4@l2&dk6C6qqq<t>Ki>$_sM>P3VYM;7eRcUntRoxMI<jeASmS
z8&=^q!HaGI31_Q^d~Xl*vq6gB2uTGNVaf;=sYRv?So@s`Lw*JV1J()UyBHm^udiV=
zdmO^JCnnE_c2|14yDO(V{-Ia%g3-KBoAjksrp-0$*SE05<QIo(;@3z2#@<3r!1?0#
z<8l$0<e%}vkAfHOa4W2$7eO*y61NMI&QEZ@$WV@jCA+<T{5fTzOVMNjrz>?Gmc2He
zY%qMja{g960N!eLAD*F{-rLoOBnc#Zhn9ci-H&S2=0pX(hIN&$uI{u$tNIbnTsa&?
zT&DIo40xHzKlALh3(bk62V?KuD&#5AAb$)}e|c>o89=5cVl|*@3XItlhwnJCBV0DS
z5mm*doRQG?NNPPB`_!nd+XXCt3`~LycYAL)ZABHq;TpS{8vGDnroCZW_%gz{SS%yw
zA1CKxz^urR3pebRqq#}is6L`kYm1<oJ#EK&MUCE-MIeX?EP0vGH1~oZ2-^j`8-F#N
z`=Vce=~|=Cf&UN|v)M6((>R-IP%I(8e(&EEb|D3HCooq(Pg*VDCvt5uz;R)(HQsR5
c{PYHETC?)hsU?u+_86+Fl9pn*yhZqb0s0KnkpKVy

literal 0
HcmV?d00001

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.gif
deleted file mode 100644
index 5f82d060fe9d60baa757ec1ad6f28b31e4548481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1918
zcmV-^2Z8uUNk%w1VYdP90HFW?0002Mz`+0i{{R30A^8LW00062EC2ui0Jj0|00091
zgpaAq?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_qb}Z!j&iDQg3<`(DqVb4KDwoWr
z^9hYgr_lxVip^@b+^+Wv4kxXGfccD0tJmzd`wfrF=k&V$j?e4&{J#GWsMnAaSZH{N
zn5ekO*y#8uH&_NqS!sERnW?!c$Uw*m8Y((UT3RY;nyR|W+Um-N`YJn1TWbp#d#k(4
z+dG@<8!S9b{0Ll(oUFVY={d;^9W7maJZ*iA&03w!-R*6;{VhID{ulmcuy;_--tK$u
zmfi{AUT^>FY)2okpC=#J@1DScjo_*I$FI|zfCL*l#FcMhK!$Y?qI-xjqq_cx&Cu*q
za0aADiU>j`(1<c6I*tG*nql}c&BU1_L#n)qQzlC|2xEGDDYK?Yp$T&uRcTP?$)Yxy
z0v&2nq|>8R9VR7O6z0>WFKNQ63fAh*l|T6{HCqyE&wgyfx^;II>QkvwyQ*!w^{w7-
zaqTvxm{%#xbxQXd<~#Nd;HifjBTcODtK-R!$@E#gn6hSpeK&jF+xfF-u%Snr&RP1j
zYLuy0yB2Htwd|^`XWMR9`?hXzxp(`{*88_`X~BmZS0?F(^5x8%JAV!xfPm=Kt6RU0
zJv)Nw+Pi!I4nDkx<K*uxD32a@-Sq6coo^4H+xz(Rr_HaAf7$)~{QimUH!21jVjv;l
zfCPs1Uru2xW?&HvHb{g;M<s~Uf(1et#Df@SnAuGf-lT&fgsJffC?lp(Vkjq4^`S~3
zCbHrgDQ*&@88dQHBWmjbcw-<r_K3-k&!{M&Q7xwQA|gVHvg9Z^;&dcRNk+y~kpTdC
zNt09_@}!45Du^XdEj`Gjm0`vMqm@v8S>c&z9W-WvRdxswnJbM*=SF$5#wLhi{-af3
zBiY#oTP`uSqEE1xIpi9c4SJA8YIe1!Mp0@sWu#nfm6?{3nN=1^k_rmx8fQKlRiuO6
z>DHwgWm*<diaN?@p(LdWs9fuGTI-^Pa+Rx2e$iTKMy_H6{_Cd0cKN2Mjbg>Au4myz
zten1nYG|raJ;`iJ$3B#-pny)=EQ!y`1+27bF~uvPnqsT&pxlz{ZJ#b;De7PG^hzt7
zoKhPUsgzpVFTBH+OK-Wf*^A_#0JCeWyN;rpt-ueLYVJi7|LZTPbGFK`ly1i8RbkG4
zESRdnGNx_Dcdo2(%xJX>@>x`ci}9vKdb+5n5>BgZ&S;Fh?o5OEOf!NZW9p`!1aDdA
z(<UZt>C&$@J&)9M6uULQL~{Mmw+`X#2hUp@Vm6Ib8*4SPSo`C(+7jcqHb!DMMD}HI
zYmzqKb%)(HxNqapcb0q0UGus(53bnZK{}pEw|v_Ee3T9<6zCl0&m}JT)!d<=Idh>m
z$NArQe-65-o2w38>0tK<dn<RxPP-|y*N*$wis#O|E4TL!d?mjJPkcdv7mvIn!za(Y
zkH<F;eId(7Pd(w!SC2j1lxNSq^w)O}{+zpqPyRgPmydo$->0Ac^z4K0{`=g=FF*G5
z*H8WZ_(QM%{>=C9KjZ;0fW#Xh0fA@01M)6`3d9`)8%VncLJ)QmoFIQHXhHm7FoX2j
zAP3>&!4I-0gd#)_2}?+x6Qa;KDqNv(TIfRGz%YionIR2rW5XNDCWkt74G(*$njZqu
zG(sGrXo_e=&mb|0npq+fC*#B?HYSQvGz|U~tEiVNV$pS5ES?s-xUlVkv36e^qmkBU
z#uTD4jVxRv8(-+gH_9-Ma;za8>xjcU;&F$1+@lZs=*J)eGLS?ZBq5Jz$U`bIk&0|0
zBO3|DM?!LnlANR!D{09rVltCl<fI8V>B%sjFO+i>BPn-N##4?Xm8wLHDO))kR>D#~
zpqypBUTMqK$TFAK*d;HCQ_Eih4wu42Br%J*$YUbYk;+_VB%A3>N<uT5mz*XwHEGRj
zc2b+h93?j$<I8WpBbeeOM>xy5i*us$7V2DQE!yc$d}K48mGLG$Nkh(iVgsJ~)J8u0
zX`g=rG#dOIsO<!5Q2ih@p~)yHL;lM&&xdkmp%NX2Ln|sbdt%gX6y0bqF6vRkMKq-4
z04Yf+VbYTtqoXQ)Creu@PmRK~9x0uvh+b+_+2J&&tLWeBn8eeF$rNg|_^C&ITBWlQ
zj;KN1R-)G8F}nn+Wv1NKw4j;}y8NtjE#1$FvPzSw4vbP(vTD(=N)N3ft*OKsrJ)pM
zRbWx8thd5e(E`S<i?P+Kc$(`+{Cd`&;dNW+3d~i5w%7FpmSa(UYhMK$E5aVku#06`
zQ|Gg?%>Grb1%vEV{Ms>6!HlhBeJo@1x~#%Z_FbRl>|j|2R-<kdv!G?HW;=VW)}B^b
zfQc<>1@qLj3iqptN*T0dR@PVHMipbbo7Hclv@_ZM)^{O`?sSn;-QG&~x;@<~cj-3L
z?>5xC;*A`6%PZ2MqL-lOT`x+-1K;?{cfRzkuYK=}-~8%#zx?g5fBy^M01J4)DJTE{
EJ7XHfG5`Po

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.png b/src/java.desktop/share/classes/java/awt/doc-files/FlowLayout-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa4dcba153ee8ddabde72b7b47cdacb11716f32d
GIT binary patch
literal 6030
zcma)AcUV)~vIhl01nJo5Jwym1ozP3@y@sNcfI&%+B9S5jD!mhWlP(<rY0{M{y-Baq
zA(YVD3+LW@?)l#P=k4!Xd)A(r-^`v_Ywb0A1!`+T$VeWN;NjtssVFPx;^-N!$rIng
z-Ju)K4LE}DtP7FDEAFLV!#!BRj8$wkH1K$EePTR(e>fh&wF<61#5FuTf~Ze;L^w)?
zYuf4fcsFqr|5~1Y<8RHg^qYV8<#BR6Sv`3b6&%&Gc7nkW&M%NI_`i8GaljF{zOjq3
zhPt>l(t*#?25AN3LpeBJL-4>Taa`8{=3>c=a(IPs7Dq|4{-q&~>tC}$tjvF@xV)5P
zHP+B(mPb0ln1%WH`S@9-NSK+K!A>@|;<^e-|Ayn9Bw1g$xHyV~KyGesd~Q$qkWO}>
zCt_k^AbtUmfB-K}gV*^j!o?EBi*RQ9my!S2QGhvHJHZ`Y;7A1XwOvaqq^pZ0E9<qR
zzpsD2CkzGuuP21_zr(@>2)dSlp78O5{<e*Sg0H#a+He%?m5Bn}0hb<}4=G_0@L%fx
zNAO>V{{R~Q7bqa~<e$iYNd7m{z!~Nwk95F!bdmb+!2BEhPvO6TV9<5o|478Yviuhp
zmu4vvFzD|glOl=5YU1V=&54SFtUd~VE9JJM{?F0&z7GU)tRL8!2|j#ivL=d?)6u6P
zWQ2C;aTC7&e2!(wSZMt^vtKjk`^Tco8K8)NVn(S(F+51bUH$%jdH`!j12w@7%TCpf
zvBpoS$ar;Ign(PruPpMZsUl2`*X2;|8FsC~3rzLCtE&s#9>%ayfFRpLfmibO->i$8
zIDEm6npC6150>d+ag?b)%^MsFRn_v=ZBP5z-VV}UfnA#H9Y5m+0M<&1FCY#nBdwQJ
zTQ!PJtlGhp+Nzq{qxlZ6<m6hwvxRL5)KKT_RjvFBvq}?1k*44Eip)V2={|<0T-f6*
zDUU~36q~=mqz?A1r)Jue;PH)t(D#EY-oSdL@vBgF=!O9qzs&S8(k0l|8A(}6Oduzd
zaOiEod0`f=>-6hrghyvZ=Ju9Q@Owq(bxPyRn0jE)j27S=z;KdxuZQG04w3Bp-hTS5
z9iZ5_5L0mYgY`LOfEYo)Grfysin5`hF6)W2t?K;wmFjMe#%bi~_;}QBOi7d=DgZ@A
zm0Y@;1CX$IeB!Mh>#M<}vg<RewWGGhN>*Ni&I+pv<SK3uDT?-6SmfAi%W+$3-Ey`$
zXqLvZnJ2l#SQZg==WQlsy)*l>x3ZL?ImDfQlM@zivo%rq6}4-%HvA<TyFD%Oyf)uL
z5F;r@uV)~9So2#ZJvX<y8dV;}0gMN?A8nzhyhEcEDv>c!th)zV+zVw3R$|F<Tpu-(
zR3@H+RFfwpJ}(m1!LGiuL>br0KNQl8{BTN!wdVM#=yV*hV1yx6!AR>ZJhT<H<f<b%
z>X@Yqjd6h0ab)WR35s@>DDQSlBy%}{9|)YaT%ltFdl+_|B?er_%(+NboL+HhCUX}U
zmBfn7dg|S}OV6DN3FnLBOun;Rua~QduBfPRG_E<_EH<xOnnX6DLqbSvmZH?m{x~EU
z1T@jLjr;WmWhz1jqRAN}hL?Ld8hmusZ*7mXJsGQxJL~gSHc>gbv2|q+b)k_oabhnr
zxs$yb$aCB82BX(6q3x|Sx6l|g-HEitb}}7<;_TWuuqWwTgu>50=RKx&v&ES?3`8~3
z-AzNc3NgKu?A*JH2n_6Cd@I1~xiq`9Nha}TGh%Hhx4Y%zofOIEdNn>WJhq;y{F;Q$
zwrh0tWxDo4&}UL#YDYyS%~g*!BYnlvln47ax^j1Gq8brFhylGA-PXReY)BV7N70v<
z?P<WtMy{$;u7qbQpZD?dvYTu04ETaT`k<N#t)ll6dDbv3@OIzB$*#`yeA{Stt@`yM
zySXK8h_*V7<=S9&RCF}k)?`&2u((=|@B5D2+pCMCKWCW6d(cfaP`$owZ!%zir7up(
z>$GEMz7^IP#j$rdiQL$33Kf~TzbT{(h32PSEhiyu!cVs}r7v7+Hotb;bVRV6N(R&M
z?(Kb~H0-E#-B`kD#9Gw58^l8frLg_-QAtTaYEJe3y+qGlGu#6IgR{n*@Xfw0<N@1a
zdw3ij?=Z#=5JjAYvg<d%#`>N-vmdHYHawL|C*fX}gv;wRw>_9}A<tR`7oeHmb$#b@
z;7)9C_$EAk;P;1y;S*Q9)lBp^PJp!ZvoLzG43V&#12F)-rB-t37~DkZdb^UswJ}x_
zx02><5zA}JSp==5QlB#@FkFLtp%A^A_h-V2jfruYb3;p?`+Pr|@em*X6ZeeIpPVVy
zZRRcH-T5vAm$~3&c||;0I=Xe$PpUp1&3nr3gOTJypZ)Xz+}!;uM0e>U+Cm?xb;t4^
z91LknXaK!$7AmSyLYgG}iZeuLi_YX1&}@7(mV@`cBudlJZkYmZZ%wF-?*{2*?A#`!
z%6_o|qU92QyRtI%j6=e}E0_8M6G>X$anaPSsq(u>b;qM=H;?fu_>hu?`x*yEjHqIr
zn+1Ek7``F3g^R2B49h)}r;~}5gc|eQ;qe_F)*r8REm#7~-d^c9u}jH5YQDs7j_X-?
z9T=#ns!|D^^AM3U4#zfsB70=>yVNofvprq+(c$cH3;McG^2iK6oTt+d)|Dk>;|Xr|
zBkD#rUT`KPBsk$@1ZoIOO@NFt%<Y`dKwENmyDT&NuzFP%5=mvYv~vGm+6N<xx7mWP
zerrFIRk?s;X6kDdA^5K?WaD=!NK!Hixq5XvXn}?uyNm6WRt=Y@8+-eG(%s8FN!bpQ
z-=I1N^0JrdQ`{2YJ<qW8V+BT9Njv3seWRGq;ba5m#OQYBl8P$(`#ur2o_=>3{ut}L
zfILWj`)NT=$1lfDMMdZH;jTdp-4#>n$*DazA5BWis5uF(^q=U0_+d%#KIzX9b}|NW
zeMIdVXFb_N!8|j=)jsRNL3`^xx%k!yoy+n*DbuvRL?N}RuNP-WaZ5`!2~X|95MDiA
zDcl`t@Sz;I+VdX)lyWdx#U(Ybv%`_x?l{mGN%+%9!$}p!#RW~80vs34h@HI|`DFj*
zbotm6ggNW$)3DwhDEAgS8C;%nah0^BnLPWD%S+>e<v$F#E&lPEs?07M8T{qbfeb4i
zc`fknhi&=BgHhAd^Yi__F^|k&NyBFTxMA8bjF()|W~NT1JO7fKx`*(-Jjwk=q8$G7
z{nOsrr>ST($19*w@o<qCCYRMIs{LuN=*`i+E?`MVmP)iuTZo<)sO>>J{moAdWde^C
z8GRzUQU#A60@RT_{)ZUy!X4GfYNK>0$Ka=oth-hDud#+vaRv5X2Zg5?4zI#X#}fYH
z><D3+3&}GjIPZh681_azC<+C9HzgqtC5FF@x}kx1GN%4g^v$Mm&GAAoY^674Z?~N(
z7#bj>6h;pa9bo=Go&$7TPOw{lX&Wx^X4~wN+CS~xsfx$Z>(#P({<`^3k6eJEZdXHE
z(rDZV-QJ?Xd*}Gk9s@Z!8lrS#HK%{p4m|DsmEw}*F;y+;F}oua8U((fp0BfAFh}F0
z8=6l#n3}TMm6a%;uL#mb%er5g6szZp<sCoyV%w`IB=Ut*wAKeBAoymrp9OM(X`)Xy
zR~*=(jPGg#E6$$#kxNCCG+shqe0j}zntL1FevwbvbXF|Y!vCs!YggiUpEs_<!jTXk
z($$-Ubr~OLQfr<9WuZ3cF7{3nOa>jBXrr)IpAC}v&T^KJ$;CO{m#=-F*+W$9Ma(qf
zE<DgV-I^2FZ{HgoVhejF(@$Jg;UKmNGqx(bS+mR`n5%8ZCi&tPH>=@~i=$akn|px3
zlUHxNC>#qnrTTuiioeH8J?7L%Tz!3D+mo!}SA4Tnp)$a5Jo9v=JfVtM6gSoUdc}ZA
zgSf&XuZP$eR?^cL){~^zq)1TswT?Ik2K#@q7ZOzAo!8Zg7Xf%ZI4fcZX3ca9_*s$p
zkh0X)bMvarP%ikrQWH-dFEO2uxbJ&|L-9R%(<i()496WFloAh9;{1(8GED@*Df0$N
zA|ZEzY<k*KqROw*={qENIJn|S!w5yGhr9T{06GU*&An#Ei_z>tAyWeFwx1#8;e_WQ
zq_%{N<sxHjWg^E3UhFeELtwHn+h^!=efL#|?%w*Z?yYY+$KA9+2yLjl83;skN9HEG
zX}$Yv_k$QZjU?r<!y=9Xblt3TIX6Kt@7KXQ9=+E1(t3E!5hHfSy1_ylzadsaiN@^%
z4q)KO*GG!8HC#sbdQT5F3ef6Qtb6hgWeYsC@U0kJt;$()S*mClFBR=8En<>{ew$E{
zzygFasI1XuzFOK}%A``0NS+xv3jS#!12e=4sJlU3GVy4J!yHUikM1T!jb=r%{}_9E
z5;Wn}S*F`5i86j?UZrvQ`@0_K!;2+{*iqxCR>3t5e8rmERW#inLJFnZ+w8yTJ0bv{
z<}Cv;lp;GWo9RPd*ytPyOAo&7amCXEDLq2XS5(wNck}d(JBCW!$a$HZ25$_(WG@{%
z<G0I-S1(0bKqNuu2yOG91J8{Nzzo2;wM^?;w=M*Sq_}OOTl*5@NklYS2awmnbXNzi
ztqfmVXSKY|>RsIsxc=ky<TnTRp7V)g4+BE2c3V%x4CP3iWX|cT%7jZe0p8=3^X)p!
z`f4f->8OmIm-8$k`E8#5&+<e_Go<g`hQo=M;-bERRtttRs~P9TwS4|}X-W3{)sFFh
zC1U1xoP6~}&)Ie#J5fJqBRiRHiJVIysA4xJ9C%3_(3yB>WbTT#kUHy?zzpj+GQK;W
zSC*lo>&u^8tA<JEBtNcj6g3%4Or|qbx+$q{Lq*M3joUKZ4fJjhn|U3K>}`}Zx-*@u
zW`?_D={WoBG<}c?`k~w25%_(Az+lf`zCu~_vNWWHC0F$0ewZ>ic&Y=V)V+NxOrf8p
zi9Hkog(miEKmSQdmy{k|nUe3DyBNzb-$PDY@=0%svxS=S)@rnt)IcTAd0?=TX9a}u
ztpWtH%Vf<iIQaeTK9>9k`Lgf>vCt{RehEoq{v6GwWXE#&%TjEa6Q+|ZZ8#E{tChA*
zmKyj<e^Z|`G9&TF<m+xm!2G=0?2Gx9kK*bPfz)lTH1Va7#;eOZis$`t0V<kPd+m%K
zkDsry&Q_E;nLS9}u3o&$@bixk5o3Q2H}Ab>W-?0ty-`!-$TSmws<d}Q4F^~)`I}wp
zTP42QRaOV{g!?-)3Ob(eT@`)<YXdk{iz$iJ!gTy(VsJ&^hiT3xjz^ZI_u>2s4>+;3
zWk<wum9TC)XEmbLLSiH`gP3WU1STST8(@5CQ|vHRJ>U^6`eLyyG#Zy?i+c)~(EHMP
zq?#X0IK_cEfU+6WDg-aClpC|2t+23e3mJ%gXbYrm&J34YR}8n?^`pQr6p%y@NXLE`
zc}>GeG4XJHq#$l_>ZuXluVb>(;!;xXX#J46PA{I(H(L{(anIfXw4^U8!m``%$jxtw
zQd@Es(spU8^9MB4O1rK(vA!xt{+`7&oM|SVUsis-DldCuVUp}9Xn8_PFRBd`Uj|T`
z?)uEdunGWsi&G^%?1^Z{NGW+^yL|CNE=~`kg<g)vo9Z-*h*Du@00ZIeErPPb%^wiU
zxR*L`eSD*>MFnC~Kj(V~n*}(QXr6>iwWt^YV^R!>px<7Zh?x-c6DJ7LlRpwxFRnj?
zCh%MOdLE1zndMX4@H+-k?-P*fMCvjFl8u!pdNsj4@tgX|F4WiVTkaUxj3!nLd~4sh
z`+z=qX*O$Xv?xiWMr@h!T{tdglbszsVMsV*5qjoGvU%rFAaqW)Nc&JTMO?+n>FYM+
zq&o<bdNR^5^XC1}P4<f2`lA^j(6DgF`!Q!9FgO}S9G@H?{X<FQqZh7x+Z(q_ds~Hn
z^VYExRe8I<O<-W4xN4CeOOFC~t?;MOBGX**BoSosQOp3S;aHASGdWM*S}RFd<5>wW
zYK#PCm(gkNHqC*nBw{+Fx$ao6sF!4M+DtJ(NEXu?6bN?~f<fy~+)gzbq<xXK#^S|~
zHPvDt4=f+~+$6GDAO2GNela9d(duq1t`M&<2?vDV)&d{Y%KQjx-1;_2kjqAC4^IFf
zgYSW2?b5ssV?LYv;o_F8a22y|BONcb^lJ-V{Pjy+Qe8bE`}@L=)_YCJpPs~d-{#D}
zd=_Ctu^(1VIR(EVsNZS10}Xsj)XVYfGw#Pvat@eaEYnB@VMx_%60UsJL}WE*1#@gU
zzjZH$A^NgrC3Rm@yTv6p-I+-(@PUaaT0lSmTZ3_=Z*N$6f|vQ`8_Uxik=A;O`||}&
zWB4asq0vzlxVk%y^r4{gZ2Mr#>rP3j;{-u?)M2PLV%M+#y{w>m^Ui2s{(ShNmRWAE
zS^6p4$wVvaYzN<}Eq%I|Er-(!(#8hw!OzbL2vms9>7%6=@9b3Bla@a<6a#h;GTC0$
z$bNRrXc7Qp=lsaKa8niQFXB@Qc3KLcp`k$m@kRCwDan7$V6oWJhIh`7AYBhyBc4a3
zq-=2`Mdx<BDF!FfUi8$gY=Cw(7CC3oKZjm-hdJpD;U6~3p9~6CMwXBkGu+fSG>m<D
z-eUP7xg&UL-Vl+4ZnDYYAdX93P!NZ11O>>M=rk9uCghvhu{S-}Mz8cd{p4>d+R}&p
z(jy_a<)<-6a<JuRiZa6O2e`3P@^mxT8higzc#HTWM12aPY45qDbm@3|pAQ5AnF)ub
z=Dr-t)nbCc3)m>j*&=7j@-^wFJCN)seH^~4H=mdEXDM@Yex<3+MXY&b#OKi+1*s(k
zi(k){$o*f)uF9YFR+IQY%d>-o+@HTN=GLEBuMVFw7M!EFYakLfza$jZXLxPsGVT{$
zZIj;4gR|7S)q5tV-R`hKCWCVSFo<rk{bDG6N4d+0J8o-aMJko+<Mzftx<KAo&OFg(
zg13>Aq1$&b1qGrH3k!m{?uttdzY#>g*vc{gYB`A*uXc@N%un}jIYzau!MRQ=<_#v4
zViU*X0_P$oFYJm_@B6r+TgLgyvn!C%pBo&IYpM;aFLeT&(i&J7XJ}@O*_LeX2U+rd
zpYhDu%t>}7gy`{^H9aNAttiJ>%ZK(zns;a0_0akK{X1r+KJ3GF1&dPV=&Y<y6HADc
zfnNrSA}1^Utw6QL;Ls-)^gd;BqJ(Q-=Zb7w0e^Bb9wl2bK-hBCPzc%aMjdtFpH9n>
zSTa**>^iT1IGr+_ly=xXKV4WAkyrQFyR$1|c`Yo2alcM<CUeRY+?+a}X3TavN~2pV
zyUC_l7M9uELkMmRH6nDVvC;>?+D%~ehJ|w(anZsxK?{=g6tR(-YA07>e<G=f2m`XH
z6nJJULrZ=RjDs=`%y`>}wD5)d#@U3?xT7|TP-5;od5sYGcZf!=SrNf1eW=`T@bwWI
z3#D;E1JNo~t~x3k1G^$lnBpuYHYUiR!q1*PN?)09&R7Qa8R&u;&{4nDuK~>zsMD->
z!DAZvi6=zE)LMidT{Gp^2oj%M&GpJ&ml`<#dUxSve&<zq?aQ+rorAiGUr>VY#DxYq
zXT~ELX$vS&?k2m@ZOL`N&<1;YRD|w%>bkCJ<!*wh&8-w#>%Wc?(G+vt`K|Voh1fSW
miDNr8P*cpy)78tVOLFQ+mVB;{AwAb;*(!>f3dM5Ieg6l=OnQ<4

literal 0
HcmV?d00001

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.gif
deleted file mode 100644
index b9117973103650aa7cbfe7c01392c50ee404df5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2608
zcmeIxi8~XF1Hf^*h!QHAx3)JW*$Cw|SM^GmTUzcd6V0_5vD_)c%n`3E=Zww7>~&wc
zMhr7o%1v*1U72!A*?v!d$M60A37_Zr8k-ntX`?O*hY0No{fa;!ba!_P{_8)1|33lc
zUkChpK}eJ@bX4>_tfGJwC3+g{+*3j6jFr4(nhUEe?24BV@tE$ZEMmX>-GFp{LQ1GN
z_3Hi7^Dh20PA1r?BiH2JB_ZL%YAe)p?eha<$<T!(rU8_pLYUOf+pHQTR*_}ioy6<_
z@cTluSh0rQz_Kx>OB?B=8J;mwg(ycJEyeQ&>agmM&j#IKS~lPzpSZeys&m9A0>|cM
zyNb?^7=XMbLk)-M)(^k41_{3Yu`dI3%u=+VdNKMX$m&dZvf9E(zHSr{wvY1aqMt0b
zEmza%8Z&w%n>!N%{Sx0Iu44q#(VCg7PrUu!q9O=0FJ%akwI0_-FG<oCKbTJMZht=O
z$%nS~w$wc3HG6*MgORJ7D~mb47FN5Pem{_vAcE>`LHPb=96LSoK;bROe@VDuHgdqi
z_(Jf<UK!AfAx|hdLgJQvKH<Q@!-?=+s)zEtA0_IF0PV}Vl8%BO$P+K(?NPBxg`&UR
zujR(%B}#>i7m^kp&_BoBT!YOMuVEXelEE8G<d?d2nU_7x?|i2w+&I(-A~<#|xg{9d
zc*y&h^7m+|%K35gX@jWa$V4n&d*-=sQ`SO?auf0MQ`ZlGVlt9xr1&awc7pnJs$51f
z+X&cHtRGbxtdPIqpao1~IiP8jjE<fw<Vfj0&v<}Wi3hn*)5|@Rldio`%rCX=bHaw=
z(TYWBNx=x}%}*;OG+OrLWAchSpp<&KNp2~%l{uLm)k&#CMnbOJlZl)w*`I63l#=Xl
z@ewUvM&B_asCL%T8(Z|nivvhqLYiUTB=H;E%d?K}yS65;aeT`Jz;5@73>BFQmO#G$
z>to@kbX@Bxw2U9?Fxg$*Q5K!x=g^_4hin8|=>a-{sZJYgMa7(|{KH2+ZgAAt%A5Tf
zV?LW)wH(6cfZpzE^}sC=m71YHPhqx(HEz6`9WjUUw%%DAt89<L?J(Q#?a}4iAF4mh
zZ;!des_cxrWnwf<oSBTBNuSe({!=)%$}a8qLCo%qVq4-ae>M!tcsds;l0QE8LKeIC
zfB=#hWpqkUPdAV*r3cOHIG`bAC$udak)FQDwBoAkz-tlNp_YKw;;%<^DoZ0oeOGQ<
zNW8h5An;PAG-Te=jVt*IoFznemy+qNo1?+&ZL0h9>V=EXQdS4ZA*&mGW4|3N2R?ij
zOySy+={qUg5)ljE@DSAos;ubuy_5Qb{2#bCrvyJC94o;=1n8xJ?=>|j5G3@9jU0ou
zACmhPDQaGDNH$1==Er+3nNV;<5yld8wD#80&N&9{VM&A}D}Xd|_(DXz6#edJm*Kg`
z4{LRtS;Iz0c~ituA_koWxR@7Z6c;Sfpndt9Dqj!o#Jfg+6MVrE_T~PZ2XahxeVyyi
z?VNs1vTqC5_qz+fJnNs^Q2+kGIAGa~yciT%LPKyg7v+$rs}-TD#bQ>>8y5hmqwIh5
z&0-LYzw!unbd7}}QivOZS!D?AYOD+`*~pOlp~=1}Aq@kFed?1iX}JsR#U-Ah@&X?8
zbl&r~$;q9SDi>{r#*BpIY2?brZ_}p{Rk*BX$*WoQJ%7kmh0W=ZL*9-<lnyGL4KzSa
z_&62#MpEKU0<CR>-Q{Mq78{mAy}>)iZH7I`_Ae_&Fypv;Dw{6zr~)mv$$)?MlgEa-
z=tCERSoo&Ryl)9~z4{E6WRk^|9ezLk)^3)SUWR$jj5z@Me2*KsfhibPF413)vGxWB
zP)4`VJwUNxA5)EIJ&Y2=9PQzRIt=mNC_)+#d=D3rhOxT~U)I?+PI4VhrnxDq58L-E
zFO*Y{7hN@d<k$=Cs>}%WUeXL~s+$~MPxGi+zU|kfRw$N2uVx^djh1avJ4Qq64KiB7
zdf-Iuz`v}cQx!m6?@Jf9sD?*@5dCG-I`BJ&g<+Yb-$Xj9m}6~3Ep>KiuuHU+Vj_8E
z4}B-ilU>!dTURq(M0AHc<iXUU32^(lAGR(VqX}C!nd;G-5BfAeRM}%_@`hQ;f!RAX
zB^DU&Pfxh9eEJ^|tNbxNwAs|;WJWEDyK-rfU=^{yQ{R3dhc)2XnpDCo^D#;uY_RP;
zU}kl^1=H?AXjy*Uc4KP#n!bbCm=_n~e3qmVP-|w>Zpx^hzxj8tlFZCj6|Uuy!PmAE
zWg{$QrOFe$mEftItTeE?Hr0k{_}v>|>WUBGz5W8J7oR)bm-&$FvqsX2n;~kx`ul}<
z`4!LJYf9L(c0b{(Zt@H#INtQNMGNkPzTT&45}u_fgPXqFe@?n>{H?G=uC>9>k74D~
zDb#QU5}os@c1TN|)lWkVj-z0tU92vilQP43batwO4WFe%OyszW%L4rD*QyN48UL!r
pXMyi&`k#L_sQfRkv@UWvtU7nm9DS&7t1f7uI)7JhFj7cJ_kST@p}YV9

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.png b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f52ab39226083266ffb986afa411be6baeaf7ef8
GIT binary patch
literal 13808
zcmb7rbyyT_+czK~p)?3eNOyNP(%l^k(%mIUcXy{CQc_DwcXxM7qcnW8dOz=Tzu))Q
z$8qfL>|QZ5*UX&1I8VY9<t1Ms;UhsoLA{dtAf^lj1?>!Me|rfJyyub!0`E}JPRf!Z
zP!*%^4uCJlAWbPVIXNgAVEZK$bch8METjwY!UtYZP_XgAPzb;$2JlkMg@$?od_qIo
zb7B6|6WTfV#ecS;z5(q}!YZOtQoyH*i6aPP>-5pixq==!1Q<ALp{nVuDJRQgVrRo(
zWNK#&VsN*yhYW$@bLRmzZ9vXO#O^lMwoW|m{3L&R@BrJ8pBYJr|8#M-;wRCRQzRC(
za|97{FfcJNkq96W6BF|}nws$_i%I-59Qejh^3mDZo`;dq&CQL$jg`U9(VUT)o12@F
ziG`7cg&ycZ@8n_YY~)UF>qPo@lK;#j268fSw6J%!u(KtG%xh$9=i<yyLIT;*|NQ+u
zPLR9BfA?hT^v`JlC&&nCVPs}tV*H=EfuVemUwITQ+(Fh_Viq>Q@&Nk~VCH1y`_upb
zY5DIS|20zczav>WS^hopUoHRlNHr&rqo|z?uuErw|6ZAY2LHS9pMiXgkTd_+O8i~s
zKfeO&EP%wv_&?W707(nwx)lnFRa;6-Sk)c+I14cotLN7Z5zQbuGM(uTys#p}4w};K
zTWID_p~RNk7op7XSXj*P1@N%o?ob#QL1qeKVhu&1op3ba&jD1#eU3+i?>Cmk4WX0#
z{E#g(vyQpl%-qbb`32<MG=M)puiw9pG%CxG!Xh&Hz3Rtf1fS+Rxu@F{^F*RDAMr<B
z9n7hZ<Mk2}KVc}sNE5rlMstZ1xjCP|mc;ctux|I85XYr=`aO21UlVKBnZ|0a&1+G~
zJ)|}|&=%rifJg;Ro(p>s`>CKG>{<5xidwhv4CAy+*U+tMkN_kwt;Ohyqqd6^S&;;p
z-9ZdWbV;j1Oe1G*fw1d=L`R{oCxGSD?%L%W?4RAA%l(*G7~^Vs8}x+2&Yr$9anZno
zfYakPQ|Brz1liZR#1DtAhhB$vI)-g3M_u~2S+W{n&@>xx5WobXUN9L1LHf8L--v?g
z?_9H6ZHL;zf1CP6epFBD7_3uW)@v!dNFsKJ{!kEn#43od(*!z<@34h)Aj0)5u$pgo
zw{XYbo{Bqq?#Vk1_M{jvh}+&qVIA3*VA1GuB^vX2j6Qj5%UgS>$e(1Am&91}Xy_mC
zC|_MP7ik`^$>bq3{N8>A+PWGu-;T<%8;U&L9q2948K!oTnMqz#KOy#OYzfiz7Iy!I
zyps;cJ$Ak3$C#FurVMrjfzLXTKj*vun$ZA_q_bZP(pG)|JMPr%tW_C(F4wM;KAibV
zDVM=fguO;*%12bZqh-#^-3eRaKYu|=C!wGMb1ssLh}0@wwfNwD_UYY|lL7T+`49#9
zfOryZnu;&q)8}^?56SQD?AsFYn57x0G9FQ9zWvNmI7twdIY}fDJWj45PbjpXaoWk^
z_7RFMdY$ljX*GF!)@eH+e`iI0EV-W3seSqU;4$9SHHS<uoeWzhi`MS>po`@uW6pH4
zffaNTl~5=WmuS6bDdG+*aI^j*jngjs=UV$(ruzVSN<V?y^84#muS#8ee@Y|{ojkAW
zlO&VA=z;UCK0WNaXaZhYFqH<@omFKk#q;f$AK#9mYms!)_9*XZVuoGYLPB;z)Y{YU
z2FJTA3y-634TZ94EZo#IhkK*x>@qj`2g~5^Tx}CyQYztgWnk29kWuFEF^ArP^dI)o
zsk7oqaJl_{L`#|A)Jtv6Z<OT3em9p#C<+8cvoJEO$)q`^NNq$!aP6U4tMpqZ^j3??
z@C+>E$iva20#me=j6+LNd!=DH4AMG35iJ!uly^~H4^i(e(!^ojT(>{dV^Yc|envo*
zE|7>S)cS7L+myxaRIC*4FHOkyF;+H}Nw`eyD-Ko0QT6ZRC7CQ97czQ!xvHz{<E6cH
z#z`@&Qb|u=y3q_~lVI5#0liF)3Qep^(5?bZQT2EN%*xV$$0`0$OJPA{mfiYKt*qMk
zfq{zzlj^L@>ujteZ-w7{`qY&5Pb-?cQqh~md}}1g16oovD(b#GRg&`7UNYeZ3sXlw
ze`a91$uTE;NMC?2GN*jD%M)D&?@!hRJe=lKJ!*SD3-q~gV!=@H(`jwT_&pTV+RB9(
z#{sw7z~z`ABazQlob&Obn!wYINt&Qvo37i6OO4GE$3mS|O5|J4QMxss>ny&@Vb)%`
zg!FVvtXcU!AB_TuS0+9gFg{QBkEec&RL+HNr>i1(RKG8FhB9!61fOpeR6>A-`;bJV
zw(XBV$TXPqF#Xw+fZtP9yY}OIZ*qIz=ch+G{fisS@-1$s-PHRHt8I<;yQEs{g-P%C
zvKbt50*_ZJ;Dh3f;S@yBS^h$k%hzSMHJ@Ga>mFQ#RL0kD){QNf8>^j9S63QKR(-DZ
zv}#PloPW+M*|z>tFQ_H*dvE~XY({{(L(wN2><k=?Bjjf8ejQOZtob(ATFs3bsIluI
zYQji8wa1N_bKjl@IhJmj4HSFWpqFO}x?aR`re-cPt1!4M)7cI_cq{D<IzfJuRmiYf
zrYrVcNCZ1^Sja!x_rz+Dv%oaFo#G^#g<+8M4Q9qyWj_C^^c&zkZ6WOm$4(&fz3HHm
zPs9nYvYaXF#r~`oBhu3omz~WZ8uB`+&T4M3C`F$}GWs3!;M_N}n-!&KZ@8Ze-}|T>
zAAY`M3|A1i6=QH)bhMw!RYX7~v`&1_nB4yScq-wqQK_$&%xJ)n<M#wEd2Ks)A+J+!
zohF;bGecHqIWyQ8vFdwoqt)tJ2R1(mvLdb}S42I*C9Fk2dCM`}@-dyw!WfH#Pv7s+
zB_Zd2&wE*+e@yV%`nOS}RjKRoB1P7-`vN&Hd_p+J%b-ssC12WyOX_XoA~FS24Fm3X
z5-$<3W#tKUX@jze4i<7A_qr_^y`|8(>&&yBW%pvdU2d$vEw!w!nx8Hd55+StW=~ep
zYWYUi<=2<&+Sw7RBELoAvrC`(=y+TVP#zcSdh8@!Y(_AKvxde}j@VkSwrH`iutX+3
zG_*gCY~wK*ekwO;Uo|@~Z@)XFH4;{IrLqO?WK_SK&q~2P5x6M{lnVGoBlsX7qDm)(
zRKh=ux3JyRaJkSlzKy|D>ZUT(S8n95x)8ko$-2<y)4cA*sMl2M@VNfeaoCsN_IuH)
z$aElHV!~v@ByP=RPS0_F{JqD`Mu^;_=WmpUp0M_JRzAR$EFRWx^-SYQ&6s#j6hebp
zcwP+1T)(a=2to!woZpQQ{e;>PXJ&y*5#FFm#x1|QJ$7HH0gce-WtOX!YfjwWa9fqD
zV^Jp;CpEboHPJXl>kx5CuW{VOt;yw0&4&*K;X>hDFN2+;)(Gd2a0HU?H@ZTO0kH6V
zIQ4sGU1GPIWwXL!sz5DYSA>O&7LoM#x}RU5C_`{VcG*DgOqRmG7~xz?WuIja2$C!K
z`Y6pDc9(+@3hkfEkRoF_lT0L9W$EiIP=siLLXnc#DlwWl$aY-zbTPT>xqC$oo`?MY
zYG^t|wuG;QV7i^FPo8@Rz4r?S9&{&W*hgWH%{HME@E)N_(58g2;+Z;35X@$bgrc{)
z)~1XbrY;{HHjV1pO|Mc7)eYyWdza=eTjS>1wX58^f@FD7G$YXvziJ0(%=261oL*f6
zA`Sr$ST{83)(>$cyGQ<PLmm34b4Ug+y^RXFY?L^LFMs&IFy-tU4j%HGO*wJ=kdP?E
z0V7QByg7_0N0ts}Q2Uh&|0Z<{m(Eere6DLXtUC=eU9(tMNfM!%Ej&M!nvqm5Tz_Hc
zUUkj}GK5aK{)^LcX^tKCSW1d7o!*_Q*N-|BITU%Q26&`*f-J8-bw?%y8{l8VL=}oh
zT%ZIXCvzjA<#1Nu=u%NhaHg?Y#CwFHT|e!lpuo{j<_f>KBv}Xj7=rB?lIgua$^+tP
z@rL6@XOLNx@(#~Uvk#oivM;s$&%6-A3vZisOA++vKH9)|zL_#LR%8Rje&8}$>$_V|
z5zG4GE0kis>SM|`O1!T}@;jI;>dktAV9-$)L~DMvKT&)>UH|rGcglx+U5@xmkbb!+
z<$x>$EuOa}Z#YK=m&H5Y18?<s&Qz?gzhX`GHI*h&iP&~La4qVyp1G1egyG)XF?rlv
zoG5E$hK5}3fU2j*Xq}?f;)eoT0B9qIe+LRFk|$ly7mtW6ij)a-?$+LQJ$7ZMvv@ex
z{Mx7$sxAE9GlHM!nSFxdrqbbly}g$)Yn!dp?PzvHv$@68eoIq)0NlbBjDlxOB8Jal
z{gFh6p?Nqg(6Kw&rm`<005?I;o=Az~*S0`datHY~?W)TY5EqZRy&r$gy?qv7<T@Ok
zgO<(?#V+)?+!e`k2csQt7MFv^l#8U(a0wV;vB}Yp{6(UJwydVic*mMe&?o3{^}H*T
zkT@aNr+rwaQewI~G&H3X*TA?UEQ7qOdRT!QNf7+28QqPpY1`YQQ7f8fM~zxlf0unO
zT6}@fIuKE_S96$3hfd1wh+~-~EWD!#qtx&=|C7%Uu`W7D_p3U6hjw2$WleAjIwRCl
z75>kr>6l=pa%Z~^JrPq>bq<2;szRU3SRxJNS4FcUn|kmd(l(dt(XK~u)=`#ZL((U5
zw0IH9?+15+*9MM`=P=xl$DF$l5nt64@*C=tjHADj*Hk=X?sP{V$j?2~?+w!G>4eWT
z&K=x6+l%QvKiln@rX~NbC@i+)+|f%@RcTT`AdAuU&2fF?6hj*IYq5X2n``&PmjpXu
zZJqjF^Ma4-mmE<7DzWhmsyoB1fav(uNw*j$7uHdl*fc163i;qxnz#XReR96hq2M;1
zcrfq_<`QwnR1?}pfJ|VcQ$w|dqjp<%B`nGNTqJ%BOV8*(D&aMvsS8T45nP@0UtW%e
z53RPJ=P;=Y`Rd<D3G_W7ic?pFaQ6S7Hv2dNBGMD9GHg|tKQn!TMdB{lgFC(>s)FVJ
z@>e7{2ovvrjObIyjvwLu-G3btJs5Yj<+%GWt?8h2&s8dBWd81EQmSXC#<XP5Fe+TR
zd>;%s34Y$%a=pFUmIvoH0>hz-0vEgFIz7p+%MXgtAe*^~Cd#43iUKuTU#h;E`Xj?@
ztZ|WNvoYv}#z)@Ur*$P(+a5qK{KTtg)9irT;mXxwXgPyn<(dM4WTaNolZv!^9MMS)
zBhh+0%nT`Je;&m=;%1(i5!0E88hhi++P*M(bd)%w2N9;mv7io9;z*Jjoy>_e40?|}
zbxEW#@#szD2RS{2U`D(hJ7Q6SkL2s0Up}kB2vaVhE0z-VXI-NpeFV#GnN=z&&b92P
zZe7h+o9y=VQH96RxPS;3D?g-#^irpTJ3%Lwd0S?;V`Wi<JKbm5bze1N@9N5=)09)B
zHzF7!&9X3?%2@@U$U<TW6Dk{u2a@%?hRFt&6?+m{9G#|`l=)DuBh=`q&OW{(NgB5o
zE$5pWIq!-QE2X_edw*}LvMV6uXvB%NTVWK@Ywo)`62S88CwJIS&#6mK9nCA8<S|Q$
zfZDk1DEgucQD1Yev2^`SbZ(;k_b)7{A?a`QsmyMIXb1UpjrT4t->U7#RYzQvE2cKn
zI3Kb0jX3V?U>6A=m&MKI31uNrx-)OQ5On1VrfGpyWRMNc#SnmARyjj1`6iqeGPZD!
z0y>c+b*ul(?Di{<NdCFw9PxSoW;g<mQ>IWYi_0P397ebJ+1OZ*;%zjiQ8?3Xzo}6=
z69rkcs=bVjBYr$93kzKI#!G=4#l4*?4O<c>^F?kmOyJ?DEKFzRq+~^6UNe)2wUsp_
zU}z8MeAtQ+#4&T&Y=~BFygz9kSu0=}L-ZdXTLF}rH^2hSEJb=JVpIbjNA>8hh_c3f
z>16TK1{1@*J*xmUFtFJZF|ysp*m@Oz+qLqYl8qDA?}~19GkMpCFWzQ1-+HP38<Wx*
z0+F{N{vru=U-k>e#<Ve|5R)$fbsxGczo-=4(sH7wwgZaL48~OdOty3QA<Mw;v94VQ
ziJHLn40%q3k!l#=dN%k=9v&A<05vQr*9EhX)jzRNJNcQ`6i?Yd-)zMU>DaY`cGpKd
z*;-l+hxM>|QmXvk;Bp%oaidcVX9@T;4W}}9-GnT>7EgVS<9^%PLqBrwPPR16@wqNE
zJ}g*MKiPn75Tzl~-CV$SnG27@Iu#-bdSi&}C`_{Xy<8g`@HB3>vTjur_{m8nBAFP+
zlnNy9y8Ho!lk9G8yYTuQ*LaKUu`k`6FSchb;~<uyW(7cQImAtp<N!+Qls1q+DHB7;
zKm61mM;eqiT76PYwL6kQX=`C>cGADv>LoK(EH^S)qL4#(`N23Wl7M&iAvMjW70{4c
zbeJU4sd55>(k(2MSW`$2+tUeBDVLwSX`Srq8};nj)xM<*F7|Gw-Flt2np0r(iN?L%
zJQR)D4RWxMO=pu@^?UZQ7|-=r8c)ngPToDQ{66+`A7JceDoxG@B(&<~Oss=~zvoSQ
zOIE%p6<Aw{1zsJ_47EH~-Bg8F3n*?j61w{<?gGLlsNwb#^b1%bR@U0@IR@l$sn38s
zOtM+39}q?5PaKaSMNhrN4m{fVJ|>U=TyVvc#;w<&liHLX>4w}bcvM2VG5+gJU56fQ
za3{|$l22bWL1!l_A@aLtJ*HCC()a_#u8aoX$GhyGny#xBN3-8plOJ-0KNqTfRi{|%
z_>2&w@Q&`m^VeZoZSbqNgMo;cvIqp_m;$$#-^q}i7RAo!1uptYcZaCsa->L@_UvLg
z$_pf8(%Yq;)G<5)j@-?ntHUzBf`*bO!A^U+_b^f5Avn&y8qiRr7ih88VzS-u`OD+V
zBE0(7M(TOnC6mI9-Rf5Q1Mm1Xa`aRaYG4%~dzF7KHQ03u#)}z7TR9FUQrFmTh-|q=
zsy8d?^S8L03HUvEV@~@gjn0i@D)1RG@jqToiF7NKlkFm{sApEO<>Mza=vgMnss^l7
zpWrl)EsmsL%YP@ZzcFp7aXC`|o)#Z(oPhL`M?cMOwPhjDj{o7Ts~41<L#Wuoa&4yD
z=IwF0lQGp#a>{b)$V-^ErRBa6gbVQy*lf)fZ(=iSo2ZNPmYChZz&O+zr#*QH+b`Gp
zE^#<rYGNCCW1_vFqM`yiSq68$jUq}1v}sxYVx5&-YRs|qRz|QwcH?ir1Cw59a*^x9
zsJHl8Jy*SRtFz^%prF8M5)eyCO4{Weze}b*y;kQ)%fFfi2#W8!5n)8!)%!22Cjf>%
zOfRO?F5kksXNRa^=IB^6ZrkA-@|qxj^gSnXr1>tp<un=&Eg;jF(e;j(8gQ>Pfu+H@
z3xGo|)N6KS@xHOQSZS(5!DH!OM$UQf9qoKLE!DViveIl0mK0eGMK3;|46eN`Mo-{2
z8-7y|3oQ;SV`f%takc%XGZaLp?tL8=Z!ue*X7Pa>b<Qxy5kqY=iyMch8qDW}|3m8|
zpR{S1+iqp+@AUQjMnLqy;m#d5tTA{$QPy<x0*}%vPd_jJ;!?$Dr&f0Jw0DBOoh>6o
z;A{2j>Y0f)F1@-KB0&ZzDX9u^6aE5whi_=B!Hq?6@{Gdy+82v8#VWJUat3t3$;JZ_
zap3gCTKHE0QU%#)DRBFaw{Q={5~b-7HZD~O-4X<nz=d)9aRvr2uBASDAqA=A@(uE#
zWzD}s?p~hR34qy)>O_6|*o#Q5b2phf9T_a`H<*d6j9|wZ+0Hf@<{O6KkGuTEi;Gd@
z;yW6VbvuKxgWzo(cjis{cNEbbvrAmq-DTR~I2$*lB&A&Me`fAoo=KEyN@Q+iOa#>8
z;BHp4iOP3xZJL&KctNgUQk26WK?8Dcn83{rMqQ=d4UBv8c9!QLaa$WWlasRXG#3P!
zXhhiA5?|7#wuKCxUvm3LKM?ipw-Ruo^N?_`-X}$Rlmj5vcn*5erzoBlB0b2T!{WAw
zF*FSc#&_6ijI4t%ivrhd&P$HAFI|@2T@N{!^Chnnd^YwFJy+-8TfexyvkAs*Syyk<
zweUCL3aINBDae!Fhh2wj_@Jvc$mcw|%AEw}j9OlJ9R#*2pqi0c0c+Hk948R0ov`a2
zArjE(w=^a`tED-$ZH&LlTLv$+G!AN^;|pIuo>o~blRLgBQZBHBE7dA$Vde0=={nma
z-6|5&!lqTn3MP;^_+m;9MTtLrASBUG%1=nTQ#ky+=2t_>@MBz<o@e9mBaL&}$D}*A
z``2%Zd^fuXLd}B0R*rim2O3Mlv1u)JDUya#A~e&Mnm68Km_)Qk260PRd{pC>{6vMb
ztRlu%%_O5*IJnHBwwoMyubtNH6b7;+8-79KOfyu@yVU-;S{_3nNG(`uJn$QZ(HU#F
zs3!uSa|U~6P)54O>y24G<_ogiA9$z%?C;HKv=G;ycM)Q|B3#(S(h!Qj48OPx>zS}m
zLr~jaO)`Zi^zJRw_st8~JLp8t3KNPa$$7b*GU+Vyhpci#&v7~X^^{ItNJ>ooajiWR
zh<Vn^Jp72XUqHNMA%B3~w*GjA#e!Jcw?Ut1t{yJPehC2nGu0Wa$nU(R56I07XWM_8
zrHOlCLmh>G^33l9&^U{L-{i%h@yy~&;G&cgYCtINcIKy7T7@~t8{qQKLHqEk`&4#3
zb%se(Z)3Rmsa3`Q`s>CDP^9VAdHdYaN^&7hLeeXC@0!$h0haa}jOPXG3HRr)o=AWE
z(51S8v=)4E0Vvm)pCC#rDbR)y1JyL&^y6`6RV{DJSU7J9%=eg8e(;yM$9loq`xIn6
z!j;^(gtA7+Oyr9@RTg^|!6+DRc857`_oH|DD^cjweng+bn<RxEeQ1!iJfW9MXNyaw
z*YTu0sK*FJgmz|`vbmcYsX!t)9@}?{i)187XdV|qhV=*NPnyCYfFOeaAejP2TaEj<
zF>9nf6V%aMC8riX+sE~R!{lA=Hygd9S-hahLaE6rBT)rJY??qp*_u7m6-5{$G$G1@
zjEM=`yvPb9{>TgVuNa{;{zsMV`VhQ)%W0bkj2yZ;m?|=8_Z6;WcHUPk)o*Qbr*&?q
z&4mk!^?&bGBAbRGB0rK3>zMNCD=NR+*IW%1m<2?p1I`UC2m?WAb~&O@DUttWn#t!;
z1IX&GpE2*al{st{P0MeA_x=`-%WnFpVcGDBW;Z*F#oAJ>yQ_l)&|*8ldj<h2J~AhK
zxjRw>Fp(O-UmA095k>4~g{~Xlx;?=9(FDZtu|_rs$1t%e$c?M5WsC94^6@_YH^GPn
z$it9H3_nGq5I(zQB7GFsD#S`^!|n=x#hUXCFqSbAxlRc6i4(!zw~iY!Mn6752N?JP
z$7;5wJA4}>C3({R>|3h!y;w`5RJn(6vJRtP1*UBL602Q*Ipqi7t_Q;PM8nCas{bVt
zSHWt)a``B@@^pHXeA8(d)x7u&|0-Vnn|7KvU?L{^zd%U8f-niThb>GBS*EOg!15#C
z>W#Wg^f<1Y8~j??Mg!rXbb3vyyTfTF%ObyJIun#Q6NL!T6jNjfh2~`LC_iPG0RC2Q
zD~rt{+re6U`}437q0y64H;wJ7jaMXF;`d{8Im*{|c^&mGN3$2(34leXz?OP9)rxrF
zs*j-<l$~<*Yta{x&31V{klq+hC(mUq+@)dOXV!MM#V!4qtO2l~$1HRjY}uEnsj0JT
z6*+HMa)(>Ju7f?pcU54R$pK?4b#tb(i~Ps-d?38-TASW%xfZF*;WV?j>Q{9+;B3iD
zOG_zUdp|wg_L|!c^~JQh9%~Qu_n$e3UdoZe6g%z=vN-L^mg+QA9OQPm0{#sDAHXN#
zaqjPiG6Aa~=!*K?P31g*=A6l6zrs$7jHxYqRvW_N&}kAMFV-ah4&B?i-q`n|!_=q(
zH@OyXj;Bi##=#{(@<S{9aIx-d*jN#>)9;@PyQy~g%q=Fpk#Sd7&K7HJtzm`(!^3P*
z+4W;^)vc@Nt!?*#N|SN>O-B{1ZNEZ@d^H#AZ8C}&nhIbq!ap6Y>v|U(hfSBM(N-Q7
z&8fjGyd2-Ty*b~CPfScaeuL;-PfUl-`LZkOPKGpV)m5wxO@%O;>5l5j6^q~Dl;)2G
zKp`tH?@Hh@p_X?U;xDqNGOf)3*0X5Mh6sKkL{oAh-bv0iZxgJh>y*Ngow*(5Mth@6
z3rp5R?Y~j#A{okuczookTP?5P*5b<OK@S@en1Hk#D$KrV3x(}0H@mai{=0ShA2lAA
zX0B>L6C~q^ikKTQG2p+vULoMDWB$O7@cJFo6p>oFrqY{9wpg&;*i_x$L)gxQ;z<qm
z#oxq3Zq)@lLc7=t1<AWm#m*agbJEpbc)88?dnDDt{@v*rxeyjkg&j$?rgS0|x?-A>
zuVRoq1s2zfx78Fd68{aX2HfFUOuDljWQE!JSXk0V9Sp^Nf5JW_6&mpMVO~#1M*XiD
zK?U5BgyN~%iGL285%G)2n9QB0&7bIt1$>Jkk)@Z0tVL`JtcWF6Q2<9%PsL@;<ex5%
zIiHTRKF&>)`Oi?h5`1&K6y*l|2ZZL5T%;^TaS1S~bzEIA1H5QiUy{%h=_ir*lTm4z
zFY`>YrusQ&=>7dD<Csvtj6=&ylB{N4DH}&i@Um;Hm+dP7d%t)KjnV{UQc|<G-nct^
zhN+f*wM9IhLuYVmCy1c4$7;-KqOGO*$N=fe3k@G8vLKc}t=1s+`{-p5cuhiy5Xa64
zP~#nQ-xGy=DL&~7F&9vFV$aZTVDP300%9MD02g^&CYcUzA?X(#WD<Vp<*NNKdwf>4
zhV7r`=#gLpqPv5sk`dEJ?&g;4tR+|q`AjNEz9I$WJd8uHof;PB)J)h>(ct&&3$aSA
z7i$Ml_?&@EC-P-*8QE)pz+g--eb5XcofxMNJLAm(@`h>C%PAwTIG2e>GB~g0URwyh
zancAH)k##sc@fq8c5;SYr2;dR-75JOi$SNp+<LxBSR(Sx`v_b{oM6G%6#qB6z>E63
z0;XikN89FOjs>t&iTBg(UfDS5cA7>>9?>}FeuQGzVSbSg#)jMI+8Pjxzw;3m$IvPl
ze&|Nx2lkvIlZ?MF--&Lx>t$Aw10?D!5R7=S@OYfRv|NtzYSlCqfd<ezUe97jS=hDR
z7B2%b^CG4FL7YN16-`*mQ(Bk;?X=y=cMchs;fl`Z{x^Hqnk$e(FpH7H_8cDH_2~c&
zCNdj=AYhc#L6gnnQdVLNkkDj8e$Uj$I8sUcYlK<v3=W&XG4TdA7S?s&)791@i>YEW
zVA&Ot50Jcm|D*=chur|dTiX@LaH&`5T2y=vl2`y@5UcbG*`c2_F#_!7x!Z{sZ(j@%
zZY1e)I1tP(`QO#~sO>9>;t9e*Q0k^cskTu;ar}d}c6wj?s6gBAm1ei^)Ot<M%!0KP
za_MixeYc`Gn~KqIr@v}2Zc#u?fZMo}`D#(cO)-ArL~h>)_XQv<p}b-G(Rd;eLueCC
zAmBaU%~DcQBC|J|Rb<o^d@-$}fOj1`ko!#SkA~QNdAfX!(;JCrvaI}&)vc`SvtQkk
zn@r#ZL#2u1d#1UrJ^|n42;_lf`<TnKfb5)C&1BjzuMHr;dgF<J>}oBL$lB(0Kg&e{
z?1jR)uNq^8d0!j~#$$};D)d+YqatB6F}VNX_7Ze+wxOIS0_Sm1lu`&_U(Lq}5+~Vb
z6_`A<(7iRV+asX+b^x`LoMPb1z3We5ndg--M!D3;4e%VZWm>>{NO*d@mpmT*I4)Mc
z`Fpj#??cy!i5K=3V}o*&v&HwY`w-ktH4Q!T7`}^8@B8D18nY4n47oXJVk&?4rz|fG
z-~QP5yE3(a8L&FQyr3RLh*^HF^bvqmx%th>A{l;c5}J;G!`sJT-k!nPZ#pAp($e8_
z7tLnzOMq@NKL=BilcznPu;%5%c9NsTv^#mB0uN{0%vX(}6}L5;1mh<46dBp`UAYa}
zLpiE-Amto2qf;VJpn{HX0w5m9*aWx|R?CDtLn+s)HPT5mHUGgpnoGGZN&}!2Aq_}h
zPk+;ybEY$D22zs7m0Q%~pwHEUHxBJU2EUj=^G>B$Hg0>{bnDcOTO24Ip@p2{5)x*h
z&`)>3matKlowLmA!?Ih&YBTJB!4waONhiX{@qS7FlP%H}kgWCA3naj;HKyEAq1T+=
zXx!OhHkNG@4G32RnHQ*0>A=m%iB1O;Mu-%Y95)Eb*0|}`oC-wM&FMNtL2|s4<yx$_
zfTsnT{-R{2eo2QtNkESFNvP#{^tSm&)O-y{W=a5iT|M8m-^HFmpc<8c2a@p&Uks|v
zy&)FTuo3xEp3&8y9*B*R9BLJ0q>SDG$VSbMO$N0xtY#zRSA~gycl9c!o&TrERUjYv
zr{<{2uZog-!}Kc{3hkF41#^WU2AbawDrbR$Z!_4((iR>7Mv`$rFPiM%hKgK2ksv#3
zl<B}sAo|k1acXBs=?p^77&}}~8Gi@#!xDp$j3H#_C+cc-gM`_8az7>@%w{#v=b1&e
zf6a%0rakE=-*sdG)uT)n)rQ766n=V00F*y(5!d3dTYYyo!&U;o5L^J1C-fs)n2frM
zjHzH8V5Z)UAMc#ajoZ8YoM&d$ChDrbU{VF9qjHBGM_@~x@{e=?AE=;}3Mj5%ES^&8
z?m`1TV4=_^|M^PQ_-$8nfz-#DKQ2BQ3v|AweHX?=w{pH%SZES>C%365-rhj6lkbbj
zo-&m^Jjhs%wk{lU5HV0sc8Mq(<$1x>@CAiU<V<<?X(7`pi6OY(5Z*N2d8z_AfdDZf
z7a8ZA`ZbA(eSHZTmA{axi3vceRi}2_A4pAk2|z0OxF_BpNG(Ua`IWcStI!<nB7UKA
zTVD{Qw^!md<)s90246%|mHk>C)~Z)Z^yTa|<SilQIz?&A{vV-c<2b06QcCqgG%!bi
zsv@C$%qodI0B3XPkO+3<GP#igqhH7hnwe)Is>c#O2SG7*LXh*dR?C~PwO5j*M>4-~
zlbecQk!busM2af>(OLGqv~t35cq8{_KjE;vzeukLAo!F@TvC73k|t(GbblK{bz|t+
zT`;bYBS23#EKz`=2P69nXRr}hJ?%(_z3HKjjXaj<WuWo9bSm6(;Z<02ndD*AYXZ0H
zPxnY|9o`$;9pVKB9~`b<)`>_Hk0Ivbmh;XUfcT6eH1~#mN-%t2?1SuxCsHhlc|2tS
zdhrsL^|f39)nK5%BMBao3Nr#Fl*Uabx1v>Do9gH9k$vxg6G|kNj7}|MCb5XXq2HWz
z0Yg+5GgrI#F1Tec+iMfOWR@BVI#RUQ=E~gLi|z^vw4bL-oXa?)`{`YQ%rH<;qnK>q
zdt20UH7PS$EcceR+nOpxr`@-;$~{6S{rdbv{oZgIDFnxy24*V_4B%hklL7D(RY=88
zi3(W}+Zn~66AAIDM4?pJiuNbZw14d7+Rs%4;V1+=s;eG*S#(+}lQpKHhUO19=Z;G@
z4FeI3ZB#J=cV7TiBl>h6<CluqMM@>F5C#!4TUQ+)>o5|8(pW&UIiCSbF5~U~?6(X^
zF@qB;0F@kriGcu64i?L0M7qSN3EHjl&9PmuREzyDq@*SRkkW$g1f5jk!@m@pd=kX*
z0pbcJB)}}}30?r+*0Q&nJBADC2BPVKX5yJ!0VlwGLVvXR+?xV2_2TLNR0dE?kxM~k
zg+)ak4@W<@tSBR~fdp+txn{M<U<xB+4FB&`)h~*|e+6BC2}IDz`#}Vq4fB5l9nUwV
zKfW<z5cCW9m%fh^1(F#)#wih4)bSu5DYN&YUmB#JAgQ-!KAF}8KC&v4zSl;=!keSS
zEp(}>WvT;Ly}f09l{P_yi~ktHe7>g;6=(gwRNVjg!KWvHjX2QguqDfbl#_yBn+pW-
z?=9!OZ+|;BjY`5!@5ILt7OzULqW=i0wq9V_(of^CNxwQ>6SPb+dadvu<+jY{`sH=G
zqn*cLY036^9}%wpYdVh3pp@``9V-{{c%y>}W__dcfwF?lOUzp16?)g4x(xQyEHmD8
z00l>!79r^73ZNS${W$!K9{#f*FN)t^?W7na0~!ePPQAf)MX2PU8kQ8$aj;&7+AB9?
zKg14s-A)n#d>Be+w<?s+;wjDth)e=tAxc?VmJMg|&UO25u{Ho1Vr;Eu*Kek#rtY4W
z_r)6t<{zQ~=N1Vmm9WQJ<D2%36M;^4`!67^Fw#AG1;5tf@g0)N>1785)AlKroPrRH
zWgg|a=oC#Kkv|+V&WC2#V^e@aOg6b#;jx&8mTrGW75IoR!RvBJ2H3T65DT`{8{iyr
zC9L?Y=Kr9X7aw55ny59{t*wexnVOlUODHVi#lE&$&6@STUh}?`!z6I(dd1lf05`qc
zvO@^pc{irkVLoq|!Vi?up1qYk(U3ymYKHkqI(Q;@lS~os*uBy7fp@rD&sU_UvlM}S
z)ar7kA*Dl~L#jXrEDC2&#EZ9pXN}eT9(m^&QhH|q;25i=K|iHcZzBoXhm<cv<nn|`
zbzk<M?7mfSm8PqchQNOOa#b=+oo;@59DJT4!85@a_j1lq69y-#n_S2%at7PhEsp`0
zlg1;l7p<91z4TAb=km*U{GQV&J;$z*Y-;;Y{o9T_c6uTsZ!R_eXsdMzsK+0;e0QC4
zs(H;y0|jh!&N%sK5F}EBS%n=(?w}Y9D@Em33dSx9Au`f6@cEU*W-%!i`r+)Ch3Ds}
z8ID)RY_0@c_Cf+cMNX+^b^f`>1sX&#0zh__Hf1P}z|t#1S=Gsr**p<ykvR0NVbzjH
zE|FeGox^(GQ2PYW3`-na_GfH<_qw)&%=bPLJxre;H#31z%<kyttykGwAS^k=X_jLz
z0zwjpk((jS)W)Uef-pPZ6~LAwenuxwN93fFAd~?LwqWkY-lM4?XCdcO0ngNb9H)$P
zGJuWt<$dZz%Lk|z=L>>`NL!2FnuS*IDkA=EK(cOkB!tCWl^2T!>QbbtKP-Ix4rN}f
zKkXmHY;(loRR_1nn%mJZYwZ6vw(Sa^ME|@YjvkDy2b8I`JpNwFelK=#82L6ZZg)Si
zL$P4hf`G@FDTmZ~^XB1lOpY5U5={Vt`6w$RCF$fu^J^K1i_tmPne+T$ewn`kD`50S
z-x*SK((=*sI8LxK5e!D$6C~89LLJ|o`y;7|caiwBL$G(wSv?6%lrCqOK!aEXHy+?G
zf37e_l+ZA?Cm$;9U{_6>Ww~RypZ83T?_Fv2EatJ1r4JyIspesg3G3gSc7?Mbke$3K
zhVIIVHuk$aC>b%7hPyAxbE|{^FnTChq(NxYMN`Qv(kS^&z^?-wxh*Qz?)ige>&L&9
zzoBk0KuV_jzAC>vgHgNo!<&uhm$(um1>(28Z|#OJ&CLsRe)5db7GgvE0u97@!aP@k
zpPRtCQGLMaJbj~{xFLo<3lyid9CV9*B<%|Ky_%5BzRNdkzu82_jJoJVX6)B<TLC3j
z*x>`m`WCq>oJ2$41Ekp%j-fmdTar0OEUkGkCU9?^9nBX;l!JbEqii_RM&mN3APP8I
z{=|l&I1@5&(#k)JxAoMTC@~$LGnIe&MrwdDJf%637E6qSVcAEL$Vm{UxPFCV;wwd1
z_|H}5x#$kV>?~ZRa_7N^Q$F-48%LhpLKM%_0Y$?!OhsdpNqANQgz$#)AMcib4qyCH
zLnTHNhL3KUu56edU5^%;-0&|aD88*w%e%)IDDcsxqjKK$Rt1=l5Mm?xk5>`dXLH5H
zqgtGnz%yzsE*^n1Qt<T%BuXAjRS<fzST`iAI6^ja6-dF<p_4l737D6~P6S={%f9!=
zt06ADuMu;JQiI2HvH>zii5kVp@Hz0{%E{qE2u9TeFwAzR=Aub>jJsckH7JSUITir1
zyVob=G>JK?1qA4@i*ZrZw1Ip)*qD9>m={38bTdn?VJi~q4w~P;%^n$~nj(|Q&-6{+
z7>#%u=g1Y%dc`ZBj}-&aMGumG(%V|B_K_|yXjEi+1BHIY1({2?TYWK{1cxsX&CZ%7
z2|dIh1&Ej2r^yCW7@q;Nz1v-0dx(pCog;jIx>SX~4wT#QAC;VrE?T{dhi1Fl;*lLE
z-a6GkTnLY{wOnhV@*VJpDTl5CHJ1UJg5CD|jeY^Jq2<YmN!^1Rn1Kf00Jy5GOj-QC
zL-Y-)RV%;~y+o!*Net}*CWBzW9>2dkkvJRL`$PHKz-uv9*I)*-UL`4AfS6!jFIbFR
z#tOB>kl??RlaL7J)-C*iuE5bOhX4tn0CaWxxN2YWk)fRygu;uM+;h9r+BMt6!0{Nw
z^e_TtGw1i#wPuJy#QKuxuL7gb!&3|5@qUyu?J+6?#YP#0N3di7{6iC^t8<?s&MS#o
z43lLyLvT+y5>9N{4FElhD$_+#yHe$%aHf$w7ccu^&Zw{nT8#>83c58QyGb1}F!WXZ
z+aWmGEzNc*u#UN-v91M7c>nSR{|ew!u$Yg&n;IXS7w(>&g7WIY)@Z~ou|O0N!uAZ{
zqxxp%jcy35#IwbuOj!`hQc2%Qm2Y8TVTPr&+X2E-vNOU`+6+bXg8X9v_jZOvIdeg1
zaY;#rlF%Rb62%HjDc>~JV6HdE>D6y)1P|b`+yQDVk^xDLFCM+=ce|4^!u-hSfXKu(
zr&Q9zdoZ3SdI!et+IwSd&yfH63a|SNdfRxydBhB-ys(gL?yE77S3K7+p(nMqD4e2=
zo%m%R*Ddn<bj?oUdYe|5ocSf}IQfAX_?-jJwSm6zvO(Jy^42!Z{in)Sam@QTj29;g
zX-?*R=5HxJo=($8nRJ8ulz~5Et(Ig05RCVVmfnW)6}m2i1;>j)G4eau06y3;IKZ>9
z7WmGO*pvs+WoINpye~aFV+!@wy$^jlgw-f~(Zt_#_lq)VtQQS(^+h%Vx*X{DSHBVZ
zY|!pIV%@>0QM7%`ZzkG*?`{y5LNf%^HMAzU=s?Uu!z-A(jvSfUeaF3a5x_KC*q1H0
z$9}~mTV+3^ra|3Cg)YQBbr!@p&G8A22LE~(aOPzj@$|lj;qAUJ1I8<!z05`ZC}jQt
zzE{M2oL%saxX$@t(j{``L`-A(Q1c){HBD>}0kc=szLj_nb1(91a1fVKzTqEH$ORi}
z+xbc+5EFuP57bWig}w=ynJx2Mp$_GjMz71B%48jXe@5JU58H%+lvznWJKBYms1`#F
zSey!o>#rqC&RoV8V^G}qpvLTn3&zKq_4f(RBWW-N=S5^+pT7^(OgH-@^lr$Rh8^no
zj`rV~{PMtR8aZh+(B?%jaQZzHXPdYG$3I3hfK?_SZHd`3)7sSgW{s5fS@TG~VGC!J
z($7m0%;^wc#yeCrnokh>?j;Qn^{D)H$zo4*BOIdKxSMW~`yMa+ryOib>jqno&Yz+2
Za?M456DG?8|11S1B`z;kAz~Qte*k%NU<&{M

literal 0
HcmV?d00001

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.gif
deleted file mode 100644
index c947c6c24f8d9d63ed340a2a67d8bb5d0cd2f30f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2592
zcmeH`2R9oE13=@o_Fm6y%^ERUqo_VzR#a_`B0&`qyRF@NpAcfxTD1v@8I5S|(OQv^
zP}-<fbi@o=YF50jzvI383+}n+TyqOEgDdytSfT;@fZrgI$f2R3)BpIdz`w76`tJjN
zzX0H10$4euLHP2w@f^ZH$S}U5A0?o0yBO4j9!%w9_njMVsw8I08mCB43j#>lDh_qh
z9*;01`9RmcVv9)y0Lz(6YgOWJzEaBsp3u+U4y_nRg9P^m3SOzct+Xz=m0lPM{D8JZ
zakY`c>Zck#dQ*5U!yBdvP@EfUT{wf<5~SrL8mZH0-4?F)nR4~v#f7BDr!HNqPWb-5
zL<xE8hD#yPp_?(cHr1lE7s+`tY}Op*&C3ayG7chvS(oVXrPtMXj9kLLOky0eHH|`A
z`roJA7t0AOl3h>f<~B3~8MZlf#HVwsL!O2)lF_+33k>P@ffci`V=VPBYCW+infaJV
z?bLxzK`6ocK`!+N4C1r=m#MBjM+XP|)+n2vUx&x5CqB?y$5B%<!KY31!h7vnxn&V-
zKiK8MT{%JSL7NqNrN}e(9Oa2Gy+Kkan)7g3?6zRdIpl@sN%Ao&*J>85<TsV1QpLhS
zo=>l&5a-g*oQHWL4L((SruVQUyJucxgBOLWDILf?`)l(fB;NREI0hx`Qu`nrL{O<p
zH8AA-{H#0><ehDqA?{h|28R0-srJx4A|CQhe|{`-B<}sUQO4o7(wix8TLh8|2tzx?
zaVqDg5T;=jx8H%_6$ou-pCV?r^SP=*DhX53chY{L08Oi%yO9KxT*Wf8$&odfGNHQC
z(njh~DFCM}0W7I>JIbl`0~`3_Q#}uAaJ}-gH6_kM)m{luJAaMW0W@d$3wtxz`7{=#
zHq{n#qaFjc=;kVepQH|Jw3wlf%Q{xzoxqo`d}y{$j?DIgdi$B&+mBv-s^9WFqrijj
zJ4w{XC-TVrTJAsKDh_!I^G?efk`9J|2Su(*Y8NUvMZ-uKm#*yre)D2yFw21Y&ZzEG
zzz)S=xnXBiiLtRWc7uKX@wkZ?ba&iL8MjMep)T)E+L~+peDCNK`18X(815$x5}|R~
z`f`HC-bb(ez`beTY9sp|l~%^yY(Nw5{#@u($vi218K=*j=i6fJFNo~(9xNhtlp>ds
zlzV7PDZ&Yh)ojETk1uygR#A3i9THa}@*M^vm&HrSu<G?hHT4yfm<+>^!5-jRFr$%~
z_l@AbYk-Hw8NwLNUns{OIDIMQ<zDxy=<ltp|J&G}k+&(>qM9pq;PBcq-6ll$%;mzq
z_0opD{G0sOj9Xoc8vQWUZJP(rlE;|G(J=ngUx6bwrzeQXj8o=?*|F2pEX4E#8|cj+
zlH0Kycgp_|d+`bz#Xtz8m7i4xz2$Pr^7n8kV!JG#%^STPFUuo0y*qV1k3}Ginf-!n
z9oa6@Gm2CXkmEF`6U61I33;^@yqu_h(n<)58S4N&q`qpO8PN1jmqOEHA5=+E1#Gjp
zONNE=uTVv`B9evCKj;dY$A8sA9OvX$*X~{%hilo~6R}V862&V5gYC}8o#QHt?DVi8
zyDcK*=GT&dbEdwJ60TP6hvce$ex{!0EA7}wHLjDL_@0iOn_r!&X<KclW~TWS%j*2!
zNMZw}((JWwAfa~t+JtE(#7hD8y06`83k+9REFpl1k7NAZR@5pLjZ95l!Q9Z+i3^zk
z`0f37wwX70z6$S5k-hjDQ7k4{opbQfEX1S2@ObP}RWhZUGYhepBQeouL48!XQ_LN@
z$T~%$hIj0gY;U-*nS#cmXLd@ZnFGro^QNsF^mI_aHmVg)SNmhR-Um<Vrs?q?wII2C
zDtK@*`rIy*B>7PEy9VD+IlhB5UAuy_6km`rd^p3cI%;fSMenkozFnVMzKjrERH|-b
z;D)Z3CZh`RwT+yb@gB=IU-^9Fp3x?pfaT(?Q<IYznI~C3<U1L$Qq7wLQH3yPaI=mw
z;15{0*VUg)){JwxTAi@=dH%cAVA4^`4<peRi{wAGK9KcWTyn72t$>zW9ki~Du$NCu
zW;1E#CYg<X^@u?6CVbs6Du>`0Yt=9t?X9Hwd?fXY_B3FeG);}(Yc_D*knJ|a5c$?I
z-|yi3oVdp#zCW}wWiZDfHuYmOGkYzb!Wya;{@u=|V1i1ey3*E)k?6^vZNyLw2hn8k
zkkCfkus59`A4YRTh&H{O$NI<AnoVMYZ#8@8LYq6advAwzeZ9NnQjt2TP{$u>aa3b7
z<?j}A_j~sOX=4FR7Td5M!sJ;k#MQkXIi%%wJ3@m99*S5Cif;R^#+-jG40@-Qt4dG_
z;#AOS$^PKr%}>f`qS)LL_vBst%D1|>WdHjolH!9LU@c(26U5@$$3jn|;52qR&9(62
z3kSa@!EaJDf!V>{RYq_|Zr2w@fBk;zO|_iLG*1O0E6LGq?)gsKH}xk$Bj#8^U*a9Q
awoXW~&oxONKj#s;UgsetfR6(JxcUznqnvO6

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.png b/src/java.desktop/share/classes/java/awt/doc-files/GridBagLayout-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..254819f3a2fb75c4d1090447a295f486c34313c8
GIT binary patch
literal 13828
zcmb7rWmp`|)-4(|1h-(p-QC^Y-3JK{L+~JB2<}dB4;I`d1Pg8nF2OB$upqZ5Iqx~=
z`|ka7=XqwPr>m-~x~glhz1H3np{^?T9F-Uq1_tK2g1odQ3=Aw7IIco|27KnxgaV&1
zupXLnk}%cdB>TV*OOU>Tjfx5kBXEoi1N+_{1_4?HcoPF}7#M`aFc>7@8yk45=fT3j
z1K+UF@;tbIYQlo^;Qu*>sRGJjB($Uy6o79nD|Zmc*~88ST+M>^9%%U8URximuc9ny
z<>JI@VeMiGV)b@%g*Jf^_7(&Voj_m<3U4PzXAePd5z0R`1c77dX*NoVKUKgEB9!_n
z>J(Bg?jQ<YR(4i)N>Nk_3JPI&Ya2mLY1w}@2Y!iA+JV8Yf^2MFUS6zTT&yncwrm^%
z0s?I8oNSz&EI<tw4<Bc+g*S_{2i4z;{Bs>?kcXAKy(`$>#hC(nT?<PWPp}9jCA6b|
zzy6LB<Zb_-o}4}Ybz8s<vO!DOI9S=){(WtrsW9}cpt`*`$k9OB-U*l<pbt?FJ}%)u
z_5ZJu|Md7@E%pD?l8cY?zgzxS$^UMt;{kG)a&ZE>1dIM>W&YLpzYG7>P?!yR=l?Ym
zf2aA+Szw+;QH9z5y=J1Q2I$wFFfd%s3epnV-mpKjQ9j`I|GFV(9Hv1#!rqdVP-or7
z)VO^K%Mlb#@p|h#oZ}fTF2}RNXVR^G;c#$b9JCY^dg|iak(d(iLg*<5-4BOf{V>MV
z7vEl63nBKi^^48UUdUbuh*O(c`3Ah!asnRizEymb+<0X>{(<3gGfs@x3!{-qyG&im
zw!5v~WZ6K`&w7rUCJ!Mw2s@lKSW0zjki?{8Y^vW(aOuR%^)sT<hX=05H0G^b*SpJo
zUDZX0ara`6x+jYjJvc>i6#8Ic>UDbe>YM}SPBa46jv<qjiz5u(*1}OFp+m@c!SHg(
zR3o-JoFYXmvbmkm2;Sa-hv1TJx|#Xmev7{P&cjhxbxP2m3SB7tg1_zMyb33COG;$x
zg$y6@cY8u^s@uM+qR_(vBkVxtcTQj9KTd-{NMvFwK%GhZiZ#)hCD5U(!?~%M7Zy$)
z=8d|%N%o~3^j+37VJiDul!45z>sxU_0$Qcj`glwqOo(-}Uz%&FU58(RkPOrIL3V23
zM;^b&T?0ujmlEe=r?{%qnzL%_Y28TC&{%hZ<<FCNNeJ3|t!TE1j9j&^XDTkk5kI-M
zX7iuhjxd=RMVh`z!>#z`#{gc1bani2{BU>M&{6x~lyS8}Vi4$^Bv7ncZg{>l{B!$7
znr9l?#E9ubZ>x>O_{GEZnv$$+n0B?X!MNDdeLTHsz%Lzx#@8tw=fg~zO^yr9w{ulS
zbWFOH@ok=mib=F8cKv*4L=zDE+wTUdvFyPP6ixTYQByO?;vJZF(ULXTA9=-2*65I)
zmgOS(50i_iTl3s$Jci>2-^Lf>tR=#ekEd{cksb13FnCh$9Dcm*BNO<vhrw_@qpHA=
zK@F+MVL7=h4{+!93_n^sZ=!C_q}jz|Iq~#OZCD}l+rCmeNowHoqu$@3F4sSB^zl<8
zO(y8_QK9u0GO<}>mte$YNZU4686pdQA$lXeGnzr=cYVx5X9}K@asU0Zc|_!TnQAwC
zH!5UIbMJVieS2@J(EVthLk-g9w8X2$I*bQ-Ty&`U8u)lYZYGdyQm#qUx*039Rg&d=
zUc76)+1&k5^+C{6an<*bg+Z%CSv4~9u9eGX6tl}t(DQ&g)`k0E+adTiQ5^3P?%ma6
zAE#UfftbI%Vj2@20e@gmtb!GOlfvfw=TfpXu2MBfQ79;ulZ|yvDWfh;{s&qV|1PGZ
z){tY;KrMWf;BZE+Y8dm25fV^W#iS@hntKGU+b|ROn0%?ot@45H`m4h3B4Yy1&2{$^
z%jRHQ+QaW_r7vO6i|uDh2HLVk1KKnqKP!^)yXHl|<Wv2qQ-RN%wOjk<=c2;T#YP$y
z7L`wz*GCJR8En(i4&`#bZ<)ulc%3qpvjufN@K)>N)_``@;EHP}lR{ROA_Pu|M>>iM
zTe4l&D-E(662E>uPqM1bPQS>(Jp_Aw7p_j;%zAQWzMz(K)5-}<fNVumrzj-kUj0nm
zG+IsE(7SZa&i3@Uk5w4pWJ~jJ65a)i2~aVp`mFt2qjEV;XO7bj>^W&U4wHf@eoqs1
ze-;;*tXs9G&Rl2l<(bcM>+V)zoM<AeN!!pMc_6dL?s$qrO{XsKY*GrnIg0178c5%6
zKj}&;&3(JrVy~&C71O(T+;Z|!ug1C3MJsPDu>0xZ1Q8N@dGJk%9=_kS%irh1@^)A3
z$^O9g{>H6bvp8}&@aaMJHYwLvz2?jN7fKg9V~`qz@sqil+^<SG;vt^G4&RwQ#QbCK
z5A?bd@mUPh*+PNk9|C%0<XiPFyyeVCH|5Uab4m3(>747>>$=%MyXc37H&%`z=1Fv3
zX(PIx1xCmeh0l_RK`J=J(!6Y$d}S3ULQ7!kosa&KR~fKtRH}}(<%Vlr0ozSW&Ph#9
zOV2)jEMbCGqF^}XJ8xyCdlWHaeY4DLz+J-<(s(hbN_HNWh_h5O(jS}EuauF?1nh=C
z=gRHtW3u{Z*`heT#%agO$*T#^KT6A*?~Z4OOfzc~gsNp|VW(bnKmKC#+0FJU(yz5V
z|MEhNus>p25=*zr@LP-Jrvr_$7XIm(8PMta=Q`hCuUl_6qP8dVrDSh?zoB;v4JXtD
znY6zll8MbF{ULMql`eM(q-uoWOpJSg#@1n;{E96VI_0v#X1@Eyb>Mx?+xv@&0MFC5
zR3WFYi8P!(=hjKHbs(ipR$pLGg0_cKc5+$?s)Hv}#YI}oyeG-nt%oo#3hb9#YBlCh
zy&rzfsk}YTy>JtI1z4#1h4&oQ#fFWqGr*6VptK`GWky8`61c9Mf?&?v<qic_*GF?n
zl;gCdadK^Xf!4rA+&6EFY~Nyhz^Ujwm66%ns^$si$`(5R_PJ)eZhCy)LSk5|oWO0^
zsMEt_=$!i<U$9H}!*`M%&L&RFKIG5WPTLW5IiIrJ`|<RKqS(6V$0;PcxZ7*pHf06e
zx58@^pRSs_GlYT7m)7Vox5(V}OV2ETh8cMnqdx|Clz+SkWFP+IeYWAg(T7slU{J`M
z#%AVxe)=tlJTvW?89tp_*qco^%1A=QQ6<!7B;7~b+yGjmW@kMAlVYVb-fHq?G5rVq
z**Rm6m}F*yX?kB~f97+clMXEm5`KyoBA4;yW^rVnyZO)3tg6_Innsfs>TT7ukUY5V
za<P#mC=Shx!g1ip-ZZ$riW6H6x|Jf$>!6n{S?8oD=|7j$5$h&ZQ&8Y&4t1~7thJQc
z-Q10?HPk55&(uAbE#E936>tt%rw>?KmwU?wQMF=XB`}52U#_>E;C<_7%%p##e~k2k
ztRaoZ;ouBd?+M4bGL0{l8a*wdpF+N1;qs%BA|7AW)~jg0IL1HdB?x6n;@-+~>Edvx
zbU;AMlGXd2Vu}4rj0O`P?v)8E!M92pu`r8o_j~?|I0J-=tctCMs=1@=KR*VaPw)8N
z%__7`qFABRJRhD-LN66ACFTCaKd36WjWtk)O$6JE6JaOev(Y7f-1Xbp3bFw>F{ipA
z5V(yvS#^J1gAJu?Y-3?&JVx!)+X0O_`Ws-=e$n6IZrND#YNtIdrTVTpm=?E9R=u7z
z_!I+Cv#RcX@iJF9L<qUqv`8N7;+J^lwt3Ba2M8NN7yGb)lLqgo2e47C`36VB1_QsR
z9lOaVC5z+3y<!1xjH0MeXCj(4l=2hblx-3)yZg~id^wheo@dr-Dl2>^LM)>(n(Rew
z5@|X$6Yz1D*KH@17GHtkfW+%y*R0=TyO>-hZS~vnHM10s6i!c7Fx+6AGCT#xX3>wd
zflhHM`>6uqcatHYSh&93m<mJ!)W|6%TIF<eQ_8;1z*`zAiKy8cv$YOnZ=zF9iL>)W
zw?L5w=aofn<MCXvwMvbT#z=w9-R2QXY>2TUH|y`ZYMvXb&~H4oNYa1RsxsuMKTQc*
z2G6MMKn8iA_imM*B@0fuqEivewz^cD60n&%E(^Gx5*Qn`xXZ?p*b}QcwFd`^0*;t7
zaQBy%KZO)!-6KhUXf0_p81w;9hq7Cr*pXkPKZZoJc^{eh*0q~q!lY>7&Euy2fDc}1
zNB&m+NSgx4jgo9UCGD%GSm~&Mt^z9-V6s$$2wjs&Qw3v!(D0erQ#o0&rm-9{mKx{2
zeJVO@wyN5&dG#6*vWM>{`sh%ga%#4D^*J!cOz^9H=*ePZMeQ4(uj>P~k%=BY_UOdi
zL(<{gc9T8QO~&pKI4IlUEK8<w1c+?3?dzfijt5@@uvy+I4Vf)_KK`l+{3+zW;yFk3
zB+ABrFg^#Xm=lgyWKeG-neE+*`E#SVvUNhUSTTculnnuo1`{J#G8VGwGGik!u~Hju
zmx{(JyhIPlLL4E1nC%qnQ61<@_bL5AW8<9b8*}fg9aR%V6>I(0j^)MNwrA|qVt^sE
zt;3*gy2CvaD`P<B7>c4lpg&4)#H`TlnYBV05&5|oyWIS?An0L)!Wau=TyLZD*>EtD
zt}ZMMiw$P!6Y)XYY+RT|CAfK=^;I1bQx=Ar{`8~IP+SEhO!LsjElpw}JaA>jr$wyB
zW5ow-grW~;!2ssWs(z|}qM^edPtsa@Yc<~e=`|07uhL6~ofbpN!#gq4SeL8=@WUFo
zsbjjaNdK4Lhw7&nGPA#)o|@E>8SGCKU*G9!t>P*06e*>|o}YrQU(W?f6|LV7qV3iM
zK2+4WB@4-MJRW;>CmFeP@(fbk80MehF@0#cs;F*b90a|FRir3I=+)g5=#0;)L2%E4
zVU789IG0s}QlK0zSo^$Apb8C(wM9By=$bf-wsiaOR*?c5?&Bm?e#!11FMK0j+-A_6
zL|46{=&yJE14|u3Mn*SQ{D(sL0d+SYvFs85c=i83Wd!qQ92;FFh7y0t2(n^cJeRNO
zQ1z39(&RfR)qthJBtVdiZL)K)e=pGJkX3zX_RQ~`{F0&6k=dbr+}`JQ-+yGWy3o@l
zwb4YbV)<S@7UVQ1&{=9lr#d{~)V}o_{{6Q49fv@G^J3?R)U4cbwxdxF4Z-pj<HVy&
z#cETHNIVgtW1T!dbo+cRQ$#CHE_qCct6zhUXsU0Q(TDp+g`@F$7aihD%*K&Bi$~va
zY3_W!?c1<x$Ox==$gNzv%l7Yn`ZUEL_5jwcDRaKv-v9hz8-QOf!R^FkP0dnSP`PgH
z5nIN6Q;6XnJ$}g%9H)mE=fQ`$WXrc8{1y{a@MyEo<(|gHhLv=;d`cVVi<8~L(J!00
zW5!dK&MCLmok%gx7F#0)GH7!5d^lr%(am*}NYSr{Tb@qqu;t5<8YZhOC4%J~#Hoxj
z?mKJ_xZd6*(0hW&7TBaR<OW#iY-NT?_(lSCE3X;o!Z4~m?GelM>OUqkc-G=}t>1sp
zW-`n6yBo~iTK`da{%ePOp}{IGBPjc2rG9nv@@!Eo?zL+-0=khj!w(w`P)_F>a)<ip
z=}0yG#Sykpmf1f&EZ>Yyv>K@IJk_{4wcg%U6n)rKRR`tVM)bh5@|l^fxrPv|VlQjE
zUSg|3#uexZp6%#;6@^{aIvt4>Q_rx?t^bV<Ixa~NT1sGV7WG(W)-%@CIGFpGDU_me
zTG4}Is!aRtGqM~T%AVAqEzU7Xf+=DW@7sItHG~%Br~bY+WnPk+I_DL^+tV*E#x5<Q
zJxR-ZV!kHVkJRL`KizD`L5Lvfna_(|=S;jZ)?|x11k^H+N(Z$AN7paE>6t0;*otb~
zxLL-|e2}LeeNpnXeiIr9&e7x8w28R9izqO<iQ#%;MbpCMT<|FhF?#)OCf<KbKCEX-
z3C?hjf8$Gb$w-Cyw9RPxD}W7iC;jfaoL1VAYj8-rE)5AJx`#1X-bmRI%}H`1<|g+$
z;^6WV<{I9WUVqkoWVnY2xgAbnQn3<JM06;WizBP^zdipz!Pl(=A|w34RMTNen>|ow
zx#6&*{BU<z1D}gIkRbndS4_~^I7dJN9;7HE`pcYh4}YiCX{IEG9px5@+}|9IuD6Gn
z9j#;C#<&ebj_pi)&y<Kt#j1C?T&r}r!G0!ME$63e=q-6h{S=F-{qd&20vWq`kOrp!
z1C{A`jMt8u=xq_;BahOjU{T2uf}#<VhOkdY2cwCoq{7e>ptNAV)@lr4p38Q86ld%E
zWNQz~#aKk2kcUm(Mn!m<J$K)E-F?S!bgN`D0SJ|Sm9_EpH%<k8<Rm(^ruU$YzKH2g
zKd*W*{~K3}5|2v1$`%2Sop3$kj0~YVy&BW$A_biK%i|TH8R10zKwwUIQ9~EL3xW6I
z`-%NeI<H5qyZvRh=pt-)Qn_-AS~5TCj*)lGdV^GlYVq!r)YWL)#$RC9j7DH8D=2)`
z>4Oc}oBD{DONv9Q9DltQXm&7H<ATc#DlIO)y+1tS61p4D7FtLKK1S+5BcsvhaiVu+
zXF@!V^Xy8*8vG)DSKO&Q-;rEcnMITNbFDkX={@$Ri+h(k0-qiSY9`Qs9#PG1LI_Ob
z0Y6fgwfo*ZDRu9uU&!Oel61rO_NabhD;S9^e#xa<B)^sp&I9cRaNKGf7wTll{7)sa
zlH(7hEpv>5tg0uQot9{sdj{bKpKufzbv{}Pa-8i{>DA=03F(FjIgMrV3?z~R+_J%O
zVR~z+JFt6Q^mA{GQFFC|!(?7Cz&OXjk-d~#7dSs4J-dMb?<vwMRlOas1g7a(#|3#e
z(xMgyxv1k?a^Ys_97h4H^e;JY=ocf&-riVTG``N2qpZe(_&C?aw2mP14JOhkMf-t<
zlNqLK%(}}~a-GZ@BeOz&Hi^g*JCiMaNx=})-5Jkzc)PB@uOAU7_ShnDIjg0Hl0X>2
zcs9Ds*{{NDKTVw>7TDz$EHg4;H!|_llahTmYOm|}F<195(SW-x-hwhSHmr2HhY~4V
zLJx>@jaoP^%TW{oTayAUcHgnSSJaB_PtaKVjAJRCD0!9RYR7_ODwEzgEuyj213*eH
z+y_a$2=y@EdT$N9bcsGZ9S-8#@}eNi_^mV5^35AVAg1M%jj!fvGv#(5=A{b%vD6C@
z>*ZvhemeZQ7`>g^mN|9M!16Yfhz(u+Tml__uc~|fjj`OMy{R0h_LDSkQAx@0(Lz0<
zLo2W$yY6($HDz>bOn>$nlbw0Go~wPKQ#1a3xj$2^nk`tu^<s(p)575m>g9ZyX=mFf
z{e=emqzD+hx$11!D(Mt&8w{-+Cg;YjE$h#@BX56S{lvj*F8Au-3f#%C9o1u$MXTLI
z4uE+*TV~OObJp!`tD0r%>)S@OiPE*lX&f!EzlnVy(7!C1%jc5Q;IyP0hC#|$W!RV~
z@$OlM;E#=-Z&S5aauNw|4!^T#nV{5AR;Ldry)@m<l_fbU(<nsePG-kqCL$t|EG&)5
zZ>CCJ=zX|$5_E{&MvCy-sp-7RJZ<$K<C#OweQaKNleNC1Xbqg#-@9yFKZ(wR#}9$U
zHrU7(!17kf;^mPbc9jjRjf;&;@x~a37;W|h!)w;tjOm-qB`aOuSPjN1Xlf?zdU}6>
zMVv#;*9A89{^cn3N19X@v1**^^}Ek-#i~E#B`n9esIA8z2af8Wzt{RCJS<F@Jx?;i
zdeLmd;`X=`m(?Bf{-jmL(a{sIq2!)u*>#UD2a*?FS{>dTw=1M$_2w7gR(+<_8*_(!
z8v!m<6mIQjnmf2^BFoO{;`T*257=zIX%G;hbGGASNY4kqZ5pQ~@m>%vb1vr#SvuZ9
zN{d*y-CL_35>a<!O+_=3q~UG36*#t*&uo)X?0L6C6zn&F+I4C$Vnp|KOvA$MeQ&?k
zj0RdH7#St7tF@&I;Eku@(5Vg${1o!2_;|Y^cpCEZetnN72Q`}y=0`xZPi0~Noa^Su
zv)CVzoG;Rny+lFBV>GGd3GBAtNh@t>Lk+U-VjOR6yqGJ}U53MOI@ZIYuwzX($|t{u
zHx5Z!MJnDPtRptd8|w@U`;Q-g7+zMP@@k?2z4iH~6wN8gFcn*OI>U2*o5>RUdpmt*
ziVa-)Wx2KerUg}a{rq;31$sr@E=T*|!ZdH*$i?WJA^OnoXOVbJs8Z_%U~NvEAe@+H
zuni?{G+A7NyXH>D!m~xKo#3H9RuRKdt>%-|DtkZcrRMgrPo$&m>K)#03{MrDwgF#$
z1kMi}+g!A5aZz%I9N(@<;P8iF49HiSHipcWX|58zT=64Z%|p%h+jxb2644zE5s-Bo
zt@uDAj*E88P~f1Su0yQ}a?W7%Q0n!o8trWD<K$T!t<rpQo)9h6iX|7rnqoGq?b!9E
ze|fD9kmH!xa^o&Xb&zU+6eE~3zlZ2Ll;@Q#V+P9l(+<+aF6N<KIOhvhjSQq+oT$Pn
zoAF8^qwa^*(Jqh6d6Zj)=l#raKmFx$jg33X+_X$gt2&aEt}xD;=)#I8ooq~)pxUyf
zL=chpDN#l14VsCt+HUTNGD0Hmqcla1+g>+rxzQh`dmd*fb~-Y^3Hus#>g)ye@q@$I
zA1C)VEQs;a|APLPEFeVF?;&XC6I_}Ft#$*V^lg~<yeRnPisc+oX*K+h&aH}qX%IT^
zS@t?idoOf?!=1<?s*(rHfvYJ}4fUXh1Ylp%Dl!YcnyQq7$RO$L(Ypv@TcpguCklu#
zXv_SS!Y$Qcs4~xt_81~HROklG6-CTR+H`j4Pwg-~i2V?J5uq-$_#;)1xgGrtw6w6y
zv%ZXTB2WyylL{!qj)Q5NZ|i~owyKrCX(^G<WfvO>9h*2x9}=wb+TM=%X9if(jnNNU
z4R%vEEofCT!4&L(k0k&gZ>yf{6<~u~GZ2JxoO5nnGG>=qVqWs40?J%V5<qhLLSY0m
z_Ics=ZPXyKSGIlK@&lK#Urp@t5kq>SiMU4TK#Gcyl}62~Vb5RELY*WjzV~pS-uyI7
zDt`NL*Hvk1-}Mg5*>SDQ1R&NF&xyHDQ`GZAuGLGr(A)A63Z!AOqn%~t{2-jZjF<E#
zMo}7Y3$(5PXUtgGo2xNn%NF!Z1biDsKq8Pz<?=o?Zv{NC{;J8&X-Rxs*=J!2Io$S|
zgaSNK*h408Iii=#RUxJ-DAqJRMQfq9-#+S$kQ@OFRyjv_A<gZ--IIk+7Vm0z0CkAP
zV`mhrhMSWMOQFWJvq&L{)@FaD-K(S=-|uqo71T#DLjoW=392=oZ;u4beS1!WIe{=M
z8Mj-i1#{SBJ3+QN?fvv{9n%;SB0D`j?f>X`b=G*Y+?u4azua2SY}BMYoW{lmbw1YN
z?B_pOq;hX~`&}K`-|3<garXH)#S(Hzs&BOTc?YZSOcyIb*dUJ&ztP@4Bv8p^26%An
ziqZPEo^<^#l8qs@F)3EW^OK)bq)<aClbq1H_jL<|TWWH`!N(QC=eID-F9PUv$;?aL
zfKK0E{tNrayQ)U@HZiqZNEjsaEJjV-w^t`?Z1B&}+4nsUzw_AN3=YP;v=yBCIbSO^
z5KXknbdl*$odBqAI$e)<4h9|GwWFClBQ21lv{1G}XCOF4k;j@Q98{f#t_<_Pe2Jcn
zdY@1MGpvf1m8B~}dwSa?s!UZ9=lsu2Iu*L-eK=}_#cJH?cQY%YU?Dc>;Fa!te+D5C
z^Srk1#jg#inrw6FZ!<a)bzpN?&9)Kx>a<YT@3puymNoXK)qUIF{)h7^NIaw6>jdK(
zcdQh_Qc>K5m7~7`Vw(nolZZpy;(4eG4YkZxn=IjK0NRT|ttA9N`b_@QR*zlc+*THH
zv8#h`7287zR9zTukM`0%&^S$rS}v>S!7K+U_k6Ws<Hr-hrVjB#cqEK;LUU%XgCK`J
zwZJ>Ayrax&1oxC6!@br>BR2fVo(`XjBB!M$PVk=k<{}}tUA(|H;0m%oFC-OugDZFq
zhQhUmNgJ5std-kl{DZ&@$%PtKnAdEXMq*A5D-bi_`UBe~Q!`hs6isuaYlq!xgfyfP
z)ty&{n?`|q`R|JWNX|GY5K^S5K?d-+-<B~|9(W2bKAQTP(8NPvOmgB#g=iHNR=IL#
z7D7HrFH@lNMS2$}sJaLh7=|-U#IoPfKfb{gaXSGN-DZ?^T4hz$D-zEst^5nQAjw^=
zSwq%V6Z_7bzgEJUR$OSBZ_VEdx9zvm^bYEtJA-k{r(5nuBG0P7qJWQ5kSHc#M*t+7
zy63)Qf2{tGfdO-x;;<clAogVhW1QlfFSNK(wKM)D`0?)%Cj0lc%$;4;$lI#89y0@e
zUuEpaG3r**quUdYE;sM)8~(L`?y4}P%2Hy_&!QowKr|vxkiSf_R1jC*k-h6BzTxdk
zHjle0h(+RW<$DxN2;?wJo;ekpMiD`0=L5NBei91ec#mvlM39EY-$3R(PLE!!B^`R2
zCp}6<DLo=YOTR2?-|ep&0fa^;8O7ereNX&Xv@#Mf^Kw`v_<vN7AtgZdxJc|WHTt7c
z$N;|zk+q^Up%>nw3I0SZQ=S*&TzlA23GOgix>~F|wEH$u*K}x?Qn3xl8u5e(m8!Le
z>WvuXlPEgY$wIyO1`d0cHbp_SaN$JG$SjuGGvO4VoQ&FIhTsr+3hWhZ?fgRhJ^4_G
zJR8l9U4xbfo^(&}aR$N4+2){1oS~^d_*uAiIn#xBGLH!gt}xufHx^hSe1rZFxMnRc
zJmC)u-B!;ge!P+{m`(Ay@;M|@%*(?>mTN|E#Fb&NaQetOu{wchN^f%m(o6Pv6Jh_B
zM%@)Tw9rTxPmmQqSqX?EpkY+euQD7n+<;0sv@+z*VC^&%DFE5K*a+@!QY~8$MEhk7
zB@GzONWRp2WvuAg`3@fsE(I6W;pnSYz=Cq%y!f5w2SgW?0H5(b>B}OUVMAHQMzrS}
zYU0s)50SB#q;L_ZLc6Nh$16-wzV`ejZ~Et)>b3($i)!7JzE_xv&EAaQN*P%LblziU
zeq?}hTP(j|U|@i9e<EJTbY|lgb;3x#<VutF@75M2Z<tK&uk?!?4jRGx)5@h>{aOi>
zGL*V|uJ6c6zC7oP#J^DHD-ddxq`-Q+i{8E1=%8n%zT$gWRTuF44K#$JlfOI6M(s<0
zQfwq_!aCL7fn5KIOY80*3T+KUYtF}oPOOIyQc@YD5QGA6N6f4r?{B+`)pA8`!iNE7
zA*Y_1qp6P4_xt2S4Kne;n*W7L>u!!;=-NYz+a~J4=5X^hDZqcerZ8v?gq}mOh}wb$
zibQ0o5jb>;z)Xxip8ohUX8Y>9KR{9to1sLR=)UuR5an4P5#P)BsY1D|8hB%RQbBP1
z_DI_A>cdrYSsznk|1jMO-LU}q<`i*#gpD(=@j3E9DZn!ED2i0RoKi+npx8kTn8*<s
zaCu+Q9}x2Y!Y7R~0PT4r@55d?pDI(KmfB9_>|D4F#lMmza#?CpQQwfxq(~NcbELme
z2a38pSzBvKfQr?zw@-YpXX!U7fB56k#FN6E-3y6%pXTk;B>)x<3fj+}6AvY+iP|sc
zEwsvwy?jCt2H1KfFKQ};To}Jar{Qz81`rXRi9m5EHSP56ssuZ_msT0n59pr*<~KQ&
z#VFJN_w`8{Ec~<dOCVaF$^Ev+-xOP`+iDPlh|4CrM!7v9Gm{aBFEw@CpN|MQqc?#L
z+SW0{ch>}F<SC(nP2fpYgrMSW6{nddb_M(%4nagi9hYK+@gnv>BmH0KRc29~k5n7E
z)aewL5SBG~<=P*&NAvF4bIw#HAe7sI;gE@qtVod)xC@OWc@B<6{P5UL(HjOhCiB|c
z-&K`{jf{H%`=9$LF@Y6#<9<Cm6w1PC+A&X?A&=Q^wZifyw=s?9M72IU$F)>{p~I(s
zfmyHmg9>V^X@gxtrE#m~aob^aybsSiY-CvqvcO$sX5$X;Gi4_w1qFp2UcyBwnkUTg
z))5Fw2};6Zn`cGsv)6OgPJ2^(EtdVLIPju=SB@6~`am?6d;w4xhW-t7s*m<JTTFV@
z%rm8GX+T&#eO%a4ugXy8$kQM3*+QOM>diP1r$qc({61OS9J+|M#;>ANu2=mg?#Iq#
zgaEFupsLFI(=hl%F^-xzINfLui05)u9o`(Pr?>E8QYzRH0=`3`<6?sXut=#9CTXlD
z(THmN^P?GDV;oQ1mYnuOMYW|sgp)RehKfqc?y`a7vM;#Z>hr_(*9lu&K+T9=6V;*t
z%b|oSP^<>-BG4EI{QBk&h(U@oB`VuMf=eo(RHbKZed&-HONBuYM%wMIa$E0#EeFB~
z$}YjjXQ8Nz6Jk$MSk5x~l+}1)B{Ch;@})H7N=4e`nnydWP-cqiHQT>znX_w-YL2+E
z@1+XQ5XkhcLhrhf39m;kak8028ESlzX;De%AdO(0OmSAd9MghJUYY#%Zj2BesSKpT
z!a=~74-%(e!JgdKY;m>N99EBBpmV)BwU}ArZntFwG}D=T#XNH?z+?huRhI@}i`^A}
z*&?m+;Rhx_RrUDJl`Jkn_1Dx<Sg_PN0#VsKj*+Q{UNq-~mXFCkv6F{i6)DVc0Nd?-
zH_3u`&%<3nBH}w69Y2KGLQk49im)!d$&#HxSd-qeCNIEnG3w~4hJtGi1q2B^K?;U=
zLL+}ZX0WuY*D=G;r&g~5eOEOslP{VD(h=b)t)TKz78Dbv;1DG!=4j@>!$BMu*RPBi
zQ2(k7^Tc<GQiaZ^%;AAzaGmU<OPg7MfJz*EbddVVH?p9pptuZm5kBJbZHiCP)}=6j
zASeL5u(Zfuj{kws2nBIGUrSNGs=w($Xs|ka2Jv<we<%_MO6azf+NjZtAwbSB;}9Ip
zAtr-Xq??VZP4xvPzvs9dA<jRR8UrQTYM?xa);uNL#P-@bV%ai}lX6GjVb=Hxxi{M!
zh4%1OL2P5-Cq;Qk^@~@2lRVAXLvaYb8nmB}Uy4YQ<D*Lou5n}+Wy>(n`}i_*!J38+
z#*y=7i}-L%BMnr|z8lCtlo~?Ux&~H(c3qd2-a8P49Uk+Iir!UdL_e=1lS~wL!1G5&
zORkhSv;+T7nOZ2g+;FDD)R^x8%?$;uKB`<g4MxkWZ7>#<a64pYuxO6&HJCgowFKcD
z9`+JWmfV*zeckev8UU&9Kr>cY*gXM=W=l=`<&(c&Nz3c0X~7|e2X%9zfDiR|M;9uv
z0W|?qlM)nDaEHlU&}SG&E@lc44Qs}+z4WmxzPJ&!6$lzZX2fTr@aS7(fCL=(!BsW#
zC}!>-g)lfoOXavxe^FrCm_%4dHRI0;bEwg}eC4g75ZwTnNaW%35w`B+G*e#%!)9lv
zuwTzhuN>y8@$j3yi(BL5>O_D%jQyF?xD2HxzyNc)u8R|i_=2fr_62<8d#aSrKN0)d
z6TqsaMIE*{(^3Q<R=2B`sAe+)yOQfCh2wjwcStW%y;gnbv~+74l!++kiG<!%E&~XA
zz7fSXOcf_g39zWN!23;do8D98$QdnQ|M1HJ&xq(FLo$GfeP!PPL|g{VRhxj$x4w1>
z<?y=|Xp~T+lZzVjI?kH|;_)3I9($K0q<t0k{dGX2lF7}Xbh6sXrJ^@qDEGq3?FEqQ
zk;&sg`!7)R`1pa}O%j+Qq1L;DiZRirgk3<(-l^zKD|-p}ZPr=h;^e+fO4B$SVLdq_
ze%8IADCdvAPm~_+e#I<7hKv8I#+wdwM=1ZBw*l#O62yQHLK8Do3N+1Br3BP+j;?mV
zG9fFHc)iFb`70f#Nj^P3Aa*|j9AiwBqh2Nw_bYefD=y1dvqk{X4;}(&PuvHS<(yU^
zLCQixVq=`5gE?9IqxRR!)h{0hYn&it0mltI4&Mot$hy5oQdv}*fLw@?AXs>1-<38`
z6+-}!te0EdO8C}eNrkLO(>Z8KArm9;eCqD*bq1^6o6r3Opz=pNJlui%SJ)135j=u{
z|0($Dr1)t4L(y7%9Os-X-J6APx0251t>RGFknmsr=v9*W@3H1Clxa}mG_`o2S(=%k
zxYb$y2g^vu07rd8$O%9Mn|9+?_pS!>m*~u3fC^`YO{ST>H2|_+RQ8MjXCNfI1ZqB!
zB>>L$3WjFGg7(*HS3tYtN}CRVJ~TkG2XFI#aW<$rt3tvr>cOP*Q9A)J)FS{D_80km
zKXdwZ2I2?g_k_Teq!BLx#PXNPU@C!Kr{A?RR|an<5})%jJ^9<4e7EN`G&G2UGBbc_
zLVgDjHw$sa24-NO&|IKlAp52mXv=9gN#TL^LijYu{(pej{`WTUzNH|;WIFKtDSM2H
z#msMN6v`4+wEY8PU$}i2$Em=s=CvE$PdiyInS1GnHQlBFhO@RlTrF*%4U#u6K&g{>
zC={?ZaDM+wO+}9SHnWiegU|CSB)HN-Fa;|$+yQY8c_T$uuoJ<4i&^I*Zo38A_Rp2}
zxesQYzMfo$#`AOz11*$6?J)yR*O=AEs2^F~X2QpseiM1O8CS~4Tn9RM_LndkzIMjR
z%jb;eEM*n;Yko<qPP{MOElp|s&H_bW8#@i=Cx@;c^|8rTO(qh!m7SU@M&~a>V}pDD
zf}B^X*_U*tq2twh`J~Sw_UnQ4!GB8kkh<2V2pG>KdbIMjc$mTX1(@2vN~!}X3VVpx
zeW=G)ZP{K>*G~KWGY;Z*z$>Q94Y<nCuGF8p5%vj(UIw5mH>39KrSL>n`7?yCUygfZ
z$rhmFsKhz-x_93lFhNt3FfDf0Wbstq<Y=%Sqn%<#I1HE#^h(zp$I>2mv_a?bks6R1
zo%N%Ip^PtdTP#i|c?6pIb*cVWeHxdx<Z$E;v!$<<lAbB;jnvB&!Qaoc<J_U5Ku`a?
zw^t+KVrMEll^hRr5M_~ogZCNUx`$SB9C|bK-Uz2Dh4Zz;@DPR_T0GosAn}UgaIPi|
z2moZ91>ar$d|8KzjuNn6oR%4U=x9^J?Z-UL^KR1uvm40k3?mx;prObSKUG>AAH+&<
z-S6#vb_%oNIqd{xnlK0*VG$)(q+evH&~ZBLrYL=YEUf@3NiHy=Go~y?aT2MNT>H#o
zvy02J5_tGGKulBw0P3Ftgq*(fO>k00Pa6>{`5!O0_RjU@KHb||C3wKGGK59t01+6X
zr(Dzdt+*7<-Arg6!pFbi{0MR37dX%9WT`;TuwBHoDw)=}Vr*&pk&Ku6)8FcV{SZzR
z>`g|SnbqVJr@yWL)IjHdw_iG77>Ab}WD!-{mX``7(E_!e1$&dzW(owj4YF5JJ%Vw6
zYpIEVo()C~Jou&Lqpn0nmM{R8h8<zUGu_Sx#_Btppc%&~Voc#EKq0N75!XMNu=2L`
zS6gWiv1kFd?}o<QFLcq<bdG!VeFW{Q|K||I-tc1S7IsudEJ?m)SE<oSi1yx10AYR{
zADY9JPWj-GkKJcQ3RaZ)c$sHjQVg}@heLe0)M!6u(Q(F3Cy@^Usx=PYc-4?#Q6P4=
zM@6oOdqiO7Z&9F;6Zq)UdND2(GyO}=3K-m+WxCx~BvbX!clN1JZO%}h-7jcN4;i*O
z5&QH_5<>X-9sBa3aHY0{7fPBOc)+TmlEI?40coIUNxp^a`*ygB<%Lq`mh{KogtUu~
zk~fLwt1GX^5x8nGy#@<{P*)f|a9gt9Fyp68aRSpTFARr13YkVPp1n}arz4vhayZi6
zgMBIEqu*knogs%|IH3)9n*!qt3yR56k06K3K_w+Xdl4x>uJdPKnIgD;DWGdm8H-X~
zEkXo`a~Ww&706ta==y&9ghD-B<^iN>vg2rTDe#Ew+6}p*B^dzh{2O>6Z|TaZd1Xhm
za>-2|=Anl>^dsHI?hnALU2Q>UES#C>pLmC=odmcA*2JF9fC!20QaC;((+)gq0|D<(
zQaIR`>ukn|eNI0kjag5jXG&88|D?zk@_J)C^OK({=&iU~9@_>@GRHXPwy!5Zm|IQJ
zI?ZE|F*6~aLQad^GsmCb@b@BnTv~cW>1F=*rd|S#q^1DD=00%csbJvId~FH*vsc#W
zsh2<$e+00V)sF^j`ar682quthf}mPJdJYT=>IN*Co96+^#90qNzP!)E+WE9YByI;N
zXk7_=%l6hbn($!{j?+aE2ENzF+4jDY%*OyTMl(YK4;}+Xy=2u@T9E@gI}P($Gmt6C
z6`vsT_F{}Li@hd=NpF!F3XPc00FOqAaMwPSpAz$=a2!!eW+fukRZZF47HnZd0$u%H
zx;#`7e_gjMu2s2gv}eZvnD4j(;)4Ie5ihAe)L<az2DKUY+Tt|}YzEA>ny)*GAvK>j
zEnVq<y7-k2*v4+)rXJCvLf0baG<HLRLH=kvW!3|POruy4vy}!jv{20}m>s!H@&&wR
zhixse5a|lSUVtp9l0qaD(sD98t36}>mD|7>noi5klIrQ_3V=`q7~pY^v@L)qP{9!O
z)wx2q>YzQgUAe}ocQM_3*>Kf3E+8~G2T1WH%iwWHwYLKuQCJ?@2XzAUxHEEw8@M$%
z=xoC%Q_^s4kYu|NF2rc;rXyil%(gZ(aC04yT+jl^D@KH#vHX_3WWfIm>@jXju^dLr
zJofkZZD#o?^*K2?>v#@GG&n~G?KUS`pZ!jLCwx9c<^D}aPXWs0DCN$&f!=n~A4>t7
zeS<*w0ZohHYd|DM*=9+?{1SM~=6iBck#gL;mzMqnz484w{gFR$L{w|Ah%t3-Jb>ew
zQzEyD>I&#^$HDm>uPfX7q7=b1#uF6T^l4J#iTgF#re=VPF}GSU1<741#)2o4&(I>s
zseg{s;CZ3AN$7T5o9w<l++XL-A~cL}(^lU`IV|JgmVm_{IzlscxZDdt%bIYkvHJTj
zgFI3M5iI4(-a&rt2vOMXwAYJ1<Ga5I9@BojVjt(&bT0d2Qah0I$ZtaA%n)#RFy2jl
zUEsJ@!ZV4L%-z+Yei01X9EdS}&!YmYD4a4(XV6>Z?L?hT_9iiGXf4yB+Zy1(eE(f2
zt#kTmI{o7J)laS;HsCQ@oAmc(1;8YIrV0|xgUx<LM2MCxG1ohVq?|1EPVkVaX0*Tt
zm28N9g@a88j>vAw{d+keJybh&rF;;0a&}uSLhGphB1Jt;G?N1Xg#T)&^`PfR2zTy%
zt`v%+6oF0CtGSaJPy9Yrdi;B^>Bm@$$E>ZbEr{rD+Ql={4daiwbKC0c9VP}sbiSY|
z=)-X?0J}^_|E986JxR(hUwv~jO7X^C!t|pQDbs_!;yJ^mM>T<OQ9Aq&Gg%KtXpF6w
zDsRBT`vctexpz5+n=#7-|Ng-A6$98PX!EW8Hi`e(f}U*}q`(2Fnk?>*CGQ!1x*D4W
zN@zDUz!gNQ{hnRDI!4N;BqZ0$_a>3mGc_ukMhl7B*6g2{m=eVbLr!gx7k}F=+TixD
j;28tg+Q#9Pw8tj{OIs;I<a!Ah;H4m=DqSsU9`b(xjy_s2

literal 0
HcmV?d00001

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.gif
deleted file mode 100644
index e48d75f6478d845f48f49f57d73057df0baf5c96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1764
zcmd^;`#;oa6vsc`kx?qy(lo|(RU{<QGHT1xE0Ut9RFYO~=(1U(2s>n%mYpt}Yc--W
zJ7SixE>YjqMAl}a?V?y@%rHt9i=vv@nb+=rvFEqvoaemH`Fx(&<GF6F3v*8nvhfa@
zNKHv?5;v(-Dog<;fm#+A0E+;}9#nu0L<8;W{C_73u#y55KmsxldnxubHj;rr3s$lU
z1PMY4w5h=~6*6I>zM~nG0CkIs1Sx~u9KBAU1R=8x*MZsUiWsB_QXzV&P_Z@OzQcG!
z!m%GNU04b*L1~!g1ElC2==i9a%@m_S1PDRVS?Kc-3=%9U!O;gCL9svRbD63FTaD?5
zJ{>d%<VsQ3p#>z-=*nc4GB8L*fI+BLY1L9eWz*SUVRqo*DyZ^+3@zx1Q7TfY@z5wE
z2taE<BRHzfK%?Xi1zHRYvS{GoUsq-Txrd>#26T1Pd}A6kH6V))k_D+B`~Ynrh(N=9
zO<pGoqa=eNW3f0Kjy4<fD0pvSDrSpC6p_$b2&#(Cb|fh-#ug7*fZsIrJApY>SO2In
zCg9AuDJM|Am7D_FBr+~ix@JLVq1If80TDq61LQz6v`C2M5Z!^01YHiY;gB&j+i7@#
z$X4574t)YfnsxrKVXG0Y`3sn;g!WWpukwqxj!&JlIH<Y2P@Jy+xn8bUMNwl0-7&JO
z`K<*~Ogw%xUKibWm-x)TB$eJPbvtVl+Tzr)8TayBLLVpORq|W%ofCD#YW+jn3cY4g
zHnao?)?eCiNiS&e^2kl+wv_SiJsTa`BwQs(F&SdnZmtMFmc79!)@EmwZw1+UB33A=
z-921fdi98XH@R$rl2jX8zWZ9*eA-5z4m)X+xmjh5ZQfu{%S`Ri;<&g<_f{T1R&UtA
zAwqK6H%DUQ^y+E57t#F6JMNeLPxkJqG36Ku6_;;x7H2bztp<6GiXp0G^r)o2DW|je
z(~9cH&wUE-$8i0Rg(#Y@D5DD$pO%a(`l5F7C5|74N7A<!1eflJ8Jiq^F`a&rxjJb~
zb%Ag8ebxk@k$lF`#f+_!;>k!kY5m^(_;g+R#e_LKI(ie0s`&+p^fb#tjzRd~^Yjl{
zUPWnh(*~b%>`UnLGYso$4Ktm21`XVm<Ac(ZZdB|3Q)?zU+fI8~3i{71zcJANv)@{4
z+1Y@thB;Y*;exR2MX?H5PDq-yJU2XRuRJfj?+1DQ{_q8%Tqoha(C_tHCKhsIq643w
zFmrFF^R&r4s{$=u#=i58lDI{M^SZZxQ^d8<<rhs`<r;B0^PpEmYPS5EqTqt*WW?9(
zttI>uesKybL1DgY$sXmE==jJZmCK(DdB16V^3ea<MoWQDm1R|=_YL=Kf$uHyi>RZw
zyBY1Cjqc+^9>2@SZG@CHFWSoQKa01kphTR@D{P2AW?NPhx5Ccjdj7e{fW95ow&jm>
z=U(-GyX1~t$UBki>x-|8Y7g!HblY24I`B+TQmGWKUn-`m>i0Dyn$8%i5xJIbyLEi#
zb%#49J6|5UeQHVO+eSubqr*)LPoI%1mN#Eo7aPo5Tp?JN(b6wj=@_^7zMIa>1;6d2
z9f)b4Vp2Bx!2gV5^iMxeyRnD7s)(^ik-=qSd3Nau(PF2b^M^aE@5?G$%qwlj8=3Xq
zv6sVcR*i_GP6mB<$)TrAaj(<zZtLSNvnRu%Zo84cWKYBS8)|wY2yS(6aLt#o-KVa$
z)^6uo1y8tdtgB}ZjOiX>9@-L?<X7LC#PcJiNyGXtM!2R2>v(_g4k&h2u8$u&<1uQ=
zs<ztoL0E5Nl<@ZP_(r>tak+%~_ibyH>nN%1yW(}~>Ur^FY13aO^gcM2m=G__=t*oW
zi83W+1Dz|CtQYp(tGd%|Oy7Ta8TRY9pJbK3Oyy91Pq$LXnV@mmiH;#Zr8c=ym8Hr0
VU54$sYroR9EK8vW>~I5C`~yt@kY4}*

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.png b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a040b1b47f63b22ceb5a7742c332afe9f16ad15
GIT binary patch
literal 7888
zcmbVx2UJtd_HTgD1wxUIbfxzq0Ro|ij(}9D(jh?TO(1lXCcPt7dJzzij!2Q-qDWWz
z2Le(wioU~lzjyCl@2$7if4!`AGW(ppXC`OQZ+?5vPJ+I!IvEKg2?zutLujZx0NT-;
zi--XDt~YHc0va5j2kJ_ohAHNK;Kt6u6yd0&1L6Z@A`niT3kZB;0$hy11p<Me$ASof
zmI}D^OK?DVK#OyuFTwq{<!A}se`G)pf*UF$5I}2ak8*H8`Z#;~-kZ#320AXe7@7K-
z>S#mlJw1eMAA8z42nBk0-E;xT1wsMQ!@<{<EzrXq=>rXv=lI(K3dlE)g*n*%Ht}_n
z=P=dLXH)h>Ij~6yi3o{sz)0BG*yK=;9ib0Y)c)xX+{tq|`}%r8g@pqG0)zs@g*;JC
z!lE)VGQuKa!eU~AfQ6t>5YpE+P!Q?E`L99#_c$sJKK3XVFJBi=B-_onwsxL=zVaL#
zHxvE)^RM6O5a{xsnUFsJycY0+!Z#XWQ6UlGe~%4xmAiQg)prSWa5qzN@c`Td%mEV<
z5s~}b{{PbaXU6~PY5M={`Cpp<v!}6-14`M`1DMhm_MescXWIW({?k!T_~y<3%M<@{
z^WRSaKf_4mg#W!}Fp@yW<tq?~8H!MW8wKJVJtFp{QGMN;9>z{;#>TEFVyk}sf@lkk
zM)%tqKu#m{?x@plvcR)G|CBi}P}$Bd69`sZ8;U!78lTuA{~aGZjE}EEnF>x7gitBb
zwxp(BFPfC^6bt6&KAsbo_aTL@K6>=N{_7>?>Y+|RW~6)c^0K+IvGF3v+ofZ`rbD@)
zD)F;db6aa#K^Z+x54%1axL4@-NPKJUw+{0kYemKW*IV67E$jsE<HyIx;T*`$4_yfp
zS=m1dC{LhZu;@&sZ}a4>Tens`mK7EJaBJB|Pb)usrD94~#u*A}R0qW>x<B&%it+Au
zzK?5k7^8)c`lVC&t%&kO6$~caAr*>X`!@SzjAkHjU~5p<8XWy;g6M;iV#lKtq5!vS
zI0Ua@v6#a^+JaannexN{JO_pcM=(>6KF{&f4yA!0r8sS3Bbqp(et~6T^M=n7v>-1V
z8vGG5mhnF!An6&z*Q0o%w#-bUt_%LI(@EW$`yme<i8T=~QsY=(G^Le|LFo51MBhoY
zN!~UJKEvaa{fTc(Q_x{%_5PS9Pb_P&OZ#q=b*gARC*f_$%yR`Nh019mWQ9UwVTM_-
zO27;6Bel7OjPNQph21aW_2RO!`N)+H_|bA3XLxw{yp~i-wxESt90hA7w^o*ZXlS=_
z-sh2&`GF|H{Ur;}3RoD{2CQ0H&4g^#oTfx7mq-)Mtyx`2cAD`1>2oxU|1hGeYM}V0
zT}*57f{O3=2;=yt<|Ml{bIm8-OVUyGEpFp2Jf2t1B-Ont-f0FjIiat*#}jLf3VP#F
zdg0p5QN0{}Gb$Dz>$il~JCw?v<Y_RpnbF*)R7K26zkl-}O^<Y1xT=i~Rwa1VP$9)$
zUw<Y=(;W8Gf4R$#|4}DO^)4wnd8I*_+HATW4Dsa2J4#e7hmduz_VDnq?={vhA1vdu
z^Gtv)8U)W0w$@z_yJFEPlFN;yU_}}i$#V97-y%gzGK)LjA}(GjEbS;ezMMft^(7CX
zBA7QZBrhEfmuT3KRD%@!c0;0DUV?vOcB|W429caLGK$Gw<CQtz!6dgxD1$_D98*W)
zhuXSVQw%)(I#<tb^x8wlt}NM#?4@$bs|w7V<QTQz_tVBzSCeBsdw;|}Y_!tp?CkU%
zVF{R74Okb<b1#`z_*1Y{XEtvm+Sqf+Sa05z2=(2Yv4P54{`%|HwDV9b85g!D7=l?8
zYmdfHaDBPZQlDSG9Z#bI>5cGvKuO2Iq_w!kYtil}9+MO_2u(t0?^plH%;MC9;B1@G
zx|EnFCMJ{})aDum2b0AF6e6F0!g^hF`puzQlY7jHMv;`Ryt)|yqS8-c_pgYroesF3
z9xhdR1<?=}g<YC4N)QRtK??7CqphC&a9DojM3Ka*P;`0pN&Qp1M_F&!&$<2is{NHt
zpH|eiX6K{sz_gv|V&T=6^K;*z^upT>F0QV8Z5|=>gJu|a*`3iePO(2Rq;y0N>(o>3
zNcbHXp(}#F_FTPGeM;LJcxso+AhuZ<`%}vP-7V||#=4>n9qM&;-2F{A_@KI~ytcz-
z{_b*5h_pO*uS_EF#0G&jd*x`LuMg?DShA1^xpb%MBOXQVP8Di#sy!>Q9g6)(J11*j
zc5p>~z-W0niJ@U%;j5MXNCWX!W+$6lCUtOvRS|7I{K!Fgra4$5mqy@n6hp>fQEtI4
zZk~pRza~J_KsN`a5_;67Qc+QH_RjE&V(;<loB3?(Cy3%FSl*bJ7y|?%p&Q{{HbADO
ztDDt8S4WOqOH3r;6A&nuUJp(8N>^7=(TBq$xiUFXY-DGBr|+1+DEX6qJQ_MWb%pEm
zbS|$d-NJJIfP)2Igl_qIUwB^~6J`cu*6N(b<^Of9hZ~3OF!45js!<l1%q9uP!otF6
zx3hxfDDb031ApN(+Yd+0V9=-8=U7IoCkI^k@lzc=pnzISo^dOlX?dkc+`pFdu!d-^
z$N_evq95wl2?q_oio%~gFi#BNW#XaWBBtDC>GWMe25CgxlT@<X>cc8(Weahivl!)w
zJ0(NQ8y>xxJ8bOJ-HMU6FMw)jX_b|ha=5Pd%J+Pmk`<feZ|qhAmeLr(xDpo|O9j0?
z`C|a9qpZV!Jn-ZCYF$s(|F6_6+$bU*y3?x_ABwQ^S@o7bpr@zbKc^U4S>4ge6^rTp
z^E)ID)?@qr8P-PU$@fh{7gd|26aAAmoBG*z9Bjv~QAteY&BFs6^m!s@kIjTvDisOe
z4;eDzNN12B5D2Amb6~$fGBY#Bs_MH4vPWoTyyW@$weI327~P}WXW=G-jxtFjGqPTE
z|FRAflYAy;(+@&Gp5<*OP<))RCZV9H`nEg$zU%Z{Jpw;IAtCLW&y<|}lCtU04nN>n
z$@p$!b>k@CrmoEgj1^JxPw5(gKK7qKE-G$^+1AwYRI!Qv<tBWdxQ~!l2`aU=3Ws3E
zRfFg+{kS#|x2zQu6s%z$X}bycic))JSMGu#YB8~~P8Myh-07Q+#zUQ6+00~t=<uIM
zuje!eo(q^Z^$YM@@{Zz4lXBV;c@0A{o+aM$s@T{X2y+$0X1I=G4;E|1<Qo?0jI7Ih
z57!tyG3bo|@>|<>t(w>$?WvFe-{zA{WwoSczeNG^J|7z%>ANtam3b-Xe#fkVl>vK<
zf1zy_W{LR8ZofWK!}4W^Kq&9&y1+uFiK(TAxa_aEj}=(mlXHA_*zfQ5`)eE0q;Fa7
zdntAa>}B^~cyslmqNAfnndlpCL;Lsce<FF~e^hEelFT5y8uGPAO$)zei*beX{mDiY
z#oWE(P^FNo<4ja(Uu47pUaI3Y_F|6FE)^$>ki~DboG3b!z5;hl0B=S6*8T3E$8TE1
zQ>OZa@!!yLxqq?u<&;WJ+(2&3A{kVe8#0N%CAD5EneIC6#fDSe-q{^L(|(#UvPIFb
zdg7+6;U=t&2ufTw;MiWubaF%-j7GY7@J6OC&58t{I|uLNI+b((I2~bi0eGQBIC7mA
zl2RfNxBQ8Z2}y?K540PqA0HiMTbZeZZ;wc(>U-qo<}UPwhXanz?nWs5I#K?Z4Y$f9
z92vLU=&<g4qGm!qLVtvt+lM{i|CmPTBEk{l1;m%JmQzk1wO8(|zdpZ9D%;z0Mz}&I
zFlczkt*mKF{#)ANJa3(iBLYb{`s>l#ph!DfVYdZ}82Wl3j$~~Q)bmkgm03b~{AViF
z{^-+Nn%r5baVzb<j8$0<F8-!Kqr}sp`kk9a&s0vwSV4*8uP?06f^9Y0MRCGNJ5-t!
zD{&lt|Ni+E1p=LV4FQ|MCQs$gP*~!#XA)h;mBji4O3Ez*XFS;x5{<7}WmO;%Y}S$=
z&$u&>u=k8D?+beqYaT1Uh>ClV<5kaiRWs(wC;tlG?TR{c3=({!Z+eivWt`5N6ukJQ
zZ~AxCl9PMs`C#AUphsoUx$l=Lv#l9b`R6qW0u#!Ay00%kfl1>ctbg3o$@}u+`GKK8
z9C7LNPEg+hz44H<MIt>L5Gh_=Nt=GA6@yC<6x7bs;rh$&V_nI$-V=4u;@pjQJN+`(
zeG3q>c{B1qn}c)M8iv!gzKH>XRi!>M*^SZ$-9f7-H2EGv^!-R$TW36y(gy6#ZUYe>
z$n9}O_0$#2O+9|#zb47Y)2*B7XPxnJe8PK*6T$-{c4oM(OWZuWATOCPsN~t}Xy3?n
zakpvtlh!nbMOm?DzVb4wbAkv3`^I<u1EV@V)pK{9qrRab?JGy~0|8sN6`72P$@O);
zUQ`i;PDdWvUPg|%(DRRM{B=?zvlcUWXSXip-KJ+QX;**kpYK_OUvq6eWf<a4{Q^{z
zC-{FnzzO6Pl8~6;i*n!&J!Z!37&zVH?B&N<;`_isJh#Qk3&AZu+<MxJg-txzK3S6i
zpUe#GF6P7#P_Ty*KGvi{Kst<@m^E$n)v_&?^{1!CXsB7>kvPAn7RReSIP}eob$(zH
z_ditMf(8j0KACS2Nl8g4_o5EaO2doRXMOZhAcHeM8gw#jG4%n3LVdv-%iu!MXkE%2
ztnhW8g@%7UK0lFv{gl_IG?!Tiy)GwyN233HGX$AVkLPAe*wH!@>7tLkojyd9xg$@o
z6exlda+?coRE&o-#$<4H)oZnMP5pFK0s+>c*0>dlgnSVa`cy@(%&n@RHR>jlYdJ*f
zuR*F!I+L*!?~RAvGXyv`NpVz7apc-~Sf1o3OKy27DfzJ=5tDD^C0vM9zFC<8!&`;v
zIeYKIPM0K_L&c?=2zKV`NLgM+RMA1tvaBg;4!b>JU?i-GZ&Hw`#_%q8f8<zhzMkAV
zpP6la(^dV_VOiT8dQaIX>pA7j9RO07IX+2Hr3m6uPKV}~%bfk-**iWB2I@p2aNlwP
zTH_D^W6Snak_SY9ZF0tNscQ;|S|wznQ;mfkuuW?*H97*&=bR#gdC3XbLLbmRt&zvo
zh8&6RGWtbFoTgi_jJe<C%d&b$qW_^uL_1%~W1`_(f<KW>B%8o+#Dyj_UQ#pm76XUL
zt2td<45r+T6pb$yN6x~RExFbk_U2dnhYN^zLNZ6w<1wmEDq33FVa);RyV@ca52j{O
za=e8Nf*L@c9%^SBsV(3)G0;O)XW2Q|VI+}-96Iwheev39y6E_J9dX;?GI}E_r0uZ}
zwa7-DkW#-di=TE`6nE7kNtaNK(l<L_9mwSD772@*&7a@bzSwgYM!CSIp&&U?cIvm(
zZKXcBGiJq-ZnQf2QaVB`^}9PF@bfx(iVPOFySfGU4TSDOflP}cV@4(|hiz(exSC0k
zO;Av$;XTY@oF-4yUJZ};!UusVGtK#{M89r6*@crbF)?v(xy=o=8FKxyKZGmnbeL{?
z;bj>1JgqOL#39G228bbD9_0<h&kGB6=zUCVe|<kaI{}hK8Y-&N(x664+$Od_=Unp6
ztD{fZOAU`|)4&alY8Ws=Te}=cG%;m^+)^Yskhh<3ui)J}Wh-~GIr_ogyakpyuYsjI
zl}bW|SSEs~-&S~`Y}aA|;giJpkvA`}cG-htF+og#;5pCpdZYrtf+fj4x*ZQd`2QN{
zA$Z{V409_yqIrp6w{n4l7`+`&Mi6D$_|x3L#c=#{w=Nr~u2~J*WTK_SDLd7iE9CrD
zrMaM$n8+q9I7T5c4V;ijL|v?jH8eA0s3`1Nh~AQ^6(<6@*^vMB0&gBdPtT)pPb%s2
z=N)xWu{++)CZyUb-G2QR$WMJGuH_10;bxC^!^GJ^&mtv7M!4K&B1r<#_=JRpy1L1U
zTRmz-pl>B5Y%Z$$6<iusU%=IDJS5_qN7#J|=*fsn*F)dJnp!srs>z?VI9dJY{j>8_
z_BLb_)SoS=d~Fy{Xohx@iktJ==hKsc(Fx&3B42iQF<V^Me>q_JIiF5hc4%*JZ__X^
zAT~EQGd}R`REE3jn+2}(fWhN?8BW_@<}VI0+u8#9Dy}G|gAcH@u1eEsO^R@OuE9D%
zAeGBVO|^0S&BRUUB&H0aw?9jnn9!ENBi#v+@@swuh6|}ae`;pJjnLG3|FWiLyiO73
z!ibxrcV9rjs7wEd>hmFYTn#>n055OaJi~y(yCG7R5ON*${^@DG19m9XT=({3sVb>B
zs)Rrs&Bh^n#dz(<ZgKpyG21|rAFruH;5%uBN_3oNcDrGmiYp6~!)td)sktfZU!wKo
zgc$aS-*@71P3S`2+o(e3!9QZSTPOzkL{%$JM@}AGUtjawtx^3<x>=CNF|*NaTBo7o
zH;@^`hPxy+j2H7bjUFd}UB40EptoW9jh3QkEgei4y)3&7s~~I(kYKHHqsIZH*V-Pc
z5MQt;Dn^(6az(T?y6$vW9~X+IA5*G=gjldB&oi2`RyucFexMA?p#+cji*OV@$jM~V
za)l=_TgHLzK)+uw_jzovM_W%EauOd7`E_7Sp38^Pt2bweDaJpnH(xZlGx7$4)4c@3
z|HuIt#3;&|W(bDS%kJyb6gg{?6VCd=#caqpKq2q@u}v!FKc+qQm8rl&w`tHAt^3YT
zL6&AVp36TR!<=jJ=9dL7Y+KpBU$RL^EJz5lx<!CQUSF&d9xCIVco^AMQ<UKk$SPEN
ziY|}7H<$#JgqK;g(HFC~Y-IJzD`3xP-$r&9L{px~08|RALLr;Pfjw6Me>#t42DW3d
zp^Wqg20%4cGVBsY4lwd`bpg{~w*ZyX%vLKb4%o!IMpI<|1b|B1+1tEWIf8i0hi{ia
zHVRNNwBE0uzS;URnLbg4a6om-ykKb;GIMd&`t$OrOg`jtrqgHl%e_H>c`9)52)-9k
z$u|#-q_9@8$okJLR2y#B#T4<Baf<CPqnV+;8c&oJ9*;tPIINxT&+qRRhx?bW7F04&
z_FrATa-1xcbX(FlFfb5bTKJ_3kncpk^mP2p-fUU5=X$U2$p-uY(^xE8MA53gv1nqQ
zNg;IP<{y^S)y`Jw)jv6C5;!(CRyiA5CyJXd?OE9qay7R#{8X}`GpJ_14IhUKIJ<Cl
znD_lUBh|^1NKi{+T$I!BuJ)%K9UUzJj?!~l!aXX5P`{RZD+*#?Pk2j9%a>(xQ^t*n
zT=9(j{93}59$mGGc)aX@js8dp#|ipIm*QjMvlXA|*)G4sJ>Y1U#c~dmfC7_H=L@MG
zpW0_<%hZV<g0p`8*e%Z9>N^=Ejh<EOAy|E5O7i{fTa|;4ukHap(pEjSQU*s{qwz_f
zN!l$|4#iOz0@0-U(HsAFfjumHd2H&*%rDwKK0R=E7dTq)EB1n+zG(F9_w#?z(b3^{
z=PQs4dcGF^CyWsmdcVzc-AeTk+31EAu<o_&GB$;he*2V6FN(IAlj&fM#5!sP^gW(J
zl(?Zc;&=p5x!Kw3g|Y!z;+3+PP~BBaB1P8y{rySfZpZC|JhnhhTbOZ?p6RQf!@GQQ
z*F0I%F3*_iZpdC|b7%Y<pnnxlM*AR1RUi}KU9rqvgV><=bnFEhD**sX#N_kO-^7C+
zmuK6HGyu3Ny?h*k0dSQ{CpCBH0dZxP2HBwP3D}-jie{M@0vOF3oXp%O18mnM-krGu
zfkwr!qf@MhosAfcdDr~We8$R?Y%agsl;Y85<71QEI*OQh{}8P(dO-~v8@AiDw66Dv
zF<g}W?gIU5Vofjs%GsTj2drwORLsoUK#_Y{W1x+m60`${!{-uTYM4Tn;*^v>^;Ezn
z1c-{vU0ht2HNOnC;Q$c=ZA$R=6->auWzEL|`!_Y$xNe4TGI?sl3NkWOh>3}%Ci^s}
zLv|@a?{cW_iHjRfX|S@gS_{9cqu4$5lZunS;guLppyp3JKsWTz%1X#dH=x~4*E0#^
zXcc)#!@?pcJ@F2ge^%cnOd?u$zCosxf*)Nno|nfsX!QI8W{HtZd%k>gg$n0fxP%@k
zGj;}mX_w+Sc_f9B<ikD`EP_eiz8esS*o1ZHQB2@o*-lFyf&jmfXT0U;qQJ=)qJ3)+
zM$r~f9KU8P9%=<{3uyJzq;UP}4AaGk-~y6o?s6jA9^|31@t7|3a>d~Fzc><0je~>J
zlAhet(|hNz>@@Jx`~7&>1QD)-jVYa8b$mP#2`Op%c&iDebpSJtoUf*q*0!e(J@4Bl
z&oD0Au=~kw_J+&zao#y5ym)$&MThOpUb5K~jgpG+c8x)-7rB;6d3yzg{XLe%LF%Nj
zO_G-^{CK8OME|Uo%WuHjso+R0{1_EAHK{%t%P0n1FNeq;m)-meTY|L8ds$c!b4X|i
zgpskPTEvn8G2sz*HGuV+Ud18LIT&(=pG>9Hzt&vkto*t_G7;HRfo~huv3sX!A#N7k
zp$;5>DNo!1loi#pW=%~3xLc_MHLSe?QqjQnC#FzoAd&Tch1(H4tp?ECN38As$}@lg
zCrLIA<e329IvvJU_=p3DmgbMBz51UG)c;qy#Wd}rc~|;9y}2wwiwU9g<JEiua%N}R
zk$cPRUfbih&ENP70#!k!sXIYH@nXIlk={z(KP(B*Wr2LiL%z=d`<1u9&lY||&mlBr
z02Wz4>G1x%_o3Nd;)X~44kGagnJ16a_I*9z5j;Dck6t4S)zOD;O7&Jf=1;8u3=p!8
z_DHu{V`$$p(QF8M^b=ZJyhc_4CA}arnG&W|YOwf>Ucvn|S|Ljf1_p*TRNsCBiyZ@*
zOd;h%UM8ThdvUP%bZ0VO9iVi~BMWW(B}w>k*P)PkyF0@RP9p1og_j1=$+Cn;l>J>|
zL^q{O264w3?8PCkuyD%GRAFt8h)|sY2AuHpX&F3<V75TU$9b{F_{=`!IHlv{*sJs<
z;Fj?PAUiLKyAvD_Fsa&nrA`?sozTqYP+TF;*sJFN6;<j31o$vH?}R6dmv5QHzM}5r
z#Osxx5KuxZ2j$coHo`IBNa7KRqMQ@tx1Gt1%uMcU>mEMkX_P&7q1k?9ZmlO|e`6r(
zfpF7Kb91xrCy&?r?Jiw+c2=8g@#;;Rm8RI4si~C>E45#|P>wrz$Pi2yx-*gM`}<c=
zFm}Ico901Iyx0C*MRdi^Iis&m>R9?cEhU?*V+&-bY9sW7u~YP;3>LlDWN*YTDQSF_
zUVNCxmUAw{%{}af6!CN+!g7A-X5Z_g*dim@kP4InKs3EXp|$G>pb_~HWb*YRfJQkB
z1%bl+n`5~dj%AM%fW}kz>n3014H_Nsy)KH905rb37@F&30MM9!yMHm{e>M;ZO%vQ6
zFTldNAq6IZr{ad{MNazS_`Oc}Vt?CS-Z!StwF~ML#-q~u$zrbz1Rhhoh>VPk=C!!V
zQz`{<FS8;qY!l+8c4@JrC)CtWt`qOk!eHZLW3y@`4a4yu5egEL=MPm>TVOO)%U^Xa
zaF7vff1>FF?QFHQwC1h&SnDZG@q8d}|7K)hk86cRFcF-N=<DmBRK4tF`XwByXK87v
z{ZH09|4X{><(dVa$kf!-UF~ybN=kMG9ef6N{G~WSBTFVs1Z-~D(t4HbrLK0dxM|Ks
z;eEB(=g+Co!m(sNjEf5k8&q+3IU=gPH^%J-J=}AS%3!FMHKwd2#F(#4b8#ZfDe=5d
z{SoLAS5eYoj^>|C$#9|x$(SCEcph>gCD1h~&%5<?>thz)tcy(|%_J?u6xeT}%Cx)`
zsw8l=Pum*A`%LL`&1cJJ5yzCKT$Z(T_}=9XB2+4pS{)WqZ-=+Hy7Lo1%X4nv5tWm2
ziW+tpztQ>RstU1;mZa=UxCKEjdBL;RI1Xr=RpXC#9@lO~;Bl7NgHNKYn?Fn?gj}0!
m9wX_#5q&j&IMn*+4~2I*)x?o)mjBJa!3b4dl?Ejn^#1~!hAzPX

literal 0
HcmV?d00001

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.gif
deleted file mode 100644
index 24a2999519a740c9195d052416f0f0fcd9f162f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1776
zcmd^;`&*1@7{|ZwJ33h%R*dPSNT{^YM0Fu8HesxkL#}d23?f2rD#>(^R9H)AQaX%7
z&30}o-rAj18%DcXJ6lxSG*fBEvXQjR?98?MU+n$c^L+37bKl?lxt=v^Jzd=bGmwt=
z&_qI9LW`(HrBY!MFaZc7U<yzKl5C(2@POmMPwM;sP9(65gbJVm8Hl~44U>mhz;AX$
ztO^7TLJD-K!AuoWVWG~^G>V40L`8#^L2iXUXOIC%?Z7=?s#+0&u7Fg4K5eLY8gTzH
zyr#h(fa`NC1PMJ35T_F&`KW2^CPGsMAONXj!}$nP8kCesG6L8j9glDdwN>D$83Qn4
zfw>5oQq)TrKn#<mjHQ%*0V)EfgxV5As10o%iw6o*{f<>bl?9|QU?4(Cg-VTw#uh;U
zj6sdtLmksJHkwH=Off_;k%WI&G6l#yhGk%>E3D0#&<H>p3p53(H@pEYAV57gfhKE>
zq<cusGc}b_R8mrs77sH>jL)7a;)yEA3W19N+A0>0O_Q$Xv!7Ccx1Rcu;HEp-D8d{c
z;F8oRCs4MPo&@FuQu4^>hS0HLOos@lAPB)`InV|M4Urrb%@ELF$w4<AHHT(E4bKnh
z>UCJbh=7@9od0nw(0JGU1?VcFrEBh0miK+UuCZM}TUoy7oY5?UOt12r4^mj{;OA{`
zW+TpGRkHco<Nd9~=e~CmSbb8DtM)<d&JrIy%5n{Q7M)eeZ_jo)J$awdcXvm=mm#^K
zee>=01se(s0_+wCZ_3$Hn)|5h?aNI9_uFw6FR2AS<=j*08_dG({i`>Y(~r-G3&g@*
zisF*HCmnlerw?R|FuZJ6U7|JfYmUT0+G1r{8MYv6sJC5TE2ua!vU26)Tz<HLV%nmE
z;>#N|#3RPM5kbL~mgVashdO@?@qHMh-yP=rJd|Q<<>pj}6sPPv^sdxA@^E2uyxE^7
z*I$iF@AIW4M|MP<7<}Zf+_u5sbX|Cspfi5ZB<*ibN8yimnOIR3{mZ-My(_Mt8C8x~
zKVH*Ijcd8~o*6Uo%R5PqoimA>ux+!9HBPLxIz=XP1JAO!u6>DcipWct6`q+NpZ4XD
z<$1kiVPB+uz2B@<LmyT@h=E(ui_6A_q?bIjZRcEy&_6hE*=z20-zd(K;ejjOp0={9
zK2ulA()_r$i=t+R56d!kC)&z0gVOfOv$*|d<=Kb1&3h7@dd7>A7sp9%p4X>MtaGiq
z^yb}g6dw#qaV~b9f9>o#Pkw&PE4{Rg`F2qUQqQ~B+$y~AOm8SPu4U~3eonjIa3Qs|
zT~d_(^7e4S4$tg6d}Y#BS<jBLo2~vng5ogykZM7gSwyjCmHqZYvGd5rI}>(I<!xiZ
z3(6D@-Tt@S^zAnb4C|Wz2z=_JqX^{)T7#>EbIm$ylBeGt@fcdkEGg@}_}TU92eEcX
zbF-Yf9E!%|DZ>r%`B8W3zI){#+z3WuX&^bTCba1#ogKPMpUrvQBvz(`@{LEfENWIV
zqmSOO=zdrJ!;Gcoi&|`+P)-kQ{jZfbuX}d5^4qU^N=C)*F;%iB9*mHE9jj+p*kpOl
zD}DPj$3?L{$9qjF_vz*vChRtCcGqA2j;Ep*x3eqny}30j=vsBl-Wv{YB&9L>CnR<m
z7PVb__{)#yg+Fu{l{`C4g;aF!6y0~}p6Nbi$%|v7*VB8yU?^+*tn804r2$KGjWT2_
z#okwXV}2E^x@z_|vOdbid17z2V_1Dd<AvJeHJPJ!ZVlzeIrS?Wx$X@fb)(7S_4T#l
z24T^vs)_ySmQNcLjXB~YgAEp!J}QKr_7=a-o7?+-B!2Mz(rt;2FP2Gq_fMbb?<&}M
zTKXX6j0?Z#MCx){)<DO|6guw8?sw}c<-jnb?^8`iW2?e3^pn4su*_(RnEuUa{W&`)
fQLUAew=Ueze6;&<G`GqiD)hk2DS;g%iKYJl6UmL7

diff --git a/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.png b/src/java.desktop/share/classes/java/awt/doc-files/GridLayout-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..850b67795db931fd2e2e37763e23d382f7e4ea40
GIT binary patch
literal 7846
zcmch6cT`i)_HP0KA~p0PlF+1gkzPXYA~keGKq3O6NpGQqCLI(NktQM_MVj<xrGr!j
z>Agws{0`plyZ5g5)?4fS^|IDvK4)g{nKLt=*|TS#7=1l;GGZoT5C}x3si9&3<X^86
zlo0qYMZJFoWMEGNbtTaIUgj0x!Oj7t>8Ps<;sr1i1jeC3kSh@&F#!n#f}})&h=805
zNcykAAbcPPU)8_H`?uuR*ZBXzKs^X)sH~|8<c9Y>92{Ido!q>*dY&=^iX&(vlov`@
zNBX{-i{L$bH#-MGUl+`k3P{#h8h|biUiT2bE{|M2rG4et{z^y#_^Mcl4e?jR%UO;M
zrK^uncJpvR+!hoT6lRkrMj#Nf9`=sX1}bX*r~^-OY))QY7-=CPA0Hn<A2C5Uj|V~`
zQc_Yv!lFW=q5^<~fTy3U*F9eWS5NkTHS)jOQE~9R?}5g6q1{{&SMA=jbMy9+V`IDO
z=-<D8y{CgO`aeCndj2ykV1PnbH9{hS!b1OU8&H+KDwWnp`#L-_Q$f1`(*yJ&FDfi7
z`&a(|sQFKi|D}ogziR$h&Ht`x?CId4?B)V==_UW4mHDUJ|E~N;QC8?`<o`7j|C;8%
zrNBJP6Uz$yd(GsDeH|wbK_F(BrV7%?7rbG0&5Ks`X|vF&5?!UD(wL6Dv6nuLk19c1
z_-n*0Qay@2PE?(8U$RAAPVnrzkh<AkUHA0sGq%|T;cY(dO>XYkP>$$FZAq{cMLH^_
znxe84|K`z^MovG!$@3FBulk1i`qdGi)8c?)YoGLRFC|06)V${A;E1|gBQuznT)m#1
z?u}#hs~k(*YON2U%=CEKG<^s1e;!@(CtM1#vCWdWPvw_JD__5BYARvSDM0xX;r`)3
zG+PXh6&H#iTutMu31DYum#8-p*2w}I@Q`IcxZe4BUcYr)ex5Rv74}n6_Edlw!;}Cu
z4wx|rV-7J~YJ31$j}Dz~?ZA>CzIMEAv5&Rw;dY-fl)-EFc7*J~V6LOy?UNJJu+C8D
z{TCXyG=x~ch~V8;MVP|o`IF|%kyNz_F}mQHhhliHP$-|Ms7})Tcnkh)2qY{jDk^lo
zBa;CKsteOQ5w=lrdRLscDh?kk>XR=RIz8;N$gTXqvpBKF?fMJip`vz@@<dG6a1Q-$
zYL{tvJtR>N{(JJJ&1f6V3%QtCLLDx3RGL_+5K-avwdIh57R@bYYvq=#F?Kg8K0lD|
zrg(y*<E4yh<S|#abEc}Qs@Lidp4H)E`bZqE!Fo{6y3tp}<!8+kIzdZ~m6es!!S#vi
zxEj|<tq0jbx2=3<A{mg$X!EG+76nVt4j2O=cJII>@cuUu-qW&=H0%dxO--7C;=;y)
z3wv7Q3s1)M_cq!*eS*2=RU;JP)>BW!BaQ0a@jl%;(?rK;(u@~MwbT!Nc`NEBpS~WH
zYM>shajzoNzqU43#$%QH$)zjrf&{IBffAJir^J%ao)=?}OkG3<-2bV3vzOF<^vcw#
z^&QH!k<vVI=aK$_Javc4<z*)(g<#o9|Fu#Yx<zJIxAafR?CNhTD^v7d$rfoR1)Uyz
z3q(R;_TN%C_ZFVo4DPKAq1VSMN_WIWXPXYE*ijuZ)Lbds-=5HXimnV$?qUhKfm;Ac
z&E8=yd_UP>7~!h{RVaxj`x4zzU5VSwds9DT%?IuRdvqF77UVzBw>OHfBML{8`^8II
z@=f|ui;Ms8@1e-RpXbIf=WU`HY1nr>tIj$^W-%_mY7L7_(l(rr)<5()tqc|z0Rvsi
z@?o*^8c@ysPVRp=>4P4xbYS`5w^~%VJZx%H&>VE?uk#=>ZmV&ZywtopR>fwRc$U!o
z^ZRmy<|~g<v)$w><`^uro!%+SsFU-}8-s8s2j`KJH+3<!ReEz&hUcf3T3yK;(V=Hm
zX3}qCQVa&)&Y-}?TUKg+@V6d+Y}lU}#OKRjSbjC}GP}--`Z>4myiZ+zlC{h>-T8yw
zTRr<Dg&04YYn%0Jf=p6WLiDhWsiqe!0qY_sXS;pq?`b@Hz*`PXR6C=Owr8q*wydQw
z)1aoaoh}cVz$0O~v+a&Sfv&EuREqK7ndgi1^ZI?Sdg$JJe>)NRS?l)n5H9T%ZTqQL
zdX4|Nl;_PhgQla|xE}@D^ycNZVU3KUGdWSGw*w9yovajQ=T~C`F^9bhmx1-?2R{pn
zj|SA?1D~H<U-^99E&pzwnkH3urWh_aH+OmbL3Y7M&!v<jUB$)IR(y(nGKpV`qc$N;
z%}F_oFMiZy_Z!SS?~~7g%$QXBr&xh0DQE@}rM3DWwyd;ZuIVgNm@*F19cpyahy^PB
zvcju){z>WAFwz%dk!z7v%@GQhXQ}Usix<KRzlNO>Qn2X21Gm9Vz&p{<)2kaB8}G1w
z3MZ5(xsxqFxQ`uf>j*g6L-Ps=6+U?77qy+l#lg}4XYLDUQD8DY8gn^xM?n`cnr>>X
ziAJOMCVhTu;vKGy-l_L!xx8rL;2LzBYBbAu;=H`povmO)6);wQF9npeU+~mg$ski=
zK7ud0e{76<OZ9w4iJU=L@$(!-bQUj@QUk$~(29$3<H4aE4XgCr6yC2=^BiusoEm!>
zRpRm&Oh5ImrKqTV(RXPpbK!dUaYuVx@B1e2RKZ>nT!V^z=jX+eVA(M%*!*EccX!K)
zVjP_S+ujYMy332xVOBC`$)t;m!<JOvnI6VMat}|>qTF1p|KX-?pTcFM&hF7%;!wg3
z86&F1)3Gs>QX%|8VFxFUtq$dvYyo(IK0nzXG_Zw%kJ&C#v;}h{rhJtT;I<;J&Bu<s
z0s;k$Vvha5TIu@y-WV6nlSQSvH6N>)Q=-^!5kDp=6`!z%bQ*5-`zcPmxWSLj!)L!U
z;W2Yt_2e1c91W4x=e2imxR(5U`3pQG|M_#K@rifN7{9%*VQZ0*k)n(m`O+UXw)l|!
z$l%NK!vcr5rRT+W-b5v<$1|{A!`>CEI!YotFE}~^4#Dl${MSnr@c0$Av|`sy+dMGa
z38AL+eD#;0cRqJ@EX+noeDFG&r<A-VTJBnH@QnAl@s%!<7*4L3$5H|1?fq%2URv{9
zCkrk_?xiO4xO+A>c;<FTCk_q{mDQi*YJYje?M=?yW(^hQ^<{dsF;e<MCkkgww$yI5
zBmSD;ayCvVKOM{IxATo_(lwHgz--#_9tSD-Jp(r7ZZh~ijiqeeok`Vf12QwX%wwH5
zU#e@ct8rD{az=Aa=CHHgupG;H6HNshifeyVOo?rz9M4pmie250vhbBZ@~l+MW{#}n
z&mq-=X%}c@Ff~7${JH*CiJ&WHE4K?eLu&g|Z2TOgCVw6({1UA8#*WZO`0n;d6a<9-
z=7-ffbkVI;zP7;|{qhvlMM+J~4!5l{SqA0JmC)aQG^Qxyv*~4Bzc;9zl|gL(NxV*d
z0yAuEI$+_}r268vONvKsOIT<dev;$D_w+#~yCiT1(GBmf`Ot_{VJ(6bH2yCgQpv{c
zc9Kf5#NL)HtSJeV#O6)u^yg}{7>WKW=WxIZGu>-W9<hjC3*pKl?#tb&q{_^8&e%bn
zwN)G5lY^q0A{obP4TZkvr(~S{;@2dR!jy73zy?p4Zt6T!^qKN2tm60`d@2wGSd~hl
zu-`ne#Mk_|iM0i?TEcVMsxeIQ&hG9tiYjOQ!#O66w>4NSUj1w=pVM-G&JJtP`TnSb
z4dLOt089x#VS-TekzFAl?tc8^ux@zpQO^3;@LLSYN_Fd%UG`H)lr(u}{uGz<-%@#`
zq|8#7ARjC+(5J|si#6@7`#7a|6V+%F7}%ATp9q>(Y3tq)%-!i^Y;RQ6P2p-BS<YOI
zRV-pxcz8$=IUsP{Rw~W9v$pXyU;OFur7~*-)*`}YaG*U`-1r>IQ=T0nyc)?megN4M
zn5JsO`$#x{+$GfV6%6X^AY1!cTjosVM|#L3A~LXI^6{o33-pzJ_`+Sm%(bSR;B{&w
z2pc#&KS%M_v7=>qFDIPp>09|Ap2t5JVyWL7pIVEXX$_y6#F*+H+*%s-27Oxi#cM5|
zIq=?8_afj@0qt<1o@RQ1>vppp%)C`_sC$d=G=aS7A)A=kO7_yLfCSqa*f!r~6?#aA
zw@CccP9|cc#Clo#$zAdI8izP=%EkF9E;usWQu(Gv5_oC0Br<eVufF<S$Dk-)m}=-X
zDwM2LEle2zcEk&-5IXQp4ckBSzm!M;5Y3ZTOpSs(Lxg=w^&}C2umxW*8m4;KLKwhu
z5awA<$w^b)A1?|YmidT%IZh1q$7yXeEnq6&WOy9X>fc?tCT$&@vTEMEz55t$b4V7Z
z@h3)YG~f5ThVGj-DKi@SpJx-P^$oPhZDU4jm(L9nV{<PxbEj9wSn^wo7mpr8w#4sk
zp?7fM1YeeG703<me!EtLi;8lzDwmgjL*y;77bYMptFy|=E|A$P{egbJ=fru3vUYS5
zNf?-hPcXf!ABY?o!709jO`YOEOg931<IL{#LuVSO<x;pkXqW|3Pg=EOD=L!f(dVh5
zh7D|?4_Jh9XJz2FrC7F@R75N@BI4w$I_F~0Gz`@2TTEx+?q2aIsfr`af}kshChGIU
zRz^7|jZ68ol$VOhlrv$}Uq4F?4@>Be$7oF)2gq+o=_8gH^q&<Lau_sXYG3A|zL(m0
zK(=DQBTmmko1Bw^66k7)%U;{aKN7YI`1a9`IM4njj!*xFteP^uPFd4DbBsuN)FI?4
zowQ;S1j&&WVe&*7LmBD~I(UChJiHWYAucQv*UQ+?Ri`vwe#@4$<WCa?lfW{l4UL=*
zKR#hBBKxye#f$H`pVh#dU(%>`^l5)*j=Rp785<5NSIdK}=ioyM36Sclr`6_|&PpGi
z9^xX;4~YHT-2@ZTti!bVgP<@cH>01X0k&k_1wZ+`LZ_<`8(k?|tNf6(F4~z6`|&K!
z@W~xx6yN&YkektyukhZN*+7MnXV^IEpJZU5<W}$gJ_!J9Fz$8@tgVoW7oR^i2Ls>_
ziJ;yi34mFTha^Wwg#ZxT_9<o~3Pj!M%CvNH5(xmII?0Mjm@Rfpch1tL1pr3`^jtO9
z@p^@bOHuCp8sSBk74m8}6*oUG59BSZYMPX2zx^6tP+q}Cf1CfuP@X!4wrS5Go&8LE
zq{jj$zkN(P+O1*Zb}eT&e<>pgaUy~Cmv~0@r<vBZu32XXQ`lh)_4pv&JmA1S7SxR|
zXfL;9G>Nz&Y9DREdCVaR%`Ys}j!PiWuGsV9hG<*BM!g$Eo{(oqn();`VLeJrh;%e^
zGWu(tue*G6Mq}$t9_}voT={EE;t$iDZ^6azZYUu*pxEA%mr|ZiBPC`YMYH6r?Gj>m
zf>6{e1S-#M^+%D%pYMQQRd4i!f-x+C-4>0VUtIj|-TI*W8S=w}zD-G{m-y_jk*$My
zs6^SF=$B0U?Ic2JEs?KXpFLRZ7VG<AlzJyT40Kb5TS(~X(7W8m*jQp|_gM%h7Z*|9
zkseRSAS8?+%)k;ygQI}!bv+f@qA8a&?1R$K(ozPe8r%cC%^l3?!3GUAbzZJOb*(It
zKk{)j$&1WPO+P<BR%31LL!^=xwI!n=TPsAQz#PT>0Re!xn<(=Ce<c%1_}WUIP;xwf
zlr~n9nY{gtRlmHX-FO2{$(^!oQw>`wyUu$}o7A+!yw4A_;z8wvi>=lI*EXsU$;rt(
zp5OE`!aj^5Lhl%aH92c&MN?-};S6<k$rd&*hxV!9K5TfcOwaHG{%)h(yu6~ix;pB(
zrILLZXz}jdyOqNRqhf<83$+Ks!^2hVTZj!gUlps_ATCx=e3-cK7mkR2F!lujQafs^
zQ3^r?26he-HriiyC&~y$6Pd{-5qQYwa_n7(sns)3R?c%aklzI1wNgEE9j`F8BP|K@
zbM!aGlEat*FGlwr=~0J<k(rsMnVDHya`M3Uv*M~oH#lA^L+W)J8k(<+DB<kVkxxp!
zey553@Z-p;t$xaPrKJU(ohq@3iG|&+JUtf`c|i-iRszuILYAzZ_E}MBzn%QR#R2_=
zy%pqxgWmkG@tzNZ4U~{tr7*y;_Nb>j`l3%REyygLpol^-w55N#B{^2_wUVn%Zk)pQ
zZKnOc0mbmJxRH%bnc%KG2x==oQ&)#7dTO1y;ySN*PzuFrz;co0Bmp|b9jq9rZ3ILm
zjOWXg1vjr0GK86zZJqDVh(5lA$rNID&A+Z6sT5e^g+ATy$=@u}bUj?7>J%WzenuEp
zxx+h7G;@<rm^bVx6AOzPkEYc`cmLq7UA0*;tZ7;^nbq8(qj+KR^L0Tsl2#}KPVohu
z%D&u>DM?D@V*5QL?8nsT1drU?rm{nK={_hofNp#9VPD@*NT%`{tXN8@r>i{3R=&3U
z?EX9?%WJ*K`-d5P<IB&VS<TBGPZ0WqQQiYu_cFZr-3d88pv-tqUfa$B!OlwT5%+%A
zXtbX|nKxY)=5^t{clirQVYwEyt}Y8-{(x0LWtoade~x=W5SSDE!{89^Ln^syj_Q4n
zqi9D^3fLJ29&^TDQ;ySE%3fPhrh*94(qKm!B_Z_Sy2{q6>fN3b=zDTY?V;5UG;&)&
z<I$rMXLEUSJiJ!REg9w!by({tk5Vy3AwioAYNA%ldvob6h#k}&)--}Gm&YTmN*qV;
z&r~7gr~1AzfGw`fZF>F3$_rqx{-GDqbK?W7Y>k10>4*&gF4#V=xLjFTlhwuVCvgC<
z>6C0Ly)w62la^*7lz_R7V<@bp#nXXV6usbE69Pa8<=kG4Qs^~1K5tKlbHI6+6|#Fd
zWde=pKCEhZypg-VHaY~{5f@4#YX);Qc~7ryu1nb=dPL;RN!gF?JiisA7SC{xYGr~;
zO#=lB{4MvOm)X4L5u>q@Q5D6t=Hd?M8F0Dr&<h8`4qZZ=Tg|7gCl{w%GB3-L86zSH
z{AOdg^6lawDP1@Hx7&!agms<?heZLF3|N4IIHBe-Mz?DGE{mk$V$-2Fx-XpCummO@
z^7#vqFCxp>PWM*sulSo!VCR>Xh8q2Lmx0@DLGbyBnK@+++u7+>%N<O0@X-v>^V=>=
zPv8nugT^092--;bg;z{%g2Z)SN)8NaK{;ngNJthYxKPsfe>VpK!3DdORkI9)^XU76
z8#0e!B~bHsr<)CTcxQ8PENt;_Fv5gk0h=FjCM76jcHmCT`fDM}x_$;Ep3yr8s}fe_
zsQ%PD@+%SG;@elzq4#yO#6ZyKsn{!ucqBqhEcJC>mW&S*yJDzTH9ykB!vp$)IN)GC
z$JE*{@^ius?WTZ3lYvGGHay^>U-(Kcz~JFSUYDuHOpLtiuR4Sl>?oIC8zw;G($ib2
z`(-H$*P6nqoo^9Yups<<`|84u@hfFkib9;99u_t>%JQwX?^Mp=%=z&w%+0m>i5$yo
z{h^Flloe$TLZL)*v6ighI7>h#mX?@;X0+`LIOe;{*faVS0WJ|@`&3`Rfn)yIyOWA3
z8sL)R_D82(cHn4eNkA##16*Q&%G0|91G0;wl-f=RfJ^voOSwIXfb5yH-8C{5fK-Sh
z%c^5Q_L+@3e@+<C0VyOq?zRFTySo<6c?$;Cgf+g2*L6b%;5&R!9Y9f7&6M$$^qRqm
zlczVTPcY_5U%zSqaR7=}9F{36pbsIS02kXJC(3KRA5GwTBvdzU=zjY2sVy0+?al`3
z&dbfsr@fn8jwqpsRKpya2i2Lus?0xr{MeTM^>YE(*_IsZgg<KrH#d?#w7dgPsI08K
zY0Q5n6lfU#?e&MsN^W*`<<Ya^y~aa0*fyRgmYA4$o^%<A?zz}?pKQZzLbkTwP)J}A
zp1<^sja9cll@E`Me9x>u7kD;Qs|FGaYW3FA)62N-co~|$O@o5J>R%ZXx7izrMQ~RF
zKB;gu*MY9C9{!LB`p7i~bV9FB>Uh>V^|bY5o1oyJ;LjV1Ni*Hok~Zn1@)bvdAu!vZ
zqi_@3p_7paf*PIPCzR!+z_fL}jU^Dr16$FPVBa?5Ca$wua%Wu2rbliBmF5kGPn`P0
z3wPr~0px60%LbK>*x%o;OihsU`B9xzeaWn)7{bQJru2BQ;&5d2eoz(M&CTZ|7Z{Qv
zBg2R)UwTrKqPx4hLFN?k>{>H>s9Irtz4^sRM6wd;X^kq?2yUycMxsC>ND}9lF53St
za`4x?4FW-i!<lMAZjD5al0;jl)+SQ9AW4}OeH!yyH*qpfS$>2iNQiA2SqX&zTUN;X
zLJCb-osqtVot@p1b{l6ME69{?tl@F98Qc{{u&?sh64nw`R8$~oqe$3eK2G_-ODOKY
zBFD5E1M7|T3ErFH6<5<aO(XutM#lRQRslSL-S3<+U<7+!5wtcKB^`c6&=Qc~)UPX6
zm%=l8ZLe6(7aAua0ZgOk8m>T$0ibsq@$_uZ6M(Y6PVTLcssWTO$E)-Ge{04y``2>|
zqo9=p7C9}z@hY5b@aY;S?vp#T1PspeV7r73Bgnz}xH3HCtipn^BZ@4qxU6|XpjV44
zqXzNp_v4-UZ&jX4dQ5WuRcA~dT^Rx<?F#w!lPw`Fk4he|k0Bq*c+5u^tT~}cD!o<=
zj^z%W%bIQ;W{jvrLlgaQrX?s!wrbW&z@ibU0ny8xwX&91-zY^B^NxA#%&^f8*XQ@7
zP_)jooiVq(mi4c!D|+<3)uQsa8r413&?3XaLBM2kD=7Tl5wGP(mM2_mzlul#FI?rZ
zpmh~hB4Y7v-O;LeNFZ1@jb{$TyYIb*1hoNiIBMxl6Y>mB4WK#B&DzPw*R4Ez#BVwE
zBc6*p)7=1~lQk|s9UZbzCI?kjx0s|nI3`0b&-Ye~%f5f3D4Bv+0KJJC1_n0%tdG^y
z)ZCeAUr%C=SAG4U@0Ewqz-k^UgA@8@?d2^rmCHm`3=mW2J!N+)H83<>dFk0Ja<Ed4
zUctDFl=9w0ST^~K)6&s>zsO0SDc=*`0s_<8L=-IfGMjbEdS($ZTXX{EDyWHg<!wq-
z^+VbwAim<Ex0IGf^IYUU;S)x&n@3nkxr#P5B-OcNR26q4&m8zJCOiHZ1Sb#q@LWEq
zo&(~jt1uTYcGfhRwj!Vli{w6GACqK=1KphI?d`p75)FFlIxepf>OQ^B0JZ`cR$q?c
zVDFCyQAcD$)LQWYs!>dDa{|0-?*p+<g8{}7VUDN(md-o~rQ8k$h=(s37z2=XTdWo8
zs|XywVCLpdfU`%8wh&ps6aNDux3L2nJ|h*zV}XH?-{mZqwBtjwD7lG{33KN`kKU8K
z{mGbaJ91+!hwsez<Lb-(9N4uf>%7D{gob=<VthP@PEH4F9n|(Y^FQ0LO=@(RT|q~u
z^?=%(KXBc^(vq2(r;dgTuT_?pSIeA|_S=cR1|($b9R&s-a!lW;7#ArZAt7;OFkYqd
z*ZKWxf>+KwOXXY1a7S~J!DmNqxkt$DmhB)P2M12T(Y>pt7WMvkEAXyzEyUK+$Vlax
zuM8_IGMJZCbeUiT$HE)-WcPKVtjOVnEm17>P<1?&<GCU8T-3XFyjY<qGEW`x+qY+_
zaO7;EMX}T0?XV9XJqs!j@OYbxf)mHIZpp1EGbF5a(imLlK<ZaLqqT1yJ16^sfGpl_
zx8_ix!GTyqF9>L;Sy%)Qo9(;)Wna<C@JrYbom@O~76k2H{ff?gN9i<nu7LsE#V%}9
zXOak=)##e$h<=xWsa1=O)9yS*(0&O}YbAuvUt@PK!xZ1HAE~BAVkk#c&Tfh-)tTKV
zFpG+LE7qBTs9F5x_6ba+*4hr8CTh{DxB=@sxzj#r#kJ@?m0uF&+;jm?t)%LnG|G{?
P`o^oNs;BZ^$rk%RaZ*B6

literal 0
HcmV?d00001


From fdda7661906eab63d939e9f482449e21cc143c8f Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Thu, 22 May 2025 21:25:33 +0000
Subject: [PATCH 597/901] 8356814: LineBreakMeasurer.nextLayout() slower than
 necessary when no break needed

Reviewed-by: prr, dnguyen, honkar
---
 .../share/classes/sun/font/ExtendedTextSourceLabel.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
index cb45be73f68..433d1d5413f 100644
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
+++ b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
@@ -875,7 +875,14 @@ protected int v2l(int index) {
   }
 
   public TextLineComponent getSubset(int start, int limit, int dir) {
-    return new ExtendedTextSourceLabel(source.getSubSource(start, limit-start, dir), decorator);
+    if (start == 0 &&
+        limit == source.getLength() &&
+        (dir == source.getBidiLevel() || dir == TextLineComponent.UNCHANGED)) {
+      return this; // avoid unnecessary object creation and text shaping
+    } else {
+      TextSource subSource = source.getSubSource(start, limit-start, dir);
+      return new ExtendedTextSourceLabel(subSource, decorator);
+    }
   }
 
   public String toString() {

From 796ec5e7cfcfb20d76a3b48c0b369dc73250f7e4 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Thu, 22 May 2025 23:35:13 +0000
Subject: [PATCH 598/901] 8353741: Eliminate table lookup in UUID.toString

Reviewed-by: rriggs
---
 .../share/classes/java/util/UUID.java         | 106 +++++++++++++++---
 .../classes/jdk/internal/util/HexDigits.java  |  16 ---
 2 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/src/java.base/share/classes/java/util/UUID.java b/src/java.base/share/classes/java/util/UUID.java
index 08b9b87b7ca..5961fce9cb2 100644
--- a/src/java.base/share/classes/java/util/UUID.java
+++ b/src/java.base/share/classes/java/util/UUID.java
@@ -31,7 +31,7 @@
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.util.HexDigits;
+import jdk.internal.util.ByteArrayLittleEndian;
 
 /**
  * A class that represents an immutable universally unique identifier (UUID).
@@ -76,7 +76,6 @@
  * @since   1.5
  */
 public final class UUID implements java.io.Serializable, Comparable<UUID> {
-
     /**
      * Explicit serialVersionUID for interoperability.
      */
@@ -462,24 +461,24 @@ public long node() {
      */
     @Override
     public String toString() {
-        int i0 = (int) (mostSigBits >> 32);
-        int i1 = (int) mostSigBits;
-        int i2 = (int) (leastSigBits >> 32);
-        int i3 = (int) leastSigBits;
-
         byte[] buf = new byte[36];
-        HexDigits.put4(buf, 0, i0 >> 16);
-        HexDigits.put4(buf, 4, i0);
         buf[8] = '-';
-        HexDigits.put4(buf, 9, i1 >> 16);
         buf[13] = '-';
-        HexDigits.put4(buf, 14, i1);
         buf[18] = '-';
-        HexDigits.put4(buf, 19, i2 >> 16);
         buf[23] = '-';
-        HexDigits.put4(buf, 24, i2);
-        HexDigits.put4(buf, 28, i3 >> 16);
-        HexDigits.put4(buf, 32, i3);
+
+        // Although the UUID byte ordering is defined to be big-endian, ByteArrayLittleEndian is used here to optimize
+        // for the most common architectures. hex8 reverses the order internally.
+        ByteArrayLittleEndian.setLong(buf, 0, hex8(mostSigBits >>> 32));
+        long x0 = hex8(mostSigBits);
+        ByteArrayLittleEndian.setInt(buf, 9, (int) x0);
+        ByteArrayLittleEndian.setInt(buf, 14, (int) (x0 >>> 32));
+
+        long x1 = hex8(leastSigBits >>> 32);
+        ByteArrayLittleEndian.setInt(buf, 19, (int) (x1));
+        ByteArrayLittleEndian.setInt(buf, 24, (int) (x1 >>> 32));
+        ByteArrayLittleEndian.setLong(buf, 28, hex8(leastSigBits));
+
         try {
             return jla.uncheckedNewStringNoRepl(buf, StandardCharsets.ISO_8859_1);
         } catch (CharacterCodingException cce) {
@@ -487,6 +486,83 @@ public String toString() {
         }
     }
 
+    /**
+     * Efficiently converts 8 hexadecimal digits to their ASCII representation using SIMD-style vector operations.
+     * This method processes multiple digits in parallel by treating a long value as eight 8-bit lanes,
+     * achieving significantly better performance compared to traditional loop-based conversion.
+     *
+     * <p>The conversion algorithm works as follows:
+     * <pre>
+     * 1. Input expansion: Each 4-bit hex digit is expanded to 8 bits
+     * 2. Vector processing:
+     *    - Add 6 to each digit: triggers carry flag for a-f digits
+     *    - Mask with 0x10 pattern to isolate carry flags
+     *    - Calculate ASCII adjustment: (carry << 1) + (carry >> 1) - (carry >> 4)
+     *    - Add ASCII '0' base (0x30) and original value
+     * 3. Byte order adjustment for final output
+     * </pre>
+     *
+     * <p>Performance characteristics:
+     * <ul>
+     *   <li>Processes 8 digits in parallel using vector operations
+     *   <li>Avoids branching and loops completely
+     *   <li>Uses only integer arithmetic and bit operations
+     *   <li>Constant time execution regardless of input values
+     * </ul>
+     *
+     * <p>ASCII conversion mapping:
+     * <ul>
+     *   <li>Digits 0-9 → ASCII '0'-'9' (0x30-0x39)
+     *   <li>Digits a-f → ASCII 'a'-'f' (0x61-0x66)
+     * </ul>
+     *
+     * @param input A long containing 8 hex digits (each digit must be 0-15)
+     * @return A long containing 8 ASCII bytes representing the hex digits
+     *
+     * @implNote The implementation leverages CPU vector processing capabilities through
+     *           long integer operations. The algorithm is based on the observation that
+     *           ASCII hex digits have a specific pattern that can be computed efficiently
+     *           using carry flag manipulation.
+     *
+     * @example
+     * <pre>
+     * Input:  0xABCDEF01
+     * Output: 3130666564636261 ('1','0','f','e','d','c','b','a' in ASCII)
+     * </pre>
+     *
+     * @see Long#reverseBytes(long)
+     */
+    private static long hex8(long i) {
+        // Expand each 4-bit group into 8 bits, spreading them out in the long value: 0xAABBCCDD -> 0xA0A0B0B0C0C0D0D
+        i = Long.expand(i, 0x0F0F_0F0F_0F0F_0F0FL);
+
+        /*
+         * This method efficiently converts 8 hexadecimal digits simultaneously using vector operations
+         * The algorithm works as follows:
+         *
+         * For input values 0-15:
+         * - For digits 0-9: converts to ASCII '0'-'9' (0x30-0x39)
+         * - For digits 10-15: converts to ASCII 'a'-'f' (0x61-0x66)
+         *
+         * The conversion process:
+         * 1. Add 6 to each 4-bit group: i + 0x0606_0606_0606_0606L
+         * 2. Mask to get the adjustment flags: & 0x1010_1010_1010_1010L
+         * 3. Calculate the offset: (m << 1) + (m >> 1) - (m >> 4)
+         *    - For 0-9: offset = 0
+         *    - For a-f: offset = 39 (to bridge the gap between '9' and 'a' in ASCII)
+         * 4. Add ASCII '0' base (0x30) and the original value
+         * 5. Reverse byte order for correct positioning
+         */
+        long m = (i + 0x0606_0606_0606_0606L) & 0x1010_1010_1010_1010L;
+
+        // Calculate final ASCII values and reverse bytes for proper ordering
+        return Long.reverseBytes(
+                ((m << 1) + (m >> 1) - (m >> 4))
+                + 0x3030_3030_3030_3030L // Add ASCII '0' base to all digits
+                + i                      // Add original values
+        );
+    }
+
     /**
      * Returns a hash code for this {@code UUID}.
      *
diff --git a/src/java.base/share/classes/jdk/internal/util/HexDigits.java b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
index e014c932f83..443a431701b 100644
--- a/src/java.base/share/classes/jdk/internal/util/HexDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
@@ -113,22 +113,6 @@ public static short digitPair(int i, boolean ucase) {
                 : v;
     }
 
-    /**
-     * Insert the unsigned 2-byte integer into the buffer as 4 hexadecimal digit ASCII bytes,
-     * only least significant 16 bits of {@code value} are used.
-     * @param buffer byte buffer to copy into
-     * @param index insert point
-     * @param value to convert
-     */
-    public static void put4(byte[] buffer, int index, int value) {
-        // Prepare an int value so C2 generates a 4-byte write instead of two 2-byte writes
-        int v = (DIGITS[value & 0xff] << 16) | DIGITS[(value >> 8) & 0xff];
-        buffer[index]     = (byte)  v;
-        buffer[index + 1] = (byte) (v >> 8);
-        buffer[index + 2] = (byte) (v >> 16);
-        buffer[index + 3] = (byte) (v >> 24);
-    }
-
     /**
      * Insert digits for long value in buffer from high index to low index.
      *

From 840246956507ce354c3efd2dc3de44041ba5d607 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Fri, 23 May 2025 00:21:29 +0000
Subject: [PATCH 599/901] 8355236: AOT Assembly crash with unregistered class
 and -Xlog:cds+resolve=trace

Reviewed-by: shade, kvn
---
 src/hotspot/share/oops/constantPool.cpp       |  15 +-
 .../cds/appcds/aotCache/ExcludedClasses.java  | 241 ++++++++++++++++++
 .../aotCache/test-classes/CustyWithLoop.java  |  45 ++++
 3 files changed, 293 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes/CustyWithLoop.java

diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index e2a7850fb77..5b0ee298ddc 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -484,15 +484,14 @@ static const char* get_type(Klass* k) {
     type = "prim";
   } else {
     InstanceKlass* src_ik = InstanceKlass::cast(src_k);
-    oop loader = src_ik->class_loader();
-    if (loader == nullptr) {
-      type = "boot";
-    } else if (loader == SystemDictionary::java_platform_loader()) {
-      type = "plat";
-    } else if (loader == SystemDictionary::java_system_loader()) {
-      type = "app";
+    if (src_ik->defined_by_boot_loader()) {
+      return "boot";
+    } else if (src_ik->defined_by_platform_loader()) {
+      return "plat";
+    } else if (src_ik->defined_by_app_loader()) {
+      return "app";
     } else {
-      type = "unreg";
+      return "unreg";
     }
   }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java
new file mode 100644
index 00000000000..4f2ff4f0f76
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ExcludedClasses.java
@@ -0,0 +1,241 @@
+/*
+ * 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.
+ *
+ */
+
+/*
+ * @test
+ * @summary Test how various AOT optimizations handle classes that are excluded from the AOT cache.
+ * @requires vm.cds.write.archived.java.heap
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ *          /test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes
+ * @build ExcludedClasses CustyWithLoop
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 TestApp
+ *                 TestApp$Foo
+ *                 TestApp$Foo$Bar
+ *                 TestApp$Foo$ShouldBeExcluded
+ *                 TestApp$MyInvocationHandler
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar cust.jar
+ *                 CustyWithLoop
+ * @run driver ExcludedClasses
+ */
+
+import java.io.File;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.ProtectionDomain;
+import java.util.Map;
+
+import jdk.jfr.Event;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ExcludedClasses {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "TestApp";
+
+    public static void main(String[] args) throws Exception {
+        Tester tester = new Tester();
+        tester.runAOTWorkflow();
+    }
+
+    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[] {
+                "-Xlog:cds+resolve=trace",
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass, runMode.name()
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (isDumping(runMode)) {
+                out.shouldNotMatch("cds,resolve.*archived field.*TestApp.Foo => TestApp.Foo.ShouldBeExcluded.f:I");
+            }
+        }
+    }
+}
+
+class TestApp {
+    static volatile Object custInstance;
+    static volatile Object custArrayInstance;
+
+    public static void main(String args[]) throws Exception {
+        // In new workflow, classes from custom loaders are passed from the preimage
+        // to the final image. See ClassPrelinker::record_unregistered_klasses().
+        custInstance = initFromCustomLoader();
+        custArrayInstance = Array.newInstance(custInstance.getClass(), 0);
+        System.out.println(custArrayInstance);
+        System.out.println("Counter = " + Foo.hotSpot());
+    }
+
+    static Object initFromCustomLoader() throws Exception {
+        String path = "cust.jar";
+        URL url = new File(path).toURI().toURL();
+        URL[] urls = new URL[] {url};
+        URLClassLoader urlClassLoader =
+            new URLClassLoader("MyLoader", urls, null);
+        Class c = Class.forName("CustyWithLoop", true, urlClassLoader);
+        return c.newInstance();
+    }
+
+    static class MyInvocationHandler implements InvocationHandler {
+        volatile static int cnt;
+
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            long start = System.currentTimeMillis();
+            while (System.currentTimeMillis() - start < 20) {
+                cnt += 2;
+                for (int i = 0; i < 1000; i++) {
+                    int n = cnt - 2;
+                    if (n < 2) {
+                        n = 2;
+                    }
+                    cnt += (i + cnt) % n + cnt % 2;
+                }
+            }
+            return Integer.valueOf(cnt);
+        }
+    }
+
+    static class Foo {
+        volatile static int counter;
+        static Class c = ShouldBeExcluded.class;
+
+        static Map mapProxy = (Map) Proxy.newProxyInstance(
+            Foo.class.getClassLoader(),
+            new Class[] { Map.class },
+            new MyInvocationHandler());
+
+        static int hotSpot() {
+            ShouldBeExcluded s = new ShouldBeExcluded();
+            Bar b = new Bar();
+
+            long start = System.currentTimeMillis();
+            while (System.currentTimeMillis() - start < 1000) {
+                lambdaHotSpot();
+                s.hotSpot2();
+                b.hotSpot3();
+
+                // In JDK mainline, generated proxy classes are excluded from the AOT cache.
+                // In Leyden/premain, generated proxy classes included. The following code should
+                // work with either repos.
+                Integer i = (Integer)mapProxy.get(null);
+                counter += i.intValue();
+
+                if (custInstance != null) {
+                    // Classes loaded by custom loaders are included included in the AOT cache
+                    // but their array classes are excluded.
+                    counter += custInstance.equals(null) ? 1 : 2;
+                }
+
+                if (custArrayInstance != null) {
+                    if ((counter % 3) == 0) {
+                        counter += (custArrayInstance instanceof String) ? 0 : 1;
+                    } else {
+                        counter += (custArrayInstance instanceof Object) ? 0 : 1;
+                    }
+                }
+            }
+
+            return counter + s.m() + s.f + b.m() + b.f;
+        }
+
+        static void f() {
+            if (counter % 2 == 1) {
+                counter ++;
+            }
+        }
+
+        // Generated Lambda classes should be excluded from CDS preimage.
+        static void lambdaHotSpot() {
+            long start = System.currentTimeMillis();
+            while (System.currentTimeMillis() - start < 20) {
+                doit(() -> counter ++ );
+            }
+        }
+
+        static void doit(Runnable r) {
+            r.run();
+        }
+
+        // All subclasses of jdk.jfr.Event are excluded from the CDS archive.
+        static class ShouldBeExcluded extends jdk.jfr.Event {
+            int f = (int)(System.currentTimeMillis()) + 123;
+            int m() {
+                return f + 456;
+            }
+
+            void hotSpot2() {
+                long start = System.currentTimeMillis();
+                while (System.currentTimeMillis() - start < 20) {
+                    for (int i = 0; i < 50000; i++) {
+                        counter += i;
+                    }
+                    f();
+                }
+            }
+        }
+
+        static class Bar {
+            int f = (int)(System.currentTimeMillis()) + 123;
+            int m() {
+                return f + 456;
+            }
+
+            void hotSpot3() {
+                long start = System.currentTimeMillis();
+                while (System.currentTimeMillis() - start < 20) {
+                    for (int i = 0; i < 50000; i++) {
+                        counter += i;
+                    }
+                    f();
+                }
+            }
+        }
+    }
+}
+
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes/CustyWithLoop.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes/CustyWithLoop.java
new file mode 100644
index 00000000000..edd98777b9d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/test-classes/CustyWithLoop.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ *
+ */
+
+// A class to be loaded by a custom class loader. It has a loop. AOT
+// optimizations may be applied to this loop.
+public class CustyWithLoop {
+    volatile static int cnt;
+
+    @Override
+    public boolean equals(Object other) {
+        long start = System.currentTimeMillis();
+        while (System.currentTimeMillis() - start < 20) {
+            cnt += 2;
+            for (int i = 0; i < 1000; i++) {
+                int n = cnt - 2;
+                if (n < 2) {
+                    n = 2;
+                }
+                cnt += (i + cnt) % n + cnt % 2;
+            }
+        }
+        return (cnt % 17) == 8;
+    }
+}

From a94d1a04076c64f983e508c4da2e59a8aab5e4c5 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Fri, 23 May 2025 02:24:09 +0000
Subject: [PATCH 600/901] 8357305: Compilation failure in
 javax/swing/JMenuItem/bug6197830.java

Reviewed-by: aivanov
---
 .../MenuItemTest/MenuItemTestHelper.java      | 163 +++++++++++++++
 .../JMenuItem/MenuItemTest/bug4729669.java    |  61 ++++++
 .../{ => MenuItemTest}/bug6197830.java        |  39 ++--
 .../jdk/javax/swing/JMenuItem/bug4729669.java | 186 ------------------
 4 files changed, 240 insertions(+), 209 deletions(-)
 create mode 100644 test/jdk/javax/swing/JMenuItem/MenuItemTest/MenuItemTestHelper.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/MenuItemTest/bug4729669.java
 rename test/jdk/javax/swing/JMenuItem/{ => MenuItemTest}/bug6197830.java (56%)
 delete mode 100644 test/jdk/javax/swing/JMenuItem/bug4729669.java

diff --git a/test/jdk/javax/swing/JMenuItem/MenuItemTest/MenuItemTestHelper.java b/test/jdk/javax/swing/JMenuItem/MenuItemTest/MenuItemTestHelper.java
new file mode 100644
index 00000000000..16b87490585
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/MenuItemTest/MenuItemTestHelper.java
@@ -0,0 +1,163 @@
+/*
+ * 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.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.ComponentOrientation;
+import java.awt.Graphics;
+import java.awt.event.KeyEvent;
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.KeyStroke;
+import javax.swing.UIManager;
+
+final class MenuItemTestHelper {
+
+    public static JFrame getMenuItemTestFrame(boolean isLeft, String lafName) {
+        boolean applyLookAndFeel = lafName != null;
+        if (applyLookAndFeel) {
+            try {
+                UIManager.setLookAndFeel(lafName);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        Icon myIcon = new ColoredIcon(Color.RED, 10, 10);
+        Icon myIcon2 = new ColoredIcon(Color.GREEN, 15, 10);
+
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.add(createViewMenu(myIcon, myIcon2));
+        menuBar.add(createNoNothingMenu());
+        menuBar.add(createSomeIconsMenu(myIcon, myIcon2));
+
+        String title = (isLeft ? "(Left-to-right)" : "(Right-to-left)") + " - Menu Item Test";
+        JFrame frame = new JFrame(title);
+        frame.setJMenuBar(menuBar);
+        frame.applyComponentOrientation(isLeft
+                ? ComponentOrientation.LEFT_TO_RIGHT
+                : ComponentOrientation.RIGHT_TO_LEFT);
+
+        if (applyLookAndFeel) {
+            String shortName = lafName.substring(lafName.lastIndexOf('.') + 1);
+            JLabel label = new JLabel("<HTML><H2>" + shortName + "</H2></HTML>");
+            frame.setLayout(new BorderLayout());
+            frame.add(label, BorderLayout.CENTER);
+        }
+
+        frame.setSize(300, 300);
+        return frame;
+    }
+
+    public static JFrame getMenuItemTestFrame(boolean isLeft) {
+        return getMenuItemTestFrame(isLeft, null);
+    }
+
+    private static JMenu createViewMenu(Icon myIcon, Icon myIcon2) {
+        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_DOWN_MASK));
+        rm2.setIcon(myIcon2);
+        menu.add(rm2);
+
+        JRadioButtonMenuItem mi3 = new JRadioButtonMenuItem("Radio w/icon");
+        mi3.setIcon(myIcon);
+        menu.add(mi3);
+
+        menu.add(new JMenuItem(myIcon2));
+
+        JMenuItem mi4 = new JMenuItem("Item with icon");
+        mi4.setIcon(myIcon);
+        menu.addSeparator();
+        menu.add(mi4);
+
+        return menu;
+    }
+
+    private static JMenu createNoNothingMenu() {
+        final JMenu noMenu = new JMenu("No nothing");
+
+        for (String label : new String[]{"One", "Two", "Threeee"}) {
+            JMenuItem item = new JMenuItem(label);
+            item.addActionListener((e) ->
+                    PassFailJFrame.log("menu.width = "
+                            + noMenu.getPopupMenu().getWidth()));
+            noMenu.add(item);
+        }
+
+        return noMenu;
+    }
+
+    private static JMenu createSomeIconsMenu(Icon myIcon, Icon myIcon2) {
+        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"));
+
+        return someIcons;
+    }
+
+    private record ColoredIcon(Color color, int width, int height)
+            implements Icon {
+        @Override
+        public void paintIcon(Component c, Graphics g, int x, int y) {
+            Color oldColor = g.getColor();
+            g.setColor(color);
+            g.fillRect(x, y, width, height);
+            g.setColor(oldColor);
+        }
+
+        @Override
+        public int getIconWidth() {
+            return width;
+        }
+
+        @Override
+        public int getIconHeight() {
+            return height;
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug4729669.java b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug4729669.java
new file mode 100644
index 00000000000..6518b6b8fae
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug4729669.java
@@ -0,0 +1,61 @@
+/*
+ * 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.util.List;
+import javax.swing.JFrame;
+
+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)
+                .positionTestUIRightColumn()
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static List<JFrame> createTestUI() {
+        JFrame f1 = MenuItemTestHelper.getMenuItemTestFrame(true);
+        JFrame f2 = MenuItemTestHelper.getMenuItemTestFrame(false);
+        return List.of(f1, f2);
+    }
+}
+
diff --git a/test/jdk/javax/swing/JMenuItem/bug6197830.java b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
similarity index 56%
rename from test/jdk/javax/swing/JMenuItem/bug6197830.java
rename to test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
index 58fd9a76e23..afb1c7bb33f 100644
--- a/test/jdk/javax/swing/JMenuItem/bug6197830.java
+++ b/test/jdk/javax/swing/JMenuItem/MenuItemTest/bug6197830.java
@@ -31,13 +31,16 @@
  * @run main/manual bug6197830
  */
 
+import java.util.List;
+import javax.swing.JFrame;
+
 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.""";
+            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()
@@ -45,30 +48,20 @@ public static void main(String[] args) throws Exception {
                 .instructions(INSTRUCTIONS)
                 .columns(35)
                 .testUI(bug6197830::createTestUI)
-                .position(PassFailJFrame.Position.TOP_LEFT_CORNER)
+                .positionTestUIBottomRowCentered()
                 .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());
+        JFrame frame1 = MenuItemTestHelper.getMenuItemTestFrame(true,
+                "com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        JFrame frame2 = MenuItemTestHelper.getMenuItemTestFrame(false,
+                "com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+        JFrame frame3 = MenuItemTestHelper.getMenuItemTestFrame(true,
+                "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+        JFrame frame4 = MenuItemTestHelper.getMenuItemTestFrame(false,
+                "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
         return List.of(frame1, frame2, frame3, frame4);
     }
 }
diff --git a/test/jdk/javax/swing/JMenuItem/bug4729669.java b/test/jdk/javax/swing/JMenuItem/bug4729669.java
deleted file mode 100644
index 815558fc8fd..00000000000
--- a/test/jdk/javax/swing/JMenuItem/bug4729669.java
+++ /dev/null
@@ -1,186 +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.
- */
-
-/*
- * @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 4193d052c0ae2336d816d0e76dec5420aa386465 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy.wood@mac.com>
Date: Fri, 23 May 2025 02:25:12 +0000
Subject: [PATCH 601/901] 8356061: [macos]
 com/apple/laf/RootPane/RootPaneDefaultButtonTest.java test fails on
 macosx-aarch64 machine

Reviewed-by: jdv, serb
---
 .../RootPane/RootPaneDefaultButtonTest.java   | 294 ++++++++----------
 1 file changed, 127 insertions(+), 167 deletions(-)

diff --git a/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java b/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
index f314d48841c..6cb94c28727 100644
--- a/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
+++ b/test/jdk/com/apple/laf/RootPane/RootPaneDefaultButtonTest.java
@@ -34,6 +34,8 @@
 import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * This presents two dialogs, each with two possible default buttons. The
@@ -45,132 +47,139 @@
  * to double-check that the removed code didn't negatively affect how default
  * buttons are repainted.
  */
-public class RootPaneDefaultButtonTest extends JDialog {
+public class RootPaneDefaultButtonTest {
 
-    record ButtonRenderingExpectation(JButton button,
-                                      boolean appearAsDefault) {}
+    static class TestDialog extends JDialog {
 
-    public static void main(String[] args) throws Exception {
-        if (!System.getProperty("os.name").contains("OS X")) {
-            System.out.println("This test is for MacOS only.");
-            return;
+        JButton button1 = new JButton("Button 1");
+        JButton button2 = new JButton("Button 2");
+
+        TestDialog() {
+            getContentPane().setLayout(new BorderLayout());
+            getContentPane().add(createPushButtonRow(), BorderLayout.SOUTH);
+            setUndecorated(true);
+            pack();
         }
 
-        RootPaneDefaultButtonTest window1 = new RootPaneDefaultButtonTest();
-        RootPaneDefaultButtonTest window2 = new RootPaneDefaultButtonTest();
+        private JPanel createPushButtonRow() {
+            JPanel p = new JPanel(new GridLayout(1, 2));
+            p.add(button1);
+            p.add(button2);
+            p.setBorder(new EmptyBorder(5,5,5,5));
+            return p;
+        }
+    }
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                Rectangle r1 = new Rectangle(0, 20,
+    /**
+     * We want 2 dialogs: one in the foreground and one not in the foreground
+     */
+    static class TestScene {
+        boolean isButton1Default, isButton2Default;
+
+        TestScene(boolean isButton1Default, boolean isButton2Default) {
+            this.isButton1Default = isButton1Default;
+            this.isButton2Default = isButton2Default;
+        }
+
+        void run() throws Exception {
+            SwingUtilities.invokeAndWait(() -> {
+                System.out.println(
+                        "Testing isButton1Default = " + isButton1Default +
+                                " isButton2Default = " + isButton2Default);
+                TestDialog window1 = new TestDialog();
+                TestDialog window2 = new TestDialog();
+
+                if (isButton1Default) {
+                    window1.getRootPane().setDefaultButton(window1.button1);
+                }
+                if (isButton2Default) {
+                    window1.getRootPane().setDefaultButton(window1.button2);
+                }
+
+                Rectangle r1 = new Rectangle(0, 100,
                         window1.getWidth(), window1.getHeight());
                 window1.setBounds(r1);
 
-                Rectangle r2 = new Rectangle((int) (r1.getMaxX() + 10), 20,
+                Rectangle r2 = new Rectangle((int) (r1.getMaxX() + 10), 100,
                         window2.getWidth(), window2.getHeight());
                 window2.setBounds(r2);
 
                 window1.setVisible(true);
                 window2.setVisible(true);
-            }
-        });
-
-        Robot robot = new Robot();
-
-        test(robot, window1.radioButton1,
-                new ButtonRenderingExpectation(window1.button1, true),
-                new ButtonRenderingExpectation(window1.button2, false),
-                new ButtonRenderingExpectation(window2.button1, false),
-                new ButtonRenderingExpectation(window2.button2, false));
-
-        test(robot, window1.radioButton2,
-                new ButtonRenderingExpectation(window1.button1, false),
-                new ButtonRenderingExpectation(window1.button2, true),
-                new ButtonRenderingExpectation(window2.button1, false),
-                new ButtonRenderingExpectation(window2.button2, false));
-
-        test(robot, window1.radioButton3,
-                new ButtonRenderingExpectation(window1.button1, false),
-                new ButtonRenderingExpectation(window1.button2, false),
-                new ButtonRenderingExpectation(window2.button1, false),
-                new ButtonRenderingExpectation(window2.button2, false));
-
-        test(robot, window2.radioButton1,
-                new ButtonRenderingExpectation(window1.button1, false),
-                new ButtonRenderingExpectation(window1.button2, false),
-                new ButtonRenderingExpectation(window2.button1, true),
-                new ButtonRenderingExpectation(window2.button2, false));
-
-        test(robot, window2.radioButton2,
-                new ButtonRenderingExpectation(window1.button1, false),
-                new ButtonRenderingExpectation(window1.button2, false),
-                new ButtonRenderingExpectation(window2.button1, false),
-                new ButtonRenderingExpectation(window2.button2, true));
-
-        test(robot, window2.radioButton3,
-                new ButtonRenderingExpectation(window1.button1, false),
-                new ButtonRenderingExpectation(window1.button2, false),
-                new ButtonRenderingExpectation(window2.button1, false),
-                new ButtonRenderingExpectation(window2.button2, false));
-
-        System.out.println("Test passed successfully");
-    }
 
-    private static void test(Robot robot, AbstractButton buttonToClick,
-                             ButtonRenderingExpectation... expectations)
-            throws Exception {
-        robot.delay(100);
-
-        Point mouseLoc = buttonToClick.getLocationOnScreen();
-        robot.mouseMove(mouseLoc.x + buttonToClick.getSize().width / 2,
-                mouseLoc.y + buttonToClick.getSize().height / 2);
-        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
-        robot.delay(20);
-        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
-
-        robot.delay(100);
-
-        // the colors may change depending on your system's appearance.
-        // Depending on how you've configured "Appearance" in the
-        // System Settings app: the default button may be blue (the default),
-        // red, purple, etc. So instead of checking for a specific color: we'll
-        // make sure 3-4 are the same color, and one is significantly
-        // different.
-        Color defaultColor = null;
-        Color nonDefaultColor = null;
-
-        for (ButtonRenderingExpectation expectation : expectations) {
-            int x = expectation.button.getLocationOnScreen().x + 20;
-            int y = expectation.button.getLocationOnScreen().y + 10;
-
-            // this mouseMove is optional, but it helps debug this test to see
-            // where we're sampling the pixel color from:
-            robot.mouseMove(x, y);
-
-            Color c = robot.getPixelColor(x, y);
-            if (expectation.appearAsDefault) {
-                if (defaultColor == null) {
-                    defaultColor = c;
-                } else {
-                    throw new IllegalStateException(
-                            "there should only be at most 1 default button");
-                }
-            } else {
-                if (nonDefaultColor == null) {
-                    nonDefaultColor = c;
-                } else if (!isSimilar(nonDefaultColor, c)) {
-                    throw new IllegalStateException(
-                            "these two colors should match: " + c + ", " +
-                                    nonDefaultColor);
+                Rectangle sum = new Rectangle();
+                sum.add(r1);
+                sum.add(r2);
+                BufferedImage bi = new BufferedImage(sum.width, sum.height,
+                        BufferedImage.TYPE_INT_ARGB);
+                Graphics2D g = bi.createGraphics();
+                window1.paint(g.create(r1.x, r1.y, r1.width, r1.height));
+                window2.paint(g.create(r2.x, r2.y, r2.width, r2.height));
+                g.dispose();
+
+                // the exact colors may change depending on your system's
+                // appearance. Depending on how you've configured "Appearance"
+                // in the System Settings app: the default button may be blue
+                // (the default), red, purple, etc. So instead of checking for
+                // a specific color: we'll make sure 3-4 are the same color,
+                // and one is significantly different.
+                Color defaultColor = null;
+                Color nonDefaultColor = null;
+
+                JButton[] buttons = new JButton[] {window1.button1,
+                        window1.button2, window2.button1, window2.button2};
+
+                try {
+                    for (int a = 0; a < buttons.length; a++) {
+                        try {
+                            JButton b = buttons[a];
+
+                            Point p = b.getLocationOnScreen();
+                            int x = p.x + 20;
+                            int y = p.y + 10;
+
+                            Color c = new Color(bi.getRGB(x - sum.x, y - sum.y));
+                            if (b.isDefaultButton()) {
+                                if (defaultColor == null) {
+                                    defaultColor = c;
+                                } else {
+                                    throw new IllegalStateException(
+                                            "there should only be at most 1 " +
+                                                    "default button");
+                                }
+                            } else {
+                                if (nonDefaultColor == null) {
+                                    nonDefaultColor = c;
+                                } else if (!isSimilar(nonDefaultColor, c)) {
+                                    throw new IllegalStateException(
+                                            "these two colors should match: " + c +
+                                                    ", " + nonDefaultColor);
+                                }
+                            }
+
+                            if (defaultColor != null && nonDefaultColor != null &&
+                                    isSimilar(defaultColor, nonDefaultColor)) {
+                                throw new IllegalStateException(
+                                        "The default button and non-default " +
+                                                "buttons should look " +
+                                                "different: " + defaultColor +
+                                                " matches " + nonDefaultColor);
+                            }
+                        } catch(Exception e) {
+                            System.err.println("a = " + a);
+                            throw e;
+                        }
+                    }
+                } finally {
+                    System.out.println("defaultColor = " + defaultColor +
+                            " nonDefaultColor = " + nonDefaultColor);
+
+                    window1.dispose();
+                    window2.dispose();
                 }
-            }
-        }
 
-        if (defaultColor != null && isSimilar(defaultColor, nonDefaultColor)) {
-            throw new IllegalStateException(
-                    "The default button and non-default buttons should " +
-                            "look different: " + defaultColor + " matches " +
-                            nonDefaultColor);
+                System.out.println("Test passed successfully\n");
+            });
         }
     }
 
@@ -187,63 +196,14 @@ private static boolean isSimilar(Color c1, Color c2) {
         return true;
     }
 
-    JRadioButton radioButton1 = new JRadioButton(
-            "\"Button 1\" is the default button");
-    JRadioButton radioButton2 = new JRadioButton(
-            "\"Button 2\" is the default button");
-    JRadioButton radioButton3 = new JRadioButton("No default button");
-
-    JButton button1 = new JButton("Button 1");
-    JButton button2 = new JButton("Button 2");
-
-    public RootPaneDefaultButtonTest() {
-        getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(createRadioButtonPanel(), BorderLayout.NORTH);
-        getContentPane().add(createPushButtonRow(), BorderLayout.SOUTH);
-        pack();
-
-        radioButton1.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                getRootPane().setDefaultButton(button1);
-            }
-        });
-
-        radioButton2.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                getRootPane().setDefaultButton(button2);
-            }
-        });
-
-        radioButton3.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                getRootPane().setDefaultButton(null);
-            }
-        });
-
-        ButtonGroup g = new ButtonGroup();
-        g.add(radioButton1);
-        g.add(radioButton2);
-        g.add(radioButton3);
-        radioButton1.doClick();
-    }
-
-    private JPanel createPushButtonRow() {
-        JPanel p = new JPanel(new GridLayout(1, 2));
-        p.add(button1);
-        p.add(button2);
-        p.setBorder(new EmptyBorder(5,5,5,5));
-        return p;
-    }
+    public static void main(String[] args) throws Exception {
+        if (!System.getProperty("os.name").contains("OS X")) {
+            System.out.println("This test is for MacOS only.");
+            return;
+        }
 
-    private JPanel createRadioButtonPanel() {
-        JPanel p = new JPanel(new GridLayout(3, 1));
-        p.add(radioButton1);
-        p.add(radioButton2);
-        p.add(radioButton3);
-        p.setBorder(new EmptyBorder(5,5,5,5));
-        return p;
+        new TestScene(true, false).run();
+        new TestScene(false, true).run();
+        new TestScene(false, false).run();
     }
 }

From 1fd65b7a7b0ec38fde79aa4f5e53506d28893439 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Fri, 23 May 2025 03:48:09 +0000
Subject: [PATCH 602/901] 8351140: RISC-V: Intrinsify Unsafe::setMemory

Reviewed-by: fjiang, fyang
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 125 ++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 9fcbcbbf51d..41739c2270c 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -1633,6 +1633,126 @@ class StubGenerator: public StubCodeGenerator {
     BLOCK_COMMENT("arraycopy_range_checks done");
   }
 
+  address generate_unsafecopy_common_error_exit() {
+    address start = __ pc();
+    __ mv(x10, 0);
+    __ leave();
+    __ ret();
+    return start;
+  }
+
+  //
+  //  Generate 'unsafe' set memory stub
+  //  Though just as safe as the other stubs, it takes an unscaled
+  //  size_t (# bytes) argument instead of an element count.
+  //
+  //  Input:
+  //    c_rarg0   - destination array address
+  //    c_rarg1   - byte count (size_t)
+  //    c_rarg2   - byte value
+  //
+  address generate_unsafe_setmemory() {
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::unsafe_setmemory_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+
+    // bump this on entry, not on exit:
+    // inc_counter_np(SharedRuntime::_unsafe_set_memory_ctr);
+
+    Label L_fill_elements;
+
+    const Register dest = c_rarg0;
+    const Register count = c_rarg1;
+    const Register value = c_rarg2;
+    const Register cnt_words = x28; // temp register
+    const Register tmp_reg   = x29; // temp register
+
+    // Mark remaining code as such which performs Unsafe accesses.
+    UnsafeMemoryAccessMark umam(this, true, false);
+
+    __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+    // if count < 8, jump to L_fill_elements
+    __ mv(tmp_reg, 8); // 8 bytes fill by element
+    __ bltu(count, tmp_reg, L_fill_elements);
+
+    // Propagate byte to 64-bit width
+    // 8 bit -> 16 bit
+    __ zext(value, value, 8);
+    __ slli(tmp_reg, value, 8);
+    __ orr(value, value, tmp_reg);
+    // 16 bit -> 32 bit
+    __ slli(tmp_reg, value, 16);
+    __ orr(value, value, tmp_reg);
+    // 32 bit -> 64 bit
+    __ slli(tmp_reg, value, 32);
+    __ orr(value, value, tmp_reg);
+
+    // Align source address at 8 bytes address boundary.
+    Label L_skip_align1, L_skip_align2, L_skip_align4;
+    // One byte misalignment happens.
+    __ test_bit(tmp_reg, dest, 0);
+    __ beqz(tmp_reg, L_skip_align1);
+    __ sb(value, Address(dest, 0));
+    __ addi(dest, dest, 1);
+    __ subi(count, count, 1);
+
+    __ bind(L_skip_align1);
+    // Two bytes misalignment happens.
+    __ test_bit(tmp_reg, dest, 1);
+    __ beqz(tmp_reg, L_skip_align2);
+    __ sh(value, Address(dest, 0));
+    __ addi(dest, dest, 2);
+    __ subi(count, count, 2);
+
+    __ bind(L_skip_align2);
+    // Four bytes misalignment happens.
+    __ test_bit(tmp_reg, dest, 2);
+    __ beqz(tmp_reg, L_skip_align4);
+    __ sw(value, Address(dest, 0));
+    __ addi(dest, dest, 4);
+    __ subi(count, count, 4);
+    __ bind(L_skip_align4);
+
+    //  Fill large chunks
+    __ srli(cnt_words, count, 3); // number of words
+    __ slli(tmp_reg, cnt_words, 3);
+    __ sub(count, count, tmp_reg);
+    {
+      __ fill_words(dest, cnt_words, value);
+    }
+
+    // Handle copies less than 8 bytes
+    __ bind(L_fill_elements);
+    Label L_fill_2, L_fill_1, L_exit;
+    __ test_bit(tmp_reg, count, 2);
+    __ beqz(tmp_reg, L_fill_2);
+    __ sb(value, Address(dest, 0));
+    __ sb(value, Address(dest, 1));
+    __ sb(value, Address(dest, 2));
+    __ sb(value, Address(dest, 3));
+    __ addi(dest, dest, 4);
+
+    __ bind(L_fill_2);
+    __ test_bit(tmp_reg, count, 1);
+    __ beqz(tmp_reg, L_fill_1);
+    __ sb(value, Address(dest, 0));
+    __ sb(value, Address(dest, 1));
+    __ addi(dest, dest, 2);
+
+    __ bind(L_fill_1);
+    __ test_bit(tmp_reg, count, 0);
+    __ beqz(tmp_reg, L_exit);
+    __ sb(value, Address(dest, 0));
+
+    __ bind(L_exit);
+    __ leave();
+    __ ret();
+
+    return start;
+  }
+
   //
   //  Generate 'unsafe' array copy stub
   //  Though just as safe as the other stubs, it takes an unscaled
@@ -2202,6 +2322,9 @@ class StubGenerator: public StubCodeGenerator {
     generate_copy_longs(StubGenStubId::copy_byte_f_id, copy_f, c_rarg0, c_rarg1, t1);
     generate_copy_longs(StubGenStubId::copy_byte_b_id, copy_b, c_rarg0, c_rarg1, t1);
 
+    address ucm_common_error_exit     = generate_unsafecopy_common_error_exit();
+    UnsafeMemoryAccess::set_common_exit_stub_pc(ucm_common_error_exit);
+
     StubRoutines::riscv::_zero_blocks = generate_zero_blocks();
 
     //*** jbyte
@@ -2272,6 +2395,8 @@ class StubGenerator: public StubCodeGenerator {
     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::_unsafe_setmemory    = generate_unsafe_setmemory();
   }
 
   void generate_aes_loadkeys(const Register &key, VectorRegister *working_vregs, int rounds) {

From 99e01301cd7f063f167db107d31468b1d3f901aa Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 23 May 2025 04:35:11 +0000
Subject: [PATCH 603/901] 8356145: ListEnterExitTest.java fails on macos

Reviewed-by: aivanov, jdv, kizune
---
 test/jdk/java/awt/List/ListEnterExitTest.java | 80 +++++++++----------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/test/jdk/java/awt/List/ListEnterExitTest.java b/test/jdk/java/awt/List/ListEnterExitTest.java
index cb9c035d977..201a0e43c13 100644
--- a/test/jdk/java/awt/List/ListEnterExitTest.java
+++ b/test/jdk/java/awt/List/ListEnterExitTest.java
@@ -36,16 +36,24 @@
 import java.awt.Point;
 import java.awt.Robot;
 
-import java.awt.event.InputEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 public class ListEnterExitTest {
     final List list = new List();
-    final MouseEnterExitListener mouseEnterExitListener = new MouseEnterExitListener();
     Frame frame;
     volatile Point p;
 
+    private static final int X_OFFSET = 30;
+    private static final int Y_OFFSET = 40;
+    private static final int LATCH_TIMEOUT = 3;
+
+    private final CountDownLatch mouseEnterLatch = new CountDownLatch(1);
+    private final CountDownLatch mouseExitLatch = new CountDownLatch(1);
+
     public static void main(String[] args) throws Exception {
         ListEnterExitTest test = new ListEnterExitTest();
         test.start();
@@ -57,7 +65,11 @@ public void start() throws Exception {
                 frame = new Frame("ListEnterExitTest");
                 list.add("Item 1");
                 list.add("Item 2");
-                list.addMouseListener(mouseEnterExitListener);
+                list.add("Item 3");
+                list.add("Item 4");
+                list.add("Item 5");
+                list.add("Item 6");
+                list.addMouseListener(new MouseEnterExitListener());
                 frame.add(list);
                 frame.setLayout(new FlowLayout());
                 frame.setSize(300, 200);
@@ -66,25 +78,28 @@ public void start() throws Exception {
             });
 
             final Robot robot = new Robot();
-            robot.delay(1000);
+            robot.setAutoDelay(100);
             robot.waitForIdle();
+            robot.delay(1000);
 
             EventQueue.invokeAndWait(() -> {
                 p = list.getLocationOnScreen();
             });
-            robot.mouseMove(p.x + 10, p.y + 10);
-            robot.delay(100);
+            robot.mouseMove(p.x + X_OFFSET, p.y + Y_OFFSET);
             robot.waitForIdle();
-            robot.mouseMove(p.x - 10, p.y - 10);
-            robot.delay(100);
+
+            robot.mouseMove(p.x - X_OFFSET, p.y + Y_OFFSET);
             robot.waitForIdle();
-            robot.mouseMove(p.x + 10, p.y + 10);
 
-            robot.mousePress(InputEvent.BUTTON1_MASK);
-            robot.mouseRelease(InputEvent.BUTTON1_MASK);
+            robot.mouseMove(p.x + X_OFFSET, p.y + Y_OFFSET);
+            robot.waitForIdle();
+
+            if (!mouseEnterLatch.await(LATCH_TIMEOUT, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Mouse enter event timeout");
+            }
 
-            synchronized (mouseEnterExitListener) {
-                mouseEnterExitListener.wait(2000);
+            if (!mouseExitLatch.await(LATCH_TIMEOUT, TimeUnit.SECONDS)) {
+                throw new RuntimeException("Mouse exit event timeout");
             }
         } finally {
             EventQueue.invokeAndWait(() -> {
@@ -93,38 +108,19 @@ public void start() throws Exception {
                 }
             });
         }
-        System.out.println("mouseEnterExitListener.isPassed() : " + mouseEnterExitListener.isPassed());
-        if (!mouseEnterExitListener.isPassed()) {
-            throw new RuntimeException("Haven't receive mouse enter/exit events");
-        }
-
     }
 
-}
-
-class MouseEnterExitListener extends MouseAdapter {
-
-    volatile boolean passed_1 = false;
-    volatile boolean passed_2 = false;
-
-    public void mouseEntered(MouseEvent e) {
-        passed_1 = true;
-        System.out.println("passed_1 is: " + passed_1);
-    }
-
-    public void mouseExited(MouseEvent e) {
-        passed_2 = true;
-        System.out.println("passed_2 is: " + passed_2);
-    }
-
-    public void mousePressed(MouseEvent e) {
-        synchronized (this) {
-            System.out.println("mouse pressed");
-            this.notifyAll();
+    private class MouseEnterExitListener extends MouseAdapter {
+        @Override
+        public void mouseEntered(MouseEvent e) {
+            System.out.println("Mouse Entered Event");
+            mouseEnterLatch.countDown();
         }
-    }
 
-    public boolean isPassed() {
-        return passed_1 & passed_2;
+        @Override
+        public void mouseExited(MouseEvent e) {
+            System.out.println("Mouse Exited Event");
+            mouseExitLatch.countDown();
+        }
     }
 }

From 9d9e41f5b4ea70a32871ea6f03a21e3d77212289 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 23 May 2025 04:35:29 +0000
Subject: [PATCH 604/901] 8356894: Adjust CreateSymbols to properly handle the
 newly added @jdk.internal.RequiresIdentity

Reviewed-by: vromero, liach
---
 .../tools/symbolgenerator/CreateSymbols.java  | 204 +++++++++++++++++-
 .../com/sun/tools/javac/code/Flags.java       |   5 +
 .../com/sun/tools/javac/code/Symbol.java      |   3 +-
 .../com/sun/tools/javac/code/Symtab.java      |  10 +-
 .../com/sun/tools/javac/comp/Annotate.java    |   6 +
 .../com/sun/tools/javac/comp/Check.java       |  13 +-
 .../com/sun/tools/javac/jvm/ClassReader.java  |  11 +-
 .../com/sun/tools/javac/util/Names.java       |   6 +
 .../javac/platform/RequiresIdentityTest.java  | 166 ++++++++++++++
 .../javac/platform/RequiresIdentityTest.out   |   4 +
 .../createsymbols/CreateSymbolsTest.java      |  13 --
 .../createsymbols/CreateSymbolsTestImpl.java  | 118 +++++++++-
 12 files changed, 529 insertions(+), 30 deletions(-)
 create mode 100644 test/langtools/tools/javac/platform/RequiresIdentityTest.java
 create mode 100644 test/langtools/tools/javac/platform/RequiresIdentityTest.out

diff --git a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
index 08d5cb85ef2..fe5938ce0e3 100644
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -46,6 +46,8 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.classfile.*;
+import java.lang.classfile.TypeAnnotation.TargetInfo;
+import java.lang.classfile.TypeAnnotation.TypePathComponent;
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
@@ -991,6 +993,12 @@ private void addGenericAttributes(FeatureDescription desc, Consumer<? super Attr
         if (desc.runtimeAnnotations != null && !desc.runtimeAnnotations.isEmpty()) {
             builder.accept(RuntimeVisibleAnnotationsAttribute.of(createAnnotations(desc.runtimeAnnotations)));
         }
+        if (desc.classTypeAnnotations != null && !desc.classTypeAnnotations.isEmpty()) {
+            builder.accept(RuntimeInvisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.classTypeAnnotations)));
+        }
+        if (desc.runtimeTypeAnnotations != null && !desc.runtimeTypeAnnotations.isEmpty()) {
+            builder.accept(RuntimeVisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.runtimeTypeAnnotations)));
+        }
     }
 
     private List<Annotation> createAnnotations(List<AnnotationDescription> desc) {
@@ -1066,6 +1074,44 @@ private AnnotationValue createAttributeValue(Object value) {
             default -> throw new IllegalArgumentException(value.getClass().getName());
         };
     }
+
+    private List<TypeAnnotation> createTypeAnnotations(List<TypeAnnotationDescription> desc) {
+        return desc.stream().map(this::createTypeAnnotation).collect(Collectors.toList());
+    }
+
+    private TypeAnnotation createTypeAnnotation(TypeAnnotationDescription desc) {
+        Annotation baseAnn = createAnnotation(desc.annotation);
+        TargetInfo targetInfo = switch ((String) desc.targetInfo.get("targetType")) {
+            case "CLASS_TYPE_PARAMETER" -> //TODO: test!
+                TargetInfo.ofClassTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
+            case "METHOD_TYPE_PARAMETER" ->
+                TargetInfo.ofMethodTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
+            case "CLASS_EXTENDS" ->
+                TargetInfo.ofClassExtends((int) desc.targetInfo.get("supertypeIndex"));
+            case "CLASS_TYPE_PARAMETER_BOUND" ->
+                TargetInfo.ofClassTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
+                                                     (int) desc.targetInfo.get("boundIndex"));
+            case "METHOD_TYPE_PARAMETER_BOUND" ->
+                TargetInfo.ofMethodTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
+                                                      (int) desc.targetInfo.get("boundIndex"));
+            case "METHOD_RETURN" ->
+                TargetInfo.ofMethodReturn();
+            case "METHOD_RECEIVER" ->
+                TargetInfo.ofMethodReceiver();
+            case "METHOD_FORMAL_PARAMETER" ->
+                TargetInfo.ofMethodFormalParameter((int) desc.targetInfo.get("formalParameterIndex"));
+            case "THROWS" ->
+                TargetInfo.ofThrows((int) desc.targetInfo.get("throwsTargetIndex"));
+            case "FIELD" ->
+                TargetInfo.ofField();
+            case String targetType ->
+                throw new IllegalStateException("Unsupported targetType: " + targetType);
+        };
+
+        List<TypePathComponent> typePath = desc.typePath.stream().map(d -> TypePathComponent.of(TypePathComponent.Kind.valueOf(d.tag()), d.index())).toList();
+
+        return TypeAnnotation.of(targetInfo, typePath, baseAnn);
+    }
     //</editor-fold>
     //</editor-fold>
 
@@ -2213,7 +2259,10 @@ private boolean readAttribute(FeatureDescription feature, Attribute<?> attr) {
                 chd.permittedSubclasses = a.permittedSubclasses().stream().map(ClassEntry::asInternalName).collect(Collectors.toList());
             }
             case ModuleMainClassAttribute a -> ((ModuleHeaderDescription) feature).moduleMainClass = a.mainClass().asInternalName();
-            case RuntimeVisibleTypeAnnotationsAttribute a -> {/* do nothing for now */}
+            case RuntimeInvisibleTypeAnnotationsAttribute a ->
+                feature.classTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
+            case RuntimeVisibleTypeAnnotationsAttribute a ->
+                feature.runtimeTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
             default -> throw new IllegalArgumentException("Unhandled attribute: " + attr.attributeName()); // Do nothing
         }
 
@@ -2270,6 +2319,31 @@ private AnnotationDescription annotation2Description(java.lang.classfile.Annotat
 
         return new AnnotationDescription(annotationType, values);
     }
+
+    private List<TypeAnnotationDescription> typeAnnotations2Descriptions(List<TypeAnnotation> annos) {
+        return annos.stream().map(ta -> {
+            TypeAnnotationDescription desc = new TypeAnnotationDescription();
+            desc.annotation = annotation2Description(ta.annotation());
+            desc.targetInfo = new HashMap<>();
+            desc.targetInfo.put("targetType", ta.targetInfo().targetType().name());
+            switch (ta.targetInfo()) {
+                case TypeAnnotation.TypeParameterTarget tpt -> desc.targetInfo.put("typeParameterIndex", tpt.typeParameterIndex());
+                case TypeAnnotation.SupertypeTarget st -> desc.targetInfo.put("supertypeIndex", st.supertypeIndex());
+                case TypeAnnotation.TypeParameterBoundTarget tpbt -> {
+                    desc.targetInfo.put("typeParameterIndex", tpbt.typeParameterIndex());
+                    desc.targetInfo.put("boundIndex", tpbt.boundIndex());
+                }
+                case TypeAnnotation.EmptyTarget _ -> {
+                    // nothing to write
+                }
+                case TypeAnnotation.FormalParameterTarget fpt -> desc.targetInfo.put("formalParameterIndex", fpt.formalParameterIndex());
+                case TypeAnnotation.ThrowsTarget tt -> desc.targetInfo.put("throwsTargetIndex", tt.throwsTargetIndex());
+                default -> throw new IllegalStateException(ta.targetInfo().targetType().name());
+            }
+            desc.typePath = ta.targetPath().stream().map(tpc -> new TypeAnnotationDescription.TypePathComponentDesc(tpc.typePathKind().name(), tpc.typeArgumentIndex())).toList();
+            return desc;
+        }).toList();
+    }
     //</editor-fold>
 
     protected boolean includeEffectiveAccess(ClassList classes, ClassDescription clazz) {
@@ -2391,6 +2465,8 @@ static abstract class FeatureDescription {
         String versions = "";
         List<AnnotationDescription> classAnnotations;
         List<AnnotationDescription> runtimeAnnotations;
+        List<TypeAnnotationDescription> classTypeAnnotations;
+        List<TypeAnnotationDescription> runtimeTypeAnnotations;
 
         protected void writeAttributes(Appendable output) throws IOException {
             if (flags != 0)
@@ -2413,6 +2489,18 @@ protected void writeAttributes(Appendable output) throws IOException {
                     output.append(quote(a.toString(), false));
                 }
             }
+            if (classTypeAnnotations != null && !classTypeAnnotations.isEmpty()) {
+                output.append(" classTypeAnnotations ");
+                for (TypeAnnotationDescription a : classTypeAnnotations) {
+                    output.append(quote(a.toString(), false));
+                }
+            }
+            if (runtimeTypeAnnotations != null && !runtimeTypeAnnotations.isEmpty()) {
+                output.append(" runtimeTypeAnnotations ");
+                for (TypeAnnotationDescription a : runtimeTypeAnnotations) {
+                    output.append(quote(a.toString(), false));
+                }
+            }
         }
 
         protected boolean shouldIgnore(String baselineVersion, String version) {
@@ -2442,6 +2530,14 @@ protected void readAttributes(LineBasedReader reader) {
             if (inRuntimeAnnotations != null) {
                 runtimeAnnotations = parseAnnotations(inRuntimeAnnotations, new int[1]);
             }
+            String inClassTypeAnnotations = reader.attributes.get("classTypeAnnotations");
+            if (inClassTypeAnnotations != null) {
+                classTypeAnnotations = parseTypeAnnotations(inClassTypeAnnotations, new int[1]);
+            }
+            String inRuntimeTypeAnnotations = reader.attributes.get("runtimeTypeAnnotations");
+            if (inRuntimeTypeAnnotations != null) {
+                runtimeTypeAnnotations = parseTypeAnnotations(inRuntimeTypeAnnotations, new int[1]);
+            }
         }
 
         public abstract boolean read(LineBasedReader reader) throws IOException;
@@ -2454,6 +2550,8 @@ public int hashCode() {
             hash = 89 * hash + Objects.hashCode(this.signature);
             hash = 89 * hash + listHashCode(this.classAnnotations);
             hash = 89 * hash + listHashCode(this.runtimeAnnotations);
+            hash = 89 * hash + listHashCode(this.classTypeAnnotations);
+            hash = 89 * hash + listHashCode(this.runtimeTypeAnnotations);
             return hash;
         }
 
@@ -2481,6 +2579,12 @@ public boolean equals(Object obj) {
             if (!listEquals(this.runtimeAnnotations, other.runtimeAnnotations)) {
                 return false;
             }
+            if (!listEquals(this.classTypeAnnotations, other.classTypeAnnotations)) {
+                return false;
+            }
+            if (!listEquals(this.runtimeTypeAnnotations, other.runtimeTypeAnnotations)) {
+                return false;
+            }
             return true;
         }
 
@@ -3285,6 +3389,8 @@ public int hashCode() {
             hash = 59 * hash + Objects.hashCode(this.descriptor);
             hash = 59 * hash + Objects.hashCode(this.thrownTypes);
             hash = 59 * hash + Objects.hashCode(this.annotationDefaultValue);
+            hash = 59 * hash + Objects.hashCode(this.classParameterAnnotations);
+            hash = 59 * hash + Objects.hashCode(this.runtimeParameterAnnotations);
             return hash;
         }
 
@@ -3309,6 +3415,12 @@ public boolean equals(Object obj) {
             if (!Objects.equals(this.annotationDefaultValue, other.annotationDefaultValue)) {
                 return false;
             }
+            if (!Objects.equals(this.classParameterAnnotations, other.classParameterAnnotations)) {
+                return false;
+            }
+            if (!Objects.equals(this.runtimeParameterAnnotations, other.runtimeParameterAnnotations)) {
+                return false;
+            }
             return true;
         }
 
@@ -3636,6 +3748,40 @@ private static String dumpAnnotationValue(Object value) {
         }
     }
 
+    static final class TypeAnnotationDescription {
+        AnnotationDescription annotation;
+        Map<String, Object> targetInfo;
+        List<TypePathComponentDesc> typePath;
+
+        public TypeAnnotationDescription() {
+        }
+
+        public TypeAnnotationDescription(AnnotationDescription annotation, Map<String, Object> targetInfo, List<TypePathComponentDesc> typePath) {
+            this.annotation = annotation;
+            this.targetInfo = targetInfo;
+            this.typePath = typePath;
+        }
+
+        @Override
+        public String toString() {
+            return annotation.toString() + "{" + targetInfo.entrySet().stream().map(e -> e.getKey() + "=" + quote(printValue(e.getValue()), false)).collect(Collectors.joining(",")) + "}" +
+                                           (!typePath.isEmpty() ? "[" + typePath.stream().map(desc -> desc.tag + ":" + desc.index).collect(Collectors.joining(",")) + "]" : "");
+        }
+
+        private String printValue(Object obj) {
+            if (obj instanceof String s) {
+                return "\"" + s + "\"";
+            } else if (obj instanceof Integer i) {
+                return "I" + String.valueOf(i);
+            } else {
+                throw new IllegalStateException("Unsupported value: " + obj.getClass());
+            }
+        }
+
+        //TODO: path
+        record TypePathComponentDesc(String tag, int index) {}
+    }
+
     static final class EnumConstant {
         String type;
         String constant;
@@ -3975,23 +4121,69 @@ public static List<AnnotationDescription> parseAnnotations(String encoded, int[]
 
     private static AnnotationDescription parseAnnotation(String value, int[] valuePointer) {
         String className = className(value, valuePointer);
-        Map<String, Object> attribute2Value = new HashMap<>();
+        Map<String, Object> attribute2Value = Map.of();
 
         if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '(') {
-            while (value.charAt(valuePointer[0]) != ')') {
+            attribute2Value = parseMap(value, valuePointer, ')');
+        }
+
+        return new AnnotationDescription(className, attribute2Value);
+    }
+
+    private static Map<String, Object> parseMap(String value, int[] valuePointer, char endBracket) {
+        Map<String, Object> attribute2Value = new HashMap<>();
+
+        while (value.charAt(valuePointer[0]) != endBracket) {
+            int nameStart = ++valuePointer[0];
+
+            while (value.charAt(valuePointer[0]++) != '=');
+
+            String name = value.substring(nameStart, valuePointer[0] - 1);
+
+            attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
+        }
+
+        valuePointer[0]++;
+
+        return attribute2Value;
+    }
+
+    public static List<TypeAnnotationDescription> parseTypeAnnotations(String encoded, int[] pointer) {
+        List<TypeAnnotationDescription> result = new ArrayList<>();
+
+        while (pointer[0] < encoded.length() && encoded.charAt(pointer[0]) == '@') {
+            pointer[0]++;
+            result.add(parseTypeAnnotation(encoded, pointer));
+        }
+
+        return result;
+    }
+
+    private static TypeAnnotationDescription parseTypeAnnotation(String value, int[] valuePointer) {
+        AnnotationDescription ann = parseAnnotation(value, valuePointer);
+        Map<String, Object> targetInfo = Map.of();
+
+        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '{') {
+            targetInfo = parseMap(value, valuePointer, '}');
+        }
+
+        List<TypeAnnotationDescription.TypePathComponentDesc> typePath = new ArrayList<>();
+
+        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '[') {
+            while (value.charAt(valuePointer[0]) != ']') {
                 int nameStart = ++valuePointer[0];
 
-                while (value.charAt(valuePointer[0]++) != '=');
+                while (value.charAt(valuePointer[0]++) != ':');
 
                 String name = value.substring(nameStart, valuePointer[0] - 1);
 
-                attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
+                typePath.add(new TypeAnnotationDescription.TypePathComponentDesc(name, Integer.parseInt(readDigits(value, valuePointer))));
             }
 
             valuePointer[0]++;
         }
 
-        return new AnnotationDescription(className, attribute2Value);
+        return new TypeAnnotationDescription(ann, targetInfo, typePath);
     }
     //</editor-fold>
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
index 53abf99ed7d..2d1ebcfebe8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@@ -399,6 +399,11 @@ public static EnumSet<Flag> asFlagSet(long flags) {
      */
     public static final long RESTRICTED = 1L<<62; // MethodSymbols
 
+    /**
+     * Flag to indicate parameters that require identity.
+     */
+    public static final long REQUIRES_IDENTITY = 1L<<62; // VarSymbols (parameters)
+
     /**
      * Flag to indicate type annotations have been queued for field initializers.
      */
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index 54b3fe8a562..e5eac0786f6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -969,7 +969,8 @@ public <A extends Annotation> Attribute.Compound getAttribute(Class<A> annoType)
             boolean isCurrentSymbolsAnnotation(Attribute.TypeCompound anno, int index) {
                 return (anno.position.type == TargetType.CLASS_TYPE_PARAMETER ||
                         anno.position.type == TargetType.METHOD_TYPE_PARAMETER) &&
-                        anno.position.parameter_index == index;
+                        anno.position.parameter_index == index &&
+                        anno.type.tsym.flatName() != name.table.names.requiresIdentityInternal;
             }
 
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
index 2079532eb2c..762932fe904 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -384,9 +384,15 @@ public boolean isTerminal() {
     // Enter a synthetic class that is used to mark classes in ct.sym.
     // This class does not have a class file.
     private Type enterSyntheticAnnotation(String name) {
+        return enterSyntheticAnnotation(names.fromString(name));
+    }
+
+    // Enter a synthetic class that is used to mark classes in ct.sym.
+    // This class does not have a class file.
+    private Type enterSyntheticAnnotation(Name name) {
         // for now, leave the module null, to prevent problems from synthesizing the
         // existence of a class in any specific module, including noModule
-        ClassType type = (ClassType)enterClass(java_base, names.fromString(name)).type;
+        ClassType type = (ClassType)enterClass(java_base, name).type;
         ClassSymbol sym = (ClassSymbol)type.tsym;
         sym.completer = Completer.NULL_COMPLETER;
         sym.flags_field = PUBLIC|ACYCLIC|ANNOTATION|INTERFACE;
@@ -613,7 +619,7 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         valueBasedType = enterClass("jdk.internal.ValueBased");
         valueBasedInternalType = enterSyntheticAnnotation("jdk.internal.ValueBased+Annotation");
         requiresIdentityType = enterClass("jdk.internal.RequiresIdentity");
-        requiresIdentityInternalType = enterSyntheticAnnotation("jdk.internal.RequiresIdentity+Annotation");
+        requiresIdentityInternalType = enterSyntheticAnnotation(names.requiresIdentityInternal);
         classDescType = enterClass("java.lang.constant.ClassDesc");
         enumDescType = enterClass("java.lang.Enum$EnumDesc");
         // For serialization lint checking
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index 35672b2b1bc..3da83248436 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -384,6 +384,12 @@ private <T extends Attribute.Compound> void annotateNow(Symbol toAnnotate,
                     && types.isSameType(c.type, syms.restrictedType)) {
                 toAnnotate.flags_field |= Flags.RESTRICTED;
             }
+
+            if (!c.type.isErroneous()
+                    && toAnnotate.kind == VAR
+                    && types.isSameType(c.type, syms.requiresIdentityType)) {
+                toAnnotate.flags_field |= Flags.REQUIRES_IDENTITY;
+            }
         }
 
         List<T> buf = List.nil();
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 05730e3f257..89ab5b13dd1 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
@@ -5729,14 +5729,14 @@ void checkRequiresIdentity(JCTree tree, Lint lint) {
                     if (!argExps.isEmpty() && msym instanceof MethodSymbol ms && ms.params != null) {
                         VarSymbol lastParam = ms.params.head;
                         for (VarSymbol param: ms.params) {
-                            if (param.attribute(syms.requiresIdentityType.tsym) != null && argExps.head.type.isValueBased()) {
+                            if ((param.flags_field & REQUIRES_IDENTITY) != 0 && argExps.head.type.isValueBased()) {
                                 lint.logIfEnabled(argExps.head.pos(), LintWarnings.AttemptToUseValueBasedWhereIdentityExpected);
                             }
                             lastParam = param;
                             argExps = argExps.tail;
                         }
                         while (argExps != null && !argExps.isEmpty() && lastParam != null) {
-                            if (lastParam.attribute(syms.requiresIdentityType.tsym) != null && argExps.head.type.isValueBased()) {
+                            if ((lastParam.flags_field & REQUIRES_IDENTITY) != 0 && argExps.head.type.isValueBased()) {
                                 lint.logIfEnabled(argExps.head.pos(), LintWarnings.AttemptToUseValueBasedWhereIdentityExpected);
                             }
                             argExps = argExps.tail;
@@ -5813,7 +5813,7 @@ public Void visitClassType(ClassType t, Set<Type> seen) {
                 SymbolMetadata sm = t.tsym.getMetadata();
                 if (sm != null && !t.getTypeArguments().isEmpty()) {
                     if (sm.getTypeAttributes().stream()
-                            .filter(ta -> ta.type.tsym == syms.requiresIdentityType.tsym &&
+                            .filter(ta -> isRequiresIdentityAnnotation(ta.type.tsym) &&
                                     t.getTypeArguments().get(ta.position.parameter_index) != null &&
                                     t.getTypeArguments().get(ta.position.parameter_index).isValueBased()).findAny().isPresent()) {
                         requiresWarning = true;
@@ -5838,11 +5838,16 @@ private void checkIfTypeParamsRequiresIdentity(SymbolMetadata sm,
             }
             if (sm != null)
                 sm.getTypeAttributes().stream()
-                        .filter(ta -> (ta.type.tsym == syms.requiresIdentityType.tsym) &&
+                        .filter(ta -> isRequiresIdentityAnnotation(ta.type.tsym) &&
                                 typeParamTrees.get(ta.position.parameter_index).type != null &&
                                 typeParamTrees.get(ta.position.parameter_index).type.isValueBased())
                         .forEach(ta -> lint.logIfEnabled(typeParamTrees.get(ta.position.parameter_index).pos(),
                                 CompilerProperties.LintWarnings.AttemptToUseValueBasedWhereIdentityExpected));
         }
     }
+
+    private boolean isRequiresIdentityAnnotation(TypeSymbol annoType) {
+        return annoType == syms.requiresIdentityType.tsym ||
+               annoType.flatName() == syms.requiresIdentityInternalType.tsym.flatName();
+    }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 0173ab109d7..cf751ff6b30 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1556,6 +1556,9 @@ else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
             } else if (proxy.type.tsym.flatName() == syms.restrictedInternalType.tsym.flatName()) {
                 Assert.check(sym.kind == MTH);
                 sym.flags_field |= RESTRICTED;
+            } else if (proxy.type.tsym.flatName() == syms.requiresIdentityInternalType.tsym.flatName()) {
+                Assert.check(sym.kind == VAR);
+                sym.flags_field |= REQUIRES_IDENTITY;
             } else {
                 if (proxy.type.tsym == syms.annotationTargetType.tsym) {
                     target = proxy;
@@ -1572,6 +1575,9 @@ else if (proxy.type.tsym.flatName() == syms.profileType.tsym.flatName()) {
                 }  else if (proxy.type.tsym == syms.restrictedType.tsym) {
                     Assert.check(sym.kind == MTH);
                     sym.flags_field |= RESTRICTED;
+                }  else if (proxy.type.tsym == syms.requiresIdentityType.tsym) {
+                    Assert.check(sym.kind == VAR);
+                    sym.flags_field |= REQUIRES_IDENTITY;
                 }
                 proxies.append(proxy);
             }
@@ -2809,9 +2815,8 @@ void setParameters(MethodSymbol sym, Type jvmType) {
             params.append(param);
             if (parameterAnnotations != null) {
                 ParameterAnnotations annotations = parameterAnnotations[annotationIndex];
-                if (annotations != null && annotations.proxies != null
-                        && !annotations.proxies.isEmpty()) {
-                    annotate.normal(new AnnotationCompleter(param, annotations.proxies));
+                if (annotations != null && annotations.proxies != null) {
+                    attachAnnotations(param, annotations.proxies);
                 }
             }
             nameIndexLvt += Code.width(t);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
index d9aec7c4592..f5df8baddbd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
@@ -228,6 +228,9 @@ public static Names instance(Context context) {
     public final Name enumSwitch;
     public final Name enumConstant;
 
+    // special annotation names
+    public final Name requiresIdentityInternal;
+
     public final Name.Table table;
 
     @SuppressWarnings("this-escape")
@@ -412,6 +415,9 @@ record = fromString("record");
         typeSwitch = fromString("typeSwitch");
         enumSwitch = fromString("enumSwitch");
         enumConstant = fromString("enumConstant");
+
+        // special annotations:
+        requiresIdentityInternal = fromString("jdk.internal.RequiresIdentity+Annotation");
     }
 
     protected Name.Table createTable(Options options) {
diff --git a/test/langtools/tools/javac/platform/RequiresIdentityTest.java b/test/langtools/tools/javac/platform/RequiresIdentityTest.java
new file mode 100644
index 00000000000..f10d6e8054c
--- /dev/null
+++ b/test/langtools/tools/javac/platform/RequiresIdentityTest.java
@@ -0,0 +1,166 @@
+/*
+ * 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 8356894
+ * @summary Verify source level checks are performed properly
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main RequiresIdentityTest
+*/
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import toolbox.TestRunner;
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class RequiresIdentityTest extends TestRunner {
+
+    ToolBox tb;
+
+    public static void main(String... args) throws Exception {
+        new RequiresIdentityTest().runTests();
+    }
+
+    RequiresIdentityTest() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void testReleaseWorksAsCurrentVersion(Path base) throws Exception {
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          import java.util.WeakHashMap;
+                          import java.util.Optional;
+
+                          public class Test {
+                              void test() {
+                                  WeakHashMap<Optional<Integer>, Object> m = null;
+                                  m.put(Optional.empty(), 1);
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        var expectedErrors = List.of(
+            "Test.java:6:20: compiler.warn.attempt.to.use.value.based.where.identity.expected",
+            "Test.java:7:29: compiler.warn.attempt.to.use.value.based.where.identity.expected",
+            "2 warnings"
+        );
+
+        {
+            var actualErrors =
+                    new JavacTask(tb)
+                        .options("-XDrawDiagnostics")
+                        .outdir(classes)
+                        .files(tb.findJavaFiles(src))
+                        .run()
+                        .writeAll()
+                        .getOutputLines(Task.OutputKind.DIRECT);
+            if (!expectedErrors.equals(actualErrors)) {
+                throw new AssertionError("Incorrect errors, expected: " + List.of(expectedErrors) +
+                                          ", actual: " + actualErrors);
+            }
+        }
+
+        {
+            var actualErrors =
+                    new JavacTask(tb)
+                        .options("--release", System.getProperty("java.specification.version"),
+                                 "-XDrawDiagnostics")
+                        .outdir(classes)
+                        .files(tb.findJavaFiles(src))
+                        .run()
+                        .writeAll()
+                        .getOutputLines(Task.OutputKind.DIRECT);
+            if (!expectedErrors.equals(actualErrors)) {
+                throw new AssertionError("Incorrect errors, expected: " + List.of(expectedErrors) +
+                                          ", actual: " + actualErrors);
+            }
+        }
+    }
+
+    @Test
+    public void testModel(Path base) throws Exception {
+        {
+            List<String> printed =
+                new JavacTask(tb)
+                    .options("-Xprint")
+                    .classes("java.util.WeakHashMap")
+                    .run()
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.STDOUT);
+
+            printed.removeIf(l -> !l.contains("put(") && !l.contains("class WeakHashMap<"));
+
+            List<String> expected = List.of(
+                "public class WeakHashMap<@jdk.internal.RequiresIdentity K, V> extends java.util.AbstractMap<K,V> implements java.util.Map<K,V> {",
+                "  public V put(@jdk.internal.RequiresIdentity sealed K key,"
+            );
+            if (!expected.equals(printed)) {
+                throw new AssertionError("Expected: " + expected +
+                                         ", but got: " + printed);
+            }
+        }
+
+        {
+            List<String> printed =
+                new JavacTask(tb)
+                    .options("--release", System.getProperty("java.specification.version"),
+                             "-Xprint")
+                    .classes("java.util.WeakHashMap")
+                    .run()
+                    .writeAll()
+                    .getOutputLines(Task.OutputKind.STDOUT);
+
+            printed.removeIf(l -> !l.contains("put(") && !l.contains("class WeakHashMap<"));
+
+            List<String> expected = List.of(
+                "public class WeakHashMap<K, V> extends java.util.AbstractMap<K,V> implements java.util.Map<K,V> {",
+                "  public V put(sealed K arg0,"
+            );
+            if (!expected.equals(printed)) {
+                throw new AssertionError("Expected: " + expected +
+                                         ", but got: " + printed);
+            }
+        }
+    }
+
+}
diff --git a/test/langtools/tools/javac/platform/RequiresIdentityTest.out b/test/langtools/tools/javac/platform/RequiresIdentityTest.out
new file mode 100644
index 00000000000..7b93ce830b7
--- /dev/null
+++ b/test/langtools/tools/javac/platform/RequiresIdentityTest.out
@@ -0,0 +1,4 @@
+RequiresIdentityTest.java:16:18: compiler.warn.attempt.to.use.value.based.where.identity.expected
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
index 76c13582b73..ac42c26488a 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTest.java
@@ -21,19 +21,6 @@
  * questions.
  */
 
-/**
- * @test
- * @bug 8072480 8277106 8331027
- * @summary Unit test for CreateSymbols
- * @modules java.compiler
- *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.jvm
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.util
- * @clean *
- * @run main/othervm CreateSymbolsTest
- */
-
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java
index c66cd08852a..2680ca6488f 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.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
@@ -21,6 +21,19 @@
  * questions.
  */
 
+/**
+ * @test
+ * @bug 8072480 8277106 8331027
+ * @summary Unit test for CreateSymbols
+ * @modules java.compiler
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @clean *
+ * @run main/othervm CreateSymbolsTest
+ */
+
 import java.io.File;
 import java.io.InputStream;
 import java.io.Writer;
@@ -908,6 +921,109 @@ public static class OtherNested {}
                    """);
     }
 
+    @Test
+    void testTypeAnnotations() throws Exception {
+        doPrintElementTest("""
+                           package t;
+                           public class T {
+                           }
+                           """,
+                           """
+                           package t;
+                           import java.lang.annotation.*;
+                           import java.util.*;
+                           public class T<@AnnInvisible @AnnVisible E extends @AnnInvisible @AnnVisible ArrayList<@AnnInvisible @AnnVisible ArrayList>> extends @AnnInvisible @AnnVisible ArrayList {
+                               public @AnnInvisible @AnnVisible List<@AnnInvisible @AnnVisible E> field;
+                               public <@AnnInvisible @AnnVisible M extends @AnnInvisible @AnnVisible ArrayList<@AnnInvisible @AnnVisible ArrayList>> @AnnInvisible @AnnVisible List<@AnnInvisible @AnnVisible M> convert(@AnnInvisible @AnnVisible T<E> this, @AnnInvisible @AnnVisible M e1, @AnnInvisible @AnnVisible List<@AnnInvisible @AnnVisible E> e2) throws @AnnInvisible @AnnVisible IllegalStateException, @AnnInvisible @AnnVisible IllegalArgumentException {
+                                   return null;
+                               }
+                           }
+                           @Retention(RetentionPolicy.RUNTIME)
+                           @Target(ElementType.TYPE_USE)
+                           @interface AnnVisible {
+                           }
+                           @Retention(RetentionPolicy.CLASS)
+                           @Target(ElementType.TYPE_USE)
+                           @interface AnnInvisible {
+                           }
+                           """,
+                           "t.T",
+                           """
+                           package t;
+
+                           public class T {
+
+                             public T();
+                           }
+                           """,
+                           "t.T",
+                           """
+                           package t;
+
+                           public class T<@t.AnnInvisible @t.AnnVisible E extends java.util.@t.AnnInvisible @t.AnnVisible ArrayList<java.util.@t.AnnInvisible @t.AnnVisible ArrayList>> extends java.util.@t.AnnInvisible @t.AnnVisible ArrayList {
+                             public java.util.@t.AnnInvisible @t.AnnVisible List<@t.AnnInvisible @t.AnnVisible E> field;
+
+                             public T();
+
+                             public <@t.AnnInvisible @t.AnnVisible M extends java.util.@t.AnnInvisible @t.AnnVisible ArrayList<java.util.@t.AnnInvisible @t.AnnVisible ArrayList>> java.util.@t.AnnInvisible @t.AnnVisible List<@t.AnnInvisible @t.AnnVisible M> convert(@t.AnnInvisible @t.AnnVisible M arg0,
+                               java.util.@t.AnnInvisible @t.AnnVisible List<@t.AnnInvisible @t.AnnVisible E> arg1) throws java.lang.@t.AnnInvisible @t.AnnVisible IllegalStateException,\s
+                               java.lang.@t.AnnInvisible @t.AnnVisible IllegalArgumentException;
+                           }
+                           """);
+    }
+
+    @Test
+    void testParameterAnnotations() throws Exception {
+        doPrintElementTest("""
+                           package t;
+                           public class T {
+                               public void test(int p1, int p2) {
+                               }
+                           }
+                           """,
+                           """
+                           package t;
+                           import java.lang.annotation.*;
+                           import java.util.*;
+                           public class T {
+                               public void test(@AnnVisible int p1, @AnnInvisible int p2) {
+                               }
+                           }
+                           @Retention(RetentionPolicy.RUNTIME)
+                           @Target(ElementType.PARAMETER)
+                           @interface AnnVisible {
+                           }
+                           @Retention(RetentionPolicy.CLASS)
+                           @Target(ElementType.PARAMETER)
+                           @interface AnnInvisible {
+                           }
+                           """,
+                           "t.T",
+                           """
+                           package t;
+
+                           public class T {
+
+                             public T();
+
+                             public void test(int arg0,
+                               int arg1);
+                           }
+                           """,
+                           "t.T",
+                           """
+                           package t;
+
+                           public class T {
+
+                             public T();
+
+                             public void test(@t.AnnVisible int arg0,
+                               @t.AnnInvisible int arg1);
+                           }
+                           """);
+    }
+
     void doTestData(String data,
                           String... code) throws Exception {
         String testClasses = System.getProperty("test.classes");

From d6e4c5f65932114b5c6f455db6cfaa220607ce18 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 23 May 2025 06:32:56 +0000
Subject: [PATCH 605/901] 8357506: [JVMCI] Consolidate eager JVMCI
 initialization code

Reviewed-by: kvn, yzheng
---
 src/hotspot/share/jvmci/jvmci.cpp        | 9 +++++++--
 src/hotspot/share/jvmci/jvmci.hpp        | 5 ++---
 src/hotspot/share/jvmci/jvmciEnv.cpp     | 5 +----
 src/hotspot/share/jvmci/jvmciRuntime.cpp | 8 --------
 src/hotspot/share/jvmci/jvmciRuntime.hpp | 2 --
 src/hotspot/share/runtime/threads.cpp    | 2 +-
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmci.cpp b/src/hotspot/share/jvmci/jvmci.cpp
index 15973f4549f..b59c7fa3444 100644
--- a/src/hotspot/share/jvmci/jvmci.cpp
+++ b/src/hotspot/share/jvmci/jvmci.cpp
@@ -151,7 +151,7 @@ void* JVMCI::get_shared_library(char*& path, bool load) {
   return _shared_library_handle;
 }
 
-void JVMCI::initialize_compiler(TRAPS) {
+void JVMCI::initialize_compiler_in_create_vm(TRAPS) {
   if (JVMCILibDumpJNIConfig) {
     JNIJVMCI::initialize_ids(nullptr);
     ShouldNotReachHere();
@@ -162,7 +162,12 @@ void JVMCI::initialize_compiler(TRAPS) {
   } else {
       runtime = JVMCI::java_runtime();
   }
-  runtime->call_getCompiler(CHECK);
+
+  JVMCIENV_FROM_THREAD(THREAD);
+  JVMCIENV->check_init(CHECK);
+  JVMCIObject jvmciRuntime = runtime->get_HotSpotJVMCIRuntime(JVMCI_CHECK);
+  runtime->initialize(JVMCI_CHECK);
+  JVMCIENV->call_HotSpotJVMCIRuntime_getCompiler(jvmciRuntime, JVMCI_CHECK);
 }
 
 void JVMCI::initialize_globals() {
diff --git a/src/hotspot/share/jvmci/jvmci.hpp b/src/hotspot/share/jvmci/jvmci.hpp
index 7eaea597936..196007fc7dd 100644
--- a/src/hotspot/share/jvmci/jvmci.hpp
+++ b/src/hotspot/share/jvmci/jvmci.hpp
@@ -191,9 +191,8 @@ class JVMCI : public AllStatic {
 
   static void initialize_globals();
 
-  // Called to force initialization of the JVMCI compiler
-  // early in VM startup.
-  static void initialize_compiler(TRAPS);
+  // Initializes the JVMCI compiler during VM startup.
+  static void initialize_compiler_in_create_vm(TRAPS);
 
   // Ensures the boxing cache classes (e.g., java.lang.Integer.IntegerCache) are initialized.
   static void ensure_box_caches_initialized(TRAPS);
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index 5a0efef0bd3..b8474552256 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -251,12 +251,9 @@ void JVMCIEnv::check_init(TRAPS) {
   if (_init_error == JNI_OK) {
     return;
   }
-  if (_init_error == JNI_ENOMEM) {
-    THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "JNI_ENOMEM creating or attaching to libjvmci");
-  }
   stringStream st;
   st.print("Error creating or attaching to libjvmci (err: %d, description: %s)",
-           _init_error, _init_error_msg == nullptr ? "unknown" : _init_error_msg);
+            _init_error, _init_error_msg != nullptr ? _init_error_msg : (_init_error == JNI_ENOMEM ? "JNI_ENOMEM" : "none"));
   THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), st.freeze());
 }
 
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index f02ef57de34..15fb0d6ed3a 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -743,14 +743,6 @@ JVM_ENTRY_NO_ENV(jlong, JVM_ReadSystemPropertiesInfo(JNIEnv *env, jclass c, jint
 JVM_END
 
 
-void JVMCIRuntime::call_getCompiler(TRAPS) {
-  JVMCIENV_FROM_THREAD(THREAD);
-  JVMCIENV->check_init(CHECK);
-  JVMCIObject jvmciRuntime = JVMCIRuntime::get_HotSpotJVMCIRuntime(JVMCI_CHECK);
-  initialize(JVMCI_CHECK);
-  JVMCIENV->call_HotSpotJVMCIRuntime_getCompiler(jvmciRuntime, JVMCI_CHECK);
-}
-
 void JVMCINMethodData::initialize(int nmethod_mirror_index,
                                   int nmethod_entry_patch_offset,
                                   const char* nmethod_mirror_name,
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index c35813eb16f..aa4685c5818 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -375,8 +375,6 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
   // Explicitly initialize HotSpotJVMCIRuntime itself
   void initialize_HotSpotJVMCIRuntime(JVMCI_TRAPS);
 
-  void call_getCompiler(TRAPS);
-
   // Shuts down this runtime by calling HotSpotJVMCIRuntime.shutdown().
   // If this is the last thread attached to this runtime, then
   // `_HotSpotJVMCIRuntime_instance` is set to null and `_init_state`
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 47c030fdb72..aac827246d2 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -835,7 +835,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 
 #if INCLUDE_JVMCI
   if (force_JVMCI_initialization) {
-    JVMCI::initialize_compiler(CHECK_JNI_ERR);
+    JVMCI::initialize_compiler_in_create_vm(CHECK_JNI_ERR);
   }
 #endif
 

From ae7ae847d4cb0dc2caf7bdc6a82673287cba8d30 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 23 May 2025 06:54:51 +0000
Subject: [PATCH 606/901] 8356016: Build fails by clang(XCode 16.3) on macOS
 after JDK-8347719

Reviewed-by: shade, mgronlun
---
 test/hotspot/gtest/jfr/test_networkUtilization.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/gtest/jfr/test_networkUtilization.cpp b/test/hotspot/gtest/jfr/test_networkUtilization.cpp
index fe7296eb719..46c92dc4646 100644
--- a/test/hotspot/gtest/jfr/test_networkUtilization.cpp
+++ b/test/hotspot/gtest/jfr/test_networkUtilization.cpp
@@ -39,12 +39,13 @@
 #include "logging/log.hpp"
 #include "runtime/os_perf.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/growableArray.hpp"
 
 #include "utilities/vmassert_uninstall.hpp"
-#include <vector>
+BEGIN_ALLOW_FORBIDDEN_FUNCTIONS
 #include <list>
-#include <map>
+#include <string>
+#include <vector>
+END_ALLOW_FORBIDDEN_FUNCTIONS
 #include "utilities/vmassert_reinstall.hpp"
 
 #include "unittest.hpp"
@@ -68,7 +69,6 @@ namespace {
   class MockJfrCheckpointWriter {
    public:
     traceid current;
-    std::map<traceid, std::string> ids;
 
     const JfrCheckpointContext context() const {
       return JfrCheckpointContext();

From 36f6d155e3b9d0b279be33414573217ea38551ac Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 23 May 2025 08:22:50 +0000
Subject: [PATCH 607/901] 8354517: Parallel: JDK-8339668 causes up to 3.7x
 slowdown in openjdk.bench.vm.gc.systemgc

Reviewed-by: tschatzl, aboldtch, zgu
---
 src/hotspot/share/gc/g1/g1ParScanThreadState.cpp      | 2 +-
 src/hotspot/share/gc/parallel/psCompactionManager.cpp | 2 +-
 src/hotspot/share/gc/parallel/psPromotionManager.cpp  | 2 +-
 src/hotspot/share/gc/shared/partialArraySplitter.cpp  | 5 +++--
 src/hotspot/share/gc/shared/partialArraySplitter.hpp  | 4 +++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index 89d7e44e6b3..388b378fdcd 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -80,7 +80,7 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
     _surviving_young_words(nullptr),
     _surviving_words_length(collection_set->young_region_length() + 1),
     _old_gen_is_full(false),
-    _partial_array_splitter(g1h->partial_array_state_manager(), num_workers),
+    _partial_array_splitter(g1h->partial_array_state_manager(), num_workers, ParGCArrayScanChunk),
     _string_dedup_requests(),
     _max_num_optional_regions(collection_set->num_optional_regions()),
     _numa(g1h->numa()),
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index ba936277821..b8ea47eeb09 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -58,7 +58,7 @@ PreservedMarksSet* ParCompactionManager::_preserved_marks_set = nullptr;
 ParCompactionManager::ParCompactionManager(PreservedMarks* preserved_marks,
                                            ReferenceProcessor* ref_processor,
                                            uint parallel_gc_threads)
-  :_partial_array_splitter(_partial_array_state_manager, parallel_gc_threads),
+  :_partial_array_splitter(_partial_array_state_manager, parallel_gc_threads, ObjArrayMarkingStride),
    _mark_and_push_closure(this, ref_processor) {
 
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index 12758f1b661..d27525c15b2 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -166,7 +166,7 @@ PartialArrayTaskStats* PSPromotionManager::partial_array_task_stats() {
 
 // Most members are initialized either by initialize() or reset().
 PSPromotionManager::PSPromotionManager()
-  : _partial_array_splitter(_partial_array_state_manager, ParallelGCThreads)
+  : _partial_array_splitter(_partial_array_state_manager, ParallelGCThreads, ParGCArrayScanChunk)
 {
   // We set the old lab's start array.
   _old_lab.set_start_array(old_gen()->start_array());
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.cpp b/src/hotspot/share/gc/shared/partialArraySplitter.cpp
index 12dd387fbfa..d1833872683 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.cpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.cpp
@@ -28,9 +28,10 @@
 #include "utilities/macros.hpp"
 
 PartialArraySplitter::PartialArraySplitter(PartialArrayStateManager* manager,
-                                           uint num_workers)
+                                           uint num_workers,
+                                           size_t chunk_size)
   : _allocator(manager),
-    _stepper(num_workers, ParGCArrayScanChunk)
+    _stepper(num_workers, chunk_size)
     TASKQUEUE_STATS_ONLY(COMMA _stats())
 {}
 
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.hpp b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
index 0dd2072c590..8608f993f8d 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.hpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
@@ -43,7 +43,9 @@ class PartialArraySplitter {
   TASKQUEUE_STATS_ONLY(PartialArrayTaskStats _stats;)
 
 public:
-  PartialArraySplitter(PartialArrayStateManager* manager, uint num_workers);
+  PartialArraySplitter(PartialArrayStateManager* manager,
+                       uint num_workers,
+                       size_t chunk_size);
   ~PartialArraySplitter() = default;
 
   NONCOPYABLE(PartialArraySplitter);

From 02995887b2a2554631f3d2bce03f8e3af6d0bafc Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Fri, 23 May 2025 09:07:58 +0000
Subject: [PATCH 608/901] 8343580: Type error with inner classes of generic
 classes in functions generic by outer

Reviewed-by: vromero
---
 .../com/sun/tools/javac/code/Type.java        |  6 +-
 test/langtools/tools/javac/T8343580.java      | 62 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 test/langtools/tools/javac/T8343580.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
index fa0220b1e1f..d397d71e4b5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
@@ -1155,7 +1155,11 @@ public void setEnclosingType(Type outer) {
 
         public List<Type> allparams() {
             if (allparams_field == null) {
-                allparams_field = getTypeArguments().prependList(getEnclosingType().allparams());
+                Type enclosingType = getEnclosingType();
+                while (enclosingType.hasTag(TYPEVAR)) {
+                    enclosingType = enclosingType.getUpperBound();
+                }
+                allparams_field = getTypeArguments().prependList(enclosingType.allparams());
             }
             return allparams_field;
         }
diff --git a/test/langtools/tools/javac/T8343580.java b/test/langtools/tools/javac/T8343580.java
new file mode 100644
index 00000000000..4a004bd86a6
--- /dev/null
+++ b/test/langtools/tools/javac/T8343580.java
@@ -0,0 +1,62 @@
+/*
+ * 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 8343580
+ * @summary Type error with inner classes of generic classes in functions generic by outer
+ * @compile T8343580.java
+ */
+
+class T8343580 {
+   static abstract class Getters<T> {
+      abstract class Getter {
+         abstract T get();
+      }
+   }
+
+   static class Usage1<T, G extends Getters<T>> {
+      public T test(G.Getter getter) {
+         return getter.get();
+      }
+   }
+
+   static class Usage2<T, U extends Getters<T>, G extends U> {
+      public T test(G.Getter getter) {
+         return getter.get();
+      }
+   }
+
+   static class Usage3<T, U extends T, G extends Getters<T>> {
+      public T test(G.Getter getter) {
+         return getter.get();
+      }
+   }
+
+   class G2<K> extends Getters<K> {}
+   static class Usage4<M, L extends G2<M>> {
+      M test(L.Getter getter) {
+         return getter.get();
+      }
+   }
+}

From 68ee06f0c9ec420cb1a60e0b361971372b18b82b Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Fri, 23 May 2025 09:42:25 +0000
Subject: [PATCH 609/901] 8357563: Shenandoah headers leak un-prefixed defines

Reviewed-by: shade, kbarrett
---
 .../share/gc/shenandoah/shenandoahFreeSet.hpp        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 4d22d7aa923..55f23480618 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -39,12 +39,6 @@ enum class ShenandoahFreeSetPartitionId : uint8_t {
   NotFree                       // Region is in no free set: it has no available memory
 };
 
-// We do not maintain counts, capacity, or used for regions that are not free.  Informally, if a region is NotFree, it is
-// in no partition.  NumPartitions represents the size of an array that may be indexed by Mutator or Collector.
-#define NumPartitions           (ShenandoahFreeSetPartitionId::NotFree)
-#define IntNumPartitions     int(ShenandoahFreeSetPartitionId::NotFree)
-#define UIntNumPartitions   uint(ShenandoahFreeSetPartitionId::NotFree)
-
 // ShenandoahRegionPartitions provides an abstraction to help organize the implementation of ShenandoahFreeSet.  This
 // class implements partitioning of regions into distinct sets.  Each ShenandoahHeapRegion is either in the Mutator free set,
 // the Collector free set, or in neither free set (NotFree).  When we speak of a "free partition", we mean partitions that
@@ -52,6 +46,12 @@ enum class ShenandoahFreeSetPartitionId : uint8_t {
 class ShenandoahRegionPartitions {
 
 private:
+  // We do not maintain counts, capacity, or used for regions that are not free.  Informally, if a region is NotFree, it is
+  // in no partition.  NumPartitions represents the size of an array that may be indexed by Mutator or Collector.
+  static constexpr ShenandoahFreeSetPartitionId NumPartitions     =      ShenandoahFreeSetPartitionId::NotFree;
+  static constexpr int                          IntNumPartitions  =  int(ShenandoahFreeSetPartitionId::NotFree);
+  static constexpr uint                         UIntNumPartitions = uint(ShenandoahFreeSetPartitionId::NotFree);
+
   const ssize_t _max;           // The maximum number of heap regions
   const size_t _region_size_bytes;
   const ShenandoahFreeSet* _free_set;

From 488e4ea5c6bc47be1d777bf5c26e2ffa2c436e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Fri, 23 May 2025 11:55:21 +0000
Subject: [PATCH 610/901] 8357539: TimeSource.now() is not monotonic

Reviewed-by: dfuchs, jpai
---
 .../jdk/internal/net/http/common/TimeSource.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/TimeSource.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/TimeSource.java
index 98ed50de77d..489fbe7ffd8 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/TimeSource.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/TimeSource.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
@@ -69,6 +69,8 @@ Deadline instant(long nanos) {
         }
 
         Deadline instant(long nanos, long delay) {
+            assert firstNanos + delay == nanos :
+                    "%d + %d != %d".formatted(firstNanos, delay, nanos);
             Instant now = first.plusNanos(delay);
             if (!isInWindow(delay)) {
                 // Shifts the time reference (firstNanos) to
@@ -85,18 +87,19 @@ long delay(long nanos) {
         }
 
         boolean isInWindow(long delay) {
-            return delay >= 0 && delay <= TIME_WINDOW;
+            return delay >= -TIME_WINDOW && delay <= TIME_WINDOW;
         }
 
     }
 
     @Override
     public Deadline instant() {
-        long nanos = System.nanoTime();
-        long delay = localSource.delay(nanos);
         // use localSource if possible to avoid a volatile read
-        if (localSource.isInWindow(delay)) {
-            return localSource.instant(nanos, delay);
+        NanoSource source = localSource;
+        long nanos = System.nanoTime();
+        long delay = source.delay(nanos);
+        if (source.isInWindow(delay)) {
+            return source.instant(nanos, delay);
         } else {
             // will cause the time reference to shift forward,
             // at the cost of a volatile write + a volatile read

From 84a67e83e3f4fcb6be6802d12b0788850a3845b5 Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Fri, 23 May 2025 11:56:25 +0000
Subject: [PATCH 611/901] 8341370: Test
 java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java fails
 intermittently on macOS-aarch64

Reviewed-by: kizune, dnguyen
---
 test/jdk/ProblemList.txt                      |  1 -
 .../ShapeNotSetSometimes.java                 | 23 +++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index c1a20e9ee63..d08d148a9f8 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -123,7 +123,6 @@ java/awt/Frame/MaximizedToMaximized/MaximizedToMaximized.java 8340374 macosx-all
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
 java/awt/Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java 8286840 linux-all
 java/awt/Frame/InitialIconifiedTest.java 7144049,8203920 macosx-all,linux-all
-java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java 8341370 macosx-all
 java/awt/Frame/FocusTest.java 8341480 macosx-all
 java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java 8160558 windows-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
diff --git a/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java b/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
index 52a5754a9c3..fe3bf95f25a 100644
--- a/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
+++ b/test/jdk/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java
@@ -33,6 +33,7 @@
 import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import javax.imageio.ImageIO;
@@ -42,7 +43,7 @@
  * @key headful
  * @bug 6988428
  * @summary Tests whether shape is always set
- * @run main/othervm -Dsun.java2d.uiScale=1 ShapeNotSetSometimes
+ * @run main/othervm/timeout=300 -Dsun.java2d.uiScale=1 ShapeNotSetSometimes
  */
 
 public class ShapeNotSetSometimes {
@@ -147,15 +148,20 @@ private void doTest() throws Exception {
         robot.waitForIdle();
         robot.delay(500);
 
+        Rectangle screenBounds = window.getGraphicsConfiguration().getBounds();
+        BufferedImage screenCapture = robot.createScreenCapture(screenBounds);
         try {
-            colorCheck(innerPoint.x, innerPoint.y, SHAPE_COLOR, true);
+            colorCheck(innerPoint.x, innerPoint.y, SHAPE_COLOR,
+                    true, screenCapture);
 
             for (Point point : pointsOutsideToCheck) {
-                colorCheck(point.x, point.y, BACKGROUND_COLOR, true);
+                colorCheck(point.x, point.y, BACKGROUND_COLOR,
+                        true, screenCapture);
             }
 
             for (Point point : shadedPointsToCheck) {
-                colorCheck(point.x, point.y, SHAPE_COLOR, false);
+                colorCheck(point.x, point.y, SHAPE_COLOR,
+                        false, screenCapture);
             }
         } finally {
             EventQueue.invokeAndWait(() -> {
@@ -169,15 +175,12 @@ private void doTest() throws Exception {
         }
     }
 
-    private void colorCheck(int x, int y, Color expectedColor, boolean mustBeExpectedColor) {
+    private void colorCheck(int x, int y, Color expectedColor,
+                            boolean mustBeExpectedColor, BufferedImage screenCapture) {
         int screenX = window.getX() + x;
         int screenY = window.getY() + y;
 
-        robot.mouseMove(screenX, screenY);
-        robot.waitForIdle();
-        robot.delay(50);
-
-        Color actualColor = robot.getPixelColor(screenX, screenY);
+        Color actualColor = new Color(screenCapture.getRGB(screenX, screenY));
 
         System.out.printf(
                 "Checking %3d, %3d, %35s should %sbe %35s\n",

From f5e6d2c93c3274e465c42709b7634463899fdf2e Mon Sep 17 00:00:00 2001
From: Renjith Kannath Pariyangad <rkannathpari@openjdk.org>
Date: Fri, 23 May 2025 11:57:35 +0000
Subject: [PATCH 612/901] 8334016: Make PrintNullString.java automatic

Reviewed-by: aivanov, prr, dnguyen
---
 .../awt/print/PrinterJob/PrintNullString.java | 201 +++++++-----------
 1 file changed, 75 insertions(+), 126 deletions(-)

diff --git a/test/jdk/java/awt/print/PrinterJob/PrintNullString.java b/test/jdk/java/awt/print/PrinterJob/PrintNullString.java
index 397dd2902d1..2bcee65fe9b 100644
--- a/test/jdk/java/awt/print/PrinterJob/PrintNullString.java
+++ b/test/jdk/java/awt/print/PrinterJob/PrintNullString.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
@@ -21,164 +21,113 @@
  * questions.
  */
 
-import java.awt.Button;
-import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Panel;
 import java.awt.print.PageFormat;
 import java.awt.print.Printable;
 import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
+import java.io.File;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 
-import javax.swing.JOptionPane;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.Destination;
 
 /*
  * @test
  * @bug 4223328
- * @summary Printer graphics must behave the same as screen graphics
+ * @summary Printer graphics must throw expected exceptions
  * @key printer
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @run main/manual PrintNullString
+ * @run main PrintNullString
  */
-public class PrintNullString extends Frame {
-    private static final String INSTRUCTIONS =
-            "This test should print a page which contains the same\n" +
-            "text messages as in the test window on the screen.\n" +
-            "\n" +
-            "The messages should contain only 'OK' and 'expected' messages.\n" +
-            "Press Pass if it's the case; otherwise press Fail.\n" +
-            "\n" +
-            "If the page fails to print, but there were no exceptions\n" +
-            "then the problem is likely elsewhere (i.e. your printer)";
+public class PrintNullString implements Printable {
+    private final String nullStr = null;
+    private final String emptyStr = "";
+    private final AttributedString emptyAttStr = new AttributedString(emptyStr);
+    private final AttributedCharacterIterator nullIterator = null;
+    private final AttributedCharacterIterator emptyIterator = emptyAttStr.getIterator();
 
     public static void main(String[] args) throws Exception {
         if (PrinterJob.lookupPrintServices().length == 0) {
             throw new RuntimeException("Printer not configured or available.");
         }
 
-        PassFailJFrame.builder()
-                .instructions(INSTRUCTIONS)
-                .testUI(PrintNullString::new)
-                .rows((int) INSTRUCTIONS.lines().count() + 1)
-                .columns(45)
-                .build()
-                .awaitAndCheck();
+        new PrintNullString();
     }
 
-    public PrintNullString() {
-        super("PrintNullString");
-
-        TextCanvas c = new TextCanvas();
-        add("Center", c);
-
-        Button b = new Button("Print");
-        add("South", b);
-        b.addActionListener(e -> {
-            PrinterJob pj = PrinterJob.getPrinterJob();
-            if (pj.printDialog()) {
-                pj.setPrintable(c);
-                try {
-                    pj.print();
-                } catch (PrinterException ex) {
-                    ex.printStackTrace();
-                    String msg = "PrinterException: " + ex.getMessage();
-                    JOptionPane.showMessageDialog(b, msg, "Error occurred",
-                            JOptionPane.ERROR_MESSAGE);
-                    PassFailJFrame.forceFail(msg);
-                }
-            }
-        });
-        pack();
+    public PrintNullString() throws PrinterException {
+        PrinterJob pj = PrinterJob.getPrinterJob();
+        pj.setPrintable(this, new PageFormat());
+        PrintRequestAttributeSet pSet = new HashPrintRequestAttributeSet();
+        File file = new File("out.prn");
+        file.deleteOnExit();
+        pSet.add(new Destination(file.toURI()));
+        pj.print(pSet);
     }
 
-    private static class TextCanvas extends Panel implements Printable {
-        private final String nullStr = null;
-        private final String emptyStr = "";
-        private final AttributedString emptyAttStr = new AttributedString(emptyStr);
-        private final AttributedCharacterIterator nullIterator = null;
-        private final AttributedCharacterIterator emptyIterator = emptyAttStr.getIterator();
-
-        @Override
-        public void paint(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            paint(g2d);
+    @Override
+    public int print(Graphics g, PageFormat pgFmt, int pgIndex) {
+        if (pgIndex > 0) {
+            return NO_SUCH_PAGE;
         }
 
-        @Override
-        public int print(Graphics g, PageFormat pgFmt, int pgIndex) {
-            if (pgIndex > 0) {
-                return NO_SUCH_PAGE;
-            }
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.translate(pgFmt.getImageableX(), pgFmt.getImageableY());
 
-            Graphics2D g2d = (Graphics2D) g;
-            g2d.translate(pgFmt.getImageableX(), pgFmt.getImageableY());
-            paint(g2d);
+        // API 1: null & empty drawString(String, int, int);
+        try {
+            g2d.drawString(nullStr, 20, 40);
+            throw new RuntimeException("FAILURE: No NPE for null String, int");
+        } catch (NullPointerException e) {
+            g2d.drawString("caught expected NPE for null String, int", 20, 40);
+        }
+
+        g2d.drawString(emptyStr, 20, 60);
+        g2d.drawString("OK for empty String, int", 20, 60);
+
+        // API 2: null & empty drawString(String, float, float);
+        try {
+            g2d.drawString(nullStr, 20.0f, 80.0f);
+            throw new RuntimeException("FAILURE: No NPE for null String, float");
+        } catch (NullPointerException e) {
+            g2d.drawString("caught expected NPE for null String, float", 20, 80);
+        }
 
-            return PAGE_EXISTS;
+        g2d.drawString(emptyStr, 20.0f, 100.0f);
+        g2d.drawString("OK for empty String, float", 20.0f, 100.f);
+
+        // API 3: null & empty drawString(Iterator, int, int);
+        try {
+            g2d.drawString(nullIterator, 20, 120);
+            throw new RuntimeException("FAILURE: No NPE for null iterator, int");
+        } catch (NullPointerException e) {
+            g2d.drawString("caught expected NPE for null iterator, int", 20, 120);
+        }
+
+        try {
+            g2d.drawString(emptyIterator, 20, 140);
+            throw new RuntimeException("FAILURE: No IAE for empty iterator, int");
+        } catch (IllegalArgumentException e) {
+            g2d.drawString("caught expected IAE for empty iterator, int", 20, 140);
         }
 
-        private void paint(Graphics2D g2d) {
-            // API 1: null & empty drawString(String, int, int);
-            try {
-                g2d.drawString(nullStr, 20, 40);
-                g2d.drawString("FAILURE: No NPE for null String, int", 20, 40);
-            } catch (NullPointerException e) {
-                g2d.drawString("caught expected NPE for null String, int", 20, 40);
-            }
-
-            g2d.drawString(emptyStr, 20, 60);
-            g2d.drawString("OK for empty String, int", 20, 60);
-
-            // API 2: null & empty drawString(String, float, float);
-            try {
-                g2d.drawString(nullStr, 20.0f, 80.0f);
-                g2d.drawString("FAILURE: No NPE for null String, float", 20, 80);
-            } catch (NullPointerException e) {
-                g2d.drawString("caught expected NPE for null String, float", 20, 80);
-            }
-
-            g2d.drawString(emptyStr, 20.0f, 100.0f);
-            g2d.drawString("OK for empty String, float", 20.0f, 100.f);
-
-            // API 3: null & empty drawString(Iterator, int, int);
-            try {
-                g2d.drawString(nullIterator, 20, 120);
-                g2d.drawString("FAILURE: No NPE for null iterator, int", 20, 120);
-            } catch (NullPointerException e) {
-                g2d.drawString("caught expected NPE for null iterator, int", 20, 120);
-            }
-
-            try {
-                g2d.drawString(emptyIterator, 20, 140);
-                g2d.drawString("FAILURE: No IAE for empty iterator, int", 20, 140);
-            } catch (IllegalArgumentException e) {
-                g2d.drawString("caught expected IAE for empty iterator, int", 20, 140);
-            }
-
-            // API 4: null & empty drawString(Iterator, float, int);
-            try {
-                g2d.drawString(nullIterator, 20.0f, 160.0f);
-                g2d.drawString("FAILURE: No NPE for null iterator, float", 20, 160);
-            } catch (NullPointerException e) {
-                g2d.drawString("caught expected NPE for null iterator, float", 20, 160);
-            }
-
-            try {
-                g2d.drawString(emptyIterator, 20.0f, 180.0f);
-                g2d.drawString("FAILURE: No IAE for empty iterator, float", 20, 180);
-            } catch (IllegalArgumentException e) {
-                g2d.drawString("caught expected IAE for empty iterator, float", 20, 180);
-            }
+        // API 4: null & empty drawString(Iterator, float, int);
+        try {
+            g2d.drawString(nullIterator, 20.0f, 160.0f);
+            throw new RuntimeException("FAILURE: No NPE for null iterator, float");
+        } catch (NullPointerException e) {
+            g2d.drawString("caught expected NPE for null iterator, float", 20, 160);
         }
 
-        @Override
-        public Dimension getPreferredSize() {
-            return new Dimension(450, 250);
+        try {
+            g2d.drawString(emptyIterator, 20.0f, 180.0f);
+            throw new RuntimeException("FAILURE: No IAE for empty iterator, float");
+        } catch (IllegalArgumentException e) {
+            g2d.drawString("caught expected IAE for empty iterator, float", 20, 180);
         }
+
+        return PAGE_EXISTS;
     }
 }

From 48df41b6997cfe2c8aa3bc46ea25eff01f615d31 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 23 May 2025 12:01:45 +0000
Subject: [PATCH 613/901] 8357306: G1: Remove _gc_succeeded from
 VM_G1CollectForAllocation because it is always true

Reviewed-by: ayang, sjohanss
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 51 ++++++++-------------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 16 +++----
 src/hotspot/share/gc/g1/g1VMOperations.cpp  | 14 +++---
 src/hotspot/share/gc/g1/g1VMOperations.hpp  |  5 +-
 4 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 6df9383ce22..6ea4e4f197f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -840,7 +840,7 @@ void G1CollectedHeap::verify_after_full_collection() {
   _ref_processor_cm->verify_no_references_recorded();
 }
 
-bool G1CollectedHeap::do_full_collection(bool clear_all_soft_refs,
+void G1CollectedHeap::do_full_collection(bool clear_all_soft_refs,
                                          bool do_maximal_compaction,
                                          size_t allocation_word_size) {
   assert_at_safepoint_on_vm_thread();
@@ -855,9 +855,6 @@ bool G1CollectedHeap::do_full_collection(bool clear_all_soft_refs,
   collector.prepare_collection();
   collector.collect();
   collector.complete_collection(allocation_word_size);
-
-  // Full collection was successfully completed.
-  return true;
 }
 
 void G1CollectedHeap::do_full_collection(bool clear_all_soft_refs) {
@@ -870,16 +867,12 @@ void G1CollectedHeap::do_full_collection(bool clear_all_soft_refs) {
                      size_t(0) /* allocation_word_size */);
 }
 
-bool G1CollectedHeap::upgrade_to_full_collection() {
+void G1CollectedHeap::upgrade_to_full_collection() {
   GCCauseSetter compaction(this, GCCause::_g1_compaction_pause);
   log_info(gc, ergo)("Attempting full compaction clearing soft references");
-  bool success = do_full_collection(true  /* clear_all_soft_refs */,
-                                    false /* do_maximal_compaction */,
-                                    size_t(0) /* allocation_word_size */);
-  // do_full_collection only fails if blocked by GC locker and that can't
-  // be the case here since we only call this when already completed one gc.
-  assert(success, "invariant");
-  return success;
+  do_full_collection(true  /* clear_all_soft_refs */,
+                     false /* do_maximal_compaction */,
+                     size_t(0) /* allocation_word_size */);
 }
 
 void G1CollectedHeap::resize_heap_if_necessary(size_t allocation_word_size) {
@@ -900,9 +893,7 @@ void G1CollectedHeap::resize_heap_if_necessary(size_t allocation_word_size) {
 HeapWord* G1CollectedHeap::satisfy_failed_allocation_helper(size_t word_size,
                                                             bool do_gc,
                                                             bool maximal_compaction,
-                                                            bool expect_null_mutator_alloc_region,
-                                                            bool* gc_succeeded) {
-  *gc_succeeded = true;
+                                                            bool expect_null_mutator_alloc_region) {
   // Let's attempt the allocation first.
   HeapWord* result =
     attempt_allocation_at_safepoint(word_size,
@@ -930,16 +921,15 @@ HeapWord* G1CollectedHeap::satisfy_failed_allocation_helper(size_t word_size,
     } else {
       log_info(gc, ergo)("Attempting full compaction");
     }
-    *gc_succeeded = do_full_collection(maximal_compaction /* clear_all_soft_refs */,
-                                       maximal_compaction /* do_maximal_compaction */,
-                                       word_size /* allocation_word_size */);
+    do_full_collection(maximal_compaction /* clear_all_soft_refs */,
+                       maximal_compaction /* do_maximal_compaction */,
+                       word_size /* allocation_word_size */);
   }
 
   return nullptr;
 }
 
-HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
-                                                     bool* succeeded) {
+HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size) {
   assert_at_safepoint_on_vm_thread();
 
   // Attempts to allocate followed by Full GC.
@@ -947,10 +937,9 @@ HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
     satisfy_failed_allocation_helper(word_size,
                                      true,  /* do_gc */
                                      false, /* maximum_collection */
-                                     false, /* expect_null_mutator_alloc_region */
-                                     succeeded);
+                                     false /* expect_null_mutator_alloc_region */);
 
-  if (result != nullptr || !*succeeded) {
+  if (result != nullptr) {
     return result;
   }
 
@@ -958,10 +947,9 @@ HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
   result = satisfy_failed_allocation_helper(word_size,
                                             true, /* do_gc */
                                             true, /* maximum_collection */
-                                            true, /* expect_null_mutator_alloc_region */
-                                            succeeded);
+                                            true /* expect_null_mutator_alloc_region */);
 
-  if (result != nullptr || !*succeeded) {
+  if (result != nullptr) {
     return result;
   }
 
@@ -969,8 +957,7 @@ HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
   result = satisfy_failed_allocation_helper(word_size,
                                             false, /* do_gc */
                                             false, /* maximum_collection */
-                                            true,  /* expect_null_mutator_alloc_region */
-                                            succeeded);
+                                            true  /* expect_null_mutator_alloc_region */);
 
   if (result != nullptr) {
     return result;
@@ -2285,10 +2272,9 @@ HeapWord* G1CollectedHeap::do_collection_pause(size_t word_size,
   VMThread::execute(&op);
 
   HeapWord* result = op.result();
-  bool ret_succeeded = op.prologue_succeeded() && op.gc_succeeded();
-  assert(result == nullptr || ret_succeeded,
+  *succeeded = op.gc_succeeded();
+  assert(result == nullptr || *succeeded,
          "the result should be null if the VM did not succeed");
-  *succeeded = ret_succeeded;
 
   assert_heap_not_locked();
   return result;
@@ -2415,12 +2401,11 @@ void G1CollectedHeap::expand_heap_after_young_collection(){
   }
 }
 
-bool G1CollectedHeap::do_collection_pause_at_safepoint() {
+void G1CollectedHeap::do_collection_pause_at_safepoint() {
   assert_at_safepoint_on_vm_thread();
   guarantee(!is_stw_gc_active(), "collection is not reentrant");
 
   do_collection_pause_at_safepoint_helper();
-  return true;
 }
 
 G1HeapPrinterMark::G1HeapPrinterMark(G1CollectedHeap* g1h) : _g1h(g1h), _heap_transition(g1h) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index f9c9525c675..2de9057bcad 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -481,7 +481,7 @@ class G1CollectedHeap : public CollectedHeap {
   //    be accounted for in case shrinking of the heap happens.
   // - it returns false if it is unable to do the collection due to the
   //   GC locker being active, true otherwise.
-  bool do_full_collection(bool clear_all_soft_refs,
+  void do_full_collection(bool clear_all_soft_refs,
                           bool do_maximal_compaction,
                           size_t allocation_word_size);
 
@@ -489,13 +489,12 @@ class G1CollectedHeap : public CollectedHeap {
   void do_full_collection(bool clear_all_soft_refs) override;
 
   // Helper to do a full collection that clears soft references.
-  bool upgrade_to_full_collection();
+  void upgrade_to_full_collection();
 
   // Callback from VM_G1CollectForAllocation operation.
   // This function does everything necessary/possible to satisfy a
   // failed allocation request (including collection, expansion, etc.)
-  HeapWord* satisfy_failed_allocation(size_t word_size,
-                                      bool* succeeded);
+  HeapWord* satisfy_failed_allocation(size_t word_size);
   // Internal helpers used during full GC to split it up to
   // increase readability.
   bool abort_concurrent_cycle();
@@ -510,8 +509,7 @@ class G1CollectedHeap : public CollectedHeap {
   HeapWord* satisfy_failed_allocation_helper(size_t word_size,
                                              bool do_gc,
                                              bool maximal_compaction,
-                                             bool expect_null_mutator_alloc_region,
-                                             bool* gc_succeeded);
+                                             bool expect_null_mutator_alloc_region);
 
   // Attempting to expand the heap sufficiently
   // to support an allocation of the given "word_size".  If
@@ -742,12 +740,10 @@ class G1CollectedHeap : public CollectedHeap {
                                 GCCause::Cause gc_cause);
 
   // Perform an incremental collection at a safepoint, possibly
-  // followed by a by-policy upgrade to a full collection.  Returns
-  // false if unable to do the collection due to the GC locker being
-  // active, true otherwise.
+  // followed by a by-policy upgrade to a full collection.
   // precondition: at safepoint on VM thread
   // precondition: !is_stw_gc_active()
-  bool do_collection_pause_at_safepoint();
+  void do_collection_pause_at_safepoint();
 
   // Helper for do_collection_pause_at_safepoint, containing the guts
   // of the incremental collection pause, executed by the vm thread.
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index c1d0e5ab433..69cdd8d5ca6 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -102,34 +102,32 @@ void VM_G1TryInitiateConcMark::doit() {
     // we've rejected this request.
     _whitebox_attached = true;
   } else {
-    _gc_succeeded = g1h->do_collection_pause_at_safepoint();
-    assert(_gc_succeeded, "No reason to fail");
+    g1h->do_collection_pause_at_safepoint();
+    _gc_succeeded = true;
   }
 }
 
 VM_G1CollectForAllocation::VM_G1CollectForAllocation(size_t         word_size,
                                                      uint           gc_count_before,
                                                      GCCause::Cause gc_cause) :
-  VM_CollectForAllocation(word_size, gc_count_before, gc_cause),
-  _gc_succeeded(false) {}
+  VM_CollectForAllocation(word_size, gc_count_before, gc_cause) {}
 
 void VM_G1CollectForAllocation::doit() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
 
   GCCauseSetter x(g1h, _gc_cause);
   // Try a partial collection of some kind.
-  _gc_succeeded = g1h->do_collection_pause_at_safepoint();
-  assert(_gc_succeeded, "no reason to fail");
+  g1h->do_collection_pause_at_safepoint();
 
   if (_word_size > 0) {
     // An allocation had been requested. Do it, eventually trying a stronger
     // kind of GC.
-    _result = g1h->satisfy_failed_allocation(_word_size, &_gc_succeeded);
+    _result = g1h->satisfy_failed_allocation(_word_size);
   } else if (g1h->should_upgrade_to_full_gc()) {
     // There has been a request to perform a GC to free some space. We have no
     // information on how much memory has been asked for. In case there are
     // absolutely no regions left to allocate into, do a full compaction.
-    _gc_succeeded = g1h->upgrade_to_full_collection();
+    g1h->upgrade_to_full_collection();
   }
 }
 
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp
index 46ef69abbcb..d046dfaa4e8 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp
@@ -49,6 +49,8 @@ class VM_G1TryInitiateConcMark : public VM_GC_Operation {
   bool _cycle_already_in_progress;
   bool _whitebox_attached;
   bool _terminating;
+  // The concurrent start pause may be cancelled for some reasons. Keep track of
+  // this.
   bool _gc_succeeded;
 
 public:
@@ -65,7 +67,6 @@ class VM_G1TryInitiateConcMark : public VM_GC_Operation {
 };
 
 class VM_G1CollectForAllocation : public VM_CollectForAllocation {
-  bool _gc_succeeded;
 
 public:
   VM_G1CollectForAllocation(size_t         word_size,
@@ -73,7 +74,7 @@ class VM_G1CollectForAllocation : public VM_CollectForAllocation {
                             GCCause::Cause gc_cause);
   virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
   virtual void doit();
-  bool gc_succeeded() const { return _gc_succeeded; }
+  bool gc_succeeded() const { return prologue_succeeded(); }
 };
 
 // Concurrent G1 stop-the-world operations such as remark and cleanup.

From d0402ddad72f8ac251d963d57cd6710d6aa655d1 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Fri, 23 May 2025 13:34:32 +0000
Subject: [PATCH 614/901] 8355323: JShell LocalExecutionControl should add
 stopCheck() at method entry

Reviewed-by: liach, jlahoda
---
 .../execution/LocalExecutionControl.java      |  43 +++++---
 .../jdk/jshell/AbstractStopExecutionTest.java |  71 +++++++++++++
 .../jdk/jshell/LocalStopExecutionTest.java    | 100 ++++++++++++++++++
 .../jdk/jshell/StopExecutionTest.java         |  47 +-------
 4 files changed, 203 insertions(+), 58 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/AbstractStopExecutionTest.java
 create mode 100644 test/langtools/jdk/jshell/LocalStopExecutionTest.java

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
index d3aa891b8c4..3db08b80bff 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
@@ -35,6 +35,8 @@
 import java.util.stream.Stream;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassTransform;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.Label;
 import java.lang.classfile.instruction.BranchInstruction;
@@ -90,31 +92,21 @@ public void load(ClassBytecodes[] cbcs)
 
     private static final String CANCEL_CLASS = "REPL.$Cancel$";
     private static final ClassDesc CD_Cancel = ClassDesc.of(CANCEL_CLASS);
+    private static final String STOP_CHECK = "stopCheck";
     private static final ClassDesc CD_ThreadDeath = ClassDesc.of("java.lang.ThreadDeath");
 
     private static byte[] instrument(byte[] classFile) {
         var cc = ClassFile.of();
         return cc.transformClass(cc.parse(classFile),
                         ClassTransform.transformingMethodBodies(
-                            CodeTransform.ofStateful(() -> {
-                                Set<Label> priorLabels = new HashSet<>();
-                                return (builder, element) -> {
-                                    switch (element) {
-                                        case LabelTarget target -> priorLabels.add(target.label());
-                                        case BranchInstruction branch when priorLabels.contains(branch.target())
-                                            -> builder.invokestatic(CD_Cancel, "stopCheck", ConstantDescs.MTD_void);
-                                        default -> { }
-                                    }
-                                    builder.with(element);
-                                };
-                            })));
+                            CodeTransform.ofStateful(StopCheckWeaver::new)));
     }
 
     private static ClassBytecodes genCancelClass() {
         return new ClassBytecodes(CANCEL_CLASS, ClassFile.of().build(CD_Cancel, clb ->
              clb.withFlags(ClassFile.ACC_PUBLIC)
                 .withField("allStop", ConstantDescs.CD_boolean, ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC | ClassFile.ACC_VOLATILE)
-                .withMethodBody("stopCheck", ConstantDescs.MTD_void, ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC, cob ->
+                .withMethodBody(STOP_CHECK, ConstantDescs.MTD_void, ClassFile.ACC_PUBLIC | ClassFile.ACC_STATIC, cob ->
                         cob.getstatic(CD_Cancel, "allStop", ConstantDescs.CD_boolean)
                            .ifThenElse(tb -> tb.new_(CD_ThreadDeath)
                                                .dup()
@@ -123,6 +115,31 @@ private static ClassBytecodes genCancelClass() {
                                        eb -> eb.return_()))));
     }
 
+    // This inserts calls to REPL.$Cancel$.stopCheck() at method start and prior to any backward branch
+    private static class StopCheckWeaver implements CodeTransform {
+
+        private final Set<Label> priorLabels = new HashSet<>();
+
+        @Override
+        public void atStart(CodeBuilder builder) {
+            stopCheck(builder);
+        }
+
+        @Override
+        public void accept(CodeBuilder builder, CodeElement element) {
+            switch (element) {
+                case LabelTarget target -> priorLabels.add(target.label());
+                case BranchInstruction branch when priorLabels.contains(branch.target()) -> stopCheck(builder);
+                default -> { }
+            }
+            builder.with(element);
+        };
+
+        private void stopCheck(CodeBuilder builder) {
+            builder.invokestatic(CD_Cancel, STOP_CHECK, ConstantDescs.MTD_void);
+        }
+    }
+
     @Override
     @SuppressWarnings("removal")
     protected String invoke(Method doitMethod) throws Exception {
diff --git a/test/langtools/jdk/jshell/AbstractStopExecutionTest.java b/test/langtools/jdk/jshell/AbstractStopExecutionTest.java
new file mode 100644
index 00000000000..c38549b5128
--- /dev/null
+++ b/test/langtools/jdk/jshell/AbstractStopExecutionTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.PrintWriter;
+import java.io.StringWriter;
+
+import jdk.jshell.JShell;
+
+import static org.testng.Assert.fail;
+
+public abstract class AbstractStopExecutionTest extends KullaTesting {
+
+    private final Object lock = new Object();
+    private boolean isStopped;
+
+    protected void scheduleStop(String src) throws InterruptedException {
+        JShell state = getState();
+        isStopped = false;
+        StringWriter writer = new StringWriter();
+        PrintWriter out = new PrintWriter(writer);
+        Thread t = new Thread(() -> {
+            int i = 1;
+            int n = 30;
+            synchronized (lock) {
+                do {
+                    state.stop();
+                    if (!isStopped) {
+                        out.println("Not stopped. Try again: " + i);
+                        try {
+                            lock.wait(1000);
+                        } catch (InterruptedException ignored) {
+                        }
+                    }
+                } while (i++ < n && !isStopped);
+                if (!isStopped) {
+                    System.err.println(writer.toString());
+                    fail("Evaluation was not stopped: '" + src + "'");
+                }
+            }
+        });
+        t.start();
+        assertEval(src);
+        synchronized (lock) {
+            out.println("Evaluation was stopped successfully: '" + src + "'");
+            isStopped = true;
+            lock.notify();
+        }
+        // wait until the background thread finishes to prevent from calling 'stop' on closed state.
+        t.join();
+    }
+}
diff --git a/test/langtools/jdk/jshell/LocalStopExecutionTest.java b/test/langtools/jdk/jshell/LocalStopExecutionTest.java
new file mode 100644
index 00000000000..501c5cf7df9
--- /dev/null
+++ b/test/langtools/jdk/jshell/LocalStopExecutionTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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 8355323
+ * @summary Verify local execution can stop execution when there are no backward branches
+ * @modules jdk.jshell/jdk.internal.jshell.tool
+ * @build KullaTesting TestingInputStream
+ * @run testng LocalStopExecutionTest
+ */
+
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+
+import jdk.internal.jshell.tool.StopDetectingInputStream;
+import jdk.internal.jshell.tool.StopDetectingInputStream.State;
+import jdk.jshell.JShell;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+@Test
+public class LocalStopExecutionTest extends AbstractStopExecutionTest {
+
+    @BeforeMethod
+    @Override
+    public void setUp() {
+        setUp(b -> b.executionEngine("local"));
+    }
+
+    @Test
+    public void testVeryLongRecursion() throws InterruptedException {
+        scheduleStop(
+            """
+            // Note: there are no backward branches in this class
+            new Runnable() {
+                public void run() {
+                    recurse(1);
+                    recurse(10);
+                    recurse(100);
+                    recurse(1000);
+                    recurse(10000);
+                    recurse(100000);
+                    recurse(1000000);
+                }
+                public void recurse(int depth) {
+                    if (depth == 0)
+                        return;
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                    recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1); recurse(depth - 1);
+                }
+            }.run();
+            """
+        );
+    }
+}
diff --git a/test/langtools/jdk/jshell/StopExecutionTest.java b/test/langtools/jdk/jshell/StopExecutionTest.java
index 389794d35d2..b1584c0eb89 100644
--- a/test/langtools/jdk/jshell/StopExecutionTest.java
+++ b/test/langtools/jdk/jshell/StopExecutionTest.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
@@ -33,25 +33,18 @@
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Consumer;
 
 import jdk.internal.jshell.tool.StopDetectingInputStream;
 import jdk.internal.jshell.tool.StopDetectingInputStream.State;
-import jdk.jshell.JShell;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
 
 @Test
-public class StopExecutionTest extends KullaTesting {
-
-    private final Object lock = new Object();
-    private boolean isStopped;
+public class StopExecutionTest extends AbstractStopExecutionTest {
 
     @Test(enabled = false) // TODO 8129546
     public void testStopLoop() throws InterruptedException {
@@ -68,42 +61,6 @@ public void testScriptCatchesStop() throws Exception {
         scheduleStop("for (int i = 0; i < 30; i++) { try { Thread.sleep(100); } catch (Throwable ex) { } }");
     }
 
-    private void scheduleStop(String src) throws InterruptedException {
-        JShell state = getState();
-        isStopped = false;
-        StringWriter writer = new StringWriter();
-        PrintWriter out = new PrintWriter(writer);
-        Thread t = new Thread(() -> {
-            int i = 1;
-            int n = 30;
-            synchronized (lock) {
-                do {
-                    state.stop();
-                    if (!isStopped) {
-                        out.println("Not stopped. Try again: " + i);
-                        try {
-                            lock.wait(1000);
-                        } catch (InterruptedException ignored) {
-                        }
-                    }
-                } while (i++ < n && !isStopped);
-                if (!isStopped) {
-                    System.err.println(writer.toString());
-                    fail("Evaluation was not stopped: '" + src + "'");
-                }
-            }
-        });
-        t.start();
-        assertEval(src);
-        synchronized (lock) {
-            out.println("Evaluation was stopped successfully: '" + src + "'");
-            isStopped = true;
-            lock.notify();
-        }
-        // wait until the background thread finishes to prevent from calling 'stop' on closed state.
-        t.join();
-    }
-
     public void testStopDetectingInputRandom() throws IOException {
         long seed = System.nanoTime();
         Random r = new Random(seed);

From b07da7bcdcd4d1bba1f6e922d8e606bd73879052 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 23 May 2025 13:53:07 +0000
Subject: [PATCH 615/901] 8357171: Test
 tools/jpackage/windows/WinOSConditionTest.java fails for non administrator

Reviewed-by: erikj
---
 .../jdk/jpackage/test/PackageTest.java        | 29 ++++++++++++-------
 .../jpackage/windows/WinOSConditionTest.java  | 13 ++++++++-
 2 files changed, 30 insertions(+), 12 deletions(-)

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 c1739b9095a..61e4ccdb4a2 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -53,6 +53,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
@@ -126,8 +127,8 @@ public PackageTest setExpectedExitCode(int v) {
         return this;
     }
 
-    public PackageTest setExpectedInstallExitCode(int v) {
-        expectedInstallExitCode = v;
+    public PackageTest setExpectedInstallExitCode(int... v) {
+        expectedInstallExitCodes = IntStream.of(v).mapToObj(Integer::valueOf).collect(Collectors.toSet());
         return this;
     }
 
@@ -483,11 +484,15 @@ private List<Consumer<Action>> createPackageTypeHandlers() {
     }
 
     private record PackageTypePipeline(PackageType type, int expectedJPackageExitCode,
-            int expectedInstallExitCode, PackageHandlers packageHandlers, Handler handler,
+            Set<Integer> expectedInstallExitCodes, PackageHandlers packageHandlers, Handler handler,
             JPackageCommand cmd, State state) implements Consumer<Action> {
 
         PackageTypePipeline {
             Objects.requireNonNull(type);
+            Objects.requireNonNull(expectedInstallExitCodes);
+            if (expectedInstallExitCodes.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
             Objects.requireNonNull(packageHandlers);
             Objects.requireNonNull(handler);
             Objects.requireNonNull(cmd);
@@ -495,9 +500,9 @@ private record PackageTypePipeline(PackageType type, int expectedJPackageExitCod
         }
 
         PackageTypePipeline(PackageType type, int expectedJPackageExitCode,
-                int expectedInstallExitCode, PackageHandlers packageHandlers,
+                Set<Integer> expectedInstallExitCodes, PackageHandlers packageHandlers,
                 Handler handler, JPackageCommand cmd) {
-            this(type, expectedJPackageExitCode, expectedInstallExitCode,
+            this(type, expectedJPackageExitCode, expectedInstallExitCodes,
                     packageHandlers, handler, cmd, new State());
         }
 
@@ -532,9 +537,10 @@ public void accept(Action action) {
 
                 case INSTALL -> {
                     cmd.setUnpackedPackageLocation(null);
-                    final int installExitCode = packageHandlers.install(cmd);
-                    TKit.assertEquals(expectedInstallExitCode, installExitCode,
-                            String.format("Check installer exited with %d code", expectedInstallExitCode));
+                    final int actualInstallExitCode = packageHandlers.install(cmd);
+                    state.actualInstallExitCode = Optional.of(actualInstallExitCode);
+                    TKit.assertTrue(expectedInstallExitCodes.contains(actualInstallExitCode),
+                            String.format("Check installer exit code %d is one of %s", actualInstallExitCode, expectedInstallExitCodes));
                 }
 
                 case UNINSTALL -> {
@@ -624,7 +630,7 @@ private boolean processed(Action action) {
         }
 
         private boolean installFailed() {
-            return processed(Action.INSTALL) && expectedInstallExitCode != 0;
+            return processed(Action.INSTALL) && state.actualInstallExitCode.orElseThrow() != 0;
         }
 
         private boolean jpackageFailed() {
@@ -636,6 +642,7 @@ private boolean unpackNotSupported() {
         }
 
         private static final class State {
+            private Optional<Integer> actualInstallExitCode = Optional.empty();
             private final Set<Action> packageActions = new HashSet<>();
             private final List<Path> deleteUnpackDirs = new ArrayList<>();
         }
@@ -649,7 +656,7 @@ private Consumer<Action> createPackageTypeHandler(PackageType type, Handler hand
         }
         type.applyTo(cmd);
         return new PackageTypePipeline(type, expectedJPackageExitCode,
-                expectedInstallExitCode, getPackageHandlers(type), handler.copy(), cmd);
+                expectedInstallExitCodes, getPackageHandlers(type), handler.copy(), cmd);
     }
 
     private record Handler(List<Consumer<JPackageCommand>> initializers,
@@ -929,7 +936,7 @@ private static boolean isOfType(JPackageCommand cmd, Set<PackageType> packageTyp
     private Collection<PackageType> currentTypes;
     private Set<PackageType> excludeTypes;
     private int expectedJPackageExitCode;
-    private int expectedInstallExitCode;
+    private Set<Integer> expectedInstallExitCodes;
     private final Map<PackageType, Handler> handlers;
     private final Set<String> namedInitializers;
     private final Map<PackageType, PackageHandlers> packageHandlers;
diff --git a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
index c92ad7701b5..aea7e9e99b2 100644
--- a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
+++ b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
@@ -62,6 +62,17 @@ public static void test() throws IOException {
                     "--resource-dir", resourceDir.toString()).setFakeRuntime();
         })
         .addUninstallVerifier(cmd -> {
+            // Installation could have ended up with 1603 or 1625 error codes.
+            // MSI error code 1625 indicates the test is being executed in an environment
+            // that doesn't allow per-user installations. This means the test should be skipped.
+            try (final var lines = cmd.winMsiLogFileContents().orElseThrow()) {
+                if (lines.anyMatch(line -> {
+                    return line.endsWith("Installation success or error status: 1625.");
+                })) {
+                    TKit.throwSkippedException("Installation of per-user packages by the current user is forbidden by system policy");
+                }
+            }
+
             // 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()) {
@@ -72,7 +83,7 @@ public static void test() throws IOException {
             }
         })
         .createMsiLog(true)
-        .setExpectedInstallExitCode(1603)
+        .setExpectedInstallExitCode(1603, 1625)
         // Create, try install the package (installation should fail) and verify it is not installed.
         .run(Action.CREATE, Action.INSTALL, Action.VERIFY_UNINSTALL);
     }

From 6a07820483bcf3e9d7df27ee496db43675f1c002 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Fri, 23 May 2025 14:53:44 +0000
Subject: [PATCH 616/901] 8357285: JSR166 Test case
 testShutdownNow_delayedTasks failed

Reviewed-by: alanb
---
 .../java/util/concurrent/tck/ScheduledExecutorTest.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java b/test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java
index 26510b3bfdd..7daedeaf4a4 100644
--- a/test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java
+++ b/test/jdk/java/util/concurrent/tck/ScheduledExecutorTest.java
@@ -700,11 +700,13 @@ public void testShutdownNow() throws InterruptedException {
     public void testShutdownNow_delayedTasks() throws InterruptedException {
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         List<ScheduledFuture<?>> tasks = new ArrayList<>();
+        final int DELAY = 100;
+
         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));
+            tasks.add(p.schedule(r, DELAY, SECONDS));
+            tasks.add(p.scheduleAtFixedRate(r, DELAY, DELAY, SECONDS));
+            tasks.add(p.scheduleWithFixedDelay(r, DELAY, DELAY, SECONDS));
         }
         if (testImplementationDetails)
             assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(p.getQueue()));

From 90e076b2a1ee5f91317157911e2c62a37978e93e Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Fri, 23 May 2025 14:55:57 +0000
Subject: [PATCH 617/901] 8357654: [BACKOUT] JDK-8343580: Type error with inner
 classes of generic classes in functions generic by outer

Reviewed-by: mcimadamore, liach, vromero
---
 .../com/sun/tools/javac/code/Type.java        |  6 +-
 test/langtools/tools/javac/T8343580.java      | 62 -------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 test/langtools/tools/javac/T8343580.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
index d397d71e4b5..fa0220b1e1f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
@@ -1155,11 +1155,7 @@ public void setEnclosingType(Type outer) {
 
         public List<Type> allparams() {
             if (allparams_field == null) {
-                Type enclosingType = getEnclosingType();
-                while (enclosingType.hasTag(TYPEVAR)) {
-                    enclosingType = enclosingType.getUpperBound();
-                }
-                allparams_field = getTypeArguments().prependList(enclosingType.allparams());
+                allparams_field = getTypeArguments().prependList(getEnclosingType().allparams());
             }
             return allparams_field;
         }
diff --git a/test/langtools/tools/javac/T8343580.java b/test/langtools/tools/javac/T8343580.java
deleted file mode 100644
index 4a004bd86a6..00000000000
--- a/test/langtools/tools/javac/T8343580.java
+++ /dev/null
@@ -1,62 +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
- * @bug 8343580
- * @summary Type error with inner classes of generic classes in functions generic by outer
- * @compile T8343580.java
- */
-
-class T8343580 {
-   static abstract class Getters<T> {
-      abstract class Getter {
-         abstract T get();
-      }
-   }
-
-   static class Usage1<T, G extends Getters<T>> {
-      public T test(G.Getter getter) {
-         return getter.get();
-      }
-   }
-
-   static class Usage2<T, U extends Getters<T>, G extends U> {
-      public T test(G.Getter getter) {
-         return getter.get();
-      }
-   }
-
-   static class Usage3<T, U extends T, G extends Getters<T>> {
-      public T test(G.Getter getter) {
-         return getter.get();
-      }
-   }
-
-   class G2<K> extends Getters<K> {}
-   static class Usage4<M, L extends G2<M>> {
-      M test(L.Getter getter) {
-         return getter.get();
-      }
-   }
-}

From a58bfb93ff3a3cc9a3636b124299d9179a51f03b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 23 May 2025 16:20:19 +0000
Subject: [PATCH 618/901] 8357638: Problemlist more Hotspot tests for static
 JDK

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

diff --git a/test/hotspot/jtreg/ProblemList-StaticJdk.txt b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
index e5bdfaf8337..c872a97b301 100644
--- a/test/hotspot/jtreg/ProblemList-StaticJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
@@ -43,3 +43,11 @@ gtest/NMTGtests.java#nmt-detail                         8356201 generic-all
 gtest/NMTGtests.java#nmt-off                            8356201 generic-all
 gtest/NMTGtests.java#nmt-summary                        8356201 generic-all
 
+# Need CDS archive
+runtime/cds/NonJVMVariantLocation.java                        8357632 generic-all
+runtime/cds/TestCDSVMCrash.java                               8357632 generic-all
+runtime/cds/TestDefaultArchiveLoading.java#coops_coh          8357632 generic-all
+runtime/cds/TestDefaultArchiveLoading.java#coops_nocoh        8357632 generic-all
+runtime/cds/TestDefaultArchiveLoading.java#nocoops_coh        8357632 generic-all
+runtime/cds/TestDefaultArchiveLoading.java#nocoops_nocoh      8357632 generic-all
+serviceability/jvmti/RedefineClasses/RedefineSharedClass.java 8357632 generic-all

From 2b6b7661b949971fe776714795d7dd46ed343cde Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 23 May 2025 16:29:57 +0000
Subject: [PATCH 619/901] 8357581: [JVMCI] Add HotSpotProfilingInfo

Reviewed-by: kvn, never
---
 .../vm/ci/hotspot/HotSpotProfilingInfo.java   | 224 ++--------------
 .../ci/hotspot/HotSpotProfilingInfoImpl.java  | 243 ++++++++++++++++++
 .../HotSpotResolvedJavaMethodImpl.java        |   2 +-
 .../jdk/vm/ci/meta/DefaultProfilingInfo.java  |   9 +-
 .../jvmci/meta/ProfilingInfoTest.java         |  13 +-
 5 files changed, 277 insertions(+), 214 deletions(-)
 create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfoImpl.java

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java
index 97deccf0dcf..b89849fb454 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfo.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfo.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
@@ -22,219 +22,25 @@
  */
 package jdk.vm.ci.hotspot;
 
-import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
-
-import jdk.vm.ci.meta.DeoptimizationReason;
-import jdk.vm.ci.meta.JavaMethodProfile;
-import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ProfilingInfo;
-import jdk.vm.ci.meta.TriState;
-
-final class HotSpotProfilingInfo implements ProfilingInfo {
-
-    private final HotSpotMethodData methodData;
-    private final HotSpotResolvedJavaMethod method;
-
-    private boolean isMature;
-    private int position;
-    private int hintPosition;
-    private int hintBCI;
-    private HotSpotMethodDataAccessor dataAccessor;
-
-    private boolean includeNormal;
-    private boolean includeOSR;
-
-    HotSpotProfilingInfo(HotSpotMethodData methodData, HotSpotResolvedJavaMethod method, boolean includeNormal, boolean includeOSR) {
-        this.methodData = methodData;
-        this.method = method;
-        if (!method.getDeclaringClass().isLinked()) {
-            throw new IllegalArgumentException(method.format("%H.%n(%p) must be linked"));
-        }
-        this.includeNormal = includeNormal;
-        this.includeOSR = includeOSR;
-        this.isMature = methodData.isProfileMature();
-        hintPosition = 0;
-        hintBCI = -1;
-    }
-
-    @Override
-    public int getCodeSize() {
-        return method.getCodeSize();
-    }
-
-    public int getDecompileCount() {
-        return methodData.getDecompileCount();
-    }
-
-    public int getOverflowRecompileCount() {
-        return methodData.getOverflowRecompileCount();
-    }
-
-    public int getOverflowTrapCount() {
-        return methodData.getOverflowTrapCount();
-    }
-
-    @Override
-    public JavaTypeProfile getTypeProfile(int bci) {
-        if (!isMature) {
-            return null;
-        }
-        findBCI(bci);
-        return dataAccessor.getTypeProfile(methodData, position);
-    }
-
-    @Override
-    public JavaMethodProfile getMethodProfile(int bci) {
-        if (!isMature) {
-            return null;
-        }
-        findBCI(bci);
-        return dataAccessor.getMethodProfile(methodData, position);
-    }
-
-    @Override
-    public double getBranchTakenProbability(int bci) {
-        if (!isMature) {
-            return -1;
-        }
-        findBCI(bci);
-        return dataAccessor.getBranchTakenProbability(methodData, position);
-    }
-
-    @Override
-    public double[] getSwitchProbabilities(int bci) {
-        if (!isMature) {
-            return null;
-        }
-        findBCI(bci);
-        return dataAccessor.getSwitchProbabilities(methodData, position);
-    }
-
-    @Override
-    public TriState getExceptionSeen(int bci) {
-        if (!findBCI(bci)) {
-            // There might data in the extra data section but all accesses to that memory must be
-            // under a lock so go into VM to get the data.
-            int exceptionSeen = compilerToVM().methodDataExceptionSeen(methodData.methodDataPointer, bci);
-            if (exceptionSeen == -1) {
-                return TriState.UNKNOWN;
-            }
-            return TriState.get(exceptionSeen != 0);
-        }
-        return dataAccessor.getExceptionSeen(methodData, position);
-    }
-
-    @Override
-    public TriState getNullSeen(int bci) {
-        findBCI(bci);
-        return dataAccessor.getNullSeen(methodData, position);
-    }
 
-    @Override
-    public int getExecutionCount(int bci) {
-        if (!isMature) {
-            return -1;
-        }
-        findBCI(bci);
-        return dataAccessor.getExecutionCount(methodData, position);
-    }
-
-    @Override
-    public int getDeoptimizationCount(DeoptimizationReason reason) {
-        int count = 0;
-        if (includeNormal) {
-            count += methodData.getDeoptimizationCount(reason);
-        }
-        if (includeOSR) {
-            count += methodData.getOSRDeoptimizationCount(reason);
-        }
-        return count;
-    }
-
-    private boolean findBCI(int targetBCI) {
-        assert targetBCI >= 0 : "invalid BCI";
-
-        if (methodData.hasNormalData()) {
-            int currentPosition = targetBCI < hintBCI ? 0 : hintPosition;
-            HotSpotMethodDataAccessor currentAccessor;
-            while ((currentAccessor = methodData.getNormalData(currentPosition)) != null) {
-                int currentBCI = currentAccessor.getBCI(methodData, currentPosition);
-                if (currentBCI == targetBCI) {
-                    normalDataFound(currentAccessor, currentPosition, currentBCI);
-                    return true;
-                } else if (currentBCI > targetBCI) {
-                    break;
-                }
-                currentPosition = currentPosition + currentAccessor.getSize(methodData, currentPosition);
-            }
-        }
-        noDataFound(false);
-        return false;
-    }
-
-    private void normalDataFound(HotSpotMethodDataAccessor data, int pos, int bci) {
-        setCurrentData(data, pos);
-        this.hintPosition = position;
-        this.hintBCI = bci;
-    }
-
-    private void noDataFound(boolean exceptionPossiblyNotRecorded) {
-        HotSpotMethodDataAccessor accessor = HotSpotMethodData.getNoDataAccessor(exceptionPossiblyNotRecorded);
-        setCurrentData(accessor, -1);
-    }
-
-    private void setCurrentData(HotSpotMethodDataAccessor dataAccessor, int position) {
-        this.dataAccessor = dataAccessor;
-        this.position = position;
-    }
-
-    @Override
-    public boolean isMature() {
-        return isMature;
-    }
-
-    public void ignoreMature() {
-        isMature = true;
-    }
-
-    @Override
-    public String toString() {
-        return "HotSpotProfilingInfo<" + this.toString(null, "; ") + ">";
-    }
-
-    @Override
-    public void setMature() {
-        isMature = true;
-    }
+/**
+ * Extends {@link ProfilingInfo} with HotSpot specific profiling info.
+ */
+public interface HotSpotProfilingInfo extends ProfilingInfo {
 
     /**
-     * {@code MethodData::_jvmci_ir_size} (currently) supports at most one JVMCI compiler IR type
-     * which will be determined by the first JVMCI compiler that calls
-     * {@link #setCompilerIRSize(Class, int)}.
+     * Returns {@code MethodData::_compiler_counters._nof_decompiles}.
      */
-    private static volatile Class<?> supportedCompilerIRType;
+    int getDecompileCount();
 
-    @Override
-    public boolean setCompilerIRSize(Class<?> irType, int size) {
-        if (supportedCompilerIRType == null) {
-            synchronized (HotSpotProfilingInfo.class) {
-                if (supportedCompilerIRType == null) {
-                    supportedCompilerIRType = irType;
-                }
-            }
-        }
-        if (supportedCompilerIRType != irType) {
-            return false;
-        }
-        methodData.setCompiledIRSize(size);
-        return true;
-    }
+    /**
+     * Returns {@code MethodData::_compiler_counters._nof_overflow_recompiles}.
+     */
+    int getOverflowRecompileCount();
 
-    @Override
-    public int getCompilerIRSize(Class<?> irType) {
-        if (irType == supportedCompilerIRType) {
-            return methodData.getCompiledIRSize();
-        }
-        return -1;
-    }
+    /**
+     * Returns {@code MethodData::_compiler_counters._nof_overflow_traps}.
+     */
+    int getOverflowTrapCount();
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfoImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfoImpl.java
new file mode 100644
index 00000000000..3dcdedef282
--- /dev/null
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotProfilingInfoImpl.java
@@ -0,0 +1,243 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.hotspot;
+
+import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
+
+import jdk.vm.ci.meta.DeoptimizationReason;
+import jdk.vm.ci.meta.JavaMethodProfile;
+import jdk.vm.ci.meta.JavaTypeProfile;
+import jdk.vm.ci.meta.ProfilingInfo;
+import jdk.vm.ci.meta.TriState;
+
+final class HotSpotProfilingInfoImpl implements HotSpotProfilingInfo {
+
+    private final HotSpotMethodData methodData;
+    private final HotSpotResolvedJavaMethod method;
+
+    private boolean isMature;
+    private int position;
+    private int hintPosition;
+    private int hintBCI;
+    private HotSpotMethodDataAccessor dataAccessor;
+
+    private boolean includeNormal;
+    private boolean includeOSR;
+
+    HotSpotProfilingInfoImpl(HotSpotMethodData methodData, HotSpotResolvedJavaMethod method, boolean includeNormal, boolean includeOSR) {
+        this.methodData = methodData;
+        this.method = method;
+        if (!method.getDeclaringClass().isLinked()) {
+            throw new IllegalArgumentException(method.format("%H.%n(%p) must be linked"));
+        }
+        this.includeNormal = includeNormal;
+        this.includeOSR = includeOSR;
+        this.isMature = methodData.isProfileMature();
+        hintPosition = 0;
+        hintBCI = -1;
+    }
+
+    @Override
+    public int getCodeSize() {
+        return method.getCodeSize();
+    }
+
+    @Override
+    public int getDecompileCount() {
+        return methodData.getDecompileCount();
+    }
+
+    @Override
+    public int getOverflowRecompileCount() {
+        return methodData.getOverflowRecompileCount();
+    }
+
+    @Override
+    public int getOverflowTrapCount() {
+        return methodData.getOverflowTrapCount();
+    }
+
+    @Override
+    public JavaTypeProfile getTypeProfile(int bci) {
+        if (!isMature) {
+            return null;
+        }
+        findBCI(bci);
+        return dataAccessor.getTypeProfile(methodData, position);
+    }
+
+    @Override
+    public JavaMethodProfile getMethodProfile(int bci) {
+        if (!isMature) {
+            return null;
+        }
+        findBCI(bci);
+        return dataAccessor.getMethodProfile(methodData, position);
+    }
+
+    @Override
+    public double getBranchTakenProbability(int bci) {
+        if (!isMature) {
+            return -1;
+        }
+        findBCI(bci);
+        return dataAccessor.getBranchTakenProbability(methodData, position);
+    }
+
+    @Override
+    public double[] getSwitchProbabilities(int bci) {
+        if (!isMature) {
+            return null;
+        }
+        findBCI(bci);
+        return dataAccessor.getSwitchProbabilities(methodData, position);
+    }
+
+    @Override
+    public TriState getExceptionSeen(int bci) {
+        if (!findBCI(bci)) {
+            // There might data in the extra data section but all accesses to that memory must be
+            // under a lock so go into VM to get the data.
+            int exceptionSeen = compilerToVM().methodDataExceptionSeen(methodData.methodDataPointer, bci);
+            if (exceptionSeen == -1) {
+                return TriState.UNKNOWN;
+            }
+            return TriState.get(exceptionSeen != 0);
+        }
+        return dataAccessor.getExceptionSeen(methodData, position);
+    }
+
+    @Override
+    public TriState getNullSeen(int bci) {
+        findBCI(bci);
+        return dataAccessor.getNullSeen(methodData, position);
+    }
+
+    @Override
+    public int getExecutionCount(int bci) {
+        if (!isMature) {
+            return -1;
+        }
+        findBCI(bci);
+        return dataAccessor.getExecutionCount(methodData, position);
+    }
+
+    @Override
+    public int getDeoptimizationCount(DeoptimizationReason reason) {
+        int count = 0;
+        if (includeNormal) {
+            count += methodData.getDeoptimizationCount(reason);
+        }
+        if (includeOSR) {
+            count += methodData.getOSRDeoptimizationCount(reason);
+        }
+        return count;
+    }
+
+    private boolean findBCI(int targetBCI) {
+        assert targetBCI >= 0 : "invalid BCI";
+
+        if (methodData.hasNormalData()) {
+            int currentPosition = targetBCI < hintBCI ? 0 : hintPosition;
+            HotSpotMethodDataAccessor currentAccessor;
+            while ((currentAccessor = methodData.getNormalData(currentPosition)) != null) {
+                int currentBCI = currentAccessor.getBCI(methodData, currentPosition);
+                if (currentBCI == targetBCI) {
+                    normalDataFound(currentAccessor, currentPosition, currentBCI);
+                    return true;
+                } else if (currentBCI > targetBCI) {
+                    break;
+                }
+                currentPosition = currentPosition + currentAccessor.getSize(methodData, currentPosition);
+            }
+        }
+        noDataFound(false);
+        return false;
+    }
+
+    private void normalDataFound(HotSpotMethodDataAccessor data, int pos, int bci) {
+        setCurrentData(data, pos);
+        this.hintPosition = position;
+        this.hintBCI = bci;
+    }
+
+    private void noDataFound(boolean exceptionPossiblyNotRecorded) {
+        HotSpotMethodDataAccessor accessor = HotSpotMethodData.getNoDataAccessor(exceptionPossiblyNotRecorded);
+        setCurrentData(accessor, -1);
+    }
+
+    private void setCurrentData(HotSpotMethodDataAccessor dataAccessor, int position) {
+        this.dataAccessor = dataAccessor;
+        this.position = position;
+    }
+
+    @Override
+    public boolean isMature() {
+        return isMature;
+    }
+
+    public void ignoreMature() {
+        isMature = true;
+    }
+
+    @Override
+    public String toString() {
+        return "HotSpotProfilingInfo<" + this.toString(null, "; ") + ">";
+    }
+
+    @Override
+    public void setMature() {
+        isMature = true;
+    }
+
+    /**
+     * {@code MethodData::_jvmci_ir_size} (currently) supports at most one JVMCI compiler IR type
+     * which will be determined by the first JVMCI compiler that calls
+     * {@link #setCompilerIRSize(Class, int)}.
+     */
+    private static volatile Class<?> supportedCompilerIRType;
+
+    @Override
+    public boolean setCompilerIRSize(Class<?> irType, int size) {
+        if (supportedCompilerIRType == null) {
+            synchronized (HotSpotProfilingInfoImpl.class) {
+                if (supportedCompilerIRType == null) {
+                    supportedCompilerIRType = irType;
+                }
+            }
+        }
+        if (supportedCompilerIRType != irType) {
+            return false;
+        }
+        methodData.setCompiledIRSize(size);
+        return true;
+    }
+
+    @Override
+    public int getCompilerIRSize(Class<?> irType) {
+        if (irType == supportedCompilerIRType) {
+            return methodData.getCompiledIRSize();
+        }
+        return -1;
+    }
+}
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 4fbd4796024..59f5320cc54 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -489,7 +489,7 @@ public ProfilingInfo getProfilingInfo(boolean includeNormal, boolean includeOSR)
             // case of a deoptimization.
             info = DefaultProfilingInfo.get(TriState.FALSE);
         } else {
-            info = new HotSpotProfilingInfo(methodData, this, includeNormal, includeOSR);
+            info = new HotSpotProfilingInfoImpl(methodData, this, includeNormal, includeOSR);
         }
         return info;
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/DefaultProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/DefaultProfilingInfo.java
index a0df0a2e809..4fa945a8969 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/DefaultProfilingInfo.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/DefaultProfilingInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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
@@ -28,8 +28,11 @@
  */
 public final class DefaultProfilingInfo implements ProfilingInfo {
 
-    private static final ProfilingInfo[] NO_PROFILING_INFO = new ProfilingInfo[]{new DefaultProfilingInfo(TriState.TRUE), new DefaultProfilingInfo(TriState.FALSE),
-                    new DefaultProfilingInfo(TriState.UNKNOWN)};
+    private static final ProfilingInfo[] NO_PROFILING_INFO = {
+        new DefaultProfilingInfo(TriState.TRUE),
+        new DefaultProfilingInfo(TriState.FALSE),
+        new DefaultProfilingInfo(TriState.UNKNOWN)
+    };
 
     private final TriState exceptionSeen;
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/meta/ProfilingInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/meta/ProfilingInfoTest.java
index fab61b299ad..278d52322d9 100644
--- a/test/hotspot/jtreg/compiler/jvmci/meta/ProfilingInfoTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/meta/ProfilingInfoTest.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
@@ -32,6 +32,7 @@
  * @requires vm.compMode != "Xcomp"
  * @requires vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel > 1
  * @modules jdk.internal.vm.ci/jdk.vm.ci.meta
+ *          jdk.internal.vm.ci/jdk.vm.ci.hotspot
  *          jdk.internal.vm.ci/jdk.vm.ci.runtime
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Xbootclasspath/a:. compiler.jvmci.meta.ProfilingInfoTest
  */
@@ -47,6 +48,7 @@
 import org.junit.Assume;
 import org.junit.Test;
 
+import jdk.vm.ci.hotspot.HotSpotProfilingInfo;
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ProfilingInfo;
@@ -203,6 +205,15 @@ private void testTypeProfile(String testSnippet, int bci) {
         resetProfile(testSnippet);
         typeProfile = info.getTypeProfile(bci);
         Assert.assertNull(typeProfile);
+
+        // Basic test that the counters are non-negative
+        HotSpotProfilingInfo hsInfo = (HotSpotProfilingInfo) info;
+        int count = hsInfo.getDecompileCount();
+        Assert.assertTrue("count = " + count, count >= 0);
+        count = hsInfo.getOverflowRecompileCount();
+        Assert.assertTrue("count = " + count, count >= 0);
+        count = hsInfo.getOverflowTrapCount();
+        Assert.assertTrue("count = " + count, count >= 0);
     }
 
     public ProfilingInfoTest() {

From 917c1546f353c2814de8465d1dfad66b01561f12 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Fri, 23 May 2025 16:59:17 +0000
Subject: [PATCH 620/901] 8139228: JFileChooser renders file names as HTML
 document

Reviewed-by: prr, serb, aivanov
---
 .../com/apple/laf/AquaFileChooserUI.java      |   6 +
 .../swing/plaf/motif/MotifFileChooserUI.java  |   6 +
 .../classes/javax/swing/JFileChooser.java     |   1 +
 .../swing/plaf/metal/MetalFileChooserUI.java  |   2 +
 .../share/classes/sun/swing/FilePane.java     |   4 +
 .../plaf/synth/SynthFileChooserUIImpl.java    |   2 +
 .../plaf/windows/WindowsFileChooserUI.java    |   2 +
 .../swing/JFileChooser/HTMLFileName.java      | 166 ++++++++++++++++++
 8 files changed, 189 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFileChooser/HTMLFileName.java

diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
index bdb440bf4d2..90b02fb6dad 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java
@@ -1192,6 +1192,9 @@ public Component getTableCellRendererComponent(final JTable list,
             setText(fc.getName(file));
             setIcon(fc.getIcon(file));
             setEnabled(isSelectableInList(file));
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -1256,6 +1259,9 @@ public Component getListCellRendererComponent(final JList<? extends File> list,
                 final JFileChooser chooser = getFileChooser();
                 setText(chooser.getName(directory));
                 setIcon(chooser.getIcon(directory));
+
+                putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
                 return this;
             }
         };
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
index 0f1ecd0dc1e..342583aaa46 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
@@ -656,6 +656,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             setText(getFileChooser().getName((File) value));
             setInheritsPopupMenu(true);
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
@@ -668,6 +671,9 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
             super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             setText(getFileChooser().getName((File) value));
             setInheritsPopupMenu(true);
+
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index a5802e26938..ddb3a3911a6 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -399,6 +399,7 @@ protected void setup(FileSystemView view) {
             setFileFilter(getAcceptAllFileFilter());
         }
         enableEvents(AWTEvent.MOUSE_EVENT_MASK);
+        putClientProperty("html.disable", true);
     }
 
     private void installHierarchyListener() {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
index a7b8718ca8d..032db36b87e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -949,6 +949,8 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
             ii.depth = directoryComboBoxModel.getDepth(index);
             setIcon(ii);
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
diff --git a/src/java.desktop/share/classes/sun/swing/FilePane.java b/src/java.desktop/share/classes/sun/swing/FilePane.java
index 052e7a96ac4..976201c5721 100644
--- a/src/java.desktop/share/classes/sun/swing/FilePane.java
+++ b/src/java.desktop/share/classes/sun/swing/FilePane.java
@@ -1235,6 +1235,8 @@ public Component getTableCellRendererComponent(JTable table, Object value,
 
             setText(text);
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
 
@@ -1631,6 +1633,8 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
                 }
             }
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
index c225ddc9ff6..c57912448af 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
@@ -689,6 +689,8 @@ public Component getListCellRendererComponent(JList<? extends File> list, File v
             ii.depth = directoryComboBoxModel.getDepth(index);
             label.setIcon(ii);
 
+            label.putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return label;
         }
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index 37d45bbf902..08c01760be9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
@@ -1078,6 +1078,8 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
             ii.depth = directoryComboBoxModel.getDepth(index);
             setIcon(ii);
 
+            putClientProperty("html.disable", getFileChooser().getClientProperty("html.disable"));
+
             return this;
         }
     }
diff --git a/test/jdk/javax/swing/JFileChooser/HTMLFileName.java b/test/jdk/javax/swing/JFileChooser/HTMLFileName.java
new file mode 100644
index 00000000000..8783c388985
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/HTMLFileName.java
@@ -0,0 +1,166 @@
+/*
+ * 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.File;
+import java.util.List;
+import javax.swing.Icon;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.filechooser.FileSystemView;
+
+/*
+ * @test id=metal
+ * @bug 8139228
+ * @summary JFileChooser should not render Directory names in HTML format
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual HTMLFileName metal
+ */
+
+/*
+ * @test id=system
+ * @bug 8139228
+ * @summary JFileChooser should not render Directory names in HTML format
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual HTMLFileName system
+ */
+
+public class HTMLFileName {
+    private static final String INSTRUCTIONS = """
+            <html>
+            <ol>
+            <li>FileChooser shows up a virtual directory and file with name
+               <html><h1 color=#ff00ff><font face="Comic Sans MS">Swing Rocks!.
+            <li>On "HTML disabled" frame :
+                <ol>
+                  <li>Verify that the folder and file name must be plain text.
+                  <li>If the name in file pane window and also in directory
+                     ComboBox remains in plain text, then press <b>Pass</b>.
+                     If it appears to be in HTML format with Pink color as
+                     shown, then press <b>Fail</b>.
+                </ol>
+
+            <li>On "HTML enabled" frame :
+                <ol>
+                  <li>Verify that the folder and file name remains in HTML
+                     format with name "Swing Rocks!" pink in color as shown.
+                  <li>If the name in file pane window and also in directory
+                     ComboBox remains in HTML format string, then press <b>Pass</b>.
+                     If it appears to be in plain text, then press <b>Fail</b>.
+                </ol>
+            </ol>
+            </html>
+            """;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length < 1) {
+            throw new IllegalArgumentException("Look-and-Feel keyword is required");
+        }
+
+        final String lafClassName;
+        switch (args[0]) {
+            case "metal" -> lafClassName = UIManager.getCrossPlatformLookAndFeelClassName();
+            case "system" -> lafClassName = UIManager.getSystemLookAndFeelClassName();
+            default -> throw new IllegalArgumentException("Unsupported Look-and-Feel keyword: " + args[0]);
+        }
+
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                UIManager.setLookAndFeel(lafClassName);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        System.out.println("Test for LookAndFeel " + lafClassName);
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(HTMLFileName::initialize)
+                .positionTestUIBottomRowCentered()
+                .build()
+                .awaitAndCheck();
+        System.out.println("Test passed for LookAndFeel " + lafClassName);
+    }
+
+    private static List<JFrame> initialize() {
+        return List.of(createFileChooser(true), createFileChooser(false));
+    }
+
+    private static JFrame createFileChooser(boolean htmlEnabled) {
+        JFileChooser jfc = new JFileChooser(new VirtualFileSystemView());
+        jfc.putClientProperty("html.disable", htmlEnabled);
+        jfc.setControlButtonsAreShown(false);
+
+        JFrame frame = new JFrame((htmlEnabled) ? "HTML enabled" : "HTML disabled");
+        frame.add(jfc);
+        frame.pack();
+        return frame;
+    }
+
+    private static class VirtualFileSystemView extends FileSystemView {
+        @Override
+        public File createNewFolder(File containingDir) {
+            return null;
+        }
+
+        @Override
+        public File[] getRoots() {
+            return new File[]{
+                    new File("/", "<html><h1 color=#ff00ff><font " +
+                            "face=\"Comic Sans MS\">Swing Rocks!"),
+                    new File("/", "virtualFile2.txt"),
+                    new File("/", "virtualFolder")
+            };
+        }
+
+        @Override
+        public File getHomeDirectory() {
+            return new File("/");
+        }
+
+        @Override
+        public File getDefaultDirectory() {
+            return new File("/");
+        }
+
+        @Override
+        public File[] getFiles(File dir, boolean useFileHiding) {
+            // Simulate a virtual folder structure
+            return new File[]{
+                    new File("/", "<html><h1 color=#ff00ff><font " +
+                            "face=\"Comic Sans MS\">Swing Rocks!"),
+                    new File(dir, "virtualFile2.txt"),
+                    new File(dir, "virtualFolder")
+            };
+        }
+
+        @Override
+        public Icon getSystemIcon(File f) {
+            return null;
+        }
+    }
+}

From 2f530f89e0ee5ed5253125d0e9319b07103173f0 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Fri, 23 May 2025 17:44:39 +0000
Subject: [PATCH 621/901] 8357281: sun.util.Locale.LanguageTag should be
 immutable

Reviewed-by: naoto, liach
---
 .../share/classes/java/util/Locale.java       |  12 +-
 .../util/locale/InternalLocaleBuilder.java    |  16 +-
 .../classes/sun/util/locale/LanguageTag.java  | 252 +++++++-----------
 3 files changed, 111 insertions(+), 169 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 14f3fe13918..fa13afcc310 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -1691,37 +1691,37 @@ public String toLanguageTag() {
         LanguageTag tag = LanguageTag.parseLocale(baseLocale, localeExtensions);
         StringBuilder buf = new StringBuilder();
 
-        String subtag = tag.getLanguage();
+        String subtag = tag.language();
         if (!subtag.isEmpty()) {
             buf.append(LanguageTag.canonicalizeLanguage(subtag));
         }
 
-        subtag = tag.getScript();
+        subtag = tag.script();
         if (!subtag.isEmpty()) {
             buf.append(LanguageTag.SEP);
             buf.append(LanguageTag.canonicalizeScript(subtag));
         }
 
-        subtag = tag.getRegion();
+        subtag = tag.region();
         if (!subtag.isEmpty()) {
             buf.append(LanguageTag.SEP);
             buf.append(LanguageTag.canonicalizeRegion(subtag));
         }
 
-        List<String>subtags = tag.getVariants();
+        List<String>subtags = tag.variants();
         for (String s : subtags) {
             buf.append(LanguageTag.SEP);
             // preserve casing
             buf.append(s);
         }
 
-        subtags = tag.getExtensions();
+        subtags = tag.extensions();
         for (String s : subtags) {
             buf.append(LanguageTag.SEP);
             buf.append(LanguageTag.canonicalizeExtension(s));
         }
 
-        subtag = tag.getPrivateuse();
+        subtag = tag.privateuse();
         if (!subtag.isEmpty()) {
             if (buf.length() > 0) {
                 buf.append(LanguageTag.SEP);
diff --git a/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java b/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java
index 894a49e8efe..5da725d59c8 100644
--- a/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.java
+++ b/src/java.base/share/classes/sun/util/locale/InternalLocaleBuilder.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
@@ -347,18 +347,18 @@ private InternalLocaleBuilder setExtensions(List<String> bcpExtensions, String p
      */
     public InternalLocaleBuilder setLanguageTag(LanguageTag langtag) {
         clear();
-        if (!langtag.getExtlangs().isEmpty()) {
-            language = langtag.getExtlangs().get(0);
+        if (!langtag.extlangs().isEmpty()) {
+            language = langtag.extlangs().get(0);
         } else {
-            String lang = langtag.getLanguage();
+            String lang = langtag.language();
             if (!lang.equals(LanguageTag.UNDETERMINED)) {
                 language = lang;
             }
         }
-        script = langtag.getScript();
-        region = langtag.getRegion();
+        script = langtag.script();
+        region = langtag.region();
 
-        List<String> bcpVariants = langtag.getVariants();
+        List<String> bcpVariants = langtag.variants();
         if (!bcpVariants.isEmpty()) {
             StringBuilder var = new StringBuilder(bcpVariants.get(0));
             int size = bcpVariants.size();
@@ -368,7 +368,7 @@ public InternalLocaleBuilder setLanguageTag(LanguageTag langtag) {
             variant = var.toString();
         }
 
-        setExtensions(langtag.getExtensions(), langtag.getPrivateuse());
+        setExtensions(langtag.extensions(), langtag.privateuse());
 
         return this;
     }
diff --git a/src/java.base/share/classes/sun/util/locale/LanguageTag.java b/src/java.base/share/classes/sun/util/locale/LanguageTag.java
index 5c905372c5a..a88937b7538 100644
--- a/src/java.base/share/classes/sun/util/locale/LanguageTag.java
+++ b/src/java.base/share/classes/sun/util/locale/LanguageTag.java
@@ -42,30 +42,21 @@
 import java.util.Set;
 import java.util.StringJoiner;
 
-public class LanguageTag {
-    //
-    // static fields
-    //
+// List fields are unmodifiable
+public record LanguageTag(String language, String script, String region, String privateuse,
+                          List<String> extlangs, List<String> variants, List<String> extensions) {
+
     public static final String SEP = "-";
     public static final String PRIVATEUSE = "x";
     public static final String UNDETERMINED = "und";
     public static final String PRIVUSE_VARIANT_PREFIX = "lvariant";
+    private static final String EMPTY_SUBTAG = "";
+    private static final List<String> EMPTY_SUBTAGS = Collections.emptyList();
 
-    //
-    // Language subtag fields
-    //
-    private String language = "";      // language subtag
-    private String script = "";        // script subtag
-    private String region = "";        // region subtag
-    private String privateuse = "";    // privateuse
-
-    private List<String> extlangs = Collections.emptyList();   // extlang subtags
-    private List<String> variants = Collections.emptyList();   // variant subtags
-    private List<String> extensions = Collections.emptyList(); // extensions
     // Map contains legacy language tags and its preferred mappings from
     // http://www.ietf.org/rfc/rfc5646.txt
     // Keys are lower-case strings.
-    private static final Map<String, String[]> LEGACY = new HashMap<>();
+    private static final Map<String, String[]> LEGACY;
 
     static {
         // grandfathered = irregular           ; non-redundant tags registered
@@ -128,14 +119,12 @@ public class LanguageTag {
             {"zh-min-nan",  "nan"},
             {"zh-xiang",    "hsn"},
         };
+        LEGACY = HashMap.newHashMap(entries.length);
         for (String[] e : entries) {
             LEGACY.put(LocaleUtils.toLowerString(e[0]), e);
         }
     }
 
-    private LanguageTag() {
-    }
-
     /*
      * BNF in RFC5646
      *
@@ -195,17 +184,27 @@ public static LanguageTag parse(String languageTag, ParsePosition pp,
             itr = new StringTokenIterator(languageTag, SEP);
         }
 
-        LanguageTag tag = new LanguageTag();
-
+        String language = parseLanguage(itr, pp);
+        List<String> extlangs;
+        String script;
+        String region;
+        List<String> variants;
+        List<String> extensions;
         // langtag must start with either language or privateuse
-        if (tag.parseLanguage(itr, pp)) {
-            tag.parseExtlangs(itr, pp);
-            tag.parseScript(itr, pp);
-            tag.parseRegion(itr, pp);
-            tag.parseVariants(itr, pp);
-            tag.parseExtensions(itr, pp, errorMsg);
+        if (!language.isEmpty()) {
+            extlangs = parseExtlangs(itr, pp);
+            script = parseScript(itr, pp);
+            region = parseRegion(itr, pp);
+            variants = parseVariants(itr, pp);
+            extensions = parseExtensions(itr, pp, errorMsg);
+        } else {
+            extlangs = EMPTY_SUBTAGS;
+            script = EMPTY_SUBTAG;
+            region = EMPTY_SUBTAG;
+            variants = EMPTY_SUBTAGS;
+            extensions = EMPTY_SUBTAGS;
         }
-        tag.parsePrivateuse(itr, pp, errorMsg);
+        String privateuse = parsePrivateuse(itr, pp, errorMsg);
 
         if (!itr.isDone() && pp.getErrorIndex() == -1) {
             String s = itr.current();
@@ -221,110 +220,94 @@ public static LanguageTag parse(String languageTag, ParsePosition pp,
             throw new IllformedLocaleException(errorMsg.toString(), pp.getErrorIndex());
         }
 
-        return tag;
+        return new LanguageTag(language, script, region, privateuse, extlangs, variants, extensions);
     }
 
     //
     // Language subtag parsers
     //
 
-    private boolean parseLanguage(StringTokenIterator itr, ParsePosition pp) {
+    private static String parseLanguage(StringTokenIterator itr, ParsePosition pp) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAG;
         }
 
-        boolean found = false;
-
         String s = itr.current();
         if (isLanguage(s)) {
-            found = true;
-            language = s;
             pp.setIndex(itr.currentEnd());
             itr.next();
+            return s;
         }
 
-        return found;
+        return EMPTY_SUBTAG;
     }
 
-    private boolean parseExtlangs(StringTokenIterator itr, ParsePosition pp) {
+    private static List<String> parseExtlangs(StringTokenIterator itr, ParsePosition pp) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAGS;
         }
-
-        boolean found = false;
-
+        List<String> extlangs = null;
         while (!itr.isDone()) {
             String s = itr.current();
             if (!isExtlang(s)) {
                 break;
             }
-            found = true;
-            if (extlangs.isEmpty()) {
+            if (extlangs == null) {
                 extlangs = new ArrayList<>(3);
             }
             extlangs.add(s);
             pp.setIndex(itr.currentEnd());
             itr.next();
-
             if (extlangs.size() == 3) {
                 // Maximum 3 extlangs
                 break;
             }
         }
-
-        return found;
+        return extlangs == null ? EMPTY_SUBTAGS :
+                Collections.unmodifiableList(extlangs);
     }
 
-    private boolean parseScript(StringTokenIterator itr, ParsePosition pp) {
+    private static String parseScript(StringTokenIterator itr, ParsePosition pp) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAG;
         }
 
-        boolean found = false;
-
         String s = itr.current();
         if (isScript(s)) {
-            found = true;
-            script = s;
             pp.setIndex(itr.currentEnd());
             itr.next();
+            return s;
         }
 
-        return found;
+        return EMPTY_SUBTAG;
     }
 
-    private boolean parseRegion(StringTokenIterator itr, ParsePosition pp) {
+    private static String parseRegion(StringTokenIterator itr, ParsePosition pp) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAG;
         }
-
-        boolean found = false;
-
         String s = itr.current();
         if (isRegion(s)) {
-            found = true;
-            region = s;
             pp.setIndex(itr.currentEnd());
             itr.next();
+            return s;
         }
 
-        return found;
+        return EMPTY_SUBTAG;
     }
 
-    private boolean parseVariants(StringTokenIterator itr, ParsePosition pp) {
+    private static List<String> parseVariants(StringTokenIterator itr, ParsePosition pp) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAGS;
         }
-
-        boolean found = false;
+        List<String> variants = null;
 
         while (!itr.isDone()) {
             String s = itr.current();
             if (!isVariant(s)) {
                 break;
             }
-            found = true;
-            if (variants.isEmpty()) {
+            if (variants == null) {
                 variants = new ArrayList<>(3);
             }
             variants.add(s);
@@ -332,16 +315,16 @@ private boolean parseVariants(StringTokenIterator itr, ParsePosition pp) {
             itr.next();
         }
 
-        return found;
+        return variants == null ? EMPTY_SUBTAGS :
+                Collections.unmodifiableList(variants);
     }
 
-    private boolean parseExtensions(StringTokenIterator itr, ParsePosition pp,
+    private static List<String> parseExtensions(StringTokenIterator itr, ParsePosition pp,
                                     StringBuilder err) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAGS;
         }
-
-        boolean found = false;
+        List<String> extensions = null;
 
         while (!itr.isDone()) {
             String s = itr.current();
@@ -368,26 +351,24 @@ private boolean parseExtensions(StringTokenIterator itr, ParsePosition pp,
                     break;
                 }
 
-                if (extensions.isEmpty()) {
+                if (extensions == null) {
                     extensions = new ArrayList<>(4);
                 }
                 extensions.add(sb.toString());
-                found = true;
             } else {
                 break;
             }
         }
-        return found;
+        return extensions == null ? EMPTY_SUBTAGS :
+                Collections.unmodifiableList(extensions);
     }
 
-    private boolean parsePrivateuse(StringTokenIterator itr, ParsePosition pp,
+    private static String parsePrivateuse(StringTokenIterator itr, ParsePosition pp,
                                     StringBuilder err) {
         if (itr.isDone() || pp.getErrorIndex() != -1) {
-            return false;
+            return EMPTY_SUBTAG;
         }
 
-        boolean found = false;
-
         String s = itr.current();
         if (isPrivateusePrefix(s)) {
             int start = itr.currentStart();
@@ -410,12 +391,11 @@ private boolean parsePrivateuse(StringTokenIterator itr, ParsePosition pp,
                 pp.setErrorIndex(start);
                 err.append("Incomplete privateuse");
             } else {
-                privateuse = sb.toString();
-                found = true;
+                return sb.toString();
             }
         }
 
-        return found;
+        return EMPTY_SUBTAG;
     }
 
     public static String caseFoldTag(String tag) {
@@ -462,48 +442,50 @@ public static String caseFoldTag(String tag) {
     }
 
     public static LanguageTag parseLocale(BaseLocale baseLocale, LocaleExtensions localeExtensions) {
-        LanguageTag tag = new LanguageTag();
 
-        String language = baseLocale.getLanguage();
-        String script = baseLocale.getScript();
-        String region = baseLocale.getRegion();
-        String variant = baseLocale.getVariant();
+        String language = EMPTY_SUBTAG;
+        String script = EMPTY_SUBTAG;
+        String region = EMPTY_SUBTAG;
+
+        String baseLanguage = baseLocale.getLanguage();
+        String baseScript = baseLocale.getScript();
+        String baseRegion = baseLocale.getRegion();
+        String baseVariant = baseLocale.getVariant();
 
         boolean hasSubtag = false;
 
         String privuseVar = null;   // store ill-formed variant subtags
 
-        if (isLanguage(language)) {
+        if (isLanguage(baseLanguage)) {
             // Convert a deprecated language code to its new code
-            if (language.equals("iw")) {
-                language = "he";
-            } else if (language.equals("ji")) {
-                language = "yi";
-            } else if (language.equals("in")) {
-                language = "id";
-            }
-            tag.language = language;
+            baseLanguage = switch (baseLanguage) {
+                case "iw" -> "he";
+                case "ji" -> "yi";
+                case "in" -> "id";
+                default -> baseLanguage;
+            };
+            language = baseLanguage;
         }
 
-        if (isScript(script)) {
-            tag.script = canonicalizeScript(script);
+        if (isScript(baseScript)) {
+            script = canonicalizeScript(baseScript);
             hasSubtag = true;
         }
 
-        if (isRegion(region)) {
-            tag.region = canonicalizeRegion(region);
+        if (isRegion(baseRegion)) {
+            region = canonicalizeRegion(baseRegion);
             hasSubtag = true;
         }
 
         // Special handling for no_NO_NY - use nn_NO for language tag
-        if (tag.language.equals("no") && tag.region.equals("NO") && variant.equals("NY")) {
-            tag.language = "nn";
-            variant = "";
+        if (language.equals("no") && region.equals("NO") && baseVariant.equals("NY")) {
+            language = "nn";
+            baseVariant = EMPTY_SUBTAG;
         }
 
-        if (!variant.isEmpty()) {
-            List<String> variants = null;
-            StringTokenIterator varitr = new StringTokenIterator(variant, BaseLocale.SEP);
+        List<String> variants = null;
+        if (!baseVariant.isEmpty()) {
+            StringTokenIterator varitr = new StringTokenIterator(baseVariant, BaseLocale.SEP);
             while (!varitr.isDone()) {
                 String var = varitr.current();
                 if (!isVariant(var)) {
@@ -516,7 +498,6 @@ public static LanguageTag parseLocale(BaseLocale baseLocale, LocaleExtensions lo
                 varitr.next();
             }
             if (variants != null) {
-                tag.variants = variants;
                 hasSubtag = true;
             }
             if (!varitr.isDone()) {
@@ -556,7 +537,6 @@ public static LanguageTag parseLocale(BaseLocale baseLocale, LocaleExtensions lo
         }
 
         if (extensions != null) {
-            tag.extensions = extensions;
             hasSubtag = true;
         }
 
@@ -570,59 +550,21 @@ public static LanguageTag parseLocale(BaseLocale baseLocale, LocaleExtensions lo
             }
         }
 
-        if (privateuse != null) {
-            tag.privateuse = privateuse;
-        }
-
-        if (tag.language.isEmpty() && (hasSubtag || privateuse == null)) {
+        if (language.isEmpty() && (hasSubtag || privateuse == null)) {
             // use lang "und" when 1) no language is available AND
             // 2) any of other subtags other than private use are available or
             // no private use tag is available
-            tag.language = UNDETERMINED;
-        }
-
-        return tag;
-    }
-
-    //
-    // Getter methods for language subtag fields
-    //
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public List<String> getExtlangs() {
-        if (extlangs.isEmpty()) {
-            return Collections.emptyList();
+            language = UNDETERMINED;
         }
-        return Collections.unmodifiableList(extlangs);
-    }
-
-    public String getScript() {
-        return script;
-    }
-
-    public String getRegion() {
-        return region;
-    }
 
-    public List<String> getVariants() {
-        if (variants.isEmpty()) {
-            return Collections.emptyList();
-        }
-        return Collections.unmodifiableList(variants);
-    }
-
-    public List<String> getExtensions() {
-        if (extensions.isEmpty()) {
-            return Collections.emptyList();
-        }
-        return Collections.unmodifiableList(extensions);
-    }
+        privateuse = privateuse == null ? EMPTY_SUBTAG : privateuse;
+        extensions = extensions == null ? EMPTY_SUBTAGS :
+                Collections.unmodifiableList(extensions);
+        variants = variants == null ? EMPTY_SUBTAGS :
+                Collections.unmodifiableList(variants);
 
-    public String getPrivateuse() {
-        return privateuse;
+        // extlangs always empty for locale parse
+        return new LanguageTag(language, script, region, privateuse, EMPTY_SUBTAGS, variants, extensions);
     }
 
     //

From 85ca0813f1624141993b20b3d8e404f86da2cef3 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 23 May 2025 17:59:47 +0000
Subject: [PATCH 622/901] 8354316: clang/linux build fails with -Wunused-result
 warning at XToolkit.c:695:9

Reviewed-by: aivanov, ihse, serb, kizune, syan, erikj
---
 make/modules/java.desktop/lib/AwtLibraries.gmk           | 1 -
 src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 5414c93c908..463e09e12dc 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -278,7 +278,6 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_gcc_X11TextRenderer_md.c := unused-but-set-variable, \
       DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
       DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
-      DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
       DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
       DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
       DISABLED_WARNINGS_clang_gtk3_interface.c := unused-function parentheses, \
diff --git a/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c b/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
index abe3a1c54ce..d5f3130386d 100644
--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
+++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
@@ -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
@@ -692,7 +692,9 @@ void awt_output_flush() {
 static void wakeUp() {
     static char wakeUp_char = 'p';
     if (!isMainThread() && awt_pipe_inited) {
-        write ( AWT_WRITEPIPE, &wakeUp_char, 1 );
+        if (write(AWT_WRITEPIPE, &wakeUp_char, 1) < 0) {
+            DTRACE_PRINTLN("wakeUp(): write to AWT pipe failed");
+        }
     }
 }
 

From 236e1b6d529771f44218b6a4e2693e234e6a4e09 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 23 May 2025 18:17:40 +0000
Subject: [PATCH 623/901] 8357401: BigDecimal: Constants ONE_TENTH and ONE_HALF
 are unused after JDK-8341402

Reviewed-by: bpb, liach, darcy
---
 src/java.base/share/classes/java/math/BigDecimal.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index d40ec0b705a..6fdd3e7fcc2 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -480,16 +480,6 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
     public static final BigDecimal TEN =
         ZERO_THROUGH_TEN[10];
 
-    /**
-     * The value 0.1, with a scale of 1.
-     */
-    private static final BigDecimal ONE_TENTH = valueOf(1L, 1);
-
-    /**
-     * The value 0.5, with a scale of 1.
-     */
-    private static final BigDecimal ONE_HALF = valueOf(5L, 1);
-
     // Constructors
 
     /**

From 66747710a49ea6a78aee94d3a3ec6a24b7cc36e5 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Fri, 23 May 2025 19:29:09 +0000
Subject: [PATCH 624/901] 8357468: [asan] heap buffer overflow reported in
 PcDesc::pc_offset() pcDesc.hpp:57

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/code/nmethod.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index ed6167dac22..83afc02cdfc 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -393,7 +393,9 @@ static inline bool match_desc(PcDesc* pc, int pc_offset, bool approximate) {
   if (!approximate) {
     return pc->pc_offset() == pc_offset;
   } else {
-    return (pc-1)->pc_offset() < pc_offset && pc_offset <= pc->pc_offset();
+    // Do not look before the sentinel
+    assert(pc_offset > PcDesc::lower_offset_limit, "illegal pc_offset");
+    return pc_offset <= pc->pc_offset() && (pc-1)->pc_offset() < pc_offset;
   }
 }
 

From 070c84cd22485a93a562a7639439fb056e840861 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 23 May 2025 22:58:09 +0000
Subject: [PATCH 625/901] 8357178: Simplify Class::componentType

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

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 8be5ae8fa15..a7b856fa449 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -3982,7 +3982,7 @@ public String descriptorString() {
      */
     @Override
     public Class<?> componentType() {
-        return isArray() ? componentType : null;
+        return getComponentType();
     }
 
     /**

From e89330579d5f38e282512211711fffeeea3e899e Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Sat, 24 May 2025 09:51:53 +0000
Subject: [PATCH 626/901] 8334513: New test gc/TestAlwaysPreTouchBehavior.java
 is failing on MacOS aarch64

Reviewed-by: mbaesken, aph
---
 src/hotspot/os/bsd/os_bsd.cpp                 |  4 +-
 src/hotspot/share/prims/whitebox.cpp          |  6 ++
 test/hotspot/jtreg/ProblemList.txt            |  6 --
 .../jtreg/gc/TestAlwaysPreTouchBehavior.java  | 93 ++++++++++++++-----
 test/lib/jdk/test/whitebox/WhiteBox.java      |  1 +
 5 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index e517e8f30a0..01901acc0a3 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -142,7 +142,9 @@ julong os::free_memory() {
   return Bsd::available_memory();
 }
 
-// available here means free
+// Available here means free. Note that this number is of no much use. As an estimate
+// for future memory pressure it is far too conservative, since MacOS will use a lot
+// of unused memory for caches, and return it willingly in case of needs.
 julong os::Bsd::available_memory() {
   uint64_t available = physical_memory() >> 2;
 #ifdef __APPLE__
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 69b1b0a8b97..c7f44c78fc5 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -2511,6 +2511,11 @@ WB_ENTRY(jlong, WB_HostPhysicalMemory(JNIEnv* env, jobject o))
   return os::physical_memory();
 WB_END
 
+// Available memory of the host machine (container-aware)
+WB_ENTRY(jlong, WB_HostAvailableMemory(JNIEnv* env, jobject o))
+  return os::available_memory();
+WB_END
+
 // Physical swap of the host machine (including containers), Linux only.
 WB_ENTRY(jlong, WB_HostPhysicalSwap(JNIEnv* env, jobject o))
   LINUX_ONLY(return (jlong)os::Linux::host_swap();)
@@ -2980,6 +2985,7 @@ static JNINativeMethod methods[] = {
                                                       (void*)&WB_ValidateCgroup },
   {CC"hostPhysicalMemory",        CC"()J",            (void*)&WB_HostPhysicalMemory },
   {CC"hostPhysicalSwap",          CC"()J",            (void*)&WB_HostPhysicalSwap },
+  {CC"hostAvailableMemory",       CC"()J",            (void*)&WB_HostAvailableMemory },
   {CC"hostCPUs",                  CC"()I",            (void*)&WB_HostCPUs },
   {CC"printOsInfo",               CC"()V",            (void*)&WB_PrintOsInfo },
   {CC"disableElfSectionCache",    CC"()V",            (void*)&WB_DisableElfSectionCache },
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index a31376f82f5..974f9b9fd38 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -91,12 +91,6 @@ gc/TestAllocHumongousFragment.java#adaptive 8298781 generic-all
 gc/TestAllocHumongousFragment.java#aggressive 8298781 generic-all
 gc/TestAllocHumongousFragment.java#g1 8298781 generic-all
 gc/TestAllocHumongousFragment.java#static 8298781 generic-all
-gc/TestAlwaysPreTouchBehavior.java#ParallelCollector 8334513 generic-all
-gc/TestAlwaysPreTouchBehavior.java#SerialCollector 8334513 generic-all
-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/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
 
diff --git a/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java b/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
index 9f6c915d1c0..b8197f70384 100644
--- a/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
+++ b/test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2014, 2024, Alibaba Group Holding Limited. All rights reserved.
- * Copyright (c) 2024, Red Hat Inc.
+ * Copyright (c) 2024, 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
@@ -29,23 +30,25 @@
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.Parallel
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -Xmx512m -Xms512m -XX:+UseParallelGC -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx256m -Xms256m -XX:+UseParallelGC -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
- /**
+/**
  * @test id=SerialCollector
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.Serial
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -Xmx512m -Xms512m -XX:+UseSerialGC -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx256m -Xms256m -XX:+UseSerialGC -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
 /**
@@ -53,11 +56,12 @@
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.Shenandoah
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -Xmx512m -Xms512m -XX:+UseShenandoahGC  -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx256m -Xms256m -XX:+UseShenandoahGC  -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
 /**
@@ -65,11 +69,12 @@
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.G1
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -Xmx512m -Xms512m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx256m -Xms256m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
 /**
@@ -77,11 +82,12 @@
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.Z
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -XX:+UseZGC -Xmx512m -Xms512m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseZGC -Xmx256m -Xms256m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
 /**
@@ -89,30 +95,67 @@
  * @summary tests AlwaysPreTouch
  * @requires vm.gc.Epsilon
  * @requires os.maxMemory > 2G
- * @requires os.family != "aix"
+ * @requires !vm.debug
+ * @requires os.family == "linux"
  * @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 -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xmx512m -Xms512m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xmx256m -Xms256m -XX:+AlwaysPreTouch gc.TestAlwaysPreTouchBehavior
  */
 
-
 import jdk.test.lib.Asserts;
 
 import jdk.test.whitebox.WhiteBox;
+import jtreg.SkippedException;
 
 public class TestAlwaysPreTouchBehavior {
+    //
+    //    This test tests the ability of the JVM to pretouch its java heap for test purposes (AlwaysPreTouch). We start a
+    //    JVM with -XX:+AlwaysPreTouch, then observe RSS and expect to see RSS covering the entirety of the java heap,
+    //    since it should all be pre-touched now.
+    //
+    //    This test is important (we had pretouching break before) but very shaky since RSS of the JVM process is subject to
+    //    host machine conditions. If there is memory pressure, we may swap parts of the heap out after pretouching and
+    //    before measuring RSS, thus tainting the result.
+    //
+    //    This test attempts to minimize the risk of false positives stemming from memory pressure by:
+    //    - specifying @requires os.maxMemory > 2G
+    //    - checking  if the memory still available on the host machine after starting the process is lower than a
+    //      certain required threshold; if it is, we take this as a sign of memory pressure and disregard test errors.
+    //    - we only run this test with release JVMs - debug JVMs have a higher and more unpredictable RSS footprint
+    //      and therefore would require a larger heap for a clear difference between non-pretouch and pretouch; also,
+    //      there should not be much difference between debug and release code.
+    //
+    //    Obviously, all of this is not bulletproof and only useful on Linux:
+    //    - On MacOS, os::available_memory() drastically underreports available memory, so this technique would almost
+    //      always fail to function
+    //    - On AIX, we dont have a way to measure rss yet.
+    //
 
     public static void main(String [] args) {
-    long rss = WhiteBox.getWhiteBox().rss();
-    System.out.println("RSS: " + rss);
-    if (rss == 0) {
-        System.out.println("cannot get RSS, just skip");
-        return; // Did not get available RSS, just ignore this test.
+        long rss = WhiteBox.getWhiteBox().rss();
+        System.out.println("RSS: " + rss);
+        long available = WhiteBox.getWhiteBox().hostAvailableMemory();
+        System.out.println("Host available memory: " + available);
+
+        long heapSize = 256 * 1024 * 1024;
+
+        // On Linux, a JVM that runs with 256M pre-committed heap will use about 60MB (release JVM) RSS. Barring
+        // memory pressure that causes us to lose RSS, pretouching should increase RSS to >256MB. So there should be a
+        // clear distinction between non-pretouched and pretouched.
+        long minRequiredRss = heapSize;
+
+        // The minimum required available memory size to count test errors as errors (to somewhat safely disregard
+        // outside memory pressure as the culprit). We are over-cautious and require at least 1G free. We rather err
+        // on the side of disregarding true errors than to produce false positives (if pretouching is broken, at least
+        // some of the runs of this test will run on beefy enough machines and show the test as failed).
+        long requiredAvailable = 1024 * 1024 * 1024;
+        if (rss == 0) {
+            throw new SkippedException("cannot get RSS?");
+        }
+        if (available > requiredAvailable) {
+            Asserts.assertGreaterThan(rss, minRequiredRss, "RSS of this process(" + rss + "b) should be bigger " +
+                                      "than or equal to heap size(" + heapSize + "b) (available memory: " + available + ")");
+        }
     }
-    Runtime runtime = Runtime.getRuntime();
-    long committedMemory = runtime.totalMemory();
-    Asserts.assertGreaterThan(rss, committedMemory, "RSS of this process(" + rss + "b) should be bigger than or equal to committed heap mem(" + committedMemory + "b)");
-   }
 }
-
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 4747740274e..10fad866ca3 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -816,6 +816,7 @@ public native int validateCgroup(boolean cgroupsV2Enabled,
                                    String procSelfMountinfo);
   public native void printOsInfo();
   public native long hostPhysicalMemory();
+  public native long hostAvailableMemory();
   public native long hostPhysicalSwap();
   public native int hostCPUs();
 

From 1f24a5414d735f9faaabd5b49f786419a40d9da5 Mon Sep 17 00:00:00 2001
From: Sorna Sarathi N <ssarathi@openjdk.org>
Date: Sat, 24 May 2025 15:06:25 +0000
Subject: [PATCH 627/901] 8357644: Add missing CPE statements

Reviewed-by: asemenyuk
---
 .../classes/jdk/jpackage/internal/util/CollectionUtils.java   | 4 +++-
 .../classes/jdk/jpackage/internal/util/CompositeProxy.java    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
index 7f8b67ccde4..e5ad5246f05 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
@@ -4,7 +4,9 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
index 5d6dba2abd4..4fe5fe9039e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
@@ -4,7 +4,9 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

From b037353734fd67f8898eb797a041bc1152a18178 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Sat, 24 May 2025 17:08:03 +0000
Subject: [PATCH 628/901] 8357081: Removed unused methods of HexDigits

Reviewed-by: rriggs, jpai
---
 .../classes/jdk/internal/util/HexDigits.java  | 69 -------------------
 1 file changed, 69 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/util/HexDigits.java b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
index 443a431701b..45b39704059 100644
--- a/src/java.base/share/classes/jdk/internal/util/HexDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/HexDigits.java
@@ -25,7 +25,6 @@
 
 package jdk.internal.util;
 
-import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.vm.annotation.Stable;
 
@@ -36,8 +35,6 @@
  * @since 21
  */
 public final class HexDigits {
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
-
     /**
      * Each element of the array represents the ascii encoded
      * hex relative to its index, for example:<p>
@@ -112,70 +109,4 @@ public static short digitPair(int i, boolean ucase) {
                 ? (short) (v - ((v & 0b0100_0000_0100_0000) >> 1))
                 : v;
     }
-
-    /**
-     * Insert digits for long value in buffer from high index to low index.
-     *
-     * @param value      value to convert
-     * @param index      insert point + 1
-     * @param buffer     byte buffer to copy into
-     *
-     * @return the last index used
-     */
-    public static int getCharsLatin1(long value, int index, byte[] buffer) {
-        while ((value & ~0xFF) != 0) {
-            short pair = DIGITS[((int) value) & 0xFF];
-            buffer[--index] = (byte)(pair >> 8);
-            buffer[--index] = (byte)(pair);
-            value >>>= 8;
-        }
-
-        int digits = DIGITS[(int) (value & 0xFF)];
-        buffer[--index] = (byte) (digits >> 8);
-
-        if (0xF < value) {
-            buffer[--index] = (byte) (digits & 0xFF);
-        }
-
-        return index;
-    }
-
-    /**
-     * Insert digits for long value in buffer from high index to low index.
-     *
-     * @param value      value to convert
-     * @param index      insert point + 1
-     * @param buffer     byte buffer to copy into
-     *
-     * @return the last index used
-     */
-    public static int getCharsUTF16(long value, int index, byte[] buffer) {
-        while ((value & ~0xFF) != 0) {
-            int pair = (int) DIGITS[((int) value) & 0xFF];
-            JLA.uncheckedPutCharUTF16(buffer, --index, pair >> 8);
-            JLA.uncheckedPutCharUTF16(buffer, --index, pair & 0xFF);
-            value >>>= 8;
-        }
-
-        int digits = DIGITS[(int) (value & 0xFF)];
-        JLA.uncheckedPutCharUTF16(buffer, --index, (byte) (digits >> 8));
-
-        if (0xF < value) {
-            JLA.uncheckedPutCharUTF16(buffer, --index, (byte) (digits & 0xFF));
-        }
-
-        return index;
-    }
-
-    /**
-     * Calculate the number of digits required to represent the long.
-     *
-     * @param value value to convert
-     *
-     * @return number of digits
-     */
-    public static int stringSize(long value) {
-        return value == 0 ? 1 :
-                67 - Long.numberOfLeadingZeros(value) >> 2;
-    }
 }

From b034710b2ae5fbfbe619abba86fef3b5a2d685e0 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Sun, 25 May 2025 12:56:55 +0000
Subject: [PATCH 629/901] 8356629: Incorrect use of {@linkplain} in java.sql

Reviewed-by: lancea
---
 src/java.sql/share/classes/java/sql/DatabaseMetaData.java | 4 ++--
 src/java.sql/share/classes/java/sql/DriverManager.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
index f4cb8787b5f..1fe1b387f42 100644
--- a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
+++ b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 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
@@ -3589,7 +3589,7 @@ ResultSet getFunctionColumns(String catalog,
      * DECIMAL_DIGITS is not applicable.
      *  <LI><B>NUM_PREC_RADIX</B> int {@code =>} Radix (typically either 10 or 2)
      *  <LI><B>COLUMN_USAGE</B> String {@code =>} The allowed usage for the column.  The
-     *  value returned will correspond to the enum name returned by {@link PseudoColumnUsage#name PseudoColumnUsage.name()}
+     *  value returned will correspond to the enum name returned by {@link PseudoColumnUsage#name() PseudoColumnUsage.name()}
      *  <LI><B>REMARKS</B> String {@code =>} comment describing column (may be {@code null})
      *  <LI><B>CHAR_OCTET_LENGTH</B> int {@code =>} for char types the
      *       maximum number of bytes in the column
diff --git a/src/java.sql/share/classes/java/sql/DriverManager.java b/src/java.sql/share/classes/java/sql/DriverManager.java
index 7620a11e6fd..2f51dee5e70 100644
--- a/src/java.sql/share/classes/java/sql/DriverManager.java
+++ b/src/java.sql/share/classes/java/sql/DriverManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 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
@@ -59,7 +59,7 @@
  * </ul>
  *
  * <li>Service providers of the {@code java.sql.Driver} class, that are loaded
- * via the {@linkplain ServiceLoader#load service-provider loading} mechanism.
+ * via the {@linkplain ServiceLoader#load(Class) service-provider loading} mechanism.
  *</ul>
  *
  * @implNote

From 4a4209ffef8f8d65054cbf46ebf8e169d100c0d8 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Sun, 25 May 2025 17:39:53 +0000
Subject: [PATCH 630/901] 8357685: Change the type of Integer::digits from
 char[] to byte[]

Reviewed-by: rgiulietti, liach
---
 src/java.base/share/classes/java/lang/Integer.java | 9 +++++----
 src/java.base/share/classes/java/lang/Long.java    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index a95149a3edd..41487a469b6 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -100,7 +100,8 @@ public final class Integer extends Number
     /**
      * All possible chars for representing a number as a String
      */
-    static final char[] digits = {
+    @Stable
+    static final byte[] digits = {
         '0' , '1' , '2' , '3' , '4' , '5' ,
         '6' , '7' , '8' , '9' , 'a' , 'b' ,
         'c' , 'd' , 'e' , 'f' , 'g' , 'h' ,
@@ -172,10 +173,10 @@ public static String toString(int i, int radix) {
             }
 
             while (i <= -radix) {
-                buf[charPos--] = (byte)digits[-(i % radix)];
+                buf[charPos--] = digits[-(i % radix)];
                 i = i / radix;
             }
-            buf[charPos] = (byte)digits[-i];
+            buf[charPos] = digits[-i];
 
             if (negative) {
                 buf[--charPos] = '-';
@@ -392,7 +393,7 @@ private static void formatUnsignedInt(int val, int shift, byte[] buf, int len) {
         int radix = 1 << shift;
         int mask = radix - 1;
         do {
-            buf[--charPos] = (byte)Integer.digits[val & mask];
+            buf[--charPos] = Integer.digits[val & mask];
             val >>>= shift;
         } while (charPos > 0);
     }
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 20e07f41b9e..2fb2d18a78c 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -157,10 +157,10 @@ public static String toString(long i, int radix) {
             }
 
             while (i <= -radix) {
-                buf[charPos--] = (byte)Integer.digits[(int)(-(i % radix))];
+                buf[charPos--] = Integer.digits[(int)(-(i % radix))];
                 i = i / radix;
             }
-            buf[charPos] = (byte)Integer.digits[(int)(-i)];
+            buf[charPos] = Integer.digits[(int)(-i)];
 
             if (negative) {
                 buf[--charPos] = '-';
@@ -422,7 +422,7 @@ private static void formatUnsignedLong0(long val, int shift, byte[] buf, int off
         int radix = 1 << shift;
         int mask = radix - 1;
         do {
-            buf[--charPos] = (byte)Integer.digits[((int) val) & mask];
+            buf[--charPos] = Integer.digits[((int) val) & mask];
             val >>>= shift;
         } while (charPos > offset);
     }

From aac287ebacbd982f3c17f5687ec2aff638a82a63 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 26 May 2025 04:41:02 +0000
Subject: [PATCH 631/901] 8353581: Support for `import module` in JShell's code
 completion

Reviewed-by: asotona
---
 .../jdk/jshell/SourceCodeAnalysisImpl.java    | 81 ++++++++++++++-----
 .../jdk/jshell/CompletionSuggestionTest.java  | 14 +++-
 2 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index 7fb354d4d1d..4ee629476db 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.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
@@ -83,6 +83,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
+import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
@@ -250,6 +251,10 @@ public CompletionInfo analyzeCompletion(String srcInput) {
     }
 
     private Tree.Kind guessKind(String code) {
+        return guessKind(code, null);
+    }
+
+    private Tree.Kind guessKind(String code, boolean[] moduleImport) {
         return proc.taskFactory.parse(code, pt -> {
             List<? extends Tree> units = pt.units();
             if (units.isEmpty()) {
@@ -257,6 +262,9 @@ private Tree.Kind guessKind(String code) {
             }
             Tree unitTree = units.get(0);
             proc.debug(DBG_COMPA, "Kind: %s -- %s\n", unitTree.getKind(), unitTree);
+            if (moduleImport != null && unitTree.getKind() == Kind.IMPORT) {
+                moduleImport[0] = ((ImportTree) unitTree).isModule();
+            }
             return unitTree.getKind();
         });
     }
@@ -292,19 +300,21 @@ private List<Suggestion> completionSuggestionsImpl(String code, int cursor, int[
         if (code.trim().isEmpty()) { //TODO: comment handling
             code += ";";
         }
-        OuterWrap codeWrap = switch (guessKind(code)) {
-            case IMPORT -> proc.outerMap.wrapImport(Wrap.simpleWrap(code + "any.any"), null);
+        boolean[] moduleImport = new boolean[1];
+        OuterWrap codeWrap = switch (guessKind(code, moduleImport)) {
+            case IMPORT -> moduleImport[0] ? proc.outerMap.wrapImport(Wrap.simpleWrap(code), null)
+                                           : proc.outerMap.wrapImport(Wrap.simpleWrap(code + "any.any"), null);
             case CLASS, METHOD -> proc.outerMap.wrapInTrialClass(Wrap.classMemberWrap(code));
             default -> proc.outerMap.wrapInTrialClass(Wrap.methodWrap(code));
         };
-        String requiredPrefix = identifier;
-        return computeSuggestions(codeWrap, cursor, anchor).stream()
-                .filter(s -> s.continuation().startsWith(requiredPrefix) && !s.continuation().equals(REPL_DOESNOTMATTER_CLASS_NAME))
+        String[] requiredPrefix = new String[] {identifier};
+        return computeSuggestions(codeWrap, cursor, requiredPrefix, anchor).stream()
+                .filter(s -> s.continuation().startsWith(requiredPrefix[0]) && !s.continuation().equals(REPL_DOESNOTMATTER_CLASS_NAME))
                 .sorted(Comparator.comparing(Suggestion::continuation))
                 .toList();
     }
 
-    private List<Suggestion> computeSuggestions(OuterWrap code, int cursor, int[] anchor) {
+    private List<Suggestion> computeSuggestions(OuterWrap code, int cursor, String[] requiredPrefix, int[] anchor) {
         return proc.taskFactory.analyze(code, at -> {
             SourcePositions sp = at.trees().getSourcePositions();
             CompilationUnitTree topLevel = at.firstCuTree();
@@ -395,6 +405,21 @@ private List<Suggestion> computeSuggestions(OuterWrap code, int cursor, int[] an
                         TypeMirror site = at.trees().getTypeMirror(exprPath);
                         boolean staticOnly = isStaticContext(at, exprPath);
                         ImportTree it = findImport(tp);
+
+                        if (it != null && it.isModule()) {
+                            int selectStart = (int) sp.getStartPosition(topLevel, tp.getLeaf());
+                            String qualifiedPrefix = it.getQualifiedIdentifier().getKind() == Kind.MEMBER_SELECT
+                                ? ((MemberSelectTree) it.getQualifiedIdentifier()).getExpression().toString() + "."
+                                : "";
+
+                            addModuleElements(at, qualifiedPrefix, result);
+
+                            requiredPrefix[0] = qualifiedPrefix + requiredPrefix[0];
+                            anchor[0] = selectStart;
+
+                            return result;
+                        }
+
                         boolean isImport = it != null;
 
                         List<? extends Element> members = membersOf(at, site, staticOnly && !isImport && tp.getLeaf().getKind() == Kind.MEMBER_SELECT);
@@ -454,18 +479,24 @@ private List<Suggestion> computeSuggestions(OuterWrap code, int cursor, int[] an
                         }
                         ImportTree it = findImport(tp);
                         if (it != null) {
-                            // the context of the identifier is an import, look for
-                            // package names that start with the identifier.
-                            // If and when Java allows imports from the default
-                            // package to the default package which would allow
-                            // JShell to change to use the default package, and that
-                            // change is done, then this should use some variation
-                            // of membersOf(at, at.getElements().getPackageElement("").asType(), false)
-                            addElements(listPackages(at, ""),
-                                    it.isStatic()
-                                            ? STATIC_ONLY.and(accessibility)
-                                            : accessibility,
-                                    smartFilter, result);
+                            if (it.isModule()) {
+                                addModuleElements(at, "", result);
+                            } else {
+                                // the context of the identifier is an import, look for
+                                // package names that start with the identifier.
+                                // If and when Java allows imports from the default
+                                // package to the default package which would allow
+                                // JShell to change to use the default package, and that
+                                // change is done, then this should use some variation
+                                // of membersOf(at, at.getElements().getPackageElement("").asType(), false)
+                                addElements(listPackages(at, ""),
+                                        it.isStatic()
+                                                ? STATIC_ONLY.and(accessibility)
+                                                : accessibility,
+                                        smartFilter, result);
+
+                                result.add(new SuggestionImpl("module ", false));
+                            }
                         }
                         break;
                     case CLASS: {
@@ -1014,6 +1045,18 @@ private void addElements(Iterable<? extends Element> elements, Predicate<Element
         }
     }
 
+    private void addModuleElements(AnalyzeTask at,
+                                   String prefix,
+                                   List<Suggestion> result) {
+        for (ModuleElement me : at.getElements().getAllModuleElements()) {
+            if (!me.getQualifiedName().toString().startsWith(prefix)) {
+                continue;
+            }
+            result.add(new SuggestionImpl(me.getQualifiedName().toString(),
+                                          false));
+        }
+    }
+
     private String simpleName(Element el) {
         return el.getKind() == ElementKind.CONSTRUCTOR ? el.getEnclosingElement().getSimpleName().toString()
                                                        : el.getSimpleName().toString();
diff --git a/test/langtools/jdk/jshell/CompletionSuggestionTest.java b/test/langtools/jdk/jshell/CompletionSuggestionTest.java
index 8564c5d1da2..6bc7c41e62c 100644
--- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java
+++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658 8278039 8286206 8296789 8314662 8326333 8326333
+ * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658 8278039 8286206 8296789 8314662 8326333 8326333 8353581
  * @summary Test Completion and Documentation
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -824,4 +824,14 @@ public void testArray() {
         assertCompletion("ints.cl|", "clone()");
         assertCompletion("String[].|", "class");
     }
+
+    //JDK-8353581: completion for module imports:
+    public void testModuleImport() {
+        assertCompletionIncludesExcludes("import |", Set.of("module "), Set.of());
+        assertCompletionIncludesExcludes("import module |", Set.of("java.base"), Set.of("java.", "module"));
+        assertCompletionIncludesExcludes("import module java.|", Set.of("java.base"), Set.of());
+        assertCompletion("import module java.ba|", "java.base");
+        assertCompletionIncludesExcludes("import module ja|", Set.of("java.base"), Set.of("jdk.compiler"));
+        assertCompletion("import module java/*c*/./*c*/ba|", "java.base");
+    }
 }

From a50d3bee12cd2f528067bc15b404cf2289977af5 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Mon, 26 May 2025 06:03:28 +0000
Subject: [PATCH 632/901] 8312198: [macos] metal pipeline - window rendering
 stops after display sleep

Reviewed-by: serb, avu, prr
---
 .../libawt_lwawt/java2d/metal/MTLLayer.h      |  3 ++-
 .../libawt_lwawt/java2d/metal/MTLLayer.m      | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h
index 83e868b37b7..ec477323f98 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h
@@ -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
@@ -56,6 +56,7 @@
 @property (readwrite, assign) int leftInset;
 @property (readwrite, assign) CVDisplayLinkRef displayLink;
 @property (readwrite, atomic) int displayLinkCount;
+@property (readwrite, atomic) int displayLinkFailCount;
 
 - (id) initWithJavaLayer:(jobject)layer;
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
index d7d75f16966..9f3ab974feb 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
@@ -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
@@ -30,6 +30,8 @@
 #import "MTLSurfaceData.h"
 #import "JNIUtilities.h"
 #define KEEP_ALIVE_INC 4
+#define CV_DISPLAYLINK_FAIL_DELAY 1.0
+#define MAX_DISPLAYLINK_FAIL_COUNT 5
 
 @implementation MTLLayer
 
@@ -44,11 +46,27 @@ @implementation MTLLayer
 @synthesize nextDrawableCount;
 @synthesize displayLink;
 @synthesize displayLinkCount;
+@synthesize displayLinkFailCount;
 
 - (void) createDisplayLink {
-    CVDisplayLinkCreateWithActiveCGDisplays(&displayLink);
-    CVDisplayLinkSetOutputCallback(displayLink, &displayLinkCallback, (__bridge void*)self);
-    self.displayLinkCount = 0;
+    CVReturn r = CVDisplayLinkCreateWithActiveCGDisplays(&displayLink);
+    if (r != kCVReturnSuccess) {
+        if (self.displayLinkFailCount >= MAX_DISPLAYLINK_FAIL_COUNT) {
+            J2dTraceLn(J2D_TRACE_ERROR,
+                "MTLLayer.createDisplayLink --- unable to create CVDisplayLink.");
+            self.displayLinkFailCount = 0;
+            return;
+        }
+        self.displayLinkFailCount++;
+        [self performSelector:@selector(createDisplayLink)
+                   withObject:nil
+                   afterDelay:CV_DISPLAYLINK_FAIL_DELAY];
+        return;
+    } else {
+        CVDisplayLinkSetOutputCallback(displayLink, &displayLinkCallback, (__bridge void*)self);
+        self.displayLinkCount = 0;
+        self.displayLinkFailCount = 0;
+    }
 }
 
 - (id) initWithJavaLayer:(jobject)layer

From 99f33b4d9b91c71ec032dc47ed0b98e4419ac432 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 26 May 2025 07:24:25 +0000
Subject: [PATCH 633/901] 8357568: IGV: Show NULL and numbers up to 4
 characters in "Condense graph" filter

Reviewed-by: thartmann, mchevalier, mhaessig
---
 src/hotspot/share/opto/idealGraphPrinter.cpp | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 5154a85b0f8..fe379c0c3c8 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -626,12 +626,8 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
     const char *short_name = "short_name";
     if (strcmp(node->Name(), "Parm") == 0 && node->as_Proj()->_con >= TypeFunc::Parms) {
       int index = node->as_Proj()->_con - TypeFunc::Parms;
-      if (index >= 10) {
-        print_prop(short_name, "PA");
-      } else {
-        os::snprintf_checked(buffer, sizeof(buffer), "P%d", index);
-        print_prop(short_name, buffer);
-      }
+      os::snprintf_checked(buffer, sizeof(buffer), "P%d", index);
+      print_prop(short_name, buffer);
     } else if (strcmp(node->Name(), "IfTrue") == 0) {
       print_prop(short_name, "T");
     } else if (strcmp(node->Name(), "IfFalse") == 0) {
@@ -643,9 +639,9 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
         assert(typeInt->is_con(), "must be constant");
         jint value = typeInt->get_con();
 
-        // max. 2 chars allowed
-        if (value >= -9 && value <= 99) {
-          os::snprintf_checked(buffer, sizeof(buffer), "%d", value);
+        // Only use up to 4 chars and fall back to a generic "I" to keep it short.
+        int written_chars = os::snprintf_checked(buffer, sizeof(buffer), "%d", value);
+        if (written_chars <= 4) {
           print_prop(short_name, buffer);
         } else {
           print_prop(short_name, "I");
@@ -657,9 +653,9 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
         assert(typeLong->is_con(), "must be constant");
         jlong value = typeLong->get_con();
 
-        // max. 2 chars allowed
-        if (value >= -9 && value <= 99) {
-          os::snprintf_checked(buffer, sizeof(buffer), JLONG_FORMAT, value);
+        // Only use up to 4 chars and fall back to a generic "L" to keep it short.
+        int written_chars = os::snprintf_checked(buffer, sizeof(buffer), JLONG_FORMAT, value);
+        if (written_chars <= 4) {
           print_prop(short_name, buffer);
         } else {
           print_prop(short_name, "L");
@@ -676,11 +672,17 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
       } else if (t->base() == Type::Return_Address) {
         print_prop(short_name, "RA");
       } else if (t->base() == Type::AnyPtr) {
-        print_prop(short_name, "P");
+        if (t->is_ptr()->ptr() == TypePtr::Null) {
+          print_prop(short_name, "Null");
+        } else {
+          print_prop(short_name, "P");
+        }
       } else if (t->base() == Type::RawPtr) {
         print_prop(short_name, "RP");
       } else if (t->base() == Type::AryPtr) {
         print_prop(short_name, "AP");
+      } else if (t->base() == Type::NarrowOop && t->is_narrowoop() == TypeNarrowOop::NULL_PTR) {
+        print_prop(short_name, "Null");
       }
     }
 

From 3dbd2d3d2d554ce5a8561f1c0fa67fb176d1273d Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 26 May 2025 07:40:51 +0000
Subject: [PATCH 634/901] 8347570: Configure fails on macOS if directory name
 do not have correct case

Reviewed-by: erikj
---
 make/autoconf/basic.m4 | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 0e9470a1cff..2d3e071dd52 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -415,11 +415,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
       [ CONF_NAME=${with_conf_name} ])
 
   # Test from where we are running configure, in or outside of src root.
+  if test "x$OPENJDK_BUILD_OS" = xwindows || test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
+    # These systems have case insensitive paths, so convert them to lower case.
+    [ cmp_configure_start_dir=`$ECHO $CONFIGURE_START_DIR | $TR '[:upper:]' '[:lower:]'` ]
+    [ cmp_topdir=`$ECHO $TOPDIR | $TR '[:upper:]' '[:lower:]'` ]
+    [ cmp_custom_root=`$ECHO $CUSTOM_ROOT | $TR '[:upper:]' '[:lower:]'` ]
+  else
+    cmp_configure_start_dir="$CONFIGURE_START_DIR"
+    cmp_topdir="$TOPDIR"
+    cmp_custom_root="$CUSTOM_ROOT"
+  fi
   AC_MSG_CHECKING([where to store configuration])
-  if test "x$CONFIGURE_START_DIR" = "x$TOPDIR" \
-      || test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \
-      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \
-      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make" ; then
+  if test "x$cmp_configure_start_dir" = "x$cmp_topdir" \
+      || test "x$cmp_configure_start_dir" = "x$cmp_custom_root" \
+      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make/autoconf" \
+      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
@@ -440,7 +450,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     # If configuration is situated in normal build directory, just use the build
     # directory name as configuration name, otherwise use the complete path.
     if test "x${CONF_NAME}" = x; then
-      CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"`
+      [ if [[ "$cmp_configure_start_dir" =~ ^${cmp_topdir}/build/[^/]+$ ||
+          "$cmp_configure_start_dir" =~ ^${cmp_custom_root}/build/[^/]+$ ]]; then ]
+          CONF_NAME="${CONFIGURE_START_DIR##*/}"
+      else
+          CONF_NAME="$CONFIGURE_START_DIR"
+      fi
     fi
     OUTPUTDIR="$CONFIGURE_START_DIR"
     AC_MSG_RESULT([in current directory])

From a37e8265b53b35c0b7f3ce9f4df9b2efcde322be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Mon, 26 May 2025 07:51:23 +0000
Subject: [PATCH 635/901] 8357649: IGV: add block index to the supplemental
 node properties
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, chagedorn
---
 src/hotspot/share/opto/idealGraphPrinter.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index fe379c0c3c8..3721394c112 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -474,6 +474,10 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
         // Enforce dots as decimal separators, as required by IGV.
         StringUtils::replace_no_expand(buffer, ",", ".");
         print_prop("frequency", buffer);
+        // Print block index for nodes that are placed in blocks and scheduled locally.
+        if (block->contains(node)) {
+          print_prop("block_index", block->find_node(node));
+        }
       }
     }
 

From 5cdeef81ddb4ff1a6160b112f0f8338514d7b0a7 Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Mon, 26 May 2025 08:25:46 +0000
Subject: [PATCH 636/901] 8331859: [PPC64] Remove support for Power7 and older

Reviewed-by: mdoerr
---
 make/autoconf/flags-cflags.m4                 |   3 +-
 src/hotspot/cpu/ppc/assembler_ppc.hpp         |   4 +-
 src/hotspot/cpu/ppc/assembler_ppc.inline.hpp  |  45 +-
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |  89 +-
 src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp   |  90 +-
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp |   9 +-
 src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp    |  14 +-
 .../shenandoahBarrierSetAssembler_ppc.cpp     |   9 +-
 src/hotspot/cpu/ppc/globals_ppc.hpp           |   2 +-
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |  14 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    | 199 +---
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp    |  30 +-
 .../cpu/ppc/macroAssembler_ppc.inline.hpp     |  22 +-
 src/hotspot/cpu/ppc/matcher_ppc.hpp           |   5 +-
 src/hotspot/cpu/ppc/ppc.ad                    | 935 ++----------------
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     | 243 +----
 src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp   |  44 +-
 .../ppc/templateInterpreterGenerator_ppc.cpp  |   4 +-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |  28 +-
 src/hotspot/cpu/ppc/vm_version_ppc.cpp        | 110 +--
 src/hotspot/cpu/ppc/vm_version_ppc.hpp        |  18 -
 src/hotspot/os/aix/os_aix.cpp                 |  33 -
 .../os_cpu/linux_ppc/atomic_linux_ppc.hpp     |  43 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   2 +-
 src/hotspot/share/runtime/sharedRuntime.hpp   |   2 +-
 25 files changed, 266 insertions(+), 1731 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index eb0e5e20e4c..e80d9a98957 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -732,8 +732,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_CFLAGS_CPU_JVM="-mno-multiple -mno-string"
       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="-mcpu=powerpc64 -mtune=power5"
+        $1_CFLAGS_CPU="-mcpu=power8 -mtune=power8"
         $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index 0b17854a58b..491bd107819 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -2008,7 +2008,7 @@ class Assembler : public AbstractAssembler {
 
   // Wait instructions for polling. Attention: May result in SIGILL.
   inline void wait();
-  inline void waitrsv(); // >=Power7
+  inline void waitrsv();
 
   // atomics
   inline void lbarx_unchecked(Register d, Register a, Register b, int eh1 = 0); // >=Power 8
@@ -2016,7 +2016,6 @@ class Assembler : public AbstractAssembler {
   inline void lwarx_unchecked(Register d, Register a, Register b, int eh1 = 0);
   inline void ldarx_unchecked(Register d, Register a, Register b, int eh1 = 0);
   inline void lqarx_unchecked(Register d, Register a, Register b, int eh1 = 0); // >=Power 8
-  inline bool lxarx_hint_exclusive_access();
   inline void lbarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
   inline void lharx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
   inline void lwarx(  Register d, Register a, Register b, bool hint_exclusive_access = false);
@@ -2039,7 +2038,6 @@ class Assembler : public AbstractAssembler {
   inline void smt_prio_low();
   inline void smt_prio_medium_low();
   inline void smt_prio_medium();
-  // >= Power7
   inline void smt_yield();
   inline void smt_mdoio();
   inline void smt_mdoom();
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index a9ac76a76db..176994cf92c 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -208,8 +208,7 @@ inline void Assembler::cmpldi(ConditionRegister crx, Register a, int ui16)   { A
 inline void Assembler::cmplw( ConditionRegister crx, Register a, Register b) { Assembler::cmpl( crx, 0, a, b); }
 inline void Assembler::cmpld( ConditionRegister crx, Register a, Register b) { Assembler::cmpl( crx, 1, a, b); }
 
-inline void Assembler::isel(Register d, Register a, Register b, int c) { guarantee(VM_Version::has_isel(), "opcode not supported on this hardware");
-                                                                         emit_int32(ISEL_OPCODE    | rt(d)  | ra(a) | rb(b) | bc(c)); }
+inline void Assembler::isel(Register d, Register a, Register b, int c) { emit_int32(ISEL_OPCODE    | rt(d)  | ra(a) | rb(b) | bc(c)); }
 
 // PPC 1, section 3.3.11, Fixed-Point Logical Instructions
 inline void Assembler::andi_(   Register a, Register s, int ui16)      { emit_int32(ANDI_OPCODE    | rta(a) | rs(s) | uimm(ui16, 16)); }
@@ -701,12 +700,11 @@ inline void Assembler::lharx_unchecked(Register d, Register a, Register b, int e
 inline void Assembler::lwarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LWARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline void Assembler::ldarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LDARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
 inline void Assembler::lqarx_unchecked(Register d, Register a, Register b, int eh1)           { emit_int32( LQARX_OPCODE | rt(d) | ra0mem(a) | rb(b) | eh(eh1)); }
-inline bool Assembler::lxarx_hint_exclusive_access()                                          { return VM_Version::has_lxarxeh(); }
-inline void Assembler::lbarx( Register d, Register a, Register b, bool hint_exclusive_access) { lbarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lharx( Register d, Register a, Register b, bool hint_exclusive_access) { lharx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lwarx( Register d, Register a, Register b, bool hint_exclusive_access) { lwarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::ldarx( Register d, Register a, Register b, bool hint_exclusive_access) { ldarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lqarx( Register d, Register a, Register b, bool hint_exclusive_access) { lqarx_unchecked(d, a, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lbarx( Register d, Register a, Register b, bool hint_exclusive_access) { lbarx_unchecked(d, a, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lharx( Register d, Register a, Register b, bool hint_exclusive_access) { lharx_unchecked(d, a, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lwarx( Register d, Register a, Register b, bool hint_exclusive_access) { lwarx_unchecked(d, a, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::ldarx( Register d, Register a, Register b, bool hint_exclusive_access) { ldarx_unchecked(d, a, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lqarx( Register d, Register a, Register b, bool hint_exclusive_access) { lqarx_unchecked(d, a, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::stbcx_(Register s, Register a, Register b)                             { emit_int32( STBCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
 inline void Assembler::sthcx_(Register s, Register a, Register b)                             { emit_int32( STHCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
 inline void Assembler::stwcx_(Register s, Register a, Register b)                             { emit_int32( STWCX_OPCODE | rs(s) | ra0mem(a) | rb(b) | rc(1)); }
@@ -775,12 +773,9 @@ inline void Assembler::frim( FloatRegister d, FloatRegister b) { emit_int32( FRI
 //inline void Assembler::mffgpr( FloatRegister d, Register b)   { emit_int32( MFFGPR_OPCODE | frt(d) | rb(b) | rc(0)); }
 //inline void Assembler::mftgpr( Register d, FloatRegister b)   { emit_int32( MFTGPR_OPCODE | rt(d) | frb(b) | rc(0)); }
 // add cmpb and popcntb to detect ppc power version.
-inline void Assembler::cmpb(   Register a, Register s, Register b) { guarantee(VM_Version::has_cmpb(), "opcode not supported on this hardware");
-                                                                     emit_int32( CMPB_OPCODE    | rta(a) | rs(s) | rb(b) | rc(0)); }
-inline void Assembler::popcntb(Register a, Register s)             { guarantee(VM_Version::has_popcntb(), "opcode not supported on this hardware");
-                                                                     emit_int32( POPCNTB_OPCODE | rta(a) | rs(s)); };
-inline void Assembler::popcntw(Register a, Register s)             { guarantee(VM_Version::has_popcntw(), "opcode not supported on this hardware");
-                                                                     emit_int32( POPCNTW_OPCODE | rta(a) | rs(s)); };
+inline void Assembler::cmpb(   Register a, Register s, Register b) { emit_int32( CMPB_OPCODE    | rta(a) | rs(s) | rb(b) | rc(0)); }
+inline void Assembler::popcntb(Register a, Register s)             { emit_int32( POPCNTB_OPCODE | rta(a) | rs(s)); };
+inline void Assembler::popcntw(Register a, Register s)             { emit_int32( POPCNTW_OPCODE | rta(a) | rs(s)); };
 inline void Assembler::popcntd(Register a, Register s)             { emit_int32( POPCNTD_OPCODE | rta(a) | rs(s)); };
 
 inline void Assembler::fneg(  FloatRegister d, FloatRegister b) { emit_int32( FNEG_OPCODE  | frt(d) | frb(b) | rc(0)); }
@@ -835,17 +830,14 @@ inline void Assembler::fctidz(FloatRegister d, FloatRegister b) { emit_int32( FC
 inline void Assembler::fctiw( FloatRegister d, FloatRegister b) { emit_int32( FCTIW_OPCODE  | frt(d) | frb(b) | rc(0)); }
 inline void Assembler::fctiwz(FloatRegister d, FloatRegister b) { emit_int32( FCTIWZ_OPCODE | frt(d) | frb(b) | rc(0)); }
 inline void Assembler::fcfid( FloatRegister d, FloatRegister b) { emit_int32( FCFID_OPCODE  | frt(d) | frb(b) | rc(0)); }
-inline void Assembler::fcfids(FloatRegister d, FloatRegister b) { guarantee(VM_Version::has_fcfids(), "opcode not supported on this hardware");
-                                                                  emit_int32( FCFIDS_OPCODE | frt(d) | frb(b) | rc(0)); }
+inline void Assembler::fcfids(FloatRegister d, FloatRegister b) { emit_int32( FCFIDS_OPCODE | frt(d) | frb(b) | rc(0)); }
 
 // PPC 1, section 4.6.7 Floating-Point Compare Instructions
 inline void Assembler::fcmpu( ConditionRegister crx, FloatRegister a, FloatRegister b) { emit_int32( FCMPU_OPCODE | bf(crx) | fra(a) | frb(b)); }
 
 // PPC 1, section 5.2.1 Floating-Point Arithmetic Instructions
-inline void Assembler::fsqrt( FloatRegister d, FloatRegister b) { guarantee(VM_Version::has_fsqrt(), "opcode not supported on this hardware");
-                                                                  emit_int32( FSQRT_OPCODE  | frt(d) | frb(b) | rc(0)); }
-inline void Assembler::fsqrts(FloatRegister d, FloatRegister b) { guarantee(VM_Version::has_fsqrts(), "opcode not supported on this hardware");
-                                                                  emit_int32( FSQRTS_OPCODE | frt(d) | frb(b) | rc(0)); }
+inline void Assembler::fsqrt( FloatRegister d, FloatRegister b) { emit_int32( FSQRT_OPCODE  | frt(d) | frb(b) | rc(0)); }
+inline void Assembler::fsqrts(FloatRegister d, FloatRegister b) { emit_int32( FSQRTS_OPCODE | frt(d) | frb(b) | rc(0)); }
 
 // Vector instructions for >= Power6.
 inline void Assembler::lvebx( VectorRegister d, Register s1, Register s2) { emit_int32( LVEBX_OPCODE  | vrt(d) | ra0mem(s1) | rb(s2)); }
@@ -1057,8 +1049,7 @@ inline void Assembler::vcmpgtsw_(VectorRegister d,VectorRegister a, VectorRegist
 inline void Assembler::vcmpgtub_(VectorRegister d,VectorRegister a, VectorRegister b) { emit_int32( VCMPGTUB_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(1)); }
 inline void Assembler::vcmpgtuh_(VectorRegister d,VectorRegister a, VectorRegister b) { emit_int32( VCMPGTUH_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(1)); }
 inline void Assembler::vcmpgtuw_(VectorRegister d,VectorRegister a, VectorRegister b) { emit_int32( VCMPGTUW_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(1)); }
-inline void Assembler::vand(    VectorRegister d, VectorRegister a, VectorRegister b) { guarantee(VM_Version::has_vand(), "opcode not supported on this hardware");
-                                                                                        emit_int32( VAND_OPCODE     | vrt(d) | vra(a) | vrb(b)); }
+inline void Assembler::vand(    VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VAND_OPCODE     | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vandc(   VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VANDC_OPCODE    | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vnor(    VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VNOR_OPCODE     | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vor(     VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VOR_OPCODE      | vrt(d) | vra(a) | vrb(b)); }
@@ -1166,11 +1157,11 @@ inline void Assembler::lharx_unchecked(Register d, Register b, int eh1)
 inline void Assembler::lwarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LWARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
 inline void Assembler::ldarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LDARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
 inline void Assembler::lqarx_unchecked(Register d, Register b, int eh1)          { emit_int32( LQARX_OPCODE | rt(d) | rb(b) | eh(eh1)); }
-inline void Assembler::lbarx( Register d, Register b, bool hint_exclusive_access){ lbarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lharx( Register d, Register b, bool hint_exclusive_access){ lharx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lwarx( Register d, Register b, bool hint_exclusive_access){ lwarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::ldarx( Register d, Register b, bool hint_exclusive_access){ ldarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
-inline void Assembler::lqarx( Register d, Register b, bool hint_exclusive_access){ lqarx_unchecked(d, b, (hint_exclusive_access && lxarx_hint_exclusive_access() && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lbarx( Register d, Register b, bool hint_exclusive_access){ lbarx_unchecked(d, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lharx( Register d, Register b, bool hint_exclusive_access){ lharx_unchecked(d, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lwarx( Register d, Register b, bool hint_exclusive_access){ lwarx_unchecked(d, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::ldarx( Register d, Register b, bool hint_exclusive_access){ ldarx_unchecked(d, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
+inline void Assembler::lqarx( Register d, Register b, bool hint_exclusive_access){ lqarx_unchecked(d, b, (hint_exclusive_access && UseExtendedLoadAndReserveInstructionsPPC64) ? 1 : 0); }
 inline void Assembler::stbcx_(Register s, Register b)                            { emit_int32( STBCX_OPCODE | rs(s) | rb(b) | rc(1)); }
 inline void Assembler::sthcx_(Register s, Register b)                            { emit_int32( STHCX_OPCODE | rs(s) | rb(b) | rc(1)); }
 inline void Assembler::stwcx_(Register s, Register b)                            { emit_int32( STWCX_OPCODE | rs(s) | rb(b) | rc(1)); }
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index c678f409c49..7dfde40364e 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -538,48 +538,32 @@ void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
       __ extsh(dst->as_register(), src->as_register());
       break;
     }
-    case Bytecodes::_i2d:
+    case Bytecodes::_i2d:{
+      FloatRegister rdst = dst->as_double_reg();
+      // move src to dst register
+      __ mtfprwa(rdst, src->as_register());
+      __ fcfid(rdst, rdst);
+      break;
+    }
     case Bytecodes::_l2d: {
-      bool src_in_memory = !VM_Version::has_mtfprd();
       FloatRegister rdst = dst->as_double_reg();
-      FloatRegister rsrc;
-      if (src_in_memory) {
-        rsrc = src->as_double_reg(); // via mem
-      } else {
-        // move src to dst register
-        if (code == Bytecodes::_i2d) {
-          __ mtfprwa(rdst, src->as_register());
-        } else {
-          __ mtfprd(rdst, src->as_register_lo());
-        }
-        rsrc = rdst;
-      }
-      __ fcfid(rdst, rsrc);
+      // move src to dst register
+      __ mtfprd(rdst, src->as_register_lo());
+      __ fcfid(rdst, rdst);
+      break;
+    }
+    case Bytecodes::_i2f:{
+      FloatRegister rdst = dst->as_float_reg();
+      // move src to dst register
+      __ mtfprwa(rdst, src->as_register());
+      __ fcfids(rdst, rdst);
       break;
     }
-    case Bytecodes::_i2f:
     case Bytecodes::_l2f: {
-      bool src_in_memory = !VM_Version::has_mtfprd();
       FloatRegister rdst = dst->as_float_reg();
-      FloatRegister rsrc;
-      if (src_in_memory) {
-        rsrc = src->as_double_reg(); // via mem
-      } else {
-        // move src to dst register
-        if (code == Bytecodes::_i2f) {
-          __ mtfprwa(rdst, src->as_register());
-        } else {
-          __ mtfprd(rdst, src->as_register_lo());
-        }
-        rsrc = rdst;
-      }
-      if (VM_Version::has_fcfids()) {
-        __ fcfids(rdst, rsrc);
-      } else {
-        assert(code == Bytecodes::_i2f, "fcfid+frsp needs fixup code to avoid rounding incompatibility");
-        __ fcfid(rdst, rsrc);
-        __ frsp(rdst, rdst);
-      }
+      // move src to dst register
+      __ mtfprd(rdst, src->as_register_lo());
+      __ fcfids(rdst, rdst);
       break;
     }
     case Bytecodes::_f2d: {
@@ -592,49 +576,27 @@ void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
     }
     case Bytecodes::_d2i:
     case Bytecodes::_f2i: {
-      bool dst_in_memory = !VM_Version::has_mtfprd();
       FloatRegister rsrc = (code == Bytecodes::_d2i) ? src->as_double_reg() : src->as_float_reg();
-      Address       addr = dst_in_memory ? frame_map()->address_for_slot(dst->double_stack_ix()) : Address();
       Label L;
       // Result must be 0 if value is NaN; test by comparing value to itself.
       __ fcmpu(CR0, rsrc, rsrc);
-      if (dst_in_memory) {
-        __ li(R0, 0); // 0 in case of NAN
-        __ std(R0, addr);
-      } else {
-        __ li(dst->as_register(), 0);
-      }
+      __ li(dst->as_register(), 0);
       __ bso(CR0, L);
       __ fctiwz(rsrc, rsrc); // USE_KILL
-      if (dst_in_memory) {
-        __ stfd(rsrc, addr.disp(), addr.base());
-      } else {
-        __ mffprd(dst->as_register(), rsrc);
-      }
+      __ mffprd(dst->as_register(), rsrc);
       __ bind(L);
       break;
     }
     case Bytecodes::_d2l:
     case Bytecodes::_f2l: {
-      bool dst_in_memory = !VM_Version::has_mtfprd();
       FloatRegister rsrc = (code == Bytecodes::_d2l) ? src->as_double_reg() : src->as_float_reg();
-      Address       addr = dst_in_memory ? frame_map()->address_for_slot(dst->double_stack_ix()) : Address();
       Label L;
       // Result must be 0 if value is NaN; test by comparing value to itself.
       __ fcmpu(CR0, rsrc, rsrc);
-      if (dst_in_memory) {
-        __ li(R0, 0); // 0 in case of NAN
-        __ std(R0, addr);
-      } else {
-        __ li(dst->as_register_lo(), 0);
-      }
+      __ li(dst->as_register_lo(), 0);
       __ bso(CR0, L);
       __ fctidz(rsrc, rsrc); // USE_KILL
-      if (dst_in_memory) {
-        __ stfd(rsrc, addr.disp(), addr.base());
-      } else {
-        __ mffprd(dst->as_register_lo(), rsrc);
-      }
+      __ mffprd(dst->as_register_lo(), rsrc);
       __ bind(L);
       break;
     }
@@ -1581,8 +1543,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
     default:                    ShouldNotReachHere();
   }
 
-  // Try to use isel on >=Power7.
-  if (VM_Version::has_isel() && result->is_cpu_register()) {
+  if (result->is_cpu_register()) {
     bool o1_is_reg = opr1->is_cpu_register(), o2_is_reg = opr2->is_cpu_register();
     const Register result_reg = result->is_single_cpu() ? result->as_register() : result->as_register_lo();
 
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
index b9c8ced8ef1..815e5c83a1b 100644
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -714,14 +714,12 @@ void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
     }
     case vmIntrinsics::_dsqrt:
     case vmIntrinsics::_dsqrt_strict: {
-      if (VM_Version::has_fsqrt()) {
-        assert(x->number_of_arguments() == 1, "wrong type");
-        LIRItem value(x->argument_at(0), this);
-        value.load_item();
-        LIR_Opr dst = rlock_result(x);
-        __ sqrt(value.result(), dst, LIR_OprFact::illegalOpr);
-        break;
-      } // else fallthru
+      assert(x->number_of_arguments() == 1, "wrong type");
+      LIRItem value(x->argument_at(0), this);
+      value.load_item();
+      LIR_Opr dst = rlock_result(x);
+      __ sqrt(value.result(), dst, LIR_OprFact::illegalOpr);
+      break;
     }
     case vmIntrinsics::_dsin:   // fall through
     case vmIntrinsics::_dcos:   // fall through
@@ -733,10 +731,6 @@ void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
 
       address runtime_entry = nullptr;
       switch (x->id()) {
-        case vmIntrinsics::_dsqrt:
-        case vmIntrinsics::_dsqrt_strict:
-          runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt);
-          break;
         case vmIntrinsics::_dsin:
           runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
           break;
@@ -819,78 +813,6 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
 // _i2l, _i2f, _i2d, _l2i, _l2f, _l2d, _f2i, _f2l, _f2d, _d2i, _d2l, _d2f
 // _i2b, _i2c, _i2s
 void LIRGenerator::do_Convert(Convert* x) {
-  if (!VM_Version::has_mtfprd()) {
-    switch (x->op()) {
-
-      // int -> float: force spill
-      case Bytecodes::_l2f: {
-        if (!VM_Version::has_fcfids()) { // fcfids is >= Power7 only
-          // fcfid+frsp needs fixup code to avoid rounding incompatibility.
-          address entry = CAST_FROM_FN_PTR(address, SharedRuntime::l2f);
-          LIR_Opr result = call_runtime(x->value(), entry, x->type(), nullptr);
-          set_result(x, result);
-          return;
-        } // else fallthru
-      }
-      case Bytecodes::_l2d: {
-        LIRItem value(x->value(), this);
-        LIR_Opr reg = rlock_result(x);
-        value.load_item();
-        LIR_Opr tmp = force_to_spill(value.result(), T_DOUBLE);
-        __ convert(x->op(), tmp, reg);
-        return;
-      }
-      case Bytecodes::_i2f:
-      case Bytecodes::_i2d: {
-        LIRItem value(x->value(), this);
-        LIR_Opr reg = rlock_result(x);
-        value.load_item();
-        // Convert i2l first.
-        LIR_Opr tmp1 = new_register(T_LONG);
-        __ convert(Bytecodes::_i2l, value.result(), tmp1);
-        LIR_Opr tmp2 = force_to_spill(tmp1, T_DOUBLE);
-        __ convert(x->op(), tmp2, reg);
-        return;
-      }
-
-      // float -> int: result will be stored
-      case Bytecodes::_f2l:
-      case Bytecodes::_d2l: {
-        LIRItem value(x->value(), this);
-        LIR_Opr reg = rlock_result(x);
-        value.set_destroys_register(); // USE_KILL
-        value.load_item();
-        set_vreg_flag(reg, must_start_in_memory);
-        __ convert(x->op(), value.result(), reg);
-        return;
-      }
-      case Bytecodes::_f2i:
-      case Bytecodes::_d2i: {
-        LIRItem value(x->value(), this);
-        LIR_Opr reg = rlock_result(x);
-        value.set_destroys_register(); // USE_KILL
-        value.load_item();
-        // Convert l2i afterwards.
-        LIR_Opr tmp1 = new_register(T_LONG);
-        set_vreg_flag(tmp1, must_start_in_memory);
-        __ convert(x->op(), value.result(), tmp1);
-        __ convert(Bytecodes::_l2i, tmp1, reg);
-        return;
-      }
-
-      // Within same category: just register conversions.
-      case Bytecodes::_i2b:
-      case Bytecodes::_i2c:
-      case Bytecodes::_i2s:
-      case Bytecodes::_i2l:
-      case Bytecodes::_l2i:
-      case Bytecodes::_f2d:
-      case Bytecodes::_d2f:
-        break;
-
-      default: ShouldNotReachHere();
-    }
-  }
 
   // Register conversion.
   LIRItem value(x->value(), this);
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index cddf08eceb1..5e18be552a9 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -234,14 +234,7 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
   // Save diff in case we need it for a tie-breaker.
   subf_(diff, cnt2, cnt1); // diff = cnt1 - cnt2
   // if (diff > 0) { cnt1 = cnt2; }
-  if (VM_Version::has_isel()) {
-    isel(cnt1, CR0, Assembler::greater, /*invert*/ false, cnt2);
-  } else {
-    Label Lskip;
-    blt(CR0, Lskip);
-    mr(cnt1, cnt2);
-    bind(Lskip);
-  }
+  isel(cnt1, CR0, Assembler::greater, /*invert*/ false, cnt2);
 
   // Rename registers
   Register chr1 = result;
diff --git a/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
index 8f5f0ba4955..c74cd3781a2 100644
--- a/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
+++ b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
@@ -112,12 +112,7 @@ static void move_reg64(MacroAssembler* masm, int out_stk_bias,
         __ stw(as_Register(from_reg), -8, R1_SP);
         __ lfs(as_FloatRegister(to_reg), -8, R1_SP); // convert to double precision format
       } else {
-        if (VM_Version::has_mtfprd()) {
-          __ mtfprd(as_FloatRegister(to_reg), as_Register(from_reg));
-        } else {
-          __ std(as_Register(from_reg), -8, R1_SP);
-          __ lfd(as_FloatRegister(to_reg), -8, R1_SP);
-        }
+        __ mtfprd(as_FloatRegister(to_reg), as_Register(from_reg));
       }
       break;
     case StorageType::STACK:
@@ -150,12 +145,7 @@ static void move_float(MacroAssembler* masm, int out_stk_bias,
         __ stfs(as_FloatRegister(from_reg), -8, R1_SP); // convert to single precision format
         __ lwa(as_Register(to_reg), -8, R1_SP);
       } else {
-        if (VM_Version::has_mtfprd()) {
-          __ mffprd(as_Register(to_reg), as_FloatRegister(from_reg));
-        } else {
-          __ stfd(as_FloatRegister(from_reg), -8, R1_SP);
-          __ ld(as_Register(to_reg), -8, R1_SP);
-        }
+        __ mffprd(as_Register(to_reg), as_FloatRegister(from_reg));
       }
       break;
     case StorageType::FLOAT:
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index ec5b98bd4c5..b7156144d8b 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -360,13 +360,8 @@ void ShenandoahBarrierSetAssembler::resolve_forward_pointer_not_null(MacroAssemb
 
   assert(markWord::lock_mask_in_place == markWord::marked_value,
          "marked value must equal the value obtained when all lock bits are being set");
-  if (VM_Version::has_isel()) {
-    __ xori(tmp1, tmp1, markWord::lock_mask_in_place);
-    __ isel(dst, CR0, Assembler::equal, false, tmp1);
-  } else {
-    __ bne(CR0, done);
-    __ xori(dst, tmp1, markWord::lock_mask_in_place);
-  }
+  __ xori(tmp1, tmp1, markWord::lock_mask_in_place);
+  __ isel(dst, CR0, Assembler::equal, false, tmp1);
 
   __ bind(done);
   __ block_comment("} resolve_forward_pointer_not_null (shenandoahgc)");
diff --git a/src/hotspot/cpu/ppc/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp
index 7fefc856a47..597d7e2100a 100644
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp
@@ -115,7 +115,7 @@ define_pd_global(intx, InitArrayShortSize, 9*BytesPerLong);
           "Use static branch prediction hints for uncommon paths.")         \
                                                                             \
   /* special instructions */                                                \
-  product(bool, SuperwordUseVSX, false,                                     \
+  product(bool, SuperwordUseVSX, true,                                      \
           "Use Power8 VSX instructions for superword optimization.")        \
                                                                             \
   product(bool, UseByteReverseInstructions, false, DIAGNOSTIC,              \
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index b51a0739d63..92c7a4fb5f8 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -308,21 +308,11 @@ void InterpreterMacroAssembler::push_2ptrs(Register first, Register second) {
 }
 
 void InterpreterMacroAssembler::move_l_to_d(Register l, FloatRegister d) {
-  if (VM_Version::has_mtfprd()) {
-    mtfprd(d, l);
-  } else {
-    std(l, 0, R15_esp);
-    lfd(d, 0, R15_esp);
-  }
+  mtfprd(d, l);
 }
 
 void InterpreterMacroAssembler::move_d_to_l(FloatRegister d, Register l) {
-  if (VM_Version::has_mtfprd()) {
-    mffprd(l, d);
-  } else {
-    stfd(d, 0, R15_esp);
-    ld(l, 0, R15_esp);
-  }
+  mffprd(l, d);
 }
 
 void InterpreterMacroAssembler::push(TosState state) {
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 19f64a79300..7a58a0b0d5a 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -1552,57 +1552,27 @@ void MacroAssembler::atomic_get_and_modify_generic(Register dest_current_value,
                                                    Register addr_base, Register tmp1, Register tmp2, Register tmp3,
                                                    bool cmpxchgx_hint, bool is_add, int size) {
   // Sub-word instructions are available since Power 8.
-  // For older processors, instruction_type != size holds, and we
-  // emulate the sub-word instructions by constructing a 4-byte value
-  // that leaves the other bytes unchanged.
-  const int instruction_type = VM_Version::has_lqarx() ? size : 4;
 
   Label retry;
   Register shift_amount = noreg,
            val32 = dest_current_value,
            modval = is_add ? tmp1 : exchange_value;
 
-  if (instruction_type != size) {
-    assert_different_registers(tmp1, tmp2, tmp3, dest_current_value, exchange_value, addr_base);
-    modval = tmp1;
-    shift_amount = tmp2;
-    val32 = tmp3;
-    // Need some preparation: Compute shift amount, align address. Note: shorts must be 2 byte aligned.
-#ifdef VM_LITTLE_ENDIAN
-    rldic(shift_amount, addr_base, 3, 64-5); // (dest & 3) * 8;
-    clrrdi(addr_base, addr_base, 2);
-#else
-    xori(shift_amount, addr_base, (size == 1) ? 3 : 2);
-    clrrdi(addr_base, addr_base, 2);
-    rldic(shift_amount, shift_amount, 3, 64-5); // byte: ((3-dest) & 3) * 8; short: ((1-dest/2) & 1) * 16;
-#endif
-  }
 
   // atomic emulation loop
   bind(retry);
 
-  switch (instruction_type) {
+  switch (size) {
     case 4: lwarx(val32, addr_base, cmpxchgx_hint); break;
     case 2: lharx(val32, addr_base, cmpxchgx_hint); break;
     case 1: lbarx(val32, addr_base, cmpxchgx_hint); break;
     default: ShouldNotReachHere();
   }
 
-  if (instruction_type != size) {
-    srw(dest_current_value, val32, shift_amount);
-  }
-
   if (is_add) { add(modval, dest_current_value, exchange_value); }
 
-  if (instruction_type != size) {
-    // Transform exchange value such that the replacement can be done by one xor instruction.
-    xorr(modval, dest_current_value, is_add ? modval : exchange_value);
-    clrldi(modval, modval, (size == 1) ? 56 : 48);
-    slw(modval, modval, shift_amount);
-    xorr(modval, val32, modval);
-  }
 
-  switch (instruction_type) {
+  switch (size) {
     case 4: stwcx_(modval, addr_base); break;
     case 2: sthcx_(modval, addr_base); break;
     case 1: stbcx_(modval, addr_base); break;
@@ -1627,51 +1597,22 @@ void MacroAssembler::atomic_get_and_modify_generic(Register dest_current_value,
 // Only signed types are supported with size < 4.
 void MacroAssembler::cmpxchg_loop_body(ConditionRegister flag, Register dest_current_value,
                                        RegisterOrConstant compare_value, Register exchange_value,
-                                       Register addr_base, Register tmp1, Register tmp2,
-                                       Label &retry, Label &failed, bool cmpxchgx_hint, int size) {
+                                       Register addr_base, Label &retry, Label &failed, bool cmpxchgx_hint, int size) {
   // Sub-word instructions are available since Power 8.
-  // For older processors, instruction_type != size holds, and we
-  // emulate the sub-word instructions by constructing a 4-byte value
-  // that leaves the other bytes unchanged.
-  const int instruction_type = VM_Version::has_lqarx() ? size : 4;
-
   Register shift_amount = noreg,
            val32 = dest_current_value,
            modval = exchange_value;
 
-  if (instruction_type != size) {
-    assert_different_registers(tmp1, tmp2, dest_current_value, compare_value.register_or_noreg(), exchange_value, addr_base);
-    shift_amount = tmp1;
-    val32 = tmp2;
-    modval = tmp2;
-    // Need some preparation: Compute shift amount, align address. Note: shorts must be 2 byte aligned.
-#ifdef VM_LITTLE_ENDIAN
-    rldic(shift_amount, addr_base, 3, 64-5); // (dest & 3) * 8;
-    clrrdi(addr_base, addr_base, 2);
-#else
-    xori(shift_amount, addr_base, (size == 1) ? 3 : 2);
-    clrrdi(addr_base, addr_base, 2);
-    rldic(shift_amount, shift_amount, 3, 64-5); // byte: ((3-dest) & 3) * 8; short: ((1-dest/2) & 1) * 16;
-#endif
-    // Transform exchange value such that the replacement can be done by one xor instruction.
-    xorr(exchange_value, compare_value, exchange_value);
-    clrldi(exchange_value, exchange_value, (size == 1) ? 56 : 48);
-    slw(exchange_value, exchange_value, shift_amount);
-  }
-
   // atomic emulation loop
   bind(retry);
 
-  switch (instruction_type) {
+  switch (size) {
     case 4: lwarx(val32, addr_base, cmpxchgx_hint); break;
     case 2: lharx(val32, addr_base, cmpxchgx_hint); break;
     case 1: lbarx(val32, addr_base, cmpxchgx_hint); break;
     default: ShouldNotReachHere();
   }
 
-  if (instruction_type != size) {
-    srw(dest_current_value, val32, shift_amount);
-  }
   if (size == 1) {
     extsb(dest_current_value, dest_current_value);
   } else if (size == 2) {
@@ -1687,11 +1628,7 @@ void MacroAssembler::cmpxchg_loop_body(ConditionRegister flag, Register dest_cur
   // branch to done  => (flag == ne), (dest_current_value != compare_value)
   // fall through    => (flag == eq), (dest_current_value == compare_value)
 
-  if (instruction_type != size) {
-    xorr(modval, val32, exchange_value);
-  }
-
-  switch (instruction_type) {
+  switch (size) {
     case 4: stwcx_(modval, addr_base); break;
     case 2: sthcx_(modval, addr_base); break;
     case 1: stbcx_(modval, addr_base); break;
@@ -1702,8 +1639,7 @@ void MacroAssembler::cmpxchg_loop_body(ConditionRegister flag, Register dest_cur
 // CmpxchgX sets condition register to cmpX(current, compare).
 void MacroAssembler::cmpxchg_generic(ConditionRegister flag, Register dest_current_value,
                                      RegisterOrConstant compare_value, Register exchange_value,
-                                     Register addr_base, Register tmp1, Register tmp2,
-                                     int semantics, bool cmpxchgx_hint, Register int_flag_success,
+                                     Register addr_base, int semantics, bool cmpxchgx_hint, Register int_flag_success,
                                      Label* failed_ext, bool contention_hint, bool weak, int size) {
   Label retry;
   Label failed_int;
@@ -1714,8 +1650,7 @@ void MacroAssembler::cmpxchg_generic(ConditionRegister flag, Register dest_curre
   // result register is different from the other ones.
   bool use_result_reg    = (int_flag_success != noreg);
   bool preset_result_reg = (int_flag_success != dest_current_value && int_flag_success != compare_value.register_or_noreg() &&
-                            int_flag_success != exchange_value && int_flag_success != addr_base &&
-                            int_flag_success != tmp1 && int_flag_success != tmp2);
+                            int_flag_success != exchange_value && int_flag_success != addr_base);
   assert(!weak || flag == CR0, "weak only supported with CR0");
   assert(int_flag_success == noreg || failed_ext == nullptr, "cannot have both");
   assert(size == 1 || size == 2 || size == 4, "unsupported");
@@ -1741,7 +1676,7 @@ void MacroAssembler::cmpxchg_generic(ConditionRegister flag, Register dest_curre
     release();
   }
 
-  cmpxchg_loop_body(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
+  cmpxchg_loop_body(flag, dest_current_value, compare_value, exchange_value, addr_base,
                     retry, failed, cmpxchgx_hint, size);
   if (!weak || use_result_reg || failed_ext) {
     if (UseStaticBranchPredictionInCompareAndSwapPPC64) {
@@ -3717,7 +3652,6 @@ void MacroAssembler::load_reverse_32(Register dst, Register src) {
 // Due to register shortage, setting tc3 may overwrite table. With the return offset
 // at hand, the original table address can be easily reconstructed.
 int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2, Register tc3) {
-  assert(!VM_Version::has_vpmsumb(), "Vector version should be used instead!");
 
   // Point to 4 byte folding tables (byte-reversed version for Big Endian)
   // Layout: See StubRoutines::ppc::generate_crc_constants.
@@ -3850,103 +3784,6 @@ void MacroAssembler::update_1word_crc32(Register crc, Register buf, Register tab
   xorr(crc, t0, t2);  // Now crc contains the final checksum value.
 }
 
-/**
- * @param crc   register containing existing CRC (32-bit)
- * @param buf   register pointing to input byte buffer (byte*)
- * @param len   register containing number of bytes
- * @param table register pointing to CRC table
- *
- * uses R9..R12 as work register. Must be saved/restored by caller!
- */
-void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
-                                        Register t0,  Register t1,  Register t2,  Register t3,
-                                        Register tc0, Register tc1, Register tc2, Register tc3,
-                                        bool invertCRC) {
-  assert_different_registers(crc, buf, len, table);
-
-  Label L_mainLoop, L_tail;
-  Register  tmp          = t0;
-  Register  data         = t0;
-  Register  tmp2         = t1;
-  const int mainLoop_stepping  = 4;
-  const int tailLoop_stepping  = 1;
-  const int log_stepping       = exact_log2(mainLoop_stepping);
-  const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
-  const int complexThreshold   = 2*mainLoop_stepping;
-
-  // Don't test for len <= 0 here. This pathological case should not occur anyway.
-  // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles
-  // for all well-behaved cases. The situation itself is detected and handled correctly
-  // within update_byteLoop_crc32.
-  assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
-
-  BLOCK_COMMENT("kernel_crc32_1word {");
-
-  if (invertCRC) {
-    nand(crc, crc, crc);                      // 1s complement of crc
-  }
-
-  // Check for short (<mainLoop_stepping) buffer.
-  cmpdi(CR0, len, complexThreshold);
-  blt(CR0, L_tail);
-
-  // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
-  // We leave the code in for reference. Maybe we need alignment when we exploit vector instructions.
-  {
-    // Align buf addr to mainLoop_stepping boundary.
-    neg(tmp2, buf);                              // Calculate # preLoop iterations for alignment.
-    rldicl(tmp2, tmp2, 0, 64-log_stepping);      // Rotate tmp2 0 bits, insert into tmp2, anding with mask with 1s from 62..63.
-
-    if (complexThreshold > mainLoop_stepping) {
-      sub(len, len, tmp2);                       // Remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
-    } else {
-      sub(tmp, len, tmp2);                       // Remaining bytes for main loop.
-      cmpdi(CR0, tmp, mainLoop_stepping);
-      blt(CR0, L_tail);                         // For less than one mainloop_stepping left, do only tail processing
-      mr(len, tmp);                              // remaining bytes for main loop (>=mainLoop_stepping is guaranteed).
-    }
-    update_byteLoop_crc32(crc, buf, tmp2, table, data, false);
-  }
-
-  srdi(tmp2, len, log_stepping);                 // #iterations for mainLoop
-  andi(len, len, mainLoop_stepping-1);           // remaining bytes for tailLoop
-  mtctr(tmp2);
-
-#ifdef VM_LITTLE_ENDIAN
-  Register crc_rv = crc;
-#else
-  Register crc_rv = tmp;                         // Load_reverse needs separate registers to work on.
-                                                 // Occupies tmp, but frees up crc.
-  load_reverse_32(crc_rv, crc);                  // Revert byte order because we are dealing with big-endian data.
-  tmp = crc;
-#endif
-
-  int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
-
-  align(mainLoop_alignment);                     // Octoword-aligned loop address. Shows 2% improvement.
-  BIND(L_mainLoop);
-    update_1word_crc32(crc_rv, buf, table, 0, mainLoop_stepping, crc_rv, t1, t2, t3, tc0, tc1, tc2, tc3);
-    bdnz(L_mainLoop);
-
-#ifndef VM_LITTLE_ENDIAN
-  load_reverse_32(crc, crc_rv);                  // Revert byte order because we are dealing with big-endian data.
-  tmp = crc_rv;                                  // Tmp uses it's original register again.
-#endif
-
-  // Restore original table address for tailLoop.
-  if (reconstructTableOffset != 0) {
-    addi(table, table, -reconstructTableOffset);
-  }
-
-  // Process last few (<complexThreshold) bytes of buffer.
-  BIND(L_tail);
-  update_byteLoop_crc32(crc, buf, len, table, data, false);
-
-  if (invertCRC) {
-    nand(crc, crc, crc);                      // 1s complement of crc
-  }
-  BLOCK_COMMENT("} kernel_crc32_1word");
-}
 
 /**
  * @param crc             register containing existing CRC (32-bit)
@@ -4061,11 +3898,9 @@ void MacroAssembler::kernel_crc32_vpmsum_aligned(Register crc, Register buf, Reg
   // We have at least 1 iteration (ensured by caller).
   Label L_outer_loop, L_inner_loop, L_last;
 
-  // If supported set DSCR pre-fetch to deepest.
-  if (VM_Version::has_mfdscr()) {
-    load_const_optimized(t0, VM_Version::_dscr_val | 7);
-    mtdscr(t0);
-  }
+  // Set DSCR pre-fetch to deepest.
+  load_const_optimized(t0, VM_Version::_dscr_val | 7);
+  mtdscr(t0);
 
   mtvrwz(VCRC, crc); // crc lives in VCRC, now
 
@@ -4209,10 +4044,8 @@ void MacroAssembler::kernel_crc32_vpmsum_aligned(Register crc, Register buf, Reg
   // ********** Main loop end **********
 
   // Restore DSCR pre-fetch value.
-  if (VM_Version::has_mfdscr()) {
-    load_const_optimized(t0, VM_Version::_dscr_val);
-    mtdscr(t0);
-  }
+  load_const_optimized(t0, VM_Version::_dscr_val);
+  mtdscr(t0);
 
   // ********** Simple loop for remaining 16 byte blocks **********
   {
@@ -4284,11 +4117,7 @@ void MacroAssembler::crc32(Register crc, Register buf, Register len, Register t0
   load_const_optimized(t0, is_crc32c ? StubRoutines::crc32c_table_addr()
                                      : StubRoutines::crc_table_addr()   , R0);
 
-  if (VM_Version::has_vpmsumb()) {
-    kernel_crc32_vpmsum(crc, buf, len, t0, t1, t2, t3, t4, t5, t6, t7, !is_crc32c);
-  } else {
-    kernel_crc32_1word(crc, buf, len, t0, t1, t2, t3, t4, t5, t6, t7, t0, !is_crc32c);
-  }
+  kernel_crc32_vpmsum(crc, buf, len, t0, t1, t2, t3, t4, t5, t6, t7, !is_crc32c);
 }
 
 void MacroAssembler::kernel_crc32_singleByteReg(Register crc, Register val, Register table, bool invertCRC) {
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 3528dbb5591..3008277034d 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -501,12 +501,10 @@ class MacroAssembler: public Assembler {
                                      bool cmpxchgx_hint, bool is_add, int size);
   void cmpxchg_loop_body(ConditionRegister flag, Register dest_current_value,
                          RegisterOrConstant compare_value, Register exchange_value,
-                         Register addr_base, Register tmp1, Register tmp2,
-                         Label &retry, Label &failed, bool cmpxchgx_hint, int size);
+                         Register addr_base,Label &retry, Label &failed, bool cmpxchgx_hint, int size);
   void cmpxchg_generic(ConditionRegister flag, Register dest_current_value,
                        RegisterOrConstant compare_value, Register exchange_value,
-                       Register addr_base, Register tmp1, Register tmp2,
-                       int semantics, bool cmpxchgx_hint, Register int_flag_success,
+                       Register addr_base, int semantics, bool cmpxchgx_hint, Register int_flag_success,
                        Label* failed_ext, bool contention_hint, bool weak, int size);
  public:
   // Temps and addr_base are killed if processor does not support Power 8 instructions.
@@ -549,20 +547,20 @@ class MacroAssembler: public Assembler {
   // compare_value must be at least 32 bit sign extended. Result will be sign extended.
   void cmpxchgb(ConditionRegister flag, Register dest_current_value,
                 RegisterOrConstant compare_value, Register exchange_value,
-                Register addr_base, Register tmp1, Register tmp2,
-                int semantics, bool cmpxchgx_hint = false, Register int_flag_success = noreg,
-                Label* failed = nullptr, bool contention_hint = false, bool weak = false) {
-    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
-                    semantics, cmpxchgx_hint, int_flag_success, failed, contention_hint, weak, 1);
+                Register addr_base, int semantics, bool cmpxchgx_hint = false,
+                Register int_flag_success = noreg, Label* failed = nullptr,
+                bool contention_hint = false, bool weak = false) {
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, semantics,
+                    cmpxchgx_hint, int_flag_success, failed, contention_hint, weak, 1);
   }
   // Temps, addr_base and exchange_value are killed if processor does not support Power 8 instructions.
   // compare_value must be at least 32 bit sign extended. Result will be sign extended.
   void cmpxchgh(ConditionRegister flag, Register dest_current_value,
                 RegisterOrConstant compare_value, Register exchange_value,
-                Register addr_base, Register tmp1, Register tmp2,
-                int semantics, bool cmpxchgx_hint = false, Register int_flag_success = noreg,
-                Label* failed = nullptr, bool contention_hint = false, bool weak = false) {
-    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, tmp1, tmp2,
+                Register addr_base, int semantics, bool cmpxchgx_hint = false,
+                Register int_flag_success = noreg, Label* failed = nullptr,
+                bool contention_hint = false, bool weak = false) {
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base,
                     semantics, cmpxchgx_hint, int_flag_success, failed, contention_hint, weak, 2);
   }
   void cmpxchgw(ConditionRegister flag, Register dest_current_value,
@@ -570,7 +568,7 @@ class MacroAssembler: public Assembler {
                 Register addr_base,
                 int semantics, bool cmpxchgx_hint = false, Register int_flag_success = noreg,
                 Label* failed = nullptr, bool contention_hint = false, bool weak = false) {
-    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base, noreg, noreg,
+    cmpxchg_generic(flag, dest_current_value, compare_value, exchange_value, addr_base,
                     semantics, cmpxchgx_hint, int_flag_success, failed, contention_hint, weak, 4);
   }
   void cmpxchgd(ConditionRegister flag, Register dest_current_value,
@@ -897,10 +895,6 @@ class MacroAssembler: public Assembler {
   void update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int bufInc,
                           Register t0,  Register t1,  Register t2,  Register t3,
                           Register tc0, Register tc1, Register tc2, Register tc3);
-  void kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
-                          Register t0,  Register t1,  Register t2,  Register t3,
-                          Register tc0, Register tc1, Register tc2, Register tc3,
-                          bool invertCRC);
   void kernel_crc32_vpmsum(Register crc, Register buf, Register len, Register constants,
                            Register t0, Register t1, Register t2, Register t3, Register t4,
                            Register t5, Register t6, bool invertCRC);
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
index b2bcf72bd35..d27011112e2 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
@@ -467,18 +467,10 @@ inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register sr
 
 inline Register MacroAssembler::encode_heap_oop(Register d, Register src) {
   if (CompressedOops::base() != nullptr) {
-    if (VM_Version::has_isel()) {
-      cmpdi(CR0, src, 0);
-      Register co = encode_heap_oop_not_null(d, src);
-      assert(co == d, "sanity");
-      isel_0(d, CR0, Assembler::equal);
-    } else {
-      Label isNull;
-      or_(d, src, src); // move and compare 0
-      beq(CR0, isNull);
-      encode_heap_oop_not_null(d, src);
-      bind(isNull);
-    }
+    cmpdi(CR0, src, 0);
+    Register co = encode_heap_oop_not_null(d, src);
+    assert(co == d, "sanity");
+    isel_0(d, CR0, Assembler::equal);
     return d;
   } else {
     return encode_heap_oop_not_null(d, src);
@@ -510,11 +502,7 @@ inline void MacroAssembler::decode_heap_oop(Register d) {
   bool use_isel = false;
   if (CompressedOops::base() != nullptr) {
     cmpwi(CR0, d, 0);
-    if (VM_Version::has_isel()) {
-      use_isel = true;
-    } else {
-      beq(CR0, isNull);
-    }
+    use_isel = true;
   }
   decode_heap_oop_not_null(d);
   if (use_isel) {
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index 666bec9e0c8..aad41fb7b1c 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -158,11 +158,10 @@
   }
 
   // true means we have fast l2f conversion
-  // false means that conversion is done by runtime call
-  static bool convL2FSupported(void) {
+  static constexpr bool convL2FSupported(void) {
     // fcfids can do the conversion (>= Power7).
     // fcfid + frsp showed rounding problem when result should be 0x3f800001.
-    return VM_Version::has_fcfids();
+    return true;
   }
 
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 5c6d9815245..38bb150d6c7 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2362,10 +2362,6 @@ bool Matcher::match_rule_supported(int opcode) {
   }
 
   switch (opcode) {
-    case Op_SqrtD:
-      return VM_Version::has_fsqrt();
-    case Op_RoundDoubleMode:
-      return VM_Version::has_vsx();
     case Op_CountLeadingZerosI:
     case Op_CountLeadingZerosL:
       return UseCountLeadingZerosInstructionsPPC64;
@@ -2374,11 +2370,10 @@ bool Matcher::match_rule_supported(int opcode) {
       return (UseCountLeadingZerosInstructionsPPC64 || UseCountTrailingZerosInstructionsPPC64);
     case Op_PopCountI:
     case Op_PopCountL:
-      return (UsePopCountInstruction && VM_Version::has_popcntw());
+      return UsePopCountInstruction;
     case Op_ConvF2HF:
     case Op_ConvHF2F:
       return VM_Version::supports_float16();
-
     case Op_AddVB:
     case Op_AddVS:
     case Op_AddVI:
@@ -3185,85 +3180,42 @@ encode %{
   %}
 
   enc_class postalloc_expand_encode_oop(iRegNdst dst, iRegPdst src, flagsReg crx) %{
+    // use isel instruction with Power 7
+    cmpP_reg_imm16Node *n_compare  = new cmpP_reg_imm16Node();
+    encodeP_subNode    *n_sub_base = new encodeP_subNode();
+    encodeP_shiftNode  *n_shift    = new encodeP_shiftNode();
+    cond_set_0_oopNode *n_cond_set = new cond_set_0_oopNode();
+
+    n_compare->add_req(n_region, n_src);
+    n_compare->_opnds[0] = op_crx;
+    n_compare->_opnds[1] = op_src;
+    n_compare->_opnds[2] = new immL16Oper(0);
 
-    if (VM_Version::has_isel()) {
-      // use isel instruction with Power 7
-      cmpP_reg_imm16Node *n_compare  = new cmpP_reg_imm16Node();
-      encodeP_subNode    *n_sub_base = new encodeP_subNode();
-      encodeP_shiftNode  *n_shift    = new encodeP_shiftNode();
-      cond_set_0_oopNode *n_cond_set = new cond_set_0_oopNode();
-
-      n_compare->add_req(n_region, n_src);
-      n_compare->_opnds[0] = op_crx;
-      n_compare->_opnds[1] = op_src;
-      n_compare->_opnds[2] = new immL16Oper(0);
-
-      n_sub_base->add_req(n_region, n_src);
-      n_sub_base->_opnds[0] = op_dst;
-      n_sub_base->_opnds[1] = op_src;
-      n_sub_base->_bottom_type = _bottom_type;
-
-      n_shift->add_req(n_region, n_sub_base);
-      n_shift->_opnds[0] = op_dst;
-      n_shift->_opnds[1] = op_dst;
-      n_shift->_bottom_type = _bottom_type;
-
-      n_cond_set->add_req(n_region, n_compare, n_shift);
-      n_cond_set->_opnds[0] = op_dst;
-      n_cond_set->_opnds[1] = op_crx;
-      n_cond_set->_opnds[2] = op_dst;
-      n_cond_set->_bottom_type = _bottom_type;
-
-      ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
-      ra_->set_pair(n_sub_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_cond_set->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-
-      nodes->push(n_compare);
-      nodes->push(n_sub_base);
-      nodes->push(n_shift);
-      nodes->push(n_cond_set);
+    n_sub_base->add_req(n_region, n_src);
+    n_sub_base->_opnds[0] = op_dst;
+    n_sub_base->_opnds[1] = op_src;
+    n_sub_base->_bottom_type = _bottom_type;
 
-    } else {
-      // before Power 7
-      moveRegNode        *n_move     = new moveRegNode();
-      cmpP_reg_imm16Node *n_compare  = new cmpP_reg_imm16Node();
-      encodeP_shiftNode  *n_shift    = new encodeP_shiftNode();
-      cond_sub_baseNode  *n_sub_base = new cond_sub_baseNode();
-
-      n_move->add_req(n_region, n_src);
-      n_move->_opnds[0] = op_dst;
-      n_move->_opnds[1] = op_src;
-      ra_->set_oop(n_move, true); // Until here, 'n_move' still produces an oop.
-
-      n_compare->add_req(n_region, n_src);
-      n_compare->add_prec(n_move);
-
-      n_compare->_opnds[0] = op_crx;
-      n_compare->_opnds[1] = op_src;
-      n_compare->_opnds[2] = new immL16Oper(0);
-
-      n_sub_base->add_req(n_region, n_compare, n_src);
-      n_sub_base->_opnds[0] = op_dst;
-      n_sub_base->_opnds[1] = op_crx;
-      n_sub_base->_opnds[2] = op_src;
-      n_sub_base->_bottom_type = _bottom_type;
-
-      n_shift->add_req(n_region, n_sub_base);
-      n_shift->_opnds[0] = op_dst;
-      n_shift->_opnds[1] = op_dst;
-      n_shift->_bottom_type = _bottom_type;
-
-      ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
-      ra_->set_pair(n_sub_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_move->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-
-      nodes->push(n_move);
-      nodes->push(n_compare);
-      nodes->push(n_sub_base);
-      nodes->push(n_shift);
-    }
+    n_shift->add_req(n_region, n_sub_base);
+    n_shift->_opnds[0] = op_dst;
+    n_shift->_opnds[1] = op_dst;
+    n_shift->_bottom_type = _bottom_type;
+
+    n_cond_set->add_req(n_region, n_compare, n_shift);
+    n_cond_set->_opnds[0] = op_dst;
+    n_cond_set->_opnds[1] = op_crx;
+    n_cond_set->_opnds[2] = op_dst;
+    n_cond_set->_bottom_type = _bottom_type;
+
+    ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
+    ra_->set_pair(n_sub_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    ra_->set_pair(n_cond_set->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+
+    nodes->push(n_compare);
+    nodes->push(n_sub_base);
+    nodes->push(n_shift);
+    nodes->push(n_cond_set);
 
     assert(!(ra_->is_oop(this)), "sanity"); // This is not supposed to be GC'ed.
   %}
@@ -3303,56 +3255,33 @@ encode %{
     n_shift->_opnds[1] = op_src;
     n_shift->_bottom_type = _bottom_type;
 
-    if (VM_Version::has_isel()) {
-      // use isel instruction with Power 7
-
-      decodeN_addNode *n_add_base = new decodeN_addNode();
-      n_add_base->add_req(n_region, n_shift);
-      n_add_base->_opnds[0] = op_dst;
-      n_add_base->_opnds[1] = op_dst;
-      n_add_base->_bottom_type = _bottom_type;
-
-      cond_set_0_ptrNode *n_cond_set = new cond_set_0_ptrNode();
-      n_cond_set->add_req(n_region, n_compare, n_add_base);
-      n_cond_set->_opnds[0] = op_dst;
-      n_cond_set->_opnds[1] = op_crx;
-      n_cond_set->_opnds[2] = op_dst;
-      n_cond_set->_bottom_type = _bottom_type;
-
-      assert(ra_->is_oop(this) == true, "A decodeN node must produce an oop!");
-      ra_->set_oop(n_cond_set, true);
-
-      ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
-      ra_->set_pair(n_add_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_cond_set->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    // use isel instruction with Power 7
+    decodeN_addNode *n_add_base = new decodeN_addNode();
+    n_add_base->add_req(n_region, n_shift);
+    n_add_base->_opnds[0] = op_dst;
+    n_add_base->_opnds[1] = op_dst;
+    n_add_base->_bottom_type = _bottom_type;
 
-      nodes->push(n_compare);
-      nodes->push(n_shift);
-      nodes->push(n_add_base);
-      nodes->push(n_cond_set);
-
-    } else {
-      // before Power 7
-      cond_add_baseNode *n_add_base = new cond_add_baseNode();
+    cond_set_0_ptrNode *n_cond_set = new cond_set_0_ptrNode();
+    n_cond_set->add_req(n_region, n_compare, n_add_base);
+    n_cond_set->_opnds[0] = op_dst;
+    n_cond_set->_opnds[1] = op_crx;
+    n_cond_set->_opnds[2] = op_dst;
+    n_cond_set->_bottom_type = _bottom_type;
 
-      n_add_base->add_req(n_region, n_compare, n_shift);
-      n_add_base->_opnds[0] = op_dst;
-      n_add_base->_opnds[1] = op_crx;
-      n_add_base->_opnds[2] = op_dst;
-      n_add_base->_bottom_type = _bottom_type;
+    assert(ra_->is_oop(this) == true, "A decodeN node must produce an oop!");
+    ra_->set_oop(n_cond_set, true);
 
-      assert(ra_->is_oop(this) == true, "A decodeN node must produce an oop!");
-      ra_->set_oop(n_add_base, true);
+    ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
+    ra_->set_pair(n_add_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    ra_->set_pair(n_cond_set->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
 
-      ra_->set_pair(n_shift->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
-      ra_->set_pair(n_compare->_idx, ra_->get_reg_second(n_crx), ra_->get_reg_first(n_crx));
-      ra_->set_pair(n_add_base->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this));
+    nodes->push(n_compare);
+    nodes->push(n_shift);
+    nodes->push(n_add_base);
+    nodes->push(n_cond_set);
 
-      nodes->push(n_compare);
-      nodes->push(n_shift);
-      nodes->push(n_add_base);
-    }
   %}
 
   enc_class postalloc_expand_decode_oop_not_null(iRegPdst dst, iRegNsrc src) %{
@@ -3377,25 +3306,6 @@ encode %{
     nodes->push(n2);
   %}
 
-  enc_class enc_cmove_reg(iRegIdst dst, flagsRegSrc crx, iRegIsrc src, cmpOp cmp) %{
-    int cc        = $cmp$$cmpcode;
-    int flags_reg = $crx$$reg;
-    Label done;
-    assert((Assembler::bcondCRbiIs1 & ~Assembler::bcondCRbiIs0) == 8, "check encoding");
-    // Branch if not (cmp crx).
-    __ bc(cc_to_inverse_boint(cc), cc_to_biint(cc, flags_reg), done);
-    __ mr($dst$$Register, $src$$Register);
-    __ bind(done);
-  %}
-
-  enc_class enc_cmove_imm(iRegIdst dst, flagsRegSrc crx, immI16 src, cmpOp cmp) %{
-    Label done;
-    assert((Assembler::bcondCRbiIs1 & ~Assembler::bcondCRbiIs0) == 8, "check encoding");
-    // Branch if not (cmp crx).
-    __ bc(cc_to_inverse_boint($cmp$$cmpcode), cc_to_biint($cmp$$cmpcode, $crx$$reg), done);
-    __ li($dst$$Register, $src$$constant);
-    __ bind(done);
-  %}
 
   // This enc_class is needed so that scheduler gets proper
   // input mapping for latency computation.
@@ -7096,7 +7006,7 @@ instruct decodeN_Disjoint_isel_Ex(iRegPdst dst, iRegNsrc src, flagsReg crx) %{
   effect(TEMP_DEF dst, TEMP crx);
   predicate((n->bottom_type()->is_oopptr()->ptr() != TypePtr::NotNull &&
              n->bottom_type()->is_oopptr()->ptr() != TypePtr::Constant) &&
-            CompressedOops::base_disjoint() && VM_Version::has_isel());
+            CompressedOops::base_disjoint());
   ins_cost(3 * DEFAULT_COST);
 
   format %{ "DecodeN  $dst, $src \t// decode with disjoint base using isel" %}
@@ -7476,7 +7386,6 @@ instruct membar_CPUOrder() %{
 // Cmove using isel.
 instruct cmovI_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegIdst dst, iRegIsrc src) %{
   match(Set dst (CMoveI (Binary cmp crx) (Binary dst src)));
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST);
 
   format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
@@ -7491,37 +7400,9 @@ instruct cmovI_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegIdst dst, iRegIsrc src)
   ins_pipe(pipe_class_default);
 %}
 
-instruct cmovI_reg(cmpOp cmp, flagsRegSrc crx, iRegIdst dst, iRegIsrc src) %{
-  match(Set dst (CMoveI (Binary cmp crx) (Binary dst src)));
-  predicate(!VM_Version::has_isel());
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler
-  size(8);
-  ins_encode( enc_cmove_reg(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
-instruct cmovI_imm(cmpOp cmp, flagsRegSrc crx, iRegIdst dst, immI16 src) %{
-  match(Set dst (CMoveI (Binary cmp crx) (Binary dst src)));
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler
-  size(8);
-  ins_encode( enc_cmove_imm(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
 // Cmove using isel.
 instruct cmovL_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegLdst dst, iRegLsrc src) %{
   match(Set dst (CMoveL (Binary cmp crx) (Binary dst src)));
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST);
 
   format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
@@ -7536,37 +7417,9 @@ instruct cmovL_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegLdst dst, iRegLsrc src)
   ins_pipe(pipe_class_default);
 %}
 
-instruct cmovL_reg(cmpOp cmp, flagsRegSrc crx, iRegLdst dst, iRegLsrc src) %{
-  match(Set dst (CMoveL (Binary cmp crx) (Binary dst src)));
-  predicate(!VM_Version::has_isel());
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_reg(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
-instruct cmovL_imm(cmpOp cmp, flagsRegSrc crx, iRegLdst dst, immL16 src) %{
-  match(Set dst (CMoveL (Binary cmp crx) (Binary dst src)));
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_imm(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
 // Cmove using isel.
 instruct cmovN_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegNdst dst, iRegNsrc src) %{
   match(Set dst (CMoveN (Binary cmp crx) (Binary dst src)));
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST);
 
   format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
@@ -7581,38 +7434,9 @@ instruct cmovN_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegNdst dst, iRegNsrc src)
   ins_pipe(pipe_class_default);
 %}
 
-// Conditional move for RegN. Only cmov(reg, reg).
-instruct cmovN_reg(cmpOp cmp, flagsRegSrc crx, iRegNdst dst, iRegNsrc src) %{
-  match(Set dst (CMoveN (Binary cmp crx) (Binary dst src)));
-  predicate(!VM_Version::has_isel());
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_reg(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
-instruct cmovN_imm(cmpOp cmp, flagsRegSrc crx, iRegNdst dst, immN_0 src) %{
-  match(Set dst (CMoveN (Binary cmp crx) (Binary dst src)));
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_imm(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
 // Cmove using isel.
 instruct cmovP_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegPdst dst, iRegPsrc src) %{
   match(Set dst (CMoveP (Binary cmp crx) (Binary dst src)));
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST);
 
   format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
@@ -7627,33 +7451,6 @@ instruct cmovP_reg_isel(cmpOp cmp, flagsRegSrc crx, iRegPdst dst, iRegPsrc src)
   ins_pipe(pipe_class_default);
 %}
 
-instruct cmovP_reg(cmpOp cmp, flagsRegSrc crx, iRegPdst dst, iRegP_N2P src) %{
-  match(Set dst (CMoveP (Binary cmp crx) (Binary dst src)));
-  predicate(!VM_Version::has_isel());
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_reg(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
-instruct cmovP_imm(cmpOp cmp, flagsRegSrc crx, iRegPdst dst, immP_0 src) %{
-  match(Set dst (CMoveP (Binary cmp crx) (Binary dst src)));
-  ins_cost(DEFAULT_COST+BRANCH_COST);
-
-  ins_variable_size_depending_on_alignment(true);
-
-  format %{ "CMOVE   $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
-  size(8);
-  ins_encode( enc_cmove_imm(dst, crx, src, cmp) );
-  ins_pipe(pipe_class_default);
-%}
-
 instruct cmovF_reg(cmpOp cmp, flagsRegSrc crx, regF dst, regF src) %{
   match(Set dst (CMoveF (Binary cmp crx) (Binary dst src)));
   ins_cost(DEFAULT_COST+BRANCH_COST);
@@ -7704,31 +7501,11 @@ instruct cmovD_reg(cmpOp cmp, flagsRegSrc crx, regD dst, regD src) %{
 
 instruct compareAndSwapB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                $res$$Register, nullptr, true);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct compareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, nullptr, true);
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
@@ -7742,31 +7519,11 @@ instruct compareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIs
 
 instruct compareAndSwapS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                $res$$Register, nullptr, true);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct compareAndSwapS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 $res$$Register, nullptr, true);
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
@@ -7856,26 +7613,12 @@ instruct compareAndSwapP_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr, iRegPsrc
 
 instruct weakCompareAndSwapB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone,
-                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct weakCompareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "weak CMPXCHGB $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone,
                 MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
   %}
@@ -7884,26 +7627,12 @@ instruct weakCompareAndSwapB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iR
 
 instruct weakCompareAndSwapB_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) );
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
-                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct weakCompareAndSwapB4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (WeakCompareAndSwapB mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "weak CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgb(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
                 MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
   %}
@@ -7912,26 +7641,12 @@ instruct weakCompareAndSwapB4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr
 
 instruct weakCompareAndSwapS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone,
-                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct weakCompareAndSwapS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "weak CMPXCHGH $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone,
                 MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
   %}
@@ -7940,26 +7655,12 @@ instruct weakCompareAndSwapS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iR
 
 instruct weakCompareAndSwapS_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst));
   effect(TEMP_DEF res, TEMP cr0); // TEMP_DEF to avoid jump
   format %{ "weak CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as bool" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
-                MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct weakCompareAndSwapS4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, iRegIdst tmp2, flagsRegCR0 cr0) %{
-  match(Set res (WeakCompareAndSwapS mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0); // TEMP_DEF to avoid jump
-  format %{ "weak CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as bool" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, $tmp2$$Register,
+    __ cmpxchgh(CR0, R0, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 support_IRIW_for_not_multiple_copy_atomic_cpu ? MacroAssembler::MemBarAcq : MacroAssembler::MemBarFenceAfter,
                 MacroAssembler::cmpxchgx_hint_atomic_update(), $res$$Register, nullptr, true, /*weak*/ true);
   %}
@@ -8091,26 +7792,12 @@ instruct weakCompareAndSwapP_acq_regP_regP_regP(iRegIdst res, iRegPdst mem_ptr,
 
 instruct compareAndExchangeB_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as int" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                noreg, nullptr, true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct compareAndExchangeB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
-  format %{ "CMPXCHGB $res, $mem_ptr, $src1, $src2; as int" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, nullptr, true);
   %}
@@ -8119,12 +7806,12 @@ instruct compareAndExchangeB4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iR
 
 instruct compareAndExchangeB_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst));
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as int" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, nullptr, true);
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
@@ -8137,48 +7824,15 @@ instruct compareAndExchangeB_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr,
   ins_pipe(pipe_class_default);
 %}
 
-instruct compareAndExchangeB4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndExchangeB mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
-  format %{ "CMPXCHGB acq $res, $mem_ptr, $src1, $src2; as int" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgb(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                noreg, nullptr, true);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
 
 instruct compareAndExchangeS_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && VM_Version::has_lqarx());
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as int" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                noreg, nullptr, true);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct compareAndExchangeS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
-  format %{ "CMPXCHGH $res, $mem_ptr, $src1, $src2; as int" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
+    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, nullptr, true);
   %}
@@ -8187,12 +7841,12 @@ instruct compareAndExchangeS4_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iR
 
 instruct compareAndExchangeS_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && VM_Version::has_lqarx());
+  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst));
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as int" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, noreg, noreg,
+    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, nullptr, true);
     if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
@@ -8205,34 +7859,14 @@ instruct compareAndExchangeS_acq_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr,
   ins_pipe(pipe_class_default);
 %}
 
-instruct compareAndExchangeS4_acq_regP_regI_regI(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src1, rarg4RegI src2, iRegIdst tmp1, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndExchangeS mem_ptr (Binary src1 src2)));
-  predicate((((CompareAndSwapNode*)n)->order() == MemNode::acquire || ((CompareAndSwapNode*)n)->order() == MemNode::seqcst) && !VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL src2, USE_KILL mem_ptr, TEMP tmp1, TEMP cr0);
-  format %{ "CMPXCHGH acq $res, $mem_ptr, $src1, $src2; as int" %}
+instruct compareAndExchangeI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
+  match(Set res (CompareAndExchangeI mem_ptr (Binary src1 src2)));
+  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
+  effect(TEMP_DEF res, TEMP cr0);
+  format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as int" %}
   ins_encode %{
     // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgh(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register, $tmp1$$Register, R0,
-                MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
-                noreg, nullptr, true);
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      // isync would be sufficient in case of CompareAndExchangeAcquire, but we currently don't optimize for that.
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct compareAndExchangeI_regP_regI_regI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
-  match(Set res (CompareAndExchangeI mem_ptr (Binary src1 src2)));
-  predicate(((CompareAndSwapNode*)n)->order() != MemNode::acquire && ((CompareAndSwapNode*)n)->order() != MemNode::seqcst);
-  effect(TEMP_DEF res, TEMP cr0);
-  format %{ "CMPXCHGW $res, $mem_ptr, $src1, $src2; as int" %}
-  ins_encode %{
-    // CmpxchgX sets CR0 to cmpX(src1, src2) and Rres to 'true'/'false'.
-    __ cmpxchgw(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
+    __ cmpxchgw(CR0, $res$$Register, $src1$$Register, $src2$$Register, $mem_ptr$$Register,
                 MacroAssembler::MemBarNone, MacroAssembler::cmpxchgx_hint_atomic_update(),
                 noreg, nullptr, true);
   %}
@@ -8367,7 +8001,6 @@ instruct compareAndExchangeP_acq_regP_regP_regP(iRegPdst res, iRegPdst mem_ptr,
 
 instruct getAndAddB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddB mem_ptr src));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndAddB $res, $mem_ptr, $src" %}
   ins_encode %{
@@ -8382,26 +8015,8 @@ instruct getAndAddB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr
   ins_pipe(pipe_class_default);
 %}
 
-instruct getAndAddB4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
-  match(Set res (GetAndAddB mem_ptr src));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
-  format %{ "GetAndAddB $res, $mem_ptr, $src" %}
-  ins_encode %{
-    __ getandaddb($res$$Register, $src$$Register, $mem_ptr$$Register,
-                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
 instruct getAndAddS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddS mem_ptr src));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndAddS $res, $mem_ptr, $src" %}
   ins_encode %{
@@ -8416,22 +8031,6 @@ instruct getAndAddS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr
   ins_pipe(pipe_class_default);
 %}
 
-instruct getAndAddS4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
-  match(Set res (GetAndAddS mem_ptr src));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
-  format %{ "GetAndAddS $res, $mem_ptr, $src" %}
-  ins_encode %{
-    __ getandaddh($res$$Register, $src$$Register, $mem_ptr$$Register,
-                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
 
 instruct getAndAddI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndAddI mem_ptr src));
@@ -8467,7 +8066,6 @@ instruct getAndAddL(iRegLdst res, iRegPdst mem_ptr, iRegLsrc src, flagsRegCR0 cr
 
 instruct getAndSetB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetB mem_ptr src));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetB $res, $mem_ptr, $src" %}
   ins_encode %{
@@ -8482,26 +8080,8 @@ instruct getAndSetB(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr
   ins_pipe(pipe_class_default);
 %}
 
-instruct getAndSetB4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
-  match(Set res (GetAndSetB mem_ptr src));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
-  format %{ "GetAndSetB $res, $mem_ptr, $src" %}
-  ins_encode %{
-    __ getandsetb($res$$Register, $src$$Register, $mem_ptr$$Register,
-                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
 instruct getAndSetS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetS mem_ptr src));
-  predicate(VM_Version::has_lqarx());
   effect(TEMP_DEF res, TEMP cr0);
   format %{ "GetAndSetS $res, $mem_ptr, $src" %}
   ins_encode %{
@@ -8516,22 +8096,6 @@ instruct getAndSetS(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr
   ins_pipe(pipe_class_default);
 %}
 
-instruct getAndSetS4(iRegIdst res, rarg3RegP mem_ptr, iRegIsrc src, iRegIsrc tmp1, iRegIsrc tmp2, flagsRegCR0 cr0) %{
-  match(Set res (GetAndSetS mem_ptr src));
-  predicate(!VM_Version::has_lqarx());
-  effect(TEMP_DEF res, USE_KILL mem_ptr, TEMP tmp1, TEMP tmp2, TEMP cr0);
-  format %{ "GetAndSetS $res, $mem_ptr, $src" %}
-  ins_encode %{
-    __ getandseth($res$$Register, $src$$Register, $mem_ptr$$Register,
-                  R0, $tmp1$$Register, $tmp2$$Register, MacroAssembler::cmpxchgx_hint_atomic_update());
-    if (support_IRIW_for_not_multiple_copy_atomic_cpu) {
-      __ isync();
-    } else {
-      __ sync();
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
 
 instruct getAndSetI(iRegIdst res, iRegPdst mem_ptr, iRegIsrc src, flagsRegCR0 cr0) %{
   match(Set res (GetAndSetI mem_ptr src));
@@ -9820,7 +9384,6 @@ instruct negD_absD_reg(regD dst, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// VM_Version::has_fsqrt() decides if this node will be used.
 // Sqrt float double precision
 instruct sqrtD_reg(regD dst, regD src) %{
   match(Set dst (SqrtD src));
@@ -9835,7 +9398,6 @@ instruct sqrtD_reg(regD dst, regD src) %{
 // Single-precision sqrt.
 instruct sqrtF_reg(regF dst, regF src) %{
   match(Set dst (SqrtF src));
-  predicate(VM_Version::has_fsqrts());
   ins_cost(DEFAULT_COST);
 
   format %{ "FSQRTS  $dst, $src" %}
@@ -10337,7 +9899,6 @@ instruct andcL_reg_reg(iRegLdst dst, iRegLsrc src1, iRegLsrc src2) %{
 
 instruct moveL2D_reg(regD dst, iRegLsrc src) %{
   match(Set dst (MoveL2D src));
-  predicate(VM_Version::has_mtfprd());
 
   format %{ "MTFPRD  $dst, $src" %}
   size(4);
@@ -10457,18 +10018,6 @@ instruct moveI2F_reg_stack(stackSlotF dst, iRegIsrc src) %{
   ins_pipe(pipe_class_memory);
 %}
 
-//----------Moves between long and float
-
-instruct moveF2L_reg_stack(stackSlotL dst, regF src) %{
-  // no match-rule, false predicate
-  effect(DEF dst, USE src);
-  predicate(false);
-
-  format %{ "storeD  $src, $dst \t// STACK" %}
-  size(4);
-  ins_encode( enc_stfd(src, dst) );
-  ins_pipe(pipe_class_default);
-%}
 
 //----------Moves between long and double
 
@@ -10494,27 +10043,6 @@ instruct moveD2L_reg_stack(stackSlotL dst, regD src) %{
   ins_pipe(pipe_class_memory);
 %}
 
-// Move long value from long stack-location to double register.
-instruct moveL2D_stack_reg(regD dst, stackSlotL src) %{
-  match(Set dst (MoveL2D src));
-  ins_cost(MEMORY_REF_COST);
-
-  format %{ "LFD     $dst, $src \t// MoveL2D" %}
-  size(4);
-  ins_encode( enc_lfd(dst, src) );
-  ins_pipe(pipe_class_memory);
-%}
-
-// Move long value from long register to double stack-location.
-instruct moveL2D_reg_stack(stackSlotD dst, iRegLsrc src) %{
-  match(Set dst (MoveL2D src));
-  ins_cost(MEMORY_REF_COST);
-
-  format %{ "STD     $src, $dst \t// MoveL2D" %}
-  size(4);
-  ins_encode( enc_std(src, dst) );
-  ins_pipe(pipe_class_memory);
-%}
 
 //----------Register Move Instructions-----------------------------------------
 
@@ -10914,59 +10442,6 @@ instruct cmovI_bso_reg(iRegIdst dst, flagsRegSrc crx, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-instruct cmovI_bso_stackSlotL_conLvalue0_Ex(iRegIdst dst, flagsRegSrc crx, stackSlotL mem) %{
-  // no match-rule, false predicate
-  effect(DEF dst, USE crx, USE mem);
-  predicate(false);
-
-  format %{ "CmovI   $dst, $crx, $mem \t// postalloc expanded" %}
-  postalloc_expand %{
-    //
-    // replaces
-    //
-    //   region  dst  crx  mem
-    //    \       |    |   /
-    //     dst=cmovI_bso_stackSlotL_conLvalue0
-    //
-    // with
-    //
-    //   region  dst
-    //    \       /
-    //     dst=loadConI16(0)
-    //      |
-    //      ^  region  dst  crx  mem
-    //      |   \       |    |    /
-    //      dst=cmovI_bso_stackSlotL
-    //
-
-    // Create new nodes.
-    MachNode *m1 = new loadConI16Node();
-    MachNode *m2 = new cmovI_bso_stackSlotLNode();
-
-    // inputs for new nodes
-    m1->add_req(n_region);
-    m2->add_req(n_region, n_crx, n_mem);
-
-    // precedences for new nodes
-    m2->add_prec(m1);
-
-    // operands for new nodes
-    m1->_opnds[0] = op_dst;
-    m1->_opnds[1] = new immI16Oper(0);
-
-    m2->_opnds[0] = op_dst;
-    m2->_opnds[1] = op_crx;
-    m2->_opnds[2] = op_mem;
-
-    // registers for new nodes
-    ra_->set_pair(m1->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this)); // dst
-    ra_->set_pair(m2->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this)); // dst
-
-    // Insert new nodes.
-    nodes->push(m1);
-    nodes->push(m2);
-  %}
-%}
 
 instruct cmovI_bso_reg_conLvalue0_Ex(iRegIdst dst, flagsRegSrc crx, regD src) %{
   // no match-rule, false predicate
@@ -11022,27 +10497,10 @@ instruct cmovI_bso_reg_conLvalue0_Ex(iRegIdst dst, flagsRegSrc crx, regD src) %{
   %}
 %}
 
-// Double to Int conversion, NaN is mapped to 0.
-instruct convD2I_reg_ExEx(iRegIdst dst, regD src) %{
-  match(Set dst (ConvD2I src));
-  predicate(!VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    regD tmpD;
-    stackSlotL tmpS;
-    flagsReg crx;
-    cmpDUnordered_reg_reg(crx, src, src);               // Check whether src is NaN.
-    convD2IRaw_regD(tmpD, src);                         // Convert float to int (speculated).
-    moveD2L_reg_stack(tmpS, tmpD);                      // Store float to stack (speculated).
-    cmovI_bso_stackSlotL_conLvalue0_Ex(dst, crx, tmpS); // Cmove based on NaN check.
-  %}
-%}
 
 // Double to Int conversion, NaN is mapped to 0. Special version for Power8.
 instruct convD2I_reg_mffprd_ExEx(iRegIdst dst, regD src) %{
   match(Set dst (ConvD2I src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11067,27 +10525,10 @@ instruct convF2IRaw_regF(regF dst, regF src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Float to Int conversion, NaN is mapped to 0.
-instruct convF2I_regF_ExEx(iRegIdst dst, regF src) %{
-  match(Set dst (ConvF2I src));
-  predicate(!VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    regF tmpF;
-    stackSlotL tmpS;
-    flagsReg crx;
-    cmpFUnordered_reg_reg(crx, src, src);               // Check whether src is NaN.
-    convF2IRaw_regF(tmpF, src);                         // Convert float to int (speculated).
-    moveF2L_reg_stack(tmpS, tmpF);                      // Store float to stack (speculated).
-    cmovI_bso_stackSlotL_conLvalue0_Ex(dst, crx, tmpS); // Cmove based on NaN check.
-  %}
-%}
 
 // Float to Int conversion, NaN is mapped to 0. Special version for Power8.
 instruct convF2I_regF_mffprd_ExEx(iRegIdst dst, regF src) %{
   match(Set dst (ConvF2I src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11178,56 +10619,6 @@ instruct cmovL_bso_reg(iRegLdst dst, flagsRegSrc crx, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-instruct cmovL_bso_stackSlotL_conLvalue0_Ex(iRegLdst dst, flagsRegSrc crx, stackSlotL mem) %{
-  // no match-rule, false predicate
-  effect(DEF dst, USE crx, USE mem);
-  predicate(false);
-
-  format %{ "CmovL   $dst, $crx, $mem \t// postalloc expanded" %}
-  postalloc_expand %{
-    //
-    // replaces
-    //
-    //   region  dst  crx  mem
-    //    \       |    |   /
-    //     dst=cmovL_bso_stackSlotL_conLvalue0
-    //
-    // with
-    //
-    //   region  dst
-    //    \       /
-    //     dst=loadConL16(0)
-    //      |
-    //      ^  region  dst  crx  mem
-    //      |   \       |    |    /
-    //      dst=cmovL_bso_stackSlotL
-    //
-
-    // Create new nodes.
-    MachNode *m1 = new loadConL16Node();
-    MachNode *m2 = new cmovL_bso_stackSlotLNode();
-
-    // inputs for new nodes
-    m1->add_req(n_region);
-    m2->add_req(n_region, n_crx, n_mem);
-    m2->add_prec(m1);
-
-    // operands for new nodes
-    m1->_opnds[0] = op_dst;
-    m1->_opnds[1] = new immL16Oper(0);
-    m2->_opnds[0] = op_dst;
-    m2->_opnds[1] = op_crx;
-    m2->_opnds[2] = op_mem;
-
-    // registers for new nodes
-    ra_->set_pair(m1->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this)); // dst
-    ra_->set_pair(m2->_idx, ra_->get_reg_second(this), ra_->get_reg_first(this)); // dst
-
-    // Insert new nodes.
-    nodes->push(m1);
-    nodes->push(m2);
-  %}
-%}
 
 instruct cmovL_bso_reg_conLvalue0_Ex(iRegLdst dst, flagsRegSrc crx, regD src) %{
   // no match-rule, false predicate
@@ -11280,27 +10671,10 @@ instruct cmovL_bso_reg_conLvalue0_Ex(iRegLdst dst, flagsRegSrc crx, regD src) %{
   %}
 %}
 
-// Float to Long conversion, NaN is mapped to 0.
-instruct convF2L_reg_ExEx(iRegLdst dst, regF src) %{
-  match(Set dst (ConvF2L src));
-  predicate(!VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    regF tmpF;
-    stackSlotL tmpS;
-    flagsReg crx;
-    cmpFUnordered_reg_reg(crx, src, src);               // Check whether src is NaN.
-    convF2LRaw_regF(tmpF, src);                         // Convert float to long (speculated).
-    moveF2L_reg_stack(tmpS, tmpF);                      // Store float to stack (speculated).
-    cmovL_bso_stackSlotL_conLvalue0_Ex(dst, crx, tmpS); // Cmove based on NaN check.
-  %}
-%}
 
 // Float to Long conversion, NaN is mapped to 0. Special version for Power8.
 instruct convF2L_reg_mffprd_ExEx(iRegLdst dst, regF src) %{
   match(Set dst (ConvF2L src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11325,27 +10699,10 @@ instruct convD2LRaw_regD(regD dst, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Double to Long conversion, NaN is mapped to 0.
-instruct convD2L_reg_ExEx(iRegLdst dst, regD src) %{
-  match(Set dst (ConvD2L src));
-  predicate(!VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    regD tmpD;
-    stackSlotL tmpS;
-    flagsReg crx;
-    cmpDUnordered_reg_reg(crx, src, src);               // Check whether src is NaN.
-    convD2LRaw_regD(tmpD, src);                         // Convert float to long (speculated).
-    moveD2L_reg_stack(tmpS, tmpD);                      // Store float to stack (speculated).
-    cmovL_bso_stackSlotL_conLvalue0_Ex(dst, crx, tmpS); // Cmove based on NaN check.
-  %}
-%}
 
 // Double to Long conversion, NaN is mapped to 0. Special version for Power8.
 instruct convD2L_reg_mffprd_ExEx(iRegLdst dst, regD src) %{
   match(Set dst (ConvD2L src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11384,25 +10741,6 @@ instruct convD2F_reg(regF dst, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Integer to Float conversion.
-instruct convI2F_ireg_Ex(regF dst, iRegIsrc src) %{
-  match(Set dst (ConvI2F src));
-  predicate(!VM_Version::has_fcfids());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    iRegLdst tmpL;
-    stackSlotL tmpS;
-    regD tmpD;
-    regD tmpD2;
-    convI2L_reg(tmpL, src);              // Sign-extension int to long.
-    regL_to_stkL(tmpS, tmpL);            // Store long to stack.
-    moveL2D_stack_reg(tmpD, tmpS);       // Load long into double register.
-    convL2DRaw_regD(tmpD2, tmpD);        // Convert to double.
-    convD2F_reg(dst, tmpD2);             // Convert double to float.
-  %}
-%}
-
 instruct convL2FRaw_regF(regF dst, regD src) %{
   // no match-rule, false predicate
   effect(DEF dst, USE src);
@@ -11416,27 +10754,10 @@ instruct convL2FRaw_regF(regF dst, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Integer to Float conversion. Special version for Power7.
-instruct convI2F_ireg_fcfids_Ex(regF dst, iRegIsrc src) %{
-  match(Set dst (ConvI2F src));
-  predicate(VM_Version::has_fcfids() && !VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    iRegLdst tmpL;
-    stackSlotL tmpS;
-    regD tmpD;
-    convI2L_reg(tmpL, src);              // Sign-extension int to long.
-    regL_to_stkL(tmpS, tmpL);            // Store long to stack.
-    moveL2D_stack_reg(tmpD, tmpS);       // Load long into double register.
-    convL2FRaw_regF(dst, tmpD);          // Convert to float.
-  %}
-%}
 
 // Integer to Float conversion. Special version for Power8.
 instruct convI2F_ireg_mtfprd_Ex(regF dst, iRegIsrc src) %{
   match(Set dst (ConvI2F src));
-  predicate(VM_Version::has_fcfids() && VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11446,25 +10767,10 @@ instruct convI2F_ireg_mtfprd_Ex(regF dst, iRegIsrc src) %{
   %}
 %}
 
-// L2F to avoid runtime call.
-instruct convL2F_ireg_fcfids_Ex(regF dst, iRegLsrc src) %{
-  match(Set dst (ConvL2F src));
-  predicate(VM_Version::has_fcfids() && !VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    stackSlotL tmpS;
-    regD tmpD;
-    regL_to_stkL(tmpS, src);             // Store long to stack.
-    moveL2D_stack_reg(tmpD, tmpS);       // Load long into double register.
-    convL2FRaw_regF(dst, tmpD);          // Convert to float.
-  %}
-%}
 
 // L2F to avoid runtime call.  Special version for Power8.
 instruct convL2F_ireg_mtfprd_Ex(regF dst, iRegLsrc src) %{
   match(Set dst (ConvL2F src));
-  predicate(VM_Version::has_fcfids() && VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11479,27 +10785,10 @@ instruct convL2F_ireg_mtfprd_Ex(regF dst, iRegLsrc src) %{
 
 // Convert to Double
 
-// Integer to Double conversion.
-instruct convI2D_reg_Ex(regD dst, iRegIsrc src) %{
-  match(Set dst (ConvI2D src));
-  predicate(!VM_Version::has_mtfprd());
-  ins_cost(DEFAULT_COST);
-
-  expand %{
-    iRegLdst tmpL;
-    stackSlotL tmpS;
-    regD tmpD;
-    convI2L_reg(tmpL, src);              // Sign-extension int to long.
-    regL_to_stkL(tmpS, tmpL);            // Store long to stack.
-    moveL2D_stack_reg(tmpD, tmpS);       // Load long into double register.
-    convL2DRaw_regD(dst, tmpD);          // Convert to double.
-  %}
-%}
 
 // Integer to Double conversion. Special version for Power8.
 instruct convI2D_reg_mtfprd_Ex(regD dst, iRegIsrc src) %{
   match(Set dst (ConvI2D src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -11509,22 +10798,10 @@ instruct convI2D_reg_mtfprd_Ex(regD dst, iRegIsrc src) %{
   %}
 %}
 
-// Long to Double conversion
-instruct convL2D_reg_Ex(regD dst, stackSlotL src) %{
-  match(Set dst (ConvL2D src));
-  ins_cost(DEFAULT_COST + MEMORY_REF_COST);
-
-  expand %{
-    regD tmpD;
-    moveL2D_stack_reg(tmpD, src);
-    convL2DRaw_regD(dst, tmpD);
-  %}
-%}
 
 // Long to Double conversion. Special version for Power8.
 instruct convL2D_reg_mtfprd_Ex(regD dst, iRegLsrc src) %{
   match(Set dst (ConvL2D src));
-  predicate(VM_Version::has_mtfprd());
   ins_cost(DEFAULT_COST);
 
   expand %{
@@ -13119,30 +12396,10 @@ instruct encode_ascii_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst
 
 //---------- Min/Max Instructions ---------------------------------------------
 
-instruct minI_reg_reg_Ex(iRegIdst dst, iRegIsrc src1, iRegIsrc src2) %{
-  match(Set dst (MinI src1 src2));
-  ins_cost(DEFAULT_COST*6);
-
-  expand %{
-    iRegLdst src1s;
-    iRegLdst src2s;
-    iRegLdst diff;
-    iRegLdst sm;
-    iRegLdst doz; // difference or zero
-    convI2L_reg(src1s, src1); // Ensure proper sign extension.
-    convI2L_reg(src2s, src2); // Ensure proper sign extension.
-    subL_reg_reg(diff, src2s, src1s);
-    // Need to consider >=33 bit result, therefore we need signmaskL.
-    signmask64L_regL(sm, diff);
-    andL_reg_reg(doz, diff, sm); // <=0
-    addI_regL_regL(dst, doz, src1s);
-  %}
-%}
 
 instruct minI_reg_reg_isel(iRegIdst dst, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set dst (MinI src1 src2));
   effect(KILL cr0);
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST*2);
 
   ins_encode %{
@@ -13152,30 +12409,10 @@ instruct minI_reg_reg_isel(iRegIdst dst, iRegIsrc src1, iRegIsrc src2, flagsRegC
   ins_pipe(pipe_class_default);
 %}
 
-instruct maxI_reg_reg_Ex(iRegIdst dst, iRegIsrc src1, iRegIsrc src2) %{
-  match(Set dst (MaxI src1 src2));
-  ins_cost(DEFAULT_COST*6);
-
-  expand %{
-    iRegLdst src1s;
-    iRegLdst src2s;
-    iRegLdst diff;
-    iRegLdst sm;
-    iRegLdst doz; // difference or zero
-    convI2L_reg(src1s, src1); // Ensure proper sign extension.
-    convI2L_reg(src2s, src2); // Ensure proper sign extension.
-    subL_reg_reg(diff, src2s, src1s);
-    // Need to consider >=33 bit result, therefore we need signmaskL.
-    signmask64L_regL(sm, diff);
-    andcL_reg_reg(doz, diff, sm); // >=0
-    addI_regL_regL(dst, doz, src1s);
-  %}
-%}
 
 instruct maxI_reg_reg_isel(iRegIdst dst, iRegIsrc src1, iRegIsrc src2, flagsRegCR0 cr0) %{
   match(Set dst (MaxI src1 src2));
   effect(KILL cr0);
-  predicate(VM_Version::has_isel());
   ins_cost(DEFAULT_COST*2);
 
   ins_encode %{
@@ -13190,7 +12427,7 @@ instruct maxI_reg_reg_isel(iRegIdst dst, iRegIsrc src1, iRegIsrc src2, flagsRegC
 // Popcnt for Power7.
 instruct popCountI(iRegIdst dst, iRegIsrc src) %{
   match(Set dst (PopCountI src));
-  predicate(UsePopCountInstruction && VM_Version::has_popcntw());
+  predicate(UsePopCountInstruction);
   ins_cost(DEFAULT_COST);
 
   format %{ "POPCNTW $dst, $src" %}
@@ -13203,7 +12440,7 @@ instruct popCountI(iRegIdst dst, iRegIsrc src) %{
 
 // Popcnt for Power7.
 instruct popCountL(iRegIdst dst, iRegLsrc src) %{
-  predicate(UsePopCountInstruction && VM_Version::has_popcntw());
+  predicate(UsePopCountInstruction);
   match(Set dst (PopCountL src));
   ins_cost(DEFAULT_COST);
 
@@ -13562,7 +12799,7 @@ instruct loadI_reversed_acquire(iRegIdst dst, indirect mem) %{
 // Load Long - aligned and reversed
 instruct loadL_reversed(iRegLdst dst, indirect mem) %{
   match(Set dst (ReverseBytesL (LoadL mem)));
-  predicate(VM_Version::has_ldbrx() && (n->in(1)->as_Load()->is_unordered() || followed_by_acquire(n->in(1))));
+  predicate((n->in(1)->as_Load()->is_unordered() || followed_by_acquire(n->in(1))));
   ins_cost(MEMORY_REF_COST);
 
   size(4);
@@ -13574,7 +12811,6 @@ instruct loadL_reversed(iRegLdst dst, indirect mem) %{
 
 instruct loadL_reversed_acquire(iRegLdst dst, indirect mem) %{
   match(Set dst (ReverseBytesL (LoadL mem)));
-  predicate(VM_Version::has_ldbrx());
   ins_cost(2 * MEMORY_REF_COST);
 
   size(12);
@@ -13655,7 +12891,6 @@ instruct storeI_reversed(iRegIsrc src, indirect mem) %{
 // Store Long reversed byte order
 instruct storeL_reversed(iRegLsrc src, indirect mem) %{
   match(Set mem (StoreL mem (ReverseBytesL src)));
-  predicate(VM_Version::has_stdbrx());
   ins_cost(MEMORY_REF_COST);
 
   size(4);
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index c4e89495503..7fc807bb9ce 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -954,10 +954,8 @@ class StubGenerator: public StubCodeGenerator {
     address start_pc = __ pc();
     Register tmp1 = R6_ARG4;
     // probably copy stub would have changed value reset it.
-    if (VM_Version::has_mfdscr()) {
-      __ load_const_optimized(tmp1, VM_Version::_dscr_val);
-      __ mtdscr(tmp1);
-    }
+    __ load_const_optimized(tmp1, VM_Version::_dscr_val);
+    __ mtdscr(tmp1);
     __ li(R3_RET, 0); // return 0
     __ blr();
     return start_pc;
@@ -1069,34 +1067,13 @@ class StubGenerator: public StubCodeGenerator {
         __ andi_(R5_ARG3, R5_ARG3, 31);
         __ mtctr(tmp1);
 
-       if (!VM_Version::has_vsx()) {
-
-        __ bind(l_8);
-        // Use unrolled version for mass copying (copy 32 elements a time)
-        // Load feeding store gets zero latency on Power6, however not on Power5.
-        // Therefore, the following sequence is made for the good of both.
-        __ ld(tmp1, 0, R3_ARG1);
-        __ ld(tmp2, 8, R3_ARG1);
-        __ ld(tmp3, 16, R3_ARG1);
-        __ ld(tmp4, 24, R3_ARG1);
-        __ std(tmp1, 0, R4_ARG2);
-        __ std(tmp2, 8, R4_ARG2);
-        __ std(tmp3, 16, R4_ARG2);
-        __ std(tmp4, 24, R4_ARG2);
-        __ addi(R3_ARG1, R3_ARG1, 32);
-        __ addi(R4_ARG2, R4_ARG2, 32);
-        __ bdnz(l_8);
-
-      } else { // Processor supports VSX, so use it to mass copy.
 
         // Prefetch the data into the L2 cache.
         __ dcbt(R3_ARG1, 0);
 
         // If supported set DSCR pre-fetch to deepest.
-        if (VM_Version::has_mfdscr()) {
-          __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-          __ mtdscr(tmp2);
-        }
+        __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+        __ mtdscr(tmp2);
 
         __ li(tmp1, 16);
 
@@ -1117,12 +1094,9 @@ class StubGenerator: public StubCodeGenerator {
         __ bdnz(l_10);                       // Dec CTR and loop if not zero.
 
         // Restore DSCR pre-fetch value.
-        if (VM_Version::has_mfdscr()) {
-          __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-          __ mtdscr(tmp2);
-        }
+        __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+        __ mtdscr(tmp2);
 
-      } // VSX
      } // FasterArrayCopy
 
       __ bind(l_6);
@@ -1365,34 +1339,15 @@ class StubGenerator: public StubCodeGenerator {
         __ andi_(R5_ARG3, R5_ARG3, 15);
         __ mtctr(tmp1);
 
-        if (!VM_Version::has_vsx()) {
-
-          __ bind(l_8);
-          // Use unrolled version for mass copying (copy 16 elements a time).
-          // Load feeding store gets zero latency on Power6, however not on Power5.
-          // Therefore, the following sequence is made for the good of both.
-          __ ld(tmp1, 0, R3_ARG1);
-          __ ld(tmp2, 8, R3_ARG1);
-          __ ld(tmp3, 16, R3_ARG1);
-          __ ld(tmp4, 24, R3_ARG1);
-          __ std(tmp1, 0, R4_ARG2);
-          __ std(tmp2, 8, R4_ARG2);
-          __ std(tmp3, 16, R4_ARG2);
-          __ std(tmp4, 24, R4_ARG2);
-          __ addi(R3_ARG1, R3_ARG1, 32);
-          __ addi(R4_ARG2, R4_ARG2, 32);
-          __ bdnz(l_8);
-
-        } else { // Processor supports VSX, so use it to mass copy.
+
+        // Processor supports VSX, so use it to mass copy.
 
           // Prefetch src data into L2 cache.
           __ dcbt(R3_ARG1, 0);
 
           // If supported set DSCR pre-fetch to deepest.
-          if (VM_Version::has_mfdscr()) {
-            __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-            __ mtdscr(tmp2);
-          }
+          __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+          __ mtdscr(tmp2);
           __ li(tmp1, 16);
 
           // Backbranch target aligned to 32-byte. It's not aligned 16-byte
@@ -1412,12 +1367,8 @@ class StubGenerator: public StubCodeGenerator {
           __ bdnz(l_9);                        // Dec CTR and loop if not zero.
 
           // Restore DSCR pre-fetch value.
-          if (VM_Version::has_mfdscr()) {
-            __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-            __ mtdscr(tmp2);
-          }
-
-        }
+          __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+          __ mtdscr(tmp2);
       } // FasterArrayCopy
       __ bind(l_6);
 
@@ -1572,60 +1523,38 @@ class StubGenerator: public StubCodeGenerator {
       __ andi_(R5_ARG3, R5_ARG3, 7);
       __ mtctr(tmp1);
 
-     if (!VM_Version::has_vsx()) {
+    // Processor supports VSX, so use it to mass copy.
 
-      __ bind(l_6);
-      // Use unrolled version for mass copying (copy 8 elements a time).
-      // Load feeding store gets zero latency on power6, however not on power 5.
-      // Therefore, the following sequence is made for the good of both.
-      __ ld(tmp1, 0, R3_ARG1);
-      __ ld(tmp2, 8, R3_ARG1);
-      __ ld(tmp3, 16, R3_ARG1);
-      __ ld(tmp4, 24, R3_ARG1);
-      __ std(tmp1, 0, R4_ARG2);
-      __ std(tmp2, 8, R4_ARG2);
-      __ std(tmp3, 16, R4_ARG2);
-      __ std(tmp4, 24, R4_ARG2);
-      __ addi(R3_ARG1, R3_ARG1, 32);
-      __ addi(R4_ARG2, R4_ARG2, 32);
-      __ bdnz(l_6);
-
-    } else { // Processor supports VSX, so use it to mass copy.
+    // Prefetch the data into the L2 cache.
+    __ dcbt(R3_ARG1, 0);
 
-      // Prefetch the data into the L2 cache.
-      __ dcbt(R3_ARG1, 0);
+    // Set DSCR pre-fetch to deepest.
+    __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+    __ mtdscr(tmp2);
 
-      // If supported set DSCR pre-fetch to deepest.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-        __ mtdscr(tmp2);
-      }
+    __ li(tmp1, 16);
 
-      __ li(tmp1, 16);
+    // Backbranch target aligned to 32-byte. Not 16-byte align as
+    // loop contains < 8 instructions that fit inside a single
+    // i-cache sector.
+    __ align(32);
 
-      // Backbranch target aligned to 32-byte. Not 16-byte align as
-      // loop contains < 8 instructions that fit inside a single
-      // i-cache sector.
-      __ align(32);
+    __ bind(l_7);
+    // Use loop with VSX load/store instructions to
+    // copy 8 elements a time.
+    __ lxvd2x(tmp_vsr1, R3_ARG1);        // Load src
+    __ stxvd2x(tmp_vsr1, R4_ARG2);       // Store to dst
+    __ lxvd2x(tmp_vsr2, tmp1, R3_ARG1);  // Load src + 16
+    __ stxvd2x(tmp_vsr2, tmp1, R4_ARG2); // Store to dst + 16
+    __ addi(R3_ARG1, R3_ARG1, 32);       // Update src+=32
+    __ addi(R4_ARG2, R4_ARG2, 32);       // Update dsc+=32
+    __ bdnz(l_7);                        // Dec CTR and loop if not zero.
 
-      __ bind(l_7);
-      // Use loop with VSX load/store instructions to
-      // copy 8 elements a time.
-      __ lxvd2x(tmp_vsr1, R3_ARG1);        // Load src
-      __ stxvd2x(tmp_vsr1, R4_ARG2);       // Store to dst
-      __ lxvd2x(tmp_vsr2, tmp1, R3_ARG1);  // Load src + 16
-      __ stxvd2x(tmp_vsr2, tmp1, R4_ARG2); // Store to dst + 16
-      __ addi(R3_ARG1, R3_ARG1, 32);       // Update src+=32
-      __ addi(R4_ARG2, R4_ARG2, 32);       // Update dsc+=32
-      __ bdnz(l_7);                        // Dec CTR and loop if not zero.
+    // Restore DSCR pre-fetch value.
+    __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+    __ mtdscr(tmp2);
 
-      // Restore DSCR pre-fetch value.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-        __ mtdscr(tmp2);
-      }
 
-    } // VSX
    } // FasterArrayCopy
 
     // copy 1 element at a time
@@ -1740,31 +1669,13 @@ class StubGenerator: public StubCodeGenerator {
       __ andi(R5_ARG3, R5_ARG3, 7);
       __ mtctr(tmp1);
 
-     if (!VM_Version::has_vsx()) {
-      __ bind(l_4);
-      // Use unrolled version for mass copying (copy 4 elements a time).
-      // Load feeding store gets zero latency on Power6, however not on Power5.
-      // Therefore, the following sequence is made for the good of both.
-      __ addi(R3_ARG1, R3_ARG1, -32);
-      __ addi(R4_ARG2, R4_ARG2, -32);
-      __ ld(tmp4, 24, R3_ARG1);
-      __ ld(tmp3, 16, R3_ARG1);
-      __ ld(tmp2, 8, R3_ARG1);
-      __ ld(tmp1, 0, R3_ARG1);
-      __ std(tmp4, 24, R4_ARG2);
-      __ std(tmp3, 16, R4_ARG2);
-      __ std(tmp2, 8, R4_ARG2);
-      __ std(tmp1, 0, R4_ARG2);
-      __ bdnz(l_4);
-     } else {  // Processor supports VSX, so use it to mass copy.
+      // Processor supports VSX, so use it to mass copy.
       // Prefetch the data into the L2 cache.
       __ dcbt(R3_ARG1, 0);
 
-      // If supported set DSCR pre-fetch to deepest.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-        __ mtdscr(tmp2);
-      }
+      // Set DSCR pre-fetch to deepest.
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+      __ mtdscr(tmp2);
 
       __ li(tmp1, 16);
 
@@ -1785,11 +1696,8 @@ class StubGenerator: public StubCodeGenerator {
       __ bdnz(l_4);
 
       // Restore DSCR pre-fetch value.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-        __ mtdscr(tmp2);
-      }
-     }
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+      __ mtdscr(tmp2);
 
       __ cmpwi(CR0, R5_ARG3, 0);
       __ beq(CR0, l_6);
@@ -1876,33 +1784,14 @@ class StubGenerator: public StubCodeGenerator {
       __ andi_(R5_ARG3, R5_ARG3, 3);
       __ mtctr(tmp1);
 
-    if (!VM_Version::has_vsx()) {
-      __ bind(l_4);
-      // Use unrolled version for mass copying (copy 4 elements a time).
-      // Load feeding store gets zero latency on Power6, however not on Power5.
-      // Therefore, the following sequence is made for the good of both.
-      __ ld(tmp1, 0, R3_ARG1);
-      __ ld(tmp2, 8, R3_ARG1);
-      __ ld(tmp3, 16, R3_ARG1);
-      __ ld(tmp4, 24, R3_ARG1);
-      __ std(tmp1, 0, R4_ARG2);
-      __ std(tmp2, 8, R4_ARG2);
-      __ std(tmp3, 16, R4_ARG2);
-      __ std(tmp4, 24, R4_ARG2);
-      __ addi(R3_ARG1, R3_ARG1, 32);
-      __ addi(R4_ARG2, R4_ARG2, 32);
-      __ bdnz(l_4);
-
-    } else { // Processor supports VSX, so use it to mass copy.
+      // Processor supports VSX, so use it to mass copy.
 
       // Prefetch the data into the L2 cache.
       __ dcbt(R3_ARG1, 0);
 
-      // If supported set DSCR pre-fetch to deepest.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-        __ mtdscr(tmp2);
-      }
+      // Set DSCR pre-fetch to deepest.
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+      __ mtdscr(tmp2);
 
       __ li(tmp1, 16);
 
@@ -1923,12 +1812,9 @@ class StubGenerator: public StubCodeGenerator {
       __ bdnz(l_5);                        // Dec CTR and loop if not zero.
 
       // Restore DSCR pre-fetch value.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-        __ mtdscr(tmp2);
-      }
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+      __ mtdscr(tmp2);
 
-    } // VSX
    } // FasterArrayCopy
 
     // copy 1 element at a time
@@ -2021,31 +1907,13 @@ class StubGenerator: public StubCodeGenerator {
       __ andi(R5_ARG3, R5_ARG3, 3);
       __ mtctr(tmp1);
 
-     if (!VM_Version::has_vsx()) {
-      __ bind(l_4);
-      // Use unrolled version for mass copying (copy 4 elements a time).
-      // Load feeding store gets zero latency on Power6, however not on Power5.
-      // Therefore, the following sequence is made for the good of both.
-      __ addi(R3_ARG1, R3_ARG1, -32);
-      __ addi(R4_ARG2, R4_ARG2, -32);
-      __ ld(tmp4, 24, R3_ARG1);
-      __ ld(tmp3, 16, R3_ARG1);
-      __ ld(tmp2, 8, R3_ARG1);
-      __ ld(tmp1, 0, R3_ARG1);
-      __ std(tmp4, 24, R4_ARG2);
-      __ std(tmp3, 16, R4_ARG2);
-      __ std(tmp2, 8, R4_ARG2);
-      __ std(tmp1, 0, R4_ARG2);
-      __ bdnz(l_4);
-     } else { // Processor supports VSX, so use it to mass copy.
+      // Processor supports VSX, so use it to mass copy.
       // Prefetch the data into the L2 cache.
       __ dcbt(R3_ARG1, 0);
 
-      // If supported set DSCR pre-fetch to deepest.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
-        __ mtdscr(tmp2);
-      }
+      // Set DSCR pre-fetch to deepest.
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7);
+      __ mtdscr(tmp2);
 
       __ li(tmp1, 16);
 
@@ -2066,11 +1934,8 @@ class StubGenerator: public StubCodeGenerator {
       __ bdnz(l_4);
 
       // Restore DSCR pre-fetch value.
-      if (VM_Version::has_mfdscr()) {
-        __ load_const_optimized(tmp2, VM_Version::_dscr_val);
-        __ mtdscr(tmp2);
-      }
-     }
+      __ load_const_optimized(tmp2, VM_Version::_dscr_val);
+      __ mtdscr(tmp2);
 
       __ cmpwi(CR0, R5_ARG3, 0);
       __ beq(CR0, l_1);
diff --git a/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp b/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
index 60cca4efb57..fed3f208f06 100644
--- a/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp
@@ -77,13 +77,10 @@ static julong compute_inverse_poly(julong long_poly) {
 // Constants to fold n words as needed by macroAssembler.
 address StubRoutines::ppc::generate_crc_constants(juint reverse_poly) {
   // Layout of constant table:
-  // <= Power7 Little Endian: 4 tables for byte folding
-  // <= Power7 Big Endian: 1 table for single byte folding + 4 tables for multi-byte folding
   // >= Power8: 1 table for single byte folding + constants for fast vector implementation
-  const bool use_vector = VM_Version::has_vpmsumb();
   const int vector_size = 16 * (CRC32_UNROLL_FACTOR2 + CRC32_UNROLL_FACTOR / CRC32_UNROLL_FACTOR2);
 
-  const int size = use_vector ? CRC32_TABLE_SIZE + vector_size : (4 BIG_ENDIAN_ONLY(+1)) * CRC32_TABLE_SIZE;
+  const int size = CRC32_TABLE_SIZE + vector_size;
   const address consts = (address)os::malloc(size, mtInternal);
   if (consts == nullptr) {
     vm_exit_out_of_memory(size, OOM_MALLOC_ERROR, "CRC constants: no enough space");
@@ -91,43 +88,8 @@ address StubRoutines::ppc::generate_crc_constants(juint reverse_poly) {
   juint* ptr = (juint*)consts;
 
   // Simple table used for single byte folding
-  LITTLE_ENDIAN_ONLY(if (use_vector)) {
-    for (int i = 0; i < 256; ++i) {
-      ptr[i] = fold_byte(i, reverse_poly);
-    }
-  }
-
-  if (!use_vector) {
-    BIG_ENDIAN_ONLY(ptr = (juint*)(consts + CRC32_TABLE_SIZE);)
-    // <= Power7: 4 tables
-    for (int i = 0; i < 256; ++i) {
-      juint a = fold_byte(i, reverse_poly),
-            b = fold_byte(a, reverse_poly),
-            c = fold_byte(b, reverse_poly),
-            d = fold_byte(c, reverse_poly);
-#ifndef VM_LITTLE_ENDIAN
-      a = byteswap(a);
-      b = byteswap(b);
-      c = byteswap(c);
-      d = byteswap(d);
-#endif
-      ptr[i         ] = a;
-      ptr[i +    256] = b;
-      ptr[i + 2* 256] = c;
-      ptr[i + 3* 256] = d;
-    }
-#if 0
-    for (int i = 0; i < 4; ++i) {
-      tty->print_cr("table %d:", i);
-      for (int j = 0; j < 32; ++j) {
-        for (int k = 0; k < 8; ++k) {
-          tty->print("%08x ", ptr[i*256 + j*8 + k]);
-        }
-        tty->cr();
-      }
-    }
-#endif
-    return consts;
+  for (int i = 0; i < 256; ++i) {
+    ptr[i] = fold_byte(i, reverse_poly);
   }
 
   // >= Power8: vector constants
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index b0570101912..b0e5731cbeb 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1078,7 +1078,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
 
   // PPC64 specific:
   switch (kind) {
-    case Interpreter::java_lang_math_sqrt: use_instruction = VM_Version::has_fsqrt(); break;
+    case Interpreter::java_lang_math_sqrt: use_instruction = true; break;
     case Interpreter::java_lang_math_abs:  use_instruction = true; break;
     case Interpreter::java_lang_math_fmaF:
     case Interpreter::java_lang_math_fmaD: use_instruction = UseFMA; break;
@@ -1091,7 +1091,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     case Interpreter::java_lang_math_tan  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);   break;
     case Interpreter::java_lang_math_tanh : /* run interpreted */ break;
     case Interpreter::java_lang_math_abs  : /* run interpreted */ break;
-    case Interpreter::java_lang_math_sqrt : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt);  break;
+    case Interpreter::java_lang_math_sqrt : /* run interpreted */  break;
     case Interpreter::java_lang_math_log  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);   break;
     case Interpreter::java_lang_math_log10: runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog10); break;
     case Interpreter::java_lang_math_pow  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dpow); num_args = 2; break;
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 8be6080e3d1..4770962853b 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -319,14 +319,7 @@ void TemplateTable::fast_aldc(LdcType type) {
   __ ld(R31, simm16_rest, R11_scratch1);
   __ resolve_oop_handle(R31, R11_scratch1, R12_scratch2, MacroAssembler::PRESERVATION_NONE);
   __ cmpld(CR0, R17_tos, R31);
-  if (VM_Version::has_isel()) {
-    __ isel_0(R17_tos, CR0, Assembler::equal);
-  } else {
-    Label not_sentinel;
-    __ bne(CR0, not_sentinel);
-    __ li(R17_tos, 0);
-    __ bind(not_sentinel);
-  }
+  __ isel_0(R17_tos, CR0, Assembler::equal);
   __ verify_oop(R17_tos);
   __ dispatch_epilog(atos, Bytecodes::length_for(bytecode()));
 
@@ -1534,25 +1527,12 @@ void TemplateTable::convert() {
     case Bytecodes::_i2f:
       __ extsw(R17_tos, R17_tos);
       __ move_l_to_d();
-      if (VM_Version::has_fcfids()) { // fcfids is >= Power7 only
-        // Comment: alternatively, load with sign extend could be done by lfiwax.
-        __ fcfids(F15_ftos, F15_ftos);
-      } else {
-        __ fcfid(F15_ftos, F15_ftos);
-        __ frsp(F15_ftos, F15_ftos);
-      }
+      __ fcfids(F15_ftos, F15_ftos);
       break;
 
     case Bytecodes::_l2f:
-      if (VM_Version::has_fcfids()) { // fcfids is >= Power7 only
-        __ move_l_to_d();
-        __ fcfids(F15_ftos, F15_ftos);
-      } else {
-        // Avoid rounding problem when result should be 0x3f800001: need fixup code before fcfid+frsp.
-        __ mr(R3_ARG1, R17_tos);
-        __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::l2f));
-        __ fmr(F15_ftos, F1_RET);
-      }
+      __ move_l_to_d();
+      __ fcfids(F15_ftos, F15_ftos);
       break;
 
     case Bytecodes::_f2d:
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index c8c53543d14..79efc9a05c1 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -64,16 +64,8 @@ void VM_Version::initialize() {
       FLAG_SET_ERGO(PowerArchitecturePPC64, 10);
     } else if (VM_Version::has_darn()) {
       FLAG_SET_ERGO(PowerArchitecturePPC64, 9);
-    } else if (VM_Version::has_lqarx()) {
-      FLAG_SET_ERGO(PowerArchitecturePPC64, 8);
-    } else if (VM_Version::has_popcntw()) {
-      FLAG_SET_ERGO(PowerArchitecturePPC64, 7);
-    } else if (VM_Version::has_cmpb()) {
-      FLAG_SET_ERGO(PowerArchitecturePPC64, 6);
-    } else if (VM_Version::has_popcntb()) {
-      FLAG_SET_ERGO(PowerArchitecturePPC64, 5);
     } else {
-      FLAG_SET_ERGO(PowerArchitecturePPC64, 0);
+      FLAG_SET_ERGO(PowerArchitecturePPC64, 8);
     }
   }
 
@@ -81,20 +73,14 @@ void VM_Version::initialize() {
   switch (PowerArchitecturePPC64) {
     case 10: if (!VM_Version::has_brw()    ) break;
     case  9: if (!VM_Version::has_darn()   ) break;
-    case  8: if (!VM_Version::has_lqarx()  ) break;
-    case  7: if (!VM_Version::has_popcntw()) break;
-    case  6: if (!VM_Version::has_cmpb()   ) break;
-    case  5: if (!VM_Version::has_popcntb()) break;
-    case  0: PowerArchitecturePPC64_ok = true; break;
+    case  8: PowerArchitecturePPC64_ok = true; break;
     default: break;
   }
   guarantee(PowerArchitecturePPC64_ok, "PowerArchitecturePPC64 cannot be set to "
             "%zu on this machine", PowerArchitecturePPC64);
 
   // Power 8: Configure Data Stream Control Register.
-  if (PowerArchitecturePPC64 >= 8 && has_mfdscr()) {
-    config_dscr();
-  }
+  config_dscr();
 
   if (!UseSIGTRAP) {
     MSG(TrapBasedICMissChecks);
@@ -109,27 +95,6 @@ void VM_Version::initialize() {
     FLAG_SET_ERGO(TrapBasedRangeChecks, false);
   }
 
-  // Power7 and later.
-  if (PowerArchitecturePPC64 > 6) {
-    if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
-      FLAG_SET_ERGO(UsePopCountInstruction, true);
-    }
-  }
-
-  if (!VM_Version::has_isel() && FLAG_IS_DEFAULT(ConditionalMoveLimit)) {
-    FLAG_SET_ERGO(ConditionalMoveLimit, 0);
-  }
-
-  if (PowerArchitecturePPC64 >= 8) {
-    if (FLAG_IS_DEFAULT(SuperwordUseVSX)) {
-      FLAG_SET_ERGO(SuperwordUseVSX, true);
-    }
-  } else {
-    if (SuperwordUseVSX) {
-      warning("SuperwordUseVSX specified, but needs at least Power8.");
-      FLAG_SET_DEFAULT(SuperwordUseVSX, false);
-    }
-  }
   MaxVectorSize = SuperwordUseVSX ? 16 : 8;
   if (FLAG_IS_DEFAULT(AlignVector)) {
     FLAG_SET_ERGO(AlignVector, false);
@@ -198,23 +163,7 @@ void VM_Version::initialize() {
   // Create and print feature-string.
   char buf[(num_features+1) * 16]; // Max 16 chars per feature.
   jio_snprintf(buf, sizeof(buf),
-               "ppc64%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-               (has_fsqrt()   ? " fsqrt"   : ""),
-               (has_isel()    ? " isel"    : ""),
-               (has_lxarxeh() ? " lxarxeh" : ""),
-               (has_cmpb()    ? " cmpb"    : ""),
-               (has_popcntb() ? " popcntb" : ""),
-               (has_popcntw() ? " popcntw" : ""),
-               (has_fcfids()  ? " fcfids"  : ""),
-               (has_vand()    ? " vand"    : ""),
-               (has_lqarx()   ? " lqarx"   : ""),
-               (has_vcipher() ? " aes"     : ""),
-               (has_vpmsumb() ? " vpmsumb" : ""),
-               (has_mfdscr()  ? " mfdscr"  : ""),
-               (has_vsx()     ? " vsx"     : ""),
-               (has_ldbrx()   ? " ldbrx"   : ""),
-               (has_stdbrx()  ? " stdbrx"  : ""),
-               (has_vshasig() ? " sha"     : ""),
+               "ppc64 sha aes%s%s",
                (has_darn()    ? " darn"    : ""),
                (has_brw()     ? " brw"     : "")
                // Make sure number of %s matches num_features!
@@ -283,24 +232,12 @@ void VM_Version::initialize() {
   }
 
   // The AES intrinsic stubs require AES instruction support.
-  if (has_vcipher()) {
-    if (FLAG_IS_DEFAULT(UseAES)) {
-      UseAES = true;
-    }
-  } else if (UseAES) {
-    if (!FLAG_IS_DEFAULT(UseAES))
-      warning("AES instructions are not available on this CPU");
-    FLAG_SET_DEFAULT(UseAES, false);
+  if (FLAG_IS_DEFAULT(UseAES)) {
+    UseAES = true;
   }
 
-  if (UseAES && has_vcipher()) {
-    if (FLAG_IS_DEFAULT(UseAESIntrinsics)) {
-      UseAESIntrinsics = true;
-    }
-  } else if (UseAESIntrinsics) {
-    if (!FLAG_IS_DEFAULT(UseAESIntrinsics))
-      warning("AES intrinsics are not available on this CPU");
-    FLAG_SET_DEFAULT(UseAESIntrinsics, false);
+  if (FLAG_IS_DEFAULT(UseAESIntrinsics)) {
+    UseAESIntrinsics = true;
   }
 
   if (UseAESCTRIntrinsics) {
@@ -308,15 +245,8 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
   }
 
-  if (VM_Version::has_vsx()) {
-    if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
-      UseGHASHIntrinsics = true;
-    }
-  } else if (UseGHASHIntrinsics) {
-    if (!FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
-      warning("GHASH intrinsics are not available on this CPU");
-    }
-    FLAG_SET_DEFAULT(UseGHASHIntrinsics, false);
+  if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
+    UseGHASHIntrinsics = true;
   }
 
   if (FLAG_IS_DEFAULT(UseFMA)) {
@@ -328,14 +258,8 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseMD5Intrinsics, false);
   }
 
-  if (has_vshasig()) {
-    if (FLAG_IS_DEFAULT(UseSHA)) {
-      UseSHA = true;
-    }
-  } else if (UseSHA) {
-    if (!FLAG_IS_DEFAULT(UseSHA))
-      warning("SHA instructions are not available on this CPU");
-    FLAG_SET_DEFAULT(UseSHA, false);
+  if (FLAG_IS_DEFAULT(UseSHA)) {
+    UseSHA = true;
   }
 
   if (UseSHA1Intrinsics) {
@@ -343,7 +267,7 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
   }
 
-  if (UseSHA && has_vshasig()) {
+  if (UseSHA) {
     if (FLAG_IS_DEFAULT(UseSHA256Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA256Intrinsics, true);
     }
@@ -352,7 +276,7 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
   }
 
-  if (UseSHA && has_vshasig()) {
+  if (UseSHA) {
     if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
     }
@@ -370,12 +294,6 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA, false);
   }
 
-  if (UseSecondarySupersTable && PowerArchitecturePPC64 < 7) {
-    if (!FLAG_IS_DEFAULT(UseSecondarySupersTable)) {
-      warning("UseSecondarySupersTable requires Power7 or later.");
-    }
-    FLAG_SET_DEFAULT(UseSecondarySupersTable, false);
-  }
 
 #ifdef COMPILER2
   if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index 6096f8e4fd1..a92aa5ca5e3 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -101,28 +101,10 @@ class VM_Version: public Abstract_VM_Version {
 
   static bool is_determine_features_test_running() { return _is_determine_features_test_running; }
   // CPU instruction support
-  static bool has_fsqrt()   { return (_features & fsqrt_m) != 0; }
-  static bool has_fsqrts()  { return (_features & fsqrts_m) != 0; }
-  static bool has_isel()    { return (_features & isel_m) != 0; }
-  static bool has_lxarxeh() { return (_features & lxarxeh_m) !=0; }
-  static bool has_cmpb()    { return (_features & cmpb_m) != 0; }
-  static bool has_popcntb() { return (_features & popcntb_m) != 0; }
-  static bool has_popcntw() { return (_features & popcntw_m) != 0; }
-  static bool has_fcfids()  { return (_features & fcfids_m) != 0; }
-  static bool has_vand()    { return (_features & vand_m) != 0; }
-  static bool has_lqarx()   { return (_features & lqarx_m) != 0; }
-  static bool has_vcipher() { return (_features & vcipher_m) != 0; }
-  static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
   static bool has_mfdscr()  { return (_features & mfdscr_m) != 0; }
-  static bool has_vsx()     { return (_features & vsx_m) != 0; }
-  static bool has_ldbrx()   { return (_features & ldbrx_m) != 0; }
-  static bool has_stdbrx()  { return (_features & stdbrx_m) != 0; }
-  static bool has_vshasig() { return (_features & vshasig_m) != 0; }
   static bool has_darn()    { return (_features & darn_m) != 0; }
   static bool has_brw()     { return (_features & brw_m) != 0; }
 
-  static bool has_mtfprd()  { return has_vpmsumb(); } // alias for P8
-
   // Assembler testing
   static void allow_all();
   static void revert();
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 4937456d09f..7dfbc3905bf 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -138,12 +138,6 @@ extern "C" int getargs(procsinfo*, int, char*, int);
 #define ERROR_MP_VMGETINFO_CLAIMS_NO_SUPPORT_FOR_64K 103
 
 // excerpts from sys/systemcfg.h that might be missing on older os levels
-#ifndef PV_7
-  #define PV_7 0x200000          /* Power PC 7 */
-#endif
-#ifndef PV_7_Compat
-  #define PV_7_Compat 0x208000   /* Power PC 7 */
-#endif
 #ifndef PV_8
   #define PV_8 0x300000          /* Power PC 8 */
 #endif
@@ -1247,33 +1241,6 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
   case PV_8:
     strncpy(buf, "Power PC 8", buflen);
     break;
-  case PV_7:
-    strncpy(buf, "Power PC 7", buflen);
-    break;
-  case PV_6_1:
-    strncpy(buf, "Power PC 6 DD1.x", buflen);
-    break;
-  case PV_6:
-    strncpy(buf, "Power PC 6", buflen);
-    break;
-  case PV_5:
-    strncpy(buf, "Power PC 5", buflen);
-    break;
-  case PV_5_2:
-    strncpy(buf, "Power PC 5_2", buflen);
-    break;
-  case PV_5_3:
-    strncpy(buf, "Power PC 5_3", buflen);
-    break;
-  case PV_5_Compat:
-    strncpy(buf, "PV_5_Compat", buflen);
-    break;
-  case PV_6_Compat:
-    strncpy(buf, "PV_6_Compat", buflen);
-    break;
-  case PV_7_Compat:
-    strncpy(buf, "PV_7_Compat", buflen);
-    break;
   case PV_8_Compat:
     strncpy(buf, "PV_8_Compat", buflen);
     break;
diff --git a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
index 41f1d85a2f2..1e4eb37cdac 100644
--- a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
@@ -246,53 +246,30 @@ inline T Atomic::PlatformCmpxchg<1>::operator()(T volatile* dest,
   // specified otherwise (see atomic.hpp).
 
   // Using 32 bit internally.
-  volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
-
-#ifdef VM_LITTLE_ENDIAN
-  const unsigned int shift_amount        = ((uintptr_t)dest & 3) * 8;
-#else
-  const unsigned int shift_amount        = ((~(uintptr_t)dest) & 3) * 8;
-#endif
-  const unsigned int masked_compare_val  = ((unsigned int)(unsigned char)compare_value),
-                     masked_exchange_val = ((unsigned int)(unsigned char)exchange_value),
-                     xor_value           = (masked_compare_val ^ masked_exchange_val) << shift_amount;
-
-  unsigned int old_value, value32;
-
+  unsigned int old_value, loaded_value;
   pre_membar(order);
 
   __asm__ __volatile__ (
-    /* simple guard */
-    "   lbz     %[old_value], 0(%[dest])                  \n"
-    "   cmpw    %[masked_compare_val], %[old_value]       \n"
-    "   bne-    2f                                        \n"
     /* atomic loop */
     "1:                                                   \n"
-    "   lwarx   %[value32], 0, %[dest_base]               \n"
+    "   lbarx   %[old_value], 0, %[dest]                  \n"
     /* extract byte and compare */
-    "   srd     %[old_value], %[value32], %[shift_amount] \n"
-    "   clrldi  %[old_value], %[old_value], 56            \n"
-    "   cmpw    %[masked_compare_val], %[old_value]       \n"
+    "   cmpw    %[compare_value], %[old_value]            \n"
     "   bne-    2f                                        \n"
     /* replace byte and try to store */
-    "   xor     %[value32], %[xor_value], %[value32]      \n"
-    "   stwcx.  %[value32], 0, %[dest_base]               \n"
+    "   stbcx.  %[exchange_value], 0, %[dest]             \n"
     "   bne-    1b                                        \n"
     /* exit */
     "2:                                                   \n"
     /* out */
     : [old_value]           "=&r"   (old_value),
-      [value32]             "=&r"   (value32),
-                            "=m"    (*dest),
-                            "=m"    (*dest_base)
+      [loaded_value]        "=&r"   (loaded_value),
+                            "=m"    (*dest)
     /* in */
-    : [dest]                "b"     (dest),
-      [dest_base]           "b"     (dest_base),
-      [shift_amount]        "r"     (shift_amount),
-      [masked_compare_val]  "r"     (masked_compare_val),
-      [xor_value]           "r"     (xor_value),
-                            "m"     (*dest),
-                            "m"     (*dest_base)
+    : [dest]            "b"     (dest),
+      [compare_value]   "r"     (compare_value),
+      [exchange_value]  "r"     (exchange_value),
+                        "m"     (*dest)
     /* clobber */
     : "cc",
       "memory"
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index ab31f093146..56471e096b8 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -441,7 +441,7 @@ double SharedRuntime::dabs(double f)  {
 
 #endif
 
-#if defined(__SOFTFP__) || defined(PPC)
+#if defined(__SOFTFP__)
 double SharedRuntime::dsqrt(double f) {
   return sqrt(f);
 }
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index de16a33fdcc..86074ac7aca 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -185,7 +185,7 @@ class SharedRuntime: AllStatic {
   static double dabs(double f);
 #endif
 
-#if defined(__SOFTFP__) || defined(PPC)
+#if defined(__SOFTFP__)
   static double dsqrt(double f);
 #endif
 

From 9946c85e2f905f18340a76cebce04b0003783cb4 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 26 May 2025 08:27:30 +0000
Subject: [PATCH 637/901] 8357621: G1: Clean up G1BiasedArray

Reviewed-by: sjohanss, ayang
---
 src/hotspot/share/gc/g1/g1BiasedArray.cpp     |  8 ---
 src/hotspot/share/gc/g1/g1BiasedArray.hpp     | 56 ++++++-------------
 .../gtest/gc/g1/test_g1BiasedArray.cpp        | 18 +++++-
 3 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.cpp b/src/hotspot/share/gc/g1/g1BiasedArray.cpp
index 05b8d7834e7..e03513a89a3 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.cpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.cpp
@@ -56,12 +56,4 @@ void G1BiasedMappedArrayBase::verify_biased_index(idx_t biased_index) const {
             "Biased index out of bounds, index: %zu bias: %zu length: %zu",
             biased_index, bias(), length());
 }
-
-void G1BiasedMappedArrayBase::verify_biased_index_inclusive_end(idx_t biased_index) const {
-  guarantee(_biased_base != nullptr, "Array not initialized");
-  guarantee(biased_index >= bias() && biased_index <= (bias() + length()),
-            "Biased index out of inclusive bounds, index: %zu bias: %zu length: %zu",
-            biased_index, bias(), length());
-}
-
 #endif
diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
index da99f928ab5..d2e308f78b0 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
@@ -38,19 +38,6 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
 
   void* _alloc_base;      // the address the unpadded array has been allocated to
 
-public:
-  typedef size_t idx_t;
-
-protected:
-  address _base;          // the real base address
-  size_t _length;         // the length of the array
-  address _biased_base;   // base address biased by "bias" elements
-  size_t _bias;           // the bias, i.e. the offset biased_base is located to the right in elements
-  uint _shift_by;         // the amount of bits to shift right when mapping to an index of the array.
-
-protected:
-  G1BiasedMappedArrayBase();
-
   // Allocate a new array, generic version.
   address create_new_base_array(size_t length, size_t elem_size);
 
@@ -67,6 +54,18 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
     _shift_by = shift_by;
   }
 
+public:
+  typedef size_t idx_t;
+
+protected:
+  address _base;          // the real base address
+  size_t _length;         // the length of the array
+  address _biased_base;   // base address biased by "bias" elements
+  size_t _bias;           // the bias, i.e. the offset biased_base is located to the right in elements
+  uint _shift_by;         // the amount of bits to shift right when mapping to an index of the array.
+
+  G1BiasedMappedArrayBase();
+
   // Allocate and initialize this array to cover the heap addresses in the range
   // of [bottom, end).
   void initialize(HeapWord* bottom, HeapWord* end, size_t target_elem_size_in_bytes, size_t mapping_granularity_in_bytes) {
@@ -90,7 +89,6 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
 
   void verify_index(idx_t index) const PRODUCT_RETURN;
   void verify_biased_index(idx_t biased_index) const PRODUCT_RETURN;
-  void verify_biased_index_inclusive_end(idx_t biased_index) const PRODUCT_RETURN;
 
 public:
   virtual ~G1BiasedMappedArrayBase();
@@ -103,10 +101,15 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
 // heap into this array.
 template<class T>
 class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
+protected:
+  T* base() const { return (T*)G1BiasedMappedArrayBase::_base; }
+
+  // The raw biased base pointer.
+  T* biased_base() const { return (T*)G1BiasedMappedArrayBase::_biased_base; }
+
 public:
   typedef G1BiasedMappedArrayBase::idx_t idx_t;
 
-  T* base() const { return (T*)G1BiasedMappedArrayBase::_base; }
   // Return the element of the given array at the given index. Assume
   // the index is valid. This is a convenience method that does sanity
   // checking on the index.
@@ -123,9 +126,6 @@ class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
     this->base()[index] = value;
   }
 
-  // The raw biased base pointer.
-  T* biased_base() const { return (T*)G1BiasedMappedArrayBase::_biased_base; }
-
   // Return the element of the given array that covers the given word in the
   // heap. Assumes the index is valid.
   T get_by_address(HeapWord* value) const {
@@ -154,26 +154,6 @@ class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
     biased_base()[biased_index] = value;
   }
 
-  // Set the value of all array entries that correspond to addresses
-  // in the specified MemRegion.
-  void set_by_address(MemRegion range, T value) {
-    idx_t biased_start = ((uintptr_t)range.start()) >> this->shift_by();
-    idx_t biased_last = ((uintptr_t)range.last()) >> this->shift_by();
-    this->verify_biased_index(biased_start);
-    this->verify_biased_index(biased_last);
-    for (idx_t i = biased_start; i <= biased_last; i++) {
-      biased_base()[i] = value;
-    }
-  }
-
-protected:
-  // Returns the address of the element the given address maps to
-  T* address_mapped_to(HeapWord* address) {
-    idx_t biased_index = ((uintptr_t)address) >> this->shift_by();
-    this->verify_biased_index_inclusive_end(biased_index);
-    return biased_base() + biased_index;
-  }
-
 public:
   // Return the smallest address (inclusive) in the heap that this array covers.
   HeapWord* bottom_address_mapped() const {
diff --git a/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp b/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
index 4b6af09ce09..b8b86425190 100644
--- a/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
@@ -25,13 +25,29 @@
 #include "unittest.hpp"
 
 class TestMappedArray : public G1BiasedMappedArray<int> {
+  void verify_biased_index_inclusive_end(idx_t biased_index) const {
+    guarantee(_biased_base != nullptr, "Array not initialized");
+    guarantee(biased_index >= bias() && biased_index <= (bias() + length()),
+              "Biased index out of inclusive bounds, index: %zu bias: %zu length: %zu",
+              biased_index, bias(), length());
+  }
+
 public:
   virtual int default_value() const {
     return 0xBAADBABE;
   }
+
+  // Returns the address of the element the given address maps to
   int* my_address_mapped_to(HeapWord* address) {
-    return address_mapped_to(address);
+    idx_t biased_index = ((uintptr_t)address) >> shift_by();
+    verify_biased_index_inclusive_end(biased_index);
+    return biased_base() + biased_index;
   }
+
+  int* base() const { return G1BiasedMappedArray<int>::base(); }
+
+  // The raw biased base pointer.
+  int* biased_base() const { return G1BiasedMappedArray<int>::biased_base(); }
 };
 
 TEST_VM(G1BiasedArray, simple) {

From ed4cd2acd2d8bb92c296c5a860c76cffaff53add Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Mon, 26 May 2025 08:33:37 +0000
Subject: [PATCH 638/901] 8356989: Unexpected null in C2 compiled code

Reviewed-by: chagedorn, kvn, thartmann
---
 src/hotspot/share/opto/escape.cpp             | 12 ++--
 ...SameSrcDstInitializesNonEscapingArray.java | 60 +++++++++++++++++++
 2 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopySameSrcDstInitializesNonEscapingArray.java

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 3a6a81f656e..3dd43f12b2f 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -2260,14 +2260,10 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
             }
             PointsToNode* src_ptn = ptnode_adr(src->_idx);
             assert(src_ptn != nullptr, "should be registered");
-            if (arg_ptn != src_ptn) {
-              // Special arraycopy edge:
-              // A destination object's field can't have the source object
-              // as base since objects escape states are not related.
-              // Only escape state of destination object's fields affects
-              // escape state of fields in source object.
-              add_arraycopy(call, es, src_ptn, arg_ptn);
-            }
+            // Special arraycopy edge:
+            // Only escape state of destination object's fields affects
+            // escape state of fields in source object.
+            add_arraycopy(call, es, src_ptn, arg_ptn);
           }
         }
       }
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopySameSrcDstInitializesNonEscapingArray.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopySameSrcDstInitializesNonEscapingArray.java
new file mode 100644
index 00000000000..ffc44266c1d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopySameSrcDstInitializesNonEscapingArray.java
@@ -0,0 +1,60 @@
+/*
+ * 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 8356989
+ * @summary Unexpected null in C2 compiled code
+ * @run main/othervm -XX:-BackgroundCompilation TestArrayCopySameSrcDstInitializesNonEscapingArray
+ * @run main TestArrayCopySameSrcDstInitializesNonEscapingArray
+ */
+
+ public class TestArrayCopySameSrcDstInitializesNonEscapingArray {
+    private static volatile int volatileField;
+
+    public static void main(String[] args) {
+        Object obj = new Object();
+        for (int i = 0; i < 20_000; i++) {
+            test1(obj);
+        }
+    }
+
+    private static void test1(Object obj) {
+        A a = new A();
+        Object[] array = new Object[2];
+        array[0] = obj;
+        a.field = array;
+        System.arraycopy(array, 0, array, 1, 1);
+        if (a.field[1] == null) {
+            throw new RuntimeException("Can't be null");
+        }
+    }
+
+    private static class A {
+        Object[] field;
+
+        public A() {
+            field = null;
+        }
+    }
+}

From f825a51198137799f00a0ec2cefa1daa59542f68 Mon Sep 17 00:00:00 2001
From: Kieran Farrell <kieran.farrell@oracle.com>
Date: Mon, 26 May 2025 11:12:49 +0000
Subject: [PATCH 639/901] 7046003: Default value of
 Authenticator.getRequestingURL() is not specified

Reviewed-by: michaelm, jpai
---
 src/java.base/share/classes/java/net/Authenticator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/net/Authenticator.java b/src/java.base/share/classes/java/net/Authenticator.java
index 9ac504f9a62..fb33596feed 100644
--- a/src/java.base/share/classes/java/net/Authenticator.java
+++ b/src/java.base/share/classes/java/net/Authenticator.java
@@ -426,12 +426,12 @@ protected PasswordAuthentication getPasswordAuthentication() {
     }
 
     /**
-     * Returns the URL that resulted in this
-     * request for authentication.
+     * Returns the URL that resulted in this request for authentication.
+     * If the corresponding request does not specify a URL, this method returns null.
      *
      * @since 1.5
      *
-     * @return the requesting URL
+     * @return the requesting URL, or null if not available.
      *
      */
     protected URL getRequestingURL () {

From 7002233ed943a21b49bc69ff728964d004b2d5c1 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Mon, 26 May 2025 11:16:59 +0000
Subject: [PATCH 640/901] 8351950: C2: AVX512 vector assembler routines causing
 SIGFPE / no valid evex tuple_table entry

Reviewed-by: epeter, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp         | 109 ++++++++-------
 .../incubator/vector/Byte128VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Byte256VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Byte512VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Byte64VectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/ByteMaxVectorTests.java  | 132 ++++++++++++++++++
 .../vector/Double128VectorTests.java          | 132 ++++++++++++++++++
 .../vector/Double256VectorTests.java          | 132 ++++++++++++++++++
 .../vector/Double512VectorTests.java          | 132 ++++++++++++++++++
 .../incubator/vector/Double64VectorTests.java | 132 ++++++++++++++++++
 .../vector/DoubleMaxVectorTests.java          | 132 ++++++++++++++++++
 .../incubator/vector/Float128VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Float256VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Float512VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Float64VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/FloatMaxVectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Int128VectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/Int256VectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/Int512VectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/Int64VectorTests.java    | 132 ++++++++++++++++++
 .../incubator/vector/IntMaxVectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/Long128VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Long256VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Long512VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Long64VectorTests.java   | 132 ++++++++++++++++++
 .../incubator/vector/LongMaxVectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/Short128VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Short256VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Short512VectorTests.java | 132 ++++++++++++++++++
 .../incubator/vector/Short64VectorTests.java  | 132 ++++++++++++++++++
 .../incubator/vector/ShortMaxVectorTests.java | 132 ++++++++++++++++++
 test/jdk/jdk/incubator/vector/gen-template.sh |  12 ++
 .../Kernel-Binary-Masked-mem-op.template      |  11 ++
 .../templates/Kernel-Binary-mem-op.template   |   9 ++
 .../Unit-Binary-Masked-mem-op.template        |   8 ++
 .../templates/Unit-Binary-mem-op.template     |   8 ++
 .../vector/templates/Unit-header.template     |  26 ++++
 37 files changed, 4095 insertions(+), 48 deletions(-)
 create mode 100644 test/jdk/jdk/incubator/vector/templates/Kernel-Binary-Masked-mem-op.template
 create mode 100644 test/jdk/jdk/incubator/vector/templates/Kernel-Binary-mem-op.template
 create mode 100644 test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-mem-op.template
 create mode 100644 test/jdk/jdk/incubator/vector/templates/Unit-Binary-mem-op.template

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 7a4d7c6d6f3..1b17663971d 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -4589,7 +4589,7 @@ void Assembler::packuswb(XMMRegister dst, Address src) {
   assert((UseAVX > 0), "SSE mode requires address alignment 16 bytes");
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8(0x67);
   emit_operand(dst, src, 0);
@@ -4653,6 +4653,7 @@ void Assembler::vpermb(XMMRegister dst, XMMRegister nds, Address src, int vector
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
   emit_int8((unsigned char)0x8D);
   emit_operand(dst, src, 0);
@@ -4683,6 +4684,7 @@ void Assembler::vpermd(XMMRegister dst, XMMRegister nds, Address src, int vector
   // VEX.NDS.256.66.0F38.W0 36 /r
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
   emit_int8(0x36);
   emit_operand(dst, src, 0);
@@ -5392,7 +5394,7 @@ void Assembler::evpmovzxbd(XMMRegister dst, KRegister mask, Address src, int vec
   assert(dst != xnoreg, "sanity");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* rex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ false, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_HVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_QVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   attributes.set_is_evex_instruction();
   vex_prefix(src, 0, dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
@@ -8191,6 +8193,7 @@ void Assembler::paddd(XMMRegister dst, XMMRegister src) {
 void Assembler::paddd(XMMRegister dst, Address src) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   simd_prefix(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xFE);
   emit_operand(dst, src, 0);
@@ -8364,7 +8367,7 @@ void Assembler::vpaddsb(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xEC);
   emit_operand(dst, src, 0);
@@ -8383,7 +8386,7 @@ void Assembler::vpaddsw(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xED);
   emit_operand(dst, src, 0);
@@ -8402,7 +8405,7 @@ void Assembler::vpaddusb(XMMRegister dst, XMMRegister nds, Address src, int vect
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xDC);
   emit_operand(dst, src, 0);
@@ -8422,7 +8425,7 @@ void Assembler::vpaddusw(XMMRegister dst, XMMRegister nds, Address src, int vect
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xDD);
   emit_operand(dst, src, 0);
@@ -8442,7 +8445,7 @@ void Assembler::vpsubsb(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xE8);
   emit_operand(dst, src, 0);
@@ -8461,7 +8464,7 @@ void Assembler::vpsubsw(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xE9);
   emit_operand(dst, src, 0);
@@ -8480,7 +8483,7 @@ void Assembler::vpsubusb(XMMRegister dst, XMMRegister nds, Address src, int vect
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xD8);
   emit_operand(dst, src, 0);
@@ -8499,7 +8502,7 @@ void Assembler::vpsubusw(XMMRegister dst, XMMRegister nds, Address src, int vect
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xD9);
   emit_operand(dst, src, 0);
@@ -8867,7 +8870,7 @@ void Assembler::vpminub(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xDA);
   emit_operand(dst, src, 0);
@@ -8890,7 +8893,7 @@ void Assembler::evpminub(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -8913,7 +8916,7 @@ void Assembler::vpminuw(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(!needs_evex(dst, nds) || VM_Version::supports_avx512bw(), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
   emit_int8((unsigned char)0x3A);
   emit_operand(dst, src, 0);
@@ -8936,7 +8939,7 @@ void Assembler::evpminuw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -9036,7 +9039,7 @@ void Assembler::vpmaxub(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(UseAVX > 0 && (vector_len == Assembler::AVX_512bit || (!needs_evex(dst, nds) || VM_Version::supports_avx512vl())), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int8((unsigned char)0xDE);
   emit_operand(dst, src, 0);
@@ -9059,7 +9062,7 @@ void Assembler::evpmaxub(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -9084,7 +9087,7 @@ void Assembler::vpmaxuw(XMMRegister dst, XMMRegister nds, Address src, int vecto
   assert(UseAVX > 0 && (vector_len == Assembler::AVX_512bit || (!needs_evex(dst, nds) || VM_Version::supports_avx512vl())), "");
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ _legacy_mode_bw, /* no_mask_reg */ true, /* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes);
   emit_int8((unsigned char)0x3E);
   emit_operand(dst, src, 0);
@@ -9107,7 +9110,7 @@ void Assembler::evpmaxuw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -10552,7 +10555,7 @@ void Assembler::evpaddb(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10579,7 +10582,7 @@ void Assembler::evpaddw(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10722,7 +10725,7 @@ void Assembler::evpsubb(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10749,7 +10752,7 @@ void Assembler::evpsubw(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10892,7 +10895,7 @@ void Assembler::evpaddsb(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10919,7 +10922,7 @@ void Assembler::evpaddsw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10946,7 +10949,7 @@ void Assembler::evpaddusb(XMMRegister dst, KRegister mask, XMMRegister nds, Addr
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -10973,7 +10976,7 @@ void Assembler::evpaddusw(XMMRegister dst, KRegister mask, XMMRegister nds, Addr
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11000,7 +11003,7 @@ void Assembler::evpsubsb(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11027,7 +11030,7 @@ void Assembler::evpsubsw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11054,7 +11057,7 @@ void Assembler::evpsubusb(XMMRegister dst, KRegister mask, XMMRegister nds, Addr
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11082,7 +11085,7 @@ void Assembler::evpsubusw(XMMRegister dst, KRegister mask, XMMRegister nds, Addr
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11109,7 +11112,7 @@ void Assembler::evpmullw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11375,7 +11378,6 @@ void Assembler::evdivsd(XMMRegister dst, XMMRegister nds, XMMRegister src, EvexR
 void Assembler::evpabsb(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len) {
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11390,7 +11392,7 @@ void Assembler::evpabsb(XMMRegister dst, KRegister mask, Address src, bool merge
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11404,7 +11406,6 @@ void Assembler::evpabsb(XMMRegister dst, KRegister mask, Address src, bool merge
 void Assembler::evpabsw(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len) {
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11419,7 +11420,7 @@ void Assembler::evpabsw(XMMRegister dst, KRegister mask, Address src, bool merge
   InstructionMark im(this);
   assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");
   InstructionAttr attributes(vector_len, /* vex_w */ false,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11539,7 +11540,7 @@ void Assembler::evpfma213pd(XMMRegister dst, KRegister mask, XMMRegister nds, Ad
   assert(VM_Version::supports_evex(), "");
   assert(vector_len == AVX_512bit || VM_Version::supports_avx512vl(), "");
   InstructionAttr attributes(vector_len, /* vex_w */ true,/* legacy_mode */ false, /* no_mask_reg */ false,/* uses_vl */ true);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_32bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV,/* input_size_in_bits */ EVEX_NObit);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
@@ -11568,6 +11569,7 @@ void Assembler::evpermb(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -11594,6 +11596,7 @@ void Assembler::evpermw(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -11620,6 +11623,7 @@ void Assembler::evpermd(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -11646,6 +11650,7 @@ void Assembler::evpermq(XMMRegister dst, KRegister mask, XMMRegister nds, Addres
   InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12014,6 +12019,7 @@ void Assembler::evpminsb(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12039,6 +12045,7 @@ void Assembler::evpminsw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -12068,6 +12075,7 @@ void Assembler::evpminsd(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12096,6 +12104,7 @@ void Assembler::evpminsq(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12123,6 +12132,7 @@ void Assembler::evpmaxsb(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12149,6 +12159,7 @@ void Assembler::evpmaxsw(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12177,6 +12188,7 @@ void Assembler::evpmaxsd(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
   attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   if (merge) {
     attributes.reset_is_clear_context();
   }
@@ -12204,6 +12216,7 @@ void Assembler::evpmaxsq(XMMRegister dst, KRegister mask, XMMRegister nds, Addre
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   attributes.set_embedded_opmask_register_specifier(mask);
   if (merge) {
     attributes.reset_is_clear_context();
@@ -12574,7 +12587,7 @@ void Assembler::evpgatherdq(XMMRegister dst, KRegister mask, Address src, int ve
   assert(mask != k0, "instruction will #UD if mask is in k0");
   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_T1S, /* input_size_in_bits */ EVEX_32bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   attributes.reset_is_clear_context();
   attributes.set_embedded_opmask_register_specifier(mask);
   attributes.set_is_evex_instruction();
@@ -12592,7 +12605,7 @@ void Assembler::evgatherdpd(XMMRegister dst, KRegister mask, Address src, int ve
   assert(mask != k0, "instruction will #UD if mask is in k0");
   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_T1S, /* input_size_in_bits */ EVEX_32bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   attributes.reset_is_clear_context();
   attributes.set_embedded_opmask_register_specifier(mask);
   attributes.set_is_evex_instruction();
@@ -12639,7 +12652,7 @@ void Assembler::evpscatterdq(Address dst, KRegister mask, XMMRegister src, int v
   assert(mask != k0, "instruction will #UD if mask is in k0");
   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_T1S, /* input_size_in_bits */ EVEX_32bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   attributes.reset_is_clear_context();
   attributes.set_embedded_opmask_register_specifier(mask);
   attributes.set_is_evex_instruction();
@@ -12667,7 +12680,7 @@ void Assembler::evscatterdpd(Address dst, KRegister mask, XMMRegister src, int v
   assert(mask != k0, "instruction will #UD if mask is in k0");
   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_T1S, /* input_size_in_bits */ EVEX_32bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
   attributes.reset_is_clear_context();
   attributes.set_embedded_opmask_register_specifier(mask);
   attributes.set_is_evex_instruction();
@@ -14852,7 +14865,7 @@ void Assembler::cvtsi2sdq(XMMRegister dst, Register src) {
 void Assembler::cvtsi2sdq(XMMRegister dst, Address src) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_32bit);
   simd_prefix(dst, dst, src, VEX_SIMD_F2, VEX_OPCODE_0F, &attributes);
   emit_int8(0x2A);
   emit_operand(dst, src, 0);
@@ -14861,7 +14874,7 @@ void Assembler::cvtsi2sdq(XMMRegister dst, Address src) {
 void Assembler::cvtsi2ssq(XMMRegister dst, Address src) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_32bit);
   simd_prefix(dst, dst, src, VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
   emit_int8(0x2A);
   emit_operand(dst, src, 0);
@@ -16443,7 +16456,7 @@ void Assembler::evaddph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x58);
   emit_operand(dst, src, 0);
@@ -16464,7 +16477,7 @@ void Assembler::evsubph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x5C);
   emit_operand(dst, src, 0);
@@ -16485,7 +16498,7 @@ void Assembler::evmulph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x59);
   emit_operand(dst, src, 0);
@@ -16506,7 +16519,7 @@ void Assembler::evminph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x5D);
   emit_operand(dst, src, 0);
@@ -16527,7 +16540,7 @@ void Assembler::evmaxph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x5F);
   emit_operand(dst, src, 0);
@@ -16548,7 +16561,7 @@ void Assembler::evdivph(XMMRegister dst, XMMRegister nds, Address src, int vecto
   InstructionMark im(this);
   InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_is_evex_instruction();
-  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_NObit);
   vex_prefix(src, nds->encoding(), dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_MAP5, &attributes);
   emit_int8(0x5E);
   emit_operand(dst, src, 0);
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
index 7c8265169f4..5ead28c47f0 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2907,6 +2933,112 @@ static void ROLByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
     }
 
 
+    static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::MIN);
+    }
+
+    static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void minByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::min);
+    }
+
+    static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MINByte128VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte128VectorTests::MIN);
+    }
+
+    static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::MAX);
+    }
+
+    static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void maxByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::max);
+    }
+
+    static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MAXByte128VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte128VectorTests::MAX);
+    }
+
     static byte MIN(byte a, byte b) {
         return (byte)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
index 0fbbca79f5d..22d645b2502 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2907,6 +2933,112 @@ static void ROLByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
     }
 
 
+    static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::MIN);
+    }
+
+    static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void minByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::min);
+    }
+
+    static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MINByte256VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte256VectorTests::MIN);
+    }
+
+    static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::MAX);
+    }
+
+    static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void maxByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::max);
+    }
+
+    static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MAXByte256VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte256VectorTests::MAX);
+    }
+
     static byte MIN(byte a, byte b) {
         return (byte)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
index a17e621a0e6..738d6898374 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2907,6 +2933,112 @@ static void ROLByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
     }
 
 
+    static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::MIN);
+    }
+
+    static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void minByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::min);
+    }
+
+    static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MINByte512VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte512VectorTests::MIN);
+    }
+
+    static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::MAX);
+    }
+
+    static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void maxByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::max);
+    }
+
+    static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MAXByte512VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte512VectorTests::MAX);
+    }
+
     static byte MIN(byte a, byte b) {
         return (byte)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
index 58f1d6295a0..6d80672f3eb 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2907,6 +2933,112 @@ static void ROLByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
     }
 
 
+    static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::MIN);
+    }
+
+    static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void minByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::min);
+    }
+
+    static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MINByte64VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte64VectorTests::MIN);
+    }
+
+    static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::MAX);
+    }
+
+    static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void maxByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::max);
+    }
+
+    static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MAXByte64VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, Byte64VectorTests::MAX);
+    }
+
     static byte MIN(byte a, byte b) {
         return (byte)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
index 9aaf1b6db95..276ee98fd62 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
@@ -421,6 +421,17 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, FBinOp f) {
         int i = 0;
         try {
@@ -460,6 +471,21 @@ static void assertArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(byte[] r, byte[] a, byte b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(byte[] r, byte[] a, byte[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2912,6 +2938,112 @@ static void ROLByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
     }
 
 
+    static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::MIN);
+    }
+
+    static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void minByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::min);
+    }
+
+    static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MINByteMaxVectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, ByteMaxVectorTests::MIN);
+    }
+
+    static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::MAX);
+    }
+
+    static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void maxByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::max);
+    }
+
+    static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
+
+    @Test(dataProvider = "byteUnaryOpMaskProvider")
+    static void MAXByteMaxVectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (byte)10, mask, ByteMaxVectorTests::MAX);
+    }
+
     static byte MIN(byte a, byte b) {
         return (byte)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
index 05678c4290b..9aea4137a3c 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mas
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2024,6 +2050,112 @@ static void ADDDouble128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
         assertBroadcastLongArraysEquals(r, a, b, mask, Double128VectorTests::ADD);
     }
 
+    static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double128VectorTests::MIN);
+    }
+
+    static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void minDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double128VectorTests::min);
+    }
+
+    static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MINDouble128VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double128VectorTests::MIN);
+    }
+
+    static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double128VectorTests::MAX);
+    }
+
+    static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void maxDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double128VectorTests::max);
+    }
+
+    static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MAXDouble128VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double128VectorTests::MAX);
+    }
+
     static double MIN(double a, double b) {
         return (double)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
index fe59fc85a2e..b0d9825fa9d 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mas
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2024,6 +2050,112 @@ static void ADDDouble256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
         assertBroadcastLongArraysEquals(r, a, b, mask, Double256VectorTests::ADD);
     }
 
+    static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double256VectorTests::MIN);
+    }
+
+    static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void minDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double256VectorTests::min);
+    }
+
+    static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MINDouble256VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double256VectorTests::MIN);
+    }
+
+    static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double256VectorTests::MAX);
+    }
+
+    static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void maxDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double256VectorTests::max);
+    }
+
+    static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MAXDouble256VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double256VectorTests::MAX);
+    }
+
     static double MIN(double a, double b) {
         return (double)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
index 1e5b68ab989..672c943bae2 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mas
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2024,6 +2050,112 @@ static void ADDDouble512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
         assertBroadcastLongArraysEquals(r, a, b, mask, Double512VectorTests::ADD);
     }
 
+    static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double512VectorTests::MIN);
+    }
+
+    static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void minDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double512VectorTests::min);
+    }
+
+    static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MINDouble512VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double512VectorTests::MIN);
+    }
+
+    static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double512VectorTests::MAX);
+    }
+
+    static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void maxDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double512VectorTests::max);
+    }
+
+    static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MAXDouble512VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double512VectorTests::MAX);
+    }
+
     static double MIN(double a, double b) {
         return (double)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
index b56b4d237f4..415763c5882 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mas
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2024,6 +2050,112 @@ static void ADDDouble64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doubl
         assertBroadcastLongArraysEquals(r, a, b, mask, Double64VectorTests::ADD);
     }
 
+    static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double64VectorTests::MIN);
+    }
+
+    static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void minDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double64VectorTests::min);
+    }
+
+    static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MINDouble64VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double64VectorTests::MIN);
+    }
+
+    static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double64VectorTests::MAX);
+    }
+
+    static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void maxDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, Double64VectorTests::max);
+    }
+
+    static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MAXDouble64VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, Double64VectorTests::MAX);
+    }
+
     static double MIN(double a, double b) {
         return (double)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
index 43da4f57636..992f16006db 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
@@ -439,6 +439,17 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, FBinOp f) {
         int i = 0;
         try {
@@ -478,6 +489,21 @@ static void assertArraysEquals(double[] r, double[] a, double[] b, boolean[] mas
         }
     }
 
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(double[] r, double[] a, double b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(double[] r, double[] a, double[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2029,6 +2055,112 @@ static void ADDDoubleMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<doub
         assertBroadcastLongArraysEquals(r, a, b, mask, DoubleMaxVectorTests::ADD);
     }
 
+    static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::MIN);
+    }
+
+    static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void minDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::min);
+    }
+
+    static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MINDoubleMaxVectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, DoubleMaxVectorTests::MIN);
+    }
+
+    static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::MAX);
+    }
+
+    static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void maxDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::max);
+    }
+
+    static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
+
+    @Test(dataProvider = "doubleUnaryOpMaskProvider")
+    static void MAXDoubleMaxVectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+        double[] a = fa.apply(SPECIES.length());
+        double[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (double)10, mask, DoubleMaxVectorTests::MAX);
+    }
+
     static double MIN(double a, double b) {
         return (double)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
index 549199513d5..4fc6d1bdb45 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2035,6 +2061,112 @@ static void ADDFloat128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
         assertBroadcastLongArraysEquals(r, a, b, mask, Float128VectorTests::ADD);
     }
 
+    static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float128VectorTests::MIN);
+    }
+
+    static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void minFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float128VectorTests::min);
+    }
+
+    static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MINFloat128VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float128VectorTests::MIN);
+    }
+
+    static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float128VectorTests::MAX);
+    }
+
+    static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void maxFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float128VectorTests::max);
+    }
+
+    static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MAXFloat128VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float128VectorTests::MAX);
+    }
+
     static float MIN(float a, float b) {
         return (float)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
index 6d17727c325..59104c40b9e 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2035,6 +2061,112 @@ static void ADDFloat256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
         assertBroadcastLongArraysEquals(r, a, b, mask, Float256VectorTests::ADD);
     }
 
+    static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float256VectorTests::MIN);
+    }
+
+    static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void minFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float256VectorTests::min);
+    }
+
+    static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MINFloat256VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float256VectorTests::MIN);
+    }
+
+    static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float256VectorTests::MAX);
+    }
+
+    static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void maxFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float256VectorTests::max);
+    }
+
+    static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MAXFloat256VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float256VectorTests::MAX);
+    }
+
     static float MIN(float a, float b) {
         return (float)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
index c2290eb7080..3cc45a88e84 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2035,6 +2061,112 @@ static void ADDFloat512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
         assertBroadcastLongArraysEquals(r, a, b, mask, Float512VectorTests::ADD);
     }
 
+    static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float512VectorTests::MIN);
+    }
+
+    static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void minFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float512VectorTests::min);
+    }
+
+    static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MINFloat512VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float512VectorTests::MIN);
+    }
+
+    static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float512VectorTests::MAX);
+    }
+
+    static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void maxFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float512VectorTests::max);
+    }
+
+    static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MAXFloat512VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float512VectorTests::MAX);
+    }
+
     static float MIN(float a, float b) {
         return (float)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
index 0d50726f644..70aaeb134a6 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
@@ -434,6 +434,17 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
@@ -473,6 +484,21 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2035,6 +2061,112 @@ static void ADDFloat64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[
         assertBroadcastLongArraysEquals(r, a, b, mask, Float64VectorTests::ADD);
     }
 
+    static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float64VectorTests::MIN);
+    }
+
+    static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void minFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float64VectorTests::min);
+    }
+
+    static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MINFloat64VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float64VectorTests::MIN);
+    }
+
+    static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float64VectorTests::MAX);
+    }
+
+    static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void maxFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, Float64VectorTests::max);
+    }
+
+    static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MAXFloat64VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, Float64VectorTests::MAX);
+    }
+
     static float MIN(float a, float b) {
         return (float)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
index 6a0b1301ab3..c22b2d329f1 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
@@ -439,6 +439,17 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, FBinOp f) {
         int i = 0;
         try {
@@ -478,6 +489,21 @@ static void assertArraysEquals(float[] r, float[] a, float[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(float[] r, float[] a, float b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(float[] r, float[] a, float[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2040,6 +2066,112 @@ static void ADDFloatMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float
         assertBroadcastLongArraysEquals(r, a, b, mask, FloatMaxVectorTests::ADD);
     }
 
+    static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::MIN);
+    }
+
+    static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void minFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::min);
+    }
+
+    static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MINFloatMaxVectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, FloatMaxVectorTests::MIN);
+    }
+
+    static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::MAX);
+    }
+
+    static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void maxFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::max);
+    }
+
+    static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
+
+    @Test(dataProvider = "floatUnaryOpMaskProvider")
+    static void MAXFloatMaxVectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+        float[] a = fa.apply(SPECIES.length());
+        float[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (float)10, mask, FloatMaxVectorTests::MAX);
+    }
+
     static float MIN(float a, float b) {
         return (float)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
index 4f8f296c519..a88dcf27888 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int128VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMa
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2951,6 +2977,112 @@ static void ROLInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
     }
 
 
+    static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int128VectorTests::MIN);
+    }
+
+    static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void minInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int128VectorTests::min);
+    }
+
+    static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MINInt128VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int128VectorTests::MIN);
+    }
+
+    static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int128VectorTests::MAX);
+    }
+
+    static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void maxInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int128VectorTests::max);
+    }
+
+    static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MAXInt128VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int128VectorTests::MAX);
+    }
+
     static int MIN(int a, int b) {
         return (int)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
index 312227c54e1..1b88adf9c21 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int256VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMa
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2951,6 +2977,112 @@ static void ROLInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
     }
 
 
+    static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int256VectorTests::MIN);
+    }
+
+    static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void minInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int256VectorTests::min);
+    }
+
+    static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MINInt256VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int256VectorTests::MIN);
+    }
+
+    static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int256VectorTests::MAX);
+    }
+
+    static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void maxInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int256VectorTests::max);
+    }
+
+    static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MAXInt256VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int256VectorTests::MAX);
+    }
+
     static int MIN(int a, int b) {
         return (int)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
index 3e5b51180b6..a9da97d66ce 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int512VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMa
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2951,6 +2977,112 @@ static void ROLInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
     }
 
 
+    static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int512VectorTests::MIN);
+    }
+
+    static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void minInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int512VectorTests::min);
+    }
+
+    static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MINInt512VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int512VectorTests::MIN);
+    }
+
+    static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int512VectorTests::MAX);
+    }
+
+    static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void maxInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int512VectorTests::max);
+    }
+
+    static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MAXInt512VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int512VectorTests::MAX);
+    }
+
     static int MIN(int a, int b) {
         return (int)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
index fccad11d4d6..b41bf7b95d5 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Int64VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMa
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2951,6 +2977,112 @@ static void ROLInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
     }
 
 
+    static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int64VectorTests::MIN);
+    }
+
+    static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void minInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int64VectorTests::min);
+    }
+
+    static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MINInt64VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int64VectorTests::MIN);
+    }
+
+    static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int64VectorTests::MAX);
+    }
+
+    static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void maxInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, Int64VectorTests::max);
+    }
+
+    static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MAXInt64VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, Int64VectorTests::MAX);
+    }
+
     static int MIN(int a, int b) {
         return (int)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
index 3254c2fb86c..d2b910ba8ae 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
@@ -421,6 +421,17 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, FBinOp f) {
         int i = 0;
         try {
@@ -460,6 +471,21 @@ static void assertArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinMa
         }
     }
 
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(int[] r, int[] a, int b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(int[] r, int[] a, int[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2956,6 +2982,112 @@ static void ROLIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
     }
 
 
+    static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::MIN);
+    }
+
+    static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void minIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::min);
+    }
+
+    static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MINIntMaxVectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, IntMaxVectorTests::MIN);
+    }
+
+    static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::MAX);
+    }
+
+    static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void maxIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::max);
+    }
+
+    static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
+
+    @Test(dataProvider = "intUnaryOpMaskProvider")
+    static void MAXIntMaxVectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+        int[] a = fa.apply(SPECIES.length());
+        int[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                IntVector av = IntVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (int)10, mask, IntMaxVectorTests::MAX);
+    }
+
     static int MIN(int a, int b) {
         return (int)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
index 09fdc3c1979..5bc29f498ba 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long128VectorTests.java
@@ -373,6 +373,17 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
@@ -412,6 +423,21 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2973,6 +2999,112 @@ static void ROLLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
     }
 
 
+    static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long128VectorTests::MIN);
+    }
+
+    static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void minLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long128VectorTests::min);
+    }
+
+    static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MINLong128VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long128VectorTests::MIN);
+    }
+
+    static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long128VectorTests::MAX);
+    }
+
+    static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void maxLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long128VectorTests::max);
+    }
+
+    static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MAXLong128VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long128VectorTests::MAX);
+    }
+
     static long MIN(long a, long b) {
         return (long)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
index 7dd0da772ed..25a73d1916e 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long256VectorTests.java
@@ -373,6 +373,17 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
@@ -412,6 +423,21 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2973,6 +2999,112 @@ static void ROLLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
     }
 
 
+    static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long256VectorTests::MIN);
+    }
+
+    static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void minLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long256VectorTests::min);
+    }
+
+    static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MINLong256VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long256VectorTests::MIN);
+    }
+
+    static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long256VectorTests::MAX);
+    }
+
+    static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void maxLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long256VectorTests::max);
+    }
+
+    static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MAXLong256VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long256VectorTests::MAX);
+    }
+
     static long MIN(long a, long b) {
         return (long)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
index 360e822e121..dab8ac0621a 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long512VectorTests.java
@@ -373,6 +373,17 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
@@ -412,6 +423,21 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2973,6 +2999,112 @@ static void ROLLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
     }
 
 
+    static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long512VectorTests::MIN);
+    }
+
+    static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void minLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long512VectorTests::min);
+    }
+
+    static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MINLong512VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long512VectorTests::MIN);
+    }
+
+    static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long512VectorTests::MAX);
+    }
+
+    static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void maxLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long512VectorTests::max);
+    }
+
+    static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MAXLong512VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long512VectorTests::MAX);
+    }
+
     static long MIN(long a, long b) {
         return (long)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
index 31f6fafea7c..f62ffc6554c 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Long64VectorTests.java
@@ -373,6 +373,17 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
@@ -412,6 +423,21 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2973,6 +2999,112 @@ static void ROLLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
     }
 
 
+    static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long64VectorTests::MIN);
+    }
+
+    static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void minLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long64VectorTests::min);
+    }
+
+    static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MINLong64VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long64VectorTests::MIN);
+    }
+
+    static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long64VectorTests::MAX);
+    }
+
+    static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void maxLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, Long64VectorTests::max);
+    }
+
+    static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MAXLong64VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, Long64VectorTests::MAX);
+    }
+
     static long MIN(long a, long b) {
         return (long)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
index a3cacbe3251..70441d0d763 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
@@ -378,6 +378,17 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, FBinOp f) {
         int i = 0;
         try {
@@ -417,6 +428,21 @@ static void assertArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBi
         }
     }
 
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(long[] r, long[] a, long b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(long[] r, long[] a, long[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2978,6 +3004,112 @@ static void ROLLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
     }
 
 
+    static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::MIN);
+    }
+
+    static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void minLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::min);
+    }
+
+    static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MINLongMaxVectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, LongMaxVectorTests::MIN);
+    }
+
+    static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::MAX);
+    }
+
+    static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void maxLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::max);
+    }
+
+    static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
+
+    @Test(dataProvider = "longUnaryOpMaskProvider")
+    static void MAXLongMaxVectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+        long[] a = fa.apply(SPECIES.length());
+        long[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                LongVector av = LongVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (long)10, mask, LongMaxVectorTests::MAX);
+    }
+
     static long MIN(long a, long b) {
         return (long)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
index 967418181bf..b4240dabc87 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short128VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2898,6 +2924,112 @@ static void ROLShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa
     }
 
 
+    static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short128VectorTests::MIN);
+    }
+
+    static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void minShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short128VectorTests::min);
+    }
+
+    static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MINShort128VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short128VectorTests::MIN);
+    }
+
+    static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short128VectorTests::MAX);
+    }
+
+    static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void maxShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short128VectorTests::max);
+    }
+
+    static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MAXShort128VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short128VectorTests::MAX);
+    }
+
     static short MIN(short a, short b) {
         return (short)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
index 2386d89e53b..902cac11eb6 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short256VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2898,6 +2924,112 @@ static void ROLShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa
     }
 
 
+    static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short256VectorTests::MIN);
+    }
+
+    static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void minShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short256VectorTests::min);
+    }
+
+    static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MINShort256VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short256VectorTests::MIN);
+    }
+
+    static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short256VectorTests::MAX);
+    }
+
+    static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void maxShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short256VectorTests::max);
+    }
+
+    static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MAXShort256VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short256VectorTests::MAX);
+    }
+
     static short MIN(short a, short b) {
         return (short)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
index cb9fc1830b9..39ab2da2925 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short512VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2898,6 +2924,112 @@ static void ROLShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa
     }
 
 
+    static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short512VectorTests::MIN);
+    }
+
+    static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void minShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short512VectorTests::min);
+    }
+
+    static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MINShort512VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short512VectorTests::MIN);
+    }
+
+    static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short512VectorTests::MAX);
+    }
+
+    static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void maxShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short512VectorTests::max);
+    }
+
+    static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MAXShort512VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short512VectorTests::MAX);
+    }
+
     static short MIN(short a, short b) {
         return (short)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
index 64bb5f52329..ff3cea2e051 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Short64VectorTests.java
@@ -416,6 +416,17 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
@@ -455,6 +466,21 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2898,6 +2924,112 @@ static void ROLShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
     }
 
 
+    static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short64VectorTests::MIN);
+    }
+
+    static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void minShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short64VectorTests::min);
+    }
+
+    static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MINShort64VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short64VectorTests::MIN);
+    }
+
+    static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short64VectorTests::MAX);
+    }
+
+    static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void maxShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, Short64VectorTests::max);
+    }
+
+    static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MAXShort64VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, Short64VectorTests::MAX);
+    }
+
     static short MIN(short a, short b) {
         return (short)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
index 6445443b9d6..25b219f8abc 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
@@ -421,6 +421,17 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, FBinOp f) {
         int i = 0;
         try {
@@ -460,6 +471,21 @@ static void assertArraysEquals(short[] r, short[] a, short[] b, boolean[] mask,
         }
     }
 
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals(short[] r, short[] a, short b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals(short[] r, short[] a, short[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }
@@ -2903,6 +2929,112 @@ static void ROLShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa
     }
 
 
+    static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::MIN);
+    }
+
+    static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void minShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.min(bv_min).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::min);
+    }
+
+    static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MINShortMaxVectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MIN, bv_MIN_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, ShortMaxVectorTests::MIN);
+    }
+
+    static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::MAX);
+    }
+
+    static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void maxShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.max(bv_max).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::max);
+    }
+
+    static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
+
+    @Test(dataProvider = "shortUnaryOpMaskProvider")
+    static void MAXShortMaxVectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+        short[] a = fa.apply(SPECIES.length());
+        short[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.MAX, bv_MAX_M, vmask).intoArray(r, i);
+            }
+        }
+
+        assertArraysEquals(r, a, (short)10, mask, ShortMaxVectorTests::MAX);
+    }
+
     static short MIN(short a, short b) {
         return (short)(Math.min(a, b));
     }
diff --git a/test/jdk/jdk/incubator/vector/gen-template.sh b/test/jdk/jdk/incubator/vector/gen-template.sh
index 06e89b824cd..da5585b1305 100644
--- a/test/jdk/jdk/incubator/vector/gen-template.sh
+++ b/test/jdk/jdk/incubator/vector/gen-template.sh
@@ -42,6 +42,8 @@ ternary_double_broadcast_masked="Ternary-Double-Broadcast-Masked-op"
 ternary_scalar="Ternary-Scalar-op"
 binary="Binary-op"
 binary_masked="Binary-Masked-op"
+binary_memop="Binary-mem-op"
+binary_masked_memop="Binary-Masked-mem-op"
 saturating_binary="SaturatingBinary-op"
 saturating_binary_masked="SaturatingBinary-Masked-op"
 binary_broadcast="Binary-Broadcast-op"
@@ -255,6 +257,12 @@ function gen_binary_alu_op {
   gen_op_tmpl $binary_masked "$@"
 }
 
+function gen_binary_alu_mem_op {
+  echo "Generating binary op $1 ($2)..."
+  gen_op_tmpl $binary_memop "$@"
+  gen_op_tmpl $binary_masked_memop "$@"
+}
+
 function gen_binary_alu_bcst_op {
   echo "Generating binary broadcast op $1 ($2)..."
   gen_op_tmpl $binary_broadcast "$@"
@@ -464,6 +472,10 @@ gen_shift_cst_op  "ASHR" "(a >> CONST_SHIFT)" "BITWISE"
 gen_shift_cst_op  "ROR" "ROR_scalar(a, CONST_SHIFT)" "BITWISE"
 gen_shift_cst_op  "ROL" "ROL_scalar(a, CONST_SHIFT)" "BITWISE"
 
+# Binary operation with one memory operand
+gen_binary_alu_mem_op "MIN+min+withMask", "Math.min(a, b)"
+gen_binary_alu_mem_op "MAX+max+withMask", "Math.max(a, b)"
+
 # Masked reductions.
 gen_binary_op_no_masked "MIN+min" "Math.min(a, b)"
 gen_binary_op_no_masked "MAX+max" "Math.max(a, b)"
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-Masked-mem-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-Masked-mem-op.template
new file mode 100644
index 00000000000..f42e5be6f39
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-Masked-mem-op.template
@@ -0,0 +1,11 @@
+        $type$[] a = fa.apply(SPECIES.length());
+        $type$[] r = fr.apply(SPECIES.length());
+        boolean[] mask = fm.apply(SPECIES.length());
+        VectorMask<$Wideboxtype$> vmask = VectorMask.fromArray(SPECIES, mask, 0);
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.[[TEST]], bv_[[TEST]]_M, vmask).intoArray(r, i);
+            }
+        }
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-mem-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-mem-op.template
new file mode 100644
index 00000000000..a0231b3f653
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Binary-mem-op.template
@@ -0,0 +1,9 @@
+        $type$[] a = fa.apply(SPECIES.length());
+        $type$[] r = fr.apply(SPECIES.length());
+
+        for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            for (int i = 0; i < a.length; i += SPECIES.length()) {
+                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
+                av.lanewise(VectorOperators.[[TEST]], bv_[[TEST]]).intoArray(r, i);
+            }
+        }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-mem-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-mem-op.template
new file mode 100644
index 00000000000..3c2ffd68607
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-Masked-mem-op.template
@@ -0,0 +1,8 @@
+
+    static $abstractvectortype$ bv_[[TEST]]_M = $abstractvectortype$.broadcast(SPECIES, ($type$)10);
+
+    @Test(dataProvider = "$type$UnaryOpMaskProvider")
+    static void [[TEST]]$vectorteststype$MaskedWithMemOp(IntFunction<$type$[]> fa, IntFunction<boolean[]> fm) {
+[[KERNEL]]
+        assertArraysEquals(r, a, ($type$)10, mask, $vectorteststype$::[[TEST]]);
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Binary-mem-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-mem-op.template
new file mode 100644
index 00000000000..1fef6ddb989
--- /dev/null
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Binary-mem-op.template
@@ -0,0 +1,8 @@
+
+    static $abstractvectortype$ bv_[[TEST]] = $abstractvectortype$.broadcast(SPECIES, ($type$)10);
+
+    @Test(dataProvider = "$type$UnaryOpProvider")
+    static void [[TEST]]$vectorteststype$WithMemOp(IntFunction<$type$[]> fa) {
+[[KERNEL]]
+        assertArraysEquals(r, a, ($type$)10, $vectorteststype$::[[TEST]]);
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index 991f82cc7cf..66646b15918 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -513,6 +513,17 @@ relativeError));
         }
     }
 
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$ b, FBinOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b));
+            }
+        } catch (AssertionError e) {
+            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+        }
+    }
+
     static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, FBinOp f) {
         int i = 0;
         try {
@@ -552,6 +563,21 @@ relativeError));
         }
     }
 
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$ b, boolean[] mask, FBinOp f) {
+        assertArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
+    }
+
+    static void assertArraysEquals($type$[] r, $type$[] a, $type$ b, boolean[] mask, FBinMaskOp f) {
+        int i = 0;
+        try {
+            for (; i < a.length; i++) {
+                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+            }
+        } catch (AssertionError err) {
+            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+        }
+    }
+
     static void assertBroadcastArraysEquals($type$[] r, $type$[] a, $type$[] b, boolean[] mask, FBinOp f) {
         assertBroadcastArraysEquals(r, a, b, mask, FBinMaskOp.lift(f));
     }

From daa8eda530c4c3929c68ace1f1a2d1ed62331584 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Mon, 26 May 2025 11:52:32 +0000
Subject: [PATCH 641/901] 8357056: RISC-V: Asm fixes - load/store width

Reviewed-by: fjiang, mli, luhenry, fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 382 ++++++++++++----------
 1 file changed, 213 insertions(+), 169 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 1495e604086..3cdc9b70d52 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -671,29 +671,86 @@ class Assembler : public AbstractAssembler {
 
 #undef INSN
 
-// Load/store register (all modes)
-#define INSN(NAME, op, funct3)                                                                     \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                      \
-    guarantee(is_simm12(offset), "offset is invalid.");                                            \
-    unsigned insn = 0;                                                                             \
-    int32_t val = offset & 0xfff;                                                                  \
-    patch((address)&insn, 6, 0, op);                                                               \
-    patch((address)&insn, 14, 12, funct3);                                                         \
-    patch_reg((address)&insn, 15, Rs);                                                             \
-    patch_reg((address)&insn, 7, Rd);                                                              \
-    patch((address)&insn, 31, 20, val);                                                            \
-    emit(insn);                                                                                    \
-  }
-
-  INSN(lb,  0b0000011, 0b000);
-  INSN(_lbu, 0b0000011, 0b100);
-  INSN(_lh,  0b0000011, 0b001);
-  INSN(_lhu, 0b0000011, 0b101);
-  INSN(_lw, 0b0000011, 0b010);
-  INSN(lwu, 0b0000011, 0b110);
-  INSN(_ld, 0b0000011, 0b011);
+ private:
+  // Load
+  enum LoadWidthFunct3 : uint8_t {
+    LOAD_WIDTH_BYTE              = 0b000,
+    LOAD_WIDTH_HALFWORD          = 0b001,
+    LOAD_WIDTH_WORD              = 0b010,
+    LOAD_WIDTH_DOUBLEWORD        = 0b011,
+    LOAD_WIDTH_BYTE_UNSIGNED     = 0b100,
+    LOAD_WIDTH_HALFWORD_UNSIGNED = 0b101,
+    LOAD_WIDTH_WORD_UNSIGNED     = 0b110,
+    // 0b111 is reserved
+  };
 
-#undef INSN
+  static constexpr uint8_t OP_LOAD_MAJOR    = 0b0000011;
+  static constexpr uint8_t OP_FP_LOAD_MAJOR = 0b0000111;
+
+  template <uint8_t op_major, LoadWidthFunct3 width>
+  void load_base(uint8_t Rd, Register Rs, const int32_t offset) {
+    guarantee(is_simm12(offset), "offset is invalid.");
+    unsigned insn = 0;
+    int32_t val = offset & 0xfff;
+    patch((address)&insn,  6,  0, op_major);
+    patch((address)&insn, 11,  7, Rd);
+    patch((address)&insn, 14, 12, width);
+    patch_reg((address)&insn, 15, Rs);
+    patch((address)&insn, 31, 20, val);
+    emit(insn);
+  }
+
+  template <LoadWidthFunct3 width>
+  void load_base(Register Rd, Register Rs, const int32_t offset) {
+    load_base<OP_LOAD_MAJOR, width>(Rd->raw_encoding(), Rs, offset);
+  }
+
+  template <LoadWidthFunct3 width>
+  void load_base(FloatRegister Rd, Register Rs, const int32_t offset) {
+    load_base<OP_FP_LOAD_MAJOR, width>(Rd->raw_encoding(), Rs, offset);
+  }
+
+ public:
+
+  void lb(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_BYTE>(Rd, Rs, offset);
+  }
+
+  void _lbu(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_BYTE_UNSIGNED>(Rd, Rs, offset);
+  }
+
+  void _lh(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_HALFWORD>(Rd, Rs, offset);
+  }
+
+  void _lhu(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_HALFWORD_UNSIGNED>(Rd, Rs, offset);
+  }
+
+  void _lw(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_WORD>(Rd, Rs, offset);
+  }
+
+  void lwu(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_WORD_UNSIGNED>(Rd, Rs, offset);
+  }
+
+  void _ld(Register Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_DOUBLEWORD>(Rd, Rs, offset);
+  }
+
+  void flh(FloatRegister Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_HALFWORD>(Rd, Rs, offset);
+  }
+
+  void flw(FloatRegister Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_WORD>(Rd, Rs, offset);
+  }
+
+  void _fld(FloatRegister Rd, Register Rs, const int32_t offset) {
+    load_base<LOAD_WIDTH_DOUBLEWORD>(Rd, Rs, offset);
+  }
 
 #define INSN(NAME, op, funct3)                                                                           \
   void NAME(Register Rs1, Register Rs2, const int64_t offset) {                                          \
@@ -724,30 +781,70 @@ class Assembler : public AbstractAssembler {
 
 #undef INSN
 
-#define INSN(NAME, REGISTER, op, funct3)                                                                    \
-  void NAME(REGISTER Rs1, Register Rs2, const int32_t offset) {                                             \
-    guarantee(is_simm12(offset), "offset is invalid.");                                                     \
-    unsigned insn = 0;                                                                                      \
-    uint32_t val  = offset & 0xfff;                                                                         \
-    uint32_t low  = val & 0x1f;                                                                             \
-    uint32_t high = (val >> 5) & 0x7f;                                                                      \
-    patch((address)&insn, 6, 0, op);                                                                        \
-    patch((address)&insn, 14, 12, funct3);                                                                  \
-    patch_reg((address)&insn, 15, Rs2);                                                                     \
-    patch_reg((address)&insn, 20, Rs1);                                                                     \
-    patch((address)&insn, 11, 7, low);                                                                      \
-    patch((address)&insn, 31, 25, high);                                                                    \
-    emit(insn);                                                                                             \
-  }                                                                                                         \
+ private:
 
-  INSN(_sb,   Register,      0b0100011, 0b000);
-  INSN(_sh,   Register,      0b0100011, 0b001);
-  INSN(_sw,  Register,      0b0100011, 0b010);
-  INSN(_sd,  Register,      0b0100011, 0b011);
-  INSN(fsw,  FloatRegister, 0b0100111, 0b010);
-  INSN(_fsd, FloatRegister, 0b0100111, 0b011);
+  enum StoreWidthFunct3 : uint8_t {
+    STORE_WIDTH_BYTE        = 0b000,
+    STORE_WIDTH_HALFWORD    = 0b001,
+    STORE_WIDTH_WORD        = 0b010,
+    STORE_WIDTH_DOUBLEWORD  = 0b011,
+    // 0b100 to 0b111 are reserved for this opcode
+  };
 
-#undef INSN
+  static constexpr uint8_t OP_STORE_MAJOR    = 0b0100011;
+  static constexpr uint8_t OP_FP_STORE_MAJOR = 0b0100111;
+
+  template <uint8_t op_code, StoreWidthFunct3 width>
+  void store_base(uint8_t Rs2, Register Rs1, const int32_t offset) {
+    guarantee(is_simm12(offset), "offset is invalid.");
+    unsigned insn = 0;
+    uint32_t val  = offset & 0xfff;
+    uint32_t low  = val & 0x1f;
+    uint32_t high = (val >> 5) & 0x7f;
+    patch((address)&insn,  6,  0, op_code);
+    patch((address)&insn, 11,  7, low);
+    patch((address)&insn, 14, 12, width);
+    patch_reg((address)&insn, 15, Rs1);
+    patch((address)&insn, 24, 20, Rs2);
+    patch((address)&insn, 31, 25, high);
+    emit(insn);
+  }
+
+  template <StoreWidthFunct3 width>
+  void store_base(Register Rs2, Register Rs1, const int32_t offset) {
+    store_base<OP_STORE_MAJOR, width>(Rs2->raw_encoding(), Rs1, offset);
+  }
+
+  template <StoreWidthFunct3 width>
+  void store_base(FloatRegister Rs2, Register Rs1, const int32_t offset) {
+    store_base<OP_FP_STORE_MAJOR, width>(Rs2->raw_encoding(), Rs1, offset);
+  }
+
+ public:
+
+  void _sb(Register Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_BYTE>(Rs2, Rs1, offset);
+  }
+
+  void _sh(Register Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_HALFWORD>(Rs2, Rs1, offset);
+  }
+
+  void _sw(Register Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_WORD>(Rs2, Rs1, offset);
+  }
+
+  void _sd(Register Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_DOUBLEWORD>(Rs2, Rs1, offset);
+  }
+
+  void fsw(FloatRegister Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_WORD>(Rs2, Rs1, offset);
+  }
+
+  void _fsd(FloatRegister Rs2, Register Rs1, const int32_t offset) {
+    store_base<STORE_WIDTH_DOUBLEWORD>(Rs2, Rs1, offset);
+  }
 
 #define INSN(NAME, op, funct3)                                                        \
   void NAME(Register Rd, const uint32_t csr, Register Rs1) {                          \
@@ -1345,29 +1442,6 @@ enum operand_size { int8, int16, int32, uint32, int64 };
     fp_base<D_64_dp, 0b11100>(Rd, Rs1, 0b00000, 0b000);
   }
 
- private:
-  static constexpr unsigned int OP_LOAD_FP = 0b0000111;
-
-  template <int8_t FpWidth>
-  void fp_load(FloatRegister Rd, Register Rs, const int32_t offset) {
-    guarantee(is_uimm3(FpWidth), "Rounding mode is out of validity");
-    guarantee(is_simm12(offset), "offset is invalid.");
-    unsigned insn = 0;
-    uint32_t val = offset & 0xfff;
-    patch((address)&insn,   6, 0, OP_LOAD_FP);
-    patch_reg((address)&insn,  7, Rd);
-    patch((address)&insn, 14, 12, FpWidth);
-    patch_reg((address)&insn, 15, Rs);
-    patch((address)&insn, 31, 20, val);
-    emit(insn);
-  }
-
- 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); }
-
  private:
   template <FmtPrecision Fmt, uint8_t OpVal>
   void fp_fm(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, FloatRegister Rs3, RoundingMode rm) {
@@ -3185,125 +3259,95 @@ enum Nf {
 // --------------------------
 // Load/store register
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
-    /* lw -> c.lwsp/c.lw */                                                                  \
-    if (do_compress()) {                                                                     \
-      if (is_c_lwswsp(Rs, Rd, offset, true)) {                                               \
-        c_lwsp(Rd, offset);                                                                  \
-        return;                                                                              \
-      } else if (is_c_lwsw(Rs, Rd, offset)) {                                                \
-        c_lw(Rd, Rs, offset);                                                                \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _lw(Rd, Rs, offset);                                                                     \
+  void lw(Register Rd, Register Rs, const int32_t offset) {
+    /* lw -> c.lwsp/c.lw */
+    if (do_compress()) {
+      if (is_c_lwswsp(Rs, Rd, offset, true)) {
+        c_lwsp(Rd, offset);
+        return;
+      } else if (is_c_lwsw(Rs, Rd, offset)) {
+        c_lw(Rd, Rs, offset);
+        return;
+      }
+    }
+    _lw(Rd, Rs, offset);
   }
 
-  INSN(lw);
-
-#undef INSN
-
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
-    /* ld -> c.ldsp/c.ld */                                                                  \
-    if (do_compress()) {                                                                     \
-      if (is_c_ldsdsp(Rs, Rd, offset, true)) {                                               \
-        c_ldsp(Rd, offset);                                                                  \
-        return;                                                                              \
-      } else if (is_c_ldsd(Rs, Rd, offset)) {                                                \
-        c_ld(Rd, Rs, offset);                                                                \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _ld(Rd, Rs, offset);                                                                     \
+  void ld(Register Rd, Register Rs, const int32_t offset) {
+    /* ld -> c.ldsp/c.ld */
+    if (do_compress()) {
+      if (is_c_ldsdsp(Rs, Rd, offset, true)) {
+        c_ldsp(Rd, offset);
+        return;
+      } else if (is_c_ldsd(Rs, Rd, offset)) {
+        c_ld(Rd, Rs, offset);
+        return;
+      }
+    }
+    _ld(Rd, Rs, offset);
   }
 
-  INSN(ld);
-
-#undef INSN
-
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(FloatRegister Rd, Register Rs, const int32_t offset) {                           \
-    /* fld -> c.fldsp/c.fld */                                                               \
-    if (do_compress()) {                                                                     \
-      if (is_c_fldsdsp(Rs, offset)) {                                                        \
-        c_fldsp(Rd, offset);                                                                 \
-        return;                                                                              \
-      } else if (is_c_fldsd(Rs, Rd, offset)) {                                               \
-        c_fld(Rd, Rs, offset);                                                               \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _fld(Rd, Rs, offset);                                                                    \
+  void fld(FloatRegister Rd, Register Rs, const int32_t offset) {
+    /* fld -> c.fldsp/c.fld */
+    if (do_compress()) {
+      if (is_c_fldsdsp(Rs, offset)) {
+        c_fldsp(Rd, offset);
+        return;
+      } else if (is_c_fldsd(Rs, Rd, offset)) {
+        c_fld(Rd, Rs, offset);
+        return;
+      }
+    }
+    _fld(Rd, Rs, offset);
   }
 
-  INSN(fld);
-
-#undef INSN
-
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
-    /* sd -> c.sdsp/c.sd */                                                                  \
-    if (do_compress()) {                                                                     \
-      if (is_c_ldsdsp(Rs, Rd, offset, false)) {                                              \
-        c_sdsp(Rd, offset);                                                                  \
-        return;                                                                              \
-      } else if (is_c_ldsd(Rs, Rd, offset)) {                                                \
-        c_sd(Rd, Rs, offset);                                                                \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _sd(Rd, Rs, offset);                                                                     \
+  void sd(Register Rs2, Register Rs1, const int32_t offset) {
+    /* sd -> c.sdsp/c.sd */
+    if (do_compress()) {
+      if (is_c_ldsdsp(Rs1, Rs2, offset, false)) {
+        c_sdsp(Rs2, offset);
+        return;
+      } else if (is_c_ldsd(Rs1, Rs2, offset)) {
+        c_sd(Rs2, Rs1, offset);
+        return;
+      }
+    }
+    _sd(Rs2, Rs1, offset);
   }
 
-  INSN(sd);
-
-#undef INSN
-
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(Register Rd, Register Rs, const int32_t offset) {                                \
-    /* sw -> c.swsp/c.sw */                                                                  \
-    if (do_compress()) {                                                                     \
-      if (is_c_lwswsp(Rs, Rd, offset, false)) {                                              \
-        c_swsp(Rd, offset);                                                                  \
-        return;                                                                              \
-      } else if (is_c_lwsw(Rs, Rd, offset)) {                                                \
-        c_sw(Rd, Rs, offset);                                                                \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _sw(Rd, Rs, offset);                                                                     \
+  void sw(Register Rs2, Register Rs1, const int32_t offset) {
+    /* sw -> c.swsp/c.sw */
+    if (do_compress()) {
+      if (is_c_lwswsp(Rs1, Rs2, offset, false)) {
+        c_swsp(Rs2, offset);
+        return;
+      } else if (is_c_lwsw(Rs1, Rs2, offset)) {
+        c_sw(Rs2, Rs1, offset);
+        return;
+      }
+    }
+    _sw(Rs2, Rs1, offset);
   }
 
-  INSN(sw);
-
-#undef INSN
-
 // --------------------------
-#define INSN(NAME)                                                                           \
-  void NAME(FloatRegister Rd, Register Rs, const int32_t offset) {                           \
-    /* fsd -> c.fsdsp/c.fsd */                                                               \
-    if (do_compress()) {                                                                     \
-      if (is_c_fldsdsp(Rs, offset)) {                                                        \
-        c_fsdsp(Rd, offset);                                                                 \
-        return;                                                                              \
-      } else if (is_c_fldsd(Rs, Rd, offset)) {                                               \
-        c_fsd(Rd, Rs, offset);                                                               \
-        return;                                                                              \
-      }                                                                                      \
-    }                                                                                        \
-    _fsd(Rd, Rs, offset);                                                                    \
+  void fsd(FloatRegister Rs2, Register Rs1, const int32_t offset) {
+    /* fsd -> c.fsdsp/c.fsd */
+    if (do_compress()) {
+      if (is_c_fldsdsp(Rs1, offset)) {
+        c_fsdsp(Rs2, offset);
+        return;
+      } else if (is_c_fldsd(Rs1, Rs2, offset)) {
+        c_fsd(Rs2, Rs1, offset);
+        return;
+      }
+    }
+    _fsd(Rs2, Rs1, offset);
   }
 
-  INSN(fsd);
-
-#undef INSN
-
 // --------------------------
 // Unconditional branch instructions
 // --------------------------

From bd095896dd6e3fccb932f3d9823008766e9ab18d Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Mon, 26 May 2025 12:40:49 +0000
Subject: [PATCH 642/901] 8356632: Fix remaining {@link/@linkplain} tags with
 refer to private/protected types in java.base

Reviewed-by: weijun, liach
---
 .../share/classes/java/lang/invoke/MethodHandles.java     | 6 +++---
 .../share/classes/java/lang/module/ModuleDescriptor.java  | 2 +-
 src/java.base/share/classes/java/net/Socket.java          | 8 ++++----
 .../share/classes/java/util/concurrent/ForkJoinTask.java  | 4 ++--
 src/java.base/share/classes/javax/crypto/KEM.java         | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

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 007834ed5f4..3d7ba22e54e 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -2821,10 +2821,10 @@ private IllegalAccessException makeAccessException(Class<?> targetClass) {
          * if and only if one of the following is true:
          * <ul>
          * <li>{@code targetClass} is in {@code M0} and {@code M1}
-         *     {@linkplain Module#reads reads} {@code M0} and the type is
+         *     {@linkplain Module#canRead(Module)}  reads} {@code M0} and the type is
          *     in a package that is exported to at least {@code M1}.
          * <li>{@code targetClass} is in {@code M1} and {@code M0}
-         *     {@linkplain Module#reads reads} {@code M1} and the type is
+         *     {@linkplain Module#canRead(Module)}  reads} {@code M1} and the type is
          *     in a package that is exported to at least {@code M0}.
          * <li>{@code targetClass} is in a third module {@code M2} and both {@code M0}
          *     and {@code M1} reads {@code M2} and the type is in a package
@@ -4890,7 +4890,7 @@ private static MethodHandle identityOrVoid(Class<?> type) {
      * @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#primitiveZero
+     * @see MethodHandles#zero(Class)
      * @see MethodHandles#constant
      * @since 9
      */
diff --git a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
index 169c2656bba..7aac752cc89 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
@@ -2020,7 +2020,7 @@ public Builder uses(String service) {
 
         /**
          * Provides a service with one or more implementations. The package for
-         * each {@link Provides#providers provider} (or provider factory) is
+         * each {@link Provides#providers() provider} (or provider factory) is
          * added to the module if not already added.
          *
          * @param  p
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index cdf2d703233..d2afa166a88 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -679,7 +679,7 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
      *          SocketAddress subclass not supported by this socket
      *
      * @since   1.4
-     * @see #isBound
+     * @see #isBound()
      */
     public void bind(SocketAddress bindpoint) throws IOException {
         int s = state;
@@ -1612,7 +1612,7 @@ private void closeSuppressingExceptions(Throwable parentException) {
      * as well.
      *
      * @throws     IOException  if an I/O error occurs when closing this socket.
-     * @see #isClosed
+     * @see #isClosed()
      */
     public void close() throws IOException {
         synchronized (socketLock) {
@@ -1642,7 +1642,7 @@ public void close() throws IOException {
      * @see java.net.Socket#shutdownOutput()
      * @see java.net.Socket#close()
      * @see java.net.Socket#setSoLinger(boolean, int)
-     * @see #isInputShutdown
+     * @see #isInputShutdown()
      */
     public void shutdownInput() throws IOException {
         int s = state;
@@ -1672,7 +1672,7 @@ public void shutdownInput() throws IOException {
      * @see java.net.Socket#shutdownInput()
      * @see java.net.Socket#close()
      * @see java.net.Socket#setSoLinger(boolean, int)
-     * @see #isOutputShutdown
+     * @see #isOutputShutdown()
      */
     public void shutdownOutput() throws IOException {
         int s = state;
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 5f2dcb30d41..51b2488264e 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -131,11 +131,11 @@
  * (including the case where a task was cancelled without executing);
  * {@link #isCompletedNormally} is true if a task completed without
  * cancellation or encountering an exception; {@link #isCancelled} is
- * true if the task was cancelled (in which case {@link #getException}
+ * true if the task was cancelled (in which case {@link #getException()}
  * returns a {@link CancellationException}); and
  * {@link #isCompletedAbnormally} is true if a task was either
  * cancelled or encountered an exception, in which case {@link
- * #getException} will return either the encountered exception or
+ * #getException()} will return either the encountered exception or
  * {@link CancellationException}.
  *
  * <p>The ForkJoinTask class is not usually directly subclassed.
diff --git a/src/java.base/share/classes/javax/crypto/KEM.java b/src/java.base/share/classes/javax/crypto/KEM.java
index f19d3306266..58089b38666 100644
--- a/src/java.base/share/classes/javax/crypto/KEM.java
+++ b/src/java.base/share/classes/javax/crypto/KEM.java
@@ -707,8 +707,8 @@ public Encapsulator newEncapsulator(PublicKey publicKey, SecureRandom secureRand
      * the same key can be used to derive shared secrets in different ways.
      * If any extra information inside this object needs to be transmitted along
      * with the key encapsulation message so that the receiver is able to create
-     * a matching decapsulator, it will be included as a byte array in the
-     * {@link Encapsulated#params} field inside the encapsulation output.
+     * a matching decapsulator, it will be included as a byte array returned by the
+     * {@link Encapsulated#params()} method within the encapsulation output.
      * In this case, the security provider should provide an
      * {@code AlgorithmParameters} implementation using the same algorithm name
      * as the KEM. The receiver can initiate such an {@code AlgorithmParameters}

From a300c356555019a42c19bf0c16184f6dee4ad96e Mon Sep 17 00:00:00 2001
From: Daniel Skantz <dskantz@openjdk.org>
Date: Mon, 26 May 2025 14:22:12 +0000
Subject: [PATCH 643/901] 8357105: C2: compilation fails with "assert(false)
 failed: empty program detected during loop optimization"

Reviewed-by: syan, rcastanedalo
---
 src/hotspot/share/opto/stringopts.cpp         | 13 ++++-
 .../TestStackedConcatsAppendUncommonTrap.java | 55 +++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsAppendUncommonTrap.java

diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 793145e078d..cde6c1634ba 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -987,12 +987,21 @@ bool StringConcat::validate_control_flow() {
         continue;
       }
 
-      // A test which leads to an uncommon trap which should be safe.
-      // Later this trap will be converted into a trap that restarts
+      // A test which leads to an uncommon trap. It is safe to convert the trap
+      // into a trap that restarts at the beginning as long as its test does not
+      // depend on intermediate results of the candidate chain.
       // at the beginning.
       if (otherproj->outcnt() == 1) {
         CallStaticJavaNode* call = otherproj->unique_out()->isa_CallStaticJava();
         if (call != nullptr && call->_name != nullptr && strcmp(call->_name, "uncommon_trap") == 0) {
+          // First check for dependency on a toString that is going away during stacked concats.
+          if (_multiple &&
+              ((v1->is_Proj() && is_SB_toString(v1->in(0)) && ctrl_path.member(v1->in(0))) ||
+               (v2->is_Proj() && is_SB_toString(v2->in(0)) && ctrl_path.member(v2->in(0))))) {
+            // iftrue -> if -> bool -> cmpp -> resproj -> tostring
+            fail = true;
+            break;
+          }
           // control flow leads to uct so should be ok
           _uncommon_traps.push(call);
           ctrl_path.push(call);
diff --git a/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsAppendUncommonTrap.java b/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsAppendUncommonTrap.java
new file mode 100644
index 00000000000..2b72796836f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsAppendUncommonTrap.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8357105
+ * @summary Test stacked string concatenations where the toString result
+ *          of the first StringBuilder chain is wired into an uncommon trap
+ *          located in the second one.
+ * @run main/othervm compiler.stringopts.TestStackedConcatsAppendUncommonTrap
+ * @run main/othervm -XX:-TieredCompilation -Xbatch
+ *                   -XX:CompileOnly=compiler.stringopts.TestStackedConcatsAppendUncommonTrap::*
+ *                   compiler.stringopts.TestStackedConcatsAppendUncommonTrap
+ */
+
+package compiler.stringopts;
+
+public class TestStackedConcatsAppendUncommonTrap {
+
+    public static void main (String... args) {
+        for (int i = 0; i < 10000; i++) {
+            String s = f(" ");
+            if (!s.equals("    ")) {
+                throw new RuntimeException("wrong result.");
+            }
+        }
+    }
+
+    static String f(String c) {
+        String s = " ";
+        s = new StringBuilder().append(s).append(s).toString();
+        s = new StringBuilder().append(s).append(s == c ? s : "  ").toString();
+        return s;
+    }
+}

From e8eff4d25b984d503a4daa5d291b52a8d1e2f186 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 26 May 2025 18:31:19 +0000
Subject: [PATCH 644/901] 8357530: C2 SuperWord: Diagnostic flag
 AutoVectorizationOverrideProfitability

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/opto/c2_globals.hpp         |  12 ++
 src/hotspot/share/opto/superword.cpp          |  65 ++++++-
 ...utoVectorizationOverrideProfitability.java | 164 ++++++++++++++++++
 3 files changed, 233 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java

diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 0bb842907a3..fd55f2fd666 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -375,6 +375,18 @@
           "2 = Prefer alignment with vector load.")                         \
           range(0, 2)                                                       \
                                                                             \
+  product(uint, AutoVectorizationOverrideProfitability, 1, DIAGNOSTIC,      \
+          "Override the auto vectorization profitability heuristics."       \
+          "0 = Run auto vectorizer, but abort just before applying"         \
+          "    vectorization, as though it was not profitable."             \
+          "1 = Run auto vectorizer with the default profitability"          \
+          "    heuristics. This is the default, and hopefully"              \
+          "    delivers the best performance."                              \
+          "2 = Run auto vectorizer, and vectorize even if the"              \
+          "    profitability heuristics predict that vectorization"         \
+          "    is not profitable.")                                         \
+          range(0, 2)                                                       \
+                                                                            \
   product(bool, UseCMoveUnconditionally, false,                             \
           "Use CMove (scalar and vector) ignoring profitability test.")     \
                                                                             \
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index b663bed3938..47735f6bbba 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -1605,12 +1605,31 @@ bool SuperWord::implemented(const Node_List* pack, const uint size) const {
     int opc = p0->Opcode();
     if (is_marked_reduction(p0)) {
       const Type *arith_type = p0->bottom_type();
-      // Length 2 reductions of INT/LONG do not offer performance benefits
-      if (((arith_type->basic_type() == T_INT) || (arith_type->basic_type() == T_LONG)) && (size == 2)) {
-        retValue = false;
-      } else {
-        retValue = ReductionNode::implemented(opc, size, arith_type->basic_type());
+      // This heuristic predicts that 2-element reductions for INT/LONG are not
+      // profitable. This heuristic was added in JDK-8078563. The argument
+      // was that reductions are not just a single instruction, but multiple, and
+      // hence it is not directly clear that they are profitable. If we only have
+      // two elements per vector, then the performance gains from non-reduction
+      // vectors are at most going from 2 scalar instructions to 1 vector instruction.
+      // But a 2-element reduction vector goes from 2 scalar instructions to
+      // 3 instructions (1 shuffle and two reduction ops).
+      // However, this optimization assumes that these reductions stay in the loop
+      // which may not be true any more in most cases after the introduction of:
+      // PhaseIdealLoop::move_unordered_reduction_out_of_loop
+      // Hence, this heuristic has room for improvement.
+      bool is_two_element_int_or_long_reduction = (size == 2) &&
+                                                  (arith_type->basic_type() == T_INT ||
+                                                   arith_type->basic_type() == T_LONG);
+      if (is_two_element_int_or_long_reduction && AutoVectorizationOverrideProfitability != 2) {
+#ifndef PRODUCT
+        if (is_trace_superword_rejections()) {
+          tty->print_cr("\nPerformance heuristic: 2-element INT/LONG reduction not profitable.");
+          tty->print_cr("  Can override with AutoVectorizationOverrideProfitability=2");
+        }
+#endif
+        return false;
       }
+      retValue = ReductionNode::implemented(opc, size, arith_type->basic_type());
     } else if (VectorNode::is_convert_opcode(opc)) {
       retValue = VectorCastNode::implemented(opc, size, velt_basic_type(p0->in(1)), velt_basic_type(p0));
     } else if (VectorNode::is_minmax_opcode(opc) && is_subword_type(velt_basic_type(p0))) {
@@ -1756,9 +1775,29 @@ bool SuperWord::profitable(const Node_List* p) const {
   if (is_marked_reduction(p0)) {
     Node* second_in = p0->in(2);
     Node_List* second_pk = get_pack(second_in);
-    if ((second_pk == nullptr) || (_num_work_vecs == _num_reductions)) {
-      // No parent pack or not enough work
-      // to cover reduction expansion overhead
+    if (second_pk == nullptr) {
+      // The second input has to be the vector we wanted to reduce,
+      // but it was not packed.
+      return false;
+    } else if (_num_work_vecs == _num_reductions && AutoVectorizationOverrideProfitability != 2) {
+      // This heuristic predicts that the reduction is not profitable.
+      // Reduction vectors can be expensive, because they require multiple
+      // operations to fold all the lanes together. Hence, vectorizing the
+      // reduction is not profitable on its own. Hence, we need a lot of
+      // other "work vectors" that deliver performance improvements to
+      // balance out the performance loss due to reductions.
+      // This heuristic is a bit simplistic, and assumes that the reduction
+      // vector stays in the loop. But in some cases, we can move the
+      // reduction out of the loop, replacing it with a single vector op.
+      // See: PhaseIdealLoop::move_unordered_reduction_out_of_loop
+      // Hence, this heuristic has room for improvement.
+#ifndef PRODUCT
+        if (is_trace_superword_rejections()) {
+          tty->print_cr("\nPerformance heuristic: not enough vectors in the loop to make");
+          tty->print_cr("  reduction profitable.");
+          tty->print_cr("  Can override with AutoVectorizationOverrideProfitability=2");
+        }
+#endif
       return false;
     } else if (second_pk->size() != p->size()) {
       return false;
@@ -1914,6 +1953,16 @@ bool SuperWord::schedule_and_apply() const {
 
   if (!vtransform.schedule()) { return false; }
   if (vtransform.has_store_to_load_forwarding_failure()) { return false; }
+
+  if (AutoVectorizationOverrideProfitability == 0) {
+#ifndef PRODUCT
+    if (is_trace_superword_any()) {
+      tty->print_cr("\nForced bailout of vectorization (AutoVectorizationOverrideProfitability=0).");
+    }
+#endif
+    return false;
+  }
+
   vtransform.apply();
   return true;
 }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.java
new file mode 100644
index 00000000000..10ad19d03a7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAutoVectorizationOverrideProfitability.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.
+ */
+
+/**
+ * @test
+ * @bug 8357530
+ * @summary Test the effect of AutoVectorizationOverrideProfitability.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestAutoVectorizationOverrideProfitability
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.verify.*;
+import compiler.lib.generators.Generator;
+import static compiler.lib.generators.Generators.G;
+
+public class TestAutoVectorizationOverrideProfitability {
+    public static final Generator<Integer> GEN_I = G.ints();
+    public static final Generator<Float>   GEN_F = G.floats();
+
+    public static int[] aI = new int[10_000];
+    public static int[] rI = new int[10_000];
+    public static float[] aF = new float[10_000];
+    public static float[] rF = new float[10_000];
+
+    static {
+        G.fill(GEN_I, aI);
+        G.fill(GEN_F, aF);
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Do not vectorize, even if profitable.
+        TestFramework.runWithFlags("-XX:+UnlockDiagnosticVMOptions", "-XX:AutoVectorizationOverrideProfitability=0");
+
+        // Normal run, i.e. with normal heuristic. In some cases this vectorizes, in some not.
+        // By default, we have AutoVectorizationOverrideProfitability=1
+        TestFramework.run();
+
+        // Vectorize even if not profitable.
+        TestFramework.runWithFlags("-XX:+UnlockDiagnosticVMOptions", "-XX:AutoVectorizationOverrideProfitability=2");
+    }
+
+    public static final float GOLD_SIMPLE_FLOAT_REDUCTION = simpleFloatReduction();
+
+    @Test
+    @Warmup(10)
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"},
+        counts = {IRNode.ADD_REDUCTION_VF, "> 0"})
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"},
+        counts = {IRNode.ADD_REDUCTION_VF, "= 0"})
+    // The simple float reduction is not profitable. We need to sequentially
+    // add up the values, and so we cannot move the reduction out of the loop.
+    private static float simpleFloatReduction() {
+        float sum = 0;
+        for (int i = 0; i < aF.length; i++) {
+            sum += aF[i];
+        }
+        return sum;
+    }
+
+    @Check(test="simpleFloatReduction")
+    public static void checkSimpleFloatReduction(float result) {
+        Verify.checkEQ(GOLD_SIMPLE_FLOAT_REDUCTION, result);
+    }
+
+    static { simpleFloatCopy(); }
+    public static final float[] GOLD_SIMPLE_FLOAT_COPY = rF.clone();
+
+    @Test
+    @Warmup(10)
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"},
+        counts = {IRNode.LOAD_VECTOR_F, "> 0"})
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"},
+        counts = {IRNode.LOAD_VECTOR_F, "= 0"})
+    // The simple float copy is always profitable.
+    private static void simpleFloatCopy() {
+        for (int i = 0; i < aF.length; i++) {
+            rF[i] = aF[i];
+        }
+    }
+
+    @Check(test="simpleFloatCopy")
+    public static void checkSimpleFloatCopy() {
+        Verify.checkEQ(GOLD_SIMPLE_FLOAT_COPY, rF);
+    }
+
+    public static final int GOLD_SIMPLE_INT_REDUCTION = simpleIntReduction();
+
+    @Test
+    @Warmup(10)
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 2"},
+        counts = {IRNode.ADD_REDUCTION_VI, "> 0", IRNode.ADD_VI, "> 0"})
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "< 2"},
+        counts = {IRNode.ADD_REDUCTION_VI, "= 0", IRNode.ADD_VI, "= 0"})
+    // Current heuristics say that this simple int reduction is not profitable.
+    // But it would actually be profitable, since we are able to move the
+    // reduction out of the loop (we can reorder the reduction). When moving
+    // the reduction out of the loop, we instead accumulate with a simple
+    // ADD_VI inside the loop.
+    // See: JDK-8307516 JDK-8345044
+    private static int simpleIntReduction() {
+        int sum = 0;
+        for (int i = 0; i < aI.length; i++) {
+            sum += aI[i];
+        }
+        return sum;
+    }
+
+    @Check(test="simpleIntReduction")
+    public static void checkSimpleIntReduction(int result) {
+        Verify.checkEQ(GOLD_SIMPLE_INT_REDUCTION, result);
+    }
+
+    static { simpleIntCopy(); }
+    public static final int[] GOLD_SIMPLE_INT_COPY = rI.clone();
+
+    @Test
+    @Warmup(10)
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"},
+        counts = {IRNode.LOAD_VECTOR_I, "> 0"})
+    @IR(applyIfCPUFeatureOr = {"avx", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"},
+        counts = {IRNode.LOAD_VECTOR_I, "= 0"})
+    // The simple int copy is always profitable.
+    private static void simpleIntCopy() {
+        for (int i = 0; i < aI.length; i++) {
+            rI[i] = aI[i];
+        }
+    }
+
+    @Check(test="simpleIntCopy")
+    public static void checkSimpleIntCopy() {
+        Verify.checkEQ(GOLD_SIMPLE_INT_COPY, rI);
+    }
+}

From bbceab072555d5e2f5d3e99ae07a5ca5e909d7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Mon, 26 May 2025 18:37:55 +0000
Subject: [PATCH 645/901] 8352251: Implement JEP 518: JFR Cooperative Sampling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Aleksey Shipilev <shade@openjdk.org>
Co-authored-by: Erik Österlund <eosterlund@openjdk.org>
Co-authored-by: Boris Ulasevich <bulasevich@openjdk.org>
Co-authored-by: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Co-authored-by: Fei Yang <fyang@openjdk.org>
Co-authored-by: Amit Kumar <amitkumar@openjdk.org>
Reviewed-by: eosterlund, egahlin
---
 src/hotspot/cpu/aarch64/frame_aarch64.cpp     |   1 -
 .../cpu/aarch64/frame_aarch64.inline.hpp      |  49 +-
 .../cpu/aarch64/interp_masm_aarch64.cpp       |  69 +-
 .../cpu/aarch64/interp_masm_aarch64.hpp       |   5 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     |  17 +
 .../templateInterpreterGenerator_aarch64.cpp  |  26 +
 .../cpu/aarch64/templateTable_aarch64.cpp     |   5 +
 src/hotspot/cpu/arm/frame_arm.hpp             |   3 +
 src/hotspot/cpu/arm/frame_arm.inline.hpp      |  86 +-
 src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp      |  19 +-
 src/hotspot/cpu/ppc/c2_CodeStubs_ppc.cpp      |  22 +-
 src/hotspot/cpu/ppc/frame_ppc.hpp             |   2 +-
 src/hotspot/cpu/ppc/frame_ppc.inline.hpp      |  43 +-
 src/hotspot/cpu/ppc/interp_masm_ppc.hpp       |  10 +-
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |  62 +-
 src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp   |   6 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    |  29 +
 src/hotspot/cpu/ppc/macroAssembler_ppc.hpp    |   1 +
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  31 +-
 .../ppc/templateInterpreterGenerator_ppc.cpp  |  23 +-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |   6 +-
 src/hotspot/cpu/riscv/frame_riscv.cpp         |   1 -
 src/hotspot/cpu/riscv/frame_riscv.inline.hpp  |  47 ++
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |  78 +-
 src/hotspot/cpu/riscv/interp_masm_riscv.hpp   |   3 +
 .../cpu/riscv/macroAssembler_riscv.cpp        |  10 +-
 .../cpu/riscv/macroAssembler_riscv.hpp        |   2 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |  18 +
 .../templateInterpreterGenerator_riscv.cpp    |  30 +-
 src/hotspot/cpu/riscv/templateTable_riscv.cpp |   7 +-
 src/hotspot/cpu/s390/frame_s390.hpp           |   1 +
 src/hotspot/cpu/s390/frame_s390.inline.hpp    |  43 +
 src/hotspot/cpu/x86/frame_x86.cpp             |   1 -
 src/hotspot/cpu/x86/frame_x86.inline.hpp      |  49 +-
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |  67 +-
 src/hotspot/cpu/x86/interp_masm_x86.hpp       |   5 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |  17 +
 .../x86/templateInterpreterGenerator_x86.cpp  |  28 +
 src/hotspot/cpu/x86/templateTable_x86.cpp     |   8 +-
 src/hotspot/os/posix/os_posix.cpp             |  10 +
 src/hotspot/os/posix/os_posix.hpp             |   2 +
 src/hotspot/os/windows/os_windows.cpp         |  65 +-
 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp     |   7 +
 .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp     |   9 +
 src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp     |   8 +
 src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp   |   5 +
 .../os_cpu/linux_aarch64/os_linux_aarch64.cpp |   8 +
 src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp |   5 +
 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp |   7 +
 .../os_cpu/linux_riscv/os_linux_riscv.cpp     |   8 +
 .../os_cpu/linux_s390/os_linux_s390.cpp       |   5 +
 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp |   8 +
 .../os_cpu/linux_zero/os_linux_zero.cpp       |   5 +
 .../windows_aarch64/os_windows_aarch64.cpp    |  18 +
 .../os_cpu/windows_x86/os_windows_x86.cpp     |  17 +
 .../share/interpreter/interpreterRuntime.cpp  |   4 +
 src/hotspot/share/jfr/jfr.cpp                 |   1 +
 src/hotspot/share/jfr/jfr.hpp                 |   4 +-
 src/hotspot/share/jfr/jfr.inline.hpp          |  44 +
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   4 +-
 .../checkpoint/objectSampleCheckpoint.cpp     |   7 +-
 src/hotspot/share/jfr/metadata/metadata.xml   |   9 +
 .../jfr/periodic/sampling/jfrCallTrace.cpp    | 120 ---
 .../periodic/sampling/jfrSampleRequest.cpp    | 305 +++++++
 .../periodic/sampling/jfrSampleRequest.hpp    |  85 ++
 .../periodic/sampling/jfrThreadSampler.cpp    | 763 ++++++------------
 .../periodic/sampling/jfrThreadSampler.hpp    |  19 +-
 .../periodic/sampling/jfrThreadSampling.cpp   | 397 +++++++++
 ...jfrCallTrace.hpp => jfrThreadSampling.hpp} |  23 +-
 .../share/jfr/recorder/jfrRecorder.cpp        |  20 +-
 .../share/jfr/recorder/jfrRecorder.hpp        |   4 +-
 .../recorder/service/jfrEventThrottler.cpp    |  52 +-
 .../recorder/service/jfrRecorderThread.cpp    |  16 +-
 .../recorder/service/jfrRecorderThread.hpp    |   4 +-
 .../service/jfrRecorderThreadLoop.cpp         |   2 +-
 .../stacktrace/jfrStackFilterRegistry.cpp     |   4 +-
 .../jfr/recorder/stacktrace/jfrStackFrame.cpp |  66 ++
 .../jfr/recorder/stacktrace/jfrStackFrame.hpp |  67 ++
 .../jfr/recorder/stacktrace/jfrStackTrace.cpp | 315 +++-----
 .../jfr/recorder/stacktrace/jfrStackTrace.hpp |  53 +-
 .../stacktrace/jfrStackTraceRepository.cpp    |  26 +-
 .../stacktrace/jfrStackTraceRepository.hpp    |   8 +-
 .../recorder/stacktrace/jfrVframeStream.cpp   |  55 ++
 .../recorder/stacktrace/jfrVframeStream.hpp}  |  24 +-
 .../stacktrace/jfrVframeStream.inline.hpp     |  56 ++
 .../share/jfr/support/jfrThreadExtension.hpp  |   9 +-
 .../share/jfr/support/jfrThreadLocal.cpp      |  57 +-
 .../share/jfr/support/jfrThreadLocal.hpp      | 109 ++-
 .../share/jfr/utilities/jfrLogTagSets.hpp     |   3 +-
 .../share/runtime/continuationEntry.hpp       |  19 +-
 .../share/runtime/continuationFreezeThaw.cpp  |   4 +
 src/hotspot/share/runtime/deoptimization.cpp  |   2 +
 src/hotspot/share/runtime/frame.cpp           |   8 +
 src/hotspot/share/runtime/frame.hpp           |  15 +-
 src/hotspot/share/runtime/javaThread.cpp      |   1 -
 src/hotspot/share/runtime/javaThread.hpp      |   8 +-
 .../share/runtime/javaThread.inline.hpp       |   8 +-
 src/hotspot/share/runtime/mutexLocker.cpp     |   2 -
 src/hotspot/share/runtime/mutexLocker.hpp     |   1 -
 src/hotspot/share/runtime/os.hpp              |   1 +
 .../share/runtime/safepointMechanism.cpp      |   8 +-
 .../share/runtime/safepointMechanism.hpp      |   4 +-
 .../runtime/safepointMechanism.inline.hpp     |   9 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   4 +-
 .../share/runtime/suspendedThreadTask.hpp     |  29 +-
 src/hotspot/share/runtime/thread.hpp          |   1 +
 src/hotspot/share/utilities/growableArray.hpp |  12 +
 .../classes/jdk/jfr/internal/LogTag.java      |  18 +-
 src/jdk.jfr/share/conf/jfr/default.jfc        |   7 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |   7 +
 .../event/profiling/TestSafepointLatency.java |  79 ++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   1 +
 112 files changed, 2768 insertions(+), 1332 deletions(-)
 create mode 100644 src/hotspot/share/jfr/jfr.inline.hpp
 delete mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
 rename src/hotspot/share/jfr/periodic/sampling/{jfrCallTrace.hpp => jfrThreadSampling.hpp} (65%)
 create mode 100644 src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.cpp
 create mode 100644 src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.hpp
 create mode 100644 src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp
 rename src/hotspot/share/{runtime/suspendedThreadTask.cpp => jfr/recorder/stacktrace/jfrVframeStream.hpp} (63%)
 create mode 100644 src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestSafepointLatency.java

diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
index b07fa2fa9df..7ffba17bab3 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -828,7 +828,6 @@ void JavaFrameAnchor::make_walkable() {
   // already walkable?
   if (walkable()) return;
   vmassert(last_Java_sp() != nullptr, "not called from Java code?");
-  vmassert(last_Java_pc() == nullptr, "already walkable");
   _last_Java_pc = (address)_last_Java_sp[-1];
   vmassert(walkable(), "something went wrong");
 }
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
index d22442db0d7..47ae93a4932 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.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, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -35,6 +35,53 @@
 
 // Inline functions for AArch64 frames:
 
+#if INCLUDE_JFR
+
+// Static helper routines
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::interpreter_frame_bcp_offset]);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::return_addr_offset]);
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::interpreter_frame_sender_sp_offset]);
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp + frame::interpreter_frame_initial_sp_offset;
+}
+
+inline intptr_t* frame::sender_sp(intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return fp + frame::sender_sp_offset;
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::link_offset]);
+}
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(sp[-1]);
+}
+
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(sp[-2]);
+}
+
+#endif // INCLUDE_JFR
+
 // Constructors:
 
 inline frame::frame() {
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index dd1d7d1d2e1..48f92d28e03 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -458,9 +458,10 @@ void InterpreterMacroAssembler::dispatch_via(TosState state, address* table) {
 
 // remove activation
 //
-// Apply stack watermark barrier.
 // Unlock the receiver if this is a synchronized method.
 // Unlock any Java monitors from synchronized blocks.
+// Apply stack watermark barrier.
+// Notify JVMTI.
 // Remove the activation from the stack.
 //
 // If there are locked Java monitors
@@ -470,30 +471,14 @@ void InterpreterMacroAssembler::dispatch_via(TosState state, address* table) {
 //       installs IllegalMonitorStateException
 //    Else
 //       no error processing
-void InterpreterMacroAssembler::remove_activation(
-        TosState state,
-        bool throw_monitor_exception,
-        bool install_monitor_exception,
-        bool notify_jvmdi) {
+void InterpreterMacroAssembler::remove_activation(TosState state,
+                                                  bool throw_monitor_exception,
+                                                  bool install_monitor_exception,
+                                                  bool notify_jvmdi) {
   // Note: Registers r3 xmm0 may be in use for the
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
-  // 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
-  // the stack, will call InterpreterRuntime::at_unwind.
-  Label slow_path;
-  Label fast_path;
-  safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
-  br(Assembler::AL, fast_path);
-  bind(slow_path);
-  push(state);
-  set_last_Java_frame(esp, rfp, (address)pc(), rscratch1);
-  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
-  reset_last_Java_frame(true);
-  pop(state);
-  bind(fast_path);
-
   // get the value of _do_not_unlock_if_synchronized into r3
   const Address do_not_unlock_if_synchronized(rthread,
     in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
@@ -611,7 +596,24 @@ void InterpreterMacroAssembler::remove_activation(
 
   bind(no_unlock);
 
-  // jvmti support
+  JFR_ONLY(enter_jfr_critical_section();)
+
+  // 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
+  // the stack, will call InterpreterRuntime::at_unwind.
+  Label slow_path;
+  Label fast_path;
+  safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
+  br(Assembler::AL, fast_path);
+  bind(slow_path);
+  push(state);
+  set_last_Java_frame(esp, rfp, pc(), rscratch1);
+  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
+  reset_last_Java_frame(true);
+  pop(state);
+  bind(fast_path);
+
+  // JVMTI support. Make sure the safepoint poll test is issued prior.
   if (notify_jvmdi) {
     notify_method_exit(state, NotifyJVMTI);    // preserve TOSCA
   } else {
@@ -638,6 +640,8 @@ void InterpreterMacroAssembler::remove_activation(
     cmp(rscratch2, rscratch1);
     br(Assembler::LS, no_reserved_zone_enabling);
 
+    JFR_ONLY(leave_jfr_critical_section();)
+
     call_VM_leaf(
       CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone), rthread);
     call_VM(noreg, CAST_FROM_FN_PTR(address,
@@ -647,10 +651,14 @@ void InterpreterMacroAssembler::remove_activation(
     bind(no_reserved_zone_enabling);
   }
 
-  // restore sender esp
-  mov(esp, rscratch2);
   // remove frame anchor
   leave();
+
+  JFR_ONLY(leave_jfr_critical_section();)
+
+  // restore sender esp
+  mov(esp, rscratch2);
+
   // If we're returning to interpreted code we will shortly be
   // adjusting SP to allow some space for ESP.  If we're returning to
   // compiled code the saved sender SP was saved in sender_sp, so this
@@ -658,6 +666,19 @@ void InterpreterMacroAssembler::remove_activation(
   andr(sp, esp, -16);
 }
 
+#if INCLUDE_JFR
+void InterpreterMacroAssembler::enter_jfr_critical_section() {
+  const Address sampling_critical_section(rthread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  mov(rscratch1, true);
+  strb(rscratch1, sampling_critical_section);
+}
+
+void InterpreterMacroAssembler::leave_jfr_critical_section() {
+  const Address sampling_critical_section(rthread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  strb(zr, sampling_critical_section);
+}
+#endif // INCLUDE_JFR
+
 // Lock object
 //
 // Args:
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index 059d79c3cb9..58a7ed03150 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_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, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -310,6 +310,9 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void notify_method_entry();
   void notify_method_exit(TosState state, NotifyMethodExitMode mode);
 
+  JFR_ONLY(void enter_jfr_critical_section();)
+  JFR_ONLY(void leave_jfr_critical_section();)
+
   virtual void _call_Unimplemented(address call_site) {
     save_bcp();
     set_last_Java_frame(esp, rfp, (address) pc(), rscratch1);
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index ed296f60e2d..51f18cb1bbe 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1985,6 +1985,23 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   __ leave();
 
+  #if INCLUDE_JFR
+  // We need to do a poll test after unwind in case the sampler
+  // managed to sample the native frame after returning to Java.
+  Label L_return;
+  __ ldr(rscratch1, Address(rthread, JavaThread::polling_word_offset()));
+  address poll_test_pc = __ pc();
+  __ relocate(relocInfo::poll_return_type);
+  __ tbz(rscratch1, log2i_exact(SafepointMechanism::poll_bit()), L_return);
+  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
+    "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+  __ adr(rscratch1, InternalAddress(poll_test_pc));
+  __ str(rscratch1, Address(rthread, JavaThread::saved_exception_pc_offset()));
+  __ far_jump(RuntimeAddress(stub));
+  __ bind(L_return);
+#endif // INCLUDE_JFR
+
   // Any exception pending?
   __ ldr(rscratch1, Address(rthread, in_bytes(Thread::pending_exception_offset())));
   __ cbnz(rscratch1, exception_pending);
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 2db3b435abb..af41ab3ef69 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1593,6 +1593,30 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ bind(L);
   }
 
+  #if INCLUDE_JFR
+  __ enter_jfr_critical_section();
+
+  // This poll test is to uphold the invariant that a JFR sampled frame
+  // must not return to its caller without a prior safepoint poll check.
+  // The earlier poll check in this routine is insufficient for this purpose
+  // because the thread has transitioned back to Java.
+
+  Label slow_path;
+  Label fast_path;
+  __ safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
+  __ br(Assembler::AL, fast_path);
+  __ bind(slow_path);
+  __ push(dtos);
+  __ push(ltos);
+  __ set_last_Java_frame(esp, rfp, __ pc(), rscratch1);
+  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
+  __ reset_last_Java_frame(true);
+  __ pop(ltos);
+  __ pop(dtos);
+  __ bind(fast_path);
+
+#endif // INCLUDE_JFR
+
   // jvmti support
   // Note: This must happen _after_ handling/throwing any exceptions since
   //       the exception handler code notifies the runtime of method exits
@@ -1615,6 +1639,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // remove frame anchor
   __ leave();
 
+  JFR_ONLY(__ leave_jfr_critical_section();)
+
   // restore sender sp
   __ mov(sp, esp);
 
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 2cc9b39983a..4c1e4ce3a05 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -1890,6 +1890,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide)
 
     __ mov(r19, r0);                             // save the nmethod
 
+    JFR_ONLY(__ enter_jfr_critical_section();)
+
     call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
 
     // r0 is OSR buffer, move it to expected parameter location
@@ -1901,6 +1903,9 @@ void TemplateTable::branch(bool is_jsr, bool is_wide)
         Address(rfp, frame::interpreter_frame_sender_sp_offset * wordSize));
     // remove frame anchor
     __ leave();
+
+    JFR_ONLY(__ leave_jfr_critical_section();)
+
     // Ensure compiled code always sees stack at proper alignment
     __ andr(sp, esp, -16);
 
diff --git a/src/hotspot/cpu/arm/frame_arm.hpp b/src/hotspot/cpu/arm/frame_arm.hpp
index dee005b8d75..dec27554a47 100644
--- a/src/hotspot/cpu/arm/frame_arm.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.hpp
@@ -108,6 +108,9 @@
 
   frame(intptr_t* sp, intptr_t* fp);
 
+  frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, bool allow_cb_null = false);
+
+  void setup(address pc);
   void init(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc);
 
   // accessors for the instance variables
diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp
index 92a48f22f8c..4be190f0504 100644
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp
@@ -27,9 +27,58 @@
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
 
 // Inline functions for ARM frames:
 
+#if INCLUDE_JFR
+
+// Static helper routines
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::interpreter_frame_bcp_offset]);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::return_addr_offset]);
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::interpreter_frame_sender_sp_offset]);
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp + frame::interpreter_frame_initial_sp_offset;
+}
+
+inline intptr_t* frame::sender_sp(intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return fp + frame::sender_sp_offset;
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::link_offset]);
+}
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(sp[-1]);
+}
+
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(sp[-2]);
+}
+
+#endif // INCLUDE_JFR
+
+
 // Constructors:
 
 inline frame::frame() {
@@ -54,21 +103,30 @@ inline void frame::init(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, add
   _fp = fp;
   _pc = pc;
   assert(pc != nullptr, "no pc?");
+  _on_heap = false;
+  _oop_map = nullptr;
   _cb = CodeCache::find_blob(pc);
-  adjust_unextended_sp();
   DEBUG_ONLY(_frame_index = -1;)
 
+  setup(pc);
+}
+
+inline void frame::setup(address pc) {
+  adjust_unextended_sp();
+
   address original_pc = get_deopt_original_pc();
   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 compiled method (or must be immediately following it)");
     _deopt_state = is_deoptimized;
+    assert(_cb == nullptr || _cb->as_nmethod()->insts_contains_inclusive(_pc),
+           "original PC must be in the main code section of the compiled method (or must be immediately following it)");
   } else {
-    _deopt_state = not_deoptimized;
+    if (_cb == SharedRuntime::deopt_blob()) {
+      _deopt_state = is_deoptimized;
+    } else {
+      _deopt_state = not_deoptimized;
+    }
   }
-  _on_heap = false;
-  _oop_map = nullptr;
 }
 
 inline frame::frame(intptr_t* sp, intptr_t* fp, address pc) {
@@ -85,6 +143,22 @@ inline frame::frame(intptr_t* sp, intptr_t* fp) {
   init(sp, sp, fp, pc);
 }
 
+inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, bool allow_cb_null) {
+  intptr_t a = intptr_t(sp);
+  intptr_t b = intptr_t(fp);
+  _sp = sp;
+  _unextended_sp = unextended_sp;
+  _fp = fp;
+  _pc = pc;
+  assert(pc != nullptr, "no pc?");
+  _cb = cb;
+  _oop_map = nullptr;
+  assert(_cb != nullptr || allow_cb_null, "pc: " INTPTR_FORMAT, p2i(pc));
+  _on_heap = false;
+  DEBUG_ONLY(_frame_index = -1;)
+
+  setup(pc);
+}
 
 // Accessors
 
diff --git a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
index a390a6eeed4..b1cdf38daf3 100644
--- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
@@ -41,25 +41,8 @@ void C1SafepointPollStub::emit_code(LIR_Assembler* ce) {
   if (UseSIGTRAP) {
     DEBUG_ONLY( __ should_not_reach_here("C1SafepointPollStub::emit_code"); )
   } else {
-    assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
-           "polling page return stub not created yet");
-    address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
-
     __ bind(_entry);
-    // Using pc relative address computation.
-    {
-      Label next_pc;
-      __ bl(next_pc);
-      __ bind(next_pc);
-    }
-    int current_offset = __ offset();
-    __ mflr(R12);
-    __ add_const_optimized(R12, R12, safepoint_offset() - current_offset);
-    __ std(R12, in_bytes(JavaThread::saved_exception_pc_offset()), R16_thread);
-
-    __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(stub));
-    __ mtctr(R0);
-    __ bctr();
+    __ jump_to_polling_page_return_handler_blob(safepoint_offset());
   }
 }
 
diff --git a/src/hotspot/cpu/ppc/c2_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c2_CodeStubs_ppc.cpp
index 484e0fd0196..632ad87cd4c 100644
--- a/src/hotspot/cpu/ppc/c2_CodeStubs_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_CodeStubs_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022, SAP SE. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -34,26 +34,8 @@ int C2SafepointPollStub::max_size() const {
 }
 
 void C2SafepointPollStub::emit(C2_MacroAssembler& masm) {
-  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
-         "polling page return stub not created yet");
-  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
-
   __ bind(entry());
-  // Using pc relative address computation.
-  {
-    Label next_pc;
-    __ bl(next_pc);
-    __ bind(next_pc);
-  }
-  int current_offset = __ offset();
   // Code size should not depend on offset: see _stub_size computation in output.cpp
-  __ load_const32(R12, _safepoint_offset - current_offset);
-  __ mflr(R0);
-  __ add(R12, R12, R0);
-  __ std(R12, in_bytes(JavaThread::saved_exception_pc_offset()), R16_thread);
-
-  __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(stub));
-  __ mtctr(R0);
-  __ bctr();
+  __ jump_to_polling_page_return_handler_blob(_safepoint_offset, true);
 }
 #undef __
diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp
index 2fff3fb2e48..188015f5cd9 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp
@@ -363,7 +363,7 @@
   inline frame(intptr_t* sp, intptr_t* fp, address pc);
   inline frame(intptr_t* sp, address pc, kind knd = kind::nmethod);
   inline frame(intptr_t* sp, address pc, intptr_t* unextended_sp, intptr_t* fp = nullptr, CodeBlob* cb = nullptr);
-  inline frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map);
+  inline frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map = nullptr);
   inline frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map, bool on_heap);
 
  private:
diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
index 19a90367353..bb711f2d053 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. 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
@@ -391,4 +391,43 @@ void frame::update_map_with_saved_link(RegisterMapT* map, intptr_t** link_addr)
   // Nothing to do.
 }
 
+#if INCLUDE_JFR
+
+// Static helper routines
+inline intptr_t* frame::sender_sp(intptr_t* fp) { return fp; }
+
+// Extract common_abi parts.
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(((common_abi*)sp)->callers_sp);
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) { return frame::fp(fp); }
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(((common_abi*)sp)->lr);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) { return frame::return_address(fp); }
+
+// Extract java interpreter state parts.
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(*(fp + ijava_idx(bcp)));
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(*(fp + ijava_idx(sender_sp)));
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp - ((frame::ijava_state_size + frame::top_ijava_frame_abi_size) >> LogBytesPerWord);
+}
+
+#endif // INCLUDE_JFR
+
 #endif // CPU_PPC_FRAME_PPC_INLINE_HPP
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index 99ac037e4b7..d3969427db3 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. 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
@@ -170,7 +170,11 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void remove_activation(TosState state,
                          bool throw_monitor_exception = true,
                          bool install_monitor_exception = true);
-  void merge_frames(Register Rtop_frame_sp, Register return_pc, Register Rscratch1, Register Rscratch2); // merge top frames
+  JFR_ONLY(void enter_jfr_critical_section();)
+  JFR_ONLY(void leave_jfr_critical_section();)
+  void load_fp(Register fp);
+  void remove_top_frame_given_fp(Register fp, Register sender_sp, Register sender_fp, Register return_pc, Register temp);
+  void merge_frames(Register sender_sp, Register return_pc, Register temp1, Register temp2); // merge top frames
 
   void add_monitor_to_stack(bool stack_is_empty, Register Rtemp1, Register Rtemp2);
 
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 92c7a4fb5f8..29fb54250c2 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -783,19 +783,27 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
 }
 
 // Support function for remove_activation & Co.
-void InterpreterMacroAssembler::merge_frames(Register Rsender_sp, Register return_pc,
-                                             Register Rscratch1, Register Rscratch2) {
-  // Pop interpreter frame.
-  ld(Rscratch1, 0, R1_SP); // *SP
-  ld(Rsender_sp, _ijava_state_neg(sender_sp), Rscratch1); // top_frame_sp
-  ld(Rscratch2, 0, Rscratch1); // **SP
-  if (return_pc!=noreg) {
-    ld(return_pc, _abi0(lr), Rscratch1); // LR
+void InterpreterMacroAssembler::load_fp(Register fp) {
+  ld(fp, _abi0(callers_sp), R1_SP); // *SP
+}
+
+void InterpreterMacroAssembler::remove_top_frame_given_fp(Register fp, Register sender_sp, Register sender_fp,
+                                                          Register return_pc, Register temp) {
+  assert_different_registers(sender_sp, sender_fp, return_pc, temp);
+  ld(sender_sp, _ijava_state_neg(sender_sp), fp);
+  ld(sender_fp, _abi0(callers_sp), fp); // **SP
+  if (return_pc != noreg) {
+    ld(return_pc, _abi0(lr), fp); // last usage of fp, register can be reused
   }
+  subf(temp, R1_SP, sender_sp);   // sender_sp - SP
+  stdux(sender_fp, R1_SP, temp);  // atomically set *(SP = sender_sp) = sender_fp
+}
 
-  // Merge top frames.
-  subf(Rscratch1, R1_SP, Rsender_sp); // top_frame_sp - SP
-  stdux(Rscratch2, R1_SP, Rscratch1); // atomically set *(SP = top_frame_sp) = **SP
+void InterpreterMacroAssembler::merge_frames(Register sender_sp, Register return_pc,
+                                             Register temp1, Register temp2) {
+  Register fp = temp1, sender_fp = temp2;
+  load_fp(fp);
+  remove_top_frame_given_fp(fp, sender_sp, sender_fp, return_pc, /* temp */ fp);
 }
 
 void InterpreterMacroAssembler::narrow(Register result) {
@@ -854,11 +862,16 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
                                                   bool install_monitor_exception) {
   BLOCK_COMMENT("remove_activation {");
 
+  unlock_if_synchronized_method(state, throw_monitor_exception, install_monitor_exception);
+
   // 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
   // the stack, will call InterpreterRuntime::at_unwind.
-  Label slow_path;
-  Label fast_path;
+  Label slow_path, fast_path;
+  Register fp = R22_tmp2;
+  load_fp(fp);
+
+  JFR_ONLY(enter_jfr_critical_section();)
   safepoint_poll(slow_path, R11_scratch1, true /* at_return */, false /* in_nmethod */);
   b(fast_path);
   bind(slow_path);
@@ -870,8 +883,6 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
   align(32);
   bind(fast_path);
 
-  unlock_if_synchronized_method(state, throw_monitor_exception, install_monitor_exception);
-
   // Save result (push state before jvmti call and pop it afterwards) and notify jvmti.
   notify_method_exit(false, state, NotifyJVMTI, true);
 
@@ -891,10 +902,11 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
     // call could have a smaller SP, so that this compare succeeds for an
     // inner call of the method annotated with ReservedStack.
     ld_ptr(R0, JavaThread::reserved_stack_activation_offset(), R16_thread);
-    ld_ptr(R11_scratch1, _abi0(callers_sp), R1_SP); // Load frame pointer.
-    cmpld(CR0, R11_scratch1, R0);
+    cmpld(CR0, fp, R0);
     blt_predict_taken(CR0, no_reserved_zone_enabling);
 
+    JFR_ONLY(leave_jfr_critical_section();)
+
     // Enable reserved zone again, throw stack overflow exception.
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone), R16_thread);
     call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_delayed_StackOverflowError));
@@ -906,12 +918,26 @@ void InterpreterMacroAssembler::remove_activation(TosState state,
 
   verify_oop(R17_tos, state);
 
-  merge_frames(/*top_frame_sp*/ R21_sender_SP, /*return_pc*/ R0, R11_scratch1, R12_scratch2);
+  remove_top_frame_given_fp(fp, R21_sender_SP, R23_tmp3, /*return_pc*/ R0, R11_scratch1);
   mtlr(R0);
   pop_cont_fastpath();
+  JFR_ONLY(leave_jfr_critical_section();)
+
   BLOCK_COMMENT("} remove_activation");
 }
 
+#if INCLUDE_JFR
+void InterpreterMacroAssembler::enter_jfr_critical_section() {
+  li(R0, 1);
+  stb(R0, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR), R16_thread);
+}
+
+void InterpreterMacroAssembler::leave_jfr_critical_section() {
+  li(R0, 0);
+  stb(R0, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR), R16_thread);
+}
+#endif // INCLUDE_JFR
+
 // Lock object
 //
 // Registers alive
diff --git a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
index 8b539bc8101..00a6b4cbf95 100644
--- a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
+++ b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. 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
@@ -73,6 +73,8 @@
 
   address last_Java_pc(void)          { return _last_Java_pc; }
 
+  intptr_t* last_Java_fp() const      { return *(intptr_t**)_last_Java_sp; }
+
   void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; }
 
 #endif // CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 7a58a0b0d5a..857911214c5 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -3277,6 +3277,35 @@ void MacroAssembler::safepoint_poll(Label& slow_path, Register temp, bool at_ret
   }
 }
 
+void MacroAssembler::jump_to_polling_page_return_handler_blob(int safepoint_offset, bool fixed_size) {
+  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
+         "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+
+  // Determine saved exception pc using pc relative address computation.
+  {
+    Label next_pc;
+    bl(next_pc);
+    bind(next_pc);
+  }
+  int current_offset = offset();
+
+  if (fixed_size) {
+    // Code size must not depend on offsets.
+    load_const32(R12, safepoint_offset - current_offset);
+    mflr(R0);
+    add(R12, R12, R0);
+  } else {
+    mflr(R12);
+    add_const_optimized(R12, R12, safepoint_offset - current_offset);
+  }
+  std(R12, in_bytes(JavaThread::saved_exception_pc_offset()), R16_thread);
+
+  add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(stub));
+  mtctr(R0);
+  bctr();
+}
+
 void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2,
                                      MacroAssembler::PreservationLevel preservation_level) {
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 3008277034d..471ebb7459a 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -729,6 +729,7 @@ class MacroAssembler: public Assembler {
 
   // Check if safepoint requested and if so branch
   void safepoint_poll(Label& slow_path, Register temp, bool at_return, bool in_nmethod);
+  void jump_to_polling_page_return_handler_blob(int safepoint_offset, bool fixed_size = false);
 
   void resolve_jobject(Register value, Register tmp1, Register tmp2,
                        MacroAssembler::PreservationLevel preservation_level);
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index ebcfaa10f7c..a7e759d770b 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -2740,6 +2740,21 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   __ li(r_temp_2, 0);
   __ stw(r_temp_2, in_bytes(JNIHandleBlock::top_offset()), r_temp_1);
 
+  // Prepare for return
+  // --------------------------------------------------------------------------
+  __ pop_frame();
+  __ restore_LR(R11);
+
+#if INCLUDE_JFR
+  // We need to do a poll test after unwind in case the sampler
+  // managed to sample the native frame after returning to Java.
+  Label L_stub;
+  int safepoint_offset = __ offset();
+  if (!UseSIGTRAP) {
+    __ relocate(relocInfo::poll_return_type);
+  }
+  __ safepoint_poll(L_stub, r_temp_2, true /* at_return */, true /* in_nmethod: frame already popped */);
+#endif // INCLUDE_JFR
 
   // Check for pending exceptions.
   // --------------------------------------------------------------------------
@@ -2747,13 +2762,16 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   __ cmpdi(CR0, r_temp_2, 0);
   __ bne(CR0, handle_pending_exception);
 
-  // Return
-  // --------------------------------------------------------------------------
-
-  __ pop_frame();
-  __ restore_LR(R11);
+  // Return.
   __ blr();
 
+  // Handler for return safepoint (out-of-line).
+#if INCLUDE_JFR
+  if (!UseSIGTRAP) {
+    __ bind(L_stub);
+    __ jump_to_polling_page_return_handler_blob(safepoint_offset);
+  }
+#endif // INCLUDE_JFR
 
   // Handler for pending exceptions (out-of-line).
   // --------------------------------------------------------------------------
@@ -2761,9 +2779,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   // is the empty function. We just pop this frame and then jump to
   // forward_exception_entry.
   __ bind(handle_pending_exception);
-
-  __ pop_frame();
-  __ restore_LR(R11);
   __ b64_patchable((address)StubRoutines::forward_exception_entry(),
                        relocInfo::runtime_call_type);
 
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index b0e5731cbeb..020590d414f 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1584,6 +1584,24 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ st_ptr(R0, JavaThread::pending_jni_exception_check_fn_offset(), R16_thread);
   }
 
+  #if INCLUDE_JFR
+  __ enter_jfr_critical_section();
+
+  // This poll test is to uphold the invariant that a JFR sampled frame
+  // must not return to its caller without a prior safepoint poll check.
+  // The earlier poll check in this routine is insufficient for this purpose
+  // because the thread has transitioned back to Java.
+
+  Label slow_path, fast_path;
+  __ safepoint_poll(slow_path, R11_scratch1, true /* at_return */, false /* in_nmethod */);
+  __ b(fast_path);
+  __ bind(slow_path);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), R16_thread);
+  __ align(32);
+  __ bind(fast_path);
+
+#endif // INCLUDE_JFR
+
   __ reset_last_Java_frame();
 
   // Jvmdi/jvmpi support. Whether we've got an exception pending or
@@ -1625,11 +1643,12 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ lfd(F1_RET, _ijava_state_neg(fresult), R11_scratch1);
   __ call_stub(result_handler_addr);
 
-  __ merge_frames(/*top_frame_sp*/ R21_sender_SP, /*return_pc*/ R0, R11_scratch1, R12_scratch2);
+  __ merge_frames(/*top_frame_sp*/ R21_sender_SP, /*return_pc*/ R12_scratch2, R11_scratch1, R0);
+  JFR_ONLY(__ leave_jfr_critical_section();)
 
   // Must use the return pc which was loaded from the caller's frame
   // as the VM uses return-pc-patching for deoptimization.
-  __ mtlr(R0);
+  __ mtlr(R12_scratch2);
   __ blr();
 
   //-----------------------------------------------------------------------------
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 4770962853b..1667fa3aba3 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -1728,16 +1728,18 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
     const Register osr_nmethod = R31;
     __ mr(osr_nmethod, R3_RET);
     __ set_top_ijava_frame_at_SP_as_last_Java_frame(R1_SP, R11_scratch1);
+    JFR_ONLY(__ enter_jfr_critical_section();)
     __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin), R16_thread);
     __ reset_last_Java_frame();
     // OSR buffer is in ARG1.
 
     // Remove the interpreter frame.
-    __ merge_frames(/*top_frame_sp*/ R21_sender_SP, /*return_pc*/ R0, R11_scratch1, R12_scratch2);
+    __ merge_frames(/*top_frame_sp*/ R21_sender_SP, /*return_pc*/ R12_scratch2, R11_scratch1, R0);
+    JFR_ONLY(__ leave_jfr_critical_section();)
 
     // Jump to the osr code.
     __ ld(R11_scratch1, nmethod::osr_entry_point_offset(), osr_nmethod);
-    __ mtlr(R0);
+    __ mtlr(R12_scratch2);
     __ mtctr(R11_scratch1);
     __ bctr();
 
diff --git a/src/hotspot/cpu/riscv/frame_riscv.cpp b/src/hotspot/cpu/riscv/frame_riscv.cpp
index 8ee6d11dcaf..e77375434c2 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.cpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.cpp
@@ -670,7 +670,6 @@ void JavaFrameAnchor::make_walkable() {
   // already walkable?
   if (walkable()) { return; }
   vmassert(last_Java_sp() != nullptr, "not called from Java code?");
-  vmassert(last_Java_pc() == nullptr, "already walkable");
   _last_Java_pc = (address)_last_Java_sp[-1];
   vmassert(walkable(), "something went wrong");
 }
diff --git a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
index 2e79c89e7b0..fb31760e20b 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.inline.hpp
@@ -35,6 +35,53 @@
 
 // Inline functions for RISCV frames:
 
+#if INCLUDE_JFR
+
+// Static helper routines
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::interpreter_frame_bcp_offset]);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::return_addr_offset]);
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::interpreter_frame_sender_sp_offset]);
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp + frame::interpreter_frame_initial_sp_offset;
+}
+
+inline intptr_t* frame::sender_sp(intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return fp + frame::sender_sp_offset;
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::link_offset]);
+}
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(sp[-1]);
+}
+
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(sp[-2]);
+}
+
+#endif // INCLUDE_JFR
+
 // Constructors:
 
 inline frame::frame() {
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 8be5408cb2b..2a01a6d209d 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -497,9 +497,10 @@ void InterpreterMacroAssembler::dispatch_via(TosState state, address* table) {
 
 // remove activation
 //
-// Apply stack watermark barrier.
 // Unlock the receiver if this is a synchronized method.
 // Unlock any Java monitors from synchronized blocks.
+// Apply stack watermark barrier.
+// Notify JVMTI.
 // Remove the activation from the stack.
 //
 // If there are locked Java monitors
@@ -509,32 +510,14 @@ void InterpreterMacroAssembler::dispatch_via(TosState state, address* table) {
 //       installs IllegalMonitorStateException
 //    Else
 //       no error processing
-void InterpreterMacroAssembler::remove_activation(
-                                TosState state,
-                                bool throw_monitor_exception,
-                                bool install_monitor_exception,
-                                bool notify_jvmdi) {
+void InterpreterMacroAssembler::remove_activation(TosState state,
+                                                  bool throw_monitor_exception,
+                                                  bool install_monitor_exception,
+                                                  bool notify_jvmdi) {
   // Note: Registers x13 may be in use for the
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
-  // 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
-  // the stack, will call InterpreterRuntime::at_unwind.
-  Label slow_path;
-  Label fast_path;
-  safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
-  j(fast_path);
-
-  bind(slow_path);
-  push(state);
-  set_last_Java_frame(esp, fp, (address)pc(), t0);
-  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), xthread);
-  reset_last_Java_frame(true);
-  pop(state);
-
-  bind(fast_path);
-
   // get the value of _do_not_unlock_if_synchronized into x13
   const Address do_not_unlock_if_synchronized(xthread,
     in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
@@ -655,10 +638,27 @@ void InterpreterMacroAssembler::remove_activation(
 
   bind(no_unlock);
 
-  // jvmti support
-  if (notify_jvmdi) {
-    notify_method_exit(state, NotifyJVMTI);    // preserve TOSCA
+  JFR_ONLY(enter_jfr_critical_section();)
+
+  // 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
+  // the stack, will call InterpreterRuntime::at_unwind.
+  Label slow_path;
+  Label fast_path;
+  safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
+  j(fast_path);
+
+  bind(slow_path);
+  push(state);
+  set_last_Java_frame(esp, fp, pc(), t0);
+  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), xthread);
+  reset_last_Java_frame(true);
+  pop(state);
+  bind(fast_path);
 
+  // JVMTI support. Make sure the safepoint poll test is issued prior.
+  if (notify_jvmdi) {
+    notify_method_exit(state, NotifyJVMTI); // preserve TOSCA
   } else {
     notify_method_exit(state, SkipNotifyJVMTI); // preserve TOSCA
   }
@@ -677,9 +677,13 @@ void InterpreterMacroAssembler::remove_activation(
     subw(t0, t0, StackOverflow::stack_guard_enabled);
     beqz(t0, no_reserved_zone_enabling);
 
+    // look for an overflow into the stack reserved zone, i.e.
+    // interpreter_frame_sender_sp <= JavaThread::reserved_stack_activation
     ld(t0, Address(xthread, JavaThread::reserved_stack_activation_offset()));
     ble(t1, t0, no_reserved_zone_enabling);
 
+    JFR_ONLY(leave_jfr_critical_section();)
+
     call_VM_leaf(
       CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone), xthread);
     call_VM(noreg, CAST_FROM_FN_PTR(address,
@@ -689,11 +693,14 @@ void InterpreterMacroAssembler::remove_activation(
     bind(no_reserved_zone_enabling);
   }
 
+  // remove frame anchor
+  leave();
+
+  JFR_ONLY(leave_jfr_critical_section();)
+
   // restore sender esp
   mv(esp, t1);
 
-  // remove frame anchor
-  leave();
   // If we're returning to interpreted code we will shortly be
   // adjusting SP to allow some space for ESP.  If we're returning to
   // compiled code the saved sender SP was saved in sender_sp, so this
@@ -701,6 +708,19 @@ void InterpreterMacroAssembler::remove_activation(
   andi(sp, esp, -16);
 }
 
+#if INCLUDE_JFR
+void InterpreterMacroAssembler::enter_jfr_critical_section() {
+  const Address sampling_critical_section(xthread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  mv(t0, true);
+  sb(t0, sampling_critical_section);
+}
+
+void InterpreterMacroAssembler::leave_jfr_critical_section() {
+  const Address sampling_critical_section(xthread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  sb(zr, sampling_critical_section);
+}
+#endif // INCLUDE_JFR
+
 // Lock object
 //
 // Args:
@@ -1515,7 +1535,7 @@ void InterpreterMacroAssembler::call_VM_leaf_base(address entry_point,
                                                   int number_of_arguments) {
   // interpreter specific
   //
-  // Note: No need to save/restore rbcp & rlocals pointer since these
+  // Note: No need to save/restore xbcp & xlocals pointer since these
   //       are callee saved registers and no blocking/ GC can happen
   //       in leaf calls.
 #ifdef ASSERT
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index b94140ea990..7a3e6764aaa 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -290,6 +290,9 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void notify_method_entry();
   void notify_method_exit(TosState state, NotifyMethodExitMode mode);
 
+  JFR_ONLY(void enter_jfr_critical_section();)
+  JFR_ONLY(void leave_jfr_critical_section();)
+
   virtual void _call_Unimplemented(address call_site) {
     save_bcp();
     set_last_Java_frame(esp, fp, (address) pc(), t0);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 2d3edbb1bee..bc6bf88d0ad 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3739,16 +3739,16 @@ void MacroAssembler::check_klass_subtype(Register sub_klass,
   bind(L_failure);
 }
 
-void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod) {
-  ld(t0, Address(xthread, JavaThread::polling_word_offset()));
+void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod, Register tmp_reg) {
+  ld(tmp_reg, Address(xthread, JavaThread::polling_word_offset()));
   if (acquire) {
     membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
   }
   if (at_return) {
-    bgtu(in_nmethod ? sp : fp, t0, slow_path, /* is_far */ true);
+    bgtu(in_nmethod ? sp : fp, tmp_reg, slow_path, /* is_far */ true);
   } else {
-    test_bit(t0, t0, exact_log2(SafepointMechanism::poll_bit()));
-    bnez(t0, slow_path, true /* is_far */);
+    test_bit(tmp_reg, tmp_reg, exact_log2(SafepointMechanism::poll_bit()));
+    bnez(tmp_reg, slow_path, /* is_far */ true);
   }
 }
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 468ba54438b..6f80a02ddc6 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -44,7 +44,7 @@ class MacroAssembler: public Assembler {
 
   MacroAssembler(CodeBuffer* code) : Assembler(code) {}
 
-  void safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod);
+  void safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod, Register tmp_reg = t0);
 
   // Alignment
   int align(int modulus, int extra_offset = 0);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 7db1659c2fc..391be81c1ae 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1894,6 +1894,24 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   __ leave();
 
+  #if INCLUDE_JFR
+  // We need to do a poll test after unwind in case the sampler
+  // managed to sample the native frame after returning to Java.
+  Label L_return;
+  __ ld(t0, Address(xthread, JavaThread::polling_word_offset()));
+  address poll_test_pc = __ pc();
+  __ relocate(relocInfo::poll_return_type);
+  __ test_bit(t0, t0, log2i_exact(SafepointMechanism::poll_bit()));
+  __ beqz(t0, L_return);
+  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
+         "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+  __ la(t0, InternalAddress(poll_test_pc));
+  __ sd(t0, Address(xthread, JavaThread::saved_exception_pc_offset()));
+  __ far_jump(RuntimeAddress(stub));
+  __ bind(L_return);
+#endif // INCLUDE_JFR
+
   // Any exception pending?
   Label exception_pending;
   __ ld(t0, Address(xthread, in_bytes(Thread::pending_exception_offset())));
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 72e1180164b..d63953232c5 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1372,6 +1372,31 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ bind(L);
   }
 
+  #if INCLUDE_JFR
+  __ enter_jfr_critical_section();
+
+  // This poll test is to uphold the invariant that a JFR sampled frame
+  // must not return to its caller without a prior safepoint poll check.
+  // The earlier poll check in this routine is insufficient for this purpose
+  // because the thread has transitioned back to Java.
+
+  Label slow_path;
+  Label fast_path;
+  __ safepoint_poll(slow_path, true /* at_return */, false /* acquire */, false /* in_nmethod */);
+  __ j(fast_path);
+
+  __ bind(slow_path);
+  __ push(dtos);
+  __ push(ltos);
+  __ set_last_Java_frame(esp, fp, __ pc(), t0);
+  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), xthread);
+  __ reset_last_Java_frame(true);
+  __ pop(ltos);
+  __ pop(dtos);
+  __ bind(fast_path);
+
+#endif // INCLUDE_JFR
+
   // jvmti support
   // Note: This must happen _after_ handling/throwing any exceptions since
   //       the exception handler code notifies the runtime of method exits
@@ -1385,10 +1410,13 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   __ jalr(result_handler);
 
   // remove activation
-  __ ld(esp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // get sender sp
+  // get sender sp
+  __ ld(esp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize));
   // remove frame anchor
   __ leave();
 
+  JFR_ONLY(__ leave_jfr_critical_section();)
+
   // restore sender sp
   __ mv(sp, esp);
 
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index a035326be01..547a1ad35c5 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -1757,6 +1757,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
 
     __ mv(x9, x10);                             // save the nmethod
 
+    JFR_ONLY(__ enter_jfr_critical_section();)
+
     call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
 
     // x10 is OSR buffer, move it to expected parameter location
@@ -1765,9 +1767,12 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
     // remove activation
     // get sender esp
     __ ld(esp,
-        Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize));
+          Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize));
     // remove frame anchor
     __ leave();
+
+    JFR_ONLY(__ leave_jfr_critical_section();)
+
     // Ensure compiled code always sees stack at proper alignment
     __ andi(sp, esp, -16);
 
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 537a3ce5bcc..85e957fe992 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -475,6 +475,7 @@
  public:
   // To be used, if sp was not extended to match callee's calling convention.
   inline frame(intptr_t* sp, address pc, intptr_t* unextended_sp = nullptr, intptr_t* fp = nullptr, CodeBlob* cb = nullptr);
+  inline frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map = nullptr);
 
   // Access frame via stack pointer.
   inline intptr_t* sp_addr_at(int index) const  { return &sp()[index]; }
diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp
index 5512bed5688..dea0e72581f 100644
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp
@@ -87,6 +87,11 @@ inline frame::frame(intptr_t* sp, address pc, intptr_t* unextended_sp, intptr_t*
 
 inline frame::frame(intptr_t* sp) : frame(sp, nullptr) {}
 
+inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address pc, CodeBlob* cb, const ImmutableOopMap* oop_map)
+  :_sp(sp), _pc(pc), _cb(cb), _oop_map(oop_map), _on_heap(false), DEBUG_ONLY(_frame_index(-1) COMMA) _unextended_sp(unextended_sp), _fp(fp) {
+  setup();
+}
+
 // Generic constructor. Used by pns() in debug.cpp only
 #ifndef PRODUCT
 inline frame::frame(void* sp, void* pc, void* unextended_sp)
@@ -371,4 +376,42 @@ void frame::update_map_with_saved_link(RegisterMapT* map, intptr_t** link_addr)
   Unimplemented();
 }
 
+#if INCLUDE_JFR
+
+// Static helper routines
+inline intptr_t* frame::sender_sp(intptr_t* fp) { return fp; }
+
+// Extract common_abi parts.
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(((z_common_abi*)sp)->callers_sp);
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) { return frame::fp(fp); }
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(((z_common_abi*)sp)->return_pc);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) { return frame::return_address(fp); }
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(*(fp + _z_ijava_idx(bcp)));
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(*(fp + _z_ijava_idx(sender_sp)));
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp - ((frame::z_ijava_state_size + frame::z_top_ijava_frame_abi_size) >> LogBytesPerWord);
+}
+
+#endif // INCLUDE_JFR
+
 #endif // CPU_S390_FRAME_S390_INLINE_HPP
diff --git a/src/hotspot/cpu/x86/frame_x86.cpp b/src/hotspot/cpu/x86/frame_x86.cpp
index a5700134f60..b9a2ef35f10 100644
--- a/src/hotspot/cpu/x86/frame_x86.cpp
+++ b/src/hotspot/cpu/x86/frame_x86.cpp
@@ -701,7 +701,6 @@ void JavaFrameAnchor::make_walkable() {
   if (last_Java_sp() == nullptr) return;
   // already walkable?
   if (walkable()) return;
-  vmassert(last_Java_pc() == nullptr, "already walkable");
   _last_Java_pc = (address)_last_Java_sp[-1];
   vmassert(walkable(), "something went wrong");
 }
diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
index c74731d0410..afc4ab8767b 100644
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.inline.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
@@ -35,6 +35,53 @@
 
 // Inline functions for Intel frames:
 
+#if INCLUDE_JFR
+
+// Static helper routines
+
+inline address frame::interpreter_bcp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::interpreter_frame_bcp_offset]);
+}
+
+inline address frame::interpreter_return_address(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<address>(fp[frame::return_addr_offset]);
+}
+
+inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::interpreter_frame_sender_sp_offset]);
+}
+
+inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
+  assert(fp != nullptr, "invariant");
+  assert(sp != nullptr, "invariant");
+  return sp <= fp + frame::interpreter_frame_initial_sp_offset;
+}
+
+inline intptr_t* frame::sender_sp(intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return fp + frame::sender_sp_offset;
+}
+
+inline intptr_t* frame::link(const intptr_t* fp) {
+  assert(fp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(fp[frame::link_offset]);
+}
+
+inline address frame::return_address(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<address>(sp[-1]);
+}
+
+inline intptr_t* frame::fp(const intptr_t* sp) {
+  assert(sp != nullptr, "invariant");
+  return reinterpret_cast<intptr_t*>(sp[-2]);
+}
+
+#endif // INCLUDE_JFR
+
 // Constructors:
 
 inline frame::frame() {
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index bc58b38d18b..6d638ab67ef 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -778,9 +778,10 @@ void InterpreterMacroAssembler::narrow(Register result) {
 
 // remove activation
 //
-// Apply stack watermark barrier.
 // Unlock the receiver if this is a synchronized method.
 // Unlock any Java monitors from synchronized blocks.
+// Apply stack watermark barrier.
+// Notify JVMTI.
 // Remove the activation from the stack.
 //
 // If there are locked Java monitors
@@ -790,12 +791,11 @@ void InterpreterMacroAssembler::narrow(Register result) {
 //       installs IllegalMonitorStateException
 //    Else
 //       no error processing
-void InterpreterMacroAssembler::remove_activation(
-        TosState state,
-        Register ret_addr,
-        bool throw_monitor_exception,
-        bool install_monitor_exception,
-        bool notify_jvmdi) {
+void InterpreterMacroAssembler::remove_activation(TosState state,
+                                                  Register ret_addr,
+                                                  bool throw_monitor_exception,
+                                                  bool install_monitor_exception,
+                                                  bool notify_jvmdi) {
   // Note: Registers rdx xmm0 may be in use for the
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
@@ -804,21 +804,6 @@ void InterpreterMacroAssembler::remove_activation(
   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
-  // the stack, will call InterpreterRuntime::at_unwind.
-  Label slow_path;
-  Label fast_path;
-  safepoint_poll(slow_path, true /* at_return */, false /* in_nmethod */);
-  jmp(fast_path);
-  bind(slow_path);
-  push(state);
-  set_last_Java_frame(noreg, rbp, (address)pc(), rscratch1);
-  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
-  reset_last_Java_frame(true);
-  pop(state);
-  bind(fast_path);
-
   // get the value of _do_not_unlock_if_synchronized into rdx
   const Address do_not_unlock_if_synchronized(rthread,
     in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
@@ -940,7 +925,24 @@ void InterpreterMacroAssembler::remove_activation(
 
   bind(no_unlock);
 
-  // jvmti support
+  JFR_ONLY(enter_jfr_critical_section();)
+
+  // 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
+  // the stack, will call InterpreterRuntime::at_unwind.
+  Label slow_path;
+  Label fast_path;
+  safepoint_poll(slow_path, true /* at_return */, false /* in_nmethod */);
+  jmp(fast_path);
+  bind(slow_path);
+  push(state);
+  set_last_Java_frame(noreg, rbp, (address)pc(), rscratch1);
+  super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), r15_thread);
+  reset_last_Java_frame(true);
+  pop(state);
+  bind(fast_path);
+
+  // JVMTI support. Make sure the safepoint poll test is issued prior.
   if (notify_jvmdi) {
     notify_method_exit(state, NotifyJVMTI);    // preserve TOSCA
   } else {
@@ -964,6 +966,8 @@ void InterpreterMacroAssembler::remove_activation(
     cmpptr(rbx, Address(rthread, JavaThread::reserved_stack_activation_offset()));
     jcc(Assembler::lessEqual, no_reserved_zone_enabling);
 
+    JFR_ONLY(leave_jfr_critical_section();)
+
     call_VM_leaf(
       CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone), rthread);
     call_VM(noreg, CAST_FROM_FN_PTR(address,
@@ -972,11 +976,28 @@ void InterpreterMacroAssembler::remove_activation(
 
     bind(no_reserved_zone_enabling);
   }
+
   leave();                           // remove frame anchor
+
+  JFR_ONLY(leave_jfr_critical_section();)
+
   pop(ret_addr);                     // get return address
   mov(rsp, rbx);                     // set sp to sender sp
   pop_cont_fastpath();
+
+}
+
+#if INCLUDE_JFR
+void InterpreterMacroAssembler::enter_jfr_critical_section() {
+  const Address sampling_critical_section(r15_thread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  movbool(sampling_critical_section, true);
+}
+
+void InterpreterMacroAssembler::leave_jfr_critical_section() {
+  const Address sampling_critical_section(r15_thread, in_bytes(SAMPLING_CRITICAL_SECTION_OFFSET_JFR));
+  movbool(sampling_critical_section, false);
 }
+#endif // INCLUDE_JFR
 
 void InterpreterMacroAssembler::get_method_counters(Register method,
                                                     Register mcs, Label& skip) {
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 6ff3d17ca8b..47d54b54d7f 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.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
@@ -262,6 +262,9 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void notify_method_entry();
   void notify_method_exit(TosState state, NotifyMethodExitMode mode);
 
+  JFR_ONLY(void enter_jfr_critical_section();)
+  JFR_ONLY(void leave_jfr_critical_section();)
+
  private:
 
   Register _locals_register; // register that contains the pointer to the locals
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index f26d8243ddc..78259157dfa 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -2425,6 +2425,23 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   __ leave();
 
+#if INCLUDE_JFR
+  // We need to do a poll test after unwind in case the sampler
+  // managed to sample the native frame after returning to Java.
+  Label L_return;
+  address poll_test_pc = __ pc();
+  __ relocate(relocInfo::poll_return_type);
+  __ testb(Address(r15_thread, JavaThread::polling_word_offset()), SafepointMechanism::poll_bit());
+  __ jccb(Assembler::zero, L_return);
+  __ lea(rscratch1, InternalAddress(poll_test_pc));
+  __ movptr(Address(r15_thread, JavaThread::saved_exception_pc_offset()), rscratch1);
+  assert(SharedRuntime::polling_page_return_handler_blob() != nullptr,
+    "polling page return stub not created yet");
+  address stub = SharedRuntime::polling_page_return_handler_blob()->entry_point();
+  __ jump(RuntimeAddress(stub));
+  __ bind(L_return);
+#endif // INCLUDE_JFR
+
   // Any exception pending?
   __ cmpptr(Address(r15_thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
   __ jcc(Assembler::notEqual, exception_pending);
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index 45e30a8b4fb..d4691c9874c 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -1147,6 +1147,30 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ bind(L);
   }
 
+#if INCLUDE_JFR
+  __ enter_jfr_critical_section();
+
+  // This poll test is to uphold the invariant that a JFR sampled frame
+  // must not return to its caller without a prior safepoint poll check.
+  // The earlier poll check in this routine is insufficient for this purpose
+  // because the thread has transitioned back to Java.
+
+  Label slow_path;
+  Label fast_path;
+  __ safepoint_poll(slow_path, true /* at_return */, false /* in_nmethod */);
+  __ jmp(fast_path);
+  __ bind(slow_path);
+  __ push(dtos);
+  __ push(ltos);
+  __ set_last_Java_frame(noreg, rbp, (address)__ pc(), rscratch1);
+  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), r15_thread);
+  __ reset_last_Java_frame(true);
+  __ pop(ltos);
+  __ pop(dtos);
+  __ bind(fast_path);
+
+#endif // INCLUDE_JFR
+
   // jvmti support
   // Note: This must happen _after_ handling/throwing any exceptions since
   //       the exception handler code notifies the runtime of method exits
@@ -1169,8 +1193,12 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
                        frame::interpreter_frame_sender_sp_offset *
                        wordSize)); // get sender sp
   __ leave();                                // remove frame anchor
+
+  JFR_ONLY(__ leave_jfr_critical_section();)
+
   __ pop(rdi);                               // get return address
   __ mov(rsp, t);                            // set sp to sender sp
+
   __ jmp(rdi);
 
   if (inc_counter) {
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 43da80f4082..9f568904ae2 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -1825,6 +1825,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
       // it will be preserved in rbx.
       __ mov(rbx, rax);
 
+      JFR_ONLY(__ enter_jfr_critical_section();)
+
       call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
 
       // rax is OSR buffer, move it to expected parameter location
@@ -1839,14 +1841,12 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
       // pop the interpreter frame
       __ movptr(sender_sp, Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize)); // get sender sp
       __ leave();                                // remove frame anchor
+      JFR_ONLY(__ leave_jfr_critical_section();)
       __ pop(retaddr);                           // get return address
-      __ mov(rsp, sender_sp);                   // set sp to sender sp
+      __ mov(rsp, sender_sp);                    // set sp to sender sp
       // Ensure compiled code always sees stack at proper alignment
       __ andptr(rsp, -(StackAlignmentInBytes));
 
-      // unlike x86 we need no specialized return from compiled code
-      // to the interpreter or the call stub.
-
       // push the return address
       __ push(retaddr);
 
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 1da0eb219b6..448ebce620a 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "classfile/classLoader.hpp"
+#include "interpreter/interpreter.hpp"
 #include "jvm.h"
 #include "jvmtifiles/jvmti.h"
 #include "logging/log.hpp"
@@ -1330,6 +1331,15 @@ int os::Posix::clock_tics_per_second() {
   return clock_tics_per_sec;
 }
 
+#ifdef ASSERT
+bool os::Posix::ucontext_is_interpreter(const ucontext_t* uc) {
+  assert(uc != nullptr, "invariant");
+  address pc = os::Posix::ucontext_get_pc(uc);
+  assert(pc != nullptr, "invariant");
+  return Interpreter::contains(pc);
+}
+#endif
+
 // Utility to convert the given timeout to an absolute timespec
 // (based on the appropriate clock) to use with pthread_cond_timewait,
 // and sem_timedwait().
diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp
index 5c3b1f35bd1..4b8b75ea07e 100644
--- a/src/hotspot/os/posix/os_posix.hpp
+++ b/src/hotspot/os/posix/os_posix.hpp
@@ -89,6 +89,8 @@ class os::Posix {
   static address ucontext_get_pc(const ucontext_t* ctx);
   static void    ucontext_set_pc(ucontext_t* ctx, address pc);
 
+  DEBUG_ONLY(static bool ucontext_is_interpreter(const ucontext_t* ctx);)
+
   static void to_RTC_abstime(timespec* abstime, int64_t millis);
 
   // clock ticks per second of the system
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index b6771719427..fbd1b37699f 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -5840,61 +5840,34 @@ ssize_t os::raw_send(int fd, char* buf, size_t nBytes, uint flags) {
   return ::send(fd, buf, (int)nBytes, flags);
 }
 
-// returns true if thread could be suspended,
-// false otherwise
-static bool do_suspend(HANDLE* h) {
-  if (h != nullptr) {
-    if (SuspendThread(*h) != ~0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// resume the thread
-// calling resume on an active thread is a no-op
-static void do_resume(HANDLE* h) {
-  if (h != nullptr) {
-    ResumeThread(*h);
-  }
-}
+// WINDOWS CONTEXT Flags for THREAD_SAMPLING
+#if defined(AMD64) || defined(_M_ARM64)
+  #define sampling_context_flags (CONTEXT_FULL | CONTEXT_FLOATING_POINT)
+#endif
 
-// retrieve a suspend/resume context capable handle
-// from the tid. Caller validates handle return value.
-void get_thread_handle_for_extended_context(HANDLE* h,
-                                            DWORD tid) {
-  if (h != nullptr) {
-    *h = OpenThread(THREAD_SUSPEND_RESUME | THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, FALSE, tid);
-  }
+// Retrieve a suspend/resume context capable handle for the tid.
+// Caller validates handle return value.
+static inline HANDLE get_thread_handle_for_extended_context(DWORD tid) {
+  return OpenThread(THREAD_SUSPEND_RESUME | THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, FALSE, tid);
 }
 
 // Thread sampling implementation
 //
 void SuspendedThreadTask::internal_do_task() {
-  CONTEXT    ctxt;
-  HANDLE     h = nullptr;
-
-  // get context capable handle for thread
-  get_thread_handle_for_extended_context(&h, _thread->osthread()->thread_id());
-
-  // sanity
-  if (h == nullptr || h == INVALID_HANDLE_VALUE) {
+  const HANDLE h = get_thread_handle_for_extended_context(_thread->osthread()->thread_id());
+  if (h == nullptr) {
     return;
   }
-
-  // suspend the thread
-  if (do_suspend(&h)) {
-    ctxt.ContextFlags = (CONTEXT_FULL | CONTEXT_FLOATING_POINT);
-    // get thread context
-    GetThreadContext(h, &ctxt);
-    SuspendedThreadTaskContext context(_thread, &ctxt);
-    // pass context to Thread Sampling impl
-    do_task(context);
-    // resume thread
-    do_resume(&h);
+  CONTEXT ctxt;
+  ctxt.ContextFlags = sampling_context_flags;
+  if (SuspendThread(h) != OS_ERR) {
+    if (GetThreadContext(h, &ctxt)) {
+      const SuspendedThreadTaskContext context(_thread, &ctxt);
+      // Pass context to Thread Sampling implementation.
+      do_task(context);
+    }
+    ResumeThread(h);
   }
-
-  // close handle
   CloseHandle(h);
 }
 
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 3d11bfe037a..3dbb8adddd6 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -138,6 +138,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, lr, frame::kind::unknown);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->uc_mcontext.jmp_context.gpr[14]); // R14_bcp
+}
+
 frame os::get_sender_for_C_frame(frame* fr) {
   if (*fr->sp() == (intptr_t) nullptr) {
     // fr is the last C frame
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index aeba308d3a2..ae352641516 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -98,6 +98,8 @@
 #define context_cpsr uc_mcontext->DU3_PREFIX(ss,cpsr)
 #define context_esr  uc_mcontext->DU3_PREFIX(es,esr)
 
+#define REG_BCP context_x[22]
+
 address os::current_stack_pointer() {
 #if defined(__clang__) || defined(__llvm__)
   void *sp;
@@ -179,6 +181,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, pc);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->REG_BCP);
+}
+
 // JVM compiled with -fno-omit-frame-pointer, so RFP is saved on the stack.
 frame os::get_sender_for_C_frame(frame* fr) {
   return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
index d11e7d8b90b..1a7063198e3 100644
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
@@ -89,6 +89,7 @@
 #ifdef AMD64
 #define SPELL_REG_SP "rsp"
 #define SPELL_REG_FP "rbp"
+#define REG_BCP context_r13
 #else
 #define SPELL_REG_SP "esp"
 #define SPELL_REG_FP "ebp"
@@ -349,6 +350,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(fr.sp() + 1, fr.fp(), (address)*(fr.sp()));
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->REG_BCP);
+}
+
 // By default, gcc always save frame pointer (%ebp/%rbp) on stack. It may get
 // turned off by -fomit-frame-pointer,
 frame os::get_sender_for_C_frame(frame* fr) {
diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
index 29efae1adc8..3fefbdbe56c 100644
--- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
+++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
@@ -109,6 +109,11 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   return frame();
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  ShouldNotCallThis();
+  return nullptr;
+}
+
 bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                                              ucontext_t* uc, JavaThread* thread) {
 
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 4335733d1fe..6900283418d 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -75,6 +75,7 @@
 
 #define REG_FP 29
 #define REG_LR 30
+#define REG_BCP 22
 
 NOINLINE address os::current_stack_pointer() {
   return (address)__builtin_frame_address(0);
@@ -148,6 +149,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, pc);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->uc_mcontext.regs[REG_BCP]);
+}
+
 // By default, gcc always saves frame pointer rfp on this stack. This
 // may get turned off by -fomit-frame-pointer.
 // The "Procedure Call Standard for the Arm 64-bit Architecture" doesn't
diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
index 5723e86f859..6c245f8f1a6 100644
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
@@ -208,6 +208,11 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, pc);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  Unimplemented();
+  return nullptr;
+}
+
 frame os::get_sender_for_C_frame(frame* fr) {
 #ifdef __thumb__
   // We can't reliably get anything from a thumb C frame.
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 81fede02956..5fe37be0d20 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -170,6 +170,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, lr, frame::kind::unknown);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->uc_mcontext.regs->gpr[14]); // R14_bcp
+}
+
 frame os::get_sender_for_C_frame(frame* fr) {
   if (*fr->sp() == 0) {
     // fr is the last C frame
diff --git a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
index 945280bca10..8366a7249fa 100644
--- a/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
+++ b/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp
@@ -77,6 +77,7 @@
 
 #define REG_LR       1
 #define REG_FP       8
+#define REG_BCP      22
 
 NOINLINE address os::current_stack_pointer() {
   return (address)__builtin_frame_address(0);
@@ -157,6 +158,13 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   return frame(frame_sp, frame_fp, epc);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->uc_mcontext.__gregs[REG_BCP]);
+}
+
 // By default, gcc always saves frame pointer rfp on this stack. This
 // may get turned off by -fomit-frame-pointer.
 frame os::get_sender_for_C_frame(frame* fr) {
diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
index 192bfb6d537..7e4d72fc066 100644
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
@@ -155,6 +155,11 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp, lr);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  Unimplemented();
+  return nullptr;
+}
+
 frame os::get_sender_for_C_frame(frame* fr) {
   if (*fr->sp() == 0) {
     // fr is the last C frame.
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 3eb91412d8c..9c648f78118 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -80,6 +80,7 @@
 #define REG_SP REG_RSP
 #define REG_PC REG_RIP
 #define REG_FP REG_RBP
+#define REG_BCP REG_R13
 #define SPELL_REG_SP "rsp"
 #define SPELL_REG_FP "rbp"
 #else
@@ -157,6 +158,13 @@ frame os::fetch_compiled_frame_from_context(const void* ucVoid) {
   return frame(sp + 1, fp, (address)*sp);
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const ucontext_t* uc = (const ucontext_t*)ucVoid;
+  assert(os::Posix::ucontext_is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->uc_mcontext.gregs[REG_BCP]);
+}
+
 // By default, gcc always save frame pointer (%ebp/%rbp) on stack. It may get
 // turned off by -fomit-frame-pointer,
 frame os::get_sender_for_C_frame(frame* fr) {
diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
index 01e207b73c8..c9ac461851a 100644
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp
@@ -211,6 +211,11 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   }
 }
 
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  ShouldNotCallThis();
+  return nullptr;
+}
+
 bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                                              ucontext_t* uc, JavaThread* thread) {
 
diff --git a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
index df77502b860..01105e6d51e 100644
--- a/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
+++ b/src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp
@@ -58,6 +58,8 @@
 # include <stdio.h>
 # include <intrin.h>
 
+#define REG_BCP X22
+
 void os::os_exception_wrapper(java_call_t f, JavaValue* value, const methodHandle& method, JavaCallArguments* args, JavaThread* thread) {
   f(value, method, args, thread);
 }
@@ -97,6 +99,22 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, epc);
 }
 
+#ifdef ASSERT
+static bool is_interpreter(const CONTEXT* uc) {
+  assert(uc != nullptr, "invariant");
+  address pc = reinterpret_cast<address>(uc->Pc);
+  assert(pc != nullptr, "invariant");
+  return Interpreter::contains(pc);
+}
+#endif
+
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  CONTEXT* uc = (CONTEXT*)ucVoid;
+  assert(is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->REG_BCP);
+}
+
 bool os::win32::get_frame_at_stack_banging_point(JavaThread* thread,
         struct _EXCEPTION_POINTERS* exceptionInfo, address pc, frame* fr) {
   PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
index 6414bb9eaf6..c188919595c 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
@@ -58,6 +58,7 @@
 #define REG_SP Rsp
 #define REG_FP Rbp
 #define REG_PC Rip
+#define REG_BCP R13
 
 JNIEXPORT
 extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
@@ -320,6 +321,22 @@ frame os::fetch_frame_from_context(const void* ucVoid) {
   return frame(sp, fp, epc);
 }
 
+#ifdef ASSERT
+static bool is_interpreter(const CONTEXT* uc) {
+  assert(uc != nullptr, "invariant");
+  address pc = reinterpret_cast<address>(uc->REG_PC);
+  assert(pc != nullptr, "invariant");
+  return Interpreter::contains(pc);
+}
+#endif
+
+intptr_t* os::fetch_bcp_from_context(const void* ucVoid) {
+  assert(ucVoid != nullptr, "invariant");
+  const CONTEXT* const uc = (CONTEXT*)ucVoid;
+  assert(is_interpreter(uc), "invariant");
+  return reinterpret_cast<intptr_t*>(uc->REG_BCP);
+}
+
 // Returns the current stack pointer. Accurate value needed for
 // os::verify_stack_alignment().
 address os::current_stack_pointer() {
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index f0b85d9f5d4..fcc0b96efa4 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -75,6 +75,9 @@
 #include "utilities/checkedCast.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.inline.hpp"
+#endif
 
 // Helper class to access current interpreter state
 class LastFrameAccessor : public StackObj {
@@ -1167,6 +1170,7 @@ JRT_END
 
 JRT_LEAF(void, InterpreterRuntime::at_unwind(JavaThread* current))
   assert(current == JavaThread::current(), "pre-condition");
+  JFR_ONLY(Jfr::check_and_process_sample_request(current);)
   // This function is called by the interpreter when the return poll found a reason
   // to call the VM. The reason could be that we are returning into a not yet safe
   // to access frame. We handle that below.
diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp
index 08e2b9f6675..99416519e40 100644
--- a/src/hotspot/share/jfr/jfr.cpp
+++ b/src/hotspot/share/jfr/jfr.cpp
@@ -34,6 +34,7 @@
 #include "jfr/support/jfrResolution.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "runtime/java.hpp"
+#include "runtime/javaThread.hpp"
 
 bool Jfr::is_enabled() {
   return JfrRecorder::is_enabled();
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index df19ebc5808..ce6db8a164d 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -25,7 +25,6 @@
 #ifndef SHARE_JFR_JFR_HPP
 #define SHARE_JFR_JFR_HPP
 
-#include "jni.h"
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/exceptions.hpp"
@@ -36,6 +35,7 @@ class ciKlass;
 class ciMethod;
 class GraphBuilder;
 class JavaThread;
+struct JavaVMOption;
 class Klass;
 class outputStream;
 class Parse;
@@ -72,6 +72,8 @@ class Jfr : AllStatic {
   static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter);
   static void on_backpatching(const Method* callee_method, JavaThread* jt);
   static void initialize_main_thread(JavaThread* jt);
+  static bool has_sample_request(JavaThread* jt);
+  static void check_and_process_sample_request(JavaThread* jt);
 };
 
 #endif // SHARE_JFR_JFR_HPP
diff --git a/src/hotspot/share/jfr/jfr.inline.hpp b/src/hotspot/share/jfr/jfr.inline.hpp
new file mode 100644
index 00000000000..bdb47f600e6
--- /dev/null
+++ b/src/hotspot/share/jfr/jfr.inline.hpp
@@ -0,0 +1,44 @@
+/*
+ * 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_JFR_JFR_INLINE_HPP
+#define SHARE_JFR_JFR_INLINE_HPP
+
+#include "jfr/jfr.hpp"
+
+#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
+#include "runtime/javaThread.hpp"
+
+inline bool Jfr::has_sample_request(JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  return jt->jfr_thread_local()->has_sample_request();
+}
+
+inline void Jfr::check_and_process_sample_request(JavaThread* jt) {
+  if (has_sample_request(jt)) {
+    JfrThreadSampling::process_sample_request(jt);
+  }
+}
+
+#endif // SHARE_JFR_JFR_INLINE_HPP
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index 18a258cad75..d932f073d4b 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -277,9 +277,9 @@ JVM_ENTRY_NO_ENV(void, jfr_set_method_sampling_period(JNIEnv* env, jclass jvm, j
   assert(EventExecutionSample::eventId == typed_event_id || EventNativeMethodSample::eventId == typed_event_id, "invariant");
   JfrEventSetting::set_enabled(typed_event_id, periodMillis > 0);
   if (EventExecutionSample::eventId == type) {
-    JfrThreadSampling::set_java_sample_period(periodMillis);
+    JfrThreadSampler::set_java_sample_period(periodMillis);
   } else {
-    JfrThreadSampling::set_native_sample_period(periodMillis);
+    JfrThreadSampler::set_native_sample_period(periodMillis);
   }
 JVM_END
 
diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
index 5ce2723391a..3d87e86e9bd 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
@@ -334,10 +334,11 @@ void ObjectSampleCheckpoint::write_stacktrace(const JfrStackTrace* trace, JfrChe
   // JfrStackTrace
   writer.write(trace->id());
   writer.write((u1)!trace->_reached_root);
-  writer.write(trace->_nr_of_frames);
+  const int number_of_frames = trace->number_of_frames();
+  writer.write<u4>(number_of_frames);
   // JfrStackFrames
-  for (u4 i = 0; i < trace->_nr_of_frames; ++i) {
-    const JfrStackFrame& frame = trace->_frames[i];
+  for (int i = 0; i < number_of_frames; ++i) {
+    const JfrStackFrame& frame = trace->_frames->at(i);
     frame.write(writer);
     add_to_leakp_set(frame._klass, frame._methodid);
   }
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 644abcc324c..47f78a88abd 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -710,6 +710,11 @@
     <Field type="ulong" name="safepointId" label="Safepoint Identifier" relation="SafepointId" />
   </Event>
 
+  <Event name="SafepointLatency" category="Java Virtual Machine, Runtime, Safepoint" label="Safepoint Latency"
+    description="The delay for a thread to reach its next safepoint poll instruction after receiving an asynchronous sampling interrupt" thread="true" stackTrace="true" throttle="true">
+    <Field type="VMThreadState" name="threadState" label="VM Thread State" />
+  </Event>
+
   <Event name="ExecuteVMOperation" category="Java Virtual Machine, Runtime" label="VM Operation" description="Execution of a VM Operation" thread="true">
     <Field type="VMOperationType" name="operation" label="Operation" />
     <Field type="boolean" name="safepoint" label="At Safepoint" description="If the operation occurred at a safepoint" />
@@ -1295,6 +1300,10 @@
     <Field type="string" name="action" label="Action" />
   </Type>
 
+  <Type name="VMThreadState" label="JVM Thread State">
+    <Field type="string" name="state" label="State" />
+  </Type>
+
   <Type name="Bytecode" label="Bytecode Instruction">
     <Field type="string" name="bytecode" label="Instruction" />
   </Type>
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp
deleted file mode 100644
index 72cad299f8b..00000000000
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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/debugInfoRec.hpp"
-#include "code/nmethod.hpp"
-#include "code/pcDesc.hpp"
-#include "jfr/periodic/sampling/jfrCallTrace.hpp"
-#include "jfr/utilities/jfrTypes.hpp"
-#include "oops/method.hpp"
-#include "runtime/javaCalls.hpp"
-#include "runtime/javaThread.inline.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/registerMap.hpp"
-
-bool JfrGetCallTrace::find_top_frame(frame& top_frame, Method** method, frame& first_frame) {
-  assert(top_frame.cb() != nullptr, "invariant");
-  RegisterMap map(_thread,
-                  RegisterMap::UpdateMap::skip,
-                  RegisterMap::ProcessFrames::skip,
-                  RegisterMap::WalkContinuation::skip);
-  frame candidate = top_frame;
-  for (u4 i = 0; i < MAX_STACK_DEPTH * 2; ++i) {
-    if (candidate.is_entry_frame()) {
-      JavaCallWrapper *jcw = candidate.entry_frame_call_wrapper_if_safe(_thread);
-      if (jcw == nullptr || jcw->is_first_frame()) {
-        return false;
-      }
-    }
-
-    if (candidate.is_interpreted_frame()) {
-      JavaThreadState state = _thread->thread_state();
-      const bool known_valid = (state == _thread_in_native || state == _thread_in_vm || state == _thread_blocked);
-      if (known_valid || candidate.is_interpreted_frame_valid(_thread)) {
-        Method* im = candidate.interpreter_frame_method();
-        if (known_valid && !Method::is_valid_method(im)) {
-          return false;
-        }
-        *method = im;
-        first_frame = candidate;
-        return true;
-      }
-    }
-
-    if (candidate.cb()->is_nmethod()) {
-      // first check to make sure that we have a sane stack,
-      // the PC is actually inside the code part of the codeBlob,
-      // and we are past is_frame_complete_at (stack has been setup)
-      if (!candidate.safe_for_sender(_thread)) {
-        return false;
-      }
-      nmethod* nm = (nmethod*)candidate.cb();
-      *method = nm->method();
-
-      if (_in_java) {
-        PcDesc* pc_desc = nm->pc_desc_near(candidate.pc() + 1);
-        if (pc_desc == nullptr || pc_desc->scope_decode_offset() == DebugInformationRecorder::serialized_null) {
-          return false;
-        }
-        candidate.set_pc(pc_desc->real_pc(nm));
-        assert(nm->pc_desc_at(candidate.pc()) != nullptr, "invalid pc");
-      }
-      first_frame = candidate;
-      return true;
-    }
-
-    if (!candidate.safe_for_sender(_thread) ||
-      candidate.is_stub_frame() ||
-      candidate.cb()->frame_size() <= 0) {
-      return false;
-    }
-
-    candidate = candidate.sender(&map);
-    if (candidate.cb() == nullptr) {
-      return false;
-    }
-  }
-  return false;
-}
-
-bool JfrGetCallTrace::get_topframe(void* ucontext, frame& topframe) {
-  if (!_thread->pd_get_top_frame_for_profiling(&topframe, ucontext, _in_java)) {
-    return false;
-  }
-
-  if (topframe.cb() == nullptr) {
-    return false;
-  }
-
-  frame first_java_frame;
-  Method* method = nullptr;
-  if (find_top_frame(topframe, &method, first_java_frame)) {
-    if (method == nullptr) {
-      return false;
-    }
-    topframe = first_java_frame;
-    return true;
-  }
-  return false;
-}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
new file mode 100644
index 00000000000..f8e63e2e344
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
@@ -0,0 +1,305 @@
+/*
+ * 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.
+ *
+ */
+#include "asm/codeBuffer.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "runtime/continuationEntry.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/javaThread.inline.hpp"
+#include "runtime/os.hpp"
+#include "runtime/safepointMechanism.inline.hpp"
+#include "runtime/stubRoutines.hpp"
+
+static inline bool is_entry_frame(address pc) {
+  return StubRoutines::returns_to_call_stub(pc);
+}
+
+static inline bool is_entry_frame(const JfrSampleRequest& request) {
+  return is_entry_frame(static_cast<address>(request._sample_pc));
+}
+
+static inline bool is_interpreter(address pc) {
+  return Interpreter::contains(pc);
+}
+
+static inline bool is_interpreter(const JfrSampleRequest& request) {
+  return is_interpreter(static_cast<address>(request._sample_pc));
+}
+
+static inline address interpreter_frame_bcp(const JfrSampleRequest& request) {
+  assert(is_interpreter(request), "invariant");
+  return frame::interpreter_bcp(static_cast<intptr_t*>(request._sample_bcp));
+}
+
+static inline bool in_stack(intptr_t* ptr, JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  return jt->is_in_full_stack_checked(reinterpret_cast<address>(ptr));
+}
+
+static inline bool sp_in_stack(const JfrSampleRequest& request, JavaThread* jt) {
+  return in_stack(static_cast<intptr_t*>(request._sample_sp), jt);
+}
+
+static inline bool fp_in_stack(const JfrSampleRequest& request, JavaThread* jt) {
+  return in_stack(static_cast<intptr_t*>(request._sample_bcp), jt);
+}
+
+static inline void update_interpreter_frame_sender_pc(JfrSampleRequest& request, intptr_t* fp) {
+  request._sample_pc = frame::interpreter_return_address(fp);
+}
+
+static inline void update_interpreter_frame_pc(JfrSampleRequest& request, JavaThread* jt) {
+  assert(fp_in_stack(request, jt), "invariant");
+  assert(is_interpreter(request), "invariant");
+  request._sample_pc = frame::interpreter_return_address(static_cast<intptr_t*>(request._sample_bcp));
+}
+
+static inline address interpreter_frame_return_address(const JfrSampleRequest& request) {
+  assert(is_interpreter(request), "invariant");
+  return frame::interpreter_return_address(static_cast<intptr_t*>(request._sample_bcp));
+}
+
+static inline intptr_t* frame_sender_sp(const JfrSampleRequest& request, JavaThread* jt) {
+  assert(fp_in_stack(request, jt), "invariant");
+  return frame::sender_sp(static_cast<intptr_t*>(request._sample_bcp));
+}
+
+static inline void update_frame_sender_sp(JfrSampleRequest& request, JavaThread* jt) {
+  request._sample_sp = frame_sender_sp(request, jt);
+}
+
+static inline void update_frame_sender_sp(JfrSampleRequest& request, intptr_t* fp) {
+  request._sample_sp = frame::sender_sp(fp);
+}
+
+static inline intptr_t* frame_link(const JfrSampleRequest& request) {
+  return frame::link(static_cast<intptr_t*>(request._sample_bcp));
+}
+
+static inline void update_sp(JfrSampleRequest& request, int frame_size) {
+  assert(frame_size >= 0, "invariant");
+  request._sample_sp = static_cast<intptr_t*>(request._sample_sp) + frame_size;
+}
+
+static inline void update_pc(JfrSampleRequest& request) {
+  assert(request._sample_sp != nullptr, "invariant");
+  request._sample_pc = frame::return_address(static_cast<intptr_t*>(request._sample_sp));
+}
+
+static inline void update_fp(JfrSampleRequest& request) {
+  assert(request._sample_sp != nullptr, "invariant");
+  request._sample_bcp = is_interpreter(request) ? frame::fp(static_cast<intptr_t*>(request._sample_sp)) : nullptr;
+}
+
+// Less extensive sanity checks for an interpreter frame.
+static bool is_valid_interpreter_frame(const JfrSampleRequest& request, JavaThread* jt) {
+  assert(sp_in_stack(request, jt), "invariant");
+  assert(fp_in_stack(request, jt), "invariant");
+  return frame::is_interpreter_frame_setup_at(static_cast<intptr_t*>(request._sample_bcp), request._sample_sp);
+}
+
+static inline bool is_continuation_frame(address pc) {
+  return ContinuationEntry::return_pc() == pc;
+}
+
+static inline bool is_continuation_frame(const JfrSampleRequest& request) {
+  return is_continuation_frame(static_cast<address>(request._sample_pc));
+}
+
+static intptr_t* sender_for_interpreter_frame(JfrSampleRequest& request, JavaThread* jt) {
+  update_interpreter_frame_pc(request, jt); // pick up return address
+  if (is_continuation_frame(request) || is_entry_frame(request)) {
+    request._sample_pc = nullptr;
+    return nullptr;
+  }
+  update_frame_sender_sp(request, jt);
+  intptr_t* fp = nullptr;
+  if (is_interpreter(request)) {
+    fp = frame_link(request);
+  }
+  request._sample_bcp = nullptr;
+  return fp;
+}
+
+static bool build(JfrSampleRequest& request, intptr_t* fp, JavaThread* jt);
+
+static bool build_for_interpreter(JfrSampleRequest& request, JavaThread* jt) {
+  assert(is_interpreter(request), "invariant");
+  assert(jt != nullptr, "invariant");
+  if (!fp_in_stack(request, jt)) {
+    return false;
+  }
+  if (is_valid_interpreter_frame(request, jt)) {
+    // Set fp as sp for interpreter frames.
+    request._sample_sp = request._sample_bcp;
+    // Get real bcp.
+    void* const bcp = interpreter_frame_bcp(request);
+    // Setting bcp = 1 marks the sample request to represent a native method.
+    request._sample_bcp = bcp != nullptr ? bcp : reinterpret_cast<address>(1);
+    return true;
+  }
+  intptr_t* fp = sender_for_interpreter_frame(request, jt);
+  if (request._sample_pc == nullptr || request._sample_sp == nullptr) {
+    return false;
+  }
+  return build(request, fp, jt);
+}
+
+// Attempt to build a Jfr sample request.
+static bool build(JfrSampleRequest& request, intptr_t* fp, JavaThread* jt) {
+  assert(request._sample_sp != nullptr, "invariant");
+  assert(request._sample_pc != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(jt->thread_state() == _thread_in_Java, "invariant");
+
+  // 1. Interpreter frame?
+  if (is_interpreter(request)) {
+    request._sample_bcp = fp;
+    return build_for_interpreter(request, jt);
+  }
+  const CodeBlob* const cb = CodeCache::find_blob(request._sample_pc);
+  if (cb != nullptr) {
+    // 2. Is nmethod?
+    return cb->is_nmethod();
+    // 3. What kind of CodeBlob or Stub?
+    // Longer plan is to make stubs and blobs parsable,
+    // and we will have a list of cases here for each blob type
+    // describing how to locate the sender. We can't get to the
+    // sender of a blob or stub until they have a standardized
+    // layout and proper metadata descriptions.
+  }
+  return false;
+}
+
+static bool build_from_ljf(JfrSampleRequest& request,
+                           const JfrThreadLocal* tl,
+                           JavaThread* jt) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(jt->jfr_thread_local() == tl, "invariant");
+  assert(sp_in_stack(request, jt), "invariant");
+  // Last Java frame is available, but might not be walkable, fix it.
+  address last_pc = jt->last_Java_pc();
+  if (last_pc == nullptr) {
+    last_pc = frame::return_address(static_cast<intptr_t*>(request._sample_sp));
+    if (last_pc == nullptr) {
+      return false;
+    }
+  }
+  assert(last_pc != nullptr, "invariant");
+  if (is_interpreter(last_pc)) {
+    if (tl->in_sampling_critical_section()) {
+      return false;
+    }
+    request._sample_pc = last_pc;
+    request._sample_bcp = jt->frame_anchor()->last_Java_fp();
+    return build_for_interpreter(request, jt);
+  }
+  request._sample_pc = last_pc;
+  return build(request, nullptr, jt);
+}
+
+static bool build_from_context(JfrSampleRequest& request,
+                               const void* ucontext,
+                               const JfrThreadLocal* tl,
+                               JavaThread* jt) {
+  assert(ucontext != nullptr, "invariant");
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(jt->jfr_thread_local() == tl, "invariant");
+  assert(!jt->has_last_Java_frame(), "invariant");
+  intptr_t* fp;
+  request._sample_pc = os::fetch_frame_from_context(ucontext, reinterpret_cast<intptr_t**>(&request._sample_sp), &fp);
+  assert(sp_in_stack(request, jt), "invariant");
+  if (is_interpreter(request)) {
+    if (tl->in_sampling_critical_section() || !in_stack(fp, jt)) {
+      return false;
+    }
+    if (frame::is_interpreter_frame_setup_at(fp, request._sample_sp)) {
+      // Set fp as sp for interpreter frames.
+      request._sample_sp = fp;
+      void* bcp = os::fetch_bcp_from_context(ucontext);
+      // Setting bcp = 1 marks the sample request to represent a native method.
+      request._sample_bcp = bcp != nullptr ? bcp : reinterpret_cast<void*>(1);
+      return true;
+    }
+    request._sample_bcp = fp;
+    fp = sender_for_interpreter_frame(request, jt);
+    if (request._sample_pc == nullptr || request._sample_sp == nullptr) {
+      return false;
+    }
+  }
+  return build(request, fp, jt);
+}
+
+static inline JfrSampleResult set_request_and_arm_local_poll(JfrSampleRequest& request, JfrThreadLocal* tl, JavaThread* jt) {
+  assert(tl != nullptr, "invariant");
+  assert(jt->jfr_thread_local() == tl, "invariant");
+  tl->set_sample_state(JAVA_SAMPLE);
+  SafepointMechanism::arm_local_poll_release(jt);
+  // For a Java sample, request._sample_ticks is also the start time for the SafepointLatency event.
+  request._sample_ticks = JfrTicks::now();
+  tl->set_sample_request(request);
+  return SAMPLE_JAVA;
+}
+
+// A biased sample request is denoted by an empty bcp and an empty pc.
+static inline JfrSampleResult set_biased_java_sample(JfrSampleRequest& request, JfrThreadLocal* tl, JavaThread* jt) {
+  if (request._sample_bcp != nullptr) {
+    request._sample_bcp = nullptr;
+  }
+  assert(request._sample_bcp == nullptr, "invariant");
+  request._sample_pc = nullptr;
+  return set_request_and_arm_local_poll(request, tl, jt);
+}
+
+static inline JfrSampleResult set_unbiased_java_sample(JfrSampleRequest& request, JfrThreadLocal* tl, JavaThread* jt) {
+  assert(request._sample_sp != nullptr, "invariant");
+  assert(sp_in_stack(request, jt), "invariant");
+  assert(request._sample_bcp != nullptr || !is_interpreter(request), "invariant");
+  return set_request_and_arm_local_poll(request, tl, jt);
+}
+
+JfrSampleResult JfrSampleRequestBuilder::build_java_sample_request(const void* ucontext,
+                                                                   JfrThreadLocal* tl,
+                                                                   JavaThread* jt) {
+  assert(ucontext != nullptr, "invariant");
+  assert(tl != nullptr, "invariant");
+  assert(tl->sample_state() == NO_SAMPLE, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(jt->thread_state() == _thread_in_Java, "invariant");
+
+  JfrSampleRequest request;
+
+  // Prioritize the ljf, if one exists.
+  request._sample_sp = jt->last_Java_sp();
+  if (request._sample_sp != nullptr) {
+    if (build_from_ljf(request, tl, jt)) {
+      return set_unbiased_java_sample(request, tl, jt);
+    }
+  } else if (build_from_context(request, ucontext, tl, jt)) {
+    return set_unbiased_java_sample(request, tl, jt);
+  }
+  return set_biased_java_sample(request, tl, jt);
+}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
new file mode 100644
index 00000000000..8cc2b66aa9e
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
+
+#include "jfr/utilities/jfrTime.hpp"
+#include "memory/allocation.hpp"
+#include "utilities/growableArray.hpp"
+
+class JavaThread;
+class JfrThreadLocal;
+
+enum JfrSampleResult {
+  THREAD_SUSPENSION_ERROR,
+  WRONG_THREAD_STATE,
+  UNPARSABLE_TOP_FRAME,
+  INVALID_STACK_TRACE,
+  CRASH,
+  NO_LAST_JAVA_FRAME,
+  UNKNOWN,
+  FAIL,
+  SKIP,
+  SAMPLE_NATIVE,
+  SAMPLE_JAVA,
+  NOF_SAMPLING_RESULTS
+};
+
+enum JfrSampleRequestType {
+  NO_SAMPLE = 0,
+  NATIVE_SAMPLE = 1,
+  JAVA_SAMPLE = 2,
+  NOF_SAMPLE_TYPES
+};
+
+struct JfrSampleRequest {
+  void* _sample_sp;
+  void* _sample_pc;
+  void* _sample_bcp;
+  JfrTicks _sample_ticks;
+
+  JfrSampleRequest() :
+    _sample_sp(nullptr),
+    _sample_pc(nullptr),
+    _sample_bcp(nullptr),
+    _sample_ticks() {}
+
+  JfrSampleRequest(const JfrTicks& ticks) :
+    _sample_sp(nullptr),
+    _sample_pc(nullptr),
+    _sample_bcp(nullptr),
+    _sample_ticks(ticks) {}
+};
+
+typedef GrowableArrayCHeap<JfrSampleRequest, mtTracing> JfrSampleRequestQueue;
+
+class JfrSampleRequestBuilder : AllStatic {
+ public:
+  static JfrSampleResult build_java_sample_request(const void* ucontext,
+                                                   JfrThreadLocal* tl,
+                                                   JavaThread* jt);
+};
+
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index 29f4c88881b..a64bbc66d05 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -22,340 +22,48 @@
  *
  */
 
-#include "classfile/javaThreadStatus.hpp"
-#include "jfr/jfrEvents.hpp"
-#include "jfr/recorder/jfrRecorder.hpp"
-#include "jfr/periodic/sampling/jfrCallTrace.hpp"
-#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
-#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp"
+#include "jfr/metadata/jfrSerializer.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
-#include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
-#include "jfr/recorder/storage/jfrBuffer.hpp"
-#include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
+#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/utilities/jfrTime.hpp"
-#include "jfrfiles/jfrEventClasses.hpp"
+#include "jfr/utilities/jfrTryLock.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/frame.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/javaThread.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
+#include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/semaphore.hpp"
-#include "runtime/stackWatermark.hpp"
 #include "runtime/suspendedThreadTask.hpp"
-#include "runtime/threadCrashProtection.hpp"
-#include "runtime/threadSMR.hpp"
+#include "runtime/threadSMR.inline.hpp"
 #include "utilities/systemMemoryBarrier.hpp"
 
-enum JfrSampleType {
-  NO_SAMPLE = 0,
-  JAVA_SAMPLE = 1,
-  NATIVE_SAMPLE = 2
-};
-
-static bool thread_state_in_java(JavaThread* thread) {
-  assert(thread != nullptr, "invariant");
-  switch(thread->thread_state()) {
-    case _thread_new:
-    case _thread_uninitialized:
-    case _thread_new_trans:
-    case _thread_in_vm_trans:
-    case _thread_blocked_trans:
-    case _thread_in_native_trans:
-    case _thread_blocked:
-    case _thread_in_vm:
-    case _thread_in_native:
-    case _thread_in_Java_trans:
-      break;
-    case _thread_in_Java:
-      return true;
-    default:
-      ShouldNotReachHere();
-      break;
-  }
-  return false;
-}
-
-static bool thread_state_in_native(JavaThread* thread) {
-  assert(thread != nullptr, "invariant");
-  switch(thread->thread_state()) {
-    case _thread_new:
-    case _thread_uninitialized:
-    case _thread_new_trans:
-    case _thread_blocked_trans:
-    case _thread_blocked:
-    case _thread_in_vm:
-    case _thread_in_vm_trans:
-    case _thread_in_Java_trans:
-    case _thread_in_Java:
-    case _thread_in_native_trans:
-      break;
-    case _thread_in_native:
-      return true;
-    default:
-      ShouldNotReachHere();
-      break;
-  }
-  return false;
-}
-
-class JfrThreadSampleClosure {
- public:
-  JfrThreadSampleClosure(EventExecutionSample* events, EventNativeMethodSample* events_native);
-  ~JfrThreadSampleClosure() {}
-  EventExecutionSample* next_event() { return &_events[_added_java++]; }
-  EventNativeMethodSample* next_event_native() { return &_events_native[_added_native++]; }
-  void commit_events(JfrSampleType type);
-  bool do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, JfrSampleType type);
-  uint java_entries() { return _added_java; }
-  uint native_entries() { return _added_native; }
-
- private:
-  bool sample_thread_in_java(JavaThread* thread, JfrStackFrame* frames, u4 max_frames);
-  bool sample_thread_in_native(JavaThread* thread, JfrStackFrame* frames, u4 max_frames);
-  EventExecutionSample* _events;
-  EventNativeMethodSample* _events_native;
-  Thread* _self;
-  uint _added_java;
-  uint _added_native;
-};
-
-class OSThreadSampler : public SuspendedThreadTask {
- public:
-  OSThreadSampler(JavaThread* thread,
-                  JfrThreadSampleClosure& closure,
-                  JfrStackFrame *frames,
-                  u4 max_frames) : SuspendedThreadTask((Thread*)thread),
-    _success(false),
-    _thread_oop(thread->threadObj()),
-    _stacktrace(frames, max_frames),
-    _closure(closure),
-    _suspend_time() {}
-
-  void take_sample();
-  void do_task(const SuspendedThreadTaskContext& context);
-  void protected_task(const SuspendedThreadTaskContext& context);
-  bool success() const { return _success; }
-  const JfrStackTrace& stacktrace() const { return _stacktrace; }
-
- private:
-  bool _success;
-  oop _thread_oop;
-  JfrStackTrace _stacktrace;
-  JfrThreadSampleClosure& _closure;
-  JfrTicks _suspend_time;
-};
-
-class OSThreadSamplerCallback : public CrashProtectionCallback {
- public:
-  OSThreadSamplerCallback(OSThreadSampler& sampler, const SuspendedThreadTaskContext &context) :
-    _sampler(sampler), _context(context) {
-  }
-  virtual void call() {
-    _sampler.protected_task(_context);
-  }
- private:
-  OSThreadSampler& _sampler;
-  const SuspendedThreadTaskContext& _context;
-};
-
-void OSThreadSampler::do_task(const SuspendedThreadTaskContext& context) {
-#ifndef ASSERT
-  guarantee(JfrOptionSet::sample_protection(), "Sample Protection should be on in product builds");
-#endif
-  assert(_suspend_time.value() == 0, "already timestamped!");
-  _suspend_time = JfrTicks::now();
-
-  if (JfrOptionSet::sample_protection()) {
-    OSThreadSamplerCallback cb(*this, context);
-    ThreadCrashProtection crash_protection;
-    if (!crash_protection.call(cb)) {
-      log_error(jfr)("Thread method sampler crashed");
-    }
-  } else {
-    protected_task(context);
-  }
-}
-
-/*
-* From this method and down the call tree we attempt to protect against crashes
-* using a signal handler / __try block. Don't take locks, rely on destructors or
-* leave memory (in case of signal / exception) in an inconsistent state. */
-void OSThreadSampler::protected_task(const SuspendedThreadTaskContext& context) {
-  JavaThread* const jt = JavaThread::cast(context.thread());
-  // Skip sample if we signaled a thread that moved to other state
-  if (!thread_state_in_java(jt)) {
-    return;
-  }
-  JfrGetCallTrace trace(true, jt);
-  frame topframe;
-  if (trace.get_topframe(context.ucontext(), topframe)) {
-    if (_stacktrace.record_async(jt, topframe)) {
-      /* If we managed to get a topframe and a stacktrace, create an event
-      * and put it into our array. We can't call Jfr::_stacktraces.add()
-      * here since it would allocate memory using malloc. Doing so while
-      * the stopped thread is inside malloc would deadlock. */
-      _success = true;
-      EventExecutionSample *ev = _closure.next_event();
-      ev->set_starttime(_suspend_time);
-      ev->set_endtime(_suspend_time); // fake to not take an end time
-      ev->set_sampledThread(JfrThreadLocal::thread_id(jt));
-      ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));
-    }
-  }
-}
-
-void OSThreadSampler::take_sample() {
-  run();
-}
-
-class JfrNativeSamplerCallback : public CrashProtectionCallback {
- public:
-  JfrNativeSamplerCallback(JfrThreadSampleClosure& closure, JavaThread* jt, JfrStackFrame* frames, u4 max_frames) :
-    _closure(closure), _jt(jt), _thread_oop(jt->threadObj()), _stacktrace(frames, max_frames), _success(false) {
-  }
-  virtual void call();
-  bool success() { return _success; }
-  JfrStackTrace& stacktrace() { return _stacktrace; }
-
- private:
-  JfrThreadSampleClosure& _closure;
-  JavaThread* _jt;
-  oop _thread_oop;
-  JfrStackTrace _stacktrace;
-  bool _success;
-};
-
-static void write_native_event(JfrThreadSampleClosure& closure, JavaThread* jt, oop thread_oop) {
-  EventNativeMethodSample *ev = closure.next_event_native();
-  ev->set_starttime(JfrTicks::now());
-  ev->set_sampledThread(JfrThreadLocal::thread_id(jt));
-  ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));
-}
-
-void JfrNativeSamplerCallback::call() {
-  // When a thread is only attach it will be native without a last java frame
-  if (!_jt->has_last_Java_frame()) {
-    return;
-  }
-
-  frame topframe = _jt->last_frame();
-  frame first_java_frame;
-  Method* method = nullptr;
-  JfrGetCallTrace gct(false, _jt);
-  if (!gct.find_top_frame(topframe, &method, first_java_frame)) {
-    return;
-  }
-  if (method == nullptr) {
-    return;
-  }
-  topframe = first_java_frame;
-  _success = _stacktrace.record_async(_jt, topframe);
-  if (_success) {
-    write_native_event(_closure, _jt, _thread_oop);
-  }
-}
-
-bool JfrThreadSampleClosure::sample_thread_in_java(JavaThread* thread, JfrStackFrame* frames, u4 max_frames) {
-  // Process the oops in the thread head before calling into code that wants to
-  // stack walk over Loom continuations. The stack walking code will otherwise
-  // skip frames in stack chunks on the Java heap.
-  StackWatermarkSet::start_processing(thread, StackWatermarkKind::gc);
-
-  OSThreadSampler sampler(thread, *this, frames, max_frames);
-  sampler.take_sample();
-  /* We don't want to allocate any memory using malloc/etc while the thread
-  * is stopped, so everything is stored in stack allocated memory until this
-  * point where the thread has been resumed again, if the sampling was a success
-  * we need to store the stacktrace in the stacktrace repository and update
-  * the event with the id that was returned. */
-  if (!sampler.success()) {
-    return false;
-  }
-  EventExecutionSample *event = &_events[_added_java - 1];
-  traceid id = JfrStackTraceRepository::add(sampler.stacktrace());
-  assert(id != 0, "Stacktrace id should not be 0");
-  event->set_stackTrace(id);
-  return true;
-}
-
-bool JfrThreadSampleClosure::sample_thread_in_native(JavaThread* thread, JfrStackFrame* frames, u4 max_frames) {
-  // Process the oops in the thread head before calling into code that wants to
-  // stack walk over Loom continuations. The stack walking code will otherwise
-  // skip frames in stack chunks on the Java heap.
-  StackWatermarkSet::start_processing(thread, StackWatermarkKind::gc);
-
-  JfrNativeSamplerCallback cb(*this, thread, frames, max_frames);
-  if (JfrOptionSet::sample_protection()) {
-    ThreadCrashProtection crash_protection;
-    if (!crash_protection.call(cb)) {
-      log_error(jfr)("Thread method sampler crashed for native");
-    }
-  } else {
-    cb.call();
-  }
-  if (!cb.success()) {
-    return false;
-  }
-  EventNativeMethodSample *event = &_events_native[_added_native - 1];
-  traceid id = JfrStackTraceRepository::add(cb.stacktrace());
-  assert(id != 0, "Stacktrace id should not be 0");
-  event->set_stackTrace(id);
-  return true;
-}
-
-static const uint MAX_NR_OF_JAVA_SAMPLES = 5;
-static const uint MAX_NR_OF_NATIVE_SAMPLES = 1;
-
-void JfrThreadSampleClosure::commit_events(JfrSampleType type) {
-  if (JAVA_SAMPLE == type) {
-    assert(_added_java > 0 && _added_java <= MAX_NR_OF_JAVA_SAMPLES, "invariant");
-    if (EventExecutionSample::is_enabled()) {
-      for (uint i = 0; i < _added_java; ++i) {
-        _events[i].commit();
-      }
-    }
-  } else {
-    assert(NATIVE_SAMPLE == type, "invariant");
-    assert(_added_native > 0 && _added_native <= MAX_NR_OF_NATIVE_SAMPLES, "invariant");
-    if (EventNativeMethodSample::is_enabled()) {
-      for (uint i = 0; i < _added_native; ++i) {
-        _events_native[i].commit();
-      }
-    }
-  }
-}
-
-JfrThreadSampleClosure::JfrThreadSampleClosure(EventExecutionSample* events, EventNativeMethodSample* events_native) :
-  _events(events),
-  _events_native(events_native),
-  _self(Thread::current()),
-  _added_java(0),
-  _added_native(0) {
-}
-
-class JfrThreadSampler : public NonJavaThread {
-  friend class JfrThreadSampling;
+// The JfrSamplerThread suspends, if necessary, JavaThreads for sampling.
+// It creates a sample description of the top Java frame, called a Jfr Sample Request.
+// The request is installed into a thread-local queue associated with the sampled thread.
+// Before resuming the sampled thread, its thread-local poll page is armed.
+// This mechanism lets the sampled thread discover and process the installed
+// sample request at its next safepoint poll instruction.
+class JfrSamplerThread : public NonJavaThread {
+  friend class JfrThreadSampler;
  private:
   Semaphore _sample;
-  Thread* _sampler_thread;
-  JfrStackFrame* const _frames;
   JavaThread* _last_thread_java;
   JavaThread* _last_thread_native;
   int64_t _java_period_millis;
   int64_t _native_period_millis;
-  const size_t _min_size; // for enqueue buffer monitoring
   int _cur_index;
   const u4 _max_frames;
   volatile bool _disenrolled;
 
-  const JfrBuffer* get_enqueue_buffer();
-  const JfrBuffer* renew_if_full(const JfrBuffer* enqueue_buffer);
-
   JavaThread* next_thread(ThreadsList* t_list, JavaThread* first_sampled, JavaThread* current);
-  void task_stacktrace(JfrSampleType type, JavaThread** last_thread);
-  JfrThreadSampler(int64_t java_period_millis, int64_t native_period_millis, u4 max_frames);
-  ~JfrThreadSampler();
+  void task_stacktrace(JfrSampleRequestType type, JavaThread** last_thread);
+  JfrSamplerThread(int64_t java_period_millis, int64_t native_period_millis, u4 max_frames);
 
   void start_thread();
 
@@ -363,68 +71,27 @@ class JfrThreadSampler : public NonJavaThread {
   void disenroll();
   void set_java_period(int64_t period_millis);
   void set_native_period(int64_t period_millis);
+  bool sample_java_thread(JavaThread* jt);
+  bool sample_native_thread(JavaThread* jt);
+
  protected:
+  void run();
   virtual void post_run();
+
  public:
-  virtual const char* name() const { return "JFR Thread Sampler"; }
-  virtual const char* type_name() const { return "JfrThreadSampler"; }
+  virtual const char* name() const { return "JFR Sampler Thread"; }
+  virtual const char* type_name() const { return "JfrSamplerThread"; }
   bool is_JfrSampler_thread() const { return true; }
-  void run();
-  static Monitor* transition_block() { return JfrThreadSampler_lock; }
-  static void on_javathread_suspend(JavaThread* thread);
-  int64_t get_java_period() const { return Atomic::load(&_java_period_millis); };
-  int64_t get_native_period() const { return Atomic::load(&_native_period_millis); };
+  int64_t java_period() const { return Atomic::load(&_java_period_millis); };
+  int64_t native_period() const { return Atomic::load(&_native_period_millis); };
 };
 
-static void clear_transition_block(JavaThread* jt) {
-  assert(Threads_lock->owned_by_self(), "Holding the thread table lock.");
-  jt->clear_trace_flag();
-  JfrThreadLocal* const tl = jt->jfr_thread_local();
-  MutexLocker ml(JfrThreadSampler::transition_block(), Mutex::_no_safepoint_check_flag);
-  if (tl->is_trace_block()) {
-    JfrThreadSampler::transition_block()->notify();
-  }
-}
-
-static bool is_excluded(JavaThread* thread) {
-  assert(thread != nullptr, "invariant");
-  return thread->is_hidden_from_external_view() || thread->in_deopt_handler() || thread->jfr_thread_local()->is_excluded();
-}
-
-bool JfrThreadSampleClosure::do_sample_thread(JavaThread* thread, JfrStackFrame* frames, u4 max_frames, JfrSampleType type) {
-  assert(Threads_lock->owned_by_self(), "Holding the thread table lock.");
-  if (is_excluded(thread)) {
-    return false;
-  }
-
-  bool ret = false;
-  thread->set_trace_flag();  // Provides StoreLoad, needed to keep read of thread state from floating up.
-  if (UseSystemMemoryBarrier) {
-    SystemMemoryBarrier::emit();
-  }
-  if (JAVA_SAMPLE == type) {
-    if (thread_state_in_java(thread)) {
-      ret = sample_thread_in_java(thread, frames, max_frames);
-    }
-  } else {
-    assert(NATIVE_SAMPLE == type, "invariant");
-    if (thread_state_in_native(thread)) {
-      ret = sample_thread_in_native(thread, frames, max_frames);
-    }
-  }
-  clear_transition_block(thread);
-  return ret;
-}
-
-JfrThreadSampler::JfrThreadSampler(int64_t java_period_millis, int64_t native_period_millis, u4 max_frames) :
+JfrSamplerThread::JfrSamplerThread(int64_t java_period_millis, int64_t native_period_millis, u4 max_frames) :
   _sample(),
-  _sampler_thread(nullptr),
-  _frames(JfrCHeapObj::new_array<JfrStackFrame>(max_frames)),
   _last_thread_java(nullptr),
   _last_thread_native(nullptr),
   _java_period_millis(java_period_millis),
   _native_period_millis(native_period_millis),
-  _min_size(max_frames * 2 * wordSize), // each frame tags at most 2 words, min size is a full stacktrace
   _cur_index(-1),
   _max_frames(max_frames),
   _disenrolled(true) {
@@ -432,54 +99,12 @@ JfrThreadSampler::JfrThreadSampler(int64_t java_period_millis, int64_t native_pe
   assert(_native_period_millis >= 0, "invariant");
 }
 
-JfrThreadSampler::~JfrThreadSampler() {
-  JfrCHeapObj::free(_frames, sizeof(JfrStackFrame) * _max_frames);
-}
-
-void JfrThreadSampler::set_java_period(int64_t period_millis) {
-  assert(period_millis >= 0, "invariant");
-  Atomic::store(&_java_period_millis, period_millis);
-}
-
-void JfrThreadSampler::set_native_period(int64_t period_millis) {
-  assert(period_millis >= 0, "invariant");
-  Atomic::store(&_native_period_millis, period_millis);
-}
-
-static inline bool is_released(JavaThread* jt) {
-  return !jt->is_trace_suspend();
-}
-
-void JfrThreadSampler::on_javathread_suspend(JavaThread* thread) {
-  if (is_released(thread)) {
-    return;
-  }
-  JfrThreadLocal* const tl = thread->jfr_thread_local();
-  MonitorLocker ml(transition_block(), Mutex::_no_safepoint_check_flag);
-  tl->set_trace_block();
-  while (!is_released(thread)) {
-    ml.wait();
-  }
-  tl->clear_trace_block();
-}
-
-JavaThread* JfrThreadSampler::next_thread(ThreadsList* t_list, JavaThread* first_sampled, JavaThread* current) {
-  assert(t_list != nullptr, "invariant");
-  assert(Threads_lock->owned_by_self(), "Holding the thread table lock.");
-  assert(_cur_index >= -1 && (uint)_cur_index + 1 <= t_list->length(), "invariant");
-  assert((current == nullptr && -1 == _cur_index) || (t_list->find_index_of_JavaThread(current) == _cur_index), "invariant");
-  if ((uint)_cur_index + 1 == t_list->length()) {
-    // wrap
-    _cur_index = 0;
-  } else {
-    _cur_index++;
-  }
-  assert(_cur_index >= 0 && (uint)_cur_index < t_list->length(), "invariant");
-  JavaThread* const next = t_list->thread_at(_cur_index);
-  return next != first_sampled ? next : nullptr;
+void JfrSamplerThread::post_run() {
+  this->NonJavaThread::post_run();
+  delete this;
 }
 
-void JfrThreadSampler::start_thread() {
+void JfrSamplerThread::start_thread() {
   if (os::create_thread(this, os::os_thread)) {
     os::start_thread(this);
   } else {
@@ -487,7 +112,7 @@ void JfrThreadSampler::start_thread() {
   }
 }
 
-void JfrThreadSampler::enroll() {
+void JfrSamplerThread::enroll() {
   if (_disenrolled) {
     log_trace(jfr)("Enrolling thread sampler");
     _sample.signal();
@@ -495,7 +120,7 @@ void JfrThreadSampler::enroll() {
   }
 }
 
-void JfrThreadSampler::disenroll() {
+void JfrSamplerThread::disenroll() {
   if (!_disenrolled) {
     _sample.wait();
     _disenrolled = true;
@@ -503,14 +128,23 @@ void JfrThreadSampler::disenroll() {
   }
 }
 
-static int64_t get_monotonic_ms() {
+// Currently we only need to serialize a single thread state
+// _thread_in_Java for the SafepointLatency event.
+class VMThreadStateSerializer : public JfrSerializer {
+ public:
+  void serialize(JfrCheckpointWriter& writer) {
+    writer.write_count(1);
+    writer.write_key(_thread_in_Java);
+    writer.write("_thread_in_Java");
+  }
+};
+
+static inline int64_t get_monotonic_ms() {
   return os::javaTimeNanos() / 1000000;
 }
 
-void JfrThreadSampler::run() {
-  assert(_sampler_thread == nullptr, "invariant");
-
-  _sampler_thread = this;
+void JfrSamplerThread::run() {
+  JfrSerializer::register_serializer(TYPE_VMTHREADSTATE, true, new VMThreadStateSerializer());
 
   int64_t last_java_ms = get_monotonic_ms();
   int64_t last_native_ms = last_java_ms;
@@ -523,9 +157,9 @@ void JfrThreadSampler::run() {
     }
     _sample.signal();
 
-    int64_t java_period_millis = get_java_period();
+    int64_t java_period_millis = java_period();
     java_period_millis = java_period_millis == 0 ? max_jlong : MAX2<int64_t>(java_period_millis, 1);
-    int64_t native_period_millis = get_native_period();
+    int64_t native_period_millis = native_period();
     native_period_millis = native_period_millis == 0 ? max_jlong : MAX2<int64_t>(native_period_millis, 1);
 
     // If both periods are max_jlong, it implies the sampler is in the process of
@@ -567,110 +201,201 @@ void JfrThreadSampler::run() {
   }
 }
 
-void JfrThreadSampler::post_run() {
-  this->NonJavaThread::post_run();
-  delete this;
-}
-
-const JfrBuffer* JfrThreadSampler::get_enqueue_buffer() {
-  const JfrBuffer* buffer = JfrTraceIdLoadBarrier::get_sampler_enqueue_buffer(this);
-  return buffer != nullptr ? renew_if_full(buffer) : JfrTraceIdLoadBarrier::renew_sampler_enqueue_buffer(this);
+JavaThread* JfrSamplerThread::next_thread(ThreadsList* t_list, JavaThread* first_sampled, JavaThread* current) {
+  assert(t_list != nullptr, "invariant");
+  assert(_cur_index >= -1 && (uint)_cur_index + 1 <= t_list->length(), "invariant");
+  assert((current == nullptr && -1 == _cur_index) || (t_list->find_index_of_JavaThread(current) == _cur_index), "invariant");
+  if ((uint)_cur_index + 1 == t_list->length()) {
+    // wrap
+    _cur_index = 0;
+  } else {
+    _cur_index++;
+  }
+  assert(_cur_index >= 0 && (uint)_cur_index < t_list->length(), "invariant");
+  JavaThread* const next = t_list->thread_at(_cur_index);
+  return next != first_sampled ? next : nullptr;
 }
 
-const JfrBuffer* JfrThreadSampler::renew_if_full(const JfrBuffer* enqueue_buffer) {
-  assert(enqueue_buffer != nullptr, "invariant");
-  return enqueue_buffer->free_size() < _min_size ? JfrTraceIdLoadBarrier::renew_sampler_enqueue_buffer(this) : enqueue_buffer;
+static inline bool is_excluded(JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  return jt->is_Compiler_thread() || jt->is_hidden_from_external_view() || jt->is_JfrRecorder_thread() || jt->jfr_thread_local()->is_excluded();
 }
 
-void JfrThreadSampler::task_stacktrace(JfrSampleType type, JavaThread** last_thread) {
-  ResourceMark rm;
-  EventExecutionSample samples[MAX_NR_OF_JAVA_SAMPLES];
-  EventNativeMethodSample samples_native[MAX_NR_OF_NATIVE_SAMPLES];
-  JfrThreadSampleClosure sample_task(samples, samples_native);
-
-  const uint sample_limit = JAVA_SAMPLE == type ? MAX_NR_OF_JAVA_SAMPLES : MAX_NR_OF_NATIVE_SAMPLES;
+void JfrSamplerThread::task_stacktrace(JfrSampleRequestType type, JavaThread** last_thread) {
+  const uint sample_limit = JAVA_SAMPLE == type ? 5 : 1;
   uint num_samples = 0;
   JavaThread* start = nullptr;
+  elapsedTimer sample_time;
+  sample_time.start();
   {
-    elapsedTimer sample_time;
-    sample_time.start();
-    {
-      MutexLocker tlock(Threads_lock);
-      ThreadsListHandle tlh;
-      // Resolve a sample session relative start position index into the thread list array.
-      // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
-      _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
-      JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
-
-      // Explicitly monitor the available space of the thread-local buffer used by the load barrier
-      // for enqueuing klasses as part of tagging methods. We do this because if space becomes sparse,
-      // we cannot rely on the implicit allocation of a new buffer as part of the regular tag mechanism.
-      // If the free list is empty, a malloc could result, and the problem with that is that the thread
-      // we have suspended could be the holder of the malloc lock. Instead, the buffer is pre-emptively
-      // renewed before thread suspension.
-      const JfrBuffer* enqueue_buffer = get_enqueue_buffer();
-      assert(enqueue_buffer != nullptr, "invariant");
-
-      while (num_samples < sample_limit) {
-        current = next_thread(tlh.list(), start, current);
-        if (current == nullptr) {
-          break;
-        }
-        if (start == nullptr) {
-          start = current;  // remember the thread where we started to attempt sampling
-        }
-        if (current->is_Compiler_thread()) {
-          continue;
-        }
-        assert(enqueue_buffer->free_size() >= _min_size, "invariant");
-        if (sample_task.do_sample_thread(current, _frames, _max_frames, type)) {
-          num_samples++;
-        }
-        enqueue_buffer = renew_if_full(enqueue_buffer);
+    MutexLocker tlock(Threads_lock);
+    ThreadsListHandle tlh;
+    // Resolve a sample session relative start position index into the thread list array.
+    // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
+    _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
+    JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
+
+    // while (num_samples < sample_limit) {
+    while (true) {
+      current = next_thread(tlh.list(), start, current);
+      if (current == nullptr) {
+        break;
+      }
+      if (is_excluded(current)) {
+        continue;
+      }
+      if (start == nullptr) {
+        start = current; // remember the thread where we started to attempt sampling
+      }
+      bool success;
+      if (JAVA_SAMPLE == type) {
+        success = sample_java_thread(current);
+      } else {
+        assert(type == NATIVE_SAMPLE, "invariant");
+        success = sample_native_thread(current);
+      }
+      if (success) {
+        num_samples++;
       }
-      *last_thread = current;  // remember the thread we last attempted to sample
     }
-    sample_time.stop();
-    log_trace(jfr)("JFR thread sampling done in %3.7f secs with %d java %d native samples",
-                   sample_time.seconds(), sample_task.java_entries(), sample_task.native_entries());
+    *last_thread = current; // remember the thread we last attempted to sample
   }
-  if (num_samples > 0) {
-    sample_task.commit_events(type);
+  sample_time.stop();
+  log_trace(jfr)("JFR thread sampling done in %3.7f secs with %d java %d native samples",
+    sample_time.seconds(), type == JAVA_SAMPLE ? num_samples : 0, type == NATIVE_SAMPLE ? num_samples : 0);
+}
+
+// Platform-specific thread suspension and CPU context retrieval.
+class OSThreadSampler : public SuspendedThreadTask {
+ private:
+  JfrSampleResult _result;
+ public:
+  OSThreadSampler(JavaThread* jt) : SuspendedThreadTask(jt),
+                                    _result(THREAD_SUSPENSION_ERROR) {}
+  void request_sample() { run(); }
+  JfrSampleResult result() const { return _result; }
+
+  void do_task(const SuspendedThreadTaskContext& context) {
+    JavaThread* const jt = JavaThread::cast(context.thread());
+    assert(jt != nullptr, "invariant");
+    if (jt->thread_state() == _thread_in_Java) {
+      JfrThreadLocal* const tl = jt->jfr_thread_local();
+      if (tl->sample_state() == NO_SAMPLE) {
+        _result = JfrSampleRequestBuilder::build_java_sample_request(context.ucontext(), tl, jt);
+      }
+    }
+  }
+};
+
+// Sampling a thread in state _thread_in_Java
+// involves a platform-specific thread suspend and CPU context retrieval.
+bool JfrSamplerThread::sample_java_thread(JavaThread* jt) {
+  if (jt->thread_state() != _thread_in_Java) {
+    return false;
+  }
+
+  OSThreadSampler sampler(jt);
+  sampler.request_sample();
+
+  if (sampler.result() != SAMPLE_JAVA) {
+    // Wrong thread state or suspension error.
+    return false;
+  }
+
+  // If we get to do it before the sampled thread, we install
+  // the new Jfr Sample Request into the thread-local queue
+  // associated with the sampled thread. This makes the just
+  // sampled thread eligible for yet another sample.
+  JfrThreadLocal* const tl = jt->jfr_thread_local();
+  JfrMutexTryLock lock(tl->sample_monitor());
+  if (lock.acquired() && tl->sample_state() == JAVA_SAMPLE) {
+    tl->enqueue_request();
+    assert(tl->sample_state() == NO_SAMPLE, "invariant");
+  }
+  return true;
+}
+
+static JfrSamplerThread* _sampler_thread = nullptr;
+
+// We can sample a JavaThread running in state _thread_in_native
+// without thread suspension and CPU context retrieval,
+// if we carefully order the loads of the thread state.
+bool JfrSamplerThread::sample_native_thread(JavaThread* jt) {
+  if (jt->thread_state() != _thread_in_native) {
+    return false;
+  }
+
+  JfrThreadLocal* const tl = jt->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+
+  if (tl->sample_state() != NO_SAMPLE) {
+    return false;
+  }
+
+  tl->set_sample_state(NATIVE_SAMPLE);
+
+  SafepointMechanism::arm_local_poll_release(jt);
+
+  // Barriers needed to keep the next read of thread state from floating up.
+  if (UseSystemMemoryBarrier) {
+    SystemMemoryBarrier::emit();
+  } else {
+    OrderAccess::storeload();
+  }
+
+  if (jt->thread_state() != _thread_in_native || !jt->has_last_Java_frame()) {
+    MonitorLocker lock(tl->sample_monitor(), Monitor::_no_safepoint_check_flag);
+    tl->set_sample_state(NO_SAMPLE);
+    lock.notify_all();
+    return false;
   }
+
+  return JfrThreadSampling::process_native_sample_request(tl, jt, _sampler_thread);
+}
+
+void JfrSamplerThread::set_java_period(int64_t period_millis) {
+  assert(period_millis >= 0, "invariant");
+  Atomic::store(&_java_period_millis, period_millis);
+}
+
+void JfrSamplerThread::set_native_period(int64_t period_millis) {
+  assert(period_millis >= 0, "invariant");
+  Atomic::store(&_native_period_millis, period_millis);
 }
 
-static JfrThreadSampling* _instance = nullptr;
+// JfrThreadSampler;
+static JfrThreadSampler* _instance = nullptr;
 
-JfrThreadSampling& JfrThreadSampling::instance() {
+JfrThreadSampler& JfrThreadSampler::instance() {
   return *_instance;
 }
 
-JfrThreadSampling* JfrThreadSampling::create() {
+JfrThreadSampler::JfrThreadSampler() {}
+
+JfrThreadSampler::~JfrThreadSampler() {
+  if (_sampler_thread != nullptr) {
+    _sampler_thread->disenroll();
+  }
+}
+
+JfrThreadSampler* JfrThreadSampler::create() {
   assert(_instance == nullptr, "invariant");
-  _instance = new JfrThreadSampling();
+  _instance = new JfrThreadSampler();
   return _instance;
 }
 
-void JfrThreadSampling::destroy() {
+void JfrThreadSampler::destroy() {
   if (_instance != nullptr) {
     delete _instance;
     _instance = nullptr;
   }
 }
 
-JfrThreadSampling::JfrThreadSampling() : _sampler(nullptr) {}
-
-JfrThreadSampling::~JfrThreadSampling() {
-  if (_sampler != nullptr) {
-    _sampler->disenroll();
-  }
-}
-
 #ifdef ASSERT
-static void assert_periods(const JfrThreadSampler* sampler, int64_t java_period_millis, int64_t native_period_millis) {
-  assert(sampler != nullptr, "invariant");
-  assert(sampler->get_java_period() == java_period_millis, "invariant");
-  assert(sampler->get_native_period() == native_period_millis, "invariant");
+static void assert_periods(const JfrSamplerThread* sampler_thread, int64_t java_period_millis, int64_t native_period_millis) {
+  assert(sampler_thread != nullptr, "invariant");
+  assert(sampler_thread->java_period() == java_period_millis, "invariant");
+  assert(sampler_thread->native_period() == native_period_millis, "invariant");
 }
 #endif
 
@@ -678,66 +403,62 @@ static void log(int64_t java_period_millis, int64_t native_period_millis) {
   log_trace(jfr)("Updated thread sampler for java: " INT64_FORMAT "  ms, native " INT64_FORMAT " ms", java_period_millis, native_period_millis);
 }
 
-void JfrThreadSampling::create_sampler(int64_t java_period_millis, int64_t native_period_millis) {
-  assert(_sampler == nullptr, "invariant");
+void JfrThreadSampler::create_sampler(int64_t java_period_millis, int64_t native_period_millis) {
+  assert(_sampler_thread == nullptr, "invariant");
   log_trace(jfr)("Creating thread sampler for java:" INT64_FORMAT " ms, native " INT64_FORMAT " ms", java_period_millis, native_period_millis);
-  _sampler = new JfrThreadSampler(java_period_millis, native_period_millis, JfrOptionSet::stackdepth());
-  _sampler->start_thread();
-  _sampler->enroll();
+  _sampler_thread = new JfrSamplerThread(java_period_millis, native_period_millis, JfrOptionSet::stackdepth());
+  _sampler_thread->start_thread();
+  _sampler_thread->enroll();
 }
 
-void JfrThreadSampling::update_run_state(int64_t java_period_millis, int64_t native_period_millis) {
+void JfrThreadSampler::update_run_state(int64_t java_period_millis, int64_t native_period_millis) {
   if (java_period_millis > 0 || native_period_millis > 0) {
-    if (_sampler == nullptr) {
+    if (_sampler_thread == nullptr) {
       create_sampler(java_period_millis, native_period_millis);
     } else {
-      _sampler->enroll();
+      _sampler_thread->enroll();
     }
-    DEBUG_ONLY(assert_periods(_sampler, java_period_millis, native_period_millis);)
+    DEBUG_ONLY(assert_periods(_sampler_thread, java_period_millis, native_period_millis);)
     log(java_period_millis, native_period_millis);
     return;
   }
-  if (_sampler != nullptr) {
-    DEBUG_ONLY(assert_periods(_sampler, java_period_millis, native_period_millis);)
-    _sampler->disenroll();
+  if (_sampler_thread != nullptr) {
+    DEBUG_ONLY(assert_periods(_sampler_thread, java_period_millis, native_period_millis);)
+    _sampler_thread->disenroll();
   }
 }
 
-void JfrThreadSampling::set_sampling_period(bool is_java_period, int64_t period_millis) {
+void JfrThreadSampler::set_period(bool is_java_period, int64_t period_millis) {
   int64_t java_period_millis = 0;
   int64_t native_period_millis = 0;
   if (is_java_period) {
     java_period_millis = period_millis;
-    if (_sampler != nullptr) {
-      _sampler->set_java_period(java_period_millis);
-      native_period_millis = _sampler->get_native_period();
+    if (_sampler_thread != nullptr) {
+      _sampler_thread->set_java_period(java_period_millis);
+      native_period_millis = _sampler_thread->native_period();
     }
   } else {
     native_period_millis = period_millis;
-    if (_sampler != nullptr) {
-      _sampler->set_native_period(native_period_millis);
-      java_period_millis = _sampler->get_java_period();
+    if (_sampler_thread != nullptr) {
+      _sampler_thread->set_native_period(native_period_millis);
+      java_period_millis = _sampler_thread->java_period();
     }
   }
   update_run_state(java_period_millis, native_period_millis);
 }
 
-void JfrThreadSampling::set_java_sample_period(int64_t period_millis) {
+void JfrThreadSampler::set_java_sample_period(int64_t period_millis) {
   assert(period_millis >= 0, "invariant");
   if (_instance == nullptr && 0 == period_millis) {
     return;
   }
-  instance().set_sampling_period(true, period_millis);
+  instance().set_period(true, period_millis);
 }
 
-void JfrThreadSampling::set_native_sample_period(int64_t period_millis) {
+void JfrThreadSampler::set_native_sample_period(int64_t period_millis) {
   assert(period_millis >= 0, "invariant");
   if (_instance == nullptr && 0 == period_millis) {
     return;
   }
-  instance().set_sampling_period(false, period_millis);
-}
-
-void JfrThreadSampling::on_javathread_suspend(JavaThread* thread) {
-  JfrThreadSampler::on_javathread_suspend(thread);
+  instance().set_period(false, period_millis);
 }
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
index ed3f9ce8629..9cfa33ea7c6 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
@@ -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
@@ -27,28 +27,23 @@
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
-class JavaThread;
-class JfrThreadSampler;
-
-class JfrThreadSampling : public JfrCHeapObj {
+class JfrThreadSampler : public JfrCHeapObj {
   friend class JfrRecorder;
  private:
-  JfrThreadSampler* _sampler;
   void create_sampler(int64_t java_period_millis, int64_t native_period_millis);
   void update_run_state(int64_t java_period_millis, int64_t native_period_millis);
-  void set_sampling_period(bool is_java_period, int64_t period_millis);
+  void set_period(bool is_java_period, int64_t period_millis);
 
-  JfrThreadSampling();
-  ~JfrThreadSampling();
+  JfrThreadSampler();
+  ~JfrThreadSampler();
 
-  static JfrThreadSampling& instance();
-  static JfrThreadSampling* create();
+  static JfrThreadSampler& instance();
+  static JfrThreadSampler* create();
   static void destroy();
 
  public:
   static void set_java_sample_period(int64_t period_millis);
   static void set_native_sample_period(int64_t period_millis);
-  static void on_javathread_suspend(JavaThread* thread);
 };
 
 #endif // SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
new file mode 100644
index 00000000000..9bae25bcb3c
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -0,0 +1,397 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 "classfile/javaThreadStatus.hpp"
+#include "code/codeCache.inline.hpp"
+#include "code/debugInfoRec.hpp"
+#include "code/nmethod.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
+#include "jfr/recorder/stacktrace/jfrStackTrace.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/method.hpp"
+#include "runtime/continuation.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/javaThread.inline.hpp"
+#include "runtime/stackFrameStream.inline.hpp"
+
+template <typename EventType>
+static inline void send_sample_event(const JfrTicks& start_time, const JfrTicks& end_time, traceid sid, traceid tid) {
+  EventType event(UNTIMED);
+  event.set_starttime(start_time);
+  event.set_endtime(end_time);
+  event.set_sampledThread(tid);
+  event.set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));
+  event.set_stackTrace(sid);
+  event.commit();
+}
+
+static inline void send_safepoint_latency_event(const JfrSampleRequest& request, const JfrTicks& end_time, traceid sid, const JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  assert(!jt->jfr_thread_local()->has_cached_stack_trace(), "invariant");
+  EventSafepointLatency event(UNTIMED);
+  event.set_starttime(request._sample_ticks);
+  event.set_endtime(end_time);
+  if (event.should_commit()) {
+    event.set_threadState(_thread_in_Java);
+    jt->jfr_thread_local()->set_cached_stack_trace_id(sid);
+    event.commit();
+    jt->jfr_thread_local()->clear_cached_stack_trace();
+  }
+}
+
+static inline bool is_interpreter(address pc) {
+  return Interpreter::contains(pc);
+}
+
+static inline bool is_interpreter(const JfrSampleRequest& request) {
+  return request._sample_bcp != nullptr;
+}
+
+static inline bool is_in_continuation(const frame& frame, JavaThread* jt) {
+  return JfrThreadLocal::is_vthread(jt) &&
+         (Continuation::is_frame_in_continuation(jt, frame) || Continuation::is_continuation_enterSpecial(frame));
+}
+
+// A sampled interpreter frame is handled differently from a sampled compiler frame.
+//
+// The JfrSampleRequest description partially describes a _potential_ interpreter Java frame.
+// It's partial because the sampler thread only sets the fp and bcp fields.
+//
+// We want to ensure that what we discovered inside interpreter code _really_ is what we assume, a valid interpreter frame.
+//
+// Therefore, instead of letting the sampler thread read what it believes to be a Method*, we delay until we are at a safepoint to ensure the Method* is valid.
+//
+// If the JfrSampleRequest represents a valid interpreter frame, the Method* is retrieved and the sender frame is returned per the sender_frame.
+//
+// If it is not a valid interpreter frame, then the JfrSampleRequest is invalidated, and the current frame is returned per the sender frame.
+//
+static bool compute_sender_frame(JfrSampleRequest& request, frame& sender_frame, bool& in_continuation, JavaThread* jt) {
+  assert(is_interpreter(request), "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(jt->has_last_Java_frame(), "invariant");
+
+  // For a request representing an interpreter frame, request._sample_sp is actually the frame pointer, fp.
+  const void* const sampled_fp = request._sample_sp;
+
+  StackFrameStream stream(jt, false, false);
+
+  // Search for the sampled interpreter frame and get its Method*.
+
+  while (!stream.is_done()) {
+    const frame* const frame = stream.current();
+    assert(frame != nullptr, "invariant");
+    const intptr_t* const real_fp = frame->real_fp();
+    assert(real_fp != nullptr, "invariant");
+    if (real_fp == sampled_fp && frame->is_interpreted_frame()) {
+      Method* const method = frame->interpreter_frame_method();
+      assert(method != nullptr, "invariant");
+      request._sample_pc = method;
+      // Got the Method*. Validate bcp.
+      if (!method->is_native() &&  !method->contains(static_cast<address>(request._sample_bcp))) {
+        request._sample_bcp = frame->interpreter_frame_bcp();
+      }
+      in_continuation = is_in_continuation(*frame, jt);
+      break;
+    }
+    if (real_fp >= sampled_fp) {
+      // What we sampled is not an official interpreter frame.
+      // Invalidate the sample request and use current.
+      request._sample_bcp = nullptr;
+      sender_frame = *stream.current();
+      in_continuation = is_in_continuation(sender_frame, jt);
+      return true;
+    }
+    stream.next();
+  }
+
+  assert(!stream.is_done(), "invariant");
+
+  // Step to sender.
+  stream.next();
+
+  // If the top frame is in a continuation, check that the sender frame is too.
+  if (in_continuation && !is_in_continuation(*stream.current(), jt)) {
+    // Leave sender frame empty.
+    return true;
+  }
+
+  sender_frame = *stream.current();
+
+  assert(request._sample_pc != nullptr, "invariant");
+  assert(request._sample_bcp != nullptr, "invariant");
+  assert(Method::is_valid_method(static_cast<const Method*>(request._sample_pc)), "invariant");
+  assert(static_cast<const Method*>(request._sample_pc)->is_native() ||
+         static_cast<const Method*>(request._sample_pc)->contains(static_cast<address>(request._sample_bcp)), "invariant");
+  return true;
+}
+
+static inline const PcDesc* get_pc_desc(nmethod* nm, void* pc) {
+  assert(nm != nullptr, "invariant");
+  assert(pc != nullptr, "invariant");
+  return nm->pc_desc_near(static_cast<address>(pc));
+}
+
+static inline bool is_valid(const PcDesc* pc_desc) {
+  return pc_desc != nullptr && pc_desc->scope_decode_offset() != DebugInformationRecorder::serialized_null;
+}
+
+static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+
+  if (!jt->has_last_Java_frame()) {
+    return false;
+  }
+
+  if (is_interpreter(request)) {
+    return compute_sender_frame(const_cast<JfrSampleRequest&>(request), top_frame, in_continuation, jt);
+  }
+
+  void* const sampled_pc = request._sample_pc;
+  CodeBlob* sampled_cb;
+  if (sampled_pc == nullptr || (sampled_cb = CodeCache::find_blob(sampled_pc)) == nullptr) {
+    // A biased sample is requested or no code blob.
+    top_frame = jt->last_frame();
+    in_continuation = is_in_continuation(top_frame, jt);
+    return true;
+  }
+
+  // We will never describe a sample request that represents an unparsable stub or blob.
+  assert(sampled_cb->frame_complete_offset() != CodeOffsets::frame_never_safe, "invariant");
+
+  const void* const sampled_sp = request._sample_sp;
+  assert(sampled_sp != nullptr, "invariant");
+
+  nmethod* const sampled_nm = sampled_cb->as_nmethod_or_null();
+
+  StackFrameStream stream(jt, false /* update registers */, false /* process frames */);
+
+  if (stream.current()->is_safepoint_blob_frame()) {
+    if (sampled_nm != nullptr) {
+      // Move to the physical sender frame of the SafepointBlob stub frame using the frame size, not the logical iterator.
+      const int safepoint_blob_stub_frame_size = stream.current()->cb()->frame_size();
+      intptr_t* const sender_sp = stream.current()->unextended_sp() + safepoint_blob_stub_frame_size;
+      if (sender_sp > sampled_sp) {
+        const address saved_exception_pc = jt->saved_exception_pc();
+        assert(saved_exception_pc != nullptr, "invariant");
+        const nmethod* const exception_nm = CodeCache::find_blob(saved_exception_pc)->as_nmethod();
+        assert(exception_nm != nullptr, "invariant");
+        if (exception_nm == sampled_nm && sampled_nm->is_at_poll_return(saved_exception_pc)) {
+          // We sit at the poll return site in the sampled compiled nmethod with only the return address on the stack.
+          // The sampled_nm compiled frame is no longer extant, but we might be able to reconstruct a synthetic
+          // compiled frame at this location. We do this by overlaying a reconstructed frame on top of
+          // the huge SafepointBlob stub frame. Of course, the synthetic frame only contains random stack memory,
+          // but it is safe because stack walking cares only about the form of the frame (i.e., an sp and a pc).
+          // We also do not have to worry about stackbanging because we currently have a huge SafepointBlob stub frame
+          // on the stack. For extra assurance, we know that we can create this frame size at this
+          // very location because we just popped such a frame before we hit the return poll site.
+          //
+          // Let's attempt to correct for the safepoint bias.
+          const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
+          if (is_valid(pc_desc)) {
+            intptr_t* const synthetic_sp = sender_sp - sampled_nm->frame_size();
+            top_frame = frame(synthetic_sp, synthetic_sp, sender_sp, pc_desc->real_pc(sampled_nm), sampled_nm);
+            in_continuation = is_in_continuation(top_frame, jt);
+            return true;
+          }
+        }
+      }
+    }
+    stream.next(); // skip the SafepointBlob stub frame
+  }
+
+  assert(!stream.current()->is_safepoint_blob_frame(), "invariant");
+
+  // Search the first frame that is above the sampled sp.
+  for (; !stream.is_done(); stream.next()) {
+    frame* const current = stream.current();
+
+    if (current->real_fp() <= sampled_sp) {
+      // Continue searching for a matching frame.
+      continue;
+    }
+
+    if (sampled_nm == nullptr) {
+      // The sample didn't have an nmethod; we decide to trace from its sender.
+      // Another instance of safepoint bias.
+      top_frame = *current;
+      break;
+    }
+
+    // Check for a matching compiled method.
+    if (current->cb()->as_nmethod_or_null() == sampled_nm) {
+      if (current->pc() != sampled_pc) {
+        // Let's adjust for the safepoint bias if we can.
+        const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
+        if (is_valid(pc_desc)) {
+          current->adjust_pc(pc_desc->real_pc(sampled_nm));
+        }
+      }
+    }
+    // Either a hit or a mismatched sample in which case we trace from the sender.
+    // Yet another instance of safepoint bias,to be addressed with
+    // more exact and stricter versions when parsable blobs become available.
+    top_frame = *current;
+    break;
+  }
+
+  in_continuation = is_in_continuation(top_frame, jt);
+  return true;
+}
+
+static void record_thread_in_java(const JfrSampleRequest& request, const JfrTicks& now, const JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(jt != nullptr, "invariant");
+  assert(tl != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+
+  frame top_frame;
+  bool in_continuation;
+  if (!compute_top_frame(request, top_frame, in_continuation, jt)) {
+    return;
+  }
+
+  traceid sid;
+  {
+    ResourceMark rm(current);
+    JfrStackTrace stacktrace;
+    if (!stacktrace.record(jt, top_frame, in_continuation, request)) {
+      // Unable to record stacktrace. Fail.
+      return;
+    }
+    sid = JfrStackTraceRepository::add(stacktrace);
+  }
+  assert(sid != 0, "invariant");
+  const traceid tid = in_continuation ? tl->vthread_id_with_epoch_update(jt) : JfrThreadLocal::jvm_thread_id(jt);
+  send_sample_event<EventExecutionSample>(request._sample_ticks, now, sid, tid);
+  if (current == jt) {
+    send_safepoint_latency_event(request, now, sid, jt);
+  }
+}
+
+static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+  assert(jt->jfr_thread_local() == tl, "invariant");
+  assert_lock_strong(tl->sample_monitor());
+  if (tl->has_enqueued_requests()) {
+    for (const JfrSampleRequest& request : *tl->sample_requests()) {
+      record_thread_in_java(request, now, tl, jt, current);
+    }
+    tl->clear_enqueued_requests();
+  }
+  assert(!tl->has_enqueued_requests(), "invariant");
+}
+
+class SampleMonitor : public StackObj {
+ private:
+  JfrThreadLocal* const _tl;
+  Monitor* const _sample_monitor;
+ public:
+  SampleMonitor(JfrThreadLocal* tl) : _tl(tl), _sample_monitor(tl->sample_monitor()) {
+    assert(tl != nullptr, "invariant");
+    assert(_sample_monitor != nullptr, "invariant");
+    _sample_monitor->lock_without_safepoint_check();
+  }
+  ~SampleMonitor() {
+    assert_lock_strong(_sample_monitor);
+    _tl->set_sample_state(NO_SAMPLE);
+    _sample_monitor->notify_all();
+    _sample_monitor->unlock();
+  }
+};
+
+// Only entered by the JfrSampler thread.
+bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread) {
+  assert(tl != nullptr, "invairant");
+  assert(jt != nullptr, "invariant");
+  assert(sampler_thread != nullptr, "invariant");
+  assert(sampler_thread->is_JfrSampler_thread(), "invariant");
+  assert(tl == jt->jfr_thread_local(), "invariant");
+  assert(jt != sampler_thread, "only asynchronous processing of native samples");
+  assert(jt->has_last_Java_frame(), "invariant");
+  assert(tl->sample_state() == NATIVE_SAMPLE, "invariant");
+
+  const JfrTicks start_time = JfrTicks::now();
+
+  traceid tid;
+  traceid sid;
+
+  {
+    SampleMonitor sm(tl);
+
+    // Because the thread was in native, it is in a walkable state, because
+    // it will hit a safepoint poll on the way back from native. To ensure timely
+    // progress, any requests in the queue can be safely processed now.
+    drain_enqueued_requests(start_time, tl, jt, sampler_thread);
+    // Process the current stacktrace using the ljf.
+    {
+      ResourceMark rm(sampler_thread);
+      JfrStackTrace stacktrace;
+      const frame top_frame = jt->last_frame();
+      if (!stacktrace.record_inner(jt, top_frame, is_in_continuation(top_frame, jt), 0 /* skip level */)) {
+        // Unable to record stacktrace. Fail.
+        return false;
+      }
+      sid = JfrStackTraceRepository::add(stacktrace);
+    }
+    // Read the tid under the monitor to ensure that if its a virtual thread,
+    // it is not unmounted until we are done with it.
+    tid = JfrThreadLocal::thread_id(jt);
+  }
+
+  assert(tl->sample_state() == NO_SAMPLE, "invariant");
+  send_sample_event<EventNativeMethodSample>(start_time, start_time, sid, tid);
+  return true;
+}
+
+// Entry point for a sampled thread that discovered pending Jfr Sample Requests as part of a safepoint poll.
+void JfrThreadSampling::process_sample_request(JavaThread* jt) {
+  assert(JavaThread::current() == jt, "should be current thread");
+  assert(jt->thread_state() == _thread_in_vm || jt->thread_state() == _thread_in_Java, "invariant");
+
+  const JfrTicks now = JfrTicks::now();
+
+  JfrThreadLocal* const tl = jt->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+
+  MonitorLocker ml(tl->sample_monitor(), Monitor::_no_safepoint_check_flag);
+
+  for (;;) {
+    const int sample_state = tl->sample_state();
+    if (sample_state == NATIVE_SAMPLE) {
+      // Wait until stack trace is processed.
+      ml.wait();
+    } else if (sample_state == JAVA_SAMPLE) {
+      tl->enqueue_request();
+    } else {
+      // State has been processed.
+      break;
+    }
+  }
+  drain_enqueued_requests(now, tl, jt, jt);
+}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
similarity index 65%
rename from src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
rename to src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
index 8a57160bd9e..d4c4bc0d873 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, 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
@@ -22,24 +22,21 @@
  *
  */
 
-#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
-#define SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLING_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLING_HPP
 
 #include "memory/allocation.hpp"
 
-class frame;
-class Method;
 class JavaThread;
+class JfrThreadLocal;
+class Thread;
 
-class JfrGetCallTrace : public StackObj {
+class JfrThreadSampling : AllStatic {
+  friend class JfrSamplerThread;
  private:
-  JavaThread* _thread;
-  bool _in_java;
-
+  static bool process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread);
  public:
-  JfrGetCallTrace(bool in_java, JavaThread* thread) : _thread(thread), _in_java(in_java) {}
-  bool find_top_frame(frame& topframe, Method** method, frame& first_frame);
-  bool get_topframe(void* ucontext, frame& top);
+  static void process_sample_request(JavaThread* jt);
 };
 
-#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLING_HPP
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index d6fea53fcc9..384305862ca 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -301,7 +301,7 @@ bool JfrRecorder::create_components() {
   if (!create_stringpool()) {
     return false;
   }
-  if (!create_thread_sampling()) {
+  if (!create_thread_sampler()) {
     return false;
   }
   if (!create_event_throttler()) {
@@ -317,7 +317,7 @@ static JfrRepository* _repository = nullptr;
 static JfrStackTraceRepository* _stack_trace_repository;
 static JfrStringPool* _stringpool = nullptr;
 static JfrOSInterface* _os_interface = nullptr;
-static JfrThreadSampling* _thread_sampling = nullptr;
+static JfrThreadSampler* _thread_sampler = nullptr;
 static JfrCheckpointManager* _checkpoint_manager = nullptr;
 
 bool JfrRecorder::create_java_event_writer() {
@@ -384,10 +384,10 @@ bool JfrRecorder::create_stringpool() {
   return _stringpool != nullptr && _stringpool->initialize();
 }
 
-bool JfrRecorder::create_thread_sampling() {
-  assert(_thread_sampling == nullptr, "invariant");
-  _thread_sampling = JfrThreadSampling::create();
-  return _thread_sampling != nullptr;
+bool JfrRecorder::create_thread_sampler() {
+  assert(_thread_sampler == nullptr, "invariant");
+  _thread_sampler = JfrThreadSampler::create();
+  return _thread_sampler != nullptr;
 }
 
 bool JfrRecorder::create_event_throttler() {
@@ -424,15 +424,15 @@ void JfrRecorder::destroy_components() {
     JfrOSInterface::destroy();
     _os_interface = nullptr;
   }
-  if (_thread_sampling != nullptr) {
-    JfrThreadSampling::destroy();
-    _thread_sampling = nullptr;
+  if (_thread_sampler != nullptr) {
+    JfrThreadSampler::destroy();
+    _thread_sampler = nullptr;
   }
   JfrEventThrottler::destroy();
 }
 
 bool JfrRecorder::create_recorder_thread() {
-  return JfrRecorderThread::start(_checkpoint_manager, _post_box, JavaThread::current());
+  return JfrRecorderThreadEntry::start(_checkpoint_manager, _post_box, JavaThread::current());
 }
 
 void JfrRecorder::destroy() {
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index d513b82b38c..b917904c5fb 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.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 JfrRecorder : public JfrCHeapObj {
   static bool create_stacktrace_repository();
   static bool create_storage();
   static bool create_stringpool();
-  static bool create_thread_sampling();
+  static bool create_thread_sampler();
   static bool create_event_throttler();
   static bool create_components();
   static void destroy_components();
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
index 6b8b5f0cc8c..0befaae7751 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
@@ -34,7 +34,8 @@ constexpr static const JfrSamplerParams _disabled_params = {
                                                              false // reconfigure
                                                            };
 
-static JfrEventThrottler* _throttler = nullptr;
+static JfrEventThrottler* _object_allocation_throttler = nullptr;
+static JfrEventThrottler* _safepoint_latency_throttler = nullptr;
 
 JfrEventThrottler::JfrEventThrottler(JfrEventId event_id) :
   JfrAdaptiveSampler(),
@@ -47,30 +48,49 @@ JfrEventThrottler::JfrEventThrottler(JfrEventId event_id) :
   _update(false) {}
 
 bool JfrEventThrottler::create() {
-  assert(_throttler == nullptr, "invariant");
-  _throttler = new JfrEventThrottler(JfrObjectAllocationSampleEvent);
-  return _throttler != nullptr && _throttler->initialize();
+  assert(_object_allocation_throttler == nullptr, "invariant");
+  _object_allocation_throttler = new JfrEventThrottler(JfrObjectAllocationSampleEvent);
+  if (_object_allocation_throttler == nullptr || !_object_allocation_throttler->initialize()) {
+    return false;
+  }
+  assert(_safepoint_latency_throttler == nullptr, "invariant");
+  _safepoint_latency_throttler = new JfrEventThrottler(JfrSafepointLatencyEvent);
+  return _safepoint_latency_throttler != nullptr && _safepoint_latency_throttler->initialize();
 }
 
 void JfrEventThrottler::destroy() {
-  delete _throttler;
-  _throttler = nullptr;
+  delete _object_allocation_throttler;
+  _object_allocation_throttler = nullptr;
+  delete _safepoint_latency_throttler;
+  _safepoint_latency_throttler = nullptr;
 }
 
-// There is currently only one throttler instance, for the jdk.ObjectAllocationSample event.
-// When introducing additional throttlers, also add a lookup map keyed by event id.
+// There is currently only two throttler instances, one for the jdk.ObjectAllocationSample event
+// and another for the SamplingLatency event.
+// When introducing many more throttlers, consider adding a lookup map keyed by event id.
 JfrEventThrottler* JfrEventThrottler::for_event(JfrEventId event_id) {
-  assert(_throttler != nullptr, "JfrEventThrottler has not been properly initialized");
-  assert(event_id == JfrObjectAllocationSampleEvent, "Event type has an unconfigured throttler");
-  return event_id == JfrObjectAllocationSampleEvent ? _throttler : nullptr;
+  assert(_object_allocation_throttler != nullptr, "ObjectAllocation throttler has not been properly initialized");
+  assert(_safepoint_latency_throttler != nullptr, "SafepointLatency throttler has not been properly initialized");
+  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent, "Event type has an unconfigured throttler");
+  if (event_id == JfrObjectAllocationSampleEvent) {
+    return _object_allocation_throttler;
+  }
+  if (event_id == JfrSafepointLatencyEvent) {
+    return _safepoint_latency_throttler;
+  }
+  return nullptr;
 }
 
 void JfrEventThrottler::configure(JfrEventId event_id, int64_t sample_size, int64_t period_ms) {
-  if (event_id != JfrObjectAllocationSampleEvent) {
+  if (event_id == JfrObjectAllocationSampleEvent) {
+    assert(_object_allocation_throttler != nullptr, "ObjectAllocation throttler has not been properly initialized");
+    _object_allocation_throttler->configure(sample_size, period_ms);
     return;
   }
-  assert(_throttler != nullptr, "JfrEventThrottler has not been properly initialized");
-  _throttler->configure(sample_size, period_ms);
+  if (event_id == JfrSafepointLatencyEvent) {
+    assert(_safepoint_latency_throttler != nullptr, "SafepointLatency throttler has not been properly initialized");
+    _safepoint_latency_throttler->configure(sample_size, period_ms);
+  }
 }
 
 /*
@@ -92,8 +112,8 @@ void JfrEventThrottler::configure(int64_t sample_size, int64_t period_ms) {
 // Predicate for event selection.
 bool JfrEventThrottler::accept(JfrEventId event_id, int64_t timestamp /* 0 */) {
   JfrEventThrottler* const throttler = for_event(event_id);
-  if (throttler == nullptr) return true;
-  return _throttler->_disabled ? true : _throttler->sample(timestamp);
+  assert(throttler != nullptr, "invariant");
+  return throttler->_disabled ? true : throttler->sample(timestamp);
 }
 
 /*
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp
index de0a77a0c82..71b7014e6ec 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.cpp
@@ -36,11 +36,19 @@
 #include "utilities/preserveException.hpp"
 #include "utilities/macros.hpp"
 
+class JfrRecorderThread : public JavaThread {
+ public:
+  JfrRecorderThread(ThreadFunction entry_point) : JavaThread(entry_point) {}
+  virtual ~JfrRecorderThread() {}
+
+  virtual bool is_JfrRecorder_thread() const { return true; }
+};
+
 static Thread* start_thread(instanceHandle thread_oop, ThreadFunction proc, TRAPS) {
   assert(thread_oop.not_null(), "invariant");
   assert(proc != nullptr, "invariant");
 
-  JavaThread* new_thread = new JavaThread(proc);
+  JfrRecorderThread* new_thread = new JfrRecorderThread(proc);
 
   // At this point it may be possible that no
   // osthread was created for the JavaThread due to lack of resources.
@@ -54,16 +62,16 @@ static Thread* start_thread(instanceHandle thread_oop, ThreadFunction proc, TRAP
   }
 }
 
-JfrPostBox* JfrRecorderThread::_post_box = nullptr;
+JfrPostBox* JfrRecorderThreadEntry::_post_box = nullptr;
 
-JfrPostBox& JfrRecorderThread::post_box() {
+JfrPostBox& JfrRecorderThreadEntry::post_box() {
   return *_post_box;
 }
 
 // defined in JfrRecorderThreadLoop.cpp
 void recorderthread_entry(JavaThread*, JavaThread*);
 
-bool JfrRecorderThread::start(JfrCheckpointManager* cp_manager, JfrPostBox* post_box, TRAPS) {
+bool JfrRecorderThreadEntry::start(JfrCheckpointManager* cp_manager, JfrPostBox* post_box, TRAPS) {
   assert(cp_manager != nullptr, "invariant");
   assert(post_box != nullptr, "invariant");
   _post_box = post_box;
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
index ca8d3e87841..df8b1f55a4e 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
@@ -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
@@ -33,7 +33,7 @@ class JfrCheckpointManager;
 class JfrPostBox;
 class Thread;
 
-class JfrRecorderThread : AllStatic {
+class JfrRecorderThreadEntry : AllStatic {
  private:
   static JfrPostBox* _post_box;
 
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
index d549ea55dee..8aeb745b35e 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
@@ -46,7 +46,7 @@ void recorderthread_entry(JavaThread* thread, JavaThread* unused) {
   #define FLUSHPOINT (msgs & (MSGBIT(MSG_FLUSHPOINT)))
   #define PROCESS_FULL_BUFFERS (msgs & (MSGBIT(MSG_ROTATE)|MSGBIT(MSG_STOP)|MSGBIT(MSG_FULLBUFFER)))
 
-  JfrPostBox& post_box = JfrRecorderThread::post_box();
+  JfrPostBox& post_box = JfrRecorderThreadEntry::post_box();
   log_debug(jfr, system)("Recorder thread STARTED");
 
   {
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.cpp
index de20cd36375..0721604b1c1 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFilterRegistry.cpp
@@ -77,9 +77,7 @@ int64_t JfrStackFilterRegistry::add(const JfrStackFilter* filter) {
 }
 
 const JfrStackFilter* JfrStackFilterRegistry::lookup(int64_t id) {
-  if (id < 0) {
-    return nullptr;
-  }
+  assert(id >= 0, "invariant");
   assert(range_check(id), "invariant");
   return _elements[id];
 }
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.cpp
new file mode 100644
index 00000000000..15e468583f0
--- /dev/null
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.cpp
@@ -0,0 +1,66 @@
+/*
+ * 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 "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
+#include "jfr/recorder/repository/jfrChunkWriter.hpp"
+#include "jfr/recorder/stacktrace/jfrStackFrame.hpp"
+#include "jfr/support/jfrMethodLookup.hpp"
+#include "oops/method.inline.hpp"
+
+JfrStackFrame::JfrStackFrame() : _klass(nullptr), _methodid(0), _line(0), _bci(0), _type(0) {}
+
+JfrStackFrame::JfrStackFrame(const traceid& id, int bci, u1 type, const InstanceKlass* ik) :
+  _klass(ik), _methodid(id), _line(0), _bci(bci), _type(type) {}
+
+JfrStackFrame::JfrStackFrame(const traceid& id, int bci, u1 type, int lineno, const InstanceKlass* ik) :
+  _klass(ik), _methodid(id), _line(lineno), _bci(bci), _type(type) {}
+
+template <typename Writer>
+static void write_frame(Writer& w, traceid methodid, int line, int bci, u1 type) {
+  w.write(methodid);
+  w.write(static_cast<u4>(line));
+  w.write(static_cast<u4>(bci));
+  w.write(static_cast<u8>(type));
+}
+
+void JfrStackFrame::write(JfrChunkWriter& cw) const {
+  write_frame(cw, _methodid, _line, _bci, _type);
+}
+
+void JfrStackFrame::write(JfrCheckpointWriter& cpw) const {
+  write_frame(cpw, _methodid, _line, _bci, _type);
+}
+
+bool JfrStackFrame::equals(const JfrStackFrame& rhs) const {
+  return _methodid == rhs._methodid && _bci == rhs._bci && _type == rhs._type;
+}
+
+void JfrStackFrame::resolve_lineno() const {
+  assert(_klass, "no klass pointer");
+  assert(_line == 0, "already have linenumber");
+  const Method* const method = JfrMethodLookup::lookup(_klass, _methodid);
+  assert(method != nullptr, "invariant");
+  assert(method->method_holder() == _klass, "invariant");
+  _line = method->line_number_from_bci(_bci);
+}
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.hpp
new file mode 100644
index 00000000000..8be321e3e1c
--- /dev/null
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackFrame.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKFRAME_HPP
+#define SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKFRAME_HPP
+
+#include "jfr/utilities/jfrTypes.hpp"
+
+class JfrCheckpointWriter;
+class JfrChunkWriter;
+class InstanceKlass;
+
+class JfrStackFrame {
+  friend class ObjectSampleCheckpoint;
+ private:
+  const InstanceKlass* _klass;
+  traceid _methodid;
+  mutable int _line;
+  int _bci;
+  u1 _type;
+
+ public:
+  JfrStackFrame();
+  JfrStackFrame(const traceid& id, int bci, u1 type, const InstanceKlass* klass);
+  JfrStackFrame(const traceid& id, int bci, u1 type, int lineno, const InstanceKlass* klass);
+
+  bool equals(const JfrStackFrame& rhs) const;
+  void write(JfrChunkWriter& cw) const;
+  void write(JfrCheckpointWriter& cpw) const;
+  void resolve_lineno() const;
+
+  enum : u1 {
+    FRAME_INTERPRETER = 0,
+    FRAME_JIT,
+    FRAME_INLINE,
+    FRAME_NATIVE,
+    NUM_FRAME_TYPES
+  };
+};
+
+template <typename>
+class GrowableArray;
+
+typedef GrowableArray<JfrStackFrame> JfrStackFrames;
+
+#endif // SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKFRAME_HPP
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
index f7e62858d22..95f2f8ef7bf 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
@@ -26,40 +26,37 @@
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
 #include "jfr/recorder/repository/jfrChunkWriter.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTrace.hpp"
+#include "jfr/recorder/stacktrace/jfrVframeStream.inline.hpp"
 #include "jfr/recorder/storage/jfrBuffer.hpp"
-#include "jfr/support/jfrMethodLookup.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfrStackFilter.hpp"
 #include "jfrStackFilterRegistry.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTag.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/vframe.inline.hpp"
+#include "utilities/growableArray.hpp"
 
-static void copy_frames(JfrStackFrame** lhs_frames, u4 length, const JfrStackFrame* rhs_frames) {
+static inline void copy_frames(JfrStackFrames* lhs_frames, const JfrStackFrames* rhs_frames) {
   assert(lhs_frames != nullptr, "invariant");
   assert(rhs_frames != nullptr, "invariant");
-  if (length > 0) {
-    *lhs_frames = NEW_C_HEAP_ARRAY(JfrStackFrame, length, mtTracing);
-    memcpy(*lhs_frames, rhs_frames, length * sizeof(JfrStackFrame));
-  }
+  assert(rhs_frames->length() > 0, "invariant");
+  assert(lhs_frames->capacity() == rhs_frames->length(), "invariant");
+  assert(lhs_frames->length() == rhs_frames->length(), "invariant");
+  assert(lhs_frames->capacity() == lhs_frames->length(), "invariant");
+  memcpy(lhs_frames->adr_at(0), rhs_frames->adr_at(0), rhs_frames->length() * sizeof(JfrStackFrame));
 }
 
-JfrStackFrame::JfrStackFrame(const traceid& id, int bci, u1 type, const InstanceKlass* ik) :
-  _klass(ik), _methodid(id), _line(0), _bci(bci), _type(type) {}
-
-JfrStackFrame::JfrStackFrame(const traceid& id, int bci, u1 type, int lineno, const InstanceKlass* ik) :
-  _klass(ik), _methodid(id), _line(lineno), _bci(bci), _type(type) {}
-
-JfrStackTrace::JfrStackTrace(JfrStackFrame* frames, u4 max_frames) :
+JfrStackTrace::JfrStackTrace() :
   _next(nullptr),
-  _frames(frames),
+  _frames(new JfrStackFrames(JfrOptionSet::stackdepth())), // ResourceArea
   _id(0),
   _hash(0),
-  _nr_of_frames(0),
-  _max_frames(max_frames),
+  _count(0),
+  _max_frames(JfrOptionSet::stackdepth()),
   _frames_ownership(false),
   _reached_root(false),
   _lineno(false),
@@ -67,237 +64,128 @@ JfrStackTrace::JfrStackTrace(JfrStackFrame* frames, u4 max_frames) :
 
 JfrStackTrace::JfrStackTrace(traceid id, const JfrStackTrace& trace, const JfrStackTrace* next) :
   _next(next),
-  _frames(nullptr),
+  _frames(new (mtTracing) JfrStackFrames(trace.number_of_frames(), trace.number_of_frames(), mtTracing)), // CHeap
   _id(id),
   _hash(trace._hash),
-  _nr_of_frames(trace._nr_of_frames),
+  _count(trace._count),
   _max_frames(trace._max_frames),
   _frames_ownership(true),
   _reached_root(trace._reached_root),
   _lineno(trace._lineno),
   _written(false) {
-  copy_frames(&_frames, trace._nr_of_frames, trace._frames);
+  copy_frames(_frames, trace._frames);
 }
 
 JfrStackTrace::~JfrStackTrace() {
   if (_frames_ownership) {
-    FREE_C_HEAP_ARRAY(JfrStackFrame, _frames);
+    delete _frames;
   }
 }
 
+int JfrStackTrace::number_of_frames() const {
+  assert(_frames != nullptr, "invariant");
+  return _frames->length();
+}
+
 template <typename Writer>
-static void write_stacktrace(Writer& w, traceid id, bool reached_root, u4 nr_of_frames, const JfrStackFrame* frames) {
-  w.write((u8)id);
-  w.write((u1)!reached_root);
-  w.write(nr_of_frames);
-  for (u4 i = 0; i < nr_of_frames; ++i) {
-    frames[i].write(w);
+static void write_stacktrace(Writer& w, traceid id, bool reached_root, const JfrStackFrames* frames) {
+  w.write(static_cast<u8>(id));
+  w.write(static_cast<u1>(!reached_root));
+  const int nr_of_frames = frames->length();
+  w.write(static_cast<u4>(nr_of_frames));
+  for (int i = 0; i < nr_of_frames; ++i) {
+    frames->at(i).write(w);
   }
 }
 
 void JfrStackTrace::write(JfrChunkWriter& sw) const {
   assert(!_written, "invariant");
-  write_stacktrace(sw, _id, _reached_root, _nr_of_frames, _frames);
+  write_stacktrace(sw, _id, _reached_root, _frames);
   _written = true;
 }
 
 void JfrStackTrace::write(JfrCheckpointWriter& cpw) const {
   assert(!_written, "invariant");
-  write_stacktrace(cpw, _id, _reached_root, _nr_of_frames, _frames);
+  write_stacktrace(cpw, _id, _reached_root, _frames);
   _written = true;
 }
 
-bool JfrStackFrame::equals(const JfrStackFrame& rhs) const {
-  return _methodid == rhs._methodid && _bci == rhs._bci && _type == rhs._type;
-}
-
 bool JfrStackTrace::equals(const JfrStackTrace& rhs) const {
-  if (_reached_root != rhs._reached_root || _nr_of_frames != rhs._nr_of_frames || _hash != rhs._hash) {
+  if (_reached_root != rhs._reached_root || _frames->length() != rhs.number_of_frames() || _hash != rhs._hash) {
     return false;
   }
-  for (u4 i = 0; i < _nr_of_frames; ++i) {
-    if (!_frames[i].equals(rhs._frames[i])) {
+  for (int i = 0; i < _frames->length(); ++i) {
+    if (!_frames->at(i).equals(rhs._frames->at(i))) {
       return false;
     }
   }
   return true;
 }
 
-template <typename Writer>
-static void write_frame(Writer& w, traceid methodid, int line, int bci, u1 type) {
-  w.write((u8)methodid);
-  w.write((u4)line);
-  w.write((u4)bci);
-  w.write((u8)type);
-}
-
-void JfrStackFrame::write(JfrChunkWriter& cw) const {
-  write_frame(cw, _methodid, _line, _bci, _type);
+static inline bool is_in_continuation(const frame& frame, JavaThread* jt) {
+  return JfrThreadLocal::is_vthread(jt) &&
+    (Continuation::is_frame_in_continuation(jt, frame) || Continuation::is_continuation_enterSpecial(frame));
 }
 
-void JfrStackFrame::write(JfrCheckpointWriter& cpw) const {
-  write_frame(cpw, _methodid, _line, _bci, _type);
+static inline bool is_interpreter(const JfrSampleRequest& request) {
+  return request._sample_bcp != nullptr;
 }
 
-class JfrVframeStream : public vframeStreamCommon {
- private:
-  bool _vthread;
-  const ContinuationEntry* _cont_entry;
-  bool _async_mode;
-  bool step_to_sender();
-  void next_frame();
- public:
-  JfrVframeStream(JavaThread* jt, const frame& fr, bool stop_at_java_call_stub, bool async_mode);
-  void next_vframe();
-};
-
-static RegisterMap::WalkContinuation walk_continuation(JavaThread* jt) {
-  // NOTE: WalkContinuation::skip, because of interactions with ZGC relocation
-  //       and load barriers. This code is run while generating stack traces for
-  //       the ZPage allocation event, even when ZGC is relocating  objects.
-  //       When ZGC is relocating, it is forbidden to run code that performs
-  //       load barriers. With WalkContinuation::include, we visit heap stack
-  //       chunks and could be using load barriers.
-  return (UseZGC && !StackWatermarkSet::processing_started(jt))
-      ? RegisterMap::WalkContinuation::skip
-      : RegisterMap::WalkContinuation::include;
-}
-
-JfrVframeStream::JfrVframeStream(JavaThread* jt, const frame& fr, bool stop_at_java_call_stub, bool async_mode) :
-  vframeStreamCommon(jt,
-                     RegisterMap::UpdateMap::skip,
-                     RegisterMap::ProcessFrames::skip,
-                     walk_continuation(jt)),
-    _vthread(JfrThreadLocal::is_vthread(jt)),
-    _cont_entry(_vthread ? jt->last_continuation() : nullptr),
-    _async_mode(async_mode) {
-  assert(!_vthread || _cont_entry != nullptr, "invariant");
-  _reg_map.set_async(async_mode);
-  _frame = fr;
-  _stop_at_java_call_stub = stop_at_java_call_stub;
-  while (!fill_from_frame()) {
-    step_to_sender();
+void JfrStackTrace::record_interpreter_top_frame(const JfrSampleRequest& request) {
+  assert(_hash == 0, "invariant");
+  assert(_count == 0, "invariant");
+  assert(_frames != nullptr, "invariant");
+  assert(_frames->length() == 0, "invariant");
+  _hash = 1;
+  const Method* method = reinterpret_cast<Method*>(request._sample_pc);
+  assert(method != nullptr, "invariant");
+  const traceid mid = JfrTraceId::load(method);
+  const int bci = method->is_native() ? 0 : method->bci_from(reinterpret_cast<address>(request._sample_bcp));
+  const u1 type = method->is_native() ? JfrStackFrame::FRAME_NATIVE : JfrStackFrame::FRAME_INTERPRETER;
+  _hash = (_hash * 31) + mid;
+  _hash = (_hash * 31) + bci;
+  _hash = (_hash * 31) + type;
+  _frames->append(JfrStackFrame(mid, bci, type, method->method_holder()));
+  _count++;
+}
+
+bool JfrStackTrace::record(JavaThread* jt, const frame& frame, bool in_continuation, const JfrSampleRequest& request) {
+  if (is_interpreter(request)) {
+    record_interpreter_top_frame(request);
+    if (frame.pc() == nullptr) {
+      // No sender frame. Done.
+      return true;
+    }
   }
+  return record(jt, frame, in_continuation, 0);
 }
 
-inline bool JfrVframeStream::step_to_sender() {
-  if (_async_mode && !_frame.safe_for_sender(_thread)) {
-    _mode = at_end_mode;
+bool JfrStackTrace::record(JavaThread* jt, int skip, int64_t stack_filter_id) {
+  assert(jt != nullptr, "invariant");
+  assert(jt == JavaThread::current(), "invariant");
+  if (!jt->has_last_Java_frame()) {
     return false;
   }
-  _frame = _frame.sender(&_reg_map);
-  return true;
-}
-
-inline void JfrVframeStream::next_frame() {
-  static constexpr const u4 loop_max = MAX_STACK_DEPTH * 2;
-  u4 loop_count = 0;
-  do {
-    if (_vthread && Continuation::is_continuation_enterSpecial(_frame)) {
-      if (_cont_entry->is_virtual_thread()) {
-        // An entry of a vthread continuation is a termination point.
-        _mode = at_end_mode;
-        break;
-      }
-      _cont_entry = _cont_entry->parent();
-    }
-    if (_async_mode) {
-      ++loop_count;
-      if (loop_count > loop_max) {
-        _mode = at_end_mode;
-        break;
-      }
-    }
-  } while (step_to_sender() && !fill_from_frame());
-}
-
-// Solaris SPARC Compiler1 needs an additional check on the grandparent
-// of the top_frame when the parent of the top_frame is interpreted and
-// the grandparent is compiled. However, in this method we do not know
-// the relationship of the current _frame relative to the top_frame so
-// we implement a more broad sanity check. When the previous callee is
-// interpreted and the current sender is compiled, we verify that the
-// current sender is also walkable. If it is not walkable, then we mark
-// the current vframeStream as at the end.
-void JfrVframeStream::next_vframe() {
-  // handle frames with inlining
-  if (_mode == compiled_mode && fill_in_compiled_inlined_sender()) {
-    return;
-  }
-  next_frame();
+  const frame last_frame = jt->last_frame();
+  return record(jt, last_frame, is_in_continuation(last_frame, jt), skip, stack_filter_id);
 }
 
-static const size_t min_valid_free_size_bytes = 16;
-
-static inline bool is_full(const JfrBuffer* enqueue_buffer) {
-  return enqueue_buffer->free_size() < min_valid_free_size_bytes;
+bool JfrStackTrace::record(JavaThread* jt, const frame& frame, bool in_continuation, int skip, int64_t stack_filter_id /* -1 */) {
+  // Must use ResetNoHandleMark here to bypass if any NoHandleMark exist on stack.
+  // This is because RegisterMap uses Handles to support continuations.
+  ResetNoHandleMark rnhm;
+  return record_inner(jt, frame, in_continuation, skip, stack_filter_id);
 }
 
-bool JfrStackTrace::record_async(JavaThread* jt, const frame& frame) {
+bool JfrStackTrace::record_inner(JavaThread* jt, const frame& frame, bool in_continuation, int skip, int64_t stack_filter_id /* -1 */) {
   assert(jt != nullptr, "invariant");
   assert(!_lineno, "invariant");
-  Thread* current_thread = Thread::current();
-  assert(current_thread->is_JfrSampler_thread(), "invariant");
-  assert(jt != current_thread, "invariant");
-  // Explicitly monitor the available space of the thread-local buffer used for enqueuing klasses as part of tagging methods.
-  // We do this because if space becomes sparse, we cannot rely on the implicit allocation of a new buffer as part of the
-  // regular tag mechanism. If the free list is empty, a malloc could result, and the problem with that is that the thread
-  // we have suspended could be the holder of the malloc lock. If there is no more available space, the attempt is aborted.
-  const JfrBuffer* const enqueue_buffer = JfrTraceIdLoadBarrier::get_sampler_enqueue_buffer(current_thread);
+  assert(_frames != nullptr, "invariant");
+  assert(_frames->length() == 0 || _frames->length() == 1, "invariant");
+  assert(!in_continuation || is_in_continuation(frame, jt), "invariant");
+  Thread* const current_thread = Thread::current();
   HandleMark hm(current_thread); // RegisterMap uses Handles to support continuations.
-  JfrVframeStream vfs(jt, frame, false, true);
-  u4 count = 0;
-  _reached_root = true;
-  _hash = 1;
-  while (!vfs.at_end()) {
-    if (count >= _max_frames) {
-      _reached_root = false;
-      break;
-    }
-    const Method* method = vfs.method();
-    if (!Method::is_valid_method(method) || is_full(enqueue_buffer)) {
-      // we throw away everything we've gathered in this sample since
-      // none of it is safe
-      return false;
-    }
-    const traceid mid = JfrTraceId::load(method);
-    u1 type = vfs.is_interpreted_frame() ? JfrStackFrame::FRAME_INTERPRETER : JfrStackFrame::FRAME_JIT;
-    int bci = 0;
-    if (method->is_native()) {
-      type = JfrStackFrame::FRAME_NATIVE;
-    } else {
-      bci = vfs.bci();
-    }
-
-    intptr_t* frame_id = vfs.frame_id();
-    vfs.next_vframe();
-    if (type == JfrStackFrame::FRAME_JIT && !vfs.at_end() && frame_id == vfs.frame_id()) {
-      // This frame and the caller frame are both the same physical
-      // frame, so this frame is inlined into the caller.
-      type = JfrStackFrame::FRAME_INLINE;
-    }
-    _hash = (_hash * 31) + mid;
-    _hash = (_hash * 31) + bci;
-    _hash = (_hash * 31) + type;
-    _frames[count] = JfrStackFrame(mid, bci, type, method->line_number_from_bci(bci), method->method_holder());
-    count++;
-  }
-  _lineno = true;
-  _nr_of_frames = count;
-  return count > 0;
-}
-
-bool JfrStackTrace::record(JavaThread* jt, const frame& frame, int skip, int64_t stack_filter_id) {
-  assert(jt != nullptr, "invariant");
-  assert(jt == Thread::current(), "invariant");
-  assert(jt->thread_state() != _thread_in_native, "invariant");
-  assert(!_lineno, "invariant");
-  // Must use ResetNoHandleMark here to bypass if any NoHandleMark exist on stack.
-  // This is because RegisterMap uses Handles to support continuations.
-  ResetNoHandleMark rnhm;
-  HandleMark hm(jt);
-  JfrVframeStream vfs(jt, frame, false, false);
-  u4 count = 0;
+  JfrVframeStream vfs(jt, frame, in_continuation, false);
   _reached_root = true;
   for (int i = 0; i < skip; ++i) {
     if (vfs.at_end()) {
@@ -305,10 +193,12 @@ bool JfrStackTrace::record(JavaThread* jt, const frame& frame, int skip, int64_t
     }
     vfs.next_vframe();
   }
-  const JfrStackFilter* stack_filter = JfrStackFilterRegistry::lookup(stack_filter_id);
-  _hash = 1;
+  const JfrStackFilter* stack_filter = stack_filter_id < 0 ? nullptr : JfrStackFilterRegistry::lookup(stack_filter_id);
+  if (_hash == 0) {
+    _hash = 1;
+  }
   while (!vfs.at_end()) {
-    if (count >= _max_frames) {
+    if (_count >= _max_frames) {
       _reached_root = false;
       break;
     }
@@ -328,7 +218,7 @@ bool JfrStackTrace::record(JavaThread* jt, const frame& frame, int skip, int64_t
       bci = vfs.bci();
     }
 
-    intptr_t* frame_id = vfs.frame_id();
+    const intptr_t* const frame_id = vfs.frame_id();
     vfs.next_vframe();
     if (type == JfrStackFrame::FRAME_JIT && !vfs.at_end() && frame_id == vfs.frame_id()) {
       // This frame and the caller frame are both the same physical
@@ -338,35 +228,16 @@ bool JfrStackTrace::record(JavaThread* jt, const frame& frame, int skip, int64_t
     _hash = (_hash * 31) + mid;
     _hash = (_hash * 31) + bci;
     _hash = (_hash * 31) + type;
-    _frames[count] = JfrStackFrame(mid, bci, type, method->method_holder());
-    count++;
+    _frames->append(JfrStackFrame(mid, bci, type, method->method_holder()));
+    _count++;
   }
-  _nr_of_frames = count;
-  return count > 0;
-}
-
-bool JfrStackTrace::record(JavaThread* current_thread, int skip, int64_t stack_filter_id) {
-  assert(current_thread != nullptr, "invariant");
-  assert(current_thread == Thread::current(), "invariant");
-  if (!current_thread->has_last_Java_frame()) {
-    return false;
-  }
-  return record(current_thread, current_thread->last_frame(), skip, stack_filter_id);
-}
-
-void JfrStackFrame::resolve_lineno() const {
-  assert(_klass, "no klass pointer");
-  assert(_line == 0, "already have linenumber");
-  const Method* const method = JfrMethodLookup::lookup(_klass, _methodid);
-  assert(method != nullptr, "invariant");
-  assert(method->method_holder() == _klass, "invariant");
-  _line = method->line_number_from_bci(_bci);
+  return _count > 0;
 }
 
 void JfrStackTrace::resolve_linenos() const {
   assert(!_lineno, "invariant");
-  for (unsigned int i = 0; i < _nr_of_frames; i++) {
-    _frames[i].resolve_lineno();
+  for (int i = 0; i < _frames->length(); i++) {
+    _frames->at(i).resolve_lineno();
   }
   _lineno = true;
 }
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
index 101dae21681..b268ddf7a0e 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACE_HPP
 #define SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACE_HPP
 
+#include "jfr/recorder/stacktrace/jfrStackFrame.hpp"
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 
@@ -33,48 +34,22 @@ class InstanceKlass;
 class JavaThread;
 class JfrCheckpointWriter;
 class JfrChunkWriter;
-
-class JfrStackFrame {
-  friend class ObjectSampleCheckpoint;
- private:
-  const InstanceKlass* _klass;
-  traceid _methodid;
-  mutable int _line;
-  int _bci;
-  u1 _type;
-
- public:
-  JfrStackFrame(const traceid& id, int bci, u1 type, const InstanceKlass* klass);
-  JfrStackFrame(const traceid& id, int bci, u1 type, int lineno, const InstanceKlass* klass);
-
-  bool equals(const JfrStackFrame& rhs) const;
-  void write(JfrChunkWriter& cw) const;
-  void write(JfrCheckpointWriter& cpw) const;
-  void resolve_lineno() const;
-
-  enum : u1 {
-    FRAME_INTERPRETER = 0,
-    FRAME_JIT,
-    FRAME_INLINE,
-    FRAME_NATIVE,
-    NUM_FRAME_TYPES
-  };
-};
+struct JfrSampleRequest;
 
 class JfrStackTrace : public JfrCHeapObj {
   friend class JfrNativeSamplerCallback;
   friend class JfrStackTraceRepository;
   friend class LeakProfilerStackTraceWriter;
+  friend class JfrThreadSampling;
   friend class ObjectSampleCheckpoint;
   friend class ObjectSampler;
-  friend class OSThreadSampler;
   friend class StackTraceResolver;
  private:
   const JfrStackTrace* _next;
-  JfrStackFrame* _frames;
+  JfrStackFrames* _frames;
   traceid _id;
   traceid _hash;
-  u4 _nr_of_frames;
+  u4 _count;
   u4 _max_frames;
   bool _frames_ownership;
   bool _reached_root;
@@ -88,25 +63,29 @@ class JfrStackTrace : public JfrCHeapObj {
   bool equals(const JfrStackTrace& rhs) const;
 
   void set_id(traceid id) { _id = id; }
-  void set_nr_of_frames(u4 nr_of_frames) { _nr_of_frames = nr_of_frames; }
   void set_hash(unsigned int hash) { _hash = hash; }
   void set_reached_root(bool reached_root) { _reached_root = reached_root; }
   void resolve_linenos() const;
 
-  bool record(JavaThread* current_thread, int skip, int64_t stack_frame_id);
-  bool record(JavaThread* current_thread, const frame& frame, int skip, int64_t stack_frame_id);
-  bool record_async(JavaThread* other_thread, const frame& frame);
-
+  int number_of_frames() const;
   bool have_lineno() const { return _lineno; }
   bool full_stacktrace() const { return _reached_root; }
+  bool record_inner(JavaThread* jt, const frame& frame, bool in_continuation, int skip, int64_t stack_filter_id = -1);
+  bool record(JavaThread* jt, const frame& frame, bool in_continuation, int skip, int64_t stack_filter_id = -1);
+  void record_interpreter_top_frame(const JfrSampleRequest& request);
 
   JfrStackTrace(traceid id, const JfrStackTrace& trace, const JfrStackTrace* next);
-  JfrStackTrace(JfrStackFrame* frames, u4 max_frames);
-  ~JfrStackTrace();
 
  public:
+  // ResourceArea allocation, remember ResourceMark.
+  JfrStackTrace();
+  ~JfrStackTrace();
+
   traceid hash() const { return _hash; }
   traceid id() const { return _id; }
+
+  bool record(JavaThread* current_thread, int skip, int64_t stack_filter_id);
+  bool record(JavaThread* jt, const frame& frame, bool in_continuation, const JfrSampleRequest& request);
   bool should_write() const { return !_written; }
 };
 
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
index 99d26c4689e..456896fe887 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
@@ -25,6 +25,7 @@
 #include "jfr/metadata/jfrSerializer.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
 #include "jfr/recorder/repository/jfrChunkWriter.hpp"
+#include "jfr/recorder/service/jfrOptionSet.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -65,7 +66,7 @@ JfrStackTraceRepository* JfrStackTraceRepository::create() {
   return _instance;
 }
 
-class JfrFrameType : public JfrSerializer {
+class JfrFrameTypeSerializer : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer) {
     writer.write_count(JfrStackFrame::NUM_FRAME_TYPES);
@@ -81,7 +82,7 @@ class JfrFrameType : public JfrSerializer {
 };
 
 bool JfrStackTraceRepository::initialize() {
-  return JfrSerializer::register_serializer(TYPE_FRAMETYPE, true, new JfrFrameType());
+  return JfrSerializer::register_serializer(TYPE_FRAMETYPE, true, new JfrFrameTypeSerializer());
 }
 
 void JfrStackTraceRepository::destroy() {
@@ -150,19 +151,9 @@ traceid JfrStackTraceRepository::record(Thread* current_thread, int skip /* 0 */
   if (!current_thread->is_Java_thread() || current_thread->is_hidden_from_external_view()) {
     return 0;
   }
-  JfrStackFrame* frames = tl->stackframes();
-  if (frames == nullptr) {
-    // pending oom
-    return 0;
-  }
-  assert(frames != nullptr, "invariant");
-  assert(tl->stackframes() == frames, "invariant");
-  return instance().record(JavaThread::cast(current_thread), skip, stack_filter_id, frames, tl->stackdepth());
-}
-
-traceid JfrStackTraceRepository::record(JavaThread* current_thread, int skip, int64_t stack_filter_id, JfrStackFrame *frames, u4 max_frames) {
-  JfrStackTrace stacktrace(frames, max_frames);
-  return stacktrace.record(current_thread, skip, stack_filter_id) ? add(instance(), stacktrace) : 0;
+  ResourceMark rm(current_thread);
+  JfrStackTrace stacktrace;
+  return stacktrace.record(JavaThread::cast(current_thread), skip, stack_filter_id) ? add(instance(), stacktrace) : 0;
 }
 
 traceid JfrStackTraceRepository::add(JfrStackTraceRepository& repo, const JfrStackTrace& stacktrace) {
@@ -185,7 +176,8 @@ void JfrStackTraceRepository::record_for_leak_profiler(JavaThread* current_threa
   JfrThreadLocal* const tl = current_thread->jfr_thread_local();
   assert(tl != nullptr, "invariant");
   assert(!tl->has_cached_stack_trace(), "invariant");
-  JfrStackTrace stacktrace(tl->stackframes(), tl->stackdepth());
+  ResourceMark rm(current_thread);
+  JfrStackTrace stacktrace;
   stacktrace.record(current_thread, skip, -1);
   const traceid hash = stacktrace.hash();
   if (hash != 0) {
@@ -195,7 +187,7 @@ void JfrStackTraceRepository::record_for_leak_profiler(JavaThread* current_threa
 
 traceid JfrStackTraceRepository::add_trace(const JfrStackTrace& stacktrace) {
   MutexLocker lock(JfrStacktrace_lock, Mutex::_no_safepoint_check_flag);
-  assert(stacktrace._nr_of_frames > 0, "invariant");
+  assert(stacktrace.number_of_frames() > 0, "invariant");
   const size_t index = stacktrace._hash % TABLE_SIZE;
   const JfrStackTrace* table_entry = _table[index];
 
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
index 5aa382944e2..d2bfc105999 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
@@ -31,12 +31,14 @@
 
 class JavaThread;
 class JfrChunkWriter;
+class JfrStackTrace;
 
 class JfrStackTraceRepository : public JfrCHeapObj {
   friend class JfrDeprecatedEdge;
   friend class JfrRecorder;
   friend class JfrRecorderService;
   friend class JfrThreadSampleClosure;
+  friend class JfrThreadSampler;
   friend class ObjectSampleCheckpoint;
   friend class ObjectSampler;
   friend class RecordStackTrace;
@@ -68,13 +70,11 @@ class JfrStackTraceRepository : public JfrCHeapObj {
   static void iterate_leakprofiler(Callback& cb);
 
   static traceid next_id();
-
-  traceid add_trace(const JfrStackTrace& stacktrace);
   static traceid add(JfrStackTraceRepository& repo, const JfrStackTrace& stacktrace);
-  static traceid add(const JfrStackTrace& stacktrace);
-  traceid record(JavaThread* current_thread, int skip, int64_t stack_filter_id, JfrStackFrame* frames, u4 max_frames);
+  traceid add_trace(const JfrStackTrace& stacktrace);
 
  public:
+  static traceid add(const JfrStackTrace& stacktrace);
   static traceid record(Thread* current_thread, int skip = 0, int64_t stack_filter_id = -1);
 };
 
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp
new file mode 100644
index 00000000000..22f103959cc
--- /dev/null
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ *
+ */
+
+#include "jfr/recorder/stacktrace/jfrVframeStream.inline.hpp"
+#include "runtime/javaThread.inline.hpp"
+#include "runtime/registerMap.hpp"
+#include "runtime/stackWatermarkSet.inline.hpp"
+
+static inline RegisterMap::WalkContinuation walk_continuation(JavaThread* jt) {
+  // NOTE: WalkContinuation::skip, because of interactions with ZGC relocation
+  //       and load barriers. This code is run while generating stack traces for
+  //       the ZPage allocation event, even when ZGC is relocating  objects.
+  //       When ZGC is relocating, it is forbidden to run code that performs
+  //       load barriers. With WalkContinuation::include, we visit heap stack
+  //       chunks and could be using load barriers.
+  //
+  // NOTE: Shenandoah GC also seems to require this check - actual details as to why
+  //       is unknown but to be filled in by others.
+  return ((UseZGC || UseShenandoahGC) && !StackWatermarkSet::processing_started(jt))
+    ? RegisterMap::WalkContinuation::skip
+    : RegisterMap::WalkContinuation::include;
+}
+
+JfrVframeStream::JfrVframeStream(JavaThread* jt, const frame& fr, bool in_continuation, bool stop_at_java_call_stub) :
+  vframeStreamCommon(jt, RegisterMap::UpdateMap::skip, RegisterMap::ProcessFrames::skip, walk_continuation(jt)),
+  _vthread(in_continuation), _cont_entry(_vthread ? jt->last_continuation() : nullptr) {
+  assert(!_vthread || JfrThreadLocal::is_vthread(jt), "invariant");
+  assert(!_vthread || _cont_entry != nullptr, "invariant");
+  _frame = fr;
+  _stop_at_java_call_stub = stop_at_java_call_stub;
+  while (!fill_from_frame()) {
+    _frame = _frame.sender(&_reg_map);
+  }
+}
diff --git a/src/hotspot/share/runtime/suspendedThreadTask.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
similarity index 63%
rename from src/hotspot/share/runtime/suspendedThreadTask.cpp
rename to src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
index 40a671d60fc..32910739f4d 100644
--- a/src/hotspot/share/runtime/suspendedThreadTask.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, 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
@@ -22,10 +22,20 @@
  *
  */
 
-#include "runtime/atomic.hpp"
-#include "runtime/suspendedThreadTask.hpp"
+#ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_HPP
+#define SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_HPP
 
-void SuspendedThreadTask::run() {
-  internal_do_task();
-  _done = true;
-}
+#include "runtime/vframe.hpp"
+
+class JfrVframeStream : public vframeStreamCommon {
+ private:
+  bool _vthread;
+  const ContinuationEntry* _cont_entry;
+  void step_to_sender();
+  void next_frame();
+ public:
+  JfrVframeStream(JavaThread* jt, const frame& fr, bool in_continuation, bool stop_at_java_call_stub);
+  void next_vframe();
+};
+
+#endif // SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_HPP
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
new file mode 100644
index 00000000000..1f8b75e57ce
--- /dev/null
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_INLINE_HPP
+#define SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_INLINE_HPP
+
+#include "jfr/recorder/stacktrace/jfrVframeStream.hpp"
+#include "runtime/continuationEntry.inline.hpp"
+#include "runtime/vframe.inline.hpp"
+
+inline void JfrVframeStream::next_frame() {
+  do {
+    if (_vthread && Continuation::is_continuation_enterSpecial(_frame)) {
+      if (_cont_entry->is_virtual_thread()) {
+        // An entry of a vthread continuation is a termination point.
+        _mode = at_end_mode;
+        break;
+      }
+      _cont_entry = _cont_entry->parent();
+    }
+
+    _frame = _frame.sender(&_reg_map);
+
+  } while (!fill_from_frame());
+}
+
+inline void JfrVframeStream::next_vframe() {
+  // handle frames with inlining
+  if (_mode == compiled_mode && fill_in_compiled_inlined_sender()) {
+    return;
+  }
+  next_frame();
+}
+
+#endif // SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_INLINE_HPP
diff --git a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
index 1396b6d51c1..074f9328bed 100644
--- a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp
@@ -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
@@ -25,7 +25,6 @@
 #ifndef SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
 #define SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
 
-#include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "jfr/support/jfrThreadId.hpp"
 
@@ -65,6 +64,10 @@
 #define THREAD_LOCAL_WRITER_OFFSET_JFR \
   JfrThreadLocal::java_event_writer_offset() + THREAD_LOCAL_OFFSET_JFR
 
-#define SUSPEND_THREAD_CONDITIONAL(thread) if ((thread)->is_trace_suspend()) JfrThreadSampling::on_javathread_suspend(thread)
+#define SAMPLE_STATE_OFFSET_JFR \
+  JfrThreadLocal::sample_state_offset() + THREAD_LOCAL_OFFSET_JFR
+
+#define SAMPLING_CRITICAL_SECTION_OFFSET_JFR \
+  JfrThreadLocal::sampling_critical_section_offset() + THREAD_LOCAL_OFFSET_JFR
 
 #endif // SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 31fd9892a31..503aa85e02f 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -46,6 +46,9 @@
 #include "utilities/sizes.hpp"
 
 JfrThreadLocal::JfrThreadLocal() :
+  _sample_request(),
+  _sample_request_queue(8),
+  _sample_monitor(Monitor::nosafepoint, "jfr thread sample monitor"),
   _java_event_writer(nullptr),
   _java_buffer(nullptr),
   _native_buffer(nullptr),
@@ -54,7 +57,7 @@ JfrThreadLocal::JfrThreadLocal() :
   _load_barrier_buffer_epoch_1(nullptr),
   _checkpoint_buffer_epoch_0(nullptr),
   _checkpoint_buffer_epoch_1(nullptr),
-  _stackframes(nullptr),
+  _sample_state(0),
   _dcmd_arena(nullptr),
   _thread(),
   _vthread_id(0),
@@ -68,12 +71,11 @@ JfrThreadLocal::JfrThreadLocal() :
   _user_time(0),
   _cpu_time(0),
   _wallclock_time(os::javaTimeNanos()),
-  _stackdepth(0),
-  _entering_suspend_flag(0),
   _non_reentrant_nesting(0),
   _vthread_epoch(0),
   _vthread_excluded(false),
   _jvm_thread_excluded(false),
+  _enqueued_requests(false),
   _vthread(false),
   _notified(false),
   _dead(false) {
@@ -165,10 +167,6 @@ void JfrThreadLocal::release(Thread* t) {
     JfrStorage::release_thread_local(java_buffer(), t);
     _java_buffer = nullptr;
   }
-  if (_stackframes != nullptr) {
-    FREE_C_HEAP_ARRAY(JfrStackFrame, _stackframes);
-    _stackframes = nullptr;
-  }
   if (_load_barrier_buffer_epoch_0 != nullptr) {
     _load_barrier_buffer_epoch_0->set_retired();
     _load_barrier_buffer_epoch_0 = nullptr;
@@ -245,12 +243,6 @@ JfrBuffer* JfrThreadLocal::install_java_buffer() const {
   return _java_buffer;
 }
 
-JfrStackFrame* JfrThreadLocal::install_stackframes() const {
-  assert(_stackframes == nullptr, "invariant");
-  _stackframes = NEW_C_HEAP_ARRAY(JfrStackFrame, stackdepth(), mtTracing);
-  return _stackframes;
-}
-
 ByteSize JfrThreadLocal::java_event_writer_offset() {
   return byte_offset_of(JfrThreadLocal, _java_event_writer);
 }
@@ -279,6 +271,14 @@ ByteSize JfrThreadLocal::notified_offset() {
   return byte_offset_of(JfrThreadLocal, _notified);
 }
 
+ByteSize JfrThreadLocal::sample_state_offset() {
+  return byte_offset_of(JfrThreadLocal, _sample_state);
+}
+
+ByteSize JfrThreadLocal::sampling_critical_section_offset() {
+  return byte_offset_of(JfrThreadLocal, _sampling_critical_section);
+}
+
 void JfrThreadLocal::set(bool* exclusion_field, bool state) {
   assert(exclusion_field != nullptr, "invariant");
   *exclusion_field = state;
@@ -337,10 +337,6 @@ bool JfrThreadLocal::is_included(const Thread* t) {
   return t->jfr_thread_local()->is_included();
 }
 
-u4 JfrThreadLocal::stackdepth() const {
-  return _stackdepth != 0 ? _stackdepth : (u4)JfrOptionSet::stackdepth();
-}
-
 bool JfrThreadLocal::is_impersonating(const Thread* t) {
   return t->jfr_thread_local()->_thread_id_alias != max_julong;
 }
@@ -397,6 +393,19 @@ traceid JfrThreadLocal::vthread_id(const Thread* t) {
   return Atomic::load(&t->jfr_thread_local()->_vthread_id);
 }
 
+traceid JfrThreadLocal::vthread_id_with_epoch_update(const JavaThread* jt) const {
+  assert(is_vthread(jt), "invariant");
+  const traceid tid = vthread_id(jt);
+  assert(tid != 0, "invariant");
+  if (!is_vthread_excluded()) {
+    const u2 current_epoch = AccessThreadTraceId::current_epoch();
+    if (vthread_epoch(jt) != current_epoch) {
+      set_vthread_epoch_checked(jt, tid, current_epoch);
+    }
+  }
+  return tid;
+}
+
 u2 JfrThreadLocal::vthread_epoch(const JavaThread* jt) {
   assert(jt != nullptr, "invariant");
   return Atomic::load(&jt->jfr_thread_local()->_vthread_epoch);
@@ -412,19 +421,7 @@ traceid JfrThreadLocal::thread_id(const Thread* t) {
     return jvm_thread_id(tl);
   }
   const JavaThread* jt = JavaThread::cast(t);
-  if (!is_vthread(jt)) {
-    return jvm_thread_id(tl);
-  }
-  // virtual thread
-  const traceid tid = vthread_id(jt);
-  assert(tid != 0, "invariant");
-  if (!tl->is_vthread_excluded()) {
-    const u2 current_epoch = AccessThreadTraceId::current_epoch();
-    if (vthread_epoch(jt) != current_epoch) {
-      set_vthread_epoch_checked(jt, tid, current_epoch);
-    }
-  }
-  return tid;
+  return is_vthread(jt) ? tl->vthread_id_with_epoch_update(jt) : jvm_thread_id(tl);
 }
 
 // When not recording, there is no checkpoint system
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index 5e25de56ec0..8e545d9c429 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -25,13 +25,17 @@
 #ifndef SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
 #define SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
 
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrBlob.hpp"
+#include "jfr/utilities/jfrTime.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/mutexLocker.hpp"
 
 class Arena;
 class JavaThread;
 class JfrBuffer;
-class JfrStackFrame;
 class Thread;
 
 class JfrThreadLocal {
@@ -40,6 +44,9 @@ class JfrThreadLocal {
   friend class JfrJavaSupport;
   friend class JVMCIVMStructs;
  private:
+  mutable JfrSampleRequest _sample_request;
+  JfrSampleRequestQueue _sample_request_queue;
+  Monitor _sample_monitor;
   jobject _java_event_writer;
   mutable JfrBuffer* _java_buffer;
   mutable JfrBuffer* _native_buffer;
@@ -48,7 +55,7 @@ class JfrThreadLocal {
   JfrBuffer* _load_barrier_buffer_epoch_1;
   JfrBuffer* _checkpoint_buffer_epoch_0;
   JfrBuffer* _checkpoint_buffer_epoch_1;
-  mutable JfrStackFrame* _stackframes;
+  volatile int _sample_state;
   Arena* _dcmd_arena;
   JfrBlobHandle _thread;
   mutable traceid _vthread_id;
@@ -62,19 +69,18 @@ class JfrThreadLocal {
   jlong _user_time;
   jlong _cpu_time;
   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;
+  volatile bool _enqueued_requests;
   bool _vthread;
   bool _notified;
   bool _dead;
+  bool _sampling_critical_section;
 
   JfrBuffer* install_native_buffer() const;
   JfrBuffer* install_java_buffer() const;
-  JfrStackFrame* install_stackframes() const;
   void release(Thread* t);
   static void release(JfrThreadLocal* tl, Thread* t);
   static void initialize_main_thread(JavaThread* jt);
@@ -140,18 +146,78 @@ class JfrThreadLocal {
     _java_event_writer = java_event_writer;
   }
 
-  JfrStackFrame* stackframes() const {
-    return _stackframes != nullptr ? _stackframes : install_stackframes();
+
+  int sample_state() const {
+    return Atomic::load_acquire(&_sample_state);
+  }
+
+  void set_sample_state(int state) {
+    Atomic::release_store(&_sample_state, state);
+  }
+
+  Monitor* sample_monitor() {
+    return &_sample_monitor;
+  }
+
+  JfrSampleRequestQueue* sample_requests() {
+    return &_sample_request_queue;
+  }
+
+  JfrSampleRequest sample_request() const {
+    return _sample_request;
+  }
+
+  void set_sample_request(JfrSampleRequest request) {
+    _sample_request = request;
+  }
+
+  void set_sample_ticks() {
+    _sample_request._sample_ticks = JfrTicks::now();
+  }
+
+  void set_sample_ticks(const JfrTicks& ticks) {
+    _sample_request._sample_ticks = ticks;
+  }
+
+  bool has_sample_ticks() const {
+    return _sample_request._sample_ticks.value() != 0;
   }
 
-  void set_stackframes(JfrStackFrame* frames) {
-    _stackframes = frames;
+  const JfrTicks& sample_ticks() const {
+    return _sample_request._sample_ticks;
   }
 
-  u4 stackdepth() const;
+  bool has_enqueued_requests() const {
+    return Atomic::load_acquire(&_enqueued_requests);
+  }
+
+  void enqueue_request() {
+    assert_lock_strong(sample_monitor());
+    assert(sample_state() == JAVA_SAMPLE, "invariant");
+    if (_sample_request_queue.append(_sample_request) == 0) {
+      Atomic::release_store(&_enqueued_requests, true);
+    }
+    set_sample_state(NO_SAMPLE);
+  }
+
+  void clear_enqueued_requests() {
+    assert_lock_strong(sample_monitor());
+    assert(has_enqueued_requests(), "invariant");
+    assert(_sample_request_queue.is_nonempty(), "invariant");
+    _sample_request_queue.clear();
+    Atomic::release_store(&_enqueued_requests, false);
+  }
+
+  bool has_native_sample_request() const {
+    return sample_state() == NATIVE_SAMPLE;
+  }
+
+  bool has_java_sample_request() const {
+    return sample_state() == JAVA_SAMPLE || has_enqueued_requests();
+  }
 
-  void set_stackdepth(u4 depth) {
-    _stackdepth = depth;
+  bool has_sample_request() const {
+    return sample_state() != NO_SAMPLE || has_enqueued_requests();
   }
 
   int64_t last_allocated_bytes() const {
@@ -171,6 +237,7 @@ class JfrThreadLocal {
   static traceid thread_id(const Thread* t);
   static bool is_vthread(const JavaThread* jt);
   static u2 vthread_epoch(const JavaThread* jt);
+  traceid vthread_id_with_epoch_update(const JavaThread* jt) const;
 
   // Exposed to external code that use a thread id unconditionally.
   // Jfr might not even be running.
@@ -211,18 +278,6 @@ class JfrThreadLocal {
     return _stack_trace_hash;
   }
 
-  void set_trace_block() {
-    _entering_suspend_flag = 1;
-  }
-
-  void clear_trace_block() {
-    _entering_suspend_flag = 0;
-  }
-
-  bool is_trace_block() const {
-    return _entering_suspend_flag != 0;
-  }
-
   u8 data_lost() const {
     return _data_lost;
   }
@@ -269,6 +324,10 @@ class JfrThreadLocal {
     return _dead;
   }
 
+  bool in_sampling_critical_section() const {
+    return _sampling_critical_section;
+  }
+
   static int32_t make_non_reentrant(Thread* thread);
   static void make_reentrant(Thread* thread, int32_t previous_nesting);
 
@@ -297,6 +356,8 @@ class JfrThreadLocal {
   static ByteSize vthread_epoch_offset();
   static ByteSize vthread_excluded_offset();
   static ByteSize notified_offset();
+  static ByteSize sample_state_offset();
+  static ByteSize sampling_critical_section_offset();
 
   friend class JfrJavaThread;
   friend class JfrCheckpointManager;
diff --git a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
index a86b4ee25ab..70404d22e3f 100644
--- a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrLogTagSets.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
@@ -56,6 +56,7 @@
   JFR_LOG_TAG(jfr, system, streaming) \
   JFR_LOG_TAG(jfr, system, throttle) \
   JFR_LOG_TAG(jfr, system, periodic) \
+  JFR_LOG_TAG(jfr, system, sampling) \
   JFR_LOG_TAG(jfr, periodic) \
   JFR_LOG_TAG(jfr, metadata) \
   JFR_LOG_TAG(jfr, event) \
diff --git a/src/hotspot/share/runtime/continuationEntry.hpp b/src/hotspot/share/runtime/continuationEntry.hpp
index 990ee6c6a42..3c8532b9e87 100644
--- a/src/hotspot/share/runtime/continuationEntry.hpp
+++ b/src/hotspot/share/runtime/continuationEntry.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
@@ -42,11 +42,11 @@ class ContinuationEntry {
   friend class JVMCIVMStructs;
   ContinuationEntryPD _pd;
 #ifdef ASSERT
-private:
+ private:
   static const int COOKIE_VALUE = 0x1234;
   int cookie;
 
-public:
+ public:
   static int cookie_value() { return COOKIE_VALUE; }
   static ByteSize cookie_offset() { return byte_offset_of(ContinuationEntry, cookie); }
 
@@ -55,7 +55,7 @@ class ContinuationEntry {
   }
 #endif
 
-public:
+ public:
   static int _return_pc_offset; // friend gen_continuation_enter
   static int _thaw_call_pc_offset;
   static int _cleanup_offset;
@@ -63,14 +63,14 @@ class ContinuationEntry {
   static void set_enter_code(nmethod* nm, int interpreted_entry_offset);
   static bool is_interpreted_call(address call_address);
 
-private:
+ private:
   static address _return_pc;
   static address _thaw_call_pc;
   static address _cleanup_pc;
   static nmethod* _enter_special;
   static int _interpreted_entry_offset;
 
-private:
+ private:
   ContinuationEntry* _parent;
   oopDesc* _cont;
   oopDesc* _chunk;
@@ -86,7 +86,7 @@ class ContinuationEntry {
 #endif
   uint32_t _pin_count;
 
-public:
+ public:
   static ByteSize parent_offset()   { return byte_offset_of(ContinuationEntry, _parent); }
   static ByteSize cont_offset()     { return byte_offset_of(ContinuationEntry, _cont); }
   static ByteSize chunk_offset()    { return byte_offset_of(ContinuationEntry, _chunk); }
@@ -96,7 +96,10 @@ class ContinuationEntry {
   static ByteSize parent_cont_fastpath_offset()      { return byte_offset_of(ContinuationEntry, _parent_cont_fastpath); }
   static ByteSize parent_held_monitor_count_offset() { return byte_offset_of(ContinuationEntry, _parent_held_monitor_count); }
 
-public:
+  static address return_pc() { return _return_pc; }
+  static address return_pc_address() { return (address)&_return_pc; }
+
+ public:
   static size_t size() { return align_up((int)sizeof(ContinuationEntry), 2*wordSize); }
 
   ContinuationEntry* parent() const { return _parent; }
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index d20cfde09ca..a928b0443ee 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -70,6 +70,9 @@
 #if INCLUDE_ZGC
 #include "gc/z/zStackChunkGCData.inline.hpp"
 #endif
+#if INCLUDE_JFR
+#include "jfr/jfr.inline.hpp"
+#endif
 
 #include <type_traits>
 
@@ -608,6 +611,7 @@ void FreezeBase::unwind_frames() {
   ContinuationEntry* entry = _cont.entry();
   entry->flush_stack_processing(_thread);
   assert_frames_in_continuation_are_safe(_thread);
+  JFR_ONLY(Jfr::check_and_process_sample_request(_thread);)
   assert(LockingMode != LM_LEGACY || !monitors_on_stack(_thread), "unexpected monitors on stack");
   set_anchor_to_entry(_thread, entry);
 }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 8478cad4df5..4042bb01c58 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -101,6 +101,7 @@
 #include "utilities/preserveException.hpp"
 #include "utilities/xmlstream.hpp"
 #if INCLUDE_JFR
+#include "jfr/jfr.inline.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/metadata/jfrSerializer.hpp"
 #endif
@@ -473,6 +474,7 @@ bool Deoptimization::deoptimize_objects_internal(JavaThread* thread, GrowableArr
 
 // This is factored, since it is both called from a JRT_LEAF (deoptimization) and a JRT_ENTRY (uncommon_trap)
 Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread* current, int exec_mode) {
+  JFR_ONLY(Jfr::check_and_process_sample_request(current);)
   // When we get here we are about to unwind the deoptee frame. In order to
   // catch not yet safe to use frames, the following stack watermark barrier
   // poll will make such frames safe to use.
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 5c461c121db..ba9aa3eb29a 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -229,7 +229,15 @@ void frame::set_pc(address newpc) {
   _deopt_state = unknown;
   _pc = newpc;
   _cb = CodeCache::find_blob(_pc);
+}
 
+// This is optimized for intra-blob pc adjustments only.
+void frame::adjust_pc(address newpc) {
+  assert(_cb != nullptr, "invariant");
+  assert(_cb == CodeCache::find_blob(newpc), "invariant");
+  // Unsafe to use the is_deoptimized tester after changing pc
+  _deopt_state = unknown;
+  _pc = newpc;
 }
 
 // type testers
diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
index 1c24e5b63c7..fbe7310f3ae 100644
--- a/src/hotspot/share/runtime/frame.hpp
+++ b/src/hotspot/share/runtime/frame.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
@@ -127,6 +127,7 @@ class frame {
   address get_deopt_original_pc() const;
 
   void set_pc(address newpc);
+  void adjust_pc(address newpc);
 
   intptr_t* sp() const           { assert_absolute(); return _sp; }
   void set_sp( intptr_t* newsp ) { _sp = newsp; }
@@ -505,6 +506,18 @@ class frame {
   // assert(frame::verify_return_pc(return_address), "must be a return pc");
 #endif
 
+#if INCLUDE_JFR
+  // Static helper routines
+  static address interpreter_bcp(const intptr_t* fp);
+  static address interpreter_return_address(const intptr_t* fp);
+  static intptr_t* interpreter_sender_sp(const intptr_t* fp);
+  static bool is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp);
+  static intptr_t* sender_sp(intptr_t* fp);
+  static intptr_t* link(const intptr_t* fp);
+  static address return_address(const intptr_t* sp);
+  static intptr_t* fp(const intptr_t* sp);
+#endif
+
 #include CPU_HEADER(frame)
 
 };
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 0d3209e2d6c..060c0a33cdf 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1078,7 +1078,6 @@ void JavaThread::handle_special_runtime_exit_condition() {
     frame_anchor()->make_walkable();
     wait_for_object_deoptimization();
   }
-  JFR_ONLY(SUSPEND_THREAD_CONDITIONAL(this);)
 }
 
 
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index ab3b3611f1d..968dfd0ce48 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.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.
  *
@@ -216,7 +216,6 @@ class JavaThread: public Thread {
   enum SuspendFlags {
     // NOTE: avoid using the sign-bit as cc generates different test code
     //       when the sign-bit is used, and sometimes incorrectly - see CR 6398077
-    _trace_flag             = 0x00000004U, // call tracing backend
     _obj_deopt              = 0x00000008U  // suspend for object reallocation and relocking for JVMTI agent
   };
 
@@ -227,11 +226,8 @@ class JavaThread: public Thread {
   inline void clear_suspend_flag(SuspendFlags f);
 
  public:
-  inline void set_trace_flag();
-  inline void clear_trace_flag();
   inline void set_obj_deopt_flag();
   inline void clear_obj_deopt_flag();
-  bool is_trace_suspend()      { return (_suspend_flags & _trace_flag) != 0; }
   bool is_obj_deopt_suspend()  { return (_suspend_flags & _obj_deopt) != 0; }
 
   // Asynchronous exception support
@@ -751,7 +747,7 @@ class JavaThread: public Thread {
   // Support for object deoptimization and JFR suspension
   void handle_special_runtime_exit_condition();
   bool has_special_runtime_exit_condition() {
-    return (_suspend_flags & (_obj_deopt JFR_ONLY(| _trace_flag))) != 0;
+    return (_suspend_flags & _obj_deopt) != 0;
   }
 
   // Stack-locking support (not for LM_LIGHTWEIGHT)
diff --git a/src/hotspot/share/runtime/javaThread.inline.hpp b/src/hotspot/share/runtime/javaThread.inline.hpp
index de492fda50b..136a9d84151 100644
--- a/src/hotspot/share/runtime/javaThread.inline.hpp
+++ b/src/hotspot/share/runtime/javaThread.inline.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.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -57,12 +57,6 @@ inline void JavaThread::clear_suspend_flag(SuspendFlags f) {
   while (Atomic::cmpxchg(&_suspend_flags, flags, (flags & ~f)) != flags);
 }
 
-inline void JavaThread::set_trace_flag() {
-  set_suspend_flag(_trace_flag);
-}
-inline void JavaThread::clear_trace_flag() {
-  clear_suspend_flag(_trace_flag);
-}
 inline void JavaThread::set_obj_deopt_flag() {
   set_suspend_flag(_obj_deopt);
 }
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 74df0fa9188..3624c5e8976 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -117,7 +117,6 @@ Mutex*   Verify_lock                  = nullptr;
 Mutex*   JfrStacktrace_lock           = nullptr;
 Monitor* JfrMsg_lock                  = nullptr;
 Mutex*   JfrBuffer_lock               = nullptr;
-Monitor* JfrThreadSampler_lock        = nullptr;
 #endif
 
 Mutex*   CodeHeapStateAnalytics_lock  = nullptr;
@@ -282,7 +281,6 @@ void mutex_init() {
   MUTEX_DEFN(JfrBuffer_lock                  , PaddedMutex  , event);
   MUTEX_DEFN(JfrMsg_lock                     , PaddedMonitor, event);
   MUTEX_DEFN(JfrStacktrace_lock              , PaddedMutex  , event);
-  MUTEX_DEFN(JfrThreadSampler_lock           , PaddedMonitor, nosafepoint);
 #endif
 
   MUTEX_DEFN(ContinuationRelativize_lock     , PaddedMonitor, nosafepoint-3);
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index b21a738c8ff..67126c9ee29 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -136,7 +136,6 @@ extern Mutex*   FinalImageRecipes_lock;          // Protecting the tables used b
 extern Mutex*   JfrStacktrace_lock;              // used to guard access to the JFR stacktrace table
 extern Monitor* JfrMsg_lock;                     // protects JFR messaging
 extern Mutex*   JfrBuffer_lock;                  // protects JFR buffer operations
-extern Monitor* JfrThreadSampler_lock;           // used to suspend/resume JFR thread sampler
 #endif
 
 extern Mutex*   Metaspace_lock;                  // protects Metaspace virtualspace and chunk expansions
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index dde80806912..b26ec280e72 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -623,6 +623,7 @@ class os: AllStatic {
   static address    fetch_frame_from_context(const void* ucVoid, intptr_t** sp, intptr_t** fp);
   static frame      fetch_frame_from_context(const void* ucVoid);
   static frame      fetch_compiled_frame_from_context(const void* ucVoid);
+  static intptr_t*  fetch_bcp_from_context(const void* ucVoid);
 
   // For saving an os specific context generated by an assert or guarantee.
   static void       save_assert_context(const void* ucVoid);
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index 71224bbff4c..d4160161f19 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -32,6 +32,9 @@
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "utilities/globalDefinitions.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.inline.hpp"
+#endif
 
 uintptr_t SafepointMechanism::_poll_word_armed_value;
 uintptr_t SafepointMechanism::_poll_word_disarmed_value;
@@ -94,7 +97,7 @@ void SafepointMechanism::update_poll_values(JavaThread* thread) {
   assert(thread->thread_state() != _thread_in_native, "Must not be");
 
   for (;;) {
-    bool armed = global_poll() || thread->handshake_state()->has_operation();
+    bool armed = has_pending_safepoint(thread);
     uintptr_t stack_watermark = StackWatermarkSet::lowest_watermark(thread);
     uintptr_t poll_page = armed ? _poll_page_armed_value
                                 : _poll_page_disarmed_value;
@@ -120,7 +123,7 @@ void SafepointMechanism::update_poll_values(JavaThread* thread) {
     thread->poll_data()->set_polling_page(poll_page);
     thread->poll_data()->set_polling_word(poll_word);
     OrderAccess::fence();
-    if (!armed && (global_poll() || thread->handshake_state()->has_operation())) {
+    if (!armed && has_pending_safepoint(thread)) {
       // We disarmed an old safepoint, but a new one is synchronizing.
       // We need to arm the poll for the subsequent safepoint poll.
       continue;
@@ -139,6 +142,7 @@ void SafepointMechanism::process(JavaThread *thread, bool allow_suspend, bool ch
   do {
     JavaThreadState state = thread->thread_state();
     guarantee(state == _thread_in_vm, "Illegal threadstate encountered: %d", state);
+    JFR_ONLY(Jfr::check_and_process_sample_request(thread);)
     if (global_poll()) {
       // Any load in ::block() must not pass the global poll load.
       // Otherwise we might load an old safepoint counter (for example).
diff --git a/src/hotspot/share/runtime/safepointMechanism.hpp b/src/hotspot/share/runtime/safepointMechanism.hpp
index 331f5177e60..ba7d9c06bb4 100644
--- a/src/hotspot/share/runtime/safepointMechanism.hpp
+++ b/src/hotspot/share/runtime/safepointMechanism.hpp
@@ -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,6 +49,8 @@ class SafepointMechanism : public AllStatic {
 
   static inline bool global_poll();
 
+  static inline bool has_pending_safepoint(JavaThread* thread);
+
   static void process(JavaThread *thread, bool allow_suspend, bool check_async_exception);
 
   static void default_initialize();
diff --git a/src/hotspot/share/runtime/safepointMechanism.inline.hpp b/src/hotspot/share/runtime/safepointMechanism.inline.hpp
index d0fb3a8fa2d..6b848ee6af9 100644
--- a/src/hotspot/share/runtime/safepointMechanism.inline.hpp
+++ b/src/hotspot/share/runtime/safepointMechanism.inline.hpp
@@ -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
@@ -31,6 +31,9 @@
 #include "runtime/handshake.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/stackWatermarkSet.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.inline.hpp"
+#endif
 
 // Caller is responsible for using a memory barrier if needed.
 inline void SafepointMechanism::ThreadData::set_polling_page(uintptr_t poll_value) {
@@ -56,6 +59,10 @@ bool SafepointMechanism::global_poll() {
   return (SafepointSynchronize::_state != SafepointSynchronize::_not_synchronized);
 }
 
+inline bool SafepointMechanism::has_pending_safepoint(JavaThread* thread) {
+  return global_poll() || thread->handshake_state()->has_operation() JFR_ONLY(|| Jfr::has_sample_request(thread));
+}
+
 bool SafepointMechanism::should_process(JavaThread* thread, bool allow_suspend) {
   if (!local_poll_armed(thread)) {
     return false;
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 56471e096b8..a3546e0f5a2 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -87,7 +87,7 @@
 #include "c1/c1_Runtime1.hpp"
 #endif
 #if INCLUDE_JFR
-#include "jfr/jfr.hpp"
+#include "jfr/jfr.inline.hpp"
 #endif
 
 // Shared runtime stub routines reside in their own unique blob with a
@@ -3280,7 +3280,7 @@ VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver,
 
 JRT_LEAF(intptr_t*, SharedRuntime::OSR_migration_begin( JavaThread *current) )
   assert(current == JavaThread::current(), "pre-condition");
-
+  JFR_ONLY(Jfr::check_and_process_sample_request(current);)
   // During OSR migration, we unwind the interpreted frame and replace it with a compiled
   // frame. The stack watermark code below ensures that the interpreted frame is processed
   // before it gets unwound. This is helpful as the size of the compiled frame could be
diff --git a/src/hotspot/share/runtime/suspendedThreadTask.hpp b/src/hotspot/share/runtime/suspendedThreadTask.hpp
index d6f93fab43c..934d4a8768a 100644
--- a/src/hotspot/share/runtime/suspendedThreadTask.hpp
+++ b/src/hotspot/share/runtime/suspendedThreadTask.hpp
@@ -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
@@ -28,26 +28,25 @@
 class Thread;
 
 class SuspendedThreadTaskContext {
-public:
-  SuspendedThreadTaskContext(Thread* thread, void *ucontext) : _thread(thread), _ucontext(ucontext) {}
-  Thread* thread() const { return _thread; }
-  void* ucontext() const { return _ucontext; }
-private:
+ private:
   Thread* _thread;
   void* _ucontext;
+ public:
+  SuspendedThreadTaskContext(Thread* thread, void* ucontext) : _thread(thread), _ucontext(ucontext) {}
+  Thread* thread() const { return _thread; }
+  void* ucontext() const { return _ucontext; }
 };
 
 class SuspendedThreadTask {
-public:
-  SuspendedThreadTask(Thread* thread) : _thread(thread), _done(false) {}
-  void run();
-  virtual void do_task(const SuspendedThreadTaskContext& context) = 0;
-protected:
-  ~SuspendedThreadTask() {}
-private:
-  void internal_do_task();
+ private:
   Thread* _thread;
-  bool _done;
+  void internal_do_task();
+ protected:
+  ~SuspendedThreadTask() {}
+ public:
+  SuspendedThreadTask(Thread* thread) : _thread(thread) {}
+  void run() { internal_do_task(); }
+  virtual void do_task(const SuspendedThreadTaskContext& context) = 0;
 };
 
 #endif // SHARE_RUNTIME_SUSPENDEDTHREADTASK_HPP
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 354461b8f04..f3a06d5efd2 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -309,6 +309,7 @@ class Thread: public ThreadShadow {
   virtual bool is_Named_thread() const               { return false; }
   virtual bool is_Worker_thread() const              { return false; }
   virtual bool is_JfrSampler_thread() const          { return false; }
+  virtual bool is_JfrRecorder_thread() const         { return false; }
   virtual bool is_AttachListener_thread() const      { return false; }
   virtual bool is_monitor_deflation_thread() const   { return false; }
 
diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
index 86b7ed5f917..759b9451490 100644
--- a/src/hotspot/share/utilities/growableArray.hpp
+++ b/src/hotspot/share/utilities/growableArray.hpp
@@ -405,6 +405,9 @@ class GrowableArrayWithAllocator : public GrowableArrayView<E> {
     }
   }
 
+  GrowableArrayWithAllocator(E* data, int capacity, int initial_len) :
+    GrowableArrayView<E>(data, capacity, initial_len) {}
+
   ~GrowableArrayWithAllocator() {}
 
 public:
@@ -780,6 +783,15 @@ class GrowableArray : public GrowableArrayWithAllocator<E, GrowableArray<E>> {
     init_checks();
   }
 
+  // This constructor performs no default initialization, so be careful.
+  GrowableArray(int initial_capacity, int initial_len, MemTag mem_tag) :
+    GrowableArrayWithAllocator<E, GrowableArray>(
+      allocate(initial_capacity, mem_tag),
+      initial_capacity, initial_len),
+    _metadata(mem_tag) {
+    init_checks();
+  }
+
   GrowableArray(int initial_capacity, int initial_len, const E& filler, MemTag mem_tag) :
       GrowableArrayWithAllocator<E, GrowableArray>(
           allocate(initial_capacity, mem_tag),
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
index baac3f542ef..4babd74c73d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.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
@@ -74,30 +74,34 @@ public enum LogTag {
      *  Covers periodic task work (for Hotspot developer)
      */
     JFR_SYSTEM_PERIODIC(9),
+    /**
+     *  Covers sampling work (for Hotspot developer)
+     */
+    JFR_SYSTEM_SAMPLING(10),
     /**
      *  Covers periodic event work (for users of the JDK)
      */
-    JFR_PERIODIC(10),
+    JFR_PERIODIC(11),
     /**
      *  Covers metadata for Java user (for Hotspot developers)
      */
-    JFR_METADATA(11),
+    JFR_METADATA(12),
     /**
      * Covers events (for users of the JDK)
      */
-    JFR_EVENT(12),
+    JFR_EVENT(13),
     /**
      * Covers setting (for users of the JDK)
      */
-    JFR_SETTING(13),
+    JFR_SETTING(14),
     /**
      * Covers usage of jcmd with JFR
      */
-    JFR_DCMD(14),
+    JFR_DCMD(15),
     /**
      * -XX:StartFlightRecording
      */
-    JFR_START(15);
+    JFR_START(16);
 
     /* set from native side */
     volatile int tagSetLevel = 100; // prevent logging if JVM log system has not been initialized
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 2ba673eba1d..9f3a34618d3 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -206,6 +206,13 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.SafepointLatency">
+      <setting name="enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+      <setting name="throttle">off</setting>
+    </event>
+
     <event name="jdk.SafepointBegin">
       <setting name="enabled">true</setting>
       <setting name="threshold">10 ms</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index a86cf243571..4c9f4b4f8ec 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -206,6 +206,13 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.SafepointLatency">
+      <setting name="enabled">false</setting>
+      <setting name="stackTrace">false</setting>
+      <setting name="threshold">0 ms</setting>
+      <setting name="throttle">off</setting>
+    </event>
+
     <event name="jdk.SafepointBegin">
       <setting name="enabled">true</setting>
       <setting name="threshold">0 ms</setting>
diff --git a/test/jdk/jdk/jfr/event/profiling/TestSafepointLatency.java b/test/jdk/jdk/jfr/event/profiling/TestSafepointLatency.java
new file mode 100644
index 00000000000..d9fbc16d4e9
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestSafepointLatency.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.jfr.event.profiling;
+
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.Random;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+
+/*
+ * @test
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestSafepointLatency
+ */
+public class TestSafepointLatency {
+    // The SafepointLatency event is parasitic on the ExecutionSample mechanism.
+    final static String EXECUTION_SAMPLE_EVENT = EventNames.ExecutionSample;
+    final static String SAFEPOINT_LATENCY_EVENT = EventNames.SafepointLatency;
+    final static CountDownLatch latch = new CountDownLatch(10);
+    final static Random random = new Random();
+    public static int publicizedValue = 4711;
+
+    public static void main(String[] args) throws Exception {
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(EXECUTION_SAMPLE_EVENT).withPeriod(Duration.ofMillis(1));
+            rs.enable(SAFEPOINT_LATENCY_EVENT);
+            rs.onEvent(SAFEPOINT_LATENCY_EVENT, e -> latch.countDown());
+            rs.startAsync();
+            Thread t = new Thread(TestSafepointLatency::callMethods);
+            t.setDaemon(true);
+            t.start();
+            latch.await();
+        }
+    }
+
+    public static void callMethods() {
+        while (latch.getCount() > 0) {
+            publicizedValue += bar(publicizedValue);
+        }
+    }
+
+    private static int bar(int value) {
+        return baz(value);
+    }
+
+    private static int baz(int value) {
+        return qux(value);
+    }
+
+    private static int qux(int value) {
+        return (value << 4) * random.nextInt();
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 8137f33df44..b2d8bcb12bf 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -90,6 +90,7 @@ public class EventNames {
     public static final String JavaAgent = PREFIX + "JavaAgent";
     public static final String NativeAgent = PREFIX + "NativeAgent";
     public static final String DeprecatedInvocation = PREFIX + "DeprecatedInvocation";
+    public static final String SafepointLatency = PREFIX + "SafepointLatency";
 
     // This event is hard to test
     public static final String ReservedStackActivation = PREFIX + "ReservedStackActivation";

From 2c034f57d6b4229aaf195fdd6efd016cf694855f Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Mon, 26 May 2025 22:37:42 +0000
Subject: [PATCH 646/901] 8357146: ForkJoinPool:schedule(*) does not throw
 RejectedExecutionException when pool is shutdown

Reviewed-by: alanb
---
 .../java/util/concurrent/ForkJoinPool.java    | 22 +++++++++++++------
 .../concurrent/tck/ForkJoinPool20Test.java    | 18 +++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

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 eac0f5bdc18..a7821921bc9 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -3452,9 +3452,9 @@ private DelayScheduler startDelayScheduler() {
             String name = poolName + "-delayScheduler";
             if (workerNamePrefix == null)
                 asyncCommonPool();  // override common parallelism zero
-            lockRunState();
+            long isShutdown = lockRunState() & SHUTDOWN;
             try {
-                if ((ds = delayScheduler) == null) {
+                if (isShutdown == 0L && (ds = delayScheduler) == null) {
                     ds = delayScheduler = new DelayScheduler(this, name);
                     start = true;
                 }
@@ -3462,12 +3462,20 @@ private DelayScheduler startDelayScheduler() {
                 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();
+                try {
+                    if ((ctr = container) != null)
+                        ctr.start(ds);
+                    else
+                        ds.start();
+                } catch (RuntimeException | Error ex) { // back out
+                    lockRunState();
+                    ds = delayScheduler = null;
+                    unlockRunState();
+                    tryTerminate(false, false);
+                    if (ex instanceof Error)
+                        throw ex;
+                }
             }
         }
         return ds;
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
index 9b60bbae484..9e26ec11d72 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
@@ -644,4 +644,22 @@ public Boolean realCall() {
         }
     }
 
+    /**
+     * schedule throws RejectedExecutionException if shutdown before
+     * first delayed task is submitted
+     */
+    public void testInitialScheduleAfterShutdown() throws InterruptedException {
+        Runnable r = new NoOpRunnable();
+        boolean rje = false;
+        try (final ForkJoinPool p = new ForkJoinPool(1)) {
+            p.shutdown();
+            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+            try {
+                p.schedule(r, 1, MILLISECONDS);
+            } catch (RejectedExecutionException ok) {
+                rje = true;
+            }
+        }
+        assertTrue(rje);
+    }
 }

From 37d04a1e365d005afec3651c5e25fdceeceb9313 Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Tue, 27 May 2025 02:05:46 +0000
Subject: [PATCH 647/901] 8355512: Test
 compiler/vectorization/TestVectorZeroCount.java times out with
 -XX:TieredStopAtLevel=3

Reviewed-by: chagedorn, epeter
---
 .../jtreg/compiler/vectorization/TestVectorZeroCount.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
index 03a7beb35c0..f4c8845b857 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
@@ -23,6 +23,7 @@
 
 /* @test
  * @bug 8349637
+ * @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
  * @summary Ensure that vectorization of numberOfLeadingZeros and numberOfTrailingZeros outputs correct values
  * @library /test/lib /
  * @run main/othervm compiler.vectorization.TestVectorZeroCount

From 78d0dc75029dba7b4ba388f9a7f5f7b22e4b838e Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Tue, 27 May 2025 03:39:28 +0000
Subject: [PATCH 648/901] 8357460: RISC-V: Optimize array fill stub for small
 size

Reviewed-by: wenanjian, fyang
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 86 ++++++++-----------
 1 file changed, 34 insertions(+), 52 deletions(-)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 41739c2270c..c58f6bc338d 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2025, Red Hat Inc. All rights reserved.
- * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2020, 2025, 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
@@ -2196,8 +2196,8 @@ class StubGenerator: public StubCodeGenerator {
       switch (t) {
         case T_BYTE:
           // One byte misalignment happens only for byte arrays.
-          __ test_bit(t0, to, 0);
-          __ beqz(t0, L_skip_align1);
+          __ test_bit(tmp_reg, to, 0);
+          __ beqz(tmp_reg, L_skip_align1);
           __ sb(value, Address(to, 0));
           __ addi(to, to, 1);
           __ subiw(count, count, 1);
@@ -2205,8 +2205,8 @@ class StubGenerator: public StubCodeGenerator {
           // Fallthrough
         case T_SHORT:
           // Two bytes misalignment happens only for byte and short (char) arrays.
-          __ test_bit(t0, to, 1);
-          __ beqz(t0, L_skip_align2);
+          __ test_bit(tmp_reg, to, 1);
+          __ beqz(tmp_reg, L_skip_align2);
           __ sh(value, Address(to, 0));
           __ addi(to, to, 2);
           __ subiw(count, count, 2 >> shift);
@@ -2214,8 +2214,8 @@ class StubGenerator: public StubCodeGenerator {
           // Fallthrough
         case T_INT:
           // Align to 8 bytes, we know we are 4 byte aligned to start.
-          __ test_bit(t0, to, 2);
-          __ beqz(t0, L_skip_align4);
+          __ test_bit(tmp_reg, to, 2);
+          __ beqz(tmp_reg, L_skip_align4);
           __ sw(value, Address(to, 0));
           __ addi(to, to, 4);
           __ subiw(count, count, 4 >> shift);
@@ -2241,69 +2241,51 @@ class StubGenerator: public StubCodeGenerator {
       __ fill_words(to, cnt_words, value);
     }
 
-    // Remaining count is less than 8 bytes and address is heapword aligned.
-    Label L_fill_1, L_fill_2, L_exit1;
+    // Handle copies less than 8 bytes.
+    // Address may not be heapword aligned.
+    Label L_fill_1, L_fill_2, L_exit;
+    __ bind(L_fill_elements);
     switch (t) {
       case T_BYTE:
-        __ test_bit(t0, count, 2);
-        __ beqz(t0, L_fill_2);
-        __ sw(value, Address(to, 0));
+        __ test_bit(tmp_reg, count, 2);
+        __ beqz(tmp_reg, L_fill_2);
+        __ sb(value, Address(to, 0));
+        __ sb(value, Address(to, 1));
+        __ sb(value, Address(to, 2));
+        __ sb(value, Address(to, 3));
         __ addi(to, to, 4);
+
         __ bind(L_fill_2);
-        __ test_bit(t0, count, 1);
-        __ beqz(t0, L_fill_1);
-        __ sh(value, Address(to, 0));
+        __ test_bit(tmp_reg, count, 1);
+        __ beqz(tmp_reg, L_fill_1);
+        __ sb(value, Address(to, 0));
+        __ sb(value, Address(to, 1));
         __ addi(to, to, 2);
+
         __ bind(L_fill_1);
-        __ test_bit(t0, count, 0);
-        __ beqz(t0, L_exit1);
+        __ test_bit(tmp_reg, count, 0);
+        __ beqz(tmp_reg, L_exit);
         __ sb(value, Address(to, 0));
         break;
       case T_SHORT:
-        __ test_bit(t0, count, 1);
-        __ beqz(t0, L_fill_2);
-        __ sw(value, Address(to, 0));
-        __ addi(to, to, 4);
-        __ bind(L_fill_2);
-        __ test_bit(t0, count, 0);
-        __ beqz(t0, L_exit1);
+        __ test_bit(tmp_reg, count, 1);
+        __ beqz(tmp_reg, L_fill_2);
         __ sh(value, Address(to, 0));
-        break;
-      case T_INT:
-        __ beqz(count, L_exit1);
-        __ sw(value, Address(to, 0));
-        break;
-      default: ShouldNotReachHere();
-    }
-    __ bind(L_exit1);
-    __ leave();
-    __ ret();
+        __ sh(value, Address(to, 2));
+        __ addi(to, to, 4);
 
-    // Handle copies less than 8 bytes.
-    Label L_loop1, L_loop2, L_exit2;
-    __ bind(L_fill_elements);
-    __ beqz(count, L_exit2);
-    switch (t) {
-      case T_BYTE:
-        __ bind(L_loop1);
-        __ sb(value, Address(to, 0));
-        __ addi(to, to, 1);
-        __ subiw(count, count, 1);
-        __ bnez(count, L_loop1);
-        break;
-      case T_SHORT:
-        __ bind(L_loop2);
+        __ bind(L_fill_2);
+        __ test_bit(tmp_reg, count, 0);
+        __ beqz(tmp_reg, L_exit);
         __ sh(value, Address(to, 0));
-        __ addi(to, to, 2);
-        __ subiw(count, count, 2 >> shift);
-        __ bnez(count, L_loop2);
         break;
       case T_INT:
+        __ beqz(count, L_exit);
         __ sw(value, Address(to, 0));
         break;
       default: ShouldNotReachHere();
     }
-    __ bind(L_exit2);
+    __ bind(L_exit);
     __ leave();
     __ ret();
 

From 85af573cb6b5063c24f1efcbfb80bbace2883c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 27 May 2025 06:58:57 +0000
Subject: [PATCH 649/901] 8356848: Separate Metaspace and GC printing

Reviewed-by: stefank, stuefe
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |   4 +-
 .../share/gc/parallel/psParallelCompact.cpp   |   4 +-
 src/hotspot/share/gc/parallel/psScavenge.cpp  |   4 +-
 src/hotspot/share/gc/serial/serialHeap.cpp    |   8 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp | 111 ++++++++++--------
 src/hotspot/share/gc/shared/collectedHeap.hpp |  14 ++-
 src/hotspot/share/gc/z/zStat.cpp              |   4 +-
 .../share/memory/metaspace/metaspaceDCmd.cpp  |   2 +
 src/hotspot/share/runtime/java.cpp            |   2 +-
 .../share/services/diagnosticCommand.cpp      |   1 -
 src/hotspot/share/utilities/vmError.cpp       |  28 ++---
 .../ErrorHandling/ShowEventsOnCrashTest.java  |   3 +-
 .../serviceability/dcmd/gc/HeapInfoTest.java  |  12 +-
 .../serviceability/dcmd/vm/EventsTest.java    |   8 +-
 14 files changed, 117 insertions(+), 88 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 6ea4e4f197f..49ec55cf74a 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2413,7 +2413,7 @@ G1HeapPrinterMark::G1HeapPrinterMark(G1CollectedHeap* g1h) : _g1h(g1h), _heap_tr
   _g1h->rem_set()->print_periodic_summary_info("Before GC RS summary",
                                                _g1h->total_collections(),
                                                true /* show_thread_times */);
-  _g1h->print_heap_before_gc();
+  _g1h->print_before_gc();
   _g1h->print_heap_regions();
 }
 
@@ -2427,7 +2427,7 @@ G1HeapPrinterMark::~G1HeapPrinterMark() {
 
   _heap_transition.print();
   _g1h->print_heap_regions();
-  _g1h->print_heap_after_gc();
+  _g1h->print_after_gc();
   // Print NUMA statistics.
   _g1h->numa()->print_statistics();
 }
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index ed8df5d42f6..79a0b898a6b 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -664,7 +664,7 @@ void PSParallelCompact::pre_compact()
 
   CodeCache::on_gc_marking_cycle_start();
 
-  heap->print_heap_before_gc();
+  heap->print_before_gc();
   heap->trace_heap_before_gc(&_gc_tracer);
 
   // Fill in TLABs
@@ -1167,7 +1167,7 @@ bool PSParallelCompact::invoke_no_policy(bool clear_all_soft_refs) {
     Universe::verify("After GC");
   }
 
-  heap->print_heap_after_gc();
+  heap->print_after_gc();
   heap->trace_heap_after_gc(&_gc_tracer);
 
   AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index c8996ec6d9d..7729b3e2006 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -352,7 +352,7 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
     young_gen->eden_space()->accumulate_statistics();
   }
 
-  heap->print_heap_before_gc();
+  heap->print_before_gc();
   heap->trace_heap_before_gc(&_gc_tracer);
 
   assert(!NeverTenure || _tenuring_threshold == markWord::max_age + 1, "Sanity");
@@ -587,7 +587,7 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
     Universe::verify("After GC");
   }
 
-  heap->print_heap_after_gc();
+  heap->print_after_gc();
   heap->trace_heap_after_gc(&_gc_tracer);
 
   AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections());
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index fdc710af02f..fae6acfcda9 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -404,7 +404,7 @@ bool SerialHeap::do_young_collection(bool clear_soft_refs) {
   GCTraceTime(Info, gc) t("Pause Young", nullptr, gc_cause(), true);
   TraceCollectorStats tcs(_young_gen->counters());
   TraceMemoryManagerStats tmms(_young_gen->gc_manager(), gc_cause(), "end of minor GC");
-  print_heap_before_gc();
+  print_before_gc();
   const PreGenGCValues pre_gc_values = get_pre_gc_values();
 
   increment_total_collections(false);
@@ -440,7 +440,7 @@ bool SerialHeap::do_young_collection(bool clear_soft_refs) {
 
   gc_epilogue(false);
 
-  print_heap_after_gc();
+  print_after_gc();
 
   return result;
 }
@@ -623,7 +623,7 @@ void SerialHeap::do_full_collection(bool clear_all_soft_refs) {
   TraceCollectorStats tcs(_old_gen->counters());
   TraceMemoryManagerStats tmms(_old_gen->gc_manager(), gc_cause(), "end of major GC");
   const PreGenGCValues pre_gc_values = get_pre_gc_values();
-  print_heap_before_gc();
+  print_before_gc();
 
   increment_total_collections(true);
   const bool should_verify = total_collections() >= VerifyGCStartAt;
@@ -683,7 +683,7 @@ void SerialHeap::do_full_collection(bool clear_all_soft_refs) {
   // the initial value for "complete" flag.
   gc_epilogue(true);
 
-  print_heap_after_gc();
+  print_after_gc();
 
   if (should_verify && VerifyAfterGC) {
     Universe::verify("After GC");
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 11fb3e2d40b..6628df66cad 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -67,33 +67,24 @@ Klass* CollectedHeap::_filler_object_klass = nullptr;
 size_t CollectedHeap::_filler_array_max_size = 0;
 size_t CollectedHeap::_stack_chunk_max_size = 0;
 
-class GCMessage : public FormatBuffer<1024> {
- public:
-  bool is_before;
-};
+class GCLogMessage : public FormatBuffer<512> {};
 
 template <>
-void EventLogBase<GCMessage>::print(outputStream* st, GCMessage& m) {
-  st->print_cr("GC heap %s", m.is_before ? "before" : "after");
+void EventLogBase<GCLogMessage>::print(outputStream* st, GCLogMessage& m) {
   st->print_raw(m);
 }
 
-class GCHeapLog : public EventLogBase<GCMessage> {
- private:
-  void log_heap(CollectedHeap* heap, bool before);
+class GCLog : public EventLogBase<GCLogMessage> {
+ protected:
+  virtual void log_usage(const CollectedHeap* heap, outputStream* st) const = 0;
 
  public:
-  GCHeapLog() : EventLogBase<GCMessage>("GC Heap History", "gc") {}
+  GCLog(const char* name, const char* handle) : EventLogBase<GCLogMessage>(name, handle) {}
 
-  void log_heap_before(CollectedHeap* heap) {
-    log_heap(heap, true);
-  }
-  void log_heap_after(CollectedHeap* heap) {
-    log_heap(heap, false);
-  }
+  void log_gc(const CollectedHeap* heap, GCWhen::Type when);
 };
 
-void GCHeapLog::log_heap(CollectedHeap* heap, bool before) {
+void GCLog::log_gc(const CollectedHeap* heap, GCWhen::Type when) {
   if (!should_log()) {
     return;
   }
@@ -101,25 +92,39 @@ void GCHeapLog::log_heap(CollectedHeap* heap, bool before) {
   double timestamp = fetch_timestamp();
   MutexLocker ml(&_mutex, Mutex::_no_safepoint_check_flag);
   int index = compute_log_index();
-  _records[index].thread = nullptr; // Its the GC thread so it's not that interesting.
+  _records[index].thread = nullptr; // It's the GC thread so it's not that interesting.
   _records[index].timestamp = timestamp;
-  _records[index].data.is_before = before;
   stringStream st(_records[index].data.buffer(), _records[index].data.size());
 
-  st.print_cr("{Heap %s GC invocations=%u (full %u):",
-                 before ? "before" : "after",
-                 heap->total_collections(),
-                 heap->total_full_collections());
-
+  st.print("{");
   {
+    heap->print_invocation_on(&st, _handle, when);
     StreamIndentor si(&st, 1);
-    heap->print_heap_on(&st);
-    MetaspaceUtils::print_on(&st);
+    log_usage(heap, &st);
   }
-
   st.print_cr("}");
 }
 
+class GCHeapLog : public GCLog {
+ private:
+  void log_usage(const CollectedHeap* heap, outputStream* st) const override {
+    heap->print_heap_on(st);
+  }
+
+ public:
+  GCHeapLog() : GCLog("GC Heap Usage History", "heap") {}
+};
+
+class GCMetaspaceLog : public GCLog {
+ private:
+  void log_usage(const CollectedHeap* heap, outputStream* st) const override {
+    MetaspaceUtils::print_on(st);
+  }
+
+ public:
+  GCMetaspaceLog() : GCLog("Metaspace Usage History", "metaspace") {}
+};
+
 ParallelObjectIterator::ParallelObjectIterator(uint thread_num) :
   _impl(Universe::heap()->parallel_object_iterator(thread_num))
 {}
@@ -163,38 +168,46 @@ bool CollectedHeap::contains_null(const oop* p) const {
   return *p == nullptr;
 }
 
-void CollectedHeap::print_heap_before_gc() {
-  LogTarget(Debug, gc, heap) lt;
-  if (lt.is_enabled()) {
-    LogStream ls(lt);
-    ls.print_cr("Heap before GC invocations=%u (full %u):", total_collections(), total_full_collections());
+void CollectedHeap::print_invocation_on(outputStream* st, const char* type, GCWhen::Type when) const {
+  st->print_cr("%s %s invocations=%u (full %u):", type, GCWhen::to_string(when), total_collections(), total_full_collections());
+}
 
+void CollectedHeap::print_relative_to_gc(GCWhen::Type when) const {
+  // Print heap information
+  LogTarget(Debug, gc, heap) lt_heap;
+  if (lt_heap.is_enabled()) {
+    LogStream ls(lt_heap);
+    print_invocation_on(&ls, "Heap", when);
     StreamIndentor si(&ls, 1);
     print_heap_on(&ls);
-    MetaspaceUtils::print_on(&ls);
   }
 
-  if (_gc_heap_log != nullptr) {
-    _gc_heap_log->log_heap_before(this);
+  if (_heap_log != nullptr) {
+    _heap_log->log_gc(this, when);
   }
-}
-
-void CollectedHeap::print_heap_after_gc() {
-  LogTarget(Debug, gc, heap) lt;
-  if (lt.is_enabled()) {
-    LogStream ls(lt);
-    ls.print_cr("Heap after GC invocations=%u (full %u):", total_collections(), total_full_collections());
 
-    StreamIndentor si(&ls, 1);
-    print_heap_on(&ls);
+  // Print metaspace information
+  LogTarget(Debug, gc, metaspace) lt_metaspace;
+  if (lt_metaspace.is_enabled()) {
+    LogStream ls(lt_metaspace);
+    print_invocation_on(&ls, "Metaspace", when);
+    StreamIndentor indentor(&ls, 1);
     MetaspaceUtils::print_on(&ls);
   }
 
-  if (_gc_heap_log != nullptr) {
-    _gc_heap_log->log_heap_after(this);
+  if (_metaspace_log != nullptr) {
+    _metaspace_log->log_gc(this, when);
   }
 }
 
+void CollectedHeap::print_before_gc() const {
+  print_relative_to_gc(GCWhen::BeforeGC);
+}
+
+void CollectedHeap::print_after_gc() const {
+  print_relative_to_gc(GCWhen::AfterGC);
+}
+
 void CollectedHeap::print() const {
   print_heap_on(tty);
   print_gc_on(tty);
@@ -301,9 +314,11 @@ CollectedHeap::CollectedHeap() :
 
   // Create the ring log
   if (LogEvents) {
-    _gc_heap_log = new GCHeapLog();
+    _metaspace_log = new GCMetaspaceLog();
+    _heap_log = new GCHeapLog();
   } else {
-    _gc_heap_log = nullptr;
+    _metaspace_log = nullptr;
+    _heap_log = nullptr;
   }
 }
 
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 8bf47d6b0bb..30ee35a34a7 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -48,9 +48,10 @@
 
 class GCHeapLog;
 class GCHeapSummary;
+class GCMemoryManager;
+class GCMetaspaceLog;
 class GCTimer;
 class GCTracer;
-class GCMemoryManager;
 class MemoryPool;
 class MetaspaceSummary;
 class ReservedHeapSpace;
@@ -94,7 +95,8 @@ class CollectedHeap : public CHeapObj<mtGC> {
   friend class MemAllocator;
 
  private:
-  GCHeapLog* _gc_heap_log;
+  GCHeapLog*      _heap_log;
+  GCMetaspaceLog* _metaspace_log;
 
   // Historic gc information
   size_t _capacity_at_last_gc;
@@ -420,6 +422,8 @@ class CollectedHeap : public CHeapObj<mtGC> {
 
   virtual void initialize_serviceability() = 0;
 
+  void print_relative_to_gc(GCWhen::Type when) const;
+
  public:
   void pre_full_gc_dump(GCTimer* timer);
   void post_full_gc_dump(GCTimer* timer);
@@ -435,6 +439,8 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // explicitly checks if the given memory location contains a null value.
   virtual bool contains_null(const oop* p) const;
 
+  void print_invocation_on(outputStream* st, const char* type, GCWhen::Type when) const;
+
   // Print heap information.
   virtual void print_heap_on(outputStream* st) const = 0;
 
@@ -454,8 +460,8 @@ class CollectedHeap : public CHeapObj<mtGC> {
   // Default implementation does nothing.
   virtual void print_tracing_info() const = 0;
 
-  void print_heap_before_gc();
-  void print_heap_after_gc();
+  void print_before_gc() const;
+  void print_after_gc() const;
 
   // Registering and unregistering an nmethod (compiled code) with the heap.
   virtual void register_nmethod(nmethod* nm) = 0;
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index a6b2bd0930d..45c77e68f0e 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -701,7 +701,7 @@ ZGenerationTracer* ZStatPhaseGeneration::jfr_tracer() const {
 }
 
 void ZStatPhaseGeneration::register_start(ConcurrentGCTimer* timer, const Ticks& start) const {
-  ZCollectedHeap::heap()->print_heap_before_gc();
+  ZCollectedHeap::heap()->print_before_gc();
 
   jfr_tracer()->report_start(start);
 
@@ -716,7 +716,7 @@ void ZStatPhaseGeneration::register_end(ConcurrentGCTimer* timer, const Ticks& s
 
   jfr_tracer()->report_end(end);
 
-  ZCollectedHeap::heap()->print_heap_after_gc();
+  ZCollectedHeap::heap()->print_after_gc();
 
   const Tickspan duration = end - start;
   ZStatDurationSample(_sampler, duration);
diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
index 0ab83b44a76..e6943b8e2d3 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
@@ -58,6 +58,8 @@ MetaspaceDCmd::MetaspaceDCmd(outputStream* output, bool heap) :
 }
 
 void MetaspaceDCmd::execute(DCmdSource source, TRAPS) {
+  MetaspaceUtils::print_on(output());
+
   // Parse scale value.
   const char* scale_value = _scale.value();
   size_t scale = 0;
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 1079212a843..06c5fbce756 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -480,7 +480,7 @@ void before_exit(JavaThread* thread, bool halt) {
   Universe::heap()->stop();
 
   // Print GC/heap related information.
-  Log(gc, heap, exit) log;
+  Log(gc, exit) log;
   if (log.is_info()) {
     LogStream ls_info(log.info());
     Universe::print_on(&ls_info);
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 17906520f5c..26a762fa109 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -413,7 +413,6 @@ void RunFinalizationDCmd::execute(DCmdSource source, TRAPS) {
 void HeapInfoDCmd::execute(DCmdSource source, TRAPS) {
   MutexLocker hl(THREAD, Heap_lock);
   Universe::heap()->print_heap_on(output());
-  MetaspaceUtils::print_on(output());
 }
 
 void FinalizerInfoDCmd::execute(DCmdSource source, TRAPS) {
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 24d649e1f11..7d1b17d5deb 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -1203,7 +1203,6 @@ void VMError::report(outputStream* st, bool _verbose) {
       st->print_cr("Heap:");
       StreamIndentor si(st, 1);
       Universe::heap()->print_heap_on(st);
-      MetaspaceUtils::print_on(st);
       st->cr();
     }
 
@@ -1220,6 +1219,7 @@ void VMError::report(outputStream* st, bool _verbose) {
 
   STEP_IF("printing metaspace information", _verbose && Universe::is_fully_initialized())
     st->print_cr("Metaspace:");
+    MetaspaceUtils::print_on(st);
     MetaspaceUtils::print_basic_report(st, 0);
 
   STEP_IF("printing code cache information", _verbose && Universe::is_fully_initialized())
@@ -1391,38 +1391,34 @@ void VMError::print_vm_info(outputStream* st) {
   }
 #endif
 
-  // Take heap lock over both heap and GC printing so that information is
-  // consistent.
-  {
+  // Take heap lock over heap, GC and metaspace printing so that information
+  // is consistent.
+  if (Universe::is_fully_initialized()) {
     MutexLocker ml(Heap_lock);
 
     // STEP("printing heap information")
 
-    if (Universe::is_fully_initialized()) {
-      GCLogPrecious::print_on_error(st);
+    GCLogPrecious::print_on_error(st);
 
+    {
       st->print_cr("Heap:");
       StreamIndentor si(st, 1);
       Universe::heap()->print_heap_on(st);
-      MetaspaceUtils::print_on(st);
       st->cr();
     }
 
     // STEP("printing GC information")
 
-    if (Universe::is_fully_initialized()) {
-      Universe::heap()->print_gc_on(st);
-      st->cr();
+    Universe::heap()->print_gc_on(st);
+    st->cr();
 
-      st->print_cr("Polling page: " PTR_FORMAT, p2i(SafepointMechanism::get_polling_page()));
-      st->cr();
-    }
-  }
+    st->print_cr("Polling page: " PTR_FORMAT, p2i(SafepointMechanism::get_polling_page()));
+    st->cr();
 
-  // STEP("printing metaspace information")
+    // STEP("printing metaspace information")
 
-  if (Universe::is_fully_initialized()) {
     st->print_cr("Metaspace:");
+    MetaspaceUtils::print_on(st);
     MetaspaceUtils::print_basic_report(st, 0);
   }
 
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java
index e2c1e51c338..0c8646a4345 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ShowEventsOnCrashTest.java
@@ -60,7 +60,8 @@ public static void main(String[] args) throws Exception {
         // Pattern match the hs_err_pid file.
         Pattern[] patterns = new Pattern[] {
             Pattern.compile("Compilation events \\([0-9]* events\\):"),
-            Pattern.compile("GC Heap History \\([0-9]* events\\):"),
+            Pattern.compile("GC Heap Usage History \\([0-9]* events\\):"),
+            Pattern.compile("Metaspace Usage History \\([0-9]* events\\):"),
             Pattern.compile("Dll operation events \\([0-9]* events\\):"),
             Pattern.compile("Deoptimization events \\([0-9]* events\\):"),
             Pattern.compile("Classes loaded \\([0-9]* events\\):"),
diff --git a/test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.java
index b2297552b35..bc8b2b80645 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapInfoTest.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
@@ -44,7 +44,15 @@ public class HeapInfoTest {
     public void run(CommandExecutor executor) {
         String cmd = "GC.heap_info";
         OutputAnalyzer output = executor.execute(cmd);
-        output.shouldContain("Metaspace");
+
+        // All GCs have different strategies for printing similar information,
+        // which makes it hard to grep for anything substantial. However, all
+        // GCs print the string "used", so lets check for that to see if the
+        // jcmd printed something at all.
+        output.shouldContain("used");
+
+        output.shouldNotContain("Unknown diagnostic command");
+        output.shouldHaveExitValue(0);
     }
 
     @Test
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.java
index 9828a8990e0..5990419b45c 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.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
@@ -52,7 +52,8 @@ public void run_all(CommandExecutor executor) {
         // Those are always printed even if the corresponding event log is empty.
         output.stdoutShouldMatch(buildHeaderPattern("Events"));
         output.stdoutShouldMatch(buildHeaderPattern("Compilation"));
-        output.stdoutShouldMatch(buildHeaderPattern("GC Heap History"));
+        output.stdoutShouldMatch(buildHeaderPattern("GC Heap Usage History"));
+        output.stdoutShouldMatch(buildHeaderPattern("Metaspace Usage History"));
         output.stdoutShouldMatch(buildHeaderPattern("Deoptimization"));
         output.stdoutShouldMatch(buildHeaderPattern("Classes unloaded"));
     }
@@ -64,7 +65,8 @@ public void run_selected(CommandExecutor executor) {
 
         output.stdoutShouldNotMatch(buildHeaderPattern("Events"));
         output.stdoutShouldNotMatch(buildHeaderPattern("Compilation"));
-        output.stdoutShouldNotMatch(buildHeaderPattern("GC Heap History"));
+        output.stdoutShouldNotMatch(buildHeaderPattern("GC Heap Usage History"));
+        output.stdoutShouldNotMatch(buildHeaderPattern("Metaspace Usage History"));
         output.stdoutShouldNotMatch(buildHeaderPattern("Classes unloaded"));
     }
 

From 7bc315fa6ac4e539e52b077f15c061516e208278 Mon Sep 17 00:00:00 2001
From: Bhavana Kilambi <bkilambi@openjdk.org>
Date: Tue, 27 May 2025 08:17:02 +0000
Subject: [PATCH 650/901] 8355585: Aarch64: Add aarch64 backend for Float16
 vector operations

Reviewed-by: epeter, haosun, xgong, aph
---
 src/hotspot/cpu/aarch64/aarch64.ad            |   10 +
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |  209 ++-
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  |  152 +-
 src/hotspot/cpu/aarch64/assembler_aarch64.cpp |   13 +
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |   66 +-
 src/hotspot/share/adlc/dfa.cpp                |    4 +-
 test/hotspot/gtest/aarch64/aarch64-asmtest.py |   48 +-
 test/hotspot/gtest/aarch64/asmtest.out.h      | 1231 +++++++++--------
 .../TestFloat16VectorOperations.java          |   73 +-
 9 files changed, 1116 insertions(+), 690 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 1b128f2a0ce..690210a8c40 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -8236,6 +8236,16 @@ instruct castLL_checked(iRegL dst, rFlagsReg cr)
   ins_pipe(pipe_slow);
 %}
 
+instruct castHH(vRegF 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(vRegF dst)
 %{
   match(Set dst (CastFF dst));
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index c7a0fc5724b..b4e6d79347f 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2024, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 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
@@ -225,6 +225,26 @@ source %{
           return false;
         }
         break;
+      case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
+      case Op_DivVHF:
+      case Op_MinVHF:
+      case Op_MaxVHF:
+      case Op_SqrtVHF:
+        // FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
+        // Only the Neon instructions need this check. SVE supports half-precision floats
+        // by default.
+        if (UseSVE == 0 && !is_feat_fp16_supported()) {
+          return false;
+        }
+        break;
+      case Op_FmaVHF:
+        // UseFMA flag needs to be checked along with FEAT_FP16
+        if (!UseFMA || (UseSVE == 0 && !is_feat_fp16_supported())) {
+          return false;
+        }
+        break;
       default:
         break;
     }
@@ -270,6 +290,19 @@ source %{
       case Op_StoreVectorScatter:
         opcode = Op_StoreVectorScatterMasked;
         break;
+      // Currently, the masked versions of the following 8 Float16 operations are disabled.
+      // When the support for Float16 vector classes is added in VectorAPI and the masked
+      // Float16 IR can be generated, these masked operations will be enabled and relevant
+      // backend support added.
+      case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
+      case Op_DivVHF:
+      case Op_MaxVHF:
+      case Op_MinVHF:
+      case Op_SqrtVHF:
+      case Op_FmaVHF:
+        return false;
       default:
         break;
     }
@@ -583,6 +616,22 @@ instruct vaddL(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vaddHF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (AddVHF src1 src2));
+  format %{ "vaddHF $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)) {
+      __ fadd($dst$$FloatRegister, get_arrangement(this),
+              $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      __ sve_fadd($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vaddF(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (AddVF src1 src2));
   format %{ "vaddF $dst, $src1, $src2" %}
@@ -807,6 +856,22 @@ instruct vsubL(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vsubHF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (SubVHF src1 src2));
+  format %{ "vsubHF $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)) {
+      __ fsub($dst$$FloatRegister, get_arrangement(this),
+              $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      __ sve_fsub($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vsubF(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (SubVF src1 src2));
   format %{ "vsubF $dst, $src1, $src2" %}
@@ -1004,6 +1069,22 @@ instruct vmulL_sve(vReg dst_src1, vReg src2) %{
 
 // vector mul - floating-point
 
+instruct vmulHF(vReg dst, vReg src1, vReg src2) %{
+  match(Set dst (MulVHF src1 src2));
+  format %{ "vmulHF $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)) {
+      __ fmul($dst$$FloatRegister, get_arrangement(this),
+              $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      __ sve_fmul($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vmulF(vReg dst, vReg src1, vReg src2) %{
   match(Set dst (MulVF src1 src2));
   format %{ "vmulF $dst, $src1, $src2" %}
@@ -1102,6 +1183,28 @@ instruct vmulD_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
 
 // vector float div
 
+instruct vdivHF_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst (DivVHF src1 src2));
+  format %{ "vdivHF_neon $dst, $src1, $src2" %}
+  ins_encode %{
+    __ fdiv($dst$$FloatRegister, get_arrangement(this),
+            $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vdivHF_sve(vReg dst_src1, vReg src2) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 (DivVHF dst_src1 src2));
+  format %{ "vdivHF_sve $dst_src1, $dst_src1, $src2" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    __ sve_fdiv($dst_src1$$FloatRegister, __ H, ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vdivF_neon(vReg dst, vReg src1, vReg src2) %{
   predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
   match(Set dst (DivVF src1 src2));
@@ -1991,6 +2094,21 @@ instruct vnegD_masked(vReg dst_src, pRegGov pg) %{
 
 // vector sqrt
 
+instruct vsqrtHF(vReg dst, vReg src) %{
+  match(Set dst (SqrtVHF src));
+  format %{ "vsqrtHF $dst, $src" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ fsqrt($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      __ sve_fsqrt($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct vsqrtF(vReg dst, vReg src) %{
   match(Set dst (SqrtVF src));
   format %{ "vsqrtF $dst, $src" %}
@@ -2069,7 +2187,7 @@ instruct vminL_sve(vReg dst_src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
-// vector min - B/S/I/F/D
+// vector min - B/S/I/HF/F/D
 
 instruct vmin_neon(vReg dst, vReg src1, vReg src2) %{
   predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
@@ -2110,6 +2228,29 @@ instruct vmin_sve(vReg dst_src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vmin_HF_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst (MinVHF src1 src2));
+  format %{ "vmin_HF_neon $dst, $src1, $src2\t# Half float" %}
+  ins_encode %{
+    __ fmin($dst$$FloatRegister, get_arrangement(this),
+            $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmin_HF_sve(vReg dst_src1, vReg src2) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 (MinVHF dst_src1 src2));
+  format %{ "vmin_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    __ sve_fmin($dst_src1$$FloatRegister, __ H,
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector min - predicated
 
 instruct vmin_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
@@ -2226,7 +2367,7 @@ instruct vmaxL_sve(vReg dst_src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
-// vector max - B/S/I/F/D
+// vector max - B/S/I/HF/F/D
 
 instruct vmax_neon(vReg dst, vReg src1, vReg src2) %{
   predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
@@ -2267,6 +2408,29 @@ instruct vmax_sve(vReg dst_src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct vmax_HF_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst (MaxVHF src1 src2));
+  format %{ "vmax_HF_neon $dst, $src1, $src2\t# Half float" %}
+  ins_encode %{
+    __ fmax($dst$$FloatRegister, get_arrangement(this),
+            $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vmax_HF_sve(vReg dst_src1, vReg src2) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 (MaxVHF dst_src1 src2));
+  format %{ "vmax_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    __ sve_fmax($dst_src1$$FloatRegister, __ H,
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector max - predicated
 
 instruct vmax_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
@@ -2413,8 +2577,9 @@ instruct vmla_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
 // dst_src1 = src2 * src3 + dst_src1
 
 instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
-  match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
-  match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVF  dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVD  dst_src1 (Binary src2 src3)));
   format %{ "vfmla $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -4613,6 +4778,23 @@ instruct replicateD(vReg dst, vRegD src) %{
   ins_pipe(pipe_slow);
 %}
 
+// Replicate a half-precision float value held in a floating point register
+instruct replicateHF(vReg dst, vRegF src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (Replicate src));
+  format %{ "replicateHF $dst, $src\t# replicate half-precision float" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ dup($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
+    } else { // length_in_bytes must be > 16 and SVE should be enabled
+      assert(UseSVE > 0, "must be sve");
+      __ sve_cpy($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // replicate from imm
 
 instruct replicateI_imm_le128b(vReg dst, immI con) %{
@@ -4681,6 +4863,23 @@ instruct replicateL_imm8_gt128b(vReg dst, immL8_shift8 con) %{
   ins_pipe(pipe_slow);
 %}
 
+// Replicate a 16-bit half precision float value
+instruct replicateHF_imm(vReg dst, immH con) %{
+  match(Set dst (Replicate con));
+  format %{ "replicateHF_imm $dst, $con\t# replicate immediate half-precision float" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    int imm = (int)($con$$constant) & 0xffff;
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ mov($dst$$FloatRegister, get_arrangement(this), imm);
+    } else { // length_in_bytes must be > 16 and SVE should be enabled
+      assert(UseSVE > 0, "must be sve");
+      __ sve_dup($dst$$FloatRegister, __ H, imm);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector insert --------------------------------
 
 // BYTE, SHORT, INT
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 171bc390545..cc07e0e4076 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2024, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 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
@@ -215,6 +215,26 @@ source %{
           return false;
         }
         break;
+      case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
+      case Op_DivVHF:
+      case Op_MinVHF:
+      case Op_MaxVHF:
+      case Op_SqrtVHF:
+        // FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
+        // Only the Neon instructions need this check. SVE supports half-precision floats
+        // by default.
+        if (UseSVE == 0 && !is_feat_fp16_supported()) {
+          return false;
+        }
+        break;
+      case Op_FmaVHF:
+        // UseFMA flag needs to be checked along with FEAT_FP16
+        if (!UseFMA || (UseSVE == 0 && !is_feat_fp16_supported())) {
+          return false;
+        }
+        break;
       default:
         break;
     }
@@ -260,6 +280,19 @@ source %{
       case Op_StoreVectorScatter:
         opcode = Op_StoreVectorScatterMasked;
         break;
+      // Currently, the masked versions of the following 8 Float16 operations are disabled.
+      // When the support for Float16 vector classes is added in VectorAPI and the masked
+      // Float16 IR can be generated, these masked operations will be enabled and relevant
+      // backend support added.
+      case Op_AddVHF:
+      case Op_SubVHF:
+      case Op_MulVHF:
+      case Op_DivVHF:
+      case Op_MaxVHF:
+      case Op_MinVHF:
+      case Op_SqrtVHF:
+      case Op_FmaVHF:
+        return false;
       default:
         break;
     }
@@ -508,12 +541,13 @@ dnl
 // ------------------------------ Vector add -----------------------------------
 
 // vector add
-BINARY_OP(vaddB, AddVB, addv, sve_add,  B)
-BINARY_OP(vaddS, AddVS, addv, sve_add,  H)
-BINARY_OP(vaddI, AddVI, addv, sve_add,  S)
-BINARY_OP(vaddL, AddVL, addv, sve_add,  D)
-BINARY_OP(vaddF, AddVF, fadd, sve_fadd, S)
-BINARY_OP(vaddD, AddVD, fadd, sve_fadd, D)
+BINARY_OP(vaddB,  AddVB,  addv, sve_add,  B)
+BINARY_OP(vaddS,  AddVS,  addv, sve_add,  H)
+BINARY_OP(vaddI,  AddVI,  addv, sve_add,  S)
+BINARY_OP(vaddL,  AddVL,  addv, sve_add,  D)
+BINARY_OP(vaddHF, AddVHF, fadd, sve_fadd, H)
+BINARY_OP(vaddF,  AddVF,  fadd, sve_fadd, S)
+BINARY_OP(vaddD,  AddVD,  fadd, sve_fadd, D)
 
 // vector add - predicated
 BINARY_OP_PREDICATE(vaddB, AddVB, sve_add,  B)
@@ -532,12 +566,13 @@ VADD_IMM(L, immLAddSubV, D)
 // ------------------------------ Vector sub -----------------------------------
 
 // vector sub
-BINARY_OP(vsubB, SubVB, subv, sve_sub,  B)
-BINARY_OP(vsubS, SubVS, subv, sve_sub,  H)
-BINARY_OP(vsubI, SubVI, subv, sve_sub,  S)
-BINARY_OP(vsubL, SubVL, subv, sve_sub,  D)
-BINARY_OP(vsubF, SubVF, fsub, sve_fsub, S)
-BINARY_OP(vsubD, SubVD, fsub, sve_fsub, D)
+BINARY_OP(vsubB,  SubVB,  subv, sve_sub,  B)
+BINARY_OP(vsubS,  SubVS,  subv, sve_sub,  H)
+BINARY_OP(vsubI,  SubVI,  subv, sve_sub,  S)
+BINARY_OP(vsubL,  SubVL,  subv, sve_sub,  D)
+BINARY_OP(vsubHF, SubVHF, fsub, sve_fsub, H)
+BINARY_OP(vsubF,  SubVF,  fsub, sve_fsub, S)
+BINARY_OP(vsubD,  SubVD,  fsub, sve_fsub, D)
 
 // vector sub - predicated
 BINARY_OP_PREDICATE(vsubB, SubVB, sve_sub,  B)
@@ -612,8 +647,9 @@ instruct vmulL_sve(vReg dst_src1, vReg src2) %{
 %}
 
 // vector mul - floating-point
-BINARY_OP(vmulF, MulVF, fmul, sve_fmul, S)
-BINARY_OP(vmulD, MulVD, fmul, sve_fmul, D)
+BINARY_OP(vmulHF, MulVHF, fmul, sve_fmul, H)
+BINARY_OP(vmulF,  MulVF,  fmul, sve_fmul, S)
+BINARY_OP(vmulD,  MulVD,  fmul, sve_fmul, D)
 
 // vector mul - predicated
 BINARY_OP_PREDICATE(vmulB, MulVB, sve_mul,  B)
@@ -626,8 +662,9 @@ BINARY_OP_PREDICATE(vmulD, MulVD, sve_fmul, D)
 // ------------------------------ Vector float div -----------------------------
 
 // vector float div
-BINARY_OP_NEON_SVE_PAIRWISE(vdivF, DivVF, fdiv, sve_fdiv, S)
-BINARY_OP_NEON_SVE_PAIRWISE(vdivD, DivVD, fdiv, sve_fdiv, D)
+BINARY_OP_NEON_SVE_PAIRWISE(vdivHF, DivVHF, fdiv, sve_fdiv, H)
+BINARY_OP_NEON_SVE_PAIRWISE(vdivF,  DivVF,  fdiv, sve_fdiv, S)
+BINARY_OP_NEON_SVE_PAIRWISE(vdivD,  DivVD,  fdiv, sve_fdiv, D)
 
 // vector float div - predicated
 BINARY_OP_PREDICATE(vdivF, DivVF, sve_fdiv, S)
@@ -1016,8 +1053,9 @@ UNARY_OP_PREDICATE_WITH_SIZE(vnegD, NegVD, sve_fneg, D)
 // ------------------------------ Vector sqrt ----------------------------------
 
 // vector sqrt
-UNARY_OP(vsqrtF, SqrtVF, fsqrt, sve_fsqrt, S)
-UNARY_OP(vsqrtD, SqrtVD, fsqrt, sve_fsqrt, D)
+UNARY_OP(vsqrtHF, SqrtVHF, fsqrt, sve_fsqrt, H)
+UNARY_OP(vsqrtF,  SqrtVF,  fsqrt, sve_fsqrt, S)
+UNARY_OP(vsqrtD,  SqrtVD,  fsqrt, sve_fsqrt, D)
 
 // vector sqrt - predicated
 UNARY_OP_PREDICATE_WITH_SIZE(vsqrtF, SqrtVF, sve_fsqrt, S)
@@ -1074,6 +1112,20 @@ instruct v$1_neon(vReg dst, vReg src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}')dnl
 dnl
+dnl VMINMAX_HF_NEON($1,   $2,      $3     )
+dnl VMINMAX_HF_NEON(type, op_name, insn_fp)
+define(`VMINMAX_HF_NEON', `
+instruct v$1_HF_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst ($2 src1 src2));
+  format %{ "v$1_HF_neon $dst, $src1, $src2\t# Half float" %}
+  ins_encode %{
+    __ $3($dst$$FloatRegister, get_arrangement(this),
+            $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
 dnl VMINMAX_SVE($1,   $2,      $3,      $4           )
 dnl VMINMAX_SVE(type, op_name, insn_fp, insn_integral)
 define(`VMINMAX_SVE', `
@@ -1097,6 +1149,21 @@ instruct v$1_sve(vReg dst_src1, vReg src2) %{
   ins_pipe(pipe_slow);
 %}')dnl
 dnl
+dnl VMINMAX_HF_SVE($1,   $2,      $3     )
+dnl VMINMAX_HF_SVE(type, op_name, insn_fp)
+define(`VMINMAX_HF_SVE', `
+instruct v$1_HF_sve(vReg dst_src1, vReg src2) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 ($2 dst_src1 src2));
+  format %{ "v$1_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    __ $3($dst_src1$$FloatRegister, __ H,
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
 dnl VMINMAX_PREDICATE($1,   $2,      $3,      $4           )
 dnl VMINMAX_PREDICATE(type, op_name, insn_fp, insn_integral)
 define(`VMINMAX_PREDICATE', `
@@ -1175,9 +1242,11 @@ dnl
 VMINMAX_L_NEON(min, MinV)
 VMINMAX_L_SVE(min, MinV, sve_smin)
 
-// vector min - B/S/I/F/D
+// vector min - B/S/I/HF/F/D
 VMINMAX_NEON(min, MinV, fmin, minv)
 VMINMAX_SVE(min, MinV, sve_fmin, sve_smin)
+VMINMAX_HF_NEON(min, MinVHF, fmin)
+VMINMAX_HF_SVE(min, MinVHF, sve_fmin)
 
 // vector min - predicated
 VMINMAX_PREDICATE(min, MinV, sve_fmin, sve_smin)
@@ -1199,9 +1268,11 @@ VUMINMAX_PREDICATE(umin, UMinV, sve_umin)
 VMINMAX_L_NEON(max, MaxV)
 VMINMAX_L_SVE(max, MaxV, sve_smax)
 
-// vector max - B/S/I/F/D
+// vector max - B/S/I/HF/F/D
 VMINMAX_NEON(max, MaxV, fmax, maxv)
 VMINMAX_SVE(max, MaxV, sve_fmax, sve_smax)
+VMINMAX_HF_NEON(max, MaxVHF, fmax)
+VMINMAX_HF_SVE(max, MaxVHF, sve_fmax)
 
 // vector max - predicated
 VMINMAX_PREDICATE(max, MaxV, sve_fmax, sve_smax)
@@ -1273,8 +1344,9 @@ instruct vmla_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
 // dst_src1 = src2 * src3 + dst_src1
 
 instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
-  match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
-  match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVF  dst_src1 (Binary src2 src3)));
+  match(Set dst_src1 (FmaVD  dst_src1 (Binary src2 src3)));
   format %{ "vfmla $dst_src1, $src2, $src3" %}
   ins_encode %{
     assert(UseFMA, "Needs FMA instructions support.");
@@ -2938,6 +3010,23 @@ REPLICATE_INT(L, iRegL)
 REPLICATE_FP(F, S, T_FLOAT )
 REPLICATE_FP(D, D, T_DOUBLE)
 
+// Replicate a half-precision float value held in a floating point register
+instruct replicateHF(vReg dst, vRegF src) %{
+  predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
+  match(Set dst (Replicate src));
+  format %{ "replicateHF $dst, $src\t# replicate half-precision float" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ dup($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
+    } else { // length_in_bytes must be > 16 and SVE should be enabled
+      assert(UseSVE > 0, "must be sve");
+      __ sve_cpy($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // replicate from imm
 
 instruct replicateI_imm_le128b(vReg dst, immI con) %{
@@ -3006,6 +3095,23 @@ instruct replicateL_imm8_gt128b(vReg dst, immL8_shift8 con) %{
   ins_pipe(pipe_slow);
 %}
 
+// Replicate a 16-bit half precision float value
+instruct replicateHF_imm(vReg dst, immH con) %{
+  match(Set dst (Replicate con));
+  format %{ "replicateHF_imm $dst, $con\t# replicate immediate half-precision float" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    int imm = (int)($con$$constant) & 0xffff;
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ mov($dst$$FloatRegister, get_arrangement(this), imm);
+    } else { // length_in_bytes must be > 16 and SVE should be enabled
+      assert(UseSVE > 0, "must be sve");
+      __ sve_dup($dst$$FloatRegister, __ H, imm);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector insert --------------------------------
 
 // BYTE, SHORT, INT
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
index ec4f2a0d6c3..5e5d6c16b45 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
@@ -240,6 +240,19 @@ void Assembler::add_sub_immediate(Instruction_aarch64 &current_insn,
   srf(Rn, 5);
 }
 
+// This method is used to generate Advanced SIMD data processing instructions
+void Assembler::adv_simd_three_same(Instruction_aarch64 &current_insn, FloatRegister Vd,
+                                    SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm,
+                                    int op1, int op2, int op3) {
+  assert(T == T4H || T == T8H || T == T2S || T == T4S || T == T2D, "invalid arrangement");
+  int op22 = (T == T2S || T == T4S) ? 0b0 : 0b1;
+  int op21 = (T == T4H || T == T8H) ? 0b0 : 0b1;
+  int op14 = (T == T4H || T == T8H) ? 0b00 : 0b11;
+  f(0, 31), f((int)T & 1, 30), f(op1, 29), f(0b01110, 28, 24), f(op2, 23);
+  f(op22, 22); f(op21, 21), rf(Vm, 16), f(op14, 15, 14), f(op3, 13, 10),
+  rf(Vn, 5), rf(Vd, 0);
+}
+
 #undef f
 #undef sf
 #undef rf
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index aee4a30b649..573b451261f 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -2743,26 +2743,26 @@ template<typename R, typename... Rx>
 
 #undef INSN
 
-// Advanced SIMD three same
-#define INSN(NAME, op1, op2, op3)                                                       \
-  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
-    starti;                                                                             \
-    assert(T == T2S || T == T4S || T == T2D, "invalid arrangement");                    \
-    f(0, 31), f((int)T & 1, 30), f(op1, 29), f(0b01110, 28, 24), f(op2, 23);            \
-    f(T==T2D ? 1:0, 22); f(1, 21), rf(Vm, 16), f(op3, 15, 10), rf(Vn, 5), rf(Vd, 0);    \
-  }
-
-  INSN(fabd, 1, 1, 0b110101);
-  INSN(fadd, 0, 0, 0b110101);
-  INSN(fdiv, 1, 0, 0b111111);
-  INSN(faddp, 1, 0, 0b110101);
-  INSN(fmul, 1, 0, 0b110111);
-  INSN(fsub, 0, 1, 0b110101);
-  INSN(fmla, 0, 0, 0b110011);
-  INSN(fmls, 0, 1, 0b110011);
-  INSN(fmax, 0, 0, 0b111101);
-  INSN(fmin, 0, 1, 0b111101);
-  INSN(facgt, 1, 1, 0b111011);
+  // Advanced SIMD three same
+  void adv_simd_three_same(Instruction_aarch64 &current_insn, FloatRegister Vd,
+                           SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm,
+                           int op1, int op2, int op3);
+#define INSN(NAME, op1, op2, op3)                                                             \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) {       \
+    starti;                                                                                   \
+    adv_simd_three_same(current_insn, Vd, T, Vn, Vm, op1, op2, op3);                          \
+  }
+  INSN(fabd,  1, 1, 0b0101);
+  INSN(fadd,  0, 0, 0b0101);
+  INSN(fdiv,  1, 0, 0b1111);
+  INSN(faddp, 1, 0, 0b0101);
+  INSN(fmul,  1, 0, 0b0111);
+  INSN(fsub,  0, 1, 0b0101);
+  INSN(fmla,  0, 0, 0b0011);
+  INSN(fmls,  0, 1, 0b0011);
+  INSN(fmax,  0, 0, 0b1101);
+  INSN(fmin,  0, 1, 0b1101);
+  INSN(facgt, 1, 1, 0b1011);
 
 #undef INSN
 
@@ -3262,18 +3262,24 @@ template<typename R, typename... Rx>
   // parameter "tmask" is a 2-bit mask used to indicate which bits in the size
   // field are determined by the SIMD_Arrangement. The bit of "tmask" should be
   // set to 1 if corresponding bit marked as "x" in the ArmARM.
-#define INSN(NAME, U, size, tmask, opcode)                                          \
-  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {               \
-       starti;                                                                      \
-       assert((ASSERTION), MSG);                                                    \
-       f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24);                   \
-       f(size | ((int)(T >> 1) & tmask), 23, 22), f(0b10000, 21, 17);               \
-       f(opcode, 16, 12), f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0);                    \
+#define INSN(NAME, U, size, tmask, opcode)                                      \
+  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {           \
+    starti;                                                                     \
+    assert((ASSERTION), MSG);                                                   \
+    int op22 = (int)(T >> 1) & tmask;                                           \
+    int op19 = 0b00;                                                            \
+    if (tmask == 0b01 && (T == T4H || T == T8H)) {                              \
+      op22 = 0b1;                                                               \
+      op19 = 0b11;                                                              \
+    }                                                                           \
+    f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24);                  \
+    f(size | op22, 23, 22), f(1, 21), f(op19, 20, 19), f(0b00, 18, 17);         \
+    f(opcode, 16, 12), f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0);                   \
  }
 
 #define MSG "invalid arrangement"
 
-#define ASSERTION (T == T2S || T == T4S || T == T2D)
+#define ASSERTION (T == T4H || T == T8H || T == T2S || T == T4S || T == T2D)
   INSN(fsqrt,  1, 0b10, 0b01, 0b11111);
   INSN(fabs,   0, 0b10, 0b01, 0b01111);
   INSN(fneg,   1, 0b10, 0b01, 0b01111);
@@ -3400,7 +3406,7 @@ template<typename R, typename... Rx>
 #define INSN(NAME, opcode)                                                             \
   void NAME(FloatRegister Zd, SIMD_RegVariant T, FloatRegister Zn, FloatRegister Zm) { \
     starti;                                                                            \
-    assert(T == S || T == D, "invalid register variant");                              \
+    assert(T == H || T == S || T == D, "invalid register variant");                    \
     f(0b01100101, 31, 24), f(T, 23, 22), f(0, 21),                                     \
     rf(Zm, 16), f(0, 15, 13), f(opcode, 12, 10), rf(Zn, 5), rf(Zd, 0);                 \
   }
@@ -3485,7 +3491,7 @@ template<typename R, typename... Rx>
 // SVE floating-point arithmetic - predicate
 #define INSN(NAME, op1, op2)                                                                          \
   void NAME(FloatRegister Zd_or_Zdn_or_Vd, SIMD_RegVariant T, PRegister Pg, FloatRegister Zn_or_Zm) { \
-    assert(T == S || T == D, "invalid register variant");                                             \
+    assert(T == H || T == S || T == D, "invalid register variant");                                   \
     sve_predicate_reg_insn(op1, op2, Zd_or_Zdn_or_Vd, T, Pg, Zn_or_Zm);                               \
   }
 
diff --git a/src/hotspot/share/adlc/dfa.cpp b/src/hotspot/share/adlc/dfa.cpp
index 9c3d76cba55..d23ffb06c01 100644
--- a/src/hotspot/share/adlc/dfa.cpp
+++ b/src/hotspot/share/adlc/dfa.cpp
@@ -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
@@ -582,7 +582,7 @@ static bool is_vector_unary_op_name(const char* op_name) {
   static const char* vector_unary_op_list[] = {
     "AbsVB", "AbsVS", "AbsVI", "AbsVL", "AbsVF", "AbsVD",
     "NegVI", "NegVL", "NegVF", "NegVD",
-    "SqrtVF", "SqrtVD",
+    "SqrtVHF", "SqrtVF", "SqrtVD",
     "PopCountVI", "PopCountVL",
     "CountLeadingZerosV", "CountTrailingZerosV",
     "ReverseV", "ReverseBytesV",
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 866fb7f3e58..b0c8cdbc330 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -1780,11 +1780,14 @@ def generate(kind, names):
           ["absr", "abs", "2S"], ["absr", "abs", "4S"],
           ["absr", "abs", "2D"],
           ["fabs", "fabs", "2S"], ["fabs", "fabs", "4S"],
-          ["fabs", "fabs", "2D"],
+          ["fabs", "fabs", "2D"], ["fabs", "fabs", "4H"],
+          ["fabs", "fabs", "8H"],
           ["fneg", "fneg", "2S"], ["fneg", "fneg", "4S"],
-          ["fneg", "fneg", "2D"],
+          ["fneg", "fneg", "2D"], ["fneg", "fneg", "4H"],
+          ["fneg", "fneg", "8H"],
           ["fsqrt", "fsqrt", "2S"], ["fsqrt", "fsqrt", "4S"],
-          ["fsqrt", "fsqrt", "2D"],
+          ["fsqrt", "fsqrt", "2D"], ["fsqrt", "fsqrt", "4H"],
+          ["fsqrt", "fsqrt", "8H"],
           ["notr", "not", "8B"], ["notr", "not", "16B"],
           ])
 
@@ -1805,7 +1808,8 @@ def generate(kind, names):
           ["uqaddv", "uqadd", "2S"], ["uqaddv", "uqadd", "4S"],
           ["uqaddv", "uqadd", "2D"],
           ["fadd", "fadd", "2S"], ["fadd", "fadd", "4S"],
-          ["fadd", "fadd", "2D"],
+          ["fadd", "fadd", "2D"], ["fadd", "fadd", "4H"],
+          ["fadd", "fadd", "8H"],
           ["subv", "sub", "8B"], ["subv", "sub", "16B"],
           ["subv", "sub", "4H"], ["subv", "sub", "8H"],
           ["subv", "sub", "2S"], ["subv", "sub", "4S"],
@@ -1819,26 +1823,33 @@ def generate(kind, names):
           ["uqsubv", "uqsub", "2S"], ["uqsubv", "uqsub", "4S"],
           ["uqsubv", "uqsub", "2D"],
           ["fsub", "fsub", "2S"], ["fsub", "fsub", "4S"],
-          ["fsub", "fsub", "2D"],
+          ["fsub", "fsub", "2D"], ["fsub", "fsub", "4H"],
+          ["fsub", "fsub", "8H"],
           ["mulv", "mul", "8B"], ["mulv", "mul", "16B"],
           ["mulv", "mul", "4H"], ["mulv", "mul", "8H"],
           ["mulv", "mul", "2S"], ["mulv", "mul", "4S"],
           ["fabd", "fabd", "2S"], ["fabd", "fabd", "4S"],
-          ["fabd", "fabd", "2D"],
+          ["fabd", "fabd", "2D"], ["fabd", "fabd", "4H"],
+          ["fabd", "fabd", "8H"],
           ["faddp", "faddp", "2S"], ["faddp", "faddp", "4S"],
-          ["faddp", "faddp", "2D"],
+          ["faddp", "faddp", "2D"], ["faddp", "faddp", "4H"],
+          ["faddp", "faddp", "8H"],
           ["fmul", "fmul", "2S"], ["fmul", "fmul", "4S"],
-          ["fmul", "fmul", "2D"],
+          ["fmul", "fmul", "2D"], ["fmul", "fmul", "4H"],
+          ["fmul", "fmul", "8H"],
           ["mlav", "mla", "4H"], ["mlav", "mla", "8H"],
           ["mlav", "mla", "2S"], ["mlav", "mla", "4S"],
           ["fmla", "fmla", "2S"], ["fmla", "fmla", "4S"],
-          ["fmla", "fmla", "2D"],
+          ["fmla", "fmla", "2D"], ["fmla", "fmla", "4H"],
+          ["fmla", "fmla", "8H"],
           ["mlsv", "mls", "4H"], ["mlsv", "mls", "8H"],
           ["mlsv", "mls", "2S"], ["mlsv", "mls", "4S"],
           ["fmls", "fmls", "2S"], ["fmls", "fmls", "4S"],
-          ["fmls", "fmls", "2D"],
+          ["fmls", "fmls", "2D"], ["fmls", "fmls", "4H"],
+          ["fmls", "fmls", "8H"],
           ["fdiv", "fdiv", "2S"], ["fdiv", "fdiv", "4S"],
-          ["fdiv", "fdiv", "2D"],
+          ["fdiv", "fdiv", "2D"], ["fdiv", "fdiv", "4H"],
+          ["fdiv", "fdiv", "8H"],
           ["maxv", "smax", "8B"], ["maxv", "smax", "16B"],
           ["maxv", "smax", "4H"], ["maxv", "smax", "8H"],
           ["maxv", "smax", "2S"], ["maxv", "smax", "4S"],
@@ -1849,7 +1860,8 @@ def generate(kind, names):
           ["smaxp", "smaxp", "4H"], ["smaxp", "smaxp", "8H"],
           ["smaxp", "smaxp", "2S"], ["smaxp", "smaxp", "4S"],
           ["fmax", "fmax", "2S"], ["fmax", "fmax", "4S"],
-          ["fmax", "fmax", "2D"],
+          ["fmax", "fmax", "2D"], ["fmax", "fmax", "4H"],
+          ["fmax", "fmax", "8H"],
           ["minv", "smin", "8B"], ["minv", "smin", "16B"],
           ["minv", "smin", "4H"], ["minv", "smin", "8H"],
           ["minv", "smin", "2S"], ["minv", "smin", "4S"],
@@ -1865,9 +1877,11 @@ def generate(kind, names):
           ["shsubv", "shsub", "4H"], ["shsubv", "shsub", "8H"],
           ["shsubv", "shsub", "2S"], ["shsubv", "shsub", "4S"],
           ["fmin", "fmin", "2S"], ["fmin", "fmin", "4S"],
-          ["fmin", "fmin", "2D"],
+          ["fmin", "fmin", "2D"], ["fmin", "fmin", "4H"],
+          ["fmin", "fmin", "8H"],
           ["facgt", "facgt", "2S"], ["facgt", "facgt", "4S"],
-          ["facgt", "facgt", "2D"],
+          ["facgt", "facgt", "2D"], ["facgt", "facgt", "4H"],
+          ["facgt", "facgt", "8H"],
           ])
 
 generate(VectorScalarNEONInstruction,
@@ -1928,8 +1942,14 @@ def generate(kind, names):
                         ["fmov",   "__ fmovd(v14, __ T2D, 0.5f);",                       "fmov\tv14.2d, 0.5"],
                         ["ld1",    "__ ld1(v31, v0, __ T2D, Address(__ post(r1, r0)));", "ld1\t{v31.2d, v0.2d}, [x1], x0"],
                         ["fcvtzs", "__ fcvtzs(v0, __ T2S, v1);",                         "fcvtzs\tv0.2s, v1.2s"],
+                        ["fcvtzs", "__ fcvtzs(v0, __ T4H, v1);",                         "fcvtzs\tv0.4h, v1.4h"],
+                        ["fcvtzs", "__ fcvtzs(v0, __ T8H, v1);",                         "fcvtzs\tv0.8h, v1.8h"],
                         ["fcvtas", "__ fcvtas(v2, __ T4S, v3);",                         "fcvtas\tv2.4s, v3.4s"],
+                        ["fcvtas", "__ fcvtas(v2, __ T4H, v3);",                         "fcvtas\tv2.4h, v3.4h"],
+                        ["fcvtas", "__ fcvtas(v2, __ T8H, v3);",                         "fcvtas\tv2.8h, v3.8h"],
                         ["fcvtms", "__ fcvtms(v4, __ T2D, v5);",                         "fcvtms\tv4.2d, v5.2d"],
+                        ["fcvtms", "__ fcvtms(v4, __ T4H, v5);",                         "fcvtms\tv4.4h, v5.4h"],
+                        ["fcvtms", "__ fcvtms(v4, __ T8H, v5);",                         "fcvtms\tv4.8h, v5.8h"],
                         # SVE instructions
                         ["cpy",      "__ sve_cpy(z0, __ S, p0, v1);",                      "mov\tz0.s, p0/m, s1"],
                         ["cpy",      "__ sve_cpy(z0, __ B, p0, 127, true);",               "mov\tz0.b, p0/m, 127"],
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index c2e8046213b..2b4ea356d70 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -666,238 +666,266 @@
     __ fabs(v16, __ T2S, v17);                         //       fabs    v16.2S, v17.2S
     __ fabs(v17, __ T4S, v18);                         //       fabs    v17.4S, v18.4S
     __ fabs(v2, __ T2D, v3);                           //       fabs    v2.2D, v3.2D
-    __ fneg(v1, __ T2S, v2);                           //       fneg    v1.2S, v2.2S
-    __ fneg(v0, __ T4S, v1);                           //       fneg    v0.4S, v1.4S
-    __ fneg(v24, __ T2D, v25);                         //       fneg    v24.2D, v25.2D
-    __ fsqrt(v4, __ T2S, v5);                          //       fsqrt   v4.2S, v5.2S
-    __ fsqrt(v3, __ T4S, v4);                          //       fsqrt   v3.4S, v4.4S
-    __ fsqrt(v12, __ T2D, v13);                        //       fsqrt   v12.2D, v13.2D
-    __ notr(v31, __ T8B, v0);                          //       not     v31.8B, v0.8B
-    __ notr(v28, __ T16B, v29);                        //       not     v28.16B, v29.16B
+    __ fabs(v1, __ T4H, v2);                           //       fabs    v1.4H, v2.4H
+    __ fabs(v0, __ T8H, v1);                           //       fabs    v0.8H, v1.8H
+    __ fneg(v24, __ T2S, v25);                         //       fneg    v24.2S, v25.2S
+    __ fneg(v4, __ T4S, v5);                           //       fneg    v4.4S, v5.4S
+    __ fneg(v3, __ T2D, v4);                           //       fneg    v3.2D, v4.2D
+    __ fneg(v12, __ T4H, v13);                         //       fneg    v12.4H, v13.4H
+    __ fneg(v31, __ T8H, v0);                          //       fneg    v31.8H, v0.8H
+    __ fsqrt(v28, __ T2S, v29);                        //       fsqrt   v28.2S, v29.2S
+    __ fsqrt(v10, __ T4S, v11);                        //       fsqrt   v10.4S, v11.4S
+    __ fsqrt(v26, __ T2D, v27);                        //       fsqrt   v26.2D, v27.2D
+    __ fsqrt(v2, __ T4H, v3);                          //       fsqrt   v2.4H, v3.4H
+    __ fsqrt(v12, __ T8H, v13);                        //       fsqrt   v12.8H, v13.8H
+    __ notr(v18, __ T8B, v19);                         //       not     v18.8B, v19.8B
+    __ notr(v31, __ T16B, v0);                         //       not     v31.16B, v0.16B
 
 // ThreeRegNEONOp
-    __ andr(v10, __ T8B, v11, v12);                    //       and     v10.8B, v11.8B, v12.8B
-    __ andr(v26, __ T16B, v27, v28);                   //       and     v26.16B, v27.16B, v28.16B
-    __ orr(v2, __ T8B, v3, v4);                        //       orr     v2.8B, v3.8B, v4.8B
-    __ orr(v12, __ T16B, v13, v14);                    //       orr     v12.16B, v13.16B, v14.16B
-    __ eor(v18, __ T8B, v19, v20);                     //       eor     v18.8B, v19.8B, v20.8B
-    __ eor(v31, __ T16B, v0, v1);                      //       eor     v31.16B, v0.16B, v1.16B
-    __ addv(v1, __ T8B, v2, v3);                       //       add     v1.8B, v2.8B, v3.8B
-    __ addv(v13, __ T16B, v14, v15);                   //       add     v13.16B, v14.16B, v15.16B
-    __ addv(v29, __ T4H, v30, v31);                    //       add     v29.4H, v30.4H, v31.4H
-    __ addv(v0, __ T8H, v1, v2);                       //       add     v0.8H, v1.8H, v2.8H
-    __ addv(v19, __ T2S, v20, v21);                    //       add     v19.2S, v20.2S, v21.2S
-    __ addv(v12, __ T4S, v13, v14);                    //       add     v12.4S, v13.4S, v14.4S
-    __ addv(v17, __ T2D, v18, v19);                    //       add     v17.2D, v18.2D, v19.2D
-    __ sqaddv(v22, __ T8B, v23, v24);                  //       sqadd   v22.8B, v23.8B, v24.8B
-    __ sqaddv(v13, __ T16B, v14, v15);                 //       sqadd   v13.16B, v14.16B, v15.16B
-    __ sqaddv(v28, __ T4H, v29, v30);                  //       sqadd   v28.4H, v29.4H, v30.4H
+    __ andr(v1, __ T8B, v2, v3);                       //       and     v1.8B, v2.8B, v3.8B
+    __ andr(v13, __ T16B, v14, v15);                   //       and     v13.16B, v14.16B, v15.16B
+    __ orr(v29, __ T8B, v30, v31);                     //       orr     v29.8B, v30.8B, v31.8B
+    __ orr(v0, __ T16B, v1, v2);                       //       orr     v0.16B, v1.16B, v2.16B
+    __ eor(v19, __ T8B, v20, v21);                     //       eor     v19.8B, v20.8B, v21.8B
+    __ eor(v12, __ T16B, v13, v14);                    //       eor     v12.16B, v13.16B, v14.16B
+    __ addv(v17, __ T8B, v18, v19);                    //       add     v17.8B, v18.8B, v19.8B
+    __ addv(v22, __ T16B, v23, v24);                   //       add     v22.16B, v23.16B, v24.16B
+    __ addv(v13, __ T4H, v14, v15);                    //       add     v13.4H, v14.4H, v15.4H
+    __ addv(v28, __ T8H, v29, v30);                    //       add     v28.8H, v29.8H, v30.8H
+    __ addv(v30, __ T2S, v31, v0);                     //       add     v30.2S, v31.2S, v0.2S
+    __ addv(v31, __ T4S, v0, v1);                      //       add     v31.4S, v0.4S, v1.4S
+    __ addv(v1, __ T2D, v2, v3);                       //       add     v1.2D, v2.2D, v3.2D
+    __ sqaddv(v26, __ T8B, v27, v28);                  //       sqadd   v26.8B, v27.8B, v28.8B
+    __ sqaddv(v28, __ T16B, v29, v30);                 //       sqadd   v28.16B, v29.16B, v30.16B
+    __ sqaddv(v4, __ T4H, v5, v6);                     //       sqadd   v4.4H, v5.4H, v6.4H
     __ sqaddv(v30, __ T8H, v31, v0);                   //       sqadd   v30.8H, v31.8H, v0.8H
-    __ sqaddv(v31, __ T2S, v0, v1);                    //       sqadd   v31.2S, v0.2S, v1.2S
-    __ sqaddv(v1, __ T4S, v2, v3);                     //       sqadd   v1.4S, v2.4S, v3.4S
-    __ sqaddv(v26, __ T2D, v27, v28);                  //       sqadd   v26.2D, v27.2D, v28.2D
-    __ uqaddv(v28, __ T8B, v29, v30);                  //       uqadd   v28.8B, v29.8B, v30.8B
-    __ uqaddv(v4, __ T16B, v5, v6);                    //       uqadd   v4.16B, v5.16B, v6.16B
-    __ uqaddv(v30, __ T4H, v31, v0);                   //       uqadd   v30.4H, v31.4H, v0.4H
-    __ uqaddv(v4, __ T8H, v5, v6);                     //       uqadd   v4.8H, v5.8H, v6.8H
-    __ uqaddv(v6, __ T2S, v7, v8);                     //       uqadd   v6.2S, v7.2S, v8.2S
-    __ uqaddv(v30, __ T4S, v31, v0);                   //       uqadd   v30.4S, v31.4S, v0.4S
-    __ uqaddv(v26, __ T2D, v27, v28);                  //       uqadd   v26.2D, v27.2D, v28.2D
-    __ fadd(v18, __ T2S, v19, v20);                    //       fadd    v18.2S, v19.2S, v20.2S
-    __ fadd(v9, __ T4S, v10, v11);                     //       fadd    v9.4S, v10.4S, v11.4S
-    __ fadd(v8, __ T2D, v9, v10);                      //       fadd    v8.2D, v9.2D, v10.2D
-    __ subv(v12, __ T8B, v13, v14);                    //       sub     v12.8B, v13.8B, v14.8B
-    __ subv(v0, __ T16B, v1, v2);                      //       sub     v0.16B, v1.16B, v2.16B
-    __ subv(v20, __ T4H, v21, v22);                    //       sub     v20.4H, v21.4H, v22.4H
-    __ subv(v1, __ T8H, v2, v3);                       //       sub     v1.8H, v2.8H, v3.8H
-    __ subv(v24, __ T2S, v25, v26);                    //       sub     v24.2S, v25.2S, v26.2S
-    __ subv(v2, __ T4S, v3, v4);                       //       sub     v2.4S, v3.4S, v4.4S
-    __ subv(v0, __ T2D, v1, v2);                       //       sub     v0.2D, v1.2D, v2.2D
-    __ sqsubv(v9, __ T8B, v10, v11);                   //       sqsub   v9.8B, v10.8B, v11.8B
-    __ sqsubv(v24, __ T16B, v25, v26);                 //       sqsub   v24.16B, v25.16B, v26.16B
-    __ sqsubv(v26, __ T4H, v27, v28);                  //       sqsub   v26.4H, v27.4H, v28.4H
-    __ sqsubv(v16, __ T8H, v17, v18);                  //       sqsub   v16.8H, v17.8H, v18.8H
-    __ sqsubv(v30, __ T2S, v31, v0);                   //       sqsub   v30.2S, v31.2S, v0.2S
-    __ sqsubv(v3, __ T4S, v4, v5);                     //       sqsub   v3.4S, v4.4S, v5.4S
+    __ sqaddv(v4, __ T2S, v5, v6);                     //       sqadd   v4.2S, v5.2S, v6.2S
+    __ sqaddv(v6, __ T4S, v7, v8);                     //       sqadd   v6.4S, v7.4S, v8.4S
+    __ sqaddv(v30, __ T2D, v31, v0);                   //       sqadd   v30.2D, v31.2D, v0.2D
+    __ uqaddv(v26, __ T8B, v27, v28);                  //       uqadd   v26.8B, v27.8B, v28.8B
+    __ uqaddv(v18, __ T16B, v19, v20);                 //       uqadd   v18.16B, v19.16B, v20.16B
+    __ uqaddv(v9, __ T4H, v10, v11);                   //       uqadd   v9.4H, v10.4H, v11.4H
+    __ uqaddv(v8, __ T8H, v9, v10);                    //       uqadd   v8.8H, v9.8H, v10.8H
+    __ uqaddv(v12, __ T2S, v13, v14);                  //       uqadd   v12.2S, v13.2S, v14.2S
+    __ uqaddv(v0, __ T4S, v1, v2);                     //       uqadd   v0.4S, v1.4S, v2.4S
+    __ uqaddv(v20, __ T2D, v21, v22);                  //       uqadd   v20.2D, v21.2D, v22.2D
+    __ fadd(v1, __ T2S, v2, v3);                       //       fadd    v1.2S, v2.2S, v3.2S
+    __ fadd(v24, __ T4S, v25, v26);                    //       fadd    v24.4S, v25.4S, v26.4S
+    __ fadd(v2, __ T2D, v3, v4);                       //       fadd    v2.2D, v3.2D, v4.2D
+    __ fadd(v0, __ T4H, v1, v2);                       //       fadd    v0.4H, v1.4H, v2.4H
+    __ fadd(v9, __ T8H, v10, v11);                     //       fadd    v9.8H, v10.8H, v11.8H
+    __ subv(v24, __ T8B, v25, v26);                    //       sub     v24.8B, v25.8B, v26.8B
+    __ subv(v26, __ T16B, v27, v28);                   //       sub     v26.16B, v27.16B, v28.16B
+    __ subv(v16, __ T4H, v17, v18);                    //       sub     v16.4H, v17.4H, v18.4H
+    __ subv(v30, __ T8H, v31, v0);                     //       sub     v30.8H, v31.8H, v0.8H
+    __ subv(v3, __ T2S, v4, v5);                       //       sub     v3.2S, v4.2S, v5.2S
+    __ subv(v10, __ T4S, v11, v12);                    //       sub     v10.4S, v11.4S, v12.4S
+    __ subv(v23, __ T2D, v24, v25);                    //       sub     v23.2D, v24.2D, v25.2D
+    __ sqsubv(v10, __ T8B, v11, v12);                  //       sqsub   v10.8B, v11.8B, v12.8B
+    __ sqsubv(v4, __ T16B, v5, v6);                    //       sqsub   v4.16B, v5.16B, v6.16B
+    __ sqsubv(v18, __ T4H, v19, v20);                  //       sqsub   v18.4H, v19.4H, v20.4H
+    __ sqsubv(v2, __ T8H, v3, v4);                     //       sqsub   v2.8H, v3.8H, v4.8H
+    __ sqsubv(v11, __ T2S, v12, v13);                  //       sqsub   v11.2S, v12.2S, v13.2S
+    __ sqsubv(v8, __ T4S, v9, v10);                    //       sqsub   v8.4S, v9.4S, v10.4S
     __ sqsubv(v10, __ T2D, v11, v12);                  //       sqsub   v10.2D, v11.2D, v12.2D
-    __ uqsubv(v23, __ T8B, v24, v25);                  //       uqsub   v23.8B, v24.8B, v25.8B
-    __ uqsubv(v10, __ T16B, v11, v12);                 //       uqsub   v10.16B, v11.16B, v12.16B
-    __ uqsubv(v4, __ T4H, v5, v6);                     //       uqsub   v4.4H, v5.4H, v6.4H
-    __ uqsubv(v18, __ T8H, v19, v20);                  //       uqsub   v18.8H, v19.8H, v20.8H
-    __ uqsubv(v2, __ T2S, v3, v4);                     //       uqsub   v2.2S, v3.2S, v4.2S
-    __ uqsubv(v11, __ T4S, v12, v13);                  //       uqsub   v11.4S, v12.4S, v13.4S
-    __ uqsubv(v8, __ T2D, v9, v10);                    //       uqsub   v8.2D, v9.2D, v10.2D
-    __ fsub(v10, __ T2S, v11, v12);                    //       fsub    v10.2S, v11.2S, v12.2S
-    __ fsub(v15, __ T4S, v16, v17);                    //       fsub    v15.4S, v16.4S, v17.4S
-    __ fsub(v17, __ T2D, v18, v19);                    //       fsub    v17.2D, v18.2D, v19.2D
-    __ mulv(v2, __ T8B, v3, v4);                       //       mul     v2.8B, v3.8B, v4.8B
-    __ mulv(v10, __ T16B, v11, v12);                   //       mul     v10.16B, v11.16B, v12.16B
-    __ mulv(v12, __ T4H, v13, v14);                    //       mul     v12.4H, v13.4H, v14.4H
-    __ mulv(v12, __ T8H, v13, v14);                    //       mul     v12.8H, v13.8H, v14.8H
-    __ mulv(v15, __ T2S, v16, v17);                    //       mul     v15.2S, v16.2S, v17.2S
-    __ mulv(v13, __ T4S, v14, v15);                    //       mul     v13.4S, v14.4S, v15.4S
-    __ fabd(v2, __ T2S, v3, v4);                       //       fabd    v2.2S, v3.2S, v4.2S
-    __ fabd(v7, __ T4S, v8, v9);                       //       fabd    v7.4S, v8.4S, v9.4S
-    __ fabd(v20, __ T2D, v21, v22);                    //       fabd    v20.2D, v21.2D, v22.2D
-    __ faddp(v26, __ T2S, v27, v28);                   //       faddp   v26.2S, v27.2S, v28.2S
-    __ faddp(v16, __ T4S, v17, v18);                   //       faddp   v16.4S, v17.4S, v18.4S
-    __ faddp(v4, __ T2D, v5, v6);                      //       faddp   v4.2D, v5.2D, v6.2D
-    __ fmul(v2, __ T2S, v3, v4);                       //       fmul    v2.2S, v3.2S, v4.2S
-    __ fmul(v4, __ T4S, v5, v6);                       //       fmul    v4.4S, v5.4S, v6.4S
-    __ fmul(v12, __ T2D, v13, v14);                    //       fmul    v12.2D, v13.2D, v14.2D
-    __ mlav(v18, __ T4H, v19, v20);                    //       mla     v18.4H, v19.4H, v20.4H
-    __ mlav(v21, __ T8H, v22, v23);                    //       mla     v21.8H, v22.8H, v23.8H
+    __ uqsubv(v15, __ T8B, v16, v17);                  //       uqsub   v15.8B, v16.8B, v17.8B
+    __ uqsubv(v17, __ T16B, v18, v19);                 //       uqsub   v17.16B, v18.16B, v19.16B
+    __ uqsubv(v2, __ T4H, v3, v4);                     //       uqsub   v2.4H, v3.4H, v4.4H
+    __ uqsubv(v10, __ T8H, v11, v12);                  //       uqsub   v10.8H, v11.8H, v12.8H
+    __ uqsubv(v12, __ T2S, v13, v14);                  //       uqsub   v12.2S, v13.2S, v14.2S
+    __ uqsubv(v12, __ T4S, v13, v14);                  //       uqsub   v12.4S, v13.4S, v14.4S
+    __ uqsubv(v15, __ T2D, v16, v17);                  //       uqsub   v15.2D, v16.2D, v17.2D
+    __ fsub(v13, __ T2S, v14, v15);                    //       fsub    v13.2S, v14.2S, v15.2S
+    __ fsub(v2, __ T4S, v3, v4);                       //       fsub    v2.4S, v3.4S, v4.4S
+    __ fsub(v7, __ T2D, v8, v9);                       //       fsub    v7.2D, v8.2D, v9.2D
+    __ fsub(v20, __ T4H, v21, v22);                    //       fsub    v20.4H, v21.4H, v22.4H
+    __ fsub(v26, __ T8H, v27, v28);                    //       fsub    v26.8H, v27.8H, v28.8H
+    __ mulv(v16, __ T8B, v17, v18);                    //       mul     v16.8B, v17.8B, v18.8B
+    __ mulv(v4, __ T16B, v5, v6);                      //       mul     v4.16B, v5.16B, v6.16B
+    __ mulv(v2, __ T4H, v3, v4);                       //       mul     v2.4H, v3.4H, v4.4H
+    __ mulv(v4, __ T8H, v5, v6);                       //       mul     v4.8H, v5.8H, v6.8H
+    __ mulv(v12, __ T2S, v13, v14);                    //       mul     v12.2S, v13.2S, v14.2S
+    __ mulv(v18, __ T4S, v19, v20);                    //       mul     v18.4S, v19.4S, v20.4S
+    __ fabd(v21, __ T2S, v22, v23);                    //       fabd    v21.2S, v22.2S, v23.2S
+    __ fabd(v16, __ T4S, v17, v18);                    //       fabd    v16.4S, v17.4S, v18.4S
+    __ fabd(v18, __ T2D, v19, v20);                    //       fabd    v18.2D, v19.2D, v20.2D
+    __ fabd(v11, __ T4H, v12, v13);                    //       fabd    v11.4H, v12.4H, v13.4H
+    __ fabd(v21, __ T8H, v22, v23);                    //       fabd    v21.8H, v22.8H, v23.8H
+    __ faddp(v23, __ T2S, v24, v25);                   //       faddp   v23.2S, v24.2S, v25.2S
+    __ faddp(v12, __ T4S, v13, v14);                   //       faddp   v12.4S, v13.4S, v14.4S
+    __ faddp(v26, __ T2D, v27, v28);                   //       faddp   v26.2D, v27.2D, v28.2D
+    __ faddp(v23, __ T4H, v24, v25);                   //       faddp   v23.4H, v24.4H, v25.4H
+    __ faddp(v28, __ T8H, v29, v30);                   //       faddp   v28.8H, v29.8H, v30.8H
+    __ fmul(v14, __ T2S, v15, v16);                    //       fmul    v14.2S, v15.2S, v16.2S
+    __ fmul(v11, __ T4S, v12, v13);                    //       fmul    v11.4S, v12.4S, v13.4S
+    __ fmul(v24, __ T2D, v25, v26);                    //       fmul    v24.2D, v25.2D, v26.2D
+    __ fmul(v1, __ T4H, v2, v3);                       //       fmul    v1.4H, v2.4H, v3.4H
+    __ fmul(v12, __ T8H, v13, v14);                    //       fmul    v12.8H, v13.8H, v14.8H
+    __ mlav(v31, __ T4H, v0, v1);                      //       mla     v31.4H, v0.4H, v1.4H
+    __ mlav(v10, __ T8H, v11, v12);                    //       mla     v10.8H, v11.8H, v12.8H
     __ mlav(v16, __ T2S, v17, v18);                    //       mla     v16.2S, v17.2S, v18.2S
-    __ mlav(v18, __ T4S, v19, v20);                    //       mla     v18.4S, v19.4S, v20.4S
-    __ fmla(v11, __ T2S, v12, v13);                    //       fmla    v11.2S, v12.2S, v13.2S
-    __ fmla(v21, __ T4S, v22, v23);                    //       fmla    v21.4S, v22.4S, v23.4S
-    __ fmla(v23, __ T2D, v24, v25);                    //       fmla    v23.2D, v24.2D, v25.2D
-    __ mlsv(v12, __ T4H, v13, v14);                    //       mls     v12.4H, v13.4H, v14.4H
-    __ mlsv(v26, __ T8H, v27, v28);                    //       mls     v26.8H, v27.8H, v28.8H
-    __ mlsv(v23, __ T2S, v24, v25);                    //       mls     v23.2S, v24.2S, v25.2S
-    __ mlsv(v28, __ T4S, v29, v30);                    //       mls     v28.4S, v29.4S, v30.4S
-    __ fmls(v14, __ T2S, v15, v16);                    //       fmls    v14.2S, v15.2S, v16.2S
-    __ fmls(v11, __ T4S, v12, v13);                    //       fmls    v11.4S, v12.4S, v13.4S
-    __ fmls(v24, __ T2D, v25, v26);                    //       fmls    v24.2D, v25.2D, v26.2D
-    __ fdiv(v1, __ T2S, v2, v3);                       //       fdiv    v1.2S, v2.2S, v3.2S
-    __ fdiv(v12, __ T4S, v13, v14);                    //       fdiv    v12.4S, v13.4S, v14.4S
-    __ fdiv(v31, __ T2D, v0, v1);                      //       fdiv    v31.2D, v0.2D, v1.2D
-    __ maxv(v10, __ T8B, v11, v12);                    //       smax    v10.8B, v11.8B, v12.8B
-    __ maxv(v16, __ T16B, v17, v18);                   //       smax    v16.16B, v17.16B, v18.16B
-    __ maxv(v7, __ T4H, v8, v9);                       //       smax    v7.4H, v8.4H, v9.4H
-    __ maxv(v2, __ T8H, v3, v4);                       //       smax    v2.8H, v3.8H, v4.8H
-    __ maxv(v3, __ T2S, v4, v5);                       //       smax    v3.2S, v4.2S, v5.2S
-    __ maxv(v13, __ T4S, v14, v15);                    //       smax    v13.4S, v14.4S, v15.4S
-    __ umaxv(v19, __ T8B, v20, v21);                   //       umax    v19.8B, v20.8B, v21.8B
-    __ umaxv(v17, __ T16B, v18, v19);                  //       umax    v17.16B, v18.16B, v19.16B
+    __ mlav(v7, __ T4S, v8, v9);                       //       mla     v7.4S, v8.4S, v9.4S
+    __ fmla(v2, __ T2S, v3, v4);                       //       fmla    v2.2S, v3.2S, v4.2S
+    __ fmla(v3, __ T4S, v4, v5);                       //       fmla    v3.4S, v4.4S, v5.4S
+    __ fmla(v13, __ T2D, v14, v15);                    //       fmla    v13.2D, v14.2D, v15.2D
+    __ fmla(v19, __ T4H, v20, v21);                    //       fmla    v19.4H, v20.4H, v21.4H
+    __ fmla(v17, __ T8H, v18, v19);                    //       fmla    v17.8H, v18.8H, v19.8H
+    __ mlsv(v16, __ T4H, v17, v18);                    //       mls     v16.4H, v17.4H, v18.4H
+    __ mlsv(v3, __ T8H, v4, v5);                       //       mls     v3.8H, v4.8H, v5.8H
+    __ mlsv(v1, __ T2S, v2, v3);                       //       mls     v1.2S, v2.2S, v3.2S
+    __ mlsv(v11, __ T4S, v12, v13);                    //       mls     v11.4S, v12.4S, v13.4S
+    __ fmls(v30, __ T2S, v31, v0);                     //       fmls    v30.2S, v31.2S, v0.2S
+    __ fmls(v5, __ T4S, v6, v7);                       //       fmls    v5.4S, v6.4S, v7.4S
+    __ fmls(v8, __ T2D, v9, v10);                      //       fmls    v8.2D, v9.2D, v10.2D
+    __ fmls(v15, __ T4H, v16, v17);                    //       fmls    v15.4H, v16.4H, v17.4H
+    __ fmls(v29, __ T8H, v30, v31);                    //       fmls    v29.8H, v30.8H, v31.8H
+    __ fdiv(v30, __ T2S, v31, v0);                     //       fdiv    v30.2S, v31.2S, v0.2S
+    __ fdiv(v0, __ T4S, v1, v2);                       //       fdiv    v0.4S, v1.4S, v2.4S
+    __ fdiv(v20, __ T2D, v21, v22);                    //       fdiv    v20.2D, v21.2D, v22.2D
+    __ fdiv(v7, __ T4H, v8, v9);                       //       fdiv    v7.4H, v8.4H, v9.4H
+    __ fdiv(v20, __ T8H, v21, v22);                    //       fdiv    v20.8H, v21.8H, v22.8H
+    __ maxv(v23, __ T8B, v24, v25);                    //       smax    v23.8B, v24.8B, v25.8B
+    __ maxv(v28, __ T16B, v29, v30);                   //       smax    v28.16B, v29.16B, v30.16B
+    __ maxv(v21, __ T4H, v22, v23);                    //       smax    v21.4H, v22.4H, v23.4H
+    __ maxv(v27, __ T8H, v28, v29);                    //       smax    v27.8H, v28.8H, v29.8H
+    __ maxv(v25, __ T2S, v26, v27);                    //       smax    v25.2S, v26.2S, v27.2S
+    __ maxv(v5, __ T4S, v6, v7);                       //       smax    v5.4S, v6.4S, v7.4S
+    __ umaxv(v1, __ T8B, v2, v3);                      //       umax    v1.8B, v2.8B, v3.8B
+    __ umaxv(v23, __ T16B, v24, v25);                  //       umax    v23.16B, v24.16B, v25.16B
     __ umaxv(v16, __ T4H, v17, v18);                   //       umax    v16.4H, v17.4H, v18.4H
-    __ umaxv(v3, __ T8H, v4, v5);                      //       umax    v3.8H, v4.8H, v5.8H
-    __ umaxv(v1, __ T2S, v2, v3);                      //       umax    v1.2S, v2.2S, v3.2S
-    __ umaxv(v11, __ T4S, v12, v13);                   //       umax    v11.4S, v12.4S, v13.4S
-    __ smaxp(v30, __ T8B, v31, v0);                    //       smaxp   v30.8B, v31.8B, v0.8B
-    __ smaxp(v5, __ T16B, v6, v7);                     //       smaxp   v5.16B, v6.16B, v7.16B
-    __ smaxp(v8, __ T4H, v9, v10);                     //       smaxp   v8.4H, v9.4H, v10.4H
-    __ smaxp(v15, __ T8H, v16, v17);                   //       smaxp   v15.8H, v16.8H, v17.8H
-    __ smaxp(v29, __ T2S, v30, v31);                   //       smaxp   v29.2S, v30.2S, v31.2S
-    __ smaxp(v30, __ T4S, v31, v0);                    //       smaxp   v30.4S, v31.4S, v0.4S
-    __ fmax(v0, __ T2S, v1, v2);                       //       fmax    v0.2S, v1.2S, v2.2S
-    __ fmax(v20, __ T4S, v21, v22);                    //       fmax    v20.4S, v21.4S, v22.4S
-    __ fmax(v7, __ T2D, v8, v9);                       //       fmax    v7.2D, v8.2D, v9.2D
-    __ minv(v20, __ T8B, v21, v22);                    //       smin    v20.8B, v21.8B, v22.8B
-    __ minv(v23, __ T16B, v24, v25);                   //       smin    v23.16B, v24.16B, v25.16B
-    __ minv(v28, __ T4H, v29, v30);                    //       smin    v28.4H, v29.4H, v30.4H
-    __ minv(v21, __ T8H, v22, v23);                    //       smin    v21.8H, v22.8H, v23.8H
-    __ minv(v27, __ T2S, v28, v29);                    //       smin    v27.2S, v28.2S, v29.2S
-    __ minv(v25, __ T4S, v26, v27);                    //       smin    v25.4S, v26.4S, v27.4S
-    __ uminv(v5, __ T8B, v6, v7);                      //       umin    v5.8B, v6.8B, v7.8B
-    __ uminv(v1, __ T16B, v2, v3);                     //       umin    v1.16B, v2.16B, v3.16B
-    __ uminv(v23, __ T4H, v24, v25);                   //       umin    v23.4H, v24.4H, v25.4H
-    __ uminv(v16, __ T8H, v17, v18);                   //       umin    v16.8H, v17.8H, v18.8H
-    __ uminv(v31, __ T2S, v0, v1);                     //       umin    v31.2S, v0.2S, v1.2S
-    __ uminv(v5, __ T4S, v6, v7);                      //       umin    v5.4S, v6.4S, v7.4S
-    __ sminp(v12, __ T8B, v13, v14);                   //       sminp   v12.8B, v13.8B, v14.8B
-    __ sminp(v9, __ T16B, v10, v11);                   //       sminp   v9.16B, v10.16B, v11.16B
-    __ sminp(v28, __ T4H, v29, v30);                   //       sminp   v28.4H, v29.4H, v30.4H
-    __ sminp(v15, __ T8H, v16, v17);                   //       sminp   v15.8H, v16.8H, v17.8H
-    __ sminp(v29, __ T2S, v30, v31);                   //       sminp   v29.2S, v30.2S, v31.2S
-    __ sminp(v22, __ T4S, v23, v24);                   //       sminp   v22.4S, v23.4S, v24.4S
-    __ sqdmulh(v31, __ T4H, v0, v1);                   //       sqdmulh v31.4H, v0.4H, v1.4H
-    __ sqdmulh(v19, __ T8H, v20, v21);                 //       sqdmulh v19.8H, v20.8H, v21.8H
-    __ sqdmulh(v31, __ T2S, v0, v1);                   //       sqdmulh v31.2S, v0.2S, v1.2S
-    __ sqdmulh(v5, __ T4S, v6, v7);                    //       sqdmulh v5.4S, v6.4S, v7.4S
-    __ shsubv(v14, __ T8B, v15, v16);                  //       shsub   v14.8B, v15.8B, v16.8B
-    __ shsubv(v18, __ T16B, v19, v20);                 //       shsub   v18.16B, v19.16B, v20.16B
-    __ shsubv(v31, __ T4H, v0, v1);                    //       shsub   v31.4H, v0.4H, v1.4H
-    __ shsubv(v18, __ T8H, v19, v20);                  //       shsub   v18.8H, v19.8H, v20.8H
-    __ shsubv(v27, __ T2S, v28, v29);                  //       shsub   v27.2S, v28.2S, v29.2S
-    __ shsubv(v20, __ T4S, v21, v22);                  //       shsub   v20.4S, v21.4S, v22.4S
-    __ fmin(v16, __ T2S, v17, v18);                    //       fmin    v16.2S, v17.2S, v18.2S
-    __ fmin(v12, __ T4S, v13, v14);                    //       fmin    v12.4S, v13.4S, v14.4S
-    __ fmin(v11, __ T2D, v12, v13);                    //       fmin    v11.2D, v12.2D, v13.2D
-    __ facgt(v9, __ T2S, v10, v11);                    //       facgt   v9.2S, v10.2S, v11.2S
-    __ facgt(v6, __ T4S, v7, v8);                      //       facgt   v6.4S, v7.4S, v8.4S
-    __ facgt(v30, __ T2D, v31, v0);                    //       facgt   v30.2D, v31.2D, v0.2D
+    __ umaxv(v31, __ T8H, v0, v1);                     //       umax    v31.8H, v0.8H, v1.8H
+    __ umaxv(v5, __ T2S, v6, v7);                      //       umax    v5.2S, v6.2S, v7.2S
+    __ umaxv(v12, __ T4S, v13, v14);                   //       umax    v12.4S, v13.4S, v14.4S
+    __ smaxp(v9, __ T8B, v10, v11);                    //       smaxp   v9.8B, v10.8B, v11.8B
+    __ smaxp(v28, __ T16B, v29, v30);                  //       smaxp   v28.16B, v29.16B, v30.16B
+    __ smaxp(v15, __ T4H, v16, v17);                   //       smaxp   v15.4H, v16.4H, v17.4H
+    __ smaxp(v29, __ T8H, v30, v31);                   //       smaxp   v29.8H, v30.8H, v31.8H
+    __ smaxp(v22, __ T2S, v23, v24);                   //       smaxp   v22.2S, v23.2S, v24.2S
+    __ smaxp(v31, __ T4S, v0, v1);                     //       smaxp   v31.4S, v0.4S, v1.4S
+    __ fmax(v19, __ T2S, v20, v21);                    //       fmax    v19.2S, v20.2S, v21.2S
+    __ fmax(v31, __ T4S, v0, v1);                      //       fmax    v31.4S, v0.4S, v1.4S
+    __ fmax(v5, __ T2D, v6, v7);                       //       fmax    v5.2D, v6.2D, v7.2D
+    __ fmax(v14, __ T4H, v15, v16);                    //       fmax    v14.4H, v15.4H, v16.4H
+    __ fmax(v18, __ T8H, v19, v20);                    //       fmax    v18.8H, v19.8H, v20.8H
+    __ minv(v31, __ T8B, v0, v1);                      //       smin    v31.8B, v0.8B, v1.8B
+    __ minv(v18, __ T16B, v19, v20);                   //       smin    v18.16B, v19.16B, v20.16B
+    __ minv(v27, __ T4H, v28, v29);                    //       smin    v27.4H, v28.4H, v29.4H
+    __ minv(v20, __ T8H, v21, v22);                    //       smin    v20.8H, v21.8H, v22.8H
+    __ minv(v16, __ T2S, v17, v18);                    //       smin    v16.2S, v17.2S, v18.2S
+    __ minv(v12, __ T4S, v13, v14);                    //       smin    v12.4S, v13.4S, v14.4S
+    __ uminv(v11, __ T8B, v12, v13);                   //       umin    v11.8B, v12.8B, v13.8B
+    __ uminv(v9, __ T16B, v10, v11);                   //       umin    v9.16B, v10.16B, v11.16B
+    __ uminv(v6, __ T4H, v7, v8);                      //       umin    v6.4H, v7.4H, v8.4H
+    __ uminv(v30, __ T8H, v31, v0);                    //       umin    v30.8H, v31.8H, v0.8H
+    __ uminv(v17, __ T2S, v18, v19);                   //       umin    v17.2S, v18.2S, v19.2S
+    __ uminv(v27, __ T4S, v28, v29);                   //       umin    v27.4S, v28.4S, v29.4S
+    __ sminp(v28, __ T8B, v29, v30);                   //       sminp   v28.8B, v29.8B, v30.8B
+    __ sminp(v30, __ T16B, v31, v0);                   //       sminp   v30.16B, v31.16B, v0.16B
+    __ sminp(v7, __ T4H, v8, v9);                      //       sminp   v7.4H, v8.4H, v9.4H
+    __ sminp(v10, __ T8H, v11, v12);                   //       sminp   v10.8H, v11.8H, v12.8H
+    __ sminp(v20, __ T2S, v21, v22);                   //       sminp   v20.2S, v21.2S, v22.2S
+    __ sminp(v10, __ T4S, v11, v12);                   //       sminp   v10.4S, v11.4S, v12.4S
+    __ sqdmulh(v4, __ T4H, v5, v6);                    //       sqdmulh v4.4H, v5.4H, v6.4H
+    __ sqdmulh(v24, __ T8H, v25, v26);                 //       sqdmulh v24.8H, v25.8H, v26.8H
+    __ sqdmulh(v17, __ T2S, v18, v19);                 //       sqdmulh v17.2S, v18.2S, v19.2S
+    __ sqdmulh(v17, __ T4S, v18, v19);                 //       sqdmulh v17.4S, v18.4S, v19.4S
+    __ shsubv(v22, __ T8B, v23, v24);                  //       shsub   v22.8B, v23.8B, v24.8B
+    __ shsubv(v3, __ T16B, v4, v5);                    //       shsub   v3.16B, v4.16B, v5.16B
+    __ shsubv(v29, __ T4H, v30, v31);                  //       shsub   v29.4H, v30.4H, v31.4H
+    __ shsubv(v15, __ T8H, v16, v17);                  //       shsub   v15.8H, v16.8H, v17.8H
+    __ shsubv(v22, __ T2S, v23, v24);                  //       shsub   v22.2S, v23.2S, v24.2S
+    __ shsubv(v19, __ T4S, v20, v21);                  //       shsub   v19.4S, v20.4S, v21.4S
+    __ fmin(v19, __ T2S, v20, v21);                    //       fmin    v19.2S, v20.2S, v21.2S
+    __ fmin(v22, __ T4S, v23, v24);                    //       fmin    v22.4S, v23.4S, v24.4S
+    __ fmin(v2, __ T2D, v3, v4);                       //       fmin    v2.2D, v3.2D, v4.2D
+    __ fmin(v15, __ T4H, v16, v17);                    //       fmin    v15.4H, v16.4H, v17.4H
+    __ fmin(v6, __ T8H, v7, v8);                       //       fmin    v6.8H, v7.8H, v8.8H
+    __ facgt(v12, __ T2S, v13, v14);                   //       facgt   v12.2S, v13.2S, v14.2S
+    __ facgt(v16, __ T4S, v17, v18);                   //       facgt   v16.4S, v17.4S, v18.4S
+    __ facgt(v11, __ T2D, v12, v13);                   //       facgt   v11.2D, v12.2D, v13.2D
+    __ facgt(v13, __ T4H, v14, v15);                   //       facgt   v13.4H, v14.4H, v15.4H
+    __ facgt(v23, __ T8H, v24, v25);                   //       facgt   v23.8H, v24.8H, v25.8H
 
 // VectorScalarNEONInstruction
-    __ fmlavs(v13, __ T2S, v14, v15, 1);               //       fmla    v13.2S, v14.2S, v15.S[1]
-    __ mulvs(v15, __ T4S, v0, v1, 3);                  //       mul     v15.4S, v0.4S, v1.S[3]
-    __ fmlavs(v5, __ T2D, v6, v7, 0);                  //       fmla    v5.2D, v6.2D, v7.D[0]
-    __ fmlsvs(v5, __ T2S, v6, v7, 1);                  //       fmls    v5.2S, v6.2S, v7.S[1]
-    __ mulvs(v12, __ T4S, v13, v14, 0);                //       mul     v12.4S, v13.4S, v14.S[0]
-    __ fmlsvs(v8, __ T2D, v9, v10, 1);                 //       fmls    v8.2D, v9.2D, v10.D[1]
-    __ fmulxvs(v1, __ T2S, v2, v3, 1);                 //       fmulx   v1.2S, v2.2S, v3.S[1]
-    __ mulvs(v7, __ T4S, v8, v9, 3);                   //       mul     v7.4S, v8.4S, v9.S[3]
-    __ fmulxvs(v9, __ T2D, v10, v11, 1);               //       fmulx   v9.2D, v10.2D, v11.D[1]
-    __ mulvs(v11, __ T4H, v12, v13, 2);                //       mul     v11.4H, v12.4H, v13.H[2]
-    __ mulvs(v7, __ T8H, v8, v9, 0);                   //       mul     v7.8H, v8.8H, v9.H[0]
-    __ mulvs(v6, __ T2S, v7, v8, 0);                   //       mul     v6.2S, v7.2S, v8.S[0]
-    __ mulvs(v5, __ T4S, v6, v7, 2);                   //       mul     v5.4S, v6.4S, v7.S[2]
+    __ fmlavs(v15, __ T2S, v0, v1, 0);                 //       fmla    v15.2S, v0.2S, v1.S[0]
+    __ mulvs(v2, __ T4S, v3, v4, 2);                   //       mul     v2.4S, v3.4S, v4.S[2]
+    __ fmlavs(v1, __ T2D, v2, v3, 1);                  //       fmla    v1.2D, v2.2D, v3.D[1]
+    __ fmlsvs(v11, __ T2S, v12, v13, 1);               //       fmls    v11.2S, v12.2S, v13.S[1]
+    __ mulvs(v5, __ T4S, v6, v7, 1);                   //       mul     v5.4S, v6.4S, v7.S[1]
+    __ fmlsvs(v14, __ T2D, v15, v16, 1);               //       fmls    v14.2D, v15.2D, v16.D[1]
+    __ fmulxvs(v6, __ T2S, v7, v8, 1);                 //       fmulx   v6.2S, v7.2S, v8.S[1]
+    __ mulvs(v1, __ T4S, v2, v3, 3);                   //       mul     v1.4S, v2.4S, v3.S[3]
+    __ fmulxvs(v15, __ T2D, v0, v1, 0);                //       fmulx   v15.2D, v0.2D, v1.D[0]
+    __ mulvs(v9, __ T4H, v10, v11, 3);                 //       mul     v9.4H, v10.4H, v11.H[3]
+    __ mulvs(v4, __ T8H, v5, v6, 4);                   //       mul     v4.8H, v5.8H, v6.H[4]
+    __ mulvs(v13, __ T2S, v14, v15, 1);                //       mul     v13.2S, v14.2S, v15.S[1]
+    __ mulvs(v3, __ T4S, v4, v5, 1);                   //       mul     v3.4S, v4.4S, v5.S[1]
 
 // NEONVectorCompare
-    __ cm(Assembler::GT, v13, __ T8B, v14, v15);       //       cmgt    v13.8B, v14.8B, v15.8B
+    __ cm(Assembler::GT, v21, __ T8B, v22, v23);       //       cmgt    v21.8B, v22.8B, v23.8B
     __ cm(Assembler::GT, v23, __ T16B, v24, v25);      //       cmgt    v23.16B, v24.16B, v25.16B
-    __ cm(Assembler::GT, v1, __ T4H, v2, v3);          //       cmgt    v1.4H, v2.4H, v3.4H
-    __ cm(Assembler::GT, v30, __ T8H, v31, v0);        //       cmgt    v30.8H, v31.8H, v0.8H
-    __ cm(Assembler::GT, v19, __ T2S, v20, v21);       //       cmgt    v19.2S, v20.2S, v21.2S
-    __ cm(Assembler::GT, v5, __ T4S, v6, v7);          //       cmgt    v5.4S, v6.4S, v7.4S
-    __ cm(Assembler::GT, v17, __ T2D, v18, v19);       //       cmgt    v17.2D, v18.2D, v19.2D
-    __ cm(Assembler::GE, v2, __ T8B, v3, v4);          //       cmge    v2.8B, v3.8B, v4.8B
-    __ cm(Assembler::GE, v16, __ T16B, v17, v18);      //       cmge    v16.16B, v17.16B, v18.16B
-    __ cm(Assembler::GE, v22, __ T4H, v23, v24);       //       cmge    v22.4H, v23.4H, v24.4H
-    __ cm(Assembler::GE, v13, __ T8H, v14, v15);       //       cmge    v13.8H, v14.8H, v15.8H
-    __ cm(Assembler::GE, v10, __ T2S, v11, v12);       //       cmge    v10.2S, v11.2S, v12.2S
-    __ cm(Assembler::GE, v21, __ T4S, v22, v23);       //       cmge    v21.4S, v22.4S, v23.4S
-    __ cm(Assembler::GE, v29, __ T2D, v30, v31);       //       cmge    v29.2D, v30.2D, v31.2D
-    __ cm(Assembler::EQ, v27, __ T8B, v28, v29);       //       cmeq    v27.8B, v28.8B, v29.8B
-    __ cm(Assembler::EQ, v12, __ T16B, v13, v14);      //       cmeq    v12.16B, v13.16B, v14.16B
-    __ cm(Assembler::EQ, v27, __ T4H, v28, v29);       //       cmeq    v27.4H, v28.4H, v29.4H
-    __ cm(Assembler::EQ, v3, __ T8H, v4, v5);          //       cmeq    v3.8H, v4.8H, v5.8H
-    __ cm(Assembler::EQ, v1, __ T2S, v2, v3);          //       cmeq    v1.2S, v2.2S, v3.2S
-    __ cm(Assembler::EQ, v31, __ T4S, v0, v1);         //       cmeq    v31.4S, v0.4S, v1.4S
-    __ cm(Assembler::EQ, v24, __ T2D, v25, v26);       //       cmeq    v24.2D, v25.2D, v26.2D
-    __ cm(Assembler::HI, v19, __ T8B, v20, v21);       //       cmhi    v19.8B, v20.8B, v21.8B
-    __ cm(Assembler::HI, v17, __ T16B, v18, v19);      //       cmhi    v17.16B, v18.16B, v19.16B
-    __ cm(Assembler::HI, v9, __ T4H, v10, v11);        //       cmhi    v9.4H, v10.4H, v11.4H
-    __ cm(Assembler::HI, v28, __ T8H, v29, v30);       //       cmhi    v28.8H, v29.8H, v30.8H
+    __ cm(Assembler::GT, v31, __ T4H, v0, v1);         //       cmgt    v31.4H, v0.4H, v1.4H
+    __ cm(Assembler::GT, v25, __ T8H, v26, v27);       //       cmgt    v25.8H, v26.8H, v27.8H
+    __ cm(Assembler::GT, v2, __ T2S, v3, v4);          //       cmgt    v2.2S, v3.2S, v4.2S
+    __ cm(Assembler::GT, v31, __ T4S, v0, v1);         //       cmgt    v31.4S, v0.4S, v1.4S
+    __ cm(Assembler::GT, v27, __ T2D, v28, v29);       //       cmgt    v27.2D, v28.2D, v29.2D
+    __ cm(Assembler::GE, v18, __ T8B, v19, v20);       //       cmge    v18.8B, v19.8B, v20.8B
+    __ cm(Assembler::GE, v10, __ T16B, v11, v12);      //       cmge    v10.16B, v11.16B, v12.16B
+    __ cm(Assembler::GE, v23, __ T4H, v24, v25);       //       cmge    v23.4H, v24.4H, v25.4H
+    __ cm(Assembler::GE, v19, __ T8H, v20, v21);       //       cmge    v19.8H, v20.8H, v21.8H
+    __ cm(Assembler::GE, v3, __ T2S, v4, v5);          //       cmge    v3.2S, v4.2S, v5.2S
+    __ cm(Assembler::GE, v18, __ T4S, v19, v20);       //       cmge    v18.4S, v19.4S, v20.4S
+    __ cm(Assembler::GE, v0, __ T2D, v1, v2);          //       cmge    v0.2D, v1.2D, v2.2D
+    __ cm(Assembler::EQ, v25, __ T8B, v26, v27);       //       cmeq    v25.8B, v26.8B, v27.8B
+    __ cm(Assembler::EQ, v26, __ T16B, v27, v28);      //       cmeq    v26.16B, v27.16B, v28.16B
+    __ cm(Assembler::EQ, v23, __ T4H, v24, v25);       //       cmeq    v23.4H, v24.4H, v25.4H
+    __ cm(Assembler::EQ, v2, __ T8H, v3, v4);          //       cmeq    v2.8H, v3.8H, v4.8H
+    __ cm(Assembler::EQ, v18, __ T2S, v19, v20);       //       cmeq    v18.2S, v19.2S, v20.2S
+    __ cm(Assembler::EQ, v12, __ T4S, v13, v14);       //       cmeq    v12.4S, v13.4S, v14.4S
+    __ cm(Assembler::EQ, v4, __ T2D, v5, v6);          //       cmeq    v4.2D, v5.2D, v6.2D
+    __ cm(Assembler::HI, v28, __ T8B, v29, v30);       //       cmhi    v28.8B, v29.8B, v30.8B
+    __ cm(Assembler::HI, v30, __ T16B, v31, v0);       //       cmhi    v30.16B, v31.16B, v0.16B
+    __ cm(Assembler::HI, v29, __ T4H, v30, v31);       //       cmhi    v29.4H, v30.4H, v31.4H
+    __ cm(Assembler::HI, v16, __ T8H, v17, v18);       //       cmhi    v16.8H, v17.8H, v18.8H
     __ cm(Assembler::HI, v27, __ T2S, v28, v29);       //       cmhi    v27.2S, v28.2S, v29.2S
-    __ cm(Assembler::HI, v15, __ T4S, v16, v17);       //       cmhi    v15.4S, v16.4S, v17.4S
-    __ cm(Assembler::HI, v7, __ T2D, v8, v9);          //       cmhi    v7.2D, v8.2D, v9.2D
-    __ cm(Assembler::HS, v21, __ T8B, v22, v23);       //       cmhs    v21.8B, v22.8B, v23.8B
-    __ cm(Assembler::HS, v23, __ T16B, v24, v25);      //       cmhs    v23.16B, v24.16B, v25.16B
-    __ cm(Assembler::HS, v31, __ T4H, v0, v1);         //       cmhs    v31.4H, v0.4H, v1.4H
-    __ cm(Assembler::HS, v25, __ T8H, v26, v27);       //       cmhs    v25.8H, v26.8H, v27.8H
-    __ cm(Assembler::HS, v2, __ T2S, v3, v4);          //       cmhs    v2.2S, v3.2S, v4.2S
-    __ cm(Assembler::HS, v31, __ T4S, v0, v1);         //       cmhs    v31.4S, v0.4S, v1.4S
-    __ cm(Assembler::HS, v27, __ T2D, v28, v29);       //       cmhs    v27.2D, v28.2D, v29.2D
-    __ fcm(Assembler::EQ, v18, __ T2S, v19, v20);      //       fcmeq   v18.2S, v19.2S, v20.2S
-    __ fcm(Assembler::EQ, v10, __ T4S, v11, v12);      //       fcmeq   v10.4S, v11.4S, v12.4S
-    __ fcm(Assembler::EQ, v23, __ T2D, v24, v25);      //       fcmeq   v23.2D, v24.2D, v25.2D
-    __ fcm(Assembler::GT, v19, __ T2S, v20, v21);      //       fcmgt   v19.2S, v20.2S, v21.2S
-    __ fcm(Assembler::GT, v3, __ T4S, v4, v5);         //       fcmgt   v3.4S, v4.4S, v5.4S
-    __ fcm(Assembler::GT, v18, __ T2D, v19, v20);      //       fcmgt   v18.2D, v19.2D, v20.2D
-    __ fcm(Assembler::GE, v0, __ T2S, v1, v2);         //       fcmge   v0.2S, v1.2S, v2.2S
-    __ fcm(Assembler::GE, v25, __ T4S, v26, v27);      //       fcmge   v25.4S, v26.4S, v27.4S
-    __ fcm(Assembler::GE, v26, __ T2D, v27, v28);      //       fcmge   v26.2D, v27.2D, v28.2D
+    __ cm(Assembler::HI, v6, __ T4S, v7, v8);          //       cmhi    v6.4S, v7.4S, v8.4S
+    __ cm(Assembler::HI, v9, __ T2D, v10, v11);        //       cmhi    v9.2D, v10.2D, v11.2D
+    __ cm(Assembler::HS, v29, __ T8B, v30, v31);       //       cmhs    v29.8B, v30.8B, v31.8B
+    __ cm(Assembler::HS, v18, __ T16B, v19, v20);      //       cmhs    v18.16B, v19.16B, v20.16B
+    __ cm(Assembler::HS, v7, __ T4H, v8, v9);          //       cmhs    v7.4H, v8.4H, v9.4H
+    __ cm(Assembler::HS, v4, __ T8H, v5, v6);          //       cmhs    v4.8H, v5.8H, v6.8H
+    __ cm(Assembler::HS, v7, __ T2S, v8, v9);          //       cmhs    v7.2S, v8.2S, v9.2S
+    __ cm(Assembler::HS, v15, __ T4S, v16, v17);       //       cmhs    v15.4S, v16.4S, v17.4S
+    __ cm(Assembler::HS, v9, __ T2D, v10, v11);        //       cmhs    v9.2D, v10.2D, v11.2D
+    __ fcm(Assembler::EQ, v23, __ T2S, v24, v25);      //       fcmeq   v23.2S, v24.2S, v25.2S
+    __ fcm(Assembler::EQ, v8, __ T4S, v9, v10);        //       fcmeq   v8.4S, v9.4S, v10.4S
+    __ fcm(Assembler::EQ, v2, __ T2D, v3, v4);         //       fcmeq   v2.2D, v3.2D, v4.2D
+    __ fcm(Assembler::GT, v28, __ T2S, v29, v30);      //       fcmgt   v28.2S, v29.2S, v30.2S
+    __ fcm(Assembler::GT, v21, __ T4S, v22, v23);      //       fcmgt   v21.4S, v22.4S, v23.4S
+    __ fcm(Assembler::GT, v31, __ T2D, v0, v1);        //       fcmgt   v31.2D, v0.2D, v1.2D
+    __ fcm(Assembler::GE, v5, __ T2S, v6, v7);         //       fcmge   v5.2S, v6.2S, v7.2S
+    __ fcm(Assembler::GE, v27, __ T4S, v28, v29);      //       fcmge   v27.4S, v28.4S, v29.4S
+    __ fcm(Assembler::GE, v0, __ T2D, v1, v2);         //       fcmge   v0.2D, v1.2D, v2.2D
 
 // SVEComparisonWithZero
-    __ sve_fcm(Assembler::EQ, p11, __ D, p3, z2, 0.0); //       fcmeq   p11.d, p3/z, z2.d, #0.0
-    __ sve_fcm(Assembler::GT, p2, __ D, p7, z28, 0.0); //       fcmgt   p2.d, p7/z, z28.d, #0.0
-    __ sve_fcm(Assembler::GE, p8, __ S, p2, z27, 0.0); //       fcmge   p8.s, p2/z, z27.s, #0.0
-    __ sve_fcm(Assembler::LT, p14, __ S, p1, z18, 0.0); //      fcmlt   p14.s, p1/z, z18.s, #0.0
-    __ sve_fcm(Assembler::LE, p3, __ S, p5, z15, 0.0); //       fcmle   p3.s, p5/z, z15.s, #0.0
-    __ sve_fcm(Assembler::NE, p4, __ D, p5, z2, 0.0);  //       fcmne   p4.d, p5/z, z2.d, #0.0
+    __ sve_fcm(Assembler::EQ, p8, __ S, p6, z15, 0.0); //       fcmeq   p8.s, p6/z, z15.s, #0.0
+    __ sve_fcm(Assembler::GT, p4, __ D, p6, z28, 0.0); //       fcmgt   p4.d, p6/z, z28.d, #0.0
+    __ sve_fcm(Assembler::GE, p13, __ D, p0, z25, 0.0); //      fcmge   p13.d, p0/z, z25.d, #0.0
+    __ sve_fcm(Assembler::LT, p2, __ D, p0, z6, 0.0);  //       fcmlt   p2.d, p0/z, z6.d, #0.0
+    __ sve_fcm(Assembler::LE, p2, __ S, p2, z15, 0.0); //       fcmle   p2.s, p2/z, z15.s, #0.0
+    __ sve_fcm(Assembler::NE, p3, __ S, p7, z5, 0.0);  //       fcmne   p3.s, p7/z, z5.s, #0.0
 
 // SVEComparisonWithImm
-    __ sve_cmp(Assembler::EQ, p15, __ D, p0, z5, 1);   //       cmpeq   p15.d, p0/z, z5.d, #1
-    __ sve_cmp(Assembler::GT, p7, __ D, p2, z4, 12);   //       cmpgt   p7.d, p2/z, z4.d, #12
-    __ sve_cmp(Assembler::GE, p11, __ D, p6, z27, 7);  //       cmpge   p11.d, p6/z, z27.d, #7
-    __ sve_cmp(Assembler::LT, p0, __ B, p4, z4, -16);  //       cmplt   p0.b, p4/z, z4.b, #-16
-    __ sve_cmp(Assembler::LE, p2, __ B, p2, z15, -9);  //       cmple   p2.b, p2/z, z15.b, #-9
-    __ sve_cmp(Assembler::NE, p2, __ D, p1, z10, 4);   //       cmpne   p2.d, p1/z, z10.d, #4
-    __ sve_cmp(Assembler::HS, p11, __ B, p2, z21, 34); //       cmphs   p11.b, p2/z, z21.b, #34
-    __ sve_cmp(Assembler::HI, p8, __ B, p4, z31, 8);   //       cmphi   p8.b, p4/z, z31.b, #8
-    __ sve_cmp(Assembler::LS, p6, __ D, p0, z30, 109); //       cmpls   p6.d, p0/z, z30.d, #109
-    __ sve_cmp(Assembler::LO, p11, __ H, p3, z29, 114); //      cmplo   p11.h, p3/z, z29.h, #114
+    __ sve_cmp(Assembler::EQ, p3, __ S, p5, z20, -10); //       cmpeq   p3.s, p5/z, z20.s, #-10
+    __ sve_cmp(Assembler::GT, p5, __ S, p7, z8, -10);  //       cmpgt   p5.s, p7/z, z8.s, #-10
+    __ sve_cmp(Assembler::GE, p8, __ H, p7, z2, 13);   //       cmpge   p8.h, p7/z, z2.h, #13
+    __ sve_cmp(Assembler::LT, p1, __ S, p7, z27, -2);  //       cmplt   p1.s, p7/z, z27.s, #-2
+    __ sve_cmp(Assembler::LE, p6, __ S, p6, z28, -11); //       cmple   p6.s, p6/z, z28.s, #-11
+    __ sve_cmp(Assembler::NE, p1, __ H, p4, z14, -5);  //       cmpne   p1.h, p4/z, z14.h, #-5
+    __ sve_cmp(Assembler::HS, p13, __ H, p1, z23, 90); //       cmphs   p13.h, p1/z, z23.h, #90
+    __ sve_cmp(Assembler::HI, p8, __ B, p4, z4, 66);   //       cmphi   p8.b, p4/z, z4.b, #66
+    __ sve_cmp(Assembler::LS, p9, __ H, p3, z13, 11);  //       cmpls   p9.h, p3/z, z13.h, #11
+    __ sve_cmp(Assembler::LO, p8, __ S, p5, z3, 21);   //       cmplo   p8.s, p5/z, z3.s, #21
 
 // SpecialCases
     __ ccmn(zr, zr, 3u, Assembler::LE);                //       ccmn    xzr, xzr, #3, LE
@@ -927,8 +955,14 @@
     __ fmovd(v14, __ T2D, 0.5f);                       //       fmov    v14.2d, 0.5
     __ ld1(v31, v0, __ T2D, Address(__ post(r1, r0))); //       ld1     {v31.2d, v0.2d}, [x1], x0
     __ fcvtzs(v0, __ T2S, v1);                         //       fcvtzs  v0.2s, v1.2s
+    __ fcvtzs(v0, __ T4H, v1);                         //       fcvtzs  v0.4h, v1.4h
+    __ fcvtzs(v0, __ T8H, v1);                         //       fcvtzs  v0.8h, v1.8h
     __ fcvtas(v2, __ T4S, v3);                         //       fcvtas  v2.4s, v3.4s
+    __ fcvtas(v2, __ T4H, v3);                         //       fcvtas  v2.4h, v3.4h
+    __ fcvtas(v2, __ T8H, v3);                         //       fcvtas  v2.8h, v3.8h
     __ fcvtms(v4, __ T2D, v5);                         //       fcvtms  v4.2d, v5.2d
+    __ fcvtms(v4, __ T4H, v5);                         //       fcvtms  v4.4h, v5.4h
+    __ fcvtms(v4, __ T8H, v5);                         //       fcvtms  v4.8h, v5.8h
     __ sve_cpy(z0, __ S, p0, v1);                      //       mov     z0.s, p0/m, s1
     __ sve_cpy(z0, __ B, p0, 127, true);               //       mov     z0.b, p0/m, 127
     __ sve_cpy(z1, __ H, p0, -128, true);              //       mov     z1.h, p0/m, -128
@@ -1152,239 +1186,239 @@
     __ fmovd(v0, -1.0625);                             //       fmov d0, #-1.0625
 
 // LSEOp
-    __ swp(Assembler::xword, r17, r24, r5);            //       swp     x17, x24, [x5]
-    __ ldadd(Assembler::xword, r2, r14, r10);          //       ldadd   x2, x14, [x10]
-    __ ldbic(Assembler::xword, r16, r11, r27);         //       ldclr   x16, x11, [x27]
-    __ ldeor(Assembler::xword, r23, r12, r4);          //       ldeor   x23, x12, [x4]
-    __ ldorr(Assembler::xword, r22, r17, r4);          //       ldset   x22, x17, [x4]
-    __ ldsmin(Assembler::xword, r1, r19, r16);         //       ldsmin  x1, x19, [x16]
-    __ ldsmax(Assembler::xword, r16, r13, r14);        //       ldsmax  x16, x13, [x14]
-    __ ldumin(Assembler::xword, r12, r2, r17);         //       ldumin  x12, x2, [x17]
-    __ ldumax(Assembler::xword, r3, r21, r23);         //       ldumax  x3, x21, [x23]
+    __ swp(Assembler::xword, r6, r7, r19);             //       swp     x6, x7, [x19]
+    __ ldadd(Assembler::xword, r13, r28, r17);         //       ldadd   x13, x28, [x17]
+    __ ldbic(Assembler::xword, r16, r6, r2);           //       ldclr   x16, x6, [x2]
+    __ ldeor(Assembler::xword, r29, r3, r4);           //       ldeor   x29, x3, [x4]
+    __ ldorr(Assembler::xword, r6, r16, r20);          //       ldset   x6, x16, [x20]
+    __ ldsmin(Assembler::xword, r13, r12, r20);        //       ldsmin  x13, x12, [x20]
+    __ ldsmax(Assembler::xword, r8, r25, r20);         //       ldsmax  x8, x25, [x20]
+    __ ldumin(Assembler::xword, r19, r0, r11);         //       ldumin  x19, x0, [x11]
+    __ ldumax(Assembler::xword, r24, r6, r20);         //       ldumax  x24, x6, [x20]
 
 // LSEOp
-    __ swpa(Assembler::xword, r5, r6, r7);             //       swpa    x5, x6, [x7]
-    __ ldadda(Assembler::xword, r19, r13, r28);        //       ldadda  x19, x13, [x28]
-    __ ldbica(Assembler::xword, r17, r16, r6);         //       ldclra  x17, x16, [x6]
-    __ ldeora(Assembler::xword, r2, r29, r3);          //       ldeora  x2, x29, [x3]
-    __ ldorra(Assembler::xword, r4, r6, r15);          //       ldseta  x4, x6, [x15]
-    __ ldsmina(Assembler::xword, r20, r13, r12);       //       ldsmina x20, x13, [x12]
-    __ ldsmaxa(Assembler::xword, r20, r8, r25);        //       ldsmaxa x20, x8, [x25]
-    __ ldumina(Assembler::xword, r20, r19, r0);        //       ldumina x20, x19, [x0]
-    __ ldumaxa(Assembler::xword, r11, r24, r6);        //       ldumaxa x11, x24, [x6]
+    __ swpa(Assembler::xword, zr, r14, r16);           //       swpa    xzr, x14, [x16]
+    __ ldadda(Assembler::xword, r6, r0, r7);           //       ldadda  x6, x0, [x7]
+    __ ldbica(Assembler::xword, r15, r19, r26);        //       ldclra  x15, x19, [x26]
+    __ ldeora(Assembler::xword, r9, r10, r23);         //       ldeora  x9, x10, [x23]
+    __ ldorra(Assembler::xword, r21, r22, r28);        //       ldseta  x21, x22, [x28]
+    __ ldsmina(Assembler::xword, r2, r3, r15);         //       ldsmina x2, x3, [x15]
+    __ ldsmaxa(Assembler::xword, r19, r20, r7);        //       ldsmaxa x19, x20, [x7]
+    __ ldumina(Assembler::xword, r4, r29, r7);         //       ldumina x4, x29, [x7]
+    __ ldumaxa(Assembler::xword, r0, r9, r16);         //       ldumaxa x0, x9, [x16]
 
 // LSEOp
-    __ swpal(Assembler::xword, r20, zr, r14);          //       swpal   x20, xzr, [x14]
-    __ ldaddal(Assembler::xword, r16, r6, r0);         //       ldaddal x16, x6, [x0]
-    __ ldbical(Assembler::xword, r7, r15, r19);        //       ldclral x7, x15, [x19]
-    __ ldeoral(Assembler::xword, r26, r9, r10);        //       ldeoral x26, x9, [x10]
-    __ ldorral(Assembler::xword, r23, r21, r22);       //       ldsetal x23, x21, [x22]
-    __ ldsminal(Assembler::xword, r28, r2, r3);        //       ldsminal        x28, x2, [x3]
-    __ ldsmaxal(Assembler::xword, r15, r19, r20);      //       ldsmaxal        x15, x19, [x20]
-    __ lduminal(Assembler::xword, r7, r4, r29);        //       lduminal        x7, x4, [x29]
-    __ ldumaxal(Assembler::xword, r7, r0, r9);         //       ldumaxal        x7, x0, [x9]
+    __ swpal(Assembler::xword, r20, r23, r4);          //       swpal   x20, x23, [x4]
+    __ ldaddal(Assembler::xword, r16, r10, r23);       //       ldaddal x16, x10, [x23]
+    __ ldbical(Assembler::xword, r11, r25, r6);        //       ldclral x11, x25, [x6]
+    __ ldeoral(Assembler::xword, zr, r16, r13);        //       ldeoral xzr, x16, [x13]
+    __ ldorral(Assembler::xword, r23, r12, r1);        //       ldsetal x23, x12, [x1]
+    __ ldsminal(Assembler::xword, r14, r9, r21);       //       ldsminal        x14, x9, [x21]
+    __ ldsmaxal(Assembler::xword, r16, r26, r15);      //       ldsmaxal        x16, x26, [x15]
+    __ lduminal(Assembler::xword, r4, r4, r15);        //       lduminal        x4, x4, [x15]
+    __ ldumaxal(Assembler::xword, r8, r6, r30);        //       ldumaxal        x8, x6, [x30]
 
 // LSEOp
-    __ swpl(Assembler::xword, r16, r20, r23);          //       swpl    x16, x20, [x23]
-    __ ldaddl(Assembler::xword, r4, r16, r10);         //       ldaddl  x4, x16, [x10]
-    __ ldbicl(Assembler::xword, r23, r11, r25);        //       ldclrl  x23, x11, [x25]
-    __ ldeorl(Assembler::xword, r6, zr, r16);          //       ldeorl  x6, xzr, [x16]
-    __ ldorrl(Assembler::xword, r13, r23, r12);        //       ldsetl  x13, x23, [x12]
-    __ ldsminl(Assembler::xword, r1, r14, r9);         //       ldsminl x1, x14, [x9]
-    __ ldsmaxl(Assembler::xword, r21, r16, r26);       //       ldsmaxl x21, x16, [x26]
-    __ lduminl(Assembler::xword, r15, r4, r4);         //       lduminl x15, x4, [x4]
-    __ ldumaxl(Assembler::xword, r16, r8, r6);         //       ldumaxl x16, x8, [x6]
+    __ swpl(Assembler::xword, r4, r29, r17);           //       swpl    x4, x29, [x17]
+    __ ldaddl(Assembler::xword, r29, r26, r9);         //       ldaddl  x29, x26, [x9]
+    __ ldbicl(Assembler::xword, r15, r2, r11);         //       ldclrl  x15, x2, [x11]
+    __ ldeorl(Assembler::xword, r29, r3, r7);          //       ldeorl  x29, x3, [x7]
+    __ ldorrl(Assembler::xword, r1, r27, r21);         //       ldsetl  x1, x27, [x21]
+    __ ldsminl(Assembler::xword, r16, r14, r8);        //       ldsminl x16, x14, [x8]
+    __ ldsmaxl(Assembler::xword, r16, r22, r25);       //       ldsmaxl x16, x22, [x25]
+    __ lduminl(Assembler::xword, r5, r20, r21);        //       lduminl x5, x20, [x21]
+    __ ldumaxl(Assembler::xword, r16, r23, r16);       //       ldumaxl x16, x23, [x16]
 
 // LSEOp
-    __ swp(Assembler::word, r30, r4, r29);             //       swp     w30, w4, [x29]
-    __ ldadd(Assembler::word, r17, r29, r26);          //       ldadd   w17, w29, [x26]
-    __ ldbic(Assembler::word, r9, r15, r2);            //       ldclr   w9, w15, [x2]
-    __ ldeor(Assembler::word, r11, r29, r3);           //       ldeor   w11, w29, [x3]
-    __ ldorr(Assembler::word, r7, r1, r27);            //       ldset   w7, w1, [x27]
-    __ ldsmin(Assembler::word, r21, r16, r14);         //       ldsmin  w21, w16, [x14]
-    __ ldsmax(Assembler::word, r8, r16, r22);          //       ldsmax  w8, w16, [x22]
-    __ ldumin(Assembler::word, r25, r5, r20);          //       ldumin  w25, w5, [x20]
-    __ ldumax(Assembler::word, r21, r16, r23);         //       ldumax  w21, w16, [x23]
+    __ swp(Assembler::word, r30, r20, r20);            //       swp     w30, w20, [x20]
+    __ ldadd(Assembler::word, r0, r4, r19);            //       ldadd   w0, w4, [x19]
+    __ ldbic(Assembler::word, r24, r4, r20);           //       ldclr   w24, w4, [x20]
+    __ ldeor(Assembler::word, r4, r24, r26);           //       ldeor   w4, w24, [x26]
+    __ ldorr(Assembler::word, r19, r2, r8);            //       ldset   w19, w2, [x8]
+    __ ldsmin(Assembler::word, r8, r14, r24);          //       ldsmin  w8, w14, [x24]
+    __ ldsmax(Assembler::word, r16, zr, r22);          //       ldsmax  w16, wzr, [x22]
+    __ ldumin(Assembler::word, r4, zr, r1);            //       ldumin  w4, wzr, [x1]
+    __ ldumax(Assembler::word, r10, r20, r12);         //       ldumax  w10, w20, [x12]
 
 // LSEOp
-    __ swpa(Assembler::word, r16, r30, r20);           //       swpa    w16, w30, [x20]
-    __ ldadda(Assembler::word, r20, r0, r4);           //       ldadda  w20, w0, [x4]
-    __ ldbica(Assembler::word, r19, r24, r4);          //       ldclra  w19, w24, [x4]
-    __ ldeora(Assembler::word, r20, r4, r24);          //       ldeora  w20, w4, [x24]
-    __ ldorra(Assembler::word, r26, r19, r2);          //       ldseta  w26, w19, [x2]
-    __ ldsmina(Assembler::word, r8, r8, r14);          //       ldsmina w8, w8, [x14]
-    __ ldsmaxa(Assembler::word, r24, r16, sp);         //       ldsmaxa w24, w16, [sp]
-    __ ldumina(Assembler::word, r22, r4, sp);          //       ldumina w22, w4, [sp]
-    __ ldumaxa(Assembler::word, r1, r10, r20);         //       ldumaxa w1, w10, [x20]
+    __ swpa(Assembler::word, r0, r9, r7);              //       swpa    w0, w9, [x7]
+    __ ldadda(Assembler::word, r24, r16, r4);          //       ldadda  w24, w16, [x4]
+    __ ldbica(Assembler::word, r27, r6, r10);          //       ldclra  w27, w6, [x10]
+    __ ldeora(Assembler::word, r27, r24, r13);         //       ldeora  w27, w24, [x13]
+    __ ldorra(Assembler::word, r16, zr, r22);          //       ldseta  w16, wzr, [x22]
+    __ ldsmina(Assembler::word, r22, r20, sp);         //       ldsmina w22, w20, [sp]
+    __ ldsmaxa(Assembler::word, r29, r9, r14);         //       ldsmaxa w29, w9, [x14]
+    __ ldumina(Assembler::word, r20, r7, r20);         //       ldumina w20, w7, [x20]
+    __ ldumaxa(Assembler::word, r28, r9, r11);         //       ldumaxa w28, w9, [x11]
 
 // LSEOp
-    __ swpal(Assembler::word, r12, r0, r9);            //       swpal   w12, w0, [x9]
-    __ ldaddal(Assembler::word, r7, r24, r15);         //       ldaddal w7, w24, [x15]
-    __ ldbical(Assembler::word, r4, r27, r6);          //       ldclral w4, w27, [x6]
-    __ ldeoral(Assembler::word, r10, r27, r24);        //       ldeoral w10, w27, [x24]
-    __ ldorral(Assembler::word, r13, r16, sp);         //       ldsetal w13, w16, [sp]
-    __ ldsminal(Assembler::word, r22, r22, r20);       //       ldsminal        w22, w22, [x20]
-    __ ldsmaxal(Assembler::word, zr, r29, r9);         //       ldsmaxal        wzr, w29, [x9]
-    __ lduminal(Assembler::word, r14, r20, r7);        //       lduminal        w14, w20, [x7]
-    __ ldumaxal(Assembler::word, r20, r28, r9);        //       ldumaxal        w20, w28, [x9]
+    __ swpal(Assembler::word, r14, r12, r20);          //       swpal   w14, w12, [x20]
+    __ ldaddal(Assembler::word, r1, r24, r9);          //       ldaddal w1, w24, [x9]
+    __ ldbical(Assembler::word, r19, r13, r19);        //       ldclral w19, w13, [x19]
+    __ ldeoral(Assembler::word, r16, r16, r5);         //       ldeoral w16, w16, [x5]
+    __ ldorral(Assembler::word, r0, r3, r12);          //       ldsetal w0, w3, [x12]
+    __ ldsminal(Assembler::word, r8, r15, r15);        //       ldsminal        w8, w15, [x15]
+    __ ldsmaxal(Assembler::word, r16, r4, r15);        //       ldsmaxal        w16, w4, [x15]
+    __ lduminal(Assembler::word, r30, r5, r0);         //       lduminal        w30, w5, [x0]
+    __ ldumaxal(Assembler::word, r10, r22, r27);       //       ldumaxal        w10, w22, [x27]
 
 // LSEOp
-    __ swpl(Assembler::word, r11, r14, r12);           //       swpl    w11, w14, [x12]
-    __ ldaddl(Assembler::word, r20, r1, r24);          //       ldaddl  w20, w1, [x24]
-    __ ldbicl(Assembler::word, r9, r19, r13);          //       ldclrl  w9, w19, [x13]
-    __ ldeorl(Assembler::word, r19, r16, r16);         //       ldeorl  w19, w16, [x16]
-    __ ldorrl(Assembler::word, r5, r0, r3);            //       ldsetl  w5, w0, [x3]
-    __ ldsminl(Assembler::word, r12, r8, r15);         //       ldsminl w12, w8, [x15]
-    __ ldsmaxl(Assembler::word, r15, r16, r4);         //       ldsmaxl w15, w16, [x4]
-    __ lduminl(Assembler::word, r15, r30, r5);         //       lduminl w15, w30, [x5]
-    __ ldumaxl(Assembler::word, r0, r10, r22);         //       ldumaxl w0, w10, [x22]
+    __ swpl(Assembler::word, r3, r0, r9);              //       swpl    w3, w0, [x9]
+    __ ldaddl(Assembler::word, r19, r29, r10);         //       ldaddl  w19, w29, [x10]
+    __ ldbicl(Assembler::word, r24, r4, r20);          //       ldclrl  w24, w4, [x20]
+    __ ldeorl(Assembler::word, r7, r24, r29);          //       ldeorl  w7, w24, [x29]
+    __ ldorrl(Assembler::word, r14, r21, r11);         //       ldsetl  w14, w21, [x11]
+    __ ldsminl(Assembler::word, r27, r13, r15);        //       ldsminl w27, w13, [x15]
+    __ ldsmaxl(Assembler::word, zr, r17, r14);         //       ldsmaxl wzr, w17, [x14]
+    __ lduminl(Assembler::word, r3, r30, r16);         //       lduminl w3, w30, [x16]
+    __ ldumaxl(Assembler::word, r22, r20, r7);         //       ldumaxl w22, w20, [x7]
 
 // SHA3SIMDOp
-    __ bcax(v27, __ T16B, v3, v0, v9);                 //       bcax            v27.16B, v3.16B, v0.16B, v9.16B
-    __ eor3(v19, __ T16B, v29, v10, v24);              //       eor3            v19.16B, v29.16B, v10.16B, v24.16B
-    __ rax1(v4, __ T2D, v20, v7);                      //       rax1            v4.2D, v20.2D, v7.2D
-    __ xar(v24, __ T2D, v29, v14, 43);                 //       xar             v24.2D, v29.2D, v14.2D, #43
+    __ bcax(v20, __ T16B, v3, v1, v26);                //       bcax            v20.16B, v3.16B, v1.16B, v26.16B
+    __ eor3(v19, __ T16B, v9, v16, v17);               //       eor3            v19.16B, v9.16B, v16.16B, v17.16B
+    __ rax1(v21, __ T2D, v0, v4);                      //       rax1            v21.2D, v0.2D, v4.2D
+    __ xar(v2, __ T2D, v24, v14, 12);                  //       xar             v2.2D, v24.2D, v14.2D, #12
 
 // SHA512SIMDOp
-    __ sha512h(v11, __ T2D, v27, v13);                 //       sha512h         q11, q27, v13.2D
-    __ sha512h2(v18, __ T2D, v31, v17);                //       sha512h2                q18, q31, v17.2D
-    __ sha512su0(v14, __ T2D, v3);                     //       sha512su0               v14.2D, v3.2D
-    __ sha512su1(v30, __ T2D, v16, v22);               //       sha512su1               v30.2D, v16.2D, v22.2D
+    __ sha512h(v11, __ T2D, v21, v14);                 //       sha512h         q11, q21, v14.2D
+    __ sha512h2(v17, __ T2D, v30, v12);                //       sha512h2                q17, q30, v12.2D
+    __ sha512su0(v3, __ T2D, v3);                      //       sha512su0               v3.2D, v3.2D
+    __ sha512su1(v23, __ T2D, v9, v3);                 //       sha512su1               v23.2D, v9.2D, v3.2D
 
 // SVEBinaryImmOp
-    __ sve_add(z20, __ B, 163u);                       //       add     z20.b, z20.b, #0xa3
-    __ sve_sub(z3, __ B, 215u);                        //       sub     z3.b, z3.b, #0xd7
-    __ sve_and(z19, __ H, 33279u);                     //       and     z19.h, z19.h, #0x81ff
-    __ sve_eor(z21, __ B, 12u);                        //       eor     z21.b, z21.b, #0xc
-    __ sve_orr(z24, __ H, 8064u);                      //       orr     z24.h, z24.h, #0x1f80
+    __ sve_add(z24, __ D, 26u);                        //       add     z24.d, z24.d, #0x1a
+    __ sve_sub(z19, __ S, 62u);                        //       sub     z19.s, z19.s, #0x3e
+    __ sve_and(z26, __ S, 917504u);                    //       and     z26.s, z26.s, #0xe0000
+    __ sve_eor(z8, __ D, 18442240474082197503u);       //       eor     z8.d, z8.d, #0xfff0000000003fff
+    __ sve_orr(z18, __ S, 253952u);                    //       orr     z18.s, z18.s, #0x3e000
 
 // SVEBinaryImmOp
-    __ sve_add(z21, __ H, 139u);                       //       add     z21.h, z21.h, #0x8b
-    __ sve_sub(z30, __ H, 26u);                        //       sub     z30.h, z30.h, #0x1a
-    __ sve_and(z3, __ S, 122880u);                     //       and     z3.s, z3.s, #0x1e000
-    __ sve_eor(z24, __ D, 18158513714670600195u);      //       eor     z24.d, z24.d, #0xfc000003fc000003
-    __ sve_orr(z23, __ B, 191u);                       //       orr     z23.b, z23.b, #0xbf
+    __ sve_add(z9, __ S, 97u);                         //       add     z9.s, z9.s, #0x61
+    __ sve_sub(z8, __ H, 118u);                        //       sub     z8.h, z8.h, #0x76
+    __ sve_and(z19, __ S, 1056980736u);                //       and     z19.s, z19.s, #0x3f003f00
+    __ sve_eor(z25, __ S, 3758350339u);                //       eor     z25.s, z25.s, #0xe003e003
+    __ sve_orr(z9, __ S, 4294459391u);                 //       orr     z9.s, z9.s, #0xfff83fff
 
 // SVEBinaryImmOp
-    __ sve_add(z14, __ B, 66u);                        //       add     z14.b, z14.b, #0x42
-    __ sve_sub(z26, __ B, 180u);                       //       sub     z26.b, z26.b, #0xb4
-    __ sve_and(z18, __ S, 253952u);                    //       and     z18.s, z18.s, #0x3e000
-    __ sve_eor(z9, __ S, 16744448u);                   //       eor     z9.s, z9.s, #0xff8000
-    __ sve_orr(z12, __ H, 33279u);                     //       orr     z12.h, z12.h, #0x81ff
+    __ sve_add(z23, __ D, 183u);                       //       add     z23.d, z23.d, #0xb7
+    __ sve_sub(z8, __ H, 41u);                         //       sub     z8.h, z8.h, #0x29
+    __ sve_and(z28, __ D, 8064u);                      //       and     z28.d, z28.d, #0x1f80
+    __ sve_eor(z15, __ D, 18428729675200069887u);      //       eor     z15.d, z15.d, #0xffc00000000000ff
+    __ sve_orr(z0, __ B, 239u);                        //       orr     z0.b, z0.b, #0xef
 
 // SVEBinaryImmOp
-    __ sve_add(z11, __ H, 206u);                       //       add     z11.h, z11.h, #0xce
-    __ sve_sub(z18, __ D, 154u);                       //       sub     z18.d, z18.d, #0x9a
-    __ sve_and(z9, __ S, 4294459391u);                 //       and     z9.s, z9.s, #0xfff83fff
-    __ sve_eor(z23, __ D, 562675075514368u);           //       eor     z23.d, z23.d, #0x1ffc000000000
-    __ sve_orr(z8, __ B, 243u);                        //       orr     z8.b, z8.b, #0xf3
+    __ sve_add(z5, __ D, 243u);                        //       add     z5.d, z5.d, #0xf3
+    __ sve_sub(z19, __ S, 8u);                         //       sub     z19.s, z19.s, #0x8
+    __ sve_and(z13, __ H, 32256u);                     //       and     z13.h, z13.h, #0x7e00
+    __ sve_eor(z0, __ S, 4294967293u);                 //       eor     z0.s, z0.s, #0xfffffffd
+    __ sve_orr(z21, __ S, 4294965263u);                //       orr     z21.s, z21.s, #0xfffff80f
 
 // SVEBinaryImmOp
-    __ sve_add(z10, __ B, 121u);                       //       add     z10.b, z10.b, #0x79
-    __ sve_sub(z25, __ S, 172u);                       //       sub     z25.s, z25.s, #0xac
-    __ sve_and(z0, __ B, 239u);                        //       and     z0.b, z0.b, #0xef
-    __ sve_eor(z5, __ D, 17870287719452639231u);       //       eor     z5.d, z5.d, #0xf80003ffffffffff
-    __ sve_orr(z17, __ B, 128u);                       //       orr     z17.b, z17.b, #0x80
+    __ sve_add(z12, __ H, 20u);                        //       add     z12.h, z12.h, #0x14
+    __ sve_sub(z0, __ H, 190u);                        //       sub     z0.h, z0.h, #0xbe
+    __ sve_and(z23, __ B, 239u);                       //       and     z23.b, z23.b, #0xef
+    __ sve_eor(z27, __ D, 18442240474082197503u);      //       eor     z27.d, z27.d, #0xfff0000000003fff
+    __ sve_orr(z22, __ B, 124u);                       //       orr     z22.b, z22.b, #0x7c
 
 // SVEBinaryImmOp
-    __ sve_add(z30, __ H, 3u);                         //       add     z30.h, z30.h, #0x3
-    __ sve_sub(z18, __ B, 253u);                       //       sub     z18.b, z18.b, #0xfd
-    __ sve_and(z21, __ S, 4294965263u);                //       and     z21.s, z21.s, #0xfffff80f
-    __ sve_eor(z12, __ H, 1u);                         //       eor     z12.h, z12.h, #0x1
-    __ sve_orr(z15, __ S, 1u);                         //       orr     z15.s, z15.s, #0x1
+    __ sve_add(z20, __ H, 165u);                       //       add     z20.h, z20.h, #0xa5
+    __ sve_sub(z24, __ D, 72u);                        //       sub     z24.d, z24.d, #0x48
+    __ sve_and(z31, __ S, 4026535935u);                //       and     z31.s, z31.s, #0xf0000fff
+    __ sve_eor(z21, __ B, 128u);                       //       eor     z21.b, z21.b, #0x80
+    __ sve_orr(z30, __ S, 4294967293u);                //       orr     z30.s, z30.s, #0xfffffffd
 
 // SVEVectorOp
-    __ sve_add(z19, __ D, z26, z27);                   //       add     z19.d, z26.d, z27.d
-    __ sve_sub(z13, __ B, z22, z22);                   //       sub     z13.b, z22.b, z22.b
-    __ sve_fadd(z1, __ S, z11, z20);                   //       fadd    z1.s, z11.s, z20.s
-    __ sve_fmul(z20, __ S, z24, z24);                  //       fmul    z20.s, z24.s, z24.s
-    __ sve_fsub(z31, __ D, z17, z20);                  //       fsub    z31.d, z17.d, z20.d
-    __ sve_sqadd(z21, __ H, z4, z21);                  //       sqadd   z21.h, z4.h, z21.h
-    __ sve_sqsub(z30, __ D, z22, z31);                 //       sqsub   z30.d, z22.d, z31.d
-    __ sve_uqadd(z26, __ H, z18, z19);                 //       uqadd   z26.h, z18.h, z19.h
-    __ sve_uqsub(z11, __ S, z13, z29);                 //       uqsub   z11.s, z13.s, z29.s
-    __ sve_abs(z5, __ H, p0, z14);                     //       abs     z5.h, p0/m, z14.h
-    __ sve_add(z2, __ H, p1, z10);                     //       add     z2.h, p1/m, z2.h, z10.h
-    __ sve_and(z19, __ H, p1, z26);                    //       and     z19.h, p1/m, z19.h, z26.h
-    __ sve_asr(z2, __ B, p0, z30);                     //       asr     z2.b, p0/m, z2.b, z30.b
-    __ sve_bic(z20, __ D, p1, z20);                    //       bic     z20.d, p1/m, z20.d, z20.d
-    __ sve_clz(z29, __ H, p3, z13);                    //       clz     z29.h, p3/m, z13.h
-    __ sve_cnt(z14, __ H, p7, z1);                     //       cnt     z14.h, p7/m, z1.h
-    __ sve_eor(z28, __ D, p0, z3);                     //       eor     z28.d, p0/m, z28.d, z3.d
-    __ sve_lsl(z9, __ B, p6, z9);                      //       lsl     z9.b, p6/m, z9.b, z9.b
-    __ sve_lsr(z26, __ B, p2, z14);                    //       lsr     z26.b, p2/m, z26.b, z14.b
-    __ sve_mul(z20, __ D, p6, z7);                     //       mul     z20.d, p6/m, z20.d, z7.d
-    __ sve_neg(z20, __ D, p4, z6);                     //       neg     z20.d, p4/m, z6.d
-    __ sve_not(z13, __ H, p0, z29);                    //       not     z13.h, p0/m, z29.h
-    __ sve_orr(z9, __ B, p0, z1);                      //       orr     z9.b, p0/m, z9.b, z1.b
-    __ sve_rbit(z27, __ B, p6, z15);                   //       rbit    z27.b, p6/m, z15.b
-    __ sve_revb(z4, __ D, p7, z17);                    //       revb    z4.d, p7/m, z17.d
-    __ sve_smax(z2, __ B, p0, z24);                    //       smax    z2.b, p0/m, z2.b, z24.b
-    __ sve_smin(z26, __ B, p7, z13);                   //       smin    z26.b, p7/m, z26.b, z13.b
-    __ sve_umax(z22, __ D, p3, z16);                   //       umax    z22.d, p3/m, z22.d, z16.d
-    __ sve_umin(z17, __ D, p1, z11);                   //       umin    z17.d, p1/m, z17.d, z11.d
-    __ sve_sub(z16, __ B, p0, z16);                    //       sub     z16.b, p0/m, z16.b, z16.b
-    __ sve_fabs(z28, __ D, p1, z23);                   //       fabs    z28.d, p1/m, z23.d
-    __ sve_fadd(z28, __ D, p4, z10);                   //       fadd    z28.d, p4/m, z28.d, z10.d
-    __ sve_fdiv(z17, __ D, p7, z7);                    //       fdiv    z17.d, p7/m, z17.d, z7.d
-    __ sve_fmax(z4, __ S, p3, z24);                    //       fmax    z4.s, p3/m, z4.s, z24.s
-    __ sve_fmin(z9, __ S, p2, z11);                    //       fmin    z9.s, p2/m, z9.s, z11.s
-    __ sve_fmul(z4, __ D, p5, z22);                    //       fmul    z4.d, p5/m, z4.d, z22.d
-    __ sve_fneg(z4, __ S, p0, z15);                    //       fneg    z4.s, p0/m, z15.s
-    __ sve_frintm(z4, __ D, p7, z26);                  //       frintm  z4.d, p7/m, z26.d
-    __ sve_frintn(z5, __ S, p5, z26);                  //       frintn  z5.s, p5/m, z26.s
-    __ sve_frintp(z31, __ S, p0, z25);                 //       frintp  z31.s, p0/m, z25.s
-    __ sve_fsqrt(z8, __ D, p1, z3);                    //       fsqrt   z8.d, p1/m, z3.d
-    __ sve_fsub(z7, __ D, p6, z24);                    //       fsub    z7.d, p6/m, z7.d, z24.d
-    __ sve_fmad(z24, __ S, p7, z17, z1);               //       fmad    z24.s, p7/m, z17.s, z1.s
-    __ sve_fmla(z12, __ D, p7, z13, z8);               //       fmla    z12.d, p7/m, z13.d, z8.d
-    __ sve_fmls(z29, __ D, p0, z31, z23);              //       fmls    z29.d, p0/m, z31.d, z23.d
-    __ sve_fmsb(z20, __ D, p0, z21, z7);               //       fmsb    z20.d, p0/m, z21.d, z7.d
-    __ sve_fnmad(z29, __ D, p6, z22, z8);              //       fnmad   z29.d, p6/m, z22.d, z8.d
-    __ sve_fnmsb(z26, __ D, p5, z5, z6);               //       fnmsb   z26.d, p5/m, z5.d, z6.d
-    __ sve_fnmla(z18, __ S, p3, z26, z21);             //       fnmla   z18.s, p3/m, z26.s, z21.s
-    __ sve_fnmls(z0, __ S, p4, z10, z28);              //       fnmls   z0.s, p4/m, z10.s, z28.s
-    __ sve_mla(z17, __ D, p1, z30, z20);               //       mla     z17.d, p1/m, z30.d, z20.d
-    __ sve_mls(z28, __ S, p3, z17, z14);               //       mls     z28.s, p3/m, z17.s, z14.s
-    __ sve_and(z10, z26, z11);                         //       and     z10.d, z26.d, z11.d
-    __ sve_eor(z0, z11, z15);                          //       eor     z0.d, z11.d, z15.d
-    __ sve_orr(z23, z23, z20);                         //       orr     z23.d, z23.d, z20.d
-    __ sve_bic(z23, z20, z29);                         //       bic     z23.d, z20.d, z29.d
-    __ sve_uzp1(z0, __ S, z27, z6);                    //       uzp1    z0.s, z27.s, z6.s
-    __ sve_uzp2(z13, __ H, z12, z4);                   //       uzp2    z13.h, z12.h, z4.h
-    __ sve_fabd(z31, __ D, p6, z23);                   //       fabd    z31.d, p6/m, z31.d, z23.d
-    __ sve_bext(z6, __ D, z2, z29);                    //       bext    z6.d, z2.d, z29.d
-    __ sve_bdep(z0, __ B, z29, z23);                   //       bdep    z0.b, z29.b, z23.b
-    __ sve_eor3(z4, z5, z8);                           //       eor3    z4.d, z4.d, z5.d, z8.d
-    __ sve_sqadd(z13, __ H, p4, z13);                  //       sqadd   z13.h, p4/m, z13.h, z13.h
-    __ sve_sqsub(z8, __ H, p2, z8);                    //       sqsub   z8.h, p2/m, z8.h, z8.h
-    __ sve_uqadd(z19, __ S, p0, z29);                  //       uqadd   z19.s, p0/m, z19.s, z29.s
-    __ sve_uqsub(z16, __ D, p3, z23);                  //       uqsub   z16.d, p3/m, z16.d, z23.d
+    __ sve_add(z26, __ H, z18, z19);                   //       add     z26.h, z18.h, z19.h
+    __ sve_sub(z11, __ S, z13, z29);                   //       sub     z11.s, z13.s, z29.s
+    __ sve_fadd(z5, __ S, z1, z14);                    //       fadd    z5.s, z1.s, z14.s
+    __ sve_fmul(z2, __ S, z7, z10);                    //       fmul    z2.s, z7.s, z10.s
+    __ sve_fsub(z19, __ S, z4, z26);                   //       fsub    z19.s, z4.s, z26.s
+    __ sve_sqadd(z2, __ B, z3, z30);                   //       sqadd   z2.b, z3.b, z30.b
+    __ sve_sqsub(z20, __ D, z5, z20);                  //       sqsub   z20.d, z5.d, z20.d
+    __ sve_uqadd(z29, __ H, z13, z13);                 //       uqadd   z29.h, z13.h, z13.h
+    __ sve_uqsub(z14, __ H, z30, z1);                  //       uqsub   z14.h, z30.h, z1.h
+    __ sve_abs(z28, __ D, p0, z3);                     //       abs     z28.d, p0/m, z3.d
+    __ sve_add(z9, __ B, p6, z9);                      //       add     z9.b, p6/m, z9.b, z9.b
+    __ sve_and(z26, __ B, p2, z14);                    //       and     z26.b, p2/m, z26.b, z14.b
+    __ sve_asr(z20, __ D, p6, z7);                     //       asr     z20.d, p6/m, z20.d, z7.d
+    __ sve_bic(z20, __ D, p4, z6);                     //       bic     z20.d, p4/m, z20.d, z6.d
+    __ sve_clz(z13, __ H, p0, z29);                    //       clz     z13.h, p0/m, z29.h
+    __ sve_cnt(z9, __ B, p0, z1);                      //       cnt     z9.b, p0/m, z1.b
+    __ sve_eor(z27, __ B, p6, z15);                    //       eor     z27.b, p6/m, z27.b, z15.b
+    __ sve_lsl(z4, __ D, p7, z17);                     //       lsl     z4.d, p7/m, z4.d, z17.d
+    __ sve_lsr(z2, __ B, p0, z24);                     //       lsr     z2.b, p0/m, z2.b, z24.b
+    __ sve_mul(z26, __ B, p7, z13);                    //       mul     z26.b, p7/m, z26.b, z13.b
+    __ sve_neg(z22, __ D, p3, z16);                    //       neg     z22.d, p3/m, z16.d
+    __ sve_not(z17, __ D, p1, z11);                    //       not     z17.d, p1/m, z11.d
+    __ sve_orr(z16, __ B, p0, z16);                    //       orr     z16.b, p0/m, z16.b, z16.b
+    __ sve_rbit(z28, __ D, p1, z23);                   //       rbit    z28.d, p1/m, z23.d
+    __ sve_revb(z28, __ D, p4, z10);                   //       revb    z28.d, p4/m, z10.d
+    __ sve_smax(z17, __ S, p7, z7);                    //       smax    z17.s, p7/m, z17.s, z7.s
+    __ sve_smin(z4, __ H, p3, z24);                    //       smin    z4.h, p3/m, z4.h, z24.h
+    __ sve_umax(z9, __ B, p2, z11);                    //       umax    z9.b, p2/m, z9.b, z11.b
+    __ sve_umin(z4, __ S, p5, z22);                    //       umin    z4.s, p5/m, z4.s, z22.s
+    __ sve_sub(z4, __ H, p0, z15);                     //       sub     z4.h, p0/m, z4.h, z15.h
+    __ sve_fabs(z4, __ D, p7, z26);                    //       fabs    z4.d, p7/m, z26.d
+    __ sve_fadd(z5, __ S, p5, z26);                    //       fadd    z5.s, p5/m, z5.s, z26.s
+    __ sve_fdiv(z31, __ S, p0, z25);                   //       fdiv    z31.s, p0/m, z31.s, z25.s
+    __ sve_fmax(z8, __ D, p1, z3);                     //       fmax    z8.d, p1/m, z8.d, z3.d
+    __ sve_fmin(z7, __ D, p6, z24);                    //       fmin    z7.d, p6/m, z7.d, z24.d
+    __ sve_fmul(z24, __ S, p7, z17);                   //       fmul    z24.s, p7/m, z24.s, z17.s
+    __ sve_fneg(z10, __ S, p3, z30);                   //       fneg    z10.s, p3/m, z30.s
+    __ sve_frintm(z8, __ S, p6, z29);                  //       frintm  z8.s, p6/m, z29.s
+    __ sve_frintn(z31, __ D, p5, z31);                 //       frintn  z31.d, p5/m, z31.d
+    __ sve_frintp(z0, __ D, p5, z7);                   //       frintp  z0.d, p5/m, z7.d
+    __ sve_fsqrt(z29, __ S, p6, z22);                  //       fsqrt   z29.s, p6/m, z22.s
+    __ sve_fsub(z29, __ S, p6, z20);                   //       fsub    z29.s, p6/m, z29.s, z20.s
+    __ sve_fmad(z6, __ D, p4, z18, z13);               //       fmad    z6.d, p4/m, z18.d, z13.d
+    __ sve_fmla(z21, __ S, p2, z0, z19);               //       fmla    z21.s, p2/m, z0.s, z19.s
+    __ sve_fmls(z28, __ D, p1, z17, z6);               //       fmls    z28.d, p1/m, z17.d, z6.d
+    __ sve_fmsb(z20, __ D, p6, z28, z14);              //       fmsb    z20.d, p6/m, z28.d, z14.d
+    __ sve_fnmad(z14, __ S, p4, z10, z26);             //       fnmad   z14.s, p4/m, z10.s, z26.s
+    __ sve_fnmsb(z24, __ D, p0, z11, z15);             //       fnmsb   z24.d, p0/m, z11.d, z15.d
+    __ sve_fnmla(z23, __ D, p5, z20, z28);             //       fnmla   z23.d, p5/m, z20.d, z28.d
+    __ sve_fnmls(z20, __ D, p7, z24, z0);              //       fnmls   z20.d, p7/m, z24.d, z0.d
+    __ sve_mla(z6, __ B, p5, z13, z12);                //       mla     z6.b, p5/m, z13.b, z12.b
+    __ sve_mls(z13, __ S, p7, z26, z23);               //       mls     z13.s, p7/m, z26.s, z23.s
+    __ sve_and(z6, z2, z29);                           //       and     z6.d, z2.d, z29.d
+    __ sve_eor(z0, z29, z23);                          //       eor     z0.d, z29.d, z23.d
+    __ sve_orr(z4, z5, z8);                            //       orr     z4.d, z5.d, z8.d
+    __ sve_bic(z13, z17, z13);                         //       bic     z13.d, z17.d, z13.d
+    __ sve_uzp1(z8, __ H, z10, z8);                    //       uzp1    z8.h, z10.h, z8.h
+    __ sve_uzp2(z19, __ S, z0, z29);                   //       uzp2    z19.s, z0.s, z29.s
+    __ sve_fabd(z16, __ D, p3, z23);                   //       fabd    z16.d, p3/m, z16.d, z23.d
+    __ sve_bext(z23, __ B, z30, z13);                  //       bext    z23.b, z30.b, z13.b
+    __ sve_bdep(z25, __ H, z22, z0);                   //       bdep    z25.h, z22.h, z0.h
+    __ sve_eor3(z25, z30, z11);                        //       eor3    z25.d, z25.d, z30.d, z11.d
+    __ sve_sqadd(z14, __ H, p5, z22);                  //       sqadd   z14.h, p5/m, z14.h, z22.h
+    __ sve_sqsub(z5, __ H, p4, z0);                    //       sqsub   z5.h, p4/m, z5.h, z0.h
+    __ sve_uqadd(z9, __ D, p0, z3);                    //       uqadd   z9.d, p0/m, z9.d, z3.d
+    __ sve_uqsub(z14, __ H, p1, z29);                  //       uqsub   z14.h, p1/m, z14.h, z29.h
 
 // SVEReductionOp
-    __ sve_andv(v23, __ B, p7, z13);                   //       andv b23, p7, z13.b
-    __ sve_orv(v25, __ H, p5, z0);                     //       orv h25, p5, z0.h
-    __ sve_eorv(v25, __ H, p7, z11);                   //       eorv h25, p7, z11.h
-    __ sve_smaxv(v14, __ H, p5, z22);                  //       smaxv h14, p5, z22.h
-    __ sve_sminv(v5, __ H, p4, z0);                    //       sminv h5, p4, z0.h
-    __ sve_fminv(v9, __ D, p0, z3);                    //       fminv d9, p0, z3.d
-    __ sve_fmaxv(v14, __ S, p1, z29);                  //       fmaxv s14, p1, z29.s
-    __ sve_fadda(v14, __ D, p5, z4);                   //       fadda d14, p5, d14, z4.d
-    __ sve_uaddv(v27, __ S, p3, z22);                  //       uaddv d27, p3, z22.s
+    __ sve_andv(v14, __ D, p5, z4);                    //       andv d14, p5, z4.d
+    __ sve_orv(v27, __ S, p3, z22);                    //       orv s27, p3, z22.s
+    __ sve_eorv(v31, __ S, p6, z11);                   //       eorv s31, p6, z11.s
+    __ sve_smaxv(v12, __ B, p4, z28);                  //       smaxv b12, p4, z28.b
+    __ sve_sminv(v28, __ D, p4, z4);                   //       sminv d28, p4, z4.d
+    __ sve_fminv(v6, __ D, p0, z15);                   //       fminv d6, p0, z15.d
+    __ sve_fmaxv(v1, __ D, p5, z18);                   //       fmaxv d1, p5, z18.d
+    __ sve_fadda(v2, __ S, p2, z4);                    //       fadda s2, p2, s2, z4.s
+    __ sve_uaddv(v11, __ S, p2, z28);                  //       uaddv d11, p2, z28.s
 
 // AddWideNEONOp
-    __ saddwv(v31, v0, __ T8H, v1, __ T8B);            //       saddw   v31.8H, v0.8H, v1.8B
-    __ saddwv2(v24, v25, __ T8H, v26, __ T16B);        //       saddw2  v24.8H, v25.8H, v26.16B
-    __ saddwv(v11, v12, __ T4S, v13, __ T4H);          //       saddw   v11.4S, v12.4S, v13.4H
-    __ saddwv2(v16, v17, __ T4S, v18, __ T8H);         //       saddw2  v16.4S, v17.4S, v18.8H
-    __ saddwv(v12, v13, __ T2D, v14, __ T2S);          //       saddw   v12.2D, v13.2D, v14.2S
-    __ saddwv2(v17, v18, __ T2D, v19, __ T4S);         //       saddw2  v17.2D, v18.2D, v19.4S
-    __ uaddwv(v28, v29, __ T8H, v30, __ T8B);          //       uaddw   v28.8H, v29.8H, v30.8B
-    __ uaddwv2(v3, v4, __ T8H, v5, __ T16B);           //       uaddw2  v3.8H, v4.8H, v5.16B
-    __ uaddwv(v28, v29, __ T4S, v30, __ T4H);          //       uaddw   v28.4S, v29.4S, v30.4H
-    __ uaddwv2(v16, v17, __ T4S, v18, __ T8H);         //       uaddw2  v16.4S, v17.4S, v18.8H
-    __ uaddwv(v4, v5, __ T2D, v6, __ T2S);             //       uaddw   v4.2D, v5.2D, v6.2S
-    __ uaddwv2(v29, v30, __ T2D, v31, __ T4S);         //       uaddw2  v29.2D, v30.2D, v31.4S
+    __ saddwv(v3, v4, __ T8H, v5, __ T8B);             //       saddw   v3.8H, v4.8H, v5.8B
+    __ saddwv2(v21, v22, __ T8H, v23, __ T16B);        //       saddw2  v21.8H, v22.8H, v23.16B
+    __ saddwv(v31, v0, __ T4S, v1, __ T4H);            //       saddw   v31.4S, v0.4S, v1.4H
+    __ saddwv2(v11, v12, __ T4S, v13, __ T8H);         //       saddw2  v11.4S, v12.4S, v13.8H
+    __ saddwv(v24, v25, __ T2D, v26, __ T2S);          //       saddw   v24.2D, v25.2D, v26.2S
+    __ saddwv2(v21, v22, __ T2D, v23, __ T4S);         //       saddw2  v21.2D, v22.2D, v23.4S
+    __ uaddwv(v15, v16, __ T8H, v17, __ T8B);          //       uaddw   v15.8H, v16.8H, v17.8B
+    __ uaddwv2(v12, v13, __ T8H, v14, __ T16B);        //       uaddw2  v12.8H, v13.8H, v14.16B
+    __ uaddwv(v6, v7, __ T4S, v8, __ T4H);             //       uaddw   v6.4S, v7.4S, v8.4H
+    __ uaddwv2(v13, v14, __ T4S, v15, __ T8H);         //       uaddw2  v13.4S, v14.4S, v15.8H
+    __ uaddwv(v8, v9, __ T2D, v10, __ T2S);            //       uaddw   v8.2D, v9.2D, v10.2S
+    __ uaddwv2(v15, v16, __ T2D, v17, __ T4S);         //       uaddw2  v15.2D, v16.2D, v17.4S
 
     __ bind(forth);
 
@@ -1403,30 +1437,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    0x14000000,     0x17ffffd7,     0x1400048d,     0x94000000,
-    0x97ffffd4,     0x9400048a,     0x3400000a,     0x34fffa2a,
-    0x340090ea,     0x35000008,     0x35fff9c8,     0x35009088,
-    0xb400000b,     0xb4fff96b,     0xb400902b,     0xb500001d,
-    0xb5fff91d,     0xb5008fdd,     0x10000013,     0x10fff8b3,
-    0x10008f73,     0x90000013,     0x36300016,     0x3637f836,
-    0x36308ef6,     0x3758000c,     0x375ff7cc,     0x37588e8c,
+    0x14000000,     0x17ffffd7,     0x140004af,     0x94000000,
+    0x97ffffd4,     0x940004ac,     0x3400000a,     0x34fffa2a,
+    0x3400952a,     0x35000008,     0x35fff9c8,     0x350094c8,
+    0xb400000b,     0xb4fff96b,     0xb400946b,     0xb500001d,
+    0xb5fff91d,     0xb500941d,     0x10000013,     0x10fff8b3,
+    0x100093b3,     0x90000013,     0x36300016,     0x3637f836,
+    0x36309336,     0x3758000c,     0x375ff7cc,     0x375892cc,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    0x54008c60,     0x54000001,     0x54fff541,     0x54008c01,
-    0x54000002,     0x54fff4e2,     0x54008ba2,     0x54000002,
-    0x54fff482,     0x54008b42,     0x54000003,     0x54fff423,
-    0x54008ae3,     0x54000003,     0x54fff3c3,     0x54008a83,
-    0x54000004,     0x54fff364,     0x54008a24,     0x54000005,
-    0x54fff305,     0x540089c5,     0x54000006,     0x54fff2a6,
-    0x54008966,     0x54000007,     0x54fff247,     0x54008907,
-    0x54000008,     0x54fff1e8,     0x540088a8,     0x54000009,
-    0x54fff189,     0x54008849,     0x5400000a,     0x54fff12a,
-    0x540087ea,     0x5400000b,     0x54fff0cb,     0x5400878b,
-    0x5400000c,     0x54fff06c,     0x5400872c,     0x5400000d,
-    0x54fff00d,     0x540086cd,     0x5400000e,     0x54ffefae,
-    0x5400866e,     0x5400000f,     0x54ffef4f,     0x5400860f,
+    0x540090a0,     0x54000001,     0x54fff541,     0x54009041,
+    0x54000002,     0x54fff4e2,     0x54008fe2,     0x54000002,
+    0x54fff482,     0x54008f82,     0x54000003,     0x54fff423,
+    0x54008f23,     0x54000003,     0x54fff3c3,     0x54008ec3,
+    0x54000004,     0x54fff364,     0x54008e64,     0x54000005,
+    0x54fff305,     0x54008e05,     0x54000006,     0x54fff2a6,
+    0x54008da6,     0x54000007,     0x54fff247,     0x54008d47,
+    0x54000008,     0x54fff1e8,     0x54008ce8,     0x54000009,
+    0x54fff189,     0x54008c89,     0x5400000a,     0x54fff12a,
+    0x54008c2a,     0x5400000b,     0x54fff0cb,     0x54008bcb,
+    0x5400000c,     0x54fff06c,     0x54008b6c,     0x5400000d,
+    0x54fff00d,     0x54008b0d,     0x5400000e,     0x54ffefae,
+    0x54008aae,     0x5400000f,     0x54ffef4f,     0x54008a4f,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1528,172 +1562,181 @@
     0x6ea0db7a,     0x6ee0db17,     0x0e20ba0f,     0x4e20bad5,
     0x0e60b883,     0x4e60bb38,     0x0ea0b928,     0x4ea0bb59,
     0x4ee0bab4,     0x0ea0fa30,     0x4ea0fa51,     0x4ee0f862,
-    0x2ea0f841,     0x6ea0f820,     0x6ee0fb38,     0x2ea1f8a4,
-    0x6ea1f883,     0x6ee1f9ac,     0x2e20581f,     0x6e205bbc,
-    0x0e2c1d6a,     0x4e3c1f7a,     0x0ea41c62,     0x4eae1dac,
-    0x2e341e72,     0x6e211c1f,     0x0e238441,     0x4e2f85cd,
-    0x0e7f87dd,     0x4e628420,     0x0eb58693,     0x4eae85ac,
-    0x4ef38651,     0x0e380ef6,     0x4e2f0dcd,     0x0e7e0fbc,
-    0x4e600ffe,     0x0ea10c1f,     0x4ea30c41,     0x4efc0f7a,
-    0x2e3e0fbc,     0x6e260ca4,     0x2e600ffe,     0x6e660ca4,
-    0x2ea80ce6,     0x6ea00ffe,     0x6efc0f7a,     0x0e34d672,
-    0x4e2bd549,     0x4e6ad528,     0x2e2e85ac,     0x6e228420,
-    0x2e7686b4,     0x6e638441,     0x2eba8738,     0x6ea48462,
-    0x6ee28420,     0x0e2b2d49,     0x4e3a2f38,     0x0e7c2f7a,
-    0x4e722e30,     0x0ea02ffe,     0x4ea52c83,     0x4eec2d6a,
-    0x2e392f17,     0x6e2c2d6a,     0x2e662ca4,     0x6e742e72,
-    0x2ea42c62,     0x6ead2d8b,     0x6eea2d28,     0x0eacd56a,
-    0x4eb1d60f,     0x4ef3d651,     0x0e249c62,     0x4e2c9d6a,
-    0x0e6e9dac,     0x4e6e9dac,     0x0eb19e0f,     0x4eaf9dcd,
-    0x2ea4d462,     0x6ea9d507,     0x6ef6d6b4,     0x2e3cd77a,
-    0x6e32d630,     0x6e66d4a4,     0x2e24dc62,     0x6e26dca4,
-    0x6e6eddac,     0x0e749672,     0x4e7796d5,     0x0eb29630,
-    0x4eb49672,     0x0e2dcd8b,     0x4e37ced5,     0x4e79cf17,
-    0x2e6e95ac,     0x6e7c977a,     0x2eb99717,     0x6ebe97bc,
-    0x0eb0cdee,     0x4eadcd8b,     0x4efacf38,     0x2e23fc41,
-    0x6e2efdac,     0x6e61fc1f,     0x0e2c656a,     0x4e326630,
-    0x0e696507,     0x4e646462,     0x0ea56483,     0x4eaf65cd,
-    0x2e356693,     0x6e336651,     0x2e726630,     0x6e656483,
-    0x2ea36441,     0x6ead658b,     0x0e20a7fe,     0x4e27a4c5,
-    0x0e6aa528,     0x4e71a60f,     0x0ebfa7dd,     0x4ea0a7fe,
-    0x0e22f420,     0x4e36f6b4,     0x4e69f507,     0x0e366eb4,
-    0x4e396f17,     0x0e7e6fbc,     0x4e776ed5,     0x0ebd6f9b,
-    0x4ebb6f59,     0x2e276cc5,     0x6e236c41,     0x2e796f17,
-    0x6e726e30,     0x2ea16c1f,     0x6ea76cc5,     0x0e2eadac,
-    0x4e2bad49,     0x0e7eafbc,     0x4e71ae0f,     0x0ebfafdd,
-    0x4eb8aef6,     0x0e61b41f,     0x4e75b693,     0x0ea1b41f,
-    0x4ea7b4c5,     0x0e3025ee,     0x4e342672,     0x0e61241f,
-    0x4e742672,     0x0ebd279b,     0x4eb626b4,     0x0eb2f630,
-    0x4eaef5ac,     0x4eedf58b,     0x2eabed49,     0x6ea8ece6,
-    0x6ee0effe,     0x0faf11cd,     0x4fa1880f,     0x4fc710c5,
-    0x0fa750c5,     0x4f8e81ac,     0x4fca5928,     0x2fa39041,
-    0x4fa98907,     0x6fcb9949,     0x0f6d818b,     0x4f498107,
-    0x0f8880e6,     0x4f8788c5,     0x0e2f35cd,     0x4e393717,
-    0x0e633441,     0x4e6037fe,     0x0eb53693,     0x4ea734c5,
-    0x4ef33651,     0x0e243c62,     0x4e323e30,     0x0e783ef6,
-    0x4e6f3dcd,     0x0eac3d6a,     0x4eb73ed5,     0x4eff3fdd,
-    0x2e3d8f9b,     0x6e2e8dac,     0x2e7d8f9b,     0x6e658c83,
-    0x2ea38c41,     0x6ea18c1f,     0x6efa8f38,     0x2e353693,
-    0x6e333651,     0x2e6b3549,     0x6e7e37bc,     0x2ebd379b,
-    0x6eb1360f,     0x6ee93507,     0x2e373ed5,     0x6e393f17,
-    0x2e613c1f,     0x6e7b3f59,     0x2ea43c62,     0x6ea13c1f,
-    0x6efd3f9b,     0x0e34e672,     0x4e2ce56a,     0x4e79e717,
-    0x2eb5e693,     0x6ea5e483,     0x6ef4e672,     0x2e22e420,
-    0x6e3be759,     0x6e7ce77a,     0x65d22c4b,     0x65d03f92,
-    0x65902b68,     0x6591264e,     0x659135f3,     0x65d33444,
-    0x25c180af,     0x25cc0897,     0x25c71b6b,     0x25103080,
-    0x251729f2,     0x25c48552,     0x24288aab,     0x242213f8,
-    0x24fb63d6,     0x247cafab,     0xba5fd3e3,     0x3a5f03e5,
+    0x0ef8f841,     0x4ef8f820,     0x2ea0fb38,     0x6ea0f8a4,
+    0x6ee0f883,     0x2ef8f9ac,     0x6ef8f81f,     0x2ea1fbbc,
+    0x6ea1f96a,     0x6ee1fb7a,     0x2ef9f862,     0x6ef9f9ac,
+    0x2e205a72,     0x6e20581f,     0x0e231c41,     0x4e2f1dcd,
+    0x0ebf1fdd,     0x4ea21c20,     0x2e351e93,     0x6e2e1dac,
+    0x0e338651,     0x4e3886f6,     0x0e6f85cd,     0x4e7e87bc,
+    0x0ea087fe,     0x4ea1841f,     0x4ee38441,     0x0e3c0f7a,
+    0x4e3e0fbc,     0x0e660ca4,     0x4e600ffe,     0x0ea60ca4,
+    0x4ea80ce6,     0x4ee00ffe,     0x2e3c0f7a,     0x6e340e72,
+    0x2e6b0d49,     0x6e6a0d28,     0x2eae0dac,     0x6ea20c20,
+    0x6ef60eb4,     0x0e23d441,     0x4e3ad738,     0x4e64d462,
+    0x0e421420,     0x4e4b1549,     0x2e3a8738,     0x6e3c877a,
+    0x2e728630,     0x6e6087fe,     0x2ea58483,     0x6eac856a,
+    0x6ef98717,     0x0e2c2d6a,     0x4e262ca4,     0x0e742e72,
+    0x4e642c62,     0x0ead2d8b,     0x4eaa2d28,     0x4eec2d6a,
+    0x2e312e0f,     0x6e332e51,     0x2e642c62,     0x6e6c2d6a,
+    0x2eae2dac,     0x6eae2dac,     0x6ef12e0f,     0x0eafd5cd,
+    0x4ea4d462,     0x4ee9d507,     0x0ed616b4,     0x4edc177a,
+    0x0e329e30,     0x4e269ca4,     0x0e649c62,     0x4e669ca4,
+    0x0eae9dac,     0x4eb49e72,     0x2eb7d6d5,     0x6eb2d630,
+    0x6ef4d672,     0x2ecd158b,     0x6ed716d5,     0x2e39d717,
+    0x6e2ed5ac,     0x6e7cd77a,     0x2e591717,     0x6e5e17bc,
+    0x2e30ddee,     0x6e2ddd8b,     0x6e7adf38,     0x2e431c41,
+    0x6e4e1dac,     0x0e61941f,     0x4e6c956a,     0x0eb29630,
+    0x4ea99507,     0x0e24cc62,     0x4e25cc83,     0x4e6fcdcd,
+    0x0e550e93,     0x4e530e51,     0x2e729630,     0x6e659483,
+    0x2ea39441,     0x6ead958b,     0x0ea0cffe,     0x4ea7ccc5,
+    0x4eeacd28,     0x0ed10e0f,     0x4edf0fdd,     0x2e20fffe,
+    0x6e22fc20,     0x6e76feb4,     0x2e493d07,     0x6e563eb4,
+    0x0e396717,     0x4e3e67bc,     0x0e7766d5,     0x4e7d679b,
+    0x0ebb6759,     0x4ea764c5,     0x2e236441,     0x6e396717,
+    0x2e726630,     0x6e61641f,     0x2ea764c5,     0x6eae65ac,
+    0x0e2ba549,     0x4e3ea7bc,     0x0e71a60f,     0x4e7fa7dd,
+    0x0eb8a6f6,     0x4ea1a41f,     0x0e35f693,     0x4e21f41f,
+    0x4e67f4c5,     0x0e5035ee,     0x4e543672,     0x0e216c1f,
+    0x4e346e72,     0x0e7d6f9b,     0x4e766eb4,     0x0eb26e30,
+    0x4eae6dac,     0x2e2d6d8b,     0x6e2b6d49,     0x2e686ce6,
+    0x6e606ffe,     0x2eb36e51,     0x6ebd6f9b,     0x0e3eafbc,
+    0x4e20affe,     0x0e69ad07,     0x4e6cad6a,     0x0eb6aeb4,
+    0x4eacad6a,     0x0e66b4a4,     0x4e7ab738,     0x0eb3b651,
+    0x4eb3b651,     0x0e3826f6,     0x4e252483,     0x0e7f27dd,
+    0x4e71260f,     0x0eb826f6,     0x4eb52693,     0x0eb5f693,
+    0x4eb8f6f6,     0x4ee4f462,     0x0ed1360f,     0x4ec834e6,
+    0x2eaeedac,     0x6eb2ee30,     0x6eeded8b,     0x2ecf2dcd,
+    0x6ed92f17,     0x0f81100f,     0x4f848862,     0x4fc31841,
+    0x0fad518b,     0x4fa780c5,     0x4fd059ee,     0x2fa890e6,
+    0x4fa38841,     0x6fc1900f,     0x0f7b8149,     0x4f4688a4,
+    0x0faf81cd,     0x4fa58083,     0x0e3736d5,     0x4e393717,
+    0x0e61341f,     0x4e7b3759,     0x0ea43462,     0x4ea1341f,
+    0x4efd379b,     0x0e343e72,     0x4e2c3d6a,     0x0e793f17,
+    0x4e753e93,     0x0ea53c83,     0x4eb43e72,     0x4ee23c20,
+    0x2e3b8f59,     0x6e3c8f7a,     0x2e798f17,     0x6e648c62,
+    0x2eb48e72,     0x6eae8dac,     0x6ee68ca4,     0x2e3e37bc,
+    0x6e2037fe,     0x2e7f37dd,     0x6e723630,     0x2ebd379b,
+    0x6ea834e6,     0x6eeb3549,     0x2e3f3fdd,     0x6e343e72,
+    0x2e693d07,     0x6e663ca4,     0x2ea93d07,     0x6eb13e0f,
+    0x6eeb3d49,     0x0e39e717,     0x4e2ae528,     0x4e64e462,
+    0x2ebee7bc,     0x6eb7e6d5,     0x6ee1e41f,     0x2e27e4c5,
+    0x6e3de79b,     0x6e62e420,     0x659239e8,     0x65d03b94,
+    0x65d0232d,     0x65d120c2,     0x659129f2,     0x65933ca3,
+    0x25969683,     0x25961d15,     0x254d1c48,     0x259e3f61,
+    0x25953b96,     0x255b91d1,     0x247686ed,     0x24309098,
+    0x2462edb9,     0x24a57468,     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,     0xf83180b8,     0xf822014e,
-    0xf830136b,     0xf837208c,     0xf8363091,     0xf8215213,
-    0xf83041cd,     0xf82c7222,     0xf82362f5,     0xf8a580e6,
-    0xf8b3038d,     0xf8b110d0,     0xf8a2207d,     0xf8a431e6,
-    0xf8b4518d,     0xf8b44328,     0xf8b47013,     0xf8ab60d8,
-    0xf8f481df,     0xf8f00006,     0xf8e7126f,     0xf8fa2149,
-    0xf8f732d5,     0xf8fc5062,     0xf8ef4293,     0xf8e773a4,
-    0xf8e76120,     0xf87082f4,     0xf8640150,     0xf877132b,
-    0xf866221f,     0xf86d3197,     0xf861512e,     0xf8754350,
-    0xf86f7084,     0xf87060c8,     0xb83e83a4,     0xb831035d,
-    0xb829104f,     0xb82b207d,     0xb8273361,     0xb83551d0,
-    0xb82842d0,     0xb8397285,     0xb83562f0,     0xb8b0829e,
-    0xb8b40080,     0xb8b31098,     0xb8b42304,     0xb8ba3053,
-    0xb8a851c8,     0xb8b843f0,     0xb8b673e4,     0xb8a1628a,
-    0xb8ec8120,     0xb8e701f8,     0xb8e410db,     0xb8ea231b,
-    0xb8ed33f0,     0xb8f65296,     0xb8ff413d,     0xb8ee70f4,
-    0xb8f4613c,     0xb86b818e,     0xb8740301,     0xb86911b3,
-    0xb8732210,     0xb8653060,     0xb86c51e8,     0xb86f4090,
-    0xb86f70be,     0xb86062ca,     0xce20247b,     0xce0a63b3,
-    0xce678e84,     0xce8eafb8,     0xce6d836b,     0xce7187f2,
-    0xcec0806e,     0xce768a1e,     0x2520d474,     0x2521dae3,
-    0x05800d33,     0x05403635,     0x05004cb8,     0x2560d175,
-    0x2561c35e,     0x05809863,     0x054030f8,     0x05000ed7,
-    0x2520c84e,     0x2521d69a,     0x05809892,     0x05408909,
-    0x05000d2c,     0x2560d9cb,     0x25e1d352,     0x05806b49,
-    0x0542d157,     0x050026a8,     0x2520cf2a,     0x25a1d599,
-    0x05801ec0,     0x05422dc5,     0x05000e11,     0x2560c07e,
-    0x2521dfb2,     0x0580ab15,     0x0540040c,     0x0500000f,
-    0x04fb0353,     0x043606cd,     0x65940161,     0x65980b14,
-    0x65d4063f,     0x04751095,     0x04ff1ade,     0x0473165a,
-    0x04bd1dab,     0x0456a1c5,     0x04400542,     0x045a0753,
-    0x041083c2,     0x04db0694,     0x0459adbd,     0x045abc2e,
-    0x04d9007c,     0x04139929,     0x041189da,     0x04d018f4,
-    0x04d7b0d4,     0x045ea3ad,     0x04180029,     0x052799fb,
-    0x05e49e24,     0x04080302,     0x040a1dba,     0x04c90e16,
-    0x04cb0571,     0x04010210,     0x04dca6fc,     0x65c0915c,
-    0x65cd9cf1,     0x65868f04,     0x65878969,     0x65c296c4,
-    0x049da1e4,     0x65c2bf44,     0x6580b745,     0x6581a33f,
-    0x65cda468,     0x65c19b07,     0x65a19e38,     0x65e81dac,
-    0x65f723fd,     0x65e7a2b4,     0x65e8dadd,     0x65e6f4ba,
-    0x65b54f52,     0x65bc7140,     0x04d447d1,     0x048e6e3c,
-    0x042b334a,     0x04af3160,     0x047432f7,     0x04fd3297,
-    0x05a66b60,     0x05646d8d,     0x65c89aff,     0x45ddb046,
-    0x4517b7a0,     0x04253904,     0x445891ad,     0x445a8908,
-    0x449983b3,     0x44db8ef0,     0x041a3db7,     0x04583419,
-    0x04593d79,     0x044836ce,     0x044a3005,     0x65c72069,
-    0x658627ae,     0x65d8348e,     0x04812edb,     0x0e21101f,
-    0x4e3a1338,     0x0e6d118b,     0x4e721230,     0x0eae11ac,
-    0x4eb31251,     0x2e3e13bc,     0x6e251083,     0x2e7e13bc,
-    0x6e721230,     0x2ea610a4,     0x6ebf13dd,
+    0x0ea1b820,     0x0ef9b820,     0x4ef9b820,     0x4e21c862,
+    0x0e79c862,     0x4e79c862,     0x4e61b8a4,     0x0e79b8a4,
+    0x4e79b8a4,     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,
+    0xf8268267,     0xf82d023c,     0xf8301046,     0xf83d2083,
+    0xf8263290,     0xf82d528c,     0xf8284299,     0xf8337160,
+    0xf8386286,     0xf8bf820e,     0xf8a600e0,     0xf8af1353,
+    0xf8a922ea,     0xf8b53396,     0xf8a251e3,     0xf8b340f4,
+    0xf8a470fd,     0xf8a06209,     0xf8f48097,     0xf8f002ea,
+    0xf8eb10d9,     0xf8ff21b0,     0xf8f7302c,     0xf8ee52a9,
+    0xf8f041fa,     0xf8e471e4,     0xf8e863c6,     0xf864823d,
+    0xf87d013a,     0xf86f1162,     0xf87d20e3,     0xf86132bb,
+    0xf870510e,     0xf8704336,     0xf86572b4,     0xf8706217,
+    0xb83e8294,     0xb8200264,     0xb8381284,     0xb8242358,
+    0xb8333102,     0xb828530e,     0xb83042df,     0xb824703f,
+    0xb82a6194,     0xb8a080e9,     0xb8b80090,     0xb8bb1146,
+    0xb8bb21b8,     0xb8b032df,     0xb8b653f4,     0xb8bd41c9,
+    0xb8b47287,     0xb8bc6169,     0xb8ee828c,     0xb8e10138,
+    0xb8f3126d,     0xb8f020b0,     0xb8e03183,     0xb8e851ef,
+    0xb8f041e4,     0xb8fe7005,     0xb8ea6376,     0xb8638120,
+    0xb873015d,     0xb8781284,     0xb86723b8,     0xb86e3175,
+    0xb87b51ed,     0xb87f41d1,     0xb863721e,     0xb87660f4,
+    0xce216874,     0xce104533,     0xce648c15,     0xce8e3302,
+    0xce6e82ab,     0xce6c87d1,     0xcec08063,     0xce638937,
+    0x25e0c358,     0x25a1c7d3,     0x0580785a,     0x05426328,
+    0x05009892,     0x25a0cc29,     0x2561cec8,     0x058044b3,
+    0x05401c99,     0x05006b49,     0x25e0d6f7,     0x2561c528,
+    0x0583c8bc,     0x0542522f,     0x05001ec0,     0x25e0de65,
+    0x25a1c113,     0x05803cad,     0x0540f3c0,     0x0500ab15,
+    0x2560c28c,     0x2561d7c0,     0x05801ed7,     0x0542633b,
+    0x05003696,     0x2560d4b4,     0x25e1c918,     0x058021ff,
+    0x05400e15,     0x0500f3de,     0x0473025a,     0x04bd05ab,
+    0x658e0025,     0x658a08e2,     0x659a0493,     0x043e1062,
+    0x04f418b4,     0x046d15bd,     0x04611fce,     0x04d6a07c,
+    0x04001929,     0x041a09da,     0x04d098f4,     0x04db10d4,
+    0x0459a3ad,     0x041aa029,     0x041919fb,     0x04d39e24,
+    0x04118302,     0x04101dba,     0x04d7ae16,     0x04dea571,
+    0x04180210,     0x05e786fc,     0x05e4915c,     0x04881cf1,
+    0x044a0f04,     0x04090969,     0x048b16c4,     0x044101e4,
+    0x04dcbf44,     0x65809745,     0x658d833f,     0x65c68468,
+    0x65c79b07,     0x65829e38,     0x049dafca,     0x6582bba8,
+    0x65c0b7ff,     0x65c1b4e0,     0x658dbadd,     0x65819a9d,
+    0x65ed9246,     0x65b30815,     0x65e6263c,     0x65eebb94,
+    0x65bad14e,     0x65efe178,     0x65fc5697,     0x65e07f14,
+    0x040c55a6,     0x04977f4d,     0x043d3046,     0x04b733a0,
+    0x046830a4,     0x04ed322d,     0x05686948,     0x05bd6c13,
+    0x65c88ef0,     0x450db3d7,     0x4540b6d9,     0x043e3979,
+    0x445896ce,     0x445a9005,     0x44d98069,     0x445b87ae,
+    0x04da348e,     0x04982edb,     0x0499397f,     0x0408338c,
+    0x04ca309c,     0x65c721e6,     0x65c63641,     0x65982882,
+    0x04812b8b,     0x0e251083,     0x4e3712d5,     0x0e61101f,
+    0x4e6d118b,     0x0eba1338,     0x4eb712d5,     0x2e31120f,
+    0x6e2e11ac,     0x2e6810e6,     0x6e6f11cd,     0x2eaa1128,
+    0x6eb1120f,
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
index b95e9749a54..a0622d665b8 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorOperations.java
@@ -50,7 +50,14 @@ public class TestFloat16VectorOperations {
     private static final int LEN = 2048;
 
     public static void main(String args[]) {
+        // Test with default MaxVectorSize
         TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
+
+        // Test with different values of MaxVectorSize
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:MaxVectorSize=8");
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:MaxVectorSize=16");
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:MaxVectorSize=32");
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:MaxVectorSize=64");
     }
 
     public static boolean assertResults(short expected, short actual) {
@@ -76,9 +83,11 @@ public TestFloat16VectorOperations() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.ADD_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.ADD_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorAddFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(add(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -97,9 +106,11 @@ public void checkResultAdd() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.SUB_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.SUB_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorSubFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(subtract(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -118,9 +129,11 @@ public void checkResultSub() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
     @IR(counts = {IRNode.MUL_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
+    @IR(counts = {IRNode.MUL_VHF, ">= 1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorMulFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(multiply(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -139,9 +152,11 @@ public void checkResultMul() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.DIV_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.DIV_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorDivFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(divide(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -160,9 +175,11 @@ public void checkResultDiv() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.MIN_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.MIN_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorMinFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(min(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -181,9 +198,11 @@ public void checkResultMin() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
     @IR(counts = {IRNode.MAX_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
+    @IR(counts = {IRNode.MAX_VHF, ">= 1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorMaxFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(max(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i])));
@@ -202,9 +221,11 @@ public void checkResultMax() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.SQRT_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.SQRT_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorSqrtFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(sqrt(shortBitsToFloat16(input1[i])));
@@ -223,9 +244,11 @@ public void checkResultSqrt() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.FMA_VHF, ">= 1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.FMA_VHF, ">= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorFmaFloat16() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(fma(shortBitsToFloat16(input1[i]), shortBitsToFloat16(input2[i]),
@@ -246,9 +269,11 @@ public void checkResultFma() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
     @IR(counts = {IRNode.FMA_VHF, " >= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
+    @IR(counts = {IRNode.FMA_VHF, ">= 1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorFmaFloat16ScalarMixedConstants() {
         for (int i = 0; i < LEN; ++i) {
             output[i] = float16ToRawShortBits(fma(shortBitsToFloat16(input1[i]), shortBitsToFloat16(SCALAR_FP16),
@@ -270,9 +295,11 @@ public void checkResultFmaScalarMixedConstants() {
 
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
     @IR(counts = {IRNode.FMA_VHF, " >= 1"},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
+    @IR(counts = {IRNode.FMA_VHF, ">= 1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorFmaFloat16MixedConstants() {
         short input3 = floatToFloat16(3.0f);
         for (int i = 0; i < LEN; ++i) {
@@ -293,9 +320,11 @@ public void checkResultFmaMixedConstants() {
     }
 
     @Test
-    @Warmup(10000)
+    @Warmup(50)
+    @IR(counts = {IRNode.FMA_VHF, " 0 "},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true", "sve", "true"})
     @IR(counts = {IRNode.FMA_VHF, " 0 "},
-        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zvfh", "true"})
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
     public void vectorFmaFloat16AllConstants() {
         short input1 = floatToFloat16(1.0f);
         short input2 = floatToFloat16(2.0f);

From 5924c2d6c7f636b428bc7f43abe2115af4532358 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Tue, 27 May 2025 08:28:55 +0000
Subject: [PATCH 651/901] 8357267: ZGC: Handle APX EGPRs spilling in
 ZRuntimeCallSpill

Reviewed-by: rcastanedalo, sviswanathan
---
 .../cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp | 101 ++++++++++++++----
 1 file changed, 78 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index 4a956b450bd..fe7f19e1260 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -78,15 +78,48 @@ class ZRuntimeCallSpill {
 
   void save() {
     MacroAssembler* masm = _masm;
-    __ push(rax);
-    __ push(rcx);
-    __ push(rdx);
-    __ push(rdi);
-    __ push(rsi);
-    __ push(r8);
-    __ push(r9);
-    __ push(r10);
-    __ push(r11);
+    if (VM_Version::supports_apx_f()) {
+      if (_result != rax) {
+        __ pushp(rax);
+      }
+      __ pushp(rcx);
+      // Save current stack pointer into rcx
+      __ movptr(rcx, rsp);
+      // Align stack pointer to 16 byte boundary. This is hard constraint
+      // for push2/pop2 with PPX hints.
+      __ andptr(rsp, -StackAlignmentInBytes);
+      // Push original stack pointer.
+      __ push(rcx);
+      // Restore the original contents of RCX register.
+      __ movptr(rcx, Address(rcx));
+      // Now push remaining caller save GPRs and EGPRs on 16B aligned stack.
+      // Note: For PPX to work properly, a PPX-marked PUSH2 (respectively, POP2) should always
+      // be matched with a PPX-marked POP2 (PUSH2), not with two PPX-marked POPs (PUSHs).
+      __ pushp(rdx);
+      __ push2p(rdi, rsi);
+      __ push2p(r8, r9);
+      __ push2p(r10, r11);
+      __ push2p(r16, r17);
+      __ push2p(r18, r19);
+      __ push2p(r20, r21);
+      __ push2p(r22, r23);
+      __ push2p(r24, r25);
+      __ push2p(r26, r27);
+      __ push2p(r28, r29);
+      __ push2p(r30, r31);
+    } else {
+      if (_result != rax) {
+        __ push(rax);
+      }
+      __ push(rcx);
+      __ push(rdx);
+      __ push(rdi);
+      __ push(rsi);
+      __ push(r8);
+      __ push(r9);
+      __ push(r10);
+      __ push(r11);
+    }
 
     if (_xmm_spill_size != 0) {
       __ subptr(rsp, _xmm_spill_size);
@@ -139,21 +172,43 @@ class ZRuntimeCallSpill {
       __ addptr(rsp, _xmm_spill_size);
     }
 
-    __ pop(r11);
-    __ pop(r10);
-    __ pop(r9);
-    __ pop(r8);
-    __ pop(rsi);
-    __ pop(rdi);
-    __ pop(rdx);
-    __ pop(rcx);
-    if (_result == noreg) {
-      __ pop(rax);
-    } else if (_result == rax) {
-      __ addptr(rsp, wordSize);
+    if (VM_Version::supports_apx_f()) {
+      __ pop2p(r31, r30);
+      __ pop2p(r29, r28);
+      __ pop2p(r27, r26);
+      __ pop2p(r25, r24);
+      __ pop2p(r23, r22);
+      __ pop2p(r21, r20);
+      __ pop2p(r19, r18);
+      __ pop2p(r17, r16);
+      __ pop2p(r11, r10);
+      __ pop2p(r9, r8);
+      __ pop2p(rsi, rdi);
+      __ popp(rdx);
+      // Re-instantiate original stack pointer.
+      __ movptr(rsp, Address(rsp));
+      __ popp(rcx);
+      if (_result != rax) {
+        if (_result != noreg) {
+          __ movptr(_result, rax);
+        }
+        __ popp(rax);
+      }
     } else {
-      __ movptr(_result, rax);
-      __ pop(rax);
+      __ pop(r11);
+      __ pop(r10);
+      __ pop(r9);
+      __ pop(r8);
+      __ pop(rsi);
+      __ pop(rdi);
+      __ pop(rdx);
+      __ pop(rcx);
+      if (_result != rax) {
+        if (_result != noreg) {
+          __ movptr(_result, rax);
+        }
+        __ pop(rax);
+      }
     }
   }
 

From 7cb6e5eb3e004ad974a0c49e83014844f9f7cabb Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Tue, 27 May 2025 08:37:32 +0000
Subject: [PATCH 652/901] 8353124:
 java/lang/Thread/virtual/stress/Skynet.java#Z times out on macosx-x64-debug

Reviewed-by: alanb
---
 test/jdk/java/lang/Thread/virtual/stress/Skynet.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
index 562a8dbd5e1..1d9a5b7104b 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet.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
@@ -26,13 +26,13 @@
  * @summary Stress test virtual threads with a variation of the Skynet 1M benchmark
  * @requires vm.continuations
  * @requires !vm.debug | vm.gc != "Z"
- * @run main/othervm/timeout=300 -Xmx1500m Skynet
+ * @run main/othervm/timeout=400 -Xmx1500m Skynet
  */
 /*
  * @test id=Z
  * @requires vm.debug == true & vm.continuations
  * @requires vm.gc.Z
- * @run main/othervm/timeout=300 -XX:+UnlockDiagnosticVMOptions
+ * @run main/othervm/timeout=400 -XX:+UnlockDiagnosticVMOptions
  *     -XX:+UseZGC
  *     -XX:+ZVerifyOops -XX:ZCollectionInterval=0.01 -Xmx1500m Skynet
  */

From f62b9780c38ed3caa64726be5ea47667847157e3 Mon Sep 17 00:00:00 2001
From: Arno Zeller <azeller@openjdk.org>
Date: Tue, 27 May 2025 09:11:00 +0000
Subject: [PATCH 653/901] 8357448: AOT crashes on linux musl with AddReads.java

Reviewed-by: mbaesken, shade, mdoerr
---
 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 cf5d52a5676..192791ebd9c 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -490,8 +490,8 @@ void AOTClassLocationConfig::dumptime_init_helper(TRAPS) {
 
   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);
+    os::free((void*)lcp);
   } else {
     assert(_dumptime_lcp_len == 0, "sanity");
     log_info(class, path)("Longest common prefix = <none> (0 chars)");

From aea32ec5060a2e57947dc3e5d14613241e223ce4 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Tue, 27 May 2025 09:17:29 +0000
Subject: [PATCH 654/901] 8357647: Stream gatherers forward upstream size
 information to downstream

Reviewed-by: liach, alanb
---
 .../classes/java/util/stream/GathererOp.java  |  2 +-
 test/jdk/java/util/stream/GathererTest.java   | 40 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/stream/GathererOp.java b/src/java.base/share/classes/java/util/stream/GathererOp.java
index 39758bd834a..c4239b1e029 100644
--- a/src/java.base/share/classes/java/util/stream/GathererOp.java
+++ b/src/java.base/share/classes/java/util/stream/GathererOp.java
@@ -150,7 +150,7 @@ public void begin(long size) {
             final var initializer = gatherer.initializer();
             if (initializer != Gatherer.defaultInitializer()) // Optimization
                 state = initializer.get();
-            sink.begin(size);
+            sink.begin(-1); // GathererOp does not know the size of the output
         }
 
         @Override
diff --git a/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java
index d85f466496f..419347d76c6 100644
--- a/test/jdk/java/util/stream/GathererTest.java
+++ b/test/jdk/java/util/stream/GathererTest.java
@@ -20,9 +20,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;
+import java.util.Spliterator;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.*;
 import java.util.stream.Gatherer;
@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.*;
 
@@ -465,6 +466,41 @@ public void testExceptionInFinisher(Config config) {
         , expectedMessage);
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = { false, true })
+    public void mustNotPropagateSizeInformation(boolean parallel) {
+        // Constructs a spliterator of unbounded length but which
+        // reports SIZED and SUBSIZED characteristics so if its size
+        // of Long.MAX_VALUE gets propagated by gather() then the
+        // resulting toList() call would allocate a huge array and as
+        // such would yield an OutOfMemoryError
+        var s = new Spliterator<Integer>() {
+            @Override
+            public boolean tryAdvance(Consumer<? super Integer> action) {
+                action.accept(0);
+                return true;
+            }
+
+            @Override public Spliterator<Integer> trySplit() { return null; }
+
+            @Override public long estimateSize() { return Long.MAX_VALUE; }
+
+            @Override
+            public int characteristics() {
+                return Spliterator.SIZED | Spliterator.IMMUTABLE | Spliterator.SUBSIZED;
+            }
+        };
+
+        var result = StreamSupport.stream(s, parallel)
+                                  .gather(
+                                      Gatherer.of(
+                                          (_, i, d)
+                                              -> d.push(i) && false
+                                      )
+                                  ).toList();
+        assertEquals(result, List.of(0));
+    }
+
     private final static void assertThrowsTestException(Supplier<?> supplier, String expectedMessage) {
         try {
             var discard = supplier.get();

From b9db99d7f7e3720c7e34fbcd22ff9529054601f6 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 27 May 2025 09:43:07 +0000
Subject: [PATCH 655/901] 8357797: Use StructuredTaskScopeImpl.ST_NEW for state
 init

Reviewed-by: alanb
---
 .../classes/java/util/concurrent/StructuredTaskScopeImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
index 29d85ac44ec..f65ea18e226 100644
--- a/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
+++ b/src/java.base/share/classes/java/util/concurrent/StructuredTaskScopeImpl.java
@@ -67,6 +67,7 @@ private StructuredTaskScopeImpl(Joiner<? super T, ? extends R> joiner,
         this.joiner = joiner;
         this.threadFactory = threadFactory;
         this.flock = ThreadFlock.open((name != null) ? name : Objects.toIdentityString(this));
+        this.state = ST_NEW;
     }
 
     /**

From 9c191cc0fad4e2cd8ac021082acc494dc7503745 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 27 May 2025 09:49:26 +0000
Subject: [PATCH 656/901] 8356245: stdin.encoding and stdout.encoding in jshell
 don't respect console code pages

Reviewed-by: asotona, cstein, liach
---
 .../jshell/tool/ConsoleIOContext.java         | 19 ++++++++++----
 .../execution/JdiDefaultExecutionControl.java | 26 ++++++++++++-------
 test/langtools/jdk/jshell/InputUITest.java    |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
index b2edb8851c0..c5b3dae2d58 100644
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
@@ -37,6 +37,7 @@
 import java.io.Writer;
 import java.net.URI;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -159,10 +160,15 @@ public int readBuffered(byte[] b) throws IOException {
             boolean allowExecTerminal = !OSUtils.IS_WINDOWS &&
                                         !OSUtils.IS_LINUX &&
                                         !OSUtils.IS_OSX;
-            terminal = TerminalBuilder.builder().exec(allowExecTerminal).inputStreamWrapper(in -> {
-                input.setInputStream(in);
-                return nonBlockingInput;
-            }).nativeSignals(false).build();
+            terminal = TerminalBuilder.builder()
+                                      .exec(allowExecTerminal)
+                                      .inputStreamWrapper(in -> {
+                                          input.setInputStream(in);
+                                          return nonBlockingInput;
+                                      })
+                                      .nativeSignals(false)
+                                      .encoding(System.getProperty("stdin.encoding"))
+                                      .build();
             useComplexDeprecationHighlight = !OSUtils.IS_WINDOWS;
         }
         this.allowIncompleteInputs = allowIncompleteInputs;
@@ -968,6 +974,9 @@ public void perform(LineReaderImpl in) throws IOException {
         }
     }
 
+    private static final Charset stdinCharset =
+            Charset.forName(System.getProperty("stdin.encoding"),
+                            Charset.defaultCharset());
     private String pendingLine;
     private int pendingLinePointer;
     private byte[] pendingBytes;
@@ -990,7 +999,7 @@ public synchronized int readUserInput() throws IOException {
                     pendingLinePointer--;
                 }
             }
-            pendingBytes = dataToConvert.toString().getBytes();
+            pendingBytes = dataToConvert.toString().getBytes(stdinCharset);
             pendingBytesPointer = 0;
         }
         return pendingBytes[pendingBytesPointer++];
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
index a9136e7e876..526580988ab 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/JdiDefaultExecutionControl.java
@@ -48,9 +48,8 @@
 import com.sun.jdi.VMDisconnectedException;
 import com.sun.jdi.VirtualMachine;
 import java.io.PrintStream;
+import java.time.Duration;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
 import jdk.jshell.JShellConsole;
 import jdk.jshell.execution.JdiDefaultExecutionControl.JdiStarter.TargetDescription;
 import jdk.jshell.spi.ExecutionControl;
@@ -71,7 +70,12 @@
  */
 public class JdiDefaultExecutionControl extends JdiExecutionControl {
 
-    private static final int SHUTDOWN_TIMEOUT = 1; //1 second
+    private static final Duration SHUTDOWN_TIMEOUT = Duration.ofSeconds(1);
+    private static final List<String> FORWARD_SYSTEM_PROPERTIES = List.of(
+        "stderr.encoding",
+        "stdin.encoding",
+        "stdout.encoding"
+    );
 
     private VirtualMachine vm;
     private Process process;
@@ -105,11 +109,15 @@ static ExecutionControl create(ExecutionEnv env, Map<String, String> parameters,
             int port = listener.getLocalPort();
             Optional<JShellConsole> console = env.console();
             String consoleModule = console.isPresent() ? "jdk.jshell" : "java.base";
-            List<String> augmentedremoteVMOptions =
-                    Stream.concat(env.extraRemoteVMOptions().stream(),
-                                  //disable System.console():
-                                  List.of("-Djdk.console=" + consoleModule).stream())
-                          .toList();
+            List<String> augmentedremoteVMOptions = new ArrayList<>();
+
+            //the stdin/out/err.encoding properties are always defined, and can be copied:
+            FORWARD_SYSTEM_PROPERTIES.forEach(
+                    prop -> augmentedremoteVMOptions.add("-D" + prop + "=" +
+                                                         System.getProperty(prop)));
+            augmentedremoteVMOptions.addAll(env.extraRemoteVMOptions());
+            augmentedremoteVMOptions.add("-Djdk.console=" + consoleModule);
+
             ExecutionEnv augmentedEnv = new ExecutionEnv() {
                 @Override
                 public InputStream userIn() {
@@ -279,7 +287,7 @@ public void close() {
 
         if (remoteProcess != null) {
             try {
-                remoteProcess.waitFor(SHUTDOWN_TIMEOUT, TimeUnit.SECONDS);
+                remoteProcess.waitFor(SHUTDOWN_TIMEOUT);
             } catch (InterruptedException ex) {
                 debug(ex, "waitFor remote");
             }
diff --git a/test/langtools/jdk/jshell/InputUITest.java b/test/langtools/jdk/jshell/InputUITest.java
index ef4e7fabb9d..d46c88aa797 100644
--- a/test/langtools/jdk/jshell/InputUITest.java
+++ b/test/langtools/jdk/jshell/InputUITest.java
@@ -35,7 +35,7 @@
  * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
  * @build Compiler UITesting
  * @compile InputUITest.java
- * @run testng InputUITest
+ * @run testng/othervm -Dstderr.encoding=UTF-8 -Dstdin.encoding=UTF-8 -Dstdout.encoding=UTF-8 InputUITest
  */
 
 import java.util.function.Function;

From 67d4ed173af325a5a28ee17765d491fd0cfe38c2 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Tue, 27 May 2025 10:43:16 +0000
Subject: [PATCH 657/901] 8357559: G1HeapRegionManager refactor rename
 functions related to the number of regions in different states

Reviewed-by: ayang, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 26 ++++-----
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   | 21 ++++----
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  | 26 ++++-----
 .../share/gc/g1/g1ConcurrentMark.inline.hpp   |  8 +--
 src/hotspot/share/gc/g1/g1FullCollector.cpp   | 16 +++---
 src/hotspot/share/gc/g1/g1FullCollector.hpp   |  2 +-
 .../share/gc/g1/g1HeapRegionManager.cpp       | 54 +++++++++----------
 .../share/gc/g1/g1HeapRegionManager.hpp       | 18 +++----
 .../gc/g1/g1HeapRegionManager.inline.hpp      |  4 +-
 src/hotspot/share/gc/g1/g1Policy.cpp          | 10 ++--
 src/hotspot/share/gc/g1/g1RemSet.cpp          |  2 +-
 src/hotspot/share/gc/g1/g1RemSet.hpp          |  4 +-
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  |  2 +-
 .../g1/g1YoungGCAllocationFailureInjector.cpp |  2 +-
 src/hotspot/share/prims/whitebox.cpp          |  2 +-
 15 files changed, 97 insertions(+), 100 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 49ec55cf74a..8aaab14ad75 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -359,7 +359,7 @@ HeapWord* G1CollectedHeap::humongous_obj_allocate(size_t word_size) {
       // We managed to find a region by expanding the heap.
       log_debug(gc, ergo, heap)("Heap expansion (humongous allocation request). Allocation request: %zuB",
                                 word_size * HeapWordSize);
-      policy()->record_new_heap_size(num_regions());
+      policy()->record_new_heap_size(num_committed_regions());
     } else {
       // Policy: Potentially trigger a defragmentation GC.
     }
@@ -1022,7 +1022,7 @@ bool G1CollectedHeap::expand(size_t expand_bytes, WorkerThreads* pretouch_worker
 
   size_t actual_expand_bytes = expanded_by * G1HeapRegion::GrainBytes;
   assert(actual_expand_bytes <= aligned_expand_bytes, "post-condition");
-  policy()->record_new_heap_size(num_regions());
+  policy()->record_new_heap_size(num_committed_regions());
 
   return true;
 }
@@ -1031,12 +1031,12 @@ bool G1CollectedHeap::expand_single_region(uint node_index) {
   uint expanded_by = _hrm.expand_on_preferred_node(node_index);
 
   if (expanded_by == 0) {
-    assert(is_maximal_no_gc(), "Should be no regions left, available: %u", _hrm.available());
+    assert(is_maximal_no_gc(), "Should be no regions left, available: %u", _hrm.num_inactive_regions());
     log_debug(gc, ergo, heap)("Did not expand the heap (heap already fully expanded)");
     return false;
   }
 
-  policy()->record_new_heap_size(num_regions());
+  policy()->record_new_heap_size(num_committed_regions());
   return true;
 }
 
@@ -1052,7 +1052,7 @@ void G1CollectedHeap::shrink_helper(size_t shrink_bytes) {
                             shrink_bytes, aligned_shrink_bytes, shrunk_bytes);
   if (num_regions_removed > 0) {
     log_debug(gc, heap)("Uncommittable regions after shrink: %u", num_regions_removed);
-    policy()->record_new_heap_size(num_regions());
+    policy()->record_new_heap_size(num_committed_regions());
   } else {
     log_debug(gc, ergo, heap)("Did not shrink the heap (heap shrinking operation failed)");
   }
@@ -1364,15 +1364,15 @@ jint G1CollectedHeap::initialize() {
   // 6843694 - ensure that the maximum region index can fit
   // in the remembered set structures.
   const uint max_region_idx = (1U << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1;
-  guarantee((max_reserved_regions() - 1) <= max_region_idx, "too many regions");
+  guarantee((max_num_regions() - 1) <= max_region_idx, "too many regions");
 
   // The G1FromCardCache reserves card with value 0 as "invalid", so the heap must not
   // start within the first card.
   guarantee((uintptr_t)(heap_rs.base()) >= G1CardTable::card_size(), "Java heap must not start within the first card.");
-  G1FromCardCache::initialize(max_reserved_regions());
+  G1FromCardCache::initialize(max_num_regions());
   // Also create a G1 rem set.
   _rem_set = new G1RemSet(this, _card_table);
-  _rem_set->initialize(max_reserved_regions());
+  _rem_set->initialize(max_num_regions());
 
   size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
   guarantee(G1HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
@@ -1381,7 +1381,7 @@ jint G1CollectedHeap::initialize() {
 
   G1HeapRegionRemSet::initialize(_reserved);
 
-  G1FreeRegionList::set_unrealistically_long_length(max_regions() + 1);
+  G1FreeRegionList::set_unrealistically_long_length(max_num_regions() + 1);
 
   _bot = new G1BlockOffsetTable(reserved(), bot_storage);
 
@@ -1449,7 +1449,7 @@ jint G1CollectedHeap::initialize() {
   // values in the heap have been properly initialized.
   _monitoring_support = new G1MonitoringSupport(this);
 
-  _collection_set.initialize(max_reserved_regions());
+  _collection_set.initialize(max_num_regions());
 
   allocation_failure_injector()->reset();
 
@@ -1548,7 +1548,7 @@ void G1CollectedHeap::ref_processing_init() {
 }
 
 size_t G1CollectedHeap::capacity() const {
-  return _hrm.length() * G1HeapRegion::GrainBytes;
+  return _hrm.num_committed_regions() * G1HeapRegion::GrainBytes;
 }
 
 size_t G1CollectedHeap::unused_committed_regions_in_bytes() const {
@@ -2040,7 +2040,7 @@ size_t G1CollectedHeap::unsafe_max_tlab_alloc(Thread* ignored) const {
 }
 
 size_t G1CollectedHeap::max_capacity() const {
-  return max_regions() * G1HeapRegion::GrainBytes;
+  return max_num_regions() * G1HeapRegion::GrainBytes;
 }
 
 void G1CollectedHeap::prepare_for_verify() {
@@ -2188,7 +2188,7 @@ G1HeapSummary G1CollectedHeap::create_g1_heap_summary() {
 
   VirtualSpaceSummary heap_summary = create_heap_space_summary();
   return G1HeapSummary(heap_summary, heap_used, eden_used_bytes, eden_capacity_bytes,
-                       survivor_used_bytes, old_gen_used_bytes, num_regions());
+                       survivor_used_bytes, old_gen_used_bytes, num_committed_regions());
 }
 
 G1EvacSummary G1CollectedHeap::create_g1_evac_summary(G1EvacStats* stats) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 2de9057bcad..71aab49864e 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -90,7 +90,7 @@ class WorkerThreads;
 typedef OverflowTaskQueue<ScannerTask, mtGC>           G1ScannerTasksQueue;
 typedef GenericTaskQueueSet<G1ScannerTasksQueue, mtGC> G1ScannerTasksQueueSet;
 
-typedef int RegionIdx_t;   // needs to hold [ 0..max_reserved_regions() )
+typedef int RegionIdx_t;   // needs to hold [ 0..max_num_regions() )
 typedef int CardIdx_t;     // needs to hold [ 0..CardsPerRegion )
 
 // The G1 STW is alive closure.
@@ -967,7 +967,7 @@ class G1CollectedHeap : public CollectedHeap {
   // But G1CollectedHeap doesn't yet support this.
 
   bool is_maximal_no_gc() const override {
-    return _hrm.available() == 0;
+    return _hrm.num_inactive_regions() == 0;
   }
 
   // Returns true if an incremental GC should be upgrade to a full gc. This
@@ -977,27 +977,24 @@ class G1CollectedHeap : public CollectedHeap {
   }
 
   // The current number of regions in the heap.
-  uint num_regions() const { return _hrm.length(); }
+  uint num_committed_regions() const { return _hrm.num_committed_regions(); }
 
-  // The max number of regions reserved for the heap. Except for static array
-  // sizing purposes you probably want to use max_regions().
-  uint max_reserved_regions() const { return _hrm.reserved_length(); }
-
-  // Max number of regions that can be committed.
-  uint max_regions() const { return _hrm.max_length(); }
+  // The max number of regions reserved for the heap.
+  uint max_num_regions() const { return _hrm.max_num_regions(); }
 
   // The number of regions that are completely free.
   uint num_free_regions() const { return _hrm.num_free_regions(); }
 
+  // The number of regions that are not completely free.
+  uint num_used_regions() const { return _hrm.num_used_regions(); }
+
   // The number of regions that can be allocated into.
-  uint num_free_or_available_regions() const { return num_free_regions() + _hrm.available(); }
+  uint num_available_regions() const { return _hrm.num_available_regions(); }
 
   MemoryUsage get_auxiliary_data_memory_usage() const {
     return _hrm.get_auxiliary_data_memory_usage();
   }
 
-  // The number of regions that are not completely free.
-  uint num_used_regions() const { return num_regions() - num_free_regions(); }
 
 #ifdef ASSERT
   bool is_on_master_free_list(G1HeapRegion* hr) {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 5daadc18a56..25a9b80093c 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -475,7 +475,7 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
 
   _heap(_g1h->reserved()),
 
-  _root_regions(_g1h->max_regions()),
+  _root_regions(_g1h->max_num_regions()),
 
   _global_mark_stack(),
 
@@ -513,9 +513,9 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
   _num_concurrent_workers(0),
   _max_concurrent_workers(0),
 
-  _region_mark_stats(NEW_C_HEAP_ARRAY(G1RegionMarkStats, _g1h->max_reserved_regions(), mtGC)),
-  _top_at_mark_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_reserved_regions(), mtGC)),
-  _top_at_rebuild_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_reserved_regions(), mtGC)),
+  _region_mark_stats(NEW_C_HEAP_ARRAY(G1RegionMarkStats, _g1h->max_num_regions(), mtGC)),
+  _top_at_mark_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_num_regions(), mtGC)),
+  _top_at_rebuild_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_num_regions(), mtGC)),
   _needs_remembered_set_rebuild(false)
 {
   assert(CGC_lock != nullptr, "CGC_lock must be initialized");
@@ -570,8 +570,8 @@ void G1ConcurrentMark::reset() {
     _tasks[i]->reset(mark_bitmap());
   }
 
-  uint max_reserved_regions = _g1h->max_reserved_regions();
-  for (uint i = 0; i < max_reserved_regions; i++) {
+  uint max_num_regions = _g1h->max_num_regions();
+  for (uint i = 0; i < max_num_regions; i++) {
     _top_at_rebuild_starts[i] = nullptr;
     _region_mark_stats[i].clear();
   }
@@ -613,8 +613,8 @@ void G1ConcurrentMark::reset_marking_for_restart() {
   if (has_overflown()) {
     _global_mark_stack.expand();
 
-    uint max_reserved_regions = _g1h->max_reserved_regions();
-    for (uint i = 0; i < max_reserved_regions; i++) {
+    uint max_num_regions = _g1h->max_num_regions();
+    for (uint i = 0; i < max_num_regions; i++) {
       _region_mark_stats[i].clear_during_overflow();
     }
   }
@@ -782,7 +782,7 @@ class G1ClearBitMapTask : public WorkerTask {
 void G1ConcurrentMark::clear_bitmap(WorkerThreads* workers, bool may_yield) {
   assert(may_yield || SafepointSynchronize::is_at_safepoint(), "Non-yielding bitmap clear only allowed at safepoint.");
 
-  size_t const num_bytes_to_clear = (G1HeapRegion::GrainBytes * _g1h->num_regions()) / G1CMBitMap::heap_map_factor();
+  size_t const num_bytes_to_clear = (G1HeapRegion::GrainBytes * _g1h->num_committed_regions()) / G1CMBitMap::heap_map_factor();
   size_t const num_chunks = align_up(num_bytes_to_clear, G1ClearBitMapTask::chunk_size()) / G1ClearBitMapTask::chunk_size();
 
   uint const num_workers = (uint)MIN2(num_chunks, (size_t)workers->active_workers());
@@ -1434,20 +1434,20 @@ void G1ConcurrentMark::remark() {
       GCTraceTime(Debug, gc, phases) debug("Select For Rebuild and Reclaim Empty Regions", _gc_timer_cm);
 
       G1UpdateRegionLivenessAndSelectForRebuildTask cl(_g1h, this, _g1h->workers()->active_workers());
-      uint const num_workers = MIN2(G1UpdateRegionLivenessAndSelectForRebuildTask::desired_num_workers(_g1h->num_regions()),
+      uint const num_workers = MIN2(G1UpdateRegionLivenessAndSelectForRebuildTask::desired_num_workers(_g1h->num_committed_regions()),
                                     _g1h->workers()->active_workers());
-      log_debug(gc,ergo)("Running %s using %u workers for %u regions in heap", cl.name(), num_workers, _g1h->num_regions());
+      log_debug(gc,ergo)("Running %s using %u workers for %u regions in heap", cl.name(), num_workers, _g1h->num_committed_regions());
       _g1h->workers()->run_task(&cl, num_workers);
 
       log_debug(gc, remset, tracking)("Remembered Set Tracking update regions total %u, selected %u",
-                                        _g1h->num_regions(), cl.total_selected_for_rebuild());
+                                        _g1h->num_committed_regions(), cl.total_selected_for_rebuild());
 
       _needs_remembered_set_rebuild = (cl.total_selected_for_rebuild() > 0);
 
       if (_needs_remembered_set_rebuild) {
         // Prune rebuild candidates based on G1HeapWastePercent.
         // Improves rebuild time in addition to remembered set memory usage.
-        G1CollectionSetChooser::build(_g1h->workers(), _g1h->num_regions(), _g1h->policy()->candidates());
+        G1CollectionSetChooser::build(_g1h->workers(), _g1h->num_committed_regions(), _g1h->policy()->candidates());
       }
     }
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
index 982d03d0da2..6f71012ff7c 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
@@ -186,7 +186,7 @@ inline size_t G1CMTask::scan_objArray(objArrayOop obj, MemRegion mr) {
 
 inline void G1ConcurrentMark::update_top_at_mark_start(G1HeapRegion* r) {
   uint const region = r->hrm_index();
-  assert(region < _g1h->max_reserved_regions(), "Tried to access TAMS for region %u out of bounds", region);
+  assert(region < _g1h->max_num_regions(), "Tried to access TAMS for region %u out of bounds", region);
   _top_at_mark_starts[region] = r->top();
 }
 
@@ -199,13 +199,13 @@ inline HeapWord* G1ConcurrentMark::top_at_mark_start(const G1HeapRegion* r) cons
 }
 
 inline HeapWord* G1ConcurrentMark::top_at_mark_start(uint region) const {
-  assert(region < _g1h->max_reserved_regions(), "Tried to access TARS for region %u out of bounds", region);
+  assert(region < _g1h->max_num_regions(), "Tried to access TARS for region %u out of bounds", region);
   return _top_at_mark_starts[region];
 }
 
 inline bool G1ConcurrentMark::obj_allocated_since_mark_start(oop obj) const {
   uint const region = _g1h->addr_to_region(obj);
-  assert(region < _g1h->max_reserved_regions(), "obj " PTR_FORMAT " outside heap %u", p2i(obj), region);
+  assert(region < _g1h->max_num_regions(), "obj " PTR_FORMAT " outside heap %u", p2i(obj), region);
   return cast_from_oop<HeapWord*>(obj) >= top_at_mark_start(region);
 }
 
@@ -217,7 +217,7 @@ inline void G1ConcurrentMark::update_top_at_rebuild_start(G1HeapRegion* r) {
   assert(r->is_old() || r->is_humongous(), "precondition");
 
   uint const region = r->hrm_index();
-  assert(region < _g1h->max_reserved_regions(), "Tried to access TARS for region %u out of bounds", region);
+  assert(region < _g1h->max_num_regions(), "Tried to access TARS for region %u out of bounds", region);
   assert(_top_at_rebuild_starts[region] == nullptr,
          "TARS for region %u has already been set to " PTR_FORMAT " should be null",
          region, p2i(_top_at_rebuild_starts[region]));
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
index 9255efa9f2c..637995c7e52 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -83,7 +83,7 @@ uint G1FullCollector::calc_active_workers() {
 
   // Consider G1HeapWastePercent to decide max number of workers. Each worker
   // will in average cause half a region waste.
-  uint max_wasted_regions_allowed = ((heap->num_regions() * G1HeapWastePercent) / 100);
+  uint max_wasted_regions_allowed = ((heap->num_committed_regions() * G1HeapWastePercent) / 100);
   uint waste_worker_count = MAX2((max_wasted_regions_allowed * 2) , 1u);
   uint heap_waste_worker_limit = MIN2(waste_worker_count, max_worker_count);
 
@@ -133,9 +133,9 @@ G1FullCollector::G1FullCollector(G1CollectedHeap* heap,
   _markers = NEW_C_HEAP_ARRAY(G1FullGCMarker*, _num_workers, mtGC);
   _compaction_points = NEW_C_HEAP_ARRAY(G1FullGCCompactionPoint*, _num_workers, mtGC);
 
-  _live_stats = NEW_C_HEAP_ARRAY(G1RegionMarkStats, _heap->max_regions(), mtGC);
-  _compaction_tops = NEW_C_HEAP_ARRAY(HeapWord*, _heap->max_regions(), mtGC);
-  for (uint j = 0; j < heap->max_regions(); j++) {
+  _live_stats = NEW_C_HEAP_ARRAY(G1RegionMarkStats, _heap->max_num_regions(), mtGC);
+  _compaction_tops = NEW_C_HEAP_ARRAY(HeapWord*, _heap->max_num_regions(), mtGC);
+  for (uint j = 0; j < heap->max_num_regions(); j++) {
     _live_stats[j].clear();
     _compaction_tops[j] = nullptr;
   }
@@ -415,7 +415,7 @@ void G1FullCollector::phase2c_prepare_serial_compaction() {
   // lowest and the highest region in the tails of the compaction points.
 
   uint start_serial = truncate_parallel_cps();
-  assert(start_serial < _heap->max_reserved_regions(), "Called on empty parallel compaction queues");
+  assert(start_serial < _heap->max_num_regions(), "Called on empty parallel compaction queues");
 
   G1FullGCCompactionPoint* serial_cp = serial_compaction_point();
   assert(!serial_cp->is_initialized(), "sanity!");
@@ -427,7 +427,7 @@ void G1FullCollector::phase2c_prepare_serial_compaction() {
   HeapWord* dense_prefix_top = compaction_top(start_hr);
   G1SerialRePrepareClosure re_prepare(serial_cp, dense_prefix_top);
 
-  for (uint i = start_serial + 1; i < _heap->max_reserved_regions(); i++) {
+  for (uint i = start_serial + 1; i < _heap->max_num_regions(); i++) {
     if (is_compaction_target(i)) {
       G1HeapRegion* current = _heap->region_at(i);
       set_compaction_top(current, current->bottom());
@@ -445,11 +445,11 @@ void G1FullCollector::phase2d_prepare_humongous_compaction() {
 
   uint last_serial_target = serial_cp->current_region()->hrm_index();
   uint region_index = last_serial_target + 1;
-  uint max_reserved_regions = _heap->max_reserved_regions();
+  uint max_num_regions = _heap->max_num_regions();
 
   G1FullGCCompactionPoint* humongous_cp = humongous_compaction_point();
 
-  while (region_index < max_reserved_regions) {
+  while (region_index < max_num_regions) {
     G1HeapRegion* hr = _heap->region_at_or_null(region_index);
 
     if (hr == nullptr) {
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp
index f1ad57075da..ed8225fc004 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp
@@ -121,7 +121,7 @@ class G1FullCollector : StackObj {
   G1CMBitMap*              mark_bitmap();
   ReferenceProcessor*      reference_processor();
   size_t live_words(uint region_index) const {
-    assert(region_index < _heap->max_regions(), "sanity");
+    assert(region_index < _heap->max_num_regions(), "sanity");
     return _live_stats[region_index]._live_words;
   }
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index be469b655f7..df4786d7fa5 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -86,7 +86,7 @@ void G1HeapRegionManager::initialize(G1RegionToSpaceMapper* heap_storage,
 
   _regions.initialize(heap_storage->reserved(), G1HeapRegion::GrainBytes);
 
-  _committed_map.initialize(reserved_length());
+  _committed_map.initialize(max_num_regions());
 }
 
 G1HeapRegion* G1HeapRegionManager::allocate_free_region(G1HeapRegionType type, uint requested_node_index) {
@@ -177,7 +177,7 @@ void G1HeapRegionManager::expand(uint start, uint num_regions, WorkerThreads* pr
 
 void G1HeapRegionManager::commit_regions(uint index, size_t num_regions, WorkerThreads* pretouch_workers) {
   guarantee(num_regions > 0, "Must commit more than zero regions");
-  guarantee(num_regions <= available(),
+  guarantee(num_regions <= num_inactive_regions(),
             "Cannot commit more than the maximum amount of regions");
 
   _heap_mapper->commit_regions(index, num_regions, pretouch_workers);
@@ -242,7 +242,7 @@ void G1HeapRegionManager::reactivate_regions(uint start, uint num_regions) {
 
 void G1HeapRegionManager::deactivate_regions(uint start, uint num_regions) {
   assert(num_regions > 0, "Need to specify at least one region to uncommit, tried to uncommit zero regions at %u", start);
-  assert(length() >= num_regions, "pre-condition");
+  assert(num_committed_regions() >= num_regions, "pre-condition");
 
   // Reset NUMA index to and print state change.
   uint end = start + num_regions;
@@ -395,8 +395,8 @@ void G1HeapRegionManager::expand_exact(uint start, uint num_regions, WorkerThrea
 uint G1HeapRegionManager::expand_on_preferred_node(uint preferred_index) {
   uint expand_candidate = UINT_MAX;
 
-  if (available() >= 1) {
-    for (uint i = 0; i < reserved_length(); i++) {
+  if (num_inactive_regions() >= 1) {
+    for (uint i = 0; i < max_num_regions(); i++) {
       if (is_available(i)) {
         // Already in use continue
         continue;
@@ -471,18 +471,18 @@ uint G1HeapRegionManager::find_contiguous_in_free_list(uint num_regions) {
   do {
     range = _committed_map.next_active_range(range.end());
     candidate = find_contiguous_in_range(range.start(), range.end(), num_regions);
-  } while (candidate == G1_NO_HRM_INDEX && range.end() < reserved_length());
+  } while (candidate == G1_NO_HRM_INDEX && range.end() < max_num_regions());
 
   return candidate;
 }
 
 uint G1HeapRegionManager::find_contiguous_allow_expand(uint num_regions) {
   // Check if we can actually satisfy the allocation.
-  if (num_regions > (num_free_regions() + available())) {
+  if (num_regions > num_available_regions()) {
     return G1_NO_HRM_INDEX;
   }
   // Find any candidate.
-  return find_contiguous_in_range(0, reserved_length(), num_regions);
+  return find_contiguous_in_range(0, max_num_regions(), num_regions);
 }
 
 G1HeapRegion* G1HeapRegionManager::next_region_in_heap(const G1HeapRegion* r) const {
@@ -498,7 +498,7 @@ G1HeapRegion* G1HeapRegionManager::next_region_in_heap(const G1HeapRegion* r) co
 }
 
 void G1HeapRegionManager::iterate(G1HeapRegionClosure* blk) const {
-  uint len = reserved_length();
+  uint len = max_num_regions();
 
   for (uint i = 0; i < len; i++) {
     if (!is_available(i)) {
@@ -514,7 +514,7 @@ void G1HeapRegionManager::iterate(G1HeapRegionClosure* blk) const {
 }
 
 void G1HeapRegionManager::iterate(G1HeapRegionIndexClosure* blk) const {
-  uint len = reserved_length();
+  uint len = max_num_regions();
 
   for (uint i = 0; i < len; i++) {
     if (!is_available(i)) {
@@ -581,10 +581,10 @@ void G1HeapRegionManager::par_iterate(G1HeapRegionClosure* blk, G1HeapRegionClai
 }
 
 uint G1HeapRegionManager::shrink_by(uint num_regions_to_remove) {
-  assert(length() > 0, "the region sequence should not be empty");
-  assert(length() <= _next_highest_used_hrm_index, "invariant");
+  assert(num_committed_regions() > 0, "the region sequence should not be empty");
+  assert(num_committed_regions() <= _next_highest_used_hrm_index, "invariant");
   assert(_next_highest_used_hrm_index > 0, "we should have at least one region committed");
-  assert(num_regions_to_remove < length(), "We should never remove all regions");
+  assert(num_regions_to_remove < num_committed_regions(), "We should never remove all regions");
 
   if (num_regions_to_remove == 0) {
     return 0;
@@ -657,15 +657,15 @@ uint G1HeapRegionManager::find_empty_from_idx_reverse(uint start_idx, uint* res_
 }
 
 void G1HeapRegionManager::verify() {
-  guarantee(length() <= _next_highest_used_hrm_index,
-            "invariant: _length: %u _next_highest_used_hrm_index: %u",
-            length(), _next_highest_used_hrm_index);
-  guarantee(_next_highest_used_hrm_index <= reserved_length(),
-            "invariant: _next_highest_used_hrm_index: %u _max_length: %u",
-            _next_highest_used_hrm_index, reserved_length());
-  guarantee(length() <= max_length(),
-            "invariant: committed regions: %u max_regions: %u",
-            length(), max_length());
+  guarantee(num_committed_regions() <= _next_highest_used_hrm_index,
+            "invariant: committed regions: %u _next_highest_used_hrm_index: %u",
+            num_committed_regions(), _next_highest_used_hrm_index);
+  guarantee(_next_highest_used_hrm_index <= max_num_regions(),
+            "invariant: _next_highest_used_hrm_index: %u max_num_regions: %u",
+            _next_highest_used_hrm_index, max_num_regions());
+  guarantee(num_committed_regions() <= max_num_regions(),
+            "invariant: committed regions: %u max_num_regions: %u",
+            num_committed_regions(), max_num_regions());
 
   bool prev_committed = true;
   uint num_committed = 0;
@@ -692,11 +692,11 @@ void G1HeapRegionManager::verify() {
     prev_committed = true;
     prev_end = hr->end();
   }
-  for (uint i = _next_highest_used_hrm_index; i < reserved_length(); i++) {
+  for (uint i = _next_highest_used_hrm_index; i < max_num_regions(); i++) {
     guarantee(_regions.get_by_index(i) == nullptr, "invariant i: %u", i);
   }
 
-  guarantee(num_committed == length(), "Found %u committed regions, but should be %u", num_committed, length());
+  guarantee(num_committed == num_committed_regions(), "Found %u committed regions, but should be %u", num_committed, num_committed_regions());
   _free_list.verify();
 }
 
@@ -745,7 +745,7 @@ class G1RebuildFreeListTask : public WorkerTask {
       WorkerTask("G1 Rebuild Free List Task"),
       _hrm(hrm),
       _worker_freelists(NEW_C_HEAP_ARRAY(G1FreeRegionList, num_workers, mtGC)),
-      _worker_chunk_size((_hrm->reserved_length() + num_workers - 1) / num_workers),
+      _worker_chunk_size((_hrm->max_num_regions() + num_workers - 1) / num_workers),
       _num_workers(num_workers) {
     for (uint worker = 0; worker < _num_workers; worker++) {
       ::new (&_worker_freelists[worker]) G1FreeRegionList("Appendable Worker Free List");
@@ -770,7 +770,7 @@ class G1RebuildFreeListTask : public WorkerTask {
     EventGCPhaseParallel event;
 
     uint start = worker_id * _worker_chunk_size;
-    uint end = MIN2(start + _worker_chunk_size, _hrm->reserved_length());
+    uint end = MIN2(start + _worker_chunk_size, _hrm->max_num_regions());
 
     // If start is outside the heap, this worker has nothing to do.
     if (start > end) {
@@ -796,7 +796,7 @@ void G1HeapRegionManager::rebuild_free_list(WorkerThreads* workers) {
   // Abandon current free list to allow a rebuild.
   _free_list.abandon();
 
-  uint const num_workers = clamp(max_length(), 1u, workers->active_workers());
+  uint const num_workers = clamp(max_num_regions(), 1u, workers->active_workers());
   G1RebuildFreeListTask task(this, num_workers);
 
   log_debug(gc, ergo)("Running %s using %u workers for rebuilding free list of regions",
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
index 563140acf5b..4429384bcc5 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
@@ -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
@@ -66,8 +66,7 @@ class G1HeapRegionTable : public G1BiasedMappedArray<G1HeapRegion*> {
 //   committed regions. These may not be contiguous.
 // * _next_highest_used_hrm_index (not exposed outside this class) is the
 //   highest heap region index +1 for which we have G1HeapRegions.
-// * max_length() returns the maximum number of regions the heap may commit.
-// * reserved_length() returns the maximum number of regions the heap has reserved.
+// * max_num_regions() returns the maximum number of regions the heap has reserved.
 //
 
 class G1HeapRegionManager: public CHeapObj<mtGC> {
@@ -221,6 +220,8 @@ class G1HeapRegionManager: public CHeapObj<mtGC> {
     return _free_list.length();
   }
 
+  uint num_used_regions() const { return num_committed_regions() - num_free_regions(); }
+
   uint num_free_regions(uint node_index) const {
     return _free_list.length(node_index);
   }
@@ -229,17 +230,16 @@ class G1HeapRegionManager: public CHeapObj<mtGC> {
     return num_free_regions() * G1HeapRegion::GrainBytes;
   }
 
-  // Return the number of regions available (uncommitted) regions.
-  uint available() const { return max_length() - length(); }
+  // Return the number of regions uncommitted or ready to be uncommitted.
+  uint num_inactive_regions() const { return max_num_regions() - num_committed_regions(); }
 
   // Return the number of regions currently active and available for use.
-  uint length() const { return _committed_map.num_active(); }
+  uint num_committed_regions() const { return _committed_map.num_active(); }
 
   // The number of regions reserved for the heap.
-  uint reserved_length() const { return (uint)_regions.length(); }
+  uint max_num_regions() const { return (uint)_regions.length(); }
 
-  // Return maximum number of regions that heap can expand to.
-  uint max_length() const { return reserved_length(); }
+  uint num_available_regions() const { return num_free_regions() + num_inactive_regions(); }
 
   MemoryUsage get_auxiliary_data_memory_usage() const;
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp
index f78f12672e3..d65fdef922c 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.inline.hpp
@@ -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
@@ -66,7 +66,7 @@ inline G1HeapRegion* G1HeapRegionManager::next_region_in_humongous(G1HeapRegion*
   assert(is_available(index), "pre-condition");
   assert(hr->is_humongous(), "next_region_in_humongous should only be called for a humongous region.");
   index++;
-  if (index < reserved_length() && is_available(index) && at(index)->is_continues_humongous()) {
+  if (index < max_num_regions() && is_available(index) && at(index)->is_continues_humongous()) {
     return at(index);
   } else {
     return nullptr;
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 6488bf44e41..92b56953067 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -94,7 +94,7 @@ void G1Policy::init(G1CollectedHeap* g1h, G1CollectionSet* collection_set) {
 
   assert(Heap_lock->owned_by_self(), "Locking discipline.");
 
-  _young_gen_sizer.adjust_max_new_size(_g1h->max_regions());
+  _young_gen_sizer.adjust_max_new_size(_g1h->max_num_regions());
 
   _free_regions_at_end_of_collection = _g1h->num_free_regions();
 
@@ -676,9 +676,9 @@ void G1Policy::record_young_collection_start() {
   // every time we calculate / recalculate the target young length.
   update_survivors_policy();
 
-  assert(max_survivor_regions() + _g1h->num_used_regions() <= _g1h->max_regions(),
+  assert(max_survivor_regions() + _g1h->num_used_regions() <= _g1h->max_num_regions(),
          "Maximum survivor regions %u plus used regions %u exceeds max regions %u",
-         max_survivor_regions(), _g1h->num_used_regions(), _g1h->max_regions());
+         max_survivor_regions(), _g1h->num_used_regions(), _g1h->max_num_regions());
   assert_used_and_recalculate_used_equal(_g1h);
 
   phase_times()->record_cur_collection_start_sec(now.seconds());
@@ -1200,7 +1200,7 @@ void G1Policy::update_survivors_policy() {
   // The real maximum survivor size is bounded by the number of regions that can
   // be allocated into.
   _max_survivor_regions = MIN2(desired_max_survivor_regions,
-                               _g1h->num_free_or_available_regions());
+                               _g1h->num_available_regions());
 }
 
 bool G1Policy::force_concurrent_start_if_outside_cycle(GCCause::Cause gc_cause) {
@@ -1445,7 +1445,7 @@ uint G1Policy::calc_max_old_cset_length() const {
   // as a percentage of the heap size. I.e., it should bound the
   // number of old regions added to the CSet irrespective of how many
   // of them are available.
-  double result = (double)_g1h->num_regions() * G1OldCSetRegionThresholdPercent / 100;
+  double result = (double)_g1h->num_committed_regions() * G1OldCSetRegionThresholdPercent / 100;
   // Round up to be conservative.
   return (uint)ceil(result);
 }
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index 6ef99d49085..c0ee48b6bd3 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1432,7 +1432,7 @@ void G1RemSet::print_merge_heap_roots_stats() {
 
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
     size_t total_old_region_cards =
-      (g1h->num_regions() - (g1h->num_free_regions() - g1h->collection_set()->cur_length())) * G1HeapRegion::CardsPerRegion;
+      (g1h->num_committed_regions() - (g1h->num_free_regions() - g1h->collection_set()->cur_length())) * G1HeapRegion::CardsPerRegion;
 
     ls.print_cr("Visited cards %zu Total dirty %zu (%.2lf%%) Total old %zu (%.2lf%%)",
                 num_visited_cards,
diff --git a/src/hotspot/share/gc/g1/g1RemSet.hpp b/src/hotspot/share/gc/g1/g1RemSet.hpp
index ae4d4a35c45..50cc029a9a1 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.hpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.hpp
@@ -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
@@ -76,7 +76,7 @@ class G1RemSet: public CHeapObj<mtGC> {
 
 public:
   // Initialize data that depends on the heap size being known.
-  void initialize(uint max_reserved_regions);
+  void initialize(uint max_num_regions);
 
   G1RemSet(G1CollectedHeap* g1h, G1CardTable* ct);
   ~G1RemSet();
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 450fc957bdc..b56d9991acb 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -496,7 +496,7 @@ void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info)
   // reference processing currently works in G1.
   ref_processor_stw()->start_discovery(false /* always_clear */);
 
-  _evac_failure_regions.pre_collection(_g1h->max_reserved_regions());
+  _evac_failure_regions.pre_collection(_g1h->max_num_regions());
 
   _g1h->gc_prologue(false);
 
diff --git a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
index ceb859d249b..75cff2b339b 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCAllocationFailureInjector.cpp
@@ -54,7 +54,7 @@ G1YoungGCAllocationFailureInjector::G1YoungGCAllocationFailureInjector()
 
 void G1YoungGCAllocationFailureInjector::select_allocation_failure_regions() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
-  _allocation_failure_regions.reinitialize(g1h->max_reserved_regions());
+  _allocation_failure_regions.reinitialize(g1h->max_num_regions());
   SelectAllocationFailureRegionClosure closure(_allocation_failure_regions, g1h->collection_set()->cur_length());
   g1h->collection_set_iterate_all(&closure);
 }
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index c7f44c78fc5..f14c5efc65d 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -537,7 +537,7 @@ WB_END
 WB_ENTRY(jlong, WB_G1NumMaxRegions(JNIEnv* env, jobject o))
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    size_t nr = g1h->max_regions();
+    size_t nr = g1h->max_num_regions();
     return (jlong)nr;
   }
   THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1NumMaxRegions: G1 GC is not enabled");

From b4b11d777137c21c8808bbba5bdf20a2b4ff5be6 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Tue, 27 May 2025 11:38:08 +0000
Subject: [PATCH 658/901] 8356443: Update open/test/jdk/TEST.groups manual test
 groups definitions with missing manual test

Reviewed-by: msheppar
---
 test/jdk/TEST.groups | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index bd50b583c13..8bb270561dc 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -397,7 +397,6 @@ jdk_foreign = \
     -java/foreign/TestUpcallStress.java
 
 jdk_foreign_stress = \
-    java/foreign/TestMatrix.java \
     java/foreign/TestUpcallStress.java
 
 jdk_vector = \
@@ -629,14 +628,14 @@ jdk_core_manual_no_input = \
     javax/net/ssl/compatibility/BasicConnectTest.java \
     javax/net/ssl/compatibility/HrrTest.java \
     javax/net/ssl/compatibility/SniTest.java \
-    jdk/nio/zipfs/TestLocOffsetFromZip64EF.java \
     jdk/nio/zipfs/LargeCompressedEntrySizeTest.java \
     java/util/ArrayList/Bug8146568.java \
     java/util/Vector/Bug8148174.java \
     com/sun/net/httpserver/simpleserver/CommandLinePortNotSpecifiedTest.java \
     com/sun/net/httpserver/simpleserver/jwebserver/CommandLinePortNotSpecifiedTest.java \
     com/sun/net/httpserver/simpleserver/DocRootDirPermissionsWinTest.java \
-    javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java 
+    javax/xml/jaxp/datatype/8033980/GregorianCalAndDurSerDataUtil.java \
+    java/util/zip/ZipFile/CenSizeMaximum.java
 
 jdk_security_manual_no_input = \
     :jdk_security_infra \
@@ -660,7 +659,9 @@ jdk_core_manual_interactive = \
     java/util/TimeZone/DefaultTimeZoneTest.java \
     java/nio/MappedByteBuffer/PmemTest.java \
     java/rmi/registry/nonLocalRegistry/NonLocalRegistryTest.java \
-    java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java
+    java/rmi/registry/nonLocalRegistry/NonLocalSkeletonTest.java \
+    java/foreign/TestMatrix.java \
+    java/nio/channels/FileChannel/BlockDeviceSize.java
 
 jdk_security_manual_interactive = \
     sun/security/tools/keytool/i18n.java \

From 72a3022dc6a1521d8e3f08fe5d592f760fc462d2 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 27 May 2025 12:35:31 +0000
Subject: [PATCH 659/901] 8357842: PandocFilter misses copyright header

Reviewed-by: syan, erikj
---
 .../tools/pandocfilter/PandocFilter.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java b/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
index 64eeaaa36df..ebb49613e53 100644
--- a/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
+++ b/make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java
@@ -1,3 +1,26 @@
+/*
+ * 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 build.tools.pandocfilter;
 
 import build.tools.pandocfilter.json.JSON;

From cdff7b963c0600e9a6fe9cd8561d7d04b30f190c Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 27 May 2025 14:33:35 +0000
Subject: [PATCH 660/901] 8357801: Parallel: Remove deprecated PSVirtualSpace
 methods

Reviewed-by: tschatzl, iwalulya
---
 .../share/gc/parallel/objectStartArray.cpp    | 19 ++++++++++---------
 .../share/gc/parallel/objectStartArray.hpp    |  4 ++--
 src/hotspot/share/gc/parallel/psOldGen.cpp    |  6 ++----
 src/hotspot/share/gc/parallel/psOldGen.hpp    |  6 +++---
 .../share/gc/parallel/psVirtualspace.cpp      | 19 -------------------
 .../share/gc/parallel/psVirtualspace.hpp      |  3 ---
 6 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp
index d2c91b302b5..d120c71d2fa 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.cpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp
@@ -36,9 +36,10 @@ static size_t num_bytes_required(MemRegion mr) {
   return mr.word_size() / CardTable::card_size_in_words();
 }
 
-void ObjectStartArray::initialize(MemRegion reserved_region) {
+ObjectStartArray::ObjectStartArray(MemRegion covered_region)
+  : _virtual_space(nullptr) {
   // Calculate how much space must be reserved
-  size_t bytes_to_reserve = num_bytes_required(reserved_region);
+  size_t bytes_to_reserve = num_bytes_required(covered_region);
   assert(bytes_to_reserve > 0, "Sanity");
 
   bytes_to_reserve =
@@ -52,21 +53,21 @@ void ObjectStartArray::initialize(MemRegion reserved_region) {
   }
 
   // We do not commit any memory initially
-  _virtual_space.initialize(backing_store);
+  _virtual_space = new PSVirtualSpace(backing_store, os::vm_page_size());
 
-  assert(_virtual_space.low_boundary() != nullptr, "set from the backing_store");
+  assert(_virtual_space->low_boundary() != nullptr, "set from the backing_store");
 
-  _offset_base = (uint8_t*)(_virtual_space.low_boundary() - (uintptr_t(reserved_region.start()) >> CardTable::card_shift()));
+  _offset_base = (uint8_t*)(_virtual_space->low_boundary() - (uintptr_t(covered_region.start()) >> CardTable::card_shift()));
 }
 
 void ObjectStartArray::set_covered_region(MemRegion mr) {
   DEBUG_ONLY(_covered_region = mr;)
 
   size_t requested_size = num_bytes_required(mr);
-  // Only commit memory in page sized chunks
+  // Only commit memory in page-sized chunks
   requested_size = align_up(requested_size, os::vm_page_size());
 
-  size_t current_size = _virtual_space.committed_size();
+  size_t current_size = _virtual_space->committed_size();
 
   if (requested_size == current_size) {
     return;
@@ -75,13 +76,13 @@ void ObjectStartArray::set_covered_region(MemRegion mr) {
   if (requested_size > current_size) {
     // Expand
     size_t expand_by = requested_size - current_size;
-    if (!_virtual_space.expand_by(expand_by)) {
+    if (!_virtual_space->expand_by(expand_by)) {
       vm_exit_out_of_memory(expand_by, OOM_MMAP_ERROR, "object start array expansion");
     }
   } else {
     // Shrink
     size_t shrink_by = current_size - requested_size;
-    _virtual_space.shrink_by(shrink_by);
+    _virtual_space->shrink_by(shrink_by);
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp
index aadf2651f2c..3453df4059e 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.hpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp
@@ -42,7 +42,7 @@ class ObjectStartArray : public CHeapObj<mtGC> {
   DEBUG_ONLY(MemRegion  _covered_region;)
 
   // BOT array
-  PSVirtualSpace  _virtual_space;
+  PSVirtualSpace* _virtual_space;
 
   // Biased array-start of BOT array for fast heap-addr / BOT entry translation
   uint8_t*        _offset_base;
@@ -74,7 +74,7 @@ class ObjectStartArray : public CHeapObj<mtGC> {
   void verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const;
 
  public:
-  void initialize(MemRegion reserved_region);
+  ObjectStartArray(MemRegion covered_region);
 
   // Heap old-gen resizing
   void set_covered_region(MemRegion mr);
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index c1322fb7d9f..7980c30241f 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -67,9 +67,6 @@ void PSOldGen::initialize_work(const char* perf_data_name, int level) {
   MemRegion const reserved_mr = reserved();
   assert(reserved_mr.byte_size() == max_gen_size(), "invariant");
 
-  // Object start stuff: for all reserved memory
-  start_array()->initialize(reserved_mr);
-
   // Card table stuff: for all committed memory
   MemRegion committed_mr((HeapWord*)virtual_space()->low(),
                          (HeapWord*)virtual_space()->high());
@@ -108,6 +105,7 @@ void PSOldGen::initialize_work(const char* perf_data_name, int level) {
                              &ParallelScavengeHeap::heap()->workers());
 
   // Update the start_array
+  _start_array = new ObjectStartArray(reserved_mr);
   start_array()->set_covered_region(committed_mr);
 }
 
@@ -282,7 +280,7 @@ void PSOldGen::complete_loaded_archive_space(MemRegion archive_space) {
   HeapWord* cur = archive_space.start();
   while (cur < archive_space.end()) {
     size_t word_size = cast_to_oop(cur)->size();
-    _start_array.update_for_block(cur, cur + word_size);
+    _start_array->update_for_block(cur, cur + word_size);
     cur += word_size;
   }
 }
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 138b2a5b30c..d408401bec8 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -38,7 +38,7 @@ class PSOldGen : public CHeapObj<mtGC> {
   friend class VMStructs;
  private:
   PSVirtualSpace*          _virtual_space;     // Controls mapping and unmapping of virtual mem
-  ObjectStartArray         _start_array;       // Keeps track of where objects start in a 512b block
+  ObjectStartArray*        _start_array;       // Keeps track of where objects start in a 512b block
   MutableSpace*            _object_space;      // Where all the objects live
 
   // Performance Counters
@@ -56,7 +56,7 @@ class PSOldGen : public CHeapObj<mtGC> {
     assert_locked_or_safepoint(Heap_lock);
     HeapWord* res = object_space()->cas_allocate(word_size);
     if (res != nullptr) {
-      _start_array.update_for_block(res, res + word_size);
+      _start_array->update_for_block(res, res + word_size);
     }
     return res;
   }
@@ -103,7 +103,7 @@ class PSOldGen : public CHeapObj<mtGC> {
   }
 
   MutableSpace*         object_space() const      { return _object_space; }
-  ObjectStartArray*     start_array()             { return &_start_array; }
+  ObjectStartArray*     start_array()             { return _start_array;  }
   PSVirtualSpace*       virtual_space() const     { return _virtual_space;}
 
   // Size info
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
index b15264f5fca..8b98c0d096e 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
@@ -27,8 +27,6 @@
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 
-// PSVirtualSpace
-
 PSVirtualSpace::PSVirtualSpace(ReservedSpace rs, size_t alignment) :
   _alignment(alignment)
 {
@@ -37,23 +35,6 @@ PSVirtualSpace::PSVirtualSpace(ReservedSpace rs, size_t alignment) :
   DEBUG_ONLY(verify());
 }
 
-// Deprecated.
-PSVirtualSpace::PSVirtualSpace():
-  _alignment(os::vm_page_size()),
-  _reserved_low_addr(nullptr),
-  _reserved_high_addr(nullptr),
-  _committed_low_addr(nullptr),
-  _committed_high_addr(nullptr),
-  _special(false) {
-}
-
-// Deprecated.
-void PSVirtualSpace::initialize(ReservedSpace rs) {
-  set_reserved(rs);
-  set_committed(reserved_low_addr(), reserved_low_addr());
-  DEBUG_ONLY(verify());
-}
-
 PSVirtualSpace::~PSVirtualSpace() {
   release();
 }
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.hpp b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
index 4c2aa8eef3f..a54a513a117 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp
@@ -58,9 +58,6 @@ class PSVirtualSpace : public CHeapObj<mtGC> {
 
   ~PSVirtualSpace();
 
-  PSVirtualSpace();
-  void initialize(ReservedSpace rs);
-
   bool is_in_committed(const void* p) const {
     return (p >= committed_low_addr()) && (p < committed_high_addr());
   }

From c29537740efb04e061732a700582d43b1956cff4 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 27 May 2025 14:44:40 +0000
Subject: [PATCH 661/901] 8357800: Initialize JvmtiThreadState bool fields with
 bool literals

Reviewed-by: alanb, stefank
---
 src/hotspot/share/prims/jvmtiThreadState.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index 5346f7a860e..01600b26c28 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -74,7 +74,7 @@ JvmtiThreadState::JvmtiThreadState(JavaThread* thread, oop thread_oop)
   _the_class_for_redefinition_verification = nullptr;
   _scratch_class_for_redefinition_verification = nullptr;
   _cur_stack_depth = UNKNOWN_STACK_DEPTH;
-  _saved_interp_only_mode = 0;
+  _saved_interp_only_mode = false;
 
   // JVMTI ForceEarlyReturn support
   _pending_step_for_earlyret = false;
@@ -800,7 +800,7 @@ void JvmtiThreadState::leave_interp_only_mode() {
   assert(is_interp_only_mode(), "leaving interp only when not in interp only mode");
   if (_thread == nullptr) {
     // Unmounted virtual thread updates the saved value.
-    _saved_interp_only_mode = 0;
+    _saved_interp_only_mode = false;
   } else {
     _thread->set_interp_only_mode(false);
   }

From c1f066e17eacf7649df4042e2fb985da9724ef40 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 27 May 2025 17:11:24 +0000
Subject: [PATCH 662/901] 8356888: (fs) FileSystems.newFileSystem that take an
 env must specify IllegalArgumentException

Reviewed-by: lancea, alanb, jpai
---
 .../classes/java/nio/file/FileSystems.java    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/file/FileSystems.java b/src/java.base/share/classes/java/nio/file/FileSystems.java
index f60f798c6e2..2a59eb33f76 100644
--- a/src/java.base/share/classes/java/nio/file/FileSystems.java
+++ b/src/java.base/share/classes/java/nio/file/FileSystems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 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
@@ -257,8 +257,9 @@ public static FileSystem getFileSystem(URI uri) {
      *
      * @throws  IllegalArgumentException
      *          if the pre-conditions for the {@code uri} parameter are not met,
-     *          or the {@code env} parameter does not contain properties required
-     *          by the provider, or a property value is invalid
+     *          or if the {@code env} parameter does not contain properties
+     *          required by the provider, contains an invalid combination of
+     *          properties and values, or contains an invalid property value
      * @throws  FileSystemAlreadyExistsException
      *          if the file system has already been created
      * @throws  ProviderNotFoundException
@@ -296,8 +297,9 @@ public static FileSystem newFileSystem(URI uri, Map<String,?> env)
      *
      * @throws  IllegalArgumentException
      *          if the pre-conditions for the {@code uri} parameter are not met,
-     *          or the {@code env} parameter does not contain properties required
-     *          by the provider, or a property value is invalid
+     *          or if the {@code env} parameter does not contain properties
+     *          required by the provider, contains an invalid combination of
+     *          properties and values, or contains an invalid property value
      * @throws  FileSystemAlreadyExistsException
      *          if the URI scheme identifies an installed provider and the file
      *          system has already been created
@@ -370,6 +372,8 @@ public static FileSystem newFileSystem(URI uri, Map<String,?> env, ClassLoader l
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
+     *
+     * @since 13
      */
     public static FileSystem newFileSystem(Path path,
                                            ClassLoader loader)
@@ -400,6 +404,10 @@ public static FileSystem newFileSystem(Path path,
      *
      * @return  a new file system
      *
+     * @throws  IllegalArgumentException
+     *          if the {@code env} parameter does not contain properties
+     *          required by the provider, contains an invalid combination of
+     *          properties and values, or contains an invalid property value
      * @throws  ProviderNotFoundException
      *          if a provider supporting this file type cannot be located
      * @throws  ServiceConfigurationError
@@ -476,6 +484,10 @@ public static FileSystem newFileSystem(Path path) throws IOException {
      *
      * @return  a new file system
      *
+     * @throws  IllegalArgumentException
+     *          if the {@code env} parameter does not contain properties
+     *          required by the provider, contains an invalid combination of
+     *          properties and values, or contains an invalid property value
      * @throws  ProviderNotFoundException
      *          if a provider supporting this file type cannot be located
      * @throws  ServiceConfigurationError

From d4b923d175b07e39ee8ee2c79f04457ea1cfbdd0 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 27 May 2025 19:11:12 +0000
Subject: [PATCH 663/901] 8357268: Use JavaNioAccess.getBufferAddress rather
 than DirectBuffer.address()

Reviewed-by: alanb, valeriep
---
 .../crypto/provider/GaloisCounterMode.java    | 19 +++++++++--------
 .../share/classes/sun/nio/ch/IOUtil.java      |  4 ++--
 .../fs/UnixUserDefinedFileAttributeView.java  |  8 +++----
 .../sun/security/pkcs11/P11AEADCipher.java    | 11 +++++-----
 .../sun/security/pkcs11/P11Cipher.java        | 15 ++++++-------
 .../sun/security/pkcs11/P11Digest.java        |  7 ++++---
 .../sun/security/pkcs11/P11KeyWrapCipher.java | 11 +++++-----
 .../classes/sun/security/pkcs11/P11Mac.java   |  5 +++--
 .../sun/security/pkcs11/P11PSSSignature.java  |  6 +++---
 .../sun/security/pkcs11/P11Signature.java     |  6 +++---
 .../sun/nio/ch/sctp/SctpChannelImpl.java      |  7 ++++---
 .../sun/nio/ch/sctp/SctpMultiChannelImpl.java |  7 ++++---
 .../AsynchronousFileChannel/Basic.java        | 21 +++++++++++--------
 .../UserDefinedFileAttributeView/Basic.java   | 12 ++++++++---
 14 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
index 4f6495b8916..3d1396121ad 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.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
@@ -27,6 +27,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.*;
@@ -910,26 +911,26 @@ int doLastBlock(GCMOperation op, ByteBuffer buffer, ByteBuffer src,
          */
         ByteBuffer overlapDetection(ByteBuffer src, ByteBuffer dst) {
             if (src.isDirect() && dst.isDirect()) {
-                // The use of DirectBuffer::address below need not be guarded as
+                // The use of addresses below need not be guarded as
                 // no access is made to actual memory.
                 DirectBuffer dsrc = (DirectBuffer) src;
                 DirectBuffer ddst = (DirectBuffer) dst;
 
                 // Get the current memory address for the given ByteBuffers
-                long srcaddr = dsrc.address();
-                long dstaddr = ddst.address();
+                long srcaddr = NIO_ACCESS.getBufferAddress(src);
+                long dstaddr = NIO_ACCESS.getBufferAddress(dst);
 
                 // Find the lowest attachment that is the base memory address
                 // of the shared memory for the src object
                 while (dsrc.attachment() != null) {
-                    srcaddr = ((DirectBuffer) dsrc.attachment()).address();
+                    srcaddr = NIO_ACCESS.getBufferAddress((Buffer) dsrc.attachment());
                     dsrc = (DirectBuffer) dsrc.attachment();
                 }
 
                 // Find the lowest attachment that is the base memory address
                 // of the shared memory for the dst object
                 while (ddst.attachment() != null) {
-                    dstaddr = ((DirectBuffer) ddst.attachment()).address();
+                    dstaddr = NIO_ACCESS.getBufferAddress((Buffer) ddst.attachment());
                     ddst = (DirectBuffer) ddst.attachment();
                 }
 
@@ -947,8 +948,8 @@ ByteBuffer overlapDetection(ByteBuffer src, ByteBuffer dst) {
                 // side, we are not in overlap.
                 // NOTE: inPlaceArray does not apply here as direct buffers run
                 // through a byte[] to get to the combined intrinsic
-                if (((DirectBuffer) src).address() - srcaddr + src.position() >=
-                    ((DirectBuffer) dst).address() - dstaddr + dst.position()) {
+                if (NIO_ACCESS.getBufferAddress(src) - srcaddr + src.position() >=
+                    NIO_ACCESS.getBufferAddress(dst) - dstaddr + dst.position()) {
                     return dst;
                 }
 
@@ -1602,7 +1603,7 @@ public int doFinal(ByteBuffer src, ByteBuffer dst)
                         NIO_ACCESS.acquireSession(dst);
                         try {
                             Unsafe.getUnsafe().setMemory(
-                                ((DirectBuffer)dst).address(),
+                                NIO_ACCESS.getBufferAddress(dst),
                                 len + dst.position(), (byte) 0);
                         } finally {
                             NIO_ACCESS.releaseSession(dst);
diff --git a/src/java.base/share/classes/sun/nio/ch/IOUtil.java b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
index d86d6decb14..ad1aedc2668 100644
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.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
@@ -484,7 +484,7 @@ static void acquireScope(ByteBuffer bb, boolean async) {
         NIO_ACCESS.acquireSession(bb);
     }
 
-    private static void releaseScope(ByteBuffer bb) {
+    static void releaseScope(ByteBuffer bb) {
         try {
             NIO_ACCESS.releaseSession(bb);
         } catch (Exception e) {
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
index d2295ce3cc5..1214ba85568 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixUserDefinedFileAttributeView.java
@@ -166,10 +166,10 @@ public int read(String name, ByteBuffer dst) throws IOException {
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        if (dst instanceof sun.nio.ch.DirectBuffer ddst) {
+        if (dst.isDirect()) {
             NIO_ACCESS.acquireSession(dst);
             try {
-                long address = ddst.address() + pos;
+                long address = NIO_ACCESS.getBufferAddress(dst) + pos;
                 int n = read(name, address, rem);
                 dst.position(pos + n);
                 return n;
@@ -225,10 +225,10 @@ public int write(String name, ByteBuffer src) throws IOException {
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        if (src instanceof sun.nio.ch.DirectBuffer buf) {
+        if (src.isDirect()) {
             NIO_ACCESS.acquireSession(src);
             try {
-                long address = buf.address() + pos;
+                long address = NIO_ACCESS.getBufferAddress(src) + pos;
                 write(name, address, rem);
                 src.position(pos + rem);
                 return rem;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
index d04776a0384..b41e939e906 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11AEADCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 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,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.io.ByteArrayOutputStream;
@@ -743,8 +744,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                         inOfs = 0;
                         inLen = in.length;
                     } else {
-                        if (inBuffer instanceof DirectBuffer dInBuffer) {
-                            inAddr = dInBuffer.address();
+                        if (inBuffer instanceof DirectBuffer) {
+                            inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                             inOfs = inBuffer.position();
                         } else {
                             if (inBuffer.hasArray()) {
@@ -759,8 +760,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                     long outAddr = 0;
                     byte[] outArray = null;
                     int outOfs = 0;
-                    if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                        outAddr = dOutBuffer.address();
+                    if (outBuffer instanceof DirectBuffer) {
+                        outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                         outOfs = outBuffer.position();
                     } else {
                         if (outBuffer.hasArray()) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
index faf1aa9237f..9c923b76215 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.nio.ByteBuffer;
@@ -742,8 +743,8 @@ private int implUpdate(ByteBuffer inBuffer, ByteBuffer outBuffer)
                 int inOfs = 0;
                 byte[] inArray = null;
 
-                if (inBuffer instanceof DirectBuffer dInBuffer) {
-                    inAddr = dInBuffer.address();
+                if (inBuffer instanceof DirectBuffer) {
+                    inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                     inOfs = origPos;
                 } else if (inBuffer.hasArray()) {
                     inArray = inBuffer.array();
@@ -753,8 +754,8 @@ private int implUpdate(ByteBuffer inBuffer, ByteBuffer outBuffer)
                 long outAddr = 0;
                 int outOfs = 0;
                 byte[] outArray = null;
-                if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                    outAddr = dOutBuffer.address();
+                if (outBuffer instanceof DirectBuffer) {
+                    outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                     outOfs = outBuffer.position();
                 } else {
                     if (outBuffer.hasArray()) {
@@ -1012,8 +1013,8 @@ private int implDoFinal(ByteBuffer outBuffer)
                 long outAddr = 0;
                 byte[] outArray = null;
                 int outOfs = 0;
-                if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                    outAddr = dOutBuffer.address();
+                if (outBuffer instanceof DirectBuffer) {
+                    outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                     outOfs = outBuffer.position();
                 } else {
                     if (outBuffer.hasArray()) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
index 5a0aec89aa1..7f6a62e9363 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Digest.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
@@ -271,7 +271,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             return;
         }
 
-        if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+        if (!(byteBuffer instanceof DirectBuffer)) {
             super.engineUpdate(byteBuffer);
             return;
         }
@@ -289,7 +289,8 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             }
             NIO_ACCESS.acquireSession(byteBuffer);
             try {
-                token.p11.C_DigestUpdate(session.id(), dByteBuffer.address() + ofs, null, 0, len);
+                final long address = NIO_ACCESS.getBufferAddress(byteBuffer);
+                token.p11.C_DigestUpdate(session.id(), address + ofs, null, 0, len);
             } finally {
                 NIO_ACCESS.releaseSession(byteBuffer);
             }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyWrapCipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyWrapCipher.java
index 75b28d3eaab..d761a0637ad 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyWrapCipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KeyWrapCipher.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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.security.pkcs11;
 
 import java.io.ByteArrayOutputStream;
@@ -577,8 +578,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                         inOfs = 0;
                         inLen = in.length;
                     } else {
-                        if (inBuffer instanceof DirectBuffer dInBuffer) {
-                            inAddr = dInBuffer.address();
+                        if (inBuffer instanceof DirectBuffer) {
+                            inAddr = NIO_ACCESS.getBufferAddress(inBuffer);
                             inOfs = inBuffer.position();
                         } else {
                             if (inBuffer.hasArray()) {
@@ -593,8 +594,8 @@ private int implDoFinal(ByteBuffer inBuffer, ByteBuffer outBuffer)
                     long outAddr = 0;
                     byte[] outArray = null;
                     int outOfs = 0;
-                    if (outBuffer instanceof DirectBuffer dOutBuffer) {
-                        outAddr = dOutBuffer.address();
+                    if (outBuffer instanceof DirectBuffer) {
+                        outAddr = NIO_ACCESS.getBufferAddress(outBuffer);
                         outOfs = outBuffer.position();
                     } else {
                         if (outBuffer.hasArray()) {
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
index f684b13fcd8..0af129f0ba4 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Mac.java
@@ -279,14 +279,15 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
             if (len <= 0) {
                 return;
             }
-            if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+            if (!(byteBuffer instanceof DirectBuffer)) {
                 super.engineUpdate(byteBuffer);
                 return;
             }
             int ofs = byteBuffer.position();
             NIO_ACCESS.acquireSession(byteBuffer);
             try  {
-                token.p11.C_SignUpdate(session.id(), dByteBuffer.address() + ofs, null, 0, len);
+                final long address = NIO_ACCESS.getBufferAddress(byteBuffer);
+                token.p11.C_SignUpdate(session.id(), address + ofs, null, 0, len);
             } finally {
                 NIO_ACCESS.releaseSession(byteBuffer);
             }
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
index 77783870df7..52d6ef72d38 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11PSSSignature.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
@@ -614,7 +614,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
         isActive = true;
         switch (type) {
             case T_UPDATE -> {
-                if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+                if (!(byteBuffer instanceof DirectBuffer)) {
                     // cannot do better than default impl
                     super.engineUpdate(byteBuffer);
                     return;
@@ -622,7 +622,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
                 int ofs = byteBuffer.position();
                 NIO_ACCESS.acquireSession(byteBuffer);
                 try {
-                    long addr = dByteBuffer.address();
+                    long addr = NIO_ACCESS.getBufferAddress(byteBuffer);
                     if (mode == M_SIGN) {
                         if (DEBUG) System.out.println(this + ": Calling C_SignUpdate");
                         token.p11.C_SignUpdate
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
index 0d22665721c..ed7cd525283 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Signature.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
@@ -579,7 +579,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
         }
         switch (type) {
             case T_UPDATE -> {
-                if (!(byteBuffer instanceof DirectBuffer dByteBuffer)) {
+                if (!(byteBuffer instanceof DirectBuffer)) {
                     // cannot do better than default impl
                     super.engineUpdate(byteBuffer);
                     return;
@@ -587,7 +587,7 @@ protected void engineUpdate(ByteBuffer byteBuffer) {
                 int ofs = byteBuffer.position();
                 NIO_ACCESS.acquireSession(byteBuffer);
                 try {
-                    long addr = dByteBuffer.address();
+                    long addr = NIO_ACCESS.getBufferAddress(byteBuffer);
                     if (mode == M_SIGN) {
                         token.p11.C_SignUpdate
                                 (session.id(), addr + ofs, null, 0, len);
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
index 2a676e55a90..485ebf13f2c 100644
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.nio.ch.sctp;
 
 import java.net.InetAddress;
@@ -829,7 +830,7 @@ private int receiveIntoNativeBuffer(int fd,
     {
         NIO_ACCESS.acquireSession(bb);
         try {
-            int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem, peek);
+            int n = receive0(fd, resultContainer, NIO_ACCESS.getBufferAddress(bb) + pos, rem, peek);
 
             if (n > 0)
                 bb.position(pos + n);
@@ -1012,7 +1013,7 @@ private int sendFromNativeBuffer(int fd,
 
         NIO_ACCESS.acquireSession(bb);
         try {
-            int written = send0(fd, ((DirectBuffer)bb).address() + pos, rem, addr,
+            int written = send0(fd, NIO_ACCESS.getBufferAddress(bb) + pos, rem, addr,
                     port, -1 /*121*/, streamNumber, unordered, ppid);
             if (written > 0)
                 bb.position(pos + written);
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
index 4a3f18e6b08..31e83d72f96 100644
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package sun.nio.ch.sctp;
 
 import java.net.InetAddress;
@@ -561,7 +562,7 @@ private int receiveIntoNativeBuffer(int fd,
             throws IOException {
         NIO_ACCESS.acquireSession(bb);
         try {
-            int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem);
+            int n = receive0(fd, resultContainer, NIO_ACCESS.getBufferAddress(bb) + pos, rem);
             if (n > 0)
                 bb.position(pos + n);
             return n;
@@ -870,7 +871,7 @@ private int sendFromNativeBuffer(int fd,
 
         NIO_ACCESS.acquireSession(bb);
         try {
-            int written = send0(fd, ((DirectBuffer)bb).address() + pos, rem, addr,
+            int written = send0(fd, NIO_ACCESS.getBufferAddress(bb) + pos, rem, addr,
                     port, assocId, streamNumber, unordered, ppid);
             if (written > 0)
                 bb.position(pos + written);
diff --git a/test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java b/test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java
index 600d73dc71b..bb3cf92ac01 100644
--- a/test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java
+++ b/test/jdk/java/nio/channels/AsynchronousFileChannel/Basic.java
@@ -29,6 +29,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.foreign.Arena;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousCloseException;
 import java.nio.channels.AsynchronousFileChannel;
@@ -58,6 +59,7 @@
 
 public class Basic {
 
+    // Must be indeterministic
     private static final Random rand = new Random();
 
     public static void main(String[] args) throws IOException {
@@ -563,15 +565,16 @@ static void testTruncate(Path file) throws IOException {
     static ByteBuffer genBuffer() {
         int size = 1024 + rand.nextInt(16000);
         byte[] buf = new byte[size];
-        boolean useDirect = rand.nextBoolean();
-        if (useDirect) {
-            ByteBuffer bb = ByteBuffer.allocateDirect(buf.length);
-            bb.put(buf);
-            bb.flip();
-            return bb;
-        } else {
-            return ByteBuffer.wrap(buf);
-        }
+        return switch (rand.nextInt(3)) {
+            case 0 -> ByteBuffer.allocateDirect(buf.length)
+                    .put(buf)
+                    .flip();
+            case 1 -> ByteBuffer.wrap(buf);
+            case 2 -> Arena.ofAuto().allocate(buf.length).asByteBuffer()
+                    .put(buf)
+                    .flip();
+            default -> throw new InternalError("Should not reach here");
+        };
     }
 
     // writes all remaining bytes in the buffer to the given channel at the
diff --git a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
index da46e401365..92ab35ce5d0 100644
--- a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
+++ b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
@@ -31,6 +31,7 @@
  */
 
 import java.io.IOException;
+import java.lang.foreign.Arena;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -46,7 +47,8 @@
 
 public class Basic {
 
-    private static Random rand = new Random();
+    // Must be indeterministic
+    private static final Random rand = new Random();
 
     private static final String ATTR_NAME = "mime_type";
     private static final String ATTR_VALUE = "text/plain";
@@ -88,8 +90,12 @@ static boolean hasAttribute(UserDefinedFileAttributeView view, String attr)
     static void test(Path file, LinkOption... options) throws IOException {
         final UserDefinedFileAttributeView view =
             Files.getFileAttributeView(file, UserDefinedFileAttributeView.class, options);
-        ByteBuffer buf = rand.nextBoolean() ?
-            ByteBuffer.allocate(100) : ByteBuffer.allocateDirect(100);
+        final ByteBuffer buf = switch (rand.nextInt(3)) {
+            case 0 -> ByteBuffer.allocate(100);
+            case 1 -> ByteBuffer.allocateDirect(100);
+            case 2 -> Arena.ofAuto().allocate(100).asByteBuffer();
+            default -> throw new InternalError("Should not reach here");
+        };
 
         // Test: write
         buf.put(ATTR_VALUE.getBytes()).flip();

From da228e069359bbab0e5c54f8cb2e20d67693b87c Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Tue, 27 May 2025 19:15:40 +0000
Subject: [PATCH 664/901] 8357145: CRC/Inflater/Deflater/Adler32 methods that
 take a ByteBuffer throw UOE if backed by shared memory segment

Reviewed-by: alanb
---
 .../share/classes/java/util/zip/Adler32.java    |  5 ++---
 .../share/classes/java/util/zip/CRC32.java      |  5 ++---
 .../share/classes/java/util/zip/CRC32C.java     |  4 ++--
 .../share/classes/java/util/zip/Deflater.java   | 13 ++++++-------
 .../share/classes/java/util/zip/Inflater.java   | 13 ++++++-------
 test/jdk/java/util/zip/ChecksumBase.java        | 17 +++++++++++++----
 test/jdk/java/util/zip/DeInflate.java           | 15 +++++++++++++--
 7 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/src/java.base/share/classes/java/util/zip/Adler32.java b/src/java.base/share/classes/java/util/zip/Adler32.java
index 807c08ced8a..fa2fdb1f4c3 100644
--- a/src/java.base/share/classes/java/util/zip/Adler32.java
+++ b/src/java.base/share/classes/java/util/zip/Adler32.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
@@ -29,7 +29,6 @@
 
 import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
-import sun.nio.ch.DirectBuffer;
 
 import static java.util.zip.ZipUtils.NIO_ACCESS;
 
@@ -100,7 +99,7 @@ public void update(ByteBuffer buffer) {
         if (buffer.isDirect()) {
             NIO_ACCESS.acquireSession(buffer);
             try {
-                adler = updateByteBuffer(adler, ((DirectBuffer)buffer).address(), pos, rem);
+                adler = updateByteBuffer(adler, NIO_ACCESS.getBufferAddress(buffer), pos, rem);
             } finally {
                 NIO_ACCESS.releaseSession(buffer);
             }
diff --git a/src/java.base/share/classes/java/util/zip/CRC32.java b/src/java.base/share/classes/java/util/zip/CRC32.java
index 944ccaa7e21..80b4f05a3c1 100644
--- a/src/java.base/share/classes/java/util/zip/CRC32.java
+++ b/src/java.base/share/classes/java/util/zip/CRC32.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
@@ -28,7 +28,6 @@
 import java.nio.ByteBuffer;
 import java.util.Objects;
 
-import sun.nio.ch.DirectBuffer;
 import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
@@ -99,7 +98,7 @@ public void update(ByteBuffer buffer) {
         if (buffer.isDirect()) {
             NIO_ACCESS.acquireSession(buffer);
             try {
-                crc = updateByteBuffer(crc, ((DirectBuffer)buffer).address(), pos, rem);
+                crc = updateByteBuffer(crc, NIO_ACCESS.getBufferAddress(buffer), pos, rem);
             } finally {
                 NIO_ACCESS.releaseSession(buffer);
             }
diff --git a/src/java.base/share/classes/java/util/zip/CRC32C.java b/src/java.base/share/classes/java/util/zip/CRC32C.java
index 36d37f3fe26..5b4b3597e9c 100644
--- a/src/java.base/share/classes/java/util/zip/CRC32C.java
+++ b/src/java.base/share/classes/java/util/zip/CRC32C.java
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.util.zip;
 
 import java.nio.ByteBuffer;
@@ -30,7 +31,6 @@
 import jdk.internal.misc.Unsafe;
 import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
-import sun.nio.ch.DirectBuffer;
 
 import static java.util.zip.ZipUtils.NIO_ACCESS;
 
@@ -176,7 +176,7 @@ public void update(ByteBuffer buffer) {
         if (buffer.isDirect()) {
             NIO_ACCESS.acquireSession(buffer);
             try {
-                crc = updateDirectByteBuffer(crc, ((DirectBuffer)buffer).address(),
+                crc = updateDirectByteBuffer(crc, NIO_ACCESS.getBufferAddress(buffer),
                         pos, limit);
             } finally {
                 NIO_ACCESS.releaseSession(buffer);
diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java
index 97a2a2d10ec..c3ce84263b2 100644
--- a/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -32,7 +32,6 @@
 
 import jdk.internal.ref.CleanerFactory;
 import jdk.internal.util.Preconditions;
-import sun.nio.ch.DirectBuffer;
 
 import static java.util.zip.ZipUtils.NIO_ACCESS;
 
@@ -322,7 +321,7 @@ public void setDictionary(ByteBuffer dictionary) {
             if (dictionary.isDirect()) {
                 NIO_ACCESS.acquireSession(dictionary);
                 try {
-                    long address = ((DirectBuffer) dictionary).address();
+                    long address = NIO_ACCESS.getBufferAddress(dictionary);
                     setDictionaryBuffer(zsRef.address(), address + position, remaining);
                 } finally {
                     NIO_ACCESS.releaseSession(dictionary);
@@ -577,7 +576,7 @@ public int deflate(byte[] output, int off, int len, int flush) {
                 if (input.isDirect()) {
                     NIO_ACCESS.acquireSession(input);
                     try {
-                        long inputAddress = ((DirectBuffer) input).address();
+                        long inputAddress = NIO_ACCESS.getBufferAddress(input);
                         result = deflateBufferBytes(zsRef.address(),
                             inputAddress + inputPos, inputRem,
                             output, off, len,
@@ -701,7 +700,7 @@ public int deflate(ByteBuffer output, int flush) {
                 if (output.isDirect()) {
                     NIO_ACCESS.acquireSession(output);
                     try {
-                        long outputAddress = ((DirectBuffer) output).address();
+                        long outputAddress = NIO_ACCESS.getBufferAddress(output);
                         result = deflateBytesBuffer(zsRef.address(),
                             inputArray, inputPos, inputLim - inputPos,
                             outputAddress + outputPos, outputRem,
@@ -723,11 +722,11 @@ public int deflate(ByteBuffer output, int flush) {
                 if (input.isDirect()) {
                     NIO_ACCESS.acquireSession(input);
                     try {
-                        long inputAddress = ((DirectBuffer) input).address();
+                        long inputAddress = NIO_ACCESS.getBufferAddress(input);
                         if (output.isDirect()) {
                             NIO_ACCESS.acquireSession(output);
                             try {
-                                long outputAddress = outputPos + ((DirectBuffer) output).address();
+                                long outputAddress = outputPos + NIO_ACCESS.getBufferAddress(output);
                                 result = deflateBufferBuffer(zsRef.address(),
                                     inputAddress + inputPos, inputRem,
                                     outputAddress, outputRem,
@@ -752,7 +751,7 @@ public int deflate(ByteBuffer output, int flush) {
                     if (output.isDirect()) {
                         NIO_ACCESS.acquireSession(output);
                         try {
-                            long outputAddress = ((DirectBuffer) output).address();
+                            long outputAddress = NIO_ACCESS.getBufferAddress(output);
                             result = deflateBytesBuffer(zsRef.address(),
                                 inputArray, inputOffset + inputPos, inputRem,
                                 outputAddress + outputPos, outputRem,
diff --git a/src/java.base/share/classes/java/util/zip/Inflater.java b/src/java.base/share/classes/java/util/zip/Inflater.java
index 7c439ec812d..5ced5a4879a 100644
--- a/src/java.base/share/classes/java/util/zip/Inflater.java
+++ b/src/java.base/share/classes/java/util/zip/Inflater.java
@@ -32,7 +32,6 @@
 
 import jdk.internal.ref.CleanerFactory;
 import jdk.internal.util.Preconditions;
-import sun.nio.ch.DirectBuffer;
 
 import static java.util.zip.ZipUtils.NIO_ACCESS;
 
@@ -243,7 +242,7 @@ public void setDictionary(ByteBuffer dictionary) {
             if (dictionary.isDirect()) {
                 NIO_ACCESS.acquireSession(dictionary);
                 try {
-                    long address = ((DirectBuffer) dictionary).address();
+                    long address = NIO_ACCESS.getBufferAddress(dictionary);
                     setDictionaryBuffer(zsRef.address(), address + position, remaining);
                 } finally {
                     NIO_ACCESS.releaseSession(dictionary);
@@ -366,7 +365,7 @@ public int inflate(byte[] output, int off, int len)
                         if (input.isDirect()) {
                             NIO_ACCESS.acquireSession(input);
                             try {
-                                long inputAddress = ((DirectBuffer) input).address();
+                                long inputAddress = NIO_ACCESS.getBufferAddress(input);
                                 result = inflateBufferBytes(zsRef.address(),
                                     inputAddress + inputPos, inputRem,
                                     output, off, len);
@@ -503,7 +502,7 @@ public int inflate(ByteBuffer output) throws DataFormatException {
                         if (output.isDirect()) {
                             NIO_ACCESS.acquireSession(output);
                             try {
-                                long outputAddress = ((DirectBuffer) output).address();
+                                long outputAddress = NIO_ACCESS.getBufferAddress(output);
                                 result = inflateBytesBuffer(zsRef.address(),
                                     inputArray, inputPos, inputLim - inputPos,
                                     outputAddress + outputPos, outputRem);
@@ -528,11 +527,11 @@ public int inflate(ByteBuffer output) throws DataFormatException {
                         if (input.isDirect()) {
                             NIO_ACCESS.acquireSession(input);
                             try {
-                                long inputAddress = ((DirectBuffer) input).address();
+                                long inputAddress = NIO_ACCESS.getBufferAddress(input);
                                 if (output.isDirect()) {
                                     NIO_ACCESS.acquireSession(output);
                                     try {
-                                        long outputAddress = ((DirectBuffer) output).address();
+                                        long outputAddress = NIO_ACCESS.getBufferAddress(output);
                                         result = inflateBufferBuffer(zsRef.address(),
                                             inputAddress + inputPos, inputRem,
                                             outputAddress + outputPos, outputRem);
@@ -555,7 +554,7 @@ public int inflate(ByteBuffer output) throws DataFormatException {
                             if (output.isDirect()) {
                                 NIO_ACCESS.acquireSession(output);
                                 try {
-                                    long outputAddress = ((DirectBuffer) output).address();
+                                    long outputAddress = NIO_ACCESS.getBufferAddress(output);
                                     result = inflateBytesBuffer(zsRef.address(),
                                         inputArray, inputOffset + inputPos, inputRem,
                                         outputAddress + outputPos, outputRem);
diff --git a/test/jdk/java/util/zip/ChecksumBase.java b/test/jdk/java/util/zip/ChecksumBase.java
index 6c4f1edf45c..1df1f8203c9 100644
--- a/test/jdk/java/util/zip/ChecksumBase.java
+++ b/test/jdk/java/util/zip/ChecksumBase.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
@@ -21,14 +21,15 @@
  * questions.
  */
 
-/**
- * Base class for Checksum tests
- */
+import java.lang.foreign.MemorySegment;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.Checksum;
 
+/**
+ * Base class for Checksum tests
+ */
 public class ChecksumBase {
 
     private static final byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
@@ -36,6 +37,7 @@ public class ChecksumBase {
     public static void testAll(Checksum checksum, long expected) {
         testBytes(checksum, expected);
         testByteArray(checksum, expected);
+        testWrappedMemorySegment(checksum, expected);
         testWrappedByteBuffer(checksum, expected);
         testReadonlyByteBuffer(checksum, expected);
         testDirectByteBuffer(checksum, expected);
@@ -69,6 +71,13 @@ private static void testWrappedByteBuffer(Checksum checksum, long expected) {
         checkChecksum(checksum, expected);
     }
 
+    private static void testWrappedMemorySegment(Checksum checksum, long expected) {
+        checksum.reset();
+        ByteBuffer bb = MemorySegment.ofArray(BYTES_123456789).asByteBuffer();
+        checksum.update(bb);
+        checkChecksum(checksum, expected);
+    }
+
     private static void testReadonlyByteBuffer(Checksum checksum, long expected) {
         checksum.reset();
         ByteBuffer bb = ByteBuffer.wrap(BYTES_123456789).asReadOnlyBuffer();
diff --git a/test/jdk/java/util/zip/DeInflate.java b/test/jdk/java/util/zip/DeInflate.java
index d3785f0360e..226d4ed4ae3 100644
--- a/test/jdk/java/util/zip/DeInflate.java
+++ b/test/jdk/java/util/zip/DeInflate.java
@@ -21,14 +21,15 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug 7110149 8184306 6341887
+ * @bug 7110149 8184306 6341887 8357145
  * @summary Test basic deflater & inflater functionality
  * @key randomness
  */
 
 import java.io.*;
+import java.lang.foreign.Arena;
 import java.nio.*;
 import java.util.*;
 import java.util.zip.*;
@@ -203,6 +204,16 @@ static void check(Deflater def, byte[] in, int len, boolean nowrap)
         bbOut2 = ByteBuffer.allocateDirect(out2.length);
         checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
         checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+
+        // segment
+        try (var arena = Arena.ofConfined()) {
+            bbIn = arena.allocate(in.length).asByteBuffer();
+            bbIn.put(in, 0, n).flip();
+            bbOut1 = arena.allocate(out1.length).asByteBuffer();
+            bbOut2 = arena.allocate(out2.length).asByteBuffer();
+            checkByteBuffer(def, inf, bbIn, bbOut1, bbOut2, in, len, out2, false);
+            checkByteBufferReadonly(def, inf, bbIn, bbOut1, bbOut2);
+        }
     }
 
     static void checkDict(Deflater def, Inflater inf, byte[] src,

From 4755276f36ccc989d9171fc9f92f8e886d4d99b9 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 27 May 2025 19:47:56 +0000
Subject: [PATCH 665/901] 8357912: (fs) Remove @since tag from
 java.nio.file.FileSystems.newFileSystem(Path,ClassLoader)

Reviewed-by: lancea, alanb
---
 src/java.base/share/classes/java/nio/file/FileSystems.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/file/FileSystems.java b/src/java.base/share/classes/java/nio/file/FileSystems.java
index 2a59eb33f76..fc4b80b0b2a 100644
--- a/src/java.base/share/classes/java/nio/file/FileSystems.java
+++ b/src/java.base/share/classes/java/nio/file/FileSystems.java
@@ -372,8 +372,6 @@ public static FileSystem newFileSystem(URI uri, Map<String,?> env, ClassLoader l
      *          when an error occurs while loading a service provider
      * @throws  IOException
      *          if an I/O error occurs
-     *
-     * @since 13
      */
     public static FileSystem newFileSystem(Path path,
                                            ClassLoader loader)

From 11ad1733f8db3d8e868383fc9826963b9ffd620f Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Tue, 27 May 2025 20:43:09 +0000
Subject: [PATCH 666/901] 8354944: Remove unnecessary PartiallyOrderedSet.nodes

Reviewed-by: serb, aivanov
---
 .../javax/imageio/spi/PartiallyOrderedSet.java     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java b/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
index a547db84363..f88724cce6a 100644
--- a/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
+++ b/src/java.desktop/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 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,7 +30,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * A set of {@code Object}s with pairwise orderings between them.
@@ -58,10 +57,7 @@ class PartiallyOrderedSet<E> extends AbstractSet<E> {
     // p. 315.
 
     // Maps Objects to DigraphNodes that contain them
-    private Map<E, DigraphNode<E>> poNodes = new HashMap<>();
-
-    // The set of Objects
-    private Set<E> nodes = poNodes.keySet();
+    private final Map<E, DigraphNode<E>> poNodes = new HashMap<>();
 
     /**
      * Constructs a {@code PartiallyOrderedSet}.
@@ -69,11 +65,11 @@ class PartiallyOrderedSet<E> extends AbstractSet<E> {
     public PartiallyOrderedSet() {}
 
     public int size() {
-        return nodes.size();
+        return poNodes.size();
     }
 
     public boolean contains(Object o) {
-        return nodes.contains(o);
+        return poNodes.containsKey(o);
     }
 
     /**
@@ -90,7 +86,7 @@ public Iterator<E> iterator() {
      * {@code PartiallyOrderedSet}.
      */
     public boolean add(E o) {
-        if (nodes.contains(o)) {
+        if (poNodes.containsKey(o)) {
             return false;
         }
 

From 2e8b195a96e3b2a4ca27c64a923adc4334073128 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 27 May 2025 21:40:27 +0000
Subject: [PATCH 667/901] 8354078: Implement JEP 521: Generational Shenandoah

Reviewed-by: ysr
---
 .../share/gc/shenandoah/mode/shenandoahGenerationalMode.hpp     | 2 +-
 test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.hpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.hpp
index 0946858169a..26020777693 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.hpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahGenerationalMode.hpp
@@ -32,7 +32,7 @@ class ShenandoahGenerationalMode : public ShenandoahMode {
   virtual void initialize_flags() const;
   virtual const char* name()     { return "Generational"; }
   virtual bool is_diagnostic()   { return false; }
-  virtual bool is_experimental() { return true; }
+  virtual bool is_experimental() { return false; }
   virtual bool is_generational() { return true; }
 };
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
index 70bec36da62..1f231da44c9 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
@@ -47,7 +47,7 @@ enum Mode {
     public static void main(String[] args) throws Exception {
         testWith("-XX:ShenandoahGCMode=satb",         Mode.PRODUCT);
         testWith("-XX:ShenandoahGCMode=passive",      Mode.DIAGNOSTIC);
-        testWith("-XX:ShenandoahGCMode=generational", Mode.EXPERIMENTAL);
+        testWith("-XX:ShenandoahGCMode=generational", Mode.PRODUCT);
     }
 
     private static void testWith(String h, Mode mode) throws Exception {

From f25f4a3eb2f3ebba4af30471de9d35778c120d50 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 27 May 2025 22:41:39 +0000
Subject: [PATCH 668/901] 8349665: Make clean removes module-deps.gmk

Reviewed-by: erikj
---
 make/Init.gmk           | 12 ++++++++----
 make/Main.gmk           |  6 ++++++
 make/PreInitSupport.gmk |  7 ++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 5dd1a71dd9a..32624d7dee6 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -37,10 +37,6 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/InitSupport.gmk
 include LogUtils.gmk
 
-# Force early generation of module-deps.gmk
-GENERATE_MODULE_DEPS_FILE := true
-include Modules.gmk
-
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
 .NOTPARALLEL:
@@ -144,6 +140,14 @@ main: $(INIT_TARGETS)
 	    ( cd $(TOPDIR) && \
 	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	        $(SEQUENTIAL_TARGETS) )
+            # We might have cleaned away essential files, recreate them.
+	    ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
+	        $(USER_MAKE_VARS) )
+	    ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
+	        UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	        create-main-targets-include )
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)
diff --git a/make/Main.gmk b/make/Main.gmk
index 3535ad16aae..6a800a2edd5 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -42,6 +42,12 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/MainSupport.gmk
 
 include FindTests.gmk
+
+ifeq ($(UPDATE_MODULE_DEPS), true)
+  # Update module-deps.gmk if requested. This is read in Modules.gmk.
+  GENERATE_MODULE_DEPS_FILE := true
+endif
+
 include Modules.gmk
 
 # Are we requested to ignore dependencies?
diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk
index 1d3c3ce9135..660e1214b5b 100644
--- a/make/PreInitSupport.gmk
+++ b/make/PreInitSupport.gmk
@@ -268,11 +268,12 @@ define DefineMainTargets
 
   $$(main_targets_file):
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
 	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) NO_RECIPES=true \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/Main.gmk \
+	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) \
+	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )
 

From c110623d38806c5170fbff640e77933dcef8981b Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 27 May 2025 23:23:26 +0000
Subject: [PATCH 669/901] 8357282: Test
 vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java fails
 after ClassNotFoundException

Reviewed-by: lmesnik, sspitsyn
---
 test/hotspot/jtreg/ProblemList.txt                       | 1 -
 .../vmTestbase/nsk/share/aod/AODRunnerArgParser.java     | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 974f9b9fd38..125ca887078 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -162,7 +162,6 @@ vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
 
-vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/AODRunnerArgParser.java b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/AODRunnerArgParser.java
index b5cc96055d6..089da5b9721 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/AODRunnerArgParser.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/AODRunnerArgParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, 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
@@ -106,7 +106,12 @@ public String getTargetApp() {
             throw new TestBug("Target application isn't specified");
         }
 
-        return options.getProperty(TARGET_APP_PARAM);
+        String target = options.getProperty(TARGET_APP_PARAM);
+        // target may contain class and arguments in surrounding quotes
+        if (target.startsWith("\"") && target.endsWith("\"")) {
+            target = target.substring(1, target.length() - 1);
+        }
+        return target;
     }
 
     public String getTestedJDK() {

From 4cad437956ff75a377adba8a760e19dc6cf7dc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Nie=C3=9Fing?= <zuniquex@protonmail.com>
Date: Wed, 28 May 2025 01:54:48 +0000
Subject: [PATCH 670/901] 8357597: Proxy.getInvocationHandler throws
 NullPointerException instead of IllegalArgumentException for null

Reviewed-by: rriggs, jpai, liach
---
 src/java.base/share/classes/java/lang/reflect/Proxy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java
index 83a1520ce08..dc512e86590 100644
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -967,6 +967,7 @@ public static boolean isProxyClass(Class<?> cl) {
      * @return  the invocation handler for the proxy instance
      * @throws  IllegalArgumentException if the argument is not a
      *          proxy instance
+     * @throws  NullPointerException if {@code proxy} is {@code null}
      */
     public static InvocationHandler getInvocationHandler(Object proxy)
         throws IllegalArgumentException

From 96fb31e2dbc16875c6c8183096cd03f30d0632ee Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dzhang@openjdk.org>
Date: Wed, 28 May 2025 02:27:06 +0000
Subject: [PATCH 671/901] 8357695: RISC-V: Move vector intrinsic condition
 checks into match_rule_supported_vector

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/riscv.ad   | 15 ---------------
 src/hotspot/cpu/riscv/riscv_v.ad | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 3cc645c8fe6..c711d2db640 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1882,18 +1882,6 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_EncodeISOArray:
       return UseRVV;
 
-    // Current test shows that, it brings performance gain when MaxVectorSize >= 32, but brings
-    // regression when MaxVectorSize == 16. So only enable the intrinsic when MaxVectorSize >= 32.
-    case Op_RoundVF:
-      return UseRVV && MaxVectorSize >= 32;
-
-    // For double, current test shows that even with MaxVectorSize == 32, there is still some regression.
-    // Although there is no hardware to verify it for now, from the trend of performance data on hardwares
-    // (with vlenb == 16 and 32 respectively), it's promising to bring better performance rather than
-    // regression for double when MaxVectorSize == 64+. So only enable the intrinsic when MaxVectorSize >= 64.
-    case Op_RoundVD:
-      return UseRVV && MaxVectorSize >= 64;
-
     case Op_PopCountI:
     case Op_PopCountL:
       return UsePopCountInstruction;
@@ -1917,9 +1905,6 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_FmaF:
     case Op_FmaD:
       return UseFMA;
-    case Op_FmaVF:
-    case Op_FmaVD:
-      return UseRVV && UseFMA;
 
     case Op_ConvHF2F:
     case Op_ConvF2HF:
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index de4c2b408d4..8b5759ce11c 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -122,6 +122,20 @@ source %{
         return UseZvfh;
       case Op_FmaVHF:
         return UseZvfh && UseFMA;
+      case Op_FmaVF:
+      case Op_FmaVD:
+        return UseFMA;
+
+      // For float, current test shows that, it brings performance gain when vlen >= 8, but brings
+      // regression when vlen == 4. So only enable this intrinsic when vlen >= 8.
+      // For double, current test shows that even with vlen == 4, there is still some regression.
+      // Although there is no hardware to verify it, from the trend of performance data on hardwares
+      // (with vlen == 2 and 4 respectively), it's promising to bring better performance rather than
+      // regression for double when vlen == 8. So only enable this intrinsic when vlen >= 8.
+      case Op_RoundVF:
+      case Op_RoundVD:
+        return vlen >= 8;
+
       default:
         break;
     }

From 72b9aafd5a0dfb379a979f554fa99a767eef3e50 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 28 May 2025 02:39:59 +0000
Subject: [PATCH 672/901] 8357917: Assert in
 MetaspaceShared::preload_and_dump() when printing exception

Reviewed-by: kvn, jrose
---
 src/hotspot/share/cds/metaspaceShared.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index be7fa383263..d8281d1f9a4 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -799,8 +799,9 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
                      "%zuM", MaxHeapSize/M);
       MetaspaceShared::writing_error();
     } else {
+      oop message = java_lang_Throwable::message(PENDING_EXCEPTION);
       aot_log_error(aot)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
-                     java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
+                         message == nullptr ? "(null)" : java_lang_String::as_utf8_string(message));
       MetaspaceShared::writing_error(err_msg("Unexpected exception, use -Xlog:aot%s,exceptions=trace for detail",
                                              CDSConfig::new_aot_flags_used() ? "" : ",cds"));
     }

From 670ef8cc52e6eb068ca6968142629abc1c424571 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 28 May 2025 05:54:10 +0000
Subject: [PATCH 673/901] 8357561: BootstrapLoggerTest does not work on Ubuntu
 24 with LANG de_DE.UTF-8

Reviewed-by: dfuchs
---
 .../internal/BootstrapLogger/BootstrapLoggerTest.java     | 6 +++++-
 test/jdk/java/util/logging/LocalizedLevelName.java        | 3 ++-
 test/jdk/java/util/logging/SimpleFormatterFormat.java     | 8 ++++++--
 test/jdk/sun/util/logging/SourceClassName.java            | 6 +++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
index a59cfefcdb2..72d92c21d7a 100644
--- a/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
+++ b/test/jdk/java/lang/System/LoggerFinder/internal/BootstrapLogger/BootstrapLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
@@ -32,6 +32,7 @@
 import java.lang.System.Logger.Level;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -78,6 +79,8 @@ static enum TestCase {
     }
 
     public static void main(String[] args) throws Exception {
+        Locale savedLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
         if (args == null || args.length == 0) {
             args = new String[] { TestCase.RUN_AND_WAIT.name() };
         }
@@ -351,6 +354,7 @@ public static void main(String[] args) throws Exception {
             LogStream.err.println("Not checking executor termination for " + test);
         }
         LogStream.err.println(test.name() + ": PASSED");
+        Locale.setDefault(savedLocale);
     }
 
 }
diff --git a/test/jdk/java/util/logging/LocalizedLevelName.java b/test/jdk/java/util/logging/LocalizedLevelName.java
index aaaf6f22a54..157e965f1a9 100644
--- a/test/jdk/java/util/logging/LocalizedLevelName.java
+++ b/test/jdk/java/util/logging/LocalizedLevelName.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
@@ -52,6 +52,7 @@ public class LocalizedLevelName {
     public static void main(String args[]) throws Exception {
         Locale defaultLocale = Locale.getDefault();
         for (int i=0; i<namesMap.length; i += 4) {
+            Locale.setDefault(Locale.US);
             final String key = (String) namesMap[i];
             final Locale locale = (Locale) namesMap[i+1];
             final String expectedTranslation = (String) namesMap[i+2];
diff --git a/test/jdk/java/util/logging/SimpleFormatterFormat.java b/test/jdk/java/util/logging/SimpleFormatterFormat.java
index 882a3414175..26abcc2f913 100644
--- a/test/jdk/java/util/logging/SimpleFormatterFormat.java
+++ b/test/jdk/java/util/logging/SimpleFormatterFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, 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
@@ -30,6 +30,7 @@
  */
 
 import java.io.*;
+import java.util.Locale;
 import java.util.logging.*;
 import java.util.regex.*;
 
@@ -38,6 +39,8 @@ public class SimpleFormatterFormat {
     private static final String origFormat = System.getProperty(key);
     private static final PrintStream err = System.err;
     public static void main(String[] args) throws Exception {
+        Locale savedLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
         try {
             File dir = new File(System.getProperty("user.dir", "."));
             File log = new File(dir, "simpleformat.txt");
@@ -53,7 +56,8 @@ public static void main(String[] args) throws Exception {
                 System.setProperty(key, origFormat);
             }
             System.setErr(err);
-       }
+        }
+        Locale.setDefault(savedLocale);
     }
 
     private static String[] loggers = new String[] {
diff --git a/test/jdk/sun/util/logging/SourceClassName.java b/test/jdk/sun/util/logging/SourceClassName.java
index f3023122618..3dbc46f3d11 100644
--- a/test/jdk/sun/util/logging/SourceClassName.java
+++ b/test/jdk/sun/util/logging/SourceClassName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, 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
@@ -33,17 +33,21 @@
  * @run main/othervm SourceClassName
  */
 
+import java.util.Locale;
 import java.util.logging.*;
 import java.io.*;
 import sun.util.logging.PlatformLogger;
 
 public class SourceClassName {
     public static void main(String[] args) throws Exception {
+        Locale savedLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
         File dir = new File(System.getProperty("user.dir", "."));
         File log = new File(dir, "testlog.txt");
         PrintStream logps = new PrintStream(log);
         writeLogRecords(logps);
         checkLogRecords(log);
+        Locale.setDefault(savedLocale);
     }
 
     private static void writeLogRecords(PrintStream logps) throws Exception {

From db515566875b92bd4aff08cccc80d80b85f01514 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 28 May 2025 06:55:20 +0000
Subject: [PATCH 674/901] 8354428: [ubsan] g1BiasedArray.hpp: pointer overflow
 in address calculation

Reviewed-by: ayang, kbarrett, mbaesken
---
 src/hotspot/share/gc/g1/g1BiasedArray.cpp       |  4 ++--
 src/hotspot/share/gc/g1/g1BiasedArray.hpp       | 15 +++++++--------
 src/hotspot/share/gc/g1/vmStructs_g1.hpp        |  4 ++--
 test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp |  8 ++------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.cpp b/src/hotspot/share/gc/g1/g1BiasedArray.cpp
index e03513a89a3..3ce775f809a 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.cpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.cpp
@@ -29,7 +29,7 @@ G1BiasedMappedArrayBase::G1BiasedMappedArrayBase() :
   _alloc_base(nullptr),
   _base(nullptr),
   _length(0),
-  _biased_base(nullptr),
+  _biased_base(0),
   _bias(0),
   _shift_by(0) { }
 
@@ -51,7 +51,7 @@ void G1BiasedMappedArrayBase::verify_index(idx_t index) const {
 }
 
 void G1BiasedMappedArrayBase::verify_biased_index(idx_t biased_index) const {
-  guarantee(_biased_base != nullptr, "Array not initialized");
+  guarantee(_biased_base != 0, "Array not initialized");
   guarantee(biased_index >= bias() && biased_index < (bias() + length()),
             "Biased index out of bounds, index: %zu bias: %zu length: %zu",
             biased_index, bias(), length());
diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
index d2e308f78b0..6282ae8fa7f 100644
--- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp
@@ -49,7 +49,7 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
     assert(shift_by < sizeof(uintptr_t) * 8, "Shifting by %u, larger than word size?", shift_by);
     _base = base;
     _length = length;
-    _biased_base = base - (bias * elem_size);
+    _biased_base = (uintptr_t)base - (bias * elem_size);
     _bias = bias;
     _shift_by = shift_by;
   }
@@ -60,7 +60,7 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
 protected:
   address _base;          // the real base address
   size_t _length;         // the length of the array
-  address _biased_base;   // base address biased by "bias" elements
+  uintptr_t _biased_base; // base address biased by "bias" elements
   size_t _bias;           // the bias, i.e. the offset biased_base is located to the right in elements
   uint _shift_by;         // the amount of bits to shift right when mapping to an index of the array.
 
@@ -102,10 +102,9 @@ class G1BiasedMappedArrayBase : public CHeapObj<mtGC> {
 template<class T>
 class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
 protected:
-  T* base() const { return (T*)G1BiasedMappedArrayBase::_base; }
+  T* base() const { return (T*)this->_base; }
 
-  // The raw biased base pointer.
-  T* biased_base() const { return (T*)G1BiasedMappedArrayBase::_biased_base; }
+  T* biased_base_at(idx_t index) const { return (T*)(this->_biased_base + index * sizeof(T)); }
 
 public:
   typedef G1BiasedMappedArrayBase::idx_t idx_t;
@@ -131,7 +130,7 @@ class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
   T get_by_address(HeapWord* value) const {
     idx_t biased_index = ((uintptr_t)value) >> this->shift_by();
     this->verify_biased_index(biased_index);
-    return biased_base()[biased_index];
+    return *biased_base_at(biased_index);
   }
 
   T* get_ref_by_index(uintptr_t index) const {
@@ -151,7 +150,7 @@ class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
   void set_by_address(HeapWord * address, T value) {
     idx_t biased_index = ((uintptr_t)address) >> this->shift_by();
     this->verify_biased_index(biased_index);
-    biased_base()[biased_index] = value;
+    *biased_base_at(biased_index) = value;
   }
 
 public:
@@ -180,7 +179,7 @@ class G1BiasedMappedArray : public G1BiasedMappedArrayBase {
   // Allocate and initialize this array to cover the heap addresses in the given MemRegion.
   void initialize(MemRegion region, size_t mapping_granularity) {
     G1BiasedMappedArrayBase::initialize(region.start(), region.end(), sizeof(T), mapping_granularity);
-    this->clear();
+    clear();
   }
 };
 
diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
index 22c4cfc584a..651808b4ba0 100644
--- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp
+++ b/src/hotspot/share/gc/g1/vmStructs_g1.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
@@ -48,7 +48,7 @@
                                                                               \
   nonstatic_field(G1HeapRegionTable, _base,             address)              \
   nonstatic_field(G1HeapRegionTable, _length,           size_t)               \
-  nonstatic_field(G1HeapRegionTable, _biased_base,      address)              \
+  nonstatic_field(G1HeapRegionTable, _biased_base,      uintptr_t)            \
   nonstatic_field(G1HeapRegionTable, _bias,             size_t)               \
   nonstatic_field(G1HeapRegionTable, _shift_by,         uint)                 \
                                                                               \
diff --git a/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp b/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
index b8b86425190..59899ec5233 100644
--- a/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1BiasedArray.cpp
@@ -26,7 +26,7 @@
 
 class TestMappedArray : public G1BiasedMappedArray<int> {
   void verify_biased_index_inclusive_end(idx_t biased_index) const {
-    guarantee(_biased_base != nullptr, "Array not initialized");
+    guarantee(_biased_base != 0, "Array not initialized");
     guarantee(biased_index >= bias() && biased_index <= (bias() + length()),
               "Biased index out of inclusive bounds, index: %zu bias: %zu length: %zu",
               biased_index, bias(), length());
@@ -37,17 +37,13 @@ class TestMappedArray : public G1BiasedMappedArray<int> {
     return 0xBAADBABE;
   }
 
-  // Returns the address of the element the given address maps to
   int* my_address_mapped_to(HeapWord* address) {
     idx_t biased_index = ((uintptr_t)address) >> shift_by();
     verify_biased_index_inclusive_end(biased_index);
-    return biased_base() + biased_index;
+    return biased_base_at(biased_index);
   }
 
   int* base() const { return G1BiasedMappedArray<int>::base(); }
-
-  // The raw biased base pointer.
-  int* biased_base() const { return G1BiasedMappedArray<int>::biased_base(); }
 };
 
 TEST_VM(G1BiasedArray, simple) {

From 1d57ff8ad4938bc9ca9b1996eb200c1b51bdf300 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Wed, 28 May 2025 07:52:17 +0000
Subject: [PATCH 675/901] 8357781: Deep recursion in PhaseCFG::set_next_call
 leads to stack overflow

Reviewed-by: thartmann, kvn, mhaessig
---
 src/hotspot/share/opto/block.hpp              |  2 +-
 src/hotspot/share/opto/lcm.cpp                | 20 ++++--
 .../c2/StackOverflowInSetNextCall.java        | 68 +++++++++++++++++++
 3 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/StackOverflowInSetNextCall.java

diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp
index 66ce1f51f24..c5a3a589407 100644
--- a/src/hotspot/share/opto/block.hpp
+++ b/src/hotspot/share/opto/block.hpp
@@ -447,7 +447,7 @@ class PhaseCFG : public Phase {
   Block* hoist_to_cheaper_block(Block* LCA, Block* early, Node* self);
 
   bool schedule_local(Block* block, GrowableArray<int>& ready_cnt, VectorSet& next_call, intptr_t* recacl_pressure_nodes);
-  void set_next_call(Block* block, Node* n, VectorSet& next_call);
+  void set_next_call(const Block* block, Node* n, VectorSet& next_call) const;
   void needed_for_next_call(Block* block, Node* this_call, VectorSet& next_call);
 
   // Perform basic-block local scheduling
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 69732245dcf..4df3bbab731 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -795,13 +795,19 @@ void PhaseCFG::adjust_register_pressure(Node* n, Block* block, intptr_t* recalc_
 }
 
 //------------------------------set_next_call----------------------------------
-void PhaseCFG::set_next_call(Block* block, Node* n, VectorSet& next_call) {
-  if( next_call.test_set(n->_idx) ) return;
-  for( uint i=0; i<n->len(); i++ ) {
-    Node *m = n->in(i);
-    if( !m ) continue;  // must see all nodes in block that precede call
-    if (get_block_for_node(m) == block) {
-      set_next_call(block, m, next_call);
+void PhaseCFG::set_next_call(const Block* block, Node* init, VectorSet& next_call) const {
+  Node_List worklist;
+  worklist.push(init);
+
+  while (worklist.size() > 0) {
+    Node* n = worklist.pop();
+    if (next_call.test_set(n->_idx)) continue;
+    for (uint i = 0; i < n->len(); i++) {
+      Node* m = n->in(i);
+      if (m == nullptr) continue;  // must see all nodes in block that precede call
+      if (get_block_for_node(m) == block) {
+        worklist.push(m);
+      }
     }
   }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/StackOverflowInSetNextCall.java b/test/hotspot/jtreg/compiler/c2/StackOverflowInSetNextCall.java
new file mode 100644
index 00000000000..f5ca4d11a85
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/StackOverflowInSetNextCall.java
@@ -0,0 +1,68 @@
+/*
+ * 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 8357781
+ * @summary Triggered a stack overflow in PhaseCFG::set_next_call due to a legitimately big (mostly deep and not wide) graph.
+ *
+ * @run main/othervm -Xcomp -XX:LoopUnrollLimit=8192 -XX:CompileCommand=compileonly,StackOverflowInSetNextCall::test StackOverflowInSetNextCall
+ * @run main StackOverflowInSetNextCall
+ *
+ */
+
+import java.util.Arrays;
+
+public class StackOverflowInSetNextCall {
+    public static Double d;
+
+    static Long[] arr = new Long[500];
+
+    public static double test() {
+        long x = 0;
+        for (int i = 0; i < 100; i++) {
+            for (int j = 0; j < 100; j++) {
+                if (!Arrays.equals(arr, arr)) {
+                    for (int k = 0; k < 100; k++) {
+                        for (int l = 0; l < 100; ++l) {
+                            x -= (j - k) * x;
+                            for (int m = 0; m < 100; m++) {
+                                x += x;
+                                x += x - (x - arr[i]);
+                            }
+                        }
+                        d = 0.0d;
+                    }
+                }
+            }
+        }
+        return x;
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 400; ++i) {
+            test();
+        }
+    }
+}

From efeb050e00145da18f979fe17c22da2f736dbd41 Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Wed, 28 May 2025 08:13:02 +0000
Subject: [PATCH 676/901] 8357808: Add a command line option for specifying a
 counter in TestRandomFloatingDecimal

Reviewed-by: liach
---
 .../TestRandomFloatingDecimal.java            | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/test/jdk/jdk/internal/math/FloatingDecimal/TestRandomFloatingDecimal.java b/test/jdk/jdk/internal/math/FloatingDecimal/TestRandomFloatingDecimal.java
index ff904474c2c..5d16cf4ec77 100644
--- a/test/jdk/jdk/internal/math/FloatingDecimal/TestRandomFloatingDecimal.java
+++ b/test/jdk/jdk/internal/math/FloatingDecimal/TestRandomFloatingDecimal.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
@@ -24,7 +24,8 @@
 /*
  * @test
  * @bug 8345403
- * @summary FloatingDecimal parsing methods (use -Dseed=X to set seed)
+ * @summary FloatingDecimal parsing methods (use -Dseed=X to set seed,
+ *      use -Dsamples=N to set the number of random samples per test)
  * @modules java.base/jdk.internal.math
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
@@ -34,6 +35,7 @@
 
 import jdk.internal.math.FloatingDecimal;
 import jdk.test.lib.RandomFactory;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -55,24 +57,40 @@ public class TestRandomFloatingDecimal {
      * Hence, the expected values are those computed by BigDecimal,
      * while the actual values are those returned by FloatingDecimal.
      */
-    private static final int COUNT = 10_000;  // random samples per test
+
 
     private static final Random RANDOM = RandomFactory.getRandom();
+    private static int samples;  // random samples per test
 
     static Stream<Args> testRandomDecForFloat() {
-        return Stream.generate(() -> randomDec(false)).limit(COUNT);
+        return Stream.generate(() -> randomDec(false)).limit(samples);
     }
 
     static Stream<Args> testRandomDecForDouble() {
-        return Stream.generate(() -> randomDec(true)).limit(COUNT);
+        return Stream.generate(() -> randomDec(true)).limit(samples);
     }
 
     static Stream<Args> testRandomHexForFloat() {
-        return Stream.generate(() -> randomHex(false)).limit(COUNT);
+        return Stream.generate(() -> randomHex(false)).limit(samples);
     }
 
     static Stream<Args> testRandomHexForDouble() {
-        return Stream.generate(() -> randomHex(true)).limit(COUNT);
+        return Stream.generate(() -> randomHex(true)).limit(samples);
+    }
+
+    private static final String SAMPLES_PROP = "samples";
+
+    @BeforeAll
+    static void setCount() {
+        String prop = System.getProperty(SAMPLES_PROP, "10000");  // 10_000
+        try {
+            samples = Integer.parseInt(prop);
+            if (samples <= 0) {
+                throw new NumberFormatException();
+            }
+        } catch (NumberFormatException _) {
+            throw new IllegalArgumentException("-D" + SAMPLES_PROP + "=" + prop + " must specify a valid positive decimal integer.");
+        }
     }
 
     @ParameterizedTest

From f74fbfe5de9dc5b90652956935642670c085938c Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 28 May 2025 08:20:48 +0000
Subject: [PATCH 677/901] 8357449: ZGC: Multiple medium page sizes

Reviewed-by: stefank, jsikstro
---
 src/hotspot/share/gc/z/vmStructs_z.hpp        |   4 +-
 src/hotspot/share/gc/z/zAllocationFlags.hpp   |  25 +++-
 src/hotspot/share/gc/z/zArguments.cpp         |   5 +-
 src/hotspot/share/gc/z/zGlobals.cpp           |   6 +-
 src/hotspot/share/gc/z/zGlobals.hpp           |   8 +-
 src/hotspot/share/gc/z/zHeap.cpp              |  10 +-
 src/hotspot/share/gc/z/zHeuristics.cpp        |  15 +-
 src/hotspot/share/gc/z/zMappedCache.cpp       |  36 +++++
 src/hotspot/share/gc/z/zMappedCache.hpp       |   1 +
 src/hotspot/share/gc/z/zObjectAllocator.cpp   |  17 ++-
 src/hotspot/share/gc/z/zPage.cpp              |   3 +-
 src/hotspot/share/gc/z/zPageAllocator.cpp     |  94 +++++++++++--
 src/hotspot/share/gc/z/zPageAllocator.hpp     |   2 +
 .../share/gc/z/zRelocationSetSelector.cpp     |  35 ++---
 .../share/gc/z/zRelocationSetSelector.hpp     |  11 +-
 .../gc/z/zRelocationSetSelector.inline.hpp    |  38 ++++-
 src/hotspot/share/gc/z/zStat.cpp              |   2 +-
 src/hotspot/share/gc/z/z_globals.hpp          |   7 +
 .../jtreg/gc/z/TestZMediumPageSizes.java      | 131 ++++++++++++++++++
 19 files changed, 392 insertions(+), 58 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/z/TestZMediumPageSizes.java

diff --git a/src/hotspot/share/gc/z/vmStructs_z.hpp b/src/hotspot/share/gc/z/vmStructs_z.hpp
index e1eb2a661f5..a88dae188d3 100644
--- a/src/hotspot/share/gc/z/vmStructs_z.hpp
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp
@@ -120,13 +120,13 @@ typedef ZValue<ZPerNUMAStorage, ZPartition> ZPerNUMAZPartition;
   declare_constant(ZPageType::small)                                                                 \
   declare_constant(ZPageType::medium)                                                                \
   declare_constant(ZPageType::large)                                                                 \
+  declare_constant(ZPageSizeSmallShift)                                                              \
+  declare_constant(ZPageSizeMediumMaxShift)                                                          \
   declare_constant(ZObjectAlignmentMediumShift)                                                      \
   declare_constant(ZObjectAlignmentLargeShift)
 
 #define VM_LONG_CONSTANTS_Z(declare_constant)                                                        \
   declare_constant(ZGranuleSizeShift)                                                                \
-  declare_constant(ZPageSizeSmallShift)                                                              \
-  declare_constant(ZPageSizeMediumShift)                                                             \
   declare_constant(ZAddressOffsetShift)                                                              \
   declare_constant(ZAddressOffsetBits)                                                               \
   declare_constant(ZAddressOffsetMask)                                                               \
diff --git a/src/hotspot/share/gc/z/zAllocationFlags.hpp b/src/hotspot/share/gc/z/zAllocationFlags.hpp
index d94badae929..f76873983e3 100644
--- a/src/hotspot/share/gc/z/zAllocationFlags.hpp
+++ b/src/hotspot/share/gc/z/zAllocationFlags.hpp
@@ -31,22 +31,25 @@
 // Allocation flags layout
 // -----------------------
 //
-//   7      1 0
-//  +------+-+-+
-//  |000000|1|1|
-//  +------+-+-+
+//   7     2 1 0
+//  +-----+-+-+-+
+//  |00000|1|1|1|
+//  +-----+-+-+-+
+//  |      | | |
+//  |      | | * 0-0 Non-Blocking Flag (1-bit)
 //  |      | |
-//  |      | * 0-0 Non-Blocking Flag (1-bit)
+//  |      | * 1-1 GC Relocation Flag (1-bit)
 //  |      |
-//  |      * 1-1 GC Relocation Flag (1-bit)
+//  |      * 2-2 Fast Medium Flag (1-bit)
 //  |
-//  * 7-2 Unused (6-bits)
+//  * 7-3 Unused (5-bits)
 //
 
 class ZAllocationFlags {
 private:
   typedef ZBitField<uint8_t, bool, 0, 1> field_non_blocking;
   typedef ZBitField<uint8_t, bool, 1, 1> field_gc_relocation;
+  typedef ZBitField<uint8_t, bool, 2, 1> field_fast_medium;
 
   uint8_t _flags;
 
@@ -62,6 +65,10 @@ class ZAllocationFlags {
     _flags |= field_gc_relocation::encode(true);
   }
 
+  void set_fast_medium() {
+    _flags |= field_fast_medium::encode(true);
+  }
+
   bool non_blocking() const {
     return field_non_blocking::decode(_flags);
   }
@@ -69,6 +76,10 @@ class ZAllocationFlags {
   bool gc_relocation() const {
     return field_gc_relocation::decode(_flags);
   }
+
+  bool fast_medium() const {
+    return field_fast_medium::decode(_flags);
+  }
 };
 
 #endif // SHARE_GC_Z_ZALLOCATIONFLAGS_HPP
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 73e06e5c34d..03aa8e5acee 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -162,9 +162,8 @@ void ZArguments::initialize() {
     uint tenuring_threshold;
     for (tenuring_threshold = 0; tenuring_threshold < MaxTenuringThreshold; ++tenuring_threshold) {
       // Reduce the number of object ages, if the resulting garbage is too high
-      const size_t medium_page_overhead = ZPageSizeMedium * tenuring_threshold;
-      const size_t small_page_overhead = ZPageSizeSmall * ConcGCThreads * tenuring_threshold;
-      if (small_page_overhead + medium_page_overhead >= ZHeuristics::significant_young_overhead()) {
+      const size_t per_age_overhead = ZHeuristics::relocation_headroom();
+      if (per_age_overhead * tenuring_threshold >= ZHeuristics::significant_young_overhead()) {
         break;
       }
     }
diff --git a/src/hotspot/share/gc/z/zGlobals.cpp b/src/hotspot/share/gc/z/zGlobals.cpp
index 2cb9a70eb7e..5596a8277fd 100644
--- a/src/hotspot/share/gc/z/zGlobals.cpp
+++ b/src/hotspot/share/gc/z/zGlobals.cpp
@@ -23,8 +23,10 @@
 
 #include "gc/z/zGlobals.hpp"
 
-size_t     ZPageSizeMediumShift;
-size_t     ZPageSizeMedium;
+int        ZPageSizeMediumMaxShift;
+size_t     ZPageSizeMediumMax;
+size_t     ZPageSizeMediumMin;
+bool       ZPageSizeMediumEnabled;
 
 size_t     ZObjectSizeLimitMedium;
 
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
index 918301b1853..8c4f0d0c015 100644
--- a/src/hotspot/share/gc/z/zGlobals.hpp
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -42,12 +42,14 @@ const size_t      ZVirtualToPhysicalRatio       = 16; // 16:1
 const size_t      ZMaxVirtualReservations       = 100; // Each reservation at least 1% of total
 
 // Page size shifts
-const size_t      ZPageSizeSmallShift           = ZGranuleSizeShift;
-extern size_t     ZPageSizeMediumShift;
+const int         ZPageSizeSmallShift           = (int)ZGranuleSizeShift;
+extern int        ZPageSizeMediumMaxShift;
 
 // Page sizes
 const size_t      ZPageSizeSmall                = (size_t)1 << ZPageSizeSmallShift;
-extern size_t     ZPageSizeMedium;
+extern size_t     ZPageSizeMediumMax;
+extern size_t     ZPageSizeMediumMin;
+extern bool       ZPageSizeMediumEnabled;
 
 // Object size limits
 const size_t      ZObjectSizeLimitSmall         = ZPageSizeSmall / 8; // 12.5% max waste
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 51c6478dc94..2c1cb5a69cb 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -364,7 +364,15 @@ void ZHeap::print_globals_on(outputStream* st) const {
   st->print_cr(" Old Collection:     %s/%u", ZGeneration::old()->phase_to_string(), ZGeneration::old()->seqnum());
   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);
+  if (ZPageSizeMediumEnabled) {
+    if (ZPageSizeMediumMin == ZPageSizeMediumMax) {
+      st->print_cr(" Page Size Medium: %zuM", ZPageSizeMediumMax / M);
+    } else {
+      st->print_cr(" Page Size Medium: Range [%zuM, %zuM]", ZPageSizeMediumMin / M, ZPageSizeMediumMax / M);
+    }
+  } else {
+    st->print_cr(" Page Size Medium: N/A");
+  }
   st->cr();
   st->print_cr("ZGC Metadata Bits:");
   st->print_cr(" LoadGood:           " PTR_FORMAT, ZPointerLoadGoodMask);
diff --git a/src/hotspot/share/gc/z/zHeuristics.cpp b/src/hotspot/share/gc/z/zHeuristics.cpp
index d13cdef3bb5..fac5fca080d 100644
--- a/src/hotspot/share/gc/z/zHeuristics.cpp
+++ b/src/hotspot/share/gc/z/zHeuristics.cpp
@@ -28,6 +28,7 @@
 #include "gc/z/zHeuristics.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -44,18 +45,22 @@ void ZHeuristics::set_medium_page_size() {
 
   if (size > ZPageSizeSmall) {
     // Enable medium pages
-    ZPageSizeMedium             = size;
-    ZPageSizeMediumShift        = (size_t)log2i_exact(ZPageSizeMedium);
-    ZObjectSizeLimitMedium      = ZPageSizeMedium / 8;
-    ZObjectAlignmentMediumShift = (int)ZPageSizeMediumShift - 13;
+    ZPageSizeMediumMax          = size;
+    ZPageSizeMediumMaxShift     = log2i_exact(ZPageSizeMediumMax);
+    ZObjectSizeLimitMedium      = ZPageSizeMediumMax / 8;
+    ZObjectAlignmentMediumShift = ZPageSizeMediumMaxShift - 13;
     ZObjectAlignmentMedium      = 1 << ZObjectAlignmentMediumShift;
+    ZPageSizeMediumEnabled      = true;
+    ZPageSizeMediumMin          = ZUseMediumPageSizeRange
+                                ? align_up(ZObjectSizeLimitMedium, ZGranuleSize)
+                                : ZPageSizeMediumMax;
   }
 }
 
 size_t ZHeuristics::relocation_headroom() {
   // Calculate headroom needed to avoid in-place relocation. Each worker will try
   // to allocate a small page, and all workers will share a single medium page.
-  return (ConcGCThreads * ZPageSizeSmall) + ZPageSizeMedium;
+  return (ConcGCThreads * ZPageSizeSmall) + ZPageSizeMediumMax;
 }
 
 bool ZHeuristics::use_per_cpu_shared_small_pages() {
diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index 973cff0cfef..252219572b5 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -414,6 +414,11 @@ ZVirtualMemory ZMappedCache::remove_vmem(ZMappedCacheEntry* const entry, size_t
 template <typename SelectFunction, typename ConsumeFunction>
 bool ZMappedCache::try_remove_vmem_size_class(size_t min_size, SelectFunction select, ConsumeFunction consume) {
 new_max_size:
+  if (_size < min_size) {
+    // Not enough left in cache to satisfy the min_size
+    return false;
+  }
+
   // Query the max select size possible given the size of the cache
   const size_t max_size = select(_size);
 
@@ -648,6 +653,37 @@ ZVirtualMemory ZMappedCache::remove_contiguous(size_t size) {
   return result;
 }
 
+ZVirtualMemory ZMappedCache::remove_contiguous_power_of_2(size_t min_size, size_t max_size) {
+  precond(is_aligned(min_size, ZGranuleSize));
+  precond(is_power_of_2(min_size));
+  precond(is_aligned(max_size, ZGranuleSize));
+  precond(is_power_of_2(max_size));
+  precond(min_size <= max_size);
+
+  ZVirtualMemory result;
+
+  const auto select_size_fn = [&](size_t size) {
+    // Always select a power of 2 within the [min_size, max_size] interval.
+    return clamp(round_down_power_of_2(size), min_size, max_size);
+  };
+
+  const auto consume_vmem_fn = [&](ZVirtualMemory vmem) {
+    assert(result.is_null(), "only consume once");
+    assert(min_size <= vmem.size() && vmem.size() <= max_size,
+      "Must be %zu <= %zu <= %zu", min_size, vmem.size(), max_size);
+    assert(is_power_of_2(vmem.size()), "Must be power_of_2(%zu)", vmem.size());
+
+    result = vmem;
+
+    // Only require one vmem
+    return true;
+  };
+
+  scan_remove_vmem<RemovalStrategy::SizeClasses>(min_size, select_size_fn, consume_vmem_fn);
+
+  return result;
+}
+
 size_t ZMappedCache::remove_discontiguous(size_t size, ZArray<ZVirtualMemory>* out) {
   return remove_discontiguous_with_strategy<RemovalStrategy::SizeClasses>(size, out);
 }
diff --git a/src/hotspot/share/gc/z/zMappedCache.hpp b/src/hotspot/share/gc/z/zMappedCache.hpp
index 482f802952a..40dfeab2f66 100644
--- a/src/hotspot/share/gc/z/zMappedCache.hpp
+++ b/src/hotspot/share/gc/z/zMappedCache.hpp
@@ -129,6 +129,7 @@ class ZMappedCache {
   void insert(const ZVirtualMemory& vmem);
 
   ZVirtualMemory remove_contiguous(size_t size);
+  ZVirtualMemory remove_contiguous_power_of_2(size_t min_size, size_t max_size);
   size_t remove_discontiguous(size_t size, ZArray<ZVirtualMemory>* out);
 
   size_t reset_min();
diff --git a/src/hotspot/share/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp
index b92828e24a6..46baec28094 100644
--- a/src/hotspot/share/gc/z/zObjectAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp
@@ -140,13 +140,26 @@ zaddress ZObjectAllocator::alloc_object_in_medium_page(size_t size,
     ZAllocationFlags non_blocking_flags = flags;
     non_blocking_flags.set_non_blocking();
 
-    addr = alloc_object_in_shared_page(shared_medium_page, ZPageType::medium, ZPageSizeMedium, size, non_blocking_flags);
+    if (ZPageSizeMediumMin != ZPageSizeMediumMax) {
+      assert(ZPageSizeMediumEnabled, "must be enabled");
+      // We attempt a fast medium allocations first. Which will only succeed
+      // if a page in the range [ZPageSizeMediumMin, ZPageSizeMediumMax] can
+      // be allocated without any expensive syscalls, directly from the cache.
+      ZAllocationFlags fast_medium_flags = non_blocking_flags;
+      fast_medium_flags.set_fast_medium();
+      addr = alloc_object_in_shared_page(shared_medium_page, ZPageType::medium, ZPageSizeMediumMax, size, fast_medium_flags);
+    }
+
+    if (is_null(addr)) {
+      addr = alloc_object_in_shared_page(shared_medium_page, ZPageType::medium, ZPageSizeMediumMax, size, non_blocking_flags);
+    }
+
   }
 
   if (is_null(addr) && !flags.non_blocking()) {
     // The above allocation attempts failed and this allocation should stall
     // until memory is available. Redo the allocation with blocking enabled.
-    addr = alloc_object_in_shared_page(shared_medium_page, ZPageType::medium, ZPageSizeMedium, size, flags);
+    addr = alloc_object_in_shared_page(shared_medium_page, ZPageType::medium, ZPageSizeMediumMax, size, flags);
   }
 
   return addr;
diff --git a/src/hotspot/share/gc/z/zPage.cpp b/src/hotspot/share/gc/z/zPage.cpp
index f4cc7542052..80e10dc75ec 100644
--- a/src/hotspot/share/gc/z/zPage.cpp
+++ b/src/hotspot/share/gc/z/zPage.cpp
@@ -23,6 +23,7 @@
 
 #include "gc/shared/gc_globals.hpp"
 #include "gc/z/zGeneration.inline.hpp"
+#include "gc/z/zGlobals.hpp"
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zPageAge.hpp"
 #include "gc/z/zRememberedSet.inline.hpp"
@@ -43,7 +44,7 @@ ZPage::ZPage(ZPageType type, ZPageAge age, const ZVirtualMemory& vmem, ZMultiPar
     _multi_partition_tracker(multi_partition_tracker) {
   assert(!_virtual.is_null(), "Should not be null");
   assert((_type == ZPageType::small && size() == ZPageSizeSmall) ||
-         (_type == ZPageType::medium && size() == ZPageSizeMedium) ||
+         (_type == ZPageType::medium && ZPageSizeMediumMin <= size() && size() <= ZPageSizeMediumMax) ||
          (_type == ZPageType::large && is_aligned(size(), ZGranuleSize)),
          "Page type/size mismatch");
   reset(age);
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index bf8ddf3e8dc..61f44ec1c84 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -59,6 +59,7 @@
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/powerOfTwo.hpp"
 #include "utilities/ticks.hpp"
 #include "utilities/vmError.hpp"
 
@@ -184,6 +185,17 @@ class ZMemoryAllocation : public CHeapObj<mtGC> {
     return _satisfied_from_cache_vmem;
   }
 
+  void set_satisfied_from_cache_vmem_fast_medium(ZVirtualMemory vmem) {
+    precond(_satisfied_from_cache_vmem.is_null());
+    precond(_partial_vmems.is_empty());
+    precond(ZPageSizeMediumEnabled);
+    precond(vmem.size() >= ZPageSizeMediumMin);
+    precond(vmem.size() <= ZPageSizeMediumMax);
+    precond(is_power_of_2(vmem.size()));
+
+    _satisfied_from_cache_vmem = vmem;
+  }
+
   void set_satisfied_from_cache_vmem(ZVirtualMemory vmem) {
     precond(_satisfied_from_cache_vmem.is_null());
     precond(vmem.size() == size());
@@ -394,7 +406,7 @@ class ZPageAllocation : public StackObj {
 
 private:
   const ZPageType            _type;
-  const size_t               _size;
+  const size_t               _requested_size;
   const ZAllocationFlags     _flags;
   const ZPageAge             _age;
   const Ticks                _start_timestamp;
@@ -410,7 +422,7 @@ class ZPageAllocation : public StackObj {
 public:
   ZPageAllocation(ZPageType type, size_t size, ZAllocationFlags flags, ZPageAge age)
     : _type(type),
-      _size(size),
+      _requested_size(size),
       _flags(flags),
       _age(age),
       _start_timestamp(Ticks::now()),
@@ -434,7 +446,16 @@ class ZPageAllocation : public StackObj {
   }
 
   size_t size() const {
-    return _size;
+    if (_flags.fast_medium()) {
+      // A fast medium allocation may have allocated less than the _size field
+      const ZVirtualMemory vmem = _single_partition_allocation.allocation()->satisfied_from_cache_vmem();
+      if (!vmem.is_null()) {
+        // The allocation has been satisfied, return the satisfied size.
+        return vmem.size();
+      }
+    }
+
+    return _requested_size;
   }
 
   ZAllocationFlags flags() const {
@@ -534,7 +555,7 @@ class ZPageAllocation : public StackObj {
     event.commit(_start_timestamp,
                  end_timestamp,
                  (u8)_type,
-                 _size,
+                 size(),
                  st._total_harvested,
                  st._total_committed_capacity,
                  (unsigned)st._num_harvested_vmems,
@@ -740,6 +761,32 @@ bool ZPartition::claim_capacity(ZMemoryAllocation* allocation) {
   return true;
 }
 
+bool ZPartition::claim_capacity_fast_medium(ZMemoryAllocation* allocation) {
+  precond(ZPageSizeMediumEnabled);
+
+  // Try to allocate a medium page sized contiguous vmem
+  const size_t min_size = ZPageSizeMediumMin;
+  const size_t max_size = ZStressFastMediumPageAllocation ? min_size : ZPageSizeMediumMax;
+  ZVirtualMemory vmem = _cache.remove_contiguous_power_of_2(min_size, max_size);
+
+  if (vmem.is_null()) {
+    // Failed to find a contiguous vmem
+    return false;
+  }
+
+  // Found a satisfying vmem in the cache
+  allocation->set_satisfied_from_cache_vmem_fast_medium(vmem);
+
+  // Associate the allocation with this partition.
+  allocation->set_partition(this);
+
+  // Updated used statistics
+  increase_used(vmem.size());
+
+  // Success
+  return true;
+}
+
 size_t ZPartition::uncommit(uint64_t* timeout) {
   ZArray<ZVirtualMemory> flushed_vmems;
   size_t flushed = 0;
@@ -1278,8 +1325,12 @@ ZPageAllocator::ZPageAllocator(size_t min_capacity,
   log_info_p(gc, init)("Initial Capacity: %zuM", initial_capacity / M);
   log_info_p(gc, init)("Max Capacity: %zuM", max_capacity / M);
   log_info_p(gc, init)("Soft Max Capacity: %zuM", soft_max_capacity / M);
-  if (ZPageSizeMedium > 0) {
-    log_info_p(gc, init)("Medium Page Size: %zuM", ZPageSizeMedium / M);
+  if (ZPageSizeMediumEnabled) {
+    if (ZPageSizeMediumMin == ZPageSizeMediumMax) {
+      log_info_p(gc, init)("Page Size Medium: %zuM", ZPageSizeMediumMax / M);
+    } else {
+      log_info_p(gc, init)("Page Size Medium: Range [%zuM, %zuM]", ZPageSizeMediumMin / M, ZPageSizeMediumMax / M);
+    }
   } else {
     log_info_p(gc, init)("Medium Page Size: N/A");
   }
@@ -1459,8 +1510,8 @@ ZPage* ZPageAllocator::alloc_page(ZPageType type, size_t size, ZAllocationFlags
   if (!flags.gc_relocation() && is_init_completed()) {
     // Note that there are two allocation rate counters, which have
     // different purposes and are sampled at different frequencies.
-    ZStatInc(ZCounterMutatorAllocationRate, size);
-    ZStatMutatorAllocRate::sample_allocation(size);
+    ZStatInc(ZCounterMutatorAllocationRate, page->size());
+    ZStatMutatorAllocRate::sample_allocation(page->size());
   }
 
   const ZPageAllocationStats stats = allocation.stats();
@@ -1588,12 +1639,16 @@ bool ZPageAllocator::claim_capacity_or_stall(ZPageAllocation* allocation) {
 }
 
 bool ZPageAllocator::claim_capacity(ZPageAllocation* allocation) {
+  // Fast medium allocation
+  if (allocation->flags().fast_medium()) {
+    return claim_capacity_fast_medium(allocation);
+  }
+
+  // Round robin single-partition claiming
   const uint32_t start_numa_id = allocation->initiating_numa_id();
   const uint32_t start_partition = start_numa_id;
   const uint32_t num_partitions = _partitions.count();
 
-  // Round robin single-partition claiming
-
   for (uint32_t i = 0; i < num_partitions; ++i) {
     const uint32_t partition_id = (start_partition + i) % num_partitions;
 
@@ -1619,6 +1674,23 @@ bool ZPageAllocator::claim_capacity(ZPageAllocation* allocation) {
   return true;
 }
 
+bool ZPageAllocator::claim_capacity_fast_medium(ZPageAllocation* allocation) {
+  const uint32_t start_node = allocation->initiating_numa_id();
+  const uint32_t numa_nodes = ZNUMA::count();
+
+  for (uint32_t i = 0; i < numa_nodes; ++i) {
+    const uint32_t numa_id = (start_node + i) % numa_nodes;
+    ZPartition& partition = _partitions.get(numa_id);
+    ZSinglePartitionAllocation* single_partition_allocation = allocation->single_partition_allocation();
+
+    if (partition.claim_capacity_fast_medium(single_partition_allocation->allocation())) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 bool ZPageAllocator::claim_capacity_single_partition(ZSinglePartitionAllocation* single_partition_allocation, uint32_t partition_id) {
   ZPartition& partition = _partitions.get(partition_id);
 
@@ -2076,6 +2148,8 @@ void ZPageAllocator::free_memory_alloc_failed(ZMemoryAllocation* allocation) {
 }
 
 ZPage* ZPageAllocator::create_page(ZPageAllocation* allocation, const ZVirtualMemory& vmem) {
+  assert(allocation->size() == vmem.size(), "Must be %zu == %zu", allocation->size(), vmem.size());
+
   // We don't track generation usage when claiming capacity, because this page
   // could have been allocated by a thread that satisfies a stalling allocation.
   // The stalled thread can wake up and potentially realize that the page alloc
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index ba83686a87d..85ce59a8913 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -101,6 +101,7 @@ class ZPartition {
 
   void claim_from_cache_or_increase_capacity(ZMemoryAllocation* allocation);
   bool claim_capacity(ZMemoryAllocation* allocation);
+  bool claim_capacity_fast_medium(ZMemoryAllocation* allocation);
 
   size_t uncommit(uint64_t* timeout);
 
@@ -174,6 +175,7 @@ class ZPageAllocator {
 
   bool claim_capacity_or_stall(ZPageAllocation* allocation);
   bool claim_capacity(ZPageAllocation* allocation);
+  bool claim_capacity_fast_medium(ZPageAllocation* allocation);
   bool claim_capacity_single_partition(ZSinglePartitionAllocation* single_partition_allocation, uint32_t partition_id);
   void claim_capacity_multi_partition(ZMultiPartitionAllocation* multi_partition_allocation, uint32_t start_partition);
 
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
index 03835689ec5..e9ef66a19dc 100644
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
@@ -42,23 +42,23 @@ ZRelocationSetSelectorGroupStats::ZRelocationSetSelectorGroupStats()
 
 ZRelocationSetSelectorGroup::ZRelocationSetSelectorGroup(const char* name,
                                                          ZPageType page_type,
-                                                         size_t page_size,
+                                                         size_t max_page_size,
                                                          size_t object_size_limit,
                                                          double fragmentation_limit)
   : _name(name),
     _page_type(page_type),
-    _page_size(page_size),
+    _max_page_size(max_page_size),
     _object_size_limit(object_size_limit),
     _fragmentation_limit(fragmentation_limit),
-    _page_fragmentation_limit((size_t)(page_size * (fragmentation_limit / 100))),
+    _page_fragmentation_limit((size_t)(_max_page_size * (_fragmentation_limit / 100))),
     _live_pages(),
     _not_selected_pages(),
     _forwarding_entries(0),
     _stats() {}
 
 bool ZRelocationSetSelectorGroup::is_disabled() {
-  // Medium pages are disabled when their page size is zero
-  return _page_type == ZPageType::medium && _page_size == 0;
+  // Only medium pages can be disabled
+  return _page_type == ZPageType::medium && !ZPageSizeMediumEnabled;
 }
 
 bool ZRelocationSetSelectorGroup::is_selectable() {
@@ -66,26 +66,29 @@ bool ZRelocationSetSelectorGroup::is_selectable() {
   return _page_type != ZPageType::large;
 }
 
+size_t ZRelocationSetSelectorGroup::partition_index(const ZPage* page) const {
+  const size_t partition_size = page->size() >> NumPartitionsShift;
+  const int partition_size_shift = log2i_exact(partition_size);
+
+  return page->live_bytes() >> partition_size_shift;
+}
+
 void ZRelocationSetSelectorGroup::semi_sort() {
   // Semi-sort live pages by number of live bytes in ascending order
-  const size_t npartitions_shift = 11;
-  const size_t npartitions = (size_t)1 << npartitions_shift;
-  const size_t partition_size = _page_size >> npartitions_shift;
-  const int partition_size_shift = log2i_exact(partition_size);
 
   // Partition slots/fingers
-  int partitions[npartitions] = { /* zero initialize */ };
+  int partitions[NumPartitions] = { /* zero initialize */ };
 
   // Calculate partition slots
   ZArrayIterator<ZPage*> iter1(&_live_pages);
   for (ZPage* page; iter1.next(&page);) {
-    const size_t index = page->live_bytes() >> partition_size_shift;
+    const size_t index = partition_index(page);
     partitions[index]++;
   }
 
   // Calculate partition fingers
   int finger = 0;
-  for (size_t i = 0; i < npartitions; i++) {
+  for (size_t i = 0; i < NumPartitions; i++) {
     const int slots = partitions[i];
     partitions[i] = finger;
     finger += slots;
@@ -98,7 +101,7 @@ void ZRelocationSetSelectorGroup::semi_sort() {
   // Sort pages into partitions
   ZArrayIterator<ZPage*> iter2(&_live_pages);
   for (ZPage* page; iter2.next(&page);) {
-    const size_t index = page->live_bytes() >> partition_size_shift;
+    const size_t index = partition_index(page);
     const int finger = partitions[index]++;
     assert(sorted_live_pages.at(finger) == nullptr, "Invalid finger");
     sorted_live_pages.at_put(finger, page);
@@ -134,7 +137,7 @@ void ZRelocationSetSelectorGroup::select_inner() {
     // By subtracting the object size limit from the pages size we get the maximum
     // number of pages that the relocation set is guaranteed to fit in, regardless
     // of in which order the objects are relocated.
-    const int to = (int)ceil(from_live_bytes / (double)(_page_size - _object_size_limit));
+    const int to = (int)ceil(from_live_bytes / (double)(_max_page_size - _object_size_limit));
 
     // Calculate the relative difference in reclaimable space compared to our
     // currently selected final relocation set. If this number is larger than the
@@ -211,8 +214,8 @@ void ZRelocationSetSelectorGroup::select() {
 
 ZRelocationSetSelector::ZRelocationSetSelector(double fragmentation_limit)
   : _small("Small", ZPageType::small, ZPageSizeSmall, ZObjectSizeLimitSmall, fragmentation_limit),
-    _medium("Medium", ZPageType::medium, ZPageSizeMedium, ZObjectSizeLimitMedium, fragmentation_limit),
-    _large("Large", ZPageType::large, 0 /* page_size */, 0 /* object_size_limit */, fragmentation_limit),
+    _medium("Medium", ZPageType::medium, ZPageSizeMediumMax, ZObjectSizeLimitMedium, fragmentation_limit),
+    _large("Large", ZPageType::large, 0 /* max_page_size */, 0 /* object_size_limit */, fragmentation_limit),
     _empty_pages() {}
 
 void ZRelocationSetSelector::select() {
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.hpp b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp
index 7bf2942e843..b6ec2347153 100644
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.hpp
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp
@@ -78,9 +78,12 @@ class ZRelocationSetSelectorStats {
 
 class ZRelocationSetSelectorGroup {
 private:
+  static constexpr int NumPartitionsShift = 11;
+  static constexpr int NumPartitions = int(1) << NumPartitionsShift;
+
   const char* const                _name;
   const ZPageType                  _page_type;
-  const size_t                     _page_size;
+  const size_t                     _max_page_size;
   const size_t                     _object_size_limit;
   const double                     _fragmentation_limit;
   const size_t                     _page_fragmentation_limit;
@@ -91,13 +94,17 @@ class ZRelocationSetSelectorGroup {
 
   bool is_disabled();
   bool is_selectable();
+
+  size_t partition_index(const ZPage* page) const;
   void semi_sort();
   void select_inner();
 
+  bool pre_filter_page(const ZPage* page, size_t live_bytes) const;
+
 public:
   ZRelocationSetSelectorGroup(const char* name,
                               ZPageType page_type,
-                              size_t page_size,
+                              size_t max_page_size,
                               size_t object_size_limit,
                               double fragmentation_limit);
 
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp b/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp
index 316409ac7d8..7cd0a005aac 100644
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.inline.hpp
@@ -27,7 +27,9 @@
 #include "gc/z/zRelocationSetSelector.hpp"
 
 #include "gc/z/zArray.inline.hpp"
+#include "gc/z/zGlobals.hpp"
 #include "gc/z/zPage.inline.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 inline size_t ZRelocationSetSelectorGroupStats::npages_candidates() const {
   return _npages_candidates;
@@ -69,18 +71,48 @@ inline const ZRelocationSetSelectorGroupStats& ZRelocationSetSelectorStats::larg
   return _large[static_cast<uint>(age)];
 }
 
+inline bool ZRelocationSetSelectorGroup::pre_filter_page(const ZPage* page, size_t live_bytes) const {
+  if (page->is_small()) {
+    // Small pages are always the same size, so we can simply compare the
+    // garbage pre-calculated _page_fragmentation_limit.
+    assert(page->size() == ZPageSizeSmall, "Unexpected small page size %zu", page->size());
+
+    const size_t garbage = ZPageSizeSmall - live_bytes;
+
+    return garbage > _page_fragmentation_limit;
+  }
+
+  if (page->is_medium()) {
+    // Medium pages may have different sizes, so we can recalculate the page
+    // fragmentation limit for a specific page by multiplying pre-calculated
+    // _page_fragmentation_limit (calculated using the max page size) by the
+    // fraction the specific page size is of the max page size.
+    // Because the page sizes are always a power of two we can rewrite this
+    // using log2 and bit-shift.
+    const size_t size = page->size();
+    const int shift = ZPageSizeMediumMaxShift - log2i_exact(size);
+    const size_t page_fragmentation_limit = _page_fragmentation_limit >> shift;
+
+    const size_t garbage = size - live_bytes;
+
+    return garbage > page_fragmentation_limit;
+  }
+
+  // Large pages are never relocated
+  return false;
+}
+
 inline void ZRelocationSetSelectorGroup::register_live_page(ZPage* page) {
-  const size_t size = page->size();
   const size_t live = page->live_bytes();
-  const size_t garbage = size - live;
 
   // Pre-filter out pages that are guaranteed to not be selected
-  if (!page->is_large() && garbage > _page_fragmentation_limit) {
+  if (pre_filter_page(page, live)) {
     _live_pages.append(page);
   } else if (page->is_young()) {
     _not_selected_pages.append(page);
   }
 
+  const size_t size = page->size();
   const uint age = static_cast<uint>(page->age());
   _stats[age]._npages_candidates++;
   _stats[age]._total += size;
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index 45c77e68f0e..ec751cbb693 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -1531,7 +1531,7 @@ void ZStatRelocation::print_page_summary() {
   };
 
   print_summary("Small", small_summary, _small_in_place_count);
-  if (ZPageSizeMedium != 0) {
+  if (ZPageSizeMediumEnabled) {
     print_summary("Medium", medium_summary, _medium_in_place_count);
   }
   print_summary("Large", large_summary, 0 /* in_place_count */);
diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp
index 17a77a12ca4..e1f525e5372 100644
--- a/src/hotspot/share/gc/z/z_globals.hpp
+++ b/src/hotspot/share/gc/z/z_globals.hpp
@@ -104,6 +104,13 @@
   product(bool, ZVerifyRemembered, trueInDebug, DIAGNOSTIC,                 \
           "Verify remembered sets")                                         \
                                                                             \
+  product(bool, ZUseMediumPageSizeRange, true, DIAGNOSTIC,                  \
+          "Allow multiple medium page sizes")                               \
+                                                                            \
+  product(bool, ZStressFastMediumPageAllocation, false, DIAGNOSTIC,         \
+          "Always use the minimum medium page size for fast medium page "   \
+          "allocations")                                                    \
+                                                                            \
   product(int, ZTenuringThreshold, -1, DIAGNOSTIC,                          \
           "Young generation tenuring threshold, -1 for dynamic computation")\
           range(-1, static_cast<int>(ZPageAgeMax))                          \
diff --git a/test/hotspot/jtreg/gc/z/TestZMediumPageSizes.java b/test/hotspot/jtreg/gc/z/TestZMediumPageSizes.java
new file mode 100644
index 00000000000..0a559b8c0cd
--- /dev/null
+++ b/test/hotspot/jtreg/gc/z/TestZMediumPageSizes.java
@@ -0,0 +1,131 @@
+/*
+ * 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 gc.z;
+
+/**
+ * @test TestZMediumPageSizes
+ * @requires vm.gc.Z
+ * @summary Test TestZMediumPageSizes heap reservation / commits interactions.
+ * @library / /test/lib
+ * @run driver gc.z.TestZMediumPageSizes
+ */
+
+import static gc.testlibrary.Allocation.blackHole;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
+
+public class TestZMediumPageSizes {
+    private static final int XmxInM = 1024;
+    private static final int XmsInM = 512;
+    static class Test {
+        private static final int K = 1024;
+        private static final int M = 1024 * K;
+        private static final int SMALL_PAGE_SIZE = 2 * M;
+        private static final int SMALL_OBJECTS_PER_PAGE = 20;
+        private static final int SMALL_OBJECT_SIZE = SMALL_PAGE_SIZE / SMALL_OBJECTS_PER_PAGE;
+        private static final int MEDIUM_OBJECT_SIZE = 3 * M;
+        private static final int CHUNK_COUNT = 32;
+        private static final int CHUNK_LENGTH = SMALL_OBJECTS_PER_PAGE * 3;
+        private static final int ITERATIONS = 10;
+
+        public static void main(String[] args) throws Exception {
+            for (int page = 0; page < ITERATIONS; ++page) {
+                var keep = new ArrayList<byte[]>();
+                try {
+                    System.gc();
+                    for (;;) {
+                        // Allocate objects on small pages until we're unable to
+                        keep.add(new byte[SMALL_OBJECT_SIZE]);
+                    }
+                } catch (OutOfMemoryError oome) {
+                    // Assume that most small allocations were allocated in
+                    // consecutive addresses. By making CHUNK_LENGTH consecutive
+                    // number of small objects eligible for collection, at least
+                    // CHUNK_LENGTH - 1 pages should get eligible for relocation
+                    // and be returned to the mapped cache. We do this for
+                    // CHUNK_COUNT number of chunks which should ensure that
+                    // there is enough free memory to allocate a full sized
+                    // medium page. These chunks are spread out, so as not to be
+                    // consecutive, so that a full sized medium page can only be
+                    // created harvesting some number of smaller memory chunks.
+                    for (int i = 0; i < CHUNK_COUNT; i++) {
+                        for (int j = 0; j < CHUNK_LENGTH; j++) {
+                            keep.set(2 * i * CHUNK_LENGTH + j, null);
+                        }
+                    }
+
+                    // Reclaim memory from pages
+                    System.gc();
+
+                    // Allocate a new medium page (may happen through flush/harvest)
+                    blackHole(new byte[MEDIUM_OBJECT_SIZE]);
+                }
+
+                blackHole(keep);
+            }
+
+        }
+    }
+
+    private static OutputAnalyzer createAndExecuteJava(String... extraOptions) throws Exception {
+        final var options = new ArrayList<String>(List.of(
+            "-XX:+UseZGC",
+            "-Xms" + XmsInM + "M",
+            "-Xmx" + XmxInM + "M",
+            "-Xlog:gc,gc+init,gc+heap=debug"));
+        Collections.addAll(options, extraOptions);
+        options.add(Test.class.getName());
+        OutputAnalyzer oa = ProcessTools
+                .executeTestJava(options)
+                .outputTo(System.out)
+                .errorTo(System.out)
+                .shouldHaveExitValue(0);
+        return oa;
+    }
+
+    private static void runTestDefault() throws Exception {
+        var oa = createAndExecuteJava(
+            "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:+ZUseMediumPageSizeRange");
+        oa.shouldContain("Page Size Medium: Range");
+        oa.shouldNotContain("Mapped Cache Harvested");
+    }
+
+    private static void runTestFixedPageSize() throws Exception {
+        var oa = createAndExecuteJava(
+            "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:-ZUseMediumPageSizeRange");
+        oa.shouldNotContain("Page Size Medium: Range");
+        oa.shouldContain("Mapped Cache Harvested");
+    }
+
+    public static void main(String[] args) throws Exception {
+        runTestDefault();
+        runTestFixedPageSize();
+    }
+}

From 1e0caedb9ab1c56e3986764ce260b94e423d4948 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 28 May 2025 08:47:36 +0000
Subject: [PATCH 678/901] 8357854: Parallel: Inline args of
 PSOldGen::initialize_performance_counters

Reviewed-by: tschatzl, jsikstro
---
 .../gc/parallel/parallelScavengeHeap.cpp      |  3 +--
 src/hotspot/share/gc/parallel/psOldGen.cpp    | 19 +++++++++----------
 src/hotspot/share/gc/parallel/psOldGen.hpp    |  9 ++++-----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 713c738c4f8..bc138ce643a 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -93,8 +93,7 @@ jint ParallelScavengeHeap::initialize() {
       old_rs,
       OldSize,
       MinOldSize,
-      MaxOldSize,
-      "old", 1);
+      MaxOldSize);
 
   assert(young_gen()->max_gen_size() == young_rs.size(),"Consistency check");
   assert(old_gen()->max_gen_size() == old_rs.size(), "Consistency check");
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 7980c30241f..0d1c3b60672 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -37,19 +37,18 @@
 #include "utilities/align.hpp"
 
 PSOldGen::PSOldGen(ReservedSpace rs, size_t initial_size, size_t min_size,
-                   size_t max_size, const char* perf_data_name, int level):
+                   size_t max_size):
   _min_gen_size(min_size),
   _max_gen_size(max_size)
 {
-  initialize(rs, initial_size, GenAlignment, perf_data_name, level);
+  initialize(rs, initial_size, GenAlignment);
 }
 
-void PSOldGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment,
-                          const char* perf_data_name, int level) {
+void PSOldGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment) {
   initialize_virtual_space(rs, initial_size, alignment);
-  initialize_work(perf_data_name, level);
+  initialize_work();
 
-  initialize_performance_counters(perf_data_name, level);
+  initialize_performance_counters();
 }
 
 void PSOldGen::initialize_virtual_space(ReservedSpace rs,
@@ -63,7 +62,7 @@ void PSOldGen::initialize_virtual_space(ReservedSpace rs,
   }
 }
 
-void PSOldGen::initialize_work(const char* perf_data_name, int level) {
+void PSOldGen::initialize_work() {
   MemRegion const reserved_mr = reserved();
   assert(reserved_mr.byte_size() == max_gen_size(), "invariant");
 
@@ -109,9 +108,9 @@ void PSOldGen::initialize_work(const char* perf_data_name, int level) {
   start_array()->set_covered_region(committed_mr);
 }
 
-void PSOldGen::initialize_performance_counters(const char* perf_data_name, int level) {
-  // Generation Counters, generation 'level', 1 subspace
-  _gen_counters = new GenerationCounters(perf_data_name, level, 1, min_gen_size(),
+void PSOldGen::initialize_performance_counters() {
+  const char* perf_data_name = "old";
+  _gen_counters = new GenerationCounters(perf_data_name, 1, 1, min_gen_size(),
                                          max_gen_size(), virtual_space()->committed_size());
   _space_counters = new SpaceCounters(perf_data_name, 0,
                                       virtual_space()->reserved_size(),
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index d408401bec8..f4815e67179 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -70,16 +70,15 @@ class PSOldGen : public CHeapObj<mtGC> {
 
   void post_resize();
 
-  void initialize(ReservedSpace rs, size_t initial_size, size_t alignment,
-                  const char* perf_data_name, int level);
+  void initialize(ReservedSpace rs, size_t initial_size, size_t alignment);
   void initialize_virtual_space(ReservedSpace rs, size_t initial_size, size_t alignment);
-  void initialize_work(const char* perf_data_name, int level);
-  void initialize_performance_counters(const char* perf_data_name, int level);
+  void initialize_work();
+  void initialize_performance_counters();
 
  public:
   // Initialize the generation.
   PSOldGen(ReservedSpace rs, size_t initial_size, size_t min_size,
-           size_t max_size, const char* perf_data_name, int level);
+           size_t max_size);
 
   MemRegion reserved() const {
     return MemRegion((HeapWord*)(_virtual_space->low_boundary()),

From f02190bc30bf3d203a5012140a72023622fc2d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 28 May 2025 08:57:04 +0000
Subject: [PATCH 679/901] 8357829: Commented out sample limit in
 JfrSamplerThread::task_stacktrace

Reviewed-by: shade
---
 .../share/jfr/periodic/sampling/jfrThreadSampler.cpp      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index a64bbc66d05..3efa0b0d581 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -221,8 +221,11 @@ static inline bool is_excluded(JavaThread* jt) {
   return jt->is_Compiler_thread() || jt->is_hidden_from_external_view() || jt->is_JfrRecorder_thread() || jt->jfr_thread_local()->is_excluded();
 }
 
+static const uint MAX_NR_OF_JAVA_SAMPLES = 5;
+static const uint MAX_NR_OF_NATIVE_SAMPLES = 1;
+
 void JfrSamplerThread::task_stacktrace(JfrSampleRequestType type, JavaThread** last_thread) {
-  const uint sample_limit = JAVA_SAMPLE == type ? 5 : 1;
+  const uint sample_limit = JAVA_SAMPLE == type ? MAX_NR_OF_JAVA_SAMPLES : MAX_NR_OF_NATIVE_SAMPLES;
   uint num_samples = 0;
   JavaThread* start = nullptr;
   elapsedTimer sample_time;
@@ -235,8 +238,7 @@ void JfrSamplerThread::task_stacktrace(JfrSampleRequestType type, JavaThread** l
     _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
     JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
 
-    // while (num_samples < sample_limit) {
-    while (true) {
+    while (num_samples < sample_limit) {
       current = next_thread(tlh.list(), start, current);
       if (current == nullptr) {
         break;

From 4e1878ca452d1e781eb61610a94064c0c4798073 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Wed, 28 May 2025 09:41:37 +0000
Subject: [PATCH 680/901] 8355022: Implement JEP 506: Scoped Values

Reviewed-by: liach, alanb
---
 .../share/classes/java/lang/ScopedValue.java     | 16 ++++++----------
 .../classes/javax/security/auth/Subject.java     |  2 +-
 .../jdk/internal/javac/PreviewFeature.java       |  1 -
 test/jdk/java/lang/ScopedValue/ManyBindings.java |  1 -
 .../java/lang/ScopedValue/ScopedValueAPI.java    |  6 ++----
 .../lang/ScopedValue/UnboundValueAfterOOME.java  |  1 -
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ScopedValue.java b/src/java.base/share/classes/java/lang/ScopedValue.java
index 866e575390a..206c81d5238 100644
--- a/src/java.base/share/classes/java/lang/ScopedValue.java
+++ b/src/java.base/share/classes/java/lang/ScopedValue.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * 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
@@ -34,7 +34,6 @@
 import java.util.function.Supplier;
 import jdk.internal.access.JavaUtilConcurrentTLRAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.javac.PreviewFeature;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Hidden;
 import jdk.internal.vm.ScopedValueContainer;
@@ -237,9 +236,8 @@
  * have to be regenerated after a blocking operation.
  *
  * @param <T> the type of the value
- * @since 21
+ * @since 25
  */
-@PreviewFeature(feature = PreviewFeature.Feature.SCOPED_VALUES)
 public final class ScopedValue<T> {
     private final int hash;
 
@@ -310,9 +308,8 @@ Object find(ScopedValue<?> key) {
      * <p> Unless otherwise specified, passing a {@code null} argument to a method in
      * this class will cause a {@link NullPointerException} to be thrown.
      *
-     * @since 21
+     * @since 25
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.SCOPED_VALUES)
     public static final class Carrier {
         // Bit masks: a 1 in position n indicates that this set of bound values
         // hits that slot in the cache.
@@ -413,7 +410,6 @@ public <T> T get(ScopedValue<T> key) {
          * @return the result
          * @throws StructureViolationException if a structure violation is detected
          * @throws X if {@code op} completes with an exception
-         * @since 23
          */
         public <R, X extends Throwable> R call(CallableOp<? extends R, X> op) throws X {
             Objects.requireNonNull(op);
@@ -497,9 +493,8 @@ private void runWith(Snapshot newSnapshot, Runnable op) {
      *
      * @param <T> result type of the operation
      * @param <X> type of the exception thrown by the operation
-     * @since 23
+     * @since 25
      */
-    @PreviewFeature(feature = PreviewFeature.Feature.SCOPED_VALUES)
     @FunctionalInterface
     public interface CallableOp<T, X extends Throwable> {
         /**
@@ -612,10 +607,11 @@ private Object findBinding() {
      * Returns the value of this scoped value if bound in the current thread, otherwise
      * returns {@code other}.
      *
-     * @param other the value to return if not bound, can be {@code null}
+     * @param other the value to return if not bound
      * @return the value of the scoped value if bound, otherwise {@code other}
      */
     public T orElse(T other) {
+        Objects.requireNonNull(other);
         Object obj = findBinding();
         if (obj != Snapshot.NIL) {
             @SuppressWarnings("unchecked")
diff --git a/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java
index ceb860e653a..dd1e2333005 100644
--- a/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -300,7 +300,7 @@ public static Subject getSubject(final AccessControlContext acc) {
      * @since 18
      */
     public static Subject current() {
-        return SCOPED_SUBJECT.orElse(null);
+        return SCOPED_SUBJECT.isBound() ? SCOPED_SUBJECT.get() : null;
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 80593c5453a..1f28864b4db 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -69,7 +69,6 @@ public enum Feature {
 
         //---
         IMPLICIT_CLASSES, //to be removed when boot JDK is 25
-        @JEP(number=487, title="Scoped Values", status="Fourth Preview")
         SCOPED_VALUES,
         @JEP(number=505, title="Structured Concurrency", status="Fifth Preview")
         STRUCTURED_CONCURRENCY,
diff --git a/test/jdk/java/lang/ScopedValue/ManyBindings.java b/test/jdk/java/lang/ScopedValue/ManyBindings.java
index 48751ae039f..5f9b5e6e176 100644
--- a/test/jdk/java/lang/ScopedValue/ManyBindings.java
+++ b/test/jdk/java/lang/ScopedValue/ManyBindings.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Stress test ScopedValue with many bindings and rebindings
- * @enablePreview
  * @library /test/lib
  * @key randomness
  * @run junit ManyBindings
diff --git a/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java b/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
index 3cb96533cc4..5652de7e10e 100644
--- a/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
+++ b/test/jdk/java/lang/ScopedValue/ScopedValueAPI.java
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary Test ScopedValue API
- * @enablePreview
  * @run junit ScopedValueAPI
  */
 
@@ -175,18 +174,15 @@ void testIsBound(ThreadFactory factory) throws Exception {
     void testOrElse(ThreadFactory factory) throws Exception {
         test(factory, () -> {
             ScopedValue<String> name = ScopedValue.newInstance();
-            assertNull(name.orElse(null));
             assertEquals("default", name.orElse("default"));
 
             // where
             ScopedValue.where(name, "duke").run(() -> {
-                assertEquals("duke", name.orElse(null));
                 assertEquals("duke", name.orElse("default"));
             });
 
             // callWhere
             ScopedValue.where(name, "duke").call(() -> {
-                assertEquals("duke", name.orElse(null));
                 assertEquals("duke", name.orElse("default"));
                 return null;
             });
@@ -416,6 +412,7 @@ void testNullPointerException() {
         assertThrows(NullPointerException.class, () -> ScopedValue.where(null, "duke").call(() -> ""));
         assertThrows(NullPointerException.class, () -> ScopedValue.where(name, "duke").call(null));
 
+        assertThrows(NullPointerException.class, () -> name.orElse(null));
         assertThrows(NullPointerException.class, () -> name.orElseThrow(null));
 
         var carrier = ScopedValue.where(name, "duke");
@@ -423,6 +420,7 @@ void testNullPointerException() {
         assertThrows(NullPointerException.class, () -> carrier.get((ScopedValue<?>)null));
         assertThrows(NullPointerException.class, () -> carrier.run(null));
         assertThrows(NullPointerException.class, () -> carrier.call(null));
+        assertThrows(NullPointerException.class, () -> carrier.run(() -> name.orElse(null)));
     }
 
     @FunctionalInterface
diff --git a/test/jdk/java/lang/ScopedValue/UnboundValueAfterOOME.java b/test/jdk/java/lang/ScopedValue/UnboundValueAfterOOME.java
index 87183775266..78fef931617 100644
--- a/test/jdk/java/lang/ScopedValue/UnboundValueAfterOOME.java
+++ b/test/jdk/java/lang/ScopedValue/UnboundValueAfterOOME.java
@@ -26,7 +26,6 @@
 /*
  * @test
  * @bug 8319120
- * @enablePreview
  * @run main/othervm -Xmx10m UnboundValueAfterOOME
  */
 public class UnboundValueAfterOOME {

From 39714b603040f1619f5e0e2a13ea8a90bb993c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 28 May 2025 09:46:49 +0000
Subject: [PATCH 681/901] 8357869: Remove PreviewNote taglet in its current
 form

Reviewed-by: erikj
---
 make/Docs.gmk                                 |   2 -
 .../build/tools/taglet/PreviewNote.java       | 127 ------------------
 2 files changed, 129 deletions(-)
 delete mode 100644 make/jdk/src/classes/build/tools/taglet/PreviewNote.java

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 9026217fa42..d88683e2b28 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -79,8 +79,6 @@ JAVADOC_TAGS := \
     -tag see \
     -taglet build.tools.taglet.ExtLink \
     -taglet build.tools.taglet.Incubating \
-    -taglet build.tools.taglet.PreviewNote \
-    --preview-note-tag previewNote \
     -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     $(CUSTOM_JAVADOC_TAGS) \
     #
diff --git a/make/jdk/src/classes/build/tools/taglet/PreviewNote.java b/make/jdk/src/classes/build/tools/taglet/PreviewNote.java
deleted file mode 100644
index ee3f9bea527..00000000000
--- a/make/jdk/src/classes/build/tools/taglet/PreviewNote.java
+++ /dev/null
@@ -1,127 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.taglet;
-
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
-
-import javax.lang.model.element.Element;
-import javax.tools.Diagnostic;
-
-
-import com.sun.source.doctree.DocTree;
-import com.sun.source.doctree.UnknownInlineTagTree;
-import jdk.javadoc.doclet.Doclet;
-import jdk.javadoc.doclet.DocletEnvironment;
-import jdk.javadoc.doclet.Reporter;
-import jdk.javadoc.doclet.StandardDoclet;
-import jdk.javadoc.doclet.Taglet;
-
-import static com.sun.source.doctree.DocTree.Kind.UNKNOWN_INLINE_TAG;
-
-/**
- * An inline tag to insert a note formatted as preview note.
- * The tag can be used as follows:
- *
- * <pre>
- * {&commat;previewNote jep-number [Preview note heading]}
- * Preview note content
- * {&commat;previewNote}
- * </pre>
- *
- */
-public class PreviewNote implements Taglet {
-
-    static final String TAG_NAME = "previewNote";
-    Reporter reporter = null;
-
-    @Override
-    public void init(DocletEnvironment env, Doclet doclet) {
-        if (doclet instanceof StandardDoclet stdoclet) {
-            reporter = stdoclet.getReporter();
-        }
-    }
-
-    /**
-     * Returns the set of locations in which the tag may be used.
-     */
-    @Override
-    public Set<Location> getAllowedLocations() {
-        return EnumSet.allOf(Taglet.Location.class);
-    }
-
-    @Override
-    public boolean isInlineTag() {
-        return true;
-    }
-
-    @Override
-    public String getName() {
-        return TAG_NAME;
-    }
-
-    @Override
-    public String toString(List<? extends DocTree> tags, Element elem) {
-
-        for (DocTree tag : tags) {
-            if (tag.getKind() == UNKNOWN_INLINE_TAG) {
-                UnknownInlineTagTree inlineTag = (UnknownInlineTagTree) tag;
-                String[] content = inlineTag.getContent().toString().trim().split("\\s+", 2);
-                if (!content[0].isBlank()) {
-                    StringBuilder sb = new StringBuilder("""
-                       <div class="preview-block" style="margin-top:10px; display:block; max-width:max-content;">
-                       """);
-                    if (content.length == 2) {
-                        sb.append("""
-                                <div class="preview-label">
-                                """)
-                          .append(content[1])
-                          .append("""
-                                </div>
-                                """);
-                    }
-                    sb.append("""
-                            <div class="preview-comment">
-                            """);
-                    return sb.toString();
-                } else {
-                    return """
-                             </div>
-                             </div>
-                            """;
-                }
-            }
-        }
-
-        if (reporter == null) {
-            throw new IllegalArgumentException("@" + TAG_NAME + " taglet content must be begin or end");
-        }
-        reporter.print(Diagnostic.Kind.ERROR, "@" + TAG_NAME + " taglet content must be begin or end");
-        return "";
-    }
-}

From 627ef34498c31b5d16f9da423cfe0a5fe46a3562 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Wed, 28 May 2025 10:34:50 +0000
Subject: [PATCH 682/901] 8304065: HttpServer.stop should terminate immediately
 if no exchanges are in progress
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eirik Bjørsnøs <eirbjo@openjdk.org>
Reviewed-by: dfuchs, michaelm
---
 .../net/httpserver/ChunkedOutputStream.java   |   8 +-
 .../classes/sun/net/httpserver/Event.java     |  33 +-
 .../httpserver/FixedLengthOutputStream.java   |   8 +-
 .../sun/net/httpserver/ServerImpl.java        | 155 +++++---
 .../httpserver/UndefLengthOutputStream.java   |   8 +-
 .../net/httpserver/WriteFinishedEvent.java    |  34 --
 .../httpserver/ServerStopTerminationTest.java | 347 ++++++++++++++++++
 7 files changed, 482 insertions(+), 111 deletions(-)
 delete mode 100644 src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java
 create mode 100644 test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java

diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
index aefb9b5d1fc..e8e84eb8edd 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -26,12 +26,8 @@
 package sun.net.httpserver;
 
 import java.io.*;
-import java.net.*;
 import java.util.Objects;
 
-import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
-
 /**
  * a class which allows the caller to write an arbitrary
  * number of bytes to an underlying stream.
@@ -159,7 +155,7 @@ public void close () throws IOException {
             closed = true;
         }
 
-        WriteFinishedEvent e = new WriteFinishedEvent (t);
+        Event e = new Event.WriteFinished(t);
         t.getHttpContext().getServerImpl().addEvent (e);
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
index 6577d5fbcdd..18c2535492b 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, 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
@@ -25,14 +25,35 @@
 
 package sun.net.httpserver;
 
-import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
+import java.util.Objects;
 
-class Event {
+abstract sealed class Event {
 
-    ExchangeImpl exchange;
+    final ExchangeImpl exchange;
 
-    protected Event (ExchangeImpl t) {
+    protected Event(ExchangeImpl t) {
         this.exchange = t;
     }
+
+    /**
+     * Stopping event for the http server.
+     * The event applies to the whole server and is not tied to any particular
+     * exchange.
+     */
+    static final class StopRequested extends Event {
+        StopRequested() {
+            super(null);
+        }
+    }
+
+    /**
+     * Event indicating that writing is finished for a given exchange.
+     */
+    static final class WriteFinished extends Event {
+        WriteFinished(ExchangeImpl t) {
+            super(Objects.requireNonNull(t));
+            assert !t.writefinished;
+            t.writefinished = true;
+        }
+    }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
index 277e6bb4228..f800bdaba18 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.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
@@ -26,12 +26,8 @@
 package sun.net.httpserver;
 
 import java.io.*;
-import java.net.*;
 import java.util.Objects;
 
-import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
-
 /**
  * a class which allows the caller to write up to a defined
  * number of bytes to an underlying stream. The caller *must*
@@ -98,7 +94,7 @@ public void close () throws IOException {
                 is.close();
             } catch (IOException e) {}
         }
-        WriteFinishedEvent e = new WriteFinishedEvent (t);
+        Event e = new Event.WriteFinished(t);
         t.getHttpContext().getServerImpl().addEvent (e);
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index cb27911c647..217ae86f5d3 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -60,7 +60,9 @@
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static sun.net.httpserver.Utils.isValidName;
@@ -93,7 +95,7 @@ class ServerImpl {
     private final Set<HttpConnection> rspConnections;
     private List<Event> events;
     private final Object lolock = new Object();
-    private volatile boolean finished = false;
+    private final CountDownLatch finishedLatch = new CountDownLatch(1);
     private volatile boolean terminating = false;
     private boolean bound = false;
     private boolean started = false;
@@ -179,7 +181,7 @@ public void bind (InetSocketAddress addr, int backlog) throws IOException {
     }
 
     public void start () {
-        if (!bound || started || finished) {
+        if (!bound || started || finished()) {
             throw new IllegalStateException ("server in wrong state");
         }
         if (executor == null) {
@@ -222,45 +224,75 @@ public HttpsConfigurator getHttpsConfigurator () {
         return httpsConfig;
     }
 
+    private final boolean finished(){
+        // if the latch is 0, the server is finished
+        return finishedLatch.getCount() == 0;
+    }
+
     public final boolean isFinishing() {
-        return finished;
+        return finished();
     }
 
+    /**
+     * This method stops the server by adding a stop request event and
+     * waiting for the server until the event is triggered or until the maximum delay is triggered.
+     * <p>
+     * This ensures that the server is stopped immediately after all exchanges are complete. HttpConnections will be forcefully closed if active exchanges do not
+     * complete within the imparted delay.
+     *
+     * @param delay maximum delay to wait for exchanges completion, in seconds
+     */
     public void stop (int delay) {
         if (delay < 0) {
             throw new IllegalArgumentException ("negative delay parameter");
         }
+
+        logger.log(Level.TRACE, "stopping");
+        // posting a stop event, which will flip finished flag if it finishes
+        // before the timeout in this method
         terminating = true;
+
+        addEvent(new Event.StopRequested());
+
         try { schan.close(); } catch (IOException e) {}
         selector.wakeup();
-        long latest = System.currentTimeMillis() + delay * 1000;
-        while (System.currentTimeMillis() < latest) {
-            delay();
-            if (finished) {
-                break;
+
+        try {
+            // waiting for the duration of the delay, unless released before
+            finishedLatch.await(delay, TimeUnit.SECONDS);
+
+        } catch (InterruptedException e) {
+            logger.log(Level.TRACE, "Error in awaiting the delay");
+
+        } finally {
+
+            logger.log(Level.TRACE, "closing connections");
+            finishedLatch.countDown();
+            selector.wakeup();
+            synchronized (allConnections) {
+                for (HttpConnection c : allConnections) {
+                    c.close();
+                }
             }
-        }
-        finished = true;
-        selector.wakeup();
-        synchronized (allConnections) {
-            for (HttpConnection c : allConnections) {
-                c.close();
+            allConnections.clear();
+            idleConnections.clear();
+            newlyAcceptedConnections.clear();
+            timer.cancel();
+            if (reqRspTimeoutEnabled) {
+                timer1.cancel();
             }
-        }
-        allConnections.clear();
-        idleConnections.clear();
-        newlyAcceptedConnections.clear();
-        timer.cancel();
-        if (reqRspTimeoutEnabled) {
-            timer1.cancel();
-        }
-        if (dispatcherThread != null && dispatcherThread != Thread.currentThread()) {
-            try {
-                dispatcherThread.join();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-                logger.log (Level.TRACE, "ServerImpl.stop: ", e);
+            logger.log(Level.TRACE, "connections closed");
+
+            if (dispatcherThread != null && dispatcherThread != Thread.currentThread()) {
+                logger.log(Level.TRACE, "waiting for dispatcher thread");
+                try {
+                    dispatcherThread.join();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    logger.log(Level.TRACE, "ServerImpl.stop: ", e);
+                }
             }
+            logger.log(Level.TRACE, "server stopped");
         }
     }
 
@@ -382,15 +414,34 @@ void addEvent (Event r) {
     class Dispatcher implements Runnable {
 
         private void handleEvent (Event r) {
+
+            // Stopping marking the state as finished if stop is requested,
+            // termination is in progress and exchange count is 0
+            if (r instanceof Event.StopRequested) {
+                logger.log(Level.TRACE, "Handling Stop Requested Event");
+
+                // checking if terminating is set to true
+                final boolean terminatingCopy = terminating;
+                assert terminatingCopy;
+
+                if (getExchangeCount() == 0 && reqConnections.isEmpty()) {
+                    finishedLatch.countDown();
+                } else {
+                    logger.log(Level.TRACE, "Some requests are still pending");
+                }
+                return;
+            }
+
             ExchangeImpl t = r.exchange;
             HttpConnection c = t.getConnection();
+
             try {
-                if (r instanceof WriteFinishedEvent) {
+                if (r instanceof Event.WriteFinished) {
 
                     logger.log(Level.TRACE, "Write Finished");
                     int exchanges = endExchange();
-                    if (terminating && exchanges == 0) {
-                        finished = true;
+                    if (terminating && exchanges == 0 && reqConnections.isEmpty()) {
+                        finishedLatch.countDown();
                     }
                     LeftOverInputStream is = t.getOriginalInputStream();
                     if (!is.isEOF()) {
@@ -440,11 +491,12 @@ void reRegister (HttpConnection c) {
         }
 
         public void run() {
-            while (!finished) {
+            // finished() will be true when there are no active exchange after terminating
+             while (!finished()) {
                 try {
                     List<Event> list = null;
                     synchronized (lolock) {
-                        if (events.size() > 0) {
+                        if (!events.isEmpty()) {
                             list = events;
                             events = new ArrayList<>();
                         }
@@ -591,18 +643,18 @@ private void closeConnection(HttpConnection conn) {
         conn.close();
         allConnections.remove(conn);
         switch (conn.getState()) {
-        case REQUEST:
-            reqConnections.remove(conn);
-            break;
-        case RESPONSE:
-            rspConnections.remove(conn);
-            break;
-        case IDLE:
-            idleConnections.remove(conn);
-            break;
-        case NEWLY_ACCEPTED:
-            newlyAcceptedConnections.remove(conn);
-            break;
+            case REQUEST:
+                reqConnections.remove(conn);
+                break;
+            case RESPONSE:
+                rspConnections.remove(conn);
+                break;
+            case IDLE:
+                idleConnections.remove(conn);
+                break;
+            case NEWLY_ACCEPTED:
+                newlyAcceptedConnections.remove(conn);
+                break;
         }
         assert !reqConnections.remove(conn);
         assert !rspConnections.remove(conn);
@@ -925,19 +977,16 @@ void logReply (int code, String requestStr, String text) {
         logger.log (Level.DEBUG, message);
     }
 
-    void delay () {
-        Thread.yield();
-        try {
-            Thread.sleep (200);
-        } catch (InterruptedException e) {}
-    }
-
     private int exchangeCount = 0;
 
     synchronized void startExchange () {
         exchangeCount ++;
     }
 
+    synchronized int getExchangeCount() {
+        return exchangeCount;
+    }
+
     synchronized int endExchange () {
         exchangeCount --;
         assert exchangeCount >= 0;
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
index 76a1be6ec5f..7bfc39c84a1 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.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.
  * 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,8 @@
 package sun.net.httpserver;
 
 import java.io.*;
-import java.net.*;
 import java.util.Objects;
 
-import com.sun.net.httpserver.*;
-import com.sun.net.httpserver.spi.*;
-
 /**
  * a class which allows the caller to write an indefinite
  * number of bytes to an underlying stream , but without using
@@ -79,7 +75,7 @@ public void close () throws IOException {
                 is.close();
             } catch (IOException e) {}
         }
-        WriteFinishedEvent e = new WriteFinishedEvent (t);
+        Event e = new Event.WriteFinished(t);
         t.getHttpContext().getServerImpl().addEvent (e);
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java
deleted file mode 100644
index 6a04129d679..00000000000
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/WriteFinishedEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.net.httpserver;
-
-class WriteFinishedEvent extends Event {
-    WriteFinishedEvent (ExchangeImpl t) {
-        super (t);
-        assert !t.writefinished;
-        t.writefinished = true;
-    }
-}
diff --git a/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java b/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java
new file mode 100644
index 00000000000..81561160725
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/ServerStopTerminationTest.java
@@ -0,0 +1,347 @@
+/*
+ * 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 com.sun.net.httpserver.HttpServer;
+import jdk.test.lib.Utils;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
+ * @test
+ * @bug 8304065
+ * @summary HttpServer.stop() should terminate immediately if no exchanges are in progress,
+ *          else terminate after a timeout
+ * @library /test/lib
+ * @run junit/othervm -Djdk.internal.httpclient.debug=err ServerStopTerminationTest
+ */
+
+public class ServerStopTerminationTest {
+
+    // enabling logging for the http server
+    private final static Logger logger = Logger.getLogger("com.sun.net.httpserver");
+
+    static {
+        logger.setLevel(Level.FINEST);
+        Logger.getLogger("").getHandlers()[0].setLevel(Level.FINEST);
+    }
+
+    // The server instance used to test shutdown timing
+    private HttpServer server;
+    // Client for initiating exchanges
+    private HttpClient client;
+    // Allows test to await the start of the exchange
+    private final CountDownLatch start = new CountDownLatch(1);
+    // Allows test to signal when exchange should complete
+    private final CountDownLatch complete = new CountDownLatch(1);
+
+    @BeforeEach
+    public void setup() throws IOException {
+
+        // Create an HttpServer binding to the loopback address with an ephemeral port
+        server = HttpServer.create();
+        final InetAddress loopbackAddress = InetAddress.getLoopbackAddress();
+        server.bind(
+                new InetSocketAddress(loopbackAddress, 0),
+                0);
+
+        // A handler with completion timing controlled by tests
+        server.createContext("/", exchange -> {
+            // Let the test know the exchange is started
+            start.countDown();
+            try {
+                // Wait for test to signal that we can complete the exchange
+                complete.await();
+                exchange.sendResponseHeaders(200, 0);
+                exchange.close();
+            } catch (final InterruptedException e) {
+                throw new IOException(e);
+            }
+        });
+
+        // Start server and client
+        server.start();
+        client = HttpClient.newBuilder().build();
+    }
+
+    /**
+     * Clean up resources used by this test
+     */
+    @AfterEach
+    public void cleanup() {
+        client.shutdown();
+    }
+
+    /**
+     * Verify that a stop operation with a 1-second exchange and a 2-second delay
+     * completes when the exchange completes.
+     *
+     * @throws InterruptedException if an unexpected interruption occurs
+     */
+    @Test
+    public void shouldAwaitActiveExchange() throws InterruptedException {
+        // Initiate an exchange
+        startExchange();
+        // Wait for the server to receive the exchange
+        start.await();
+        log("Exchange started");
+
+        // Complete the exchange one second into the future
+        final Duration exchangeDuration = Duration.ofSeconds(1);
+        completeExchange(exchangeDuration);
+        log("Complete Exchange triggered");
+
+        // Time the shutdown sequence
+        final Duration delayDuration = Duration.ofSeconds(Utils.adjustTimeout(5));
+        log("Shutdown triggered with the delay of " + delayDuration.getSeconds());
+        final long elapsed = timeShutdown(delayDuration);
+        log("Shutdown complete");
+
+        // The shutdown should take at least as long as the exchange duration
+        if (elapsed < exchangeDuration.toNanos()) {
+            fail("HttpServer.stop terminated before exchange completed");
+        }
+
+        // The delay should not have expired
+        if (elapsed >= delayDuration.toNanos()) {
+            fail("HttpServer.stop terminated after delay expired");
+        }
+    }
+
+    /**
+     * Verify that a stop operation with a 1-second delay and a 10-second exchange
+     * completes after the delay expires.
+     *
+     * @throws InterruptedException if an unexpected interruption occurs
+     */
+    @Test
+    public void shouldCompeteAfterDelay() throws InterruptedException {
+        // Initiate an exchange
+        startExchange();
+        // Wait for the server to receive the exchange
+        start.await();
+        log("Exchange started");
+
+        // Complete the exchange 10 second into the future.
+        // Runs in parallel, so won't block the server stop
+        final Duration exchangeDuration = Duration.ofSeconds(Utils.adjustTimeout(10));
+        completeExchange(exchangeDuration);
+        log("Complete Exchange triggered");
+
+
+        // Time the shutdown sequence
+        final Duration delayDuration = Duration.ofSeconds(1);
+        log("Shutdown triggered with the delay of " + delayDuration.getSeconds());
+        final long elapsed = timeShutdown(delayDuration);
+        log("Shutdown complete");
+
+
+        // The shutdown should not await the exchange to complete
+        if (elapsed >= exchangeDuration.toNanos()) {
+            fail("HttpServer.stop terminated too late");
+        }
+
+        // The shutdown delay should have expired
+        if (elapsed < delayDuration.toNanos()) {
+            fail("HttpServer.stop terminated before delay");
+        }
+    }
+
+    /**
+     * Verify that a stop operation with a 1-second delay and a 20-second executor
+     * completes after the delay expires.
+     *
+     * @throws InterruptedException if an unexpected interruption occurs
+     */
+    @Test
+    public void shouldCompeteAfterDelayCustomHandler() throws IOException, InterruptedException {
+
+        // Custom server setup to include the executor
+        log("Changing the server to the server with a custom executor");
+        // Create an HttpServer binding
+        final InetAddress loopbackAddress = InetAddress.getLoopbackAddress();
+        server = HttpServer.create(new InetSocketAddress(loopbackAddress, 0),
+                0,
+                "/", exchange -> {
+                    exchange.sendResponseHeaders(200, 0);
+                    exchange.close();
+                });
+        final Duration executorSleepTime = Duration.ofSeconds(Utils.adjustTimeout(20));
+        server.setExecutor(command -> Thread.ofVirtual().start(() -> {
+            try {
+                // Let the test know the executor was triggered
+                start.countDown();
+                log("Custom executor started, sleeping");
+                // waiting in the executor stage before running the exchange
+                Thread.sleep(executorSleepTime);
+                log("Custom executor sleep complete");
+                command.run();// start the exchange
+
+            } catch (final InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+        // Start server and client
+        server.start();
+        log("Custom setup complete");
+
+        // Initiate an exchange
+        startExchange();
+        // Wait for the server to start the executor
+        start.await();
+        log("Exchange (Executor) started");
+
+        // Time the shutdown sequence
+        final Duration delayDuration = Duration.ofSeconds(1);
+        log("Shutdown triggered with the delay of " + delayDuration.getSeconds());
+        final long elapsed = timeShutdown(delayDuration);
+        log("Shutdown complete");
+
+        // The shutdown should not await the exchange to complete
+        if (elapsed >= executorSleepTime.toNanos()) {
+            fail("HttpServer.stop terminated too late");
+        }
+
+        // The shutdown delay should have expired
+        if (elapsed < delayDuration.toNanos()) {
+            fail("HttpServer.stop terminated before delay");
+        }
+    }
+
+    /**
+     * Verify that an HttpServer with no active exchanges terminates
+     * before the delay timeout occurs.
+     */
+    @Test
+    public void noActiveExchanges() {
+        // With no active exchanges, shutdown should complete immediately
+        final Duration delayDuration = Duration.ofSeconds(Utils.adjustTimeout(5));
+        final long elapsed = timeShutdown(delayDuration);
+        log("Shutting down the server with no exchanges");
+        if (elapsed >= delayDuration.toNanos()) {
+            fail("Expected HttpServer.stop to terminate immediately with no active exchanges");
+        }
+    }
+
+    /**
+     * Verify that an already stopped HttpServer can be stopped
+     */
+    @Test
+    public void shouldAllowRepeatedStop() {
+        final Duration delayDuration = Duration.ofSeconds(1);
+        log("Shutting down the server the first time");
+        timeShutdown(delayDuration);
+        log("Shutting down the server the second time");
+        timeShutdown(delayDuration);
+    }
+
+    /**
+     * Run HttpServer::stop with the given delay, returning the
+     * elapsed time in nanoseconds for the shutdown to complete
+     */
+    private long timeShutdown(Duration delayDuration) {
+        final long startTime = System.nanoTime();
+
+        server.stop((int) delayDuration.toSeconds());
+        return System.nanoTime() - startTime;
+    }
+
+    /**
+     * Initiate an exchange asynchronously
+     */
+    private void startExchange() {
+        try {
+            final HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URIBuilder.newBuilder()
+                            .scheme("http")
+                            .loopback()
+                            .port(server.getAddress().getPort())
+                            .build())
+                    // We need to use POST to prevent retries
+                    .POST(HttpRequest.BodyPublishers.ofString(""))
+                    .build();
+
+            client.sendAsync(request, HttpResponse.BodyHandlers.ofString())
+                    .whenCompleteAsync((r, t) -> {
+                        System.out.println("request completed (" + r + ", " + t + ")");
+                        // count the latch down to allow the handler to complete
+                        // and the server's dispatcher thread to proceed; The handler
+                        // is called within the dispatcher thread since we haven't
+                        // set any executor on the server side
+                        complete.countDown();
+                    });
+        } catch (final URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * At the specified time into the future, signal to the
+     * handler that the exchange can complete.
+     *
+     * @param exchangeDuration the duration to wait before signaling completion
+     */
+    private void completeExchange(Duration exchangeDuration) {
+        Thread.ofVirtual().start(() -> {
+            try {
+                Thread.sleep(exchangeDuration);
+                complete.countDown();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    /**
+     * This logging method will log the name of the method which called the log
+     * for easier debug
+     *
+     * @param message message to include in the log
+     */
+    private void log(final String message) {
+
+        String filename = "";
+        try {
+            filename = Thread.currentThread()
+                    .getStackTrace()[2].getMethodName();
+        } finally {
+            System.out.printf("{%s}: %s%n", filename, message);
+        }
+    }
+}

From 0671309de530822cc261e8251fc425c8aa3cc487 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Wed, 28 May 2025 10:57:57 +0000
Subject: [PATCH 683/901] 8357919: Arena::allocate returns segments with
 address zero if the segment length is zero after JDK-8345687

Reviewed-by: mcimadamore
---
 .../internal/foreign/SegmentFactories.java    |  7 +++++++
 test/jdk/java/foreign/TestSegments.java       | 21 +++++++++++++++++++
 2 files changed, 28 insertions(+)

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 f4ea2ed8c74..3edcac2e44c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
@@ -192,6 +192,13 @@ private static long allocateNativeInternal(long byteSize, long byteAlignment, Me
         }
         // 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;
+        // Check for wrap around
+        if (alignedSize < 0) {
+            throw new OutOfMemoryError();
+        }
+        // Always allocate at least some memory so that zero-length segments have distinct
+        // non-zero addresses.
+        alignedSize = Math.max(1, alignedSize);
 
         long allocationSize;
         long allocationBase;
diff --git a/test/jdk/java/foreign/TestSegments.java b/test/jdk/java/foreign/TestSegments.java
index af639596734..2942b388d50 100644
--- a/test/jdk/java/foreign/TestSegments.java
+++ b/test/jdk/java/foreign/TestSegments.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @requires vm.bits == 64
+ * @modules java.base/sun.nio.ch
  * @run testng/othervm -Xmx4G -XX:MaxDirectMemorySize=1M --enable-native-access=ALL-UNNAMED TestSegments
  */
 
@@ -58,6 +59,12 @@ public void testZeroLengthNativeSegment() {
         try (Arena arena = Arena.ofConfined()) {
             var segment = arena.allocate(0, 1);
             assertEquals(segment.byteSize(), 0);
+            if (segment.address() == 0) {
+                fail("Segment address is zero");
+            }
+            if (segment.address() == arena.allocate(0, 1).address()) {
+                fail("Segment address was not distinct");
+            }
             MemoryLayout seq = MemoryLayout.sequenceLayout(0, JAVA_INT);
             segment = arena.allocate(seq);
             assertEquals(segment.byteSize(), 0);
@@ -71,6 +78,20 @@ public void testZeroLengthNativeSegment() {
         }
     }
 
+    @Test
+    public void testZeroLengthNativeSegmentHyperAligned() {
+        long byteAlignment = 1024;
+        try (Arena arena = Arena.ofConfined()) {
+            var segment = arena.allocate(0, byteAlignment);
+            assertEquals(segment.byteSize(), 0);
+            if (segment.address() == 0) {
+                fail("Segment address is zero");
+            }
+            assertTrue(segment.maxByteAlignment() >= byteAlignment);
+        }
+    }
+
+
     @Test(expectedExceptions = { OutOfMemoryError.class,
                                  IllegalArgumentException.class })
     public void testAllocateTooBig() {

From f30e15411f5c0fc90565dac19203fdc1ab43fd88 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 28 May 2025 11:38:20 +0000
Subject: [PATCH 684/901] 8357673: remove test
 serviceability/jvmti/vthread/TestPinCaseWithCFLH

Reviewed-by: amenkov, lmesnik
---
 .../TestPinCaseWithCFLH.java                  | 77 -------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java

diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java
deleted file mode 100644
index 02755a0289f..00000000000
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
-import java.lang.instrument.Instrumentation;
-import java.security.ProtectionDomain;
-import jdk.test.lib.thread.VThreadPinner;
-
-/*
- * @test
- * @summary javaagent + tracePinnedThreads will cause jvm crash/ run into deadlock when the virtual thread is pinned
- * @library /test/lib
- * @requires vm.continuations
- * @requires vm.jvmti
- * @modules java.base/java.lang:+open
- * @compile TestPinCaseWithCFLH.java
- * @build jdk.test.lib.Utils
- * @run driver jdk.test.lib.util.JavaAgentBuilder
- *             TestPinCaseWithCFLH TestPinCaseWithCFLH.jar
- * @run main/othervm/timeout=100  -Djdk.virtualThreadScheduler.maxPoolSize=1
- *       -Djdk.tracePinnedThreads=full --enable-native-access=ALL-UNNAMED
- *       -javaagent:TestPinCaseWithCFLH.jar TestPinCaseWithCFLH
- */
-public class TestPinCaseWithCFLH {
-
-    public static class TestClassFileTransformer implements ClassFileTransformer {
-        public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
-                                ProtectionDomain protectionDomain, byte[] classfileBuffer)
-                                throws IllegalClassFormatException {
-            return classfileBuffer;
-        }
-    }
-
-    // Called when agent is loaded at startup
-    public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception {
-        instrumentation.addTransformer(new TestClassFileTransformer());
-    }
-
-    private static int result = 0;
-
-    public static void main(String[] args) throws Exception{
-        Thread t1 = Thread.ofVirtual().name("vthread-1").start(() -> {
-            VThreadPinner.runPinned(() -> {
-                try {
-                    // try yield, will pin,
-                    // javaagent + tracePinnedThreads should not lead to crash
-                    // (because of the class `PinnedThreadPrinter`)
-                    Thread.sleep(500);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-        });
-        t1.join();
-    }
-
-}
\ No newline at end of file

From 6ebae6cded49f9b0b0d42899af3303647eca7848 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Wed, 28 May 2025 12:00:15 +0000
Subject: [PATCH 685/901] 8241678: Remove PerfData sampling via StatSampler

Reviewed-by: jsjolen, ayang
---
 src/hotspot/os/aix/os_aix.cpp                 |   1 -
 src/hotspot/os/bsd/os_bsd.cpp                 |   1 -
 src/hotspot/os/linux/os_linux.cpp             |   1 -
 src/hotspot/os/windows/os_windows.cpp         |   1 -
 .../share/gc/parallel/spaceCounters.cpp       |  23 +-
 .../share/gc/parallel/spaceCounters.hpp       |  13 -
 .../share/gc/serial/cSpaceCounters.cpp        |  23 +-
 .../share/gc/serial/cSpaceCounters.hpp        |  13 -
 src/hotspot/share/runtime/arguments.cpp       |   1 +
 src/hotspot/share/runtime/globals.hpp         |   5 -
 src/hotspot/share/runtime/java.cpp            |   5 -
 src/hotspot/share/runtime/perfData.cpp        | 203 ++++++----
 src/hotspot/share/runtime/perfData.hpp        | 122 +-----
 src/hotspot/share/runtime/perfDataTypes.hpp   |   2 -
 src/hotspot/share/runtime/perfMemory.cpp      |  11 +-
 src/hotspot/share/runtime/statSampler.cpp     | 349 ------------------
 src/hotspot/share/runtime/statSampler.hpp     |  71 ----
 src/hotspot/share/runtime/threads.cpp         |   6 +-
 .../perfdata/monitor/v1_0/PerfDataBuffer.java |  10 +-
 .../sun/jvmstat/perfdata/resources/aliasmap   |   2 -
 .../sun/tools/jstat/ExpressionExecuter.java   |   4 +
 .../sun/tools/jstat/ExpressionResolver.java   |   2 +-
 .../share/classes/sun/tools/jstat/Parser.java |  11 +-
 .../classes/sun/tools/jstat/Timestamp.java    |  41 ++
 .../sun/tools/jstat/resources/jstat_options   |   2 +-
 25 files changed, 209 insertions(+), 714 deletions(-)
 delete mode 100644 src/hotspot/share/runtime/statSampler.cpp
 delete mode 100644 src/hotspot/share/runtime/statSampler.hpp
 create mode 100644 src/jdk.jcmd/share/classes/sun/tools/jstat/Timestamp.java

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 7dfbc3905bf..e7b401701ac 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -58,7 +58,6 @@
 #include "runtime/perfMemory.hpp"
 #include "runtime/safefetch.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 01901acc0a3..3535d027dbc 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -53,7 +53,6 @@
 #include "runtime/perfMemory.hpp"
 #include "runtime/semaphore.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 1b48550bfb7..807014e7b0c 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -56,7 +56,6 @@
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.hpp"
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index fbd1b37699f..9e536d2df97 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -60,7 +60,6 @@
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/suspendedThreadTask.hpp"
 #include "runtime/threads.hpp"
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.cpp b/src/hotspot/share/gc/parallel/spaceCounters.cpp
index 4133fc2e248..c15d25dc0aa 100644
--- a/src/hotspot/share/gc/parallel/spaceCounters.cpp
+++ b/src/hotspot/share/gc/parallel/spaceCounters.cpp
@@ -33,8 +33,7 @@
 
 SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size,
                              MutableSpace* m, GenerationCounters* gc)
-  : _last_used_in_bytes(0), _object_space(m)
-{
+    : _object_space(m) {
   if (UsePerfData) {
     EXCEPTION_MARK;
     ResourceMark rm;
@@ -60,7 +59,7 @@ SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size,
 
     cname = PerfDataManager::counter_name(_name_space, "used");
     _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes,
-                                             new UsedHelper(this),
+                                             _object_space->used_in_bytes(),
                                              CHECK);
 
     cname = PerfDataManager::counter_name(_name_space, "initCapacity");
@@ -74,21 +73,5 @@ SpaceCounters::~SpaceCounters() {
 }
 
 void SpaceCounters::update_used() {
-  size_t new_used = _object_space->used_in_bytes();
-  Atomic::store(&_last_used_in_bytes, new_used);
-  _used->set_value(new_used);
-}
-
-jlong SpaceCounters::UsedHelper::take_sample() {
-  // Sampling may occur during GC, possibly while GC is updating the space.
-  // The space can be in an inconsistent state during such an update.  We
-  // don't want to block sampling for the duration of a GC.  Instead, skip
-  // sampling in that case, using the last recorded value.
-  assert(!Heap_lock->owned_by_self(), "precondition");
-  if (Heap_lock->try_lock()) {
-    size_t new_used = _counters->_object_space->used_in_bytes();
-    Atomic::store(&_counters->_last_used_in_bytes, new_used);
-    Heap_lock->unlock();
-  }
-  return Atomic::load(&_counters->_last_used_in_bytes);
+  _used->set_value(_object_space->used_in_bytes());
 }
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp
index 3d0c1ff7b50..b33aac386a6 100644
--- a/src/hotspot/share/gc/parallel/spaceCounters.hpp
+++ b/src/hotspot/share/gc/parallel/spaceCounters.hpp
@@ -39,7 +39,6 @@ class SpaceCounters: public CHeapObj<mtGC> {
  private:
   PerfVariable*      _capacity;
   PerfVariable*      _used;
-  volatile size_t    _last_used_in_bytes;
 
   // Constant PerfData types don't need to retain a reference.
   // However, it's a good idea to document them here.
@@ -48,8 +47,6 @@ class SpaceCounters: public CHeapObj<mtGC> {
   MutableSpace*     _object_space;
   char*             _name_space;
 
-  class UsedHelper;
-
  public:
 
   SpaceCounters(const char* name, int ordinal, size_t max_size,
@@ -71,14 +68,4 @@ class SpaceCounters: public CHeapObj<mtGC> {
   const char* name_space() const        { return _name_space; }
 };
 
-class SpaceCounters::UsedHelper: public PerfLongSampleHelper {
- private:
-  SpaceCounters* _counters;
-
- public:
-  UsedHelper(SpaceCounters* counters) : _counters(counters) { }
-
-  jlong take_sample() override;
-};
-
 #endif // SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/serial/cSpaceCounters.cpp b/src/hotspot/share/gc/serial/cSpaceCounters.cpp
index 9f8b91e205c..f6bcee99423 100644
--- a/src/hotspot/share/gc/serial/cSpaceCounters.cpp
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.cpp
@@ -28,8 +28,7 @@
 
 CSpaceCounters::CSpaceCounters(const char* name, int ordinal, size_t max_size,
                                ContiguousSpace* s, GenerationCounters* gc)
-  : _last_used_in_bytes(0), _space(s)
-{
+    : _space(s) {
   if (UsePerfData) {
     EXCEPTION_MARK;
     ResourceMark rm;
@@ -57,7 +56,7 @@ CSpaceCounters::CSpaceCounters(const char* name, int ordinal, size_t max_size,
 
     cname = PerfDataManager::counter_name(_name_space, "used");
     _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes,
-                                             new UsedHelper(this),
+                                             _space->used(),
                                              CHECK);
 
     cname = PerfDataManager::counter_name(_name_space, "initCapacity");
@@ -75,26 +74,10 @@ void CSpaceCounters::update_capacity() {
 }
 
 void CSpaceCounters::update_used() {
-  size_t new_used = _space->used();
-  Atomic::store(&_last_used_in_bytes, new_used);
-  _used->set_value(new_used);
+  _used->set_value(_space->used());
 }
 
 void CSpaceCounters::update_all() {
   update_used();
   update_capacity();
 }
-
-jlong CSpaceCounters::UsedHelper::take_sample(){
-  // Sampling may occur during GC, possibly while GC is updating the space.
-  // The space can be in an inconsistent state during such an update.  We
-  // don't want to block sampling for the duration of a GC.  Instead, skip
-  // sampling in that case, using the last recorded value.
-  assert(!Heap_lock->owned_by_self(), "precondition");
-  if (Heap_lock->try_lock()) {
-    size_t new_used = _counters->_space->used();
-    Atomic::store(&_counters->_last_used_in_bytes, new_used);
-    Heap_lock->unlock();
-  }
-  return Atomic::load(&_counters->_last_used_in_bytes);
-}
diff --git a/src/hotspot/share/gc/serial/cSpaceCounters.hpp b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
index 334f649382b..b378f379afe 100644
--- a/src/hotspot/share/gc/serial/cSpaceCounters.hpp
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.hpp
@@ -39,7 +39,6 @@ class CSpaceCounters: public CHeapObj<mtGC> {
   PerfVariable*      _capacity;
   PerfVariable*      _used;
   PerfVariable*      _max_capacity;
-  volatile size_t    _last_used_in_bytes;
 
   // Constant PerfData types don't need to retain a reference.
   // However, it's a good idea to document them here.
@@ -48,8 +47,6 @@ class CSpaceCounters: public CHeapObj<mtGC> {
   ContiguousSpace*     _space;
   char*                _name_space;
 
-  class UsedHelper;
-
  public:
 
   CSpaceCounters(const char* name, int ordinal, size_t max_size,
@@ -64,14 +61,4 @@ class CSpaceCounters: public CHeapObj<mtGC> {
   const char* name_space() const        { return _name_space; }
 };
 
-class CSpaceCounters::UsedHelper : public PerfLongSampleHelper {
- private:
-  CSpaceCounters* _counters;
-
- public:
-  UsedHelper(CSpaceCounters* counters) : _counters(counters) { }
-
-  jlong take_sample() override;
-};
-
 #endif // SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 8b1f5e645d4..62fcc65743a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -536,6 +536,7 @@ static SpecialFlag const special_jvm_flags[] = {
 
   // -------------- Obsolete Flags - sorted by expired_in --------------
 
+  { "PerfDataSamplingInterval",     JDK_Version::undefined(), JDK_Version::jdk(25), JDK_Version::jdk(26) },
   { "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() },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 2b07f9d47e1..290ce0d3cba 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1728,11 +1728,6 @@ const int ObjectAlignmentInBytes = 8;
           "The string %p in the file name (if present) "                    \
           "will be replaced by pid")                                        \
                                                                             \
-  product(int, PerfDataSamplingInterval, 50,                                \
-          "Data sampling interval (in milliseconds)")                       \
-          range(PeriodicTask::min_interval, max_jint)                       \
-          constraint(PerfDataSamplingIntervalFunc, AfterErgo)               \
-                                                                            \
   product(bool, PerfDisableSharedMem, false,                                \
           "Store performance data in standard memory")                      \
                                                                             \
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 06c5fbce756..aa0b5dca3e4 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -70,7 +70,6 @@
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/task.hpp"
 #include "runtime/threads.hpp"
@@ -470,10 +469,6 @@ void before_exit(JavaThread* thread, bool halt) {
   // PeriodicTasks to reduce the likelihood of races.
   WatcherThread::stop();
 
-  // shut down the StatSampler task
-  StatSampler::disengage();
-  StatSampler::destroy();
-
   NativeHeapTrimmer::cleanup();
 
   // Stop concurrent GC threads
diff --git a/src/hotspot/share/runtime/perfData.cpp b/src/hotspot/share/runtime/perfData.cpp
index ba6370e596a..bc9d86400dc 100644
--- a/src/hotspot/share/runtime/perfData.cpp
+++ b/src/hotspot/share/runtime/perfData.cpp
@@ -27,8 +27,10 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/arguments.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
@@ -38,7 +40,6 @@
 #include "utilities/globalDefinitions.hpp"
 
 PerfDataList*   PerfDataManager::_all = nullptr;
-PerfDataList*   PerfDataManager::_sampled = nullptr;
 PerfDataList*   PerfDataManager::_constants = nullptr;
 volatile bool   PerfDataManager::_has_PerfData = 0;
 
@@ -198,20 +199,6 @@ PerfLong::PerfLong(CounterNS ns, const char* namep, Units u, Variability v)
   create_entry(T_LONG, sizeof(jlong));
 }
 
-PerfLongVariant::PerfLongVariant(CounterNS ns, const char* namep, Units u,
-                                 Variability v, PerfLongSampleHelper* helper)
-                                : PerfLong(ns, namep, u, v),
-                                  _sample_helper(helper) {
-
-  sample();
-}
-
-void PerfLongVariant::sample() {
-  if (_sample_helper != nullptr) {
-    *(jlong*)_valuep = _sample_helper->take_sample();
-  }
-}
-
 PerfByteArray::PerfByteArray(CounterNS ns, const char* namep, Units u,
                              Variability v, jint length)
                             : PerfData(ns, namep, u, v), _length(length) {
@@ -266,8 +253,8 @@ void PerfDataManager::destroy() {
   Atomic::store(&_has_PerfData, false);
   GlobalCounter::write_synchronize();
 
-  log_debug(perf, datacreation)("Total = %d, Sampled = %d, Constants = %d",
-                                _all->length(), _sampled == nullptr ? 0 : _sampled->length(),
+  log_debug(perf, datacreation)("Total = %d, Constants = %d",
+                                _all->length(),
                                 _constants == nullptr ? 0 : _constants->length());
 
   for (int index = 0; index < _all->length(); index++) {
@@ -276,15 +263,13 @@ void PerfDataManager::destroy() {
   }
 
   delete(_all);
-  delete(_sampled);
   delete(_constants);
 
   _all = nullptr;
-  _sampled = nullptr;
   _constants = nullptr;
 }
 
-void PerfDataManager::add_item(PerfData* p, bool sampled) {
+void PerfDataManager::add_item(PerfData* p) {
 
   MutexLocker ml(PerfDataManager_lock);
 
@@ -306,24 +291,6 @@ void PerfDataManager::add_item(PerfData* p, bool sampled) {
     _constants->append(p);
     return;
   }
-
-  if (sampled) {
-    if (_sampled == nullptr) {
-      _sampled = new PerfDataList(1);
-    }
-    _sampled->append(p);
-  }
-}
-
-PerfDataList* PerfDataManager::sampled() {
-
-  MutexLocker ml(PerfDataManager_lock);
-
-  if (_sampled == nullptr)
-    return nullptr;
-
-  PerfDataList* clone = _sampled->clone();
-  return clone;
 }
 
 char* PerfDataManager::counter_name(const char* ns, const char* name) {
@@ -362,7 +329,7 @@ PerfStringConstant* PerfDataManager::create_string_constant(CounterNS ns,
     THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
-  add_item(p, false);
+  add_item(p);
 
   return p;
 }
@@ -380,7 +347,7 @@ PerfLongConstant* PerfDataManager::create_long_constant(CounterNS ns,
     THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
-  add_item(p, false);
+  add_item(p);
 
   return p;
 }
@@ -403,7 +370,7 @@ PerfStringVariable* PerfDataManager::create_string_variable(CounterNS ns,
     THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
-  add_item(p, false);
+  add_item(p);
 
   return p;
 }
@@ -421,21 +388,17 @@ PerfLongVariable* PerfDataManager::create_long_variable(CounterNS ns,
     THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
-  add_item(p, false);
+  add_item(p);
 
   return p;
 }
 
-PerfLongVariable* PerfDataManager::create_long_variable(CounterNS ns,
-                                                        const char* name,
-                                                        PerfData::Units u,
-                                                        PerfSampleHelper* sh,
-                                                        TRAPS) {
-
-  // Sampled counters not supported if UsePerfData is false
-  if (!UsePerfData) return nullptr;
+PerfLongCounter* PerfDataManager::create_long_counter(CounterNS ns,
+                                                      const char* name,
+                                                      PerfData::Units u,
+                                                      jlong ival, TRAPS) {
 
-  PerfLongVariable* p = new PerfLongVariable(ns, name, u, sh);
+  PerfLongCounter* p = new PerfLongCounter(ns, name, u, ival);
 
   if (!p->is_valid()) {
     // allocation of native resources failed.
@@ -443,49 +406,133 @@ PerfLongVariable* PerfDataManager::create_long_variable(CounterNS ns,
     THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
-  add_item(p, true);
+  add_item(p);
 
   return p;
 }
 
-PerfLongCounter* PerfDataManager::create_long_counter(CounterNS ns,
-                                                      const char* name,
-                                                      PerfData::Units u,
-                                                      jlong ival, TRAPS) {
+/*
+ * Call into java.lang.System.getProperty to check that the value of the
+ * specified property matches
+ */
+void PerfDataManager::assert_system_property(const char* name, const char* value, TRAPS) {
+#ifdef ASSERT
+  ResourceMark rm(THREAD);
 
-  PerfLongCounter* p = new PerfLongCounter(ns, name, u, ival);
+  // setup the arguments to getProperty
+  Handle key_str   = java_lang_String::create_from_str(name, CHECK);
 
-  if (!p->is_valid()) {
-    // allocation of native resources failed.
-    delete p;
-    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
-  }
+  // return value
+  JavaValue result(T_OBJECT);
 
-  add_item(p, false);
+  // public static String getProperty(String key, String def);
+  JavaCalls::call_static(&result, vmClasses::System_klass(),
+                         vmSymbols::getProperty_name(),
+                         vmSymbols::string_string_signature(), key_str, CHECK);
 
-  return p;
+  oop value_oop = result.get_oop();
+  assert(value_oop != nullptr, "property must have a value");
+
+  // convert Java String to utf8 string
+  char *system_value = java_lang_String::as_utf8_string(value_oop);
+
+  assert(strcmp(value, system_value) == 0, "property value mustn't differ from System.getProperty. Our value is: %s, System.getProperty is: %s",
+         value, system_value);
+#endif // ASSERT
 }
 
-PerfLongCounter* PerfDataManager::create_long_counter(CounterNS ns,
-                                                      const char* name,
-                                                      PerfData::Units u,
-                                                      PerfSampleHelper* sh,
-                                                      TRAPS) {
+/*
+ * Adds a constant counter of the given property. Asserts the value does not
+ * differ from the value retrievable from System.getProperty(name)
+ */
+void PerfDataManager::add_property_constant(CounterNS name_space, const char* name, const char* value, TRAPS) {
+  // the property must exist
+  assert(value != nullptr, "property name should be have a value: %s", name);
+  assert_system_property(name, value, CHECK);
 
-  // Sampled counters not supported if UsePerfData is false
-  if (!UsePerfData) return nullptr;
+  // create the property counter
+  PerfDataManager::create_string_constant(name_space, name, value, CHECK);
+}
 
-  PerfLongCounter* p = new PerfLongCounter(ns, name, u, sh);
+/*
+ * Adds a string constant of the given property. Retrieves the value via
+ * Arguments::get_property() and asserts the value for the does not differ from
+ * the value retrievable from System.getProperty()
+ */
+void PerfDataManager::add_property_constant(CounterNS name_space, const char* name, TRAPS) {
+  add_property_constant(name_space, name, Arguments::get_property(name), CHECK);
+}
 
-  if (!p->is_valid()) {
-    // allocation of native resources failed.
-    delete p;
-    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
+/*
+ * Adds a string constant of the given property. Retrieves the value via
+ * Arguments::get_property() and asserts the value for the does not differ from
+ * the value retrievable from System.getProperty()
+ */
+void PerfDataManager::add_optional_property_constant(CounterNS name_space, const char* name, TRAPS) {
+  const char* value = Arguments::get_property(name);
+
+  if (value != nullptr) {
+    add_property_constant(name_space, name, value, CHECK);
   }
+}
+
+void PerfDataManager::create_system_property_instrumentation(TRAPS) {
+
+  // Non-writeable, constant properties
+  add_property_constant(JAVA_PROPERTY, "java.vm.specification.name", "Java Virtual Machine Specification", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.version", JDK_Version::java_version(), CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.vm.version", VM_Version::vm_release(), CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.vm.name", VM_Version::vm_name(), CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.vm.vendor", VM_Version::vm_vendor(), CHECK);
+  add_property_constant(JAVA_PROPERTY, "jdk.debug", VM_Version::jdk_debug_level(), CHECK);
+
+  // Get remaining property constants via Arguments::get_property,
+  // which does a linear search over the internal system properties list.
+
+  // SUN_PROPERTY properties
+  add_property_constant(SUN_PROPERTY, "sun.boot.library.path", CHECK);
+
+  // JAVA_PROPERTY properties
+  add_property_constant(JAVA_PROPERTY, "java.vm.specification.version", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.vm.specification.vendor", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.vm.info", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.library.path", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.class.path", CHECK);
+  add_property_constant(JAVA_PROPERTY, "java.home", CHECK);
+
+  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.path", CHECK);
+  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.upgrade.path", CHECK);
+  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.main", CHECK);
+}
 
-  add_item(p, true);
+void PerfDataManager::create_misc_perfdata() {
 
-  return p;
+  ResourceMark rm;
+  EXCEPTION_MARK;
+
+  // numeric constants
+
+  // frequency of the native high resolution timer
+  create_constant(SUN_OS, "hrt.frequency", PerfData::U_Hertz,
+    os::elapsed_frequency(), CHECK);
+
+  // string constants
+
+  // create string instrumentation for various Java properties.
+  create_system_property_instrumentation(CHECK);
+
+  // HotSpot flags (from .hotspotrc) and args (from command line)
+  //
+  create_string_constant(JAVA_RT, "vmFlags", Arguments::jvm_flags(), CHECK);
+  create_string_constant(JAVA_RT, "vmArgs", Arguments::jvm_args(), CHECK);
+
+  // java class name/jar file and arguments to main class
+  // note: name is coordinated with launcher and Arguments.cpp
+  create_string_constant(SUN_RT, "javaCommand", Arguments::java_command(), CHECK);
+
+  // the Java VM Internal version string
+  create_string_constant(SUN_RT, "internalVersion",
+                         VM_Version::internal_vm_info_string(), CHECK);
 }
 
 PerfDataList::PerfDataList(int length) {
diff --git a/src/hotspot/share/runtime/perfData.hpp b/src/hotspot/share/runtime/perfData.hpp
index c14bc40c10a..7f05e4673fc 100644
--- a/src/hotspot/share/runtime/perfData.hpp
+++ b/src/hotspot/share/runtime/perfData.hpp
@@ -200,43 +200,10 @@ enum CounterNS {
  *   are not encouraged to access the string constant's value via this
  *   pointer at this time due to security concerns.
  *
- * Creating a performance counter in an arbitrary name space that holds a
- * value that is sampled by the StatSampler periodic task.
- *
- *    PerfDataManager::create_counter("foo.sampled", PerfData::U_Events,
- *                                    &my_jlong, CHECK);
- *
- *    In this example, the PerfData pointer can be ignored as the caller
- *    is relying on the StatSampler PeriodicTask to sample the given
- *    address at a regular interval. The interval is defined by the
- *    PerfDataSamplingInterval global variable, and is applied on
- *    a system wide basis, not on an per-counter basis.
- *
- * Creating a performance counter in an arbitrary name space that utilizes
- * a helper object to return a value to the StatSampler via the take_sample()
- * method.
- *
- *     class MyTimeSampler : public PerfLongSampleHelper {
- *       public:
- *         jlong take_sample() { return os::elapsed_counter(); }
- *     };
- *
- *     PerfDataManager::create_counter(SUN_RT, "helped",
- *                                     PerfData::U_Ticks,
- *                                     new MyTimeSampler(), CHECK);
- *
- *     In this example, a subtype of PerfLongSampleHelper is instantiated
- *     and its take_sample() method is overridden to perform whatever
- *     operation is necessary to generate the data sample. This method
- *     will be called by the StatSampler at a regular interval, defined
- *     by the PerfDataSamplingInterval global variable.
- *
- *     As before, PerfSampleHelper is an alias for PerfLongSampleHelper.
- *
  * For additional uses of PerfData subtypes, see the utility classes
  * PerfTraceTime and PerfTraceTimedEvent below.
  *
- * Always-on non-sampled counters can be created independent of
+ * Always-on counters can be created independent of
  * the UsePerfData flag. Counters will be created on the c-heap
  * if UsePerfData is false.
  *
@@ -260,7 +227,6 @@ enum CounterNS {
  */
 class PerfData : public CHeapObj<mtInternal> {
 
-  friend class StatSampler;      // for access to protected void sample()
   friend class PerfDataManager;  // for access to protected destructor
   friend class VMStructs;
 
@@ -314,10 +280,6 @@ class PerfData : public CHeapObj<mtInternal> {
     // facilitate its use by external processes.
     void create_entry(BasicType dtype, size_t dsize, size_t dlen = 0);
 
-    // sample the data item given at creation time and write its value
-    // into the its corresponding PerfMemory location.
-    virtual void sample() = 0;
-
   public:
 
     // returns a boolean indicating the validity of this object.
@@ -352,17 +314,6 @@ class PerfData : public CHeapObj<mtInternal> {
     inline void* get_address() { return _valuep; }
 };
 
-/*
- * PerfLongSampleHelper, and its alias PerfSamplerHelper, is a base class
- * for helper classes that rely upon the StatSampler periodic task to
- * invoke the take_sample() method and write the value returned to its
- * appropriate location in the PerfData memory region.
- */
-class PerfLongSampleHelper : public CHeapObj<mtInternal> {
-  public:
-    virtual jlong take_sample() = 0;
-};
-
 /*
  * PerfLong is the base class for the various Long PerfData subtypes.
  * it contains implementation details that are common among its derived
@@ -390,10 +341,6 @@ class PerfLongConstant : public PerfLong {
 
   friend class PerfDataManager; // for access to protected constructor
 
-  private:
-    // hide sample() - no need to sample constants
-    void sample() { }
-
   protected:
 
     PerfLongConstant(CounterNS ns, const char* namep, Units u,
@@ -413,19 +360,12 @@ class PerfLongConstant : public PerfLong {
 class PerfLongVariant : public PerfLong {
 
   protected:
-    PerfLongSampleHelper* _sample_helper;
-
     PerfLongVariant(CounterNS ns, const char* namep, Units u, Variability v,
                     jlong initial_value=0)
                    : PerfLong(ns, namep, u, v) {
       if (is_valid()) *(jlong*)_valuep = initial_value;
     }
 
-    PerfLongVariant(CounterNS ns, const char* namep, Units u, Variability v,
-                    PerfLongSampleHelper* sample_helper);
-
-    void sample();
-
   public:
     inline void inc() { (*(jlong*)_valuep)++; }
     inline void inc(jlong val) { (*(jlong*)_valuep) += val; }
@@ -451,11 +391,6 @@ class PerfLongCounter : public PerfLongVariant {
                     jlong initial_value=0)
                    : PerfLongVariant(ns, namep, u, V_Monotonic,
                                      initial_value) { }
-
-    PerfLongCounter(CounterNS ns, const char* namep, Units u,
-                    PerfLongSampleHelper* sample_helper)
-                   : PerfLongVariant(ns, namep, u, V_Monotonic,
-                                     sample_helper) { }
 };
 
 /*
@@ -474,11 +409,6 @@ class PerfLongVariable : public PerfLongVariant {
                     : PerfLongVariant(ns, namep, u, V_Variable,
                                       initial_value) { }
 
-    PerfLongVariable(CounterNS ns, const char* namep, Units u,
-                     PerfLongSampleHelper* sample_helper)
-                    : PerfLongVariant(ns, namep, u, V_Variable,
-                                      sample_helper) { }
-
   public:
     inline void set_value(jlong val) { (*(jlong*)_valuep) = val; }
 };
@@ -521,11 +451,6 @@ class PerfStringConstant : public PerfString {
 
   friend class PerfDataManager; // for access to protected constructor
 
-  private:
-
-    // hide sample() - no need to sample constants
-    void sample() { }
-
   protected:
 
     // Restrict string constant lengths to be <= PerfMaxStringConstLength.
@@ -550,9 +475,6 @@ class PerfStringVariable : public PerfString {
 
   protected:
 
-    // sampling of string variables are not yet supported
-    void sample() { }
-
     PerfStringVariable(CounterNS ns, const char* namep, jint max_length,
                        const char* initial_value)
                       : PerfString(ns, namep, V_Variable, max_length+1,
@@ -643,26 +565,23 @@ class PerfDataList : public CHeapObj<mtInternal> {
  * of the various PerfData types.
  */
 class PerfDataManager : AllStatic {
-
-  friend class StatSampler;   // for access to protected PerfDataList methods
-
   private:
     static PerfDataList* _all;
-    static PerfDataList* _sampled;
     static PerfDataList* _constants;
     static const char* _name_spaces[];
     static volatile bool _has_PerfData;
 
     // add a PerfData item to the list(s) of know PerfData objects
-    static void add_item(PerfData* p, bool sampled);
-
-  protected:
-
-    // return the list of all known PerfData items that are to be
-    // sampled by the StatSampler.
-    static PerfDataList* sampled();
+    static void add_item(PerfData* p);
 
+    static void create_system_property_instrumentation(TRAPS);
+    static void assert_system_property(const char* name, const char* value, TRAPS);
+    static void add_property_constant(CounterNS name_space, const char* name, const char* value, TRAPS);
+    static void add_property_constant(CounterNS name_space, const char* name, TRAPS);
+    static void add_optional_property_constant(CounterNS name_space, const char* name, TRAPS);
   public:
+    // Creates miscellaneous perfdata constants
+    static void create_misc_perfdata();
 
     // method to check for the existence of a PerfData item with
     // the given name.
@@ -747,23 +666,12 @@ class PerfDataManager : AllStatic {
       return create_long_variable(ns, name, u, (jlong)0, THREAD);
     };
 
-    static PerfLongVariable* create_long_variable(CounterNS ns,
-                                                  const char* name,
-                                                  PerfData::Units u,
-                                                  PerfLongSampleHelper* sh,
-                                                  TRAPS);
-
 
     // Counter Types
     static PerfLongCounter* create_long_counter(CounterNS ns, const char* name,
                                                 PerfData::Units u,
                                                 jlong ival, TRAPS);
 
-    static PerfLongCounter* create_long_counter(CounterNS ns, const char* name,
-                                                PerfData::Units u,
-                                                PerfLongSampleHelper* sh,
-                                                TRAPS);
-
 
     // these creation methods are provided for ease of use. These allow
     // Long performance data types to be created with a shorthand syntax.
@@ -783,23 +691,11 @@ class PerfDataManager : AllStatic {
       return create_long_variable(ns, name, u, (jlong)0, THREAD);
     }
 
-    static PerfVariable* create_variable(CounterNS ns, const char* name,
-                                         PerfData::Units u,
-                                         PerfSampleHelper* sh, TRAPS) {
-      return create_long_variable(ns, name, u, sh, THREAD);
-    }
-
     static PerfCounter* create_counter(CounterNS ns, const char* name,
                                        PerfData::Units u, TRAPS) {
       return create_long_counter(ns, name, u, (jlong)0, THREAD);
     }
 
-    static PerfCounter* create_counter(CounterNS ns, const char* name,
-                                       PerfData::Units u,
-                                       PerfSampleHelper* sh, TRAPS) {
-      return create_long_counter(ns, name, u, sh, THREAD);
-    }
-
     static void destroy();
     static bool has_PerfData() { return Atomic::load_acquire(&_has_PerfData); }
 };
diff --git a/src/hotspot/share/runtime/perfDataTypes.hpp b/src/hotspot/share/runtime/perfDataTypes.hpp
index e619ef78a5f..9928975b8e2 100644
--- a/src/hotspot/share/runtime/perfDataTypes.hpp
+++ b/src/hotspot/share/runtime/perfDataTypes.hpp
@@ -31,13 +31,11 @@
 // To reduce HotSpot build time, if you just need to declare a pointer to the
 // following types, include this file instead of perfData.hpp.
 
-class PerfLongSampleHelper;
 class PerfLongConstant;
 class PerfLongCounter;
 class PerfLongVariable;
 class PerfStringVariable;
 
-typedef PerfLongSampleHelper PerfSampleHelper;
 typedef PerfLongConstant PerfConstant;
 typedef PerfLongCounter PerfCounter;
 typedef PerfLongVariable PerfVariable;
diff --git a/src/hotspot/share/runtime/perfMemory.cpp b/src/hotspot/share/runtime/perfMemory.cpp
index 5b44c56261d..1122aa8da47 100644
--- a/src/hotspot/share/runtime/perfMemory.cpp
+++ b/src/hotspot/share/runtime/perfMemory.cpp
@@ -34,7 +34,6 @@
 #include "runtime/perfData.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/safepoint.hpp"
-#include "runtime/statSampler.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -66,16 +65,16 @@ void perfMemory_exit() {
   if (!UsePerfData) return;
   if (!PerfMemory::is_usable()) return;
 
-  // Only destroy PerfData objects if we're at a safepoint and the
-  // StatSampler is not active. Otherwise, we risk removing PerfData
-  // objects that are currently being used by running JavaThreads
-  // or the StatSampler. This method is invoked while we are not at
+  // Only destroy PerfData objects if we're at a safepoint.
+  // Otherwise, we risk removing PerfData objects
+  // that are currently being used by running JavaThreads.
+  // This method is invoked while we are not at
   // a safepoint during a VM abort so leaving the PerfData objects
   // around may also help diagnose the failure. In rare cases,
   // PerfData objects are used in parallel with a safepoint. See
   // the work around in PerfDataManager::destroy().
   //
-  if (SafepointSynchronize::is_at_safepoint() && !StatSampler::is_active()) {
+  if (SafepointSynchronize::is_at_safepoint()) {
     PerfDataManager::destroy();
   }
 
diff --git a/src/hotspot/share/runtime/statSampler.cpp b/src/hotspot/share/runtime/statSampler.cpp
deleted file mode 100644
index acae27944b0..00000000000
--- a/src/hotspot/share/runtime/statSampler.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * 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.
- *
- */
-
-#include "classfile/javaClasses.hpp"
-#include "classfile/vmClasses.hpp"
-#include "classfile/vmSymbols.hpp"
-#include "memory/allocation.inline.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/arguments.hpp"
-#include "runtime/java.hpp"
-#include "runtime/javaCalls.hpp"
-#include "runtime/os.hpp"
-#include "runtime/perfData.inline.hpp"
-#include "runtime/statSampler.hpp"
-#include "runtime/vm_version.hpp"
-
-// --------------------------------------------------------
-// StatSamplerTask
-
-class StatSamplerTask : public PeriodicTask {
-  public:
-    StatSamplerTask(int interval_time) : PeriodicTask(interval_time) {}
-    void task() { StatSampler::collect_sample(); }
-};
-
-
-//----------------------------------------------------------
-// Implementation of StatSampler
-
-StatSamplerTask*              StatSampler::_task   = nullptr;
-PerfDataList*                 StatSampler::_sampled = nullptr;
-
-/*
- * the initialize method is called from the engage() method
- * and is responsible for initializing various global variables.
- */
-void StatSampler::initialize() {
-
-  if (!UsePerfData) return;
-
-  // create performance data that could not be created prior
-  // to vm_init_globals() or otherwise have no logical home.
-
-  create_misc_perfdata();
-
-  // get copy of the sampled list
-  _sampled = PerfDataManager::sampled();
-
-}
-
-/*
- * The engage() method is called at initialization time via
- * Thread::create_vm() to initialize the StatSampler and
- * register it with the WatcherThread as a periodic task.
- */
-void StatSampler::engage() {
-
-  if (!UsePerfData) return;
-
-  if (!is_active()) {
-
-    initialize();
-
-    // start up the periodic task
-    _task = new StatSamplerTask(PerfDataSamplingInterval);
-    _task->enroll();
-  }
-}
-
-
-/*
- * the disengage() method is responsible for deactivating the periodic
- * task and, if logging was enabled, for logging the final sample. This
- * method is called from before_exit() in java.cpp and is only called
- * after the WatcherThread has been stopped.
- */
-void StatSampler::disengage() {
-
-  if (!UsePerfData) return;
-
-  if (!is_active())
-    return;
-
-  // remove StatSamplerTask
-  _task->disenroll();
-  delete _task;
-  _task = nullptr;
-
-  // force a final sample
-  sample_data(_sampled);
-}
-
-/*
- * the destroy method is responsible for releasing any resources used by
- * the StatSampler prior to shutdown of the VM. this method is called from
- * before_exit() in java.cpp and is only called after the WatcherThread
- * has stopped.
- */
-void StatSampler::destroy() {
-
-  if (!UsePerfData) return;
-
-  if (_sampled != nullptr) {
-    delete(_sampled);
-    _sampled = nullptr;
-  }
-}
-
-/*
- * The sample_data() method is responsible for sampling the
- * the data value for each PerfData instance in the given list.
- */
-void StatSampler::sample_data(PerfDataList* list) {
-
-  assert(list != nullptr, "null list unexpected");
-
-  for (int index = 0; index < list->length(); index++) {
-    PerfData* item = list->at(index);
-    item->sample();
-  }
-}
-
-/*
- * the collect_sample() method is the method invoked by the
- * WatcherThread via the PeriodicTask::task() method. This method
- * is responsible for collecting data samples from sampled
- * PerfData instances every PerfDataSamplingInterval milliseconds.
- * It is also responsible for logging the requested set of
- * PerfData instances every _sample_count milliseconds. While
- * logging data, it will output a column header after every _print_header
- * rows of data have been logged.
- */
-void StatSampler::collect_sample() {
-
-  // future - check for new PerfData objects. PerfData objects might
-  // get added to the PerfDataManager lists after we have already
-  // built our local copies.
-  //
-  // if (PerfDataManager::count() > previous) {
-  //   // get a new copy of the sampled list
-  //   if (_sampled != nullptr) {
-  //     delete(_sampled);
-  //     _sampled = nullptr;
-  //   }
-  //   _sampled = PerfDataManager::sampled();
-  // }
-
-  assert(_sampled != nullptr, "list not initialized");
-
-  sample_data(_sampled);
-}
-
-/*
- * Call into java.lang.System.getProperty to check that the value of the
- * specified property matches
- */
-void StatSampler::assert_system_property(const char* name, const char* value, TRAPS) {
-#ifdef ASSERT
-  ResourceMark rm(THREAD);
-
-  // setup the arguments to getProperty
-  Handle key_str   = java_lang_String::create_from_str(name, CHECK);
-
-  // return value
-  JavaValue result(T_OBJECT);
-
-  // public static String getProperty(String key, String def);
-  JavaCalls::call_static(&result,
-                         vmClasses::System_klass(),
-                         vmSymbols::getProperty_name(),
-                         vmSymbols::string_string_signature(),
-                         key_str,
-                         CHECK);
-
-  oop value_oop = result.get_oop();
-  assert(value_oop != nullptr, "property must have a value");
-
-  // convert Java String to utf8 string
-  char* system_value = java_lang_String::as_utf8_string(value_oop);
-
-  assert(strcmp(value, system_value) == 0, "property value mustn't differ from System.getProperty. Our value is: %s, System.getProperty is: %s",
-         value, system_value);
-#endif // ASSERT
-}
-
-/*
- * Adds a constant counter of the given property. Asserts the value does not
- * differ from the value retrievable from System.getProperty(name)
- */
-void StatSampler::add_property_constant(CounterNS name_space, const char* name, const char* value, TRAPS) {
-  // the property must exist
-  assert(value != nullptr, "property name should be have a value: %s", name);
-  assert_system_property(name, value, CHECK);
-  if (value != nullptr) {
-    // create the property counter
-    PerfDataManager::create_string_constant(name_space, name, value, CHECK);
-  }
-}
-
-/*
- * Adds a string constant of the given property. Retrieves the value via
- * Arguments::get_property() and asserts the value for the does not differ from
- * the value retrievable from System.getProperty()
- */
-void StatSampler::add_property_constant(CounterNS name_space, const char* name, TRAPS) {
-  add_property_constant(name_space, name, Arguments::get_property(name), CHECK);
-}
-
-/*
- * Adds a string constant of the given property. Retrieves the value via
- * Arguments::get_property() and asserts the value for the does not differ from
- * the value retrievable from System.getProperty()
- */
-void StatSampler::add_optional_property_constant(CounterNS name_space, const char* name, TRAPS) {
-  const char* value = Arguments::get_property(name);
-
-  if (value != nullptr) {
-    add_property_constant(name_space, name, value, CHECK);
-  }
-}
-
-/*
- * Method to create PerfStringConstants containing the values of various
- * system properties. Constants are created from information known to HotSpot,
- * but are initialized as-if getting the values from System.getProperty()
- * during bootstrap.
- *
- * Property counters have a counter name space prefix prepended to the
- * property name.
- */
-void StatSampler::create_system_property_instrumentation(TRAPS) {
-
-  // Non-writeable, constant properties
-  add_property_constant(JAVA_PROPERTY, "java.vm.specification.name", "Java Virtual Machine Specification", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.version", JDK_Version::java_version(), CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.vm.version", VM_Version::vm_release(), CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.vm.name", VM_Version::vm_name(), CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.vm.vendor", VM_Version::vm_vendor(), CHECK);
-  add_property_constant(JAVA_PROPERTY, "jdk.debug", VM_Version::jdk_debug_level(), CHECK);
-
-  // Get remaining property constants via Arguments::get_property,
-  // which does a linear search over the internal system properties list.
-
-  // SUN_PROPERTY properties
-  add_property_constant(SUN_PROPERTY, "sun.boot.library.path", CHECK);
-
-  // JAVA_PROPERTY properties
-  add_property_constant(JAVA_PROPERTY, "java.vm.specification.version", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.vm.specification.vendor", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.vm.info", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.library.path", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.class.path", CHECK);
-  add_property_constant(JAVA_PROPERTY, "java.home", CHECK);
-
-  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.path", CHECK);
-  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.upgrade.path", CHECK);
-  add_optional_property_constant(JAVA_PROPERTY, "jdk.module.main", CHECK);
-}
-
-/*
- * The create_misc_perfdata() method provides a place to create
- * PerfData instances that would otherwise have no better place
- * to exist.
- */
-void StatSampler::create_misc_perfdata() {
-
-  ResourceMark rm;
-  EXCEPTION_MARK;
-
-  // numeric constants
-
-  // frequency of the native high resolution timer
-  PerfDataManager::create_constant(SUN_OS, "hrt.frequency",
-                                   PerfData::U_Hertz, os::elapsed_frequency(),
-                                   CHECK);
-
-  // string constants
-
-  // create string instrumentation for various Java properties.
-  create_system_property_instrumentation(CHECK);
-
-  // HotSpot flags (from .hotspotrc) and args (from command line)
-  //
-  PerfDataManager::create_string_constant(JAVA_RT, "vmFlags",
-                                          Arguments::jvm_flags(), CHECK);
-  PerfDataManager::create_string_constant(JAVA_RT, "vmArgs",
-                                          Arguments::jvm_args(), CHECK);
-
-  // java class name/jar file and arguments to main class
-  // note: name is coordinated with launcher and Arguments.cpp
-  PerfDataManager::create_string_constant(SUN_RT, "javaCommand",
-                                          Arguments::java_command(), CHECK);
-
-  // the Java VM Internal version string
-  PerfDataManager::create_string_constant(SUN_RT, "internalVersion",
-                                         VM_Version::internal_vm_info_string(),
-                                         CHECK);
-
-  // create sampled instrumentation objects
-  create_sampled_perfdata();
-}
-
-/*
- * helper class to provide for sampling of the elapsed_counter value
- * maintained in the OS class.
- */
-class HighResTimeSampler : public PerfSampleHelper {
-  public:
-    jlong take_sample() { return os::elapsed_counter(); }
-};
-
-/*
- * the create_sampled_perdata() method provides a place to instantiate
- * sampled PerfData instances that would otherwise have no better place
- * to exist.
- */
-void StatSampler::create_sampled_perfdata() {
-
-  EXCEPTION_MARK;
-
-  // setup sampling of the elapsed time counter maintained in the
-  // the os class. This counter can be used as either a time stamp
-  // for each logged entry or as a liveness indicator for the VM.
-  PerfSampleHelper* psh = new HighResTimeSampler();
-  PerfDataManager::create_counter(SUN_OS, "hrt.ticks",
-                                  PerfData::U_Ticks, psh, CHECK);
-}
diff --git a/src/hotspot/share/runtime/statSampler.hpp b/src/hotspot/share/runtime/statSampler.hpp
deleted file mode 100644
index b42700caffa..00000000000
--- a/src/hotspot/share/runtime/statSampler.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_RUNTIME_STATSAMPLER_HPP
-#define SHARE_RUNTIME_STATSAMPLER_HPP
-
-#include "runtime/perfData.hpp"
-#include "runtime/task.hpp"
-
-class StatSamplerTask;
-
-/*
- * The StatSampler class is responsible for periodically updating
- * sampled PerfData instances and writing the sampled values to the
- * PerfData memory region.
- *
- * In addition it is also responsible for providing a home for
- * PerfData instances that otherwise have no better home.
- */
-class StatSampler : AllStatic {
-
-  friend class StatSamplerTask;
-
-  private:
-
-    static StatSamplerTask* _task;
-    static PerfDataList* _sampled;
-
-    static void collect_sample();
-    static void create_misc_perfdata();
-    static void create_sampled_perfdata();
-    static void sample_data(PerfDataList* list);
-    static void assert_system_property(const char* name, const char* value, TRAPS);
-    static void add_property_constant(CounterNS name_space, const char* name, TRAPS);
-    static void add_optional_property_constant(CounterNS name_space, const char* name, TRAPS);
-    static void add_property_constant(CounterNS name_space, const char* name, const char* value, TRAPS);
-    static void create_system_property_instrumentation(TRAPS);
-
-  public:
-    // Start/stop the sampler
-    static void engage();
-    static void disengage();
-
-    static bool is_active() { return _task != nullptr; }
-
-    static void initialize();
-    static void destroy();
-};
-
-#endif // SHARE_RUNTIME_STATSAMPLER_HPP
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index aac827246d2..fef868e90ff 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -82,13 +82,13 @@
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/osThread.hpp"
+#include "runtime/perfData.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/serviceThread.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stackWatermarkSet.inline.hpp"
-#include "runtime/statSampler.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.inline.hpp"
@@ -852,7 +852,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   }
 #endif // INCLUDE_MANAGEMENT
 
-  StatSampler::engage();
+  if (UsePerfData)         PerfDataManager::create_misc_perfdata();
   if (CheckJNICalls)                  JniPeriodicChecker::engage();
 
   call_postVMInitHook(THREAD);
@@ -906,7 +906,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
 //   + Call before_exit(), prepare for VM exit
 //      > run VM level shutdown hooks (they are registered through JVM_OnExit(),
 //        currently the only user of this mechanism is File.deleteOnExit())
-//      > stop StatSampler, watcher thread,
+//      > stop watcher thread,
 //        post thread end and vm death events to JVMTI,
 //        stop signal thread
 //   + Call JavaThread::exit(), it will:
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
index 35582943c3d..ba02e792f3e 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java
@@ -244,11 +244,9 @@ protected void buildPseudoMonitors(Map<String, Monitor> map) {
      * Method to provide a gross level of synchronization with the
      * target monitored jvm.
      *
-     * gross synchronization works by polling for the hotspot.rt.hrt.ticks
-     * counter, which is the last counter created by the StatSampler
-     * initialization code. The counter is updated when the watcher thread
-     * starts scheduling tasks, which is the last thing done in vm
-     * initialization.
+     * gross synchronization works by polling for the hotspot.rt.hrt.frequency
+     * constant, which is created by the PerfData initialization code. The
+     * creation of constants is one of the last things done in vm initialization.
      */
     protected void synchWithTarget(Map<String, Monitor> map) throws MonitorException {
         /*
@@ -258,7 +256,7 @@ protected void synchWithTarget(Map<String, Monitor> map) throws MonitorException
          */
         long timeLimit = System.currentTimeMillis() + syncWaitMs;
 
-        String name = "hotspot.rt.hrt.ticks";
+        String name = "hotspot.rt.hrt.frequency";
         LongMonitor ticks = (LongMonitor)pollFor(map, name, timeLimit);
 
         /*
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
index ecc752e8014..e19521c83a9 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
@@ -541,8 +541,6 @@ alias sun.gc.tlab.refillWaste                     // 17
 // sun.os
 alias sun.os.hrt.frequency                        // 1.5.0 b39
 	hotspot.rt.hrt.frequency                  // 1.4.1
-alias sun.os.hrt.ticks                            // 1.5.0 b39
-	hotspot.rt.hrt.ticks                      // 1.4.1
 
 // sun.perfdata
 alias sun.perfdata.overflow                       // 1.5.0 b39
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
index c49cdf55502..860fd832197 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionExecuter.java
@@ -61,6 +61,10 @@ public Object evaluate(Expression e) {
             return ((Literal)e).getValue();
         }
 
+        if (e instanceof Timestamp) {
+            return ((Timestamp)e).getValue();
+        }
+
         if (e instanceof Identifier) {
             Identifier id = (Identifier)e;
             if (map.containsKey(id.getName())) {
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
index 98602df2207..f0e1bc371e3 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/ExpressionResolver.java
@@ -87,7 +87,7 @@ public Object evaluate(Expression e) throws MonitorException {
             return id;
         }
 
-        if (e instanceof Literal) {
+        if (e instanceof Literal || e instanceof Timestamp) {
             return e;
         }
 
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
index da0827c185d..cf1790d65e6 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/Parser.java
@@ -222,6 +222,13 @@ private boolean isReservedWord(String word) {
         return reservedWords.contains(word);
     }
 
+    /**
+     * determine if the given word is the timestamp key word
+     */
+    private boolean isTimestamp(String word) {
+        return word.equals("jstat.timestamp");
+    }
+
     /**
      * determine if the give work is a reserved key word
      */
@@ -297,7 +304,7 @@ private void formatStmt(ColumnFormat cf)
     }
 
     /**
-     *  Primary -> Literal | Identifier | '(' Expression ')'
+     *  Primary -> Literal | Timestamp | Identifier | '(' Expression ')'
      */
     private Expression primary() throws ParserException, IOException {
         Expression e = null;
@@ -315,7 +322,7 @@ private Expression primary() throws ParserException, IOException {
                                           "Reserved Word: " + lookahead.sval);
             }
             matchID();
-            e = new Identifier(s);
+            e = isTimestamp(s) ? new Timestamp() : new Identifier(s);
             log(pdebug, "Parsed: ID -> " + s);
             break;
         case StreamTokenizer.TT_NUMBER:
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/Timestamp.java b/src/jdk.jcmd/share/classes/sun/tools/jstat/Timestamp.java
new file mode 100644
index 00000000000..8d96fab5c00
--- /dev/null
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/Timestamp.java
@@ -0,0 +1,41 @@
+/*
+ * 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.tools.jstat;
+
+public class Timestamp extends Expression {
+
+    public Timestamp() {
+        super();
+    }
+
+    public Object getValue() {
+        return System.currentTimeMillis();
+    }
+
+    public String toString() {
+        return "jstat.timestamp";
+    }
+}
diff --git a/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
index 7fe7487e11a..6bf67b9bdc4 100644
--- a/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
+++ b/src/jdk.jcmd/share/classes/sun/tools/jstat/resources/jstat_options
@@ -26,7 +26,7 @@
 option timestamp {
   column {
     header "^Timestamp"
-    data (sun.os.hrt.ticks/sun.os.hrt.frequency)
+    data ((jstat.timestamp - sun.rt.createVmBeginTime) / 1000)
     scale sec
     align right
     width 15

From c9e6c4d0171ff6f419344f9341747c71416d4ec9 Mon Sep 17 00:00:00 2001
From: Fabio Romano <fabio19298@gmail.com>
Date: Wed, 28 May 2025 12:48:47 +0000
Subject: [PATCH 686/901] 8356891: Some code simplifications in BigInteger

Reviewed-by: rgiulietti
---
 .../share/classes/java/math/BigInteger.java   | 258 +++++++-----------
 1 file changed, 105 insertions(+), 153 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index b0a7f784aab..a6ce483f3eb 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -203,12 +203,13 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
     private int bitCountPlusOne;
 
     /**
-     * One plus the bitLength of this BigInteger. This is a stable variable.
+     * One plus the bitLength of the magnitude of this BigInteger.
+     * This is a stable variable.
      * (either value is acceptable).
      *
-     * @see #bitLength()
+     * @see #magBitLength()
      */
-    private int bitLengthPlusOne;
+    private int magBitLengthPlusOne;
 
     /**
      * Two plus the lowest set bit of this BigInteger. This is a stable variable.
@@ -223,11 +224,9 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
      * least significant int has int-number 0, the next int in order of
      * increasing significance has int-number 1, and so forth.
      *
-     * <p>Note: never used for a BigInteger with a magnitude of zero.
-     *
-     * @see #firstNonzeroIntNum()
+     * @see #numberOfTrailingZeroInts()
      */
-    private int firstNonzeroIntNumPlusTwo;
+    private int numberOfTrailingZeroIntsPlusTwo;
 
     /**
      * This mask is used to obtain the value of an int as if it were unsigned.
@@ -490,7 +489,7 @@ public BigInteger(int signum, byte[] magnitude) {
      * unchanged for the duration of the constructor call.
      */
     private BigInteger(int signum, int[] magnitude) {
-        this.mag = stripLeadingZeroInts(magnitude);
+        this.mag = stripLeadingZeroInts(magnitude, false);
 
         if (signum < -1 || signum > 1)
             throw(new NumberFormatException("Invalid signum value"));
@@ -841,7 +840,7 @@ public static BigInteger probablePrime(int bitLength, Random rnd) {
     private static BigInteger smallPrime(int bitLength, int certainty, Random rnd) {
         int magLen = (bitLength + 31) >>> 5;
         int temp[] = new int[magLen];
-        int highBit = 1 << ((bitLength+31) & 0x1f);  // High bit of high int
+        int highBit = 1 << (bitLength - 1);  // High bit of high int
         int highMask = (highBit << 1) - 1;  // Bits to keep in high int
 
         while (true) {
@@ -885,7 +884,7 @@ private static BigInteger smallPrime(int bitLength, int certainty, Random rnd) {
     private static BigInteger largePrime(int bitLength, int certainty, Random rnd) {
         BigInteger p;
         p = new BigInteger(bitLength, rnd).setBit(bitLength-1);
-        p.mag[p.mag.length-1] &= 0xfffffffe;
+        p.mag[p.mag.length-1] &= ~1;
 
         // Use a sieve length likely to contain the next prime number
         int searchLen = getPrimeSearchLen(bitLength);
@@ -896,7 +895,7 @@ private static BigInteger largePrime(int bitLength, int certainty, Random rnd) {
             p = p.add(BigInteger.valueOf(2*searchLen));
             if (p.bitLength() != bitLength)
                 p = new BigInteger(bitLength, rnd).setBit(bitLength-1);
-            p.mag[p.mag.length-1] &= 0xfffffffe;
+            p.mag[p.mag.length-1] &= ~1;
             searchSieve = new BitSieve(p, searchLen);
             candidate = searchSieve.retrieve(p, certainty, rnd);
         }
@@ -1756,9 +1755,8 @@ private BigInteger multiply(BigInteger val, boolean isRecursion, boolean paralle
                     // are only considering the magnitudes as non-negative. The
                     // Toom-Cook multiplication algorithm determines the sign
                     // at its end from the two signum values.
-                    if ((long)bitLength(mag, mag.length) +
-                        (long)bitLength(val.mag, val.mag.length) >
-                        32L*MAX_MAG_LENGTH) {
+                    if ((long) this.magBitLength() + val.magBitLength() >
+                        (long) Integer.SIZE * MAX_MAG_LENGTH) {
                         reportOverflow();
                     }
                 }
@@ -1769,7 +1767,7 @@ private BigInteger multiply(BigInteger val, boolean isRecursion, boolean paralle
     }
 
     private static BigInteger multiplyByInt(int[] x, int y, int sign) {
-        if (Integer.bitCount(y) == 1) {
+        if (Integer.lowestOneBit(y) == y) {
             return new BigInteger(shiftLeft(x,Integer.numberOfTrailingZeros(y)), sign);
         }
         int xlen = x.length;
@@ -2271,7 +2269,7 @@ private BigInteger square(boolean isRecursion, boolean parallel, int depth) {
                 // For a discussion of overflow detection see multiply()
                 //
                 if (!isRecursion) {
-                    if (bitLength(mag, mag.length) > 16L*MAX_MAG_LENGTH) {
+                    if (magBitLength() > (Integer.SIZE / 2) * MAX_MAG_LENGTH) {
                         reportOverflow();
                     }
                 }
@@ -2640,8 +2638,8 @@ public BigInteger pow(int exponent) {
                     ? new BigInteger(result << bitsToShift, newSign)
                     : new BigInteger(result, newSign).shiftLeft(bitsToShift);
         }
-
-        if ((bitLength() - 1L) * exponent >= Integer.MAX_VALUE) {
+        // (magBitLength() - 1L) * exponent + 1L > Integer.MAX_VALUE
+        if (scaleFactor + bitsToShift - exponent >= Integer.MAX_VALUE) {
             reportOverflow();
         }
 
@@ -2824,13 +2822,16 @@ static void primitiveLeftShift(int[] a, int len, int n) {
     }
 
     /**
-     * Calculate bitlength of contents of the first len elements an int array,
-     * assuming there are no leading zero ints.
+     * Calculate bitlength of the magnitude of this {@code BigInteger}.
      */
-    private static int bitLength(int[] val, int len) {
-        if (len == 0)
-            return 0;
-        return ((len - 1) << 5) + bitLengthForInt(val[0]);
+    private int magBitLength() {
+        int n = magBitLengthPlusOne - 1;
+        if (n == -1) { // not initialized
+            n = mag.length == 0 ? 0
+                    : mag.length * Integer.SIZE - Integer.numberOfLeadingZeros(mag[0]);
+            magBitLengthPlusOne = n + 1;
+        }
+        return n;
     }
 
     /**
@@ -3127,7 +3128,7 @@ private BigInteger oddModPow(BigInteger y, BigInteger z) {
 
         // Select an appropriate window size
         int wbits = 0;
-        int ebits = bitLength(exp, exp.length);
+        int ebits = y.magBitLength();
         // if exponent is 65537 (0x10001), use minimum window size
         if ((ebits != 17) || (exp[0] != 65537)) {
             while (ebits > bnExpModThreshTable[wbits]) {
@@ -3180,7 +3181,7 @@ private BigInteger oddModPow(BigInteger y, BigInteger z) {
         }
 
         // Pre load the window that slides over the exponent
-        int bitpos = 1 << ((ebits-1) & (32-1));
+        int bitpos = 1 << ((ebits-1) & 0x1f);
 
         int buf = 0;
         int elen = exp.length;
@@ -3190,7 +3191,7 @@ private BigInteger oddModPow(BigInteger y, BigInteger z) {
             bitpos >>>= 1;
             if (bitpos == 0) {
                 eIndex++;
-                bitpos = 1 << (32-1);
+                bitpos = 1 << 0x1f;
                 elen--;
             }
         }
@@ -3224,7 +3225,7 @@ private BigInteger oddModPow(BigInteger y, BigInteger z) {
                 bitpos >>>= 1;
                 if (bitpos == 0) {
                     eIndex++;
-                    bitpos = 1 << (32-1);
+                    bitpos = 1 << 0x1f;
                     elen--;
                 }
             }
@@ -3613,14 +3614,11 @@ private BigInteger shiftRightImpl(int n) {
 
         if (signum < 0) {
             // Find out whether any one-bits were shifted off the end.
-            boolean onesLost = false;
-            for (int i=magLen-1, j=magLen-nInts; i >= j && !onesLost; i--)
-                onesLost = (mag[i] != 0);
-            if (!onesLost && nBits != 0)
-                onesLost = (mag[magLen - nInts - 1] << (32 - nBits) != 0);
-
-            if (onesLost)
+            int nzInts = numberOfTrailingZeroInts();
+            if (nInts > nzInts || nInts == nzInts
+                    && (mag[magLen - nzInts - 1] & ((1 << nBits) - 1)) != 0) {
                 newMag = javaIncrement(newMag);
+            }
         }
 
         return new BigInteger(newMag, signum);
@@ -3637,7 +3635,7 @@ private static void shiftRightImplWorker(int[] newArr, int[] oldArr, int newIdx,
         }
     }
 
-    int[] javaIncrement(int[] val) {
+    static int[] javaIncrement(int[] val) {
         int lastSum = 0;
         for (int i=val.length-1;  i >= 0 && lastSum == 0; i--)
             lastSum = (val[i] += 1);
@@ -3750,7 +3748,7 @@ public boolean testBit(int n) {
         if (n < 0)
             throw new ArithmeticException("Negative bit address");
 
-        return (getInt(n >>> 5) & (1 << (n & 31))) != 0;
+        return (getInt(n >>> 5) & (1 << (n & 0x1f))) != 0;
     }
 
     /**
@@ -3771,7 +3769,7 @@ public BigInteger setBit(int n) {
         for (int i=0; i < result.length; i++)
             result[result.length-i-1] = getInt(i);
 
-        result[result.length-intNum-1] |= (1 << (n & 31));
+        result[result.length-intNum-1] |= (1 << (n & 0x1f));
 
         return valueOf(result);
     }
@@ -3795,7 +3793,7 @@ public BigInteger clearBit(int n) {
         for (int i=0; i < result.length; i++)
             result[result.length-i-1] = getInt(i);
 
-        result[result.length-intNum-1] &= ~(1 << (n & 31));
+        result[result.length-intNum-1] &= ~(1 << (n & 0x1f));
 
         return valueOf(result);
     }
@@ -3819,7 +3817,7 @@ public BigInteger flipBit(int n) {
         for (int i=0; i < result.length; i++)
             result[result.length-i-1] = getInt(i);
 
-        result[result.length-intNum-1] ^= (1 << (n & 31));
+        result[result.length-intNum-1] ^= (1 << (n & 0x1f));
 
         return valueOf(result);
     }
@@ -3835,15 +3833,11 @@ public BigInteger flipBit(int n) {
     public int getLowestSetBit() {
         int lsb = lowestSetBitPlusTwo - 2;
         if (lsb == -2) {  // lowestSetBit not initialized yet
-            lsb = 0;
             if (signum == 0) {
-                lsb -= 1;
+                lsb = -1;
             } else {
-                // Search for lowest order nonzero int
-                int i,b;
-                for (i=0; (b = getInt(i)) == 0; i++)
-                    ;
-                lsb += (i << 5) + Integer.numberOfTrailingZeros(b);
+                int tz = numberOfTrailingZeroInts();
+                lsb = tz * Integer.SIZE + Integer.numberOfTrailingZeros(mag[mag.length - 1 - tz]);
             }
             lowestSetBitPlusTwo = lsb + 2;
         }
@@ -3864,29 +3858,11 @@ public int getLowestSetBit() {
      *         representation of this BigInteger, <em>excluding</em> a sign bit.
      */
     public int bitLength() {
-        int n = bitLengthPlusOne - 1;
-        if (n == -1) { // bitLength not initialized yet
-            int[] m = mag;
-            int len = m.length;
-            if (len == 0) {
-                n = 0; // offset by one to initialize
-            }  else {
-                // Calculate the bit length of the magnitude
-                int magBitLength = ((len - 1) << 5) + bitLengthForInt(mag[0]);
-                 if (signum < 0) {
-                     // Check if magnitude is a power of two
-                     boolean pow2 = (Integer.bitCount(mag[0]) == 1);
-                     for (int i=1; i< len && pow2; i++)
-                         pow2 = (mag[i] == 0);
-
-                     n = (pow2 ? magBitLength - 1 : magBitLength);
-                 } else {
-                     n = magBitLength;
-                 }
-            }
-            bitLengthPlusOne = n + 1;
-        }
-        return n;
+        return signum < 0
+                // Check if magnitude is a power of two
+                && Integer.lowestOneBit(mag[0]) == mag[0]
+                && numberOfTrailingZeroInts() == mag.length - 1
+            ? magBitLength() - 1 : magBitLength();
     }
 
     /**
@@ -3901,17 +3877,15 @@ public int bitCount() {
         int bc = bitCountPlusOne - 1;
         if (bc == -1) {  // bitCount not initialized yet
             bc = 0;      // offset by one to initialize
+
+            final int firstZeroInt = mag.length - numberOfTrailingZeroInts();
             // Count the bits in the magnitude
-            for (int i=0; i < mag.length; i++)
+            for (int i = 0; i < firstZeroInt; i++)
                 bc += Integer.bitCount(mag[i]);
-            if (signum < 0) {
-                // Count the trailing zeros in the magnitude
-                int magTrailingZeroCount = 0, j;
-                for (j=mag.length-1; mag[j] == 0; j--)
-                    magTrailingZeroCount += 32;
-                magTrailingZeroCount += Integer.numberOfTrailingZeros(mag[j]);
-                bc += magTrailingZeroCount - 1;
-            }
+
+            if (signum < 0)
+                bc += getLowestSetBit() - 1; // Count the trailing zeros
+
             bitCountPlusOne = bc + 1;
         }
         return bc;
@@ -4333,10 +4307,9 @@ public String toString() {
      * @see    #BigInteger(byte[])
      */
     public byte[] toByteArray() {
-        int byteLen = bitLength()/8 + 1;
-        byte[] byteArray = new byte[byteLen];
+        byte[] byteArray = new byte[(bitLength() >>> 3) + 1];
 
-        for (int i=byteLen-1, bytesCopied=4, nextInt=0, intIndex=0; i >= 0; i--) {
+        for (int i=byteArray.length-1, bytesCopied=4, nextInt=0, intIndex=0; i >= 0; i--) {
             if (bytesCopied == 4) {
                 nextInt = getInt(intIndex++);
                 bytesCopied = 1;
@@ -4366,9 +4339,7 @@ public byte[] toByteArray() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
     public int intValue() {
-        int result = 0;
-        result = getInt(0);
-        return result;
+        return getInt(0);
     }
 
     /**
@@ -4388,11 +4359,7 @@ public int intValue() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
     public long longValue() {
-        long result = 0;
-
-        for (int i=1; i >= 0; i--)
-            result = (result << 32) + (getInt(i) & LONG_MASK);
-        return result;
+        return ((long) getInt(1) << Integer.SIZE) | (getInt(0) & LONG_MASK);
     }
 
     /**
@@ -4416,7 +4383,7 @@ public float floatValue() {
             return 0.0f;
         }
 
-        int exponent = ((mag.length - 1) << 5) + bitLengthForInt(mag[0]) - 1;
+        int exponent = magBitLength() - 1;
 
         // exponent == floor(log2(abs(this)))
         if (exponent < Long.SIZE - 1) {
@@ -4501,7 +4468,7 @@ public double doubleValue() {
             return 0.0;
         }
 
-        int exponent = ((mag.length - 1) << 5) + bitLengthForInt(mag[0]) - 1;
+        int exponent = magBitLength() - 1;
 
         // exponent == floor(log2(abs(this))Double)
         if (exponent < Long.SIZE - 1) {
@@ -4574,30 +4541,24 @@ public double doubleValue() {
     }
 
     /**
-     * Returns a copy of the input array stripped of any leading zero bytes.
+     * Returns the input array stripped of any leading zero ints.
+     * If the source is trusted the copying may be skipped.
      */
-    private static int[] stripLeadingZeroInts(int[] val) {
-        int vlen = val.length;
+    private static int[] stripLeadingZeroInts(int[] val, boolean trusted) {
         int keep;
 
-        // Find first nonzero byte
-        for (keep = 0; keep < vlen && val[keep] == 0; keep++)
+        // Find first nonzero int
+        for (keep = 0; keep < val.length && val[keep] == 0; keep++)
             ;
-        return Arrays.copyOfRange(val, keep, vlen);
+        return trusted && keep == 0 ? val : Arrays.copyOfRange(val, keep, val.length);
     }
 
     /**
-     * Returns the input array stripped of any leading zero bytes.
+     * Returns the input array stripped of any leading zero ints.
      * Since the source is trusted the copying may be skipped.
      */
     private static int[] trustedStripLeadingZeroInts(int[] val) {
-        int vlen = val.length;
-        int keep;
-
-        // Find first nonzero byte
-        for (keep = 0; keep < vlen && val[keep] == 0; keep++)
-            ;
-        return keep == 0 ? val : Arrays.copyOfRange(val, keep, vlen);
+        return stripLeadingZeroInts(val, true);
     }
 
     private static int[] stripLeadingZeroBytes(byte[] a, int from, int len) {
@@ -4768,7 +4729,7 @@ private static int[] makePositive(int b, byte[] a, int from, int len) {
      * returns the minimal (no leading zero ints) unsigned whose value is -a.
      */
     private static int[] makePositive(int[] a) {
-        int keep, j;
+        int keep, i;
 
         // Find first non-sign (0xffffffff) int of input
         for (keep=0; keep < a.length && a[keep] == -1; keep++)
@@ -4776,20 +4737,20 @@ private static int[] makePositive(int[] a) {
 
         /* Allocate output array.  If all non-sign ints are 0x00, we must
          * allocate space for one extra output int. */
-        for (j=keep; j < a.length && a[j] == 0; j++)
+        for (i = a.length - 1; a[i] == 0; i--) // Skip trailing zeros
             ;
-        int extraInt = (j == a.length ? 1 : 0);
-        int result[] = new int[a.length - keep + extraInt];
-
-        /* Copy one's complement of input into output, leaving extra
-         * int (if it exists) == 0x00 */
-        for (int i = keep; i < a.length; i++)
-            result[i - keep + extraInt] = ~a[i];
-
-        // Add one to one's complement to generate two's complement
-        for (int i=result.length-1; ++result[i] == 0; i--)
-            ;
-
+        int[] result;
+        if (i < keep) {
+            result = new int[a.length - keep + 1];
+            result[0] = 1;
+        } else { // Exists a non-sign int that is non-zero
+            result = new int[a.length - keep];
+            // Copy two's complement of input into output
+            result[i - keep] = -a[i];
+            i--;
+            for (; i >= keep; i--)
+                result[i - keep] = ~a[i];
+        }
         return result;
     }
 
@@ -4883,29 +4844,28 @@ private int getInt(int n) {
         int magInt = mag[mag.length-n-1];
 
         return (signum >= 0 ? magInt :
-                (n <= firstNonzeroIntNum() ? -magInt : ~magInt));
+                (n <= numberOfTrailingZeroInts() ? -magInt : ~magInt));
     }
 
     /**
      * Returns the index of the int that contains the first nonzero int in the
      * little-endian binary representation of the magnitude (int 0 is the
-     * least significant). If the magnitude is zero, return value is undefined.
+     * least significant). If the magnitude is zero, return value is zero.
      *
-     * <p>Note: never used for a BigInteger with a magnitude of zero.
      * @see #getInt
      */
-    private int firstNonzeroIntNum() {
-        int fn = firstNonzeroIntNumPlusTwo - 2;
-        if (fn == -2) { // firstNonzeroIntNum not initialized yet
+    private int numberOfTrailingZeroInts() {
+        int nz = numberOfTrailingZeroIntsPlusTwo - 2;
+        if (nz == -2) { // numberOfTrailingZeroInts not initialized yet
             // Search for the first nonzero int
             int i;
-            int mlen = mag.length;
-            for (i = mlen - 1; i >= 0 && mag[i] == 0; i--)
+            final int lowest = mag.length - 1;
+            for (i = lowest; i >= 0 && mag[i] == 0; i--)
                 ;
-            fn = mlen - i - 1;
-            firstNonzeroIntNumPlusTwo = fn + 2; // offset by two to initialize
+            nz = lowest - i;
+            numberOfTrailingZeroIntsPlusTwo = nz + 2; // offset by two to initialize
         }
-        return fn;
+        return nz;
     }
 
     /** use serialVersionUID from JDK 1.1. for interoperability */
@@ -5052,13 +5012,9 @@ private void writeObject(ObjectOutputStream s) throws IOException {
      * Returns the mag array as an array of bytes.
      */
     private byte[] magSerializedForm() {
-        int len = mag.length;
-
-        int bitLen = (len == 0 ? 0 : ((len - 1) << 5) + bitLengthForInt(mag[0]));
-        int byteLen = (bitLen + 7) >>> 3;
-        byte[] result = new byte[byteLen];
+        byte[] result = new byte[(magBitLength() + 7) >>> 3];
 
-        for (int i = byteLen - 1, bytesCopied = 4, intIndex = len - 1, nextInt = 0;
+        for (int i = result.length - 1, bytesCopied = 4, intIndex = mag.length - 1, nextInt = 0;
              i >= 0; i--) {
             if (bytesCopied == 4) {
                 nextInt = mag[intIndex--];
@@ -5085,10 +5041,10 @@ private byte[] magSerializedForm() {
      * @since  1.8
      */
     public long longValueExact() {
-        if (mag.length <= 2 && bitLength() <= 63)
+        if (mag.length <= 2 && bitLength() < Long.SIZE)
             return longValue();
-        else
-            throw new ArithmeticException("BigInteger out of long range");
+
+        throw new ArithmeticException("BigInteger out of long range");
     }
 
     /**
@@ -5104,10 +5060,10 @@ public long longValueExact() {
      * @since  1.8
      */
     public int intValueExact() {
-        if (mag.length <= 1 && bitLength() <= 31)
+        if (mag.length <= 1 && bitLength() < Integer.SIZE)
             return intValue();
-        else
-            throw new ArithmeticException("BigInteger out of int range");
+
+        throw new ArithmeticException("BigInteger out of int range");
     }
 
     /**
@@ -5123,11 +5079,9 @@ public int intValueExact() {
      * @since  1.8
      */
     public short shortValueExact() {
-        if (mag.length <= 1 && bitLength() <= 31) {
-            int value = intValue();
-            if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE)
-                return shortValue();
-        }
+        if (mag.length <= 1 && bitLength() < Short.SIZE)
+            return shortValue();
+
         throw new ArithmeticException("BigInteger out of short range");
     }
 
@@ -5144,11 +5098,9 @@ public short shortValueExact() {
      * @since  1.8
      */
     public byte byteValueExact() {
-        if (mag.length <= 1 && bitLength() <= 31) {
-            int value = intValue();
-            if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE)
-                return byteValue();
-        }
+        if (mag.length <= 1 && bitLength() < Byte.SIZE)
+            return byteValue();
+
         throw new ArithmeticException("BigInteger out of byte range");
     }
 }

From 4b9290af0a46bdf662735c24d00732a4c1601102 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Wed, 28 May 2025 13:26:15 +0000
Subject: [PATCH 687/901] 8356647: C2: Excessively strict assert in
 PhaseIdealLoop::do_unroll

Reviewed-by: chagedorn, epeter, dlong
---
 src/hotspot/share/opto/loopTransform.cpp      |  6 ++-
 src/hotspot/share/opto/loopnode.hpp           |  5 +-
 .../UnrollWideLoopHitsTooStrictAssert.java    | 50 +++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/UnrollWideLoopHitsTooStrictAssert.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 8ae1c6e6e92..58105afd9d5 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1907,6 +1907,8 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
         "odd trip count for maximally unroll");
     // Don't need to adjust limit for maximally unroll since trip count is even.
   } else if (loop_head->has_exact_trip_count() && init->is_Con()) {
+    // The trip count being exact means it has been set (using CountedLoopNode::set_exact_trip_count in compute_trip_count)
+    assert(old_trip_count < max_juint, "sanity");
     // Loop's limit is constant. Loop's init could be constant when pre-loop
     // become peeled iteration.
     jlong init_con = init->get_int();
@@ -1920,8 +1922,10 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
     int stride_m    = new_stride_con - (stride_con > 0 ? 1 : -1);
     jlong trip_count = (limit_con - init_con + stride_m)/new_stride_con;
     // New trip count should satisfy next conditions.
-    assert(trip_count > 0 && (julong)trip_count < (julong)max_juint/2, "sanity");
+    assert(trip_count > 0 && (julong)trip_count <= (julong)max_juint/2, "sanity");
     uint new_trip_count = (uint)trip_count;
+    // Since old_trip_count has been set to < max_juint (that is at most 2^32-2),
+    // new_trip_count is lower than or equal to 2^31-1 and the multiplication cannot overflow.
     adjust_min_trip = (old_trip_count != new_trip_count*2);
   }
 
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 84d8fc71f6b..0f87ed6763d 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -304,11 +304,14 @@ class CountedLoopNode : public BaseCountedLoopNode {
   void set_post_loop (CountedLoopNode *main) { assert(is_normal_loop(),""); _loop_flags |= Post; _main_idx = main->_idx; }
   void set_normal_loop(                    ) { _loop_flags &= ~PreMainPostFlagsMask; }
 
-  void set_trip_count(uint tc) { _trip_count = tc; }
+  // We use max_juint for the default value of _trip_count to signal it wasn't set.
+  // We shouldn't set _trip_count to max_juint explicitly.
+  void set_trip_count(uint tc) { assert(tc < max_juint, "Cannot set trip count to max_juint"); _trip_count = tc; }
   uint trip_count()            { return _trip_count; }
 
   bool has_exact_trip_count() const { return (_loop_flags & HasExactTripCount) != 0; }
   void set_exact_trip_count(uint tc) {
+    assert(tc < max_juint, "Cannot set trip count to max_juint");
     _trip_count = tc;
     _loop_flags |= HasExactTripCount;
   }
diff --git a/test/hotspot/jtreg/compiler/loopopts/UnrollWideLoopHitsTooStrictAssert.java b/test/hotspot/jtreg/compiler/loopopts/UnrollWideLoopHitsTooStrictAssert.java
new file mode 100644
index 00000000000..34db2e9e9f5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/UnrollWideLoopHitsTooStrictAssert.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 8356647
+ * @summary C2's unrolling code has a too strict assert when a counted loop's range is as wide as int's.
+ * @run main/othervm -XX:CompileCommand=compileonly,compiler.loopopts.UnrollWideLoopHitsTooStrictAssert::test -Xcomp
+ *                   compiler.loopopts.UnrollWideLoopHitsTooStrictAssert
+ * @run main compiler.loopopts.UnrollWideLoopHitsTooStrictAssert
+ */
+
+package compiler.loopopts;
+
+public class UnrollWideLoopHitsTooStrictAssert {
+    public static void main(String[] args) {
+        test(true);
+    }
+
+    private static long test(boolean flag) {
+        long x = 0;
+        for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; ++i) {
+            x += i;
+            if (flag) {
+                break;
+            }
+        }
+        return x;
+    }
+}

From 016cc4f333d1a59a7cd534cb7ee4c373087efd10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 28 May 2025 13:51:24 +0000
Subject: [PATCH 688/901] 8357830: JfrVframeStream::_cont_entry shadows
 super-class field

Reviewed-by: egahlin
---
 .../recorder/stacktrace/jfrVframeStream.cpp   | 55 -------------------
 .../recorder/stacktrace/jfrVframeStream.hpp   |  4 +-
 .../stacktrace/jfrVframeStream.inline.hpp     | 34 ++++++++++++
 3 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp

diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp
deleted file mode 100644
index 22f103959cc..00000000000
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.cpp
+++ /dev/null
@@ -1,55 +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.
- *
- */
-
-#include "jfr/recorder/stacktrace/jfrVframeStream.inline.hpp"
-#include "runtime/javaThread.inline.hpp"
-#include "runtime/registerMap.hpp"
-#include "runtime/stackWatermarkSet.inline.hpp"
-
-static inline RegisterMap::WalkContinuation walk_continuation(JavaThread* jt) {
-  // NOTE: WalkContinuation::skip, because of interactions with ZGC relocation
-  //       and load barriers. This code is run while generating stack traces for
-  //       the ZPage allocation event, even when ZGC is relocating  objects.
-  //       When ZGC is relocating, it is forbidden to run code that performs
-  //       load barriers. With WalkContinuation::include, we visit heap stack
-  //       chunks and could be using load barriers.
-  //
-  // NOTE: Shenandoah GC also seems to require this check - actual details as to why
-  //       is unknown but to be filled in by others.
-  return ((UseZGC || UseShenandoahGC) && !StackWatermarkSet::processing_started(jt))
-    ? RegisterMap::WalkContinuation::skip
-    : RegisterMap::WalkContinuation::include;
-}
-
-JfrVframeStream::JfrVframeStream(JavaThread* jt, const frame& fr, bool in_continuation, bool stop_at_java_call_stub) :
-  vframeStreamCommon(jt, RegisterMap::UpdateMap::skip, RegisterMap::ProcessFrames::skip, walk_continuation(jt)),
-  _vthread(in_continuation), _cont_entry(_vthread ? jt->last_continuation() : nullptr) {
-  assert(!_vthread || JfrThreadLocal::is_vthread(jt), "invariant");
-  assert(!_vthread || _cont_entry != nullptr, "invariant");
-  _frame = fr;
-  _stop_at_java_call_stub = stop_at_java_call_stub;
-  while (!fill_from_frame()) {
-    _frame = _frame.sender(&_reg_map);
-  }
-}
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
index 32910739f4d..5da1a90db4e 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.hpp
@@ -30,9 +30,9 @@
 class JfrVframeStream : public vframeStreamCommon {
  private:
   bool _vthread;
-  const ContinuationEntry* _cont_entry;
-  void step_to_sender();
+
   void next_frame();
+  static RegisterMap::WalkContinuation walk_continuation(JavaThread* jt);
  public:
   JfrVframeStream(JavaThread* jt, const frame& fr, bool in_continuation, bool stop_at_java_call_stub);
   void next_vframe();
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
index 1f8b75e57ce..8495c7172c7 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrVframeStream.inline.hpp
@@ -26,9 +26,43 @@
 #define SHARE_JFR_RECORDER_STACKTRACE_JFRVFRAMESTREAM_INLINE_HPP
 
 #include "jfr/recorder/stacktrace/jfrVframeStream.hpp"
+
 #include "runtime/continuationEntry.inline.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/registerMap.hpp"
+#include "runtime/stackWatermarkSet.inline.hpp"
 #include "runtime/vframe.inline.hpp"
 
+inline RegisterMap::WalkContinuation JfrVframeStream::walk_continuation(JavaThread* jt) {
+  // NOTE: WalkContinuation::skip, because of interactions with ZGC relocation
+  //       and load barriers. This code is run while generating stack traces for
+  //       the ZPage allocation event, even when ZGC is relocating  objects.
+  //       When ZGC is relocating, it is forbidden to run code that performs
+  //       load barriers. With WalkContinuation::include, we visit heap stack
+  //       chunks and could be using load barriers.
+  //
+  // NOTE: Shenandoah GC also seems to require this check - actual details as to why
+  //       is unknown but to be filled in by others.
+  return ((UseZGC || UseShenandoahGC) && !StackWatermarkSet::processing_started(jt))
+    ? RegisterMap::WalkContinuation::skip
+    : RegisterMap::WalkContinuation::include;
+}
+
+inline JfrVframeStream::JfrVframeStream(JavaThread* jt, const frame& fr, bool in_continuation, bool stop_at_java_call_stub) :
+  vframeStreamCommon(jt, RegisterMap::UpdateMap::skip, RegisterMap::ProcessFrames::skip, walk_continuation(jt)),
+  _vthread(in_continuation) {
+  assert(!_vthread || JfrThreadLocal::is_vthread(jt), "invariant");
+  if (in_continuation) {
+    _cont_entry = jt->last_continuation();
+    assert(_cont_entry != nullptr, "invariant");
+  }
+  _frame = fr;
+  _stop_at_java_call_stub = stop_at_java_call_stub;
+  while (!fill_from_frame()) {
+    _frame = _frame.sender(&_reg_map);
+  }
+}
+
 inline void JfrVframeStream::next_frame() {
   do {
     if (_vthread && Continuation::is_continuation_enterSpecial(_frame)) {

From 1a65719ab336336f94777df85bafeeef2c4d5b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 28 May 2025 13:51:40 +0000
Subject: [PATCH 689/901] 8357911: JFR: Fix subtle xor method tagging bug

Reviewed-by: egahlin
---
 .../share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp | 6 ++++--
 .../recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
index bfff7eaaf1b..1fb7db1b9ed 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.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
@@ -112,7 +112,9 @@ class ClearArtifact<const Method*> {
     assert(METHOD_IS_NOT_LEAKP(method), "invariant");
     assert(METHOD_IS_NOT_TRANSIENT(method), "invariant");
     SET_PREVIOUS_EPOCH_METHOD_CLEARED_BIT(method);
-    CLEAR_PREVIOUS_EPOCH_METHOD_FLAG(method);
+    if (METHOD_FLAG_USED_PREVIOUS_EPOCH_BIT(method)) {
+      CLEAR_PREVIOUS_EPOCH_METHOD_FLAG(method);
+    }
     assert(IS_THIS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
     assert(IS_PREVIOUS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
     return true;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
index b487b5e6670..392e36f2c3c 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.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
@@ -104,6 +104,7 @@
 #define METHOD_FLAG_USED_THIS_EPOCH(method)       (METHOD_FLAG_PREDICATE(method, (TRANSIENT_BIT | THIS_EPOCH_BIT)))
 #define METHOD_FLAG_NOT_USED_THIS_EPOCH(method)   (!(METHOD_FLAG_USED_THIS_EPOCH(method)))
 #define METHOD_FLAG_USED_PREVIOUS_EPOCH(method)   (METHOD_FLAG_PREDICATE(method, (TRANSIENT_BIT | PREVIOUS_EPOCH_BIT)))
+#define METHOD_FLAG_USED_PREVIOUS_EPOCH_BIT(method) (METHOD_FLAG_PREDICATE(method, (PREVIOUS_EPOCH_BIT)))
 #define METHOD_FLAG_NOT_USED_PREVIOUS_EPOCH(method) (!(METHOD_FLAG_USED_PREVIOUS_EPOCH(method)))
 #define IS_METHOD_BLESSED(method)                 (METHOD_FLAG_PREDICATE(method, BLESSED_METHOD_BIT))
 

From 18285fc136e1a892ab54a705c1fa82e91325b06a Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Wed, 28 May 2025 14:23:23 +0000
Subject: [PATCH 690/901] 8356553: Incorrect uses of {@link} in
 AbstractQueuedLongSynchronizer and AbstractQueuedSynchronizer

Reviewed-by: alanb
---
 .../locks/AbstractQueuedLongSynchronizer.java | 20 +++++++-------
 .../locks/AbstractQueuedSynchronizer.java     | 27 ++++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index bdb81f3cb60..c660af6a0ba 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -1303,8 +1303,8 @@ private ConditionNode newConditionNode() {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(long)} with saved state as argument.
          * </ol>
          */
         public final void awaitUninterruptibly() {
@@ -1346,8 +1346,8 @@ else if ((node.status & COND) != 0) {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled or interrupted.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(long)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * </ol>
          */
@@ -1398,8 +1398,8 @@ public final void await() throws InterruptedException {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(long)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * </ol>
          */
@@ -1442,8 +1442,8 @@ public final long awaitNanos(long nanosTimeout)
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(long)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * <li>If timed out while blocked in step 4, return false, else true.
          * </ol>
@@ -1485,8 +1485,8 @@ public final boolean awaitUntil(Date deadline)
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(long)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * <li>If timed out while blocked in step 4, return false, else true.
          * </ol>
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 5d899ffb0c5..0ff216c80a0 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -86,9 +86,10 @@
  * #isHeldExclusively} reports whether synchronization is exclusively
  * held with respect to the current thread, method {@link #release}
  * invoked with the current {@link #getState} value fully releases
- * this object, and {@link #acquire}, given this saved state value,
- * eventually restores this object to its previous acquired state.  No
- * {@code AbstractQueuedSynchronizer} method otherwise creates such a
+ * this object, and the underlying version of {@link #acquire(int)},
+ * given this saved state value, eventually restores this object to
+ * its previous acquired state.
+ * No {@code AbstractQueuedSynchronizer} method otherwise creates such a
  * condition, so if this constraint cannot be met, do not use it.  The
  * behavior of {@link ConditionObject} depends of course on the
  * semantics of its synchronizer implementation.
@@ -1682,8 +1683,8 @@ private ConditionNode newConditionNode() {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(int)} with saved state as argument.
          * </ol>
          */
         public final void awaitUninterruptibly() {
@@ -1725,8 +1726,8 @@ else if ((node.status & COND) != 0) {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled or interrupted.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(int)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * </ol>
          */
@@ -1777,8 +1778,8 @@ public final void await() throws InterruptedException {
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(int)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * </ol>
          */
@@ -1821,8 +1822,8 @@ public final long awaitNanos(long nanosTimeout)
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(int)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * <li>If timed out while blocked in step 4, return false, else true.
          * </ol>
@@ -1864,8 +1865,8 @@ public final boolean awaitUntil(Date deadline)
          * <li>Invoke {@link #release} with saved state as argument,
          *     throwing IllegalMonitorStateException if it fails.
          * <li>Block until signalled, interrupted, or timed out.
-         * <li>Reacquire by invoking specialized version of
-         *     {@link #acquire} with saved state as argument.
+         * <li>Reacquire by invoking underlying version of
+         *     {@link #acquire(int)} with saved state as argument.
          * <li>If interrupted while blocked in step 4, throw InterruptedException.
          * <li>If timed out while blocked in step 4, return false, else true.
          * </ol>

From 7bd8375fe49eedecae7b2a1c75e7efb5ab06b22d Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 28 May 2025 14:25:12 +0000
Subject: [PATCH 691/901] 8357920: Add .rej and .orig to .gitignore

Reviewed-by: syan, erikj
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2d82e0d943c..9145a9fa67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ NashornProfile.txt
 /.gdbinit
 /.lldbinit
 **/core.[0-9]*
+*.rej
+*.orig

From a4f870df553e4d7669edf6e454e147526ff2fae7 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 28 May 2025 14:42:21 +0000
Subject: [PATCH 692/901] 8357510: [REDO] RunTest variables should always be
 assigned

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

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 95d3dee7013..51c75cc4872 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -583,6 +583,8 @@ define SetMicroValue
   else
     ifneq ($3, )
       $1_$2 := $3
+    else
+      $1_$2 :=
     endif
   endif
 endef
@@ -709,6 +711,8 @@ define SetJtregValue
     else
       ifneq ($3, )
         $1_$2 := $3
+      else
+        $1_$2 :=
       endif
     endif
   endif
@@ -841,6 +845,12 @@ define SetupRunJtregTestBody
     endif
   endif
 
+  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
+    JTREG_PROBLEM_LIST_PREFIX := -match:
+  else
+    JTREG_PROBLEM_LIST_PREFIX := -exclude:
+  endif
+
   ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
@@ -869,7 +879,7 @@ define SetupRunJtregTestBody
   # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
+      -concurrency:$$($1_JTREG_JOBS) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -902,12 +912,6 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
   endif
 
-  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
-    JTREG_PROBLEM_LIST_PREFIX := -match:
-  else
-    JTREG_PROBLEM_LIST_PREFIX := -exclude:
-  endif
-
   ifneq ($$($1_JTREG_PROBLEM_LIST), )
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
   endif
@@ -994,6 +998,7 @@ define SetupRunJtregTestBody
   endif
 
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
+  $1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
 	$$(call LogWarn, Clean up dirs for $1)

From 63d0e7ff117537bf4768b88c43a0231a14ed1512 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 28 May 2025 14:42:35 +0000
Subject: [PATCH 693/901] 8355725: SPEC_FILTER stopped working

Reviewed-by: erikj
---
 make/Docs.gmk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index d88683e2b28..1fcc8575d2c 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -540,7 +540,9 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
 # Format: space-delimited list of names, including at most one '%' as a
 # wildcard. Spec source files match if their filename or any enclosing folder
 # name matches one of the items in SPEC_FILTER.
-SPEC_FILTER := %
+ifeq ($(SPEC_FILTER), )
+  SPEC_FILTER := %
+endif
 
 ApplySpecFilter = \
     $(strip $(foreach file, $(1), \

From e3f85c961b4c1e5e01aedf3a0f4e1b0e6ff457fd Mon Sep 17 00:00:00 2001
From: Igor Veresov <iveresov@openjdk.org>
Date: Wed, 28 May 2025 15:15:03 +0000
Subject: [PATCH 694/901] 8355003: Implement JEP 515: Ahead-of-Time Method
 Profiling

Co-authored-by: John R Rose <jrose@openjdk.org>
Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Co-authored-by: Ioi Lam <iklam@openjdk.org>
Co-authored-by: Vladimir Kozlov <kvn@openjdk.org>
Co-authored-by: Aleksey Shipilev <shade@openjdk.org>
Reviewed-by: kvn, ihse, cjplummer, iklam
---
 make/hotspot/lib/JvmFeatures.gmk              |   3 +-
 src/hotspot/share/cds/aotArtifactFinder.cpp   |   3 +
 .../share/cds/aotLinkedClassBulkLoader.cpp    |  43 +-
 .../share/cds/aotLinkedClassBulkLoader.hpp    |   5 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |  70 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |  14 +-
 src/hotspot/share/cds/cdsConfig.cpp           |  24 +
 src/hotspot/share/cds/cdsConfig.hpp           |   1 +
 src/hotspot/share/cds/cds_globals.hpp         |  17 +
 src/hotspot/share/cds/cppVtables.cpp          |  14 +-
 src/hotspot/share/cds/dumpAllocStats.cpp      |  12 +-
 src/hotspot/share/cds/filemap.cpp             |  67 ++
 src/hotspot/share/cds/filemap.hpp             |  11 +
 src/hotspot/share/cds/metaspaceShared.cpp     |  19 +
 src/hotspot/share/cds/runTimeClassInfo.hpp    |   4 +
 src/hotspot/share/ci/ciEnv.cpp                |   7 +
 src/hotspot/share/ci/ciInstanceKlass.hpp      |   1 +
 src/hotspot/share/ci/ciMethod.cpp             |  32 +
 src/hotspot/share/ci/ciMethodData.cpp         |  19 +-
 src/hotspot/share/ci/ciObjectFactory.cpp      |  45 +-
 src/hotspot/share/ci/ciObjectFactory.hpp      |   8 +-
 .../share/classfile/compactHashtable.hpp      |   1 +
 .../classfile/systemDictionaryShared.cpp      |   7 +-
 .../share/compiler/compilationPolicy.cpp      | 532 ++++++++---
 .../share/compiler/compilationPolicy.hpp      | 130 ++-
 src/hotspot/share/compiler/compileBroker.cpp  |  27 +-
 src/hotspot/share/compiler/compileBroker.hpp  |  16 +-
 src/hotspot/share/compiler/compileTask.cpp    |   1 +
 src/hotspot/share/compiler/compileTask.hpp    |   5 +
 .../share/compiler/compilerDefinitions.hpp    |   3 +-
 .../share/compiler/compiler_globals.hpp       |  12 +-
 src/hotspot/share/logging/logTag.hpp          |   1 +
 src/hotspot/share/memory/allocation.cpp       |   7 +
 src/hotspot/share/memory/allocation.hpp       |   5 +
 src/hotspot/share/memory/metadataFactory.hpp  |   6 +
 src/hotspot/share/memory/metaspaceClosure.hpp |  42 +-
 src/hotspot/share/oops/array.hpp              |   5 +
 src/hotspot/share/oops/array.inline.hpp       |  15 +
 src/hotspot/share/oops/instanceKlass.cpp      |   3 +
 src/hotspot/share/oops/instanceKlass.hpp      |   6 +
 src/hotspot/share/oops/instanceKlassFlags.hpp |   1 +
 src/hotspot/share/oops/klass.hpp              |   1 +
 src/hotspot/share/oops/klass.inline.hpp       |   5 +
 src/hotspot/share/oops/method.cpp             |  53 ++
 src/hotspot/share/oops/method.hpp             |   9 +-
 src/hotspot/share/oops/methodCounters.cpp     |  57 +-
 src/hotspot/share/oops/methodCounters.hpp     |  57 +-
 src/hotspot/share/oops/methodData.cpp         | 140 ++-
 src/hotspot/share/oops/methodData.hpp         |  81 +-
 src/hotspot/share/oops/trainingData.cpp       | 794 +++++++++++++++++
 src/hotspot/share/oops/trainingData.hpp       | 825 ++++++++++++++++++
 src/hotspot/share/runtime/init.cpp            |   6 +
 src/hotspot/share/runtime/mutexLocker.cpp     |   4 +
 src/hotspot/share/runtime/mutexLocker.hpp     |   2 +
 src/hotspot/share/runtime/threads.cpp         |   5 +
 src/hotspot/share/runtime/vmStructs.cpp       |   1 +
 .../sun/jvm/hotspot/memory/FileMapInfo.java   |   9 +-
 .../sun/jvm/hotspot/runtime/Threads.java      |   1 +
 .../appcds/aotProfile/AOTProfileFlags.java    | 143 +++
 59 files changed, 3224 insertions(+), 213 deletions(-)
 create mode 100644 src/hotspot/share/oops/trainingData.cpp
 create mode 100644 src/hotspot/share/oops/trainingData.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java

diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index ffea9aa3926..0fd1c752174 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -128,7 +128,8 @@ ifneq ($(call check-jvm-feature, cds), true)
       aotCodeCache.cpp \
       classLoaderDataShared.cpp \
       classLoaderExt.cpp \
-      systemDictionaryShared.cpp
+      systemDictionaryShared.cpp \
+      trainingData.cpp
   JVM_EXCLUDE_PATTERNS += cds/
 endif
 
diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 732d898e808..d8999774a53 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -35,6 +35,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
+#include "oops/trainingData.hpp"
 #include "utilities/resourceHash.hpp"
 
 // All the classes that should be included in the AOT cache (in at least the "allocated" state)
@@ -165,6 +166,8 @@ void AOTArtifactFinder::find_artifacts() {
   });
 
   end_scanning_for_oops();
+
+  TrainingData::cleanup_training_data();
 }
 
 void AOTArtifactFinder::start_scanning_for_oops() {
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
index 70339a12110..39236975782 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
@@ -32,10 +32,12 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
+#include "compiler/compilationPolicy.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 
@@ -48,6 +50,17 @@ void AOTLinkedClassBulkLoader::serialize(SerializeClosure* soc, bool is_static_a
   AOTLinkedClassTable::get(is_static_archive)->serialize(soc);
 }
 
+bool AOTLinkedClassBulkLoader::class_preloading_finished() {
+  if (!CDSConfig::is_using_aot_linked_classes()) {
+    return true;
+  } else {
+    // The ConstantPools of preloaded classes have references to other preloaded classes. We don't
+    // want any Java code (including JVMCI compiler) to use these classes until all of them
+    // are loaded.
+    return Atomic::load_acquire(&_all_completed);
+  }
+}
+
 void AOTLinkedClassBulkLoader::load_javabase_classes(JavaThread* current) {
   assert(CDSConfig::is_using_aot_linked_classes(), "sanity");
   load_classes_in_loader(current, AOTLinkedClassCategory::BOOT1, nullptr); // only java.base classes
@@ -70,8 +83,14 @@ void AOTLinkedClassBulkLoader::load_non_javabase_classes(JavaThread* current) {
   _platform_completed = true;
 
   load_classes_in_loader(current, AOTLinkedClassCategory::APP, SystemDictionary::java_system_loader());
+
+  if (AOTPrintTrainingInfo) {
+    tty->print_cr("==================== archived_training_data ** after all classes preloaded ====================");
+    TrainingData::print_archived_training_data_on(tty);
+  }
+
   _app_completed = true;
-  _all_completed = true;
+  Atomic::release_store(&_all_completed, true);
 }
 
 void AOTLinkedClassBulkLoader::load_classes_in_loader(JavaThread* current, AOTLinkedClassCategory class_category, oop class_loader_oop) {
@@ -394,3 +413,25 @@ bool AOTLinkedClassBulkLoader::is_pending_aot_linked_class(Klass* k) {
     return false;
   }
 }
+
+void AOTLinkedClassBulkLoader::replay_training_at_init(Array<InstanceKlass*>* classes, TRAPS) {
+  if (classes != nullptr) {
+    for (int i = 0; i < classes->length(); i++) {
+      InstanceKlass* ik = classes->at(i);
+      if (ik->has_aot_initialized_mirror() && ik->is_initialized() && !ik->has_init_deps_processed()) {
+        CompilationPolicy::replay_training_at_init(ik, CHECK);
+      }
+    }
+  }
+}
+
+void AOTLinkedClassBulkLoader::replay_training_at_init_for_preloaded_classes(TRAPS) {
+  if (CDSConfig::is_using_aot_linked_classes() && TrainingData::have_data()) {
+    // Only static archive can have training data.
+    AOTLinkedClassTable* table = AOTLinkedClassTable::for_static_archive();
+    replay_training_at_init(table->boot(),     CHECK);
+    replay_training_at_init(table->boot2(),    CHECK);
+    replay_training_at_init(table->platform(), CHECK);
+    replay_training_at_init(table->app(),      CHECK);
+  }
+}
\ No newline at end of file
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp
index a8e6365b899..86fb5017eb8 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.hpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.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
@@ -55,6 +55,7 @@ class AOTLinkedClassBulkLoader :  AllStatic {
                                 const char* category_name, Handle loader, TRAPS);
   static void load_hidden_class(ClassLoaderData* loader_data, InstanceKlass* ik, TRAPS);
   static void init_required_classes_for_loader(Handle class_loader, Array<InstanceKlass*>* classes, TRAPS);
+  static void replay_training_at_init(Array<InstanceKlass*>* classes, TRAPS) NOT_CDS_RETURN;
 public:
   static void serialize(SerializeClosure* soc, bool is_static_archive) NOT_CDS_RETURN;
 
@@ -63,6 +64,8 @@ class AOTLinkedClassBulkLoader :  AllStatic {
   static void finish_loading_javabase_classes(TRAPS) NOT_CDS_RETURN;
   static void exit_on_exception(JavaThread* current);
 
+  static void replay_training_at_init_for_preloaded_classes(TRAPS) NOT_CDS_RETURN;
+  static bool class_preloading_finished();
   static bool is_pending_aot_linked_class(Klass* k) NOT_CDS_RETURN_(false);
 };
 
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 4dadae6ca39..5f197f70ecc 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -54,9 +54,12 @@
 #include "memory/resourceArea.hpp"
 #include "oops/compressedKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
+#include "oops/methodCounters.hpp"
+#include "oops/methodData.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oopHandle.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/globals_extension.hpp"
@@ -131,13 +134,27 @@ class RelocateEmbeddedPointers : public BitMapClosure {
     size_t field_offset = size_t(bit_offset - _start_idx) * sizeof(address);
     address* ptr_loc = (address*)(_buffered_obj + field_offset);
 
-    address old_p = *ptr_loc;
+    address old_p_with_tags = *ptr_loc;
+    assert(old_p_with_tags != nullptr, "null ptrs shouldn't have been marked");
+
+    address old_p = MetaspaceClosure::strip_tags(old_p_with_tags);
+    uintx tags = MetaspaceClosure::decode_tags(old_p_with_tags);
     address new_p = _builder->get_buffered_addr(old_p);
 
-    log_trace(aot)("Ref: [" PTR_FORMAT "] -> " PTR_FORMAT " => " PTR_FORMAT,
-                   p2i(ptr_loc), p2i(old_p), p2i(new_p));
+    bool nulled;
+    if (new_p == nullptr) {
+      // old_p had a FollowMode of set_to_null
+      nulled = true;
+    } else {
+      new_p = MetaspaceClosure::add_tags(new_p, tags);
+      nulled = false;
+    }
+
+    log_trace(aot)("Ref: [" PTR_FORMAT "] -> " PTR_FORMAT " => " PTR_FORMAT " %zu",
+                   p2i(ptr_loc), p2i(old_p) + tags, p2i(new_p), tags);
 
     ArchivePtrMarker::set_and_mark_pointer(ptr_loc, new_p);
+    ArchiveBuilder::current()->count_relocated_pointer(tags != 0, nulled);
     return true; // keep iterating the bitmap
   }
 };
@@ -178,6 +195,9 @@ ArchiveBuilder::ArchiveBuilder() :
   _klasses = new (mtClassShared) GrowableArray<Klass*>(4 * K, mtClassShared);
   _symbols = new (mtClassShared) GrowableArray<Symbol*>(256 * K, mtClassShared);
   _entropy_seed = 0x12345678;
+  _relocated_ptr_info._num_ptrs = 0;
+  _relocated_ptr_info._num_tagged_ptrs = 0;
+  _relocated_ptr_info._num_nulled_ptrs = 0;
   assert(_current == nullptr, "must be");
   _current = this;
 }
@@ -437,6 +457,11 @@ bool ArchiveBuilder::gather_one_source_obj(MetaspaceClosure::Ref* ref, bool read
   }
 #endif
 
+  if (ref->msotype() == MetaspaceObj::MethodDataType) {
+    MethodData* md = (MethodData*)ref->obj();
+    md->clean_method_data(false /* always_clean */);
+  }
+
   assert(p->read_only() == src_info.read_only(), "must be");
 
   if (created && src_info.should_copy()) {
@@ -534,8 +559,11 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
     // Don't dump existing shared metadata again.
     return point_to_it;
   } else if (ref->msotype() == MetaspaceObj::MethodDataType ||
-             ref->msotype() == MetaspaceObj::MethodCountersType) {
-    return set_to_null;
+             ref->msotype() == MetaspaceObj::MethodCountersType ||
+             ref->msotype() == MetaspaceObj::KlassTrainingDataType ||
+             ref->msotype() == MetaspaceObj::MethodTrainingDataType ||
+             ref->msotype() == MetaspaceObj::CompileTrainingDataType) {
+    return (TrainingData::need_data() || TrainingData::assembling_data()) ? make_a_copy : set_to_null;
   } else if (ref->msotype() == MetaspaceObj::AdapterHandlerEntryType) {
     if (CDSConfig::is_dumping_adapters()) {
       AdapterHandlerEntry* entry = (AdapterHandlerEntry*)ref->obj();
@@ -756,6 +784,10 @@ void ArchiveBuilder::relocate_metaspaceobj_embedded_pointers() {
   aot_log_info(aot)("Relocating embedded pointers in core regions ... ");
   relocate_embedded_pointers(&_rw_src_objs);
   relocate_embedded_pointers(&_ro_src_objs);
+  log_info(cds)("Relocating %zu pointers, %zu tagged, %zu nulled",
+                _relocated_ptr_info._num_ptrs,
+                _relocated_ptr_info._num_tagged_ptrs,
+                _relocated_ptr_info._num_nulled_ptrs);
 }
 
 #define ADD_COUNT(x) \
@@ -953,6 +985,28 @@ void ArchiveBuilder::make_klasses_shareable() {
   DynamicArchive::make_array_klasses_shareable();
 }
 
+void ArchiveBuilder::make_training_data_shareable() {
+  auto clean_td = [&] (address& src_obj,  SourceObjInfo& info) {
+    if (!is_in_buffer_space(info.buffered_addr())) {
+      return;
+    }
+
+    if (info.msotype() == MetaspaceObj::KlassTrainingDataType ||
+        info.msotype() == MetaspaceObj::MethodTrainingDataType ||
+        info.msotype() == MetaspaceObj::CompileTrainingDataType) {
+      TrainingData* buffered_td = (TrainingData*)info.buffered_addr();
+      buffered_td->remove_unshareable_info();
+    } else if (info.msotype() == MetaspaceObj::MethodDataType) {
+      MethodData* buffered_mdo = (MethodData*)info.buffered_addr();
+      buffered_mdo->remove_unshareable_info();
+    } else if (info.msotype() == MetaspaceObj::MethodCountersType) {
+      MethodCounters* buffered_mc = (MethodCounters*)info.buffered_addr();
+      buffered_mc->remove_unshareable_info();
+    }
+  };
+  _src_obj_table.iterate_all(clean_td);
+}
+
 void ArchiveBuilder::serialize_dynamic_archivable_items(SerializeClosure* soc) {
   SymbolTable::serialize_shared_table_header(soc, false);
   SystemDictionaryShared::serialize_dictionary_headers(soc, false);
@@ -1588,6 +1642,12 @@ void ArchiveBuilder::write_region(FileMapInfo* mapinfo, int region_idx, DumpRegi
   mapinfo->write_region(region_idx, dump_region->base(), dump_region->used(), read_only, allow_exec);
 }
 
+void ArchiveBuilder::count_relocated_pointer(bool tagged, bool nulled) {
+  _relocated_ptr_info._num_ptrs ++;
+  _relocated_ptr_info._num_tagged_ptrs += tagged ? 1 : 0;
+  _relocated_ptr_info._num_nulled_ptrs += nulled ? 1 : 0;
+}
+
 void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo, ArchiveHeapInfo* heap_info) {
   // Print statistics of all the regions
   const size_t bitmap_used = mapinfo->region_at(MetaspaceShared::bm)->used();
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 531c43e1cbf..1957786fe76 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -238,6 +238,11 @@ class ArchiveBuilder : public StackObj {
   // statistics
   DumpAllocStats _alloc_stats;
   size_t _total_heap_region_size;
+  struct {
+    size_t _num_ptrs;
+    size_t _num_tagged_ptrs;
+    size_t _num_nulled_ptrs;
+  } _relocated_ptr_info;
 
   void print_region_stats(FileMapInfo *map_info, ArchiveHeapInfo* heap_info);
   void print_bitmap_region_stats(size_t size, size_t total_size);
@@ -258,6 +263,8 @@ class ArchiveBuilder : public StackObj {
     ~OtherROAllocMark();
   };
 
+  void count_relocated_pointer(bool tagged, bool nulled);
+
 private:
   FollowMode get_follow_mode(MetaspaceClosure::Ref *ref);
 
@@ -419,6 +426,7 @@ class ArchiveBuilder : public StackObj {
   void relocate_metaspaceobj_embedded_pointers();
   void record_regenerated_object(address orig_src_obj, address regen_src_obj);
   void make_klasses_shareable();
+  void make_training_data_shareable();
   void relocate_to_requested();
   void write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_info);
   void write_region(FileMapInfo* mapinfo, int region_idx, DumpRegion* dump_region,
@@ -443,7 +451,8 @@ class ArchiveBuilder : public StackObj {
 
   address get_buffered_addr(address src_addr) const;
   template <typename T> T get_buffered_addr(T src_addr) const {
-    return (T)get_buffered_addr((address)src_addr);
+    CDS_ONLY(return (T)get_buffered_addr((address)src_addr);)
+    NOT_CDS(return nullptr;)
   }
 
   address get_source_addr(address buffered_addr) const;
@@ -456,7 +465,8 @@ class ArchiveBuilder : public StackObj {
   GrowableArray<Symbol*>* symbols() const { return _symbols; }
 
   static bool is_active() {
-    return (_current != nullptr);
+    CDS_ONLY(return (_current != nullptr));
+    NOT_CDS(return false;)
   }
 
   static ArchiveBuilder* current() {
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index c8b6be2142f..c8888fe6bb3 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -532,6 +532,8 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
     FLAG_SET_ERGO_IF_DEFAULT(AOTClassLinking, true);
   }
 
+  setup_compiler_args();
+
   if (AOTClassLinking) {
     // If AOTClassLinking is specified, enable all AOT optimizations by default.
     FLAG_SET_ERGO_IF_DEFAULT(AOTInvokeDynamicLinking, true);
@@ -604,6 +606,28 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
   return true;
 }
 
+void CDSConfig::setup_compiler_args() {
+  // AOT profiles are supported only in the JEP 483 workflow.
+  bool can_dump_profiles = AOTClassLinking && new_aot_flags_used();
+
+  if (is_dumping_preimage_static_archive() && can_dump_profiles) {
+    // JEP 483 workflow -- training
+    FLAG_SET_ERGO_IF_DEFAULT(AOTRecordTraining, true);
+    FLAG_SET_ERGO(AOTReplayTraining, false);
+  } else if (is_dumping_final_static_archive() && can_dump_profiles) {
+    // JEP 483 workflow -- assembly
+    FLAG_SET_ERGO(AOTRecordTraining, false);
+    FLAG_SET_ERGO_IF_DEFAULT(AOTReplayTraining, true);
+  } else if (is_using_archive() && new_aot_flags_used()) {
+    // JEP 483 workflow -- production
+    FLAG_SET_ERGO(AOTRecordTraining, false);
+    FLAG_SET_ERGO_IF_DEFAULT(AOTReplayTraining, true);
+  } else {
+    FLAG_SET_ERGO(AOTReplayTraining, false);
+    FLAG_SET_ERGO(AOTRecordTraining, false);
+  }
+}
+
 void CDSConfig::prepare_for_dumping() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
 
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index b3b504997ff..22378f5c42c 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -67,6 +67,7 @@ class CDSConfig : public AllStatic {
   static void check_aotmode_auto_or_on();
   static void check_aotmode_record();
   static void check_aotmode_create();
+  static void setup_compiler_args();
   static void check_unsupported_dumping_module_options();
 
   // Called after Arguments::apply_ergo() has started
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index a7250e9f575..aab5647e0b8 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -130,6 +130,23 @@
   product(bool, AOTCacheParallelRelocation, true, DIAGNOSTIC,               \
           "Use parallel relocation code to speed up startup.")              \
                                                                             \
+  /* flags to control training and deployment modes  */                     \
+                                                                            \
+  product(bool, AOTRecordTraining, false, DIAGNOSTIC,                       \
+          "Request output of training data for improved deployment.")       \
+                                                                            \
+  product(bool, AOTReplayTraining, false, DIAGNOSTIC,                       \
+          "Read training data, if available, for use in this execution")    \
+                                                                            \
+  product(bool, AOTPrintTrainingInfo, false, DIAGNOSTIC,                    \
+          "Print additional information about training")                    \
+                                                                            \
+  product(bool, AOTVerifyTrainingData, trueInDebug, DIAGNOSTIC,             \
+          "Verify archived training data")                                  \
+                                                                            \
+  product(bool, AOTCompileEagerly, false, DIAGNOSTIC,                       \
+          "Compile methods as soon as possible")                            \
+                                                                            \
   /* AOT Code flags */                                                      \
                                                                             \
   product(bool, AOTAdapterCaching, false, DIAGNOSTIC,                       \
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index 46dbfd45d46..fe8b8d917be 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -32,7 +32,9 @@
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/instanceRefKlass.hpp"
 #include "oops/instanceStackChunkKlass.hpp"
+#include "oops/methodCounters.hpp"
 #include "oops/methodData.hpp"
+#include "oops/trainingData.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/typeArrayKlass.hpp"
 #include "runtime/arguments.hpp"
@@ -60,8 +62,13 @@
   f(InstanceRefKlass) \
   f(InstanceStackChunkKlass) \
   f(Method) \
+  f(MethodData) \
+  f(MethodCounters) \
   f(ObjArrayKlass) \
-  f(TypeArrayKlass)
+  f(TypeArrayKlass) \
+  f(KlassTrainingData) \
+  f(MethodTrainingData) \
+  f(CompileTrainingData)
 
 class CppVtableInfo {
   intptr_t _vtable_size;
@@ -279,16 +286,11 @@ intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address ob
   case MetaspaceObj::ConstMethodType:
   case MetaspaceObj::ConstantPoolCacheType:
   case MetaspaceObj::AnnotationsType:
-  case MetaspaceObj::MethodCountersType:
   case MetaspaceObj::RecordComponentType:
   case MetaspaceObj::AdapterHandlerEntryType:
   case MetaspaceObj::AdapterFingerPrintType:
     // These have no vtables.
     break;
-  case MetaspaceObj::MethodDataType:
-    // We don't archive MethodData <-- should have been removed in removed_unsharable_info
-    ShouldNotReachHere();
-    break;
   default:
     for (kind = 0; kind < _num_cloned_vtable_kinds; kind ++) {
       if (vtable_of((Metadata*)obj) == _orig_cpp_vtptrs[kind] ||
diff --git a/src/hotspot/share/cds/dumpAllocStats.cpp b/src/hotspot/share/cds/dumpAllocStats.cpp
index 671612ec6b3..5f324566103 100644
--- a/src/hotspot/share/cds/dumpAllocStats.cpp
+++ b/src/hotspot/share/cds/dumpAllocStats.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassLinker.hpp"
+#include "cds/cdsConfig.hpp"
 #include "cds/dumpAllocStats.hpp"
 #include "logging/log.hpp"
 #include "logging/logMessage.hpp"
@@ -118,8 +119,15 @@ void DumpAllocStats::print_stats(int ro_all, int rw_all) {
            _num_indy_cp_entries, _num_indy_cp_entries_archived,
            percent_of(_num_indy_cp_entries_archived, _num_indy_cp_entries),
            _num_indy_cp_entries_reverted);
-  msg.info("Platform loader initiated classes = %5d", AOTClassLinker::num_platform_initiated_classes());
-  msg.info("App      loader initiated classes = %5d", AOTClassLinker::num_app_initiated_classes());
+  msg.info("Platform loader initiated classes = %6d", AOTClassLinker::num_platform_initiated_classes());
+  msg.info("App      loader initiated classes = %6d", AOTClassLinker::num_app_initiated_classes());
+  msg.info("MethodCounters                    = %6d (%8d bytes)", _counts[RW][MethodCountersType],
+                                                                  _bytes [RW][MethodCountersType]);
+  msg.info("KlassTrainingData                 = %6d (%8d bytes)", _counts[RW][KlassTrainingDataType],
+                                                                  _bytes [RW][KlassTrainingDataType]);
+  msg.info("MethodTrainingData                = %6d (%8d bytes)", _counts[RW][MethodTrainingDataType],
+                                                                  _bytes [RW][MethodTrainingDataType]);
+
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 006a0cda59a..7094e1c326d 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -60,6 +60,7 @@
 #include "oops/compressedKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "oops/typeArrayKlass.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
@@ -231,6 +232,14 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   } else {
     _narrow_klass_pointer_bits = _narrow_klass_shift = -1;
   }
+  _type_profile_level = TypeProfileLevel;
+  _type_profile_args_limit = TypeProfileArgsLimit;
+  _type_profile_parms_limit = TypeProfileParmsLimit;
+  _type_profile_width = TypeProfileWidth;
+  _bci_profile_width = BciProfileWidth;
+  _profile_traps = ProfileTraps;
+  _type_profile_casts = TypeProfileCasts;
+  _spec_trap_limit_extra_entries = SpecTrapLimitExtraEntries;
   _max_heap_size = MaxHeapSize;
   _use_optimized_module_handling = CDSConfig::is_using_optimized_module_handling();
   _has_aot_linked_classes = CDSConfig::is_dumping_aot_linked_classes();
@@ -1923,6 +1932,64 @@ bool FileMapHeader::validate() {
                   CompactStrings   ? "enabled" : "disabled");
     return false;
   }
+  if (TrainingData::have_data()) {
+    if (_type_profile_level != TypeProfileLevel) {
+      MetaspaceShared::report_loading_error("The %s's TypeProfileLevel setting (%d)"
+                                            " does not equal the current TypeProfileLevel setting (%d).", file_type,
+                                            _type_profile_level, TypeProfileLevel);
+      return false;
+    }
+    if (_type_profile_args_limit != TypeProfileArgsLimit) {
+      MetaspaceShared::report_loading_error("The %s's TypeProfileArgsLimit setting (%d)"
+                                            " does not equal the current TypeProfileArgsLimit setting (%d).", file_type,
+                                            _type_profile_args_limit, TypeProfileArgsLimit);
+      return false;
+    }
+    if (_type_profile_parms_limit != TypeProfileParmsLimit) {
+      MetaspaceShared::report_loading_error("The %s's TypeProfileParamsLimit setting (%d)"
+                                            " does not equal the current TypeProfileParamsLimit setting (%d).", file_type,
+                                            _type_profile_args_limit, TypeProfileArgsLimit);
+      return false;
+
+    }
+    if (_type_profile_width != TypeProfileWidth) {
+      MetaspaceShared::report_loading_error("The %s's TypeProfileWidth setting (%d)"
+                                            " does not equal the current TypeProfileWidth setting (%d).", file_type,
+                                            (int)_type_profile_width, (int)TypeProfileWidth);
+      return false;
+
+    }
+    if (_bci_profile_width != BciProfileWidth) {
+      MetaspaceShared::report_loading_error("The %s's BciProfileWidth setting (%d)"
+                                            " does not equal the current BciProfileWidth setting (%d).", file_type,
+                                            (int)_bci_profile_width, (int)BciProfileWidth);
+      return false;
+    }
+    if (_type_profile_casts != TypeProfileCasts) {
+      MetaspaceShared::report_loading_error("The %s's TypeProfileCasts setting (%s)"
+                                            " does not equal the current TypeProfileCasts setting (%s).", file_type,
+                                            _type_profile_casts ? "enabled" : "disabled",
+                                            TypeProfileCasts    ? "enabled" : "disabled");
+
+      return false;
+
+    }
+    if (_profile_traps != ProfileTraps) {
+      MetaspaceShared::report_loading_error("The %s's ProfileTraps setting (%s)"
+                                            " does not equal the current ProfileTraps setting (%s).", file_type,
+                                            _profile_traps ? "enabled" : "disabled",
+                                            ProfileTraps   ? "enabled" : "disabled");
+
+      return false;
+    }
+    if (_spec_trap_limit_extra_entries != SpecTrapLimitExtraEntries) {
+      MetaspaceShared::report_loading_error("The %s's SpecTrapLimitExtraEntries setting (%d)"
+                                            " does not equal the current SpecTrapLimitExtraEntries setting (%d).", file_type,
+                                            _spec_trap_limit_extra_entries, SpecTrapLimitExtraEntries);
+      return false;
+
+    }
+  }
 
   // This must be done after header validation because it might change the
   // header data
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index d90be1ccff3..e0b33fc8245 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -145,6 +145,17 @@ class FileMapHeader: private CDSFileMapHeaderBase {
   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
+
+  // The following are parameters that affect MethodData layout.
+  uint    _type_profile_level;
+  int     _type_profile_args_limit;
+  int     _type_profile_parms_limit;
+  intx    _type_profile_width;
+  intx    _bci_profile_width;
+  bool    _profile_traps;
+  bool    _type_profile_casts;
+  int     _spec_trap_limit_extra_entries;
+
   template <typename T> T from_mapped_offset(size_t offset) const {
     return (T)(mapped_base_address() + offset);
   }
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index d8281d1f9a4..4e82395dba9 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -81,6 +81,7 @@
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/oopHandle.hpp"
+#include "oops/trainingData.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals.hpp"
@@ -483,6 +484,7 @@ void MetaspaceShared::serialize(SerializeClosure* soc) {
   SystemDictionaryShared::serialize_dictionary_headers(soc);
   AOTLinkedClassBulkLoader::serialize(soc, true);
   FinalImageRecipes::serialize(soc);
+  TrainingData::serialize(soc);
   InstanceMirrorKlass::serialize_offsets(soc);
 
   // Dump/restore well known classes (pointers)
@@ -569,6 +571,7 @@ class StaticArchiveBuilder : public ArchiveBuilder {
     SystemDictionaryShared::dumptime_classes_do(it);
     Universe::metaspace_pointers_do(it);
     vmSymbols::metaspace_pointers_do(it);
+    TrainingData::iterate_roots(it);
 
     // The above code should find all the symbols that are referenced by the
     // archived classes. We just need to add the extra symbols which
@@ -608,6 +611,9 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
   if (CDSConfig::is_dumping_preimage_static_archive()) {
     FinalImageRecipes::record_recipes();
   }
+
+  TrainingData::dump_training_data();
+
   MetaspaceShared::write_method_handle_intrinsics();
 
   // Write lambform lines into archive
@@ -673,6 +679,9 @@ void VM_PopulateDumpSharedSpace::doit() {
     LambdaProxyClassDictionary::adjust_dumptime_table();
   }
 
+  log_info(cds)("Make training data shareable");
+  _builder.make_training_data_shareable();
+
   // The vtable clones contain addresses of the current process.
   // We don't want to write these addresses into the archive.
   CppVtables::zero_archived_vtables();
@@ -791,6 +800,13 @@ void MetaspaceShared::link_shared_classes(TRAPS) {
 void MetaspaceShared::preload_and_dump(TRAPS) {
   CDSConfig::DumperThreadMark dumper_thread_mark(THREAD);
   ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
+
+ if (CDSConfig::is_dumping_final_static_archive() && AOTPrintTrainingInfo) {
+   tty->print_cr("==================== archived_training_data ** before dumping ====================");
+   TrainingData::print_archived_training_data_on(tty);
+ }
+
   StaticArchiveBuilder builder;
   preload_and_dump_impl(builder, THREAD);
   if (HAS_PENDING_EXCEPTION) {
@@ -956,6 +972,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
   // are implemented by K are not verified.
   link_shared_classes(CHECK);
   log_info(aot)("Rewriting and linking classes: done");
+  TrainingData::init_dumptime_table(CHECK); // captures TrainingDataSetLocker
 
   if (CDSConfig::is_dumping_regenerated_lambdaform_invokers()) {
     LambdaFormInvokers::regenerate_holder_classes(CHECK);
@@ -1860,6 +1877,8 @@ void MetaspaceShared::initialize_shared_spaces() {
       SystemDictionaryShared::print_shared_archive(tty, false/*dynamic*/);
     }
 
+    TrainingData::print_archived_training_data_on(tty);
+
     if (AOTCodeCache::is_on_for_use()) {
       tty->print_cr("\n\nAOT Code");
       AOTCodeCache::print_on(tty);
diff --git a/src/hotspot/share/cds/runTimeClassInfo.hpp b/src/hotspot/share/cds/runTimeClassInfo.hpp
index 8ad2efcbccb..058d5181881 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.hpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.hpp
@@ -264,7 +264,11 @@ class RunTimeClassInfo {
   // Used by RunTimeSharedDictionary to implement OffsetCompactHashtable::EQUALS
   static inline bool EQUALS(
        const RunTimeClassInfo* value, Symbol* key, int len_unused) {
+#if INCLUDE_CDS
     return (value->klass()->name() == key);
+#else
+    return false;
+#endif
   }
 };
 
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 9f6a8d653aa..2de77f2828d 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1159,6 +1159,13 @@ int ciEnv::compile_id() {
 // ciEnv::notice_inlined_method()
 void ciEnv::notice_inlined_method(ciMethod* method) {
   _num_inlined_bytecodes += method->code_size_for_inlining();
+  CompileTrainingData* ctd = task()->training_data();
+  if (ctd != nullptr) {
+    GUARDED_VM_ENTRY({
+      methodHandle mh(Thread::current(), method->get_Method());
+      ctd->notice_inlined_method(task(), mh);
+    });
+  }
 }
 
 // ------------------------------------------------------------------
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index 69b73152d37..92a7434e8ba 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -44,6 +44,7 @@ class ciInstanceKlass : public ciKlass {
   friend class ciMethod;
   friend class ciField;
   friend class ciReplay;
+  friend class CompileTrainingData;
 
 private:
   enum SubklassValue { subklass_unknown, subklass_false, subklass_true };
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index 6b6f1b6f0a8..d3b8b8f13cc 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -36,6 +36,7 @@
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "compiler/compileTask.hpp"
 #include "compiler/methodLiveness.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
@@ -47,6 +48,7 @@
 #include "oops/generateOopMap.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/handles.inline.hpp"
@@ -1148,6 +1150,28 @@ int ciMethod::code_size_for_inlining() {
 // Also some instructions inside the code are excluded from inline
 // heuristic (e.g. post call nop instructions; see InlineSkippedInstructionsCounter)
 int ciMethod::inline_instructions_size() {
+  if (_inline_instructions_size == -1) {
+    if (TrainingData::have_data()) {
+      GUARDED_VM_ENTRY(
+        CompLevel level = static_cast<CompLevel>(CURRENT_ENV->comp_level());
+        methodHandle top_level_mh(Thread::current(), CURRENT_ENV->task()->method());
+        MethodTrainingData* mtd = MethodTrainingData::find(top_level_mh);
+        if (mtd != nullptr) {
+          CompileTrainingData* ctd = mtd->last_toplevel_compile(level);
+          if (ctd != nullptr) {
+            methodHandle mh(Thread::current(), get_Method());
+            MethodTrainingData* this_mtd = MethodTrainingData::find(mh);
+            if (this_mtd != nullptr) {
+              auto r = ctd->ci_records().ciMethod__inline_instructions_size.find(this_mtd);
+              if (r.is_valid()) {
+                _inline_instructions_size = r.result();
+              }
+            }
+          }
+        }
+      );
+    }
+  }
   if (_inline_instructions_size == -1) {
     GUARDED_VM_ENTRY(
       nmethod* code = get_Method()->code();
@@ -1157,6 +1181,14 @@ int ciMethod::inline_instructions_size() {
       } else {
         _inline_instructions_size = 0;
       }
+      if (TrainingData::need_data()) {
+        CompileTrainingData* ctd = CURRENT_ENV->task()->training_data();
+        if (ctd != nullptr) {
+          methodHandle mh(Thread::current(), get_Method());
+          MethodTrainingData* this_mtd = MethodTrainingData::make(mh);
+          ctd->ci_records().ciMethod__inline_instructions_size.append_if_missing(_inline_instructions_size, this_mtd);
+        }
+      }
     );
   }
   return _inline_instructions_size;
diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
index a37e4ba75e6..096a674ad56 100644
--- a/src/hotspot/share/ci/ciMethodData.cpp
+++ b/src/hotspot/share/ci/ciMethodData.cpp
@@ -31,6 +31,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/methodData.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/deoptimization.hpp"
 #include "utilities/copy.hpp"
 
@@ -54,6 +55,15 @@ ciMethodData::ciMethodData(MethodData* md)
   _invocation_counter(0),
   _orig() {}
 
+
+static bool is_klass_loaded(Klass* k) {
+  if (TrainingData::have_data()) {
+    // If we're running in AOT mode some classes may not be loaded yet
+    return !k->is_instance_klass() || InstanceKlass::cast(k)->is_loaded();
+  }
+  return true;
+}
+
 // Check for entries that reference an unloaded method
 class PrepareExtraDataClosure : public CleanExtraDataClosure {
   MethodData*            _mdo;
@@ -68,7 +78,8 @@ class PrepareExtraDataClosure : public CleanExtraDataClosure {
   { }
 
   bool is_live(Method* m) {
-    if (!m->method_holder()->is_loader_alive()) {
+    Klass* holder = m->method_holder();
+    if (holder == nullptr || !holder->is_loader_present_and_alive() || !is_klass_loaded(holder)) {
       return false;
     }
     if (CURRENT_ENV->cached_metadata(m) == nullptr) {
@@ -303,7 +314,7 @@ bool ciMethodData::load_data() {
 void ciReceiverTypeData::translate_receiver_data_from(const ProfileData* data) {
   for (uint row = 0; row < row_limit(); row++) {
     Klass* k = data->as_ReceiverTypeData()->receiver(row);
-    if (k != nullptr) {
+    if (k != nullptr && k->class_loader_data() != nullptr && is_klass_loaded(k)) {
       if (k->is_loader_alive()) {
         ciKlass* klass = CURRENT_ENV->get_klass(k);
         set_receiver(row, klass);
@@ -321,7 +332,7 @@ void ciTypeStackSlotEntries::translate_type_data_from(const TypeStackSlotEntries
   for (int i = 0; i < number_of_entries(); i++) {
     intptr_t k = entries->type(i);
     Klass* klass = (Klass*)klass_part(k);
-    if (klass != nullptr && !klass->is_loader_alive()) {
+    if (klass == nullptr || !klass->is_loader_present_and_alive() || !is_klass_loaded(klass)) {
       // With concurrent class unloading, the MDO could have stale metadata; override it
       TypeStackSlotEntries::set_type(i, TypeStackSlotEntries::with_status((Klass*)nullptr, k));
     } else {
@@ -333,7 +344,7 @@ void ciTypeStackSlotEntries::translate_type_data_from(const TypeStackSlotEntries
 void ciReturnTypeEntry::translate_type_data_from(const ReturnTypeEntry* ret) {
   intptr_t k = ret->type();
   Klass* klass = (Klass*)klass_part(k);
-  if (klass != nullptr && !klass->is_loader_alive()) {
+  if (klass == nullptr || !klass->is_loader_present_and_alive() || !is_klass_loaded(klass)) {
     // With concurrent class unloading, the MDO could have stale metadata; override it
     set_type(ReturnTypeEntry::with_status((Klass*)nullptr, k));
   } else {
diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
index 1fa590e4ad3..2af5d812922 100644
--- a/src/hotspot/share/ci/ciObjectFactory.cpp
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
@@ -44,10 +44,12 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/vmClasses.hpp"
 #include "compiler/compiler_globals.hpp"
+#include "compiler/compileTask.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/signature.hpp"
 #include "utilities/macros.hpp"
@@ -108,7 +110,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::Tag::tag_cienv);
+  Arena* arena = new (mtCompiler) Arena(mtCompiler);
   ciEnv initial(arena);
   ciEnv* env = ciEnv::current();
   env->_factory->init_shared_objects();
@@ -232,26 +234,40 @@ void ciObjectFactory::remove_symbols() {
 ciObject* ciObjectFactory::get(oop key) {
   ASSERT_IN_VM;
 
-  assert(Universe::heap()->is_in(key), "must be");
+  Handle keyHandle(Thread::current(), key);
+  assert(Universe::heap()->is_in(keyHandle()), "must be");
 
-  NonPermObject* &bucket = find_non_perm(key);
+  NonPermObject* &bucket = find_non_perm(keyHandle);
   if (bucket != nullptr) {
     return bucket->object();
   }
 
   // The ciObject does not yet exist.  Create it and insert it
   // into the cache.
-  Handle keyHandle(Thread::current(), key);
   ciObject* new_object = create_new_object(keyHandle());
   assert(keyHandle() == new_object->get_oop(), "must be properly recorded");
   init_ident_of(new_object);
   assert(Universe::heap()->is_in(new_object->get_oop()), "must be");
 
   // Not a perm-space object.
-  insert_non_perm(bucket, keyHandle(), new_object);
+  insert_non_perm(bucket, keyHandle, new_object);
+  notice_new_object(new_object);
   return new_object;
 }
 
+void ciObjectFactory::notice_new_object(ciBaseObject* new_object) {
+  if (TrainingData::need_data()) {
+    ciEnv* env = ciEnv::current();
+    if (env->task() != nullptr) {
+      // Note: task will be null during init_compiler_runtime.
+      CompileTrainingData* td = env->task()->training_data();
+      if (td != nullptr) {
+        td->notice_jit_observation(env, new_object);
+      }
+    }
+  }
+}
+
 int ciObjectFactory::metadata_compare(Metadata* const& key, ciMetadata* const& elt) {
   Metadata* value = elt->constant_encoding();
   if (key < value)      return -1;
@@ -331,6 +347,7 @@ ciMetadata* ciObjectFactory::get_metadata(Metadata* key) {
     }
     assert(!found, "no double insert");
     _ci_metadata.insert_before(index, new_object);
+    notice_new_object(new_object);
     return new_object;
   }
   return _ci_metadata.at(index)->as_metadata();
@@ -636,12 +653,12 @@ static ciObjectFactory::NonPermObject* emptyBucket = nullptr;
 // Use a small hash table, hashed on the klass of the key.
 // If there is no entry in the cache corresponding to this oop, return
 // the null tail of the bucket into which the oop should be inserted.
-ciObjectFactory::NonPermObject* &ciObjectFactory::find_non_perm(oop key) {
-  assert(Universe::heap()->is_in(key), "must be");
-  ciMetadata* klass = get_metadata(key->klass());
+ciObjectFactory::NonPermObject* &ciObjectFactory::find_non_perm(Handle keyHandle) {
+  assert(Universe::heap()->is_in(keyHandle()), "must be");
+  ciMetadata* klass = get_metadata(keyHandle->klass()); // This may safepoint!
   NonPermObject* *bp = &_non_perm_bucket[(unsigned) klass->hash() % NON_PERM_BUCKETS];
   for (NonPermObject* p; (p = (*bp)) != nullptr; bp = &p->next()) {
-    if (is_equal(p, key))  break;
+    if (is_equal(p, keyHandle()))  break;
   }
   return (*bp);
 }
@@ -664,12 +681,12 @@ inline ciObjectFactory::NonPermObject::NonPermObject(ciObjectFactory::NonPermObj
 // ciObjectFactory::insert_non_perm
 //
 // Insert a ciObject into the non-perm table.
-void ciObjectFactory::insert_non_perm(ciObjectFactory::NonPermObject* &where, oop key, ciObject* obj) {
-  assert(Universe::heap()->is_in_or_null(key), "must be");
+void ciObjectFactory::insert_non_perm(ciObjectFactory::NonPermObject* &where, Handle keyHandle, ciObject* obj) {
+  assert(Universe::heap()->is_in_or_null(keyHandle()), "must be");
   assert(&where != &emptyBucket, "must not try to fill empty bucket");
-  NonPermObject* p = new (arena()) NonPermObject(where, key, obj);
-  assert(where == p && is_equal(p, key) && p->object() == obj, "entry must match");
-  assert(find_non_perm(key) == p, "must find the same spot");
+  NonPermObject* p = new (arena()) NonPermObject(where, keyHandle(), obj);
+  assert(where == p && is_equal(p, keyHandle()) && p->object() == obj, "entry must match");
+  assert(find_non_perm(keyHandle) == p, "must find the same spot");
   ++_non_perm_count;
 }
 
diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp
index d95a7d1ff22..15ff2e48eb6 100644
--- a/src/hotspot/share/ci/ciObjectFactory.hpp
+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
@@ -37,6 +37,7 @@
 // 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:
@@ -77,8 +78,8 @@ class ciObjectFactory : public ArenaObj {
     return p->object()->get_oop() == key;
   }
 
-  NonPermObject* &find_non_perm(oop key);
-  void insert_non_perm(NonPermObject* &where, oop key, ciObject* obj);
+  NonPermObject* &find_non_perm(Handle keyHandle);
+  void insert_non_perm(NonPermObject* &where, Handle keyHandle, ciObject* obj);
 
   void init_ident_of(ciBaseObject* obj);
 
@@ -106,6 +107,9 @@ class ciObjectFactory : public ArenaObj {
   // Get the ciSymbol corresponding to one of the vmSymbols.
   static ciSymbol* vm_symbol_at(vmSymbolID index);
 
+  // Called on every new object made.
+  void notice_new_object(ciBaseObject* new_object);
+
   // Get the ciMethod representing an unloaded/unfound method.
   ciMethod* get_unloaded_method(ciInstanceKlass* holder,
                                 ciSymbol*        name,
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 47fbd06f629..83299eda8c7 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -241,6 +241,7 @@ template <
   bool (*EQUALS)(V value, K key, int len)
   >
 class CompactHashtable : public SimpleCompactHashtable {
+  friend class VMStructs;
 
   V decode(u4 offset) const {
     return DECODE(_base_address, offset);
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index bf29dcf70e5..c949119d363 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -659,6 +659,11 @@ bool SystemDictionaryShared::should_be_excluded(Klass* k) {
   } else {
     InstanceKlass* ik = InstanceKlass::cast(k);
 
+    if (CDSConfig::is_dumping_dynamic_archive() && ik->is_shared()) {
+      // ik is already part of the static archive, so it will never be considered as excluded.
+      return false;
+    }
+
     if (!SafepointSynchronize::is_at_safepoint()) {
       if (!ik->is_linked()) {
         // check_for_exclusion() below doesn't link unlinked classes. We come
@@ -1003,7 +1008,7 @@ void SystemDictionaryShared::copy_linking_constraints_from_preimage(InstanceKlas
 }
 
 unsigned int SystemDictionaryShared::hash_for_shared_dictionary(address ptr) {
-  if (ArchiveBuilder::is_active()) {
+  if (ArchiveBuilder::is_active() && ArchiveBuilder::current()->is_in_buffer_space(ptr)) {
     uintx offset = ArchiveBuilder::current()->any_to_offset(ptr);
     unsigned int hash = primitive_hash<uintx>(offset);
     DEBUG_ONLY({
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 9885136bed2..d95debeda44 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotLinkedClassBulkLoader.hpp"
 #include "code/scopeDesc.hpp"
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compileBroker.hpp"
@@ -31,6 +32,7 @@
 #include "oops/method.inline.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/deoptimization.hpp"
@@ -50,11 +52,13 @@
 #include "jvmci/jvmci.hpp"
 #endif
 
-jlong CompilationPolicy::_start_time = 0;
+int64_t CompilationPolicy::_start_time = 0;
 int CompilationPolicy::_c1_count = 0;
 int CompilationPolicy::_c2_count = 0;
 double CompilationPolicy::_increase_threshold_at_ratio = 0;
 
+CompilationPolicy::TrainingReplayQueue CompilationPolicy::_training_replay_queue;
+
 void compilationPolicy_init() {
   CompilationPolicy::initialize();
 }
@@ -78,36 +82,114 @@ bool CompilationPolicy::must_be_compiled(const methodHandle& m, int comp_level)
   if (m->has_compiled_code()) return false;       // already compiled
   if (!can_be_compiled(m, comp_level)) return false;
 
-  return !UseInterpreter ||                                              // must compile all methods
+  return !UseInterpreter ||                                                                        // must compile all methods
          (AlwaysCompileLoopMethods && m->has_loops() && CompileBroker::should_compile_new_jobs()); // eagerly compile loop methods
 }
 
+void CompilationPolicy::maybe_compile_early(const methodHandle& m, TRAPS) {
+  if (m->method_holder()->is_not_initialized()) {
+    // 'is_not_initialized' means not only '!is_initialized', but also that
+    // initialization has not been started yet ('!being_initialized')
+    // Do not force compilation of methods in uninitialized classes.
+    return;
+  }
+  if (!m->is_native() && MethodTrainingData::have_data()) {
+    MethodTrainingData* mtd = MethodTrainingData::find_fast(m);
+    if (mtd == nullptr) {
+      return;              // there is no training data recorded for m
+    }
+    CompLevel cur_level = static_cast<CompLevel>(m->highest_comp_level());
+    CompLevel next_level = trained_transition(m, cur_level, mtd, THREAD);
+    if (next_level != cur_level && can_be_compiled(m, next_level) && !CompileBroker::compilation_is_in_queue(m)) {
+      if (PrintTieredEvents) {
+        print_event(FORCE_COMPILE, m(), m(), InvocationEntryBci, next_level);
+      }
+      CompileBroker::compile_method(m, InvocationEntryBci, next_level, 0, CompileTask::Reason_MustBeCompiled, THREAD);
+      if (HAS_PENDING_EXCEPTION) {
+        CLEAR_PENDING_EXCEPTION;
+      }
+    }
+  }
+}
+
 void CompilationPolicy::compile_if_required(const methodHandle& m, TRAPS) {
+  if (!THREAD->can_call_java() || THREAD->is_Compiler_thread()) {
+    // don't force compilation, resolve was on behalf of compiler
+    return;
+  }
+  if (m->method_holder()->is_not_initialized()) {
+    // 'is_not_initialized' means not only '!is_initialized', but also that
+    // initialization has not been started yet ('!being_initialized')
+    // Do not force compilation of methods in uninitialized classes.
+    // Note that doing this would throw an assert later,
+    // in CompileBroker::compile_method.
+    // We sometimes use the link resolver to do reflective lookups
+    // even before classes are initialized.
+    return;
+  }
+
   if (must_be_compiled(m)) {
     // This path is unusual, mostly used by the '-Xcomp' stress test mode.
-
-    if (!THREAD->can_call_java() || THREAD->is_Compiler_thread()) {
-      // don't force compilation, resolve was on behalf of compiler
-      return;
-    }
-    if (m->method_holder()->is_not_initialized()) {
-      // 'is_not_initialized' means not only '!is_initialized', but also that
-      // initialization has not been started yet ('!being_initialized')
-      // Do not force compilation of methods in uninitialized classes.
-      // Note that doing this would throw an assert later,
-      // in CompileBroker::compile_method.
-      // We sometimes use the link resolver to do reflective lookups
-      // even before classes are initialized.
-      return;
-    }
     CompLevel level = initial_compile_level(m);
     if (PrintTieredEvents) {
-      print_event(COMPILE, m(), m(), InvocationEntryBci, level);
+      print_event(FORCE_COMPILE, m(), m(), InvocationEntryBci, level);
     }
     CompileBroker::compile_method(m, InvocationEntryBci, level, 0, CompileTask::Reason_MustBeCompiled, THREAD);
   }
 }
 
+void CompilationPolicy::replay_training_at_init_impl(InstanceKlass* klass, TRAPS) {
+  if (!klass->has_init_deps_processed()) {
+    ResourceMark rm;
+    log_debug(training)("Replay training: %s", klass->external_name());
+
+    KlassTrainingData* ktd = KlassTrainingData::find(klass);
+    if (ktd != nullptr) {
+      guarantee(ktd->has_holder(), "");
+      ktd->notice_fully_initialized(); // sets klass->has_init_deps_processed bit
+      assert(klass->has_init_deps_processed(), "");
+      if (AOTCompileEagerly) {
+        ktd->iterate_comp_deps([&](CompileTrainingData* ctd) {
+          if (ctd->init_deps_left() == 0) {
+            MethodTrainingData* mtd = ctd->method();
+            if (mtd->has_holder()) {
+              const methodHandle mh(THREAD, const_cast<Method*>(mtd->holder()));
+              CompilationPolicy::maybe_compile_early(mh, THREAD);
+            }
+          }
+        });
+      }
+    }
+  }
+}
+
+void CompilationPolicy::replay_training_at_init(InstanceKlass* klass, TRAPS) {
+  assert(klass->is_initialized(), "");
+  if (TrainingData::have_data() && klass->is_shared()) {
+    _training_replay_queue.push(klass, TrainingReplayQueue_lock, THREAD);
+  }
+}
+
+// For TrainingReplayQueue
+template<>
+void CompilationPolicyUtils::Queue<InstanceKlass>::print_on(outputStream* st) {
+  int pos = 0;
+  for (QueueNode* cur = _head; cur != nullptr; cur = cur->next()) {
+    ResourceMark rm;
+    InstanceKlass* ik = cur->value();
+    st->print_cr("%3d: " INTPTR_FORMAT " %s", ++pos, p2i(ik), ik->external_name());
+  }
+}
+
+void CompilationPolicy::replay_training_at_init_loop(TRAPS) {
+  while (!CompileBroker::is_compilation_disabled_forever()) {
+    InstanceKlass* ik = _training_replay_queue.pop(TrainingReplayQueue_lock, THREAD);
+    if (ik != nullptr) {
+      replay_training_at_init_impl(ik, THREAD);
+    }
+  }
+}
+
 static inline CompLevel adjust_level_for_compilability_query(CompLevel comp_level) {
   if (comp_level == CompLevel_any) {
      if (CompilerConfig::is_c1_only()) {
@@ -122,7 +204,7 @@ static inline CompLevel adjust_level_for_compilability_query(CompLevel comp_leve
 // Returns true if m is allowed to be compiled
 bool CompilationPolicy::can_be_compiled(const methodHandle& m, int comp_level) {
   // allow any levels for WhiteBox
-  assert(WhiteBoxAPI || comp_level == CompLevel_any || is_compile(comp_level), "illegal compilation level");
+  assert(WhiteBoxAPI || comp_level == CompLevel_any || is_compile(comp_level), "illegal compilation level %d", comp_level);
 
   if (m->is_abstract()) return false;
   if (DontCompileHugeMethods && m->code_size() > HugeMethodLimit) return false;
@@ -322,7 +404,7 @@ double CompilationPolicy::threshold_scale(CompLevel level, int feedback_k) {
   return 1;
 }
 
-void CompilationPolicy::print_counters(const char* prefix, const Method* m) {
+void CompilationPolicy::print_counters(const char* prefix, Method* m) {
   int invocation_count = m->invocation_count();
   int backedge_count = m->backedge_count();
   MethodData* mdh = m->method_data();
@@ -342,8 +424,36 @@ void CompilationPolicy::print_counters(const char* prefix, const Method* m) {
       m->highest_comp_level(), m->highest_osr_comp_level());
 }
 
+void CompilationPolicy::print_training_data(const char* prefix, Method* method) {
+  methodHandle m(Thread::current(), method);
+  tty->print(" %smtd: ", prefix);
+  MethodTrainingData* mtd = MethodTrainingData::find(m);
+  if (mtd == nullptr) {
+    tty->print("null");
+  } else {
+    MethodData* md = mtd->final_profile();
+    tty->print("mdo=");
+    if (md == nullptr) {
+      tty->print("null");
+    } else {
+      int mdo_invocations = md->invocation_count();
+      int mdo_backedges = md->backedge_count();
+      int mdo_invocations_start = md->invocation_count_start();
+      int mdo_backedges_start = md->backedge_count_start();
+      tty->print("%d(%d), %d(%d)", mdo_invocations, mdo_invocations_start, mdo_backedges, mdo_backedges_start);
+    }
+    CompileTrainingData* ctd = mtd->last_toplevel_compile(CompLevel_full_optimization);
+    tty->print(", deps=");
+    if (ctd == nullptr) {
+      tty->print("null");
+    } else {
+      tty->print("%d", ctd->init_deps_left());
+    }
+  }
+}
+
 // Print an event.
-void CompilationPolicy::print_event(EventType type, const Method* m, const Method* im, int bci, CompLevel level) {
+void CompilationPolicy::print_event(EventType type, Method* m, Method* im, int bci, CompLevel level) {
   bool inlinee_event = m != im;
 
   ttyLocker tty_lock;
@@ -359,6 +469,9 @@ void CompilationPolicy::print_event(EventType type, const Method* m, const Metho
   case COMPILE:
     tty->print("compile");
     break;
+  case FORCE_COMPILE:
+    tty->print("force-compile");
+    break;
   case REMOVE_FROM_QUEUE:
     tty->print("remove-from-queue");
     break;
@@ -424,6 +537,10 @@ void CompilationPolicy::print_event(EventType type, const Method* m, const Metho
     if (m->queued_for_compilation()) {
       tty->print("in-queue");
     } else tty->print("idle");
+    print_training_data("", m);
+    if (inlinee_event) {
+      print_training_data("inlinee ", im);
+    }
   }
   tty->print_cr("]");
 }
@@ -617,12 +734,12 @@ void CompilationPolicy::handle_counter_overflow(const methodHandle& method) {
 }
 
 // Called with the queue locked and with at least one element
-CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
+CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue, JavaThread* THREAD) {
   CompileTask *max_blocking_task = nullptr;
   CompileTask *max_task = nullptr;
   Method* max_method = nullptr;
 
-  jlong t = nanos_to_millis(os::javaTimeNanos());
+  int64_t t = nanos_to_millis(os::javaTimeNanos());
   // Iterate through the queue and find a method with a maximum rate.
   for (CompileTask* task = compile_queue->first(); task != nullptr;) {
     CompileTask* next_task = task->next();
@@ -639,7 +756,7 @@ CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
       return task;
     }
     Method* method = task->method();
-    methodHandle mh(Thread::current(), method);
+    methodHandle mh(THREAD, method);
     if (task->can_become_stale() && is_stale(t, TieredCompileTaskTimeout, mh) && !is_old(mh)) {
       if (PrintTieredEvents) {
         print_event(REMOVE_FROM_QUEUE, method, method, task->osr_bci(), (CompLevel) task->comp_level());
@@ -675,7 +792,7 @@ CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
     max_method = max_task->method();
   }
 
-  methodHandle max_method_h(Thread::current(), max_method);
+  methodHandle max_method_h(THREAD, max_method);
 
   if (max_task != nullptr && max_task->comp_level() == CompLevel_full_profile && TieredStopAtLevel > CompLevel_full_profile &&
       max_method != nullptr && is_method_profiled(max_method_h) && !Arguments::is_compiler_only()) {
@@ -694,7 +811,6 @@ CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
       print_event(UPDATE_IN_QUEUE, max_method, max_method, max_task->osr_bci(), (CompLevel)max_task->comp_level());
     }
   }
-
   return max_task;
 }
 
@@ -717,6 +833,13 @@ nmethod* CompilationPolicy::event(const methodHandle& method, const methodHandle
     print_event(bci == InvocationEntryBci ? CALL : LOOP, method(), inlinee(), bci, comp_level);
   }
 
+#if INCLUDE_JVMCI
+  if (EnableJVMCI && UseJVMCICompiler &&
+      comp_level == CompLevel_full_optimization CDS_ONLY(&& !AOTLinkedClassBulkLoader::class_preloading_finished())) {
+    return nullptr;
+  }
+#endif
+
   if (comp_level == CompLevel_none &&
       JvmtiExport::can_post_interpreter_events() &&
       THREAD->is_interp_only_mode()) {
@@ -817,7 +940,7 @@ void CompilationPolicy::compile(const methodHandle& mh, int bci, CompLevel level
 }
 
 // update_rate() is called from select_task() while holding a compile queue lock.
-void CompilationPolicy::update_rate(jlong t, const methodHandle& method) {
+void CompilationPolicy::update_rate(int64_t t, const methodHandle& method) {
   // Skip update if counters are absent.
   // Can't allocate them since we are holding compile queue lock.
   if (method->method_counters() == nullptr)  return;
@@ -831,8 +954,8 @@ void CompilationPolicy::update_rate(jlong t, const methodHandle& method) {
 
   // We don't update the rate if we've just came out of a safepoint.
   // delta_s is the time since last safepoint in milliseconds.
-  jlong delta_s = t - SafepointTracing::end_of_last_safepoint_ms();
-  jlong delta_t = t - (method->prev_time() != 0 ? method->prev_time() : start_time()); // milliseconds since the last measurement
+  int64_t delta_s = t - SafepointTracing::end_of_last_safepoint_ms();
+  int64_t delta_t = t - (method->prev_time() != 0 ? method->prev_time() : start_time()); // milliseconds since the last measurement
   // How many events were there since the last time?
   int event_count = method->invocation_count() + method->backedge_count();
   int delta_e = event_count - method->prev_event_count();
@@ -855,9 +978,9 @@ void CompilationPolicy::update_rate(jlong t, const methodHandle& method) {
 
 // Check if this method has been stale for a given number of milliseconds.
 // See select_task().
-bool CompilationPolicy::is_stale(jlong t, jlong timeout, const methodHandle& method) {
-  jlong delta_s = t - SafepointTracing::end_of_last_safepoint_ms();
-  jlong delta_t = t - method->prev_time();
+bool CompilationPolicy::is_stale(int64_t t, int64_t timeout, const methodHandle& method) {
+  int64_t delta_s = t - SafepointTracing::end_of_last_safepoint_ms();
+  int64_t delta_t = t - method->prev_time();
   if (delta_t > timeout && delta_s > timeout) {
     int event_count = method->invocation_count() + method->backedge_count();
     int delta_e = event_count - method->prev_event_count();
@@ -908,13 +1031,12 @@ bool CompilationPolicy::is_method_profiled(const methodHandle& method) {
 
 
 // Determine is a method is mature.
-bool CompilationPolicy::is_mature(Method* method) {
+bool CompilationPolicy::is_mature(MethodData* mdo) {
   if (Arguments::is_compiler_only()) {
     // Always report profiles as immature with -Xcomp
     return false;
   }
-  methodHandle mh(Thread::current(), method);
-  MethodData* mdo = method->method_data();
+  methodHandle mh(Thread::current(), mdo->method());
   if (mdo != nullptr) {
     int i = mdo->invocation_count();
     int b = mdo->backedge_count();
@@ -931,9 +1053,18 @@ bool CompilationPolicy::should_create_mdo(const methodHandle& method, CompLevel
   if (cur_level != CompLevel_none || force_comp_at_level_simple(method) || CompilationModeFlag::quick_only() || !ProfileInterpreter) {
     return false;
   }
+
+  if (TrainingData::have_data()) {
+    MethodTrainingData* mtd = MethodTrainingData::find_fast(method);
+    if (mtd != nullptr && mtd->saw_level(CompLevel_full_optimization)) {
+      return true;
+    }
+  }
+
   if (is_old(method)) {
     return true;
   }
+
   int i = method->invocation_count();
   int b = method->backedge_count();
   double k = Tier0ProfilingStartPercentage / 100.0;
@@ -967,7 +1098,7 @@ void CompilationPolicy::create_mdo(const methodHandle& mh, JavaThread* THREAD) {
   if (mh->method_data() == nullptr) {
     Method::build_profiling_method_data(mh, CHECK_AND_CLEAR);
   }
-  if (ProfileInterpreter) {
+  if (ProfileInterpreter && THREAD->has_last_Java_frame()) {
     MethodData* mdo = mh->method_data();
     if (mdo != nullptr) {
       frame last_frame = THREAD->last_frame();
@@ -980,7 +1111,136 @@ void CompilationPolicy::create_mdo(const methodHandle& mh, JavaThread* THREAD) {
   }
 }
 
+CompLevel CompilationPolicy::trained_transition_from_none(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD) {
+  precond(mtd != nullptr);
+  precond(cur_level == CompLevel_none);
+
+  if (mtd->only_inlined() && !mtd->saw_level(CompLevel_full_optimization)) {
+    return CompLevel_none;
+  }
+
+  bool training_has_profile = (mtd->final_profile() != nullptr);
+  if (mtd->saw_level(CompLevel_full_optimization) && !training_has_profile) {
+    return CompLevel_full_profile;
+  }
+
+  CompLevel highest_training_level = static_cast<CompLevel>(mtd->highest_top_level());
+  switch (highest_training_level) {
+    case CompLevel_limited_profile:
+    case CompLevel_full_profile:
+      return CompLevel_limited_profile;
+    case CompLevel_simple:
+      return CompLevel_simple;
+    case CompLevel_none:
+      return CompLevel_none;
+    default:
+      break;
+  }
+
+  // Now handle the case of level 4.
+  assert(highest_training_level == CompLevel_full_optimization, "Unexpected compilation level: %d", highest_training_level);
+  if (!training_has_profile) {
+    // The method was a part of a level 4 compile, but don't have a stored profile,
+    // we need to profile it.
+    return CompLevel_full_profile;
+  }
+  const bool deopt = (static_cast<CompLevel>(method->highest_comp_level()) == CompLevel_full_optimization);
+  // If we deopted, then we reprofile
+  if (deopt && !is_method_profiled(method)) {
+    return CompLevel_full_profile;
+  }
+
+  CompileTrainingData* ctd = mtd->last_toplevel_compile(CompLevel_full_optimization);
+  assert(ctd != nullptr, "Should have CTD for CompLevel_full_optimization");
+  // With SkipTier2IfPossible and all deps satisfied, go to level 4 immediately
+  if (SkipTier2IfPossible && ctd->init_deps_left() == 0) {
+    if (method->method_data() == nullptr) {
+      create_mdo(method, THREAD);
+    }
+    return CompLevel_full_optimization;
+  }
+
+  // Otherwise go to level 2
+  return CompLevel_limited_profile;
+}
+
+
+CompLevel CompilationPolicy::trained_transition_from_limited_profile(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD) {
+  precond(mtd != nullptr);
+  precond(cur_level == CompLevel_limited_profile);
+
+  // One of the main reasons that we can get here is that we're waiting for the stored C2 code to become ready.
+
+  // But first, check if we have a saved profile
+  bool training_has_profile = (mtd->final_profile() != nullptr);
+  if (!training_has_profile) {
+    return CompLevel_full_profile;
+  }
+
+
+  assert(training_has_profile, "Have to have a profile to be here");
+  // Check if the method is ready
+  CompileTrainingData* ctd = mtd->last_toplevel_compile(CompLevel_full_optimization);
+  if (ctd != nullptr && ctd->init_deps_left() == 0) {
+    if (method->method_data() == nullptr) {
+      create_mdo(method, THREAD);
+    }
+    return CompLevel_full_optimization;
+  }
+
+  // Otherwise stay at the current level
+  return CompLevel_limited_profile;
+}
+
+
+CompLevel CompilationPolicy::trained_transition_from_full_profile(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD) {
+  precond(mtd != nullptr);
+  precond(cur_level == CompLevel_full_profile);
+
+  CompLevel highest_training_level = static_cast<CompLevel>(mtd->highest_top_level());
+  // We have method at the full profile level and we also know that it's possibly an important method.
+  if (highest_training_level == CompLevel_full_optimization && !mtd->only_inlined()) {
+    // Check if it is adequately profiled
+    if (is_method_profiled(method)) {
+      return CompLevel_full_optimization;
+    }
+  }
+
+  // Otherwise stay at the current level
+  return CompLevel_full_profile;
+}
+
+CompLevel CompilationPolicy::trained_transition(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD) {
+  precond(MethodTrainingData::have_data());
 
+  // If there is no training data recorded for this method, bail out.
+  if (mtd == nullptr) {
+    return cur_level;
+  }
+
+  CompLevel next_level = cur_level;
+  switch(cur_level) {
+    default: break;
+    case CompLevel_none:
+      next_level = trained_transition_from_none(method, cur_level, mtd, THREAD);
+      break;
+    case CompLevel_limited_profile:
+      next_level = trained_transition_from_limited_profile(method, cur_level, mtd, THREAD);
+      break;
+    case CompLevel_full_profile:
+      next_level = trained_transition_from_full_profile(method, cur_level, mtd, THREAD);
+      break;
+  }
+
+  // We don't have any special strategies for the C2-only compilation modes, so just fix up the levels for now.
+  if (CompilationModeFlag::high_only_quick_internal() && CompLevel_simple < next_level && next_level < CompLevel_full_optimization) {
+    return CompLevel_none;
+  }
+  if (CompilationModeFlag::high_only() && next_level < CompLevel_full_optimization) {
+    return CompLevel_none;
+  }
+  return (cur_level != next_level) ? limit_level(next_level) : cur_level;
+}
 
 /*
  * Method states:
@@ -1022,93 +1282,137 @@ void CompilationPolicy::create_mdo(const methodHandle& mh, JavaThread* THREAD) {
 
 // Common transition function. Given a predicate determines if a method should transition to another level.
 template<typename Predicate>
-CompLevel CompilationPolicy::common(const methodHandle& method, CompLevel cur_level, bool disable_feedback) {
+CompLevel CompilationPolicy::common(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD, bool disable_feedback) {
   CompLevel next_level = cur_level;
-  int i = method->invocation_count();
-  int b = method->backedge_count();
 
   if (force_comp_at_level_simple(method)) {
     next_level = CompLevel_simple;
-  } else {
-    if (is_trivial(method) || method->is_native()) {
-      next_level = CompilationModeFlag::disable_intermediate() ? CompLevel_full_optimization : CompLevel_simple;
+  } else if (is_trivial(method) || method->is_native()) {
+    // We do not care if there is profiling data for these methods, throw them to compiler.
+    next_level = CompilationModeFlag::disable_intermediate() ? CompLevel_full_optimization : CompLevel_simple;
+  } else if (MethodTrainingData::have_data()) {
+    MethodTrainingData* mtd = MethodTrainingData::find_fast(method);
+    if (mtd == nullptr) {
+      // We haven't see compilations of this method in training. It's either very cold or the behavior changed.
+      // Feed it to the standard TF with no profiling delay.
+      next_level = standard_transition<Predicate>(method, cur_level, false /*delay_profiling*/, disable_feedback);
     } else {
-      switch(cur_level) {
-      default: break;
-      case CompLevel_none:
-        // If we were at full profile level, would we switch to full opt?
-        if (common<Predicate>(method, CompLevel_full_profile, disable_feedback) == CompLevel_full_optimization) {
-          next_level = CompLevel_full_optimization;
-        } else if (!CompilationModeFlag::disable_intermediate() && Predicate::apply(method, cur_level, i, b)) {
-          // C1-generated fully profiled code is about 30% slower than the limited profile
-          // code that has only invocation and backedge counters. The observation is that
-          // if C2 queue is large enough we can spend too much time in the fully profiled code
-          // while waiting for C2 to pick the method from the queue. To alleviate this problem
-          // we introduce a feedback on the C2 queue size. If the C2 queue is sufficiently long
-          // we choose to compile a limited profiled version and then recompile with full profiling
-          // when the load on C2 goes down.
-          if (!disable_feedback && CompileBroker::queue_size(CompLevel_full_optimization) >
-              Tier3DelayOn * compiler_count(CompLevel_full_optimization)) {
-            next_level = CompLevel_limited_profile;
-          } else {
-            next_level = CompLevel_full_profile;
-          }
-        }
-        break;
-      case CompLevel_limited_profile:
-        if (is_method_profiled(method)) {
-          // Special case: we got here because this method was fully profiled in the interpreter.
-          next_level = CompLevel_full_optimization;
-        } else {
-          MethodData* mdo = method->method_data();
-          if (mdo != nullptr) {
-            if (mdo->would_profile()) {
-              if (disable_feedback || (CompileBroker::queue_size(CompLevel_full_optimization) <=
-                                       Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
-                                       Predicate::apply(method, cur_level, i, b))) {
-                next_level = CompLevel_full_profile;
-              }
-            } else {
-              next_level = CompLevel_full_optimization;
-            }
-          } else {
-            // If there is no MDO we need to profile
-            if (disable_feedback || (CompileBroker::queue_size(CompLevel_full_optimization) <=
-                                     Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
-                                     Predicate::apply(method, cur_level, i, b))) {
-              next_level = CompLevel_full_profile;
-            }
-          }
-        }
-        break;
-      case CompLevel_full_profile:
-        {
-          MethodData* mdo = method->method_data();
-          if (mdo != nullptr) {
-            if (mdo->would_profile() || CompilationModeFlag::disable_intermediate()) {
-              int mdo_i = mdo->invocation_count_delta();
-              int mdo_b = mdo->backedge_count_delta();
-              if (Predicate::apply(method, cur_level, mdo_i, mdo_b)) {
-                next_level = CompLevel_full_optimization;
-              }
-            } else {
-              next_level = CompLevel_full_optimization;
-            }
-          }
-        }
-        break;
+      next_level = trained_transition(method, cur_level, mtd, THREAD);
+      if (cur_level == next_level) {
+        // trained_transtion() is going to return the same level if no startup/warmup optimizations apply.
+        // In order to catch possible pathologies due to behavior change we feed the event to the regular
+        // TF but with profiling delay.
+        next_level = standard_transition<Predicate>(method, cur_level, true /*delay_profiling*/, disable_feedback);
       }
     }
+  } else {
+    next_level = standard_transition<Predicate>(method, cur_level, false /*delay_profiling*/, disable_feedback);
   }
   return (next_level != cur_level) ? limit_level(next_level) : next_level;
 }
 
 
+template<typename Predicate>
+CompLevel CompilationPolicy::standard_transition(const methodHandle& method, CompLevel cur_level, bool delay_profiling, bool disable_feedback) {
+  CompLevel next_level = cur_level;
+  switch(cur_level) {
+  default: break;
+  case CompLevel_none:
+    next_level = transition_from_none<Predicate>(method, cur_level, delay_profiling, disable_feedback);
+    break;
+  case CompLevel_limited_profile:
+    next_level = transition_from_limited_profile<Predicate>(method, cur_level, delay_profiling, disable_feedback);
+    break;
+  case CompLevel_full_profile:
+    next_level = transition_from_full_profile<Predicate>(method, cur_level);
+    break;
+  }
+  return next_level;
+}
+
+template<typename Predicate>
+CompLevel CompilationPolicy::transition_from_none(const methodHandle& method, CompLevel cur_level, bool delay_profiling, bool disable_feedback) {
+  precond(cur_level == CompLevel_none);
+  CompLevel next_level = cur_level;
+  int i = method->invocation_count();
+  int b = method->backedge_count();
+  double scale = delay_profiling ? Tier0ProfileDelayFactor : 1.0;
+  // If we were at full profile level, would we switch to full opt?
+  if (transition_from_full_profile<Predicate>(method, CompLevel_full_profile) == CompLevel_full_optimization) {
+    next_level = CompLevel_full_optimization;
+  } else if (!CompilationModeFlag::disable_intermediate() && Predicate::apply_scaled(method, cur_level, i, b, scale)) {
+    // C1-generated fully profiled code is about 30% slower than the limited profile
+    // code that has only invocation and backedge counters. The observation is that
+    // if C2 queue is large enough we can spend too much time in the fully profiled code
+    // while waiting for C2 to pick the method from the queue. To alleviate this problem
+    // we introduce a feedback on the C2 queue size. If the C2 queue is sufficiently long
+    // we choose to compile a limited profiled version and then recompile with full profiling
+    // when the load on C2 goes down.
+    if (delay_profiling || (!disable_feedback && CompileBroker::queue_size(CompLevel_full_optimization) > Tier3DelayOn * compiler_count(CompLevel_full_optimization))) {
+      next_level = CompLevel_limited_profile;
+    } else {
+      next_level = CompLevel_full_profile;
+    }
+  }
+  return next_level;
+}
+
+template<typename Predicate>
+CompLevel CompilationPolicy::transition_from_full_profile(const methodHandle& method, CompLevel cur_level) {
+  precond(cur_level == CompLevel_full_profile);
+  CompLevel next_level = cur_level;
+  MethodData* mdo = method->method_data();
+  if (mdo != nullptr) {
+    if (mdo->would_profile() || CompilationModeFlag::disable_intermediate()) {
+      int mdo_i = mdo->invocation_count_delta();
+      int mdo_b = mdo->backedge_count_delta();
+      if (Predicate::apply(method, cur_level, mdo_i, mdo_b)) {
+        next_level = CompLevel_full_optimization;
+      }
+    } else {
+      next_level = CompLevel_full_optimization;
+    }
+  }
+  return next_level;
+}
+
+template<typename Predicate>
+CompLevel CompilationPolicy::transition_from_limited_profile(const methodHandle& method, CompLevel cur_level, bool delay_profiling, bool disable_feedback) {
+  precond(cur_level == CompLevel_limited_profile);
+  CompLevel next_level = cur_level;
+  int i = method->invocation_count();
+  int b = method->backedge_count();
+  double scale = delay_profiling ? Tier2ProfileDelayFactor : 1.0;
+  MethodData* mdo = method->method_data();
+  if (mdo != nullptr) {
+    if (mdo->would_profile()) {
+      if (disable_feedback || (CompileBroker::queue_size(CompLevel_full_optimization) <=
+                              Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
+                              Predicate::apply_scaled(method, cur_level, i, b, scale))) {
+        next_level = CompLevel_full_profile;
+      }
+    } else {
+      next_level = CompLevel_full_optimization;
+    }
+  } else {
+    // If there is no MDO we need to profile
+    if (disable_feedback || (CompileBroker::queue_size(CompLevel_full_optimization) <=
+                            Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
+                            Predicate::apply_scaled(method, cur_level, i, b, scale))) {
+      next_level = CompLevel_full_profile;
+    }
+  }
+  if (next_level == CompLevel_full_profile && is_method_profiled(method)) {
+    next_level = CompLevel_full_optimization;
+  }
+  return next_level;
+}
+
 
 // Determine if a method should be compiled with a normal entry point at a different level.
-CompLevel CompilationPolicy::call_event(const methodHandle& method, CompLevel cur_level, Thread* thread) {
-  CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(), common<LoopPredicate>(method, cur_level, true));
-  CompLevel next_level = common<CallPredicate>(method, cur_level, is_old(method));
+CompLevel CompilationPolicy::call_event(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD) {
+  CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(), common<LoopPredicate>(method, cur_level, THREAD, true));
+  CompLevel next_level = common<CallPredicate>(method, cur_level, THREAD, !TrainingData::have_data() && is_old(method));
 
   // If OSR method level is greater than the regular method level, the levels should be
   // equalized by raising the regular method level in order to avoid OSRs during each
@@ -1122,12 +1426,18 @@ CompLevel CompilationPolicy::call_event(const methodHandle& method, CompLevel cu
   } else {
     next_level = MAX2(osr_level, next_level);
   }
+#if INCLUDE_JVMCI
+  if (EnableJVMCI && UseJVMCICompiler &&
+      next_level == CompLevel_full_optimization CDS_ONLY(&& !AOTLinkedClassBulkLoader::class_preloading_finished())) {
+    next_level = cur_level;
+  }
+#endif
   return next_level;
 }
 
 // Determine if we should do an OSR compilation of a given method.
-CompLevel CompilationPolicy::loop_event(const methodHandle& method, CompLevel cur_level, Thread* thread) {
-  CompLevel next_level = common<LoopPredicate>(method, cur_level, true);
+CompLevel CompilationPolicy::loop_event(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD) {
+  CompLevel next_level = common<LoopPredicate>(method, cur_level, THREAD, true);
   if (cur_level == CompLevel_none) {
     // If there is a live OSR method that means that we deopted to the interpreter
     // for the transition.
diff --git a/src/hotspot/share/compiler/compilationPolicy.hpp b/src/hotspot/share/compiler/compilationPolicy.hpp
index fe33fb8cfba..75374a2f830 100644
--- a/src/hotspot/share/compiler/compilationPolicy.hpp
+++ b/src/hotspot/share/compiler/compilationPolicy.hpp
@@ -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
@@ -28,8 +28,82 @@
 #include "code/nmethod.hpp"
 #include "compiler/compileBroker.hpp"
 #include "oops/methodData.hpp"
+#include "oops/trainingData.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+namespace CompilationPolicyUtils {
+template<typename T>
+class Queue {
+  class QueueNode : public CHeapObj<mtCompiler> {
+    T* _value;
+    QueueNode* _next;
+  public:
+    QueueNode(T* value, QueueNode* next) : _value(value), _next(next) { }
+    T* value() const { return _value; }
+    void set_next(QueueNode* next) { _next = next; }
+    QueueNode* next() const { return _next; }
+  };
+
+  QueueNode* _head;
+  QueueNode* _tail;
+
+  void push_unlocked(T* value) {
+    QueueNode* n = new QueueNode(value, nullptr);
+    if (_tail != nullptr) {
+      _tail->set_next(n);
+    }
+    _tail = n;
+    if (_head == nullptr) {
+      _head = _tail;
+    }
+  }
+  T* pop_unlocked() {
+    QueueNode* n = _head;
+    if (_head != nullptr) {
+      _head = _head->next();
+    }
+    if (_head == nullptr) {
+      _tail = _head;
+    }
+    T* value = nullptr;
+    if (n != nullptr) {
+      value = n->value();
+      delete n;
+    }
+    return value;
+  }
+public:
+  Queue() : _head(nullptr), _tail(nullptr) { }
+  void push(T* value, Monitor* lock, TRAPS) {
+    MonitorLocker locker(THREAD, lock);
+    push_unlocked(value);
+    locker.notify_all();
+  }
+
+  bool is_empty_unlocked() const { return _head == nullptr; }
+
+  T* pop(Monitor* lock, TRAPS) {
+    MonitorLocker locker(THREAD, lock);
+    while(is_empty_unlocked() && !CompileBroker::is_compilation_disabled_forever()) {
+      locker.wait();
+    }
+    T* value = pop_unlocked();
+    return value;
+  }
+
+  T* try_pop(Monitor* lock, TRAPS) {
+    MonitorLocker locker(THREAD, lock);
+    T* value = nullptr;
+    if (!is_empty_unlocked()) {
+      value = pop_unlocked();
+    }
+    return value;
+  }
+
+  void print_on(outputStream* st);
+};
+} // namespace CompilationPolicyUtils
+
 class CompileTask;
 class CompileQueue;
 /*
@@ -173,9 +247,12 @@ class CompilationPolicy : AllStatic {
   friend class CallPredicate;
   friend class LoopPredicate;
 
-  static jlong _start_time;
+  typedef CompilationPolicyUtils::Queue<InstanceKlass> TrainingReplayQueue;
+
+  static int64_t _start_time;
   static int _c1_count, _c2_count;
   static double _increase_threshold_at_ratio;
+  static TrainingReplayQueue _training_replay_queue;
 
   // Set carry flags in the counters (in Method* and MDO).
   inline static void handle_counter_overflow(const methodHandle& method);
@@ -187,29 +264,45 @@ class CompilationPolicy : AllStatic {
   inline static CompLevel limit_level(CompLevel level);
   // Common transition function. Given a predicate determines if a method should transition to another level.
   template<typename Predicate>
-  static CompLevel common(const methodHandle& method, CompLevel cur_level, bool disable_feedback = false);
+  static CompLevel common(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD, bool disable_feedback = false);
+
+  template<typename Predicate>
+  static CompLevel transition_from_none(const methodHandle& method, CompLevel cur_level, bool delay_profiling, bool disable_feedback);
+  template<typename Predicate>
+  static CompLevel transition_from_limited_profile(const methodHandle& method, CompLevel cur_level, bool delay_profiling, bool disable_feedback);
+  template<typename Predicate>
+  static CompLevel transition_from_full_profile(const methodHandle& method, CompLevel cur_level);
+  template<typename Predicate>
+  static CompLevel standard_transition(const methodHandle& method, CompLevel cur_level, bool delayprof, bool disable_feedback);
+
+  static CompLevel trained_transition_from_none(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD);
+  static CompLevel trained_transition_from_limited_profile(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD);
+  static CompLevel trained_transition_from_full_profile(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD);
+  static CompLevel trained_transition(const methodHandle& method, CompLevel cur_level, MethodTrainingData* mtd, JavaThread* THREAD);
+
   // Transition functions.
   // call_event determines if a method should be compiled at a different
   // level with a regular invocation entry.
-  static CompLevel call_event(const methodHandle& method, CompLevel cur_level, Thread* thread);
+  static CompLevel call_event(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD);
   // loop_event checks if a method should be OSR compiled at a different
   // level.
-  static CompLevel loop_event(const methodHandle& method, CompLevel cur_level, Thread* thread);
-  static void print_counters(const char* prefix, const Method* m);
+  static CompLevel loop_event(const methodHandle& method, CompLevel cur_level, JavaThread* THREAD);
+  static void print_counters(const char* prefix, Method* m);
+  static void print_training_data(const char* prefix, Method* method);
   // Has a method been long around?
   // We don't remove old methods from the compile queue even if they have
   // very low activity (see select_task()).
   inline static bool is_old(const methodHandle& method);
   // Was a given method inactive for a given number of milliseconds.
   // If it is, we would remove it from the queue (see select_task()).
-  inline static bool is_stale(jlong t, jlong timeout, const methodHandle& method);
+  inline static bool is_stale(int64_t t, int64_t timeout, const methodHandle& method);
   // Compute the weight of the method for the compilation scheduling
   inline static double weight(Method* method);
   // Apply heuristics and return true if x should be compiled before y
   inline static bool compare_methods(Method* x, Method* y);
   // Compute event rate for a given method. The rate is the number of event (invocations + backedges)
   // per millisecond.
-  inline static void update_rate(jlong t, const methodHandle& method);
+  inline static void update_rate(int64_t t, const methodHandle& method);
   // Compute threshold scaling coefficient
   inline static double threshold_scale(CompLevel level, int feedback_k);
   // If a method is old enough and is still in the interpreter we would want to
@@ -224,8 +317,8 @@ class CompilationPolicy : AllStatic {
   static void set_c1_count(int x) { _c1_count = x;    }
   static void set_c2_count(int x) { _c2_count = x;    }
 
-  enum EventType { CALL, LOOP, COMPILE, REMOVE_FROM_QUEUE, UPDATE_IN_QUEUE, REPROFILE, MAKE_NOT_ENTRANT };
-  static void print_event(EventType type, const Method* m, const Method* im, int bci, CompLevel level);
+  enum EventType { CALL, LOOP, COMPILE, FORCE_COMPILE, FORCE_RECOMPILE, REMOVE_FROM_QUEUE, UPDATE_IN_QUEUE, REPROFILE, MAKE_NOT_ENTRANT };
+  static void print_event(EventType type, Method* m, Method* im, int bci, CompLevel level);
   // Check if the method can be compiled, change level if necessary
   static void compile(const methodHandle& mh, int bci, CompLevel level, TRAPS);
   // Simple methods are as good being compiled with C1 as C2.
@@ -242,21 +335,25 @@ class CompilationPolicy : AllStatic {
                                       int bci, CompLevel level, nmethod* nm, TRAPS);
 
   static void set_increase_threshold_at_ratio() { _increase_threshold_at_ratio = 100 / (100 - (double)IncreaseFirstTierCompileThresholdAt); }
-  static void set_start_time(jlong t) { _start_time = t;    }
-  static jlong start_time()           { return _start_time; }
+  static void set_start_time(int64_t t) { _start_time = t;    }
+  static int64_t start_time()           { return _start_time; }
 
   // m must be compiled before executing it
   static bool must_be_compiled(const methodHandle& m, int comp_level = CompLevel_any);
-public:
+  static void maybe_compile_early(const methodHandle& m, TRAPS);
+  static void replay_training_at_init_impl(InstanceKlass* klass, TRAPS);
+ public:
   static int min_invocations() { return Tier4MinInvocationThreshold; }
   static int c1_count() { return _c1_count; }
   static int c2_count() { return _c2_count; }
   static int compiler_count(CompLevel comp_level);
-
   // If m must_be_compiled then request a compilation from the CompileBroker.
   // This supports the -Xcomp option.
   static void compile_if_required(const methodHandle& m, TRAPS);
 
+  static void replay_training_at_init(InstanceKlass* klass, TRAPS);
+  static void replay_training_at_init_loop(TRAPS);
+
   // m is allowed to be compiled
   static bool can_be_compiled(const methodHandle& m, int comp_level = CompLevel_any);
   // m is allowed to be osr compiled
@@ -269,9 +366,9 @@ class CompilationPolicy : AllStatic {
   static nmethod* event(const methodHandle& method, const methodHandle& inlinee,
                         int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS);
   // Select task is called by CompileBroker. We should return a task or nullptr.
-  static CompileTask* select_task(CompileQueue* compile_queue);
+  static CompileTask* select_task(CompileQueue* compile_queue, JavaThread* THREAD);
   // Tell the runtime if we think a given method is adequately profiled.
-  static bool is_mature(Method* method);
+  static bool is_mature(MethodData* mdo);
   // Initialize: set compiler thread count
   static void initialize();
   static bool should_not_inline(ciEnv* env, ciMethod* callee);
@@ -280,6 +377,7 @@ class CompilationPolicy : AllStatic {
   static CompLevel initial_compile_level(const methodHandle& method);
   // Return highest level possible
   static CompLevel highest_compile_level();
+  static void dump();
 };
 
 #endif // SHARE_COMPILER_COMPILATIONPOLICY_HPP
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 6dedc873028..d23d2e4febe 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/cdsConfig.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/vmClasses.hpp"
@@ -347,6 +348,13 @@ void CompileQueue::add(CompileTask* task) {
     task->log_task_queued();
   }
 
+  if (TrainingData::need_data() && !CDSConfig::is_dumping_final_static_archive()) {
+    CompileTrainingData* ctd = CompileTrainingData::make(task);
+    if (ctd != nullptr) {
+      task->set_training_data(ctd);
+    }
+  }
+
   // Notify CompilerThreads that a task is available.
   MethodCompileQueue_lock->notify_all();
 }
@@ -441,7 +449,7 @@ CompileTask* CompileQueue::get(CompilerThread* thread) {
   CompileTask* task;
   {
     NoSafepointVerifier nsv;
-    task = CompilationPolicy::select_task(this);
+    task = CompilationPolicy::select_task(this, thread);
     if (task != nullptr) {
       task = task->select_for_compilation();
     }
@@ -781,6 +789,10 @@ void CompileBroker::compilation_init(JavaThread* THREAD) {
   _initialized = true;
 }
 
+void TrainingReplayThread::training_replay_thread_entry(JavaThread* thread, TRAPS) {
+  CompilationPolicy::replay_training_at_init_loop(thread);
+}
+
 #if defined(ASSERT) && COMPILER2_OR_JVMCI
 // Entry for DeoptimizeObjectsALotThread. The threads are started in
 // CompileBroker::init_compiler_threads() iff DeoptimizeObjectsALot is enabled
@@ -858,6 +870,9 @@ JavaThread* CompileBroker::make_thread(ThreadType type, jobject thread_handle, C
       new_thread = new DeoptimizeObjectsALotThread();
       break;
 #endif // ASSERT
+    case training_replay_t:
+      new_thread = new TrainingReplayThread();
+      break;
     default:
       ShouldNotReachHere();
   }
@@ -1015,6 +1030,16 @@ void CompileBroker::init_compiler_threads() {
 #endif // defined(ASSERT) && COMPILER2_OR_JVMCI
 }
 
+void CompileBroker::init_training_replay() {
+  // Ensure any exceptions lead to vm_exit_during_initialization.
+  EXCEPTION_MARK;
+  if (TrainingData::have_data()) {
+    Handle thread_oop = JavaThread::create_system_thread_object("Training replay thread", CHECK);
+    jobject thread_handle = JNIHandles::make_local(THREAD, thread_oop());
+    make_thread(training_replay_t, thread_handle, nullptr, nullptr, THREAD);
+  }
+}
+
 void CompileBroker::possibly_add_compiler_threads(JavaThread* THREAD) {
 
   int old_c2_count = 0, new_c2_count = 0, old_c1_count = 0, new_c1_count = 0;
diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
index a9f90c3e618..9a0e77ce4ba 100644
--- a/src/hotspot/share/compiler/compileBroker.hpp
+++ b/src/hotspot/share/compiler/compileBroker.hpp
@@ -254,11 +254,13 @@ class CompileBroker: AllStatic {
 
   enum ThreadType {
     compiler_t,
-    deoptimizer_t
+    deoptimizer_t,
+    training_replay_t
   };
 
   static JavaThread* make_thread(ThreadType type, jobject thread_oop, CompileQueue* queue, AbstractCompiler* comp, JavaThread* THREAD);
   static void init_compiler_threads();
+  static void init_training_replay();
   static void possibly_add_compiler_threads(JavaThread* THREAD);
   static bool compilation_is_prohibited(const methodHandle& method, int osr_bci, int comp_level, bool excluded);
 
@@ -447,4 +449,16 @@ class CompileBroker: AllStatic {
   static void print_heapinfo(outputStream *out, const char* function, size_t granularity);
 };
 
+// In order to achiveve a maximally fast warmup we attempt to compile important methods as soon as all
+// the classes that they depend on are initialized. TrainingReplayThread processes a queue of InstanceKlass*
+// that have just finished running their static initializers. We find all the methods that depend on the given class
+// and for which the number of remaining dependencies is now zero, and eagerly compile them.
+class TrainingReplayThread : public JavaThread {
+  static void training_replay_thread_entry(JavaThread* thread, TRAPS);
+public:
+  TrainingReplayThread() : JavaThread(&training_replay_thread_entry) { }
+
+  bool is_hidden_from_external_view() const      { return true; }
+};
+
 #endif // SHARE_COMPILER_COMPILEBROKER_HPP
diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index b6ce7609f63..4f91984f7a5 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -119,6 +119,7 @@ void CompileTask::initialize(int compile_id,
   _nm_total_size = 0;
   _failure_reason = nullptr;
   _failure_reason_on_C_heap = false;
+  _training_data = nullptr;
   _arena_bytes = 0;
 
   _next = nullptr;
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 4df1533d32a..d615885e51c 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -31,6 +31,7 @@
 #include "memory/allocation.hpp"
 #include "utilities/xmlstream.hpp"
 
+class CompileTrainingData;
 class DirectiveSet;
 
 JVMCI_ONLY(class JVMCICompileState;)
@@ -111,6 +112,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
   const char*          _failure_reason;
   // Specifies if _failure_reason is on the C heap.
   bool                 _failure_reason_on_C_heap;
+  CompileTrainingData* _training_data;
   size_t               _arena_bytes;  // peak size of temporary memory during compilation (e.g. node arenas)
 
  public:
@@ -212,6 +214,9 @@ class CompileTask : public CHeapObj<mtCompiler> {
   void         set_is_free(bool val)             { _is_free = val; }
   bool         is_unloaded() const;
 
+  CompileTrainingData* training_data() const      { return _training_data; }
+  void set_training_data(CompileTrainingData* td) { _training_data = td;   }
+
   // RedefineClasses support
   void         metadata_do(MetadataClosure* f);
   void         mark_on_stack();
diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp
index bdaa6dffb8f..bacc1f73f97 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.hpp
@@ -59,7 +59,8 @@ enum CompLevel : s1 {
   CompLevel_simple            = 1,         // C1
   CompLevel_limited_profile   = 2,         // C1, invocation & backedge counters
   CompLevel_full_profile      = 3,         // C1, invocation & backedge counters + mdo
-  CompLevel_full_optimization = 4          // C2 or JVMCI
+  CompLevel_full_optimization = 4,         // C2 or JVMCI
+  CompLevel_count             = 5
 };
 
 class CompilationModeFlag : AllStatic {
diff --git a/src/hotspot/share/compiler/compiler_globals.hpp b/src/hotspot/share/compiler/compiler_globals.hpp
index a811cd8b3ba..3c47b991120 100644
--- a/src/hotspot/share/compiler/compiler_globals.hpp
+++ b/src/hotspot/share/compiler/compiler_globals.hpp
@@ -269,6 +269,17 @@
           "Maximum rate sampling interval (in milliseconds)")               \
           range(0, max_intx)                                                \
                                                                             \
+  product(double, Tier0ProfileDelayFactor, 100.0, DIAGNOSTIC,               \
+          "Delay profiling/compiling of methods that were "                 \
+          "observed to be lukewarm")                                        \
+                                                                            \
+  product(double, Tier2ProfileDelayFactor, 250.0, DIAGNOSTIC,               \
+          "Delay profiling of methods that were observed to be lukewarm")   \
+                                                                            \
+  product(bool, SkipTier2IfPossible, false, DIAGNOSTIC,                     \
+          "Compile at tier 4 instead of tier 2 in training replay "         \
+          "mode if posssible")                                              \
+                                                                            \
   product(ccstr, CompilationMode, "default",                                \
           "Compilation modes: "                                             \
           "default: normal tiered compilation; "                            \
@@ -382,7 +393,6 @@
           "If compilation is stopped with an error, capture diagnostic "    \
           "information at the bailout point")                               \
                                                                             \
-
 // end of COMPILER_FLAGS
 
 DECLARE_FLAGS(COMPILER_FLAGS)
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index d61e2461e8d..8133b4642c0 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.hpp
@@ -205,6 +205,7 @@ class outputStream;
   LOG_TAG(timer) \
   LOG_TAG(tlab) \
   LOG_TAG(tracking) \
+  LOG_TAG(training) \
   LOG_TAG(trimnative) /* trim native heap */ \
   LOG_TAG(unload) /* Trace unloading of classes */ \
   LOG_TAG(unmap) \
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index b0837fbc089..b01ab4014ed 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -85,6 +85,13 @@ void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data,
   return Metaspace::allocate(loader_data, word_size, type, /*use_class_space*/ false);
 }
 
+// This is used for allocating training data. We are allocating training data in many cases where a GC cannot be triggered.
+void* MetaspaceObj::operator new(size_t size, MemTag flags) throw() {
+  void* p = AllocateHeap(size, flags, CALLER_PC);
+  memset(p, 0, size);
+  return p;
+}
+
 bool MetaspaceObj::is_valid(const MetaspaceObj* p) {
   // Weed out obvious bogus values first without traversing metaspace
   if ((size_t)p < os::min_page_size()) {
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 93fe4f2e99b..8cd6e6d4207 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -315,6 +315,9 @@ class MetaspaceObj {
   f(Annotations) \
   f(MethodCounters) \
   f(RecordComponent) \
+  f(KlassTrainingData) \
+  f(MethodTrainingData) \
+  f(CompileTrainingData) \
   f(AdapterHandlerEntry) \
   f(AdapterFingerPrint)
 
@@ -354,6 +357,8 @@ class MetaspaceObj {
   void* operator new(size_t size, ClassLoaderData* loader_data,
                      size_t word_size,
                      Type type) throw();
+  // This is used for allocating training data. We are allocating training data in many cases where a GC cannot be triggered.
+  void* operator new(size_t size, MemTag flags) throw();
   void operator delete(void* p) = delete;
 
   // Declare a *static* method with the same signature in any subclass of MetaspaceObj
diff --git a/src/hotspot/share/memory/metadataFactory.hpp b/src/hotspot/share/memory/metadataFactory.hpp
index f5935c588d7..355702f7980 100644
--- a/src/hotspot/share/memory/metadataFactory.hpp
+++ b/src/hotspot/share/memory/metadataFactory.hpp
@@ -48,6 +48,12 @@ class MetadataFactory : AllStatic {
     return array;
   }
 
+  // This API should be used for TrainingData only.
+  template <typename T>
+  static Array<T>* new_array_from_c_heap(int length, MemTag flags) {
+    return new (length, flags) Array<T>(length);
+  }
+
   template <typename T>
   static void free_array(ClassLoaderData* loader_data, Array<T>* data) {
     if (data != nullptr) {
diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp
index 3bec05324e7..8b419034093 100644
--- a/src/hotspot/share/memory/metaspaceClosure.hpp
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp
@@ -29,6 +29,7 @@
 #include "memory/allocation.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "oops/array.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
@@ -104,6 +105,18 @@ class MetaspaceClosure {
   //         Symbol*     bar() { return (Symbol*)    _obj; }
   //
   // [2] All Array<T> dimensions are statically declared.
+  //
+  // Pointer Tagging
+  //
+  // All metaspace pointers are at least 4 byte aligned. Therefore, it's possible for
+  // certain pointers to contain "tags" in their lowest 2 bits.
+  //
+  // Ref::obj() clears the tag bits in the return values. As a result, most
+  // callers who just want walk a closure of metaspace objects do not need to worry
+  // about the tag bits.
+  //
+  // If you need to use the tags, you can access the tagged pointer with Ref::addr()
+  // and manipulate its parts with strip_tags(), decode_tags() and add_tags()
   class Ref : public CHeapObj<mtMetaspace> {
     Writability _writability;
     address _enclosing_obj;
@@ -123,7 +136,7 @@ class MetaspaceClosure {
     virtual ~Ref() {}
 
     address obj() const {
-      return *addr();
+      return strip_tags(*addr());
     }
 
     address* addr() const {
@@ -143,12 +156,35 @@ class MetaspaceClosure {
     Ref* next() const               { return _next; }
   };
 
+  // Pointer tagging support
+  constexpr static uintx TAG_MASK = 0x03;
+
+  template <typename T>
+  static T strip_tags(T ptr_with_tags) {
+    uintx n = (uintx)ptr_with_tags;
+    return (T)(n & ~TAG_MASK);
+  }
+
+  template <typename T>
+  static uintx decode_tags(T ptr_with_tags) {
+    uintx n = (uintx)ptr_with_tags;
+    return (n & TAG_MASK);
+  }
+
+  template <typename T>
+  static T add_tags(T ptr, uintx tags) {
+    uintx n = (uintx)ptr;
+    assert((n & TAG_MASK) == 0, "sanity");
+    assert(tags <= TAG_MASK, "sanity");
+    return (T)(n | tags);
+  }
+
 private:
   // MSORef -- iterate an instance of MetaspaceObj
   template <class T> class MSORef : public Ref {
     T** _mpp;
     T* dereference() const {
-      return *_mpp;
+      return strip_tags(*_mpp);
     }
   protected:
     virtual void** mpp() const {
@@ -176,7 +212,7 @@ class MetaspaceClosure {
     Array<T>** _mpp;
   protected:
     Array<T>* dereference() const {
-      return *_mpp;
+      return strip_tags(*_mpp);
     }
     virtual void** mpp() const {
       return (void**)_mpp;
diff --git a/src/hotspot/share/oops/array.hpp b/src/hotspot/share/oops/array.hpp
index 12e23080166..91a348728d2 100644
--- a/src/hotspot/share/oops/array.hpp
+++ b/src/hotspot/share/oops/array.hpp
@@ -54,6 +54,11 @@ class Array: public MetaspaceObj {
   NONCOPYABLE(Array);
 
   inline void* operator new(size_t size, ClassLoaderData* loader_data, int length, TRAPS) throw();
+  inline void* operator new(size_t size, ClassLoaderData* loader_data, int length) throw();
+
+  // Work-around -- see JDK-8331086
+  inline void* operator new(size_t size, int length, MemTag flags) throw();
+
 
   static size_t byte_sizeof(int length, size_t elm_byte_size) {
     return sizeof(Array<T>) + MAX2(length - 1, 0) * elm_byte_size;
diff --git a/src/hotspot/share/oops/array.inline.hpp b/src/hotspot/share/oops/array.inline.hpp
index 28f8a35dc0d..3fa7fd15fb3 100644
--- a/src/hotspot/share/oops/array.inline.hpp
+++ b/src/hotspot/share/oops/array.inline.hpp
@@ -37,4 +37,19 @@ inline void* Array<T>::operator new(size_t size, ClassLoaderData* loader_data, i
                                      MetaspaceObj::array_type(sizeof(T)), false, THREAD);
 }
 
+template <typename T>
+inline void* Array<T>::operator new(size_t size, ClassLoaderData* loader_data, int length) throw() {
+  size_t word_size = Array::size(length);
+  return (void*) Metaspace::allocate(loader_data, word_size,
+                                     MetaspaceObj::array_type(sizeof(T)), false);
+}
+
+template <typename T>
+inline void* Array<T>::operator new(size_t size, int length, MemTag flags) throw() {
+  size = Array::size(length) * BytesPerWord;
+  void* p = AllocateHeap(size * BytesPerWord, flags);
+  memset(p, 0, size);
+  return p;
+}
+
 #endif // SHARE_OOPS_ARRAY_INLINE_HPP
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 124193c5a82..fa6509a4422 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1327,6 +1327,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
   if (!HAS_PENDING_EXCEPTION) {
     set_initialization_state_and_notify(fully_initialized, CHECK);
     DEBUG_ONLY(vtable().verify(tty, true);)
+    CompilationPolicy::replay_training_at_init(this, THREAD);
   }
   else {
     // Step 10 and 11
@@ -2647,6 +2648,8 @@ void InstanceKlass::remove_unshareable_info() {
     set_verified_at_dump_time();
   }
 
+  _misc_flags.set_has_init_deps_processed(false);
+
   Klass::remove_unshareable_info();
 
   if (SystemDictionaryShared::has_class_failed_verification(this)) {
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 0c211c8c14b..e906d951a07 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -1118,6 +1118,12 @@ class InstanceKlass: public Klass {
   bool can_be_verified_at_dumptime() const;
   void compute_has_loops_flag_for_methods();
 #endif
+  bool     has_init_deps_processed() const { return _misc_flags.has_init_deps_processed(); }
+  void set_has_init_deps_processed() {
+    assert(is_initialized(), "");
+    assert(!has_init_deps_processed(), "already set"); // one-off action
+    _misc_flags.set_has_init_deps_processed(true);
+  }
 
   u2 compute_modifier_flags() const;
 
diff --git a/src/hotspot/share/oops/instanceKlassFlags.hpp b/src/hotspot/share/oops/instanceKlassFlags.hpp
index 548cb78333b..18a9c76103d 100644
--- a/src/hotspot/share/oops/instanceKlassFlags.hpp
+++ b/src/hotspot/share/oops/instanceKlassFlags.hpp
@@ -68,6 +68,7 @@ class InstanceKlassFlags {
     status(has_been_redefined                , 1 << 2) /* class has been redefined */ \
     status(is_scratch_class                  , 1 << 3) /* class is the redefined scratch class */ \
     status(is_marked_dependent               , 1 << 4) /* class is the redefined scratch class */ \
+    status(has_init_deps_processed           , 1 << 5) /* all init dependencies are processed */ \
     /* end of list */
 
 #define IK_STATUS_ENUM_NAME(name, value)    _misc_##name = value,
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 87f85dab956..b92f7bb8d99 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -730,6 +730,7 @@ class Klass : public Metadata {
   virtual MetaspaceObj::Type type() const { return ClassType; }
 
   inline bool is_loader_alive() const;
+  inline bool is_loader_present_and_alive() const;
 
   void clean_subklass();
 
diff --git a/src/hotspot/share/oops/klass.inline.hpp b/src/hotspot/share/oops/klass.inline.hpp
index 4f9401f1709..b37c5105f64 100644
--- a/src/hotspot/share/oops/klass.inline.hpp
+++ b/src/hotspot/share/oops/klass.inline.hpp
@@ -59,6 +59,11 @@ inline bool Klass::is_loader_alive() const {
   return class_loader_data()->is_alive();
 }
 
+inline bool Klass::is_loader_present_and_alive() const {
+  ClassLoaderData* cld = class_loader_data();
+  return (cld != nullptr) ? cld->is_alive() : false;
+}
+
 inline markWord Klass::prototype_header() const {
   assert(UseCompactObjectHeaders, "only use with compact object headers");
 #ifdef _LP64
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index f14a351ef48..d13458dfa93 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -60,6 +60,7 @@
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
+#include "oops/trainingData.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/atomic.hpp"
@@ -408,6 +409,12 @@ void Method::metaspace_pointers_do(MetaspaceClosure* it) {
 
 void Method::remove_unshareable_info() {
   unlink_method();
+  if (method_data() != nullptr) {
+    method_data()->remove_unshareable_info();
+  }
+  if (method_counters() != nullptr) {
+    method_counters()->remove_unshareable_info();
+  }
   if (CDSConfig::is_dumping_adapters() && _adapter != nullptr) {
     _adapter->remove_unshareable_info();
     _adapter = nullptr;
@@ -417,6 +424,12 @@ void Method::remove_unshareable_info() {
 
 void Method::restore_unshareable_info(TRAPS) {
   assert(is_method() && is_valid_method(this), "ensure C++ vtable is restored");
+  if (method_data() != nullptr) {
+    method_data()->restore_unshareable_info(CHECK);
+  }
+  if (method_counters() != nullptr) {
+    method_counters()->restore_unshareable_info(CHECK);
+  }
   if (_adapter != nullptr) {
     assert(_adapter->is_linked(), "must be");
     _from_compiled_entry = _adapter->get_c2i_entry();
@@ -588,9 +601,43 @@ void Method::print_invocation_count(outputStream* st) {
 #endif
 }
 
+MethodTrainingData* Method::training_data_or_null() const {
+  MethodCounters* mcs = method_counters();
+  if (mcs == nullptr) {
+    return nullptr;
+  } else {
+    MethodTrainingData* mtd = mcs->method_training_data();
+    if (mtd == mcs->method_training_data_sentinel()) {
+      return nullptr;
+    }
+    return mtd;
+  }
+}
+
+bool Method::init_training_data(MethodTrainingData* td) {
+  MethodCounters* mcs = method_counters();
+  if (mcs == nullptr) {
+    return false;
+  } else {
+    return mcs->init_method_training_data(td);
+  }
+}
+
+bool Method::install_training_method_data(const methodHandle& method) {
+  MethodTrainingData* mtd = MethodTrainingData::find(method);
+  if (mtd != nullptr && mtd->final_profile() != nullptr) {
+    Atomic::replace_if_null(&method->_method_data, mtd->final_profile());
+    return true;
+  }
+  return false;
+}
+
 // Build a MethodData* object to hold profiling information collected on this
 // method when requested.
 void Method::build_profiling_method_data(const methodHandle& method, TRAPS) {
+  if (install_training_method_data(method)) {
+    return;
+  }
   // Do not profile the method if metaspace has hit an OOM previously
   // allocating profiling data. Callers clear pending exception so don't
   // add one here.
@@ -1163,6 +1210,12 @@ void Method::unlink_method() {
 
   clear_method_data();
   clear_method_counters();
+  clear_is_not_c1_compilable();
+  clear_is_not_c1_osr_compilable();
+  clear_is_not_c2_compilable();
+  clear_is_not_c2_osr_compilable();
+  clear_queued_for_compilation();
+
   remove_unshareable_flags();
 }
 
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 5daa572a46c..ce6b859f7c1 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -59,6 +59,7 @@ class LocalVariableTableElement;
 class AdapterHandlerEntry;
 class MethodData;
 class MethodCounters;
+class MethodTrainingData;
 class ConstMethod;
 class InlineTableSizes;
 class nmethod;
@@ -310,9 +311,13 @@ class Method : public Metadata {
                               TRAPS);
 
   // method data access
-  MethodData* method_data() const              {
+  MethodData* method_data() const {
     return _method_data;
   }
+  void set_method_data(MethodData* data);
+
+  MethodTrainingData* training_data_or_null() const;
+  bool init_training_data(MethodTrainingData* td);
 
   // mark an exception handler as entered (used to prune dead catch blocks in C2)
   void set_exception_handler_entered(int handler_bci);
@@ -341,7 +346,7 @@ class Method : public Metadata {
   bool was_never_executed()                     { return !was_executed_more_than(0);  }
 
   static void build_profiling_method_data(const methodHandle& method, TRAPS);
-
+  static bool install_training_method_data(const methodHandle& method);
   static MethodCounters* build_method_counters(Thread* current, Method* m);
 
   inline int interpreter_invocation_count() const;
diff --git a/src/hotspot/share/oops/methodCounters.cpp b/src/hotspot/share/oops/methodCounters.cpp
index 4abf9ba53e7..c0787cab5e4 100644
--- a/src/hotspot/share/oops/methodCounters.cpp
+++ b/src/hotspot/share/oops/methodCounters.cpp
@@ -22,13 +22,19 @@
  *
  */
 
+#include "cds/cdsConfig.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "memory/metaspaceClosure.hpp"
 #include "oops/method.hpp"
 #include "oops/methodCounters.hpp"
+#include "oops/trainingData.hpp"
 #include "runtime/handles.inline.hpp"
+#include "memory/resourceArea.hpp"
 
 MethodCounters::MethodCounters(const methodHandle& mh) :
+  _method(mh()),
+  _method_training_data(method_training_data_sentinel()),
   _prev_time(0),
   _rate(0),
   _highest_comp_level(0),
@@ -47,14 +53,21 @@ MethodCounters::MethodCounters(const methodHandle& mh) :
   _backedge_mask = right_n_bits(CompilerConfig::scaled_freq_log(Tier0BackedgeNotifyFreqLog, scale)) << InvocationCounter::count_shift;
 }
 
+#if INCLUDE_CDS
+MethodCounters::MethodCounters() {
+  // Used by cppVtables.cpp only
+  assert(CDSConfig::is_dumping_static_archive() || UseSharedSpaces, "only for CDS");
+}
+#endif
+
 MethodCounters* MethodCounters::allocate_no_exception(const methodHandle& mh) {
   ClassLoaderData* loader_data = mh->method_holder()->class_loader_data();
-  return new(loader_data, size(), MetaspaceObj::MethodCountersType) MethodCounters(mh);
+  return new(loader_data, method_counters_size(), MetaspaceObj::MethodCountersType) MethodCounters(mh);
 }
 
 MethodCounters* MethodCounters::allocate_with_exception(const methodHandle& mh, TRAPS) {
   ClassLoaderData* loader_data = mh->method_holder()->class_loader_data();
-  return new(loader_data, size(), MetaspaceObj::MethodCountersType, THREAD) MethodCounters(mh);
+  return new(loader_data, method_counters_size(), MetaspaceObj::MethodCountersType, THREAD) MethodCounters(mh);
 }
 
 void MethodCounters::clear_counters() {
@@ -68,7 +81,47 @@ void MethodCounters::clear_counters() {
   set_highest_osr_comp_level(0);
 }
 
+void MethodCounters::metaspace_pointers_do(MetaspaceClosure* it) {
+  log_trace(aot, training)("Iter(MethodCounters): %p", this);
+  it->push(&_method);
+  it->push(&_method_training_data);
+}
+
+#if INCLUDE_CDS
+void MethodCounters::remove_unshareable_info() {
+}
+void MethodCounters::restore_unshareable_info(TRAPS) {
+  _method_training_data = method_training_data_sentinel();
+}
+#endif // INCLUDE_CDS
+
+void MethodCounters::print_on(outputStream* st) const {
+  assert(is_methodCounters(), "should be method counters");
+  st->print("method counters");
+  print_data_on(st);
+}
+
+void MethodCounters::print_data_on(outputStream* st) const {
+  ResourceMark rm;
+  st->print_cr("  - invocation_counter: %d carry=%d", _invocation_counter.count(), _invocation_counter.carry());
+  st->print_cr("  - backedge_counter: %d carry=%d",   _backedge_counter.count(), _backedge_counter.carry());
+  st->print_cr("  - prev_time: " JLONG_FORMAT,        _prev_time);
+  st->print_cr("  - rate: %.3f",             _rate);
+  st->print_cr("  - invoke_mask: %d",        _invoke_mask);
+  st->print_cr("  - backedge_mask: %d",      _backedge_mask);
+  st->print_cr("  - prev_event_count: %d",   _prev_event_count);
+#if COMPILER2_OR_JVMCI
+  st->print_cr("  - interpreter_throwout_count: %u", _interpreter_throwout_count);
+#endif
+#if INCLUDE_JVMTI
+  st->print_cr("  - number_of_breakpoints: %u", _number_of_breakpoints);
+#endif
+  st->print_cr("  - highest_comp_level: %u", _highest_comp_level);
+  st->print_cr("  - highest_osr_comp_level: %u", _highest_osr_comp_level);
+}
+
 void MethodCounters::print_value_on(outputStream* st) const {
+  assert(is_methodCounters(), "must be methodCounters");
   st->print("method counters");
   print_address_on(st);
 }
diff --git a/src/hotspot/share/oops/methodCounters.hpp b/src/hotspot/share/oops/methodCounters.hpp
index bdf033a46a8..4f4a1d1948f 100644
--- a/src/hotspot/share/oops/methodCounters.hpp
+++ b/src/hotspot/share/oops/methodCounters.hpp
@@ -30,12 +30,25 @@
 #include "interpreter/invocationCounter.hpp"
 #include "utilities/align.hpp"
 
-class MethodCounters : public MetaspaceObj {
+class MethodTrainingData;
+
+class MethodCounters : public Metadata {
  friend class VMStructs;
  friend class JVMCIVMStructs;
+
+ // Used by CDS. These classes need to access the private default constructor.
+ template <class T> friend class CppVtableTesterA;
+ template <class T> friend class CppVtableTesterB;
+ template <class T> friend class CppVtableCloner;
+
  private:
   InvocationCounter _invocation_counter;         // Incremented before each activation of the method - used to trigger frequency-based optimizations
   InvocationCounter _backedge_counter;           // Incremented before each backedge taken - used to trigger frequency-based optimizations
+
+  // Back pointer to the Method*
+  Method* _method;
+
+  Metadata*         _method_training_data;
   jlong             _prev_time;                   // Previous time the rate was acquired
   float             _rate;                        // Events (invocation and backedge counter increments) per millisecond
   int               _invoke_mask;                 // per-method Tier0InvokeNotifyFreqLog
@@ -51,20 +64,26 @@ class MethodCounters : public MetaspaceObj {
   u1                _highest_osr_comp_level;      // Same for OSR level
 
   MethodCounters(const methodHandle& mh);
+  MethodCounters();
+
  public:
+  virtual bool is_methodCounters() const { return true; }
+  Method* method() const { return _method; }
   static MethodCounters* allocate_no_exception(const methodHandle& mh);
   static MethodCounters* allocate_with_exception(const methodHandle& mh, TRAPS);
 
-  DEBUG_ONLY(bool on_stack() { return false; })
   void deallocate_contents(ClassLoaderData* loader_data) {}
 
-  void metaspace_pointers_do(MetaspaceClosure* it) { return; }
-
-  static int size() {
+  static int method_counters_size() {
     return align_up((int)sizeof(MethodCounters), wordSize) / wordSize;
   }
+  virtual int size() const {
+    return method_counters_size();
+  }
 
   MetaspaceObj::Type type() const { return MethodCountersType; }
+  void metaspace_pointers_do(MetaspaceClosure* iter);
+
   void clear_counters();
 
 #if COMPILER2_OR_JVMCI
@@ -127,7 +146,33 @@ class MethodCounters : public MetaspaceObj {
     return byte_offset_of(MethodCounters, _backedge_mask);
   }
 
-  const char* internal_name() const { return "{method counters}"; }
+  virtual const char* internal_name() const { return "{method counters}"; }
+
+  Metadata* method_training_data_sentinel() {
+    return this;
+  }
+  MethodTrainingData* method_training_data() const {
+    return reinterpret_cast<MethodTrainingData*>(_method_training_data);
+  }
+  bool init_method_training_data(MethodTrainingData* td) {
+    MethodTrainingData* cur = method_training_data();
+    if (cur == td) {
+      return true;
+    }
+    if (cur == nullptr || cur == reinterpret_cast<MethodTrainingData*>(method_training_data_sentinel())) {
+      return Atomic::cmpxchg(reinterpret_cast<MethodTrainingData**>(&_method_training_data), cur, td) == cur;
+    }
+    return false;
+  }
+
+#if INCLUDE_CDS
+  void remove_unshareable_info();
+  void restore_unshareable_info(TRAPS);
+#endif
+
+  // Printing
+  void print_on      (outputStream* st) const;
   void print_value_on(outputStream* st) const;
+  void print_data_on(outputStream* st) const;
 };
 #endif // SHARE_OOPS_METHODCOUNTERS_HPP
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index a903340f12e..0f8b8a8275a 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -22,7 +22,9 @@
  *
  */
 
+#include "cds/cdsConfig.hpp"
 #include "ci/ciMethodData.hpp"
+#include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compilationPolicy.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
@@ -319,24 +321,66 @@ void VirtualCallTypeData::post_initialize(BytecodeStream* stream, MethodData* md
   }
 }
 
+static bool is_excluded(Klass* k) {
+#if INCLUDE_CDS
+  if (SafepointSynchronize::is_at_safepoint() &&
+      CDSConfig::is_dumping_archive() &&
+      CDSConfig::current_thread_is_vm_or_dumper()) {
+    if (k->is_instance_klass() && !InstanceKlass::cast(k)->is_loaded()) {
+      log_debug(aot, training)("Purged %s from MDO: unloaded class", k->name()->as_C_string());
+      return true;
+    } else {
+      bool excluded = SystemDictionaryShared::should_be_excluded(k);
+      if (excluded) {
+        log_debug(aot, training)("Purged %s from MDO: excluded class", k->name()->as_C_string());
+      }
+      return excluded;
+    }
+  }
+#endif
+  return false;
+}
+
 void TypeStackSlotEntries::clean_weak_klass_links(bool always_clean) {
   for (int i = 0; i < _number_of_entries; i++) {
     intptr_t p = type(i);
     Klass* k = (Klass*)klass_part(p);
-    if (k != nullptr && (always_clean || !k->is_loader_alive())) {
-      set_type(i, with_status((Klass*)nullptr, p));
+    if (k != nullptr) {
+      if (!always_clean && k->is_instance_klass() && InstanceKlass::cast(k)->is_not_initialized()) {
+        continue; // skip not-yet-initialized classes // TODO: maybe clear the slot instead?
+      }
+      if (always_clean || !k->is_loader_present_and_alive() || is_excluded(k)) {
+        set_type(i, with_status((Klass*)nullptr, p));
+      }
     }
   }
 }
 
+void TypeStackSlotEntries::metaspace_pointers_do(MetaspaceClosure* it) {
+  for (int i = 0; i < _number_of_entries; i++) {
+    Klass** k = (Klass**)type_adr(i); // tagged
+    it->push(k);
+  }
+}
+
 void ReturnTypeEntry::clean_weak_klass_links(bool always_clean) {
   intptr_t p = type();
   Klass* k = (Klass*)klass_part(p);
-  if (k != nullptr && (always_clean || !k->is_loader_alive())) {
-    set_type(with_status((Klass*)nullptr, p));
+  if (k != nullptr) {
+    if (!always_clean && k->is_instance_klass() && InstanceKlass::cast(k)->is_not_initialized()) {
+      return; // skip not-yet-initialized classes // TODO: maybe clear the slot instead?
+    }
+    if (always_clean || !k->is_loader_present_and_alive() || is_excluded(k)) {
+      set_type(with_status((Klass*)nullptr, p));
+    }
   }
 }
 
+void ReturnTypeEntry::metaspace_pointers_do(MetaspaceClosure* it) {
+  Klass** k = (Klass**)type_adr(); // tagged
+  it->push(k);
+}
+
 bool TypeEntriesAtCall::return_profiling_enabled() {
   return MethodData::profile_return();
 }
@@ -412,12 +456,24 @@ void VirtualCallTypeData::print_data_on(outputStream* st, const char* extra) con
 void ReceiverTypeData::clean_weak_klass_links(bool always_clean) {
     for (uint row = 0; row < row_limit(); row++) {
     Klass* p = receiver(row);
-    if (p != nullptr && (always_clean || !p->is_loader_alive())) {
-      clear_row(row);
+    if (p != nullptr) {
+      if (!always_clean && p->is_instance_klass() && InstanceKlass::cast(p)->is_not_initialized()) {
+        continue; // skip not-yet-initialized classes // TODO: maybe clear the slot instead?
+      }
+      if (always_clean || !p->is_loader_present_and_alive() || is_excluded(p)) {
+        clear_row(row);
+      }
     }
   }
 }
 
+void ReceiverTypeData::metaspace_pointers_do(MetaspaceClosure *it) {
+  for (uint row = 0; row < row_limit(); row++) {
+    Klass** recv = (Klass**)intptr_at_adr(receiver_cell_index(row));
+    it->push(recv);
+  }
+}
+
 void ReceiverTypeData::print_receiver_data_on(outputStream* st) const {
   uint row;
   int entries = 0;
@@ -646,6 +702,11 @@ void ParametersTypeData::print_data_on(outputStream* st, const char* extra) cons
   st->cr();
 }
 
+void SpeculativeTrapData::metaspace_pointers_do(MetaspaceClosure* it) {
+  Method** m = (Method**)intptr_at_adr(speculative_trap_method);
+  it->push(m);
+}
+
 void SpeculativeTrapData::print_data_on(outputStream* st, const char* extra) const {
   print_shared(st, "SpeculativeTrapData", extra);
   tab(st);
@@ -1223,12 +1284,19 @@ void MethodData::post_initialize(BytecodeStream* stream) {
 MethodData::MethodData(const methodHandle& method)
   : _method(method()),
     // Holds Compile_lock
-    _extra_data_lock(Mutex::nosafepoint, "MDOExtraData_lock"),
     _compiler_counters(),
     _parameters_type_data_di(parameters_uninitialized) {
-  initialize();
+    _extra_data_lock = nullptr;
+    initialize();
 }
 
+#if INCLUDE_CDS
+MethodData::MethodData() {
+  // Used by cppVtables.cpp only
+  assert(CDSConfig::is_dumping_static_archive() || UseSharedSpaces, "only for CDS");
+}
+#endif
+
 // Reinitialize the storage of an existing MDO at a safepoint.  Doing it this way will ensure it's
 // not being accessed while the contents are being rewritten.
 class VM_ReinitializeMDO: public VM_Operation {
@@ -1364,7 +1432,7 @@ void MethodData::init() {
 }
 
 bool MethodData::is_mature() const {
-  return CompilationPolicy::is_mature(_method);
+  return CompilationPolicy::is_mature(const_cast<MethodData*>(this));
 }
 
 // Translate a bci to its corresponding data index (di).
@@ -1552,7 +1620,8 @@ void MethodData::print_value_on(outputStream* st) const {
 }
 
 void MethodData::print_data_on(outputStream* st) const {
-  ConditionalMutexLocker ml(extra_data_lock(), !extra_data_lock()->owned_by_self(),
+  Mutex* lock = const_cast<MethodData*>(this)->extra_data_lock();
+  ConditionalMutexLocker ml(lock, !lock->owned_by_self(),
                             Mutex::_no_safepoint_check_flag);
   ResourceMark rm;
   ProfileData* data = first_data();
@@ -1725,8 +1794,26 @@ bool MethodData::profile_parameters_for_method(const methodHandle& m) {
 }
 
 void MethodData::metaspace_pointers_do(MetaspaceClosure* it) {
-  log_trace(aot)("Iter(MethodData): %p", this);
+  log_trace(aot, training)("Iter(MethodData): %p for %p %s", this, _method, _method->name_and_sig_as_C_string());
   it->push(&_method);
+  if (_parameters_type_data_di != no_parameters) {
+    parameters_type_data()->metaspace_pointers_do(it);
+  }
+  for (ProfileData* data = first_data(); is_valid(data); data = next_data(data)) {
+    data->metaspace_pointers_do(it);
+  }
+  for (DataLayout* dp = extra_data_base();
+                   dp < extra_data_limit();
+                   dp = MethodData::next_extra(dp)) {
+    if (dp->tag() == DataLayout::speculative_trap_data_tag) {
+      ResourceMark rm;
+      SpeculativeTrapData* data = new SpeculativeTrapData(dp);
+      data->metaspace_pointers_do(it);
+    } else if (dp->tag() == DataLayout::no_tag ||
+               dp->tag() == DataLayout::arg_info_data_tag) {
+      break;
+    }
+  }
 }
 
 void MethodData::clean_extra_data_helper(DataLayout* dp, int shift, bool reset) {
@@ -1758,6 +1845,9 @@ class CleanExtraDataKlassClosure : public CleanExtraDataClosure {
 public:
   CleanExtraDataKlassClosure(bool always_clean) : _always_clean(always_clean) {}
   bool is_live(Method* m) {
+    if (!_always_clean && m->method_holder()->is_instance_klass() && InstanceKlass::cast(m->method_holder())->is_not_initialized()) {
+      return true; // TODO: treat as unloaded instead?
+    }
     return !(_always_clean) && m->method_holder()->is_loader_alive();
   }
 };
@@ -1769,6 +1859,20 @@ class CleanExtraDataMethodClosure : public CleanExtraDataClosure {
   bool is_live(Method* m) { return !m->is_old(); }
 };
 
+Mutex* MethodData::extra_data_lock() {
+  Mutex* lock = Atomic::load(&_extra_data_lock);
+  if (lock == nullptr) {
+    // This lock could be acquired while we are holding DumpTimeTable_lock/nosafepoint
+    lock = new Mutex(Mutex::nosafepoint-1, "MDOExtraData_lock");
+    Mutex* old = Atomic::cmpxchg(&_extra_data_lock, (Mutex*)nullptr, lock);
+    if (old != nullptr) {
+      // Another thread created the lock before us. Use that lock instead.
+      delete lock;
+      return old;
+    }
+  }
+  return lock;
+}
 
 // Remove SpeculativeTrapData entries that reference an unloaded or
 // redefined method
@@ -1785,7 +1889,7 @@ void MethodData::clean_extra_data(CleanExtraDataClosure* cl) {
       SpeculativeTrapData* data = new SpeculativeTrapData(dp);
       Method* m = data->method();
       assert(m != nullptr, "should have a method");
-      if (!cl->is_live(m)) {
+      if (is_excluded(m->method_holder()) || !cl->is_live(m)) {
         // "shift" accumulates the number of cells for dead
         // SpeculativeTrapData entries that have been seen so
         // far. Following entries must be shifted left by that many
@@ -1889,13 +1993,23 @@ void MethodData::release_C_heap_structures() {
 #endif
 }
 
+#if INCLUDE_CDS
+void MethodData::remove_unshareable_info() {
+  _extra_data_lock = nullptr;
+}
+
+void MethodData::restore_unshareable_info(TRAPS) {
+  //_extra_data_lock = new Mutex(Mutex::nosafepoint, "MDOExtraData_lock");
+}
+#endif // INCLUDE_CDS
+
 #ifdef ASSERT
 void MethodData::check_extra_data_locked() const {
     // Cast const away, just to be able to verify the lock
     // Usually we only want non-const accesses on the lock,
     // so this here is an exception.
     MethodData* self = (MethodData*)this;
-    assert(self->extra_data_lock()->owned_by_self(), "must have lock");
+    assert(self->extra_data_lock()->owned_by_self() || CDSConfig::is_dumping_archive(), "must have lock");
     assert(!Thread::current()->is_Java_thread() ||
            JavaThread::current()->is_in_no_safepoint_scope(),
            "JavaThread must have NoSafepointVerifier inside lock scope");
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index 7870d6e459f..61137d9fb7a 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -29,7 +29,6 @@
 #include "interpreter/invocationCounter.hpp"
 #include "oops/metadata.hpp"
 #include "oops/method.hpp"
-#include "oops/oop.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/mutex.hpp"
@@ -202,6 +201,9 @@ class DataLayout {
   intptr_t cell_at(int index) const {
     return _cells[index];
   }
+  intptr_t* cell_at_adr(int index) const {
+    return const_cast<intptr_t*>(&_cells[index]);
+  }
 
   bool set_flag_at(u1 flag_number) {
     const u1 bit = 1 << flag_number;
@@ -345,6 +347,10 @@ class ProfileData : public ResourceObj {
     assert(0 <= index && index < cell_count(), "oob");
     return data()->cell_at(index);
   }
+  intptr_t* intptr_at_adr(int index) const {
+    assert(0 <= index && index < cell_count(), "oob");
+    return data()->cell_at_adr(index);
+  }
   void set_uint_at(int index, uint value) {
     set_intptr_at(index, (intptr_t) value);
   }
@@ -362,12 +368,6 @@ class ProfileData : public ResourceObj {
   int int_at_unchecked(int index) const {
     return (int)data()->cell_at(index);
   }
-  void set_oop_at(int index, oop value) {
-    set_intptr_at(index, cast_from_oop<intptr_t>(value));
-  }
-  oop oop_at(int index) const {
-    return cast_to_oop(intptr_at(index));
-  }
 
   void set_flag_at(u1 flag_number) {
     data()->set_flag_at(flag_number);
@@ -488,7 +488,10 @@ class ProfileData : public ResourceObj {
   // GC support
   virtual void clean_weak_klass_links(bool always_clean) {}
 
-  // CI translation: ProfileData can represent both MethodDataOop data
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {}
+
+    // CI translation: ProfileData can represent both MethodDataOop data
   // as well as CIMethodData data. This function is provided for translating
   // an oop in a ProfileData to the ci equivalent. Generally speaking,
   // most ProfileData don't require any translation, so we provide the null
@@ -853,6 +856,11 @@ class TypeStackSlotEntries : public TypeEntries {
     return _pd->intptr_at(type_offset_in_cells(i));
   }
 
+  intptr_t* type_adr(int i) const {
+    assert(i >= 0 && i < _number_of_entries, "oob");
+    return _pd->intptr_at_adr(type_offset_in_cells(i));
+  }
+
   // set type for entry i
   void set_type(int i, intptr_t k) {
     assert(i >= 0 && i < _number_of_entries, "oob");
@@ -874,6 +882,9 @@ class TypeStackSlotEntries : public TypeEntries {
   // GC support
   void clean_weak_klass_links(bool always_clean);
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it);
+
   void print_data_on(outputStream* st) const;
 };
 
@@ -898,6 +909,10 @@ class ReturnTypeEntry : public TypeEntries {
     return _pd->intptr_at(_base_off);
   }
 
+  intptr_t* type_adr() const {
+    return _pd->intptr_at_adr(_base_off);
+  }
+
   void set_type(intptr_t k) {
     _pd->set_intptr_at(_base_off, k);
   }
@@ -917,6 +932,9 @@ class ReturnTypeEntry : public TypeEntries {
   // GC support
   void clean_weak_klass_links(bool always_clean);
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it);
+
   void print_data_on(outputStream* st) const;
 };
 
@@ -1108,6 +1126,16 @@ class CallTypeData : public CounterData {
     }
   }
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    if (has_arguments()) {
+      _args.metaspace_pointers_do(it);
+    }
+    if (has_return()) {
+      _ret.metaspace_pointers_do(it);
+    }
+  }
+
   virtual void print_data_on(outputStream* st, const char* extra = nullptr) const;
 };
 
@@ -1218,6 +1246,9 @@ class ReceiverTypeData : public CounterData {
   // GC support
   virtual void clean_weak_klass_links(bool always_clean);
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it);
+
   void print_receiver_data_on(outputStream* st) const;
   void print_data_on(outputStream* st, const char* extra = nullptr) const;
 };
@@ -1383,6 +1414,17 @@ class VirtualCallTypeData : public VirtualCallData {
     }
   }
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    ReceiverTypeData::metaspace_pointers_do(it);
+    if (has_arguments()) {
+      _args.metaspace_pointers_do(it);
+    }
+    if (has_return()) {
+      _ret.metaspace_pointers_do(it);
+    }
+  }
+
   virtual void print_data_on(outputStream* st, const char* extra = nullptr) const;
 };
 
@@ -1566,10 +1608,6 @@ class ArrayData : public ProfileData {
     int aindex = index + array_start_off_set;
     return int_at(aindex);
   }
-  oop array_oop_at(int index) const {
-    int aindex = index + array_start_off_set;
-    return oop_at(aindex);
-  }
   void array_set_int_at(int index, int value) {
     int aindex = index + array_start_off_set;
     set_int_at(aindex, value);
@@ -1782,6 +1820,11 @@ class ParametersTypeData : public ArrayData {
     _parameters.clean_weak_klass_links(always_clean);
   }
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it) {
+    _parameters.metaspace_pointers_do(it);
+  }
+
   virtual void print_data_on(outputStream* st, const char* extra = nullptr) const;
 
   static ByteSize stack_slot_offset(int i) {
@@ -1852,6 +1895,9 @@ class SpeculativeTrapData : public ProfileData {
     return cell_offset(speculative_trap_method);
   }
 
+  // CDS support
+  virtual void metaspace_pointers_do(MetaspaceClosure* it);
+
   virtual void print_data_on(outputStream* st, const char* extra = nullptr) const;
 };
 
@@ -1962,13 +2008,15 @@ class MethodData : public Metadata {
   // Cached hint for bci_to_dp and bci_to_data
   int _hint_di;
 
-  Mutex _extra_data_lock;
+  Mutex* volatile _extra_data_lock;
 
   MethodData(const methodHandle& method);
 
   void initialize();
 
 public:
+  MethodData();
+
   static MethodData* allocate(ClassLoaderData* loader_data, const methodHandle& method, TRAPS);
 
   virtual bool is_methodData() const { return true; }
@@ -2266,6 +2314,11 @@ class MethodData : public Metadata {
   }
 #endif
 
+#if INCLUDE_CDS
+  void remove_unshareable_info();
+  void restore_unshareable_info(TRAPS);
+#endif
+
   void set_would_profile(bool p)              { _would_profile = p ? profile : no_profile; }
   bool would_profile() const                  { return _would_profile != no_profile; }
 
@@ -2504,7 +2557,7 @@ class MethodData : public Metadata {
 
   void clean_method_data(bool always_clean);
   void clean_weak_method_links();
-  Mutex* extra_data_lock() const { return const_cast<Mutex*>(&_extra_data_lock); }
+  Mutex* extra_data_lock();
   void check_extra_data_locked() const NOT_DEBUG_RETURN;
 };
 
diff --git a/src/hotspot/share/oops/trainingData.cpp b/src/hotspot/share/oops/trainingData.cpp
new file mode 100644
index 00000000000..543462b1182
--- /dev/null
+++ b/src/hotspot/share/oops/trainingData.cpp
@@ -0,0 +1,794 @@
+/*
+ * 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.
+ *
+ */
+
+#include "ci/ciEnv.hpp"
+#include "ci/ciMetadata.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/metaspaceShared.hpp"
+#include "classfile/classLoaderData.hpp"
+#include "classfile/compactHashtable.hpp"
+#include "classfile/javaClasses.hpp"
+#include "classfile/symbolTable.hpp"
+#include "classfile/systemDictionaryShared.hpp"
+#include "compiler/compileTask.hpp"
+#include "memory/metadataFactory.hpp"
+#include "memory/metaspaceClosure.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/method.hpp"
+#include "oops/methodCounters.hpp"
+#include "oops/trainingData.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/javaThread.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
+#include "utilities/growableArray.hpp"
+
+TrainingData::TrainingDataSet TrainingData::_training_data_set(1024, 0x3fffffff);
+TrainingData::TrainingDataDictionary TrainingData::_archived_training_data_dictionary;
+TrainingData::TrainingDataDictionary TrainingData::_archived_training_data_dictionary_for_dumping;
+TrainingData::DumptimeTrainingDataDictionary* TrainingData::_dumptime_training_data_dictionary = nullptr;
+int TrainingData::TrainingDataLocker::_lock_mode;
+volatile bool TrainingData::TrainingDataLocker::_snapshot = false;
+
+MethodTrainingData::MethodTrainingData() {
+  // Used by cppVtables.cpp only
+  assert(CDSConfig::is_dumping_static_archive() || UseSharedSpaces, "only for CDS");
+}
+
+KlassTrainingData::KlassTrainingData() {
+  // Used by cppVtables.cpp only
+  assert(CDSConfig::is_dumping_static_archive() || UseSharedSpaces, "only for CDS");
+}
+
+CompileTrainingData::CompileTrainingData() : _level(-1), _compile_id(-1) {
+  // Used by cppVtables.cpp only
+  assert(CDSConfig::is_dumping_static_archive() || UseSharedSpaces, "only for CDS");
+}
+
+void TrainingData::initialize() {
+  // this is a nop if training modes are not enabled
+  if (have_data() || need_data()) {
+    // Data structures that we have do not currently support iterative training. So you cannot replay
+    // and train at the same time. Going forward we may want to adjust iteration/search to enable that.
+    guarantee(have_data() != need_data(), "Iterative training is not supported");
+    TrainingDataLocker::initialize();
+  }
+}
+
+static void verify_archived_entry(TrainingData* td, const TrainingData::Key* k) {
+  guarantee(TrainingData::Key::can_compute_cds_hash(k), "");
+  TrainingData* td1 = TrainingData::lookup_archived_training_data(k);
+  guarantee(td == td1, "");
+}
+
+void TrainingData::verify() {
+  if (TrainingData::have_data()) {
+    archived_training_data_dictionary()->iterate([&](TrainingData* td) {
+      if (td->is_KlassTrainingData()) {
+        KlassTrainingData* ktd = td->as_KlassTrainingData();
+        if (ktd->has_holder() && ktd->holder()->is_loaded()) {
+          Key k(ktd->holder());
+          verify_archived_entry(td, &k);
+        }
+        ktd->verify();
+      } else if (td->is_MethodTrainingData()) {
+        MethodTrainingData* mtd = td->as_MethodTrainingData();
+        if (mtd->has_holder() && mtd->holder()->method_holder()->is_loaded()) {
+          Key k(mtd->holder());
+          verify_archived_entry(td, &k);
+        }
+        mtd->verify();
+      } else if (td->is_CompileTrainingData()) {
+        td->as_CompileTrainingData()->verify();
+      }
+    });
+  }
+}
+
+MethodTrainingData* MethodTrainingData::make(const methodHandle& method, bool null_if_not_found, bool use_cache) {
+  MethodTrainingData* mtd = nullptr;
+  if (!have_data() && !need_data()) {
+    return mtd;
+  }
+  // Try grabbing the cached value first.
+  // Cache value is stored in MethodCounters and the following are the
+  // possible states:
+  // 1. Cached value is method_training_data_sentinel().
+  //    This is an initial state and needs a full lookup.
+  // 2. Cached value is null.
+  //    Lookup failed the last time, if we don't plan to create a new TD object,
+  //    i.e. null_if_no_found == true, then just return a null.
+  // 3. Cache value is not null.
+  //    Return it, the value of training_data_lookup_failed doesn't matter.
+  MethodCounters* mcs = method->method_counters();
+  if (mcs != nullptr) {
+    mtd = mcs->method_training_data();
+    if (mtd != nullptr && mtd != mcs->method_training_data_sentinel()) {
+      return mtd;
+    }
+    if (null_if_not_found && mtd == nullptr) {
+      assert(mtd == nullptr, "No training data found");
+      return nullptr;
+    }
+  } else if (use_cache) {
+    mcs = Method::build_method_counters(Thread::current(), method());
+  }
+
+  TrainingData* td = nullptr;
+
+  Key key(method());
+  if (have_data()) {
+    td = lookup_archived_training_data(&key);
+    if (td != nullptr) {
+      mtd = td->as_MethodTrainingData();
+    } else {
+      mtd = nullptr;
+    }
+    // Cache the pointer to MTD in MethodCounters for faster lookup (could be null if not found)
+    method->init_training_data(mtd);
+  }
+
+  if (need_data()) {
+    TrainingDataLocker l;
+    td = training_data_set()->find(&key);
+    if (td == nullptr) {
+      if (!null_if_not_found) {
+        KlassTrainingData* ktd = KlassTrainingData::make(method->method_holder());
+        if (ktd == nullptr) {
+          return nullptr; // allocation failure
+        }
+        mtd = MethodTrainingData::allocate(method(), ktd);
+        if (mtd == nullptr) {
+          return nullptr; // allocation failure
+        }
+        td = training_data_set()->install(mtd);
+        assert(td == mtd, "");
+      } else {
+        mtd = nullptr;
+      }
+    } else {
+      mtd = td->as_MethodTrainingData();
+    }
+    // Cache the pointer to MTD in MethodCounters for faster lookup (could be null if not found)
+    method->init_training_data(mtd);
+  }
+
+  return mtd;
+}
+
+void MethodTrainingData::print_on(outputStream* st, bool name_only) const {
+  if (has_holder()) {
+    _klass->print_on(st, true);
+    st->print(".");
+    name()->print_symbol_on(st);
+    signature()->print_symbol_on(st);
+  }
+  if (name_only) {
+    return;
+  }
+  if (!has_holder()) {
+    st->print("[SYM]");
+  }
+  if (_level_mask) {
+    st->print(" LM%d", _level_mask);
+  }
+  st->print(" mc=%p mdo=%p", _final_counters, _final_profile);
+}
+
+CompileTrainingData* CompileTrainingData::make(CompileTask* task) {
+  int level = task->comp_level();
+  int compile_id = task->compile_id();
+  Thread* thread = Thread::current();
+  methodHandle m(thread, task->method());
+  if (m->method_holder() == nullptr) {
+    return nullptr; // do not record (dynamically generated method)
+  }
+  MethodTrainingData* mtd = MethodTrainingData::make(m);
+  if (mtd == nullptr) {
+    return nullptr; // allocation failure
+  }
+  mtd->notice_compilation(level);
+
+  TrainingDataLocker l;
+  CompileTrainingData* ctd = CompileTrainingData::allocate(mtd, level, compile_id);
+  if (ctd != nullptr) {
+    CompileTrainingData*& last_ctd = mtd->_last_toplevel_compiles[level - 1];
+    if (last_ctd != nullptr) {
+      assert(mtd->highest_top_level() >= level, "consistency");
+      if (last_ctd->compile_id() < compile_id) {
+        last_ctd->clear_init_deps();
+        last_ctd = ctd;
+      }
+    } else {
+       last_ctd = ctd;
+       mtd->notice_toplevel_compilation(level);
+    }
+  }
+  return ctd;
+}
+
+
+void CompileTrainingData::dec_init_deps_left(KlassTrainingData* ktd) {
+  LogStreamHandle(Trace, training) log;
+  if (log.is_enabled()) {
+    log.print("CTD "); print_on(&log); log.cr();
+    log.print("KTD "); ktd->print_on(&log); log.cr();
+  }
+  assert(ktd!= nullptr && ktd->has_holder(), "");
+  assert(_init_deps.contains(ktd), "");
+  assert(_init_deps_left > 0, "");
+
+  uint init_deps_left1 = Atomic::sub(&_init_deps_left, 1);
+
+  if (log.is_enabled()) {
+    uint init_deps_left2 = compute_init_deps_left();
+    log.print("init_deps_left: %d (%d)", init_deps_left1, init_deps_left2);
+    ktd->print_on(&log, true);
+  }
+}
+
+uint CompileTrainingData::compute_init_deps_left(bool count_initialized) {
+  int left = 0;
+  for (int i = 0; i < _init_deps.length(); i++) {
+    KlassTrainingData* ktd = _init_deps.at(i);
+    // Ignore symbolic refs and already initialized classes (unless explicitly requested).
+    if (ktd->has_holder()) {
+      InstanceKlass* holder = ktd->holder();
+      if (!ktd->holder()->is_initialized() || count_initialized) {
+        ++left;
+      } else if (holder->defined_by_other_loaders()) {
+        Key k(holder);
+        if (CDS_ONLY(!Key::can_compute_cds_hash(&k)) NOT_CDS(true)) {
+          ++left;
+        }
+      }
+    }
+  }
+  return left;
+}
+
+void CompileTrainingData::print_on(outputStream* st, bool name_only) const {
+  _method->print_on(st, true);
+  st->print("#%dL%d", _compile_id, _level);
+  if (name_only) {
+    return;
+  }
+  if (_init_deps.length() > 0) {
+    if (_init_deps_left > 0) {
+      st->print(" udeps=%d", _init_deps_left);
+    }
+    for (int i = 0, len = _init_deps.length(); i < len; i++) {
+      st->print(" dep:");
+      _init_deps.at(i)->print_on(st, true);
+    }
+  }
+}
+
+void CompileTrainingData::notice_inlined_method(CompileTask* task,
+                                                const methodHandle& method) {
+  MethodTrainingData* mtd = MethodTrainingData::make(method);
+  if (mtd != nullptr) {
+    mtd->notice_compilation(task->comp_level(), true);
+  }
+}
+
+void CompileTrainingData::notice_jit_observation(ciEnv* env, ciBaseObject* what) {
+  // A JIT is starting to look at class k.
+  // We could follow the queries that it is making, but it is
+  // simpler to assume, conservatively, that the JIT will
+  // eventually depend on the initialization state of k.
+  CompileTask* task = env->task();
+  assert(task != nullptr, "");
+  Method* method = task->method();
+  InstanceKlass* compiling_klass = method->method_holder();
+  if (what->is_metadata()) {
+    ciMetadata* md = what->as_metadata();
+    if (md->is_loaded() && md->is_instance_klass()) {
+      ciInstanceKlass* cik = md->as_instance_klass();
+
+      if (cik->is_initialized()) {
+        InstanceKlass* ik = md->as_instance_klass()->get_instanceKlass();
+        KlassTrainingData* ktd = KlassTrainingData::make(ik);
+        if (ktd == nullptr) {
+          // Allocation failure or snapshot in progress
+          return;
+        }
+        // This JIT task is (probably) requesting that ik be initialized,
+        // so add him to my _init_deps list.
+        TrainingDataLocker l;
+        add_init_dep(ktd);
+      }
+    }
+  }
+}
+
+void KlassTrainingData::prepare(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  ClassLoaderData* loader_data = nullptr;
+  if (_holder != nullptr) {
+    loader_data = _holder->class_loader_data();
+  } else {
+    loader_data = java_lang_ClassLoader::loader_data(SystemDictionary::java_system_loader()); // default CLD
+  }
+  _comp_deps.prepare(loader_data);
+}
+
+void MethodTrainingData::prepare(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  klass()->prepare(visitor);
+  if (has_holder()) {
+    _final_counters = holder()->method_counters();
+    _final_profile  = holder()->method_data();
+    assert(_final_profile == nullptr || _final_profile->method() == holder(), "");
+  }
+  for (int i = 0; i < CompLevel_count - 1; i++) {
+    CompileTrainingData* ctd = _last_toplevel_compiles[i];
+    if (ctd != nullptr) {
+      ctd->prepare(visitor);
+    }
+  }
+}
+
+void CompileTrainingData::prepare(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  method()->prepare(visitor);
+  ClassLoaderData* loader_data = _method->klass()->class_loader_data();
+  _init_deps.prepare(loader_data);
+  _ci_records.prepare(loader_data);
+}
+
+KlassTrainingData* KlassTrainingData::make(InstanceKlass* holder, bool null_if_not_found) {
+  Key key(holder);
+  TrainingData* td = CDS_ONLY(have_data() ? lookup_archived_training_data(&key) :) nullptr;
+  KlassTrainingData* ktd = nullptr;
+  if (td != nullptr) {
+    ktd = td->as_KlassTrainingData();
+    guarantee(!ktd->has_holder() || ktd->holder() == holder, "");
+    if (ktd->has_holder()) {
+      return ktd;
+    } else {
+      ktd = nullptr;
+    }
+  }
+  if (need_data()) {
+    TrainingDataLocker l;
+    td = training_data_set()->find(&key);
+    if (td == nullptr) {
+      if (null_if_not_found) {
+        return nullptr;
+      }
+      ktd = KlassTrainingData::allocate(holder);
+      if (ktd == nullptr) {
+        return nullptr; // allocation failure
+      }
+      td = training_data_set()->install(ktd);
+      assert(ktd == td, "");
+    } else {
+      ktd = td->as_KlassTrainingData();
+      guarantee(ktd->holder() != nullptr, "null holder");
+    }
+    assert(ktd != nullptr, "");
+    guarantee(ktd->holder() == holder, "");
+  }
+  return ktd;
+}
+
+void KlassTrainingData::print_on(outputStream* st, bool name_only) const {
+  if (has_holder()) {
+    name()->print_symbol_on(st);
+    switch (holder()->init_state()) {
+      case InstanceKlass::allocated:            st->print("[A]"); break;
+      case InstanceKlass::loaded:               st->print("[D]"); break;
+      case InstanceKlass::linked:               st->print("[L]"); break;
+      case InstanceKlass::being_initialized:    st->print("[i]"); break;
+      case InstanceKlass::fully_initialized:                      break;
+      case InstanceKlass::initialization_error: st->print("[E]"); break;
+      default: fatal("unknown state: %d", holder()->init_state());
+    }
+    if (holder()->is_interface()) {
+      st->print("I");
+    }
+  } else {
+    st->print("[SYM]");
+  }
+  if (name_only) {
+    return;
+  }
+  if (_comp_deps.length() > 0) {
+    for (int i = 0, len = _comp_deps.length(); i < len; i++) {
+      st->print(" dep:");
+      _comp_deps.at(i)->print_on(st, true);
+    }
+  }
+}
+
+KlassTrainingData::KlassTrainingData(InstanceKlass* klass) : TrainingData(klass) {
+  if (holder() == klass) {
+    return;   // no change to make
+  }
+
+  jobject hmj = _holder_mirror;
+  if (hmj != nullptr) {   // clear out previous handle, if any
+    _holder_mirror = nullptr;
+    assert(JNIHandles::is_global_handle(hmj), "");
+    JNIHandles::destroy_global(hmj);
+  }
+
+  if (klass != nullptr) {
+    Handle hm(JavaThread::current(), klass->java_mirror());
+    hmj = JNIHandles::make_global(hm);
+    Atomic::release_store(&_holder_mirror, hmj);
+  }
+
+  Atomic::release_store(&_holder, const_cast<InstanceKlass*>(klass));
+  assert(holder() == klass, "");
+}
+
+void KlassTrainingData::notice_fully_initialized() {
+  ResourceMark rm;
+  assert(has_holder(), "");
+  assert(holder()->is_initialized(), "wrong state: %s %s",
+         holder()->name()->as_C_string(), holder()->init_state_name());
+
+  TrainingDataLocker l; // Not a real lock if we don't collect the data,
+                        // that's why we need the atomic decrement below.
+  for (int i = 0; i < comp_dep_count(); i++) {
+    comp_dep(i)->dec_init_deps_left(this);
+  }
+  holder()->set_has_init_deps_processed();
+}
+
+void TrainingData::init_dumptime_table(TRAPS) {
+  precond((!assembling_data() && !need_data()) || need_data() != assembling_data());
+  if (assembling_data()) {
+    _dumptime_training_data_dictionary = new DumptimeTrainingDataDictionary();
+    _archived_training_data_dictionary.iterate([&](TrainingData* record) {
+      _dumptime_training_data_dictionary->append(record);
+    });
+  }
+  if (need_data()) {
+    _dumptime_training_data_dictionary = new DumptimeTrainingDataDictionary();
+    TrainingDataLocker l;
+    TrainingDataLocker::snapshot();
+
+    ResourceMark rm;
+    Visitor visitor(training_data_set()->size());
+    training_data_set()->iterate([&](TrainingData* td) {
+      td->prepare(visitor);
+      if (!td->is_CompileTrainingData()) {
+        _dumptime_training_data_dictionary->append(td);
+      }
+    });
+
+    if (AOTVerifyTrainingData) {
+      training_data_set()->verify();
+    }
+  }
+}
+
+void TrainingData::iterate_roots(MetaspaceClosure* it) {
+  if (_dumptime_training_data_dictionary != nullptr) {
+    for (int i = 0; i < _dumptime_training_data_dictionary->length(); i++) {
+      _dumptime_training_data_dictionary->at(i).metaspace_pointers_do(it);
+    }
+  }
+}
+
+void TrainingData::dump_training_data() {
+  if (_dumptime_training_data_dictionary != nullptr) {
+    CompactHashtableStats stats;
+    _archived_training_data_dictionary_for_dumping.reset();
+    CompactHashtableWriter writer(_dumptime_training_data_dictionary->length(), &stats);
+    for (int i = 0; i < _dumptime_training_data_dictionary->length(); i++) {
+      TrainingData* td = _dumptime_training_data_dictionary->at(i).training_data();
+#ifdef ASSERT
+      for (int j = i+1; j < _dumptime_training_data_dictionary->length(); j++) {
+        TrainingData* td1 = _dumptime_training_data_dictionary->at(j).training_data();
+        assert(!TrainingData::Key::equals(td1, td->key(), -1), "conflict");
+      }
+#endif // ASSERT
+      td = ArchiveBuilder::current()->get_buffered_addr(td);
+      uint hash = TrainingData::Key::cds_hash(td->key());
+      u4 delta = ArchiveBuilder::current()->buffer_to_offset_u4((address)td);
+      writer.add(hash, delta);
+    }
+    writer.dump(&_archived_training_data_dictionary_for_dumping, "training data dictionary");
+  }
+}
+
+void TrainingData::cleanup_training_data() {
+  if (_dumptime_training_data_dictionary != nullptr) {
+    ResourceMark rm;
+    Visitor visitor(_dumptime_training_data_dictionary->length());
+    for (int i = 0; i < _dumptime_training_data_dictionary->length(); i++) {
+      TrainingData* td = _dumptime_training_data_dictionary->at(i).training_data();
+      td->cleanup(visitor);
+    }
+    // Throw away all elements with empty keys
+    int j = 0;
+    for (int i = 0; i < _dumptime_training_data_dictionary->length(); i++) {
+      TrainingData* td = _dumptime_training_data_dictionary->at(i).training_data();
+      if (td->key()->is_empty()) {
+        continue;
+      }
+      if (i != j) { // no need to copy if it's the same
+        _dumptime_training_data_dictionary->at_put(j, td);
+      }
+      j++;
+    }
+    _dumptime_training_data_dictionary->trunc_to(j);
+  }
+}
+
+void KlassTrainingData::cleanup(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  if (has_holder()) {
+    bool is_excluded = !holder()->is_loaded() || SystemDictionaryShared::check_for_exclusion(holder(), nullptr);
+    if (is_excluded) {
+      ResourceMark rm;
+      log_debug(aot, training)("Cleanup KTD %s", name()->as_klass_external_name());
+      _holder = nullptr;
+      key()->make_empty();
+    }
+  }
+  for (int i = 0; i < _comp_deps.length(); i++) {
+    _comp_deps.at(i)->cleanup(visitor);
+  }
+}
+
+void MethodTrainingData::cleanup(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  if (has_holder()) {
+    if (SystemDictionaryShared::check_for_exclusion(holder()->method_holder(), nullptr)) {
+      log_debug(aot, training)("Cleanup MTD %s::%s", name()->as_klass_external_name(), signature()->as_utf8());
+      if (_final_profile != nullptr && _final_profile->method() != _holder) {
+        log_warning(aot, training)("Stale MDO for  %s::%s", name()->as_klass_external_name(), signature()->as_utf8());
+      }
+      _final_profile = nullptr;
+      _final_counters = nullptr;
+      _holder = nullptr;
+      key()->make_empty();
+    }
+  }
+  for (int i = 0; i < CompLevel_count - 1; i++) {
+    CompileTrainingData* ctd = _last_toplevel_compiles[i];
+    if (ctd != nullptr) {
+      ctd->cleanup(visitor);
+    }
+  }
+}
+
+void KlassTrainingData::verify() {
+  for (int i = 0; i < comp_dep_count(); i++) {
+    CompileTrainingData* ctd = comp_dep(i);
+    if (!ctd->_init_deps.contains(this)) {
+      print_on(tty); tty->cr();
+      ctd->print_on(tty); tty->cr();
+    }
+    guarantee(ctd->_init_deps.contains(this), "");
+  }
+}
+
+void MethodTrainingData::verify() {
+  iterate_compiles([](CompileTrainingData* ctd) {
+    ctd->verify();
+
+    int init_deps_left1 = ctd->init_deps_left();
+    int init_deps_left2 = ctd->compute_init_deps_left();
+
+    if (init_deps_left1 != init_deps_left2) {
+      ctd->print_on(tty); tty->cr();
+    }
+    guarantee(init_deps_left1 == init_deps_left2, "mismatch: %d %d %d",
+              init_deps_left1, init_deps_left2, ctd->init_deps_left());
+  });
+}
+
+void CompileTrainingData::verify() {
+  for (int i = 0; i < init_dep_count(); i++) {
+    KlassTrainingData* ktd = init_dep(i);
+    if (ktd->has_holder() && ktd->holder()->defined_by_other_loaders()) {
+      LogStreamHandle(Warning, training) log;
+      if (log.is_enabled()) {
+        ResourceMark rm;
+        log.print("CTD "); print_value_on(&log);
+        log.print(" depends on unregistered class %s", ktd->holder()->name()->as_C_string());
+      }
+    }
+    if (!ktd->_comp_deps.contains(this)) {
+      print_on(tty); tty->cr();
+      ktd->print_on(tty); tty->cr();
+    }
+    guarantee(ktd->_comp_deps.contains(this), "");
+  }
+}
+
+void CompileTrainingData::cleanup(Visitor& visitor) {
+  if (visitor.is_visited(this)) {
+    return;
+  }
+  visitor.visit(this);
+  method()->cleanup(visitor);
+}
+
+void TrainingData::serialize(SerializeClosure* soc) {
+  if (soc->writing()) {
+    _archived_training_data_dictionary_for_dumping.serialize_header(soc);
+  } else {
+    _archived_training_data_dictionary.serialize_header(soc);
+  }
+}
+
+class TrainingDataPrinter : StackObj {
+  outputStream* _st;
+  int _index;
+public:
+  TrainingDataPrinter(outputStream* st) : _st(st), _index(0) {}
+  void do_value(TrainingData* td) {
+    const char* type = (td->is_KlassTrainingData()   ? "K" :
+                        td->is_MethodTrainingData()  ? "M" :
+                        td->is_CompileTrainingData() ? "C" : "?");
+    _st->print("%4d: %p %s ", _index++, td, type);
+    td->print_on(_st);
+    _st->cr();
+    if (td->is_KlassTrainingData()) {
+      td->as_KlassTrainingData()->iterate_comp_deps([&](CompileTrainingData* ctd) {
+        ResourceMark rm;
+        _st->print_raw("  C ");
+        ctd->print_on(_st);
+        _st->cr();
+      });
+    } else if (td->is_MethodTrainingData()) {
+      td->as_MethodTrainingData()->iterate_compiles([&](CompileTrainingData* ctd) {
+        ResourceMark rm;
+        _st->print_raw("  C ");
+        ctd->print_on(_st);
+        _st->cr();
+      });
+    } else if (td->is_CompileTrainingData()) {
+      // ?
+    }
+  }
+};
+
+void TrainingData::print_archived_training_data_on(outputStream* st) {
+  st->print_cr("Archived TrainingData Dictionary");
+  TrainingDataPrinter tdp(st);
+  TrainingDataLocker::initialize();
+  _archived_training_data_dictionary.iterate(&tdp);
+}
+
+void TrainingData::Key::metaspace_pointers_do(MetaspaceClosure *iter) {
+  iter->push(const_cast<Metadata**>(&_meta));
+}
+
+void TrainingData::metaspace_pointers_do(MetaspaceClosure* iter) {
+  _key.metaspace_pointers_do(iter);
+}
+
+bool TrainingData::Key::can_compute_cds_hash(const Key* const& k) {
+  return k->meta() == nullptr || MetaspaceObj::is_shared(k->meta());
+}
+
+uint TrainingData::Key::cds_hash(const Key* const& k) {
+  return SystemDictionaryShared::hash_for_shared_dictionary((address)k->meta());
+}
+
+TrainingData* TrainingData::lookup_archived_training_data(const Key* k) {
+  // For this to work, all components of the key must be in shared metaspace.
+  if (!TrainingData::Key::can_compute_cds_hash(k) || _archived_training_data_dictionary.empty()) {
+    return nullptr;
+  }
+  uint hash = TrainingData::Key::cds_hash(k);
+  TrainingData* td = _archived_training_data_dictionary.lookup(k, hash, -1 /*unused*/);
+  if (td != nullptr) {
+    if ((td->is_KlassTrainingData()  && td->as_KlassTrainingData()->has_holder()) ||
+        (td->is_MethodTrainingData() && td->as_MethodTrainingData()->has_holder())) {
+      return td;
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+  return nullptr;
+}
+
+template <typename T>
+void TrainingData::DepList<T>::metaspace_pointers_do(MetaspaceClosure* iter) {
+  iter->push(&_deps);
+}
+
+void KlassTrainingData::metaspace_pointers_do(MetaspaceClosure* iter) {
+  log_trace(aot, training)("Iter(KlassTrainingData): %p", this);
+  TrainingData::metaspace_pointers_do(iter);
+  _comp_deps.metaspace_pointers_do(iter);
+  iter->push(&_holder);
+}
+
+void MethodTrainingData::metaspace_pointers_do(MetaspaceClosure* iter) {
+  log_trace(aot, training)("Iter(MethodTrainingData): %p", this);
+  TrainingData::metaspace_pointers_do(iter);
+  iter->push(&_klass);
+  iter->push((Method**)&_holder);
+  for (int i = 0; i < CompLevel_count - 1; i++) {
+    iter->push(&_last_toplevel_compiles[i]);
+  }
+  iter->push(&_final_profile);
+  iter->push(&_final_counters);
+}
+
+void CompileTrainingData::metaspace_pointers_do(MetaspaceClosure* iter) {
+  log_trace(aot, training)("Iter(CompileTrainingData): %p", this);
+  TrainingData::metaspace_pointers_do(iter);
+  _init_deps.metaspace_pointers_do(iter);
+  _ci_records.metaspace_pointers_do(iter);
+  iter->push(&_method);
+}
+
+template <typename T>
+void TrainingData::DepList<T>::prepare(ClassLoaderData* loader_data) {
+  if (_deps == nullptr && _deps_dyn != nullptr) {
+    int len = _deps_dyn->length();
+    _deps = MetadataFactory::new_array_from_c_heap<T>(len, mtClassShared);
+    for (int i = 0; i < len; i++) {
+      _deps->at_put(i, _deps_dyn->at(i)); // copy
+    }
+  }
+}
+
+void KlassTrainingData::remove_unshareable_info() {
+  TrainingData::remove_unshareable_info();
+  _holder_mirror = nullptr;
+  _comp_deps.remove_unshareable_info();
+}
+
+void MethodTrainingData::remove_unshareable_info() {
+  TrainingData::remove_unshareable_info();
+  if (_final_counters != nullptr) {
+    _final_counters->remove_unshareable_info();
+  }
+  if (_final_profile != nullptr) {
+    _final_profile->remove_unshareable_info();
+  }
+}
+
+void CompileTrainingData::remove_unshareable_info() {
+  TrainingData::remove_unshareable_info();
+  _init_deps.remove_unshareable_info();
+  _ci_records.remove_unshareable_info();
+  _init_deps_left = compute_init_deps_left(true);
+}
diff --git a/src/hotspot/share/oops/trainingData.hpp b/src/hotspot/share/oops/trainingData.hpp
new file mode 100644
index 00000000000..d79ffaef13e
--- /dev/null
+++ b/src/hotspot/share/oops/trainingData.hpp
@@ -0,0 +1,825 @@
+/*
+ * 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_OOPS_TRAININGDATA_HPP
+#define SHARE_OOPS_TRAININGDATA_HPP
+
+#include "cds/cdsConfig.hpp"
+#include "classfile/classLoaderData.hpp"
+#include "classfile/compactHashtable.hpp"
+#include "compiler/compilerDefinitions.hpp"
+#include "compiler/compiler_globals.hpp"
+#include "memory/allocation.hpp"
+#include "memory/metaspaceClosure.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/method.hpp"
+#include "runtime/handles.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "utilities/resizeableResourceHash.hpp"
+
+class ciEnv;
+class ciBaseObject;
+class CompileTask;
+class CompileTrainingData;
+class KlassTrainingData;
+class MethodTrainingData;
+
+// Base class for all the training data varieties
+class TrainingData : public Metadata {
+  friend KlassTrainingData;
+  friend MethodTrainingData;
+  friend CompileTrainingData;
+public:
+  // Key is used to insert any TrainingData (TD) object into a hash tables. The key is currently a
+  // pointer to a metaspace object the TD is associated with. For example,
+  // for KlassTrainingData it's an InstanceKlass, for MethodTrainingData it's a Method.
+  // The utility of the these hash tables is to be able to find a TD object for a given metaspace
+  // metaspace object.
+  class Key {
+    mutable Metadata* _meta;
+    // These guys can get to my constructors:
+    friend TrainingData;
+    friend KlassTrainingData;
+    friend MethodTrainingData;
+    friend CompileTrainingData;
+
+    // The empty key
+    Key() : _meta(nullptr) { }
+    bool is_empty() const { return _meta == nullptr; }
+  public:
+    Key(Metadata* meta) : _meta(meta) { }
+
+    static bool can_compute_cds_hash(const Key* const& k);
+    static uint cds_hash(const Key* const& k);
+    static unsigned hash(const Key* const& k) {
+      return primitive_hash(k->meta());
+    }
+    static bool equals(const Key* const& k1, const Key* const& k2) {
+      return k1->meta() == k2->meta();
+    }
+    static inline bool equals(TrainingData* value, const TrainingData::Key* key, int unused) {
+      return equals(value->key(), key);
+    }
+    int cmp(const Key* that) const {
+      auto m1 = this->meta();
+      auto m2 = that->meta();
+      if (m1 < m2) return -1;
+      if (m1 > m2) return +1;
+      return 0;
+    }
+    Metadata* meta() const { return _meta; }
+    void metaspace_pointers_do(MetaspaceClosure *iter);
+    void make_empty() const { _meta = nullptr; }
+  };
+
+  // TrainingDataLocker is used to guard read/write operations on non-MT-safe data structures.
+  // It supports recursive locking and a read-only mode (in which case no locks are taken).
+  // It is also a part of the TD collection termination protocol (see the "spanshot" field).
+  class TrainingDataLocker {
+    static volatile bool _snapshot; // If true we're not allocating new training data
+    static int _lock_mode;
+    const bool _recursive;
+    static void lock() {
+#if INCLUDE_CDS
+      assert(_lock_mode != 0, "Forgot to call TrainingDataLocker::initialize()");
+      if (_lock_mode > 0) {
+        TrainingData_lock->lock();
+      }
+#endif
+    }
+    static void unlock() {
+#if INCLUDE_CDS
+      if (_lock_mode > 0) {
+        TrainingData_lock->unlock();
+      }
+#endif
+    }
+    static bool safely_locked() {
+#if INCLUDE_CDS
+      assert(_lock_mode != 0, "Forgot to call TrainingDataLocker::initialize()");
+      if (_lock_mode > 0) {
+        return is_self_locked();
+      } else {
+        return true;
+      }
+#else
+      return true;
+#endif
+    }
+    static bool is_self_locked() {
+      return CDS_ONLY(TrainingData_lock->owned_by_self()) NOT_CDS(false);
+    }
+
+  public:
+    static void snapshot() {
+#if INCLUDE_CDS
+      assert_locked();
+      _snapshot = true;
+#endif
+    }
+    static bool can_add() {
+#if INCLUDE_CDS
+      assert_locked();
+      return !_snapshot;
+#else
+      return false;
+#endif
+    }
+    static void initialize() {
+#if INCLUDE_CDS
+      _lock_mode = need_data() ? +1 : -1;   // if -1, we go lock-free
+#endif
+    }
+    static void assert_locked() {
+      assert(safely_locked(), "use under TrainingDataLocker");
+    }
+    static void assert_can_add() {
+      assert(can_add(), "Cannot add TrainingData objects");
+    }
+    TrainingDataLocker() : _recursive(is_self_locked()) {
+      if (!_recursive) {
+        lock();
+      }
+    }
+    ~TrainingDataLocker() {
+      if (!_recursive) {
+        unlock();
+      }
+    }
+  };
+
+  // A set of TD objects that we collect during the training run.
+  class TrainingDataSet {
+    friend TrainingData;
+    ResizeableResourceHashtable<const Key*, TrainingData*,
+                                AnyObj::C_HEAP, MemTag::mtCompiler,
+                                &TrainingData::Key::hash,
+                                &TrainingData::Key::equals>
+      _table;
+
+  public:
+    template<typename... Arg>
+    TrainingDataSet(Arg... arg)
+      : _table(arg...) {
+    }
+    TrainingData* find(const Key* key) const {
+      TrainingDataLocker::assert_locked();
+      if (TrainingDataLocker::can_add()) {
+        auto res = _table.get(key);
+        return res == nullptr ? nullptr : *res;
+      }
+      return nullptr;
+    }
+    bool remove(const Key* key) {
+      return _table.remove(key);
+    }
+    TrainingData* install(TrainingData* td) {
+      TrainingDataLocker::assert_locked();
+      TrainingDataLocker::assert_can_add();
+      auto key = td->key();
+      if (key->is_empty()) {
+        return td;  // unkeyed TD not installed
+      }
+      bool created = false;
+      auto prior = _table.put_if_absent(key, td, &created);
+      if (prior == nullptr || *prior == td) {
+        return td;
+      }
+      assert(false, "no pre-existing elements allowed");
+      return *prior;
+    }
+    template<typename Function>
+    void iterate(const Function& fn) const { // lambda enabled API
+      iterate(const_cast<Function&>(fn));
+    }
+    template<typename Function>
+    void iterate(Function& fn) const { // lambda enabled API
+      return _table.iterate_all([&](const TrainingData::Key* k, TrainingData* td) { fn(td); });
+    }
+    int size() const { return _table.number_of_entries(); }
+
+    void verify() const {
+      TrainingDataLocker::assert_locked();
+      iterate([&](TrainingData* td) { td->verify(); });
+    }
+  };
+
+  // A widget to ensure that we visit TD object only once (TD objects can have pointer to
+  // other TD object that are sometimes circular).
+  class Visitor {
+    ResizeableResourceHashtable<TrainingData*, bool> _visited;
+  public:
+    Visitor(unsigned size) : _visited(size, 0x3fffffff) { }
+    bool is_visited(TrainingData* td) {
+      return _visited.contains(td);
+    }
+    void visit(TrainingData* td) {
+      bool created;
+      _visited.put_if_absent(td, &created);
+    }
+  };
+
+  typedef OffsetCompactHashtable<const TrainingData::Key*, TrainingData*, TrainingData::Key::equals> TrainingDataDictionary;
+private:
+  Key _key;
+
+  // just forward all constructor arguments to the embedded key
+  template<typename... Arg>
+  TrainingData(Arg... arg)
+    : _key(arg...) { }
+
+  // Container for recording TD during training run
+  static TrainingDataSet _training_data_set;
+  // Containter for replaying the training data (read-only, populated from the AOT image)
+  static TrainingDataDictionary _archived_training_data_dictionary;
+  // Container used for writing the AOT image
+  static TrainingDataDictionary _archived_training_data_dictionary_for_dumping;
+  class DumpTimeTrainingDataInfo {
+    TrainingData* _training_data;
+  public:
+    DumpTimeTrainingDataInfo() : DumpTimeTrainingDataInfo(nullptr) {}
+    DumpTimeTrainingDataInfo(TrainingData* training_data) : _training_data(training_data) {}
+    void metaspace_pointers_do(MetaspaceClosure* it) {
+      it->push(&_training_data);
+    }
+    TrainingData* training_data() {
+      return _training_data;
+    }
+  };
+  typedef GrowableArrayCHeap<DumpTimeTrainingDataInfo, mtClassShared> DumptimeTrainingDataDictionary;
+  // A temporary container that is used to accumulate and filter TD during dumping
+  static DumptimeTrainingDataDictionary* _dumptime_training_data_dictionary;
+
+  static TrainingDataSet* training_data_set() { return &_training_data_set; }
+  static TrainingDataDictionary* archived_training_data_dictionary() { return &_archived_training_data_dictionary; }
+
+ public:
+  // Returns the key under which this TD is installed, or else
+  // Key::EMPTY if it is not installed.
+  const Key* key() const { return &_key; }
+
+  static bool have_data() { return AOTReplayTraining;  } // Going to read
+  static bool need_data() { return AOTRecordTraining;  } // Going to write
+  static bool assembling_data() { return have_data() && CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes(); }
+
+  template<typename Function>
+  static void iterate(const Function& fn) { iterate(const_cast<Function&>(fn)); }
+
+  template<typename Function>
+  static void iterate(Function& fn) { // lambda enabled API
+    TrainingDataLocker l;
+    if (have_data()) {
+      archived_training_data_dictionary()->iterate(fn);
+    }
+    if (need_data()) {
+      training_data_set()->iterate(fn);
+    }
+  }
+
+  virtual MethodTrainingData*   as_MethodTrainingData()  const { return nullptr; }
+  virtual KlassTrainingData*    as_KlassTrainingData()   const { return nullptr; }
+  virtual CompileTrainingData*  as_CompileTrainingData() const { return nullptr; }
+  bool is_MethodTrainingData()  const { return as_MethodTrainingData()  != nullptr; }
+  bool is_KlassTrainingData()   const { return as_KlassTrainingData()   != nullptr; }
+  bool is_CompileTrainingData() const { return as_CompileTrainingData() != nullptr; }
+
+  virtual void prepare(Visitor& visitor) = 0;
+  virtual void cleanup(Visitor& visitor) = 0;
+
+  static void initialize() NOT_CDS_RETURN;
+
+  static void verify();
+
+  // Widget for recording dependencies, as an N-to-M graph relation,
+  // possibly cyclic.
+  template<typename E>
+  class DepList : public StackObj {
+    GrowableArrayCHeap<E, mtCompiler>* _deps_dyn;
+    Array<E>*                          _deps;
+  public:
+    DepList() {
+      _deps_dyn = nullptr;
+      _deps = nullptr;
+    }
+
+    int length() const {
+      return (_deps_dyn != nullptr ? _deps_dyn->length()
+              : _deps   != nullptr ? _deps->length()
+              : 0);
+    }
+    E* adr_at(int i) const {
+      return (_deps_dyn != nullptr ? _deps_dyn->adr_at(i)
+              : _deps   != nullptr ? _deps->adr_at(i)
+              : nullptr);
+    }
+    E at(int i) const {
+      assert(i >= 0 && i < length(), "oob");
+      return *adr_at(i);
+    }
+    bool append_if_missing(E dep) {
+      if (_deps_dyn == nullptr) {
+        _deps_dyn = new GrowableArrayCHeap<E, mtCompiler>(10);
+        _deps_dyn->append(dep);
+        return true;
+      } else {
+        return _deps_dyn->append_if_missing(dep);
+      }
+    }
+    bool remove_if_existing(E dep) {
+      if (_deps_dyn != nullptr) {
+        return _deps_dyn->remove_if_existing(dep);
+      }
+      return false;
+    }
+    void clear() {
+      if (_deps_dyn != nullptr)  {
+        _deps_dyn->clear();
+      }
+    }
+    void append(E dep) {
+      if (_deps_dyn == nullptr) {
+        _deps_dyn = new GrowableArrayCHeap<E, mtCompiler>(10);
+      }
+      _deps_dyn->append(dep);
+    }
+    bool contains(E dep) {
+      for (int i = 0; i < length(); i++) {
+        if (dep == at(i)) {
+          return true; // found
+        }
+      }
+      return false; // not found
+    }
+
+#if INCLUDE_CDS
+    void remove_unshareable_info() {
+      _deps_dyn = nullptr;
+    }
+#endif
+    void prepare(ClassLoaderData* loader_data);
+    void metaspace_pointers_do(MetaspaceClosure *iter);
+  };
+
+  virtual void metaspace_pointers_do(MetaspaceClosure *iter);
+
+  static void init_dumptime_table(TRAPS);
+
+#if INCLUDE_CDS
+  virtual void remove_unshareable_info() {}
+  static void iterate_roots(MetaspaceClosure* it);
+  static void dump_training_data();
+  static void cleanup_training_data();
+  static void serialize(SerializeClosure* soc);
+  static void print_archived_training_data_on(outputStream* st);
+  static TrainingData* lookup_archived_training_data(const Key* k);
+#endif
+
+  template<typename TrainingDataType, typename... ArgTypes>
+  static TrainingDataType* allocate(ArgTypes... args) {
+    assert(need_data() || have_data(), "");
+    if (TrainingDataLocker::can_add()) {
+      return new (mtClassShared) TrainingDataType(args...);
+    }
+    return nullptr;
+  }
+};
+
+// Training data that is associated with an InstanceKlass
+class KlassTrainingData : public TrainingData {
+  friend TrainingData;
+  friend CompileTrainingData;
+
+  // Used by CDS. These classes need to access the private default constructor.
+  template <class T> friend class CppVtableTesterA;
+  template <class T> friend class CppVtableTesterB;
+  template <class T> friend class CppVtableCloner;
+
+  // cross-link to live klass, or null if not loaded or encountered yet
+  InstanceKlass* _holder;
+  jobject _holder_mirror;   // extra link to prevent unloading by GC
+
+  DepList<CompileTrainingData*> _comp_deps; // compiles that depend on me
+
+  KlassTrainingData();
+  KlassTrainingData(InstanceKlass* klass);
+
+  int comp_dep_count() const {
+    TrainingDataLocker::assert_locked();
+    return _comp_deps.length();
+  }
+  CompileTrainingData* comp_dep(int i) const {
+    TrainingDataLocker::assert_locked();
+    return _comp_deps.at(i);
+  }
+  void add_comp_dep(CompileTrainingData* ctd) {
+    TrainingDataLocker::assert_locked();
+     _comp_deps.append_if_missing(ctd);
+  }
+  void remove_comp_dep(CompileTrainingData* ctd) {
+    TrainingDataLocker::assert_locked();
+     _comp_deps.remove_if_existing(ctd);
+  }
+
+ public:
+  Symbol* name() const {
+    precond(has_holder());
+    return holder()->name();
+  }
+  bool has_holder()       const { return _holder != nullptr; }
+  InstanceKlass* holder() const { return _holder; }
+
+  static KlassTrainingData* make(InstanceKlass* holder,
+                                 bool null_if_not_found = false) NOT_CDS_RETURN_(nullptr);
+  static KlassTrainingData* find(InstanceKlass* holder) {
+    return make(holder, true);
+  }
+  virtual KlassTrainingData* as_KlassTrainingData() const { return const_cast<KlassTrainingData*>(this); };
+
+  ClassLoaderData* class_loader_data() {
+    assert(has_holder(), "");
+    return holder()->class_loader_data();
+  }
+  void notice_fully_initialized() NOT_CDS_RETURN;
+
+  void print_on(outputStream* st, bool name_only) const;
+  virtual void print_on(outputStream* st) const { print_on(st, false); }
+  virtual void print_value_on(outputStream* st) const { print_on(st, true); }
+
+  virtual void prepare(Visitor& visitor);
+  virtual void cleanup(Visitor& visitor) NOT_CDS_RETURN;
+
+  MetaspaceObj::Type type() const {
+    return KlassTrainingDataType;
+  }
+
+#if INCLUDE_CDS
+  virtual void remove_unshareable_info();
+#endif
+
+  void metaspace_pointers_do(MetaspaceClosure *iter);
+
+  int size() const {
+    return (int)align_metadata_size(align_up(sizeof(KlassTrainingData), BytesPerWord)/BytesPerWord);
+  }
+
+  const char* internal_name() const {
+    return "{ klass training data }";
+  };
+
+  void verify();
+
+  static KlassTrainingData* allocate(InstanceKlass* holder) {
+    return TrainingData::allocate<KlassTrainingData>(holder);
+  }
+
+  template<typename Function>
+  void iterate_comp_deps(Function fn) const { // lambda enabled API
+    TrainingDataLocker l;
+    for (int i = 0; i < comp_dep_count(); i++) {
+      fn(comp_dep(i));
+    }
+  }
+};
+
+// Information about particular JIT tasks.
+class CompileTrainingData : public TrainingData {
+  friend TrainingData;
+  friend KlassTrainingData;
+
+  // Used by CDS. These classes need to access the private default constructor.
+  template <class T> friend class CppVtableTesterA;
+  template <class T> friend class CppVtableTesterB;
+  template <class T> friend class CppVtableCloner;
+
+  MethodTrainingData* _method;
+  const short _level;
+  const int _compile_id;
+
+  // classes that should be initialized before this JIT task runs
+  DepList<KlassTrainingData*> _init_deps;
+  // Number of uninitialized classes left, when it's 0, all deps are satisfied
+  volatile int _init_deps_left;
+
+public:
+  // ciRecords is a generic meachanism to memoize CI responses to arbitary queries. For each function we're interested in we record
+  // (return_value, argument_values) tuples in a list. Arguments are allowed to have Metaspace pointers in them.
+  class ciRecords {
+    template <typename... Ts> class Arguments {
+    public:
+      bool operator==(const Arguments<>&) const { return true; }
+      void metaspace_pointers_do(MetaspaceClosure *iter) { }
+    };
+    template <typename T, typename... Ts> class Arguments<T, Ts...> {
+    private:
+      T _first;
+      Arguments<Ts...> _remaining;
+
+    public:
+      constexpr Arguments(const T& first, const Ts&... remaining) noexcept
+        : _first(first), _remaining(remaining...) {}
+      constexpr Arguments() noexcept : _first(), _remaining() {}
+      bool operator==(const Arguments<T, Ts...>& that) const {
+        return _first == that._first && _remaining == that._remaining;
+      }
+      template<typename U = T, ENABLE_IF(std::is_pointer<U>::value && std::is_base_of<MetaspaceObj, typename std::remove_pointer<U>::type>::value)>
+      void metaspace_pointers_do(MetaspaceClosure *iter) {
+        iter->push(&_first);
+        _remaining.metaspace_pointers_do(iter);
+      }
+      template<typename U = T, ENABLE_IF(!(std::is_pointer<U>::value && std::is_base_of<MetaspaceObj, typename std::remove_pointer<U>::type>::value))>
+      void metaspace_pointers_do(MetaspaceClosure *iter) {
+        _remaining.metaspace_pointers_do(iter);
+      }
+    };
+
+    template <typename ReturnType, typename... Args> class ciMemoizedFunction : public StackObj {
+    public:
+      class OptionalReturnType {
+        bool _valid;
+        ReturnType _result;
+      public:
+        OptionalReturnType(bool valid, const ReturnType& result) : _valid(valid), _result(result) {}
+        bool is_valid() const { return _valid; }
+        ReturnType result() const { return _result; }
+      };
+    private:
+      typedef Arguments<Args...> ArgumentsType;
+      class Record : public MetaspaceObj {
+        ReturnType    _result;
+        ArgumentsType _arguments;
+      public:
+        Record(const ReturnType& result, const ArgumentsType& arguments) : _result(result), _arguments(arguments) {}
+        Record() { }
+        ReturnType result() const { return _result; }
+        ArgumentsType arguments() const { return _arguments; }
+        bool operator==(const Record& that) { return _arguments == that._arguments; }
+        void metaspace_pointers_do(MetaspaceClosure *iter) { _arguments.metaspace_pointers_do(iter); }
+      };
+      DepList<Record> _data;
+    public:
+      OptionalReturnType find(const Args&... args) {
+        ArgumentsType a(args...);
+        for (int i = 0; i < _data.length(); i++) {
+          if (_data.at(i).arguments() == a) {
+            return OptionalReturnType(true, _data.at(i).result());
+          }
+        }
+        return OptionalReturnType(false, ReturnType());
+      }
+      bool append_if_missing(const ReturnType& result, const Args&... args) {
+        return _data.append_if_missing(Record(result, ArgumentsType(args...)));
+      }
+#if INCLUDE_CDS
+      void remove_unshareable_info() { _data.remove_unshareable_info(); }
+#endif
+      void prepare(ClassLoaderData* loader_data) {
+        _data.prepare(loader_data);
+      }
+      void metaspace_pointers_do(MetaspaceClosure *iter) {
+        _data.metaspace_pointers_do(iter);
+      }
+    };
+
+
+public:
+    // Record CI answers for the InlineSmallCode heuristic. It is importance since the heuristic is non-commutative and we may want to
+    // compile methods in a different order than in the training run.
+    typedef ciMemoizedFunction<int, MethodTrainingData*> ciMethod__inline_instructions_size_type;
+    ciMethod__inline_instructions_size_type ciMethod__inline_instructions_size;
+#if INCLUDE_CDS
+    void remove_unshareable_info() {
+      ciMethod__inline_instructions_size.remove_unshareable_info();
+    }
+#endif
+    void prepare(ClassLoaderData* loader_data) {
+      ciMethod__inline_instructions_size.prepare(loader_data);
+    }
+    void metaspace_pointers_do(MetaspaceClosure *iter) {
+      ciMethod__inline_instructions_size.metaspace_pointers_do(iter);
+    }
+  };
+
+private:
+  ciRecords _ci_records;
+
+  CompileTrainingData();
+  CompileTrainingData(MethodTrainingData* mtd,
+                      int level,
+                      int compile_id)
+      : TrainingData(),  // empty key
+        _method(mtd), _level(level), _compile_id(compile_id), _init_deps_left(0) { }
+public:
+  ciRecords& ci_records() { return _ci_records; }
+  static CompileTrainingData* make(CompileTask* task) NOT_CDS_RETURN_(nullptr);
+
+  virtual CompileTrainingData* as_CompileTrainingData() const { return const_cast<CompileTrainingData*>(this); };
+
+  MethodTrainingData* method() const { return _method; }
+
+  int level() const { return _level; }
+
+  int compile_id() const { return _compile_id; }
+
+  int init_dep_count() const {
+    TrainingDataLocker::assert_locked();
+    return _init_deps.length();
+  }
+  KlassTrainingData* init_dep(int i) const {
+    TrainingDataLocker::assert_locked();
+    return _init_deps.at(i);
+  }
+  void add_init_dep(KlassTrainingData* ktd) {
+    TrainingDataLocker::assert_locked();
+    ktd->add_comp_dep(this);
+    _init_deps.append_if_missing(ktd);
+  }
+  void clear_init_deps() {
+    TrainingDataLocker::assert_locked();
+    for (int i = 0; i < _init_deps.length(); i++) {
+      _init_deps.at(i)->remove_comp_dep(this);
+    }
+    _init_deps.clear();
+  }
+  void dec_init_deps_left(KlassTrainingData* ktd);
+  int init_deps_left() const {
+    return Atomic::load(&_init_deps_left);
+  }
+  uint compute_init_deps_left(bool count_initialized = false);
+
+  void notice_inlined_method(CompileTask* task, const methodHandle& method) NOT_CDS_RETURN;
+
+  // The JIT looks at classes and objects too and can depend on their state.
+  // These simple calls just report the *possibility* of an observation.
+  void notice_jit_observation(ciEnv* env, ciBaseObject* what) NOT_CDS_RETURN;
+
+  virtual void prepare(Visitor& visitor);
+  virtual void cleanup(Visitor& visitor) NOT_CDS_RETURN;
+
+  void print_on(outputStream* st, bool name_only) const;
+  virtual void print_on(outputStream* st) const { print_on(st, false); }
+  virtual void print_value_on(outputStream* st) const { print_on(st, true); }
+
+#if INCLUDE_CDS
+  virtual void remove_unshareable_info();
+#endif
+
+  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
+  virtual MetaspaceObj::Type type() const { return CompileTrainingDataType; }
+
+  virtual const char* internal_name() const {
+    return "{ compile training data }";
+  };
+
+  virtual int size() const {
+    return (int)align_metadata_size(align_up(sizeof(CompileTrainingData), BytesPerWord)/BytesPerWord);
+  }
+
+  void verify();
+
+  static CompileTrainingData* allocate(MethodTrainingData* mtd, int level, int compile_id) {
+    return TrainingData::allocate<CompileTrainingData>(mtd, level, compile_id);
+  }
+};
+
+// Record information about a method at the time compilation is requested.
+class MethodTrainingData : public TrainingData {
+  friend TrainingData;
+  friend CompileTrainingData;
+
+  // Used by CDS. These classes need to access the private default constructor.
+  template <class T> friend class CppVtableTesterA;
+  template <class T> friend class CppVtableTesterB;
+  template <class T> friend class CppVtableCloner;
+
+  KlassTrainingData* _klass;
+  Method* _holder;
+  CompileTrainingData* _last_toplevel_compiles[CompLevel_count - 1];
+  int _highest_top_level;
+  int _level_mask;  // bit-set of all possible levels
+  bool _was_toplevel;
+  // metadata snapshots of final state:
+  MethodCounters* _final_counters;
+  MethodData*     _final_profile;
+
+  MethodTrainingData();
+  MethodTrainingData(Method* method, KlassTrainingData* ktd) : TrainingData(method) {
+    _klass = ktd;
+    _holder = method;
+    for (int i = 0; i < CompLevel_count - 1; i++) {
+      _last_toplevel_compiles[i] = nullptr;
+    }
+    _highest_top_level = CompLevel_none;
+    _level_mask = 0;
+    _was_toplevel = false;
+  }
+
+  static int level_mask(int level) {
+    return ((level & 0xF) != level ? 0 : 1 << level);
+  }
+
+ public:
+  KlassTrainingData* klass()  const { return _klass; }
+  bool has_holder()           const { return _holder != nullptr; }
+  Method* holder()            const { return _holder; }
+  bool only_inlined()         const { return !_was_toplevel; }
+  bool saw_level(CompLevel l) const { return (_level_mask & level_mask(l)) != 0; }
+  int highest_top_level()     const { return _highest_top_level; }
+  MethodData* final_profile() const { return _final_profile; }
+
+  Symbol* name() const {
+    precond(has_holder());
+    return holder()->name();
+  }
+  Symbol* signature() const {
+    precond(has_holder());
+    return holder()->signature();
+  }
+
+  CompileTrainingData* last_toplevel_compile(int level) const {
+    if (level > CompLevel_none) {
+      return _last_toplevel_compiles[level - 1];
+    }
+    return nullptr;
+  }
+
+  void notice_compilation(int level, bool inlined = false) {
+    if (!inlined) {
+      _was_toplevel = true;
+    }
+    _level_mask |= level_mask(level);
+  }
+
+  void notice_toplevel_compilation(int level) {
+    _highest_top_level = MAX2(_highest_top_level, level);
+  }
+
+  static MethodTrainingData* make(const methodHandle& method,
+                                  bool null_if_not_found = false,
+                                  bool use_cache = true) NOT_CDS_RETURN_(nullptr);
+  static MethodTrainingData* find_fast(const methodHandle& method) { return make(method, true, true); }
+  static MethodTrainingData* find(const methodHandle& method) { return make(method, true, false); }
+
+  virtual MethodTrainingData* as_MethodTrainingData() const {
+    return const_cast<MethodTrainingData*>(this);
+  };
+
+  void print_on(outputStream* st, bool name_only) const;
+  virtual void print_on(outputStream* st) const { print_on(st, false); }
+  virtual void print_value_on(outputStream* st) const { print_on(st, true); }
+
+  virtual void prepare(Visitor& visitor);
+  virtual void cleanup(Visitor& visitor) NOT_CDS_RETURN;
+
+  template<typename Function>
+  void iterate_compiles(Function fn) const { // lambda enabled API
+    for (int i = 0; i < CompLevel_count - 1; i++) {
+      CompileTrainingData* ctd = _last_toplevel_compiles[i];
+      if (ctd != nullptr) {
+        fn(ctd);
+      }
+    }
+  }
+
+  virtual void metaspace_pointers_do(MetaspaceClosure* iter);
+  virtual MetaspaceObj::Type type() const { return MethodTrainingDataType; }
+
+#if INCLUDE_CDS
+  virtual void remove_unshareable_info();
+#endif
+
+  virtual int size() const {
+    return (int)align_metadata_size(align_up(sizeof(MethodTrainingData), BytesPerWord)/BytesPerWord);
+  }
+
+  virtual const char* internal_name() const {
+    return "{ method training data }";
+  };
+
+  void verify();
+
+  static MethodTrainingData* allocate(Method* m, KlassTrainingData* ktd) {
+    return TrainingData::allocate<MethodTrainingData>(m, ktd);
+  }
+};
+#endif // SHARE_OOPS_TRAININGDATA_HPP
diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp
index 48e01f82025..22a2e302600 100644
--- a/src/hotspot/share/runtime/init.cpp
+++ b/src/hotspot/share/runtime/init.cpp
@@ -32,6 +32,7 @@
 #include "logging/logAsyncWriter.hpp"
 #include "memory/universe.hpp"
 #include "nmt/memTracker.hpp"
+#include "oops/trainingData.hpp"
 #include "prims/downcallLinker.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
@@ -188,6 +189,11 @@ jint init_globals2() {
   }
 #endif
 
+  // Initialize TrainingData only we're recording/replaying
+  if (TrainingData::have_data() || TrainingData::need_data()) {
+   TrainingData::initialize();
+  }
+
   if (!universe_post_init()) {
     return JNI_ERR;
   }
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 3624c5e8976..eb57d0f9744 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -90,6 +90,8 @@ Monitor* InitCompleted_lock           = nullptr;
 Monitor* BeforeExit_lock              = nullptr;
 Monitor* Notify_lock                  = nullptr;
 Mutex*   ExceptionCache_lock          = nullptr;
+Mutex*   TrainingData_lock            = nullptr;
+Monitor* TrainingReplayQueue_lock     = nullptr;
 #ifndef PRODUCT
 Mutex*   FullGCALot_lock              = nullptr;
 #endif
@@ -256,6 +258,8 @@ void mutex_init() {
 
   MUTEX_DEFN(CompiledIC_lock                 , PaddedMutex  , nosafepoint);  // locks VtableStubs_lock
   MUTEX_DEFN(MethodCompileQueue_lock         , PaddedMonitor, safepoint);
+  MUTEX_DEFL(TrainingData_lock               , PaddedMutex  , MethodCompileQueue_lock);
+  MUTEX_DEFN(TrainingReplayQueue_lock        , PaddedMonitor, safepoint);
   MUTEX_DEFN(CompileStatistics_lock          , PaddedMutex  , safepoint);
   MUTEX_DEFN(DirectivesStack_lock            , PaddedMutex  , nosafepoint);
 
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 67126c9ee29..bc36db00dc3 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -83,6 +83,8 @@ extern Mutex*   Compile_lock;                    // a lock held when Compilation
 extern Monitor* MethodCompileQueue_lock;         // a lock held when method compilations are enqueued, dequeued
 extern Monitor* CompileThread_lock;              // a lock held by compile threads during compilation system initialization
 extern Monitor* Compilation_lock;                // a lock used to pause compilation
+extern Mutex*   TrainingData_lock;               // a lock used when accessing training records
+extern Monitor* TrainingReplayQueue_lock;        // a lock held when class are added/removed to the training replay queue
 extern Mutex*   CompileTaskAlloc_lock;           // a lock held when CompileTasks are allocated
 extern Mutex*   CompileStatistics_lock;          // a lock held when updating compilation statistics
 extern Mutex*   DirectivesStack_lock;            // a lock held when mutating the dirstack and ref counting directives
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index fef868e90ff..987db37e9d5 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -812,6 +812,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // cache the system and platform class loaders
   SystemDictionary::compute_java_loaders(CHECK_JNI_ERR);
 
+  // Initiate replay training processing once preloading is over.
+  CompileBroker::init_training_replay();
+
+  AOTLinkedClassBulkLoader::replay_training_at_init_for_preloaded_classes(CHECK_JNI_ERR);
+
   if (Continuations::enabled()) {
     // Initialize Continuation class now so that failure to create enterSpecial/doYield
     // special nmethods due to limited CodeCache size can be treated as a fatal error at
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index c47ad7092a8..4e322c333a9 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1024,6 +1024,7 @@
         declare_type(ServiceThread, JavaThread)                           \
         declare_type(NotificationThread, JavaThread)                      \
         declare_type(CompilerThread, JavaThread)                          \
+        declare_type(TrainingReplayThread, JavaThread)                    \
         declare_type(StringDedupThread, JavaThread)                       \
         declare_type(AttachListenerThread, JavaThread)                    \
         DEBUG_ONLY(COMPILER2_OR_JVMCI_PRESENT(                            \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index e6a5d00ca1c..f8500276779 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -116,7 +116,8 @@ private static void initialize(TypeDataBase db) {
   }
 
   private static void populateMetadataTypeArray(TypeDataBase db) {
-    metadataTypeArray = new Type[9];
+    metadataTypeArray = new Type[11];
+    // The order needs to match up with CPP_VTABLE_TYPES_DO in src/hotspot/share/cds/cppVtables.cpp
 
     metadataTypeArray[0] = db.lookupType("ConstantPool");
     metadataTypeArray[1] = db.lookupType("InstanceKlass");
@@ -125,8 +126,10 @@ private static void populateMetadataTypeArray(TypeDataBase db) {
     metadataTypeArray[4] = db.lookupType("InstanceRefKlass");
     metadataTypeArray[5] = db.lookupType("InstanceStackChunkKlass");
     metadataTypeArray[6] = db.lookupType("Method");
-    metadataTypeArray[7] = db.lookupType("ObjArrayKlass");
-    metadataTypeArray[8] = db.lookupType("TypeArrayKlass");
+    metadataTypeArray[9] = db.lookupType("MethodData");
+    metadataTypeArray[8] = db.lookupType("MethodCounters");
+    metadataTypeArray[9] = db.lookupType("ObjArrayKlass");
+    metadataTypeArray[10] = db.lookupType("TypeArrayKlass");
   }
 
   public FileMapHeader getHeader() {
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 b6935963de9..dfc49d1a81f 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
@@ -151,6 +151,7 @@ private static synchronized void initialize(TypeDataBase db) {
 
         if (!VM.getVM().isCore()) {
             virtualConstructor.addMapping("CompilerThread", CompilerThread.class);
+            virtualConstructor.addMapping("TrainingReplayThread", HiddenJavaThread.class);
         }
 
         // These are all the visible JavaThread subclasses that execute java code.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java
new file mode 100644
index 00000000000..e2285a59600
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotProfile/AOTProfileFlags.java
@@ -0,0 +1,143 @@
+/*
+ * 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 of combinations of the diagnostic flags [+-]AOTRecordTraining and [+-]AOTReplayTraining
+ * @requires vm.cds
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.flagless
+ * @library /test/lib /test/setup_aot /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build AOTProfileFlags JavacBenchApp Hello
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *                 JavacBenchApp
+ *                 JavacBenchApp$ClassFile
+ *                 JavacBenchApp$FileManager
+ *                 JavacBenchApp$SourceFile
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello
+ * @run driver AOTProfileFlags
+ */
+
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class AOTProfileFlags {
+    public static void testDiagnosticFlags() throws Exception {
+        printTestCase("Diagnostic Flags");
+        for (int i = 0; i < 2; i++) {
+            for (int j = 0; j < 2; j ++) {
+                SimpleCDSAppTester.of("AOTProfileFlags" + i + "" + j)
+                    .addVmArgs("-XX:+UnlockDiagnosticVMOptions",
+                               "-XX:" + (i == 0 ? "-" : "+") + "AOTRecordTraining",
+                               "-XX:" + (j == 0 ? "-" : "+") + "AOTReplayTraining")
+                    .classpath("app.jar")
+                    .appCommandLine("JavacBenchApp", "10")
+                    .runAOTWorkflow();
+            }
+        }
+    }
+    static void trainAndRun(String testName, String trainingFlags, String productionFlags, String errorPattern) throws Exception {
+        printTestCase("Flags mismatch " + testName);
+
+        String appJar = ClassFileInstaller.getJarPath("hello.jar");
+        String aotConfigFile = "hello.aotconfig";
+        String aotCacheFile = "hello.aot";
+        String helloClass = "Hello";
+
+        ProcessBuilder pb;
+        OutputAnalyzer out;
+
+        // first make sure we have a valid aotConfigFile with default value of TypeProfileLevel
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:+UnlockExperimentalVMOptions",
+            trainingFlags,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldHaveExitValue(0);
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-XX:+UnlockExperimentalVMOptions",
+            trainingFlags,
+            "-cp", appJar);
+
+        out = CDSTestUtils.executeAndLog(pb, "assemble");
+        out.shouldHaveExitValue(0);
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCache=" + aotCacheFile,
+            "-XX:+UnlockExperimentalVMOptions",
+            trainingFlags,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "production_success");
+        out.shouldNotMatch(errorPattern);
+        out.shouldHaveExitValue(0);
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCache=" + aotCacheFile,
+            "-XX:+UnlockExperimentalVMOptions",
+            productionFlags,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "production_failure");
+        out.shouldMatch(errorPattern);
+        out.shouldHaveExitValue(0);
+    }
+
+    public static void testFlagsMismatch() throws Exception {
+        String errorPattern = ".*Profile.* setting .* does not equal the current .*Profile.* setting.*";
+        trainAndRun("TypeProfileLevel", "-XX:TypeProfileLevel=222", "-XX:TypeProfileLevel=111", errorPattern);
+        trainAndRun("TypeProfileArgsLimit", "-XX:TypeProfileArgsLimit=2", "-XX:TypeProfileArgsLimit=3", errorPattern);
+        trainAndRun("TypeProfileParamsLimit", "-XX:TypeProfileParmsLimit=2", "-XX:TypeProfileParmsLimit=3", errorPattern);
+        trainAndRun("TypeProfileWidth", "-XX:TypeProfileWidth=2", "-XX:TypeProfileWidth=3", errorPattern);
+        if (Platform.isDebugBuild()) {
+          trainAndRun("ProfileTraps", "-XX:+ProfileTraps", "-XX:-ProfileTraps", errorPattern);
+          trainAndRun("TypeProfileCasts", "-XX:+TypeProfileCasts", "-XX:-TypeProfileCasts", errorPattern);
+        }
+        errorPattern = "SpecTrapLimitExtraEntries setting .* does not equal the current SpecTrapLimitExtraEntries setting";
+        trainAndRun("SpecTrapLimitExtraEntries", "-XX:SpecTrapLimitExtraEntries=2", "-XX:SpecTrapLimitExtraEntries=3", errorPattern);
+    }
+
+    static int testNum = 0;
+    static void printTestCase(String s) {
+        System.out.println("vvvvvvv TEST CASE " + testNum + ": " + s + " starts here vvvvvvv");
+        testNum++;
+    }
+    public static void main(String... args) throws Exception {
+        testDiagnosticFlags();
+        testFlagsMismatch();
+    }
+}

From 4ced4e73fc0a517df826860839681004bb67e624 Mon Sep 17 00:00:00 2001
From: gauthamkrishnanibm <gautham.k@ibm.com>
Date: Wed, 28 May 2025 15:38:00 +0000
Subject: [PATCH 695/901] 8334742: Change java.time month/day field types to
 'byte'

Reviewed-by: rriggs
---
 .../share/classes/java/time/LocalDate.java         |  8 ++++----
 .../share/classes/java/time/MonthDay.java          |  8 ++++----
 .../share/classes/java/time/YearMonth.java         |  4 ++--
 .../share/classes/java/time/chrono/HijrahDate.java | 14 +++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 016bdab5394..6724410da2b 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -182,11 +182,11 @@ public final class LocalDate
     /**
      * @serial The month-of-year.
      */
-    private final short month;
+    private final byte month;
     /**
      * @serial The day-of-month.
      */
-    private final short day;
+    private final byte day;
 
     //-----------------------------------------------------------------------
     /**
@@ -490,8 +490,8 @@ private static LocalDate resolvePreviousValid(int year, int month, int day) {
      */
     private LocalDate(int year, int month, int dayOfMonth) {
         this.year = year;
-        this.month = (short) month;
-        this.day = (short) dayOfMonth;
+        this.month = (byte) month;
+        this.day = (byte) dayOfMonth;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java
index 1de4fa84d3e..6244c14e6e1 100644
--- a/src/java.base/share/classes/java/time/MonthDay.java
+++ b/src/java.base/share/classes/java/time/MonthDay.java
@@ -146,11 +146,11 @@ public final class MonthDay
     /**
      * @serial The month-of-year, not null.
      */
-    private final int month;
+    private final byte month;
     /**
      * @serial The day-of-month.
      */
-    private final int day;
+    private final byte day;
 
     //-----------------------------------------------------------------------
     /**
@@ -319,8 +319,8 @@ public static MonthDay parse(CharSequence text, DateTimeFormatter formatter) {
      * @param dayOfMonth  the day-of-month to represent, validated from 1 to 29-31
      */
     private MonthDay(int month, int dayOfMonth) {
-        this.month = month;
-        this.day = dayOfMonth;
+        this.month = (byte) month;
+        this.day = (byte) dayOfMonth;
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java
index 8ad1172811f..b24151de3f0 100644
--- a/src/java.base/share/classes/java/time/YearMonth.java
+++ b/src/java.base/share/classes/java/time/YearMonth.java
@@ -153,7 +153,7 @@ public final class YearMonth
     /**
      * @serial The month-of-year, not null.
      */
-    private final int month;
+    private final byte month;
 
     //-----------------------------------------------------------------------
     /**
@@ -306,7 +306,7 @@ public static YearMonth parse(CharSequence text, DateTimeFormatter formatter) {
      */
     private YearMonth(int year, int month) {
         this.year = year;
-        this.month = month;
+        this.month = (byte) month;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahDate.java b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
index 114a47e4797..2d3e4f93e69 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahDate.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, 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
@@ -137,11 +137,11 @@ public final class HijrahDate
     /**
      * The month-of-year.
      */
-    private final transient int monthOfYear;
+    private final transient byte monthOfYear;
     /**
      * The day-of-month.
      */
-    private final transient int dayOfMonth;
+    private final transient byte dayOfMonth;
 
     //-------------------------------------------------------------------------
     /**
@@ -273,8 +273,8 @@ private HijrahDate(HijrahChronology chrono, int prolepticYear, int monthOfYear,
 
         this.chrono = chrono;
         this.prolepticYear = prolepticYear;
-        this.monthOfYear = monthOfYear;
-        this.dayOfMonth = dayOfMonth;
+        this.monthOfYear = (byte) monthOfYear;
+        this.dayOfMonth = (byte) dayOfMonth;
     }
 
     /**
@@ -287,8 +287,8 @@ private HijrahDate(HijrahChronology chrono, long epochDay) {
 
         this.chrono = chrono;
         this.prolepticYear = dateInfo[0];
-        this.monthOfYear = dateInfo[1];
-        this.dayOfMonth = dateInfo[2];
+        this.monthOfYear = (byte) dateInfo[1];
+        this.dayOfMonth = (byte) dateInfo[2];
     }
 
     //-----------------------------------------------------------------------

From 2e6838a20d52e9fa0a3b7322f2cb548e034b5d83 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 28 May 2025 15:49:34 +0000
Subject: [PATCH 696/901] 8357307: VM GC operations should have a public
 gc_succeeded()

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1VMOperations.hpp             | 4 +---
 src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp | 2 +-
 src/hotspot/share/gc/serial/serialHeap.cpp             | 2 +-
 src/hotspot/share/gc/shared/collectedHeap.cpp          | 2 +-
 src/hotspot/share/gc/shared/gcVMOperations.hpp         | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp
index d046dfaa4e8..a201d57db76 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp
@@ -41,7 +41,6 @@ class VM_G1CollectFull : public VM_GC_Operation {
     VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true) { }
   VMOp_Type type() const override { return VMOp_G1CollectFull; }
   void doit() override;
-  bool gc_succeeded() const { return prologue_succeeded(); }
 };
 
 class VM_G1TryInitiateConcMark : public VM_GC_Operation {
@@ -63,7 +62,7 @@ class VM_G1TryInitiateConcMark : public VM_GC_Operation {
   bool cycle_already_in_progress() const { return _cycle_already_in_progress; }
   bool whitebox_attached() const { return _whitebox_attached; }
   bool terminating() const { return _terminating; }
-  bool gc_succeeded() const { return _gc_succeeded; }
+  bool gc_succeeded() const { return _gc_succeeded && VM_GC_Operation::gc_succeeded(); }
 };
 
 class VM_G1CollectForAllocation : public VM_CollectForAllocation {
@@ -74,7 +73,6 @@ class VM_G1CollectForAllocation : public VM_CollectForAllocation {
                             GCCause::Cause gc_cause);
   virtual VMOp_Type type() const { return VMOp_G1CollectForAllocation; }
   virtual void doit();
-  bool gc_succeeded() const { return prologue_succeeded(); }
 };
 
 // Concurrent G1 stop-the-world operations such as remark and cleanup.
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index bc138ce643a..683f4e13b47 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -327,7 +327,7 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size,
       // Did the VM operation execute? If so, return the result directly.
       // This prevents us from looping until time out on requests that can
       // not be satisfied.
-      if (op.prologue_succeeded()) {
+      if (op.gc_succeeded()) {
         assert(is_in_or_null(op.result()), "result not in heap");
 
         // Exit the loop if the gc time limit has been exceeded.
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index fae6acfcda9..5b2ce8d0415 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -339,7 +339,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size, bool is_tlab) {
 
     VM_SerialCollectForAllocation op(size, is_tlab, gc_count_before);
     VMThread::execute(&op);
-    if (op.prologue_succeeded()) {
+    if (op.gc_succeeded()) {
       result = op.result();
 
       assert(result == nullptr || is_in_reserved(result),
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 6628df66cad..2d23dce9488 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -382,7 +382,7 @@ MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loa
 
     VMThread::execute(&op);
 
-    if (op.prologue_succeeded()) {
+    if (op.gc_succeeded()) {
       return op.result();
     }
     loop_count++;
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index 5893986a70d..bc370358ff8 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -143,7 +143,7 @@ class VM_GC_Operation: public VM_GC_Sync_Operation {
   virtual void doit_epilogue();
 
   virtual bool allow_nested_vm_operations() const  { return true; }
-  bool prologue_succeeded() const { return _prologue_succeeded; }
+  virtual bool gc_succeeded() const { return _prologue_succeeded; }
 
   static void notify_gc_begin(bool full = false);
   static void notify_gc_end();

From e579cca619147aa51563dc00f374e02db49e1238 Mon Sep 17 00:00:00 2001
From: PAWAN CHAWDHARY <pawan.chawdhary@oracle.com>
Date: Wed, 28 May 2025 15:59:37 +0000
Subject: [PATCH 697/901] 8354475: TestDockerMemoryMetricsSubgroup.java fails
 with exitValue = 1

Reviewed-by: lmesnik, mseledtsov
---
 .../TestDockerMemoryMetricsSubgroup.java       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
index 57df7b1adbb..c6b94370807 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -22,6 +22,7 @@
  */
 
 import jdk.internal.platform.Metrics;
+import jdk.test.lib.Container;
 import jdk.test.lib.Utils;
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerfileConfig;
@@ -50,6 +51,19 @@ public class TestDockerMemoryMetricsSubgroup {
             DockerfileConfig.getBaseImageName() + ":" +
             DockerfileConfig.getBaseImageVersion();
 
+    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) {
@@ -63,6 +77,10 @@ public static void main(String[] args) throws Exception {
 
         ContainerRuntimeVersionTestUtils.checkContainerVersionSupported();
 
+        if (isRootless()) {
+            throw new SkippedException("Test skipped in rootless mode");
+        }
+
         if ("cgroupv1".equals(metrics.getProvider())) {
             testMemoryLimitSubgroupV1("200m", "400m", false);
             testMemoryLimitSubgroupV1("500m", "1G", false);

From 8949c07484bd2ea0ab1e5207d45e6ef3694b7428 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 28 May 2025 16:18:46 +0000
Subject: [PATCH 698/901] 8357930: Amendment for JDK-8333664

Reviewed-by: almatvee
---
 .../internal/MacAppImageFileExtras.java       |   7 +-
 .../jdk/jpackage/internal/AppImageFile.java   |  53 +++-------
 .../jpackage/internal/ApplicationBuilder.java |  13 +--
 .../internal/FileAssociationGroup.java        |   5 +-
 .../jdk/jpackage/internal/FromParams.java     |   4 +-
 .../jdk/jpackage/internal/LauncherData.java   |  88 +--------------
 .../internal/LauncherStartupInfoBuilder.java  |   9 +-
 .../jdk/jpackage/internal/ModuleInfo.java     | 100 ++++++++++++++++++
 .../internal/StandardBundlerParam.java        |   5 +-
 .../jpackage/internal/model/Application.java  |   2 +-
 ...licationWriter.java => BundleCreator.java} |  14 ++-
 .../{PackageWriter.java => BundleSpec.java}   |  20 +---
 .../internal/model/BundlingEnvironment.java   |  66 ++++++++++++
 .../internal/model/BundlingOperation.java     |  35 ++++++
 .../internal/model/ExternalApplication.java   |  87 +++++++++++++++
 .../LauncherModularStartupInfoMixin.java      |  11 +-
 .../jdk/jpackage/internal/model/Package.java  |   2 +-
 .../internal/util/CollectionUtils.java        |  20 ----
 .../jpackage/internal/util/TokenReplace.java  |   2 +-
 .../jpackage/internal/AppImageFileTest.java   |   2 +-
 20 files changed, 342 insertions(+), 203 deletions(-)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleInfo.java
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/{ApplicationWriter.java => BundleCreator.java} (76%)
 rename src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/{PackageWriter.java => BundleSpec.java} (65%)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
index d44799e6807..fefa2e69557 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
@@ -26,12 +26,13 @@
 
 import static jdk.jpackage.internal.AppImageFile.getBooleanExtraFieldValue;
 
+import jdk.jpackage.internal.model.ExternalApplication;
 import jdk.jpackage.internal.model.MacApplication.ExtraAppImageFileField;
 
 record MacAppImageFileExtras(boolean signed, boolean appStore) {
 
-    MacAppImageFileExtras(AppImageFile appImageFile) {
-        this(getBooleanExtraFieldValue(ExtraAppImageFileField.SIGNED.fieldName(), appImageFile),
-                getBooleanExtraFieldValue(ExtraAppImageFileField.APP_STORE.fieldName(), appImageFile));
+    MacAppImageFileExtras(ExternalApplication app) {
+        this(getBooleanExtraFieldValue(ExtraAppImageFileField.SIGNED.fieldName(), app),
+                getBooleanExtraFieldValue(ExtraAppImageFileField.APP_STORE.fieldName(), app));
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
index c80549dca89..8b8a22edc56 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
@@ -47,6 +47,7 @@
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.w3c.dom.Document;
@@ -55,7 +56,7 @@
 import org.xml.sax.SAXException;
 
 
-final class AppImageFile {
+final class AppImageFile implements ExternalApplication {
 
     AppImageFile(Application app) {
         this(new ApplicationData(app));
@@ -72,47 +73,33 @@ private AppImageFile(ApplicationData app) {
         addLauncherInfos = app.additionalLaunchers;
     }
 
-    /**
-     * Returns list of additional launchers configured for the application.
-     *
-     * Returns empty list for application without additional launchers.
-     */
-    List<LauncherInfo> getAddLaunchers() {
+    @Override
+    public List<LauncherInfo> getAddLaunchers() {
         return addLauncherInfos;
     }
 
-    /**
-     * Returns application version. Never returns null or empty value.
-     */
-    String getAppVersion() {
+    @Override
+    public String getAppVersion() {
         return appVersion;
     }
 
-    /**
-     * Returns application name. Never returns null or empty value.
-     */
-    String getAppName() {
+    @Override
+    public String getAppName() {
         return launcherName;
     }
 
-    /**
-     * Returns main application launcher name. Never returns null or empty value.
-     */
-    String getLauncherName() {
+    @Override
+    public String getLauncherName() {
         return launcherName;
     }
 
-    /**
-     * Returns main class name. Never returns null or empty value.
-     */
-    String getMainClass() {
+    @Override
+    public String getMainClass() {
         return mainClass;
     }
 
-    /**
-     * Returns additional properties. Never returns null.
-     */
-    Map<String, String> getExtra() {
+    @Override
+    public Map<String, String> getExtra() {
         return extra;
     }
 
@@ -223,7 +210,7 @@ static AppImageFile load(Path appImageDir, ApplicationLayout appLayout) throws C
         }
     }
 
-    static boolean getBooleanExtraFieldValue(String fieldId, AppImageFile appImageFile) {
+    static boolean getBooleanExtraFieldValue(String fieldId, ExternalApplication appImageFile) {
         Objects.requireNonNull(fieldId);
         Objects.requireNonNull(appImageFile);
         return Optional.ofNullable(appImageFile.getExtra().get(fieldId)).map(Boolean::parseBoolean).orElse(false);
@@ -318,16 +305,6 @@ private static String xpathQueryForExtraProperties(Set<String> excludeNames) {
         }
     }
 
-    record LauncherInfo(String name, boolean service, Map<String, String> extra) {
-        LauncherInfo {
-            Objects.requireNonNull(name);
-            Objects.requireNonNull(extra);
-            if (name.isBlank()) {
-                throw new IllegalArgumentException();
-            }
-        }
-    }
-
     private record ApplicationData(String version, String mainLauncherName, String mainLauncherMainClassName,
             Map<String, String> extra, List<LauncherInfo> additionalLaunchers) {
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
index 82b715317b2..09bf04372ce 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
@@ -33,11 +33,12 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication;
+import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 import jdk.jpackage.internal.model.RuntimeBuilder;
@@ -83,21 +84,21 @@ ApplicationBuilder runtimeBuilder(RuntimeBuilder v) {
         return this;
     }
 
-    ApplicationBuilder initFromAppImage(AppImageFile appImageFile,
+    ApplicationBuilder initFromExternalApplication(ExternalApplication app,
             Function<LauncherInfo, Launcher> mapper) {
         if (version == null) {
-            version = appImageFile.getAppVersion();
+            version = app.getAppVersion();
         }
         if (name == null) {
-            name = appImageFile.getAppName();
+            name = app.getAppName();
         }
         runtimeBuilder = null;
 
-        var mainLauncherInfo = new LauncherInfo(appImageFile.getLauncherName(), false, Map.of());
+        var mainLauncherInfo = new LauncherInfo(app.getLauncherName(), false, Map.of());
 
         launchers = new ApplicationLaunchers(
                 mapper.apply(mainLauncherInfo),
-                appImageFile.getAddLaunchers().stream().map(mapper).toList());
+                app.getAddLaunchers().stream().map(mapper).toList());
 
         return this;
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
index 30258e520f8..349a09f237c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
@@ -34,7 +34,6 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.model.FileAssociation;
-import jdk.jpackage.internal.util.CollectionUtils;
 
 final record FileAssociationGroup(List<FileAssociation> items) {
 
@@ -113,12 +112,12 @@ Builder description(String v) {
         }
 
         Builder mimeTypes(Collection<String> v) {
-            mimeTypes = CollectionUtils.toSet(v);
+            mimeTypes = Set.copyOf(v);
             return this;
         }
 
         Builder extensions(Collection<String> v) {
-            extensions = CollectionUtils.toSet(v);
+            extensions = Set.copyOf(v);
             return this;
         }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
index 6ce387df692..92059b87590 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
@@ -57,11 +57,11 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.RuntimeLayout;
@@ -103,7 +103,7 @@ static ApplicationBuilder createApplicationBuilder(Map<String, ? super Object> p
 
             if (hasPredefinedAppImage(params)) {
                 final var appImageFile = PREDEFINED_APP_IMAGE_FILE.fetchFrom(params);
-                appBuilder.initFromAppImage(appImageFile, launcherInfo -> {
+                appBuilder.initFromExternalApplication(appImageFile, launcherInfo -> {
                     var launcherParams = mapLauncherInfo(launcherInfo);
                     return launcherMapper.apply(mergeParams(params, launcherParams));
                 });
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 d3f1f9d8328..488e9106479 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
@@ -24,12 +24,9 @@
  */
 package jdk.jpackage.internal;
 
-import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.ConfigException;
 import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
-import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleReference;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
@@ -38,9 +35,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.jar.Attributes;
@@ -76,7 +71,7 @@ String packageName() {
 
     String moduleName() {
         verifyIsModular(true);
-        return moduleInfo.name;
+        return moduleInfo.name();
     }
 
     List<Path> modulePath() {
@@ -95,7 +90,7 @@ List<Path> classPath() {
 
     String getAppVersion() {
         if (isModular()) {
-            return moduleInfo.version;
+            return moduleInfo.version().orElse(null);
         }
 
         return null;
@@ -145,15 +140,14 @@ private static LauncherData createModular(String mainModule,
                 launcherData.modulePath).find(moduleName).orElse(null);
 
         if (moduleRef != null) {
-            launcherData.moduleInfo = ModuleInfo.fromModuleDescriptor(
-                    moduleRef.descriptor());
+            launcherData.moduleInfo = ModuleInfo.fromModuleReference(moduleRef);
         } else if (params.containsKey(PREDEFINED_RUNTIME_IMAGE.getID())) {
             // Failed to find module in the specified module path list and
             // there is external runtime given to jpackage.
             // Lookup module in this runtime.
             Path cookedRuntime = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
             launcherData.moduleInfo = ModuleInfo.fromCookedRuntime(moduleName,
-                    cookedRuntime);
+                    cookedRuntime).orElse(null);
         }
 
         if (launcherData.moduleInfo == null) {
@@ -162,7 +156,7 @@ private static LauncherData createModular(String mainModule,
         }
 
         if (launcherData.qualifiedClassName == null) {
-            launcherData.qualifiedClassName = launcherData.moduleInfo.mainClass;
+            launcherData.qualifiedClassName = launcherData.moduleInfo.mainClass().orElse(null);
             if (launcherData.qualifiedClassName == null) {
                 throw new ConfigException(I18N.getString("ERR_NoMainClass"), null);
             }
@@ -310,76 +304,4 @@ private static List<Path> getPathListParameter(String paramName,
     private List<Path> classPath;
     private List<Path> modulePath;
     private ModuleInfo moduleInfo;
-
-    private static final class ModuleInfo {
-        String name;
-        String version;
-        String mainClass;
-
-        static ModuleInfo fromModuleDescriptor(ModuleDescriptor md) {
-            ModuleInfo result = new ModuleInfo();
-            result.name = md.name();
-            result.mainClass = md.mainClass().orElse(null);
-
-            ModuleDescriptor.Version ver = md.version().orElse(null);
-            if (ver != null) {
-                result.version = ver.toString();
-            } else {
-                result.version = md.rawVersion().orElse(null);
-            }
-
-            return result;
-        }
-
-        static ModuleInfo fromCookedRuntime(String moduleName,
-                Path cookedRuntime) {
-            Objects.requireNonNull(moduleName);
-
-            // We can't extract info about version and main class of a module
-            // linked in external runtime without running ModuleFinder in that
-            // runtime. But this is too much work as the runtime might have been
-            // coocked without native launchers. So just make sure the module
-            // is linked in the runtime by simply analysing the data
-            // of `release` file.
-
-            final Path releaseFile;
-            if (!OperatingSystem.isMacOS()) {
-                releaseFile = cookedRuntime.resolve("release");
-            } else {
-                // On Mac `cookedRuntime` can be runtime root or runtime home.
-                Path runtimeHome = cookedRuntime.resolve("Contents/Home");
-                if (!Files.isDirectory(runtimeHome)) {
-                    runtimeHome = cookedRuntime;
-                }
-                releaseFile = runtimeHome.resolve("release");
-            }
-
-            try (Reader reader = Files.newBufferedReader(releaseFile)) {
-                Properties props = new Properties();
-                props.load(reader);
-                String moduleList = props.getProperty("MODULES");
-                if (moduleList == null) {
-                    return null;
-                }
-
-                if ((moduleList.startsWith("\"") && moduleList.endsWith("\""))
-                        || (moduleList.startsWith("\'") && moduleList.endsWith(
-                        "\'"))) {
-                    moduleList = moduleList.substring(1, moduleList.length() - 1);
-                }
-
-                if (!List.of(moduleList.split("\\s+")).contains(moduleName)) {
-                    return null;
-                }
-            } catch (IOException|IllegalArgumentException ex) {
-                Log.verbose(ex);
-                return null;
-            }
-
-            ModuleInfo result = new ModuleInfo();
-            result.name = moduleName;
-
-            return result;
-        }
-    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
index 0f3f41a2093..5273f2d251c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
@@ -43,8 +43,7 @@ LauncherStartupInfo create() {
 
     LauncherStartupInfoBuilder launcherData(LauncherData launcherData) {
         if (launcherData.isModular()) {
-            decorator = new ModuleStartupInfo(launcherData.moduleName(),
-                    launcherData.modulePath());
+            decorator = new ModuleStartupInfo(launcherData.moduleName());
         } else {
             decorator = new JarStartupInfo(launcherData.mainJarName(),
                     launcherData.isClassNameFromMainJar());
@@ -64,14 +63,12 @@ LauncherStartupInfoBuilder defaultParameters(List<String> v) {
         return this;
     }
 
-    private static record ModuleStartupInfo(String moduleName,
-            List<Path> modulePath) implements UnaryOperator<LauncherStartupInfo> {
+    private static record ModuleStartupInfo(String moduleName) implements UnaryOperator<LauncherStartupInfo> {
 
         @Override
         public LauncherStartupInfo apply(LauncherStartupInfo base) {
             return LauncherModularStartupInfo.create(base,
-                    new LauncherModularStartupInfoMixin.Stub(moduleName,
-                            modulePath));
+                    new LauncherModularStartupInfoMixin.Stub(moduleName));
         }
     }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleInfo.java
new file mode 100644
index 00000000000..590321d5e86
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ModuleInfo.java
@@ -0,0 +1,100 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleReference;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import jdk.internal.util.OperatingSystem;
+
+record ModuleInfo(String name, Optional<String> version, Optional<String> mainClass, Optional<URI> location) {
+
+    Optional<Path> fileLocation() {
+        return location.filter(loc -> {
+            return loc.getScheme().equals("file");
+        }).map(Path::of);
+    }
+
+    static ModuleInfo fromModuleReference(ModuleReference mr) {
+        final var md = mr.descriptor();
+        return new ModuleInfo(md.name(), md.version().map(ModuleDescriptor.Version::toString).or(md::rawVersion), md.mainClass(), mr.location());
+    }
+
+    static Optional<ModuleInfo> fromCookedRuntime(String moduleName, Path cookedRuntime) {
+        Objects.requireNonNull(moduleName);
+        Objects.requireNonNull(cookedRuntime);
+
+        // We can't extract info about version and main class of a module
+        // linked in external runtime without running ModuleFinder in that
+        // runtime. But this is too much work as the runtime might have been
+        // coocked without native launchers. So just make sure the module
+        // is linked in the runtime by simply analysing the data
+        // of `release` file.
+
+        final Path releaseFile;
+        if (!OperatingSystem.isMacOS()) {
+            releaseFile = cookedRuntime.resolve("release");
+        } else {
+            // On Mac `cookedRuntime` can be runtime root or runtime home.
+            Path runtimeHome = cookedRuntime.resolve("Contents/Home");
+            if (!Files.isDirectory(runtimeHome)) {
+                runtimeHome = cookedRuntime;
+            }
+            releaseFile = runtimeHome.resolve("release");
+        }
+
+        try (Reader reader = Files.newBufferedReader(releaseFile)) {
+            Properties props = new Properties();
+            props.load(reader);
+            String moduleList = props.getProperty("MODULES");
+            if (moduleList == null) {
+                return Optional.empty();
+            }
+
+            if ((moduleList.startsWith("\"") && moduleList.endsWith("\""))
+                    || (moduleList.startsWith("\'") && moduleList.endsWith(
+                    "\'"))) {
+                moduleList = moduleList.substring(1, moduleList.length() - 1);
+            }
+
+            if (!List.of(moduleList.split("\\s+")).contains(moduleName)) {
+                return Optional.empty();
+            }
+        } catch (IOException|IllegalArgumentException ex) {
+            Log.verbose(ex);
+            return Optional.empty();
+        }
+
+        return Optional.of(new ModuleInfo(moduleName, Optional.empty(), Optional.empty(), Optional.empty()));
+    }
+}
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 cdb6e7f986e..93d84fd79b6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
@@ -41,6 +41,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication;
 import static jdk.jpackage.internal.ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.model.RuntimeBuilder.getDefaultModulePath;
 
@@ -93,8 +94,8 @@ final class StandardBundlerParam {
                     null
             );
 
-    static final BundlerParamInfo<AppImageFile> PREDEFINED_APP_IMAGE_FILE = BundlerParamInfo.createBundlerParam(
-            AppImageFile.class, params -> {
+    static final BundlerParamInfo<ExternalApplication> PREDEFINED_APP_IMAGE_FILE = BundlerParamInfo.createBundlerParam(
+            ExternalApplication.class, params -> {
                 if (hasPredefinedAppImage(params)) {
                     var appImage = getPredefinedAppImage(params);
                     return AppImageFile.load(appImage, PLATFORM_APPLICATION_LAYOUT);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
index 019ea060e79..f164daf3eb0 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
@@ -40,7 +40,7 @@
  *
  * @see Package
  */
-public interface Application {
+public interface Application extends BundleSpec {
 
     /**
      * Gets the name of this application.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
similarity index 76%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
index 14827a50729..9fbb7d682a7 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleCreator.java
@@ -30,20 +30,18 @@
 
 
 /**
- * Creates app image directory from the given {@link Application} object.
- *
- *  @ see PackageWriter
+ * Creates a bundle from the given specification.
  */
 @FunctionalInterface
-public interface ApplicationWriter {
+public interface BundleCreator<T extends BundleSpec> {
 
     /**
-     * Creates app image directory from the given {@link Application} object in the given directory.
+     * Creates a bundle from the given specification in the given directory.
      *
-     * @param app the source application
-     * @param dst the directory where to create app image of the source application
+     * @param spec the bundle specification
+     * @param dst the directory where to create the bundle
      * @throws PackagerException if packaging error occurs
      * @throws IOException if an I/O error occurs
      */
-    void write(Application app, Path dst) throws PackagerException, IOException;
+    void create(T spec, Path dst) throws PackagerException, IOException;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
similarity index 65%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
index 79f0b488363..d91662075e3 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleSpec.java
@@ -22,26 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package jdk.jpackage.internal.model;
 
-import java.io.IOException;
-import java.nio.file.Path;
-
-
 /**
- * Creates native package from the given {@link jdk.jpackage.internal.model.Package} object.
- *
- * @ see ApplicationWriter
+ * A generic bundle specification.
  */
-@FunctionalInterface
-public interface PackageWriter {
-    /**
-     * Creates native package from the given {@link jdk.jpackage.internal.model.Package} object in the given directory.
-     * @param pkg the source package
-     * @param dst the directory where to create a native package
-     * @throws PackagerException if packaging error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    void write(Package pkg, Path dst) throws PackagerException, IOException;
+public interface BundleSpec {
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
new file mode 100644
index 00000000000..dcb85ecc75c
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingEnvironment.java
@@ -0,0 +1,66 @@
+/*
+ * 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.model;
+
+import java.util.Set;
+
+/**
+ * Bundling environment. Defines available bundling operations.
+ */
+public interface BundlingEnvironment {
+
+    /**
+     * Returns the default bundling operation.
+     * <p>
+     * The returned value should be one of the elements in the collection returned by {@link #enabledOperations()} method.
+     * @return the default bundling operation
+     * @throws ConfigException in not a single bundling operation can be performed.
+     */
+    BundlingOperation defaultOperation() throws ConfigException;
+
+    /**
+     * Returns supported bundling operations.
+     * @return the supported bundling operations
+     */
+    Set<BundlingOperation> supportedOperations();
+
+    /**
+     * Returns enabled bundling operations.
+     * <p>
+     * The returned value should be a subset of the set returned by {@link #supportedOperations()} method.
+     * @return the enabled bundling operations
+     */
+    default Set<BundlingOperation> enabledOperations() {
+        return supportedOperations();
+    }
+
+    /**
+     * Returns a bundle creator corresponding to the given bundling operation in this bundling environment.
+     * @param op the bundling operation
+     * @return bundle creator corresponding to the given bundling operation in this bundling environment
+     * @throws IllegalArgumentException if the given bundling operation is not enabled in this bundling environment
+     */
+    BundleCreator<?> getBundleCreator(BundlingOperation op);
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
new file mode 100644
index 00000000000..4a664a81bcf
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundlingOperation.java
@@ -0,0 +1,35 @@
+/*
+ * 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.model;
+
+/**
+ * Generic bundling operation.
+ * <p>
+ * Bundling operation is comprised of creating of {@link BundleSpec} instance
+ * and using it as an input for {@link BundleCreator#create()} method to create
+ * a bundle.
+ */
+public interface BundlingOperation {
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.java
new file mode 100644
index 00000000000..a4a928feb70
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExternalApplication.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.model;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+
+/**
+ * Description of an external application image.
+ */
+public interface ExternalApplication {
+
+    /**
+     * Returns the list of additional launchers configured for the application.
+     * <p>
+     * Returns an empty list for an application without additional launchers.
+     * @return the list of additional launchers configured for the application
+     */
+    List<LauncherInfo> getAddLaunchers();
+
+    /**
+     * Returns application version.
+     * @return the application version
+     */
+    String getAppVersion();
+
+    /**
+     * Returns application name.
+     * @return the application name
+     */
+    String getAppName();
+
+    /**
+     * Returns main launcher name.
+     * @return the main launcher name
+     */
+    String getLauncherName();
+
+    /**
+     * Returns main class name.
+     * @return the main class name
+     */
+    String getMainClass();
+
+    /**
+     * Returns additional properties.
+     * @return the additional properties
+     */
+    Map<String, String> getExtra();
+
+    /**
+     * Additional launcher description.
+     */
+    record LauncherInfo(String name, boolean service, Map<String, String> extra) {
+        public LauncherInfo {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(extra);
+            if (name.isBlank()) {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
index 4f57975f710..4a72d93a4b7 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
@@ -24,9 +24,6 @@
  */
 package jdk.jpackage.internal.model;
 
-import java.nio.file.Path;
-import java.util.List;
-
 /**
  * Details of application launcher startup configuration using Java module.
  */
@@ -38,16 +35,10 @@ public interface LauncherModularStartupInfoMixin {
      */
     String moduleName();
 
-    /**
-     * Gets the path to the input module location.
-     * @return the path to the input module location
-     */
-    List<Path> modulePath();
-
     /**
      * Default implementation of {@link LauncherModularStartupInfoMixin} interface.
      */
-    record Stub(String moduleName, List<Path> modulePath) implements LauncherModularStartupInfoMixin {
+    record Stub(String moduleName) implements LauncherModularStartupInfoMixin {
     }
 
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
index 7a0be535a1a..35db967400f 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
@@ -78,7 +78,7 @@
  * </tr>
  * </table>
  */
-public interface Package {
+public interface Package extends BundleSpec {
 
     /**
      * Gets the application of this package.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
index e5ad5246f05..ee738221758 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
@@ -25,10 +25,6 @@
 package jdk.jpackage.internal.util;
 
 import java.util.Collection;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * This class consists exclusively of static methods that operate on or return collections.
@@ -64,20 +60,4 @@ public static <T extends B, B, C extends Collection<T>> C toCollectionUBW(Collec
         Collection<?> tmp = v;
         return (C) tmp;
     }
-
-    /**
-     * Converts the given collection to {@link Set}.
-     *
-     * @param <T> the type of elements in this output collection
-     * @param col the input collection. Null is permitted.
-     * @return the input collection if it is of type {@link Set} or a new
-     *         {@link Set} instance created from the input collection
-     */
-    public static <T> Set<T> toSet(Collection<T> col) {
-        if (col instanceof Set<T> set) {
-            return set;
-        } else {
-            return Optional.ofNullable(col).map(Collection::stream).orElseGet(Stream::of).collect(Collectors.toSet());
-        }
-    }
 }
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
index 7c213851b9b..18a980dc11c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java
@@ -199,5 +199,5 @@ public static Function<String, Object> createCachingTokenValueSupplier(Map<Strin
 
     private final String[] tokens;
     private final transient List<Pattern> regexps;
-    private final static Object NULL_SUPPLIED = new Object();
+    private static final Object NULL_SUPPLIED = new Object();
 }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index 22c6b09a4a0..2bbb16c71d3 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
@@ -39,11 +39,11 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.jpackage.internal.AppImageFile.LauncherInfo;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExternalApplication.LauncherInfo;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 import org.junit.jupiter.api.Assertions;

From b2a61a9972493d67d0f1a9f3f529c11e45838d5b Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 28 May 2025 16:24:04 +0000
Subject: [PATCH 699/901] 8356985: Use "stdin.encoding" in Console's read*()
 methods

Reviewed-by: jlu, smarks, alanb, vyazici
---
 .../share/classes/java/io/Console.java        | 29 +++---
 .../jdk/internal/io/JdkConsoleImpl.java       | 17 ++--
 .../jdk/internal/io/JdkConsoleProvider.java   |  5 +-
 .../org/jline/JdkConsoleProviderImpl.java     | 16 ++--
 .../jshell/execution/impl/ConsoleImpl.java    |  2 +-
 test/jdk/java/io/Console/CharsetTest.java     | 17 ++--
 .../java/io/Console/StdinEncodingTest.java    | 92 +++++++++++++++++++
 test/jdk/java/io/Console/csp/module-info.java | 26 ++++++
 .../provider/UppercasingCharsetProvider.java  | 87 ++++++++++++++++++
 test/jdk/java/io/Console/script.exp           |  4 +-
 test/jdk/java/io/Console/stdinEncoding.exp    | 63 +++++++++++++
 11 files changed, 317 insertions(+), 41 deletions(-)
 create mode 100644 test/jdk/java/io/Console/StdinEncodingTest.java
 create mode 100644 test/jdk/java/io/Console/csp/module-info.java
 create mode 100644 test/jdk/java/io/Console/csp/provider/UppercasingCharsetProvider.java
 create mode 100644 test/jdk/java/io/Console/stdinEncoding.exp

diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
index aaa3ba8dd27..cedb6124a31 100644
--- a/src/java.base/share/classes/java/io/Console.java
+++ b/src/java.base/share/classes/java/io/Console.java
@@ -59,6 +59,13 @@
  * on the objects returned by {@link #reader()} and {@link #writer()} may
  * block in multithreaded scenarios.
  * <p>
+ * Read and write operations use the {@code Charset}s specified by
+ * {@link System##stdin.encoding stdin.encoding} and {@link
+ * System##stdout.encoding stdout.encoding}, respectively. The
+ * {@code Charset} used for write operations can also be retrieved using
+ * the {@link #charset()} method. Since {@code Console} is intended for
+ * interactive use on a terminal, these charsets are typically the same.
+ * <p>
  * Operations that format strings are locale sensitive, using either the
  * specified {@code Locale}, or the
  * {@link Locale##default_locale default format Locale} to produce localized
@@ -509,17 +516,15 @@ public void flush() {
     }
 
     /**
-     * Returns the {@link java.nio.charset.Charset Charset} object used for
-     * the {@code Console}.
+     * {@return the {@link java.nio.charset.Charset Charset} object used for
+     * the write operations on this {@code Console}}
      * <p>
-     * The returned charset is used for interpreting the input and output source
-     * (e.g., keyboard and/or display) specified by the host environment or user,
-     * which defaults to the one based on {@link System##stdout.encoding stdout.encoding}.
-     * It may not necessarily be the same as the default charset returned from
+     * The returned charset is used for encoding the data that is sent to
+     * the output (e.g., display), specified by the host environment or user.
+     * It defaults to the one based on {@link System##stdout.encoding stdout.encoding},
+     * and may not necessarily be the same as the default charset returned from
      * {@link java.nio.charset.Charset#defaultCharset() Charset.defaultCharset()}.
      *
-     * @return a {@link java.nio.charset.Charset Charset} object used for the
-     *          {@code Console}
      * @since 17
      */
     public Charset charset() {
@@ -549,7 +554,9 @@ private static UnsupportedOperationException newUnsupportedOperationException()
     }
 
     private static final boolean istty = istty();
-    static final Charset CHARSET =
+    private static final Charset STDIN_CHARSET =
+        Charset.forName(System.getProperty("stdin.encoding"), UTF_8.INSTANCE);
+    private static final Charset STDOUT_CHARSET =
         Charset.forName(System.getProperty("stdout.encoding"), UTF_8.INSTANCE);
     private static final Console cons = instantiateConsole();
     static {
@@ -579,7 +586,7 @@ private static Console instantiateConsole() {
 
             for (var jcp : ServiceLoader.load(ModuleLayer.boot(), JdkConsoleProvider.class)) {
                 if (consModName.equals(jcp.getClass().getModule().getName())) {
-                    var jc = jcp.console(istty, CHARSET);
+                    var jc = jcp.console(istty, STDIN_CHARSET, STDOUT_CHARSET);
                     if (jc != null) {
                         c = new ProxyingConsole(jc);
                     }
@@ -591,7 +598,7 @@ private static Console instantiateConsole() {
 
         // If not found, default to built-in Console
         if (istty && c == null) {
-            c = new ProxyingConsole(new JdkConsoleImpl(CHARSET));
+            c = new ProxyingConsole(new JdkConsoleImpl(STDIN_CHARSET, STDOUT_CHARSET));
         }
 
         return c;
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index 008ed68f56f..ec94d4ec4d6 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -191,10 +191,11 @@ public void flush() {
 
     @Override
     public Charset charset() {
-        return charset;
+        return outCharset;
     }
 
-    private final Charset charset;
+    private final Charset inCharset;
+    private final Charset outCharset;
     private final Object readLock;
     private final Object writeLock;
     // Must not block while holding this. It is used in the shutdown hook.
@@ -364,16 +365,18 @@ public int read(char[] cbuf, int offset, int length)
         }
     }
 
-    public JdkConsoleImpl(Charset charset) {
-        Objects.requireNonNull(charset);
-        this.charset = charset;
+    public JdkConsoleImpl(Charset inCharset, Charset outCharset) {
+        Objects.requireNonNull(inCharset);
+        Objects.requireNonNull(outCharset);
+        this.inCharset = inCharset;
+        this.outCharset = outCharset;
         readLock = new Object();
         writeLock = new Object();
         restoreEchoLock = new Object();
         out = StreamEncoder.forOutputStreamWriter(
                 new FileOutputStream(FileDescriptor.out),
                 writeLock,
-                charset);
+                outCharset);
         pw = new PrintWriter(out, true) {
             public void close() {
             }
@@ -382,7 +385,7 @@ public void close() {
         reader = new LineReader(StreamDecoder.forInputStreamReader(
                 new FileInputStream(FileDescriptor.in),
                 readLock,
-                charset));
+                inCharset));
         rcb = new char[1024];
     }
 }
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 4ac196d67ff..f3cc67e85a0 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java
@@ -38,7 +38,8 @@ public interface JdkConsoleProvider {
     /**
      * {@return the Console instance, or {@code null} if not available}
      * @param isTTY indicates if the jvm is attached to a terminal
-     * @param charset charset of the platform console
+     * @param inCharset Standard input charset of the platform console
+     * @param outCharset Standard output charset of the platform console
      */
-    JdkConsole console(boolean isTTY, Charset charset);
+    JdkConsole console(boolean isTTY, Charset inCharset, Charset outCharset);
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
index a4d1e89c399..365f6d1e68a 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java
@@ -49,18 +49,18 @@ public class JdkConsoleProviderImpl implements JdkConsoleProvider {
      * {@inheritDoc}
      */
     @Override
-    public JdkConsole console(boolean isTTY, Charset charset) {
-        return new LazyDelegatingJdkConsoleImpl(charset);
+    public JdkConsole console(boolean isTTY, Charset inCharset, Charset outCharset) {
+        return new LazyDelegatingJdkConsoleImpl(inCharset, outCharset);
     }
 
     private static class LazyDelegatingJdkConsoleImpl implements JdkConsole {
-        private final Charset charset;
+        private final Charset outCharset;
         private volatile boolean jlineInitialized;
         private volatile JdkConsole delegate;
 
-        public LazyDelegatingJdkConsoleImpl(Charset charset) {
-            this.charset = charset;
-            this.delegate = new jdk.internal.io.JdkConsoleImpl(charset);
+        public LazyDelegatingJdkConsoleImpl(Charset inCharset, Charset outCharset) {
+            this.outCharset = outCharset;
+            this.delegate = new jdk.internal.io.JdkConsoleImpl(inCharset, outCharset);
         }
 
         @Override
@@ -130,7 +130,7 @@ public void flush() {
 
         @Override
         public Charset charset() {
-            return charset;
+            return outCharset;
         }
 
         private void flushOldDelegateIfNeeded(JdkConsole oldDelegate) {
@@ -157,7 +157,7 @@ private synchronized JdkConsole initializeJLineDelegate() {
             }
 
             try {
-                Terminal terminal = TerminalBuilder.builder().encoding(charset)
+                Terminal terminal = TerminalBuilder.builder().encoding(outCharset)
                                                    .exec(false)
                                                    .nativeSignals(false)
                                                    .systemOutput(SystemOutput.SysOut)
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
index 0282b62da4c..5f4defc8afd 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java
@@ -64,7 +64,7 @@ public ConsoleProviderImpl() {
         private static RemoteConsole console;
 
         @Override
-        public JdkConsole console(boolean isTTY, Charset charset) {
+        public JdkConsole console(boolean isTTY, Charset inCharset, Charset outCharset) {
             synchronized (ConsoleProviderImpl.class) {
                 if (remoteOutput != null && remoteInput != null) {
                     return console = new RemoteConsole(remoteOutput, remoteInput);
diff --git a/test/jdk/java/io/Console/CharsetTest.java b/test/jdk/java/io/Console/CharsetTest.java
index 8bc23fa58f8..c8c756def81 100644
--- a/test/jdk/java/io/Console/CharsetTest.java
+++ b/test/jdk/java/io/Console/CharsetTest.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
@@ -27,10 +27,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import static jdk.test.lib.Utils.*;
 
 /**
  * @test
- * @bug 8264208 8265918
+ * @bug 8264208 8265918 8356985
  * @summary Tests Console.charset() method. "expect" command in Windows/Cygwin
  *          does not work as expected. Ignoring tests on Windows.
  * @requires (os.family == "linux") | (os.family == "mac")
@@ -50,22 +51,18 @@ public static void main(String... args) throws Throwable {
             // check "expect" command availability
             var expect = Paths.get("/usr/bin/expect");
             if (!Files.exists(expect) || !Files.isExecutable(expect)) {
-                System.out.println("'expect' command not found. Test ignored.");
-                return;
+                throw new jtreg.SkippedException("'expect' command not found. Test ignored.");
             }
 
             // invoking "expect" command
-            var testSrc = System.getProperty("test.src", ".");
-            var testClasses = System.getProperty("test.classes", ".");
-            var jdkDir = System.getProperty("test.jdk");
             OutputAnalyzer output = ProcessTools.executeProcess(
                     "expect",
                     "-n",
-                    testSrc + "/script.exp",
-                    jdkDir + "/bin/java",
+                    TEST_SRC + "/script.exp",
+                    TEST_JDK + "/bin/java",
                     args[0],
                     args[1],
-                    testClasses);
+                    TEST_CLASSES);
             output.reportDiagnosticSummary();
             var eval = output.getExitValue();
             if (eval != 0) {
diff --git a/test/jdk/java/io/Console/StdinEncodingTest.java b/test/jdk/java/io/Console/StdinEncodingTest.java
new file mode 100644
index 00000000000..1f2ea225f96
--- /dev/null
+++ b/test/jdk/java/io/Console/StdinEncodingTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.BufferedReader;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import static jdk.test.lib.Utils.*;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @test
+ * @bug 8356985
+ * @summary Tests if "stdin.encoding" is reflected for reading
+ *          the console. "expect" command in Windows/Cygwin does
+ *          not work as expected. Ignoring tests on Windows.
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @library /test/lib
+ * @build csp/*
+ * @run junit StdinEncodingTest
+ */
+public class StdinEncodingTest {
+
+    @Test
+    public void testStdinEncoding() throws Throwable {
+        // check "expect" command availability
+        var expect = Paths.get("/usr/bin/expect");
+        Assumptions.assumeTrue(Files.exists(expect) && Files.isExecutable(expect),
+            "'" + expect + "' not found");
+
+        // invoking "expect" command
+        OutputAnalyzer output = ProcessTools.executeProcess(
+            "expect",
+            "-n",
+            TEST_SRC + "/stdinEncoding.exp",
+            TEST_JDK + "/bin/java",
+            "--module-path",
+            TEST_CLASSES + "/modules",
+            "-Dstdin.encoding=Uppercasing", // <- gist of this test
+            "StdinEncodingTest");
+        output.reportDiagnosticSummary();
+        var eval = output.getExitValue();
+        assertEquals(0, eval, "Test failed. Exit value from 'expect' command: " + eval);
+    }
+
+    public static void main(String... args) throws Throwable {
+        // check stdin.encoding
+        if (!"Uppercasing".equals(System.getProperty("stdin.encoding"))) {
+            throw new RuntimeException("Uppercasing charset was not set in stdin.encoding");
+        }
+        var con = System.console();
+
+        // Console.readLine()
+        System.out.print(con.readLine());
+
+        // Console.readPassword()
+        System.out.print(String.valueOf(con.readPassword()));
+
+        // Console.reader()
+        try (var br = new BufferedReader(con.reader())) {
+            System.out.print(br.readLine());
+        }
+
+        // Wait till the test receives the result
+        con.readLine();
+    }
+}
diff --git a/test/jdk/java/io/Console/csp/module-info.java b/test/jdk/java/io/Console/csp/module-info.java
new file mode 100644
index 00000000000..9178c3ea631
--- /dev/null
+++ b/test/jdk/java/io/Console/csp/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+module csp {
+    provides java.nio.charset.spi.CharsetProvider with provider.UppercasingCharsetProvider;
+}
diff --git a/test/jdk/java/io/Console/csp/provider/UppercasingCharsetProvider.java b/test/jdk/java/io/Console/csp/provider/UppercasingCharsetProvider.java
new file mode 100644
index 00000000000..ee1142de416
--- /dev/null
+++ b/test/jdk/java/io/Console/csp/provider/UppercasingCharsetProvider.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.
+ */
+package provider;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.spi.CharsetProvider;
+import java.util.Collections;
+import java.util.Iterator;
+
+// A test charset provider that decodes every input byte into its uppercase
+public class UppercasingCharsetProvider extends CharsetProvider {
+
+    @Override
+    public Iterator charsets() {
+        return Collections.singleton(new UppercasingCharsetProvider.UppercasingCharset()).iterator();
+    }
+
+    @Override
+    public Charset charsetForName(String charsetName) {
+        if (charsetName.equals("Uppercasing")) {
+            return new UppercasingCharsetProvider.UppercasingCharset();
+        } else {
+            return null;
+        }
+    }
+
+    public static class UppercasingCharset extends Charset {
+
+        public UppercasingCharset() {
+            super("Uppercasing", null);
+        }
+
+        @Override
+        public boolean contains(Charset cs) {
+            return false;
+        }
+
+        @Override
+        public CharsetDecoder newDecoder() {
+            return new UppercasingCharsetDecoder(this, 1, 1);
+        }
+
+        @Override
+        public CharsetEncoder newEncoder() {
+            return null;
+        }
+    }
+
+    private static class UppercasingCharsetDecoder extends CharsetDecoder {
+        public UppercasingCharsetDecoder(Charset cs, float averageCharsPerByte, float maxCharsPerByte) {
+            super(cs, averageCharsPerByte, maxCharsPerByte);
+        }
+
+        @Override
+        protected CoderResult decodeLoop(ByteBuffer in, CharBuffer out) {
+            while (in.remaining() > 0) {
+                out.put(Character.toUpperCase((char)in.get()));
+            }
+            return CoderResult.UNDERFLOW;
+        }
+    }
+}
diff --git a/test/jdk/java/io/Console/script.exp b/test/jdk/java/io/Console/script.exp
index 3c97a3c4143..c416990cbe9 100644
--- a/test/jdk/java/io/Console/script.exp
+++ b/test/jdk/java/io/Console/script.exp
@@ -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
@@ -27,6 +27,6 @@ set expected [lrange $argv 2 2]
 set args [lrange $argv 3 end]
 regexp {([a-zA-Z_]*).([a-zA-Z0-9\-]*)} $locale dummy lang_region encoding
 
-eval spawn $java -Dsun.stdout.encoding=$encoding -classpath $args CharsetTest
+eval spawn $java -Dstdout.encoding=$encoding -classpath $args CharsetTest
 expect $expected
 expect eof
diff --git a/test/jdk/java/io/Console/stdinEncoding.exp b/test/jdk/java/io/Console/stdinEncoding.exp
new file mode 100644
index 00000000000..23950f195f1
--- /dev/null
+++ b/test/jdk/java/io/Console/stdinEncoding.exp
@@ -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.
+#
+
+set java [lrange $argv 0 end]
+
+eval spawn $java
+
+# Console::readLine()
+send "abc\r"
+expect {
+    "ABC" { send_error "Console::readLine() received\n" }
+    timeout {
+        send_error "Error: Console::readLine() not received\n"
+        exit 1
+    }
+}
+
+# Console::readPassword()
+send "def\r"
+expect {
+    "DEF" { send_error "Console::readPassword() received\n" }
+    timeout {
+        send_error "Error: Console::readPassword() not received\n"
+        exit 1
+    }
+}
+
+# Console::reader()
+send "ghi\r"
+expect {
+    "GHI" { send_error "Console::reader() received\n" }
+    timeout {
+        send_error "Error: Console::reader() not received\n"
+        exit 1
+    }
+}
+
+# should receive eof
+send "\r"
+expect eof
+
+# success
+exit 0

From cd052c72cdb62186e66c1d2ecf9216f3df61b242 Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Wed, 28 May 2025 17:22:41 +0000
Subject: [PATCH 700/901] 8345431: Improve jar --validate to detect duplicate
 or invalid entries

Reviewed-by: lancea, jpai
---
 .../share/classes/sun/tools/jar/Main.java     |   4 +-
 .../classes/sun/tools/jar/Validator.java      | 223 +++++++++++-
 .../sun/tools/jar/resources/jar.properties    |  25 +-
 src/jdk.jartool/share/man/jar.md              |  27 +-
 test/jdk/tools/jar/ValidatorTest.java         | 332 ++++++++++++++++++
 5 files changed, 596 insertions(+), 15 deletions(-)
 create mode 100644 test/jdk/tools/jar/ValidatorTest.java

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 baedbf85205..60fb85baca8 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
@@ -447,8 +447,8 @@ public synchronized boolean run(String[] args) {
     }
 
     private boolean validateJar(File file) throws IOException {
-        try (ZipFile zf = new ZipFile(file)) {
-            return Validator.validate(this, zf);
+        try {
+            return Validator.validate(this, file);
         } catch (IOException e) {
             error(formatMsg("error.validator.jarfile.exception", fname, e.getMessage()));
             return true;
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
index 3bb5e9a2a5e..1852b2cad9d 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.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,7 +25,9 @@
 
 package sun.tools.jar;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.module.ModuleDescriptor;
@@ -36,16 +38,19 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.function.IntSupplier;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
-import static java.util.jar.JarFile.MANIFEST_NAME;
 import static sun.tools.jar.Main.VERSIONS_DIR;
 import static sun.tools.jar.Main.VERSIONS_DIR_LENGTH;
 import static sun.tools.jar.Main.MODULE_INFO;
@@ -54,6 +59,32 @@
 import static sun.tools.jar.Main.toBinaryName;
 
 final class Validator {
+    /**
+     * Regex expression to verify that the Zip Entry file name:
+     * - is not an absolute path
+     * - the file name is not '.' or '..'
+     * - does not contain a backslash, '\'
+     * - does not contain a drive letter
+     * - path element does not include '.' or '..'
+     */
+    private static final Pattern INVALID_ZIP_ENTRY_NAME_PATTERN = Pattern.compile(
+            // Don't allow a '..' in the path
+            "^(\\.|\\.\\.)$"
+                    + "|^\\.\\./"
+                    + "|/\\.\\.$"
+                    + "|/\\.\\./"
+                    // Don't allow a '.' in the path
+                    + "|^\\./"
+                    + "|/\\.$"
+                    + "|/\\./"
+                    // Don't allow absolute path
+                    + "|^/"
+                    // Don't allow a backslash in the path
+                    + "|^\\\\"
+                    + "|.*\\\\.*"
+                    // Don't allow a drive letter
+                    + "|.*[a-zA-Z]:.*"
+    );
 
     private final Map<String,FingerPrint> classes = new HashMap<>();
     private final Main main;
@@ -62,20 +93,189 @@ final class Validator {
     private Set<String> concealedPkgs = Collections.emptySet();
     private ModuleDescriptor md;
     private String mdName;
+    private final ZipInputStream zis;
 
-    private Validator(Main main, ZipFile zf) {
+    private Validator(Main main, ZipFile zf, ZipInputStream zis) {
         this.main = main;
         this.zf = zf;
+        this.zis = zis;
         checkModuleDescriptor(MODULE_INFO);
     }
 
-    static boolean validate(Main main, ZipFile zf) throws IOException {
-        return new Validator(main, zf).validate();
+    static boolean validate(Main main, File zipFile) throws IOException {
+        try (ZipFile zf = new ZipFile(zipFile);
+            ZipInputStream zis = new ZipInputStream(new BufferedInputStream(
+                    new FileInputStream(zipFile)))) {
+            return new Validator(main, zf, zis).validate();
+        }
+    }
+
+    /**
+     * Validate that the CEN/LOC file name header field adheres  to
+     * PKWARE APPNOTE-6.3.3.TXT:
+     *
+     * 4.4.17.1 The name of the file, with optional relative path.
+     * The path stored MUST not contain a drive or
+     * device letter, or a leading slash.  All slashes
+     * MUST be forward slashes '/' as opposed to
+     * backwards slashes '\' for compatibility with Amiga
+     * and UNIX file systems etc.
+     * Also validate that the file name is not "." or "..", and that any name
+     * element is not equal to "." or ".."
+     *
+     * @param entryName ZIP entry name
+     * @return true if a valid Zip Entry file name; false otherwise
+     */
+    public static boolean isZipEntryNameValid(String entryName) {
+        return !INVALID_ZIP_ENTRY_NAME_PATTERN.matcher(entryName).find();
+    }
+
+    /**
+     * Validate base on entries in CEN and LOC. To ensure
+     * - Valid entry name
+     * - No duplicate entries
+     * - CEN and LOC should have same entries, in the same order
+     *
+     * NOTE: In order to check the encounter order based on the CEN listing,
+     *       this implementation assumes CEN entries are to be added before
+     *       adding any LOC entries. That is, addCenEntry should be called before
+     *       calls to addLocEntry to ensure encounter order can be compared
+     *       properly.
+     */
+    private class EntryValidator {
+        // A place holder when an entry is not yet seen in the directory
+        static final EntryEncounter PLACE_HOLDER = new EntryEncounter(0, 0);
+        // Flag to signal the CEN and LOC is not in the same order
+        boolean outOfOrder = false;
+        /**
+         * A record to keep the encounter order in the directory and count of the appearances
+         */
+        record EntryEncounter(int order, int count) {
+            /**
+             * Add to the appearance count.
+             * @param encounterOrder The supplier for the encounter order in the directory
+             */
+            EntryEncounter increase(IntSupplier encounterOrder) {
+                return isPlaceHolder() ?
+                    // First encounter of the entry in this directory
+                    new EntryEncounter(encounterOrder.getAsInt(), 1) :
+                    // After first encounter, keep the order but add the count
+                    new EntryEncounter(order, count + 1);
+            }
+
+            /**
+             * True if this entry is not in the directory.
+             */
+            boolean isPlaceHolder() {
+                return this == PLACE_HOLDER;
+            }
+        }
+
+        /**
+         * Information used for validation for a entry in CEN and LOC.
+         */
+        record EntryInfo(EntryEncounter cen, EntryEncounter loc) {}
+
+        /**
+         * Ordered deduplication set for entries
+         */
+        LinkedHashMap<String, EntryInfo> entries = new LinkedHashMap<>();
+        // Encounter order in CEN, step by 1 on each new entry
+        int cenEncounterOrder = 0;
+        // Encounter order in LOC, step by 1 for new LOC entry that exists in CEN
+        // Order comparing is based on CEN listing, therefore we skip LOC only entries.
+        int locEncounterOrder = 0;
+
+        /**
+         * Record an entry apperance in CEN
+         */
+        public void addCenEntry(ZipEntry cenEntry) {
+            var entryName = cenEntry.getName();
+            var entryInfo = entries.get(entryName);
+            if (entryInfo == null) {
+                entries.put(entryName, new EntryInfo(
+                        new EntryEncounter(cenEncounterOrder++, 1),
+                        PLACE_HOLDER));
+            } else {
+                assert entryInfo.loc().isPlaceHolder();
+                entries.put(entryName, new EntryInfo(
+                        entryInfo.cen().increase(() -> cenEncounterOrder++),
+                        entryInfo.loc()));
+            }
+        }
+
+        /**
+         * Record an entry apperance in LOC
+         * We compare entry order based on the CEN. Thus do not increase LOC
+         * encounter order if the entry is only in LOC.
+         * NOTE: This works because all CEN entries are added before adding LOC entries.
+         */
+        public void addLocEntry(ZipEntry locEntry) {
+            var entryName = locEntry.getName();
+            var entryInfo = entries.get(entryName);
+            if (entryInfo == null) {
+                entries.put(entryName, new EntryInfo(
+                        PLACE_HOLDER,
+                        new EntryEncounter(locEncounterOrder, 1)));
+            } else {
+                entries.put(entryName, new EntryInfo(
+                        entryInfo.cen(),
+                        entryInfo.loc().increase(() -> entryInfo.cen().isPlaceHolder() ? locEncounterOrder : locEncounterOrder++)));
+            }
+        }
+
+        /**
+         * Issue warning for duplicate entries
+         */
+        private void checkDuplicates(int count, String msg, String entryName) {
+            if (count > 1) {
+                warn(formatMsg(msg, Integer.toString(count), entryName));
+                isValid = false;
+            }
+        }
+
+        /**
+         * Validation per entry observed.
+         * Each entry must appear at least once in the CEN or LOC.
+         */
+        private void validateEntry(String entryName, EntryInfo entryInfo) {
+            // Check invalid entry name
+            if (!isZipEntryNameValid(entryName)) {
+                warn(formatMsg("warn.validator.invalid.entry.name", entryName));
+                isValid = false;
+            }
+            // Check duplicate entries in CEN
+            checkDuplicates(entryInfo.cen().count(), "warn.validator.duplicate.cen.entry", entryName);
+            // Check duplicate entries in LOC
+            checkDuplicates(entryInfo.loc().count(), "warn.validator.duplicate.loc.entry", entryName);
+            // Check consistency between CEN and LOC
+            if (entryInfo.cen().isPlaceHolder()) {
+                warn(formatMsg("warn.validator.loc.only.entry", entryName));
+                isValid = false;
+            } else if (entryInfo.loc().isPlaceHolder()) {
+                warn(formatMsg("warn.validator.cen.only.entry", entryName));
+                isValid = false;
+            } else if (!outOfOrder && entryInfo.loc().order() != entryInfo.cen().order()) {
+                outOfOrder = true;
+                isValid = false;
+                warn(getMsg("warn.validator.order.mismatch"));
+            }
+        }
+
+        /**
+         * Validate the jar entries by checking each entry in encounter order
+         */
+        public void validate() {
+            entries.sequencedEntrySet().forEach(e -> validateEntry(e.getKey(), e.getValue()));
+        }
     }
 
+
     private boolean validate() {
         try {
+            var entryValidator = new EntryValidator();
             zf.stream()
+              .peek(entryValidator::addCenEntry)
               .filter(e -> e.getName().endsWith(".class"))
               .map(this::getFingerPrint)
               .filter(FingerPrint::isClass)    // skip any non-class entry
@@ -91,7 +291,18 @@ private boolean validate() {
                       else
                           validateVersioned(entries);
                   });
-        } catch (InvalidJarException e) {
+
+            /*
+            * Retrieve entries from the ZipInputStream to verify local file headers(LOC)
+            * have same entries as the cental directory(CEN).
+            */
+            ZipEntry e;
+            while ((e = zis.getNextEntry()) != null) {
+                entryValidator.addLocEntry(e);
+            }
+
+            entryValidator.validate();
+        } catch (IOException | InvalidJarException e) {
             errorAndInvalid(e.getMessage());
         }
         return isValid;
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
index 676c16c445a..0e3555f181e 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
@@ -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
@@ -143,6 +143,18 @@ warn.validator.concealed.public.class=\
         Warning: entry {0} is a public class\n\
         in a concealed package, placing this jar on the class path will result\n\
         in incompatible public interfaces
+warn.validator.duplicate.cen.entry=\
+        Warning: There were {0} central directory entries found for {1}
+warn.validator.duplicate.loc.entry=\
+        Warning: There were {0} local file headers found for {1}
+warn.validator.invalid.entry.name=\
+        Warning: entry name {0} is not valid
+warn.validator.cen.only.entry=\
+        Warning: An equivalent for the central directory entry {0} was not found in the local file headers
+warn.validator.loc.only.entry=\
+        Warning: An equivalent entry for the local file header {0} was not found in the central directory
+warn.validator.order.mismatch=\
+        Warning: Central directory and local file header entries are not in the same order
 warn.release.unexpected.versioned.entry=\
         unexpected versioned entry {0}
 warn.index.is.ignored=\
@@ -265,10 +277,13 @@ main.help.opt.main.extract=\
 main.help.opt.main.describe-module=\
 \  -d, --describe-module      Print the module descriptor, or automatic module name
 main.help.opt.main.validate=\
-\      --validate             Validate the contents of the jar archive. This option\n\
-\                             will validate that the API exported by a multi-release\n\
+\      --validate             Validate the contents of the jar archive. This option:\n\
+\                             - Validates that the API exported by a multi-release\n\
 \                             jar archive is consistent across all different release\n\
-\                             versions.
+\                             versions.\n\
+\                             - Issues a warning if there are invalid or duplicate file names
+
+
 main.help.opt.any=\
 \ Operation modifiers valid in any mode:\n\
 \n\
@@ -346,7 +361,5 @@ main.help.postopt=\
 \n\
 \ Mandatory or optional arguments to long options are also mandatory or optional\n\
 \ for any corresponding short options.
-main.help.opt.extract=\
-\ Operation modifiers valid only in extract mode:\n
 main.help.opt.extract.dir=\
 \  --dir                    Directory into which the jar will be extracted
diff --git a/src/jdk.jartool/share/man/jar.md b/src/jdk.jartool/share/man/jar.md
index 709786fe89b..d944afcfb7f 100644
--- a/src/jdk.jartool/share/man/jar.md
+++ b/src/jdk.jartool/share/man/jar.md
@@ -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,6 +106,10 @@ argument is the first argument specified on the command line.
 `-d` or `--describe-module`
 :   Prints the module descriptor or automatic module name.
 
+`--validate`
+:   Validate the contents of the JAR file.
+    See `Integrity of a JAR File` section below for more details.
+
 ## Operation Modifiers Valid in Any Mode
 
 You can use the following options to customize the actions of any operation
@@ -213,6 +217,27 @@ operation modes:
 `--version`
 :   Prints the program version.
 
+## Integrity of a JAR File
+As a JAR file is based on ZIP format, it is possible to create a JAR file using tools
+other than the `jar` command. The --validate option may be used to perform the following
+integrity checks against a JAR file:
+
+- That there are no duplicate Zip entry file names
+- Verify that the Zip entry file name:
+    - is not an absolute path
+    - the file name is not '.' or '..'
+    - does not contain a backslash, '\\'
+    - does not contain a drive letter
+    - path element does not include '.' or '..
+- The API exported by a multi-release jar archive is consistent across all different release
+  versions.
+
+The jar tool exits with a status of 0 if there were no integrity issues encountered and >0 if an
+error/warning occurred.
+
+When an integrity issue is reported, it will often require that the JAR file is re-created by the
+original source of the JAR file.
+
 ## Examples of jar Command Syntax
 
 -   Create an archive, `classes.jar`, that contains two class files,
diff --git a/test/jdk/tools/jar/ValidatorTest.java b/test/jdk/tools/jar/ValidatorTest.java
new file mode 100644
index 00000000000..c08e6a8a984
--- /dev/null
+++ b/test/jdk/tools/jar/ValidatorTest.java
@@ -0,0 +1,332 @@
+/*
+ * 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 8345431
+ * @summary test validator to report malformed jar file
+ * @library /test/lib
+ * @modules jdk.jartool
+ * @build jdk.test.lib.Platform
+ *        jdk.test.lib.util.FileUtils
+ * @run junit/othervm ValidatorTest
+ */
+
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.jar.JarFile;
+import java.util.spi.ToolProvider;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import jdk.test.lib.util.FileUtils;
+
+class ValidatorTest {
+    private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
+        .orElseThrow(() ->
+            new RuntimeException("jar tool not found")
+        );
+
+    private final String nl = System.lineSeparator();
+    private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    private final PrintStream jarOut = new PrintStream(baos);
+
+    static final String jdkVendor = System.getProperty("java.vendor");
+    static final String jdkVersion = System.getProperty("java.version");
+    static final String MANIFEST1 = "Manifest-Version: 1.0"
+            + System.lineSeparator()
+            + "Created-By: " + jdkVersion + " (" + jdkVendor + ")";
+    static final String MANIFEST2 = "Manifest-Version: 2.0"
+            + System.lineSeparator()
+            + "Created-By: " + jdkVersion + " (" + jdkVendor + ")";
+    static final String MANIFEST3 = "Manifest-Version: 3.0"
+            + System.lineSeparator()
+            + "Created-By: " + jdkVersion + " (" + jdkVendor + ")";
+    private static final String META_INF = "META-INF/";
+
+    private void writeManifestAsFirstSecondAndFourthEntry(Path path, boolean useCen, boolean useLoc) throws IOException {
+        int locPosA, cenPos;
+        System.out.printf("%n%n*****Creating Jar with duplicate Manifest*****%n%n");
+        var out = new ByteArrayOutputStream(1024);
+        try (var zos = new ZipOutputStream(out)) {
+            zos.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
+            zos.write(MANIFEST1.getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+            locPosA = out.size();
+            zos.putNextEntry(new ZipEntry(META_INF + "AANIFEST.MF"));
+            zos.write(MANIFEST2.getBytes(StandardCharsets.UTF_8));
+            zos.putNextEntry(new ZipEntry("entry1.txt"));
+            zos.write("entry1".getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+            zos.putNextEntry(new ZipEntry(META_INF + "BANIFEST.MF"));
+            zos.write(MANIFEST3.getBytes(StandardCharsets.UTF_8));
+            zos.putNextEntry(new ZipEntry("entry2.txt"));
+            zos.write("hello entry2".getBytes(StandardCharsets.UTF_8));
+            zos.flush();
+            cenPos = out.size();
+        }
+        var template = out.toByteArray();
+        // ISO_8859_1 to keep the 8-bit value to avoid mess index in the byte array
+        var s = new String(template, StandardCharsets.ISO_8859_1);
+        // change META-INF/AANIFEST.MF to META-INF/MANIFEST.MF
+        if (useCen) {
+            var cen = s.indexOf("AANIFEST.MF", cenPos);
+            template[cen] = (byte) 'M';
+            // change META-INF/BANIFEST.MF to META-INF/MANIFEST.MF
+            cen = s.indexOf("BANIFEST.MF", cenPos);
+            template[cen] = (byte) 'M';
+        }
+        if (useLoc) {
+            var loc = s.indexOf("AANIFEST.MF", locPosA);
+            template[loc] = (byte) 'M';
+        }
+        Files.write(path, template);
+    }
+
+    private void createMismatchOrderJar(Path path) throws IOException {
+        int locPosA, locPosB;
+        System.out.printf("%n%n*****Creating Jar with the swap entry name*****%n%n");
+        var out = new ByteArrayOutputStream(1024);
+        try (var zos = new ZipOutputStream(out)) {
+            zos.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
+            zos.write(MANIFEST1.getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+            locPosA = out.size();
+            zos.putNextEntry(new ZipEntry(META_INF + "AANIFEST.MF"));
+            zos.write(MANIFEST2.getBytes(StandardCharsets.UTF_8));
+            zos.putNextEntry(new ZipEntry("entry1.txt"));
+            zos.write("entry1".getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+            locPosB = out.size();
+            zos.putNextEntry(new ZipEntry(META_INF + "BANIFEST.MF"));
+            zos.write(MANIFEST3.getBytes(StandardCharsets.UTF_8));
+            zos.putNextEntry(new ZipEntry("entry2.txt"));
+            zos.write("hello entry2".getBytes(StandardCharsets.UTF_8));
+            zos.flush();
+        }
+        var template = out.toByteArray();
+        // ISO_8859_1 to keep the 8-bit value to avoid mess index in the byte array
+        var s = new String(template, StandardCharsets.ISO_8859_1);
+        // change META-INF/AANIFEST.MF to META-INF/BANIFEST.MF
+        var loc = s.indexOf("AANIFEST.MF", locPosA);
+        template[loc] = (byte) 'B';
+        // change META-INF/BANIFEST.MF to META-INF/AANIFEST.MF
+        loc = s.indexOf("BANIFEST.MF", locPosB);
+        template[loc] = (byte) 'A';
+
+        Files.write(path, template);
+    }
+
+    record EntryNameTestCase(String entryName, boolean isValid) {}
+
+    private static Stream<EntryNameTestCase> zipEntryPaths() {
+        return Stream.of(
+                new EntryNameTestCase("../../c:////d:/tmp/testentry0", false),
+                new EntryNameTestCase("..\\..\\c:\\d:\\tmp\\testentry1", false),
+                new EntryNameTestCase("////c:/tmp/testentry2", false),
+                new EntryNameTestCase("////c:/d:/tmp/testentry3", false),
+                new EntryNameTestCase("c://///d:/tmp/testentry4", false),
+                new EntryNameTestCase("//tmp/tmp2/testentry5", false),
+                new EntryNameTestCase("///tmp/abc", false),
+                new EntryNameTestCase("C:\\Documents\\tennis\\CardioTennis.pdf", false),
+                new EntryNameTestCase("\\Program Files\\Custom Utilities\\tennis.exe", false),
+                new EntryNameTestCase("myhome\\Hello.txt", false),
+                new EntryNameTestCase("Hello.txt", true),
+                new EntryNameTestCase("./Hello.txt", true),
+                new EntryNameTestCase("../Hello.txt", false),
+                new EntryNameTestCase(".\\Hello.txt", false),
+                new EntryNameTestCase("..\\Hello.txt", false),
+                new EntryNameTestCase("C:\\Hello.txt", false),
+                new EntryNameTestCase("D:/Hello.txt", false),
+                new EntryNameTestCase("foo\\bar.txt", false),
+                new EntryNameTestCase("foo/bar.txt", true),
+                new EntryNameTestCase("foo/../bar.txt", false),
+                new EntryNameTestCase("foo/./bar.txt", true),
+                new EntryNameTestCase("..", false),
+                new EntryNameTestCase(".", false),
+                new EntryNameTestCase("/home/foo.txt", false),
+                new EntryNameTestCase("./home/foo.txt", true),
+                new EntryNameTestCase("../home/foo.txt", false),
+                new EntryNameTestCase("foo/bar/..", false),
+                new EntryNameTestCase("foo/bar/.", true),
+                new EntryNameTestCase("/foo/bar/../../myhome/bin", false),
+                new EntryNameTestCase("/foo/bar/././myhome/bin", false),
+                new EntryNameTestCase("myHome/..valid", true),
+                new EntryNameTestCase("myHome/.valid", true),
+                new EntryNameTestCase("..valid", true),
+                new EntryNameTestCase(".valid", true)
+        );
+    }
+
+    private List<String> createInvalidEntryJar(Path path) throws IOException {
+        System.out.printf("%n%n*****Creating Jar with the invalid entry names*****%n%n");
+        var out = new ByteArrayOutputStream(1024);
+        List<String> invalidEntryNames;
+        try (var zos = new ZipOutputStream(out)) {
+            invalidEntryNames = zipEntryPaths()
+                .filter(testCase -> {
+                        try {
+                            zos.putNextEntry(new ZipEntry(testCase.entryName()));
+                            var content = "Content of " + testCase.entryName();
+                            zos.write(content.getBytes(StandardCharsets.UTF_8));
+                            return !testCase.isValid();
+                        } catch (IOException ioe) {
+                            throw new UncheckedIOException(ioe);
+                        }
+                    })
+                .map(EntryNameTestCase::entryName).toList();
+            zos.flush();
+        } catch (UncheckedIOException uioe) {
+            throw uioe.getCause();
+        }
+        Files.write(path, out.toByteArray());
+        return invalidEntryNames;
+    }
+
+    @Test
+    public void testValidJar() throws IOException {
+        var zip = Path.of("Regular.jar");
+        writeManifestAsFirstSecondAndFourthEntry(zip, false, false);
+        jar("--validate --file " + zip.toString());
+    }
+
+    @Test
+    public void testMultiManifestJar() throws IOException {
+        var zip = Path.of("MultipleManifestTest.jar");
+        writeManifestAsFirstSecondAndFourthEntry(zip, true, true);
+        try {
+            jar("--validate --file " + zip.toString());
+            fail("Expecting non-zero exit code");
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            assertTrue(err.contains("Warning: There were 3 central directory entries found for META-INF/MANIFEST.MF"));
+            assertTrue(err.contains("Warning: There were 2 local file headers found for META-INF/MANIFEST.MF"));
+            assertTrue(err.contains("Warning: An equivalent entry for the local file header META-INF/BANIFEST.MF was not found in the central directory"));
+        }
+    }
+
+    @Test
+    public void testOnlyLocModified() throws IOException {
+        Path f = Path.of("LocHacked.jar");
+        writeManifestAsFirstSecondAndFourthEntry(f, false, true);
+        try {
+            jar("--validate --file " + f.toString());
+            fail("Expecting non-zero exit code");
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            assertTrue(err.contains("Warning: There were 2 local file headers found for META-INF/MANIFEST.MF"));
+            assertTrue(err.contains("Warning: An equivalent for the central directory entry META-INF/AANIFEST.MF was not found in the local file headers"));
+            // Order is base on the central directory, expecting AANIFEST.MF but see next entry
+            assertTrue(err.contains("Warning: Central directory and local file header entries are not in the same order"));
+        }
+    }
+
+    @Test
+    public void testOnlyCenModified() throws IOException {
+        Path f = Path.of("CenHacked.jar");
+        writeManifestAsFirstSecondAndFourthEntry(f, true, false);
+        try {
+            jar("--validate --file " + f.toString());
+            fail("Expecting non-zero exit code");
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            assertTrue(err.contains("Warning: There were 3 central directory entries found for META-INF/MANIFEST.MF"));
+            assertTrue(err.contains("Warning: An equivalent entry for the local file header META-INF/AANIFEST.MF was not found in the central directory"));
+            assertTrue(err.contains("Warning: An equivalent entry for the local file header META-INF/BANIFEST.MF was not found in the central directory"));
+            assertFalse(err.contains("Warning: Central directory and local file header entries are not in the same order"));
+        }
+    }
+
+    @Test
+    public void testMismatchOrder() throws IOException {
+        Path f = Path.of("SwappedEntry.jar");
+        createMismatchOrderJar(f);
+        try {
+            jar("--validate --file " + f.toString());
+            fail("Expecting non-zero exit code");
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            assertTrue(err.contains("Warning: Central directory and local file header entries are not in the same order"));
+        }
+    }
+
+    @Test
+    public void testInvalidEntryName() throws IOException {
+        Path f = Path.of("InvalidEntry.jar");
+        var invalidEntryNames = createInvalidEntryJar(f);
+        try {
+            jar("--validate --file " + f.toString());
+            fail("Expecting non-zero exit code");
+        } catch (IOException e) {
+            var err = e.getMessage();
+            System.out.println(err);
+            for (var entryName : invalidEntryNames) {
+                assertTrue(err.contains("Warning: entry name " + entryName + " is not valid"), "missing warning for " + entryName);
+            }
+        }
+    }
+
+    // return stderr output
+    private String jar(String cmdline) throws IOException {
+        System.out.println("jar " + cmdline);
+        baos.reset();
+
+        // the run method catches IOExceptions, we need to expose them
+        ByteArrayOutputStream baes = new ByteArrayOutputStream();
+        PrintStream err = new PrintStream(baes);
+        PrintStream saveErr = System.err;
+        System.setErr(err);
+        try {
+            int rc = JAR_TOOL.run(jarOut, err, cmdline.split(" +"));
+            System.out.println("exit code: " + rc);
+            if (rc != 0) {
+                assertTrue(rc > 0);
+                throw new IOException(baes.toString());
+            } else {
+                return baes.toString();
+            }
+        } finally {
+            System.setErr(saveErr);
+        }
+    }
+}
\ No newline at end of file

From 28f509317d477c5f4076658f9ae9995aa6c53631 Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Wed, 28 May 2025 19:14:36 +0000
Subject: [PATCH 701/901] 8356233: NMT: tty->print_cr should not be used in
 VirtualMemoryTracker::add_reserved_region()

Reviewed-by: jsjolen, dholmes
---
 .../share/nmt/virtualMemoryTracker.cpp        | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index e6fac91f245..04a72079460 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -401,17 +401,20 @@ bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
         return true;
       }
 
-      // Print some more details. Don't use UL here to avoid circularities.
-      tty->print_cr("Error: existing region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %u.\n"
-                    "       new region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %u.",
-                    p2i(reserved_rgn->base()), p2i(reserved_rgn->end()), (unsigned)reserved_rgn->mem_tag(),
-                    p2i(base_addr), p2i(base_addr + size), (unsigned)mem_tag);
+      // Print some more details.
+      stringStream ss;
+      ss.print_cr("Error: old region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %s.\n"
+                    "       new region: [" INTPTR_FORMAT "-" INTPTR_FORMAT "), memory tag %s.",
+                    p2i(reserved_rgn->base()), p2i(reserved_rgn->end()), NMTUtil::tag_to_name(reserved_rgn->mem_tag()),
+                    p2i(base_addr), p2i(base_addr + size), NMTUtil::tag_to_name(mem_tag));
       if (MemTracker::tracking_level() == NMT_detail) {
-        tty->print_cr("Existing region allocated from:");
-        reserved_rgn->call_stack()->print_on(tty);
-        tty->print_cr("New region allocated from:");
-        stack.print_on(tty);
+        ss.print_cr("Existing region allocated from:");
+        reserved_rgn->call_stack()->print_on(&ss);
+        ss.print_cr("New region allocated from:");
+        stack.print_on(&ss);
       }
+      log_debug(nmt)("%s", ss.freeze());
+
       ShouldNotReachHere();
       return false;
     }

From bb2c80c0e9923385e0b6243c0ebff9afef208470 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Wed, 28 May 2025 19:52:18 +0000
Subject: [PATCH 702/901] 8298420: Implement JEP 470: PEM Encodings of
 Cryptographic Objects (Preview)

Reviewed-by: weijun, mr, mullan, jnimeh
---
 .../classes/java/security/AsymmetricKey.java  |   4 +-
 .../classes/java/security/DEREncodable.java   |  59 ++
 .../share/classes/java/security/KeyPair.java  |   2 +-
 .../classes/java/security/PEMDecoder.java     | 512 ++++++++++++++++++
 .../classes/java/security/PEMEncoder.java     | 382 +++++++++++++
 .../classes/java/security/PEMRecord.java      | 136 +++++
 .../classes/java/security/cert/X509CRL.java   |   4 +-
 .../java/security/cert/X509Certificate.java   |   6 +-
 .../security/spec/PKCS8EncodedKeySpec.java    |  27 +-
 .../security/spec/X509EncodedKeySpec.java     |   6 +-
 .../javax/crypto/EncryptedPrivateKeyInfo.java | 318 +++++++++--
 .../jdk/internal/javac/PreviewFeature.java    |   2 +
 .../classes/sun/security/ec/ECKeyFactory.java | 115 ++--
 .../sun/security/ec/ECPrivateKeyImpl.java     |  60 +-
 .../sun/security/ec/XDHKeyFactory.java        |  25 +-
 .../sun/security/ec/XDHPrivateKeyImpl.java    |   7 +-
 .../sun/security/ec/ed/EdDSAKeyFactory.java   |  21 +-
 .../security/ec/ed/EdDSAPrivateKeyImpl.java   |  10 +-
 .../sun/security/pkcs/NamedPKCS8Key.java      |   8 +-
 .../classes/sun/security/pkcs/PKCS8Key.java   | 205 +++++--
 .../sun/security/provider/DSAPrivateKey.java  |   6 +-
 .../sun/security/provider/KeyProtector.java   |   7 +-
 .../sun/security/provider/X509Factory.java    | 114 +---
 .../sun/security/rsa/RSAKeyFactory.java       |  13 +-
 .../security/rsa/RSAPrivateCrtKeyImpl.java    |  35 +-
 .../sun/security/rsa/RSAPrivateKeyImpl.java   |   4 +-
 .../sun/security/rsa/RSAPublicKeyImpl.java    |   8 +-
 .../classes/sun/security/util/DerValue.java   |   3 +-
 .../classes/sun/security/util/KeyUtil.java    |  68 +++
 .../share/classes/sun/security/util/Pem.java  | 309 ++++++++++-
 .../classes/sun/security/x509/X509Key.java    |  18 +-
 .../share/conf/security/java.security         |   9 +
 .../KeyFactoryGetKeySpecForInvalidSpec.java   |   1 +
 test/jdk/java/security/PEM/PEMData.java       | 476 ++++++++++++++++
 .../jdk/java/security/PEM/PEMDecoderTest.java | 510 +++++++++++++++++
 .../jdk/java/security/PEM/PEMEncoderTest.java | 199 +++++++
 .../EncryptedPrivateKeyInfo/EncryptKey.java   |  82 +++
 .../EncryptedPrivateKeyInfo/GetKey.java       |  76 +++
 .../sun/security/pkcs/pkcs8/PKCS8Test.java    |  74 +--
 39 files changed, 3519 insertions(+), 402 deletions(-)
 create mode 100644 src/java.base/share/classes/java/security/DEREncodable.java
 create mode 100644 src/java.base/share/classes/java/security/PEMDecoder.java
 create mode 100644 src/java.base/share/classes/java/security/PEMEncoder.java
 create mode 100644 src/java.base/share/classes/java/security/PEMRecord.java
 create mode 100644 test/jdk/java/security/PEM/PEMData.java
 create mode 100644 test/jdk/java/security/PEM/PEMDecoderTest.java
 create mode 100644 test/jdk/java/security/PEM/PEMEncoderTest.java
 create mode 100644 test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
 create mode 100644 test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java

diff --git a/src/java.base/share/classes/java/security/AsymmetricKey.java b/src/java.base/share/classes/java/security/AsymmetricKey.java
index e96aeb4d84c..d37afe9bfea 100644
--- a/src/java.base/share/classes/java/security/AsymmetricKey.java
+++ b/src/java.base/share/classes/java/security/AsymmetricKey.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
@@ -34,7 +34,7 @@
  *
  * @since 22
  */
-public interface AsymmetricKey extends Key {
+public non-sealed interface AsymmetricKey extends Key, DEREncodable {
     /**
      * Returns the parameters associated with this key.
      * The parameters are optional and may be either
diff --git a/src/java.base/share/classes/java/security/DEREncodable.java b/src/java.base/share/classes/java/security/DEREncodable.java
new file mode 100644
index 00000000000..63c6a73ee52
--- /dev/null
+++ b/src/java.base/share/classes/java/security/DEREncodable.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.
+ */
+
+package java.security;
+
+import jdk.internal.javac.PreviewFeature;
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * This interface is implemented by security API classes that contain
+ * binary-encodable key or certificate material.
+ * These APIs or their subclasses typically provide methods to convert
+ * their instances to and from byte arrays in the Distinguished
+ * Encoding Rules (DER) format.
+ *
+ * @see AsymmetricKey
+ * @see KeyPair
+ * @see PKCS8EncodedKeySpec
+ * @see X509EncodedKeySpec
+ * @see EncryptedPrivateKeyInfo
+ * @see X509Certificate
+ * @see X509CRL
+ * @see PEMRecord
+ *
+ * @since 25
+ */
+
+@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+public sealed interface DEREncodable permits AsymmetricKey, KeyPair,
+    PKCS8EncodedKeySpec, X509EncodedKeySpec, EncryptedPrivateKeyInfo,
+    X509Certificate, X509CRL, PEMRecord {
+}
diff --git a/src/java.base/share/classes/java/security/KeyPair.java b/src/java.base/share/classes/java/security/KeyPair.java
index cc648a677dd..39c98501fea 100644
--- a/src/java.base/share/classes/java/security/KeyPair.java
+++ b/src/java.base/share/classes/java/security/KeyPair.java
@@ -37,7 +37,7 @@
  * @since 1.1
  */
 
-public final class KeyPair implements java.io.Serializable {
+public final class KeyPair implements java.io.Serializable, DEREncodable {
 
     @java.io.Serial
     private static final long serialVersionUID = -7565189502268009837L;
diff --git a/src/java.base/share/classes/java/security/PEMDecoder.java b/src/java.base/share/classes/java/security/PEMDecoder.java
new file mode 100644
index 00000000000..eeb6decdf40
--- /dev/null
+++ b/src/java.base/share/classes/java/security/PEMDecoder.java
@@ -0,0 +1,512 @@
+/*
+ * 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 java.security;
+
+import jdk.internal.javac.PreviewFeature;
+
+import sun.security.pkcs.PKCS8Key;
+import sun.security.rsa.RSAPrivateCrtKeyImpl;
+import sun.security.util.KeyUtil;
+import sun.security.util.Pem;
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.spec.PBEKeySpec;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.*;
+import java.security.spec.*;
+import java.util.Base64;
+import java.util.Objects;
+
+/**
+ * {@code PEMDecoder} implements a decoder for Privacy-Enhanced Mail (PEM) data.
+ * PEM is a textual encoding used to store and transfer security
+ * objects, such as asymmetric keys, certificates, and certificate revocation
+ * lists (CRLs).  It is defined in RFC 1421 and RFC 7468.  PEM consists of a
+ * Base64-formatted binary encoding enclosed by a type-identifying header
+ * and footer.
+ *
+ * <p> The {@linkplain #decode(String)} and {@linkplain #decode(InputStream)}
+ * methods return an instance of a class that matches the data
+ * type and implements {@link DEREncodable}.
+ *
+ * <p> The following lists the supported PEM types and the {@code DEREncodable}
+ * types that each are decoded as:
+ * <ul>
+ *  <li>CERTIFICATE : {@code X509Certificate}</li>
+ *  <li>X509 CRL : {@code X509CRL}</li>
+ *  <li>PUBLIC KEY : {@code PublicKey}</li>
+ *  <li>PUBLIC KEY : {@code X509EncodedKeySpec} (Only supported when passed as
+ *  a {@code Class} parameter)</li>
+ *  <li>PRIVATE KEY : {@code PrivateKey}</li>
+ *  <li>PRIVATE KEY : {@code PKCS8EncodedKeySpec} (Only supported when passed
+ *  as a {@code Class} parameter)</li>
+ *  <li>PRIVATE KEY : {@code KeyPair} (if the encoding also contains a
+ *  public key)</li>
+ *  <li>ENCRYPTED PRIVATE KEY : {@code EncryptedPrivateKeyInfo} </li>
+ *  <li>ENCRYPTED PRIVATE KEY : {@code PrivateKey} (if configured with
+ *  Decryption)</li>
+ *  <li>Other types : {@code PEMRecord} </li>
+ * </ul>
+ *
+ * <p> The {@code PublicKey} and {@code PrivateKey} types, an algorithm specific
+ * subclass is returned if the underlying algorithm is supported. For example an
+ * ECPublicKey and ECPrivateKey for Elliptic Curve keys.
+ *
+ * <p> If the PEM type does not have a corresponding class,
+ * {@code decode(String)} and {@code decode(InputStream)} will return a
+ * {@link PEMRecord}.
+ *
+ * <p> The {@linkplain #decode(String, Class)} and
+ * {@linkplain #decode(InputStream, Class)} methods take a Class parameter
+ * which determines the type of {@code DEREncodable} that is returned. These
+ * methods are useful when extracting or changing the return class.
+ * For example, if the PEM contains both public and private keys, the
+ * Class parameter can specify which to return. Use
+ * {@code PrivateKey.class} to return only the private key.
+ * If the Class parameter is set to {@code X509EncodedKeySpec.class}, the
+ * public key will be returned in that format.  Any type of PEM data can be
+ * decoded into a {@code PEMRecord} by specifying {@code PEMRecord.class}.
+ * If the Class parameter doesn't match the PEM content, an
+ * {@code IllegalArgumentException} will be thrown.
+ *
+ * <p> A new {@code PEMDecoder} instance is created when configured
+ * with {@linkplain #withFactory(Provider)} and/or
+ * {@linkplain #withDecryption(char[])}. {@linkplain #withFactory(Provider)}
+ * configures the decoder to use only {@linkplain KeyFactory} and
+ * {@linkplain CertificateFactory} instances from the given {@code Provider}.
+ * {@link#withDecryption(char[])} configures the decoder to decrypt all
+ * encrypted private key PEM data using the given password.
+ * Configuring an instance for decryption does not prevent decoding with
+ * unencrypted PEM. Any encrypted PEM that fails decryption
+ * will throw a {@link RuntimeException}. When an encrypted private key PEM is
+ * used with a decoder not configured for decryption, an
+ * {@link EncryptedPrivateKeyInfo} object is returned.
+ *
+ * <p>This class is immutable and thread-safe.
+ *
+ * <p> Here is an example of decoding a {@code PrivateKey} object:
+ * {@snippet lang = java:
+ *     PEMDecoder pd = PEMDecoder.of();
+ *     PrivateKey priKey = pd.decode(priKeyPEM, PrivateKey.class);
+ * }
+ *
+ * <p> Here is an example of a {@code PEMDecoder} configured with decryption
+ * and a factory provider:
+ * {@snippet lang = java:
+ *     PEMDecoder pe = PEMDecoder.of().withDecryption(password).
+ *         withFactory(provider);
+ *     byte[] pemData = pe.decode(privKey);
+ * }
+ *
+ * @implNote An implementation may support other PEM types and
+ * {@code DEREncodables}. This implementation additionally supports PEM types:
+ * {@code X509 CERTIFICATE}, {@code X.509 CERTIFICATE}, {@code CRL},
+ * and {@code RSA PRIVATE KEY}.
+ *
+ * @see PEMEncoder
+ * @see PEMRecord
+ * @see EncryptedPrivateKeyInfo
+ *
+ * @spec https://www.rfc-editor.org/info/rfc1421
+ *       RFC 1421: Privacy Enhancement for Internet Electronic Mail
+ * @spec https://www.rfc-editor.org/info/rfc7468
+ *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
+ *
+ * @since 25
+ */
+
+@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+public final class PEMDecoder {
+    private final Provider factory;
+    private final PBEKeySpec password;
+
+    // Singleton instance for PEMDecoder
+    private final static PEMDecoder PEM_DECODER = new PEMDecoder(null, null);
+
+    /**
+     * Creates an instance with a specific KeyFactory and/or password.
+     * @param withFactory KeyFactory provider
+     * @param withPassword char[] password for EncryptedPrivateKeyInfo
+     *                    decryption
+     */
+    private PEMDecoder(Provider withFactory, PBEKeySpec withPassword) {
+        password = withPassword;
+        factory = withFactory;
+    }
+
+    /**
+     * Returns an instance of {@code PEMDecoder}.
+     *
+     * @return a {@code PEMDecoder} instance
+     */
+    public static PEMDecoder of() {
+        return PEM_DECODER;
+    }
+
+    /**
+     * After the header, footer, and base64 have been separated, identify the
+     * header and footer and proceed with decoding the base64 for the
+     * appropriate type.
+     */
+    private DEREncodable decode(PEMRecord pem) {
+        Base64.Decoder decoder = Base64.getMimeDecoder();
+
+        try {
+            return switch (pem.type()) {
+                case Pem.PUBLIC_KEY -> {
+                    X509EncodedKeySpec spec =
+                        new X509EncodedKeySpec(decoder.decode(pem.pem()));
+                    yield getKeyFactory(
+                        KeyUtil.getAlgorithm(spec.getEncoded())).
+                        generatePublic(spec);
+                }
+                case Pem.PRIVATE_KEY -> {
+                    PKCS8Key p8key = new PKCS8Key(decoder.decode(pem.pem()));
+                    String algo = p8key.getAlgorithm();
+                    KeyFactory kf = getKeyFactory(algo);
+                    DEREncodable d = kf.generatePrivate(
+                        new PKCS8EncodedKeySpec(p8key.getEncoded(), algo));
+
+                    // Look for a public key inside the pkcs8 encoding.
+                    if (p8key.getPubKeyEncoded() != null) {
+                        // Check if this is a OneAsymmetricKey encoding
+                        X509EncodedKeySpec spec = new X509EncodedKeySpec(
+                            p8key.getPubKeyEncoded(), algo);
+                        yield new KeyPair(getKeyFactory(algo).
+                            generatePublic(spec), (PrivateKey) d);
+
+                    } else if (d instanceof PKCS8Key p8 &&
+                        p8.getPubKeyEncoded() != null) {
+                        // If the KeyFactory decoded an algorithm-specific
+                        // encodings, look for the public key again.  This
+                        // happens with EC and SEC1-v2 encoding
+                        X509EncodedKeySpec spec = new X509EncodedKeySpec(
+                            p8.getPubKeyEncoded(), algo);
+                        yield new KeyPair(getKeyFactory(algo).
+                            generatePublic(spec), p8);
+                    } else {
+                        // No public key, return the private key.
+                        yield d;
+                    }
+                }
+                case Pem.ENCRYPTED_PRIVATE_KEY -> {
+                    if (password == null) {
+                        yield new EncryptedPrivateKeyInfo(decoder.decode(
+                            pem.pem()));
+                    }
+                    yield new EncryptedPrivateKeyInfo(decoder.decode(pem.pem())).
+                        getKey(password.getPassword());
+                }
+                case Pem.CERTIFICATE, Pem.X509_CERTIFICATE,
+                     Pem.X_509_CERTIFICATE -> {
+                    CertificateFactory cf = getCertFactory("X509");
+                    yield (X509Certificate) cf.generateCertificate(
+                        new ByteArrayInputStream(decoder.decode(pem.pem())));
+                }
+                case Pem.X509_CRL, Pem.CRL -> {
+                    CertificateFactory cf = getCertFactory("X509");
+                    yield (X509CRL) cf.generateCRL(
+                        new ByteArrayInputStream(decoder.decode(pem.pem())));
+                }
+                case Pem.RSA_PRIVATE_KEY -> {
+                    KeyFactory kf = getKeyFactory("RSA");
+                    yield kf.generatePrivate(
+                        RSAPrivateCrtKeyImpl.getKeySpec(decoder.decode(
+                            pem.pem())));
+                }
+                default -> pem;
+            };
+        } catch (GeneralSecurityException | IOException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Decodes and returns a {@link DEREncodable} from the given {@code String}.
+     *
+     * <p> This method reads the {@code String} until PEM data is found
+     * or the end of the {@code String} is reached.  If no PEM data is found,
+     * an {@code IllegalArgumentException} is thrown.
+     *
+     * <p> This method returns a Java API cryptographic object,
+     * such as a {@code PrivateKey}, if the PEM type is supported.
+     * Any non-PEM data preceding the PEM header is ignored by the decoder.
+     * Otherwise, a {@link PEMRecord} will be returned containing
+     * the type identifier and Base64-encoded data.
+     * Any non-PEM data preceding the PEM header will be stored in
+     * {@code leadingData}.
+     *
+     * <p> Input consumed by this method is read in as
+     * {@link java.nio.charset.StandardCharsets#UTF_8 UTF-8}.
+     *
+     * @param str a String containing PEM data
+     * @return a {@code DEREncodable}
+     * @throws IllegalArgumentException on error in decoding or no PEM data
+     * found
+     * @throws NullPointerException when {@code str} is null
+     */
+    public DEREncodable decode(String str) {
+        Objects.requireNonNull(str);
+        DEREncodable de;
+        try {
+            return decode(new ByteArrayInputStream(
+                str.getBytes(StandardCharsets.UTF_8)));
+        } catch (IOException e) {
+            // With all data contained in the String, there are no IO ops.
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Decodes and returns a {@link DEREncodable} from the given
+     * {@code InputStream}.
+     *
+     * <p> This method reads from the {@code InputStream} until the end of
+     * the PEM footer or the end of the stream. If an I/O error occurs,
+     * the read position in the stream may become inconsistent.
+     * It is recommended to perform no further decoding operations
+     * on the {@code InputStream}.
+     *
+     * <p> This method returns a Java API cryptographic object,
+     * such as a {@code PrivateKey}, if the PEM type is supported.
+     * Any non-PEM data preceding the PEM header is ignored by the decoder.
+     * Otherwise, a {@link PEMRecord} will be returned containing
+     * the type identifier and Base64-encoded data.
+     * Any non-PEM data preceding the PEM header will be stored in
+     * {@code leadingData}.
+     *
+     * <p> If no PEM data is found, an {@code IllegalArgumentException} is
+     * thrown.
+     *
+     * @param is InputStream containing PEM data
+     * @return a {@code DEREncodable}
+     * @throws IOException on IO or PEM syntax error where the
+     * {@code InputStream} did not complete decoding.
+     * @throws EOFException at the end of the {@code InputStream}
+     * @throws IllegalArgumentException on error in decoding
+     * @throws NullPointerException when {@code is} is null
+     */
+    public DEREncodable decode(InputStream is) throws IOException {
+        Objects.requireNonNull(is);
+        PEMRecord pem = Pem.readPEM(is);
+        return decode(pem);
+    }
+
+    /**
+     * Decodes and returns a {@code DEREncodable} of the specified class from
+     * the given PEM string. {@code tClass} must extend {@link DEREncodable}
+     * and be an appropriate class for the PEM type.
+     *
+     * <p> This method reads the {@code String} until PEM data is found
+     * or the end of the {@code String} is reached.  If no PEM data is found,
+     * an {@code IllegalArgumentException} is thrown.
+     *
+     * <p> If the class parameter is {@code PEMRecord.class},
+     * a {@linkplain PEMRecord} is returned containing the
+     * type identifier and Base64 encoding. Any non-PEM data preceding
+     * the PEM header will be stored in {@code leadingData}.  Other
+     * class parameters will not return preceding non-PEM data.
+     *
+     * <p> Input consumed by this method is read in as
+     * {@link java.nio.charset.StandardCharsets#UTF_8 UTF-8}.
+     *
+     * @param <S> Class type parameter that extends {@code DEREncodable}
+     * @param str the String containing PEM data
+     * @param tClass the returned object class that implements
+     * {@code DEREncodable}
+     * @return a {@code DEREncodable} specified by {@code tClass}
+     * @throws IllegalArgumentException on error in decoding or no PEM data
+     * found
+     * @throws ClassCastException if {@code tClass} is invalid for the PEM type
+     * @throws NullPointerException when any input values are null
+     */
+    public <S extends DEREncodable> S decode(String str, Class<S> tClass) {
+        Objects.requireNonNull(str);
+        try {
+            return decode(new ByteArrayInputStream(
+                str.getBytes(StandardCharsets.UTF_8)), tClass);
+        } catch (IOException e) {
+            // With all data contained in the String, there are no IO ops.
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Decodes and returns the specified class for the given
+     * {@link InputStream}.  The class must extend {@link DEREncodable} and be
+     * an appropriate class for the PEM type.
+     *
+     * <p> This method reads from the {@code InputStream} until the end of
+     * the PEM footer or the end of the stream. If an I/O error occurs,
+     * the read position in the stream may become inconsistent.
+     * It is recommended to perform no further decoding operations
+     * on the {@code InputStream}.
+     *
+     * <p> If the class parameter is {@code PEMRecord.class},
+     * a {@linkplain PEMRecord} is returned containing the
+     * type identifier and Base64 encoding. Any non-PEM data preceding
+     * the PEM header will be stored in {@code leadingData}.  Other
+     * class parameters will not return preceding non-PEM data.
+     *
+     * <p> If no PEM data is found, an {@code IllegalArgumentException} is
+     * thrown.
+     *
+     * @param <S> Class type parameter that extends {@code DEREncodable}.
+     * @param is an InputStream containing PEM data
+     * @param tClass the returned object class that implements
+     *   {@code DEREncodable}.
+     * @return a {@code DEREncodable} typecast to {@code tClass}
+     * @throws IOException on IO or PEM syntax error where the
+     * {@code InputStream} did not complete decoding.
+     * @throws EOFException at the end of the {@code InputStream}
+     * @throws IllegalArgumentException on error in decoding
+     * @throws ClassCastException if {@code tClass} is invalid for the PEM type
+     * @throws NullPointerException when any input values are null
+     *
+     * @see #decode(InputStream)
+     * @see #decode(String, Class)
+     */
+    public <S extends DEREncodable> S decode(InputStream is, Class<S> tClass)
+        throws IOException {
+        Objects.requireNonNull(is);
+        Objects.requireNonNull(tClass);
+        PEMRecord pem = Pem.readPEM(is);
+
+        if (tClass.isAssignableFrom(PEMRecord.class)) {
+            return tClass.cast(pem);
+        }
+        DEREncodable so = decode(pem);
+
+        /*
+         * If the object is a KeyPair, check if the tClass is set to class
+         * specific to a private or public key.  Because PKCS8v2 can be a
+         * KeyPair, it is possible for someone to assume all their PEM private
+         * keys are only PrivateKey and not KeyPair.
+         */
+        if (so instanceof KeyPair kp) {
+            if ((PrivateKey.class).isAssignableFrom(tClass) ||
+                (PKCS8EncodedKeySpec.class).isAssignableFrom(tClass)) {
+                so = kp.getPrivate();
+            }
+            if ((PublicKey.class).isAssignableFrom(tClass) ||
+                (X509EncodedKeySpec.class).isAssignableFrom(tClass)) {
+                so = kp.getPublic();
+            }
+        }
+
+        /*
+         * KeySpec use getKeySpec after the Key has been generated.  Even though
+         * returning a binary encoding after the Base64 decoding is ok when the
+         * user wants PKCS8EncodedKeySpec, generating the key verifies the
+         * binary encoding and allows the KeyFactory to use the provider's
+         * KeySpec()
+         */
+
+        if ((EncodedKeySpec.class).isAssignableFrom(tClass) &&
+            so instanceof Key key) {
+            try {
+                // unchecked suppressed as we know tClass comes from KeySpec
+                // KeyType not relevant here.  We just want KeyFactory
+                if ((PKCS8EncodedKeySpec.class).isAssignableFrom(tClass)) {
+                    so = getKeyFactory(key.getAlgorithm()).
+                        getKeySpec(key, PKCS8EncodedKeySpec.class);
+                } else if ((X509EncodedKeySpec.class).isAssignableFrom(tClass)) {
+                    so = getKeyFactory(key.getAlgorithm())
+                        .getKeySpec(key, X509EncodedKeySpec.class);
+                } else {
+                    throw new IllegalArgumentException("Invalid KeySpec.");
+                }
+            } catch (InvalidKeySpecException e) {
+                throw new IllegalArgumentException("Invalid KeySpec " +
+                    "specified (" + tClass.getName() +") for key (" +
+                    key.getClass().getName() +")", e);
+            }
+        }
+
+        return tClass.cast(so);
+    }
+
+    private KeyFactory getKeyFactory(String algorithm) {
+        if (algorithm == null || algorithm.isEmpty()) {
+            throw new IllegalArgumentException("No algorithm found in " +
+                "the encoding");
+        }
+        try {
+            if (factory == null) {
+                return KeyFactory.getInstance(algorithm);
+            }
+            return KeyFactory.getInstance(algorithm, factory);
+        } catch (GeneralSecurityException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    // Convenience method to avoid provider getInstance checks clutter
+    private CertificateFactory getCertFactory(String algorithm) {
+        try {
+            if (factory == null) {
+                return CertificateFactory.getInstance(algorithm);
+            }
+            return CertificateFactory.getInstance(algorithm, factory);
+        } catch (GeneralSecurityException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Returns a copy of this {@code PEMDecoder} instance that uses
+     * {@link KeyFactory} and {@link CertificateFactory} implementations
+     * from the specified {@link Provider} to produce cryptographic objects.
+     * Any errors using the {@code Provider} will occur during decoding.
+     *
+     * <p>If {@code provider} is {@code null}, a new instance is returned with
+     * the default provider configuration.
+     *
+     * @param provider the factory provider
+     * @return a new PEMEncoder instance configured to the {@code Provider}.
+     * @throws NullPointerException if {@code provider} is null
+     */
+    public PEMDecoder withFactory(Provider provider) {
+        Objects.requireNonNull(provider);
+        return new PEMDecoder(provider, password);
+    }
+
+    /**
+     * Returns a copy of this {@code PEMDecoder} that decodes and decrypts
+     * encrypted private keys using the specified password.
+     * Non-encrypted PEM can still be decoded from this instance.
+     *
+     * @param password the password to decrypt encrypted PEM data.  This array
+     *                 is cloned and stored in the new instance.
+     * @return a new PEMEncoder instance configured for decryption
+     * @throws NullPointerException if {@code password} is null
+     */
+    public PEMDecoder withDecryption(char[] password) {
+        Objects.requireNonNull(password);
+        return new PEMDecoder(factory, new PBEKeySpec(password));
+    }
+}
diff --git a/src/java.base/share/classes/java/security/PEMEncoder.java b/src/java.base/share/classes/java/security/PEMEncoder.java
new file mode 100644
index 00000000000..d5465083330
--- /dev/null
+++ b/src/java.base/share/classes/java/security/PEMEncoder.java
@@ -0,0 +1,382 @@
+/*
+ * 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 java.security;
+
+import jdk.internal.javac.PreviewFeature;
+import sun.security.pkcs.PKCS8Key;
+import sun.security.util.DerOutputStream;
+import sun.security.util.DerValue;
+import sun.security.util.Pem;
+import sun.security.x509.AlgorithmId;
+
+import javax.crypto.*;
+import javax.crypto.spec.PBEKeySpec;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Objects;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * {@code PEMEncoder} implements an encoder for Privacy-Enhanced Mail (PEM)
+ * data.  PEM is a textual encoding used to store and transfer security
+ * objects, such as asymmetric keys, certificates, and certificate revocation
+ * lists (CRL).  It is defined in RFC 1421 and RFC 7468.  PEM consists of a
+ * Base64-formatted binary encoding enclosed by a type-identifying header
+ * and footer.
+ *
+ * <p> Encoding may be performed on Java API cryptographic objects that
+ * implement {@link DEREncodable}. The {@link #encode(DEREncodable)}
+ * and {@link #encodeToString(DEREncodable)} methods encode a DEREncodable
+ * into PEM and return the data in a byte array or String.
+ *
+ * <p> Private keys can be encrypted and encoded by configuring a
+ * {@code PEMEncoder} with the {@linkplain #withEncryption(char[])} method,
+ * which takes a password and returns a new {@code PEMEncoder} instance
+ * configured to encrypt the key with that password. Alternatively, a
+ * private key encrypted as an {@code EncryptedKeyInfo} object can be encoded
+ * directly to PEM by passing it to the {@code encode} or
+ * {@code encodeToString} methods.
+ *
+ * <p> PKCS #8 2.0 defines the ASN.1 OneAsymmetricKey structure, which may
+ * contain both private and public keys.
+ * {@link KeyPair} objects passed to the {@code encode} or
+ * {@code encodeToString} methods are encoded as a
+ * OneAsymmetricKey structure using the "PRIVATE KEY" type.
+ *
+ * <p> When encoding a {@link PEMRecord}, the API surrounds the
+ * {@linkplain PEMRecord#pem()} with the PEM header and footer
+ * from {@linkplain PEMRecord#type()}. {@linkplain PEMRecord#leadingData()} is
+ * not included in the encoding.  {@code PEMRecord} will not perform
+ * validity checks on the data.
+ *
+ * <p>The following lists the supported {@code DEREncodable} classes and
+ * the PEM types that each are encoded as:
+ *
+ * <ul>
+ *  <li>{@code X509Certificate} : CERTIFICATE</li>
+ *  <li>{@code X509CRL} : X509 CRL</li>
+ *  <li>{@code PublicKey}: PUBLIC KEY</li>
+ *  <li>{@code PrivateKey} : PRIVATE KEY</li>
+ *  <li>{@code PrivateKey} (if configured with encryption):
+ *  ENCRYPTED PRIVATE KEY</li>
+ *  <li>{@code EncryptedPrivateKeyInfo} : ENCRYPTED PRIVATE KEY</li>
+ *  <li>{@code KeyPair} : PRIVATE KEY</li>
+ *  <li>{@code X509EncodedKeySpec} : PUBLIC KEY</li>
+ *  <li>{@code PKCS8EncodedKeySpec} : PRIVATE KEY</li>
+ *  <li>{@code PEMRecord} : {@code PEMRecord.type()}</li>
+ *  </ul>
+ *
+ * <p> This class is immutable and thread-safe.
+ *
+ * <p> Here is an example of encoding a {@code PrivateKey} object:
+ * {@snippet lang = java:
+ *     PEMEncoder pe = PEMEncoder.of();
+ *     byte[] pemData = pe.encode(privKey);
+ * }
+ *
+ * <p> Here is an example that encrypts and encodes a private key using the
+ * specified password:
+ * {@snippet lang = java:
+ *     PEMEncoder pe = PEMEncoder.of().withEncryption(password);
+ *     byte[] pemData = pe.encode(privKey);
+ * }
+ *
+ * @implNote An implementation may support other PEM types and DEREncodables.
+ *
+ *
+ * @see PEMDecoder
+ * @see PEMRecord
+ * @see EncryptedPrivateKeyInfo
+ *
+ * @spec https://www.rfc-editor.org/info/rfc1421
+ *       RFC 1421: Privacy Enhancement for Internet Electronic Mail
+ * @spec https://www.rfc-editor.org/info/rfc7468
+ *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
+ *
+ * @since 25
+ */
+@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+public final class PEMEncoder {
+
+    // Singleton instance of PEMEncoder
+    private static final PEMEncoder PEM_ENCODER = new PEMEncoder(null);
+
+    // Stores the password for an encrypted encoder that isn't setup yet.
+    private PBEKeySpec keySpec;
+    // Stores the key after the encoder is ready to encrypt.  The prevents
+    // repeated SecretKeyFactory calls if the encoder is used on multiple keys.
+    private SecretKey key;
+    // Makes SecretKeyFactory generation thread-safe.
+    private final ReentrantLock lock;
+
+    /**
+     * Instantiate a {@code PEMEncoder} for Encrypted Private Keys.
+     *
+     * @param pbe contains the password spec used for encryption.
+     */
+    private PEMEncoder(PBEKeySpec pbe) {
+        keySpec = pbe;
+        key = null;
+        lock = new ReentrantLock();
+    }
+
+    /**
+     * Returns an instance of {@code PEMEncoder}.
+     *
+     * @return a {@code PEMEncoder}
+     */
+    public static PEMEncoder of() {
+        return PEM_ENCODER;
+    }
+
+    /**
+     * Encodes the specified {@code DEREncodable} and returns a PEM encoded
+     * string.
+     *
+     * @param de the {@code DEREncodable} to be encoded
+     * @return a {@code String} containing the PEM encoded data
+     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be
+     * encoded
+     * @throws NullPointerException if {@code de} is {@code null}
+     * @see #withEncryption(char[])
+     */
+    public String encodeToString(DEREncodable de) {
+        Objects.requireNonNull(de);
+        return switch (de) {
+            case PublicKey pu -> buildKey(null, pu.getEncoded());
+            case PrivateKey pr -> buildKey(pr.getEncoded(), null);
+            case KeyPair kp -> {
+                if (kp.getPublic() == null) {
+                    throw new IllegalArgumentException("KeyPair does not " +
+                        "contain PublicKey.");
+                }
+                if (kp.getPrivate() == null) {
+                    throw new IllegalArgumentException("KeyPair does not " +
+                        "contain PrivateKey.");
+                }
+                yield buildKey(kp.getPrivate().getEncoded(),
+                    kp.getPublic().getEncoded());
+            }
+            case X509EncodedKeySpec x ->
+                buildKey(null, x.getEncoded());
+            case PKCS8EncodedKeySpec p ->
+                buildKey(p.getEncoded(), null);
+            case EncryptedPrivateKeyInfo epki -> {
+                try {
+                    yield Pem.pemEncoded(Pem.ENCRYPTED_PRIVATE_KEY,
+                        epki.getEncoded());
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+            case X509Certificate c -> {
+                try {
+                    if (isEncrypted()) {
+                        throw new IllegalArgumentException("Certificates " +
+                            "cannot be encrypted");
+                    }
+                    yield Pem.pemEncoded(Pem.CERTIFICATE, c.getEncoded());
+                } catch (CertificateEncodingException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+            case X509CRL crl -> {
+                try {
+                    if (isEncrypted()) {
+                        throw new IllegalArgumentException("CRLs cannot be " +
+                            "encrypted");
+                    }
+                    yield Pem.pemEncoded(Pem.X509_CRL, crl.getEncoded());
+                } catch (CRLException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+            case PEMRecord rec -> {
+                if (isEncrypted()) {
+                    throw new IllegalArgumentException("PEMRecord cannot be " +
+                        "encrypted");
+                }
+                yield Pem.pemEncoded(rec);
+            }
+
+            default -> throw new IllegalArgumentException("PEM does not " +
+                "support " + de.getClass().getCanonicalName());
+        };
+    }
+
+    /**
+     * Encodes the specified {@code DEREncodable} and returns the PEM encoding
+     * in a byte array.
+     *
+     * @param de the {@code DEREncodable} to be encoded
+     * @return a PEM encoded byte array
+     * @throws IllegalArgumentException if the {@code DEREncodable} cannot be
+     * encoded
+     * @throws NullPointerException if {@code de} is {@code null}
+     * @see #withEncryption(char[])
+     */
+    public byte[] encode(DEREncodable de) {
+        return encodeToString(de).getBytes(StandardCharsets.ISO_8859_1);
+    }
+
+    /**
+     * Returns a new {@code PEMEncoder} instance configured for encryption
+     * with the default algorithm and a given password.
+     *
+     * <p> Only {@link PrivateKey} objects can be encrypted with this newly
+     * configured instance.  Encoding other {@link DEREncodable} objects will
+     * throw an {@code IllegalArgumentException}.
+     *
+     * @implNote
+     * The default password-based encryption algorithm is defined
+     * by the {@code jdk.epkcs8.defaultAlgorithm} security property and
+     * uses the default encryption parameters of the provider that is selected.
+     * For greater flexibility with encryption options and parameters, use
+     * {@link EncryptedPrivateKeyInfo#encryptKey(PrivateKey, Key,
+     * String, AlgorithmParameterSpec, Provider, SecureRandom)} and use the
+     * returned object with {@link #encode(DEREncodable)}.
+     *
+     * @param password the encryption password.  The array is cloned and
+     *                stored in the new instance.
+     * @return a new {@code PEMEncoder} instance configured for encryption
+     * @throws NullPointerException when password is {@code null}
+     */
+    public PEMEncoder withEncryption(char[] password) {
+        // PBEKeySpec clones the password
+        Objects.requireNonNull(password, "password cannot be null.");
+        return new PEMEncoder(new PBEKeySpec(password));
+    }
+
+    /**
+     * Build PEM encoding.
+     */
+    private String buildKey(byte[] privateBytes, byte[] publicBytes) {
+        DerOutputStream out = new DerOutputStream();
+        Cipher cipher;
+
+        if (privateBytes == null && publicBytes == null) {
+            throw new IllegalArgumentException("No encoded data given by the " +
+                "DEREncodable.");
+        }
+
+        // If `keySpec` is non-null, then `key` hasn't been established.
+        // Setting a `key' prevents repeated key generations operations.
+        // withEncryption() is a configuration method and cannot throw an
+        // exception; therefore generation is delayed.
+        if (keySpec != null) {
+            // For thread safety
+            lock.lock();
+            if (key == null) {
+                try {
+                    key = SecretKeyFactory.getInstance(Pem.DEFAULT_ALGO).
+                        generateSecret(keySpec);
+                    keySpec.clearPassword();
+                    keySpec = null;
+                } catch (GeneralSecurityException e) {
+                    throw new IllegalArgumentException("Security property " +
+                        "\"jdk.epkcs8.defaultAlgorithm\" may not specify a " +
+                        "valid algorithm.  Operation cannot be performed.", e);
+                } finally {
+                    lock.unlock();
+                }
+            } else {
+                lock.unlock();
+            }
+        }
+
+        // If `key` is non-null, this is an encoder ready to encrypt.
+        if (key != null) {
+            if (privateBytes == null || publicBytes != null) {
+                throw new IllegalArgumentException("Can only encrypt a " +
+                    "PrivateKey.");
+            }
+
+            try {
+                cipher = Cipher.getInstance(Pem.DEFAULT_ALGO);
+                cipher.init(Cipher.ENCRYPT_MODE, key);
+            } catch (GeneralSecurityException e) {
+                throw new IllegalArgumentException("Security property " +
+                    "\"jdk.epkcs8.defaultAlgorithm\" may not specify a " +
+                    "valid algorithm.  Operation cannot be performed.", e);
+            }
+
+            try {
+                new AlgorithmId(Pem.getPBEID(Pem.DEFAULT_ALGO),
+                    cipher.getParameters()).encode(out);
+                out.putOctetString(cipher.doFinal(privateBytes));
+                return Pem.pemEncoded(Pem.ENCRYPTED_PRIVATE_KEY,
+                    DerValue.wrap(DerValue.tag_Sequence, out).toByteArray());
+            } catch (GeneralSecurityException e) {
+                throw new IllegalArgumentException(e);
+            }
+        }
+
+        // X509 only
+        if (publicBytes != null && privateBytes == null) {
+            if (publicBytes.length == 0) {
+                throw new IllegalArgumentException("No public key encoding " +
+                    "given by the DEREncodable.");
+            }
+
+            return Pem.pemEncoded(Pem.PUBLIC_KEY, publicBytes);
+        }
+
+        // PKCS8 only
+        if (publicBytes == null && privateBytes != null) {
+            if (privateBytes.length == 0) {
+                throw new IllegalArgumentException("No private key encoding " +
+                    "given by the DEREncodable.");
+            }
+
+            return Pem.pemEncoded(Pem.PRIVATE_KEY, privateBytes);
+        }
+
+        // OneAsymmetricKey
+        if (privateBytes.length == 0) {
+            throw new IllegalArgumentException("No private key encoding " +
+                "given by the DEREncodable.");
+        }
+
+        if (publicBytes.length == 0) {
+            throw new IllegalArgumentException("No public key encoding " +
+                "given by the DEREncodable.");
+        }
+        try {
+            return Pem.pemEncoded(Pem.PRIVATE_KEY,
+                PKCS8Key.getEncoded(publicBytes, privateBytes));
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private boolean isEncrypted() {
+        return (key != null || keySpec != null);
+    }
+}
diff --git a/src/java.base/share/classes/java/security/PEMRecord.java b/src/java.base/share/classes/java/security/PEMRecord.java
new file mode 100644
index 00000000000..dfe951a0963
--- /dev/null
+++ b/src/java.base/share/classes/java/security/PEMRecord.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.security;
+
+import jdk.internal.javac.PreviewFeature;
+
+import sun.security.util.Pem;
+
+import java.util.Base64;
+import java.util.Objects;
+
+/**
+ * {@code PEMRecord} is a {@link DEREncodable} that represents Privacy-Enhanced
+ * Mail (PEM) data by its type and Base64 form.  {@link PEMDecoder} and
+ * {@link PEMEncoder} use {@code PEMRecord} when representing the data as a
+ * cryptographic object is not desired or the type has no
+ * {@code DEREncodable}.
+ *
+ * <p> {@code type} and {@code pem} may not be {@code null}.
+ * {@code leadingData} may be null if no non-PEM data preceded PEM header
+ * during decoding.  {@code leadingData} may be useful for reading metadata
+ * that accompanies PEM data.
+ *
+ * <p> No validation is performed during instantiation to ensure that
+ * {@code type} conforms to {@code RFC 7468}, that {@code pem} is valid Base64,
+ * or that {@code pem} matches the {@code type}.  {@code leadingData} is not
+ * defensively copied and does not return a clone when
+ * {@linkplain #leadingData()} is called.
+ *
+ * @param type the type identifier in the PEM header without PEM syntax labels.
+ *           For a public key, {@code type} would be "PUBLIC KEY".
+ * @param pem any data between the PEM header and footer.
+ * @param leadingData any non-PEM data preceding the PEM header when decoding.
+ *
+ * @spec https://www.rfc-editor.org/info/rfc7468
+ *       RFC 7468: Textual Encodings of PKIX, PKCS, and CMS Structures
+ *
+ * @see PEMDecoder
+ * @see PEMEncoder
+ *
+ * @since 25
+ */
+@PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+public record PEMRecord(String type, String pem, byte[] leadingData)
+    implements DEREncodable {
+
+    /**
+     * Creates a {@code PEMRecord} instance with the given parameters.
+     *
+     * @param type the type identifier
+     * @param pem the Base64-encoded data encapsulated by the PEM header and
+     *           footer.
+     * @param leadingData any non-PEM data read during the decoding process
+     *                    before the PEM header.  This value maybe {@code null}.
+     * @throws IllegalArgumentException if the {@code type} is incorrectly
+     * formatted.
+     * @throws NullPointerException if {@code type} and/or {@code pem} are
+     * {@code null}.
+     */
+    public PEMRecord(String type, String pem, byte[] leadingData) {
+        Objects.requireNonNull(type, "\"type\" cannot be null.");
+        Objects.requireNonNull(pem, "\"pem\" cannot be null.");
+
+        // With no validity checking on `type`, the constructor accept anything
+        // including lowercase.  The onus is on the caller.
+        if (type.startsWith("-") || type.startsWith("BEGIN ") ||
+            type.startsWith("END ")) {
+            throw new IllegalArgumentException("PEM syntax labels found.  " +
+                "Only the PEM type identifier is allowed");
+        }
+
+        this.type = type;
+        this.pem = pem;
+        this.leadingData = leadingData;
+    }
+
+    /**
+     * Creates a {@code PEMRecord} instance with a given {@code type} and
+     * {@code pem} data in String form.  {@code leadingData} is set to null.
+     *
+     * @param type the PEM type identifier
+     * @param pem the Base64-encoded data encapsulated by the PEM header and
+     *           footer.
+     * @throws IllegalArgumentException if the {@code type} is incorrectly
+     * formatted.
+     * @throws NullPointerException if {@code type} and/or {@code pem} are
+     * {@code null}.
+     */
+    public PEMRecord(String type, String pem) {
+        this(type, pem, null);
+    }
+
+    /**
+     * Returns the binary encoding from the Base64 data contained in
+     * {@code pem}.
+     *
+     * @throws IllegalArgumentException if {@code pem} cannot be decoded.
+     * @return a new array of the binary encoding each time this
+     * method is called.
+     */
+    public byte[] getEncoded() {
+        return Base64.getMimeDecoder().decode(pem);
+    }
+
+    /**
+     * Returns the type and Base64 encoding in PEM format.  {@code leadingData}
+     * is not returned by this method.
+     */
+    @Override
+    public String toString() {
+        return Pem.pemEncoded(this);
+    }
+}
diff --git a/src/java.base/share/classes/java/security/cert/X509CRL.java b/src/java.base/share/classes/java/security/cert/X509CRL.java
index 111de1daf0e..d19618f81ed 100644
--- a/src/java.base/share/classes/java/security/cert/X509CRL.java
+++ b/src/java.base/share/classes/java/security/cert/X509CRL.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
@@ -107,7 +107,7 @@
  * @see X509Extension
  */
 
-public abstract class X509CRL extends CRL implements X509Extension {
+public abstract non-sealed class X509CRL extends CRL implements X509Extension, DEREncodable {
 
     private transient X500Principal issuerPrincipal;
 
diff --git a/src/java.base/share/classes/java/security/cert/X509Certificate.java b/src/java.base/share/classes/java/security/cert/X509Certificate.java
index 4e579a75b1c..fe4a472dead 100644
--- a/src/java.base/share/classes/java/security/cert/X509Certificate.java
+++ b/src/java.base/share/classes/java/security/cert/X509Certificate.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
@@ -107,8 +107,8 @@
  * @see X509Extension
  */
 
-public abstract class X509Certificate extends Certificate
-implements X509Extension {
+public abstract non-sealed class X509Certificate extends Certificate
+    implements X509Extension, DEREncodable {
 
     @java.io.Serial
     private static final long serialVersionUID = -2491127588187038216L;
diff --git a/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java b/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
index af7f135d7c4..917b15e06b6 100644
--- a/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
+++ b/src/java.base/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
@@ -25,25 +25,35 @@
 
 package java.security.spec;
 
+import java.security.DEREncodable;
+
 /**
  * This class represents the ASN.1 encoding of a private key,
- * encoded according to the ASN.1 type {@code PrivateKeyInfo}.
- * The {@code PrivateKeyInfo} syntax is defined in the PKCS#8 standard
+ * encoded according to the ASN.1 type {@code OneAsymmetricKey}.
+ * The {@code OneAsymmetricKey} syntax is defined in the PKCS#8 standard
  * as follows:
  *
  * <pre>
- * PrivateKeyInfo ::= SEQUENCE {
+ * OneAsymmetricKey ::= SEQUENCE {
  *   version Version,
  *   privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
  *   privateKey PrivateKey,
- *   attributes [0] IMPLICIT Attributes OPTIONAL }
+ *   attributes       [0] Attributes OPTIONAL,
+ *   ...,
+ *   [[2: publicKey  [1] PublicKey OPTIONAL ]],
+ *   ...
+ * }
+ *
+ * PrivateKeyInfo ::= OneAsymmetricKey
  *
- * Version ::= INTEGER
+ * Version ::= INTEGER { v1(0), v2(1) }
  *
  * PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
  *
  * PrivateKey ::= OCTET STRING
  *
+ * PublicKey ::= BIT STRING
+ *
  * Attributes ::= SET OF Attribute
  * </pre>
  *
@@ -56,11 +66,14 @@
  * @see EncodedKeySpec
  * @see X509EncodedKeySpec
  *
+ * @spec https://www.rfc-editor.org/info/rfc5958
+ *     RFC 5958: Asymmetric Key Packages
+ *
  * @since 1.2
  */
 
-public class PKCS8EncodedKeySpec extends EncodedKeySpec {
-
+public non-sealed class PKCS8EncodedKeySpec extends EncodedKeySpec implements
+    DEREncodable {
     /**
      * Creates a new {@code PKCS8EncodedKeySpec} with the given encoded key.
      *
diff --git a/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java b/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java
index a405104cd07..e8b6e599676 100644
--- a/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java
+++ b/src/java.base/share/classes/java/security/spec/X509EncodedKeySpec.java
@@ -25,6 +25,8 @@
 
 package java.security.spec;
 
+import java.security.DEREncodable;
+
 /**
  * This class represents the ASN.1 encoding of a public key,
  * encoded according to the ASN.1 type {@code SubjectPublicKeyInfo}.
@@ -49,8 +51,8 @@
  * @since 1.2
  */
 
-public class X509EncodedKeySpec extends EncodedKeySpec {
-
+public non-sealed class X509EncodedKeySpec extends EncodedKeySpec implements
+    DEREncodable {
     /**
      * Creates a new {@code X509EncodedKeySpec} with the given encoded key.
      *
diff --git a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
index 1e4e769a83e..90316d7437e 100644
--- a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.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
@@ -25,13 +25,18 @@
 
 package javax.crypto;
 
-import java.io.*;
+import jdk.internal.javac.PreviewFeature;
+
+import sun.security.jca.JCAUtil;
+import sun.security.pkcs.PKCS8Key;
+import sun.security.util.*;
+import sun.security.x509.AlgorithmId;
+
+import javax.crypto.spec.PBEKeySpec;
+import java.io.IOException;
 import java.security.*;
 import java.security.spec.*;
-import sun.security.x509.AlgorithmId;
-import sun.security.util.DerValue;
-import sun.security.util.DerInputStream;
-import sun.security.util.DerOutputStream;
+import java.util.Objects;
 
 /**
  * This class implements the {@code EncryptedPrivateKeyInfo} type
@@ -55,14 +60,14 @@
  * @since 1.4
  */
 
-public class EncryptedPrivateKeyInfo {
+public non-sealed class EncryptedPrivateKeyInfo implements DEREncodable {
 
     // The "encryptionAlgorithm" is stored in either the algid or
     // the params field. Precisely, if this object is created by
     // {@link #EncryptedPrivateKeyInfo(AlgorithmParameters, byte[])}
     // with an uninitialized AlgorithmParameters, the AlgorithmParameters
     // object is stored in the params field and algid is set to null.
-    // In all other cases, algid is non null and params is null.
+    // In all other cases, algid is non-null and params is null.
     private final AlgorithmId algid;
     private final AlgorithmParameters params;
 
@@ -73,19 +78,15 @@ public class EncryptedPrivateKeyInfo {
     private final byte[] encoded;
 
     /**
-     * Constructs (i.e., parses) an {@code EncryptedPrivateKeyInfo} from
-     * its ASN.1 encoding.
+     * Constructs an {@code EncryptedPrivateKeyInfo} from a given encrypted
+     * PKCS#8 ASN.1 encoding.
      * @param encoded the ASN.1 encoding of this object. The contents of
      * the array are copied to protect against subsequent modification.
-     * @exception NullPointerException if the {@code encoded} is
-     * {@code null}.
-     * @exception IOException if error occurs when parsing the ASN.1 encoding.
+     * @throws NullPointerException if {@code encoded} is {@code null}.
+     * @throws IOException if error occurs when parsing the ASN.1 encoding.
      */
     public EncryptedPrivateKeyInfo(byte[] encoded) throws IOException {
-        if (encoded == null) {
-            throw new NullPointerException("the encoded parameter " +
-                "must be non-null");
-        }
+        Objects.requireNonNull(encoded);
 
         this.encoded = encoded.clone();
         DerValue val = DerValue.wrap(this.encoded);
@@ -201,7 +202,7 @@ public EncryptedPrivateKeyInfo(AlgorithmParameters algParams,
             tmp = null;
         }
 
-        // one and only one is non null
+        // one and only one is non-null
         this.algid = tmp;
         this.params = this.algid != null ? null : algParams;
 
@@ -219,6 +220,17 @@ public EncryptedPrivateKeyInfo(AlgorithmParameters algParams,
         this.encoded = null;
     }
 
+    /**
+     * Create an EncryptedPrivateKeyInfo object from the given components
+     */
+    private EncryptedPrivateKeyInfo(byte[] encoded, byte[] eData,
+        AlgorithmId id, AlgorithmParameters p) {
+        this.encoded = encoded;
+        encryptedData = eData;
+        algid = id;
+        params = p;
+    }
+
     /**
      * Returns the encryption algorithm.
      * <p>Note: Standard name is returned instead of the specified one
@@ -308,6 +320,242 @@ private PKCS8EncodedKeySpec getKeySpecImpl(Key decryptKey,
         }
     }
 
+    /**
+     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from a given
+     * {@code PrivateKey}.  A valid password-based encryption (PBE) algorithm
+     * and password must be specified.
+     *
+     * <p> The PBE algorithm string format details can be found in the
+     * <a href="http://github.com/specs/security/standard-names.html#cipher-algorithms">
+     * Cipher section</a> of the Java Security Standard Algorithm Names
+     * Specification.
+     *
+     * @param key the {@code PrivateKey} to be encrypted
+     * @param password the password used in the PBE encryption.  This array
+     *                 will be cloned before being used.
+     * @param algorithm the PBE encryption algorithm.  The default algorithm
+     *                  will be used if {@code null}.  However, {@code null} is
+     *                  not allowed when {@code params} is non-null.
+     * @param params the {@code AlgorithmParameterSpec} to be used with
+     *               encryption.  The provider default will be used if
+     *               {@code null}.
+     * @param provider the {@code Provider} will be used for PBE
+     *                 {@link SecretKeyFactory} generation and {@link Cipher}
+     *                 encryption operations. The default provider list will be
+     *                 used if {@code null}.
+     * @return an {@code EncryptedPrivateKeyInfo}
+     * @throws IllegalArgumentException on initialization errors based on the
+     * arguments passed to the method
+     * @throws RuntimeException on an encryption error
+     * @throws NullPointerException if the key or password are {@code null}. If
+     * {@code params} is non-null when {@code algorithm} is {@code null}.
+     *
+     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
+     * defines the default encryption algorithm and the
+     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key,
+        char[] password, String algorithm, AlgorithmParameterSpec params,
+        Provider provider) {
+
+        SecretKey skey;
+        Objects.requireNonNull(key, "key cannot be null");
+        Objects.requireNonNull(password, "password cannot be null.");
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+        if (algorithm == null) {
+            if (params != null) {
+                throw new NullPointerException("algorithm must be specified" +
+                    " if params is non-null.");
+            }
+            algorithm = Pem.DEFAULT_ALGO;
+        }
+
+        try {
+            SecretKeyFactory factory;
+            if (provider == null) {
+                factory = SecretKeyFactory.getInstance(algorithm);
+            } else {
+                factory = SecretKeyFactory.getInstance(algorithm, provider);
+            }
+            skey = factory.generateSecret(keySpec);
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+            throw new IllegalArgumentException(e);
+        }
+        return encryptKeyImpl(key, algorithm, skey, params, provider, null);
+    }
+
+    /**
+     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from a given
+     * {@code PrivateKey} and password.  Default algorithm and parameters are
+     * used.
+     *
+     * @param key the {@code PrivateKey} to be encrypted
+     * @param password the password used in the PBE encryption.  This array
+     *                 will be cloned before being used.
+     * @return an {@code EncryptedPrivateKeyInfo}
+     * @throws IllegalArgumentException on initialization errors based on the
+     * arguments passed to the method
+     * @throws RuntimeException on an encryption error
+     * @throws NullPointerException when the {@code key} or {@code password}
+     * is {@code null}
+     *
+     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
+     * defines the default encryption algorithm and the
+     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key,
+        char[] password) {
+        return encryptKey(key, password, Pem.DEFAULT_ALGO, null, null);
+    }
+
+    /**
+     * Creates and encrypts an {@code EncryptedPrivateKeyInfo} from the given
+     * {@link PrivateKey} using the {@code encKey} and given parameters.
+     *
+     * @param key the {@code PrivateKey} to be encrypted
+     * @param encKey the password-based encryption (PBE) {@code Key} used to
+     *              encrypt {@code key}.
+     * @param algorithm the PBE encryption algorithm.  The default algorithm is
+     *                 will be used if {@code null}; however, {@code null} is
+     *                 not allowed when {@code params} is non-null.
+     * @param params the {@code AlgorithmParameterSpec} to be used with
+     *               encryption. The provider list default will be used if
+     *               {@code null}.
+     * @param random the {@code SecureRandom} instance used during
+     *               encryption.  The default will be used if {@code null}.
+     * @param provider the {@code Provider} is used for {@link Cipher}
+     *                encryption operation.  The default provider list will be
+     *                used if {@code null}.
+     * @return an {@code EncryptedPrivateKeyInfo}
+     * @throws IllegalArgumentException on initialization errors based on the
+     * arguments passed to the method
+     * @throws RuntimeException on an encryption error
+     * @throws NullPointerException if the {@code key} or {@code encKey} are
+     * {@code null}. If {@code params} is non-null, {@code algorithm} cannot be
+     * {@code null}.
+     *
+     * @implNote The {@code jdk.epkcs8.defaultAlgorithm} Security Property
+     * defines the default encryption algorithm and the
+     * {@code AlgorithmParameterSpec} are the provider's algorithm defaults.
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public static EncryptedPrivateKeyInfo encryptKey(PrivateKey key, Key encKey,
+        String algorithm, AlgorithmParameterSpec params, Provider provider,
+        SecureRandom random) {
+
+        Objects.requireNonNull(key);
+        Objects.requireNonNull(encKey);
+        if (algorithm == null) {
+            if (params != null) {
+                throw new NullPointerException("algorithm must be specified " +
+                    "if params is non-null.");
+            }
+            algorithm = Pem.DEFAULT_ALGO;
+        }
+        return encryptKeyImpl(key, algorithm, encKey, params, provider, random);
+    }
+
+    private static EncryptedPrivateKeyInfo encryptKeyImpl(PrivateKey key,
+        String algorithm, Key encryptKey, AlgorithmParameterSpec params,
+        Provider provider, SecureRandom random) {
+        AlgorithmId algId;
+        byte[] encryptedData;
+        Cipher c;
+        DerOutputStream out;
+
+        if (random == null) {
+            random = JCAUtil.getDefSecureRandom();
+        }
+        try {
+            if (provider == null) {
+                c = Cipher.getInstance(algorithm);
+            } else {
+                c = Cipher.getInstance(algorithm, provider);
+            }
+            c.init(Cipher.ENCRYPT_MODE, encryptKey, params, random);
+            encryptedData = c.doFinal(key.getEncoded());
+            algId = new AlgorithmId(Pem.getPBEID(algorithm), c.getParameters());
+            out = new DerOutputStream();
+            algId.encode(out);
+            out.putOctetString(encryptedData);
+        } catch (InvalidAlgorithmParameterException | NoSuchAlgorithmException |
+                 NoSuchPaddingException e) {
+            throw new IllegalArgumentException(e);
+        } catch (IllegalBlockSizeException | BadPaddingException |
+                 InvalidKeyException e) {
+            throw new RuntimeException(e);
+        }
+        return new EncryptedPrivateKeyInfo(
+            DerValue.wrap(DerValue.tag_Sequence, out).toByteArray(),
+            encryptedData, algId, c.getParameters());
+    }
+
+    /**
+     * Extract the enclosed {@code PrivateKey} object from the encrypted data
+     * and return it.
+     *
+     * @param password the password used in the PBE encryption.  This array
+     *                 will be cloned before being used.
+     * @return a {@code PrivateKey}
+     * @throws GeneralSecurityException if an error occurs parsing or
+     * decrypting the encrypted data, or producing the key object.
+     * @throws NullPointerException if {@code password} is null
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public PrivateKey getKey(char[] password) throws GeneralSecurityException {
+        SecretKeyFactory skf;
+        PKCS8EncodedKeySpec p8KeySpec;
+        Objects.requireNonNull(password, "password cannot be null");
+        PBEKeySpec keySpec = new PBEKeySpec(password);
+        skf = SecretKeyFactory.getInstance(getAlgName());
+        p8KeySpec = getKeySpec(skf.generateSecret(keySpec));
+
+        return PKCS8Key.parseKey(p8KeySpec.getEncoded());
+    }
+
+    /**
+     * Extract the enclosed {@code PrivateKey} object from the encrypted data
+     * and return it.
+     *
+     * @param decryptKey the decryption key and cannot be {@code null}
+     * @param provider the {@code Provider} used for Cipher decryption and
+     *                 {@code PrivateKey} generation. A {@code null} value will
+     *                 use the default provider configuration.
+     * @return a {@code PrivateKey}
+     * @throws GeneralSecurityException if an error occurs parsing or
+     * decrypting the encrypted data, or producing the key object.
+     * @throws NullPointerException if {@code decryptKey} is null
+     *
+     * @since 25
+     */
+    @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
+    public PrivateKey getKey(Key decryptKey, Provider provider)
+        throws GeneralSecurityException {
+        Objects.requireNonNull(decryptKey,"decryptKey cannot be null.");
+        PKCS8EncodedKeySpec p = getKeySpecImpl(decryptKey, provider);
+        try {
+            if (provider == null) {
+                return KeyFactory.getInstance(
+                    KeyUtil.getAlgorithm(p.getEncoded())).
+                    generatePrivate(p);
+            }
+            return KeyFactory.getInstance(KeyUtil.getAlgorithm(p.getEncoded()),
+                provider).generatePrivate(p);
+        } catch (IOException e) {
+            throw new GeneralSecurityException(e);
+        }
+    }
+
     /**
      * Extract the enclosed PKCS8EncodedKeySpec object from the
      * encrypted data and return it.
@@ -353,12 +601,8 @@ public PKCS8EncodedKeySpec getKeySpec(Key decryptKey)
     public PKCS8EncodedKeySpec getKeySpec(Key decryptKey,
         String providerName) throws NoSuchProviderException,
         NoSuchAlgorithmException, InvalidKeyException {
-        if (decryptKey == null) {
-            throw new NullPointerException("decryptKey is null");
-        }
-        if (providerName == null) {
-            throw new NullPointerException("provider is null");
-        }
+        Objects.requireNonNull(decryptKey, "decryptKey is null");
+        Objects.requireNonNull(providerName, "provider is null");
         Provider provider = Security.getProvider(providerName);
         if (provider == null) {
             throw new NoSuchProviderException("provider " +
@@ -387,12 +631,8 @@ public PKCS8EncodedKeySpec getKeySpec(Key decryptKey,
     public PKCS8EncodedKeySpec getKeySpec(Key decryptKey,
         Provider provider) throws NoSuchAlgorithmException,
         InvalidKeyException {
-        if (decryptKey == null) {
-            throw new NullPointerException("decryptKey is null");
-        }
-        if (provider == null) {
-            throw new NullPointerException("provider is null");
-        }
+        Objects.requireNonNull(decryptKey, "decryptKey is null");
+        Objects.requireNonNull(provider, "provider is null");
         return getKeySpecImpl(decryptKey, provider);
     }
 
@@ -438,23 +678,9 @@ private static void checkTag(DerValue val, byte tag, String valName)
         }
     }
 
-    @SuppressWarnings("fallthrough")
     private static PKCS8EncodedKeySpec pkcs8EncodingToSpec(byte[] encodedKey)
         throws IOException {
-        DerInputStream in = new DerInputStream(encodedKey);
-        DerValue[] values = in.getSequence(3);
-
-        switch (values.length) {
-        case 4:
-            checkTag(values[3], DerValue.TAG_CONTEXT, "attributes");
-            /* fall through */
-        case 3:
-            checkTag(values[0], DerValue.tag_Integer, "version");
-            String keyAlg = AlgorithmId.parse(values[1]).getName();
-            checkTag(values[2], DerValue.tag_OctetString, "privateKey");
-            return new PKCS8EncodedKeySpec(encodedKey, keyAlg);
-        default:
-            throw new IOException("invalid key encoding");
-        }
+            return new PKCS8EncodedKeySpec(encodedKey,
+                KeyUtil.getAlgorithm(encodedKey));
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
index 1f28864b4db..e6c994a12b1 100644
--- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
+++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java
@@ -78,6 +78,8 @@ public enum Feature {
         KEY_DERIVATION, //remove when the boot JDK is JDK 25
         @JEP(number = 502, title = "Stable Values", status = "Preview")
         STABLE_VALUES,
+        @JEP(number=470, title="PEM Encodings of Cryptographic Objects", status="Preview")
+        PEM_API,
         LANGUAGE_MODEL,
         /**
          * A key for testing.
diff --git a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
index 85d4d0bf263..cd84fd4dec3 100644
--- a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.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
@@ -25,6 +25,8 @@
 
 package sun.security.ec;
 
+import sun.security.pkcs.PKCS8Key;
+
 import java.security.*;
 import java.security.interfaces.*;
 import java.security.spec.*;
@@ -84,8 +86,7 @@ public ECKeyFactory() {
      * To be used by future Java ECDSA and ECDH implementations.
      */
     public static ECKey toECKey(Key key) throws InvalidKeyException {
-        if (key instanceof ECKey) {
-            ECKey ecKey = (ECKey)key;
+        if (key instanceof ECKey ecKey) {
             checkKey(ecKey);
             return ecKey;
         } else {
@@ -147,7 +148,7 @@ protected Key engineTranslateKey(Key key) throws InvalidKeyException {
 
     // see JCA doc
     protected PublicKey engineGeneratePublic(KeySpec keySpec)
-            throws InvalidKeySpecException {
+        throws InvalidKeySpecException {
         try {
             return implGeneratePublic(keySpec);
         } catch (InvalidKeySpecException e) {
@@ -159,7 +160,7 @@ protected PublicKey engineGeneratePublic(KeySpec keySpec)
 
     // see JCA doc
     protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
-            throws InvalidKeySpecException {
+        throws InvalidKeySpecException {
         try {
             return implGeneratePrivate(keySpec);
         } catch (InvalidKeySpecException e) {
@@ -171,19 +172,13 @@ protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
 
     // internal implementation of translateKey() for public keys. See JCA doc
     private PublicKey implTranslatePublicKey(PublicKey key)
-            throws InvalidKeyException {
-        if (key instanceof ECPublicKey) {
-            if (key instanceof ECPublicKeyImpl) {
-                return key;
-            }
-            ECPublicKey ecKey = (ECPublicKey)key;
-            return new ECPublicKeyImpl(
-                ecKey.getW(),
-                ecKey.getParams()
-            );
+        throws InvalidKeyException {
+        if (key instanceof ECPublicKeyImpl) {
+            return key;
+        } else if (key instanceof ECPublicKey ecKey) {
+            return new ECPublicKeyImpl(ecKey.getW(), ecKey.getParams());
         } else if ("X.509".equals(key.getFormat())) {
-            byte[] encoded = key.getEncoded();
-            return new ECPublicKeyImpl(encoded);
+            return new ECPublicKeyImpl(key.getEncoded());
         } else {
             throw new InvalidKeyException("Public keys must be instance "
                 + "of ECPublicKey or have X.509 encoding");
@@ -192,16 +187,11 @@ private PublicKey implTranslatePublicKey(PublicKey key)
 
     // internal implementation of translateKey() for private keys. See JCA doc
     private PrivateKey implTranslatePrivateKey(PrivateKey key)
-            throws InvalidKeyException {
-        if (key instanceof ECPrivateKey) {
-            if (key instanceof ECPrivateKeyImpl) {
-                return key;
-            }
-            ECPrivateKey ecKey = (ECPrivateKey)key;
-            return new ECPrivateKeyImpl(
-                ecKey.getS(),
-                ecKey.getParams()
-            );
+        throws InvalidKeyException {
+        if (key instanceof ECPrivateKeyImpl) {
+            return key;
+        } else if (key instanceof ECPrivateKey ecKey) {
+            return new ECPrivateKeyImpl(ecKey.getS(), ecKey.getParams());
         } else if ("PKCS#8".equals(key.getFormat())) {
             byte[] encoded = key.getEncoded();
             try {
@@ -209,52 +199,54 @@ private PrivateKey implTranslatePrivateKey(PrivateKey key)
             } finally {
                 Arrays.fill(encoded, (byte)0);
             }
-        } else {
-            throw new InvalidKeyException("Private keys must be instance "
-                + "of ECPrivateKey or have PKCS#8 encoding");
         }
+
+        throw new InvalidKeyException("Private keys must be instance "
+            + "of ECPrivateKey or have PKCS#8 encoding");
     }
 
     // internal implementation of generatePublic. See JCA doc
     private PublicKey implGeneratePublic(KeySpec keySpec)
-            throws GeneralSecurityException {
-        if (keySpec instanceof X509EncodedKeySpec) {
-            X509EncodedKeySpec x509Spec = (X509EncodedKeySpec)keySpec;
-            return new ECPublicKeyImpl(x509Spec.getEncoded());
-        } else if (keySpec instanceof ECPublicKeySpec) {
-            ECPublicKeySpec ecSpec = (ECPublicKeySpec)keySpec;
-            return new ECPublicKeyImpl(
-                ecSpec.getW(),
-                ecSpec.getParams()
-            );
-        } else {
-            throw new InvalidKeySpecException("Only ECPublicKeySpec "
-                + "and X509EncodedKeySpec supported for EC public keys");
-        }
+        throws GeneralSecurityException {
+        return switch (keySpec) {
+            case X509EncodedKeySpec x -> new ECPublicKeyImpl(x.getEncoded());
+            case ECPublicKeySpec e ->
+                new ECPublicKeyImpl(e.getW(), e.getParams());
+            case PKCS8EncodedKeySpec p8 -> {
+                PKCS8Key p8key = new ECPrivateKeyImpl(p8.getEncoded());
+                if (!p8key.hasPublicKey()) {
+                    throw new InvalidKeySpecException("No public key found.");
+                }
+                yield new ECPublicKeyImpl(p8key.getPubKeyEncoded());
+            }
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     // internal implementation of generatePrivate. See JCA doc
     private PrivateKey implGeneratePrivate(KeySpec keySpec)
-            throws GeneralSecurityException {
-        if (keySpec instanceof PKCS8EncodedKeySpec) {
-            PKCS8EncodedKeySpec pkcsSpec = (PKCS8EncodedKeySpec)keySpec;
-            byte[] encoded = pkcsSpec.getEncoded();
-            try {
-                return new ECPrivateKeyImpl(encoded);
-            } finally {
-                Arrays.fill(encoded, (byte) 0);
+        throws GeneralSecurityException {
+        return switch (keySpec) {
+            case PKCS8EncodedKeySpec p8 -> {
+                byte[] encoded = p8.getEncoded();
+                try {
+                    yield new ECPrivateKeyImpl(encoded);
+                } finally {
+                    Arrays.fill(encoded, (byte) 0);
+                }
             }
-        } else if (keySpec instanceof ECPrivateKeySpec) {
-            ECPrivateKeySpec ecSpec = (ECPrivateKeySpec)keySpec;
-            return new ECPrivateKeyImpl(ecSpec.getS(), ecSpec.getParams());
-        } else {
-            throw new InvalidKeySpecException("Only ECPrivateKeySpec "
-                + "and PKCS8EncodedKeySpec supported for EC private keys");
-        }
+            case ECPrivateKeySpec e ->
+                new ECPrivateKeyImpl(e.getS(), e.getParams());
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
-            throws InvalidKeySpecException {
+        throws InvalidKeySpecException {
         try {
             // convert key to one of our keys
             // this also verifies that the key is a valid EC key and ensures
@@ -263,8 +255,7 @@ protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
         } catch (InvalidKeyException e) {
             throw new InvalidKeySpecException(e);
         }
-        if (key instanceof ECPublicKey) {
-            ECPublicKey ecKey = (ECPublicKey)key;
+        if (key instanceof ECPublicKey ecKey) {
             if (keySpec.isAssignableFrom(ECPublicKeySpec.class)) {
                 return keySpec.cast(new ECPublicKeySpec(
                     ecKey.getW(),
diff --git a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
index b1b8b2d188f..65c4f093f27 100644
--- a/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/ec/ECPrivateKeyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
 import sun.security.util.*;
 import sun.security.x509.AlgorithmId;
 import sun.security.pkcs.PKCS8Key;
+import sun.security.x509.X509Key;
 
 /**
  * Key implementation for EC private keys.
@@ -73,6 +74,7 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
     private byte[] arrayS;      // private value as a little-endian array
     @SuppressWarnings("serial") // Type of field is not Serializable
     private ECParameterSpec params;
+    private byte[] domainParams;  //Currently unsupported
 
     /**
      * Construct a key from its encoding. Called by the ECKeyFactory.
@@ -111,7 +113,7 @@ private void makeEncoding(byte[] s) throws InvalidKeyException {
         out.putOctetString(privBytes);
         Arrays.fill(privBytes, (byte) 0);
         DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
-        key = val.toByteArray();
+        privKeyMaterial = val.toByteArray();
         val.clear();
     }
 
@@ -133,7 +135,7 @@ private void makeEncoding(BigInteger s) throws InvalidKeyException {
         out.putOctetString(sOctets);
         Arrays.fill(sOctets, (byte) 0);
         DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
-        key = val.toByteArray();
+        privKeyMaterial = val.toByteArray();
         val.clear();
     }
 
@@ -153,64 +155,78 @@ public BigInteger getS() {
         return s;
     }
 
-    private byte[] getArrayS0() {
+    // Return the internal arrayS byte[], if arrayS is null generate it.
+    public byte[] getArrayS() {
         if (arrayS == null) {
             arrayS = ECUtil.sArray(getS(), params);
         }
         return arrayS;
     }
 
-    public byte[] getArrayS() {
-        return getArrayS0().clone();
-    }
-
     // see JCA doc
     public ECParameterSpec getParams() {
         return params;
     }
 
+    /**
+     * Parse the ASN.1 of the privateKey Octet
+     */
     private void parseKeyBits() throws InvalidKeyException {
+        // Parse private key material from PKCS8Key.decode()
         try {
-            DerInputStream in = new DerInputStream(key);
+            DerInputStream in = new DerInputStream(privKeyMaterial);
             DerValue derValue = in.getDerValue();
             if (derValue.tag != DerValue.tag_Sequence) {
                 throw new IOException("Not a SEQUENCE");
             }
             DerInputStream data = derValue.data;
             int version = data.getInteger();
-            if (version != 1) {
+            if (version != V2) {
                 throw new IOException("Version must be 1");
             }
             byte[] privData = data.getOctetString();
             ArrayUtil.reverse(privData);
             arrayS = privData;
-            while (data.available() != 0) {
-                DerValue value = data.getDerValue();
-                if (value.isContextSpecific((byte) 0)) {
-                    // ignore for now
-                } else if (value.isContextSpecific((byte) 1)) {
-                    // ignore for now
-                } else {
-                    throw new InvalidKeyException("Unexpected value: " + value);
-                }
-            }
+
+            // Validate parameters stored from PKCS8Key.decode()
             AlgorithmParameters algParams = this.algid.getParameters();
             if (algParams == null) {
                 throw new InvalidKeyException("EC domain parameters must be "
                     + "encoded in the algorithm identifier");
             }
             params = algParams.getParameterSpec(ECParameterSpec.class);
+
+            if (data.available() == 0) {
+                return;
+            }
+
+            DerValue value = data.getDerValue();
+            if (value.isContextSpecific((byte) 0)) {
+                domainParams = value.getDataBytes();  // Save DER sequence
+                if (data.available() == 0) {
+                    return;
+                }
+                value = data.getDerValue();
+            }
+
+            if (value.isContextSpecific((byte) 1)) {
+                DerValue bits = value.withTag(DerValue.tag_BitString);
+                pubKeyEncoded = new X509Key(algid,
+                    bits.data.getUnalignedBitString()).getEncoded();
+            } else {
+                throw new InvalidKeyException("Unexpected value: " + value);
+            }
+
         } catch (IOException | InvalidParameterSpecException e) {
             throw new InvalidKeyException("Invalid EC private key", e);
         }
     }
 
-    @Override
     public PublicKey calculatePublicKey() {
         ECParameterSpec ecParams = getParams();
         ECOperations ops = ECOperations.forParameters(ecParams)
                 .orElseThrow(ProviderException::new);
-        MutablePoint pub = ops.multiply(ecParams.getGenerator(), getArrayS0());
+        MutablePoint pub = ops.multiply(ecParams.getGenerator(), getArrayS());
         AffinePoint affPub = pub.asAffine();
         ECPoint w = new ECPoint(affPub.getX().asBigInteger(),
                 affPub.getY().asBigInteger());
diff --git a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
index 3e2ced41236..00eb5b4353d 100644
--- a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, 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,12 +25,9 @@
 
 package sun.security.ec;
 
-import java.security.KeyFactorySpi;
-import java.security.Key;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.InvalidKeyException;
-import java.security.ProviderException;
+import sun.security.pkcs.PKCS8Key;
+
+import java.security.*;
 import java.security.interfaces.XECKey;
 import java.security.interfaces.XECPrivateKey;
 import java.security.interfaces.XECPublicKey;
@@ -160,9 +157,19 @@ private PublicKey generatePublicImpl(KeySpec keySpec)
                 InvalidKeySpecException::new, publicKeySpec.getParams());
             checkLockedParams(InvalidKeySpecException::new, params);
             return new XDHPublicKeyImpl(params, publicKeySpec.getU());
+        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
+            PKCS8Key p8key = new XDHPrivateKeyImpl(p8.getEncoded());
+            if (!p8key.hasPublicKey()) {
+                throw new InvalidKeySpecException("No public key found.");
+            }
+            XDHPublicKeyImpl result =
+                new XDHPublicKeyImpl(p8key.getPubKeyEncoded());
+            checkLockedParams(InvalidKeySpecException::new,
+                result.getParams());
+            return result;
         } else {
-            throw new InvalidKeySpecException(
-                "Only X509EncodedKeySpec and XECPublicKeySpec are supported");
+            throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                " not supported.");
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ec/XDHPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/ec/XDHPrivateKeyImpl.java
index dfc0d0f6cd3..416a3e10af4 100644
--- a/src/java.base/share/classes/sun/security/ec/XDHPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/ec/XDHPrivateKeyImpl.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
@@ -54,7 +54,7 @@ public final class XDHPrivateKeyImpl extends PKCS8Key implements XECPrivateKey {
 
         DerValue val = new DerValue(DerValue.tag_OctetString, k);
         try {
-            this.key = val.toByteArray();
+            this.privKeyMaterial = val.toByteArray();
         } finally {
             val.clear();
         }
@@ -67,7 +67,7 @@ public final class XDHPrivateKeyImpl extends PKCS8Key implements XECPrivateKey {
             InvalidKeyException::new, algid);
         paramSpec = new NamedParameterSpec(params.getName());
         try {
-            DerInputStream derStream = new DerInputStream(key);
+            DerInputStream derStream = new DerInputStream(privKeyMaterial);
             k = derStream.getOctetString();
         } catch (IOException ex) {
             throw new InvalidKeyException(ex);
@@ -102,7 +102,6 @@ public Optional<byte[]> getScalar() {
         return Optional.of(getK());
     }
 
-    @Override
     public PublicKey calculatePublicKey() {
         XECParameters params = paramSpec.getName().equalsIgnoreCase("X25519")
                 ? XECParameters.X25519
diff --git a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
index c282a34ef84..b3316f5ffe0 100644
--- a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.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
@@ -25,12 +25,9 @@
 
 package sun.security.ec.ed;
 
-import java.security.KeyFactorySpi;
-import java.security.Key;
-import java.security.PublicKey;
-import java.security.PrivateKey;
-import java.security.InvalidKeyException;
-import java.security.ProviderException;
+import sun.security.pkcs.PKCS8Key;
+
+import java.security.*;
 import java.security.interfaces.*;
 import java.security.spec.*;
 import java.util.Arrays;
@@ -153,9 +150,15 @@ private PublicKey generatePublicImpl(KeySpec keySpec)
                 InvalidKeySpecException::new, publicKeySpec.getParams());
             checkLockedParams(InvalidKeySpecException::new, params);
             return new EdDSAPublicKeyImpl(params, publicKeySpec.getPoint());
+        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
+            PKCS8Key p8key = new EdDSAPrivateKeyImpl(p8.getEncoded());
+            if (!p8key.hasPublicKey()) {
+                throw new InvalidKeySpecException("No public key found.");
+            }
+            return new EdDSAPublicKeyImpl(p8key.getPubKeyEncoded());
         } else {
-            throw new InvalidKeySpecException(
-                "Only X509EncodedKeySpec and EdECPublicKeySpec are supported");
+            throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                " not supported.");
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/ec/ed/EdDSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/ec/ed/EdDSAPrivateKeyImpl.java
index 661ec9ed1b7..10b19c1ce53 100644
--- a/src/java.base/share/classes/sun/security/ec/ed/EdDSAPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/ec/ed/EdDSAPrivateKeyImpl.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
@@ -56,7 +56,7 @@ public final class EdDSAPrivateKeyImpl
 
         DerValue val = new DerValue(DerValue.tag_OctetString, h);
         try {
-            this.key = val.toByteArray();
+            privKeyMaterial = val.toByteArray();
         } finally {
             val.clear();
         }
@@ -71,7 +71,7 @@ public final class EdDSAPrivateKeyImpl
         paramSpec = new NamedParameterSpec(params.getName());
 
         try {
-            DerInputStream derStream = new DerInputStream(key);
+            DerInputStream derStream = new DerInputStream(privKeyMaterial);
             h = derStream.getOctetString();
         } catch (IOException ex) {
             throw new InvalidKeyException(ex);
@@ -81,8 +81,8 @@ public final class EdDSAPrivateKeyImpl
 
     void checkLength(EdDSAParameters params) throws InvalidKeyException {
 
-        if (params.getKeyLength() != this.h.length) {
-            throw new InvalidKeyException("key length is " + this.h.length +
+        if (params.getKeyLength() != h.length) {
+            throw new InvalidKeyException("key length is " + h.length +
                 ", key length must be " + params.getKeyLength());
         }
     }
diff --git a/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java
index 88a2909cfac..a748433da87 100644
--- a/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.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
@@ -75,7 +75,7 @@ public NamedPKCS8Key(String fname, String pname, byte[] rawBytes) {
 
         DerValue val = new DerValue(DerValue.tag_OctetString, rawBytes);
         try {
-            this.key = val.toByteArray();
+            this.privKeyMaterial = val.toByteArray();
         } finally {
             val.clear();
         }
@@ -90,7 +90,7 @@ public NamedPKCS8Key(String fname, byte[] encoded) throws InvalidKeyException {
             if (algid.getEncodedParams() != null) {
                 throw new InvalidKeyException("algorithm identifier has params");
             }
-            rawBytes = new DerInputStream(key).getOctetString();
+            rawBytes = new DerInputStream(privKeyMaterial).getOctetString();
         } catch (IOException e) {
             throw new InvalidKeyException("Cannot parse input", e);
         }
@@ -129,7 +129,7 @@ private void readObject(ObjectInputStream stream)
     @Override
     public void destroy() throws DestroyFailedException {
         Arrays.fill(rawBytes, (byte)0);
-        Arrays.fill(key, (byte)0);
+        Arrays.fill(privKeyMaterial, (byte)0);
         if (encodedKey != null) {
             Arrays.fill(encodedKey, (byte)0);
         }
diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
index 4cb277b43a8..5aa859c58e3 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.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
@@ -25,22 +25,18 @@
 
 package sun.security.pkcs;
 
-import java.io.*;
-import java.security.Key;
-import java.security.KeyRep;
-import java.security.PrivateKey;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
+import jdk.internal.access.SharedSecrets;
+import sun.security.util.*;
+import sun.security.x509.AlgorithmId;
+import sun.security.x509.X509Key;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.security.*;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Arrays;
 
-import jdk.internal.access.SharedSecrets;
-import sun.security.x509.*;
-import sun.security.util.*;
-
 /**
  * Holds a PKCS#8 key, for example a private key
  *
@@ -56,7 +52,7 @@
  *        ...
  *      }
  *
- * We support this format but do not parse attributes and publicKey now.
+ * We support this format but do not parse attributes.
  */
 public class PKCS8Key implements PrivateKey, InternalPrivateKey {
 
@@ -67,20 +63,29 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
     /* The algorithm information (name, parameters, etc). */
     protected AlgorithmId algid;
 
-    /* The key bytes, without the algorithm information */
-    protected byte[] key;
+    /* The private key OctetString for the algorithm subclasses to decode */
+    protected byte[] privKeyMaterial;
 
-    /* The encoded for the key. Created on demand by encode(). */
+    /* The pkcs8 encoding of this key(s). Created on demand. */
     protected byte[] encodedKey;
 
+    /* The encoded x509 public key for v2 */
+    protected byte[] pubKeyEncoded = null;
+
+    /* ASN.1 Attributes */
+    private byte[] attributes;
+
+    /* PKCS8 version of the PEM */
+    private int version;
+
     /* The version for this key */
-    private static final int V1 = 0;
-    private static final int V2 = 1;
+    public static final int V1 = 0;
+    public static final int V2 = 1;
 
     /**
      * Default constructor. Constructors in subclasses that create a new key
      * from its components require this. These constructors must initialize
-     * {@link #algid} and {@link #key}.
+     * {@link #algid} and {@link #privKeyMaterial}.
      */
     protected PKCS8Key() { }
 
@@ -91,7 +96,7 @@ protected PKCS8Key() { }
      *
      * This method is also used by {@link #parseKey} to create a raw key.
      */
-    protected PKCS8Key(byte[] input) throws InvalidKeyException {
+    public PKCS8Key(byte[] input) throws InvalidKeyException {
         try {
             decode(new DerValue(input));
         } catch (IOException e) {
@@ -99,39 +104,70 @@ protected PKCS8Key(byte[] input) throws InvalidKeyException {
         }
     }
 
+    private PKCS8Key(byte[] privEncoding, byte[] pubEncoding)
+        throws InvalidKeyException {
+        this(privEncoding);
+        pubKeyEncoded = pubEncoding;
+        version = V2;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    /**
+     * Method for decoding PKCS8 v1 and v2 formats. Decoded values are stored
+     * in this class, key material remains in DER format for algorithm
+     * subclasses to decode.
+     */
     private void decode(DerValue val) throws InvalidKeyException {
         try {
             if (val.tag != DerValue.tag_Sequence) {
                 throw new InvalidKeyException("invalid key format");
             }
 
-            int version = val.data.getInteger();
+            // Support check for V1, aka 0, and V2, aka 1.
+            version = val.data.getInteger();
             if (version != V1 && version != V2) {
                 throw new InvalidKeyException("unknown version: " + version);
             }
-            algid = AlgorithmId.parse (val.data.getDerValue ());
-            key = val.data.getOctetString();
+            // Parse and store AlgorithmID
+            algid = AlgorithmId.parse(val.data.getDerValue());
+
+            // Store key material for subclasses to parse
+            privKeyMaterial = val.data.getOctetString();
 
-            DerValue next;
+            // PKCS8 v1 typically ends here
             if (val.data.available() == 0) {
                 return;
             }
-            next = val.data.getDerValue();
-            if (next.isContextSpecific((byte)0)) {
+
+            // OPTIONAL Context tag 0 for Attributes for PKCS8 v1 & v2
+            // Uses 0xA0 context-specific/constructed or 0x80
+            // context-specific/primitive.
+            DerValue v = val.data.getDerValue();
+            if (v.isContextSpecific((byte)0)) {
+                attributes = v.getDataBytes();  // Save DER sequence
                 if (val.data.available() == 0) {
                     return;
                 }
-                next = val.data.getDerValue();
+                v = val.data.getDerValue();
             }
 
-            if (next.isContextSpecific((byte)1)) {
-                if (version == V1) {
-                    throw new InvalidKeyException("publicKey seen in v1");
+            // OPTIONAL context tag 1 for Public Key for PKCS8 v2 only
+            if (version == V2) {
+                if (v.isContextSpecific((byte)1)) {
+                    DerValue bits = v.withTag(DerValue.tag_BitString);
+                    pubKeyEncoded = new X509Key(algid,
+                        bits.getUnalignedBitString()).getEncoded();
+                } else {
+                    throw new InvalidKeyException("Invalid context tag");
                 }
                 if (val.data.available() == 0) {
                     return;
                 }
             }
+
             throw new InvalidKeyException("Extra bytes");
         } catch (IOException e) {
             throw new InvalidKeyException("Unable to decode key", e);
@@ -154,17 +190,29 @@ private void decode(DerValue val) throws InvalidKeyException {
      * handling, that specific need can be accommodated.
      *
      * @param encoded the DER-encoded SubjectPublicKeyInfo value
-     * @exception IOException on data format errors
+     * @exception InvalidKeyException on data format errors
      */
-    public static PrivateKey parseKey(byte[] encoded) throws IOException {
+    public static PrivateKey parseKey(byte[] encoded)
+        throws InvalidKeyException {
+        return parseKey(encoded, null);
+    }
+
+    public static PrivateKey parseKey(byte[] encoded, Provider provider)
+        throws InvalidKeyException {
         try {
             PKCS8Key rawKey = new PKCS8Key(encoded);
-            byte[] internal = rawKey.getEncodedInternal();
-            PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(internal);
+
+            PKCS8EncodedKeySpec pkcs8KeySpec =
+                new PKCS8EncodedKeySpec(rawKey.generateEncoding());
             PrivateKey result = null;
             try {
-                result = KeyFactory.getInstance(rawKey.algid.getName())
+                if (provider == null) {
+                    result = KeyFactory.getInstance(rawKey.algid.getName())
                         .generatePrivate(pkcs8KeySpec);
+                } else {
+                    result = KeyFactory.getInstance(rawKey.algid.getName(),
+                        provider).generatePrivate(pkcs8KeySpec);
+                }
             } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
                 // Ignore and return raw key
                 result = rawKey;
@@ -176,8 +224,8 @@ public static PrivateKey parseKey(byte[] encoded) throws IOException {
                         .clearEncodedKeySpec(pkcs8KeySpec);
             }
             return result;
-        } catch (InvalidKeyException e) {
-            throw new IOException("corrupt private key", e);
+        } catch (IOException e) {
+            throw new InvalidKeyException(e);
         }
     }
 
@@ -188,10 +236,18 @@ public String getAlgorithm() {
         return algid.getName();
     }
 
+    public byte[] getPubKeyEncoded() {
+        return pubKeyEncoded;
+    }
+
+    public boolean hasPublicKey() {
+        return (pubKeyEncoded != null);
+    }
+
     /**
      * Returns the algorithm ID to be used with this key.
      */
-    public AlgorithmId  getAlgorithmId () {
+    public AlgorithmId getAlgorithmId () {
         return algid;
     }
 
@@ -210,6 +266,25 @@ public String getFormat() {
         return "PKCS#8";
     }
 
+    /**
+     * With a given encoded Public and Private key, generate and return a
+     * PKCS8v2 DER-encoded byte[].
+     *
+     * @param pubKeyEncoded DER-encoded PublicKey
+     * @param privKeyEncoded DER-encoded PrivateKey
+     * @return DER-encoded byte array
+     * @throws IOException thrown on encoding failure
+     */
+    public static byte[] getEncoded(byte[] pubKeyEncoded, byte[] privKeyEncoded)
+        throws IOException {
+        try {
+            return new PKCS8Key(privKeyEncoded, pubKeyEncoded).
+                generateEncoding();
+        } catch (InvalidKeyException e) {
+            throw new IOException(e);
+        }
+    }
+
     /**
      * DER-encodes this key as a byte array stored inside this object
      * and return it.
@@ -218,17 +293,53 @@ public String getFormat() {
      */
     private synchronized byte[] getEncodedInternal() {
         if (encodedKey == null) {
-            DerOutputStream tmp = new DerOutputStream();
-            tmp.putInteger(V1);
-            algid.encode(tmp);
-            tmp.putOctetString(key);
-            DerValue out = DerValue.wrap(DerValue.tag_Sequence, tmp);
-            encodedKey = out.toByteArray();
-            out.clear();
+            try {
+                encodedKey = generateEncoding();
+            } catch (IOException e) {
+               return null;
+            }
         }
         return encodedKey;
     }
 
+    private byte[] generateEncoding() throws IOException {
+        DerOutputStream out = new DerOutputStream();
+        out.putInteger(version);
+        algid.encode(out);
+        out.putOctetString(privKeyMaterial);
+
+        if (version == V2) {
+            if (attributes != null) {
+                out.writeImplicit(
+                    DerValue.createTag((byte) (DerValue.TAG_CONTEXT |
+                        DerValue.TAG_CONSTRUCT), false, (byte) 0),
+                    new DerOutputStream().putOctetString(attributes));
+
+            }
+
+            if (pubKeyEncoded != null) {
+                X509Key x = new X509Key();
+                try {
+                    x.decode(pubKeyEncoded);
+                } catch (InvalidKeyException e) {
+                    throw new IOException(e);
+                }
+
+                // X509Key x = X509Key.parse(pubKeyEncoded);
+                DerOutputStream pubOut = new DerOutputStream();
+                pubOut.putUnalignedBitString(x.getKey());
+                out.writeImplicit(
+                    DerValue.createTag(DerValue.TAG_CONTEXT, false,
+                        (byte) 1), pubOut);
+            }
+        }
+
+        DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
+        encodedKey = val.toByteArray();
+        val.clear();
+        return encodedKey;
+    }
+
     @java.io.Serial
     protected Object writeReplace() throws java.io.ObjectStreamException {
         return new KeyRep(KeyRep.Type.PRIVATE,
@@ -298,6 +409,6 @@ public void clear() {
         if (encodedKey != null) {
             Arrays.fill(encodedKey, (byte)0);
         }
-        Arrays.fill(key, (byte)0);
+        Arrays.fill(privKeyMaterial, (byte)0);
     }
 }
diff --git a/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java b/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java
index e34fd3a6af1..a3357b1879c 100644
--- a/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java
+++ b/src/java.base/share/classes/sun/security/provider/DSAPrivateKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, 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
@@ -70,7 +70,7 @@ public DSAPrivateKey(BigInteger x, BigInteger p,
 
         byte[] xbytes = x.toByteArray();
         DerValue val = new DerValue(DerValue.tag_Integer, xbytes);
-        key = val.toByteArray();
+        privKeyMaterial = val.toByteArray();
         val.clear();
         Arrays.fill(xbytes, (byte)0);
     }
@@ -81,7 +81,7 @@ public DSAPrivateKey(BigInteger x, BigInteger p,
     public DSAPrivateKey(byte[] encoded) throws InvalidKeyException {
         super(encoded);
         try {
-            DerInputStream in = new DerInputStream(key);
+            DerInputStream in = new DerInputStream(privKeyMaterial);
             x = in.getBigInteger();
         } catch (IOException e) {
             throw new InvalidKeyException(e.getMessage(), e);
diff --git a/src/java.base/share/classes/sun/security/provider/KeyProtector.java b/src/java.base/share/classes/sun/security/provider/KeyProtector.java
index 0faed9db737..384c28e2bf8 100644
--- a/src/java.base/share/classes/sun/security/provider/KeyProtector.java
+++ b/src/java.base/share/classes/sun/security/provider/KeyProtector.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
@@ -25,7 +25,6 @@
 
 package sun.security.provider;
 
-import java.io.IOException;
 import java.security.SecureRandom;
 import java.security.*;
 import java.util.Arrays;
@@ -300,8 +299,8 @@ public Key recover(EncryptedPrivateKeyInfo encrInfo)
         // which in turn parses the key material.
         try {
             return PKCS8Key.parseKey(plainKey);
-        } catch (IOException ioe) {
-            throw new UnrecoverableKeyException(ioe.getMessage());
+        } catch (InvalidKeyException e) {
+            throw new UnrecoverableKeyException(e.getMessage());
         } finally {
             Arrays.fill(plainKey, (byte)0);
         }
diff --git a/src/java.base/share/classes/sun/security/provider/X509Factory.java b/src/java.base/share/classes/sun/security/provider/X509Factory.java
index ad48c0c598d..ec7a1ac998a 100644
--- a/src/java.base/share/classes/sun/security/provider/X509Factory.java
+++ b/src/java.base/share/classes/sun/security/provider/X509Factory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -27,6 +27,7 @@
 
 import java.io.*;
 
+import java.security.PEMRecord;
 import java.security.cert.*;
 import java.util.*;
 
@@ -36,6 +37,7 @@
 import sun.security.provider.certpath.X509CertificatePair;
 import sun.security.util.Cache;
 import sun.security.util.DerValue;
+import sun.security.util.Pem;
 import sun.security.x509.X509CRLImpl;
 import sun.security.x509.X509CertImpl;
 
@@ -556,118 +558,20 @@ private static byte[] readOneBlock(InputStream is) throws IOException {
             readBERInternal(is, bout, c);
             return bout.toByteArray();
         } else {
-            // Read BASE64 encoded data, might skip info at the beginning
-            ByteArrayOutputStream data = new ByteArrayOutputStream();
-
-            // Step 1: Read until header is found
-            int hyphen = (c=='-') ? 1: 0;   // count of consequent hyphens
-            int last = (c=='-') ? -1: c;    // the char before hyphen
-            while (true) {
-                int next = is.read();
-                if (next == -1) {
-                    // We accept useless data after the last block,
-                    // say, empty lines.
+            try {
+                PEMRecord rec;
+                try {
+                    rec = Pem.readPEM(is, (c == '-' ? true : false));
+                } catch (EOFException e) {
                     return null;
                 }
-                if (next == '-') {
-                    hyphen++;
-                } else {
-                    hyphen = 0;
-                    last = next;
-                }
-                if (hyphen == 5 && (last == -1 || last == '\r' || last == '\n')) {
-                    break;
-                }
-            }
-
-            // Step 2: Read the rest of header, determine the line end
-            int end;
-            StringBuilder header = new StringBuilder("-----");
-            while (true) {
-                int next = is.read();
-                if (next == -1) {
-                    throw new IOException("Incomplete data");
-                }
-                if (next == '\n') {
-                    end = '\n';
-                    break;
-                }
-                if (next == '\r') {
-                    next = is.read();
-                    if (next == -1) {
-                        throw new IOException("Incomplete data");
-                    }
-                    if (next == '\n') {
-                        end = '\n';
-                    } else {
-                        end = '\r';
-                        // Skip all white space chars
-                        if (next != 9 && next != 10 && next != 13 && next != 32) {
-                            data.write(next);
-                        }
-                    }
-                    break;
-                }
-                header.append((char)next);
-            }
-
-            // Step 3: Read the data
-            while (true) {
-                int next = is.read();
-                if (next == -1) {
-                    throw new IOException("Incomplete data");
-                }
-                if (next != '-') {
-                    // Skip all white space chars
-                    if (next != 9 && next != 10 && next != 13 && next != 32) {
-                        data.write(next);
-                    }
-                } else {
-                    break;
-                }
-            }
-
-            // Step 4: Consume the footer
-            StringBuilder footer = new StringBuilder("-");
-            while (true) {
-                int next = is.read();
-                // Add next == '\n' for maximum safety, in case endline
-                // is not consistent.
-                if (next == -1 || next == end || next == '\n') {
-                    break;
-                }
-                if (next != '\r') footer.append((char)next);
-            }
-
-            checkHeaderFooter(header.toString().stripTrailing(),
-                    footer.toString().stripTrailing());
-
-            try {
-                return Base64.getDecoder().decode(data.toByteArray());
+                return Base64.getDecoder().decode(rec.pem());
             } catch (IllegalArgumentException e) {
                 throw new IOException(e);
             }
         }
     }
 
-    private static void checkHeaderFooter(String header,
-            String footer) throws IOException {
-        if (header.length() < 16 || !header.startsWith("-----BEGIN ") ||
-                !header.endsWith("-----")) {
-            throw new IOException("Illegal header: " + header);
-        }
-        if (footer.length() < 14 || !footer.startsWith("-----END ") ||
-                !footer.endsWith("-----")) {
-            throw new IOException("Illegal footer: " + footer);
-        }
-        String headerType = header.substring(11, header.length()-5);
-        String footerType = footer.substring(9, footer.length()-5);
-        if (!headerType.equals(footerType)) {
-            throw new IOException("Header and footer do not match: " +
-                    header + " " + footer);
-        }
-    }
-
     /**
      * Read one BER data block. This method is aware of indefinite-length BER
      * encoding and will read all the subsections in a recursive way
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java b/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
index c6fa1cf8980..f518bf5919b 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.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
@@ -32,6 +32,7 @@
 import java.security.spec.*;
 import java.util.Arrays;
 
+import sun.security.pkcs.PKCS8Key;
 import sun.security.rsa.RSAUtil.KeyType;
 
 /**
@@ -332,9 +333,15 @@ private PublicKey generatePublic(KeySpec keySpec)
             } catch (ProviderException e) {
                 throw new InvalidKeySpecException(e);
             }
+        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
+            PKCS8Key p8key = new PKCS8Key(p8.getEncoded());
+            if (!p8key.hasPublicKey()) {
+                throw new InvalidKeySpecException("No public key found.");
+            }
+            return RSAPublicKeyImpl.newKey(type, "X.509",
+                p8key.getPubKeyEncoded());
         } else {
-            throw new InvalidKeySpecException("Only RSAPublicKeySpec "
-                + "and X509EncodedKeySpec supported for RSA public keys");
+            throw new InvalidKeySpecException(keySpec.getClass().getName() + " not supported.");
         }
     }
 
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
index b6ef067d449..857914e6997 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.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
@@ -69,6 +69,7 @@ public final class RSAPrivateCrtKeyImpl
     private BigInteger qe;      // prime exponent q
     private BigInteger coeff;   // CRT coefficient
 
+    // RSA or RSA-PSS KeyType
     private final transient KeyType type;
 
     // Optional parameters associated with this RSA key
@@ -101,7 +102,7 @@ public static RSAPrivateKey newKey(KeyType type, String format,
             }
         case "PKCS#1":
             try {
-                BigInteger[] comps = parseASN1(encoded);
+                BigInteger[] comps = parsePKCS1(encoded);
                 if ((comps[1].signum() == 0) || (comps[3].signum() == 0) ||
                     (comps[4].signum() == 0) || (comps[5].signum() == 0) ||
                     (comps[6].signum() == 0) || (comps[7].signum() == 0)) {
@@ -237,7 +238,7 @@ private RSAPrivateCrtKeyImpl(byte[] encoded) throws InvalidKeyException {
         Arrays.fill(nbytes[6], (byte) 0);
         Arrays.fill(nbytes[7], (byte) 0);
         DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
-        key = val.toByteArray();
+        privKeyMaterial = val.toByteArray();
         val.clear();
     }
 
@@ -304,7 +305,7 @@ public AlgorithmParameterSpec getParams() {
     // utility method for parsing DER encoding of RSA private keys in PKCS#1
     // format as defined in RFC 8017 Appendix A.1.2, i.e. SEQ of version, n,
     // e, d, p, q, pe, qe, and coeff, and return the parsed components.
-    private static BigInteger[] parseASN1(byte[] raw) throws IOException {
+    private static BigInteger[] parsePKCS1(byte[] raw) throws IOException {
         DerValue derValue = new DerValue(raw);
         try {
             if (derValue.tag != DerValue.tag_Sequence) {
@@ -337,7 +338,7 @@ private static BigInteger[] parseASN1(byte[] raw) throws IOException {
 
     private void parseKeyBits() throws InvalidKeyException {
         try {
-            BigInteger[] comps = parseASN1(key);
+            BigInteger[] comps = parsePKCS1(privKeyMaterial);
             n = comps[0];
             e = comps[1];
             d = comps[2];
@@ -351,6 +352,30 @@ private void parseKeyBits() throws InvalidKeyException {
         }
     }
 
+    /**
+     * With a given PKCS#1/slleay/OpenSSL old default RSA binary encoding,
+     * decode and return the proper RSA encoded KeySpec
+     * @param encoded RSA binary encoding
+     * @return KeySpec
+     * @throws InvalidKeyException on decoding failure
+     */
+    public static KeySpec getKeySpec(byte[] encoded) throws
+        InvalidKeyException {
+        try {
+            BigInteger[] comps = parsePKCS1(encoded);
+            if ((comps[1].signum() == 0) || (comps[3].signum() == 0) ||
+                (comps[4].signum() == 0) || (comps[5].signum() == 0) ||
+                (comps[6].signum() == 0) || (comps[7].signum() == 0)) {
+                return new RSAPrivateKeySpec(comps[0], comps[2]);
+            } else {
+                return new RSAPrivateCrtKeySpec(comps[0],
+                    comps[1], comps[2], comps[3], comps[4], comps[5],
+                    comps[6], comps[7]);
+            }
+        } catch (IOException ioe) {
+            throw new InvalidKeyException("Invalid PKCS#1 encoding", ioe);
+        }
+    }
     /**
      * Restores the state of this object from the stream.
      * <p>
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
index 91bc5f771d6..c67f934b0c3 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateKeyImpl.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
@@ -110,7 +110,7 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey {
         out.putInteger(0);
         out.putInteger(0);
         DerValue val = DerValue.wrap(DerValue.tag_Sequence, out);
-        key = val.toByteArray();
+        privKeyMaterial = val.toByteArray();
         val.clear();
     }
 
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
index 5a0745604d2..47d95cdd6a0 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.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
@@ -82,7 +82,7 @@ public static RSAPublicKey newKey(KeyType type, String format,
             break;
         case "PKCS#1":
             try {
-                BigInteger[] comps = parseASN1(encoded);
+                BigInteger[] comps = parsePKCS1(encoded);
                 key = new RSAPublicKeyImpl(type, null, comps[0], comps[1]);
             } catch (IOException ioe) {
                 throw new InvalidKeyException("Invalid PKCS#1 encoding", ioe);
@@ -199,7 +199,7 @@ public AlgorithmParameterSpec getParams() {
 
     // utility method for parsing DER encoding of RSA public keys in PKCS#1
     // format as defined in RFC 8017 Appendix A.1.1, i.e. SEQ of n and e.
-    private static BigInteger[] parseASN1(byte[] raw) throws IOException {
+    private static BigInteger[] parsePKCS1(byte[] raw) throws IOException {
         DerValue derValue = new DerValue(raw);
         if (derValue.tag != DerValue.tag_Sequence) {
             throw new IOException("Not a SEQUENCE");
@@ -218,7 +218,7 @@ private static BigInteger[] parseASN1(byte[] raw) throws IOException {
      */
     protected void parseKeyBits() throws InvalidKeyException {
         try {
-            BigInteger[] comps = parseASN1(getKey().toByteArray());
+            BigInteger[] comps = parsePKCS1(getKey().toByteArray());
             n = comps[0];
             e = comps[1];
         } catch (IOException e) {
diff --git a/src/java.base/share/classes/sun/security/util/DerValue.java b/src/java.base/share/classes/sun/security/util/DerValue.java
index f2fcf350b39..19e7083180b 100644
--- a/src/java.base/share/classes/sun/security/util/DerValue.java
+++ b/src/java.base/share/classes/sun/security/util/DerValue.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
@@ -67,6 +67,7 @@ public class DerValue {
 
     /** The tag class types */
     public static final byte TAG_UNIVERSAL = (byte)0x000;
+    public static final byte TAG_CONSTRUCT = (byte)0x020;
     public static final byte TAG_APPLICATION = (byte)0x040;
     public static final byte TAG_CONTEXT = (byte)0x080;
     public static final byte TAG_PRIVATE = (byte)0x0c0;
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 03768e11450..7a58ac0d4e9 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -41,6 +41,7 @@
 import jdk.internal.access.SharedSecrets;
 
 import sun.security.jca.JCAUtil;
+import sun.security.x509.AlgorithmId;
 
 /**
  * A utility class to get key length, validate keys, etc.
@@ -478,5 +479,72 @@ public static void destroySecretKeys(SecretKey... keys) {
             }
         }
     }
+
+    /**
+     * With a given DER encoded bytes, read through and return the AlgorithmID
+     * stored if it can be found.  If none is found or there is an IOException,
+     * null is returned.
+     *
+     * @param encoded DER encoded bytes
+     * @return AlgorithmID stored in the DER encoded bytes or null.
+     */
+    public static String getAlgorithm(byte[] encoded) throws IOException {
+        try {
+            return getAlgorithmId(encoded).getName();
+        } catch (IOException e) {
+            throw new IOException("No recognized algorithm detected in " +
+                "encoding", e);
+        }
+    }
+
+    /**
+     * With a given DER encoded bytes, read through and return the AlgorithmID
+     * stored if it can be found.
+     *
+     * @param encoded DER encoded bytes
+     * @return AlgorithmID stored in the DER encoded bytes
+     * @throws IOException if there was a DER or other parsing error
+     */
+    public static AlgorithmId getAlgorithmId(byte[] encoded) throws IOException {
+        DerInputStream is = new DerInputStream(encoded);
+        DerValue value = is.getDerValue();
+        if (value.tag != DerValue.tag_Sequence) {
+            throw new IOException("Unknown DER Format:  Value 1 not a Sequence");
+        }
+
+        is = value.data;
+        value = is.getDerValue();
+        // This route is for:  RSAPublic, Encrypted RSAPrivate, EC Public,
+        // Encrypted EC Private,
+        if (value.tag == DerValue.tag_Sequence) {
+            return AlgorithmId.parse(value);
+        } else if (value.tag == DerValue.tag_Integer) {
+            // RSAPrivate, ECPrivate
+            // current value is version, which can be ignored
+            value = is.getDerValue();
+            if (value.tag == DerValue.tag_OctetString) {
+                value = is.getDerValue();
+                if (value.tag == DerValue.tag_Sequence) {
+                    return AlgorithmId.parse(value);
+                } else {
+                    // OpenSSL/X9.62 (0xA0)
+                    ObjectIdentifier oid = value.data.getOID();
+                    AlgorithmId algo = new AlgorithmId(oid, (AlgorithmParameters) null);
+                    if (CurveDB.lookup(algo.getName()) != null) {
+                        return new AlgorithmId(AlgorithmId.EC_oid);
+                    }
+
+                }
+
+            } else if (value.tag == DerValue.tag_Sequence) {
+                // Public Key
+                return AlgorithmId.parse(value);
+            }
+
+        }
+        throw new IOException("No algorithm detected");
+    }
+
+
 }
 
diff --git a/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java
index ba01d91c82e..0acbec8281a 100644
--- a/src/java.base/share/classes/sun/security/util/Pem.java
+++ b/src/java.base/share/classes/sun/security/util/Pem.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,14 +25,56 @@
 
 package sun.security.util;
 
-import java.io.IOException;
+import sun.security.x509.AlgorithmId;
+
+import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.security.PEMRecord;
+import java.security.Security;
+import java.util.Arrays;
 import java.util.Base64;
+import java.util.HexFormat;
+import java.util.Objects;
+import java.util.regex.Pattern;
 
 /**
  * A utility class for PEM format encoding.
  */
 public class Pem {
+    private static final char WS = 0x20;  // Whitespace
+    private static final byte[] CRLF = new byte[] {'\r', '\n'};
+
+    // Default algorithm from jdk.epkcs8.defaultAlgorithm in java.security
+    public static final String DEFAULT_ALGO;
+
+    // Pattern matching for EKPI operations
+    private static final Pattern pbePattern;
+
+    // Lazy initialized PBES2 OID value
+    private static ObjectIdentifier PBES2OID;
+
+    // Lazy initialized singleton encoder.
+    private static Base64.Encoder b64Encoder;
+
+    static {
+        String algo = Security.getProperty("jdk.epkcs8.defaultAlgorithm");
+        DEFAULT_ALGO = (algo == null || algo.isBlank()) ?
+            "PBEWithHmacSHA256AndAES_128" : algo;
+        pbePattern = Pattern.compile("^PBEWith.*And.*",
+            Pattern.CASE_INSENSITIVE);
+    }
+
+    public static final String CERTIFICATE = "CERTIFICATE";
+    public static final String X509_CRL = "X509 CRL";
+    public static final String ENCRYPTED_PRIVATE_KEY = "ENCRYPTED PRIVATE KEY";
+    public static final String PRIVATE_KEY = "PRIVATE KEY";
+    public static final String RSA_PRIVATE_KEY = "RSA PRIVATE KEY";
+    public static final String PUBLIC_KEY = "PUBLIC KEY";
+    // old PEM types per RFC 7468
+    public static final String X509_CERTIFICATE = "X509 CERTIFICATE";
+    public static final String X_509_CERTIFICATE = "X.509 CERTIFICATE";
+    public static final String CRL = "CRL";
 
     /**
      * Decodes a PEM-encoded block.
@@ -40,15 +82,264 @@ public class Pem {
      * @param input the input string, according to RFC 1421, can only contain
      *              characters in the base-64 alphabet and whitespaces.
      * @return the decoded bytes
-     * @throws java.io.IOException if input is invalid
      */
-    public static byte[] decode(String input) throws IOException {
-        byte[] src = input.replaceAll("\\s+", "")
-                .getBytes(StandardCharsets.ISO_8859_1);
-        try {
+    public static byte[] decode(String input) {
+        byte[] src = input.replaceAll("\\s+", "").
+            getBytes(StandardCharsets.ISO_8859_1);
             return Base64.getDecoder().decode(src);
-        } catch (IllegalArgumentException e) {
-            throw new IOException(e);
+    }
+
+    /**
+     * Return the OID for a given PBE algorithm.  PBES1 has an OID for each
+     * algorithm, while PBES2 has one OID for everything that complies with
+     * the formatting.  Therefore, if the algorithm is not PBES1, it will
+     * return PBES2.  Cipher will determine if this is a valid PBE algorithm.
+     * PBES2 specifies AES as the cipher algorithm, but any block cipher could
+     * be supported.
+     */
+    public static ObjectIdentifier getPBEID(String algorithm) {
+
+        // Verify pattern matches PBE Standard Name spec
+        if (!pbePattern.matcher(algorithm).matches()) {
+            throw new IllegalArgumentException("Invalid algorithm format.");
+        }
+
+        // Return the PBES1 OID if it matches
+        try {
+            return AlgorithmId.get(algorithm).getOID();
+        } catch (NoSuchAlgorithmException e) {
+            // fall-through
         }
+
+        // Lazy initialize
+        if (PBES2OID == null) {
+            try {
+                // Set to the hardcoded OID in KnownOID.java
+                PBES2OID = AlgorithmId.get("PBES2").getOID();
+            } catch (NoSuchAlgorithmException e) {
+                // Should never fail.
+                throw new IllegalArgumentException(e);
+            }
+        }
+        return PBES2OID;
+    }
+
+    /*
+     * RFC 7468 has some rules what generators should return given a historical
+     * type name.  This converts read in PEM to the RFC.  Change the type to
+     * be uniform is likely to help apps from not using all 3 certificate names.
+     */
+    private static String typeConverter(String type) {
+        return switch (type) {
+            case Pem.X509_CERTIFICATE, Pem.X_509_CERTIFICATE -> Pem.CERTIFICATE;
+            case Pem.CRL -> Pem.X509_CRL;
+            default -> type;
+        };
+    }
+
+    /**
+     * Read the PEM text and return it in it's three components:  header,
+     * base64, and footer.
+     *
+     * The method will leave the stream after reading the end of line of the
+     * footer or end of file
+     * @param is an InputStream
+     * @param shortHeader if true, the hyphen length is 4 because the first
+     *                    hyphen is assumed to have been read.  This is needed
+     *                    for the CertificateFactory X509 implementation.
+     * @return a new PEMRecord
+     * @throws IOException on IO errors or PEM syntax errors that leave
+     * the read position not at the end of a PEM block
+     * @throws EOFException when at the unexpected end of the stream
+     * @throws IllegalArgumentException when a PEM syntax error occurs,
+     * but the read position in the stream is at the end of the block, so
+     * future reads can be successful.
+     */
+    public static PEMRecord readPEM(InputStream is, boolean shortHeader)
+        throws IOException {
+        Objects.requireNonNull(is);
+
+        int hyphen = (shortHeader ? 1 : 0);
+        int eol = 0;
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream(6);
+        // Find starting hyphens
+        do {
+            int d = is.read();
+            switch (d) {
+                case '-' -> hyphen++;
+                case -1 -> {
+                    if (os.size() == 0) {
+                        throw new EOFException("No data available");
+                    }
+                    throw new EOFException("No PEM data found");
+                }
+                default -> hyphen = 0;
+            }
+            os.write(d);
+        } while (hyphen != 5);
+
+        StringBuilder sb = new StringBuilder(64);
+        sb.append("-----");
+        hyphen = 0;
+        int c;
+
+        // Get header definition until first hyphen
+        do {
+            switch (c = is.read()) {
+                case '-' -> hyphen++;
+                case -1 -> throw new EOFException("Input ended prematurely");
+                case '\n', '\r' -> throw new IOException("Incomplete header");
+                default -> sb.append((char) c);
+            }
+        } while (hyphen == 0);
+
+        // Verify header ending with 5 hyphens.
+        do {
+            switch (is.read()) {
+                case '-' -> hyphen++;
+                default ->
+                    throw new IOException("Incomplete header");
+            }
+        } while (hyphen < 5);
+
+        sb.append("-----");
+        String header = sb.toString();
+        if (header.length() < 16 || !header.startsWith("-----BEGIN ") ||
+            !header.endsWith("-----")) {
+            throw new IOException("Illegal header: " + header);
+        }
+
+        hyphen = 0;
+        sb = new StringBuilder(1024);
+
+        // Determine the line break using the char after the last hyphen
+        switch (is.read()) {
+            case WS -> {} // skip whitespace
+            case '\r' -> {
+                c = is.read();
+                if (c == '\n') {
+                    eol = '\n';
+                } else {
+                    eol = '\r';
+                    sb.append((char) c);
+                }
+            }
+            case '\n' -> eol = '\n';
+            default ->
+                throw new IOException("No EOL character found");
+        }
+
+        // Read data until we find the first footer hyphen.
+        do {
+            switch (c = is.read()) {
+                case -1 ->
+                    throw new EOFException("Incomplete header");
+                case '-' -> hyphen++;
+                case WS, '\t', '\r', '\n' -> {} // skip whitespace and tab
+                default -> sb.append((char) c);
+            }
+        } while (hyphen == 0);
+
+        String data = sb.toString();
+
+        // Verify footer starts with 5 hyphens.
+        do {
+            switch (is.read()) {
+                case '-' -> hyphen++;
+                case -1 -> throw new EOFException("Input ended prematurely");
+                default -> throw new IOException("Incomplete footer");
+            }
+        } while (hyphen < 5);
+
+        hyphen = 0;
+        sb = new StringBuilder(64);
+        sb.append("-----");
+
+        // Look for Complete header by looking for the end of the hyphens
+        do {
+            switch (c = is.read()) {
+                case '-' -> hyphen++;
+                case -1 -> throw new EOFException("Input ended prematurely");
+                default -> sb.append((char) c);
+            }
+        } while (hyphen == 0);
+
+        // Verify ending with 5 hyphens.
+        do {
+            switch (is.read()) {
+                case '-' -> hyphen++;
+                case -1 -> throw new EOFException("Input ended prematurely");
+                default -> throw new IOException("Incomplete footer");
+            }
+        } while (hyphen < 5);
+
+        while ((c = is.read()) != eol && c != -1 && c != WS) {
+            // skip when eol is '\n', the line separator is likely "\r\n".
+            if (c == '\r') {
+                continue;
+            }
+            throw new IOException("Invalid PEM format:  " +
+                "No EOL char found in footer:  0x" +
+                HexFormat.of().toHexDigits((byte) c));
+        }
+
+        sb.append("-----");
+        String footer = sb.toString();
+        if (footer.length() < 14 || !footer.startsWith("-----END ") ||
+            !footer.endsWith("-----")) {
+            // Not an IOE because the read pointer is correctly at the end.
+            throw new IOException("Illegal footer: " + footer);
+        }
+
+        // Verify the object type in the header and the footer are the same.
+        String headerType = header.substring(11, header.length() - 5);
+        String footerType = footer.substring(9, footer.length() - 5);
+        if (!headerType.equals(footerType)) {
+            throw new IOException("Header and footer do not " +
+                "match: " + headerType + " " + footerType);
+        }
+
+        // If there was data before finding the 5 dashes of the PEM header,
+        // backup 5 characters and save that data.
+        byte[] preData = null;
+        if (os.size() > 5) {
+            preData = Arrays.copyOf(os.toByteArray(), os.size() - 5);
+        }
+
+        return new PEMRecord(typeConverter(headerType), data, preData);
+    }
+
+    public static PEMRecord readPEM(InputStream is) throws IOException {
+        return readPEM(is, false);
+    }
+
+    private static String pemEncoded(String type, String base64) {
+        return
+            "-----BEGIN " + type + "-----\r\n" +
+            base64 + (!base64.endsWith("\n") ? "\r\n" : "") +
+            "-----END " + type + "-----\r\n";
+    }
+
+    /**
+     * Construct a String-based encoding based off the type.  leadingData
+     * is not used with this method.
+     * @return PEM in a string
+     */
+    public static String pemEncoded(String type, byte[] der) {
+        if (b64Encoder == null) {
+            b64Encoder = Base64.getMimeEncoder(64, CRLF);
+        }
+        return pemEncoded(type, b64Encoder.encodeToString(der));
+    }
+
+    /**
+     * Construct a String-based encoding based off the type.  leadingData
+     * is not used with this method.
+     * @return PEM in a string
+     */
+    public static String pemEncoded(PEMRecord pem) {
+        String p = pem.pem().replaceAll("(.{64})", "$1\r\n");
+        return pemEncoded(pem.type(), p);
     }
 }
diff --git a/src/java.base/share/classes/sun/security/x509/X509Key.java b/src/java.base/share/classes/sun/security/x509/X509Key.java
index 719748394e1..c83e06f651e 100644
--- a/src/java.base/share/classes/sun/security/x509/X509Key.java
+++ b/src/java.base/share/classes/sun/security/x509/X509Key.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
@@ -36,7 +36,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.Objects;
 
 import sun.security.util.HexDumpEncoder;
 import sun.security.util.*;
@@ -83,7 +82,8 @@ public X509Key() { }
      * data is stored and transmitted losslessly, but no knowledge
      * about this particular algorithm is available.
      */
-    private X509Key(AlgorithmId algid, BitArray key) {
+    @SuppressWarnings("this-escape")
+    public X509Key(AlgorithmId algid, BitArray key) {
         this.algid = algid;
         setKey(key);
         encode();
@@ -100,7 +100,7 @@ protected void setKey(BitArray key) {
      * Gets the key. The key may or may not be byte aligned.
      * @return a BitArray containing the key.
      */
-    protected BitArray getKey() {
+    public BitArray getKey() {
         return (BitArray)bitStringKey.clone();
     }
 
@@ -129,7 +129,7 @@ public static PublicKey parse(DerValue in) throws IOException
         algorithm = AlgorithmId.parse(in.data.getDerValue());
         try {
             subjectKey = buildX509Key(algorithm,
-                                      in.data.getUnalignedBitString());
+                in.data.getUnalignedBitString());
 
         } catch (InvalidKeyException e) {
             throw new IOException("subject key, " + e.getMessage(), e);
@@ -154,7 +154,7 @@ public static PublicKey parse(DerValue in) throws IOException
      * @exception InvalidKeyException on invalid key encodings.
      */
     protected void parseKeyBits() throws InvalidKeyException {
-        encode();
+        getEncodedInternal();
     }
 
     /*
@@ -243,7 +243,7 @@ public String getAlgorithm() {
     /**
      * Returns the algorithm ID to be used with this key.
      */
-    public AlgorithmId  getAlgorithmId() { return algid; }
+    public AlgorithmId getAlgorithmId() { return algid; }
 
     /**
      * Encode SubjectPublicKeyInfo sequence on the DER output stream.
@@ -260,7 +260,7 @@ public byte[] getEncoded() {
         return getEncodedInternal().clone();
     }
 
-    public byte[] getEncodedInternal() {
+    private byte[] getEncodedInternal() {
         byte[] encoded = encodedKey;
         if (encoded == null) {
             DerOutputStream out = new DerOutputStream();
@@ -314,7 +314,7 @@ public String toString()
      * @param val a DER-encoded X.509 SubjectPublicKeyInfo value
      * @exception InvalidKeyException on parsing errors.
      */
-    void decode(DerValue val) throws InvalidKeyException {
+    public void decode(DerValue val) throws InvalidKeyException {
         try {
             if (val.tag != DerValue.tag_Sequence)
                 throw new InvalidKeyException("invalid key format");
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index b115d479838..b750c1b82b0 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -1549,3 +1549,12 @@ jdk.tls.alpnCharset=ISO_8859_1
 # security property value defined here.
 #
 #jdk.security.krb5.name.case.sensitive=false
+
+#
+# Default algorithm for PEMEncoder Encrypted PKCS#8
+#
+# This property defines the default password-based encryption algorithm for
+# java.security.PEMEncoder when configured for encryption with the
+# withEncryption method.
+#
+jdk.epkcs8.defaultAlgorithm=PBEWithHmacSHA256AndAES_128
\ No newline at end of file
diff --git a/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java b/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
index 71b05b0c225..a8346089db7 100644
--- a/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
+++ b/test/jdk/java/security/KeyFactory/KeyFactoryGetKeySpecForInvalidSpec.java
@@ -1,5 +1,6 @@
 /*
  * Copyright Amazon.com Inc. 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
diff --git a/test/jdk/java/security/PEM/PEMData.java b/test/jdk/java/security/PEM/PEMData.java
new file mode 100644
index 00000000000..e1f32cdbb7c
--- /dev/null
+++ b/test/jdk/java/security/PEM/PEMData.java
@@ -0,0 +1,476 @@
+/*
+ * 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 javax.crypto.EncryptedPrivateKeyInfo;
+import java.security.DEREncodable;
+import java.security.KeyPair;
+import java.security.PEMRecord;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Library class for PEMEncoderTest and PEMDecoderTest
+ */
+class PEMData {
+    public static final Entry ecsecp256 = new Entry("ecsecp256",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkW3Jx561NlEgBnut
+        KwDdi3cNwu7YYD/QtJ+9+AEBdoqhRANCAASL+REY4vvAI9M3gonaml5K3lRgHq5w
+        +OO4oO0VNduC44gUN1nrk7/wdNSpL+xXNEX52Dsff+2RD/fop224ANvB
+        -----END PRIVATE KEY-----
+        """, KeyPair.class);
+
+    public static final Entry rsapriv = new Entry("rsapriv",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOtjMnCzPy4jCeZb
+        OdOvmvU3jl7+cvPFgL5MfqDCM5a8yI0yImg/hzibJJHLk3emUVBSnekgHvCqyGLW
+        3qGR2DuBEaMy0mkg8hfKcSpHLaYjDYaspO27d2qtb6d1qtsPoPjJFjWFYeW6K463
+        OHG654K5/2FcJgQdlLVyp3zCiQU/AgMBAAECgYEAwNkDkTv5rlX8nWLuLJV5kh/T
+        H9a93SRZxw8qy5Bv7bZ7ZNrHP7uUkHbi7iPojKWRhwo43692SdzR0dCSk7LGgN9q
+        CYvndsYR6gifVGBi0WF+St4+NdtcQ3VlNdsojy2BdIx0oC+r7i3bn+zc968O/kI+
+        EgdgrMcjjFqyx6tMHpECQQD8TYPKGHyN7Jdy28llCoUX/sL/yZ2vIi5mnDAFE5ae
+        KZQSkNAXG+8i9Qbs/Wdd5S3oZDqu+6DBn9gib80pYY05AkEA7tY59Oy8ka7nBlGP
+        g6Wo1usF2bKqk8vjko9ioZQay7f86aB10QFcAjCr+cCUm16Lc9DwzWl02nNggRZa
+        Jz8eNwJBAO+1zfLjFOPa14F/JHdlaVKE8EwKCFDuztsapd0M4Vtf8Zk6ERsDpU63
+        Ml9T2zOwnM9g+whpdjDAZ59ATdJ1JrECQQDReJQ2SxeL0lGPCiOLu9RcQp7L81aF
+        79G1bgp8WlAyEjlAkloiqEWRKiz7DDuKFR7Lwhognng9S+n87aS+PS57AkBh75t8
+        6onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8Ob
+        WqcWcoJqfdLEyBT+
+        -----END PRIVATE KEY-----
+        """, RSAPrivateKey.class);
+
+    public static final Entry rsaprivbc = new Entry("rsaprivbc",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOtjMnCzPy4jCeZb
+        OdOvmvU3jl7+cvPFgL5MfqDCM5a8yI0yImg/hzibJJHLk3emUVBSnekgHvCqyGLW
+        3qGR2DuBEaMy0mkg8hfKcSpHLaYjDYaspO27d2qtb6d1qtsPoPjJFjWFYeW6K463
+        OHG654K5/2FcJgQdlLVyp3zCiQU/AgMBAAECgYEAwNkDkTv5rlX8nWLuLJV5kh/T
+        H9a93SRZxw8qy5Bv7bZ7ZNrHP7uUkHbi7iPojKWRhwo43692SdzR0dCSk7LGgN9q
+        CYvndsYR6gifVGBi0WF+St4+NdtcQ3VlNdsojy2BdIx0oC+r7i3bn+zc968O/kI+
+        EgdgrMcjjFqyx6tMHpECQQD8TYPKGHyN7Jdy28llCoUX/sL/yZ2vIi5mnDAFE5ae
+        KZQSkNAXG+8i9Qbs/Wdd5S3oZDqu+6DBn9gib80pYY05AkEA7tY59Oy8ka7nBlGP
+        g6Wo1usF2bKqk8vjko9ioZQay7f86aB10QFcAjCr+cCUm16Lc9DwzWl02nNggRZa
+        Jz8eNwJBAO+1zfLjFOPa14F/JHdlaVKE8EwKCFDuztsapd0M4Vtf8Zk6ERsDpU63
+        Ml9T2zOwnM9g+whpdjDAZ59ATdJ1JrECQQDReJQ2SxeL0lGPCiOLu9RcQp7L81aF
+        79G1bgp8WlAyEjlAkloiqEWRKiz7DDuKFR7Lwhognng9S+n87aS+PS57AkBh75t8
+        6onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8Ob
+        WqcWcoJqfdLEyBT+
+        -----END PRIVATE KEY-----
+        """, RSAPrivateKey.class);
+
+    public static final Entry ec25519priv = new Entry("ed25519priv",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MC4CAQAwBQYDK2VwBCIEIFFZsmD+OKk67Cigc84/2fWtlKsvXWLSoMJ0MHh4jI4I
+        -----END PRIVATE KEY-----
+        """, EdECPrivateKey.class);
+
+    public static final Entry rsapub = new Entry("rsapub",
+        """
+        -----BEGIN PUBLIC KEY-----
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrYzJwsz8uIwnmWznTr5r1N45e
+        /nLzxYC+TH6gwjOWvMiNMiJoP4c4mySRy5N3plFQUp3pIB7wqshi1t6hkdg7gRGj
+        MtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarbD6D4yRY1hWHluiuOtzhxuueCuf9h
+        XCYEHZS1cqd8wokFPwIDAQAB
+        -----END PUBLIC KEY-----
+        """, RSAPublicKey.class);
+
+    public static final Entry rsapubbc = new Entry("rsapubbc",
+        """
+        -----BEGIN PUBLIC KEY-----
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrYzJwsz8uIwnmWznTr5r1N45e
+        /nLzxYC+TH6gwjOWvMiNMiJoP4c4mySRy5N3plFQUp3pIB7wqshi1t6hkdg7gRGj
+        MtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarbD6D4yRY1hWHluiuOtzhxuueCuf9h
+        XCYEHZS1cqd8wokFPwIDAQAB
+        -----END PUBLIC KEY-----
+        """, RSAPublicKey.class);
+
+    public static final Entry ecsecp256pub = new Entry("ecsecp256pub", """
+        -----BEGIN PUBLIC KEY-----
+        MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEi/kRGOL7wCPTN4KJ2ppeSt5UYB6u
+        cPjjuKDtFTXbguOIFDdZ65O/8HTUqS/sVzRF+dg7H3/tkQ/36KdtuADbwQ==
+        -----END PUBLIC KEY-----
+        """, ECPublicKey.class);
+
+    // EC key with explicit parameters -- Not currently supported by SunEC
+    public static final String pubec_explicit = """
+        -----BEGIN PUBLIC KEY-----
+        MIIBSzCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAABAAAA
+        AAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA////
+        ///////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMVAMSd
+        NgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg9KE5
+        RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8AAAAA
+        //////////+85vqtpxeehPO5ysL8YyVRAgEBA0IABIv5ERji+8Aj0zeCidqaXkre
+        VGAernD447ig7RU124LjiBQ3WeuTv/B01Kkv7Fc0RfnYOx9/7ZEP9+inbbgA28E=
+        -----END PUBLIC KEY-----
+        """;
+
+    public static final Entry oasbcpem = new Entry("oasbcpem",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIIDCAIBATANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOtjMnCzPy4jCeZbOdOvmvU3jl7+
+        cvPFgL5MfqDCM5a8yI0yImg/hzibJJHLk3emUVBSnekgHvCqyGLW3qGR2DuBEaMy0mkg8hfKcSpH
+        LaYjDYaspO27d2qtb6d1qtsPoPjJFjWFYeW6K463OHG654K5/2FcJgQdlLVyp3zCiQU/AgMBAAEC
+        gYEAwNkDkTv5rlX8nWLuLJV5kh/TH9a93SRZxw8qy5Bv7bZ7ZNrHP7uUkHbi7iPojKWRhwo43692
+        SdzR0dCSk7LGgN9qCYvndsYR6gifVGBi0WF+St4+NdtcQ3VlNdsojy2BdIx0oC+r7i3bn+zc968O
+        /kI+EgdgrMcjjFqyx6tMHpECQQD8TYPKGHyN7Jdy28llCoUX/sL/yZ2vIi5mnDAFE5aeKZQSkNAX
+        G+8i9Qbs/Wdd5S3oZDqu+6DBn9gib80pYY05AkEA7tY59Oy8ka7nBlGPg6Wo1usF2bKqk8vjko9i
+        oZQay7f86aB10QFcAjCr+cCUm16Lc9DwzWl02nNggRZaJz8eNwJBAO+1zfLjFOPa14F/JHdlaVKE
+        8EwKCFDuztsapd0M4Vtf8Zk6ERsDpU63Ml9T2zOwnM9g+whpdjDAZ59ATdJ1JrECQQDReJQ2SxeL
+        0lGPCiOLu9RcQp7L81aF79G1bgp8WlAyEjlAkloiqEWRKiz7DDuKFR7Lwhognng9S+n87aS+PS57
+        AkBh75t86onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8ObWqcW
+        coJqfdLEyBT+gYGNADCBiQKBgQDrYzJwsz8uIwnmWznTr5r1N45e/nLzxYC+TH6gwjOWvMiNMiJo
+        P4c4mySRy5N3plFQUp3pIB7wqshi1t6hkdg7gRGjMtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarb
+        D6D4yRY1hWHluiuOtzhxuueCuf9hXCYEHZS1cqd8wokFPwIDAQAB
+        -----END PRIVATE KEY-----
+        """, KeyPair.class);
+
+    public static final Entry oasrfc8410 = new Entry("oasrfc8410",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MHICAQEwBQYDK2VwBCIEINTuctv5E1hK1bbY8fdp+K06/nwoy/HU++CXqI9EdVhC
+        oB8wHQYKKoZIhvcNAQkJFDEPDA1DdXJkbGUgQ2hhaXJzgSEAGb9ECWmEzf6FQbrB
+        Z9w7lshQhqowtrbLDFw4rXAxZuE=
+        -----END PRIVATE KEY-----
+        """, KeyPair.class);
+
+    public static final Entry rsaOpenSSL = new Entry("rsaOpenSSL",
+        """
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEowIBAAKCAQEAqozTLan1qFcOCWnS63jXQn5lLyGOKDv3GM11n2zkGGrChayj
+        cSzB2KTlDmN9NgOyFdqGNWbSgdmXR5ToHGHYwaKubJoQIoPQcsipWDI156d3+X/8
+        BxCGY8l5nYwvS4olOXc+2kEjeFF1eamnm9IQ5DHZfaFPl0ri4Yfm1YHBAbt/7HvF
+        3MBjgBj1xSsSFLW4O6ws6guRVGDfKBVyyRNUhRTbSua/nEz0wAjxF2PWT+ZTHS6M
+        0siYwVTuPI4/n4ItoYoahvGb9JskkXP+bc/QZJCTFYdyxF5tKqVMSdYaJTxop02p
+        Jo3oeafVKSlBrr0K731xgNBKqBud44aKT5R96QIDAQABAoIBAQCD9Q/T7gOvayPm
+        LqXOISJURV1emRTXloX5/8Y5QtQ8/CVjrg6Lm3ikefjsKBgR+cwJUpmyqcrIQyXk
+        cZchlqdSMt/IEW/YdKqMlStJnRfOE+ok9lx2ztdcT9+0AWn6hXmFu/i6f9nE1yoQ
+        py6SxnbhSJyhsnTVd1CR9Uep/InsHvYW/15WlVMD1VuCSIt9sefqXwavbAfBaqbn
+        mjwBB/ulsqKhHSuRq/QWqlj+jyGqhhYmTguC1Qwt0woDbThiHtK+suCTAlGBj/A+
+        IZ1U9d+VsHBcWDKBkxmlKWcJAGR3xXiKKy9vfzC+DU7L99kgay80VZarDyXgiy78
+        9xMMzRMBAoGBANoxnZhu1bUFtLqTJ1HfDm6UB+1zVd2Mu4DXYdy/AHjoaCLp05OQ
+        0ZeyhO/eXPT+eGpzCxkWD7465KO/QDfnp54p/NS73jaJVdWQHBhzJx1MymqURy3N
+        JQeW4+ojzwSmVXcrs7Og6EBa4L+PWLpMLW2kODniCY+vp9f5LS6m8UPJAoGBAMgZ
+        4rBw7B9YFZZW/EE4eos4Q7KtA5tEP6wvCq04oxfiSytWXifYX0ToPp0CHhZlWOxk
+        v9a/BDGqM7AxAQJs7mmIvT5AT2V1w7oTbFPnnAo6pQtLcfaxdFFqr0h6t0sXSOKC
+        rQeZAqqFqwuOyP7vT0goGlBruHkwS21NKkzCyzkhAoGAc2JjhbWu+8Cdt0CUPX5o
+        ol9T5eTlFnkSuuqrTNIQzN+SGkxu341o2QDFvhdoLwLW6OwXhVeeUanROSqtKiMu
+        B70Kf/EtbMephXtk8CUNHTh7nmr1TSo8F8xakHoJQts3PQL2T9qal1W3nnWOpU4d
+        g+qg9TMsfTiV2OdjVlVgJskCgYBSnjV1qjojuue22hVvDFW0c7en5z2M9wHfItEi
+        sjbMnrdwnklj5Dd5qPZpNz2a+59ag0Kd9OJTazXKMoF7MeTCGB4ivMTLXHNCudBJ
+        WGCZ7JrGbhEQzTX8g7L5lwlk7KlANLoiX++03lm//OVKNR6j6ULsH33cM6+A4pJr
+        fSYRYQKBgCr9iMTmL0x+n6AmMNecR+MhDxi99Oy0s2EBAYqN9g/8yNgwM4KR0cjz
+        EcgIOtkvoTrJ9Cquvuj+O7/d2yNoH0SZQ4IYJKq47/Z4kKhwXzJnBCCCBKgkjfub
+        RTQSNnSEgTaBD29l7FrhNRHX9lIKFZ23caCTBS6o3q3+KgPbq7ao
+        -----END RSA PRIVATE KEY-----
+        """, RSAPrivateKey.class);
+
+    static final Entry ed25519ep8 = new Entry("ed25519ep8",
+        """
+        -----BEGIN ENCRYPTED PRIVATE KEY-----
+        MIGqMGYGCSqGSIb3DQEFDTBZMDgGCSqGSIb3DQEFDDArBBRyYnoNyrcqvubzch00
+        jyuAb5YizgICEAACARAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEAQIEEM8BgEgO
+        vdMyi46+Dw7cOjwEQLtx5ME0NOOo7vlCGm3H/4j+Tf5UXrMb1UrkPjqc8OiLbC0n
+        IycFtI70ciPjgwDSjtCcPxR8fSxJPrm2yOJsRVo=
+        -----END ENCRYPTED PRIVATE KEY-----
+        """, EdECPrivateKey.class, "fish".toCharArray());
+
+    // This is not meant to be decrypted and to stay as an EKPI
+    static final Entry ed25519ekpi = new Entry("ed25519ekpi",
+        ed25519ep8.pem(), EncryptedPrivateKeyInfo.class, null);
+
+    static final Entry rsaCert = new Entry("rsaCert",
+        """
+        -----BEGIN CERTIFICATE-----
+        MIIErDCCApQCCQD7ndjWbI/x0DANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxQ
+        RU0gVGVzdCBSU0EwIBcNMjQwMTA5MjMzNDIwWhgPMjA1MTA1MjYyMzM0MjBaMBcx
+        FTATBgNVBAMMDFBFTSBUZXN0IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+        AgoCggIBAKgO/Pciro8xn5iNjcVCR4IuXP+V1PNATtKAlMbWzwGVOupKgRcNeRbA
+        N9RlljxSgEChIWs0/DB9VsAw1wCIVeuIVxv0ZvhVAcuD8Yyl58eev1rptsSJhTkN
+        YJFxEPSP2kfWDxS21ltbg1bnY/c1SQbzWawDLJN16G+ICzQXo68UB5fCZV9Ugfgf
+        9USPkCiC6aFt+RT7eQaN/JrjtCm+mFf4VbK7jYW7D8AfjviEY1HQCnPoTjHBxdy+
+        o5s4aIOx1Wuu9wMoGuLXgY3do5/OSDCfByk7rc1drQB9GOKf2gkR8PL9TjK+R3Lq
+        wCA0a3jlCBiGPlH3oeZJrnp7jhAh/tVxbsd7yIdhQnasbiTfhew132AdPXoQE+ic
+        PFoh8MMtG1bdzt8EbvePC3GOjeyIP6f2Ixrh3B6wXzzYmJqBwON+X8TLQolcI1pa
+        Q7AUz5BScy3lO9nyJE/FJkX+Mr6n7WCdudCrQNP+0M845UvkgFyf4FcM7uUVugBm
+        AXy7sCqZgTeLdqHyTElMCoWzBa3MHKyiSCh8GUJH+I1yBY1gG95j3tITIOFvbZrk
+        vDiMwNtV9T6Ta2mb0+38GfKjbI6PF4DVrzB6xc7Q6/GwyhOb86YLOLlEHJfhuc+C
+        Pdy8hQrrulm2jiCO/skvHucABNJ2CENyWa7ljNJkcN6GNTziz4AhAgMBAAEwDQYJ
+        KoZIhvcNAQELBQADggIBAKFQE2AgYgc7/xzwveUAiZ55tfcds07UnazLCOdpz+JJ
+        W4MOt/1Qi9mUylqDEymfNZVLPd2dEjB4wJ57XBUjL+kXkH1SocuskxQPf05iz5zT
+        pEwg2fTmU73ilKMs5Q113nBnL9ZZtlRKCh1Oc5LvLW799uVXnU4UdSpWOBU9ePGY
+        +H1wUKf+e0/BkveQsZERYcamH9O9U/+h+bbhr3GpT1AVnuDRyF28OvRwARDCOVyy
+        ifh+xCR3WCnNcgfwCoH6cE1aXDKHchlAAZtvjc1lLud7/ECIg+15keVfTYk4HEbH
+        j/lprxyH7y99lMmRLQpnTve54RrZGGmg51UD7OmwPHLMGibfQkw6QgdNsggIYD6p
+        L91spgRRB+i4PTovocndOMR2RYgQEelGNqv8MsoUC7oRNxPCHxIEGuUPH1Vf3jnk
+        mTHbVzpjy57UtfcYp1uBFDf8WoWO1Mi6oXRw2YQA1YSMm1+3ftphxydcbRuBlS7O
+        6Iiqk6XlFG9Dpd2jjAQQzJGtnC0QDgGz6/KGp1bGEhRnOWju07eLWvPbyaX5zeSh
+        8gOYV33zkPhziWJt4uFMFIi7N2DLEk5UVZv1KTLZlfPl55DRs7j/Sb4vKHpB17AO
+        meVknxVvifDVY0TIz57t28Accsk6ClBCxNPluPU/8YLGAZJYsdDXjGcndQ13s5G7
+        -----END CERTIFICATE-----
+        """, X509Certificate.class);
+
+    static final Entry ecCert = new Entry("ecCert",
+        """
+        -----BEGIN CERTIFICATE-----
+        MIIBFzCBvgIJAOGVk/ky59ojMAoGCCqGSM49BAMCMBMxETAPBgNVBAMMCFBFTSB0
+        ZXN0MCAXDTI0MDEwOTIzMzEwNloYDzIwNTEwNTI2MjMzMTA2WjATMREwDwYDVQQD
+        DAhQRU0gdGVzdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGYI0jD7JZzw4RYD
+        y9DCfaYNz0CHrpr9gJU5NXe6czvuNBdAOl/lJGQ1pqpEQSQaMDII68obvQyQQyFY
+        lU3G9QAwCgYIKoZIzj0EAwIDSAAwRQIgMwYld7aBzkcRt9mn27YOed5+n0xN1y8Q
+        VEcFjLI/tBYCIQDU3szDZ/PK2mUZwtgQxLqHdh+f1JY0UwQS6M8QUvoDHw==
+        -----END CERTIFICATE-----
+        """, X509Certificate.class);
+
+    // EC cert with explicit parameters -- Not currently supported by SunEC
+    static final String ecCertEX = """
+        -----BEGIN CERTIFICATE-----
+        MIICrDCCAjMCCQDKAlI7uc1CVDAKBggqhkjOPQQDAjATMREwDwYDVQQDDAhQRU0g
+        dGVzdDAgFw0yNDAxMDkyMzIxNTlaGA8yMDUxMDUyNjIzMjE1OVowEzERMA8GA1UE
+        AwwIUEVNIHRlc3QwggHMMIIBZAYHKoZIzj0CATCCAVcCAQEwPAYHKoZIzj0BAQIx
+        AP/////////////////////////////////////////+/////wAAAAAAAAAA////
+        /zB7BDD//////////////////////////////////////////v////8AAAAAAAAA
+        AP////wEMLMxL6fiPufkmI4Fa+P4LRkYHZxu/oFBEgMUCI9QE4daxlY5jYou0Z0q
+        hcjt0+wq7wMVAKM1kmqjGaJ6HQCJamdzpIJ6zaxzBGEEqofKIr6LBTeOscce8yCt
+        dG4dO2KLp5uYWfdB4IJUKjhVAvJdv1UpbDpUXjhydgq3NhfeSpYmLG9dnpi/kpLc
+        Kfj0Hb0omhR86doxE7XwuMAKYLHOHX6BnXpDHXyQ6g5fAjEA////////////////
+        ////////////////x2NNgfQ3Ld9YGg2ySLCneuzsGWrMxSlzAgEBA2IABO+IbTh6
+        WqyzmxdCeJ0uUQ2v2jKxRuCKRyPlYAnpBmmQypsRS+GBdbBa0Mu6MTnVJh5uvqXn
+        q7IuHVEiE3EFKw0DNW30nINuQg6lTv6PgN/4nYBqsl5FQgzk2SYN3bw+7jAKBggq
+        hkjOPQQDAgNnADBkAjATCnbbn3CgPRPi9Nym0hKpBAXc30D4eVB3mz8snK0oKU0+
+        VP3F0EWcyM2QDSZCXIgCMHWknAhIGFTHxqypYUV8eAd3SY7ujZ6EPR0uG//csBWG
+        IqHcgr8slqi35ycQn5yMsQ==
+        -----END CERTIFICATE-----
+        """;
+
+    static final Entry ecsecp384 = new Entry("ecsecp384",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBVS52ZSKZ0oES7twD2
+        GGwRIVu3uHlGIwlu0xzFe7sgIPntca2bHfYMhgGxrlCm0q+hZANiAAQNWgwWfLX8
+        8pYVjvwbfvDF9f+Oa9w6JjrfpWwFAUI6b1OPgrNUh+yXtUXnQNXnfUcIu0Os53bM
+        8fTqPkQl6RyWEDHeXqJK8zTBHMeBq9nLfDPSbzQgLDyC64Orn0D8exM=
+        -----END PRIVATE KEY-----
+        """, KeyPair.class);
+
+    public static final Entry ecCSR = new Entry("ecCSR",
+        """
+        -----BEGIN CERTIFICATE REQUEST-----
+        MIICCTCCAbACAQAwRTELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxFDASBgNV
+        BAcMC1NhbnRhIENsYXJhMREwDwYDVQQDDAhUZXN0IENTUjCCAUswggEDBgcqhkjO
+        PQIBMIH3AgEBMCwGByqGSM49AQECIQD/////AAAAAQAAAAAAAAAAAAAAAP//////
+        /////////zBbBCD/////AAAAAQAAAAAAAAAAAAAAAP///////////////AQgWsY1
+        2Ko6k+ez671VdpiGvGUdBrDMU7D2O848PifSYEsDFQDEnTYIhucEk2pmeOETnSa3
+        gZ9+kARBBGsX0fLhLEJH+Lzm5WOkQPJ3A32BLeszoPShOUXYmMKWT+NC4v4af5uO
+        5+tKfA+eFivOM1drMV7Oy7ZAaDe/UfUCIQD/////AAAAAP//////////vOb6racX
+        noTzucrC/GMlUQIBAQNCAAT3UJgGXD7xMwFSzBnkhsEXz3eJLjIE0HTP1Ax6x7QX
+        G3/+Z/qgOZ6UQCxeHOWMEgF1Ufc/tZkzgbvxWJ6gokeToBUwEwYJKoZIhvcNAQkH
+        MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
+        kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
+        -----END CERTIFICATE REQUEST-----
+        """, PEMRecord.class);
+
+    public static final String preData = "TEXT BLAH TEXT BLAH" +
+        System.lineSeparator();
+    public static final String postData = "FINISHED" + System.lineSeparator();
+
+    public static final Entry ecCSRWithData = new Entry("ecCSRWithData",
+        preData + """
+        -----BEGIN CERTIFICATE REQUEST-----
+        MIICCTCCAbACAQAwRTELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxFDASBgNV
+        BAcMC1NhbnRhIENsYXJhMREwDwYDVQQDDAhUZXN0IENTUjCCAUswggEDBgcqhkjO
+        PQIBMIH3AgEBMCwGByqGSM49AQECIQD/////AAAAAQAAAAAAAAAAAAAAAP//////
+        /////////zBbBCD/////AAAAAQAAAAAAAAAAAAAAAP///////////////AQgWsY1
+        2Ko6k+ez671VdpiGvGUdBrDMU7D2O848PifSYEsDFQDEnTYIhucEk2pmeOETnSa3
+        gZ9+kARBBGsX0fLhLEJH+Lzm5WOkQPJ3A32BLeszoPShOUXYmMKWT+NC4v4af5uO
+        5+tKfA+eFivOM1drMV7Oy7ZAaDe/UfUCIQD/////AAAAAP//////////vOb6racX
+        noTzucrC/GMlUQIBAQNCAAT3UJgGXD7xMwFSzBnkhsEXz3eJLjIE0HTP1Ax6x7QX
+        G3/+Z/qgOZ6UQCxeHOWMEgF1Ufc/tZkzgbvxWJ6gokeToBUwEwYJKoZIhvcNAQkH
+        MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
+        kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
+        -----END CERTIFICATE REQUEST-----
+        """ + postData, PEMRecord.class);
+
+    final static Pattern CR = Pattern.compile("\r");
+    final static Pattern LF = Pattern.compile("\n");
+    final static Pattern LSDEFAULT = Pattern.compile(System.lineSeparator());
+
+
+    public record Entry(String name, String pem, Class clazz, char[] password,
+                        byte[] der) {
+
+        public Entry(String name, String pem, Class clazz, char[] password,
+            byte[] der) {
+            this.name = name;
+            this.pem = pem;
+            this.clazz = clazz;
+            this.password = password;
+            if (pem != null && pem.length() > 0) {
+                String[] pemtext = pem.split("-----");
+                this.der = Base64.getMimeDecoder().decode(pemtext[2]);
+            } else {
+                this.der = null;
+            }
+        }
+        Entry(String name, String pem, Class clazz, char[] password) {
+            this(name, pem, clazz, password, null);
+        }
+
+        Entry(String name, String pem, Class clazz) {
+            this(name, pem, clazz, null, null);
+        }
+
+        public Entry newClass(String name, Class c) {
+            return new Entry(name, pem, c, password);
+        }
+
+        public Entry newClass(Class c) {
+            return newClass(name, c);
+        }
+
+        Entry makeCRLF(String name) {
+            return new Entry(name,
+                Pattern.compile(System.lineSeparator()).matcher(pem).replaceAll("\r\n"),
+                clazz, password());
+        }
+
+        Entry makeCR(String name) {
+            return new Entry(name,
+                Pattern.compile(System.lineSeparator()).matcher(pem).replaceAll("\r"),
+                clazz, password());
+        }
+
+        Entry makeNoCRLF(String name) {
+            return new Entry(name,
+                LF.matcher(CR.matcher(pem).replaceAll("")).
+                    replaceAll(""),
+                clazz, password());
+        }
+    }
+
+    static public Entry getEntry(String varname) {
+        return getEntry(passList, varname);
+    }
+
+    static public Entry getEntry(List<Entry> list, String varname) {
+        for (Entry entry : list) {
+            if (entry.name.compareToIgnoreCase(varname) == 0) {
+                return entry;
+            }
+        }
+        return null;
+    }
+
+    static List<Entry> passList = new ArrayList<>();
+    static List<Entry> entryList = new ArrayList<>();
+    static List<Entry> pubList = new ArrayList<>();
+    static List<Entry> privList = new ArrayList<>();
+    static List<Entry> oasList = new ArrayList<>();
+    static List<Entry> certList = new ArrayList<>();
+    static List<Entry> encryptedList = new ArrayList<>();
+    static List<Entry> failureEntryList = new ArrayList<>();
+
+    static {
+        pubList.add(rsapub);
+        pubList.add(rsapubbc);
+        pubList.add(ecsecp256pub.makeCR("ecsecp256pub-r"));
+        pubList.add(ecsecp256pub.makeCRLF("ecsecp256pub-rn"));
+        privList.add(rsapriv);
+        privList.add(rsaprivbc);
+        privList.add(ecsecp256);
+        privList.add(ecsecp384);
+        privList.add(ec25519priv);
+        privList.add(ed25519ekpi);  // The non-EKPI version needs decryption
+        privList.add(rsaOpenSSL);
+        oasList.add(oasrfc8410);
+        oasList.add(oasbcpem);
+
+        certList.add(rsaCert);
+        certList.add(ecCert);
+
+        entryList.addAll(pubList);
+        entryList.addAll(privList);
+        entryList.addAll(oasList);
+        entryList.addAll(certList);
+
+        encryptedList.add(ed25519ep8);
+
+        passList.addAll(entryList);
+        passList.addAll(encryptedList);
+
+        failureEntryList.add(new Entry("emptyPEM", "", DEREncodable.class, null));
+        failureEntryList.add(new Entry("nullPEM", null, DEREncodable.class, null));
+    }
+
+    static void checkResults(PEMData.Entry entry, String result) {
+        try {
+            checkResults(entry.pem(), result);
+        } catch (AssertionError e) {
+            throw new AssertionError("Encoder PEM mismatch " +
+                entry.name(), e);
+        }
+    }
+
+    static void checkResults(String expected, String result) {
+        // The below matches the \r\n generated PEM with the PEM passed
+        // into the test.
+        String pem = LF.matcher(CR.matcher(expected).replaceAll("")).
+            replaceAll("");
+        result = LF.matcher(CR.matcher(result).replaceAll("")).
+            replaceAll("");
+        try {
+            if (pem.compareTo(result) != 0) {
+                System.out.println("expected:\n" + pem);
+                System.out.println("generated:\n" + result);
+                indexDiff(pem, result);
+            }
+        } catch (AssertionError e) {
+            throw new AssertionError("Encoder PEM mismatch ");
+        }
+    }
+
+    static void indexDiff(String a, String b) {
+        String lenerr = "";
+        int len = a.length();
+        int lenb = b.length();
+        if (len != lenb) {
+            lenerr = ":  Length mismatch: " + len + " vs " + lenb;
+            len = Math.min(len, lenb);
+        }
+        for (int i = 0; i < len; i++) {
+            if (a.charAt(i) != b.charAt(i)) {
+                throw new AssertionError("Char mistmatch, index #" + i +
+                    "  (" + a.charAt(i) + " vs " + b.charAt(i) + ")" + lenerr);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/security/PEM/PEMDecoderTest.java b/test/jdk/java/security/PEM/PEMDecoderTest.java
new file mode 100644
index 00000000000..6486bfc83c7
--- /dev/null
+++ b/test/jdk/java/security/PEM/PEMDecoderTest.java
@@ -0,0 +1,510 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8298420
+ * @modules java.base/sun.security.pkcs
+ *          java.base/sun.security.util
+ * @summary Testing basic PEM API decoding
+ * @enablePreview
+ */
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import java.io.*;
+import java.lang.Class;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.*;
+import java.util.Arrays;
+
+import sun.security.util.Pem;
+
+public class PEMDecoderTest {
+
+    static HexFormat hex = HexFormat.of();
+
+    public static void main(String[] args) throws IOException {
+        System.out.println("Decoder test:");
+        PEMData.entryList.forEach(PEMDecoderTest::test);
+        System.out.println("Decoder test returning DEREncodable class:");
+        PEMData.entryList.forEach(entry -> test(entry, DEREncodable.class));
+        System.out.println("Decoder test with encrypted PEM:");
+        PEMData.encryptedList.forEach(PEMDecoderTest::testEncrypted);
+        System.out.println("Decoder test with OAS:");
+        testTwoKeys();
+        System.out.println("Decoder test RSA PEM setting RSAKey.class returned:");
+        test(PEMData.rsapriv, RSAKey.class);
+        System.out.println("Decoder test failures:");
+        PEMData.failureEntryList.forEach(PEMDecoderTest::testFailure);
+        System.out.println("Decoder test ecsecp256 PEM asking for ECPublicKey.class returned:");
+        testFailure(PEMData.ecsecp256, ECPublicKey.class);
+        System.out.println("Decoder test rsapriv PEM setting P8EKS.class returned:");
+        testClass(PEMData.rsapriv, RSAPrivateKey.class);
+        System.out.println("Decoder test rsaOpenSSL P1 PEM asking for RSAPublicKey.class returned:");
+        testFailure(PEMData.rsaOpenSSL, RSAPublicKey.class);
+        System.out.println("Decoder test rsapub PEM asking X509EKS.class returned:");
+        testClass(PEMData.rsapub, X509EncodedKeySpec.class, true);
+        System.out.println("Decoder test rsapriv PEM asking X509EKS.class returned:");
+        testClass(PEMData.rsapriv, X509EncodedKeySpec.class, false);
+        System.out.println("Decoder test RSAcert PEM asking X509EKS.class returned:");
+        testClass(PEMData.rsaCert, X509EncodedKeySpec.class, false);
+        System.out.println("Decoder test OAS RFC PEM asking PrivateKey.class returned:");
+        testClass(PEMData.oasrfc8410, PrivateKey.class, true);
+        testClass(PEMData.oasrfc8410, PublicKey.class, true);
+        System.out.println("Decoder test ecsecp256:");
+        testFailure(PEMData.ecsecp256pub.makeNoCRLF("pubecpem-no"));
+        System.out.println("Decoder test RSAcert with decryption Decoder:");
+        PEMDecoder d = PEMDecoder.of().withDecryption("123".toCharArray());
+        d.decode(PEMData.rsaCert.pem());
+        System.out.println("Decoder test ecsecp256 private key with decryption Decoder:");
+        ((KeyPair) d.decode(PEMData.ecsecp256.pem())).getPrivate();
+        System.out.println("Decoder test ecsecp256 to P8EKS:");
+        d.decode(PEMData.ecsecp256.pem(), PKCS8EncodedKeySpec.class);
+
+        System.out.println("Checking if decode() returns the same encoding:");
+        PEMData.privList.forEach(PEMDecoderTest::testDERCheck);
+        PEMData.oasList.forEach(PEMDecoderTest::testDERCheck);
+
+        System.out.println("Check a Signature/Verify op is successful:");
+        PEMData.privList.forEach(PEMDecoderTest::testSignature);
+        PEMData.oasList.forEach(PEMDecoderTest::testSignature);
+
+        System.out.println("Checking if ecCSR:");
+        test(PEMData.ecCSR);
+        System.out.println("Checking if ecCSR with preData:");
+        DEREncodable result = PEMDecoder.of().decode(PEMData.ecCSRWithData.pem(), PEMRecord.class);
+        if (result instanceof PEMRecord rec) {
+            if (PEMData.preData.compareTo(new String(rec.leadingData())) != 0) {
+                System.err.println("expected: " + PEMData.preData);
+                System.err.println("received: " + new String(rec.leadingData()));
+                throw new AssertionError("ecCSRWithData preData wrong");
+            }
+            if (rec.pem().lastIndexOf("F") > rec.pem().length() - 5) {
+                System.err.println("received: " + rec.pem());
+                throw new AssertionError("ecCSRWithData: " +
+                    "End of PEM data has an unexpected character");
+            }
+        } else {
+            throw new AssertionError("ecCSRWithData didn't return a PEMRecord");
+        }
+
+        System.out.println("Decoding RSA pub using class PEMRecord:");
+        result = PEMDecoder.of().decode(PEMData.rsapub.pem(), PEMRecord.class);
+        if (!(result instanceof PEMRecord)) {
+            throw new AssertionError("pubecpem didn't return a PEMRecord");
+        }
+        if (((PEMRecord) result).type().compareTo(Pem.PUBLIC_KEY) != 0) {
+            throw new AssertionError("pubecpem PEMRecord didn't decode as a Public Key");
+        }
+
+        testInputStream();
+        testPEMRecord(PEMData.rsapub);
+        testPEMRecord(PEMData.ecCert);
+        testPEMRecord(PEMData.ec25519priv);
+        testPEMRecord(PEMData.ecCSR);
+        testPEMRecord(PEMData.ecCSRWithData);
+        testPEMRecordDecode(PEMData.rsapub);
+        testPEMRecordDecode(PEMData.ecCert);
+        testPEMRecordDecode(PEMData.ec25519priv);
+        testPEMRecordDecode(PEMData.ecCSR);
+        testPEMRecordDecode(PEMData.ecCSRWithData);
+
+        d = PEMDecoder.of();
+        System.out.println("Check leadingData is null with back-to-back PEMs: ");
+        String s = new PEMRecord("ONE", "1212").toString()
+            + new PEMRecord("TWO", "3434").toString();
+        var ins = new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
+        if (d.decode(ins, PEMRecord.class).leadingData() != null) {
+            throw new AssertionError("leading data not null on first pem");
+        }
+        if (d.decode(ins, PEMRecord.class).leadingData() != null) {
+            throw new AssertionError("leading data not null on second pem");
+        }
+        System.out.println("PASS");
+
+        System.out.println("Decode to EncryptedPrivateKeyInfo: ");
+        EncryptedPrivateKeyInfo ekpi =
+            d.decode(PEMData.ed25519ep8.pem(), EncryptedPrivateKeyInfo.class);
+        PrivateKey privateKey;
+        try {
+            privateKey = ekpi.getKey(PEMData.ed25519ep8.password());
+            System.out.println("PASS");
+        } catch (GeneralSecurityException e) {
+            throw new AssertionError("ed25519ep8 error", e);
+        }
+
+        // PBE
+        System.out.println("EncryptedPrivateKeyInfo.encryptKey with PBE: ");
+        ekpi = EncryptedPrivateKeyInfo.encryptKey(privateKey,
+            "password".toCharArray(),"PBEWithMD5AndDES", null, null);
+        try {
+            ekpi.getKey("password".toCharArray());
+            System.out.println("PASS");
+        } catch (Exception e) {
+            throw new AssertionError("error getting key", e);
+        }
+
+        // PBES2
+        System.out.println("EncryptedPrivateKeyInfo.encryptKey with default: ");
+        ekpi = EncryptedPrivateKeyInfo.encryptKey(privateKey
+            , "password".toCharArray());
+        try {
+            ekpi.getKey("password".toCharArray());
+            System.out.println("PASS");
+        } catch (Exception e) {
+            throw new AssertionError("error getting key", e);
+        }
+    }
+
+    static void testInputStream() throws IOException {
+        ByteArrayOutputStream ba = new ByteArrayOutputStream(2048);
+        OutputStreamWriter os = new OutputStreamWriter(ba);
+        os.write(PEMData.preData);
+        os.write(PEMData.rsapub.pem());
+        os.write(PEMData.preData);
+        os.write(PEMData.rsapub.pem());
+        os.write(PEMData.postData);
+        os.flush();
+        ByteArrayInputStream is = new ByteArrayInputStream(ba.toByteArray());
+
+        System.out.println("Decoding 2 RSA pub with pre & post data:");
+        PEMRecord obj;
+        int keys = 0;
+        while (keys++ < 2) {
+            obj = PEMDecoder.of().decode(is, PEMRecord.class);
+            if (!PEMData.preData.equalsIgnoreCase(
+                new String(obj.leadingData()))) {
+                System.out.println("expected: \"" + PEMData.preData + "\"");
+                System.out.println("returned: \"" +
+                    new String(obj.leadingData()) + "\"");
+                throw new AssertionError("Leading data incorrect");
+            }
+            System.out.println("  Read public key.");
+        }
+        try {
+            PEMDecoder.of().decode(is, PEMRecord.class);
+            throw new AssertionError("3rd entry returned a PEMRecord");
+        } catch (EOFException e) {
+            System.out.println("Success: No 3rd entry found.  EOFE thrown.");
+        }
+
+        // End of stream
+        try {
+            System.out.println("Failed: There should be no PEMRecord: " +
+                PEMDecoder.of().decode(is, PEMRecord.class));
+        } catch (EOFException e) {
+            System.out.println("Success");
+            return;
+        } catch (Exception e) {
+            throw new AssertionError("Caught unexpected exception " +
+                "should have been IOE EOF.");
+        }
+
+        throw new AssertionError("Failed");
+    }
+
+    static void testPEMRecord(PEMData.Entry entry) {
+        PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
+        String expected = entry.pem().split("-----")[2].replace(System.lineSeparator(), "");
+        try {
+            PEMData.checkResults(expected, r.pem());
+        } catch (AssertionError e) {
+            System.err.println("expected:\n" + expected);
+            System.err.println("received:\n" + r.pem());
+            throw e;
+        }
+
+        boolean result = switch(r.type()) {
+            case Pem.PRIVATE_KEY ->
+                PrivateKey.class.isAssignableFrom(entry.clazz());
+            case Pem.PUBLIC_KEY ->
+                PublicKey.class.isAssignableFrom(entry.clazz());
+            case Pem.CERTIFICATE, Pem.X509_CERTIFICATE ->
+                entry.clazz().isAssignableFrom(X509Certificate.class);
+            case Pem.X509_CRL ->
+                entry.clazz().isAssignableFrom(X509CRL.class);
+            case "CERTIFICATE REQUEST" ->
+                entry.clazz().isAssignableFrom(PEMRecord.class);
+            default -> false;
+        };
+
+        if (!result) {
+            System.err.println("PEMRecord type is a " + r.type());
+            System.err.println("Entry is a " + entry.clazz().getName());
+            throw new AssertionError("PEMRecord class didn't match:" +
+                entry.name());
+        }
+        System.out.println("Success (" + entry.name() + ")");
+    }
+
+
+    static void testPEMRecordDecode(PEMData.Entry entry) {
+        PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
+        DEREncodable de = PEMDecoder.of().decode(r.toString());
+
+        boolean result = switch(r.type()) {
+            case Pem.PRIVATE_KEY ->
+                PrivateKey.class.isAssignableFrom(de.getClass());
+            case Pem.PUBLIC_KEY ->
+                PublicKey.class.isAssignableFrom(de.getClass());
+            case Pem.CERTIFICATE, Pem.X509_CERTIFICATE ->
+                (de instanceof X509Certificate);
+            case Pem.X509_CRL -> (de instanceof X509CRL);
+            case "CERTIFICATE REQUEST" -> (de instanceof PEMRecord);
+            default -> false;
+        };
+
+        if (!result) {
+            System.err.println("Entry is a " + entry.clazz().getName());
+            System.err.println("PEMRecord type is a " + r.type());
+            System.err.println("Returned was a " + entry.clazz().getName());
+            throw new AssertionError("PEMRecord class didn't match:" +
+                entry.name());
+        }
+        System.out.println("Success (" + entry.name() + ")");
+    }
+
+
+    static void testFailure(PEMData.Entry entry) {
+        testFailure(entry, entry.clazz());
+    }
+
+    static void testFailure(PEMData.Entry entry, Class c) {
+        try {
+            test(entry.pem(), c, PEMDecoder.of());
+            if (entry.pem().indexOf('\r') != -1) {
+                System.out.println("Found a CR.");
+            }
+            if (entry.pem().indexOf('\n') != -1) {
+                System.out.println("Found a LF");
+            }
+            throw new AssertionError("Failure with " +
+                entry.name() + ":  Not supposed to succeed.");
+        } catch (NullPointerException e) {
+            System.out.println("PASS (" + entry.name() + "):  " + e.getClass() +
+                ": " + e.getMessage());
+        } catch (IOException | RuntimeException e) {
+            System.out.println("PASS (" + entry.name() + "):  " + e.getClass() +
+                ": " + e.getMessage());
+        }
+    }
+
+    static DEREncodable testEncrypted(PEMData.Entry entry) {
+        PEMDecoder decoder = PEMDecoder.of();
+        if (!Objects.equals(entry.clazz(), EncryptedPrivateKeyInfo.class)) {
+            decoder = decoder.withDecryption(entry.password());
+        }
+
+        try {
+            return test(entry.pem(), entry.clazz(), decoder);
+        } catch (Exception | AssertionError e) {
+            throw new RuntimeException("Error with PEM (" + entry.name() +
+                "):  " + e.getMessage(), e);
+        }
+    }
+
+    // Change the Entry to use the given class as the expected class returned
+    static DEREncodable test(PEMData.Entry entry, Class c) {
+        return test(entry.newClass(c));
+    }
+
+    // Run test with a given Entry
+    static DEREncodable test(PEMData.Entry entry) {
+        try {
+            DEREncodable r = test(entry.pem(), entry.clazz(), PEMDecoder.of());
+            System.out.println("PASS (" + entry.name() + ")");
+            return r;
+        } catch (Exception | AssertionError e) {
+            throw new RuntimeException("Error with PEM (" + entry.name() +
+                "):  " + e.getMessage(), e);
+        }
+    }
+
+    static List getInterfaceList(Class ccc) {
+        Class<?>[] interfaces = ccc.getInterfaces();
+        List<Class> list = new ArrayList<>(Arrays.asList(interfaces));
+        var x = ccc.getSuperclass();
+        if (x != null) {
+            list.add(x);
+        }
+        List<Class> results = new ArrayList<>(list);
+        if (list.size() > 0) {
+            for (Class cname : list) {
+                try {
+                    if (cname != null &&
+                        cname.getName().startsWith("java.security.")) {
+                        results.addAll(getInterfaceList(cname));
+                    }
+                } catch (Exception e) {
+                    System.err.println("Exception with " + cname);
+                }
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Perform the decoding test with the given decoder, on the given pem, and
+     * expect the clazz to be returned.
+     */
+    static DEREncodable test(String pem, Class clazz, PEMDecoder decoder)
+        throws IOException {
+        DEREncodable pk = decoder.decode(pem);
+
+        // Check that clazz matches what pk returned.
+        if (pk.getClass().equals(clazz)) {
+            return pk;
+        }
+
+        // Search interfaces and inheritance to find a match with clazz
+        List<Class> list = getInterfaceList(pk.getClass());
+        for (Class cc : list) {
+            if (cc != null && cc.equals(clazz)) {
+                return pk;
+            }
+        }
+
+        throw new RuntimeException("Entry did not contain expected: " +
+            clazz.getName());
+    }
+
+    // Run the same key twice through the same decoder and make sure the
+    // result is the same
+    static void testTwoKeys() throws IOException {
+        PublicKey p1, p2;
+        PEMDecoder pd = PEMDecoder.of();
+        p1 = pd.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
+        p2 = pd.decode(PEMData.rsapub.pem(), RSAPublicKey.class);
+        if (!Arrays.equals(p1.getEncoded(), p2.getEncoded())) {
+            System.err.println("These two should have matched:");
+            System.err.println(hex.parseHex(new String(p1.getEncoded())));
+            System.err.println(hex.parseHex(new String(p2.getEncoded())));
+            throw new AssertionError("Two decoding of the same" +
+                " key failed to match: ");
+        }
+    }
+
+    static void testClass(PEMData.Entry entry, Class clazz) throws IOException {
+        var pk = PEMDecoder.of().decode(entry.pem(), clazz);
+    }
+
+    static void testClass(PEMData.Entry entry, Class clazz, boolean pass)
+        throws RuntimeException {
+        try {
+            testClass(entry, clazz);
+        } catch (Exception e) {
+            if (pass) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    // Run test with a given Entry
+    static void testDERCheck(PEMData.Entry entry) {
+        if (entry.name().equals("rsaOpenSSL") ||  // PKCS1 data
+            entry.name().equals("ed25519ekpi")) {
+            return;
+        }
+
+        PKCS8EncodedKeySpec p8 = PEMDecoder.of().decode(entry.pem(),
+                PKCS8EncodedKeySpec.class);
+        int result = Arrays.compare(entry.der(), p8.getEncoded());
+        if (result != 0) {
+            System.err.println("Compare error with " + entry.name() + "(" +
+                result + ")");
+            System.err.println("Expected DER: " + HexFormat.of().
+                formatHex(entry.der()));
+            System.err.println("Returned DER: " + HexFormat.of().
+                formatHex(p8.getEncoded()));
+                throw new AssertionError("Failed to match " +
+                "expected DER");
+        }
+        System.out.println("PASS (" + entry.name() + ")");
+        System.out.flush();
+    }
+
+    /**
+     * Run decoded keys through Signature to make sure they are valid keys
+     */
+    static void testSignature(PEMData.Entry entry) {
+        Signature s;
+        byte[] data = "12345678".getBytes();
+        PrivateKey privateKey;
+
+        DEREncodable d = PEMDecoder.of().decode(entry.pem());
+        switch (d) {
+            case PrivateKey p -> privateKey = p;
+            case KeyPair kp -> privateKey = kp.getPrivate();
+            case EncryptedPrivateKeyInfo e -> {
+                System.out.println("SKIP: EncryptedPrivateKeyInfo " +
+                    entry.name());
+                return;
+            }
+            default -> throw new AssertionError("Private key " +
+                "should not be null");
+        }
+
+        String algorithm = switch(privateKey.getAlgorithm()) {
+            case "EC" -> "SHA256withECDSA";
+            case "EdDSA" -> "EdDSA";
+            case null -> {
+                System.out.println("Algorithm is null " +
+                    entry.name());
+                throw new AssertionError("PrivateKey algorithm" +
+                    "should not be null");
+            }
+            default -> "SHA256with" + privateKey.getAlgorithm();
+        };
+
+        try {
+            if (d instanceof PrivateKey) {
+                s = Signature.getInstance(algorithm);
+                s.initSign(privateKey);
+                s.update(data);
+                s.sign();
+                System.out.println("PASS (Sign): " + entry.name());
+            } else if (d instanceof KeyPair) {
+                s = Signature.getInstance(algorithm);
+                s.initSign(privateKey);
+                s.update(data);
+                byte[] sig = s.sign();
+                s.initVerify(((KeyPair)d).getPublic());
+                s.verify(sig);
+                System.out.println("PASS (Sign/Verify): " + entry.name());
+            } else {
+                System.out.println("SKIP: " + entry.name());
+            }
+        } catch (Exception e) {
+            System.out.println("FAIL: " + entry.name());
+            throw new AssertionError(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/security/PEM/PEMEncoderTest.java b/test/jdk/java/security/PEM/PEMEncoderTest.java
new file mode 100644
index 00000000000..c8b19c313a5
--- /dev/null
+++ b/test/jdk/java/security/PEM/PEMEncoderTest.java
@@ -0,0 +1,199 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8298420
+ * @summary Testing basic PEM API encoding
+ * @enablePreview
+ * @modules java.base/sun.security.util
+ */
+
+import sun.security.util.Pem;
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.spec.PBEParameterSpec;
+
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.spec.InvalidParameterSpecException;
+import java.util.*;
+
+public class PEMEncoderTest {
+
+    static Map<String, DEREncodable> keymap;
+
+    public static void main(String[] args) throws Exception {
+        PEMEncoder encoder = PEMEncoder.of();
+
+        // These entries are removed
+        var newEntryList = new ArrayList<>(PEMData.entryList);
+        newEntryList.remove(PEMData.getEntry("rsaOpenSSL"));
+        newEntryList.remove(PEMData.getEntry("ecsecp256"));
+        newEntryList.remove(PEMData.getEntry("ecsecp384"));
+        keymap = generateObjKeyMap(newEntryList);
+        System.out.println("Same instance re-encode test:");
+        keymap.keySet().stream().forEach(key -> test(key, encoder));
+        System.out.println("New instance re-encode test:");
+        keymap.keySet().stream().forEach(key -> test(key, PEMEncoder.of()));
+        System.out.println("Same instance re-encode testToString:");
+        keymap.keySet().stream().forEach(key -> testToString(key, encoder));
+        System.out.println("New instance re-encode testToString:");
+        keymap.keySet().stream().forEach(key -> testToString(key,
+            PEMEncoder.of()));
+
+        keymap = generateObjKeyMap(PEMData.encryptedList);
+        System.out.println("Same instance Encoder match test:");
+        keymap.keySet().stream().forEach(key -> testEncryptedMatch(key, encoder));
+        System.out.println("Same instance Encoder new withEnc test:");
+        keymap.keySet().stream().forEach(key -> testEncrypted(key, encoder));
+        System.out.println("New instance Encoder and withEnc test:");
+        keymap.keySet().stream().forEach(key -> testEncrypted(key, PEMEncoder.of()));
+        System.out.println("Same instance encrypted Encoder test:");
+        PEMEncoder encEncoder = encoder.withEncryption("fish".toCharArray());
+        keymap.keySet().stream().forEach(key -> testSameEncryptor(key, encEncoder));
+        try {
+            encoder.withEncryption(null);
+        } catch (Exception e) {
+            if (!(e instanceof NullPointerException)) {
+                throw new Exception("Should have been a NullPointerException thrown");
+            }
+        }
+
+        PEMDecoder d = PEMDecoder.of();
+        PEMRecord pemRecord =
+            d.decode(PEMData.ed25519ep8.pem(), PEMRecord.class);
+        PEMData.checkResults(PEMData.ed25519ep8, pemRecord.toString());
+    }
+
+    static Map generateObjKeyMap(List<PEMData.Entry> list) {
+        Map<String, DEREncodable> keymap = new HashMap<>();
+        PEMDecoder pemd = PEMDecoder.of();
+        for (PEMData.Entry entry : list) {
+            try {
+                if (entry.password() != null) {
+                    keymap.put(entry.name(), pemd.withDecryption(
+                        entry.password()).decode(entry.pem()));
+                } else {
+                    keymap.put(entry.name(), pemd.decode(entry.pem(),
+                        entry.clazz()));
+                }
+            } catch (Exception e) {
+                System.err.println("Verify PEMDecoderTest passes before " +
+                    "debugging this test.");
+                throw new AssertionError("Failed to initialize map on" +
+                    " entry \"" + entry.name() + "\"", e);
+            }
+        }
+        return keymap;
+    }
+
+    static void test(String key, PEMEncoder encoder) {
+        byte[] result;
+        PEMData.Entry entry = PEMData.getEntry(key);
+        try {
+            result = encoder.encode(keymap.get(key));
+        } catch (RuntimeException e) {
+            throw new AssertionError("Encoder use failure with " +
+                entry.name(), e);
+        }
+
+        PEMData.checkResults(entry, new String(result, StandardCharsets.UTF_8));
+        System.out.println("PASS: " + entry.name());
+    }
+
+    static void testToString(String key, PEMEncoder encoder) {
+        String result;
+        PEMData.Entry entry = PEMData.getEntry(key);
+        try {
+            result = encoder.encodeToString(keymap.get(key));
+        } catch (RuntimeException e) {
+            throw new AssertionError("Encoder use failure with " +
+                entry.name(), e);
+        }
+
+        PEMData.checkResults(entry, result);
+        System.out.println("PASS: " + entry.name());
+    }
+
+    /*
+     Test cannot verify PEM was the same as known PEM because we have no
+     public access to the AlgoritmID.params and PBES2Parameters.
+     */
+    static void testEncrypted(String key, PEMEncoder encoder) {
+        PEMData.Entry entry = PEMData.getEntry(key);
+        try {
+            encoder.withEncryption(
+                    (entry.password() != null ? entry.password() :
+                        "fish".toCharArray()))
+                .encodeToString(keymap.get(key));
+        } catch (RuntimeException e) {
+            throw new AssertionError("Encrypted encoder failed with " +
+                entry.name(), e);
+        }
+
+        System.out.println("PASS: " + entry.name());
+    }
+
+    /*
+     Test cannot verify PEM was the same as known PEM because we have no
+     public access to the AlgoritmID.params and PBES2Parameters.
+     */
+    static void testSameEncryptor(String key, PEMEncoder encoder) {
+        PEMData.Entry entry = PEMData.getEntry(key);
+        try {
+            encoder.encodeToString(keymap.get(key));
+        } catch (RuntimeException e) {
+            throw new AssertionError("Encrypted encoder failured with " +
+                entry.name(), e);
+        }
+
+        System.out.println("PASS: " + entry.name());
+    }
+
+    static void testEncryptedMatch(String key, PEMEncoder encoder) {
+        String result;
+        PEMData.Entry entry = PEMData.getEntry(key);
+        try {
+            PrivateKey pkey = (PrivateKey) keymap.get(key);
+            EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(entry.pem(),
+                EncryptedPrivateKeyInfo.class);
+            if (entry.password() != null) {
+                EncryptedPrivateKeyInfo.encryptKey(pkey, entry.password(),
+                    Pem.DEFAULT_ALGO, ekpi.getAlgParameters().
+                        getParameterSpec(PBEParameterSpec.class),
+                    null);
+            }
+            result = encoder.encodeToString(ekpi);
+        } catch (RuntimeException | InvalidParameterSpecException e) {
+            throw new AssertionError("Encrypted encoder failure with " +
+                entry.name(), e);
+        }
+
+        PEMData.checkResults(entry, result);
+        System.out.println("PASS: " + entry.name());
+    }
+}
+
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
new file mode 100644
index 00000000000..d1fccd9730a
--- /dev/null
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8298420
+ * @summary Testing encryptKey
+ * @enablePreview
+ */
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.PBEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.AlgorithmParameters;
+import java.security.PEMDecoder;
+import java.security.PrivateKey;
+import java.util.Arrays;
+
+public class EncryptKey {
+
+    private static final String encEdECKey =
+        """
+        -----BEGIN ENCRYPTED PRIVATE KEY-----
+        MIGqMGYGCSqGSIb3DQEFDTBZMDgGCSqGSIb3DQEFDDArBBRyYnoNyrcqvubzch00
+        jyuAb5YizgICEAACARAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEAQIEEM8BgEgO
+        vdMyi46+Dw7cOjwEQLtx5ME0NOOo7vlCGm3H/4j+Tf5UXrMb1UrkPjqc8OiLbC0n
+        IycFtI70ciPjgwDSjtCcPxR8fSxJPrm2yOJsRVo=
+        -----END ENCRYPTED PRIVATE KEY-----
+        """;
+    private static final String passwdText = "fish";
+    private static final char[] password = passwdText.toCharArray();
+    private static final SecretKey key = new SecretKeySpec(
+        passwdText.getBytes(), "PBE");
+
+    public static void main(String[] args) throws Exception {
+        EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(encEdECKey,
+            EncryptedPrivateKeyInfo.class);
+        PrivateKey priKey = PEMDecoder.of().withDecryption(password).
+            decode(encEdECKey, PrivateKey.class);
+        AlgorithmParameters ap = ekpi.getAlgParameters();
+
+        // Test encryptKey(PrivateKey, char[], String, ... )
+        var e = EncryptedPrivateKeyInfo.encryptKey(priKey, password,
+            ekpi.getAlgName(), ap.getParameterSpec(PBEParameterSpec.class),
+            null);
+        if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
+            throw new AssertionError("encryptKey() didn't match" +
+                " with expected.");
+        }
+
+        // Test encryptKey(PrivateKey, Key, String, ...)
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
+            ap.getParameterSpec(PBEParameterSpec.class),null, null);
+        if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
+            throw new AssertionError("encryptKey() didn't match" +
+                " with expected.");
+        }
+    }
+}
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
new file mode 100644
index 00000000000..7c8951b3417
--- /dev/null
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 8298420
+ * @summary Testing getKey
+ * @enablePreview
+ */
+
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.PEMDecoder;
+import java.security.PrivateKey;
+import java.util.Arrays;
+
+public class GetKey {
+
+    private static final String encEdECKey =
+        """
+        -----BEGIN ENCRYPTED PRIVATE KEY-----
+        MIGqMGYGCSqGSIb3DQEFDTBZMDgGCSqGSIb3DQEFDDArBBRyYnoNyrcqvubzch00
+        jyuAb5YizgICEAACARAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEAQIEEM8BgEgO
+        vdMyi46+Dw7cOjwEQLtx5ME0NOOo7vlCGm3H/4j+Tf5UXrMb1UrkPjqc8OiLbC0n
+        IycFtI70ciPjgwDSjtCcPxR8fSxJPrm2yOJsRVo=
+        -----END ENCRYPTED PRIVATE KEY-----
+        """;
+    private static final String passwdText = "fish";
+    private static final char[] password = passwdText.toCharArray();
+    private static final SecretKey key = new SecretKeySpec(
+        passwdText.getBytes(), "PBE");
+
+    public static void main(String[] args) throws Exception {
+        EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(encEdECKey,
+            EncryptedPrivateKeyInfo.class);
+        PrivateKey priKey = PEMDecoder.of().withDecryption(password).
+            decode(encEdECKey, PrivateKey.class);
+
+        // Test getKey(password)
+        if (!Arrays.equals(priKey.getEncoded(),
+            ekpi.getKey(password).getEncoded())) {
+            throw new AssertionError("getKey(char[]) didn't "
+                + "match with expected.");
+        }
+
+        // Test getKey(key, provider)
+        if (!Arrays.equals(priKey.getEncoded(),
+            ekpi.getKey(key, null).getEncoded())) {
+            throw new AssertionError("getKey(key, provider) " +
+                "didn't match with expected.");
+        }
+    }
+}
diff --git a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
index f4ac02c7982..49cca69971f 100644
--- a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
+++ b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.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.
  * 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,22 +30,18 @@
  *          java.base/sun.security.util
  *          java.base/sun.security.provider
  *          java.base/sun.security.x509
- * @compile -XDignore.symbol.file PKCS8Test.java
- * @run testng PKCS8Test
+ * @run main PKCS8Test
  */
 
-import java.io.IOException;
 import java.math.BigInteger;
+import java.security.InvalidKeyException;
 import java.util.Arrays;
 import java.util.HexFormat;
 
 import jdk.test.lib.hexdump.ASN1Formatter;
 import jdk.test.lib.hexdump.HexPrinter;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import sun.security.pkcs.PKCS8Key;
 import sun.security.provider.DSAPrivateKey;
-import sun.security.util.DerValue;
 
 public class PKCS8Test {
 
@@ -62,8 +58,7 @@ public class PKCS8Test {
                     "3009020102020103020104" +  // p=2, q=3, g=4
                 "0403020101");  // PrivateKey OCTET int x = 1
 
-    @Test
-    public void test() throws IOException {
+    public static void main(String[] args) throws Exception {
 
         byte[] encodedKey = new DSAPrivateKey(
                 BigInteger.valueOf(1),
@@ -71,34 +66,45 @@ public void test() throws IOException {
                 BigInteger.valueOf(3),
                 BigInteger.valueOf(4)).getEncoded();
 
-        Assert.assertTrue(Arrays.equals(encodedKey, EXPECTED),
+        if (!Arrays.equals(encodedKey, EXPECTED)) {
+            throw new AssertionError(
                 HexPrinter.simple()
-                        .formatter(ASN1Formatter.formatter())
-                        .toString(encodedKey));
+                    .formatter(ASN1Formatter.formatter())
+                    .toString(encodedKey));
+        }
 
         PKCS8Key decodedKey = (PKCS8Key)PKCS8Key.parseKey(encodedKey);
 
-        Assert.assertEquals(decodedKey.getAlgorithm(), ALGORITHM);
-        Assert.assertEquals(decodedKey.getFormat(), FORMAT);
-        Assert.assertEquals(decodedKey.getAlgorithmId().toString(),
-                EXPECTED_ALG_ID_CHRS);
+        assert(ALGORITHM.equalsIgnoreCase(decodedKey.getAlgorithm()));
+        assert(FORMAT.equalsIgnoreCase(decodedKey.getFormat()));
+        assert(EXPECTED_ALG_ID_CHRS.equalsIgnoreCase(decodedKey.getAlgorithmId().toString()));
 
         byte[] encodedOutput = decodedKey.getEncoded();
-        Assert.assertTrue(Arrays.equals(encodedOutput, EXPECTED),
+        if (!Arrays.equals(encodedOutput, EXPECTED)) {
+
+            throw new AssertionError(
                 HexPrinter.simple()
-                        .formatter(ASN1Formatter.formatter())
-                        .toString(encodedOutput));
+                    .formatter(ASN1Formatter.formatter())
+                    .toString(encodedOutput));
+        }
 
         // Test additional fields
         enlarge(0, "8000");    // attributes
-        enlarge(1, "810100");  // public key for v2
-        enlarge(1, "8000", "810100");  // both
-
-        Assert.assertThrows(() -> enlarge(2));  // bad ver
-        Assert.assertThrows(() -> enlarge(0, "8000", "8000")); // no dup
-        Assert.assertThrows(() -> enlarge(0, "810100")); // no public in v1
-        Assert.assertThrows(() -> enlarge(1, "810100", "8000")); // bad order
-        Assert.assertThrows(() -> enlarge(1, "820100")); // bad tag
+
+        // PKCSv2 testing done by PEMEncoder/PEMDecoder tests
+
+        assertThrows(() -> enlarge(2));
+        assertThrows(() -> enlarge(0, "8000", "8000")); // no dup
+        assertThrows(() -> enlarge(0, "810100")); // no public in v1
+        assertThrows(() -> enlarge(1, "810100", "8000")); // bad order
+        assertThrows(() -> enlarge(1, "820100")); // bad tag
+    }
+
+    private static void assertThrows(Runnable o) {
+        try {
+            o.run();
+            throw new AssertionError("Test failed");
+        } catch (Exception e) {}
     }
 
     /**
@@ -107,7 +113,7 @@ public void test() throws IOException {
      * @param newVersion new version
      * @param fields extra fields to add, in hex
      */
-    static void enlarge(int newVersion, String... fields) throws IOException {
+    static void enlarge(int newVersion, String... fields) {
         byte[] original = EXPECTED.clone();
         int length = original.length;
         for (String field : fields) {   // append fields
@@ -116,9 +122,13 @@ static void enlarge(int newVersion, String... fields) throws IOException {
             System.arraycopy(add, 0, original, length, add.length);
             length += add.length;
         }
-        Assert.assertTrue(length < 127);
-        original[1] = (byte)(length - 2);   // the length field inside DER
-        original[4] = (byte)newVersion;     // the version inside DER
-        PKCS8Key.parseKey(original);
+        assert (length < 127);
+        original[1] = (byte) (length - 2);   // the length field inside DER
+        original[4] = (byte) newVersion;     // the version inside DER
+        try {
+            PKCS8Key.parseKey(original);
+        } catch (InvalidKeyException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

From b7f0f480cefb7295bbd5f8830458b69baf2eaff6 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Wed, 28 May 2025 20:36:44 +0000
Subject: [PATCH 703/901] 8357681: Fixed the DigitList::toString method causing
 incorrect results during debugging

Reviewed-by: jlu, naoto
---
 src/java.base/share/classes/java/text/DigitList.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DigitList.java b/src/java.base/share/classes/java/text/DigitList.java
index f269698d6da..d757f03bb84 100644
--- a/src/java.base/share/classes/java/text/DigitList.java
+++ b/src/java.base/share/classes/java/text/DigitList.java
@@ -784,12 +784,7 @@ public String toString() {
             return "0";
         }
 
-        return getStringBuilder()
-                .append("0.")
-                .append(digits, 0, count)
-                .append("x10^")
-                .append(decimalAt)
-                .toString();
+        return "0." + new String(digits, 0, count) + "x10^" + decimalAt;
     }
 
     private StringBuilder tempBuilder;

From dede3532f7238d527fb89be41f1b8050bde02ee3 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 28 May 2025 22:12:14 +0000
Subject: [PATCH 704/901] 8355798: Implement JEP 514: Ahead-of-Time Command
 Line Ergonomics

Reviewed-by: erikj, kvn, asmehra
---
 doc/testing.html                              |  34 +++
 doc/testing.md                                |  37 ++++
 make/RunTests.gmk                             |  61 ++++--
 src/hotspot/share/cds/cdsConfig.cpp           | 124 +++++++++--
 src/hotspot/share/cds/cdsConfig.hpp           |   5 +
 src/hotspot/share/cds/cds_globals.hpp         |   3 +
 src/hotspot/share/cds/filemap.cpp             |   2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     | 139 +++++++++++-
 src/hotspot/share/cds/metaspaceShared.hpp     |   1 +
 .../classfile/systemDictionaryShared.cpp      |   2 +-
 src/hotspot/share/runtime/arguments.cpp       | 156 +++++++++----
 src/hotspot/share/runtime/arguments.hpp       |  10 +-
 .../share/classes/jdk/internal/misc/CDS.java  |  43 ++++
 src/java.base/share/man/java.md               |  85 +++++--
 test/hotspot/jtreg/TEST.groups                |   2 +
 .../runtime/cds/appcds/UseAppCDS_Test.java    |  30 ---
 .../appcds/aotCache/SpecialCacheNames.java    | 120 ++++++++++
 .../aotClassLinking/MethodHandleTest.java     |   2 +-
 .../aotClassLinking/WeakReferenceTest.java    |   2 +-
 .../cds/appcds/aotCode/AOTCodeFlags.java      |   2 +-
 .../cds/appcds/{ => aotFlags}/AOTFlags.java   | 141 +++++++++++-
 .../appcds/aotFlags/FileNameSubstitution.java | 207 ++++++++++++++++++
 .../appcds/aotFlags/JDK_AOT_VM_OPTIONS.java   | 139 ++++++++++++
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |  97 ++++++--
 test/setup_aot/TestSetupAOT.java              |   7 +-
 25 files changed, 1278 insertions(+), 173 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java
 rename test/hotspot/jtreg/runtime/cds/appcds/{ => aotFlags}/AOTFlags.java (69%)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotFlags/FileNameSubstitution.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotFlags/JDK_AOT_VM_OPTIONS.java

diff --git a/doc/testing.html b/doc/testing.html
index c1c0f15fed9..6288a552bf0 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -72,6 +72,9 @@ <h1 class="title">Testing the JDK</h1>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+<li><a href="#testing-ahead-of-time-optimizations"
+id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
+Optimizations</a></li>
 <li><a href="#testing-with-alternative-security-providers"
 id="toc-testing-with-alternative-security-providers">Testing with
 alternative security providers</a></li>
@@ -596,6 +599,37 @@ <h3 id="pkcs11-tests">PKCS11 Tests</h3>
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
+<h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
+Optimizations</h3>
+<p>One way to improve test coverage of ahead-of-time (AOT) optimizations
+in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
+mode. Example:</p>
+<pre><code>$ make test JTREG=&quot;AOT_JDK=onestep&quot; \
+    TEST=open/test/hotspot/jtreg/runtime/invokedynamic</code></pre>
+<p>In this testing mode, we first perform an AOT training run (see
+https://openjdk.org/jeps/483) of a special test program (<a
+href="http://github.com/test/setup_aot/TestSetupAOT.java">test/setup_aot/TestSetupAOT.java</a>)
+that accesses about 5,0000 classes in the JDK core libraries.
+Optimization artifacts for these classes (such as pre-linked lambda
+expressions, execution profiles, and pre-generated native code) are
+stored into an AOT cache file, which will be used by all the JVMs
+launched by the selected jtreg test cases.</p>
+<p>When the jtreg tests call into the core libraries classes that are in
+the AOT cache, we will be able to test the AOT optimizations that were
+used on those classes.</p>
+<p>Please note that not all existing jtreg test cases can be executed
+with the AOT_JDK mode. See <a
+href="http://github.com/test/hotspot/jtreg/ProblemList-AotJdk.txt">test/hotspot/jtreg/ProblemList-AotJdk.txt</a>
+and <a
+href="http://github.com/test/jdk/ProblemList-AotJdk.txt">test/jdk/ProblemList-AotJdk.txt</a>.</p>
+<p>Also, test cases that were written specifically to test AOT, such as
+the tests under <a
+href="http://github.com/test/hotspot/jtreg/runtime/cds/">test/hotspot/jtreg/runtime/cds</a>,
+cannot be executed with the AOT_JDK mode.</p>
+<p>Valid values for <code>AOT_JDK</code> are <code>onestep</code> and
+<code>twostep</code>. These control how the AOT cache is generated. See
+https://openjdk.org/jeps/514 for details. All other values are
+ignored.</p>
 <h3 id="testing-with-alternative-security-providers">Testing with
 alternative security providers</h3>
 <p>Some security tests use a hardcoded provider for
diff --git a/doc/testing.md b/doc/testing.md
index f6a25457b5e..bb56c05c295 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -611,6 +611,43 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
+### Testing Ahead-of-time Optimizations
+-------------------------------------------------------------------------------
+One way to improve test coverage of ahead-of-time (AOT) optimizations in
+the JDK is to run existing jtreg test cases in a special "AOT_JDK" mode.
+Example:
+
+```
+$ make test JTREG="AOT_JDK=onestep" \
+    TEST=open/test/hotspot/jtreg/runtime/invokedynamic
+```
+
+In this testing mode, we first perform an AOT training run
+(see https://openjdk.org/jeps/483) of a special test program
+([test/setup_aot/TestSetupAOT.java](../test/setup_aot/TestSetupAOT.java))
+that accesses about 5,0000 classes in the JDK core libraries.
+Optimization artifacts for these classes (such as pre-linked
+lambda expressions, execution profiles, and pre-generated native code)
+are stored into an AOT cache file, which will be used by all the JVMs
+launched by the selected jtreg test cases.
+
+When the jtreg tests call into the core libraries classes that are in
+the AOT cache, we will be able to test the AOT optimizations that were
+used on those classes.
+
+Please note that not all existing jtreg test cases can be executed with
+the AOT_JDK mode. See
+[test/hotspot/jtreg/ProblemList-AotJdk.txt](../test/hotspot/jtreg/ProblemList-AotJdk.txt)
+and [test/jdk/ProblemList-AotJdk.txt](../test/jdk/ProblemList-AotJdk.txt).
+
+Also, test cases that were written specifically to test AOT, such as the tests
+under [test/hotspot/jtreg/runtime/cds](../test/hotspot/jtreg/runtime/cds/),
+cannot be executed with the AOT_JDK mode.
+
+Valid values for `AOT_JDK` are `onestep` and `twostep`. These control how
+the AOT cache is generated. See https://openjdk.org/jeps/514 for details.
+All other values are ignored.
+
 ### Testing with alternative security providers
 
 Some security tests use a hardcoded provider for `KeyFactory`, `Cipher`,
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 51c75cc4872..60ae1bd4763 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -725,6 +725,7 @@ endef
 # Parameter 1 is the name of the rule.
 #
 # Remaining parameters are named arguments.
+#   TRAINING    The AOT training mode: onestep or twostep
 #   VM_OPTIONS  List of JVM arguments to use when creating AOT cache
 #
 #  After calling this, the following variables are defined
@@ -753,23 +754,39 @@ define SetupAOTBody
   $$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
 	$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
 
-	$$(call LogWarn, AOT: Create cache configuration) \
-	$$(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:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log -Xlog:cds*=error -Xlog:aot*=error \
-	        -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
-	        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_AOT_JDK_OUTPUT_DIR), ( \
-	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
-	        $$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
-	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
-	        -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
-	))
+        ifeq ($$($1_TRAINING), onestep)
+
+	  $$(call LogWarn, AOT: Create AOT cache $$($1_AOT_JDK_CACHE) in one step with flags: $$($1_VM_OPTIONS)) \
+	  $$(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:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log  -Xlog:cds*=error -Xlog:aot*=error  \
+	          -XX:AOTMode=record -XX:AOTCacheOutput=$$($1_AOT_JDK_CACHE) \
+	          TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
+	  ))
+
+        else
+
+	  $$(call LogWarn, AOT: Create cache configuration) \
+	  $$(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:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error -Xlog:aot*=error \
+	          -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
+	          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_AOT_JDK_OUTPUT_DIR), ( \
+	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
+	          $$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
+	          -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
+	          -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
+	  ))
+
+        endif
 
   $1_AOT_TARGETS += $$($1_AOT_JDK_CACHE)
 
@@ -835,7 +852,7 @@ define SetupRunJtregTestBody
   JTREG_RETRY_COUNT ?= 0
   JTREG_REPEAT_COUNT ?= 0
   JTREG_REPORT ?= files
-  JTREG_AOT_JDK ?= false
+  JTREG_AOT_JDK ?= none
 
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -975,12 +992,12 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifeq ($$(JTREG_AOT_JDK), true)
+  ifneq ($$(filter $$(JTREG_AOT_JDK), onestep twostep), )
     $$(call LogWarn, Add AOT target for $1)
-    $$(eval $$(call SetupAOT, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
-
+    $$(eval $$(call SetupAOT, $1, \
+        TRAINING := $$(JTREG_AOT_JDK), \
+        VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
     $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
-
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
   endif
 
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index c8888fe6bb3..b3c13b63aff 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -49,6 +49,8 @@ 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::_is_single_command_training = false;
+bool CDSConfig::_has_temp_aot_config_file = false;
 bool CDSConfig::_old_cds_flags_used = false;
 bool CDSConfig::_new_aot_flags_used = false;
 bool CDSConfig::_disable_heap_dumping = false;
@@ -398,12 +400,14 @@ void CDSConfig::check_aot_flags() {
     _old_cds_flags_used = true;
   }
 
-  // "New" AOT flags must not be mixed with "classic" flags such as -Xshare:dump
+  // "New" AOT flags must not be mixed with "classic" CDS flags such as -Xshare:dump
   CHECK_NEW_FLAG(AOTCache);
+  CHECK_NEW_FLAG(AOTCacheOutput);
   CHECK_NEW_FLAG(AOTConfiguration);
   CHECK_NEW_FLAG(AOTMode);
 
   CHECK_SINGLE_PATH(AOTCache);
+  CHECK_SINGLE_PATH(AOTCacheOutput);
   CHECK_SINGLE_PATH(AOTConfiguration);
 
   if (FLAG_IS_DEFAULT(AOTCache) && AOTAdapterCaching) {
@@ -413,29 +417,41 @@ void CDSConfig::check_aot_flags() {
     log_debug(aot,codecache,init)("AOTCache is not specified - AOTStubCaching is ignored");
   }
 
-  if (FLAG_IS_DEFAULT(AOTCache) && FLAG_IS_DEFAULT(AOTConfiguration) && FLAG_IS_DEFAULT(AOTMode)) {
-    // AOTCache/AOTConfiguration/AOTMode not used -> using the "classic CDS" workflow.
+  bool has_cache = !FLAG_IS_DEFAULT(AOTCache);
+  bool has_cache_output = !FLAG_IS_DEFAULT(AOTCacheOutput);
+  bool has_config = !FLAG_IS_DEFAULT(AOTConfiguration);
+  bool has_mode = !FLAG_IS_DEFAULT(AOTMode);
+
+  if (!has_cache && !has_cache_output && !has_config && !has_mode) {
+    // AOT flags are not used. Use classic CDS workflow
     return;
-  } else {
-    _new_aot_flags_used = true;
   }
 
+  if (has_cache && has_cache_output) {
+    vm_exit_during_initialization("Only one of AOTCache or AOTCacheOutput can be specified");
+  }
+
+  if (!has_cache && (!has_mode || strcmp(AOTMode, "auto") == 0)) {
+    if (has_cache_output) {
+      // If AOTCacheOutput has been set, effective mode is "record".
+      // Default value for AOTConfiguration, if necessary, will be assigned in check_aotmode_record().
+      log_info(aot)("Selected AOTMode=record because AOTCacheOutput is specified");
+      FLAG_SET_ERGO(AOTMode, "record");
+    }
+  }
+
+  // At least one AOT flag has been used
+  _new_aot_flags_used = true;
+
   if (FLAG_IS_DEFAULT(AOTMode) || strcmp(AOTMode, "auto") == 0 || strcmp(AOTMode, "on") == 0) {
     check_aotmode_auto_or_on();
   } else if (strcmp(AOTMode, "off") == 0) {
     check_aotmode_off();
+  } else if (strcmp(AOTMode, "record") == 0) {
+    check_aotmode_record();
   } else {
-    // AOTMode is record or create
-    if (FLAG_IS_DEFAULT(AOTConfiguration)) {
-      vm_exit_during_initialization(err_msg("-XX:AOTMode=%s cannot be used without setting AOTConfiguration", AOTMode));
-    }
-
-    if (strcmp(AOTMode, "record") == 0) {
-      check_aotmode_record();
-    } else {
-      assert(strcmp(AOTMode, "create") == 0, "checked by AOTModeConstraintFunc");
-      check_aotmode_create();
-    }
+    assert(strcmp(AOTMode, "create") == 0, "checked by AOTModeConstraintFunc");
+    check_aotmode_create();
   }
 
   // This is an old flag used by CDS regression testing only. It doesn't apply
@@ -450,7 +466,8 @@ void CDSConfig::check_aotmode_off() {
 
 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");
+    vm_exit_during_initialization(err_msg("AOTConfiguration can only be used with when AOTMode is record or create (selected AOTMode = %s)",
+                                          FLAG_IS_DEFAULT(AOTMode) ? "auto" : AOTMode));
   }
 
   UseSharedSpaces = true;
@@ -462,11 +479,63 @@ void CDSConfig::check_aotmode_auto_or_on() {
   }
 }
 
+// %p substitution in AOTCache, AOTCacheOutput and AOTCacheConfiguration
+static void substitute_aot_filename(JVMFlagsEnum flag_enum) {
+  JVMFlag* flag = JVMFlag::flag_from_enum(flag_enum);
+  const char* filename = flag->read<const char*>();
+  assert(filename != nullptr, "must not have default value");
+
+  // For simplicity, we don't allow %p/%t to be specified twice, because make_log_name()
+  // substitutes only the first occurrence. Otherwise, if we run with
+  //     java -XX:AOTCacheOutput=%p%p.aot
+ // it will end up with both the pid of the training process and the assembly process.
+  const char* first_p = strstr(filename, "%p");
+  if (first_p != nullptr && strstr(first_p + 2, "%p") != nullptr) {
+    vm_exit_during_initialization(err_msg("%s cannot contain more than one %%p", flag->name()));
+  }
+  const char* first_t = strstr(filename, "%t");
+  if (first_t != nullptr && strstr(first_t + 2, "%t") != nullptr) {
+    vm_exit_during_initialization(err_msg("%s cannot contain more than one %%t", flag->name()));
+  }
+
+  // Note: with single-command training, %p will be the pid of the training process, not the
+  // assembly process.
+  const char* new_filename = make_log_name(filename, nullptr);
+  if (strcmp(filename, new_filename) != 0) {
+    JVMFlag::Error err = JVMFlagAccess::set_ccstr(flag, &new_filename, JVMFlagOrigin::ERGONOMIC);
+    assert(err == JVMFlag::SUCCESS, "must never fail");
+  }
+  FREE_C_HEAP_ARRAY(char, new_filename);
+}
+
 void CDSConfig::check_aotmode_record() {
+  bool has_config = !FLAG_IS_DEFAULT(AOTConfiguration);
+  bool has_output = !FLAG_IS_DEFAULT(AOTCacheOutput);
+
+  if (!has_output && !has_config) {
+      vm_exit_during_initialization("At least one of AOTCacheOutput and AOTConfiguration must be specified when using -XX:AOTMode=record");
+  }
+
+  if (has_output) {
+    _is_single_command_training = true;
+    substitute_aot_filename(FLAG_MEMBER_ENUM(AOTCacheOutput));
+    if (!has_config) {
+      // Too early; can't use resource allocation yet.
+      size_t len = strlen(AOTCacheOutput) + 10;
+      char* temp = AllocateHeap(len, mtArguments);
+      jio_snprintf(temp, len, "%s.config", AOTCacheOutput);
+      FLAG_SET_ERGO(AOTConfiguration, temp);
+      FreeHeap(temp);
+      _has_temp_aot_config_file = true;
+    }
+  }
+
   if (!FLAG_IS_DEFAULT(AOTCache)) {
     vm_exit_during_initialization("AOTCache must not be specified when using -XX:AOTMode=record");
   }
 
+  substitute_aot_filename(FLAG_MEMBER_ENUM(AOTConfiguration));
+
   UseSharedSpaces = false;
   RequireSharedSpaces = false;
   _is_dumping_static_archive = true;
@@ -478,10 +547,27 @@ void CDSConfig::check_aotmode_record() {
 }
 
 void CDSConfig::check_aotmode_create() {
-  if (FLAG_IS_DEFAULT(AOTCache)) {
-    vm_exit_during_initialization("AOTCache must be specified when using -XX:AOTMode=create");
+  if (FLAG_IS_DEFAULT(AOTConfiguration)) {
+    vm_exit_during_initialization("AOTConfiguration must be specified when using -XX:AOTMode=create");
   }
 
+  bool has_cache = !FLAG_IS_DEFAULT(AOTCache);
+  bool has_cache_output = !FLAG_IS_DEFAULT(AOTCacheOutput);
+
+  assert(!(has_cache && has_cache_output), "already checked");
+
+  if (!has_cache && !has_cache_output) {
+    vm_exit_during_initialization("AOTCache or AOTCacheOutput must be specified when using -XX:AOTMode=create");
+  }
+
+  if (!has_cache) {
+    precond(has_cache_output);
+    FLAG_SET_ERGO(AOTCache, AOTCacheOutput);
+  }
+  // No need to check for (!has_cache_output), as we don't look at AOTCacheOutput after here.
+
+  substitute_aot_filename(FLAG_MEMBER_ENUM(AOTCache));
+
   _is_dumping_final_static_archive = true;
   UseSharedSpaces = true;
   RequireSharedSpaces = true;
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index 22378f5c42c..1fd229ff34f 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -41,6 +41,8 @@ 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 _is_single_command_training;
+  static bool _has_temp_aot_config_file;
 
   const static char* _default_archive_path;
   const static char* _input_static_archive_path;
@@ -142,6 +144,9 @@ class CDSConfig : public AllStatic {
   // Misc CDS features
   static bool allow_only_single_java_thread()                NOT_CDS_RETURN_(false);
 
+  static bool is_single_command_training()                   { return CDS_ONLY(_is_single_command_training) NOT_CDS(false); }
+  static bool has_temp_aot_config_file()                     { return CDS_ONLY(_has_temp_aot_config_file) NOT_CDS(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);
 
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index aab5647e0b8..e51dd26ff06 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -119,6 +119,9 @@
           "Cache for improving start up and warm up")                       \
           constraint(AOTCacheConstraintFunc, AtParse)                       \
                                                                             \
+  product(ccstr, AOTCacheOutput, nullptr,                                   \
+          "Specifies the file name for writing the AOT cache")              \
+                                                                            \
   product(bool, AOTInvokeDynamicLinking, false, DIAGNOSTIC,                 \
           "AOT-link JVM_CONSTANT_InvokeDynamic entries in cached "          \
           "ConstantPools")                                                  \
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 7094e1c326d..375a3ccffbc 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -744,7 +744,7 @@ void FileMapInfo::open_as_output() {
     if (CDSConfig::is_dumping_preimage_static_archive()) {
       log_info(aot)("Writing binary AOTConfiguration file: %s",  _full_path);
     } else {
-      log_info(aot)("Writing binary AOTConfiguration file: %s",  _full_path);
+      log_info(aot)("Writing AOTCache file: %s",  _full_path);
     }
   } else {
     aot_log_info(aot)("Dumping shared data to file: %s", _full_path);
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 4e82395dba9..233e64c5e3e 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -72,6 +72,7 @@
 #include "memory/memoryReserver.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceClosure.hpp"
+#include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "nmt/memTracker.hpp"
@@ -828,7 +829,6 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
       // 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);
     } else {
       // The JLI launcher only recognizes the "old" -Xshare:dump flag.
       // When the new -XX:AOTMode=create flag is used, we can't return
@@ -1027,7 +1027,16 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
     CDSConfig::disable_dumping_aot_code();
   }
 
-  if (!write_static_archive(&builder, op.map_info(), op.heap_info())) {
+  bool status = write_static_archive(&builder, op.map_info(), op.heap_info());
+  if (status && CDSConfig::is_dumping_preimage_static_archive()) {
+    tty->print_cr("%s AOTConfiguration recorded: %s",
+                  CDSConfig::has_temp_aot_config_file() ? "Temporary" : "", AOTConfiguration);
+    if (CDSConfig::is_single_command_training()) {
+      fork_and_dump_final_static_archive(CHECK);
+    }
+  }
+
+  if (!status) {
     THROW_MSG(vmSymbols::java_io_IOException(), "Encountered error while dumping");
   }
 }
@@ -1050,6 +1059,132 @@ bool MetaspaceShared::write_static_archive(ArchiveBuilder* builder, FileMapInfo*
   return true;
 }
 
+static void print_java_launcher(outputStream* st) {
+  st->print("%s%sbin%sjava", Arguments::get_java_home(), os::file_separator(), os::file_separator());
+}
+
+static void append_args(GrowableArray<Handle>* args, const char* arg, TRAPS) {
+  Handle string = java_lang_String::create_from_str(arg, CHECK);
+  args->append(string);
+}
+
+// Pass all options in Arguments::jvm_args_array() to a child JVM process
+// using the JAVA_TOOL_OPTIONS environment variable.
+static int exec_jvm_with_java_tool_options(const char* java_launcher_path, TRAPS) {
+  ResourceMark rm(THREAD);
+  HandleMark hm(THREAD);
+  GrowableArray<Handle> args;
+
+  const char* cp = Arguments::get_appclasspath();
+  if (cp != nullptr && strlen(cp) > 0 && strcmp(cp, ".") != 0) {
+    // We cannot use "-cp", because "-cp" is only interpreted by the java launcher,
+    // and is not interpreter by arguments.cpp when it loads args from JAVA_TOOL_OPTIONS
+    stringStream ss;
+    ss.print("-Djava.class.path=");
+    ss.print_raw(cp);
+    append_args(&args, ss.freeze(), CHECK_0);
+    // CDS$ProcessLauncher::execWithJavaToolOptions() must unset CLASSPATH, which has
+    // a higher priority than -Djava.class.path=
+  }
+
+  // Pass all arguments. These include those from JAVA_TOOL_OPTIONS and _JAVA_OPTIONS.
+  for (int i = 0; i < Arguments::num_jvm_args(); i++) {
+    const char* arg = Arguments::jvm_args_array()[i];
+    if (strstr(arg, "-XX:AOTCacheOutput=") == arg || // arg starts with ...
+        strstr(arg, "-XX:AOTConfiguration=") == arg ||
+        strstr(arg, "-XX:AOTMode=") == arg) {
+      // Filter these out. They wiill be set below.
+    } else {
+      append_args(&args, arg, CHECK_0);
+    }
+  }
+
+  // Note: because we are running in AOTMode=record, JDK_AOT_VM_OPTIONS have not been
+  // parsed, so they are not in Arguments::jvm_args_array. If JDK_AOT_VM_OPTIONS is in
+  // the environment, it will be inherited and parsed by the child JVM process
+  // in Arguments::parse_java_tool_options_environment_variable().
+  precond(strcmp(AOTMode, "record") == 0);
+
+  // We don't pass Arguments::jvm_flags_array(), as those will be added by
+  // the child process when it loads .hotspotrc
+
+  {
+    // If AOTCacheOutput contains %p, it should have been already substituted with the
+    // pid of the training process.
+    stringStream ss;
+    ss.print("-XX:AOTCacheOutput=");
+    ss.print_raw(AOTCacheOutput);
+    append_args(&args, ss.freeze(), CHECK_0);
+  }
+  {
+    // If AOTCacheConfiguration contains %p, it should have been already substituted with the
+    // pid of the training process.
+    // If AOTCacheConfiguration was not explicitly specified, it should have been assigned a
+    // temporary file name.
+    stringStream ss;
+    ss.print("-XX:AOTConfiguration=");
+    ss.print_raw(AOTConfiguration);
+    append_args(&args, ss.freeze(), CHECK_0);
+  }
+
+  append_args(&args, "-XX:AOTMode=create", CHECK_0);
+
+  Symbol* klass_name = SymbolTable::new_symbol("jdk/internal/misc/CDS$ProcessLauncher");
+  Klass* k = SystemDictionary::resolve_or_fail(klass_name, true, CHECK_0);
+  Symbol* methodName = SymbolTable::new_symbol("execWithJavaToolOptions");
+  Symbol* methodSignature = SymbolTable::new_symbol("(Ljava/lang/String;[Ljava/lang/String;)I");
+
+  Handle launcher = java_lang_String::create_from_str(java_launcher_path, CHECK_0);
+  objArrayOop array = oopFactory::new_objArray(vmClasses::String_klass(), args.length(), CHECK_0);
+  for (int i = 0; i < args.length(); i++) {
+    array->obj_at_put(i, args.at(i)());
+  }
+  objArrayHandle launcher_args(THREAD, array);
+
+  // The following call will pass all options inside the JAVA_TOOL_OPTIONS env variable to
+  // the child process. It will also clear the _JAVA_OPTIONS and CLASSPATH env variables for
+  // the child process.
+  //
+  // Note: the env variables are set only for the child process. They are not changed
+  // for the current process. See java.lang.ProcessBuilder::environment().
+  JavaValue result(T_OBJECT);
+  JavaCallArguments javacall_args(2);
+  javacall_args.push_oop(launcher);
+  javacall_args.push_oop(launcher_args);
+  JavaCalls::call_static(&result,
+                          InstanceKlass::cast(k),
+                          methodName,
+                          methodSignature,
+                          &javacall_args,
+                          CHECK_0);
+  return result.get_jint();
+}
+
+void MetaspaceShared::fork_and_dump_final_static_archive(TRAPS) {
+  assert(CDSConfig::is_dumping_preimage_static_archive(), "sanity");
+
+  ResourceMark rm;
+  stringStream ss;
+  print_java_launcher(&ss);
+  const char* cmd = ss.freeze();
+  tty->print_cr("Launching child process %s to assemble AOT cache %s using configuration %s", cmd, AOTCacheOutput, AOTConfiguration);
+  int status = exec_jvm_with_java_tool_options(cmd, CHECK);
+  if (status != 0) {
+    log_error(aot)("Child process failed; status = %d", status);
+    // We leave the temp config file for debugging
+  } else if (CDSConfig::has_temp_aot_config_file()) {
+    const char* tmp_config = AOTConfiguration;
+    // On Windows, need WRITE permission to remove the file.
+    WINDOWS_ONLY(chmod(tmp_config, _S_IREAD | _S_IWRITE));
+    status = remove(tmp_config);
+    if (status != 0) {
+      log_error(aot)("Failed to remove temporary AOT configuration file %s", tmp_config);
+    } else {
+      tty->print_cr("Removed temporary AOT configuration file %s", tmp_config);
+    }
+  }
+}
+
 // Returns true if the class's status has changed.
 bool MetaspaceShared::try_link_class(JavaThread* current, InstanceKlass* ik) {
   ExceptionMark em(current);
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 2423141b8fa..130e7fe4484 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -179,6 +179,7 @@ class MetaspaceShared : AllStatic {
 
 private:
   static void read_extra_data(JavaThread* current, const char* filename) NOT_CDS_RETURN;
+  static void fork_and_dump_final_static_archive(TRAPS);
   static bool write_static_archive(ArchiveBuilder* builder, FileMapInfo* map_info, ArchiveHeapInfo* heap_info);
   static FileMapInfo* open_static_archive();
   static FileMapInfo* open_dynamic_archive();
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index c949119d363..8bd09a0d947 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -309,7 +309,7 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
       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.
+      // classes from the preimage. We don't want to get a VerifyError when linking this class.
       return warn_excluded(k, "Unlinked class not supported by AOTConfiguration");
     }
   } else {
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 62fcc65743a..b7ce095b41b 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -136,6 +136,11 @@ static bool xshare_auto_cmd_line = false;
 // True if -Xint/-Xmixed/-Xcomp were specified
 static bool mode_flag_cmd_line = false;
 
+struct VMInitArgsGroup {
+  const JavaVMInitArgs* _args;
+  JVMFlagOrigin _origin;
+};
+
 bool PathString::set_value(const char *value, AllocFailType alloc_failmode) {
   char* new_value = AllocateHeap(strlen(value)+1, mtArguments, alloc_failmode);
   if (new_value == nullptr) {
@@ -1950,12 +1955,7 @@ Arguments::ArgsRange Arguments::parse_memory_size(const char* s,
   return check_memory_size(*long_arg, min_size, max_size);
 }
 
-// Parse JavaVMInitArgs structure
-
-jint Arguments::parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
-                                   const JavaVMInitArgs *java_tool_options_args,
-                                   const JavaVMInitArgs *java_options_args,
-                                   const JavaVMInitArgs *cmd_line_args) {
+jint Arguments::parse_vm_init_args(GrowableArrayCHeap<VMInitArgsGroup, mtArguments>* all_args) {
   // Save default settings for some mode flags
   Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods;
   Arguments::_UseOnStackReplacement    = UseOnStackReplacement;
@@ -1968,30 +1968,12 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
   // Setup flags for mixed which is the default
   set_mode_flags(_mixed);
 
-  // Parse args structure generated from java.base vm options resource
-  jint result = parse_each_vm_init_arg(vm_options_args, JVMFlagOrigin::JIMAGE_RESOURCE);
-  if (result != JNI_OK) {
-    return result;
-  }
-
-  // Parse args structure generated from JAVA_TOOL_OPTIONS environment
-  // variable (if present).
-  result = parse_each_vm_init_arg(java_tool_options_args, JVMFlagOrigin::ENVIRON_VAR);
-  if (result != JNI_OK) {
-    return result;
-  }
-
-  // Parse args structure generated from the command line flags.
-  result = parse_each_vm_init_arg(cmd_line_args, JVMFlagOrigin::COMMAND_LINE);
-  if (result != JNI_OK) {
-    return result;
-  }
-
-  // Parse args structure generated from the _JAVA_OPTIONS environment
-  // variable (if present) (mimics classic VM)
-  result = parse_each_vm_init_arg(java_options_args, JVMFlagOrigin::ENVIRON_VAR);
-  if (result != JNI_OK) {
-    return result;
+  jint result;
+  for (int i = 0; i < all_args->length(); i++) {
+    result = parse_each_vm_init_arg(all_args->at(i)._args, all_args->at(i)._origin);
+    if (result != JNI_OK) {
+      return result;
+    }
   }
 
   // Disable CDS for exploded image
@@ -3093,6 +3075,50 @@ jint Arguments::parse_java_tool_options_environment_variable(ScopedVMInitArgs* a
   return parse_options_environment_variable("JAVA_TOOL_OPTIONS", args);
 }
 
+static JavaVMOption* get_last_aotmode_arg(const JavaVMInitArgs* args) {
+  for (int index = args->nOptions - 1; index >= 0; index--) {
+    JavaVMOption* option = args->options + index;
+    if (strstr(option->optionString, "-XX:AOTMode=") == option->optionString) {
+      return option;
+    }
+  }
+
+  return nullptr;
+}
+
+jint Arguments::parse_jdk_aot_vm_options_environment_variable(GrowableArrayCHeap<VMInitArgsGroup, mtArguments>* all_args,
+                                                            ScopedVMInitArgs* jdk_aot_vm_options_args) {
+  // Don't bother scanning all the args if this env variable is not set
+  if (::getenv("JDK_AOT_VM_OPTIONS") == nullptr) {
+    return JNI_OK;
+  }
+
+  // Scan backwards and find the last occurrence of -XX:AOTMode=xxx, which will decide the value
+  // of AOTMode.
+  JavaVMOption* option = nullptr;
+  for (int i = all_args->length() - 1; i >= 0; i--) {
+    if ((option = get_last_aotmode_arg(all_args->at(i)._args)) != nullptr) {
+      break;
+    }
+  }
+
+  if (option != nullptr) {
+    // We have found the last -XX:AOTMode=xxx. At this point <option> has NOT been parsed yet,
+    // so its value is not reflected inside the global variable AOTMode.
+    if (strcmp(option->optionString, "-XX:AOTMode=create") != 0) {
+      return JNI_OK; // Do not parse JDK_AOT_VM_OPTIONS
+    }
+  } else {
+    // -XX:AOTMode is not specified in any of 4 options_args, let's check AOTMode,
+    // which would have been set inside process_settings_file();
+    if (AOTMode == nullptr || strcmp(AOTMode, "create") != 0) {
+      return JNI_OK; // Do not parse JDK_AOT_VM_OPTIONS
+    }
+  }
+
+  return parse_options_environment_variable("JDK_AOT_VM_OPTIONS", jdk_aot_vm_options_args);
+}
+
 jint Arguments::parse_options_environment_variable(const char* name,
                                                    ScopedVMInitArgs* vm_args) {
   char *buffer = ::getenv(name);
@@ -3471,19 +3497,23 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
   ScopedVMInitArgs initial_vm_options_args("");
   ScopedVMInitArgs initial_java_tool_options_args("env_var='JAVA_TOOL_OPTIONS'");
   ScopedVMInitArgs initial_java_options_args("env_var='_JAVA_OPTIONS'");
+  ScopedVMInitArgs initial_jdk_aot_vm_options_args("env_var='JDK_AOT_VM_OPTIONS'");
 
   // Pointers to current working set of containers
   JavaVMInitArgs* cur_cmd_args;
   JavaVMInitArgs* cur_vm_options_args;
   JavaVMInitArgs* cur_java_options_args;
   JavaVMInitArgs* cur_java_tool_options_args;
+  JavaVMInitArgs* cur_jdk_aot_vm_options_args;
 
   // Containers for modified/expanded options
   ScopedVMInitArgs mod_cmd_args("cmd_line_args");
   ScopedVMInitArgs mod_vm_options_args("vm_options_args");
   ScopedVMInitArgs mod_java_tool_options_args("env_var='JAVA_TOOL_OPTIONS'");
   ScopedVMInitArgs mod_java_options_args("env_var='_JAVA_OPTIONS'");
+  ScopedVMInitArgs mod_jdk_aot_vm_options_args("env_var='_JDK_AOT_VM_OPTIONS'");
 
+  GrowableArrayCHeap<VMInitArgsGroup, mtArguments> all_args;
 
   jint code =
       parse_java_tool_options_environment_variable(&initial_java_tool_options_args);
@@ -3491,6 +3521,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
     return code;
   }
 
+  // Yet another environment variable: _JAVA_OPTIONS. This mimics the classic VM.
+  // This is an undocumented feature.
   code = parse_java_options_environment_variable(&initial_java_options_args);
   if (code != JNI_OK) {
     return code;
@@ -3537,23 +3569,17 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
   const char* flags_file = Arguments::get_jvm_flags_file();
   settings_file_specified = (flags_file != nullptr);
 
-  if (IgnoreUnrecognizedVMOptions) {
-    cur_cmd_args->ignoreUnrecognized = true;
-    cur_java_tool_options_args->ignoreUnrecognized = true;
-    cur_java_options_args->ignoreUnrecognized = true;
-  }
-
-  // Parse specified settings file
+  // Parse specified settings file (s) -- the effects are applied immediately into the JVM global flags.
   if (settings_file_specified) {
     if (!process_settings_file(flags_file, true,
-                               cur_cmd_args->ignoreUnrecognized)) {
+                               IgnoreUnrecognizedVMOptions)) {
       return JNI_EINVAL;
     }
   } else {
 #ifdef ASSERT
     // Parse default .hotspotrc settings file
     if (!process_settings_file(".hotspotrc", false,
-                               cur_cmd_args->ignoreUnrecognized)) {
+                               IgnoreUnrecognizedVMOptions)) {
       return JNI_EINVAL;
     }
 #else
@@ -3564,17 +3590,59 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
 #endif
   }
 
+  // The settings in the args are applied in this order to the the JVM global flags.
+  // For historical reasons, the order is DIFFERENT than the scanning order of
+  // the above expand_vm_options_as_needed() calls.
+  all_args.append({cur_vm_options_args, JVMFlagOrigin::JIMAGE_RESOURCE});
+  all_args.append({cur_java_tool_options_args, JVMFlagOrigin::ENVIRON_VAR});
+  all_args.append({cur_cmd_args, JVMFlagOrigin::COMMAND_LINE});
+  all_args.append({cur_java_options_args, JVMFlagOrigin::ENVIRON_VAR});
+
+  // JDK_AOT_VM_OPTIONS are parsed only if -XX:AOTMode=create has been detected from all
+  // the options that have been gathered above.
+  code = parse_jdk_aot_vm_options_environment_variable(&all_args, &initial_jdk_aot_vm_options_args);
+  if (code != JNI_OK) {
+    return code;
+  }
+  code = expand_vm_options_as_needed(initial_jdk_aot_vm_options_args.get(),
+                                     &mod_jdk_aot_vm_options_args,
+                                     &cur_jdk_aot_vm_options_args);
+  if (code != JNI_OK) {
+    return code;
+  }
+
+  for (int index = 0; index < cur_jdk_aot_vm_options_args->nOptions; index++) {
+    JavaVMOption* option = cur_jdk_aot_vm_options_args->options + index;
+    const char* optionString = option->optionString;
+    if (strstr(optionString, "-XX:AOTMode=") == optionString &&
+        strcmp(optionString, "-XX:AOTMode=create") != 0) {
+      jio_fprintf(defaultStream::error_stream(),
+                  "Option %s cannot be specified in JDK_AOT_VM_OPTIONS\n", optionString);
+      return JNI_ERR;
+    }
+  }
+
+  all_args.append({cur_jdk_aot_vm_options_args, JVMFlagOrigin::ENVIRON_VAR});
+
+  if (IgnoreUnrecognizedVMOptions) {
+    // Note: unrecognized options in cur_vm_options_arg cannot be ignored. They are part of
+    // the JDK so it shouldn't have bad options.
+    cur_cmd_args->ignoreUnrecognized = true;
+    cur_java_tool_options_args->ignoreUnrecognized = true;
+    cur_java_options_args->ignoreUnrecognized = true;
+    cur_jdk_aot_vm_options_args->ignoreUnrecognized = true;
+  }
+
   if (PrintVMOptions) {
+    // For historical reasons, options specified in cur_vm_options_arg and -XX:Flags are not printed.
     print_options(cur_java_tool_options_args);
     print_options(cur_cmd_args);
     print_options(cur_java_options_args);
+    print_options(cur_jdk_aot_vm_options_args);
   }
 
-  // Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
-  jint result = parse_vm_init_args(cur_vm_options_args,
-                                   cur_java_tool_options_args,
-                                   cur_java_options_args,
-                                   cur_cmd_args);
+  // Apply the settings in these args to the JVM global flags.
+  jint result = parse_vm_init_args(&all_args);
 
   if (result != JNI_OK) {
     return result;
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
index 55667df2c59..5eb9601e4c5 100644
--- a/src/hotspot/share/runtime/arguments.hpp
+++ b/src/hotspot/share/runtime/arguments.hpp
@@ -148,6 +148,9 @@ class SystemProperty : public PathString {
 // Helper class for controlling the lifetime of JavaVMInitArgs objects.
 class ScopedVMInitArgs;
 
+struct VMInitArgsGroup;
+template <typename E, MemTag MT> class GrowableArrayCHeap;
+
 class Arguments : AllStatic {
   friend class VMStructs;
   friend class JvmtiExport;
@@ -310,6 +313,8 @@ class Arguments : AllStatic {
   static jint parse_options_environment_variable(const char* name, ScopedVMInitArgs* vm_args);
   static jint parse_java_tool_options_environment_variable(ScopedVMInitArgs* vm_args);
   static jint parse_java_options_environment_variable(ScopedVMInitArgs* vm_args);
+  static jint parse_jdk_aot_vm_options_environment_variable(GrowableArrayCHeap<VMInitArgsGroup, mtArguments>* all_args,
+                                                            ScopedVMInitArgs* jdk_aot_vm_options_args);
   static jint parse_vm_options_file(const char* file_name, ScopedVMInitArgs* vm_args);
   static jint parse_options_buffer(const char* name, char* buffer, const size_t buf_len, ScopedVMInitArgs* vm_args);
   static jint parse_xss(const JavaVMOption* option, const char* tail, intx* out_ThreadStackSize);
@@ -327,10 +332,7 @@ class Arguments : AllStatic {
 
   static bool handle_deprecated_print_gc_flags();
 
-  static jint parse_vm_init_args(const JavaVMInitArgs *vm_options_args,
-                                 const JavaVMInitArgs *java_tool_options_args,
-                                 const JavaVMInitArgs *java_options_args,
-                                 const JavaVMInitArgs *cmd_line_args);
+  static jint parse_vm_init_args(GrowableArrayCHeap<VMInitArgsGroup, mtArguments>* all_args);
   static jint parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin origin);
   static jint finalize_vm_init_args();
   static bool is_bad_option(const JavaVMOption* option, jboolean ignore, const char* option_type);
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 2d8046a75eb..72b8479de9a 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CDS.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CDS.java
@@ -506,4 +506,47 @@ private Class<?> load(String name, String source) throws IOException {
             return defineClass(name, bytes, 0, bytes.length);
         }
     }
+
+    /**
+     * This class is used only by native JVM code to spawn a child JVM process to assemble
+     * the AOT cache. <code>args[]</code> are passed in the <code>JAVA_TOOL_OPTIONS</code>
+     * environment variable.
+     */
+    private static class ProcessLauncher {
+        static int execWithJavaToolOptions(String javaLauncher, String args[]) throws IOException, InterruptedException {
+            ProcessBuilder pb = new ProcessBuilder().inheritIO().command(javaLauncher);
+            StringBuilder sb = new StringBuilder();
+
+            // Encode the args as described in
+            // https://docs.oracle.com/en/java/javase/24/docs/specs/jvmti.html#tooloptions
+            String prefix = "";
+            for (String arg : args) {
+                sb.append(prefix);
+
+                for (int i = 0; i < arg.length(); i++) {
+                    char c = arg.charAt(i);
+                    if (c == '"' || Character.isWhitespace(c)) {
+                        sb.append('\'');
+                        sb.append(c);
+                        sb.append('\'');
+                    } else if (c == '\'') {
+                        sb.append('"');
+                        sb.append(c);
+                        sb.append('"');
+                    } else {
+                        sb.append(c);
+                    }
+                }
+
+                prefix = " ";
+            }
+
+            Map<String, String> env = pb.environment();
+            env.put("JAVA_TOOL_OPTIONS", sb.toString());
+            env.remove("_JAVA_OPTIONS");
+            env.remove("CLASSPATH");
+            Process process = pb.start();
+            return process.waitFor();
+        }
+    }
 }
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 1dba3c6ba54..bb010e6e1c7 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -4000,8 +4000,8 @@ partially or completely disabled, leading to lower performance.
   can be used, but the "archived module graph" feature will be disabled. This can lead to increased
   start-up time.
 
-To diagnose problems with the above options, you can add `-Xlog:cds` to the application's VM
-arguments. For example, if `--add-modules jdk.jconcole` was specified during archive creation
+To diagnose problems with the AOT options, you can add `-Xlog:aot` to the application's VM
+arguments. For example, if `--add-modules jdk.jconsole` was specified during archive creation
 and `--add-modules jdk.incubator.vector` is specified during runtime, the following messages will
 be logged:
 
@@ -4050,31 +4050,66 @@ The deployment of the AOT cache is divided into three phases:
 
 The AOT cache can be used with the following command-line options:
 
-`-XX:AOTCache:=`*cachefile*
+`-XX:AOTCache=`*cachefile*
 :   Specifies the location of the AOT cache. The standard extension for *cachefile* is `.aot`.
-    If `-XX:AOTCache` is specified but `-XX:AOTMode` is not specified,
-    then `AOTMode` will be given the value of `auto`.
+    This option cannot be used together with `-XX:AOTCacheOutput`.
 
-`-XX:AOTConfiguration:=`*configfile*
+    This option is compatible with `AOTMode` settings of `on`, `create`, or `auto` (the default).
+    The *cachefile* is read in AOT modes `on` and `auto`, and is ignored by mode `off`.
+    The *cachefile* is written by AOT mode `create`.  In that case, this option is
+    equivalent to `-XX:AOTCacheOutput=`*cachefile*.
+
+`-XX:AOTCacheOutput=`*cachefile*
+:   Specifies the location of the AOT cache to write. The standard extension for *cachefile* is `.aot`.
+    This option cannot be used together with `-XX:AOTCache`.
+
+    This option is compatible with `AOTMode` settings of `record`, `create`, or `auto` (the default).
+
+`-XX:AOTConfiguration=`*configfile*
 :   Specifies the AOT Configuration file for the JVM to write to or read from.
-    This option can be used only with `-XX:AOTMode=record` and `-XX:AOTMode=create`.
     The standard extension for *configfile* is `.aotconfig`.
 
-`-XX:+AOTMode:=`*mode*
-:   *mode* must be one of the following: `off`, `record`, `create`, `auto`, or `on`.
+    This option is compatible with `AOTMode` settings of `record`, `create`, or `auto` (the default).
+    The *configfile* is read by AOT mode `create`, and written by the other applicable modes.
+    If the AOT mode is `auto`, then `AOTCacheOutput` must also be present.
 
--   `off`: no AOT cache is used.
+`-XX:AOTMode=`*mode*
+:   Specifies the AOT Mode for this run.
+    *mode* must be one of the following: `auto`, `off`, `record`, `create`, or `on`.
 
--   `record`: Execute the application in the Training phase.
-    `-XX:AOTConfiguration=`*configfile* must be specified. The JVM gathers
-     statistical data and stores them into *configfile*.
+-   `auto`: This AOT mode is the default, and takes effect if no `-XX:AOTMode` option
+    is present.  It automatically sets the AOT mode to `record`, `on`, or `off`, as follows:
+     - If `-XX:AOTCacheOutput=`*cachefile* is specified, the AOT mode is changed to `record`
+       (a training run, with a subsequent `create` operation).
+     - Otherwise, if an AOT cache can be loaded, the AOT mode is changed to `on` (a production run).
+     - Otherwise, the AOT mode is changed to `off` (a production run with no AOT cache).
 
--   `create`: Perform the Assembly phase. `-XX:AOTConfiguration=`*configfile*
-     and `-XX:AOTCache=`*cachefile*  must be specified. The JVM reads the statistical
-     data from *configfile* and writes the optimization artifacts into *cachefile*.
+-   `off`: No AOT cache is used.
+    Other AOT command line options are ignored.
+
+-   `record`: Execute the application in the training phase.
+     At least one of `-XX:AOTConfiguration=`*configfile* and/or
+     `-XX:AOTCacheOutput=`*cachefile* must be specified.
+     If `-XX:AOTConfiguration=`*configfile* is specified, the JVM gathers
+     statistical data and stores them into *configfile*.
+     If `-XX:AOTConfiguration=`*configfile* is not specified, the JVM uses
+     a temporary file name, which may be the string `AOTCacheOutput+".config"`,
+     or else a fresh implementation-dependent temporary file name.
+     If `-XX:AOTCacheOutput=`*cachefile* is specified, a second JVM process is launched
+     to perform the Assembly phase to write the optimization artifacts into *cachefile*.
+
+     Extra JVM options can be passed to the second JVM process using the environment
+     variable `JDK_AOT_VM_OPTIONS`, with the same format as the environment variable
+     `JAVA_TOOL_OPTIONS`, which is
+     [defined by JVMTI](https://docs.oracle.com/en/java/javase/24/docs/specs/jvmti.html#tooloptions).
+
+-   `create`: Perform the Assembly phase. `-XX:AOTConfiguration=`*configfile* must be
+     specified.
+     The JVM reads history and statistics
+     from *configfile* and writes the optimization artifacts into *cachefile*.
      Note that the application itself is not executed in this phase.
 
--   `auto` or `on`: These modes should be used in the Production phase.
+-   `on`: Execute the application in the Production phase.
      If `-XX:AOTCache=`*cachefile* is specified, the JVM tries to
      load *cachefile* as the AOT cache. Otherwise, the JVM tries to load
      a *default CDS archive* from the JDK installation directory as the AOT cache.
@@ -4091,14 +4126,14 @@ The AOT cache can be used with the following command-line options:
        Since the AOT cache is an optimization feature, there's no guarantee that it will be
        compatible with all possible JVM options. See [JEP 483](https://openjdk.org/jeps/483),
        section **Consistency of training and subsequent runs** for a representative
-       list of scenarios that may be incompatible with the AOT cache for JDK 24.
+       list of scenarios that may be incompatible with the AOT cache.
 
        These scenarios usually involve arbitrary modification of classes for diagnostic
        purposes and are typically not relevant for production environments.
 
      When the AOT cache fails to load:
 
-     - If `AOTMode` is `auto`, the JVM will continue execution without using the
+     - If `AOTMode` was originally `auto`, the JVM will continue execution without using the
        AOT cache. This is the recommended mode for production environments, especially
        when you may not have complete control of the command-line (e.g., your
        application's launch script may allow users to inject options to the command-line).
@@ -4108,7 +4143,7 @@ The AOT cache can be used with the following command-line options:
      - If `AOTMode` is `on`, the JVM will print an error message and exit immediately. This
        mode should be used only as a "fail-fast" debugging aid to check if your command-line
        options are compatible with the AOT cache. An alternative is to run your application with
-       `-XX:AOTMode=auto -Xlog:cds` to see if the AOT cache can be used or not.
+       `-XX:AOTMode=auto -Xlog:aot` to see if the AOT cache can be used or not.
 
 `-XX:+AOTClassLinking`
 :   If this option is enabled, the JVM will perform more advanced optimizations (such
@@ -4125,6 +4160,16 @@ The AOT cache can be used with the following command-line options:
     When `-XX:AOTMode` *is not used* in the command-line,  `AOTClassLinking` is disabled by
     default to provide full compatibility with traditional CDS options such as `-Xshare:dump.
 
+The first occurrence of the special sequence `%p` in `*configfile* and `*cachefile* is replaced
+with the process ID of the JVM process launched in the command-line, and likewise the
+first occurrence of `%t` is replace by the JVM's startup timestamp.
+(After replacement there must be no further occurrences of `%p` or `%t`, to prevent
+problems with sub-processes.)  For example:
+
+>   `java -XX:AOTConfiguration=foo%p.aotconfig -XX:AOTCacheOutput=foo%p.aot -cp foo.jar Foo`
+
+will create two files: `foopid123.aotconfig` and `foopid123.aot`, where `123` is the
+process ID of the JVM that has executed the application `Foo`.
 
 ## Performance Tuning Examples
 
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index 4e1d7601191..2fa0862a186 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -416,6 +416,7 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
  -runtime/cds/appcds/aotCode \
+ -runtime/cds/appcds/aotFlags \
  -runtime/cds/appcds/applications \
  -runtime/cds/appcds/cacheObject \
  -runtime/cds/appcds/complexURI \
@@ -517,6 +518,7 @@ hotspot_aot_classlinking = \
  -runtime/cds/appcds/aotCache \
  -runtime/cds/appcds/aotClassLinking \
  -runtime/cds/appcds/aotCode \
+ -runtime/cds/appcds/aotFlags \
  -runtime/cds/appcds/BadBSM.java \
  -runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java \
  -runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java \
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java b/test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java
deleted file mode 100644
index 8a35ff52450..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/UseAppCDS_Test.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-public class UseAppCDS_Test {
-    // args are from UseAppCDS:
-    // args[0] = TEST_OUT
-    public static void main(String[] args) {
-        System.out.println(args[0]);
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java
new file mode 100644
index 00000000000..89aa9e441a4
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java
@@ -0,0 +1,120 @@
+/*
+ * 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 Use special characters in the name of the cache file specified by -XX:AOTCacheOutput
+ *          Make sure these characters are passed to the child JVM process that assembles the cache.
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build SpecialCacheNames
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp
+ * @run driver SpecialCacheNames AOT --one-step-training
+ */
+
+import java.io.File;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class SpecialCacheNames {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "MyTestApp";
+
+    public static void main(String[] args) throws Exception {
+        test("with spaces", args);
+        test("single'quote", args);
+        if (!Platform.isWindows()) {
+            // This seems to be a limitation of ProcessBuilder on Windows that has problem passing
+            // double quote or unicode characters to a child process. As a result, we can't
+            // even pass these parameters to the training run JVM.
+            test("double\"quote", args);
+            test("unicode\u202fspace", args); // Narrow No-Break Space
+            test("unicode\u6587", args); // CJK unifed ideographs "wen" = "script"
+        }
+    }
+
+    static void test(String name, String[] args) throws Exception {
+        String archiveName = name + (args[0].equals("LEYDEN") ? ".cds" : ".aot");
+
+        System.out.println("============================= Testing with AOT cache name: {{" + archiveName + "}}");
+        new Tester(name, archiveName).run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        String archiveName;
+        public Tester(String name, String archiveName) {
+            super(name);
+            this.archiveName = archiveName;
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            // A space character in a training run vmarg should not break this vmarg into two.
+            return new String[] { "-Dmy.test.prop=space -XX:FooBar" };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (runMode.isProductionRun()) {
+                File f = new File(archiveName);
+                if (f.exists()) {
+                    System.out.println("Found Archive {{" + archiveName + "}}");
+                } else {
+                    throw new RuntimeException("Archive {{" + archiveName + "}} does not exist");
+                }
+            }
+
+            if (runMode.isApplicationExecuted()) {
+                out.shouldContain("Hello World");
+            }
+        }
+    }
+}
+
+class MyTestApp {
+    public static void main(String args[]) {
+        String s = System.getProperty("my.test.prop");
+        if (!"space -XX:FooBar".equals(s)) {
+            throw new RuntimeException("Expected \"space -XX:FooBar\" but got \"" + s + "\"");
+        }
+
+        System.out.println("Hello World");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
index 6bef9e12e95..f7a26a39db1 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
@@ -35,7 +35,7 @@
  *             MethodHandleTestApp MethodHandleTestApp$A MethodHandleTestApp$B
  *             UnsupportedBSMs UnsupportedBSMs$MyEnum
  *             ObjectMethodsTest ObjectMethodsTest$C
- * @run driver MethodHandleTest AOT
+ * @run driver MethodHandleTest AOT --two-step-training
  */
 
 import java.io.Serializable;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
index e7360a6877c..ae5cd5b3429 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/WeakReferenceTest.java
@@ -34,7 +34,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar weakref.jar
  *             WeakReferenceTestApp WeakReferenceTestApp$Inner ShouldNotBeAOTInited ShouldNotBeArchived SharedQueue
  *             WeakReferenceTestBadApp1 WeakReferenceTestBadApp2
- * @run driver WeakReferenceTest AOT
+ * @run driver WeakReferenceTest AOT --two-step-training
  */
 
 import java.lang.ref.WeakReference;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
index 0e70638b8d4..761c2c5382d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
@@ -53,7 +53,7 @@ public static void main(String... args) throws Exception {
         // Run only 2 modes (0 - no AOT code, 1 - AOT adapters) until JDK-8357398 is fixed
         for (int mode = 0; mode < 2; mode++) {
             t.setTestMode(mode);
-            t.run(new String[] {"AOT"});
+            t.run(new String[] {"AOT", "--two-step-training"});
         }
     }
     static class Tester extends CDSAppTester {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/AOTFlags.java
similarity index 69%
rename from test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
rename to test/hotspot/jtreg/runtime/cds/appcds/aotFlags/AOTFlags.java
index b760b288808..44957f5d2ed 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/AOTFlags.java
@@ -156,6 +156,107 @@ static void positiveTests() throws Exception {
         out.shouldContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Training run with -XX:-AOTClassLinking, but assembly run with -XX:+AOTClassLinking");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:-AOTClassLinking",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldHaveExitValue(0);
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:+AOTClassLinking",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar);
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        out.shouldContain("Writing AOTCache file:");
+        out.shouldMatch("aot.*hello[.]aot");
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("One step training run (JEP-514");
+
+        // Set all AOTMode/AOTCacheOutput/AOTConfiguration
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldHaveExitValue(0);
+
+        // Set AOTCacheOutput/AOTConfiguration only; Ergo for: AOTMode=record
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldHaveExitValue(0);
+
+        // Set AOTCacheOutput/AOTConfiguration/AOTMode=auto; Ergo changes: AOTMode=record
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=auto",
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldHaveExitValue(0);
+
+        // Set AOTCacheOutput only; Ergo for: AOTMode=record, AOTConfiguration=<temp>
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("Temporary AOTConfiguration recorded: " + aotCacheFile + ".config");
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldHaveExitValue(0);
+
+        // Set AOTCacheOutput/AOTMode=auto only; Ergo for: AOTMode=record, AOTConfiguration=<temp>
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=auto",
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("Temporary AOTConfiguration recorded: " + aotCacheFile + ".config");
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldHaveExitValue(0);
+
+        // Quoating of space characters in child JVM process
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-Dmy.prop=My string -Xshare:off here", // -Xshare:off should not be treated as a single VM opt for the child JVM
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldMatch("Picked up JAVA_TOOL_OPTIONS:.* -Dmy.prop=My' 'string' '-Xshare:off' 'here");
+        out.shouldHaveExitValue(0);
     }
 
     static void negativeTests() throws Exception {
@@ -183,30 +284,41 @@ static void negativeTests() throws Exception {
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
-        printTestCase("Use AOTConfiguration without AOTMode");
+        printTestCase("Use AOTConfiguration without AOTMode/AOTCacheOutput");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTConfiguration=" + aotConfigFile,
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "neg");
-        out.shouldContain("AOTConfiguration can only be used with -XX:AOTMode=record or -XX:AOTMode=create");
+        out.shouldContain("AOTConfiguration can only be used with when AOTMode is record or create (selected AOTMode = auto)");
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
-        printTestCase("Use AOTMode without AOTConfiguration");
+        printTestCase("Use AOTConfiguration with AOTMode=on");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=on",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("AOTConfiguration can only be used with when AOTMode is record or create (selected AOTMode = on)");
+        out.shouldNotHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Use AOTMode without AOTCacheOutput or AOTConfiguration");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=record",
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "neg");
-        out.shouldContain("-XX:AOTMode=record cannot be used without setting AOTConfiguration");
+        out.shouldContain("At least one of AOTCacheOutput and AOTConfiguration must be specified when using -XX:AOTMode=record");
 
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=create",
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "neg");
-        out.shouldContain("-XX:AOTMode=create cannot be used without setting AOTConfiguration");
+        out.shouldContain("AOTConfiguration must be specified when using -XX:AOTMode=create");
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -232,14 +344,27 @@ static void negativeTests() throws Exception {
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
-        printTestCase("AOTCache not specified with -XX:AOTMode=create");
+        printTestCase("AOTCache/AOTCacheOutput not specified with -XX:AOTMode=create");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("AOTCache or AOTCacheOutput must be specified when using -XX:AOTMode=create");
+        out.shouldNotHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("AOTCache and AOTCacheOutput have different values");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=create",
             "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=aaa",
+            "-XX:AOTCacheOutput=aaa",
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "neg");
-        out.shouldContain("AOTCache must be specified when using -XX:AOTMode=create");
+        out.shouldContain("Only one of AOTCache or AOTCacheOutput can be specified");
         out.shouldNotHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -372,7 +497,7 @@ static void testEmptyValue(String option) throws Exception {
 
     static int testNum = 0;
     static void printTestCase(String s) {
-        System.out.println("vvvvvvv TEST CASE " + testNum + ": " + s + " starts here vvvvvvv");
+        System.out.println("vvvvvvv TEST CASE " + testNum + ": " + s + ": starts here vvvvvvv");
         testNum++;
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/FileNameSubstitution.java b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/FileNameSubstitution.java
new file mode 100644
index 00000000000..23b82b124d9
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/FileNameSubstitution.java
@@ -0,0 +1,207 @@
+/*
+ * 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 substitution of %p/%t in AOTCache/AOTCacheOutput/AOTConfiguration
+ * @requires vm.cds
+ * @requires vm.flagless
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build Hello
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello
+ * @run driver FileNameSubstitution
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class FileNameSubstitution {
+    static String appJar = ClassFileInstaller.getJarPath("hello.jar");
+    static String helloClass = "Hello";
+
+    public static void main(String[] args) throws Exception {
+        positiveTests();
+        negativeTests();
+    }
+
+    static void positiveTests() throws Exception {
+        ProcessBuilder pb;
+        OutputAnalyzer out;
+        String aotCacheFile;
+        String aotConfigFile;
+
+        //----------------------------------------------------------------------
+        printTestCase("AOTConfiguration (two-command training)");
+        removeOutputFiles();
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=test-%p.aotconfig",
+            "-Xlog:os",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("Hello World");
+        aotConfigFile = find_pid_substituted_file(out, "test-", ".aotconfig");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldHaveExitValue(0);
+
+        // "create" with AOTCache
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=test-%p.aot",
+            "-Xlog:os",
+            "-cp", appJar);
+
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        aotCacheFile = find_pid_substituted_file(out, "test-", ".aot");
+        out.shouldContain("AOTCache creation is complete: " + aotCacheFile);
+        out.shouldHaveExitValue(0);
+
+        // "create" with AOTCacheOutput
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCacheOutput=test-%p.aot",
+            "-Xlog:os",
+            "-cp", appJar);
+
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        aotCacheFile = find_pid_substituted_file(out, "test-", ".aot");
+        out.shouldContain("AOTCache creation is complete: " + aotCacheFile);
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("AOTConfiguration/AOTCache (single-command training)");
+        removeOutputFiles();
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=test-%p.aotconfig",
+            "-XX:AOTCacheOutput=test-%p.aot",
+            "-Xlog:os",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("Hello World");
+        aotConfigFile = find_pid_substituted_file(out, "test-", ".aotconfig");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        aotCacheFile = find_pid_substituted_file(out, "test-", ".aot");
+        out.shouldContain("AOTCache creation is complete: " + aotCacheFile);
+        out.shouldHaveExitValue(0);
+
+
+        // The implementation of %t is exactly the same as %p, so just test one case
+        //----------------------------------------------------------------------
+        printTestCase("AOTConfiguration (two-command training) -- %t");
+        removeOutputFiles();
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=test-%t.aotconfig",
+            "-Xlog:os",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: test-20"); // This should work for the nest 70 years or so ...
+        out.shouldHaveExitValue(0);
+    }
+
+    static void negativeTests() throws Exception {
+        ProcessBuilder pb;
+        OutputAnalyzer out;
+
+        //----------------------------------------------------------------------
+        printTestCase("Cannot use %p twice");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=test-%p%p.aotconfig",
+            "-Xlog:os",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("AOTConfiguration cannot contain more than one %p");
+        out.shouldHaveExitValue(1);
+
+        //----------------------------------------------------------------------
+        printTestCase("Cannot use %t twice");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=test-%t%t.aotconfig",
+            "-Xlog:os",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("AOTConfiguration cannot contain more than one %t");
+        out.shouldHaveExitValue(1);
+    }
+
+    static void removeOutputFiles() {
+        removeOutputFiles(".aot");
+        removeOutputFiles(".aotconfig");
+    }
+
+    static void removeOutputFiles(String suffix) {
+        File dir = new File(".");
+        for (File f : dir.listFiles()) {
+            if (f.getName().endsWith(suffix)) {
+                f.delete();
+            }
+        }
+    }
+
+    static String find_pid_substituted_file(OutputAnalyzer out, String prefix, String suffix) {
+        String stdout = out.getStdout();
+        Pattern pattern = Pattern.compile("Initialized VM with process ID ([0-9]+)");
+        Matcher matcher = pattern.matcher(stdout);
+
+        if (!matcher.find()) {
+            throw new RuntimeException("Cannot find pid");
+        }
+        // For single-command training, pid will be from -Xlog of the first process (the training process).
+        // %p should not be substituted with the pid of the second process (the assembly process).
+        String pid = matcher.group(1);
+        String fileName = prefix + "pid" + pid + suffix;
+        File file = new File(fileName);
+        if (!file.exists()) {
+            throw new RuntimeException("Expected file doesn't exist: " + fileName);
+        }
+        if (!file.isFile()) {
+            throw new RuntimeException("Expected to be a file: " + fileName);
+        }
+        return fileName;
+    }
+
+    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/aotFlags/JDK_AOT_VM_OPTIONS.java b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/JDK_AOT_VM_OPTIONS.java
new file mode 100644
index 00000000000..e7ac72b4d38
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotFlags/JDK_AOT_VM_OPTIONS.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
+ * @summary JDK_AOT_VM_OPTIONS environment variable
+ * @requires vm.cds
+ * @requires vm.flagless
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build Hello
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello
+ * @run driver JDK_AOT_VM_OPTIONS
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class JDK_AOT_VM_OPTIONS {
+    static String appJar = ClassFileInstaller.getJarPath("hello.jar");
+    static String aotConfigFile = "hello.aotconfig";
+    static String aotCacheFile = "hello.aot";
+    static String helloClass = "Hello";
+
+    public static void main(String[] args) throws Exception {
+        ProcessBuilder pb;
+        OutputAnalyzer out;
+
+        //----------------------------------------------------------------------
+        printTestCase("JDK_AOT_VM_OPTIONS (single-command training)");
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTCacheOutput=" + aotCacheFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+        // The "-Xshare:off" below should be treated as part of a property value and not
+        // a VM option by itself
+        pb.environment().put("JDK_AOT_VM_OPTIONS", "-Dsome.option='foo -Xshare:off ' -Xmx512m -XX:-AOTClassLinking");
+        out = CDSTestUtils.executeAndLog(pb, "ontstep-train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTCache creation is complete: hello.aot");
+        out.shouldContain("Picked up JDK_AOT_VM_OPTIONS: -Dsome.option='foo -Xshare:off '");
+        checkAOTClassLinkingDisabled(out);
+
+        //----------------------------------------------------------------------
+        printTestCase("JDK_AOT_VM_OPTIONS (two-command training)");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:aot=debug",
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
+        out.shouldHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot",
+            "-cp", appJar);
+        pb.environment().put("JDK_AOT_VM_OPTIONS", "-XX:-AOTClassLinking");
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        out.shouldContain("Picked up JDK_AOT_VM_OPTIONS:");
+        checkAOTClassLinkingDisabled(out);
+
+        //----------------------------------------------------------------------
+        printTestCase("JDK_AOT_VM_OPTIONS (with AOTMode specified in -XX:VMOptionsFile)");
+        String optionsFile = "opts.txt";
+        Files.writeString(Path.of(optionsFile), "-XX:AOTMode=create");
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:VMOptionsFile=" + optionsFile,
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot",
+            "-cp", appJar);
+        pb.environment().put("JDK_AOT_VM_OPTIONS", "-XX:-AOTClassLinking");
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        out.shouldContain("Picked up JDK_AOT_VM_OPTIONS:");
+        checkAOTClassLinkingDisabled(out);
+
+        //----------------------------------------------------------------------
+        printTestCase("Using -XX:VMOptionsFile inside JDK_AOT_VM_OPTIONS)");
+        Files.writeString(Path.of(optionsFile), "-XX:-AOTClassLinking");
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-Xlog:aot",
+            "-cp", appJar);
+        pb.environment().put("JDK_AOT_VM_OPTIONS", "-XX:VMOptionsFile="  + optionsFile);
+        out = CDSTestUtils.executeAndLog(pb, "asm");
+        out.shouldContain("Picked up JDK_AOT_VM_OPTIONS:");
+        checkAOTClassLinkingDisabled(out);
+    }
+
+    static void checkAOTClassLinkingDisabled(OutputAnalyzer out) {
+        out.shouldMatch("aot-linked =[ ]+0,"); // -XX:-AOTClassLinking should take effect
+        out.shouldNotMatch("aot-linked =[ ]+[1-9]");
+        out.shouldHaveExitValue(0);
+    }
+
+    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/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index edda9d45efa..7e98b57cb83 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -35,7 +35,12 @@
  * This is a base class used for testing CDS functionalities with complex applications.
  * You can define the application by overridding the vmArgs(), classpath() and appCommandLine()
  * methods. Application-specific validation checks can be implemented with checkExecution().
-*/
+ *
+ * The AOT workflow runs with one-step training by default. For debugging purposes, run
+ * jtreg with -vmoption:-DCDSAppTester.two.step.training=true. This will run -XX:AOTMode=record
+ * and -XX:AOTMode=record in two separate processes that you can rerun easily inside a debugger.
+ * Also, the log files are easier to read.
+ */
 abstract public class CDSAppTester {
     private final String name;
     private final String classListFile;
@@ -51,7 +56,15 @@ abstract public class CDSAppTester {
     private final String tempBaseArchiveFile;
     private int numProductionRuns = 0;
     private String whiteBoxJar = null;
-
+    private boolean inOneStepTraining = false;
+
+    /**
+     * All files created in the CDS/AOT workflow will be name + extension. E.g.
+     * - name.aot
+     * - name.aotconfig
+     * - name.classlist
+     * - name.jsa
+     */
     public CDSAppTester(String name) {
         if (CDSTestUtils.DYNAMIC_DUMP) {
             throw new SkippedException("Tests based on CDSAppTester should be excluded when -Dtest.dynamic.cds.archive is specified");
@@ -59,26 +72,32 @@ public CDSAppTester(String name) {
 
         this.name = name;
         classListFile = name() + ".classlist";
-        classListFileLog = classListFile + ".log";
+        classListFileLog = logFileName(classListFile);
         aotConfigurationFile = name() + ".aotconfig";
-        aotConfigurationFileLog = aotConfigurationFile + ".log";
+        aotConfigurationFileLog = logFileName(aotConfigurationFile);
         staticArchiveFile = name() + ".static.jsa";
-        staticArchiveFileLog = staticArchiveFile + ".log";
+        staticArchiveFileLog = logFileName(staticArchiveFile);
         aotCacheFile = name() + ".aot";
-        aotCacheFileLog = aotCacheFile + ".log";
+        aotCacheFileLog = logFileName(aotCacheFile);;
         dynamicArchiveFile = name() + ".dynamic.jsa";
-        dynamicArchiveFileLog = dynamicArchiveFile + ".log";
+        dynamicArchiveFileLog = logFileName(dynamicArchiveFile);
         tempBaseArchiveFile = name() + ".temp-base.jsa";
     }
 
     private String productionRunLog() {
         if (numProductionRuns == 0) {
-            return name() + ".production.log";
+            return logFileName(name() + ".production");
         } else {
-            return name() + ".production." + numProductionRuns + ".log";
+            return logFileName(name() + ".production." + numProductionRuns);
         }
     }
 
+    private static String logFileName(String file) {
+        file = file.replace("\"", "%22");
+        file = file.replace("'", "%27");
+        return file + ".log";
+    }
+
     private enum Workflow {
         STATIC,        // classic -Xshare:dump workflow
         DYNAMIC,       // classic -XX:ArchiveClassesAtExit
@@ -168,12 +187,11 @@ public final boolean isAOTWorkflow() {
     }
 
     private String logToFile(String logFile, String... logTags) {
-        StringBuilder sb = new StringBuilder("-Xlog:");
-        String prefix = "";
+        StringBuilder sb = new StringBuilder("-Xlog:arguments");
+        String prefix = ",";
         for (String tag : logTags) {
             sb.append(prefix);
             sb.append(tag);
-            prefix = ",";
         }
         sb.append(":file=" + logFile + "::filesize=0");
         return sb.toString();
@@ -250,6 +268,22 @@ private OutputAnalyzer recordAOTConfiguration() throws Exception {
         return executeAndCheck(cmdLine, runMode, aotConfigurationFile, aotConfigurationFileLog);
     }
 
+    private OutputAnalyzer createAOTCacheOneStep() throws Exception {
+        RunMode runMode = RunMode.TRAINING;
+        String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                                   "-XX:AOTMode=record",
+                                                   "-XX:AOTCacheOutput=" + aotCacheFile,
+                                                   logToFile(aotCacheFileLog,
+                                                             "class+load=debug",
+                                                             "cds=debug",
+                                                             "cds+class=debug"));
+        cmdLine = addCommonVMArgs(runMode, cmdLine);
+        cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
+        OutputAnalyzer out =  executeAndCheck(cmdLine, runMode, aotCacheFile, aotCacheFileLog);
+        listOutputFile(aotCacheFileLog + ".0"); // the log file for the training run
+        return out;
+    }
+
     private OutputAnalyzer createClassList() throws Exception {
         RunMode runMode = RunMode.TRAINING;
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
@@ -396,14 +430,14 @@ public OutputAnalyzer productionRun(String[] extraVmArgs, String[] extraAppArgs)
     }
 
     public void run(String... args) throws Exception {
-        String err = "Must have exactly one command line argument of the following: ";
+        String err = "Must have at least one command line argument of the following: ";
         String prefix = "";
         for (Workflow wf : Workflow.values()) {
             err += prefix;
             err += wf;
             prefix = ", ";
         }
-        if (args.length != 1) {
+        if (args.length < 1) {
             throw new RuntimeException(err);
         } else {
             if (args[0].equals("STATIC")) {
@@ -411,7 +445,7 @@ public void run(String... args) throws Exception {
             } else if (args[0].equals("DYNAMIC")) {
                 runDynamicWorkflow();
             } else if (args[0].equals("AOT")) {
-                runAOTWorkflow();
+                runAOTWorkflow(args);
             } else {
                 throw new RuntimeException(err);
             }
@@ -432,10 +466,37 @@ public void runDynamicWorkflow() throws Exception {
     }
 
     // See JEP 483
-    public void runAOTWorkflow() throws Exception {
+    public void runAOTWorkflow(String... args) throws Exception {
         this.workflow = Workflow.AOT;
-        recordAOTConfiguration();
-        createAOTCache();
+        boolean oneStepTraining = true; // by default use onestep trainning
+
+        if (System.getProperty("CDSAppTester.two.step.training") != null) {
+            oneStepTraining = false;
+        }
+
+        if (args.length > 1) {
+            // Tests such as test/hotspot/jtreg/runtime/cds/appcds/aotCache/SpecialCacheNames.java
+            // use --one-step-training or --two-step-training to force a certain training workflow.
+            if (args[1].equals("--one-step-training")) {
+                oneStepTraining = true;
+            } else if (args[1].equals("--two-step-training")) {
+                oneStepTraining = false;
+            } else {
+                throw new RuntimeException("Unknown option: " + args[1]);
+            }
+        }
+
+        if (oneStepTraining) {
+            try {
+                inOneStepTraining = true;
+                createAOTCacheOneStep();
+            } finally {
+                inOneStepTraining = false;
+            }
+        } else {
+            recordAOTConfiguration();
+            createAOTCache();
+        }
         productionRun();
     }
 
diff --git a/test/setup_aot/TestSetupAOT.java b/test/setup_aot/TestSetupAOT.java
index e078279e716..a46bd6e66c7 100644
--- a/test/setup_aot/TestSetupAOT.java
+++ b/test/setup_aot/TestSetupAOT.java
@@ -41,7 +41,12 @@
 // 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
+//     make test JTREG=AOT_JDK=onestep TEST=open/test/hotspot/jtreg/runtime/invokedynamic
+//     make test JTREG=AOT_JDK=twostep TEST=open/test/hotspot/jtreg/runtime/invokedynamic
+//
+// The onestep and twostep options specify whether the AOT cache is created with
+// a single JVM command (java -XX:AOTMode=record -XX:AOTCacheOutput=jdk.aotcache ...) or
+// two JVM commands (java -XX:AOTMode=record ...; java -XX:AOTMode=create -XX:AOTCache=jdk.aotcache ...)
 //
 // 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.

From 2ec6ab347a18f454e33a3a281daf1d50a1fd5e27 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Wed, 28 May 2025 22:58:34 +0000
Subject: [PATCH 705/901] 8357525: Default CDS archive becomes
 non-deterministic after JDK-8305895

Reviewed-by: shade, coleenp
---
 src/hotspot/share/oops/klass.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 54a4bf89e72..aa31f586aab 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -810,10 +810,18 @@ void Klass::remove_unshareable_info() {
   set_class_loader_data(nullptr);
   set_is_shared();
 
-  // FIXME: validation in Klass::hash_secondary_supers() may fail for shared klasses.
-  // Even though the bitmaps always match, the canonical order of elements in the table
-  // is not guaranteed to stay the same (see tie breaker during Robin Hood hashing in Klass::hash_insert).
-  //assert(compute_secondary_supers_bitmap(secondary_supers()) == _secondary_supers_bitmap, "broken table");
+  if (CDSConfig::is_dumping_classic_static_archive()) {
+    // "Classic" static archives are required to have deterministic contents.
+    // The elements in _secondary_supers are addresses in the ArchiveBuilder
+    // output buffer, so they should have deterministic values. If we rehash
+    // _secondary_supers, its elements will appear in a deterministic order.
+    //
+    // Note that the bitmap is guaranteed to be deterministic, regardless of the
+    // actual addresses of the elements in _secondary_supers. So rehashing shouldn't
+    // change it.
+    uintx bitmap = hash_secondary_supers(secondary_supers(), true);
+    assert(bitmap == _secondary_supers_bitmap, "bitmap should not be changed due to rehashing");
+  }
 }
 
 void Klass::remove_java_mirror() {

From 83a280485889573d5709b2bb59185d11ab6a38da Mon Sep 17 00:00:00 2001
From: Lei Zhu <korov9.c@gmail.com>
Date: Thu, 29 May 2025 05:40:36 +0000
Subject: [PATCH 706/901] 8357408: runtime/interpreter/CountBytecodesTest.java
 should be flagless

Reviewed-by: shade, syan, lmesnik
---
 test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
index 4415e3faf67..d502518f982 100644
--- a/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
+++ b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
@@ -26,6 +26,7 @@
  * @test
  * @bug 8350642
  * @requires vm.debug & vm.bits == "64"
+ * @requires vm.flagless
  * @summary Test the output for CountBytecodes and validate that the counter
  *          does not overflow for more than 2^32 bytecodes counted.
  * @library /test/lib

From 04e0fe00abcf1d7919a50e0c9dd44ce2856984ea Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 29 May 2025 05:52:12 +0000
Subject: [PATCH 707/901] 8356049: Need a simple way to play back a sound clip

Reviewed-by: serb, aivanov, kizune
---
 .../com/sun/media/sound/DataPusher.java       |  22 ++-
 .../sun/media/sound/JavaSoundAudioClip.java   |  50 +++++-
 .../share/classes/javax/sound/SoundClip.java  | 146 ++++++++++++++++++
 .../classes/javax/sound/package-info.java     |  43 ++++++
 .../share/classes/module-info.java            |   3 +-
 .../javax/sound/SoundClip/LoopExitTest.java   | 105 +++++++++++++
 .../javax/sound/SoundClip/SoundClipTest.java  | 137 ++++++++++++++++
 test/jdk/javax/sound/SoundClip/badsound.wav   |   1 +
 test/jdk/javax/sound/SoundClip/javasound.wav  | Bin 0 -> 387922 bytes
 9 files changed, 496 insertions(+), 11 deletions(-)
 create mode 100644 src/java.desktop/share/classes/javax/sound/SoundClip.java
 create mode 100644 src/java.desktop/share/classes/javax/sound/package-info.java
 create mode 100644 test/jdk/javax/sound/SoundClip/LoopExitTest.java
 create mode 100644 test/jdk/javax/sound/SoundClip/SoundClipTest.java
 create mode 100644 test/jdk/javax/sound/SoundClip/badsound.wav
 create mode 100644 test/jdk/javax/sound/SoundClip/javasound.wav

diff --git a/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java b/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java
index d40c2cd8c31..bf2dbde39db 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.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
@@ -59,6 +59,7 @@ public final class DataPusher implements Runnable {
     private boolean looping;
 
     private Thread pushThread = null;
+    boolean daemonThread = false;
     private int wantedState;
     private int threadState;
 
@@ -70,28 +71,39 @@ public final class DataPusher implements Runnable {
     private final int BUFFER_SIZE = 16384;
 
     public DataPusher(SourceDataLine sourceLine, AudioFormat format, byte[] audioData, int byteLength) {
-        this(sourceLine, format, null, audioData, byteLength);
+        this(sourceLine, format, null, audioData, byteLength, false);
+    }
+
+    public DataPusher(SourceDataLine sourceLine, AudioFormat format,
+                      byte[] audioData, int byteLength, boolean daemon) {
+        this(sourceLine, format, null, audioData, byteLength, daemon);
     }
 
     public DataPusher(SourceDataLine sourceLine, AudioInputStream ais) {
-        this(sourceLine, ais.getFormat(), ais, null, 0);
+        this(sourceLine, ais.getFormat(), ais, null, 0, false);
     }
 
     private DataPusher(final SourceDataLine source, final AudioFormat format,
                        final AudioInputStream ais, final byte[] audioData,
-                       final int audioDataByteLength) {
+                       final int audioDataByteLength,
+                       final boolean daemon) {
         this.source = source;
         this.format = format;
         this.ais = ais;
         this.audioDataByteLength = audioDataByteLength;
         this.audioData = audioData == null ? null : Arrays.copyOf(audioData,
                                                                   audioData.length);
+        this.daemonThread = daemon;
     }
 
     public synchronized void start() {
         start(false);
     }
 
+    public synchronized boolean isPlaying() {
+        return threadState == STATE_PLAYING;
+    }
+
     public synchronized void start(boolean loop) {
         try {
             if (threadState == STATE_STOPPING) {
@@ -109,7 +121,7 @@ public synchronized void start(boolean loop) {
             if (pushThread == null) {
                 pushThread = JSSecurityManager.createThread(this,
                                                             "DataPusher", // name
-                                                            false,  // daemon
+                                                            daemonThread,  // daemon
                                                             -1,    // priority
                                                             true); // doStart
             }
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
index 00862ea9022..fa90f92f0ab 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.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
@@ -28,6 +28,8 @@
 import java.applet.AudioClip;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -69,8 +71,10 @@ public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, L
 
     private AutoClosingClip clip = null;
     private boolean clipLooping = false;
+    private boolean clipPlaying = false;
 
     private DataPusher datapusher = null;
+    private boolean daemonThread = false;
 
     private Sequencer sequencer = null;
     private Sequence sequence = null;
@@ -90,12 +94,21 @@ public final class JavaSoundAudioClip implements AudioClip, MetaEventListener, L
     private static final long CLIP_THRESHOLD = 1048576;
     private static final int STREAM_BUFFER_SIZE = 1024;
 
+    public static JavaSoundAudioClip create(final File file) throws IOException {
+        JavaSoundAudioClip clip = new JavaSoundAudioClip();
+        clip.daemonThread = true; // used only by javax.sound.SoundClip
+        try (FileInputStream stream = new FileInputStream(file)) {
+            clip.init(stream);
+        }
+        return clip;
+    }
+
     public static JavaSoundAudioClip create(final URLConnection uc) {
         JavaSoundAudioClip clip = new JavaSoundAudioClip();
         try {
             clip.init(uc.getInputStream());
         } catch (final Exception ignored) {
-            // AudioClip will be no-op if some exception will occurred
+            // Playing the clip will be a no-op if an exception occured in inititialization.
         }
         return clip;
     }
@@ -105,7 +118,7 @@ public static JavaSoundAudioClip create(final URL url) {
         try {
             clip.init(url.openStream());
         } catch (final Exception ignored) {
-            // AudioClip will be no-op if some exception will occurred
+            // Playing the clip will be a no-op if an exception occurred in inititialization.
         }
         return clip;
     }
@@ -128,7 +141,6 @@ private void init(InputStream in) throws IOException {
                 }
             }
         } catch (UnsupportedAudioFileException e) {
-            // not an audio file
             try {
                 MidiFileFormat mff = MidiSystem.getMidiFileFormat(bis);
                 success = createSequencer(bis);
@@ -138,6 +150,23 @@ private void init(InputStream in) throws IOException {
         }
     }
 
+    public synchronized boolean canPlay() {
+        return success;
+    }
+
+    public synchronized boolean isPlaying() {
+        if (!canPlay()) {
+            return false;
+        } else if (clip != null) {
+            return clipPlaying;
+        } else if (datapusher != null) {
+            return datapusher.isPlaying();
+        } else if (sequencer != null) {
+           return sequencer.isRunning();
+        }
+        return false;
+    }
+
     @Override
     public synchronized void play() {
         if (!success) {
@@ -258,6 +287,16 @@ public synchronized void stop() {
 
     @Override
     public synchronized void update(LineEvent event) {
+       if (clip != null) {
+           if (clip == event.getSource()) {
+               if (event.getType() == LineEvent.Type.START) {
+                  clipPlaying = true;
+               } else if ((event.getType() == LineEvent.Type.STOP) ||
+                          (event.getType() == LineEvent.Type.CLOSE)) {
+                  clipPlaying = false;
+               }
+           }
+       }
     }
 
     // handle MIDI track end meta events for looping
@@ -381,6 +420,7 @@ private boolean createClip() {
             }
             clip = (AutoClosingClip) line;
             clip.setAutoClosing(true);
+            clip.addLineListener(this);
         } catch (Exception e) {
             if (Printer.err) e.printStackTrace();
             // fail silently
@@ -403,7 +443,7 @@ private boolean createSourceDataLine() {
                 return false;
             }
             SourceDataLine source = (SourceDataLine) AudioSystem.getLine(info);
-            datapusher = new DataPusher(source, loadedAudioFormat, loadedAudio, loadedAudioByteLength);
+            datapusher = new DataPusher(source, loadedAudioFormat, loadedAudio, loadedAudioByteLength, daemonThread);
         } catch (Exception e) {
             if (Printer.err) e.printStackTrace();
             // fail silently
diff --git a/src/java.desktop/share/classes/javax/sound/SoundClip.java b/src/java.desktop/share/classes/javax/sound/SoundClip.java
new file mode 100644
index 00000000000..41ad11e5cac
--- /dev/null
+++ b/src/java.desktop/share/classes/javax/sound/SoundClip.java
@@ -0,0 +1,146 @@
+/*
+ * 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 javax.sound;
+
+import java.io.File;
+import java.io.IOException;
+
+import com.sun.media.sound.JavaSoundAudioClip;
+
+/**
+ * The {@code SoundClip} class is a simple abstraction for playing a sound clip.
+ * It will play any format that is recognized by the {@code javax.sound} API,
+ * and for which it has support. This includes midi data.
+ * <p>
+ * This class is intended for easy playback of short clips or snippets of sound.
+ * Examples of when this might be used is to play an audible alert or effect in a UI app,
+ * or to make a short announcement or to provide audible feedback such announcing as the
+ * function of a button or control.
+ * The application will typically let such clips play once to completion.
+ * <p>
+ * Applications needing more precise control or advanced
+ * features should look into other parts of the {@code javax.sound} API.
+ * Playing sound requires that the environment grants access to audio devices.
+ * Typically this means running the application in a desktop environment.
+ * <p>
+ * Multiple {@code SoundClip} items can be playing at the same time, and
+ * the resulting sound is mixed together to produce a composite.
+ *
+ * @since 25
+ */
+public final class SoundClip {
+
+    private final JavaSoundAudioClip clip;
+
+    /**
+     * Creates a {@code SoundClip} instance which will play a clip from the supplied file.
+     * <p>
+     * The file contents will be fully read before this method returns.
+     * If the file does not contain recognizable and supported sound data, or
+     * if the implementation does not find a suitable output device for the data,
+     * playing the clip will be a no-op.
+     *
+     * @param file the file from which to obtain the sound data
+     * @return a {@code SoundClip}
+     * @throws NullPointerException if {@code file} is {@code null}
+     * @throws IOException if there is an error reading from {@code file}
+     */
+    public static SoundClip createSoundClip(File file) throws IOException {
+        if (file == null) {
+            throw new NullPointerException("file must not be null");
+        }
+        return new SoundClip(file);
+    }
+
+    private SoundClip(File file) throws IOException {
+        this.clip = JavaSoundAudioClip.create(file);
+    }
+
+    /**
+     * {@return whether this is a playable sound clip}
+     * <p>
+     * A value of {@code false} means that calling any of the other methods
+     * of this class is a no-op.
+     */
+    public boolean canPlay() {
+        return clip.canPlay();
+    }
+
+    /**
+     * {@return whether sound is currently playing}
+     */
+    public boolean isPlaying() {
+        return clip.isPlaying();
+    }
+
+    /**
+     * Starts playing this sound clip.
+     * Each time this method is called, the clip is restarted from the beginning.
+     * This method will return immediately whether or not sound is played,
+     * and possibly before the sound has started playing.
+     * <p>
+     * Threading notes : Most applications will not need to do anything except call {@code play()}.
+     * The following is therefore something most applications need not be concerned about.
+     * Play back is managed in a background thread, which is usually a daemon thread.
+     * Running daemon threads do not prevent the VM from exiting.
+     * So at least one thread must be alive to prevent the VM from terminating.
+     * A UI application with any window displayed automatically satisfies this requirement.
+     * Conversely, if the application wants to guarantee VM exit before the play() has completed,
+     * it should call the {@code stop()} method.
+     */
+    public void play() {
+        clip.play();
+    }
+
+    /**
+     * Starts playing this sound clip in a loop.
+     * Each time this method is called, the clip is restarted from the beginning.
+     * This method will return immediately whether or not sound is played,
+     * and possibly before the sound has started playing.
+     * <p>
+     * Threading notes : Most applications will not need to do anything except call {@code loop()}.
+     * The following is therefore something most applications need not be concerned about.
+     * Play back is managed in a background thread, which is ususally a daemon thread.
+     * Running daemon threads do not prevent the VM from exiting.
+     * So at least one thread must be alive to prevent the VM from terminating.
+     * A UI application with any window displayed automatically satisfies this requirement.
+     * Conversely, if the application wants to guarantee VM exit before the play() has completed,
+     * it should call the {@code stop()} method.
+     */
+    public void loop() {
+        clip.loop();
+    }
+
+    /**
+     * Stops playing this sound clip.
+     * Call this if the clip is playing and the application needs to stop
+     * it early, for example so that the application can ensure the clip
+     * playing does not block exit. It is also required to stop a {@code loop()}.
+     */
+    public void stop() {
+        clip.stop();
+    }
+}
diff --git a/src/java.desktop/share/classes/javax/sound/package-info.java b/src/java.desktop/share/classes/javax/sound/package-info.java
new file mode 100644
index 00000000000..e84319318e6
--- /dev/null
+++ b/src/java.desktop/share/classes/javax/sound/package-info.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+/**
+ * Provides interfaces and classes for the Java Sound API.
+ * The API is divided into sub-packages.
+ * <ul>
+ *  <li>Capture, processing and playback of sampled audio data is under {@link javax.sound.sampled}.
+ *  <li>Sequencing, and synthesis of MIDI (Musical Instrument Digital Interface) data is under {@link javax.sound.midi}.
+ * </ul>
+ *
+ * <h2>Related Documentation</h2>
+ * For more information on using Java Sound see:
+ * <ul>
+ *   <li><a href="https://docs.oracle.com/javase/tutorial/sound/">
+ *   The Java Sound Tutorial</a>
+ * </ul>
+ *
+ * @since 25
+ */
+package javax.sound;
diff --git a/src/java.desktop/share/classes/module-info.java b/src/java.desktop/share/classes/module-info.java
index 897647ee368..884ac624956 100644
--- a/src/java.desktop/share/classes/module-info.java
+++ b/src/java.desktop/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, 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
@@ -89,6 +89,7 @@
     exports javax.print.attribute;
     exports javax.print.attribute.standard;
     exports javax.print.event;
+    exports javax.sound;
     exports javax.sound.midi;
     exports javax.sound.midi.spi;
     exports javax.sound.sampled;
diff --git a/test/jdk/javax/sound/SoundClip/LoopExitTest.java b/test/jdk/javax/sound/SoundClip/LoopExitTest.java
new file mode 100644
index 00000000000..224831b9e13
--- /dev/null
+++ b/test/jdk/javax/sound/SoundClip/LoopExitTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.File;
+import java.io.IOException;
+import javax.sound.SoundClip;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Mixer;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/*
+ * @test
+ * @bug 8356049
+ * @key sound headful
+ * @library /test/lib
+ * @summary test that loop exits
+ * @run main/othervm/timeout=120 LoopExitTest javasound.wav
+ */
+
+public class LoopExitTest {
+
+    public static void main(String[] args) throws Exception {
+
+        if (!isSoundcardInstalled()) { // will re-test in child but that's OK.
+            return;
+        }
+
+        /* Parent */
+        if (args.length == 1) { // run child
+            System.out.println("Parent running");
+                String dir = System.getProperty("test.src", ".");
+            String sep = System.getProperty("file.separator");
+            String fileName = dir + sep + args[0];
+            ProcessBuilder pb =
+                ProcessTools.createTestJavaProcessBuilder(
+                             LoopExitTest.class.getName(), fileName, "loop");
+            Process process = ProcessTools.startProcess("Loop", pb);
+            OutputAnalyzer outputAnalyzer = new OutputAnalyzer(process);
+
+            if (!process.waitFor(60, TimeUnit.SECONDS)) {
+                process.destroyForcibly();
+                throw new TimeoutException("Timed out waiting for Loop child");
+            }
+            System.out.println("Child Exited");
+            outputAnalyzer.shouldHaveExitValue(0);
+            System.out.println("Parent exiting");
+            return;
+        }
+
+        /* Child */
+        File file = new File(args[0]);
+        SoundClip clip = SoundClip.createSoundClip(file);
+        System.out.println("Call loop.");
+        clip.loop();
+        Thread.sleep(5000); // make sure loop REALLY started
+        System.out.println("Test should exit now.");
+    }
+
+    /**
+     * Returns true if at least one soundcard is correctly installed
+     * on the system.
+     */
+    public static boolean isSoundcardInstalled() {
+        boolean result = false;
+        try {
+            Mixer.Info[] mixers = AudioSystem.getMixerInfo();
+            if (mixers.length > 0) {
+                result = AudioSystem.getSourceDataLine(null) != null;
+            }
+        } catch (Exception e) {
+            System.err.println("Exception occurred: " + e);
+            e.printStackTrace();
+        }
+        if (!result) {
+            System.err.println("Soundcard does not exist or sound drivers not installed!");
+            System.err.println("This test requires sound drivers for execution.");
+        }
+        return result;
+    }
+}
diff --git a/test/jdk/javax/sound/SoundClip/SoundClipTest.java b/test/jdk/javax/sound/SoundClip/SoundClipTest.java
new file mode 100644
index 00000000000..49f3ff08bc1
--- /dev/null
+++ b/test/jdk/javax/sound/SoundClip/SoundClipTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.File;
+import java.io.IOException;
+import javax.sound.SoundClip;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Mixer;
+
+/*
+ * @test
+ * @bug 8356049
+ * @key sound headful
+ * @summary basic testing of javax.sound.SoundClip
+ * @run main/othervm/timeout=60 SoundClipTest javasound.wav good
+ * @run main/othervm/timeout=60 SoundClipTest badsound.wav bad
+ */
+
+public class SoundClipTest {
+
+    public static void main(String[] args) throws Exception {
+
+        // First verify IOException
+        try {
+            SoundClip.createSoundClip(new File("notafile.wav"));
+            throw new RuntimeException("No IOException");
+        } catch (IOException e) {
+        }
+
+        if (!isSoundcardInstalled()) {
+            return;
+        }
+        String dir = System.getProperty("test.src", ".");
+        String sep = System.getProperty("file.separator");
+        File file = new File(dir + sep + args[0]);
+
+        SoundClip clip = SoundClip.createSoundClip(file);
+
+        // Check for bad clip case
+        boolean bad = (args.length > 1) && (args[1].equals("bad"));
+        if (bad) {
+            if (clip.canPlay()) {
+                throw new RuntimeException("Should not be able play clip");
+            }
+            return;
+        } else {
+            if (!clip.canPlay()) {
+                throw new RuntimeException("Cannot play clip");
+            }
+        }
+
+        boolean playing = false;
+        int waitCount = 0;
+        System.out.println("Call loop()");
+        clip.loop();
+        while (!playing && waitCount < 10) {
+            Thread.sleep(500);
+            if (clip.isPlaying()) {
+                playing = true;
+            }
+            waitCount++;
+        }
+        if (!playing) {
+            throw new RuntimeException("Clip does not play");
+        }
+        waitCount = 0;
+        System.out.println("Call stop()");
+        clip.stop();
+        System.out.println("Called stop()");
+
+        while (playing && waitCount < 10) {
+            Thread.sleep(500);
+            if (clip.isPlaying()) {
+                playing = false;
+            }
+            waitCount++;
+        }
+        if (!playing) {
+            throw new RuntimeException("Clip does not stop");
+        }
+        System.out.println("Clip has stopped.");
+
+        // Should also test play() but don't check isPlaying() for test reliability reasons.
+        System.out.println("Call play.");
+        clip.play();
+        System.out.println("Called play()");
+        Thread.sleep(1000);
+        System.out.println("Call stop()");
+        clip.stop();
+        System.out.println("Called stop()");
+        clip.loop(); // Looping should not prevent exit
+        System.out.println("Test should exit now.");
+    }
+
+    /**
+     * Returns true if at least one soundcard is correctly installed
+     * on the system.
+     */
+    public static boolean isSoundcardInstalled() {
+        boolean result = false;
+        try {
+            Mixer.Info[] mixers = AudioSystem.getMixerInfo();
+            if (mixers.length > 0) {
+                result = AudioSystem.getSourceDataLine(null) != null;
+            }
+        } catch (Exception e) {
+            System.err.println("Exception occurred: " + e);
+            e.printStackTrace();
+        }
+        if (!result) {
+            System.err.println("Soundcard does not exist or sound drivers not installed!");
+            System.err.println("This test requires sound drivers for execution.");
+        }
+        return result;
+    }
+
+}
diff --git a/test/jdk/javax/sound/SoundClip/badsound.wav b/test/jdk/javax/sound/SoundClip/badsound.wav
new file mode 100644
index 00000000000..962bc366e1e
--- /dev/null
+++ b/test/jdk/javax/sound/SoundClip/badsound.wav
@@ -0,0 +1 @@
+This isn't actually audio data.
diff --git a/test/jdk/javax/sound/SoundClip/javasound.wav b/test/jdk/javax/sound/SoundClip/javasound.wav
new file mode 100644
index 0000000000000000000000000000000000000000..515a408b77f21a7415284041b8394d54b1034c5d
GIT binary patch
literal 387922
zcmeF)2iRp<R?z*bCaDAwkQ@dSK~y9vN*c0cL<tfkN=9-JK?e{)vLI0b$sm#h6huH2
zk*E^<KoEv3Fp`xxUH$Ffd+SfF-kkeZ&2-bi<K63d?#gSgy>>YJoVR-Bbzk+BU-{J@
z_hdKT;N@Qbm0s=jUhCDL{l@j}ZQl7kAN6$0<mQe0Zan5|7xDA=-FVU)PrHb>ev9{f
ziyJG_rClm;slcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261slcTImkL}e
zaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261slcTImkL}eaH+th0+$M0DsZX5r2>}<
zTq<y>z@-A03S261slcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261slcTI
zmkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261slcTImkL}eaH+th0+$M0DsZX5
zr2>}<Tq<y>z@-A03S261slcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261
zslcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S261slcTImkL}eaH+th0+$M0
zDsZX5r2>}<Tq<y>z@-A03S261slcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A0
z3S261slcTImkL}eaH+th0+$M0DsZX5r2>}<Tq<y>z@-A03S27igjV3@jR(UM>VL7n
zRNzv9|92|jw79fO1uhl%{at|vR(m8fe5Ct(B*%8?>wE>~^I+2FJs!H|k?QB6XZi;(
z!oH93+PRUOw5Q*5How>MM`FF`<B{m+_qvvUkotc(=3}n!Nvi|?4^llIj$HQ|JRC7E
zF&>!;JRJMsp=NqICGWgL{(i{mp^oYQCI5#yU(<im|1Z_>;Tr2ai+dI&tB>UI_lk>i
zglCK=HvWteU0?WzGj8#Jzu-B}b2-@?kJSFCuN}*6%F6YT%B%ja!}n6l>-_IUR}JpP
z_KCIGYg(VX{E3bKaQXdi@5`g{9?2fA@%(;_b2MJEBl+)k{`-8l-+r&~@Ai2Apv15K
zGv9r#rtXoT=lX2DUWf0NQ@(ezdpPvJ*R^{%#&9l1Yh{jc(&zksFXhes-SBle?!MRA
z(jD28{cg7UtpAB0u72-zuID;=V(Et~=ikdXd%ceMSs%H^|6b<(2f6R+x7Ygj!<dfF
zfcEXg<(e%1Uh$FNl<oAr#=Td&=HNQ}=4ayk!n=R+e0IHY)h3<n;l{I$V#kLc?*5MY
z_}%R5q2xd3XwF;oLy7%x`<83D#m|1yP1!@G&D|s28pn0GoQ`bLJ<@pA>S)bR{Ue>*
zQGa*Kr!h>sNgu_Wvizqkx;WWfhxufm|B-CQn0C=KMz+P7{4PruF5bOjYxG`i@6}E&
zk7S$s?5N+y7(QoHoT<+zoG#m4p8jrl`ae`!Uwe$B{&$;m{Jq4Rb3E7Hq>pl#GW}2f
zUg+6x_VszB%jO8r{%0+YY{{nmw5k6o``w`D_$IBdoj;fB6Oz{x8lyVwxjZ3#?zY7W
zr=NYDqqCiOk27`G(bI3zeD?m2;vChIOgpmQWwVbX-7dS1zt=vmi}A$h8Ux>1!{qmh
z>-(I2@sITBit$L{hgx&~+7p}a$@}5|mCq9!_0|I?$baXP@A$eJWSb3s(vweqgzwev
z$al($6Q)CJ*`2u4Z?fMnc;7>NUg>xFz3}-yT=-u5-0f!nyY3u6eWK6VPC46Je&OWd
zY}1F+Pn<5FT{n63ZXdtf#UI6;y6GQ%4(A777dN~1N;vruuFoUgE^FT<-}&SZC!T#o
zhwCSP;&eNnHk01%;@M34UVO6O@$Nfg@3s$xpZ(k`ebnEcUu&f`xbsIbo={n_`R(y1
zKke?;$3v;Xb+PyQu-*HbvPox0_Jp?S8x7wrPW8La?z+0(OCNjeeBiz9w&l0ya85q`
zcbmyST=eV@eJ<{9cQ1Ukxfk1eu_@lf`AylR)88vT8vpJ)ZH{zP#&&Ph{~XO{*PV-#
z?XKVXnahm5`={IeCqHX^j?SJw`U%1JlE)sezV@7UyJExl+KPE(pKjtKJF@ydr@u}v
z{;sdj<mYVC!{^3*6l=<&CoXQXc$h4H>UViIM>yO3<JnHx5j|}toh{kDv~%^!w>h0S
z-HxYCG@EF+HtA&N@Dn<w;?&3Nf2Y}IH~n^5x_iZPzME|}cN<^&@O5$L`0l%L--Bwu
z>*#~2i{ASo-&?lV;d6cLv7Qiq_Q!AX(fUQ#|HRo`hs%e}b**_kXVbh*JiiB_XWRLy
z+v)lwNALQ3<%=`%9y47r@zGBxp5s5~JNt{?G2dPGQ2FcDM7n$J<8JxwV;48s-TJs!
zySv4?7yaJX&Wk~|$EsdOc(*;rANfvMeq`Fz?R2)+;o|Hz#X6Et*->riudB~>{^#<U
zK1XzUoWs|hGvXcPd(=<)&H5xevM0Mvf46?`rmxS&9sh9PeT<DG`NTbclI{KHOFrpo
zcTS$o9y|WXZ`Q5aOj$AE;!Ig|x^VK}ExeDV+|TuQZcOLw&&l_G8}G#De3O^!Im~X?
zO<8fy;d>qH-bZ|Ki<5lfY<8RvdG<S9t@4czlcQ_N!^w~E?w3uz6Vt_KcZByb<#%K|
zWyKCpT`|t-&e`sM`NOp%dY2vf6}vbS=Ra#P^;2H#;&sO^#`KGxKFRJC=X)>sUSqPG
z>v#GkKf13T*<}ys6P~i{<}*0EBb;x3JDzclbTj7EHwLmvPd@n(Zl1$zioes-|0w>s
zIi1f@G0xeQ!>*q`GZwqKUXT1{&buBzTl!r#`RG}rWDf=JeV5x&o%NIcsLz?(q_e%w
zH=83|ta1voow_HK-u>hEJwdMR@psvk(e0nTu2VPjpYll`)#^IG?CUpP%t_Ba(AUMB
zw#A(?H2J<aW`FrjSuv(=(#1_S;~(w2BU!!^&p70>O@8_u(fLiEWUUeWq|;CN-SpFT
z`X|2^*|fRaT&FLu_Q8y?)A^9kTJ3g|Fa8sP%jI5udTwPu`AO5y+|c>#^7teDj8h%5
zhm*}UgWlKV)bD=9DDKWDe<*m4V~?}vmj0YP{W-kXvA!RUaUJDU{F%?}Yx*P)PoL;%
zpA4S;MDMnfpY-mJ-}PiiZQ7ylh2L$&owC`_DdOqe%;sLkH)GrjUCev2Ehj#+?Y?wm
z<-ODK>5F>~v)76{`$o_6D*EJc`rYm0ciZGo44(Zpu4Ii1A3e{abMkEO6&DBA&iS3R
zr{8QEbGmpq*%9VHTk(?ZeDWhaV@>+V_FiQ(|2d{3`Mw_RwGVbr>^S#6=D4Hp7W+t_
z?;K}+RfqVAkL>A_=Nq27>u9=KzUn<|o*YhoH(4=voF94gIXrFley48wXGdSF=J7k`
zzsur_jh}YO!`Yw1`&x)U%B`67H~C4|*Nidg^ze24O<nZvQ{437-aD?t`ObWHdfH6-
zoZYO$PR}(kb;Tl!4mX}1)6aaSZ??slx@0?Mqa`oK#Pb<6<!CKjjEU3bm;E_;^OpVW
zJKdCtmwd*~KTM~^!`dACq_32>_2=d<d4BM9t^TgFnK9YrGxJG4WziGQG44Lo?q2EQ
zv5%e@9h{3P4~_mrJ^1%JzjXN*BRu8VhRbv3AKd$i%Vv+a$H*@EwBO^J*EzT6_-Qj^
z)Yt4IS@_64-NZA-PEWqM-0_Un*pppn%O-vHyR3NGg{S?@amvrp#eh32CVr9|4~D7Z
zqwO({<k{^0lfN5X+&PxwPT5YY$=%k@?h{|1VX?IIJ3eWDr#^r7JB<g%uiASZvd?bs
zbMo2VO_siVk1(4fd9wED#Jes&Jo}w=`WY*lE_%mPSB!ABJAY0-W3kc75uW^&a{LrC
zKdLE<9xjLH{N5jXvgUryZ?UG&IXb`Hr?`6`$;0%mOS0&2GWfbyydCGW%j5ME9iBeX
z=kSpa*>x?SBg}8gkMc{u_t6}{yDonEW`Cqh2Jd!LmhK3%t3P-)_VLqZx69@np8c|k
zpY}6;@+mu_*&WHr_Li(M?SALx@JPPLE@tC`=UFi2X#ViM*i8HSO%`7~@}oBUVOuT2
z$!1NCWa;U&ou7Tr*eC1LFPq6nPy1}9Y`2?zMYG8#*~IjdN0Z&H<+IyO`HYqPIxJTD
zJ?^e+OuJqF@O;Kh|7@o3IT@RCeI@6cU9!m^$>?We6WCwvvFPqWY?2+}>-5Ff@1!SB
zUOTGEIos(o>0&%oEM_t0-X*)Pza!gxiZ}6YpYEKzzK`&AHBL9{Eyk3equI$T-{{?*
zU2WIJAL(0r*}!D2!Eoy@yCc7R&)FRHpHK0R@U$s*u_mTFYWYn4q<5dGJ6aRg2gr{N
zI@=vj-CSG6$$#o*jM+~<kAL9t58OY1Jbu?D&n7(_WE0LNK0NJ<N4L}EPp-ky=^9s<
z96jrgPmb2;gSieTJ!52>?`}8sR~>9W>BGf|hmY3n-p`TEjBzf`k$lRc?bY^cnC?hl
zF4HHwbTj`-QoQiAA*=0kmOPtq@`=-lp`}AxLz72On{*S?&z8@W?evjNvK{Zf=lFdO
zh|^fnHU5(>UNZP@vh>&C;<1T7hvhk;HIi(ugJPr$*AHGx9-rS4KC+o(tG3~(tKZ`8
zI(&X`ZPLkRj3YW3e4S5rY^H7elw}Ja)q!mGl?@y;Kh4{IK1`o%r)<*YldQaE%xorR
zzeD-VKC_v!=;CDq&o<>#H|c2~ogY4W`W(sfop{b)^5*6U?>6||?nt)VOun^DHrMc!
zXFp~7Y0Og}4e$DNd~0NrK4+60F7EW3bhc#ZBVA(&=Yzkl73&<Hb00lz#h!e0@;SC-
z+01y+aQos&maaXK&EzLN<0aRB^8CZuoYU{Qvn$@D#pz7gY5auxKEm0htFPqq4l`xw
zBV9JInDNCAr$5J&H@;bu=pCE;qjtCT$)`JZYx@YZOCAl+HucGmWa+9kOxBqA)Fzz`
zJmr(lFHCm?#h~l`qdKIEpZ-%8U0+AIu}xjF@LU7dMU8x}lYK4iJo{o6L%+Lx=7OHK
zNBnM&SCiSQW3{R_@!?%QV?>uvc*?8QIeb);S;Og<JfHBine^T4%NNcs+2rSVs>_t+
z1Ml*9IJ-$t*^zBA!}*@G-N$Sk$)c;<#OHKVj*j1PeT1`>_p~j4^1bb2ntXm@?JXVo
z^vSMVrf)gz`DV*EdiqT{y1w^#blQw@M9(>x&!;2XQ^dQ+oWA)S;k{OqpR_f9uC*U_
zn<=04jFUWBd^ma77|@L+`NZdZlfznAt!69Ml+AiZ(`Q?(*#~-_ozb)J{Negb7GHn6
zy#C>A@;SGr+0j{NXsz{EjBI9%;%0-NH2!D|M>%J^>vn&3ntsC3SAy-Qe2#FYbaT8%
zaqHtK&XG<$t^6C;w7oJ|Kgr@J&X0^;e3(3X;?`U;>#VhwZen)vV%CzwWN<B;iRtij
zOy~*Io_yAR()o~0I{##FZKva>ZL)kCPxzdC*Rv~bJ`<-4?_-<(*}&|2XNZ2%8&CQm
zS@LO@&3s<4n=#Sn`klE)8}m*VgKnqwr`2b^JI*iLT_3LxEq-D#W}NK8(>9uJHuA~0
z2d3;Coh_{GeWX9<U*FR&*^Eba6l>bn$8Hx7Ym=X6Lb@xX+dtV(JF?D^@a|h)Q(xR-
z?l?W1|2f%_UOaMb`W277^<s_AeG$LoBYSaXD}J^UvzvVJlcg^g@@Z2)+3)(v^P6Wu
z{FHSrOxd2p%%y%C<B=|#uz1<SPiSk*{LE=BI-DJ>?;3jMi3W4b)gfK}M`M`r<uYyZ
zV?$SN@Pu^9@U`{`JpZ1WKA-I3;VIkc=^q{DTPyc)^2Q0P6PylauSHM$N$1NpIa(_o
zny!{zvihLUC)v(tQ!KdgqKlpX-beayYou``pX(_by6A~pZxg34UYI;OEN?9y-dnmO
zxtQ8ft#*4hbB$HI>6@PKQ7*-tK093u@);+)#uH|fZT56i7M)L+y_O!<lAXBIZ+Trg
z9Qb4__U@0LeHJU9iRo&Sz6!d2j&w(|?BR1crQ6qRxrSSl=Wzb)k8EZf^u4skl<)LO
zR~_k+g{S?b(}(Hmquj!5?xxRnw<DjmXpfW8rFS<^CdO>pkwwGhRs3|tiHB#KV=e}L
zboGqSK0Iw_T=eYgI-0J$_k4>v{m<ECyJNofk#5GDvTVs3W7u<3%RYIsiRV7eZq|}4
zzUT3j<pb9rEWat6^lmrDl5hA(N4D#$^_61%Oh0|^Ej#kYcT@{wo-l2@+Z3ZdrcE)Y
zEW26HWV?NN!i}3P9?l+LBd;ZccNw01#?7XDvq?VVBn#&gKJuNqXgFK(kJ_A1`pKi4
z|K#Cmn+-f^w%H}0{#VM|KaF+Icjt>)+!<q!oh@Aa{Ib1Q?5v*g@+)3=%F8{!Y-XM4
z_S&Qm&u3{gU9=eJAivpfeZv}?^zfw5<(*Bn%x>aneVntSvo^DVwd^|=;&;5SYkK~T
zDV(f2?e(cnQ;zoh4W^ELJX}BF>KN9)hOe(`n9am&+q;d4OvCRwGOc=?xCcKkPTqHZ
z>;I1APTk8zJo@;?m(Nj*bnwin+{zs`zn$?@KIzr~JMv<Z*U<SyXP12Xrkl3K%08R?
z@JC~!pJP5p=RfsiN3EFEmrZ@=pI`F$a53W9HI{tf8oOPe@2=xRHhm{gE_X5wA4b=v
z?1<jSA0HMc8V=fH>G6}!Cs{n4FWlZn7dxBq9y_1x&&A7b*OO0Oe0bWU>j$1Kd9v$x
zx*4}v<|JMI;cAy(Ip<ry^y#t<Cod*^oqc}ca;VSZkjs6xBUyUu{v32hz|m~ulg(Js
z6BnOME?RVUWR2yBp5vpxTPs%a<&aOZJqP^EwXr6HXG=c)=9yldrd_rZ&zNX=o|9Gc
z8S~t@l84n~#w8bL=9z8r@qFU5FHZ9K{Nd&x%vPg=<CC!qvVrr5t^fFR$@1Ox>}H#G
z`O@$5bZ~9byU*mK^NZj8)6c%kKUww3cE{PzKBnxPfAudOyJYzkCqCQyD#vP-K6yBO
z{Pag(r{`14pZ(n+TfWhIKgroNMl!TUUQMz&X->an#UMc+^)c;c{9>htwJFEf2U<%%
zb31A7jDt=3?6V0c50giS$@cz}O^mMbMNhxzaJENy`tSPkn%FqOz1U8h`bk#I_=(HA
z`K8-s_~ci_?H_T|rO!8ceeYu-pRv%%;Ox<}C7(EbGW<OMr#>34&nb&e2REi8*{<V1
zW%<K3HfUIj-u3Z2K6#z`iJo}YVW-)NM_$})CN3VEd>U74C7ir?@h}_rLiFCUOTP0{
zjxLYn^&dZN>YL4MvyW`1jBR}J@tXeA!Noq8*R(B$IQ+URqrud((egiWCqCP$LzB-s
zpQ4_Ar(7&jEx%$-pJZY7`}n7h{#;|XH+|(l_2?trv`s%_%1tAi@v=#FvbysO+4b?^
z?BVvzjFnxO-K6oerGv>QU)*H)e5VYZ?bM^ovAxWe9IoLt{E0gKrVmeD^z@O#%p<>K
z@#U0UEINF2wlLYW&2G1ihZ}D=S$N9pgHEFhPrK;(EJ-#oeT`hJkL=i_OV38Ta=7i2
zJ^7^B<WIM^>J?6pPZp+2p6n?8)Y0>UwRB{)V&YF$C!bxPFKjQ*vvAVw^Jzmr!S~$h
za}<+*P>%SSM>)gUly`N{evU0VoX-(vL!NDXvhb82$>_^z(rjz#<Kg1MTDs`QeWhGK
zjW;_uo9Z`hqVwPJjDx1%Wy$lM`eYNQ*SDPVpX1M-uKceIZ~xG<pFVRe*{07PPB$@m
z>n%)Q-xHT}`eL%l*ZMA><TJ+96=&D){Y*Q$_SEzv$A|O5PsnDMkx!p^vTT#V(fPpl
z($q}L_Qc)c_t?9hU;b><o9}sUH~-n=ljSpWNEglqKc5-JD~IgJ%V)+wpVQ?VE;g*y
z$E<ZSSZpwBHf@WMU3@XfXPf+_^D9oe`i<Z1X6*XRX4i>9SIowdUAlO<e3BJ=t^+bH
zS-I{$_}TaDpT9kzu?wSXWPI?AW$Kc{Y_*-9e7PixKY5<|nsoVQ2g^B(?rfT}Y{<0E
z7V-(?cy0I3Zu;&v`Da6aWRrZy^#RkB$F$2PS+?09`ApmCU!GHT)#>^<inr^`+idln
z9ZVlTWA3tY%!c2T%^Z`9ksMCmJj72OS#A1GnqL1}w(Y6-Y$m_U>i-n!&YsGSy#2lJ
z-ST8pA84&yPTZZ}Vr7FbZn8VpclzFC+0J+~hvXCUX<Xzp#-!y_PVD06-*l4CIP7Ml
zOJAKQmP`8b${(*y{Yi31R?hI$<um2<c#R(9bCRCqWX)^(9cK^k_S2WXzTjFuvlctu
zS}z`)tbFp><Kgu+_4$+!eKNEbzx$oEr{7t(?5A(GQ<qHsV%Mt4l+m$Iht7UtKE>PV
z_|DF7^_zZd^^p%eX?@1me>TY{U%tuet2o8jarWVI#pfG6`RwXv_n-Zw+p(OhcYW+O
zv!BlHna2^GPce^d_I}vxery^a{ke7&%h--u=NnyXIvQU+$Yy_dZI|JX<X6VGf68y#
zMQ0}tyV>Z<r`%@#Q$PK(ow4bs9A92&wy-w+CY`RFcHPw1SI>|zA9nPOB|5&i^;2B(
zYLrd7X?t#5Y_;@a<X7DESBB#!pX?@%7H_!x_I&0`U(;`W^GSXVv(4^0-(re0?T+~R
z61Op+Yg5)3+M{fu(}l^M75M0EkN9bqUo!U5oj>t2W_ENzGP&+PeG3$G()jv;pKL*T
zc=GgQ^;5t3SEKknU;N%jF=ou^k8Ugz>&tw?#fWd7;nqZZEq=%OBriT5t+5Fwhxgd*
zlGCLp*V4hYs}9Cba=1Rx`HER11MaQeUFp&3%3<<*jBIw_e8TcU=bt=WUgt2oT4RH?
z*1?H8{Wia_#usiq>^{>zdfFFf>gdG*GdJ=Y`Sd9ceZH;Tbkm0{JGix7{24ph#51P2
zbntAueKEsF`YDSRbIwz93!8T^^)rV_=a+28Pd0J-u)Ni({NtydY_|Fg7k}DB&$!Wh
zfAyI@ezz+ooXzw>w?3Nx$)A(ePw|UMo-TaUZ~5dOR+n_>eLkn%u4Au}PdoIKUm1;`
zY+<=h96iT(G@kSm8-KN&a`cQ_ovwuAC!Znu?Q>?N|J(JNcJ)z>rVgDxd3?1i{>%Y=
zlxsfp{EAtODLd+W+8xowo4(miU39v}lzjR}XNyNyujCV_gC~7tqwnk{?)k)Lmv@Fu
zo9tjYJ|T^dRvpm%VQtbU$(=sZ*I)YN@#%{Nw+^yRhfkN?)J^;J?7<O#C0sxJwD{dV
zT{ycVe6Bz1UQ54Yv71kJ`0_xLY5ASF({FYYXBTeY!9Antk{`t*E2bRerzJb`Nx$1%
zIgX$7M6)0Aa>@oyK6Sf1-HeB>+w93|=_WSL?gGt8JiGMC;<JU1nm)@xt{S^5V*St^
zH8ym78e_P4;cU{2S6p#sJL+rNNAu@bA8`GoEAF(3o^hi2&u1IDcQkZBCeCcL@A?Sy
z+v#aP`z@DZ^P9Hu#hYV9=QnA#wfy44GY52b(R&W`=_W1S^v$Mz;61nOr;g2Bv->(O
z9$&T^x^~oWx|8+kmu&J!bbU|VQ7ro6m3wyKax7N%`1%P?+hpwWDJEU}e#S`#N7L8N
z`O(v9^%V~XVrtbIT~6qHijh8?e2x=Muca?$c<QbU$4|KtMVCi>I{2uMX*c!LFW>Z&
zH->704$2=Ub1tw0(etdBev{6htbV3UE*ja1dhom?&nJGj-Q}|`)pYtqA7QbyT{mOW
zoviMh5oFoyebUwPgZEnPx@w-?#Och#oD1@!XF+xov&FLq@zW+fT%X~Y&rUZ!w!03m
z6(^f3;rf~O<w7>?%ZD6Y%wn*u4*5-8vi#s^cIGSl>*g~%c-plV$Y)Cq_kC{qvBh^5
zhIiR-J@8w<{cVpfeK9*nr*4;(*X)DLxT^*K*{Vr+>Z9v3%s*Xz#Y{eJqW669wPNQF
zXI~$1_Q~)^wDD%!*t45Bn<<OtXI<sb7JUv{+pXp4+xiTPfo`qi^P6$*g>Juxi_;lU
zKeO+~a3q_#(Z^>C*GIZ=_V}QB!c#x#X`{~57EPvQ7kwqXEpH8F6P~u&Oh0z5yK;uL
z@U)+F`YYr0Q(y6Wyj_mZr?^L0er%88O<6S!r{k;Pr|u+uaNHxG?8>cJY@^e`<(n)U
zm<+zI9p#zd)QM3J(ebnIy)QQD;qqmdyfu+N`HrU#9iDH{Ikv}3zvJxdr}*UH+%us#
z+2N;c@-Q9x$gjTP^yqS#GIA{)tThjC^(JS_U&GfXA6<<43)2@PS>sBcP5LmqU3Vo|
zKlz5s4c=|yr!E;heT`%8JM@I3bDlnVw(;R3n{0Q?r#sa2FSjW>N6%*roBD`8dgi37
zpK{)FsZV&usSj8aXU2-(asB3>e#VGqQ_Q{Z{K}7QvC|a?u1y`;z9z_a8?xEvda@?l
zuSc=STDNGiwJAf#)75{NOsgKn5bvZp-q+c&DOPyaihjnbpX7A4WHaYUXGb>o{?1pk
zi6?y&Q|#p7e2PEi<&q!UX`gL&>9d)BY$rc$voD9v_xNn<uQR@QyIuChg==i5U%YwI
zvWw0)e&V@4k|%4OSPQL(Xt?#${tIVwPQTj~JNtP3M~A1Z{Nx>-9qhd5%$Tt!&8{|M
z6ek%>Hht0Y^jh}$!_mb^mT&yDqbpXi&1<=ar>=Q#J>XkM=zP#x@ySn;2mfXt7I)g#
zk2uAfda`Vi<9FGEdwnps+vcB~wb(~>Ag>iQ9-cn<BO7up9o(Ko&wSA7ro8<(^)pUB
z`pJ)8+xe69G<VVbw0Ps1Yia7xbKHE$G_?M-Y>GA4=xNp8xnoS-r0u=^-?2?Sx;+q1
zhM#-4K9gl9zoQ)KcU?TZw<(Jbt4H;LlSkvTA*&^$KguUNdQjW#(@m@%ljmE1Gfp&J
z>uj#6Nl#n$tp&7(7b7^*vy)diy4d(28Cz|a<JHZaH~+1R#-GouuUO?4CY!CkC#J`X
zsbzn~te@oZJI+2kd^JZ;d%Q*lpUaax-A+%x;!IigaC&$)_OsDdQ@FY&pL}tqJz4S6
z!`U3s*|9nDO&`t%-fJ_*oc_qK7<6d!gqDLgeP{0Vm;cTuzX~#b$csJ1zg?F(cDBV0
z^NCK6PexA;*U!|YXH!cy@f_<eKjNnhz4y7tV^e<7@!7`H%QZWAZ)~l})@3m|Cz8XR
zAt&oQ&z{M%nfyF^$m3_f(?0*bFE-_dt|f!_HpfnnufFMEjqizi@R^hBZn(bLq06hW
zrJp#Pa+|uwC?0(+TjOXfbmX%}*@wlMEuV?e^^4Z{z~xXs^#wO)(QGDUJ7xKhMYEeg
zchnjO9eUOR-SZXhJu<xOvrRw$UX_0`I6C_s^U+80;wLZHDQ`S*<IRo?oqXczlWjUa
zTJrjyvUK6{iHDD5>G!^7F8WD7=N_$Pn@#rFl1~|)4<L`8Yo#>=)6=0RboS&o@78qb
z`DBBh@_gv0&$OTZ$&YfPBd_f?`DQoq99Q&_eLiAO$o5D!b&Z7`c|5whM5|5pnY!}J
zclO!bib0+YesA>VU!#Nf^+>+QXJ;+frY{*@t533M@lV>*FP&Du=wh?LXOGsBpSU}}
zVrb{|Q+H&WjGY|HY0BxeDMRn}`H}~nVcF*c({&c6&ptgqI=su0!{t!E@!@Rfk80Mu
z(`#(VvW1IvCA|G}vOfLN*RsK*r@Xl2=p&nS*}|=JI&Jdw)29BCvyYy3$%-{~e9CS5
zvz;(~rX0P;7iX7Gp1n5vy%G%Bw5O|&Nt1OR6f>M1eAH&&GdA0F$tRzlthF%X=R>yV
zk}f>Qh@OxQOkUf^E01jQVUO0r`NK1Jv^MqVVic1sI$XZ-ur}qBC!hIGKXT86-IsrM
z=%dDmjd9HVJ9+fp#A5H<0M4HL@wH@dEuV1m@U+c8-NgHNb{&4kia&}e7iTU^-&vY%
zxu#EEOnByl-y5GAS}cuU@*UGPKXhnwrezx~Cc4~`XGh++l7-nGHT`MXwZ_QOO`08E
zYi*sl)9=*pG`=ygE`DQ%ciP$~(~6fJ*|f*coOWG)M>xN!D;}M;$D6X<A3ygqJ|LgE
z`b-bgcSnZj-7vm8<CEWb@+;e7^3R5j9bNY5Y@=a5<uLW+0sTI1GGnM^lO1gCv`L>N
zch=L9ZrYrqr{7NFHS6wZZ;RP}3fIr%^FN9~XWs>Ef?}jQ!feUmX&*mvcEw3Ib3iw)
zsZU-#@aWbbx|Xc<FnO`rk);pkkEhQrd9wJ4uadqUyFTdeg=QyqG4k2-$|iewHhQqP
z<i$--t`9AnoxW1u{>cWeO}e^~Mb9zh&$qFnlNakK&wR3vpSJq4_h-EFAWJ`G(>9tu
zNT$EplEYd!n>jwR*6++0O+Izee2NiH2G{C0oID@6J|=E&WjA%@u>0;l`A$2u9MZ`P
zB#+MquffgTtUbE(9L;XmC!evScU(O3n%t&c@rzr2Y|14(ZHiZ{=|{H5O_qJQnDG<W
z#~wSI^pkHc8fU&o{p8O!yJGD)eLfS<K8rPR>n)#Y-}<8?*KaL5vgmO3Ve<OPCOmD5
zKXvrU#hCVJjXliny7iC^T$_FI-=Vq59?mA;`loAe%C+ZgV^7C^(&@9OPZrL8^2yli
zyN1`~shzk7p9kcPBfI$B2fsJA)h7RGqffb(BVBnkhRLU&x@54HJ&d3ImQQxD#x}cb
z<PFjnZ(@1GUm4#1nK5?%?5-Tw58EJJK69MW>GFrusbjSar(<`WUR<`*Z`v1UVlg!`
z%{YofhHh+E2J2_avd@N2OMc?+#2{~8^4Vqd?eFlEO+R!kIa~A`&$MGdZTEcewd}&h
z&S&Cm%GrBRG`#cq^3(FKk9c^>CY^7wb{)OGryY92^hL7=yBuHRj}PaUj9g1!ym)p2
z*>y1c-09Zj?mzo3r!b!xC*LWHo;gms`1ywGBY(L5*rd-Mt|g0y`OdvrtZ5US9UHB9
z^~vsBe^btmfA+<}Ytt6Z);V+1o_?nfeLT86$>dg}t7X$!Mo!kVGdY}$9)ARECS)^Z
z{hejXe)ECf{O!NL@S%hCRe$_~sh@pBPrpgiH%9U!`bxO{6l02$%{-4}v+ndW_al3<
zTK2oo9B2LWVXwbvI6m5X&{`|e)<|o(HG}V*3TG3Zw#7Ws73)ZsU*}ggSBY-9CWF}p
z<q=MP9iFz)bDa6of!QZIpX_G-#ew@)H}!ndMeq8aW#Re>v)_Hv!R4K7<~!+gan8l&
zJI9|L`J~Gs+c3Le&y9Sx?BHyte$u;dYo5*ASLE81or}Yc4&GZn<mhruF5ju!{o}LG
zzj5RXmn$5de>h!d!p_e)`Ap2uSp#atf}@Me22CEFj;wPldgrISIN9K5OCRQo2D9(z
z>ATDFNnWgYdUFyFH%I7NHu&al%66Z0;rgBZ6}ueSM$@5#c$l4ruCc3+llJsWPnT@w
z9^D#bGikolZ_@cDgQtCcW>?&4gP!`GF7_@j7X41|w#5kRQ_J_rp3HupXJvNtT*@vP
zJnf<<&Nkor*m1G44`;XY<n!-T+4Vf?xpFsoabY=TpS-%ohuP&5p5vZ=yS%x{rrH!c
z`}pFAv(K(L>BHIW{PfFr&uQ|})=~Sjy_XEu=)>8DuN31a+ueThnHOW?av+PIIC{p*
zpKe0(Z1XMlw4L;RrtkLn8o$}pH9fpTw#no9q4k{()+T>WM&9_~Ifm(<O)~NIt)aC^
zx2{@mCyUc>x-dU9+w9}_y|wG(!}-Oxhr{%f#_urmVM{Mwe)BvbPdDjo((z3eojrNF
zJ(v0}PCn$-T)wjv<4BfIHWQ1jk=4(Pflh7=lP(S!x_+krl%Z?c#LqQG)*4N3Ezb2g
zZKj-Gt(f6_rXDSqaCBpXYsrjvHu7qdO_-h7_~<aXw)13iwl8b=eVo_Hrfo4`KAL>4
zi1kC3TrTCFzWm@?HjQiY`GxsRdXF*rY^O|Y{>dgyR^QPun<IJSEC#HxJ!&WI>38aj
zz2j_nL}yd1<U5}F{L3pHe$rxOV{FB2Ptvts(edfChl?8x=Yu}2k~_a-TDhLM2mkWd
zW}IZ?yDxs~%aaTZ&h54Q;0g63wuYZATQc;?>P{YHwQREqCof0*%r*HQC%=iO4L`bC
zboS)QvVrB*T2EfCJD=^HnZ0w?6pIbInDJyY7jljKMBT|FKFmhLpQzJs`Y@?}JJY7^
zq_c;~_qt4dG&}Sh`_$2EbBsIB{>o_lkQFog)HAQ>Jx2T<M+~ys9veT`UGcM<eq`D%
z!=E${{!LyjTGQ>v`1Cv8_4sTiO{Ps*zRBp>#ivgeFSqjB`zl8ABV7C=-IR%?Ripe)
z(o?SK_-Wzf*}}<+!xo*6zIG)XKgA`A&L5t#c(Lnigt~2g=ln@mjB*I4hsna};r2!Q
znT%aA(OR}}c}|=Sy*7EYw#Ph4@8mXZvYoNg*DwC6v)e!TS~ln6Ouzb2i(2%Nf3fQ;
zpZMv6-sdv^aDMRgopN;jG-ng<y6nwsbITsxJ7&6M#p_*G%zU$*Hp#L{H}Rg=kuICY
zyW2Dta&4~>+4RkR%9CX$#?ibatB+|nb?AAX;m_%(UGdmzaA)Ev!ilf{@@*{1!}L=Z
zO+Nc7HcXyBdyRdKE?IVTC$H0Qw&CouslVxWj?SkT#Vkhp$v2K{v)OU_t3j@x`pB+v
zX1C+nC!gYEM>caQKK-<>pZq6gJNanqeb==I+9UL}{B}&AEZgu=zQx{srfo5c!?xVm
zO_*`e`DP!V-Ne;)`b~TNOkMP}ne>c3>1h)UYsH-Q=<<j6GmsxStW96?Ait@fv6G8Y
zO=nH$_xSmwqrY3rM_#kx%TbJ}izb)bY?CkVaQ2forsRz;%+B|@$&=xeM|YOaGnWqJ
zv(xzO`#VN_@lFwb=dYOMjaHN5WlbLJ@yOYwhiAOxSHjyr`P9#hIrE-$xztyDeZ|*b
zn7o#6x_sl|>{}aQw$b6a*4htYYffwZwFdJor}~Z$Cx<nD6F1%~<?Wwo6P*vfCMLQZ
z(ZxY)`5ldszHy?pX?K#Ge$U0tr#KT&{~34E<p)=z+1I4&3r-$R7AB9Laii&K#n^qa
zC6DHV2IzeDG37J;$h7GfKV>r(`QG@jfwj3N$*2EL<JnI*k`;66&^ySDtcK>R$t^kh
zsHLCwyB*zib)0jN-5!H{hiOCCUfk{Gc{9(r?04LGH|0Ga>Swo!53`$ee&rG_S7SM{
zCu5r~KX`{}GwFPig~`$B%cZz`&PV+8&u?PmI=42+HF2liq|?FC^gAsMxi;yO<jy+I
zk4-I~_RPeSZto=HzsuS`Y_i*J$mhFrbiUKR7^i5b-`=aIEMGeR?v$>$J3aZmuNgBs
zo9b0x^fj{T7>(b3*-u$M#evCYGiP(nT3<V#4DN5RJ3VdCK<r)Kn$Bk8U6=pFJB`=s
zFP<#hsoQ1Q!5Z76mS6GVfc;Tzr(9g)%cq>`k35=RcJSo$o3d#eO+Ry*G@VAKSu?fP
zUF&Ga`As?BtAMwE_Hm>uw|z`U{*4o!z<2W1w6#+o+3bC#FV5tzqs6Q3c6<KWk!$f2
zlkYW5W)A3T{Lta%C|Pl*J^vX;&eNW*GpsyjoMh#ZE-ao_pV`$%`f8OQyvvG_PqxLH
zKD%$WF#A34Vpof)N9Uj2u0Qh2cH;Vn<w!SkopgPM*`lqn>{`F%$)??In+-f0pQ%F^
zJ3RG#>j%BZOO`y}JytxN&F(Yh)9%QZZ0_-FiZT7=n0@*kPk;7zYieR`)S`Dh?OID@
z*3rI}lI?PS>54B#IifYZacS}Be9%WNpLEqG9=_^e{Z!X<^#jj-;<JN~;-+V>;o)MT
zXUiTgUOC~>>6+6cob9gb`9a?Lnl@7wU96eU^hr-PZ6<v$_S2?VSA)G>3$mJ;q4lBR
z)%1#4Kgr|Mho>!BjeJ7#iN(ZcmoDB~u8~dq<gNF4|7NRApX|fg#1}h0Z2V~YNv9{T
zO<6RYUY|3k<k`-g(CzQ^;c1r)o^terX=faP9O&@TaQfELm2&*FuCjxVWa;gJ_CYbj
zY|b^g83%o_vfue^V18kAO)QO0D^~iG^ugbPrX70sFGf20a+|X0N1n~Z<TdtM`sCr0
z_ILgo<6Jv)9W?%A_RR!-@x^J6O`LzSZ1aW5v?JRozcSi>j9DXYyvgEoiKn;5_Ikxn
z|KgI(b$CS2b&K{c+xsm3ZZK_+eDyiw_IC=l(dj2&ztcZi{WKo(oz6CYxLRdfeX>oT
zeEOuz*SwHb>nU%}_Bot<zSa->shj+fzFgQvSA+POd%2|xUuQ!%<D>Vnio;Id#XQ3N
z?4|Y$zI}6q?XULUb+~xN*yGkGJ-YpyU-na;PyH4<%xAXbFdr>CypL!4WYaga`h}+-
znr*UT%v|a_85^y+JEGI+FZ=B1wB~fmlZDgaYe#E{46vIxx_I?F<;jX)Uo%!V>F{#X
zjBg+39P`QQ^gHFd4~ueOS0B;ocAVeQ7>%=YsPk>|?QeMM`Ay$^lBKWD>XLlgO`Ghd
z%y{A(8(xg$@U)xqU000osq%MfJLAkeCp~S7v&&}P>1IE2D*ycF+(#dcBl~pmaAQqY
zpRkyKE;;+?DNhzIAAI!Q$CT$cZKA__tbE{X<`^ek?O@P4Wi!`e`fxEOk0!5wv<A~f
z=Nqq|WV8SD`DYWp3b=mo^?5hUhfO#df3EHQvD^J-4$WUO`~<$UWe+>6I<KO`+3`j9
zOo@l(Mpur>;97CYkDR@RPLI~`6UvVat?|tUKXWG6(#I#8xEzvY8?GOE^lZkX?Yek+
z&{|ABeX_X<wEeKx<U*BgnCxV6$_<^}uH#dS4(AunE`GPe2W<B}**<P>(YNQa4U2;=
z9$M3PGPpKnGe-JwKG`SVaWRsYdw%J6oIX7B6^mS(HOw}7y2+Di$>13)U9#|$*H2gs
zE#6ofC%PEfkZHxdV%AUo?T!4x*<FX(imOe#VoZ5-ID5R74;;PQ#E1Ez^9dKPIPk1Z
zb`z)17JmfvwfwK+XN>INau17z-rMv+*Jqe4AGAiNk;9Xpw$Wj>vn7Yg#c4d~*3Q(|
zS8?_j$;0XK(Zx$P`<XW6Q&-IVcH4M9+2m87#e;iB_RL~Sp3RImW%KzJU5uUQmu}Kx
z<3aQlaa$g}>!y4kWBF$@;}@s?*qY0IKBtTiJ1v^t8mVPJF&(~^j$bs~T7&oJPr6->
zpE1zdlucju-l^b8?>5sP&6W*%w@sIP+T=5Hx=L`%amvuucgl;Kp3UB}PtFI_c0T#O
z4w6q_viNZQ9O;hwBCAeEzI&Yd38$ZYagOkA&xTABW5#K&l9%VSNe55+=u_m=?`|`F
z(bf&Tw>?L(ud~e_*2IIGQ?!;mdhZusK35LwXPz0ITj`1uKjSCcZKiyucmMkC42^eA
z2kGMBDdU4rK5_BrqveDSPx?x@>8D*W>VM~x^O<9fhPCu3?)2NdgtI%crDGRl3v0<+
zS1{P+@h7j}xi*r^p;r8KJHN-I=Nqox#hbWTdyL5!i|sz9Bc7}#4t_$h!@DhceWGi-
zy_m^%yL`gaE}H-ToQa2bn9sPzll|n$W<GML&ncg>Ngw50{Os`2;bi&O@8qNTXmc$@
zlNU3bZ8+QZ<K)lL+0OMiWs}yAHf_Zvo4KR+aZf(mISzWQc;!3smBH<we0RLZ$mb|d
zvN@i{dvsQIt~pz$U2($tOh0AiMz+^rAIIdY4Gi)XZ_3a|`y-z)|NPo3v%g7a2e*gv
zpLTND+tf#AbHvk;Yie{w-2TC9>YDr{x${e&e>QtR*(47)PW&7zx<+^8Uj|c`&&2HT
zuyKT2D-*ZYVCxO|ds;T+(?9!USIYI1JWO5=lip?c#>-A4)5Mzj(`9?IIQ^0(pET{x
zlZjKyX3EjE-GB0vW-lh3eB$;?^K4x7c=%r1-p7&Oj63OUXMdAUzvFE59nD7WN5H0W
zp&NUDd+S-6%{&{(vQJ+=d*AW$s$~nOF9$f8`cGT_`+93Fw+7juCr_po3!R>9(sbG>
z!f9WgBzJy`6TYK4QTY~^G+A_chv##oJr2`PzL>>}pK<e}o4#V@x6}F0cx1IHZ`^Qt
z^qjkNM{+Waz4g-?${%li;ag{LYZATtO<6wK#P2rZ9rZo?FUN8#Z~ScPfQPG9wI-{j
z%eFY_i-||ies>*yk5?QxU9#y<HhFaQDyQ^tc}(3-XT!eu;dFbwlTTb8Ve!tj-4Czn
zx3=@it5295-JZ-Yd=#5KxaxHM#E1Fr{b#%D$Qw^|w$&|uVsWNlx@2K;bakEdl;sa6
z-*LY7RL_ikpW*vAZ*%WvcO;|JS2jm{I<eW#T(T#tzQ%#qs?`;9o6jzst~tc#AI@fC
zy7cmzZR(1vzvwX8-so!C9m&{`TfZ7S|J~K}jlMEmKXQ$py5c1(HruId&rI3$p+Cp>
zyecNU=qqCU6r+6MYJMckb+?;7=+<}Zr*$>wtr&A|Crz(SpJ+JU6)}Fw5pI0wVRA*1
zX=0trZ~C0GJ4HGDvOmYCD<->SlP25qDQ4rwH?NbPvDs#yeB$Ycu4NNn4a3R9<-v~(
z-t#Y)bNTSIrvLAPpIPt&3%+x~w=ejf1wX#vHx@k2ji<Ts91EU*!Jl97A`4z@0sN;I
zJo|#DULfADEcoRG@UJb<p5n$++<4jr&$K|C=Unit3;x&w|6juPw;cY@0vN9u&mUUA
z_m3}lmIeIKPql#F|L>0eeqq7SFM##^>kBmJ>mOMlKjVO(a)Ev|{`&o;0sQ4br#|fL
zsm^-+irw6>>5ht?z_<GI$<`SA{|tho#hG)<e{bSwGj8WkIZa$XWRn(S%J9b4v#E20
zJU@8@{WS(_ME>P2FLBgM{fjs2mj8@bAF#ZPyD_56M;vl_Y1xrwGyUkb^2mmazg)oV
zf6{D@;_+wK{LMNP&p3(?H{KZ^O*h9}u8p-^*#P-eU)XxK&%)?xFGg{yQNHa1YyPnd
zzGcC`UhriL{>_4KUGPH-><>9T{etIN;2iji3;x0a^rII1(FJPNUbe4{SD$})!80s)
zt_98!=f?9c=<Hy_)|p}Ns)sT2(<eVZe|7<kCpSj*m!JLrzi$It9^x3I+}Jxi<bfAk
zUHJd%0yX%>1<nv>N@svEv8!gV)?Aps8ks)#{a}3QtP}kiE82L`<sc8V7<^8%cjx;J
zS?g!UEDkJgYYh$R!@L+D&=)}KQ||h+ew?xD1e~2@nz(G$Cx0=?8k4-N7qxeW19W>&
z4auCv`a#q2E7!)M4#um7a&U&17hiGJpB<lagYm}1m+dny@C*UggJ;9O_NrHXiqH4y
z7Fav5dXURkJ?g`HBnQS=4di{Q!fBkXbu~n*D_?fgwz`><*%#jWRX_H|Zw^}b`j)3>
z<})ww3>9CV##hc_0=1iR@ze#h{^W?)*vq}=CSUROqsID{yMF8^_X~T|dSR<iO|0U#
zHt?EU`2+UZ(U}`LfNHPi)lM#atO5N4`I51*hJYN6Nxb?{JO1QyHAcBR8>}aJbf>8P
z;+T)1TJwF}f}dSrZsa3>IRImBEU?(*)?2aVqgLvmf8zkHZ+RPg>jAAMYOQ}hVmkYr
zx9(wVjm^9~cER^A_@4{@*8;J{Fpti9=dCmQPb{!+)J>lDy1M+>0(Zy%Z@~{P5W~D!
z3w-{}f)`kT*0*sPi<+?iFALl`zk9(?Ea2;I_$L=Q@A*I9f=4Z|mb*8~^G6r(6XW|9
z{PY5`<)|<D8n-^>tQKlwJ(y21H1%NjYztuX$=3MHA0K&{JN2fk{^qA=+jHM|?yEh=
zU;W*o)zvdpos5~U_2K+6AAEpZ)y!O3d-{`~JmsJ^Ku+e@8K@@aM}6dOoaL<+Y@G}8
zmXmc`eDl{cQy=<cW8U4<n``St|JI6Fa+fEte)*b*A6{VY<z{S+OFj9B<2fUSIclw2
zYnuMqpv{Lll&|?QU&j8E3)I#AXl=R+uv4q{nY~2joEFQRwI7UI-|8nfVE(GT+|<o@
ztZVZoHoY}$FQ|_?l3N@4)0djjiKh<g^51U5k38@rSK~Lgasu+;D?c?d=AO6oY{g-t
zE^PD*YjU*?)zrAEt9g`f<FjY@sIgj_OY6hD^3{jF%!S(WQ&)F1YfG)I3u|3}Kes@w
z#WCl=+!&*p{r3gmwV?OO|N6jxy*eN41vOzC$idvmU3_a;{nXlf<|{0CwFR%V;Dr{*
zP2J=yU+bRyB^Ugq1uwY3JErkh=j!UYWE_0hJZiz8THp@L|J4_~-h#ij;N=&{L0-o4
zuNHj%0{3J4S!{jD@0Az4)B@*K`=+zqerzAB)BjlDy!(#}zHxy&x3fzfjLH03yTDqo
zp8ni|7hWJ=wfgr9{`rE>S>Wt5XYS(e<mTF%`}hU#vEc76khi&E=Ulah)j<8szr4()
z*w&RC>^p1ZKQH+51z)wmysEu3=Oq?c7tWBcUGPsA{IdmUerj$FIpd5)9jrZTM?ace
z#pwCM&YAgj3*`L83#=h^(Wg4U=7N`9VBX~4bHww<bIg7<ChOgNn-6_>2AOAZ+>6YQ
zJjK`Fe^_9A=D}XD2Ici~3#<q0;#C%S9$BNtz#s6jo;&N+#N1hza^`1#%q8FUuzk(f
zGt7FBi~6uL&UaYwE(_jl!7DD1ySlP5?_aZ^cQw3R>~VAC4Dh_PuHSmW-(T>)3tnRZ
z-M2mPZ4Z3G0(Jg|1<pHXnf(o%NorsZ%3uF#PN%PLUSJ=nbLXP|^zED%OC8NIxwS|3
zy$h@<V^uG8H1BMTyYEBhPAq4!Gew_#>>o8#JNa49_Mtq@uNZRYqo%;Ra6URatOeK_
z`HltFwmMoj_Jpy%?gDjVXYZO%x#;Vq7dU5(%e;NUg1@ui!xvcl`mt`<0pH2+&QkLS
z>|^K0Pd)HcSL^PJ9{8fGJnUQZNB@@>IP)I8!2UN@&qsOsJ|}m;=dla;$;n)(hjnVK
z*19!g5831Dq8|2*x;wM%r}mWd&ba>V0(;&WWuA=7T=NmnzLuM{^>z!?jox>I4_%-h
z>Z*R_WKQi9YtLS@2hE%F-Faef7@z!{7sg<{I*Z*YoRghJ?v9=p_P5$tYx?46eVa?;
zcivljp3glKjKz9)_I}d>{i&^5>C-y5f1Odz7=5Vei!QJ}-FciDpSs|a7Z|f~>C2qk
zyY@XFV>V8)tV{D?f4I+h7CIBH1#@nFnL~Pe%US3=wx;RDQMa#L;JmU2UiHSS-gy7p
zfVNJJOHQ7<*10(|H}duz0QRDJG&j!1?$~M|XFjbreX6&;sutFYzSKkAeJA>g1^Tsq
zJcr(7fqmo|!1ps3e9Qu8x^v1t`0ESUIa~BAC%IVz_MGv_+j(j1@*%fx)K46>vi9lC
z6|BzY*g4sqQ10Z`hPgEkxtTM4(5tup`51@ws1~q!(>I+u;?0{HsyY93@-<)Tst<X|
z<y84oeD=V)vES?oXPaiftFQZrv&Q;%4zjb~?E`Cv%zE$MWE?%ujYXa0suuD!S8}lr
zoJZE^n=W|c1@@s@nx79`@b?yYJ{Xg`ygb}NoYTf<KUq8ctOIiOk)!<3`f`S<q1@yl
zANv%~#~xK9Ing_7oNwmWTshP2fBl;?IeLZwHI;{bBZl#*v2{-`2XW1VHR()$@dbG2
z17Ee1&tn&u1N-Jn7r@rDwJ5F{xC^}bg7;eRZVO&}fw|G2v%tCci3{vaYqI*d2iU`{
z73*3|b+opuBTXLNC7jh_sGqvqbDkx9)JKk<{ra{qtZD1eoV%|&(=_L*^Z79g<n5WF
zuI@|jwC<6gy+AC_O7+w1N9$1C)LtBOp$`1@<JsW;;2!$*3(T20f7Alc73ZINdzQKX
zcn&&?ttn%WyETtDudsTHZ7mp+{+t!o3EuuzJB^JqK#bO$_kQPzJJahdP<Ly}y8agn
z^r^1SH+#h#|H}oQRdRTl8!vNpPx_D>A9CX@7T729a`&*dn-_c6v-GPMeBlD`1<pz5
zhPBn$&6#?12FTNM+xisOcs$#zQ+tBHbzpqXCN(pDw0z}Yp2V<L_?jp6MqBfAo@??G
z-@JK_zSaVBDVEyt*OxtDZJHacv&wsceArvVYV+s?)`C4`U(3l_@(fU0KGuglY3%&e
z&|bIS%%QbKZ*1mQ-_51<=j@V$v(1@pzKqMdP&2%FmWMOaS*hOEt@?U4ySvzjc;n<_
zoN}}0%s*Pq$&KAwQAc^n$y#&{eC`74!&;NOJ)x%7p?5j+Zy#7o@-=2>gZBpe*0a?<
zws+OL?*iR}jahzbV_dMNCeCfSxp%miSX=s)o4&0}bukX-qk9?J{l=bD3-QgNz3+Kz
zU&u*(`%oUv3_jIZ{ngw$mxFp4yK`2Zfb-2f>bJGyEK&pYd(;B8<Y#X=U(L%mEO1t^
z5kt=ALJc&r?P1TRH&|dDS;xjKN9#hL*1dB<bI15k3(UE91-71#<{s!@4C_!G<?ZZt
z7TeR#5cQOs9L>8m?RjM!o|S)Nfjf=oof`A`cMHB`fwNTq@>2tQ!@Bo;v`*z}?u^qK
zuusg3I;gSw+6&G}W7nU(W}R6R=G^_r8Z<}l4fcs~lG&%mrmw%Uz<u0aSIc~jMU6dg
z+%xS*Ytnq#$LjRh1=fPOvY*ALS8sC(%$d06)w-6uwdBs~Y-*12_Lgy}g+5#V;u^O(
z0p#joJvz6H)jrh+Kk?PpxhbxE>D5LK)>8JKIo>JM!91&vcdQRt@R$Xkw!l3~ZuI8H
z8Eaf}wLZw~W8<|>)IfbaOYAv&#`@?S7t0=<&nmSx#%gX&sFn3=4#hHu^!iX!*dDNU
ztqpxzPv*=s!Z<xk%&9d<*7*6EV`~GbVRvZx8AJQiel=ESnfsM>V;`!sz0@5-9{SOT
z_0=<2U-FQzJ!sr&=@~@Vd2Mgmd(IF!@NrKu=f)(iwV~dgDQaj;^nBFD+6Ly_`L8ba
zkFgq`npmI4!{2%_R%e*{0{M{9u`6HaqP)zLIeF}D;G-|!JLGGxu(gL<_dT=K)Hpo{
zJ$Ky+JTE+l#dT)-PUv~yIqW{C{^EN+d8WIsbsm^I@ywrjma{&4hC1)m)Y@QUT-Lt)
ztReF_@7%_&FTk%gVJ*tTJn&aX<Amvw_uOV<PSnO3>v?C)#;8B@*ZTnaQ48d4%@~I~
zoSEuk?-;kaoa<X0<F$^gEuhZ&c6OR8V0~C;)~k2u&P8LiPK=RFc5IDFZM@@~139Xx
z`L&juN%o}k2RLWQ#B@HXv%TQVEC)Hs*E&`w>(u-?$DA?tlKkXRZN-qEwO!1{#$P@8
zm|OiCW43ZtOY72@<>=mN{a6p;Sl{-OXT199%lO38)U$hr`4q>v#j*$3ky~ecf&8t9
z)}lVdS3_rH`%Z4HO?A_+`IUDy6IUK=)k564#?-eun|FQ6*WR<wJ0H}*nlj&FS+~Y(
z4T)(CY@E09CpZ7%Sd(gMy!KspUH;Cao^$$DQ}bjTKs<9|p440nV7z2(tu=WAeHn*w
zse^jz8))QmXUC7fIL=<6hIsRW*OxVhmWNu|FXlk*=EYg;EYQC`)kv<!>1?TP)|>fo
zE~}aT%LSHOb+i`6X-%p{>zAz@oI$Xf@sqQ<=-W8V2Y>5(-ht?f#n*iCS0h-CWI)Zx
z03Y>~OEojT#;Hce>REu6zh*w<YCV}_Yr`5ee(ThF(zmrNS0GL_EN9pltqDGIR}1mQ
zk()8=7jDkk%3Uqg$2);_XfKi(uiA^zv(FgRQJ-w|3D9yA2gr+$IhBiXIp^`3oaljk
ztReX|9<hu`+?g|fv7B}Gki7)d&^bzO?$uJi)|0iTAM>MM<56RK*m{>2zI`rk?-ib#
zovZZh*z*H&5l5f;xBlHloK5m-E!qQY#jsbd7Qp(kmdM!YtNR~c@tg(i-{zFPSmgBC
z6rWy>cs_DgH{;f~^-+v!0E6t=THEG!?lE!MsV|IIV}O=Z_1Ay(H(q1K^EF?Mkq@~(
zJBNy+54jqH+{o31Z}$wf6VrUK0sPd3t@+GWzw#4PUvjcO)J6a3)~B@s@a%wbSWDKW
zwc5V6C+vB9$G(T{19E$w&UxwH;&~o^?7HiDZn}^7o2qv{-*NmM$9rUVeD@shHQ%tn
z`yQb8zQ=}+kMHun%lX#idzx?J!26-^1HQF=`hxy;+uwcod4J58Jv#7x%C}hG*?g-5
z;_>IFZ~4o`Slm0@-^1SH+}FBy`P-fR-BrEkxvO~otBq$%&j)9pv%y-_%ujP+O}FmM
zy*UqC51kSA<f9g}r@dRbGx%QPJ=!~}?}K6QA?}dg`2m{Vw<q6U-J=8V$=>mN*K)T8
ze|3R(Ke|UR;FBGB?}hx(d|!Wo?;>xx;B6MX?Sj9xApBN0-s<Xm;v3$0!>jK)zBvKD
z{x0mhfN$s%*amNO<BhI#?128t)psH}<HbrxE<d^Zh6IeqyBbgfWApbW_3<7D`gZ`Z
z_g8lTb6_9Zf6h5`;0_GD2e~siHzznl%^Tl&7TVvP3FaT&zIO&WE9`CO9DQepwc$+g
zto2Ud3<14MIj{IwSN!>QmUO0xG1nNmGpV!AInr~r^TXP8hFZs-WzJO3JV5Tb=Nxfn
zI3qlVoeRD-cvta`VvpD_{wC^-@O{HMfd^=N)ptO9^s{b*zj=Me0)HF$#|u7e!3QmP
z{{`=}z`xIU=LK)O;4K!s>4G;|@Wu;ZJo@z)yv~AGUGV4ye{sQ|U+||EJm-RETJXmf
zJk5fqUhq^4o^rt-S%4;c+68}f0ojcOzjo`_ZvEndpI`7R3w~?ClRxm}S23Rcfv11q
z8E=Ew;F)hja{RL|c%B8%zu*NIyx4-jyx<iUy!L`OT3~GNy5PNT!+SpPo>$|3?+4!d
zf%jYBd(1yv@Q)UJ#Db4r@No;&OfA*cyQ1^SnePlT-`2BlwbsAAVvoM(g2ycQ&;=j0
z;Nus3(t=N4@VN{A<$|wR@O2BmZNc{~_{jzTXTg)+eA1iGvfzalyz+uKTJW|D-sv{H
z!_9ZN`Hl<TZNd94`1=d~!GaH6@Zk$Sdcnsp_|yfTwgCRe3;yAP_h0Z{3*KYFyDkt@
z?6+9(#tYtH!Rsz~odvJC;FT7<<boGm@TdjPu;3{dJjsIlZ`^<5|1S9H1wXjJIKF1V
z7cThZ1s}P<zxC+fjrd!%zk4}vox%2;J!mhgqy1*D*ax1K&VPHr`>*%Po{gR}pSQrj
z@%bkU{4Lj9ebfT;X8z2h`Sfp&{F?}K{O$|PzqL+A&;FAZ*dIO9>>0G@oadisqP^BL
z84v6|&s5LXo{xC@&@<3l@jUb1Z9m)F_PllDTyb7GL!29G&{^bM1l?7fd7feHoMG-K
z&KA!<al~-<u@3n;FTHblw)tl3`-0~itoFSpd#~*M%=yY+9^&c8e0bJ6tK47Ag>%Sv
zM&kl#=aT2UXFJ+l`If{M_WbufyZedS_<Mjlsh7KhdxU-F->?M!e(B#de98iIgl1#j
zon?IdJ!FD8^S3oI=iQ~hxzVBN0=E6#L@aX;yVn$p-kP&Etd-UX8-0Re!1}O8jL}`q
z{l;C#nox_t_gnQ*Gwa-0@5~3z88vh-q_5s#_U=jcif4;wp66=MOLJ*Iv2ia{FZ<%{
z7QFg`7hUkE1<qLK@;sZ#o@D|33oLly1uwMV&o20r3!Jyk-#@;9?H^w7_*;*^^|K4U
zf5Epc_=W{vwcraDeBy$Cu;A}3c&`QTzu==5e8z%*wcwi<{NRG$SnwPVJjVmCxZoWY
z*vsZa9j!6z(3*FC_;-%}2I9PZ*9Feok6G|(3qF5=GxjSNIFtU<f*)Ame07HX#RYG&
z-~$(Y{(}Fq;Quao=KG%cz872YY71U}!J902s|9bj;GGt{%Yt`Z@Qw@Ka={xcc+CYb
zzu+$|c)<nFwcw8~xOMZ^&7WWJ*ahFS;5!z4(}I7u;42n<&Vo-`;LQHJ3!LfB-<MtR
zrx*OO1;26QH*Wmcg6~-1dGV<WjMJUa-x@u4>{s_=d(HcRdG>FfoO6G3!D}vf*#+kN
z&n@tb^t^uF1?KWkEb#0!*Uz=U+&=4qXIp?KV`m+Bwpt6GuP?FSB^SKhg1@rBy}<pz
zJ>jhvyxW4mzu;pR$jS558E!o~2d!6kI(KV-4|GTM?*shXK+jFjOwY^DS@16we93|@
zy$xS{<BPAJGj#uafx39Ue&T|EvfvXIpg(1S^}xn+_X`$S8=twrGwQ<^yx)R%Uf^%+
z?!^8k+25?(Nj;;Sxt>d&N%p8(TaVtyoMp!5Ip8d@UcFm6$2?y?c!7Vz;+bPk-f4mQ
zn433T@OlgW`hvf<0LG*L>H>EcbtQj;1@2*QwZPu+Jo9|Br`6aw>1=W)Ie+Bi4D#Ia
zHvoTs?ce!2t9>u`oz=6+_Z;uC?xKA=@*d?pvDe(s-Qhh){7tL-{k-G%9orq=ysDe`
zFL!5q)^pD}<$2<pj=k)gd*6+%4ezn)>F*YvuhrDq>s{5q?NwLLdUbu@1@5ixtm@-j
zv(~Lq>)PGWebjx^y%X)cdb$PfsP3ljn)fYm7rnI_nv9MgTXCFAV*cp`&O!HHU{3(_
zUs&++3tnr1xiwevbI*21u`WD!jL|c|I`W-BUF>7eZ{N$+*!kvfuinS}8xniNd!hG5
zcD^fEcj8(L`m(0FufN#?Z}!07THwxOo%lCF?*3|MKU%Bmtmd9C=E5DtyNGWc)_mWH
zyw7-Vu~w{m=S=q=Ie4~tURgut+*<HX>b>>vF0jw+QG58?7yQD4XT150H(zSO-&o)t
z+FjN?_G1?~8~^D7_#+qmy#?;9Z?oXd7rf~LXE?zBtp)DJ@3P?C7r5iX?#cWB9h<jY
zpkMdgS6}cd3tn--OE38I3!ZI(OO~_un-_SNI9J?fofY1%oe{nXc-~s$>gIfKC-RP_
zF7Ac)B0#(EsJZ!fCvYFI7u^A@e|IGJBYW05F;DJ2AGyF;YQ4M5!XL2UA1v@L=e!U5
z_xARRd$RM%yx8BGHRj%JKU-hE9rSM>-+cXhGH0M?OVD=*I^QL%MLxa-@OKWVf%WPf
zci*&r0h-?T0q;d>=HKYP;{xvle|y2(FA&@J2J2c(aokaT1910s7xlcbKGjNn)Y08c
zecT6~eccu9F>?1XYt%W?om@S{Fh|zB`)cQodzv#6m>*{);OpP|x)a(v>g%1uyP>m4
z|IS?XwlDPIj^<pmxBDhPzaiRJ-g&yWJ1^~N;NIVN4rj3M4;G{K<$JsD18U)p=-r|_
zqI)9Ry^tIRWX_rHklojfTdvljaT>Shgtcd_8k4a(GdyEF!<-`k?fZc>=loHB_Ui2$
zp?kVD`Wg$Io4<7Hmu`Lgf`75#Ll?Zof|p+KtP9o^_5NR6@Usj4*Mgr~0RPN_pI`86
z3+}sh->s)z@N5hI<boGj@QMpwf5F=?c+Umzy5P+gyz+t<SnzZU?qBVv7kvMM?_Tgd
z3&elQTTglGFE4n<1^;w``>MOAbKH4teR&pIkN&OV=PmG#{!}-g>gFpf_&W=}aDjW{
z|61@H3!e18C%x~f7ChsEXJ7D~3)}^tf5A&Fc*6znv)~gK{L2Mjv)~&ReA9yOSnxdy
zzIOroYZrXMf=^xW2@5`c!N)E5hz0Mrz}?fGQ+)T#A6@Vb3qE0i^YO(O$n_^~{KSo~
zU*N9uP78dW^Im8Dn=k*q)^p-z7CiR?_xNAG_3O8OdBOi#@S6*s?13k{dN+862cF^T
zKIq=)9{C~*JZJyR0^fc-TfIYgW_mXub8n<~_jFf$r3LOcZ?nKN(fhk|&YDzj-vgZm
zAGqL)7W~%*zr5h-Z$ACa7hUjI7rgxf&x#LT;JNV03qE_nmn`_21>d;fKQ8$93%+*2
zzg|H1nF~H{!DAM9-neVO+ydwQpIGq67u>htXKwt=jqhCWWeet+@7t;GobE&RuV<w_
zXaCqQ-chZ2_cgWjJ?m>0c<*_=1uwY38h-r!kH7zy7yQzKUtRE<3w~?Cn#NmCz2G?(
zyzqj*vfxb@yz_z&Snx3mzHq^JEcn$0?&a$FmJ8I<S>!q6Ug5jB?*rcHou}RvoV_2k
zz&-ez7W~ix&*9%(;G5IaE_lube{O+qKCiUkwHCbL0?$^@(f3>6IqZGK^VD<n^%uO_
z0?%^qEl;!HaW@`!_0Hvf?k?|{>3g#8Kh8Gim^*`eo%6$)V&A>_0(V{C7rj@wOU-u+
zcRcSH?#Jr<$_xI|0`Df?SAA2w|JMCi-w_{o>v6Y!Y=QUD|F*#S1HOB~V;B75f(I7(
zF6n;foyh%7f9~1t>i(UU^Urzao!@)D=Z-UOKF^(<#$#W3zp*ylbDjC_zRvN^de1fQ
z74As>)?iKfzV2Ptv)DKI*I3|r=)K6Z)-x0ak6vIOd%k*Z*w3B`?s3lRzrEn47O2G!
z-1>oAU$)?*7QEYnzq#Nw7Cd^vi!X3aKIej`U+`25p5it<&8?@o^(+gXf5D3_c$o#S
zwBS`2yuyMPTENHo{LKqKXTgUr_@D(Jx#05_eES0H`bBTO=+)W$CAYrh*3T?(hj!+8
zmU<@nu4T;L*}S7a*Ujg;T34TO^D}OK_k!PA@ErF&$9*rc;I$TbCwKn6?Sgk(@WBf{
zdBK-2_|64Cx!_k9tmXeC+WJ)aB#*!E@%R1mf*)P*tqZ<rf%EhO7X0l6Z@%EQ7re}Z
z=Ud<$|Am{saP{8)l{dfg>ielP!`c6=3w-zdo(0}V-EHkHb7`)v0q<efv+v{HC#=8E
zU+`fI-ebW#EwHbB3;Ey$pRmAplCNLzKNkGT0_)QGX-&S$0^hLBtvlamEO3u>mvI+x
zH*g1aHu<}i_2XXkJ`2?Ks~7x_1-BMB>+EfN*M4@_{=5ZWz2KV{eAj~SU+^OfJlh_(
z;FlKoJ_3Ga!Ot!Du?7EqfwR`L(02@Hv)Jy>KY!!rZ+znd@A2+=zK`1n-XYwn>?_X!
z&mP|z?Asq%@J$OocY(UR@d9U|=k+h#{|op3&jtT|!GBxuEepPG!Iv-ik_BJ2;9D2`
z*aFS^e4Yi?-|H-Rp9TMX!M7}MHhV_-&gAa^-i6%VotO5Q`Sc9(-N1Kk-(jBT=JQ<5
zzwhMM!Urt)Cks4V)a`q3!?)l3_M2aK8@}b{w_NG0A>ZOXv;O7+=j)$Y;Jkf`1>Q4!
z(|GR%&Pn^;-Pt+e+pm95;=bm5cNV#Sx__ykbJ9BTp8AIt++5(f{R<0ze1S9I`xgA@
z0?&2p(Yvto(lgq(AJ6lbUEta5`@{#_ez)-bO<$hV{;jGzgR@T_-L2gny}!8c`g^uJ
zuWyp>z5Yh--4S@l^<1*&ot4&r?-SyvzdfTL@2Q>#{!Zf?(z`5>)7#$$`^w*}>;vCD
zoO#Y<XRz3wE&A*4ao&66;#_vm@GaDxgRlMcx(nP*od51H?t#8V{@VrirEiwb&i7vM
z)(c*4f%Ee<7r1M>$G+|YHt)WG4R9a*pambdz_Z&K{Fw`U@BGpQ&gHLO0DtlV{kXrr
z(So;G;7<F|3;xXl&oSR4e1r9TG<G%gZs6JB8T$<joJ*d;Z@u8N7W~kHr@rs0ufA#e
zR{35FK6b(9F8HzqU%KG)7JS-*Pg>xv37m}|y}*6-br<-y`Me9Be8CUi{K1=Fzu?Ok
z_&byL>DON1??v9Ft?8e=@v}Gn=Yk(u;GF#01-`@i7T_C(Zv*Znk6Pe9;5q4?$-A0&
zH*;g|J>PwU^j+qs7ktlxZ(N{mU%B94FK}kM6aDZ4cUJdLcT>+8XN+~>jPxF<Pw%n+
zXu-c(@Z$^IlV4;(cT0aGbCwy~KU?7Y@K-Hxul%+J_W2Ji_~F}tCi~U}>f$`G*PW}6
zS@6yad~0w=df5f~dfo-@Tjooh{^J7QBz=o?&-7i*v&8+<yNElI?>n9ao(t|ao++NG
zk6G}B3p}HrZ-G1HuiXDD_y52G&tT7I@LdajWWnQZ!%yD-lUMIqzj6O>-0wZi^WC%Q
z^A<QSoD=R<&II2V>>K;p`@VOH&t4#RcXQ*i=G+ZGX2GW~@QvG9_~Q#aGk$e}XUX?1
z@EzQl__+%{Wx+=*aHoHZ1=f)F7k_X3!wdfRjsJb)TNixRf)7|={ya;Z)xJ0R8;ZM`
zJFt73XXT48a6k6$;%^eI8|&q(7Pyyx?E-t;{vx-gtR>Hf?_JP&`4kU4#nn5k@7?a5
z{*K&z+u7xNm~X@We&>Gc4(Ivd&in2QJcIw<f)88p5exiX6yQI2!TT@p-|)TFg4bE#
zozwRj-vZnjJ=c9Z^^M=(;GDJQ!n?Y);oF4s%-vKSJRh8+zEAj8;oY3vx$Vy2eMQaW
zEf(Cj0Cz~h#=ha>+mmmK&$qz-@_cqKzTJYCSnwnZtgX*o@F5G{bHO_;c-sYUx8NNX
zyxW2gT<}Q?zI4HVUhsnper^H(M=f~y1<t+hL*C0jWx*#d_@o7&wZPeF|J(2X--4f5
z;NIXF=6kvOx-&$b{C(9k)ZN40a{uve^5_M=3%c{z!_RczGu`*93*KXabMLbkI2Zrj
z0`KBKwBTnK{L+G-Ti_1)T?@W$fwS|&7PvpY@PgmG`I|TY!vcSU_jmi}TVRiS2RHY=
zubE%xo_9$9j=(d^v(Ox=wYB9=(%-8+qdfC`^Y^zq;JdE(KJ(&v;Cr)g-~QI44)(!2
zF7P)8-)O7>?<?l^hZlG^@%I<+BJQo$?0YQmoxpSCrxrLDUwFamE%3d=w^)C>@=SUB
zf@it!S?+tG1&?0vnhRcU!5c47i#J=~dGjg@*gV4mcSm<ib${;#{%wPIZfCHw*x&B_
z?@aiv>YJ)Nt!IL~eedsC?N05P;GXkyw|?&GS^b^2zVm8bcqX_<TQ48Jz}fh|3p|&7
z>v`J+)>shldHq%ke3wGIpYs#r(-wTi0&C7$;*Rjr3*_Tj<?krgntu!B`R4D9zrMhC
z1>dGWWWg6NaHqbxJ}^A@0)JzC$pwF5!3!*SwgpeK;QpKU-~6cs?v2hy|E}Y$7I^RY
zQwyGKf%kUr9qy<8n>6o%&Io@G@IB96O1*sdw?2G>^KW7N-NL`0ah~~Gt?xX)w!nSI
z9@5}we-B~nuE@`KJbxqf{^pyGXOVwj<N07cTC>*Lr!R0WecJ-}LH9m)Sl@(Sc7gX?
z=c6;vdHxR<n0tS(v;N?ZUEsfabsuKy{m_~3Ty$UX&g<;=E}{PJLfswQSKVLj8Gnm3
ze*acUzV5lsG52NTaOX1?&kOfxwrXZ>-Ld|EzU~G3_jJ1NxHF<bB0{Al4Ra(}+5}BX
z>((-dVkIOJr7mrmp%tnwNtQ)i=MYAyF>ZC4FlQvB>JrSjgki>|aY>i^Xv4xGO;JQ9
zjmxB*qx<#$o%cGA@A^-Fd#&^R{=VPm`#k&Em(Sk&dA`5@F_-ErbCHKzSCLy<NB91O
zwQsujev9>SNA<b;+QVw^GVn+18RRHGhhOqQHKDvuJ#Kx-TBsW5y+dyqf|qKWi-!K|
z5UhorUmmh{bj{<}+>872QhC5bhvbq^9(wwayz}`(@Kjx8O!4oJhpdgL6XX=u@~o|p
zowajo#xTlUtk;XbpBz%J+<M6R&#Q($Gjz36u6D}L4XMu`I`oVo>zD5vf}dX<x@^et
zb3-2<vc?H(;ip>uw4rMaS<B=vFyi(@a)3*(bm?Bqv{pj@KK3=(nKdN&qO~FUu{B(4
zLe_C$qO}nA@0_i|MwqGIVIS%Z`3>Av-@s#W&o%XlwH)?K*Y-5MSHX_irI>9`NPYd`
zA^DK?G_~R#hUCT8&+P5Xao#%gsiCh7S=aEMz)ug|a_AR^?mlE4;`T%0$&H4tJ0t-h
zmy3twr7%Grsh*b`sqy92@>?G<T|LE)*){*Qrtq<$Hx7y4PaLua0rS|+uMDYY#9?de
z)*sb1XAG%ro;Gyu5G=G_u2zQ~@WGm}8p?jPH9WcdlZW7te1u%>kH{(H9^y0qg_~lb
zH4E#$-kY<JuU=3)SiCtnblQ-*Ssb$F>z%gqhmH)%AH`d_r@Gv_F8jRhkl6dNA+@!2
z8u7)tnz$#Ig&lNk?bd!WdEIx2?a24+>B3Do0XMum0YluAXR;slsb~4P9PFYY`+A=m
zg30zxDNy|ZH`oul_Ruwl$Uv^IjXKC)mt0RB`_&;ev-LgXT%Y#y+-IB4)!W)4?bN#B
zy!{{RQQo;08`SFXOwOog7Qd_|(UJ9I`m(Ojy9zKAwyUN1m;3^T@hNz!&a$@8-|je6
ze(c>k>wEmuo~Am+`ii^*rr6_BN6^K6h8{3<`jGq=p4uBT2fV^_*m;*B^@zRs&m8~E
z@z)KVIdt!#TMXS`$QtIc`M^;1&1Z)`HT3DBqeHIQSF-jl&{-q0zQoSO{3i{CnS4Yo
zbny_JylhB4;hiUTVC`K_#&*OXdZ1&rr4G37(BUDr_uq%UGj#m}*Wb%OA9CO!2VOYz
z-XT~3KTjRH+0dPb9x(Kzp%)At8G7lEy8X#Rzc~ai?>8jxy7|x#4XLZt{BZepL)RFx
zXQl3jQ}P6{i(T+TIv2Cam2F!)`sVR(?yZe|?fBRBj$(r~BYv(Pw8lgS;wgJz`__nH
zusFxB#d|pEeG%(e>NS4->>=-lS`);VJp%Zp4*tm@cqTXhr6D<|{eA0+;(&ECdpGuQ
z-Y_H&egBaCw~r2eXvlZ?sIC;3<g3pZdeo5m`<6p$RqK*4Q~j#;60^Mv$@kPlVxKyK
z&5IlM2JE+}iQhi-`$N`r)G6hb@KNn-jZxgSZgXTvt@)85^0XfBy%D)Ozmn_oLH=QV
z!e#_q@b0F)fkQ*qapmS@NQdytyKdy^Jt=jiwI8*G_l%!ABo=tr;`|}+JF!3cqW8z-
zrrtSz&ye>Tycb6wuDx-HOg#V8A@zWmBKH#SygO>Yfp3x(EP^eU48c9MChV{_$1c<<
z4;Ye9S-XanVgq0HzO`JD4U)G#XSGS|h_C{_$)DgM*}x5W>0NuZws(`r3x2X|Ji%IP
zePN&+0mh5zk=O_e@vZLio`%>26OnpDJ?-eb``Xfzy*0J+mgKrHKs)W}_52g>E4_H$
zOn?#M0~x_sb0;ggmbK2_!MEpx>?58vq>lGKncUVpCC0agDYjT=wPz}(u$kVs5KC_|
zL^kB1Exzc;IuhN8(=ZGOTI*0(pELA`A^Su2h2)jihG6EULu&SS483XS4MP_Uy>sY8
zL-JAUO7?rMcKm94d+%!cpBs`-SjXopFCBW{5S$TL`ItG9o!DUif<Iap@$RPDP|a>V
zhz~z`=+#5sr&MdJo77Tw8j?GyJs&xAc<7v=mkgaZ1V627K641JK77dgo%ZE_e8~Eg
znoBNWJyZT*Pt-oJn#6B$<iTRLSj!f~PVYgmZ8a&JP(xX#l-s|5=$%6s4P7#1-q!3s
zJ7oU>p32MQtn?vgA`8CY{S6=Q(!l^euP%DWki6)?e8du%Cdah)_L!mH8Il{3(Yl`_
zNB{F7vBo>8$R5uB9+Fp*r}a&Fw|5BaZP*{W<B<KLD-C(aABI@FdeD%XhmFZGtig*V
z*6hVZxq!U|b%iw=d82%j{^g&q7=oYTu64^_9=hL<dR(4)<OIP{F&O^JIpiPK>-i49
z@_wat6SWGAICa*{_yPOJpLdO5JdE@Xmv_%TKJ+I;_P~9Yv$M0KLth&Diy`~se?8>g
z1M83832;yCZ9Q8~2|uk{c&E+#A>!=whS)CbBqO;E{oQUz?FzfBYly*YUVeoC=MITE
z@WA_Be3TrKy$_fvX21qm!S2LeIU9V?4}6g4$+g6j_Ml;eTvuFn^c~>?KFGsiruK46
z*emy9gVtZ<>v(<F5WJKxTVp79l;<I}vTJb0{t)bhtH?7j3^uZFYnR@Yl8=U~#<8CX
zpOLx1J8{9-@@mh9)ob64AzzH}8hQ5O6Yt!?ZkWiAefYHXCVOr20Cl@qBmRgPo~0wU
z#=cJ<lKWXV@V<*RC^4R0KWE4~leKjCC&&D=p$`vTGW16$2yT90=o3S7R2ciEp|1^n
zdkBWgXYIYiV{5Hv4ZUXQ(?iCUhx55t4w;X*Y>h-+Dj#5*ep4jB@?Ilc^RCPv5ApwN
zpK|R}ZaQ>m=q^L>^S(pBHuR{WCk(;L#|^>M2M*nH=${X%O@Cs@BAj~m^+RV4*#olo
zYySsU$@%2=_A~G&F3S_`C8{yh;np4GmDWVOA0W3^r+#qgy+hV}VJ8{8Cnr?{SOZjh
zzy$lC;-y@Ie&r4J2jo!Jf9*l5(Y;?_FZVk08-RZ}WDWB4A$6s_T=-}G79QH)hLPVM
zGEaM7@@#aKA@5!NpCS9?@=vwB{M6pjBZlri<ejB!4as%oSuot*iFFKX`)o|^P%N=F
zal0XFL}IgjKkJV6Cam4OXy{o(a!m15-YI4~`u>z5HV8A-En>U9B6W+kJMZm#w}u@X
zlMnJaz5wKX_ynAigW6m4-lq5`-+aLktdmo|dFbs!a!U2OJuKL0?HGnSid8UE?0~c6
zZ!PDeL*DHYU*+QRQTD2DGO{;fZP2@S^oIwvBA&?Y*!Pa@;go!lU%z4K<wJ0k9azhO
zlM!2!XPr3&XZf;RO#aChJqx$=1Dn_=JCfhRQ+cHIKlZD}hL`e{a21}yQTPcvKRYDv
zBwPB0VRA6o1Q*#U`NK?W^YTLkN9B#`DfuV73nyW)zThHU#v6Rv=C|%e+QL^j3k$^w
z*leya&D_ONvLHM8hwu0x6MV)83?>uuAPY7_26AsXs9eQfg7+uHUiBYrW#jmO(dJ72
z)~2l$@O}H*Up)TBJzqcX_<6@4KO|qg_0V;PE<bkpUj6>=WA8q8;n1swUN-dNp>v0h
z483MZZdxu1Pycer=Q_u)v-iHJHLhn2@eBEcwF~P#)~1dQv8!JkvWBl-k`q`%y2}uJ
zun+8gBzfn-Qx5LorW*XWhMqO#9VEHt`9m)o^8L9(XAeDn=!qxZHM-Bd2U_0g9V2;{
z-)G9V<hj;6TjTe>o^>(rMY6T(Q~8g&ia*27Z_K{jr-t4$WKa0~Az1Oeq2~{sJ0$1w
zu7O<iLqqaVwLST(|E&YqbE12;#>TDF*pIRPt1jg0pBs{Y+K(U`HM+dhzK(re`$O{S
zA3Ws;_j2o>Ipt^e)`qQZSgWufbmJj1wBBn^gdFUTc!$;RqRtxf9;@|VI#9F27r*DR
zuL?h{$+AJd%8y~1^<C?8S04J>)Z9mhJ}~6HW486;A!|Gj8nVyx$f3ubAQ*}c4_O0x
z;Sf1}X9#|hvvof)%U(PksPp74awmHd?A;nHyi%jfJC6*(%L|6YAbWu@(471p4OV`6
zNRH{+w}$K=Il7N78<K}=$2MRm%%l%>JKR*Kz|F@F`K^d`19iKc2A;!rI{o|*e}pS=
zKwWCDL(M7ARHIu1wHJV_^Z1U~oVm+IVXRvA$PnCwZ~9da$UphL+8sXFpW<KgbGGdL
ze)+JYb#?iddY=63OOmDaP|uSsOoeyWRjpmYvDPou9`MULAzW8mBkT9-UHjnX7^cBi
z7$_Ij7h4bO@h&$fBN#3RhIi@<N8h`zjql;SH3j?TuvScpj6pW=(><|3UQ1TyB(|8J
zy)5fzcn~){V~#LcT|n;EoYl>ImVL{K)b7?Q;U=5D>(I@Hyuaz4Vmami7*fAqJao~J
zT=acI9~rVf`h}q{4yob)dg%DjwWo@|@sQf=u|slCIBoCD-m^G`cQxQ$hwRtcJGTFE
zvsue~(2$(!T|??lzHYzsUk%AApFh-lNEe>6qYF;CU~li;b??bPbx7`c@1ffaU2o{J
z1DEaLgnfW}4ILcfH^x?f$yMaR_!6t>L@YZzBzL!VX%5!o;N};G)aBl5c*l@j3&F|%
zHUwAYP=o>l>;<SrVU0M(zT^yI2)nh<Y0ZrP%R8-O@b|wOvX*hvA#0p))84RsjJFJV
zSLX9W=0|Z?n>AtkL*(Xo)uCgvKkUAm-MZ&HhpcsqAJ$2&kyyL1uMRWRxz+*YZr0Yt
zXt|2|iXX5m{w)@IZ|bsH<Nm~ubx!d@>`;%xNb8$&P3z=v^U*_UdRQsWykzM2hF&}L
zwxJIXePyV<#rw?f;fx0__yU{v8#DOS8VCKUr{#p+iL`%X&s)B3jo6<0ZHDZJi#_TM
zvh@2cYu^8O=q5wnue!m|-yO0JZk<{E4mahka!mQ98r^=a`b4aQIo8$qpWKVxz&N=h
zY?Pl{f4K9IwPE=SdyudD%`CF7Y~RS9h#Jj%>TuJ0L-J60miieMz!mrgBVn}lRr0Vm
za%f0C!j|kM_#3opDQmK)4_RCA9-TFIYg5)e==XX<>R0(F8N(SEB#)DGij{2E`T?J4
zy}|s{QOG%rmmgV!P-oiXvR5jHhW*yB&BZ>SYj8^c@+sKh9!!SM<mjG#Rph&Tw;Ws?
za-B_ThhU#|1H6mz;w)^mKB2xV?<6yG_l~@ncgBz!n2fw@K#pRLcS6M__-h>T!8(gP
zR9yEC@^_Dacdy1||7_p>sC`iH!P{H<#<6egVdbT>9{Rzd_YA>O<Q&F+Z0K`CUmx;r
zlREyiAvuRW<s-1fI|t-z?)0QyrE54UPZ00f@UIS8_f%th_fo#}Q$u$cf~D3n)#^_h
zdghQ^^ch1>8G^I!doSnCLw=tQPhg0eRnBIu?;b<{V91YP?N!Nt<q~WSmfCaojvL&t
zHqIy5g<8^{23(w_&shoii@lmvZfTtYcB0P>eQ5~3$fxWzS^Kn?q}~ln*_8gRaa)_R
z79-b#>Gp5sQP%9#(^o%m^*x@|@YX*M4_UwUUaGwy>k{5ySEFA(ByUIFL;Tv%pPhJr
zUCw&JkabgX7Ps^XLws8I?ENjiX`fH5R?m6&fWMFhEU-3V4Orc7|L4e%n*6MxGl%4#
zhll(w=$S+349QF3?Hh-zd61phWN)2}tT%~Wa7YbhT)v<tfLqoV<(%qe`#|2+P*1~u
zb+`Bk17YD$40$ij`o}*Sa)g=m|5HQZ<~0vo^ML(#7;GKMnx{J7@8{t({FG<<ZKt~L
zCx^(z-nG0)+=V&(Up@wBV2hj*etKU3e#&Ro{dM#84u{&tdsgHs_hfJ42ke3k7Z1T{
zwJ6(!2V#EvXJlgi!hV8xYT+j$C+|&(hwv3X*mJi2N0#=O<jVS#lfh`Yo%)$=s+;M6
z-pxxL@T4J_h(AP6eTR*()4BxA2{+}W`g!>f%!GgPXnCo8!nz~uGtUSQbgzx|RQQP2
zb8*YF;*0eHHKRGm)#R+?CC1sWHb?mYJCbXAACX<lPcIyT(dHrFlY6SI{BB~F+V}jK
zjjK1=xA)zDb?BBuHyV<EUTes2H~!X;-*A5C*mtIyzkGI;{>Bo{v8x}y`d&NxL~zzS
zczomhA$}n5f)mCjM{;3b>W2Fdd2h@*qqQdX`cH@Kt=q#;OWN~*m)`O8yB>Q*hlaeD
zXz%<UL-!hTv<7<HA?@T_aO0ChZy!1`<XyZ656Ly;oa!@wmqUK#9bb0Fj>KPk5#(&`
zg{_LUFhVXMZ?N}f{nEPx>)#<zx1t{yf{}i6DOVMr>>JaAH7)pS-Cqr-{-8(ou=icr
zH{U#Oh`+*fxhLQM*&+N}Yk2&ScZtLRd**UUYoGA&eM2zRTCr>P+u^GB3*?%f^$wDE
zwQoLjy`f`QI<~imqP~6UkazcB1HY2zu`4x={7=r{Z(z`?b#(7kUOw+5ett;J{jMR{
z$+pxTa>~~ay=6#V-ulJYmwhyGNNx{b#8v)gEdBr|>{nlDKHg2Z>5w%lxL|Kh%*C_Z
z(_Xk3LvCtqd8pc4oi3-gCxo1fLw`PGP2^99K05UNA+?CSA6BZ%&l>VBxcp6wSC_Y+
zt~Ta>))uYj$#viW-eC;vpmX~`^l!gW4(eS+@)H{zeV5C~v*oGkMSJjS6nUq0H~AL3
zArqLUrj<|edpH0??We25)#K`Nxf30#*X5>iOxML`HdnpQq4_3ksfHB;V3svcd5*jg
z=E)W1hU^#~BIo97PfMHDWnm-SB@<W&|JXfSA}c;-E-(whJm2Mc_QbT)9!Ba%?q}T<
z{u+~=ut&HJ>tMO><b^N1;)NfZi~eCLnaL@wYgofjLx?%-O3vaPAZwuFB6<3#N9h<p
z^Z*y++4L#i!Gmwk-njka3y0*3>MZM__LP2p==wv~7!uIGHNPMJ`p{Q~9KStumE%|0
z`(3?vqV6@Mc2k$}89oM2*oj<TT!9^QE7xPIFiq#`RPQc&_vST29~t_qA@3>QXvjN@
zcN)6e5d6I739^smeR^x0*8YBU$h+V2F&G0&y{mWn(4nCl40$)|(?fC=wV6Byp31fO
z>)*^?rTUsZS(9cve1eU`RCShm%YKlYqW3^y0(=p-T!*9D!cy;}lvC)BKEzG&(mFof
zvU9!)C*YZSUT&;DwLVNv)+c{{=uSiG@Bc6aAFYXcXGvaZUkJ{kR}QK9Uo>Q|$l9{F
zV!uf3e(KPKtOIbx`#IjpIXonHQRneF>v-xq>sZ#f*bq6W<Hcw1Zi}7v%RWBzCqwqo
z-ZKPS#a4BQ8eM)aH)k7Sjyg#F>fLU6ml}zW@Ll$A&C1%IcNV>`;r9&ctOpNSd-Q&Q
z*aJ(&<_`?X9pNLK{KAmAiP>-!hN{iU(|zw4!(SL`&D3wmy%Q?`7T2u*dLPP~le`li
z*?$mo`4{Z5PAFGkEA}(wY2G;!7sQ>@hv*+xMy+qUr;T{6?u7@Qhn+AP4!|I|!<W^R
z>QVj;%f){_4=dHBY#27+^;RcHoWA*xI3!<%rGI-!-TvM0?fzdrI4W<0Y5dgw2`q#~
zFmj7sFkX%wSr2z^-mp!cY94GIrnMfbPj&=f<$Q3`{OGzIw6#lkDz8Ma7skR`>!<ui
zE<*mF9TM;5&wPo!$}h>tZx-e0a&7h_zL0@Bo^7)$^7OoZ#VYFo=4(FQDf2G3`q{dR
zT**3<H9R@PxkIh--|hI__TDe?w--(wl9SpGl9yWF{IQ|y4%w@}$<XbF?m49Hf7X!v
z!y2nvj9-Yg;;Hz-|9oIP>{Jt3llSh3J#cx}BZpvs{OaRFUmd#gDOcY68zJ8N_RjpR
zhUA^64c%_Y_x_ID56|z=VW;<ZtfTrn7xqT19sc5we9nH6`po+*>ONQ@H&(Z^D{)!8
z5(m92Am-TTu_h&FP=CWsSZN=~`qd3i(81X=zTuGiOid<tRgdu<n8T*5C$UX-Dwj|@
z8JCU21%Ky9?QW049=P9OdAH_==I@AF)4SD>H9YaazWEb|{0*qHhpZpNN$)K<lBMf%
zaql~kgZI6y2dZQL&d_(S^xZuyk%zrzNIi@P^`5;MSi!#7Dm&*-;=T1b?-H=9Q-`cu
zS`Yfmq5n1X*`Yrjx^(ChL!TT{r`w~4weZvLWz;M3d+|tr?3LY;yRrBfpRtc%{}g7h
zf7p&kYm)XLy*m+(+Gl55>Umh|{aJOrcb4F(92Gftjf{KG366Si%isMF-|0gC-i^A~
zkbFfhD&G_H<Tc(W5o=+B`d!@$L%gG=hL>Mjv+>><8{&`VdiNpM*@s*ehMN1~A^yu&
z<bmo}_+dQ>R=^1Bm2Afvf_%w(nD{HVD*sgX!Bz6Im!u8M_>m!N?`)lJ<<e?h_$(H%
zeK;cj;{$M9T(Fj4&q#ceXR`x%Z?1S|-}c7n4*&8~*y&ligiEbm>YKdey2#oGa?R0w
zIBV@!T!Oov#|s(5V?;*2yY9Yr)&}?(JchZ+O-*B+3}%u8JoS!*Jk+|jIBAW>`)Fb_
zy{lE}UY%&|SnlWVGLS#)7Hh0YkOy6>Ev(7#2kU!sh6{#XIAs0*!9(8T^ZO(3();^N
ze{Tq`{`k-hhwLNyt*9DbE^D9l>>>Edm-rcsk;BOA$d-MWAKt`G7%R7sBYu7e?pe2j
z9cuo=L-0a=Wj{p?d+E^UhO7fv3-sGMdnbOg4Ua!KBqz1Ddft$H%s$E)Lu%W9G9({^
zRqB1?!WB87cVX<SkfR)t?A1<uTI^DDTEC%hI^{!b%KXF-xu-mXpWJ__eOBMe-QPP9
z!`UXgV;k&<{`m}j$rr>?xrO%x;GEyK^YwQP*>{p_S;I4j8xGk+x$ThnanB*Yt5M5a
z_q2}sfT4dgWKEb1?5o^(NS^xxL*g5J(ZBlEZ}r#|Tl4ORcQ5&`crRy{C$U{R<wxcO
z6XoFc(Zn5i>-|}Oo6(ww9M*ShB!1h={=_Kjf$UMe1cTs<yhmPRt%`5+J^oJqFd#X}
z%isr`z4MU00`<81UtXz37c1oW^3C5JIx-~x_8$GKPmq}6yS&tWm<p?{A@sLIy{m7}
z#`+`Oz%c%4e@X64fA%xffqa{6<Ynwb&S_r#?#4XJRo5JqjmXW-pN+sJcp<*PZtnou
zS5T81mrmd*tQVW*?QlY#pjO3ad8wR6ZYsAH7p#d|8z4)0srXP{O5SQGn5bSh2RgQ1
z!M@qHT*DmjFW+YCj;?v%pt*Pl!Sj4YzRl*Xx5~NYrTod<$j<!a$JUz3ldbVP`8Xb7
zhkC#}B93B${De%{g`@U8<Gwi5bJj=268X5eD8}>-1AUSYImzS6E%{jkbX{I+-^8=_
z`0xr_*=V_}T7x~Sx7hr#<Hz=DF}dv9hF&@JoT0}L`CTXM{FNa%dgl{#*V*sC_mFo)
z)%wpK^4vv39~+Vzdw+!=sp;f7^h9s=Sz0^9w|v09HEdIRS<kX}aMc4>-NTMs9Js|E
zZm4tN#lwf-<r9aVGGsqnekwn+mm-&Y)X>9*U<+LN7ejL6e>S9UmIKP$?B`equ<vEv
z?ZZRX;_UhGMYslM_?A5B(2!Us7vS6SsMhW2l8ve#)GA^>>=dhuxopcilcRi|4U5lm
zLN+GGvJ?4`x<%fou2au>CkpPv4!D6o^)5`5pUK0l4=Tj3G3&0d6ZZc7Avt^G`%e#9
z1NpHbG0i$Ej8zM(gT*^}J&X~<?QL2^<h$}BxZ=ak#c#Q#+E?6xD{>t804LxIf0U!a
zU%9;BI(qj@{^s2#K3V<ieRH{x=iw6{mmA1mti`cs_zr8WC0g@l>((>XdHe<D$T9c{
zAE7tza#|Z^Z{mj7ZjbNZ56Mj)HYApjuXR&vFLaNr4Y{tJT-mw^ESK-li~jkeG1Vbr
zvh^c=4JWK$Si@r%<RmX+6Kp}86{F;Q$Qq!zi!bs-ervtO-nR8a@|B<QrE)W}P+J%a
z7Qr4kVtsW_QS*<w(Rzhz{0~N}k;x99o`Yxfx$;{MYYmeg<cV|wEAfU`Ijp@BdPCMU
zeRsWmDD%<Yb8-{5FAmYEx?jCduW%Md&@F!GS4|&Q!pkVEWrwiS(Ok6WN9IB<`XeKK
ziy`uJW6AfdFF1N9%k_19@`TyO7DMH|@_l;?eBb(sSfwuDr(zduI5-3!ieYp?zSb+`
z3G`on#z*8`_7JQSs(Ixh_GIieSWmN#`tG5(4!w5h6+`C@y=>_Gp+6Y1k9+ZuTv^?y
zKD6)cy)A1N)+enc@I^6?9^eys;0=zkU6{;I_=R^tz5nQaKRKv<X;=v};l}lbZZveW
zA=rAyA^Dr%2f<wVoP6(J4ta0N(KYLi-lO@2q1zALX2^Rq>S_2S|GmzT7+@^xb@D$v
zz$SIQe98L)@*jR_z0~@gTnk2#zq(E=WfyEo{DxIxy8KX#uO_nADDI1uuJbRp&o0>o
z8&W^(3)av-y^9CxS?dlkMJ$t-iDz<R@BUbWu*PkjQJj$<n-k2nPiAex5q^`ewMluu
z{UG&sdpmMKdq(ykt+}+nBQ{z8r#pFq9KhW9JG<pWasjr@*3C=YfkEt$Ey#cPD&Lh$
zsk_w-$l48DcHP?E*1xUmdmfg-DDjOv$<jFT!?21E$e;MAI0ui|9_$wH=#4MQ>CH#X
zv1d-c;-CB(Zo_Ms45zCzt2N2RnyvNWGlsmkB!0naxu-Q!V^|ZEE2*FOIDf|<EPzS;
z1MaDdVV<}qCdp;Y7j8SEu-g4Fjts<qwx&N=)4QMSiB7DOl@H1x@!^Q*4UXXp9>Qff
zCYGql*s*mD^}hH>-fS2~i!F2!&#)JXC9b(g_wo>SfX{R#My+^U-iufK>@wKhzwi;C
z$d#2}&snqNKk^%Wsz2Btp5+VT03O&3o~$!Fs;$fck78c$EZ|YhFn7L8CU_9be8gTh
z#1F(|?`U~vO>HEPV>j$W9ew7I-_H5%@so$x&u<K|G0&(`<kWCnZD|~M$)54cU*tE|
zp!^=w8m7D#ZrkH{@6hXqVD&jezda;he#{Aa?7ZXpq@kw`$)T+yziQ}hLook;4*lOD
zHLCq2d6T+DjzDgF8BgjYYXNWw@33LJ7yrZax0PVEIvgfjzp$Puf40Bwx9iq1UORN*
z(3?+?_muu{$lu#^-@cNz)<x|%$-{qr=z&9U{j?!#B=Tz?IA=`&hN)-a;uD7CQDjU<
z?Wc&X;<uR1UdWkE^F6j}ZA|QfN#t&?nLHfTelTmT=c>=uar{NU`Zo@&p<6nJpK@GS
zBIj>k9?#z2lo$Jbne`Y6zqsVx5BakgXzg9T?fZ`oiH$zqskeu3eN>Jv4v3{{co@$9
z{LVo>>3vkOi`~j$;gZ^yU%?8xX7}P1pWw&jVXf2r)$DR<>!NBd>lWU3vVLw|*wNa@
zX+!R-0j;C5UA3`#Sq^TE9nQ<+*qL$25tfOI@P;h;Hh(Yowk{+el0%TITDAP!S{3XK
z!^s*x^Fz5cx${Ry-^Eb(<m0d&hRfT<ce%EHt988#;6qk)3oBs`tRXKv!$kfHTi`Ri
zHn+n=t-XqA=Ip!Nm2Bm<u--Zcj3Rru1s~;c@JG!Co8<;{1;6D8;;y_8Uy=L~`R*w0
zl#6@D^Kw@DhMCoo@<n6QfqBpe4CfPKFC4<NIf&0ub8<AV^6}P|^+6{53&xU@cqcD6
zPx4cn!ff&szvRs@P#jw0g89QD>mBsKE?}~`7UQj#%S+&?*lVBNdb)fW23RYzjv?;z
z1$G0!)o%R5{`~r0GCXG=)|>sE3iiUEV7T1Ccex>ZlRLm0eOixVr+87P;n`f&mgKC~
zB18UQzk%P_)A#pl?YDem_U7!td}QdIL$4b;f5`gubB4|yde#t3f8NlGhr|Hb{-&Y#
z4B6B9^3bGc$L0I-bG5OxSawLyWG_b`Lu+YdLk{v9G3(_+)+^-3u<2U!yU(8;y2H@D
zhk7r--z4$3U(O%$JAHr8<V{1?tR1~)<#(uI{E>NI!aD@kwyjTlcLK)SFT2|ijF+o>
zuM^f8+xmkX*L%d)FIzjHAM3<olf5u;3QkxbWFIhu?AN?pE+gKvOF3o!$|w0OTX$41
zvws-Hj`=A2WxMiCecF%N;*|9Z`JX(HJ*aoQyUkw2Cj0*Wo{6<)`&iaktPOdez&!mX
zN}k@kS@QRCcxzYQF|a?{y9Iu8>bGQX8B)8bsq8BlOFp7@VdM7f$%lXN895;SVZR)b
zOvr;D%gL?R!fxv*YDXAv&04O|JFeE??5QGa-krN1*?;wpj=fmV_ILK|jhsFtCa6<k
zrt#Tk>oG72-pc9m3-f&VmN-Vv>{cERzvbfm(Y)cjoJ;OyP0K!^xM*M7-<5GrPGYi}
zsvOO8{F=_J!;qc4o_*P?vp>OK;0^z_ULbc>|L}440qfu>427TGpB4AKuVKBCA6h3i
ze@EZpfqcV#F&D{0tcmwGRM;jtsR!T)8;09(1&-6B7|K57uyB<OVXK@+eIUQbD~wf-
zhzIgq`3pQiVvaefYhf>P9<lidE+e_Q`;OXsp5Clm>JP2`8_&4>6Cd<!eG}nPj1mvz
z19*2tt)*yZ4*1uXv5bqa)^x-@vBG+k99wP%8|*KN?X9t}BXzxcyEQ#~D%RlS6)?s-
z*5U(yvc@N`LhM9d%<ho5;iz8s-hyY;huM+*B0G{Nwhw`4{%DSJN;Q)jg|5X{`6nB(
z=ODL|gIQ<yK7&0bzyI<#SdJY(wwKpmKKu9I8v5ptqwnr{zr^0BXVet-qSP01Hhr@>
zF+wh*c2iH0HMz<u$nAzh@PyBqCqLs;a&URAy?XCM`R&|~%x}a_9g?@-dgzWr)@Q8O
z{OcjP{X>StlSeG%T@&BE6Jf30zMi-vM(9Id_VKJWi%q8td5;w~THEOFne@)8->%C4
z=!Re0D^?%KiLJAl7yA%5tXavG<X`NKKdBewE^3ByCH}|Ht1X?&pVjo*$q!qf;DhX%
zy~`uvnX#<*utzzITt)t%ZjjUBlWoB>YsKnGnB}+2>Im!T=I3w0$o<6=aR6Bx^3JY(
z5Bs}xV~@{sp0_tB&RgFQo7gQox5o!h`GUMj9%cQ+S{Gm9-+Ycww$>wdkO5m2JM9U>
zI(T;fA?uIuUX3Z1s1w8!@22#ABU_fI_%6=4rwu#zjAz-sy;AQC!%TG<T;(6~PHQ9L
zbn7B=OZr>ag<5Ns9H}ep$D8A+Lu|pk<%ib1=zxvG0VKzZ#C7M6NbaO9`FYOXu|CL>
zo$1#aKADOk^lcB0?!`1YyEQ90K3`*h@DWzaHN<I{PUhARt#7n$-WtbhkLn6JI1*Qp
znBlv7*=o5tdlh%f&&3isy7AN`WT`GGri95bIxHq<_6^5iJ?u9Rv4G9PXGi4PdawKD
z&i~+{+?k({iM(H|ZC&1)JbR>1_+C8(qsUT@!)EE(8sL`TuC;bY^)M3C*#vu+V_5Hj
z3-ly!Vk=_59FNUd3zF;8r`$^2sLqi4(KoDDZ_vMYKKQkqP`(O(*onB1jj<=|1xU;g
zdmOVbZP}E5^s5dQOT;gH$cgZ3F6Iwk$d1plC3=EGas+yYWBgVfD*u(I*stfi@((`7
zfB739_MSCAw$~;v<d4X@z<%#cc`rgfBZsk;pjMPu%ZrQ)C)pf~Y|Ra}um$>7zpB6K
zpuM-&Zq@4K1|!AU-V5s82l<_M8O|S)7u(N-iQYZ)n-1$G-beO6uiC;|jCB-$^TnEy
zd>pBNyvyzAyLZ*BwQDPH_pJA)#T$L<+wWA=D)1LB!)H9eYwI)ee;6!g!eM(2u-)H3
zv{vE$CYUS_RpW>Oat=9&`NAT$qkff}vM>9%?2i4xG4|*kR5dW!v0JvmuGzUf2=1^G
zxe>qNLokR>@h$li;&XhDE%8Tw$v+WajjS<rz8<??`;OY=;~n+C^?BpAFSp`=YxrBS
z0Pn~=n#=awea}Se9QA1oV<LRv(;Q&an%l~0VI7;5E0n{oxhsE@gR^hz^srQZ2Vdd1
zdO_~aALR>TmwX<!Bj>Kedu{9+gw6a|9j{+G3XE2R7!N*+8~d%Nzyot4XSyX17|I6J
zG;q_0@4?Nm60V3>2u^m+p2E`XN-m`z{jo3W4A~dkGH&usw(19zjKznwZm2eKB=-om
zZAl!8+*2d0F-g5p%rRbMeDzGW$rjd_ldWYt*&3{E-`hN47a~*Cx*S=M3F3QbJ(mxz
zvL}BZag0on^V+yqY$JQRLe72GcFya=xsNt<M~C$5yjbWOT4N$CM&hCRMGYmF5fdY^
z(LSNPy7(wYBA6uCLI;P$uE=-SwecK+Uy*pLU;P`)*l<l;wr46{;}y?jV1DLHzH$Qk
zpeH)Z{$Nq|$G`ao8^{LP2^-7~9oePaCR+0t&*~=|V&iNG#$+q(gH5mn`le6%O7`-P
zt&GigE7xR6ZfY`eg!|qTkY~zAB6-3}>RqwI5y?%FYn_X=NS+b-u0}zwS${!m&Lb9C
zFF|sk&K=!Du6Hh%ksl%TxBMH)b9%2&-gIb4%#%B*&$szgIlBBw?qp3@yj0g9>->>e
z8f~vxM{>_Ip4ZQshn3^w1y6E(eB#|)%#%FGM=YinI%3as$Y1yln}wnD&WG9R8jsm4
zOeub`p*0R?yKF6+%Z9f{c8%CI+zb1%^{zQ?*KM-@@YWHwihFW?WGzPgLuwY}-1YTd
zZCn#GxA)d(Yg?bS?OD&Gc)-ufSNA(^+cgi*6eG-a^=q==-^jVTWvyqD=PJi!?dZBA
z9U)i~i7}BpW6d?R(cZJGZk?~X?YzGA=e%|+U(F@m<30Wy*YhpU@#)C!cG=O%x(vo4
z_6b{2wi*U@Pwa$+uo#u6g^%51|7+aj8`X3$Q|yBC#jElXF+iS+;3z*s@?Wun?>UNL
z)po_PHI@}ywAD@@`qQsigJ89B#hl{j8hgbcAHEIi5!~M|56Jh$sx>EQ&M?9lYwop;
z&3G&}<KMj2xtX6BT6}dBmpiWKFiTt!Pf&5%HROJ=ykjw`IPQD>tk3tX`#s|rUt)dn
zUhKoSdC*<@ThG%CozPEuA+Pcw@}mp3L#E|k<p<?z<!fvYu|qLCdxgoUJkNRey5^Z;
ze7dB2cHqNy*~x0V_)dT6OuUdskxgq1;&pM@I)j)a_7p3v5fmrINbyQ+w2sjF!v8Nm
z7BAQM*II-)sE^jc9QCah_b!$3#AY$tItO0FZn0c^uT~ZR@h(QnH_S<_l((2CTVX@&
z!Tihl*g<~DC;1~?NBKs2CujOziSF}7x>@y4-`N2_%m((e130CYfoH|$YF8Kuhtbg?
z*sJ~!XQ~&)I`x@)(Yn7{@sc5RoO({JX#LGP+*&WH8NI8dCaf-08zSG`Qzxn`omV%y
zwyhtHVJzcXW5kCwz4nR3UU3uO_%GKrCoxLQg6rhK56Fq!_QNo8NBO|26MEWnj1&L3
zS3Z=EU}ieWACrIaMhv2ZH8&FHlE0X5F4czSMjyz%@_RAfbK<CZ>Mz|Iqxfg;<@RB~
z4jp#?;*(79zQ(T=1LS|@{^3E#T?MxLSDUa5c2xIuEbgqbBd_obFSsh+;+x#oxZT|7
z)tr%Yb6>BSzh|q5>B0PsVazL<t9gl+u#W#C@wHe5>#bK+>xfkd28d1KPWVs^axAv2
z_h6>lu|C#5jZs`#@g#o4(DH*~{u)<`_w=#G6*h~)nAPT8ryI8JlMOhhyH%%KU(m)l
z+HCEGOv?k{U@=5|ERL*sjdSGQe)m_oY}@o)F_?_#ulTz?ipS))%a(TkZn1jJpUj0!
zqh#XPwdPL;p4A`S=slZq#9J~jC;FFDw4NZg92{ah>_(2GUKWSc%GJUhtB-e8@%Puo
z)x+Xh_Z^FE`YXN}L!3k9R^?atKx{g~WBC;yC`U7o@+IedBx3XCo1L3~dUaf{Z_j<t
zS2~u9<x7sc3~l#+*ErX<_T9&i^ZM+5{ke`-n=IeX@7OlGU<3Su4~gI60$hb}a0jk!
z;{lx7#)G31yQ*`=GxZ+aZ(UJ*5Es;$)tcg<SdGL+)OSZQ99eS}KRY^iz4q0``qOtc
zsiQizTDLv5>Ra(jd}<A|TD0S?LOr?HRy{9<p=wswoqG<gb*=C2lh2mwV|}(hij|&O
zYtQQ3VrTKQI#B$fFM3;Z2YRJn*y#iJ^8N5{>-+hCSObS(z=}uCwOg@LKiO5dU0uMo
z#BR2QitG4A^1pIFv2dm0XnDf+=)U%3P#pH1Y>LO-Bcp0#<CbR>Z>y8bG02XO_=p>1
z2Q!nI`I7@#p=9J**z7#2o$o7-J9o`9`b5UytH}A9v*5)izQ{d_$FMyfje$RyP|PV`
zC~lWK6wBaSI1>)R8(6erKkN)o<q9joT=-jDa1<w84}UxAC;T-|SceZh#kY8rtjRQ4
zCd1^I+{l7_e9Gzai(Qtn%O^VD<{W+R8OQa!+{7_^*)y8upEbAK>Ik1m3`TUewV&o_
zzQyG9m%fr$x=K&vODE}p4#dngK8vwpuJ~)sb$e7}qSl(*llT6Ty4i6{YSi_b@9OK;
zs5`nIwWhtUcegHHPEh`!)|CT@`Q~Px#Yu6HJ+m3|BDd^=tm&Y9lipz!;``g$D7<p4
zR)r~H3`|;ceEEI3zI)+NSmxNdcD1QCaO}K(TQ77h9*7a!^X@yw!`k1Dv+u7%>Z4<0
z8Qb|9i&~2<9u^<Pu3}nwfW5+Pov1z(qpKUMAzg3%*fWtnA~Cyl<u%5tE%6xN%{#en
z<0KtMVnXquxZ&8^YB8!fwLVvl<oPvzWf!ZS(`WLJ$F6tmI^I|Q_v_Pr*NtCnE0&3~
zVy>KyJ<A2cCpZWXi!I@gBkX}SE6%`M1aG#Ov*w$8EsU<M=lEYfSl?l^@nBx@jZgMj
z;B(*8u$=#{=e}<-+qLx*P8-X0M`Pn7d8}Am%uX)mXRfffI9Y5I$KdV3q2gXOO8bZ~
zt9y>sD2|@hM_8tRV<khp;En$15&z~RCebsU!zwn*HrN(l=HGnf=n%hMec1VW-Tm@X
z{#;I<Kl9tpSN~l1e8PjqTK8bsIseGl@Y-50d!;`*F+ciXH)PJ<<Rs)nzH$k&B-i#|
z#R)MCiCM*}_D97a>!{xOvFB)A)%vP+R_ndUdx!0fT95V4nDt-pC$>Lo9k}<)>}^`-
zwcqL8X5{xQ-l;lc$h$}0@m<L^?~6KW;~i-2k@u94KD_&EFBREiwU@fCAFunU=3!2)
z6N|t0QN>U(T@5bov$^&b#7%jZyrEo6?Bu)hEV9o>>4U8yIx1$u8v4ub;ACrBY!FVt
zt6~aUgxPF@?G;BlW;@}0w%B#Y+GbzbaL3i28^d!e>9^XoxV6@>*|^xWTirbQZ?$Io
zqH5A=-RjSd)vFzA=h@EJw%ToJz3&{UZ`H)=WMtjBcS@bN4y|_9R-e_&=EQf+mrUqF
z45cT2Nr&PIy~>MFF$CuHDYp$n_rq}b8$NAqg?*F{t#Pne*)_Hkmf;hzqt4xrv@?$@
zBIB{imCSj)?i|$ze(K+`F|=7@Ff0>);V_xOWPU<+s92P|)>zEX%KbaS`z`TFq>X#E
z?YcO{cZ<Ed2)_Gw7o~T5x1F!GUwL!K{bIR(_2!;q{jB3?v+@ux>k*&Gb7CoM7x#*x
zt=FwF(f!uFV3udpK4BN0^hqwoNj6FL^ueC#2tLs{y}}|G0S}6G<)-DT{GIRQm-(Y(
zKHM=($Vc-%N2HxL?jz@r1>W$-a1T#nHhW`-`K39ClYELD$pz@1&d7tj;5^J%Q;7#+
zgZ)JD%zmSICB}$9-jDV7MEvI0JG1>pv)})EpVr^;Kz^qZ`F-3<uGh|QBK+RMZ-%{#
z+wVP%;hkK+2Q{YOO8Tw2-;{`l#mHi!-v<>3#aA(~JymfKiOJ%ixwU6{Xx=Fj<IUZB
zQ0h(bkUV;~NZl)MSl5+XLzZ7`V`S?d9amdy{gn>bAUmg%Y*22=4$IZpA}p+~41dD7
zHDBAtuVNNkU5V`=v8*<Z@SRP$2lKnn-q>BXot;{XU1N%OVeM-=dN<Zyr}t&OH;e3l
zcHZ~irF9SWUajXZS;&5^-<Pawy!);7uD*reB5`#ie>FFALTg^SpNv*Hl@pM&yg@94
z33R~sibX5_J5NXHM=nxd$$zJjlkY>(L;h_n&lY?2N&n&!e1cPAFdNy{bk%jOMHOEh
z#T@okEhH9&8P1Ejj_eK@55^cDiK}Gb-1X*L%=MjIw(-~f$h_cJluR8xr*HAoe0R}y
z7jKKH<&fK$T0G@TKK#m>PBm?Dl>dnZd{K<)SllYVErxooXV;jz#<4ZV=|}9V4uk>4
zBseTiRTs*$;R#$(x2W};qpo+XHiSh{?bldX&W;B>;#s{^JuNnn5j!YXX9sM`ngO}f
zEqRkQJA+AVi~TqjFW2=BxnZ`MUDi%NE0*b>ov?}34%m--c+fsx*ag2Rzh^_*x{vSd
zn$G1;KF;aB^=`7DC;Ex#h%U&FEa?D|b@CPm!~=0bj1V(=A4q-JdqCBK-r-UEsm;VG
z@wDH!s^i2m@vXn5Ar2zHkM=hZ#98qc`F*0_--wCGxo10yjbb8FE2=S#D;DCT-_Ci5
z$a%FYUe}n|d$zqF+&jY6!;Zzx-o<U*w^~w-O;&6(`DN2=SbQYw)-LFP@8xf;`>@q~
z){#D|E7oH;#)iW-c2I8Zymb$@3D?*QyJI^jOk#s<3hu({a9WHgcC5!W4_vPoYq~EU
zt@WIERet9vwzltCY!&y^YpCD2^#0NsCp-7ML9w%=bN7(n#zbPR^Nu~Q{r3637vt58
z_`>6MZ&r-PtG4*8zEp!&TatnJEG~<EVjX`b|8NFo(4AQ2lmCXj;dZzjropwa%`;b&
zOTnsQT-ZbBE3Oo$9r5T`{ALryXwOCB77E9@uHWssHs;Ls;2eyDnQ)T5Hh1`CPUddD
z`~;p`>w@q6h(EQD!@r6Xov$%Ld(Tx9$w&1`ru;5HGcLc9Ka@lGzEU|wu|sU2J2=eG
z$ho-CdFuw-SVG^%(Z7%J`MbH(uh<12nmhi*(CRw)O(w3(yUF9=5Zob$)=WL4oqn1(
zxthBifz60(>m29>zmD`IFQI1`QGS;FnjabHgIto|7MHqSK9=n0-#NT0zKWUR9vf;*
z_QQ7Im@(tg^Yu|b#$HLkcr+(%*_%&TyUTKR?^|bcFuL_sGWR{XIkF$}bdQaZH`!a;
z76aN-w8kh-h#hLqew!;U6^nYWcDu%^t+=J8Q|GDs#J%F8V{4|ZlZu7AsJQz-KE+I=
zrd?~w)?i()zhdngZ{1gq>Qjsr-|=KkSS?u%*&d~%b!N4;xF~-h3poZGWvgs<tqXUn
z9=pBk&dIhM)w%0@g09MI=pY}VA8pbRKk{L3#YuL+&gkDY_xK+lSjlzvnmuMaj%>_z
zlnv)A?6z3D=I{Kc*vqcjGP{PUYEQ9N+!QOs4Y5%SL2K>jdQ`iPYkSYE&xu>w)wVwB
zzc?nA6~ngAYg_ztt`BisY{R?Qwv7`o15Okpj!s+<SG1Koh>7xq)|AQ}*7`dh@nd{4
z@+`TLp}ye)`Bp!{EP8;!Z~|V08E_7*m_d)OX<zP5f3OBQ7qg;OpT^#fzdpP25&js@
z_`Vy{82UDc=3xxi9HZ{<H>PpS(LC5V`}V00<U8dN)dPGm{1Q`PnAow#&teWN)LtCn
zYx$<WqWq7K@;~GACH`i<c*CPPufCF;&6j`BDeUJb9kV4e&~BBnzIGbk%|AaC1NgPv
z2tRNm+%B%l4Pa7KzOY}Mb&qVq_i)WM&x^@qVVvfV2R4Xbb7QmR*yYUmj_YzR?bsoC
zdEQ5VYn&3hd?#~r!LPZbL%9IVUCA}~wbR~n^r#O+ud6+1XHMF%A3S7F+QV^kCx_l=
zRR<Y!9Y>$qB4c{C{9|u&%luq7mif_JAGwjS-4_qCU47%x_wpfQtHs10v8Xz&m}LLY
zJ2r=g#9Zs7;<0$EuC)iME_AL|EDl>&jl{s#SRK`zVsv|*>Rz>|ebH)A=i+C-ANBhe
z&*DK2AU{CHujW*9i>cL^Y>$tMrF@p%u}iWwf3nH{<dM$BM0QE;WV_Z6<v`>bx$pW)
zYhQdwpGg1oLRY99R$uNnUbSp-Hof{@yoD1;Y=vPcoaEp9oL}&N7zi8q3!f5K_)oD#
z3=yNm4fPum=ZbaeHFe`!EBfxbwOv#^?D=ZJ`VpJNRB^EN*y3#0#j9c*p4N3*{*T{s
zfbc+kb1pA%zc$rm;^>Ntun}g2jVnIF9r2^svBnZI^qd%7oOUd}IBKuI`qW<(Zqvz1
z?$_RRdRs}Xs=c=Q>AQQ{u5G$kAL0jWES|Cxb^|Ndyl$=C<a6tNcITrF`|}*q?uz=T
zt@hEHKkjun|FG@+fp72~#3%See$jdU#6O+8&ae0%zrkyKnM3)fdCMipfjq>$@|xt~
zxbvi4ebsey)Ng)>_vEmSrJXryhnJPagD@g|aCFT*RC{tju4zLCVUly#$P5p7G?#J(
z$L41)WPr3YU-31Yar8Y|B#&@}tdRRif8>BKvWKBC_27y4DUR4X^iEChh&nIEl{bXL
z;-NawbG?TnHnykMvoO3doO`}nea*AP<Z2;tn9Rrv;Ww<OA9^B_Y=RH*Up|hU^EL8e
zL)p3clRX)*y*0jyEv+rY?>awg!`>ybZYpLTIzeI>5<`oz;;c1ewWE91lEt~6)7CvP
z7dc<QyXJZESf9mB&x@1RW%1JbtaBv(Z}&FUrHEe2<H}jeb?JfpQMr=ya$j=dv*|~h
z)@7W#PETZtim#6OH=p1mj(lLnh_ImcTi>FumFUoiFVktCu*kLii;b{<ewClG7kDgI
zl!G5V5o^R7=VEPp5o`Ur)^qAOB-V*}V&F<^94t0g13G$Ee`}xHetg%i7+LMP^0eMt
zV`n)-d4nTb=W4#iSTQjlDrQ!jXtO@A5BJuX%<ssRe8n#E=7Zr7Y~qhF4ffIzUF|7z
z{z<Rt)Uoq)9d?I{#Rh$^dWMg9!4oPkaP-~$)^qbXy3xD&k|%P$%BkFey!MluzLUi&
z2lfcN!X$IgFZc>S;!pgFe^$4_rxk-ccO7Y0Zp?S{S^e=V{^LXLc-SwNtholA`M%ce
z$<fi=%8ML*FMo10|74VpWh?H}k1^=4JeUq6GNNm;fhpnv%!yX)3X5DLH*GxwN6;!)
zSVvA`5OS`z@~nP*C(C478}~dL)mA%kLu`wDM{qW*)gFe@gZQ<J>^nbT_xRPub84UB
zu=pwli$w^A!*g|#cU>L(o#ZxtYbPcnaY0+;yl2FPZEPR|_QP(%;^Y`^ch7wICc7#o
zZ|#OHp!Cl6=s7>&3(na>`e&oQyN=2QT}R;vd=OLcL+|ucZBLeTLWbr@4(1&to8;8H
z!{VrTYRy-?wf>8CJEXVWi|6tHwY3=RIeqF+Us2zUO*iR>4(T@?`;O>c?jg5gH|1LN
zk-f9;)xX)4c_Y4Fo>aWubNcy*oY)<oLgBA-*Q0GL?fLN6bM%E)45llTemc@;`dW3V
zt$Q$lJ-|o=ZxDQlx>g(4#TcY!3VYy<m=qPW#KGdF8Wa^ri<jEKe;5^>>#um|ntS!_
zSX=F~@s6%}Mmv0<HNF@ZPx!!3^{=CNzShO=Ybyrn4^PH{!_oG;>s^D-WJb=rYT)GG
z*h^3AF&|8)s}9q-BU?c9y6V2?^+~^o?&yoI@MaF=mt2y6@^VibZShaftIoS-UhD(r
zn47U3jafYN9WVIAFI(>ed&L+ywu=_KcoELQ<#JocD8F-*zt*Pbe0RNj;pJLKx`y~{
zM|`Y#5MH-AkZa~a2mFu^`;=S9b3Dl7!^L77Oc8I~(=Oad4*I}*xd_~;E`v3$`;N*r
z%z+H?5&qyEkMNpq=t>;OSJ^b(???G8pWr9_hfjH)J+LXd)i-(gluJ1#$8=2g$=aN^
z^JspK<OOrZcbF`Oz-UJ}9kuQ()>x-(t+M>AYhn`IHZB?Y<V#^88+D#e(>)oQL;SNj
zeH9BF>CzbGi}7I&^h2M<rC<Hf75$p4Hl8yFvBy#T(TDjX=VB=th-=oH#l~u1HSM7x
zG14AzzwOjU{i~h(t^2m8s-HC{k(*e*c3o_(pK4s!#Aj{RJZ6opyJ&hco|=z2$mP~t
zkIb@bGR=O;C>!1$*%dp>2lGAp(Kh?i7dht#^`mb@7uwdIevs!}bKmpG`Fc;A+Owzl
z)~<0pSO4{8Tzs-8d>6y{PdOHULa-CIuDLxd=6k64Qk*L`@=-pWUl-^2vU8NL?-&27
zWsA}L9@Vz^xW>q}ZS8ulXB#sfYUkN4HAZ!LHGB2?x}IJC`ZZ_qtQbu;VpzFDGIDgU
z_`J%~wZ2zl730c-99=6O7XRoBiSw>?zjftwneL1gt-93?^;~@DQ(R>quzbxA`p%Bn
z7JOriY%hCuj@V&#y|w>c#5@^K*?G@<MxSgLt$vh0<ah4#Q?|}mQ6J~|K)DP4n*)D9
z<wVW1cw1lQ=%cUlApNcF-1FJBJo)ZZGH^7fHD1-$b#q4Mg_1?jX_Fkt03MKGd5QBC
zBeZYsct+;qy643M7`fIQ;$(e07cayEF;FZ}|Ex8Wx~cbN;5e+V7FuyyEG?djJ7Q*W
zve;}a*AEV<m#VY$qaGHMidEV<uU^KV`*0u5n*%wUFCquBUgb>I<jH=tNk(j1du{0f
ze`0WX0=~<q$UHkYp8kxz>cn?_u?;xPZX(~~4G-*zEy{QJJ#x+$U1zJ=sH1-HZEpCW
zfBZ(}ZY%F(BnN1{gWS!DOv#Y!#anyI{jRk5OTTQu{;hZ|=8M<bX`>$YygJzT+B<iR
z9_h{a><)?7#>Nj`@XYqfl1!7U`MFMSuKAE%@^g)x9g{T~ksadm<VVJIjL3h70K2$I
zmOlD17TwXYV|reFaP>cJ@>xf;>LdTGuk6pU^Xw$v=of#EVU2V1G9NKuKl~S0%DazF
zoE8&{hsEXMcJZ<}y585u^T>J6I2QlJyp_bfzHein_=1Xi?nmO%8k>qm;#2W0pKx?d
z+^RqE&Df~gGQQXOJ74F~xp|Ypnqzb>hlsREmYy|NW8;G^#AJHO=F0Wyk-bIXjU#>Y
z|2}M+9mA$R?uBJ+J{w^dY{EEfLd-VyF1tJV_n6k}#lP$;OmRKxdHrg)@*S^u!y{f1
z`{gI7IL6))`{&zX5}fAm{Jy$Ftbq?moIo(C+RM3X+JzyoD@+c{9AWf+1PdcP!1nMm
z+;;5TJovmhufCT&Tkpsg*)tnt8*GLR$tUgaM83PH9s6c4<i6@KxzjT_!w7Q37k=Y$
z%X>IeF5tOvF+J%|zvg4y6+`$I`^jF-yYb0F|HgEr=i;aS5Zm<0cAc|v{TVCUbk6SF
z(-vOpKYMWuKUZ53E7W;nNpYrJLF{28+0oiYEK+}pQS6D`(S7q_6YS7E{m47im%djo
z>(6!L6%*GrU+2aU59LE*rF=+#aum-y>NnoCi7(f+F{Y!O$#{5n^!?yazTv$7jNzI5
zgPh30cWpc$AD&x%NF3%*t|4-8jsK8QzCiEk!aXu`pHF9p9p#s(XUQ35w_T@acEnD@
z4cBVR2HayKDD2D5iq-W|8+MDdW4~SZ9kIJGEx+b-;a*4fTAh`j@O6G$9E1PGvGrI@
zC`Po#S&Vbk)^*f#`l{dBcpg@Wxo`y?9r7JH7uUiXd(+-6_Fk8FydvMdKju9$ZPvZ&
zb?+HA>96`W9*gU1d|ml)T^n<0p5kIeW}SB=%ktdTt;0bW5z#}~kxpQ5_^a<#C&rH&
z%Tb$kOwSjuSDkn69=;mO@rq*nHcn<^j^SfA>HB(rwNvp1!E4vGWvlv!qo_Q#K71!P
z{IXMoPx8~=^V*{NiQjxB9@p{8JM)!}`Xr<D;<&~veb!Goif3I*2Il5kc{+Zhbdvr%
z8pGJ;!LP|_jT_GU4r5?Ym?cjrH-KHPJGvJB$vxnGm=8bK^MiW`eDeR2fz`-$vB&db
z3w(r&@GEQz<EjrFT{8#AY6g6Vqq~gh<lp0n-!<29%{*)C2$!`%-N%cu#N_nA#*7PZ
zjk!bZ-M@_`9*{x#mpPJ`zMCVNHy4<U!gGD=QTzH5tBR%KrFzo(v32A1Jt^m{IXm{w
zly|SZH|4(frTQ(a^$GnUv9&b`v6C*VGx1XWS&XDZ@h|-)({$mxxtOO<wwrCTOLFxo
zA5O1Z8IYmz#OCr1@+eN@myD1$Xtgu?AWJqKU+EyZ)2s7vgdg&?d<g%1a2Hv3>uCJS
zeSQd+;U(M@mtZ@LF9wMbt&2K8I#kRE|HU$-4>g-UQTeia`i_c&#T-ZDuHUtZ7vmYX
z_-D-)^}bcdu8DJzYu13pO~=|;2ku=jM<ibMj#kf!lVl+Vi_hjze5qz#kLHY;vu99q
zyP~+cli<mJ$+EtThukgRIj_wcx11Lj=oiKo=is;R$i3Rq)f!J~Q@g$w2iE>vYn<A-
z&tJrzT{POQOR~Wg%lXTiD~3&Q4Q?ZL@4B{ZpS`cgY6$mXpYL7s-SsP?6@!gqTt@`+
zjH^x0>kq}V>+5~z;j-AkZ{ZKDLGTp0-aQyqo^8JI(D?CSPUhYG*6;DvacvVmzz77Z
zqWW8(OSan36>^^3d#3SSN3|_3^qeuf2c!0YbNPo&c*eaj%F(C%q9fdeWqq7?56;0p
z#O7SrM;KlIp4AW1CTzrGGIDIb$tK-y^^$F53)zF`(gT?#hxllYcx>Lz@q>JP-#a<+
zkMDh4!ap*1acQMufFpn8oB6-*+Io&0eDHv`^tR65obro&gB)BpPxFgBXRdVGygH_f
z##n94HP5)FujFmKa9|y?agDdyqUW<Ga@<ePjiC?Y@G-RC99Mm7lV0(dPW6{w9h;|l
z`<Pqv!yD?Fqkham-`SC|jNSP7T<4jbJ2vOWjEBZskLd$%be|oqw&&W;OHQt#XH&3U
z{(#Dh9J4R+V5Q=L_SGZB1;=a<Kk>bj;tmt=g&%F%Y|o_IuIK;8Xq<H(&g*NPTiC%T
zJm+XW_%;u5vV5l4?<oEjgV(%gm;LNws^|HhzRW)v?xgqq^6T1q)V}$IZSig{WJaIK
zExTe<>@w=RBb&)?+-Dp5*v}S{m$AbVdTu^=#h?4(PjgI$j@x-8XV<$&4|L?ye6nlv
z^l>lyb?pA?U(H2Z&-h+{`J4Ik;e3i*kp4W^yt5hCd|W60=4<}hcXMez>m0S~x_P4P
z*U@)<rfb*mzWPD)+S)X}nj?Lhhofg*kCH($)4#qVbJI2%>BqU}e2nAhdu_HdT-(>y
zcsuFt{>7Viu19@e$7-DBL}$)>rlV)qHaqJ+`FA*1tk$-%JfCdv>SN5cFV8lvd+}r@
z?iEAebF}6JVS2dkxQ!wDGA3H>vVPcTb{ap9UDF>jz8JRVkgoMi^YUEn#TjjkW$cv~
z?LF(hI3x~RFQ|Xl*M4f_zVq(yxI4+8e$d)(l}qhA;ul|J&j#5m%tzVo>XZB|%;8hD
z^DG;WJcE4ilMS#7ANTntY}2oE*Vzt!JZlX1__%Y|*jRElkLIx2p69dS`oo7Y;eh^-
zv73jv;9<Y}WZ|P<{NqDko(+pUtDQFVn-93Q&ZDs%$<omrw=&44^rMgXYn)`Y^SbYU
z7XwfFb8LR`pFHsCV;;yDotq!>*=scaG!HzBy<%~(SsZpfc{-M}RJ&$3_=+dv8E3@`
z-_2DYs5zLo=UgMRHBRaqxmHeK9Bn<<IOY(!?tahd(^%QGcG@&nd6)LJ+ezvBb13%^
zUQv9zX1w@vzP4N2rw{#;Kl#uXU56vtSNFRY*0}HaRj0MBzvQlO?UD2J?tag>j(o@n
z@8**I`fjf78PmD@?4VrFxpqFrV&nMsA@81b-*p%nR;{r@`}nCHoP)UtCe*iaYNM|(
zcg_F9k?`DDQP=Wmyfwe{o6V575B?e#pRSV!og?jCb1y${JiL;7y3-aJQ@`4q1B?&n
z@$Y*2@x1=T0_!5yOYLb|6A{PAr+I0&pIqwGn0TQdALDo)4`fa5Y|>||L;SdBEY#ez
zGapBN?>#*K><uvgxE8smAJ5{ov5i}w`k@Q9rC+kgzqyL5<e;towaaGdMBn;k55-_}
zGf(Z~kxb(OAMWFE)lY4EZnYERrhn(2GdKNYyQ|E5R-eYsU$jpS_(u3Lrf0}N|IR(9
zy*BzLgYd&M?m6n492!TP=IFlb=1N}3C;N78Jh%vZ`M7!F+q3%7pK~AAk@?r3bJrSQ
z-_BhRe;tj35BK8NbFN4Ftj#JjbFE*`#=q+;HD6;OpY6G8=Iv9P-M5qV4IXwg-Tg}+
zk$Y<&uH&EF$gvpV8X0tNz3v(P^l7Zd@V)yh|E?QHtVG5mGxA`E{J@cn*ix}xtxgB}
zBqR33PaJ(WF8+$a`gLvX7hbSIA9LE;3_jVacKT*Ju8{$r_3t_T>LYzNKRkyw>$9FK
zesAp)|BZ(?eUd4e7!w(j+{_bSyDa-!dvansWI|TtV@{sY9$)&)R?`*UotuZbp><Bp
zA)k#WeWLXlV;cu=$wM1F;|ZCIYub?u{gN}@@um-bYUfy=`qQs=j@tIoS98F-XMEgu
zuVd%#t-Kq@_u4sXqo3O0$2{WSJ?&PRx@LTBYNrieSKi})<;S_}WJ1=-#Wnrnk^HiO
zWP{H>+HF7j-BLUmi|iZAT=ao={rix&``h@c4O_+&8R1hq_9(U&-`S6T^cT;@X>4}x
zJehP)U-_N>*)zZ4Gy3t2oTGgf@fEMy;wj%WAM+&xAH4XuPFLBBd-P=d$hGtz|Gw+X
zSa`sHWUk2b`qHkkk{6#`@y@*5GnQxR!_l*NBV)0wy*u+aH~kxzjKVV4JmWro^?}Fq
z>%Qyy#D}B#7?1qO(jFEadX5~`RrVvTh2mR#_l$|yDp}~8O!e<MeX~{H%?+=$C!gkK
z{`mFLk9PV*&h=|deTLEG;k$md%jV3%T=Z>heLHH4oX3|j@oP*n^sIgy%@5zkX@8dO
z(UW^}v)-|@uV+mCm2;4jv5l23%)z|P3F*go<75-*15fNgyJV}abI)ZTo^4Lq5S^z7
zW4o^%Ire;GlOMU`jm$b~k6c6gG$wx75~>gP&DR>aeRH+AYht%tzjrmr7+>Uq@awz2
zQDfuBICMeI#=^Tk@q}l*(7Suu`sfeo%Qg44^JzZ%CP(C4dv@Vye9yum_k9}E^LTaL
zypgtK%P;u`KcPn-e8E5Ob*OpZl=jJqKY5OR@TpzzyONWBy%*tK2ISoWwxy4114nXU
zGx?}~wZpsny*o;lcqeyu9G`5Az2nzMU+&W({`BP;e3B2@6ff8k`M@LNdybs+)jl|X
zClB-1mvN2bI;<fZyy@3H_TwE4?}F&lM?3G+dRNzbGvuRf?~SlK<C=$eX$}r~27l&5
zH@(k+N3x|$wt-hf2Y6ry`o?eVT-PRhG`?r)LO*@X%ZE<fCnx<n;>Cvyk>|*cT$3&R
z^c>wao^w2C7jNdJKmGHO-cidQ=#CDxCmYxCfp@ZJzs4sI@2apbwxc~>$&cUWyT-vY
znb0>~dX}8X41a8#9rJnmH<r0-M_1ml@p}vBu8|+!*}Zq7j75j|lHYsxh3?FiKeLtI
zqjHWXV{7Bx9sRQ#&zdj!c`t(>(jPssW$p36Ch$Ry_`m}j^NuzfA}2D>e#n#zTsJ=a
zCwH>cx4D{A*b_#OzkBqX9g!7Xlc)H?hUp7``k*W0Am`e8-uUEip5A@(J`;Z-2Qv4L
zy7$@n3A-^iKcZjljAKl^kqen?Yd-j<*P}z;qjL0}ZpqSI=@fs)BOCqWiM-j3KJZMB
z+8W2)>7;kP$kVg*hX*>+J|EGakMG(zvH^2|h29S%1JA$(@7&WJ9eUPS=B$me>jyuc
z(GKA=zcSD8PCQ@}csCzy^y7NI<T|~qL`Od4tFLs55B!sv=Y904f6w60IU+~nun9Iw
zW_Y7}^5<LZ4*#AtU*qvx&*9UD4>ex;(YJH$v`5<MyZMkeKIqsz{dJ%1ny-G`^E}@8
z5DGK134G|sT+OjQ@kLJhVx!rV=ko#2n6LQ7HtEgBnDk4g=8X^i;+a0{Z<P%m$=^Kq
z9edNaIpftm_Sl#Q$M@Nlv0bA_?-6>}p1;9KGQd~wd(sKn;fZ~-Rr)g@W32p<BmR<$
zd&o8NHb3tX@^NGNPG;$Wyz)o$AxE;NS7bbLaWpTOl5VuaC;Q=hp2vqa@Ya||hwyJ6
zWaGZ}Vk`WG8J@+n@v>F(b#7dG&@TDFc={n9?fUH<45m{$j4wDwN94p_@kWQ*kx%}t
zJ(+pdbw@gNolNkJ7h{rxk87UM2N|&=`bEZZ-Q4hNuHu<_Y6o{<E^O3Z-^OAG<!<Ik
zSMK*NDc`^wo$+67JwuPpPyfv^UF%zaY~L~8bDu2o0rN5^ZODx+vRyhb$9Q2=c;QFJ
zHqY`?ZP_$^!%n)VOFZer*m#Dse1mSy$1~){M)i#+{E?$R;~RhMmmKuRZnX2E6a6<o
z_t>jB(i<72b9`&3FFMzUHlD#Np7D+s`q9qVp5yamll<9=G2{;33HEo9y$|epJei|-
z>i1o260c+<hw=Wfzpbo2A2k+vc-OnXf#RKYV;KiOo-+;-$Jjo3n;ZY43*)3WeDFnf
zM|WgP7G&sX?#9I{eH+i;Xz~6$zWKIsVVA!jjhwqiFMP9i?49F5f969b*$X)v1E1-E
zotdlH>%Dw7p-(#So_2qy+ITRK4A{PB<Qw=UFa7aPdLs{HTt|Ge6*!>1G0aPj=A5kP
zmz?;e{|AW<`5pO?z274E9fIGt^JlhTEPso{-^liiXX%x{vG0C!puKBs1V7}$E{(}2
z*%X^F=W<oPKvrZ=pKJ(jk{9``?aRsZ?K%CCjo%ykT|S+#S^B1Xa$z@Y4o>5XZ1CCN
z-eIfc$~N$Obcimsmy_^UxxI175O2oiLvjt+CXa?0Wayr`IGUGs^r>%rlf7&BfDig>
zzGO`{`ePG#;HP9~e7}#-)^~EDZ+()Bw)mkJ&%oen61HGG<C+tG%-1zCNBCvS_*>%=
zeX?`<(4TX9As6zbNA1nuxa?LteZouM`K)$iKriO0jro%meX$c`Bf6~({4q9O$=5ye
zhM%4>5BSV4;GA}jWX})zigun`+wMGbw=Qlh-?hh|xgdP&3lI5WKF_x39+5qM@Zo+r
zC%$2mkNa$kUilK8;mh3F-@ze%%9r>o`H?Yw!ZSAPIkKk5uoIrBUp!A&_-DWHw!dl5
zzsZCBz&d}o#C+HYdFxxA<~cgm58bdEbD*Q-Zywbp*&18KtGTctawBi&WUCL@LN08V
zosbzEX->vvE9RYz)0Z*mf~@FBUoZle(G6MP2X2ZlVut7RvBfetM1Eu=rkF4Lpd<Y?
zb~sJ8<Z2G|4Wlm@^8dpchtI%C|2KsH&&l7g=BMVbf9;U}Pk`L$OrQOYP5L$meQU2B
zU9m&*hiAsepFY_Pc^R9Y=>>klJ~qJL$O-1jz4b@V^k8l<kM7w4eZm5|@Bcv1H{YTo
zHNAe>qJHTNZ`y=+`h^ATguJz5XJiV;@JJVIgH4$SVt3+{Ik}(x;E9aF8#*Be<T>M!
zRd$1a<C7D)7UPV?7TE@QkUcwM>-fSCe#wH3kTIF_Gx3mpm@Av4A2tWCoSPdg(;vUa
zE7^A6T-biNXiRg&zj69KJDIWf@ZOko0VDNm&f=6Knc~Gfv?mA8lDBcmjXcF^7=vIu
zyERWbG_JnzCuXn_*o8mi;g9U~t1si32O0X%8M|O}&dtfQY$3k+C*NV;ew#?Pbch!=
zcHz)lhu9_C&>vrxL(rjTeaDCX*)G3U`;a%C8sBr~<~yHu&2xx7u;Khq4o4p5MGo*!
z-bZiR=^G~VE%r#3;Q+lGhYhg@yl6|eWWe{zAL*97U@naCe^eS*J9cSIen(&Q$)DJ-
zzUYlS#5Z~nZ_EW=nj2ZbII?CR>{lE8X-Dql1KS+g2W-lJ$cqk*W1jF-8}{s3HjS6&
z&+cH8Ik|64bLV%?&B@sPePGy*Cw;Ijb0S-|LqEpB1AC=g*T{<f;KeyPyKhYPfOjAL
zkvZSQbNDaM^Bq5A!(Qp$v-HgFeZtma138m1{@KEzAxGnqvw6O0=nsb8Jfv@Z`u~0W
zKYRYKAQ;ak_$>SKf6K5VI;Ai6gHQahJ9DFRe#L+32*2TCIv_VT@4jpLp<i?LAyYDQ
zgjf2cSKrA2J{SwX{x+4miX6;K%n;-GJUie!WK0gQfvvH9GNng)(VuqoLdP(R?#Pr6
z(~J4AX*CTzC42HU2UzO=<ne#*h_!e&C$UN$B_8o1zR33Q*57H+-pBm=J+pbO`8`}Q
zj`=u}4Sl(ePdt+WzMPwz_;tw%qBC;ln|@R6|AW$2{9teXkJ)?~Z{&?<w&4GU67R`S
z+t&=eaOgh|@l)5?mj5qGj==u;Cww3ezJyPGniIJ=`p!n#0gQ$_?1mo2IPzj+bWZ-{
zMb7lk&)_H?9qEA&8i$PN6c1!ePVN~~TRMSL`i2L_)jvLb50}^gdoUmN&1TpL{n3H3
z*qiHQpe-5m4fAp&--AQ&o}ZW>zQ~ad`Gr_T-^DDx;Xd2r3+y6!kexBuqIqe9@D4xp
z4=?$I|C`Hi?TwEYKJiCGZyfS}|7wqCxK4L;%!cqm4s_ygiuk{!#29+ep54<8`H&UA
zhrykb5B~dqtjHFIkWqa3`>}9We`KI<y5ei<Zbv$FANKk`$lwv*^MP@HIP}^ff9r(3
z<4Zly7U`GH*&e$wclx4BK2Y6HC&qzmVm2J~H&x65Rv6R&d*<&EkSpD3_q#*?Wr&RM
z=)V6qoL|v3`SCw8;7?&O+a_Ogre}Uhk93M>@;66)!p&r&A8o}Ca+I(7dkEwyhLJy>
z`G#1GPcmnJ#)CUz8J}az_#iL-;90h4-Y}l7jSVMZgdB&@(64#m$=u+qIgmZM!X16m
zt7pY{ZSWoj=)--ONKU?+6P~ppD{~+}yy8t9<*WRRoT`oUvEqZi__+4w4O7V=%yiCn
z^hqY{mrRVuKFHTx_zT(kKYQ>AYvg_O&gNhm|2Ga>A|Ezt?)s)r{uQ2*fw`Ek{><O_
zuF;u!kT)MSHyFb{9N`OJr=NVCuZVs4XES6i1{jxK=!Z<n3y;NSe(D+-d6pe{jt<3l
zcuoFzVlU#Q`LPlD#Rnb11o9$J{gW3P)TgoNgM8#)c*3ubK8)!ZdL(P}cHa?pnHSwT
zn!gWO&=X$G3%~kx&MxqW*J6d3MCR@ri(RsJ^JXLXAP4xMomyAy=F7$w!|pZ&4`Bd4
z;42xCk6eMC@PqJLY=P7CL547l9ngt(_=KBmgw5&CnA*Y?zR#aM&;Hq?Hh459Ss05f
z$e9h9n`d1k7g(t7fZ1$@Uf|amLvlZI76ahdD~F6vZ~n&0eTMwMjt7T~2M_Sif5k}h
zBtLe}Kalz0iEU~xKEqjY3U(M%Y@>g630us^{OE>HkQv#qIX1vw#U}id4gIrSb9A5G
z_-@{?lD_mo|F9f}$!T9dMD}FGNBtj`e45YT=jf1FqrDh`FE$}2uqS-W_t*q`EzX%Q
zU!Wg8<5_mWSLMrxhS-lIUGi^ok!y=r^aD@yLq77Wdk>jM_@O;N)4y1XFY+NL7=rM~
z?#P6FdWL+-kB!4@`4Kt68u+3g^7P#~KP79=kTu^$`Xq1uYEJAZywH}9k*#ryGjz#*
z@kYkv=mQ7HS)FJ;Y)ei<KJ3oC*&LkJ7d@~gZH?iYvCV}Z*&SS>SL5?tHZ9NKXXdSq
z_H2wDkxhCsPrPZzZs=KG#$m@|C;!AJS&$VQU<+h{cY2~%ywW8;_?CA1rkCthzwE_*
zxM3{*p&h%@4;{cXvenK!=#Y<VYiwh(G5pDY#36E`3v!kd+;7PLi!PsIFL3(zhMqn2
ziXm<BrY%{@{lYB$8(SMV!v2h7JpIE7a?kegk5BxQ7k?rPctPIu&S#7ze^X1q1inWX
zuNo?UBO`Xo7Obbp&$Q(~?y(<j#b0wK2iOCn`I`28gHMqmKJb7ScEJYRV`t{ecgU3d
z**f2VN$NrKAOq*+pZ=d*L|){_C-L)~A+?aTPkfTi1BZTdNIr-s@{=pl!Hb738G@z!
z1>bx?u5Rx92A}X&PReJ@L*HSG`i*_FLw3dI$y2;xzv2~Hl8^E6TRb5TSOr7H#PrDr
z=+eB!L;4p_nm>Dzvm29K@Wrmwg5=B3=z{$@vR&hl3*Y3+Y@CgezrGM3G+*OhH1vic
zc1I^<{h$*>Hs&fn|NSBLD(qr|;*mJuNJe;OWBiHzieY3)5ANw#98epXH=iY6?X|(D
zIAT1!=@YJ5<12m}TkJG<&%sh{<rVynukhRYW{=_wxypCoDZSr)$lS<<O=%-`vq3&b
zk8%)ko=jm1oYb!mJE9ML(lNh4^y_~7h>e~jSM%x_&%4HE#07I;FYJ(Qn6I(m96i#H
zIe3Px%Ngtk$bUW0zSsmEy=BNe%#D8F4NRs3{NaI(IU3)%Y?6<fFPkziwoUJB$hdI9
z|5NS%t=2Ey@hSO?oSR<Ai9N6{dMMW>BN$9ybc{bbCkHYzZ}~YM$O4wIV|gzbcpi`9
zHs7sY)*t<aIqX@V@+CG#mUK==>?PZgL&%r#3+s%J*bjY?lQHp6ZZJz9Y*cPY-uM!y
z$c&vLeySb$vQcpWf5y@l?jiPJK4fKFV~{bK;0>?jMTW2hk8nc2VxAaDzvN6W_=fv%
z`b9%99)F%w8=o;GA7%6O4X@Ny+MYWkH`1qdu+xWredzu}><};7!W~C?iMMLXY?kfl
zhyTMWn1T;DPtW+2Q#j{W{EVODDP6)0_(jgfAtTr(M}`I3k|$l_#k|P{(GT0<i^gI5
z_Re58-Ixnsl84Jv$<lRwvuoG@C+UN}^vw_W6rSjme)-+M9TM|lnt9V3`Rkkf>0TUW
z7h;$^nC*%`{7$S9Utuczu`bN-$c2CD7e9QLyvz$P@ZgdmHYm4er|c6?FaclIMT`y8
zo;7rM2v6EtTY37>e;kqnv-h`s?`_{ZXNWC?Gwklr5ZOE8!#Kr0e82~K@{w=A2gDw<
zGcU5^$NZYTuvb1QAM`94uo3ocO#QHHcupSVir@yF@EtPJUw+DVeE1gJl<V;iZIN^B
zjmgL4w`?arq7%4E?s7jL_sATc7}tkg`EER8m=7DHW6!zAF5!{bBR?Z^Jn$v@Cri)a
zN1N9Toj1fT*&{q*FY+0>V#lt_56DyA!H(sB#&a|;`i6Ppta0R8uCo(*QU`gK?TKyl
z$^ZD6JdIrRMegKbJ}}7~_yOO7`Q%Gau!OGgM^AK2pLiobe#+nF3g%BY@Ra|+1F|)y
zzCFXIjYn6W(XX-S*gPEd0o(Zl?4}PqdsaN7C%y|)ia&U39C^0+(S<qUhfl*b6lTH#
zzRmW@6`t`Cu@KI%Rr>dllb8#BV23=KJ$R0tT{0whCS&7eo7$6$xstVc<DcJXYfkLU
zSaif5la=dy(Rl0@hLI23<MS|-KJaD?wm@HOgN+-LEX<34nw$3IsV_DyZom;XMTX{~
zzGtV#p$C1Ek$%aXZjDLaWP)$_lJ8aL(I@`-Ia{PpdOSKLUecxK@Pc=J)4k`}Fl?m<
zb7RM_(%-MumRyZZuk;01$r5Ie7i?mi=0x9k#V31X7x=*&zr_z3!Cn2Ze?0LowUzvw
zuHio$7W2qRE~dS4__BD)p2&&M^7*F>ojIgFBr~<e<Az|fc<ouWraI>ZL-fQK*)JW+
zqs2qAAqO_WcIXxFc-3BvfSq)}Z_STw!W46J-#vZOyLb!h*h713`r%i2lsmI=axfP*
zt{?67MKAmt|74^7lzYf6v}Z>zA5zD$Bl?1eWJ-tH(UpE+o;a;Wp?h{h$9OasI`c7S
zwyQ68!;d@<kN5*TW^?RK-3nLP0=%I!G4kvo^YuJ_>4M(y#0S-RbO1*^!w%Uj3>ACj
z82rT;^noWfMi+PtOW`pbXP@v*jDPgd6NlsoFhV~4#G%Iwoj*i>Z09jU=M3S^cebmx
zecaG9hs>3X$eg{gJvpG~VNkJ_t?*wuC2RAeGk$_+ehj<$gZz|zvr+k6H37V#hiYi}
zB~H^7KJdn_U|V?~+YO)LFB>5rv6!usjd9=;Y~j~rOUA}y1LQ`ZY>t28olWCIdw2*d
z*dsr)U#czKb^q6f<hb$>^Av;SzwD8IVGCWEJKexReuj7QF+M)o7QXQWo7o(D)URh?
zgF1yi<a%(EFTZ3+tiii^spSrzAh{F2a_`kczccjPL!O~Kwh4F696EdGw}#j!8RDP4
zJap)+A$~?S>ivH=^czF!dU#E~#;`sjH+<~S%ZBg?2Oc)`)S-tD@kdy3WC&h8V@U4D
zhG4I`BG{mQ^MSu?0se|bWW`s^O*{EEe=i1;tJnq)%v1kj5^Q0oeD(=LPa2Z5vL|{|
zds+*^8=bH>_M&z%2k%qBG`PTK<XKM};w$!J;UzyJ&vS?Ppc)h2>DyeNI|PGZ8{5S<
z`ym_a$M9EsdAw)j+3<mFkOe$|nc1EG*&Tkx3jWP!<X7U(p&@o)O~<_1Har%q^vf>T
zH4Ncn>`N@L?qv+v1taAUa0ISBeaKkGV9W61KMk2T%z~ZTvb9GKY0pN*5cd4gp{ERy
zzZ!%67+>3a46!*rBv)X|uNr#ckhc6^U5;mV{Qnrc4{*DyYFps!&{YIPQHl~!Kv1zD
zVnZTgFIX-LiX>uhSg;oopS|~XRTBFZ6??r(07VeHU>Aa-A_^!fAds{3#&4f9KGr*r
z`@VO^_wnE5UsjoO%rWO$JIIf`#z*dtU$pt?fPI=Tf9zL2BJadI;;V6EL;Q*_<2Ss^
zMvW0$GoJeD8eAsVU~g<fF6dfzqD^u-v6`*1Juw2;(Fnc2SjVo#6ZxH3As*v6T+RP*
z?K1-X<rDOT_>WKc82gb|@fr3Y{%8x1Fu(rj9yX-E?3oYn31jX2V*>W+S>h^<q@R4=
zJh%=Qbv&KNCfJ)fFh2ZPU-1yT(06v?oEHXsp6#(I?Nv`=Z~9{F`73@f2mbhvnC`W)
z5JT9QzOYR`Z!GYT?;Y_l-g6Ip>2sXVUvMj5a-Q$2)19aN;uwBrYue66#96W8xxp&~
z{6OEZ-&X|siHF$cQ-f6jUZ5ZJogK4%S_A*#QatOK&Y=_dxLD1e*o`(AOMSx$`onJg
ziBtN-mtC(9z7r$#(e>=!yc$d2vqxjbW{o>r_dK@3|Kx<?i}}Tg<^vxYf6vnn<EoG1
zAN$oNam;zzyDo69cn|*c-?Q|qwLtgKXKmAObHO**uoxl!^Amo7Ki(A3N%}z};f|*V
zxRY*XOZ<;LibG<mxfLVunfNR=(o<}y`5z85ui}L~Q$A;|@dm##Z{|xM@w@9hi>44C
z_`Pv67y6GEw2Ag)M|kfw!8-!H>Hg-&y>U4Eq6gWt`|#K21mcQ0;hXr3jnVMt&$G2#
z|Ja51>U`!z95$}z%D89;e&grt0q^l|?ZMB^H@~>xsNfO7%0L{$ciR4i;J841(askK
zcMR?tm<RJMPJJc#X2AB%DO-P8@QgtGG(POnn9w8cCr<cGY;bQj(A<mdn+tZt*2Ju?
zE6~2imo4Zg9oBq~P12+MOW)WZPGq~DWe$B#FPL93l5HAK9LRpe3O34aanrHEa|5y6
zIP(9G244@}8n7Ka@r2+(fpe`*cpkofaX^3TH-F=2o@;)L;oAd#sbA^>IOgR6o;0`G
zA?|1|+vMN)%-G{0JYtO4y*{u3ed13v{<8yqrQhO#dDU()S8Oo$_{ln!_TYSW&nD#y
z*1Tvt*RnT$jvr|e&(J3NijFdF;sdZ#d~O{4nIrScj&ZQD1kX25=Gr`~ONph%)p_p>
zj4j(^NAx9|{A@t8nQw8{_s<E;6YVCRXoGf(`}%=La0MS>_xBHO7d$P{XS{t<a8~f{
zfM2mmF<A_JeIP&Mn`{b)(Fbax?*GI<yJ^#v!GnV*2Cfk!#gGpLZwu%zbH|SLQH~{N
z$5+~-?PC7>0$NI}m3PnxFA4Y;P0kmLyM8)nMZk_|He)L0nSbL$o8m<A0KXb*ZFU`h
z#KruHUKHPqtK7!?;6U@r&Ws~Fk}tA1_rxE!4vq}ig!A~xmjgaP<IvvhO#AVI`)j{g
zCcok*Zx3D;umv&Rm>(KEDtLb&e!4e3p~j5Myw^T{Vy=w&lLG4xY?IEF*S;rsa)7_9
z*J%}FiW9^KylU)mARcA|_(A+)yL_83ijn0V-<t#T$tU@^cH$n_`OMMz{8t=c+s@-3
zctKvlcD#3<=iq(*sBL^tKg}-=axU(a*V2GuoVjD$+CzupOfim5;GbfmG2*x4kp75E
zaz3`eZfHMt=9zRfo?^e|0w*{ZPdXYazQ$&awb+fDJYU`;=CBXrqOG(AeW<-S$F=5O
zo+H;3!*LlMB0jpOd-Hp?sUNf?;4bmlScwDjE&7%{iOu{$e~bY?(0<Rur~b6bJhN$9
zh>i1G9A)n0<LXAnLmk5Su_gX${^=-lXl~8DaW;pZZC>#tU1%P0h|k!P*r#pI(-yYJ
zuC<-L;1u(W=k(Wn(stEW##UV5!{(Dc(O@{A7SS(S$v7H&{WDLVZ)}W#@nQ%1t6w;b
zU*JFU##Z?%o6=8n=ec6L@7S;JwcoSws~F*0?ZGoR`)vV^r)|_7`6@p*mu!Ll5lirm
z7|0&QXgLpE;e6M!N1ExW!Q%t>l`rA)S1mxiWXrf&?&Q9BNvzdRefP)r<xu9zoEax}
zZ9K&y*U(+~3BR&0?eU!V2HNF(yy!f9CXX?u&J`Doi7_>vG=MpEZ+eV&6-(UPoU#RZ
zk$Q_b!vBp0USj`j&6sN|{p4P3&i(XD-fk@1OCF$Y<_TZ;jE&+d_hDmnmh;q9j4!<*
z7HPNn77LFE#3Fu&1M%_u19QkO%_(g}o66~FUpC>{=0UEl?_!X-W<&bR=kYF{b*_8k
zS@y}s_?@Hg<#vU<kB_oJ_S}4vKSDJg+o%1EjsC6;j16DYU->+)bzi#J_{wYfwE4%G
zG!$qX4sdVJz#qm=KfN{vo~1ov74TR20^2Z_eA`^=7vE>gxDF@LE&jC6Ji0ggcW=H-
z53(ckj_<S$UzsO%<{8FRe53{Nr9K$@&jmC&ePrC!nC=riFi>02CpBC#Tpb1XHs{Bq
z=Crk8I^5W?0r?ni!bfzLI-q_UPaMe~)iunmF*8=U+?*Oq=kPuAq>t77IEm(QjXvmi
z$CRcwE@BbQCT__OJx9Gr&Y^vHQk)Y1`3?>+?l@eV!JM)MK4$LNmGS38Y~3}W%^iO>
zY`$<QztI=Ghuh6B-)Gm_X#UjzUKijAe#rN57k_aLyTNhpg?nLXpl#;Z{NhIaHO6?%
ze9>!iLtJZY+{5^Zx#Bq;AojW*$FVQtT<u|8^_fmGR^pu)&qwsx_~Th^mJ_p6+-2O%
zhkoN}bFQAtj?6F4ms73{J{{2R;?m0CfZ)ynTM`f1+-HKH1}6k^Eo04oX>mGFEaVrS
zO()ZX?nx&YV{uDN6@Ro}yb-hcguaQze2t%r2l{QEeXq~v&iIN8u4mu!6nyQOID(C^
z3;Gnd;d%LvYmB?R=ncW@K(1yC*pRq)c(5XHjhxH8scn8F;A`?goX95V)JF$uNczCn
zX=^%|X2s#+8M~pWwcB{PuQ@bd=G#28X>;v!<A5V^6Q5%XVxPYAH4qn!Gg~oU>dt(M
zW^=9f-~#jEXq<3Ae!=m4obITdvJF1Xmc{rLf!qQo@O^%uHY*QN9~Tom2iLlv@fVBD
zGp%C$@v{3{gEIc?&787-F&Q7?H~!(zc!?3lLhNHNv=?2BR~sYEFQ1n8h<$vIKERXm
zn8yVCjz7x3z7~kjG=p)&d2%X#XDrzle`ZJQ&baF{{?P_GnERV6eZ;leDo$yic{RRt
zoo8yFKDpKyyN|IlwzPn2@F31I9{M0x<hT47f9r=@gm}xY#BTYI98^5<JbFNWp&xw8
zc<Z0O;5~LOX3-s<!^ZX9T;N*I*G}JQySXqAc!o`~EuR^C`6T|Puf#}gl}DHZ+=~0@
zL42kiY@B`5?%<w$S^qr~kMe2fu@^k*dD`wX_NMP_Mtl-S_#zHs$KsIuft}-T+Du+z
z{LG=4Xzs;4xt9B=)yQ4>w)gtXzS%F{FlMz$_ccdsULMCzn&;Ad;*x$CLv8gM_j<PT
z_>ys;AB;O~&#ufJAC<3*H^zwl&;tB~4!{xeBOESQ)UNhboM1m<s5#OHW9B}_7Ka!|
zJj#Z}6ypfuKHJo1G1t5qdws*leA;W{kK?o%7kM_HWG8sT7`fKbGt8xNz_;u~Ji>co
zu=Cg-TQtUe(7o7{m?{=MIWRZonLT|x_(q^UVBXoC*rFaouRG7Z#A%R|;Rf+s4NQK)
zAL!7f@ww)J=0%&>w0;>c_OAVW6-OIew(LB-YmUsd`7n00u50);zY{ZXqBvu$@uB+G
zDZwWK{Si;Cqb>^$3|0m{6R*^hJ{izKY(tynBJ6>-#h>Dq&)JuFE}qJb@xFPYKlPXI
z;d<jQR%oj@B*uyH)`;}O_hQ_Bfw~MEbzk)!<NlUFTf}BM0T0mt?2~=4FXNAk<RI)6
zZyPthU<~<}cx_(T7>@NP{+fSdDR(e8IFsKPb9QK~)S=YW=w!a4=1Fs?)A{3*;w~Fv
zYue;K=8H{w4!*`cj{X`yafCm<V@!RoeddJiYX|>fd&Zp~i;u>b-D*FZ#zkTozvh4L
zZ?2qc9?XZ>#V7f^dBgQ$2%g5>axi1ee~cl0Ar{~y{)OkoAGWC-=DM+88{HQliii5b
zH=L&(#sydFAD9Pof_L=+2hgP2B=(tGZDF6{qi5k5_tq};9h$)08$0@yR#&5z6Vn>F
z&b{adIS1RLIdCTb(=Pgf-N|QO5U?}${NKT!g3|-_ZS(XW!6v~C1MSjoYw<q}XfoQ(
zyx<Udue_fx^LxH%?M7R~3uD99`K>reKN=Tvs2(P!nM-_!&yAn9nOE1E3%m}-&^*vN
zv^B1voA5PXVuN^HYyy742HB^!m^-}fJlE0_Y>*w`P;JBmxQSixN1zAsF#A>`_x!bi
z`NEU5rtj%c{!B9%dt<_f?;9)+#7g|mchy$aM(~6BggLa|m%inL;<|A%p5_v~)@Ju@
zP0*NXzgX^>Y)ef<e~lSU#zw?Aw&R}o$XM_>=g2eIsPFJYW3qThdx*zsinN#S@Q*y1
z{$$@`5Z-h&f98??a&O<WTl3AHX=b0ZVRaq*Y4ly&KOEp2_KstXf#>35vD6=aFo)(r
zJYnC)9v69z*Tz^p$GOHw-hkWrf$#Lec;aWk5pn=_eD~mPff@n*WS-6qeh?U2c1QQ%
zO0m&;oqlVR`_MmpN?&Lvw*T0`J?+UbckFddpgts4=?AV+Uy-YsC!7Z~u(q*Ryn_cE
z={ncw7w)4o%&B=d2HMG2a4TD;1!zZo=Tq##Ivp-FPI%0`YPWS9{N%a%s(z^LG@SN$
zzMPu>@_FrNf4EcJ5WCG48x^P3Al-+r86)vm-m8Y^Ui_NB8h>q4N8>AE8-BoNu94T`
ze=);3>NDm*jP(3f!SMkd${ui(d8A+T(cFu9#z=o%!;ZAIx<sF~lddrS#*n?@bYsp(
z^m$ppkJ+u5&$g^(tKs5I+=D08K+UtY7k)?Y(JwR@+ZOBig!rQlVt&}2=hHj*OpIU?
zY+5^UJznCg`XpY{Va6LbnSY$ZSBx#L68GdEeAxATk(Q7*i+f@YU&lXp2-FsEqB!@h
z;2(kYYB{7jA)B~Y;K;v>nK3c;e8!P2Xpd)GS2efV>0DzYPT&z^V_tEaI7(ySOZ>nt
zXh-&|t!hNHG+Q@L=8Nqc138v!*_!*9CpG%l2HGR0@(1I9)96R*?%E>;X%nr?erY8(
z!gs_Ad}dCKF`Xe!m^)g^+_61*A3MQ?c;T49*oY_2WBd9n?$R=}lY5J~&J)l1nYOtP
zAERgaia4Pybe^?OafNTOeYVF2af$j5dlQR{k#SMqqbJ1|TF<zdEA7Fx=HFb=OvY_>
zz!$|sHpiFDyKy%*+QyFPOk*t9^DKU1Y~<2-1ux=fZJ`@z2tH%J_`tmbd)3&7zP09q
z7x+E@H&@ov*o`==J@|_s$nTxke&8dYiHG`1pU^sTcH>Nw;CpSMljKR}6t8KoT88KG
zIep|q><90#X+Gm~dJXs7FVHs66i?KKt?9@S_?>y7cW4=Q2R;YdhTY*#af^M>GHlTO
z#ACKe&pP5FT%{lKLH^H<%(=P2OSnZmJvzWeY=w4V`|>00;{)c7kMJ*J<h3zverNxX
z7=>HJB(^F3@&PvDPy39MoSk;VgZ#i627X~jH0QGd_Qwu!jAyV1>)>>X{^DWt%D3nO
z*Qw*WzdEWtK5U1N>5mwxreM9=T)0;3VGB4`8~LX3c4RBGoBpuT@;ZHE{N*dg)fmz%
zu8~{d0DggIage!O9f&Dx);x+|d{f)lAv>mD#V>w}W7r>Egx^{ZbiR0O?v0H(V2AVq
z8`Dods?KKI%nw`Dce#l^@jK(rcEo%BW_^aQ=m*;n%hj=rBU>^bc!N#h4DA;a#Xx>(
z3_Mr-XJh8T9ufO=<cPGL`p$O)`xMxqIK}Rq#~;`izo)xB7iVazc6yfhggfM``m6uO
z(!8++an^J2ra#=G-hex`jX$ZW%V)$<^Maec6#ORO-(o!dC{MyM_G_6B&&2D-UVh6j
z?D3KxvT>YEtI>g;!Pdp7lY_4Y{98W6zVV~E#W$`szWOgeW@E-yUQd(Q&!OM05i`|R
z@T9oz*?5>w;2SxjHqu)72p5ZM?$0*#)tuVn;(Ywf_vsvQmQV0oc8D{~0dB-ma(Q!R
zZnTlTlqZdszOftjX<XPezryq8MEuYmn(mnaI~PyfTR-VqYZNrv>OgHsjN;pL3_ZY>
z%`@GD^Jz{x3E#5ehX=O|9vaXf+REm{Lh~h0#WBW?-{1mJ&!SDtncT!Z>2dMId(SmL
zY=Yh3H9Uqh)bYh+@t>V)8?KU9@;_Sgal!2azTjH?puhhPwwP=&Ib)+UW;#Y6?2-D@
z^iR`^1Nk2xF{YOXH<{dIa>+)Q%wiCI`H<k!>7~<40=mn*umx*AKMS;<ubLkmfqQT}
zF2hys;r{rJEoi$~MKj?=eKan{Qrp;y^Ti+M^DVJKY_yM_rZRWdS=7(0&(LA+rKbO*
z;P=6&0&~WOZW>%Uy>hzOhP`Gw40n7i;5RghTnJ~aORkAi)M)5Z{h<XskG&gjV`?nj
zU(So~Xh%60o3nn%j_?Bh<IDWA`jFr0pE#&py9Qq46YHNp4!#|*S-eim;Y@whCb<H?
z=F`4+e_SUA<j;6qz4M*{4J^K~cWVYTApbQ7;<@%ais@=Q#!AgZ-hyBB*_f+c{x$eX
zppD{^Sjg7wA9cR>VwQXI2en#u!cNVjG3A^1MIOTMw2S|$Be4lOR~&DBg<aufnnGLn
zGe6?5+Ta><PXDkcF@m-_EHEGX!>{N%zGkh`7||qhUAjum30#Lm?3=>T{8`Q^zRGvZ
z13MKH3K~l6lwX@`u~xp|d1AKn#ADjooZw|~ga$Jg_>R`2A=sd{(s>65w+(OsKXTvi
z1m6qrhWN!Mjk~?OILUY#JO09^?Wa`3@f`72K1XM>Q5-C;(MDoEey4lbl6Gi28&%s7
z2k?<Pjn9k+&1UUWThx>BzO@lCOe|mv{25oM4d7fn@qs|w<WqDJjkh%519Ap`?CaD(
z&ClG@7&t=AP}4I1#*zl36U1ZVtv%+<{ug<wajRyt9xe8mV{<4b7#G@^AB$D&R-2s1
zrtN)H6W0&+i-XP$rU4(NC2^IS`FYdxrt1Uq%$KYq|0Ost;0MOjecYRWiTV1jW-X7<
zUiY^L+1jLd%=X0tS{`q)QF=}M;KO{2pEXA{hjfLwW4^=!{6bsI#yYv_X~FLTH6XDQ
zPtmjTS$*XX)|2Gs@_qAV?L|Dt8T?Y4aD#ck*Zfld*fd+xHu22)t+j{^<^X5&e;jEJ
z*fs9LFY-b@#AfiRab*|ctn1ksjuXppk-qbHHob3f^WdOBeS?mYOR#@&>KDNW1F@6F
zxks>b;AjrmC|fo@_6pl?L%Xmo9HK4P3dBt|DApJocEHbQ797FuX*Br_o>nJhzci6K
zHm-cpxils}#(8wPKN<wj^E+Bb%xry<eTp5p5YL(?K7dojd%6~vvN!z2-{kN(hyF0f
zj<f=;S52g*DK~0g57}_YtR~Fw`MYs+Fa9Nl(Ic%V$zRzd8x~XX2OW$<Xm#9ZF0@U2
zs~%|0$aU(x#*^*RQsS2w?;6j+E8rS7V;tqm+AKE7f#^u%VXkO>Hj3YAOL~#7>IYpX
zC*-#@iuglkuwijrTg{L5(4?+2?tI#H#*QtT8|RuIxf?rY^UhZnVXJJ)IXKZCJp6`_
z%sJa)oAe^?H>UJ3y+I4$XmuL%%qQqjG0vRHRm2JHF!uT??~=0{bK_||#7Ax5hvtMX
zr2#xgE@Ur{xWON26};*9A@nXTVRvfZ^c;WWXLwiKV8`ysr@k0ibCoA(hrIW|K>lOi
z#Bbcj&uMV&Fppw6o$h>GV*EW*y$836N3@Cga3Ar<(U@zmF%vJu0AnTp&~G+~f7J=(
z@8Y)oA2=PCxDTzTkDm|3R55@L(<tnpR@`{Q#<O{&v1rB3CYwz*4e%k&jRW!WjRP7~
zeNvmul`)|;@SFLz&LNi5CAgXW7(?0!53?8J*EJ6{H+dTlVRObt4yqQQF2n|0&!2D!
zo{^J@&2&G%!m(^gPHm3aK3fxC#2MOy7Qr3PGe&%#AF+3u3@7WmKFK}sfph3eIjDFh
zHnRnq70<G1oJae3w)Hx(jveV28^smIzq+0VlH=$jf1%wT85m>srad$SyO5`_4gO|q
zX?FeN_k4`4>N`78ClFiy75p;Lf1l&6-GgldF~IfOWZvXU>d811H_PE}5nMjKe0u#2
z*Pr#7O~}vB4=xJS|INL8*jS2jcv(%vx$;xCjob9aT#E^8j*XjFbppODcF<>C6TqeN
z2V<lrF1{K=HbmR2$>Iz3Wp>S;Xe@PQ`j|c7IDYRMK4dPe&3GoBz>UUK4D>ARV}IfW
z-Ju?UTlp8>6*Ks<YiM8h(r0t+8qeu^vYI$eCw9<%>=u{nqjs|)yvX)xSNFFMf<4nG
z&UI8D({FLp+LAgn@C|vMXYfsVqA|n&><157H*l_)Li?*bSvRn^L7&B6{WH(z*fpL@
zBkCu+ptHmU<H%lcj-xqN&!VOI6K>XC+C*#+lZ}&Hg1<Y5Pt&4!SltRgsOgD0Vl7?D
zR@K?WZ|h0gB*!;y`X*i)Q*+Hfafm-{!ZCb-<`);lO#a4C*&A&s9@BHQAs^-!_(aU1
z=W&XBLVt0n`ZiwS6Ku?Q(}?tlH9mb|i}aCa@@H#f`qDjWo?&gT?UUE)w|cG^A_lQ<
z_KKI(0`-H=F?Tek_@UqCMnBjB-PIbD91j1;2aPA&V7IggduP}Bq~GSq-0?s5=KeU8
zpV9>ESbQ;`zQ;Lg0PICwV{KsW%#r)B5A&_>e2VXhUu;Qi<kODYV4SN@<c!vD#b<3Y
zhw?c(P+QqPjSZen$7+X~knwkpF~SGN)I6GJ9PhryLq3F`XbkJlw2!edj>bw%!5?&y
zSn3@8qXEp3abaUPh0doT*&#om?eQJG#y;3Cy{JZ~t?q%>)lzVUv2#715zEbw`H;Ja
z5$p#qiL=hb^Wv9wuuXQvcEuz40z1X4>>P)%q0YN|ip^}4ukughNSDw?#!wsal6#Nm
z(*t};J8>6Yat%&5hqSt}Vprx<Tls8tESoUy;#%v)uBElvsqgq6+h$|l)4tAOlla3p
z=r_%TWALQ@8dJ9K*=$CRDnBsq+H1T#w`1hqu49jm+RLtJMCY4-_Ud^wh3m|T^Kb#%
z&}RIrec~A{Vw{b=&-KB4;0gWE2jdD}8((&3{<Y2hoHxRF({-N92em_A>2LSd4t8OT
z#a!)RKgN)s@dfSoSAXF%eA>9<7SDE$IWZpEt}URAK64(hMdxa>wwqJ;RpVttO9S)6
z9@XS<1{-pZ+Bo}izVS9b_yX1i&ST&D173TEu@~F)N#Bf-n99HKhIw;8_Tzc#clu*4
z_&YoGTy1qdU8ioyNBNJrra}1svVd)Q9^U1vcp7KoJw8QO(<}OHT=Z2<M(p<5IC-{b
zdN%FNK73}*jG?*l40Bo^*I%~l$i~fubDg74^>21bYv>OjV3W>e%f`#K;(`0<i|^UI
zc`<i5(L6baJ+K@1bFF#RS739-ksWBac<p}rfoomsI`h%7H%G4H7h-@oVxF|w=lWe<
z(=MNTE-un8pRpD5?-}e=zr|c|EgNTR?k)CfhtKq_^Y2;g$yo4zZPy2Fb<}@t)PATx
zjQw{%_F-(D?;fDd?5+3nJ?Mw_JI8aK<1;p5ZamxP=8fO-L+A1}d?ALIYp-2{^Nax=
zHI~N3`Nm4ydLAuk4xP&{Ji~Z^cI%tAx+go}^Try#7z1+(p6C9~XII+CMttY<&QrO<
zXKW0o>5pqXgPq|ib7ef)kMG<E_qooW&y9=zxTn|JY<%=ZJalhubYH$ueP%4pgTA}3
zIo57-&Yu8pc3$+~+?W$%;<e9Q;~t)=zg|11ZF3L(_AJkEj&q&o9@=a?*&A-r-^K}c
zWzLL^Yu(pei&6T*ww&uvn>+)&E<D5c`k`;GHx`cIGw{8?+N95nt7nN7;I(mfy>V{8
z9lduxo2uQrmp+&S9BZz%hYj(`b%D9o5A$hW!M(K2vwY{i`sum;+ymU-*lK&*Z$8+e
zHnC&pyViX=r}}38JC~mA-ulNrjIC#DgSNPzInW3G;eD^+2k!4&Z87fV%K3cC{Ar8t
zjG;L;-`Y@LW`EjUoAGS-b&luwjtzrryw@)M@1ODTy?cT4+|M)3hklhG`H*?hF84AP
z+TUlow|Q_LTjj&-)_eE$y|$T0_cuR2GrwXpzSe*3^S$`14bIa}&-HxcXuSNHr#{!`
z#;|kfb8XZg$DW51w8uOeUv1Kl&V}=QH*YQTzN^3b*75XSJ3ZgM!8JWc8$5?!IZqqd
z3cqD@K6AeNILB*$+M>VZ%leMCwf*`Do@E@gVeF&Nde5<aUVDaf*&e%ge@D-4n;bol
zz182?A75~7+wExl^vOM(&j)ak`E$NLJIDBVhVy)HZs|$)$6-EqAJ277&%+DgzQ#nm
zjbF#yYuB-T&t$KCzI)Wq9E~eD*L}3dee~C#=jsES(_hcj9%IRl*`}lSp6R^m74O*;
zTXr5_G7sA4S)S|Yd9LRZ&MQwlpKY-@f7;}=d$MVE&!@n(=HGYjRU2Y+zSjnPqphy(
zIj->?J`(5f3{6!Zb-i<XAK%e9^e4E6PIPb2(PsDWHLmlSetCv#ak%?ChrQGu9Xk%%
z<i4JVGu)GH>%Vbe_g;_Zdj`0-=lae$J=gU<cP~dUzK$Iu*L!w3rQ_*ZV{C5pn+5{9
zKs((-Up&imwZVDx5^XLga;`DZC(rOqeREHr)BbV@=Ucm=JKfv(87oKUx{veR-*ea$
zA7s1!I``Vbe%UOaqUY!!e#R&G4u53d{Apbv4`{xmzGO{C?gVlb>$Gxq^%ZpsdpFfK
z>|avXlBZZhkf%8M+)-^4)PU6{9Mwj9jib-hT2}|wP<l@9r$*s^<1;*4T}DmDcg|5G
zkpry_)OEC5y{OO^^=owmI+wp1laYUnhw<U-e9u@KTjT7rj<vDJ>1@ONup2Nh=C=M~
zZp|k<Xf47#`dpmzx%@$`NxeXwO5H@xs0JXv0PofOdyey9S)j({bH{$}=svDdOZVEj
zYDKM^skNxTs!=%hUcJWAJ)I{vwf5ContRGEwM%a4T6w1Dy3TjjJDuk{_t!>!G7im~
z^<CRMqct?=yUz9Q<F#kBkIwfTb!F}8b-s6vJQv(s`+Tl#?%Q#3Pv1G;d4=}1Uyfi+
z)45(dU+vBP&7HY5k5C_0zi~hQY_7|DY=!^hPS?7Rxpj1IeH&NeW8mvPSJ!b*=i&(C
z=RWL={WboV1K4IY2Rp_G;*QwowOGWK#UZhg%{$iaajiJUH{`r(YkX6^TWwK&*BX!Y
z9qR_xi0oanHh;6=2EmrWB$%7d%|i4>8#dZ7&ELO+i-PllUj{!6z8jntoEn@GoEUr~
z`0v1RZE#ZH^REYA3{D7+4?Yq6SMc%RV}Ya3KO1~CI5}|d?**Q9R&Z|ck6_aco6df_
zW^cycfxQd%u~}oWUS^HeUJ-Q~`6MksC+U!w!7kKntdm$PQ2)11XYY%(z3&I>0(<zD
zOqNWx4t5B33-$_b9o#WEICyYyMDT>*8Nss`@XX0GCr=Na7Ca?*a`2?!al!K7;lX`^
zI|sK6b_uQ@Tr2SR&yD^$+xud_n6*ah#Mb((hpHo~qpCSuTjw8an_b~PePsh;MB|8~
zT98_&SkZNOybG=GiWTayj%r=b!^y_dwf6QIQ!$E8V}ESZ*s^EZg6-oV^<I0ytY2xj
zwMYAMtixHWu!dx9)Ect=G$#co2G+U#d$#t3TeG(gr|*v7TJV|qTNSAPtJPcEu!q2&
z1#2S4X+@wN)-ugI?!kA)jIZ-qb|Dt<KYx6T9&JrR->t`rRpOWUDE>9>iE};|<HR*_
zu(4096Zh2ltY3&}YM1KY>gmwBtC;VZ)v#WRZ{j{b#}(q0Hsg|NG}?nMSsKtf_^dpN
z$MLQs9xmUSCtT=!{BAtJYq5?!84q)7Jm?R$RW0H*8_-7fr4RardyJL7(jaV$EwL%%
zKtIq8)(deH@LBtt?I*TYXHC<(l|2*SHCQ9F4*<OOne|fpuB_cy$8vA;W87&Q^MD8O
zpS5LsoUB{_Df@SE)BA!~1kVm08$39;bFfEnqhPDxTETUKt%L1?8wNWDI|Vxjy99d%
z`v&(2jtHI?ye@ce@S)&S0Y1cI*WGa4*}A#*vmt(F{EQ{Or*+w;IA}kI^*ZZ-_Er5n
zz)QCa9vi$h_-gR0;9tR(OSW9HQ?O5PaBxKMtl*`=s=)E-!9#=F1~&{g4X&JAIr(RB
zVeq@)$HA9__XNiVM+Nr^b`KI3Hu`Pg-&C?s#M&s0BHoH~^pto+yYii`o7wwdkDvHs
zPmg`9_Ov}9u-|TnAmL{EmtbA+tKjE>qxXLd{ucP#X2UkKJ!`n%UI+We*Z|GSPx%)c
z6~p<1H7$FKjHPu|++weVF|{B055Zip?PS}@jRXDMJHYq*1qTNA4;~u)#{#@QB=GsY
z12N&Af#b5^F2TNm``jeBc3>~XuLHlgvsVbG*_UL0293j~jU8K{@9j6J{rc^&aTB}k
z6|lF!UJ^F#cMW$6jHA7mw;JHRIB&13ea-ey`rRr&>e{1yJ$%Jn(cd&Tp6Bm4K;A?b
z(LH#CwzO~59y0uDPnLB{Yw2uN-~6@>>?^Q;n5|f&wytSC-@3N=;I~5J1)jpq<_j<3
zIJ_*b$@`6o_|x1+JI%G+2Jhk)yll^jeZce%o5LyAPT2=7<U9KZyvI4tv5&y`;uSpM
zcN5?>KgBVwwGRTn<1;ynIWkuK*Af5u4i~X+V}EJ(|9>-hYw*nAumDf&6>JflH+SCL
z$-zg1HwP~Xo*FzRSP?uuct!A`;5)%zgDt09PInD(mHWLUSQF4q7YFnlyWns15MRLS
z#@JX}+o#282(eLYUK7~Ed10{CWUI-of`<ez3O*d19{f4je97iZZW<gA92Vf0mj`bN
z-V=NvSRK4Scx&+Dz<D<hE}dLD`EKxE!P|lt2agH(%MAkiYyJBj^nyHxRyOD6*F4&f
z%kJ$v;`{dDv3dKE>^<>s8(cNLYNlDQm|nqjr#{;(pdG<$TKC$)76Hvm<I<P^4E*8f
zJp+66@s+(W_PWYP#X_->#>da>*?PS_YxcC#a0diO2X6^J8GJ4HW^i(#|33`AADj|=
zKKN+x-r#k?^MVxtPPt8hkIcuF8(lfmh4$RpYiPdg*TH3c%YJXV$Xwz&^NWwwIcNy$
zTx^y-h&$|A{Iu`HUPj}&M<6~Lw|@m}>B7Lc$P0|0adQs7ro-*Ex98s8?C#Z<+Z!ty
zLA`}Okvp+JTt}zzeS6_?1|GC0j4s3#xY<5L`-I2W-qXYOmjMllU;Nt)#>2i)<3Ss;
zA+d=TWao6LHpu<(ikxcXS=s?7-~xNx{LYsT_ctB56NlniN1V&Y{MJ=2<@Y`IKjLOF
ziLKf@1@?E@BWMq!-vqI%p4+`i{oNG~!bRF)e>r`G)65w^5EJMt<7-aoef&tfvP;^H
zugg2-$Kr~<%gKGFRwgd%tM<$Demwp0EccR|y(f4<aB#3`aN68ybMFsu)4Kya^@ZS+
z;QPVP0-UtXberkjgBJyIIWe2B*@te-jEfx2`Z$f~PrJ;MIrSSnIT$~(r_}3T1^j7`
zKn!ktec<GQvz+Q3lXpzM7t95_E!l0!?SuV;+bv+(l4VN{51tpiI(S8JOz^N^uV6Zv
zPJR)b5UdOy5Zo~E+XMU7>~E7th)HTl=S1t;w~yc12fN=sIDdNnEN}hv^wYDx)0W2c
z4*~y?JJT{h4d@x~FAJ(;*puHJvk(5bGN6g=V-o+xHu;6QmqW-A#ALM&`^m&rV|HfX
zcWB#Bwx8ve#!Q|{zv1zB2A>Xa(WwFcp&xzrkzh@5TtN5XqUQvU4DK4xFdGNrgZ-d#
zHa;k)lXKApVm7{EkMx85#$1buY?qITy|`RlW%INM9q8X^;}`bE`mF$N*)hN~y9BsN
zJhd13E&=Wr2mFqQZ{Z%CCO*qM?C+r!<W*`ZYP0;pn5mD6d-mYbBL4kCJj3?vYwT}m
z#6x>v*&?lIKO=1;KUF)xxAyYc_elrI%hkr@Uus6X2J%a_Y&CAVl$?&=%B|(w=9YiU
zQRp!_4;v_7&}+bdjFJ7)_{Esv7&?V5;tjlIf1tg8YCSlFz7fB0iLvK@bPT&1YrEzL
z=qWZ%U&-n0zfga*<|985ljV<Ubmo0|Ko8;;e`*Zo*S|Gk-!Ge|e?Ax-6WlI1ckbM|
z*9UhEwhX50r|Y+y+iq^3;Nak4!J~sG1kVdr2Y(3eHoe;{XOjzDZ^QLwza_=PY(ShA
zqxptBS8c#t(iDFS{HEyKK<?r<FxQz}XQs~&og6xOYH&>O+~B3byMu29{|@$8vPW2C
z*^+w%_~mB7?!jGy#|3W+j$gnVmb_ufp}`G;Ur&BL`B=d3_@Ek+HqgZO71Gjl8J{*k
z;*3~|Gu7EX7RVzX65J)YV{q@_@qwK6xZpFvmjiXT(}Uj!TW#2C#_R0pxPUL%mx#O6
zHO!IqiN<65675m4zn1-q%`}Ag>vv>oVK<uGXqL|$J~@0=<$BHJH8Y<0(&S5%9|ac#
zn=IL6$<D!^!7jnIgG(ltOwJ7GAN=yBKz&Rusov!`r2OxIKyAZ%qq>qg6yM||Y+9ak
zlfdtYt`qqEk>3%sG4NWPxlyoF;I{=hRjlPB{7LTAqc}wSh^=ZjII6W6Ht#+Amq*fj
zV(Ni`SYU5IT_JDrTKnl1`7r)vV}K*+LBG3F%k!S?IT}~{z-bk=NaODQ;tbA^x2mm~
zGn!33L#;%<f+Ijq!*0Ch^KunjDnE48UpAnhYAX1V7NIxr37-Lants8hd<ndE4t~ZX
zViC^ZU-;FS$-U$|_<_#D`S=Y-m_xZE7(Za^1v><vx5hoL)#$&vma(8=VQGL%)far{
zGx}y(fPZLld$eg^oP^`m%FHWnlpm-~KP%Wj*f=<K?$o)J!5xB2)?c#z<luzh^TGFm
zzXqGlZ8o=4uwU@l;FAGe^yJ`-Ky30m9Car=Nn6r2{D`)d&zuwNG}&qLumHb^uOA2;
z-xY|v@&GYe?L}^Yf4&ij(dPvG=`O+Y;AsKwp<@mTaFOHvg9ik1vmJu-C+AN-6UZsV
zaAHrr)t-8>nys@b{>86;GyTo17JuyY*y-T`-nm(z{&m^hWplp^ei(c!_)dVw)yL$a
zPYu-5@DOd|_W<-W-MTK|-!!P0!DswiYT_z?P#3`mcxIOXSJHgyFWOD-JwAAO@S#8+
zb#|a;wegaTms~3_K3fF-u9{pG=DB2YUVxuI7vL=Q`h5a_w52>s>=(PmY;|n4a_c8z
zrMi-M%O~g&`Ojacf1Um;I5k)sSpWDzaCY$b0Dsdh`vmm0-%asHddKfmaIze%oI{_;
z&v2jEs`jUrCRf7E>ej}LU8{4`r1Btbr@`nGN3qU$($QYyRxsbrl_wc<zj35l)aBh1
z_t0+qi$<|#!mrhW%pI-EM&u-7tU1LoG>Di*r{EP_fpfgZxjhHpEDwC<T-VSt@+ISg
zr)fEP6n#U_;4FFt=iwc79UMqU(oJeD^aw3gh#6oV9sl4HwKTe24r)!<=jxL3K6w+~
zvTo*kV~^*7t>PfM4d37)bE3{kH<|}^M0r2mD1Q|ToMWBZT;m%xUw(1pVBOrhx#NSQ
zgFS<@)}OWhy}_G<j|8U&e-E~w+kS4}-~qug!RG?G)&C0Em$8#y>mQA2jaXbVpW+bh
z%Fk*4mjtT=I)tu&d+_SuRe{&O^SN5gD}xsXD}xUPKMln6y@P!N`4vCAd~*5Z;^6Or
zdXD!O1<wCO@ciIzfn34w?rCIg^hfKk5%rosPyamqO7O<O7(FaFAW#>(L7?D3^PLs^
zJh(V8j*kjH8eAOkF}bxoNiEJAiFhEVw2tK8wWPV$2lU>Kfpxq)1Zp(K=uUw;i_dY+
z&4Yb|djyXN=oQ?7ujNT!TmW8G7o!#55F8s=2c(gf1-k~G>)-jH`S>kARyUIS;$C)5
z->ARHk!ct_j6bav;1&GBj=mG%9pk1JL;vDfv766`(R@~J!KT?SpQb77SD-KCCTf4p
zeT)+>V9T&_;WzR48Pv8`1-{dMkZU?xhr^xfPV8SEsJ_k**dt9TE}MJL7OPu(8MTeP
z*6*J1tz5-;;F9HmalxN-96f>`@CQECXSPK5Kwsl*`Hvh#4Om{K=8H?LJ9(D8N3MhC
zaSDx0?{$4nJr^(I5*kJR2=oiS;p4PfImkKsgk$hH9Yo*AfxGr9AGJ@%ksg<udX8EQ
zzV-aIfw+L*@UR*c4x(e^3(dLAS$_kq)^$+eIqC;LO}@pKE||Mu?tOt8GVQW;aKZWu
z)}Il4F*rW>Lh$3j;>SV3n}TzKeWv?NUmE-*u+A=S>7(B;s58i))Fj1gwFb4@n+5FN
zdN@r(^PjeWwUf288Vg?$!{u4l#~&9wDzKJPUsIzvF%Y}g2b(R~Y!=VYot!(XTm0wb
zKPN8;jtm|Yc&3=XbwGEk35w^|D`-D<rLLf+t0wcV;HZEGw8po2kTTFr4{kEu#6M9n
zy=v~Nxhn(jZyG!@kdOHj*X*sL^Z2t`fPW`}robWh4Ychkff}&A0QLaTFGmH-gGUE=
zf*!nIpbt1n&E1{=ujNR_2LIq>{EW}-B~Yhw?)3t7VgJsr97F6^KUG(?K4U$_nv%HA
z7HM`qX3fpN0gOY{rHsp2L0^As`mI@B`NizpSR4F0@SAS=DZgY7asYNLrds=_A(jU?
z!@milPNFVLtH^Wkh<3ds@NZ&>o$7vT7V6kIMqI@obi8#j=i?!<&F5;l^a?xlET5_2
z&@prpe#3S4-r!k2BTtYw_@fWR33V51h4MezMt+1h=y?B@2aW-HMb0R{(r3T_lLOHr
za?{m;-`~53S_{a@@J(wh_(sjezhz?`3B0DOv_U?F1JzydxAk%w$JpX>IR*Vpuiymy
zgIn+selWLcy6S;AUk%uw+{<-xSp3qQR_z$q$Sc)qjE8?~fflL;#nZI9u{OTP1~^|`
zz-OK(-|_!5VK=LS0|U9hnR92(c;tY&1LiJTf6<I<)~sJM%c*|1{&(wloZE5kLBaEb
zcLiSy{uYS+Yl5veY(3L|+HU`peI3?0>=m&;2ls3@*=`n}>6MQM@`3LJUkPXz+J>eP
zv#q~;D!?1gSMQ-u#D4zuihypxIr6RJ1M4>Ov||GMdgM>f3iz#cU0OokLSu-Te%DEh
znGbv}*2tl)MSVMXZSc_GPJx_iS>U)wV2^=yKwM-G0dD$4VBL@|7RSt!IAHC>zrmz_
zU?0H#fi}?{cmmHnF~F_bi)Zx#C*vA@mQz{Z-X&NXc<nRyl55dLUiUofPxu|bZWgF7
ztEs7t>OXzQSMiOUh2Ef_+31M@TbD!8YSxbamNooe1ayu1)dz!j2lh(Pb!vsQk6Mp)
zYxx7e;&<Y+I3ylg-;&2#H<H`<Hv*gg*hi#(&t}wg?eC(~oy(4K6mGEw4c4yR3y+vf
z`vt^Qbt!t%v*;P$(N1u9;4^!QoP&4RE55;p{E}Ya!+eg9;{<t)T#CjKOXwPWtp0CJ
zh~}Yh)Tp`+gtOIo<VCIRF4i}Ah~3e`I0v`jD9@E|s_EKmLW8hT`?>fSKB<18OXW-Q
zU_8R+#5wyQ#Z!3@Zjhs@!QdR%hym^+#?Vc)2z^UenKx@qbRC_hU-;HI&|_;BU=M;i
zxcnFwYNH&-^XN!>48#I86+Xx2e2(*QCOi3O)+yf{i0wG#E5WOSM+UbGt{+TOYyNkz
z>D;DsHwz98-X5GC+;V!$>B>O;)mj7ns88xSa_0+zJtuq4;_oA~E+U5GlfwdWS&X)p
zYkfuC#vYpY2jaK*uMT|AfREiVkY~s}?B}_2Am;N^8o~Y^M|(_gj+zL~b=5{!&HmjC
zJ}9@4WBGTK@Phq;V&4_nFJ??u25LKM!g7ZX2hR`GlyS{&ft*T>XTRXS!J~uc1n&ss
z9XQNA*p$42Z;0>ytw4EZb)T`oJGfFVq|c7<;s6)XLe~5BQD5a=bj(eIodaucG!3rN
z*J}q`26!i_{N%EYE}PAPI;wxCl#i=Z^Jz78u}R!wGuC_PaPgDfi`C+|e8SrPlEC_$
z97{jH9>_<(8hCH-seNMh2+%z^j1S5k@Uc1q|B%<<KDm@Np>mP^jQ(90`MBfB3$+-W
zM5EG;*6rCc{?UH(N7v9fG|qzq{KEdMTd7f5&&4<DoBE5BJm0x^%6HCD-?t{iXVo_3
zCiDY6fRAV({J`I=n;jeQPx{AxT6JNZB)@c2ukjg<GKR*(xipiy5N@K8=o)!#YsAJL
zZ__h4r+NnWfc+idHI3spMPdg|!Yk^-v<|R8{Q$96&gC51g`YOpqIc+<lLDGoy+mKN
ziyZ^~f)|}*kE?N!cd2L7iSAD~8cTCxp4dI$AvrD1!_C$x+0ByzdjT(;yKwG=;Az1v
zgUi=nzW$fN&x5}OG|(ZztAe$`6#@N&yVMue<+Xd4)M)8tv6kQOkiE$GhtJ>)Jc3ii
zeg39SLC?G(z(+XB_xA~w1-B3Qt9Y*7%D23}MSz$1upCAHBDbOgtovR!;Di3;8#I`F
zLtO(Ovq5@W9nBnzJ?z3d%mvd6W^w-5)Rg5>2L<?<7V`R#V0rND;B~?A0e!IDhV5qY
z(HvP*X6tky4X6z`L$3AI0PorhAa{IY&@rHk=ph<Oj;W@DbJb?_34h^~zXulw)(Ne5
zdEYfddjag(ljC_dzEy9v-a}Wg2Xk~}Kre`sbToUWx#@cv$attD+nYrL{UkUskYjyr
z0biPaY4+Lor{ABg<;geg&sX!4W5_${dUm0%BL9*9%dzMm^{zh#{vD=GCYww)4b-5z
zX3vgjB=hFqUD9^kNdsBWl0)GYd#}_Q*ton-9y!A2xJE6>H9!mbj1IDYk7l4H_$}Y0
z2h{&)AbL*yMm-0w*jqy{Tl=>UsZbyGopYQ^7vUPZi2k7==pO!ToZX+_H+MQ`p+=)#
zqYdi5_yxD%67$4n<ul?1EkV1g0n?bclh!fb)=aM#&_%9stu-%k;M_p1fwrP~@eSRB
z3$;;yt-onIj-~z7Eol~9T3$8JIMq4$)SRnd(R6eij>3J`->nUpe{n;su%BByXf69E
z&Y7Mwt96Ly*4(cfTr_vl+>e4U2iCDZAK1flX>g0_Ev8QhRtIMVw7R&j{qjTk4Lh;6
zz(=;3Y?BqOon|pxtXA&@ydsXPqtZAB1-QkL#*tUhGI)oLTKiGIutvtutjnAouwy>y
z-xKrig!x{~w+};&L+w#5lKrb4@IkpMJEVccJo;O`%{qqIFP5o$;H1-n&j+6h_#a>V
zX>fj^zG{z~Jtu6?nui=-oS=EdTF)2L)t7Ojv9Q-y?M9wuA25xh?|4VfiBE4E;9ETG
z8d`_8!8v|=f@kD+{*5j7$2Il~^IJNPzECq!|FhSYhEPw@e|zfWC2|)w!d8ueI^)`a
zkMI{`!S?K<v6gNRBu@HEpeAJB27N>~TF2;mJ9}W8;wYZyH*|*mb!xuW#no_dihN5R
zX8qf|`uE$dkK<2$k(bFIX(9WF)Pk&Es4J^8(ED_du?D%XI0Iq<U4)xF|5giV&4>Q8
zZnGq?wnksz1iFoXs{4vjbdOwwKdSYpZ8@56{@HabT8AbAIh$IuF;vUpANU>ko*az5
z(N}bj{15-&9vtK~&<?bVKfEKKQm@A~I|t&3+8w{vFMC?_)q6Z7H*yagR}JMz1F=(e
zZMl^kM($;gkbZ)HQxI^lKH5vf9`wy;#zbvQKjdO^34L*IdQ4lbg_$So+u{yQZmz{5
zF+^MNwf%3e2yPqvW9}bwCkE=w>eBlMI|N$=HxBL@Sdag9V9g76eKPoWV0{qJ(`E8+
zHblShGnz%dM6-zR>KgJ197H3D{mX+Df!|-bM&6|c!vFmF-PP{{HtIJ4_Swp>{5yqy
z8=&S?z7tn*6T8-D=ki<UJMvrcl}<Dk;)(e;mhyLTPCfPXtd+k#u$MqicE3QKh>m=9
zpyqr^aCTq}>}^rYR@0`V)f@OdexO&bm)uGH`0fEM_sl^4MGvhC<Yx4ceD(f;^Ki2I
zxv{|Gttb1peCY-J1J;@OE^hKUev;#e2iBM!wZl;z+Fm(&%^2VYI+`Y+?d1e`$iK;F
zKOe0pcegk4)BrE*`*92Sczz=&Ka;~=7SP*jV{BKwRcsWa=na1Im;fi@7H!gIHmXl}
zNNh1)w4eBc!`1WjlcvK%*2z}|FAVI_p^xNQY7Y2SPDTf*d6{Dz=%@yLmw>N|nf4s=
zXLS_qqZ#;-yhARDGprZm9Q;BDiQl^gxK|vuU)^5On*_HB*pD?aT-D!ks5#@b@(#|&
zGjbz(hYpi3sSVIR-qVuSxa5U$FYwwN$({Yt-eMlkkq^;DG!Y)sKkyn?`Cd+}_Qg*<
z14qfJ#9^F77g?*M;cyM!k?)8t`b8rj7>K)kp1pVN4^QD`eWw5DE46rarXL14hraV%
zf8w7uX`kF#%&=x7PO1TlHP$A?ay4%2M%E0>kG)fy2kMg#4%A81x33-GrfmcJVyqFt
z4#7QxR|T{^8?{FQkJ6;Z6OXecH2|7MZFRqZCcrO$-ssOW{}DT_kBEzF13ZI=@Dr}#
zTjD<7XP<H~>#+Qd?Yh=+O&~A8X>tI$fIQOgozx|)&*;Azt}$>8ZRIn2TG=)oCC1<`
zwkm$mtA1ldAN(u76Zm7GmU2nJUe$VOS!2j9?Qu0n);!tZ-ua!OH6HyFH}ENLm6ypk
z<+**|-(lf39HsVt#YR`ma!~zH2cw(#wVV_$sSELAYfyj(#3|a*UKrzV4E^@k+O_)2
zihvKxbJ(;Ru0OQ^wu@uLcDh_HCm&(6YC|^;_^98U7?1S<{m578d)l9VR1?8{e3Ret
zExv?Ha3p<g9>h@Xm1E*0d@Ig~Eg%nN7xFkd(EN$T*2(BE_RW^*B=<Jn{D42G?OrR8
z?|}FAO~`5ZEspZuYZ?Q8jQUZ{mL14V)IQXW=nHxRA6bLOW5&n(<}&ga^<DmNEOCK4
z6s<xdSxYz8{1<14m-x%)<s{le{^L*n<vo3CEO8dU$8Yl$qV==yX)Nb}*UrJgxX*LM
zQFR~uQP7G$lW$oclgF!{^8tKg9=+FgoT)AR1P9XH)<DDn@qix3Ik<-oa6e;ZeM7$g
zlHkbT@L)w?fA0~&y#lo)YeQ<;X9s5mX9m9w<Z{-o<!y%ruMfT*(DFD`OyPIhXdLNa
z^C=FA#r&Huh=J-!G?Mjr`rydGp1b`6I!b<muW*n&WwYcvy9aa>EkRdVznA0re9M5I
z!e??jb#wgVJwL@gd>?liBeqE!e<oNNuphtcqIZmwLNlMbasl!)pKZwRlzdJb`L4e=
zQ7=%drCZqu{`VZ5Bc`k6;{sfYL-3+}RBn3jz`CINnR>RP@ldl?Z>naZGxrK;O`HX4
zQa&@DG!^}c<8iw&p(Bk8{b6q~p2F4mM-4^ogzitbW--(6#_@(V6Y-u_vJcT3sd<*C
z{XI}K#KG%=Uk7xQqxZfuR!al%)H?U-K#i15h}ZHbb$z^nfAFP$d!W3d)(`lVh7ynP
zE_*P)Ui+Lz#7V7f<5n?NY-*lr&L1Dh>Ev(Xt-OaeluwEe;`rLY9vzw=-_XtKCvpn)
zXxwTn?3vOxwqpOc*S_NeexKvq{;tM7Xb&7z|D_x80N;>@;bR(7>}!2X?kP6VeQINB
zFSMY#Fq;DN$FJm`=1}~=3HX%WGS+O|x|SSNjfnokiL|g>R6lX5xY_!Uwl_D^cbZB5
zDGu9fIl_0ig}s<(aYvu|f;?6Hvd-qYIE+>_&TOH2u{@#OY{R^$ed!Y&i{rqY87rW1
zi!pz7zH8;;#@76bEBM=={M>s-@A;}4mNwB%^pm}`zn%Ve_HTx~a{9{I+LZMvyh&@l
zC9tPwb@18X^x)z^Oy)CmqQ24|=2$z;t9rf~1l^AVmt;MiHlnfc6MaAntqIg!eCFTi
zSDSK;oC1IP-rAcOtRAHnRd~<-)mdpR=gUXrhjJz{o@P5X;Cu2GIzT;-Kk^UbYc9k?
zIXI3qhvria!u}L{RdA-Y;}wB<r@O=}byx9ITom`kAbNl;uLx*I{w}wp#c;LUwtS5r
zjfwi3+MGP<q`=r&d((col0MVaG|1xu+CvRlEzX)an_(OJ<N4OjmIdkv{E3h8A+NiS
zr|Va2NL^MA(j(u}AF)^Lr`e4U&ZIBIK2Y;A|J_@o2BcQY&eU#c0%OAl=^?R5d*ut-
z)_j51R@cI1?XNXIzOU{0!ZrBJ_54GhTgz!5M$JWg$*uT@@70^t&hfGFp+)I8d8VWL
z`_33TpMTPA+FyQAm*dZ3A6rqY<4g3Kx=w%N&Tar-;0ipUo`r*)ujY(<)sU=}8N=?E
zG{){v%gSwxJDov4(N1)eG47fgj+H~OLplr}`eWBLurV>Oa!dM&&8Te{4|7bb$sygZ
z`zAfd8kzR8eKpDpQ)@aS_;R3TU|-40gQo-!3e>@O4z^x^f5Ssv>VCmvf@cLU4PG0l
zJ)9h<i&}&63}a+$j0+v8@AN9JH~(suFAMB58UI}&I)m=vTjSaizrrWy2ELQmY(Ck1
zRzp{lvd%^)sCD_h5FS!r;j8#aeHBOXJ2f%>#%I_D4bLWwm-!O&*?`<x91&Asc_7xP
zKd8rm*UnQr<Ucg4dzmY9WN!GV_{T5Ad)!7ZsDbI1H3Ieh?E{*~+T)!TAm^o@<h{39
z0KKFxzGpy3$@S!c+Xlu2Hyb<J2^aadP>d@+ZLJB9S`)#a*2ne>_@S{7<K=NUaomTa
zE~@`W2I374mAk0<`pj6+9dxO>8-KDU$@bZ!m@c<xr=De<p4O)i@T;1*H5z)G&chk@
z9^pyr73xZI1bRqqNxSi)`~e5>cljvb7Gtkpw1#tNMztoK%3tu8SZl8Mn3&4%<TK*x
zCj&X0x|v)SALt(*pdaW7_Mz|KHN7FnV?XpLTf(h4K^`YRVrP6ojKypGnO^`6A@9(x
z0)Kmr|D3O_ax<JPr;@XP@dbIHTn(4tI7gg-SHOGofrsp$G(U8fx<ijNpEW|-i~lZ;
z5k3d;gWc1K=35=y`Q{z($y@opeUzS~mIvNj1H^;)&zKl@uf^f=Bdw(``lPSzn;6!9
ziBIxju?_!;Q;z&lP7d;3<2B~Y?q|H{1)sZK{f`~A?uUb23+^W$mNVmHTr93Qnj5dp
zl^E4E32}UJY@;iz3jiB5|L#HGd9L=-^<tAbFs3vw8)SQG1^ln|1AME7<mhv}Bu=qG
z_Q&qbwYk?vc1K@oqdFU%PEXKOd{CVB8c&MpxQkBVn`(0Q|JhUKT(uMD(PGZEw(m2(
z3a)cMeD7L*&8OuyegolNavaywL2^&+;j?@ghvExy+Z?cSV^iC%z2IGtGpLc6Q*$LD
zH!sE<=g=GcA2-kl^a2j@Z0*-xyohhKSB*$}<-&BUeM>leO<>)^S{!XBhWT8+tj^?h
zA@0as#X1_7jueOR8?G}p_>VTiX?PKb={r8)`~05nG7fB%z1Dsm@fN#j{n~kQV>YFh
z#m49>IhX#McVi%b!;3VNIA#2;3u_A)7ko=&kHEh)pIA<N8%tWmoQbPIpU_|IAGetY
z8ce;LkFiDb#J}-TYe%%0yi4q%&Fz(172s9*ntV>If#!H(6Pu^=X*aoH_XD^WuHpwc
z3CH0eyu>d&n?0=y@QWiG!!c|LhkETh<Bnf&fWC;A=B6;#`bmG|ai2RE_ux1jC|4I7
zXe7E~|G@eM{q%$2gy5~gi-IQv4-e?By9aj&_70W?G?{;2ZP$QayMI8xy)lsAof%vf
zSjYDa@mj6R-hAVLH`$a}C_ei4j@Z3@0_<7dLPM!l$iuo`MPr>5&=m3<wGFizn#`J*
zJvB59O-6&zY|V+(*X>PEGoeNJ2%oU_#SgTBO&ULZD;CJT#TWTMO(~yKOJxhq{pk?g
zCkFdmE~{2RkBenAusOind_YczxA>qOMSr!&dYty@mpWePBfB@|_iyZ)n)@CB-L-dc
z>wq?+)eZ>m7C3rO!_jN|1ZrG#-R^-J7oE0gV4SR{(Yxx@@?7iuI0on71p9>O8vd)^
z!&k&kG1geHbv|Hj)$*)~spo)oA^%@j>q26Ke3$RA0Y1gQ_*(TD9^sd4T3q74c$lBt
zOMu7mHSVTm0gus=Y6SE=+mZV@`dmL;V{XL*@d4M<akOXmh2s#lVEimDnSZ)Wtm1QY
zfOhJ)wJe&9uQwj*pFJynBWs<(|EJZupqiJX_ts&o7xD$?*)L^}Chg`v;;X$0@;U2+
z{1j)<F!Trwg|Dg;#20!N%niQ93E~wUV9xNKu@rywiyqKNV~dCJJbM(IeD6H^0e8?8
ztpnjqykjiHKz4wa8vo>#cun5fy{h_wXZQi&Qo39oIPS%uEsQC9&~I9g_GKGt0dhy$
z5MRm*_!2I|nRpS54L%Wv_^mO)d-#PtnM>oMPx@wDIv(mw>dwXlyf#M0#c_OZoaAiA
z*1g=<n2U2_y*V%!;vj#g@8}-w1LKC@t0#S5?c5mJI)^na_XYiM)R*Sq+OO@M&$i#3
zHU^GyQ2aHw;)Age8{E%*jTNn_edf}*m-Eb{JOs>V=h0kx?K5>QTt|<)7U%Jo)+_bR
zxOlF18`IJL^rQ2DZ{$t1k@${-fHncI#ecOy{!1g!3N$32wik)7`#qA}4PRJu1AN<c
zH{a8cG*|0+)qu;A*R_VDtuzEbYD_iHav-+GC%PU+BN|8g-?3m1Y|@;XKlaC#%$1xF
z|KK@o7X!7`z6kY7bvv+!%u$V!#-saaK<hKsPOU}Lf7N+-u>0=tqZnsA^t*l5Z+h7g
zH_C<8&($aBGMdVK&{e?3#A`l47m8={K|CpU&_}$a-|XMK<8{2{y>Va%?9HF?n7vr|
zPi>rz!NK&WvEpyW-e)kr)(&Het7^~g>(4xCn|67&xf*>Ehjsl>tj90xUyPH3+sBK4
z*fb4?lkpSZz*TB)#p+qMvwBu@Qg<qj%f5ZNDgThG;x(E=tp~5+ciPi)Js;Q0Bg%33
z14pQfus1QX+{TBEl_QQYw#MF=>l=N^57kn%L!C&CK-}?fa@+f0e-rKZtKeI~r-OF}
ztAeA0qXO%k);%8)(1Q;R9uV9opbZ}uJT_31`#`WZI48I&@C?uLOgdRCFs3xFny@@n
z{e=CqL3x>d4faoVZA&fNx)z;6_c>bQQs=j)Kpo54mb$n)oSGZGXx&aN&TpaB&iM=<
z;#+)79x4Bmd(nRQ1^2LVTxG1;uvjDRm>+Y+HpFH&VNT60yTE_?#(vD9KH>(P?vJhF
zIl9L4<g|QLj;5V{e`3vo_S+;ixg7)g?XJOn0&BmA1xExcf}<Ap(>Wd)JR&$GxJPh@
z;1+@U+zo>31WN+H3#9w34cb3PPt$!k#X2Cql!MY-ax!{YEEGHV7aNo7u}fp3uln3t
zKEL1#VuF}XH`Dx%-uq5Y<a}euKGkCQp?k7({)!9uIi8d+$`Ql^+>iHhJuSB)Fo(EY
zyJ6&YI@`J8h50r1;vx>?H+Ty#c(yi(S@JVJPs?bxT+Z5@y-@V4bwBkuIiH#w4Q!8_
z^&NSD<MKeQ1ZX_<66;*{<k&|=Gdst%at8UOoQw{ntH*uwIEMD*$J(X7<!JnHh_w=J
zr-6)L>qWF8;AA<uKb)=KQ2o+elFhTx*8FgbdElq!-Mknt_o4~Qt>PVi$Mg7=&1-|t
zJzK2g1Gou?f%op`9^k$>TKnlEdZ~35Tu5uGvFNM$!Oi+_8~~>l>Q;qwsz=6}AKgfc
z;Yw}g>-uSYXe4omX2JzD7QG@Cs#}PQ;x>5gGhnCA>9P9DT2XbRn#8=?*==_3*5_J}
z6Z6D7^I-fJ$2Bnx|C<AC?%3;x{^*zS!arh~cw*ed0=BK@%4ZvQjEQrNw|kfyb3xB~
zKEH46Mt}6PeeV%}<4u}L{m5(ils?mYw6geQp3SlGW-sR2Gx?r)r5)wi&apWaGx;KJ
z5lbC$h<J>H>kp$Xh_85BTxC1uV&i4(*tK@adCUoYqy4nlvH;iMKlM4ar`G7`rPdVX
zmGo4PYIbUB_J`4$Vi~AA`dqwmzU$qmn#)=$Zt}Y%W5<5jTkWQ{!*1koYIB9T>1(!B
z;7#Yd*1WM(n$9!SAM^_+(tJ3Q2E?P<1~{~wDo)9x>Bsg-A8BcQ)-UVgj@~=h5nPLt
zt2sT(GjX^+<8?MA#;_IkPve;zwqK2D&Ts}kV>jY*`37I$KK5VGOwMUt5)bhgw#^Rt
z5gWjH{LL8hbDEqjuwSu{J!_*HC0%Un9F3z`;(PY553V!b=19I!yVrJhS8ijAwRe8W
zC*{v<7H_d*T+g<}N!-u=yUrno(wE|?*eW-ZL#xSvyv+U?aZA3f-l87w-y&3-6wAPC
zpZQMh!THVU#659`uHk=pw6)7}2QFT$Tg9RBbv1R@dH5rU`8bG{@?A9*PB#X8UM<0M
z`8a*0ullqy5ObFY;;6ktYASxiXb*~gX!e<%AN(@-QE*0ZYH&)hHn8seso>+mhl7s<
z#|K{ueE;3xC&90SKLwWt_RD&P_)W*kf6WV?(q9^aJ@Gl*AqQ2Tl8>zkx=)nGvj<CU
zQk_!W5-ts_o2pyVXEdPSRMBf{b@sm43-5Q1bgzA;)^TZFHB#%V^zNwT)X4ZEKemoS
zbFy9hf;aHHnAe<*uQX@lKm5v3JQus!F|9x!h*$c`=J^0$mcM!)eJvl=9&J?5)F=D*
zuAAR;E)Dh#4i0Eqde-kkp0u!+@96w{JkJOmpBy|UI5fC#a6oX|VE2GN-X@@xjgx(g
z)|-t<_x#ugLerWLJkFQpu{Z_?;1jV=jAWPm&w8o&!pHcP8WkT>_p|o`_>K2ISI^=*
ze2*{6wfGGmR_kWp;xIi!ABnNX-S~??cn9AY$MUl}hxWF{LBkg69X|KH^VCYjE<E3P
zrO)t<+9e<3SA2<2%fYmtmbFLPIsk2|hN*6=J}GBYvsAmZuR<-;K0d#-^O=9kb%ed-
zuJP}q9T?biE$34kwMNfhtqt1C!hh9IagebyZt6^Ut+|1mLd{R?#_jY14y7g8q4A?B
z@V7ic+%T4OJ=+vZz<5CQm3cSrjVpAmd%8DUs1KMYv4oz&Y1#pN-MUQcj<k#RIp27@
zhd3q9m;<2KK$}OfzoMGXb#$><<p}+(@B5w4jfFpB!8cp$q+w|{V^9st?&%6XTb)W5
zupQc<@Se8A6V4SAt3||V_Y*ITwK(TF&^nE08)I$JF74Alao2blgTB|7F*h)Ng}J~z
zIEarL_r(xL&5Kw=-!>*SF3C~pO0d=jUYk?*QuCxEXj1K9589@FB;OUo^=lkQ{)+o(
ztgf*;R&yC2pv8=lvB8<_v}5Eov>t1$*d%yu{Nw=rUTpEFZKFLHKm3hTI#&8*yhc=S
z7$ZC<p3}{M^Z1)QscV!yiqoz!Zgh+IAQotYzj7G6U`x0NFR34hIdmn^f8r4RODl>K
zKr_;aKKDKCNiWjW-qWPC@`}LydQYF>bnx0U=;^NQs0WXAVef&C7YB>6e(ZJk_uy6f
z-+llwb6KEo@&kTC8`6CIsJ`SqEm+Nn%Uwe=j&*C#p@F+^fhN}WqW$#VclzXf{n2i^
zU7gl?xwxy1o>eW%XZboU%1&#CIFilPH*0TftLqnh)ZF4kxf)&^^Y-R$?0`PNk?f6a
z;6y&fxA+}x%MZmrT+Z&+E`XL)yKt<obPoSzZ{jhZ=Bp#`dKSK|HmOd*!)*gwZyVgl
z{oLELTQ^|$v~~9niP>V1SR|IKmD0y619cg((q22ilTkxex3LGyJ^<^$Bf398Y;~^n
zJvAORBYS?uKD8w4$o3X^4lUuC)e<y^wH3P89vtnI5AaofYRu}JVv;ezm$(2&;9WeT
zHjYQsGjLRM9DL3;#7yTnUo2@2#(0`T&#@jy2Wg{ri{E0ob#K2_@EZ`?z`vQ{w`P80
z<=;p3`v<>=bo8Ev2Iu(yak$36-$XN5JElMA>;C%+>TAZt+{g*cBTf@%@iaTu2bzv=
zSUXu2Si`m^;x~0_oc3<g&W!vz!FIt7gB=#IQ+~y^OK{U*kA*e%-J>s;2F}?w*dp*p
zi`#SUo;0{RGi`4#f!}0!zI-2VX%pYa34Bou!T;uiZV|6>sQEJXd=JN)H@weZX%~G|
zqu|rH2KV42wNSi(TXCuNZtLLo6!?vxF;G|TZ)?@i?fbOmuU>BNggnD<YxPSW;^@6x
zL_h6!?Oskg-tXFsso%93Uwv;~y}xh6@3>1{17B)0+tVjJgImNZb4eGoWBQa{mQ%@d
z%{kkrr}-p*kaIzERNu){R|jfBG&k)of9B`zi-T|hZfLE~^J$PVzSD<za%o_!3;rUu
zfzR~AoX|b3Q<yIt>Yg+j{X!4oLiMbZ0)9(>cU{$QJn)QMLd}=0)5hw>YRG)R-U&V-
z$EC~t?iRfE8Q=50y%)}v54%pSS<M+I*>mCE{FdHU55OzN45!Gmo1+*jTx(vmpXSB~
z?9!ij!RO4QI6~Lp6=MN??Z|fLRpHhD?Ps(QUBw67bJU2{<DN^?XhU<-bHj0Xsqw~~
zjvB}N>T&VGe7lydxsTW-mbo_@5a+5%=~7x;TiAuRl{?Kd@Lhe-*XA1Zo!6k>h4V%j
zh2F!lHFo1rsCO0G0FBN3#-Dj8UsU^v(Z)*u!~lKO=hnv>BaNSU4PF}~^K6{JYv+#R
z=6==Vj*b879lq<BY6BQsI(kGu>(O`Sp>rW-nGe2WKAIz$4}CTUi|54n6>PC%Yy8a#
zjCN@*I_}Qz__Jkv+<Q64TwT-L^*rCZH_pHXIDy`G>}$M%uc3P~y5~XcEw4C^z%lq9
z4^_9ZJMGg}w!#P5CtJBDf7JJ}UE1cpILx!Pr){Fy=|;88!h0Im?^^ITZ8_FIX<9M2
z-+K>Y5_s(z=eSSnqx7-7Qv51>2R`?`I*2xT?<faV*D!V+KVzyN`eUq&lYCTsH80~_
zcg&0%e>QG~@$=dkg72L-+C=TjJ>A>bw!Yw*eYWui-_<Vqne+O(M{Vu7xTEcEey9y&
zd#%^;fl;%U55{~Ne>SHsFW>{32_Nup9Emrp)p5T3j^68<kz-$r3*wk#L05Ne$<ejF
zem>it&$nq)H7KCV!E@EZ3h#aH9I?9XX&c64pQ#=6p!F*`28^%A_i~D{F3|6s@AKB6
z<p?xGkLujs%UkGR`3i`a^o7@JgRvgo+{GB^yPOEm8hdk4zQlp$JDgsQt4*>)K98%|
z1eCwZ0d$ABAa<E^eCiqa-FUX9DYvh-qLZu{&>wUZ4Wfpr9yq@$@UmG>A};|siuGt3
z1>{1s1bE-?eGbm`S<!Wdt}&?L({i4z4oQp1yXZKYk3OQ|=>6&vbIw-8a<PKl^AEm9
zTjCkHu$qIKfwd`nK-J#;8x8$;C1_#$iv32*(QlyXS2c5cshn#MRsX#%`yt$irdLb1
z_N88-MnT`w-s%N%aqDU71@!*Nf#pw}sE#0C*H$^adW0H)+J$?ngIFi@9Q(EGVfAd9
z9_-y;48P~>zE^d3ZI*}FLn9Be_ut+Qdra&z*2gu0-wx=r909tI%+YUP``)=~`L1;z
z`_J6h{pA_<nQ5E$%6s%dO-8@E#wV`eaeR&Q*fBn1_xOq~;1@It?ZIEzaO+sDE0jAN
z*@Mq%KIc};@H6+}2Y9a<g?6El_(-*iqxaQL&WE-GSJFwi(lc=rzs5)S2an(i{*MRP
zt2{>jAy=0-Tf0(oXWygG$@A-Td`3+`ZGcu+D^N2~I~YOB`&<n|Ey6yO?i=B6_Kc_{
z$SL@n+}XO`m^0PatZir)f78y^7W84{G=0?9k<VI#p%)ADX6%8V8h;wGFs7ZCQ9D*!
z8h4*N$MwBWuj&0dN3Jt}_yG6GpXp+;&>vpJsp2JD8)JK8JPv7`UHqBP={@k;_t2O;
z?w^q}c-~mc*A~1CUc+KN>mJo_xE{yT88ilcKr7%l`i;(U9JO3?Qb+X#pe6g-kxnZ5
zeXnz`QNMU5&>~~J(PwdK%twr|{^*ynukN7Z%?XHc^)d6s7tOJ`gn5gY_f?;FZXHLz
z<)dPyXLwe}(YULjm}9Zf{4_76sm5`n!IlQb(HPOct=l@PnbMg)uV(k!*cmta**)AB
ze=W8P&mMK9_82d7?DN{+IF{P)uj9yey>9-~adm87#Lk+dRx9+m+Mr$9cTF&-&27xF
zzSPdDWsQ&i8xLB%dfmR1qU%M~|6-iic;0u;qwlNX>3DEIV{M#0!#va$Jr~T8wwOD<
z&|IxP$X|>pn0NEf&ua(9+_+TFciijG{LI)Ghvtgo7*wBkJZdw|pT;&fSK~*{oA=K7
z*WUB3-p@1i$+&}O>z{Vi*V<QesQvn(pKPhnXZ>XdqwTN}^^Dd8#8kc~w(&haRiDGv
zjcu(1teZvAb+g<6zc==Zed4TmOQ$bJW3tby^Z%!#a~GqUUu^B#T=R||=|B00STySO
zYI-`J?!KlRMNT4ixwmJ~<ZW{`gg)x8F`y%iPvZ_=qD_op^+W3zj*In!F&4i%#_l=R
ztUPmkuCWDepk>+)^D@?A+}9jxhiBqeb8XJ?qBw&)$`6fwwHtoHM;fb~2d=>_c-wvT
zS4?k?XsnDK4IocyE=1?3X<A2g?B2T`)fKI=(DCw*>I$_`_i&U`6>Fn9eCFu0?gi?-
zyB~^9@w)Hr5wea0@&<5@XKPE>HLaP9IUC)^X4nTCH10Hqxi%L5_#i*!*Z2^(Eeq&(
z>u@wKt!wR4{he-CgQtb%3y$`lfc=2-60nc1YoBW6)-Aw&!0WDm$_u*w+4Vtdf`vAK
zy*G|Nw|=Ny)=}y4uD9B+=lR-b|GWHxcJIG~)1w^2=c@w09dRDm&*ZxH%hCJZ%lWQ@
z<|*UrYr3y-8t<uX9i#4<G#>Ig>l`ZreYLhChwA<pbtdseyj~jMSn-hEo6F`Ie8@cW
zFaE|C*?6@*d-(sUF_e3HWJ}Px2+mQ*Xf1;e^|fb=&vBjmSSOWB@B_64Hp_nb5PN3V
zwR4(X{ocMnduHVIs{?B$G`_sLzq^y;%LB%JfN})6f}Ejf{@?eG%_p31{ZC#oLLOsH
zL5|^h)(JgdJLL2I?Thwmdwr5G@^f6k7jZlO#`(s{oZv-%X|C`o4s88|kG6ha-6S54
zyth~f@Mmbvk2V<5@2acB-rmD^?8*7G#Hc64Z5Z{H*bevu8uK0LE}#b-edaaDkNcW-
zpc`5z?C1ZlWAE4J^q%fB-mALAkxo&!ZZ1Ik^x3W%UwiMK`ZQ`6nu@kEM#jq6@x5vl
zJ}6fZYs{PZ6F-|5G-irDVlbHZ#Sjyn!ycMv@@cWz{Xp*F{*8~cQ8lzSu$LZ3+Yt|I
zKVqf!1I^XfwTWtON1yd`NBysz7!w%tg=?~%YCiFL)U@u`XJ~`=`7@sWwAuNtW2@k`
zb9<lWN24vfr}u4la|dm$9gp){z0AJY0DGa=tBdLQLcY`-s=23QwR3g8xH{g$_v86q
zyN`UKxtcoCm_v9byRB`rO>G4JSKl<g;Jv=o=jw0l+4;VMdGDR~U+-(*<J|eIzFnWJ
zuR7Lu>Q_CEZ5_{VTeQtHn-_FGJg?9X{V6AnJm$5}N4u#ljQWrLuz%W-Ujjc7EBWXM
zpZ!m89$%BAH}}7$V|}vcI=>j7<+Jiba~Smi;OjIhG@ro(1>NpD=RxZT;>Kd&p7FEZ
zzt@iU@htD%zqKhxJcN(%63(Lc#Vp!F{HoTUSN-!jRPzrx(_-yEu3x)vpEb5coAI5o
z!FP`Gf%0EJ8^8Cuxr$@^-9GD|G4#B0u)Z`8(9Y(5V}7SE?PK$(<}j|u-{tG}rE}!j
z<^Y;oX=kAyV+~2W+XvSg6Kx*b+wpJSs?FLsu0u5k^trzD*nag~$7(iu4(K)-h0dc_
zy5=M|vR2f*ruj>?Tk{nfh!(QXg?@ANzIluD<W9|-#+=3d>BQ<x?V($>Uw@6YF*Yv7
zkRS1FJ})NVF1#k5<61e5wO6$pd5yIRdy1@SbZw%!1pQ5i_cuO%+tc3zjX94T0h%xL
z-{$B#g|!OsUT&~z0nURlACOO3Q)s><XOa_u*YX+P_2}IB3~T=PSK0;5!Ny~A7td>Z
zo9AfLn752=)kfzxXK{be)CO&mZ;iiqlC#;rIqu!;zD;XI*42%F_gsr@>W=0|d=x9h
z7%>2+i`nA2zt&#OGhg9DxQl=B3HESJIZo|&wB4?GHV2n~)Q06C@^CiU{J#0fd?x;X
z{+IpARbX*`ZVy!LU+!XkME+tO!ahfNjGSTh0{S~A>nHLGd%om0_Jqkfn%h|G=z7Y^
z?Af#)GOk;8J<^({yhc9beAmfetVvp*u{P?r%bu?tpl$Y+@mFmJeynf$Xe_`Osf)DM
zF|G?6Yn;(K6wWM9nyYdmE;N_opO`2ni_!l0akVHrsK#vW!AAHu?L&{S9a^4NlM}P2
z)-36+>NTH@pF5XUDcqyL9b-OFozrLaJV&27*X!PEY>Vf3-_Lr~w(3Id(r#!U#`msq
z?>@J$$2QKl`0D?*Eso>$y>|TEYgg*0ajj0I!;Cw<Y#y5Pn4fBNwY6$1+NrvRHfoG^
zEXKI!b>m%Q-uT|@p5rJ^x^HtH&#R`Z4QY=*IRjgw2@7rZnd1nbfj`$5)r~kvAFl~x
zj^%aVw;i*a4*$8Pd-j_8fcCpYn~ZhyEwRm9%&YhRd#|1E%~SK9=044@aH}~rzkJ7>
zvkmqq55dXu5HWMiKbq69$<dbB<JA^-wGXgi_vCxMw!T+?s2#eV56K5W+uFY#n-7dR
zX8Wmc;=XY*UdGNic1*n=ZK2%KT+)4vi#)^qN6cqa^ZzaXG=Fl`R&8F)L-pMr^|=^7
zGnO4gV^B_W>{#GCZ8Ep!vwf}o>a*95`q{qr``W&vzB?`+r^Pu@eR#}e_*~!n-un^0
z<D1p!^>aR4{p(mw?%2=8bm;r>yS}a#Zazc<%1e3_Uy5<vXWfFnAM=&wEY-x0eO)c>
zz1O4er!zplu=u{cf6sCB88}zoq+QzEJga>hxvgU?F5<V=bjm&EYMy1T{_pr*b6ayX
z!dx|9Esu7-dhF+p#mL*`=5ek%r_CoFY4f6=n?KO!_PhMv{%fN)kNxJ$xU_a%d#^p$
zru*J;^angzPAD&Qyo^=zdgBgbziY$#tIgWq{xwHtgS9ty0kr}7%9s;3w;b(FKGqye
zp3_{6hLZbK$I6GQWz~_P?;Yi7K!3T$_3rKYwMAN)9af9g4$Wcb)_fZW^I&X@m2oqU
z<rm{?oIB>~aCoV8HaelP3U}i(JijzhHxpZ|o7;nH53L-*-ZH<Xu;%19z}9)>750r;
z=jp%OVC_i$AvcpFH6OC})Z9nj(;TZuIZW55nrroUdG6QsD0xj`eah#H;e5~*=UTtg
zKJ6UWv8+>B$LVj|^viy_V*IW1_**@%jfLMB+IQ#Qjj{$LclEn_zlFP|J$Uve7}IfY
zLiZbs>D}wmysNrT{A%27tf3(qYs@<z#5mP>IHP{Sj_?{kz;*16-LdnoIazP&elm3g
zxtMj4wL$lr$}6n3LTd_gj^<j;v(yn5=U8$VkZZ|hnrq2z>;W6GdLi$!b~C<~hk5UF
zugAPhZYFOkny1Otyzb}Dvo0jR>ixAr-lt9SKy8HPTk0dNmB<$hpXsZ9%RalVH0EEe
zm*4<n+;ulR(i)GsXx+*jsVCuQoW}2Q9_}@_d>zN)RrAl6=_BCN^=rBWXf#@A1Y4?>
zY0kvf_&@za3$j5N>*%BYWUr$ZRTJ;Nc}I3#+x8yt3iMjngFW?X?BIEx+q|&H#h*1l
zb8Netuk}0E>dT1U&vCwoS3k>nqyBT>f)*^A=Z#0>*!;{`w>EA*%u%%=PUf#-9-lRz
z1uk#C)Y!LJBUIC|39&#7Y;5R}-}m)+?75EPwbcuapJHfr96J<C$J%z|lJA_`>lSN@
ze&3ipp6B(v(zse@R$o@LjPLup*SNm-Xn*yq`T+lpang7;=V<O{4jMQ4RO2PTGGAcs
znuFlp<{9-Xz69o6PEfzX*^9wGK&<6&?1_EV=h)=vZ~eWABcB2O!`JF>eeKwDdaQr;
zy<<P?ed?z@^3&eSxqN=~%h6}N)?Vm3nez+R_j%*%`n&7u*L<(O$$yQBu^Go`^vy9Z
z>$n<kb1>#+qaT(h&1qqd=_7o)SeG`Y@=4q~YSB@X^Cf=94%uYwz5Y;NTD-Q=wVF|r
zip|Y`Mm;K4jQVqaC18Fnpz8sRE%YUbHzR0IF}|Q#t4qBu#Hzk_>^c9tvwKT&EN8Ma
z`Y4%3(L?E(YbZSo^_vtQnX6-$_hCf-0?fD_euKktJBN(QTI3_Vebg39=<iM%!&dKb
zjk7WDbGc_??`Y+yXP2IlJtucpR=sEX{<8dgAL!h0J~U6wo3r8lM)CfQ-t)9~8_(6w
zip~keyN-8w>t@@nr`DBc?$%k)Y@H>lySg>%dkyQ=SyQ`b^v)OGw>Wb`>)pAtd%^jW
z%$~@H?`szI6VJ25MKX5c?i-l*lgIn}E#qsyMLR>6PlgxTpXktcW#O&9Tk71F`_6II
zymZc2noINf=6wJAzs+qjcf|MG`}g0LxBpuw-qqbTVRuipbKu@p*5ck>XzQ~z%EzMn
zJ9#zzwMCPspM7h+xU6;SJ8a#@7q_!3-<@BbTb)_%{II>{-goEMx3Px$Ufj6iSH&j2
z@>y=%d!4mC4^`S{<~4Lb@4jkHw7yz9twG-jwtx2dclS*Dp?%UF(jC)%(>>HZ=f3J5
z?03n26YIUL|GvwANA>ToUn<|9{r6PW-uKkr|9TIs`u7|Ay{+FhduOcn{^%VNuXo9G
z()CW6JzxBV^^r{N{nI<>(%wmntvLO6v5m!lKil6e`kQ(0ru*N<_IL9=AN0&ne!Abg
z@5@>Db~!AU<+O9AGp5{kPBahBhxT)G^?tJY{;u>s6L<FZyk@QLI<-bygVt#8wtZ*P
zecIjdA78cmqPwH_s_vKWn!az@JG8sW-L=1^cmMSpxA)+FL-Q`&-wXCW?6=8&pRD@Z
zUUct({bpJ9_sRV>SM~d4@6D>;DZ~9Glf3ur?0WC!Ct4+g_}<rxr`Y;kurd7auiEdd
zjmvL@{q1LC_V=Wo1Ma<FuF9KdkkD_6<+xn;PTQSc^={j|G)LXn&7FI?Gs3yhx#TQp
z4YU@V$(;+G(Vf+u2b}}e)>Hexb=G=o-L(eW^WA~Hn|bEm=kA^@Yvb*+rgzEKc(rHM
z&WF~1&#(JD8|_&=d3v6Q!}k;NKmWTZem(QHk39E=)%I1f6}#$w_r6)%_|hT2=vg2n
z!}EOLS;DhM_j_k*x$T_ozAfMFS9ff4;VyM%C-eP8Hfr+}oiBHMzV}?{-Ahf^a}!(r
zyBD5fX`Q&gTR(RVJ@MQ*#?rW2Yt|feC)IDYc#7A!8jrfUb5C{tEp1%Jxz9@Zai>|=
z&eeSeTe>;(ToxvSY{RPO$>zI?&n7!(cX2#bdoJB7AD&HHTh>>+`hj%ej-&DBFP{5E
zyxRI)yLe*u{Mg)>qv+<Wy6=3=ccuBQv<{kc-^28b(sPsVU$nhLK+jbn+Vf7>Gn3~h
z-(Pr!+q=!X;}dpv?w#j7DC{1De*4f)mR-+sYR`7=&d%rFyE?C{o!y<|dw+Jm?-}oG
zzwc@8-}v6^_;xSs-H=}WcRv)bce;J{EN^PL+gk3rM?5=wwrmcXE6>0Cez#|Y{oUN#
z<KE${9p~2W#n!I<v+ENNw&tyS=WMw5Q_oQDqt5c$)z0^-c9?w6{djCc-<5>!lkOPz
zOuS_7ypWG*ZGF0bF792@J~zh3z4>sal)J6=YG;dkpgfoJ-KWikGdJw~Z=TwxozrUb
zSnZ6zd$%>w9^7iZ^!#z(Rkq#wYVFyNo;~fOu(jI$s_y!YpT4@f^mecMjw5UzZ9BR>
z(w?ohSDq^Q)v3K_K;vm#?WKJVlcRE`I@6x^Q@O78{^q`IPIf=-{F&Qu_m}&yHK2M{
zaR0Ps)Yg)FXV;s3cX_p2qwPI9@16PnYz=!ZvbLdTr}kYuZS?!5`{%#GRX_N<@9XXM
zmA}<Zr+7PK?4PhPmy6vyo;gDM$TLOgzO#3FMzeqHm*&nKc23^v`wwTS=k&1q&;Dvp
zz2Ee|Klg5XI>WmITZ8tPz2f}0&*I0kuG<SLUi$&h9{P{3yJh#z-81RqwHNKn_KFzd
z)yMV|P5%k)ef!K^Z?A>!F1+$rF73C)a^Ji(SKVLEy|B`LYi>IqJ%ih8?K6ALv$ZwS
znz5#y_EvkPwP`QBZ=~<Pt?a(&PI1TVdrkE6-9e%Epnb>kdq>|l^gT>}i_rHHeNW-L
zn7+GE``cwS?E8(a{T)NKzjgliue#sS_<kjx>id#(v*D}$i=*H1tCtody_Ngz|NdKJ
zzE^47y)SxalrwkrzkR(Ax|h3$n~UbeIpJ*R4DdZm^WFTn@9p{4NNeTZmF@lZvS-}Z
zpnI{s*&2S|Ztw3~+EZ1}cs<YU_bh!Uu)jm}TS31k^tUm6&#>RG^j(C%`}Q4+?^1k^
z0-yf=!1pAfzezyXUS8j?^gT=R{jSA#F#e{R4nKXj(swWQUo3s6()T{TQ@P)(^xJ=b
zN8x*w#_Ky3zpM0Jir+~3ZDgOV%V*Eb``brnlyk<p)S2kHr1P^g##z!m-aK|bcXl|t
zJ42dp@4~HxJwrSLw{Dyx?&H>$vtsYx?y2sp&WhHgyRUmKI;^&CJxBI@*_v)`SDhi9
z8J!93g}zVO?_Bn~7r$-#Ju|H0XXp3GXw`R^eK+HLs&Cb^ak1HR`z#!7459PzJ_|JN
za#1ZWd!KvnUGz>1%ddML?XLG-f_Z_Sp+YrTbeNrr-+fSZUO>;?zHjLaagMY`Dq*!V
zrQ%MC-gSllgz0X{Z|(f*vl!5eH#T}OUzPfG=D~OsF-51_x-SRiY41a4t6cB1DOq{+
zoMr!{pC8Yvoz?9j&uZB=zxEJ$bC!?B+ju(5iz(Y`c6`)Fbp7PV{%h^kPCp%UO`i|4
z#;x)v?p=e))NIxKd**QWGzPqUM~971Jovljnv3S7vh&xokLOj-tlm93)5yZky6&~D
z&cSSxyYoWd<wR$*_Sw<tTy?g_d!Me~a?fq_!prMfud~{7Vb6k|2fv@5zu!$)zBC`6
ztvyG3?%ej?7w!$;rL6t6*=KThPl(=Ubh`TY{Gh*;)2YAoybEkj+-K#>yJ__1&luQ+
z>>&H*p*gGWx<H#}I^punwe`_D@_mx$a%<KZqwVZj{b*-pYrfLiXV14c+9&O?_FQKG
zbgn0hR@1kq?7eu|w&yz!_H1+Kgza-Ro%d<;PyOWSc2+qby5FkqyuJV2fn=fku=7d3
ze8#If$M*TbbHsiJ=04u%;(ZobKhagO^c=0d@8H>sqj9RmxbdRpETo(L(>Q<1y|dlf
z++0U*Z65EOH}}nPxUzWa)B4ym_kEkc?{@3(wIIJftl==;wp-`cwCBn_i=DOYnf8yp
zcH8z`d(>GB<8_X92DFzuBj2aM`_uETGuK(Md^8z9d_nR(x5ZS9#pGPLV{txs&UQy_
zUgXMoVE=m-ac(SsX>xPG&+>Pk%pq)^6?4AmnIl~O(oeE{*6$W$62DmGAl%%zzpa__
z_;e3jEAp*vZnWX$@47O#*4VD0U1MnL!+HtTt7DCI58ay0^7j7nEU@T~OwXNn(LLVX
z>b`fsrb`av)ki+JuV{Sz)i%zJJ-Tt0mvShd=Ej~km(8(xhpho?!a8ofwa$8mtac}c
zomrh_&c@EuJ%7=i!|o(!ynDg<AK!bacT(?uepmUoKkui#FZz1`zxCJl9hUEK_U{E&
zkFCEY=$*88TJNkEz0>-;-1NP_`mV_LXudOo#kv)L(K~nVyp6Sc)Lq+M=&s#+QQqL{
zr60e0uY2*{W!+oV=C0?G=F^$tc_-Q4Z}j%ONtbPBO>4(p(tdBfb$-Nm{#a+Ny{h%r
zc~nV{pZ0%i+8(gJt?{sZd-sL)-`Ub0sLc=E-LLjw`_!{Ej7RR-8TuXR{RIC08$EWO
z#cSt-?$cRNEaKvuUhVo9FTGGL2j#*&xo7R3x6Ma;-<*`^s=2uH(OkHnUXwE)&V=UQ
zS<o8s922VXdk*$29IoE`RC%8#@zYnyLVZ2;*Sf5_`=F2;OKZ&8wz%Vru6)v!FZZJ7
zj(fH)pDe64KkhwuT<AUvmv3I3=WOk<^&4#uE=?EG39X67WGysKIg*p|Vm*Ydf##&V
zo12|;a~PU`&%m{#t%-ElKIyJLny=6^b<f<lI`5$SDy%MFn~(hJ2QPhkZx7$^gWBE`
z=w-t`6ffWUxntk4p~LhxzxI=TVou(>;{9pQ)~Yn06??-op|#%{u+I0{&)SA$*0wda
zXw6#JomX2ue>v-)FrCiv>gqcO**Fi|NA&^G#o%1ry;HnZGW){0SUz@Nv_HyK`K!7^
z!}3~=@uDl{p#5UcEbaW;HNLcUV-2>xd^Zq&dZ&HAEq{NnuzEeGCHJ1)vs%w*xAsio
z8Dz0%w|%b5ZhiFpxBW-Q)8D?IXLl<-eu`K8;nVZY?zL$73afVy+IRL;`{?eS=1#G1
z>>Xz%Y+bZgT089_=k2aH`^9=|?K$J=*<;#ltksLj?X{Kh6Sl5ZafQWsYkF+iq_g*g
zeF1l0I8)?l+xCc@hPz+T&4WFHZho9~WYE0XYiyEdvuC9{$Gq?UvnD<vn=l=1`p)b2
zto0V}R{HCMFSt7NmPap?o3ODf<-5{cG)Lydd|A7T=F~cF?yZAe7uK3}THCsYc&+iR
z?u2lkeWKO9E70un#rBha{OsHvaPJg;`G9<f8+WvE?-=Dke(V=mPB+K$Z*P#*ZjQDz
zm)hoa(HWIa_CNVfW`4z_O(qs{``&ucwkBX>kCp=%Pad+}{=_ThjUm0&-!?rlvcI`2
zC*?|x<PD#UJiPRtA<hnGhCOJ1)~1u4b7{|`mGd2<^TA)b&b)jS8=qng8;{bM^p`Dv
z&JO)wG?wMFb)NO?;W^i{hr8K#Kb|eR^U2)TA$fQE)ANRB3*U#po<EXh<2w+#`)m@;
zChWVFzGJ!HE!Fnji@zlZ`%bFL$CGb5?5@7J#97Qe(`-)mdFImccAs_jImVsRyjmyD
zf9uIQux9W>JnP8ba7Wmi_N)D8|F@^@>!s7v-t(Yy^FGUXZrL*yZ_n9ybezr3?)Tfl
z`?Is%J3;6@;S>6fCEV|P_WPUt+hTu<h39V(wXfXY4f*>;*xwW_?e8G@gY5fGDc`<#
z@|_d(-P04^@0W}dHuiG0?^l<W<L<}36L+rA_uRJ@!q&sCpIuu^JI`B#)lbEm4O_>R
zbYH~RhqcT;oz{K(L~ZXl`<#*OE$>~<;zfIJ_3)gP?bXgo=cK*7XW`xV$)0L@oe7<p
zYUjz)`wr#(X?3oyceb^Q-t)Ed%UR~^z4}k>?VrCeANh>lnh)`X&dJ6sUvjl)qnx^v
z<XaAX7vovHxiM#W=FQx@^L9<3!#!)Qp?j|0b?A(R$)DD1{7UQ9+J*K6v^T<Z*hI5g
zo$Pjx*@xlXqwP~QSvuLS&D!Cwjs5PqFd1KLLoxADoI8eSW81O5Gxh$ouibaeOLJmx
zhdXch=5^a|&F?cI9c$zXTQ~7xYi!rjt{MI4W7iMb7{XmIjdb%;E_N+MSLLz1n%8n~
z9zu6(=w5~H*UtLReeY220B!G4d*^n~x_{lR?iuJlT6Eubf1&rTi{3ldy%=^^x-Z?o
z%U?M?_IzqzIX~&$yR|sC8c*Zi=Z$?1*?U(0<hZ=<{py}|ukM`n9MwF+-FNm=xa-5(
zX)oC??UB}<_1Ie7b?h$dtbF?3(K#JHo%x;h`~2*gdY_;Djjw0)u=;O*s{fv@-%tH+
z>TiaZ=l4~=y=t#69-V%}Mf*Luw%?WUYO`H`=>6MeaeLobY^;sVm_vU<<=w;k%gtNu
zeV=ge%KP4%?#1pwcVO5&?mNVuRnE5Nf6pmrsrw2#i(6ODqSoA=KikF+olAR1?7M;I
z{ksP`qsW|BkgoH~`$2mOz34m(J?}=-Upad9@Zghd`-`@}!%HvE7#5B1)A;2f?5vQ_
z5RI?h8KOEv_O8G)Upt3r=Z*UZ?)l^Fv1VQu`qu~k6JDL#d*_ocFWUNCe!900_KRz?
zbUNF<G#~LVO?U6}=%>OKt`44YJhjOd%lWN4H|8rH_XXaaTRK<HUwrgWw(Eyp*qY+|
z#=QK-mpoL^#vUKNGWua_rMk~t(W>YAZKK)3_~}Eop6eEqIb%H^x`P*!sh%m_&(OKO
zxVlez-h;@r_rAaHM|AX~kJ`n!?Rd4bS-YjzPxR`p?egg*UweHo%3FAIjfWq)=b9UH
zb?MsX8@5MVOZIBCb!Uw(wvJbBU0>XNap`pJmwOJ^roVJNeURg6^IQAc()q+^v-0R|
z(+R}_%Mp6<>ZZ54+Hh?*&*bsYA^qjiS$lNzn{Mq2-1(2M4dW?zu(hOIdfVw(cVYh6
zEv}6H+I2>0x2BzGXt?}%zg7Fl{@MLS#s{6+_spcD|0`!3()|h9^QX_+<zX@Ury_4x
z2mfMvPrS8HUfK1rG+lby7ukfnUjL@OzP6vA=w#LMiIz)kxc;N@!=H*V8IS#jzqmT|
z!uG3jb+nVSp<7&Ne(3YLd_L$rwU-yIk54(s*C$#0r~GYh$@P^@^iL(7N;+@qn~qmZ
zx8T7muboUKf6|ZVjHSPr?8?_aS|1m8Ov!evPr1WO54~v3FGg4QtiglMEaw<~e0cTw
zB-dX1=wf86jd$ZuZhSBu^oy7ed5g8Qd5Ra!gbsdKq0dikh3(?iUs<%6m%qHF^{>Ch
zwO{^kbaub#kn5xNlil*<1@dw6C!Z_JjxU%z`tC1%BwKmUPCxC#)klZ7kj2m6mSXzU
zPNt;uL^t2&91YW7`tA|!@X~nDUewMn8q)c+U*rGuY~!4Gvd0T=<r7~#i#OieUfreh
zx$WO*`Ck9g{E+Y5{0)!(;?ufGUfK1s{+G}G>c_WcU(UwgC!2p&@9NjqZ+P3{p`#5i
z|H%iP@D}~WzjS^4D<yk{opu;cd+Fv$d*_TU-V@RZlPmnyMu(Lr9Xx&1UVr3^SH5k2
z;Mx_#&R^|HI&bRzdGnu~-4ot3n+~6~-2s1#e86jmzo@@3{uX*<SH66@7uR2Od8x1^
ze{;Y2Pkqt7$lvAXBiYWie&A0swpVA@NoQ?sXYQrxhWyc8+ts^1=;N>M%JB75d+E*3
zOYrA|-Nn^e+ojD@x=(z(_4P#GzJF>zjXC}0qhWob=|cR)r+Zr5e;Zr+jlbV|`u)6r
zhrNFvtAD4w|Ce$9zp(yot^V!t|M;r?*3<8W{npvP@8<tM*T0e9zt`5kSD&ok8;dXf
zerxLYsJ^4?``G@zr{7Hb_v8G#Z2jA7{kORN=G$+OJu~(jdH=>%G5NR6`*+Oxojt$l
zrJt|<8(ja7oc^2Lesk@2<bHGRyWzf9lCPd~ile^+>Nn7Is<rz*JH7hvH!r`Vm7jR!
zHQVg^oweU(`|Y;=`c1gsfBWsWzWW=bbjxqP`faY?|Ms{3{ac9W#@ycvG#CBbhy5FF
z{-1DR?f%{%z4BU4TN913*!ym~cHgJgUw!pA75&|TzpV)CqrWHY-!bdoHtXMm^Y6g*
zZ=gl@@1G^>-)GFGT$F?I)41w0EVtz)S-%19?}qV`m#=bCp89X2`|qTi@77Aci<igN
zMeD}z(P8c8IJ<0`Xa7&6=DD2r`*?pRRv*n_zg<^bANlAvZ+}O||ISOlsmgu7)0WrP
zS9epTd^TodY%bF)r_F_bqtf4y_&bo~`AxUEC@<OioisXLd9}{Met)IcJa&H7x99Wd
z;%e^G?Kk84F~7}uynJQfINIlpgO9K=#pADj(rwPF?xyt8zu(Pfr({<=YWB(d4W)T#
z4*FY!=Ak)gZ^XBT{0`Iljc5MS*>zn^jcN1d_iAG;H^ud7T*g<d<~ZH0o0t44^<OdW
zwZTiLT3gQjmQ*e)$;H86vh<9<wOlO+^3b|Xr}@ygJ~nr3VfoB2yVoGTKI$`{$@Nvf
ztLejhvo*eQS2dRMZ~o&IU$Ir|2YtuCd7xWg)$H<9KlyK8G~eyf_Ec-Uy_%2wW>c)r
zrP|pWFHE<-lDDqQDZA)o={BDHw`ZdpS0#JnE5>~ABkqv@eDhyy<+VBOd}=Rr|8#ym
z&2xP<K4+`@v^`L4<t2GJ3X3zInjM|u&tKycZ{v+_9E~mee0MH(c6FZkd$s89uw=!N
zp4_}w!~0Vl`4StswNY;ByLDDAKk+K*?l|&MNoI`{Z?$$Mzxs_%mf!L!$DKpb<-PUZ
zJk)Qx`DZU~`O1IuT}j7Wv=*zaOF2%baWv2Mzk5io<-6GVt$+O$Pde3nRjp&=EJx8w
z{iaiuqwM4;Ub=GI7_9BPR+2TQs<XEF-oHPpZT%I;_FXKM_~kM^zT_;w(V@QTw^*{N
z?wZM8eQa*ZXY&`Ta`u$l;^DJ-l*5g`K9tR4{+rY4?&ap#T!-oHdTKm!-8kjKn5~;)
zspvntIEtZpv>xhPt*>1h`Ou$SHqP}`Z0hDnZqnb}WSf5dh$D<wtl6bszm2Igx!U^Z
zj1JAYG0Q_XJMMfo&Zqp!JDD7$pIu|wQfzX${F~41&wg#sR=XFS6?>P~cYT(d#(wvU
z@fv&MO()$-ah1d7uRh%comKT$MJIDF)UP>j9BSjsZ@IL0KJ6d5C<gZOo^R{S9H+y#
zc{bk0xpVDK{<N>NumAcpcF%g{H`;k=zIVLhXq;7RHojt9#$=t8=j}^g^{GEOW>-GS
zMR};yX9emPzLdT`ilZ3R#*xqZQT4TX-~RGZ;k!P!-)+AXzdrO^%+|IXilwonw|>iK
z^Ha@l{?bV|yHJg<rk9^kshto0T8qx5P&-V=d|q5V_MM-5cUXgq&Y9cS`qQ`m#k}Kc
zJoxFcZ~a$m^8@)aPjZsq^4Pqn+AzLcZyaJU-#b_JXTHo&KGvr_y{NDB>PsJdm%FO_
zDs0U7jW=B}8E<|nJ8olv$=T^IfBDy6bLiP%`xZm`Tjf3975%?k@BZp5o5qkI>&O|_
zd98Mq?ek9UYU^yzbK|Z*Ip4kRJnQ_aw)aE)u(POhXwN5iK<@^<Gxz>{|67T^GpXMH
zW}@#*@RDcezn^ojc>XOG=a97^chJ0DY`tX@l4TQJk^5KU&qungz1CuRQg>}Gy>jPg
zIg>9r+Z@Vm`o@;e`mO&;u{C$C8|$HYb&j+S%z4;a2$%nU()s@Hj+4=Y)>CLb*N-)A
z4Hv`GyU*emCpnB)ZCzLGsYNpO`K|9_+4zmsnqTzaCE(FrG~RrcLv_b&PhVc~h)Hg0
zFHOf8;T({+%|r9s8f<M^ORXbxXsx#n%F#QM|I9JoMftUcv_r*yu-;pHcP-bpCheh+
zO>w5PXNL8@*m}1o+Si^Togv<V!+nm;2U}-TeQlh@cWb#*8)xxqi`ibyuX^_)zs4Lo
zJMgamZ1|R!#<62*O!`bmjmHLEyYX5RJC^ABORi7(g8DHwzVfH$Lw=r69$<F*%&)%D
zp?*S@p7GLqva7GgSFvVyJ=+tVHSM*#-}Zd62h&CGe&owO+A}GhKJ59<ht3b@MEv~n
zS)9eab0x3wtQl)5RE@V7^xN2+FP%C1u75EY|2q@kpYmYb`RyF2Kk=D=`A)9yJ>&F|
zY{&XEKlzZy=*Fc_>!_T_M>2T}+3%dh+agzCGIe$2wSH7Q$WL}+e!^mr&&`E=Y^>~y
z2@TWB=GORh*zrlGef#8#UVieSG)Cj!wHPh;>B?b#__TK7p_6^DvNuI024jHn`AAm|
z*N$zm6!R_dEAbmo@wc9wWzMG1I)giIxoGT_d>T6}hhmPWERDxU?U%zpKGEiNeKu}m
zU)tQ(Pw^G2F?N>jdFj6BynlMe?EFt(KJsP0cbwwe@f5rM<*qoK=QkE{k(-m+`ZpKw
z&L4iL&!13k=+s7swH0%{IY?&AJFiQVhjNAv`G3OtERM!g4&-K0-a@&OFJlmU{Wn*w
zk=D%JgWA>=J?qPQ&PTq)Y@Rp&Vvw(Njb9vh{Mz~B(->|ZjQ45$Y{aKOXpc0W=xrM#
zBolivKE)<Ja|J)mmA!Y-^BrstE}g!4t`B1^rb_XN)xI<q^SJYCd@$X$Lx*Ji!EE_l
zootG!cq;N{owP=7CEIaj_j2&{VT`r!IK@~D#Uw7VCC?^A^RfJ7e6ZzjeUd@>;D2M@
zv*nJt_O282i~qFNlgW{sG=}JkzKv_=Wyf-9<G%T+oi4dC!<C`sp%|2nExNgF9Dh^q
zo@y^todI%~p0m4ni?Oq<=h3a6i|-hA?Bd=r#50cgSC$;lns0nN@7B3k)8jML#>=OY
z?_z9h<^%mH_H5`jKaJV=%gMeE;D_Z+J36~+zIKe}@y^lCNjXUVG}oICdD`4;KI9}`
zwYgT;Hy&JldSs9e#25SSN&B)f?ix(TIN5KU>pQ=6Hl}opvpiStoHviEc`;w+DtU92
zZAIUAJbUKIKOWrpikT1bKh5EjFaDC{Bl{h1aqgI{>G+>YI;!z%^L3H0SE9c@is6pY
z*u)nad%DJF?8d{+9M)I;KNbAdr6*?X5U=qy@6B=8oLdj(9hQ@=*={>J9^ds-JdMNH
zU}H9ii@P7<Z_OtAo1fb8<#BDI^GOD?;injzlj5xuzj4V)*csM27dq>FkLx=T=bW78
zCx1$PeJc81eRg4X#i?2!*3wg+Z(f`+@+=>rxsjLr)mKFv#b!_Jnvs{*PqjRR@)mAR
ztQEfGdwpiVcdhT5);BxI-{!C}$W>!(O&IrGE85A?n={YO@|VBzWllC%<*ayqitQ<{
zYx9$>xkyKT-`RhEmZ$j1Z(d%L`t>0<@7?e|iyF5vdp`0#u4g5=x$EYx9eJ;x9c!_x
z@uMrnwK2(Wes_IpZ-3V7&INz*w$Kq@n1Acy3H47etbZ}^SwD@(JX+J{2-+XoaP^~`
zzt9|-&-$pZSK|JB$f>?VxrNuJw$d2NMPo9~T@TiMymCZO4%pVN($P-7b5YpERh*6S
z*2Zf5E0Y7r$6NcIFZta)fmg2cxB1x|m`m|$-~4Qj?1_tVW>3jyn0@u;M;^nia%aws
zd-2k>Z)I=H&^WhGu^FrOqH)+abhTGE-}-qPkJw<bE6tZVLqlV<Ch)BZ?XW_>v5P0V
z_{3{m%~fOBxihcv)OgOwm1mo;{2Fupi>b9}P3}66-uRc!w)W~=ny-9Y`*g^z4>5&u
zRK7M(jp63WT+5O54&`WbVV%iIebiS)-|)?Sf2OyEjPCz08Z&?4^>y==yiz>Y(XR2O
zcbs(L9S^@R=kq~tSpOi&;Xj054ddB)Mql0QgWeOe-MF)l&(ET9Lu=vgJ$umpYaK1E
z9gl6uU;dS)$yXOIT-_bpr~K{STw1O+FLF{J=whtB{c7*H?mlv^h@CFmr?KekDKGJi
zH@tBh|MHh!-^Eb>VltQ7V!p9zZ*Ihj7d{pJuWz<tHgwQezWiuow)Z<bovHU+ZNArD
z4$OnGJ@u&{YX(|R`qxgL4L$8w0DnG=b^DW>jcMi4neV)cjc+<3f5vKzpD_K_0J~4?
zA^Y{uZf)b~C*3DHp1%0FZ87W`Mc+Q;W^<2jZsaO_4d72)+jsrhyZSaR@v_z5&3)~3
z=x4uYWAyf6%;~d>eyT5pua6y<XNJ~(@0Y&!-S0ur$*b)TcCF8idHcONuK$<v*T?3Q
zJv1h{l~;3jQBK?&SHE_(*cAO2zrDXXkc<5uB>C3tS{rwd)`vXoSkU5uJD+%T^CJ(C
zPMEFn^YfIS)k&T&`7kGq!#N};&cYBa2iCw7ZcgMw{BXyyV=2}fuQr=}RE<HNu5Wtm
z<VZVQ8~XX%Do552S#7d-3i;y7qF44r(-EK8#Te4bUMU`XJZw(Qr~PXVVRCc7b7!Bx
zm2H1=ke(todfIoaJ03Kh+B>$T^QW&+jEmyEafxaD<pV!j!3)zDqcwE*+fQvai}@7C
z6RkhEYxaqk5BzZZV!Lv*zQtm^Fukj@ZL~i5U8Ivw`E72Rr|Pa%Ytz~DzJ1<z)IFE8
zGsoM9*yBCXFXq<=8!?5uj?nS5f&3a{GCX>8Yb&dRm!4eMi}JB;xeCPv^HJdw8Xt_0
zF7}P*?cx2&ufF2qU0l29`haNd@Tpv%JJxbgTTV8nd}Ui{ERCss=-znWDF6I^)4q_0
zVywtTzTTXFem?2r{f2VAdiq>m^y)@yr(bMaj2(~9Y>d<WvF&?S>Bl)CrtS02kv_xp
zD$#5g-_q~3m#nfnVpv}Owis`=@%ac9eC?3W`q+G+x9{wCto-oH7fil3(bn(!Vb9;i
z<WD6%eL=SA>mxcoq`PRGA^y_wZu=9D{mScq`O!*oRkT+YPkZg@zAfKlwf~KKkseHD
zE<$I?^^rb5Z1w$w>BL_fG}M>&`e}^i*`5q{Ey_VUPxC>(KE)07Yy9!?mL^}Mx0sFo
zmc|R?SMc7gcfU)MhmA$KbnTm`ZNIbgy_VTSeez$sF)6zap2km3AM&?YpH(rLTWzxV
z(UrHwH=QmXyUQczWBsgb<;A^oX<TxV5A+=)+c3Q?x4+sOFL^d(##J7c-aYU{)6EZm
z{4c(Q^P%6LbVmIZ=k@<Iru_X@^ey(qJI2~oI@{jZFD=%MQC#M1WBti~eXLD>ZfU((
zN1^jBRJ~u)%SLRA`Vw1lG=A+x<9*`sd1KWkhxyo&p7xV$<<X5tm4h9-_wU|mqPM1(
zjml5B{oHXDANfo1&&S#?Ev_)W{+3V1pByZ1KG5{_$B#bb;v#u=mHOFn+5>R+Li9er
zZhQ6C-;QHx<Dg4sT-r}aC)~Ws#ZQ<&_Ul_5cicNhWA|?3UFV6vGCuNMKTsUTv2zk{
z<3q2#n91PUE=?ZBe=2nN4$bX8C&d$s@yMO_%E|cE&&Fcj#6^bxH^^2lwL|_ct-Ud!
zlU4M+^z!H%pYbl1Gr0+Gdv)cGzwj2awL|l*z5ejh`KhL-5B)d(;(#|MvdvR;h3>oc
z{JyGB$fjJQ+3U;M7k}p@+Ia`@_~Q%SKH^_qwiS5km+-@fm=p60H`hBy=tc9f{yud1
zVi)UHy30e$Rd+}CraL4)I;00LFMkz&FRdL`<iVJ3`>pl<Otv}L++F_qiRNc%JSg_t
z-m#Fu?MDpZ&Kugk6E|CJ_D_5|`9d$^>+1>if06F`i>}~_3F5O2FHd`M?U!CZPrj~v
zZS$`z9nU<4+H@CJ4^5wKZEFG24e$E7vgGTNJl^K0u{KBX%oQGte{)jX_+h>)w_V?F
z$@jS~9<uO`X~&HYI}e`P>k}=WV%jknE9}{0pQ${HkgqK|pZqRHZ@+J?|IU+>(D?88
z@STCl@j|xO*Gp+W=wYq?Q@qLVm>RdWU`(sCK9|;Kxcp1g+cC<AdqE!dE<m&6M}OM&
zxAfB(mM6X^9$$1|{x=Tv%G0UM?<YEWIS=V9@)Ivw(GDx|x3747Ml1TFyO>UX=ssa`
z#kjS@c=(~YM8Bo~eShOaK5MUE^2H}P-plyw!&r8_n;(37zhQpq=woqZ(N~`wl8fUf
zbT;i?#e1@=4}3PxJbN8Kq`Sz+qL^W_TYi%zuOCI9J07x&bT6`9yyMkgooK%5OFKIL
zQz`z+%HEvs&y_`gOWt<3y*k$a^|9^jYZq^&SjB#6<HKLQmGKjA%hg#~w6TaA#z#ZE
z+A7|~Ym@v_N!PiPPBFXd<NF(h?v!Nmmdtm2`N+oKr^!S9(o5cW)2ZeoStWk@tub=@
zEIHfs=tozw)7P8x*2zZArb2E^VYcQp{l?>Oz-o&rz4YCy`N}SNvi$Ej`AuG}q@yHn
ztmR8C*eA<Ip4i5(78l+8#WRLiNAr<f+}Y91cXZ=1-gNWBS9awi%w_tw#@~3dHHYcu
zGkJQ+8dq3JR*B}fcC;9hiC-M?(#!Am9lw&En%<lHZG*Rc@<kT%oxO2|$?~5(89&j<
z@WM*GO8S*I_n)7982fwG{QNtqJQtJr@Iri;Zw0+F^hG|s3z$QCVy+#{_iM0!#!DxR
zFSl|iE;e$dO&;=fd2+V>r&C;FX2Zvg`SR0`$A0zWm7DT%bA!i@pX{rZ#;Cp+UmvZj
z_N4ECtYf^+;%J3Ez1n=GQ@gS`VYB>r`K_)Gy4L&4+1E#Xpu^hw2)D{XJmU|w!+g{i
zEDmFW$<gVdA)A+zuMe?nhc|A0##hqAXOk?t!Y@qL7+|#ai}~jxo^jK`lb72rck%d6
zPd@p6NA-QK6jwRfF<hFzkbNjFzAutP<5@j^;zi3-bcOEnjS+9-O~1Bzj^-m23toL(
zKij^!SvxcoS8e^k)xm@2GgOQ{9Yw6Q@i*4!r@}s5zvcrbzcFbiQ-11WWvh=4jhF8b
zFKo@;N}jGY9j~@>>Dv}t`e-PR+I)uj+5XXFFum<Fe*UhUztv|)KO2RtHk&6TUyQC8
zmo*a4m_z4bbZfqLb?+AX<n~60)=&Poh}YaD!~2BgdG*<>->3fY!hD;r@b;B|y!>VZ
zqbrSD(Knu)TpN1JkFKx!>{-CrcAOjI#=U&;lGj$Emw$DW>6dJgTwd~f$F8sV@<1nK
z1Fa934H<pyP%)Np3;rF)>O_kPO}_jcyMAs=wRfEST;xlC)`tFIa((@zn@q_T4cA}1
z+F}TsOa0)py|{9Icg*p!Sv@}D>5ClF3Dc=IZ{`k<{^Ht3i%Trore8Z$&@leetA`KC
z*u+=K^j|x=JURd5Y<1Z$lE-Tting)U*2ng1ZPl-{8|~~~bdKZE4XfhbzVx?oql*_E
zZprTdr{p6$zWCQ(+&<|oFWvRE@!YY>Wq5O;&-I0;Uvq_DyK0@Mhqp1ZhuNb;Hleb7
zy6nPq@vkmD^4gmhZ7450_SHwHzh(VLS3>zPE_#dC&$gr48fUzXZ~II3Q`vsm(Z4=d
zmkwkrA8WfhVy2&rUwX@185*XiAG~n+E04c=mtH%5!i^a}-T3CyS-w7#Z{_Rq^0j{X
zNN@S+RW`@b)+kKpH@kG63g5|=uDw3Vw$F4v75X6^ynHM_`Sw+N<!Cx$cscp=5zo2q
zJp063yQTSEOulV&d~wG6sidd;q<3Z6#A6G^u>CH5{oHoCeEluTJ^k8G)f!F~U0FRm
zeqcHku^OZH>aD*^Z~w_^tGj3MLVefA_4lb?{Iyvgy7;4wL;E+L@tfD%&QH8u>#Kv_
ze)SEFwODQr=s>#R&E3k-`Bd;Ae!dmF-!T2v+4j=u)c#bik784-i5(|;&wsS<|M$CY
z-)}>|`*{am-L*&aZOzs{o>;<)*kQb6+O37BVvWFb=;ot>_ilautS^0Td}7{l<R$&B
z^>g{P<5$G^gl~=CKeOFC!roaV@13Fdhkb`2qc0ZmiJ-VEwcpe~X*@csN0#pjTzc&;
zpMCtwwHNd9>8)(#PyFS*I{MQWemt=};mXmihb`8J^`yOM&1FXq@|8Zl=q-Fb@yI^e
zkY^ix`^9J9I4j%N((7;ePjtF`UAj1aD(qG#-cQAPSevEAzIl$`eJ?-wPiF(2Pj<=c
ztD?`4-Q{W1f71J8zqYRq|9q4u?WN<%;mY|BE8Et`%J7U;`=UO6Lh*?!G?!@S86A6=
zUjCnC?9%&mHu91EQ=E;-IG^PDhT`Dw30Egt4B^sb_;Bs%U*6@jg{vQJY-ng)<ads5
ze&h;X`P%1`od0n9#$O&9u1)^%!^--2bKalJzx3)Yee=4qrSn%TN-}h~GW>YUUz?@r
zf5O#`uKc9?*7(-ZzWB+<Pkdv7>FyZWUS55F(q(gTedzBApX^$%%1`57e`3rIEe3ik
zi^hlcNisAU{l(}C9hmLf-}cp8d9=F@e=*zJXY%zKy*5k#CR_jPu5UW8K<0zqA~74d
z{L3RVkJiBQ<FTWc9KABUi~Pall|5I`;of1jRW|xxy`|}g%a7jn>OIk~Apd-bUEe>+
zwvY7Ih97y;4nOhYtE-RRSd3$NVn}~!_D~-XfAPuwiMKXO)78iBsdx(c@{-}xgZWj;
zK_wZQ3?_@d^51Nde~JPB3A3v_$>J$X|HLbH^5`x3s7=0Oj7N9r<%wZ^q>CS|T)T9t
z&NLX$c?;=2;o7Y~{oZwx&Xy;ipLl#_zx_s6t{wgO^o>dTH@rSSwYUFEZ~K$|#=1J$
z{wu{i!(CI+Dmjc_KiXluivG1<%=3|K&r@``l^$MgmCO3OJhH{~YQv?=;Vo>JAFsYD
z{E*`(6AxTo^iPE!NLPQgm!`LUiD`A$CO*5R={(^lUi`{a4&RdRPdeiImi%)qC9ka9
zI**55+`Xxvm9zV_cdiY6{MxrX$v(xsx|hD~`gtW_K5pOIY{RWj<J=tm4c+<o<Y)WV
zKVB&8U6b*wxz+vKnCU&mO(vF5+)w%|V@pqL__g_?!=6s4EDyc<^vXwcsN8n^)u;D_
z^q`o;fDg&F!^_jZ{^(piKCV8y#dNoAO~hNe_SKE|RP=w5?)ss#vX#fzruzwRZa?KE
z`<0;~|F!WTnRuaGg<F$vd+*NZWRPy{rPqG-m%ni>&Cko>*GD#&SDVdm_%i;Z&+fO}
zTpM=v#ddXmiy`^?xcd22cdz3ul7~+<T{`I1TVKUd8=|+p`k(x)4*JHh{ABuAJvuMp
z`5=?`i>WW~nEzLE=Yh|#5*p*mR*wEJhkxv}$rmqO`>Ez5zMN?DEpOW7>uY7vJKoJt
zw7s=9^w(!}MQ$LS+s6MJ%rF1Zia4~x)k}Vh@i=FaqyH6jzO4;kVX=gjXywiMCokE?
zU7H?znCz*@<Jx_qi&<GZUhSu`J&ltsS#k0Egd4Yb<K3~Z-j%akOsD>?-L`-0<HpN2
z{@N~02am3H@_1J-`RXLcyZmcgJD(LYczJwYJ|E<@Z@+B9=2stVwXfZkXTOEr#dMx{
zY_II6_WJrnul>^)<mL(4{wuO<iY1%QLbiN`@qR0-!^cIwmcM=CuinyfmY%XUcu&Y?
z_0i#tBOluz`zPO5cXifxe0@IA@yx~c#|E+$bBIm{O^@B;wPA<P$J(HO(z$)!HXl!@
z&$YqR=aXIfm1Ixl6Te(n+!xty8z0YoQd^<3xO95gFWZpMaPPODWNWj&exk)hM;l&#
z?JJ}635}EOlYP7=ezuit!{+R%pKF_LWp&@2_a{D`wSPzQ{f<V457&pa6mHG`wlDpT
z=JOgQ59?2R`^JOyamy3$>eSvo*lf({;75NdY{>b&ao=|OY%lVKPuCd$lRuTUBgcC}
z{$M)jQ2W}F;cs6{KiNOo@&m6Ae%2Nps_eBd@&l8jA)DHG=up9<zeu+F?4b3c9pXK$
z8G0*2FY*(Q%}=<tX!<w)9oN!Ve`QP4(+_n1)V{Q{=o5B#-0Htcgly?)FOr4J7t`|Y
zIBFZqm1S31oz-0#Te@uNho5-jqocjJewNlR-tA-MOQ$bZws7_6EKeU~Prj~<{o<~#
z=t^jBqo4NYZ@iWN4ZVFuZ)Lx{CtCckf&BT9)5Y>fXZfFKe)U;AztPFB9bSB6;tTTo
zGXDC|F1C12F@9PP^x;oFp8P)P=WC1j!X3lXSGG2OGfV$ge@_tZe}589wlqC5F@(#D
z-oC_RTyk;S@*G}To2}gO0rmAa$YzmUyyz|ZyfG|4eR8&c<A+VSV|{1h`#oguf=koo
zOaF^E7P32TdiZeX)%@p!Ji7kFr?Ro3pU_xfI-h9v$$u-wWNe?}qqBO^`6fg2L4Nxu
zUtHU(f7|TvjWIr6s7=1IPxL3<eC^ozhWe|mJoS<P?c=Gvc0b9lpS2UiZ`hbVRqL8O
zU%%1h(0-_m7E`<}Y%WiG^)Frf#;ZSm>1=y_FQ4rvIo;L63oF~c^p*2-_3*=`)6-^i
z+xX%3hlW@0r92<x!}@RJ>RkFN7pIc$Q{3b~q4l0l^y1R17r*kvi!b(2S^6hlGI5}5
z+rv=b+KXh6pVhfEU3_hrk6XyXmEHE0k%tPM-`ZENcq`(D{M7b-hxZBdO?K%|^SA3R
zS{ohq+_r1t(sbjqzdFT(7p=sr+_>>x!as7lcre?g`Fg^e-*oWcC%Y$pJbf>I(*49|
zyK+2vyGR~h*{AlMAGY|l(c#kTGrbDlyY>DwhGa^-OVe9^ytU&WZ`&K6_l*0Fu{!9B
z>r*Uv+D|B^VonY(pDmw@S5|Dw>isR9EnVZRjlcL}o{z>*Iqd)PiO=WiE)Sjl(obzZ
z{{~;d{fRHXTiMfDOtx)wd%m)J{}T^?ZP{J?<dZGr^HY53k<n!v{}wX%B+pO$bk=9|
zw)wdDlg{<=)KC8KKhfl2h2EuWTVJ~t(CvXII^OP&rTI(;4f%Qr=7Vmm?UO!vxP6hY
z&C2mF&v}OrKk>;IukN;^SNFz$<EDH0<s)8lGI(w97qhS6y<5+FxixYNefT7gXH8!{
ze0Fzz<A-cRdQa$iZe>rrl}9Vl=_^-{96#Obe`8J7zmwko*P!1Ynit>uk^SfY{m++=
z<{?@Cj!pe%_kaG>{%w@jP5-t{HN8sw?DHM(e|^>e`Bn3k%>PfJc(c!Un7lsj+$XCR
zXT{jk!)Ftw7r#;;^;wOMm&|zUk37GXbgb3d@f*v=o4oc`c8w?h#j>{9B=c_pk?Xg1
zv55~ICaWwOr?ISFKC9W(XZf#Reac7e<p1NVX5V=ICS}ZYvaiqh&2K*PFV19@a>7Uc
zvQLM+xRQsJ_>G}BqS+_QU-t1;eUL9d*_LGWZ9ek7{U*<Ug)HPd8F{>H8+VvqcJZUx
zB_mJ9cXWmBV*K><C#U+py6Mw3e!8J?%lnR#oj%ypVXqDO7w5IZ=YNqb+_E}LuMT?U
z`Zm6FHqLan$nWyd=1p5awX;*wi+APpRwfq6CSU1Q@Sri({!~^buF(33Uf*P)!nd~Z
qYcH-}{A<5_^dkT4enNKX$P3(D%GD=dn<qMW+efn65Uo!(EB}8izJYZB

literal 0
HcmV?d00001


From d43f588db1b39724da2823b73fe09f8609fd8e48 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Thu, 29 May 2025 07:03:26 +0000
Subject: [PATCH 708/901] 8357955:
 java.lang.classfile.Signature.ArrayTypeSig.of IAE not thrown for dims > 255

Reviewed-by: jlahoda
---
 .../classes/java/lang/classfile/Signature.java   | 11 +++++++----
 test/jdk/jdk/classfile/SignaturesTest.java       | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/Signature.java b/src/java.base/share/classes/java/lang/classfile/Signature.java
index eef86d5a7a1..f9af71083f9 100644
--- a/src/java.base/share/classes/java/lang/classfile/Signature.java
+++ b/src/java.base/share/classes/java/lang/classfile/Signature.java
@@ -417,15 +417,18 @@ public static ArrayTypeSig of(Signature componentSignature) {
          * {@return a signature for an array type}
          * @param dims the dimension of the array
          * @param componentSignature the component type
-         * @throws IllegalArgumentException if the resulting array type exceeds
-         *         255 dimensions
+         * @throws IllegalArgumentException if {@code dims < 1} or the
+         *         resulting array type exceeds 255 dimensions
          */
         public static ArrayTypeSig of(int dims, Signature componentSignature) {
             requireNonNull(componentSignature);
+            if (componentSignature instanceof SignaturesImpl.ArrayTypeSigImpl arr) {
+                if (dims < 1 || dims > 255 - arr.arrayDepth())
+                    throw new IllegalArgumentException("illegal array depth value");
+                return new SignaturesImpl.ArrayTypeSigImpl(dims + arr.arrayDepth(), arr.elemType());
+            }
             if (dims < 1 || dims > 255)
                 throw new IllegalArgumentException("illegal array depth value");
-            if (componentSignature instanceof SignaturesImpl.ArrayTypeSigImpl arr)
-                return new SignaturesImpl.ArrayTypeSigImpl(dims + arr.arrayDepth(), arr.elemType());
             return new SignaturesImpl.ArrayTypeSigImpl(dims, componentSignature);
         }
     }
diff --git a/test/jdk/jdk/classfile/SignaturesTest.java b/test/jdk/jdk/classfile/SignaturesTest.java
index 4bba69735da..692db1dbb29 100644
--- a/test/jdk/jdk/classfile/SignaturesTest.java
+++ b/test/jdk/jdk/classfile/SignaturesTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Testing Signatures.
- * @bug 8321540 8319463
+ * @bug 8321540 8319463 8357955
  * @run junit SignaturesTest
  */
 import java.io.IOException;
@@ -300,6 +300,20 @@ void testBadMethodSignatures() {
         """.lines().forEach(assertThrows(MethodSignature::parseFrom));
     }
 
+    @Test
+    void testArraySignatureLimits() {
+        var sig = Signature.parseFrom("I");
+        var arrSig = Signature.parseFrom("[I");
+        for (int dim : List.of(256, -1, 0))
+            Assertions.assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, sig));
+        for (int dim : List.of(255, -1, 0))
+            Assertions.assertThrows(IllegalArgumentException.class, () -> Signature.ArrayTypeSig.of(dim, arrSig));
+        for (int dim : List.of(255, 1))
+            Signature.ArrayTypeSig.of(dim, sig);
+        for (int dim : List.of(254, 1))
+            Signature.ArrayTypeSig.of(dim, arrSig);
+    }
+
     private Consumer<String> assertThrows(Function<String, ?> parser) {
         return s -> Assertions.assertThrows(IllegalArgumentException.class, () -> parser.apply(s), s);
     }

From 07f5b762a09e4fe9f7ba71368593f6dfa0ff8f6e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 29 May 2025 08:31:17 +0000
Subject: [PATCH 709/901] 8352738: Implement JEP 520: JFR Method Timing and
 Tracing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Markus Grönlund <mgronlun@openjdk.org>
Reviewed-by: shade, mgronlun
---
 src/hotspot/share/classfile/modules.hpp       |   1 +
 .../instrumentation/jfrClassTransformer.cpp   | 187 ++++++++
 .../instrumentation/jfrClassTransformer.hpp   |  52 +++
 .../jfrEventClassTransformer.cpp              | 369 +---------------
 .../jfr/instrumentation/jfrJvmtiAgent.cpp     |  17 +-
 .../jfr/instrumentation/jfrJvmtiAgent.hpp     |   3 +-
 src/hotspot/share/jfr/jfr.cpp                 |  22 +
 src/hotspot/share/jfr/jfr.hpp                 |   4 +
 src/hotspot/share/jfr/jni/jfrJavaSupport.cpp  |  12 +
 src/hotspot/share/jfr/jni/jfrJavaSupport.hpp  |   4 +-
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   9 +
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp    |   6 +-
 .../jfr/jni/jfrJniMethodRegistration.cpp      |   4 +-
 src/hotspot/share/jfr/jni/jfrUpcalls.cpp      | 116 ++++-
 src/hotspot/share/jfr/jni/jfrUpcalls.hpp      |  14 +-
 src/hotspot/share/jfr/metadata/metadata.xml   |  10 +
 .../share/jfr/periodic/jfrPeriodic.cpp        |   4 +
 .../recorder/checkpoint/types/jfrTypeSet.cpp  |  60 ++-
 .../checkpoint/types/traceid/jfrTraceId.hpp   |  16 +-
 .../types/traceid/jfrTraceId.inline.hpp       |  81 +++-
 .../types/traceid/jfrTraceIdEpoch.cpp         |  21 +
 .../types/traceid/jfrTraceIdEpoch.hpp         |  14 +-
 .../types/traceid/jfrTraceIdLoadBarrier.hpp   |   8 +-
 .../traceid/jfrTraceIdLoadBarrier.inline.hpp  |   7 +-
 .../types/traceid/jfrTraceIdMacros.hpp        |  35 +-
 .../support/jfrAnnotationElementIterator.cpp  | 109 +++++
 .../support/jfrAnnotationElementIterator.hpp  |  55 +++
 .../jfr/support/jfrAnnotationIterator.cpp     | 138 ++++++
 .../jfr/support/jfrAnnotationIterator.hpp     |  56 +++
 .../share/jfr/support/jfrKlassExtension.hpp   |   9 +-
 .../methodtracer/jfrClassFilterClosure.cpp    | 111 +++++
 .../methodtracer/jfrClassFilterClosure.hpp    |  79 ++++
 .../jfr/support/methodtracer/jfrFilter.cpp    | 270 ++++++++++++
 .../jfr/support/methodtracer/jfrFilter.hpp    |  79 ++++
 .../support/methodtracer/jfrFilterManager.cpp | 144 ++++++
 .../support/methodtracer/jfrFilterManager.hpp |  56 +++
 .../methodtracer/jfrInstrumentedClass.hpp     |  72 +++
 .../methodtracer/jfrMethodProcessor.cpp       | 141 ++++++
 .../methodtracer/jfrMethodProcessor.hpp       |  75 ++++
 .../support/methodtracer/jfrMethodTracer.cpp  | 411 ++++++++++++++++++
 .../support/methodtracer/jfrMethodTracer.hpp  |  74 ++++
 .../support/methodtracer/jfrTraceTagging.cpp  | 160 +++++++
 .../support/methodtracer/jfrTraceTagging.hpp  |  56 +++
 .../support/methodtracer/jfrTracedMethod.cpp  |  50 +++
 .../support/methodtracer/jfrTracedMethod.hpp  |  81 ++++
 .../share/jfr/utilities/jfrLogTagSets.hpp     |   3 +-
 .../share/jfr/utilities/jfrRelation.hpp       |   4 +
 src/hotspot/share/logging/logTag.hpp          |   3 +-
 src/hotspot/share/oops/instanceKlass.cpp      |  15 +-
 src/hotspot/share/oops/instanceKlass.hpp      |   8 +-
 .../share/prims/jvmtiRedefineClasses.cpp      |   2 +
 .../jdk/jfr/events/MethodTimingEvent.java     |  62 +++
 .../jdk/jfr/events/MethodTraceEvent.java      |  54 +++
 .../jdk/jfr/internal/EventControl.java        |  19 +
 .../classes/jdk/jfr/internal/JDKEvents.java   |  15 +
 .../share/classes/jdk/jfr/internal/JVM.java   |  66 ++-
 .../classes/jdk/jfr/internal/JVMUpcalls.java  |  34 +-
 .../classes/jdk/jfr/internal/LogTag.java      |   7 +-
 .../jdk/jfr/internal/MetadataRepository.java  |   1 -
 .../jdk/jfr/internal/PlatformEventType.java   |  48 +-
 .../jdk/jfr/internal/PlatformRecorder.java    |  12 +-
 .../jdk/jfr/internal/PlatformRecording.java   |   2 +-
 .../jdk/jfr/internal/SecuritySupport.java     |   5 +
 .../jdk/jfr/internal/ShutdownHook.java        |   2 +-
 .../classes/jdk/jfr/internal/query/Field.java |   4 +-
 .../jfr/internal/query/FieldFormatter.java    |   4 +-
 .../jdk/jfr/internal/query/QueryParser.java   |  20 +-
 .../classes/jdk/jfr/internal/query/view.ini   |  15 +-
 .../jfr/internal/settings/FilterSetting.java  | 100 +++++
 .../jfr/internal/settings/MethodSetting.java  |  63 +++
 .../jdk/jfr/internal/tracing/ExcludeList.java |  74 ++++
 .../jdk/jfr/internal/tracing/Filter.java      |  92 ++++
 .../jfr/internal/tracing/Instrumentation.java | 128 ++++++
 .../jdk/jfr/internal/tracing/Method.java      |  53 +++
 .../jfr/internal/tracing/Modification.java    |  42 ++
 .../jfr/internal/tracing/PlatformTracer.java  | 302 +++++++++++++
 .../jdk/jfr/internal/tracing/TimedClass.java  |  69 +++
 .../jdk/jfr/internal/tracing/TimedMethod.java |  40 ++
 .../jdk/jfr/internal/tracing/Transform.java   | 102 +++++
 .../jdk/jfr/internal/util/Bytecode.java       |   8 +
 .../jdk/jfr/internal/util/ValueFormatter.java |  25 +-
 .../share/classes/jdk/jfr/package-info.java   |  25 ++
 .../classes/jdk/jfr/tracing/MethodTracer.java | 103 +++++
 src/jdk.jfr/share/conf/jfr/default.jfc        |  17 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  17 +
 .../jfr/api/settings/TestSettingControl.java  |   5 +-
 test/jdk/jdk/jfr/event/tracing/Apple.java     |  35 ++
 test/jdk/jdk/jfr/event/tracing/Banana.java    |  35 ++
 test/jdk/jdk/jfr/event/tracing/Car.java       |  30 ++
 .../jfr/event/tracing/StaticInitializer.java  |  30 ++
 .../jdk/jdk/jfr/event/tracing/TestClinit.java |  78 ++++
 .../event/tracing/TestCombinedFilters.java    | 111 +++++
 .../jfr/event/tracing/TestFilterClass.java    | 113 +++++
 .../tracing/TestFilterClassAnnotation.java    | 125 ++++++
 .../jfr/event/tracing/TestFilterMethod.java   | 151 +++++++
 .../tracing/TestFilterMethodAnnotation.java   | 129 ++++++
 .../event/tracing/TestInstrumentation.java    | 190 ++++++++
 .../jfr/event/tracing/TestMethodTiming.java   | 143 ++++++
 .../jfr/event/tracing/TestMethodTrace.java    | 113 +++++
 .../event/tracing/TestMultipleRecordings.java | 221 ++++++++++
 .../event/tracing/TestMultipleThreads.java    | 137 ++++++
 .../event/tracing/TestRestrictedClasses.java  |  79 ++++
 .../event/tracing/TestRetransformFalse.java   |  78 ++++
 .../event/tracing/TestWithClassLoaders.java   | 134 ++++++
 .../jfr/event/tracing/TestWithModules.java    | 244 +++++++++++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   2 +
 test/lib/jdk/test/lib/jfr/Events.java         |  16 +
 107 files changed, 6712 insertions(+), 454 deletions(-)
 create mode 100644 src/hotspot/share/jfr/instrumentation/jfrClassTransformer.cpp
 create mode 100644 src/hotspot/share/jfr/instrumentation/jfrClassTransformer.hpp
 create mode 100644 src/hotspot/share/jfr/support/jfrAnnotationElementIterator.cpp
 create mode 100644 src/hotspot/share/jfr/support/jfrAnnotationElementIterator.hpp
 create mode 100644 src/hotspot/share/jfr/support/jfrAnnotationIterator.cpp
 create mode 100644 src/hotspot/share/jfr/support/jfrAnnotationIterator.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrFilter.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrFilter.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrInstrumentedClass.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.hpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.cpp
 create mode 100644 src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.hpp
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/FilterSetting.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/ExcludeList.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Filter.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Instrumentation.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Method.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Modification.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Transform.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/tracing/MethodTracer.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/Apple.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/Banana.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/Car.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/StaticInitializer.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestClinit.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestCombinedFilters.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestFilterClass.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestFilterClassAnnotation.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestFilterMethod.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestFilterMethodAnnotation.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestInstrumentation.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestMethodTiming.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestMethodTrace.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestMultipleRecordings.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestRestrictedClasses.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestRetransformFalse.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestWithClassLoaders.java
 create mode 100644 test/jdk/jdk/jfr/event/tracing/TestWithModules.java

diff --git a/src/hotspot/share/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp
index 33a5ec77ccb..d6d81263449 100644
--- a/src/hotspot/share/classfile/modules.hpp
+++ b/src/hotspot/share/classfile/modules.hpp
@@ -29,6 +29,7 @@
 #include "runtime/handles.hpp"
 
 class ModuleEntryTable;
+class SerializeClosure;
 class Symbol;
 
 class Modules : AllStatic {
diff --git a/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.cpp
new file mode 100644
index 00000000000..27480999720
--- /dev/null
+++ b/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.cpp
@@ -0,0 +1,187 @@
+/*
+ * 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 "classfile/classFileParser.hpp"
+#include "classfile/classFileStream.hpp"
+#include "classfile/classLoadInfo.hpp"
+#include "classfile/javaClasses.inline.hpp"
+#include "classfile/symbolTable.hpp"
+#include "jfr/instrumentation/jfrClassTransformer.hpp"
+#include "jfr/recorder/service/jfrOptionSet.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "logging/log.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/klass.inline.hpp"
+#include "prims/jvmtiRedefineClasses.hpp"
+#include "prims/jvmtiThreadState.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/javaThread.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+
+static void log_pending_exception(oop throwable) {
+  assert(throwable != nullptr, "invariant");
+  oop msg = java_lang_Throwable::message(throwable);
+  if (msg != nullptr) {
+    char* text = java_lang_String::as_utf8_string(msg);
+    if (text != nullptr) {
+      log_error(jfr, system) ("%s", text);
+    }
+  }
+}
+
+// On initial class load.
+void JfrClassTransformer::cache_class_file_data(InstanceKlass* new_ik, const ClassFileStream* new_stream, const JavaThread* thread) {
+  assert(new_ik != nullptr, "invariant");
+  assert(new_stream != nullptr, "invariant");
+  assert(thread != nullptr, "invariant");
+  assert(!thread->has_pending_exception(), "invariant");
+  if (!JfrOptionSet::allow_retransforms()) {
+    return;
+  }
+  const jint stream_len = new_stream->length();
+  JvmtiCachedClassFileData* p =
+    (JvmtiCachedClassFileData*)NEW_C_HEAP_ARRAY_RETURN_NULL(u1, offset_of(JvmtiCachedClassFileData, data) + stream_len, mtInternal);
+  if (p == nullptr) {
+    log_error(jfr, system)("Allocation using C_HEAP_ARRAY for %zu bytes failed in JfrEventClassTransformer::cache_class_file_data",
+      static_cast<size_t>(offset_of(JvmtiCachedClassFileData, data) + stream_len));
+    return;
+  }
+  p->length = stream_len;
+  memcpy(p->data, new_stream->buffer(), stream_len);
+  new_ik->set_cached_class_file(p);
+}
+
+InstanceKlass* JfrClassTransformer::create_instance_klass(InstanceKlass*& ik, ClassFileStream* stream, bool is_initial_load, JavaThread* thread) {
+  if (stream == nullptr) {
+    if (is_initial_load) {
+      log_error(jfr, system)("JfrClassTransformer: unable to create ClassFileStream for %s", ik->external_name());
+    }
+    return nullptr;
+  }
+  InstanceKlass* const new_ik = create_new_instance_klass(ik, stream, thread);
+  if (new_ik == nullptr) {
+    if (is_initial_load) {
+      log_error(jfr, system)("JfrClassTransformer: unable to create InstanceKlass for %s", ik->external_name());
+    }
+  }
+  return new_ik;
+}
+
+void JfrClassTransformer::copy_traceid(const InstanceKlass* ik, const InstanceKlass* new_ik) {
+  assert(ik != nullptr, "invariant");
+  assert(new_ik != nullptr, "invariant");
+  new_ik->set_trace_id(ik->trace_id());
+  assert(TRACE_ID(ik) == TRACE_ID(new_ik), "invariant");
+}
+
+InstanceKlass* JfrClassTransformer::create_new_instance_klass(InstanceKlass* ik, ClassFileStream* stream, TRAPS) {
+  assert(stream != nullptr, "invariant");
+  ResourceMark rm(THREAD);
+  ClassLoaderData* const cld = ik->class_loader_data();
+  Handle pd(THREAD, ik->protection_domain());
+  Symbol* const class_name = ik->name();
+  ClassLoadInfo cl_info(pd);
+  ClassFileParser new_parser(stream,
+                             class_name,
+                             cld,
+                             &cl_info,
+                             ClassFileParser::INTERNAL, // internal visibility
+                             THREAD);
+  if (HAS_PENDING_EXCEPTION) {
+    log_pending_exception(PENDING_EXCEPTION);
+    CLEAR_PENDING_EXCEPTION;
+    return nullptr;
+  }
+  const ClassInstanceInfo* cl_inst_info = cl_info.class_hidden_info_ptr();
+  InstanceKlass* const new_ik = new_parser.create_instance_klass(false, *cl_inst_info, THREAD);
+  if (HAS_PENDING_EXCEPTION) {
+    log_pending_exception(PENDING_EXCEPTION);
+    CLEAR_PENDING_EXCEPTION;
+    return nullptr;
+  }
+  assert(new_ik != nullptr, "invariant");
+  assert(new_ik->name() != nullptr, "invariant");
+  assert(ik->name() == new_ik->name(), "invariant");
+  return new_ik;
+}
+
+// Redefining / retransforming?
+const Klass* JfrClassTransformer::find_existing_klass(const InstanceKlass* ik, JavaThread* thread) {
+  assert(ik != nullptr, "invariant");
+  assert(thread != nullptr, "invariant");
+  JvmtiThreadState* const state = thread->jvmti_thread_state();
+  return state != nullptr ? klass_being_redefined(ik, state) : nullptr;
+}
+
+const Klass* JfrClassTransformer::klass_being_redefined(const InstanceKlass* ik, JvmtiThreadState* state) {
+  assert(ik != nullptr, "invariant");
+  assert(state != nullptr, "invariant");
+  const GrowableArray<Klass*>* const redef_klasses = state->get_classes_being_redefined();
+  if (redef_klasses == nullptr || redef_klasses->is_empty()) {
+    return nullptr;
+  }
+  for (int i = 0; i < redef_klasses->length(); ++i) {
+    const Klass* const existing_klass = redef_klasses->at(i);
+    assert(existing_klass != nullptr, "invariant");
+    if (ik->name() == existing_klass->name() && ik->class_loader_data() == existing_klass->class_loader_data()) {
+      // 'ik' is a scratch klass. Return the klass being redefined.
+      return existing_klass;
+    }
+  }
+  return nullptr;
+}
+
+// On redefine / retransform, in case an agent modified the class, the original bytes are cached onto the scratch klass.
+void JfrClassTransformer::transfer_cached_class_file_data(InstanceKlass* ik, InstanceKlass* new_ik, const ClassFileParser& parser, JavaThread* thread) {
+  assert(ik != nullptr, "invariant");
+  assert(new_ik != nullptr, "invariant");
+  JvmtiCachedClassFileData* const p = ik->get_cached_class_file();
+  if (p != nullptr) {
+    new_ik->set_cached_class_file(p);
+    ik->set_cached_class_file(nullptr);
+    return;
+  }
+  // No cached classfile indicates that no agent modified the klass.
+  // This means that the parser is holding the original bytes. Hence, we cache it onto the scratch klass.
+  const ClassFileStream* const stream = parser.clone_stream();
+  cache_class_file_data(new_ik, stream, thread);
+}
+
+void JfrClassTransformer::rewrite_klass_pointer(InstanceKlass*& ik, InstanceKlass* new_ik, ClassFileParser& parser, const JavaThread* thread) {
+  assert(ik != nullptr, "invariant");
+  assert(new_ik != nullptr, "invariant");
+  assert(thread != nullptr, "invariant");
+  assert(TRACE_ID(ik) == TRACE_ID(new_ik), "invariant");
+  assert(!thread->has_pending_exception(), "invariant");
+  // Assign original InstanceKlass* back onto "its" parser object for proper destruction.
+  parser.set_klass_to_deallocate(ik);
+  // Finally rewrite the original pointer to the newly created InstanceKlass.
+  ik = new_ik;
+}
+
diff --git a/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.hpp b/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.hpp
new file mode 100644
index 00000000000..3a2629bbc97
--- /dev/null
+++ b/src/hotspot/share/jfr/instrumentation/jfrClassTransformer.hpp
@@ -0,0 +1,52 @@
+/*
+ * 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_JFR_INSTRUMENTATION_JFRCLASSTRANSFORMER_HPP
+#define SHARE_JFR_INSTRUMENTATION_JFRCLASSTRANSFORMER_HPP
+
+#include "memory/allStatic.hpp"
+#include "utilities/exceptions.hpp"
+
+class ClassFileParser;
+class ClassFileStream;
+class InstanceKlass;
+
+/*
+ * Contains common functionality used by method and event instrumentation.
+ */
+class JfrClassTransformer : AllStatic {
+ private:
+  static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStream* stream, TRAPS);
+  static const Klass* klass_being_redefined(const InstanceKlass* ik, JvmtiThreadState* state);
+
+ public:
+  static const Klass* find_existing_klass(const InstanceKlass* ik, JavaThread* thread);
+  static InstanceKlass* create_instance_klass(InstanceKlass*& ik, ClassFileStream* stream, bool is_initial_load, JavaThread* thread);
+  static void copy_traceid(const InstanceKlass* ik, const InstanceKlass* new_ik);
+  static void transfer_cached_class_file_data(InstanceKlass* ik, InstanceKlass* new_ik, const ClassFileParser& parser, JavaThread* thread);
+  static void rewrite_klass_pointer(InstanceKlass*& ik, InstanceKlass* new_ik, ClassFileParser& parser, const JavaThread* thread);
+  static void cache_class_file_data(InstanceKlass* new_ik, const ClassFileStream* new_stream, const JavaThread* thread);
+};
+
+#endif // SHARE_JFR_INSTRUMENTATION_JFRCLASSTRANSFORMER_HPP
diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
index 52d7280716a..5e7f65aeec1 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
@@ -24,41 +24,35 @@
 
 #include "classfile/classFileParser.hpp"
 #include "classfile/classFileStream.hpp"
-#include "classfile/classLoadInfo.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/modules.hpp"
 #include "classfile/stackMapTable.hpp"
 #include "classfile/symbolTable.hpp"
-#include "classfile/verificationType.hpp"
 #include "interpreter/bytecodes.hpp"
-#include "jvm.h"
+#include "jfr/instrumentation/jfrClassTransformer.hpp"
 #include "jfr/instrumentation/jfrEventClassTransformer.hpp"
 #include "jfr/jfr.hpp"
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/jni/jfrUpcalls.hpp"
-#include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/jfrAnnotationElementIterator.hpp"
+#include "jfr/support/jfrAnnotationIterator.hpp"
 #include "jfr/support/jfrJdkJfrEvent.hpp"
-#include "jfr/utilities/jfrBigEndian.hpp"
 #include "jfr/writers/jfrBigEndianWriter.hpp"
+#include "jvm.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/array.hpp"
-#include "oops/constMethod.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/method.hpp"
-#include "prims/jvmtiRedefineClasses.hpp"
-#include "prims/jvmtiThreadState.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.hpp"
-#include "runtime/os.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 
 static const u2 number_of_new_methods = 5;
@@ -166,208 +160,14 @@ static u1 boolean_method_code_attribute[] = {
   0x0, // attributes_count
 };
 
-/*
-  Annotation layout.
-
-  enum {  // initial annotation layout
-    atype_off = 0,      // utf8 such as 'Ljava/lang/annotation/Retention;'
-    count_off = 2,      // u2   such as 1 (one value)
-    member_off = 4,     // utf8 such as 'value'
-    tag_off = 6,        // u1   such as 'c' (type) or 'e' (enum)
-    e_tag_val = 'e',
-    e_type_off = 7,   // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
-    e_con_off = 9,    // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
-    e_size = 11,     // end of 'e' annotation
-    c_tag_val = 'c',    // payload is type
-    c_con_off = 7,    // utf8 payload, such as 'I'
-    c_size = 9,       // end of 'c' annotation
-    s_tag_val = 's',    // payload is String
-    s_con_off = 7,    // utf8 payload, such as 'Ljava/lang/String;'
-    s_size = 9,
-    min_size = 6        // smallest possible size (zero members)
-  };
-*/
-
-static int skip_annotation_value(const address, int, int); // fwd decl
-
-// Skip an annotation.  Return >=limit if there is any problem.
-static int next_annotation_index(const address buffer, int limit, int index) {
-  assert(buffer != nullptr, "invariant");
-  index += 2;  // skip atype
-  if ((index += 2) >= limit) {
-    return limit;
-  }
-  int nof_members = JfrBigEndian::read<int, u2>(buffer + index - 2);
-  while (--nof_members >= 0 && index < limit) {
-    index += 2; // skip member
-    index = skip_annotation_value(buffer, limit, index);
-  }
-  return index;
+static JfrAnnotationElementIterator elements_iterator(const InstanceKlass* ik, const JfrAnnotationIterator& it) {
+  const address buffer = it.buffer();
+  int current = it.current();
+  int next = it.next();
+  assert(current < next, "invariant");
+  return JfrAnnotationElementIterator(ik, buffer + current, next - current);
 }
 
-// Skip an annotation value.  Return >=limit if there is any problem.
-static int skip_annotation_value(const address buffer, int limit, int index) {
-  assert(buffer != nullptr, "invariant");
-  // value := switch (tag:u1) {
-  //   case B, C, I, S, Z, D, F, J, c: con:u2;
-  //   case e: e_class:u2 e_name:u2;
-  //   case s: s_con:u2;
-  //   case [: do(nval:u2) {value};
-  //   case @: annotation;
-  //   case s: s_con:u2;
-  // }
-  if ((index += 1) >= limit) {
-    return limit;
-  }
-  const u1 tag = buffer[index - 1];
-  switch (tag) {
-    case 'B':
-    case 'C':
-    case 'I':
-    case 'S':
-    case 'Z':
-    case 'D':
-    case 'F':
-    case 'J':
-    case 'c':
-    case 's':
-      index += 2;  // skip con or s_con
-      break;
-    case 'e':
-      index += 4;  // skip e_class, e_name
-      break;
-    case '[':
-      {
-        if ((index += 2) >= limit) {
-          return limit;
-        }
-        int nof_values = JfrBigEndian::read<int, u2>(buffer + index - 2);
-        while (--nof_values >= 0 && index < limit) {
-          index = skip_annotation_value(buffer, limit, index);
-        }
-      }
-      break;
-    case '@':
-      index = next_annotation_index(buffer, limit, index);
-      break;
-    default:
-      return limit;  //  bad tag byte
-  }
-  return index;
-}
-
-static constexpr const int number_of_elements_offset = 2;
-static constexpr const int element_name_offset = number_of_elements_offset + 2;
-static constexpr const int element_name_size = 2;
-static constexpr const int value_type_relative_offset = 2;
-static constexpr const int value_relative_offset = value_type_relative_offset + 1;
-
-// see JVMS - 4.7.16. The RuntimeVisibleAnnotations Attribute
-
-class AnnotationElementIterator : public StackObj {
- private:
-  const InstanceKlass* _ik;
-  const address _buffer;
-  const int _limit; // length of annotation
-  mutable int _current; // element
-  mutable int _next; // element
-
-  int value_index() const {
-    return JfrBigEndian::read<int, u2>(_buffer + _current + value_relative_offset);
-  }
-
- public:
-  AnnotationElementIterator(const InstanceKlass* ik, address buffer, int limit) : _ik(ik),
-                                                                                  _buffer(buffer),
-                                                                                  _limit(limit),
-                                                                                  _current(element_name_offset),
-                                                                                  _next(element_name_offset) {
-    assert(_buffer != nullptr, "invariant");
-    assert(_next == element_name_offset, "invariant");
-    assert(_current == element_name_offset, "invariant");
-  }
-
-  bool has_next() const {
-    return _next < _limit;
-  }
-
-  void move_to_next() const {
-    assert(has_next(), "invariant");
-    _current = _next;
-    if (_next < _limit) {
-      _next = skip_annotation_value(_buffer, _limit, _next + element_name_size);
-    }
-    assert(_next <= _limit, "invariant");
-    assert(_current <= _limit, "invariant");
-  }
-
-  int number_of_elements() const {
-    return JfrBigEndian::read<int, u2>(_buffer + number_of_elements_offset);
-  }
-
-  const Symbol* name() const {
-    assert(_current < _next, "invariant");
-    return _ik->constants()->symbol_at(JfrBigEndian::read<int, u2>(_buffer + _current));
-  }
-
-  char value_type() const {
-    return JfrBigEndian::read<char, u1>(_buffer + _current + value_type_relative_offset);
-  }
-
-  jint read_int() const {
-    return _ik->constants()->int_at(value_index());
-  }
-
-  bool read_bool() const {
-    return read_int() != 0;
-  }
-};
-
-class AnnotationIterator : public StackObj {
- private:
-  const InstanceKlass* _ik;
-  // ensure _limit field is declared before _buffer
-  int _limit; // length of annotations array
-  const address _buffer;
-  mutable int _current; // annotation
-  mutable int _next; // annotation
-
- public:
-  AnnotationIterator(const InstanceKlass* ik, AnnotationArray* ar) : _ik(ik),
-                                                                     _limit(ar != nullptr ? ar->length() : 0),
-                                                                     _buffer(_limit > 2 ? ar->adr_at(2) : nullptr),
-                                                                     _current(0),
-                                                                     _next(0) {
-    if (_limit >= 2) {
-      _limit -= 2; // subtract sizeof(u2) number of annotations field
-    }
-  }
-  bool has_next() const {
-    return _next < _limit;
-  }
-
-  void move_to_next() const {
-    assert(has_next(), "invariant");
-    _current = _next;
-    if (_next < _limit) {
-      _next = next_annotation_index(_buffer, _limit, _next);
-    }
-    assert(_next <= _limit, "invariant");
-    assert(_current <= _limit, "invariant");
-  }
-
-  const AnnotationElementIterator elements() const {
-    assert(_current < _next, "invariant");
-    return AnnotationElementIterator(_ik, _buffer + _current, _next - _current);
-  }
-
-  const Symbol* type() const {
-    assert(_buffer != nullptr, "invariant");
-    assert(_current < _limit, "invariant");
-    return _ik->constants()->symbol_at(JfrBigEndian::read<int, u2>(_buffer + _current));
-  }
-};
-
 static const char value_name[] = "value";
 static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_type, bool default_value, bool& value) {
   assert(annotation_type != nullptr, "invariant");
@@ -375,8 +175,7 @@ static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_typ
   if (class_annotations == nullptr) {
     return false;
   }
-
-  const AnnotationIterator annotation_iterator(ik, class_annotations);
+  const JfrAnnotationIterator annotation_iterator(ik, class_annotations);
   while (annotation_iterator.has_next()) {
     annotation_iterator.move_to_next();
     if (annotation_iterator.type() == annotation_type) {
@@ -384,7 +183,7 @@ static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_typ
       static const Symbol* value_symbol =
         SymbolTable::probe(value_name, sizeof value_name - 1);
       assert(value_symbol != nullptr, "invariant");
-      const AnnotationElementIterator element_iterator = annotation_iterator.elements();
+      JfrAnnotationElementIterator element_iterator = elements_iterator(ik, annotation_iterator);
       if (!element_iterator.has_next()) {
         // Default values are not stored in the annotation element, so if the
         // element-value pair is empty, return the default value.
@@ -1555,57 +1354,6 @@ static ClassFileStream* retransform_bytes(const Klass* existing_klass, const Cla
   return new ClassFileStream(new_bytes, size_of_new_bytes, nullptr);
 }
 
-// On initial class load.
-static void cache_class_file_data(InstanceKlass* new_ik, const ClassFileStream* new_stream, const JavaThread* thread) {
-  assert(new_ik != nullptr, "invariant");
-  assert(new_stream != nullptr, "invariant");
-  assert(thread != nullptr, "invariant");
-  assert(!thread->has_pending_exception(), "invariant");
-  if (!JfrOptionSet::allow_retransforms()) {
-    return;
-  }
-  const jint stream_len = new_stream->length();
-  JvmtiCachedClassFileData* p =
-    (JvmtiCachedClassFileData*)NEW_C_HEAP_ARRAY_RETURN_NULL(u1, offset_of(JvmtiCachedClassFileData, data) + stream_len, mtInternal);
-  if (p == nullptr) {
-    log_error(jfr, system)("Allocation using C_HEAP_ARRAY for %zu bytes failed in JfrEventClassTransformer::cache_class_file_data",
-      static_cast<size_t>(offset_of(JvmtiCachedClassFileData, data) + stream_len));
-    return;
-  }
-  p->length = stream_len;
-  memcpy(p->data, new_stream->buffer(), stream_len);
-  new_ik->set_cached_class_file(p);
-}
-
-// On redefine / retransform, in case an agent modified the class, the original bytes are cached onto the scratch klass.
-static void transfer_cached_class_file_data(InstanceKlass* ik, InstanceKlass* new_ik, const ClassFileParser& parser, JavaThread* thread) {
-  assert(ik != nullptr, "invariant");
-  assert(new_ik != nullptr, "invariant");
-  JvmtiCachedClassFileData* const p = ik->get_cached_class_file();
-  if (p != nullptr) {
-    new_ik->set_cached_class_file(p);
-    ik->set_cached_class_file(nullptr);
-    return;
-  }
-  // No cached classfile indicates that no agent modified the klass.
-  // This means that the parser is holding the original bytes. Hence, we cache it onto the scratch klass.
-  const ClassFileStream* const stream = parser.clone_stream();
-  cache_class_file_data(new_ik, stream, thread);
-}
-
-static void rewrite_klass_pointer(InstanceKlass*& ik, InstanceKlass* new_ik, ClassFileParser& parser, const JavaThread* thread) {
-  assert(ik != nullptr, "invariant");
-  assert(new_ik != nullptr, "invariant");
-  assert(thread != nullptr, "invariant");
-  assert(IS_EVENT_OR_HOST_KLASS(new_ik), "invariant");
-  assert(TRACE_ID(ik) == TRACE_ID(new_ik), "invariant");
-  assert(!thread->has_pending_exception(), "invariant");
-  // Assign original InstanceKlass* back onto "its" parser object for proper destruction.
-  parser.set_klass_to_deallocate(ik);
-  // Finally rewrite the original pointer to the newly created InstanceKlass.
-  ik = new_ik;
-}
-
 // If code size is 1, it is 0xb1, i.e. the return instruction.
 static inline bool is_commit_method_instrumented(const Method* m) {
   assert(m != nullptr, "invariant");
@@ -1658,92 +1406,11 @@ static void bless_commit_method(const InstanceKlass* new_ik) {
   bless_instance_commit_method(methods);
 }
 
-static void copy_traceid(const InstanceKlass* ik, const InstanceKlass* new_ik) {
-  assert(ik != nullptr, "invariant");
-  assert(new_ik != nullptr, "invariant");
-  new_ik->set_trace_id(ik->trace_id());
-  assert(TRACE_ID(ik) == TRACE_ID(new_ik), "invariant");
-}
-
-static const Klass* klass_being_redefined(const InstanceKlass* ik, JvmtiThreadState* state) {
-  assert(ik != nullptr, "invariant");
-  assert(state != nullptr, "invariant");
-  const GrowableArray<Klass*>* const redef_klasses = state->get_classes_being_redefined();
-  if (redef_klasses == nullptr || redef_klasses->is_empty()) {
-    return nullptr;
-  }
-  for (int i = 0; i < redef_klasses->length(); ++i) {
-    const Klass* const existing_klass = redef_klasses->at(i);
-    assert(existing_klass != nullptr, "invariant");
-    if (ik->name() == existing_klass->name() && ik->class_loader_data() == existing_klass->class_loader_data()) {
-      // 'ik' is a scratch klass. Return the klass being redefined.
-      return existing_klass;
-    }
-  }
-  return nullptr;
-}
-
-// Redefining / retransforming?
-static const Klass* find_existing_klass(const InstanceKlass* ik, JavaThread* thread) {
-  assert(ik != nullptr, "invariant");
-  assert(thread != nullptr, "invariant");
-  JvmtiThreadState* const state = thread->jvmti_thread_state();
-  return state != nullptr ? klass_being_redefined(ik, state) : nullptr;
-}
-
-static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStream* stream, TRAPS) {
-  assert(stream != nullptr, "invariant");
-  ResourceMark rm(THREAD);
-  ClassLoaderData* const cld = ik->class_loader_data();
-  Handle pd(THREAD, ik->protection_domain());
-  Symbol* const class_name = ik->name();
-  const char* const klass_name = class_name != nullptr ? class_name->as_C_string() : "";
-  ClassLoadInfo cl_info(pd);
-  ClassFileParser new_parser(stream,
-                             class_name,
-                             cld,
-                             &cl_info,
-                             ClassFileParser::INTERNAL, // internal visibility
-                             THREAD);
-  if (HAS_PENDING_EXCEPTION) {
-    log_pending_exception(PENDING_EXCEPTION);
-    CLEAR_PENDING_EXCEPTION;
-    return nullptr;
-  }
-  const ClassInstanceInfo* cl_inst_info = cl_info.class_hidden_info_ptr();
-  InstanceKlass* const new_ik = new_parser.create_instance_klass(false, *cl_inst_info, THREAD);
-  if (HAS_PENDING_EXCEPTION) {
-    log_pending_exception(PENDING_EXCEPTION);
-    CLEAR_PENDING_EXCEPTION;
-    return nullptr;
-  }
-  assert(new_ik != nullptr, "invariant");
-  assert(new_ik->name() != nullptr, "invariant");
-  assert(strncmp(ik->name()->as_C_string(), new_ik->name()->as_C_string(), strlen(ik->name()->as_C_string())) == 0, "invariant");
-  return new_ik;
-}
-
-static InstanceKlass* create_instance_klass(InstanceKlass*& ik, ClassFileStream* stream, bool is_initial_load, JavaThread* thread) {
-  if (stream == nullptr) {
-    if (is_initial_load) {
-      log_error(jfr, system)("JfrEventClassTransformer: unable to create ClassFileStream for %s", ik->external_name());
-    }
-    return nullptr;
-  }
-  InstanceKlass* const new_ik = create_new_instance_klass(ik, stream, thread);
-  if (new_ik == nullptr) {
-    if (is_initial_load) {
-      log_error(jfr, system)("JfrEventClassTransformer: unable to create InstanceKlass for %s", ik->external_name());
-    }
-  }
-  return new_ik;
-}
-
 static void transform(InstanceKlass*& ik, ClassFileParser& parser, JavaThread* thread) {
   assert(IS_EVENT_OR_HOST_KLASS(ik), "invariant");
   bool is_instrumented = false;
   ClassFileStream* stream = nullptr;
-  const Klass* const existing_klass = find_existing_klass(ik, thread);
+  const Klass* const existing_klass = JfrClassTransformer::find_existing_klass(ik, thread);
   if (existing_klass != nullptr) {
     // There is already a klass defined, implying we are redefining / retransforming.
     stream = retransform_bytes(existing_klass, parser, is_instrumented, thread);
@@ -1751,20 +1418,20 @@ static void transform(InstanceKlass*& ik, ClassFileParser& parser, JavaThread* t
     // No existing klass, implying this is the initial load.
     stream = JdkJfrEvent::is(ik) ? schema_extend_event_klass_bytes(ik, parser, thread) : schema_extend_event_subklass_bytes(ik, parser, is_instrumented, thread);
   }
-  InstanceKlass* const new_ik = create_instance_klass(ik, stream, existing_klass == nullptr, thread);
+  InstanceKlass* const new_ik = JfrClassTransformer::create_instance_klass(ik, stream, existing_klass == nullptr, thread);
   if (new_ik == nullptr) {
     return;
   }
   if (existing_klass != nullptr) {
-    transfer_cached_class_file_data(ik, new_ik, parser, thread);
+    JfrClassTransformer::transfer_cached_class_file_data(ik, new_ik, parser, thread);
   } else {
-    cache_class_file_data(new_ik, stream, thread);
+    JfrClassTransformer::cache_class_file_data(new_ik, stream, thread);
   }
   if (is_instrumented && JdkJfrEvent::is_subklass(new_ik)) {
     bless_commit_method(new_ik);
   }
-  copy_traceid(ik, new_ik);
-  rewrite_klass_pointer(ik, new_ik, parser, thread);
+  JfrClassTransformer::copy_traceid(ik, new_ik);
+  JfrClassTransformer::rewrite_klass_pointer(ik, new_ik, parser, thread);
 }
 
 // Target for the JFR_ON_KLASS_CREATION hook.
diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp
index 31dd55f702d..9fb6cf87b72 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.cpp
@@ -78,19 +78,6 @@ extern "C" void JNICALL jfr_on_class_file_load_hook(jvmtiEnv *jvmti_env,
                                                     const unsigned char* class_data,
                                                     jint* new_class_data_len,
                                                     unsigned char** new_class_data) {
-  if (class_being_redefined == nullptr) {
-    return;
-  }
-  JavaThread* jt = JavaThread::thread_from_jni_environment(jni_env);
-  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));;
-  ThreadInVMfromNative tvmfn(jt);
-  JfrUpcalls::on_retransform(JfrTraceId::load_raw(class_being_redefined),
-                             class_being_redefined,
-                             class_data_len,
-                             class_data,
-                             new_class_data_len,
-                             new_class_data,
-                             jt);
 }
 
 // caller needs ResourceMark
@@ -175,6 +162,10 @@ void JfrJvmtiAgent::retransform_classes(JNIEnv* env, jobjectArray classes_array,
       }
     }
   }
+  retransform_classes(env, classes, classes_count, THREAD);
+}
+
+void JfrJvmtiAgent::retransform_classes(JNIEnv* env, jclass* classes, jint classes_count, TRAPS) {
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(THREAD));
   const jvmtiError result = jfr_jvmti_env->RetransformClasses(classes_count, classes);
   if (result != JVMTI_ERROR_NONE) {
diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
index 22c1b5c6256..d82ea3a612b 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.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
@@ -36,6 +36,7 @@ class JfrJvmtiAgent : public JfrCHeapObj {
   static void destroy() NOT_JVMTI_RETURN;
  public:
   static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS) NOT_JVMTI_RETURN;
+  static void retransform_classes(JNIEnv* env, jclass* classes, jint classes_count, TRAPS) NOT_JVMTI_RETURN;
 };
 
 #endif // SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp
index 99416519e40..f43aab6bdfc 100644
--- a/src/hotspot/share/jfr/jfr.cpp
+++ b/src/hotspot/share/jfr/jfr.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "jfr/instrumentation/jfrEventClassTransformer.hpp"
 #include "jfr/jfr.hpp"
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/leakProfiler.hpp"
@@ -31,8 +32,13 @@
 #include "jfr/recorder/service/jfrOptionSet.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
 #include "jfr/recorder/repository/jfrRepository.hpp"
+#include "jfr/support/jfrKlassExtension.hpp"
 #include "jfr/support/jfrResolution.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/instanceKlass.inline.hpp"
+#include "oops/klass.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
 
@@ -72,6 +78,22 @@ void Jfr::on_unloading_classes() {
   }
 }
 
+void Jfr::on_klass_creation(InstanceKlass*& ik, ClassFileParser& parser, TRAPS) {
+  if (IS_EVENT_OR_HOST_KLASS(ik)) {
+    JfrEventClassTransformer::on_klass_creation(ik, parser, THREAD);
+    return;
+  }
+  if (JfrMethodTracer::in_use()) {
+    JfrMethodTracer::on_klass_creation(ik, parser, THREAD);
+  }
+}
+
+void Jfr::on_klass_redefinition(const InstanceKlass* ik, Thread* thread) {
+  assert(JfrMethodTracer::in_use(), "invariant");
+  JfrMethodTracer::on_klass_redefinition(ik, thread);
+}
+
+
 bool Jfr::is_excluded(Thread* t) {
   return JfrJavaSupport::is_excluded(t);
 }
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index ce6db8a164d..471389dfb8b 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -33,7 +33,9 @@
 class CallInfo;
 class ciKlass;
 class ciMethod;
+class ClassFileParser;
 class GraphBuilder;
+class InstanceKlass;
 class JavaThread;
 struct JavaVMOption;
 class Klass;
@@ -58,6 +60,8 @@ class Jfr : AllStatic {
   static bool is_excluded(Thread* thread);
   static void include_thread(Thread* thread);
   static void exclude_thread(Thread* thread);
+  static void on_klass_creation(InstanceKlass*& ik, ClassFileParser& parser, TRAPS);
+  static void on_klass_redefinition(const InstanceKlass* ik, Thread* thread);
   static void on_thread_start(Thread* thread);
   static void on_thread_exit(Thread* thread);
   static void on_resolution(const CallInfo& info, TRAPS);
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
index 25badd191a5..1dd7168e9e5 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -35,6 +35,7 @@
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
 #include "jfr/support/jfrThreadId.inline.hpp"
 #include "logging/log.hpp"
+#include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/klass.inline.hpp"
@@ -929,3 +930,14 @@ bool JfrJavaSupport::compute_field_offset(int &dest_offset,
   dest_offset = fd.offset();
   return true;
 }
+
+jlongArray JfrJavaSupport::create_long_array(GrowableArray<jlong>* array, TRAPS) {
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+  assert(array != nullptr, "invariant");
+  assert(array->is_nonempty(), "invariant");
+  const int length = array->length();
+  assert(length > 0, "invariant");
+  typeArrayOop obj = oopFactory::new_typeArray(T_LONG, length, CHECK_NULL);
+  ArrayAccess<>::arraycopy_from_native(&array->first(), obj, typeArrayOopDesc::element_offset<jlong>(0), length);
+  return static_cast<jlongArray>(JfrJavaSupport::local_jni_handle(obj, THREAD));
+}
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
index 19ff332c118..118782bc61e 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.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
@@ -30,6 +30,7 @@
 
 class Klass;
 class outputStream;
+template <typename E> class GrowableArray;
 
 class JfrJavaSupport : public AllStatic {
  public:
@@ -88,6 +89,7 @@ class JfrJavaSupport : public AllStatic {
   static const char* c_str(oop string, Thread* thread, bool c_heap = false);
   static void free_c_str(const char* str, bool c_heap);
   static Symbol** symbol_array(jobjectArray string_array, JavaThread* thread, intptr_t* result_size, bool c_heap = false);
+  static jlongArray create_long_array(GrowableArray<jlong>* array, TRAPS);
 
   // exceptions
   static void throw_illegal_state_exception(const char* message, TRAPS);
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index d932f073d4b..6f1c1936574 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -49,6 +49,7 @@
 #include "jfr/support/jfrDeprecationManager.hpp"
 #include "jfr/support/jfrJdkJfrEvent.hpp"
 #include "jfr/support/jfrKlassUnloading.hpp"
+#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
 #include "jfr/utilities/jfrJavaLog.hpp"
 #include "jfr/utilities/jfrTimeConverter.hpp"
 #include "jfr/utilities/jfrTime.hpp"
@@ -437,3 +438,11 @@ NO_TRANSITION(jboolean, jfr_is_product(JNIEnv* env, jclass jvm))
   return false;
 #endif
 NO_TRANSITION_END
+
+JVM_ENTRY_NO_ENV(jlongArray, jfr_set_method_trace_filters(JNIEnv* env, jclass jvm, jobjectArray classes, jobjectArray methods, jobjectArray annotations, jintArray modifications))
+  return JfrMethodTracer::set_filters(env, classes, methods, annotations, modifications, thread);
+JVM_END
+
+JVM_ENTRY_NO_ENV(jlongArray, jfr_drain_stale_method_tracer_ids(JNIEnv* env, jclass jvm))
+  return JfrMethodTracer::drain_stale_class_ids(thread);
+JVM_END
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 4519b99891d..9c78c6239d4 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.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
@@ -169,6 +169,10 @@ jlong JNICALL jfr_nanos_now(JNIEnv* env, jclass jvm);
 
 jboolean JNICALL jfr_is_product(JNIEnv* env, jclass jvm);
 
+jlongArray JNICALL jfr_set_method_trace_filters(JNIEnv* env, jclass jvm, jobjectArray classes, jobjectArray methods, jobjectArray annotations, jintArray modifications);
+
+jlongArray JNICALL jfr_drain_stale_method_tracer_ids(JNIEnv* env, jclass);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index 433da3e2f43..33a564dee2f 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -101,7 +101,9 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) {
       (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*)"isProduct", (char*)"()Z", (void*)jfr_is_product
+      (char*)"isProduct", (char*)"()Z", (void*)jfr_is_product,
+      (char*)"setMethodTraceFilters", (char*)"([Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;[I)[J", (void*)jfr_set_method_trace_filters,
+      (char*)"drainStaleMethodTracerIds", (char*)"()[J", (void*)jfr_drain_stale_method_tracer_ids
     };
 
     const size_t method_array_length = sizeof(method) / sizeof(JNINativeMethod);
diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
index 718e62a9ce8..2e814cef875 100644
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.cpp
@@ -22,12 +22,16 @@
  *
  */
 
+#include "classfile/classFileStream.hpp"
 #include "classfile/javaClasses.hpp"
+#include "classfile/moduleEntry.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/jni/jfrUpcalls.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
 #include "jfr/support/jfrJdkJfrEvent.hpp"
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
@@ -36,7 +40,9 @@
 #include "oops/typeArrayKlass.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/jniHandles.inline.hpp"
 #include "runtime/os.hpp"
 #include "utilities/exceptions.hpp"
 
@@ -47,6 +53,10 @@ static Symbol* bytes_for_eager_instrumentation_sym = nullptr;
 static Symbol* bytes_for_eager_instrumentation_sig_sym = nullptr;
 static Symbol* unhide_internal_types_sym = nullptr;
 static Symbol* unhide_internal_types_sig_sym = nullptr;
+static Symbol* on_method_trace_sym = nullptr;
+static Symbol* on_method_trace_sig_sym = nullptr;
+static Symbol* publish_method_timers_for_klass_sym = nullptr;
+static Symbol* publish_method_timers_for_klass_sig_sym = nullptr;
 
 static bool initialize(TRAPS) {
   static bool initialized = false;
@@ -59,7 +69,11 @@ static bool initialize(TRAPS) {
     bytes_for_eager_instrumentation_sig_sym = SymbolTable::new_permanent_symbol("(JZZLjava/lang/Class;[B)[B");
     unhide_internal_types_sym = SymbolTable::new_permanent_symbol("unhideInternalTypes");
     unhide_internal_types_sig_sym = SymbolTable::new_permanent_symbol("()V");
-    initialized = unhide_internal_types_sig_sym != nullptr;
+    on_method_trace_sym = SymbolTable::new_permanent_symbol("onMethodTrace");
+    on_method_trace_sig_sym = SymbolTable::new_permanent_symbol("(Ljava/lang/Module;Ljava/lang/ClassLoader;Ljava/lang/String;[B[J[Ljava/lang/String;[Ljava/lang/String;[I)[B");
+    publish_method_timers_for_klass_sym = SymbolTable::new_permanent_symbol("publishMethodTimersForClass");
+    publish_method_timers_for_klass_sig_sym = SymbolTable::new_permanent_symbol("(J)V");
+    initialized = publish_method_timers_for_klass_sig_sym != nullptr;
   }
   return initialized;
 }
@@ -207,3 +221,103 @@ bool JfrUpcalls::unhide_internal_types(TRAPS) {
   }
   return true;
 }
+
+// Caller needs ResourceMark
+ClassFileStream* JfrUpcalls::on_method_trace(InstanceKlass* ik, const ClassFileStream* stream, GrowableArray<JfrTracedMethod>* methods, TRAPS) {
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+  assert(stream != nullptr, "invariant");
+  assert(methods != nullptr, "invariant");
+  assert(methods->is_nonempty(), "invariant");
+  initialize(THREAD);
+  Klass* klass = SystemDictionary::resolve_or_fail(jvm_upcalls_class_sym, true, CHECK_NULL);
+  assert(klass != nullptr, "invariant");
+
+  HandleMark hm(THREAD);
+
+  ModuleEntry* module_entry = ik->module();
+  oop module = nullptr;
+  if (module_entry != nullptr) {
+    module = module_entry->module();
+  }
+  instanceHandle module_handle(THREAD, (instanceOop)module);
+
+  // ClassLoader
+  oop class_loader = ik->class_loader();
+  instanceHandle class_loader_handle(THREAD, (instanceOop)class_loader);
+
+  // String class name
+  Handle class_name_h = java_lang_String::create_from_symbol(ik->name(), CHECK_NULL);
+
+  // new byte[]
+  int size = stream->length();
+  typeArrayOop bytecode_array = oopFactory::new_byteArray(size, CHECK_NULL);
+  typeArrayHandle h_bytecode_array(THREAD, bytecode_array);
+
+  // Copy ClassFileStream bytes to byte[]
+  const jbyte* src = reinterpret_cast<const jbyte*>(stream->buffer());
+  ArrayAccess<>::arraycopy_from_native(src, bytecode_array, typeArrayOopDesc::element_offset<jbyte>(0), size);
+
+  int method_count = methods->length();
+
+  // new long[method_count]
+  typeArrayOop id_array = oopFactory::new_longArray(method_count, CHECK_NULL);
+  typeArrayHandle h_id_array(THREAD, id_array);
+
+  // new String[method_count]
+  objArrayOop name_array = oopFactory::new_objArray(vmClasses::String_klass(), method_count, CHECK_NULL);
+  objArrayHandle h_name_array(THREAD, name_array);
+
+  // new String[method_count]
+  objArrayOop signature_array = oopFactory::new_objArray(vmClasses::String_klass(), method_count, CHECK_NULL);
+  objArrayHandle h_signature_array(THREAD, signature_array);
+
+   // new int[method_count]
+  typeArrayOop modification_array = oopFactory::new_intArray(method_count, CHECK_NULL);
+  typeArrayHandle h_modification_array(THREAD, modification_array);
+
+  // Fill in arrays
+  for (int i = 0; i < method_count; i++) {
+    JfrTracedMethod method = methods->at(i);
+    h_id_array->long_at_put(i, method.id());
+    Handle name = java_lang_String::create_from_symbol(method.name(), CHECK_NULL);
+    h_name_array->obj_at_put(i, name());
+    Handle signature = java_lang_String::create_from_symbol(method.signature(), CHECK_NULL);
+    h_signature_array->obj_at_put(i, signature());
+    h_modification_array->int_at_put(i, method.modification());
+  }
+
+  // Call JVMUpcalls::onMethodTrace
+  JavaCallArguments args;
+  JavaValue result(T_ARRAY);
+  args.push_oop(module_handle);
+  args.push_oop(class_loader_handle);
+  args.push_oop(class_name_h);
+  args.push_oop(h_bytecode_array);
+  args.push_oop(h_id_array);
+  args.push_oop(h_name_array);
+  args.push_oop(h_signature_array);
+  args.push_oop(h_modification_array);
+  JavaCalls::call_static(&result, klass, on_method_trace_sym, on_method_trace_sig_sym, &args, CHECK_NULL);
+
+  oop return_object = result.get_oop();
+  if (return_object != nullptr) {
+    assert(return_object->is_typeArray(), "invariant");
+    assert(TypeArrayKlass::cast(return_object->klass())->element_type() == T_BYTE, "invariant");
+    typeArrayOop byte_array = typeArrayOop(return_object);
+    int length = byte_array->length();
+    u1* buffer = NEW_RESOURCE_ARRAY_IN_THREAD_RETURN_NULL(THREAD, u1, length);
+    ArrayAccess<>::arraycopy_to_native<>(byte_array, typeArrayOopDesc::element_offset<jbyte>(0), buffer, length);
+    return new ClassFileStream(buffer, length, stream->source(), stream->from_boot_loader_modules_image());
+  }
+  return nullptr;
+}
+
+void JfrUpcalls::publish_method_timers_for_klass(traceid klass_id, TRAPS) {
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+  Klass* const klass = SystemDictionary::resolve_or_fail(jvm_upcalls_class_sym, true, CHECK);
+  assert(klass != nullptr, "invariant");
+  JavaCallArguments args;
+  JavaValue result(T_VOID);
+  args.push_long(static_cast<jlong>(klass_id));
+  JavaCalls::call_static(&result, klass, publish_method_timers_for_klass_sym, publish_method_timers_for_klass_sig_sym, &args, CHECK);
+}
diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp
index 54196eadb9d..bb06f593deb 100644
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.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
@@ -26,10 +26,15 @@
 #define SHARE_JFR_JNI_JFRUPCALLS_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
 #include "jni.h"
 #include "utilities/exceptions.hpp"
 
+class ClassFileStream;
+class InstanceKlass;
+class JfrTracedMethod;
 class JavaThread;
+template <typename E> class GrowableArray;
 
 //
 // Upcalls to Java for instrumentation purposes.
@@ -55,6 +60,13 @@ class JfrUpcalls : AllStatic {
                              unsigned char** new_class_data,
                              TRAPS);
 
+  // Caller needs ResourceMark
+  static ClassFileStream* on_method_trace(InstanceKlass* ik, const ClassFileStream* stream,
+                                          GrowableArray<JfrTracedMethod>* methods,
+                                          TRAPS);
+
+  static void publish_method_timers_for_klass(traceid klass_id, TRAPS);
+
   static bool unhide_internal_types(TRAPS);
 };
 
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 47f78a88abd..9c04ec3dca1 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1292,6 +1292,16 @@
     <Field type="boolean" name="forRemoval" label="For Removal" />
   </Event>
 
+  <Event name="MethodTrace" category="Java Application" label="Method Trace" thread="true" stackTrace="true" startTime="true">
+    <Field type="Method" name="method" label="Method" />
+  </Event>
+
+  <Event name="MethodTiming" category="Java Application" label="Method Timing" thread="false" stackTrace="false" startTime="false" period="everyChunk">
+    <Field type="Method" name="method" label="Method" />
+    <Field type="long" name="invocations" label="Invocations" description="The number of times the method was invoked" />
+    <Field type="Tickspan" name="average" label="Average" description="An approximation of the wall-clock time it took for the method to execute" />
+  </Event>
+
   <Type name="DeoptimizationReason" label="Deoptimization Reason">
     <Field type="string" name="reason" label="Reason" />
   </Type>
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index 91a696c6aa5..00d41a10bf0 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -321,6 +321,10 @@ TRACE_REQUEST_FUNC(JavaAgent)   {}
 TRACE_REQUEST_FUNC(NativeAgent) {}
 #endif // INCLUDE_JVMTI
 
+TRACE_REQUEST_FUNC(MethodTiming) {
+  // Emitted in Java, but defined in native to have Method type field.
+}
+
 TRACE_REQUEST_FUNC(ThreadContextSwitchRate) {
   double rate = 0.0;
   int ret_val = OS_ERR;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index a1b10e8cfb8..a8248b7714e 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -35,6 +35,8 @@
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/support/jfrKlassUnloading.hpp"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
 #include "jfr/utilities/jfrHashtable.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "jfr/writers/jfrTypeWriterHost.hpp"
@@ -480,6 +482,54 @@ static void do_primitives() {
   write_primitive(_writer, nullptr); // void.class
 }
 
+static void do_method_tracer_klasses() {
+  assert(JfrTraceIdEpoch::has_method_tracer_changed_tag_state(), "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(_subsystem_callback != nullptr, "invariant");
+  GrowableArray<JfrInstrumentedClass>* const instrumented = JfrMethodTracer::instrumented_classes();
+  assert(instrumented != nullptr, "invariant");
+  assert(instrumented->length() > 0, "invariant");
+  for (int i = 0; i < instrumented->length(); ++i) {
+    JfrInstrumentedClass& jic = instrumented->at(i);
+    if (jic.unloaded()) {
+      continue;
+    }
+    if (JfrKlassUnloading::is_unloaded(jic.trace_id(), previous_epoch())) {
+      jic.set_unloaded(true);
+      continue;
+    }
+    assert(jic.trace_id() == JfrTraceId::load_raw(jic.instance_klass()), "invariant");
+    assert(JfrTraceId::has_sticky_bit(jic.instance_klass()), "invariant");
+    if (current_epoch()) {
+      JfrTraceId::load(jic.instance_klass()); // enqueue klass for this epoch
+    } else {
+      _subsystem_callback->do_artifact(jic.instance_klass()); // process directly
+    }
+  }
+  JfrTraceIdEpoch::reset_method_tracer_tag_state();
+}
+
+static void clear_method_tracer_klasses() {
+  assert_locked_or_safepoint (ClassLoaderDataGraph_lock);
+  assert(previous_epoch(), "invariant");
+  GrowableArray<JfrInstrumentedClass>* const instrumented = JfrMethodTracer::instrumented_classes();
+  assert(instrumented != nullptr, "invariant");
+  const int length = instrumented->length();
+  bool trim = false;
+  for (int i = 0; i < length; ++i) {
+    JfrInstrumentedClass& jic = instrumented->at(i);
+    if (jic.unloaded()) {
+      trim = true;
+      continue;
+    }
+    if (JfrKlassUnloading::is_unloaded(jic.trace_id(), true)) {
+      jic.set_unloaded(true);
+      trim = true;
+    }
+  }
+  JfrMethodTracer::trim_instrumented_classes(trim);
+}
+
 static void do_unloading_klass(Klass* klass) {
   assert(klass != nullptr, "invariant");
   assert(_subsystem_callback != nullptr, "invariant");
@@ -487,6 +537,9 @@ static void do_unloading_klass(Klass* klass) {
     return;
   }
   if (JfrKlassUnloading::on_unload(klass)) {
+    if (JfrTraceId::has_sticky_bit(klass)) {
+      JfrMethodTracer::add_to_unloaded_set(klass);
+    }
     _subsystem_callback->do_artifact(klass);
   }
 }
@@ -504,9 +557,13 @@ static void do_klasses() {
     return;
   }
   if (is_initial_typeset_for_chunk()) {
-    // Only write the primitive classes once per chunk.
+    // Only write the primitive and method tracer classes once per chunk.
     do_primitives();
   }
+  if (JfrTraceIdEpoch::has_method_tracer_changed_tag_state()) {
+    do_method_tracer_klasses();
+  }
+
   JfrTraceIdLoadBarrier::do_klasses(&do_klass, previous_epoch());
 }
 
@@ -1206,6 +1263,7 @@ static size_t teardown() {
   const size_t total_count = _artifacts->total_count();
   if (previous_epoch()) {
     clear_klasses_and_methods();
+    clear_method_tracer_klasses();
     JfrKlassUnloading::clear();
     _artifacts->increment_checkpoint_id();
     _initial_type_set = true;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp
index d9211e8cb8c..378d1af23cc 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.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
@@ -86,6 +86,7 @@ class JfrTraceId : public AllStatic {
 
   // through load barrier
   static traceid load(const Klass* klass);
+  static traceid load_previous_epoch(const Klass* klass);
   static traceid load(jclass jc, bool raw = false);
   static traceid load(const Method* method);
   static traceid load(const Klass* klass, const Method* method);
@@ -102,6 +103,7 @@ class JfrTraceId : public AllStatic {
   static traceid load_raw(const Klass* klass);
   static traceid load_raw(jclass jc);
   static traceid load_raw(const Method* method);
+  static traceid load_raw(const Klass* holder, const Method* method);
   static traceid load_raw(const ModuleEntry* module);
   static traceid load_raw(const PackageEntry* package);
   static traceid load_raw(const ClassLoaderData* cld);
@@ -136,6 +138,18 @@ class JfrTraceId : public AllStatic {
   static bool is_event_host(const jclass jc);
   static void tag_as_event_host(const Klass* k);
   static void tag_as_event_host(const jclass jc);
+
+  // Sticky bits and timing bits
+  static bool has_sticky_bit(const Klass* k);
+  static bool has_sticky_bit(const Method* method);
+  static void set_sticky_bit(const Klass* k);
+  static void set_sticky_bit(const Method* method);
+  static void clear_sticky_bit(const Klass* k);
+  static void clear_sticky_bit(const Method* method);
+  static bool has_timing_bit(const Klass* k);
+  static void set_timing_bit(const Klass* k);
+  static void clear_timing_bit(const Klass* k);
+
 };
 
 #endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp
index aa99a8383eb..2b2c435d986 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.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
@@ -34,6 +34,7 @@
 #include "jfr/support/jfrKlassExtension.hpp"
 #include "oops/klass.hpp"
 #include "runtime/javaThread.inline.hpp"
+#include "runtime/mutexLocker.hpp"
 #include "utilities/debug.hpp"
 
 inline traceid JfrTraceId::load(const Klass* klass) {
@@ -77,7 +78,11 @@ inline traceid JfrTraceId::load_leakp(const Klass* klass, const Method* method)
 }
 
 inline traceid JfrTraceId::load_leakp_previous_epoch(const Klass* klass, const Method* method) {
-  return JfrTraceIdLoadBarrier::load_leakp_previuos_epoch(klass, method);
+  return JfrTraceIdLoadBarrier::load_leakp_previous_epoch(klass, method);
+}
+
+inline traceid JfrTraceId::load_previous_epoch(const Klass* klass) {
+  return JfrTraceIdLoadBarrier::load_previous_epoch(klass);
 }
 
 template <typename T>
@@ -90,8 +95,15 @@ inline traceid JfrTraceId::load_raw(const Klass* klass) {
   return raw_load(klass);
 }
 
+inline traceid JfrTraceId::load_raw(const Klass* holder, const Method* method) {
+  assert(holder != nullptr, "invariant");
+  assert(method != nullptr, "invariant");
+  assert(method->method_holder() == holder, "invariant");
+  return METHOD_ID(holder, method);
+}
+
 inline traceid JfrTraceId::load_raw(const Method* method) {
-  return (METHOD_ID(method->method_holder(), method));
+  return load_raw(method->method_holder(), method);
 }
 
 inline traceid JfrTraceId::load_raw(const ModuleEntry* module) {
@@ -156,4 +168,67 @@ inline void JfrTraceId::tag_as_event_host(const Klass* k) {
   assert(IS_EVENT_HOST_KLASS(k), "invariant");
 }
 
+inline bool JfrTraceId::has_sticky_bit(const Klass* k) {
+  assert(k != nullptr, "invariant");
+  return HAS_STICKY_BIT(k);
+}
+
+inline void JfrTraceId::set_sticky_bit(const Klass* k) {
+  assert(k != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(!has_sticky_bit(k), "invariant");
+  SET_STICKY_BIT(k);
+  assert(has_sticky_bit(k), "invariant");
+}
+
+inline void JfrTraceId::clear_sticky_bit(const Klass* k) {
+  assert(k != nullptr, "invarriant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(JfrTraceId::has_sticky_bit(k), "invariant");
+  CLEAR_STICKY_BIT(k);
+  assert(!JfrTraceId::has_sticky_bit(k), "invariant");
+}
+
+inline bool JfrTraceId::has_sticky_bit(const Method* method) {
+  assert(method != nullptr, "invariant");
+  return METHOD_HAS_STICKY_BIT(method);
+}
+
+inline void JfrTraceId::set_sticky_bit(const Method* method) {
+  assert(method != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(!has_sticky_bit(method), "invariant");
+  SET_METHOD_STICKY_BIT(method);
+  assert(has_sticky_bit(method), "invariant");
+}
+
+inline void JfrTraceId::clear_sticky_bit(const Method* method) {
+  assert(method != nullptr, "invarriant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(JfrTraceId::has_sticky_bit(method), "invariant");
+  CLEAR_STICKY_BIT_METHOD(method);
+  assert(!JfrTraceId::has_sticky_bit(method), "invariant");
+}
+
+inline bool JfrTraceId::has_timing_bit(const Klass* k) {
+  assert(k != nullptr, "invariant");
+  return HAS_TIMING_BIT(k);
+}
+
+inline void JfrTraceId::set_timing_bit(const Klass* k) {
+  assert(k != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(!has_timing_bit(k), "invariant");
+  SET_TIMING_BIT(k);
+  assert(has_timing_bit(k), "invariant");
+}
+
+inline void JfrTraceId::clear_timing_bit(const Klass* k) {
+  assert(k != nullptr, "invarriant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(JfrTraceId::has_timing_bit(k), "invariant");
+  CLEAR_TIMING_BIT(k);
+  assert(!JfrTraceId::has_timing_bit(k), "invariant");
+}
+
 #endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_INLINE_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
index 743923d674c..8c2b8cdd0ec 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
@@ -24,6 +24,8 @@
 
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
 #include "jfr/support/jfrThreadId.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/mutex.hpp"
 #include "runtime/safepoint.hpp"
 
 /*
@@ -35,6 +37,7 @@
 */
 u2 JfrTraceIdEpoch::_generation = 0;
 JfrSignal JfrTraceIdEpoch::_tag_state;
+bool JfrTraceIdEpoch::_method_tracer_state = false;
 bool JfrTraceIdEpoch::_epoch_state = false;
 bool JfrTraceIdEpoch::_synchronizing = false;
 
@@ -59,3 +62,21 @@ void JfrTraceIdEpoch::end_epoch_shift() {
   OrderAccess::storestore();
   _synchronizing = false;
 }
+
+bool JfrTraceIdEpoch::is_synchronizing() {
+  return Atomic::load_acquire(&_synchronizing);
+}
+
+void JfrTraceIdEpoch::set_method_tracer_tag_state() {
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  Atomic::release_store(&_method_tracer_state, true);
+}
+
+void JfrTraceIdEpoch::reset_method_tracer_tag_state() {
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  Atomic::release_store(&_method_tracer_state, false);
+}
+
+bool JfrTraceIdEpoch::has_method_tracer_changed_tag_state() {
+  return Atomic::load_acquire(&_method_tracer_state);
+}
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
index b74a07c23c2..10ea9643971 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.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
@@ -28,7 +28,6 @@
 #include "jfr/utilities/jfrSignal.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "memory/allStatic.hpp"
-#include "runtime/atomic.hpp"
 
 #define BIT                                  1
 #define METHOD_BIT                           (BIT << 2)
@@ -57,6 +56,7 @@ class JfrTraceIdEpoch : AllStatic {
  private:
   static u2 _generation;
   static JfrSignal _tag_state;
+  static bool _method_tracer_state;
   static bool _epoch_state;
   static bool _synchronizing;
 
@@ -92,9 +92,7 @@ class JfrTraceIdEpoch : AllStatic {
     return _epoch_state ? (u1)0 : (u1)1;
   }
 
-  static bool is_synchronizing() {
-    return Atomic::load_acquire(&_synchronizing);
-  }
+  static bool is_synchronizing();
 
   static uint8_t this_epoch_bit() {
     return _epoch_state ? EPOCH_1_BIT : EPOCH_0_BIT;
@@ -121,7 +119,7 @@ class JfrTraceIdEpoch : AllStatic {
   }
 
   static bool has_changed_tag_state() {
-    return _tag_state.is_signaled_with_reset();
+    return _tag_state.is_signaled_with_reset() || has_method_tracer_changed_tag_state();
   }
 
   static bool has_changed_tag_state_no_reset() {
@@ -135,6 +133,10 @@ class JfrTraceIdEpoch : AllStatic {
   static address signal_address() {
     return _tag_state.signaled_address();
   }
+
+  static void set_method_tracer_tag_state();
+  static void reset_method_tracer_tag_state();
+  static bool has_method_tracer_changed_tag_state();
 };
 
 #endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp
index ff984d05c19..20a12ee75e2 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.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
@@ -72,6 +72,7 @@ class JfrTraceIdLoadBarrier : AllStatic {
   friend class JfrIntrinsicSupport;
   friend class JfrStackTrace;
   friend class JfrThreadSampler;
+  friend class JfrTraceTagging;
  private:
   static bool initialize();
   static void clear();
@@ -83,16 +84,17 @@ class JfrTraceIdLoadBarrier : AllStatic {
  public:
   static traceid load(const ClassLoaderData* cld);
   static traceid load(const Klass* klass);
+  static traceid load_previous_epoch(const Klass* klass);
   static traceid load(const Klass* klass, const Method* method);
   static traceid load(const Method* method);
   static traceid load(const ModuleEntry* module);
   static traceid load(const PackageEntry* package);
   static traceid load_leakp(const Klass* klass); // leak profiler
   static traceid load_leakp(const Klass* klass, const Method* method); // leak profiler
-  static traceid load_leakp_previuos_epoch(const Klass* klass, const Method* method); // leak profiler
-  static void do_klasses(void f(Klass*), bool previous_epoch = false);
+  static traceid load_leakp_previous_epoch(const Klass* klass, const Method* method); // leak profiler
   static traceid load_no_enqueue(const Klass* klass, const Method* method);
   static traceid load_no_enqueue(const Method* method);
+  static void do_klasses(void f(Klass*), bool previous_epoch = false);
 };
 
 #endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDLOADBARRIER_HPP
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp
index 5f986121ea0..ac1c11af2f8 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.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
@@ -172,15 +172,12 @@ inline traceid JfrTraceIdLoadBarrier::load_leakp(const Klass* klass, const Metho
   return (METHOD_ID(klass, method));
 }
 
-inline traceid JfrTraceIdLoadBarrier::load_leakp_previuos_epoch(const Klass* klass, const Method* method) {
+inline traceid JfrTraceIdLoadBarrier::load_leakp_previous_epoch(const Klass* klass, const Method* method) {
   assert(klass != nullptr, "invariant");
   assert(method != nullptr, "invariant");
   assert(klass == method->method_holder(), "invariant");
   assert(METHOD_AND_CLASS_USED_PREVIOUS_EPOCH(klass), "invariant");
   if (METHOD_FLAG_NOT_USED_PREVIOUS_EPOCH(method)) {
-    // the method is already logically tagged, just like the klass,
-    // but because of redefinition, the latest Method*
-    // representation might not have a reified tag.
     SET_TRANSIENT(method);
     assert(METHOD_FLAG_USED_PREVIOUS_EPOCH(method), "invariant");
   }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
index 392e36f2c3c..27cf66cc1fe 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
@@ -51,14 +51,17 @@
 #define EPOCH_CLEARED_BITS                        (EPOCH_1_CLEARED_BIT | EPOCH_0_CLEARED_BIT)
 #define LEAKP_META_BIT                            (BIT << 2)
 #define LEAKP_BIT                                 (LEAKP_META_BIT << META_SHIFT)
+#define TIMING_BIT                                LEAKP_BIT // Alias
 #define TRANSIENT_META_BIT                        (BIT << 3)
 #define TRANSIENT_BIT                             (TRANSIENT_META_BIT << META_SHIFT)
 #define SERIALIZED_META_BIT                       (BIT << 4)
 #define SERIALIZED_BIT                            (SERIALIZED_META_BIT << META_SHIFT)
+#define STICKY_META_BIT                           (BIT << 5)
+#define STICKY_BIT                                (STICKY_META_BIT << META_SHIFT)
 #define BLESSED_METHOD_BIT                        (JDK_JFR_EVENT_SUBKLASS)
 #define TRACE_ID_SHIFT                            16
 #define METHOD_ID_NUM_MASK                        ((1 << TRACE_ID_SHIFT) - 1)
-#define META_BITS                                 (SERIALIZED_BIT | TRANSIENT_BIT | LEAKP_BIT | EPOCH_1_CLEARED_BIT | EPOCH_0_CLEARED_BIT)
+#define META_BITS                                 (STICKY_BIT | SERIALIZED_BIT | TRANSIENT_BIT | LEAKP_BIT | EPOCH_1_CLEARED_BIT | EPOCH_0_CLEARED_BIT)
 #define EVENT_BITS                                (EVENT_HOST_KLASS | JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)
 #define TAG_BITS                                  (EPOCH_1_METHOD_BIT | EPOCH_0_METHOD_BIT | EPOCH_1_BIT | EPOCH_0_BIT)
 #define ALL_BITS                                  (META_BITS | EVENT_BITS | TAG_BITS)
@@ -90,20 +93,20 @@
 #define METHOD_META_MASK_CLEAR(method, mask)      (JfrTraceIdBits::meta_mask_store(mask, method))
 
 // predicates
-#define USED_THIS_EPOCH(ptr)                      (TRACE_ID_PREDICATE(ptr, (TRANSIENT_BIT | THIS_EPOCH_BIT)))
+#define USED_THIS_EPOCH(ptr)                      (TRACE_ID_PREDICATE(ptr, (STICKY_BIT | TRANSIENT_BIT | THIS_EPOCH_BIT)))
 #define NOT_USED_THIS_EPOCH(ptr)                  (!(USED_THIS_EPOCH(ptr)))
-#define USED_PREVIOUS_EPOCH(ptr)                  (TRACE_ID_PREDICATE(ptr, (TRANSIENT_BIT | PREVIOUS_EPOCH_BIT)))
-#define USED_ANY_EPOCH(ptr)                       (TRACE_ID_PREDICATE(ptr, (TRANSIENT_BIT | EPOCH_1_BIT | EPOCH_0_BIT)))
-#define METHOD_USED_THIS_EPOCH(kls)               (TRACE_ID_PREDICATE(kls, (THIS_EPOCH_METHOD_BIT)))
+#define USED_PREVIOUS_EPOCH(ptr)                  (TRACE_ID_PREDICATE(ptr, (STICKY_BIT | TRANSIENT_BIT | PREVIOUS_EPOCH_BIT)))
+#define USED_ANY_EPOCH(ptr)                       (TRACE_ID_PREDICATE(ptr, (STICKY_BIT | TRANSIENT_BIT | EPOCH_1_BIT | EPOCH_0_BIT)))
+#define METHOD_USED_THIS_EPOCH(kls)               (TRACE_ID_PREDICATE(kls, (STICKY_BIT | THIS_EPOCH_METHOD_BIT)))
 #define METHOD_NOT_USED_THIS_EPOCH(kls)           (!(METHOD_USED_THIS_EPOCH(kls)))
-#define METHOD_USED_PREVIOUS_EPOCH(kls)           (TRACE_ID_PREDICATE(kls, (PREVIOUS_EPOCH_METHOD_BIT)))
+#define METHOD_USED_PREVIOUS_EPOCH(kls)           (TRACE_ID_PREDICATE(kls, (STICKY_BIT | PREVIOUS_EPOCH_METHOD_BIT)))
 #define METHOD_USED_ANY_EPOCH(kls)                (TRACE_ID_PREDICATE(kls, (EPOCH_1_METHOD_BIT | EPOCH_0_METHOD_BIT)))
 #define METHOD_AND_CLASS_USED_THIS_EPOCH(kls)     (TRACE_ID_PREDICATE(kls, (THIS_EPOCH_METHOD_AND_CLASS_BITS)))
 #define METHOD_AND_CLASS_USED_PREVIOUS_EPOCH(kls) (TRACE_ID_PREDICATE(kls, (PREVIOUS_EPOCH_METHOD_AND_CLASS_BITS)))
 #define METHOD_AND_CLASS_USED_ANY_EPOCH(kls)      (METHOD_USED_ANY_EPOCH(kls) && USED_ANY_EPOCH(kls))
-#define METHOD_FLAG_USED_THIS_EPOCH(method)       (METHOD_FLAG_PREDICATE(method, (TRANSIENT_BIT | THIS_EPOCH_BIT)))
+#define METHOD_FLAG_USED_THIS_EPOCH(method)       (METHOD_FLAG_PREDICATE(method, (STICKY_BIT | TRANSIENT_BIT | THIS_EPOCH_BIT)))
 #define METHOD_FLAG_NOT_USED_THIS_EPOCH(method)   (!(METHOD_FLAG_USED_THIS_EPOCH(method)))
-#define METHOD_FLAG_USED_PREVIOUS_EPOCH(method)   (METHOD_FLAG_PREDICATE(method, (TRANSIENT_BIT | PREVIOUS_EPOCH_BIT)))
+#define METHOD_FLAG_USED_PREVIOUS_EPOCH(method)   (METHOD_FLAG_PREDICATE(method, (STICKY_BIT | TRANSIENT_BIT | PREVIOUS_EPOCH_BIT)))
 #define METHOD_FLAG_USED_PREVIOUS_EPOCH_BIT(method) (METHOD_FLAG_PREDICATE(method, (PREVIOUS_EPOCH_BIT)))
 #define METHOD_FLAG_NOT_USED_PREVIOUS_EPOCH(method) (!(METHOD_FLAG_USED_PREVIOUS_EPOCH(method)))
 #define IS_METHOD_BLESSED(method)                 (METHOD_FLAG_PREDICATE(method, BLESSED_METHOD_BIT))
@@ -132,16 +135,22 @@
 // meta
 #define META_MASK                                 (~(SERIALIZED_META_BIT | TRANSIENT_META_BIT | LEAKP_META_BIT))
 #define SET_LEAKP(ptr)                            (TRACE_ID_META_TAG(ptr, LEAKP_META_BIT))
+#define SET_TIMING_BIT(ptr)                       (SET_LEAKP(ptr))
 #define IS_LEAKP(ptr)                             (TRACE_ID_PREDICATE(ptr, LEAKP_BIT))
+#define HAS_TIMING_BIT(ptr)                       (IS_LEAKP(ptr))
 #define IS_NOT_LEAKP(ptr)                         (!(IS_LEAKP(ptr)))
+#define HAS_NOT_TIMING_BIT(ptr)                   (IS_NOT_LEAKP(ptr))
 #define SET_TRANSIENT(ptr)                        (TRACE_ID_META_TAG(ptr, TRANSIENT_META_BIT))
 #define IS_TRANSIENT(ptr)                         (TRACE_ID_PREDICATE(ptr, TRANSIENT_BIT))
 #define IS_NOT_TRANSIENT(ptr)                     (!(IS_TRANSIENT(ptr)))
+#define IS_SERIALIZED(ptr)                        (TRACE_ID_PREDICATE(ptr, SERIALIZED_BIT))
+#define IS_NOT_SERIALIZED(ptr)                    (!(IS_SERIALIZED(ptr)))
 #define SET_SERIALIZED(ptr)                       (TRACE_ID_META_TAG(ptr, SERIALIZED_META_BIT))
+#define HAS_STICKY_BIT(ptr)                       (TRACE_ID_PREDICATE(ptr, STICKY_BIT))
+#define HAS_NOT_STICKY_BIT(ptr)                   (!(HAS_STICKY_BIT(ptr)))
+#define SET_STICKY_BIT(ptr)                       (TRACE_ID_META_TAG(ptr, STICKY_META_BIT))
 #define IS_THIS_EPOCH_CLEARED_BIT_SET(ptr)        (TRACE_ID_PREDICATE(ptr, (THIS_EPOCH_BIT << META_SHIFT)))
 #define IS_PREVIOUS_EPOCH_CLEARED_BIT_SET(ptr)    (TRACE_ID_PREDICATE(ptr, (PREVIOUS_EPOCH_BIT << META_SHIFT)))
-#define IS_SERIALIZED(ptr)                        (TRACE_ID_PREDICATE(ptr, SERIALIZED_BIT))
-#define IS_NOT_SERIALIZED(ptr)                    (!(IS_SERIALIZED(ptr)))
 #define SHOULD_TAG(ptr)                           (NOT_USED_THIS_EPOCH(ptr))
 #define SHOULD_TAG_KLASS_METHOD(ptr)              (METHOD_NOT_USED_THIS_EPOCH(ptr))
 #define CLEAR_SERIALIZED(ptr)                     (TRACE_ID_META_MASK_CLEAR(ptr, META_MASK))
@@ -151,6 +160,9 @@
 #define SET_METHOD_SERIALIZED(method)             (METHOD_META_TAG(method, SERIALIZED_META_BIT))
 #define METHOD_IS_SERIALIZED(method)              (METHOD_FLAG_PREDICATE(method, SERIALIZED_BIT))
 #define METHOD_IS_NOT_SERIALIZED(method)          (!(METHOD_IS_SERIALIZED(method)))
+#define SET_METHOD_STICKY_BIT(method)             (METHOD_META_TAG(method, STICKY_META_BIT))
+#define METHOD_HAS_STICKY_BIT(method)             (METHOD_FLAG_PREDICATE(method, STICKY_BIT))
+#define METHOD_HAS_NOT_STICKY_BIT(method)         (!(METHOD_HAS_STICKY_BIT(method)))
 #define SET_METHOD_LEAKP(method)                  (METHOD_META_TAG(method, LEAKP_META_BIT))
 #define METHOD_IS_LEAKP(method)                   (METHOD_FLAG_PREDICATE(method, LEAKP_BIT))
 #define METHOD_IS_NOT_LEAKP(method)               (!(METHOD_IS_LEAKP(method)))
@@ -160,7 +172,10 @@
 #define CLEAR_SERIALIZED_METHOD(method)           (METHOD_META_MASK_CLEAR(method, META_MASK))
 #define SET_PREVIOUS_EPOCH_METHOD_CLEARED_BIT(ptr) (METHOD_META_TAG(ptr, PREVIOUS_EPOCH_BIT))
 #define CLEAR_LEAKP(ptr)                          (TRACE_ID_META_MASK_CLEAR(ptr, (~(LEAKP_META_BIT))))
+#define CLEAR_TIMING_BIT(ptr)                     (CLEAR_LEAKP(ptr))
 #define CLEAR_LEAKP_METHOD(method)                (METHOD_META_MASK_CLEAR(method, (~(LEAKP_META_BIT))))
+#define CLEAR_STICKY_BIT(ptr)                     (TRACE_ID_META_MASK_CLEAR(ptr, (~(STICKY_META_BIT))))
+#define CLEAR_STICKY_BIT_METHOD(method)           (METHOD_META_MASK_CLEAR(method, (~(STICKY_META_BIT))))
 #define CLEAR_THIS_EPOCH_CLEARED_BIT(ptr)         (TRACE_ID_META_MASK_CLEAR(ptr,(~(THIS_EPOCH_BIT))))
 #define CLEAR_THIS_EPOCH_METHOD_CLEARED_BIT(ptr)  (METHOD_META_MASK_CLEAR(ptr,(~(THIS_EPOCH_BIT))))
 #define IS_THIS_EPOCH_METHOD_CLEARED(ptr)         (METHOD_FLAG_PREDICATE(method, THIS_EPOCH_BIT))
diff --git a/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.cpp b/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.cpp
new file mode 100644
index 00000000000..e318891242e
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.cpp
@@ -0,0 +1,109 @@
+/*
+* 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 "jfr/support/jfrAnnotationElementIterator.hpp"
+#include "jfr/support/jfrAnnotationIterator.hpp"
+#include "jfr/utilities/jfrBigEndian.hpp"
+#include "oops/constantPool.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/symbol.hpp"
+
+/*
+ Annotation layout.
+
+ enum {  // initial annotation layout
+   atype_off = 0,    // utf8 such as 'Ljava/lang/annotation/Retention;'
+   count_off = 2,    // u2   such as 1 (one value)
+   member_off = 4,   // utf8 such as 'value'
+   tag_off = 6,      // u1   such as 'c' (type) or 'e' (enum)
+   e_tag_val = 'e',
+   e_type_off = 7,   // utf8 such as 'Ljava/lang/annotation/RetentionPolicy;'
+   e_con_off = 9,    // utf8 payload, such as 'SOURCE', 'CLASS', 'RUNTIME'
+   e_size = 11,      // end of 'e' annotation
+   c_tag_val = 'c',  // payload is type
+   c_con_off = 7,    // utf8 payload, such as 'I'
+   c_size = 9,       // end of 'c' annotation
+   s_tag_val = 's',  // payload is String
+   s_con_off = 7,    // utf8 payload, such as 'Ljava/lang/String;'
+   s_size = 9,
+   min_size = 6      // smallest possible size (zero members)
+ };
+
+ See JVMS - 4.7.16. The RuntimeVisibleAnnotations Attribute
+
+*/
+
+static constexpr const int number_of_elements_offset = 2;
+static constexpr const int element_name_offset = number_of_elements_offset + 2;
+static constexpr const int element_name_size = 2;
+static constexpr const int value_type_relative_offset = 2;
+static constexpr const int value_relative_offset = value_type_relative_offset + 1;
+
+JfrAnnotationElementIterator::JfrAnnotationElementIterator(const InstanceKlass* ik, address buffer, int limit) :
+  _ik(ik),
+  _buffer(buffer),
+  _limit(limit),
+  _current(element_name_offset),
+  _next(element_name_offset) {
+  assert(_buffer != nullptr, "invariant");
+  assert(_next == element_name_offset, "invariant"); assert(_current == element_name_offset, "invariant");
+}
+
+int JfrAnnotationElementIterator::value_index() const {
+  return JfrBigEndian::read<int, u2>(_buffer + _current + value_relative_offset);
+}
+
+bool JfrAnnotationElementIterator::has_next() const {
+  return _next < _limit;
+}
+
+void JfrAnnotationElementIterator::move_to_next() const {
+  assert(has_next(), "invariant");
+  _current = _next;
+  if (_next < _limit) {
+    _next = JfrAnnotationIterator::skip_annotation_value(_buffer, _limit, _next + element_name_size);
+  }
+  assert(_next <= _limit, "invariant"); assert(_current <= _limit, "invariant");
+}
+
+int JfrAnnotationElementIterator::number_of_elements() const {
+  return JfrBigEndian::read<int, u2>(_buffer + number_of_elements_offset);
+}
+
+const Symbol* JfrAnnotationElementIterator::name() const {
+  assert(_current < _next, "invariant");
+  return _ik->constants()->symbol_at(JfrBigEndian::read<int, u2>(_buffer + _current));
+}
+
+char JfrAnnotationElementIterator::value_type() const {
+  return JfrBigEndian::read<char, u1>(_buffer + _current + value_type_relative_offset);
+}
+
+jint JfrAnnotationElementIterator::read_int() const {
+  return _ik->constants()->int_at(value_index());
+}
+
+bool JfrAnnotationElementIterator::read_bool() const {
+  return read_int() != 0;
+}
diff --git a/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.hpp b/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.hpp
new file mode 100644
index 00000000000..9d8b35080fb
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrAnnotationElementIterator.hpp
@@ -0,0 +1,55 @@
+/*
+* 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.
+*
+*/
+
+#ifndef SHARE_JFR_SUPPORT_JFRANNOTATIONELEMENTITERATOR_HPP
+#define SHARE_JFR_SUPPORT_JFRANNOTATIONELEMENTITERATOR_HPP
+
+#include "jni.h"
+#include "utilities/globalDefinitions.hpp"
+#include "memory/allocation.hpp"
+
+class InstanceKlass;
+class Symbol;
+
+class JfrAnnotationElementIterator : public StackObj {
+ private:
+  const InstanceKlass* _ik;
+  const address _buffer;
+  const int _limit; // length of annotation
+  mutable int _current; // element
+  mutable int _next; // element
+  int value_index() const;
+
+ public:
+  JfrAnnotationElementIterator(const InstanceKlass* ik, address buffer, int limit);
+  bool has_next() const;
+  void move_to_next() const;
+  int number_of_elements() const;
+  bool read_bool() const;
+  jint read_int() const;
+  char value_type() const;
+  const Symbol* name() const;
+};
+
+#endif // SHARE_JFR_SUPPORT_JFRANNOTATIONELEMENTITERATOR_HPP
diff --git a/src/hotspot/share/jfr/support/jfrAnnotationIterator.cpp b/src/hotspot/share/jfr/support/jfrAnnotationIterator.cpp
new file mode 100644
index 00000000000..a5fc133ba16
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrAnnotationIterator.cpp
@@ -0,0 +1,138 @@
+/*
+* 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 "jfr/support/jfrAnnotationIterator.hpp"
+#include "jfr/utilities/jfrBigEndian.hpp"
+#include "oops/constantPool.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/symbol.hpp"
+
+JfrAnnotationIterator::JfrAnnotationIterator(const InstanceKlass* ik, AnnotationArray* ar) :
+ _ik(ik),
+ _limit(ar != nullptr ? ar->length() : 0),
+ _buffer(_limit > 2 ? ar->adr_at(2) : nullptr),
+ _current(0),
+ _next(0) {
+  if (_limit >= 2) {
+    _limit -= 2; // subtract sizeof(u2) number of annotations field
+  }
+}
+
+bool JfrAnnotationIterator::has_next() const {
+  return _next < _limit;
+}
+
+void JfrAnnotationIterator::move_to_next() const {
+  assert(has_next(), "invariant");
+  _current = _next;
+  if (_next < _limit) {
+    _next = next_annotation_index(_buffer, _limit, _next);
+  }
+  assert(_next <= _limit, "invariant");
+  assert(_current <= _limit, "invariant");
+}
+
+const Symbol* JfrAnnotationIterator::type() const {
+  assert(_buffer != nullptr, "invariant");
+  assert(_current < _limit, "invariant");
+  return _ik->constants()->symbol_at(JfrBigEndian::read<int, u2>(_buffer + _current));
+}
+
+address JfrAnnotationIterator::buffer() const {
+  return _buffer;
+}
+
+int JfrAnnotationIterator::current() const {
+  return _current;
+}
+
+int JfrAnnotationIterator::next() const {
+  return _next;
+}
+
+// Skip an annotation.  Return >=limit if there is any problem.
+int JfrAnnotationIterator::next_annotation_index(const address buffer, int limit, int index) {
+  assert(buffer != nullptr, "invariant");
+  index += 2;  // skip atype
+  if ((index += 2) >= limit) {
+    return limit;
+  }
+  int nof_members = JfrBigEndian::read<int, u2>(buffer + index - 2);
+  while (--nof_members >= 0 && index < limit) {
+    index += 2; // skip member
+    index = skip_annotation_value(buffer, limit, index);
+  }
+  return index;
+}
+
+// Skip an annotation value.  Return >=limit if there is any problem.
+int JfrAnnotationIterator::skip_annotation_value(const address buffer, int limit, int index) {
+  assert(buffer != nullptr, "invariant");
+  // value := switch (tag:u1) {
+  //   case B, C, I, S, Z, D, F, J, c: con:u2;
+  //   case e: e_class:u2 e_name:u2;
+  //   case s: s_con:u2;
+  //   case [: do(nval:u2) {value};
+  //   case @: annotation;
+  //   case s: s_con:u2;
+  // }
+  if ((index += 1) >= limit) {
+    return limit;
+  }
+  const u1 tag = buffer[index - 1];
+  switch (tag) {
+    case 'B':
+    case 'C':
+    case 'I':
+    case 'S':
+    case 'Z':
+    case 'D':
+    case 'F':
+    case 'J':
+    case 'c':
+    case 's':
+      index += 2;  // skip con or s_con
+      break;
+    case 'e':
+      index += 4;  // skip e_class, e_name
+      break;
+    case '[':
+      {
+        if ((index += 2) >= limit) {
+          return limit;
+        }
+        int nof_values = JfrBigEndian::read<int, u2>(buffer + index - 2);
+        while (--nof_values >= 0 && index < limit) {
+          index = skip_annotation_value(buffer, limit, index);
+        }
+      }
+      break;
+    case '@':
+      index = next_annotation_index(buffer, limit, index);
+      break;
+    default:
+      return limit;  //  bad tag byte
+  }
+  return index;
+}
diff --git a/src/hotspot/share/jfr/support/jfrAnnotationIterator.hpp b/src/hotspot/share/jfr/support/jfrAnnotationIterator.hpp
new file mode 100644
index 00000000000..5f62287e862
--- /dev/null
+++ b/src/hotspot/share/jfr/support/jfrAnnotationIterator.hpp
@@ -0,0 +1,56 @@
+/*
+* 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.
+*
+*/
+
+#ifndef SHARE_JFR_SUPPORT_JFRANNOTATIONITERATOR_HPP
+#define SHARE_JFR_SUPPORT_JFRANNOTATIONITERATOR_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/annotations.hpp"
+
+class Symbol;
+class InstanceKlass;
+
+class JfrAnnotationIterator: public StackObj {
+ friend class JfrAnnotationElementIterator;
+ private:
+  const InstanceKlass* _ik;
+  // ensure _limit field is declared before _buffer
+  int _limit; // length of annotations array
+  const address _buffer;
+  mutable int _current; // annotation
+  mutable int _next; // annotation
+  static int skip_annotation_value(const address buffer, int limit, int index);
+  static int next_annotation_index(const address buffer, int limit, int index);
+
+ public:
+  JfrAnnotationIterator(const InstanceKlass* ik, AnnotationArray* ar);
+  bool has_next() const;
+  void move_to_next() const;
+  const Symbol* type() const;
+  address buffer() const;
+  int current() const;
+  int next() const;
+};
+
+#endif // SHARE_JFR_SUPPORT_JFRANNOTATIONITERATOR_HPP
diff --git a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
index 7652b94b26b..8f096347c77 100644
--- a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp
@@ -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
@@ -25,7 +25,7 @@
 #ifndef SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
 #define SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
 
-#include "jfr/instrumentation/jfrEventClassTransformer.hpp"
+#include "jfr/jfr.hpp"
 #include "jfr/support/jfrTraceIdExtension.hpp"
 
 #define DEFINE_KLASS_TRACE_ID_OFFSET \
@@ -37,8 +37,11 @@
 #define JDK_JFR_EVENT_KLASS    32
 #define EVENT_HOST_KLASS       64
 #define EVENT_RESERVED         128
+#define EVENT_STICKY_BIT       8192
 #define IS_EVENT_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)) != 0)
 #define IS_EVENT_OR_HOST_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS | EVENT_HOST_KLASS)) != 0)
-#define ON_KLASS_CREATION(k, p, t) if (IS_EVENT_OR_HOST_KLASS(k)) JfrEventClassTransformer::on_klass_creation(k, p, t)
+#define KLASS_HAS_STICKY_BIT(ptr) (((ptr)->trace_id() & STICKY_BIT) != 0)
+#define ON_KLASS_REDEFINITION(k, t) if (KLASS_HAS_STICKY_BIT(k)) Jfr::on_klass_redefinition(k, t)
+#define ON_KLASS_CREATION(k, p, t) Jfr::on_klass_creation(k, p, t)
 
 #endif // SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.cpp
new file mode 100644
index 00000000000..37f2d438bc6
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.cpp
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ *
+ */
+
+#include "classfile/classLoaderDataGraph.hpp"
+#include "jfr/jni/jfrJavaSupport.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/jfrKlassUnloading.hpp"
+#include "jfr/support/methodtracer/jfrClassFilterClosure.hpp"
+#include "jfr/support/methodtracer/jfrFilter.hpp"
+#include "jfr/support/methodtracer/jfrFilterManager.hpp"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "oops/instanceKlass.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/resizeableResourceHash.hpp"
+
+constexpr static unsigned int TABLE_SIZE = 1009;
+constexpr static unsigned int MAX_TABLE_SIZE = 0x3fffffff;
+
+JfrFilterClassClosure::JfrFilterClassClosure(JavaThread* thread) :
+  _new_filter(JfrFilterManager::current()),
+  _classes_to_modify(new ClosureSet(TABLE_SIZE, MAX_TABLE_SIZE)),
+  _thread(thread) {
+  assert(_new_filter != nullptr, "invariant");
+}
+
+static inline jclass mirror_as_local_jni_handle(const InstanceKlass* ik, JavaThread* thread) {
+  assert(ik != nullptr, "invariant");
+  assert(thread != nullptr, "invariant");
+  return reinterpret_cast<jclass>(JfrJavaSupport::local_jni_handle(ik->java_mirror(), thread));
+}
+
+inline bool JfrFilterClassClosure::match(const InstanceKlass* ik) const {
+  assert(_new_filter != nullptr, "invariant");
+  return _new_filter->can_instrument_class(ik) && _new_filter->match(ik);
+}
+
+void JfrFilterClassClosure::do_klass(Klass* k) {
+  assert(k != nullptr, "invariant");
+  if (k->is_instance_klass()) {
+    const InstanceKlass* const ik = InstanceKlass::cast(k);
+    if (match(ik)) {
+      assert(ik->is_loader_alive(), "invariant");
+      const traceid klass_id = JfrTraceId::load_raw(ik);
+      if (!_classes_to_modify->contains(klass_id)) {
+        jclass mirror = mirror_as_local_jni_handle(ik, _thread);
+        _classes_to_modify->put(klass_id, mirror);
+      }
+    }
+  }
+}
+
+ClosureSet* JfrFilterClassClosure::to_modify() const {
+  assert(_classes_to_modify != nullptr, "invariant");
+  return _classes_to_modify;
+}
+
+int JfrFilterClassClosure::number_of_classes() const {
+  assert(_classes_to_modify != nullptr, "invariant");
+  return _classes_to_modify->number_of_entries();
+}
+
+void JfrFilterClassClosure::iterate_all_classes(GrowableArray<JfrInstrumentedClass>* instrumented_klasses) {
+  assert(instrumented_klasses != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+  // First we process the instrumented_klasses list. The fact that a klass is on that list implies
+  // it matched _some_ previous filter, but we don't know which one. The nice thing is we don't need to know,
+  // because a klass has the STICKY_BIT set for those methods that matched _some_ previous filter.
+  // We, therefore, put these klasses directly into the classes_to_modify set. We also need to do this
+  // because some klasses on the instrumented_klasses list may not have reached the point of add_to_hierarchy yet.
+  // For those klasses, the ClassLoaderDataGraph iterator would not deliver them on iteration.
+
+  if (instrumented_klasses->is_nonempty()) {
+    for (int i = 0; i < instrumented_klasses->length(); ++i) {
+      if (JfrKlassUnloading::is_unloaded(instrumented_klasses->at(i).trace_id())) {
+        continue;
+      }
+      const InstanceKlass* const ik = instrumented_klasses->at(i).instance_klass();
+      assert(ik != nullptr, "invariant");
+      assert(ik->is_loader_alive(), "invariant");
+      assert(JfrTraceId::has_sticky_bit(ik), "invariant");
+      const traceid klass_id = JfrTraceId::load_raw(ik);
+      assert(!_classes_to_modify->contains(klass_id), "invariant");
+      jclass mirror = mirror_as_local_jni_handle(ik, _thread);
+      _classes_to_modify->put(klass_id, mirror);
+    }
+  }
+  ClassLoaderDataGraph::loaded_classes_do_keepalive(this);
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.hpp
new file mode 100644
index 00000000000..a23b27eb12a
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrClassFilterClosure.hpp
@@ -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.
+*
+*/
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERCLASSCLOSURE_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERCLASSCLOSURE_HPP
+
+#include "jni.h"
+#include "memory/iterator.hpp"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "jfr/utilities/jfrRelation.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+
+class JavaThread;
+class JfrFilter;
+class Klass;
+
+template<typename T> class GrowableArray;
+
+template<typename K, typename V,
+         AnyObj::allocation_type, MemTag,
+         unsigned (*HASH)  (K const&),
+         bool (*EQUALS)(K const&, K const&)> class ResizeableResourceHashtable;
+
+// Knuth multiplicative hashing.
+inline uint32_t knuth_hash(const traceid& id) {
+  const uint32_t v = static_cast<uint32_t>(id);
+  return v * UINT32_C(2654435761);
+}
+
+typedef ResizeableResourceHashtable<traceid, jclass,
+                                    AnyObj::RESOURCE_AREA,
+                                    mtTracing,
+                                    knuth_hash,
+                                    equals_traceid> ClosureSet;
+
+//
+// Class that collects classes that should be retransformed,
+// either for adding instrumentation by matching the current
+// filter or for removing old instrumentation.
+//
+class JfrFilterClassClosure : public KlassClosure {
+ private:
+  const JfrFilter* const _new_filter;
+  ClosureSet* const _classes_to_modify;
+  JavaThread* const _thread;
+
+  bool match(const InstanceKlass* klass) const;
+  void do_klass(Klass* k);
+
+ public:
+  JfrFilterClassClosure(JavaThread* thread);
+  void iterate_all_classes(GrowableArray<JfrInstrumentedClass>* instrumented_klasses);
+  // Returned set is Resource allocated.
+  ClosureSet* to_modify() const;
+  int number_of_classes() const;
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERCLASSCLOSURE_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrFilter.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrFilter.cpp
new file mode 100644
index 00000000000..2a977f9e823
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrFilter.cpp
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ *
+ */
+
+#include "classfile/moduleEntry.hpp"
+#include "classfile/vmClasses.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/jfrAnnotationIterator.hpp"
+#include "jfr/support/jfrJdkJfrEvent.hpp"
+#include "jfr/support/methodtracer/jfrFilter.hpp"
+#include "logging/log.hpp"
+#include "logging/logMessage.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/method.inline.hpp"
+#include "oops/symbol.hpp"
+
+JfrFilter::JfrFilter(Symbol** class_names,
+                     Symbol** method_names,
+                     Symbol** annotation_names,
+                     int* modifications,
+                     int count) :
+  _class_names(class_names),
+  _method_names(method_names),
+  _annotation_names(annotation_names),
+  _modifications(modifications),
+  _count(count) {}
+
+JfrFilter::~JfrFilter() {
+  for (int i = 0; i < _count; i++) {
+    Symbol::maybe_decrement_refcount(_class_names[i]);
+    Symbol::maybe_decrement_refcount(_method_names[i]);
+    Symbol::maybe_decrement_refcount(_annotation_names[i]);
+  }
+  FREE_C_HEAP_ARRAY(Symbol*, _class_names);
+  FREE_C_HEAP_ARRAY(Symbol*, _method_names);
+  FREE_C_HEAP_ARRAY(Symbol*, _annotation_names);
+  FREE_C_HEAP_ARRAY(int, _modifications);
+}
+
+bool JfrFilter::can_instrument_module(const ModuleEntry* module) const {
+  if (module == nullptr) {
+    return true;
+  }
+  const Symbol* name = module->name();
+  if (name == nullptr) {
+    return true;
+  }
+  if (name->equals("jdk.jfr", 7)) {
+    return false;
+  }
+  return true;
+}
+
+bool JfrFilter::can_instrument_class(const InstanceKlass* ik) const {
+  assert(ik != nullptr, "invariant");
+  if (JfrTraceId::has_sticky_bit(ik)) {
+    return true;
+  }
+  if (ik->is_hidden()) {
+    return false;
+  }
+  if (JdkJfrEvent::is_a(ik)) {
+    return false;
+  }
+  if (ik == vmClasses::Continuation_klass()) {
+    return false;
+  }
+  return can_instrument_module(ik->module());
+}
+
+// can_intrument(InstanceKlass*) is not called in this method
+// to avoid executing the same code for every method in a class
+bool JfrFilter::can_instrument_method(const Method* method) const {
+  assert(method != nullptr, "invariant");
+  if (JfrTraceId::has_sticky_bit(method)) {
+    return true;
+  }
+  if (method->is_abstract()) {
+    return false;
+  }
+  if (method->is_synthetic()) {
+    return false;
+  }
+  if (method->is_native()) {
+    return false;
+  }
+  if (method->is_compiled_lambda_form()) {
+    return false;
+  }
+  return true;
+}
+
+bool JfrFilter::match_annotations(const InstanceKlass* ik, AnnotationArray* annotations, const Symbol* symbol, bool log) const {
+  assert(ik != nullptr, "invariant");
+  assert(symbol != nullptr, "invariant");
+  if (annotations == nullptr) {
+    return false;
+  }
+  JfrAnnotationIterator it(ik, annotations);
+  while (it.has_next()) {
+    it.move_to_next();
+    const Symbol* current = it.type();
+    bool equal = current == symbol;
+    if (log && log_is_enabled(Trace, methodtrace)) {
+      ResourceMark rm;
+      log_trace(jfr, methodtrace)(
+        "match_annotations: Class %s has annotation %s %s",
+        ik->external_name(),
+        current->as_C_string(),
+        (equal ? "true" : "false")
+        );
+    }
+    if (equal) {
+      return true;
+    }
+  }
+  return false;
+}
+
+int JfrFilter::combine_bits(int a, int b) {
+  if (a == NONE) {
+    return b;
+  }
+  if (b == NONE) {
+    return a;
+  }
+  return a | b;
+}
+
+int JfrFilter::class_modifications(const InstanceKlass* ik, bool log) const {
+  assert(ik != nullptr, "invariant");
+  AnnotationArray* class_annotations = ik->class_annotations();
+  if (class_annotations == nullptr) {
+    return NONE;
+  }
+  int result = NONE;
+  for (int i = 0; i < _count; i++) {
+    const Symbol* annotation_filter = _annotation_names[i];
+    if (annotation_filter != nullptr && match_annotations(ik, class_annotations, annotation_filter, log)) {
+      result = combine_bits(result, _modifications[i]);
+      if (log && log_is_enabled(Trace, methodtrace)) {
+        ResourceMark rm;
+        log_trace(jfr, methodtrace)("Class_modifications: %s bits = %d", ik->external_name(), result);
+      }
+    }
+  }
+  return result;
+}
+
+bool JfrFilter::match(const InstanceKlass* ik) const {
+  assert(ik != nullptr, "invariant");
+  if (class_modifications(ik, false) != NONE) {
+    return true;
+  }
+  const Array<Method*>* methods = ik->methods();
+  const int method_count = methods->length();
+  for (int i = 0; i < method_count; i++) {
+    if (method_modifications(methods->at(i)) != NONE) {
+      return true;
+    }
+  }
+  return false;
+}
+
+int JfrFilter::method_modifications(const Method* method) const {
+  assert(method != nullptr, "invariant");
+  InstanceKlass* klass = method->method_holder();
+  int result = NONE;
+  for (int i = 0; i < _count; i++) {
+    Symbol* annotation_name = _annotation_names[i];
+    if (annotation_name != nullptr) {
+      if (match_annotations(klass, method->annotations(), annotation_name, false)) {
+        result = combine_bits(result, _modifications[i]);
+      }
+    } else {
+      Symbol* class_name = _class_names[i];
+      if (class_name == nullptr || klass->name() == class_name) {
+        Symbol* method_name = _method_names[i];
+        if (method_name == nullptr || (method->name() == method_name && can_instrument_method(method))) {
+          result = combine_bits(result, _modifications[i]);
+        }
+      }
+    }
+  }
+  return result;
+}
+
+void JfrFilter::log(const char* caption) const {
+  assert(caption != nullptr, "invariant");
+  if (!log_is_enabled(Debug, jfr, methodtrace))  {
+    return;
+  }
+  LogMessage(jfr,methodtrace) msg;
+  msg.debug("%s = {", caption);
+  for (int i = 0; i < _count; i++) {
+    const Symbol* m = _method_names[i];
+    const Symbol* c = _class_names[i];
+    const Symbol* a = _annotation_names[i];
+    const char* modification = modification_to_text(_modifications[i]);
+
+    if (a != nullptr) {
+      char annotation_buffer[100];
+      a->as_klass_external_name(annotation_buffer, 100);
+      size_t length = strlen(annotation_buffer);
+      if (length > 2) {
+        annotation_buffer[length - 1] = '\0'; // remove trailing ';'
+        msg.debug(" @%s %s", annotation_buffer + 1, modification); // Skip 'L'
+      }
+    } else {
+      char class_buffer[100];
+      if (c != nullptr) {
+        c->as_klass_external_name(class_buffer, 100);
+      } else {
+        class_buffer[0] = '\0';
+      }
+      if (m != nullptr) {
+        char method_buffer[100];
+        m->as_klass_external_name(method_buffer, 100);
+        msg.debug(" %s::%s %s", class_buffer, method_buffer, modification);
+      } else {
+        msg.debug(" %s %s", class_buffer, modification);
+      }
+    }
+  }
+  msg.debug("}");
+}
+
+bool JfrFilter::is_timing(int modification) {
+  return modification == NONE ? false : (modification & TIMING) != 0;
+}
+
+bool JfrFilter::is_tracing(int modification) {
+  return modification == NONE ? false : (modification & TRACING) != 0;
+}
+
+const char* JfrFilter::modification_to_text(int modification) {
+  switch (modification) {
+  case 0:
+    return "-timing -tracing";
+  case TIMING:
+    return "+timing";
+  case TRACING:
+    return "+tracing";
+  case TIMING + TRACING:
+    return "+timing +tracing";
+  default:
+    ShouldNotReachHere();
+  };
+  return "unknown modification";
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrFilter.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrFilter.hpp
new file mode 100644
index 00000000000..665a2cafad3
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrFilter.hpp
@@ -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.
+*
+*/
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTER_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTER_HPP
+
+#include "jni.h"
+#include "jfr/utilities/jfrAllocation.hpp"
+#include "oops/annotations.hpp"
+
+class InstanceKlass;
+class JavaThread;
+class Method;
+class ModuleEntry;
+class Symbol;
+
+//
+// Class that holds the configured filters.
+//
+// For information on how they are configured,
+// see jdk.jfr.internal.JVM::setMethodTraceFilters(...).
+//
+class JfrFilter : public JfrCHeapObj {
+  friend class JfrFilterManager;
+ private:
+  static constexpr int TIMING  = 1;
+  static constexpr int TRACING = 2;
+
+  Symbol** _class_names;
+  Symbol** _method_names;
+  Symbol** _annotation_names;
+  int*     _modifications;
+  int      _count;
+
+  JfrFilter(Symbol** class_names,
+            Symbol** method_names,
+            Symbol** annotation_names,
+            int* modifications,
+            int count);
+ public:
+  ~JfrFilter();
+  bool can_instrument_method(const Method* m) const;
+  bool can_instrument_class(const InstanceKlass* m) const;
+  bool can_instrument_module(const ModuleEntry* ik) const;
+  int class_modifications(const InstanceKlass* klass, bool log) const;
+  int method_modifications(const Method* method) const;
+  bool match(const InstanceKlass* klass) const;
+  bool match_annotations(const InstanceKlass* klass, AnnotationArray* annotation, const Symbol* symbol, bool log) const;
+  void log(const char* caption) const;
+
+  static constexpr int NONE = -1;
+  static bool is_timing(int modification);
+  static bool is_tracing(int modification);
+  static const char* modification_to_text(int modification);
+  static int combine_bits(int a, int b);
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTER_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.cpp
new file mode 100644
index 00000000000..00e6b8b6e2a
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.cpp
@@ -0,0 +1,144 @@
+/*
+* 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.
+*
+*/
+
+#include "jfr/jni/jfrJavaSupport.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
+#include "jfr/recorder/service/jfrOptionSet.hpp"
+#include "jfr/support/methodtracer/jfrFilter.hpp"
+#include "jfr/support/methodtracer/jfrFilterManager.hpp"
+#include "logging/log.hpp"
+#include "oops/symbol.hpp"
+#include "oops/typeArrayOop.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "utilities/growableArray.hpp"
+
+const JfrFilter* JfrFilterManager::_current = nullptr;
+
+// Track the set of previous filters during a chunk / epoch.
+static constexpr const int initial_array_size = 4;
+static GrowableArray<const JfrFilter*>* _previous_filters_epoch_0 = nullptr;
+static GrowableArray<const JfrFilter*>* _previous_filters_epoch_1 = nullptr;
+
+static GrowableArray<const JfrFilter*>* c_heap_allocate_array(int size = initial_array_size) {
+  return new (mtTracing) GrowableArray<const JfrFilter*>(size, mtTracing);
+}
+
+static GrowableArray<const JfrFilter*>* previous_filters_epoch_0() {
+  if (_previous_filters_epoch_0 == nullptr) {
+    _previous_filters_epoch_0 = c_heap_allocate_array(initial_array_size);
+  }
+  return _previous_filters_epoch_0;
+}
+
+static GrowableArray<const JfrFilter*>* previous_filters_epoch_1() {
+  if (_previous_filters_epoch_1 == nullptr) {
+    _previous_filters_epoch_1 = c_heap_allocate_array(initial_array_size);
+  }
+  return _previous_filters_epoch_1;
+}
+
+static GrowableArray<const JfrFilter*>* get_previous_filters(u1 epoch) {
+  return epoch == 0 ? previous_filters_epoch_0() : previous_filters_epoch_1();
+}
+
+static GrowableArray<const JfrFilter*>* get_previous_filters() {
+  return get_previous_filters(JfrTraceIdEpoch::current());
+}
+
+static GrowableArray<const JfrFilter*>* get_previous_filters_previous_epoch() {
+  return get_previous_filters(JfrTraceIdEpoch::previous());
+}
+
+static void add_previous_filter(const JfrFilter* previous_filter) {
+  if (previous_filter != nullptr) {
+    get_previous_filters()->append(previous_filter);
+  }
+}
+
+const JfrFilter* JfrFilterManager::current() {
+  return Atomic::load_acquire(&_current);
+}
+
+void JfrFilterManager::install(const JfrFilter* new_filter) {
+  assert(new_filter != nullptr, "invariant");
+  add_previous_filter(Atomic::xchg(&_current, new_filter));
+  new_filter->log("New filter installed");
+}
+
+static void delete_filters(GrowableArray<const JfrFilter*>* filters) {
+  assert(filters != nullptr, "invariant");
+  for (int i = 0; i < filters->length(); ++i) {
+    delete filters->at(i);
+  }
+  filters->clear();
+}
+
+void JfrFilterManager::clear_previous_filters() {
+  delete_filters(get_previous_filters_previous_epoch());
+}
+
+bool JfrFilterManager::install(jobjectArray classes, jobjectArray methods, jobjectArray annotations, jintArray modification_array, JavaThread* jt) {
+  assert(classes != nullptr, "invariant");
+  assert(methods != nullptr, "invariant");
+  assert(annotations != nullptr, "invariant");
+  assert(modification_array != nullptr, "invariant");
+
+  if (!JfrOptionSet::can_retransform()) {
+    log_info(jfr, methodtrace)("Flight Recorder retransform has been set to false. New method filter is ignored.");
+    return false;
+  }
+
+  intptr_t class_size = 0;
+  Symbol** class_names = JfrJavaSupport::symbol_array(classes, jt, &class_size, true);
+  assert(class_names != nullptr, "invariant");
+
+  intptr_t method_size = 0;
+  Symbol** method_names = JfrJavaSupport::symbol_array(methods, jt, &method_size, true);
+  assert(method_names != nullptr, "invariant");
+
+  intptr_t annotation_size = 0;
+  Symbol** annotation_names = JfrJavaSupport::symbol_array(annotations, jt, &annotation_size, true);
+  assert(annotation_names != nullptr, "invariant");
+
+  typeArrayOop ta = typeArrayOop(JfrJavaSupport::resolve_non_null(modification_array));
+  const typeArrayHandle modification_tah(jt, ta);
+  const int modification_size = modification_tah->length();
+  int* const modifications = NEW_C_HEAP_ARRAY(int, modification_size, mtTracing);
+  for (int i = 0; i < modification_size; i++) {
+    modifications[i] = modification_tah->int_at(i);
+  }
+  if (class_size != method_size || class_size != annotation_size || class_size != modification_size) {
+    FREE_C_HEAP_ARRAY(Symbol*, class_names);
+    FREE_C_HEAP_ARRAY(Symbol*, method_names);
+    FREE_C_HEAP_ARRAY(Symbol*, annotation_names);
+    FREE_C_HEAP_ARRAY(int, modifications);
+    JfrJavaSupport::throw_internal_error("Method array sizes don't match", jt);
+    return false;
+  }
+  const JfrFilter* const new_filter = new JfrFilter(class_names, method_names, annotation_names, modifications, modification_size);
+  assert(new_filter != nullptr, "invariant");
+  install(new_filter);
+  return true;
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.hpp
new file mode 100644
index 00000000000..904c8447a2e
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrFilterManager.hpp
@@ -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.
+*
+*/
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERMANAGER_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERMANAGER_HPP
+
+#include "jni.h"
+#include "jfr/utilities/jfrAllocation.hpp"
+
+class JfrFilter;
+class JavaThread;
+class Symbol;
+
+//
+// Class that manages memory for JfrFilter objects to ensure they
+// are not deleted until we have transitioned to the next epoch, which ensures
+// they are no longer in use.
+//
+class JfrFilterManager : public AllStatic {
+  friend class JfrMethodTracer;
+ private:
+  static const JfrFilter* _current;
+  static void install(const JfrFilter* filter);
+  static void clear_previous_filters();
+
+ public:
+  static const JfrFilter* current();
+  static bool install(jobjectArray classses,
+                      jobjectArray methods,
+                      jobjectArray annotations,
+                      jintArray modifications,
+                      JavaThread* jt);
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRFILTERMANAGER_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrInstrumentedClass.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrInstrumentedClass.hpp
new file mode 100644
index 00000000000..eb775581e1f
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrInstrumentedClass.hpp
@@ -0,0 +1,72 @@
+/*
+* 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_JFR_SUPPORT_METHODTRACER_JFRINSTRUMENTEDCLASS_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRINSTRUMENTEDCLASS_HPP
+
+#include "jfr/utilities/jfrTypes.hpp"
+
+class InstanceKlass;
+
+//
+// Class that holds classes that are currently being instrumented and
+// if the have been unloaded.
+//
+class JfrInstrumentedClass {
+ private:
+  traceid              _trace_id;
+  const InstanceKlass* _instance_klass;
+  bool                 _unloaded;
+
+ public:
+  JfrInstrumentedClass(traceid trace_id = 0, const InstanceKlass* instance_klass = nullptr, bool unloaded = false) :
+    _trace_id(trace_id), _instance_klass(instance_klass), _unloaded(unloaded) {
+  }
+
+  const InstanceKlass* instance_klass() const {
+    return _instance_klass;
+  }
+
+  traceid trace_id() const {
+    return _trace_id;
+  }
+
+  jlong trace_id_as_jlong() const {
+    return static_cast<jlong>(_trace_id);
+  }
+
+  void set_unloaded(bool unloaded) {
+    _unloaded = unloaded;
+  }
+
+  bool unloaded() const {
+    return _unloaded;
+  }
+
+  bool operator==(const JfrInstrumentedClass& rhs) {
+    return _trace_id == rhs._trace_id;
+  }
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRINSTRUMENTEDCLASS_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.cpp
new file mode 100644
index 00000000000..d3226729beb
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.cpp
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ *
+ */
+
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/methodtracer/jfrFilter.hpp"
+#include "jfr/support/methodtracer/jfrFilterManager.hpp"
+#include "jfr/support/methodtracer/jfrMethodProcessor.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+#include "logging/log.hpp"
+#include "oops/instanceKlass.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/growableArray.hpp"
+
+JfrMethodProcessor::JfrMethodProcessor(const InstanceKlass* ik, Thread* thread) :
+  _klass(ik),
+  _methods(nullptr),
+  _thread(thread),
+  _has_timing(false),
+  _log(log_is_enabled(Debug, jfr, methodtrace)) {
+    assert(ik != nullptr, "invariant");
+    assert(Thread::current() == thread, "invariant");
+    process();
+}
+
+JfrMethodProcessor::~JfrMethodProcessor() {
+  assert(_thread != nullptr, "invariant");
+  if (_methods != nullptr) {
+    // Removal of pushed metadata keep-alive entries.
+    for (int i = 0; i < _methods->length(); ++i) {
+      Method* const method = const_cast<Method*>(_methods->at(i).method());
+      if (method != nullptr) {
+        const int idx = _thread->metadata_handles()->find_from_end(method);
+        assert(idx >= 0, "invariant");
+        _thread->metadata_handles()->remove_at(idx);
+      }
+    }
+  }
+}
+
+void JfrMethodProcessor::update_methods(const InstanceKlass* ik) {
+  assert(ik != nullptr, "invariant");
+  assert(_methods != nullptr, "invariant");
+  const Array<Method*>* const ik_methods = ik->methods();
+  assert(ik_methods != nullptr, "invariant");
+  for (int i = 0; i < _methods->length(); ++i) {
+    const uint32_t idx = _methods->at(i).methods_array_index();
+    Method* const method = ik_methods->at(idx);
+    assert(method != nullptr, "invariant");
+    _methods->at(i).set_method(method);
+    // This is to keep the method from being unloaded during redefine / retransform.
+    // Equivalent functionality to that provided by the methodHandle. Unfortunately,
+    // we cannot use that directly because our handles would reside not on the stack
+    // but in an Arena managed by a thread-local ResourceArea, which is not allowed.
+    // Removal of pushed metadata entries happens in the destructor.
+    _thread->metadata_handles()->push(method);
+  }
+}
+
+void JfrMethodProcessor::set_timing(int modification) {
+  if (_has_timing) {
+    return;
+  }
+  if (modification > 0 && (modification & 1)) {
+    _has_timing = true;
+  }
+}
+
+
+static void log(const Method* method, traceid id, int new_modification) {
+  assert(method != nullptr, "invariant");
+  const char* timing = JfrFilter::is_timing(new_modification) ? "+timing" : "-timing";
+  const char* tracing = JfrFilter::is_tracing(new_modification) ? "+tracing" : "-tracing";
+  stringStream param_stream;
+  method->signature()->print_as_signature_external_parameters(&param_stream);
+  const char* param_string = param_stream.as_string();
+
+  stringStream ss;
+  ss.print("%s", method->method_holder()->external_name());
+  ss.print("::");
+  ss.print("%s", method->name()->as_C_string());
+  ss.print("(");
+  if (strlen(param_string) < 30) {
+    ss.print("%s", param_string);
+  } else {
+    ss.print("...");
+  }
+  ss.print(")");
+  log_debug(jfr, methodtrace)("Modify bytecode for %s %s %s (Method ID: " UINT64_FORMAT_X ")", ss.as_string(), timing, tracing, id);
+}
+
+void JfrMethodProcessor::process() {
+  const JfrFilter* const filter = JfrFilterManager::current();
+  assert(filter != nullptr, "invariant");
+  if (!filter->can_instrument_class(_klass)) {
+    return;
+  }
+  const int class_modifications = filter->class_modifications(_klass, false);
+  const Array<Method*>* const methods = _klass->methods();
+  const int method_count = methods->length();
+  for (int i = 0; i < method_count; i++) {
+    const Method* const m = methods->at(i);
+    assert(m != nullptr, "invariant");
+    if (filter->can_instrument_method(m)) {
+      const int new_modification = JfrFilter::combine_bits(class_modifications, filter->method_modifications(m));
+      if (new_modification != JfrFilter::NONE || JfrTraceId::has_sticky_bit(m)) {
+        // Allocate lazy, most classes will not match a filter
+        if (_methods == nullptr) {
+          _methods = new GrowableArray<JfrTracedMethod>();
+        }
+        set_timing(new_modification);
+        const int modification = new_modification == JfrFilter::NONE ? 0 : new_modification;
+        JfrTracedMethod traced_method(_klass, m, modification, i);
+        _methods->append(traced_method);
+        if (_log) {
+          log(m, traced_method.id(), modification);
+        }
+      }
+    }
+  }
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.hpp
new file mode 100644
index 00000000000..0f8d6a065c6
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrMethodProcessor.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODPROCESSOR_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODPROCESSOR_HPP
+
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
+#include "memory/allocation.hpp"
+
+class InstanceKlass;
+class JfrFilter;
+class Thread;
+
+template <typename> class GrowableArray;
+
+//
+// Class responsible for determining which methods in an InstanceKlass
+// that should be instrumented and tagged.
+//
+class JfrMethodProcessor: public StackObj {
+ private:
+  const InstanceKlass* const      _klass;
+  GrowableArray<JfrTracedMethod>* _methods;
+  Thread*                         _thread;
+  bool                            _has_timing;
+  bool                            _log;
+
+  void set_timing(int modification);
+  void process();
+
+ public:
+  JfrMethodProcessor(const InstanceKlass* klass, Thread* thread);
+  ~JfrMethodProcessor();
+
+  bool has_methods() const {
+    return _methods != nullptr;
+  }
+
+  const GrowableArray<JfrTracedMethod>* methods() const {
+    return _methods;
+  }
+
+  GrowableArray<JfrTracedMethod>* methods() {
+    return _methods;
+  }
+
+  void update_methods(const InstanceKlass* ik);
+
+  bool has_timing() const {
+    return _has_timing;
+  }
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODPROCESSOR_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.cpp
new file mode 100644
index 00000000000..73701445f70
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.cpp
@@ -0,0 +1,411 @@
+/*
+ * 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.
+ *
+ */
+
+#include "classfile/classFileParser.hpp"
+#include "classfile/classFileStream.hpp"
+#include "classfile/moduleEntry.hpp"
+#include "classfile/modules.hpp"
+#include "classfile/symbolTable.hpp"
+#include "jfr/instrumentation/jfrClassTransformer.hpp"
+#include "jfr/instrumentation/jfrJvmtiAgent.hpp"
+#include "jfr/jni/jfrJavaSupport.hpp"
+#include "jfr/jni/jfrUpcalls.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
+#include "jfr/support/jfrKlassUnloading.hpp"
+#include "jfr/support/methodtracer/jfrClassFilterClosure.hpp"
+#include "jfr/support/methodtracer/jfrFilter.hpp"
+#include "jfr/support/methodtracer/jfrFilterManager.hpp"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "jfr/support/methodtracer/jfrMethodProcessor.hpp"
+#include "jfr/support/methodtracer/jfrMethodTracer.hpp"
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
+#include "jfr/support/methodtracer/jfrTraceTagging.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/method.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/safepoint.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/resizeableResourceHash.hpp"
+
+ModuleEntry*                         JfrMethodTracer::_jdk_jfr_module = nullptr;
+GrowableArray<JfrInstrumentedClass>* JfrMethodTracer::_instrumented_classes = nullptr;
+GrowableArray<jlong>*                JfrMethodTracer::_timing_entries = nullptr;
+
+// Quick and unlocked check to see if the Method Tracer has been activated.
+// This is flipped to not null the first time a filter is set and will stay non-null forever.
+bool JfrMethodTracer::in_use() {
+  return JfrFilterManager::current() != nullptr;
+}
+
+static void clear(GrowableArray<JfrInstrumentedClass>* instrumented_classes) {
+  assert(instrumented_classes != nullptr, "invariant");
+  if (instrumented_classes->is_nonempty()) {
+    instrumented_classes->clear();
+    JfrTraceIdEpoch::reset_method_tracer_tag_state();
+  }
+}
+
+jlongArray JfrMethodTracer::set_filters(JNIEnv* env, jobjectArray classes, jobjectArray methods, jobjectArray annotations, jintArray modifications, TRAPS) {
+  assert(env != nullptr, "invariant");
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+
+  // This operation, if successful, atomically installs a JfrFilter object to represent all passed in filters.
+  if (!JfrFilterManager::install(classes, methods, annotations, modifications, THREAD)) {
+    return nullptr;
+  }
+
+  ResourceMark rm(THREAD);
+  JfrFilterClassClosure filter_class_closure(THREAD);
+  {
+    MutexLocker lock(ClassLoaderDataGraph_lock);
+    filter_class_closure.iterate_all_classes(instrumented_classes());
+    ::clear(instrumented_classes());
+  }
+  retransform(env, filter_class_closure, THREAD);
+  MutexLocker lock(ClassLoaderDataGraph_lock);
+  if (_timing_entries->is_empty()) {
+    return nullptr;
+  }
+  jlongArray array = JfrJavaSupport::create_long_array(_timing_entries, THREAD);
+  _timing_entries->clear();
+  return array;
+}
+
+class MirrorClosure {
+ private:
+  jclass* const _classes;
+  int _size;
+  int _idx;
+ public:
+  MirrorClosure(int size) : _classes(NEW_RESOURCE_ARRAY(jclass, size)), _size(size), _idx(0) {}
+
+  jclass* classes() const {
+    return _classes;
+  }
+
+  bool operator()(const traceid& key, const jclass& mirror) {
+    assert(_classes != nullptr, "invariant");
+    assert(_idx < _size, "invariant");
+    _classes[_idx++] = mirror;
+    return true;
+  }
+};
+
+void JfrMethodTracer::retransform(JNIEnv* env, const JfrFilterClassClosure& classes, TRAPS) {
+  log_debug(jfr, methodtrace)("Issuing Retransform Classes");
+  const int class_count = classes.number_of_classes();
+  if (class_count > 0) {
+    ThreadToNativeFromVM transition(THREAD);
+    const MirrorClosure closure(class_count);
+    classes.to_modify()->iterate_all(closure);
+    JfrJvmtiAgent::retransform_classes(env, closure.classes(), class_count, THREAD);
+  }
+}
+
+static void handle_no_bytecode_result(const Klass* klass) {
+  assert(klass != nullptr, "invariant");
+  if (JfrTraceId::has_sticky_bit(klass)) {
+    MutexLocker lock(ClassLoaderDataGraph_lock);
+    JfrTraceTagging::clear_sticky_bit(InstanceKlass::cast(klass));
+  }
+}
+
+void JfrMethodTracer::on_klass_creation(InstanceKlass*& ik, ClassFileParser& parser, TRAPS) {
+  assert(ik != nullptr, "invariant");
+  assert(in_use(), "invariant");
+
+  ResourceMark rm(THREAD);
+
+  // 1. Is the ik the initial load, i.e.the first InstanceKlass, or a scratch klass, denoting a redefine / retransform?
+  const Klass* const existing_klass = JfrClassTransformer::find_existing_klass(ik, THREAD);
+  const bool is_retransform = existing_klass != nullptr;
+
+  // 2. Test the ik and its methods against the currently installed filter object.
+  JfrMethodProcessor mp(is_retransform ? InstanceKlass::cast(existing_klass) : ik, THREAD);
+  if (!mp.has_methods()) {
+    return;
+  }
+
+  // 3. We matched one or serveral filters. Now construct a new bytecode representation with instrumented methods in accordance with matched instructions.
+  const ClassFileStream* clone = parser.clone_stream();
+  ClassFileStream* const result = JfrUpcalls::on_method_trace(ik, clone, mp.methods(), THREAD);
+  if (result == nullptr) {
+    // If no bytecode is returned, either an error occurred during transformation, but more
+    // likely the matched instructions were negative, i.e. instructions to remove existing instrumentation
+    // and so Java added no new instrumentation. By not returning a bytecode result, the klass is restored to its original, non-instrumented, version.
+    handle_no_bytecode_result(is_retransform ? InstanceKlass::cast(existing_klass) : ik);
+    return;
+  }
+  // 4. Now create a new InstanceKlass representation from the modified bytecode.
+  InstanceKlass* const new_ik = JfrClassTransformer::create_instance_klass(ik, result, !is_retransform, THREAD);
+  if (new_ik == nullptr) {
+    return;
+  }
+  // 5. Replace the passed in ik with the newly constructed, new_ik.
+  JfrClassTransformer::copy_traceid(ik, new_ik); // copy existing traceid
+  if (is_retransform) {
+    // Keep the original cached class file data from the existing class.
+    JfrClassTransformer::transfer_cached_class_file_data(ik, new_ik, parser, THREAD);
+    JfrClassTransformer::rewrite_klass_pointer(ik, new_ik, parser, THREAD); // The ik is modified to point to new_ik here.
+    const InstanceKlass* const existing_ik = InstanceKlass::cast(existing_klass);
+    mp.update_methods(existing_ik);
+    existing_ik->module()->add_read(jdk_jfr_module());
+    // By setting the sticky bit on the existng klass, we receive a callback into on_klass_redefinition (see below)
+    // when our new methods are installed into the existing klass as part of retransformation / redefinition.
+    // Only when we know our new methods have been installed can we add the klass to the instrumented list (done as part of callback).
+    JfrTraceTagging::install_sticky_bit_for_retransform_klass(existing_ik, mp.methods(), mp.has_timing());
+    return;
+  }
+  // Initial class load.
+  JfrClassTransformer::cache_class_file_data(new_ik, clone, THREAD); // save the initial class file bytes (clone stream)
+  JfrClassTransformer::rewrite_klass_pointer(ik, new_ik, parser, THREAD); // The ik is modified to point to new_ik here.
+  mp.update_methods(ik);
+  // On initial class load the newly created klass can be installed into the instrumented class list directly.
+  add_instrumented_class(ik, mp.methods());
+  if (mp.has_timing()) {
+    // After having installed the newly created klass into the list, perform an upcall to publish the associated TimedClass.
+    JfrUpcalls::publish_method_timers_for_klass(JfrTraceId::load_raw(ik), THREAD);
+  }
+}
+
+static inline void log_add(const InstanceKlass* ik) {
+  assert(ik != nullptr, "invariant");
+  if (log_is_enabled(Debug, jfr, methodtrace)) {
+    ResourceMark rm;
+    const traceid klass_id = JfrTraceId::load_raw(ik);
+    log_debug(jfr, methodtrace)("Adding class %s to instrumented list (Klass ID: " UINT64_FORMAT_X ")", ik->external_name(), klass_id);
+  }
+}
+
+void JfrMethodTracer::add_timing_entry(const InstanceKlass* ik, traceid klass_id) {
+  assert(ik != nullptr, "invariant");
+  assert(_timing_entries != nullptr, "invariant");
+  if (JfrTraceId::has_timing_bit(ik)) {
+    JfrTraceId::clear_timing_bit(ik);
+    _timing_entries->append(klass_id);
+  }
+}
+
+// At this point we have installed our new retransformed methods into the original klass, which is ik.
+// jvmtiRedefineClassses::redefine_single_class() has finished so we are still at a safepoint.
+// If the original klass is not already in the list, add it and also dynamically tag all
+// artifacts that have the sticky bit set. If the klass has an associated TimedClass,
+// also add the klass to the list of _timing_entries for publication.
+void JfrMethodTracer::on_klass_redefinition(const InstanceKlass* ik, Thread* thread) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invarint");
+  assert(ik->has_been_redefined(), "invariant");
+  assert(JfrTraceId::has_sticky_bit(ik), "invariant");
+  assert(in_use(), "invariant");
+  assert(SafepointSynchronize::is_at_safepoint(), "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+  const traceid klass_id = JfrTraceId::load_raw(ik);
+  const JfrInstrumentedClass jic(klass_id, ik, false);
+
+  if (instrumented_classes()->find(jic) == -1) { // not already existing
+    const int idx = instrumented_classes()->append(jic);
+    if (idx == 0) {
+      assert(!JfrTraceIdEpoch::has_method_tracer_changed_tag_state(), "invariant");
+      JfrTraceIdEpoch::set_method_tracer_tag_state();
+    }
+    add_timing_entry(ik, klass_id);
+    JfrTraceTagging::set_dynamic_tag_for_sticky_bit(ik);
+    log_add(ik);
+  }
+}
+
+#ifdef ASSERT
+static bool in_instrumented_list(const InstanceKlass* ik, const GrowableArray<JfrInstrumentedClass>* list) {
+  assert(ik != nullptr, "invariant");
+  assert(list != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  const JfrInstrumentedClass jic(JfrTraceId::load_raw(ik), ik, false);
+  return list->find(jic) != -1;
+}
+#endif
+
+void JfrMethodTracer::add_instrumented_class(InstanceKlass* ik, GrowableArray<JfrTracedMethod>* methods) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+  assert(methods->is_nonempty(), "invariant");
+  ik->module()->add_read(jdk_jfr_module());
+  MutexLocker lock(ClassLoaderDataGraph_lock);
+  assert(!in_instrumented_list(ik, instrumented_classes()), "invariant");
+  JfrTraceTagging::set_dynamic_tag(ik, methods);
+  JfrTraceTagging::set_sticky_bit(ik, methods);
+  const JfrInstrumentedClass jik(JfrTraceId::load_raw(ik), ik, false);
+  const int idx = instrumented_classes()->append(jik);
+  if (idx == 0) {
+    JfrTraceIdEpoch::set_method_tracer_tag_state();
+  }
+  assert(in_instrumented_list(ik, instrumented_classes()), "invariant");
+  log_add(ik);
+}
+
+ModuleEntry* JfrMethodTracer::jdk_jfr_module() {
+  if (_jdk_jfr_module == nullptr) {
+    MutexLocker ml(Module_lock);
+    ModuleEntryTable* const table = Modules::get_module_entry_table(Handle());
+    Symbol* jfr_module_name = SymbolTable::probe("jdk.jfr", 7);
+    assert(jfr_module_name != nullptr, "jdk.jfr name could not be found");
+    _jdk_jfr_module = table->lookup_only(jfr_module_name);
+    assert(_jdk_jfr_module != nullptr, "jdk.jfr module could not be found");
+  }
+  return _jdk_jfr_module;
+}
+
+// Track the set of unloaded class ids during a chunk / epoch.
+static GrowableArray<jlong>* _unloaded_class_ids_0 = nullptr;
+static GrowableArray<jlong>* _unloaded_class_ids_1 = nullptr;
+static GrowableArray<jlong>* _current_unloaded_class_ids = nullptr;
+static GrowableArray<jlong>* _stale_class_ids = nullptr;
+static GrowableArray<jlong>* _empty_class_ids = nullptr;
+
+jlongArray JfrMethodTracer::drain_stale_class_ids(TRAPS) {
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD);)
+  if (!in_use()) {
+    return nullptr;
+  }
+  MutexLocker lock(ClassLoaderDataGraph_lock);
+  assert(_stale_class_ids != nullptr, "invariant");
+  if (_stale_class_ids == _empty_class_ids) {
+    return nullptr;
+  }
+  assert(_stale_class_ids != _empty_class_ids, "invariant");
+  assert(_stale_class_ids->is_nonempty(), "invariant");
+  jlongArray array = JfrJavaSupport::create_long_array(_stale_class_ids, THREAD);
+  _stale_class_ids->clear();
+  assert(_stale_class_ids->is_empty(), "invariant");
+  _stale_class_ids = _empty_class_ids;
+  return array;
+}
+
+static constexpr const int initial_array_size = 256;
+
+static GrowableArray<jlong>* c_heap_allocate_array(int size = initial_array_size) {
+  return new (mtTracing) GrowableArray<jlong>(size, mtTracing);
+}
+
+static GrowableArray<jlong>* unloaded_class_ids_0() {
+  if (_unloaded_class_ids_0 == nullptr) {
+    _unloaded_class_ids_0 = c_heap_allocate_array(initial_array_size);
+  }
+  return _unloaded_class_ids_0;
+}
+
+static GrowableArray<jlong>* unloaded_class_ids_1() {
+  if (_unloaded_class_ids_1 == nullptr) {
+    _unloaded_class_ids_1 = c_heap_allocate_array(initial_array_size);
+  }
+  return _unloaded_class_ids_1;
+}
+
+GrowableArray<JfrInstrumentedClass>* JfrMethodTracer::instrumented_classes() {
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  if (_instrumented_classes == nullptr) {
+    _instrumented_classes = new (mtTracing) GrowableArray<JfrInstrumentedClass>(256, mtTracing);
+    _empty_class_ids = new (mtTracing) GrowableArray<jlong>(0, mtTracing);
+    _stale_class_ids = _empty_class_ids;
+    _current_unloaded_class_ids = unloaded_class_ids_0();
+    _timing_entries = new (mtTracing) GrowableArray<jlong>(256, mtTracing);
+  }
+  return _instrumented_classes;
+}
+
+// Invoked from JfrTypeSet on class unloading of sticky bit-tagged classes.
+void JfrMethodTracer::add_to_unloaded_set(const Klass* k) {
+  assert(k != nullptr, "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  assert(JfrTraceId::has_sticky_bit(k), "invariant");
+  assert(_current_unloaded_class_ids != nullptr, "invariant");
+  assert(_current_unloaded_class_ids->find(JfrTraceId::load_raw(k)) == -1, "invariant");
+  _current_unloaded_class_ids->append(static_cast<jlong>(JfrTraceId::load_raw(k)));
+}
+
+// Invoked from JfrTypeSet after having finalized rotation.
+void JfrMethodTracer::trim_instrumented_classes(bool trim) {
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+  if (trim) {
+    GrowableArray<JfrInstrumentedClass>* trimmed_classes = new (mtTracing) GrowableArray<JfrInstrumentedClass>(256, mtTracing);
+    for (int i = 0; i < _instrumented_classes->length(); i++) {
+      const JfrInstrumentedClass& jic = _instrumented_classes->at(i);
+      if (jic.unloaded()) {
+        assert(JfrKlassUnloading::is_unloaded(jic.trace_id(), true), "invariant");
+        assert(_stale_class_ids->find(jic.trace_id()) != -1 || _current_unloaded_class_ids->find(jic.trace_id()) != -1, "invariant");
+        continue;
+      }
+      trimmed_classes->append(jic);
+    }
+    delete _instrumented_classes;
+    _instrumented_classes = trimmed_classes;
+  }
+
+  if (instrumented_classes()->is_nonempty()) {
+    if (!JfrTraceIdEpoch::has_method_tracer_changed_tag_state()) {
+      // Turn the tag state back on for next chunk.
+      JfrTraceIdEpoch::set_method_tracer_tag_state();
+    }
+  }
+
+  // Clearing out filters that were used during the previous epoch.
+  JfrFilterManager::clear_previous_filters();
+
+  // Tracking unloading of sticky bit-tagged classes.
+  //
+  // We want to delay publishing an unloaded class until the very last moment.
+  // Because of our tagging scheme, writing events for classes that have unloaded
+  // is okay under the invariant that events are written in the same epoch during
+  // which the class unloaded. We save classes that unloaded during an epoch and
+  // publish them upon epoch rotation.
+  //
+  // Precautions are necessary because of complexities involving physical recording start/stop,
+  // where we must be careful not to rotate away saved unloaded class IDs before they have been drained.
+  if (_stale_class_ids == _empty_class_ids) {
+    if (_current_unloaded_class_ids->is_nonempty()) {
+      // Since we have rotated, we publicize the list of classes unloaded during the previous epoch.
+      log_debug(jfr, methodtrace)("Since we have rotated, we publicize the list of classes unloaded during the previous epoch.");
+      _stale_class_ids = _current_unloaded_class_ids;
+      // Rotating the sets for tracking the unloaded class ids.
+      _current_unloaded_class_ids = _current_unloaded_class_ids == unloaded_class_ids_0() ? unloaded_class_ids_1() : unloaded_class_ids_0();
+    }
+    return;
+  }
+
+  // The previously published unloaded classes are yet to be drained.
+  // Most likely because we are now starting a new physical recording.
+  // Move over all newly unloaded class IDs to make them available for drainage.
+  assert(_stale_class_ids != _current_unloaded_class_ids, "invariant");
+  if (_current_unloaded_class_ids->is_nonempty()) {
+    log_debug(jfr, methodtrace)("Appending unloaded classes during the previous epoch.");
+    _stale_class_ids->appendAll(_current_unloaded_class_ids);
+    _current_unloaded_class_ids->clear();
+  }
+  assert(_current_unloaded_class_ids->is_empty(), "invariant");
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.hpp
new file mode 100644
index 00000000000..1c44a93fcb2
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrMethodTracer.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODTRACER_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODTRACER_HPP
+
+#include "jni.h"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+#include "memory/allocation.hpp"
+
+class ClassFileParser;
+class InstanceKlass;
+class JavaThread;
+class JfrFilterClassClosure;
+class Klass;
+class ModuleEntry;
+
+template <typename E> class GrowableArray;
+
+//
+// Class responsible for installing and evaluating filters, collecting methods to
+// be instrumented and calling Java to create the appropriate bytecode.
+///
+class JfrMethodTracer: AllStatic {
+ private:
+  static ModuleEntry*                         _jdk_jfr_module;          // Guarded by Module_lock
+  static GrowableArray<JfrInstrumentedClass>* _instrumented_classes;    // Guarded by ClassLoaderDataGraph_lock
+  static GrowableArray<jlong>*                _timing_entries;          // Guarded by ClassLoaderDataGraph_lock
+
+  static ModuleEntry* jdk_jfr_module();
+  static void add_timing_entry(const InstanceKlass* ik, traceid klass_id);
+  static void retransform(JNIEnv* env, const JfrFilterClassClosure& classes, TRAPS);
+  static void add_instrumented_class(InstanceKlass* ik, GrowableArray<JfrTracedMethod>* methods);
+
+ public:
+  static bool in_use();
+  static jlongArray drain_stale_class_ids(TRAPS);
+  static void add_to_unloaded_set(const Klass* k);
+  static void trim_instrumented_classes(bool trim);
+  static GrowableArray<JfrInstrumentedClass>* instrumented_classes();
+  static void on_klass_redefinition(const InstanceKlass* ik, Thread* thread);
+  static void on_klass_creation(InstanceKlass*& ik, ClassFileParser& parser, TRAPS);
+  static jlongArray set_filters(JNIEnv* env,
+                                jobjectArray classes,
+                                jobjectArray methods,
+                                jobjectArray annotations,
+                                jintArray modifications,
+                                TRAPS);
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRMETHODTRACER_HPP
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.cpp
new file mode 100644
index 00000000000..e5018212768
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.cpp
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ *
+ */
+
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
+#include "jfr/support/methodtracer/jfrInstrumentedClass.hpp"
+#include "jfr/support/methodtracer/jfrTraceTagging.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/method.hpp"
+#include "utilities/growableArray.hpp"
+
+void JfrTraceTagging::tag_dynamic(const InstanceKlass* ik) {
+  JfrTraceIdLoadBarrier::load_barrier(ik);
+}
+
+void JfrTraceTagging::tag_dynamic(const Method* method) {
+  JfrTraceId::load_no_enqueue(method);
+}
+
+void JfrTraceTagging::tag_dynamic(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods) {
+  assert(ik != nullptr, "invariant");
+  assert(methods != nullptr, "invariant");
+
+  for (int i = 0; i < methods->length(); ++i) {
+    const Method* const method = methods->at(i).method();
+    assert(method != nullptr, "invariant");
+    if (!method->is_old()) {
+      tag_dynamic(method);
+      continue;
+    }
+    // A redefinition / retransformation interleaved.
+    // Find and tag the latest version of the method.
+    tag_dynamic(ik->method_with_orig_idnum(method->orig_method_idnum()));
+  }
+}
+
+void JfrTraceTagging::set_dynamic_tag(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+
+  tag_dynamic(ik, methods);
+  tag_dynamic(ik);
+}
+
+void JfrTraceTagging::set_dynamic_tag_for_sticky_bit(const InstanceKlass* ik) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+  assert(JfrTraceId::has_sticky_bit(ik), "invariant");
+
+  const int length = ik->methods()->length();
+  for (int i = 0; i < length; ++i) {
+    const Method* const m = ik->methods()->at(i);
+    if (JfrTraceId::has_sticky_bit(m)) {
+      tag_dynamic(m);
+    }
+  }
+  tag_dynamic(ik);
+}
+
+void JfrTraceTagging::tag_sticky(const InstanceKlass* ik) {
+  JfrTraceId::set_sticky_bit(ik);
+}
+
+void JfrTraceTagging::tag_sticky(const Method* method) {
+  JfrTraceId::set_sticky_bit(method);
+}
+
+void JfrTraceTagging::tag_sticky(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods) {
+  assert(ik != nullptr, "invariant");
+  assert(methods != nullptr, "invariant");
+
+  for (int i = 0; i < methods->length(); ++i) {
+    const Method* const method = methods->at(i).method();
+    assert(method != nullptr, "invariant");
+    if (!method->is_old()) {
+      tag_sticky(method);
+      continue;
+    }
+    // A redefinition / retransformation interleaved.
+    // Find and tag the latest version of the method.
+    tag_sticky(ik->method_with_orig_idnum(method->orig_method_idnum()));
+  }
+}
+
+void JfrTraceTagging::tag_timing(const InstanceKlass* ik) {
+  JfrTraceId::set_timing_bit(ik);
+}
+
+void JfrTraceTagging::install_sticky_bit_for_retransform_klass(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods, bool timing) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+
+  MutexLocker lock(ClassLoaderDataGraph_lock);
+  if (JfrTraceId::has_sticky_bit(ik)) {
+    clear_sticky_bit(ik);
+  }
+  tag_sticky(ik, methods);
+  tag_sticky(ik);
+  if (timing) {
+    tag_timing(ik);
+  }
+}
+
+void JfrTraceTagging::set_sticky_bit(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+  tag_sticky(ik, methods);
+  tag_sticky(ik);
+}
+
+void JfrTraceTagging::clear_sticky_bit(const InstanceKlass* ik, bool dynamic_tag /* true */) {
+  assert(ik != nullptr, "invariant");
+  assert(!ik->is_scratch_class(), "invariant");
+  assert(JfrTraceId::has_sticky_bit(ik), "invariant");
+  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
+
+  const Array<Method*>* const methods = ik->methods();
+  assert(methods != nullptr, "invariant");
+  const int length = methods->length();
+  for (int i = 0; i < length; ++i) {
+    const Method* const m = methods->at(i);
+    if (JfrTraceId::has_sticky_bit(m)) {
+      if (dynamic_tag) {
+        tag_dynamic(m);
+      }
+      JfrTraceId::clear_sticky_bit(m);
+    }
+  }
+  if (dynamic_tag) {
+    tag_dynamic(ik);
+  }
+  JfrTraceId::clear_sticky_bit(ik);
+  if (JfrTraceId::has_timing_bit(ik)) {
+    JfrTraceId::clear_timing_bit(ik);
+  }
+  assert(!JfrTraceId::has_timing_bit(ik), "invariant");
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.hpp
new file mode 100644
index 00000000000..d2aa6f8bb04
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrTraceTagging.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_SUPPORT_METHODTRACER_JFRTRACETAGGING_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRTRACETAGGING_HPP
+
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
+#include "memory/allStatic.hpp"
+
+class InstanceKlass;
+class Method;
+
+template <typename E> class GrowableArray;
+
+//
+// Class responsible for setting setting sticky, epoch, and timing bits.
+//
+class JfrTraceTagging : AllStatic {
+ private:
+  static void tag_dynamic(const InstanceKlass* ik);
+  static void tag_dynamic(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods);
+  static void tag_dynamic(const Method* method);
+  static void tag_sticky(const InstanceKlass* ik);
+  static void tag_sticky(const Method* method);
+  static void tag_sticky(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods);
+  static void tag_timing(const InstanceKlass* ik);
+ public:
+  static void set_dynamic_tag(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods);
+  static void set_dynamic_tag_for_sticky_bit(const InstanceKlass* ik);
+  static void install_sticky_bit_for_retransform_klass(const InstanceKlass* existing_klass, const GrowableArray<JfrTracedMethod>* methods, bool timing);
+  static void set_sticky_bit(const InstanceKlass* ik, const GrowableArray<JfrTracedMethod>* methods);
+  static void clear_sticky_bit(const InstanceKlass* ik, bool dynamic_tag = true);
+};
+
+#endif /* SHARE_JFR_SUPPORT_METHODTRACER_JFRTRACETAGGING_HPP */
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.cpp b/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.cpp
new file mode 100644
index 00000000000..e6580c9b423
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.cpp
@@ -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.
+ *
+ */
+
+#include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
+#include "jfr/support/methodtracer/jfrTracedMethod.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/method.hpp"
+
+JfrTracedMethod::JfrTracedMethod() :
+  _id(0), _name(nullptr), _signature(nullptr),
+  _method(nullptr), _modification(0), _methods_array_index(0) {
+}
+
+JfrTracedMethod::JfrTracedMethod(const InstanceKlass* ik,
+                                 const Method* method,
+                                 int32_t modification,
+                                 int32_t methods_array_index) :
+  _id(JfrTraceId::load_raw(ik, method)), _name(method->name()),
+  _signature(method->signature()), _method(nullptr),
+  _modification(modification), _methods_array_index(methods_array_index) {
+  assert(_method == nullptr, "invariant");
+}
+
+void JfrTracedMethod::set_method(const Method* method) {
+  assert(method != nullptr, "invariant");
+  assert(JfrTraceId::load_raw(method) == _id, "invariant");
+  assert(_method == nullptr, "invariant");
+  _method = method;
+}
diff --git a/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.hpp b/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.hpp
new file mode 100644
index 00000000000..2c789c8f4fa
--- /dev/null
+++ b/src/hotspot/share/jfr/support/methodtracer/jfrTracedMethod.hpp
@@ -0,0 +1,81 @@
+/*
+ * 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_JFR_SUPPORT_METHODTRACER_JFRTRACEDMETHOD_HPP
+#define SHARE_JFR_SUPPORT_METHODTRACER_JFRTRACEDMETHOD_HPP
+
+#include "jfr/utilities/jfrTypes.hpp"
+
+class InstanceKlass;
+class Method;
+class Symbol;
+
+//
+// Method that has been filtered out for tracing,
+// may or may not yet be instrumented.
+//
+class JfrTracedMethod {
+ private:
+  traceid       _id;
+  const Symbol* _name;
+  const Symbol* _signature;
+  const Method* _method;
+  int32_t       _modification;
+  int32_t       _methods_array_index;
+
+ public:
+  JfrTracedMethod();
+  JfrTracedMethod(const InstanceKlass* ik,
+                  const Method* method,
+                  int32_t modification,
+                  int32_t methods_array_index);
+
+  traceid id() const {
+    return _id;
+  }
+
+  const Symbol* name() const {
+    return _name;
+  }
+
+  const Symbol* signature() const {
+    return _signature;
+  }
+
+  const Method* method() const {
+    return _method;
+  }
+
+  void set_method(const Method* method);
+
+  int32_t modification() const {
+    return _modification;
+  }
+
+  int32_t methods_array_index() const {
+    return _methods_array_index;
+  }
+};
+
+#endif // SHARE_JFR_SUPPORT_METHODTRACER_JFRTRACEDMETHOD_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
index 70404d22e3f..034f5d20474 100644
--- a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
@@ -62,7 +62,8 @@
   JFR_LOG_TAG(jfr, event) \
   JFR_LOG_TAG(jfr, setting) \
   JFR_LOG_TAG(jfr, dcmd) \
-  JFR_LOG_TAG(jfr, start)
+  JFR_LOG_TAG(jfr, start) \
+  JFR_LOG_TAG(jfr, methodtrace)
   /* NEW TAGS, DONT FORGET TO UPDATE JAVA SIDE */
 
 #endif // SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
diff --git a/src/hotspot/share/jfr/utilities/jfrRelation.hpp b/src/hotspot/share/jfr/utilities/jfrRelation.hpp
index a6a15181d1e..9c7dce3d451 100644
--- a/src/hotspot/share/jfr/utilities/jfrRelation.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrRelation.hpp
@@ -32,6 +32,10 @@ inline int compare_traceid(const traceid& lhs, const traceid& rhs) {
   return lhs > rhs ? 1 : (lhs < rhs) ? -1 : 0;
 }
 
+inline bool equals_traceid(const traceid& lhs, const traceid& rhs) {
+  return lhs == rhs;
+}
+
 inline int sort_traceid(traceid* lhs, traceid* rhs) {
   return compare_traceid(*lhs, *rhs);
 }
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index 8133b4642c0..34927a9b613 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.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
@@ -127,6 +127,7 @@ class outputStream;
   LOG_TAG(metaspace) \
   LOG_TAG(methodcomparator) \
   LOG_TAG(methodhandles) \
+  LOG_TAG(methodtrace) \
   LOG_TAG(mirror) \
   LOG_TAG(mmu) \
   LOG_TAG(module) \
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index fa6509a4422..b3d896b6863 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2960,8 +2960,8 @@ void InstanceKlass::set_minor_version(u2 minor_version) { _constants->set_minor_
 u2 InstanceKlass::major_version() const                 { return _constants->major_version(); }
 void InstanceKlass::set_major_version(u2 major_version) { _constants->set_major_version(major_version); }
 
-InstanceKlass* InstanceKlass::get_klass_version(int version) {
-  for (InstanceKlass* ik = this; ik != nullptr; ik = ik->previous_versions()) {
+const InstanceKlass* InstanceKlass::get_klass_version(int version) const {
+  for (const InstanceKlass* ik = this; ik != nullptr; ik = ik->previous_versions()) {
     if (ik->constants()->version() == version) {
       return ik;
     }
@@ -4459,7 +4459,7 @@ void InstanceKlass::add_previous_version(InstanceKlass* scratch_class,
 
 #endif // INCLUDE_JVMTI
 
-Method* InstanceKlass::method_with_idnum(int idnum) {
+Method* InstanceKlass::method_with_idnum(int idnum) const {
   Method* m = nullptr;
   if (idnum < methods()->length()) {
     m = methods()->at(idnum);
@@ -4478,7 +4478,7 @@ Method* InstanceKlass::method_with_idnum(int idnum) {
 }
 
 
-Method* InstanceKlass::method_with_orig_idnum(int idnum) {
+Method* InstanceKlass::method_with_orig_idnum(int idnum) const {
   if (idnum >= methods()->length()) {
     return nullptr;
   }
@@ -4498,13 +4498,12 @@ Method* InstanceKlass::method_with_orig_idnum(int idnum) {
 }
 
 
-Method* InstanceKlass::method_with_orig_idnum(int idnum, int version) {
-  InstanceKlass* holder = get_klass_version(version);
+Method* InstanceKlass::method_with_orig_idnum(int idnum, int version) const {
+  const InstanceKlass* holder = get_klass_version(version);
   if (holder == nullptr) {
     return nullptr; // The version of klass is gone, no method is found
   }
-  Method* method = holder->method_with_orig_idnum(idnum);
-  return method;
+  return holder->method_with_orig_idnum(idnum);
 }
 
 #if INCLUDE_JVMTI
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index e906d951a07..078c5b81841 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -349,9 +349,9 @@ class InstanceKlass: public Klass {
   // methods
   Array<Method*>* methods() const          { return _methods; }
   void set_methods(Array<Method*>* a)      { _methods = a; }
-  Method* method_with_idnum(int idnum);
-  Method* method_with_orig_idnum(int idnum);
-  Method* method_with_orig_idnum(int idnum, int version);
+  Method* method_with_idnum(int idnum) const;
+  Method* method_with_orig_idnum(int idnum) const;
+  Method* method_with_orig_idnum(int idnum, int version) const;
 
   // method ordering
   Array<int>* method_ordering() const     { return _method_ordering; }
@@ -688,7 +688,7 @@ class InstanceKlass: public Klass {
   InstanceKlass* previous_versions() const { return nullptr; }
 #endif
 
-  InstanceKlass* get_klass_version(int version);
+  const InstanceKlass* get_klass_version(int version) const;
 
   bool has_been_redefined() const { return _misc_flags.has_been_redefined(); }
   void set_has_been_redefined() { _misc_flags.set_has_been_redefined(true); }
diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index 33ae15fd805..af9d973d2f1 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -4386,6 +4386,8 @@ void VM_RedefineClasses::redefine_single_class(Thread* current, jclass the_jclas
   // keep track of previous versions of this class
   the_class->add_previous_version(scratch_class, emcp_method_count);
 
+  JFR_ONLY(ON_KLASS_REDEFINITION(the_class, current);)
+
   _timer_rsc_phase1.stop();
   if (log_is_enabled(Info, redefine, class, timer)) {
     _timer_rsc_phase2.start();
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
new file mode 100644
index 00000000000..3eb3116db55
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
@@ -0,0 +1,62 @@
+/*
+ * 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.events;
+
+import jdk.jfr.Category;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.Timespan;
+import jdk.jfr.internal.RemoveFields;
+
+@Name("jdk.MethodTiming")
+@Label("Method Timing")
+@Category({ "Java Virtual Machine", "Method Tracing" })
+@RemoveFields({ "duration", "eventThread", "stackTrace" })
+public final class MethodTimingEvent extends AbstractJDKEvent {
+
+    @Label("Method")
+    public long method;
+
+    @Label("Invocations")
+    public long invocations;
+
+    @Label("Average Time")
+    @Timespan
+    public long average;
+
+    public static void commit(long start, long method, long invocations, long average) {
+        // Generated by JFR
+    }
+
+    public static long timestamp() {
+        // Generated by JFR
+        return 0;
+    }
+
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java
new file mode 100644
index 00000000000..b76c6c41738
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jfr.events;
+
+import jdk.jfr.Category;
+import jdk.jfr.Label;
+import jdk.jfr.Name;
+import jdk.jfr.StackTrace;
+
+@Name("jdk.MethodTrace")
+@Label("Method Trace")
+@Category({ "Java Virtual Machine", "Method Tracing" })
+@StackTrace(true)
+public final class MethodTraceEvent extends AbstractJDKEvent {
+
+    @Label("Method")
+    private long method;
+
+    public static void commit(long start, long duration, long method) {
+        // Generated by JFR
+    }
+
+    public static long timestamp() {
+        // Generated by JFR
+        return 0;
+    }
+
+    public static boolean enabled() {
+        // Generated by JFR
+        return false;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 50823951152..f43e45b724e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -49,10 +49,12 @@
 import jdk.jfr.internal.settings.CutoffSetting;
 import jdk.jfr.internal.settings.EnabledSetting;
 import jdk.jfr.internal.settings.LevelSetting;
+import jdk.jfr.internal.settings.MethodSetting;
 import jdk.jfr.internal.settings.PeriodSetting;
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 import jdk.jfr.internal.settings.ThrottleSetting;
+import jdk.jfr.internal.tracing.Modification;
 import jdk.jfr.internal.util.Utils;
 
 // This class can't have a hard reference from PlatformEventType, since it
@@ -70,6 +72,7 @@ record NamedControl(String name, Control control) {
     private static final Type TYPE_THROTTLE = TypeLibrary.createType(ThrottleSetting.class);
     private static final long STACK_FILTER_ID = Type.getTypeId(StackFilter.class);
     private static final Type TYPE_LEVEL = TypeLibrary.createType(LevelSetting.class);
+    private static final Type TYPE_METHOD_FILTER = TypeLibrary.createType(MethodSetting.class);
 
     private final ArrayList<SettingControl> settingControls = new ArrayList<>();
     private final ArrayList<NamedControl> namedControls = new ArrayList<>(5);
@@ -95,6 +98,10 @@ record NamedControl(String name, Control control) {
         if (eventType.hasLevel()) {
             addControl(Level.NAME, defineLevel(eventType));
         }
+        if (eventType.getModification() != Modification.NONE) {
+            addControl("filter", defineMethodFilter(eventType, eventType.getModification()));
+        }
+
         addControl(Enabled.NAME, defineEnabled(eventType));
 
         addStackFilters(eventType);
@@ -335,11 +342,23 @@ private static Control definePeriod(PlatformEventType type) {
         return new Control(new PeriodSetting(type, def), def);
     }
 
+    private Control defineMethodFilter(PlatformEventType type, Modification modification) {
+        String def = "";
+        type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_METHOD_FILTER, "filter", def, Collections.emptyList()));
+        return new Control(new MethodSetting(type, modification, def), def);
+    }
+
     void disable() {
         for (NamedControl nc : namedControls) {
             if (nc.control.isType(EnabledSetting.class)) {
                 nc.control.setValue("false");
                 return;
+            } else {
+                String v = nc.control.getDefaultValue();
+                // Avoids slow retransformation during shutdown
+                if (v != null && !PlatformRecorder.isInShutDown()) {
+                    nc.control.setValue(v);
+                }
             }
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
index f0b7dcc2bf2..a28f1fdd41f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JDKEvents.java
@@ -42,7 +42,11 @@
 import jdk.jfr.events.ContainerMemoryUsageEvent;
 import jdk.jfr.events.DirectBufferStatisticsEvent;
 import jdk.jfr.events.InitialSecurityPropertyEvent;
+import jdk.jfr.events.MethodTimingEvent;
+import jdk.jfr.events.MethodTraceEvent;
 import jdk.jfr.internal.periodic.PeriodicEvents;
+import jdk.jfr.internal.tracing.PlatformTracer;
+import jdk.jfr.tracing.MethodTracer;
 
 public final class JDKEvents {
 
@@ -73,6 +77,8 @@ public final class JDKEvents {
         jdk.internal.event.X509ValidationEvent.class,
         DirectBufferStatisticsEvent.class,
         InitialSecurityPropertyEvent.class,
+        MethodTraceEvent.class,
+        MethodTimingEvent.class,
     };
 
     private static final Runnable emitExceptionStatistics = JDKEvents::emitExceptionStatistics;
@@ -83,6 +89,7 @@ public final class JDKEvents {
     private static final Runnable emitContainerMemoryUsage = JDKEvents::emitContainerMemoryUsage;
     private static final Runnable emitContainerIOUsage = JDKEvents::emitContainerIOUsage;
     private static final Runnable emitInitialSecurityProperties = JDKEvents::emitInitialSecurityProperties;
+    private static final Runnable emitMethodTiming = JDKEvents::emitMethodTiming;
     private static Metrics containerMetrics = null;
     private static boolean initializationTriggered;
 
@@ -96,6 +103,7 @@ public static synchronized void initialize() {
                 PeriodicEvents.addJavaEvent(jdk.internal.event.ExceptionStatisticsEvent.class, emitExceptionStatistics);
                 PeriodicEvents.addJavaEvent(DirectBufferStatisticsEvent.class, emitDirectBufferStatistics);
                 PeriodicEvents.addJavaEvent(InitialSecurityPropertyEvent.class, emitInitialSecurityProperties);
+                PeriodicEvents.addJavaEvent(MethodTimingEvent.class, emitMethodTiming);
 
                 initializeContainerEvents();
                 JFRTracing.enable();
@@ -200,6 +208,7 @@ public static void remove() {
         PeriodicEvents.removeEvent(emitExceptionStatistics);
         PeriodicEvents.removeEvent(emitDirectBufferStatistics);
         PeriodicEvents.removeEvent(emitInitialSecurityProperties);
+        PeriodicEvents.removeEvent(emitMethodTiming);
 
         PeriodicEvents.removeEvent(emitContainerConfiguration);
         PeriodicEvents.removeEvent(emitContainerCPUUsage);
@@ -224,4 +233,10 @@ private static void emitInitialSecurityProperties() {
             }
         }
     }
+
+    private static void emitMethodTiming() {
+        if (MethodTimingEvent.enabled()) {
+            PlatformTracer.emitTiming();
+        }
+    }
 }
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 1c6859990db..e0eaef74b4c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.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
@@ -682,4 +682,68 @@ public final class JVM {
      * @return {@code true} if this is a product build, {@code false} otherwise.
      */
     public static native boolean isProduct();
+
+    /**
+     * Sets method tracing filters.
+     *
+     * A filter can be a class, a method, or an annotation.
+     *
+     * For example, the following three filters:
+     * <ul>
+     * <li>Method timing on all methods in class com.foo.Bar</li>
+     * <li>Method tracing on the method com.foo.Bar::baz</li>
+     * <li>Method timing and tracing on all methods or classes with the annotation @com.foo.Foo</li>
+     * </ul>
+     * can be set using the following code:
+     * <pre>
+     * String[] classes = new String[3];
+     * classes[0] = "com/foo/Bar";
+     * classes[1] = "com/foo/Bar";
+     * classes[2] = null;
+     *
+     * String[] methods = new String[3];
+     * methods[0] = null;
+     * methods[1] = "baz";
+     * methods[2] = null;
+     *
+     * String[] annotations = new String[3];
+     * annotations[0] = null;
+     * annotations[1] = null;
+     * annotations[2] = "com/foo/Foo";
+     *
+     * int[] modifications = new int[3];
+     * modifications[0] = 1; // filter should apply to timing
+     * modifications[1] = 2; // filter should apply to tracing
+     * modifications[2] = 1 | 2; // filter should apply to both timing and tracing
+     *
+     * JVM.setMethodTraceFilters(classes, methods, annotations, modifications);
+     * </pre>
+     * The filter will be applied to currently and future loaded classes.
+     * <p>
+     * If a method is overloaded, the filter matches against all methods. It's not possible
+     * to match specific method parameters or annotation values.
+     * <p>
+     * Only one type of a filter - class, method, or annotation - can be used per array index.
+     * <p>
+     * If the filter is matched, JVMUpcalls::onMethodTrace will be invoked with
+     * the bytecode. If a filter is replaced, and method no longer requires instrumentation,
+     * the method will also be called with modification = 0;
+     *
+     * @param classes, not {@code null}, array of class names
+     * @param methods, not {@code null}, array of method names
+     * @param annotations, not {@code null}, array of annotation names
+     * @param modifications, not {@code null}, array of modification flags
+     * @return the published IDs, or null if no classes has been published.
+     */
+    public static native long[] setMethodTraceFilters(
+            String[] classes,
+            String[] methods,
+            String[] annotations,
+            int[] modification);
+    /**
+     * Returns IDs for method-traced classes that have been unloaded.
+     *
+     * @return the unloaded IDs, or null if no unloading has occurred.
+     */
+    public static native long[] drainStaleMethodTracerIds();
 }
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 18b76cc3ff9..a82f47cac55 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
@@ -25,10 +25,11 @@
 package jdk.jfr.internal;
 
 import java.lang.reflect.Modifier;
-
 import jdk.jfr.internal.event.EventConfiguration;
 import jdk.jfr.internal.util.Bytecode;
 import jdk.jfr.internal.util.Utils;
+import jdk.jfr.internal.tracing.PlatformTracer;
+
 /**
  * All upcalls from the JVM should go through this class.
  *
@@ -159,4 +160,35 @@ static Thread createRecorderThread(ThreadGroup systemThreadGroup, ClassLoader co
         thread.setContextClassLoader(contextClassLoader);
         return thread;
     }
+
+    /**
+     * Called by the JVM to update method tracing instrumentation.
+     * <p>
+     * @param module the module the class belongs to
+     * @param classLoader the class loader the class is being loaded for
+     * @param className the internal class name, i.e. java/lang/String.
+     * @param bytecode the bytecode to modify
+     * @param methodIds the method IDs
+     * @param names constant pool indices of method names
+     * @param signatures constant pool indices of method signatures
+     * @param modifications integer mask describing the modification
+     *
+     * @return the instrumented bytecode, or null if the class can't or shouldn't be modified.
+     */
+    public static byte[] onMethodTrace(Module module, ClassLoader classLoader, String className,
+                                       byte[] bytecode, long[] methodIds, String[] names, String[] signatures,
+                                       int[] modifications) {
+        return PlatformTracer.onMethodTrace(module, classLoader, className,
+                                            bytecode, methodIds, names, signatures,
+                                            modifications);
+    }
+
+    /**
+     * Called by the JVM to publish a class ID that can safely be used by the Method Timing event.
+     * <p>
+     * @param classId the methods to be published
+     */
+    public static void publishMethodTimersForClass(long classId) {
+        PlatformTracer.publishClass(classId);
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
index 4babd74c73d..855222bc8a4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/LogTag.java
@@ -101,7 +101,12 @@ public enum LogTag {
     /**
      * -XX:StartFlightRecording
      */
-    JFR_START(16);
+    JFR_START(16),
+    /**
+     *  Covers usage of MethodTiming and MethodTrace events
+     */
+    JFR_METHODTRACE(17),
+    ;
 
     /* set from native side */
     volatile int tagSetLevel = 100; // prevent logging if JVM log system has not been initialized
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 5c44f2416cf..1c9c985fb26 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -205,7 +205,6 @@ private EventConfiguration makeConfiguration(Class<? extends jdk.internal.event.
                     nativeEventTypes.remove(n);
                     nativeControls.remove(n);
                     TypeLibrary.removeType(nativeType.getId());
-                    pEventType.setAnnotations(nativeType.getAnnotationElements());
                     pEventType.setFields(nativeType.getFields());
                 }
             }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index 22f1b4e0dbb..32b59bca4c0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -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
@@ -33,6 +33,8 @@
 import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.ImplicitFields;
 import jdk.jfr.internal.util.Utils;
+import jdk.jfr.internal.tracing.Modification;
+
 /**
  * Implementation of event type.
  *
@@ -72,13 +74,13 @@ public final class PlatformEventType extends Type {
         super(name, Type.SUPER_TYPE_EVENT, id);
         this.dynamicSettings = dynamicSettings;
         this.isJVM = Type.isDefinedByJVM(id);
-        this.isMethodSampling = isJVM && (name.equals(Type.EVENT_NAME_PREFIX + "ExecutionSample") || name.equals(Type.EVENT_NAME_PREFIX + "NativeMethodSample"));
+        this.isMethodSampling = determineMethodSampling();
         this.isJDK = isJDK;
-        this.stackTraceOffset = stackTraceOffset(name, isJDK);
+        this.stackTraceOffset = determineStackTraceOffset();
     }
 
-    private static boolean isExceptionEvent(String name) {
-        switch (name) {
+    private boolean isExceptionEvent() {
+        switch (getName()) {
             case Type.EVENT_NAME_PREFIX + "JavaErrorThrow" :
             case Type.EVENT_NAME_PREFIX + "JavaExceptionThrow" :
                 return true;
@@ -86,8 +88,8 @@ private static boolean isExceptionEvent(String name) {
         return false;
     }
 
-    private static boolean isUsingConfiguration(String name) {
-        switch (name) {
+    private boolean isStaticCommit() {
+        switch (getName()) {
             case Type.EVENT_NAME_PREFIX + "SocketRead"  :
             case Type.EVENT_NAME_PREFIX + "SocketWrite" :
             case Type.EVENT_NAME_PREFIX + "FileRead"    :
@@ -98,18 +100,44 @@ private static boolean isUsingConfiguration(String name) {
         return false;
     }
 
-    private static int stackTraceOffset(String name, boolean isJDK) {
+    private int determineStackTraceOffset() {
         if (isJDK) {
-            if (isExceptionEvent(name)) {
+            // Order matters
+            if (isExceptionEvent()) {
                 return 4;
             }
-            if (isUsingConfiguration(name)) {
+            if (getModification() == Modification.TRACING) {
+                return 5;
+            }
+            if (isStaticCommit()) {
                 return 3;
             }
         }
         return 3;
     }
 
+    private boolean determineMethodSampling() {
+        if (!isJVM) {
+            return false;
+        }
+        switch (getName()) {
+            case Type.EVENT_NAME_PREFIX + "ExecutionSample":
+            case Type.EVENT_NAME_PREFIX + "NativeMethodSample":
+                return true;
+        }
+        return false;
+    }
+
+    public Modification getModification() {
+        switch (getName()) {
+            case Type.EVENT_NAME_PREFIX + "MethodTrace":
+                return Modification.TRACING;
+            case Type.EVENT_NAME_PREFIX + "MethodTiming":
+                return Modification.TIMING;
+        }
+        return Modification.NONE;
+    }
+
     public void add(SettingDescriptor settingDescriptor) {
         Objects.requireNonNull(settingDescriptor);
         settings.add(settingDescriptor);
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 ee25a491ad3..2184d85cf34 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
@@ -25,7 +25,6 @@
 
 package jdk.jfr.internal;
 
-import static jdk.jfr.internal.LogLevel.ERROR;
 import static jdk.jfr.internal.LogLevel.INFO;
 import static jdk.jfr.internal.LogLevel.TRACE;
 import static jdk.jfr.internal.LogLevel.WARN;
@@ -59,7 +58,7 @@
 
 public final class PlatformRecorder {
 
-
+    private static volatile boolean inShutdown;
     private final ArrayList<PlatformRecording> recordings = new ArrayList<>();
     private static final List<FlightRecorderListener> changeListeners = new ArrayList<>();
     private final Repository repository;
@@ -67,7 +66,6 @@ public final class PlatformRecorder {
     private Timer timer;
     private long recordingCounter = 0;
     private RepositoryChunk currentChunk;
-    private boolean inShutdown;
     private boolean runPeriodicTask;
 
     public PlatformRecorder() throws Exception {
@@ -150,12 +148,12 @@ public static void notifyRecorderInitialized(FlightRecorder recorder) {
         }
     }
 
-    synchronized void setInShutDown() {
-        this.inShutdown = true;
+    static void setInShutDown() {
+        inShutdown = true;
     }
 
-    synchronized boolean isInShutDown() {
-        return this.inShutdown;
+    static boolean isInShutDown() {
+        return inShutdown;
     }
 
     // called by shutdown hook
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 d71c20968a0..b07a71dd4d5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
@@ -172,7 +172,7 @@ public boolean stop(String reason) {
                 dumpStopped(dest);
                 Logger.log(LogTag.JFR, LogLevel.INFO, "Wrote recording \"" + getName() + "\" (" + getId() + ") to " + dest.getRealPathText());
                 notifyIfStateChanged(newState, oldState);
-                boolean reportOnExit = recorder.isInShutDown() && !reports.isEmpty();
+                boolean reportOnExit = PlatformRecorder.isInShutDown() && !reports.isEmpty();
                 if (!reportOnExit) {
                     close(); // remove if copied out, unless we are in shutdown and there are reports to report.
                 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
index 98bc0c86bfa..25cb202b0c2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
@@ -31,6 +31,7 @@
 
 public final class SecuritySupport {
     private static final Module JFR_MODULE = Event.class.getModule();
+    private static final String TRACING_PACKAGE_NAME = "jdk.jfr.tracing";
     private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
     static {
@@ -62,6 +63,10 @@ static void addEventsExport(Class<?> clazz) {
         Modules.addExports(JFR_MODULE, "jdk.jfr.events", clazz.getModule());
     }
 
+    public static void addTracingExport() {
+        Modules.addExports(JFR_MODULE, TRACING_PACKAGE_NAME);
+    }
+
     static void addReadEdge(Class<?> clazz) {
         Modules.addReads(clazz.getModule(), JFR_MODULE);
     }
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 df9fdc2815b..d34938fdfd8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
@@ -46,7 +46,7 @@ public void run() {
         // starting any "real" operations. In low memory situations,
         // we would like to take an OOM as early as possible.
         tlabDummyObject = new Object();
-        recorder.setInShutDown();
+        PlatformRecorder.setInShutDown();
         for (PlatformRecording recording : recorder.getRecordings()) {
             if (recording.getDumpOnExit() && recording.getState() == RecordingState.RUNNING) {
                 dump(recording);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Field.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Field.java
index 794d6370c57..90cd1c40a76 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Field.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Field.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
@@ -135,6 +135,8 @@ final class Field {
     // Text to render if value is missing, typically used when value is null
     public String missingText = "N/A";
 
+    public int precision = -1;
+
     public Field(FilteredType type, String name) {
         this.type = type;
         this.name = name;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldFormatter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldFormatter.java
index 117dc6d01f3..989e2231eb1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldFormatter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldFormatter.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
@@ -123,7 +123,7 @@ private static String format(Field field, Object object, boolean compact) {
             if (d.equals(ChronoUnit.FOREVER.getDuration())) {
                 return "Indefinite";
             }
-            return ValueFormatter.formatDuration(d);
+            return ValueFormatter.formatDuration(d, field.precision);
         }
         if (object instanceof Instant instant) {
             return ValueFormatter.formatTimestamp(instant);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryParser.java
index dfaeab38b85..51cb2cb03e7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryParser.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
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import jdk.jfr.internal.query.Configuration.Truncate;
@@ -280,6 +281,11 @@ private Property property() throws ParseException {
                 if (text.startsWith("cell-height:")) {
                     yield cellHeight(text.substring("cell-height:".length()));
                 }
+                // This option is experimental and may not work properly
+                // with rounding and truncation.
+                if (text.startsWith("ms-precision:")) {
+                    yield millisPrecision(text.substring("ms-precision:".length()));
+                }
                 throw new ParseException("Unknown formatter '" + text + "'", position());
             }
         };
@@ -306,6 +312,18 @@ private Consumer<Field> cellHeight(String height) throws ParseException {
         }
     }
 
+    private Consumer<Field> millisPrecision(String digits) throws ParseException {
+        try {
+            int d = Integer.parseInt(digits);
+            if (d < 0) {
+                throw new ParseException("Expected 'precision:' to be at least 0' ", position());
+            }
+            return field -> field.precision = d;
+        } catch (NumberFormatException nfe) {
+            throw new ParseException("Not valid number for 'precision:' " + digits, position());
+        }
+    }
+
     public int position() {
         return tokenizer.getPosition();
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index 51dc2ca11bf..a6192db1ab0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -1,5 +1,5 @@
 ;
-; Copyright (c) 2023, 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
@@ -446,6 +446,19 @@ table = "COLUMN 'Alloc. Time', 'Application Method', 'Object Age', 'Heap Usage'
          SELECT LAST_BATCH(allocationTime), LAST_BATCH(stackTrace.topApplicationFrame), LAST_BATCH(objectAge),
          LAST_BATCH(lastKnownHeapUsage) FROM OldObjectSample GROUP BY stackTrace.topApplicationFrame ORDER BY allocationTime"
 
+[application.method-timing]
+label = "Method Timing"
+table = "COLUMN 'Timed Method', 'Invocations', 'Average Time'
+         FORMAT none, none, ms-precision:6
+         SELECT LAST_BATCH(method) AS M, LAST_BATCH(invocations), LAST_BATCH(average)
+         FROM jdk.MethodTiming GROUP BY method ORDER BY average"
+
+[application.method-calls]
+label = "Method Calls"
+table = "COLUMN 'Traced Method', 'Caller', 'Invocations'
+         SELECT method as M, stackTrace.topFrame.method AS S, COUNT(*) AS C
+         FROM jdk.MethodTrace GROUP BY M, S ORDER BY C DESC"
+
 [application.modules]
 label = "Modules"
 table = "SELECT LAST(source.name) AS S FROM ModuleRequire GROUP BY source.name ORDER BY S"
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/FilterSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/FilterSetting.java
new file mode 100644
index 00000000000..3741a5932b3
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/FilterSetting.java
@@ -0,0 +1,100 @@
+/*
+ * 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.settings;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.TreeSet;
+
+import jdk.jfr.SettingControl;
+import jdk.jfr.internal.PlatformEventType;
+
+/**
+ * Base class for settings that consists of semicolon-separated filters.
+ */
+public abstract class FilterSetting extends SettingControl {
+    private final List<String> activeFilters = new ArrayList<>();
+    private final PlatformEventType eventType;
+    private final String defaultValue;
+    private String value;
+
+    public FilterSetting(PlatformEventType eventType, String defaultValue) {
+        this.eventType = Objects.requireNonNull(eventType);
+        this.defaultValue = defaultValue;
+    }
+
+    protected abstract void apply(PlatformEventType eventType, List<String> text);
+
+    protected abstract boolean isValid(String text);
+
+    @Override
+    public final String combine(Set<String> settingValues) {
+        List<String> filters = normalize(settingValues);
+        if (!filters.isEmpty()) {
+            return format(filters);
+        }
+        return defaultValue;
+    }
+
+    @Override
+    public final void setValue(String settingValue) {
+        List<String> filters = normalize(Set.of(settingValue));
+        if (activeFilters.equals(filters)) {
+            return;
+        }
+        apply(eventType, filters);
+        this.value = settingValue;
+        this.activeFilters.clear();
+        this.activeFilters.addAll(filters);
+    }
+
+    @Override
+    public final String getValue() {
+        return value;
+    }
+
+    // Split, trim, sort and remove duplicates filters.
+    private List<String> normalize(Set<String> settingValues) {
+        Set<String> filters = new TreeSet<>();
+        for (String value : settingValues) {
+            for (String filter : value.split(";")) {
+                filter = filter.strip();
+                if (!filter.isEmpty() && !filter.isBlank() && isValid(filter)) {
+                    filters.add(filter);
+                }
+            }
+        }
+        return new ArrayList<>(filters);
+    }
+
+    private static String format(List<String> filters) {
+        StringJoiner sj = new StringJoiner(";");
+        filters.forEach(sj::add);
+        return sj.toString();
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java
new file mode 100644
index 00000000000..f819b1b951d
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.settings;
+
+import java.util.List;
+
+import jdk.jfr.Description;
+import jdk.jfr.Label;
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.Name;
+import jdk.jfr.internal.PlatformEventType;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.tracing.Modification;
+import jdk.jfr.internal.tracing.PlatformTracer;
+
+@MetadataDefinition
+@Label("Filter")
+@Description("Methods to be filtered")
+@Name(Type.SETTINGS_PREFIX + "Filter")
+public final class MethodSetting extends FilterSetting {
+    private final Modification modification;
+    private static volatile boolean initialized;
+
+    public MethodSetting(PlatformEventType eventType, Modification modification, String defaultValue) {
+        super(eventType, defaultValue);
+        this.modification = modification;
+    }
+
+    public boolean isValid(String text) {
+        return PlatformTracer.isValidFilter(text);
+    }
+
+    @Override
+    protected void apply(PlatformEventType eventType, List<String> filters) {
+        if (!initialized) {
+            PlatformTracer.initialize();
+            initialized = true;
+        }
+        PlatformTracer.setFilters(modification, filters);
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/ExcludeList.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/ExcludeList.java
new file mode 100644
index 00000000000..8aa889dd68d
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/ExcludeList.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tracing;
+
+// // The JVM will skip all classes in the jdk.jfr module, so it's not added here.
+public final class ExcludeList {
+    private static final String[] EXCLUDED_CLASSES = {
+        // Used by MethodTiming event to accumulate invocations.
+        "java/util/concurrent/atomic/AtomicLong",
+        // Used by EventWriter
+        "sun/misc/Unsafe",
+        "jdk/internal/misc/Unsafe;",
+    };
+
+    private static final String[] EXCLUDED_PREFIX = {
+        // Used by MethodTiming event to store invocations, including inner classes.
+        "java/util/concurrent/ConcurrentHashMap",
+        // Can't trigger <clinit> of these classes during PlatformTracer::onMethodTrace(...)
+        "jdk/internal/", // jdk/internal/classfile, jdk/internal/loader and jdk/internal/foreign
+        "java/lang/classfile/"
+    };
+
+    private static final String[] EXCLUDED_METHODS = {
+        // Long used by MethodTiming event when looking up entry for timing entry
+        "java.lang.Long::<init>",
+        "java.lang.Long::valueOf",
+        "java.lang.Number::<init>"
+    };
+
+    public static boolean containsMethod(String methodName) {
+        for (String method : EXCLUDED_METHODS) {
+            if (method.equals(methodName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean containsClass(String className) {
+        for (String clazz: EXCLUDED_CLASSES) {
+            if (clazz.equals(className)) {
+                return true;
+            }
+        }
+        for (String prefix : EXCLUDED_PREFIX) {
+            if (className.startsWith(prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Filter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Filter.java
new file mode 100644
index 00000000000..782cc3e56d1
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Filter.java
@@ -0,0 +1,92 @@
+/*
+ * 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.tracing;
+
+import jdk.internal.module.Checks;
+
+/**
+ * Class that represents the filter a user can specify for the MethodTrace and
+ * MethodTiming event.
+ */
+record Filter(String className, String methodName, String annotationName, Modification modification) {
+
+    static Filter of(String filter, Modification modification) {
+        if (filter.startsWith("@")) {
+            return ofAnnotation(filter, modification);
+        }
+        if (filter.contains("::")) {
+            return ofMethod(filter, modification);
+        }
+        return ofClass(filter, modification);
+    }
+
+    private static Filter ofAnnotation(String filter, Modification modification) {
+        String annotation = filter.substring(1);
+        if (Checks.isClassName(annotation)) {
+            return new Filter(null, null, annotation, modification);
+        }
+        return null;
+    }
+
+    private static Filter ofMethod(String filter, Modification modification) {
+        int index = filter.indexOf("::");
+        String classPart = filter.substring(0, index);
+        String methodPart = filter.substring(index + 2);
+        if (methodPart.isEmpty()) {
+            // Don't allow "foo.Bar::". User should specify "foo.Bar".
+            return null;
+        }
+
+        if (isMethod(methodPart)) {
+            // Method name only, i.e. "::baz"
+            if (classPart.isEmpty()) {
+                return new Filter(null, methodPart, null, modification);
+            }
+            // Fully qualified method name, i.e. "foo.Bar::baz"
+            if (isValidClassName(classPart)) {
+                return new Filter(classPart, methodPart, null, modification);
+            }
+        }
+        return null;
+    }
+
+    private static boolean isMethod(String methodName) {
+        if (methodName.equals("<clinit>") || methodName.equals("<init>")) {
+            return true;
+        }
+        return Checks.isJavaIdentifier(methodName);
+    }
+
+    private static Filter ofClass(String filter, Modification modification) {
+        if (isValidClassName(filter)) {
+            return new Filter(filter, null, null, modification);
+        }
+        return null;
+    }
+
+    private static boolean isValidClassName(String text) {
+        return Checks.isClassName(text);
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Instrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Instrumentation.java
new file mode 100644
index 00000000000..dbafca4ed3c
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Instrumentation.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tracing;
+
+import java.lang.classfile.ClassBuilder;
+import java.lang.classfile.ClassElement;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassFile.ClassHierarchyResolverOption;
+import java.lang.classfile.ClassFile.Option;
+import java.lang.classfile.ClassHierarchyResolver;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.MethodTransform;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import jdk.jfr.internal.LogLevel;
+import jdk.jfr.internal.LogTag;
+import jdk.jfr.internal.Logger;
+
+/**
+ * Class that adds bytecode instrumentation for a class.
+ */
+final class Instrumentation {
+    private final Map<String, Method> modificationMap = new LinkedHashMap<>();
+    private final String className;
+    private final ClassLoader classLoader;
+    private final byte[] bytecode;
+
+    public Instrumentation(ClassLoader classLoader, String internalClassName, byte[] bytecode) {
+        this.className = internalClassName.replace("/", ".");
+        this.classLoader = classLoader;
+        this.bytecode = bytecode;
+    }
+
+    public void addMethod(long methodId, String name, String signature, int modification) {
+        modificationMap.put(name + signature, new Method(methodId, Modification.valueOf(modification), className + "::" + name));
+    }
+
+    public List<Method> getMethods() {
+        return new ArrayList<>(modificationMap.values());
+    }
+
+    public byte[] generateBytecode() {
+        boolean[] modified = new boolean[1];
+        ClassFile classFile = ClassFile.of(resolverOption());
+        ClassModel classModel = classFile.parse(bytecode);
+        byte[] generated = classFile.build(classModel.thisClass().asSymbol(), classBuilder -> {
+            for (var ce : classModel) {
+                if (modifyClassElement(classBuilder, ce)) {
+                    modified[0] = true;
+                } else {
+                    classBuilder.with(ce);
+                }
+            }
+        });
+        return modified[0] ? generated : null;
+    }
+
+    private Option resolverOption() {
+        return ClassHierarchyResolverOption.of(resolver());
+    }
+
+    private ClassHierarchyResolver resolver() {
+        if (classLoader == null) {
+            return ClassHierarchyResolver.ofResourceParsing(ClassLoader.getSystemClassLoader());
+        } else {
+            return ClassHierarchyResolver.ofResourceParsing(classLoader);
+        }
+    }
+
+    private boolean modifyClassElement(ClassBuilder classBuilder, ClassElement ce) {
+        if (ce instanceof MethodModel mm) {
+            String method = mm.methodName().stringValue();
+            String signature = mm.methodType().stringValue();
+            String full = method + signature;
+            Method tm = modificationMap.get(full);
+            if (tm != null) {
+                Modification m = tm.modification();
+                if (m.tracing() || m.timing()) {
+                    return modifyMethod(classBuilder, mm, tm);
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean modifyMethod(ClassBuilder classBuilder, MethodModel m, Method method) {
+        var code = m.code();
+        if (code.isPresent()) {
+            if (classLoader == null && ExcludeList.containsMethod(method.name())) {
+                String msg = "Risk of recursion, skipping bytecode generation of " + method.name();
+                Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, msg);
+                return false;
+            }
+            MethodTransform s = MethodTransform.ofStateful(
+                () -> MethodTransform.transformingCode(new Transform(method))
+            );
+            classBuilder.transformMethod(m, s);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Method.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Method.java
new file mode 100644
index 00000000000..d685083153d
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Method.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tracing;
+
+import jdk.jfr.internal.LogLevel;
+import jdk.jfr.internal.LogTag;
+import jdk.jfr.internal.Logger;
+
+/**
+ * Class that holds information about an instrumented method.
+ */
+record Method(long methodId, Modification modification, String name) {
+    @Override
+    public String toString() {
+        return name + (modification.timing() ? " +timing" : " -timing") + (modification.tracing() ? " +tracing" : " -tracing") + " (Method ID: " + String.format("0x%08X)", methodId);
+    }
+
+    public long classId() {
+        return methodId() >> 16;
+    }
+
+    public boolean isTiming() {
+        return modification.timing();
+    }
+
+    public void log(String msg) {
+        if (Logger.shouldLog(LogTag.JFR_METHODTRACE, LogLevel.DEBUG)) {
+            Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, msg + " for " + this);
+        }
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Modification.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Modification.java
new file mode 100644
index 00000000000..3f252214d92
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Modification.java
@@ -0,0 +1,42 @@
+/*
+ * 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.tracing;
+
+/**
+ * Class that holds the type of instrumentation that can be applied to a method.
+ */
+public record Modification(boolean timing, boolean tracing) {
+    public static final Modification TIMING = new Modification(true, false);
+    public static final Modification TRACING = new Modification(false, true);
+    public static final Modification NONE = new Modification(false, false);
+
+    static Modification valueOf(int traceType) {
+        return new Modification((traceType & 1) != 0, (traceType & 2) != 0);
+    }
+
+    int toInt() {
+        return (timing ? 1 : 0) + (tracing ? 2 : 0);
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
new file mode 100644
index 00000000000..9ebbec5d451
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
@@ -0,0 +1,302 @@
+/*
+ * 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.tracing;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import jdk.jfr.events.MethodTimingEvent;
+import jdk.jfr.internal.JVM;
+import jdk.jfr.internal.LogLevel;
+import jdk.jfr.internal.LogTag;
+import jdk.jfr.internal.Logger;
+import jdk.jfr.internal.MetadataRepository;
+import jdk.jfr.internal.SecuritySupport;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.util.Bytecode;
+import jdk.jfr.tracing.MethodTracer;
+
+/**
+ * Class that contains the Method Tracer implementation.
+ * <p>
+ * By placing the implementation in jdk.jfr.internal.tracing package instead of
+ * the jdk.jfr.tracing package fewer internals are exposed to the application.
+ */
+public final class PlatformTracer {
+    private static final ConcurrentHashMap<Long, TimedMethod> timedMethods = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Long, TimedClass> timedClasses = new ConcurrentHashMap<>();
+
+    private static List<Filter> traceFilters = List.of();
+    private static List<Filter> timingFilters = List.of();
+    private static TimedMethod OBJECT;
+
+    public static byte[] onMethodTrace(Module module, ClassLoader classLoader, String className,
+                                       byte[] oldBytecode, long[] ids, String[] names, String[] signatures,
+                                       int[] modifications) {
+        if (classLoader == null && ExcludeList.containsClass(className)) {
+            log(LogLevel.DEBUG, "Risk of recursion, skipping bytecode generation", module, className);
+            return null;
+        }
+        try {
+            Instrumentation instrumentation = new Instrumentation(classLoader, className, oldBytecode);
+            for (int i = 0; i < ids.length; i++) {
+                instrumentation.addMethod(ids[i], names[i], signatures[i], modifications[i]);
+            }
+            updateTiming(instrumentation.getMethods());
+            return instrumentation.generateBytecode(); // Returns null if bytecode was not modified.
+        } catch (ClassCircularityError cce) {
+            log(LogLevel.WARN, "Class circularity error, skipping instrumentation", module, className);
+            return null;
+        } catch (Throwable t) {
+            log(LogLevel.WARN, "Unexpected error " + t.getMessage() + ". Skipping instrumentation", module, className);
+            return null;
+        }
+    }
+
+    private static void updateTiming(List<Method> methods) {
+        boolean removeClass = true;
+        for (Method method : methods) {
+            if (method.isTiming()) {
+                removeClass = false;
+            }
+            updateTiming(method);
+        }
+        if (removeClass) {
+            Long classId = methods.getFirst().classId();
+            TimedClass timedClass = timedClasses.remove(classId);
+            if (timedClass != null) {
+                Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, "TimedClass removed (Klass ID " + String.format("0x%08X)", classId));
+            }
+        }
+    }
+    private static void updateTiming(Method method) {
+        if (!timedMethods.containsKey(method.methodId())) {
+            if (method.isTiming()) {
+                // Timing started
+                TimedClass timedClass = timedClasses.computeIfAbsent(method.classId(), id -> new TimedClass());
+                TimedMethod entry = timedClass.add(method);
+                timedMethods.put(method.methodId(), entry);
+                if ("java.lang.Object::<init>".equals(method.name())) {
+                    OBJECT = entry;
+                }
+                method.log("Timing entry added");
+            }
+            return;
+        }
+        if (!method.isTiming()) {
+            TimedClass timedClass = timedClasses.get(method.classId());
+            if (timedClass != null) {
+                timedClass.remove(method);
+            }
+            timedMethods.remove(method.methodId());
+            method.log("Timing entry removed");
+        }
+    }
+
+    private static void log(LogLevel level, String message, Module module, String className) {
+        if (!Logger.shouldLog(LogTag.JFR_METHODTRACE, level)) {
+            return;
+        }
+        StringBuilder s = new StringBuilder();
+        s.append(message);
+        s.append(" for ");
+        s.append(className.replace("/", "."));
+        s.append(" in module ");
+        s.append(module.getName());
+        s.append(" and class loader " + module.getClassLoader());
+        Logger.log(LogTag.JFR_METHODTRACE, level, s.toString());
+    }
+
+    public static void emitTiming() {
+        // Metadata lock prevents rotation/flush while emitting events.
+        synchronized (MetadataRepository.getInstance()) {
+            removeClasses(JVM.drainStaleMethodTracerIds());
+            long timestamp = MethodTimingEvent.timestamp();
+            for (var tc : timedClasses.values()) {
+                tc.emit(timestamp);
+            }
+        }
+    }
+
+    public static void addObjectTiming(long duration) {
+        OBJECT.invocations().getAndIncrement();
+        OBJECT.time().addAndGet(duration);
+    }
+
+    public static void addTiming(long id, long duration) {
+        TimedMethod entry = timedMethods.get(id);
+        if (entry != null) {
+            entry.invocations().getAndIncrement();
+            entry.time().addAndGet(duration);
+        }
+    }
+
+    public static boolean isValidFilter(String text) {
+        return Filter.of(text, null) != null;
+    }
+
+    public static void setFilters(Modification modification, List<String> filters) {
+        publishClasses(applyFilter(modification, filters));
+    }
+
+    private static long[] applyFilter(Modification modification, List<String> filters) {
+        boolean hadFilters = hasFilters();
+        if (modification.tracing()) {
+            traceFilters = makeFilters(filters, modification);
+        }
+        if (modification.timing()) {
+            timingFilters = makeFilters(filters, modification);
+        }
+        if (hadFilters || hasFilters()) {
+            int size = filterCount();
+            List<Filter> allFilters = new ArrayList<>(size);
+            allFilters.addAll(traceFilters);
+            allFilters.addAll(timingFilters);
+            String[] classes = new String[size];
+            String[] methods = new String[size];
+            String[] annotations = new String[size];
+            int[] modifications = new int[size];
+            for (int index = 0; index < size; index++) {
+                Filter filter = allFilters.get(index);
+                classes[index] = Bytecode.internalName(filter.className());
+                methods[index] = filter.methodName();
+                annotations[index] = Bytecode.descriptorName(filter.annotationName());
+                modifications[index] = filter.modification().toInt();
+            }
+            return JVM.setMethodTraceFilters(classes, methods, annotations, modifications);
+        }
+        return null;
+    }
+
+    private static void removeClasses(long[] classIds) {
+        if (classIds == null) {
+            return;
+        }
+        for (int i = 0; i < classIds.length; i++) {
+            TimedClass timedClass = timedClasses.remove(classIds[i]);
+            if (timedClass != null) {
+                for (TimedMethod tm : timedClass.methods()) {
+                    timedMethods.remove(tm.method().methodId());
+                    tm.method().log("Timing entry unloaded");
+                }
+                if (Logger.shouldLog(LogTag.JFR_METHODTRACE, LogLevel.DEBUG)) {
+                    Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, "TimedClass unloaded and removed for klass ID " + String.format("0x%08X", classIds[i]));
+                }
+            }
+        }
+    }
+
+    private static void publishClasses(long[] classIds) {
+        if (classIds == null) {
+            return;
+        }
+        for (int i = 0; i < classIds.length; i++) {
+            publishClass(classIds[i]);
+        }
+    }
+
+    public static void publishClass(long classId) {
+        TimedClass timedClass = timedClasses.get(classId);
+        // The class may be null if a class is drained/unloaded before
+        // it is being published by setFilter().
+        if (timedClass != null) {
+            timedClass.publish();
+        }
+    }
+
+    private static boolean hasFilters() {
+        return filterCount() > 0;
+    }
+
+    private static int filterCount() {
+        return traceFilters.size() + timingFilters.size();
+    }
+
+    private static List<Filter> makeFilters(List<String> filterTexts, Modification modification) {
+        List<Filter> filters = new ArrayList<>(filterTexts.size());
+        for (String filterText : filterTexts) {
+            Filter filter = Filter.of(filterText, modification);
+            if (filter != null) {
+                filters.add(filter);
+            }
+        }
+        return filters;
+    }
+
+    private static void reset() {
+        timedMethods.clear();
+        timedClasses.clear();
+    }
+
+    // This method has three purposes:
+    //
+    // 1) Load classes before instrumentation to avoid recursion in class
+    // initializers when onMethodTrace(...) is called by the JVM.
+    //
+    // 2) Warm up methods used by the PlatformTracer class to reduce the observer
+    // effect later.
+    //
+    // 3) Export the jdk.jfr.tracing package to all other modules.
+    //
+    // This method takes 1-10 milliseconds to run and is only executed once,
+    // provided a user has specified a non-empty filter for the MethodTrace or
+    // MethodTiming event.
+    public static void initialize() {
+        try {
+            Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, "Method tracer initialization started.");
+            Thread current = Thread.currentThread();
+            JVM.exclude(current);
+            long methodId = 16384126;
+            long classId = methodId >> 16;
+            ClassLoader cl = null;
+            String className = " java/lang/String";
+            Module m = String.class.getModule();
+            var is = ClassLoader.getSystemClassLoader().getResourceAsStream("java/lang/String.class");
+            byte[] oldBytecode = is.readAllBytes();
+            is.close();
+            long[] ids = { methodId };
+            String[] names = { "<clinit>" };
+            String[] signatures = { "()V" };
+            int[] modifications = { 3 };
+            byte[] bytes = onMethodTrace(m, cl, className, oldBytecode, ids, names, signatures, modifications);
+            if (bytes == null) {
+                throw new Exception("Could not generate bytecode");
+            }
+            publishClass(classId);
+            for (int id = 0; id < 25_000; id++) {
+                MethodTracer.timing(MethodTracer.timestamp(), methodId);
+                MethodTracer.trace(MethodTracer.timestamp(), methodId);
+                MethodTracer.traceTiming(MethodTracer.timestamp(), methodId);
+            }
+            reset();
+            JVM.include(current);
+            SecuritySupport.addTracingExport();
+            Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, "Method tracer initialization complete.");
+        } catch (Exception e) {
+            Logger.log(LogTag.JFR_METHODTRACE, LogLevel.WARN, "Method tracer initialization failed. " + e.getMessage());
+        }
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java
new file mode 100644
index 00000000000..936a8cf835d
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tracing;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Collection;
+
+import jdk.jfr.events.MethodTimingEvent;
+
+/**
+ * Holds timed method for a class. Used when publishing method ids.
+ */
+public final class TimedClass {
+    private final ConcurrentHashMap<Long, TimedMethod> methods = new ConcurrentHashMap<>();
+
+    public TimedMethod add(Method method) {
+        return methods.computeIfAbsent(method.methodId(), id -> new TimedMethod(method));
+    }
+
+    public void remove(Method method) {
+        methods.remove(method.methodId());
+    }
+
+    public void publish() {
+        for (TimedMethod t : methods.values()) {
+            t.published().set(true);
+            t.method().log("Timing entry published");
+        }
+    }
+
+    Collection<TimedMethod> methods() {
+        return methods.values();
+    }
+
+    public void emit(long timestamp) {
+        for (var tm : methods.values()) {
+            if (tm.published().get()) {
+                long methodId = tm.method().methodId();
+                long invocations = tm.invocations().get();
+                long time = tm.time().get();
+                long average = invocations == 0 ? Long.MIN_VALUE : time / invocations;
+                MethodTimingEvent.commit(timestamp, methodId, invocations, average);
+                tm.method().log("Emitted event");
+            }
+        }
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
new file mode 100644
index 00000000000..185fab62421
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
@@ -0,0 +1,40 @@
+/*
+ * 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.tracing;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Record class that holds invocation measurements used by the MethodTiming
+ * event.
+ * <p>
+ * Fields in record classes are truly final so might help to have a record here.
+ */
+record TimedMethod(AtomicLong invocations, AtomicLong time, Method method, AtomicBoolean published) {
+    TimedMethod(Method method) {
+        this(new AtomicLong(), new AtomicLong(), method, new AtomicBoolean());
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Transform.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Transform.java
new file mode 100644
index 00000000000..cd65a119cee
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/Transform.java
@@ -0,0 +1,102 @@
+/*
+ * 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.tracing;
+
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.TypeKind;
+import java.lang.classfile.instruction.ReturnInstruction;
+import java.lang.classfile.instruction.ThrowInstruction;
+import java.lang.constant.ClassDesc;
+
+import jdk.jfr.internal.util.Bytecode;
+import jdk.jfr.internal.util.Bytecode.MethodDesc;
+import jdk.jfr.tracing.MethodTracer;
+
+/**
+ * Class that transforms the bytecode of a method so it can call the appropriate
+ * methods in the jdk.jfr.tracing.MethodTracer class.
+ * <p>
+ * The method ID is determined by native code.
+ */
+final class Transform implements CodeTransform {
+    private static final ClassDesc METHOD_TRACER_CLASS = ClassDesc.of(MethodTracer.class.getName());
+    private static final MethodDesc TRACE_METHOD = MethodDesc.of("trace", "(JJ)V");
+    private static final MethodDesc TIMING_METHOD = MethodDesc.of("timing", "(JJ)V");
+    private static final MethodDesc TRACE_TIMING_METHOD = MethodDesc.of("traceTiming", "(JJ)V");
+    private static final MethodDesc TIMESTAMP_METHOD = MethodDesc.of("timestamp", "()J");
+
+    private final Method method;
+    private int timestampSlot = -1;
+
+    Transform(Method method) {
+        this.method = method;
+    }
+
+    @Override
+    public final void accept(CodeBuilder builder, CodeElement element) {
+        if (timestampSlot == -1) {
+            timestampSlot = invokeTimestamp(builder);
+            builder.lstore(timestampSlot);
+        }
+        if (element instanceof ReturnInstruction || element instanceof ThrowInstruction) {
+            builder.lload(timestampSlot);
+            builder.ldc(method.methodId());
+            Modification modification = method.modification();
+            boolean objectInit = method.name().equals("java.lang.Object::<init>");
+            String suffix = objectInit ? "ObjectInit" : "";
+            if (modification.timing()) {
+                if (modification.tracing()) {
+                    invokeTraceTiming(builder, suffix);
+                } else {
+                    invokeTiming(builder, suffix);
+                }
+            } else {
+                if (modification.tracing()) {
+                    invokeTrace(builder, suffix);
+                }
+            }
+        }
+        builder.with(element);
+    }
+
+    public static void invokeTiming(CodeBuilder builder, String suffix) {
+        builder.invokestatic(METHOD_TRACER_CLASS, TIMING_METHOD.name() + suffix, TIMING_METHOD.descriptor());
+    }
+
+    public static void invokeTrace(CodeBuilder builder, String suffix) {
+        builder.invokestatic(METHOD_TRACER_CLASS, TRACE_METHOD.name() + suffix, TRACE_METHOD.descriptor());
+    }
+
+    public static void invokeTraceTiming(CodeBuilder builder, String suffix) {
+        builder.invokestatic(METHOD_TRACER_CLASS, TRACE_TIMING_METHOD.name() + suffix, TRACE_TIMING_METHOD.descriptor());
+    }
+
+    public static int invokeTimestamp(CodeBuilder builder) {
+        Bytecode.invokestatic(builder, METHOD_TRACER_CLASS, TIMESTAMP_METHOD);
+        return builder.allocateLocal(TypeKind.LONG);
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
index 3cea5e80643..9db92e4d4fe 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Bytecode.java
@@ -101,6 +101,14 @@ public static ClassDesc classDesc(ValueDescriptor v) {
         };
     }
 
+    public static String internalName(String className) {
+        return className != null ? className.replace(".", "/") : null;
+    }
+
+    public static String descriptorName(String className) {
+        return className != null ? ("L" + internalName(className) + ";") : null;
+    }
+
     public static ClassDesc classDesc(Class<?> clazz) {
         return ClassDesc.ofDescriptor(clazz.descriptorString());
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java
index 53a11101944..e99df10d698 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.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
@@ -110,27 +110,36 @@ public static String formatNumber(Number n) {
     }
 
     public static String formatDuration(Duration d) {
+        return formatDuration(d, -1);
+    }
+
+    public static String formatDuration(Duration d, int precision) {
         Duration roundedDuration = roundDuration(d);
         if (roundedDuration.equals(Duration.ZERO)) {
             return "0 s";
         } else if (roundedDuration.isNegative()) {
-            return "-" + formatPositiveDuration(roundedDuration.abs());
+            return "-" + formatPositiveDuration(roundedDuration.abs(), precision);
         } else {
-            return formatPositiveDuration(roundedDuration);
+            return formatPositiveDuration(roundedDuration, precision);
         }
     }
 
-    private static String formatPositiveDuration(Duration d){
+    public static String formatPositiveDuration(Duration d, int precision) {
         if (d.compareTo(MICRO_SECOND) < 0) {
             // 0.000001 ms - 0.000999 ms
+            if (precision == -1) {
+                precision = 6;
+            }
             double outputMs = (double) d.toNanosPart() / 1_000_000;
-            return String.format("%.6f ms", outputMs);
+            return String.format("%." + precision + "f ms", outputMs);
         } else if (d.compareTo(SECOND) < 0) {
             // 0.001 ms - 999 ms
-            int valueLength = countLength(d.toNanosPart());
-            int outputDigit = NANO_SIGNIFICANT_FIGURES - valueLength;
+            if (precision == -1) {
+                int valueLength = countLength(d.toNanosPart());
+                precision = NANO_SIGNIFICANT_FIGURES - valueLength;
+            }
             double outputMs = (double) d.toNanosPart() / 1_000_000;
-            return String.format("%." + outputDigit + "f ms", outputMs);
+            return String.format("%." + precision + "f ms", outputMs);
         } else if (d.compareTo(MINUTE) < 0) {
             // 1.00 s - 59.9 s
             int valueLength = countLength(d.toSecondsPart());
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/package-info.java b/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
index 50666d738ef..bd5b197d7fc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
@@ -176,6 +176,31 @@
  * <td>{@code "true"},<br>
  * {@code "false"}</td>
  * </tr>
+ * <tr>
+ * <th scope="row">{@code filter}</th>
+ * <td>Specifies the filter for the event</td>
+ * <td>{@code ""} (empty string)</td>
+ * <td>An empty string if no filter is used. Otherwise, a
+ * filter that can be used with the jdk.MethodTrace or
+ * jdk.MethodTiming events and follows this grammar:<br>
+ * {@snippet :
+ * filter ::= target (";" target)*
+ * target ::= class | class-method | method | annotation
+ * class ::= identifier ("." identifier)*
+ * class-method ::= class method
+ * method ::= "::" method-name
+ * method-name ::= identifier | "<clinit>" | "<init>"
+ * annotation ::= "@" class
+ * identifier ::= see JLS 3.8
+ * }
+ * </td>
+ * <td>{@code "java.lang.String"}<br>
+ * {@code "::<clinit>"}<br>
+ * {@code "java.util.HashMap::resize"}<br>
+ * {@code "java.io.FileDescriptor::<init>;java.io.FileDescriptor::close"}<br>
+ * {@code  "@jakarta.ws.rs.GET"}<br>
+ * </td>
+ * </tr>
  * </tbody>
  * </table>
  * <p>
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/tracing/MethodTracer.java b/src/jdk.jfr/share/classes/jdk/jfr/tracing/MethodTracer.java
new file mode 100644
index 00000000000..0d7b8072194
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/tracing/MethodTracer.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.tracing;
+
+import jdk.jfr.events.MethodTimingEvent;
+import jdk.jfr.events.MethodTraceEvent;
+import jdk.jfr.internal.JVM;
+import jdk.jfr.internal.tracing.PlatformTracer;
+
+/**
+ * This class serves as the frontend for method tracing capabilities. The
+ * jdk.jfr.tracing package is exported to all modules when the first method
+ * tracing filter is applied.
+ * <p>
+ * A malicious user could craft bytecode that invoke these methods with an
+ * invalid method ID, resulting in an event where the method field is
+ * incorrect or {@code null}. This is considered acceptable.
+ */
+public final class MethodTracer {
+
+    private MethodTracer() {
+    }
+
+    public static long timestamp() {
+        return JVM.counterTime();
+    }
+
+    public static void traceObjectInit(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTraceEvent.enabled() && JVM.getEventWriter() != null) {
+            MethodTraceEvent.commit(startTime, duration, methodId);
+        }
+    }
+
+    public static void timingObjectInit(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTimingEvent.enabled()) {
+            PlatformTracer.addObjectTiming(duration);
+        }
+    }
+
+    public static void traceTimingObjectInit(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTraceEvent.enabled() && JVM.getEventWriter() != null) {
+            MethodTraceEvent.commit(startTime, duration, methodId);
+        }
+        if (MethodTimingEvent.enabled()) {
+            PlatformTracer.addObjectTiming(duration);
+        }
+    }
+
+    public static void trace(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTraceEvent.enabled()) {
+            MethodTraceEvent.commit(startTime, duration, methodId);
+        }
+    }
+
+    public static void timing(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTimingEvent.enabled()) {
+            PlatformTracer.addTiming(methodId, duration);
+        }
+    }
+
+    public static void traceTiming(long startTime, long methodId) {
+        long endTime = JVM.counterTime();
+        long duration = endTime - startTime;
+        if (MethodTimingEvent.enabled()) {
+            PlatformTracer.addTiming(methodId, duration);
+        }
+        if (MethodTraceEvent.enabled()) {
+            MethodTraceEvent.commit(startTime, duration, methodId);
+        }
+    }
+}
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 9f3a34618d3..293af26746f 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -206,6 +206,19 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.MethodTrace">
+      <setting name="enabled">true</setting>
+      <setting name="filter" control="method-trace"></setting>
+      <setting name="threshold">0 ms</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.MethodTiming">
+      <setting name="enabled">true</setting>
+      <setting name="filter" control="method-timing"></setting>
+      <setting name="period">endChunk</setting>
+    </event>
+
     <event name="jdk.SafepointLatency">
       <setting name="enabled">false</setting>
       <setting name="stackTrace">true</setting>
@@ -1158,6 +1171,10 @@
 
       <text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">20 ms</text>
 
+      <text name="method-timing" label="Method Timing" contentType="text"></text>
+
+      <text name="method-trace" label="Method Trace" contentType="text"></text>
+
       <flag name="class-loading" label="Class Loading">false</flag>
     </control>
 
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 4c9f4b4f8ec..89a9022d11e 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -206,6 +206,19 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.MethodTrace">
+      <setting name="enabled">true</setting>
+      <setting name="filter" control="method-trace"></setting>
+      <setting name="threshold">0 ms</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.MethodTiming">
+      <setting name="enabled">true</setting>
+      <setting name="filter" control="method-timing"></setting>
+      <setting name="period">endChunk</setting>
+    </event>
+
     <event name="jdk.SafepointLatency">
       <setting name="enabled">false</setting>
       <setting name="stackTrace">false</setting>
@@ -1157,6 +1170,10 @@
 
       <text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>
 
+      <text name="method-timing" label="Method Timing" contentType="text"></text>
+
+      <text name="method-trace" label="Method Trace" contentType="text"></text>
+
       <flag name="class-loading" label="Class Loading">false</flag>
     </control>
 
diff --git a/test/jdk/jdk/jfr/api/settings/TestSettingControl.java b/test/jdk/jdk/jfr/api/settings/TestSettingControl.java
index ef38626eedb..e1c9ff1ea47 100644
--- a/test/jdk/jdk/jfr/api/settings/TestSettingControl.java
+++ b/test/jdk/jdk/jfr/api/settings/TestSettingControl.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,8 @@ public String eventSettingName() {
         new SettingTest("level", "forRemoval", "jdk.DeprecatedInvocation", List.of("off", "forRemoval")),
         new SettingTest("period", "everyChunk", "jdk.ExceptionStatistics", List.of("everyChunk", "60 s", "1 s")),
         new SettingTest("cutoff", "infinity", "jdk.OldObjectSample", List.of("0 ms", "1 s", "infinity")),
-        new SettingTest("throttle", "off", "jdk.ObjectAllocationSample", List.of("off", "100/s", "10/ms"))
+        new SettingTest("throttle", "off", "jdk.ObjectAllocationSample", List.of("off", "100/s", "10/ms")),
+        new SettingTest("filter", "", "jdk.MethodTrace", List.of("", "foo.bar::Baz", "com.example.Test;foo.bar::Baz"))
     );
 
     public static void main(String... args) throws Exception {
diff --git a/test/jdk/jdk/jfr/event/tracing/Apple.java b/test/jdk/jdk/jfr/event/tracing/Apple.java
new file mode 100644
index 00000000000..b88f3933947
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/Apple.java
@@ -0,0 +1,35 @@
+/*
+ * 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.event.tracing;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ TYPE, METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Apple {
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/Banana.java b/test/jdk/jdk/jfr/event/tracing/Banana.java
new file mode 100644
index 00000000000..072e6a5955f
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/Banana.java
@@ -0,0 +1,35 @@
+/*
+ * 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.event.tracing;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ TYPE, METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Banana {
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/Car.java b/test/jdk/jdk/jfr/event/tracing/Car.java
new file mode 100644
index 00000000000..2f3f5a5802a
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/Car.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.
+ */
+package jdk.jfr.event.tracing;
+
+public final class Car implements Runnable {
+
+    public void run() {
+        System.out.println("Car is running. Class loader name " + this.getClass().getClassLoader().getName());
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/StaticInitializer.java b/test/jdk/jdk/jfr/event/tracing/StaticInitializer.java
new file mode 100644
index 00000000000..15485660bf4
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/StaticInitializer.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.
+ */
+package jdk.jfr.event.tracing;
+
+public final class StaticInitializer {
+    public static String TRIGGERED;
+    static {
+        System.out.println("Executing StaticInitializer::<clinit>");
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestClinit.java b/test/jdk/jdk/jfr/event/tracing/TestClinit.java
new file mode 100644
index 00000000000..f2356fb8d9f
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestClinit.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.
+ */
+package jdk.jfr.event.tracing;
+
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that <clinit> can be instrumented.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @build jdk.jfr.event.tracing.StaticInitializer
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestClinit
+ **/
+public class TestClinit {
+    private static final String PACKAGE_NAME = TestClinit.class.getPackageName();
+    private static final String CLINIT_CLASS_NAME = PACKAGE_NAME + ".StaticInitializer";
+    private static final String CLINIT_METHOD_NAME = CLINIT_CLASS_NAME + "::<clinit>";
+
+    public static void main(String... args) throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("jdk.MethodTrace")
+             .with("filter", CLINIT_CLASS_NAME);
+            r.enable("jdk.MethodTiming")
+             .with("filter", CLINIT_METHOD_NAME)
+             .with("period", "endChunk");
+
+            r.start();
+            StaticInitializer.TRIGGERED = "true";
+            r.stop();
+
+            List<RecordedEvent> events = Events.fromRecording(r);
+            Events.assertEventCount(events, 2);
+
+            RecordedEvent traceEvent = Events.getFirst(events, "jdk.MethodTrace");
+            Events.assertTopFrame(traceEvent, TestClinit.class.getName(), "main");
+            assertClinitMethod(traceEvent);
+
+            RecordedEvent timingEvent = Events.getFirst(events, "jdk.MethodTiming");
+            assertClinitMethod(timingEvent);
+        }
+    }
+
+    private static void assertClinitMethod(RecordedEvent event) throws Exception {
+        RecordedMethod method = event.getValue("method");
+        if (!method.getName().equals("<clinit>")) {
+            System.out.println(event);
+            throw new Exception("Expected <clinit>, was " + method.getName());
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestCombinedFilters.java b/test/jdk/jdk/jfr/event/tracing/TestCombinedFilters.java
new file mode 100644
index 00000000000..d794a694555
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestCombinedFilters.java
@@ -0,0 +1,111 @@
+/*
+ * 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.event.tracing;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import jdk.jfr.EventType;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.event.tracing.Apple;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that the union of annotation-based, class-based and
+ *          method-based filters can be used simultaneously.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @build jdk.jfr.event.tracing.Apple
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestCombinedFilters
+ **/
+public class TestCombinedFilters {
+    private static final String APPLE_ANNOTATION = Apple.class.getName();
+    private static final String TRACE_EVENT = "jdk.MethodTrace";
+    private static final String TIMING_EVENT = "jdk.MethodTiming";
+    private static final String FOO_CLASS = Foo.class.getName();
+
+    public static class Foo {
+        @Apple
+        static void bar() {
+            System.out.println("Executing Foo:bar");
+        }
+
+        static void baz() {
+            System.out.println("Executing Foo:baz");
+        }
+
+        static void qux() {
+            System.out.println("Executing Foo:qux");
+        }
+    }
+
+    record TestEvent(String event, String type, String method) {
+    }
+
+    public static void main(String... args) throws Exception {
+        String traceFilter = "@" + APPLE_ANNOTATION + ";" + FOO_CLASS + "::bar";
+        String timingFilter = Foo.class.getName();
+        try (Recording r = new Recording()) {
+            r.enable(TRACE_EVENT).with("filter", traceFilter);
+            r.enable(TIMING_EVENT).with("filter", timingFilter).with("period", "endChunk");
+            for (var entry : r.getSettings().entrySet()) {
+                System.out.println(entry.getKey() + "=" + entry.getValue());
+            }
+            r.start();
+            Foo.bar();
+            Foo.baz();
+            Foo.qux();
+            r.stop();
+            var list = List.of(new TestEvent(TRACE_EVENT, FOO_CLASS, "bar"),
+                               new TestEvent(TIMING_EVENT, FOO_CLASS, "<init>"),
+                               new TestEvent(TIMING_EVENT, FOO_CLASS, "bar"),
+                               new TestEvent(TIMING_EVENT, FOO_CLASS, "baz"),
+                               new TestEvent(TIMING_EVENT, FOO_CLASS, "qux"));
+            List<TestEvent> expected = new ArrayList<>(list);
+            List<RecordedEvent> events = Events.fromRecording(r);
+            for (RecordedEvent event : events) {
+                System.out.println(event);
+            }
+            Events.hasEvents(events);
+            for (RecordedEvent e : events) {
+                RecordedMethod method = e.getValue("method");
+                String className = method.getType().getName();
+                String eventTypeName = e.getEventType().getName();
+                TestEvent testEvent = new TestEvent(eventTypeName, className, method.getName());
+                if (!expected.remove(testEvent)) {
+                    throw new Exception("Unexpected event " + testEvent);
+                }
+            }
+            if (!expected.isEmpty()) {
+                throw new Exception("Missing events " + expected);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestFilterClass.java b/test/jdk/jdk/jfr/event/tracing/TestFilterClass.java
new file mode 100644
index 00000000000..e89813d444f
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestFilterClass.java
@@ -0,0 +1,113 @@
+/*
+ * 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.event.tracing;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that class filters work as expected.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestFilterClass
+ **/
+public class TestFilterClass {
+    private static final String THIS_CLASS = TestFilterClass.class.getName();
+    private static final String EVENT_NAME = "jdk.MethodTrace";
+
+    interface Interface {
+        void foo();
+
+        void bar();
+
+        public static void baz() {
+            System.out.println("Executing Interface::baz");
+        }
+    }
+
+    static class Implementation implements Interface {
+        public void foo() {
+            System.out.println("Executing Implementation::foo");
+        }
+
+        @Override
+        public void bar() {
+            throw new Error("Should not happen");
+        }
+    }
+
+    enum Enum {
+        VALUE;
+
+        public void bar() {
+            System.out.println("Executing Enum::bar");
+        }
+    }
+
+    record Record(int value) {
+    }
+
+    public static void main(String... args) throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable(EVENT_NAME)
+             .with("filter", THIS_CLASS + "$Implementation;" +
+                             THIS_CLASS + "$Interface;" +
+                             THIS_CLASS + "$Enum;" +
+                             THIS_CLASS + "$Record");
+            r.start();
+            Interface.baz();
+            new Implementation().foo();
+            Enum.VALUE.bar();
+            new Record(4711).value();
+            r.stop();
+            var list = new ArrayList<>(List.of(THIS_CLASS + "$Interface::baz", THIS_CLASS + "$Implementation::<init>", THIS_CLASS + "$Implementation::foo", THIS_CLASS + "$Enum::<clinit>",
+                    THIS_CLASS + "$Enum::<init>", THIS_CLASS + "$Enum::bar", THIS_CLASS + "$Record::<init>", THIS_CLASS + "$Record::value"));
+            var events = Events.fromRecording(r);
+            System.out.println(list);
+            Events.hasEvents(events);
+            for (RecordedEvent event : events) {
+                System.out.println(event);
+                RecordedMethod method = event.getValue("method");
+                String name = method.getType().getName() + "::" + method.getName();
+                if (!list.remove(name)) {
+                    throw new Exception("Unexpected method '" + name + "' in event");
+                }
+            }
+            if (!list.isEmpty()) {
+                throw new Exception("Expected events for the methods " + list);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestFilterClassAnnotation.java b/test/jdk/jdk/jfr/event/tracing/TestFilterClassAnnotation.java
new file mode 100644
index 00000000000..fddf82ca419
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestFilterClassAnnotation.java
@@ -0,0 +1,125 @@
+/*
+ * 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.event.tracing;
+
+
+import jdk.jfr.event.tracing.Apple;
+import jdk.jfr.event.tracing.Banana;
+
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+
+import java.lang.annotation.Target;
+import java.util.HashSet;
+import java.util.Set;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedMethod;
+
+/**
+ * @test
+ * @summary Tests class-annotation-based filtering.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main/othervm
+ *    -Xlog:jfr+methodtrace=trace
+ *    jdk.jfr.event.tracing.TestFilterClassAnnotation
+ */
+
+// @Banana and Apple tests multiple annotations and that the target is not the first annotation
+@Banana
+@Apple
+public class TestFilterClassAnnotation {
+    private static final String EVENT_NAME = "jdk.MethodTrace";
+
+    // Class Foo tests inner and interface classes
+    @Apple
+    interface Foo {
+        // Method duck() tests that static methods in interfaces can be instrumented
+        private static void duck() {
+            System.out.println("Executing method: duck()");
+        }
+
+        // Method eggplant() tests that abstract method doesn't interfere in the
+        // instrumentation
+        void eggplant();
+    }
+
+    // Method ant() tests that the same method annotation as the class doesn't
+    // interfere
+    @Apple
+    private static void ant() {
+        System.out.println("Executing method: ant()");
+    }
+
+    // Method bear() tests that other method annotation doesn't interfere
+    @Banana
+    private static void bear() {
+        System.out.println("Executing method: bear()");
+    }
+
+    // Method cat() tests that a method in an annotated class is instrumented
+    private static void cat() {
+        System.out.println("Executing method: cat()");
+    }
+
+    public static void main(String... args) throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable(EVENT_NAME)
+             .with("filter", "@" + Apple.class.getName());
+            r.start();
+            ant();
+            bear();
+            cat();
+            Foo.duck();
+            r.stop();
+
+            var set = new HashSet<>(Set.of("ant", "bear", "cat", "duck"));
+            var events = Events.fromRecording(r);
+            Events.hasEvents(events);
+            for (RecordedEvent e : events) {
+                System.out.println(e);
+                RecordedMethod method = e.getValue("method");
+                if (!set.remove(method.getName())) {
+                    throw new Exception("Unexpected method '" + method.getName() + "' in event");
+                }
+                RecordedFrame topFrame = e.getStackTrace().getFrames().get(0);
+                String topMethod = topFrame.getMethod().getName();
+                if (!topMethod.equals("main")) {
+                    throw new Exception("Expected method to be called from main");
+                }
+            }
+            if (!set.isEmpty()) {
+                throw new Exception("Expected events for the methods " + set);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestFilterMethod.java b/test/jdk/jdk/jfr/event/tracing/TestFilterMethod.java
new file mode 100644
index 00000000000..82356ac1bfd
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestFilterMethod.java
@@ -0,0 +1,151 @@
+/*
+ * 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.event.tracing;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that a method filter (e.g., class::method) works as expected.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestFilterMethod
+ */
+public class TestFilterMethod {
+    private static final String THIS_CLASS = TestFilterMethod.class.getName();
+    private static final String EVENT_NAME = "jdk.MethodTrace";
+
+    // Tests implicit constructor
+    static public class SomeClass {
+        public void override() {
+            throw new Error("Should not happen");
+        }
+    }
+
+    // Tests explicit constructor
+    static public class OtherClass extends SomeClass {
+        public OtherClass() {
+            System.out.println("Executing Otherclass::Otherclass()");
+        }
+    }
+
+    // Tests method override
+    static public class SomeSubclass extends SomeClass {
+        public void override() {
+            System.out.println("Executing SomeSubclass::override()");
+        }
+    }
+
+    // Tests method in enum
+    enum Enum {
+        VALUE;
+
+        static void enumMethod() {
+            System.out.println("Executing Enum:enumMethod");
+        }
+    }
+
+    // Tests method in interface
+    interface Interface {
+        public static void staticMethod() {
+            System.out.println("Executing Interface::staticMethod");
+        }
+
+        public void instanceMethod();
+    }
+
+    static class Implementation implements Interface {
+        @Override
+        public void instanceMethod() {
+        }
+    }
+
+    // Tests normal method
+    public static void overload() {
+        System.out.println("Executing overload()");
+    }
+
+    // Tests overloaded method
+    public static void overload(int value) {
+        System.out.println("Executing overload(" + value + ")");
+    }
+
+    public static void main(String... args) throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable(EVENT_NAME)
+             .with("filter", THIS_CLASS + "$SomeSubclass::override;" +
+                             THIS_CLASS + "$OtherClass::<init>;" +
+                             THIS_CLASS + "::overload;" +
+                             THIS_CLASS + "$Enum::enumMethod;" +
+                             THIS_CLASS + "$Interface::staticMethod;" +
+                             THIS_CLASS + "$Implementation::instanceMethod");
+            r.start();
+            new SomeSubclass().override();
+            new OtherClass();
+            overload();
+            overload(1);
+            Enum.enumMethod();
+            Interface.staticMethod();
+            new Implementation().instanceMethod();
+            r.stop();
+
+            var set = new ArrayList<>(List.of(
+                "<init>", // OtherClass:<init>
+                "override",
+                "overload", // overload()
+                "overload", // overload(int)
+                "enumMethod",
+                "staticMethod",
+                "instanceMethod"));
+            var events = Events.fromRecording(r);
+            Events.hasEvents(events);
+            for (RecordedEvent event : events) {
+                System.out.println(event);
+                RecordedMethod m = event.getValue("method");
+                if (!set.remove(m.getName())) {
+                    throw new Exception("Unexpected method '" + m.getName() + "' in event");
+                }
+                RecordedFrame topFrame = event.getStackTrace().getFrames().get(0);
+                String topMethod = topFrame.getMethod().getName();
+                if (!topMethod.equals("main")) {
+                    throw new Exception("Expected method to be called from main");
+                }
+            }
+            if (!set.isEmpty()) {
+                throw new Exception("Expected events for the methods " + set);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestFilterMethodAnnotation.java b/test/jdk/jdk/jfr/event/tracing/TestFilterMethodAnnotation.java
new file mode 100644
index 00000000000..62420e3900a
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestFilterMethodAnnotation.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.
+ */
+package jdk.jfr.event.tracing;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.HashSet;
+import java.util.Set;
+
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.event.tracing.Apple;
+import jdk.jfr.event.tracing.Banana;
+import jdk.jfr.event.tracing.TestFilterMethodAnnotation.Foo;
+
+/**
+ * @test
+ * @summary Tests method-annotation-based filtering.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestFilterMethodAnnotation
+ */
+public class TestFilterMethodAnnotation {
+
+    static String EVENT_NAME = "jdk.MethodTrace";
+
+    // Tests that abstract method is ignored
+    static abstract class Foo {
+        @Apple
+        abstract void baz();
+    }
+
+    // Tests tracing of an inner class
+    static class Bar extends Foo {
+        @Override
+        // Tests method override
+        @Apple
+        void baz() {
+            System.out.println("Executing Bar::baz()");
+        }
+
+        @Apple
+        void qux() {
+            System.out.println("Executing Bar::qux()");
+        }
+    }
+
+    // Tests tracing of method with multiple annotations and the target not being
+    // first
+    @Banana
+    @Apple
+    private static void ant() {
+        System.out.println("Executing method: ant()");
+    }
+
+    // Tests that overloaded method with the same name is not traced
+    private static void ant(int i) {
+        System.out.println("Executing method: apple(" + i + ")");
+    }
+
+    // Tests that non-annotated method is not traced
+    private static void bear() {
+        System.out.println("Executing method: bear()");
+    }
+
+    public static void main(String... args) throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable(EVENT_NAME)
+             .with("filter", "@" + Apple.class.getName());
+            r.start();
+            ant();
+            ant(4711);
+            bear();
+            Bar bar = new Bar();
+            bar.baz();
+            bar.qux();
+            r.stop();
+            var set = new HashSet<>(Set.of("ant", "baz", "qux"));
+            var events = Events.fromRecording(r);
+            Events.hasEvents(events);
+            for (RecordedEvent event : events) {
+                System.out.println(event);
+                RecordedMethod method = event.getValue("method");
+                String methodName = method.getName();
+                if (!set.remove(methodName)) {
+                    throw new Exception("Unexpected method " + methodName + "() in event");
+                }
+                RecordedFrame topFrame = event.getStackTrace().getFrames().get(0);
+                if (!topFrame.getMethod().getName().equals("main")) {
+                    throw new Exception("Expected method to be called from main");
+                }
+            }
+            if (!set.isEmpty()) {
+                throw new Exception("Expected events for the methods " + set);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestInstrumentation.java b/test/jdk/jdk/jfr/event/tracing/TestInstrumentation.java
new file mode 100644
index 00000000000..834d4ab4989
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestInstrumentation.java
@@ -0,0 +1,190 @@
+/*
+ * 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.event.tracing;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Tests that methods are instrumented correctly.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm
+ *           -Xlog:jfr+methodtrace=debug
+ *           jdk.jfr.event.tracing.TestInstrumentation
+ **/
+public class TestInstrumentation {
+    private static Object nullObject;
+
+    public static void main(String... args) throws Exception {
+        List<RecordedEvent> traceEvents = new CopyOnWriteArrayList<>();
+        List<RecordedEvent> timingEvents = new CopyOnWriteArrayList<>();
+        try (RecordingStream r = new RecordingStream()) {
+            r.setReuse(false);
+            String filter = TestInstrumentation.class.getName();
+            r.enable("jdk.MethodTrace")
+             .with("filter", filter);
+            r.enable("jdk.MethodTiming")
+             .with("filter", filter)
+             .with("period", "endChunk");
+            r.onEvent("jdk.MethodTrace", traceEvents::add);
+            r.onEvent("jdk.MethodTiming", timingEvents::add);
+            r.startAsync();
+            try {
+                whileTrue();
+            } catch (NullPointerException npe) {
+                // As expected
+            }
+            recursive(3);
+            switchExpression(0);
+            switchExpression(1);
+            switchExpression(2);
+            multipleReturns();
+            multipleReturns();
+            multipleReturns();
+            multipleReturns();
+            multipleReturns();
+            try {
+                exception();
+            } catch (Exception e) {
+            }
+            try {
+                deepException();
+            } catch (Exception e) {
+            }
+            r.stop();
+        }
+        verifyTracing(traceEvents);
+        verifyTiming(timingEvents);
+    }
+
+    private static void verifyTracing(List<RecordedEvent> events) throws Exception {
+        Map<String, Long> map = buildMethodMap(events, false);
+        printMap("Tracing:", map);
+        assertMethod(map, "exception", 2);
+        assertMethod(map, "switchExpression", 3);
+        assertMethod(map, "recursive", 4);
+        assertMethod(map, "multipleReturns", 5);
+        if (!map.isEmpty()) {
+            throw new Exception("Found unexpected methods " + map.keySet());
+        }
+    }
+
+    private static void verifyTiming(List<RecordedEvent> events) throws Exception {
+        Map<String, Long> map = buildMethodMap(events, true);
+        printMap("Timing:", map);
+        assertMethod(map, "exception", 2);
+        assertMethod(map, "switchExpression", 3);
+        assertMethod(map, "recursive", 4);
+        assertMethod(map, "multipleReturns", 5);
+        for (var entry : map.entrySet()) {
+            long invocations = entry.getValue();
+            if (invocations != 0L) {
+                throw new Exception("Unexpected " + invocations + " invocations for method " + entry.getKey());
+            }
+        }
+    }
+
+    private static void printMap(String caption, Map<String, Long> map) {
+        System.out.println(caption);
+        for (var entry : map.entrySet()) {
+            System.out.println(entry.getKey() + " = " + entry.getValue());
+        }
+        System.out.println();
+    }
+
+    private static void assertMethod(Map<String, Long> map, String method, long value) throws Exception {
+        if (!map.containsKey(method)) {
+            throw new Exception("Missing method " + method);
+        }
+        if (!map.get(method).equals(value)) {
+            throw new Exception("Expected value " + value + " for method " + method);
+        }
+        map.remove(method);
+    }
+
+    private static Map<String, Long> buildMethodMap(List<RecordedEvent> events, boolean invocations) {
+        Map<String, Long> map = new HashMap<>();
+        for (RecordedEvent e : events) {
+            RecordedMethod m = e.getValue("method");
+            String name = m.getName();
+            long add = invocations ? e.getLong("invocations") : 1;
+            map.compute(name, (key, value) -> (value == null) ? add : value + add);
+        }
+        return map;
+    }
+
+    public static void whileTrue() {
+        while (true) {
+            nullObject.toString();
+        }
+    }
+
+    public static void recursive(int depth) {
+        if (depth > 0) {
+            recursive(depth - 1);
+        } else {
+            return;
+        }
+    }
+
+    public static String switchExpression(int value) {
+        return switch (value) {
+        case 0 -> "zero";
+        case 1 -> "one";
+        default -> "number";
+        };
+    }
+
+    public static void multipleReturns() {
+        Random r = new Random();
+        int v = r.nextInt(5);
+        if (v == 0) {
+            return;
+        }
+        switch (v) {
+        case 1:
+            return;
+        case 2:
+            return;
+        }
+        return;
+    }
+
+    public static void exception() throws Exception {
+        throw new Exception("");
+    }
+
+    public static void deepException() throws Exception {
+        exception();
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestMethodTiming.java b/test/jdk/jdk/jfr/event/tracing/TestMethodTiming.java
new file mode 100644
index 00000000000..1de0e5e20eb
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestMethodTiming.java
@@ -0,0 +1,143 @@
+/*
+ * 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.event.tracing;
+
+import java.time.Duration;
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.Event;
+import jdk.jfr.StackTrace;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Basic test of the MethodTiming event.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.tracing.TestMethodTiming
+ **/
+public class TestMethodTiming {
+    private static final String EVENT_NAME = "jdk.MethodTiming";
+
+    @StackTrace(false)
+    static class TimeMeasureEvent extends Event {
+        public String id;
+    }
+
+    public static void main(String... args) throws Exception {
+        testCount();
+        testDuration();
+    }
+
+    private static void testDuration() throws Exception {
+        try (Recording r = new Recording()) {
+            String filter = TestMethodTiming.class.getName() + "::takeNap";
+            r.enable(EVENT_NAME).with("period", "endChunk").with("filter", filter);
+            r.start();
+
+            TimeMeasureEvent maxEvent = new TimeMeasureEvent();
+            maxEvent.id = "max";
+            maxEvent.begin();
+            takeNap();
+            maxEvent.commit();
+            r.stop();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            for (var e : events) {
+                System.out.println(e);
+            }
+            if (events.size() != 3) {
+                throw new Exception("Expected three events: TimeMeasureEvent::id=max, TimeMeasureEventid=min and MethodTiming::method=takeNap()");
+            }
+            RecordedEvent max = findWitdId(events, "max");
+            RecordedEvent min = findWitdId(events, "min");
+
+            events.remove(min);
+            events.remove(max);
+            Duration minDuration = min.getDuration();
+            Duration maxDuration = max.getDuration();
+            RecordedEvent timingEvent = events.get(0);
+            Duration d = timingEvent.getDuration("average");
+            if (d.compareTo(min.getDuration()) < 0) {
+                throw new Exception("Expected duration to be at least " + minDuration + ", was " + d);
+            }
+            if (d.compareTo(max.getDuration()) > 0) {
+                throw new Exception("Expected duration to be at most " + maxDuration + ", was " + d);
+            }
+            RecordedMethod method = timingEvent.getValue("method");
+            String methodName = method.getType().getName() + "::" + method.getName() + " " + method.getDescriptor();
+            String expected = TestMethodTiming.class.getName() + "::takeNap ()V";
+            if (!methodName.equals(expected)) {
+                System.out.println(expected);
+                throw new Exception("Expected method " + expected + " in event, but was " +methodName);
+            }
+            if (timingEvent.getLong("invocations") != 1) {
+                throw new Exception("Expected one invocation");
+            }
+        }
+    }
+
+    private static RecordedEvent findWitdId(List<RecordedEvent> events, String id) throws Exception {
+        for (RecordedEvent event : events) {
+            if (event.hasField("id")) {
+                if (event.getString("id").equals(id)) {
+                    return event;
+                }
+            }
+        }
+        throw new Exception("Could not find event with ID " + id);
+    }
+
+    private static void takeNap() throws Exception {
+        TimeMeasureEvent minEvent = new TimeMeasureEvent();
+        minEvent.begin();
+        minEvent.id = "min";
+        Thread.sleep(10);
+        minEvent.commit();
+    }
+
+    private static void testCount() throws Exception {
+        long invocations = 100_000;
+        try (Recording r = new Recording()) {
+            zebra();
+            String filter = TestMethodTiming.class.getName() + "::zebra";
+            r.enable(EVENT_NAME).with("period", "endChunk").with("filter", filter);
+            r.start();
+            for (int i = 0; i < invocations; i++) {
+                zebra();
+            }
+            r.stop();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            Events.hasEvents(events);
+            for (RecordedEvent event : events) {
+                Events.assertField(event, "invocations").equal(invocations);
+            }
+        }
+    }
+
+    private static void zebra() {
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestMethodTrace.java b/test/jdk/jdk/jfr/event/tracing/TestMethodTrace.java
new file mode 100644
index 00000000000..a5fd1430627
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestMethodTrace.java
@@ -0,0 +1,113 @@
+/*
+ * 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.event.tracing;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import jdk.jfr.Event;
+import jdk.jfr.StackTrace;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Basic test of the MethodTrace event.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestMethodTrace
+ **/
+public class TestMethodTrace {
+    private static final String EVENT_NAME = "jdk.MethodTrace";
+    private static final String CLASS_NAME = TestMethodTrace.class.getName();
+
+    @StackTrace(false)
+    private static class OuterMeasurement extends Event {
+    }
+
+    @StackTrace(false)
+    private static class InnerMeasurement extends Event {
+    }
+
+    public static void main(String... args) throws Exception {
+        AtomicReference<RecordedEvent> o = new AtomicReference<>();
+        AtomicReference<RecordedEvent> i = new AtomicReference<>();
+        AtomicReference<RecordedEvent> e = new AtomicReference<>();
+        try (RecordingStream s = new RecordingStream()) {
+            s.enable(EVENT_NAME).with("filter", CLASS_NAME + "::bar");
+            s.onEvent(EVENT_NAME, e::set);
+            s.onEvent(OuterMeasurement.class.getName(), o::set);
+            s.onEvent(InnerMeasurement.class.getName(), i::set);
+            s.startAsync();
+            foo();
+            s.stop();
+        }
+        RecordedEvent event = e.get();
+        RecordedEvent outer = o.get();
+        RecordedEvent inner = i.get();
+        System.out.println(event);
+
+        System.out.println("Outer start          : " + outer.getStartTime());
+        System.out.println("  Method Trace start : " + event.getStartTime());
+        System.out.println("   Inner start       : " + inner.getStartTime());
+        System.out.println("   Inner end         : " + inner.getEndTime());
+        System.out.println("  Method Trace end   : " + event.getEndTime());
+        System.out.println("Outer end            : " + outer.getEndTime());
+
+        if (event.getStartTime().isBefore(outer.getStartTime())) {
+            throw new Exception("Too early start time");
+        }
+        if (event.getStartTime().isAfter(inner.getStartTime())) {
+            throw new Exception("Too late start time");
+        }
+        if (event.getEndTime().isBefore(inner.getEndTime())) {
+            throw new Exception("Too early end time");
+        }
+        if (event.getEndTime().isAfter(outer.getEndTime())) {
+            throw new Exception("Too late end time");
+        }
+        RecordedMethod method = event.getValue("method");
+        if (!method.getName().equals("bar")) {
+            throw new Exception("Expected method too be bar()");
+        }
+        RecordedMethod topMethod = event.getStackTrace().getFrames().get(0).getMethod();
+        if (!topMethod.getName().equals("foo")) {
+            throw new Exception("Expected top frame too be foo()");
+        }
+    }
+
+    private static void foo() {
+        OuterMeasurement event = new OuterMeasurement();
+        event.begin();
+        bar();
+        event.commit();
+    }
+
+    private static void bar() {
+        InnerMeasurement event = new InnerMeasurement();
+        event.begin();
+        event.commit();
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestMultipleRecordings.java b/test/jdk/jdk/jfr/event/tracing/TestMultipleRecordings.java
new file mode 100644
index 00000000000..b06fe019810
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestMultipleRecordings.java
@@ -0,0 +1,221 @@
+/*
+ * 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.event.tracing;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.EventNames;
+/**
+ * @test
+ * @summary Tests that method tracing can be used with multiple recordings.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm
+ *           -Xlog:jfr+methodtrace=debug
+ *           jdk.jfr.event.tracing.TestMultipleRecordings
+ **/
+public class TestMultipleRecordings {
+    private static final String METHOD_TRACE = "jdk.MethodTrace";
+    private static final String METHOD_TIMING = "jdk.MethodTiming";
+    private static final String CLASS_NAME = TestMultipleRecordings.class.getName();
+
+    public static void main(String... args) throws Exception {
+        testNestedMethodTrace();
+        testNestedMethodTiming();
+    }
+
+    private static void testNestedMethodTiming() throws Exception {
+        List<RecordedEvent> outerEvents = new ArrayList<>();
+        List<RecordedEvent> innerEvents = new ArrayList<>();
+
+        runNested(METHOD_TIMING, outerEvents, innerEvents);
+        var outerBatches = groupByEndTime(outerEvents);
+        System.out.println("Number of outer batches: " + outerBatches.size());
+        // Outer started
+        assertTimingBatch("outer: started", outerBatches.get(0), Map.of("foo", 0, "baz", 0));
+        assertTimingBatch("outer: initial to bestarted", outerBatches.get(1), Map.of("foo", 1, "baz", 1));
+        // Inner started
+        assertTimingBatch("outer: inner started", outerBatches.get(2), Map.of("foo", 1, "baz", 1, "bar", 0));
+        assertTimingBatch("outer: inner ended", outerBatches.get(3), Map.of("foo", 2, "baz", 2, "bar", 1));
+        // Inner stopped
+        assertTimingBatch("outer: only outer", outerBatches.get(4), Map.of("foo", 2, "baz", 2));
+        assertTimingBatch("outer: ending", outerBatches.get(5), Map.of("foo", 3, "baz", 3));
+        // Outer stopped
+
+        var innerBatches = groupByEndTime(innerEvents);
+        System.out.println("Number of inner batches: " + innerBatches.size());
+        assertTimingBatch("inner: started", innerBatches.get(0), Map.of("foo", 1, "baz", 1, "bar", 0));
+        assertTimingBatch("inner: ended", innerBatches.get(1), Map.of("foo", 2, "baz", 2, "bar", 1));
+    }
+
+    private static void assertTimingBatch(String batchName, List<RecordedEvent> events, Map<String, Integer> expected) throws Exception {
+        Map<String, Integer> map = new HashMap<>();
+        for (RecordedEvent e : events) {
+            RecordedMethod m = e.getValue("method");
+            String name = m.getName();
+            int invocations = (int) e.getLong("invocations");
+            map.put(name, invocations);
+        }
+        if (!map.equals(expected)) {
+            printBatch("Expected:", expected);
+            printBatch("Was:", map);
+            throw new Exception("Batch '" + batchName + "' not as expected");
+        }
+    }
+
+    private static void printBatch(String name, Map<String, Integer> batch) {
+        System.out.println(name);
+        for (var entry : batch.entrySet()) {
+            System.out.println(entry.getKey() + " = " + entry.getValue());
+        }
+    }
+
+    private static List<List<RecordedEvent>> groupByEndTime(List<RecordedEvent> events) {
+        var listList = new ArrayList<List<RecordedEvent>>();
+        List<RecordedEvent> list = null;
+        Instant last = null;
+        while (!events.isEmpty()) {
+            RecordedEvent event = removeEarliest(events);
+            Instant timestamp = event.getEndTime();
+            if (last == null || !timestamp.equals(last)) {
+                list = new ArrayList<RecordedEvent>();
+                listList.add(list);
+            }
+            list.add(event);
+            last = event.getEndTime();
+        }
+        return listList;
+    }
+
+    private static RecordedEvent removeEarliest(List<RecordedEvent> events) {
+        RecordedEvent earliest = null;
+        for (RecordedEvent event : events) {
+            if (earliest == null || event.getEndTime().isBefore(earliest.getEndTime())) {
+                earliest = event;
+            }
+        }
+        events.remove(earliest);
+        return earliest;
+    }
+
+    private static void testNestedMethodTrace() throws Exception {
+        List<RecordedEvent> outerEvents = new ArrayList<>();
+        List<RecordedEvent> innerEvents = new ArrayList<>();
+
+        runNested(METHOD_TRACE, outerEvents, innerEvents);
+
+        assertMethodTraceEvents(outerEvents, "Outer", "foo", 3);
+        assertMethodTraceEvents(outerEvents, "Outer", "bar", 1);
+        assertMethodTraceEvents(outerEvents, "Outer", "baz", 3);
+        assertMethodTraceEvents(innerEvents, "Inner", "foo", 1);
+        assertMethodTraceEvents(innerEvents, "Inner", "bar", 1);
+        assertMethodTraceEvents(innerEvents, "Inner", "baz", 1);
+    }
+
+    private static void runNested(String eventName, List<RecordedEvent> outerEvents, List<RecordedEvent> innerEvents)
+            throws IOException {
+        try (Recording outer = new Recording()) {
+            outer.enable(eventName).with("filter",
+               CLASS_NAME + "::foo;" +
+               CLASS_NAME + "::baz");
+            outer.start();
+            foo();
+            bar();
+            baz();
+            nap();
+            try (Recording inner = new Recording()) {
+                inner.enable(eventName).with("filter",
+                    CLASS_NAME + "::foo;" +
+                    CLASS_NAME + "::bar");
+                inner.start();
+                foo();
+                bar();
+                baz();
+                inner.stop();
+                innerEvents.addAll(Events.fromRecording(inner));
+                nap();
+            }
+            foo();
+            bar();
+            baz();
+            nap();
+            outer.stop();
+            outerEvents.addAll(Events.fromRecording(outer));
+        }
+    }
+
+    // Ensure that periodic events at endChunk get a different
+    // timestamp than periodic events at beginChunk
+    private static void nap() {
+        Instant time = Instant.now();
+        do {
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                // ignore
+            }
+        } while (time.plus(Duration.ofMillis(10)).isAfter(Instant.now()));
+    }
+
+    private static void assertMethodTraceEvents(List<RecordedEvent> events, String context, String methodName, int expected) throws Exception {
+        int actual = 0;
+        for (RecordedEvent event : events) {
+            RecordedMethod method = event.getValue("method");
+            if (method.getName().equals(methodName)) {
+                actual++;
+            }
+        }
+        if (actual != expected) {
+            System.out.println(context);
+            for (RecordedEvent event : events) {
+                System.out.println(event);
+            }
+            throw new Exception(context + ": expected " + expected + " events for method " + methodName + ", got actual " + actual);
+        }
+    }
+
+    private static void foo() {
+        System.out.println("Executing: foo()");
+    }
+
+    private static void bar() {
+        System.out.println("Executing: bar()");
+    }
+
+    private static void baz() {
+        System.out.println("Executing: baz()");
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java b/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java
new file mode 100644
index 00000000000..5b51d234661
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestMultipleThreads.java
@@ -0,0 +1,137 @@
+/*
+ * 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.event.tracing;
+
+import java.util.ArrayList;
+import java.util.List;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Tests that tracing and timing work when using multiple threads.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm
+ *           -Xlog:jfr+methodtrace=trace
+ *           jdk.jfr.event.tracing.TestMultipleThreads
+ **/
+public class TestMultipleThreads {
+    private static final String METHOD_PREFIX = TestMultipleThreads.class.getName() + "::method";
+    private static final String TRACE_EVENT = "jdk.MethodTrace";
+    private static final String TIMING_EVENT = "jdk.MethodTiming";
+    private static int METHOD_COUNT = 5;
+    private static int THREAD_COUNT = 5;
+    private static int INVOCATIONS_PER_THREAD = 25_000; // Low enough to fit one chunk
+    private static int INVOCATIONS_PER_METHOD = THREAD_COUNT * INVOCATIONS_PER_THREAD / METHOD_COUNT;
+
+    public static class TestThread extends Thread {
+        public void run() {
+            for (int i = 0; i < INVOCATIONS_PER_THREAD; i++) {
+                switch (i % METHOD_COUNT) {
+                case 0 -> method0();
+                case 1 -> method1();
+                case 2 -> method2();
+                case 3 -> method3();
+                case 4 -> method4();
+                }
+            }
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        List<RecordedEvent> traceEvents = new ArrayList<>();
+        List<RecordedEvent> timingEvents = new ArrayList<>();
+        try (RecordingStream r = new RecordingStream()) {
+            r.enable(TRACE_EVENT).with("filter",
+                METHOD_PREFIX + "0;" +
+                METHOD_PREFIX + "2;");
+            r.enable(TIMING_EVENT).with("filter",
+                METHOD_PREFIX + "0;" +
+                METHOD_PREFIX + "1;" +
+                METHOD_PREFIX + "2;" +
+                METHOD_PREFIX + "3;" +
+                METHOD_PREFIX + "4;")
+             .with("period", "endChunk");
+            List<TestThread> threads = new ArrayList<>();
+            for (int i = 0; i < THREAD_COUNT; i++) {
+                threads.add(new TestThread());
+            }
+            r.setReuse(false);
+            r.onEvent(TRACE_EVENT, traceEvents::add);
+            r.onEvent(TIMING_EVENT, timingEvents::add);
+            r.startAsync();
+            for (TestThread t : threads) {
+                t.start();
+            }
+            for (TestThread t : threads) {
+                t.join();
+            }
+            r.stop();
+            verifyTraceEvents(traceEvents);
+            for (RecordedEvent event : timingEvents) {
+                System.out.println(event);
+            }
+            verifyTimingEvents(timingEvents);
+        }
+    }
+
+    private static void verifyTimingEvents(List<RecordedEvent> events) throws Exception {
+        for (RecordedEvent e : events) {
+            long invocations = e.getLong("invocations");
+            if (invocations != INVOCATIONS_PER_METHOD) {
+                RecordedMethod method = e.getValue("method");
+                String msg = "Expected " + INVOCATIONS_PER_METHOD + " invocations for ";
+                msg += method.getName() + ", but got " + invocations;
+                throw new Exception(msg);
+            }
+        }
+        if (events.size() != METHOD_COUNT) {
+            throw new Exception("Expected " + METHOD_COUNT + " timing events, one per method");
+        }
+    }
+
+    private static void verifyTraceEvents(List<RecordedEvent> events) throws Exception {
+        int expected = 2 * INVOCATIONS_PER_METHOD;
+        if (events.size() != expected) {
+            throw new Exception("Expected " + expected + " event, but got " + events.size());
+        }
+    }
+
+    private static void method0() {
+    }
+
+    private static void method1() {
+    }
+
+    private static void method2() {
+    }
+
+    private static void method3() {
+    }
+
+    private static void method4() {
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestRestrictedClasses.java b/test/jdk/jdk/jfr/event/tracing/TestRestrictedClasses.java
new file mode 100644
index 00000000000..2bc567e23f1
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestRestrictedClasses.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.jfr.event.tracing;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import jdk.jfr.FlightRecorder;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @summary Tests that restricted classes cannot be timed or traced.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.tracing.TestRestrictedClasses
+ **/
+public class TestRestrictedClasses {
+
+    public static void main(String... args) throws Exception {
+        testJdkJfr();
+        testConcurrentHashMap();
+        testConcurrentHashMapNode();
+        testAtomicLong();
+    }
+
+    private static void testJdkJfr() throws Exception {
+        testDebug(FlightRecorder.class.getName(), null);
+    }
+
+    private static void testConcurrentHashMapNode() throws Exception {
+        testDebug(ConcurrentHashMap.class.getName() + "$Node", "Risk of recursion, skipping bytecode generation for java.util.concurrent.ConcurrentHashMap$Node");
+    }
+
+    private static void testConcurrentHashMap() throws Exception {
+        testDebug(ConcurrentHashMap.class.getName(), "Risk of recursion, skipping bytecode generation for java.util.concurrent.ConcurrentHashMap");
+    }
+
+    private static void testAtomicLong() throws Exception {
+        testDebug(AtomicLong.class.getName(), "Risk of recursion, skipping bytecode generation for java.util.concurrent.atomic.AtomicLong");
+    }
+
+    private static void testDebug(String clazz, String expected) throws Exception {
+        List<String> cmds = new ArrayList<>();
+        cmds.add("-Xlog:jfr+methodtrace=debug");
+        cmds.add("-XX:StartFlightRecording:method-trace=" + clazz);
+        cmds.add("-version");
+        OutputAnalyzer out = ProcessTools.executeTestJava(cmds);
+        out.shouldHaveExitValue(0);
+        if (expected != null) {
+            out.shouldContain(expected);
+        }
+        // Check that bytecode was not generated
+        out.shouldNotMatch("Bytecode generation");
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestRetransformFalse.java b/test/jdk/jdk/jfr/event/tracing/TestRetransformFalse.java
new file mode 100644
index 00000000000..60bcda4e40b
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestRetransformFalse.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.
+ */
+package jdk.jfr.event.tracing;
+
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @summary Tests that tracing doesn't work retransformation disabled.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm
+ *     -Xlog:jfr+methodtrace=info
+ *     -XX:FlightRecorderOptions:retransform=false
+ *     jdk.jfr.event.tracing.TestRetransformFalse false
+ * @run main/othervm -Xlog:jfr+methodtrace=info
+ *      -Xlog:jfr+methodtrace=info
+ *      -XX:FlightRecorderOptions:retransform=true
+ *      jdk.jfr.event.tracing.TestRetransformFalse true
+ **/
+public class TestRetransformFalse {
+    private static final String FILTER = "jdk.jfr.event.tracing.TestRetransformFalse::foo";
+    public static void main(String... args) throws Exception {
+        boolean retransform = switch (args[0]) {
+            case "true" -> true;
+            case "false" -> false;
+            default -> throw new Exception("Test error, expected 'true' or 'false' argument to test.");
+        };
+        System.out.println("Testing -XX:FlightRecorderOptions:retransform=" + retransform);
+        try (Recording r = new Recording()) {
+            r.enable("jdk.MethodTrace")
+             .with("filter", FILTER);
+            r.enable("jdk.MethodTiming")
+             .with("filter", FILTER)
+             .with("period", "endChunk");
+            r.start();
+            foo();
+            r.stop();
+            List<RecordedEvent> events = Events.fromRecording(r);
+            System.out.println(events);
+            if (retransform) {
+                Events.assertEventCount(events, 2);
+            } else {
+                Events.assertEventCount(events, 0);
+            }
+        }
+    }
+
+    private static void foo() {
+        System.out.println("Running Foo");
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestWithClassLoaders.java b/test/jdk/jdk/jfr/event/tracing/TestWithClassLoaders.java
new file mode 100644
index 00000000000..0dca1aa97cc
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestWithClassLoaders.java
@@ -0,0 +1,134 @@
+/*
+ * 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.event.tracing;
+
+import java.io.IOException;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Tests that filters can be applied to classes across multiple class loaders and that
+ *          method tracing works after class unloading.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @build jdk.jfr.event.tracing.Car
+ * @run main/othervm -XX:-DisableExplicitGC -Xlog:jfr+methodtrace=trace
+ *      jdk.jfr.event.tracing.TestWithClassLoaders
+ **/
+public class TestWithClassLoaders {
+    private static final String METHOD_TRACE = "jdk.MethodTrace";
+    private static final String METHOD_TIMING = "jdk.MethodTiming";
+    private static final String CLASS_NAME = "jdk.jfr.event.tracing.Car";
+
+    public static void main(String... args) throws Exception {
+        var traceEvents = new CopyOnWriteArrayList<RecordedEvent>();
+        var timingEvents = new CopyOnWriteArrayList<RecordedEvent>();
+        try (var r = new RecordingStream()) {
+            Runnable beforeCar = createCar("before");
+            r.setReuse(false);
+            r.enable(METHOD_TRACE)
+             .with("filter", CLASS_NAME + "::run");
+            r.enable(METHOD_TIMING)
+             .with("filter", CLASS_NAME + "::run").with("period", "endChunk");
+            r.onEvent(METHOD_TRACE, traceEvents::add);
+            r.onEvent(METHOD_TIMING, timingEvents::add);
+            r.startAsync();
+            Runnable duringCar = createCar("during");
+            Runnable garbageCar = createCar("garbage");
+            beforeCar.run();
+            duringCar.run();
+            garbageCar.run();
+            garbageCar = null;
+            System.gc();
+            System.gc();
+            r.stop();
+            System.out.println("Method Trace events:");
+            System.out.println(traceEvents);
+            if (traceEvents.size() != 3) {
+                throw new Exception("Expected 3 Method Trace events, one for each class loader");
+            }
+            for (RecordedEvent event : traceEvents) {
+                RecordedMethod method = event.getValue("method");
+                String methodName = method.getName();
+                if (!methodName.equals("run")) {
+                    throw new Exception("Expected method name to be 'run'");
+                }
+            }
+            System.out.println("Method Timing events:");
+            System.out.println(timingEvents);
+            if (timingEvents.size() != 3) {
+                throw new Exception("Expected 3 Method Timing events, one for each class loader");
+            }
+            int totalInvocations = 0;
+            for (RecordedEvent event : timingEvents) {
+                totalInvocations += event.getLong("invocations");
+            }
+            if (totalInvocations != 3) {
+                throw new Exception("Expected three invocations in total, was " + totalInvocations);
+            }
+        }
+    }
+
+    public static Runnable createCar(String name) throws Exception {
+        byte[] bytes = loadCarBytes();
+        ClassLoader parent = TestWithClassLoaders.class.getClassLoader();
+        CarLoader loader = new CarLoader(name, bytes, parent);
+        Class<?> clazz = loader.loadClass(CLASS_NAME);
+        Object instance = clazz.getConstructor().newInstance();
+        return (Runnable) instance;
+    }
+
+    private static byte[] loadCarBytes() throws IOException {
+        String location = "/" + CLASS_NAME.replaceAll("\\.", "/").concat(".class");
+        try (var is = TestWithClassLoaders.class.getResourceAsStream(location)) {
+            return is.readAllBytes();
+        }
+    }
+
+    public static class CarLoader extends ClassLoader {
+        private final byte[] bytes;
+
+        public CarLoader(String name, byte[] bytes, ClassLoader parent) {
+            super(name, parent);
+            this.bytes = bytes;
+        }
+
+        protected Class<?> loadClass(String className, boolean resolve) throws ClassNotFoundException {
+            Class<?> clazz = findLoadedClass(className);
+            if (clazz == null && className.equals(CLASS_NAME)) {
+                clazz = defineClass(className, bytes, 0, bytes.length);
+            } else {
+                clazz = super.loadClass(className, resolve);
+            }
+            if (resolve) {
+                resolveClass(clazz);
+            }
+            return clazz;
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/tracing/TestWithModules.java b/test/jdk/jdk/jfr/event/tracing/TestWithModules.java
new file mode 100644
index 00000000000..2b115a6b65c
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/tracing/TestWithModules.java
@@ -0,0 +1,244 @@
+/*
+ * 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.event.tracing;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.jfr.Recording;
+import java.util.spi.ToolProvider;
+
+import jdk.jfr.consumer.EventStream;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Tests applying filters to methods in both exported and unexported packages
+ *          of a named module.
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.tracing.TestWithModules
+ **/
+public class TestWithModules {
+
+    /** Directory structure:
+         |-src
+           |-application
+           | |-Main.java
+           |-module
+             |-module-info.java
+             |-test
+               |-exported
+               | |- Exported.java
+               |-unexported
+                 |- UnExported.java
+    **/
+    private static String MODULE_INFO =
+    """
+    module test.exported {
+       exports test.exported;
+    }
+    """;
+
+    private static String EXPORTED_CLASS =
+    """
+    package test.exported;
+
+    import test.unexported.Unexported;
+
+    public class Exported {
+       public static void run() {
+          System.out.println("Exported::run executed!");
+          Unexported.run();
+       }
+    }
+    """;
+
+    private static String UNEXPORTED_CLASS =
+    """
+    package test.unexported;
+
+    public class Unexported {
+       public static void run() {
+          System.out.println("Unexported::run executed!");
+       }
+    }
+    """;
+
+    private static String MAIN_CLASS =
+    """
+    import test.exported.Exported;
+    import jdk.jfr.Recording;
+    import java.nio.file.Path;
+
+    public class Main {
+       public static void main(String... args) throws Exception {
+          Path file = Path.of(args[0]);
+          boolean before = args[1].equals("run-before");
+          System.out.println("Main before=" + before);
+          try(Recording r = new Recording()) {
+            if (before) {
+              // Load class before JFR starts
+              Exported.run();
+            }
+            r.enable("jdk.MethodTrace").with("filter", "test.unexported.Unexported::run");
+            r.enable("jdk.MethodTiming").with("filter", "test.unexported.Unexported::run").with("period", "endChunk");
+            r.start();
+            System.out.println("About to run with instrumented");
+            Exported.run();
+            r.stop();
+            r.dump(file);
+            System.out.println("Dump written " + file);
+          }
+       }
+    }
+    """;
+
+    public static void main(String... args) throws Exception {
+        Path src = Path.of("src").toAbsolutePath();
+        Path modulePath = materializeModule(src);
+        Path mainFile = materializeMain(src);
+        Path output = Files.createDirectory(Path.of("output").toAbsolutePath());
+        List<Path> srcFiles = Files.walk(modulePath).filter(Files::isRegularFile).toList();
+        List<String> arguments = new ArrayList<>();
+        arguments.add("-d");
+        arguments.add(output.toString());
+        for (Path p : srcFiles) {
+            arguments.add(p.toAbsolutePath().toString());
+        }
+        if (!compile(arguments)) {
+            throw new Exception("Could not compile classes");
+        }
+        testClassloadBefore(mainFile, output);
+        testClassloadDuring(mainFile, output);
+    }
+
+    private static Path materializeMain(Path src) throws IOException {
+        Path srcApplication = Files.createDirectories(src.resolve("application"));
+        Path mainFile = srcApplication.resolve("Main.java");
+        Files.writeString(mainFile, MAIN_CLASS);
+        return mainFile;
+    }
+
+    private static void testClassloadBefore(Path mainFile, Path modulePath) throws Exception {
+        Path file = Path.of("before.jfr").toAbsolutePath();
+        execute(file, mainFile, modulePath, true);
+        verifyRecording("already loaded class", file);
+    }
+
+    private static void testClassloadDuring(Path mainFile, Path modulePath) throws Exception {
+        Path file = Path.of("during.jfr").toAbsolutePath();
+        execute(file, mainFile, modulePath, false);
+        verifyRecording("loading of class", file);
+    }
+
+    private static void verifyRecording(String title, Path file) throws Exception {
+        List<RecordedEvent> traceEvents = new ArrayList<>();
+        List<RecordedEvent> timingEvents = new ArrayList<>();
+        System.out.println("********* Verifying " + title + " ********");
+        try (EventStream s = EventStream.openFile(file)) {
+            s.setReuse(false);
+            s.onEvent("jdk.MethodTrace", traceEvents::add);
+            s.onEvent("jdk.MethodTiming", timingEvents::add);
+            s.onEvent(System.out::println);
+            s.start();
+        }
+        assertMethod(traceEvents, "test.unexported.Unexported", "run");
+        assertMethod(timingEvents, "test.unexported.Unexported", "run");
+        assertMethodTimingCount(timingEvents.get(0), 1);
+    }
+
+    private static void assertMethodTimingCount(RecordedEvent event, int expected) throws Exception {
+        long invocations = event.getLong("invocations");
+        if (invocations != expected) {
+            throw new Exception("Expected invocations to be " + expected + ", but was " + invocations);
+        }
+    }
+
+    private static void assertMethod(List<RecordedEvent> events, String className, String methodName) throws Exception {
+        for (RecordedEvent event : events) {
+            RecordedMethod method = event.getValue("method");
+            if (method.getName().equals(methodName) && method.getType().getName().equals(className)) {
+                return;
+            }
+        }
+        throw new Exception("Expected method named " + className + "::" + methodName);
+    }
+
+    private static void execute(Path jfrFile, Path mainFile, Path modulePath, boolean before) throws Exception {
+        String[] c = new String[7];
+        c[0] = "--module-path";
+        c[1] = modulePath.toString();
+        c[2] = "--add-modules";
+        c[3] = "test.exported";
+        c[4] = mainFile.toString();
+        c[5] = jfrFile.toString();
+        c[6] = before ? "run-before" : "not-run-before";
+        OutputAnalyzer oa = ProcessTools.executeTestJava(c);
+        oa.waitFor();
+        oa.shouldHaveExitValue(0);
+    }
+
+    private static Path materializeModule(Path src) throws IOException {
+        Path srcModule = Files.createDirectories(src.resolve("module"));
+        Path moduleFile = srcModule.resolve("module-info.java");
+        Files.writeString(moduleFile, MODULE_INFO);
+
+        Path exported = Files.createDirectories(srcModule.resolve("test").resolve("exported"));
+        Path exportedJava = exported.resolve("Exported.java");
+        Files.writeString(exportedJava, EXPORTED_CLASS);
+
+        Path unexported = Files.createDirectories(srcModule.resolve("test").resolve("unexported"));
+        Path unexportedJava = unexported.resolve("Unexported.java");
+        Files.writeString(unexportedJava, UNEXPORTED_CLASS);
+
+        return srcModule;
+    }
+
+    private static boolean compile(List<String> arguments) {
+        Optional<ToolProvider> tp = ToolProvider.findFirst("javac");
+        if (tp.isEmpty()) {
+            return false;
+        }
+        var tool = tp.get();
+        String[] options = arguments.toArray(String[]::new);
+        int ret = tool.run(System.out, System.err, options);
+        return ret == 0;
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index b2d8bcb12bf..904abe8e3e2 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -91,6 +91,8 @@ public class EventNames {
     public static final String NativeAgent = PREFIX + "NativeAgent";
     public static final String DeprecatedInvocation = PREFIX + "DeprecatedInvocation";
     public static final String SafepointLatency = PREFIX + "SafepointLatency";
+    public static final String MethodTiming = PREFIX + "MethodTiming";
+    public static final String MethodTrace = PREFIX + "MethodTrace";
 
     // This event is hard to test
     public static final String ReservedStackActivation = PREFIX + "ReservedStackActivation";
diff --git a/test/lib/jdk/test/lib/jfr/Events.java b/test/lib/jdk/test/lib/jfr/Events.java
index 5676b7021d6..8bbf22ca63a 100644
--- a/test/lib/jdk/test/lib/jfr/Events.java
+++ b/test/lib/jdk/test/lib/jfr/Events.java
@@ -361,6 +361,16 @@ public static void hasNotEvent(List<RecordedEvent> events, String name) throws I
         }
     }
 
+    public static RecordedEvent getFirst(List<RecordedEvent> events, String name) throws Exception {
+        for (RecordedEvent event : events) {
+            if (event.getEventType().getName().equals(name)) {
+                return event;
+            }
+        }
+        Asserts.fail("Missing event " + name + " in recording " + events.toString());
+        return null;
+    }
+
     private static boolean containsEvent(List<RecordedEvent> events, String name) {
         for (RecordedEvent event : events) {
             if (event.getEventType().getName().equals(name)) {
@@ -370,6 +380,12 @@ private static boolean containsEvent(List<RecordedEvent> events, String name) {
         return false;
     }
 
+    public static void assertEventCount(List<RecordedEvent> events, int count) throws Exception {
+        if (events.size() != count) {
+            throw new Exception("Expected " + count + " events, found " + events.size());
+        }
+    }
+
     public static void assertTopFrame(RecordedEvent event, Class<?> expectedClass, String expectedMethodName) {
         assertTopFrame(event, expectedClass.getName(), expectedMethodName);
     }

From a2743bab4fd203b0791cf47e617c1a95b05ab3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 29 May 2025 09:19:02 +0000
Subject: [PATCH 710/901] 8357458: Missing Highlight.js license file

Reviewed-by: jlahoda
---
 .../doclets/formats/html/HtmlDoclet.java      |  7 +++-
 src/jdk.javadoc/share/legal/highlightjs.md    | 34 +++++++++++++++++
 .../CheckLibraryVersions.java                 |  9 +++--
 .../testLegalNotices/TestLegalNotices.java    | 37 +++++++++++++------
 4 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 src/jdk.javadoc/share/legal/highlightjs.md

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 c6f583de361..47b2322226e 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
@@ -341,7 +341,7 @@ protected void generateOtherFiles(ClassTree classTree)
             copyResource(DocPaths.JQUERY_DIR.resolve(DocPaths.JQUERY_UI_CSS),
                     DocPaths.RESOURCE_FILES.resolve(DocPaths.JQUERY_UI_CSS), false);        }
 
-        copyLegalFiles(options.createIndex());
+        copyLegalFiles(options.createIndex(), options.syntaxHighlight());
         // Print a notice if the documentation contains diagnostic markers
         if (messages.containsDiagnosticMarkers()) {
             messages.notice("doclet.contains.diagnostic.markers");
@@ -357,7 +357,7 @@ protected void generateFiles() throws DocletException {
         }
     }
 
-    private void copyLegalFiles(boolean includeJQuery) throws DocletException {
+    private void copyLegalFiles(boolean includeJQuery, boolean includeHighlightJs) throws DocletException {
         Path legalNoticesDir;
         String legalNotices = configuration.getOptions().legalNotices();
         switch (legalNotices) {
@@ -401,6 +401,9 @@ private void copyLegalFiles(boolean includeJQuery) throws DocletException {
                     if (entry.getFileName().toString().startsWith("jquery") && !includeJQuery) {
                         continue;
                     }
+                    if (entry.getFileName().toString().equals("highlightjs.md") && !includeHighlightJs) {
+                        continue;
+                    }
                     DocPath filePath = DocPaths.LEGAL.resolve(entry.getFileName().toString());
                     DocFile df = DocFile.createFileForOutput(configuration, filePath);
                     df.copyFile(DocFile.createFileForInput(configuration, entry));
diff --git a/src/jdk.javadoc/share/legal/highlightjs.md b/src/jdk.javadoc/share/legal/highlightjs.md
new file mode 100644
index 00000000000..3dece23578e
--- /dev/null
+++ b/src/jdk.javadoc/share/legal/highlightjs.md
@@ -0,0 +1,34 @@
+## Highlight.js v11.11.1
+
+### Highlight.js License
+```
+BSD 3-Clause License
+
+Copyright (c) 2006, Ivan Sagalaev.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
diff --git a/test/langtools/jdk/javadoc/doclet/checkLibraryVersions/CheckLibraryVersions.java b/test/langtools/jdk/javadoc/doclet/checkLibraryVersions/CheckLibraryVersions.java
index 4e731a42f10..f36ef92109a 100644
--- a/test/langtools/jdk/javadoc/doclet/checkLibraryVersions/CheckLibraryVersions.java
+++ b/test/langtools/jdk/javadoc/doclet/checkLibraryVersions/CheckLibraryVersions.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 8293177 8324774
+ * @bug 8293177 8324774 8357458
  * @summary Verify version numbers in legal files
  * @library /test/lib
  * @build jtreg.SkippedException
@@ -47,7 +47,7 @@
 public class CheckLibraryVersions {
     static class SourceDirNotFound extends Error {}
     // Regex pattern for library name and version in legal Markdown file
-    static final Pattern versionPattern = Pattern.compile("## ([\\w\\s]+) v(\\d+(\\.\\d+){1,2})");
+    static final Pattern versionPattern = Pattern.compile("## ([\\w\\s.]+) v(\\d+(\\.\\d+){1,2})");
 
     // Map of 3rd party libraries. The keys are the names of files in the legal directory,
     // the values are lists of templates for library files with the following placeholders:
@@ -56,7 +56,8 @@ static class SourceDirNotFound extends Error {}
     static final Map<String, List<String>> libraries = Map.of(
             "jquery.md", List.of("jquery/jquery-%V%M.js"),
             "jqueryUI.md", List.of("jquery/jquery-ui%M.js", "jquery/jquery-ui%M.css"),
-            "dejavufonts.md", List.of("fonts/dejavu.css")
+            "dejavufonts.md", List.of("fonts/dejavu.css"),
+            "highlightjs.md", List.of("highlight.js")
     );
 
     public static void main(String... args) throws Exception {
diff --git a/test/langtools/jdk/javadoc/doclet/testLegalNotices/TestLegalNotices.java b/test/langtools/jdk/javadoc/doclet/testLegalNotices/TestLegalNotices.java
index 29da4d98972..4c3f26b9d34 100644
--- a/test/langtools/jdk/javadoc/doclet/testLegalNotices/TestLegalNotices.java
+++ b/test/langtools/jdk/javadoc/doclet/testLegalNotices/TestLegalNotices.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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8259530
+ * @bug 8259530 8357458
  * @summary Generated docs contain MIT/GPL-licenced works without reproducing the licence
  * @library  /tools/lib ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
@@ -61,6 +61,10 @@ enum IndexKind {
         INDEX, NO_INDEX
     }
 
+    enum HighlightKind {
+        HIGHLIGHT, NO_HIGHLIGHT
+    }
+
 
     @Test
     public void testCombo(Path base) throws IOException {
@@ -71,14 +75,17 @@ public void testCombo(Path base) throws IOException {
 
         for (var optionKind : OptionKind.values()) {
             for (var indexKind : IndexKind.values()) {
-                test(base, src, legal, optionKind, indexKind);
+                for (var highlightKind : HighlightKind.values()) {
+                    test(base, src, legal, optionKind, indexKind, highlightKind);
+                }
             }
         }
     }
 
-    void test(Path base, Path src, Path legal, OptionKind optionKind, IndexKind indexKind) throws IOException {
-        System.out.println("testing " + optionKind + " " + indexKind);
-        Path out = base.resolve(optionKind + "-" + indexKind).resolve("out");
+    void test(Path base, Path src, Path legal, OptionKind optionKind, IndexKind indexKind,
+              HighlightKind highlightKind) throws IOException {
+        System.out.println("testing " + optionKind + " " + indexKind + " " + highlightKind);
+        Path out = base.resolve(optionKind + "-" + indexKind + "-" + highlightKind).resolve("out");
         List<String> args = new ArrayList<>();
         args.addAll(List.of(
                 "-d", out.toString()));
@@ -87,6 +94,10 @@ void test(Path base, Path src, Path legal, OptionKind optionKind, IndexKind inde
             args.add("-noindex");
         }
 
+        if (highlightKind == HighlightKind.HIGHLIGHT) {
+            args.add("--syntax-highlight");
+        }
+
         args.addAll(List.of(
                 "-Xdoclint:-missing",
                 "--source-path", src.toString(),
@@ -103,7 +114,7 @@ void test(Path base, Path src, Path legal, OptionKind optionKind, IndexKind inde
         }
         javadoc(args.toArray(new String[0]));
 
-        Set<Path> expectFiles = getExpectFiles(optionKind, indexKind, legal);
+        Set<Path> expectFiles = getExpectFiles(optionKind, indexKind, highlightKind, legal);
         Set<Path> foundFiles = listFiles(out.resolve("legal"));
 
         checking("Checking legal notice files");
@@ -128,16 +139,18 @@ void test(Path base, Path src, Path legal, OptionKind optionKind, IndexKind inde
 
     }
 
-    Set<Path> getExpectFiles(OptionKind optionKind, IndexKind indexKind, Path legal) throws IOException {
+    Set<Path> getExpectFiles(OptionKind optionKind, IndexKind indexKind, HighlightKind highlightKind,
+                             Path legal) throws IOException {
         switch (optionKind) {
             case UNSET, DEFAULT -> {
                 Path javaHome = Path.of(System.getProperty("java.home"));
                 Path legal_javadoc = javaHome.resolve("legal").resolve("jdk.javadoc");
                 return listFiles(legal_javadoc, p ->
-                        switch (indexKind) {
-                            case INDEX -> true;
-                            case NO_INDEX -> !p.getFileName().toString().contains("jquery");
-                        });
+                        !(indexKind == IndexKind.NO_INDEX
+                                && p.getFileName().toString().contains("jquery"))
+                     && !(highlightKind == HighlightKind.NO_HIGHLIGHT
+                                && p.getFileName().toString().equals("highlightjs.md"))
+                );
             }
 
             case NONE -> {

From 4cf729cfac57c9aec692a52c1f3f95f2403e7958 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 29 May 2025 10:42:50 +0000
Subject: [PATCH 711/901] 8323497: On x64, use 32-bit immediate moves for
 narrow klass base if possible

Reviewed-by: shade, kvn, rkennke
---
 src/hotspot/cpu/x86/compressedKlass_x86.cpp   | 29 +++++++++++++------
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    | 22 +++++++++-----
 src/hotspot/share/oops/compressedKlass.cpp    |  4 +++
 src/hotspot/share/oops/compressedKlass.hpp    |  1 +
 ...essedCPUSpecificClassSpaceReservation.java |  7 +++--
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/x86/compressedKlass_x86.cpp b/src/hotspot/cpu/x86/compressedKlass_x86.cpp
index 8a06a7ba3d5..e88b7a3d4e1 100644
--- a/src/hotspot/cpu/x86/compressedKlass_x86.cpp
+++ b/src/hotspot/cpu/x86/compressedKlass_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc. 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.
  *
@@ -25,6 +25,7 @@
 
 #ifdef _LP64
 
+#include "memory/metaspace.hpp"
 #include "oops/compressedKlass.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -32,15 +33,25 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
 
   char* result = nullptr;
 
-  // Optimize for unscaled encoding; failing that, for zero-based encoding:
-  if (optimize_for_zero_base) {
-    result = reserve_address_space_for_unscaled_encoding(size, aslr);
-    if (result == nullptr) {
-      result = reserve_address_space_for_zerobased_encoding(size, aslr);
-    }
-  } // end: low-address reservation
+  assert(CompressedKlassPointers::narrow_klass_pointer_bits() == 32 ||
+         CompressedKlassPointers::narrow_klass_pointer_bits() == 22, "Rethink if we ever use different nKlass bit sizes");
+
+  // Unconditionally attempting to reserve in lower 4G first makes always sense:
+  // -CDS -COH: Try to get unscaled mode (zero base, zero shift)
+  // +CDS -COH: No zero base possible (CDS prevents it); but we still benefit from small base pointers (imm32 movabs)
+  // -CDS +COH: No zero base possible (22bit nKlass + zero base zero shift = 4MB encoding range, way too small);
+  //            but we still benefit from small base pointers (imm32 movabs)
+  // +CDS +COH: No zero base possible for multiple reasons (CDS prevents it and encoding range too small);
+  //            but we still benefit from small base pointers (imm32 movabs)
+
+  result = reserve_address_space_below_4G(size, aslr);
+
+  if (result == nullptr && optimize_for_zero_base) {
+    // Failing that, if we are running without CDS, attempt to allocate below 32G.
+    // This allows us to use zero-based encoding with a non-zero shift.
+    result = reserve_address_space_for_zerobased_encoding(size, aslr);
+  }
 
-  // Nothing more to optimize for on x64. If base != 0, we will always emit the full 64-bit immediate.
   return result;
 }
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 30f06533c39..f58a8dca98e 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -5402,24 +5402,27 @@ void  MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
 }
 
 void MacroAssembler::encode_klass_not_null(Register r, Register tmp) {
+  BLOCK_COMMENT("encode_klass_not_null {");
   assert_different_registers(r, tmp);
   if (CompressedKlassPointers::base() != nullptr) {
     if (AOTCodeCache::is_on_for_dump()) {
       movptr(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
     } else {
-      mov64(tmp, (int64_t)CompressedKlassPointers::base());
+      movptr(tmp, (intptr_t)CompressedKlassPointers::base());
     }
     subq(r, tmp);
   }
   if (CompressedKlassPointers::shift() != 0) {
     shrq(r, CompressedKlassPointers::shift());
   }
+  BLOCK_COMMENT("} encode_klass_not_null");
 }
 
 void MacroAssembler::encode_and_move_klass_not_null(Register dst, Register src) {
+  BLOCK_COMMENT("encode_and_move_klass_not_null {");
   assert_different_registers(src, dst);
   if (CompressedKlassPointers::base() != nullptr) {
-    mov64(dst, -(int64_t)CompressedKlassPointers::base());
+    movptr(dst, -(intptr_t)CompressedKlassPointers::base());
     addq(dst, src);
   } else {
     movptr(dst, src);
@@ -5427,9 +5430,11 @@ void MacroAssembler::encode_and_move_klass_not_null(Register dst, Register src)
   if (CompressedKlassPointers::shift() != 0) {
     shrq(dst, CompressedKlassPointers::shift());
   }
+  BLOCK_COMMENT("} encode_and_move_klass_not_null");
 }
 
 void  MacroAssembler::decode_klass_not_null(Register r, Register tmp) {
+  BLOCK_COMMENT("decode_klass_not_null {");
   assert_different_registers(r, tmp);
   // Note: it will change flags
   assert(UseCompressedClassPointers, "should only be used for compressed headers");
@@ -5443,13 +5448,15 @@ void  MacroAssembler::decode_klass_not_null(Register r, Register tmp) {
     if (AOTCodeCache::is_on_for_dump()) {
       movptr(tmp, ExternalAddress(CompressedKlassPointers::base_addr()));
     } else {
-      mov64(tmp, (int64_t)CompressedKlassPointers::base());
+      movptr(tmp, (intptr_t)CompressedKlassPointers::base());
     }
     addq(r, tmp);
   }
+  BLOCK_COMMENT("} decode_klass_not_null");
 }
 
 void  MacroAssembler::decode_and_move_klass_not_null(Register dst, Register src) {
+  BLOCK_COMMENT("decode_and_move_klass_not_null {");
   assert_different_registers(src, dst);
   // Note: it will change flags
   assert (UseCompressedClassPointers, "should only be used for compressed headers");
@@ -5465,7 +5472,7 @@ void  MacroAssembler::decode_and_move_klass_not_null(Register dst, Register src)
   } else {
     if (CompressedKlassPointers::shift() <= Address::times_8) {
       if (CompressedKlassPointers::base() != nullptr) {
-        mov64(dst, (int64_t)CompressedKlassPointers::base());
+        movptr(dst, (intptr_t)CompressedKlassPointers::base());
       } else {
         xorq(dst, dst);
       }
@@ -5477,9 +5484,9 @@ void  MacroAssembler::decode_and_move_klass_not_null(Register dst, Register src)
       }
     } else {
       if (CompressedKlassPointers::base() != nullptr) {
-        const uint64_t base_right_shifted =
-            (uint64_t)CompressedKlassPointers::base() >> CompressedKlassPointers::shift();
-        mov64(dst, base_right_shifted);
+        const intptr_t base_right_shifted =
+            (intptr_t)CompressedKlassPointers::base() >> CompressedKlassPointers::shift();
+        movptr(dst, base_right_shifted);
       } else {
         xorq(dst, dst);
       }
@@ -5487,6 +5494,7 @@ void  MacroAssembler::decode_and_move_klass_not_null(Register dst, Register src)
       shlq(dst, CompressedKlassPointers::shift());
     }
   }
+  BLOCK_COMMENT("} decode_and_move_klass_not_null");
 }
 
 void  MacroAssembler::set_narrow_oop(Register dst, jobject obj) {
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index df639388a5e..a1a634b6aab 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -186,6 +186,10 @@ char* CompressedKlassPointers::reserve_address_space_X(uintptr_t from, uintptr_t
   return os::attempt_reserve_memory_between((char*)from, (char*)to, size, alignment, aslr);
 }
 
+char* CompressedKlassPointers::reserve_address_space_below_4G(size_t size, bool aslr) {
+  return reserve_address_space_X(0, nth_bit(32), size, Metaspace::reserve_alignment(), aslr);
+}
+
 char* CompressedKlassPointers::reserve_address_space_for_unscaled_encoding(size_t size, bool aslr) {
   const size_t unscaled_max = nth_bit(narrow_klass_pointer_bits());
   return reserve_address_space_X(0, unscaled_max, size, Metaspace::reserve_alignment(), aslr);
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index a07e758be7b..8666d4409e8 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -139,6 +139,7 @@ class CompressedKlassPointers : public AllStatic {
 
   // Helper function for common cases.
   static char* reserve_address_space_X(uintptr_t from, uintptr_t to, size_t size, size_t alignment, bool aslr);
+  static char* reserve_address_space_below_4G(size_t size, bool aslr);
   static char* reserve_address_space_for_unscaled_encoding(size_t size, bool aslr);
   static char* reserve_address_space_for_zerobased_encoding(size_t size, bool aslr);
   static char* reserve_address_space_for_16bit_move(size_t size, bool aslr);
diff --git a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
index edb5ab9af06..622573fa709 100644
--- a/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
+++ b/test/hotspot/jtreg/runtime/CompressedOops/CompressedCPUSpecificClassSpaceReservation.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat. 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
@@ -63,6 +64,7 @@ private static void do_test(boolean CDS) throws IOException {
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
 
         final String tryReserveForUnscaled = "reserve_between (range [0x0000000000000000-0x0000000100000000)";
+        final String tryReserveBelow4G = "reserve_between (range [0x0000000000000000-0x0000000100000000)";
         final String tryReserveForZeroBased = "reserve_between (range [0x0000000100000000-0x0000000800000000)";
         final String tryReserveFor16bitMoveIntoQ3 = "reserve_between (range [0x0000000100000000-0x0001000000000000)";
         if (Platform.isAArch64()) {
@@ -98,11 +100,10 @@ private static void do_test(boolean CDS) throws IOException {
             }
             output.shouldContain(tryReserveFor16bitMoveIntoQ3);
         } else if (Platform.isX64()) {
+            output.shouldContain(tryReserveBelow4G);
             if (CDS) {
-                output.shouldNotContain(tryReserveForUnscaled);
                 output.shouldNotContain(tryReserveForZeroBased);
             } else {
-                output.shouldContain(tryReserveForUnscaled);
                 output.shouldContain(tryReserveForZeroBased);
             }
         } else {

From d8a783020d247d2c01834db14b44d239ad1f2bf4 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 29 May 2025 15:06:51 +0000
Subject: [PATCH 712/901] 8357999: SA: FileMapInfo.metadataTypeArray
 initialization issue after JDK-8355003

Reviewed-by: ayang, iklam, kvn, sspitsyn
---
 .../share/classes/sun/jvm/hotspot/memory/FileMapInfo.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index f8500276779..9d5c0dec9fb 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -126,7 +126,7 @@ private static void populateMetadataTypeArray(TypeDataBase db) {
     metadataTypeArray[4] = db.lookupType("InstanceRefKlass");
     metadataTypeArray[5] = db.lookupType("InstanceStackChunkKlass");
     metadataTypeArray[6] = db.lookupType("Method");
-    metadataTypeArray[9] = db.lookupType("MethodData");
+    metadataTypeArray[7] = db.lookupType("MethodData");
     metadataTypeArray[8] = db.lookupType("MethodCounters");
     metadataTypeArray[9] = db.lookupType("ObjArrayKlass");
     metadataTypeArray[10] = db.lookupType("TypeArrayKlass");

From 79aff26c2880922b92863911d8a5a035ba9a1e75 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 29 May 2025 15:20:39 +0000
Subject: [PATCH 713/901] 8354724: Methods in java.io.Reader to read all
 characters and all lines

Reviewed-by: rriggs, smarks, jpai, alanb
---
 .../share/classes/java/io/Reader.java         | 120 +++++++++++++++++
 test/jdk/java/io/Reader/ReadAll.java          | 127 ++++++++++++++++++
 2 files changed, 247 insertions(+)
 create mode 100644 test/jdk/java/io/Reader/ReadAll.java

diff --git a/src/java.base/share/classes/java/io/Reader.java b/src/java.base/share/classes/java/io/Reader.java
index f882a939fbc..af5ac9f68ec 100644
--- a/src/java.base/share/classes/java/io/Reader.java
+++ b/src/java.base/share/classes/java/io/Reader.java
@@ -27,6 +27,7 @@
 
 import java.nio.CharBuffer;
 import java.nio.ReadOnlyBufferException;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -198,6 +199,20 @@ public int read(char[] cbuf, int off, int len) throws IOException {
                 return n;
             }
 
+            @Override
+            public String readAllAsString() throws IOException {
+                ensureOpen();
+                int len = cs.length();
+                String result = cs.subSequence(next, len).toString();
+                next += result.length();
+                return result;
+            }
+
+            @Override
+            public List<String> readAllLines() throws IOException {
+                return readAllAsString().lines().toList();
+            }
+
             @Override
             public long skip(long n) throws IOException {
                 ensureOpen();
@@ -382,6 +397,111 @@ public int read(char[] cbuf) throws IOException {
      */
     public abstract int read(char[] cbuf, int off, int len) throws IOException;
 
+    private String readAllCharsAsString() throws IOException {
+        StringBuilder result = new StringBuilder();
+        char[] cbuf = new char[TRANSFER_BUFFER_SIZE];
+        int nread;
+        while ((nread = read(cbuf, 0, cbuf.length)) != -1) {
+            result.append(cbuf, 0, nread);
+        }
+        return result.toString();
+    }
+
+    /**
+     * Reads all remaining characters as lines of text. This method blocks until
+     * all remaining characters have been read and end of stream is detected,
+     * or an exception is thrown. This method does not close the reader.
+     *
+     * <p> When this reader reaches the end of the stream, further
+     * invocations of this method will return an empty list.
+     *
+     * <p> A <i>line</i> is either a sequence of zero or more characters
+     * followed by a line terminator, or it is a sequence of one or
+     * more characters followed by the end of the stream.
+     * A line does not include the line terminator.
+     *
+     * <p> A <i>line terminator</i> is one of the following:
+     * a line feed character {@code "\n"} (U+000A),
+     * a carriage return character {@code "\r"} (U+000D),
+     * or a carriage return followed immediately by a line feed
+     * {@code "\r\n"} (U+000D U+000A).
+     *
+     * <p> The behavior for the case where the reader is
+     * <i>asynchronously closed</i>, or the thread interrupted during the
+     * read, is highly reader specific, and therefore not specified.
+     *
+     * <p> If an I/O error occurs reading from the stream then it
+     * may do so after some, but not all, characters have been read.
+     * Consequently the stream may not be at end of stream and may
+     * be in an inconsistent state. It is strongly recommended that the reader
+     * be promptly closed if an I/O error occurs.
+     *
+     * @apiNote
+     * This method is intended for simple cases where it is appropriate and
+     * convenient to read the entire input into a list of lines. It is not
+     * suitable for reading input from an unknown origin, as this may result
+     * in the allocation of an arbitrary amount of memory.
+     *
+     * @return     the remaining characters as lines of text stored in an
+     *             unmodifiable {@code List} of {@code String}s in the order
+     *             they are read
+     *
+     * @throws     IOException  If an I/O error occurs
+     * @throws     OutOfMemoryError  If the number of remaining characters
+     *             exceeds the implementation limit for {@code String}.
+     *
+     * @see String#lines
+     * @see #readAllAsString
+     * @see java.nio.file.Files#readAllLines
+     *
+     * @since 25
+     */
+    public List<String> readAllLines() throws IOException {
+        return readAllCharsAsString().lines().toList();
+    }
+
+    /**
+     * Reads all remaining characters into a string. This method blocks until
+     * all remaining characters including all line separators have been read
+     * and end of stream is detected, or an exception is thrown. The resulting
+     * string will contain line separators as they appear in the stream. This
+     * method does not close the reader.
+     *
+     * <p> When this reader reaches the end of the stream, further
+     * invocations of this method will return an empty string.
+     *
+     * <p> The behavior for the case where the reader
+     * is <i>asynchronously closed</i>, or the thread interrupted during the
+     * read, is highly reader specific, and therefore not specified.
+     *
+     * <p> If an I/O error occurs reading from the stream then it
+     * may do so after some, but not all, characters have been read.
+     * Consequently the stream may not be at end of stream and may
+     * be in an inconsistent state. It is strongly recommended that the reader
+     * be promptly closed if an I/O error occurs.
+     *
+     * @apiNote
+     * This method is intended for simple cases where it is appropriate and
+     * convenient to read the entire input into a {@code String}. It is not
+     * suitable for reading input from an unknown origin, as this may result
+     * in the allocation of an arbitrary amount of memory.
+     *
+     * @return     a {@code String} containing all remaining characters
+     *
+     * @throws     IOException       If an I/O error occurs
+     * @throws     OutOfMemoryError  If the number of remaining characters
+     *                               exceeds the implementation limit for
+     *                               {@code String}.
+     *
+     * @see #readAllLines
+     * @see java.nio.file.Files#readString
+     *
+     * @since 25
+     */
+    public String readAllAsString() throws IOException {
+        return readAllCharsAsString();
+    }
+
     /** Maximum skip-buffer size */
     private static final int maxSkipBufferSize = 8192;
 
diff --git a/test/jdk/java/io/Reader/ReadAll.java b/test/jdk/java/io/Reader/ReadAll.java
new file mode 100644
index 00000000000..72fcf459eca
--- /dev/null
+++ b/test/jdk/java/io/Reader/ReadAll.java
@@ -0,0 +1,127 @@
+/*
+ * 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 8354724
+ * @summary Test Reader readAllLines and readAllAstring methods
+ * @library .. /test/lib
+ * @build jdk.test.lib.Platform jdk.test.lib.RandomFactory
+ * @run junit ReadAll
+ * @key randomness
+ */
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import jdk.test.lib.RandomFactory;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ReadAll {
+    private static final String PHRASE =
+        "Ange plein de gaieté, connaissez-vous l'angoisse";
+
+    private static File file;
+    private static Path path;
+    private static Random rnd;
+
+    @BeforeAll
+    public static void setup() throws IOException {
+        path = Files.createTempFile(Path.of("."), "foo", "bar");
+        file = path.toFile();
+
+        rnd = RandomFactory.getRandom();
+        int size = rnd.nextInt(2, 16386);
+
+        int plen = PHRASE.length();
+        List<String> strings = new ArrayList<String>(size);
+        while (strings.size() < size) {
+            int fromIndex = rnd.nextInt(0, plen / 2);
+            int toIndex = rnd.nextInt(fromIndex, plen);
+            strings.add(PHRASE.substring(fromIndex, toIndex));
+        }
+        Files.write(path, strings);
+        System.out.println(strings.size() + " lines written");
+    }
+
+    @AfterAll
+    public static void cleanup() throws IOException {
+        if (file != null)
+            file.delete();
+    }
+
+    @Test
+    public void readAllLines() throws IOException {
+        // Reader implementation
+        List<String> lines;
+        try (FileReader fr = new FileReader(file)) {
+            lines = fr.readAllLines();
+        }
+        System.out.println(lines.size() + " lines read");
+
+        List<String> linesExpected = Files.readAllLines(path);
+        assertEquals(linesExpected, lines);
+
+        // Reader.of implementation
+        String stringExpected = Files.readString(path);
+        int n = rnd.nextInt(stringExpected.length()/2);
+        String substringExpected = stringExpected.substring(n);
+        linesExpected = substringExpected.lines().toList();
+        try (Reader r = new StringReader(stringExpected)) {
+            r.skip(n);
+            lines = r.readAllLines();
+        }
+        assertEquals(linesExpected, lines);
+    }
+
+    @Test
+    public void readAllAsString() throws IOException {
+        // Reader implementation
+        String string;
+        try (FileReader fr = new FileReader(file)) {
+            string = fr.readAllAsString();
+        }
+        String stringExpected = Files.readString(path);
+        assertEquals(stringExpected, string);
+
+        // Reader.of implementation
+        int n = rnd.nextInt(stringExpected.length()/2);
+        try (Reader r = Reader.of(stringExpected)) {
+            r.skip(n);
+            string = r.readAllAsString();
+        }
+        assertEquals(stringExpected.substring(n), string);
+    }
+}

From f318868268f32934a2f0c4e26a6c75360d8e74b1 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 29 May 2025 17:01:28 +0000
Subject: [PATCH 714/901] 8348328: Update IANA Language Subtag Registry to
 Version 2025-05-15

Reviewed-by: iris, naoto
---
 .../data/lsrdata/language-subtag-registry.txt | 122 +++++++++++++++++-
 .../Locale/LanguageSubtagRegistryTest.java    |  28 +++-
 2 files changed, 142 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/data/lsrdata/language-subtag-registry.txt b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
index b00ea67e7e8..64c40f28162 100644
--- a/src/java.base/share/data/lsrdata/language-subtag-registry.txt
+++ b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
@@ -1,4 +1,4 @@
-File-Date: 2024-11-19
+File-Date: 2025-05-15
 %%
 Type: language
 Subtag: aa
@@ -5950,6 +5950,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: bql
+Description: Karian
 Description: Bilakura
 Added: 2009-07-29
 %%
@@ -9083,6 +9084,7 @@ Scope: collection
 %%
 Type: language
 Subtag: daz
+Description: Moi-Wadea
 Description: Dao
 Added: 2009-07-29
 %%
@@ -9290,6 +9292,8 @@ Type: language
 Subtag: dek
 Description: Dek
 Added: 2009-07-29
+Deprecated: 2024-12-12
+Preferred-Value: sqm
 %%
 Type: language
 Subtag: del
@@ -14082,6 +14086,12 @@ Added: 2009-07-29
 Macrolanguage: hmn
 %%
 Type: language
+Subtag: hnm
+Description: Hainanese
+Added: 2024-12-12
+Macrolanguage: zh
+%%
+Type: language
 Subtag: hnn
 Description: Hanunoo
 Added: 2009-07-29
@@ -16421,6 +16431,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kci
+Description: Ngyian
 Description: Kamantan
 Added: 2009-07-29
 %%
@@ -21081,6 +21092,12 @@ Description: Laua
 Added: 2009-07-29
 %%
 Type: language
+Subtag: luh
+Description: Leizhou Chinese
+Added: 2024-12-12
+Macrolanguage: zh
+%%
+Type: language
 Subtag: lui
 Description: Luiseno
 Added: 2005-10-16
@@ -22850,6 +22867,8 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mmi
+Description: Hember Avu
+Description: Amben
 Description: Musar
 Added: 2009-07-29
 %%
@@ -25197,8 +25216,9 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: new
-Description: Newari
 Description: Nepal Bhasa
+Description: Newar
+Description: Newari
 Added: 2005-10-16
 %%
 Type: language
@@ -26641,6 +26661,8 @@ Type: language
 Subtag: nte
 Description: Nathembo
 Added: 2009-07-29
+Deprecated: 2024-12-12
+Preferred-Value: eko
 %%
 Type: language
 Subtag: ntg
@@ -27185,6 +27207,12 @@ Description: Oroch
 Added: 2009-07-29
 %%
 Type: language
+Subtag: oak
+Description: Noakhali
+Description: Noakhailla
+Added: 2025-05-14
+%%
+Type: language
 Subtag: oar
 Description: Old Aramaic (up to 700 BCE)
 Description: Ancient Aramaic (up to 700 BCE)
@@ -32147,6 +32175,12 @@ Description: Sajau Basap
 Added: 2009-07-29
 %%
 Type: language
+Subtag: sjc
+Description: Shaojiang Chinese
+Added: 2024-12-12
+Macrolanguage: zh
+%%
+Type: language
 Subtag: sjd
 Description: Kildin Sami
 Added: 2009-07-29
@@ -41302,6 +41336,11 @@ Description: Aluo
 Added: 2009-07-29
 %%
 Type: language
+Subtag: ynb
+Description: Yamben
+Added: 2025-02-06
+%%
+Type: language
 Subtag: ynd
 Description: Yandruwandha
 Added: 2009-07-29
@@ -43616,6 +43655,14 @@ Preferred-Value: hks
 Prefix: sgn
 %%
 Type: extlang
+Subtag: hnm
+Description: Hainanese
+Added: 2024-12-12
+Preferred-Value: hnm
+Prefix: zh
+Macrolanguage: zh
+%%
+Type: extlang
 Subtag: hos
 Description: Ho Chi Minh City Sign Language
 Added: 2009-07-29
@@ -43958,6 +44005,14 @@ Prefix: lv
 Macrolanguage: lv
 %%
 Type: extlang
+Subtag: luh
+Description: Leizhou Chinese
+Added: 2024-12-12
+Preferred-Value: luh
+Prefix: zh
+Macrolanguage: zh
+%%
+Type: extlang
 Subtag: lvs
 Description: Standard Latvian
 Added: 2010-03-11
@@ -44393,6 +44448,14 @@ Prefix: ar
 Macrolanguage: ar
 %%
 Type: extlang
+Subtag: sjc
+Description: Shaojiang Chinese
+Added: 2024-12-12
+Preferred-Value: sjc
+Prefix: zh
+Macrolanguage: zh
+%%
+Type: extlang
 Subtag: slf
 Description: Swiss-Italian Sign Language
 Added: 2009-07-29
@@ -44844,6 +44907,11 @@ Description: Bangla
 Added: 2005-10-16
 %%
 Type: script
+Subtag: Berf
+Description: Beria Erfe
+Added: 2025-02-06
+%%
+Type: script
 Subtag: Bhks
 Description: Bhaiksuki
 Added: 2015-07-24
@@ -45132,6 +45200,12 @@ Description: Nyiakeng Puachue Hmong
 Added: 2017-08-13
 %%
 Type: script
+Subtag: Hntl
+Description: Han (Traditional variant) with Latin (alias for Hant +
+  Latn)
+Added: 2025-05-14
+%%
+Type: script
 Subtag: Hrkt
 Description: Japanese syllabaries (alias for Hiragana + Katakana)
 Added: 2005-10-16
@@ -45636,6 +45710,12 @@ Description: Saurashtra
 Added: 2006-07-21
 %%
 Type: script
+Subtag: Seal
+Description: Seal
+Description: Small Seal
+Added: 2025-05-14
+%%
+Type: script
 Subtag: Sgnw
 Description: SignWriting
 Added: 2006-10-17
@@ -47919,6 +47999,12 @@ Comments: Written standard developed by Romanilha in 1853 and used by
   dóu Po, Escolo Gaston Febus, and others
 %%
 Type: variant
+Subtag: hanoi
+Description: The Hà Nội variant of Vietnamese
+Added: 2025-03-10
+Prefix: vi
+%%
+Type: variant
 Subtag: hepburn
 Description: Hepburn romanization
 Added: 2009-10-01
@@ -47949,6 +48035,12 @@ Added: 2017-03-14
 Prefix: eo
 %%
 Type: variant
+Subtag: huett
+Description: The Huế (province Thừa Thiên) variant of Vietnamese
+Added: 2025-03-10
+Prefix: vi
+%%
+Type: variant
 Subtag: ijekavsk
 Description: Serbian with Ijekavian pronunciation
 Prefix: sr
@@ -48024,6 +48116,13 @@ Prefix: sa
 Comments: Preferred tag is cls
 %%
 Type: variant
+Subtag: leidentr
+Description: Ancient Egyptian in Leiden Unified Transliteration
+Added: 2025-02-06
+Prefix: egy
+Comments: Recommended by the International Association of Egyptologists
+%%
+Type: variant
 Subtag: lemosin
 Description: Limousin
 Added: 2018-04-22
@@ -48068,6 +48167,19 @@ Comments: Russian orthography as established by the 1917/1918
   orthographic reforms
 %%
 Type: variant
+Subtag: mdcegyp
+Description: Ancient Egyptian hieroglyphs encoded in Manuel de Codage
+Added: 2025-02-06
+Prefix: egy
+%%
+Type: variant
+Subtag: mdctrans
+Description: Ancient Egyptian transliteration encoded in Manuel de
+  Codage
+Added: 2025-02-06
+Prefix: egy
+%%
+Type: variant
 Subtag: metelko
 Description: Slovene in Metelko alphabet
 Added: 2012-06-27
@@ -48255,6 +48367,12 @@ Prefix: rm
 Comments: Supraregional Romansh written standard
 %%
 Type: variant
+Subtag: saigon
+Description: The Sài Gòn variant of Vietnamese
+Added: 2025-03-10
+Prefix: vi
+%%
+Type: variant
 Subtag: scotland
 Description: Scottish Standard English
 Added: 2007-08-31
diff --git a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
index d143e025dd5..12f5a96d3fb 100644
--- a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
+++ b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.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
@@ -25,9 +25,9 @@
  * @test
  * @bug 8025703 8040211 8191404 8203872 8222980 8225435 8241082 8242010 8247432
  *      8258795 8267038 8287180 8302512 8304761 8306031 8308021 8313702 8318322
- *      8327631 8332424 8334418 8344589
+ *      8327631 8332424 8334418 8344589 8348328
  * @summary Checks the IANA language subtag registry data update
- *          (LSR Revision: 2024-11-19) with Locale and Locale.LanguageRange
+ *          (LSR Revision: 2025-05-15) with Locale and Locale.LanguageRange
  *          class methods.
  * @run main LanguageSubtagRegistryTest
  */
@@ -45,9 +45,9 @@ public class LanguageSubtagRegistryTest {
     static boolean err = false;
 
     private static final String ACCEPT_LANGUAGE =
-        "Accept-Language: aam, adp, aeb, ajs, aog, apc, ajp, aue, bcg, bic, bpp, cey, cbr, cnp, cqu, crr, csp, csx, dif, dmw, dsz, ehs, ema,"
-        + " en-gb-oed, gti, iba, ilw, jks, kdz, kjh, kmb, koj, kru, ksp, kwq, kxe, kzk, lgs, lii, lmm, lsb, lsc, lsn, lsv, lsw, lvi, meg, mtm,"
-        + " ngv, nns, ola, oyb, pat, pcr, phr, plu, pnd, pub, rib, rnb, rsn, scv, snz, sqx, suj, szy, taj, tdg, tjj, tjp, tpn, tvx,"
+        "Accept-Language: aam, adp, aeb, ajs, aog, apc, ajp, aue, bcg, bic, bpp, cey, cbr, cnp, cqu, crr, csp, csx, dif, dmw, dsz, ehs, eko, ema,"
+        + " en-gb-oed, gti, hnm, iba, ilw, jks, kdz, kjh, kmb, koj, kru, ksp, kwq, kxe, kzk, lgs, lii, lmm, lsb, lsc, lsn, lsv, lsw, luh, lvi, meg, mtm,"
+        + " ngv, nns, ola, oyb, pat, pcr, phr, plu, pnd, pub, rib, rnb, rsn, scv, sjc, snz, sqm, sqx, suj, szy, taj, tdg, tjj, tjp, tpn, tvx,"
         + " umi, uss, uth, xia, yos, ysm, zko, wkr;q=0.9, ar-hyw;q=0.8, yug;q=0.5, gfx;q=0.4";
     private static final List<LanguageRange> EXPECTED_RANGE_LIST = List.of(
             new LanguageRange("aam", 1.0),
@@ -94,12 +94,16 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("sgn-dsz", 1.0),
             new LanguageRange("ehs", 1.0),
             new LanguageRange("sgn-ehs", 1.0),
+            new LanguageRange("eko", 1.0),
+            new LanguageRange("nte", 1.0),
             new LanguageRange("ema", 1.0),
             new LanguageRange("uok", 1.0),
             new LanguageRange("en-gb-oed", 1.0),
             new LanguageRange("en-gb-oxendict", 1.0),
             new LanguageRange("gti", 1.0),
             new LanguageRange("nyc", 1.0),
+            new LanguageRange("hnm", 1.0),
+            new LanguageRange("zh-hnm", 1.0),
             new LanguageRange("iba", 1.0),
             new LanguageRange("snb", 1.0),
             new LanguageRange("blg", 1.0),
@@ -142,6 +146,8 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("sgn-lsv", 1.0),
             new LanguageRange("lsw", 1.0),
             new LanguageRange("sgn-lsw", 1.0),
+            new LanguageRange("luh", 1.0),
+            new LanguageRange("zh-luh", 1.0),
             new LanguageRange("lvi", 1.0),
             new LanguageRange("meg", 1.0),
             new LanguageRange("cir", 1.0),
@@ -176,8 +182,12 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("sgn-rsn", 1.0),
             new LanguageRange("scv", 1.0),
             new LanguageRange("zir", 1.0),
+            new LanguageRange("sjc", 1.0),
+            new LanguageRange("zh-sjc", 1.0),
             new LanguageRange("snz", 1.0),
             new LanguageRange("asd", 1.0),
+            new LanguageRange("sqm", 1.0),
+            new LanguageRange("dek", 1.0),
             new LanguageRange("sqx", 1.0),
             new LanguageRange("sgn-sqx", 1.0),
             new LanguageRange("suj", 1.0),
@@ -264,12 +274,18 @@ private static boolean areEqual(List<LanguageRange> expected,
 
             System.err.println("  Expected size=" + expectedSize);
             for (LanguageRange lr : expected) {
+                if (!got.contains(lr)) {
+                    System.err.print("Error - Actual does not contain:");
+                }
                 System.err.println("    range=" + lr.getRange()
                         + ", weight=" + lr.getWeight());
             }
 
             System.err.println("  Actual size=" + actualSize);
             for (LanguageRange lr : got) {
+                if (!expected.contains(lr)) {
+                    System.err.print("Error - Expected does not contain:");
+                }
                 System.err.println("    range=" + lr.getRange()
                         + ", weight=" + lr.getWeight());
             }

From e306367813db7c8a3ecac5e46740600b7ab04f9d Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 29 May 2025 17:06:42 +0000
Subject: [PATCH 715/901] 8357693: AOTCodeCompressedOopsTest.java failed with
 -XX:+UseLargePages

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

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 375a3ccffbc..723b5298646 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1666,10 +1666,13 @@ bool FileMapInfo::map_heap_region_impl() {
   char* addr = (char*)_mapped_heap_memregion.start();
   char* base;
 
-  if (MetaspaceShared::use_windows_memory_mapping()) {
+  if (MetaspaceShared::use_windows_memory_mapping() || UseLargePages) {
+    // With UseLargePages, memory mapping may fail on some OSes if the size is not
+    // large page aligned, so let's use read() instead. In this case, the memory region
+    // is already commited by G1 so we don't need to commit it again.
     if (!read_region(MetaspaceShared::hp, addr,
                      align_up(_mapped_heap_memregion.byte_size(), os::vm_page_size()),
-                     /* do_commit = */ true)) {
+                     /* do_commit = */ !UseLargePages)) {
       dealloc_heap_region();
       aot_log_error(aot)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
       return false;

From e509997fe87a09513b8f79d303cc69392d2cb7b0 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 29 May 2025 17:39:08 +0000
Subject: [PATCH 716/901] 8357275: Locale.Builder.setLanguageTag should mention
 conversions made on language tag

Reviewed-by: naoto
---
 .../share/classes/java/util/Locale.java         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index fa13afcc310..a5ac0ae5bf7 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -1800,7 +1800,7 @@ public static String caseFoldLanguageTag(String languageTag) {
      * to {@link Locale.Builder#setLanguageTag(String)} which throws an exception
      * in this case.
      *
-     * <p>The following <b>conversions</b> are performed:<ul>
+     * <p>The following <b id="langtag_conversions">conversions</b> are performed:<ul>
      *
      * <li>The language code "und" is mapped to language "".
      *
@@ -1826,13 +1826,19 @@ public static String caseFoldLanguageTag(String languageTag) {
      *     loc.getExtension('x'); // returns "urp"
      * }
      *
-     * <li>When the languageTag argument contains an extlang subtag,
-     * the first such subtag is used as the language, and the primary
-     * language subtag and other extlang subtags are ignored:
+     * <li> BCP 47 language tags permit up to three extlang subtags. However,
+     * the second and third extlang subtags are always ignored. As such,
+     * the first extlang subtag in {@code languageTag} is used as the language,
+     * and the primary language subtag and other extlang subtags are ignored.
+     * Language tags that exceed three extlang subtags are considered
+     * ill-formed starting at the offending extlang subtag.
      *
      * {@snippet lang=java :
      *     Locale.forLanguageTag("ar-aao").getLanguage(); // returns "aao"
      *     Locale.forLanguageTag("en-abc-def-us").toString(); // returns "abc_US"
+     *     Locale.forLanguageTag("zh-yue-gan-cmn-czh-CN").toString();
+     *     // returns "yue"; "czh" exceeds the extlang limit, and subsequent
+     *     // subtags are considered ill-formed
      * }
      *
      * <li>Case is normalized except for variant tags, which are left
@@ -2787,6 +2793,9 @@ public Builder setLocale(Locale locale) {
          * just discards ill-formed and following portions of the
          * tag).
          *
+         * <p>See {@link Locale##langtag_conversions converions} for a full list
+         * of conversions that are performed on {@code languageTag}.
+         *
          * @param languageTag the language tag
          * @return This builder.
          * @throws IllformedLocaleException if {@code languageTag} is ill-formed

From d922e318bc2104d69c46403bceb609d538f3259a Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Thu, 29 May 2025 20:09:01 +0000
Subject: [PATCH 717/901] 8349400: Improve startup speed via eliminating nested
 classes

Reviewed-by: valeriep, rriggs
---
 .../classes/sun/security/util/KnownOIDs.java  | 74 +++++++------------
 1 file changed, 25 insertions(+), 49 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/util/KnownOIDs.java b/src/java.base/share/classes/sun/security/util/KnownOIDs.java
index 9435a7a9d39..8e764b75730 100644
--- a/src/java.base/share/classes/sun/security/util/KnownOIDs.java
+++ b/src/java.base/share/classes/sun/security/util/KnownOIDs.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
@@ -91,10 +91,7 @@ public enum KnownOIDs {
     ipsecEndSystem("1.3.6.1.5.5.7.3.5"),
     ipsecTunnel("1.3.6.1.5.5.7.3.6"),
     ipsecUser("1.3.6.1.5.5.7.3.7"),
-    KP_TimeStamping("1.3.6.1.5.5.7.3.8", "timeStamping") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    KP_TimeStamping("1.3.6.1.5.5.7.3.8", "timeStamping", false),
     OCSPSigning("1.3.6.1.5.5.7.3.9"),
     // access descriptors - PKIX.48.*
     OCSP("1.3.6.1.5.5.7.48.1"),
@@ -102,10 +99,7 @@ public enum KnownOIDs {
     OCSPNonceExt("1.3.6.1.5.5.7.48.1.2"),
     OCSPNoCheck("1.3.6.1.5.5.7.48.1.5"),
     caIssuers("1.3.6.1.5.5.7.48.2"),
-    AD_TimeStamping("1.3.6.1.5.5.7.48.3", "timeStamping") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    AD_TimeStamping("1.3.6.1.5.5.7.48.3", "timeStamping", false),
     caRepository("1.3.6.1.5.5.7.48.5", "caRepository"),
 
     // NIST --
@@ -189,10 +183,7 @@ public enum KnownOIDs {
 
     // RSASecurity
     // PKCS1 1.2.840.113549.1.1.*
-    PKCS1("1.2.840.113549.1.1", "RSA") { // RSA KeyPairGenerator and KeyFactory
-        @Override
-        boolean registerNames() { return false; }
-    },
+    PKCS1("1.2.840.113549.1.1", "RSA", false), // RSA KeyPairGenerator and KeyFactory
     RSA("1.2.840.113549.1.1.1"), // RSA encryption
 
     MD2withRSA("1.2.840.113549.1.1.2"),
@@ -322,10 +313,7 @@ public enum KnownOIDs {
     SpecifiedSHA2withECDSA("1.2.840.10045.4.3"),
 
     // X9.42 1.2.840.10046.2.*
-    X942_DH("1.2.840.10046.2.1", "DiffieHellman") { // unused by JDK providers
-        @Override
-        boolean registerNames() { return false; }
-    },
+    X942_DH("1.2.840.10046.2.1", "DiffieHellman", false), // unused by JDK providers
 
     // Teletrust 1.3.36.*
     brainpoolP160r1("1.3.36.3.3.2.8.1.1.1"),
@@ -375,34 +363,19 @@ public enum KnownOIDs {
     // OIW secsig 1.3.14.3.*
     OIW_DES_CBC("1.3.14.3.2.7", "DES/CBC", "DES"),
 
-    OIW_DSA("1.3.14.3.2.12", "DSA") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    OIW_DSA("1.3.14.3.2.12", "DSA", false),
 
-    OIW_JDK_SHA1withDSA("1.3.14.3.2.13", "SHA1withDSA") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    OIW_JDK_SHA1withDSA("1.3.14.3.2.13", "SHA1withDSA", false),
 
-    OIW_SHA1withRSA_Odd("1.3.14.3.2.15", "SHA1withRSA") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    OIW_SHA1withRSA_Odd("1.3.14.3.2.15", "SHA1withRSA", false),
 
     DESede("1.3.14.3.2.17", "DESede"),
 
     SHA_1("1.3.14.3.2.26", "SHA-1", "SHA", "SHA1"),
 
-    OIW_SHA1withDSA("1.3.14.3.2.27", "SHA1withDSA") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    OIW_SHA1withDSA("1.3.14.3.2.27", "SHA1withDSA", false),
 
-    OIW_SHA1withRSA("1.3.14.3.2.29", "SHA1withRSA") {
-        @Override
-        boolean registerNames() { return false; }
-    },
+    OIW_SHA1withRSA("1.3.14.3.2.29", "SHA1withRSA", false),
 
     // Thawte 1.3.101.*
     X25519("1.3.101.110"),
@@ -426,11 +399,9 @@ public enum KnownOIDs {
     // Consider removing them in future releases when their usage
     // have died out
 
-    ITUX509_RSA("2.5.8.1.1", "RSA") { // unused by JDK providers
-                                      // defined in X.509 for RSA keys
-        @Override                     // with modulus length as its parameter
-        boolean registerNames() { return false; }
-    },
+    ITUX509_RSA("2.5.8.1.1", "RSA", false), // unused by JDK providers
+                                            // defined in X.509 for RSA keys
+                                            // with modulus length as its parameter
 
     SkipIPAddress("1.3.6.1.4.1.42.2.11.2.1"),
     JAVASOFT_JDKKeyProtector("1.3.6.1.4.1.42.2.17.1.1"),
@@ -442,6 +413,7 @@ public enum KnownOIDs {
     private final String stdName;
     private final String oid;
     private final String[] aliases;
+    private final boolean registerNames;
 
     // find the matching enum using either name or oid string
     // return null if no match found
@@ -476,9 +448,8 @@ private static void register(KnownOIDs o) {
         } else if (debug != null) {
             debug.println(o.oid + " => " + o.name());
         }
-        // only register the stdName and aliases if o.registerNames()
-        // returns true
-        if (o.registerNames()) {
+        // only register the stdName and aliases if o.registerNames is true
+        if (o.registerNames) {
             String stdNameUpper = o.stdName.toUpperCase(Locale.ENGLISH);
             if (Objects.nonNull(name2enum.put(stdNameUpper, o))) {
                 throw new RuntimeException("ERROR: Duplicate " +
@@ -505,12 +476,21 @@ private static void register(KnownOIDs o) {
         this.oid = oid;
         this.stdName = name(); // defaults to enum name
         this.aliases = new String[0];
+        this.registerNames = true;
     }
 
     KnownOIDs(String oid, String stdName, String... aliases) {
         this.oid = oid;
         this.stdName = stdName;
         this.aliases = aliases;
+        this.registerNames = true;
+    }
+
+    KnownOIDs(String oid, String stdName, boolean registerNames) {
+        this.oid = oid;
+        this.stdName = stdName;
+        this.aliases = new String[0];
+        this.registerNames = registerNames;
     }
 
     // returns the oid string associated with this enum
@@ -527,8 +507,4 @@ public String stdName() {
     public String[] aliases() {
         return aliases;
     }
-
-    boolean registerNames() {
-        return true;
-    }
 }

From 727412d1b5f0764363ebd2ff600d4b7f0c99bb9b Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Thu, 29 May 2025 20:09:58 +0000
Subject: [PATCH 718/901] 8357690: Add @Stable and final to
 java.lang.CharacterDataLatin1 and other CharacterData classes

Reviewed-by: naoto
---
 .../build/tools/generatecharacter/GenerateCharacter.java  | 6 +++---
 src/java.base/share/classes/java/lang/CharacterData.java  | 6 ++++--
 .../share/classes/java/lang/CharacterData00.java.template | 4 +++-
 .../share/classes/java/lang/CharacterData01.java.template | 8 +++++---
 .../share/classes/java/lang/CharacterData02.java.template | 8 +++++---
 .../share/classes/java/lang/CharacterData03.java.template | 8 +++++---
 .../share/classes/java/lang/CharacterData0E.java.template | 8 +++++---
 .../classes/java/lang/CharacterDataLatin1.java.template   | 7 +++++--
 .../share/classes/java/lang/CharacterDataPrivateUse.java  | 4 ++--
 .../share/classes/java/lang/CharacterDataUndefined.java   | 4 ++--
 10 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
index 8d6a703f1c9..a2f37db72d9 100644
--- a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
+++ b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.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
@@ -1190,7 +1190,7 @@ static void genTable(StringBuffer result, String name,
         if (Csyntax)
             result.append("  static ");
         else
-            result.append("  static final ");
+            result.append("  @Stable static final ");
         result.append(atype);
         result.append(" ").append(name).append("[");
         if (Csyntax)
@@ -1347,7 +1347,7 @@ else if (bits == 64) {
     }
 
     static void genCaseMapTableDeclaration(StringBuffer result) {
-        result.append("    static final char[][][] charMap;\n");
+        result.append("    @Stable static final char[][][] charMap;\n");
     }
 
     static void genCaseMapTable(StringBuffer result, SpecialCaseMap[] specialCaseMaps){
diff --git a/src/java.base/share/classes/java/lang/CharacterData.java b/src/java.base/share/classes/java/lang/CharacterData.java
index d75853fe9ca..6631b7c204e 100644
--- a/src/java.base/share/classes/java/lang/CharacterData.java
+++ b/src/java.base/share/classes/java/lang/CharacterData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2023, 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
@@ -25,7 +25,9 @@
 
 package java.lang;
 
-abstract class CharacterData {
+abstract sealed class CharacterData
+    permits CharacterData00, CharacterData01, CharacterData02, CharacterData03,
+        CharacterData0E, CharacterDataLatin1, CharacterDataPrivateUse, CharacterDataUndefined {
     abstract int getProperties(int ch);
     abstract int getType(int ch);
     abstract boolean isDigit(int ch);
diff --git a/src/java.base/share/classes/java/lang/CharacterData00.java.template b/src/java.base/share/classes/java/lang/CharacterData00.java.template
index db496250201..247a3ec7050 100644
--- a/src/java.base/share/classes/java/lang/CharacterData00.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData00.java.template
@@ -25,12 +25,14 @@
 
 package java.lang;
 
+import jdk.internal.vm.annotation.Stable;
+
 /**
  * The CharacterData00 class encapsulates the large tables once found in
  * java.lang.Character
 */
 
-class CharacterData00 extends CharacterData {
+final class CharacterData00 extends CharacterData {
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
         4 bits  directionality property
diff --git a/src/java.base/share/classes/java/lang/CharacterData01.java.template b/src/java.base/share/classes/java/lang/CharacterData01.java.template
index 0c25f633391..e634e3486e8 100644
--- a/src/java.base/share/classes/java/lang/CharacterData01.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData01.java.template
@@ -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
@@ -25,11 +25,13 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables once found in
+import jdk.internal.vm.annotation.Stable;
+
+/** The CharacterData01 class encapsulates the large tables once found in
  *  java.lang.Character. 
  */
 
-class CharacterData01 extends CharacterData {
+final class CharacterData01 extends CharacterData {
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
         4 bits  directionality property
diff --git a/src/java.base/share/classes/java/lang/CharacterData02.java.template b/src/java.base/share/classes/java/lang/CharacterData02.java.template
index ff5a1c30189..65570ae3f5b 100644
--- a/src/java.base/share/classes/java/lang/CharacterData02.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData02.java.template
@@ -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
@@ -25,10 +25,12 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables found in
+import jdk.internal.vm.annotation.Stable;
+
+/** The CharacterData02 class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterData02 extends CharacterData {
+final class CharacterData02 extends CharacterData {
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
         4 bits  directionality property
diff --git a/src/java.base/share/classes/java/lang/CharacterData03.java.template b/src/java.base/share/classes/java/lang/CharacterData03.java.template
index 27d1f4b9a69..6b7d037fbc3 100644
--- a/src/java.base/share/classes/java/lang/CharacterData03.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData03.java.template
@@ -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
@@ -25,10 +25,12 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables found in
+import jdk.internal.vm.annotation.Stable;
+
+/** The CharacterData03 class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterData03 extends CharacterData {
+final class CharacterData03 extends CharacterData {
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
         4 bits  directionality property
diff --git a/src/java.base/share/classes/java/lang/CharacterData0E.java.template b/src/java.base/share/classes/java/lang/CharacterData0E.java.template
index f2ac14682ac..6e4858e4d3d 100644
--- a/src/java.base/share/classes/java/lang/CharacterData0E.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterData0E.java.template
@@ -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
@@ -25,10 +25,12 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables found in
+import jdk.internal.vm.annotation.Stable;
+
+/** The CharacterData0E class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterData0E extends CharacterData {
+final class CharacterData0E extends CharacterData {
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
         4 bits  directionality property
diff --git a/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
index 3f162e6cc16..8316164c7c5 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
+++ b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
@@ -26,11 +26,12 @@
 package java.lang;
 
 import jdk.internal.vm.annotation.IntrinsicCandidate;
+import jdk.internal.vm.annotation.Stable;
 
-/** The CharacterData class encapsulates the large tables found in
+/** The CharacterDataLatin1 class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterDataLatin1 extends CharacterData {
+final class CharacterDataLatin1 extends CharacterData {
 
     /* The character properties are currently encoded into 32 bits in the following manner:
         1 bit   mirrored property
@@ -230,6 +231,7 @@ class CharacterDataLatin1 extends CharacterData {
     //
     // Analysis has shown that generating the whole array allows the JIT to generate
     // better code compared to a slimmed down array, such as one cutting off after 'z'
+    @Stable
     private static final byte[] DIGITS = new byte[] {
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -314,6 +316,7 @@ class CharacterDataLatin1 extends CharacterData {
         return mapChar;
     }
 
+    @Stable
     static char[] sharpsMap = new char[] {'S', 'S'};
 
     char[] toUpperCaseCharArray(int ch) {
diff --git a/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java b/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
index 9e6c446f86a..22eae86f4a3 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
+++ b/src/java.base/share/classes/java/lang/CharacterDataPrivateUse.java
@@ -25,10 +25,10 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables found in
+/** The CharacterDataPrivateUse class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterDataPrivateUse extends CharacterData {
+final class CharacterDataPrivateUse extends CharacterData {
 
     int getProperties(int ch) {
         return 0;
diff --git a/src/java.base/share/classes/java/lang/CharacterDataUndefined.java b/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
index 58c74b658b1..4db9ff4ed3c 100644
--- a/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
+++ b/src/java.base/share/classes/java/lang/CharacterDataUndefined.java
@@ -25,10 +25,10 @@
 
 package java.lang;
 
-/** The CharacterData class encapsulates the large tables found in
+/** The CharacterDataUndefined class encapsulates the large tables found in
     Java.lang.Character. */
 
-class CharacterDataUndefined extends CharacterData {
+final class CharacterDataUndefined extends CharacterData {
 
     int getProperties(int ch) {
         return 0;

From cb8eea4ecd12669e361baac8bb6e71cde7937812 Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Thu, 29 May 2025 21:29:35 +0000
Subject: [PATCH 719/901] 8356095: AArch64: Obsolete -XX:+NearCPool option

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/globals_aarch64.hpp | 2 --
 src/hotspot/share/runtime/arguments.cpp     | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 800e7718921..632bba728a1 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -83,8 +83,6 @@ define_pd_global(intx, InlineSmallCode,          1000);
                    range,                                               \
                    constraint)                                          \
                                                                         \
-  product(bool, NearCpool, true,                                        \
-         "constant pool is close to instructions")                      \
   product(bool, UseCRC32, false,                                        \
           "Use CRC32 instructions for CRC32 computation")               \
   product(bool, UseCryptoPmullForCRC32, false,                          \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index b7ce095b41b..7592d233f0c 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -545,6 +545,9 @@ 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() },
+#if defined(AARCH64)
+  { "NearCpool",                    JDK_Version::undefined(), JDK_Version::jdk(25), JDK_Version::undefined() },
+#endif
 
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },

From 648c337bea5ec65908cab02eaf232243ccf2d4bf Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Thu, 29 May 2025 21:41:49 +0000
Subject: [PATCH 720/901] 8356648: runtime/Thread/AsyncExceptionTest.java fails
 with +StressCompiledExceptionHandlers

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/c1/c1_Runtime1.cpp          |  2 +-
 .../runtime/Thread/AsyncExceptionTest.java    | 51 +++++++++----------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 4bf056fe312..93b8ed4410b 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -508,7 +508,7 @@ static nmethod* counter_overflow_helper(JavaThread* current, int branch_bci, Met
 
 JRT_BLOCK_ENTRY(address, Runtime1::counter_overflow(JavaThread* current, int bci, Method* method))
   nmethod* osr_nm;
-  JRT_BLOCK
+  JRT_BLOCK_NO_ASYNC
     osr_nm = counter_overflow_helper(current, bci, method);
     if (osr_nm != nullptr) {
       RegisterMap map(current,
diff --git a/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
index e1296ab81e9..c7d0d1a27f0 100644
--- a/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
+++ b/test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.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
@@ -27,11 +27,17 @@
  * @requires vm.compiler1.enabled | vm.compiler2.enabled
  * @summary Stress delivery of asynchronous exceptions.
  * @library /test/hotspot/jtreg/testlibrary
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+StressCompiledExceptionHandlers
+ *                   -Xcomp -XX:TieredStopAtLevel=3
+ *                   -XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
+ *                   -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
+ *                   -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
+ *                   AsyncExceptionTest
  * @run main/othervm -Xcomp
-                     -XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
-                     -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
-                     -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
-                     AsyncExceptionTest
+ *                   -XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
+ *                   -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
+ *                   -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
+ *                   AsyncExceptionTest
  */
 
 import jvmti.JVMTIUtils;
@@ -42,19 +48,19 @@ public class AsyncExceptionTest extends Thread {
     private final static int DEF_TIME_MAX = 30;  // default max # secs to test
     private final static String PROG_NAME = "AsyncExceptionTest";
 
-    public CountDownLatch exitSyncObj = new CountDownLatch(1);
     public CountDownLatch startSyncObj = new CountDownLatch(1);
 
     private boolean firstEntry = true;
     private boolean receivedThreadDeathinInternal1 = false;
     private boolean receivedThreadDeathinInternal2 = false;
+    private volatile RuntimeException error = null;
 
     @Override
     public void run() {
         try {
             internalRun1();
         } catch (ThreadDeath td) {
-            throw new RuntimeException("Caught ThreadDeath in run() instead of internalRun2() or internalRun1().\n"
+            error = new RuntimeException("Caught ThreadDeath in run() instead of internalRun2() or internalRun1().\n"
                     + "receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1
                     + "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
         } catch (NoClassDefFoundError ncdfe) {
@@ -62,11 +68,10 @@ public void run() {
         }
 
         if (receivedThreadDeathinInternal2 == false && receivedThreadDeathinInternal1 == false) {
-            throw new RuntimeException("Didn't catch ThreadDeath in internalRun2() nor in internalRun1().\n"
+            error = new RuntimeException("Didn't catch ThreadDeath in internalRun2() nor in internalRun1().\n"
                     + "receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1
                     + "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
         }
-        exitSyncObj.countDown();
     }
 
     public void internalRun1() {
@@ -123,18 +128,9 @@ public static void main(String[] args) {
             try {
                 // Wait for the worker thread to get going.
                 thread.startSyncObj.await();
-                while (true) {
-                    // Send async exception and wait until it is thrown
-                    JVMTIUtils.stopThread(thread);
-                    thread.exitSyncObj.await();
-                    Thread.sleep(100);
-
-                    if (!thread.isAlive()) {
-                        // Done with Thread.stop() calls since
-                        // thread is not alive.
-                        break;
-                    }
-                }
+                // Send async exception and wait until it is thrown
+                JVMTIUtils.stopThread(thread);
+                thread.join();
             } catch (InterruptedException e) {
                 throw new Error("Unexpected: " + e);
             } catch (NoClassDefFoundError ncdfe) {
@@ -143,11 +139,14 @@ public static void main(String[] args) {
                 // in a worker thread can subsequently be seen in the
                 // main thread.
             }
-
-            try {
-                thread.join();
-            } catch (InterruptedException e) {
-                throw new Error("Unexpected: " + e);
+            if (thread.isAlive()) {
+                // Really shouldn't be possible after join() above...
+                throw new RuntimeException("Thread did not exit.\n"
+                    + "receivedThreadDeathinInternal1=" + thread.receivedThreadDeathinInternal1
+                    + "; receivedThreadDeathinInternal2=" + thread.receivedThreadDeathinInternal2);
+            }
+            if (thread.error != null) {
+                throw thread.error;
             }
         }
 

From a05f9dea18ec812abad1dbe0084c0c58384a9076 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 29 May 2025 21:44:47 +0000
Subject: [PATCH 721/901] 8358017: Various enhancements of jpackage test
 helpers

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/AnnotationsTest.java    |  2 +-
 .../jdk/jpackage/test/JUnitAdapter.java       | 33 +++++++----
 .../jdk/jpackage/test/FileAssociations.java   | 16 +++++-
 .../helpers/jdk/jpackage/test/HelloApp.java   | 25 ++++++--
 .../jdk/jpackage/test/JPackageCommand.java    | 18 +++---
 .../helpers/jdk/jpackage/test/JavaTool.java   |  4 +-
 .../helpers/jdk/jpackage/test/MacSign.java    |  2 +-
 .../jdk/jpackage/test/MacSignVerify.java      |  2 +-
 .../jpackage/test/RunnablePackageTest.java    |  6 +-
 .../helpers/jdk/jpackage/test/TKit.java       | 48 +++++++++++++++-
 .../jdk/jpackage/test/TestBuilder.java        | 22 ++++---
 .../jdk/jpackage/test/TestInstance.java       | 57 +++++++++----------
 .../jdk/jpackage/test/TestMethodSupplier.java | 16 +++---
 13 files changed, 172 insertions(+), 79 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 fdbd30ac7e9..e16b175ab8a 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
@@ -225,7 +225,7 @@ public static Set<String> getExpectedTestDescs() {
             );
         }
 
-        private final static TestExecutionRecorder staticRecorder = new TestExecutionRecorder(ParameterizedInstanceTest.class);
+        private static final TestExecutionRecorder staticRecorder = new TestExecutionRecorder(ParameterizedInstanceTest.class);
     }
 
     public static class IfOSTest extends TestExecutionRecorder {
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
index 7bf1f57a254..b7c50285797 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java
@@ -22,8 +22,6 @@
  */
 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;
@@ -33,28 +31,39 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
 
 public class JUnitAdapter {
 
-    JUnitAdapter() {
+    static {
         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()
-                    });
+    public static Stream<DynamicTest> createJPackageTests(ClassLoader testClassLoader, String... args) throws Throwable {
+        final List<TestInstance> tests = new ArrayList<>();
+        try (final var testBuilder = TestBuilder.build().workDirRoot(Path.of("")).testClassLoader(testClassLoader).testConsumer(tests::add).create()) {
+            for (final var arg : args) {
+                testBuilder.processCmdLineArg(arg);
+            }
         }
+        return tests.stream().map(test -> {
+            return DynamicTest.dynamicTest(test.fullName(), () -> {
+                TKit.runAdhocTest(test);
+            });
+        });
+    }
+
+    @TestFactory
+    Stream<DynamicTest> createJPackageTests() throws Throwable {
+        return createJPackageTests(getClass().getClassLoader(), "--jpt-run=" + getClass().getName());
     }
 
     static List<String> captureJPackageTestLog(ThrowingRunnable runnable) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
index 091a2206b17..f8dc10c3dd0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.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
@@ -32,6 +32,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.util.PathUtils;
 
 
@@ -142,7 +143,18 @@ List<String> openFiles(List<Path> testFiles) throws IOException {
             switch (invocationType) {
                 case DesktopOpenAssociatedFile: {
                     TKit.trace(String.format("Use desktop to open [%s] file", testFile));
-                    Desktop.getDesktop().open(testFile.toFile());
+                    if (!HelloApp.CLEAR_JAVA_ENV_VARS) {
+                        Desktop.getDesktop().open(testFile.toFile());
+                    } else {
+                        final var jsScript = TKit.createTempFile(Path.of("fa-scripts", testFile.getFileName().toString() + ".jsh"));
+                        TKit.createTextFile(jsScript, List.of(
+                                "import java.awt.Desktop",
+                                "import java.io.File",
+                                String.format("Desktop.getDesktop().open(new File(\"%s\"))", testFile.toString().replace('\\', '/')),
+                                "/exit"));
+                        final var exec = Executor.of(JavaTool.JSHELL.getPath().toString(), jsScript.toString());
+                        HelloApp.configureEnvironment(exec).dumpOutput().execute();
+                    }
                     return List.of(testFile.toString());
                 }
                 case WinCommandLine: {
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 7ac4159c2a6..69ea4ecfaa0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -514,16 +515,25 @@ private static Executor.Result execute(int expectedExitCode, Executor executor)
         }
     }
 
-    private static Executor configureEnvironment(Executor executor) {
+    static Executor configureEnvironment(Executor executor) {
         if (CLEAR_JAVA_ENV_VARS) {
-            executor.removeEnvVar("JAVA_TOOL_OPTIONS");
-            executor.removeEnvVar("_JAVA_OPTIONS");
+            JAVA_ENV_VARS.forEach(executor::removeEnvVar);
         }
         return executor;
     }
 
+    private static boolean javaEnvVariablesContainsModulePath() {
+        return JAVA_ENV_VARS.stream().map(System::getenv).filter(Objects::nonNull).anyMatch(HelloApp::containsModulePath);
+    }
+
+    private static boolean containsModulePath(String value) {
+        return value.contains("--module-path");
+    }
+
     static final String OUTPUT_FILENAME = "appOutput.txt";
 
+    private static final Set<String> JAVA_ENV_VARS = Set.of("JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS");
+
     private final JavaAppDesc appDesc;
 
     private static final Path HELLO_JAVA = TKit.TEST_SRC_ROOT.resolve(
@@ -532,6 +542,11 @@ private static Executor configureEnvironment(Executor executor) {
     private static final String CLASS_NAME = HELLO_JAVA.getFileName().toString().split(
             "\\.", 2)[0];
 
-    private static final boolean CLEAR_JAVA_ENV_VARS = Optional.ofNullable(
-            TKit.getConfigProperty("clear-app-launcher-java-env-vars")).map(Boolean::parseBoolean).orElse(false);
+    //
+    // Runtime in the app image normally doesn't have .jmod files. Because of this `--module-path`
+    // option will cause failure at app launcher startup.
+    // Java environment variables containing this option should be removed from the
+    // environment in which app launchers are started.
+    //
+    static final boolean CLEAR_JAVA_ENV_VARS = javaEnvVariablesContainsModulePath();
 }
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 bab752affb8..7f9feb986b4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -52,6 +52,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
+import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
@@ -664,12 +665,16 @@ public boolean isPackageUnpacked() {
         return hasArgument(UNPACKED_PATH_ARGNAME);
     }
 
+    public static void useToolProviderByDefault(ToolProvider jpackageToolProvider) {
+        defaultToolProvider = Optional.of(jpackageToolProvider);
+    }
+
     public static void useToolProviderByDefault() {
-        defaultWithToolProvider = true;
+        useToolProviderByDefault(JavaTool.JPACKAGE.asToolProvider());
     }
 
     public static void useExecutableByDefault() {
-        defaultWithToolProvider = false;
+        defaultToolProvider = Optional.empty();
     }
 
     public JPackageCommand useToolProvider(boolean v) {
@@ -778,8 +783,7 @@ public JPackageCommand validateOutput(CannedFormattedString... str) {
     }
 
     public boolean isWithToolProvider() {
-        return Optional.ofNullable(withToolProvider).orElse(
-                defaultWithToolProvider);
+        return Optional.ofNullable(withToolProvider).orElseGet(defaultToolProvider::isPresent);
     }
 
     public JPackageCommand executePrerequisiteActions() {
@@ -800,7 +804,7 @@ private Executor createExecutor() {
                 .addArguments(args);
 
         if (isWithToolProvider()) {
-            exec.setToolProvider(JavaTool.JPACKAGE);
+            exec.setToolProvider(defaultToolProvider.orElseGet(JavaTool.JPACKAGE::asToolProvider));
         } else {
             exec.setExecutable(JavaTool.JPACKAGE);
             if (TKit.isWindows()) {
@@ -973,7 +977,7 @@ List<Path> getPaths(JPackageCommand cmd) {
             return getPaths.apply(cmd).stream().toList();
         }
 
-        private final static class Builder {
+        private static final class Builder {
 
             Builder(String argName) {
                 this.argName = Objects.requireNonNull(argName);
@@ -1472,7 +1476,7 @@ public void run() {
     private Set<ReadOnlyPathAssert> readOnlyPathAsserts = Set.of(ReadOnlyPathAssert.values());
     private Set<AppLayoutAssert> appLayoutAsserts = Set.of(AppLayoutAssert.values());
     private List<Consumer<Iterator<String>>> outputValidators = new ArrayList<>();
-    private static boolean defaultWithToolProvider;
+    private static Optional<ToolProvider> defaultToolProvider = Optional.empty();
 
     private static final Map<String, PackageType> PACKAGE_TYPES = Functional.identity(
             () -> {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java
index 7b217b2431c..0bbf71fe0cd 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.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
@@ -29,7 +29,7 @@
 import java.util.spi.ToolProvider;
 
 public enum JavaTool {
-    JAVA, JAVAC, JPACKAGE, JAR, JLINK, JMOD;
+    JAVA, JAVAC, JPACKAGE, JAR, JLINK, JMOD, JSHELL;
 
     JavaTool() {
         this.path = Path.of(System.getProperty("java.home")).resolve(
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 a97969e00b7..af9f57c4f7f 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -1037,7 +1037,7 @@ public static boolean isDeployed(List<KeychainWithCertsSpec> specs) {
         return !missingKeychain && !missingCertificates && !invalidCertificates;
     }
 
-    public final static class ResolvedKeychain {
+    public static final class ResolvedKeychain {
         public ResolvedKeychain(KeychainWithCertsSpec spec) {
             this.spec = Objects.requireNonNull(spec);
         }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
index 88b41c2e469..432433b4fd0 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
@@ -83,7 +83,7 @@ public String value() {
             return value;
         }
 
-        final private String value;
+        private final String value;
     }
 
     public static final String ADHOC_SIGN_ORIGIN = "-";
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
index 9f307989715..5337651bddc 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/RunnablePackageTest.java
@@ -71,7 +71,7 @@ protected void runActions(List<Action[]> actions) {
     /**
      * Test action.
      */
-    static public enum Action {
+    public static enum Action {
         /**
          * Init test.
          */
@@ -114,7 +114,7 @@ public String toString() {
             return name().toLowerCase().replace('_', '-');
         }
 
-        public final static Action[] CREATE_AND_UNPACK = new Action[] {
+        public static final Action[] CREATE_AND_UNPACK = new Action[] {
             CREATE, UNPACK, VERIFY_INSTALL
         };
     };
@@ -143,7 +143,7 @@ private List<Action[]> groupActions(List<Action> actions) {
         return groups;
     }
 
-    private final static List<Action> DEFAULT_ACTIONS;
+    private static final List<Action> DEFAULT_ACTIONS;
 
     static {
         final String propertyName = "action";
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 6c424e21d5f..2508db00295 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -25,6 +25,7 @@
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.io.Closeable;
 import java.io.FileOutputStream;
@@ -126,7 +127,19 @@ static void withExtraLogStream(ThrowingRunnable action, PrintStream logStream) {
         }
     }
 
+    enum RunTestMode {
+        FAIL_FAST;
+
+        static final Set<RunTestMode> DEFAULTS = Set.of();
+    }
+
     static void runTests(List<TestInstance> tests) {
+        runTests(tests, RunTestMode.DEFAULTS);
+    }
+
+    static void runTests(List<TestInstance> tests, Set<RunTestMode> modes) {
+        Objects.requireNonNull(tests);
+        Objects.requireNonNull(modes);
         if (currentTest != null) {
             throw new IllegalStateException(
                     "Unexpected nested or concurrent Test.run() call");
@@ -136,7 +149,11 @@ static void runTests(List<TestInstance> tests) {
             tests.stream().forEach(test -> {
                 currentTest = test;
                 try {
-                    ignoreExceptions(test).run();
+                    if (modes.contains(RunTestMode.FAIL_FAST)) {
+                        ThrowingRunnable.toRunnable(test::run).run();
+                    } else {
+                        ignoreExceptions(test).run();
+                    }
                 } finally {
                     currentTest = null;
                     if (extraLogStream != null) {
@@ -147,6 +164,35 @@ static void runTests(List<TestInstance> tests) {
         });
     }
 
+    static <T> T runAdhocTest(ThrowingSupplier<T> action) {
+        final List<T> box = new ArrayList<>();
+        runAdhocTest(() -> {
+            box.add(action.get());
+        });
+        return box.getFirst();
+    }
+
+    static void runAdhocTest(ThrowingRunnable action) {
+        Objects.requireNonNull(action);
+
+        final Path workDir = toSupplier(() -> Files.createTempDirectory("jdk.jpackage-test")).get();
+
+        final TestInstance test;
+        if (action instanceof TestInstance ti) {
+            test = new TestInstance(ti, workDir);
+        } else {
+            test = new TestInstance(() -> {
+                try {
+                    action.run();
+                } finally {
+                    TKit.deleteDirectoryRecursive(workDir);
+                }
+            }, workDir);
+        }
+
+        runTests(List.of(test), Set.of(RunTestMode.FAIL_FAST));
+    }
+
     static Runnable ignoreExceptions(ThrowingRunnable action) {
         return () -> {
             try {
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 db4810ce5e2..227c73bc68e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
@@ -60,7 +60,7 @@ static Builder build() {
         return new Builder();
     }
 
-    final static class Builder {
+    static final class Builder {
         private Builder() {
         }
 
@@ -74,17 +74,24 @@ Builder workDirRoot(Path v) {
             return this;
         }
 
+        Builder testClassLoader(ClassLoader v) {
+            testClassLoader = v;
+            return this;
+        }
+
         TestBuilder create() {
-            return new TestBuilder(testConsumer, workDirRoot);
+            return new TestBuilder(testConsumer, workDirRoot, testClassLoader);
         }
 
         private Consumer<TestInstance> testConsumer;
         private Path workDirRoot = Path.of("");
+        private ClassLoader testClassLoader = TestBuilder.class.getClassLoader();
     }
 
-    private TestBuilder(Consumer<TestInstance> testConsumer, Path workDirRoot) {
+    private TestBuilder(Consumer<TestInstance> testConsumer, Path workDirRoot, ClassLoader testClassLoader) {
         this.testMethodSupplier = TestBuilderConfig.getDefault().createTestMethodSupplier();
         this.workDirRoot = Objects.requireNonNull(workDirRoot);
+        this.testClassLoader = Objects.requireNonNull(testClassLoader);
         argProcessors = Map.of(
                 CMDLINE_ARG_PREFIX + "after-run",
                 arg -> getJavaMethodsFromArg(arg).map(
@@ -233,9 +240,9 @@ private void clear() {
         testGroup = null;
     }
 
-    private static Class<?> probeClass(String name) {
+    private static Class<?> probeClass(String name, ClassLoader classLoader) {
         try {
-            return Class.forName(name);
+            return Class.forName(name, true, classLoader);
         } catch (ClassNotFoundException ex) {
             return null;
         }
@@ -254,7 +261,7 @@ private Stream<Method> getJavaMethodsFromArg(String argValue) {
 
         String defaultClassName = null;
         for (String token : argValue.split(",")) {
-            Class<?> testSet = probeClass(token);
+            Class<?> testSet = probeClass(token, testClassLoader);
             if (testSet != null) {
                 if (testMethodSupplier.isTestClass(testSet)) {
                     toConsumer(testMethodSupplier::verifyTestClass).accept(testSet);
@@ -297,7 +304,7 @@ private List<Method> getJavaMethodFromString(String qualifiedMethodName) {
 
         try {
             return testMethodSupplier.findNullaryLikeMethods(
-                    fromQualifiedMethodName(qualifiedMethodName));
+                    fromQualifiedMethodName(qualifiedMethodName), testClassLoader);
         } catch (NoSuchMethodException ex) {
             throw new ParseException(ex.getMessage() + ";", ex);
         }
@@ -371,6 +378,7 @@ static void trace(String msg) {
     private final Map<String, ThrowingConsumer<String>> argProcessors;
     private final Consumer<TestInstance> testConsumer;
     private final Path workDirRoot;
+    private final ClassLoader testClassLoader;
     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 bef75e7280a..4445a194ee7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
@@ -48,8 +48,16 @@
 
 final class TestInstance implements ThrowingRunnable {
 
-    static class TestDesc {
-        private TestDesc() {
+    static final class TestDesc {
+        private TestDesc(Class<?> clazz, String functionName, String functionArgs, String instanceArgs) {
+            this.clazz = Objects.requireNonNull(clazz);
+            this.functionName = functionName;
+            this.functionArgs = functionArgs;
+            this.instanceArgs = instanceArgs;
+        }
+
+        private TestDesc(Class<?> clazz) {
+            this(clazz, null, null, null);
         }
 
         String testFullName() {
@@ -93,16 +101,11 @@ Builder methodArgs(Object... v) {
 
             @Override
             public TestDesc get() {
-                TestDesc desc = new TestDesc();
                 if (method == null) {
-                    desc.clazz = enclosingMainMethodClass();
+                    return new TestDesc(enclosingMainMethodClass());
                 } else {
-                    desc.clazz = method.getDeclaringClass();
-                    desc.functionName = method.getName();
-                    desc.functionArgs = formatArgs(methodArgs);
-                    desc.instanceArgs = formatArgs(ctorArgs);
+                    return new TestDesc(method.getDeclaringClass(), method.getName(), formatArgs(methodArgs), formatArgs(ctorArgs));
                 }
-                return desc;
             }
 
             private static String formatArgs(List<Object> values) {
@@ -140,27 +143,10 @@ private static String formatArgs(List<Object> values) {
             private static final HexFormat ARGS_CHAR_FORMATTER = HexFormat.of().withUpperCase();
         }
 
-        static TestDesc create(Method m, Object... args) {
-            TestDesc desc = new TestDesc();
-            desc.clazz = m.getDeclaringClass();
-            desc.functionName = m.getName();
-            if (args.length != 0) {
-                desc.functionArgs = Stream.of(args).map(v -> {
-                    if (v.getClass().isArray()) {
-                        return String.format("%s(length=%d)",
-                                Arrays.deepToString((Object[]) v),
-                                Array.getLength(v));
-                    }
-                    return String.format("%s", v);
-                }).collect(Collectors.joining(", "));
-            }
-            return desc;
-        }
-
-        private Class<?> clazz;
-        private String functionName;
-        private String functionArgs;
-        private String instanceArgs;
+        private final Class<?> clazz;
+        private final String functionName;
+        private final String functionArgs;
+        private final String instanceArgs;
     }
 
     TestInstance(ThrowingRunnable testBody, Path workDirRoot) {
@@ -186,6 +172,17 @@ static TestDesc create(Method m, Object... args) {
         this.workDir = workDirRoot.resolve(createWorkDirPath(testDesc));
     }
 
+    TestInstance(TestInstance other, Path workDirRoot) {
+        assertCount = 0;
+        this.testConstructor = other.testConstructor;
+        this.testBody = other.testBody;
+        this.beforeActions = other.beforeActions;
+        this.afterActions = other.afterActions;
+        this.testDesc = other.testDesc;
+        this.dryRun = other.dryRun;
+        this.workDir = workDirRoot.resolve(createWorkDirPath(other.testDesc));
+    }
+
     void notifyAssert() {
         assertCount++;
     }
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 8b92ae7ca46..36ae81b7db4 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java
@@ -62,8 +62,8 @@ final class TestMethodSupplier {
 
     record MethodQuery(String className, String methodName) {
 
-        List<Method> lookup() throws ClassNotFoundException {
-            final Class<?> methodClass = Class.forName(className);
+        List<Method> lookup(ClassLoader classLoader) throws ClassNotFoundException {
+            final Class<?> methodClass = Class.forName(className, true, classLoader);
 
             // Get the list of all public methods as need to deal with overloads.
             return Stream.of(methodClass.getMethods()).filter(method -> {
@@ -84,11 +84,11 @@ static MethodQuery fromQualifiedMethodName(String qualifiedMethodName) {
         }
     }
 
-    List<Method> findNullaryLikeMethods(MethodQuery query) throws NoSuchMethodException {
+    List<Method> findNullaryLikeMethods(MethodQuery query, ClassLoader classLoader) throws NoSuchMethodException {
         List<Method> methods;
 
         try {
-            methods = query.lookup();
+            methods = query.lookup(classLoader);
         } catch (ClassNotFoundException ex) {
             throw new NoSuchMethodException(
                     String.format("Class [%s] not found", query.className()));
@@ -273,8 +273,10 @@ private List<Object[]> createArgsForAnnotation(Executable exec,
 
         final Method supplierMethod;
         try {
-            final var parameterSupplierCandidates = findNullaryLikeMethods(methodQuery);
-            final Function<String, Class<?>> classForName = toFunction(Class::forName);
+            final var parameterSupplierCandidates = findNullaryLikeMethods(methodQuery, execClass.getClassLoader());
+            final Function<String, Class<?>> classForName = toFunction(name -> {
+                return Class.forName(name, true, execClass.getClassLoader());
+            });
             final var supplierMethodClass = classForName.apply(methodQuery.className());
             if (parameterSupplierCandidates.isEmpty()) {
                 throw new RuntimeException(String.format(
@@ -284,7 +286,7 @@ private List<Object[]> createArgsForAnnotation(Executable exec,
 
             var allParameterSuppliers = filterParameterSuppliers(supplierMethodClass).toList();
 
-            supplierMethod = findNullaryLikeMethods(methodQuery)
+            supplierMethod = findNullaryLikeMethods(methodQuery, execClass.getClassLoader())
                     .stream()
                     .filter(allParameterSuppliers::contains)
                     .findFirst().orElseThrow(() -> {

From 64503c784bbddc638ce0098f5c6ef0cb81cbf938 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 30 May 2025 02:06:56 +0000
Subject: [PATCH 722/901] 8357299: Graphics copyArea doesn't copy any pixels
 when there is overflow

Reviewed-by: achung, kizune, prr
---
 .../share/native/libawt/java2d/loops/Blit.c   | 21 +++----
 .../java/awt/Graphics/BrokenBoundsClip.java   | 60 +++++++++++++++++++
 2 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 test/jdk/java/awt/Graphics/BrokenBoundsClip.java

diff --git a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
index 8a41584deef..cbba3e4cacb 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
@@ -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
@@ -74,19 +74,16 @@ Java_sun_java2d_loops_Blit_Blit
 
     srcInfo.bounds.x1 = srcx;
     srcInfo.bounds.y1 = srcy;
-    if (UNSAFE_TO_ADD(srcx, width) ||
-        UNSAFE_TO_ADD(srcy, height) ||
-        UNSAFE_TO_ADD(dstx, width) ||
-        UNSAFE_TO_ADD(dsty, height)) {
-        return;
-    }
-
-    srcInfo.bounds.x2 = srcx + width;
-    srcInfo.bounds.y2 = srcy + height;
+    srcInfo.bounds.x2 = UNSAFE_TO_ADD(srcx, width)
+                        ? clipInfo.bounds.x2 : (srcx + width);
+    srcInfo.bounds.y2 = UNSAFE_TO_ADD(srcy, height)
+                        ? clipInfo.bounds.y2 : (srcy + height);
     dstInfo.bounds.x1 = dstx;
     dstInfo.bounds.y1 = dsty;
-    dstInfo.bounds.x2 = dstx + width;
-    dstInfo.bounds.y2 = dsty + height;
+    dstInfo.bounds.x2 = UNSAFE_TO_ADD(dstx, width)
+                        ? clipInfo.bounds.x2 : (dstx + width);
+    dstInfo.bounds.y2 = UNSAFE_TO_ADD(dsty, height)
+                        ? clipInfo.bounds.y2 : (dsty + height);
     if (UNSAFE_TO_SUB(srcx, dstx) ||
         UNSAFE_TO_SUB(srcy, dsty)) {
         return;
diff --git a/test/jdk/java/awt/Graphics/BrokenBoundsClip.java b/test/jdk/java/awt/Graphics/BrokenBoundsClip.java
new file mode 100644
index 00000000000..3ba8ebe2e3f
--- /dev/null
+++ b/test/jdk/java/awt/Graphics/BrokenBoundsClip.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.
+ */
+
+/*
+ * @test
+ * @bug 8357299
+ * @summary Verifies if Graphics copyArea doesn't copy any pixels
+ *          when there is overflow
+ * @run main BrokenBoundsClip
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+import static java.awt.image.BufferedImage.TYPE_INT_RGB;
+
+public final class BrokenBoundsClip {
+
+     public static final int SIZE = 100;
+
+     public static void main(String[] args) {
+         BufferedImage bi = new BufferedImage(SIZE, SIZE, TYPE_INT_RGB);
+
+         Graphics2D g2d = bi.createGraphics();
+         g2d.setColor(Color.RED);
+         g2d.fillRect(SIZE / 2, SIZE / 2, SIZE / 2, SIZE / 2);
+
+         g2d.copyArea(bi.getWidth() / 2, bi.getHeight() / 2,
+                      Integer.MAX_VALUE , Integer.MAX_VALUE ,
+                      -bi.getWidth() / 2, -bi.getHeight() / 2);
+         int actual = bi.getRGB(0, 0);
+         int expected = Color.RED.getRGB();
+         if (actual != expected) {
+             System.err.println("Actual:   " + Integer.toHexString(actual));
+             System.err.println("Expected: " + Integer.toHexString(expected));
+             throw new RuntimeException("Wrong color");
+         }
+     }
+}

From fd51b03910ba90ca1c46a4204b8940421338e22e Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 30 May 2025 03:07:04 +0000
Subject: [PATCH 723/901] 8351369: [macos] Use --install-dir option with DMG
 packaging

Reviewed-by: asemenyuk
---
 .../internal/MacDmgPackageBuilder.java        |  8 ---
 .../jdk/jpackage/internal/MacDmgPackager.java |  4 +-
 .../jpackage/internal/resources/DMGsetup.scpt |  7 ++-
 .../resources/MacResources.properties         |  1 -
 .../tools/jpackage/share/InstallDirTest.java  | 50 ++++---------------
 5 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
index 0ee1756b235..d453bb59184 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
@@ -54,14 +54,6 @@ List<Path> validatedDmgContent() {
 
     MacDmgPackage create() throws ConfigException {
         final var superPkgBuilder = pkgBuilder.pkgBuilder();
-        superPkgBuilder.installDir().ifPresent(installDir -> {
-            final var defaultInstallDirLocation = superPkgBuilder.defaultInstallDir().map(Path::getParent).orElseThrow();
-            if (!defaultInstallDirLocation.equals(installDir)) {
-                Log.info(I18N.format("message.install-dir-ignored", defaultInstallDirLocation));
-                superPkgBuilder.installDir(defaultInstallDirLocation);
-            }
-        });
-
         final var pkg = pkgBuilder.create();
 
         return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
index b37fa6979de..eb3ad3a76c8 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
@@ -285,7 +285,9 @@ private String getInstallDirDisplayName() {
             // Return "Applications" for "/Applications/foo.app"
             return defaultInstallDir.getParent().getFileName().toString();
         } else {
-            return pkg.installDir().getParent().toString();
+            // If we returning full path we need to replace '/' with ':'.
+            // In this case macOS will display link name as "/Users/USER/MyCompany/MyApp".
+            return pkg.installDir().getParent().toString().replace('/', ':');
         }
     }
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt
index ab87a7bd700..112b7239103 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt
@@ -17,7 +17,7 @@ tell application "Finder"
   set background picture of theViewOptions to POSIX file "DEPLOY_BG_FILE"
 
   -- Create alias for install location
-  make new alias file at POSIX file "DEPLOY_VOLUME_PATH" to POSIX file "DEPLOY_INSTALL_LOCATION" with properties {name:"DEPLOY_INSTALL_LOCATION_DISPLAY_NAME"}
+  do shell script "(cd 'DEPLOY_VOLUME_PATH' && ln -s 'DEPLOY_INSTALL_LOCATION' 'DEPLOY_INSTALL_LOCATION_DISPLAY_NAME')"
 
   set allTheFiles to the name of every item of theWindow
   set xpos to 120
@@ -28,7 +28,10 @@ tell application "Finder"
     set theFilePath to POSIX path of theFile
     set appFilePath to POSIX path of "/DEPLOY_TARGET"
     if theFilePath ends with "DEPLOY_INSTALL_LOCATION_DISPLAY_NAME" then
-      -- Position install location
+      -- Position install location for default install dir
+      set position of item theFile of theWindow to {390, 130}
+    else if theFilePath ends with "DEPLOY_INSTALL_LOCATION" then
+      -- Position install location for custom install dir
       set position of item theFile of theWindow to {390, 130}
     else if theFilePath ends with appFilePath then
       -- Position application or runtime
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 e7e4b2adb61..1325e3be4f4 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
@@ -80,7 +80,6 @@ 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" 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/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java
index 2c14e863910..bbdc118d60b 100644
--- a/test/jdk/tools/jpackage/share/InstallDirTest.java
+++ b/test/jdk/tools/jpackage/share/InstallDirTest.java
@@ -113,7 +113,7 @@ public static void testLinuxInvalid(String installDir) {
         .run();
     }
 
-    record DmgTestSpec(Path installDir, boolean installDirIgnored, boolean runtimeInstaller) {
+    record DmgTestSpec(Path installDir, boolean runtimeInstaller) {
 
         DmgTestSpec {
             Objects.requireNonNull(installDir);
@@ -125,15 +125,8 @@ static Builder build() {
 
         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;
             }
 
@@ -143,11 +136,10 @@ Builder runtimeInstaller() {
             }
 
             DmgTestSpec create() {
-                return new DmgTestSpec(installDir, installDirIgnored, runtimeInstaller);
+                return new DmgTestSpec(installDir, runtimeInstaller);
             }
 
             private Path installDir;
-            private boolean installDirIgnored;
             private boolean runtimeInstaller;
         }
 
@@ -155,9 +147,6 @@ DmgTestSpec create() {
         public String toString() {
             final var sb = new StringBuilder();
             sb.append(installDir);
-            if (installDirIgnored) {
-                sb.append(", ignore");
-            }
             if (runtimeInstaller) {
                 sb.append(", runtime");
             }
@@ -176,27 +165,8 @@ void run() {
 
             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)
@@ -207,19 +177,19 @@ public static void testDmg(DmgTestSpec testSpec) {
 
     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().acceptedInstallDir("/foo"),
+                DmgTestSpec.build().acceptedInstallDir("/foo/bar"),
+                DmgTestSpec.build().acceptedInstallDir("/foo").runtimeInstaller(),
+                DmgTestSpec.build().acceptedInstallDir("/foo/bar").runtimeInstaller(),
 
-                DmgTestSpec.build().ignoredInstallDir("/Library/Java/JavaVirtualMachines"),
-                DmgTestSpec.build().ignoredInstallDir("/Applications").runtimeInstaller(),
+                DmgTestSpec.build().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
+                DmgTestSpec.build().acceptedInstallDir("/Applications").runtimeInstaller(),
 
                 DmgTestSpec.build().acceptedInstallDir("/Applications"),
-                DmgTestSpec.build().ignoredInstallDir("/Applications/foo/bar/buz"),
+                DmgTestSpec.build().acceptedInstallDir("/Applications/foo/bar/buz"),
 
                 DmgTestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
-                DmgTestSpec.build().runtimeInstaller().ignoredInstallDir("/Library/Java/JavaVirtualMachines/foo/bar/buz")
+                DmgTestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines/foo/bar/buz")
         ).map(DmgTestSpec.Builder::create).map(testSpec -> {
             return new Object[] { testSpec };
         }).toList();

From 20005511e3612d6a5f12fa83066f02c88c628e8b Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Fri, 30 May 2025 03:50:43 +0000
Subject: [PATCH 724/901] 8353500: [s390x] Intrinsify Unsafe::setMemory

Reviewed-by: lucy, mdoerr
---
 src/hotspot/cpu/s390/stubGenerator_s390.cpp | 119 ++++++++++++++++++++
 1 file changed, 119 insertions(+)

diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index b46393f543e..1e9136cdca9 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -1468,11 +1468,120 @@ class StubGenerator: public StubCodeGenerator {
     return __ addr_at(start_off);
   }
 
+  //
+  //  Generate 'unsafe' set memory stub
+  //  Though just as safe as the other stubs, it takes an unscaled
+  //  size_t (# bytes) argument instead of an element count.
+  //
+  //  Input:
+  //    Z_ARG1   - destination array address
+  //    Z_ARG2   - byte count (size_t)
+  //    Z_ARG3   - byte value
+  //
+  address generate_unsafe_setmemory(address unsafe_byte_fill) {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, StubGenStubId::unsafe_setmemory_id);
+    unsigned int start_off = __ offset();
+
+    // bump this on entry, not on exit:
+    // inc_counter_np(SharedRuntime::_unsafe_set_memory_ctr);
+
+    const Register dest = Z_ARG1;
+    const Register size = Z_ARG2;
+    const Register byteVal = Z_ARG3;
+    NearLabel tail, finished;
+    // fill_to_memory_atomic(unsigned char*, unsigned long, unsigned char)
+
+    // Mark remaining code as such which performs Unsafe accesses.
+    UnsafeMemoryAccessMark umam(this, true, false);
+
+    __ z_vlvgb(Z_V0, byteVal, 0);
+    __ z_vrepb(Z_V0, Z_V0, 0);
+
+    __ z_aghi(size, -32);
+    __ z_brl(tail);
+
+    {
+      NearLabel again;
+      __ bind(again);
+      __ z_vst(Z_V0, Address(dest, 0));
+      __ z_vst(Z_V0, Address(dest, 16));
+      __ z_aghi(dest, 32);
+      __ z_aghi(size, -32);
+      __ z_brnl(again);
+    }
+
+    __ bind(tail);
+
+    {
+      NearLabel dont;
+      __ testbit(size, 4);
+      __ z_brz(dont);
+      __ z_vst(Z_V0, Address(dest, 0));
+      __ z_aghi(dest, 16);
+      __ bind(dont);
+    }
+
+    {
+      NearLabel dont;
+      __ testbit(size, 3);
+      __ z_brz(dont);
+      __ z_vsteg(Z_V0, 0, Z_R0, dest, 0);
+      __ z_aghi(dest, 8);
+      __ bind(dont);
+    }
+
+    __ z_tmll(size, 7);
+    __ z_brc(Assembler::bcondAllZero, finished);
+
+    {
+      NearLabel dont;
+      __ testbit(size, 2);
+      __ z_brz(dont);
+      __ z_vstef(Z_V0, 0, Z_R0, dest, 0);
+      __ z_aghi(dest, 4);
+      __ bind(dont);
+    }
+
+    {
+      NearLabel dont;
+      __ testbit(size, 1);
+      __ z_brz(dont);
+      __ z_vsteh(Z_V0, 0, Z_R0, dest, 0);
+      __ z_aghi(dest, 2);
+      __ bind(dont);
+    }
+
+    {
+      NearLabel dont;
+      __ testbit(size, 0);
+      __ z_brz(dont);
+      __ z_vsteb(Z_V0, 0, Z_R0, dest, 0);
+      __ bind(dont);
+    }
+
+    __ bind(finished);
+    __ z_br(Z_R14);
+
+    return __ addr_at(start_off);
+  }
+
+  // This is common errorexit stub for UnsafeMemoryAccess.
+  address generate_unsafecopy_common_error_exit() {
+    unsigned int start_off = __ offset();
+    __ z_lghi(Z_RET, 0); // return 0
+    __ z_br(Z_R14);
+    return __ addr_at(start_off);
+  }
 
   void generate_arraycopy_stubs() {
 
     // Note: the disjoint stubs must be generated first, some of
     // the conjoint stubs use them.
+
+    address ucm_common_error_exit       =  generate_unsafecopy_common_error_exit();
+    UnsafeMemoryAccess::set_common_exit_stub_pc(ucm_common_error_exit);
+
     StubRoutines::_jbyte_disjoint_arraycopy      = generate_disjoint_nonoop_copy (StubGenStubId::jbyte_disjoint_arraycopy_id);
     StubRoutines::_jshort_disjoint_arraycopy     = generate_disjoint_nonoop_copy(StubGenStubId::jshort_disjoint_arraycopy_id);
     StubRoutines::_jint_disjoint_arraycopy       = generate_disjoint_nonoop_copy  (StubGenStubId::jint_disjoint_arraycopy_id);
@@ -1500,6 +1609,12 @@ class StubGenerator: public StubCodeGenerator {
     StubRoutines::_arrayof_jlong_arraycopy      = generate_conjoint_nonoop_copy(StubGenStubId::arrayof_jlong_arraycopy_id);
     StubRoutines::_arrayof_oop_arraycopy        = generate_conjoint_oop_copy(StubGenStubId::arrayof_oop_arraycopy_id);
     StubRoutines::_arrayof_oop_arraycopy_uninit = generate_conjoint_oop_copy(StubGenStubId::arrayof_oop_arraycopy_uninit_id);
+
+#ifdef COMPILER2
+    StubRoutines::_unsafe_setmemory =
+             VM_Version::has_VectorFacility() ? generate_unsafe_setmemory(StubRoutines::_jbyte_fill) : nullptr;
+
+#endif // COMPILER2
   }
 
   // Call interface for AES_encryptBlock, AES_decryptBlock stubs.
@@ -3184,6 +3299,10 @@ class StubGenerator: public StubCodeGenerator {
     //----------------------------------------------------------------------
     // Entry points that are platform specific.
 
+    if (UnsafeMemoryAccess::_table == nullptr) {
+      UnsafeMemoryAccess::create_table(4); // 4 for setMemory
+    }
+
     if (UseCRC32Intrinsics) {
       StubRoutines::_crc_table_adr     = (address)StubRoutines::zarch::_crc_table;
       StubRoutines::_updateBytesCRC32  = generate_CRC32_updateBytes();

From 6f9e1175a983c735c1beed755ec5b14b476858d7 Mon Sep 17 00:00:00 2001
From: Daniel Skantz <dskantz@openjdk.org>
Date: Fri, 30 May 2025 06:23:11 +0000
Subject: [PATCH 725/901] 8356246: C2: Compilation fails with
 "assert(bol->is_Bool()) failed: unexpected if shape" in
 StringConcat::eliminate_unneeded_control

Reviewed-by: rcastanedalo, kvn
---
 src/hotspot/share/opto/stringopts.cpp         |  7 +++
 .../TestStackedConcatsSharedTest.java         | 55 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsSharedTest.java

diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index cde6c1634ba..641634b906e 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -256,6 +256,13 @@ void StringConcat::eliminate_unneeded_control() {
       assert(n->req() == 3 && n->in(2)->in(0) == iff, "not a diamond");
       assert(iff->is_If(), "no if for the diamond");
       Node* bol = iff->in(1);
+      if (bol->is_Con()) {
+        // A BoolNode shared by two diamond Region/If sub-graphs
+        // was replaced by a constant zero in a previous call to this method.
+        // Do nothing as the transformation in the previous call ensures both are folded away.
+        assert(bol == _stringopts->gvn()->intcon(0), "shared condition should have been set to false");
+        continue;
+      }
       assert(bol->is_Bool(), "unexpected if shape");
       Node* cmp = bol->in(1);
       assert(cmp->is_Cmp(), "unexpected if shape");
diff --git a/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsSharedTest.java b/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsSharedTest.java
new file mode 100644
index 00000000000..15fc0303674
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/stringopts/TestStackedConcatsSharedTest.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8356246
+ * @summary Test stacked string concatenations where the toString of the first StringBuilder
+ *          is used as a shared test by two diamond Ifs in the second StringBuilder.
+ * @run main/othervm compiler.stringopts.TestStackedConcatsSharedTest
+ * @run main/othervm -XX:-TieredCompilation -Xcomp
+ *                   -XX:CompileOnly=compiler.stringopts.TestStackedConcatsSharedTest::*
+ *                   compiler.stringopts.TestStackedConcatsSharedTest
+ */
+
+package compiler.stringopts;
+
+public class TestStackedConcatsSharedTest {
+
+    public static void main(String... args) {
+        f(); // one warmup call
+        String s = f();
+        if (!s.equals("")) {
+            throw new RuntimeException("wrong result");
+        }
+    }
+
+    static String f() {
+        String s = "";
+        s = new StringBuilder().toString();
+        // Warming up with many iterations invalidated the optimization due to an unstable If
+        // associated with the valueOf calls below. Using -Xcomp for the test.
+        s = new StringBuilder(String.valueOf(s)).append(String.valueOf(s)).toString();
+        return s;
+    }
+}

From e33eeeea04fc7899bf66b0a2fdaccc30060854b4 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 30 May 2025 06:25:08 +0000
Subject: [PATCH 726/901] 8341311: [Accessibility,macOS,VoiceOver] VoiceOver
 announces incorrect number of items in submenu of JPopupMenu

Reviewed-by: asemenov, kizune
---
 .../sun/lwawt/macosx/CAccessibility.java      |  32 ++++-
 .../libawt_lwawt/awt/a11y/MenuAccessibility.m |  33 +++++-
 .../TestPopupMenuChildCount.java              | 109 ++++++++++++++++++
 3 files changed, 172 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/javax/accessibility/TestPopupMenuChildCount.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
index 417750507aa..0017c39bfda 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.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
@@ -60,9 +60,11 @@
 import javax.swing.JComponent;
 import javax.swing.JEditorPane;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JTextArea;
 import javax.swing.JList;
+import javax.swing.JPopupMenu;
 import javax.swing.JTree;
 import javax.swing.KeyStroke;
 
@@ -856,6 +858,34 @@ public Accessible call() throws Exception {
         }, c);
     }
 
+    private static Accessible getCurrentAccessiblePopupMenu(Accessible a, Component c) {
+        if (a == null) return null;
+
+        return invokeAndWait(new Callable<Accessible>() {
+            @Override
+            public Accessible call() throws Exception {
+                return traversePopupMenu(a);
+            }
+        }, c);
+    }
+
+    private static Accessible traversePopupMenu(Accessible a) {
+        // a is root level popupmenu
+        AccessibleContext ac = a.getAccessibleContext();
+        if (ac != null) {
+            for (int i = 0; i < ac.getAccessibleChildrenCount(); i++) {
+                Accessible child = ac.getAccessibleChild(i);
+                if (child instanceof JMenu subMenu) {
+                    JPopupMenu popup = subMenu.getPopupMenu();
+                    if (popup.isVisible()) {
+                        return traversePopupMenu((Accessible) popup);
+                    }
+                }
+            }
+        }
+        return a;
+    }
+
     @Native private static final int JAVA_AX_ROWS = 1;
     @Native private static final int JAVA_AX_COLS = 2;
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
index e8b28d93068..90a147aa5a2 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/MenuAccessibility.m
@@ -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
@@ -24,6 +24,10 @@
  */
 
 #import "MenuAccessibility.h"
+#import "ThreadUtilities.h"
+#import "sun_lwawt_macosx_CAccessibility.h"
+
+static jclass sjc_CAccessibility = NULL;
 
 /*
  * Implementing a protocol that represents menus both as submenu and as a
@@ -51,4 +55,31 @@ - (id _Nullable)accessibilityValue
     return NULL;
 }
 
+/*
+ * Return all non-ignored children.
+ */
+- (NSArray *)accessibilityChildren {
+    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    GET_CACCESSIBILITY_CLASS_RETURN(nil);
+    DECLARE_STATIC_METHOD_RETURN(sjm_getCurrentAccessiblePopupMenu, sjc_CAccessibility,
+            "getCurrentAccessiblePopupMenu",
+             "(Ljavax/accessibility/Accessible;Ljava/awt/Component;)Ljavax/accessibility/Accessible;", nil);
+    jobject axComponent = (*env)->CallStaticObjectMethod(env, sjc_CAccessibility,
+                                                             sjm_getCurrentAccessiblePopupMenu,
+                                                             fAccessible, fComponent);
+
+    CommonComponentAccessibility *currentElement = [CommonComponentAccessibility createWithAccessible:axComponent
+                                                            withEnv:env withView:self->fView isCurrent:YES];
+
+    NSArray *children = [CommonComponentAccessibility childrenOfParent:currentElement
+                                withEnv:env
+                                withChildrenCode:sun_lwawt_macosx_CAccessibility_JAVA_AX_ALL_CHILDREN
+                                allowIgnored:NO];
+
+    if ([children count] == 0) {
+        return nil;
+    } else {
+        return children;
+    }
+}
 @end
diff --git a/test/jdk/javax/accessibility/TestPopupMenuChildCount.java b/test/jdk/javax/accessibility/TestPopupMenuChildCount.java
new file mode 100644
index 00000000000..f59b7007145
--- /dev/null
+++ b/test/jdk/javax/accessibility/TestPopupMenuChildCount.java
@@ -0,0 +1,109 @@
+/*
+ * 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.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
+/*
+ * @test
+ * @bug 8341311
+ * @summary Verifies that VoiceOver announces correct number of child for PopupMenu on macOS
+ * @requires os.family == "mac"
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestPopupMenuChildCount
+ */
+
+public class TestPopupMenuChildCount {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                This test is applicable only on macOS.
+
+                Test UI contains an empty JFrame. On press of left/right mouse button,
+                a PopupMenu will be visible.
+
+                Follow these steps to test the behaviour:
+
+                1. Start the VoiceOver (Press Command + F5) application
+                2. Press Left/Right mouse button inside test frame window to open
+                   the PopupMenu
+                3. VO should announce "Menu" with number of child items of the Popupmenu
+                4. Press Up/Down arrow to traverse popupmenu child items
+                5. Press Right arrow key to open submenu
+                6. VO should announce "Menu" with correct number of child items
+                   for the submenu (For e.g. When Submenu-1 is open, VO should announce
+                   "Menu 4 items")
+                7. Repeat the process for other submenus
+                8. Press Pass if you are able to hear correct announcements
+                   else Fail""";
+
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .testUI(TestPopupMenuChildCount::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createUI() {
+        JFrame frame = new JFrame("Test Frame");
+
+        JPopupMenu popupmenu = new JPopupMenu();
+        JMenuItem mi1 = new JMenuItem("MenuItem-1");
+        JMenuItem mi2 = new JMenuItem("MenuItem-2");
+        JMenuItem mi3 = new JMenuItem("MenuItem-3");
+        popupmenu.add(mi1);
+        popupmenu.add(mi2);
+        popupmenu.add(mi3);
+
+        JMenu submenu1 = new JMenu("Submenu-1");
+        submenu1.add("subOne");
+        submenu1.add("subTwo");
+        submenu1.add("subThree");
+
+        JMenu submenu2 = new JMenu("Submenu-2");
+        submenu2.add("subOne");
+        submenu2.add("subTwo");
+
+        JMenu submenu3 = new JMenu ("Submenu-3");
+        submenu3.add("subOne");
+        submenu1.add(submenu3);
+
+        popupmenu.add(submenu1);
+        popupmenu.add(submenu2);
+
+        frame.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                popupmenu.show(e.getComponent(), e.getX(), e.getY());
+            }
+        });
+        frame.setSize(300, 300);
+        return frame;
+    }
+}

From 566e3b21ed14748cb0d9117b6bd58b4bfcf625c6 Mon Sep 17 00:00:00 2001
From: nibjen <jena.nibedita@oracle.com>
Date: Fri, 30 May 2025 09:22:16 +0000
Subject: [PATCH 727/901] 8357253: Test
 test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java writes
 in src dir

Reviewed-by: coffeys
---
 .../ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
index b3c66eb9bcd..c9768c1756c 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeClientTLS12withSNI.java
@@ -65,16 +65,10 @@ public class ResumeClientTLS12withSNI {
     /*
      * The following is to set up the keystores.
      */
-    private static final String pathToStores = System.getProperty("test.src", ".");
-    private static final String keyStoreFile = "ks_san.p12";
-    private static final String trustStoreFile = "ks_san.p12";
+    private static final String keyFilename = "ks_san.p12";
+    private static final String trustFilename = "ks_san.p12";
     private static final char[] passphrase = "123456".toCharArray();
 
-    private static final String keyFilename =
-            pathToStores + "/" + keyStoreFile;
-    private static final String trustFilename =
-            pathToStores + "/" + trustStoreFile;
-
     private static final String HOST_NAME = "arf.yak.foo.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456."
             + "localhost123456.localhost123456.localhost123456.localhost123456.localhost123456.localhost123456";
     private static final SNIMatcher SNI_MATCHER = SNIHostName.createSNIMatcher("arf\\.yak\\.foo.*");
@@ -118,7 +112,7 @@ public ResumeClientTLS12withSNI(final String sslProtocol) throws Exception {
     private static KeyManagerFactory makeKeyManagerFactory(String ksPath,
                                                            char[] pass) throws GeneralSecurityException, IOException {
         KeyManagerFactory kmf;
-        KeyStore ks = KeyStore.getInstance("JKS");
+        KeyStore ks = KeyStore.getInstance("PKCS12");
 
         try (FileInputStream fsIn = new FileInputStream(ksPath)) {
             ks.load(fsIn, pass);

From a0eb1900c91531db26d1086a3b251bce0cf7c141 Mon Sep 17 00:00:00 2001
From: Qizheng Xing <qxing@openjdk.org>
Date: Fri, 30 May 2025 09:41:08 +0000
Subject: [PATCH 728/901] 8358104: Fix ZGC compilation error on GCC 10.2

Reviewed-by: kbarrett, jsikstro
---
 src/hotspot/share/gc/z/zMappedCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index 252219572b5..3fc54087daa 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -556,7 +556,7 @@ size_t ZMappedCache::remove_discontiguous_with_strategy(size_t size, ZArray<ZVir
 
 ZMappedCache::ZMappedCache()
   : _tree(),
-    _size_class_lists{},
+    _size_class_lists(),
     _size(0),
     _min(_size) {}
 

From acd64ba24afd508689803adaa6714a784946979c Mon Sep 17 00:00:00 2001
From: Anjian Wen <wenanjian@openjdk.org>
Date: Fri, 30 May 2025 10:56:37 +0000
Subject: [PATCH 729/901] 8357626: RISC-V: Tighten up template interpreter
 method entry code

Reviewed-by: fyang, fjiang
---
 .../templateInterpreterGenerator_riscv.cpp    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index d63953232c5..75469ea40e9 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -765,6 +765,10 @@ void TemplateInterpreterGenerator::lock_method() {
 //      xcpool: cp cache
 //      stack_pointer: previous sp
 void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
+  // Save ConstMethod* in x15_const_method for later use to avoid loading multiple times
+  Register x15_const_method = x15;
+  __ ld(x15_const_method, Address(xmethod, Method::const_offset()));
+
   // initialize fixed part of activation frame
   if (native_call) {
     __ subi(esp, sp, 14 * wordSize);
@@ -775,8 +779,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
     __ sd(zr, Address(sp, 12 * wordSize));
   } else {
     __ subi(esp, sp, 12 * wordSize);
-    __ ld(t0, Address(xmethod, Method::const_offset()));     // get ConstMethod
-    __ add(xbcp, t0, in_bytes(ConstMethod::codes_offset())); // get codebase
+    __ add(xbcp, x15_const_method, in_bytes(ConstMethod::codes_offset())); // get codebase
     __ subi(sp, sp, 12 * wordSize);
   }
   __ sd(xbcp, Address(sp, wordSize));
@@ -798,9 +801,10 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ sd(fp, Address(sp, 10 * wordSize));
   __ la(fp, Address(sp, 12 * wordSize)); // include ra & fp
 
-  __ ld(xcpool, Address(xmethod, Method::const_offset()));
-  __ ld(xcpool, Address(xcpool, ConstMethod::constants_offset()));
-  __ ld(xcpool, Address(xcpool, ConstantPool::cache_offset()));
+  // Save ConstantPool* in x28_constants for later use to avoid loading multiple times
+  Register x28_constants = x28;
+  __ ld(x28_constants, Address(x15_const_method, ConstMethod::constants_offset()));
+  __ ld(xcpool, Address(x28_constants, ConstantPool::cache_offset()));
   __ sd(xcpool, Address(sp, 3 * wordSize));
   __ sub(t0, xlocals, fp);
   __ srai(t0, t0, Interpreter::logStackElementSize);   // t0 = xlocals - fp();
@@ -812,13 +816,15 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ sd(x19_sender_sp, Address(sp, 9 * wordSize));
   __ sd(zr, Address(sp, 8 * wordSize));
 
-  // Get mirror and store it in the frame as GC root for this Method*
-  __ load_mirror(t2, xmethod, x15, t1);
+  // Get mirror, Resolve ConstantPool* -> InstanceKlass* -> Java mirror
+  // and store it in the frame as GC root for this Method*
+  __ ld(t2, Address(x28_constants, ConstantPool::pool_holder_offset()));
+  __ ld(t2, Address(t2, in_bytes(Klass::java_mirror_offset())));
+  __ resolve_oop_handle(t2, t0, t1);
   __ sd(t2, Address(sp, 4 * wordSize));
 
   if (!native_call) {
-    __ ld(t0, Address(xmethod, Method::const_offset()));
-    __ lhu(t0, Address(t0, ConstMethod::max_stack_offset()));
+    __ lhu(t0, Address(x15_const_method, ConstMethod::max_stack_offset()));
     __ add(t0, t0, MAX2(3, Method::extra_stack_entries()));
     __ slli(t0, t0, 3);
     __ sub(t0, sp, t0);

From 12ee80cac754c1a6dd37191a9f80c01de8b659ad Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Fri, 30 May 2025 13:31:35 +0000
Subject: [PATCH 730/901] 8357675: Amend headless message

Reviewed-by: prr, shade
---
 .../unix/classes/sun/awt/PlatformGraphicsInfo.java           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
index 1ff871f9efc..9c2f51cc94f 100644
--- a/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.java
+++ b/src/java.desktop/unix/classes/sun/awt/PlatformGraphicsInfo.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
@@ -85,7 +85,6 @@ public static String getDefaultHeadlessMessage() {
 
             No X11 DISPLAY variable was set,
             or no headful library support was found,
-            but this program performed an operation which requires it,
-            """;
+            but this program performed an operation which requires it.""";
     }
 }

From ae3d96a4ec87262bc2f01d87fe91daa5d0d3966f Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Fri, 30 May 2025 13:40:25 +0000
Subject: [PATCH 731/901] 8357683: (process) SIGQUIT still blocked after
 JDK-8234262 with jdk.lang.Process.launchMechanism=FORK or VFORK

Reviewed-by: rriggs
---
 .../unix/native/jspawnhelper/jspawnhelper.c   |  6 ------
 src/java.base/unix/native/libjava/childproc.c |  8 ++++++++
 .../lang/ProcessBuilder/UnblockSignals.java   | 20 +++++++++++++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/java.base/unix/native/jspawnhelper/jspawnhelper.c b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
index de85d917811..071be59504d 100644
--- a/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
+++ b/src/java.base/unix/native/jspawnhelper/jspawnhelper.c
@@ -26,7 +26,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -145,7 +144,6 @@ int main(int argc, char *argv[]) {
     struct stat buf;
     /* argv[1] contains the fd number to read all the child info */
     int r, fdinr, fdinw, fdout;
-    sigset_t unblock_signals;
 
 #ifdef DEBUG
     jtregSimulateCrash(0, 4);
@@ -173,10 +171,6 @@ int main(int argc, char *argv[]) {
         shutItDown();
     }
 
-    // Reset any mask signals from parent
-    sigemptyset(&unblock_signals);
-    sigprocmask(SIG_SETMASK, &unblock_signals, NULL);
-
     // Close the writing end of the pipe we use for reading from the parent.
     // We have to do this before we start reading from the parent to avoid
     // blocking in the case the parent exits before we finished reading from it.
diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c
index 1543e269223..7a21b86565f 100644
--- a/src/java.base/unix/native/libjava/childproc.c
+++ b/src/java.base/unix/native/libjava/childproc.c
@@ -26,6 +26,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -405,6 +406,13 @@ childProcess(void *arg)
     if (p->pdir != NULL && chdir(p->pdir) < 0)
         goto WhyCantJohnnyExec;
 
+    // Reset any mask signals from parent, but not in VFORK mode
+    if (p->mode != MODE_VFORK) {
+        sigset_t unblock_signals;
+        sigemptyset(&unblock_signals);
+        sigprocmask(SIG_SETMASK, &unblock_signals, NULL);
+    }
+
     if (fcntl(FAIL_FILENO, F_SETFD, FD_CLOEXEC) == -1)
         goto WhyCantJohnnyExec;
 
diff --git a/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java b/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java
index 3f82bed8708..d2625518b6d 100644
--- a/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java
+++ b/test/jdk/java/lang/ProcessBuilder/UnblockSignals.java
@@ -24,15 +24,27 @@
 import java.io.IOException;
 
 /*
- * @test
- * @summary Verify Signal mask is cleared by ProcessBuilder start
+ * @test id=posix_spawn
+ * @summary Verify Signal mask is cleared by ProcessBuilder start when using posix_spawn mode
  * @bug 8234262
  * @requires (os.family == "linux" | os.family == "mac")
  * @comment Don't allow -Xcomp, it disturbs the relative timing of the sleep and kill commands
  * @requires (vm.compMode != "Xcomp")
- * @run main/othervm UnblockSignals
- * @run main/othervm -Xrs UnblockSignals
+ * @run main/othervm -Djdk.lang.Process.launchMechanism=POSIX_SPAWN UnblockSignals
+ * @run main/othervm -Djdk.lang.Process.launchMechanism=POSIX_SPAWN -Xrs UnblockSignals
  */
+
+/*
+ * @test id=fork
+ * @summary Verify Signal mask is cleared by ProcessBuilder start when using fork mode
+ * @bug 8357683
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @comment Don't allow -Xcomp, it disturbs the relative timing of the sleep and kill commands
+ * @requires (vm.compMode != "Xcomp")
+ * @run main/othervm -Djdk.lang.Process.launchMechanism=FORK UnblockSignals
+ * @run main/othervm -Djdk.lang.Process.launchMechanism=FORK -Xrs UnblockSignals
+ */
+
 public class UnblockSignals {
     public static void main(String[] args)  throws IOException, InterruptedException {
         // Check that SIGQUIT is not masked, in previous releases it was masked

From 26275a10b2aa75f0d4ff49248a3309f9d7b19bf3 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Fri, 30 May 2025 14:42:36 +0000
Subject: [PATCH 732/901] 8355753: @SuppressWarnings("this-escape") not
 respected for indirect leak via field

Reviewed-by: vromero
---
 .../tools/javac/comp/ThisEscapeAnalyzer.java  | 448 ++++++++++--------
 .../tools/javac/warnings/ThisEscape.java      |  51 +-
 .../tools/javac/warnings/ThisEscape.out       |   3 +-
 3 files changed, 306 insertions(+), 196 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
index 77ddd5c6583..9119278660f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java
@@ -25,9 +25,7 @@
 
 package com.sun.tools.javac.comp;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -35,12 +33,13 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.BiPredicate;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import com.sun.tools.javac.code.Directive;
@@ -52,21 +51,20 @@
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.resources.CompilerProperties.LintWarnings;
-import com.sun.tools.javac.resources.CompilerProperties.Warnings;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+import com.sun.tools.javac.util.JCDiagnostic.LintWarning;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Names;
 import com.sun.tools.javac.util.Pair;
 
 import static com.sun.tools.javac.code.Kinds.Kind.*;
+import static com.sun.tools.javac.code.Lint.LintCategory.THIS_ESCAPE;
 import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
@@ -164,7 +162,7 @@ public class ThisEscapeAnalyzer extends TreeScanner {
 
     /** Environment for symbol lookup.
      */
-    private Env<AttrContext> attrEnv;
+    private Env<AttrContext> topLevelEnv;
 
     /** Maps symbols of all methods to their corresponding declarations.
      */
@@ -185,30 +183,25 @@ public class ThisEscapeAnalyzer extends TreeScanner {
 
     /** Snapshots of {@link #callStack} where possible 'this' escapes occur.
      */
-    private final ArrayList<DiagnosticPosition[]> warningList = new ArrayList<>();
+    private final ArrayList<Warning> warningList = new ArrayList<>();
 
 // These fields are scoped to the constructor being analyzed
 
-    /** The declaring class of the "invoked" method we're currently analyzing.
+    /** The method we're currently analyzing.
      *  This is either the analyzed constructor or some method it invokes.
      */
-    private JCClassDecl methodClass;
+    private MethodInfo currentMethod;
 
-    /** The current "call stack" during our analysis. The first entry is some method
-     *  invoked from the target constructor; if empty, we're still in the constructor.
+    /** The current "call stack" during our analysis. The first entry is the initial
+     *  constructor we started with, and subsequent entries correspond to invoked methods.
+     *  If we're still in the initial constructor, the list will be empty.
      */
-    private final ArrayDeque<DiagnosticPosition> callStack = new ArrayDeque<>();
+    private final ArrayList<StackFrame> callStack = new ArrayList<>();
 
     /** Used to terminate recursion in {@link #invokeInvokable invokeInvokable()}.
      */
     private final Set<Pair<JCMethodDecl, RefSet<Ref>>> invocations = new HashSet<>();
 
-    /** Snapshot of {@link #callStack} where a possible 'this' escape occurs.
-     *  If non-null, a 'this' escape warning has been found in the current
-     *  constructor statement, initialization block statement, or field initializer.
-     */
-    private DiagnosticPosition[] pendingWarning;
-
 // These fields are scoped to the constructor or invoked method being analyzed
 
     /** Current lexical scope depth in the constructor or method we're currently analyzing.
@@ -246,18 +239,18 @@ protected ThisEscapeAnalyzer(Context context) {
 //
 
     public void analyzeTree(Env<AttrContext> env) {
+        topLevelEnv = env;
         try {
             doAnalyzeTree(env);
         } finally {
-            attrEnv = null;
+            topLevelEnv = null;
             methodMap.clear();
             nonPublicOuters.clear();
             targetClass = null;
             warningList.clear();
-            methodClass = null;
+            currentMethod = null;
             callStack.clear();
             invocations.clear();
-            pendingWarning = null;
             depth = -1;
             refs = null;
         }
@@ -270,7 +263,7 @@ private void doAnalyzeTree(Env<AttrContext> env) {
         Assert.check(methodMap.isEmpty());      // we are not prepared to be used more than once
 
         // Short circuit if warnings are totally disabled
-        if (!lint.isEnabled(Lint.LintCategory.THIS_ESCAPE))
+        if (!lint.isEnabled(THIS_ESCAPE))
             return;
 
         // Determine which packages are exported by the containing module, if any.
@@ -324,7 +317,7 @@ public void visitVarDef(JCVariableDecl tree) {
                 try {
 
                     // Track warning suppression of fields
-                    if (tree.sym.owner.kind == TYP && !lint.isEnabled(Lint.LintCategory.THIS_ESCAPE))
+                    if (tree.sym.owner.kind == TYP && !lint.isEnabled(THIS_ESCAPE))
                         suppressed.add(tree.sym);
 
                     // Recurse
@@ -341,23 +334,23 @@ public void visitMethodDef(JCMethodDecl tree) {
                 try {
 
                     // Track warning suppression of constructors
-                    if (TreeInfo.isConstructor(tree) && !lint.isEnabled(Lint.LintCategory.THIS_ESCAPE))
+                    if (TreeInfo.isConstructor(tree) && !lint.isEnabled(THIS_ESCAPE))
                         suppressed.add(tree.sym);
 
+                    // Gather some useful info
+                    boolean constructor = TreeInfo.isConstructor(tree);
+                    boolean extendableClass = currentClassIsExternallyExtendable();
+                    boolean nonPrivate = (tree.sym.flags() & (Flags.PUBLIC | Flags.PROTECTED)) != 0;
+                    boolean finalish = (tree.mods.flags & (Flags.STATIC | Flags.PRIVATE | Flags.FINAL)) != 0;
+
                     // Determine if this is a constructor we should analyze
-                    boolean extendable = currentClassIsExternallyExtendable();
-                    boolean analyzable = extendable &&
-                        TreeInfo.isConstructor(tree) &&
-                        (tree.sym.flags() & (Flags.PUBLIC | Flags.PROTECTED)) != 0 &&
-                        !suppressed.contains(tree.sym);
+                    boolean analyzable = extendableClass && constructor && nonPrivate;
 
-                    // Determine if this method is "invokable" in an analysis (can't be overridden)
-                    boolean invokable = !extendable ||
-                        TreeInfo.isConstructor(tree) ||
-                        (tree.mods.flags & (Flags.STATIC | Flags.PRIVATE | Flags.FINAL)) != 0;
+                    // Determine if it's safe to "invoke" the method in an analysis (i.e., it can't be overridden)
+                    boolean invokable = !extendableClass || constructor || finalish;
 
-                    // Add method or constructor to map
-                    methodMap.put(tree.sym, new MethodInfo(currentClass, tree, analyzable, invokable));
+                    // Add this method or constructor to our map
+                    methodMap.put(tree.sym, new MethodInfo(currentClass, tree, constructor, analyzable, invokable));
 
                     // Recurse
                     super.visitMethodDef(tree);
@@ -377,106 +370,54 @@ private boolean currentClassIsExternallyExtendable() {
             }
         }.scan(env.tree);
 
-        // Analyze non-static field initializers and initialization blocks,
-        // but only for classes having at least one analyzable constructor.
+        // Analyze the analyzable constructors we found
         methodMap.values().stream()
-                .filter(MethodInfo::analyzable)
-                .map(MethodInfo::declaringClass)
-                .distinct()
-                .forEach(klass -> {
-            for (List<JCTree> defs = klass.defs; defs.nonEmpty(); defs = defs.tail) {
-
-                // Ignore static stuff
-                if ((TreeInfo.flags(defs.head) & Flags.STATIC) != 0)
-                    continue;
-
-                // Handle field initializers
-                if (defs.head instanceof JCVariableDecl vardef) {
-                    visitTopLevel(env, klass, () -> {
-                        scan(vardef);
-                        copyPendingWarning();
-                    });
-                    continue;
-                }
-
-                // Handle initialization blocks
-                if (defs.head instanceof JCBlock block) {
-                    visitTopLevel(env, klass, () -> analyzeStatements(block.stats));
-                    continue;
-                }
-            }
+          .filter(MethodInfo::analyzable)
+          .forEach(this::analyzeConstructor);
+
+        // Manually apply any Lint suppression
+        filterWarnings(warning -> !warning.isSuppressed());
+
+        // Field intitializers and initialization blocks will generate a separate warning for each primary constructor.
+        // Trim off stack frames up through the super() call so these will have identical stacks and get de-duplicated below.
+        warningList.forEach(Warning::trimInitializerFrames);
+
+        // Sort warnings so redundant warnings immediately follow whatever they are redundant for, then remove them
+        warningList.sort(Warning::sortByStackFrames);
+        AtomicReference<Warning> previousRef = new AtomicReference<>();
+        filterWarnings(warning -> {
+            Warning previous = previousRef.get();
+            if (previous != null && warning.isRedundantWith(previous))
+                return false;
+            previousRef.set(warning);
+            return true;
         });
 
-        // Analyze all of the analyzable constructors we found
-        methodMap.values().stream()
-                .filter(MethodInfo::analyzable)
-                .forEach(methodInfo -> {
-            visitTopLevel(env, methodInfo.declaringClass(),
-                () -> analyzeStatements(methodInfo.declaration().body.stats));
-        });
+        // Limit output to one warning per constructor, field initializer, or initializer block
+        Set<JCTree> thingsWarnedAbout = new HashSet<>();
+        filterWarnings(warning -> thingsWarnedAbout.add(warning.origin));
 
-        // Eliminate duplicate warnings. Warning B duplicates warning A if the stack trace of A is a prefix
-        // of the stack trace of B. For example, if constructor Foo(int x) has a leak, and constructor
-        // Foo() invokes this(0), then emitting a warning for Foo() would be redundant.
-        BiPredicate<DiagnosticPosition[], DiagnosticPosition[]> extendsAsPrefix = (warning1, warning2) -> {
-            if (warning2.length < warning1.length)
-                return false;
-            for (int index = 0; index < warning1.length; index++) {
-                if (warning2[index].getPreferredPosition() != warning1[index].getPreferredPosition())
-                    return false;
-            }
-            return true;
-        };
-
-        // Stack traces are ordered top to bottom, and so duplicates always have the same first element(s).
-        // Sort the stack traces lexicographically, so that duplicates immediately follow what they duplicate.
-        Comparator<DiagnosticPosition[]> ordering = (warning1, warning2) -> {
-            for (int index1 = 0, index2 = 0; true; index1++, index2++) {
-                boolean end1 = index1 >= warning1.length;
-                boolean end2 = index2 >= warning2.length;
-                if (end1 && end2)
-                    return 0;
-                if (end1)
-                    return -1;
-                if (end2)
-                    return 1;
-                int posn1 = warning1[index1].getPreferredPosition();
-                int posn2 = warning2[index2].getPreferredPosition();
-                int diff = Integer.compare(posn1, posn2);
-                if (diff != 0)
-                    return diff;
-            }
-        };
-        warningList.sort(ordering);
-
-        // Now emit the warnings, but skipping over duplicates as we go through the list
-        DiagnosticPosition[] previous = null;
-        for (DiagnosticPosition[] warning : warningList) {
-
-            // Skip duplicates
-            if (previous != null && extendsAsPrefix.test(previous, warning))
-                continue;
-            previous = warning;
-
-            // Emit warnings showing the entire stack trace
-            JCDiagnostic.Warning key = LintWarnings.PossibleThisEscape;
-            int remain = warning.length;
-            do {
-                DiagnosticPosition pos = warning[--remain];
-                log.warning(pos, key);
+        // Emit warnings
+        for (Warning warning : warningList) {
+            LintWarning key = LintWarnings.PossibleThisEscape;
+            for (StackFrame frame : warning.stack) {
+                log.warning(frame.site.pos(), key);
                 key = LintWarnings.PossibleThisEscapeLocation;
-            } while (remain > 0);
+            }
         }
+
+        // Done
         warningList.clear();
     }
 
-    // Analyze statements, but stop at (and record) the first warning generated
-    private void analyzeStatements(List<JCStatement> stats) {
-        for (JCStatement stat : stats) {
-            scan(stat);
-            if (copyPendingWarning())
-                break;
+    // Warning list editor (this is slightly more efficient than removeIf())
+    private void filterWarnings(Predicate<Warning> filter) {
+        int numRetained = 0;
+        for (Warning warning : warningList) {
+            if (filter.test(warning))
+                warningList.set(numRetained++, warning);
         }
+        warningList.subList(numRetained, warningList.size()).clear();
     }
 
     @Override
@@ -542,10 +483,6 @@ public void visitVarDef(JCVariableDecl tree) {
 
     private void visitVarDef(VarSymbol sym, JCExpression expr) {
 
-        // Skip if ignoring warnings for this field
-        if (suppressed.contains(sym))
-            return;
-
         // Scan initializer, if any
         scan(expr);
         if (isParamOrVar(sym))
@@ -579,19 +516,43 @@ public void visitApply(JCMethodInvocation invoke) {
         } else
             refs.discardExprs(depth);
 
-        // If "super()": ignore - we don't try to track into superclasses
-        if (TreeInfo.name(invoke.meth) == names._super)
+        // If "super()": we don't invoke it (we don't track into superclasses) but we do execute any
+        // non-static field initializers and initialization blocks because this is when they happen.
+        if (TreeInfo.name(invoke.meth) == names._super) {
+            currentMethod.declaringClass.defs.stream()
+              .filter(def -> (TreeInfo.flags(def) & Flags.STATIC) == 0)
+              .forEach(def -> {
+                switch (def) {
+                case JCBlock block          -> analyzeInitializer(invoke, block, receiverRefs, () -> visitBlock(block));
+                case JCVariableDecl varDecl -> analyzeInitializer(invoke, varDecl, receiverRefs, () -> scan(varDecl));
+                default -> { }
+                }
+              });
             return;
+        }
 
         // "Invoke" the method
         invoke(invoke, sym, invoke.args, receiverRefs);
     }
 
-    private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<ThisRef> receiverRefs) {
+    // Analyze a field initializer or initialization block after encountering a super() invocation
+    private void analyzeInitializer(JCMethodInvocation site, JCTree initializer, RefSet<ThisRef> receiverRefs, Runnable action) {
+        RefSet<Ref> refsPrev = refs;
+        refs = RefSet.newEmpty();
+        int depthPrev = depth;
+        depth = 0;
+        callStack.add(new StackFrame(currentMethod, initializer, site));
+        try {
+            refs.addAll(receiverRefs);
+            action.run();
+        } finally {
+            callStack.remove(callStack.size() - 1);
+            depth = depthPrev;
+            refs = refsPrev;
+        }
+    }
 
-        // Skip if ignoring warnings for a constructor invoked via 'this()'
-        if (suppressed.contains(sym))
-            return;
+    private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<ThisRef> receiverRefs) {
 
         // Ignore final methods in java.lang.Object (getClass(), notify(), etc.)
         if (sym != null &&
@@ -627,7 +588,7 @@ private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<Thi
         }
 
         // Analyze method if possible, otherwise assume nothing
-        if (methodInfo != null && methodInfo.invokable())
+        if (methodInfo != null && methodInfo.invokable)
             invokeInvokable(site, args, receiverRefs, methodInfo);
         else
             invokeUnknown(site, args, receiverRefs);
@@ -644,12 +605,11 @@ private boolean isTargetMethod(MethodInfo info, Symbol method, TypeSymbol receiv
     }
 
     // Handle the invocation of a local analyzable method or constructor
-    private void invokeInvokable(JCTree site, List<JCExpression> args,
-            RefSet<ThisRef> receiverRefs, MethodInfo methodInfo) {
-        Assert.check(methodInfo.invokable());
+    private void invokeInvokable(JCTree site, List<JCExpression> args, RefSet<ThisRef> receiverRefs, MethodInfo methodInfo) {
+        Assert.check(methodInfo.invokable);
 
         // Collect 'this' references found in method parameters
-        JCMethodDecl method = methodInfo.declaration();
+        JCMethodDecl method = methodInfo.declaration;
         RefSet<VarRef> paramRefs = RefSet.newEmpty();
         List<JCVariableDecl> params = method.params;
         while (args.nonEmpty() && params.nonEmpty()) {
@@ -663,13 +623,13 @@ private void invokeInvokable(JCTree site, List<JCExpression> args,
         }
 
         // "Invoke" the method
-        JCClassDecl methodClassPrev = methodClass;
-        methodClass = methodInfo.declaringClass();
+        MethodInfo currentMethodPrev = currentMethod;
+        currentMethod = methodInfo;
         RefSet<Ref> refsPrev = refs;
         refs = RefSet.newEmpty();
         int depthPrev = depth;
         depth = 0;
-        callStack.push(site);
+        callStack.add(new StackFrame(currentMethodPrev, null, site));
         try {
 
             // Add initial references from method receiver
@@ -706,10 +666,10 @@ private void invokeInvokable(JCTree site, List<JCExpression> args,
               .map(ref -> new ExprRef(depthPrev, ref))
               .forEach(refsPrev::add);
         } finally {
-            callStack.pop();
+            callStack.remove(callStack.size() - 1);
             depth = depthPrev;
             refs = refsPrev;
-            methodClass = methodClassPrev;
+            currentMethod = currentMethodPrev;
         }
     }
 
@@ -755,7 +715,7 @@ public void visitNewClass(JCNewClass tree) {
         RefSet<ThisRef> receiverRefs = receiverRefsForConstructor(tree.encl, tsym);
 
         // "Invoke" the constructor
-        if (methodInfo != null && methodInfo.invokable())
+        if (methodInfo != null && methodInfo.invokable)
             invokeInvokable(tree, tree.args, receiverRefs, methodInfo);
         else
             invokeUnknown(tree, tree.args, receiverRefs);
@@ -787,9 +747,10 @@ private RefSet<ThisRef> receiverRefsForConstructor(JCExpression explicitOuterThi
 
     // Determine if an unqualified "new Foo()" constructor gets 'this' as an implicit outer instance
     private boolean hasImplicitOuterInstance(TypeSymbol tsym) {
-        return tsym != methodClass.sym
+        ClassSymbol currentClassSym = currentMethod.declaringClass.sym;
+        return tsym != currentClassSym
           && tsym.hasOuterInstance()
-          && tsym.isEnclosedBy(methodClass.sym);
+          && tsym.isEnclosedBy(currentClassSym);
     }
 
 //
@@ -824,18 +785,18 @@ public void visitForeachLoop(JCEnhancedForLoop tree) {
         Type elemType = types.elemtype(tree.expr.type);
 
         // If not array, resolve the Iterable and Iterator methods
-        record ForeachMethods(MethodSymbol iterator, MethodSymbol hasNext, MethodSymbol next) { };
+        record ForeachMethods(MethodSymbol iterator, MethodSymbol hasNext, MethodSymbol next) { }
         MethodSymbol iterator = null;
         MethodSymbol hasNext = null;
         MethodSymbol next = null;
         if (elemType == null) {
-            Symbol iteratorSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+            Symbol iteratorSym = rs.resolveQualifiedMethod(tree.expr.pos(), topLevelEnv,
               tree.expr.type, names.iterator, List.nil(), List.nil());
             if (iteratorSym instanceof MethodSymbol) {
                 iterator = (MethodSymbol)iteratorSym;
-                Symbol hasNextSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+                Symbol hasNextSym = rs.resolveQualifiedMethod(tree.expr.pos(), topLevelEnv,
                   iterator.getReturnType(), names.hasNext, List.nil(), List.nil());
-                Symbol nextSym = rs.resolveQualifiedMethod(tree.expr.pos(), attrEnv,
+                Symbol nextSym = rs.resolveQualifiedMethod(tree.expr.pos(), topLevelEnv,
                   iterator.getReturnType(), names.next, List.nil(), List.nil());
                 if (hasNextSym instanceof MethodSymbol)
                     hasNext = (MethodSymbol)hasNextSym;
@@ -974,7 +935,7 @@ public void visitSelect(JCFieldAccess tree) {
         Stream<ExprRef> methodRefs = refs.removeExprs(depth);
 
         // Explicit 'this' reference? The expression references whatever 'this' references
-        Type.ClassType currentClassType = (Type.ClassType)methodClass.sym.type;
+        Type.ClassType currentClassType = (Type.ClassType)currentMethod.declaringClass.sym.type;
         if (TreeInfo.isExplicitThisReference(types, currentClassType, tree)) {
             refs.find(ThisRef.class)
               .map(ref -> new ExprRef(depth, ref))
@@ -1059,7 +1020,7 @@ public void visitIdent(JCIdent tree) {
             MethodSymbol sym = (MethodSymbol)tree.sym;
 
             // Check for implicit 'this' reference
-            ClassSymbol methodClassSym = methodClass.sym;
+            ClassSymbol methodClassSym = currentMethod.declaringClass.sym;
             if (methodClassSym.isSubClass(sym.owner, types)) {
                 refs.find(ThisRef.class)
                   .map(ref -> new ExprRef(depth, ref))
@@ -1243,53 +1204,49 @@ public void visitBinary(JCBinary tree) {
 
 // Helper methods
 
-    private void visitTopLevel(Env<AttrContext> env, JCClassDecl klass, Runnable action) {
-        Assert.check(attrEnv == null);
+    private void analyzeConstructor(MethodInfo constructor) {
         Assert.check(targetClass == null);
-        Assert.check(methodClass == null);
+        Assert.check(currentMethod == null);
         Assert.check(depth == -1);
         Assert.check(refs == null);
-        attrEnv = env;
-        targetClass = klass;
-        methodClass = klass;
+        targetClass = constructor.declaringClass;
+        currentMethod = constructor;
         try {
 
             // Add the initial 'this' reference
             refs = RefSet.newEmpty();
             refs.add(new ThisRef(targetClass.sym, EnumSet.of(Indirection.DIRECT)));
 
-            // Perform action
-            this.visitScoped(false, action);
+            // Analyze constructor
+            visitScoped(false, () -> scan(constructor.declaration.body));
         } finally {
             Assert.check(depth == -1);
-            attrEnv = null;
-            methodClass = null;
+            currentMethod = null;
             targetClass = null;
             refs = null;
         }
     }
 
     // Recurse through indirect code that might get executed later, e.g., a lambda.
-    // We stash any pending warning and the current RefSet, then recurse into the deferred
-    // code (still using the current RefSet) to see if it would leak. Then we restore the
-    // pending warning and the current RefSet. Finally, if the deferred code would have
-    // leaked, we create an indirect ExprRef because it must be holding a 'this' reference.
-    // If the deferred code would not leak, then obviously no leak is possible, period.
+    // We record the current number of (real) warnings, then recurse into the deferred
+    // code (still using the current RefSet) to see if that number increases, i.e., to
+    // see if it would leak. Then we discard any new warnings and the lambda's RefSet.
+    // Finally, if the deferred code would have leaked, we create an indirect ExprRef
+    // because the lambda must be holding a 'this' reference. If not, no leak is possible.
     private <T extends JCTree> void visitDeferred(Runnable deferredCode) {
-        DiagnosticPosition[] pendingWarningPrev = pendingWarning;
-        pendingWarning = null;
+        int numWarningsPrev = warningList.size();
         RefSet<Ref> refsPrev = refs.clone();
         boolean deferredCodeLeaks;
         try {
             deferredCode.run();
-            deferredCodeLeaks = pendingWarning != null;
+            deferredCodeLeaks = warningList.size() > numWarningsPrev;
 
             // There can be ExprRef's if the deferred code returns something.
             // Don't let them escape unnoticed.
             deferredCodeLeaks |= refs.discardExprs(depth);
         } finally {
             refs = refsPrev;
-            pendingWarning = pendingWarningPrev;
+            warningList.subList(numWarningsPrev, warningList.size()).clear();
         }
         if (deferredCodeLeaks)
             refs.add(new ExprRef(depth, syms.objectType.tsym, EnumSet.of(Indirection.INDIRECT)));
@@ -1341,24 +1298,9 @@ private void popScope() {
 
     // Note a possible 'this' reference leak at the specified location
     private void leakAt(JCTree tree) {
-
-        // Generate at most one warning per statement
-        if (pendingWarning != null)
-            return;
-
-        // Snapshot the current stack trace
-        callStack.push(tree.pos());
-        pendingWarning = callStack.toArray(new DiagnosticPosition[0]);
-        callStack.pop();
-    }
-
-    // Copy pending warning, if any, to the warning list and reset
-    private boolean copyPendingWarning() {
-        if (pendingWarning == null)
-            return false;
-        warningList.add(pendingWarning);
-        pendingWarning = null;
-        return true;
+        callStack.add(new StackFrame(currentMethod, null, tree));         // include the point of leakage in the stack
+        warningList.add(new Warning(targetClass, new ArrayList<>(callStack)));
+        callStack.remove(callStack.size() - 1);
     }
 
     // Does the symbol correspond to a parameter or local variable (not a field)?
@@ -1398,7 +1340,7 @@ private boolean isAnalyzing() {
     private boolean checkInvariants(boolean analyzing, boolean allowExpr) {
         Assert.check(analyzing == isAnalyzing());
         if (isAnalyzing()) {
-            Assert.check(methodClass != null);
+            Assert.check(currentMethod != null);
             Assert.check(targetClass != null);
             Assert.check(refs != null);
             Assert.check(depth >= 0);
@@ -1409,7 +1351,6 @@ private boolean checkInvariants(boolean analyzing, boolean allowExpr) {
             Assert.check(refs == null);
             Assert.check(depth == -1);
             Assert.check(callStack.isEmpty());
-            Assert.check(pendingWarning == null);
             Assert.check(invocations.isEmpty());
         }
         return true;
@@ -1788,12 +1729,130 @@ public RefSet<T> clone() {
         }
     }
 
+// StackFrame
+
+    // Information about one frame on the call stack
+    private class StackFrame {
+
+        final MethodInfo method;                    // the method containing the statement
+        final JCTree site;                          // the call site within the method
+        final JCTree initializer;                   // originating field or initialization block, else null
+        final boolean suppressible;                 // whether warning can be suppressed at this frame
+
+        StackFrame(MethodInfo method, JCTree initializer, JCTree site) {
+            this.method = method;
+            this.initializer = initializer;
+            this.site = site;
+            this.suppressible = initializer != null || (method.constructor && method.declaringClass == targetClass);
+        }
+
+        boolean isSuppressed() {
+            return suppressible &&
+              suppressed.contains(initializer instanceof JCVariableDecl v ? v.sym : method.declaration.sym);
+        }
+
+        int comparePos(StackFrame that) {
+            return Integer.compare(this.site.pos().getPreferredPosition(), that.site.pos().getPreferredPosition());
+        }
+
+        @Override
+        public String toString() {
+            return "StackFrame"
+              + "[" + method.declaration.sym + "@" + site.pos().getPreferredPosition()
+              + (initializer != null ? ",init@" + initializer.pos().getPreferredPosition() : "")
+              + "]";
+        }
+    }
+
+// Warning
+
+    // Information about one warning we have generated
+    private class Warning {
+
+        final JCClassDecl declaringClass;           // the class whose instance is leaked
+        final ArrayList<StackFrame> stack;          // the call stack where the leak happens
+        final JCTree origin;                        // the originating ctor, field, or init block
+
+        Warning(JCClassDecl declaringClass, ArrayList<StackFrame> stack) {
+            this.declaringClass = declaringClass;
+            this.stack = stack;
+            this.origin = stack.stream()
+              .map(frame -> frame.initializer)
+              .filter(Objects::nonNull)
+              .findFirst()
+              .orElseGet(() -> stack.get(0).method.declaration);    // default to the initial constructor
+        }
+
+        // Used to eliminate redundant warnings. Warning A is redundant with warning B if the call stack of A includes
+        // the call stack of B plus additional initial frame(s). For example, if constructor B = Foo(int x) generates a
+        // warning, then generating warning for some other constructor A when it invokes this(123) would be redundant.
+        boolean isRedundantWith(Warning that) {
+            int numExtra = this.stack.size() - that.stack.size();
+            return numExtra >= 0 &&
+              IntStream.range(0, that.stack.size())
+                .allMatch(index -> this.stack.get(numExtra + index).comparePos(that.stack.get(index)) == 0);
+        }
+
+        // Order warnings by their stack frames, lexicographically in reverse calling order, which will cause
+        // all warnings that are isRedundantWith() some other warning to immediately follow that warning.
+        static int sortByStackFrames(Warning warning1, Warning warning2) {
+            int index1 = warning1.stack.size();
+            int index2 = warning2.stack.size();
+            while (true) {
+                boolean end1 = --index1 < 0;
+                boolean end2 = --index2 < 0;
+                if (end1 && end2)
+                    return 0;
+                if (end1)
+                    return -1;
+                if (end2)
+                    return 1;
+                int diff = warning1.stack.get(index1).comparePos(warning2.stack.get(index2));
+                if (diff != 0)
+                    return diff;
+            }
+        }
+
+        // Determine whether this warning is suppressed. A single "this-escape" warning involves multiple source code
+        // positions, so we must determine suppression manually. We do this as follows: A warning is suppressed if
+        // "this-escape" is disabled at any position in the stack where that stack frame corresponds to a constructor
+        // or field initializer in the target class. That means, for example, @SuppressWarnings("this-escape") annotations
+        // on regular methods are ignored. Here we work our way back up the call stack from the point of the leak until
+        // we encounter a suppressible stack frame.
+        boolean isSuppressed() {
+            for (int index = stack.size() - 1; index >= 0; index--) {
+                if (stack.get(index).isSuppressed())
+                    return true;
+            }
+            return false;
+        }
+
+        // If this is a field or initializer warning, trim the initial stack frame(s) up through the super() call
+        void trimInitializerFrames() {
+            for (int i = 0; i < stack.size(); i++) {
+                if (stack.get(i).initializer != null) {
+                    stack.subList(0, i + 1).clear();
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "Warning"
+              + "[class=" + declaringClass.sym.flatname
+              + ",stack=[\n    " + stack.stream().map(StackFrame::toString).collect(Collectors.joining("\n    ")) + "]"
+              + "]";
+        }
+    }
+
 // MethodInfo
 
     // Information about a constructor or method in the compilation unit
     private record MethodInfo(
         JCClassDecl declaringClass,     // the class declaring "declaration"
         JCMethodDecl declaration,       // the method or constructor itself
+        boolean constructor,            // the method is a constructor
         boolean analyzable,             // it's a constructor that we should analyze
         boolean invokable) {            // it may be safely "invoked" during analysis
 
@@ -1801,6 +1860,7 @@ private record MethodInfo(
         public String toString() {
             return "MethodInfo"
               + "[method=" + declaringClass.sym.flatname + "." + declaration.sym
+              + ",constructor=" + constructor
               + ",analyzable=" + analyzable
               + ",invokable=" + invokable
               + "]";
diff --git a/test/langtools/tools/javac/warnings/ThisEscape.java b/test/langtools/tools/javac/warnings/ThisEscape.java
index 93ccb6e0830..f9280b5b1ae 100644
--- a/test/langtools/tools/javac/warnings/ThisEscape.java
+++ b/test/langtools/tools/javac/warnings/ThisEscape.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8015831
+ * @bug 8015831 8355753
  * @compile/ref=ThisEscape.out -Xlint:this-escape -XDrawDiagnostics ThisEscape.java
  * @summary Verify 'this' escape detection
  */
@@ -765,4 +765,53 @@ private Object getObject() {
             return this.obj;
         }
     }
+
+    // JDK-8355753 - @SuppressWarnings("this-escape") not respected for indirect leak via field
+    public static class SuppressedIndirectLeakViaField {
+
+        private final int x = this.mightLeak();     // this leak should be suppressed
+        private int y;
+
+        {
+            y = this.mightLeak();                   // this leak should be suppressed
+        }
+
+        public SuppressedIndirectLeakViaField() {
+            this("");
+        }
+
+        @SuppressWarnings("this-escape")
+        private SuppressedIndirectLeakViaField(String s) {
+        }
+
+        public int mightLeak() {
+            return 0;
+        }
+    }
+
+    public static class UnsuppressedIndirectLeakViaField {
+
+        private final int x = this.mightLeak();     // this leak should not be suppressed
+
+        public UnsuppressedIndirectLeakViaField() {
+            this("");       // this constructor does not trigger the warning
+        }
+
+        @SuppressWarnings("this-escape")
+        private UnsuppressedIndirectLeakViaField(String s) {
+            // this constructor does not trigger the warning (obviously; it's directly suppressed)
+        }
+
+        public UnsuppressedIndirectLeakViaField(int z) {
+            // this constructor triggers the warning
+        }
+
+        public UnsuppressedIndirectLeakViaField(float z) {
+            // this constructor also triggers the warning, but should not create a duplicate
+        }
+
+        public int mightLeak() {
+            return 0;
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/warnings/ThisEscape.out b/test/langtools/tools/javac/warnings/ThisEscape.out
index a444c2828b7..b866c4a7731 100644
--- a/test/langtools/tools/javac/warnings/ThisEscape.out
+++ b/test/langtools/tools/javac/warnings/ThisEscape.out
@@ -35,4 +35,5 @@ ThisEscape.java:652:55: compiler.warn.possible.this.escape
 ThisEscape.java:672:18: compiler.warn.possible.this.escape
 ThisEscape.java:669:48: compiler.warn.possible.this.escape.location
 ThisEscape.java:726:32: compiler.warn.possible.this.escape
-37 warnings
+ThisEscape.java:794:45: compiler.warn.possible.this.escape
+38 warnings

From 99048c3d4a66be9bf586949bd08e33cb091fa6bf Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Fri, 30 May 2025 16:03:13 +0000
Subject: [PATCH 733/901] 8357033: Reduce stateless session ticket size

Reviewed-by: wetmore, djelinski, ascarpino
---
 .../security/ssl/PreSharedKeyExtension.java   |  10 +-
 .../sun/security/ssl/SSLSessionImpl.java      | 351 ++++++++----------
 .../security/ssl/SessionTicketExtension.java  |  92 ++++-
 .../SSLSessionImpl/ResumeChecksServer.java    |  42 ++-
 .../ResumeChecksServerStateless.java          |   6 +-
 5 files changed, 262 insertions(+), 239 deletions(-)

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 f9c78774bc9..76bb64a66c3 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -443,12 +443,6 @@ private static boolean canRejoin(ClientHelloMessage clientHello,
             result = false;
         }
 
-        // 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.
-        SignatureScheme.updateHandshakeLocalSupportedAlgs(shc);
-
         // Validate the required client authentication.
         if (result &&
             (shc.sslConfig.clientAuthType == CLIENT_AUTH_REQUIRED)) {
@@ -464,7 +458,9 @@ private static boolean canRejoin(ClientHelloMessage clientHello,
                 result = false;
             }
 
-            // Make sure the list of supported signature algorithms matches
+            // Make sure the list of supported signature algorithms matches.
+            // HandshakeContext's localSupportedCertSignAlgs has been already
+            // updated when we set the negotiated protocol.
             Collection<SignatureScheme> sessionSigAlgs =
                 s.getLocalSupportedSignatureSchemes();
             if (result &&
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 f5e173c636a..032aa7de5b3 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -24,34 +24,33 @@
  */
 package sun.security.ssl;
 
-import sun.security.provider.X509Factory;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Queue;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.zip.Adler32;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 import javax.net.ssl.ExtendedSSLSession;
 import javax.net.ssl.SNIHostName;
 import javax.net.ssl.SNIServerName;
-import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSessionBindingEvent;
 import javax.net.ssl.SSLSessionBindingListener;
 import javax.net.ssl.SSLSessionContext;
+import sun.security.provider.X509Factory;
+import sun.security.ssl.X509Authentication.X509Possession;
 
 /**
  * Implements the SSL session interface, and exposes the session context
@@ -256,59 +255,51 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     }
 
     /**
+     * Reassemble new session ticket.
+     * <p>
      * < 2 bytes > protocolVersion
      * < 2 bytes > cipherSuite
      * < 1 byte > localSupportedSignAlgs entries
      *   < 2 bytes per entries > localSupportedSignAlgs
-     * < 1 bytes > peerSupportedSignAlgs entries
-     *   < 2 bytes per entries > peerSupportedSignAlgs
-     * < 2 bytes > preSharedKey length
-     * < length in bytes > preSharedKey
-     * < 1 byte > pskIdentity length
-     * < length in bytes > pskIdentity
-     * < 1 byte > masterSecret length
-     *   < 1 byte > masterSecret algorithm length
-     *   < length in bytes > masterSecret algorithm
-     *   < 2 bytes > masterSecretKey length
-     *   < length in bytes> masterSecretKey
-     * < 1 byte > useExtendedMasterSecret
+     * select (protocolVersion)
+     *   case TLS13Plus:
+     *     < 2 bytes > preSharedKey length
+     *     < length in bytes > preSharedKey
+     *   case non-TLS13Plus:
+     *     < 2 bytes > masterSecretKey length
+     *     < length in bytes> masterSecretKey
+     *     < 1 byte > useExtendedMasterSecret
      * < 1 byte > identificationProtocol length
-     * < length in bytes > identificationProtocol
+     *   < length in bytes > identificationProtocol
      * < 1 byte > serverNameIndication length
-     * < length in bytes > serverNameIndication
+     *   < length in bytes > serverNameIndication
      * < 1 byte > Number of requestedServerNames entries
-     *   < 1 byte > ServerName length
-     *   < length in bytes > ServerName
+     *   For each entry {
+     *     < 1 byte > ServerName length
+     *     < length in bytes > ServerName
+     *   }
      * < 4 bytes > maximumPacketSize
      * < 4 bytes > negotiatedMaxFragSize
      * < 4 bytes > creationTime
-     * < 2 byte > status response length
-     *   < 2 byte > status response entry length
-     *   < length in byte > status response entry
      * < 1 byte > Length of peer host
      *   < length in bytes > peer host
      * < 2 bytes> peer port
-     * < 1 byte > Number of peerCerts entries
-     *   < 4 byte > peerCert length
-     *   < length in bytes > peerCert
-     * < 1 byte > localCerts type (Cert, PSK, Anonymous)
-     *   Certificate
-     *     < 1 byte > Number of Certificate entries
-     *       < 4 byte> Certificate length
-     *       < length in bytes> Certificate
-     *   PSK
-     *     < 1 byte > Number of PSK entries
-     *       < 1 bytes > PSK algorithm length
-     *       < length in bytes > PSK algorithm string
-     *       < 4 bytes > PSK key length
-     *       < length in bytes> PSK key
-     *       < 4 bytes > PSK identity length
-     *       < length in bytes> PSK identity
-     *   Anonymous
-     *     < 1 byte >
+     * < 1 byte > Number of Peer Certificate entries
+     *   For each entry {
+     *     < 4 bytes > Peer certificate length
+     *     < length in bytes> Peer certificate
+     *   }
+     * < 1 byte > Number of Local Certificate entries
+     *   For each entry {
+     *     < 1 byte > Local Certificate algorithm length
+     *     < length in bytes> Local Certificate algorithm
+     *     < 4 bytes > Certificate checksum
+     *   }
      */
 
     SSLSessionImpl(HandshakeContext hc, ByteBuffer buf) throws IOException {
+        int len;
+        byte[] b;
         boundValues = new ConcurrentHashMap<>();
         this.protocolVersion =
                 ProtocolVersion.valueOf(Record.getInt16(buf));
@@ -321,51 +312,36 @@ final class SSLSessionImpl extends ExtendedSSLSession {
                 CipherSuite.valueOf(Record.getInt16(buf));
 
         // Local Supported signature algorithms
-        ArrayList<SignatureScheme> list = new ArrayList<>();
-        int i = Record.getInt8(buf);
-        while (i-- > 0) {
+        List<SignatureScheme> list = new ArrayList<>();
+        len = Record.getInt8(buf);
+        while (len-- > 0) {
             list.add(SignatureScheme.valueOf(
                     Record.getInt16(buf)));
         }
         this.localSupportedSignAlgs = Collections.unmodifiableCollection(list);
 
-        // Peer Supported signature algorithms
-        i = Record.getInt8(buf);
-        list.clear();
-        while (i-- > 0) {
-            list.add(SignatureScheme.valueOf(
-                    Record.getInt16(buf)));
-        }
-        this.peerSupportedSignAlgs = Collections.unmodifiableCollection(list);
-
-        // PSK
-        byte[] b = Record.getBytes16(buf);
-        if (b.length > 0) {
+        if (protocolVersion.useTLS13PlusSpec()) {
+            // PSK
             b = Record.getBytes16(buf);
-            this.preSharedKey = new SecretKeySpec(b, "TlsMasterSecret");
-        } else {
-            this.preSharedKey = null;
-        }
+            if (b.length > 0) {
+                this.preSharedKey = new SecretKeySpec(b, "TlsMasterSecret");
+            } else {
+                this.preSharedKey = null;
+            }
 
-        // PSK identity
-        b = Record.getBytes8(buf);
-        if (b.length > 0) {
-            this.pskIdentity = b;
+            this.useExtendedMasterSecret = false;
         } else {
-            this.pskIdentity = null;
-        }
-
-        // Master secret length of secret key algorithm  (one byte)
-        b = Record.getBytes8(buf);
-        if (b.length > 0) {
+            // Master secret
             b = Record.getBytes16(buf);
-            this.masterSecret = new SecretKeySpec(b, "TlsMasterSecret");
-        } else {
-            this.masterSecret = null;
-        }
+            if (b.length > 0) {
+                this.masterSecret = new SecretKeySpec(b, "TlsMasterSecret");
+            } else {
+                this.masterSecret = null;
+            }
 
-        // Use extended master secret
-        this.useExtendedMasterSecret = (Record.getInt8(buf) != 0);
+            // Extended master secret usage.
+            this.useExtendedMasterSecret = (Record.getInt8(buf) != 0);
+        }
 
         // Identification Protocol
         b = Record.getBytes8(buf);
@@ -384,7 +360,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         }
 
         // List of SNIServerName
-        int len = Record.getInt16(buf);
+        len = Record.getInt16(buf);
         if (len == 0) {
             this.requestedServerNames = Collections.emptyList();
         } else {
@@ -401,20 +377,6 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         // Get creation time
         this.creationTime = buf.getLong();
 
-        // Get Buffer sizes
-
-        // Status Response
-        len = Record.getInt16(buf);
-        if (len == 0) {
-            statusResponses = Collections.emptyList();
-        } else {
-            statusResponses = new ArrayList<>();
-        }
-        while (len-- > 0) {
-            b = Record.getBytes16(buf);
-            statusResponses.add(b);
-        }
-
         // Get Peer host & port
         b = Record.getBytes8(buf);
         if (b.length == 0) {
@@ -424,71 +386,89 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         }
         this.port = Record.getInt16(buf);
 
-        // Peer certs
-        i = Record.getInt8(buf);
-        if (i == 0) {
+        // Peer certs.
+        len = Record.getInt8(buf);
+        if (len == 0) {
             this.peerCerts = null;
         } else {
-            this.peerCerts = new X509Certificate[i];
-            int j = 0;
-            while (i > j) {
+            this.peerCerts = new X509Certificate[len];
+            for (int i = 0; len > i; i++) {
                 b = new byte[buf.getInt()];
                 buf.get(b);
                 try {
-                    this.peerCerts[j] = X509Factory.cachedGetX509Cert(b);
+                    this.peerCerts[i] = X509Factory.cachedGetX509Cert(b);
                 } catch (Exception e) {
                     throw new IOException(e);
                 }
-                j++;
             }
         }
 
-        // Get local certs of PSK
-        switch (Record.getInt8(buf)) {
-            case 0:
-                break;
-            case 1:
-                // number of certs
-                len = buf.get();
-                this.localCerts = new X509Certificate[len];
-                i = 0;
-                while (len > i) {
-                    b = new byte[buf.getInt()];
-                    buf.get(b);
+        // Restore local certificates if cert algorithm(s) present.
+        len = Record.getInt8(buf);
+        if (len == 0) {
+            this.localCerts = null;
+        } else {
+            String[] certAlgs = new String[len];
+            int[] certCheckSums = new int[len];
+
+            for (int i = 0; len > i; i++) {
+                certAlgs[i] = new String(Record.getBytes8(buf));
+                certCheckSums[i] = Record.getInt32(buf);
+            }
+
+            SSLPossession pos = X509Authentication.createPossession(
+                    hc, certAlgs);
+            boolean same = false;
+
+            if (pos instanceof X509Possession x509Pos
+                    && x509Pos.popCerts != null
+                    && x509Pos.popCerts.length == len) {
+                // Make sure we got the exact same cert chain.
+                for (int i = 0; i < x509Pos.popCerts.length; i++) {
                     try {
-                        this.localCerts[i] = X509Factory.cachedGetX509Cert(b);
+                        byte[] encoded = x509Pos.popCerts[i].getEncoded();
+                        String popAlg = x509Pos.popCerts[i]
+                                .getPublicKey().getAlgorithm();
+
+                        if (certCheckSums[i] == getChecksum(encoded)
+                                && certAlgs[i].equals(popAlg)) {
+                            // Use certs from cache.
+                            x509Pos.popCerts[i] =
+                                    X509Factory.cachedGetX509Cert(encoded);
+                            same = true;
+                        } else {
+                            same = false;
+                            break;
+                        }
                     } catch (Exception e) {
                         throw new IOException(e);
                     }
-                    i++;
                 }
-                break;
-            case 2:
-                // pre-shared key
-                // Length of pre-shared key algorithm  (one byte)
-                b = Record.getBytes8(buf);
-                String alg = new String(b);
-                // Get encoding
-                b = Record.getBytes16(buf);
-                this.preSharedKey = new SecretKeySpec(b, alg);
-                // Get identity len
-                i = Record.getInt8(buf);
-                if (i > 0) {
-                    this.pskIdentity = Record.getBytes8(buf);
-                } else {
-                    this.pskIdentity = null;
+            }
+
+            if (same) {
+                this.localCerts = ((X509Possession) pos).popCerts;
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,session")) {
+                    SSLLogger.fine("Restored " + len
+                            + " local certificates from session ticket"
+                            + " for algorithms " + Arrays.toString(certAlgs));
+                }
+            } else {
+                this.localCerts = null;
+                this.invalidated = true;
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,session")) {
+                    SSLLogger.warning("Local certificates can not be restored "
+                            + "from session ticket "
+                            + "for algorithms " + Arrays.toString(certAlgs));
                 }
-                break;
-            default:
-                throw new SSLException("Failed local certs of session.");
+            }
         }
 
-        context = (SSLSessionContextImpl)
+        this.context = (SSLSessionContextImpl)
                 hc.sslContext.engineGetServerSessionContext();
         this.lastUsedTime = System.currentTimeMillis();
     }
 
-
     // Some situations we cannot provide a stateless ticket, but after it
     // has been negotiated
     boolean isStatelessable() {
@@ -529,49 +509,25 @@ byte[] write() throws Exception {
             hos.putInt16(s.id);
         }
 
-        // Peer Supported signature algorithms
-        hos.putInt8(peerSupportedSignAlgs.size());
-        for (SignatureScheme s : peerSupportedSignAlgs) {
-            hos.putInt16(s.id);
-        }
-
-        // PSK
-        if (preSharedKey == null ||
-                preSharedKey.getAlgorithm() == null) {
-            hos.putInt16(0);
-        } else {
-            hos.putInt16(preSharedKey.getAlgorithm().length());
-            if (preSharedKey.getAlgorithm().length() != 0) {
-                hos.write(preSharedKey.getAlgorithm().getBytes());
+        // PreSharedKey is only needed by TLSv1.3,
+        // masterSecret is only needed by pre-TLSv1.3.
+        if (protocolVersion.useTLS13PlusSpec()) {
+            // PSK
+            if (preSharedKey == null) {
+                hos.putInt16(0);
+            } else {
+                hos.putBytes16(preSharedKey.getEncoded());
             }
-            b = preSharedKey.getEncoded();
-            hos.putInt16(b.length);
-            hos.write(b, 0, b.length);
-        }
-
-        // PSK Identity
-        if (pskIdentity == null) {
-            hos.putInt8(0);
         } else {
-            hos.putInt8(pskIdentity.length);
-            hos.write(pskIdentity, 0, pskIdentity.length);
-        }
-
-        // Master Secret
-        if (getMasterSecret() == null ||
-                getMasterSecret().getAlgorithm() == null) {
-            hos.putInt8(0);
-        } else {
-            hos.putInt8(getMasterSecret().getAlgorithm().length());
-            if (getMasterSecret().getAlgorithm().length() != 0) {
-                hos.write(getMasterSecret().getAlgorithm().getBytes());
+            // Master Secret
+            if (getMasterSecret() == null) {
+                hos.putInt16(0);
+            } else {
+                hos.putBytes16(masterSecret.getEncoded());
             }
-            b = getMasterSecret().getEncoded();
-            hos.putInt16(b.length);
-            hos.write(b, 0, b.length);
-        }
 
-        hos.putInt8(useExtendedMasterSecret ? 1 : 0);
+            hos.putInt8(useExtendedMasterSecret ? 1 : 0);
+        }
 
         // Identification Protocol
         if (identificationProtocol == null) {
@@ -605,20 +561,11 @@ byte[] write() throws Exception {
         hos.putInt32(maximumPacketSize);
         hos.putInt32(negotiatedMaxFragLen);
 
-        // creation time
+        // Creation time
         ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
         hos.writeBytes(buffer.putLong(creationTime).array());
 
-        // Status Responses
-        List<byte[]> list = getStatusResponses();
-        int l = list.size();
-        hos.putInt16(l);
-        for (byte[] e : list) {
-            hos.putInt16(e.length);
-            hos.write(e);
-        }
-
-        // peer Host & Port
+        // Peer Host & Port
         if (host == null || host.length() == 0) {
             hos.putInt8(0);
         } else {
@@ -627,7 +574,7 @@ byte[] write() throws Exception {
         }
         hos.putInt16(port);
 
-        // Peer cert
+        // Peer certs.
         if (peerCerts == null || peerCerts.length == 0) {
             hos.putInt8(0);
         } else {
@@ -639,34 +586,28 @@ byte[] write() throws Exception {
             }
         }
 
-        // Client identity
-        if (localCerts != null && localCerts.length > 0) {
-            // certificate based
-            hos.putInt8(1);
+        // Local certificates' algorithms and checksums.
+        // We don't include the complete local certificates in a session ticket
+        // to decrease the size of ClientHello message.
+        if (localCerts == null || localCerts.length == 0) {
+            hos.putInt8(0);
+        } else {
             hos.putInt8(localCerts.length);
             for (X509Certificate c : localCerts) {
-                b = c.getEncoded();
-                hos.putInt32(b.length);
-                hos.writeBytes(b);
+                hos.putBytes8(c.getPublicKey().getAlgorithm().getBytes());
+                hos.putInt32(getChecksum(c.getEncoded()));
             }
-        } else if (preSharedKey != null) {
-            // pre-shared key
-            hos.putInt8(2);
-            hos.putInt8(preSharedKey.getAlgorithm().length());
-            hos.write(preSharedKey.getAlgorithm().getBytes());
-            b = preSharedKey.getEncoded();
-            hos.putInt32(b.length);
-            hos.writeBytes(b);
-            hos.putInt32(pskIdentity.length);
-            hos.writeBytes(pskIdentity);
-        } else {
-            // anonymous
-            hos.putInt8(0);
         }
 
         return hos.toByteArray();
     }
 
+    private static int getChecksum(byte[] input) {
+        Adler32 adler32 = new Adler32();
+        adler32.update(input);
+        return (int) adler32.getValue();
+    }
+
     void setMasterSecret(SecretKey secret) {
         masterSecret = secret;
     }
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 6cf930619f7..c0d2bea77ca 100644
--- a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
@@ -25,12 +25,16 @@
 
 package sun.security.ssl;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.text.MessageFormat;
 import java.util.Locale;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
@@ -70,6 +74,9 @@ final class SessionTicketExtension {
             new T12SHSessionTicketConsumer();
 
     static final SSLStringizer steStringizer = new SessionTicketStringizer();
+    // No need to compress a ticket if it can fit in a single packet.
+    // Besides, small buffers often end up to be larger when compressed.
+    static final int MIN_COMPRESS_SIZE = 600;
 
     // Time in milliseconds until key is changed for encrypting session state
     private static final int TIMEOUT_DEFAULT = 3600 * 1000;
@@ -196,7 +203,7 @@ static final class SessionTicketSpec implements SSLExtensionSpec {
             data = buf;
         }
 
-        public byte[] encrypt(HandshakeContext hc, SSLSessionImpl session) {
+        byte[] encrypt(HandshakeContext hc, SSLSessionImpl session) {
             byte[] encrypted;
 
             if (!hc.statelessResumption ||
@@ -213,26 +220,34 @@ public byte[] encrypt(HandshakeContext hc, SSLSessionImpl session) {
                 Cipher c = Cipher.getInstance("AES/GCM/NoPadding");
                 c.init(Cipher.ENCRYPT_MODE, key.key,
                         new GCMParameterSpec(GCM_TAG_LEN, iv));
-                c.updateAAD(new byte[] {
-                        (byte)(key.num >>> 24),
-                        (byte)(key.num >>> 16),
-                        (byte)(key.num >>> 8),
-                        (byte)(key.num)}
-                );
+
                 byte[] data = session.write();
                 if (data.length == 0) {
                     return data;
                 }
+
+                // Compress the session before encryption if needed.
+                byte compressed = 0;
+                if (data.length >= MIN_COMPRESS_SIZE) {
+                    data = compress(data);
+                    compressed = 1;
+                }
+
+                ByteBuffer aad = ByteBuffer.allocate(Integer.BYTES + 1);
+                aad.putInt(key.num).put(compressed);
+                c.updateAAD(aad);
+
                 encrypted = c.doFinal(data);
                 byte[] result = new byte[encrypted.length + Integer.BYTES +
-                        iv.length];
+                        iv.length + 1];
                 result[0] = (byte)(key.num >>> 24);
                 result[1] = (byte)(key.num >>> 16);
                 result[2] = (byte)(key.num >>> 8);
                 result[3] = (byte)(key.num);
                 System.arraycopy(iv, 0, result, Integer.BYTES, iv.length);
+                result[Integer.BYTES + iv.length] = compressed;
                 System.arraycopy(encrypted, 0, result,
-                        Integer.BYTES + iv.length, encrypted.length);
+                        Integer.BYTES + iv.length + 1, encrypted.length);
                 return result;
             } catch (Exception e) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -257,26 +272,67 @@ ByteBuffer decrypt(HandshakeContext hc) {
                 Cipher c = Cipher.getInstance("AES/GCM/NoPadding");
                 c.init(Cipher.DECRYPT_MODE, key.key,
                         new GCMParameterSpec(GCM_TAG_LEN, iv));
-                c.updateAAD(new byte[] {
-                        (byte)(keyID >>> 24),
-                        (byte)(keyID >>> 16),
-                        (byte)(keyID >>> 8),
-                        (byte)(keyID)}
-                );
-
-                ByteBuffer out;
-                out = ByteBuffer.allocate(data.remaining() - GCM_TAG_LEN / 8);
+
+                byte compressed = data.get();
+                ByteBuffer aad = ByteBuffer.allocate(Integer.BYTES + 1);
+                aad.putInt(keyID).put(compressed);
+                c.updateAAD(aad);
+
+                ByteBuffer out = ByteBuffer.allocate(
+                        data.remaining() - GCM_TAG_LEN / 8);
                 c.doFinal(data, out);
                 out.flip();
+
+                // Decompress the session after decryption if needed.
+                if (compressed == 1) {
+                    out = decompress(out);
+                }
+
                 return out;
             } catch (Exception e) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Decryption failed." + e.getMessage());
                 }
             }
+
             return null;
         }
 
+        private static byte[] compress(byte[] input) throws IOException {
+            try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    GZIPOutputStream gos = new GZIPOutputStream(baos)) {
+                final int decompressedLen = input.length;
+                gos.write(input, 0, decompressedLen);
+                gos.finish();
+
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine("decompressed bytes: " + decompressedLen
+                            + "; compressed bytes: " + baos.size());
+                }
+
+                return baos.toByteArray();
+            }
+        }
+
+        private static ByteBuffer decompress(ByteBuffer input)
+                throws IOException {
+            final int compressedLen = input.remaining();
+            byte[] bytes = new byte[compressedLen];
+            input.get(bytes);
+
+            try (GZIPInputStream gis = new GZIPInputStream(
+                    new ByteArrayInputStream(bytes))) {
+                byte[] out = gis.readAllBytes();
+
+                if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
+                    SSLLogger.fine("compressed bytes: " + compressedLen
+                            + "; decompressed bytes: " + out.length);
+                }
+
+                return ByteBuffer.wrap(out);
+            }
+        }
+
         byte[] getEncoded() {
             byte[] out = new byte[data.capacity()];
             data.duplicate().get(out);
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServer.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServer.java
index 0d5413d1fa2..341dfb11d77 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServer.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServer.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
@@ -26,6 +26,7 @@
  * @bug 8206929
  * @summary ensure that server only resumes a session if certain properties
  *    of the session are compatible with the new connection
+ * @modules java.base/sun.security.x509
  * @library /javax/net/ssl/templates
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.2 -Djdk.tls.server.enableSessionTicketExtension=false -Djdk.tls.client.enableSessionTicketExtension=false ResumeChecksServer BASIC
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.2 -Djdk.tls.server.enableSessionTicketExtension=true -Djdk.tls.client.enableSessionTicketExtension=false ResumeChecksServer BASIC
@@ -48,6 +49,7 @@
 import java.security.*;
 import java.net.*;
 import java.util.*;
+import sun.security.x509.X509CertImpl;
 
 public class ResumeChecksServer extends SSLContextTemplate {
 
@@ -57,7 +59,8 @@ enum TestMode {
         VERSION_2_TO_3,
         VERSION_3_TO_2,
         CIPHER_SUITE,
-        SIGNATURE_SCHEME
+        SIGNATURE_SCHEME,
+        LOCAL_CERTS
     }
 
     public static void main(String[] args) throws Exception {
@@ -71,6 +74,7 @@ public ResumeChecksServer(TestMode testMode) {
     }
 
     private void run() throws Exception {
+        SSLSession firstSession;
         SSLSession secondSession = null;
 
         SSLContext sslContext = createServerSSLContext();
@@ -81,7 +85,7 @@ private void run() throws Exception {
         Client client = startClient(ssock.getLocalPort());
 
         try {
-            connect(client, ssock, testMode, false);
+            firstSession = connect(client, ssock, testMode, null);
         } catch (Exception ex) {
             throw new RuntimeException(ex);
         }
@@ -89,7 +93,7 @@ private void run() throws Exception {
         long secondStartTime = System.currentTimeMillis();
         Thread.sleep(10);
         try {
-            secondSession = connect(client, ssock, testMode, true);
+            secondSession = connect(client, ssock, testMode, firstSession);
         } catch (SSLHandshakeException ex) {
             // this is expected
         } catch (Exception ex) {
@@ -105,6 +109,14 @@ private void run() throws Exception {
             if (secondSession.getCreationTime() > secondStartTime) {
                 throw new RuntimeException("Session was not reused");
             }
+
+            // Fail if session's certificates are not restored correctly.
+            if (!java.util.Arrays.equals(
+                    firstSession.getLocalCertificates(),
+                    secondSession.getLocalCertificates())) {
+                throw new RuntimeException("Certificates do not match");
+            }
+
             break;
         case CLIENT_AUTH:
             // throws an exception if the client is not authenticated
@@ -114,6 +126,7 @@ private void run() throws Exception {
         case VERSION_3_TO_2:
         case CIPHER_SUITE:
         case SIGNATURE_SCHEME:
+        case LOCAL_CERTS:
             // fail if a new session is not created
             if (secondSession.getCreationTime() <= secondStartTime) {
                 throw new RuntimeException("Existing session was used");
@@ -153,7 +166,9 @@ public boolean permits(Set<CryptoPrimitive> primitives,
     }
 
     private static SSLSession connect(Client client, SSLServerSocket ssock,
-        TestMode mode, boolean second) throws Exception {
+            TestMode mode, SSLSession firstSession) throws Exception {
+
+        boolean second = firstSession != null;
 
         try {
             client.signal();
@@ -200,9 +215,22 @@ private static SSLSession connect(Client client, SSLServerSocket ssock,
                 AlgorithmConstraints constraints =
                     params.getAlgorithmConstraints();
                 if (second) {
-                    params.setAlgorithmConstraints(new NoSig("ecdsa"));
+                    params.setAlgorithmConstraints(
+                            new NoSig("ecdsa_secp384r1_sha384"));
                 } else {
-                    params.setAlgorithmConstraints(new NoSig("rsa"));
+                    params.setAlgorithmConstraints(
+                            new NoSig("ecdsa_secp521r1_sha512"));
+                }
+                break;
+            case LOCAL_CERTS:
+                if (second) {
+                    // Add first session's certificate signature
+                    // algorithm to constraints so local certificates
+                    // can't be restored from the session ticket.
+                    params.setAlgorithmConstraints(
+                            new NoSig(X509CertImpl.toImpl((X509CertImpl)
+                                            firstSession.getLocalCertificates()[0])
+                                    .getSigAlgName()));
                 }
                 break;
             default:
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServerStateless.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServerStateless.java
index 8071bb1ced8..f68af24ea93 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServerStateless.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumeChecksServerStateless.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 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
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @bug 8211018
+ * @bug 8211018 8357033
  * @summary ensure that server only resumes a session if certain properties
  *    of the session are compatible with the new connection
+ * @modules java.base/sun.security.x509
  * @library /javax/net/ssl/templates
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 ResumeChecksServer BASIC
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 ResumeChecksServer CLIENT_AUTH
@@ -33,4 +34,5 @@
  * @run main/othervm ResumeChecksServer VERSION_3_TO_2
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 ResumeChecksServer CIPHER_SUITE
  * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 ResumeChecksServer SIGNATURE_SCHEME
+ * @run main/othervm -Djdk.tls.client.protocols=TLSv1.3 ResumeChecksServer LOCAL_CERTS
  */

From 81464cd1141ebdf0cdde22e7388b97224d810f4a Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Fri, 30 May 2025 17:13:04 +0000
Subject: [PATCH 734/901] 8358089: Remove the GenerateKeyList.java test tool

Reviewed-by: naoto
---
 .../jdk/java/util/Locale/GenerateKeyList.java | 90 -------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 test/jdk/java/util/Locale/GenerateKeyList.java

diff --git a/test/jdk/java/util/Locale/GenerateKeyList.java b/test/jdk/java/util/Locale/GenerateKeyList.java
deleted file mode 100644
index 32598b8a759..00000000000
--- a/test/jdk/java/util/Locale/GenerateKeyList.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2007, 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.
- */
-/**
- * This is a simple program that will generate a key list that can be used as the basis
- * for a LocaleData file suitable for use with LocaleDataTest.  It always sends its
- * output to standard out.
- */
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.Enumeration;
-import java.io.PrintStream;
-
-public class GenerateKeyList {
-    public static void main(String[] args) throws Exception {
-        doOutputFor("sun.util.resources", "CalendarData", System.out);
-        doOutputFor("sun.util.resources", "CurrencyNames", System.out);
-        doOutputFor("sun.util.resources", "LocaleNames", System.out);
-        doOutputFor("sun.util.resources", "TimeZoneNames", System.out);
-        doOutputFor("sun.text.resources", "CollationData", System.out);
-        doOutputFor("sun.text.resources", "FormatData", System.out);
-    };
-
-    public static void doOutputFor(String packageName,
-            String resourceBundleName, PrintStream out)
-                    throws Exception {
-        Locale[] availableLocales = Locale.getAvailableLocales();
-
-        ResourceBundle bundle = ResourceBundle.getBundle(packageName +
-                        resourceBundleName, Locale.of(""));
-        dumpResourceBundle(resourceBundleName + "/", bundle, out);
-        for (int i = 0; i < availableLocales.length; i++) {
-            bundle = ResourceBundle.getBundle(packageName + resourceBundleName,
-                            availableLocales[i]);
-            dumpResourceBundle(resourceBundleName + "/" + availableLocales[i].toString(),
-                            bundle, out);
-        }
-    }
-
-    public static void dumpResourceBundle(String pathName, ResourceBundle bundle,
-                    PrintStream out) throws Exception {
-        Enumeration keys = bundle.getKeys();
-        while(keys.hasMoreElements()) {
-            String key = (String)(keys.nextElement());
-            dumpResource(pathName + "/" + key, bundle.getObject(key), out);
-        }
-    }
-
-    public static void dumpResource(String pathName, Object resource, PrintStream out)
-                    throws Exception {
-        if (resource instanceof String[]) {
-            String[] stringList = (String[])resource;
-            for (int i = 0; i < stringList.length; i++)
-                out.println(pathName + "/" + i);
-        }
-        else if (resource instanceof String[][]) {
-            String[][] stringArray = (String[][])resource;
-            if (pathName.startsWith("TimeZoneNames")) {
-                for (int i = 0; i < stringArray.length; i++)
-                    for (int j = 0; j < stringArray[i].length; j++)
-                        out.println(pathName + "/" + i + "/" + j);
-            }
-            else {
-                for (int i = 0; i < stringArray.length; i++)
-                    out.println(pathName + "/" + stringArray[i][0]);
-            }
-        }
-        else
-            out.println(pathName);
-    }
-}

From eaf7815ea6854de603a1b5c179799a9ef5d37f42 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 30 May 2025 17:22:51 +0000
Subject: [PATCH 735/901] 8357886: Remove TimeZoneNames_* of the COMPAT locale
 data provider

Reviewed-by: joehw, jlu
---
 .../util/resources/ext/TimeZoneNames_de.java  | 1046 ----------------
 .../resources/ext/TimeZoneNames_en_CA.java    |   51 -
 .../resources/ext/TimeZoneNames_en_GB.java    |   54 -
 .../resources/ext/TimeZoneNames_en_IE.java    |   54 -
 .../util/resources/ext/TimeZoneNames_es.java  | 1046 ----------------
 .../util/resources/ext/TimeZoneNames_fr.java  | 1046 ----------------
 .../util/resources/ext/TimeZoneNames_hi.java  |   49 -
 .../util/resources/ext/TimeZoneNames_it.java  | 1046 ----------------
 .../util/resources/ext/TimeZoneNames_ja.java  | 1046 ----------------
 .../util/resources/ext/TimeZoneNames_ko.java  | 1046 ----------------
 .../resources/ext/TimeZoneNames_pt_BR.java    | 1046 ----------------
 .../util/resources/ext/TimeZoneNames_sv.java  | 1046 ----------------
 .../resources/ext/TimeZoneNames_zh_CN.java    | 1046 ----------------
 .../resources/ext/TimeZoneNames_zh_HK.java    |   59 -
 .../resources/ext/TimeZoneNames_zh_TW.java    | 1048 -----------------
 15 files changed, 10729 deletions(-)
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java
 delete mode 100644 src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java

diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
deleted file mode 100644
index 5cc8a38892d..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_de extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Acre Normalzeit", "ACT",
-                                     "Acre Sommerzeit", "ACST",
-                                     "Acre Normalzeit", "ACT"};
-        String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "ACST",
-                                          "Zentrale Sommerzeit (S\u00FCdaustralien)", "ACDT",
-                                          "Zentrale Zeitzone (S\u00FCdaustralien)", "ACT"};
-        String AGT[] = new String[] {"Argentinische Zeit", "ART",
-                                     "Argentinische Sommerzeit", "ARST",
-                                     "Argentinische Zeit", "ART"};
-        String AKST[] = new String[] {"Alaska Normalzeit", "AKST",
-                                      "Alaska Sommerzeit", "AKDT",
-                                      "Zeitzone f\u00FCr Alaska", "AKT"};
-        String AMT[] = new String[] {"Amazonas Normalzeit", "AMT",
-                                     "Amazonas Sommerzeit", "AMST",
-                                     "Amazonas Normalzeit", "AMT"};
-        String ARAST[] = new String[] {"Arabische Normalzeit", "AST",
-                                       "Arabische Sommerzeit", "ADT",
-                                       "Zeitzone f\u00FCr Arabische Halbinsel", "AT"};
-        String ARMT[] = new String[] {"Armenische Zeit", "AMT",
-                                      "Armenische Sommerzeit", "AMST",
-                                      "Armenische Zeit", "AMT"};
-        String AST[] = new String[] {"Atlantik Normalzeit", "AST",
-                                     "Atlantik Sommerzeit", "ADT",
-                                     "Zeitzone Atlantik", "AT"};
-        String BDT[] = new String[] {"Bangladesch Zeit", "BDT",
-                                     "Bangladesch Sommerzeit", "BDST",
-                                     "Bangladesch Zeit", "BDT"};
-        String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "AEST",
-                                          "\u00D6stliche Sommerzeit (Queensland)", "AEDT",
-                                          "\u00D6stliche Zeitzone (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "ACST",
-                                             "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "ACDT",
-                                             "Zentrale Zeitzone (S\u00FCdaustralien/New South Wales)", "ACT"};
-        String BRT[] = new String[] {"Brasilianische Zeit", "BRT",
-                                     "Brasilianische Sommerzeit", "BRST",
-                                     "Brasilianische Zeit", "BRT"};
-        String BTT[] = new String[] {"Bhutanische Zeit", "BTT",
-                                     "Bhutanische Sommerzeit", "BTST",
-                                     "Bhutanische Zeit", "BTT"};
-        String CAT[] = new String[] {"Zentralafrikanische Zeit", "CAT",
-                                     "Zentralafrikanische Sommerzeit", "CAST",
-                                     "Zentralafrikanische Zeit", "CAT"};
-        String CET[] = new String[] {"Mitteleurop\u00e4ische Zeit", "MEZ",
-                                     "Mitteleurop\u00e4ische Sommerzeit", "MESZ",
-                                     "Mitteleurop\u00E4ische Zeit", "MEZ"};
-        String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST",
-                                       "Chatham Sommerzeit", "CHADT",
-                                       "Zeitzone f\u00FCr Chatham-Inseln", "CHAT"};
-        String CHUT[] = new String[] {"Chuuk Zeit", "CHUT",
-                                      "Chuuk Sommerzeit", "CHUST",
-                                      "Chuuk Zeit", "CHUT"};
-        String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA",
-                                     "Zentralindonesische Sommerzeit", "CIST",
-                                     "Zentralindonesische Zeit", "WITA"};
-        String CLT[] = new String[] {"Chilenische Zeit", "CLT",
-                                     "Chilenische Sommerzeit", "CLST",
-                                     "Chilenische Zeit", "CLT"};
-        String CST[] = new String[] {"Zentrale Normalzeit", "CST",
-                                     "Zentrale Sommerzeit", "CDT",
-                                     "Zentrale Zeitzone", "CT"};
-        String CTT[] = new String[] {"Chinesische Normalzeit", "CST",
-                                     "Chinesische Sommerzeit", "CDT",
-                                     "Zeitzone f\u00FCr China", "CT"};
-        String CUBA[] = new String[] {"Kubanische Normalzeit", "CST",
-                                      "Kubanische Sommerzeit", "CDT",
-                                      "Kubanische Normalzeit", "CT"};
-        String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "ACST",
-                                        "Zentrale Sommerzeit (Northern Territory)", "ACDT",
-                                        "Zentrale Zeitzone (Northern Territory)", "ACT"};
-        String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT",
-                                        "Irische Sommerzeit", "IST",
-                                        "Irische Zeit", "IT"};
-        String EAT[] = new String[] {"Ostafrikanische Zeit", "EAT",
-                                     "Ostafrikanische Sommerzeit", "EAST",
-                                     "Ostafrikanische Zeit", "EAT"};
-        String EASTER[] = new String[] {"Osterinseln Zeit", "EAST",
-                                        "Osterinseln Sommerzeit", "EASST",
-                                        "Osterinseln Zeit", "EAST"};
-        String EET[] = new String[] {"Osteurop\u00e4ische Zeit", "OEZ",
-                                     "Osteurop\u00e4ische Sommerzeit", "OESZ",
-                                     "Osteurop\u00e4ische Zeit", "OEZ"};
-        String EGT[] = new String[] {"Ostgr\u00f6nl\u00e4ndische Zeit", "EGT",
-                                     "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST",
-                                     "Ostgr\u00F6nl\u00E4ndische Zeit", "EGT"};
-        String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST",
-                                     "\u00d6stliche Sommerzeit", "EDT",
-                                     "\u00D6stliche Zeitzone", "ET"};
-        String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "AEST",
-                                         "\u00D6stliche Sommerzeit (New South Wales)", "AEDT",
-                                         "\u00D6stliche Zeitzone (New South Wales)", "AET"};
-        String FET[] = new String[] {"Kaliningrader Zeit", "FET",
-                                     "Kaliningrader Sommerzeit", "FEST",
-                                     "Kaliningrader Zeit", "FET"};
-        String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT",
-                                      "Ghanaische Sommerzeit", "GHST",
-                                      "Ghanaische Normalzeit", "GMT"};
-        String GAMBIER[] =  new String[] {"Gambier Zeit", "GAMT",
-                                          "Gambier Sommerzeit", "GAMST",
-                                          "Gambier Zeit", "GAMT"};
-        String GMT[] = new String[] {"Greenwich Zeit", "GMT",
-                                   "Greenwich Zeit", "GMT",
-                                   "Greenwich Zeit", "GMT"};
-        String GMTBST[] = new String[] {"Greenwich Zeit", "GMT",
-                                        "Britische Sommerzeit", "BST",
-                                        "Britische Zeit", "BT"};
-        String GST[] = new String[] {"Golf Normalzeit", "GST",
-                                     "Golf Sommerzeit", "GDT",
-                                     "Zeitzone f\u00FCr Persischen Golf", "GT"};
-        String HKT[] =  new String[] {"Hongkong Zeit", "HKT",
-                                      "Hongkong Sommerzeit", "HKST",
-                                      "Hongkong Zeit", "HKT"};
-        String HST[] = new String[] {"Hawaii Normalzeit", "HST",
-                                     "Hawaii Sommerzeit", "HDT",
-                                     "Zeitzone f\u00FCr Hawaii", "HT"};
-        String ICT[] = new String[] {"Indochina Zeit", "ICT",
-                                     "Indochina Sommerzeit", "ICST",
-                                     "Indochina Zeit", "ICT"};
-        String IRKT[] = new String[] {"Irkutsk Zeit", "IRKT",
-                                      "Irkutsk Sommerzeit", "IRKST",
-                                      "Irkutsk Zeit", "IRKT"};
-        String IRT[] = new String[] {"Iranische Normalzeit", "IRST",
-                                     "Iranische Sommerzeit", "IRDT",
-                                     "Iranische Zeit", "IRT"};
-        String ISRAEL[] = new String[] {"Israelische Normalzeit", "IST",
-                                        "Israelische Sommerzeit", "IDT",
-                                        "Zeitzone f\u00FCr Israel", "IT"};
-        String IST[] = new String[] {"Indische Normalzeit", "IST",
-                                     "Indische Sommerzeit", "IDT",
-                                     "Zeitzone f\u00FCr Indien", "IT"};
-        String JST[] = new String[] {"Japanische Normalzeit", "JST",
-                                     "Japanische Sommerzeit", "JDT",
-                                     "Zeitzone f\u00FCr Japan", "JT"};
-        String KRAT[] = new String[] {"Krasnojarsker Zeit", "KRAT",
-                                      "Krasnojarsker Sommerzeit", "KRAST",
-                                      "Krasnojarsker Zeit", "KRAT"};
-        String KST[] = new String[] {"Koreanische Normalzeit", "KST",
-                                     "Koreanische Sommerzeit", "KDT",
-                                     "Zeitzone f\u00FCr Korea", "KT"};
-        String LORD_HOWE[] = new String[] {"Lord Howe Normalzeit", "LHST",
-                                           "Lord Howe Sommerzeit", "LHDT",
-                                           "Lord-Howe Normalzeit", "LHT"};
-        String MHT[] = new String[] {"Marshallinseln Zeit", "MHT",
-                                     "Marshallinseln Sommerzeit", "MHST",
-                                     "Marshallinseln Zeit", "MHT"};
-        String MMT[] = new String[] {"Myanmar Zeit", "MMT",
-                                     "Myanmar Sommerzeit", "MMST",
-                                     "Myanmar Zeit", "MMT"};
-        String MSK[] = new String[] {"Moskauer Normalzeit", "MSK",
-                                     "Moskauer Sommerzeit", "MSD",
-                                     "Zeitzone f\u00FCr Moskau", "MT"};
-        String MST[] = new String[] {"Rocky Mountains Normalzeit", "MST",
-                                     "Rocky Mountains Sommerzeit", "MDT",
-                                     "Zeitzone Mountain", "MT"};
-        String MYT[] = new String[] {"Malaysische Zeit", "MYT",
-                                     "Malaysische Sommerzeit", "MYST",
-                                     "Malaysische Zeit", "MYT"};
-        String NORONHA[] = new String[] {"Fernando de Noronha Zeit", "FNT",
-                                         "Fernando de Noronha Sommerzeit", "FNST",
-                                         "Fernando de Noronha Zeit", "FNT"};
-        String NOVT[] = new String[] {"Nowosibirsker Zeit", "NOVT",
-                                      "Nowosibirsker Sommerzeit", "NOVST",
-                                      "Nowosibirsker Zeit", "NOVT"};
-        String NPT[] = new String[] {"Nepalesische Zeit", "NPT",
-                                     "Nepalesische Sommerzeit", "NPST",
-                                     "Nepalesische Zeit", "NPT"};
-        String NST[] = new String[] {"Neufundland Normalzeit", "NST",
-                                     "Neufundland Sommerzeit", "NDT",
-                                     "Zeitzone f\u00FCr Neufundland", "NT"};
-        String NZST[] = new String[] {"Neuseeland Normalzeit", "NZST",
-                                      "Neuseeland Sommerzeit", "NZDT",
-                                      "Zeitzone f\u00FCr Neuseeland", "NZT"};
-        String PITCAIRN[] = new String[] {"Pitcairn Normalzeit", "PST",
-                                          "Pitcairn Sommerzeit", "PDT",
-                                          "Zeitzone f\u00FCr Pitcairn", "PT"};
-        String PKT[] = new String[] {"Pakistanische Zeit", "PKT",
-                                     "Pakistanische Sommerzeit", "PKST",
-                                     "Pakistanische Zeit", "PKT"};
-        String PONT[] = new String[] {"Pohnpei Zeit", "PONT",
-                                      "Pohnpei Sommerzeit", "PONST",
-                                      "Pohnpei-Inseln Zeit", "PONT"};
-        String PST[] = new String[] {"Pazifische Normalzeit", "PST",
-                                     "Pazifische Sommerzeit", "PDT",
-                                     "Zeitzone Pazifik", "PT"};
-        String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST",
-                                      "S\u00fcdafrikanische Sommerzeit", "SAST",
-                                      "Zeitzone f\u00FCr S\u00FCdafrika", "SAT"};
-        String SBT[] = new String[] {"Salomoninseln Zeit", "SBT",
-                                     "Salomoninseln Sommerzeit", "SBST",
-                                     "Salomoninseln Zeit", "SBT"};
-        String SGT[] = new String[] {"Singapur Zeit", "SGT",
-                                     "Singapur Sommerzeit", "SGST",
-                                     "Singapur Zeit", "SGT"};
-        String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "AEST",
-                                          "\u00D6stliche Sommerzeit (Tasmanien)", "AEDT",
-                                          "\u00D6stliche Zeitzone (Tasmanien)", "AET"};
-        String TMT[] = new String[] {"Turkmenische Zeit", "TMT",
-                                     "Turkmenische Sommerzeit", "TMST",
-                                     "Turkmenische Zeit", "TMT"};
-        String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT",
-                                     "Ulaanbaatar Sommerzeit", "ULAST",
-                                     "Ulaanbaatar Zeit", "ULAT"};
-        String WAT[] = new String[] {"Westafrikanische Zeit", "WAT",
-                                     "Westafrikanische Sommerzeit", "WAST",
-                                     "Westafrikanische Zeit", "WAT"};
-        String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ",
-                                     "Westeurop\u00e4ische Sommerzeit", "WESZ",
-                                     "Westeurop\u00E4ische Zeit", "WEZ"};
-        String WGT[] = new String[] {"Westgr\u00f6nl\u00e4ndische Zeit", "WGT",
-                                     "Westgr\u00f6nl\u00e4ndische Sommerzeit", "WGST",
-                                     "Westgr\u00F6nl\u00E4ndische Zeit", "WGT"};
-        String WIT[] = new String[] {"Westindonesische Zeit", "WIB",
-                                     "Westindonesische Sommerzeit", "WIST",
-                                     "Westindonesische Zeit", "WIB"};
-        String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "AWST",
-                                         "Westliche Sommerzeit (Australien)", "AWDT",
-                                         "Westliche Zeitzone (Australien)", "AWT"};
-        String SAMOA[] = new String[] {"Samoa Normalzeit", "SST",
-                                       "Samoa Sommerzeit", "SDT",
-                                       "Zeitzone f\u00FCr Samoa", "ST"};
-        String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WSST",
-                                           "West Samoa Sommerzeit", "WSDT",
-                                           "West Samoa Zeit", "WST"};
-        String ChST[] = new String[] {"Chamorro Normalzeit", "ChST",
-                      "Chamorro Sommerzeit", "ChDT",
-                      "Zeitzone f\u00FCr die Marianen", "ChT"};
-        String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "AEST",
-                                          "\u00D6stliche Sommerzeit (Victoria)", "AEDT",
-                                          "\u00D6stliche Zeitzone (Victoria)", "AET"};
-        String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC",
-                                     "Koordinierte Universalzeit", "UTC",
-                                     "Koordinierte Universalzeit", "UTC"};
-        String UZT[] = new String[] {"Usbekistan Zeit", "UZT",
-                                     "Usbekistan Sommerzeit", "UZST",
-                                     "Usbekistan Zeit", "UZT"};
-        String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
-                                     "Chinesische Sommerzeit", "XJDT",
-                                     "Zeitzone f\u00FCr China", "XJT"};
-        String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT",
-                                      "Jakutsk Sommerzeit", "YAKST",
-                                      "Jakutsk Zeit", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Paraguay Zeit", "PYT",
-                                               "Paraguay Sommerzeit", "PYST",
-                                               "Paraguay Zeit", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Kolumbianische Zeit", "COT",
-                                             "Kolumbianische Sommerzeit", "COST",
-                                             "Kolumbianische Zeit", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Venezuelanische Zeit", "VET",
-                                              "Venezuelanische Sommerzeit", "VEST",
-                                              "Venezuelanische Zeit", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Franz\u00f6sisch-Guiana Zeit", "GFT",
-                                              "Franz\u00f6sisch-Guiana Sommerzeit", "GFST",
-                                              "Franz\u00F6sisch-Guiana Zeit", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Ecuadorianische Zeit", "ECT",
-                                                "Ecuadorianische Sommerzeit", "ECST",
-                                                "Ecuadorianische Zeit", "ECT"}},
-            {"America/Guyana", new String[] {"Guyanische Zeit", "GYT",
-                                             "Guyanische Sommerzeit", "GYST",
-                                             "Guyanische Zeit", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Bolivianische Zeit", "BOT",
-                                             "Bolivianische Sommerzeit", "BOST",
-                                             "Bolivianische Zeit", "BOT"}},
-            {"America/Lima", new String[] {"Peruanische Zeit", "PET",
-                                           "Peruanische Sommerzeit", "PEST",
-                                           "Peruanische Zeit", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
-                                               "Pierre & Miquelon Sommerzeit", "PMDT",
-                                               "Zeitzone f\u00FCr St. Pierre und Miquelon", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Uruguayische Zeit", "UYT",
-                                                 "Uruguayische Sommerzeit", "UYST",
-                                                 "Uruguayanische Zeit", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Suriname Zeit", "SRT",
-                                                 "Suriname Sommerzeit", "SRST",
-                                                 "Suriname Zeit", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Davis Zeit", "DAVT",
-                                               "Davis Sommerzeit", "DAVST",
-                                               "Davis Zeit", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT",
-                                                        "Dumont-d'Urville Sommerzeit", "DDUST",
-                                                        "Dumont-d'Urville Zeit", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT",
-                                                "Mawson Sommerzeit", "MAWST",
-                                                "Mawson Zeit", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Rothera Zeit", "ROTT",
-                                                 "Rothera Sommerzeit", "ROTST",
-                                                 "Rothera Zeit", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT",
-                                               "Syowa Sommerzeit", "SYOST",
-                                               "Syowa Zeit", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC",
-                                               "Mitteleurop\u00e4ische Sommerzeit", "MESZ",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST",
-                                                "Vostok Sommerzeit", "VOSST",
-                                                "Vostok Zeit", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Alma Ata Zeit", "ALMT",
-                                          "Alma-Ata Sommerzeit", "ALMST",
-                                          "Alma Ata Zeit", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Anadyr Zeit", "ANAT",
-                                          "Anadyr Sommerzeit", "ANAST",
-                                          "Anadyr Zeit", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Aqtau Zeit", "AQTT",
-                                         "Aqtau Sommerzeit", "AQTST",
-                                         "Aqtau Zeit", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Aqtobe Zeit", "AQTT",
-                                          "Aqtobe Sommerzeit", "AQTST",
-                                          "Aqtobe Zeit", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Aserbaidschanische Zeit", "AZT",
-                                        "Aserbaidschanische Sommerzeit", "AZST",
-                                        "Aserbaidschanische Zeit", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Kirgisische Zeit", "KGT",
-                                           "Kirgisische Sommerzeit", "KGST",
-                                           "Kirgisische Zeit", "KGT"}},
-            {"Asia/Brunei", new String[] {"Brunei Zeit", "BNT",
-                                          "Brunei Sommerzeit", "BNST",
-                                          "Brunei Zeit", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
-                                              "Choibalsan Sommerzeit", "CHOST",
-                                              "Choibalsan Zeit", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Timor-Leste Normalzeit", "TLT",
-                                        "Timor-Leste Sommerzeit", "TLST",
-                                        "Timor-Leste Normalzeit", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Tadschikische Zeit", "TJT",
-                                            "Tadschikische Sommerzeit", "TJST",
-                                            "Tadschikische Zeit", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
-                                        "Hovd Sommerzeit", "HOVST",
-                                        "Hovd Zeit", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT",
-                                            "Ostindonesische Sommerzeit", "EIST",
-                                            "Ostindonesische Zeit", "WIT"}},
-            {"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT",
-                                         "Afghanistanische Sommerzeit", "AFST",
-                                         "Afghanistanische Zeit", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Petropawlowsk-Kamtschatkische Zeit", "PETT",
-                                             "Petropawlowsk-Kamtschatkische Sommerzeit", "PETST",
-                                             "Petropawlowsk-Kamtschatkische Zeit", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Magadanische Zeit", "MAGT",
-                                           "Magadanische Sommerzeit", "MAGST",
-                                           "Magadanische Zeit", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Oral Zeit", "ORAT",
-                                        "Oral Sommerzeit", "ORAST",
-                                        "Oral Zeit", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Omsk Zeit", "OMST",
-                                        "Omsk Sommerzeit", "OMSST",
-                                        "Omsk Zeit", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Qyzylorda Zeit", "QYZT",
-                                             "Qyzylorda Sommerzeit", "QYZST",
-                                             "Qyzylorda Zeit", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Sakhalin Zeit", "SAKT",
-                                            "Sakhalin Sommerzeit", "SAKST",
-                                            "Sakhalin Zeit", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Georgische Zeit", "GET",
-                                           "Georgische Sommerzeit", "GEST",
-                                           "Georgische Zeit", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT",
-                                            "Ust-Nera Sommerzeit", "VLAST",
-                                            "Ust-Nera Zeit", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT",
-                                               "Wladiwostok Sommerzeit", "VLAST",
-                                               "Wladiwostok Zeit", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT",
-                                                 "Jekaterinburger Sommerzeit", "YEKST",
-                                                 "Jekaterinburger Zeit", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Azoren Zeit", "AZOT",
-                                              "Azoren Sommerzeit", "AZOST",
-                                              "Azoren Zeit", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Kap Verde Zeit", "CVT",
-                                                  "Kap Verde Sommerzeit", "CVST",
-                                                  "Kap Verde Zeit", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"South Georgia Normalzeit", "GST",
-                                                     "South Georgia Sommerzeit", "GDT",
-                                                     "Zeitzone f\u00FCr S\u00FCdgeorgien", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Falkland Inseln Zeit", "FKT",
-                                               "Falkland Inseln Sommerzeit", "FKST",
-                                               "Falkland Inseln Zeit", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "ACWST",
-                                              "Zentral-Westliche Sommerzeit (Australien)", "ACWDT",
-                                              "Zentral-Westliche Normalzeit (Australien)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Samarische Zeit", "SAMT",
-                                            "Samarische Sommerzeit", "SAMST",
-                                            "Samarische Zeit", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Indischer Ozean Territorium Zeit", "IOT",
-                                            "Indischer Ozean Territorium Sommerzeit", "IOST",
-                                            "Indischer Ozean Territorium Zeit", "IOT"}},
-            {"Indian/Christmas", new String[] {"Christmas Island Zeit", "CXT",
-                                               "Christmas Island Sommerzeit", "CXST",
-                                               "Weihnachtsinseln Zeit", "CIT"}},
-            {"Indian/Cocos", new String[] {"Cocos Islands Zeit", "CCT",
-                                           "Cocos Islands Sommerzeit", "CCST",
-                                           "Kokos-Inseln Zeit", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Franz\u00f6sisch S\u00fcd- u. Antarktische Landzeit", "TFT",
-                                               "Franz\u00f6sisch S\u00fcd- u. Antarktische Landsommerzeit", "TFST",
-                                               "Franz\u00F6sisch S\u00FCd- u. Antarktische Landzeit", "TFT"}},
-            {"Indian/Mahe", new String[] {"Seychellen Zeit", "SCT",
-                                          "Seychellen Sommerzeit", "SCST",
-                                          "Seychellen Zeit", "SCT"}},
-            {"Indian/Maldives", new String[] {"Maledivische Zeit", "MVT",
-                                              "Maledivische Sommerzeit", "MVST",
-                                              "Maledivische Zeit", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Mauritius Zeit", "MUT",
-                                               "Mauritius Sommerzeit", "MUST",
-                                               "Mauritius Zeit", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Reunion Zeit", "RET",
-                                             "Reunion Sommerzeit", "REST",
-                                             "R\u00E9union Zeit", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Vanuatu Zeit", "VUT",
-                                            "Vanuatu Sommerzeit", "VUST",
-                                            "Vanuatu Zeit", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Phoenix Inseln Zeit", "PHOT",
-                                                "Phoenix Inseln Sommerzeit", "PHOST",
-                                                "Phoenix Inseln Zeit", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Tokelau Zeit", "TKT",
-                                              "Tokelau Sommerzeit", "TKST",
-                                              "Tokelau Zeit", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Fidschi Zeit", "FJT",
-                                           "Fidschi Sommerzeit", "FJST",
-                                           "Fidschi Zeit", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Tuvalu Zeit", "TVT",
-                                               "Tuvalu Sommerzeit", "TVST",
-                                               "Tuvalu Zeit", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Galapagos Zeit", "GALT",
-                                                "Galapagos Sommerzeit", "GALST",
-                                                "Galapagos Zeit", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Line Inseln Zeit", "LINT",
-                                                 "Line Inseln Sommerzeit", "LINST",
-                                                 "Line Inseln Zeit", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Kosrae Zeit", "KOST",
-                                             "Kosrae Sommerzeit", "KOSST",
-                                             "Kosrae Zeit", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Marquesas Zeit", "MART",
-                                                "Marquesas Sommerzeit", "MARST",
-                                                "Marquesas Zeit", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Nauru Zeit", "NRT",
-                                            "Nauru Sommerzeit", "NRST",
-                                            "Nauru Zeit", "NRT"}},
-            {"Pacific/Niue", new String[] {"Niue Zeit", "NUT",
-                                           "Niue Sommerzeit", "NUST",
-                                           "Niue Zeit", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Norfolk Zeit", "NFT",
-                                              "Norfolk Sommerzeit", "NFST",
-                                              "Norfolk Zeit", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Neukaledonische Zeit", "NCT",
-                                             "Neukaledonische Sommerzeit", "NCST",
-                                             "Neukaledonische Zeit", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Palau Zeit", "PWT",
-                                            "Palau Sommerzeit", "PWST",
-                                            "Palau Zeit", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Papua-Neuguinea Zeit", "PGT",
-                                                   "Papua-Neuguinea Sommerzeit", "PGST",
-                                                   "Papua-Neuguinea Zeit", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Cook-Inseln Zeit", "CKT",
-                                                "Cook-Inseln Sommerzeit", "CKHST",
-                                                "Cook-Inseln Zeit", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Tahiti Zeit", "TAHT",
-                                             "Tahiti Sommerzeit", "TAHST",
-                                             "Tahiti Zeit", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Gilbert-Inseln Zeit", "GILT",
-                                             "Gilbert-Inseln Sommerzeit", "GILST",
-                                             "Gilbert-Inseln Zeit", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Tonga Zeit", "TOT",
-                                                "Tonga Sommerzeit", "TOST",
-                                                "Tonga Zeit", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"Wake Zeit", "WAKT",
-                                           "Wake Sommerzeit", "WAKST",
-                                           "Wake Zeit", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Wallis u. Futuna Zeit", "WFT",
-                                             "Wallis u. Futuna Sommerzeit", "WFST",
-                                             "Wallis u. Futuna Zeit", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java
deleted file mode 100644
index 0e35d5045d0..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_CA.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1996, 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.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_en_CA extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        return new Object[][] {
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java
deleted file mode 100644
index 43922dcb032..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_GB.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1996, 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.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_en_GB extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        return new Object[][] {
-            {"Europe/London", new String[] {"Greenwich Mean Time", "GMT",
-                                            "British Summer Time", "BST",
-                                            "British Time", "BT"}},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java
deleted file mode 100644
index e41f889190c..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_en_IE.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_en_IE extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        return new Object[][] {
-            {"Europe/London", new String[] {"Greenwich Mean Time", "GMT",
-                                    "Irish Summer Time", "IST", /*Dublin*/
-                                    "Irish Time", "IT" /*Dublin*/}},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
deleted file mode 100644
index 92dcaca5b1f..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_es extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Hora de Acre", "ACT",
-                                     "Hora de verano de Acre", "ACST",
-                                     "Hora de Acre", "ACT"};
-        String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "ACST",
-                                          "Hora de verano Central (Sur de Australia)", "ACDT",
-                                          "Hora Central (Australia del Sur)", "ACT"};
-        String AGT[] = new String[] {"Hora de Argentina", "ART",
-                                     "Hora de verano de Argentina", "ARST",
-                                     "Hora de Argentina", "ART"};
-        String AKST[] = new String[] {"Hora est\u00e1ndar de Alaska", "AKST",
-                                      "Hora de verano de Alaska", "AKDT",
-                                      "Hora de Alaska", "AKT"};
-        String AMT[] = new String[] {"Hora est\u00e1ndar de Amazonia", "AMT",
-                                     "Hora de verano de Amazonia", "AMST",
-                                     "Hora est\u00E1ndar de Amazonia", "AMT"};
-        String ARAST[] = new String[] {"Hora est\u00e1ndar de Arabia", "AST",
-                                       "Hora de verano de Arabia", "ADT",
-                                       "Hora de Arabia", "AT"};
-        String ARMT[] = new String[] {"Hora de Armenia", "AMT",
-                                      "Hora de verano de Armenia", "AMST",
-                                      "Hora de Armenia", "AMT"};
-        String AST[] = new String[] {"Hora est\u00e1ndar Atl\u00e1ntico", "AST",
-                                     "Hora de verano Atl\u00e1ntico", "ADT",
-                                     "Hora del Atl\u00E1ntico", "AT"};
-        String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
-                                     "Hora de verano de Bangladesh", "BDST",
-                                     "Hora de Bangladesh", "BDT"};
-        String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "AEST",
-                                          "Hora est\u00E1ndar de verano del Este (Queensland)", "AEDT",
-                                          "Hora Oriental (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "ACST",
-                                             "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "ACDT",
-                                             "Hora Central (Australia del Sur/Nueva Gales del Sur)", "ACT"};
-        String BRT[] = new String[] {"Hora de Brasil", "BRT",
-                                     "Hora de verano de Brasil", "BRST",
-                                     "Hora de Brasil", "BRT"};
-        String BTT[] = new String[] {"Hora de But\u00e1n", "BTT",
-                                     "Hora de verano de But\u00e1n", "BTST",
-                                     "Hora de But\u00E1n", "BTT"};
-        String CAT[] = new String[] {"Hora de \u00c1frica Central", "CAT",
-                                     "Hora de verano de \u00c1frica Central", "CAST",
-                                     "Hora de \u00C1frica Central", "CAT"};
-        String CET[] = new String[] {"Hora de Europa Central", "CET",
-                                     "Hora de verano de Europa Central", "CEST",
-                                     "Hora de Europa Central", "CET"};
-        String CHAST[] = new String[] {"Hora est\u00e1ndar de Chatham", "CHAST",
-                                       "Hora de verano de Chatham", "CHADT",
-                                       "Hora de Chatam", "CHAT"};
-        String CHUT[] = new String[] {"Hora de Chuuk", "CHUT",
-                                      "Hora de verano de Chuuk", "CHUST",
-                                      "Hora de Chuuk", "CHUT"};
-        String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
-                                     "Hora de verano de Indonesia Central", "CIST",
-                                     "Hora de Indonesia Central", "WITA"};
-        String CLT[] = new String[] {"Hora de Chile", "CLT",
-                                     "Hora de verano de Chile", "CLST",
-                                     "Hora de Chile", "CLT"};
-        String CST[] = new String[] {"Hora est\u00e1ndar Central", "CST",
-                                     "Hora de verano Central", "CDT",
-                                     "Hora Central", "CT"};
-        String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST",
-                                     "Hora de verano de China", "CDT",
-                                     "Hora de China", "CT"};
-        String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
-                                      "Hora de verano de Cuba", "CDT",
-                                      "Hora de Cuba", "CT"};
-        String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "ACST",
-                                        "Hora de verano Central (territorio del Norte)", "ACDT",
-                                        "Hora Central (Territorio Septentrional)", "ACT"};
-        String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                        "Hora de verano de Irlanda", "IST",
-                                        "Hora de Irlanda", "IT"};
-        String EAT[] = new String[] {"Hora de \u00c1frica Oriental", "EAT",
-                                     "Hora de verano de \u00c1frica Oriental", "EAST",
-                                     "Hora de \u00C1frica Oriental", "EAT"};
-        String EASTER[] = new String[] {"Hora de la Isla de Pascua", "EAST",
-                                        "Hora de verano de la Isla de Pascua", "EASST",
-                                        "Hora de la Isla de Pascua", "EAST"};
-        String EET[] = new String[] {"Hora de Europa Oriental", "EET",
-                                     "Hora de verano de Europa Oriental", "EEST",
-                                     "Hora de Europa Oriental", "EET"};
-        String EGT[] = new String[] {"Hora de Groenlandia Oriental", "EGT",
-                                     "Hora de verano de Groenlandia Oriental", "EGST",
-                                     "Hora de Groenlandia Oriental", "EGT"};
-        String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
-                                     "Hora de verano Oriental", "EDT",
-                                     "Hora Oriental", "ET"};
-        String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "AEST",
-                                         "Hora de verano Oriental (Nueva Gales del Sur)", "AEDT",
-                                         "Hora Oriental (Nueva Gales del Sur)", "AET"};
-        String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
-                                     "Hora de verano de Europa m\u00E1s Oriental", "FEST",
-                                     "Hora de Europa m\u00E1s Oriental", "FET"};
-        String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
-                                      "Hora de verano de Ghana", "GHST",
-                                      "Hora central de Ghana", "GMT"};
-        String GAMBIER[] =  new String[] {"Hora de Gambier", "GAMT",
-                                          "Hora de verano de Gambier", "GAMST",
-                                          "Hora de Gambier", "GAMT"};
-        String GMT[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                     "Hora del Meridiano de Greenwich", "GMT",
-                                     "Hora del Meridiano de Greenwich", "GMT"};
-        String GMTBST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                        "Hora de verano de Gran Breta\u00f1a", "BST",
-                                        "Hora de Gran Breta\u00F1a", "BT"};
-        String GST[] = new String[] {"Hora est\u00e1ndar del Golfo", "GST",
-                                     "Hora de verano del Golfo", "GDT",
-                                     "Hora del Golfo", "GT"};
-        String HKT[] =  new String[] {"Hora de Hong Kong", "HKT",
-                                      "Hora de verano de Hong Kong", "HKST",
-                                      "Hora de Hong Kong", "HKT"};
-        String HST[] = new String[] {"Hora est\u00e1ndar de Hawaii", "HST",
-                                     "Hora de verano de Hawaii", "HDT",
-                                     "Hora de Hawaii", "HT"};
-        String ICT[] = new String[] {"Hora de Indochina", "ICT",
-                                     "Hora de verano de Indochina", "ICST",
-                                     "Hora de Indochina", "ICT"};
-        String IRKT[] = new String[] {"Hora de Irkutsk", "IRKT",
-                                      "Hora de verano de Irkutsk", "IRKST",
-                                      "Hora de Irkutsk", "IRKT"};
-        String IRT[] = new String[] {"Hora est\u00e1ndar de Ir\u00e1n", "IRST",
-                                     "Hora de verano de Ir\u00e1n", "IRDT",
-                                     "Hora de Ir\u00E1n", "IRT"};
-        String ISRAEL[] = new String[] {"Hora est\u00e1ndar de Israel", "IST",
-                                        "Hora de verano de Israel", "IDT",
-                                        "Hora de Israel", "IT"};
-        String IST[] = new String[] {"Hora est\u00e1ndar de India", "IST",
-                                     "Hora de verano de India", "IDT",
-                                     "Hora de India", "IT"};
-        String JST[] = new String[] {"Hora est\u00e1ndar de Jap\u00f3n", "JST",
-                                     "Hora de verano de Jap\u00f3n", "JDT",
-                                     "Hora de Jap\u00F3n", "JT"};
-        String KRAT[] = new String[] {"Hora de Krasnoyarsk", "KRAT",
-                                      "Hora de verano de Krasnoyarsk", "KRAST",
-                                      "Hora de Krasnoyarsk", "KRAT"};
-        String KST[] = new String[] {"Hora est\u00e1ndar de Corea", "KST",
-                                     "Hora de verano de Corea", "KDT",
-                                     "Hora de Corea", "KT"};
-        String LORD_HOWE[] = new String[] {"Hora est\u00e1ndar de Lord Howe", "LHST",
-                                           "Hora de verano de Lord Howe", "LHDT",
-                                           "Hora de Lord Howe", "LHT"};
-        String MHT[] = new String[] {"Hora de las Islas Marshall", "MHT",
-                                     "Hora de verano de las Islas Marshall", "MHST",
-                                     "Hora de Islas Marshall", "MHT"};
-        String MMT[] = new String[] {"Hora de Myanmar", "MMT",
-                                     "Hora de verano de Myanmar", "MMST",
-                                     "Hora de Myanmar", "MMT"};
-        String MSK[] = new String[] {"Hora est\u00e1ndar de Mosc\u00fa", "MSK",
-                                     "Hora de verano de Mosc\u00fa", "MSD",
-                                     "Hora de Mosc\u00FA", "MT"};
-        String MST[] = new String[] {"Hora est\u00e1ndar de las Rocosas", "MST",
-                                     "Hora de verano de las Rocosas", "MDT",
-                                     "Hora de las Monta\u00F1as Rocosas", "MT"};
-        String MYT[] = new String[] {"Hora de Malasia", "MYT",
-                                     "Hora de verano de Malasia", "MYST",
-                                     "Hora de Malasia", "MYT"};
-        String NORONHA[] = new String[] {"Hora de Fernando de Noronha", "FNT",
-                                         "Hora de verano de Fernando de Noronha", "FNST",
-                                         "Hora de Fernando de Noronha", "FNT"};
-        String NOVT[] = new String[] {"Hora de Novosibirsk", "NOVT",
-                                      "Hora de verano de Novosibirsk", "NOVST",
-                                      "Hora de Novosibirsk", "NOVT"};
-        String NPT[] = new String[] {"Hora de Nepal", "NPT",
-                                     "Hora de verano de Nepal", "NPST",
-                                     "Hora de Nepal", "NPT"};
-        String NST[] = new String[] {"Hora est\u00e1ndar de Terranova", "NST",
-                                     "Hora de verano de Terranova", "NDT",
-                                     "Hora de Terranova", "NT"};
-        String NZST[] = new String[] {"Hora est\u00e1ndar de Nueva Zelanda", "NZST",
-                                      "Hora de verano de Nueva Zelanda", "NZDT",
-                                      "Hora de Nueva Zelanda", "NZT"};
-        String PITCAIRN[] = new String[] {"Hora est\u00e1ndar de Pitcairn", "PST",
-                                          "Hora de verano de Pitcairn", "PDT",
-                                          "Hora de Islas Pitcairn", "PT"};
-        String PKT[] = new String[] {"Hora de Pakist\u00e1n", "PKT",
-                                     "Hora de verano de Pakist\u00e1n", "PKST",
-                                     "Hora de Pakist\u00E1n", "PKT"};
-        String PONT[] = new String[] {"Hora de Pohnpei", "PONT",
-                                      "Hora de verano de Pohnpei", "PONST",
-                                      "Hora de Pohnpei", "PONT"};
-        String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST",
-                                     "Hora de verano del Pac\u00edfico", "PDT",
-                                     "Hora del Pac\u00EDfico", "PT"};
-        String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST",
-                                      "Hora de verano de Sud\u00e1frica", "SAST",
-                                      "Hora de Sud\u00E1frica", "SAT"};
-        String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT",
-                                     "Hora de verano de las Islas Solomon", "SBST",
-                                     "Hora de las Islas Solomon", "SBT"};
-        String SGT[] = new String[] {"Hora de Singapur", "SGT",
-                                     "Hora de verano de  Singapur", "SGST",
-                                     "Hora de Singapur", "SGT"};
-        String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "AEST",
-                                          "Hora de verano del Este (Tasmania)", "AEDT",
-                                          "Hora Oriental (Tasmania)", "AET"};
-        String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
-                                     "Hora de verano de Turkmenist\u00e1n", "TMST",
-                                     "Hora de Turkmenist\u00E1n", "TMT"};
-        String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT",
-                                     "Hora de verano de Ulan Bator", "ULAST",
-                                     "Hora de Ulan Bator", "ULAT"};
-        String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT",
-                                     "Hora de verano de \u00c1frica Occidental", "WAST",
-                                     "Hora de \u00C1frica Occidental", "WAT"};
-        String WET[] = new String[] {"Hora de Europa Occidental", "WET",
-                                     "Hora de verano de Europa Occidental", "WEST",
-                                     "Hora de Europa Occidental", "WET"};
-        String WGT[] = new String[] {"Hora de Groenlandia Occidental", "WGT",
-                                     "Hora de verano de Groenlandia Occidental", "WGST",
-                                     "Hora de Groenlandia Occidental", "WGT"};
-        String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
-                                     "Indonesia Hora de verano de Indonesia Occidental", "WIST",
-                                     "Hora de Indonesia Occidental", "WIB"};
-        String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "AWST",
-                                         "Hora de verano Occidental (Australia)", "AWDT",
-                                         "Hora Occidental (Australia)", "AWT"};
-        String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
-                                       "Hora de verano de Samoa", "SDT",
-                                       "Hora de Samoa", "ST"};
-        String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WSST",
-                                           "Hora de verano de Samoa Occidental", "WSDT",
-                                           "Hora de Samoa Occidental", "WST"};
-        String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
-                                      "Hora de verano de Chamorro", "ChDT",
-                                      "Hora de Chamorro", "ChT"};
-        String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "AEST",
-                                          "Hora de verano del Este (Victoria)", "AEDT",
-                                          "Hora Oriental (Victoria)", "AET"};
-        String UTC[] = new String[] {"Hora Universal Coordinada", "UTC",
-                                     "Hora Universal Coordinada", "UTC",
-                                     "Hora Universal Coordinada", "UTC"};
-        String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
-                                     "Hora de verano de Uzbekist\u00e1n", "UZST",
-                                     "Hora de Uzbekist\u00E1n", "UZT"};
-        String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
-                                     "Hora de verano de China", "XJDT",
-                                     "Hora de China", "XJT"};
-        String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT",
-                                      "Hora de verano de Yakutsk", "YAKST",
-                                      "Hora de Yakutsk", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Hora de Paraguay", "PYT",
-                                               "Hora de verano de Paraguay", "PYST",
-                                               "Hora de Paraguay", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Hora de Colombia", "COT",
-                                             "Hora de verano de Colombia", "COST",
-                                             "Hora de Colombia", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Hora de Venezuela", "VET",
-                                              "Hora de verano de Venezuela", "VEST",
-                                              "Hora de Venezuela", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Hora de la Guayana Francesa", "GFT",
-                                              "Hora de verano de la Guayana Francesa", "GFST",
-                                              "Hora de la Guayana Francesa", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Hora de Ecuador", "ECT",
-                                                "Hora de verano de Ecuador", "ECST",
-                                                "Hora de Ecuador", "ECT"}},
-            {"America/Guyana", new String[] {"Hora de Guyana", "GYT",
-                                             "Hora de verano de Guyana", "GYST",
-                                             "Hora de Guyana", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Hora de Bolivia", "BOT",
-                                             "Hora de verano de Bolivia", "BOST",
-                                             "Hora de Bolivia", "BOT"}},
-            {"America/Lima", new String[] {"Hora de Per\u00fa", "PET",
-                                           "Hora de verano de Per\u00fa", "PEST",
-                                           "Hora de Per\u00FA", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
-                                               "Hora de verano de Pierre & Miquelon", "PMDT",
-                                               "Hora de San Pedro y Miquel\u00F3n", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Hora de Uruguay", "UYT",
-                                                 "Hora de verano de Uruguay", "UYST",
-                                                 "Hora de Uruguay", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Hora de Surinam", "SRT",
-                                                 "Hora de verano de Surinam", "SRST",
-                                                 "Hora de Surinam", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Hora de Davis", "DAVT",
-                                               "Hora de verano de Davis", "DAVST",
-                                               "Hora de Davis", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Hora de Dumont-d'Urville", "DDUT",
-                                                        "Hora de verano de Dumont-d'Urville", "DDUST",
-                                                        "Hora de Dumont-d'Urville", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT",
-                                                "Hora de verano de Mawson", "MAWST",
-                                                "Hora de Mawson", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Hora de Rothera", "ROTT",
-                                                 "Hora de verano de Rothera", "ROTST",
-                                                 "Hora de Rothera", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
-                                               "Hora de verano de Syowa", "SYOST",
-                                               "Hora de Syowa", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC",
-                                               "Hora de verano de Europa Central", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
-                                                "Hora de verano de Vostok", "VOSST",
-                                                "Hora de Vostok", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Hora de Alma-Ata", "ALMT",
-                                          "Hora de verano de Alma-Ata", "ALMST",
-                                          "Hora de Alma-Ata", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT",
-                                          "Hora de verano de Anadyr", "ANAST",
-                                          "Hora de Anadyr", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT",
-                                         "Hora de verano de Aqtau", "AQTST",
-                                         "Hora de Aqtau", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Hora de Aqtobe", "AQTT",
-                                          "Hora de verano de Aqtobe", "AQTST",
-                                          "Hora de Aqtobe", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Hora de Azerbaiy\u00e1n", "AZT",
-                                        "Hora de verano de Azerbaiy\u00e1n", "AZST",
-                                        "Hora de Azerbaiy\u00E1n", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Hora de Kirguizist\u00e1n", "KGT",
-                                           "Hora de verano de Kirguizist\u00e1n", "KGST",
-                                           "Hora de Kirguizist\u00E1n", "KGT"}},
-            {"Asia/Brunei", new String[] {"Hora de Brunei", "BNT",
-                                          "Hora de verano de Brunei", "BNST",
-                                          "Hora de Brunei", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
-                                              "Hora de verano de Choibalsan", "CHOST",
-                                              "Hora de Choibalsan", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Hora de Timor Leste", "TLT",
-                                        "Hora de verano de Timor Leste", "TLST",
-                                        "Hora de Timor Leste", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Hora de Tajikist\u00e1n", "TJT",
-                                            "Hora de verano de Tajikist\u00e1n", "TJST",
-                                            "Hora de Tajikist\u00E1n", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
-                                        "Hora de verano de Hovd", "HOVST",
-                                        "Hora de Hovd", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
-                                            "Hora de verano de Indonesia Oriental", "EIST",
-                                            "Hora de Indonesia Oriental", "WIT"}},
-            {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
-                                         "Hora de verano de Afganist\u00e1n", "AFST",
-                                         "Hora de Afganist\u00E1n", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Hora de Petropavlovsk-Kamchatski", "PETT",
-                                             "Hora de verano de Petropavlovsk-Kamchatski", "PETST",
-                                             "Hora de Petropavlovsk-Kamchatski", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Hora de Magad\u00e1n", "MAGT",
-                                           "Hora de verano de Magad\u00e1n", "MAGST",
-                                           "Hora de Magad\u00E1n", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT",
-                                        "Hora de verano de Uralsk", "ORAST",
-                                        "Hora de Uralsk", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Hora de Omsk", "OMST",
-                                        "Hora de verano de Omsk", "OMSST",
-                                        "Hora de Omsk", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Hora de Qyzylorda", "QYZT",
-                                             "Hora de verano de Qyzylorda", "QYZST",
-                                             "Hora de Qyzylorda", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Hora de Sajalin", "SAKT",
-                                            "Hora de verano de Sajalin", "SAKST",
-                                            "Hora de Sajalin", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Hora de Georgia", "GET",
-                                           "Hora de verano de Georgia", "GEST",
-                                           "Hora de Georgia", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
-                                            "Hora de verano de Ust-Nera", "VLAST",
-                                            "Hora de Ust-Nera", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT",
-                                               "Hora de verano de Vladivostok", "VLAST",
-                                               "Hora de Vladivostok", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT",
-                                                 "Hora de verano de Ekaterinburgo", "YEKST",
-                                                 "Hora de Ekaterinburgo", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Hora de Azores", "AZOT",
-                                              "Hora de verano de Azores", "AZOST",
-                                              "Hora de Azores", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Hora de Cabo Verde", "CVT",
-                                                  "Hora de verano de Cabo Verde", "CVST",
-                                                  "Hora de Cabo Verde", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"Hora est\u00e1ndar de Georgia del Sur", "GST",
-                                                     "Hora de verano de Georgia del Sur", "GDT",
-                                                     "Hora de Georgia del Sur", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Hora de las islas Malvinas", "FKT",
-                                               "Hora de verano de las islas Malvinas", "FKST",
-                                               "Hora de las islas Malvinas", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "ACWST",
-                                              "Hora est\u00E1ndar de verano de Australia Central y Occidental", "ACWDT",
-                                              "Hora de Australia Central y Occidental", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Hora de Samara", "SAMT",
-                                            "Hora de verano de Samara", "SAMST",
-                                            "Hora de Samara", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Hora del Territorio del Oc\u00e9ano \u00cdndico", "IOT",
-                                            "Hora de verano del Territorio del Oc\u00e9ano \u00cdndico", "IOST",
-                                            "Hora del Territorio del Oc\u00E9ano \u00CDndico", "IOT"}},
-            {"Indian/Christmas", new String[] {"Hora de la isla de Christmas", "CXT",
-                                               "Hora de verano de la isla de Christmas", "CXST",
-                                               "Hora de la isla de Christmas", "CIT"}},
-            {"Indian/Cocos", new String[] {"Hora de las islas Cocos", "CCT",
-                                           "Hora de verano de las islas Cocos", "CCST",
-                                           "Hora de las islas Cocos", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Hora de los Territorios Franceses del Sur y de la Ant\u00e1rtida", "TFT",
-                                               "Hora de verano de los Territorios Franceses del Sur y de la Ant\u00e1rtida", "TFST",
-                                               "Hora de los Territorios Franceses del Sur y de la Ant\u00E1rtida", "TFT"}},
-            {"Indian/Mahe", new String[] {"Hora de Seychelles", "SCT",
-                                          "Hora de verano de Seychelles", "SCST",
-                                          "Hora de Seychelles", "SCT"}},
-            {"Indian/Maldives", new String[] {"Hora de Maldivas", "MVT",
-                                              "Hora de verano de Maldivas", "MVST",
-                                              "Hora de Maldivas", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Hora de Mauricio", "MUT",
-                                               "Hora de verano de Mauricio", "MUST",
-                                               "Hora de Mauricio", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Hora de Reuni\u00f3n", "RET",
-                                             "Hora de verano de Reuni\u00f3n", "REST",
-                                             "Hora de Reuni\u00F3n", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Hora de Vanuatu", "VUT",
-                                            "Hora de verano de Vanuatu", "VUST",
-                                            "Hora de Vanuatu", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Hora de la isla Phoenix", "PHOT",
-                                                "Hora de verano de la isla Phoenix", "PHOST",
-                                                "Hora de la isla Phoenix", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Hora de Tokelau", "TKT",
-                                              "Hora de verano de Tokelau", "TKST",
-                                              "Hora de Tokelau", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Hora de Fiji", "FJT",
-                                           "Hora de verano de Fiji", "FJST",
-                                           "Hora de Fiji", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Hora de Tuvalu", "TVT",
-                                               "Hora de verano de Tuvalu", "TVST",
-                                               "Hora de Tuvalu", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Hora de Gal\u00e1pagos", "GALT",
-                                                "Hora de verano de Gal\u00e1pagos", "GALST",
-                                                "Hora de Gal\u00E1pagos", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Hora de las islas Line", "LINT",
-                                                 "Hora de verano de las islas Line", "LINST",
-                                                 "Hora de las islas Line", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Hora de Kosrae", "KOST",
-                                             "Hora de verano de Kosrae", "KOSST",
-                                             "Hora de Kosrae", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Hora de Marquesas", "MART",
-                                                "Hora de verano de Marquesas", "MARST",
-                                                "Hora de Marquesas", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Hora de Nauru", "NRT",
-                                            "Hora de verano de Nauru", "NRST",
-                                            "Hora de Nauru", "NRT"}},
-            {"Pacific/Niue", new String[] {"Hora de Niue", "NUT",
-                                           "Hora de verano de Niue", "NUST",
-                                           "Hora de Niue", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Hora de Norfolk", "NFT",
-                                              "Hora de verano de Norfolk", "NFST",
-                                              "Hora de Norfolk", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Hora de Nueva Caledonia", "NCT",
-                                             "Hora de verano de Nueva Caledonia", "NCST",
-                                             "Hora de Nueva Caledonia", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Hora de Palau", "PWT",
-                                            "Hora de verano de Palau", "PWST",
-                                            "Hora de Palau", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Hora de Pap\u00faa-Nueva Guinea", "PGT",
-                                                   "Hora de verano de Pap\u00faa-Nueva Guinea", "PGST",
-                                                   "Hora de Pap\u00FAa-Nueva Guinea", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Hora de las islas Cook", "CKT",
-                                                "Hora de verano de las islas Cook", "CKHST",
-                                                "Hora de las islas Cook", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Hora de Tahit\u00ed", "TAHT",
-                                             "Hora de verano de Tahit\u00ed", "TAHST",
-                                             "Hora de Tahit\u00ED", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Hora de las islas Gilbert", "GILT",
-                                             "Hora de verano de las islas Gilbert", "GILST",
-                                             "Hora de las islas Gilbert", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Hora de Tonga", "TOT",
-                                                "Hora de verano de Tonga", "TOST",
-                                                "Hora de Tonga", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"Hora de Wake", "WAKT",
-                                           "Hora de verano de Wake", "WAKST",
-                                           "Hora de Wake", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Hora de Wallis y Futuna", "WFT",
-                                             "Hora de verano de Wallis y Futuna", "WFST",
-                                             "Hora de Wallis y Futuna", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
deleted file mode 100644
index 7eb166300c2..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Heure de l'Acre", "ACT",
-                                     "Heure d'\u00e9t\u00e9 de l'Acre", "ACST",
-                                     "Heure de l'Acre", "ACT"};
-        String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "ACST",
-                                          "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "ACDT",
-                                          "Centre (Australie-M\u00E9ridionale)", "ACT"};
-        String AGT[] = new String[] {"Heure D'Argentine", "ART",
-                                     "Heure d'\u00e9t\u00e9 D'Argentine", "ARST",
-                                     "Heure d'Argentine", "ART"} ;
-        String AKST[] = new String[] {"Heure normale d'Alaska", "AKST",
-                                      "Heure avanc\u00e9e d'Alaska", "AKDT",
-                                      "Alaska", "AKT"} ;
-        String AMT[] = new String[] {"Heure normale d'Amazonie", "AMT",
-                                     "Heure d'\u00e9t\u00e9 d'Amazonie", "AMST",
-                                     "Heure d'Amazonie", "AMT"} ;
-        String ARAST[] = new String[] {"Heure normale d'Arabie", "AST",
-                                       "Heure avanc\u00e9e d'Arabie", "ADT",
-                                       "Arabie", "AT"} ;
-        String ARMT[] = new String[] {"Heure d'Arm\u00e9nie", "AMT",
-                                      "Heure d'\u00e9t\u00e9 d'Arm\u00e9nie", "AMST",
-                                      "Heure d'Arm\u00E9nie", "AMT"} ;
-        String AST[] = new String[] {"Heure normale de l'Atlantique", "AST",
-                                     "Heure avanc\u00e9e de l'Atlantique", "ADT",
-                                     "Atlantique", "AT"} ;
-        String BDT[] = new String[] {"Heure du Bangladesh", "BDT",
-                                     "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST",
-                                     "Heure du Bangladesh", "BDT"} ;
-        String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "AEST",
-                                          "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "AEDT",
-                                          "C\u00F4te Est (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACST",
-                                             "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "ACDT",
-                                             "Centre (Australie-M\u00E9ridionale/Nouvelle-Galles du Sud)", "ACT"};
-        String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT",
-                                     "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST",
-                                     "Heure du Br\u00E9sil", "BRT"} ;
-        String BTT[] = new String[] {"Heure du Bhoutan", "BTT",
-                                     "Heure d'\u00e9t\u00e9 du Bhoutan", "BTST",
-                                     "Heure du Bhoutan", "BTT"} ;
-        String CAT[] = new String[] {"Heure d'Afrique centrale", "CAT",
-                                     "Heure d'\u00e9t\u00e9 d'Afrique centrale", "CAST",
-                                     "Heure d'Afrique centrale", "CAT"} ;
-        String CET[] = new String[] {"Heure d'Europe centrale", "CET",
-                                     "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST",
-                                     "Heure d'Europe centrale", "CET"} ;
-        String CHAST[] = new String[] {"Heure standard de Chatham", "CHAST",
-                                       "Heure avanc\u00e9e de Chatham", "CHADT",
-                                       "Chatham", "CHAT"};
-        String CHUT[] = new String[] {"Heure de Chuuk", "CHUT",
-                                      "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST",
-                                      "Heure de Chuuk", "CHUT"};
-        String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA",
-                                     "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST",
-                                     "Heure d'Indon\u00E9sie centrale", "WITA"};
-        String CLT[] = new String[] {"Heure du Chili", "CLT",
-                                     "Heure d'\u00e9t\u00e9 du Chili", "CLST",
-                                     "Heure du Chili", "CLT"} ;
-        String CST[] = new String[] {"Heure normale du Centre", "CST",
-                                     "Heure avanc\u00e9e du Centre", "CDT",
-                                     "Centre", "CT"} ;
-        String CTT[] = new String[] {"Heure normale de Chine", "CST",
-                                     "Heure avanc\u00e9e de Chine", "CDT",
-                                     "Chine", "CT"} ;
-        String CUBA[] = new String[] {"Heure standard de Cuba", "CST",
-                                      "Heure d'\u00e9t\u00e9 de Cuba", "CDT",
-                                      "Heure de Cuba", "CT"};
-        String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "ACST",
-                                        "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "ACDT",
-                                        "Centre (Territoire du Nord)", "ACT"};
-        String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
-                                        "Heure d'\u00e9t\u00e9 irlandaise", "IST",
-                                        "Heure irlandaise", "IT"};
-        String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT",
-                                     "Heure d'\u00e9t\u00e9 d'Afrique de l'Est", "EAST",
-                                     "Heure d'Afrique de l'Est", "EAT"} ;
-        String EASTER[] = new String[] {"Heure de l'Ile de P\u00e2ques", "EAST",
-                                        "Heure d'\u00e9t\u00e9 de l'Ile de P\u00e2ques", "EASST",
-                                        "Heure de l'Ile de P\u00E2ques", "EAST"};
-        String EET[] = new String[] {"Heure d'Europe de l'Est", "EET",
-                                     "Heure d'\u00e9t\u00e9 d'Europe de l'Est", "EEST",
-                                     "Heure d'Europe de l'Est", "EET"} ;
-        String EGT[] = new String[] {"Heure du Groenland de l'Est", "EGT",
-                                     "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST",
-                                     "Heure du Groenland de l'Est", "EGT"} ;
-        String EST[] = new String[] {"Heure normale de l'Est", "EST",
-                                     "Heure avanc\u00e9e de l'Est", "EDT",
-                                     "C\u00F4te Est", "ET"} ;
-        String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "AEST",
-                                         "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "AEDT",
-                                         "C\u00F4te Est (Nouvelle-Galles du Sud)", "AET"} ;
-        String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET",
-                                     "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST",
-                                     "Heure d'Europe de l'Est UTC+3", "FET"};
-        String GHMT[] = new String[] {"Heure du Ghana", "GMT",
-                                      "Heure d'\u00e9t\u00e9 du Ghana", "GHST",
-                                      "Heure du Ghana", "GMT"};
-        String GAMBIER[] =  new String[] {"Heure de Gambi", "GAMT",
-                                          "Heure d'\u00e9t\u00e9 de Gambi", "GAMST",
-                                          "Heure de Gambi", "GAMT"};
-        String GMT[] = new String[] {"Heure de Greenwich", "GMT",
-                                   "Heure de Greenwich", "GMT",
-                                   "Heure de Greenwich", "GMT"} ;
-        String GMTBST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT",
-                                        "Heure d'\u00e9t\u00e9 britannique", "BST",
-                                        "Heure britannique", "BT"};
-        String GST[] = new String[] {"Heure normale du Golfe", "GST",
-                                     "Heure avanc\u00e9e du Golfe", "GDT",
-                                     "Golfe", "GT"} ;
-        String HKT[] =  new String[] {"Heure de Hong Kong", "HKT",
-                                      "Heure d'\u00e9t\u00e9 de Hong Kong", "HKST",
-                                      "Heure de Hong-Kong", "HKT"};
-        String HST[] = new String[] {"Heure normale d'Hawa\u00ef", "HST",
-                                     "Heure avanc\u00e9e d'Hawa\u00ef", "HDT",
-                                     "Hawa\u00EF", "HT"} ;
-        String ICT[] = new String[] {"Heure d'Indochine", "ICT",
-                                     "Heure d'\u00e9t\u00e9 d'Indochine", "ICST",
-                                     "Heure d'Indochine", "ICT"} ;
-        String IRKT[] = new String[] {"Heure d'Irkutsk", "IRKT",
-                                      "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST",
-                                      "Heure d'Irkutsk", "IRKT"};
-        String IRT[] = new String[] {"Heure normale d'Iran", "IRST",
-                                     "Heure avanc\u00e9e d'Iran", "IRDT",
-                                     "Heure d'Iran", "IRT"} ;
-        String ISRAEL[] = new String[] {"Heure standard d'Isra\u00ebl", "IST",
-                                        "Heure avanc\u00e9e d'Isra\u00ebl", "IDT",
-                                        "Isra\u00EBl", "IT"};
-        String IST[] = new String[] {"Heure normale d'Inde", "IST",
-                                     "Heure avanc\u00e9e d'Inde", "IDT",
-                                     "Inde", "IT"} ;
-        String JST[] = new String[] {"Heure normale du Japon", "JST",
-                                     "Heure avanc\u00e9e du Japon", "JDT",
-                                     "Japon", "JT"} ;
-        String KRAT[] = new String[] {"Heure de Krasno\u00efarsk", "KRAT",
-                                      "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST",
-                                      "Heure de Krasno\u00EFarsk", "KRAT"};
-        String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST",
-                                     "Heure avanc\u00e9e de Cor\u00e9e", "KDT",
-                                     "Cor\u00E9e", "KT"} ;
-        String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST",
-                                           "Heure d'\u00e9t\u00e9 de Lord Howe", "LHDT",
-                                           "Heure de Lord Howe", "LHT"};
-        String MHT[] = new String[] {"Heure des Iles Marshall", "MHT",
-                                     "Heure d'\u00e9t\u00e9 des Iles Marshall", "MHST",
-                                     "Heure des Iles Marshall", "MHT"};
-        String MMT[] = new String[] {"Heure de Myanmar", "MMT",
-                                     "Heure d'\u00e9t\u00e9 de Myanmar", "MMST",
-                                     "Heure de Myanmar", "MMT"};
-        String MSK[] = new String[] {"Heure standard de Moscou", "MSK",
-                                     "Heure avanc\u00e9e de Moscou", "MSD",
-                                     "Moscou", "MT"};
-        String MST[] = new String[] {"Heure normale des Rocheuses", "MST",
-                                     "Heure avanc\u00e9e des Rocheuses", "MDT",
-                                     "Rocheuses", "MT"} ;
-        String MYT[] = new String[] {"Heure de Malaisie", "MYT",
-                                     "Heure d'\u00e9t\u00e9 de Malaisie", "MYST",
-                                     "Heure de Malaisie", "MYT"};
-        String NORONHA[] = new String[] {"Heure de Fernando de Noronha", "FNT",
-                                         "Heure d'\u00e9t\u00e9 de Fernando de Noronha", "FNST",
-                                         "Heure de Fernando de Noronha", "FNT"};
-        String NOVT[] = new String[] {"Heure de Novossibirsk", "NOVT",
-                                      "Heure d'\u00e9t\u00e9 de Novossibirsk", "NOVST",
-                                      "Heure de Novossibirsk", "NOVT"};
-        String NPT[] = new String[] {"Heure du N\u00e9pal", "NPT",
-                                     "Heure d'\u00e9t\u00e9 du N\u00e9pal", "NPST",
-                                     "Heure du N\u00E9pal", "NPT"};
-        String NST[] = new String[] {"Heure normale de Terre-Neuve", "NST",
-                                     "Heure avanc\u00e9e de Terre-Neuve", "NDT",
-                                     "Terre-Neuve", "NT"} ;
-        String NZST[] = new String[] {"Heure normale de Nouvelle-Z\u00e9lande", "NZST",
-                                      "Heure avanc\u00e9e de Nouvelle-Z\u00e9lande", "NZDT",
-                                      "Nouvelle-Z\u00E9lande", "NZT"} ;
-        String PITCAIRN[] = new String[] {"Heure standard des Pitcairn", "PST",
-                                          "heure avanc\u00e9e des Pitcairn", "PDT",
-                                          "Pitcairn", "PT"};
-        String PKT[] = new String[] {"Heure du Pakistan", "PKT",
-                                     "Heure d'\u00e9t\u00e9 du Pakistan", "PKST",
-                                     "Heure du Pakistan", "PKT"} ;
-        String PONT[] = new String[] {"Heure de Pohnpei", "PONT",
-                                      "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST",
-                                      "Ponape", "PONT"};
-        String PST[] = new String[] {"Heure normale du Pacifique", "PST",
-                                     "Heure avanc\u00e9e du Pacifique", "PDT",
-                                     "Pacifique", "PT"} ;
-        String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST",
-                                      "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST",
-                                      "Afrique du Sud", "SAT"} ;
-        String SBT[] = new String[] {"Heure des \u00celes Salomon", "SBT",
-                                     "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST",
-                                     "Heure des Iles Salomon", "SBT"} ;
-        String SGT[] = new String[] {"Heure de Singapour", "SGT",
-                                     "Heure d'\u00e9t\u00e9 de Singapour", "SGST",
-                                     "Heure de Singapour", "SGT"};
-        String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "AEST",
-                                          "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "AEDT",
-                                          "C\u00F4te Est (Tasmanie)", "AET"};
-        String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT",
-                                     "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST",
-                                     "Heure du Turkm\u00E9nistan", "TMT"} ;
-        String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT",
-                                     "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST",
-                                     "Heure de l'Ulaanbaatar", "ULAT"} ;
-        String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT",
-                                     "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST",
-                                     "Heure d'Afrique de l'Ouest", "WAT"} ;
-        String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET",
-                                     "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST",
-                                     "Heure d'Europe de l'Ouest", "WET"} ;
-        String WGT[] = new String[] {"Heure du Groenland de l'Ouest", "WGT",
-                                     "Heure d'\u00e9t\u00e9 du Groenland de l'Ouest", "WGST",
-                                     "Heure du Groenland de l'Ouest", "WGT"};
-        String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB",
-                                     "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST",
-                                     "Heure de l'Indon\u00E9sie occidentale", "WIB"};
-        String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "AWST",
-                                         "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "AWDT",
-                                         "Ouest (Australie)", "AWT"} ;
-        String SAMOA[] = new String[] {"Heure standard de Samoa", "SST",
-                                       "Heure avanc\u00e9e de Samoa", "SDT",
-                                       "Samoa", "ST"};
-        String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WSST",
-                                           "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT",
-                                           "Heure des Samoas occidentales", "WST"} ;
-        String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST",
-                      "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT",
-                      "Chamorro", "ChT"};
-        String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "AEST",
-                                          "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "AEDT",
-                                          "C\u00F4te Est (Victoria)", "AET"};
-        String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC",
-                                     "Temps universel coordonn\u00e9", "UTC",
-                                     "Temps universel coordonn\u00E9", "UTC"};
-        String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT",
-                                     "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST",
-                                     "Heure de l'Ouzb\u00E9kistan", "UZT"};
-        String XJT[] = new String[] {"Heure normale de Chine", "XJT",
-                                     "Heure avanc\u00e9e de Chine", "XJDT",
-                                     "Chine", "XJT"};
-        String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
-                                      "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST",
-                                      "Heure du Iakoutsk", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Heure du Paraguay", "PYT",
-                                               "Heure d'\u00e9t\u00e9 du Paraguay", "PYST",
-                                               "Heure du Paraguay", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Heure de Colombie", "COT",
-                                             "Heure d'\u00e9t\u00e9 de Colombie", "COST",
-                                             "Heure de Colombie", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Heure du Venezuela", "VET",
-                                              "Heure d'\u00e9t\u00e9 du Venezuela", "VEST",
-                                              "Heure du Venezuela", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Heure de Guyane fran\u00e7aise", "GFT",
-                                              "Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST",
-                                              "Heure de Guyane fran\u00E7aise", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Heure de l'\u00c9quateur", "ECT",
-                                                "Heure d'\u00e9t\u00e9 de l'\u00c9quateur", "ECST",
-                                                "Heure de l'Equateur", "ECT"}},
-            {"America/Guyana", new String[] {"Heure de Guyana", "GYT",
-                                             "Heure d'\u00e9t\u00e9 de Guyana", "GYST",
-                                             "Heure de Guyana", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Heure de Bolivie", "BOT",
-                                             "Heure d'\u00e9t\u00e9 de Bolivie", "BOST",
-                                             "Heure de Bolivie", "BOT"}},
-            {"America/Lima", new String[] {"Heure du P\u00e9rou", "PET",
-                                           "Heure d'\u00e9t\u00e9 du P\u00e9rou", "PEST",
-                                           "Heure du P\u00E9rou", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
-                                               "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT",
-                                               "Saint-Pierre-et-Miquelon", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Heure de l'Uruguay", "UYT",
-                                                 "Heure d'\u00e9t\u00e9 de l'Uruguay", "UYST",
-                                                 "Heure de l'Uruguay", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Heure du Surinam", "SRT",
-                                                 "Heure d'\u00e9t\u00e9 du Surinam", "SRST",
-                                                 "Heure du Surinam", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Heure de Davis", "DAVT",
-                                               "Heure d'\u00e9t\u00e9 de Davis", "DAVST",
-                                               "Heure de Davis", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT",
-                                                        "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST",
-                                                        "Heure de Dumont-d'Urville", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT",
-                                                "Heure d'\u00e9t\u00e9 de Mawson", "MAWST",
-                                                "Heure de Mawson", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Heure de Rothera", "ROTT",
-                                                 "Heure d'\u00e9t\u00e9 de Rothera", "ROTST",
-                                                 "Heure de Rothera", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT",
-                                               "Heure d'\u00e9t\u00e9 de Syowa", "SYOST",
-                                               "Heure de Syowa", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC",
-                                               "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST",
-                                                "Heure d'\u00e9t\u00e9 de Vostok", "VOSST",
-                                                "Heure de Vostok", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Heure d'Alma-Ata", "ALMT",
-                                          "Heure d'\u00e9t\u00e9 d'Alma-Ata", "ALMST",
-                                          "Heure d'Alma-Ata", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Heure d'Anadyr", "ANAT",
-                                          "Heure d'\u00e9t\u00e9 d'Anadyr", "ANAST",
-                                          "Heure d'Anadyr", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Heure d'Aqtau", "AQTT",
-                                         "Heure d'\u00e9t\u00e9 d'Aqtau", "AQTST",
-                                         "Heure d'Aqtau", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Heure d'Aqtobe", "AQTT",
-                                          "Heure d'\u00e9t\u00e9 d'Aqtobe", "AQTST",
-                                          "Heure d'Aqtobe", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Heure d'Azerba\u00efdjan", "AZT",
-                                        "Heure d'\u00e9t\u00e9 d'Azerba\u00efdjan", "AZST",
-                                        "Heure d'Azerba\u00EFdjan", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Heure du Kirghizistan", "KGT",
-                                           "Heure d'\u00e9t\u00e9 du Kirghizistan", "KGST",
-                                           "Heure du Kirghizistan", "KGT"}},
-            {"Asia/Brunei", new String[] {"Heure du Brunei", "BNT",
-                                          "Heure d'\u00e9t\u00e9 du Brunei", "BNST",
-                                          "Heure du Brunei", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
-                                              "Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST",
-                                              "Heure de Choibalsan", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Heure de Timor-Leste", "TLT",
-                                        "Heure d'\u00e9t\u00e9 de Timor-Leste", "TLST",
-                                        "Heure de Timor-Leste", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Heure du Tadjikistan", "TJT",
-                                            "Heure d'\u00e9t\u00e9 du Tadjikistan", "TJST",
-                                            "Heure du Tadjikistan", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
-                                        "Heure d'\u00e9t\u00e9 de Hovd", "HOVST",
-                                        "Heure de Hovd", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT",
-                                            "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST",
-                                            "Heure d'Indon\u00E9sie orientale", "WIT"}},
-            {"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT",
-                                         "Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST",
-                                         "Heure d'Afghanistan", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Heure de Petropavlovsk-Kamchatski", "PETT",
-                                             "Heure d'\u00e9t\u00e9 de Petropavlovsk-Kamchatski", "PETST",
-                                             "Heure de Petropavlovsk-Kamchatski", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Heure de Magadan", "MAGT",
-                                           "Heure d'\u00e9t\u00e9 de Magadan", "MAGST",
-                                           "Heure de Magadan", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Heure d'Oral", "ORAT",
-                                        "Heure d'\u00e9t\u00e9 d'Oral", "ORAST",
-                                        "Heure d'Oral", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Heure d'Omsk", "OMST",
-                                        "Heure d'\u00e9t\u00e9 d'Omsk", "OMSST",
-                                        "Heure d'Omsk", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Heure de Kyzylorda", "QYZT",
-                                             "Heure d'\u00e9t\u00e9 de Kyzylorda", "QYZST",
-                                             "Heure de Kyzylorda", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Heure de Sakhalin", "SAKT",
-                                            "Heure d'\u00e9t\u00e9 de Sakhalin", "SAKST",
-                                            "Heure de Sakhalin", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Heure de G\u00e9orgie", "GET",
-                                           "Heure d'\u00e9t\u00e9 de G\u00e9orgie", "GEST",
-                                           "Heure de G\u00E9orgie", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT",
-                                            "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST",
-                                            "Heure d'Ust-Nera", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT",
-                                               "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST",
-                                               "Heure de Vladivostok", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT",
-                                                 "Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST",
-                                                 "Heure de Yekaterinburg", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Heure des A\u00e7ores", "AZOT",
-                                              "Heure d'\u00e9t\u00e9 des A\u00e7ores", "AZOST",
-                                              "Heure des A\u00E7ores", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Heure de Cap-Vert", "CVT",
-                                                  "Heure d'\u00e9t\u00e9 de Cap-Vert", "CVST",
-                                                  "Heure de Cap-Vert", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"Heure normale de G\u00e9orgie du Sud", "GST",
-                                                     "Heure avanc\u00e9e de G\u00e9orgie du Sud", "GDT",
-                                                     "G\u00E9orgie du Sud", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Heure des \u00eeles Falkland", "FKT",
-                                               "Heure d'\u00e9t\u00e9 des \u00eeles Falkland", "FKST",
-                                               "Heure des \u00EEles Falkland", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "ACWST",
-                                              "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "ACWDT",
-                                              "Heure de l'Australie occidentale (centre)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Heure normale de Samara", "SAMT",
-                                            "Heure d'\u00e9t\u00e9 de Samara", "SAMST",
-                                            "Heure de Samara", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Heure de l'oc\u00e9an Indien", "IOT",
-                                            "Heure d'\u00e9t\u00e9 de l'oc\u00e9an Indien", "IOST",
-                                            "Heure de l'oc\u00E9an Indien", "IOT"}},
-            {"Indian/Christmas", new String[] {"Heure de l'\u00cele Christmas", "CXT",
-                                               "Heure d'\u00e9t\u00e9 de l'\u00cele Christmas", "CXST",
-                                               "Heure de l'Ile Christmas", "CIT"}},
-            {"Indian/Cocos", new String[] {"Heure des \u00celes Cocos", "CCT",
-                                           "Heure d'\u00e9t\u00e9 des \u00celes Cocos", "CCST",
-                                           "Heure des Iles Cocos", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Heure des Terres australes antartiques fran\u00e7aises", "TFT",
-                                               "Heure d'\u00e9t\u00e9 des Terres australes antartiques fran\u00e7aises", "TFST",
-                                               "Heure des Terres australes antarctiques fran\u00E7aises", "TFT"}},
-            {"Indian/Mahe", new String[] {"Heure des Seychelles", "SCT",
-                                          "Heure d'\u00e9t\u00e9 des Seychelles", "SCST",
-                                          "Heure des Seychelles", "SCT"}},
-            {"Indian/Maldives", new String[] {"Heure des Maldives", "MVT",
-                                              "Heure d'\u00e9t\u00e9 des Maldives", "MVST",
-                                              "Heure des Maldives", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Heure de Maurice", "MUT",
-                                               "Heure d'\u00e9t\u00e9 de Maurice", "MUST",
-                                               "Heure de Maurice", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Heure de la R\u00e9union", "RET",
-                                             "Heure d'\u00e9t\u00e9 de la R\u00e9union", "REST",
-                                             "Heure de la R\u00E9union", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Heure du Vanuatu", "VUT",
-                                            "Heure d'\u00e9t\u00e9 du Vanuatu", "VUST",
-                                            "Heure du Vanuatu", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Heure de l'\u00cele de Phoenix", "PHOT",
-                                                "Heure d'\u00e9t\u00e9 de l'\u00cele de Phoenix", "PHOST",
-                                                "Heure de l'Ile de Phoenix", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Heure de Tokelau", "TKT",
-                                              "Heure d'\u00e9t\u00e9 de Tokelau", "TKST",
-                                              "Heure de Tokelau", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Heure de Fidji", "FJT",
-                                           "Heure d'\u00e9t\u00e9 de Fidji", "FJST",
-                                           "Heure de Fidji", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Heure de Tuvalu", "TVT",
-                                               "Heure d'\u00e9t\u00e9 de Tuvalu", "TVST",
-                                               "Heure de Tuvalu", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Heure des Galapagos", "GALT",
-                                                "Heure d'\u00e9t\u00e9 des Galapagos", "GALST",
-                                                "Heure des Galapagos", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Heure de l'\u00cele de Line", "LINT",
-                                                 "Heure d'\u00e9t\u00e9 de l'\u00cele de Line", "LINST",
-                                                 "Heure de l'Ile de Line", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Heure de Kusaie", "KOST",
-                                             "Heure d'\u00e9t\u00e9 de Kusaie", "KOSST",
-                                             "Heure de Kusaie", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Heure des Marquises", "MART",
-                                                "Heure d'\u00e9t\u00e9 des Marquises", "MARST",
-                                                "Heure des Marquises", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Heure de Nauru", "NRT",
-                                            "Heure d'\u00e9t\u00e9 de Nauru", "NRST",
-                                            "Heure de Nauru", "NRT"}},
-            {"Pacific/Niue", new String[] {"Heure de Niue", "NUT",
-                                           "Heure d'\u00e9t\u00e9 de Niue", "NUST",
-                                           "Heure de Niue", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Heure de Norfolk", "NFT",
-                                              "Heure d'\u00e9t\u00e9 de Norfolk", "NFST",
-                                              "Heure de Norfolk", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Heure de Nouvelle-Cal\u00e9donie", "NCT",
-                                             "Heure d'\u00e9t\u00e9 de Nouvelle-Cal\u00e9donie", "NCST",
-                                             "Heure de Nouvelle-Cal\u00E9donie", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Heure de Palaos", "PWT",
-                                            "Heure d'\u00e9t\u00e9 de Palaos", "PWST",
-                                            "Heure de Palaos", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Heure de Papouasie-Nouvelle-Guin\u00e9e", "PGT",
-                                                   "Heure d'\u00e9t\u00e9 de de Papouasie-Nouvelle-Guin\u00e9e", "PGST",
-                                                   "Heure de Papouasie-Nouvelle-Guin\u00E9e", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Heure des \u00celes Cook", "CKT",
-                                                "Heure d'\u00e9t\u00e9 des \u00celes Cook", "CKHST",
-                                                "Heure des Iles Cook", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Heure de Tahiti", "TAHT",
-                                             "Heure d'\u00e9t\u00e9 de Tahiti", "TAHST",
-                                             "Heure de Tahiti", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Heure de Kiribati", "GILT",
-                                             "Heure d'\u00e9t\u00e9 de Kiribati", "GILST",
-                                             "Heure de Kiribati", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Heure de Tonga", "TOT",
-                                                "Heure d'\u00e9t\u00e9 de Tonga", "TOST",
-                                                "Heure de Tonga", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"Heure de Wake", "WAKT",
-                                           "Heure d'\u00e9t\u00e9 de Wake", "WAKST",
-                                           "Heure de Wake", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Heure de Wallis et Futuna", "WFT",
-                                             "Heure d'\u00e9t\u00e9 de Wallis et Futuna", "WFST",
-                                             "Heure de Wallis-et-Futuna", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java
deleted file mode 100644
index f47c414938a..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_hi.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Copyright (c) 1998 International Business Machines.
- * All Rights Reserved.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_hi extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        return new Object[][] {
-            {"Asia/Calcutta",
-                new String[] {
-                    "\u092d\u093e\u0930\u0924\u0940\u092f \u0938\u092e\u092f", "IST",
-                    "\u092d\u093e\u0930\u0924\u0940\u092f \u0938\u092e\u092f", "IST",
-                    "\u092d\u093e\u0930\u0924\u0940\u092f \u0938\u092e\u092f", "IT"
-                }
-            },
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
deleted file mode 100644
index 90d3c2927dc..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_it extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Ora di Acre", "ACT",
-                                     "Ora estiva di Acre", "ACST",
-                                     "Ora di Acre", "ACT"};
-        String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "ACST",
-                                          "Ora estiva centrale (Australia del Sud)", "ACDT",
-                                          "Ora fuso centrale (Australia del Sud)", "ACT"};
-        String AGT[] = new String[] {"Ora dell'Argentina", "ART",
-                                     "Ora estiva dell'Argentina", "ARST",
-                                     "Ora dell'Argentina", "ART"};
-        String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST",
-                                      "Ora legale dell'Alaska", "AKDT",
-                                      "Ora Alaska", "AKT"};
-        String AMT[] = new String[] {"Ora solare dell'Amazzonia", "AMT",
-                                     "Ora estiva dell'Amazzonia", "AMST",
-                                     "Ora dell'Amazzonia", "AMT"};
-        String ARAST[] = new String[] {"Ora solare dell'Arabia", "AST",
-                                       "Ora legale dell'Arabia", "ADT",
-                                       "Ora Arabia Saudita", "AT"};
-        String ARMT[] = new String[] {"Ora dell'Armenia", "AMT",
-                                      "Ora estiva dell'Armenia", "AMST",
-                                      "Ora dell'Armenia", "AMT"};
-        String AST[] = new String[] {"Ora solare dell'Atlantico occidentale", "AST",
-                                     "Ora legale dell'Atlantico occidentale", "ADT",
-                                     "Fuso dell'Atlantico", "AT"};
-        String BDT[] = new String[] {"Ora del Bangladesh", "BDT",
-                                     "Ora estiva del Bangladesh", "BDST",
-                                     "Ora del Bangladesh", "BDT"};
-        String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "AEST",
-                                          "Ora estiva orientale (Queensland)", "AEDT",
-                                          "Ora fuso orientale (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "ACST",
-                                             "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "ACDT",
-                                             "Ora fuso centrale (Australia del Sud/Nuovo Galles del Sud)", "ACT"};
-        String BRT[] = new String[] {"Ora del Brasile", "BRT",
-                                     "Ora estiva del Brasile", "BRST",
-                                     "Ora di Brasilia", "BRT"};
-        String BTT[] = new String[] {"Ora del Bhutan", "BTT",
-                                     "Ora estiva del Bhutan", "BTST",
-                                     "Ora del Bhutan", "BTT"};
-        String CAT[] = new String[] {"Ora dell'Africa centrale", "CAT",
-                                     "Ora estiva dell'Africa centrale", "CAST",
-                                     "Ora dell'Africa centrale", "CAT"};
-        String CET[] = new String[] {"Ora dell'Europa centrale", "CET",
-                                     "Ora estiva dell'Europa centrale", "CEST",
-                                     "Ora dell'Europa centrale", "CET"};
-        String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST",
-                                       "Ora legale di Chatham", "CHADT",
-                                       "Ora Chatham", "CHAT"};
-        String CHUT[] = new String[] {"Ora di Chuuk", "CHUT",
-                                      "Ora estiva di Chuuk", "CHUST",
-                                      "Ora di Chuuk", "CHUT"};
-        String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA",
-                                     "Ora estiva dell'Indonesia centrale", "CIST",
-                                     "Ora dell'Indonesia centrale", "WITA"};
-        String CLT[] = new String[] {"Ora del Cile", "CLT",
-                                     "Ora estiva del Cile", "CLST",
-                                     "Ora del Cile", "CLT"};
-        String CST[] = new String[] {"Ora solare USA centrale", "CST",
-                                     "Ora legale USA centrale", "CDT",
-                                     "Ora fuso centrale", "CT"};
-        String CTT[] = new String[] {"Ora solare della Cina", "CST",
-                                     "Ora legale della Cina", "CDT",
-                                     "Ora Cina", "CT"};
-        String CUBA[] = new String[] {"Ora solare Cuba", "CST",
-                                      "Ora legale Cuba", "CDT",
-                                      "Ora di Cuba", "CT"};
-        String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "ACST",
-                                        "Ora estiva centrale (Territori del Nord)", "ACDT",
-                                        "Ora fuso centrale (Territori del Nord)", "ACT"};
-        String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT",
-                                        "Ora estiva irlandese", "IST",
-                                        "Ora irlandese", "IT"};
-        String EAT[] = new String[] {"Ora dell'Africa orientale", "EAT",
-                                     "Ora estiva dell'Africa orientale", "EAST",
-                                     "Ora dell'Africa orientale", "EAT"};
-        String EASTER[] = new String[] {"Ora dell'Isola di Pasqua", "EAST",
-                                        "Ora estiva dell'Isola di Pasqua", "EASST",
-                                        "Ora dell'Isola di Pasqua", "EAST"};
-        String EET[] = new String[] {"Ora dell'Europa orientale", "EET",
-                                     "Ora estiva dell'Europa orientale", "EEST",
-                                     "Ora dell'Europa orientale", "EET"};
-        String EGT[] = new String[] {"Ora della Groenlandia orientale", "EGT",
-                                     "Ora estiva della Groenlandia orientale", "EGST",
-                                     "Ora della Groenlandia orientale", "EGT"};
-        String EST[] = new String[] {"Ora solare USA orientale", "EST",
-                                     "Ora legale USA orientale", "EDT",
-                                     "Fuso orientale", "ET"};
-        String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "AEST",
-                                         "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "AEDT",
-                                         "Ora fuso orientale (Nuovo Galles del Sud)", "AET"};
-        String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET",
-                                     "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST",
-                                     "Ora dei paesi europei pi\u00F9 orientali", "FET"};
-        String GHMT[] = new String[] {"Ora media del Ghana", "GMT",
-                                      "Ora legale del Ghana", "GHST",
-                                      "Ora media del Ghana", "GMT"};
-        String GAMBIER[] =  new String[] {"Ora di Gambier", "GAMT",
-                                          "Ora estiva di Gambier", "GAMST",
-                                          "Ora di Gambier", "GAMT"};
-        String GMT[] = new String[] {"Ora media di Greenwich", "GMT",
-                                   "Ora media di Greenwich", "GMT",
-                                   "Ora media di Greenwich", "GMT"};
-        String GMTBST[] = new String[] {"Ora media di Greenwich", "GMT",
-                                        "Ora estiva britannica", "BST",
-                                        "Ora britannica", "BT"};
-        String GST[] = new String[] {"Ora solare del golfo", "GST",
-                                     "Ora legale del golfo", "GDT",
-                                     "Ora del golfo", "GT"};
-        String HKT[] =  new String[] {"Ora di Hong Kong", "HKT",
-                                      "Ora estiva di Hong Kong", "HKST",
-                                      "Ora di Hong Kong", "HKT"};
-        String HST[] = new String[] {"Ora solare delle Isole Hawaii", "HST",
-                                     "Ora legale delle Isole Hawaii", "HDT",
-                                     "Ora Hawaii", "HT"};
-        String ICT[] = new String[] {"Ora dell'Indocina", "ICT",
-                                     "Ora estiva dell'Indocina", "ICST",
-                                     "Ora dell'Indocina", "ICT"};
-        String IRKT[] = new String[] {"Ora di Irkutsk", "IRKT",
-                                      "Ora estiva di Irkutsk", "IRKST",
-                                      "Ora di Irkutsk", "IRKT"};
-        String IRT[] = new String[] {"Ora solare Iran", "IRST",
-                                     "Ora legale Iran", "IRDT",
-                                     "Ora Iran", "IRT"};
-        String ISRAEL[] = new String[] {"Ora standard di Israele", "IST",
-                                        "Ora legale di Israele", "IDT",
-                                        "Ora Israele", "IT"};
-        String IST[] = new String[] {"Ora solare dell'India", "IST",
-                                     "Ora legale dell'India", "IDT",
-                                     "Ora India", "IT"};
-        String JST[] = new String[] {"Ora solare del Giappone", "JST",
-                                     "Ora legale del Giappone", "JDT",
-                                     "Ora Giappone", "JT"};
-        String KRAT[] = new String[] {"Ora di Krasnojarsk", "KRAT",
-                                      "Ora estiva di Krasnojarsk", "KRAST",
-                                      "Ora di Krasnojarsk", "KRAT"};
-        String KST[] = new String[] {"Ora solare della Corea", "KST",
-                                     "Ora legale della Corea", "KDT",
-                                     "Ora Corea", "KT"};
-        String LORD_HOWE[] = new String[] {"Ora standard di Lord Howe", "LHST",
-                                           "Ora estiva di Lord Howe", "LHDT",
-                                           "Ora di Lord Howe", "LHT"};
-        String MHT[] = new String[] {"Ora delle Isole Marshall", "MHT",
-                                     "Ora estiva delle Isole Marshall", "MHST",
-                                     "Ora delle Isole Marshall", "MHT"};
-        String MMT[] = new String[] {"Ora della Birmania/Myanmar", "MMT",
-                                     "Ora estiva della Birmania/Myanmar", "MMST",
-                                     "Ora della Birmania/Myanmar", "MMT"};
-        String MSK[] = new String[] {"Ora standard di Mosca", "MSK",
-                                     "Ora legale di Mosca", "MSD",
-                                     "Ora Mosca", "MT"};
-        String MST[] = new String[] {"Ora solare USA occidentale", "MST",
-                                     "Ora legale USA occidentale", "MDT",
-                                     "Ora fuso occidentale", "MT"};
-        String MYT[] = new String[] {"Ora della Malaysia", "MYT",
-                                     "Ora estiva della Malaysia", "MYST",
-                                     "Ora della Malaysia", "MYT"};
-        String NORONHA[] = new String[] {"Ora di Fernando de Noronha", "FNT",
-                                         "Ora estiva di Fernando de Noronha", "FNST",
-                                         "Ora di Fernando de Noronha", "FNT"};
-        String NOVT[] = new String[] {"Ora di Novosibirsk", "NOVT",
-                                      "Ora estiva di Novosibirsk", "NOVST",
-                                      "Ora di Novosibirsk", "NOVT"};
-        String NPT[] = new String[] {"Ora del Nepal", "NPT",
-                                     "Ora estiva del Nepal", "NPST",
-                                     "Ora del Nepal", "NPT"};
-        String NST[] = new String[] {"Ora solare di Terranova", "NST",
-                                     "Ora legale di Terranova", "NDT",
-                                     "Ora Terranova", "NT"};
-        String NZST[] = new String[] {"Ora solare della Nuova Zelanda", "NZST",
-                                      "Ora legale della Nuova Zelanda", "NZDT",
-                                      "Ora Nuova Zelanda", "NZT"};
-        String PITCAIRN[] = new String[] {"Ora standard di Pitcairn", "PST",
-                                          "Ora legale di Pitcairn", "PDT",
-                                          "Ora Pitcairn", "PT"};
-        String PKT[] = new String[] {"Ora del Pakistan", "PKT",
-                                     "Ora estiva del Pakistan", "PKST",
-                                     "Ora del Pakistan", "PKT"};
-        String PONT[] = new String[] {"Ora di Pohnpei", "PONT",
-                                      "Ora estiva di Pohnpei", "PONST",
-                                      "Ora Ponape", "PONT"};
-        String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST",
-                                     "Ora legale della costa occidentale USA", "PDT",
-                                     "Fuso del Pacifico", "PT"};
-        String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST",
-                                      "Ora estiva del Sudafrica", "SAST",
-                                      "Ora Sudafrica", "SAT"};
-        String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT",
-                                     "Ora estiva delle Isole Salomone", "SBST",
-                                     "Ora delle Isole Salomone", "SBT"};
-        String SGT[] = new String[] {"Ora di Singapore", "SGT",
-                                     "Ora estiva di Singapore", "SGST",
-                                     "Ora di Singapore", "SGT"};
-        String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "AEST",
-                                          "Ora estiva orientale (Tasmania)", "AEDT",
-                                          "Ora fuso orientale (Tasmania)", "AET"};
-        String TMT[] = new String[] {"Ora del Turkmenistan", "TMT",
-                                     "Ora estiva del Turkmenistan", "TMST",
-                                     "Ora del Turkmenistan", "TMT"};
-        String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT",
-                                     "Ora estiva di Ulaanbaatar", "ULAST",
-                                     "Ora di Ulaanbaatar", "ULAT"};
-        String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT",
-                                     "Ora estiva dell'Africa occidentale", "WAST",
-                                     "Ora dell'Africa occidentale", "WAT"};
-        String WET[] = new String[] {"Ora dell'Europa occidentale", "WET",
-                                     "Ora estiva dell'Europa occidentale", "WEST",
-                                     "Ora dell'Europa occidentale", "WET"};
-        String WGT[] = new String[] {"Ora della Groenlandia occidentale", "WGT",
-                                     "Ora estiva della Groenlandia occidentale", "WGST",
-                                     "Ora della Groenlandia occidentale", "WGT"};
-        String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB",
-                                     "Ora estiva dell'Indonesia occidentale", "WIST",
-                                     "Ora dell'Indonesia occidentale", "WIB"};
-        String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "AWST",
-                                         "Ora estiva dell'Australia occidentale", "AWDT",
-                                         "Ora Australia occidentale", "AWT"};
-        String SAMOA[] = new String[] {"Ora standard di Samoa", "SST",
-                                       "Ora legale di Samoa", "SDT",
-                                       "Ora Samoa", "ST"};
-        String WST_SAMOA[] = new String[] {"Ora di Samoa", "WSST",
-                                           "Ora estiva di Samoa", "WSDT",
-                                           "Ora di Samoa occidentale", "WST"};
-        String ChST[] = new String[] {"Ora standard di Chamorro", "ChST",
-                              "Ora legale di Chamorro", "ChDT",
-                              "Ora Chamorro", "ChT"};
-        String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "AEST",
-                                          "Ora estiva orientale (Victoria)", "AEDT",
-                                          "Ora fuso orientale (Victoria)", "AET"};
-        String UTC[] = new String[] {"Tempo universale coordinato", "UTC",
-                                     "Tempo universale coordinato", "UTC",
-                                     "Tempo universale coordinato", "UTC"};
-        String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT",
-                                     "Ora estiva dell'Uzbekistan", "UZST",
-                                     "Ora dell'Uzbekistan", "UZT"};
-        String XJT[] = new String[] {"Ora solare della Cina", "XJT",
-                                     "Ora legale della Cina", "XJDT",
-                                     "Ora Cina", "XJT"};
-        String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT",
-                                      "Ora estiva di Jakutsk", "YAKST",
-                                      "Ora di Yakutsk", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Ora del Paraguay", "PYT",
-                                               "Ora estiva del Paraguay", "PYST",
-                                               "Ora del Paraguay", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Ora della Colombia", "COT",
-                                             "Ora estiva della Colombia", "COST",
-                                             "Ora della Colombia", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Ora del Venezuela", "VET",
-                                              "Ora estiva del Venezuela", "VEST",
-                                              "Ora del Venezuela", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Ora della Guyana Francese", "GFT",
-                                              "Ora estiva della Guyana Francese", "GFST",
-                                              "Ora della Guyana Francese", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Ora dell'Ecuador", "ECT",
-                                                "Ora estiva dell'Ecuador", "ECST",
-                                                "Ora dell'Ecuador", "ECT"}},
-            {"America/Guyana", new String[] {"Ora della Guyana", "GYT",
-                                             "Ora estiva della Guyana", "GYST",
-                                             "Ora della Guyana", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Ora della Bolivia", "BOT",
-                                             "Ora estiva della Bolivia", "BOST",
-                                             "Ora della Bolivia", "BOT"}},
-            {"America/Lima", new String[] {"Ora del Per\u00f9", "PET",
-                                           "Ora estiva del Per\u00f9", "PEST",
-                                           "Ora del Per\u00F9", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
-                                               "Ora legale di Saint-Pierre e Miquelon", "PMDT",
-                                               "Ora Saint-Pierre e Miquelon", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Ora dell'Uruguay", "UYT",
-                                                 "Ora estiva dell'Uruguay", "UYST",
-                                                 "Ora dell'Uruguay", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Ora di Suriname", "SRT",
-                                                 "Ora estiva di Suriname", "SRST",
-                                                 "Ora di Suriname", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Ora di Davis", "DAVT",
-                                               "Ora estiva di Davis", "DAVST",
-                                               "Ora di Davis", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT",
-                                                        "Ora estiva di Dumont-d'Urville", "DDUST",
-                                                        "Ora di Dumont-d'Urville", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT",
-                                                "Ora estiva di Mawson", "MAWST",
-                                                "Ora di Mawson", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Ora di Rothera", "ROTT",
-                                                 "Ora estiva di Rothera", "ROTST",
-                                                 "Ora di Rothera", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT",
-                                               "Ora estiva di Syowa", "SYOST",
-                                               "Ora di Syowa", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC",
-                                               "Ora estiva dell'Europa centrale", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST",
-                                                "Ora estiva di Vostok", "VOSST",
-                                                "Ora di Vostok", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Ora di Alma-Ata", "ALMT",
-                                          "Ora estiva di Alma-Ata", "ALMST",
-                                          "Ora di Alma-Ata", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Ora di Anadyr", "ANAT",
-                                          "Ora estiva di Anadyr", "ANAST",
-                                          "Ora di Anadyr", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Ora di Aqtau", "AQTT",
-                                         "Ora estiva di Aqtau", "AQTST",
-                                         "Ora di Aqtau", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Ora di Aqtobe", "AQTT",
-                                          "Ora estiva di Aqtobe", "AQTST",
-                                          "Ora di Aqtobe", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Ora dell'Azerbaigian", "AZT",
-                                        "Ora estiva dell'Azerbaigian", "AZST",
-                                        "Ora dell'Azerbaigian", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Ora del Kirghizistan", "KGT",
-                                           "Ora estiva del Kirghizistan", "KGST",
-                                           "Ora del Kirghizistan", "KGT"}},
-            {"Asia/Brunei", new String[] {"Ora del Brunei", "BNT",
-                                          "Ora estiva del Brunei", "BNST",
-                                          "Ora del Brunei", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
-                                              "Ora estiva di Choibalsan", "CHOST",
-                                              "Ora di Choibalsan", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Ora di Timor Leste", "TLT",
-                                        "Ora estiva di Timor Leste", "TLST",
-                                        "Ora di Timor Est", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Ora del Tagikistan", "TJT",
-                                            "Ora estiva del Tagikistan", "TJST",
-                                            "Ora del Tagikistan", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
-                                        "Ora estiva di Hovd", "HOVST",
-                                        "Ora di Hovd", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT",
-                                            "Ora estiva dell'Indonesia orientale", "EIST",
-                                            "Ora dell'Indonesia orientale", "WIT"}},
-            {"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT",
-                                         "Ora estiva dell'Afghanistan", "AFST",
-                                         "Ora dell'Afghanistan", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Ora di Petropavlovsk-Kamchatski", "PETT",
-                                             "Ora estiva di Petropavlovsk-Kamchatski", "PETST",
-                                             "Ora di Petropavlovsk-Kamchatski", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Ora di Magadan", "MAGT",
-                                           "Ora estiva di Magadan", "MAGST",
-                                           "Ora di Magadan", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Ora di Oral", "ORAT",
-                                        "Ora estiva di Oral", "ORAST",
-                                        "Ora di Oral", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Ora di Omsk", "OMST",
-                                        "Ora estiva di Omsk", "OMSST",
-                                        "Ora di Omsk", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Ora di Qyzylorda", "QYZT",
-                                             "Ora estiva di Qyzylorda", "QYZST",
-                                             "Ora di Qyzylorda", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Ora di Sakhalin", "SAKT",
-                                            "Ora estiva di Sakhalin", "SAKST",
-                                            "Ora di Sakhalin", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Ora della Georgia", "GET",
-                                           "Ora estiva della Georgia", "GEST",
-                                           "Ora della Georgia", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT",
-                                            "Ora estiva di Ust-Nera", "VLAST",
-                                            "Ora di Ust-Nera", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT",
-                                               "Ora estiva di Vladivostok", "VLAST",
-                                               "Ora di Vladivostok", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT",
-                                                 "Ora estiva di Ekaterinburg", "YEKST",
-                                                 "Ora di Ekaterinburg", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Ora delle Azzorre", "AZOT",
-                                              "Ora estiva delle Azzorre", "AZOST",
-                                              "Ora delle Azzorre", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Ora di Capo Verde", "CVT",
-                                                  "Ora estiva di Capo Verde", "CVST",
-                                                  "Ora di Capo Verde", "CVT"}},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"Ora solare della Georgia Australe", "GST",
-                                                     "Ora legale della Georgia Australe", "GDT",
-                                                     "Ora Georgia del Sud", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Ora delle Falkland", "FKT",
-                                               "Ora estiva delle Falkland", "FKST",
-                                               "Ora delle Falkland", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "ACWST",
-                                              "Ora estiva Australia centro-occidentale", "ACWDT",
-                                              "Ora Australia centro-occidentale", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Ora di Samara", "SAMT",
-                                            "Ora estiva di Samara", "SAMST",
-                                            "Ora di Samara", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Ora del Terr. Britannico dell'Oceano Indiano", "IOT",
-                                            "Ora estiva del Terr. Britannico dell'Oceano Indiano", "IOST",
-                                            "Ora del Territorio Britannico dell'Oceano Indiano", "IOT"}},
-            {"Indian/Christmas", new String[] {"Ora dell'Isola Christmas", "CXT",
-                                               "Ora estiva dell'Isola Christmas", "CXST",
-                                               "Ora dell'Isola Christmas", "CIT"}},
-            {"Indian/Cocos", new String[] {"Ora delle Isole Cocos", "CCT",
-                                           "Ora estiva delle Isole Cocos", "CCST",
-                                           "Ora delle Isole Cocos", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Ora delle Terre Australi e Antartiche Francesi", "TFT",
-                                               "Ora estiva delle Terre Australi Antartiche Francesi", "TFST",
-                                               "Ora delle Terre Australi e Antartiche Francesi", "TFT"}},
-            {"Indian/Mahe", new String[] {"Ora delle Seychelles", "SCT",
-                                          "Ora estiva delle Seychelles", "SCST",
-                                          "Ora delle Seychelles", "SCT"}},
-            {"Indian/Maldives", new String[] {"Ora delle Maldive", "MVT",
-                                              "Ora estiva delle Maldive", "MVST",
-                                              "Ora delle Maldive", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Ora di Mauritius", "MUT",
-                                               "Ora estiva di Mauritius", "MUST",
-                                               "Ora di Mauritius", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Ora di Reunion", "RET",
-                                             "Ora estiva di Reunion", "REST",
-                                             "Ora di Reunion", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Ora di Vanuatu", "VUT",
-                                            "Ora estiva di Vanuatu", "VUST",
-                                            "Ora di Vanuatu", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Ora dell'Isola della Fenice", "PHOT",
-                                                "Ora estiva dell'Isola della Fenice", "PHOST",
-                                                "Ora delle Isole Phoenix", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Ora di Tokelau", "TKT",
-                                              "Ora estiva di Tokelau", "TKST",
-                                              "Ora di Tokelau", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Ora di Figi", "FJT",
-                                           "Ora estiva di Figi", "FJST",
-                                           "Ora di Figi", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Ora di Tuvalu", "TVT",
-                                               "Ora estiva di Tuvalu", "TVST",
-                                               "Ora di Tuvalu", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Ora delle Galapagos", "GALT",
-                                                "Ora estiva delle Galapagos", "GALST",
-                                                "Ora delle Galapagos", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Ora delle Line Islands", "LINT",
-                                                 "Ora estiva delle Line Islands", "LINST",
-                                                 "Ora delle Line Islands", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Ora di Kosrae", "KOST",
-                                             "Ora estiva di Kosrae", "KOSST",
-                                             "Ora di Kosrae", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Ora delle Isole Marchesi", "MART",
-                                                "Ora estiva delle Isole Marchesi", "MARST",
-                                                "Ora delle Isole Marchesi", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Ora di Nauru", "NRT",
-                                            "Ora estiva di Nauru", "NRST",
-                                            "Ora di Nauru", "NRT"}},
-            {"Pacific/Niue", new String[] {"Ora di Niue", "NUT",
-                                           "Ora estiva di Niue", "NUST",
-                                           "Ora di Niue", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Ora di Norfolk", "NFT",
-                                              "Ora estiva di Norfolk", "NFST",
-                                              "Ora di Norfolk", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Ora della Nuova Caledonia", "NCT",
-                                             "Ora estiva della Nuova Caledonia", "NCST",
-                                             "Ora della Nuova Caledonia", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Ora di Palau", "PWT",
-                                            "Ora estiva di Palau", "PWST",
-                                            "Ora di Palau", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Ora di Papua Nuova Guinea", "PGT",
-                                                   "Ora estiva di Papua Nuova Guinea", "PGST",
-                                                   "Ora di Papua Nuova Guinea", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Ora delle Isole Cook", "CKT",
-                                                "Ora estiva delle Isole Cook", "CKHST",
-                                                "Ora delle Isole Cook", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Ora di Tahiti", "TAHT",
-                                             "Ora estiva di Tahiti", "TAHST",
-                                             "Ora di Tahiti", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Ora delle Isole Gilbert", "GILT",
-                                             "Ora estiva delle Isole Gilbert", "GILST",
-                                             "Ora delle Isole Gilbert", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Ora di Tonga", "TOT",
-                                                "Ora estiva di Tonga", "TOST",
-                                                "Ora di Tonga", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"Ora di Wake", "WAKT",
-                                           "Ora estiva di Wake", "WAKST",
-                                           "Ora di Wake", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Ora di Wallis e Futuna", "WFT",
-                                             "Ora estiva di Wallis e Futuna", "WFST",
-                                             "Ora di Wallis e Futuna", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
deleted file mode 100644
index 22db0a4f35e..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT",
-                                     "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST",
-                                     "\u30a2\u30af\u30ec\u6642\u9593", "ACT"};
-        String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACST",
-                                          "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACDT",
-                                          "\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACT"};
-        String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART",
-                                     "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST",
-                                     "\u30A2\u30EB\u30BC\u30F3\u30C1\u30F3\u6642\u9593", "ART"};
-        String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST",
-                                      "\u30a2\u30e9\u30b9\u30ab\u590f\u6642\u9593", "AKDT",
-                                      "\u30A2\u30E9\u30B9\u30AB\u6642\u9593", "AKT"};
-        String AMT[] = new String[] {"\u30a2\u30de\u30be\u30f3\u6642\u9593", "AMT",
-                                     "\u30a2\u30de\u30be\u30f3\u590f\u6642\u9593", "AMST",
-                                     "\u30A2\u30DE\u30BE\u30F3\u6642\u9593", "AMT"};
-        String ARAST[] = new String[] {"\u30a2\u30e9\u30d3\u30a2\u6a19\u6e96\u6642", "AST",
-                                       "\u30a2\u30e9\u30d3\u30a2\u590f\u6642\u9593", "ADT",
-                                       "\u30A2\u30E9\u30D3\u30A2\u6642\u9593", "AT"};
-        String ARMT[] = new String[] {"\u30a2\u30eb\u30e1\u30cb\u30a2\u6642\u9593", "AMT",
-                                      "\u30a2\u30eb\u30e1\u30cb\u30a2\u590f\u6642\u9593", "AMST",
-                                      "\u30A2\u30EB\u30E1\u30CB\u30A2\u6642\u9593", "AMT"};
-        String AST[] = new String[] {"\u5927\u897f\u6d0b\u6a19\u6e96\u6642", "AST",
-                                     "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT",
-                                     "\u5927\u897F\u6D0B\u6A19\u6E96\u6642", "AT"};
-        String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT",
-                                     "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST",
-                                     "\u30D0\u30F3\u30B0\u30E9\u30C7\u30B7\u30E5\u6642\u9593", "BDT"};
-        String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEST",
-                                          "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AEDT",
-                                          "\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "AET"};
-        String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACST",
-                                             "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACDT",
-                                             "\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "ACT"};
-        String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT",
-                                     "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST",
-                                     "\u30D6\u30E9\u30B8\u30EA\u30A2\u6642\u9593", "BRT"};
-        String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT",
-                                     "\u30d6\u30fc\u30bf\u30f3\u590f\u6642\u9593", "BTST",
-                                     "\u30D6\u30FC\u30BF\u30F3\u6642\u9593", "BTT"};
-        String CAT[] = new String[] {"\u4e2d\u90e8\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "CAT",
-                                     "\u4e2d\u90e8\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "CAST",
-                                     "\u4E2D\u90E8\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "CAT"};
-        String CET[] = new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "CET",
-                                     "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST",
-                                     "\u4E2D\u90E8\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "CET"};
-        String CHAST[] = new String[] {"\u30c1\u30e3\u30bf\u30e0\u6a19\u6e96\u6642", "CHAST",
-                                       "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT",
-                                       "\u30C1\u30E3\u30BF\u30E0\u6642\u9593", "CHAT"};
-        String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT",
-                                      "Chuuk Time", "CHUST",
-                                      "\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT"};
-        String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA",
-                                     "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST",
-                                     "\u4E2D\u90E8\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u6642\u9593", "WITA"};
-        String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT",
-                                     "\u30c1\u30ea\u590f\u6642\u9593", "CLST",
-                                     "\u30C1\u30EA\u6642\u9593", "CLT"};
-        String CST[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642", "CST",
-                                     "\u4e2d\u90e8\u590f\u6642\u9593", "CDT",
-                                     "\u4E2D\u90E8\u6A19\u6E96\u6642", "CT"};
-        String CTT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "CST",
-                                     "\u4e2d\u56fd\u590f\u6642\u9593", "CDT",
-                                     "\u4E2D\u56FD\u6642\u9593", "CT"};
-        String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST",
-                                      "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT",
-                                      "\u30AD\u30E5\u30FC\u30D0\u6642\u9593", "CT"};
-        String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACST",
-                                        "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACDT",
-                                        "\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "ACT"};
-        String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
-                                        "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST",
-                                        "\u30A2\u30A4\u30EB\u30E9\u30F3\u30C9\u6642\u9593", "IT"};
-        String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT",
-                                     "\u6771\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "EAST",
-                                     "\u6771\u90E8\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "EAT"};
-        String EASTER[] = new String[] {"\u30a4\u30fc\u30b9\u30bf\u30fc\u5cf6\u6642\u9593", "EAST",
-                                        "\u30a4\u30fc\u30b9\u30bf\u30fc\u5cf6\u590f\u6642\u9593", "EASST",
-                                        "\u30A4\u30FC\u30B9\u30BF\u30FC\u5CF6\u6642\u9593", "EAST"};
-        String EET[] = new String[] {"\u6771\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "EET",
-                                     "\u6771\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "EEST",
-                                     "\u6771\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "EET"};
-        String EGT[] = new String[] {"\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u6642\u9593", "EGT",
-                                     "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST",
-                                     "\u6771\u90E8\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u6642\u9593", "EGT"};
-        String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST",
-                                     "\u6771\u90e8\u590f\u6642\u9593", "EDT",
-                                     "\u6771\u90E8\u6A19\u6E96\u6642", "ET"};
-        String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEST",
-                                         "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AEDT",
-                                         "\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "AET"};
-        String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET",
-                                     "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST",
-                                     "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET"};
-        String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT",
-                                     "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST",
-                                     "\u30AC\u30FC\u30CA\u6A19\u6E96\u6642", "GMT"};
-        String GAMBIER[] =  new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT",
-                                          "\u30ac\u30f3\u30d3\u30a2\u590f\u6642\u9593", "GAMST",
-                                          "\u30AC\u30F3\u30D3\u30A8\u6642\u9593", "GAMT"};
-        String GMT[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
-                                     "\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
-                                     "\u30B0\u30EA\u30CB\u30C3\u30B8\u6A19\u6E96\u6642", "GMT"};
-        String GMTBST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT",
-                                        "\u82f1\u56fd\u590f\u6642\u9593", "BST",
-                                        "\u30A4\u30AE\u30EA\u30B9\u6642\u9593", "BT"};
-        String GST[] = new String[] {"\u6e7e\u5cb8\u6a19\u6e96\u6642", "GST",
-                                     "\u6e7e\u5cb8\u590f\u6642\u9593", "GDT",
-                                     "\u6E7E\u5CB8\u6642\u9593", "GT"};
-        String HKT[] =  new String[] {"\u9999\u6e2f\u6642\u9593", "HKT",
-                                      "\u9999\u6e2f\u590f\u6642\u9593", "HKST",
-                                      "\u9999\u6E2F\u6642\u9593", "HKT"};
-        String HST[] = new String[] {"\u30cf\u30ef\u30a4\u6a19\u6e96\u6642", "HST",
-                                     "\u30cf\u30ef\u30a4\u590f\u6642\u9593", "HDT",
-                                     "\u30CF\u30EF\u30A4\u6642\u9593", "HT"};
-        String ICT[] = new String[] {"\u30a4\u30f3\u30c9\u30b7\u30ca\u6642\u9593", "ICT",
-                                     "\u30a4\u30f3\u30c9\u30b7\u30ca\u590f\u6642\u9593", "ICST",
-                                     "\u30A4\u30F3\u30C9\u30B7\u30CA\u6642\u9593", "ICT"};
-        String IRKT[] = new String[] {"\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u6642\u9593", "IRKT",
-                                      "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST",
-                                      "\u30A4\u30EB\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "IRKT"};
-        String IRT[] = new String[] {"\u30a4\u30e9\u30f3\u6a19\u6e96\u6642", "IRST",
-                                     "\u30a4\u30e9\u30f3\u590f\u6642\u9593", "IRDT",
-                                     "\u30A4\u30E9\u30F3\u6642\u9593", "IRT"};
-        String ISRAEL[] = new String[] {"\u30a4\u30b9\u30e9\u30a8\u30eb\u6a19\u6e96\u6642", "IST",
-                                        "\u30a4\u30b9\u30e9\u30a8\u30eb\u590f\u6642\u9593", "IDT",
-                                        "\u30A4\u30B9\u30E9\u30A8\u30EB\u6642\u9593", "IT"};
-        String IST[] = new String[] {"\u30a4\u30f3\u30c9\u6a19\u6e96\u6642", "IST",
-                                     "\u30a4\u30f3\u30c9\u590f\u6642\u9593", "IDT",
-                                     "\u30A4\u30F3\u30C9\u6642\u9593", "IT"};
-        String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642", "JST",
-                                     "\u65e5\u672c\u590f\u6642\u9593", "JDT",
-                                     "\u65E5\u672C\u6642\u9593", "JT"};
-        String KRAT[] = new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
-                                      "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST",
-                                      "\u30AF\u30E9\u30B9\u30CE\u30E4\u30EB\u30B9\u30AF\u6642\u9593", "KRAT"};
-        String KST[] = new String[] {"\u97d3\u56fd\u6a19\u6e96\u6642", "KST",
-                                     "\u97d3\u56fd\u590f\u6642\u9593", "KDT",
-                                     "\u97D3\u56FD\u6642\u9593", "KT"};
-        String LORD_HOWE[] = new String[] {"\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u6a19\u6e96\u6642", "LHST",
-                                           "\u30ed\u30fc\u30c9\u30cf\u30a6\u5cf6\u590f\u6642\u9593", "LHDT",
-                                           "\u30ED\u30FC\u30C9\u30CF\u30A6\u6642\u9593", "LHT"};
-        String MHT[] = new String[] {"\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u6642\u9593", "MHT",
-                                     "\u30de\u30fc\u30b7\u30e3\u30eb\u5cf6\u590f\u6642\u9593", "MHST",
-                                     "\u30DE\u30FC\u30B7\u30E3\u30EB\u8AF8\u5CF6\u6642\u9593", "MHT"};
-        String MMT[] = new String[] {"\u30df\u30e3\u30f3\u30de\u30fc\u6642\u9593", "MMT",
-                                     "\u30df\u30e3\u30f3\u30de\u30fc\u590f\u6642\u9593", "MMST",
-                                     "\u30DF\u30E3\u30F3\u30DE\u30FC\u6642\u9593", "MMT"};
-        String MSK[] = new String[] {"\u30e2\u30b9\u30af\u30ef\u6a19\u6e96\u6642", "MSK",
-                                     "\u30e2\u30b9\u30af\u30ef\u590f\u6642\u9593", "MSD",
-                                     "\u30E2\u30B9\u30AF\u30EF\u6642\u9593", "MT"};
-        String MST[] = new String[] {"\u5c71\u5730\u6a19\u6e96\u6642", "MST",
-                                     "\u5c71\u5730\u590f\u6642\u9593", "MDT",
-                                     "\u5C71\u5730\u6A19\u6E96\u6642", "MT"};
-        String MYT[] = new String[] {"\u30de\u30ec\u30fc\u30b7\u30a2\u6642\u9593", "MYT",
-                                     "\u30de\u30ec\u30fc\u30b7\u30a2\u590f\u6642\u9593", "MYST",
-                                     "\u30DE\u30EC\u30FC\u30B7\u30A2\u6642\u9593", "MYT"};
-        String NORONHA[] = new String[] {"\u30d5\u30a7\u30eb\u30ca\u30f3\u30c9\u30fb\u30c7\u30fb\u30ce\u30ed\u30fc\u30cb\u30e3\u6642\u9593", "FNT",
-                                         "\u30d5\u30a7\u30eb\u30ca\u30f3\u30c9\u30fb\u30c7\u30fb\u30ce\u30ed\u30fc\u30cb\u30e3\u590f\u6642\u9593", "FNST",
-                                         "\u30D5\u30A7\u30EB\u30CA\u30F3\u30C9\u30FB\u30C7\u30FB\u30CE\u30ED\u30FC\u30CB\u30E3\u6642\u9593", "FNT"};
-        String NOVT[] = new String[] {"\u30ce\u30dc\u30b7\u30d3\u30eb\u30b9\u30af\u6642\u9593", "NOVT",
-                                      "\u30ce\u30dc\u30b7\u30d3\u30eb\u30b9\u30af\u590f\u6642\u9593", "NOVST",
-                                      "\u30CE\u30F4\u30A9\u30B7\u30D3\u30EB\u30B9\u30AF\u6642\u9593", "NOVT"};
-        String NPT[] = new String[] {"\u30cd\u30d1\u30fc\u30eb\u6642\u9593", "NPT",
-                                      "\u30cd\u30d1\u30fc\u30eb\u590f\u6642\u9593", "NPST",
-                                      "\u30CD\u30D1\u30FC\u30EB\u6642\u9593", "NPT"};
-        String NST[] = new String[] {"\u30cb\u30e5\u30fc\u30d5\u30a1\u30f3\u30c9\u30e9\u30f3\u30c9\u6a19\u6e96\u6642", "NST",
-                                     "\u30cb\u30e5\u30fc\u30d5\u30a1\u30f3\u30c9\u30e9\u30f3\u30c9\u590f\u6642\u9593", "NDT",
-                                     "\u30CB\u30E5\u30FC\u30D5\u30A1\u30F3\u30C9\u30E9\u30F3\u30C9\u6642\u9593", "NT"};
-        String NZST[] = new String[] {"\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9\u6a19\u6e96\u6642", "NZST",
-                                      "\u30cb\u30e5\u30fc\u30b8\u30fc\u30e9\u30f3\u30c9\u590f\u6642\u9593", "NZDT",
-                                      "\u30CB\u30E5\u30FC\u30B8\u30FC\u30E9\u30F3\u30C9\u6642\u9593", "NZT"};
-        String PITCAIRN[] = new String[] {"\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u6a19\u6e96\u6642", "PST",
-                                          "\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT",
-                                          "\u30D4\u30C8\u30B1\u30A2\u30F3\u6642\u9593", "PT"};
-        String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT",
-                                     "\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST",
-                                     "\u30D1\u30AD\u30B9\u30BF\u30F3\u6642\u9593", "PKT"};
-        String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT",
-                                      "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST",
-                                      "\u30DD\u30CA\u30DA\u6642\u9593", "PONT"};
-        String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST",
-                                     "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT",
-                                     "\u592A\u5E73\u6D0B\u6A19\u6E96\u6642", "PT"};
-        String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST",
-                                      "\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST",
-                                      "\u5357\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "SAT"};
-        String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT",
-                                     "\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "SBST",
-                                     "\u30BD\u30ED\u30E2\u30F3\u8AF8\u5CF6\u6642\u9593", "SBT"};
-        String SGT[] = new String[] {"\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u6642\u9593", "SGT",
-                                     "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST",
-                                     "\u30B7\u30F3\u30AC\u30DD\u30FC\u30EB\u6642\u9593", "SGT"};
-        String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEST",
-                                          "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AEDT",
-                                          "\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "AET"};
-        String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT",
-                                     "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST",
-                                     "\u30C8\u30EB\u30AF\u30E1\u30CB\u30B9\u30BF\u30F3\u6642\u9593", "TMT"};
-        String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT",
-                                     "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST",
-                                     "\u30A6\u30E9\u30F3\u30D0\u30FC\u30C8\u30EB\u6642\u9593", "ULAT"};
-        String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT",
-                                     "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST",
-                                     "\u897F\u90E8\u30A2\u30D5\u30EA\u30AB\u6642\u9593", "WAT"};
-        String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET",
-                                     "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST",
-                                     "\u897F\u90E8\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "WET"};
-        String WGT[] = new String[] {"\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u6642\u9593", "WGT",
-                                     "\u897f\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "WGST",
-                                     "\u897F\u90E8\u30B0\u30EA\u30FC\u30F3\u30E9\u30F3\u30C9\u6642\u9593", "WGT"};
-        String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB",
-                                     "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST",
-                                     "\u897F\u90E8\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u6642\u9593", "WIB"};
-        String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWST",
-                                         "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWDT",
-                                         "\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "AWT"};
-        String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST",
-                                       "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT",
-                                       "\u30B5\u30E2\u30A2\u6642\u9593", "ST"};
-        String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WSST",
-                                           "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT",
-                                           "\u897F\u30B5\u30E2\u30A2\u6642\u9593", "WST"};
-        String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST",
-                                      "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT",
-                                      "\u30C1\u30E3\u30E2\u30ED\u6642\u9593", "ChT"};
-        String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEST",
-                                          "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AEDT",
-                                          "\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "AET"};
-        String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
-                                     "\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
-                                     "\u5354\u5B9A\u4E16\u754C\u6642", "UTC"};
-        String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT",
-                                     "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST",
-                                     "\u30A6\u30BA\u30D9\u30AD\u30B9\u30BF\u30F3\u6642\u9593", "UZT"};
-        String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
-                                     "\u4e2d\u56fd\u590f\u6642\u9593", "XJDT",
-                                     "\u4E2D\u56FD\u6642\u9593", "XJT"};
-        String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
-                                      "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST",
-                                      "\u30E4\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"\u30d1\u30e9\u30b0\u30a2\u30a4\u6642\u9593", "PYT",
-                                               "\u30d1\u30e9\u30b0\u30a2\u30a4\u590f\u6642\u9593", "PYST",
-                                               "\u30D1\u30E9\u30B0\u30A2\u30A4\u6642\u9593", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"\u30b3\u30ed\u30f3\u30d3\u30a2\u6642\u9593", "COT",
-                                             "\u30b3\u30ed\u30f3\u30d3\u30a2\u590f\u6642\u9593", "COST",
-                                             "\u30B3\u30ED\u30F3\u30D3\u30A2\u6642\u9593", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"\u30d9\u30cd\u30ba\u30a8\u30e9\u6642\u9593", "VET",
-                                              "\u30d9\u30cd\u30ba\u30a8\u30e9\u590f\u6642\u9593", "VEST",
-                                              "\u30D9\u30CD\u30BA\u30A8\u30E9\u6642\u9593", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"\u4ecf\u9818\u30ae\u30a2\u30ca\u6642\u9593", "GFT",
-                                              "\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST",
-                                              "\u30D5\u30E9\u30F3\u30B9\u9818\u30AE\u30A2\u30CA\u6642\u9593", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"\u30a8\u30af\u30a2\u30c9\u30eb\u6642\u9593", "ECT",
-                                                "\u30a8\u30af\u30a2\u30c9\u30eb\u590f\u6642\u9593", "ECST",
-                                                "\u30A8\u30AF\u30A2\u30C9\u30EB\u6642\u9593", "ECT"}},
-            {"America/Guyana", new String[] {"\u30ac\u30a4\u30a2\u30ca\u6642\u9593", "GYT",
-                                             "\u30ac\u30a4\u30a2\u30ca\u590f\u6642\u9593", "GYST",
-                                             "\u30AC\u30A4\u30A2\u30CA\u6642\u9593", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"\u30dc\u30ea\u30d3\u30a2\u6642\u9593", "BOT",
-                                             "\u30dc\u30ea\u30d3\u30a2\u590f\u6642\u9593", "BOST",
-                                             "\u30DC\u30EA\u30D3\u30A2\u6642\u9593", "BOT"}},
-            {"America/Lima", new String[] {"\u30da\u30eb\u30fc\u6642\u9593", "PET",
-                                           "\u30da\u30eb\u30fc\u590f\u6642\u9593", "PEST",
-                                           "\u30DA\u30EB\u30FC\u6642\u9593", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
-                                               "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT",
-                                               "\u30D4\u30A8\u30FC\u30EB\u30FB\u30DF\u30AF\u30ED\u30F3\u6642\u9593", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"\u30a6\u30eb\u30b0\u30a2\u30a4\u6642\u9593", "UYT",
-                                                 "\u30a6\u30eb\u30b0\u30a2\u30a4\u590f\u6642\u9593", "UYST",
-                                                 "\u30A6\u30EB\u30B0\u30A2\u30A4\u6642\u9593", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"\u30b9\u30ea\u30ca\u30e0\u6642\u9593", "SRT",
-                                                 "\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST",
-                                                 "\u30B9\u30EA\u30CA\u30E0\u6642\u9593", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"\u30c7\u30a4\u30d3\u30b9\u6642\u9593", "DAVT",
-                                               "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST",
-                                               "\u30C7\u30FC\u30D3\u30B9\u6642\u9593", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT",
-                                                        "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST",
-                                                        "\u30C7\u30E5\u30E2\u30F3\u30FB\u30C7\u30E5\u30EB\u30D3\u30EB\u6642\u9593", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT",
-                                                "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST",
-                                                "\u30E2\u30FC\u30BD\u30F3\u6642\u9593", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"\u30ed\u30bc\u30e9\u6642\u9593", "ROTT",
-                                                 "\u30ed\u30bc\u30e9\u590f\u6642\u9593", "ROTST",
-                                                 "\u30ED\u30BC\u30E9\u6642\u9593", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT",
-                                               "\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST",
-                                               "\u662D\u548C\u57FA\u5730\u6642\u9593", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC",
-                                               "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST",
-                                                "\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST",
-                                                "\u30DC\u30B9\u30C8\u30FC\u30AF\u6642\u9593", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"\u30a2\u30eb\u30de\u30a2\u30bf\u6642\u9593", "ALMT",
-                                          "\u30a2\u30eb\u30de\u30a2\u30bf\u590f\u6642\u9593", "ALMST",
-                                          "\u30A2\u30EB\u30DE\u30A2\u30BF\u6642\u9593", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u6642\u9593", "ANAT",
-                                          "\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u590f\u6642\u9593", "ANAST",
-                                          "\u30A2\u30CA\u30C7\u30A3\u30EA\u6642\u9593", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"\u30a2\u30af\u30bf\u30a6\u6642\u9593", "AQTT",
-                                         "\u30a2\u30af\u30bf\u30a6\u590f\u6642\u9593", "AQTST",
-                                         "\u30A2\u30AF\u30BF\u30A6\u6642\u9593", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"\u30a2\u30af\u30c8\u30d9\u6642\u9593", "AQTT",
-                                          "\u30a2\u30af\u30c8\u30d9\u590f\u6642\u9593", "AQTST",
-                                          "\u30A2\u30AF\u30C8\u30D9\u6642\u9593", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u6642\u9593", "AZT",
-                                        "\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3\u590f\u6642\u9593", "AZST",
-                                        "\u30A2\u30BC\u30EB\u30D0\u30A4\u30B8\u30E3\u30F3\u6642\u9593", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3\u6642\u9593", "KGT",
-                                           "\u30ad\u30eb\u30ae\u30b9\u30bf\u30f3\u590f\u6642\u9593", "KGST",
-                                           "\u30AD\u30EB\u30AE\u30B9\u6642\u9593", "KGT"}},
-            {"Asia/Brunei", new String[] {"\u30d6\u30eb\u30cd\u30a4\u6642\u9593", "BNT",
-                                          "\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST",
-                                          "\u30D6\u30EB\u30CD\u30A4\u6642\u9593", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT",
-                                              "\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST",
-                                              "\u30C1\u30E7\u30A4\u30D0\u30EB\u30B5\u30F3\u6642\u9593", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"\u6771\u30c6\u30a3\u30e2\u30fc\u30eb\u6642\u9593", "TLT",
-                                        "\u6771\u30c6\u30a3\u30e2\u30fc\u30eb\u590f\u6642\u9593", "TLST",
-                                        "\u6771\u30C6\u30A3\u30E2\u30FC\u30EB\u6642\u9593", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "TJT",
-                                            "\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TJST",
-                                            "\u30BF\u30B8\u30AD\u30B9\u30BF\u30F3\u6642\u9593", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
-                                        "\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST",
-                                        "\u30DB\u30D6\u30C9\u6642\u9593", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT",
-                                            "\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" ,
-                                            "\u6771\u90E8\u30A4\u30F3\u30C9\u30CD\u30B7\u30A2\u6642\u9593", "WIT"}},
-            {"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT",
-                                         "\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST",
-                                         "\u30A2\u30D5\u30AC\u30CB\u30B9\u30BF\u30F3\u6642\u9593", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u6642\u9593", "PETT",
-                                             "\u30da\u30c8\u30ed\u30d1\u30d6\u30ed\u30d5\u30b9\u30af\u30ab\u30e0\u30c1\u30e3\u30c4\u30ad\u30fc\u590f\u6642\u9593", "PETST",
-                                             "\u30DA\u30C8\u30ED\u30D1\u30D6\u30ED\u30D5\u30B9\u30AF\u30FB\u30AB\u30E0\u30C1\u30E3\u30C4\u30AD\u30FC\u6642\u9593", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"\u30de\u30ac\u30c0\u30f3\u6642\u9593", "MAGT",
-                                           "\u30de\u30ac\u30c0\u30f3\u590f\u6642\u9593", "MAGST",
-                                           "\u30DE\u30AC\u30C0\u30F3\u6642\u9593", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"\u30aa\u30e9\u30eb\u6642\u9593", "ORAT",
-                                        "\u30aa\u30e9\u30eb\u590f\u6642\u9593", "ORAST",
-                                        "\u30AA\u30E9\u30EB\u6642\u9593", "ORAT"}},
-            {"Asia/Omsk", new String[] {"\u30aa\u30e0\u30b9\u30af\u6642\u9593", "OMST",
-                                        "\u30aa\u30e0\u30b9\u30af\u590f\u6642\u9593", "OMSST",
-                                        "\u30AA\u30E0\u30B9\u30AF\u6642\u9593", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"\u30ad\u30b8\u30eb\u30aa\u30eb\u30c0\u6642\u9593", "QYZT",
-                                             "\u30ad\u30b8\u30eb\u30aa\u30eb\u30c0\u590f\u6642\u9593", "QYZST",
-                                             "\u30AF\u30BA\u30ED\u30EB\u30C0\u6642\u9593", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"\u6a3a\u592a\u6642\u9593", "SAKT",
-                                            "\u6a3a\u592a\u590f\u6642\u9593", "SAKST",
-                                            "\u30B5\u30CF\u30EA\u30F3\u6642\u9593", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"\u30b0\u30eb\u30b8\u30a2\u6642\u9593", "GET",
-                                           "\u30b0\u30eb\u30b8\u30a2\u590f\u6642\u9593", "GEST",
-                                           "\u30B0\u30EB\u30B8\u30A2\u6642\u9593", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT",
-                                            "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST",
-                                            "\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
-                                               "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST",
-                                               "\u30A6\u30E9\u30B8\u30AA\u30B9\u30C8\u30AF\u6642\u9593", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u6642\u9593", "YEKT",
-                                                 "\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u590f\u6642\u9593", "YEKST",
-                                                 "\u30A8\u30AB\u30C6\u30EA\u30F3\u30D6\u30EB\u30AF\u6642\u9593", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"\u30a2\u30be\u30ec\u30b9\u6642\u9593", "AZOT",
-                                              "\u30a2\u30be\u30ec\u30b9\u590f\u6642\u9593", "AZOST",
-                                              "\u30A2\u30BE\u30EC\u30B9\u6642\u9593", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7\u6642\u9593", "CVT",
-                                                  "\u30ab\u30fc\u30dc\u30d9\u30eb\u30c7\u590f\u6642\u9593", "CVST",
-                                                  "\u30AB\u30FC\u30DC\u30D9\u30EB\u30C7\u6642\u9593", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"\u5357\u30b8\u30e7\u30fc\u30b8\u30a2\u5cf6\u6a19\u6e96\u6642", "GST",
-                                                     "\u5357\u30b8\u30e7\u30fc\u30b8\u30a2\u5cf6\u590f\u6642\u9593", "GDT",
-                                                     "\u5357\u30B8\u30E7\u30FC\u30B8\u30A2\u6642\u9593", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\u8af8\u5cf6\u6642\u9593", "FKT",
-                                               "\u30d5\u30a9\u30fc\u30af\u30e9\u30f3\u30c9\u8af8\u5cf6\u590f\u6642\u9593", "FKST",
-                                               "\u30D5\u30A9\u30FC\u30AF\u30E9\u30F3\u30C9\u8AF8\u5CF6\u6642\u9593", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWST",
-                                              "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWDT",
-                                              "\u4E2D\u897F\u90E8\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"\u30b5\u30de\u30e9\u6642\u9593", "SAMT",
-                                            "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST",
-                                            "\u30B5\u30DE\u30E9\u6642\u9593", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"\u30a4\u30f3\u30c9\u6d0b\u5730\u57df\u6642\u9593", "IOT",
-                                            "\u30a4\u30f3\u30c9\u6d0b\u5730\u57df\u590f\u6642\u9593", "IOST",
-                                            "\u30A4\u30F3\u30C9\u6D0B\u5730\u57DF\u6642\u9593", "IOT"}},
-            {"Indian/Christmas", new String[] {"\u30af\u30ea\u30b9\u30de\u30b9\u8af8\u5cf6\u6642\u9593", "CXT",
-                                               "\u30af\u30ea\u30b9\u30de\u30b9\u8af8\u5cf6\u590f\u6642\u9593", "CXST",
-                                               "\u30AF\u30EA\u30B9\u30DE\u30B9\u5CF6\u6642\u9593", "CIT"}},
-            {"Indian/Cocos", new String[] {"\u30b3\u30b3\u30b9\u8af8\u5cf6\u6642\u9593", "CCT",
-                                           "\u30b3\u30b3\u30b9\u8af8\u5cf6\u590f\u6642\u9593", "CCST",
-                                           "\u30B3\u30B3\u30B9\u8AF8\u5CF6\u6642\u9593", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"\u4ecf\u5357\u65b9\u9818\u304a\u3088\u3073\u5357\u6975\u6642\u9593", "TFT",
-                                               "\u4ecf\u5357\u65b9\u9818\u304a\u3088\u3073\u5357\u6975\u590f\u6642\u9593", "TFST",
-                                               "\u30D5\u30E9\u30F3\u30B9\u9818\u5357\u65B9\u304A\u3088\u3073\u5357\u6975\u5927\u9678\u6642\u9593", "TFT"}},
-            {"Indian/Mahe", new String[] {"\u30bb\u30a4\u30b7\u30a7\u30eb\u6642\u9593", "SCT",
-                                          "\u30bb\u30a4\u30b7\u30a7\u30eb\u590f\u6642\u9593", "SCST",
-                                          "\u30BB\u30FC\u30B7\u30A7\u30EB\u6642\u9593", "SCT"}},
-            {"Indian/Maldives", new String[] {"\u30e2\u30eb\u30b8\u30d6\u6642\u9593", "MVT",
-                                              "\u30e2\u30eb\u30b8\u30d6\u590f\u6642\u9593", "MVST",
-                                              "\u30E2\u30EB\u30B8\u30D6\u6642\u9593", "MVT"}},
-            {"Indian/Mauritius", new String[] {"\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9\u6642\u9593", "MUT",
-                                               "\u30e2\u30fc\u30ea\u30b7\u30e3\u30b9\u590f\u6642\u9593", "MUST",
-                                               "\u30E2\u30FC\u30EA\u30B7\u30E3\u30B9\u6642\u9593", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"\u30ec\u30e6\u30cb\u30aa\u30f3\u6642\u9593", "RET",
-                                             "\u30ec\u30e6\u30cb\u30aa\u30f3\u590f\u6642\u9593", "REST",
-                                             "\u30EC\u30E6\u30CB\u30AA\u30F3\u6642\u9593", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"\u30d0\u30cc\u30a2\u30c4\u6642\u9593", "VUT",
-                                            "\u30d0\u30cc\u30a2\u30c4\u590f\u6642\u9593", "VUST",
-                                            "\u30D0\u30CC\u30A2\u30C4\u6642\u9593", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"\u30d5\u30a7\u30cb\u30c3\u30af\u30b9\u8af8\u5cf6\u6642\u9593", "PHOT",
-                                                "\u30d5\u30a7\u30cb\u30c3\u30af\u30b9\u8af8\u5cf6\u590f\u6642\u9593", "PHOST",
-                                                "\u30D5\u30A7\u30CB\u30C3\u30AF\u30B9\u8AF8\u5CF6\u6642\u9593", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"\u30c8\u30b1\u30e9\u30a6\u8af8\u5cf6\u6642\u9593", "TKT",
-                                              "\u30c8\u30b1\u30e9\u30a6\u8af8\u5cf6\u590f\u6642\u9593", "TKST",
-                                              "\u30C8\u30B1\u30E9\u30A6\u6642\u9593", "TKT"}},
-            {"Pacific/Fiji", new String[] {"\u30d5\u30a3\u30b8\u30fc\u6642\u9593", "FJT",
-                                           "\u30d5\u30a3\u30b8\u30fc\u590f\u6642\u9593", "FJST",
-                                           "\u30D5\u30A3\u30B8\u30FC\u6642\u9593", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"\u30c4\u30d0\u30eb\u6642\u9593", "TVT",
-                                               "\u30c4\u30d0\u30eb\u590f\u6642\u9593", "TVST",
-                                               "\u30C4\u30D0\u30EB\u6642\u9593", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"\u30ac\u30e9\u30d1\u30b4\u30b9\u6642\u9593", "GALT",
-                                                "\u30ac\u30e9\u30d1\u30b4\u30b9\u590f\u6642\u9593", "GALST",
-                                                "\u30AC\u30E9\u30D1\u30B4\u30B9\u6642\u9593", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"\u30e9\u30a4\u30f3\u8af8\u5cf6\u6642\u9593", "LINT",
-                                                 "\u30e9\u30a4\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "LINST",
-                                                 "\u30E9\u30A4\u30F3\u8AF8\u5CF6\u6642\u9593", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"\u30b3\u30b9\u30e9\u30a8\u6642\u9593", "KOST",
-                                             "\u30b3\u30b9\u30e9\u30a8\u590f\u6642\u9593", "KOSST",
-                                             "\u30B3\u30B9\u30E9\u30A8\u6642\u9593", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"\u30de\u30eb\u30b1\u30b5\u30b9\u6642\u9593", "MART",
-                                                "\u30de\u30eb\u30b1\u30b5\u30b9\u590f\u6642\u9593", "MARST",
-                                                "\u30DE\u30EB\u30AD\u30FC\u30BA\u6642\u9593", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"\u30ca\u30a6\u30eb\u6642\u9593", "NRT",
-                                            "\u30ca\u30a6\u30eb\u590f\u6642\u9593", "NRST",
-                                            "\u30CA\u30A6\u30EB\u6642\u9593", "NRT"}},
-            {"Pacific/Niue", new String[] {"\u30cb\u30a6\u30a8\u5cf6\u6642\u9593", "NUT",
-                                           "\u30cb\u30a6\u30a8\u5cf6\u590f\u6642\u9593", "NUST",
-                                           "\u30CB\u30A6\u30A8\u6642\u9593", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"\u30ce\u30fc\u30d5\u30a9\u30fc\u30af\u6642\u9593", "NFT",
-                                              "\u30ce\u30fc\u30d5\u30a9\u30fc\u30af\u590f\u6642\u9593", "NFST",
-                                              "\u30CE\u30FC\u30D5\u30A9\u30FC\u30AF\u6642\u9593", "NFT"}},
-            {"Pacific/Noumea", new String[] {"\u30cb\u30e5\u30fc\u30ab\u30ec\u30c9\u30cb\u30a2\u6642\u9593", "NCT",
-                                             "\u30cb\u30e5\u30fc\u30ab\u30ec\u30c9\u30cb\u30a2\u590f\u6642\u9593", "NCST",
-                                             "\u30CB\u30E5\u30FC\u30AB\u30EC\u30C9\u30CB\u30A2\u6642\u9593", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"\u30d1\u30e9\u30aa\u6642\u9593", "PWT",
-                                            "\u30d1\u30e9\u30aa\u590f\u6642\u9593", "PWST",
-                                            "\u30D1\u30E9\u30AA\u6642\u9593", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u6642\u9593", "PGT",
-                                                   "\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u590f\u6642\u9593", "PGST",
-                                                   "\u30D1\u30D7\u30A2\u30CB\u30E5\u30FC\u30AE\u30CB\u30A2\u6642\u9593", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"\u30af\u30c3\u30af\u8af8\u5cf6\u6642\u9593", "CKT",
-                                                "\u30af\u30c3\u30af\u8af8\u5cf6\u590f\u6642\u9593", "CKHST",
-                                                "\u30AF\u30C3\u30AF\u8AF8\u5CF6\u6642\u9593", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"\u30bf\u30d2\u30c1\u6642\u9593", "TAHT",
-                                             "\u30bf\u30d2\u30c1\u590f\u6642\u9593", "TAHST",
-                                             "\u30BF\u30D2\u30C1\u6642\u9593", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"\u30ae\u30eb\u30d0\u30fc\u30c8\u8af8\u5cf6\u6642\u9593", "GILT",
-                                             "\u30ae\u30eb\u30d0\u30fc\u30c8\u8af8\u5cf6\u590f\u6642\u9593", "GILST",
-                                             "\u30AE\u30EB\u30D0\u30FC\u30C8\u8AF8\u5CF6\u6642\u9593", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"\u30c8\u30f3\u30ac\u6642\u9593", "TOT",
-                                                "\u30c8\u30f3\u30ac\u590f\u6642\u9593", "TOST",
-                                                "\u30C8\u30F3\u30AC\u6642\u9593", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"\u30a6\u30a7\u30fc\u30af\u6642\u9593", "WAKT",
-                                           "\u30a6\u30a7\u30fc\u30af\u590f\u6642\u9593", "WAKST",
-                                           "\u30A6\u30A7\u30FC\u30AF\u6642\u9593", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u6642\u9593", "WFT",
-                                             "\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u590f\u6642\u9593", "WFST",
-                                             "\u30A6\u30A9\u30EA\u30B9\u30FB\u30D5\u30C4\u30CA\u6642\u9593", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
deleted file mode 100644
index e8e6d45e523..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT",
-                                     "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST",
-                                     "\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT"};
-        String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACST",
-                                          "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACDT",
-                                          "\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACT"};
-        String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART",
-                                     "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST",
-                                     "\uC544\uB974\uD5E8\uD2F0\uB098 \uD45C\uC900\uC2DC", "ART"};
-        String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST",
-                                      "\uc54c\ub798\uc2a4\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AKDT",
-                                      "\uC54C\uB798\uC2A4\uCE74 \uD45C\uC900\uC2DC", "AKT"};
-        String AMT[] = new String[] {"\uc544\ub9c8\uc874 \uc2dc\uac04", "AMT",
-                                     "\uc544\ub9c8\uc874 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AMST",
-                                     "\uC544\uB9C8\uC874 \uD45C\uC900\uC2DC", "AMT"};
-        String ARAST[] = new String[] {"\uc544\ub78d \ud45c\uc900\uc2dc", "AST",
-                                       "\uc544\ub78d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT",
-                                       "\uC544\uB77C\uBE44\uC544 \uD45C\uC900\uC2DC", "AT"};
-        String ARMT[] = new String[] {"\uc544\ub974\uba54\ub2c8\uc544 \uc2dc\uac04", "AMT",
-                                      "\uc544\ub974\uba54\ub2c8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AMST",
-                                      "\uC544\uB974\uBA54\uB2C8\uC544 \uD45C\uC900\uC2DC", "AMT"};
-        String AST[] = new String[] {"\ub300\uc11c\uc591 \ud45c\uc900\uc2dc", "AST",
-                                     "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT",
-                                     "\uB300\uC11C\uC591 \uD45C\uC900\uC2DC", "AT"};
-        String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT",
-                                     "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST",
-                                     "\uBC29\uAE00\uB77C\uB370\uC2DC \uD45C\uC900\uC2DC", "BDT"};
-        String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AEST",
-                                          "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "AEDT",
-                                          "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "AET"};
-        String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACST",
-                                             "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACDT",
-                                             "\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "ACT"};
-        String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT",
-                                     "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST",
-                                     "\uBE0C\uB77C\uC9C8\uB9AC\uC544 \uD45C\uC900\uC2DC", "BRT"};
-        String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT",
-                                     "\ubd80\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BTST",
-                                     "\uBD80\uD0C4 \uD45C\uC900\uC2DC", "BTT"};
-        String CAT[] = new String[] {"\uc911\uc559 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "CAT",
-                                     "\uc911\uc559 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CAST",
-                                     "\uC911\uC559 \uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "CAT"};
-        String CET[] = new String[] {"\uc911\uc559 \uc720\ub7fd \uc2dc\uac04", "CET",
-                                     "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST",
-                                     "\uC911\uC559 \uC720\uB7FD \uD45C\uC900\uC2DC", "CET"};
-        String CHAST[] = new String[] {"Chatham \ud45c\uc900\uc2dc", "CHAST",
-                                       "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT",
-                                       "\uCC44\uD140 \uD45C\uC900\uC2DC", "CHAT"};
-        String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT",
-                                      "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST",
-                                      "\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT"};
-        String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA",
-                                     "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST",
-                                     "\uC911\uBD80 \uC778\uB3C4\uB124\uC2DC\uC544 \uD45C\uC900\uC2DC", "WITA"};
-        String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT",
-                                     "\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST",
-                                     "\uCE60\uB808 \uD45C\uC900\uC2DC", "CLT"};
-        String CST[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc", "CST",
-                                     "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT",
-                                     "\uC911\uBD80 \uD45C\uC900\uC2DC", "CT"};
-        String CTT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "CST",
-                                     "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT",
-                                     "\uC911\uAD6D \uD45C\uC900\uC2DC", "CT"};
-        String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST",
-                                      "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT",
-                                      "\uCFE0\uBC14 \uD45C\uC900\uC2DC", "CT"};
-        String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACST",
-                                        "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "ACDT",
-                                        "\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "ACT"};
-        String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
-                                        "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST",
-                                        "\uC544\uC77C\uB79C\uB4DC \uD45C\uC900\uC2DC", "IT"};
-        String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT",
-                                     "\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EAST",
-                                     "\uB3D9\uBD80 \uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "EAT"};
-        String EASTER[] = new String[] {"Easter Is. \uc2dc\uac04", "EAST",
-                                        "Easter Is. \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EASST",
-                                        "\uC774\uC2A4\uD130 \uC12C \uD45C\uC900\uC2DC", "EAST"};
-        String EET[] = new String[] {"\ub3d9\uc720\ub7fd \uc2dc\uac04", "EET",
-                                     "\ub3d9\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EEST",
-                                     "\ub3d9\ubd80 \uc720\ub7fd \ud45c\uc900\uc2dc", "EET"};
-        String EGT[] = new String[] {"\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc2dc\uac04", "EGT",
-                                     "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST",
-                                     "\uB3D9\uBD80 \uADF8\uB9B0\uB780\uB4DC \uD45C\uC900\uC2DC", "EGT"};
-        String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST",
-                                     "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT",
-                                     "\uB3D9\uBD80 \uD45C\uC900\uC2DC", "ET"};
-        String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEST",
-                                         "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AEDT",
-                                         "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "AET"};
-        String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET",
-                                     "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST",
-                                     "\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET"};
-        String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT",
-                                     "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST",
-                                     "\uAC00\uB098 \uD45C\uC900\uC2DC", "GMT"};
-        String GAMBIER[] =  new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT",
-                                          "\uac10\ube44\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GAMST",
-                                          "\uC7A0\uBE44\uC544 \uD45C\uC900\uC2DC", "GAMT"};
-        String GMT[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
-                                     "\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
-                                     "\uADF8\uB9AC\uB2C8\uCE58 \uD45C\uC900\uC2DC", "GMT"};
-        String GMTBST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT",
-                                        "\uc601\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BST",
-                                        "\uC601\uAD6D \uD45C\uC900\uC2DC", "BT"};
-        String GST[] = new String[] {"\uac78\ud504\ub9cc \ud45c\uc900\uc2dc", "GST",
-                                     "\uac78\ud504\ub9cc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GDT",
-                                     "\uAC78\uD504\uB9CC \uD45C\uC900\uC2DC", "GT"};
-        String HKT[] =  new String[] {"\ud64d\ucf69 \uc2dc\uac04", "HKT",
-                                      "\ud64d\ucf69 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HKST",
-                                      "\uD64D\uCF69 \uD45C\uC900\uC2DC", "HKT"};
-        String HST[] = new String[] {"\ud558\uc640\uc774 \ud45c\uc900\uc2dc", "HST",
-                                     "\ud558\uc640\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HDT",
-                                     "\uD558\uC640\uC774 \uD45C\uC900\uC2DC", "HT"};
-        String ICT[] = new String[] {"\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc2dc\uac04", "ICT",
-                                     "\uc778\ub3c4\ucc28\uc774\ub098 \ubc18\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ICST",
-                                     "\uC778\uB3C4\uCC28\uC774\uB098 \uBC18\uB3C4 \uD45C\uC900\uC2DC", "ICT"};
-        String IRKT[] =  new String[] {"\uc774\ub974\ucfe0\uce20\ud06c \uc2dc\uac04", "IRKT",
-                                       "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST",
-                                       "\uC774\uB974\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "IRKT"};
-        String IRT[] = new String[] {"\uc774\ub780 \ud45c\uc900\uc2dc", "IRST",
-                                     "\uc774\ub780 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRDT",
-                                     "\uC774\uB780 \uD45C\uC900\uC2DC", "IRT"};
-        String ISRAEL[] = new String[] {"\uc774\uc2a4\ub77c\uc5d8 \ud45c\uc900\uc2dc", "IST",
-                                        "\uc774\uc2a4\ub77c\uc5d8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IDT",
-                                        "\uC544\uC2A4\uB77C\uC5D8 \uD45C\uC900\uC2DC", "IT"};
-        String IST[] = new String[] {"\uc778\ub3c4 \ud45c\uc900\uc2dc", "IST",
-                                     "\uc778\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IDT",
-                                     "\uC778\uB3C4 \uD45C\uC900\uC2DC", "IT"};
-        String JST[] = new String[] {"\uc77c\ubcf8 \ud45c\uc900\uc2dc", "JST",
-                                     "\uc77c\ubcf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "JDT",
-                                     "\uC77C\uBCF8 \uD45C\uC900\uC2DC", "JT"};
-        String KRAT[] = new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
-                                      "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST",
-                                      "\uD06C\uB77C\uC2A4\uB178\uC57C\uB974\uC2A4\uD06C \uD45C\uC900\uC2DC", "KRAT"};
-        String KST[] = new String[] {"\ud55c\uad6d \ud45c\uc900\uc2dc", "KST",
-                                     "\ud55c\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KDT",
-                                     "\uB300\uD55C\uBBFC\uAD6D \uD45C\uC900\uC2DC", "KT"};
-        String LORD_HOWE[] = new String[] {"\ub85c\ub4dc \ud558\uc6b0 \ud45c\uc900\uc2dc", "LHST",
-                                           "\ub85c\ub4dc \ud558\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LHDT",
-                                           "\uB85C\uB4DC\uD558\uC6B0 \uD45C\uC900\uC2DC", "LHT"};
-        String MHT[] = new String[] {"\ub9c8\uc15c\uc81c\ub3c4 \uc2dc\uac04", "MHT",
-                                     "\ub9c8\uc15c\uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MHST",
-                                     "\uB9C8\uC15C \uC81C\uB3C4 \uD45C\uC900\uC2DC", "MHT"};
-        String MMT[] = new String[] {"\ubbf8\uc580\ub9c8 \uc2dc\uac04", "MMT",
-                                     "\ubbf8\uc580\ub9c8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MMST",
-                                     "\uBBF8\uC580\uB9C8 \uD45C\uC900\uC2DC", "MMT"};
-        String MSK[] = new String[] {"\ubaa8\uc2a4\ud06c\ubc14 \ud45c\uc900\uc2dc", "MSK",
-                                     "\ubaa8\uc2a4\ud06c\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MSD",
-                                     "\uBAA8\uC2A4\uD06C\uBC14 \uD45C\uC900\uC2DC", "MT"};
-        String MST[] = new String[] {"\uc0b0\uc9c0 \ud45c\uc900\uc2dc", "MST",
-                                     "\uc0b0\uc9c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MDT",
-                                     "\uC0B0\uC9C0 \uD45C\uC900\uC2DC", "MT"};
-        String MYT[] = new String[] {"\ub9d0\ub808\uc774\uc2dc\uc544 \uc2dc\uac04", "MYT",
-                                     "\ub9d0\ub808\uc774\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MYST",
-                                     "\uB9D0\uB808\uC774\uC2DC\uC544 \uD45C\uC900\uC2DC", "MYT"};
-        String NORONHA[] = new String[] {"Fernando de Noronha \uc2dc\uac04", "FNT",
-                                         "Fernando de Noronha \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "FNST",
-                                         "\uD398\uB974\uB09C\uB3C4 \uB4DC \uB178\uB85C\uD558 \uD45C\uC900\uC2DC", "FNT"};
-        String NOVT[] = new String[] {"\ub178\ube0c\uc2dc\ube4c\uc2a4\ud06c \uc2dc\uac04", "NOVT",
-                                      "\ub178\ube0c\uc2dc\ube4c\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NOVST",
-                                      "\uB178\uBCF4\uC2DC\uBE44\uB974\uC2A4\uD06C \uD45C\uC900\uC2DC", "NOVT"};
-        String NPT[] = new String[] {"\ub124\ud314 \uc2dc\uac04", "NPT",
-                                      "\ub124\ud314 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NPST",
-                                      "\uB124\uD314 \uD45C\uC900\uC2DC", "NPT"};
-        String NST[] = new String[] {"\ub274\ud380\ub4e4\ub79c\ub4dc \ud45c\uc900\uc2dc", "NST",
-                                     "\ub274\ud380\ub4e4\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NDT",
-                                     "\uB274\uD380\uB4E4\uB79C\uB4DC \uD45C\uC900\uC2DC", "NT"};
-        String NZST[] = new String[] {"\ub274\uc9c8\ub79c\ub4dc \ud45c\uc900\uc2dc", "NZST",
-                                      "\ub274\uc9c8\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NZDT",
-                                      "\uB274\uC9C8\uB79C\uB4DC \uD45C\uC900\uC2DC", "NZT"};
-        String PITCAIRN[] = new String[] {"Pitcairn \ud45c\uc900\uc2dc", "PST",
-                                          "Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT",
-                                          "\uD54F\uCF00\uC5B8 \uD45C\uC900\uC2DC", "PT"};
-        String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT",
-                                     "\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST",
-                                     "\uD30C\uD0A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "PKT"};
-        String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT",
-                                      "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST",
-                                      "\uD3EC\uB098\uD398 \uD45C\uC900\uC2DC", "PONT"};
-        String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST",
-                                     "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT",
-                                     "\uD0DC\uD3C9\uC591 \uD45C\uC900\uC2DC", "PT"};
-        String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST",
-                                      "\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST",
-                                      "\uB0A8\uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "SAT"};
-        String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT",
-                                     "\uc194\ub85c\ubaac \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SBST",
-                                     "\uC194\uB85C\uBAAC \uC81C\uB3C4 \uD45C\uC900\uC2DC", "SBT"};
-        String SGT[] = new String[] {"\uc2f1\uac00\ud3ec\ub974 \uc2dc\uac04", "SGT",
-                                     "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST",
-                                     "\uC2F1\uAC00\uD3EC\uB974 \uD45C\uC900\uC2DC", "SGT"};
-        String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEST",
-                                          "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AEDT",
-                                          "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "AET"};
-        String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT",
-                                     "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST",
-                                     "\uD22C\uB974\uD06C\uBA54\uB2C8\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "TMT"};
-        String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT",
-                                     "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST",
-                                     "\uC6B8\uB780\uBC14\uD1A0\uB974 \uD45C\uC900\uC2DC", "ULAT"};
-        String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT",
-                                     "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST",
-                                     "\uC11C\uBD80 \uC544\uD504\uB9AC\uCE74 \uD45C\uC900\uC2DC", "WAT"};
-        String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET",
-                                     "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST",
-                                     "\uC11C\uBD80 \uC720\uB7FD \uD45C\uC900\uC2DC", "WET"};
-        String WGT[] = new String[] {"\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc2dc\uac04", "WGT",
-                                     "\uc11c\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WGST",
-                                     "\uC11C\uBD80 \uADF8\uB9B0\uB780\uB4DC \uD45C\uC900\uC2DC", "WGT"};
-        String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB",
-                                     "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST",
-                                     "\uC11C\uBD80 \uC778\uB3C4\uB124\uC2DC\uC544 \uD45C\uC900\uC2DC", "WIB"};
-        String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWST",
-                                         "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWDT",
-                                         "\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "AWT"};
-        String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST",
-                                       "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT",
-                                       "\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "ST"};
-        String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WSST",
-                                           "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT",
-                                           "\uC11C\uC0AC\uBAA8\uC544 \uD45C\uC900\uC2DC", "WST"};
-        String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST",
-                                      "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT",
-                                      "\uCC28\uBAA8\uB974 \uD45C\uC900\uC2DC", "ChT"};
-        String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AEST",
-                                          "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "AEDT",
-                                          "\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "AET"};
-        String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
-                                     "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
-                                     "\uC9C0\uC5ED \uD45C\uC900\uC2DC", "UTC"};
-        String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT",
-                                     "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST",
-                                     "\uC6B0\uC988\uBCA0\uD0A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "UZT"};
-        String XJT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "XJT",
-                                     "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "XJDT",
-                                     "\uC911\uAD6D \uD45C\uC900\uC2DC", "XJT"};
-        String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
-                                      "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST",
-                                      "\uC57C\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"\ud30c\ub77c\uacfc\uc774 \uc2dc\uac04", "PYT",
-                                               "\ud30c\ub77c\uacfc\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PYST",
-                                               "\uD30C\uB77C\uACFC\uC774 \uD45C\uC900\uC2DC", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"\ucf5c\ub86c\ube44\uc544 \uc2dc\uac04", "COT",
-                                              "\ucf5c\ub86c\ube44\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "COST",
-                                              "\uCF5C\uB86C\uBE44\uC544 \uD45C\uC900\uC2DC", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"\ubca0\ub124\uc218\uc5d8\ub77c \uc2dc\uac04", "VET",
-                                              "\ubca0\ub124\uc218\uc5d8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VEST",
-                                              "\uBCA0\uB124\uC218\uC5D8\uB77C \uD45C\uC900\uC2DC", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc2dc\uac04", "GFT",
-                                              "\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST",
-                                              "\uD504\uB791\uC2A4\uB839 \uAE30\uC544\uB098 \uD45C\uC900\uC2DC", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"\uc5d0\ucfe0\uc544\ub3c4\ub974 \uc2dc\uac04", "ECT",
-                                                "\uc5d0\ucfe0\uc544\ub3c4\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ECST",
-                                                "\uC5D0\uCF70\uB3C4\uB974 \uD45C\uC900\uC2DC", "ECT"}},
-            {"America/Guyana", new String[] {"\uac00\uc774\uc544\ub098 \uc2dc\uac04", "GYT",
-                                             "\uac00\uc774\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GYST",
-                                             "\uAC00\uC774\uC544\uB098 \uD45C\uC900\uC2DC", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"\ubcfc\ub9ac\ube44\uc544 \uc2dc\uac04", "BOT",
-                                            "\ubcfc\ub9ac\ube44\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BOST",
-                                            "\uBCFC\uB9AC\uBE44\uC544 \uD45C\uC900\uC2DC", "BOT"}},
-            {"America/Lima", new String[] {"\ud398\ub8e8 \uc2dc\uac04", "PET",
-                                            "\ud398\ub8e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PEST",
-                                            "\uD398\uB8E8 \uD45C\uC900\uC2DC", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
-                                               "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT",
-                                               "\uD53C\uC5D0\uB974 \uBBF8\uD074\uB871 \uD45C\uC900\uC2DC", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"\uc6b0\ub8e8\uacfc\uc774 \uc2dc\uac04", "UYT",
-                                                 "\uc6b0\ub8e8\uacfc\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UYST",
-                                                 "\uC6B0\uB8E8\uACFC\uC774 \uD45C\uC900\uC2DC", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"\uc218\ub9ac\ub0a8 \uc2dc\uac04", "SRT",
-                                                 "\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST",
-                                                 "\uC218\uB9AC\uB0A8 \uD45C\uC900\uC2DC", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Davis \uc2dc\uac04", "DAVT",
-                                               "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST",
-                                               "\uB370\uC774\uBE44\uC2A4 \uD45C\uC900\uC2DC", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT",
-                                                        "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST",
-                                                        "\uB450\uBAAC\uD2B8\uC6B0\uB974\uBE4C \uD45C\uC900\uC2DC", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT",
-                                                "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST",
-                                                "\uB9C8\uC2A8 \uD45C\uC900\uC2DC", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"\ub85c\uc81c\ub77c \ud45c\uc900\uc2dc", "ROTT",
-                                                 "\ub85c\uc81c\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ROTST",
-                                                 "\uB85C\uB354\uB77C \uD45C\uC900\uC2DC", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT",
-                                               "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST",
-                                               "\uC1FC\uC640 \uD45C\uC900\uC2DC", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC",
-                                               "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST",
-                                                "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST",
-                                                "\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"\uc54c\ub9c8\uc544\ud0c0 \uc2dc\uac04", "ALMT",
-                                          "\uc54c\ub9c8\uc544\ud0c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ALMST",
-                                          "\uC54C\uB9C8\uC544\uD0C0 \uD45C\uC900\uC2DC", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"\uc544\ub098\ub514\ub974 \uc2dc\uac04", "ANAT",
-                                          "\uc544\ub098\ub514\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ANAST",
-                                          "\uC544\uB098\uB514\uB9AC \uD45C\uC900\uC2DC", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"\uc545\ud0c0\uc6b0 \uc2dc\uac04", "AQTT",
-                                         "\uc545\ud0c0\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AQTST",
-                                         "\uC544\uD06C\uD0C0\uC6B0 \uD45C\uC900\uC2DC", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"\uc545\ud1a0\ube0c \uc2dc\uac04", "AQTT",
-                                          "\uc545\ud1a0\ube0c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AQTST",
-                                          "\uC544\uD06C\uD1A0\uBCA0 \uD45C\uC900\uC2DC", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"\uc544\uc81c\ub974\ubc14\uc774\uc794 \uc2dc\uac04", "AZT",
-                                        "\uc544\uc81c\ub974\ubc14\uc774\uc794 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AZST",
-                                        "\uC544\uC81C\uB974\uBC14\uC774\uC794 \uD45C\uC900\uC2DC", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"\ud0a4\ub974\ud0a4\uc988\uc2a4\ud0c4 \uc2dc\uac04", "KGT",
-                                           "\ud0a4\ub974\uae30\uc988\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KGST",
-                                           "\uD0A4\uB974\uAE30\uC2A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "KGT"}},
-            {"Asia/Brunei", new String[] {"\ube0c\ub8e8\ub098\uc774 \uc2dc\uac04", "BNT",
-                                          "\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST",
-                                          "\uBE0C\uB8E8\uB098\uC774 \uD45C\uC900\uC2DC", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
-                                              "Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST",
-                                              "\uCD08\uC774\uBC1C\uC0B0 \uD45C\uC900\uC2DC", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"\ud2f0\ubaa8\ub974-\ub808\uc2a4\ud14c \uc2dc\uac04", "TLT",
-                                        "\ud2f0\ubaa8\ub974-\ub808\uc2a4\ud14c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TLST",
-                                        "\uB3D9\uD2F0\uBAA8\uB974 \uD45C\uC900\uC2DC", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "TJT",
-                                            "\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TJST",
-                                            "\uD0C0\uC9C0\uD0A4\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
-                                        "Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST",
-                                        "\uD638\uBE0C\uB4DC \uD45C\uC900\uC2DC", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT",
-                                            "\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST",
-                                            "\uB3D9\uBD80 \uC778\uB3C4\uB124\uC2DC\uC544 \uD45C\uC900\uC2DC", "WIT"}},
-            {"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT",
-                                         "\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST",
-                                         "\uC544\uD504\uAC00\uB2C8\uC2A4\uD0C4 \uD45C\uC900\uC2DC", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc2dc\uac04", "PETT",
-                                            "\ud398\ud2b8\ub85c\ud30c\ube14\ub85c\ud504\uc2a4\ud06c-\uce84\ucc28\uce20\ud0a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PETST",
-                                            "\uD398\uD2B8\uB85C\uD30C\uBE0C\uB85C\uD504\uC2A4\uD06C-\uCE84\uCC28\uCE20\uD0A4 \uD45C\uC900\uC2DC", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"\ub9c8\uac00\ub2e8 \uc2dc\uac04", "MAGT",
-                                           "\ub9c8\uac00\ub2e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAGST",
-                                           "\uB9C8\uAC00\uB2E8 \uD45C\uC900\uC2DC", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Oral \ud45c\uc900\uc2dc", "ORAT",
-                                        "Oral \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ORAST",
-                                        "\uC624\uB7F4 \uD45C\uC900\uC2DC", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Omsk \uc2dc\uac04", "OMST",
-                                        "Omsk \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "OMSST",
-                                        "\uC634\uC2A4\uD06C \uD45C\uC900\uC2DC", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Qyzylorda \ud45c\uc900\uc2dc", "QYZT",
-                                             "Qyzylorda \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "QYZST",
-                                             "\uD0A4\uC9C8\uB85C\uB974\uB2E4 \uD45C\uC900\uC2DC", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"\uc0ac\ud560\ub9b0 \uc2dc\uac04", "SAKT",
-                                            "\uc0ac\ud560\ub9b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAKST",
-                                            "\uC0AC\uD560\uB9B0 \uD45C\uC900\uC2DC", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"\uadf8\ub8e8\uc9c0\uc57c \uc2dc\uac04", "GET",
-                                          "\uadf8\ub8e8\uc9c0\uc57c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GEST",
-                                          "\uADF8\uB8E8\uC9C0\uC57C \uD45C\uC900\uC2DC", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT",
-                                            "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST" ,
-                                            "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
-                                               "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST",
-                                               "\uBE14\uB77C\uB514\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc2dc\uac04", "YEKT",
-                                                 "\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YEKST",
-                                                 "\uC608\uCE74\uD14C\uB9B0\uBD80\uB974\uD06C \uD45C\uC900\uC2DC", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"\uc544\uc870\ub808\uc2a4 \uc2dc\uac04", "AZOT",
-                                              "\uc544\uc870\ub808\uc2a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AZOST",
-                                              "\uC544\uC870\uB808\uC2A4 \uD45C\uC900\uC2DC", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"\uae4c\ubf40\ubca0\ub974\ub370 \uc2dc\uac04", "CVT",
-                                                  "\uae4c\ubf40\ubca0\ub974\ub370 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CVST",
-                                                  "\uCF00\uC774\uD504\uBCA0\uB974\uB370 \uD45C\uC900\uC2DC", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"\uc0ac\uc6b0\uc2a4 \uc870\uc9c0\uc544 \ud45c\uc900\uc2dc", "GST",
-                                                     "\uc0ac\uc6b0\uc2a4 \uc870\uc9c0\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GDT",
-                                                     "\uC0AC\uC6B0\uC2A4\uC870\uC9C0\uC544 \uD45C\uC900\uC2DC", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"\ud3ec\ud074\ub79c\ub4dc \uad70\ub3c4 \uc2dc\uac04", "FKT",
-                                               "\ud3ec\ud074\ub79c\ub4dc \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "FKST",
-                                               "\uD3EC\uD074\uB79C\uB4DC \uC81C\uB3C4 \uD45C\uC900\uC2DC", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWST",
-                                              "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWDT",
-                                              "\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"\uc0ac\ub9c8\ub77c \uc2dc\uac04", "SAMT",
-                                            "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST",
-                                            "\uC0AC\uB9C8\uB77C \uD45C\uC900\uC2DC", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"\uc601\uc778\ub3c4 \uc81c\ub3c4 \uc2dc\uac04", "IOT",
-                                            "\uc601\uc778\ub3c4 \uc81c\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IOST",
-                                            "\uC778\uB3C4\uC591 \uC2DD\uBBFC\uC9C0 \uD45C\uC900\uC2DC", "IOT"}},
-            {"Indian/Christmas", new String[] {"\ud06c\ub9ac\uc2a4\ub9c8\uc2a4\uc12c \uc2dc\uac04", "CXT",
-                                               "\ud06c\ub9ac\uc2a4\ub9c8\uc2a4\uc12c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CXST",
-                                               "\uD06C\uB9AC\uC2A4\uB9C8\uC2A4 \uC12C \uD45C\uC900\uC2DC", "CIT"}},
-            {"Indian/Cocos", new String[] {"\ucf54\ucf54\uc2a4 \uad70\ub3c4 \uc2dc\uac04", "CCT",
-                                           "\ucf54\ucf54\uc2a4 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CCST",
-                                           "\uCF54\uCF54\uC2A4 \uC81C\uB3C4 \uD45C\uC900\uC2DC", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"\ud504\ub791\uc2a4 \ub0a8\ubd80 \uc9c0\ubc29 \ubc0f \ub0a8\uadf9 \uc9c0\uc5ed \uc2dc\uac04", "TFT",
-                                               "\ud504\ub791\uc2a4 \ub0a8\ubd80 \uc9c0\ubc29 \ubc0f \ub0a8\uadf9 \uc9c0\uc5ed \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TFST",
-                                               "\uD504\uB791\uC2A4\uB839 \uB0A8\uBD80 \uBC0F \uB0A8\uADF9 \uB300\uB959 \uD45C\uC900\uC2DC", "TFT"}},
-            {"Indian/Mahe", new String[] {"\uc138\uc774\uc140 \uc2dc\uac04", "SCT",
-                                          "\uc138\uc774\uc258 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SCST",
-                                          "\uC138\uC774\uC178 \uD45C\uC900\uC2DC", "SCT"}},
-            {"Indian/Maldives", new String[] {"\ubab0\ub514\ube0c \uc2dc\uac04", "MVT",
-                                              "\ubab0\ub514\ube0c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MVST",
-                                              "\uBAB0\uB514\uBE0C \uD45C\uC900\uC2DC", "MVT"}},
-            {"Indian/Mauritius", new String[] {"\ubaa8\ub9ac\uc154\uc2a4 \uc2dc\uac04", "MUT",
-                                               "\ubaa8\ub9ac\uc154\uc2a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MUST",
-                                               "\uBAA8\uB9AC\uC154\uC2A4 \uD45C\uC900\uC2DC", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"\ub9ac\uc720\ub2c8\uc5b8 \uc2dc\uac04", "RET",
-                                             "\ub9ac\uc720\ub2c8\uc5b8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "REST",
-                                             "\uB808\uC704\uB2C8\uC639 \uD45C\uC900\uC2DC", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"\ube44\ub204\uc544\ud22c \uc2dc\uac04", "VUT",
-                                            "\ubc14\ub204\uc544\ud22c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VUST",
-                                            "\uBC14\uB204\uC544\uD22C \uD45C\uC900\uC2DC", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"\ud53c\ub2c9\uc2a4 \uad70\ub3c4 \uc2dc\uac04", "PHOT",
-                                                "\ud53c\ub2c9\uc2a4 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PHOST",
-                                                "\uD53C\uB2C9\uC2A4 \uC81C\uB3C4 \uD45C\uC900\uC2DC", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"\ud1a0\ucf08\ub77c\uc6b0 \uc2dc\uac04", "TKT",
-                                              "\ud1a0\ucf08\ub77c\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TKST",
-                                              "\uD1A0\uCF08\uB77C\uC6B0 \uD45C\uC900\uC2DC", "TKT"}},
-            {"Pacific/Fiji", new String[] {"\ud53c\uc9c0 \uc2dc\uac04", "FJT",
-                                          "\ud53c\uc9c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "FJST",
-                                          "\uD53C\uC9C0 \uD45C\uC900\uC2DC", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"\ud22c\ubc1c\ub8e8 \uc2dc\uac04", "TVT",
-                                             "\ud22c\ubc1c\ub8e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TVST",
-                                             "\uD22C\uBC1C\uB8E8 \uD45C\uC900\uC2DC", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"\uac08\ub77c\ud30c\uace0\uc2a4 \uc2dc\uac04", "GALT",
-                                                "\uac08\ub77c\ud30c\uace0\uc2a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GALST",
-                                                "\uAC08\uB77C\uD30C\uACE0\uC2A4 \uD45C\uC900\uC2DC", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"\ub77c\uc778 \uad70\ub3c4 \uc2dc\uac04", "LINT",
-                                                 "\ub77c\uc778 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "LINST",
-                                                 "\uB77C\uC778 \uC81C\uB3C4 \uD45C\uC900\uC2DC", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"\ucf54\uc2a4\ub798 \uc2dc\uac04", "KOST",
-                                             "\ucf54\uc2a4\ub798 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KOSST",
-                                             "\uCF54\uC2A4\uB808 \uD45C\uC900\uC2DC", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"\ub9c8\ub974\ucf00\uc0ac\uc2a4 \uc2dc\uac04", "MART",
-                                                "\ub9c8\ub974\ucf00\uc0ac\uc2a4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MARST",
-                                                "\uB9C8\uD0A4\uC800\uC2A4 \uD45C\uC900\uC2DC", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"\ub098\uc6b0\ub8e8 \uc2dc\uac04", "NRT",
-                                           "\ub098\uc6b0\ub8e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NRST",
-                                           "\uB098\uC6B0\uB8E8 \uD45C\uC900\uC2DC", "NRT"}},
-            {"Pacific/Niue", new String[] {"\ub2c8\uc6b0\uc5d0 \uc2dc\uac04", "NUT",
-                                           "\ub2c8\uc6b0\uc5d0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NUST",
-                                           "\uB2C8\uC6B0\uC5D0 \uD45C\uC900\uC2DC", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"\ub178\ud37d \uc2dc\uac04", "NFT",
-                                              "\ub178\ud37d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NFST",
-                                              "\uB178\uD37D \uD45C\uC900\uC2DC", "NFT"}},
-            {"Pacific/Noumea", new String[] {"\ub274 \uce7c\ub808\ub3c4\ub2c8\uc544 \uc2dc\uac04", "NCT",
-                                             "\ub274 \uce7c\ub808\ub3c4\ub2c8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NCST",
-                                             "\uB274 \uCE7C\uB808\uB3C4\uB2C8\uC544 \uD45C\uC900\uC2DC", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"\ud314\ub77c\uc6b0 \uc2dc\uac04", "PWT",
-                                            "\ud314\ub77c\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PWST",
-                                            "\uD314\uB77C\uC6B0 \uD45C\uC900\uC2DC", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc2dc\uac04", "PGT",
-                                                  "\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PGST",
-                                                  "\uD30C\uD478\uC544 \uB274\uAE30\uB2C8\uC544 \uD45C\uC900\uC2DC", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"\ucfe0\ud06c \uad70\ub3c4 \uc2dc\uac04", "CKT",
-                                                "\ucfe0\ud06c \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CKHST",
-                                                "\uCFE1 \uC81C\uB3C4 \uD45C\uC900\uC2DC", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"\ud0c0\ud788\ud2f0 \uc2dc\uac04", "TAHT",
-                                             "\ud0c0\ud788\ud2f0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TAHST",
-                                             "\uD0C0\uD788\uD2F0 \uD45C\uC900\uC2DC", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"\uae38\ubc84\ud2b8 \uad70\ub3c4 \uc2dc\uac04", "GILT",
-                                             "\uae38\ubc84\ud2b8 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GILST",
-                                             "\uAE38\uBC84\uD2B8 \uC81C\uB3C4 \uD45C\uC900\uC2DC", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"\ud1b5\uac00 \uc2dc\uac04", "TOT",
-                                                "\ud1b5\uac00 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TOST",
-                                                "\uD1B5\uAC00 \uD45C\uC900\uC2DC", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"\uc6e8\uc774\ud06c \uc2dc\uac04", "WAKT",
-                                           "\uc6e8\uc774\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAKST",
-                                           "\uC6E8\uC774\uD06C \uD45C\uC900\uC2DC", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"\uc6d4\ub9ac\uc2a4 \ud6c4\ud22c\ub098 \uc2dc\uac04", "WFT",
-                                             "\uc6d4\ub9ac\uc2a4 \ud6c4\ud2b8\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WFST",
-                                             "\uC6D4\uB9AC\uC2A4 \uD478\uD22C\uB098 \uD45C\uC900\uC2DC", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
deleted file mode 100644
index 8f79d22ca4e..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST",
-                                     "Fuso hor\u00e1rio do Acre", "ACT"};
-        String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "ACST",
-                                          "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "ACDT",
-                                          "Hor\u00E1rio Central (Austr\u00E1lia do Sul)", "ACT"};
-        String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST",
-                                     "Hor\u00E1rio da Argentina", "ART"};
-        String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST",
-                                      "Hor\u00e1rio de luz natural do Alaska", "AKDT",
-                                      "Hor\u00E1rio do Alasca", "AKT"};
-        String AMT[] = new String[] {"Fuso hor\u00e1rio do Amazonas", "AMT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Amazonas", "AMST",
-                                     "Hor\u00E1rio do Amazonas", "AMT"};
-        String ARAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ar\u00e1bia", "AST",
-                                       "Hor\u00e1rio de luz natural da Ar\u00e1bia", "ADT",
-                                       "Hor\u00E1rio da Ar\u00E1bia", "AT"};
-        String ARMT[] = new String[] {"Fuso hor\u00e1rio da Arm\u00eania", "AMT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o da Arm\u00eania", "AMST",
-                                      "Hor\u00E1rio da Arm\u00EAnia", "AMT"};
-        String AST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Atl\u00e2ntico", "AST",
-                                     "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT",
-                                     "Hor\u00E1rio do Atl\u00E2ntico", "AT"};
-        String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST",
-                                     "Hor\u00E1rio de Bangladesh", "BDT"};
-        String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "AEST",
-                                          "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "AEDT",
-                                          "Hor\u00E1rio do Leste (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACST",
-                                             "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACDT",
-                                             "Hor\u00E1rio Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "ACT"};
-        String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST",
-                                     "Hor\u00E1rio de Bras\u00EDlia", "BRT"};
-        String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o de But\u00e3o", "BTST",
-                                     "Hor\u00E1rio do But\u00E3o", "BTT"};
-        String CAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Central", "CAT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Central", "CAST",
-                                     "Hor\u00E1rio da \u00C1frica Central", "CAT"};
-        String CET[] = new String[] {"Fuso hor\u00e1rio da Europa Central", "CET",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST",
-                                     "Hor\u00E1rio da Europa Central", "CET"};
-        String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST",
-                                       "Hor\u00e1rio de luz natural de Chatham", "CHADT",
-                                       "Hor\u00E1rio de Chatham", "CHAT"};
-        String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "WITA",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST",
-                                     "Hor\u00E1rio da Indon\u00E9sia Central", "WITA"};
-        String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST",
-                                     "Hor\u00E1rio do Chile", "CLT"};
-        String CST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central", "CST",
-                                     "Hor\u00e1rio de luz natural central", "CDT",
-                                     "Hor\u00E1rio Central", "CT"};
-        String CTT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "CST",
-                                     "Hor\u00e1rio de luz natural da China", "CDT",
-                                     "Hor\u00E1rio da China", "CT"};
-        String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST",
-                                      "Hor\u00e1rio de luz natural de Cuba", "CDT",
-                                      "Hor\u00E1rio de Cuba", "CT"};
-        String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "ACST",
-                                        "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "ACDT",
-                                        "Hor\u00E1rio Central (Territ\u00F3rio do Norte)", "ACT"};
-        String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST",
-                                        "Hor\u00E1rio da Rep\u00FAblica da Irlanda", "IT"};
-        String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT",
-                                     "Fuso hor\u00e1rio padr\u00e3o da \u00c1frica Oriental", "EAST",
-                                     "Hor\u00E1rio do Leste da \u00C1frica", "EAT"};
-        String EASTER[] = new String[] {"Fuso hor\u00e1rio da Ilha de P\u00e1scoa", "EAST",
-                                        "Fuso hor\u00e1rio de ver\u00e3o da Ilha de P\u00e1scoa", "EASST",
-                                        "Hor\u00E1rio da Ilha de P\u00E1scoa", "EAST"};
-        String EET[] = new String[] {"Fuso hor\u00e1rio da Europa Oriental", "EET",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Europa Oriental", "EEST",
-                                     "Hor\u00e1rio da Europa Oriental", "EET"};
-        String EGT[] = new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Oriental", "EGT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST",
-                                     "Hor\u00E1rio da Groenl\u00E2ndia Oriental", "EGT"};
-        String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST",
-                                     "Hor\u00e1rio de luz natural oriental", "EDT",
-                                     "Hor\u00E1rio do Leste", "ET"};
-        String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "AEST",
-                                         "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "AEDT",
-                                         "Hor\u00E1rio Oriental (Nova Gales do Sul)", "AET"};
-        String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET",
-                                     "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST",
-                                     "Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET"};
-        String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST",
-                                      "Fuso Hor\u00E1rio do Meridiano de Gana", "GMT"};
-        String GAMBIER[] =  new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o de Gambier", "GAMST",
-                                          "Hor\u00E1rio de Gambier", "GAMT"};
-        String GMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
-                                     "Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
-                                     "Hor\u00E1rio M\u00E9dio de Greenwich", "GMT"};
-        String GMTBST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o da Gr\u00e3-Bretanha", "BST",
-                                        "Hor\u00E1rio do Reino Unido", "BT"};
-        String GST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do golfo", "GST",
-                                     "Hor\u00e1rio de luz natural do golfo", "GDT",
-                                     "Hor\u00E1rio do Golfo", "GT"};
-        String HKT[] =  new String[] {"Fuso hor\u00e1rio de Hong Kong", "HKT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Hong Kong", "HKST",
-                                      "Hor\u00E1rio de Hong Kong", "HKT"};
-        String HST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed", "HST",
-                                     "Hor\u00e1rio de luz natural do Hava\u00ed", "HDT",
-                                     "Hor\u00E1rio do Hava\u00ED", "HT"};
-        String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST",
-                                     "Hor\u00E1rio da Indochina", "ICT"};
-        String IRKT[] = new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST",
-                                      "Hor\u00E1rio de Irkutsk", "IRKT"};
-        String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST",
-                                     "Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT",
-                                     "Hor\u00E1rio do Ir\u00E3", "IRT"};
-        String ISRAEL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Israel", "IST",
-                                        "Hor\u00e1rio de luz natural de Israel", "IDT",
-                                        "Hor\u00E1rio de Israel", "IT"};
-        String IST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00cdndia", "IST",
-                                     "Hor\u00e1rio de luz natural da \u00cdndia", "IDT",
-                                     "Hor\u00E1rio da \u00CDndia", "IT"};
-        String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST",
-                                     "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT",
-                                     "Hor\u00E1rio do Jap\u00E3o", "JT"};
-        String KRAT[] = new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST",
-                                      "Hor\u00E1rio de Krasnoyarsk", "KRAT"};
-        String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST",
-                                     "Hor\u00e1rio de luz natural da Coreia", "KDT",
-                                     "Hor\u00E1rio da Coreia", "KT"};
-        String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHDT",
-                                           "Hor\u00E1rio de Lord Howe", "LHT"};
-        String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST",
-                                     "Hor\u00E1rio das Ilhas Marshall", "MHT"};
-        String MSK[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Moscou", "MSK",
-                                     "Hor\u00e1rio de luz natural de Moscou", "MSD",
-                                     "Hor\u00E1rio de Moscou", "MT"};
-        String MMT[] = new String[] {"Fuso hor\u00e1rio de Mianmar", "MMT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o de Mianmar", "MMST",
-                                     "Hor\u00E1rio de Mianmar", "MMT"};
-        String MST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o das montanhas", "MST",
-                                     "Hor\u00e1rio de luz natural das montanhas", "MDT",
-                                     "Hor\u00E1rio das Montanhas Rochosas", "MT"};
-        String MYT[] = new String[] {"Fuso hor\u00e1rio da Mal\u00e1sia", "MYT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Mal\u00e1sia", "MYST",
-                                     "Hor\u00E1rio da Mal\u00E1sia", "MYT"};
-        String NORONHA[] = new String[] {"Fuso hor\u00e1rio de Fernando de Noronha", "FNT",
-                                         "Fuso hor\u00e1rio de ver\u00e3o de Fernando de Noronha", "FNST",
-                                         "Hor\u00E1rio de Fernando de Noronha", "FNT"};
-        String NOVT[] = new String[] {"Fuso hor\u00e1rio de Novosibirsk", "NOVT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Novosibirsk", "NOVST",
-                                      "Hor\u00E1rio de Novosibirsk", "NOVT"};
-        String NPT[] = new String[] {"Fuso hor\u00e1rio do Nepal", "NPT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Nepal", "NPST",
-                                     "Hor\u00E1rio do Nepal", "NPT"};
-        String NST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Terra Nova", "NST",
-                                     "Hor\u00e1rio de luz natural de Terra Nova", "NDT",
-                                     "Hor\u00E1rio de Terra Nova", "NT"};
-        String NZST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Nova Zel\u00e2ndia", "NZST",
-                                      "Hor\u00e1rio de luz natural da Nova Zel\u00e2ndia", "NZDT",
-                                      "Hor\u00E1rio da Nova Zel\u00E2ndia", "NZT"};
-        String PITCAIRN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Pitcairn", "PST",
-                                          "Hor\u00e1rio de luz natural de Pitcairn", "PDT",
-                                          "Hor\u00E1rio de Pitcairn", "PT"};
-        String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST",
-                                     "Hor\u00E1rio do Paquist\u00E3o", "PKT"};
-        String PONT[] = new String[] {"Fuso Hor\u00E1rio de Pohnpei", "PONT",
-                                      "Fuso Hor\u00E1rio de Ver\u00E3o de Pohnpei", "PONST",
-                                      "Hor\u00E1rio de Ponape", "PONT"};
-        String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST",
-                                     "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT",
-                                     "Hor\u00E1rio do Pac\u00EDfico", "PT"};
-        String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST",
-                                      "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST",
-                                      "Hor\u00E1rio da \u00C1frica do Sul", "SAT"};
-        String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Salom\u00e3o", "SBST",
-                                     "Hor\u00E1rio das Ilhas Salom\u00E3o", "SBT"};
-        String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT",
-                                     "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST",
-                                     "Hor\u00E1rio de Cingapura", "SGT"};
-        String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "AEST",
-                                          "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "AEDT",
-                                          "Hor\u00E1rio do Leste (Tasm\u00E2nia)", "AET"};
-        String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST",
-                                     "Hor\u00E1rio do Turcomenist\u00E3o", "TMT"};
-        String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT",
-                                      "Fuso Hor\u00E1rio de Ver\u00E3o de Chuuk", "CHUST",
-                                      "Fuso Hor\u00E1rio de Chuuk", "CHUT"};
-        String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST",
-                                     "Hor\u00E1rio de Ulaanbaatar", "ULAT"};
-        String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST",
-                                     "Hor\u00E1rio da \u00C1frica Ocidental", "WAT"};
-        String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST",
-                                     "Hor\u00E1rio da Europa Ocidental", "WET"};
-        String WGT[] = new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Ocidental", "WGT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST",
-                                     "Hor\u00E1rio da Groenl\u00E2ndia Ocidental", "WGT"};
-        String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB",
-                                     "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST",
-                                     "Hor\u00E1rio da Indon\u00E9sia Ocidental", "WIB"};
-        String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "AWST",
-                                         "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "AWDT",
-                                         "Hor\u00E1rio Ocidental (Austr\u00E1lia)", "AWT"};
-        String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST",
-                                       "Hor\u00e1rio de luz natural de Samoa", "SDT",
-                                       "Hor\u00E1rio da Samoa", "ST"};
-        String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WSST",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT",
-                                           "Fuso Hor\u00E1rio de Samoa Ocidental", "WST"};
-        String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST",
-                                      "Hor\u00e1rio de luz natural de Chamorro", "ChDT",
-                                      "Hor\u00E1rio de Chamorro", "ChT"};
-        String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "AEST",
-                                          "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "AEDT",
-                                          "Hor\u00E1rio do Leste (Victoria)", "AET"};
-        String UTC[] = new String[] {"Tempo universal coordenado", "UTC",
-                                     "Tempo universal coordenado", "UTC",
-                                     "Hor\u00E1rio Universal Coordenado", "UTC"};
-        String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT",
-                                     "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST",
-                                     "Hor\u00E1rio do Uzbequist\u00E3o", "UZT"};
-        String XJT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "XJT",
-                                     "Hor\u00e1rio de luz natural da China", "XJDT",
-                                     "Hor\u00E1rio da China", "XJT"};
-        String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
-                                      "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST",
-                                      "Hor\u00E1rio de Yakutsk", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Fuso hor\u00e1rio do Paraguai", "PYT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o do Paraguai", "PYST",
-                                               "Hor\u00E1rio do Paraguai", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Fuso hor\u00e1rio da Col\u00f4mbia", "COT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o da Col\u00f4mbia", "COST",
-                                             "Hor\u00E1rio da Col\u00F4mbia", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Fuso hor\u00e1rio da Venezuela", "VET",
-                                              "Fuso hor\u00e1rio de ver\u00e3o da Venezuela", "VEST",
-                                              "Hor\u00E1rio da Venezuela", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Fuso hor\u00e1rio da Guiana Francesa", "GFT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST",
-                                              "Hor\u00E1rio da Guiana Francesa", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Fuso hor\u00e1rio do Equador", "ECT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o do Equador", "ECST",
-                                                "Hor\u00E1rio do Equador", "ECT"}},
-            {"America/Guyana", new String[] {"Fuso hor\u00e1rio da Guiana", "GYT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o da Guiana", "GYST",
-                                             "Hor\u00E1rios da Guiana", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Fuso hor\u00e1rio da Bol\u00edvia", "BOT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o da Bol\u00edvia", "BOST",
-                                             "Hor\u00E1rio da Bol\u00EDvia", "BOT"}},
-            {"America/Lima", new String[] {"Fuso hor\u00e1rio do Peru", "PET",
-                                           "Fuso hor\u00e1rio de ver\u00e3o do Peru", "PEST",
-                                           "Hor\u00E1rio do Peru", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
-                                               "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT",
-                                               "Hor\u00E1rio de Saint Pierre e Miquelon", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Fuso hor\u00e1rio do Uruguai", "UYT",
-                                                 "Fuso hor\u00e1rio de ver\u00e3o do Uruguai", "UYST",
-                                                 "Hor\u00E1rio do Uruguai", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Fuso hor\u00e1rio do Suriname", "SRT",
-                                                 "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST",
-                                                 "Hor\u00E1rio do Suriname", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Fuso hor\u00e1rio de Davis", "DAVT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST",
-                                               "Hor\u00E1rio de Davis", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT",
-                                                        "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST",
-                                                        "Fuso Hor\u00E1rio de Dumont-d'Urville", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST",
-                                                "Hor\u00E1rio de Mawson", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Fuso hor\u00e1rio de Rothera", "ROTT",
-                                                 "Fuso hor\u00e1rio de ver\u00e3o de Rothera", "ROTST",
-                                                 "Hor\u00E1rio de Rothera", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST",
-                                               "Hor\u00E1rio de Syowa", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Tempo universal coordenado", "UTC",
-                                               "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST",
-                                                "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST",
-                                                "Hor\u00E1rio de Vostok", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST",
-                                          "Hor\u00E1rio de Alma-Ata", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST",
-                                          "Hor\u00E1rio de Anadyr", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT",
-                                         "Fuso hor\u00e1rio de ver\u00e3o de Aqtau", "AQTST",
-                                         "Hor\u00E1rio de Aqtau", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Fuso hor\u00e1rio de Aqtobe", "AQTT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o de Aqtobe", "AQTST",
-                                          "Hor\u00E1rio de Aqtobe", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Fuso hor\u00e1rio do Azerbaij\u00e3o", "AZT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o do Azerbaij\u00e3o", "AZST",
-                                        "Hor\u00E1rio do Azerbaij\u00E3o", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Fuso hor\u00e1rio do Quirguist\u00e3o", "KGT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o do Quirguist\u00e3o", "KGST",
-                                           "Hor\u00E1rio do Quirguist\u00E3o", "KGT"}},
-            {"Asia/Brunei", new String[] {"Fuso hor\u00e1rio de Brunei", "BNT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST",
-                                          "Hor\u00E1rio de Brunei", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST",
-                                              "Hor\u00E1rio de Choibalsan", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Fuso hor\u00e1rio do Timor-Leste", "TLT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o do Timor-Leste", "TLST",
-                                        "Hor\u00E1rio do Timor-Leste", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Fuso hor\u00e1rio do Tadjiquist\u00e3o", "TJT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST",
-                                            "Hor\u00E1rio do Tadjiquist\u00E3o", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST",
-                                        "Hor\u00E1rio de Hovd", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST",
-                                            "Hor\u00E1rio da Indon\u00E9sia Oriental", "WIT"}},
-            {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT",
-                                         "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST",
-                                         "Hor\u00E1rio do Afeganist\u00E3o", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Fuso hor\u00e1rio de Petropavlovsk-Kamchatski", "PETT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST",
-                                             "Hor\u00E1rio de Petropavlovsk-Kamchatski", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Fuso hor\u00e1rio de Magadan", "MAGT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Magadan", "MAGST",
-                                           "Hor\u00E1rio de Magadan", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT",
-                                        "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST",
-                                        "Hor\u00E1rio de Uralsk", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Fuso hor\u00e1rio de Omsk", "OMST",
-                                        "Fuso hor\u00e1rio de ver\u00e3o de Omsk", "OMSST",
-                                        "Hor\u00E1rio de Omsk", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Fuso hor\u00e1rio de Kizil-Orda", "QYZT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o de Kizil-Orda", "QYZST",
-                                             "Hor\u00E1rio de Qyzylorda", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Fuso hor\u00e1rio de Sakhalina", "SAKT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o de Sakhalina", "SAKST",
-                                            "Hor\u00E1rio de Sakhalin", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Fuso hor\u00e1rio da Ge\u00f3rgia", "GET",
-                                           "Fuso hor\u00e1rio de ver\u00e3o da Ge\u00f3rgia", "GEST",
-                                           "Hor\u00E1rio da Ge\u00F3rgia", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT",
-                                            "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST",
-                                            "Hor\u00E1rio de Ust-Nera", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST",
-                                               "Hor\u00E1rio de Vladivostok", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT",
-                                                 "Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST",
-                                                 "Hor\u00E1rio de Yekaterinburg", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Fuso hor\u00e1rio das A\u00e7ores", "AZOT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o das A\u00e7ores", "AZOST",
-                                              "Hor\u00E1rio de A\u00E7ores", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Fuso hor\u00e1rio de Cabo Verde", "CVT",
-                                                  "Fuso hor\u00e1rio de ver\u00e3o de Cabo Verde", "CVST",
-                                                  "Hor\u00E1rio de Cabo Verde", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ge\u00f3rgia do Sul", "GST",
-                                                     "Hor\u00e1rio de luz natural da Ge\u00f3rgia do Sul", "GDT",
-                                                     "Hor\u00E1rio da Ge\u00F3rgia do Sul", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Fuso hor\u00e1rio das Ilhas Falkland", "FKT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Falkland", "FKST",
-                                               "Hor\u00E1rio das Ilhas Malvinas", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "ACWST",
-                                              "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "ACWDT",
-                                              "Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Fuso hor\u00e1rio de Samara", "SAMT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST",
-                                            "Hor\u00E1rio de Samara", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Fuso hor\u00e1rio dos territ\u00f3rios do Oceano \u00cdndico", "IOT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o dos territ\u00f3rios do Oceano \u00cdndico", "IOST",
-                                            "Hor\u00E1rio do Territ\u00F3rio do Oceano \u00CDndico", "IOT"}},
-            {"Indian/Christmas", new String[] {"Fuso hor\u00e1rio das Ilhas Christmas", "CXT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Christmas", "CXST",
-                                               "Hor\u00E1rio da Ilha Christmas", "CIT"}},
-            {"Indian/Cocos", new String[] {"Fuso hor\u00e1rio das Ilhas Cocos", "CCT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cocos", "CCST",
-                                           "Hor\u00E1rio das Ilhas Cocos", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Fuso hor\u00e1rio das Terras Austrais e Ant\u00e1rticas Francesas", "TFT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o das Terras Austrais e Ant\u00e1rticas Francesas", "TFST",
-                                               "Hor\u00E1rio do Territ\u00F3rio Franc\u00EAs no Sul da Ant\u00E1rtica", "TFT"}},
-            {"Indian/Mahe", new String[] {"Fuso hor\u00e1rio das Seychelles", "SCT",
-                                          "Fuso hor\u00e1rio de ver\u00e3o das Seychelles", "SCST",
-                                          "Hor\u00E1rio de Seychelles", "SCT"}},
-            {"Indian/Maldives", new String[] {"Fuso hor\u00e1rio das Maldivas", "MVT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o das Maldivas", "MVST",
-                                              "Hor\u00E1rio das Maldivas", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Fuso hor\u00e1rio das Ilhas Maur\u00edcio", "MUT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Maur\u00edcio", "MUST",
-                                               "Hor\u00E1rio de Maur\u00EDcio", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Fuso hor\u00e1rio de Reuni\u00e3o", "RET",
-                                             "Fuso hor\u00e1rio de ver\u00e3o de Reuni\u00e3o", "REST",
-                                             "Hor\u00E1rio das Ilhas Reuni\u00E3o", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", TRUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Fuso hor\u00e1rio de Vanuatu", "VUT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o de Vanuatu", "VUST",
-                                            "Hor\u00E1rio de Vanuatu", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Fuso hor\u00e1rio das Ilhas F\u00e9nix", "PHOT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o das Ilhas F\u00e9nix", "PHOST",
-                                                "Hor\u00E1rio da Ilha Phoenix", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Fuso hor\u00e1rio de Tokelau", "TKT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o de Tokelau", "TKST",
-                                              "Hor\u00E1rio de Toquelau", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Fuso hor\u00e1rio de Fiji", "FJT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Fiji", "FJST",
-                                           "Hor\u00E1rio de Fiji", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Fuso hor\u00e1rio de Tuvalu", "TVT",
-                                               "Fuso hor\u00e1rio de ver\u00e3o de Tuvalu", "TVST",
-                                               "Hor\u00E1rio de Tuvalu", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Fuso hor\u00e1rio das Ilhas Gal\u00e1pagos", "GALT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gal\u00e1pagos", "GALST",
-                                                "Hor\u00E1rio de Gal\u00E1pagos", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Fuso hor\u00e1rio das Esp\u00f3rades Equatoriais", "LINT",
-                                                 "Fuso hor\u00e1rio de ver\u00e3o das Esp\u00f3rades Equatoriais", "LINST",
-                                                 "Hor\u00E1rio das Ilhas Line", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Fuso hor\u00e1rio de Kosrae", "KOST",
-                                             "Fuso hor\u00e1rio de ver\u00e3o de Kosrae", "KOSST",
-                                             "Hor\u00E1rio de Kosrae", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Fuso hor\u00e1rio das Ilhas Marquesas", "MART",
-                                                "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marquesas", "MARST",
-                                                "Hor\u00E1rio das Ilhas Marquesas", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Fuso hor\u00e1rio de Nauru", "NRT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o de Nauru", "NRST",
-                                            "Hor\u00E1rio de Nauru", "NRT"}},
-            {"Pacific/Niue", new String[] {"Fuso hor\u00e1rio de Niue", "NUT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Niue", "NUST",
-                                           "Hor\u00E1rio de Niue", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Fuso hor\u00e1rio da Ilha de Norfolk", "NFT",
-                                              "Fuso hor\u00e1rio de ver\u00e3o da Ilha de Norfolk", "NFST",
-                                              "Hor\u00E1rio de Norfolk", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Fuso hor\u00e1rio da Nova Caled\u00f4nia", "NCT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o da Nova Caled\u00f4nia", "NCST",
-                                             "Hor\u00E1rio da Nova Caled\u00F4nia", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Fuso hor\u00e1rio de Palau", "PWT",
-                                            "Fuso hor\u00e1rio de ver\u00e3o de Palau", "PWST",
-                                            "Hor\u00E1rio de Palau", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Fuso hor\u00e1rio de Papua-Nova Guin\u00e9", "PGT",
-                                                   "Fuso hor\u00e1rio de ver\u00e3o de Papua-Nova Guin\u00e9", "PGST",
-                                                   "Hor\u00E1rio de Papua-Nova Guin\u00E9", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Fuso hor\u00e1rio das Ilhas Cook", "CKT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cook", "CKHST",
-                                                "Hor\u00E1rio das Ilhas Cook", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Fuso hor\u00e1rio do Taiti", "TAHT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o do Taiti", "TAHST",
-                                             "Hor\u00E1rio do Tahiti", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Fuso hor\u00e1rio das Ilhas Gilbert", "GILT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gilbert", "GILST",
-                                             "Hor\u00E1rio das Ilhas Gilbert", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Fuso hor\u00e1rio de Tonga", "TOT",
-                                                "Fuso hor\u00e1rio de ver\u00e3o de Tonga", "TOST",
-                                                "Hor\u00E1rio de Tonga", "TOT"}},
-            {"Pacific/Truk", TRUT},
-            {"Pacific/Wake", new String[] {"Fuso hor\u00e1rio de Wake", "WAKT",
-                                           "Fuso hor\u00e1rio de ver\u00e3o de Wake", "WAKST",
-                                           "Hor\u00E1rio de Wake", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Fuso hor\u00e1rio de Wallis e Futuna", "WFT",
-                                             "Fuso hor\u00e1rio de ver\u00e3o de Wallis e Futuna", "WFST",
-                                             "Hor\u00E1rio das Ilhas Wallis e Futuna", "WFT"}},
-            {"Pacific/Yap", TRUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
deleted file mode 100644
index 6b0e1dd7266..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Acre, normaltid", "ACT",
-                                     "Acre, sommartid", "ACST",
-                                     "Acre, normaltid", "ACT"};
-        String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "ACST",
-                                          "Central sommartid (South Australia)", "ACDT",
-                                          "Central tid (Sydaustralien)", "ACT"};
-        String AGT[] = new String[] {"Argentina, normaltid", "ART",
-                                     "Argentina, sommartid", "ARST",
-                                     "Argentinsk tid", "ART"};
-        String AKST[] = new String[] {"Alaska, normaltid", "AKST",
-                                      "Alaska, sommartid", "AKDT",
-                                      "Alaskisk tid", "AKT"};
-        String AMT[] = new String[] {"Amazonas, normaltid", "AMT",
-                                     "Amazonas, sommartid", "AMST",
-                                     "Amazonas-tid", "AMT"};
-        String ARAST[] = new String[] {"Arabisk normaltid", "AST",
-                                       "Arabisk sommartid", "ADT",
-                                       "Arabisk tid", "AT"};
-        String ARMT[] = new String[] {"Armenien, normaltid", "AMT",
-                                      "Armenien, sommartid", "AMST",
-                                      "Armenisk tid", "AMT"};
-        String AST[] = new String[] {"Atlantisk normaltid", "AST",
-                                     "Atlantisk sommartid", "ADT",
-                                     "Atlantisk tid", "AT"};
-        String BDT[] = new String[] {"Bangladesh, normaltid", "BDT",
-                                     "Bangladesh, sommartid", "BDST",
-                                     "Bangladeshisk tid", "BDT"};
-        String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "AEST",
-                                          "\u00D6stlig sommartid (Queensland)", "AEDT",
-                                          "\u00D6stlig tid (Queensland)", "AET"};
-        String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "ACST",
-                                             "Central sommartid (South Australia/New South Wales)", "ACDT",
-                                             "Central tid (Sydaustralien/New South Wales)", "ACT"};
-        String BRT[] = new String[] {"Brasilien, normaltid", "BRT",
-                                     "Brasilien, sommartid", "BRST",
-                                     "Brasiliansk tid", "BRT"};
-        String BTT[] = new String[] {"Bhutan, normaltid", "BTT",
-                                     "Bhutan, sommartid", "BTST",
-                                     "Bhutanesisk tid", "BTT"};
-        String CAT[] = new String[] {"Centralafrikansk tid", "CAT",
-                                     "Centralafrikansk sommartid", "CAST",
-                                     "Centralafrikansk tid", "CAT"};
-        String CET[] = new String[] {"Centraleuropeisk tid", "CET",
-                                     "Centraleuropeisk sommartid", "CEST",
-                                     "Centraleuropeisk tid", "CET"};
-        String CHAST[] = new String[] {"Chatham, normaltid", "CHAST",
-                                       "Chatham, sommartid", "CHADT",
-                                       "Chathams tid", "CHAT"};
-        String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT",
-                                      "Chuuk, sommartid", "CHUST",
-                                      "Chuuk, normaltid", "CHUT"};
-        String CIT[] = new String[] {"Centralindonesisk tid", "WITA",
-                                     "Centralindonesisk sommartid", "CIST",
-                                     "Centralindonesisk tid", "WITA"};
-        String CLT[] = new String[] {"Chile, normaltid", "CLT",
-                                     "Chile, sommartid", "CLST",
-                                     "Chilensk tid", "CLT"};
-        String CST[] = new String[] {"Central normaltid", "CST",
-                                     "Central sommartid", "CDT",
-                                     "Central tid", "CT"};
-        String CTT[] = new String[] {"Kina, normaltid", "CST",
-                                     "Kina, sommartid", "CDT",
-                                     "Kinesisk tid", "CT"};
-        String CUBA[] = new String[] {"Kuba, normaltid", "CST",
-                                      "Kuba, sommartid", "CDT",
-                                      "Kubansk tid", "CT"};
-        String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "ACST",
-                                        "Central sommartid (Nordterritoriet)", "ACDT",
-                                        "Central tid (Nordterritoriet)", "ACT"};
-        String DUBLIN[] = new String[] {"Greenwichtid", "GMT",
-                                        "Irland, sommartid", "IST",
-                                        "Irl\u00E4ndsk tid", "IT"};
-        String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT",
-                                     "\u00d6stafrikansk sommartid", "EAST",
-                                     "\u00D6stafrikansk tid", "EAT"};
-        String EASTER[] = new String[] {"P\u00e5sk\u00f6n, normaltid", "EAST",
-                                        "P\u00e5sk\u00f6n, sommartid", "EASST",
-                                        "P\u00E5sk\u00F6n-tid", "EAST"};
-        String EET[] = new String[] {"\u00d6steuropeisk tid", "EET",
-                                     "\u00d6steuropeisk sommartid", "EEST",
-                                     "\u00d6steuropeisk tid", "EET"};
-        String EGT[] = new String[] {"\u00d6stgr\u00f6nl\u00e4ndsk tid", "EGT",
-                                     "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST",
-                                     "\u00D6stgr\u00F6nl\u00E4ndsk tid", "EGT"};
-        String EST[] = new String[] {"Eastern, normaltid", "EST",
-                                     "Eastern, sommartid", "EDT",
-                                     "\u00D6stlig tid", "ET"};
-        String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "AEST",
-                                         "\u00D6stlig sommartid (New South Wales)", "AEDT",
-                                         "\u00D6stlig tid (New South Wales)", "AET"};
-        String FET[] = new String[] {"Kaliningradtid", "FET",
-                                     "\u00D6steuropeisk sommartid", "FEST",
-                                     "Kaliningradtid", "FET"};
-        String GHMT[] = new String[] {"Ghana, normaltid", "GMT",
-                                      "Ghana, sommartid", "GHST",
-                                      "Ghana, normaltid", "GMT"};
-        String GAMBIER[] =  new String[] {"Gambier, normaltid", "GAMT",
-                                          "Gambier, sommartid", "GAMST",
-                                          "Gambier\u00F6arna-tid", "GAMT"};
-        String GMT[] = new String[] {"Greenwichtid", "GMT",
-                                     "Greenwichtid", "GMT",
-                                     "Greenwichtid", "GMT"};
-        String GMTBST[] = new String[] {"Greenwichtid", "GMT",
-                                        "Brittisk sommartid", "BST",
-                                        "Brittisk tid", "BT"};
-        String GST[] = new String[] {"Gulf-normaltid", "GST",
-                                     "Gulf-sommartid", "GDT",
-                                     "Golfens tid", "GT"};
-        String HKT[] =  new String[] {"Hong Kong, normaltid", "HKT",
-                                      "Hong Kong, sommartid", "HKST",
-                                      "Hongkong-tid", "HKT"};
-        String HST[] = new String[] {"Hawaii, normaltid", "HST",
-                                     "Hawaii, sommartid", "HDT",
-                                     "Hawaiiansk tid", "HT"};
-        String ICT[] = new String[] {"Indokinesisk tid", "ICT",
-                                     "Indokinesisk sommartid", "ICST",
-                                     "Indokinesisk tid", "ICT"};
-        String IRKT[] = new String[] {"Irkutsk, normaltid", "IRKT",
-                                      "Irkutsk, sommartid", "IRKST",
-                                      "Irkutsk-tid", "IRKT"};
-        String IRT[] = new String[] {"Iran, normaltid", "IRST",
-                                     "Iran, sommartid", "IRDT",
-                                     "Iransk tid", "IRT"};
-        String ISRAEL[] = new String[] {"Israel, normaltid", "IST",
-                                        "Israel, sommartid", "IDT",
-                                        "Israelisk tid", "IT"};
-        String IST[] = new String[] {"Indien, normaltid", "IST",
-                                     "Indien, sommartid", "IDT",
-                                     "Indisk tid", "IT"};
-        String JST[] = new String[] {"Japan, normaltid", "JST",
-                                     "Japan, sommartid", "JDT",
-                                     "Japansk tid", "JT"};
-        String KRAT[] = new String[] {"Krasnojarsk, normaltid", "KRAT",
-                                      "Krasnojarsk, sommartid", "KRAST",
-                                      "Krasnojarsk-tid", "KRAT"};
-        String KST[] = new String[] {"Korea, normaltid", "KST",
-                                     "Korea, sommartid", "KDT",
-                                     "Koreansk tid", "KT"};
-        String LORD_HOWE[] = new String[] {"Lord Howe, normaltid", "LHST",
-                                           "Lord Howe, sommartid", "LHDT",
-                                           "Lord Howe-tid", "LHT"};
-        String MHT[] = new String[] {"Marshall\u00f6arna, normaltid", "MHT",
-                                     "Marshall\u00f6arna, sommartid", "MHST",
-                                     "Marshall\u00F6arna-tid", "MHT"};
-        String MMT[] = new String[] {"Myanmar, normaltid", "MMT",
-                                     "Myanmar, sommartid", "MMST",
-                                     "Myanmar-tid", "MMT"};
-        String MSK[] = new String[] {"Moskva, normaltid", "MSK",
-                                     "Moskva, sommartid", "MSD",
-                                     "Moskvas tid", "MT"};
-        String MST[] = new String[] {"Mountain, normaltid", "MST",
-                                     "Mountain, sommartid", "MDT",
-                                     "Mountain-tid", "MT"};
-        String MYT[] = new String[] {"Malaysia, normaltid", "MYT",
-                                     "Malaysia, sommartid", "MYST",
-                                     "Malaysisk tid", "MYT"};
-        String NORONHA[] = new String[] {"Fernando de Noronha, normaltid", "FNT",
-                                         "Fernando de Noronha, sommartid", "FNST",
-                                         "Fernando de Noronha-tid", "FNT"};
-        String NOVT[] = new String[] {"Novosibirsk, normaltid", "NOVT",
-                                      "Novosibirsk, sommartid", "NOVST",
-                                      "Sibirisk tid", "NOVT"};
-        String NPT[] = new String[] {"Nepal, normaltid", "NPT",
-                                     "Nepal, sommartid", "NPST",
-                                     "Nepalesisk tid", "NPT"};
-        String NST[] = new String[] {"Newfoundland, normaltid", "NST",
-                                     "Newfoundland, sommartid", "NDT",
-                                     "Newfoundl\u00E4ndsk tid", "NT"};
-        String NZST[] = new String[] {"Nya Zeeland, normaltid", "NZST",
-                                      "Nya Zeeland, sommartid", "NZDT",
-                                      "Nyzeel\u00E4ndsk tid", "NZT"};
-        String PITCAIRN[] = new String[] {"Pitcairn, normaltid", "PST",
-                                          "Pitcairn, sommartid", "PDT",
-                                          "Pitcairn-tid", "PT"};
-        String PKT[] = new String[] {"Pakistan, normaltid", "PKT",
-                                     "Pakistan, sommartid", "PKST",
-                                     "Pakistansk tid", "PKT"};
-        String PONT[] = new String[] {"Pohnpei, normaltid", "PONT",
-                                      "Pohnpei, sommartid", "PONST",
-                                      "Ponape-tid", "PONT"};
-        String PST[] = new String[] {"Stilla havet, normaltid", "PST",
-                                     "Stilla havet, sommartid", "PDT",
-                                     "Stillahavet", "PT"};
-        String SAST[] = new String[] {"Sydafrika, normaltid", "SAST",
-                                      "Sydafrika, sommartid", "SAST",
-                                      "Sydafrikansk tid", "SAT"};
-        String SBT[] = new String[] {"Salomon\u00f6arna, normaltid", "SBT",
-                                     "Salomon\u00f6arna, sommartid", "SBST",
-                                     "Salomon\u00F6arna-tid", "SBT"};
-        String SGT[] = new String[] {"Singapore, normaltid", "SGT",
-                                     "Singapore, sommartid", "SGST",
-                                     "Singapore-tid", "SGT"};
-        String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "AEST",
-                                          "\u00D6stlig sommartid (Tasmanien)", "AEDT",
-                                          "\u00D6stlig tid (Tasmania)", "AET"};
-        String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT",
-                                     "Turkmenistan, sommartid", "TMST",
-                                     "Turkmensk tid", "TMT"};
-        String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT",
-                                     "Ulaanbaatar, sommartid", "ULAST",
-                                     "Ulaanbaatar-tid", "ULAT"};
-        String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT",
-                                     "V\u00e4stafrikansk sommartid", "WAST",
-                                     "V\u00E4stafrikansk tid", "WAT"};
-        String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET",
-                                     "V\u00e4steuropeisk sommartid", "WEST",
-                                     "V\u00E4steuropeisk tid", "WET"};
-        String WGT[] = new String[] {"V\u00e4stra Gr\u00f6nland, normaltid", "WGT",
-                                     "V\u00e4stra Gr\u00f6nland, sommartid", "WGST",
-                                     "V\u00E4stgr\u00F6nl\u00E4ndsk tid", "WGT"};
-        String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB",
-                                     "V\u00e4stindonesisk sommartid", "WIST",
-                                     "V\u00E4stindonesisk tid", "WIB"};
-        String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "AWST",
-                                         "V\u00E4stlig sommartid (Australien)", "AWDT",
-                                         "V\u00E4stlig tid (Australien)", "AWT"};
-        String SAMOA[] = new String[] {"Samoa, normaltid", "SST",
-                                       "Samoa, sommartid", "SDT",
-                                       "Samoansk tid", "ST"};
-        String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WSST",
-                                           "V\u00e4stsamoansk sommartid", "WSDT",
-                                           "V\u00E4stsamoansk tid", "WST"};
-        String ChST[] = new String[] {"Chamorro, normaltid", "ChST",
-                                      "Chamorro, sommartid", "ChDT",
-                                      "Chamorros tid", "ChT"};
-        String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "AEST",
-                                          "\u00D6stlig sommartid (Victoria)", "AEDT",
-                                          "\u00D6stlig tid (Victoria)", "AET"};
-        String UTC[] = new String[] {"Koordinerad universell tid", "UTC",
-                                     "Koordinerad universell tid", "UTC",
-                                     "UTC (koordinerad v\u00E4rldstid)", "UTC"};
-        String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT",
-                                     "Uzbekistan, sommartid", "UZST",
-                                     "Uzbekisk tid", "UZT"};
-        String XJT[] = new String[] {"Kina, normaltid", "XJT",
-                                     "Kina, sommartid", "XJDT",
-                                     "Kinesisk tid", "XJT"};
-        String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
-                                      "Jakutsk, sommartid", "YAKST",
-                                      "Jakutsk-tid", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"Paraguay, normaltid", "PYT",
-                                               "Paraguay, sommartid", "PYST",
-                                               "Paraguayansk tid", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"Colombia, normaltid", "COT",
-                                             "Colombia, sommartid", "COST",
-                                             "Kolombiansk tid", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"Venezuela, normaltid", "VET",
-                                              "Venezuela, sommartid", "VEST",
-                                              "Venezuelansk tid", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"Franska Guyana, normaltid", "GFT",
-                                              "Franska Guyana, sommartid", "GFST",
-                                              "Franska Guyana-tid", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"Ecuador, normaltid", "ECT",
-                                                "Ecuador, sommartid", "ECST",
-                                                "Ecuadoriansk tid", "ECT"}},
-            {"America/Guyana", new String[] {"Guyana, normaltid", "GYT",
-                                             "Guyana, sommartid", "GYST",
-                                             "Guyansk tid", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"Bolivia, normaltid", "BOT",
-                                             "Bolivia, sommartid", "BOST",
-                                             "Boliviansk tid", "BOT"}},
-            {"America/Lima", new String[] {"Peru, normaltid", "PET",
-                                           "Peru, sommartid", "PEST",
-                                           "Peruansk tid", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
-                                               "Saint-Pierre-et-Miquelon, sommartid", "PMDT",
-                                               "Saint-Pierre och Miquelons tid", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"Uruguay, normaltid", "UYT",
-                                                 "Uruguay, sommartid", "UYST",
-                                                 "Uruguayansk tid", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"Surinam, normaltid", "SRT",
-                                                 "Surinam, sommartid", "SRST",
-                                                 "Surinamsk tid", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"Davis, normaltid", "DAVT",
-                                               "Davis, sommartid", "DAVST",
-                                               "Davis-tid", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT",
-                                                        "Dumont-d'Urville, sommartid", "DDUST",
-                                                        "Dumont-d'Urville-tid", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT",
-                                                "Mawson, sommartid", "MAWST",
-                                                "Mawson-tid", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"Rothera, normaltid", "ROTT",
-                                                 "Rothera, sommartid", "ROTST",
-                                                 "Rothera-tid", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT",
-                                               "Syowa, sommartid", "SYOST",
-                                               "Syowa-tid", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC",
-                                               "Centraleuropeisk sommartid", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST",
-                                                "Vostok, sommartid", "VOSST",
-                                                "Vostok-tid", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Alma-Ata, normaltid", "ALMT",
-                                          "Alma-Ata, sommartid", "ALMST",
-                                          "Alma-Ata-tid", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"Anadyr, normaltid", "ANAT",
-                                          "Anadyr, sommartid", "ANAST",
-                                          "Anadyr-tid", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Aqtau, normaltid", "AQTT",
-                                         "Aqtau, sommartid", "AQTST",
-                                         "Aqtau-tid", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Aqtobe, normaltid", "AQTT",
-                                          "Aqtobe, sommartid", "AQTST",
-                                          "Aqtobe-tid", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"Azerbajdzjan, normaltid", "AZT",
-                                        "Azerbajdzjan, sommartid", "AZST",
-                                        "Azerbajdzjansk tid", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Kirgizstan, normaltid", "KGT",
-                                           "Kirgizstan, sommartid", "KGST",
-                                           "Kirgizisk tid", "KGT"}},
-            {"Asia/Brunei", new String[] {"Brunei, normaltid", "BNT",
-                                          "Brunei, sommartid", "BNST",
-                                          "Bruneisk tid", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Choibalsan", new String[] {"Choibalsan, normaltid", "CHOT",
-                                              "Choibalsan, sommartid", "CHOST",
-                                              "Choibalsan-tid", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Chita", YAKT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"Timor-Leste, normaltid", "TLT",
-                                        "Timor-Leste, sommartid", "TLST",
-                                        "\u00D6sttimor, normaltid", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"Tadzjikistan, normaltid", "TJT",
-                                            "Tadzjikistan, sommartid", "TJST",
-                                            "Tadzjikisk tid", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
-                                        "Hovd, sommartid", "HOVST",
-                                        "Hovd-tid", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT",
-                                            "\u00d6stindonesisk sommartid", "EIST",
-                                            "\u00D6stindonesisk tid", "WIT"}},
-            {"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT",
-                                         "Afghanistan, sommartid", "AFST",
-                                         "Afghansk tid", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamtjatka, normaltid", "PETT",
-                                             "Petropavlovsk-Kamtjatka, sommartid", "PETST",
-                                             "Petropavlovsk-Kamtjatskij-tid", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Magadan, normaltid", "MAGT",
-                                           "Magadan, sommartid", "MAGST",
-                                           "Magadan-tid", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Oral, normaltid", "ORAT",
-                                        "Oral, sommartid", "ORAST",
-                                        "Oral-tid", "ORAT"}},
-            {"Asia/Omsk", new String[] {"Omsk, normaltid", "OMST",
-                                        "Omsk, sommartid", "OMSST",
-                                        "Omsk-tid", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Qyzylorda, normaltid", "QYZT",
-                                             "Qyzylorda, sommartid", "QYZST",
-                                             "Qyzylorda-tid", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"Sakhalin, normaltid", "SAKT",
-                                            "Sakhalin, sommartid", "SAKST",
-                                            "Sakhalin-tid", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"Georgien, normaltid", "GET",
-                                           "Georgien, sommartid", "GEST",
-                                           "Georgisk tid", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT",
-                                            "Ust-Nera, sommartid", "VLAST",
-                                            "Ust-Nera, normaltid", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT",
-                                               "Vladivostok, sommartid", "VLAST",
-                                               "Vladivostok-tid", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT",
-                                                 "Jekaterinburg, sommartid", "YEKST",
-                                                 "Jekaterinburg-tid", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"Azorerna, normaltid", "AZOT",
-                                              "Azorerna, sommartid", "AZOST",
-                                              "Azorerna-tid", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"Kap Verde, normaltid", "CVT",
-                                                  "Kap Verde, sommartid", "CVST",
-                                                  "Kap Verde-tid", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"Sydgeorgien, normaltid", "GST",
-                                                     "Sydgeorgien, sommartid", "GDT",
-                                                     "Sydgeorgisk tid", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"Falklands\u00f6arna, normaltid", "FKT",
-                                               "Falklands\u00f6arna, sommartid", "FKST",
-                                               "Falklands\u00F6arna-tid", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "ACWST",
-                                              "Central v\u00E4stlig sommartid (Australien)", "ACWDT",
-                                              "Central v\u00E4stlig tid (Australien)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"Samara, normaltid", "SAMT",
-                                            "Samara, sommartid", "SAMST",
-                                            "Samara-tid", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"Indiska oceanen, normaltid", "IOT",
-                                            "Indiska oceanen, sommartid", "IOST",
-                                            "Indiska Ocean\u00F6arna-tid", "IOT"}},
-            {"Indian/Christmas", new String[] {"Jul\u00f6n, normaltid", "CXT",
-                                               "Jul\u00f6n, sommartid", "CXST",
-                                               "Jul\u00F6n-tid", "CIT"}},
-            {"Indian/Cocos", new String[] {"Cocos-Keeling\u00f6arna, normaltid", "CCT",
-                                           "Cocos-Keeling\u00f6arna, sommartid", "CCST",
-                                           "Kokos\u00F6arna-tid", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"Franska s\u00f6dra och antarktiska omr\u00e5dena, normaltid", "TFT",
-                                               "Franska s\u00f6dra och antarktiska omr\u00e5dena, sommartid", "TFST",
-                                               "Franska s\u00F6dra och antarktiska \u00F6arna-tid", "TFT"}},
-            {"Indian/Mahe", new String[] {"Seychellerna, normaltid", "SCT",
-                                          "Seychellerna, sommartid", "SCST",
-                                          "Seychellisk tid", "SCT"}},
-            {"Indian/Maldives", new String[] {"Maldiverna, normaltid", "MVT",
-                                              "Maldiverna, sommartid", "MVST",
-                                              "Maldivisk tid", "MVT"}},
-            {"Indian/Mauritius", new String[] {"Mauritius, normaltid", "MUT",
-                                               "Mauritius, sommartid", "MUST",
-                                               "Mauritiansk tid", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"Reunion, normaltid", "RET",
-                                             "Reunion, sommartid", "REST",
-                                             "Reunion-tid", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"Vanuatu, normaltid", "VUT",
-                                            "Vanuatu, sommartid", "VUST",
-                                            "Vanuatu-tid", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"Phoenix-\u00f6arna, normaltid", "PHOT",
-                                                "Phoenix-\u00f6arna, sommartid", "PHOST",
-                                                "Phoenix\u00F6arna-tid", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"Tokelau, normaltid", "TKT",
-                                              "Tokelau, sommartid", "TKST",
-                                              "Tokelau-tid", "TKT"}},
-            {"Pacific/Fiji", new String[] {"Fiji, normaltid", "FJT",
-                                           "Fiji, sommartid", "FJST",
-                                           "Fijiansk tid", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"Tuvalu, normaltid", "TVT",
-                                               "Tuvalu, sommartid", "TVST",
-                                               "Tuvalu-tid", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"Galapagos, normaltid", "GALT",
-                                                "Galapagos, sommartid", "GALST",
-                                                "Galapagos-tid", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Line-\u00f6arna, normaltid", "LINT",
-                                                 "Line-\u00f6arna, sommartid", "LINST",
-                                                 "Line Islands-tid", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Kosrae, normaltid", "KOST",
-                                             "Kosrae, sommartid", "KOSST",
-                                             "Kosrae-tid", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"Marquesas, normaltid", "MART",
-                                                "Marquesas, sommartid", "MARST",
-                                                "Marquesas\u00F6arna-tid", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"Nauru, normaltid", "NRT",
-                                            "Nauru, sommartid", "NRST",
-                                            "Nauruansk tid", "NRT"}},
-            {"Pacific/Niue", new String[] {"Niue, normaltid", "NUT",
-                                           "Niue, sommartid", "NUST",
-                                           "Niue-tid", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"Norfolk, normaltid", "NFT",
-                                              "Norfolk, sommartid", "NFST",
-                                              "Norfolk-tid", "NFT"}},
-            {"Pacific/Noumea", new String[] {"Nya Caledonien, normaltid", "NCT",
-                                             "Nya Caledonien, sommartid", "NCST",
-                                             "Nya Kaledonien-tid", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"Palau, normaltid", "PWT",
-                                            "Palau, sommartid", "PWST",
-                                            "Palau-tid", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"Papua Nya Guinea, normaltid", "PGT",
-                                                   "Papua Nya Guinea, sommartid", "PGST",
-                                                   "Papua Nya Guinea-tid", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"Cook\u00f6arna, normaltid", "CKT",
-                                                "Cook\u00f6arna, sommartid", "CKHST",
-                                                "Cook\u00F6arna-tid", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"Tahiti, normaltid", "TAHT",
-                                             "Tahiti, sommartid", "TAHST",
-                                             "Tahiti-tid", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"Gilbert\u00f6arna, normaltid", "GILT",
-                                             "Gilbert\u00f6arna, sommartid", "GILST",
-                                             "Gilbert\u00F6arna-tid", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"Tonga, normaltid", "TOT",
-                                                "Tonga, sommartid", "TOST",
-                                                "Tonga-tid", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"Wake, normaltid", "WAKT",
-                                           "Wake, sommartid", "WAKST",
-                                           "Wake-tid", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"Wallis & Futuna, normaltid", "WFT",
-                                             "Wallis & Futuna, sommartid", "WFST",
-                                             "Wallis- och Futuna\u00F6arna-tid", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
deleted file mode 100644
index 4d493df7254..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java
+++ /dev/null
@@ -1,1046 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT",
-                                     "Acre \u590f\u4ee4\u65f6", "ACST",
-                                     "Acre \u65f6\u95f4", "ACT"};
-        String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACST",
-                                          "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACDT",
-                                          "\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "ACT"};
-        String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART",
-                                     "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST",
-                                     "\u963F\u6839\u5EF7\u65F6\u95F4", "ART"};
-        String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST",
-                                      "\u963f\u62c9\u65af\u52a0\u590f\u4ee4\u65f6", "AKDT",
-                                      "\u963F\u62C9\u65AF\u52A0\u65F6\u95F4", "AKT"};
-        String AMT[] = new String[] {"\u4e9a\u9a6c\u900a\u65f6\u95f4", "AMT",
-                                     "\u4e9a\u9a6c\u900a\u590f\u4ee4\u65f6", "AMST",
-                                     "\u4E9A\u9A6C\u900A\u65F6\u95F4", "AMT"};
-        String ARAST[] = new String[] {"\u963f\u62c9\u4f2f\u6807\u51c6\u65f6\u95f4", "AST",
-                                       "\u963f\u62c9\u4f2f\u590f\u4ee4\u65f6", "ADT",
-                                       "\u963F\u62C9\u4F2F\u534A\u5C9B\u65F6\u95F4", "AT"};
-        String ARMT[] = new String[] {"\u4e9a\u7f8e\u5c3c\u4e9a\u65f6\u95f4", "AMT",
-                                      "\u4e9a\u7f8e\u5c3c\u4e9a\u590f\u4ee4\u65f6", "AMST",
-                                      "\u4E9A\u7F8E\u5C3C\u4E9A\u65F6\u95F4", "AMT"};
-        String AST[] = new String[] {"\u5927\u897f\u6d0b\u6807\u51c6\u65f6\u95f4", "AST",
-                                     "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT",
-                                     "\u5927\u897F\u6D0B\u65F6\u95F4", "AT"};
-        String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT",
-                                     "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST",
-                                     "\u5B5F\u52A0\u62C9\u65F6\u95F4", "BDT"};
-        String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "AEST",
-                                          "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "AEDT",
-                                          "\u4E1C\u90E8\u65F6\u95F4 (\u6606\u58EB\u5170)", "AET"};
-        String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACST",
-                                             "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACDT",
-                                             "\u4E2D\u90E8\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "ACT"};
-        String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT",
-                                     "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST",
-                                     "\u5DF4\u897F\u5229\u4E9A\u65F6\u95F4", "BRT"};
-        String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT",
-                                     "\u4e0d\u4e39\u590f\u4ee4\u65f6", "BTST",
-                                     "\u4E0D\u4E39\u65F6\u95F4", "BTT"};
-        String CAT[] = new String[] {"\u4e2d\u975e\u65f6\u95f4", "CAT",
-                                     "\u4e2d\u975e\u590f\u4ee4\u65f6", "CAST",
-                                     "\u4E2D\u975E\u65F6\u95F4", "CAT"};
-        String CET[] = new String[] {"\u4e2d\u6b27\u65f6\u95f4", "CET",
-                                     "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST",
-                                     "\u4E2D\u6B27\u65F6\u95F4", "CET"};
-        String CHAST[] = new String[] {"\u67e5\u8428\u59c6\u6807\u51c6\u65f6\u95f4", "CHAST",
-                                       "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT",
-                                       "\u67E5\u5854\u59C6\u65F6\u95F4", "CHAT"};
-        String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT",
-                                      "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST",
-                                      "\u4E18\u514B\u65F6\u95F4", "CHUT"};
-        String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA",
-                                     "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST",
-                                     "\u4E2D\u90E8\u5370\u5EA6\u5C3C\u897F\u4E9A\u65F6\u95F4", "WITA"};
-        String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT",
-                                     "\u667a\u5229\u590f\u4ee4\u65f6", "CLST",
-                                     "\u667A\u5229\u65F6\u95F4", "CLT"};
-        String CST[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4", "CST",
-                                     "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT",
-                                     "\u4E2D\u90E8\u65F6\u95F4", "CT"};
-        String CTT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "CST",
-                                     "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT",
-                                     "\u4E2D\u56FD\u65F6\u95F4", "CT"};
-        String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST",
-                                      "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT",
-                                      "\u53E4\u5DF4\u65F6\u95F4", "CT"};
-        String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "ACST",
-                                        "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "ACDT",
-                                        "\u4E2D\u90E8\u65F6\u95F4 (\u5317\u90E8\u5730\u533A)", "ACT"};
-        String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
-                                        "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST",
-                                        "\u7231\u5C14\u5170\u65F6\u95F4", "IT"};
-        String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT",
-                                     "\u4e1c\u975e\u590f\u4ee4\u65f6", "EAST",
-                                     "\u4E1C\u975E\u65F6\u95F4", "EAT"};
-        String EASTER[] = new String[] {"\u590d\u6d3b\u5c9b\u65f6\u95f4", "EAST",
-                                        "\u590d\u6d3b\u5c9b\u590f\u4ee4\u65f6", "EASST",
-                                        "\u590D\u6D3B\u5C9B\u65F6\u95F4", "EAST"};
-        String EET[] = new String[] {"\u4e1c\u6b27\u65f6\u95f4", "EET",
-                                     "\u4e1c\u6b27\u590f\u4ee4\u65f6", "EEST",
-                                     "\u4e1c\u6b27\u65f6\u95f4", "EET"};
-        String EGT[] = new String[] {"\u4e1c\u683c\u6797\u5c9b\u65f6\u95f4", "EGT",
-                                     "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST",
-                                     "\u4E1C\u683C\u6797\u5C9B\u65F6\u95F4", "EGT"};
-        String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST",
-                                     "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT",
-                                     "\u4E1C\u90E8\u65F6\u95F4", "ET"};
-        String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEST",
-                                         "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AEDT",
-                                         "\u4E1C\u90E8\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "AET"};
-        String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET",
-                                     "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST",
-                                     "\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET"};
-        String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT",
-                                     "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST",
-                                     "\u52A0\u7EB3\u65F6\u95F4", "GMT"};
-        String GAMBIER[] =  new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT",
-                                          "\u5188\u6bd4\u4e9a\u590f\u4ee4\u65f6", "GAMST",
-                                          "\u5188\u6BD4\u4E9A\u65F6\u95F4", "GAMT"};
-        String GMT[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
-                                     "\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
-                                     "\u683C\u6797\u5A01\u6CBB\u65F6\u95F4", "GMT"};
-        String GMTBST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT",
-                                        "\u82f1\u56fd\u590f\u4ee4\u65f6", "BST",
-                                        "\u82F1\u56FD\u65F6\u95F4", "BT"};
-        String GST[] = new String[] {"\u6ce2\u65af\u6e7e\u6807\u51c6\u65f6\u95f4", "GST",
-                                     "\u6ce2\u65af\u6e7e\u590f\u4ee4\u65f6", "GDT",
-                                     "\u6D77\u6E7E\u65F6\u95F4", "GT"};
-        String HKT[] =  new String[] {"\u9999\u6e2f\u65f6\u95f4", "HKT",
-                                      "\u9999\u6e2f\u590f\u4ee4\u65f6", "HKST",
-                                      "\u9999\u6E2F\u65F6\u95F4", "HKT"};
-        String HST[] = new String[] {"\u590f\u5a01\u5937\u6807\u51c6\u65f6\u95f4", "HST",
-                                     "\u590f\u5a01\u5937\u590f\u4ee4\u65f6", "HDT",
-                                     "\u590F\u5A01\u5937\u65F6\u95F4", "HT"};
-        String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u65f6\u95f4", "ICT",
-                                     "\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u65f6", "ICST",
-                                     "\u5370\u5EA6\u652F\u90A3\u65F6\u95F4", "ICT"};
-        String IRKT[] = new String[] {"\u4f0a\u5c14\u5e93\u6b21\u514b\u65f6\u95f4", "IRKT",
-                                      "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST",
-                                      "\u4F0A\u5C14\u5E93\u6B21\u514B\u65F6\u95F4", "IRKT"};
-        String IRT[] = new String[] {"\u4f0a\u6717\u6807\u51c6\u65f6\u95f4", "IRST",
-                                     "\u4f0a\u6717\u590f\u4ee4\u65f6", "IRDT",
-                                     "\u4F0A\u6717\u65F6\u95F4", "IRT"};
-        String ISRAEL[] = new String[] {"\u4ee5\u8272\u5217\u6807\u51c6\u65f6\u95f4", "IST",
-                                        "\u4ee5\u8272\u5217\u590f\u4ee4\u65f6", "IDT",
-                                        "\u4EE5\u8272\u5217\u65F6\u95F4", "IT"};
-        String IST[] = new String[] {"\u5370\u5ea6\u6807\u51c6\u65f6\u95f4", "IST",
-                                     "\u5370\u5ea6\u590f\u4ee4\u65f6", "IDT",
-                                     "\u5370\u5EA6\u65F6\u95F4", "IT"};
-        String JST[] = new String[] {"\u65e5\u672c\u6807\u51c6\u65f6\u95f4", "JST",
-                                     "\u65e5\u672c\u590f\u4ee4\u65f6", "JDT",
-                                     "\u65E5\u672C\u65F6\u95F4", "JT"};
-        String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
-                                      "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST",
-                                      "\u514B\u62C9\u65AF\u8BFA\u4E9A\u5C14\u65AF\u514B\u65F6\u95F4", "KRAT"};
-        String KST[] = new String[] {"\u97e9\u56fd\u6807\u51c6\u65f6\u95f4", "KST",
-                                     "\u97e9\u56fd\u590f\u4ee4\u65f6", "KDT",
-                                     "\u97E9\u56FD\u65F6\u95F4", "KT"};
-        String LORD_HOWE[] = new String[] {"\u8c6a\u516c\u6807\u51c6\u65f6\u95f4", "LHST",
-                                           "\u8c6a\u516c\u590f\u4ee4\u65f6", "LHDT",
-                                           "\u8C6A\u516C\u65F6\u95F4", "LHT"};
-        String MHT[] = new String[] {"\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u65f6\u95f4", "MHT",
-                                     "\u9a6c\u7ecd\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "MHST",
-                                     "\u9A6C\u7ECD\u5C14\u7FA4\u5C9B\u65F6\u95F4", "MHT"};
-        String MMT[] = new String[] {"\u7f05\u7538\u65f6\u95f4", "MMT",
-                                     "\u7f05\u7538\u590f\u4ee4\u65f6", "MMST",
-                                     "\u7F05\u7538\u65F6\u95F4", "MMT"};
-        String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6807\u51c6\u65f6\u95f4", "MSK",
-                                     "\u83ab\u65af\u79d1\u590f\u4ee4\u65f6", "MSD",
-                                     "\u83AB\u65AF\u79D1\u65F6\u95F4", "MT"};
-        String MST[] = new String[] {"Mountain \u6807\u51c6\u65f6\u95f4", "MST",
-                                     "Mountain \u590f\u4ee4\u65f6", "MDT",
-                                     "\u5C71\u5730\u65F6\u95F4", "MT"};
-        String MYT[] = new String[] {"\u9a6c\u6765\u897f\u4e9a\u65f6\u95f4", "MYT",
-                                     "\u9a6c\u6765\u897f\u4e9a\u590f\u4ee4\u65f6", "MYST",
-                                     "\u9A6C\u6765\u897F\u4E9A\u65F6\u95F4", "MYT"};
-        String NORONHA[] = new String[] {"\u8d39\u5c14\u5357\u591a\u5fb7\u8bfa\u7f57\u5c3c\u4e9a\u65f6\u95f4", "FNT",
-                                         "\u8d39\u5c14\u5357\u591a\u5fb7\u8bfa\u7f57\u5c3c\u4e9a\u590f\u4ee4\u65f6", "FNST",
-                                         "\u8D39\u5C14\u5357\u591A\u5FB7\u8BFA\u7F57\u5C3C\u4E9A\u65F6\u95F4", "FNT"};
-        String NOVT[] = new String[] {"Novosibirsk \u65f6\u95f4", "NOVT",
-                                      "Novosibirsk \u590f\u4ee4\u65f6", "NOVST",
-                                      "Novosibirsk \u65F6\u95F4", "NOVT"};
-        String NPT[] = new String[] {"\u5c3c\u6cca\u5c14\u65f6\u95f4", "NPT",
-                                     "\u5c3c\u6cca\u5c14\u590f\u4ee4\u65f6", "NPST",
-                                     "\u5C3C\u6CCA\u5C14\u65F6\u95F4", "NPT"};
-        String NST[] = new String[] {"\u7ebd\u82ac\u5170\u6807\u51c6\u65f6\u95f4", "NST",
-                                     "\u7ebd\u82ac\u5170\u590f\u4ee4\u65f6", "NDT",
-                                     "\u7EBD\u82AC\u5170\u65F6\u95F4", "NT"};
-        String NZST[] = new String[] {"\u65b0\u897f\u5170\u6807\u51c6\u65f6\u95f4", "NZST",
-                                      "\u65b0\u897f\u5170\u590f\u4ee4\u65f6", "NZDT",
-                                      "\u65B0\u897F\u5170\u65F6\u95F4", "NZT"};
-        String PITCAIRN[] = new String[] {"\u76ae\u7279\u5eb7\u5c9b\u6807\u51c6\u65f6\u95f4", "PST",
-                                          "\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT",
-                                          "\u76AE\u7279\u51EF\u6069\u65F6\u95F4", "PT"};
-        String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT",
-                                     "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST",
-                                     "\u5DF4\u57FA\u65AF\u5766\u65F6\u95F4", "PKT"};
-        String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT",
-                                      "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST",
-                                      "\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT"};
-        String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST",
-                                     "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT",
-                                     "\u592A\u5E73\u6D0B\u65F6\u95F4", "PT"};
-        String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST",
-                                      "\u5357\u975e\u590f\u4ee4\u65f6", "SAST",
-                                      "\u5357\u975E\u65F6\u95F4", "SAT"};
-        String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT",
-                                     "\u6240\u7f57\u95e8\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SBST",
-                                     "\u6240\u7F57\u95E8\u7FA4\u5C9B\u65F6\u95F4", "SBT"};
-        String SGT[] = new String[] {"\u65b0\u52a0\u5761\u65f6\u95f4", "SGT",
-                                     "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST",
-                                     "\u65B0\u52A0\u5761\u65F6\u95F4", "SGT"};
-        String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEST",
-                                          "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AEDT",
-                                          "\u4E1C\u90E8\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "AET"};
-        String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT",
-                                     "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST",
-                                     "\u571F\u5E93\u66FC\u65F6\u95F4", "TMT"};
-        String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT",
-                                     "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST",
-                                     "\u5E93\u4F26\u65F6\u95F4", "ULAT"};
-        String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT",
-                                     "\u897f\u975e\u590f\u4ee4\u65f6", "WAST",
-                                     "\u897F\u975E\u65F6\u95F4", "WAT"};
-        String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET",
-                                     "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST",
-                                     "\u897F\u6B27\u65F6\u95F4", "WET"};
-        String WGT[] = new String[] {"\u897f\u683c\u6797\u5170\u5c9b\u65f6\u95f4", "WGT",
-                                     "\u897f\u683c\u6797\u5170\u5c9b\u590f\u4ee4\u65f6", "WGST",
-                                     "\u897F\u683C\u6797\u5170\u5C9B\u65F6\u95F4", "WGT"};
-        String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB",
-                                     "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST",
-                                     "\u897F\u5370\u5EA6\u5C3C\u897F\u4E9A\u65F6\u95F4", "WIB"};
-        String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWST",
-                                         "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "AWDT",
-                                         "\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "AWT"};
-        String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST",
-                                       "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT",
-                                       "\u8428\u6469\u4E9A\u65F6\u95F4", "ST"};
-        String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WSST",
-                                           "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT",
-                                           "\u897F\u8428\u6469\u4E9A\u65F6\u95F4", "WST"};
-        String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST",
-                                      "Chamorro \u590f\u4ee4\u65f6", "ChDT",
-                                      "\u67E5\u6469\u6D1B\u65F6\u95F4", "ChT"};
-        String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AEST",
-                                          "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "AEDT",
-                                          "\u4E1C\u90E8\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "AET"};
-        String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
-                                     "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
-                                     "\u534F\u8C03\u4E16\u754C\u65F6\u95F4", "UTC"};
-        String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT",
-                                     "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST",
-                                     "\u4E4C\u5179\u522B\u514B\u65AF\u5766\u65F6\u95F4", "UZT"};
-        String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
-                                     "\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT",
-                                     "\u4E2D\u56FD\u65F6\u95F4", "XJT"};
-        String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
-                                      "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST",
-                                      "\u4E9A\u5E93\u6B21\u514B\u65F6\u95F4", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"\u5df4\u62c9\u572d\u65f6\u95f4", "PYT",
-                                               "\u5df4\u62c9\u572d\u590f\u4ee4\u65f6", "PYST",
-                                               "\u5DF4\u62C9\u572D\u65F6\u95F4", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"\u54e5\u4f26\u6bd4\u4e9a\u65f6\u95f4", "COT",
-                                             "\u54e5\u4f26\u6bd4\u4e9a\u590f\u4ee4\u65f6", "COST",
-                                             "\u54E5\u4F26\u6BD4\u4E9A\u65F6\u95F4", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"\u59d4\u5185\u745e\u62c9\u65f6\u95f4", "VET",
-                                              "\u59d4\u5185\u745e\u62c9\u590f\u4ee4\u65f6", "VEST",
-                                              "\u59D4\u5185\u745E\u62C9\u65F6\u95F4", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"\u6cd5\u5c5e\u572d\u4e9a\u90a3\u65f6\u95f4", "GFT",
-                                              "\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST",
-                                              "\u6CD5\u5C5E\u572D\u4E9A\u90A3\u65F6\u95F4", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"\u5384\u74dc\u591a\u5c14\u65f6\u95f4", "ECT",
-                                                "\u5384\u74dc\u591a\u5c14\u590f\u4ee4\u65f6", "ECST",
-                                                "\u5384\u74DC\u591A\u5C14\u65F6\u95F4", "ECT"}},
-            {"America/Guyana", new String[] {"\u572d\u4e9a\u90a3\u65f6\u95f4", "GYT",
-                                             "\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GYST",
-                                             "\u572D\u4E9A\u90A3\u65F6\u95F4", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"\u73bb\u5229\u7ef4\u4e9a\u65f6\u95f4", "BOT",
-                                             "\u73bb\u5229\u7ef4\u4e9a\u590f\u4ee4\u65f6", "BOST",
-                                             "\u73BB\u5229\u7EF4\u4E9A\u65F6\u95F4", "BOT"}},
-            {"America/Lima", new String[] {"\u79d8\u9c81\u65f6\u95f4", "PET",
-                                           "\u79d8\u9c81\u590f\u4ee4\u65f6", "PEST",
-                                           "\u79D8\u9C81\u65F6\u95F4", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
-                                               "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT",
-                                               "\u76AE\u57C3\u5C14\u548C\u5BC6\u514B\u9686\u5C9B\u65F6\u95F4", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"\u4e4c\u62c9\u572d\u65f6\u95f4", "UYT",
-                                                 "\u4e4c\u62c9\u572d\u590f\u4ee4\u65f6", "UYST",
-                                                 "\u4E4C\u62C9\u572D\u65F6\u95F4", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"\u82cf\u5229\u5357\u65f6\u95f4", "SRT",
-                                                 "\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST",
-                                                 "\u82CF\u5229\u5357\u65F6\u95F4", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"\u6234\u7ef4\u65af\u65f6\u95f4", "DAVT",
-                                               "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST",
-                                               "\u6234\u7EF4\u65AF\u65F6\u95F4", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT",
-                                                        "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST",
-                                                        "Dumont-d'Urville \u65F6\u95F4", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT",
-                                                "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST",
-                                                "\u83AB\u68EE\u65F6\u95F4", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"\u7f57\u745f\u62c9\u65f6\u95f4", "ROTT",
-                                                 "\u7f57\u745f\u62c9\u590f\u4ee4\u65f6", "ROTST",
-                                                 "\u7F57\u745F\u62C9\u65F6\u95F4", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT",
-                                               "Syowa \u590f\u4ee4\u65f6", "SYOST",
-                                               "Syowa \u65F6\u95F4", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC",
-                                               "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST",
-                                                "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST",
-                                                "\u83AB\u65AF\u6258\u514B\u65F6\u95F4", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Alma-Ata \u65f6\u95f4", "ALMT",
-                                          "Alma-Ata \u590f\u4ee4\u65f6", "ALMST",
-                                          "Alma-Ata \u65F6\u95F4", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u65f6\u95f4", "ANAT",
-                                          "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u65f6", "ANAST",
-                                          "\u963F\u90A3\u5E95\u6CB3\u65F6\u95F4", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Aqtau \u65f6\u95f4", "AQTT",
-                                         "Aqtau \u590f\u4ee4\u65f6", "AQTST",
-                                         "Aqtau \u65F6\u95F4", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Aqtobe \u65f6\u95f4", "AQTT",
-                                          "Aqtobe \u590f\u4ee4\u65f6", "AQTST",
-                                          "Aqtobe \u65F6\u95F4", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"\u4e9a\u585e\u62dc\u7136\u65f6\u95f4", "AZT",
-                                        "\u4e9a\u585e\u62dc\u7136\u590f\u4ee4\u65f6", "AZST",
-                                        "\u4E9A\u585E\u62DC\u7136\u65F6\u95F4", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"\u5409\u5c14\u5409\u65af\u65af\u5766\u65f6\u95f4", "KGT",
-                                           "\u5409\u5c14\u5409\u65af\u65af\u5766\u590f\u4ee4\u65f6", "KGST",
-                                           "\u5409\u5C14\u5409\u65AF\u65AF\u5766\u65F6\u95F4", "KGT"}},
-            {"Asia/Brunei", new String[] {"\u6587\u83b1\u65f6\u95f4", "BNT",
-                                          "\u6587\u83b1\u590f\u4ee4\u65f6", "BNST",
-                                          "\u6587\u83B1\u65F6\u95F4", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
-                                              "Choibalsan \u590f\u4ee4\u65f6", "CHOST",
-                                              "Choibalsan \u65F6\u95F4", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"\u4e1c\u5e1d\u6c76\u65f6\u95f4", "TLT",
-                                        "\u4e1c\u5e1d\u6c76\u590f\u4ee4\u65f6", "TLST",
-                                        "\u4E1C\u5E1D\u6C76\u65F6\u95F4", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"\u5854\u5409\u514b\u65af\u5766\u65f6\u95f4", "TJT",
-                                            "\u5854\u5409\u514b\u65af\u5766\u590f\u4ee4\u65f6", "TJST",
-                                            "\u5854\u5409\u514B\u65AF\u5766\u65F6\u95F4", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
-                                        "\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST",
-                                        "\u79D1\u5E03\u591A\u65F6\u95F4", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT",
-                                            "\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST",
-                                            "\u4E1C\u5370\u5EA6\u5C3C\u897F\u4E9A\u65F6\u95F4", "WIT"}},
-            {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT",
-                                         "\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST",
-                                         "\u963F\u5BCC\u6C57\u65F6\u95F4", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u65f6\u95f4", "PETT",
-                                             "\u5f7c\u5f97\u7f57\u5df4\u752b\u6d1b\u592b\u65af\u514b\u590f\u4ee4\u65f6", "PETST",
-                                             "\u5F7C\u5F97\u7F57\u5DF4\u752B\u6D1B\u592B\u65AF\u514B\u65F6\u95F4", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Magadan \u65f6\u95f4", "MAGT",
-                                           "Magadan \u590f\u4ee4\u65f6", "MAGST",
-                                           "Magadan \u65F6\u95F4", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"Oral \u65f6\u95f4", "ORAT",
-                                        "Oral \u590f\u4ee4\u65f6", "ORAST",
-                                        "Oral \u65F6\u95F4", "ORAT"}},
-            {"Asia/Omsk", new String[] {"\u9102\u6728\u65af\u514b\u65f6\u95f4", "OMST",
-                                        "\u9102\u6728\u65af\u514b\u590f\u4ee4\u65f6", "OMSST",
-                                        "\u9102\u6728\u65AF\u514B\u65F6\u95F4", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Qyzylorda \u65f6\u95f4", "QYZT",
-                                             "Qyzylorda \u590f\u4ee4\u65f6", "QYZST",
-                                             "Qyzylorda \u65F6\u95F4", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"\u5e93\u9875\u5c9b\u65f6\u95f4", "SAKT",
-                                            "\u5e93\u9875\u5c9b\u590f\u4ee4\u65f6", "SAKST",
-                                            "\u5E93\u9875\u5C9B\u65F6\u95F4", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", CTT},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"\u4e54\u6cbb\u4e9a\u65f6\u95f4", "GET",
-                                           "\u4e54\u6cbb\u4e9a\u590f\u4ee4\u65f6", "GEST",
-                                           "\u4E54\u6CBB\u4E9A\u65F6\u95F4", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT",
-                                            "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST",
-                                            "\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
-                                               "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST",
-                                               "\u6D77\u53C2\u5D34\u65F6\u95F4", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT",
-                                                 "Yekaterinburg \u590f\u4ee4\u65f6", "YEKST",
-                                                 "Yekaterinburg \u65F6\u95F4", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"\u4e9a\u901f\u5c14\u7fa4\u5c9b\u65f6\u95f4", "AZOT",
-                                              "\u4e9a\u901f\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "AZOST",
-                                              "\u4E9A\u901F\u5C14\u7FA4\u5C9B\u65F6\u95F4", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"\u4f5b\u5fb7\u89d2\u65f6\u95f4", "CVT",
-                                                  "\u4f5b\u5fb7\u89d2\u590f\u4ee4\u65f6", "CVST",
-                                                  "\u4F5B\u5FB7\u89D2\u65F6\u95F4", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"\u5357\u4e54\u6cbb\u4e9a\u6807\u51c6\u65f6\u95f4", "GST",
-                                                     "\u5357\u4e54\u6cbb\u4e9a\u590f\u4ee4\u65f6", "GDT",
-                                                     "\u5357\u4E54\u6CBB\u4E9A\u5C9B\u65F6\u95F4", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"\u798f\u514b\u5170\u7fa4\u5c9b\u65f6\u95f4", "FKT",
-                                               "\u798f\u514b\u5170\u7fa4\u5c9b\u590f\u4ee4\u65f6", "FKST",
-                                               "\u798F\u514B\u5170\u7FA4\u5C9B\u65F6\u95F4", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWST",
-                                              "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "ACWDT",
-                                              "\u4E2D\u897F\u90E8\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"\u6c99\u9a6c\u62c9\u65f6\u95f4", "SAMT",
-                                            "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST",
-                                            "\u6C99\u9A6C\u62C9\u65F6\u95F4", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"\u5370\u5ea6\u6d0b\u5730\u5e26\u65f6\u95f4", "IOT",
-                                            "\u5370\u5ea6\u6d0b\u5730\u5e26\u590f\u4ee4\u65f6", "IOST",
-                                            "\u5370\u5EA6\u6D0B\u5730\u5E26\u65F6\u95F4", "IOT"}},
-            {"Indian/Christmas", new String[] {"\u5723\u8bde\u5c9b\u65f6\u95f4", "CXT",
-                                               "\u5723\u8bde\u5c9b\u590f\u4ee4\u65f6", "CXST",
-                                               "\u5723\u8BDE\u5C9B\u65F6\u95F4", "CIT"}},
-            {"Indian/Cocos", new String[] {"\u53ef\u53ef\u65af\u7fa4\u5c9b\u65f6\u95f4", "CCT",
-                                           "\u53ef\u53ef\u65af\u7fa4\u5c9b\u590f\u4ee4\u65f6", "CCST",
-                                           "\u53EF\u53EF\u65AF\u7FA4\u5C9B\u65F6\u95F4", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"\u6cd5\u5c5e\u5357\u6781\u65f6\u95f4", "TFT",
-                                               "\u6cd5\u5c5e\u5357\u6781\u590f\u4ee4\u65f6", "TFST",
-                                               "\u6CD5\u5C5E\u5357\u6781\u65F6\u95F4", "TFT"}},
-            {"Indian/Mahe", new String[] {"\u585e\u5e2d\u5c14\u7fa4\u5c9b\u65f6\u95f4", "SCT",
-                                          "\u585e\u5e2d\u5c14\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SCST",
-                                          "\u585E\u5E2D\u5C14\u7FA4\u5C9B\u65F6\u95F4", "SCT"}},
-            {"Indian/Maldives", new String[] {"\u9a6c\u5c14\u4ee3\u592b\u65f6\u95f4", "MVT",
-                                              "\u9a6c\u5c14\u4ee3\u592b\u590f\u4ee4\u65f6", "MVST",
-                                              "\u9A6C\u5C14\u4EE3\u592B\u65F6\u95F4", "MVT"}},
-            {"Indian/Mauritius", new String[] {"\u6469\u91cc\u897f\u65af\u65f6\u95f4", "MUT",
-                                               "\u6469\u91cc\u897f\u65af\u590f\u4ee4\u65f6", "MUST",
-                                               "\u6469\u91CC\u897F\u65AF\u65F6\u95F4", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"\u7559\u5c3c\u65fa\u5c9b\u65f6\u95f4", "RET",
-                                             "\u7559\u5c3c\u65fa\u5c9b\u590f\u4ee4\u65f6", "REST",
-                                             "\u7559\u5C3C\u65FA\u5C9B\u65F6\u95F4", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u56fe\u65f6\u95f4", "VUT",
-                                            "\u74e6\u5974\u963f\u56fe\u590f\u4ee4\u65f6", "VUST",
-                                            "\u74E6\u5974\u963F\u56FE\u65F6\u95F4", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"\u83f2\u5c3c\u514b\u65af\u7fa4\u5c9b\u65f6\u95f4", "PHOT",
-                                                "\u83f2\u5c3c\u514b\u65af\u7fa4\u5c9b\u590f\u4ee4\u65f6", "PHOST",
-                                                "\u83F2\u5C3C\u514B\u65AF\u7FA4\u5C9B\u65F6\u95F4", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"\u6258\u514b\u52b3\u7fa4\u5c9b\u65f6\u95f4", "TKT",
-                                              "\u6258\u514b\u52b3\u7fa4\u5c9b\u590f\u4ee4\u65f6", "TKST",
-                                              "\u6258\u514B\u52B3\u7FA4\u5C9B\u65F6\u95F4", "TKT"}},
-            {"Pacific/Fiji", new String[] {"\u6590\u6d4e\u65f6\u95f4", "FJT",
-                                           "\u6590\u6d4e\u590f\u4ee4\u65f6", "FJST",
-                                           "\u6590\u6D4E\u65F6\u95F4", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"\u5410\u9c81\u74e6\u65f6\u95f4", "TVT",
-                                               "\u5410\u9c81\u74e6\u590f\u4ee4\u65f6", "TVST",
-                                               "\u5410\u9C81\u74E6\u65F6\u95F4", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"\u52a0\u62c9\u5df4\u54e5\u65f6\u95f4", "GALT",
-                                                "\u52a0\u62c9\u5df4\u54e5\u590f\u4ee4\u65f6", "GALST",
-                                                "\u52A0\u62C9\u5DF4\u54E5\u65F6\u95F4", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Line \u5c9b\u65f6\u95f4", "LINT",
-                                                 "Line \u5c9b\u590f\u4ee4\u65f6", "LINST",
-                                                 "Line \u5C9B\u65F6\u95F4", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Kosrae \u65f6\u95f4", "KOST",
-                                             "Kosrae \u590f\u4ee4\u65f6", "KOSST",
-                                             "Kosrae \u65F6\u95F4", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"\u9a6c\u514b\u8428\u65af\u65f6\u95f4", "MART",
-                                                "\u9a6c\u514b\u8428\u65af\u590f\u4ee4\u65f6", "MARST",
-                                                "\u9A6C\u514B\u8428\u65AF\u65F6\u95F4", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"\u8bfa\u9c81\u65f6\u95f4", "NRT",
-                                            "\u8bfa\u9c81\u590f\u4ee4\u65f6", "NRST",
-                                            "\u8BFA\u9C81\u65F6\u95F4", "NRT"}},
-            {"Pacific/Niue", new String[] {"\u7ebd\u5a01\u5c9b\u65f6\u95f4", "NUT",
-                                           "\u7ebd\u5a01\u5c9b\u590f\u4ee4\u65f6", "NUST",
-                                           "\u7EBD\u5A01\u5C9B\u65F6\u95F4", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"\u8bfa\u798f\u514b\u65f6\u95f4", "NFT",
-                                              "\u8bfa\u798f\u514b\u590f\u4ee4\u65f6", "NFST",
-                                              "\u8BFA\u798F\u514B\u65F6\u95F4", "NFT"}},
-            {"Pacific/Noumea", new String[] {"\u65b0\u52a0\u52d2\u591a\u5c3c\u4e9a\u65f6\u95f4", "NCT",
-                                             "\u65b0\u52a0\u52d2\u591a\u5c3c\u4e9a\u590f\u4ee4\u65f6", "NCST",
-                                             "\u65B0\u52A0\u52D2\u591A\u5C3C\u4E9A\u65F6\u95F4", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"\u5e1b\u7409\u65f6\u95f4", "PWT",
-                                            "\u5e1b\u7409\u590f\u4ee4\u65f6", "PWST",
-                                            "\u5E1B\u7409\u65F6\u95F4", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u65f6\u95f4", "PGT",
-                                                   "\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u590f\u4ee4\u65f6", "PGST",
-                                                   "\u5DF4\u5E03\u4E9A\u65B0\u51E0\u5185\u4E9A\u65F6\u95F4", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"\u5e93\u514b\u7fa4\u5c9b\u65f6\u95f4", "CKT",
-                                                "\u5e93\u514b\u7fa4\u5c9b\u590f\u4ee4\u65f6", "CKHST",
-                                                "\u5E93\u514B\u7FA4\u5C9B\u65F6\u95F4", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"\u5927\u6eaa\u5730\u5c9b\u65f6\u95f4", "TAHT",
-                                             "\u5927\u6eaa\u5730\u5c9b\u590f\u4ee4\u65f6", "TAHST",
-                                             "\u5927\u6EAA\u5730\u5C9B\u65F6\u95F4", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"\u5409\u4f2f\u7279\u7fa4\u5c9b\u65f6\u95f4", "GILT",
-                                             "\u5409\u4f2f\u7279\u7fa4\u5c9b\u590f\u4ee4\u65f6", "GILST",
-                                             "\u5409\u4F2F\u7279\u7FA4\u5C9B\u65F6\u95F4", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"\u4e1c\u52a0\u65f6\u95f4", "TOT",
-                                                "\u4e1c\u52a0\u590f\u4ee4\u65f6", "TOST",
-                                                "\u4E1C\u52A0\u65F6\u95F4", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"\u5a01\u514b\u65f6\u95f4", "WAKT",
-                                           "\u5a01\u514b\u590f\u4ee4\u65f6", "WAKST",
-                                           "\u5A01\u514B\u65F6\u95F4", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u65f6\u95f4", "WFT",
-                                             "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u590f\u4ee4\u65f6", "WFST",
-                                             "\u74E6\u5229\u65AF\u53CA\u798F\u675C\u7EB3\u7FA4\u5C9B\u65F6\u95F4", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java
deleted file mode 100644
index 9733c12e96c..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_HK.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1998, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - All Rights Reserved
- *
- *   The original version of this source code and documentation is copyrighted
- * and owned by Taligent, Inc., a wholly-owned subsidiary of IBM. These
- * materials are provided under terms of a License Agreement between Taligent
- * and Sun. This technology is protected by multiple US and International
- * patents. This notice and attribution to Taligent may not be removed.
- *   Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-import sun.util.locale.provider.LocaleProviderAdapter;
-import sun.util.locale.provider.ResourceBundleBasedAdapter;
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_zh_HK extends TimeZoneNamesBundle {
-
-    // reparent to zh_TW for traditional Chinese names
-    public TimeZoneNames_zh_HK() {
-        ResourceBundle bundle = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getTimeZoneNames(Locale.TAIWAN);
-        setParent(bundle);
-    }
-
-    @Override
-    protected Object[][] getContents() {
-        return new Object[][] {};
-    }
-}
diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
deleted file mode 100644
index f2ddb6c407b..00000000000
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java
+++ /dev/null
@@ -1,1048 +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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package sun.util.resources.ext;
-
-import sun.util.resources.TimeZoneNamesBundle;
-
-public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
-
-    protected final Object[][] getContents() {
-        String ACT[] = new String[] {"Acre \u6642\u9593", "ACT",
-                                     "Acre \u590f\u4ee4\u6642\u9593", "ACST",
-                                     "Acre \u6642\u9593", "ACT"};
-        String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "ACST",
-                                          "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "ACDT",
-                                          "\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "ACT"};
-        String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART",
-                                     "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST",
-                                     "\u963F\u6839\u5EF7\u6642\u9593", "ART"};
-        String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST",
-                                      "\u963f\u62c9\u65af\u52a0\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "AKDT",
-                                      "\u963F\u62C9\u65AF\u52A0\u6642\u9593", "AKT"};
-        String AMT[] = new String[] {"\u4e9e\u99ac\u905c\u6642\u9593", "AMT",
-                                     "\u4e9e\u99ac\u905c\u590f\u4ee4\u6642\u9593", "AMST",
-                                     "\u4E9E\u99AC\u905C\u6642\u9593", "AMT"};
-        String ARAST[] = new String[] {"\u963f\u62c9\u4f2f\u6a19\u6e96\u6642\u9593", "AST",
-                                       "\u963f\u62c9\u4f2f\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT",
-                                       "\u963F\u62C9\u4F2F\u6642\u9593", "AT"};
-        String ARMT[] = new String[] {"\u4e9e\u7f8e\u5c3c\u4e9e\u6642\u9593", "AMT",
-                                      "\u4e9e\u7f8e\u5c3c\u4e9e\u590f\u4ee4\u6642\u9593", "AMST",
-                                      "\u4E9E\u7F8E\u5C3C\u4E9E\u6642\u9593", "AMT"};
-        String AST[] = new String[] {"\u5927\u897f\u6d0b\u6a19\u6e96\u6642\u9593", "AST",
-                                     "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT",
-                                     "\u5927\u897F\u6D0B\u6642\u9593", "AT"};
-        String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT",
-                                     "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST",
-                                     "\u5B5F\u52A0\u62C9\u6642\u9593", "BDT"};
-        String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "AEST",
-                                          "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "AEDT",
-                                          "\u6771\u90E8\u6642\u9593 (\u6606\u58EB\u862D)", "AET"};
-        String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACST",
-                                             "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "ACDT",
-                                             "\u4E2D\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8/\u65B0\u5357\u5A01\u723E\u65AF)", "ACT"};
-        String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT",
-                                     "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST",
-                                     "\u5DF4\u897F\u5229\u4E9E\u6642\u9593", "BRT"};
-        String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT",
-                                     "\u4e0d\u4e39\u590f\u4ee4\u6642\u9593", "BTST",
-                                     "\u4E0D\u4E39\u6642\u9593", "BTT"};
-        String CAT[] = new String[] {"\u4e2d\u975e\u6642\u9593", "CAT",
-                                     "\u4e2d\u975e\u590f\u4ee4\u6642\u9593", "CAST",
-                                     "\u4E2D\u975E\u6642\u9593", "CAT"};
-        String CET[] = new String[] {"\u4e2d\u6b50\u6642\u9593", "CET",
-                                     "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST",
-                                     "\u4E2D\u6B50\u6642\u9593", "CET"};
-        String CHAST[] = new String[] {"\u67e5\u5766\u6a19\u6e96\u6642\u9593", "CHAST",
-                                       "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT",
-                                       "\u67E5\u5766\u6642\u9593", "CHAT"};
-        String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT",
-                                      "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST",
-                                      "\u695A\u514B\u6642\u9593", "CHUT"};
-        String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA",
-                                     "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST",
-                                     "\u4E2D\u5370\u5EA6\u5C3C\u897F\u4E9E\u6642\u9593", "WITA"};
-        String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT",
-                                     "\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST",
-                                     "\u667A\u5229\u6642\u9593", "CLT"};
-        String CST[] = new String[] {"\u4e2d\u592e\u6a19\u6e96\u6642\u9593", "CST",
-                                     "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT",
-                                     "\u7F8E\u570B\u4E2D\u90E8\u6642\u9593", "CT"};
-        String CTT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "CST",
-                                     "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT",
-                                     "\u4E2D\u570B\u6642\u9593", "CT"};
-        String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST",
-                                      "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT",
-                                      "\u53E4\u5DF4\u6642\u9593", "CT"};
-        String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACST",
-                                        "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "ACDT",
-                                        "\u6FB3\u5927\u5229\u4E9E\u4E2D\u90E8\u6642\u9593 (\u5317\u65B9\u5340\u57DF)", "ACT"};
-        String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
-                                        "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST",
-                                        "\u611B\u723E\u862D\u6587\u6642\u9593", "IT"};
-        String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT",
-                                     "\u6771\u975e\u590f\u4ee4\u6642\u9593", "EAST",
-                                     "\u6771\u975E\u6642\u9593", "EAT"};
-        String EASTER[] = new String[] {"\u5fa9\u6d3b\u5cf6\u6642\u9593", "EAST",
-                                        "\u5fa9\u6d3b\u5cf6\u590f\u4ee4\u6642\u9593", "EASST",
-                                        "\u5FA9\u6D3B\u5CF6\u6642\u9593", "EAST"};
-        String EET[] = new String[] {"\u6771\u6b50\u6642\u9593", "EET",
-                                     "\u6771\u6b50\u590f\u4ee4\u6642\u9593", "EEST",
-                                     "\u6771\u6b50\u6642\u9593", "EET"};
-        String EGT[] = new String[] {"\u6771\u683c\u6797\u5cf6\u6642\u9593", "EGT",
-                                     "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST",
-                                     "\u6771\u683C\u9675\u862D\u6642\u9593", "EGT"};
-        String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST",
-                                     "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT",
-                                     "\u7F8E\u570B\u6771\u90E8\u6642\u9593", "ET"};
-        String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEST",
-                                         "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AEDT",
-                                         "\u6771\u90E8\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "AET"};
-        String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET",
-                                     "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST",
-                                     "\u6771\u6B50\u5167\u9678\u6642\u9593", "FET"};
-        String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT",
-                                      "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST",
-                                      "\u8FE6\u7D0D\u6642\u9593", "GMT"};
-        String GAMBIER[] =  new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT",
-                                          "\u7518\u6bd4\u723e\u590f\u4ee4\u6642\u9593", "GAMST",
-                                          "\u7518\u6BD4\u723E\u6642\u9593", "GAMT"};
-        String GMT[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u6642\u9593", "GMT",
-                                   "\u683c\u6797\u5a01\u6cbb\u6642\u9593", "GMT",
-                                   "\u683C\u6797\u5A01\u6CBB\u6642\u9593", "GMT"};
-        String GMTBST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT",
-                                        "\u82f1\u570b\u590f\u4ee4\u6642\u9593", "BST",
-                                        "\u82F1\u570B\u6642\u9593", "BT"};
-        String GST[] = new String[] {"\u6ce2\u65af\u7063\u6a19\u6e96\u6642\u9593", "GST",
-                                     "\u6ce2\u65af\u7063\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "GDT",
-                                     "\u6CE2\u65AF\u7063\u6642\u9593", "GT"};
-        String HKT[] =  new String[] {"\u9999\u6e2f\u6642\u9593", "HKT",
-                                      "\u9999\u6e2f\u590f\u4ee4\u6642\u9593", "HKST",
-                                      "\u9999\u6E2F\u6642\u9593", "HKT"};
-        String HST[] = new String[] {"\u590f\u5a01\u5937\u6a19\u6e96\u6642\u9593", "HST",
-                                     "\u590f\u5a01\u5937\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "HDT",
-                                     "\u590F\u5A01\u5937\u6642\u9593", "HT"};
-        String ICT[] = new String[] {"\u5370\u5ea6\u652f\u90a3\u6642\u9593", "ICT",
-                                     "\u5370\u5ea6\u652f\u90a3\u590f\u4ee4\u6642\u9593", "ICST",
-                                     "\u5370\u5EA6\u652F\u90A3\u6642\u9593", "ICT"};
-        String IRKT[] = new String[] {"Irkutsk \u6642\u9593", "IRKT",
-                                      "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST",
-                                      "\u4F0A\u723E\u5EAB\u6B21\u514B\u6642\u9593", "IRKT"};
-        String IRT[] = new String[] {"\u4f0a\u6717\u6a19\u6e96\u6642\u9593", "IRST",
-                                     "\u4f0a\u6717\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IRDT",
-                                     "\u4F0A\u6717\u6642\u9593", "IRT"};
-        String ISRAEL[] = new String[] {"\u4ee5\u8272\u5217\u6a19\u6e96\u6642\u9593", "IST",
-                                        "\u4ee5\u8272\u5217\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IDT",
-                                        "\u4EE5\u8272\u5217\u6642\u9593", "IT"};
-        String IST[] = new String[] {"\u5370\u5ea6\u6a19\u6e96\u6642\u9593", "IST",
-                                     "\u5370\u5ea6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "IDT",
-                                     "\u5370\u5EA6\u6642\u9593", "IT"};
-        String JST[] = new String[] {"\u65e5\u672c\u6a19\u6e96\u6642\u9593", "JST",
-                                     "\u65e5\u672c\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "JDT",
-                                     "\u65E5\u672C\u6642\u9593", "JT"};
-        String KRAT[] = new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
-                                      "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST",
-                                      "\u514B\u62C9\u65AF\u8AFE\u4E9E\u723E\u65AF\u514B\u6642\u9593", "KRAT"};
-        String KST[] = new String[] {"\u97d3\u570b\u6a19\u6e96\u6642\u9593", "KST",
-                                     "\u97d3\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "KDT",
-                                     "\u97D3\u570B\u6642\u9593", "KT"};
-        String LORD_HOWE[] = new String[] {"\u8c6a\u52f3\u7235\u5cf6\u6a19\u6e96\u6642\u9593", "LHST",
-                                           "\u8c6a\u52f3\u7235\u5cf6\u590f\u4ee4\u6642\u9593", "LHDT",
-                                           "\u8C6A\u52F3\u7235\u5CF6\u6642\u9593", "LHT"};
-        String MHT[] = new String[] {"\u99ac\u7d39\u723e\u7fa4\u5cf6\u6642\u9593", "MHT",
-                                     "\u99ac\u7d39\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "MHST",
-                                     "\u99AC\u7D39\u723E\u7FA4\u5CF6\u6642\u9593", "MHT"};
-        String MMT[] = new String[] {"\u7dec\u7538\u6642\u9593", "MMT",
-                                     "\u7dec\u7538\u590f\u4ee4\u6642\u9593", "MMST",
-                                     "\u7DEC\u7538\u6642\u9593", "MMT"};
-        String MSK[] = new String[] {"\u83ab\u65af\u79d1\u6a19\u6e96\u6642\u9593", "MSK",
-                                     "\u83ab\u65af\u79d1\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "MSD",
-                                     "\u83AB\u65AF\u79D1\u6642\u9593", "MT"};
-        String MST[] = new String[] {"\u5c71\u5340\u6a19\u6e96\u6642\u9593", "MST",
-                                     "\u5c71\u5340\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "MDT",
-                                     "\u7F8E\u570B\u5C71\u5340\u6642\u9593", "MT"};
-        String MYT[] = new String[] {"\u99ac\u4f86\u897f\u4e9e\u6642\u9593", "MYT",
-                                     "\u99ac\u4f86\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "MYST",
-                                     "\u99AC\u4F86\u897F\u4E9E\u6642\u9593", "MYT"};
-        String NORONHA[] = new String[] {"\u8cbb\u723e\u5357\u591a-\u8fea\u8afe\u7f85\u5c3c\u4e9e\u6642\u9593", "FNT",
-                                         "\u8cbb\u723e\u5357\u591a-\u8fea\u8afe\u7f85\u5c3c\u4e9e\u590f\u4ee4\u6642\u9593", "FNST",
-                                         "\u8CBB\u723E\u5357\u591A-\u8FEA\u8AFE\u7F85\u5C3C\u4E9E\u6642\u9593", "FNT"};
-        String NOVT[] = new String[] {"Novosibirsk \u6642\u9593", "NOVT",
-                                      "Novosibirsk \u590f\u4ee4\u6642\u9593", "NOVST",
-                                      "\u65B0\u897F\u4F2F\u5229\u4E9E\u6642\u9593", "NOVT"};
-        String NPT[] = new String[] {"\u5c3c\u6cca\u723e\u6642\u9593", "NPT",
-                                     "\u5c3c\u6cca\u723e\u590f\u4ee4\u6642\u9593", "NPST",
-                                     "\u5C3C\u6CCA\u723E\u6642\u9593", "NPT"};
-        String NST[] = new String[] {"\u7d10\u82ac\u862d\u6a19\u6e96\u6642\u9593", "NST",
-                                     "\u7d10\u82ac\u862d\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "NDT",
-                                     "\u7D10\u82AC\u862D\u6642\u9593", "NT"};
-        String NZST[] = new String[] {"\u7d10\u897f\u862d\u6a19\u6e96\u6642\u9593", "NZST",
-                                      "\u7d10\u897f\u862d\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "NZDT",
-                                      "\u7D10\u897F\u862D\u6642\u9593", "NZT"};
-        String PITCAIRN[] = new String[] {"\u76ae\u7279\u5eb7\u6a19\u6e96\u6642\u9593", "PST",
-                                        "\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT",
-                                        "\u76AE\u7279\u5EB7\u6642\u9593", "PT"};
-        String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT",
-                                     "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST",
-                                     "\u5DF4\u57FA\u65AF\u5766\u6642\u9593", "PKT"};
-        String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT",
-                                      "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST",
-                                      "\u6CE2\u7D0D\u4F69\u5CF6\u6642\u9593", "PONT"};
-        String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST",
-                                     "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT",
-                                     "\u592A\u5E73\u6D0B\u6642\u9593", "PT"};
-        String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST",
-                                      "\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST",
-                                      "\u5357\u975E\u6642\u9593", "SAT"};
-        String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT",
-                                     "\u6240\u7f85\u9580\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "SBST",
-                                     "\u6240\u7F85\u9580\u7FA4\u5CF6\u6642\u9593", "SBT"};
-        String SGT[] = new String[] {"\u65b0\u52a0\u5761\u6642\u9593", "SGT",
-                                     "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST",
-                                     "\u65B0\u52A0\u5761\u6642\u9593", "SGT"};
-        String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEST",
-                                          "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "AEDT",
-                                          "\u6FB3\u5927\u5229\u4E9E\u6771\u90E8\u6642\u9593 (\u5854\u65AF\u99AC\u5C3C\u4E9E\u5CF6)", "AET"};
-        String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT",
-                                     "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST",
-                                     "\u571F\u5EAB\u66FC\u6642\u9593", "TMT"};
-        String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT",
-                                     "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST",
-                                     "\u5EAB\u502B\u6642\u9593", "ULAT"};
-        String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT",
-                                     "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST",
-                                     "\u897F\u975E\u6642\u9593", "WAT"};
-        String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
-                                     "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST",
-                                     "\u897F\u6B50\u6642\u9593", "WET"};
-        String WGT[] = new String[] {"\u897f\u683c\u6797\u862d\u5cf6\u6642\u9593", "WGT",
-                                     "\u897f\u683c\u6797\u862d\u5cf6\u590f\u4ee4\u6642\u9593", "WGST",
-                                     "\u897F\u683C\u9675\u862D\u6642\u9593", "WGT"};
-        String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB",
-                                     "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST",
-                                     "\u897F\u5370\u5C3C\u6642\u9593", "WIB"};
-        String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWST",
-                                         "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWDT",
-                                         "\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "AWT"};
-        String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST",
-                                       "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT",
-                                       "\u85A9\u6469\u4E9E\u6642\u9593", "ST"};
-        String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WSST",
-                                           "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT",
-                                           "\u897F\u85A9\u6469\u4E9E\u6642\u9593", "WST"};
-        String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST",
-                                     "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT",
-                                     "\u67E5\u83AB\u7F85\u6642\u9593", "ChT"};
-        String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEST",
-                                          "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "AEDT",
-                                          "\u6771\u90E8\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E)", "AET"};
-        String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
-                                     "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
-                                     "\u5354\u8ABF\u4E16\u754C\u6642\u9593", "UTC"};
-        String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT",
-                                     "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST",
-                                     "\u70CF\u8332\u5225\u514B\u65AF\u5766\u6642\u9593", "UZT"};
-        String XJT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "XJT",
-                                     "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "XJDT",
-                                     "\u4E2D\u570B\u6642\u9593", "XJT"};
-        String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
-                                      "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST",
-                                      "\u4E9E\u5EAB\u6B21\u514B\u6642\u9593", "YAKT"};
-
-        return new Object[][] {
-            {"America/Los_Angeles", PST},
-            {"PST", PST},
-            {"America/Denver", MST},
-            {"MST", MST},
-            {"America/Phoenix", MST},
-            {"PNT", MST},
-            {"America/Chicago", CST},
-            {"CST", CST},
-            {"America/New_York", EST},
-            {"EST", EST},
-            {"America/Indianapolis", EST},
-            {"IET", EST},
-            {"Pacific/Honolulu", HST},
-            {"HST", HST},
-            {"America/Anchorage", AKST},
-            {"AST", AKST},
-            {"America/Halifax", AST},
-            {"America/Sitka", AKST},
-            {"America/St_Johns", NST},
-            {"CNT", NST},
-            {"Europe/Paris", CET},
-            {"ECT", CET},
-            {"GMT", GMT},
-            {"Africa/Casablanca", WET},
-            {"Asia/Jerusalem", ISRAEL},
-            {"Asia/Tokyo", JST},
-            {"JST", JST},
-            {"Europe/Bucharest", EET},
-            {"Asia/Shanghai", CTT},
-            {"CTT", CTT},
-            {"UTC", UTC},
-            /* Don't change the order of the above zones
-             * to keep compatibility with the previous version.
-             */
-
-            {"ACT", DARWIN},
-            {"AET", EST_NSW},
-            {"AGT", AGT},
-            {"ART", EET},
-            {"Africa/Abidjan", GMT},
-            {"Africa/Accra", GHMT},
-            {"Africa/Addis_Ababa", EAT},
-            {"Africa/Algiers", CET},
-            {"Africa/Asmara", EAT},
-            {"Africa/Asmera", EAT},
-            {"Africa/Bamako", GMT},
-            {"Africa/Bangui", WAT},
-            {"Africa/Banjul", GMT},
-            {"Africa/Bissau", GMT},
-            {"Africa/Blantyre", CAT},
-            {"Africa/Brazzaville", WAT},
-            {"Africa/Bujumbura", CAT},
-            {"Africa/Cairo", EET},
-            {"Africa/Ceuta", CET},
-            {"Africa/Conakry", GMT},
-            {"Africa/Dakar", GMT},
-            {"Africa/Dar_es_Salaam", EAT},
-            {"Africa/Djibouti", EAT},
-            {"Africa/Douala", WAT},
-            {"Africa/El_Aaiun", WET},
-            {"Africa/Freetown", GMT},
-            {"Africa/Gaborone", CAT},
-            {"Africa/Harare", CAT},
-            {"Africa/Johannesburg", SAST},
-            {"Africa/Juba", CAT},
-            {"Africa/Kampala", EAT},
-            {"Africa/Khartoum", CAT},
-            {"Africa/Kigali", CAT},
-            {"Africa/Kinshasa", WAT},
-            {"Africa/Lagos", WAT},
-            {"Africa/Libreville", WAT},
-            {"Africa/Lome", GMT},
-            {"Africa/Luanda", WAT},
-            {"Africa/Lubumbashi", CAT},
-            {"Africa/Lusaka", CAT},
-            {"Africa/Malabo", WAT},
-            {"Africa/Maputo", CAT},
-            {"Africa/Maseru", SAST},
-            {"Africa/Mbabane", SAST},
-            {"Africa/Mogadishu", EAT},
-            {"Africa/Monrovia", GMT},
-            {"Africa/Nairobi", EAT},
-            {"Africa/Ndjamena", WAT},
-            {"Africa/Niamey", WAT},
-            {"Africa/Nouakchott", GMT},
-            {"Africa/Ouagadougou", GMT},
-            {"Africa/Porto-Novo", WAT},
-            {"Africa/Sao_Tome", GMT},
-            {"Africa/Timbuktu", GMT},
-            {"Africa/Tripoli", EET},
-            {"Africa/Tunis", CET},
-            {"Africa/Windhoek", new String[] {"Central African Time", "CAT",
-                                              "Western African Time", "WAT",
-                                              "Central African Time", "CAT"}},
-            {"America/Adak", HST},
-            {"America/Anguilla", AST},
-            {"America/Antigua", AST},
-            {"America/Araguaina", BRT},
-            {"America/Argentina/Buenos_Aires", AGT},
-            {"America/Argentina/Catamarca", AGT},
-            {"America/Argentina/ComodRivadavia", AGT},
-            {"America/Argentina/Cordoba", AGT},
-            {"America/Argentina/Jujuy", AGT},
-            {"America/Argentina/La_Rioja", AGT},
-            {"America/Argentina/Mendoza", AGT},
-            {"America/Argentina/Rio_Gallegos", AGT},
-            {"America/Argentina/Salta", AGT},
-            {"America/Argentina/San_Juan", AGT},
-            {"America/Argentina/San_Luis", AGT},
-            {"America/Argentina/Tucuman", AGT},
-            {"America/Argentina/Ushuaia", AGT},
-            {"America/Aruba", AST},
-            {"America/Asuncion", new String[] {"\u5df4\u62c9\u572d\u6642\u9593", "PYT",
-                                               "\u5df4\u62c9\u572d\u590f\u4ee4\u6642\u9593", "PYST",
-                                               "\u5DF4\u62C9\u572D\u6642\u9593", "PYT"}},
-            {"America/Atikokan", EST},
-            {"America/Atka", HST},
-            {"America/Bahia", BRT},
-            {"America/Bahia_Banderas", CST},
-            {"America/Barbados", AST},
-            {"America/Belem", BRT},
-            {"America/Belize", CST},
-            {"America/Blanc-Sablon", AST},
-            {"America/Boa_Vista", AMT},
-            {"America/Bogota", new String[] {"\u54e5\u502b\u6bd4\u4e9e\u6642\u9593", "COT",
-                                             "\u54e5\u502b\u6bd4\u4e9e\u590f\u4ee4\u6642\u9593", "COST",
-                                             "\u54E5\u502B\u6BD4\u4E9E\u6642\u9593", "COT"}},
-            {"America/Boise", MST},
-            {"America/Buenos_Aires", AGT},
-            {"America/Cambridge_Bay", MST},
-            {"America/Campo_Grande", AMT},
-            {"America/Cancun", EST},
-            {"America/Caracas", new String[] {"\u59d4\u5167\u745e\u62c9\u6642\u9593", "VET",
-                                              "\u59d4\u5167\u745e\u62c9\u590f\u4ee4\u6642\u9593", "VEST",
-                                              "\u59D4\u5167\u745E\u62C9\u6642\u9593", "VET"}},
-            {"America/Catamarca", AGT},
-            {"America/Cayenne", new String[] {"\u6cd5\u5c6c\u572d\u4e9e\u90a3\u6642\u9593", "GFT",
-                                              "\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST",
-                                              "\u6CD5\u5C6C\u572D\u4E9E\u90A3\u6642\u9593", "GFT"}},
-            {"America/Cayman", EST},
-            {"America/Chihuahua", CST},
-            {"America/Ciudad_Juarez", MST},
-            {"America/Creston", MST},
-            {"America/Coral_Harbour", EST},
-            {"America/Cordoba", AGT},
-            {"America/Costa_Rica", CST},
-            {"America/Cuiaba", AMT},
-            {"America/Curacao", AST},
-            {"America/Danmarkshavn", GMT},
-            {"America/Dawson", MST},
-            {"America/Dawson_Creek", MST},
-            {"America/Detroit", EST},
-            {"America/Dominica", AST},
-            {"America/Edmonton", MST},
-            {"America/Eirunepe", ACT},
-            {"America/El_Salvador", CST},
-            {"America/Ensenada", PST},
-            {"America/Fort_Nelson", MST},
-            {"America/Fort_Wayne", EST},
-            {"America/Fortaleza", BRT},
-            {"America/Glace_Bay", AST},
-            {"America/Godthab", WGT},
-            {"America/Goose_Bay", AST},
-            {"America/Grand_Turk", EST},
-            {"America/Grenada", AST},
-            {"America/Guadeloupe", AST},
-            {"America/Guatemala", CST},
-            {"America/Guayaquil", new String[] {"\u5384\u74dc\u591a\u723e\u6642\u9593", "ECT",
-                                                "\u5384\u74dc\u591a\u723e\u590f\u4ee4\u6642\u9593", "ECST",
-                                                "\u5384\u74DC\u591A\u723E\u6642\u9593", "ECT"}},
-            {"America/Guyana", new String[] {"\u84cb\u4e9e\u90a3\u6642\u9593", "GYT",
-                                             "\u84cb\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GYST",
-                                             "\u84CB\u4E9E\u90A3\u6642\u9593", "GYT"}},
-            {"America/Havana", CUBA},
-            {"America/Hermosillo", MST},
-            {"America/Indiana/Indianapolis", EST},
-            {"America/Indiana/Knox", CST},
-            {"America/Indiana/Marengo", EST},
-            {"America/Indiana/Petersburg", EST},
-            {"America/Indiana/Tell_City", CST},
-            {"America/Indiana/Vevay", EST},
-            {"America/Indiana/Vincennes", EST},
-            {"America/Indiana/Winamac", EST},
-            {"America/Inuvik", MST},
-            {"America/Iqaluit", EST},
-            {"America/Jamaica", EST},
-            {"America/Jujuy", AGT},
-            {"America/Juneau", AKST},
-            {"America/Kentucky/Louisville", EST},
-            {"America/Kentucky/Monticello", EST},
-            {"America/Knox_IN", CST},
-            {"America/Kralendijk", AST},
-            {"America/La_Paz", new String[] {"\u73bb\u5229\u7dad\u4e9e\u6642\u9593", "BOT",
-                                             "\u73bb\u5229\u7dad\u4e9e\u590f\u4ee4\u6642\u9593", "BOST",
-                                             "\u73BB\u5229\u7DAD\u4E9E\u6642\u9593", "BOT"}},
-            {"America/Lima", new String[] {"\u7955\u9b6f\u6642\u9593", "PET",
-                                           "\u7955\u9b6f\u590f\u4ee4\u6642\u9593", "PEST",
-                                           "\u7955\u9B6F\u6642\u9593", "PET"}},
-            {"America/Louisville", EST},
-            {"America/Lower_Princes", AST},
-            {"America/Maceio", BRT},
-            {"America/Managua", CST},
-            {"America/Manaus", AMT},
-            {"America/Marigot", AST},
-            {"America/Martinique", AST},
-            {"America/Matamoros", CST},
-            {"America/Mazatlan", MST},
-            {"America/Mendoza", AGT},
-            {"America/Menominee", CST},
-            {"America/Merida", CST},
-            {"America/Metlakatla", AKST},
-            {"America/Mexico_City", CST},
-            {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
-                                               "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT",
-                                               "\u8056\u5F7C\u5FB7\u8207\u5BC6\u555F\u5D19\u6642\u9593", "PMT"}},
-            {"America/Moncton", AST},
-            {"America/Montevideo", new String[] {"\u70cf\u62c9\u572d\u6642\u9593", "UYT",
-                                                 "\u70cf\u62c9\u572d\u590f\u4ee4\u6642\u9593", "UYST",
-                                                 "\u70CF\u62C9\u572D\u6642\u9593", "UYT"}},
-            {"America/Monterrey", CST},
-            {"America/Montreal", EST},
-            {"America/Montserrat", AST},
-            {"America/Nassau", EST},
-            {"America/Nipigon", EST},
-            {"America/Nome", AKST},
-            {"America/Noronha", NORONHA},
-            {"America/North_Dakota/Beulah", CST},
-            {"America/North_Dakota/Center", CST},
-            {"America/North_Dakota/New_Salem", CST},
-            {"America/Nuuk", WGT},
-            {"America/Ojinaga", CST},
-            {"America/Panama", EST},
-            {"America/Pangnirtung", EST},
-            {"America/Paramaribo", new String[] {"\u8607\u5229\u5357\u6642\u9593", "SRT",
-                                                 "\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST",
-                                                 "\u8607\u5229\u5357\u6642\u9593", "SRT"}},
-            {"America/Port-au-Prince", EST},
-            {"America/Port_of_Spain", AST},
-            {"America/Porto_Acre", ACT},
-            {"America/Porto_Velho", AMT},
-            {"America/Puerto_Rico", AST},
-            {"America/Rainy_River", CST},
-            {"America/Rankin_Inlet", CST},
-            {"America/Recife", BRT},
-            {"America/Regina", CST},
-            {"America/Resolute", CST},
-            {"America/Rio_Branco", ACT},
-            {"America/Rosario", AGT},
-            {"America/Santa_Isabel", PST},
-            {"America/Santarem", BRT},
-            {"America/Santiago", CLT},
-            {"America/Santo_Domingo", AST},
-            {"America/Sao_Paulo", BRT},
-            {"America/Scoresbysund", EGT},
-            {"America/Shiprock", MST},
-            {"America/St_Barthelemy", AST},
-            {"America/St_Kitts", AST},
-            {"America/St_Lucia", AST},
-            {"America/St_Thomas", AST},
-            {"America/St_Vincent", AST},
-            {"America/Swift_Current", CST},
-            {"America/Tegucigalpa", CST},
-            {"America/Thule", AST},
-            {"America/Thunder_Bay", EST},
-            {"America/Tijuana", PST},
-            {"America/Toronto", EST},
-            {"America/Tortola", AST},
-            {"America/Vancouver", PST},
-            {"America/Virgin", AST},
-            {"America/Whitehorse", MST},
-            {"America/Winnipeg", CST},
-            {"America/Yakutat", AKST},
-            {"America/Yellowknife", MST},
-            {"Antarctica/Casey", WST_AUS},
-            {"Antarctica/Davis", new String[] {"\u81fa\u7dad\u65af\u6642\u9593", "DAVT",
-                                               "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST",
-                                               "\u81FA\u7DAD\u65AF\u6642\u9593", "DAVT"}},
-            {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT",
-                                                        "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST",
-                                                        "Dumont-d'Urville \u6642\u9593", "DDUT"}},
-            {"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
-                                                   "Australian Eastern Daylight Time (Macquarie)", "AEDT",
-                                                   "Australian Eastern Time (Macquarie)", "AET"}},
-            {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT",
-                                                "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST",
-                                                "\u83AB\u68EE\u6642\u9593", "MAWT"}},
-            {"Antarctica/McMurdo", NZST},
-            {"Antarctica/Palmer", CLT},
-            {"Antarctica/Rothera", new String[] {"\u7f85\u897f\u62c9\u6642\u9593", "ROTT",
-                                                 "\u7f85\u897f\u62c9\u590f\u4ee4\u6642\u9593", "ROTST",
-                                                 "\u7F85\u897F\u62C9\u6642\u9593", "ROTT"}},
-            {"Antarctica/South_Pole", NZST},
-            {"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT",
-                                               "\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST",
-                                               "\u5915\u6B50\u74E6 (Syowa) \u6642\u9593", "SYOT"}},
-            {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC",
-                                               "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST",
-                                               "Troll Time", "ATT"}},
-            {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST",
-                                                "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST",
-                                                "\u4F5B\u65AF\u6258 (Vostok) \u6642\u9593", "VOST"}},
-            {"Arctic/Longyearbyen", CET},
-            {"Asia/Aden", ARAST},
-            {"Asia/Almaty", new String[] {"Alma-Ata \u6642\u9593", "ALMT",
-                                          "Alma-Ata \u590f\u4ee4\u6642\u9593", "ALMST",
-                                          "\u963F\u62C9\u6728\u5716\u6642\u9593", "ALMT"}},
-            {"Asia/Amman", EET},
-            {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u6642\u9593", "ANAT",
-                                          "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u6642\u9593", "ANAST",
-                                          "\u963F\u90A3\u5E95\u6CB3\u6642\u9593", "ANAT"}},
-            {"Asia/Aqtau", new String[] {"Aqtau \u6642\u9593", "AQTT",
-                                         "Aqtau \u590f\u4ee4\u6642\u9593", "AQTST",
-                                         "\u963F\u514B\u5957\u6642\u9593", "AQTT"}},
-            {"Asia/Aqtobe", new String[] {"Aqtobe \u6642\u9593", "AQTT",
-                                          "Aqtobe \u590f\u4ee4\u6642\u9593", "AQTST",
-                                          "\u963F\u514B\u6258\u5225\u6642\u9593", "AQTT"}},
-            {"Asia/Ashgabat", TMT},
-            {"Asia/Ashkhabad", TMT},
-            {"Asia/Baghdad", ARAST},
-            {"Asia/Bahrain", ARAST},
-            {"Asia/Baku", new String[] {"\u4e9e\u585e\u62dc\u7136\u6642\u9593", "AZT",
-                                        "\u4e9e\u585e\u62dc\u7136\u590f\u4ee4\u6642\u9593", "AZST",
-                                        "\u4E9E\u585E\u62DC\u7136\u6642\u9593", "AZT"}},
-            {"Asia/Bangkok", ICT},
-            {"Asia/Beirut", EET},
-            {"Asia/Bishkek", new String[] {"Kirgizstan \u6642\u9593", "KGT",
-                                           "Kirgizstan \u590f\u4ee4\u6642\u9593", "KGST",
-                                           "\u5409\u723E\u5409\u65AF\u6642\u9593", "KGT"}},
-            {"Asia/Brunei", new String[] {"\u6c76\u840a\u6642\u9593", "BNT",
-                                          "\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST",
-                                          "\u6C76\u840A\u6642\u9593", "BNT"}},
-            {"Asia/Calcutta", IST},
-            {"Asia/Chita", YAKT},
-            {"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
-                                              "\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST",
-                                              "\u5DE7\u5DF4\u5C71 (Choibalsan) \u6642\u9593", "CHOT"}},
-            {"Asia/Chongqing", CTT},
-            {"Asia/Chungking", CTT},
-            {"Asia/Colombo", IST},
-            {"Asia/Dacca", BDT},
-            {"Asia/Dhaka", BDT},
-            {"Asia/Dili", new String[] {"\u6771\u5e1d\u6c76\u6642\u9593", "TLT",
-                                        "\u6771\u5e1d\u6c76\u590f\u4ee4\u6642\u9593", "TLST",
-                                        "\u6771\u5E1D\u6C76\u6642\u9593", "TLT"}},
-            {"Asia/Damascus", EET},
-            {"Asia/Dubai", GST},
-            {"Asia/Dushanbe", new String[] {"\u5854\u5409\u514b\u6642\u9593", "TJT",
-                                            "\u5854\u5409\u514b\u590f\u4ee4\u6642\u9593", "TJST",
-                                            "\u5854\u5409\u514B\u6642\u9593", "TJT"}},
-            {"Asia/Gaza", EET},
-            {"Asia/Harbin", CTT},
-            {"Asia/Hebron", EET},
-            {"Asia/Ho_Chi_Minh", ICT},
-            {"Asia/Hong_Kong", HKT},
-            {"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
-                                        "\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST",
-                                        "\u4FAF\u5FB7 (Hovd) \u6642\u9593", "HOVT"}},
-            {"Asia/Irkutsk", IRKT},
-            {"Asia/Istanbul", EET},
-            {"Asia/Jakarta", WIT},
-            {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT",
-                                            "\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST",
-                                            "\u6771\u5370\u5EA6\u5C3C\u897F\u4E9E\u6642\u9593", "WIT"}},
-            {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT",
-                                         "\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST",
-                                         "\u963F\u5BCC\u6C57\u6642\u9593", "AFT"}},
-            {"Asia/Kamchatka", new String[] {"Petropavlovsk-Kamchatski \u6642\u9593", "PETT",
-                                             "Petropavlovsk-Kamchatski \u590f\u4ee4\u6642\u9593", "PETST",
-                                             "Petropavlovsk-Kamchatski \u6642\u9593", "PETT"}},
-            {"Asia/Karachi", PKT},
-            {"Asia/Kashgar", XJT},
-            {"Asia/Kathmandu", NPT},
-            {"Asia/Katmandu", NPT},
-            {"Asia/Khandyga", YAKT},
-            {"Asia/Kolkata", IST},
-            {"Asia/Krasnoyarsk", KRAT},
-            {"Asia/Kuala_Lumpur", MYT},
-            {"Asia/Kuching", MYT},
-            {"Asia/Kuwait", ARAST},
-            {"Asia/Macao", CTT},
-            {"Asia/Macau", CTT},
-            {"Asia/Magadan", new String[] {"Magadan \u6642\u9593", "MAGT",
-                                           "Magadan \u590f\u4ee4\u6642\u9593", "MAGST",
-                                           "\u99AC\u52A0\u4E39\u6642\u9593", "MAGT"}},
-            {"Asia/Makassar", CIT},
-            {"Asia/Manila", new String[] {"Philippines Standard Time", "PST",
-                                          "Philippines Daylight Time", "PDT",
-                                          "Philippines Time", "PT"}},
-            {"Asia/Muscat", GST},
-            {"Asia/Nicosia", EET},
-            {"Asia/Novokuznetsk", KRAT},
-            {"Asia/Novosibirsk", NOVT},
-            {"Asia/Oral", new String[] {"\u6b50\u4f5b\u6642\u9593", "ORAT",
-                                        "\u6b50\u4f5b\u590f\u4ee4\u6642\u9593", "ORAST",
-                                        "\u6B50\u4F5B\u6642\u9593", "ORAT"}},
-            {"Asia/Omsk", new String[] {"\u6b50\u59c6\u65af\u514b (Omsk) \u6642\u9593", "OMST",
-                                        "\u6b50\u59c6\u65af\u514b (Omsk) \u590f\u4ee4\u6642\u9593", "OMSST",
-                                        "\u6B50\u59C6\u65AF\u514B (Omsk) \u6642\u9593", "OMST"}},
-            {"Asia/Phnom_Penh", ICT},
-            {"Asia/Pontianak", WIT},
-            {"Asia/Pyongyang", KST},
-            {"Asia/Qatar", ARAST},
-            {"Asia/Qyzylorda", new String[] {"Qyzylorda \u6642\u9593", "QYZT",
-                                             "Qyzylorda \u590f\u4ee4\u6642\u9593", "QYZST",
-                                             "\u514B\u5B5C\u6D1B\u723E\u9054\u6642\u9593", "QYZT"}},
-            {"Asia/Rangoon", MMT},
-            {"Asia/Riyadh", ARAST},
-            {"Asia/Saigon", ICT},
-            {"Asia/Sakhalin", new String[] {"\u5eab\u9801\u5cf6\u6642\u9593", "SAKT",
-                                            "\u5eab\u9801\u5cf6\u590f\u4ee4\u6642\u9593", "SAKST",
-                                            "\u5EAB\u9801\u5CF6\u6642\u9593", "SAKT"}},
-            {"Asia/Samarkand", UZT},
-            {"Asia/Seoul", KST},
-            {"Asia/Singapore", SGT},
-            {"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
-                                                 "Srednekolymsk Daylight Time", "SREDT",
-                                                 "Srednekolymsk Time", "SRET"}},
-            {"Asia/Taipei", new String[] {"\u53f0\u7063\u6a19\u6e96\u6642\u9593", "TST",
-                                          "\u53f0\u7063\u590f\u4ee4\u6642\u9593", "TDT",
-                                          "\u53f0\u7063\u6642\u9593", "TT"}},
-            {"Asia/Tel_Aviv", ISRAEL},
-            {"Asia/Tashkent", UZT},
-            {"Asia/Tbilisi", new String[] {"\u55ac\u6cbb\u4e9e\u6642\u9593", "GET",
-                                           "\u55ac\u6cbb\u4e9e\u590f\u4ee4\u6642\u9593", "GEST",
-                                           "\u55AC\u6CBB\u4E9E\u6642\u9593", "GET"}},
-            {"Asia/Tehran", IRT},
-            {"Asia/Thimbu", BTT},
-            {"Asia/Thimphu", BTT},
-            {"Asia/Ujung_Pandang", CIT},
-            {"Asia/Ulaanbaatar", ULAT},
-            {"Asia/Ulan_Bator", ULAT},
-            {"Asia/Urumqi", XJT},
-            {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT",
-                                            "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST",
-                                            "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT"}},
-            {"Asia/Vientiane", ICT},
-            {"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
-                                               "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST",
-                                               "\u6D77\u53C3\u5D34\u6642\u9593", "VLAT"}},
-            {"Asia/Yakutsk", YAKT},
-            {"Asia/Yangon", MMT},
-            {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT",
-                                                 "Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST",
-                                                 "\u8449\u5361\u6377\u7433\u5821\u6642\u9593", "YEKT"}},
-            {"Asia/Yerevan", ARMT},
-            {"Atlantic/Azores", new String[] {"\u4e9e\u901f\u723e\u7fa4\u5cf6\u6642\u9593", "AZOT",
-                                              "\u4e9e\u901f\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "AZOST",
-                                              "\u4E9E\u901F\u723E\u7FA4\u5CF6\u6642\u9593", "AZOT"}},
-            {"Atlantic/Bermuda", AST},
-            {"Atlantic/Canary", WET},
-            {"Atlantic/Cape_Verde", new String[] {"\u4f5b\u5fb7\u89d2\u6642\u9593", "CVT",
-                                                  "\u4f5b\u5fb7\u89d2\u590f\u4ee4\u6642\u9593", "CVST",
-                                                  "\u4F5B\u5FB7\u89D2\u6642\u9593", "CVT"}},
-            {"Atlantic/Faeroe", WET},
-            {"Atlantic/Faroe", WET},
-            {"Atlantic/Jan_Mayen", CET},
-            {"Atlantic/Madeira", WET},
-            {"Atlantic/Reykjavik", GMT},
-            {"Atlantic/South_Georgia", new String[] {"\u5357\u55ac\u6cbb\u4e9e\u6a19\u6e96\u6642\u9593", "GST",
-                                                     "\u5357\u55ac\u6cbb\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "GDT",
-                                                     "\u5357\u55AC\u6CBB\u4E9E\u6642\u9593", "GT"}},
-            {"Atlantic/St_Helena", GMT},
-            {"Atlantic/Stanley", new String[] {"\u798f\u514b\u862d\u7fa4\u5cf6\u6642\u9593", "FKT",
-                                               "\u798f\u514b\u862d\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "FKST",
-                                               "\u798F\u514B\u862D\u7FA4\u5CF6\u6642\u9593", "FKT"}},
-            {"Australia/ACT", EST_NSW},
-            {"Australia/Adelaide", ADELAIDE},
-            {"Australia/Brisbane", BRISBANE},
-            {"Australia/Broken_Hill", BROKEN_HILL},
-            {"Australia/Canberra", EST_NSW},
-            {"Australia/Currie", EST_NSW},
-            {"Australia/Darwin", DARWIN},
-            {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWST",
-                                              "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWDT",
-                                              "\u4E2D\u897F\u90E8\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "ACWT"}},
-            {"Australia/Hobart", TASMANIA},
-            {"Australia/LHI", LORD_HOWE},
-            {"Australia/Lindeman", BRISBANE},
-            {"Australia/Lord_Howe", LORD_HOWE},
-            {"Australia/Melbourne", VICTORIA},
-            {"Australia/North", DARWIN},
-            {"Australia/NSW", EST_NSW},
-            {"Australia/Perth", WST_AUS},
-            {"Australia/Queensland", BRISBANE},
-            {"Australia/South", ADELAIDE},
-            {"Australia/Sydney", EST_NSW},
-            {"Australia/Tasmania", TASMANIA},
-            {"Australia/Victoria", VICTORIA},
-            {"Australia/West", WST_AUS},
-            {"Australia/Yancowinna", BROKEN_HILL},
-            {"BET", BRT},
-            {"BST", BDT},
-            {"Brazil/Acre", ACT},
-            {"Brazil/DeNoronha", NORONHA},
-            {"Brazil/East", BRT},
-            {"Brazil/West", AMT},
-            {"Canada/Atlantic", AST},
-            {"Canada/Central", CST},
-            {"Canada/Eastern", EST},
-            {"Canada/Mountain", MST},
-            {"Canada/Newfoundland", NST},
-            {"Canada/Pacific", PST},
-            {"Canada/Yukon", MST},
-            {"Canada/Saskatchewan", CST},
-            {"CAT", CAT},
-            {"CET", CET},
-            {"Chile/Continental", CLT},
-            {"Chile/EasterIsland", EASTER},
-            {"CST6CDT", CST},
-            {"Cuba", CUBA},
-            {"EAT", EAT},
-            {"EET", EET},
-            {"Egypt", EET},
-            {"Eire", DUBLIN},
-            {"EST5EDT", EST},
-            {"Etc/Greenwich", GMT},
-            {"Etc/UCT", UTC},
-            {"Etc/Universal", UTC},
-            {"Etc/UTC", UTC},
-            {"Etc/Zulu", UTC},
-            {"Europe/Amsterdam", CET},
-            {"Europe/Andorra", CET},
-            {"Europe/Athens", EET},
-            {"Europe/Belfast", GMTBST},
-            {"Europe/Belgrade", CET},
-            {"Europe/Berlin", CET},
-            {"Europe/Bratislava", CET},
-            {"Europe/Brussels", CET},
-            {"Europe/Budapest", CET},
-            {"Europe/Busingen", CET},
-            {"Europe/Chisinau", EET},
-            {"Europe/Copenhagen", CET},
-            {"Europe/Dublin", DUBLIN},
-            {"Europe/Gibraltar", CET},
-            {"Europe/Guernsey", GMTBST},
-            {"Europe/Helsinki", EET},
-            {"Europe/Isle_of_Man", GMTBST},
-            {"Europe/Istanbul", EET},
-            {"Europe/Jersey", GMTBST},
-            {"Europe/Kaliningrad", EET},
-            {"Europe/Kiev", EET},
-            {"Europe/Lisbon", WET},
-            {"Europe/Ljubljana", CET},
-            {"Europe/London", GMTBST},
-            {"Europe/Luxembourg", CET},
-            {"Europe/Madrid", CET},
-            {"Europe/Malta", CET},
-            {"Europe/Mariehamn", EET},
-            {"Europe/Minsk", MSK},
-            {"Europe/Monaco", CET},
-            {"Europe/Moscow", MSK},
-            {"Europe/Nicosia", EET},
-            {"Europe/Oslo", CET},
-            {"Europe/Podgorica", CET},
-            {"Europe/Prague", CET},
-            {"Europe/Riga", EET},
-            {"Europe/Rome", CET},
-            {"Europe/Samara", new String[] {"\u6c99\u99ac\u62c9\u6642\u9593", "SAMT",
-                                            "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST",
-                                            "\u6C99\u99AC\u62C9\u6642\u9593", "SAMT"}},
-            {"Europe/San_Marino", CET},
-            {"Europe/Sarajevo", CET},
-            {"Europe/Simferopol", MSK},
-            {"Europe/Skopje", CET},
-            {"Europe/Sofia", EET},
-            {"Europe/Stockholm", CET},
-            {"Europe/Tallinn", EET},
-            {"Europe/Tirane", CET},
-            {"Europe/Tiraspol", EET},
-            {"Europe/Uzhgorod", EET},
-            {"Europe/Vaduz", CET},
-            {"Europe/Vatican", CET},
-            {"Europe/Vienna", CET},
-            {"Europe/Vilnius", EET},
-            {"Europe/Volgograd", MSK},
-            {"Europe/Warsaw", CET},
-            {"Europe/Zagreb", CET},
-            {"Europe/Zaporozhye", EET},
-            {"Europe/Zurich", CET},
-            {"GB", GMTBST},
-            {"GB-Eire", GMTBST},
-            {"Greenwich", GMT},
-            {"Hongkong", HKT},
-            {"Iceland", GMT},
-            {"Iran", IRT},
-            {"IST", IST},
-            {"Indian/Antananarivo", EAT},
-            {"Indian/Chagos", new String[] {"\u5370\u5ea6\u6d0b\u5730\u5340\u6642\u9593", "IOT",
-                                            "\u5370\u5ea6\u6d0b\u5730\u5340\u590f\u4ee4\u6642\u9593", "IOST",
-                                            "\u82F1\u5C6C\u5370\u5EA6\u6D0B\u5730\u5340", "IOT"}},
-            {"Indian/Christmas", new String[] {"\u8056\u8a95\u5cf6\u6642\u9593", "CXT",
-                                               "\u8056\u8a95\u5cf6\u590f\u4ee4\u6642\u9593", "CXST",
-                                               "\u8056\u8A95\u5CF6\u6642\u9593", "CIT"}},
-            {"Indian/Cocos", new String[] {"\u53ef\u53ef\u65af\u7fa4\u5cf6\u6642\u9593", "CCT",
-                                           "\u53ef\u53ef\u65af\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "CCST",
-                                           "\u53EF\u53EF\u65AF\u7FA4\u5CF6\u6642\u9593", "CCT"}},
-            {"Indian/Comoro", EAT},
-            {"Indian/Kerguelen", new String[] {"\u6cd5\u570b\u5357\u534a\u7403\u53ca\u5357\u6975\u5c6c\u5730\u6642\u9593", "TFT",
-                                               "\u6cd5\u570b\u5357\u534a\u7403\u53ca\u5357\u6975\u5c6c\u5730\u590f\u4ee4\u6642\u9593", "TFST",
-                                               "\u6CD5\u570B\u5357\u534A\u7403\u53CA\u5357\u6975\u5C6C\u5730\u6642\u9593", "TFT"}},
-            {"Indian/Mahe", new String[] {"\u585e\u5e2d\u723e\u7fa4\u5cf6\u6642\u9593", "SCT",
-                                          "\u585e\u5e2d\u723e\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "SCST",
-                                          "\u585E\u5E2D\u723E\u7FA4\u5CF6\u6642\u9593", "SCT"}},
-            {"Indian/Maldives", new String[] {"\u99ac\u723e\u5730\u592b\u6642\u9593", "MVT",
-                                              "\u99ac\u723e\u5730\u592b\u590f\u4ee4\u6642\u9593", "MVST",
-                                              "\u99AC\u723E\u5730\u592B\u6642\u9593", "MVT"}},
-            {"Indian/Mauritius", new String[] {"\u6469\u91cc\u897f\u65af\u6642\u9593", "MUT",
-                                               "\u6469\u91cc\u897f\u65af\u590f\u4ee4\u6642\u9593", "MUST",
-                                               "\u6469\u91CC\u897F\u65AF\u6642\u9593", "MUT"}},
-            {"Indian/Mayotte", EAT},
-            {"Indian/Reunion", new String[] {"\u7559\u5c3c\u65fa\u5cf6\u6642\u9593", "RET",
-                                             "\u7559\u5c3c\u65fa\u5cf6\u590f\u4ee4\u6642\u9593", "REST",
-                                             "\u7559\u5C3C\u65FA\u5CF6\u6642\u9593", "RET"}},
-            {"Israel", ISRAEL},
-            {"Jamaica", EST},
-            {"Japan", JST},
-            {"Kwajalein", MHT},
-            {"Libya", EET},
-            {"MET", CET},
-            {"Mexico/BajaNorte", PST},
-            {"Mexico/BajaSur", MST},
-            {"Mexico/General", CST},
-            {"MIT", WST_SAMOA},
-            {"MST7MDT", MST},
-            {"Navajo", MST},
-            {"NET", ARMT},
-            {"NST", NZST},
-            {"NZ", NZST},
-            {"NZ-CHAT", CHAST},
-            {"PLT", PKT},
-            {"Portugal", WET},
-            {"PRT", AST},
-            {"Pacific/Apia", WST_SAMOA},
-            {"Pacific/Auckland", NZST},
-            {"Pacific/Bougainville", new String[] {"Bougainville Standard Time", "BST",
-                                                   "Bougainville Daylight Time", "BST",
-                                                   "Bougainville Time", "BT"}},
-            {"Pacific/Chatham", CHAST},
-            {"Pacific/Chuuk", CHUT},
-            {"Pacific/Easter", EASTER},
-            {"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u5716\u6642\u9593", "VUT",
-                                            "\u74e6\u5974\u963f\u5716\u590f\u4ee4\u6642\u9593", "VUST",
-                                            "\u74E6\u5974\u963F\u5716\u6642\u9593", "VUT"}},
-            {"Pacific/Enderbury", new String[] {"\u83f2\u5c3c\u514b\u65af\u7fa4\u5cf6\u6642\u9593", "PHOT",
-                                                "\u83f2\u5c3c\u514b\u65af\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "PHOST",
-                                                "\u83F2\u5C3C\u514B\u65AF\u7FA4\u5CF6\u6642\u9593", "PHOT"}},
-            {"Pacific/Fakaofo", new String[] {"\u6258\u514b\u52de\u7fa4\u5cf6\u6642\u9593", "TKT",
-                                              "\u6258\u514b\u52de\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "TKST",
-                                              "\u6258\u514B\u52DE\u7FA4\u5CF6\u6642\u9593", "TKT"}},
-            {"Pacific/Fiji", new String[] {"\u6590\u6fdf\u6642\u9593", "FJT",
-                                           "\u6590\u6fdf\u590f\u4ee4\u6642\u9593", "FJST",
-                                           "\u6590\u6FDF\u6642\u9593", "FJT"}},
-            {"Pacific/Funafuti", new String[] {"\u5410\u9b6f\u74e6\u6642\u9593", "TVT",
-                                               "\u5410\u9b6f\u74e6\u590f\u4ee4\u6642\u9593", "TVST",
-                                               "\u5410\u74E6\u9B6F\u6642\u9593", "TVT"}},
-            {"Pacific/Galapagos", new String[] {"\u52a0\u62c9\u5df4\u54e5\u6642\u9593", "GALT",
-                                                "\u52a0\u62c9\u5df4\u54e5\u590f\u4ee4\u6642\u9593", "GALST",
-                                                "\u52A0\u62C9\u5DF4\u54E5\u6642\u9593", "GALT"}},
-            {"Pacific/Gambier", GAMBIER},
-            {"Pacific/Guadalcanal", SBT},
-            {"Pacific/Guam", ChST},
-            {"Pacific/Johnston", HST},
-            {"Pacific/Kiritimati", new String[] {"Line Is. \u6642\u9593", "LINT",
-                                                 "Line Is. \u590f\u4ee4\u6642\u9593", "LINST",
-                                                 "\u5217\u5DBC\u7FA4\u5CF6\u6642\u9593", "LINT"}},
-            {"Pacific/Kosrae", new String[] {"Kosrae \u6642\u9593", "KOST",
-                                             "Kosrae \u590f\u4ee4\u6642\u9593", "KOSST",
-                                             "Kosrae \u6642\u9593", "KOST"}},
-            {"Pacific/Kwajalein", MHT},
-            {"Pacific/Majuro", MHT},
-            {"Pacific/Marquesas", new String[] {"\u99ac\u514b\u85a9\u65af\u6642\u9593", "MART",
-                                                "\u99ac\u514b\u85a9\u65af\u590f\u4ee4\u6642\u9593", "MARST",
-                                                "\u99AC\u514B\u85A9\u65AF\u6642\u9593", "MART"}},
-            {"Pacific/Midway", SAMOA},
-            {"Pacific/Nauru", new String[] {"\u8afe\u9b6f\u6642\u9593", "NRT",
-                                            "\u8afe\u9b6f\u590f\u4ee4\u6642\u9593", "NRST",
-                                            "\u8AFE\u9B6F\u6642\u9593", "NRT"}},
-            {"Pacific/Niue", new String[] {"\u7d10\u5a01\u5cf6\u6642\u9593", "NUT",
-                                           "\u7d10\u5a01\u5cf6\u590f\u4ee4\u6642\u9593", "NUST",
-                                           "\u7D10\u5A01\u5CF6\u6642\u9593", "NUT"}},
-            {"Pacific/Norfolk", new String[] {"\u8afe\u798f\u514b\u6642\u9593", "NFT",
-                                              "\u8afe\u798f\u514b\u590f\u4ee4\u6642\u9593", "NFST",
-                                              "\u8AFE\u798F\u514B\u6642\u9593", "NFT"}},
-            {"Pacific/Noumea", new String[] {"\u65b0\u52a0\u52d2\u591a\u5c3c\u4e9e\u6642\u9593", "NCT",
-                                             "\u65b0\u52a0\u52d2\u591a\u5c3c\u4e9e\u590f\u4ee4\u6642\u9593", "NCST",
-                                             "\u65B0\u52A0\u52D2\u591A\u5C3C\u4E9E\u6642\u9593", "NCT"}},
-            {"Pacific/Pago_Pago", SAMOA},
-            {"Pacific/Palau", new String[] {"\u5e1b\u7409\u6642\u9593", "PWT",
-                                            "\u5e1b\u7409\u590f\u4ee4\u6642\u9593", "PWST",
-                                            "\u5E1B\u7409\u6642\u9593", "PWT"}},
-            {"Pacific/Pitcairn", PITCAIRN},
-            {"Pacific/Pohnpei", PONT},
-            {"Pacific/Ponape", PONT},
-            {"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u6642\u9593", "PGT",
-                                                   "\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u590f\u4ee4\u6642\u9593", "PGST",
-                                                   "\u5DF4\u5E03\u4E9E\u65B0\u5E7E\u5167\u4E9E\u6642\u9593", "PGT"}},
-            {"Pacific/Rarotonga", new String[] {"\u5eab\u514b\u7fa4\u5cf6\u6642\u9593", "CKT",
-                                                "\u5eab\u514b\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "CKHST",
-                                                "\u5EAB\u514B\u7FA4\u5CF6\u6642\u9593", "CKT"}},
-            {"Pacific/Saipan", ChST},
-            {"Pacific/Samoa", SAMOA},
-            {"Pacific/Tahiti", new String[] {"\u5927\u6eaa\u5730\u5cf6\u6642\u9593", "TAHT",
-                                             "\u5927\u6eaa\u5730\u5cf6\u590f\u4ee4\u6642\u9593", "TAHST",
-                                             "\u5927\u6EAA\u5730\u6642\u9593", "TAHT"}},
-            {"Pacific/Tarawa", new String[] {"\u5409\u4f2f\u7279\u7fa4\u5cf6\u6642\u9593", "GILT",
-                                             "\u5409\u4f2f\u7279\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "GILST",
-                                             "\u5409\u4F2F\u7279\u7FA4\u5CF6\u6642\u9593", "GILT"}},
-            {"Pacific/Tongatapu", new String[] {"\u6771\u52a0\u6642\u9593", "TOT",
-                                                "\u6771\u52a0\u590f\u4ee4\u6642\u9593", "TOST",
-                                                "\u6771\u52A0\u6642\u9593", "TOT"}},
-            {"Pacific/Truk", CHUT},
-            {"Pacific/Wake", new String[] {"\u5a01\u514b\u6642\u9593", "WAKT",
-                                           "\u5a01\u514b\u590f\u4ee4\u6642\u9593", "WAKST",
-                                           "\u5A01\u514B\u6642\u9593", "WAKT"}},
-            {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u6642\u9593", "WFT",
-                                             "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "WFST",
-                                             "\u74E6\u5229\u65AF\u53CA\u798F\u675C\u7D0D\u7FA4\u5CF6\u6642\u9593", "WFT"}},
-            {"Pacific/Yap", CHUT},
-            {"Poland", CET},
-            {"PRC", CTT},
-            {"PST8PDT", PST},
-            {"ROK", KST},
-            {"Singapore", SGT},
-            {"SST", SBT},
-            {"SystemV/AST4", AST},
-            {"SystemV/AST4ADT", AST},
-            {"SystemV/CST6", CST},
-            {"SystemV/CST6CDT", CST},
-            {"SystemV/EST5", EST},
-            {"SystemV/EST5EDT", EST},
-            {"SystemV/HST10", HST},
-            {"SystemV/MST7", MST},
-            {"SystemV/MST7MDT", MST},
-            {"SystemV/PST8", PST},
-            {"SystemV/PST8PDT", PST},
-            {"SystemV/YST9", AKST},
-            {"SystemV/YST9YDT", AKST},
-            {"Turkey", EET},
-            {"UCT", UTC},
-            {"Universal", UTC},
-            {"US/Alaska", AKST},
-            {"US/Aleutian", HST},
-            {"US/Arizona", MST},
-            {"US/Central", CST},
-            {"US/Eastern", EST},
-            {"US/Hawaii", HST},
-            {"US/Indiana-Starke", CST},
-            {"US/East-Indiana", EST},
-            {"US/Michigan", EST},
-            {"US/Mountain", MST},
-            {"US/Pacific", PST},
-            {"US/Samoa", SAMOA},
-            {"VST", ICT},
-            {"W-SU", MSK},
-            {"WET", WET},
-            {"Zulu", UTC},
-        };
-    }
-}

From 4fa4f15122213afea5cb25166c3b36a1c395b06c Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 30 May 2025 17:23:52 +0000
Subject: [PATCH 736/901] 8357882: Use UTF-8 encoded data in LocaleDataTest

Reviewed-by: jlu, joehw
---
 test/jdk/sun/text/resources/LocaleData.cldr   | 8182 ++++++++---------
 .../sun/text/resources/LocaleDataTest.java    |  127 +-
 2 files changed, 4104 insertions(+), 4205 deletions(-)

diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr
index b7eb72b23e8..c56ad663798 100644
--- a/test/jdk/sun/text/resources/LocaleData.cldr
+++ b/test/jdk/sun/text/resources/LocaleData.cldr
@@ -8,7 +8,7 @@
 LocaleNames/en/es=Spanish
 
 # bug #4052679
-LocaleNames/fr/fr=fran\u00e7ais
+LocaleNames/fr/fr=français
 
 # bug #4055602, 4290801, 8013836
 CurrencyNames/pt_BR/BRL=R$
@@ -32,26 +32,26 @@ FormatData/pt_BR/DayAbbreviations/1=seg.
 FormatData/pt_BR/DayAbbreviations/2=ter.
 FormatData/pt_BR/DayNames/0=domingo
 FormatData/pt_BR/DayNames/1=segunda-feira
-FormatData/pt_BR/DayNames/2=ter\u00e7a-feira
+FormatData/pt_BR/DayNames/2=terça-feira
 FormatData/pt_BR/MonthNames/0=janeiro
 FormatData/pt_BR/MonthNames/1=fevereiro
-FormatData/pt_BR/MonthNames/2=mar\u00e7o
-LocaleNames/pt_BR/pt=portugu\u00eas
+FormatData/pt_BR/MonthNames/2=março
+LocaleNames/pt_BR/pt=português
 LocaleNames/pt_BR/PT=Portugal
 LocaleNames/pt_BR/BR=Brasil
 
 # bug #4066550
-FormatData/ja/Eras/0=\u7d00\u5143\u524d
-FormatData/ja/Eras/1=\u897f\u66a6
+FormatData/ja/Eras/0=紀元前
+FormatData/ja/Eras/1=西暦
 
 # bug #4067619
 LocaleNames/en/LT=Lithuania
 
 # bug #4068012, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u20bd
+CurrencyNames/ru_RU/RUB=₽
 FormatData/ru_RU/latn.NumberPatterns/0=#,##0.###
-# FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
-FormatData/ru_RU/latn.NumberPatterns/2=#,##0\u00a0%
+# FormatData/ru_RU/NumberPatterns/1=#,##0.##'р.';-#,##0.##'р.' # Changed; see bug 4122840
+FormatData/ru_RU/latn.NumberPatterns/2=#,##0 %
 
 # bug #4070174
 FormatData/en_CA/latn.NumberElements/1=,
@@ -82,60 +82,60 @@ FormatData/fr_FR/DatePatterns/0=EEEE d MMMM y
 # FormatData/it_IT/NumberPatterns/1='L.' #,##0;-'L.' #,##0 # Changed; see bug 4122840
 
 # bug #4071782
-FormatData/ru/DayAbbreviations/0=\u0432\u0441
-FormatData/ru/DayAbbreviations/1=\u043f\u043d
-FormatData/ru/DayAbbreviations/2=\u0432\u0442
-FormatData/ru/DayAbbreviations/3=\u0441\u0440
-FormatData/ru/DayAbbreviations/4=\u0447\u0442
-FormatData/ru/DayAbbreviations/5=\u043f\u0442
-FormatData/ru/DayAbbreviations/6=\u0441\u0431
+FormatData/ru/DayAbbreviations/0=вс
+FormatData/ru/DayAbbreviations/1=пн
+FormatData/ru/DayAbbreviations/2=вт
+FormatData/ru/DayAbbreviations/3=ср
+FormatData/ru/DayAbbreviations/4=чт
+FormatData/ru/DayAbbreviations/5=пт
+FormatData/ru/DayAbbreviations/6=сб
 
 # bug #4072013 - obsoleted by 6386647: Full date format in DateFormat does not include day of the week for UK locale
 #FormatData/en_GB/DatePatterns/0=dd MMMM yyyy
 
 # bug #4072388
-LocaleNames/cs/cs=\u010de\u0161tina
+LocaleNames/cs/cs=čeština
 
 # bug #4072773
 FormatData/ja/DatePatterns/2=y/MM/dd
 FormatData/ja/DatePatterns/3=y/MM/dd
 
 # bug #4075404, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u20bd
+CurrencyNames/ru_RU/RUB=₽
 FormatData/ru_RU/TimePatterns/0=HH:mm:ss zzzz
 FormatData/ru_RU/TimePatterns/1=HH:mm:ss z
 FormatData/ru_RU/TimePatterns/2=HH:mm:ss
 FormatData/ru_RU/TimePatterns/3=HH:mm
-FormatData/ru_RU/DatePatterns/0=EEEE, d MMMM y\u202f'\u0433'.
-FormatData/ru_RU/DatePatterns/1=d MMMM y\u202f'\u0433'.
-FormatData/ru_RU/DatePatterns/2=d MMM y\u202f'\u0433'.
+FormatData/ru_RU/DatePatterns/0=EEEE, d MMMM y 'г'.
+FormatData/ru_RU/DatePatterns/1=d MMMM y 'г'.
+FormatData/ru_RU/DatePatterns/2=d MMM y 'г'.
 FormatData/ru_RU/DatePatterns/3=dd.MM.y
 FormatData/ru_RU/DateTimePatterns/0={1}, {0}
 
 # bug #4084356, 4290801
-CurrencyNames/pl_PL/PLN=z\u0142
+CurrencyNames/pl_PL/PLN=zł
 FormatData/pl_PL/latn.NumberPatterns/0=#,##0.###
-# FormatData/pl_PL/NumberPatterns/1=#,##0.## z\u0142;-#,##0.## z\u0142 # Changed; see bug 4122840
+# FormatData/pl_PL/NumberPatterns/1=#,##0.## zł;-#,##0.## zł # Changed; see bug 4122840
 FormatData/pl_PL/latn.NumberPatterns/2=#,##0%
 FormatData/pl_PL/DayNames/0=niedziela
-FormatData/pl_PL/DayNames/1=poniedzia\u0142ek
+FormatData/pl_PL/DayNames/1=poniedziałek
 FormatData/pl_PL/DayNames/2=wtorek
-FormatData/pl_PL/DayNames/3=\u015broda
+FormatData/pl_PL/DayNames/3=środa
 FormatData/pl_PL/DayNames/4=czwartek
-FormatData/pl_PL/DayNames/5=pi\u0105tek
+FormatData/pl_PL/DayNames/5=piątek
 FormatData/pl_PL/DayNames/6=sobota
-FormatData/pl_PL/standalone.MonthNames/0=stycze\u0144
+FormatData/pl_PL/standalone.MonthNames/0=styczeń
 FormatData/pl_PL/standalone.MonthNames/1=luty
 FormatData/pl_PL/standalone.MonthNames/2=marzec
-FormatData/pl_PL/standalone.MonthNames/3=kwiecie\u0144
+FormatData/pl_PL/standalone.MonthNames/3=kwiecień
 FormatData/pl_PL/standalone.MonthNames/4=maj
 FormatData/pl_PL/standalone.MonthNames/5=czerwiec
 FormatData/pl_PL/standalone.MonthNames/6=lipiec
-FormatData/pl_PL/standalone.MonthNames/7=sierpie\u0144
-FormatData/pl_PL/standalone.MonthNames/8=wrzesie\u0144
-FormatData/pl_PL/standalone.MonthNames/9=pa\u017adziernik
+FormatData/pl_PL/standalone.MonthNames/7=sierpień
+FormatData/pl_PL/standalone.MonthNames/8=wrzesień
+FormatData/pl_PL/standalone.MonthNames/9=październik
 FormatData/pl_PL/standalone.MonthNames/10=listopad
-FormatData/pl_PL/standalone.MonthNames/11=grudzie\u0144
+FormatData/pl_PL/standalone.MonthNames/11=grudzień
 FormatData/pl_PL/standalone.MonthNames/12=
 LocaleNames/pl_PL/pl=polski
 FormatData/pl_PL/TimePatterns/0=HH:mm:ss zzzz
@@ -149,15 +149,15 @@ FormatData/pl_PL/DatePatterns/2=d MMM y
 FormatData/pl_PL/DatePatterns/3=d.MM.y
 FormatData/pl_PL/DateTimePatterns/0={1} {0}
 FormatData/pl_PL/latn.NumberElements/0=,
-FormatData/pl_PL/latn.NumberElements/1=\u00a0
+FormatData/pl_PL/latn.NumberElements/1= 
 FormatData/pl_PL/latn.NumberElements/2=;
 FormatData/pl_PL/latn.NumberElements/3=%
 FormatData/pl_PL/latn.NumberElements/4=0
 FormatData/pl_PL/latn.NumberElements/5=#
 FormatData/pl_PL/latn.NumberElements/6=-
 FormatData/pl_PL/latn.NumberElements/7=E
-FormatData/pl_PL/latn.NumberElements/8=\u2030
-FormatData/pl_PL/latn.NumberElements/9=\u221e
+FormatData/pl_PL/latn.NumberElements/8=‰
+FormatData/pl_PL/latn.NumberElements/9=∞
 FormatData/pl_PL/latn.NumberElements/10=NaN
 FormatData/pl_PL/Eras/0=p.n.e.
 FormatData/pl_PL/Eras/1=n.e.
@@ -165,7 +165,7 @@ LocaleNames/pl_PL/PL=Polska
 FormatData/pl_PL/DayAbbreviations/0=niedz.
 FormatData/pl_PL/DayAbbreviations/1=pon.
 FormatData/pl_PL/DayAbbreviations/2=wt.
-FormatData/pl_PL/DayAbbreviations/3=\u015br.
+FormatData/pl_PL/DayAbbreviations/3=śr.
 FormatData/pl_PL/DayAbbreviations/4=czw.
 FormatData/pl_PL/DayAbbreviations/5=pt.
 FormatData/pl_PL/DayAbbreviations/6=sob.
@@ -178,7 +178,7 @@ FormatData/pl_PL/MonthAbbreviations/5=cze
 FormatData/pl_PL/MonthAbbreviations/6=lip
 FormatData/pl_PL/MonthAbbreviations/7=sie
 FormatData/pl_PL/MonthAbbreviations/8=wrz
-FormatData/pl_PL/MonthAbbreviations/9=pa\u017a
+FormatData/pl_PL/MonthAbbreviations/9=paź
 FormatData/pl_PL/MonthAbbreviations/10=lis
 FormatData/pl_PL/MonthAbbreviations/11=gru
 FormatData/pl_PL/MonthAbbreviations/12=
@@ -187,14 +187,14 @@ FormatData/pl_PL/AmPmMarkers/1=PM
 
 # bug #4087238, 4290801
 # bug 4156708 - changed currency symbol from 00a5 to ffe5
-CurrencyNames/ja_JP/JPY=\uffe5
-# FormatData/ja_JP/NumberPatterns/1=\u00a5#,##0.00 # Changed; see bug 4122840
+CurrencyNames/ja_JP/JPY=￥
+# FormatData/ja_JP/NumberPatterns/1=¥#,##0.00 # Changed; see bug 4122840
 
 # bug #4092361
-FormatData/en_US/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/en_US/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/en_US/TimePatterns/2=h:mm:ss\u202fa
-FormatData/en_US/TimePatterns/3=h:mm\u202fa
+FormatData/en_US/TimePatterns/0=h:mm:ss a zzzz
+FormatData/en_US/TimePatterns/1=h:mm:ss a z
+FormatData/en_US/TimePatterns/2=h:mm:ss a
+FormatData/en_US/TimePatterns/3=h:mm a
 FormatData/en_US/DatePatterns/0=EEEE, MMMM d, y
 FormatData/en_US/DatePatterns/1=MMMM d, y
 FormatData/en_US/DatePatterns/2=MMM d, y
@@ -202,121 +202,121 @@ FormatData/en_US/DatePatterns/3=M/d/yy
 FormatData/en_US/DateTimePatterns/0={1}, {0}
 
 # bug #4094033, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u20bd
+CurrencyNames/ru_RU/RUB=₽
 FormatData/ru_RU/latn.NumberPatterns/0=#,##0.###
-# FormatData/ru_RU/NumberPatterns/1=#,##0.##'\u0440.';-#,##0.##'\u0440.' # Changed; see bug 4122840
-FormatData/ru_RU/latn.NumberPatterns/2=#,##0\u00a0%
-FormatData/ru_RU/MonthNames/0=\u044f\u043d\u0432\u0430\u0440\u044f
-FormatData/ru_RU/MonthNames/1=\u0444\u0435\u0432\u0440\u0430\u043b\u044f
-FormatData/ru_RU/MonthNames/2=\u043c\u0430\u0440\u0442\u0430
-FormatData/ru_RU/MonthNames/3=\u0430\u043f\u0440\u0435\u043b\u044f
-FormatData/ru_RU/MonthNames/4=\u043c\u0430\u044f
-FormatData/ru_RU/MonthNames/5=\u0438\u044e\u043d\u044f
-FormatData/ru_RU/MonthNames/6=\u0438\u044e\u043b\u044f
-FormatData/ru_RU/MonthNames/7=\u0430\u0432\u0433\u0443\u0441\u0442\u0430
-FormatData/ru_RU/MonthNames/8=\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/9=\u043e\u043a\u0442\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/10=\u043d\u043e\u044f\u0431\u0440\u044f
-FormatData/ru_RU/MonthNames/11=\u0434\u0435\u043a\u0430\u0431\u0440\u044f
+# FormatData/ru_RU/NumberPatterns/1=#,##0.##'р.';-#,##0.##'р.' # Changed; see bug 4122840
+FormatData/ru_RU/latn.NumberPatterns/2=#,##0 %
+FormatData/ru_RU/MonthNames/0=января
+FormatData/ru_RU/MonthNames/1=февраля
+FormatData/ru_RU/MonthNames/2=марта
+FormatData/ru_RU/MonthNames/3=апреля
+FormatData/ru_RU/MonthNames/4=мая
+FormatData/ru_RU/MonthNames/5=июня
+FormatData/ru_RU/MonthNames/6=июля
+FormatData/ru_RU/MonthNames/7=августа
+FormatData/ru_RU/MonthNames/8=сентября
+FormatData/ru_RU/MonthNames/9=октября
+FormatData/ru_RU/MonthNames/10=ноября
+FormatData/ru_RU/MonthNames/11=декабря
 FormatData/ru_RU/MonthNames/12=
-FormatData/ru_RU/standalone.MonthNames/0=\u044f\u043d\u0432\u0430\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/1=\u0444\u0435\u0432\u0440\u0430\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/2=\u043c\u0430\u0440\u0442
-FormatData/ru_RU/standalone.MonthNames/3=\u0430\u043f\u0440\u0435\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/4=\u043c\u0430\u0439
-FormatData/ru_RU/standalone.MonthNames/5=\u0438\u044e\u043d\u044c
-FormatData/ru_RU/standalone.MonthNames/6=\u0438\u044e\u043b\u044c
-FormatData/ru_RU/standalone.MonthNames/7=\u0430\u0432\u0433\u0443\u0441\u0442
-FormatData/ru_RU/standalone.MonthNames/8=\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/9=\u043e\u043a\u0442\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/10=\u043d\u043e\u044f\u0431\u0440\u044c
-FormatData/ru_RU/standalone.MonthNames/11=\u0434\u0435\u043a\u0430\u0431\u0440\u044c
+FormatData/ru_RU/standalone.MonthNames/0=январь
+FormatData/ru_RU/standalone.MonthNames/1=февраль
+FormatData/ru_RU/standalone.MonthNames/2=март
+FormatData/ru_RU/standalone.MonthNames/3=апрель
+FormatData/ru_RU/standalone.MonthNames/4=май
+FormatData/ru_RU/standalone.MonthNames/5=июнь
+FormatData/ru_RU/standalone.MonthNames/6=июль
+FormatData/ru_RU/standalone.MonthNames/7=август
+FormatData/ru_RU/standalone.MonthNames/8=сентябрь
+FormatData/ru_RU/standalone.MonthNames/9=октябрь
+FormatData/ru_RU/standalone.MonthNames/10=ноябрь
+FormatData/ru_RU/standalone.MonthNames/11=декабрь
 FormatData/ru_RU/standalone.MonthNames/12=
-FormatData/ru_RU/Eras/0=\u0434\u043e \u043d. \u044d.
-FormatData/ru_RU/Eras/1=\u043d. \u044d.
-LocaleNames/ru_RU/ru=\u0440\u0443\u0441\u0441\u043a\u0438\u0439
-FormatData/ru_RU/MonthAbbreviations/0=\u044f\u043d\u0432.
-FormatData/ru_RU/MonthAbbreviations/1=\u0444\u0435\u0432\u0440.
-FormatData/ru_RU/MonthAbbreviations/2=\u043c\u0430\u0440.
-FormatData/ru_RU/MonthAbbreviations/3=\u0430\u043f\u0440.
-FormatData/ru_RU/MonthAbbreviations/4=\u043c\u0430\u044f
-FormatData/ru_RU/MonthAbbreviations/5=\u0438\u044e\u043d.
-FormatData/ru_RU/MonthAbbreviations/6=\u0438\u044e\u043b.
-FormatData/ru_RU/MonthAbbreviations/7=\u0430\u0432\u0433.
-FormatData/ru_RU/MonthAbbreviations/8=\u0441\u0435\u043d\u0442.
-FormatData/ru_RU/MonthAbbreviations/9=\u043e\u043a\u0442.
-FormatData/ru_RU/MonthAbbreviations/10=\u043d\u043e\u044f\u0431.
-FormatData/ru_RU/MonthAbbreviations/11=\u0434\u0435\u043a.
+FormatData/ru_RU/Eras/0=до н. э.
+FormatData/ru_RU/Eras/1=н. э.
+LocaleNames/ru_RU/ru=русский
+FormatData/ru_RU/MonthAbbreviations/0=янв.
+FormatData/ru_RU/MonthAbbreviations/1=февр.
+FormatData/ru_RU/MonthAbbreviations/2=мар.
+FormatData/ru_RU/MonthAbbreviations/3=апр.
+FormatData/ru_RU/MonthAbbreviations/4=мая
+FormatData/ru_RU/MonthAbbreviations/5=июн.
+FormatData/ru_RU/MonthAbbreviations/6=июл.
+FormatData/ru_RU/MonthAbbreviations/7=авг.
+FormatData/ru_RU/MonthAbbreviations/8=сент.
+FormatData/ru_RU/MonthAbbreviations/9=окт.
+FormatData/ru_RU/MonthAbbreviations/10=нояб.
+FormatData/ru_RU/MonthAbbreviations/11=дек.
 FormatData/ru_RU/MonthAbbreviations/12=
-# FormatData/ru_RU/standalone.MonthAbbreviations/0=\u044f\u043d\u0432
-# FormatData/ru_RU/standalone.MonthAbbreviations/1=\u0444\u0435\u0432
-# FormatData/ru_RU/standalone.MonthAbbreviations/2=\u043c\u0430\u0440
-# FormatData/ru_RU/standalone.MonthAbbreviations/3=\u0430\u043f\u0440
-# FormatData/ru_RU/standalone.MonthAbbreviations/4=\u043c\u0430\u0439
-# FormatData/ru_RU/standalone.MonthAbbreviations/5=\u0438\u044e\u043d
-# FormatData/ru_RU/standalone.MonthAbbreviations/6=\u0438\u044e\u043b
-# FormatData/ru_RU/standalone.MonthAbbreviations/7=\u0430\u0432\u0433
-# FormatData/ru_RU/standalone.MonthAbbreviations/8=\u0441\u0435\u043d
-# FormatData/ru_RU/standalone.MonthAbbreviations/9=\u043e\u043a\u0442
-# FormatData/ru_RU/standalone.MonthAbbreviations/10=\u043d\u043e\u044f
-# FormatData/ru_RU/standalone.MonthAbbreviations/11=\u0434\u0435\u043a
+# FormatData/ru_RU/standalone.MonthAbbreviations/0=янв
+# FormatData/ru_RU/standalone.MonthAbbreviations/1=фев
+# FormatData/ru_RU/standalone.MonthAbbreviations/2=мар
+# FormatData/ru_RU/standalone.MonthAbbreviations/3=апр
+# FormatData/ru_RU/standalone.MonthAbbreviations/4=май
+# FormatData/ru_RU/standalone.MonthAbbreviations/5=июн
+# FormatData/ru_RU/standalone.MonthAbbreviations/6=июл
+# FormatData/ru_RU/standalone.MonthAbbreviations/7=авг
+# FormatData/ru_RU/standalone.MonthAbbreviations/8=сен
+# FormatData/ru_RU/standalone.MonthAbbreviations/9=окт
+# FormatData/ru_RU/standalone.MonthAbbreviations/10=ноя
+# FormatData/ru_RU/standalone.MonthAbbreviations/11=дек
 # FormatData/ru_RU/standalone.MonthAbbreviations/12=
-FormatData/ru_RU/standalone.MonthAbbreviations/0=\u044f\u043d\u0432.
-FormatData/ru_RU/standalone.MonthAbbreviations/1=\u0444\u0435\u0432\u0440.
-FormatData/ru_RU/standalone.MonthAbbreviations/2=\u043c\u0430\u0440\u0442
-FormatData/ru_RU/standalone.MonthAbbreviations/3=\u0430\u043f\u0440.
-FormatData/ru_RU/standalone.MonthAbbreviations/4=\u043c\u0430\u0439
-FormatData/ru_RU/standalone.MonthAbbreviations/5=\u0438\u044e\u043d\u044c
-FormatData/ru_RU/standalone.MonthAbbreviations/6=\u0438\u044e\u043b\u044c
-FormatData/ru_RU/standalone.MonthAbbreviations/7=\u0430\u0432\u0433.
-FormatData/ru_RU/standalone.MonthAbbreviations/8=\u0441\u0435\u043d\u0442.
-FormatData/ru_RU/standalone.MonthAbbreviations/9=\u043e\u043a\u0442.
-FormatData/ru_RU/standalone.MonthAbbreviations/10=\u043d\u043e\u044f\u0431.
-FormatData/ru_RU/standalone.MonthAbbreviations/11=\u0434\u0435\u043a.
+FormatData/ru_RU/standalone.MonthAbbreviations/0=янв.
+FormatData/ru_RU/standalone.MonthAbbreviations/1=февр.
+FormatData/ru_RU/standalone.MonthAbbreviations/2=март
+FormatData/ru_RU/standalone.MonthAbbreviations/3=апр.
+FormatData/ru_RU/standalone.MonthAbbreviations/4=май
+FormatData/ru_RU/standalone.MonthAbbreviations/5=июнь
+FormatData/ru_RU/standalone.MonthAbbreviations/6=июль
+FormatData/ru_RU/standalone.MonthAbbreviations/7=авг.
+FormatData/ru_RU/standalone.MonthAbbreviations/8=сент.
+FormatData/ru_RU/standalone.MonthAbbreviations/9=окт.
+FormatData/ru_RU/standalone.MonthAbbreviations/10=нояб.
+FormatData/ru_RU/standalone.MonthAbbreviations/11=дек.
 FormatData/ru_RU/standalone.MonthAbbreviations/12=
 FormatData/ru_RU/TimePatterns/0=HH:mm:ss zzzz
 FormatData/ru_RU/TimePatterns/1=HH:mm:ss z
 FormatData/ru_RU/TimePatterns/2=HH:mm:ss
 FormatData/ru_RU/TimePatterns/3=HH:mm
-FormatData/ru_RU/DatePatterns/0=EEEE, d MMMM y\u202f'\u0433'.
-FormatData/ru_RU/DatePatterns/1=d MMMM y\u202f'\u0433'.
-FormatData/ru_RU/DatePatterns/2=d MMM y\u202f'\u0433'.
+FormatData/ru_RU/DatePatterns/0=EEEE, d MMMM y 'г'.
+FormatData/ru_RU/DatePatterns/1=d MMMM y 'г'.
+FormatData/ru_RU/DatePatterns/2=d MMM y 'г'.
 FormatData/ru_RU/DatePatterns/3=dd.MM.y
 FormatData/ru_RU/DateTimePatterns/0={1}, {0}
-FormatData/ru_RU/DayNames/0=\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435
-FormatData/ru_RU/DayNames/1=\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a
-FormatData/ru_RU/DayNames/2=\u0432\u0442\u043e\u0440\u043d\u0438\u043a
-FormatData/ru_RU/DayNames/3=\u0441\u0440\u0435\u0434\u0430
-FormatData/ru_RU/DayNames/4=\u0447\u0435\u0442\u0432\u0435\u0440\u0433
-FormatData/ru_RU/DayNames/5=\u043f\u044f\u0442\u043d\u0438\u0446\u0430
-FormatData/ru_RU/DayNames/6=\u0441\u0443\u0431\u0431\u043e\u0442\u0430
+FormatData/ru_RU/DayNames/0=воскресенье
+FormatData/ru_RU/DayNames/1=понедельник
+FormatData/ru_RU/DayNames/2=вторник
+FormatData/ru_RU/DayNames/3=среда
+FormatData/ru_RU/DayNames/4=четверг
+FormatData/ru_RU/DayNames/5=пятница
+FormatData/ru_RU/DayNames/6=суббота
 FormatData/ru_RU/latn.NumberElements/0=,
-FormatData/ru_RU/latn.NumberElements/1=\u00a0
+FormatData/ru_RU/latn.NumberElements/1= 
 FormatData/ru_RU/latn.NumberElements/2=;
 FormatData/ru_RU/latn.NumberElements/3=%
 FormatData/ru_RU/latn.NumberElements/4=0
 FormatData/ru_RU/latn.NumberElements/5=#
 FormatData/ru_RU/latn.NumberElements/6=-
 FormatData/ru_RU/latn.NumberElements/7=E
-FormatData/ru_RU/latn.NumberElements/8=\u2030
-FormatData/ru_RU/latn.NumberElements/9=\u221e
-FormatData/ru_RU/latn.NumberElements/10=\u043d\u0435\u00a0\u0447\u0438\u0441\u043b\u043e
-LocaleNames/ru_RU/RU=\u0420\u043e\u0441\u0441\u0438\u044f
-FormatData/ru_RU/DayAbbreviations/0=\u0432\u0441
-FormatData/ru_RU/DayAbbreviations/1=\u043f\u043d
-FormatData/ru_RU/DayAbbreviations/2=\u0432\u0442
-FormatData/ru_RU/DayAbbreviations/3=\u0441\u0440
-FormatData/ru_RU/DayAbbreviations/4=\u0447\u0442
-FormatData/ru_RU/DayAbbreviations/5=\u043f\u0442
-FormatData/ru_RU/DayAbbreviations/6=\u0441\u0431
+FormatData/ru_RU/latn.NumberElements/8=‰
+FormatData/ru_RU/latn.NumberElements/9=∞
+FormatData/ru_RU/latn.NumberElements/10=не число
+LocaleNames/ru_RU/RU=Россия
+FormatData/ru_RU/DayAbbreviations/0=вс
+FormatData/ru_RU/DayAbbreviations/1=пн
+FormatData/ru_RU/DayAbbreviations/2=вт
+FormatData/ru_RU/DayAbbreviations/3=ср
+FormatData/ru_RU/DayAbbreviations/4=чт
+FormatData/ru_RU/DayAbbreviations/5=пт
+FormatData/ru_RU/DayAbbreviations/6=сб
 FormatData/ru_RU/AmPmMarkers/0=AM
 FormatData/ru_RU/AmPmMarkers/1=PM
 
 # bug #4094371, 4098518, 4290801, 6558863
-FormatData/en_AU/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/en_AU/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/en_AU/TimePatterns/2=h:mm:ss\u202fa
-FormatData/en_AU/TimePatterns/3=h:mm\u202fa
+FormatData/en_AU/TimePatterns/0=h:mm:ss a zzzz
+FormatData/en_AU/TimePatterns/1=h:mm:ss a z
+FormatData/en_AU/TimePatterns/2=h:mm:ss a
+FormatData/en_AU/TimePatterns/3=h:mm a
 FormatData/en_AU/DatePatterns/0=EEEE, d MMMM y
 FormatData/en_AU/DatePatterns/1=d MMMM y
 FormatData/en_AU/DatePatterns/2=d MMM y
@@ -337,10 +337,10 @@ FormatData/en_AU/MonthNames/0=January
 FormatData/en_AU/MonthNames/1=February
 FormatData/en_AU/MonthNames/2=March
 # changed, bug 6558863
-FormatData/en_NZ/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/en_NZ/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/en_NZ/TimePatterns/2=h:mm:ss\u202fa
-FormatData/en_NZ/TimePatterns/3=h:mm\u202fa
+FormatData/en_NZ/TimePatterns/0=h:mm:ss a zzzz
+FormatData/en_NZ/TimePatterns/1=h:mm:ss a z
+FormatData/en_NZ/TimePatterns/2=h:mm:ss a
+FormatData/en_NZ/TimePatterns/3=h:mm a
 FormatData/en_NZ/DatePatterns/0=EEEE, d MMMM y
 FormatData/en_NZ/DatePatterns/1=d MMMM y
 FormatData/en_NZ/DatePatterns/2=d MMM y
@@ -387,10 +387,10 @@ CurrencyNames/es_AR/ARS=$
 FormatData/es_AR/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_AR/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
 FormatData/es_AR/latn.NumberPatterns/2=#,##0%
-FormatData/es_AR/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_AR/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_AR/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_AR/TimePatterns/3=h:mm\u202fa
+FormatData/es_AR/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_AR/TimePatterns/1=h:mm:ss a z
+FormatData/es_AR/TimePatterns/2=h:mm:ss a
+FormatData/es_AR/TimePatterns/3=h:mm a
 FormatData/es_AR/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_AR/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_AR/DatePatterns/2=d MMM y
@@ -403,10 +403,10 @@ FormatData/es_BO/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_BO/NumberPatterns/1=B$#,##0.00;(B$#,##0.00) # Changed; see bug 4122840
 FormatData/es_BO/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_BO/BOB=Bs
-FormatData/es_BO/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_BO/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_BO/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_BO/TimePatterns/3=h:mm\u202fa
+FormatData/es_BO/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_BO/TimePatterns/1=h:mm:ss a z
+FormatData/es_BO/TimePatterns/2=h:mm:ss a
+FormatData/es_BO/TimePatterns/3=h:mm a
 FormatData/es_BO/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_BO/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_BO/DatePatterns/2=d MMM 'de' y
@@ -433,10 +433,10 @@ FormatData/es_CO/latn.NumberPatterns/0=#,##0.###
 FormatData/es_CO/latn.NumberPatterns/2=#,##0%
 # changed currency symbol during 5102005 bugfix
 CurrencyNames/es_CO/COP=$
-FormatData/es_CO/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_CO/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_CO/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_CO/TimePatterns/3=h:mm\u202fa
+FormatData/es_CO/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_CO/TimePatterns/1=h:mm:ss a z
+FormatData/es_CO/TimePatterns/2=h:mm:ss a
+FormatData/es_CO/TimePatterns/3=h:mm a
 FormatData/es_CO/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_CO/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_CO/DatePatterns/2=d/MM/y
@@ -449,27 +449,27 @@ FormatData/es_CO/latn.NumberElements/2=;
 FormatData/es_CR/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_CR/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
 FormatData/es_CR/latn.NumberPatterns/2=#,##0%
-CurrencyNames/es_CR/CRC=\u20a1
-FormatData/es_CR/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_CR/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_CR/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_CR/TimePatterns/3=h:mm\u202fa
+CurrencyNames/es_CR/CRC=₡
+FormatData/es_CR/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_CR/TimePatterns/1=h:mm:ss a z
+FormatData/es_CR/TimePatterns/2=h:mm:ss a
+FormatData/es_CR/TimePatterns/3=h:mm a
 FormatData/es_CR/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_CR/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_CR/DatePatterns/2=d MMM y
 FormatData/es_CR/DatePatterns/3=d/M/yy
 FormatData/es_CR/DateTimePatterns/0={1}, {0}
 FormatData/es_CR/latn.NumberElements/0=,
-FormatData/es_CR/latn.NumberElements/1=\u00a0
+FormatData/es_CR/latn.NumberElements/1= 
 FormatData/es_CR/latn.NumberElements/2=;
 FormatData/es_DO/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_DO/NumberPatterns/1=RD$#,##0.00;(RD$#,##0.00) # Changed; see bug 4122840
 FormatData/es_DO/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_DO/DOP=RD$
-FormatData/es_DO/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_DO/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_DO/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_DO/TimePatterns/3=h:mm\u202fa
+FormatData/es_DO/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_DO/TimePatterns/1=h:mm:ss a z
+FormatData/es_DO/TimePatterns/2=h:mm:ss a
+FormatData/es_DO/TimePatterns/3=h:mm a
 FormatData/es_DO/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_DO/DatePatterns/1=d 'de' MMMM 'de' y
 # FormatData/es_DO/DatePatterns/2=MM/dd/yyyy # Changed: see bug 8037343
@@ -492,20 +492,20 @@ FormatData/es_EC/DateTimePatterns/0={1}, {0}
 FormatData/es_EC/latn.NumberElements/0=,
 FormatData/es_EC/latn.NumberElements/1=.
 FormatData/es_EC/latn.NumberElements/2=;
-LocaleNames/es/ES=Espa\u00f1a
+LocaleNames/es/ES=España
 LocaleNames/es/AR=Argentina
 LocaleNames/es/BO=Bolivia
 LocaleNames/es/CL=Chile
 LocaleNames/es/CO=Colombia
 LocaleNames/es/CR=Costa Rica
-LocaleNames/es/DO=Rep\u00fablica Dominicana
+LocaleNames/es/DO=República Dominicana
 LocaleNames/es/EC=Ecuador
 LocaleNames/es/GT=Guatemala
 LocaleNames/es/HN=Honduras
-LocaleNames/es/MX=M\u00e9xico
+LocaleNames/es/MX=México
 LocaleNames/es/NI=Nicaragua
-LocaleNames/es/PA=Panam\u00e1
-LocaleNames/es/PE=Per\u00fa
+LocaleNames/es/PA=Panamá
+LocaleNames/es/PE=Perú
 LocaleNames/es/PR=Puerto Rico
 LocaleNames/es/PY=Paraguay
 # LocaleNames/es/SV=El SalvadorUY # Changed, see bug 4331446
@@ -515,10 +515,10 @@ FormatData/es_GT/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_GT/NumberPatterns/1=Q#,##0.00;(Q#,##0.00) # Changed; see bug 4122840
 FormatData/es_GT/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_GT/GTQ=Q
-FormatData/es_GT/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_GT/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_GT/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_GT/TimePatterns/3=h:mm\u202fa
+FormatData/es_GT/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_GT/TimePatterns/1=h:mm:ss a z
+FormatData/es_GT/TimePatterns/2=h:mm:ss a
+FormatData/es_GT/TimePatterns/3=h:mm a
 FormatData/es_GT/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_GT/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_GT/DatePatterns/2=d/MM/y
@@ -531,10 +531,10 @@ FormatData/es_HN/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_HN/NumberPatterns/1=L#,##0.00;(L#,##0.00) # Changed; see bug 4122840
 FormatData/es_HN/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_HN/HNL=L
-FormatData/es_HN/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_HN/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_HN/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_HN/TimePatterns/3=h:mm\u202fa
+FormatData/es_HN/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_HN/TimePatterns/1=h:mm:ss a z
+FormatData/es_HN/TimePatterns/2=h:mm:ss a
+FormatData/es_HN/TimePatterns/3=h:mm a
 FormatData/es_HN/DatePatterns/0=EEEE dd 'de' MMMM 'de' y
 FormatData/es_HN/DatePatterns/1=dd 'de' MMMM 'de' y
 FormatData/es_HN/DatePatterns/2=d MMM y
@@ -547,10 +547,10 @@ FormatData/es_MX/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_MX/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
 FormatData/es_MX/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_MX/MXN=$
-FormatData/es_MX/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_MX/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_MX/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_MX/TimePatterns/3=h:mm\u202fa
+FormatData/es_MX/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_MX/TimePatterns/1=h:mm:ss a z
+FormatData/es_MX/TimePatterns/2=h:mm:ss a
+FormatData/es_MX/TimePatterns/3=h:mm a
 FormatData/es_MX/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_MX/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_MX/DatePatterns/2=d MMM y
@@ -563,10 +563,10 @@ FormatData/es_NI/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_NI/NumberPatterns/1=$C#,##0.00;($C#,##0.00) # Changed; see bug 4122840
 FormatData/es_NI/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_NI/NIO=C$
-FormatData/es_NI/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_NI/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_NI/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_NI/TimePatterns/3=h:mm\u202fa
+FormatData/es_NI/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_NI/TimePatterns/1=h:mm:ss a z
+FormatData/es_NI/TimePatterns/2=h:mm:ss a
+FormatData/es_NI/TimePatterns/3=h:mm a
 FormatData/es_NI/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_NI/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_NI/DatePatterns/2=d MMM y
@@ -579,10 +579,10 @@ FormatData/es_PA/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_PA/NumberPatterns/1=B#,##0.00;(B#,##0.00) # Changed; see bug 4122840
 FormatData/es_PA/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_PA/PAB=B/.
-FormatData/es_PA/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_PA/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_PA/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_PA/TimePatterns/3=h:mm\u202fa
+FormatData/es_PA/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_PA/TimePatterns/1=h:mm:ss a z
+FormatData/es_PA/TimePatterns/2=h:mm:ss a
+FormatData/es_PA/TimePatterns/3=h:mm a
 FormatData/es_PA/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PA/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PA/DatePatterns/2=MM/dd/y
@@ -594,10 +594,10 @@ FormatData/es_PA/latn.NumberElements/2=;
 FormatData/es_PE/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_PE/NumberPatterns/1=S/#,##0.00;S/-#,##0.00 # Changed; see bug 4122840
 FormatData/es_PE/latn.NumberPatterns/2=#,##0%
-FormatData/es_PE/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_PE/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_PE/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_PE/TimePatterns/3=h:mm\u202fa
+FormatData/es_PE/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_PE/TimePatterns/1=h:mm:ss a z
+FormatData/es_PE/TimePatterns/2=h:mm:ss a
+FormatData/es_PE/TimePatterns/3=h:mm a
 FormatData/es_PE/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PE/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PE/DatePatterns/2=d MMM y
@@ -610,10 +610,10 @@ FormatData/es_PR/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_PR/NumberPatterns/1=$#,##0.00;($#,##0.00) # Changed; see bug 4122840
 FormatData/es_PR/latn.NumberPatterns/2=#,##0%
 CurrencyNames/es_PR/USD=$
-FormatData/es_PR/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_PR/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_PR/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_PR/TimePatterns/3=h:mm\u202fa
+FormatData/es_PR/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_PR/TimePatterns/1=h:mm:ss a z
+FormatData/es_PR/TimePatterns/2=h:mm:ss a
+FormatData/es_PR/TimePatterns/3=h:mm a
 FormatData/es_PR/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PR/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PR/DatePatterns/2=MM/dd/y
@@ -626,10 +626,10 @@ CurrencyNames/es_PY/PYG=Gs.
 FormatData/es_PY/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_PY/NumberPatterns/1=G#,##0.00;(G#,##0.00) # Changed; see bug 4122840
 FormatData/es_PY/latn.NumberPatterns/2=#,##0%
-FormatData/es_PY/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_PY/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_PY/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_PY/TimePatterns/3=h:mm\u202fa
+FormatData/es_PY/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_PY/TimePatterns/1=h:mm:ss a z
+FormatData/es_PY/TimePatterns/2=h:mm:ss a
+FormatData/es_PY/TimePatterns/3=h:mm a
 FormatData/es_PY/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_PY/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_PY/DatePatterns/2=d MMM y
@@ -641,10 +641,10 @@ FormatData/es_PY/latn.NumberElements/2=;
 FormatData/es_SV/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_SV/NumberPatterns/1=C#,##0.00;(C#,##0.00) # Changed; see bug 4122840
 FormatData/es_SV/latn.NumberPatterns/2=#,##0%
-FormatData/es_SV/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_SV/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_SV/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_SV/TimePatterns/3=h:mm\u202fa
+FormatData/es_SV/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_SV/TimePatterns/1=h:mm:ss a z
+FormatData/es_SV/TimePatterns/2=h:mm:ss a
+FormatData/es_SV/TimePatterns/3=h:mm a
 FormatData/es_SV/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_SV/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_SV/DatePatterns/2=d MMM y
@@ -657,10 +657,10 @@ CurrencyNames/es_UY/UYU=$
 FormatData/es_UY/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_UY/NumberPatterns/1=NU$ #,##0.00;(NU$#,##0.00) # Changed; see bug 4122840
 FormatData/es_UY/latn.NumberPatterns/2=#,##0%
-FormatData/es_UY/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_UY/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_UY/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_UY/TimePatterns/3=h:mm\u202fa
+FormatData/es_UY/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_UY/TimePatterns/1=h:mm:ss a z
+FormatData/es_UY/TimePatterns/2=h:mm:ss a
+FormatData/es_UY/TimePatterns/3=h:mm a
 FormatData/es_UY/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_UY/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_UY/DatePatterns/2=d MMM y
@@ -673,10 +673,10 @@ FormatData/es_UY/latn.NumberElements/2=;
 FormatData/es_VE/latn.NumberPatterns/0=#,##0.###
 # FormatData/es_VE/NumberPatterns/1=Bs#,##0.00;Bs -#,##0.00 # Changed; see bug 4122840
 FormatData/es_VE/latn.NumberPatterns/2=#,##0%
-FormatData/es_VE/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_VE/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_VE/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_VE/TimePatterns/3=h:mm\u202fa
+FormatData/es_VE/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_VE/TimePatterns/1=h:mm:ss a z
+FormatData/es_VE/TimePatterns/2=h:mm:ss a
+FormatData/es_VE/TimePatterns/3=h:mm a
 FormatData/es_VE/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_VE/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_VE/DatePatterns/2=d MMM y
@@ -687,19 +687,19 @@ FormatData/es_VE/latn.NumberElements/1=.
 FormatData/es_VE/latn.NumberElements/2=;
 
 # bug #4099810, 4290801, 6868106, 6916787
-CurrencyNames/uk_UA/UAH=\u20b4
+CurrencyNames/uk_UA/UAH=₴
 FormatData/uk_UA/latn.NumberPatterns/0=#,##0.###
-# FormatData/uk_UA/NumberPatterns/1=#,##0.## '\u0433\u0440\u0432.';-#,##0.## '\u0433\u0440\u0432.' # Changed; see bug 4122840
+# FormatData/uk_UA/NumberPatterns/1=#,##0.## 'грв.';-#,##0.## 'грв.' # Changed; see bug 4122840
 FormatData/uk_UA/latn.NumberPatterns/2=#,##0%
 
 # bug 6245766
-FormatData/uk/DatePatterns/0=EEEE, d MMMM y\u202f'\u0440'.
-FormatData/uk/DatePatterns/1=d MMMM y\u202f'\u0440'.
-FormatData/uk/DatePatterns/2=d MMM y\u202f'\u0440'.
+FormatData/uk/DatePatterns/0=EEEE, d MMMM y 'р'.
+FormatData/uk/DatePatterns/1=d MMMM y 'р'.
+FormatData/uk/DatePatterns/2=d MMM y 'р'.
 FormatData/uk/DatePatterns/3=dd.MM.yy
 
 # bug #4103218
-# FormatData/ko_KR/NumberPatterns/1=\u20a9#,##0;-\u20a9#,##0 # Changed; see bug 4122840
+# FormatData/ko_KR/NumberPatterns/1=₩#,##0;-₩#,##0 # Changed; see bug 4122840
 
 # bug #4103220 should be adequately tested by the above tests, which represent a pretty
 # good cross-section of the locale data
@@ -721,1481 +721,1481 @@ FormatData/fr_CA/TimePatterns/0=HH 'h' mm 'min' ss 's' zzzz
 FormatData/fr_CA/TimePatterns/1=HH 'h' mm 'min' ss 's' z
 
 # bug #4113638, 4290801
-CurrencyNames/ar_AE/AED=\u062f.\u0625.\u200f
+CurrencyNames/ar_AE/AED=د.إ.‏
 FormatData/ar_AE/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_AE/NumberPatterns/1='\u062f.\u0625.\u200f' #,##0.###;'\u062f.\u0625.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_AE/NumberPatterns/1='د.إ.‏' #,##0.###;'د.إ.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_AE/arab.NumberPatterns/2=#,##0%
-FormatData/ar_AE/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_AE/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_AE/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_AE/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_AE/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_AE/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_AE/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_AE/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_AE/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_AE/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_AE/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_AE/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_AE/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_AE/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_AE/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_AE/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_AE/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_AE/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_AE/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_AE/DayNames/0=الأحد
+FormatData/ar_AE/DayNames/1=الاثنين
+FormatData/ar_AE/DayNames/2=الثلاثاء
+FormatData/ar_AE/DayNames/3=الأربعاء
+FormatData/ar_AE/DayNames/4=الخميس
+FormatData/ar_AE/DayNames/5=الجمعة
+FormatData/ar_AE/DayNames/6=السبت
+FormatData/ar_AE/MonthAbbreviations/0=يناير
+FormatData/ar_AE/MonthAbbreviations/1=فبراير
+FormatData/ar_AE/MonthAbbreviations/2=مارس
+FormatData/ar_AE/MonthAbbreviations/3=أبريل
+FormatData/ar_AE/MonthAbbreviations/4=مايو
+FormatData/ar_AE/MonthAbbreviations/5=يونيو
+FormatData/ar_AE/MonthAbbreviations/6=يوليو
+FormatData/ar_AE/MonthAbbreviations/7=أغسطس
+FormatData/ar_AE/MonthAbbreviations/8=سبتمبر
+FormatData/ar_AE/MonthAbbreviations/9=أكتوبر
+FormatData/ar_AE/MonthAbbreviations/10=نوفمبر
+FormatData/ar_AE/MonthAbbreviations/11=ديسمبر
 FormatData/ar_AE/MonthAbbreviations/12=
-FormatData/ar_AE/Eras/0=\u0642.\u0645
-FormatData/ar_AE/Eras/1=\u0645
-FormatData/ar_AE/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_AE/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_AE/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_AE/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_AE/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_AE/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_AE/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_AE/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_AE/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_AE/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_AE/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_AE/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_AE/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_AE/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_AE/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_AE/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_AE/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_AE/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_AE/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_AE/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_AE/Eras/0=ق.م
+FormatData/ar_AE/Eras/1=م
+FormatData/ar_AE/DayAbbreviations/0=الأحد
+FormatData/ar_AE/DayAbbreviations/1=الاثنين
+FormatData/ar_AE/DayAbbreviations/2=الثلاثاء
+FormatData/ar_AE/DayAbbreviations/3=الأربعاء
+FormatData/ar_AE/DayAbbreviations/4=الخميس
+FormatData/ar_AE/DayAbbreviations/5=الجمعة
+FormatData/ar_AE/DayAbbreviations/6=السبت
+LocaleNames/ar_AE/ar=العربية
+FormatData/ar_AE/MonthNames/0=يناير
+FormatData/ar_AE/MonthNames/1=فبراير
+FormatData/ar_AE/MonthNames/2=مارس
+FormatData/ar_AE/MonthNames/3=أبريل
+FormatData/ar_AE/MonthNames/4=مايو
+FormatData/ar_AE/MonthNames/5=يونيو
+FormatData/ar_AE/MonthNames/6=يوليو
+FormatData/ar_AE/MonthNames/7=أغسطس
+FormatData/ar_AE/MonthNames/8=سبتمبر
+FormatData/ar_AE/MonthNames/9=أكتوبر
+FormatData/ar_AE/MonthNames/10=نوفمبر
+FormatData/ar_AE/MonthNames/11=ديسمبر
 FormatData/ar_AE/MonthNames/12=
-FormatData/ar_AE/AmPmMarkers/0=\u0635
-FormatData/ar_AE/AmPmMarkers/1=\u0645
+FormatData/ar_AE/AmPmMarkers/0=ص
+FormatData/ar_AE/AmPmMarkers/1=م
 FormatData/ar_AE/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_AE/TimePatterns/1=h:mm:ss a z
 FormatData/ar_AE/TimePatterns/2=h:mm:ss a
 FormatData/ar_AE/TimePatterns/3=h:mm a
-FormatData/ar_AE/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_AE/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_AE/DatePatterns/1=d MMMM y
-FormatData/ar_AE/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_AE/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_AE/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_AE/EG=\u0645\u0635\u0631
-LocaleNames/ar_AE/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_AE/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_AE/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_AE/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_AE/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_AE/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_AE/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_AE/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_AE/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_AE/QA=\u0642\u0637\u0631
-LocaleNames/ar_AE/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_AE/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_AE/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_AE/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_AE/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_AE/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_AE/arab.NumberElements/0=\u066b
-FormatData/ar_AE/arab.NumberElements/1=\u066c
-FormatData/ar_AE/arab.NumberElements/2=\u061b
-FormatData/ar_AE/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_AE/arab.NumberElements/4=\u0660
+FormatData/ar_AE/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_AE/DatePatterns/3=d‏/M‏/y
+FormatData/ar_AE/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_AE/EG=مصر
+LocaleNames/ar_AE/DZ=الجزائر
+LocaleNames/ar_AE/BH=البحرين
+LocaleNames/ar_AE/IQ=العراق
+LocaleNames/ar_AE/JO=الأردن
+LocaleNames/ar_AE/KW=الكويت
+LocaleNames/ar_AE/LB=لبنان
+LocaleNames/ar_AE/LY=ليبيا
+LocaleNames/ar_AE/MA=المغرب
+LocaleNames/ar_AE/OM=عُمان
+LocaleNames/ar_AE/QA=قطر
+LocaleNames/ar_AE/SA=المملكة العربية السعودية
+LocaleNames/ar_AE/SD=السودان
+LocaleNames/ar_AE/SY=سوريا
+LocaleNames/ar_AE/TN=تونس
+LocaleNames/ar_AE/AE=الإمارات العربية المتحدة
+LocaleNames/ar_AE/YE=اليمن
+FormatData/ar_AE/arab.NumberElements/0=٫
+FormatData/ar_AE/arab.NumberElements/1=٬
+FormatData/ar_AE/arab.NumberElements/2=؛
+FormatData/ar_AE/arab.NumberElements/3=٪؜
+FormatData/ar_AE/arab.NumberElements/4=٠
 FormatData/ar_AE/arab.NumberElements/5=#
-FormatData/ar_AE/arab.NumberElements/6=\u061c-
-FormatData/ar_AE/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_AE/arab.NumberElements/8=\u0609
-FormatData/ar_AE/arab.NumberElements/9=\u221e
-FormatData/ar_AE/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_BH/BHD=\u062f.\u0628.\u200f
+FormatData/ar_AE/arab.NumberElements/6=؜-
+FormatData/ar_AE/arab.NumberElements/7=أس
+FormatData/ar_AE/arab.NumberElements/8=؉
+FormatData/ar_AE/arab.NumberElements/9=∞
+FormatData/ar_AE/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_BH/BHD=د.ب.‏
 FormatData/ar_BH/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_BH/NumberPatterns/1='\u062f.\u0628.\u200f' #,##0.###;'\u062f.\u0628.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_BH/NumberPatterns/1='د.ب.‏' #,##0.###;'د.ب.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_BH/arab.NumberPatterns/2=#,##0%
-FormatData/ar_BH/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_BH/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_BH/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_BH/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_BH/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_BH/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_BH/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_BH/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_BH/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_BH/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_BH/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_BH/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_BH/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_BH/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_BH/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_BH/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_BH/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_BH/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_BH/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_BH/DayNames/0=الأحد
+FormatData/ar_BH/DayNames/1=الاثنين
+FormatData/ar_BH/DayNames/2=الثلاثاء
+FormatData/ar_BH/DayNames/3=الأربعاء
+FormatData/ar_BH/DayNames/4=الخميس
+FormatData/ar_BH/DayNames/5=الجمعة
+FormatData/ar_BH/DayNames/6=السبت
+FormatData/ar_BH/MonthAbbreviations/0=يناير
+FormatData/ar_BH/MonthAbbreviations/1=فبراير
+FormatData/ar_BH/MonthAbbreviations/2=مارس
+FormatData/ar_BH/MonthAbbreviations/3=أبريل
+FormatData/ar_BH/MonthAbbreviations/4=مايو
+FormatData/ar_BH/MonthAbbreviations/5=يونيو
+FormatData/ar_BH/MonthAbbreviations/6=يوليو
+FormatData/ar_BH/MonthAbbreviations/7=أغسطس
+FormatData/ar_BH/MonthAbbreviations/8=سبتمبر
+FormatData/ar_BH/MonthAbbreviations/9=أكتوبر
+FormatData/ar_BH/MonthAbbreviations/10=نوفمبر
+FormatData/ar_BH/MonthAbbreviations/11=ديسمبر
 FormatData/ar_BH/MonthAbbreviations/12=
-FormatData/ar_BH/Eras/0=\u0642.\u0645
-FormatData/ar_BH/Eras/1=\u0645
-FormatData/ar_BH/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_BH/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_BH/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_BH/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_BH/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_BH/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_BH/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_BH/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_BH/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_BH/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_BH/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_BH/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_BH/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_BH/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_BH/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_BH/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_BH/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_BH/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_BH/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_BH/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_BH/Eras/0=ق.م
+FormatData/ar_BH/Eras/1=م
+FormatData/ar_BH/DayAbbreviations/0=الأحد
+FormatData/ar_BH/DayAbbreviations/1=الاثنين
+FormatData/ar_BH/DayAbbreviations/2=الثلاثاء
+FormatData/ar_BH/DayAbbreviations/3=الأربعاء
+FormatData/ar_BH/DayAbbreviations/4=الخميس
+FormatData/ar_BH/DayAbbreviations/5=الجمعة
+FormatData/ar_BH/DayAbbreviations/6=السبت
+LocaleNames/ar_BH/ar=العربية
+FormatData/ar_BH/MonthNames/0=يناير
+FormatData/ar_BH/MonthNames/1=فبراير
+FormatData/ar_BH/MonthNames/2=مارس
+FormatData/ar_BH/MonthNames/3=أبريل
+FormatData/ar_BH/MonthNames/4=مايو
+FormatData/ar_BH/MonthNames/5=يونيو
+FormatData/ar_BH/MonthNames/6=يوليو
+FormatData/ar_BH/MonthNames/7=أغسطس
+FormatData/ar_BH/MonthNames/8=سبتمبر
+FormatData/ar_BH/MonthNames/9=أكتوبر
+FormatData/ar_BH/MonthNames/10=نوفمبر
+FormatData/ar_BH/MonthNames/11=ديسمبر
 FormatData/ar_BH/MonthNames/12=
-FormatData/ar_BH/AmPmMarkers/0=\u0635
-FormatData/ar_BH/AmPmMarkers/1=\u0645
+FormatData/ar_BH/AmPmMarkers/0=ص
+FormatData/ar_BH/AmPmMarkers/1=م
 FormatData/ar_BH/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_BH/TimePatterns/1=h:mm:ss a z
 FormatData/ar_BH/TimePatterns/2=h:mm:ss a
 FormatData/ar_BH/TimePatterns/3=h:mm a
-FormatData/ar_BH/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_BH/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_BH/DatePatterns/1=d MMMM y
-FormatData/ar_BH/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_BH/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_BH/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_BH/EG=\u0645\u0635\u0631
-LocaleNames/ar_BH/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_BH/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_BH/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_BH/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_BH/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_BH/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_BH/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_BH/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_BH/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_BH/QA=\u0642\u0637\u0631
-LocaleNames/ar_BH/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_BH/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_BH/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_BH/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_BH/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_BH/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_BH/arab.NumberElements/0=\u066b
-FormatData/ar_BH/arab.NumberElements/1=\u066c
-FormatData/ar_BH/arab.NumberElements/2=\u061b
-FormatData/ar_BH/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_BH/arab.NumberElements/4=\u0660
+FormatData/ar_BH/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_BH/DatePatterns/3=d‏/M‏/y
+FormatData/ar_BH/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_BH/EG=مصر
+LocaleNames/ar_BH/DZ=الجزائر
+LocaleNames/ar_BH/BH=البحرين
+LocaleNames/ar_BH/IQ=العراق
+LocaleNames/ar_BH/JO=الأردن
+LocaleNames/ar_BH/KW=الكويت
+LocaleNames/ar_BH/LB=لبنان
+LocaleNames/ar_BH/LY=ليبيا
+LocaleNames/ar_BH/MA=المغرب
+LocaleNames/ar_BH/OM=عُمان
+LocaleNames/ar_BH/QA=قطر
+LocaleNames/ar_BH/SA=المملكة العربية السعودية
+LocaleNames/ar_BH/SD=السودان
+LocaleNames/ar_BH/SY=سوريا
+LocaleNames/ar_BH/TN=تونس
+LocaleNames/ar_BH/AE=الإمارات العربية المتحدة
+LocaleNames/ar_BH/YE=اليمن
+FormatData/ar_BH/arab.NumberElements/0=٫
+FormatData/ar_BH/arab.NumberElements/1=٬
+FormatData/ar_BH/arab.NumberElements/2=؛
+FormatData/ar_BH/arab.NumberElements/3=٪؜
+FormatData/ar_BH/arab.NumberElements/4=٠
 FormatData/ar_BH/arab.NumberElements/5=#
-FormatData/ar_BH/arab.NumberElements/6=\u061c-
-FormatData/ar_BH/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_BH/arab.NumberElements/8=\u0609
-FormatData/ar_BH/arab.NumberElements/9=\u221e
-FormatData/ar_BH/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_DZ/DZD=\u062f.\u062c.\u200f
+FormatData/ar_BH/arab.NumberElements/6=؜-
+FormatData/ar_BH/arab.NumberElements/7=أس
+FormatData/ar_BH/arab.NumberElements/8=؉
+FormatData/ar_BH/arab.NumberElements/9=∞
+FormatData/ar_BH/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_DZ/DZD=د.ج.‏
 FormatData/ar_DZ/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_DZ/NumberPatterns/1='\u062f.\u062c.\u200f' #,##0.###;'\u062f.\u062c.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_DZ/NumberPatterns/1='د.ج.‏' #,##0.###;'د.ج.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_DZ/arab.NumberPatterns/2=#,##0%
-FormatData/ar_DZ/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_DZ/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_DZ/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_DZ/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_DZ/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_DZ/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_DZ/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_DZ/MonthAbbreviations/0=\u062c\u0627\u0646\u0641\u064a
-FormatData/ar_DZ/MonthAbbreviations/1=\u0641\u064a\u0641\u0631\u064a
-FormatData/ar_DZ/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_DZ/MonthAbbreviations/3=\u0623\u0641\u0631\u064a\u0644
-FormatData/ar_DZ/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_DZ/MonthAbbreviations/5=\u062c\u0648\u0627\u0646
-FormatData/ar_DZ/MonthAbbreviations/6=\u062c\u0648\u064a\u0644\u064a\u0629
-FormatData/ar_DZ/MonthAbbreviations/7=\u0623\u0648\u062a
-FormatData/ar_DZ/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_DZ/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_DZ/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_DZ/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_DZ/DayNames/0=الأحد
+FormatData/ar_DZ/DayNames/1=الاثنين
+FormatData/ar_DZ/DayNames/2=الثلاثاء
+FormatData/ar_DZ/DayNames/3=الأربعاء
+FormatData/ar_DZ/DayNames/4=الخميس
+FormatData/ar_DZ/DayNames/5=الجمعة
+FormatData/ar_DZ/DayNames/6=السبت
+FormatData/ar_DZ/MonthAbbreviations/0=جانفي
+FormatData/ar_DZ/MonthAbbreviations/1=فيفري
+FormatData/ar_DZ/MonthAbbreviations/2=مارس
+FormatData/ar_DZ/MonthAbbreviations/3=أفريل
+FormatData/ar_DZ/MonthAbbreviations/4=ماي
+FormatData/ar_DZ/MonthAbbreviations/5=جوان
+FormatData/ar_DZ/MonthAbbreviations/6=جويلية
+FormatData/ar_DZ/MonthAbbreviations/7=أوت
+FormatData/ar_DZ/MonthAbbreviations/8=سبتمبر
+FormatData/ar_DZ/MonthAbbreviations/9=أكتوبر
+FormatData/ar_DZ/MonthAbbreviations/10=نوفمبر
+FormatData/ar_DZ/MonthAbbreviations/11=ديسمبر
 FormatData/ar_DZ/MonthAbbreviations/12=
-FormatData/ar_DZ/Eras/0=\u0642.\u0645
-FormatData/ar_DZ/Eras/1=\u0645
-FormatData/ar_DZ/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_DZ/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_DZ/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_DZ/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_DZ/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_DZ/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_DZ/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_DZ/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_DZ/MonthNames/0=\u062c\u0627\u0646\u0641\u064a
-FormatData/ar_DZ/MonthNames/1=\u0641\u064a\u0641\u0631\u064a
-FormatData/ar_DZ/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_DZ/MonthNames/3=\u0623\u0641\u0631\u064a\u0644
-FormatData/ar_DZ/MonthNames/4=\u0645\u0627\u064a
-FormatData/ar_DZ/MonthNames/5=\u062c\u0648\u0627\u0646
-FormatData/ar_DZ/MonthNames/6=\u062c\u0648\u064a\u0644\u064a\u0629
-FormatData/ar_DZ/MonthNames/7=\u0623\u0648\u062a
-FormatData/ar_DZ/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_DZ/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_DZ/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_DZ/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_DZ/Eras/0=ق.م
+FormatData/ar_DZ/Eras/1=م
+FormatData/ar_DZ/DayAbbreviations/0=الأحد
+FormatData/ar_DZ/DayAbbreviations/1=الاثنين
+FormatData/ar_DZ/DayAbbreviations/2=الثلاثاء
+FormatData/ar_DZ/DayAbbreviations/3=الأربعاء
+FormatData/ar_DZ/DayAbbreviations/4=الخميس
+FormatData/ar_DZ/DayAbbreviations/5=الجمعة
+FormatData/ar_DZ/DayAbbreviations/6=السبت
+LocaleNames/ar_DZ/ar=العربية
+FormatData/ar_DZ/MonthNames/0=جانفي
+FormatData/ar_DZ/MonthNames/1=فيفري
+FormatData/ar_DZ/MonthNames/2=مارس
+FormatData/ar_DZ/MonthNames/3=أفريل
+FormatData/ar_DZ/MonthNames/4=ماي
+FormatData/ar_DZ/MonthNames/5=جوان
+FormatData/ar_DZ/MonthNames/6=جويلية
+FormatData/ar_DZ/MonthNames/7=أوت
+FormatData/ar_DZ/MonthNames/8=سبتمبر
+FormatData/ar_DZ/MonthNames/9=أكتوبر
+FormatData/ar_DZ/MonthNames/10=نوفمبر
+FormatData/ar_DZ/MonthNames/11=ديسمبر
 FormatData/ar_DZ/MonthNames/12=
-FormatData/ar_DZ/AmPmMarkers/0=\u0635
-FormatData/ar_DZ/AmPmMarkers/1=\u0645
+FormatData/ar_DZ/AmPmMarkers/0=ص
+FormatData/ar_DZ/AmPmMarkers/1=م
 FormatData/ar_DZ/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_DZ/TimePatterns/1=h:mm:ss a z
 FormatData/ar_DZ/TimePatterns/2=h:mm:ss a
 FormatData/ar_DZ/TimePatterns/3=h:mm a
-FormatData/ar_DZ/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_DZ/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_DZ/DatePatterns/1=d MMMM y
-FormatData/ar_DZ/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_DZ/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_DZ/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_DZ/EG=\u0645\u0635\u0631
-LocaleNames/ar_DZ/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_DZ/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_DZ/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_DZ/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_DZ/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_DZ/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_DZ/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_DZ/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_DZ/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_DZ/QA=\u0642\u0637\u0631
-LocaleNames/ar_DZ/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_DZ/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_DZ/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_DZ/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_DZ/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_DZ/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_DZ/arab.NumberElements/0=\u066b
-FormatData/ar_DZ/arab.NumberElements/1=\u066c
-FormatData/ar_DZ/arab.NumberElements/2=\u061b
-FormatData/ar_DZ/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_DZ/arab.NumberElements/4=\u0660
+FormatData/ar_DZ/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_DZ/DatePatterns/3=d‏/M‏/y
+FormatData/ar_DZ/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_DZ/EG=مصر
+LocaleNames/ar_DZ/DZ=الجزائر
+LocaleNames/ar_DZ/BH=البحرين
+LocaleNames/ar_DZ/IQ=العراق
+LocaleNames/ar_DZ/JO=الأردن
+LocaleNames/ar_DZ/KW=الكويت
+LocaleNames/ar_DZ/LB=لبنان
+LocaleNames/ar_DZ/LY=ليبيا
+LocaleNames/ar_DZ/MA=المغرب
+LocaleNames/ar_DZ/OM=عُمان
+LocaleNames/ar_DZ/QA=قطر
+LocaleNames/ar_DZ/SA=المملكة العربية السعودية
+LocaleNames/ar_DZ/SD=السودان
+LocaleNames/ar_DZ/SY=سوريا
+LocaleNames/ar_DZ/TN=تونس
+LocaleNames/ar_DZ/AE=الإمارات العربية المتحدة
+LocaleNames/ar_DZ/YE=اليمن
+FormatData/ar_DZ/arab.NumberElements/0=٫
+FormatData/ar_DZ/arab.NumberElements/1=٬
+FormatData/ar_DZ/arab.NumberElements/2=؛
+FormatData/ar_DZ/arab.NumberElements/3=٪؜
+FormatData/ar_DZ/arab.NumberElements/4=٠
 FormatData/ar_DZ/arab.NumberElements/5=#
-FormatData/ar_DZ/arab.NumberElements/6=\u061c-
-FormatData/ar_DZ/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_DZ/arab.NumberElements/8=\u0609
-FormatData/ar_DZ/arab.NumberElements/9=\u221e
-FormatData/ar_DZ/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_EG/EGP=\u062c.\u0645.\u200f
+FormatData/ar_DZ/arab.NumberElements/6=؜-
+FormatData/ar_DZ/arab.NumberElements/7=أس
+FormatData/ar_DZ/arab.NumberElements/8=؉
+FormatData/ar_DZ/arab.NumberElements/9=∞
+FormatData/ar_DZ/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_EG/EGP=ج.م.‏
 FormatData/ar_EG/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_EG/NumberPatterns/1='\u062c.\u0645.\u200f' #,##0.###;'\u062c.\u0645.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_EG/NumberPatterns/1='ج.م.‏' #,##0.###;'ج.م.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_EG/arab.NumberPatterns/2=#,##0%
-FormatData/ar_EG/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_EG/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_EG/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_EG/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_EG/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_EG/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_EG/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_EG/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_EG/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_EG/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_EG/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_EG/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_EG/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_EG/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_EG/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_EG/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_EG/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_EG/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_EG/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_EG/DayNames/0=الأحد
+FormatData/ar_EG/DayNames/1=الاثنين
+FormatData/ar_EG/DayNames/2=الثلاثاء
+FormatData/ar_EG/DayNames/3=الأربعاء
+FormatData/ar_EG/DayNames/4=الخميس
+FormatData/ar_EG/DayNames/5=الجمعة
+FormatData/ar_EG/DayNames/6=السبت
+FormatData/ar_EG/MonthAbbreviations/0=يناير
+FormatData/ar_EG/MonthAbbreviations/1=فبراير
+FormatData/ar_EG/MonthAbbreviations/2=مارس
+FormatData/ar_EG/MonthAbbreviations/3=أبريل
+FormatData/ar_EG/MonthAbbreviations/4=مايو
+FormatData/ar_EG/MonthAbbreviations/5=يونيو
+FormatData/ar_EG/MonthAbbreviations/6=يوليو
+FormatData/ar_EG/MonthAbbreviations/7=أغسطس
+FormatData/ar_EG/MonthAbbreviations/8=سبتمبر
+FormatData/ar_EG/MonthAbbreviations/9=أكتوبر
+FormatData/ar_EG/MonthAbbreviations/10=نوفمبر
+FormatData/ar_EG/MonthAbbreviations/11=ديسمبر
 FormatData/ar_EG/MonthAbbreviations/12=
-FormatData/ar_EG/Eras/0=\u0642.\u0645
-FormatData/ar_EG/Eras/1=\u0645
-FormatData/ar_EG/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_EG/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_EG/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_EG/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_EG/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_EG/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_EG/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_EG/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_EG/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_EG/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_EG/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_EG/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_EG/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_EG/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_EG/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_EG/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_EG/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_EG/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_EG/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_EG/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_EG/Eras/0=ق.م
+FormatData/ar_EG/Eras/1=م
+FormatData/ar_EG/DayAbbreviations/0=الأحد
+FormatData/ar_EG/DayAbbreviations/1=الاثنين
+FormatData/ar_EG/DayAbbreviations/2=الثلاثاء
+FormatData/ar_EG/DayAbbreviations/3=الأربعاء
+FormatData/ar_EG/DayAbbreviations/4=الخميس
+FormatData/ar_EG/DayAbbreviations/5=الجمعة
+FormatData/ar_EG/DayAbbreviations/6=السبت
+LocaleNames/ar_EG/ar=العربية
+FormatData/ar_EG/MonthNames/0=يناير
+FormatData/ar_EG/MonthNames/1=فبراير
+FormatData/ar_EG/MonthNames/2=مارس
+FormatData/ar_EG/MonthNames/3=أبريل
+FormatData/ar_EG/MonthNames/4=مايو
+FormatData/ar_EG/MonthNames/5=يونيو
+FormatData/ar_EG/MonthNames/6=يوليو
+FormatData/ar_EG/MonthNames/7=أغسطس
+FormatData/ar_EG/MonthNames/8=سبتمبر
+FormatData/ar_EG/MonthNames/9=أكتوبر
+FormatData/ar_EG/MonthNames/10=نوفمبر
+FormatData/ar_EG/MonthNames/11=ديسمبر
 FormatData/ar_EG/MonthNames/12=
-FormatData/ar_EG/AmPmMarkers/0=\u0635
-FormatData/ar_EG/AmPmMarkers/1=\u0645
+FormatData/ar_EG/AmPmMarkers/0=ص
+FormatData/ar_EG/AmPmMarkers/1=م
 FormatData/ar_EG/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_EG/TimePatterns/1=h:mm:ss a z
 FormatData/ar_EG/TimePatterns/2=h:mm:ss a
 FormatData/ar_EG/TimePatterns/3=h:mm a
-FormatData/ar_EG/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_EG/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_EG/DatePatterns/1=d MMMM y
-FormatData/ar_EG/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_EG/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_EG/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_EG/EG=\u0645\u0635\u0631
-LocaleNames/ar_EG/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_EG/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_EG/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_EG/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_EG/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_EG/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_EG/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_EG/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_EG/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_EG/QA=\u0642\u0637\u0631
-LocaleNames/ar_EG/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_EG/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_EG/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_EG/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_EG/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_EG/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_EG/arab.NumberElements/0=\u066b
-FormatData/ar_EG/arab.NumberElements/1=\u066c
-FormatData/ar_EG/arab.NumberElements/2=\u061b
-FormatData/ar_EG/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_EG/arab.NumberElements/4=\u0660
+FormatData/ar_EG/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_EG/DatePatterns/3=d‏/M‏/y
+FormatData/ar_EG/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_EG/EG=مصر
+LocaleNames/ar_EG/DZ=الجزائر
+LocaleNames/ar_EG/BH=البحرين
+LocaleNames/ar_EG/IQ=العراق
+LocaleNames/ar_EG/JO=الأردن
+LocaleNames/ar_EG/KW=الكويت
+LocaleNames/ar_EG/LB=لبنان
+LocaleNames/ar_EG/LY=ليبيا
+LocaleNames/ar_EG/MA=المغرب
+LocaleNames/ar_EG/OM=عُمان
+LocaleNames/ar_EG/QA=قطر
+LocaleNames/ar_EG/SA=المملكة العربية السعودية
+LocaleNames/ar_EG/SD=السودان
+LocaleNames/ar_EG/SY=سوريا
+LocaleNames/ar_EG/TN=تونس
+LocaleNames/ar_EG/AE=الإمارات العربية المتحدة
+LocaleNames/ar_EG/YE=اليمن
+FormatData/ar_EG/arab.NumberElements/0=٫
+FormatData/ar_EG/arab.NumberElements/1=٬
+FormatData/ar_EG/arab.NumberElements/2=؛
+FormatData/ar_EG/arab.NumberElements/3=٪؜
+FormatData/ar_EG/arab.NumberElements/4=٠
 FormatData/ar_EG/arab.NumberElements/5=#
-FormatData/ar_EG/arab.NumberElements/6=\u061c-
-FormatData/ar_EG/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_EG/arab.NumberElements/8=\u0609
-FormatData/ar_EG/arab.NumberElements/9=\u221e
-FormatData/ar_EG/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_IQ/IQD=\u062f.\u0639.\u200f
+FormatData/ar_EG/arab.NumberElements/6=؜-
+FormatData/ar_EG/arab.NumberElements/7=أس
+FormatData/ar_EG/arab.NumberElements/8=؉
+FormatData/ar_EG/arab.NumberElements/9=∞
+FormatData/ar_EG/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_IQ/IQD=د.ع.‏
 FormatData/ar_IQ/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_IQ/NumberPatterns/1='\u062f.\u0639.\u200f' #,##0.###;'\u062f.\u0639.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_IQ/NumberPatterns/1='د.ع.‏' #,##0.###;'د.ع.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_IQ/arab.NumberPatterns/2=#,##0%
-FormatData/ar_IQ/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_IQ/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_IQ/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_IQ/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_IQ/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_IQ/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_IQ/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_IQ/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_IQ/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_IQ/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_IQ/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_IQ/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_IQ/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_IQ/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_IQ/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_IQ/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_IQ/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646\u00a0\u0627\u0644\u0623\u0648\u0644
-FormatData/ar_IQ/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_IQ/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar_IQ/DayNames/0=الأحد
+FormatData/ar_IQ/DayNames/1=الاثنين
+FormatData/ar_IQ/DayNames/2=الثلاثاء
+FormatData/ar_IQ/DayNames/3=الأربعاء
+FormatData/ar_IQ/DayNames/4=الخميس
+FormatData/ar_IQ/DayNames/5=الجمعة
+FormatData/ar_IQ/DayNames/6=السبت
+FormatData/ar_IQ/MonthAbbreviations/0=كانون الثاني
+FormatData/ar_IQ/MonthAbbreviations/1=شباط
+FormatData/ar_IQ/MonthAbbreviations/2=آذار
+FormatData/ar_IQ/MonthAbbreviations/3=نيسان
+FormatData/ar_IQ/MonthAbbreviations/4=أيار
+FormatData/ar_IQ/MonthAbbreviations/5=حزيران
+FormatData/ar_IQ/MonthAbbreviations/6=تموز
+FormatData/ar_IQ/MonthAbbreviations/7=آب
+FormatData/ar_IQ/MonthAbbreviations/8=أيلول
+FormatData/ar_IQ/MonthAbbreviations/9=تشرين الأول
+FormatData/ar_IQ/MonthAbbreviations/10=تشرين الثاني
+FormatData/ar_IQ/MonthAbbreviations/11=كانون الأول
 FormatData/ar_IQ/MonthAbbreviations/12=
-FormatData/ar_IQ/Eras/0=\u0642.\u0645
-FormatData/ar_IQ/Eras/1=\u0645
-FormatData/ar_IQ/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_IQ/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_IQ/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_IQ/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_IQ/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_IQ/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_IQ/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_IQ/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_IQ/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_IQ/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_IQ/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_IQ/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_IQ/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_IQ/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_IQ/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_IQ/MonthNames/7=\u0622\u0628
-FormatData/ar_IQ/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_IQ/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_IQ/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_IQ/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar_IQ/Eras/0=ق.م
+FormatData/ar_IQ/Eras/1=م
+FormatData/ar_IQ/DayAbbreviations/0=الأحد
+FormatData/ar_IQ/DayAbbreviations/1=الاثنين
+FormatData/ar_IQ/DayAbbreviations/2=الثلاثاء
+FormatData/ar_IQ/DayAbbreviations/3=الأربعاء
+FormatData/ar_IQ/DayAbbreviations/4=الخميس
+FormatData/ar_IQ/DayAbbreviations/5=الجمعة
+FormatData/ar_IQ/DayAbbreviations/6=السبت
+LocaleNames/ar_IQ/ar=العربية
+FormatData/ar_IQ/MonthNames/0=كانون الثاني
+FormatData/ar_IQ/MonthNames/1=شباط
+FormatData/ar_IQ/MonthNames/2=آذار
+FormatData/ar_IQ/MonthNames/3=نيسان
+FormatData/ar_IQ/MonthNames/4=أيار
+FormatData/ar_IQ/MonthNames/5=حزيران
+FormatData/ar_IQ/MonthNames/6=تموز
+FormatData/ar_IQ/MonthNames/7=آب
+FormatData/ar_IQ/MonthNames/8=أيلول
+FormatData/ar_IQ/MonthNames/9=تشرين الأول
+FormatData/ar_IQ/MonthNames/10=تشرين الثاني
+FormatData/ar_IQ/MonthNames/11=كانون الأول
 FormatData/ar_IQ/MonthNames/12=
-FormatData/ar_IQ/AmPmMarkers/0=\u0635
-FormatData/ar_IQ/AmPmMarkers/1=\u0645
+FormatData/ar_IQ/AmPmMarkers/0=ص
+FormatData/ar_IQ/AmPmMarkers/1=م
 FormatData/ar_IQ/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_IQ/TimePatterns/1=h:mm:ss a z
 FormatData/ar_IQ/TimePatterns/2=h:mm:ss a
 FormatData/ar_IQ/TimePatterns/3=h:mm a
-FormatData/ar_IQ/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_IQ/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_IQ/DatePatterns/1=d MMMM y
-FormatData/ar_IQ/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_IQ/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_IQ/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_IQ/EG=\u0645\u0635\u0631
-LocaleNames/ar_IQ/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_IQ/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_IQ/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_IQ/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_IQ/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_IQ/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_IQ/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_IQ/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_IQ/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_IQ/QA=\u0642\u0637\u0631
-LocaleNames/ar_IQ/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_IQ/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_IQ/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_IQ/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_IQ/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_IQ/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_IQ/arab.NumberElements/0=\u066b
-FormatData/ar_IQ/arab.NumberElements/1=\u066c
-FormatData/ar_IQ/arab.NumberElements/2=\u061b
-FormatData/ar_IQ/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_IQ/arab.NumberElements/4=\u0660
+FormatData/ar_IQ/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_IQ/DatePatterns/3=d‏/M‏/y
+FormatData/ar_IQ/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_IQ/EG=مصر
+LocaleNames/ar_IQ/DZ=الجزائر
+LocaleNames/ar_IQ/BH=البحرين
+LocaleNames/ar_IQ/IQ=العراق
+LocaleNames/ar_IQ/JO=الأردن
+LocaleNames/ar_IQ/KW=الكويت
+LocaleNames/ar_IQ/LB=لبنان
+LocaleNames/ar_IQ/LY=ليبيا
+LocaleNames/ar_IQ/MA=المغرب
+LocaleNames/ar_IQ/OM=عُمان
+LocaleNames/ar_IQ/QA=قطر
+LocaleNames/ar_IQ/SA=المملكة العربية السعودية
+LocaleNames/ar_IQ/SD=السودان
+LocaleNames/ar_IQ/SY=سوريا
+LocaleNames/ar_IQ/TN=تونس
+LocaleNames/ar_IQ/AE=الإمارات العربية المتحدة
+LocaleNames/ar_IQ/YE=اليمن
+FormatData/ar_IQ/arab.NumberElements/0=٫
+FormatData/ar_IQ/arab.NumberElements/1=٬
+FormatData/ar_IQ/arab.NumberElements/2=؛
+FormatData/ar_IQ/arab.NumberElements/3=٪؜
+FormatData/ar_IQ/arab.NumberElements/4=٠
 FormatData/ar_IQ/arab.NumberElements/5=#
-FormatData/ar_IQ/arab.NumberElements/6=\u061c-
-FormatData/ar_IQ/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_IQ/arab.NumberElements/8=\u0609
-FormatData/ar_IQ/arab.NumberElements/9=\u221e
-FormatData/ar_IQ/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
+FormatData/ar_IQ/arab.NumberElements/6=؜-
+FormatData/ar_IQ/arab.NumberElements/7=أس
+FormatData/ar_IQ/arab.NumberElements/8=؉
+FormatData/ar_IQ/arab.NumberElements/9=∞
+FormatData/ar_IQ/arab.NumberElements/10=ليس رقمًا
 FormatData/ar_JO/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_JO/NumberPatterns/1='\u062f.\u0623.\u200f' #,##0.###;'\u062f.\u0623.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_JO/NumberPatterns/1='د.أ.‏' #,##0.###;'د.أ.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_JO/arab.NumberPatterns/2=#,##0%
-CurrencyNames/ar_JO/JOD=\u062f.\u0623.\u200f
-FormatData/ar_JO/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_JO/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_JO/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_JO/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_JO/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_JO/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_JO/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_JO/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_JO/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_JO/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_JO/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_JO/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_JO/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_JO/MonthNames/7=\u0622\u0628
-FormatData/ar_JO/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_JO/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+CurrencyNames/ar_JO/JOD=د.أ.‏
+FormatData/ar_JO/DayAbbreviations/0=الأحد
+FormatData/ar_JO/DayAbbreviations/1=الاثنين
+FormatData/ar_JO/DayAbbreviations/2=الثلاثاء
+FormatData/ar_JO/DayAbbreviations/3=الأربعاء
+FormatData/ar_JO/DayAbbreviations/4=الخميس
+FormatData/ar_JO/DayAbbreviations/5=الجمعة
+FormatData/ar_JO/DayAbbreviations/6=السبت
+FormatData/ar_JO/MonthNames/0=كانون الثاني
+FormatData/ar_JO/MonthNames/1=شباط
+FormatData/ar_JO/MonthNames/2=آذار
+FormatData/ar_JO/MonthNames/3=نيسان
+FormatData/ar_JO/MonthNames/4=أيار
+FormatData/ar_JO/MonthNames/5=حزيران
+FormatData/ar_JO/MonthNames/6=تموز
+FormatData/ar_JO/MonthNames/7=آب
+FormatData/ar_JO/MonthNames/8=أيلول
+FormatData/ar_JO/MonthNames/9=تشرين الأول
+FormatData/ar_JO/MonthNames/10=تشرين الثاني
+FormatData/ar_JO/MonthNames/11=كانون الأول
 FormatData/ar_JO/MonthNames/12=
-FormatData/ar_JO/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_JO/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_JO/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_JO/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_JO/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_JO/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_JO/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_JO/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_JO/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_JO/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_JO/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar_JO/MonthAbbreviations/0=كانون الثاني
+FormatData/ar_JO/MonthAbbreviations/1=شباط
+FormatData/ar_JO/MonthAbbreviations/2=آذار
+FormatData/ar_JO/MonthAbbreviations/3=نيسان
+FormatData/ar_JO/MonthAbbreviations/4=أيار
+FormatData/ar_JO/MonthAbbreviations/5=حزيران
+FormatData/ar_JO/MonthAbbreviations/6=تموز
+FormatData/ar_JO/MonthAbbreviations/7=آب
+FormatData/ar_JO/MonthAbbreviations/8=أيلول
+FormatData/ar_JO/MonthAbbreviations/9=تشرين الأول
+FormatData/ar_JO/MonthAbbreviations/10=تشرين الثاني
+FormatData/ar_JO/MonthAbbreviations/11=كانون الأول
 FormatData/ar_JO/MonthAbbreviations/12=
-FormatData/ar_JO/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_JO/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_JO/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_JO/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_JO/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_JO/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_JO/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_JO/Eras/0=\u0642.\u0645
-FormatData/ar_JO/Eras/1=\u0645
-LocaleNames/ar_JO/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_JO/AmPmMarkers/0=\u0635
-FormatData/ar_JO/AmPmMarkers/1=\u0645
+FormatData/ar_JO/DayNames/0=الأحد
+FormatData/ar_JO/DayNames/1=الاثنين
+FormatData/ar_JO/DayNames/2=الثلاثاء
+FormatData/ar_JO/DayNames/3=الأربعاء
+FormatData/ar_JO/DayNames/4=الخميس
+FormatData/ar_JO/DayNames/5=الجمعة
+FormatData/ar_JO/DayNames/6=السبت
+FormatData/ar_JO/Eras/0=ق.م
+FormatData/ar_JO/Eras/1=م
+LocaleNames/ar_JO/ar=العربية
+FormatData/ar_JO/AmPmMarkers/0=ص
+FormatData/ar_JO/AmPmMarkers/1=م
 FormatData/ar_JO/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_JO/TimePatterns/1=h:mm:ss a z
 FormatData/ar_JO/TimePatterns/2=h:mm:ss a
 FormatData/ar_JO/TimePatterns/3=h:mm a
-FormatData/ar_JO/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_JO/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_JO/DatePatterns/1=d MMMM y
-FormatData/ar_JO/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_JO/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_JO/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_JO/EG=\u0645\u0635\u0631
-LocaleNames/ar_JO/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_JO/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_JO/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_JO/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_JO/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_JO/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_JO/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_JO/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_JO/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_JO/QA=\u0642\u0637\u0631
-LocaleNames/ar_JO/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_JO/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_JO/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_JO/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_JO/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_JO/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_JO/arab.NumberElements/0=\u066b
-FormatData/ar_JO/arab.NumberElements/1=\u066c
-FormatData/ar_JO/arab.NumberElements/2=\u061b
-FormatData/ar_JO/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_JO/arab.NumberElements/4=\u0660
+FormatData/ar_JO/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_JO/DatePatterns/3=d‏/M‏/y
+FormatData/ar_JO/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_JO/EG=مصر
+LocaleNames/ar_JO/DZ=الجزائر
+LocaleNames/ar_JO/BH=البحرين
+LocaleNames/ar_JO/IQ=العراق
+LocaleNames/ar_JO/JO=الأردن
+LocaleNames/ar_JO/KW=الكويت
+LocaleNames/ar_JO/LB=لبنان
+LocaleNames/ar_JO/LY=ليبيا
+LocaleNames/ar_JO/MA=المغرب
+LocaleNames/ar_JO/OM=عُمان
+LocaleNames/ar_JO/QA=قطر
+LocaleNames/ar_JO/SA=المملكة العربية السعودية
+LocaleNames/ar_JO/SD=السودان
+LocaleNames/ar_JO/SY=سوريا
+LocaleNames/ar_JO/TN=تونس
+LocaleNames/ar_JO/AE=الإمارات العربية المتحدة
+LocaleNames/ar_JO/YE=اليمن
+FormatData/ar_JO/arab.NumberElements/0=٫
+FormatData/ar_JO/arab.NumberElements/1=٬
+FormatData/ar_JO/arab.NumberElements/2=؛
+FormatData/ar_JO/arab.NumberElements/3=٪؜
+FormatData/ar_JO/arab.NumberElements/4=٠
 FormatData/ar_JO/arab.NumberElements/5=#
-FormatData/ar_JO/arab.NumberElements/6=\u061c-
-FormatData/ar_JO/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_JO/arab.NumberElements/8=\u0609
-FormatData/ar_JO/arab.NumberElements/9=\u221e
-FormatData/ar_JO/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_KW/KWD=\u062f.\u0643.\u200f
+FormatData/ar_JO/arab.NumberElements/6=؜-
+FormatData/ar_JO/arab.NumberElements/7=أس
+FormatData/ar_JO/arab.NumberElements/8=؉
+FormatData/ar_JO/arab.NumberElements/9=∞
+FormatData/ar_JO/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_KW/KWD=د.ك.‏
 FormatData/ar_KW/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_KW/NumberPatterns/1='\u062f.\u0643.\u200f' #,##0.###;'\u062f.\u0643.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_KW/NumberPatterns/1='د.ك.‏' #,##0.###;'د.ك.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_KW/arab.NumberPatterns/2=#,##0%
-FormatData/ar_KW/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_KW/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_KW/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_KW/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_KW/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_KW/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_KW/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_KW/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_KW/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_KW/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_KW/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_KW/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_KW/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_KW/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_KW/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_KW/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_KW/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_KW/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_KW/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_KW/DayNames/0=الأحد
+FormatData/ar_KW/DayNames/1=الاثنين
+FormatData/ar_KW/DayNames/2=الثلاثاء
+FormatData/ar_KW/DayNames/3=الأربعاء
+FormatData/ar_KW/DayNames/4=الخميس
+FormatData/ar_KW/DayNames/5=الجمعة
+FormatData/ar_KW/DayNames/6=السبت
+FormatData/ar_KW/MonthAbbreviations/0=يناير
+FormatData/ar_KW/MonthAbbreviations/1=فبراير
+FormatData/ar_KW/MonthAbbreviations/2=مارس
+FormatData/ar_KW/MonthAbbreviations/3=أبريل
+FormatData/ar_KW/MonthAbbreviations/4=مايو
+FormatData/ar_KW/MonthAbbreviations/5=يونيو
+FormatData/ar_KW/MonthAbbreviations/6=يوليو
+FormatData/ar_KW/MonthAbbreviations/7=أغسطس
+FormatData/ar_KW/MonthAbbreviations/8=سبتمبر
+FormatData/ar_KW/MonthAbbreviations/9=أكتوبر
+FormatData/ar_KW/MonthAbbreviations/10=نوفمبر
+FormatData/ar_KW/MonthAbbreviations/11=ديسمبر
 FormatData/ar_KW/MonthAbbreviations/12=
-FormatData/ar_KW/Eras/0=\u0642.\u0645
-FormatData/ar_KW/Eras/1=\u0645
-FormatData/ar_KW/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_KW/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_KW/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_KW/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_KW/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_KW/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_KW/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_KW/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_KW/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_KW/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_KW/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_KW/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_KW/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_KW/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_KW/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_KW/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_KW/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_KW/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_KW/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_KW/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_KW/Eras/0=ق.م
+FormatData/ar_KW/Eras/1=م
+FormatData/ar_KW/DayAbbreviations/0=الأحد
+FormatData/ar_KW/DayAbbreviations/1=الاثنين
+FormatData/ar_KW/DayAbbreviations/2=الثلاثاء
+FormatData/ar_KW/DayAbbreviations/3=الأربعاء
+FormatData/ar_KW/DayAbbreviations/4=الخميس
+FormatData/ar_KW/DayAbbreviations/5=الجمعة
+FormatData/ar_KW/DayAbbreviations/6=السبت
+LocaleNames/ar_KW/ar=العربية
+FormatData/ar_KW/MonthNames/0=يناير
+FormatData/ar_KW/MonthNames/1=فبراير
+FormatData/ar_KW/MonthNames/2=مارس
+FormatData/ar_KW/MonthNames/3=أبريل
+FormatData/ar_KW/MonthNames/4=مايو
+FormatData/ar_KW/MonthNames/5=يونيو
+FormatData/ar_KW/MonthNames/6=يوليو
+FormatData/ar_KW/MonthNames/7=أغسطس
+FormatData/ar_KW/MonthNames/8=سبتمبر
+FormatData/ar_KW/MonthNames/9=أكتوبر
+FormatData/ar_KW/MonthNames/10=نوفمبر
+FormatData/ar_KW/MonthNames/11=ديسمبر
 FormatData/ar_KW/MonthNames/12=
-FormatData/ar_KW/AmPmMarkers/0=\u0635
-FormatData/ar_KW/AmPmMarkers/1=\u0645
+FormatData/ar_KW/AmPmMarkers/0=ص
+FormatData/ar_KW/AmPmMarkers/1=م
 FormatData/ar_KW/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_KW/TimePatterns/1=h:mm:ss a z
 FormatData/ar_KW/TimePatterns/2=h:mm:ss a
 FormatData/ar_KW/TimePatterns/3=h:mm a
-FormatData/ar_KW/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_KW/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_KW/DatePatterns/1=d MMMM y
-FormatData/ar_KW/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_KW/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_KW/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_KW/EG=\u0645\u0635\u0631
-LocaleNames/ar_KW/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_KW/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_KW/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_KW/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_KW/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_KW/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_KW/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_KW/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_KW/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_KW/QA=\u0642\u0637\u0631
-LocaleNames/ar_KW/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_KW/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_KW/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_KW/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_KW/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_KW/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_KW/arab.NumberElements/0=\u066b
-FormatData/ar_KW/arab.NumberElements/1=\u066c
-FormatData/ar_KW/arab.NumberElements/2=\u061b
-FormatData/ar_KW/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_KW/arab.NumberElements/4=\u0660
+FormatData/ar_KW/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_KW/DatePatterns/3=d‏/M‏/y
+FormatData/ar_KW/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_KW/EG=مصر
+LocaleNames/ar_KW/DZ=الجزائر
+LocaleNames/ar_KW/BH=البحرين
+LocaleNames/ar_KW/IQ=العراق
+LocaleNames/ar_KW/JO=الأردن
+LocaleNames/ar_KW/KW=الكويت
+LocaleNames/ar_KW/LB=لبنان
+LocaleNames/ar_KW/LY=ليبيا
+LocaleNames/ar_KW/MA=المغرب
+LocaleNames/ar_KW/OM=عُمان
+LocaleNames/ar_KW/QA=قطر
+LocaleNames/ar_KW/SA=المملكة العربية السعودية
+LocaleNames/ar_KW/SD=السودان
+LocaleNames/ar_KW/SY=سوريا
+LocaleNames/ar_KW/TN=تونس
+LocaleNames/ar_KW/AE=الإمارات العربية المتحدة
+LocaleNames/ar_KW/YE=اليمن
+FormatData/ar_KW/arab.NumberElements/0=٫
+FormatData/ar_KW/arab.NumberElements/1=٬
+FormatData/ar_KW/arab.NumberElements/2=؛
+FormatData/ar_KW/arab.NumberElements/3=٪؜
+FormatData/ar_KW/arab.NumberElements/4=٠
 FormatData/ar_KW/arab.NumberElements/5=#
-FormatData/ar_KW/arab.NumberElements/6=\u061c-
-FormatData/ar_KW/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_KW/arab.NumberElements/8=\u0609
-FormatData/ar_KW/arab.NumberElements/9=\u221e
-FormatData/ar_KW/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
+FormatData/ar_KW/arab.NumberElements/6=؜-
+FormatData/ar_KW/arab.NumberElements/7=أس
+FormatData/ar_KW/arab.NumberElements/8=؉
+FormatData/ar_KW/arab.NumberElements/9=∞
+FormatData/ar_KW/arab.NumberElements/10=ليس رقمًا
 FormatData/ar_LB/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_LB/NumberPatterns/1='\u0644.\u0644.\u200f' #,##0.###;'\u0644.\u0644.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_LB/NumberPatterns/1='ل.ل.‏' #,##0.###;'ل.ل.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_LB/arab.NumberPatterns/2=#,##0%
-CurrencyNames/ar_LB/LBP=\u0644.\u0644.\u200f
-FormatData/ar_LB/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LB/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LB/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LB/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LB/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LB/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LB/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_LB/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_LB/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_LB/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_LB/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_LB/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_LB/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_LB/MonthNames/7=\u0622\u0628
-FormatData/ar_LB/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_LB/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+CurrencyNames/ar_LB/LBP=ل.ل.‏
+FormatData/ar_LB/DayAbbreviations/0=الأحد
+FormatData/ar_LB/DayAbbreviations/1=الاثنين
+FormatData/ar_LB/DayAbbreviations/2=الثلاثاء
+FormatData/ar_LB/DayAbbreviations/3=الأربعاء
+FormatData/ar_LB/DayAbbreviations/4=الخميس
+FormatData/ar_LB/DayAbbreviations/5=الجمعة
+FormatData/ar_LB/DayAbbreviations/6=السبت
+FormatData/ar_LB/MonthNames/0=كانون الثاني
+FormatData/ar_LB/MonthNames/1=شباط
+FormatData/ar_LB/MonthNames/2=آذار
+FormatData/ar_LB/MonthNames/3=نيسان
+FormatData/ar_LB/MonthNames/4=أيار
+FormatData/ar_LB/MonthNames/5=حزيران
+FormatData/ar_LB/MonthNames/6=تموز
+FormatData/ar_LB/MonthNames/7=آب
+FormatData/ar_LB/MonthNames/8=أيلول
+FormatData/ar_LB/MonthNames/9=تشرين الأول
+FormatData/ar_LB/MonthNames/10=تشرين الثاني
+FormatData/ar_LB/MonthNames/11=كانون الأول
 FormatData/ar_LB/MonthNames/12=
-FormatData/ar_LB/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_LB/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_LB/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_LB/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_LB/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_LB/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_LB/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_LB/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_LB/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_LB/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_LB/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar_LB/MonthAbbreviations/0=كانون الثاني
+FormatData/ar_LB/MonthAbbreviations/1=شباط
+FormatData/ar_LB/MonthAbbreviations/2=آذار
+FormatData/ar_LB/MonthAbbreviations/3=نيسان
+FormatData/ar_LB/MonthAbbreviations/4=أيار
+FormatData/ar_LB/MonthAbbreviations/5=حزيران
+FormatData/ar_LB/MonthAbbreviations/6=تموز
+FormatData/ar_LB/MonthAbbreviations/7=آب
+FormatData/ar_LB/MonthAbbreviations/8=أيلول
+FormatData/ar_LB/MonthAbbreviations/9=تشرين الأول
+FormatData/ar_LB/MonthAbbreviations/10=تشرين الثاني
+FormatData/ar_LB/MonthAbbreviations/11=كانون الأول
 FormatData/ar_LB/MonthAbbreviations/12=
-FormatData/ar_LB/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LB/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LB/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LB/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LB/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LB/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LB/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_LB/Eras/0=\u0642.\u0645
-FormatData/ar_LB/Eras/1=\u0645
-LocaleNames/ar_LB/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_LB/AmPmMarkers/0=\u0635
-FormatData/ar_LB/AmPmMarkers/1=\u0645
+FormatData/ar_LB/DayNames/0=الأحد
+FormatData/ar_LB/DayNames/1=الاثنين
+FormatData/ar_LB/DayNames/2=الثلاثاء
+FormatData/ar_LB/DayNames/3=الأربعاء
+FormatData/ar_LB/DayNames/4=الخميس
+FormatData/ar_LB/DayNames/5=الجمعة
+FormatData/ar_LB/DayNames/6=السبت
+FormatData/ar_LB/Eras/0=ق.م
+FormatData/ar_LB/Eras/1=م
+LocaleNames/ar_LB/ar=العربية
+FormatData/ar_LB/AmPmMarkers/0=ص
+FormatData/ar_LB/AmPmMarkers/1=م
 FormatData/ar_LB/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_LB/TimePatterns/1=h:mm:ss a z
 FormatData/ar_LB/TimePatterns/2=h:mm:ss a
 FormatData/ar_LB/TimePatterns/3=h:mm a
-FormatData/ar_LB/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_LB/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_LB/DatePatterns/1=d MMMM y
-FormatData/ar_LB/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_LB/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_LB/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_LB/EG=\u0645\u0635\u0631
-LocaleNames/ar_LB/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_LB/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_LB/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_LB/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_LB/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_LB/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_LB/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_LB/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_LB/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_LB/QA=\u0642\u0637\u0631
-LocaleNames/ar_LB/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_LB/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_LB/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_LB/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_LB/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_LB/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_LB/arab.NumberElements/0=\u066b
-FormatData/ar_LB/arab.NumberElements/1=\u066c
-FormatData/ar_LB/arab.NumberElements/2=\u061b
-FormatData/ar_LB/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_LB/arab.NumberElements/4=\u0660
+FormatData/ar_LB/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_LB/DatePatterns/3=d‏/M‏/y
+FormatData/ar_LB/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_LB/EG=مصر
+LocaleNames/ar_LB/DZ=الجزائر
+LocaleNames/ar_LB/BH=البحرين
+LocaleNames/ar_LB/IQ=العراق
+LocaleNames/ar_LB/JO=الأردن
+LocaleNames/ar_LB/KW=الكويت
+LocaleNames/ar_LB/LB=لبنان
+LocaleNames/ar_LB/LY=ليبيا
+LocaleNames/ar_LB/MA=المغرب
+LocaleNames/ar_LB/OM=عُمان
+LocaleNames/ar_LB/QA=قطر
+LocaleNames/ar_LB/SA=المملكة العربية السعودية
+LocaleNames/ar_LB/SD=السودان
+LocaleNames/ar_LB/SY=سوريا
+LocaleNames/ar_LB/TN=تونس
+LocaleNames/ar_LB/AE=الإمارات العربية المتحدة
+LocaleNames/ar_LB/YE=اليمن
+FormatData/ar_LB/arab.NumberElements/0=٫
+FormatData/ar_LB/arab.NumberElements/1=٬
+FormatData/ar_LB/arab.NumberElements/2=؛
+FormatData/ar_LB/arab.NumberElements/3=٪؜
+FormatData/ar_LB/arab.NumberElements/4=٠
 FormatData/ar_LB/arab.NumberElements/5=#
-FormatData/ar_LB/arab.NumberElements/6=\u061c-
-FormatData/ar_LB/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_LB/arab.NumberElements/8=\u0609
-FormatData/ar_LB/arab.NumberElements/9=\u221e
-FormatData/ar_LB/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_LY/LYD=\u062f.\u0644.\u200f
+FormatData/ar_LB/arab.NumberElements/6=؜-
+FormatData/ar_LB/arab.NumberElements/7=أس
+FormatData/ar_LB/arab.NumberElements/8=؉
+FormatData/ar_LB/arab.NumberElements/9=∞
+FormatData/ar_LB/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_LY/LYD=د.ل.‏
 FormatData/ar_LY/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_LY/NumberPatterns/1='\u062f.\u0644.\u200f' #,##0.###;'\u062f.\u0644.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_LY/NumberPatterns/1='د.ل.‏' #,##0.###;'د.ل.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_LY/arab.NumberPatterns/2=#,##0%
-FormatData/ar_LY/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LY/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LY/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LY/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LY/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LY/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LY/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_LY/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_LY/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_LY/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_LY/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_LY/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_LY/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_LY/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_LY/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_LY/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_LY/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_LY/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_LY/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_LY/DayNames/0=الأحد
+FormatData/ar_LY/DayNames/1=الاثنين
+FormatData/ar_LY/DayNames/2=الثلاثاء
+FormatData/ar_LY/DayNames/3=الأربعاء
+FormatData/ar_LY/DayNames/4=الخميس
+FormatData/ar_LY/DayNames/5=الجمعة
+FormatData/ar_LY/DayNames/6=السبت
+FormatData/ar_LY/MonthAbbreviations/0=يناير
+FormatData/ar_LY/MonthAbbreviations/1=فبراير
+FormatData/ar_LY/MonthAbbreviations/2=مارس
+FormatData/ar_LY/MonthAbbreviations/3=أبريل
+FormatData/ar_LY/MonthAbbreviations/4=مايو
+FormatData/ar_LY/MonthAbbreviations/5=يونيو
+FormatData/ar_LY/MonthAbbreviations/6=يوليو
+FormatData/ar_LY/MonthAbbreviations/7=أغسطس
+FormatData/ar_LY/MonthAbbreviations/8=سبتمبر
+FormatData/ar_LY/MonthAbbreviations/9=أكتوبر
+FormatData/ar_LY/MonthAbbreviations/10=نوفمبر
+FormatData/ar_LY/MonthAbbreviations/11=ديسمبر
 FormatData/ar_LY/MonthAbbreviations/12=
-FormatData/ar_LY/Eras/0=\u0642.\u0645
-FormatData/ar_LY/Eras/1=\u0645
-FormatData/ar_LY/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_LY/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_LY/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_LY/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_LY/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_LY/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_LY/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_LY/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_LY/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_LY/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_LY/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_LY/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_LY/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_LY/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_LY/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_LY/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_LY/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_LY/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_LY/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_LY/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_LY/Eras/0=ق.م
+FormatData/ar_LY/Eras/1=م
+FormatData/ar_LY/DayAbbreviations/0=الأحد
+FormatData/ar_LY/DayAbbreviations/1=الاثنين
+FormatData/ar_LY/DayAbbreviations/2=الثلاثاء
+FormatData/ar_LY/DayAbbreviations/3=الأربعاء
+FormatData/ar_LY/DayAbbreviations/4=الخميس
+FormatData/ar_LY/DayAbbreviations/5=الجمعة
+FormatData/ar_LY/DayAbbreviations/6=السبت
+LocaleNames/ar_LY/ar=العربية
+FormatData/ar_LY/MonthNames/0=يناير
+FormatData/ar_LY/MonthNames/1=فبراير
+FormatData/ar_LY/MonthNames/2=مارس
+FormatData/ar_LY/MonthNames/3=أبريل
+FormatData/ar_LY/MonthNames/4=مايو
+FormatData/ar_LY/MonthNames/5=يونيو
+FormatData/ar_LY/MonthNames/6=يوليو
+FormatData/ar_LY/MonthNames/7=أغسطس
+FormatData/ar_LY/MonthNames/8=سبتمبر
+FormatData/ar_LY/MonthNames/9=أكتوبر
+FormatData/ar_LY/MonthNames/10=نوفمبر
+FormatData/ar_LY/MonthNames/11=ديسمبر
 FormatData/ar_LY/MonthNames/12=
-FormatData/ar_LY/AmPmMarkers/0=\u0635
-FormatData/ar_LY/AmPmMarkers/1=\u0645
+FormatData/ar_LY/AmPmMarkers/0=ص
+FormatData/ar_LY/AmPmMarkers/1=م
 FormatData/ar_LY/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_LY/TimePatterns/1=h:mm:ss a z
 FormatData/ar_LY/TimePatterns/2=h:mm:ss a
 FormatData/ar_LY/TimePatterns/3=h:mm a
-FormatData/ar_LY/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_LY/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_LY/DatePatterns/1=d MMMM y
-FormatData/ar_LY/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_LY/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_LY/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_LY/EG=\u0645\u0635\u0631
-LocaleNames/ar_LY/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_LY/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_LY/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_LY/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_LY/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_LY/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_LY/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_LY/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_LY/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_LY/QA=\u0642\u0637\u0631
-LocaleNames/ar_LY/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_LY/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_LY/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_LY/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_LY/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_LY/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_LY/arab.NumberElements/0=\u066b
-FormatData/ar_LY/arab.NumberElements/1=\u066c
-FormatData/ar_LY/arab.NumberElements/2=\u061b
-FormatData/ar_LY/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_LY/arab.NumberElements/4=\u0660
+FormatData/ar_LY/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_LY/DatePatterns/3=d‏/M‏/y
+FormatData/ar_LY/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_LY/EG=مصر
+LocaleNames/ar_LY/DZ=الجزائر
+LocaleNames/ar_LY/BH=البحرين
+LocaleNames/ar_LY/IQ=العراق
+LocaleNames/ar_LY/JO=الأردن
+LocaleNames/ar_LY/KW=الكويت
+LocaleNames/ar_LY/LB=لبنان
+LocaleNames/ar_LY/LY=ليبيا
+LocaleNames/ar_LY/MA=المغرب
+LocaleNames/ar_LY/OM=عُمان
+LocaleNames/ar_LY/QA=قطر
+LocaleNames/ar_LY/SA=المملكة العربية السعودية
+LocaleNames/ar_LY/SD=السودان
+LocaleNames/ar_LY/SY=سوريا
+LocaleNames/ar_LY/TN=تونس
+LocaleNames/ar_LY/AE=الإمارات العربية المتحدة
+LocaleNames/ar_LY/YE=اليمن
+FormatData/ar_LY/arab.NumberElements/0=٫
+FormatData/ar_LY/arab.NumberElements/1=٬
+FormatData/ar_LY/arab.NumberElements/2=؛
+FormatData/ar_LY/arab.NumberElements/3=٪؜
+FormatData/ar_LY/arab.NumberElements/4=٠
 FormatData/ar_LY/arab.NumberElements/5=#
-FormatData/ar_LY/arab.NumberElements/6=\u061c-
-FormatData/ar_LY/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_LY/arab.NumberElements/8=\u0609
-FormatData/ar_LY/arab.NumberElements/9=\u221e
-FormatData/ar_LY/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_MA/MAD=\u062f.\u0645.\u200f
+FormatData/ar_LY/arab.NumberElements/6=؜-
+FormatData/ar_LY/arab.NumberElements/7=أس
+FormatData/ar_LY/arab.NumberElements/8=؉
+FormatData/ar_LY/arab.NumberElements/9=∞
+FormatData/ar_LY/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_MA/MAD=د.م.‏
 FormatData/ar_MA/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_MA/NumberPatterns/1='\u062f.\u0645.\u200f' #,##0.###;'\u062f.\u0645.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_MA/NumberPatterns/1='د.م.‏' #,##0.###;'د.م.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_MA/arab.NumberPatterns/2=#,##0%
-FormatData/ar_MA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_MA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_MA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_MA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_MA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_MA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_MA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_MA/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_MA/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_MA/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_MA/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_MA/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_MA/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_MA/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648\u0632
-FormatData/ar_MA/MonthAbbreviations/7=\u063a\u0634\u062a
-FormatData/ar_MA/MonthAbbreviations/8=\u0634\u062a\u0646\u0628\u0631
-FormatData/ar_MA/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_MA/MonthAbbreviations/10=\u0646\u0648\u0646\u0628\u0631
-FormatData/ar_MA/MonthAbbreviations/11=\u062f\u062c\u0646\u0628\u0631
+FormatData/ar_MA/DayNames/0=الأحد
+FormatData/ar_MA/DayNames/1=الاثنين
+FormatData/ar_MA/DayNames/2=الثلاثاء
+FormatData/ar_MA/DayNames/3=الأربعاء
+FormatData/ar_MA/DayNames/4=الخميس
+FormatData/ar_MA/DayNames/5=الجمعة
+FormatData/ar_MA/DayNames/6=السبت
+FormatData/ar_MA/MonthAbbreviations/0=يناير
+FormatData/ar_MA/MonthAbbreviations/1=فبراير
+FormatData/ar_MA/MonthAbbreviations/2=مارس
+FormatData/ar_MA/MonthAbbreviations/3=أبريل
+FormatData/ar_MA/MonthAbbreviations/4=ماي
+FormatData/ar_MA/MonthAbbreviations/5=يونيو
+FormatData/ar_MA/MonthAbbreviations/6=يوليوز
+FormatData/ar_MA/MonthAbbreviations/7=غشت
+FormatData/ar_MA/MonthAbbreviations/8=شتنبر
+FormatData/ar_MA/MonthAbbreviations/9=أكتوبر
+FormatData/ar_MA/MonthAbbreviations/10=نونبر
+FormatData/ar_MA/MonthAbbreviations/11=دجنبر
 FormatData/ar_MA/MonthAbbreviations/12=
-FormatData/ar_MA/Eras/0=\u0642.\u0645
-FormatData/ar_MA/Eras/1=\u0645
-FormatData/ar_MA/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_MA/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_MA/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_MA/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_MA/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_MA/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_MA/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_MA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_MA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_MA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_MA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_MA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_MA/MonthNames/4=\u0645\u0627\u064a
-FormatData/ar_MA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_MA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648\u0632
-FormatData/ar_MA/MonthNames/7=\u063a\u0634\u062a
-FormatData/ar_MA/MonthNames/8=\u0634\u062a\u0646\u0628\u0631
-FormatData/ar_MA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_MA/MonthNames/10=\u0646\u0648\u0646\u0628\u0631
-FormatData/ar_MA/MonthNames/11=\u062f\u062c\u0646\u0628\u0631
+FormatData/ar_MA/Eras/0=ق.م
+FormatData/ar_MA/Eras/1=م
+FormatData/ar_MA/DayAbbreviations/0=الأحد
+FormatData/ar_MA/DayAbbreviations/1=الاثنين
+FormatData/ar_MA/DayAbbreviations/2=الثلاثاء
+FormatData/ar_MA/DayAbbreviations/3=الأربعاء
+FormatData/ar_MA/DayAbbreviations/4=الخميس
+FormatData/ar_MA/DayAbbreviations/5=الجمعة
+FormatData/ar_MA/DayAbbreviations/6=السبت
+LocaleNames/ar_MA/ar=العربية
+FormatData/ar_MA/MonthNames/0=يناير
+FormatData/ar_MA/MonthNames/1=فبراير
+FormatData/ar_MA/MonthNames/2=مارس
+FormatData/ar_MA/MonthNames/3=أبريل
+FormatData/ar_MA/MonthNames/4=ماي
+FormatData/ar_MA/MonthNames/5=يونيو
+FormatData/ar_MA/MonthNames/6=يوليوز
+FormatData/ar_MA/MonthNames/7=غشت
+FormatData/ar_MA/MonthNames/8=شتنبر
+FormatData/ar_MA/MonthNames/9=أكتوبر
+FormatData/ar_MA/MonthNames/10=نونبر
+FormatData/ar_MA/MonthNames/11=دجنبر
 FormatData/ar_MA/MonthNames/12=
-FormatData/ar_MA/AmPmMarkers/0=\u0635
-FormatData/ar_MA/AmPmMarkers/1=\u0645
+FormatData/ar_MA/AmPmMarkers/0=ص
+FormatData/ar_MA/AmPmMarkers/1=م
 FormatData/ar_MA/TimePatterns/0=HH:mm:ss zzzz
 FormatData/ar_MA/TimePatterns/1=HH:mm:ss z
 FormatData/ar_MA/TimePatterns/2=HH:mm:ss
 FormatData/ar_MA/TimePatterns/3=HH:mm
-FormatData/ar_MA/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_MA/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_MA/DatePatterns/1=d MMMM y
-FormatData/ar_MA/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_MA/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_MA/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_MA/EG=\u0645\u0635\u0631
-LocaleNames/ar_MA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_MA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_MA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_MA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_MA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_MA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_MA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_MA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_MA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_MA/QA=\u0642\u0637\u0631
-LocaleNames/ar_MA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_MA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_MA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_MA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_MA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_MA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_MA/arab.NumberElements/0=\u066b
-FormatData/ar_MA/arab.NumberElements/1=\u066c
-FormatData/ar_MA/arab.NumberElements/2=\u061b
-FormatData/ar_MA/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_MA/arab.NumberElements/4=\u0660
+FormatData/ar_MA/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_MA/DatePatterns/3=d‏/M‏/y
+FormatData/ar_MA/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_MA/EG=مصر
+LocaleNames/ar_MA/DZ=الجزائر
+LocaleNames/ar_MA/BH=البحرين
+LocaleNames/ar_MA/IQ=العراق
+LocaleNames/ar_MA/JO=الأردن
+LocaleNames/ar_MA/KW=الكويت
+LocaleNames/ar_MA/LB=لبنان
+LocaleNames/ar_MA/LY=ليبيا
+LocaleNames/ar_MA/MA=المغرب
+LocaleNames/ar_MA/OM=عُمان
+LocaleNames/ar_MA/QA=قطر
+LocaleNames/ar_MA/SA=المملكة العربية السعودية
+LocaleNames/ar_MA/SD=السودان
+LocaleNames/ar_MA/SY=سوريا
+LocaleNames/ar_MA/TN=تونس
+LocaleNames/ar_MA/AE=الإمارات العربية المتحدة
+LocaleNames/ar_MA/YE=اليمن
+FormatData/ar_MA/arab.NumberElements/0=٫
+FormatData/ar_MA/arab.NumberElements/1=٬
+FormatData/ar_MA/arab.NumberElements/2=؛
+FormatData/ar_MA/arab.NumberElements/3=٪؜
+FormatData/ar_MA/arab.NumberElements/4=٠
 FormatData/ar_MA/arab.NumberElements/5=#
-FormatData/ar_MA/arab.NumberElements/6=\u061c-
-FormatData/ar_MA/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_MA/arab.NumberElements/8=\u0609
-FormatData/ar_MA/arab.NumberElements/9=\u221e
-FormatData/ar_MA/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_OM/OMR=\u0631.\u0639.\u200f
+FormatData/ar_MA/arab.NumberElements/6=؜-
+FormatData/ar_MA/arab.NumberElements/7=أس
+FormatData/ar_MA/arab.NumberElements/8=؉
+FormatData/ar_MA/arab.NumberElements/9=∞
+FormatData/ar_MA/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_OM/OMR=ر.ع.‏
 FormatData/ar_OM/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_OM/NumberPatterns/1='\u0631.\u0639.\u200f' #,##0.###;'\u0631.\u0639.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_OM/NumberPatterns/1='ر.ع.‏' #,##0.###;'ر.ع.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_OM/arab.NumberPatterns/2=#,##0%
-FormatData/ar_OM/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_OM/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_OM/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_OM/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_OM/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_OM/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_OM/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_OM/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_OM/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_OM/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_OM/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_OM/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_OM/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_OM/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_OM/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_OM/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_OM/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_OM/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_OM/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_OM/DayNames/0=الأحد
+FormatData/ar_OM/DayNames/1=الاثنين
+FormatData/ar_OM/DayNames/2=الثلاثاء
+FormatData/ar_OM/DayNames/3=الأربعاء
+FormatData/ar_OM/DayNames/4=الخميس
+FormatData/ar_OM/DayNames/5=الجمعة
+FormatData/ar_OM/DayNames/6=السبت
+FormatData/ar_OM/MonthAbbreviations/0=يناير
+FormatData/ar_OM/MonthAbbreviations/1=فبراير
+FormatData/ar_OM/MonthAbbreviations/2=مارس
+FormatData/ar_OM/MonthAbbreviations/3=أبريل
+FormatData/ar_OM/MonthAbbreviations/4=مايو
+FormatData/ar_OM/MonthAbbreviations/5=يونيو
+FormatData/ar_OM/MonthAbbreviations/6=يوليو
+FormatData/ar_OM/MonthAbbreviations/7=أغسطس
+FormatData/ar_OM/MonthAbbreviations/8=سبتمبر
+FormatData/ar_OM/MonthAbbreviations/9=أكتوبر
+FormatData/ar_OM/MonthAbbreviations/10=نوفمبر
+FormatData/ar_OM/MonthAbbreviations/11=ديسمبر
 FormatData/ar_OM/MonthAbbreviations/12=
-FormatData/ar_OM/Eras/0=\u0642.\u0645
-FormatData/ar_OM/Eras/1=\u0645
-FormatData/ar_OM/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_OM/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_OM/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_OM/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_OM/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_OM/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_OM/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_OM/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_OM/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_OM/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_OM/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_OM/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_OM/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_OM/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_OM/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_OM/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_OM/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_OM/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_OM/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_OM/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_OM/Eras/0=ق.م
+FormatData/ar_OM/Eras/1=م
+FormatData/ar_OM/DayAbbreviations/0=الأحد
+FormatData/ar_OM/DayAbbreviations/1=الاثنين
+FormatData/ar_OM/DayAbbreviations/2=الثلاثاء
+FormatData/ar_OM/DayAbbreviations/3=الأربعاء
+FormatData/ar_OM/DayAbbreviations/4=الخميس
+FormatData/ar_OM/DayAbbreviations/5=الجمعة
+FormatData/ar_OM/DayAbbreviations/6=السبت
+LocaleNames/ar_OM/ar=العربية
+FormatData/ar_OM/MonthNames/0=يناير
+FormatData/ar_OM/MonthNames/1=فبراير
+FormatData/ar_OM/MonthNames/2=مارس
+FormatData/ar_OM/MonthNames/3=أبريل
+FormatData/ar_OM/MonthNames/4=مايو
+FormatData/ar_OM/MonthNames/5=يونيو
+FormatData/ar_OM/MonthNames/6=يوليو
+FormatData/ar_OM/MonthNames/7=أغسطس
+FormatData/ar_OM/MonthNames/8=سبتمبر
+FormatData/ar_OM/MonthNames/9=أكتوبر
+FormatData/ar_OM/MonthNames/10=نوفمبر
+FormatData/ar_OM/MonthNames/11=ديسمبر
 FormatData/ar_OM/MonthNames/12=
-FormatData/ar_OM/AmPmMarkers/0=\u0635
-FormatData/ar_OM/AmPmMarkers/1=\u0645
+FormatData/ar_OM/AmPmMarkers/0=ص
+FormatData/ar_OM/AmPmMarkers/1=م
 FormatData/ar_OM/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_OM/TimePatterns/1=h:mm:ss a z
 FormatData/ar_OM/TimePatterns/2=h:mm:ss a
 FormatData/ar_OM/TimePatterns/3=h:mm a
-FormatData/ar_OM/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_OM/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_OM/DatePatterns/1=d MMMM y
-FormatData/ar_OM/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_OM/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_OM/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_OM/EG=\u0645\u0635\u0631
-LocaleNames/ar_OM/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_OM/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_OM/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_OM/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_OM/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_OM/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_OM/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_OM/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_OM/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_OM/QA=\u0642\u0637\u0631
-LocaleNames/ar_OM/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_OM/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_OM/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_OM/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_OM/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_OM/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_OM/arab.NumberElements/0=\u066b
-FormatData/ar_OM/arab.NumberElements/1=\u066c
-FormatData/ar_OM/arab.NumberElements/2=\u061b
-FormatData/ar_OM/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_OM/arab.NumberElements/4=\u0660
+FormatData/ar_OM/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_OM/DatePatterns/3=d‏/M‏/y
+FormatData/ar_OM/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_OM/EG=مصر
+LocaleNames/ar_OM/DZ=الجزائر
+LocaleNames/ar_OM/BH=البحرين
+LocaleNames/ar_OM/IQ=العراق
+LocaleNames/ar_OM/JO=الأردن
+LocaleNames/ar_OM/KW=الكويت
+LocaleNames/ar_OM/LB=لبنان
+LocaleNames/ar_OM/LY=ليبيا
+LocaleNames/ar_OM/MA=المغرب
+LocaleNames/ar_OM/OM=عُمان
+LocaleNames/ar_OM/QA=قطر
+LocaleNames/ar_OM/SA=المملكة العربية السعودية
+LocaleNames/ar_OM/SD=السودان
+LocaleNames/ar_OM/SY=سوريا
+LocaleNames/ar_OM/TN=تونس
+LocaleNames/ar_OM/AE=الإمارات العربية المتحدة
+LocaleNames/ar_OM/YE=اليمن
+FormatData/ar_OM/arab.NumberElements/0=٫
+FormatData/ar_OM/arab.NumberElements/1=٬
+FormatData/ar_OM/arab.NumberElements/2=؛
+FormatData/ar_OM/arab.NumberElements/3=٪؜
+FormatData/ar_OM/arab.NumberElements/4=٠
 FormatData/ar_OM/arab.NumberElements/5=#
-FormatData/ar_OM/arab.NumberElements/6=\u061c-
-FormatData/ar_OM/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_OM/arab.NumberElements/8=\u0609
-FormatData/ar_OM/arab.NumberElements/9=\u221e
-FormatData/ar_OM/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_QA/QAR=\u0631.\u0642.\u200f
+FormatData/ar_OM/arab.NumberElements/6=؜-
+FormatData/ar_OM/arab.NumberElements/7=أس
+FormatData/ar_OM/arab.NumberElements/8=؉
+FormatData/ar_OM/arab.NumberElements/9=∞
+FormatData/ar_OM/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_QA/QAR=ر.ق.‏
 FormatData/ar_QA/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_QA/NumberPatterns/1='\u0631.\u0642.\u200f' #,##0.###;'\u0631.\u0642.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_QA/NumberPatterns/1='ر.ق.‏' #,##0.###;'ر.ق.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_QA/arab.NumberPatterns/2=#,##0%
-FormatData/ar_QA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_QA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_QA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_QA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_QA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_QA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_QA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_QA/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_QA/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_QA/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_QA/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_QA/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_QA/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_QA/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_QA/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_QA/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_QA/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_QA/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_QA/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_QA/DayNames/0=الأحد
+FormatData/ar_QA/DayNames/1=الاثنين
+FormatData/ar_QA/DayNames/2=الثلاثاء
+FormatData/ar_QA/DayNames/3=الأربعاء
+FormatData/ar_QA/DayNames/4=الخميس
+FormatData/ar_QA/DayNames/5=الجمعة
+FormatData/ar_QA/DayNames/6=السبت
+FormatData/ar_QA/MonthAbbreviations/0=يناير
+FormatData/ar_QA/MonthAbbreviations/1=فبراير
+FormatData/ar_QA/MonthAbbreviations/2=مارس
+FormatData/ar_QA/MonthAbbreviations/3=أبريل
+FormatData/ar_QA/MonthAbbreviations/4=مايو
+FormatData/ar_QA/MonthAbbreviations/5=يونيو
+FormatData/ar_QA/MonthAbbreviations/6=يوليو
+FormatData/ar_QA/MonthAbbreviations/7=أغسطس
+FormatData/ar_QA/MonthAbbreviations/8=سبتمبر
+FormatData/ar_QA/MonthAbbreviations/9=أكتوبر
+FormatData/ar_QA/MonthAbbreviations/10=نوفمبر
+FormatData/ar_QA/MonthAbbreviations/11=ديسمبر
 FormatData/ar_QA/MonthAbbreviations/12=
-FormatData/ar_QA/Eras/0=\u0642.\u0645
-FormatData/ar_QA/Eras/1=\u0645
-FormatData/ar_QA/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_QA/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_QA/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_QA/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_QA/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_QA/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_QA/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_QA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_QA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_QA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_QA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_QA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_QA/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_QA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_QA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_QA/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_QA/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_QA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_QA/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_QA/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_QA/Eras/0=ق.م
+FormatData/ar_QA/Eras/1=م
+FormatData/ar_QA/DayAbbreviations/0=الأحد
+FormatData/ar_QA/DayAbbreviations/1=الاثنين
+FormatData/ar_QA/DayAbbreviations/2=الثلاثاء
+FormatData/ar_QA/DayAbbreviations/3=الأربعاء
+FormatData/ar_QA/DayAbbreviations/4=الخميس
+FormatData/ar_QA/DayAbbreviations/5=الجمعة
+FormatData/ar_QA/DayAbbreviations/6=السبت
+LocaleNames/ar_QA/ar=العربية
+FormatData/ar_QA/MonthNames/0=يناير
+FormatData/ar_QA/MonthNames/1=فبراير
+FormatData/ar_QA/MonthNames/2=مارس
+FormatData/ar_QA/MonthNames/3=أبريل
+FormatData/ar_QA/MonthNames/4=مايو
+FormatData/ar_QA/MonthNames/5=يونيو
+FormatData/ar_QA/MonthNames/6=يوليو
+FormatData/ar_QA/MonthNames/7=أغسطس
+FormatData/ar_QA/MonthNames/8=سبتمبر
+FormatData/ar_QA/MonthNames/9=أكتوبر
+FormatData/ar_QA/MonthNames/10=نوفمبر
+FormatData/ar_QA/MonthNames/11=ديسمبر
 FormatData/ar_QA/MonthNames/12=
-FormatData/ar_QA/AmPmMarkers/0=\u0635
-FormatData/ar_QA/AmPmMarkers/1=\u0645
+FormatData/ar_QA/AmPmMarkers/0=ص
+FormatData/ar_QA/AmPmMarkers/1=م
 FormatData/ar_QA/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_QA/TimePatterns/1=h:mm:ss a z
 FormatData/ar_QA/TimePatterns/2=h:mm:ss a
 FormatData/ar_QA/TimePatterns/3=h:mm a
-FormatData/ar_QA/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_QA/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_QA/DatePatterns/1=d MMMM y
-FormatData/ar_QA/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_QA/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_QA/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_QA/EG=\u0645\u0635\u0631
-LocaleNames/ar_QA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_QA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_QA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_QA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_QA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_QA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_QA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_QA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_QA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_QA/QA=\u0642\u0637\u0631
-LocaleNames/ar_QA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_QA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_QA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_QA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_QA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_QA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_QA/arab.NumberElements/0=\u066b
-FormatData/ar_QA/arab.NumberElements/1=\u066c
-FormatData/ar_QA/arab.NumberElements/2=\u061b
-FormatData/ar_QA/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_QA/arab.NumberElements/4=\u0660
+FormatData/ar_QA/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_QA/DatePatterns/3=d‏/M‏/y
+FormatData/ar_QA/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_QA/EG=مصر
+LocaleNames/ar_QA/DZ=الجزائر
+LocaleNames/ar_QA/BH=البحرين
+LocaleNames/ar_QA/IQ=العراق
+LocaleNames/ar_QA/JO=الأردن
+LocaleNames/ar_QA/KW=الكويت
+LocaleNames/ar_QA/LB=لبنان
+LocaleNames/ar_QA/LY=ليبيا
+LocaleNames/ar_QA/MA=المغرب
+LocaleNames/ar_QA/OM=عُمان
+LocaleNames/ar_QA/QA=قطر
+LocaleNames/ar_QA/SA=المملكة العربية السعودية
+LocaleNames/ar_QA/SD=السودان
+LocaleNames/ar_QA/SY=سوريا
+LocaleNames/ar_QA/TN=تونس
+LocaleNames/ar_QA/AE=الإمارات العربية المتحدة
+LocaleNames/ar_QA/YE=اليمن
+FormatData/ar_QA/arab.NumberElements/0=٫
+FormatData/ar_QA/arab.NumberElements/1=٬
+FormatData/ar_QA/arab.NumberElements/2=؛
+FormatData/ar_QA/arab.NumberElements/3=٪؜
+FormatData/ar_QA/arab.NumberElements/4=٠
 FormatData/ar_QA/arab.NumberElements/5=#
-FormatData/ar_QA/arab.NumberElements/6=\u061c-
-FormatData/ar_QA/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_QA/arab.NumberElements/8=\u0609
-FormatData/ar_QA/arab.NumberElements/9=\u221e
-FormatData/ar_QA/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_SA/SAR=\u0631.\u0633.\u200f
+FormatData/ar_QA/arab.NumberElements/6=؜-
+FormatData/ar_QA/arab.NumberElements/7=أس
+FormatData/ar_QA/arab.NumberElements/8=؉
+FormatData/ar_QA/arab.NumberElements/9=∞
+FormatData/ar_QA/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_SA/SAR=ر.س.‏
 FormatData/ar_SA/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_SA/NumberPatterns/1='\u0631.\u0633.\u200f' #,##0.###;'\u0631.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_SA/NumberPatterns/1='ر.س.‏' #,##0.###;'ر.س.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_SA/arab.NumberPatterns/2=#,##0%
-FormatData/ar_SA/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SA/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SA/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SA/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SA/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SA/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SA/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_SA/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SA/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SA/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SA/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SA/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SA/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SA/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SA/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SA/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SA/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SA/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SA/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_SA/DayNames/0=الأحد
+FormatData/ar_SA/DayNames/1=الاثنين
+FormatData/ar_SA/DayNames/2=الثلاثاء
+FormatData/ar_SA/DayNames/3=الأربعاء
+FormatData/ar_SA/DayNames/4=الخميس
+FormatData/ar_SA/DayNames/5=الجمعة
+FormatData/ar_SA/DayNames/6=السبت
+FormatData/ar_SA/MonthAbbreviations/0=يناير
+FormatData/ar_SA/MonthAbbreviations/1=فبراير
+FormatData/ar_SA/MonthAbbreviations/2=مارس
+FormatData/ar_SA/MonthAbbreviations/3=أبريل
+FormatData/ar_SA/MonthAbbreviations/4=مايو
+FormatData/ar_SA/MonthAbbreviations/5=يونيو
+FormatData/ar_SA/MonthAbbreviations/6=يوليو
+FormatData/ar_SA/MonthAbbreviations/7=أغسطس
+FormatData/ar_SA/MonthAbbreviations/8=سبتمبر
+FormatData/ar_SA/MonthAbbreviations/9=أكتوبر
+FormatData/ar_SA/MonthAbbreviations/10=نوفمبر
+FormatData/ar_SA/MonthAbbreviations/11=ديسمبر
 FormatData/ar_SA/MonthAbbreviations/12=
-FormatData/ar_SA/Eras/0=\u0642.\u0645
-FormatData/ar_SA/Eras/1=\u0645
-FormatData/ar_SA/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SA/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SA/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SA/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SA/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SA/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SA/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_SA/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SA/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SA/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SA/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SA/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SA/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SA/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SA/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SA/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SA/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SA/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SA/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SA/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_SA/Eras/0=ق.م
+FormatData/ar_SA/Eras/1=م
+FormatData/ar_SA/DayAbbreviations/0=الأحد
+FormatData/ar_SA/DayAbbreviations/1=الاثنين
+FormatData/ar_SA/DayAbbreviations/2=الثلاثاء
+FormatData/ar_SA/DayAbbreviations/3=الأربعاء
+FormatData/ar_SA/DayAbbreviations/4=الخميس
+FormatData/ar_SA/DayAbbreviations/5=الجمعة
+FormatData/ar_SA/DayAbbreviations/6=السبت
+LocaleNames/ar_SA/ar=العربية
+FormatData/ar_SA/MonthNames/0=يناير
+FormatData/ar_SA/MonthNames/1=فبراير
+FormatData/ar_SA/MonthNames/2=مارس
+FormatData/ar_SA/MonthNames/3=أبريل
+FormatData/ar_SA/MonthNames/4=مايو
+FormatData/ar_SA/MonthNames/5=يونيو
+FormatData/ar_SA/MonthNames/6=يوليو
+FormatData/ar_SA/MonthNames/7=أغسطس
+FormatData/ar_SA/MonthNames/8=سبتمبر
+FormatData/ar_SA/MonthNames/9=أكتوبر
+FormatData/ar_SA/MonthNames/10=نوفمبر
+FormatData/ar_SA/MonthNames/11=ديسمبر
 FormatData/ar_SA/MonthNames/12=
-FormatData/ar_SA/AmPmMarkers/0=\u0635
-FormatData/ar_SA/AmPmMarkers/1=\u0645
+FormatData/ar_SA/AmPmMarkers/0=ص
+FormatData/ar_SA/AmPmMarkers/1=م
 FormatData/ar_SA/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_SA/TimePatterns/1=h:mm:ss a z
 FormatData/ar_SA/TimePatterns/2=h:mm:ss a
 FormatData/ar_SA/TimePatterns/3=h:mm a
-FormatData/ar_SA/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_SA/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_SA/DatePatterns/1=d MMMM y
-FormatData/ar_SA/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_SA/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_SA/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_SA/EG=\u0645\u0635\u0631
-LocaleNames/ar_SA/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SA/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SA/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SA/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SA/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SA/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SA/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SA/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SA/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SA/QA=\u0642\u0637\u0631
-LocaleNames/ar_SA/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SA/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SA/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SA/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SA/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SA/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SA/arab.NumberElements/0=\u066b
-FormatData/ar_SA/arab.NumberElements/1=\u066c
-FormatData/ar_SA/arab.NumberElements/2=\u061b
-FormatData/ar_SA/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_SA/arab.NumberElements/4=\u0660
+FormatData/ar_SA/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_SA/DatePatterns/3=d‏/M‏/y
+FormatData/ar_SA/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_SA/EG=مصر
+LocaleNames/ar_SA/DZ=الجزائر
+LocaleNames/ar_SA/BH=البحرين
+LocaleNames/ar_SA/IQ=العراق
+LocaleNames/ar_SA/JO=الأردن
+LocaleNames/ar_SA/KW=الكويت
+LocaleNames/ar_SA/LB=لبنان
+LocaleNames/ar_SA/LY=ليبيا
+LocaleNames/ar_SA/MA=المغرب
+LocaleNames/ar_SA/OM=عُمان
+LocaleNames/ar_SA/QA=قطر
+LocaleNames/ar_SA/SA=المملكة العربية السعودية
+LocaleNames/ar_SA/SD=السودان
+LocaleNames/ar_SA/SY=سوريا
+LocaleNames/ar_SA/TN=تونس
+LocaleNames/ar_SA/AE=الإمارات العربية المتحدة
+LocaleNames/ar_SA/YE=اليمن
+FormatData/ar_SA/arab.NumberElements/0=٫
+FormatData/ar_SA/arab.NumberElements/1=٬
+FormatData/ar_SA/arab.NumberElements/2=؛
+FormatData/ar_SA/arab.NumberElements/3=٪؜
+FormatData/ar_SA/arab.NumberElements/4=٠
 FormatData/ar_SA/arab.NumberElements/5=#
-FormatData/ar_SA/arab.NumberElements/6=\u061c-
-FormatData/ar_SA/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_SA/arab.NumberElements/8=\u0609
-FormatData/ar_SA/arab.NumberElements/9=\u221e
-FormatData/ar_SA/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
+FormatData/ar_SA/arab.NumberElements/6=؜-
+FormatData/ar_SA/arab.NumberElements/7=أس
+FormatData/ar_SA/arab.NumberElements/8=؉
+FormatData/ar_SA/arab.NumberElements/9=∞
+FormatData/ar_SA/arab.NumberElements/10=ليس رقمًا
 # changed for 4945388, removed for 6531591, see bellow
-# CurrencyNames/ar_SD/SDD=\u062c.\u0633.\u200f
+# CurrencyNames/ar_SD/SDD=ج.س.‏
 FormatData/ar_SD/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_SD/NumberPatterns/1='\u062c.\u0633.\u200f' #,##0.###;'\u062c.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_SD/NumberPatterns/1='ج.س.‏' #,##0.###;'ج.س.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_SD/arab.NumberPatterns/2=#,##0%
-FormatData/ar_SD/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SD/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SD/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SD/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SD/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SD/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SD/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_SD/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SD/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SD/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SD/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SD/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SD/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SD/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SD/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SD/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SD/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SD/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SD/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_SD/DayNames/0=الأحد
+FormatData/ar_SD/DayNames/1=الاثنين
+FormatData/ar_SD/DayNames/2=الثلاثاء
+FormatData/ar_SD/DayNames/3=الأربعاء
+FormatData/ar_SD/DayNames/4=الخميس
+FormatData/ar_SD/DayNames/5=الجمعة
+FormatData/ar_SD/DayNames/6=السبت
+FormatData/ar_SD/MonthAbbreviations/0=يناير
+FormatData/ar_SD/MonthAbbreviations/1=فبراير
+FormatData/ar_SD/MonthAbbreviations/2=مارس
+FormatData/ar_SD/MonthAbbreviations/3=أبريل
+FormatData/ar_SD/MonthAbbreviations/4=مايو
+FormatData/ar_SD/MonthAbbreviations/5=يونيو
+FormatData/ar_SD/MonthAbbreviations/6=يوليو
+FormatData/ar_SD/MonthAbbreviations/7=أغسطس
+FormatData/ar_SD/MonthAbbreviations/8=سبتمبر
+FormatData/ar_SD/MonthAbbreviations/9=أكتوبر
+FormatData/ar_SD/MonthAbbreviations/10=نوفمبر
+FormatData/ar_SD/MonthAbbreviations/11=ديسمبر
 FormatData/ar_SD/MonthAbbreviations/12=
-FormatData/ar_SD/Eras/0=\u0642.\u0645
-FormatData/ar_SD/Eras/1=\u0645
-FormatData/ar_SD/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SD/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SD/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SD/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SD/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SD/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SD/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_SD/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SD/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_SD/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_SD/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_SD/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_SD/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_SD/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_SD/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_SD/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_SD/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_SD/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_SD/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_SD/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_SD/Eras/0=ق.م
+FormatData/ar_SD/Eras/1=م
+FormatData/ar_SD/DayAbbreviations/0=الأحد
+FormatData/ar_SD/DayAbbreviations/1=الاثنين
+FormatData/ar_SD/DayAbbreviations/2=الثلاثاء
+FormatData/ar_SD/DayAbbreviations/3=الأربعاء
+FormatData/ar_SD/DayAbbreviations/4=الخميس
+FormatData/ar_SD/DayAbbreviations/5=الجمعة
+FormatData/ar_SD/DayAbbreviations/6=السبت
+LocaleNames/ar_SD/ar=العربية
+FormatData/ar_SD/MonthNames/0=يناير
+FormatData/ar_SD/MonthNames/1=فبراير
+FormatData/ar_SD/MonthNames/2=مارس
+FormatData/ar_SD/MonthNames/3=أبريل
+FormatData/ar_SD/MonthNames/4=مايو
+FormatData/ar_SD/MonthNames/5=يونيو
+FormatData/ar_SD/MonthNames/6=يوليو
+FormatData/ar_SD/MonthNames/7=أغسطس
+FormatData/ar_SD/MonthNames/8=سبتمبر
+FormatData/ar_SD/MonthNames/9=أكتوبر
+FormatData/ar_SD/MonthNames/10=نوفمبر
+FormatData/ar_SD/MonthNames/11=ديسمبر
 FormatData/ar_SD/MonthNames/12=
-FormatData/ar_SD/AmPmMarkers/0=\u0635
-FormatData/ar_SD/AmPmMarkers/1=\u0645
+FormatData/ar_SD/AmPmMarkers/0=ص
+FormatData/ar_SD/AmPmMarkers/1=م
 FormatData/ar_SD/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_SD/TimePatterns/1=h:mm:ss a z
 FormatData/ar_SD/TimePatterns/2=h:mm:ss a
 FormatData/ar_SD/TimePatterns/3=h:mm a
-FormatData/ar_SD/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_SD/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_SD/DatePatterns/1=d MMMM y
-FormatData/ar_SD/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_SD/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_SD/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_SD/EG=\u0645\u0635\u0631
-LocaleNames/ar_SD/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SD/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SD/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SD/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SD/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SD/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SD/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SD/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SD/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SD/QA=\u0642\u0637\u0631
-LocaleNames/ar_SD/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SD/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SD/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SD/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SD/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SD/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SD/arab.NumberElements/0=\u066b
-FormatData/ar_SD/arab.NumberElements/1=\u066c
-FormatData/ar_SD/arab.NumberElements/2=\u061b
-FormatData/ar_SD/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_SD/arab.NumberElements/4=\u0660
+FormatData/ar_SD/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_SD/DatePatterns/3=d‏/M‏/y
+FormatData/ar_SD/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_SD/EG=مصر
+LocaleNames/ar_SD/DZ=الجزائر
+LocaleNames/ar_SD/BH=البحرين
+LocaleNames/ar_SD/IQ=العراق
+LocaleNames/ar_SD/JO=الأردن
+LocaleNames/ar_SD/KW=الكويت
+LocaleNames/ar_SD/LB=لبنان
+LocaleNames/ar_SD/LY=ليبيا
+LocaleNames/ar_SD/MA=المغرب
+LocaleNames/ar_SD/OM=عُمان
+LocaleNames/ar_SD/QA=قطر
+LocaleNames/ar_SD/SA=المملكة العربية السعودية
+LocaleNames/ar_SD/SD=السودان
+LocaleNames/ar_SD/SY=سوريا
+LocaleNames/ar_SD/TN=تونس
+LocaleNames/ar_SD/AE=الإمارات العربية المتحدة
+LocaleNames/ar_SD/YE=اليمن
+FormatData/ar_SD/arab.NumberElements/0=٫
+FormatData/ar_SD/arab.NumberElements/1=٬
+FormatData/ar_SD/arab.NumberElements/2=؛
+FormatData/ar_SD/arab.NumberElements/3=٪؜
+FormatData/ar_SD/arab.NumberElements/4=٠
 FormatData/ar_SD/arab.NumberElements/5=#
-FormatData/ar_SD/arab.NumberElements/6=\u061c-
-FormatData/ar_SD/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_SD/arab.NumberElements/8=\u0609
-FormatData/ar_SD/arab.NumberElements/9=\u221e
-FormatData/ar_SD/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
+FormatData/ar_SD/arab.NumberElements/6=؜-
+FormatData/ar_SD/arab.NumberElements/7=أس
+FormatData/ar_SD/arab.NumberElements/8=؉
+FormatData/ar_SD/arab.NumberElements/9=∞
+FormatData/ar_SD/arab.NumberElements/10=ليس رقمًا
 FormatData/ar_SY/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_SY/NumberPatterns/1='\u0644.\u0633.\u200f' #,##0.###;'\u0644.\u0633.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_SY/NumberPatterns/1='ل.س.‏' #,##0.###;'ل.س.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_SY/arab.NumberPatterns/2=#,##0%
-CurrencyNames/ar_SY/SYP=\u0644.\u0633.\u200f
-FormatData/ar_SY/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SY/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SY/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SY/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SY/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SY/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SY/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_SY/MonthNames/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthNames/1=\u0634\u0628\u0627\u0637
-FormatData/ar_SY/MonthNames/2=\u0622\u0630\u0627\u0631
-FormatData/ar_SY/MonthNames/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_SY/MonthNames/4=\u0623\u064a\u0627\u0631
-FormatData/ar_SY/MonthNames/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_SY/MonthNames/6=\u062a\u0645\u0648\u0632
-FormatData/ar_SY/MonthNames/7=\u0622\u0628
-FormatData/ar_SY/MonthNames/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_SY/MonthNames/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthNames/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthNames/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+CurrencyNames/ar_SY/SYP=ل.س.‏
+FormatData/ar_SY/DayAbbreviations/0=الأحد
+FormatData/ar_SY/DayAbbreviations/1=الاثنين
+FormatData/ar_SY/DayAbbreviations/2=الثلاثاء
+FormatData/ar_SY/DayAbbreviations/3=الأربعاء
+FormatData/ar_SY/DayAbbreviations/4=الخميس
+FormatData/ar_SY/DayAbbreviations/5=الجمعة
+FormatData/ar_SY/DayAbbreviations/6=السبت
+FormatData/ar_SY/MonthNames/0=كانون الثاني
+FormatData/ar_SY/MonthNames/1=شباط
+FormatData/ar_SY/MonthNames/2=آذار
+FormatData/ar_SY/MonthNames/3=نيسان
+FormatData/ar_SY/MonthNames/4=أيار
+FormatData/ar_SY/MonthNames/5=حزيران
+FormatData/ar_SY/MonthNames/6=تموز
+FormatData/ar_SY/MonthNames/7=آب
+FormatData/ar_SY/MonthNames/8=أيلول
+FormatData/ar_SY/MonthNames/9=تشرين الأول
+FormatData/ar_SY/MonthNames/10=تشرين الثاني
+FormatData/ar_SY/MonthNames/11=كانون الأول
 FormatData/ar_SY/MonthNames/12=
-FormatData/ar_SY/MonthAbbreviations/0=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthAbbreviations/1=\u0634\u0628\u0627\u0637
-FormatData/ar_SY/MonthAbbreviations/2=\u0622\u0630\u0627\u0631
-FormatData/ar_SY/MonthAbbreviations/3=\u0646\u064a\u0633\u0627\u0646
-FormatData/ar_SY/MonthAbbreviations/4=\u0623\u064a\u0627\u0631
-FormatData/ar_SY/MonthAbbreviations/5=\u062d\u0632\u064a\u0631\u0627\u0646
-FormatData/ar_SY/MonthAbbreviations/6=\u062a\u0645\u0648\u0632
-FormatData/ar_SY/MonthAbbreviations/7=\u0622\u0628
-FormatData/ar_SY/MonthAbbreviations/8=\u0623\u064a\u0644\u0648\u0644
-FormatData/ar_SY/MonthAbbreviations/9=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u0623\u0648\u0644
-FormatData/ar_SY/MonthAbbreviations/10=\u062a\u0634\u0631\u064a\u0646 \u0627\u0644\u062b\u0627\u0646\u064a
-FormatData/ar_SY/MonthAbbreviations/11=\u0643\u0627\u0646\u0648\u0646 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar_SY/MonthAbbreviations/0=كانون الثاني
+FormatData/ar_SY/MonthAbbreviations/1=شباط
+FormatData/ar_SY/MonthAbbreviations/2=آذار
+FormatData/ar_SY/MonthAbbreviations/3=نيسان
+FormatData/ar_SY/MonthAbbreviations/4=أيار
+FormatData/ar_SY/MonthAbbreviations/5=حزيران
+FormatData/ar_SY/MonthAbbreviations/6=تموز
+FormatData/ar_SY/MonthAbbreviations/7=آب
+FormatData/ar_SY/MonthAbbreviations/8=أيلول
+FormatData/ar_SY/MonthAbbreviations/9=تشرين الأول
+FormatData/ar_SY/MonthAbbreviations/10=تشرين الثاني
+FormatData/ar_SY/MonthAbbreviations/11=كانون الأول
 FormatData/ar_SY/MonthAbbreviations/12=
-FormatData/ar_SY/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_SY/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_SY/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_SY/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_SY/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_SY/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_SY/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_SY/Eras/0=\u0642.\u0645
-FormatData/ar_SY/Eras/1=\u0645
-LocaleNames/ar_SY/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_SY/AmPmMarkers/0=\u0635
-FormatData/ar_SY/AmPmMarkers/1=\u0645
+FormatData/ar_SY/DayNames/0=الأحد
+FormatData/ar_SY/DayNames/1=الاثنين
+FormatData/ar_SY/DayNames/2=الثلاثاء
+FormatData/ar_SY/DayNames/3=الأربعاء
+FormatData/ar_SY/DayNames/4=الخميس
+FormatData/ar_SY/DayNames/5=الجمعة
+FormatData/ar_SY/DayNames/6=السبت
+FormatData/ar_SY/Eras/0=ق.م
+FormatData/ar_SY/Eras/1=م
+LocaleNames/ar_SY/ar=العربية
+FormatData/ar_SY/AmPmMarkers/0=ص
+FormatData/ar_SY/AmPmMarkers/1=م
 FormatData/ar_SY/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_SY/TimePatterns/1=h:mm:ss a z
 FormatData/ar_SY/TimePatterns/2=h:mm:ss a
 FormatData/ar_SY/TimePatterns/3=h:mm a
-FormatData/ar_SY/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_SY/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_SY/DatePatterns/1=d MMMM y
-FormatData/ar_SY/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_SY/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_SY/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_SY/EG=\u0645\u0635\u0631
-LocaleNames/ar_SY/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_SY/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_SY/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_SY/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_SY/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_SY/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_SY/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_SY/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_SY/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_SY/QA=\u0642\u0637\u0631
-LocaleNames/ar_SY/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_SY/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_SY/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_SY/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_SY/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_SY/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_SY/arab.NumberElements/0=\u066b
-FormatData/ar_SY/arab.NumberElements/1=\u066c
-FormatData/ar_SY/arab.NumberElements/2=\u061b
-FormatData/ar_SY/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_SY/arab.NumberElements/4=\u0660
+FormatData/ar_SY/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_SY/DatePatterns/3=d‏/M‏/y
+FormatData/ar_SY/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_SY/EG=مصر
+LocaleNames/ar_SY/DZ=الجزائر
+LocaleNames/ar_SY/BH=البحرين
+LocaleNames/ar_SY/IQ=العراق
+LocaleNames/ar_SY/JO=الأردن
+LocaleNames/ar_SY/KW=الكويت
+LocaleNames/ar_SY/LB=لبنان
+LocaleNames/ar_SY/LY=ليبيا
+LocaleNames/ar_SY/MA=المغرب
+LocaleNames/ar_SY/OM=عُمان
+LocaleNames/ar_SY/QA=قطر
+LocaleNames/ar_SY/SA=المملكة العربية السعودية
+LocaleNames/ar_SY/SD=السودان
+LocaleNames/ar_SY/SY=سوريا
+LocaleNames/ar_SY/TN=تونس
+LocaleNames/ar_SY/AE=الإمارات العربية المتحدة
+LocaleNames/ar_SY/YE=اليمن
+FormatData/ar_SY/arab.NumberElements/0=٫
+FormatData/ar_SY/arab.NumberElements/1=٬
+FormatData/ar_SY/arab.NumberElements/2=؛
+FormatData/ar_SY/arab.NumberElements/3=٪؜
+FormatData/ar_SY/arab.NumberElements/4=٠
 FormatData/ar_SY/arab.NumberElements/5=#
-FormatData/ar_SY/arab.NumberElements/6=\u061c-
-FormatData/ar_SY/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_SY/arab.NumberElements/8=\u0609
-FormatData/ar_SY/arab.NumberElements/9=\u221e
-FormatData/ar_SY/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_TN/TND=\u062f.\u062a.\u200f
+FormatData/ar_SY/arab.NumberElements/6=؜-
+FormatData/ar_SY/arab.NumberElements/7=أس
+FormatData/ar_SY/arab.NumberElements/8=؉
+FormatData/ar_SY/arab.NumberElements/9=∞
+FormatData/ar_SY/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_TN/TND=د.ت.‏
 FormatData/ar_TN/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_TN/NumberPatterns/1='\u062f.\u062a.\u200f' #,##0.###;'\u062f.\u062a.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_TN/NumberPatterns/1='د.ت.‏' #,##0.###;'د.ت.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_TN/arab.NumberPatterns/2=#,##0%
-FormatData/ar_TN/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_TN/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_TN/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_TN/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_TN/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_TN/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_TN/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_TN/MonthAbbreviations/0=\u062c\u0627\u0646\u0641\u064a
-FormatData/ar_TN/MonthAbbreviations/1=\u0641\u064a\u0641\u0631\u064a
-FormatData/ar_TN/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_TN/MonthAbbreviations/3=\u0623\u0641\u0631\u064a\u0644
-FormatData/ar_TN/MonthAbbreviations/4=\u0645\u0627\u064a
-FormatData/ar_TN/MonthAbbreviations/5=\u062c\u0648\u0627\u0646
-FormatData/ar_TN/MonthAbbreviations/6=\u062c\u0648\u064a\u0644\u064a\u0629
-FormatData/ar_TN/MonthAbbreviations/7=\u0623\u0648\u062a
-FormatData/ar_TN/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_TN/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_TN/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_TN/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_TN/DayNames/0=الأحد
+FormatData/ar_TN/DayNames/1=الاثنين
+FormatData/ar_TN/DayNames/2=الثلاثاء
+FormatData/ar_TN/DayNames/3=الأربعاء
+FormatData/ar_TN/DayNames/4=الخميس
+FormatData/ar_TN/DayNames/5=الجمعة
+FormatData/ar_TN/DayNames/6=السبت
+FormatData/ar_TN/MonthAbbreviations/0=جانفي
+FormatData/ar_TN/MonthAbbreviations/1=فيفري
+FormatData/ar_TN/MonthAbbreviations/2=مارس
+FormatData/ar_TN/MonthAbbreviations/3=أفريل
+FormatData/ar_TN/MonthAbbreviations/4=ماي
+FormatData/ar_TN/MonthAbbreviations/5=جوان
+FormatData/ar_TN/MonthAbbreviations/6=جويلية
+FormatData/ar_TN/MonthAbbreviations/7=أوت
+FormatData/ar_TN/MonthAbbreviations/8=سبتمبر
+FormatData/ar_TN/MonthAbbreviations/9=أكتوبر
+FormatData/ar_TN/MonthAbbreviations/10=نوفمبر
+FormatData/ar_TN/MonthAbbreviations/11=ديسمبر
 FormatData/ar_TN/MonthAbbreviations/12=
-FormatData/ar_TN/Eras/0=\u0642.\u0645
-FormatData/ar_TN/Eras/1=\u0645
-FormatData/ar_TN/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_TN/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_TN/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_TN/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_TN/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_TN/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_TN/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_TN/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_TN/MonthNames/0=\u062c\u0627\u0646\u0641\u064a
-FormatData/ar_TN/MonthNames/1=\u0641\u064a\u0641\u0631\u064a
-FormatData/ar_TN/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_TN/MonthNames/3=\u0623\u0641\u0631\u064a\u0644
-FormatData/ar_TN/MonthNames/4=\u0645\u0627\u064a
-FormatData/ar_TN/MonthNames/5=\u062c\u0648\u0627\u0646
-FormatData/ar_TN/MonthNames/6=\u062c\u0648\u064a\u0644\u064a\u0629
-FormatData/ar_TN/MonthNames/7=\u0623\u0648\u062a
-FormatData/ar_TN/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_TN/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_TN/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_TN/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_TN/Eras/0=ق.م
+FormatData/ar_TN/Eras/1=م
+FormatData/ar_TN/DayAbbreviations/0=الأحد
+FormatData/ar_TN/DayAbbreviations/1=الاثنين
+FormatData/ar_TN/DayAbbreviations/2=الثلاثاء
+FormatData/ar_TN/DayAbbreviations/3=الأربعاء
+FormatData/ar_TN/DayAbbreviations/4=الخميس
+FormatData/ar_TN/DayAbbreviations/5=الجمعة
+FormatData/ar_TN/DayAbbreviations/6=السبت
+LocaleNames/ar_TN/ar=العربية
+FormatData/ar_TN/MonthNames/0=جانفي
+FormatData/ar_TN/MonthNames/1=فيفري
+FormatData/ar_TN/MonthNames/2=مارس
+FormatData/ar_TN/MonthNames/3=أفريل
+FormatData/ar_TN/MonthNames/4=ماي
+FormatData/ar_TN/MonthNames/5=جوان
+FormatData/ar_TN/MonthNames/6=جويلية
+FormatData/ar_TN/MonthNames/7=أوت
+FormatData/ar_TN/MonthNames/8=سبتمبر
+FormatData/ar_TN/MonthNames/9=أكتوبر
+FormatData/ar_TN/MonthNames/10=نوفمبر
+FormatData/ar_TN/MonthNames/11=ديسمبر
 FormatData/ar_TN/MonthNames/12=
-FormatData/ar_TN/AmPmMarkers/0=\u0635
-FormatData/ar_TN/AmPmMarkers/1=\u0645
+FormatData/ar_TN/AmPmMarkers/0=ص
+FormatData/ar_TN/AmPmMarkers/1=م
 FormatData/ar_TN/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_TN/TimePatterns/1=h:mm:ss a z
 FormatData/ar_TN/TimePatterns/2=h:mm:ss a
 FormatData/ar_TN/TimePatterns/3=h:mm a
-FormatData/ar_TN/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_TN/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_TN/DatePatterns/1=d MMMM y
-FormatData/ar_TN/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_TN/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_TN/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_TN/EG=\u0645\u0635\u0631
-LocaleNames/ar_TN/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_TN/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_TN/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_TN/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_TN/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_TN/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_TN/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_TN/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_TN/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_TN/QA=\u0642\u0637\u0631
-LocaleNames/ar_TN/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_TN/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_TN/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_TN/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_TN/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_TN/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_TN/arab.NumberElements/0=\u066b
-FormatData/ar_TN/arab.NumberElements/1=\u066c
-FormatData/ar_TN/arab.NumberElements/2=\u061b
-FormatData/ar_TN/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_TN/arab.NumberElements/4=\u0660
+FormatData/ar_TN/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_TN/DatePatterns/3=d‏/M‏/y
+FormatData/ar_TN/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_TN/EG=مصر
+LocaleNames/ar_TN/DZ=الجزائر
+LocaleNames/ar_TN/BH=البحرين
+LocaleNames/ar_TN/IQ=العراق
+LocaleNames/ar_TN/JO=الأردن
+LocaleNames/ar_TN/KW=الكويت
+LocaleNames/ar_TN/LB=لبنان
+LocaleNames/ar_TN/LY=ليبيا
+LocaleNames/ar_TN/MA=المغرب
+LocaleNames/ar_TN/OM=عُمان
+LocaleNames/ar_TN/QA=قطر
+LocaleNames/ar_TN/SA=المملكة العربية السعودية
+LocaleNames/ar_TN/SD=السودان
+LocaleNames/ar_TN/SY=سوريا
+LocaleNames/ar_TN/TN=تونس
+LocaleNames/ar_TN/AE=الإمارات العربية المتحدة
+LocaleNames/ar_TN/YE=اليمن
+FormatData/ar_TN/arab.NumberElements/0=٫
+FormatData/ar_TN/arab.NumberElements/1=٬
+FormatData/ar_TN/arab.NumberElements/2=؛
+FormatData/ar_TN/arab.NumberElements/3=٪؜
+FormatData/ar_TN/arab.NumberElements/4=٠
 FormatData/ar_TN/arab.NumberElements/5=#
-FormatData/ar_TN/arab.NumberElements/6=\u061c-
-FormatData/ar_TN/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_TN/arab.NumberElements/8=\u0609
-FormatData/ar_TN/arab.NumberElements/9=\u221e
-FormatData/ar_TN/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
-CurrencyNames/ar_YE/YER=\u0631.\u064a.\u200f
+FormatData/ar_TN/arab.NumberElements/6=؜-
+FormatData/ar_TN/arab.NumberElements/7=أس
+FormatData/ar_TN/arab.NumberElements/8=؉
+FormatData/ar_TN/arab.NumberElements/9=∞
+FormatData/ar_TN/arab.NumberElements/10=ليس رقمًا
+CurrencyNames/ar_YE/YER=ر.ي.‏
 FormatData/ar_YE/arab.NumberPatterns/0=#,##0.###
-# FormatData/ar_YE/NumberPatterns/1='\u0631.\u064a.\u200f' #,##0.###;'\u0631.\u064a.\u200f' #,##0.###- # Changed; see bug 4122840
+# FormatData/ar_YE/NumberPatterns/1='ر.ي.‏' #,##0.###;'ر.ي.‏' #,##0.###- # Changed; see bug 4122840
 FormatData/ar_YE/arab.NumberPatterns/2=#,##0%
-FormatData/ar_YE/DayNames/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_YE/DayNames/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_YE/DayNames/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_YE/DayNames/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_YE/DayNames/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_YE/DayNames/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_YE/DayNames/6=\u0627\u0644\u0633\u0628\u062a
-FormatData/ar_YE/MonthAbbreviations/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_YE/MonthAbbreviations/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_YE/MonthAbbreviations/2=\u0645\u0627\u0631\u0633
-FormatData/ar_YE/MonthAbbreviations/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_YE/MonthAbbreviations/4=\u0645\u0627\u064a\u0648
-FormatData/ar_YE/MonthAbbreviations/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_YE/MonthAbbreviations/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_YE/MonthAbbreviations/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_YE/MonthAbbreviations/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_YE/MonthAbbreviations/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_YE/MonthAbbreviations/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_YE/MonthAbbreviations/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_YE/DayNames/0=الأحد
+FormatData/ar_YE/DayNames/1=الاثنين
+FormatData/ar_YE/DayNames/2=الثلاثاء
+FormatData/ar_YE/DayNames/3=الأربعاء
+FormatData/ar_YE/DayNames/4=الخميس
+FormatData/ar_YE/DayNames/5=الجمعة
+FormatData/ar_YE/DayNames/6=السبت
+FormatData/ar_YE/MonthAbbreviations/0=يناير
+FormatData/ar_YE/MonthAbbreviations/1=فبراير
+FormatData/ar_YE/MonthAbbreviations/2=مارس
+FormatData/ar_YE/MonthAbbreviations/3=أبريل
+FormatData/ar_YE/MonthAbbreviations/4=مايو
+FormatData/ar_YE/MonthAbbreviations/5=يونيو
+FormatData/ar_YE/MonthAbbreviations/6=يوليو
+FormatData/ar_YE/MonthAbbreviations/7=أغسطس
+FormatData/ar_YE/MonthAbbreviations/8=سبتمبر
+FormatData/ar_YE/MonthAbbreviations/9=أكتوبر
+FormatData/ar_YE/MonthAbbreviations/10=نوفمبر
+FormatData/ar_YE/MonthAbbreviations/11=ديسمبر
 FormatData/ar_YE/MonthAbbreviations/12=
-FormatData/ar_YE/Eras/0=\u0642.\u0645
-FormatData/ar_YE/Eras/1=\u0645
-FormatData/ar_YE/DayAbbreviations/0=\u0627\u0644\u0623\u062d\u062f
-FormatData/ar_YE/DayAbbreviations/1=\u0627\u0644\u0627\u062b\u0646\u064a\u0646
-FormatData/ar_YE/DayAbbreviations/2=\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621
-FormatData/ar_YE/DayAbbreviations/3=\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621
-FormatData/ar_YE/DayAbbreviations/4=\u0627\u0644\u062e\u0645\u064a\u0633
-FormatData/ar_YE/DayAbbreviations/5=\u0627\u0644\u062c\u0645\u0639\u0629
-FormatData/ar_YE/DayAbbreviations/6=\u0627\u0644\u0633\u0628\u062a
-LocaleNames/ar_YE/ar=\u0627\u0644\u0639\u0631\u0628\u064a\u0629
-FormatData/ar_YE/MonthNames/0=\u064a\u0646\u0627\u064a\u0631
-FormatData/ar_YE/MonthNames/1=\u0641\u0628\u0631\u0627\u064a\u0631
-FormatData/ar_YE/MonthNames/2=\u0645\u0627\u0631\u0633
-FormatData/ar_YE/MonthNames/3=\u0623\u0628\u0631\u064a\u0644
-FormatData/ar_YE/MonthNames/4=\u0645\u0627\u064a\u0648
-FormatData/ar_YE/MonthNames/5=\u064a\u0648\u0646\u064a\u0648
-FormatData/ar_YE/MonthNames/6=\u064a\u0648\u0644\u064a\u0648
-FormatData/ar_YE/MonthNames/7=\u0623\u063a\u0633\u0637\u0633
-FormatData/ar_YE/MonthNames/8=\u0633\u0628\u062a\u0645\u0628\u0631
-FormatData/ar_YE/MonthNames/9=\u0623\u0643\u062a\u0648\u0628\u0631
-FormatData/ar_YE/MonthNames/10=\u0646\u0648\u0641\u0645\u0628\u0631
-FormatData/ar_YE/MonthNames/11=\u062f\u064a\u0633\u0645\u0628\u0631
+FormatData/ar_YE/Eras/0=ق.م
+FormatData/ar_YE/Eras/1=م
+FormatData/ar_YE/DayAbbreviations/0=الأحد
+FormatData/ar_YE/DayAbbreviations/1=الاثنين
+FormatData/ar_YE/DayAbbreviations/2=الثلاثاء
+FormatData/ar_YE/DayAbbreviations/3=الأربعاء
+FormatData/ar_YE/DayAbbreviations/4=الخميس
+FormatData/ar_YE/DayAbbreviations/5=الجمعة
+FormatData/ar_YE/DayAbbreviations/6=السبت
+LocaleNames/ar_YE/ar=العربية
+FormatData/ar_YE/MonthNames/0=يناير
+FormatData/ar_YE/MonthNames/1=فبراير
+FormatData/ar_YE/MonthNames/2=مارس
+FormatData/ar_YE/MonthNames/3=أبريل
+FormatData/ar_YE/MonthNames/4=مايو
+FormatData/ar_YE/MonthNames/5=يونيو
+FormatData/ar_YE/MonthNames/6=يوليو
+FormatData/ar_YE/MonthNames/7=أغسطس
+FormatData/ar_YE/MonthNames/8=سبتمبر
+FormatData/ar_YE/MonthNames/9=أكتوبر
+FormatData/ar_YE/MonthNames/10=نوفمبر
+FormatData/ar_YE/MonthNames/11=ديسمبر
 FormatData/ar_YE/MonthNames/12=
-FormatData/ar_YE/AmPmMarkers/0=\u0635
-FormatData/ar_YE/AmPmMarkers/1=\u0645
+FormatData/ar_YE/AmPmMarkers/0=ص
+FormatData/ar_YE/AmPmMarkers/1=م
 FormatData/ar_YE/TimePatterns/0=h:mm:ss a zzzz
 FormatData/ar_YE/TimePatterns/1=h:mm:ss a z
 FormatData/ar_YE/TimePatterns/2=h:mm:ss a
 FormatData/ar_YE/TimePatterns/3=h:mm a
-FormatData/ar_YE/DatePatterns/0=EEEE\u060c d MMMM y
+FormatData/ar_YE/DatePatterns/0=EEEE، d MMMM y
 FormatData/ar_YE/DatePatterns/1=d MMMM y
-FormatData/ar_YE/DatePatterns/2=dd\u200f/MM\u200f/y
-FormatData/ar_YE/DatePatterns/3=d\u200f/M\u200f/y
-FormatData/ar_YE/DateTimePatterns/0={1}\u060c {0}
-LocaleNames/ar_YE/EG=\u0645\u0635\u0631
-LocaleNames/ar_YE/DZ=\u0627\u0644\u062c\u0632\u0627\u0626\u0631
-LocaleNames/ar_YE/BH=\u0627\u0644\u0628\u062d\u0631\u064a\u0646
-LocaleNames/ar_YE/IQ=\u0627\u0644\u0639\u0631\u0627\u0642
-LocaleNames/ar_YE/JO=\u0627\u0644\u0623\u0631\u062f\u0646
-LocaleNames/ar_YE/KW=\u0627\u0644\u0643\u0648\u064a\u062a
-LocaleNames/ar_YE/LB=\u0644\u0628\u0646\u0627\u0646
-LocaleNames/ar_YE/LY=\u0644\u064a\u0628\u064a\u0627
-LocaleNames/ar_YE/MA=\u0627\u0644\u0645\u063a\u0631\u0628
-LocaleNames/ar_YE/OM=\u0639\u064f\u0645\u0627\u0646
-LocaleNames/ar_YE/QA=\u0642\u0637\u0631
-LocaleNames/ar_YE/SA=\u0627\u0644\u0645\u0645\u0644\u0643\u0629 \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629
-LocaleNames/ar_YE/SD=\u0627\u0644\u0633\u0648\u062f\u0627\u0646
-LocaleNames/ar_YE/SY=\u0633\u0648\u0631\u064a\u0627
-LocaleNames/ar_YE/TN=\u062a\u0648\u0646\u0633
-LocaleNames/ar_YE/AE=\u0627\u0644\u0625\u0645\u0627\u0631\u0627\u062a \u0627\u0644\u0639\u0631\u0628\u064a\u0629 \u0627\u0644\u0645\u062a\u062d\u062f\u0629
-LocaleNames/ar_YE/YE=\u0627\u0644\u064a\u0645\u0646
-FormatData/ar_YE/arab.NumberElements/0=\u066b
-FormatData/ar_YE/arab.NumberElements/1=\u066c
-FormatData/ar_YE/arab.NumberElements/2=\u061b
-FormatData/ar_YE/arab.NumberElements/3=\u066a\u061c
-FormatData/ar_YE/arab.NumberElements/4=\u0660
+FormatData/ar_YE/DatePatterns/2=dd‏/MM‏/y
+FormatData/ar_YE/DatePatterns/3=d‏/M‏/y
+FormatData/ar_YE/DateTimePatterns/0={1}، {0}
+LocaleNames/ar_YE/EG=مصر
+LocaleNames/ar_YE/DZ=الجزائر
+LocaleNames/ar_YE/BH=البحرين
+LocaleNames/ar_YE/IQ=العراق
+LocaleNames/ar_YE/JO=الأردن
+LocaleNames/ar_YE/KW=الكويت
+LocaleNames/ar_YE/LB=لبنان
+LocaleNames/ar_YE/LY=ليبيا
+LocaleNames/ar_YE/MA=المغرب
+LocaleNames/ar_YE/OM=عُمان
+LocaleNames/ar_YE/QA=قطر
+LocaleNames/ar_YE/SA=المملكة العربية السعودية
+LocaleNames/ar_YE/SD=السودان
+LocaleNames/ar_YE/SY=سوريا
+LocaleNames/ar_YE/TN=تونس
+LocaleNames/ar_YE/AE=الإمارات العربية المتحدة
+LocaleNames/ar_YE/YE=اليمن
+FormatData/ar_YE/arab.NumberElements/0=٫
+FormatData/ar_YE/arab.NumberElements/1=٬
+FormatData/ar_YE/arab.NumberElements/2=؛
+FormatData/ar_YE/arab.NumberElements/3=٪؜
+FormatData/ar_YE/arab.NumberElements/4=٠
 FormatData/ar_YE/arab.NumberElements/5=#
-FormatData/ar_YE/arab.NumberElements/6=\u061c-
-FormatData/ar_YE/arab.NumberElements/7=\u0623\u0633
-FormatData/ar_YE/arab.NumberElements/8=\u0609
-FormatData/ar_YE/arab.NumberElements/9=\u221e
-FormatData/ar_YE/arab.NumberElements/10=\u0644\u064a\u0633\u00a0\u0631\u0642\u0645\u064b\u0627
+FormatData/ar_YE/arab.NumberElements/6=؜-
+FormatData/ar_YE/arab.NumberElements/7=أس
+FormatData/ar_YE/arab.NumberElements/8=؉
+FormatData/ar_YE/arab.NumberElements/9=∞
+FormatData/ar_YE/arab.NumberElements/10=ليس رقمًا
 
 # bug #4113654 (this is obviously not an exhaustive test; I'm trying it here for a single
 # inheritance chain only.  This bug fix also gets tested fairly well by the tests for all
 # the other bugs as given above)
 FormatData//latn.NumberPatterns/0=#,##0.###
-# FormatData//NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00 # Changed; see bug 4122840
+# FormatData//NumberPatterns/1=¤ #,##0.00;-¤ #,##0.00 # Changed; see bug 4122840
 FormatData//latn.NumberPatterns/2=#,##0%
 FormatData/fr/latn.NumberPatterns/0=#,##0.###
-# FormatData/fr/NumberPatterns/1=\u00a4 #,##0.00;-\u00a4 #,##0.00 # Changed; see bug 4122840
+# FormatData/fr/NumberPatterns/1=¤ #,##0.00;-¤ #,##0.00 # Changed; see bug 4122840
 # FormatData/fr/NumberPatterns/2=#,##0% # changed, see bug 6547501
 CurrencyNames/fr_FR/FRF=F
-CurrencyNames/fr_FR/EUR=\u20ac
+CurrencyNames/fr_FR/EUR=€
 FormatData/fr_FR/latn.NumberPatterns/0=#,##0.###
 # FormatData/fr_FR/NumberPatterns/1=#,##0.00 F;-#,##0.00 F # Changed; see bug 4122840
 # FormatData/fr_FR/NumberPatterns/2=#,##0% # changed; see bug 6547501
@@ -2207,19 +2207,19 @@ FormatData/fr_FR/DayNames/4=jeudi
 FormatData/fr_FR/DayNames/5=vendredi
 FormatData/fr_FR/DayNames/6=samedi
 FormatData/fr_FR/MonthNames/0=janvier
-FormatData/fr_FR/MonthNames/1=f\u00e9vrier
+FormatData/fr_FR/MonthNames/1=février
 FormatData/fr_FR/MonthNames/2=mars
 FormatData/fr_FR/MonthNames/3=avril
 FormatData/fr_FR/MonthNames/4=mai
 FormatData/fr_FR/MonthNames/5=juin
 FormatData/fr_FR/MonthNames/6=juillet
-FormatData/fr_FR/MonthNames/7=ao\u00fbt
+FormatData/fr_FR/MonthNames/7=août
 FormatData/fr_FR/MonthNames/8=septembre
 FormatData/fr_FR/MonthNames/9=octobre
 FormatData/fr_FR/MonthNames/10=novembre
-FormatData/fr_FR/MonthNames/11=d\u00e9cembre
+FormatData/fr_FR/MonthNames/11=décembre
 FormatData/fr_FR/MonthNames/12=
-LocaleNames/fr_FR/fr=fran\u00e7ais
+LocaleNames/fr_FR/fr=français
 LocaleNames/fr_FR/en=anglais
 LocaleNames/fr_FR/de=allemand
 LocaleNames/fr_FR/da=danois
@@ -2229,10 +2229,10 @@ LocaleNames/fr_FR/fi=finnois
 LocaleNames/fr_FR/it=italien
 LocaleNames/fr_FR/ja=japonais
 #bug 4965260
-LocaleNames/fr_FR/nl=n\u00e9erlandais
-LocaleNames/fr_FR/no=norv\u00e9gien
+LocaleNames/fr_FR/nl=néerlandais
+LocaleNames/fr_FR/no=norvégien
 LocaleNames/fr_FR/pt=portugais
-LocaleNames/fr_FR/sv=su\u00e9dois
+LocaleNames/fr_FR/sv=suédois
 LocaleNames/fr_FR/tr=turc
 FormatData/fr_FR/TimePatterns/0=HH:mm:ss zzzz
 FormatData/fr_FR/TimePatterns/1=HH:mm:ss z
@@ -2244,24 +2244,24 @@ FormatData/fr_FR/DatePatterns/2=d MMM y
 FormatData/fr_FR/DatePatterns/3=dd/MM/y
 FormatData/fr_FR/DateTimePatterns/0={1}, {0}
 FormatData/fr_FR/latn.NumberElements/0=,
-FormatData/fr_FR/latn.NumberElements/1=\u202f
+FormatData/fr_FR/latn.NumberElements/1= 
 FormatData/fr_FR/latn.NumberElements/2=;
 FormatData/fr_FR/latn.NumberElements/3=%
 FormatData/fr_FR/latn.NumberElements/4=0
 FormatData/fr_FR/latn.NumberElements/5=#
 FormatData/fr_FR/latn.NumberElements/6=-
 FormatData/fr_FR/latn.NumberElements/7=E
-FormatData/fr_FR/latn.NumberElements/8=\u2030
-FormatData/fr_FR/latn.NumberElements/9=\u221e
+FormatData/fr_FR/latn.NumberElements/8=‰
+FormatData/fr_FR/latn.NumberElements/9=∞
 FormatData/fr_FR/latn.NumberElements/10=NaN
 FormatData/fr_FR/Eras/0=av. J.-C.
 FormatData/fr_FR/Eras/1=ap. J.-C.
 LocaleNames/fr_FR/FR=France
-LocaleNames/fr_FR/US=\u00c9tats-Unis
+LocaleNames/fr_FR/US=États-Unis
 LocaleNames/fr_FR/DK=Danemark
 LocaleNames/fr_FR/DE=Allemagne
 LocaleNames/fr_FR/AT=Autriche
-LocaleNames/fr_FR/GR=Gr\u00e8ce
+LocaleNames/fr_FR/GR=Grèce
 LocaleNames/fr_FR/ES=Espagne
 LocaleNames/fr_FR/FI=Finlande
 LocaleNames/fr_FR/IT=Italie
@@ -2270,9 +2270,9 @@ LocaleNames/fr_FR/BE=Belgique
 LocaleNames/fr_FR/CA=Canada
 LocaleNames/fr_FR/JP=Japon
 LocaleNames/fr_FR/NL=Pays-Bas
-LocaleNames/fr_FR/NO=Norv\u00e8ge
+LocaleNames/fr_FR/NO=Norvège
 LocaleNames/fr_FR/PT=Portugal
-LocaleNames/fr_FR/SE=Su\u00e8de
+LocaleNames/fr_FR/SE=Suède
 LocaleNames/fr_FR/TR=Turquie
 FormatData/fr_FR/DayAbbreviations/0=dim.
 FormatData/fr_FR/DayAbbreviations/1=lun.
@@ -2282,132 +2282,132 @@ FormatData/fr_FR/DayAbbreviations/4=jeu.
 FormatData/fr_FR/DayAbbreviations/5=ven.
 FormatData/fr_FR/DayAbbreviations/6=sam.
 FormatData/fr_FR/MonthAbbreviations/0=janv.
-FormatData/fr_FR/MonthAbbreviations/1=f\u00e9vr.
+FormatData/fr_FR/MonthAbbreviations/1=févr.
 FormatData/fr_FR/MonthAbbreviations/2=mars
 FormatData/fr_FR/MonthAbbreviations/3=avr.
 FormatData/fr_FR/MonthAbbreviations/4=mai
 FormatData/fr_FR/MonthAbbreviations/5=juin
 FormatData/fr_FR/MonthAbbreviations/6=juil.
-FormatData/fr_FR/MonthAbbreviations/7=ao\u00fbt
+FormatData/fr_FR/MonthAbbreviations/7=août
 FormatData/fr_FR/MonthAbbreviations/8=sept.
 FormatData/fr_FR/MonthAbbreviations/9=oct.
 FormatData/fr_FR/MonthAbbreviations/10=nov.
-FormatData/fr_FR/MonthAbbreviations/11=d\u00e9c.
+FormatData/fr_FR/MonthAbbreviations/11=déc.
 FormatData/fr_FR/MonthAbbreviations/12=
 FormatData/fr_FR/AmPmMarkers/0=AM
 FormatData/fr_FR/AmPmMarkers/1=PM
 
 # bug #4117054
-FormatData/ja_JP/AmPmMarkers/0=\u5348\u524d
-FormatData/ja_JP/AmPmMarkers/1=\u5348\u5f8c
+FormatData/ja_JP/AmPmMarkers/0=午前
+FormatData/ja_JP/AmPmMarkers/1=午後
 
 # bug #4122840, 4290801
-FormatData/ar_AE/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_BH/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_DZ/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_EG/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_IQ/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_JO/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_KW/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_LB/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_LY/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_MA/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_OM/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_QA/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_SA/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_SD/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_SY/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_TN/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/ar_YE/arab.NumberPatterns/1=\u200f#,##0.00\u00a0\u00a4
-FormatData/en_AU/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/en_NZ/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/en_ZA/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_AR/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00
-FormatData/es_BO/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_CL/latn.NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_CO/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00
-FormatData/es_CR/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_DO/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_EC/latn.NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/es_GT/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_HN/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_MX/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_NI/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_PA/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_PE/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00
-FormatData/es_PR/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_PY/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00;\u00a4\u00a0-#,##0.00
-FormatData/es_SV/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/es_UY/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00
-FormatData/es_VE/latn.NumberPatterns/1=\u00a4#,##0.00;\u00a4-#,##0.00
-FormatData/fr_FR/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-FormatData/it_IT/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-#FormatData/ja_JP/NumberPatterns/1=\u00a4#,##0.00  #see bug 4175306
-FormatData/ko_KR/latn.NumberPatterns/1=\u00a4#,##0.00
-FormatData/pl_PL/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-FormatData/pt_BR/latn.NumberPatterns/1=\u00a4\u00a0#,##0.00
+FormatData/ar_AE/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_BH/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_DZ/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_EG/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_IQ/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_JO/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_KW/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_LB/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_LY/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_MA/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_OM/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_QA/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_SA/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_SD/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_SY/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_TN/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/ar_YE/arab.NumberPatterns/1=‏#,##0.00 ¤
+FormatData/en_AU/latn.NumberPatterns/1=¤#,##0.00
+FormatData/en_NZ/latn.NumberPatterns/1=¤#,##0.00
+FormatData/en_ZA/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_AR/latn.NumberPatterns/1=¤ #,##0.00
+FormatData/es_BO/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_CL/latn.NumberPatterns/1=¤#,##0.00;¤-#,##0.00
+FormatData/es_CO/latn.NumberPatterns/1=¤ #,##0.00
+FormatData/es_CR/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_DO/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_EC/latn.NumberPatterns/1=¤#,##0.00;¤-#,##0.00
+FormatData/es_GT/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_HN/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_MX/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_NI/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_PA/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_PE/latn.NumberPatterns/1=¤ #,##0.00
+FormatData/es_PR/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_PY/latn.NumberPatterns/1=¤ #,##0.00;¤ -#,##0.00
+FormatData/es_SV/latn.NumberPatterns/1=¤#,##0.00
+FormatData/es_UY/latn.NumberPatterns/1=¤ #,##0.00
+FormatData/es_VE/latn.NumberPatterns/1=¤#,##0.00;¤-#,##0.00
+FormatData/fr_FR/latn.NumberPatterns/1=#,##0.00 ¤
+FormatData/it_IT/latn.NumberPatterns/1=#,##0.00 ¤
+#FormatData/ja_JP/NumberPatterns/1=¤#,##0.00  #see bug 4175306
+FormatData/ko_KR/latn.NumberPatterns/1=¤#,##0.00
+FormatData/pl_PL/latn.NumberPatterns/1=#,##0.00 ¤
+FormatData/pt_BR/latn.NumberPatterns/1=¤ #,##0.00
 #Changed; see 4936845
-FormatData/ru_RU/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-FormatData/uk_UA/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
+FormatData/ru_RU/latn.NumberPatterns/1=#,##0.00 ¤
+FormatData/uk_UA/latn.NumberPatterns/1=#,##0.00 ¤
 
 # bug #4139860
 FormatData/cs/DatePatterns/0=EEEE d. MMMM y
 FormatData/cs/DatePatterns/1=d. MMMM y
 FormatData/cs/DatePatterns/2=d. M. y
 FormatData/cs/DatePatterns/3=dd.MM.yy
-FormatData/cs/latn.NumberElements/1=\u00a0
+FormatData/cs/latn.NumberElements/1= 
 FormatData/cs_CZ/latn.NumberPatterns/0=#,##0.###
-FormatData/cs_CZ/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-FormatData/cs_CZ/latn.NumberPatterns/2=#,##0\u00a0%
+FormatData/cs_CZ/latn.NumberPatterns/1=#,##0.00 ¤
+FormatData/cs_CZ/latn.NumberPatterns/2=#,##0 %
 
 #bug #4135752
-FormatData/th_TH/latn.NumberPatterns/1=\u00a4#,##0.00
-CurrencyNames/th_TH/THB=\u0e3f
+FormatData/th_TH/latn.NumberPatterns/1=¤#,##0.00
+CurrencyNames/th_TH/THB=฿
 
 #bug #4153698
 # TimeZoneNames/zh_HK/zoneStrings/0/1=Hong Kong Standard Time # changed, see bug 4261506
 # TimeZoneNames/zh_HK/zoneStrings/0/2=HKST # changed, see bug 4261506
-LocaleNames/zh/HK=\u4e2d\u56fd\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a
-FormatData/zh_HK/MonthNames/0=1\u6708
-FormatData/zh_HK/MonthNames/1=2\u6708
-FormatData/zh_HK/MonthNames/2=3\u6708
-FormatData/zh_HK/MonthNames/3=4\u6708
-FormatData/zh_HK/MonthAbbreviations/0=1\u6708
-FormatData/zh_HK/MonthAbbreviations/1=2\u6708
-FormatData/zh_HK/MonthAbbreviations/2=3\u6708
-FormatData/zh_HK/MonthAbbreviations/3=4\u6708
-FormatData/zh_HK/DayNames/0=\u661f\u671f\u65e5
-FormatData/zh_HK/DayNames/1=\u661f\u671f\u4e00
-FormatData/zh_HK/DayNames/2=\u661f\u671f\u4e8c
-FormatData/zh_HK/DayAbbreviations/0=\u9031\u65e5
-FormatData/zh_HK/DayAbbreviations/1=\u9031\u4e00
-FormatData/zh_HK/DayAbbreviations/2=\u9031\u4e8c
-FormatData/zh_HK/latn.NumberPatterns/1=\u00a4#,##0.00
+LocaleNames/zh/HK=中国香港特别行政区
+FormatData/zh_HK/MonthNames/0=1月
+FormatData/zh_HK/MonthNames/1=2月
+FormatData/zh_HK/MonthNames/2=3月
+FormatData/zh_HK/MonthNames/3=4月
+FormatData/zh_HK/MonthAbbreviations/0=1月
+FormatData/zh_HK/MonthAbbreviations/1=2月
+FormatData/zh_HK/MonthAbbreviations/2=3月
+FormatData/zh_HK/MonthAbbreviations/3=4月
+FormatData/zh_HK/DayNames/0=星期日
+FormatData/zh_HK/DayNames/1=星期一
+FormatData/zh_HK/DayNames/2=星期二
+FormatData/zh_HK/DayAbbreviations/0=週日
+FormatData/zh_HK/DayAbbreviations/1=週一
+FormatData/zh_HK/DayAbbreviations/2=週二
+FormatData/zh_HK/latn.NumberPatterns/1=¤#,##0.00
 CurrencyNames/zh_HK/HKD=HK$
 FormatData/zh_HK/TimePatterns/0=ah:mm:ss [zzzz]
 FormatData/zh_HK/TimePatterns/1=ah:mm:ss [z]
 FormatData/zh_HK/TimePatterns/2=ah:mm:ss
 FormatData/zh_HK/TimePatterns/3=ah:mm
-FormatData/zh_HK/DatePatterns/0=y\u5e74M\u6708d\u65e5EEEE
-FormatData/zh_HK/DatePatterns/1=y\u5e74M\u6708d\u65e5
-FormatData/zh_HK/DatePatterns/2=y\u5e74M\u6708d\u65e5
+FormatData/zh_HK/DatePatterns/0=y年M月d日EEEE
+FormatData/zh_HK/DatePatterns/1=y年M月d日
+FormatData/zh_HK/DatePatterns/2=y年M月d日
 FormatData/zh_HK/DatePatterns/3=d/M/y
 FormatData/zh_HK/DateTimePatterns/0={1} {0}
 
 #bug #4149569
-LocaleNames/tr/TR=T\u00fcrkiye
+LocaleNames/tr/TR=Türkiye
 
 #bug 4175306
-FormatData/es_ES/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
-FormatData/ja_JP/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/es_ES/latn.NumberPatterns/1=#,##0.00 ¤
+FormatData/ja_JP/latn.NumberPatterns/1=¤#,##0.00
 
 #bug #4215747 - commented out by mfang due to 4900884
-#FormatData/ko/TimePatterns/0=a h'\uc2dc' m'\ubd84' s'\ucd08' z
-#FormatData/ko/TimePatterns/1=a h'\uc2dc' m'\ubd84' s'\ucd08'
+#FormatData/ko/TimePatterns/0=a h'시' m'분' s'초' z
+#FormatData/ko/TimePatterns/1=a h'시' m'분' s'초'
 
 #bug 4900884
-FormatData/ko/TimePatterns/0=a h\uc2dc m\ubd84 s\ucd08 zzzz
-FormatData/ko/TimePatterns/1=a h\uc2dc m\ubd84 s\ucd08 z
+FormatData/ko/TimePatterns/0=a h시 m분 s초 zzzz
+FormatData/ko/TimePatterns/1=a h시 m분 s초 z
 FormatData/ko/TimePatterns/2=a h:mm:ss
 FormatData/ko/TimePatterns/3=a h:mm
 
@@ -2415,111 +2415,111 @@ FormatData/ko/TimePatterns/3=a h:mm
 LocaleNames/es/SV=El Salvador
 
 #bug nobugid, 4290801, 4942982
-CurrencyNames/ru_RU/RUB=\u20bd
+CurrencyNames/ru_RU/RUB=₽
 
 #bug 4826794
-LocaleNames/ru_RU/MM=\u041c\u044c\u044f\u043d\u043c\u0430 (\u0411\u0438\u0440\u043c\u0430)
+LocaleNames/ru_RU/MM=Мьянма (Бирма)
 
 #bug 4945388
-CurrencyNames/bg_BG/BGN=\u043b\u0432.
+CurrencyNames/bg_BG/BGN=лв.
 
 #bug 4794068
 FormatData/ca_ES/latn.NumberPatterns/0=#,##0.###
 
 #bug 5032580
-FormatData/sk/DayNames/0=nede\u013ea
+FormatData/sk/DayNames/0=nedeľa
 FormatData/sk/DayAbbreviations/5=pi
 
 #bug 5074431
-FormatData/bg/DayNames/4=\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a
+FormatData/bg/DayNames/4=четвъртък
 
 #bug 2121133
-FormatData/sv/latn.NumberElements/1=\u00a0
+FormatData/sv/latn.NumberElements/1= 
 
 #bug 6208712
-LocaleNames/zh/tw=\u5951\u7ef4\u8bed
+LocaleNames/zh/tw=契维语
 
 #bug 6277696
 #zh_SG, id, id_ID, en_MT, mt_MT, en_PH, el, el_CY, ms, ms_MY
 #zh_SG
-FormatData/zh_SG/DayAbbreviations/0=\u5468\u65e5
-FormatData/zh_SG/DayAbbreviations/1=\u5468\u4e00
-FormatData/zh_SG/DayAbbreviations/2=\u5468\u4e8c
-FormatData/zh_SG/DayAbbreviations/3=\u5468\u4e09
-FormatData/zh_SG/DayAbbreviations/4=\u5468\u56db
-FormatData/zh_SG/DayAbbreviations/5=\u5468\u4e94
-FormatData/zh_SG/DayAbbreviations/6=\u5468\u516d
+FormatData/zh_SG/DayAbbreviations/0=周日
+FormatData/zh_SG/DayAbbreviations/1=周一
+FormatData/zh_SG/DayAbbreviations/2=周二
+FormatData/zh_SG/DayAbbreviations/3=周三
+FormatData/zh_SG/DayAbbreviations/4=周四
+FormatData/zh_SG/DayAbbreviations/5=周五
+FormatData/zh_SG/DayAbbreviations/6=周六
 FormatData/zh_SG/latn.NumberPatterns/0=#,##0.###
-FormatData/zh_SG/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/zh_SG/latn.NumberPatterns/1=¤#,##0.00
 FormatData/zh_SG/latn.NumberPatterns/2=#,##0%
 CurrencyNames/zh_SG/SGD=$
 FormatData/zh_SG/TimePatterns/0=zzzz ah:mm:ss
 FormatData/zh_SG/TimePatterns/1=z ah:mm:ss
 FormatData/zh_SG/TimePatterns/2=ah:mm:ss
 FormatData/zh_SG/TimePatterns/3=ah:mm
-FormatData/zh_SG/DatePatterns/0=y\u5e74M\u6708d\u65e5EEEE
-FormatData/zh_SG/DatePatterns/1=y\u5e74M\u6708d\u65e5
-FormatData/zh_SG/DatePatterns/2=y\u5e74M\u6708d\u65e5
+FormatData/zh_SG/DatePatterns/0=y年M月d日EEEE
+FormatData/zh_SG/DatePatterns/1=y年M月d日
+FormatData/zh_SG/DatePatterns/2=y年M月d日
 FormatData/zh_SG/DatePatterns/3=dd/MM/yy
 FormatData/zh_SG/DateTimePatterns/0={1} {0}
-LocaleNames/zh_SG/ae=\u963f\u7ef4\u65af\u5854\u8bed
-LocaleNames/zh_SG/ak=\u963f\u80af\u8bed
-LocaleNames/zh_SG/cr=\u514b\u91cc\u8bed
-LocaleNames/zh_SG/cu=\u6559\u4f1a\u65af\u62c9\u592b\u8bed
-LocaleNames/zh_SG/ff=\u5bcc\u62c9\u8bed
-LocaleNames/zh_SG/gv=\u9a6c\u6069\u8bed
-LocaleNames/zh_SG/ig=\u4f0a\u535a\u8bed
-LocaleNames/zh_SG/ii=\u51c9\u5c71\u5f5d\u8bed
-LocaleNames/zh_SG/ko=\u97e9\u8bed
-LocaleNames/zh_SG/kw=\u5eb7\u6c83\u5c14\u8bed
-LocaleNames/zh_SG/lg=\u5362\u5e72\u8fbe\u8bed
-LocaleNames/zh_SG/li=\u6797\u5821\u8bed
-LocaleNames/zh_SG/lu=\u9c81\u5df4\u52a0\u4e39\u52a0\u8bed
-LocaleNames/zh_SG/nd=\u5317\u6069\u5fb7\u8d1d\u52d2\u8bed
-LocaleNames/zh_SG/nr=\u5357\u6069\u5fb7\u8d1d\u52d2\u8bed
-LocaleNames/zh_SG/sc=\u8428\u4e01\u8bed
-LocaleNames/zh_SG/ty=\u5854\u5e0c\u63d0\u8bed
-LocaleNames/zh_SG/AS=\u7f8e\u5c5e\u8428\u6469\u4e9a
-LocaleNames/zh_SG/AU=\u6fb3\u5927\u5229\u4e9a
-LocaleNames/zh_SG/BD=\u5b5f\u52a0\u62c9\u56fd
-LocaleNames/zh_SG/BV=\u5e03\u97e6\u5c9b
-LocaleNames/zh_SG/BZ=\u4f2f\u5229\u5179
-LocaleNames/zh_SG/CZ=\u6377\u514b
-LocaleNames/zh_SG/ER=\u5384\u7acb\u7279\u91cc\u4e9a
-LocaleNames/zh_SG/FK=\u798f\u514b\u5170\u7fa4\u5c9b
-LocaleNames/zh_SG/FM=\u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/GS=\u5357\u4e54\u6cbb\u4e9a\u548c\u5357\u6851\u5a01\u5947\u7fa4\u5c9b
-LocaleNames/zh_SG/GW=\u51e0\u5185\u4e9a\u6bd4\u7ecd
-LocaleNames/zh_SG/HK=\u4e2d\u56fd\u9999\u6e2f\u7279\u522b\u884c\u653f\u533a
-LocaleNames/zh_SG/HM=\u8d6b\u5fb7\u5c9b\u548c\u9ea6\u514b\u5510\u7eb3\u7fa4\u5c9b
-LocaleNames/zh_SG/ID=\u5370\u5ea6\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/KR=\u97e9\u56fd
-LocaleNames/zh_SG/LA=\u8001\u631d
-LocaleNames/zh_SG/MK=\u5317\u9a6c\u5176\u987f
-LocaleNames/zh_SG/MO=\u4e2d\u56fd\u6fb3\u95e8\u7279\u522b\u884c\u653f\u533a
-LocaleNames/zh_SG/MP=\u5317\u9a6c\u91cc\u4e9a\u7eb3\u7fa4\u5c9b
-LocaleNames/zh_SG/NU=\u7ebd\u57c3
-LocaleNames/zh_SG/NZ=\u65b0\u897f\u5170
-LocaleNames/zh_SG/PF=\u6cd5\u5c5e\u6ce2\u5229\u5c3c\u897f\u4e9a
-LocaleNames/zh_SG/PM=\u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686\u7fa4\u5c9b
-LocaleNames/zh_SG/PN=\u76ae\u7279\u51ef\u6069\u7fa4\u5c9b
-LocaleNames/zh_SG/PR=\u6ce2\u591a\u9ece\u5404
-LocaleNames/zh_SG/PS=\u5df4\u52d2\u65af\u5766\u9886\u571f
-LocaleNames/zh_SG/RE=\u7559\u5c3c\u6c6a
-LocaleNames/zh_SG/SA=\u6c99\u7279\u963f\u62c9\u4f2f
-LocaleNames/zh_SG/SH=\u5723\u8d6b\u52d2\u62ff
-LocaleNames/zh_SG/SJ=\u65af\u74e6\u5c14\u5df4\u548c\u626c\u9a6c\u5ef6
-LocaleNames/zh_SG/SL=\u585e\u62c9\u5229\u6602
-LocaleNames/zh_SG/TC=\u7279\u514b\u65af\u548c\u51ef\u79d1\u65af\u7fa4\u5c9b
-LocaleNames/zh_SG/TK=\u6258\u514b\u52b3
-LocaleNames/zh_SG/TW=\u53f0\u6e7e
-LocaleNames/zh_SG/UM=\u7f8e\u56fd\u672c\u571f\u5916\u5c0f\u5c9b\u5c7f
-LocaleNames/zh_SG/WF=\u74e6\u5229\u65af\u548c\u5bcc\u56fe\u7eb3
-LocaleNames/zh_SG/WS=\u8428\u6469\u4e9a
-LocaleNames/zh_SG/YT=\u9a6c\u7ea6\u7279
+LocaleNames/zh_SG/ae=阿维斯塔语
+LocaleNames/zh_SG/ak=阿肯语
+LocaleNames/zh_SG/cr=克里语
+LocaleNames/zh_SG/cu=教会斯拉夫语
+LocaleNames/zh_SG/ff=富拉语
+LocaleNames/zh_SG/gv=马恩语
+LocaleNames/zh_SG/ig=伊博语
+LocaleNames/zh_SG/ii=凉山彝语
+LocaleNames/zh_SG/ko=韩语
+LocaleNames/zh_SG/kw=康沃尔语
+LocaleNames/zh_SG/lg=卢干达语
+LocaleNames/zh_SG/li=林堡语
+LocaleNames/zh_SG/lu=鲁巴加丹加语
+LocaleNames/zh_SG/nd=北恩德贝勒语
+LocaleNames/zh_SG/nr=南恩德贝勒语
+LocaleNames/zh_SG/sc=萨丁语
+LocaleNames/zh_SG/ty=塔希提语
+LocaleNames/zh_SG/AS=美属萨摩亚
+LocaleNames/zh_SG/AU=澳大利亚
+LocaleNames/zh_SG/BD=孟加拉国
+LocaleNames/zh_SG/BV=布韦岛
+LocaleNames/zh_SG/BZ=伯利兹
+LocaleNames/zh_SG/CZ=捷克
+LocaleNames/zh_SG/ER=厄立特里亚
+LocaleNames/zh_SG/FK=福克兰群岛
+LocaleNames/zh_SG/FM=密克罗尼西亚
+LocaleNames/zh_SG/GS=南乔治亚和南桑威奇群岛
+LocaleNames/zh_SG/GW=几内亚比绍
+LocaleNames/zh_SG/HK=中国香港特别行政区
+LocaleNames/zh_SG/HM=赫德岛和麦克唐纳群岛
+LocaleNames/zh_SG/ID=印度尼西亚
+LocaleNames/zh_SG/KR=韩国
+LocaleNames/zh_SG/LA=老挝
+LocaleNames/zh_SG/MK=北马其顿
+LocaleNames/zh_SG/MO=中国澳门特别行政区
+LocaleNames/zh_SG/MP=北马里亚纳群岛
+LocaleNames/zh_SG/NU=纽埃
+LocaleNames/zh_SG/NZ=新西兰
+LocaleNames/zh_SG/PF=法属波利尼西亚
+LocaleNames/zh_SG/PM=圣皮埃尔和密克隆群岛
+LocaleNames/zh_SG/PN=皮特凯恩群岛
+LocaleNames/zh_SG/PR=波多黎各
+LocaleNames/zh_SG/PS=巴勒斯坦领土
+LocaleNames/zh_SG/RE=留尼汪
+LocaleNames/zh_SG/SA=沙特阿拉伯
+LocaleNames/zh_SG/SH=圣赫勒拿
+LocaleNames/zh_SG/SJ=斯瓦尔巴和扬马延
+LocaleNames/zh_SG/SL=塞拉利昂
+LocaleNames/zh_SG/TC=特克斯和凯科斯群岛
+LocaleNames/zh_SG/TK=托克劳
+LocaleNames/zh_SG/TW=台湾
+LocaleNames/zh_SG/UM=美国本土外小岛屿
+LocaleNames/zh_SG/WF=瓦利斯和富图纳
+LocaleNames/zh_SG/WS=萨摩亚
+LocaleNames/zh_SG/YT=马约特
 #en_SG
 FormatData/en_SG/latn.NumberPatterns/0=#,##0.###
-FormatData/en_SG/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/en_SG/latn.NumberPatterns/1=¤#,##0.00
 FormatData/en_SG/latn.NumberPatterns/2=#,##0%
 CurrencyNames/en_SG/SGD=$
 LocaleNames/en_SG/kj=Kuanyama
@@ -2531,14 +2531,14 @@ LocaleNames/en_SG/pa=Punjabi
 LocaleNames/en_SG/rm=Romansh
 LocaleNames/en_SG/to=Tongan
 LocaleNames/en_SG/CC=Cocos (Keeling) Islands
-LocaleNames/en_SG/CI=C\u00f4te d\u2019Ivoire
+LocaleNames/en_SG/CI=Côte d’Ivoire
 LocaleNames/en_SG/GS=South Georgia & South Sandwich Islands
 LocaleNames/en_SG/HM=Heard & McDonald Islands
 LocaleNames/en_SG/KN=St Kitts & Nevis
 LocaleNames/en_SG/PM=St Pierre & Miquelon
 LocaleNames/en_SG/PS=Palestinian Territories
 LocaleNames/en_SG/SJ=Svalbard & Jan Mayen
-LocaleNames/en_SG/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
+LocaleNames/en_SG/ST=São Tomé & Príncipe
 LocaleNames/en_SG/TC=Turks & Caicos Islands
 LocaleNames/en_SG/TL=Timor-Leste
 LocaleNames/en_SG/VC=St Vincent & the Grenadines
@@ -2586,7 +2586,7 @@ FormatData/in/DayAbbreviations/6=Sab
 FormatData/in/Eras/0=SM
 FormatData/in/Eras/1=M
 FormatData/in/latn.NumberPatterns/0=#,##0.###
-FormatData/in/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/in/latn.NumberPatterns/1=¤#,##0.00
 FormatData/in/latn.NumberPatterns/2=#,##0%
 FormatData/in/latn.NumberElements/0=,
 FormatData/in/latn.NumberElements/1=.
@@ -2596,8 +2596,8 @@ FormatData/in/latn.NumberElements/4=0
 FormatData/in/latn.NumberElements/5=#
 FormatData/in/latn.NumberElements/6=-
 FormatData/in/latn.NumberElements/7=E
-FormatData/in/latn.NumberElements/8=\u2030
-FormatData/in/latn.NumberElements/9=\u221e
+FormatData/in/latn.NumberElements/8=‰
+FormatData/in/latn.NumberElements/9=∞
 FormatData/in/latn.NumberElements/10=NaN
 FormatData/in/TimePatterns/0=HH.mm.ss zzzz
 FormatData/in/TimePatterns/1=HH.mm.ss z
@@ -2620,7 +2620,7 @@ FormatData/in_ID/DatePatterns/3=dd/MM/yy
 FormatData/in_ID/DateTimePatterns/0={1} {0}
 #en_MT
 FormatData/en_MT/latn.NumberPatterns/0=#,##0.###
-FormatData/en_MT/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/en_MT/latn.NumberPatterns/1=¤#,##0.00
 FormatData/en_MT/latn.NumberPatterns/2=#,##0%
 FormatData/en_MT/TimePatterns/0=HH:mm:ss zzzz
 FormatData/en_MT/TimePatterns/1=HH:mm:ss z
@@ -2631,7 +2631,7 @@ FormatData/en_MT/DatePatterns/1=dd MMMM y
 FormatData/en_MT/DatePatterns/2=dd MMM y
 FormatData/en_MT/DatePatterns/3=dd/MM/y
 FormatData/en_MT/DateTimePatterns/0={1}, {0}
-CurrencyNames/en_MT/EUR=\u20ac
+CurrencyNames/en_MT/EUR=€
 LocaleNames/en_MT/kj=Kuanyama
 LocaleNames/en_MT/kl=Kalaallisut
 LocaleNames/en_MT/ny=Nyanja
@@ -2641,31 +2641,31 @@ LocaleNames/en_MT/pa=Punjabi
 LocaleNames/en_MT/rm=Romansh
 LocaleNames/en_MT/to=Tongan
 LocaleNames/en_MT/CC=Cocos (Keeling) Islands
-LocaleNames/en_MT/CI=C\u00f4te d\u2019Ivoire
+LocaleNames/en_MT/CI=Côte d’Ivoire
 LocaleNames/en_MT/GS=South Georgia & South Sandwich Islands
 LocaleNames/en_MT/HM=Heard & McDonald Islands
 LocaleNames/en_MT/KN=St Kitts & Nevis
 LocaleNames/en_MT/PM=St Pierre & Miquelon
 LocaleNames/en_MT/PS=Palestinian Territories
 LocaleNames/en_MT/SJ=Svalbard & Jan Mayen
-LocaleNames/en_MT/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
+LocaleNames/en_MT/ST=São Tomé & Príncipe
 LocaleNames/en_MT/TC=Turks & Caicos Islands
 LocaleNames/en_MT/TL=Timor-Leste
 LocaleNames/en_MT/VC=St Vincent & the Grenadines
 LocaleNames/en_MT/WF=Wallis & Futuna
 #mt_MT
 FormatData/mt_MT/latn.NumberPatterns/0=#,##0.###
-FormatData/mt_MT/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/mt_MT/latn.NumberPatterns/1=¤#,##0.00
 FormatData/mt_MT/latn.NumberPatterns/2=#,##0%
-CurrencyNames/mt_MT/EUR=\u20ac
+CurrencyNames/mt_MT/EUR=€
 #en_PH
 FormatData/en_PH/latn.NumberPatterns/0=#,##0.###
-FormatData/en_PH/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/en_PH/latn.NumberPatterns/1=¤#,##0.00
 FormatData/en_PH/latn.NumberPatterns/2=#,##0%
-FormatData/en_PH/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/en_PH/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/en_PH/TimePatterns/2=h:mm:ss\u202fa
-FormatData/en_PH/TimePatterns/3=h:mm\u202fa
+FormatData/en_PH/TimePatterns/0=h:mm:ss a zzzz
+FormatData/en_PH/TimePatterns/1=h:mm:ss a z
+FormatData/en_PH/TimePatterns/2=h:mm:ss a
+FormatData/en_PH/TimePatterns/3=h:mm a
 FormatData/en_PH/DatePatterns/0=EEEE, MMMM d, y
 FormatData/en_PH/DatePatterns/1=MMMM d, y
 FormatData/en_PH/DatePatterns/2=MMM d, y
@@ -2680,56 +2680,56 @@ LocaleNames/en_PH/pa=Punjabi
 LocaleNames/en_PH/rm=Romansh
 LocaleNames/en_PH/to=Tongan
 LocaleNames/en_PH/CC=Cocos (Keeling) Islands
-LocaleNames/en_PH/CI=C\u00f4te d\u2019Ivoire
+LocaleNames/en_PH/CI=Côte d’Ivoire
 LocaleNames/en_PH/GS=South Georgia & South Sandwich Islands
 LocaleNames/en_PH/HM=Heard & McDonald Islands
 LocaleNames/en_PH/KN=St. Kitts & Nevis
 LocaleNames/en_PH/PM=St. Pierre & Miquelon
 LocaleNames/en_PH/PS=Palestinian Territories
 LocaleNames/en_PH/SJ=Svalbard & Jan Mayen
-LocaleNames/en_PH/ST=S\u00e3o Tom\u00e9 & Pr\u00edncipe
+LocaleNames/en_PH/ST=São Tomé & Príncipe
 #el
-FormatData/el/standalone.MonthNames/0=\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/1=\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/2=\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/3=\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/4=\u039c\u03ac\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/5=\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/6=\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/7=\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2
-FormatData/el/standalone.MonthNames/8=\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/9=\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/10=\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
-FormatData/el/standalone.MonthNames/11=\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2
+FormatData/el/standalone.MonthNames/0=Ιανουάριος
+FormatData/el/standalone.MonthNames/1=Φεβρουάριος
+FormatData/el/standalone.MonthNames/2=Μάρτιος
+FormatData/el/standalone.MonthNames/3=Απρίλιος
+FormatData/el/standalone.MonthNames/4=Μάιος
+FormatData/el/standalone.MonthNames/5=Ιούνιος
+FormatData/el/standalone.MonthNames/6=Ιούλιος
+FormatData/el/standalone.MonthNames/7=Αύγουστος
+FormatData/el/standalone.MonthNames/8=Σεπτέμβριος
+FormatData/el/standalone.MonthNames/9=Οκτώβριος
+FormatData/el/standalone.MonthNames/10=Νοέμβριος
+FormatData/el/standalone.MonthNames/11=Δεκέμβριος
 FormatData/el/standalone.MonthNames/12=
-FormatData/el/MonthAbbreviations/0=\u0399\u03b1\u03bd
-FormatData/el/MonthAbbreviations/1=\u03a6\u03b5\u03b2
-FormatData/el/MonthAbbreviations/2=\u039c\u03b1\u03c1
-FormatData/el/MonthAbbreviations/3=\u0391\u03c0\u03c1
-FormatData/el/MonthAbbreviations/4=\u039c\u03b1\u0390
-FormatData/el/MonthAbbreviations/5=\u0399\u03bf\u03c5\u03bd
-FormatData/el/MonthAbbreviations/6=\u0399\u03bf\u03c5\u03bb
-FormatData/el/MonthAbbreviations/7=\u0391\u03c5\u03b3
-FormatData/el/MonthAbbreviations/8=\u03a3\u03b5\u03c0
-FormatData/el/MonthAbbreviations/9=\u039f\u03ba\u03c4
-FormatData/el/MonthAbbreviations/10=\u039d\u03bf\u03b5
-FormatData/el/MonthAbbreviations/11=\u0394\u03b5\u03ba
-FormatData/el/DayNames/0=\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae
-FormatData/el/DayNames/1=\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1
-FormatData/el/DayNames/2=\u03a4\u03c1\u03af\u03c4\u03b7
-FormatData/el/DayNames/3=\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7
-FormatData/el/DayNames/4=\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7
-FormatData/el/DayNames/5=\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae
-FormatData/el/DayNames/6=\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf
-FormatData/el/DayAbbreviations/0=\u039a\u03c5\u03c1
-FormatData/el/DayAbbreviations/1=\u0394\u03b5\u03c5
-FormatData/el/DayAbbreviations/2=\u03a4\u03c1\u03af
-FormatData/el/DayAbbreviations/3=\u03a4\u03b5\u03c4
-FormatData/el/DayAbbreviations/4=\u03a0\u03ad\u03bc
-FormatData/el/DayAbbreviations/5=\u03a0\u03b1\u03c1
-FormatData/el/DayAbbreviations/6=\u03a3\u03ac\u03b2
-FormatData/el/AmPmMarkers/0=\u03c0.\u03bc.
-FormatData/el/AmPmMarkers/1=\u03bc.\u03bc.
+FormatData/el/MonthAbbreviations/0=Ιαν
+FormatData/el/MonthAbbreviations/1=Φεβ
+FormatData/el/MonthAbbreviations/2=Μαρ
+FormatData/el/MonthAbbreviations/3=Απρ
+FormatData/el/MonthAbbreviations/4=Μαΐ
+FormatData/el/MonthAbbreviations/5=Ιουν
+FormatData/el/MonthAbbreviations/6=Ιουλ
+FormatData/el/MonthAbbreviations/7=Αυγ
+FormatData/el/MonthAbbreviations/8=Σεπ
+FormatData/el/MonthAbbreviations/9=Οκτ
+FormatData/el/MonthAbbreviations/10=Νοε
+FormatData/el/MonthAbbreviations/11=Δεκ
+FormatData/el/DayNames/0=Κυριακή
+FormatData/el/DayNames/1=Δευτέρα
+FormatData/el/DayNames/2=Τρίτη
+FormatData/el/DayNames/3=Τετάρτη
+FormatData/el/DayNames/4=Πέμπτη
+FormatData/el/DayNames/5=Παρασκευή
+FormatData/el/DayNames/6=Σάββατο
+FormatData/el/DayAbbreviations/0=Κυρ
+FormatData/el/DayAbbreviations/1=Δευ
+FormatData/el/DayAbbreviations/2=Τρί
+FormatData/el/DayAbbreviations/3=Τετ
+FormatData/el/DayAbbreviations/4=Πέμ
+FormatData/el/DayAbbreviations/5=Παρ
+FormatData/el/DayAbbreviations/6=Σάβ
+FormatData/el/AmPmMarkers/0=π.μ.
+FormatData/el/AmPmMarkers/1=μ.μ.
 FormatData/el/latn.NumberElements/0=,
 FormatData/el/latn.NumberElements/1=.
 FormatData/el/latn.NumberElements/2=;
@@ -2738,353 +2738,353 @@ FormatData/el/latn.NumberElements/4=0
 FormatData/el/latn.NumberElements/5=#
 FormatData/el/latn.NumberElements/6=-
 FormatData/el/latn.NumberElements/7=e
-FormatData/el/latn.NumberElements/8=\u2030
-FormatData/el/latn.NumberElements/9=\u221e
+FormatData/el/latn.NumberElements/8=‰
+FormatData/el/latn.NumberElements/9=∞
 FormatData/el/latn.NumberElements/10=NaN
-FormatData/el/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/el/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/el/TimePatterns/2=h:mm:ss\u202fa
-FormatData/el/TimePatterns/3=h:mm\u202fa
+FormatData/el/TimePatterns/0=h:mm:ss a zzzz
+FormatData/el/TimePatterns/1=h:mm:ss a z
+FormatData/el/TimePatterns/2=h:mm:ss a
+FormatData/el/TimePatterns/3=h:mm a
 FormatData/el/DatePatterns/0=EEEE d MMMM y
 FormatData/el/DatePatterns/1=d MMMM y
 FormatData/el/DatePatterns/2=d MMM y
 FormatData/el/DatePatterns/3=d/M/yy
 FormatData/el/DateTimePatterns/0={1} - {0}
-LocaleNames/el/GR=\u0395\u03bb\u03bb\u03ac\u03b4\u03b1
+LocaleNames/el/GR=Ελλάδα
 #el_CY
 #bug 6483191
-FormatData/el_CY/MonthNames/0=\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/1=\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/2=\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/3=\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/4=\u039c\u03b1\u0390\u03bf\u03c5
-FormatData/el_CY/MonthNames/5=\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/6=\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/7=\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5
-FormatData/el_CY/MonthNames/8=\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/9=\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/10=\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5
-FormatData/el_CY/MonthNames/11=\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5
+FormatData/el_CY/MonthNames/0=Ιανουαρίου
+FormatData/el_CY/MonthNames/1=Φεβρουαρίου
+FormatData/el_CY/MonthNames/2=Μαρτίου
+FormatData/el_CY/MonthNames/3=Απριλίου
+FormatData/el_CY/MonthNames/4=Μαΐου
+FormatData/el_CY/MonthNames/5=Ιουνίου
+FormatData/el_CY/MonthNames/6=Ιουλίου
+FormatData/el_CY/MonthNames/7=Αυγούστου
+FormatData/el_CY/MonthNames/8=Σεπτεμβρίου
+FormatData/el_CY/MonthNames/9=Οκτωβρίου
+FormatData/el_CY/MonthNames/10=Νοεμβρίου
+FormatData/el_CY/MonthNames/11=Δεκεμβρίου
 FormatData/el_CY/MonthNames/12=
-FormatData/el_CY/AmPmMarkers/0=\u03c0.\u03bc.
-FormatData/el_CY/AmPmMarkers/1=\u03bc.\u03bc.
-FormatData/el_CY/Eras/0=\u03c0.\u03a7.
-FormatData/el_CY/Eras/1=\u03bc.\u03a7.
+FormatData/el_CY/AmPmMarkers/0=π.μ.
+FormatData/el_CY/AmPmMarkers/1=μ.μ.
+FormatData/el_CY/Eras/0=π.Χ.
+FormatData/el_CY/Eras/1=μ.Χ.
 FormatData/el_CY/latn.NumberPatterns/0=#,##0.###
-FormatData/el_CY/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
+FormatData/el_CY/latn.NumberPatterns/1=#,##0.00 ¤
 FormatData/el_CY/latn.NumberPatterns/2=#,##0%
-FormatData/el_CY/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/el_CY/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/el_CY/TimePatterns/2=h:mm:ss\u202fa
-FormatData/el_CY/TimePatterns/3=h:mm\u202fa
+FormatData/el_CY/TimePatterns/0=h:mm:ss a zzzz
+FormatData/el_CY/TimePatterns/1=h:mm:ss a z
+FormatData/el_CY/TimePatterns/2=h:mm:ss a
+FormatData/el_CY/TimePatterns/3=h:mm a
 FormatData/el_CY/DatePatterns/0=EEEE d MMMM y
 FormatData/el_CY/DatePatterns/1=d MMMM y
 FormatData/el_CY/DatePatterns/2=d MMM y
 FormatData/el_CY/DatePatterns/3=d/M/yy
 FormatData/el_CY/DateTimePatterns/0={1} - {0}
-LocaleNames/el_CY/ar=\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el_CY/be=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/bg=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el_CY/bo=\u0398\u03b9\u03b2\u03b5\u03c4\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el_CY/bs=\u0392\u03bf\u03c3\u03bd\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el_CY/bn=\u0392\u03b5\u03b3\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ca=\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/co=\u039a\u03bf\u03c1\u03c3\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/cs=\u03a4\u03c3\u03b5\u03c7\u03b9\u03ba\u03ac
-LocaleNames/el_CY/cy=\u039f\u03c5\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/da=\u0394\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/de=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/el=\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/en=\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/es=\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/et=\u0395\u03c3\u03b8\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/eu=\u0392\u03b1\u03c3\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fa=\u03a0\u03b5\u03c1\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fi=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/fr=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ga=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/gd=\u03a3\u03ba\u03c9\u03c4\u03b9\u03ba\u03ac \u039a\u03b5\u03bb\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/he=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el_CY/hi=\u03a7\u03af\u03bd\u03c4\u03b9
-LocaleNames/el_CY/hr=\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/hu=\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el_CY/hy=\u0391\u03c1\u03bc\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/id=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el_CY/is=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/it=\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ja=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ka=\u0393\u03b5\u03c9\u03c1\u03b3\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el_CY/ko=\u039a\u03bf\u03c1\u03b5\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/la=\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/lt=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/lv=\u039b\u03b5\u03c4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mk=\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mn=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/mt=\u039c\u03b1\u03bb\u03c4\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el_CY/nl=\u039f\u03bb\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/no=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/pl=\u03a0\u03bf\u03bb\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/pt=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ro=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/ru=\u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sk=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sl=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sq=\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sr=\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el_CY/sv=\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/th=\u03a4\u03b1\u03ca\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el_CY/tr=\u03a4\u03bf\u03c5\u03c1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el_CY/uk=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el_CY/vi=\u0392\u03b9\u03b5\u03c4\u03bd\u03b1\u03bc\u03b9\u03ba\u03ac
-LocaleNames/el_CY/yi=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el_CY/zh=\u039a\u03b9\u03bd\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el_CY/AD=\u0391\u03bd\u03b4\u03cc\u03c1\u03b1
-LocaleNames/el_CY/AE=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac \u0395\u03bc\u03b9\u03c1\u03ac\u03c4\u03b1
-LocaleNames/el_CY/AF=\u0391\u03c6\u03b3\u03b1\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\u03b1\u03b9 \u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03bf\u03cd\u03bd\u03c4\u03b1
-LocaleNames/el_CY/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
-LocaleNames/el_CY/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el_CY/AO=\u0391\u03b3\u03ba\u03cc\u03bb\u03b1
-LocaleNames/el_CY/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
-LocaleNames/el_CY/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
-LocaleNames/el_CY/AS=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el_CY/AT=\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1
-LocaleNames/el_CY/AU=\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/AW=\u0391\u03c1\u03bf\u03cd\u03bc\u03c0\u03b1
-LocaleNames/el_CY/AX=\u039d\u03ae\u03c3\u03bf\u03b9 \u038c\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el_CY/AZ=\u0391\u03b6\u03b5\u03c1\u03bc\u03c0\u03b1\u03ca\u03c4\u03b6\u03ac\u03bd
-LocaleNames/el_CY/BA=\u0392\u03bf\u03c3\u03bd\u03af\u03b1 - \u0395\u03c1\u03b6\u03b5\u03b3\u03bf\u03b2\u03af\u03bd\u03b7
-LocaleNames/el_CY/BB=\u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03ad\u03b9\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el_CY/BD=\u039c\u03c0\u03b1\u03bd\u03b3\u03ba\u03bb\u03b1\u03bd\u03c4\u03ad\u03c2
-LocaleNames/el_CY/BE=\u0392\u03ad\u03bb\u03b3\u03b9\u03bf
-LocaleNames/el_CY/BF=\u039c\u03c0\u03bf\u03c5\u03c1\u03ba\u03af\u03bd\u03b1 \u03a6\u03ac\u03c3\u03bf
-LocaleNames/el_CY/BG=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el_CY/BH=\u039c\u03c0\u03b1\u03c7\u03c1\u03ad\u03b9\u03bd
-LocaleNames/el_CY/BI=\u039c\u03c0\u03bf\u03c5\u03c1\u03bf\u03cd\u03bd\u03c4\u03b9
-LocaleNames/el_CY/BJ=\u039c\u03c0\u03b5\u03bd\u03af\u03bd
-LocaleNames/el_CY/BM=\u0392\u03b5\u03c1\u03bc\u03bf\u03cd\u03b4\u03b5\u03c2
-LocaleNames/el_CY/BN=\u039c\u03c0\u03c1\u03bf\u03c5\u03bd\u03ad\u03b9
-LocaleNames/el_CY/BO=\u0392\u03bf\u03bb\u03b9\u03b2\u03af\u03b1
-LocaleNames/el_CY/BR=\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1
-LocaleNames/el_CY/BS=\u039c\u03c0\u03b1\u03c7\u03ac\u03bc\u03b5\u03c2
-LocaleNames/el_CY/BT=\u039c\u03c0\u03bf\u03c5\u03c4\u03ac\u03bd
-LocaleNames/el_CY/BV=\u039d\u03ae\u03c3\u03bf\u03c2 \u039c\u03c0\u03bf\u03c5\u03b2\u03ad
-LocaleNames/el_CY/BW=\u039c\u03c0\u03bf\u03c4\u03c3\u03bf\u03c5\u03ac\u03bd\u03b1
-LocaleNames/el_CY/BY=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el_CY/BZ=\u039c\u03c0\u03b5\u03bb\u03af\u03b6
-LocaleNames/el_CY/CA=\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2
-LocaleNames/el_CY/CC=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03cc\u03ba\u03bf\u03c2 (\u039a\u03af\u03bb\u03b9\u03bd\u03b3\u03ba)
-LocaleNames/el_CY/CD=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039a\u03b9\u03bd\u03c3\u03ac\u03c3\u03b1
-LocaleNames/el_CY/CF=\u039a\u03b5\u03bd\u03c4\u03c1\u03bf\u03b1\u03c6\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/CG=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039c\u03c0\u03c1\u03b1\u03b6\u03b1\u03b2\u03af\u03bb
-LocaleNames/el_CY/CH=\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1
-LocaleNames/el_CY/CI=\u0391\u03ba\u03c4\u03ae \u0395\u03bb\u03b5\u03c6\u03b1\u03bd\u03c4\u03bf\u03c3\u03c4\u03bf\u03cd
-LocaleNames/el_CY/CK=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03bf\u03c5\u03ba
-LocaleNames/el_CY/CL=\u03a7\u03b9\u03bb\u03ae
-LocaleNames/el_CY/CM=\u039a\u03b1\u03bc\u03b5\u03c1\u03bf\u03cd\u03bd
-LocaleNames/el_CY/CN=\u039a\u03af\u03bd\u03b1
-LocaleNames/el_CY/CO=\u039a\u03bf\u03bb\u03bf\u03bc\u03b2\u03af\u03b1
-LocaleNames/el_CY/CR=\u039a\u03cc\u03c3\u03c4\u03b1 \u03a1\u03af\u03ba\u03b1
-LocaleNames/el_CY/CU=\u039a\u03bf\u03cd\u03b2\u03b1
-LocaleNames/el_CY/CV=\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf \u0391\u03ba\u03c1\u03c9\u03c4\u03ae\u03c1\u03b9\u03bf
-LocaleNames/el_CY/CX=\u039d\u03ae\u03c3\u03bf\u03c2 \u03c4\u03c9\u03bd \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03c5\u03b3\u03ad\u03bd\u03bd\u03c9\u03bd
-LocaleNames/el_CY/CY=\u039a\u03cd\u03c0\u03c1\u03bf\u03c2
-LocaleNames/el_CY/CZ=\u03a4\u03c3\u03b5\u03c7\u03af\u03b1
-LocaleNames/el_CY/DE=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/DJ=\u03a4\u03b6\u03b9\u03bc\u03c0\u03bf\u03c5\u03c4\u03af
-LocaleNames/el_CY/DK=\u0394\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/DM=\u039d\u03c4\u03bf\u03bc\u03af\u03bd\u03b9\u03ba\u03b1
-LocaleNames/el_CY/DO=\u0394\u03bf\u03bc\u03b9\u03bd\u03b9\u03ba\u03b1\u03bd\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/DZ=\u0391\u03bb\u03b3\u03b5\u03c1\u03af\u03b1
-LocaleNames/el_CY/EC=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03cc\u03c2
-LocaleNames/el_CY/EE=\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/EG=\u0391\u03af\u03b3\u03c5\u03c0\u03c4\u03bf\u03c2
-LocaleNames/el_CY/EH=\u0394\u03c5\u03c4\u03b9\u03ba\u03ae \u03a3\u03b1\u03c7\u03ac\u03c1\u03b1
-LocaleNames/el_CY/ER=\u0395\u03c1\u03c5\u03b8\u03c1\u03b1\u03af\u03b1
-LocaleNames/el_CY/ES=\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/ET=\u0391\u03b9\u03b8\u03b9\u03bf\u03c0\u03af\u03b1
-LocaleNames/el_CY/FI=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/FJ=\u03a6\u03af\u03c4\u03b6\u03b9
-LocaleNames/el_CY/FK=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03cc\u03ba\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el_CY/FM=\u039c\u03b9\u03ba\u03c1\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/FO=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03b5\u03c1\u03cc\u03b5\u03c2
-LocaleNames/el_CY/FR=\u0393\u03b1\u03bb\u03bb\u03af\u03b1
-LocaleNames/el_CY/GA=\u0393\u03ba\u03b1\u03bc\u03c0\u03cc\u03bd
-LocaleNames/el_CY/GB=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf
-LocaleNames/el_CY/GD=\u0393\u03c1\u03b5\u03bd\u03ac\u03b4\u03b1
-LocaleNames/el_CY/GE=\u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1
-LocaleNames/el_CY/GF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el_CY/GH=\u0393\u03ba\u03ac\u03bd\u03b1
-LocaleNames/el_CY/GI=\u0393\u03b9\u03b2\u03c1\u03b1\u03bb\u03c4\u03ac\u03c1
-LocaleNames/el_CY/GL=\u0393\u03c1\u03bf\u03b9\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/GM=\u0393\u03ba\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/GN=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/GP=\u0393\u03bf\u03c5\u03b1\u03b4\u03b5\u03bb\u03bf\u03cd\u03c0\u03b7
-LocaleNames/el_CY/GQ=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/GS=\u039d\u03ae\u03c3\u03bf\u03b9 \u039d\u03cc\u03c4\u03b9\u03b1 \u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1 \u03ba\u03b1\u03b9 \u039d\u03cc\u03c4\u03b9\u03b5\u03c2 \u03a3\u03ac\u03bd\u03c4\u03bf\u03c5\u03b9\u03c4\u03c2
-LocaleNames/el_CY/GT=\u0393\u03bf\u03c5\u03b1\u03c4\u03b5\u03bc\u03ac\u03bb\u03b1
-LocaleNames/el_CY/GU=\u0393\u03ba\u03bf\u03c5\u03ac\u03bc
-LocaleNames/el_CY/GW=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1 \u039c\u03c0\u03b9\u03c3\u03ac\u03bf\u03c5
-LocaleNames/el_CY/GY=\u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el_CY/HK=\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el_CY/HM=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a7\u03b5\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u039c\u03b1\u03ba\u03bd\u03c4\u03cc\u03bd\u03b1\u03bb\u03bd\u03c4
-LocaleNames/el_CY/HN=\u039f\u03bd\u03b4\u03bf\u03cd\u03c1\u03b1
-LocaleNames/el_CY/HR=\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1
-LocaleNames/el_CY/HT=\u0391\u03ca\u03c4\u03ae
-LocaleNames/el_CY/HU=\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el_CY/ID=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/IE=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IL=\u0399\u03c3\u03c1\u03b1\u03ae\u03bb
-LocaleNames/el_CY/IN=\u0399\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IO=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7 \u0399\u03bd\u03b4\u03b9\u03ba\u03bf\u03cd \u03a9\u03ba\u03b5\u03b1\u03bd\u03bf\u03cd
-LocaleNames/el_CY/IQ=\u0399\u03c1\u03ac\u03ba
-LocaleNames/el_CY/IR=\u0399\u03c1\u03ac\u03bd
-LocaleNames/el_CY/IS=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/IT=\u0399\u03c4\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/JM=\u03a4\u03b6\u03b1\u03bc\u03ac\u03b9\u03ba\u03b1
-LocaleNames/el_CY/JO=\u0399\u03bf\u03c1\u03b4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/JP=\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1
-LocaleNames/el_CY/KE=\u039a\u03ad\u03bd\u03c5\u03b1
-LocaleNames/el_CY/KG=\u039a\u03b9\u03c1\u03b3\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/KH=\u039a\u03b1\u03bc\u03c0\u03cc\u03c4\u03b6\u03b7
-LocaleNames/el_CY/KI=\u039a\u03b9\u03c1\u03b9\u03bc\u03c0\u03ac\u03c4\u03b9
-LocaleNames/el_CY/KM=\u039a\u03bf\u03bc\u03cc\u03c1\u03b5\u03c2
-LocaleNames/el_CY/KN=\u03a3\u03b5\u03bd \u039a\u03b9\u03c4\u03c2 \u03ba\u03b1\u03b9 \u039d\u03ad\u03b2\u03b9\u03c2
-LocaleNames/el_CY/KP=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el_CY/KR=\u039d\u03cc\u03c4\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el_CY/KW=\u039a\u03bf\u03c5\u03b2\u03ad\u03b9\u03c4
-LocaleNames/el_CY/KY=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03ad\u03b9\u03bc\u03b1\u03bd
-LocaleNames/el_CY/KZ=\u039a\u03b1\u03b6\u03b1\u03ba\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/LA=\u039b\u03ac\u03bf\u03c2
-LocaleNames/el_CY/LB=\u039b\u03af\u03b2\u03b1\u03bd\u03bf\u03c2
-LocaleNames/el_CY/LC=\u0391\u03b3\u03af\u03b1 \u039b\u03bf\u03c5\u03ba\u03af\u03b1
-LocaleNames/el_CY/LI=\u039b\u03b9\u03c7\u03c4\u03b5\u03bd\u03c3\u03c4\u03ac\u03b9\u03bd
-LocaleNames/el_CY/LK=\u03a3\u03c1\u03b9 \u039b\u03ac\u03bd\u03ba\u03b1
-LocaleNames/el_CY/LR=\u039b\u03b9\u03b2\u03b5\u03c1\u03af\u03b1
-LocaleNames/el_CY/LS=\u039b\u03b5\u03c3\u03cc\u03c4\u03bf
-LocaleNames/el_CY/LT=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/LU=\u039b\u03bf\u03c5\u03be\u03b5\u03bc\u03b2\u03bf\u03cd\u03c1\u03b3\u03bf
-LocaleNames/el_CY/LV=\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/LY=\u039b\u03b9\u03b2\u03cd\u03b7
-LocaleNames/el_CY/MA=\u039c\u03b1\u03c1\u03cc\u03ba\u03bf
-LocaleNames/el_CY/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
-LocaleNames/el_CY/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
-LocaleNames/el_CY/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
-LocaleNames/el_CY/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el_CY/MK=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/ML=\u039c\u03ac\u03bb\u03b9
-LocaleNames/el_CY/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1 (\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1)
-LocaleNames/el_CY/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
-LocaleNames/el_CY/MO=\u039c\u03b1\u03ba\u03ac\u03bf \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el_CY/MP=\u039d\u03ae\u03c3\u03bf\u03b9 \u0392\u03cc\u03c1\u03b5\u03b9\u03b5\u03c2 \u039c\u03b1\u03c1\u03b9\u03ac\u03bd\u03b5\u03c2
-LocaleNames/el_CY/MQ=\u039c\u03b1\u03c1\u03c4\u03b9\u03bd\u03af\u03ba\u03b1
-LocaleNames/el_CY/MR=\u039c\u03b1\u03c5\u03c1\u03b9\u03c4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/MS=\u039c\u03bf\u03bd\u03c3\u03b5\u03c1\u03ac\u03c4
-LocaleNames/el_CY/MT=\u039c\u03ac\u03bb\u03c4\u03b1
-LocaleNames/el_CY/MU=\u039c\u03b1\u03c5\u03c1\u03af\u03ba\u03b9\u03bf\u03c2
-LocaleNames/el_CY/MV=\u039c\u03b1\u03bb\u03b4\u03af\u03b2\u03b5\u03c2
-LocaleNames/el_CY/MW=\u039c\u03b1\u03bb\u03ac\u03bf\u03c5\u03b9
-LocaleNames/el_CY/MX=\u039c\u03b5\u03be\u03b9\u03ba\u03cc
-LocaleNames/el_CY/MY=\u039c\u03b1\u03bb\u03b1\u03b9\u03c3\u03af\u03b1
-LocaleNames/el_CY/MZ=\u039c\u03bf\u03b6\u03b1\u03bc\u03b2\u03af\u03ba\u03b7
-LocaleNames/el_CY/NA=\u039d\u03b1\u03bc\u03af\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/NC=\u039d\u03ad\u03b1 \u039a\u03b1\u03bb\u03b7\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el_CY/NE=\u039d\u03af\u03b3\u03b7\u03c1\u03b1\u03c2
-LocaleNames/el_CY/NF=\u039d\u03ae\u03c3\u03bf\u03c2 \u039d\u03cc\u03c1\u03c6\u03bf\u03bb\u03ba
-LocaleNames/el_CY/NG=\u039d\u03b9\u03b3\u03b7\u03c1\u03af\u03b1
-LocaleNames/el_CY/NI=\u039d\u03b9\u03ba\u03b1\u03c1\u03ac\u03b3\u03bf\u03c5\u03b1
-LocaleNames/el_CY/NL=\u039a\u03ac\u03c4\u03c9 \u03a7\u03ce\u03c1\u03b5\u03c2
-LocaleNames/el_CY/NO=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1
-LocaleNames/el_CY/NP=\u039d\u03b5\u03c0\u03ac\u03bb
-LocaleNames/el_CY/NR=\u039d\u03b1\u03bf\u03c5\u03c1\u03bf\u03cd
-LocaleNames/el_CY/NU=\u039d\u03b9\u03bf\u03cd\u03b5
-LocaleNames/el_CY/NZ=\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el_CY/OM=\u039f\u03bc\u03ac\u03bd
-LocaleNames/el_CY/PA=\u03a0\u03b1\u03bd\u03b1\u03bc\u03ac\u03c2
-LocaleNames/el_CY/PE=\u03a0\u03b5\u03c1\u03bf\u03cd
-LocaleNames/el_CY/PF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u03a0\u03bf\u03bb\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/PG=\u03a0\u03b1\u03c0\u03bf\u03cd\u03b1 \u039d\u03ad\u03b1 \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el_CY/PH=\u03a6\u03b9\u03bb\u03b9\u03c0\u03c0\u03af\u03bd\u03b5\u03c2
-LocaleNames/el_CY/PK=\u03a0\u03b1\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/PL=\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1
-LocaleNames/el_CY/PM=\u03a3\u03b5\u03bd \u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd
-LocaleNames/el_CY/PN=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a0\u03af\u03c4\u03ba\u03b5\u03c1\u03bd
-LocaleNames/el_CY/PR=\u03a0\u03bf\u03c5\u03ad\u03c1\u03c4\u03bf \u03a1\u03af\u03ba\u03bf
-LocaleNames/el_CY/PS=\u03a0\u03b1\u03bb\u03b1\u03b9\u03c3\u03c4\u03b9\u03bd\u03b9\u03b1\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el_CY/PT=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/PW=\u03a0\u03b1\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el_CY/PY=\u03a0\u03b1\u03c1\u03b1\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el_CY/QA=\u039a\u03b1\u03c4\u03ac\u03c1
-LocaleNames/el_CY/RE=\u03a1\u03b5\u03ca\u03bd\u03b9\u03cc\u03bd
-LocaleNames/el_CY/RO=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/RU=\u03a1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el_CY/RW=\u03a1\u03bf\u03c5\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el_CY/SA=\u03a3\u03b1\u03bf\u03c5\u03b4\u03b9\u03ba\u03ae \u0391\u03c1\u03b1\u03b2\u03af\u03b1
-LocaleNames/el_CY/SB=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a3\u03bf\u03bb\u03bf\u03bc\u03ce\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el_CY/SC=\u03a3\u03b5\u03cb\u03c7\u03ad\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el_CY/SD=\u03a3\u03bf\u03c5\u03b4\u03ac\u03bd
-LocaleNames/el_CY/SE=\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1
-LocaleNames/el_CY/SG=\u03a3\u03b9\u03b3\u03ba\u03b1\u03c0\u03bf\u03cd\u03c1\u03b7
-LocaleNames/el_CY/SH=\u0391\u03b3\u03af\u03b1 \u0395\u03bb\u03ad\u03bd\u03b7
-LocaleNames/el_CY/SI=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1
-LocaleNames/el_CY/SJ=\u03a3\u03b2\u03ac\u03bb\u03bc\u03c0\u03b1\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u0393\u03b9\u03b1\u03bd \u039c\u03b1\u03b3\u03b9\u03ad\u03bd
-LocaleNames/el_CY/SK=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1
-LocaleNames/el_CY/SL=\u03a3\u03b9\u03ad\u03c1\u03b1 \u039b\u03b5\u03cc\u03bd\u03b5
-LocaleNames/el_CY/SM=\u0386\u03b3\u03b9\u03bf\u03c2 \u039c\u03b1\u03c1\u03af\u03bd\u03bf\u03c2
-LocaleNames/el_CY/SN=\u03a3\u03b5\u03bd\u03b5\u03b3\u03ac\u03bb\u03b7
-LocaleNames/el_CY/SO=\u03a3\u03bf\u03bc\u03b1\u03bb\u03af\u03b1
-LocaleNames/el_CY/SR=\u03a3\u03bf\u03c5\u03c1\u03b9\u03bd\u03ac\u03bc
-LocaleNames/el_CY/ST=\u03a3\u03ac\u03bf \u03a4\u03bf\u03bc\u03ad \u03ba\u03b1\u03b9 \u03a0\u03c1\u03af\u03bd\u03c3\u03b9\u03c0\u03b5
-LocaleNames/el_CY/SV=\u0395\u03bb \u03a3\u03b1\u03bb\u03b2\u03b1\u03b4\u03cc\u03c1
-LocaleNames/el_CY/SY=\u03a3\u03c5\u03c1\u03af\u03b1
-LocaleNames/el_CY/SZ=\u0395\u03c3\u03bf\u03c5\u03b1\u03c4\u03af\u03bd\u03b9
-LocaleNames/el_CY/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba\u03c2 \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
-LocaleNames/el_CY/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el_CY/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el_CY/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
-LocaleNames/el_CY/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
-LocaleNames/el_CY/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/TK=\u03a4\u03bf\u03ba\u03b5\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el_CY/TL=\u03a4\u03b9\u03bc\u03cc\u03c1-\u039b\u03ad\u03c3\u03c4\u03b5
-LocaleNames/el_CY/TM=\u03a4\u03bf\u03c5\u03c1\u03ba\u03bc\u03b5\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/TN=\u03a4\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el_CY/TO=\u03a4\u03cc\u03bd\u03b3\u03ba\u03b1
-LocaleNames/el_CY/TR=\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1
-LocaleNames/el_CY/TT=\u03a4\u03c1\u03b9\u03bd\u03b9\u03bd\u03c4\u03ac\u03bd\u03c4 \u03ba\u03b1\u03b9 \u03a4\u03bf\u03bc\u03c0\u03ac\u03b3\u03ba\u03bf
-LocaleNames/el_CY/TV=\u03a4\u03bf\u03c5\u03b2\u03b1\u03bb\u03bf\u03cd
-LocaleNames/el_CY/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
-LocaleNames/el_CY/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
-LocaleNames/el_CY/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el_CY/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
-LocaleNames/el_CY/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
-LocaleNames/el_CY/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el_CY/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el_CY/VA=\u0392\u03b1\u03c4\u03b9\u03ba\u03b1\u03bd\u03cc
-LocaleNames/el_CY/VC=\u0386\u03b3\u03b9\u03bf\u03c2 \u0392\u03b9\u03ba\u03ad\u03bd\u03c4\u03b9\u03bf\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b5\u03bd\u03b1\u03b4\u03af\u03bd\u03b5\u03c2
-LocaleNames/el_CY/VE=\u0392\u03b5\u03bd\u03b5\u03b6\u03bf\u03c5\u03ad\u03bb\u03b1
-LocaleNames/el_CY/VG=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el_CY/VI=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el_CY/VN=\u0392\u03b9\u03b5\u03c4\u03bd\u03ac\u03bc
-LocaleNames/el_CY/VU=\u0392\u03b1\u03bd\u03bf\u03c5\u03ac\u03c4\u03bf\u03c5
-LocaleNames/el_CY/WF=\u0393\u03bf\u03c5\u03ac\u03bb\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03a6\u03bf\u03c5\u03c4\u03bf\u03cd\u03bd\u03b1
-LocaleNames/el_CY/WS=\u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el_CY/YE=\u03a5\u03b5\u03bc\u03ad\u03bd\u03b7
-LocaleNames/el_CY/YT=\u039c\u03b1\u03b3\u03b9\u03cc\u03c4
-LocaleNames/el_CY/ZA=\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae
-LocaleNames/el_CY/ZM=\u0396\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el_CY/ZW=\u0396\u03b9\u03bc\u03c0\u03ac\u03bc\u03c0\u03bf\u03c5\u03b5
-CurrencyNames/el_CY/EUR=\u20ac
+LocaleNames/el_CY/ar=Αραβικά
+LocaleNames/el_CY/be=Λευκορωσικά
+LocaleNames/el_CY/bg=Βουλγαρικά
+LocaleNames/el_CY/bo=Θιβετιανά
+LocaleNames/el_CY/bs=Βοσνιακά
+LocaleNames/el_CY/bn=Βεγγαλικά
+LocaleNames/el_CY/ca=Καταλανικά
+LocaleNames/el_CY/co=Κορσικανικά
+LocaleNames/el_CY/cs=Τσεχικά
+LocaleNames/el_CY/cy=Ουαλικά
+LocaleNames/el_CY/da=Δανικά
+LocaleNames/el_CY/de=Γερμανικά
+LocaleNames/el_CY/el=Ελληνικά
+LocaleNames/el_CY/en=Αγγλικά
+LocaleNames/el_CY/es=Ισπανικά
+LocaleNames/el_CY/et=Εσθονικά
+LocaleNames/el_CY/eu=Βασκικά
+LocaleNames/el_CY/fa=Περσικά
+LocaleNames/el_CY/fi=Φινλανδικά
+LocaleNames/el_CY/fr=Γαλλικά
+LocaleNames/el_CY/ga=Ιρλανδικά
+LocaleNames/el_CY/gd=Σκωτικά Κελτικά
+LocaleNames/el_CY/he=Εβραϊκά
+LocaleNames/el_CY/hi=Χίντι
+LocaleNames/el_CY/hr=Κροατικά
+LocaleNames/el_CY/hu=Ουγγρικά
+LocaleNames/el_CY/hy=Αρμενικά
+LocaleNames/el_CY/id=Ινδονησιακά
+LocaleNames/el_CY/is=Ισλανδικά
+LocaleNames/el_CY/it=Ιταλικά
+LocaleNames/el_CY/ja=Ιαπωνικά
+LocaleNames/el_CY/ka=Γεωργιανά
+LocaleNames/el_CY/ko=Κορεατικά
+LocaleNames/el_CY/la=Λατινικά
+LocaleNames/el_CY/lt=Λιθουανικά
+LocaleNames/el_CY/lv=Λετονικά
+LocaleNames/el_CY/mk=Σλαβομακεδονικά
+LocaleNames/el_CY/mn=Μογγολικά
+LocaleNames/el_CY/mt=Μαλτεζικά
+LocaleNames/el_CY/nl=Ολλανδικά
+LocaleNames/el_CY/no=Νορβηγικά
+LocaleNames/el_CY/pl=Πολωνικά
+LocaleNames/el_CY/pt=Πορτογαλικά
+LocaleNames/el_CY/ro=Ρουμανικά
+LocaleNames/el_CY/ru=Ρωσικά
+LocaleNames/el_CY/sk=Σλοβακικά
+LocaleNames/el_CY/sl=Σλοβενικά
+LocaleNames/el_CY/sq=Αλβανικά
+LocaleNames/el_CY/sr=Σερβικά
+LocaleNames/el_CY/sv=Σουηδικά
+LocaleNames/el_CY/th=Ταϊλανδικά
+LocaleNames/el_CY/tr=Τουρκικά
+LocaleNames/el_CY/uk=Ουκρανικά
+LocaleNames/el_CY/vi=Βιετναμικά
+LocaleNames/el_CY/yi=Γίντις
+LocaleNames/el_CY/zh=Κινεζικά
+LocaleNames/el_CY/AD=Ανδόρα
+LocaleNames/el_CY/AE=Ηνωμένα Αραβικά Εμιράτα
+LocaleNames/el_CY/AF=Αφγανιστάν
+LocaleNames/el_CY/AG=Αντίγκουα και Μπαρμπούντα
+LocaleNames/el_CY/AI=Ανγκουίλα
+LocaleNames/el_CY/AL=Αλβανία
+LocaleNames/el_CY/AM=Αρμενία
+LocaleNames/el_CY/AO=Αγκόλα
+LocaleNames/el_CY/AQ=Ανταρκτική
+LocaleNames/el_CY/AR=Αργεντινή
+LocaleNames/el_CY/AS=Αμερικανική Σαμόα
+LocaleNames/el_CY/AT=Αυστρία
+LocaleNames/el_CY/AU=Αυστραλία
+LocaleNames/el_CY/AW=Αρούμπα
+LocaleNames/el_CY/AX=Νήσοι Όλαντ
+LocaleNames/el_CY/AZ=Αζερμπαϊτζάν
+LocaleNames/el_CY/BA=Βοσνία - Ερζεγοβίνη
+LocaleNames/el_CY/BB=Μπαρμπέιντος
+LocaleNames/el_CY/BD=Μπανγκλαντές
+LocaleNames/el_CY/BE=Βέλγιο
+LocaleNames/el_CY/BF=Μπουρκίνα Φάσο
+LocaleNames/el_CY/BG=Βουλγαρία
+LocaleNames/el_CY/BH=Μπαχρέιν
+LocaleNames/el_CY/BI=Μπουρούντι
+LocaleNames/el_CY/BJ=Μπενίν
+LocaleNames/el_CY/BM=Βερμούδες
+LocaleNames/el_CY/BN=Μπρουνέι
+LocaleNames/el_CY/BO=Βολιβία
+LocaleNames/el_CY/BR=Βραζιλία
+LocaleNames/el_CY/BS=Μπαχάμες
+LocaleNames/el_CY/BT=Μπουτάν
+LocaleNames/el_CY/BV=Νήσος Μπουβέ
+LocaleNames/el_CY/BW=Μποτσουάνα
+LocaleNames/el_CY/BY=Λευκορωσία
+LocaleNames/el_CY/BZ=Μπελίζ
+LocaleNames/el_CY/CA=Καναδάς
+LocaleNames/el_CY/CC=Νήσοι Κόκος (Κίλινγκ)
+LocaleNames/el_CY/CD=Κονγκό - Κινσάσα
+LocaleNames/el_CY/CF=Κεντροαφρικανική Δημοκρατία
+LocaleNames/el_CY/CG=Κονγκό - Μπραζαβίλ
+LocaleNames/el_CY/CH=Ελβετία
+LocaleNames/el_CY/CI=Ακτή Ελεφαντοστού
+LocaleNames/el_CY/CK=Νήσοι Κουκ
+LocaleNames/el_CY/CL=Χιλή
+LocaleNames/el_CY/CM=Καμερούν
+LocaleNames/el_CY/CN=Κίνα
+LocaleNames/el_CY/CO=Κολομβία
+LocaleNames/el_CY/CR=Κόστα Ρίκα
+LocaleNames/el_CY/CU=Κούβα
+LocaleNames/el_CY/CV=Πράσινο Ακρωτήριο
+LocaleNames/el_CY/CX=Νήσος των Χριστουγέννων
+LocaleNames/el_CY/CY=Κύπρος
+LocaleNames/el_CY/CZ=Τσεχία
+LocaleNames/el_CY/DE=Γερμανία
+LocaleNames/el_CY/DJ=Τζιμπουτί
+LocaleNames/el_CY/DK=Δανία
+LocaleNames/el_CY/DM=Ντομίνικα
+LocaleNames/el_CY/DO=Δομινικανή Δημοκρατία
+LocaleNames/el_CY/DZ=Αλγερία
+LocaleNames/el_CY/EC=Ισημερινός
+LocaleNames/el_CY/EE=Εσθονία
+LocaleNames/el_CY/EG=Αίγυπτος
+LocaleNames/el_CY/EH=Δυτική Σαχάρα
+LocaleNames/el_CY/ER=Ερυθραία
+LocaleNames/el_CY/ES=Ισπανία
+LocaleNames/el_CY/ET=Αιθιοπία
+LocaleNames/el_CY/FI=Φινλανδία
+LocaleNames/el_CY/FJ=Φίτζι
+LocaleNames/el_CY/FK=Νήσοι Φόκλαντ
+LocaleNames/el_CY/FM=Μικρονησία
+LocaleNames/el_CY/FO=Νήσοι Φερόες
+LocaleNames/el_CY/FR=Γαλλία
+LocaleNames/el_CY/GA=Γκαμπόν
+LocaleNames/el_CY/GB=Ηνωμένο Βασίλειο
+LocaleNames/el_CY/GD=Γρενάδα
+LocaleNames/el_CY/GE=Γεωργία
+LocaleNames/el_CY/GF=Γαλλική Γουιάνα
+LocaleNames/el_CY/GH=Γκάνα
+LocaleNames/el_CY/GI=Γιβραλτάρ
+LocaleNames/el_CY/GL=Γροιλανδία
+LocaleNames/el_CY/GM=Γκάμπια
+LocaleNames/el_CY/GN=Γουινέα
+LocaleNames/el_CY/GP=Γουαδελούπη
+LocaleNames/el_CY/GQ=Ισημερινή Γουινέα
+LocaleNames/el_CY/GS=Νήσοι Νότια Γεωργία και Νότιες Σάντουιτς
+LocaleNames/el_CY/GT=Γουατεμάλα
+LocaleNames/el_CY/GU=Γκουάμ
+LocaleNames/el_CY/GW=Γουινέα Μπισάου
+LocaleNames/el_CY/GY=Γουιάνα
+LocaleNames/el_CY/HK=Χονγκ Κονγκ ΕΔΠ Κίνας
+LocaleNames/el_CY/HM=Νήσοι Χερντ και Μακντόναλντ
+LocaleNames/el_CY/HN=Ονδούρα
+LocaleNames/el_CY/HR=Κροατία
+LocaleNames/el_CY/HT=Αϊτή
+LocaleNames/el_CY/HU=Ουγγαρία
+LocaleNames/el_CY/ID=Ινδονησία
+LocaleNames/el_CY/IE=Ιρλανδία
+LocaleNames/el_CY/IL=Ισραήλ
+LocaleNames/el_CY/IN=Ινδία
+LocaleNames/el_CY/IO=Βρετανικά Εδάφη Ινδικού Ωκεανού
+LocaleNames/el_CY/IQ=Ιράκ
+LocaleNames/el_CY/IR=Ιράν
+LocaleNames/el_CY/IS=Ισλανδία
+LocaleNames/el_CY/IT=Ιταλία
+LocaleNames/el_CY/JM=Τζαμάικα
+LocaleNames/el_CY/JO=Ιορδανία
+LocaleNames/el_CY/JP=Ιαπωνία
+LocaleNames/el_CY/KE=Κένυα
+LocaleNames/el_CY/KG=Κιργιστάν
+LocaleNames/el_CY/KH=Καμπότζη
+LocaleNames/el_CY/KI=Κιριμπάτι
+LocaleNames/el_CY/KM=Κομόρες
+LocaleNames/el_CY/KN=Σεν Κιτς και Νέβις
+LocaleNames/el_CY/KP=Βόρεια Κορέα
+LocaleNames/el_CY/KR=Νότια Κορέα
+LocaleNames/el_CY/KW=Κουβέιτ
+LocaleNames/el_CY/KY=Νήσοι Κέιμαν
+LocaleNames/el_CY/KZ=Καζακστάν
+LocaleNames/el_CY/LA=Λάος
+LocaleNames/el_CY/LB=Λίβανος
+LocaleNames/el_CY/LC=Αγία Λουκία
+LocaleNames/el_CY/LI=Λιχτενστάιν
+LocaleNames/el_CY/LK=Σρι Λάνκα
+LocaleNames/el_CY/LR=Λιβερία
+LocaleNames/el_CY/LS=Λεσότο
+LocaleNames/el_CY/LT=Λιθουανία
+LocaleNames/el_CY/LU=Λουξεμβούργο
+LocaleNames/el_CY/LV=Λετονία
+LocaleNames/el_CY/LY=Λιβύη
+LocaleNames/el_CY/MA=Μαρόκο
+LocaleNames/el_CY/MC=Μονακό
+LocaleNames/el_CY/MD=Μολδαβία
+LocaleNames/el_CY/MG=Μαδαγασκάρη
+LocaleNames/el_CY/MH=Νήσοι Μάρσαλ
+LocaleNames/el_CY/MK=Βόρεια Μακεδονία
+LocaleNames/el_CY/ML=Μάλι
+LocaleNames/el_CY/MM=Μιανμάρ (Βιρμανία)
+LocaleNames/el_CY/MN=Μογγολία
+LocaleNames/el_CY/MO=Μακάο ΕΔΠ Κίνας
+LocaleNames/el_CY/MP=Νήσοι Βόρειες Μαριάνες
+LocaleNames/el_CY/MQ=Μαρτινίκα
+LocaleNames/el_CY/MR=Μαυριτανία
+LocaleNames/el_CY/MS=Μονσεράτ
+LocaleNames/el_CY/MT=Μάλτα
+LocaleNames/el_CY/MU=Μαυρίκιος
+LocaleNames/el_CY/MV=Μαλδίβες
+LocaleNames/el_CY/MW=Μαλάουι
+LocaleNames/el_CY/MX=Μεξικό
+LocaleNames/el_CY/MY=Μαλαισία
+LocaleNames/el_CY/MZ=Μοζαμβίκη
+LocaleNames/el_CY/NA=Ναμίμπια
+LocaleNames/el_CY/NC=Νέα Καληδονία
+LocaleNames/el_CY/NE=Νίγηρας
+LocaleNames/el_CY/NF=Νήσος Νόρφολκ
+LocaleNames/el_CY/NG=Νιγηρία
+LocaleNames/el_CY/NI=Νικαράγουα
+LocaleNames/el_CY/NL=Κάτω Χώρες
+LocaleNames/el_CY/NO=Νορβηγία
+LocaleNames/el_CY/NP=Νεπάλ
+LocaleNames/el_CY/NR=Ναουρού
+LocaleNames/el_CY/NU=Νιούε
+LocaleNames/el_CY/NZ=Νέα Ζηλανδία
+LocaleNames/el_CY/OM=Ομάν
+LocaleNames/el_CY/PA=Παναμάς
+LocaleNames/el_CY/PE=Περού
+LocaleNames/el_CY/PF=Γαλλική Πολυνησία
+LocaleNames/el_CY/PG=Παπούα Νέα Γουινέα
+LocaleNames/el_CY/PH=Φιλιππίνες
+LocaleNames/el_CY/PK=Πακιστάν
+LocaleNames/el_CY/PL=Πολωνία
+LocaleNames/el_CY/PM=Σεν Πιερ και Μικελόν
+LocaleNames/el_CY/PN=Νήσοι Πίτκερν
+LocaleNames/el_CY/PR=Πουέρτο Ρίκο
+LocaleNames/el_CY/PS=Παλαιστινιακά Εδάφη
+LocaleNames/el_CY/PT=Πορτογαλία
+LocaleNames/el_CY/PW=Παλάου
+LocaleNames/el_CY/PY=Παραγουάη
+LocaleNames/el_CY/QA=Κατάρ
+LocaleNames/el_CY/RE=Ρεϊνιόν
+LocaleNames/el_CY/RO=Ρουμανία
+LocaleNames/el_CY/RU=Ρωσία
+LocaleNames/el_CY/RW=Ρουάντα
+LocaleNames/el_CY/SA=Σαουδική Αραβία
+LocaleNames/el_CY/SB=Νήσοι Σολομώντος
+LocaleNames/el_CY/SC=Σεϋχέλλες
+LocaleNames/el_CY/SD=Σουδάν
+LocaleNames/el_CY/SE=Σουηδία
+LocaleNames/el_CY/SG=Σιγκαπούρη
+LocaleNames/el_CY/SH=Αγία Ελένη
+LocaleNames/el_CY/SI=Σλοβενία
+LocaleNames/el_CY/SJ=Σβάλμπαρντ και Γιαν Μαγιέν
+LocaleNames/el_CY/SK=Σλοβακία
+LocaleNames/el_CY/SL=Σιέρα Λεόνε
+LocaleNames/el_CY/SM=Άγιος Μαρίνος
+LocaleNames/el_CY/SN=Σενεγάλη
+LocaleNames/el_CY/SO=Σομαλία
+LocaleNames/el_CY/SR=Σουρινάμ
+LocaleNames/el_CY/ST=Σάο Τομέ και Πρίνσιπε
+LocaleNames/el_CY/SV=Ελ Σαλβαδόρ
+LocaleNames/el_CY/SY=Συρία
+LocaleNames/el_CY/SZ=Εσουατίνι
+LocaleNames/el_CY/TC=Νήσοι Τερκς και Κάικος
+LocaleNames/el_CY/TD=Τσαντ
+LocaleNames/el_CY/TF=Γαλλικά Νότια Εδάφη
+LocaleNames/el_CY/TG=Τόγκο
+LocaleNames/el_CY/TH=Ταϊλάνδη
+LocaleNames/el_CY/TJ=Τατζικιστάν
+LocaleNames/el_CY/TK=Τοκελάου
+LocaleNames/el_CY/TL=Τιμόρ-Λέστε
+LocaleNames/el_CY/TM=Τουρκμενιστάν
+LocaleNames/el_CY/TN=Τυνησία
+LocaleNames/el_CY/TO=Τόνγκα
+LocaleNames/el_CY/TR=Τουρκία
+LocaleNames/el_CY/TT=Τρινιντάντ και Τομπάγκο
+LocaleNames/el_CY/TV=Τουβαλού
+LocaleNames/el_CY/TW=Ταϊβάν
+LocaleNames/el_CY/TZ=Τανζανία
+LocaleNames/el_CY/UA=Ουκρανία
+LocaleNames/el_CY/UG=Ουγκάντα
+LocaleNames/el_CY/UM=Απομακρυσμένες Νησίδες ΗΠΑ
+LocaleNames/el_CY/US=Ηνωμένες Πολιτείες
+LocaleNames/el_CY/UY=Ουρουγουάη
+LocaleNames/el_CY/UZ=Ουζμπεκιστάν
+LocaleNames/el_CY/VA=Βατικανό
+LocaleNames/el_CY/VC=Άγιος Βικέντιος και Γρεναδίνες
+LocaleNames/el_CY/VE=Βενεζουέλα
+LocaleNames/el_CY/VG=Βρετανικές Παρθένες Νήσοι
+LocaleNames/el_CY/VI=Αμερικανικές Παρθένες Νήσοι
+LocaleNames/el_CY/VN=Βιετνάμ
+LocaleNames/el_CY/VU=Βανουάτου
+LocaleNames/el_CY/WF=Γουάλις και Φουτούνα
+LocaleNames/el_CY/WS=Σαμόα
+LocaleNames/el_CY/YE=Υεμένη
+LocaleNames/el_CY/YT=Μαγιότ
+LocaleNames/el_CY/ZA=Νότια Αφρική
+LocaleNames/el_CY/ZM=Ζάμπια
+LocaleNames/el_CY/ZW=Ζιμπάμπουε
+CurrencyNames/el_CY/EUR=€
 
 #ms_MY and ms
 FormatData/ms_MY/latn.NumberPatterns/0=#,##0.###
-FormatData/ms_MY/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/ms_MY/latn.NumberPatterns/1=¤#,##0.00
 FormatData/ms_MY/latn.NumberPatterns/2=#,##0%
-FormatData/ms_MY/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/ms_MY/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/ms_MY/TimePatterns/2=h:mm:ss\u202fa
-FormatData/ms_MY/TimePatterns/3=h:mm\u202fa
+FormatData/ms_MY/TimePatterns/0=h:mm:ss a zzzz
+FormatData/ms_MY/TimePatterns/1=h:mm:ss a z
+FormatData/ms_MY/TimePatterns/2=h:mm:ss a
+FormatData/ms_MY/TimePatterns/3=h:mm a
 FormatData/ms_MY/DatePatterns/0=EEEE, d MMMM y
 FormatData/ms_MY/DatePatterns/1=d MMMM y
 FormatData/ms_MY/DatePatterns/2=d MMM y
@@ -3099,7 +3099,7 @@ LocaleNames/ms/CA=Kanada
 LocaleNames/ms/CC=Kepulauan Cocos (Keeling)
 LocaleNames/ms/CD=Congo - Kinshasa
 LocaleNames/ms/CF=Republik Afrika Tengah
-LocaleNames/ms/CI=Cote d\u2019Ivoire
+LocaleNames/ms/CI=Cote d’Ivoire
 LocaleNames/ms/CL=Chile
 LocaleNames/ms/CM=Cameroon
 LocaleNames/ms/CN=China
@@ -3165,68 +3165,68 @@ LocaleNames/ms/ZA=Afrika Selatan
 FormatData/es_US/Eras/0=a.C.
 FormatData/es_US/Eras/1=d.C.
 FormatData/es_US/latn.NumberPatterns/0=#,##0.###
-FormatData/es_US/latn.NumberPatterns/1=\u00a4#,##0.00
+FormatData/es_US/latn.NumberPatterns/1=¤#,##0.00
 FormatData/es_US/latn.NumberPatterns/2=#,##0%
-FormatData/es_US/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_US/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_US/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_US/TimePatterns/3=h:mm\u202fa
+FormatData/es_US/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_US/TimePatterns/1=h:mm:ss a z
+FormatData/es_US/TimePatterns/2=h:mm:ss a
+FormatData/es_US/TimePatterns/3=h:mm a
 FormatData/es_US/DatePatterns/0=EEEE, d 'de' MMMM 'de' y
 FormatData/es_US/DatePatterns/1=d 'de' MMMM 'de' y
 FormatData/es_US/DatePatterns/2=d MMM y
 FormatData/es_US/DatePatterns/3=d/M/y
 FormatData/es_US/DateTimePatterns/0={1}, {0}
 LocaleNames/es_US/aa=afar
-LocaleNames/es_US/ae=av\u00e9stico
+LocaleNames/es_US/ae=avéstico
 LocaleNames/es_US/ak=akan
-LocaleNames/es_US/an=aragon\u00e9s
+LocaleNames/es_US/an=aragonés
 LocaleNames/es_US/av=avar
 LocaleNames/es_US/ay=aimara
 LocaleNames/es_US/az=azerbaiyano
 LocaleNames/es_US/ba=baskir
 LocaleNames/es_US/bm=bambara
-LocaleNames/es_US/bn=bengal\u00ed
+LocaleNames/es_US/bn=bengalí
 LocaleNames/es_US/bs=bosnio
 LocaleNames/es_US/ce=checheno
 LocaleNames/es_US/ch=chamorro
 LocaleNames/es_US/cr=cree
-LocaleNames/es_US/cu=eslavo eclesi\u00e1stico
+LocaleNames/es_US/cu=eslavo eclesiástico
 LocaleNames/es_US/cv=chuvasio
 LocaleNames/es_US/dv=divehi
-LocaleNames/es_US/ee=ew\u00e9
+LocaleNames/es_US/ee=ewé
 LocaleNames/es_US/eu=euskera
 LocaleNames/es_US/ff=fula
-LocaleNames/es_US/fo=fero\u00e9s
-LocaleNames/es_US/fy=fris\u00f3n occidental
-LocaleNames/es_US/gu=gurayat\u00ed
-LocaleNames/es_US/gv=man\u00e9s
+LocaleNames/es_US/fo=feroés
+LocaleNames/es_US/fy=frisón occidental
+LocaleNames/es_US/gu=gurayatí
+LocaleNames/es_US/gv=manés
 LocaleNames/es_US/hi=hindi
 LocaleNames/es_US/ho=hiri motu
 LocaleNames/es_US/ht=criollo haitiano
 LocaleNames/es_US/hz=herero
 LocaleNames/es_US/ie=interlingue
 LocaleNames/es_US/ig=igbo
-LocaleNames/es_US/ii=yi de Sichu\u00e1n
+LocaleNames/es_US/ii=yi de Sichuán
 LocaleNames/es_US/io=ido
-LocaleNames/es_US/jv=javan\u00e9s
+LocaleNames/es_US/jv=javanés
 LocaleNames/es_US/kg=kongo
 LocaleNames/es_US/ki=kikuyu
 LocaleNames/es_US/kj=kuanyama
 LocaleNames/es_US/kk=kazajo
 LocaleNames/es_US/km=jemer
-LocaleNames/es_US/kn=canar\u00e9s
+LocaleNames/es_US/kn=canarés
 LocaleNames/es_US/kr=kanuri
 LocaleNames/es_US/ks=cachemiro
 LocaleNames/es_US/ku=kurdo
 LocaleNames/es_US/kv=komi
-LocaleNames/es_US/kw=c\u00f3rnico
-LocaleNames/es_US/ky=kirgu\u00eds
-LocaleNames/es_US/lb=luxemburgu\u00e9s
+LocaleNames/es_US/kw=córnico
+LocaleNames/es_US/ky=kirguís
+LocaleNames/es_US/lb=luxemburgués
 LocaleNames/es_US/lg=ganda
-LocaleNames/es_US/li=limburgu\u00e9s
+LocaleNames/es_US/li=limburgués
 LocaleNames/es_US/lu=luba-katanga
-LocaleNames/es_US/mh=marshal\u00e9s
-LocaleNames/es_US/mr=marat\u00ed
+LocaleNames/es_US/mh=marshalés
+LocaleNames/es_US/mr=maratí
 LocaleNames/es_US/nb=noruego bokmal
 LocaleNames/es_US/nd=ndebele del norte
 LocaleNames/es_US/ng=ndonga
@@ -3236,7 +3236,7 @@ LocaleNames/es_US/nv=navajo
 LocaleNames/es_US/ny=nyanja
 LocaleNames/es_US/oc=occitano
 LocaleNames/es_US/oj=ojibwa
-LocaleNames/es_US/os=os\u00e9tico
+LocaleNames/es_US/os=osético
 LocaleNames/es_US/pi=pali
 LocaleNames/es_US/rm=romanche
 LocaleNames/es_US/rn=kirundi
@@ -3248,7 +3248,7 @@ LocaleNames/es_US/sl=esloveno
 LocaleNames/es_US/sn=shona
 LocaleNames/es_US/ss=siswati
 LocaleNames/es_US/st=sesotho del sur
-LocaleNames/es_US/su=sundan\u00e9s
+LocaleNames/es_US/su=sundanés
 LocaleNames/es_US/sw=swahili
 LocaleNames/es_US/tg=tayiko
 LocaleNames/es_US/tn=setsuana
@@ -3259,7 +3259,7 @@ LocaleNames/es_US/ug=uigur
 LocaleNames/es_US/uk=ucraniano
 LocaleNames/es_US/uz=uzbeko
 LocaleNames/es_US/ve=venda
-LocaleNames/es_US/wa=val\u00f3n
+LocaleNames/es_US/wa=valón
 LocaleNames/es_US/za=zhuang
 LocaleNames/es_US/BA=Bosnia y Herzegovina
 LocaleNames/es_US/CC=Islas Cocos
@@ -3269,14 +3269,14 @@ LocaleNames/es_US/EH=Sahara Occidental
 LocaleNames/es_US/FK=Islas Malvinas
 LocaleNames/es_US/HK=RAE de Hong Kong (China)
 LocaleNames/es_US/KM=Comoras
-LocaleNames/es_US/LC=Santa Luc\u00eda
+LocaleNames/es_US/LC=Santa Lucía
 LocaleNames/es_US/LS=Lesoto
 LocaleNames/es_US/MO=RAE de Macao (China)
 LocaleNames/es_US/MW=Malaui
-LocaleNames/es_US/NL=Pa\u00edses Bajos
+LocaleNames/es_US/NL=Países Bajos
 LocaleNames/es_US/NU=Niue
-LocaleNames/es_US/PG=Pap\u00faa Nueva Guinea
-LocaleNames/es_US/PK=Pakist\u00e1n
+LocaleNames/es_US/PG=Papúa Nueva Guinea
+LocaleNames/es_US/PK=Pakistán
 LocaleNames/es_US/PN=Islas Pitcairn
 LocaleNames/es_US/PS=Territorios Palestinos
 LocaleNames/es_US/PW=Palaos
@@ -3286,169 +3286,169 @@ LocaleNames/es_US/SH=Santa Elena
 LocaleNames/es_US/TF=Territorios Australes Franceses
 LocaleNames/es_US/TK=Tokelau
 LocaleNames/es_US/TT=Trinidad y Tobago
-LocaleNames/es_US/VI=Islas V\u00edrgenes de EE. UU.
+LocaleNames/es_US/VI=Islas Vírgenes de EE. UU.
 CurrencyNames/es_US/USD=$
 #bug 4400849
 LocaleNames/pt/aa=afar
-LocaleNames/pt/ab=abc\u00e1zio
-LocaleNames/pt/ae=av\u00e9stico
-LocaleNames/pt/af=afric\u00e2ner
-LocaleNames/pt/am=am\u00e1rico
-LocaleNames/pt/an=aragon\u00eas
-LocaleNames/pt/ar=\u00e1rabe
-LocaleNames/pt/as=assam\u00eas
-LocaleNames/pt/av=av\u00e1rico
-LocaleNames/pt/ay=aimar\u00e1
+LocaleNames/pt/ab=abcázio
+LocaleNames/pt/ae=avéstico
+LocaleNames/pt/af=africâner
+LocaleNames/pt/am=amárico
+LocaleNames/pt/an=aragonês
+LocaleNames/pt/ar=árabe
+LocaleNames/pt/as=assamês
+LocaleNames/pt/av=avárico
+LocaleNames/pt/ay=aimará
 LocaleNames/pt/az=azerbaijano
 LocaleNames/pt/ba=bashkir
 LocaleNames/pt/be=bielorrusso
-LocaleNames/pt/bg=b\u00falgaro
-LocaleNames/pt/bi=bislam\u00e1
+LocaleNames/pt/bg=búlgaro
+LocaleNames/pt/bi=bislamá
 LocaleNames/pt/bm=bambara
 LocaleNames/pt/bn=bengali
 LocaleNames/pt/bo=tibetano
-LocaleNames/pt/br=bret\u00e3o
-LocaleNames/pt/bs=b\u00f3snio
-LocaleNames/pt/ca=catal\u00e3o
+LocaleNames/pt/br=bretão
+LocaleNames/pt/bs=bósnio
+LocaleNames/pt/ca=catalão
 LocaleNames/pt/ce=checheno
 LocaleNames/pt/ch=chamorro
 LocaleNames/pt/co=corso
 LocaleNames/pt/cr=cree
 LocaleNames/pt/cs=tcheco
-LocaleNames/pt/cu=eslavo eclesi\u00e1stico
+LocaleNames/pt/cu=eslavo eclesiástico
 LocaleNames/pt/cv=tchuvache
-LocaleNames/pt/cy=gal\u00eas
-LocaleNames/pt/da=dinamarqu\u00eas
-LocaleNames/pt/de=alem\u00e3o
+LocaleNames/pt/cy=galês
+LocaleNames/pt/da=dinamarquês
+LocaleNames/pt/de=alemão
 LocaleNames/pt/dv=divehi
 LocaleNames/pt/dz=dzonga
 LocaleNames/pt/ee=ewe
 LocaleNames/pt/el=grego
-LocaleNames/pt/en=ingl\u00eas
+LocaleNames/pt/en=inglês
 LocaleNames/pt/eo=esperanto
 LocaleNames/pt/es=espanhol
 LocaleNames/pt/et=estoniano
 LocaleNames/pt/eu=basco
 LocaleNames/pt/fa=persa
 LocaleNames/pt/ff=fula
-LocaleNames/pt/fi=finland\u00eas
+LocaleNames/pt/fi=finlandês
 LocaleNames/pt/fj=fijiano
-LocaleNames/pt/fo=fero\u00eas
-LocaleNames/pt/fr=franc\u00eas
-LocaleNames/pt/fy=fr\u00edsio ocidental
-LocaleNames/pt/ga=irland\u00eas
-LocaleNames/pt/gd=ga\u00e9lico escoc\u00eas
+LocaleNames/pt/fo=feroês
+LocaleNames/pt/fr=francês
+LocaleNames/pt/fy=frísio ocidental
+LocaleNames/pt/ga=irlandês
+LocaleNames/pt/gd=gaélico escocês
 LocaleNames/pt/gl=galego
 LocaleNames/pt/gn=guarani
 LocaleNames/pt/gu=guzerate
 LocaleNames/pt/gv=manx
-LocaleNames/pt/ha=hau\u00e7\u00e1
+LocaleNames/pt/ha=hauçá
 LocaleNames/pt/he=hebraico
-LocaleNames/pt/hi=h\u00edndi
+LocaleNames/pt/hi=híndi
 LocaleNames/pt/ho=hiri motu
 LocaleNames/pt/hr=croata
 LocaleNames/pt/ht=haitiano
-LocaleNames/pt/hu=h\u00fangaro
-LocaleNames/pt/hy=arm\u00eanio
+LocaleNames/pt/hu=húngaro
+LocaleNames/pt/hy=armênio
 LocaleNames/pt/hz=herero
-LocaleNames/pt/ia=interl\u00edngua
-LocaleNames/pt/id=indon\u00e9sio
+LocaleNames/pt/ia=interlíngua
+LocaleNames/pt/id=indonésio
 LocaleNames/pt/ie=interlingue
 LocaleNames/pt/ig=igbo
 LocaleNames/pt/ii=sichuan yi
 LocaleNames/pt/io=ido
-LocaleNames/pt/is=island\u00eas
+LocaleNames/pt/is=islandês
 LocaleNames/pt/it=italiano
 LocaleNames/pt/iu=inuktitut
-LocaleNames/pt/ja=japon\u00eas
+LocaleNames/pt/ja=japonês
 LocaleNames/pt/ka=georgiano
-LocaleNames/pt/kg=congol\u00eas
+LocaleNames/pt/kg=congolês
 LocaleNames/pt/ki=quicuio
 LocaleNames/pt/kj=cuanhama
 LocaleNames/pt/kk=cazaque
-LocaleNames/pt/kl=groenland\u00eas
+LocaleNames/pt/kl=groenlandês
 LocaleNames/pt/km=khmer
 LocaleNames/pt/kn=canarim
 LocaleNames/pt/ko=coreano
-LocaleNames/pt/kr=can\u00fari
+LocaleNames/pt/kr=canúri
 LocaleNames/pt/ks=caxemira
 LocaleNames/pt/ku=curdo
 LocaleNames/pt/kv=komi
-LocaleNames/pt/kw=c\u00f3rnico
+LocaleNames/pt/kw=córnico
 LocaleNames/pt/ky=quirguiz
 LocaleNames/pt/la=latim
-LocaleNames/pt/lb=luxemburgu\u00eas
+LocaleNames/pt/lb=luxemburguês
 LocaleNames/pt/lg=luganda
-LocaleNames/pt/li=limburgu\u00eas
+LocaleNames/pt/li=limburguês
 LocaleNames/pt/ln=lingala
 LocaleNames/pt/lo=laosiano
 LocaleNames/pt/lt=lituano
 LocaleNames/pt/lu=luba-catanga
-LocaleNames/pt/lv=let\u00e3o
+LocaleNames/pt/lv=letão
 LocaleNames/pt/mg=malgaxe
-LocaleNames/pt/mh=marshal\u00eas
+LocaleNames/pt/mh=marshalês
 LocaleNames/pt/mi=maori
-LocaleNames/pt/mk=maced\u00f4nio
+LocaleNames/pt/mk=macedônio
 LocaleNames/pt/ml=malaiala
 LocaleNames/pt/mn=mongol
 LocaleNames/pt/mr=marati
 LocaleNames/pt/ms=malaio
-LocaleNames/pt/mt=malt\u00eas
-LocaleNames/pt/my=birman\u00eas
+LocaleNames/pt/mt=maltês
+LocaleNames/pt/my=birmanês
 LocaleNames/pt/na=nauruano
-LocaleNames/pt/nb=bokm\u00e5l noruegu\u00eas
+LocaleNames/pt/nb=bokmål norueguês
 LocaleNames/pt/nd=ndebele do norte
-LocaleNames/pt/ne=nepal\u00eas
+LocaleNames/pt/ne=nepalês
 LocaleNames/pt/ng=dongo
-LocaleNames/pt/nl=holand\u00eas
-LocaleNames/pt/nn=nynorsk noruegu\u00eas
-LocaleNames/pt/no=noruegu\u00eas
+LocaleNames/pt/nl=holandês
+LocaleNames/pt/nn=nynorsk norueguês
+LocaleNames/pt/no=norueguês
 LocaleNames/pt/nr=ndebele do sul
 LocaleNames/pt/nv=navajo
 LocaleNames/pt/ny=nianja
-LocaleNames/pt/oc=occit\u00e2nico
+LocaleNames/pt/oc=occitânico
 LocaleNames/pt/oj=ojibwa
 LocaleNames/pt/om=oromo
-LocaleNames/pt/or=ori\u00e1
+LocaleNames/pt/or=oriá
 LocaleNames/pt/os=osseto
 LocaleNames/pt/pa=panjabi
-LocaleNames/pt/pi=p\u00e1li
-LocaleNames/pt/pl=polon\u00eas
+LocaleNames/pt/pi=páli
+LocaleNames/pt/pl=polonês
 LocaleNames/pt/ps=pashto
-LocaleNames/pt/pt=portugu\u00eas
-LocaleNames/pt/qu=qu\u00edchua
+LocaleNames/pt/pt=português
+LocaleNames/pt/qu=quíchua
 LocaleNames/pt/rm=romanche
 LocaleNames/pt/rn=rundi
 LocaleNames/pt/ro=romeno
 LocaleNames/pt/ru=russo
 LocaleNames/pt/rw=quiniaruanda
-LocaleNames/pt/sa=s\u00e2nscrito
+LocaleNames/pt/sa=sânscrito
 LocaleNames/pt/sc=sardo
 LocaleNames/pt/sd=sindi
 LocaleNames/pt/se=sami setentrional
 LocaleNames/pt/sg=sango
-LocaleNames/pt/si=cingal\u00eas
+LocaleNames/pt/si=cingalês
 LocaleNames/pt/sk=eslovaco
 LocaleNames/pt/sl=esloveno
 LocaleNames/pt/so=somali
-LocaleNames/pt/sq=alban\u00eas
-LocaleNames/pt/sr=s\u00e9rvio
-LocaleNames/pt/ss=su\u00e1zi
+LocaleNames/pt/sq=albanês
+LocaleNames/pt/sr=sérvio
+LocaleNames/pt/ss=suázi
 LocaleNames/pt/st=soto do sul
-LocaleNames/pt/su=sundan\u00eas
+LocaleNames/pt/su=sundanês
 LocaleNames/pt/sv=sueco
-LocaleNames/pt/sw=sua\u00edli
-LocaleNames/pt/ta=t\u00e2mil
-LocaleNames/pt/te=t\u00e9lugo
+LocaleNames/pt/sw=suaíli
+LocaleNames/pt/ta=tâmil
+LocaleNames/pt/te=télugo
 LocaleNames/pt/tg=tadjique
-LocaleNames/pt/th=tailand\u00eas
-LocaleNames/pt/ti=tigr\u00ednia
+LocaleNames/pt/th=tailandês
+LocaleNames/pt/ti=tigrínia
 LocaleNames/pt/tk=turcomeno
 LocaleNames/pt/tn=tswana
-LocaleNames/pt/to=tongan\u00eas
+LocaleNames/pt/to=tonganês
 LocaleNames/pt/tr=turco
 LocaleNames/pt/ts=tsonga
-LocaleNames/pt/tt=t\u00e1rtaro
+LocaleNames/pt/tt=tártaro
 LocaleNames/pt/tw=twi
 LocaleNames/pt/ty=taitiano
 LocaleNames/pt/ug=uigur
@@ -3458,628 +3458,628 @@ LocaleNames/pt/uz=uzbeque
 LocaleNames/pt/ve=venda
 LocaleNames/pt/vi=vietnamita
 LocaleNames/pt/vo=volapuque
-LocaleNames/pt/wa=val\u00e3o
+LocaleNames/pt/wa=valão
 LocaleNames/pt/wo=uolofe
 LocaleNames/pt/xh=xhosa
-LocaleNames/pt/yi=i\u00eddiche
-LocaleNames/pt/yo=iorub\u00e1
+LocaleNames/pt/yi=iídiche
+LocaleNames/pt/yo=iorubá
 LocaleNames/pt/za=zhuang
-LocaleNames/pt/zh=chin\u00eas
+LocaleNames/pt/zh=chinês
 LocaleNames/pt/zu=zulu
-LocaleNames/pt/AE=Emirados \u00c1rabes Unidos
-LocaleNames/pt/AF=Afeganist\u00e3o
-LocaleNames/pt/AG=Ant\u00edgua e Barbuda
-LocaleNames/pt/AL=Alb\u00e2nia
-LocaleNames/pt/AM=Arm\u00eania
-LocaleNames/pt/AQ=Ant\u00e1rtida
+LocaleNames/pt/AE=Emirados Árabes Unidos
+LocaleNames/pt/AF=Afeganistão
+LocaleNames/pt/AG=Antígua e Barbuda
+LocaleNames/pt/AL=Albânia
+LocaleNames/pt/AM=Armênia
+LocaleNames/pt/AQ=Antártida
 LocaleNames/pt/AS=Samoa Americana
-LocaleNames/pt/AT=\u00c1ustria
-LocaleNames/pt/AU=Austr\u00e1lia
-LocaleNames/pt/AZ=Azerbaij\u00e3o
-LocaleNames/pt/BA=B\u00f3snia e Herzegovina
-LocaleNames/pt/BE=B\u00e9lgica
+LocaleNames/pt/AT=Áustria
+LocaleNames/pt/AU=Austrália
+LocaleNames/pt/AZ=Azerbaijão
+LocaleNames/pt/BA=Bósnia e Herzegovina
+LocaleNames/pt/BE=Bélgica
 LocaleNames/pt/BF=Burquina Faso
-LocaleNames/pt/BG=Bulg\u00e1ria
+LocaleNames/pt/BG=Bulgária
 LocaleNames/pt/BH=Barein
 LocaleNames/pt/BM=Bermudas
-LocaleNames/pt/BO=Bol\u00edvia
+LocaleNames/pt/BO=Bolívia
 LocaleNames/pt/BR=Brasil
-LocaleNames/pt/BT=But\u00e3o
+LocaleNames/pt/BT=Butão
 LocaleNames/pt/BV=Ilha Bouvet
 LocaleNames/pt/BW=Botsuana
-LocaleNames/pt/CA=Canad\u00e1
+LocaleNames/pt/CA=Canadá
 LocaleNames/pt/CC=Ilhas Cocos (Keeling)
 LocaleNames/pt/CD=Congo - Kinshasa
-LocaleNames/pt/CF=Rep\u00fablica Centro-Africana
-LocaleNames/pt/CH=Su\u00ed\u00e7a
+LocaleNames/pt/CF=República Centro-Africana
+LocaleNames/pt/CH=Suíça
 LocaleNames/pt/CI=Costa do Marfim
 LocaleNames/pt/CK=Ilhas Cook
-LocaleNames/pt/CM=Camar\u00f5es
-LocaleNames/pt/CO=Col\u00f4mbia
+LocaleNames/pt/CM=Camarões
+LocaleNames/pt/CO=Colômbia
 LocaleNames/pt/CV=Cabo Verde
 LocaleNames/pt/CX=Ilha Christmas
 LocaleNames/pt/CY=Chipre
-LocaleNames/pt/CZ=Tch\u00e9quia
+LocaleNames/pt/CZ=Tchéquia
 LocaleNames/pt/DE=Alemanha
 LocaleNames/pt/DJ=Djibuti
 LocaleNames/pt/DK=Dinamarca
-LocaleNames/pt/DO=Rep\u00fablica Dominicana
-LocaleNames/pt/DZ=Arg\u00e9lia
+LocaleNames/pt/DO=República Dominicana
+LocaleNames/pt/DZ=Argélia
 LocaleNames/pt/EC=Equador
-LocaleNames/pt/EE=Est\u00f4nia
+LocaleNames/pt/EE=Estônia
 LocaleNames/pt/EG=Egito
 LocaleNames/pt/EH=Saara Ocidental
 LocaleNames/pt/ER=Eritreia
 LocaleNames/pt/ES=Espanha
-LocaleNames/pt/ET=Eti\u00f3pia
-LocaleNames/pt/FI=Finl\u00e2ndia
+LocaleNames/pt/ET=Etiópia
+LocaleNames/pt/FI=Finlândia
 LocaleNames/pt/FK=Ilhas Malvinas
-LocaleNames/pt/FM=Micron\u00e9sia
-LocaleNames/pt/FO=Ilhas Faro\u00e9
-LocaleNames/pt/FR=Fran\u00e7a
-LocaleNames/pt/GA=Gab\u00e3o
+LocaleNames/pt/FM=Micronésia
+LocaleNames/pt/FO=Ilhas Faroé
+LocaleNames/pt/FR=França
+LocaleNames/pt/GA=Gabão
 LocaleNames/pt/GB=Reino Unido
 LocaleNames/pt/GD=Granada
-LocaleNames/pt/GE=Ge\u00f3rgia
+LocaleNames/pt/GE=Geórgia
 LocaleNames/pt/GF=Guiana Francesa
 LocaleNames/pt/GH=Gana
-LocaleNames/pt/GL=Groenl\u00e2ndia
-LocaleNames/pt/GM=G\u00e2mbia
-LocaleNames/pt/GN=Guin\u00e9
+LocaleNames/pt/GL=Groenlândia
+LocaleNames/pt/GM=Gâmbia
+LocaleNames/pt/GN=Guiné
 LocaleNames/pt/GP=Guadalupe
-LocaleNames/pt/GQ=Guin\u00e9 Equatorial
-LocaleNames/pt/GR=Gr\u00e9cia
-LocaleNames/pt/GS=Ilhas Ge\u00f3rgia do Sul e Sandwich do Sul
-LocaleNames/pt/GW=Guin\u00e9-Bissau
+LocaleNames/pt/GQ=Guiné Equatorial
+LocaleNames/pt/GR=Grécia
+LocaleNames/pt/GS=Ilhas Geórgia do Sul e Sandwich do Sul
+LocaleNames/pt/GW=Guiné-Bissau
 LocaleNames/pt/GY=Guiana
 LocaleNames/pt/HK=Hong Kong, RAE da China
 LocaleNames/pt/HM=Ilhas Heard e McDonald
-LocaleNames/pt/HR=Cro\u00e1cia
+LocaleNames/pt/HR=Croácia
 LocaleNames/pt/HU=Hungria
-LocaleNames/pt/ID=Indon\u00e9sia
+LocaleNames/pt/ID=Indonésia
 LocaleNames/pt/IE=Irlanda
-LocaleNames/pt/IN=\u00cdndia
-LocaleNames/pt/IO=Territ\u00f3rio Brit\u00e2nico do Oceano \u00cdndico
+LocaleNames/pt/IN=Índia
+LocaleNames/pt/IO=Território Britânico do Oceano Índico
 LocaleNames/pt/IQ=Iraque
-LocaleNames/pt/IR=Ir\u00e3
-LocaleNames/pt/IS=Isl\u00e2ndia
-LocaleNames/pt/IT=It\u00e1lia
-LocaleNames/pt/JO=Jord\u00e2nia
-LocaleNames/pt/JP=Jap\u00e3o
-LocaleNames/pt/KE=Qu\u00eania
-LocaleNames/pt/KG=Quirguist\u00e3o
+LocaleNames/pt/IR=Irã
+LocaleNames/pt/IS=Islândia
+LocaleNames/pt/IT=Itália
+LocaleNames/pt/JO=Jordânia
+LocaleNames/pt/JP=Japão
+LocaleNames/pt/KE=Quênia
+LocaleNames/pt/KG=Quirguistão
 LocaleNames/pt/KH=Camboja
 LocaleNames/pt/KI=Quiribati
 LocaleNames/pt/KM=Comores
-LocaleNames/pt/KN=S\u00e3o Crist\u00f3v\u00e3o e N\u00e9vis
+LocaleNames/pt/KN=São Cristóvão e Névis
 LocaleNames/pt/KP=Coreia do Norte
 LocaleNames/pt/KR=Coreia do Sul
 LocaleNames/pt/KY=Ilhas Cayman
-LocaleNames/pt/KZ=Cazaquist\u00e3o
+LocaleNames/pt/KZ=Cazaquistão
 LocaleNames/pt/LA=Laos
-LocaleNames/pt/LB=L\u00edbano
-LocaleNames/pt/LC=Santa L\u00facia
-LocaleNames/pt/LR=Lib\u00e9ria
+LocaleNames/pt/LB=Líbano
+LocaleNames/pt/LC=Santa Lúcia
+LocaleNames/pt/LR=Libéria
 LocaleNames/pt/LS=Lesoto
-LocaleNames/pt/LT=Litu\u00e2nia
+LocaleNames/pt/LT=Lituânia
 LocaleNames/pt/LU=Luxemburgo
-LocaleNames/pt/LV=Let\u00f4nia
-LocaleNames/pt/LY=L\u00edbia
+LocaleNames/pt/LV=Letônia
+LocaleNames/pt/LY=Líbia
 LocaleNames/pt/MA=Marrocos
-LocaleNames/pt/MC=M\u00f4naco
-LocaleNames/pt/MD=Mold\u00e1via
+LocaleNames/pt/MC=Mônaco
+LocaleNames/pt/MD=Moldávia
 LocaleNames/pt/MH=Ilhas Marshall
-LocaleNames/pt/MK=Maced\u00f4nia do Norte
-LocaleNames/pt/MM=Mianmar (Birm\u00e2nia)
-LocaleNames/pt/MN=Mong\u00f3lia
+LocaleNames/pt/MK=Macedônia do Norte
+LocaleNames/pt/MM=Mianmar (Birmânia)
+LocaleNames/pt/MN=Mongólia
 LocaleNames/pt/MO=Macau, RAE da China
 LocaleNames/pt/MP=Ilhas Marianas do Norte
 LocaleNames/pt/MQ=Martinica
-LocaleNames/pt/MR=Maurit\u00e2nia
-LocaleNames/pt/MU=Maur\u00edcio
+LocaleNames/pt/MR=Mauritânia
+LocaleNames/pt/MU=Maurício
 LocaleNames/pt/MV=Maldivas
-LocaleNames/pt/MX=M\u00e9xico
-LocaleNames/pt/MY=Mal\u00e1sia
-LocaleNames/pt/MZ=Mo\u00e7ambique
-LocaleNames/pt/NA=Nam\u00edbia
-LocaleNames/pt/NC=Nova Caled\u00f4nia
-LocaleNames/pt/NE=N\u00edger
+LocaleNames/pt/MX=México
+LocaleNames/pt/MY=Malásia
+LocaleNames/pt/MZ=Moçambique
+LocaleNames/pt/NA=Namíbia
+LocaleNames/pt/NC=Nova Caledônia
+LocaleNames/pt/NE=Níger
 LocaleNames/pt/NF=Ilha Norfolk
-LocaleNames/pt/NG=Nig\u00e9ria
-LocaleNames/pt/NI=Nicar\u00e1gua
-LocaleNames/pt/NL=Pa\u00edses Baixos
+LocaleNames/pt/NG=Nigéria
+LocaleNames/pt/NI=Nicarágua
+LocaleNames/pt/NL=Países Baixos
 LocaleNames/pt/NO=Noruega
-LocaleNames/pt/NZ=Nova Zel\u00e2ndia
-LocaleNames/pt/OM=Om\u00e3
-LocaleNames/pt/PA=Panam\u00e1
-LocaleNames/pt/PF=Polin\u00e9sia Francesa
-LocaleNames/pt/PG=Papua-Nova Guin\u00e9
+LocaleNames/pt/NZ=Nova Zelândia
+LocaleNames/pt/OM=Omã
+LocaleNames/pt/PA=Panamá
+LocaleNames/pt/PF=Polinésia Francesa
+LocaleNames/pt/PG=Papua-Nova Guiné
 LocaleNames/pt/PH=Filipinas
-LocaleNames/pt/PK=Paquist\u00e3o
-LocaleNames/pt/PL=Pol\u00f4nia
-LocaleNames/pt/PM=S\u00e3o Pedro e Miquel\u00e3o
+LocaleNames/pt/PK=Paquistão
+LocaleNames/pt/PL=Polônia
+LocaleNames/pt/PM=São Pedro e Miquelão
 LocaleNames/pt/PR=Porto Rico
-LocaleNames/pt/PS=Territ\u00f3rios palestinos
+LocaleNames/pt/PS=Territórios palestinos
 LocaleNames/pt/PY=Paraguai
 LocaleNames/pt/QA=Catar
-LocaleNames/pt/RE=Reuni\u00e3o
-LocaleNames/pt/RO=Rom\u00eania
-LocaleNames/pt/RU=R\u00fassia
+LocaleNames/pt/RE=Reunião
+LocaleNames/pt/RO=Romênia
+LocaleNames/pt/RU=Rússia
 LocaleNames/pt/RW=Ruanda
-LocaleNames/pt/SA=Ar\u00e1bia Saudita
-LocaleNames/pt/SB=Ilhas Salom\u00e3o
-LocaleNames/pt/SD=Sud\u00e3o
-LocaleNames/pt/SE=Su\u00e9cia
+LocaleNames/pt/SA=Arábia Saudita
+LocaleNames/pt/SB=Ilhas Salomão
+LocaleNames/pt/SD=Sudão
+LocaleNames/pt/SE=Suécia
 LocaleNames/pt/SG=Singapura
 LocaleNames/pt/SH=Santa Helena
-LocaleNames/pt/SI=Eslov\u00eania
+LocaleNames/pt/SI=Eslovênia
 LocaleNames/pt/SJ=Svalbard e Jan Mayen
-LocaleNames/pt/SK=Eslov\u00e1quia
+LocaleNames/pt/SK=Eslováquia
 LocaleNames/pt/SL=Serra Leoa
-LocaleNames/pt/SO=Som\u00e1lia
-LocaleNames/pt/ST=S\u00e3o Tom\u00e9 e Pr\u00edncipe
-LocaleNames/pt/SY=S\u00edria
-LocaleNames/pt/SZ=Essuat\u00edni
+LocaleNames/pt/SO=Somália
+LocaleNames/pt/ST=São Tomé e Príncipe
+LocaleNames/pt/SY=Síria
+LocaleNames/pt/SZ=Essuatíni
 LocaleNames/pt/TC=Ilhas Turcas e Caicos
 LocaleNames/pt/TD=Chade
-LocaleNames/pt/TF=Territ\u00f3rios Franceses do Sul
-LocaleNames/pt/TH=Tail\u00e2ndia
-LocaleNames/pt/TJ=Tadjiquist\u00e3o
+LocaleNames/pt/TF=Territórios Franceses do Sul
+LocaleNames/pt/TH=Tailândia
+LocaleNames/pt/TJ=Tadjiquistão
 LocaleNames/pt/TL=Timor-Leste
-LocaleNames/pt/TM=Turcomenist\u00e3o
-LocaleNames/pt/TN=Tun\u00edsia
+LocaleNames/pt/TM=Turcomenistão
+LocaleNames/pt/TN=Tunísia
 LocaleNames/pt/TR=Turquia
 LocaleNames/pt/TT=Trinidad e Tobago
-LocaleNames/pt/TZ=Tanz\u00e2nia
-LocaleNames/pt/UA=Ucr\u00e2nia
+LocaleNames/pt/TZ=Tanzânia
+LocaleNames/pt/UA=Ucrânia
 LocaleNames/pt/UM=Ilhas Menores Distantes dos EUA
 LocaleNames/pt/US=Estados Unidos
 LocaleNames/pt/UY=Uruguai
-LocaleNames/pt/UZ=Uzbequist\u00e3o
+LocaleNames/pt/UZ=Uzbequistão
 LocaleNames/pt/VA=Cidade do Vaticano
-LocaleNames/pt/VC=S\u00e3o Vicente e Granadinas
-LocaleNames/pt/VG=Ilhas Virgens Brit\u00e2nicas
+LocaleNames/pt/VC=São Vicente e Granadinas
+LocaleNames/pt/VG=Ilhas Virgens Britânicas
 LocaleNames/pt/VI=Ilhas Virgens Americanas
-LocaleNames/pt/VN=Vietn\u00e3
+LocaleNames/pt/VN=Vietnã
 LocaleNames/pt/WF=Wallis e Futuna
-LocaleNames/pt/YE=I\u00eamen
-LocaleNames/pt/ZA=\u00c1frica do Sul
-LocaleNames/pt/ZM=Z\u00e2mbia
-LocaleNames/pt/ZW=Zimb\u00e1bue
+LocaleNames/pt/YE=Iêmen
+LocaleNames/pt/ZA=África do Sul
+LocaleNames/pt/ZM=Zâmbia
+LocaleNames/pt/ZW=Zimbábue
 # pt_PT
 LocaleNames/pt_PT/cs=checo
-LocaleNames/pt_PT/et=est\u00f3nio
+LocaleNames/pt_PT/et=estónio
 LocaleNames/pt_PT/pl=polaco
 LocaleNames/pt_PT/sl=esloveno
-LocaleNames/pt_PT/AE=Emirados \u00c1rabes Unidos
-LocaleNames/pt_PT/AM=Arm\u00e9nia
-LocaleNames/pt_PT/AQ=Ant\u00e1rtida
-LocaleNames/pt_PT/AZ=Azerbaij\u00e3o
-LocaleNames/pt_PT/BA=B\u00f3snia e Herzegovina
+LocaleNames/pt_PT/AE=Emirados Árabes Unidos
+LocaleNames/pt_PT/AM=Arménia
+LocaleNames/pt_PT/AQ=Antártida
+LocaleNames/pt_PT/AZ=Azerbaijão
+LocaleNames/pt_PT/BA=Bósnia e Herzegovina
 LocaleNames/pt_PT/BJ=Benim
-LocaleNames/pt_PT/BY=Bielorr\u00fassia
-LocaleNames/pt_PT/CM=Camar\u00f5es
+LocaleNames/pt_PT/BY=Bielorrússia
+LocaleNames/pt_PT/CM=Camarões
 LocaleNames/pt_PT/CX=Ilha do Natal
-LocaleNames/pt_PT/CZ=Ch\u00e9quia
-LocaleNames/pt_PT/EE=Est\u00f3nia
+LocaleNames/pt_PT/CZ=Chéquia
+LocaleNames/pt_PT/EE=Estónia
 LocaleNames/pt_PT/EG=Egito
 LocaleNames/pt_PT/EH=Sara Ocidental
 LocaleNames/pt_PT/ER=Eritreia
 LocaleNames/pt_PT/FK=Ilhas Falkland
-LocaleNames/pt_PT/GL=Gronel\u00e2ndia
-LocaleNames/pt_PT/GS=Ilhas Ge\u00f3rgia do Sul e Sandwich do Sul
-LocaleNames/pt_PT/GW=Guin\u00e9-Bissau
+LocaleNames/pt_PT/GL=Gronelândia
+LocaleNames/pt_PT/GS=Ilhas Geórgia do Sul e Sandwich do Sul
+LocaleNames/pt_PT/GW=Guiné-Bissau
 LocaleNames/pt_PT/HK=Hong Kong, RAE da China
-LocaleNames/pt_PT/KE=Qu\u00e9nia
-LocaleNames/pt_PT/KG=Quirguist\u00e3o
-LocaleNames/pt_PT/KN=S\u00e3o Crist\u00f3v\u00e3o e Neves
+LocaleNames/pt_PT/KE=Quénia
+LocaleNames/pt_PT/KG=Quirguistão
+LocaleNames/pt_PT/KN=São Cristóvão e Neves
 LocaleNames/pt_PT/KP=Coreia do Norte
 LocaleNames/pt_PT/KR=Coreia do Sul
-LocaleNames/pt_PT/KY=Ilhas Caim\u00e3o
-LocaleNames/pt_PT/KZ=Cazaquist\u00e3o
+LocaleNames/pt_PT/KY=Ilhas Caimão
+LocaleNames/pt_PT/KZ=Cazaquistão
 LocaleNames/pt_PT/LA=Laos
-LocaleNames/pt_PT/LV=Let\u00f3nia
-LocaleNames/pt_PT/MC=M\u00f3naco
-LocaleNames/pt_PT/MD=Mold\u00e1via
-LocaleNames/pt_PT/MG=Madag\u00e1scar
-LocaleNames/pt_PT/MK=Maced\u00f3nia do Norte
+LocaleNames/pt_PT/LV=Letónia
+LocaleNames/pt_PT/MC=Mónaco
+LocaleNames/pt_PT/MD=Moldávia
+LocaleNames/pt_PT/MG=Madagáscar
+LocaleNames/pt_PT/MK=Macedónia do Norte
 LocaleNames/pt_PT/MO=Macau, RAE da China
 LocaleNames/pt_PT/MP=Ilhas Marianas do Norte
-LocaleNames/pt_PT/MU=Maur\u00edcia
-LocaleNames/pt_PT/NC=Nova Caled\u00f3nia
-LocaleNames/pt_PT/PG=Papua-Nova Guin\u00e9
-LocaleNames/pt_PT/PL=Pol\u00f3nia
-LocaleNames/pt_PT/PS=Territ\u00f3rios palestinianos
-LocaleNames/pt_PT/RE=Reuni\u00e3o
-LocaleNames/pt_PT/RO=Rom\u00e9nia
+LocaleNames/pt_PT/MU=Maurícia
+LocaleNames/pt_PT/NC=Nova Caledónia
+LocaleNames/pt_PT/PG=Papua-Nova Guiné
+LocaleNames/pt_PT/PL=Polónia
+LocaleNames/pt_PT/PS=Territórios palestinianos
+LocaleNames/pt_PT/RE=Reunião
+LocaleNames/pt_PT/RO=Roménia
 LocaleNames/pt_PT/SC=Seicheles
 LocaleNames/pt_PT/SG=Singapura
-LocaleNames/pt_PT/SI=Eslov\u00e9nia
-LocaleNames/pt_PT/SM=S\u00e3o Marinho
+LocaleNames/pt_PT/SI=Eslovénia
+LocaleNames/pt_PT/SM=São Marinho
 LocaleNames/pt_PT/TC=Ilhas Turcas e Caicos
 LocaleNames/pt_PT/TD=Chade
-LocaleNames/pt_PT/TF=Territ\u00f3rios Austrais Franceses
-LocaleNames/pt_PT/TJ=Tajiquist\u00e3o
-LocaleNames/pt_PT/TM=Turquemenist\u00e3o
+LocaleNames/pt_PT/TF=Territórios Austrais Franceses
+LocaleNames/pt_PT/TJ=Tajiquistão
+LocaleNames/pt_PT/TM=Turquemenistão
 LocaleNames/pt_PT/UM=Ilhas Menores Afastadas dos EUA
-LocaleNames/pt_PT/UZ=Usbequist\u00e3o
+LocaleNames/pt_PT/UZ=Usbequistão
 LocaleNames/pt_PT/VA=Cidade do Vaticano
-LocaleNames/pt_PT/VC=S\u00e3o Vicente e Granadinas
-LocaleNames/pt_PT/VG=Ilhas Virgens Brit\u00e2nicas
+LocaleNames/pt_PT/VC=São Vicente e Granadinas
+LocaleNames/pt_PT/VG=Ilhas Virgens Britânicas
 LocaleNames/pt_PT/VI=Ilhas Virgens dos EUA
 LocaleNames/pt_PT/VN=Vietname
-LocaleNames/pt_PT/YE=I\u00e9men
+LocaleNames/pt_PT/YE=Iémen
 #bug 6290792 Gaelic support
-LocaleNames/ga/ab=Abc\u00e1isis
-LocaleNames/ga/ae=Aiv\u00e9istis
-LocaleNames/ga/af=Afrac\u00e1inis
+LocaleNames/ga/ab=Abcáisis
+LocaleNames/ga/ae=Aivéistis
+LocaleNames/ga/af=Afracáinis
 LocaleNames/ga/ar=Araibis
 LocaleNames/ga/as=Asaimis
-LocaleNames/ga/az=Asarbaise\u00e1inis
-LocaleNames/ga/ba=Baisc\u00edris
-LocaleNames/ga/be=Bealar\u00faisis
-LocaleNames/ga/bg=Bulg\u00e1iris
-LocaleNames/ga/bn=Beang\u00e1ilis
-LocaleNames/ga/bo=Tib\u00e9idis
-LocaleNames/ga/br=Briot\u00e1inis
+LocaleNames/ga/az=Asarbaiseáinis
+LocaleNames/ga/ba=Baiscíris
+LocaleNames/ga/be=Bealarúisis
+LocaleNames/ga/bg=Bulgáiris
+LocaleNames/ga/bn=Beangáilis
+LocaleNames/ga/bo=Tibéidis
+LocaleNames/ga/br=Briotáinis
 LocaleNames/ga/bs=Boisnis
-LocaleNames/ga/ca=Catal\u00f3inis
+LocaleNames/ga/ca=Catalóinis
 LocaleNames/ga/ce=Seisnis
 LocaleNames/ga/co=Corsaicis
-LocaleNames/ga/cr=Cra\u00eds
+LocaleNames/ga/cr=Craís
 LocaleNames/ga/cs=Seicis
 LocaleNames/ga/cu=Slavais na hEaglaise
 LocaleNames/ga/cv=Suvaisis
 LocaleNames/ga/cy=Breatnais
 LocaleNames/ga/da=Danmhairgis
-LocaleNames/ga/de=Gearm\u00e1inis
-LocaleNames/ga/el=Gr\u00e9igis
-LocaleNames/ga/en=B\u00e9arla
-LocaleNames/ga/es=Sp\u00e1innis
-LocaleNames/ga/et=East\u00f3inis
+LocaleNames/ga/de=Gearmáinis
+LocaleNames/ga/el=Gréigis
+LocaleNames/ga/en=Béarla
+LocaleNames/ga/es=Spáinnis
+LocaleNames/ga/et=Eastóinis
 LocaleNames/ga/eu=Bascais
 LocaleNames/ga/fa=Peirsis
 LocaleNames/ga/fi=Fionlainnis
 LocaleNames/ga/fj=Fidsis
-LocaleNames/ga/fo=Far\u00f3is
+LocaleNames/ga/fo=Faróis
 LocaleNames/ga/fr=Fraincis
 LocaleNames/ga/fy=Freaslainnis Iartharach
 LocaleNames/ga/ga=Gaeilge
 LocaleNames/ga/gd=Gaeilge na hAlban
-LocaleNames/ga/gu=G\u00faisear\u00e1itis
+LocaleNames/ga/gu=Gúisearáitis
 LocaleNames/ga/gv=Manainnis
 LocaleNames/ga/he=Eabhrais
-LocaleNames/ga/hi=Hiond\u00fais
-LocaleNames/ga/hr=Cr\u00f3itis
-LocaleNames/ga/hu=Ung\u00e1iris
-LocaleNames/ga/hy=Airm\u00e9inis
-LocaleNames/ga/id=Indin\u00e9isis
-LocaleNames/ga/is=\u00cdoslainnis
-LocaleNames/ga/it=Iod\u00e1ilis
-LocaleNames/ga/iu=Ion\u00faitis
-LocaleNames/ga/ja=Seap\u00e1inis
-LocaleNames/ga/jv=I\u00e1ivis
+LocaleNames/ga/hi=Hiondúis
+LocaleNames/ga/hr=Cróitis
+LocaleNames/ga/hu=Ungáiris
+LocaleNames/ga/hy=Airméinis
+LocaleNames/ga/id=Indinéisis
+LocaleNames/ga/is=Íoslainnis
+LocaleNames/ga/it=Iodáilis
+LocaleNames/ga/iu=Ionúitis
+LocaleNames/ga/ja=Seapáinis
+LocaleNames/ga/jv=Iáivis
 LocaleNames/ga/ka=Seoirsis
 LocaleNames/ga/kk=Casaicis
 LocaleNames/ga/kn=Cannadais
-LocaleNames/ga/ko=C\u00f3ir\u00e9is
-LocaleNames/ga/ks=Caism\u00edris
+LocaleNames/ga/ko=Cóiréis
+LocaleNames/ga/ks=Caismíris
 LocaleNames/ga/kw=Coirnis
 LocaleNames/ga/ky=Cirgisis
 LocaleNames/ga/la=Laidin
 LocaleNames/ga/lb=Lucsambuirgis
 LocaleNames/ga/lo=Laoisis
-LocaleNames/ga/lt=Liotu\u00e1inis
+LocaleNames/ga/lt=Liotuáinis
 LocaleNames/ga/lv=Laitvis
-LocaleNames/ga/mg=Malag\u00e1isis
+LocaleNames/ga/mg=Malagáisis
 LocaleNames/ga/mi=Maorais
-LocaleNames/ga/mk=Macad\u00f3inis
-LocaleNames/ga/ml=Mail\u00e9alaimis
-LocaleNames/ga/mn=Mong\u00f3ilis
+LocaleNames/ga/mk=Macadóinis
+LocaleNames/ga/ml=Mailéalaimis
+LocaleNames/ga/mn=Mongóilis
 LocaleNames/ga/mr=Maraitis
-LocaleNames/ga/mt=M\u00e1ltais
+LocaleNames/ga/mt=Máltais
 LocaleNames/ga/my=Burmais
-LocaleNames/ga/na=N\u00e1r\u00fais
-LocaleNames/ga/nb=Bocm\u00e1l
+LocaleNames/ga/na=Nárúis
+LocaleNames/ga/nb=Bocmál
 LocaleNames/ga/ne=Neipeailis
 LocaleNames/ga/nl=Ollainnis
 LocaleNames/ga/nn=Nua-Ioruais
 LocaleNames/ga/no=Ioruais
-LocaleNames/ga/nv=Navach\u00f3is
-LocaleNames/ga/oc=Ocsat\u00e1inis
-LocaleNames/ga/os=Ois\u00e9itis
-LocaleNames/ga/pa=Puinse\u00e1ibis
+LocaleNames/ga/nv=Navachóis
+LocaleNames/ga/oc=Ocsatáinis
+LocaleNames/ga/os=Oiséitis
+LocaleNames/ga/pa=Puinseáibis
 LocaleNames/ga/pl=Polainnis
 LocaleNames/ga/ps=Paistis
-LocaleNames/ga/pt=Portaing\u00e9ilis
+LocaleNames/ga/pt=Portaingéilis
 LocaleNames/ga/qu=Ceatsuais
-LocaleNames/ga/ro=R\u00f3m\u00e1inis
-LocaleNames/ga/ru=R\u00faisis
+LocaleNames/ga/ro=Rómáinis
+LocaleNames/ga/ru=Rúisis
 LocaleNames/ga/sa=Sanscrait
-LocaleNames/ga/sc=Saird\u00ednis
+LocaleNames/ga/sc=Sairdínis
 LocaleNames/ga/sd=Sindis
-LocaleNames/ga/se=S\u00e1imis an Tuaiscirt
-LocaleNames/ga/sk=Sl\u00f3vaicis
-LocaleNames/ga/sl=Sl\u00f3iv\u00e9inis
-LocaleNames/ga/sm=Sam\u00f3is
-LocaleNames/ga/so=Som\u00e1ilis
-LocaleNames/ga/sq=Alb\u00e1inis
+LocaleNames/ga/se=Sáimis an Tuaiscirt
+LocaleNames/ga/sk=Slóvaicis
+LocaleNames/ga/sl=Slóivéinis
+LocaleNames/ga/sm=Samóis
+LocaleNames/ga/so=Somáilis
+LocaleNames/ga/sq=Albáinis
 LocaleNames/ga/sr=Seirbis
 LocaleNames/ga/sv=Sualainnis
-LocaleNames/ga/sw=Svaha\u00edlis
+LocaleNames/ga/sw=Svahaílis
 LocaleNames/ga/ta=Tamailis
-LocaleNames/ga/th=T\u00e9alainnis
-LocaleNames/ga/tl=Tag\u00e1laigis
+LocaleNames/ga/th=Téalainnis
+LocaleNames/ga/tl=Tagálaigis
 LocaleNames/ga/tr=Tuircis
 LocaleNames/ga/tt=Tatairis
-LocaleNames/ga/ty=Taih\u00edtis
-LocaleNames/ga/uk=\u00dacr\u00e1inis
-LocaleNames/ga/ur=Urd\u00fais
-LocaleNames/ga/uz=\u00daisb\u00e9iceast\u00e1inis
-LocaleNames/ga/vi=V\u00edtneaimis
-LocaleNames/ga/wa=Vall\u00fanais
-LocaleNames/ga/yi=Gi\u00fadais
-LocaleNames/ga/zh=S\u00ednis
-LocaleNames/ga/zu=S\u00fal\u00fais
-LocaleNames/ga/AD=And\u00f3ra
-LocaleNames/ga/AE=Aontas na n\u00c9im\u00edr\u00edochta\u00ed Arabacha
-LocaleNames/ga/AF=an Afganast\u00e1in
-LocaleNames/ga/AG=Antigua agus Barb\u00fada
-LocaleNames/ga/AL=an Alb\u00e1in
-LocaleNames/ga/AM=an Airm\u00e9in
-LocaleNames/ga/AO=Ang\u00f3la
+LocaleNames/ga/ty=Taihítis
+LocaleNames/ga/uk=Úcráinis
+LocaleNames/ga/ur=Urdúis
+LocaleNames/ga/uz=Úisbéiceastáinis
+LocaleNames/ga/vi=Vítneaimis
+LocaleNames/ga/wa=Vallúnais
+LocaleNames/ga/yi=Giúdais
+LocaleNames/ga/zh=Sínis
+LocaleNames/ga/zu=Súlúis
+LocaleNames/ga/AD=Andóra
+LocaleNames/ga/AE=Aontas na nÉimíríochtaí Arabacha
+LocaleNames/ga/AF=an Afganastáin
+LocaleNames/ga/AG=Antigua agus Barbúda
+LocaleNames/ga/AL=an Albáin
+LocaleNames/ga/AM=an Airméin
+LocaleNames/ga/AO=Angóla
 LocaleNames/ga/AQ=Antartaice
-LocaleNames/ga/AR=an Airgint\u00edn
-LocaleNames/ga/AS=Sam\u00f3 Mheirice\u00e1
+LocaleNames/ga/AR=an Airgintín
+LocaleNames/ga/AS=Samó Mheiriceá
 LocaleNames/ga/AT=an Ostair
-LocaleNames/ga/AU=an Astr\u00e1il
-LocaleNames/ga/AZ=an Asarbaise\u00e1in
-LocaleNames/ga/BA=an Bhoisnia agus an Heirseagaiv\u00e9in
-LocaleNames/ga/BB=Barbad\u00f3s
-LocaleNames/ga/BD=an Bhanglaid\u00e9is
+LocaleNames/ga/AU=an Astráil
+LocaleNames/ga/AZ=an Asarbaiseáin
+LocaleNames/ga/BA=an Bhoisnia agus an Heirseagaivéin
+LocaleNames/ga/BB=Barbadós
+LocaleNames/ga/BD=an Bhanglaidéis
 LocaleNames/ga/BE=an Bheilg
-LocaleNames/ga/BF=Buirc\u00edne Fas\u00f3
-LocaleNames/ga/BG=an Bhulg\u00e1ir
-LocaleNames/ga/BH=Bair\u00e9in
-LocaleNames/ga/BI=an Bhur\u00fain
+LocaleNames/ga/BF=Buircíne Fasó
+LocaleNames/ga/BG=an Bhulgáir
+LocaleNames/ga/BH=Bairéin
+LocaleNames/ga/BI=an Bhurúin
 LocaleNames/ga/BJ=Beinin
-LocaleNames/ga/BM=Beirmi\u00fada
-LocaleNames/ga/BN=Br\u00fain\u00e9
+LocaleNames/ga/BM=Beirmiúda
+LocaleNames/ga/BN=Brúiné
 LocaleNames/ga/BO=an Bholaiv
-LocaleNames/ga/BR=an Bhrasa\u00edl
-LocaleNames/ga/BS=na Bah\u00e1ma\u00ed
-LocaleNames/ga/BT=an Bh\u00fat\u00e1in
-LocaleNames/ga/BV=Oile\u00e1n Bouvet
-LocaleNames/ga/BW=an Bhotsu\u00e1in
-LocaleNames/ga/BY=an Bhealar\u00fais
-LocaleNames/ga/BZ=an Bheil\u00eds
+LocaleNames/ga/BR=an Bhrasaíl
+LocaleNames/ga/BS=na Bahámaí
+LocaleNames/ga/BT=an Bhútáin
+LocaleNames/ga/BV=Oileán Bouvet
+LocaleNames/ga/BW=an Bhotsuáin
+LocaleNames/ga/BY=an Bhealarúis
+LocaleNames/ga/BZ=an Bheilís
 LocaleNames/ga/CA=Ceanada
-LocaleNames/ga/CC=Oile\u00e1in Cocos (Keeling)
-LocaleNames/ga/CD=Poblacht Dhaonlathach an Chong\u00f3
-LocaleNames/ga/CF=Poblacht na hAfraice L\u00e1ir
-LocaleNames/ga/CG=Cong\u00f3-Brazzaville
-LocaleNames/ga/CH=an Eilv\u00e9is
-LocaleNames/ga/CI=An C\u00f3sta Eabhair
-LocaleNames/ga/CK=Oile\u00e1in Cook
+LocaleNames/ga/CC=Oileáin Cocos (Keeling)
+LocaleNames/ga/CD=Poblacht Dhaonlathach an Chongó
+LocaleNames/ga/CF=Poblacht na hAfraice Láir
+LocaleNames/ga/CG=Congó-Brazzaville
+LocaleNames/ga/CH=an Eilvéis
+LocaleNames/ga/CI=An Cósta Eabhair
+LocaleNames/ga/CK=Oileáin Cook
 LocaleNames/ga/CL=an tSile
-LocaleNames/ga/CM=Camar\u00fan
-LocaleNames/ga/CN=an tS\u00edn
-LocaleNames/ga/CO=an Chol\u00f3im
-LocaleNames/ga/CR=C\u00f3sta R\u00edce
-LocaleNames/ga/CU=C\u00faba
+LocaleNames/ga/CM=Camarún
+LocaleNames/ga/CN=an tSín
+LocaleNames/ga/CO=an Cholóim
+LocaleNames/ga/CR=Cósta Ríce
+LocaleNames/ga/CU=Cúba
 LocaleNames/ga/CV=Rinn Verde
-LocaleNames/ga/CX=Oile\u00e1n na Nollag
+LocaleNames/ga/CX=Oileán na Nollag
 LocaleNames/ga/CY=an Chipir
 LocaleNames/ga/CZ=an tSeicia
-LocaleNames/ga/DE=an Ghearm\u00e1in
+LocaleNames/ga/DE=an Ghearmáin
 LocaleNames/ga/DK=an Danmhairg
 LocaleNames/ga/DM=Doiminice
 LocaleNames/ga/DO=an Phoblacht Dhoiminiceach
-LocaleNames/ga/DZ=An Ailg\u00e9ir
-LocaleNames/ga/EC=Eacuad\u00f3r
-LocaleNames/ga/EE=an East\u00f3in
-LocaleNames/ga/EG=An \u00c9igipt
-LocaleNames/ga/EH=An Sah\u00e1ra Thiar
-LocaleNames/ga/ES=an Sp\u00e1inn
-LocaleNames/ga/ET=an Aet\u00f3ip
+LocaleNames/ga/DZ=An Ailgéir
+LocaleNames/ga/EC=Eacuadór
+LocaleNames/ga/EE=an Eastóin
+LocaleNames/ga/EG=An Éigipt
+LocaleNames/ga/EH=An Sahára Thiar
+LocaleNames/ga/ES=an Spáinn
+LocaleNames/ga/ET=an Aetóip
 LocaleNames/ga/FI=an Fhionlainn
-LocaleNames/ga/FJ=Fids\u00ed
-LocaleNames/ga/FK=Oile\u00e1in Fh\u00e1clainne
-LocaleNames/ga/FM=an Mhicrin\u00e9is
-LocaleNames/ga/FO=Oile\u00e1in Fhar\u00f3
+LocaleNames/ga/FJ=Fidsí
+LocaleNames/ga/FK=Oileáin Fháclainne
+LocaleNames/ga/FM=an Mhicrinéis
+LocaleNames/ga/FO=Oileáin Fharó
 LocaleNames/ga/FR=an Fhrainc
-LocaleNames/ga/GA=an Ghab\u00fain
-LocaleNames/ga/GB=an R\u00edocht Aontaithe
+LocaleNames/ga/GA=an Ghabúin
+LocaleNames/ga/GB=an Ríocht Aontaithe
 LocaleNames/ga/GE=an tSeoirsia
-LocaleNames/ga/GF=Gu\u00e1in na Fraince
-LocaleNames/ga/GH=G\u00e1na
-LocaleNames/ga/GI=Giobr\u00e1ltar
+LocaleNames/ga/GF=Guáin na Fraince
+LocaleNames/ga/GH=Gána
+LocaleNames/ga/GI=Giobráltar
 LocaleNames/ga/GL=an Ghraonlainn
 LocaleNames/ga/GM=An Ghaimbia
 LocaleNames/ga/GN=An Ghuine
-LocaleNames/ga/GP=Guadal\u00faip
-LocaleNames/ga/GQ=an Ghuine Mhe\u00e1nchiorclach
-LocaleNames/ga/GR=an Ghr\u00e9ig
-LocaleNames/ga/GS=An tSeoirsia Theas agus Oile\u00e1in Sandwich Theas
+LocaleNames/ga/GP=Guadalúip
+LocaleNames/ga/GQ=an Ghuine Mheánchiorclach
+LocaleNames/ga/GR=an Ghréig
+LocaleNames/ga/GS=An tSeoirsia Theas agus Oileáin Sandwich Theas
 LocaleNames/ga/GT=Guatamala
 LocaleNames/ga/GW=Guine Bissau
-LocaleNames/ga/GY=An Ghu\u00e1in
-LocaleNames/ga/HM=Oile\u00e1n Heard agus Oile\u00e1in McDonald
-LocaleNames/ga/HN=Hond\u00faras
-LocaleNames/ga/HR=an Chr\u00f3it
-LocaleNames/ga/HT=H\u00e1\u00edt\u00ed
-LocaleNames/ga/HU=an Ung\u00e1ir
-LocaleNames/ga/ID=an Indin\u00e9is
-LocaleNames/ga/IE=\u00c9ire
+LocaleNames/ga/GY=An Ghuáin
+LocaleNames/ga/HM=Oileán Heard agus Oileáin McDonald
+LocaleNames/ga/HN=Hondúras
+LocaleNames/ga/HR=an Chróit
+LocaleNames/ga/HT=Háítí
+LocaleNames/ga/HU=an Ungáir
+LocaleNames/ga/ID=an Indinéis
+LocaleNames/ga/IE=Éire
 LocaleNames/ga/IL=Iosrael
 LocaleNames/ga/IN=an India
-LocaleNames/ga/IO=Cr\u00edoch Aig\u00e9an Indiach na Breataine
-LocaleNames/ga/IQ=an Iar\u00e1ic
-LocaleNames/ga/IR=an Iar\u00e1in
-LocaleNames/ga/IS=an \u00cdoslainn
-LocaleNames/ga/IT=an Iod\u00e1il
-LocaleNames/ga/JM=Iam\u00e1ice
-LocaleNames/ga/JO=an Iord\u00e1in
-LocaleNames/ga/JP=an tSeap\u00e1in
-LocaleNames/ga/KE=an Ch\u00e9inia
-LocaleNames/ga/KG=an Chirgeast\u00e1in
-LocaleNames/ga/KH=an Chamb\u00f3id
+LocaleNames/ga/IO=Críoch Aigéan Indiach na Breataine
+LocaleNames/ga/IQ=an Iaráic
+LocaleNames/ga/IR=an Iaráin
+LocaleNames/ga/IS=an Íoslainn
+LocaleNames/ga/IT=an Iodáil
+LocaleNames/ga/JM=Iamáice
+LocaleNames/ga/JO=an Iordáin
+LocaleNames/ga/JP=an tSeapáin
+LocaleNames/ga/KE=an Chéinia
+LocaleNames/ga/KG=an Chirgeastáin
+LocaleNames/ga/KH=an Chambóid
 LocaleNames/ga/KI=Ciribeas
-LocaleNames/ga/KM=Oile\u00e1in Chom\u00f3ra
-LocaleNames/ga/KN=San Cr\u00edost\u00f3ir-Nimheas
-LocaleNames/ga/KP=an Ch\u00f3ir\u00e9 Thuaidh
-LocaleNames/ga/KR=an Ch\u00f3ir\u00e9 Theas
-LocaleNames/ga/KW=Cu\u00e1it
-LocaleNames/ga/KY=Oile\u00e1in Cayman
-LocaleNames/ga/KZ=an Chasacst\u00e1in
-LocaleNames/ga/LB=an Liob\u00e1in
-LocaleNames/ga/LI=Lichtinst\u00e9in
-LocaleNames/ga/LK=Sr\u00ed Lanca
-LocaleNames/ga/LR=An Lib\u00e9ir
-LocaleNames/ga/LS=Leos\u00f3ta
-LocaleNames/ga/LT=an Liotu\u00e1in
+LocaleNames/ga/KM=Oileáin Chomóra
+LocaleNames/ga/KN=San Críostóir-Nimheas
+LocaleNames/ga/KP=an Chóiré Thuaidh
+LocaleNames/ga/KR=an Chóiré Theas
+LocaleNames/ga/KW=Cuáit
+LocaleNames/ga/KY=Oileáin Cayman
+LocaleNames/ga/KZ=an Chasacstáin
+LocaleNames/ga/LB=an Liobáin
+LocaleNames/ga/LI=Lichtinstéin
+LocaleNames/ga/LK=Srí Lanca
+LocaleNames/ga/LR=An Libéir
+LocaleNames/ga/LS=Leosóta
+LocaleNames/ga/LT=an Liotuáin
 LocaleNames/ga/LU=Lucsamburg
 LocaleNames/ga/LV=an Laitvia
 LocaleNames/ga/LY=An Libia
-LocaleNames/ga/MA=Marac\u00f3
-LocaleNames/ga/MC=Monac\u00f3
-LocaleNames/ga/MD=an Mhold\u00f3iv
-LocaleNames/ga/MH=Oile\u00e1in Marshall
-LocaleNames/ga/MK=an Mhacad\u00f3in Thuaidh
-LocaleNames/ga/ML=Mail\u00ed
+LocaleNames/ga/MA=Maracó
+LocaleNames/ga/MC=Monacó
+LocaleNames/ga/MD=an Mholdóiv
+LocaleNames/ga/MH=Oileáin Marshall
+LocaleNames/ga/MK=an Mhacadóin Thuaidh
+LocaleNames/ga/ML=Mailí
 LocaleNames/ga/MM=Maenmar (Burma)
-LocaleNames/ga/MN=an Mhong\u00f3il
-LocaleNames/ga/MP=Na hOile\u00e1in Mh\u00e1irianacha Thuaidh
-LocaleNames/ga/MR=An Mh\u00e1rat\u00e1i
+LocaleNames/ga/MN=an Mhongóil
+LocaleNames/ga/MP=Na hOileáin Mháirianacha Thuaidh
+LocaleNames/ga/MR=An Mháratái
 LocaleNames/ga/MS=Montsarat
-LocaleNames/ga/MT=M\u00e1lta
-LocaleNames/ga/MU=Oile\u00e1n Mhuir\u00eds
-LocaleNames/ga/MV=Oile\u00e1in Mhaild\u00edve
-LocaleNames/ga/MW=an Mhal\u00e1iv
+LocaleNames/ga/MT=Málta
+LocaleNames/ga/MU=Oileán Mhuirís
+LocaleNames/ga/MV=Oileáin Mhaildíve
+LocaleNames/ga/MW=an Mhaláiv
 LocaleNames/ga/MX=Meicsiceo
 LocaleNames/ga/MY=an Mhalaeisia
-LocaleNames/ga/MZ=M\u00f3saimb\u00edc
+LocaleNames/ga/MZ=Mósaimbíc
 LocaleNames/ga/NA=an Namaib
-LocaleNames/ga/NC=an Nua-Chalad\u00f3in
-LocaleNames/ga/NE=An N\u00edgir
-LocaleNames/ga/NF=Oile\u00e1n Norfolk
-LocaleNames/ga/NG=An Nig\u00e9ir
+LocaleNames/ga/NC=an Nua-Chaladóin
+LocaleNames/ga/NE=An Nígir
+LocaleNames/ga/NF=Oileán Norfolk
+LocaleNames/ga/NG=An Nigéir
 LocaleNames/ga/NI=Nicearagua
-LocaleNames/ga/NL=an \u00cdsilt\u00edr
+LocaleNames/ga/NL=an Ísiltír
 LocaleNames/ga/NO=an Iorua
 LocaleNames/ga/NP=Neipeal
-LocaleNames/ga/NR=N\u00e1r\u00fa
-LocaleNames/ga/NZ=an Nua-Sh\u00e9alainn
-LocaleNames/ga/PE=Peiri\u00fa
-LocaleNames/ga/PF=Polain\u00e9is na Fraince
+LocaleNames/ga/NR=Nárú
+LocaleNames/ga/NZ=an Nua-Shéalainn
+LocaleNames/ga/PE=Peiriú
+LocaleNames/ga/PF=Polainéis na Fraince
 LocaleNames/ga/PG=Nua-Ghuine Phapua
-LocaleNames/ga/PH=Na hOile\u00e1in Fhilip\u00edneacha
-LocaleNames/ga/PK=an Phacast\u00e1in
+LocaleNames/ga/PH=Na hOileáin Fhilipíneacha
+LocaleNames/ga/PK=an Phacastáin
 LocaleNames/ga/PL=an Pholainn
 LocaleNames/ga/PM=San Pierre agus Miquelon
-LocaleNames/ga/PR=P\u00f3rt\u00f3 R\u00edce
-LocaleNames/ga/PS=na Cr\u00edocha Palaist\u00edneacha
-LocaleNames/ga/PT=an Phortaing\u00e9il
+LocaleNames/ga/PR=Pórtó Ríce
+LocaleNames/ga/PS=na Críocha Palaistíneacha
+LocaleNames/ga/PT=an Phortaingéil
 LocaleNames/ga/PY=Paragua
 LocaleNames/ga/QA=Catar
-LocaleNames/ga/RE=La R\u00e9union
-LocaleNames/ga/RO=an R\u00f3m\u00e1in
-LocaleNames/ga/RU=an R\u00fais
+LocaleNames/ga/RE=La Réunion
+LocaleNames/ga/RO=an Rómáin
+LocaleNames/ga/RU=an Rúis
 LocaleNames/ga/RW=Ruanda
-LocaleNames/ga/SA=an Araib Sh\u00e1dach
-LocaleNames/ga/SB=Oile\u00e1in Sholaimh
-LocaleNames/ga/SC=na S\u00e9is\u00e9il
-LocaleNames/ga/SD=An tS\u00fad\u00e1in
+LocaleNames/ga/SA=an Araib Shádach
+LocaleNames/ga/SB=Oileáin Sholaimh
+LocaleNames/ga/SC=na Séiséil
+LocaleNames/ga/SD=An tSúdáin
 LocaleNames/ga/SE=an tSualainn
-LocaleNames/ga/SG=Singeap\u00f3r
-LocaleNames/ga/SH=San H\u00e9ilin
-LocaleNames/ga/SI=an tSl\u00f3iv\u00e9in
+LocaleNames/ga/SG=Singeapór
+LocaleNames/ga/SH=San Héilin
+LocaleNames/ga/SI=an tSlóivéin
 LocaleNames/ga/SJ=Svalbard agus Jan Mayen
-LocaleNames/ga/SK=an tSl\u00f3vaic
+LocaleNames/ga/SK=an tSlóvaic
 LocaleNames/ga/SL=Siarra Leon
-LocaleNames/ga/SM=San Mair\u00edne
-LocaleNames/ga/SN=An tSeineag\u00e1il
-LocaleNames/ga/SO=an tSom\u00e1il
+LocaleNames/ga/SM=San Mairíne
+LocaleNames/ga/SN=An tSeineagáil
+LocaleNames/ga/SO=an tSomáil
 LocaleNames/ga/SR=Suranam
-LocaleNames/ga/ST=S\u00e3o Tom\u00e9 agus Pr\u00edncipe
-LocaleNames/ga/SV=An tSalvad\u00f3ir
+LocaleNames/ga/ST=São Tomé agus Príncipe
+LocaleNames/ga/SV=An tSalvadóir
 LocaleNames/ga/SY=an tSiria
-LocaleNames/ga/SZ=eSuait\u00edn\u00ed
-LocaleNames/ga/TC=Oile\u00e1in na dTurcach agus Caicos
+LocaleNames/ga/SZ=eSuaitíní
+LocaleNames/ga/TC=Oileáin na dTurcach agus Caicos
 LocaleNames/ga/TD=Sead
-LocaleNames/ga/TF=Cr\u00edocha Francacha Dheisceart an Domhain
-LocaleNames/ga/TG=T\u00f3ga
-LocaleNames/ga/TH=an T\u00e9alainn
-LocaleNames/ga/TJ=an T\u00e1ids\u00edceast\u00e1in
-LocaleNames/ga/TK=T\u00f3cal\u00e1
-LocaleNames/ga/TL=T\u00edom\u00f3r Thoir
-LocaleNames/ga/TM=an Tuircm\u00e9anast\u00e1in
-LocaleNames/ga/TN=An Tuin\u00e9is
+LocaleNames/ga/TF=Críocha Francacha Dheisceart an Domhain
+LocaleNames/ga/TG=Tóga
+LocaleNames/ga/TH=an Téalainn
+LocaleNames/ga/TJ=an Táidsíceastáin
+LocaleNames/ga/TK=Tócalá
+LocaleNames/ga/TL=Tíomór Thoir
+LocaleNames/ga/TM=an Tuircméanastáin
+LocaleNames/ga/TN=An Tuinéis
 LocaleNames/ga/TR=an Tuirc
-LocaleNames/ga/TT=Oile\u00e1n na Tr\u00edon\u00f3ide agus Tob\u00e1ga
-LocaleNames/ga/TV=T\u00faval\u00fa
-LocaleNames/ga/TW=an T\u00e9av\u00e1in
-LocaleNames/ga/TZ=an Tans\u00e1in
-LocaleNames/ga/UA=an \u00dacr\u00e1in
-LocaleNames/ga/UM=Oile\u00e1in Imeallacha S.A.M.
-LocaleNames/ga/US=St\u00e1it Aontaithe Mheirice\u00e1
+LocaleNames/ga/TT=Oileán na Tríonóide agus Tobága
+LocaleNames/ga/TV=Túvalú
+LocaleNames/ga/TW=an Téaváin
+LocaleNames/ga/TZ=an Tansáin
+LocaleNames/ga/UA=an Úcráin
+LocaleNames/ga/UM=Oileáin Imeallacha S.A.M.
+LocaleNames/ga/US=Stáit Aontaithe Mheiriceá
 LocaleNames/ga/UY=Uragua
-LocaleNames/ga/UZ=an \u00daisb\u00e9iceast\u00e1in
-LocaleNames/ga/VA=Cathair na Vatac\u00e1ine
-LocaleNames/ga/VC=San Uinseann agus na Grean\u00e1id\u00edn\u00ed
-LocaleNames/ga/VE=Veinis\u00e9ala
-LocaleNames/ga/VG=Oile\u00e1in Bhriotanacha na Maighdean
-LocaleNames/ga/VI=Oile\u00e1in Mheirice\u00e1nacha na Maighdean
-LocaleNames/ga/VN=V\u00edtneam
-LocaleNames/ga/VU=Vanuat\u00fa
-LocaleNames/ga/WF=Vail\u00eds agus Fut\u00fana
-LocaleNames/ga/WS=Sam\u00f3
-LocaleNames/ga/YE=\u00c9imin
+LocaleNames/ga/UZ=an Úisbéiceastáin
+LocaleNames/ga/VA=Cathair na Vatacáine
+LocaleNames/ga/VC=San Uinseann agus na Greanáidíní
+LocaleNames/ga/VE=Veiniséala
+LocaleNames/ga/VG=Oileáin Bhriotanacha na Maighdean
+LocaleNames/ga/VI=Oileáin Mheiriceánacha na Maighdean
+LocaleNames/ga/VN=Vítneam
+LocaleNames/ga/VU=Vanuatú
+LocaleNames/ga/WF=Vailís agus Futúna
+LocaleNames/ga/WS=Samó
+LocaleNames/ga/YE=Éimin
 LocaleNames/ga/ZA=an Afraic Theas
 LocaleNames/ga/ZM=an tSaimbia
 # bug #6277696
-FormatData/sr/MonthNames/0=\u0458\u0430\u043d\u0443\u0430\u0440
-FormatData/sr/MonthNames/1=\u0444\u0435\u0431\u0440\u0443\u0430\u0440
-FormatData/sr/MonthNames/2=\u043c\u0430\u0440\u0442
-FormatData/sr/MonthNames/3=\u0430\u043f\u0440\u0438\u043b
-FormatData/sr/MonthNames/4=\u043c\u0430\u0458
-FormatData/sr/MonthNames/5=\u0458\u0443\u043d
-FormatData/sr/MonthNames/6=\u0458\u0443\u043b
-FormatData/sr/MonthNames/7=\u0430\u0432\u0433\u0443\u0441\u0442
-FormatData/sr/MonthNames/8=\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthNames/9=\u043e\u043a\u0442\u043e\u0431\u0430\u0440
-FormatData/sr/MonthNames/10=\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthNames/11=\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440
-FormatData/sr/MonthAbbreviations/0=\u0458\u0430\u043d
-FormatData/sr/MonthAbbreviations/1=\u0444\u0435\u0431
-FormatData/sr/MonthAbbreviations/2=\u043c\u0430\u0440
-FormatData/sr/MonthAbbreviations/3=\u0430\u043f\u0440
-FormatData/sr/MonthAbbreviations/4=\u043c\u0430\u0458
-FormatData/sr/MonthAbbreviations/5=\u0458\u0443\u043d
-FormatData/sr/MonthAbbreviations/6=\u0458\u0443\u043b
-FormatData/sr/MonthAbbreviations/7=\u0430\u0432\u0433
-FormatData/sr/MonthAbbreviations/8=\u0441\u0435\u043f
-FormatData/sr/MonthAbbreviations/9=\u043e\u043a\u0442
-FormatData/sr/MonthAbbreviations/10=\u043d\u043e\u0432
-FormatData/sr/MonthAbbreviations/11=\u0434\u0435\u0446
-FormatData/sr/DayNames/0=\u043d\u0435\u0434\u0435\u0459\u0430
-FormatData/sr/DayNames/1=\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a
-FormatData/sr/DayNames/2=\u0443\u0442\u043e\u0440\u0430\u043a
-FormatData/sr/DayNames/3=\u0441\u0440\u0435\u0434\u0430
-FormatData/sr/DayNames/4=\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a
-FormatData/sr/DayNames/5=\u043f\u0435\u0442\u0430\u043a
-FormatData/sr/DayNames/6=\u0441\u0443\u0431\u043e\u0442\u0430
-FormatData/sr/DayAbbreviations/0=\u043d\u0435\u0434
-FormatData/sr/DayAbbreviations/1=\u043f\u043e\u043d
-FormatData/sr/DayAbbreviations/2=\u0443\u0442\u043e
-FormatData/sr/DayAbbreviations/3=\u0441\u0440\u0435
-FormatData/sr/DayAbbreviations/4=\u0447\u0435\u0442
-FormatData/sr/DayAbbreviations/5=\u043f\u0435\u0442
-FormatData/sr/DayAbbreviations/6=\u0441\u0443\u0431
-FormatData/sr/Eras/0=\u043f. \u043d. \u0435.
-FormatData/sr/Eras/1=\u043d. \u0435.
+FormatData/sr/MonthNames/0=јануар
+FormatData/sr/MonthNames/1=фебруар
+FormatData/sr/MonthNames/2=март
+FormatData/sr/MonthNames/3=април
+FormatData/sr/MonthNames/4=мај
+FormatData/sr/MonthNames/5=јун
+FormatData/sr/MonthNames/6=јул
+FormatData/sr/MonthNames/7=август
+FormatData/sr/MonthNames/8=септембар
+FormatData/sr/MonthNames/9=октобар
+FormatData/sr/MonthNames/10=новембар
+FormatData/sr/MonthNames/11=децембар
+FormatData/sr/MonthAbbreviations/0=јан
+FormatData/sr/MonthAbbreviations/1=феб
+FormatData/sr/MonthAbbreviations/2=мар
+FormatData/sr/MonthAbbreviations/3=апр
+FormatData/sr/MonthAbbreviations/4=мај
+FormatData/sr/MonthAbbreviations/5=јун
+FormatData/sr/MonthAbbreviations/6=јул
+FormatData/sr/MonthAbbreviations/7=авг
+FormatData/sr/MonthAbbreviations/8=сеп
+FormatData/sr/MonthAbbreviations/9=окт
+FormatData/sr/MonthAbbreviations/10=нов
+FormatData/sr/MonthAbbreviations/11=дец
+FormatData/sr/DayNames/0=недеља
+FormatData/sr/DayNames/1=понедељак
+FormatData/sr/DayNames/2=уторак
+FormatData/sr/DayNames/3=среда
+FormatData/sr/DayNames/4=четвртак
+FormatData/sr/DayNames/5=петак
+FormatData/sr/DayNames/6=субота
+FormatData/sr/DayAbbreviations/0=нед
+FormatData/sr/DayAbbreviations/1=пон
+FormatData/sr/DayAbbreviations/2=уто
+FormatData/sr/DayAbbreviations/3=сре
+FormatData/sr/DayAbbreviations/4=чет
+FormatData/sr/DayAbbreviations/5=пет
+FormatData/sr/DayAbbreviations/6=суб
+FormatData/sr/Eras/0=п. н. е.
+FormatData/sr/Eras/1=н. е.
 FormatData/sr/latn.NumberPatterns/0=#,##0.###
-FormatData/sr/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
+FormatData/sr/latn.NumberPatterns/1=#,##0.00 ¤
 FormatData/sr/latn.NumberPatterns/2=#,##0%
 FormatData/sr/latn.NumberElements/0=,
 FormatData/sr/latn.NumberElements/1=.
@@ -4089,8 +4089,8 @@ FormatData/sr/latn.NumberElements/4=0
 FormatData/sr/latn.NumberElements/5=#
 FormatData/sr/latn.NumberElements/6=-
 FormatData/sr/latn.NumberElements/7=E
-FormatData/sr/latn.NumberElements/8=\u2030
-FormatData/sr/latn.NumberElements/9=\u221e
+FormatData/sr/latn.NumberElements/8=‰
+FormatData/sr/latn.NumberElements/9=∞
 FormatData/sr/latn.NumberElements/10=NaN
 FormatData/sr/TimePatterns/0=HH:mm:ss zzzz
 FormatData/sr/TimePatterns/1=HH:mm:ss z
@@ -4101,610 +4101,610 @@ FormatData/sr/DatePatterns/1=d. MMMM y.
 FormatData/sr/DatePatterns/2=d. M. y.
 FormatData/sr/DatePatterns/3=d. M. y.
 FormatData/sr/DateTimePatterns/0={1} {0}
-LocaleNames/sr/af=\u0430\u0444\u0440\u0438\u043a\u0430\u043d\u0441
-LocaleNames/sr/ar=\u0430\u0440\u0430\u043f\u0441\u043a\u0438
-LocaleNames/sr/be=\u0431\u0435\u043b\u043e\u0440\u0443\u0441\u043a\u0438
-LocaleNames/sr/bg=\u0431\u0443\u0433\u0430\u0440\u0441\u043a\u0438
-LocaleNames/sr/br=\u0431\u0440\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/ca=\u043a\u0430\u0442\u0430\u043b\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/co=\u043a\u043e\u0440\u0437\u0438\u043a\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/cs=\u0447\u0435\u0448\u043a\u0438
-LocaleNames/sr/da=\u0434\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/de=\u043d\u0435\u043c\u0430\u0447\u043a\u0438
-LocaleNames/sr/el=\u0433\u0440\u0447\u043a\u0438
-LocaleNames/sr/en=\u0435\u043d\u0433\u043b\u0435\u0441\u043a\u0438
-LocaleNames/sr/eo=\u0435\u0441\u043f\u0435\u0440\u0430\u043d\u0442\u043e
-LocaleNames/sr/es=\u0448\u043f\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/et=\u0435\u0441\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/eu=\u0431\u0430\u0441\u043a\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/fa=\u043f\u0435\u0440\u0441\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/fi=\u0444\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/fr=\u0444\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0438
-LocaleNames/sr/ga=\u0438\u0440\u0441\u043a\u0438
-LocaleNames/sr/he=\u0445\u0435\u0431\u0440\u0435\u0458\u0441\u043a\u0438
-LocaleNames/sr/hi=\u0445\u0438\u043d\u0434\u0438
-LocaleNames/sr/hr=\u0445\u0440\u0432\u0430\u0442\u0441\u043a\u0438
-LocaleNames/sr/hu=\u043c\u0430\u0452\u0430\u0440\u0441\u043a\u0438
-LocaleNames/sr/hy=\u0458\u0435\u0440\u043c\u0435\u043d\u0441\u043a\u0438
-LocaleNames/sr/id=\u0438\u043d\u0434\u043e\u043d\u0435\u0436\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/is=\u0438\u0441\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-LocaleNames/sr/it=\u0438\u0442\u0430\u043b\u0438\u0458\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/ja=\u0458\u0430\u043f\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/ka=\u0433\u0440\u0443\u0437\u0438\u0458\u0441\u043a\u0438
-LocaleNames/sr/km=\u043a\u043c\u0435\u0440\u0441\u043a\u0438
-LocaleNames/sr/ko=\u043a\u043e\u0440\u0435\u0458\u0441\u043a\u0438
-LocaleNames/sr/ku=\u043a\u0443\u0440\u0434\u0441\u043a\u0438
-LocaleNames/sr/ky=\u043a\u0438\u0440\u0433\u0438\u0441\u043a\u0438
-LocaleNames/sr/la=\u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/lt=\u043b\u0438\u0442\u0432\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/lv=\u043b\u0435\u0442\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/mk=\u043c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438
-LocaleNames/sr/mn=\u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438
-LocaleNames/sr/my=\u0431\u0443\u0440\u043c\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/nl=\u0445\u043e\u043b\u0430\u043d\u0434\u0441\u043a\u0438
-LocaleNames/sr/no=\u043d\u043e\u0440\u0432\u0435\u0448\u043a\u0438
-LocaleNames/sr/pl=\u043f\u043e\u0459\u0441\u043a\u0438
-LocaleNames/sr/pt=\u043f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0441\u043a\u0438
-LocaleNames/sr/rm=\u0440\u043e\u043c\u0430\u043d\u0448
-LocaleNames/sr/ro=\u0440\u0443\u043c\u0443\u043d\u0441\u043a\u0438
-LocaleNames/sr/ru=\u0440\u0443\u0441\u043a\u0438
-LocaleNames/sr/sa=\u0441\u0430\u043d\u0441\u043a\u0440\u0438\u0442
-LocaleNames/sr/sk=\u0441\u043b\u043e\u0432\u0430\u0447\u043a\u0438
-LocaleNames/sr/sl=\u0441\u043b\u043e\u0432\u0435\u043d\u0430\u0447\u043a\u0438
-LocaleNames/sr/sq=\u0430\u043b\u0431\u0430\u043d\u0441\u043a\u0438
-LocaleNames/sr/sr=\u0441\u0440\u043f\u0441\u043a\u0438
-LocaleNames/sr/sv=\u0448\u0432\u0435\u0434\u0441\u043a\u0438
-LocaleNames/sr/sw=\u0441\u0432\u0430\u0445\u0438\u043b\u0438
-LocaleNames/sr/tr=\u0442\u0443\u0440\u0441\u043a\u0438
-LocaleNames/sr/uk=\u0443\u043a\u0440\u0430\u0458\u0438\u043d\u0441\u043a\u0438
-LocaleNames/sr/vi=\u0432\u0438\u0458\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438
-LocaleNames/sr/yi=\u0458\u0438\u0434\u0438\u0448
-LocaleNames/sr/zh=\u043a\u0438\u043d\u0435\u0441\u043a\u0438
-LocaleNames/sr/AD=\u0410\u043d\u0434\u043e\u0440\u0430
-LocaleNames/sr/AE=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0438 \u0410\u0440\u0430\u043f\u0441\u043a\u0438 \u0415\u043c\u0438\u0440\u0430\u0442\u0438
-LocaleNames/sr/AF=\u0410\u0432\u0433\u0430\u043d\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/AL=\u0410\u043b\u0431\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/AM=\u0408\u0435\u0440\u043c\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/AO=\u0410\u043d\u0433\u043e\u043b\u0430
-LocaleNames/sr/AR=\u0410\u0440\u0433\u0435\u043d\u0442\u0438\u043d\u0430
-LocaleNames/sr/AT=\u0410\u0443\u0441\u0442\u0440\u0438\u0458\u0430
-LocaleNames/sr/AU=\u0410\u0443\u0441\u0442\u0440\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/AW=\u0410\u0440\u0443\u0431\u0430
-LocaleNames/sr/AX=\u041e\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/AZ=\u0410\u0437\u0435\u0440\u0431\u0435\u0458\u045f\u0430\u043d
-LocaleNames/sr/BA=\u0411\u043e\u0441\u043d\u0430 \u0438 \u0425\u0435\u0440\u0446\u0435\u0433\u043e\u0432\u0438\u043d\u0430
-LocaleNames/sr/BB=\u0411\u0430\u0440\u0431\u0430\u0434\u043e\u0441
-LocaleNames/sr/BD=\u0411\u0430\u043d\u0433\u043b\u0430\u0434\u0435\u0448
-LocaleNames/sr/BE=\u0411\u0435\u043b\u0433\u0438\u0458\u0430
-LocaleNames/sr/BF=\u0411\u0443\u0440\u043a\u0438\u043d\u0430 \u0424\u0430\u0441\u043e
-LocaleNames/sr/BG=\u0411\u0443\u0433\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/BH=\u0411\u0430\u0445\u0440\u0435\u0438\u043d
-LocaleNames/sr/BI=\u0411\u0443\u0440\u0443\u043d\u0434\u0438
-LocaleNames/sr/BJ=\u0411\u0435\u043d\u0438\u043d
-LocaleNames/sr/BM=\u0411\u0435\u0440\u043c\u0443\u0434\u0438
-LocaleNames/sr/BN=\u0411\u0440\u0443\u043d\u0435\u0458
-LocaleNames/sr/BO=\u0411\u043e\u043b\u0438\u0432\u0438\u0458\u0430
-LocaleNames/sr/BR=\u0411\u0440\u0430\u0437\u0438\u043b
-LocaleNames/sr/BS=\u0411\u0430\u0445\u0430\u043c\u0438
-LocaleNames/sr/BT=\u0411\u0443\u0442\u0430\u043d
-LocaleNames/sr/BV=\u041e\u0441\u0442\u0440\u0432\u043e \u0411\u0443\u0432\u0435
-LocaleNames/sr/BW=\u0411\u043e\u0446\u0432\u0430\u043d\u0430
-LocaleNames/sr/BY=\u0411\u0435\u043b\u043e\u0440\u0443\u0441\u0438\u0458\u0430
-LocaleNames/sr/BZ=\u0411\u0435\u043b\u0438\u0437\u0435
-LocaleNames/sr/CA=\u041a\u0430\u043d\u0430\u0434\u0430
-LocaleNames/sr/CC=\u041a\u043e\u043a\u043e\u0441\u043e\u0432\u0430 (\u041a\u0438\u043b\u0438\u043d\u0433\u043e\u0432\u0430) \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/CD=\u041a\u043e\u043d\u0433\u043e - \u041a\u0438\u043d\u0448\u0430\u0441\u0430
-LocaleNames/sr/CF=\u0426\u0435\u043d\u0442\u0440\u0430\u043b\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/sr/CG=\u041a\u043e\u043d\u0433\u043e - \u0411\u0440\u0430\u0437\u0430\u0432\u0438\u043b
-LocaleNames/sr/CH=\u0428\u0432\u0430\u0458\u0446\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/CI=\u041e\u0431\u0430\u043b\u0430 \u0421\u043b\u043e\u043d\u043e\u0432\u0430\u0447\u0435 (\u041a\u043e\u0442 \u0434\u2019\u0418\u0432\u043e\u0430\u0440)
-LocaleNames/sr/CL=\u0427\u0438\u043b\u0435
-LocaleNames/sr/CM=\u041a\u0430\u043c\u0435\u0440\u0443\u043d
-LocaleNames/sr/CN=\u041a\u0438\u043d\u0430
-LocaleNames/sr/CO=\u041a\u043e\u043b\u0443\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/CR=\u041a\u043e\u0441\u0442\u0430\u0440\u0438\u043a\u0430
-LocaleNames/sr/CU=\u041a\u0443\u0431\u0430
-LocaleNames/sr/CV=\u0417\u0435\u043b\u0435\u043d\u043e\u0440\u0442\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/CX=\u0411\u043e\u0436\u0438\u045b\u043d\u043e \u041e\u0441\u0442\u0440\u0432\u043e
-LocaleNames/sr/CY=\u041a\u0438\u043f\u0430\u0440
-LocaleNames/sr/CZ=\u0427\u0435\u0448\u043a\u0430
-LocaleNames/sr/DE=\u041d\u0435\u043c\u0430\u0447\u043a\u0430
-LocaleNames/sr/DJ=\u040f\u0438\u0431\u0443\u0442\u0438
-LocaleNames/sr/DK=\u0414\u0430\u043d\u0441\u043a\u0430
-LocaleNames/sr/DM=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430
-LocaleNames/sr/DO=\u0414\u043e\u043c\u0438\u043d\u0438\u043a\u0430\u043d\u0441\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/sr/DZ=\u0410\u043b\u0436\u0438\u0440
-LocaleNames/sr/EC=\u0415\u043a\u0432\u0430\u0434\u043e\u0440
-LocaleNames/sr/EE=\u0415\u0441\u0442\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/EG=\u0415\u0433\u0438\u043f\u0430\u0442
-LocaleNames/sr/EH=\u0417\u0430\u043f\u0430\u0434\u043d\u0430 \u0421\u0430\u0445\u0430\u0440\u0430
-LocaleNames/sr/ER=\u0415\u0440\u0438\u0442\u0440\u0435\u0458\u0430
-LocaleNames/sr/ES=\u0428\u043f\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/ET=\u0415\u0442\u0438\u043e\u043f\u0438\u0458\u0430
-LocaleNames/sr/FI=\u0424\u0438\u043d\u0441\u043a\u0430
-LocaleNames/sr/FJ=\u0424\u0438\u045f\u0438
-LocaleNames/sr/FK=\u0424\u043e\u043a\u043b\u0430\u043d\u0434\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/FM=\u041c\u0438\u043a\u0440\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/FO=\u0424\u0430\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/FR=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430
-LocaleNames/sr/GA=\u0413\u0430\u0431\u043e\u043d
-LocaleNames/sr/GB=\u0423\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u043e \u041a\u0440\u0430\u0459\u0435\u0432\u0441\u0442\u0432\u043e
-LocaleNames/sr/GD=\u0413\u0440\u0435\u043d\u0430\u0434\u0430
-LocaleNames/sr/GE=\u0413\u0440\u0443\u0437\u0438\u0458\u0430
-LocaleNames/sr/GF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u0413\u0432\u0430\u0458\u0430\u043d\u0430
-LocaleNames/sr/GH=\u0413\u0430\u043d\u0430
-LocaleNames/sr/GI=\u0413\u0438\u0431\u0440\u0430\u043b\u0442\u0430\u0440
-LocaleNames/sr/GL=\u0413\u0440\u0435\u043d\u043b\u0430\u043d\u0434
-LocaleNames/sr/GM=\u0413\u0430\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/GN=\u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/GP=\u0413\u0432\u0430\u0434\u0435\u043b\u0443\u043f
-LocaleNames/sr/GQ=\u0415\u043a\u0432\u0430\u0442\u043e\u0440\u0438\u0458\u0430\u043b\u043d\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/GR=\u0413\u0440\u0447\u043a\u0430
-LocaleNames/sr/GS=\u0408\u0443\u0436\u043d\u0430 \u040f\u043e\u0440\u045f\u0438\u0458\u0430 \u0438 \u0408\u0443\u0436\u043d\u0430 \u0421\u0435\u043d\u0434\u0432\u0438\u0447\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/GT=\u0413\u0432\u0430\u0442\u0435\u043c\u0430\u043b\u0430
-LocaleNames/sr/GU=\u0413\u0443\u0430\u043c
-LocaleNames/sr/GW=\u0413\u0432\u0438\u043d\u0435\u0458\u0430-\u0411\u0438\u0441\u0430\u043e
-LocaleNames/sr/GY=\u0413\u0432\u0430\u0458\u0430\u043d\u0430
-LocaleNames/sr/HK=\u0421\u0410\u0420 \u0425\u043e\u043d\u0433\u043a\u043e\u043d\u0433 (\u041a\u0438\u043d\u0430)
-LocaleNames/sr/HM=\u041e\u0441\u0442\u0440\u0432\u043e \u0425\u0435\u0440\u0434 \u0438 \u041c\u0435\u043a\u0434\u043e\u043d\u0430\u043b\u0434\u043e\u0432\u0430 \u043e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/HN=\u0425\u043e\u043d\u0434\u0443\u0440\u0430\u0441
-LocaleNames/sr/HR=\u0425\u0440\u0432\u0430\u0442\u0441\u043a\u0430
-LocaleNames/sr/HT=\u0425\u0430\u0438\u0442\u0438
-LocaleNames/sr/HU=\u041c\u0430\u0452\u0430\u0440\u0441\u043a\u0430
-LocaleNames/sr/ID=\u0418\u043d\u0434\u043e\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/IE=\u0418\u0440\u0441\u043a\u0430
-LocaleNames/sr/IL=\u0418\u0437\u0440\u0430\u0435\u043b
-LocaleNames/sr/IN=\u0418\u043d\u0434\u0438\u0458\u0430
-LocaleNames/sr/IQ=\u0418\u0440\u0430\u043a
-LocaleNames/sr/IR=\u0418\u0440\u0430\u043d
-LocaleNames/sr/IS=\u0418\u0441\u043b\u0430\u043d\u0434
-LocaleNames/sr/IT=\u0418\u0442\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/JM=\u0408\u0430\u043c\u0430\u0458\u043a\u0430
-LocaleNames/sr/JO=\u0408\u043e\u0440\u0434\u0430\u043d
-LocaleNames/sr/JP=\u0408\u0430\u043f\u0430\u043d
-LocaleNames/sr/KE=\u041a\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/KG=\u041a\u0438\u0440\u0433\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/KH=\u041a\u0430\u043c\u0431\u043e\u045f\u0430
-LocaleNames/sr/KI=\u041a\u0438\u0440\u0438\u0431\u0430\u0442\u0438
-LocaleNames/sr/KM=\u041a\u043e\u043c\u043e\u0440\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/KN=\u0421\u0435\u043d\u0442 \u041a\u0438\u0442\u0441 \u0438 \u041d\u0435\u0432\u0438\u0441
-LocaleNames/sr/KP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-LocaleNames/sr/KR=\u0408\u0443\u0436\u043d\u0430 \u041a\u043e\u0440\u0435\u0458\u0430
-LocaleNames/sr/KW=\u041a\u0443\u0432\u0430\u0458\u0442
-LocaleNames/sr/KY=\u041a\u0430\u0458\u043c\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/KZ=\u041a\u0430\u0437\u0430\u0445\u0441\u0442\u0430\u043d
-LocaleNames/sr/LA=\u041b\u0430\u043e\u0441
-LocaleNames/sr/LB=\u041b\u0438\u0431\u0430\u043d
-LocaleNames/sr/LC=\u0421\u0432\u0435\u0442\u0430 \u041b\u0443\u0446\u0438\u0458\u0430
-LocaleNames/sr/LI=\u041b\u0438\u0445\u0442\u0435\u043d\u0448\u0442\u0430\u0458\u043d
-LocaleNames/sr/LK=\u0428\u0440\u0438 \u041b\u0430\u043d\u043a\u0430
-LocaleNames/sr/LR=\u041b\u0438\u0431\u0435\u0440\u0438\u0458\u0430
-LocaleNames/sr/LS=\u041b\u0435\u0441\u043e\u0442\u043e
-LocaleNames/sr/LT=\u041b\u0438\u0442\u0432\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/LU=\u041b\u0443\u043a\u0441\u0435\u043c\u0431\u0443\u0440\u0433
-LocaleNames/sr/LV=\u041b\u0435\u0442\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/LY=\u041b\u0438\u0431\u0438\u0458\u0430
-LocaleNames/sr/MA=\u041c\u0430\u0440\u043e\u043a\u043e
-LocaleNames/sr/MC=\u041c\u043e\u043d\u0430\u043a\u043e
-LocaleNames/sr/MD=\u041c\u043e\u043b\u0434\u0430\u0432\u0438\u0458\u0430
-LocaleNames/sr/MG=\u041c\u0430\u0434\u0430\u0433\u0430\u0441\u043a\u0430\u0440
-LocaleNames/sr/MH=\u041c\u0430\u0440\u0448\u0430\u043b\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/MK=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/ML=\u041c\u0430\u043b\u0438
-LocaleNames/sr/MM=\u041c\u0438\u0458\u0430\u043d\u043c\u0430\u0440 (\u0411\u0443\u0440\u043c\u0430)
-LocaleNames/sr/MN=\u041c\u043e\u043d\u0433\u043e\u043b\u0438\u0458\u0430
-LocaleNames/sr/MO=\u0421\u0410\u0420 \u041c\u0430\u043a\u0430\u043e (\u041a\u0438\u043d\u0430)
-LocaleNames/sr/MP=\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/MQ=\u041c\u0430\u0440\u0442\u0438\u043d\u0438\u043a
-LocaleNames/sr/MR=\u041c\u0430\u0443\u0440\u0438\u0442\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/MS=\u041c\u043e\u043d\u0441\u0435\u0440\u0430\u0442
-LocaleNames/sr/MT=\u041c\u0430\u043b\u0442\u0430
-LocaleNames/sr/MU=\u041c\u0430\u0443\u0440\u0438\u0446\u0438\u0458\u0443\u0441
-LocaleNames/sr/MV=\u041c\u0430\u043b\u0434\u0438\u0432\u0438
-LocaleNames/sr/MW=\u041c\u0430\u043b\u0430\u0432\u0438
-LocaleNames/sr/MX=\u041c\u0435\u043a\u0441\u0438\u043a\u043e
-LocaleNames/sr/MY=\u041c\u0430\u043b\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/MZ=\u041c\u043e\u0437\u0430\u043c\u0431\u0438\u043a
-LocaleNames/sr/NA=\u041d\u0430\u043c\u0438\u0431\u0438\u0458\u0430
-LocaleNames/sr/NC=\u041d\u043e\u0432\u0430 \u041a\u0430\u043b\u0435\u0434\u043e\u043d\u0438\u0458\u0430
-LocaleNames/sr/NE=\u041d\u0438\u0433\u0435\u0440
-LocaleNames/sr/NF=\u041e\u0441\u0442\u0440\u0432\u043e \u041d\u043e\u0440\u0444\u043e\u043a
-LocaleNames/sr/NG=\u041d\u0438\u0433\u0435\u0440\u0438\u0458\u0430
-LocaleNames/sr/NI=\u041d\u0438\u043a\u0430\u0440\u0430\u0433\u0432\u0430
-LocaleNames/sr/NL=\u0425\u043e\u043b\u0430\u043d\u0434\u0438\u0458\u0430
-LocaleNames/sr/NO=\u041d\u043e\u0440\u0432\u0435\u0448\u043a\u0430
-LocaleNames/sr/NP=\u041d\u0435\u043f\u0430\u043b
-LocaleNames/sr/NR=\u041d\u0430\u0443\u0440\u0443
-LocaleNames/sr/NU=\u041d\u0438\u0443\u0435
-LocaleNames/sr/NZ=\u041d\u043e\u0432\u0438 \u0417\u0435\u043b\u0430\u043d\u0434
-LocaleNames/sr/OM=\u041e\u043c\u0430\u043d
-LocaleNames/sr/PA=\u041f\u0430\u043d\u0430\u043c\u0430
-LocaleNames/sr/PE=\u041f\u0435\u0440\u0443
-LocaleNames/sr/PF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0430 \u041f\u043e\u043b\u0438\u043d\u0435\u0437\u0438\u0458\u0430
-LocaleNames/sr/PG=\u041f\u0430\u043f\u0443\u0430 \u041d\u043e\u0432\u0430 \u0413\u0432\u0438\u043d\u0435\u0458\u0430
-LocaleNames/sr/PH=\u0424\u0438\u043b\u0438\u043f\u0438\u043d\u0438
-LocaleNames/sr/PK=\u041f\u0430\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/PL=\u041f\u043e\u0459\u0441\u043a\u0430
-LocaleNames/sr/PM=\u0421\u0435\u043d \u041f\u0458\u0435\u0440 \u0438 \u041c\u0438\u043a\u0435\u043b\u043e\u043d
-LocaleNames/sr/PN=\u041f\u0438\u0442\u043a\u0435\u0440\u043d
-LocaleNames/sr/PR=\u041f\u043e\u0440\u0442\u043e\u0440\u0438\u043a\u043e
-LocaleNames/sr/PS=\u041f\u0430\u043b\u0435\u0441\u0442\u0438\u043d\u0441\u043a\u0435 \u0442\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-LocaleNames/sr/PT=\u041f\u043e\u0440\u0442\u0443\u0433\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/PW=\u041f\u0430\u043b\u0430\u0443
-LocaleNames/sr/PY=\u041f\u0430\u0440\u0430\u0433\u0432\u0430\u0458
-LocaleNames/sr/QA=\u041a\u0430\u0442\u0430\u0440
-LocaleNames/sr/RE=\u0420\u0435\u0438\u043d\u0438\u043e\u043d
-LocaleNames/sr/RO=\u0420\u0443\u043c\u0443\u043d\u0438\u0458\u0430
-LocaleNames/sr/RU=\u0420\u0443\u0441\u0438\u0458\u0430
-LocaleNames/sr/RW=\u0420\u0443\u0430\u043d\u0434\u0430
-LocaleNames/sr/SA=\u0421\u0430\u0443\u0434\u0438\u0458\u0441\u043a\u0430 \u0410\u0440\u0430\u0431\u0438\u0458\u0430
-LocaleNames/sr/SB=\u0421\u043e\u043b\u043e\u043c\u043e\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/SC=\u0421\u0435\u0458\u0448\u0435\u043b\u0438
-LocaleNames/sr/SD=\u0421\u0443\u0434\u0430\u043d
-LocaleNames/sr/SE=\u0428\u0432\u0435\u0434\u0441\u043a\u0430
-LocaleNames/sr/SG=\u0421\u0438\u043d\u0433\u0430\u043f\u0443\u0440
-LocaleNames/sr/SH=\u0421\u0432\u0435\u0442\u0430 \u0408\u0435\u043b\u0435\u043d\u0430
-LocaleNames/sr/SI=\u0421\u043b\u043e\u0432\u0435\u043d\u0438\u0458\u0430
-LocaleNames/sr/SJ=\u0421\u0432\u0430\u043b\u0431\u0430\u0440\u0434 \u0438 \u0408\u0430\u043d \u041c\u0430\u0458\u0435\u043d
-LocaleNames/sr/SK=\u0421\u043b\u043e\u0432\u0430\u0447\u043a\u0430
-LocaleNames/sr/SL=\u0421\u0438\u0458\u0435\u0440\u0430 \u041b\u0435\u043e\u043d\u0435
-LocaleNames/sr/SM=\u0421\u0430\u043d \u041c\u0430\u0440\u0438\u043d\u043e
-LocaleNames/sr/SN=\u0421\u0435\u043d\u0435\u0433\u0430\u043b
-LocaleNames/sr/SO=\u0421\u043e\u043c\u0430\u043b\u0438\u0458\u0430
-LocaleNames/sr/SR=\u0421\u0443\u0440\u0438\u043d\u0430\u043c
-LocaleNames/sr/ST=\u0421\u0430\u043e \u0422\u043e\u043c\u0435 \u0438 \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0435
-LocaleNames/sr/SV=\u0421\u0430\u043b\u0432\u0430\u0434\u043e\u0440
-LocaleNames/sr/SY=\u0421\u0438\u0440\u0438\u0458\u0430
-LocaleNames/sr/SZ=\u0421\u0432\u0430\u0437\u0438\u043b\u0435\u043d\u0434
-LocaleNames/sr/TC=\u041e\u0441\u0442\u0440\u0432\u0430 \u0422\u0443\u0440\u043a\u0441 \u0438 \u041a\u0430\u0438\u043a\u043e\u0441
-LocaleNames/sr/TD=\u0427\u0430\u0434
-LocaleNames/sr/TF=\u0424\u0440\u0430\u043d\u0446\u0443\u0441\u043a\u0435 \u0408\u0443\u0436\u043d\u0435 \u0422\u0435\u0440\u0438\u0442\u043e\u0440\u0438\u0458\u0435
-LocaleNames/sr/TG=\u0422\u043e\u0433\u043e
-LocaleNames/sr/TH=\u0422\u0430\u0458\u043b\u0430\u043d\u0434
-LocaleNames/sr/TJ=\u0422\u0430\u045f\u0438\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/TK=\u0422\u043e\u043a\u0435\u043b\u0430\u0443
-LocaleNames/sr/TL=\u0422\u0438\u043c\u043e\u0440-\u041b\u0435\u0441\u0442\u0435 (\u0418\u0441\u0442\u043e\u0447\u043d\u0438 \u0422\u0438\u043c\u043e\u0440)
-LocaleNames/sr/TM=\u0422\u0443\u0440\u043a\u043c\u0435\u043d\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/TN=\u0422\u0443\u043d\u0438\u0441
-LocaleNames/sr/TO=\u0422\u043e\u043d\u0433\u0430
-LocaleNames/sr/TR=\u0422\u0443\u0440\u0441\u043a\u0430
-LocaleNames/sr/TT=\u0422\u0440\u0438\u043d\u0438\u0434\u0430\u0434 \u0438 \u0422\u043e\u0431\u0430\u0433\u043e
-LocaleNames/sr/TV=\u0422\u0443\u0432\u0430\u043b\u0443
-LocaleNames/sr/TW=\u0422\u0430\u0458\u0432\u0430\u043d
-LocaleNames/sr/TZ=\u0422\u0430\u043d\u0437\u0430\u043d\u0438\u0458\u0430
-LocaleNames/sr/UA=\u0423\u043a\u0440\u0430\u0458\u0438\u043d\u0430
-LocaleNames/sr/UG=\u0423\u0433\u0430\u043d\u0434\u0430
-LocaleNames/sr/UM=\u0423\u0434\u0430\u0459\u0435\u043d\u0430 \u043e\u0441\u0442\u0440\u0432\u0430 \u0421\u0410\u0414
-LocaleNames/sr/US=\u0421\u0458\u0435\u0434\u0438\u045a\u0435\u043d\u0435 \u0414\u0440\u0436\u0430\u0432\u0435
-LocaleNames/sr/UY=\u0423\u0440\u0443\u0433\u0432\u0430\u0458
-LocaleNames/sr/UZ=\u0423\u0437\u0431\u0435\u043a\u0438\u0441\u0442\u0430\u043d
-LocaleNames/sr/VA=\u0412\u0430\u0442\u0438\u043a\u0430\u043d
-LocaleNames/sr/VC=\u0421\u0435\u043d\u0442 \u0412\u0438\u043d\u0441\u0435\u043d\u0442 \u0438 \u0413\u0440\u0435\u043d\u0430\u0434\u0438\u043d\u0438
-LocaleNames/sr/VE=\u0412\u0435\u043d\u0435\u0446\u0443\u0435\u043b\u0430
-LocaleNames/sr/VG=\u0411\u0440\u0438\u0442\u0430\u043d\u0441\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/VI=\u0410\u043c\u0435\u0440\u0438\u0447\u043a\u0430 \u0414\u0435\u0432\u0438\u0447\u0430\u043d\u0441\u043a\u0430 \u041e\u0441\u0442\u0440\u0432\u0430
-LocaleNames/sr/VN=\u0412\u0438\u0458\u0435\u0442\u043d\u0430\u043c
-LocaleNames/sr/VU=\u0412\u0430\u043d\u0443\u0430\u0442\u0443
-LocaleNames/sr/WF=\u0412\u0430\u043b\u0438\u0441 \u0438 \u0424\u0443\u0442\u0443\u043d\u0430
-LocaleNames/sr/WS=\u0421\u0430\u043c\u043e\u0430
-LocaleNames/sr/YE=\u0408\u0435\u043c\u0435\u043d
-LocaleNames/sr/YT=\u041c\u0430\u0458\u043e\u0442
-LocaleNames/sr/ZM=\u0417\u0430\u043c\u0431\u0438\u0458\u0430
-LocaleNames/sr/ZW=\u0417\u0438\u043c\u0431\u0430\u0431\u0432\u0435
-CurrencyNames/sr_CS/EUR=\u20ac
+LocaleNames/sr/af=африканс
+LocaleNames/sr/ar=арапски
+LocaleNames/sr/be=белоруски
+LocaleNames/sr/bg=бугарски
+LocaleNames/sr/br=бретонски
+LocaleNames/sr/ca=каталонски
+LocaleNames/sr/co=корзикански
+LocaleNames/sr/cs=чешки
+LocaleNames/sr/da=дански
+LocaleNames/sr/de=немачки
+LocaleNames/sr/el=грчки
+LocaleNames/sr/en=енглески
+LocaleNames/sr/eo=есперанто
+LocaleNames/sr/es=шпански
+LocaleNames/sr/et=естонски
+LocaleNames/sr/eu=баскијски
+LocaleNames/sr/fa=персијски
+LocaleNames/sr/fi=фински
+LocaleNames/sr/fr=француски
+LocaleNames/sr/ga=ирски
+LocaleNames/sr/he=хебрејски
+LocaleNames/sr/hi=хинди
+LocaleNames/sr/hr=хрватски
+LocaleNames/sr/hu=мађарски
+LocaleNames/sr/hy=јерменски
+LocaleNames/sr/id=индонежански
+LocaleNames/sr/is=исландски
+LocaleNames/sr/it=италијански
+LocaleNames/sr/ja=јапански
+LocaleNames/sr/ka=грузијски
+LocaleNames/sr/km=кмерски
+LocaleNames/sr/ko=корејски
+LocaleNames/sr/ku=курдски
+LocaleNames/sr/ky=киргиски
+LocaleNames/sr/la=латински
+LocaleNames/sr/lt=литвански
+LocaleNames/sr/lv=летонски
+LocaleNames/sr/mk=македонски
+LocaleNames/sr/mn=монголски
+LocaleNames/sr/my=бурмански
+LocaleNames/sr/nl=холандски
+LocaleNames/sr/no=норвешки
+LocaleNames/sr/pl=пољски
+LocaleNames/sr/pt=португалски
+LocaleNames/sr/rm=романш
+LocaleNames/sr/ro=румунски
+LocaleNames/sr/ru=руски
+LocaleNames/sr/sa=санскрит
+LocaleNames/sr/sk=словачки
+LocaleNames/sr/sl=словеначки
+LocaleNames/sr/sq=албански
+LocaleNames/sr/sr=српски
+LocaleNames/sr/sv=шведски
+LocaleNames/sr/sw=свахили
+LocaleNames/sr/tr=турски
+LocaleNames/sr/uk=украјински
+LocaleNames/sr/vi=вијетнамски
+LocaleNames/sr/yi=јидиш
+LocaleNames/sr/zh=кинески
+LocaleNames/sr/AD=Андора
+LocaleNames/sr/AE=Уједињени Арапски Емирати
+LocaleNames/sr/AF=Авганистан
+LocaleNames/sr/AL=Албанија
+LocaleNames/sr/AM=Јерменија
+LocaleNames/sr/AO=Ангола
+LocaleNames/sr/AR=Аргентина
+LocaleNames/sr/AT=Аустрија
+LocaleNames/sr/AU=Аустралија
+LocaleNames/sr/AW=Аруба
+LocaleNames/sr/AX=Оландска Острва
+LocaleNames/sr/AZ=Азербејџан
+LocaleNames/sr/BA=Босна и Херцеговина
+LocaleNames/sr/BB=Барбадос
+LocaleNames/sr/BD=Бангладеш
+LocaleNames/sr/BE=Белгија
+LocaleNames/sr/BF=Буркина Фасо
+LocaleNames/sr/BG=Бугарска
+LocaleNames/sr/BH=Бахреин
+LocaleNames/sr/BI=Бурунди
+LocaleNames/sr/BJ=Бенин
+LocaleNames/sr/BM=Бермуди
+LocaleNames/sr/BN=Брунеј
+LocaleNames/sr/BO=Боливија
+LocaleNames/sr/BR=Бразил
+LocaleNames/sr/BS=Бахами
+LocaleNames/sr/BT=Бутан
+LocaleNames/sr/BV=Острво Буве
+LocaleNames/sr/BW=Боцвана
+LocaleNames/sr/BY=Белорусија
+LocaleNames/sr/BZ=Белизе
+LocaleNames/sr/CA=Канада
+LocaleNames/sr/CC=Кокосова (Килингова) Острва
+LocaleNames/sr/CD=Конго - Киншаса
+LocaleNames/sr/CF=Централноафричка Република
+LocaleNames/sr/CG=Конго - Бразавил
+LocaleNames/sr/CH=Швајцарска
+LocaleNames/sr/CI=Обала Слоноваче (Кот д’Ивоар)
+LocaleNames/sr/CL=Чиле
+LocaleNames/sr/CM=Камерун
+LocaleNames/sr/CN=Кина
+LocaleNames/sr/CO=Колумбија
+LocaleNames/sr/CR=Костарика
+LocaleNames/sr/CU=Куба
+LocaleNames/sr/CV=Зеленортска Острва
+LocaleNames/sr/CX=Божићно Острво
+LocaleNames/sr/CY=Кипар
+LocaleNames/sr/CZ=Чешка
+LocaleNames/sr/DE=Немачка
+LocaleNames/sr/DJ=Џибути
+LocaleNames/sr/DK=Данска
+LocaleNames/sr/DM=Доминика
+LocaleNames/sr/DO=Доминиканска Република
+LocaleNames/sr/DZ=Алжир
+LocaleNames/sr/EC=Еквадор
+LocaleNames/sr/EE=Естонија
+LocaleNames/sr/EG=Египат
+LocaleNames/sr/EH=Западна Сахара
+LocaleNames/sr/ER=Еритреја
+LocaleNames/sr/ES=Шпанија
+LocaleNames/sr/ET=Етиопија
+LocaleNames/sr/FI=Финска
+LocaleNames/sr/FJ=Фиџи
+LocaleNames/sr/FK=Фокландска Острва
+LocaleNames/sr/FM=Микронезија
+LocaleNames/sr/FO=Фарска Острва
+LocaleNames/sr/FR=Француска
+LocaleNames/sr/GA=Габон
+LocaleNames/sr/GB=Уједињено Краљевство
+LocaleNames/sr/GD=Гренада
+LocaleNames/sr/GE=Грузија
+LocaleNames/sr/GF=Француска Гвајана
+LocaleNames/sr/GH=Гана
+LocaleNames/sr/GI=Гибралтар
+LocaleNames/sr/GL=Гренланд
+LocaleNames/sr/GM=Гамбија
+LocaleNames/sr/GN=Гвинеја
+LocaleNames/sr/GP=Гваделуп
+LocaleNames/sr/GQ=Екваторијална Гвинеја
+LocaleNames/sr/GR=Грчка
+LocaleNames/sr/GS=Јужна Џорџија и Јужна Сендвичка Острва
+LocaleNames/sr/GT=Гватемала
+LocaleNames/sr/GU=Гуам
+LocaleNames/sr/GW=Гвинеја-Бисао
+LocaleNames/sr/GY=Гвајана
+LocaleNames/sr/HK=САР Хонгконг (Кина)
+LocaleNames/sr/HM=Острво Херд и Мекдоналдова острва
+LocaleNames/sr/HN=Хондурас
+LocaleNames/sr/HR=Хрватска
+LocaleNames/sr/HT=Хаити
+LocaleNames/sr/HU=Мађарска
+LocaleNames/sr/ID=Индонезија
+LocaleNames/sr/IE=Ирска
+LocaleNames/sr/IL=Израел
+LocaleNames/sr/IN=Индија
+LocaleNames/sr/IQ=Ирак
+LocaleNames/sr/IR=Иран
+LocaleNames/sr/IS=Исланд
+LocaleNames/sr/IT=Италија
+LocaleNames/sr/JM=Јамајка
+LocaleNames/sr/JO=Јордан
+LocaleNames/sr/JP=Јапан
+LocaleNames/sr/KE=Кенија
+LocaleNames/sr/KG=Киргистан
+LocaleNames/sr/KH=Камбоџа
+LocaleNames/sr/KI=Кирибати
+LocaleNames/sr/KM=Коморска Острва
+LocaleNames/sr/KN=Сент Китс и Невис
+LocaleNames/sr/KP=Северна Кореја
+LocaleNames/sr/KR=Јужна Кореја
+LocaleNames/sr/KW=Кувајт
+LocaleNames/sr/KY=Кајманска Острва
+LocaleNames/sr/KZ=Казахстан
+LocaleNames/sr/LA=Лаос
+LocaleNames/sr/LB=Либан
+LocaleNames/sr/LC=Света Луција
+LocaleNames/sr/LI=Лихтенштајн
+LocaleNames/sr/LK=Шри Ланка
+LocaleNames/sr/LR=Либерија
+LocaleNames/sr/LS=Лесото
+LocaleNames/sr/LT=Литванија
+LocaleNames/sr/LU=Луксембург
+LocaleNames/sr/LV=Летонија
+LocaleNames/sr/LY=Либија
+LocaleNames/sr/MA=Мароко
+LocaleNames/sr/MC=Монако
+LocaleNames/sr/MD=Молдавија
+LocaleNames/sr/MG=Мадагаскар
+LocaleNames/sr/MH=Маршалска Острва
+LocaleNames/sr/MK=Северна Македонија
+LocaleNames/sr/ML=Мали
+LocaleNames/sr/MM=Мијанмар (Бурма)
+LocaleNames/sr/MN=Монголија
+LocaleNames/sr/MO=САР Макао (Кина)
+LocaleNames/sr/MP=Северна Маријанска Острва
+LocaleNames/sr/MQ=Мартиник
+LocaleNames/sr/MR=Мауританија
+LocaleNames/sr/MS=Монсерат
+LocaleNames/sr/MT=Малта
+LocaleNames/sr/MU=Маурицијус
+LocaleNames/sr/MV=Малдиви
+LocaleNames/sr/MW=Малави
+LocaleNames/sr/MX=Мексико
+LocaleNames/sr/MY=Малезија
+LocaleNames/sr/MZ=Мозамбик
+LocaleNames/sr/NA=Намибија
+LocaleNames/sr/NC=Нова Каледонија
+LocaleNames/sr/NE=Нигер
+LocaleNames/sr/NF=Острво Норфок
+LocaleNames/sr/NG=Нигерија
+LocaleNames/sr/NI=Никарагва
+LocaleNames/sr/NL=Холандија
+LocaleNames/sr/NO=Норвешка
+LocaleNames/sr/NP=Непал
+LocaleNames/sr/NR=Науру
+LocaleNames/sr/NU=Ниуе
+LocaleNames/sr/NZ=Нови Зеланд
+LocaleNames/sr/OM=Оман
+LocaleNames/sr/PA=Панама
+LocaleNames/sr/PE=Перу
+LocaleNames/sr/PF=Француска Полинезија
+LocaleNames/sr/PG=Папуа Нова Гвинеја
+LocaleNames/sr/PH=Филипини
+LocaleNames/sr/PK=Пакистан
+LocaleNames/sr/PL=Пољска
+LocaleNames/sr/PM=Сен Пјер и Микелон
+LocaleNames/sr/PN=Питкерн
+LocaleNames/sr/PR=Порторико
+LocaleNames/sr/PS=Палестинске територије
+LocaleNames/sr/PT=Португалија
+LocaleNames/sr/PW=Палау
+LocaleNames/sr/PY=Парагвај
+LocaleNames/sr/QA=Катар
+LocaleNames/sr/RE=Реинион
+LocaleNames/sr/RO=Румунија
+LocaleNames/sr/RU=Русија
+LocaleNames/sr/RW=Руанда
+LocaleNames/sr/SA=Саудијска Арабија
+LocaleNames/sr/SB=Соломонска Острва
+LocaleNames/sr/SC=Сејшели
+LocaleNames/sr/SD=Судан
+LocaleNames/sr/SE=Шведска
+LocaleNames/sr/SG=Сингапур
+LocaleNames/sr/SH=Света Јелена
+LocaleNames/sr/SI=Словенија
+LocaleNames/sr/SJ=Свалбард и Јан Мајен
+LocaleNames/sr/SK=Словачка
+LocaleNames/sr/SL=Сијера Леоне
+LocaleNames/sr/SM=Сан Марино
+LocaleNames/sr/SN=Сенегал
+LocaleNames/sr/SO=Сомалија
+LocaleNames/sr/SR=Суринам
+LocaleNames/sr/ST=Сао Томе и Принципе
+LocaleNames/sr/SV=Салвадор
+LocaleNames/sr/SY=Сирија
+LocaleNames/sr/SZ=Свазиленд
+LocaleNames/sr/TC=Острва Туркс и Каикос
+LocaleNames/sr/TD=Чад
+LocaleNames/sr/TF=Француске Јужне Територије
+LocaleNames/sr/TG=Того
+LocaleNames/sr/TH=Тајланд
+LocaleNames/sr/TJ=Таџикистан
+LocaleNames/sr/TK=Токелау
+LocaleNames/sr/TL=Тимор-Лесте (Источни Тимор)
+LocaleNames/sr/TM=Туркменистан
+LocaleNames/sr/TN=Тунис
+LocaleNames/sr/TO=Тонга
+LocaleNames/sr/TR=Турска
+LocaleNames/sr/TT=Тринидад и Тобаго
+LocaleNames/sr/TV=Тувалу
+LocaleNames/sr/TW=Тајван
+LocaleNames/sr/TZ=Танзанија
+LocaleNames/sr/UA=Украјина
+LocaleNames/sr/UG=Уганда
+LocaleNames/sr/UM=Удаљена острва САД
+LocaleNames/sr/US=Сједињене Државе
+LocaleNames/sr/UY=Уругвај
+LocaleNames/sr/UZ=Узбекистан
+LocaleNames/sr/VA=Ватикан
+LocaleNames/sr/VC=Сент Винсент и Гренадини
+LocaleNames/sr/VE=Венецуела
+LocaleNames/sr/VG=Британска Девичанска Острва
+LocaleNames/sr/VI=Америчка Девичанска Острва
+LocaleNames/sr/VN=Вијетнам
+LocaleNames/sr/VU=Вануату
+LocaleNames/sr/WF=Валис и Футуна
+LocaleNames/sr/WS=Самоа
+LocaleNames/sr/YE=Јемен
+LocaleNames/sr/YT=Мајот
+LocaleNames/sr/ZM=Замбија
+LocaleNames/sr/ZW=Зимбабве
+CurrencyNames/sr_CS/EUR=€
 # bug 6498742: data is changed
-CurrencyNames/sr_BA/BAM=\u041a\u041c
+CurrencyNames/sr_BA/BAM=КМ
 
-CurrencyNames/sr_BA/EUR=\u20ac
+CurrencyNames/sr_BA/EUR=€
 
 # bug #6351682 Country name for Korean is wrong in Simplified Chinese
-LocaleNames/zh/KP=\u671d\u9c9c
-LocaleNames/zh/KR=\u97e9\u56fd
+LocaleNames/zh/KP=朝鲜
+LocaleNames/zh/KR=韩国
 
 # bug 6379382: Finnish time of day should be formatted as "H.mm.ss", not "hh:mm:ss"
 FormatData/fi/TimePatterns/0=H.mm.ss zzzz
 FormatData/fi/TimePatterns/1=H.mm.ss z
 
 # bug 6498742: data for IR & ZW changed
-LocaleNames/pt_PT/IR=Ir\u00e3o
-LocaleNames/pt_PT/ZW=Zimbabu\u00e9
-
-LocaleNames/el/ar=\u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el/be=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/bg=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el/bn=\u0392\u03b5\u03b3\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/bo=\u0398\u03b9\u03b2\u03b5\u03c4\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el/bs=\u0392\u03bf\u03c3\u03bd\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el/ca=\u039a\u03b1\u03c4\u03b1\u03bb\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/co=\u039a\u03bf\u03c1\u03c3\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/cs=\u03a4\u03c3\u03b5\u03c7\u03b9\u03ba\u03ac
-LocaleNames/el/cy=\u039f\u03c5\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/da=\u0394\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/de=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/el=\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/en=\u0391\u03b3\u03b3\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/es=\u0399\u03c3\u03c0\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/et=\u0395\u03c3\u03b8\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/eu=\u0392\u03b1\u03c3\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/fa=\u03a0\u03b5\u03c1\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/fi=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/fr=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/ga=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/gd=\u03a3\u03ba\u03c9\u03c4\u03b9\u03ba\u03ac \u039a\u03b5\u03bb\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/he=\u0395\u03b2\u03c1\u03b1\u03ca\u03ba\u03ac
-LocaleNames/el/hi=\u03a7\u03af\u03bd\u03c4\u03b9
-LocaleNames/el/hr=\u039a\u03c1\u03bf\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/hu=\u039f\u03c5\u03b3\u03b3\u03c1\u03b9\u03ba\u03ac
-LocaleNames/el/hy=\u0391\u03c1\u03bc\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/id=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03b9\u03b1\u03ba\u03ac
-LocaleNames/el/is=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/it=\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/ja=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/ka=\u0393\u03b5\u03c9\u03c1\u03b3\u03b9\u03b1\u03bd\u03ac
-LocaleNames/el/ko=\u039a\u03bf\u03c1\u03b5\u03b1\u03c4\u03b9\u03ba\u03ac
-LocaleNames/el/la=\u039b\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/lt=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/lv=\u039b\u03b5\u03c4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/mk=\u03a3\u03bb\u03b1\u03b2\u03bf\u03bc\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/mn=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/mt=\u039c\u03b1\u03bb\u03c4\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el/no=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03b9\u03ba\u03ac
-LocaleNames/el/pl=\u03a0\u03bf\u03bb\u03c9\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/pt=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03b9\u03ba\u03ac
-LocaleNames/el/ro=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/ru=\u03a1\u03c9\u03c3\u03b9\u03ba\u03ac
-LocaleNames/el/sk=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/sl=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/sq=\u0391\u03bb\u03b2\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/sr=\u03a3\u03b5\u03c1\u03b2\u03b9\u03ba\u03ac
-LocaleNames/el/sv=\u03a3\u03bf\u03c5\u03b7\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/th=\u03a4\u03b1\u03ca\u03bb\u03b1\u03bd\u03b4\u03b9\u03ba\u03ac
-LocaleNames/el/tr=\u03a4\u03bf\u03c5\u03c1\u03ba\u03b9\u03ba\u03ac
-LocaleNames/el/uk=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03b9\u03ba\u03ac
-LocaleNames/el/vi=\u0392\u03b9\u03b5\u03c4\u03bd\u03b1\u03bc\u03b9\u03ba\u03ac
-LocaleNames/el/yi=\u0393\u03af\u03bd\u03c4\u03b9\u03c2
-LocaleNames/el/zh=\u039a\u03b9\u03bd\u03b5\u03b6\u03b9\u03ba\u03ac
-LocaleNames/el/AD=\u0391\u03bd\u03b4\u03cc\u03c1\u03b1
-LocaleNames/el/AE=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b1 \u0391\u03c1\u03b1\u03b2\u03b9\u03ba\u03ac \u0395\u03bc\u03b9\u03c1\u03ac\u03c4\u03b1
-LocaleNames/el/AF=\u0391\u03c6\u03b3\u03b1\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/AG=\u0391\u03bd\u03c4\u03af\u03b3\u03ba\u03bf\u03c5\u03b1 \u03ba\u03b1\u03b9 \u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03bf\u03cd\u03bd\u03c4\u03b1
-LocaleNames/el/AI=\u0391\u03bd\u03b3\u03ba\u03bf\u03c5\u03af\u03bb\u03b1
-LocaleNames/el/AL=\u0391\u03bb\u03b2\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/AM=\u0391\u03c1\u03bc\u03b5\u03bd\u03af\u03b1
-LocaleNames/el/AO=\u0391\u03b3\u03ba\u03cc\u03bb\u03b1
-LocaleNames/el/AQ=\u0391\u03bd\u03c4\u03b1\u03c1\u03ba\u03c4\u03b9\u03ba\u03ae
-LocaleNames/el/AR=\u0391\u03c1\u03b3\u03b5\u03bd\u03c4\u03b9\u03bd\u03ae
-LocaleNames/el/AS=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el/AT=\u0391\u03c5\u03c3\u03c4\u03c1\u03af\u03b1
-LocaleNames/el/AU=\u0391\u03c5\u03c3\u03c4\u03c1\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/AW=\u0391\u03c1\u03bf\u03cd\u03bc\u03c0\u03b1
-LocaleNames/el/AX=\u039d\u03ae\u03c3\u03bf\u03b9 \u038c\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el/AZ=\u0391\u03b6\u03b5\u03c1\u03bc\u03c0\u03b1\u03ca\u03c4\u03b6\u03ac\u03bd
-LocaleNames/el/BA=\u0392\u03bf\u03c3\u03bd\u03af\u03b1 - \u0395\u03c1\u03b6\u03b5\u03b3\u03bf\u03b2\u03af\u03bd\u03b7
-LocaleNames/el/BB=\u039c\u03c0\u03b1\u03c1\u03bc\u03c0\u03ad\u03b9\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el/BD=\u039c\u03c0\u03b1\u03bd\u03b3\u03ba\u03bb\u03b1\u03bd\u03c4\u03ad\u03c2
-LocaleNames/el/BE=\u0392\u03ad\u03bb\u03b3\u03b9\u03bf
-LocaleNames/el/BF=\u039c\u03c0\u03bf\u03c5\u03c1\u03ba\u03af\u03bd\u03b1 \u03a6\u03ac\u03c3\u03bf
-LocaleNames/el/BG=\u0392\u03bf\u03c5\u03bb\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el/BH=\u039c\u03c0\u03b1\u03c7\u03c1\u03ad\u03b9\u03bd
-LocaleNames/el/BI=\u039c\u03c0\u03bf\u03c5\u03c1\u03bf\u03cd\u03bd\u03c4\u03b9
-LocaleNames/el/BJ=\u039c\u03c0\u03b5\u03bd\u03af\u03bd
-LocaleNames/el/BM=\u0392\u03b5\u03c1\u03bc\u03bf\u03cd\u03b4\u03b5\u03c2
-LocaleNames/el/BN=\u039c\u03c0\u03c1\u03bf\u03c5\u03bd\u03ad\u03b9
-LocaleNames/el/BO=\u0392\u03bf\u03bb\u03b9\u03b2\u03af\u03b1
-LocaleNames/el/BR=\u0392\u03c1\u03b1\u03b6\u03b9\u03bb\u03af\u03b1
-LocaleNames/el/BS=\u039c\u03c0\u03b1\u03c7\u03ac\u03bc\u03b5\u03c2
-LocaleNames/el/BT=\u039c\u03c0\u03bf\u03c5\u03c4\u03ac\u03bd
-LocaleNames/el/BV=\u039d\u03ae\u03c3\u03bf\u03c2 \u039c\u03c0\u03bf\u03c5\u03b2\u03ad
-LocaleNames/el/BW=\u039c\u03c0\u03bf\u03c4\u03c3\u03bf\u03c5\u03ac\u03bd\u03b1
-LocaleNames/el/BY=\u039b\u03b5\u03c5\u03ba\u03bf\u03c1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el/BZ=\u039c\u03c0\u03b5\u03bb\u03af\u03b6
-LocaleNames/el/CA=\u039a\u03b1\u03bd\u03b1\u03b4\u03ac\u03c2
-LocaleNames/el/CC=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03cc\u03ba\u03bf\u03c2 (\u039a\u03af\u03bb\u03b9\u03bd\u03b3\u03ba)
-LocaleNames/el/CD=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039a\u03b9\u03bd\u03c3\u03ac\u03c3\u03b1
-LocaleNames/el/CF=\u039a\u03b5\u03bd\u03c4\u03c1\u03bf\u03b1\u03c6\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/CG=\u039a\u03bf\u03bd\u03b3\u03ba\u03cc - \u039c\u03c0\u03c1\u03b1\u03b6\u03b1\u03b2\u03af\u03bb
-LocaleNames/el/CH=\u0395\u03bb\u03b2\u03b5\u03c4\u03af\u03b1
-LocaleNames/el/CI=\u0391\u03ba\u03c4\u03ae \u0395\u03bb\u03b5\u03c6\u03b1\u03bd\u03c4\u03bf\u03c3\u03c4\u03bf\u03cd
-LocaleNames/el/CK=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03bf\u03c5\u03ba
-LocaleNames/el/CL=\u03a7\u03b9\u03bb\u03ae
-LocaleNames/el/CM=\u039a\u03b1\u03bc\u03b5\u03c1\u03bf\u03cd\u03bd
-LocaleNames/el/CN=\u039a\u03af\u03bd\u03b1
-LocaleNames/el/CO=\u039a\u03bf\u03bb\u03bf\u03bc\u03b2\u03af\u03b1
-LocaleNames/el/CR=\u039a\u03cc\u03c3\u03c4\u03b1 \u03a1\u03af\u03ba\u03b1
-LocaleNames/el/CU=\u039a\u03bf\u03cd\u03b2\u03b1
-LocaleNames/el/CV=\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf \u0391\u03ba\u03c1\u03c9\u03c4\u03ae\u03c1\u03b9\u03bf
-LocaleNames/el/CX=\u039d\u03ae\u03c3\u03bf\u03c2 \u03c4\u03c9\u03bd \u03a7\u03c1\u03b9\u03c3\u03c4\u03bf\u03c5\u03b3\u03ad\u03bd\u03bd\u03c9\u03bd
-LocaleNames/el/CY=\u039a\u03cd\u03c0\u03c1\u03bf\u03c2
-LocaleNames/el/CZ=\u03a4\u03c3\u03b5\u03c7\u03af\u03b1
-LocaleNames/el/DE=\u0393\u03b5\u03c1\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/DJ=\u03a4\u03b6\u03b9\u03bc\u03c0\u03bf\u03c5\u03c4\u03af
-LocaleNames/el/DK=\u0394\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/DM=\u039d\u03c4\u03bf\u03bc\u03af\u03bd\u03b9\u03ba\u03b1
-LocaleNames/el/DO=\u0394\u03bf\u03bc\u03b9\u03bd\u03b9\u03ba\u03b1\u03bd\u03ae \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/DZ=\u0391\u03bb\u03b3\u03b5\u03c1\u03af\u03b1
-LocaleNames/el/EC=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03cc\u03c2
-LocaleNames/el/EE=\u0395\u03c3\u03b8\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/EG=\u0391\u03af\u03b3\u03c5\u03c0\u03c4\u03bf\u03c2
-LocaleNames/el/EH=\u0394\u03c5\u03c4\u03b9\u03ba\u03ae \u03a3\u03b1\u03c7\u03ac\u03c1\u03b1
-LocaleNames/el/ER=\u0395\u03c1\u03c5\u03b8\u03c1\u03b1\u03af\u03b1
-LocaleNames/el/ES=\u0399\u03c3\u03c0\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/ET=\u0391\u03b9\u03b8\u03b9\u03bf\u03c0\u03af\u03b1
-LocaleNames/el/FI=\u03a6\u03b9\u03bd\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/FJ=\u03a6\u03af\u03c4\u03b6\u03b9
-LocaleNames/el/FK=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03cc\u03ba\u03bb\u03b1\u03bd\u03c4
-LocaleNames/el/FM=\u039c\u03b9\u03ba\u03c1\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/FO=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a6\u03b5\u03c1\u03cc\u03b5\u03c2
-LocaleNames/el/FR=\u0393\u03b1\u03bb\u03bb\u03af\u03b1
-LocaleNames/el/GA=\u0393\u03ba\u03b1\u03bc\u03c0\u03cc\u03bd
-LocaleNames/el/GB=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03bf \u0392\u03b1\u03c3\u03af\u03bb\u03b5\u03b9\u03bf
-LocaleNames/el/GD=\u0393\u03c1\u03b5\u03bd\u03ac\u03b4\u03b1
-LocaleNames/el/GE=\u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1
-LocaleNames/el/GF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el/GH=\u0393\u03ba\u03ac\u03bd\u03b1
-LocaleNames/el/GI=\u0393\u03b9\u03b2\u03c1\u03b1\u03bb\u03c4\u03ac\u03c1
-LocaleNames/el/GL=\u0393\u03c1\u03bf\u03b9\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/GM=\u0393\u03ba\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/GN=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/GP=\u0393\u03bf\u03c5\u03b1\u03b4\u03b5\u03bb\u03bf\u03cd\u03c0\u03b7
-LocaleNames/el/GQ=\u0399\u03c3\u03b7\u03bc\u03b5\u03c1\u03b9\u03bd\u03ae \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/GS=\u039d\u03ae\u03c3\u03bf\u03b9 \u039d\u03cc\u03c4\u03b9\u03b1 \u0393\u03b5\u03c9\u03c1\u03b3\u03af\u03b1 \u03ba\u03b1\u03b9 \u039d\u03cc\u03c4\u03b9\u03b5\u03c2 \u03a3\u03ac\u03bd\u03c4\u03bf\u03c5\u03b9\u03c4\u03c2
-LocaleNames/el/GT=\u0393\u03bf\u03c5\u03b1\u03c4\u03b5\u03bc\u03ac\u03bb\u03b1
-LocaleNames/el/GU=\u0393\u03ba\u03bf\u03c5\u03ac\u03bc
-LocaleNames/el/GW=\u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1 \u039c\u03c0\u03b9\u03c3\u03ac\u03bf\u03c5
-LocaleNames/el/GY=\u0393\u03bf\u03c5\u03b9\u03ac\u03bd\u03b1
-LocaleNames/el/HK=\u03a7\u03bf\u03bd\u03b3\u03ba \u039a\u03bf\u03bd\u03b3\u03ba \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el/HM=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a7\u03b5\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u039c\u03b1\u03ba\u03bd\u03c4\u03cc\u03bd\u03b1\u03bb\u03bd\u03c4
-LocaleNames/el/HN=\u039f\u03bd\u03b4\u03bf\u03cd\u03c1\u03b1
-LocaleNames/el/HR=\u039a\u03c1\u03bf\u03b1\u03c4\u03af\u03b1
-LocaleNames/el/HT=\u0391\u03ca\u03c4\u03ae
-LocaleNames/el/HU=\u039f\u03c5\u03b3\u03b3\u03b1\u03c1\u03af\u03b1
-LocaleNames/el/ID=\u0399\u03bd\u03b4\u03bf\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/IE=\u0399\u03c1\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IL=\u0399\u03c3\u03c1\u03b1\u03ae\u03bb
-LocaleNames/el/IN=\u0399\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IO=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7 \u0399\u03bd\u03b4\u03b9\u03ba\u03bf\u03cd \u03a9\u03ba\u03b5\u03b1\u03bd\u03bf\u03cd
-LocaleNames/el/IQ=\u0399\u03c1\u03ac\u03ba
-LocaleNames/el/IR=\u0399\u03c1\u03ac\u03bd
-LocaleNames/el/IS=\u0399\u03c3\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/IT=\u0399\u03c4\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/JM=\u03a4\u03b6\u03b1\u03bc\u03ac\u03b9\u03ba\u03b1
-LocaleNames/el/JO=\u0399\u03bf\u03c1\u03b4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/JP=\u0399\u03b1\u03c0\u03c9\u03bd\u03af\u03b1
-LocaleNames/el/KE=\u039a\u03ad\u03bd\u03c5\u03b1
-LocaleNames/el/KG=\u039a\u03b9\u03c1\u03b3\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/KH=\u039a\u03b1\u03bc\u03c0\u03cc\u03c4\u03b6\u03b7
-LocaleNames/el/KI=\u039a\u03b9\u03c1\u03b9\u03bc\u03c0\u03ac\u03c4\u03b9
-LocaleNames/el/KM=\u039a\u03bf\u03bc\u03cc\u03c1\u03b5\u03c2
-LocaleNames/el/KN=\u03a3\u03b5\u03bd \u039a\u03b9\u03c4\u03c2 \u03ba\u03b1\u03b9 \u039d\u03ad\u03b2\u03b9\u03c2
-LocaleNames/el/KP=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el/KR=\u039d\u03cc\u03c4\u03b9\u03b1 \u039a\u03bf\u03c1\u03ad\u03b1
-LocaleNames/el/KW=\u039a\u03bf\u03c5\u03b2\u03ad\u03b9\u03c4
-LocaleNames/el/KY=\u039d\u03ae\u03c3\u03bf\u03b9 \u039a\u03ad\u03b9\u03bc\u03b1\u03bd
-LocaleNames/el/KZ=\u039a\u03b1\u03b6\u03b1\u03ba\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/LA=\u039b\u03ac\u03bf\u03c2
-LocaleNames/el/LB=\u039b\u03af\u03b2\u03b1\u03bd\u03bf\u03c2
-LocaleNames/el/LC=\u0391\u03b3\u03af\u03b1 \u039b\u03bf\u03c5\u03ba\u03af\u03b1
-LocaleNames/el/LI=\u039b\u03b9\u03c7\u03c4\u03b5\u03bd\u03c3\u03c4\u03ac\u03b9\u03bd
-LocaleNames/el/LK=\u03a3\u03c1\u03b9 \u039b\u03ac\u03bd\u03ba\u03b1
-LocaleNames/el/LR=\u039b\u03b9\u03b2\u03b5\u03c1\u03af\u03b1
-LocaleNames/el/LS=\u039b\u03b5\u03c3\u03cc\u03c4\u03bf
-LocaleNames/el/LT=\u039b\u03b9\u03b8\u03bf\u03c5\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/LU=\u039b\u03bf\u03c5\u03be\u03b5\u03bc\u03b2\u03bf\u03cd\u03c1\u03b3\u03bf
-LocaleNames/el/LV=\u039b\u03b5\u03c4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/LY=\u039b\u03b9\u03b2\u03cd\u03b7
-LocaleNames/el/MA=\u039c\u03b1\u03c1\u03cc\u03ba\u03bf
-LocaleNames/el/MC=\u039c\u03bf\u03bd\u03b1\u03ba\u03cc
-LocaleNames/el/MD=\u039c\u03bf\u03bb\u03b4\u03b1\u03b2\u03af\u03b1
-LocaleNames/el/MG=\u039c\u03b1\u03b4\u03b1\u03b3\u03b1\u03c3\u03ba\u03ac\u03c1\u03b7
-LocaleNames/el/MH=\u039d\u03ae\u03c3\u03bf\u03b9 \u039c\u03ac\u03c1\u03c3\u03b1\u03bb
-LocaleNames/el/MK=\u0392\u03cc\u03c1\u03b5\u03b9\u03b1 \u039c\u03b1\u03ba\u03b5\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/ML=\u039c\u03ac\u03bb\u03b9
-LocaleNames/el/MM=\u039c\u03b9\u03b1\u03bd\u03bc\u03ac\u03c1 (\u0392\u03b9\u03c1\u03bc\u03b1\u03bd\u03af\u03b1)
-LocaleNames/el/MN=\u039c\u03bf\u03b3\u03b3\u03bf\u03bb\u03af\u03b1
-LocaleNames/el/MO=\u039c\u03b1\u03ba\u03ac\u03bf \u0395\u0394\u03a0 \u039a\u03af\u03bd\u03b1\u03c2
-LocaleNames/el/MP=\u039d\u03ae\u03c3\u03bf\u03b9 \u0392\u03cc\u03c1\u03b5\u03b9\u03b5\u03c2 \u039c\u03b1\u03c1\u03b9\u03ac\u03bd\u03b5\u03c2
-LocaleNames/el/MQ=\u039c\u03b1\u03c1\u03c4\u03b9\u03bd\u03af\u03ba\u03b1
-LocaleNames/el/MR=\u039c\u03b1\u03c5\u03c1\u03b9\u03c4\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/MS=\u039c\u03bf\u03bd\u03c3\u03b5\u03c1\u03ac\u03c4
-LocaleNames/el/MT=\u039c\u03ac\u03bb\u03c4\u03b1
-LocaleNames/el/MU=\u039c\u03b1\u03c5\u03c1\u03af\u03ba\u03b9\u03bf\u03c2
-LocaleNames/el/MV=\u039c\u03b1\u03bb\u03b4\u03af\u03b2\u03b5\u03c2
-LocaleNames/el/MW=\u039c\u03b1\u03bb\u03ac\u03bf\u03c5\u03b9
-LocaleNames/el/MX=\u039c\u03b5\u03be\u03b9\u03ba\u03cc
-LocaleNames/el/MY=\u039c\u03b1\u03bb\u03b1\u03b9\u03c3\u03af\u03b1
-LocaleNames/el/MZ=\u039c\u03bf\u03b6\u03b1\u03bc\u03b2\u03af\u03ba\u03b7
-LocaleNames/el/NA=\u039d\u03b1\u03bc\u03af\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/NC=\u039d\u03ad\u03b1 \u039a\u03b1\u03bb\u03b7\u03b4\u03bf\u03bd\u03af\u03b1
-LocaleNames/el/NE=\u039d\u03af\u03b3\u03b7\u03c1\u03b1\u03c2
-LocaleNames/el/NF=\u039d\u03ae\u03c3\u03bf\u03c2 \u039d\u03cc\u03c1\u03c6\u03bf\u03bb\u03ba
-LocaleNames/el/NG=\u039d\u03b9\u03b3\u03b7\u03c1\u03af\u03b1
-LocaleNames/el/NI=\u039d\u03b9\u03ba\u03b1\u03c1\u03ac\u03b3\u03bf\u03c5\u03b1
-LocaleNames/el/NL=\u039a\u03ac\u03c4\u03c9 \u03a7\u03ce\u03c1\u03b5\u03c2
-LocaleNames/el/NO=\u039d\u03bf\u03c1\u03b2\u03b7\u03b3\u03af\u03b1
-LocaleNames/el/NP=\u039d\u03b5\u03c0\u03ac\u03bb
-LocaleNames/el/NR=\u039d\u03b1\u03bf\u03c5\u03c1\u03bf\u03cd
-LocaleNames/el/NU=\u039d\u03b9\u03bf\u03cd\u03b5
-LocaleNames/el/NZ=\u039d\u03ad\u03b1 \u0396\u03b7\u03bb\u03b1\u03bd\u03b4\u03af\u03b1
-LocaleNames/el/OM=\u039f\u03bc\u03ac\u03bd
-LocaleNames/el/PA=\u03a0\u03b1\u03bd\u03b1\u03bc\u03ac\u03c2
-LocaleNames/el/PE=\u03a0\u03b5\u03c1\u03bf\u03cd
-LocaleNames/el/PF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ae \u03a0\u03bf\u03bb\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/PG=\u03a0\u03b1\u03c0\u03bf\u03cd\u03b1 \u039d\u03ad\u03b1 \u0393\u03bf\u03c5\u03b9\u03bd\u03ad\u03b1
-LocaleNames/el/PH=\u03a6\u03b9\u03bb\u03b9\u03c0\u03c0\u03af\u03bd\u03b5\u03c2
-LocaleNames/el/PK=\u03a0\u03b1\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/PL=\u03a0\u03bf\u03bb\u03c9\u03bd\u03af\u03b1
-LocaleNames/el/PM=\u03a3\u03b5\u03bd \u03a0\u03b9\u03b5\u03c1 \u03ba\u03b1\u03b9 \u039c\u03b9\u03ba\u03b5\u03bb\u03cc\u03bd
-LocaleNames/el/PN=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a0\u03af\u03c4\u03ba\u03b5\u03c1\u03bd
-LocaleNames/el/PR=\u03a0\u03bf\u03c5\u03ad\u03c1\u03c4\u03bf \u03a1\u03af\u03ba\u03bf
-LocaleNames/el/PS=\u03a0\u03b1\u03bb\u03b1\u03b9\u03c3\u03c4\u03b9\u03bd\u03b9\u03b1\u03ba\u03ac \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el/PT=\u03a0\u03bf\u03c1\u03c4\u03bf\u03b3\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/PW=\u03a0\u03b1\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el/PY=\u03a0\u03b1\u03c1\u03b1\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el/QA=\u039a\u03b1\u03c4\u03ac\u03c1
-LocaleNames/el/RE=\u03a1\u03b5\u03ca\u03bd\u03b9\u03cc\u03bd
-LocaleNames/el/RO=\u03a1\u03bf\u03c5\u03bc\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/RU=\u03a1\u03c9\u03c3\u03af\u03b1
-LocaleNames/el/RW=\u03a1\u03bf\u03c5\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el/SA=\u03a3\u03b1\u03bf\u03c5\u03b4\u03b9\u03ba\u03ae \u0391\u03c1\u03b1\u03b2\u03af\u03b1
-LocaleNames/el/SB=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a3\u03bf\u03bb\u03bf\u03bc\u03ce\u03bd\u03c4\u03bf\u03c2
-LocaleNames/el/SC=\u03a3\u03b5\u03cb\u03c7\u03ad\u03bb\u03bb\u03b5\u03c2
-LocaleNames/el/SD=\u03a3\u03bf\u03c5\u03b4\u03ac\u03bd
-LocaleNames/el/SE=\u03a3\u03bf\u03c5\u03b7\u03b4\u03af\u03b1
-LocaleNames/el/SG=\u03a3\u03b9\u03b3\u03ba\u03b1\u03c0\u03bf\u03cd\u03c1\u03b7
-LocaleNames/el/SH=\u0391\u03b3\u03af\u03b1 \u0395\u03bb\u03ad\u03bd\u03b7
-LocaleNames/el/SI=\u03a3\u03bb\u03bf\u03b2\u03b5\u03bd\u03af\u03b1
-LocaleNames/el/SJ=\u03a3\u03b2\u03ac\u03bb\u03bc\u03c0\u03b1\u03c1\u03bd\u03c4 \u03ba\u03b1\u03b9 \u0393\u03b9\u03b1\u03bd \u039c\u03b1\u03b3\u03b9\u03ad\u03bd
-LocaleNames/el/SK=\u03a3\u03bb\u03bf\u03b2\u03b1\u03ba\u03af\u03b1
-LocaleNames/el/SL=\u03a3\u03b9\u03ad\u03c1\u03b1 \u039b\u03b5\u03cc\u03bd\u03b5
-LocaleNames/el/SM=\u0386\u03b3\u03b9\u03bf\u03c2 \u039c\u03b1\u03c1\u03af\u03bd\u03bf\u03c2
-LocaleNames/el/SN=\u03a3\u03b5\u03bd\u03b5\u03b3\u03ac\u03bb\u03b7
-LocaleNames/el/SO=\u03a3\u03bf\u03bc\u03b1\u03bb\u03af\u03b1
-LocaleNames/el/SR=\u03a3\u03bf\u03c5\u03c1\u03b9\u03bd\u03ac\u03bc
-LocaleNames/el/ST=\u03a3\u03ac\u03bf \u03a4\u03bf\u03bc\u03ad \u03ba\u03b1\u03b9 \u03a0\u03c1\u03af\u03bd\u03c3\u03b9\u03c0\u03b5
-LocaleNames/el/SV=\u0395\u03bb \u03a3\u03b1\u03bb\u03b2\u03b1\u03b4\u03cc\u03c1
-LocaleNames/el/SY=\u03a3\u03c5\u03c1\u03af\u03b1
-LocaleNames/el/SZ=\u0395\u03c3\u03bf\u03c5\u03b1\u03c4\u03af\u03bd\u03b9
-LocaleNames/el/TC=\u039d\u03ae\u03c3\u03bf\u03b9 \u03a4\u03b5\u03c1\u03ba\u03c2 \u03ba\u03b1\u03b9 \u039a\u03ac\u03b9\u03ba\u03bf\u03c2
-LocaleNames/el/TD=\u03a4\u03c3\u03b1\u03bd\u03c4
-LocaleNames/el/TF=\u0393\u03b1\u03bb\u03bb\u03b9\u03ba\u03ac \u039d\u03cc\u03c4\u03b9\u03b1 \u0395\u03b4\u03ac\u03c6\u03b7
-LocaleNames/el/TG=\u03a4\u03cc\u03b3\u03ba\u03bf
-LocaleNames/el/TH=\u03a4\u03b1\u03ca\u03bb\u03ac\u03bd\u03b4\u03b7
-LocaleNames/el/TJ=\u03a4\u03b1\u03c4\u03b6\u03b9\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/TK=\u03a4\u03bf\u03ba\u03b5\u03bb\u03ac\u03bf\u03c5
-LocaleNames/el/TL=\u03a4\u03b9\u03bc\u03cc\u03c1-\u039b\u03ad\u03c3\u03c4\u03b5
-LocaleNames/el/TM=\u03a4\u03bf\u03c5\u03c1\u03ba\u03bc\u03b5\u03bd\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/TN=\u03a4\u03c5\u03bd\u03b7\u03c3\u03af\u03b1
-LocaleNames/el/TO=\u03a4\u03cc\u03bd\u03b3\u03ba\u03b1
-LocaleNames/el/TR=\u03a4\u03bf\u03c5\u03c1\u03ba\u03af\u03b1
-LocaleNames/el/TT=\u03a4\u03c1\u03b9\u03bd\u03b9\u03bd\u03c4\u03ac\u03bd\u03c4 \u03ba\u03b1\u03b9 \u03a4\u03bf\u03bc\u03c0\u03ac\u03b3\u03ba\u03bf
-LocaleNames/el/TV=\u03a4\u03bf\u03c5\u03b2\u03b1\u03bb\u03bf\u03cd
-LocaleNames/el/TW=\u03a4\u03b1\u03ca\u03b2\u03ac\u03bd
-LocaleNames/el/TZ=\u03a4\u03b1\u03bd\u03b6\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/UA=\u039f\u03c5\u03ba\u03c1\u03b1\u03bd\u03af\u03b1
-LocaleNames/el/UG=\u039f\u03c5\u03b3\u03ba\u03ac\u03bd\u03c4\u03b1
-LocaleNames/el/UM=\u0391\u03c0\u03bf\u03bc\u03b1\u03ba\u03c1\u03c5\u03c3\u03bc\u03ad\u03bd\u03b5\u03c2 \u039d\u03b7\u03c3\u03af\u03b4\u03b5\u03c2 \u0397\u03a0\u0391
-LocaleNames/el/US=\u0397\u03bd\u03c9\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a0\u03bf\u03bb\u03b9\u03c4\u03b5\u03af\u03b5\u03c2
-LocaleNames/el/UY=\u039f\u03c5\u03c1\u03bf\u03c5\u03b3\u03bf\u03c5\u03ac\u03b7
-LocaleNames/el/UZ=\u039f\u03c5\u03b6\u03bc\u03c0\u03b5\u03ba\u03b9\u03c3\u03c4\u03ac\u03bd
-LocaleNames/el/VA=\u0392\u03b1\u03c4\u03b9\u03ba\u03b1\u03bd\u03cc
-LocaleNames/el/VC=\u0386\u03b3\u03b9\u03bf\u03c2 \u0392\u03b9\u03ba\u03ad\u03bd\u03c4\u03b9\u03bf\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b5\u03bd\u03b1\u03b4\u03af\u03bd\u03b5\u03c2
-LocaleNames/el/VE=\u0392\u03b5\u03bd\u03b5\u03b6\u03bf\u03c5\u03ad\u03bb\u03b1
-LocaleNames/el/VG=\u0392\u03c1\u03b5\u03c4\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el/VI=\u0391\u03bc\u03b5\u03c1\u03b9\u03ba\u03b1\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a0\u03b1\u03c1\u03b8\u03ad\u03bd\u03b5\u03c2 \u039d\u03ae\u03c3\u03bf\u03b9
-LocaleNames/el/VN=\u0392\u03b9\u03b5\u03c4\u03bd\u03ac\u03bc
-LocaleNames/el/VU=\u0392\u03b1\u03bd\u03bf\u03c5\u03ac\u03c4\u03bf\u03c5
-LocaleNames/el/WF=\u0393\u03bf\u03c5\u03ac\u03bb\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03a6\u03bf\u03c5\u03c4\u03bf\u03cd\u03bd\u03b1
-LocaleNames/el/WS=\u03a3\u03b1\u03bc\u03cc\u03b1
-LocaleNames/el/YE=\u03a5\u03b5\u03bc\u03ad\u03bd\u03b7
-LocaleNames/el/YT=\u039c\u03b1\u03b3\u03b9\u03cc\u03c4
-LocaleNames/el/ZA=\u039d\u03cc\u03c4\u03b9\u03b1 \u0391\u03c6\u03c1\u03b9\u03ba\u03ae
-LocaleNames/el/ZM=\u0396\u03ac\u03bc\u03c0\u03b9\u03b1
-LocaleNames/el/ZW=\u0396\u03b9\u03bc\u03c0\u03ac\u03bc\u03c0\u03bf\u03c5\u03b5
+LocaleNames/pt_PT/IR=Irão
+LocaleNames/pt_PT/ZW=Zimbabué
+
+LocaleNames/el/ar=Αραβικά
+LocaleNames/el/be=Λευκορωσικά
+LocaleNames/el/bg=Βουλγαρικά
+LocaleNames/el/bn=Βεγγαλικά
+LocaleNames/el/bo=Θιβετιανά
+LocaleNames/el/bs=Βοσνιακά
+LocaleNames/el/ca=Καταλανικά
+LocaleNames/el/co=Κορσικανικά
+LocaleNames/el/cs=Τσεχικά
+LocaleNames/el/cy=Ουαλικά
+LocaleNames/el/da=Δανικά
+LocaleNames/el/de=Γερμανικά
+LocaleNames/el/el=Ελληνικά
+LocaleNames/el/en=Αγγλικά
+LocaleNames/el/es=Ισπανικά
+LocaleNames/el/et=Εσθονικά
+LocaleNames/el/eu=Βασκικά
+LocaleNames/el/fa=Περσικά
+LocaleNames/el/fi=Φινλανδικά
+LocaleNames/el/fr=Γαλλικά
+LocaleNames/el/ga=Ιρλανδικά
+LocaleNames/el/gd=Σκωτικά Κελτικά
+LocaleNames/el/he=Εβραϊκά
+LocaleNames/el/hi=Χίντι
+LocaleNames/el/hr=Κροατικά
+LocaleNames/el/hu=Ουγγρικά
+LocaleNames/el/hy=Αρμενικά
+LocaleNames/el/id=Ινδονησιακά
+LocaleNames/el/is=Ισλανδικά
+LocaleNames/el/it=Ιταλικά
+LocaleNames/el/ja=Ιαπωνικά
+LocaleNames/el/ka=Γεωργιανά
+LocaleNames/el/ko=Κορεατικά
+LocaleNames/el/la=Λατινικά
+LocaleNames/el/lt=Λιθουανικά
+LocaleNames/el/lv=Λετονικά
+LocaleNames/el/mk=Σλαβομακεδονικά
+LocaleNames/el/mn=Μογγολικά
+LocaleNames/el/mt=Μαλτεζικά
+LocaleNames/el/no=Νορβηγικά
+LocaleNames/el/pl=Πολωνικά
+LocaleNames/el/pt=Πορτογαλικά
+LocaleNames/el/ro=Ρουμανικά
+LocaleNames/el/ru=Ρωσικά
+LocaleNames/el/sk=Σλοβακικά
+LocaleNames/el/sl=Σλοβενικά
+LocaleNames/el/sq=Αλβανικά
+LocaleNames/el/sr=Σερβικά
+LocaleNames/el/sv=Σουηδικά
+LocaleNames/el/th=Ταϊλανδικά
+LocaleNames/el/tr=Τουρκικά
+LocaleNames/el/uk=Ουκρανικά
+LocaleNames/el/vi=Βιετναμικά
+LocaleNames/el/yi=Γίντις
+LocaleNames/el/zh=Κινεζικά
+LocaleNames/el/AD=Ανδόρα
+LocaleNames/el/AE=Ηνωμένα Αραβικά Εμιράτα
+LocaleNames/el/AF=Αφγανιστάν
+LocaleNames/el/AG=Αντίγκουα και Μπαρμπούντα
+LocaleNames/el/AI=Ανγκουίλα
+LocaleNames/el/AL=Αλβανία
+LocaleNames/el/AM=Αρμενία
+LocaleNames/el/AO=Αγκόλα
+LocaleNames/el/AQ=Ανταρκτική
+LocaleNames/el/AR=Αργεντινή
+LocaleNames/el/AS=Αμερικανική Σαμόα
+LocaleNames/el/AT=Αυστρία
+LocaleNames/el/AU=Αυστραλία
+LocaleNames/el/AW=Αρούμπα
+LocaleNames/el/AX=Νήσοι Όλαντ
+LocaleNames/el/AZ=Αζερμπαϊτζάν
+LocaleNames/el/BA=Βοσνία - Ερζεγοβίνη
+LocaleNames/el/BB=Μπαρμπέιντος
+LocaleNames/el/BD=Μπανγκλαντές
+LocaleNames/el/BE=Βέλγιο
+LocaleNames/el/BF=Μπουρκίνα Φάσο
+LocaleNames/el/BG=Βουλγαρία
+LocaleNames/el/BH=Μπαχρέιν
+LocaleNames/el/BI=Μπουρούντι
+LocaleNames/el/BJ=Μπενίν
+LocaleNames/el/BM=Βερμούδες
+LocaleNames/el/BN=Μπρουνέι
+LocaleNames/el/BO=Βολιβία
+LocaleNames/el/BR=Βραζιλία
+LocaleNames/el/BS=Μπαχάμες
+LocaleNames/el/BT=Μπουτάν
+LocaleNames/el/BV=Νήσος Μπουβέ
+LocaleNames/el/BW=Μποτσουάνα
+LocaleNames/el/BY=Λευκορωσία
+LocaleNames/el/BZ=Μπελίζ
+LocaleNames/el/CA=Καναδάς
+LocaleNames/el/CC=Νήσοι Κόκος (Κίλινγκ)
+LocaleNames/el/CD=Κονγκό - Κινσάσα
+LocaleNames/el/CF=Κεντροαφρικανική Δημοκρατία
+LocaleNames/el/CG=Κονγκό - Μπραζαβίλ
+LocaleNames/el/CH=Ελβετία
+LocaleNames/el/CI=Ακτή Ελεφαντοστού
+LocaleNames/el/CK=Νήσοι Κουκ
+LocaleNames/el/CL=Χιλή
+LocaleNames/el/CM=Καμερούν
+LocaleNames/el/CN=Κίνα
+LocaleNames/el/CO=Κολομβία
+LocaleNames/el/CR=Κόστα Ρίκα
+LocaleNames/el/CU=Κούβα
+LocaleNames/el/CV=Πράσινο Ακρωτήριο
+LocaleNames/el/CX=Νήσος των Χριστουγέννων
+LocaleNames/el/CY=Κύπρος
+LocaleNames/el/CZ=Τσεχία
+LocaleNames/el/DE=Γερμανία
+LocaleNames/el/DJ=Τζιμπουτί
+LocaleNames/el/DK=Δανία
+LocaleNames/el/DM=Ντομίνικα
+LocaleNames/el/DO=Δομινικανή Δημοκρατία
+LocaleNames/el/DZ=Αλγερία
+LocaleNames/el/EC=Ισημερινός
+LocaleNames/el/EE=Εσθονία
+LocaleNames/el/EG=Αίγυπτος
+LocaleNames/el/EH=Δυτική Σαχάρα
+LocaleNames/el/ER=Ερυθραία
+LocaleNames/el/ES=Ισπανία
+LocaleNames/el/ET=Αιθιοπία
+LocaleNames/el/FI=Φινλανδία
+LocaleNames/el/FJ=Φίτζι
+LocaleNames/el/FK=Νήσοι Φόκλαντ
+LocaleNames/el/FM=Μικρονησία
+LocaleNames/el/FO=Νήσοι Φερόες
+LocaleNames/el/FR=Γαλλία
+LocaleNames/el/GA=Γκαμπόν
+LocaleNames/el/GB=Ηνωμένο Βασίλειο
+LocaleNames/el/GD=Γρενάδα
+LocaleNames/el/GE=Γεωργία
+LocaleNames/el/GF=Γαλλική Γουιάνα
+LocaleNames/el/GH=Γκάνα
+LocaleNames/el/GI=Γιβραλτάρ
+LocaleNames/el/GL=Γροιλανδία
+LocaleNames/el/GM=Γκάμπια
+LocaleNames/el/GN=Γουινέα
+LocaleNames/el/GP=Γουαδελούπη
+LocaleNames/el/GQ=Ισημερινή Γουινέα
+LocaleNames/el/GS=Νήσοι Νότια Γεωργία και Νότιες Σάντουιτς
+LocaleNames/el/GT=Γουατεμάλα
+LocaleNames/el/GU=Γκουάμ
+LocaleNames/el/GW=Γουινέα Μπισάου
+LocaleNames/el/GY=Γουιάνα
+LocaleNames/el/HK=Χονγκ Κονγκ ΕΔΠ Κίνας
+LocaleNames/el/HM=Νήσοι Χερντ και Μακντόναλντ
+LocaleNames/el/HN=Ονδούρα
+LocaleNames/el/HR=Κροατία
+LocaleNames/el/HT=Αϊτή
+LocaleNames/el/HU=Ουγγαρία
+LocaleNames/el/ID=Ινδονησία
+LocaleNames/el/IE=Ιρλανδία
+LocaleNames/el/IL=Ισραήλ
+LocaleNames/el/IN=Ινδία
+LocaleNames/el/IO=Βρετανικά Εδάφη Ινδικού Ωκεανού
+LocaleNames/el/IQ=Ιράκ
+LocaleNames/el/IR=Ιράν
+LocaleNames/el/IS=Ισλανδία
+LocaleNames/el/IT=Ιταλία
+LocaleNames/el/JM=Τζαμάικα
+LocaleNames/el/JO=Ιορδανία
+LocaleNames/el/JP=Ιαπωνία
+LocaleNames/el/KE=Κένυα
+LocaleNames/el/KG=Κιργιστάν
+LocaleNames/el/KH=Καμπότζη
+LocaleNames/el/KI=Κιριμπάτι
+LocaleNames/el/KM=Κομόρες
+LocaleNames/el/KN=Σεν Κιτς και Νέβις
+LocaleNames/el/KP=Βόρεια Κορέα
+LocaleNames/el/KR=Νότια Κορέα
+LocaleNames/el/KW=Κουβέιτ
+LocaleNames/el/KY=Νήσοι Κέιμαν
+LocaleNames/el/KZ=Καζακστάν
+LocaleNames/el/LA=Λάος
+LocaleNames/el/LB=Λίβανος
+LocaleNames/el/LC=Αγία Λουκία
+LocaleNames/el/LI=Λιχτενστάιν
+LocaleNames/el/LK=Σρι Λάνκα
+LocaleNames/el/LR=Λιβερία
+LocaleNames/el/LS=Λεσότο
+LocaleNames/el/LT=Λιθουανία
+LocaleNames/el/LU=Λουξεμβούργο
+LocaleNames/el/LV=Λετονία
+LocaleNames/el/LY=Λιβύη
+LocaleNames/el/MA=Μαρόκο
+LocaleNames/el/MC=Μονακό
+LocaleNames/el/MD=Μολδαβία
+LocaleNames/el/MG=Μαδαγασκάρη
+LocaleNames/el/MH=Νήσοι Μάρσαλ
+LocaleNames/el/MK=Βόρεια Μακεδονία
+LocaleNames/el/ML=Μάλι
+LocaleNames/el/MM=Μιανμάρ (Βιρμανία)
+LocaleNames/el/MN=Μογγολία
+LocaleNames/el/MO=Μακάο ΕΔΠ Κίνας
+LocaleNames/el/MP=Νήσοι Βόρειες Μαριάνες
+LocaleNames/el/MQ=Μαρτινίκα
+LocaleNames/el/MR=Μαυριτανία
+LocaleNames/el/MS=Μονσεράτ
+LocaleNames/el/MT=Μάλτα
+LocaleNames/el/MU=Μαυρίκιος
+LocaleNames/el/MV=Μαλδίβες
+LocaleNames/el/MW=Μαλάουι
+LocaleNames/el/MX=Μεξικό
+LocaleNames/el/MY=Μαλαισία
+LocaleNames/el/MZ=Μοζαμβίκη
+LocaleNames/el/NA=Ναμίμπια
+LocaleNames/el/NC=Νέα Καληδονία
+LocaleNames/el/NE=Νίγηρας
+LocaleNames/el/NF=Νήσος Νόρφολκ
+LocaleNames/el/NG=Νιγηρία
+LocaleNames/el/NI=Νικαράγουα
+LocaleNames/el/NL=Κάτω Χώρες
+LocaleNames/el/NO=Νορβηγία
+LocaleNames/el/NP=Νεπάλ
+LocaleNames/el/NR=Ναουρού
+LocaleNames/el/NU=Νιούε
+LocaleNames/el/NZ=Νέα Ζηλανδία
+LocaleNames/el/OM=Ομάν
+LocaleNames/el/PA=Παναμάς
+LocaleNames/el/PE=Περού
+LocaleNames/el/PF=Γαλλική Πολυνησία
+LocaleNames/el/PG=Παπούα Νέα Γουινέα
+LocaleNames/el/PH=Φιλιππίνες
+LocaleNames/el/PK=Πακιστάν
+LocaleNames/el/PL=Πολωνία
+LocaleNames/el/PM=Σεν Πιερ και Μικελόν
+LocaleNames/el/PN=Νήσοι Πίτκερν
+LocaleNames/el/PR=Πουέρτο Ρίκο
+LocaleNames/el/PS=Παλαιστινιακά Εδάφη
+LocaleNames/el/PT=Πορτογαλία
+LocaleNames/el/PW=Παλάου
+LocaleNames/el/PY=Παραγουάη
+LocaleNames/el/QA=Κατάρ
+LocaleNames/el/RE=Ρεϊνιόν
+LocaleNames/el/RO=Ρουμανία
+LocaleNames/el/RU=Ρωσία
+LocaleNames/el/RW=Ρουάντα
+LocaleNames/el/SA=Σαουδική Αραβία
+LocaleNames/el/SB=Νήσοι Σολομώντος
+LocaleNames/el/SC=Σεϋχέλλες
+LocaleNames/el/SD=Σουδάν
+LocaleNames/el/SE=Σουηδία
+LocaleNames/el/SG=Σιγκαπούρη
+LocaleNames/el/SH=Αγία Ελένη
+LocaleNames/el/SI=Σλοβενία
+LocaleNames/el/SJ=Σβάλμπαρντ και Γιαν Μαγιέν
+LocaleNames/el/SK=Σλοβακία
+LocaleNames/el/SL=Σιέρα Λεόνε
+LocaleNames/el/SM=Άγιος Μαρίνος
+LocaleNames/el/SN=Σενεγάλη
+LocaleNames/el/SO=Σομαλία
+LocaleNames/el/SR=Σουρινάμ
+LocaleNames/el/ST=Σάο Τομέ και Πρίνσιπε
+LocaleNames/el/SV=Ελ Σαλβαδόρ
+LocaleNames/el/SY=Συρία
+LocaleNames/el/SZ=Εσουατίνι
+LocaleNames/el/TC=Νήσοι Τερκς και Κάικος
+LocaleNames/el/TD=Τσαντ
+LocaleNames/el/TF=Γαλλικά Νότια Εδάφη
+LocaleNames/el/TG=Τόγκο
+LocaleNames/el/TH=Ταϊλάνδη
+LocaleNames/el/TJ=Τατζικιστάν
+LocaleNames/el/TK=Τοκελάου
+LocaleNames/el/TL=Τιμόρ-Λέστε
+LocaleNames/el/TM=Τουρκμενιστάν
+LocaleNames/el/TN=Τυνησία
+LocaleNames/el/TO=Τόνγκα
+LocaleNames/el/TR=Τουρκία
+LocaleNames/el/TT=Τρινιντάντ και Τομπάγκο
+LocaleNames/el/TV=Τουβαλού
+LocaleNames/el/TW=Ταϊβάν
+LocaleNames/el/TZ=Τανζανία
+LocaleNames/el/UA=Ουκρανία
+LocaleNames/el/UG=Ουγκάντα
+LocaleNames/el/UM=Απομακρυσμένες Νησίδες ΗΠΑ
+LocaleNames/el/US=Ηνωμένες Πολιτείες
+LocaleNames/el/UY=Ουρουγουάη
+LocaleNames/el/UZ=Ουζμπεκιστάν
+LocaleNames/el/VA=Βατικανό
+LocaleNames/el/VC=Άγιος Βικέντιος και Γρεναδίνες
+LocaleNames/el/VE=Βενεζουέλα
+LocaleNames/el/VG=Βρετανικές Παρθένες Νήσοι
+LocaleNames/el/VI=Αμερικανικές Παρθένες Νήσοι
+LocaleNames/el/VN=Βιετνάμ
+LocaleNames/el/VU=Βανουάτου
+LocaleNames/el/WF=Γουάλις και Φουτούνα
+LocaleNames/el/WS=Σαμόα
+LocaleNames/el/YE=Υεμένη
+LocaleNames/el/YT=Μαγιότ
+LocaleNames/el/ZA=Νότια Αφρική
+LocaleNames/el/ZM=Ζάμπια
+LocaleNames/el/ZW=Ζιμπάμπουε
 LocaleNames/en_MT/fy=Western Frisian
 LocaleNames/en_MT/gl=Galician
 LocaleNames/en_MT/ps=Pashto
-LocaleNames/en_MT/AX=\u00c5land Islands
+LocaleNames/en_MT/AX=Åland Islands
 LocaleNames/en_MT/CD=Congo - Kinshasa
 LocaleNames/en_MT/CG=Congo - Brazzaville
 LocaleNames/en_MT/HK=Hong Kong SAR China
@@ -4712,7 +4712,7 @@ LocaleNames/en_MT/MO=Macao SAR China
 LocaleNames/en_PH/fy=Western Frisian
 LocaleNames/en_PH/gl=Galician
 LocaleNames/en_PH/ps=Pashto
-LocaleNames/en_PH/AX=\u00c5land Islands
+LocaleNames/en_PH/AX=Åland Islands
 LocaleNames/en_PH/CD=Congo - Kinshasa
 LocaleNames/en_PH/CG=Congo - Brazzaville
 LocaleNames/en_PH/HK=Hong Kong SAR China
@@ -4721,7 +4721,7 @@ LocaleNames/en_PH/MO=Macao SAR China
 LocaleNames/en_SG/fy=Western Frisian
 LocaleNames/en_SG/gl=Galician
 LocaleNames/en_SG/ps=Pashto
-LocaleNames/en_SG/AX=\u00c5land Islands
+LocaleNames/en_SG/AX=Åland Islands
 LocaleNames/en_SG/CD=Congo - Kinshasa
 LocaleNames/en_SG/CG=Congo - Brazzaville
 LocaleNames/en_SG/HK=Hong Kong SAR China
@@ -4729,53 +4729,53 @@ LocaleNames/en_SG/MO=Macao SAR China
 LocaleNames/es_US/ab=abjasio
 LocaleNames/es_US/dz=dzongkha
 LocaleNames/es_US/fj=fiyiano
-LocaleNames/es_US/si=cingal\u00e9s
-LocaleNames/es_US/ti=tigri\u00f1a
-LocaleNames/es_US/vo=volap\u00fck
-LocaleNames/es_US/AX=Islas \u00c5land
-LocaleNames/es_US/BH=Bar\u00e9in
-LocaleNames/es_US/KG=Kirguist\u00e1n
-LocaleNames/mt/ab=Abka\u017cjan
+LocaleNames/es_US/si=cingalés
+LocaleNames/es_US/ti=tigriña
+LocaleNames/es_US/vo=volapük
+LocaleNames/es_US/AX=Islas Åland
+LocaleNames/es_US/BH=Baréin
+LocaleNames/es_US/KG=Kirguistán
+LocaleNames/mt/ab=Abkażjan
 LocaleNames/mt/af=Afrikans
 LocaleNames/mt/am=Amhariku
-LocaleNames/mt/ar=G\u0127arbi
+LocaleNames/mt/ar=Għarbi
 LocaleNames/mt/av=Avarik
 LocaleNames/mt/ay=Aymara
-LocaleNames/mt/az=A\u017cerbaj\u0121ani
+LocaleNames/mt/az=Ażerbajġani
 LocaleNames/mt/ba=Bashkir
 LocaleNames/mt/be=Belarussu
 LocaleNames/mt/bg=Bulgaru
 LocaleNames/mt/bo=Tibetjan
 LocaleNames/mt/br=Breton
-LocaleNames/mt/bs=Bo\u017cnijaku
+LocaleNames/mt/bs=Bożnijaku
 LocaleNames/mt/ca=Katalan
 LocaleNames/mt/ce=Chechen
 LocaleNames/mt/ch=Chamorro
 LocaleNames/mt/co=Korsiku
 LocaleNames/mt/cr=Cree
-LocaleNames/mt/cs=\u010aek
+LocaleNames/mt/cs=Ċek
 LocaleNames/mt/cu=Slaviku tal-Knisja
 LocaleNames/mt/cv=Chuvash
 LocaleNames/mt/cy=Welsh
-LocaleNames/mt/da=Dani\u017c
-LocaleNames/mt/de=\u0120ermani\u017c
+LocaleNames/mt/da=Daniż
+LocaleNames/mt/de=Ġermaniż
 LocaleNames/mt/dv=Divehi
 LocaleNames/mt/dz=Dzongkha
 LocaleNames/mt/el=Grieg
-LocaleNames/mt/en=Ingli\u017c
+LocaleNames/mt/en=Ingliż
 LocaleNames/mt/es=Spanjol
 LocaleNames/mt/et=Estonjan
 LocaleNames/mt/eu=Bask
 LocaleNames/mt/fa=Persjan
 LocaleNames/mt/ff=Fulah
-LocaleNames/mt/fi=Finlandi\u017c
-LocaleNames/mt/fj=Fi\u0121jan
+LocaleNames/mt/fi=Finlandiż
+LocaleNames/mt/fj=Fiġjan
 LocaleNames/mt/fo=Faroese
-LocaleNames/mt/fr=Fran\u010bi\u017c
+LocaleNames/mt/fr=Franċiż
 LocaleNames/mt/fy=Frisian tal-Punent
-LocaleNames/mt/ga=Irlandi\u017c
-LocaleNames/mt/gd=Galliku Sko\u010b\u010bi\u017c
-LocaleNames/mt/gl=Gali\u010bjan
+LocaleNames/mt/ga=Irlandiż
+LocaleNames/mt/gd=Galliku Skoċċiż
+LocaleNames/mt/gl=Galiċjan
 LocaleNames/mt/gn=Guarani
 LocaleNames/mt/gu=Gujarati
 LocaleNames/mt/gv=Manx
@@ -4784,59 +4784,59 @@ LocaleNames/mt/he=Ebrajk
 LocaleNames/mt/hi=Hindi
 LocaleNames/mt/ho=Hiri Motu
 LocaleNames/mt/hr=Kroat
-LocaleNames/mt/hu=Ungeri\u017c
+LocaleNames/mt/hu=Ungeriż
 LocaleNames/mt/hy=Armen
 LocaleNames/mt/hz=Herero
-LocaleNames/mt/id=Indone\u017cjan
+LocaleNames/mt/id=Indoneżjan
 LocaleNames/mt/ik=Inupjak
-LocaleNames/mt/is=I\u017clandi\u017c
+LocaleNames/mt/is=Iżlandiż
 LocaleNames/mt/it=Taljan
 LocaleNames/mt/iu=Inuktitut
-LocaleNames/mt/ja=\u0120appuni\u017c
-LocaleNames/mt/jv=\u0120avani\u017c
-LocaleNames/mt/ka=\u0120or\u0121jan
+LocaleNames/mt/ja=Ġappuniż
+LocaleNames/mt/jv=Ġavaniż
+LocaleNames/mt/ka=Ġorġjan
 LocaleNames/mt/ki=Kikuju
 LocaleNames/mt/kj=Kuanyama
-LocaleNames/mt/kk=Ka\u017cak
+LocaleNames/mt/kk=Każak
 LocaleNames/mt/kl=Kalallisut
 LocaleNames/mt/km=Khmer
 LocaleNames/mt/ko=Korean
 LocaleNames/mt/ks=Kashmiri
 LocaleNames/mt/ku=Kurd
 LocaleNames/mt/kw=Korniku
-LocaleNames/mt/ky=Kirgi\u017c
-LocaleNames/mt/lb=Lussemburgi\u017c
+LocaleNames/mt/ky=Kirgiż
+LocaleNames/mt/lb=Lussemburgiż
 LocaleNames/mt/ln=Lingaljan
 LocaleNames/mt/lt=Litwan
 LocaleNames/mt/lv=Latvjan
 LocaleNames/mt/mg=Malagasy
-LocaleNames/mt/mh=Marshalljani\u017c
-LocaleNames/mt/mk=Ma\u010bedonjan
+LocaleNames/mt/mh=Marshalljaniż
+LocaleNames/mt/mk=Maċedonjan
 LocaleNames/mt/ml=Malayalam
 LocaleNames/mt/mn=Mongoljan
 LocaleNames/mt/mr=Marathi
 LocaleNames/mt/ms=Malay
 LocaleNames/mt/mt=Malti
-LocaleNames/mt/my=Burmi\u017c
+LocaleNames/mt/my=Burmiż
 LocaleNames/mt/na=Naurujan
-LocaleNames/mt/nb=Bokmal Norve\u0121i\u017c
+LocaleNames/mt/nb=Bokmal Norveġiż
 LocaleNames/mt/nd=Ndebeli tat-Tramuntana
-LocaleNames/mt/ne=Nepali\u017c
-LocaleNames/mt/nl=Olandi\u017c
-LocaleNames/mt/nn=Ninorsk Norve\u0121i\u017c
-LocaleNames/mt/no=Norve\u0121i\u017c
+LocaleNames/mt/ne=Nepaliż
+LocaleNames/mt/nl=Olandiż
+LocaleNames/mt/nn=Ninorsk Norveġiż
+LocaleNames/mt/no=Norveġiż
 LocaleNames/mt/nr=Ndebele tan-Nofsinhar
 LocaleNames/mt/nv=Navajo
 LocaleNames/mt/ny=Nyanja
-LocaleNames/mt/oc=O\u010b\u010bitan
-LocaleNames/mt/oj=O\u0121ibwa
+LocaleNames/mt/oc=Oċċitan
+LocaleNames/mt/oj=Oġibwa
 LocaleNames/mt/om=Oromo
 LocaleNames/mt/or=Odia
 LocaleNames/mt/os=Ossettiku
 LocaleNames/mt/pa=Punjabi
 LocaleNames/mt/pl=Pollakk
 LocaleNames/mt/ps=Pashto
-LocaleNames/mt/pt=Portugi\u017c
+LocaleNames/mt/pt=Portugiż
 LocaleNames/mt/qu=Quechua
 LocaleNames/mt/rm=Romanz
 LocaleNames/mt/ro=Rumen
@@ -4850,127 +4850,127 @@ LocaleNames/mt/sk=Slovakk
 LocaleNames/mt/sl=Sloven
 LocaleNames/mt/sm=Samoan
 LocaleNames/mt/sn=Shona
-LocaleNames/mt/sq=Albani\u017c
+LocaleNames/mt/sq=Albaniż
 LocaleNames/mt/sr=Serb
 LocaleNames/mt/st=Soto tan-Nofsinhar
-LocaleNames/mt/su=Sundani\u017c
-LocaleNames/mt/sv=\u017bvedi\u017c
+LocaleNames/mt/su=Sundaniż
+LocaleNames/mt/sv=Żvediż
 LocaleNames/mt/sw=Swahili
-LocaleNames/mt/tg=Ta\u0121ik
-LocaleNames/mt/th=Tajlandi\u017c
+LocaleNames/mt/tg=Taġik
+LocaleNames/mt/th=Tajlandiż
 LocaleNames/mt/ti=Tigrinya
 LocaleNames/mt/tk=Turkmeni
 LocaleNames/mt/tn=Tswana
 LocaleNames/mt/to=Tongan
 LocaleNames/mt/tr=Tork
-LocaleNames/mt/ty=Ta\u0127itjan
+LocaleNames/mt/ty=Taħitjan
 LocaleNames/mt/ug=Uyghur
 LocaleNames/mt/uk=Ukren
 LocaleNames/mt/uz=Uzbek
-LocaleNames/mt/vi=Vjetnami\u017c
+LocaleNames/mt/vi=Vjetnamiż
 LocaleNames/mt/vo=Volapuk
 LocaleNames/mt/xh=Xhosa
 LocaleNames/mt/yi=Yiddish
 LocaleNames/mt/yo=Yoruba
 LocaleNames/mt/za=Zhuang
-LocaleNames/mt/zh=\u010aini\u017c
+LocaleNames/mt/zh=Ċiniż
 LocaleNames/mt/zu=Zulu
-LocaleNames/mt/AE=l-Emirati G\u0127arab Mag\u0127quda
+LocaleNames/mt/AE=l-Emirati Għarab Magħquda
 LocaleNames/mt/AF=l-Afganistan
 LocaleNames/mt/AI=Anguilla
 LocaleNames/mt/AL=l-Albanija
 LocaleNames/mt/AM=l-Armenja
 LocaleNames/mt/AQ=l-Antartika
-LocaleNames/mt/AR=l-Ar\u0121entina
+LocaleNames/mt/AR=l-Arġentina
 LocaleNames/mt/AS=is-Samoa Amerikana
 LocaleNames/mt/AT=l-Awstrija
 LocaleNames/mt/AU=l-Awstralja
-LocaleNames/mt/AZ=l-A\u017cerbaj\u0121an
-LocaleNames/mt/BA=il-Bo\u017cnija-\u0126erzegovina
+LocaleNames/mt/AZ=l-Ażerbajġan
+LocaleNames/mt/BA=il-Bożnija-Ħerzegovina
 LocaleNames/mt/BD=il-Bangladesh
-LocaleNames/mt/BE=il-Bel\u0121ju
+LocaleNames/mt/BE=il-Belġju
 LocaleNames/mt/BG=il-Bulgarija
 LocaleNames/mt/BH=il-Bahrain
 LocaleNames/mt/BN=il-Brunei
 LocaleNames/mt/BO=il-Bolivja
-LocaleNames/mt/BR=Il-Bra\u017cil
+LocaleNames/mt/BR=Il-Brażil
 LocaleNames/mt/BS=il-Bahamas
 LocaleNames/mt/BT=il-Bhutan
 LocaleNames/mt/BY=il-Belarussja
 LocaleNames/mt/BZ=il-Belize
 LocaleNames/mt/CA=il-Kanada
-LocaleNames/mt/CC=G\u017cejjer Cocos (Keeling)
+LocaleNames/mt/CC=Gżejjer Cocos (Keeling)
 LocaleNames/mt/CD=ir-Repubblika Demokratika tal-Kongo
-LocaleNames/mt/CF=ir-Repubblika \u010aentru-Afrikana
+LocaleNames/mt/CF=ir-Repubblika Ċentru-Afrikana
 LocaleNames/mt/CG=il-Kongo - Brazzaville
-LocaleNames/mt/CH=l-I\u017cvizzera
+LocaleNames/mt/CH=l-Iżvizzera
 LocaleNames/mt/CI=il-Kosta tal-Avorju
-LocaleNames/mt/CL=i\u010b-\u010aili
+LocaleNames/mt/CL=iċ-Ċili
 LocaleNames/mt/CM=il-Kamerun
-LocaleNames/mt/CN=i\u010b-\u010aina
+LocaleNames/mt/CN=iċ-Ċina
 LocaleNames/mt/CO=il-Kolombja
 LocaleNames/mt/CR=il-Costa Rica
 LocaleNames/mt/CU=Kuba
 LocaleNames/mt/CV=Cape Verde
-LocaleNames/mt/CY=\u010aipru
-LocaleNames/mt/CZ=ir-Repubblika \u010aeka
-LocaleNames/mt/DE=il-\u0120ermanja
+LocaleNames/mt/CY=Ċipru
+LocaleNames/mt/CZ=ir-Repubblika Ċeka
+LocaleNames/mt/DE=il-Ġermanja
 LocaleNames/mt/DJ=il-Djibouti
 LocaleNames/mt/DK=id-Danimarka
 LocaleNames/mt/DM=Dominica
 LocaleNames/mt/DO=ir-Repubblika Dominicana
-LocaleNames/mt/DZ=l-Al\u0121erija
+LocaleNames/mt/DZ=l-Alġerija
 LocaleNames/mt/EC=l-Ekwador
 LocaleNames/mt/EE=l-Estonja
-LocaleNames/mt/EG=l-E\u0121ittu
-LocaleNames/mt/EH=is-Sa\u0127ara tal-Punent
+LocaleNames/mt/EG=l-Eġittu
+LocaleNames/mt/EH=is-Saħara tal-Punent
 LocaleNames/mt/ER=l-Eritrea
 LocaleNames/mt/ES=Spanja
 LocaleNames/mt/ET=l-Etjopja
 LocaleNames/mt/FI=il-Finlandja
-LocaleNames/mt/FJ=Fi\u0121i
-LocaleNames/mt/FM=il-Mikrone\u017cja
-LocaleNames/mt/FO=il-G\u017cejjer Faeroe
+LocaleNames/mt/FJ=Fiġi
+LocaleNames/mt/FM=il-Mikroneżja
+LocaleNames/mt/FO=il-Gżejjer Faeroe
 LocaleNames/mt/FR=Franza
 LocaleNames/mt/GB=ir-Renju Unit
 LocaleNames/mt/GE=il-Georgia
-LocaleNames/mt/GF=il-Guyana Fran\u010bi\u017ca
+LocaleNames/mt/GF=il-Guyana Franċiża
 LocaleNames/mt/GH=il-Ghana
 LocaleNames/mt/GL=Greenland
 LocaleNames/mt/GM=il-Gambja
 LocaleNames/mt/GN=il-Guinea
 LocaleNames/mt/GP=Guadeloupe
 LocaleNames/mt/GQ=il-Guinea Ekwatorjali
-LocaleNames/mt/GR=il-Gre\u010bja
-LocaleNames/mt/GS=il-Georgia tan-Nofsinhar u l-G\u017cejjer Sandwich tan-Nofsinhar
+LocaleNames/mt/GR=il-Greċja
+LocaleNames/mt/GS=il-Georgia tan-Nofsinhar u l-Gżejjer Sandwich tan-Nofsinhar
 LocaleNames/mt/GT=il-Gwatemala
 LocaleNames/mt/GU=Guam
 LocaleNames/mt/GW=il-Guinea-Bissau
 LocaleNames/mt/GY=il-Guyana
-LocaleNames/mt/HK=ir-Re\u0121jun Amministrattiv Spe\u010bjali ta\u2019 Hong Kong tar-Repubblika tal-Poplu ta\u010b-\u010aina
-LocaleNames/mt/HM=il-G\u017cejjer Heard u l-G\u017cejjer McDonald
+LocaleNames/mt/HK=ir-Reġjun Amministrattiv Speċjali ta’ Hong Kong tar-Repubblika tal-Poplu taċ-Ċina
+LocaleNames/mt/HM=il-Gżejjer Heard u l-Gżejjer McDonald
 LocaleNames/mt/HN=il-Honduras
 LocaleNames/mt/HR=il-Kroazja
 LocaleNames/mt/HT=il-Haiti
 LocaleNames/mt/HU=l-Ungerija
-LocaleNames/mt/ID=l-Indone\u017cja
+LocaleNames/mt/ID=l-Indoneżja
 LocaleNames/mt/IE=l-Irlanda
-LocaleNames/mt/IL=I\u017crael
+LocaleNames/mt/IL=Iżrael
 LocaleNames/mt/IN=l-Indja
-LocaleNames/mt/IS=l-I\u017clanda
+LocaleNames/mt/IS=l-Iżlanda
 LocaleNames/mt/IT=l-Italja
-LocaleNames/mt/JM=il-\u0120amajka
-LocaleNames/mt/JO=il-\u0120ordan
-LocaleNames/mt/JP=il-\u0120appun
+LocaleNames/mt/JM=il-Ġamajka
+LocaleNames/mt/JO=il-Ġordan
+LocaleNames/mt/JP=il-Ġappun
 LocaleNames/mt/KE=il-Kenja
-LocaleNames/mt/KG=il-Kirgi\u017cistan
+LocaleNames/mt/KG=il-Kirgiżistan
 LocaleNames/mt/KH=il-Kambodja
 LocaleNames/mt/KM=Comoros
 LocaleNames/mt/KN=Saint Kitts u Nevis
-LocaleNames/mt/KP=il-Korea ta\u2019 Fuq
-LocaleNames/mt/KR=il-Korea t\u2019Isfel
+LocaleNames/mt/KP=il-Korea ta’ Fuq
+LocaleNames/mt/KR=il-Korea t’Isfel
 LocaleNames/mt/KW=il-Kuwajt
-LocaleNames/mt/KZ=il-Ka\u017cakistan
+LocaleNames/mt/KZ=il-Każakistan
 LocaleNames/mt/LB=il-Libanu
 LocaleNames/mt/LC=Saint Lucia
 LocaleNames/mt/LR=il-Liberja
@@ -4983,12 +4983,12 @@ LocaleNames/mt/MA=il-Marokk
 LocaleNames/mt/MC=Monaco
 LocaleNames/mt/MD=il-Moldova
 LocaleNames/mt/MG=Madagascar
-LocaleNames/mt/MH=G\u017cejjer Marshall
-LocaleNames/mt/MK=il-Ma\u010bedonja ta\u2019 Fuq
+LocaleNames/mt/MH=Gżejjer Marshall
+LocaleNames/mt/MK=il-Maċedonja ta’ Fuq
 LocaleNames/mt/MM=il-Myanmar/Burma
 LocaleNames/mt/MN=il-Mongolja
-LocaleNames/mt/MO=ir-Re\u0121jun Amministrattiv Spe\u010bjali tal-Macao tar-Repubblika tal-Poplu ta\u010b-\u010aina
-LocaleNames/mt/MP=\u0120\u017cejjer Mariana tat-Tramuntana
+LocaleNames/mt/MO=ir-Reġjun Amministrattiv Speċjali tal-Macao tar-Repubblika tal-Poplu taċ-Ċina
+LocaleNames/mt/MP=Ġżejjer Mariana tat-Tramuntana
 LocaleNames/mt/MQ=Martinique
 LocaleNames/mt/MR=il-Mauritania
 LocaleNames/mt/MU=Mauritius
@@ -4996,12 +4996,12 @@ LocaleNames/mt/MX=il-Messiku
 LocaleNames/mt/MY=il-Malasja
 LocaleNames/mt/MZ=il-Mozambique
 LocaleNames/mt/NA=in-Namibja
-LocaleNames/mt/NE=in-Ni\u0121er
-LocaleNames/mt/NG=in-Ni\u0121erja
+LocaleNames/mt/NE=in-Niġer
+LocaleNames/mt/NG=in-Niġerja
 LocaleNames/mt/NI=in-Nikaragwa
 LocaleNames/mt/NL=in-Netherlands
-LocaleNames/mt/NO=in-Norve\u0121ja
-LocaleNames/mt/PF=Poline\u017cja Fran\u010bi\u017ca
+LocaleNames/mt/NO=in-Norveġja
+LocaleNames/mt/PF=Polineżja Franċiża
 LocaleNames/mt/PG=Papua New Guinea
 LocaleNames/mt/PH=il-Filippini
 LocaleNames/mt/PL=il-Polonja
@@ -5009,28 +5009,28 @@ LocaleNames/mt/PM=Saint Pierre u Miquelon
 LocaleNames/mt/PS=it-Territorji Palestinjani
 LocaleNames/mt/PT=il-Portugall
 LocaleNames/mt/PY=il-Paragwaj
-LocaleNames/mt/RE=R\u00e9union
+LocaleNames/mt/RE=Réunion
 LocaleNames/mt/RO=ir-Rumanija
 LocaleNames/mt/RU=ir-Russja
 LocaleNames/mt/SA=l-Arabja Sawdija
-LocaleNames/mt/SE=l-I\u017cvezja
+LocaleNames/mt/SE=l-Iżvezja
 LocaleNames/mt/SG=Singapore
 LocaleNames/mt/SI=is-Slovenja
 LocaleNames/mt/SJ=Svalbard u Jan Mayen
 LocaleNames/mt/SK=is-Slovakkja
 LocaleNames/mt/SO=is-Somalja
 LocaleNames/mt/SR=is-Suriname
-LocaleNames/mt/ST=S\u00e3o Tom\u00e9 u Pr\u00edncipe
+LocaleNames/mt/ST=São Tomé u Príncipe
 LocaleNames/mt/SY=is-Sirja
 LocaleNames/mt/SZ=l-Eswatini
-LocaleNames/mt/TC=il-G\u017cejjer Turks u Caicos
-LocaleNames/mt/TD=i\u010b-Chad
-LocaleNames/mt/TF=It-Territorji Fran\u010bi\u017ci tan-Nofsinhar
+LocaleNames/mt/TC=il-Gżejjer Turks u Caicos
+LocaleNames/mt/TD=iċ-Chad
+LocaleNames/mt/TF=It-Territorji Franċiżi tan-Nofsinhar
 LocaleNames/mt/TH=it-Tajlandja
-LocaleNames/mt/TJ=it-Ta\u0121ikistan
+LocaleNames/mt/TJ=it-Taġikistan
 LocaleNames/mt/TK=it-Tokelau
 LocaleNames/mt/TL=Timor Leste
-LocaleNames/mt/TN=it-Tune\u017cija
+LocaleNames/mt/TN=it-Tuneżija
 LocaleNames/mt/TR=it-Turkija
 LocaleNames/mt/TT=Trinidad u Tobago
 LocaleNames/mt/TW=it-Tajwan
@@ -5038,7 +5038,7 @@ LocaleNames/mt/TZ=it-Tanzanija
 LocaleNames/mt/UA=l-Ukrajna
 LocaleNames/mt/US=l-Istati Uniti
 LocaleNames/mt/UY=l-Urugwaj
-LocaleNames/mt/UZ=l-U\u017cbekistan
+LocaleNames/mt/UZ=l-Użbekistan
 LocaleNames/mt/VA=l-Istat tal-Belt tal-Vatikan
 LocaleNames/mt/VC=Saint Vincent u l-Grenadini
 LocaleNames/mt/VE=il-Venezwela
@@ -5047,48 +5047,48 @@ LocaleNames/mt/VU=Vanuatu
 LocaleNames/mt/WF=Wallis u Futuna
 LocaleNames/mt/YE=il-Jemen
 LocaleNames/mt/YT=Mayotte
-LocaleNames/mt/ZA=l-Afrika t\u2019Isfel
-LocaleNames/mt/ZM=i\u017c-\u017bambja
-LocaleNames/mt/ZW=i\u017c-\u017bimbabwe
-LocaleNames/sr/ZA=\u0408\u0443\u0436\u043d\u043e\u0430\u0444\u0440\u0438\u0447\u043a\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430
-LocaleNames/zh_SG/bo=\u85cf\u8bed
-LocaleNames/zh_SG/gd=\u82cf\u683c\u5170\u76d6\u5c14\u8bed
-LocaleNames/zh_SG/ho=\u5e0c\u91cc\u83ab\u56fe\u8bed
-LocaleNames/zh_SG/ia=\u56fd\u9645\u8bed
-LocaleNames/zh_SG/ie=\u56fd\u9645\u6587\u5b57\uff08E\uff09
-LocaleNames/zh_SG/iu=\u56e0\u7ebd\u7279\u8bed
-LocaleNames/zh_SG/kj=\u5bbd\u4e9a\u739b\u8bed
-LocaleNames/zh_SG/kn=\u5361\u7eb3\u8fbe\u8bed
-LocaleNames/zh_SG/lv=\u62c9\u8131\u7ef4\u4e9a\u8bed
-LocaleNames/zh_SG/ny=\u9f50\u5207\u74e6\u8bed
-LocaleNames/zh_SG/oc=\u5965\u514b\u8bed
-LocaleNames/zh_SG/om=\u5965\u7f57\u83ab\u8bed
-LocaleNames/zh_SG/rm=\u7f57\u66fc\u4ec0\u8bed
-LocaleNames/zh_SG/sd=\u4fe1\u5fb7\u8bed
-LocaleNames/zh_SG/se=\u5317\u65b9\u8428\u7c73\u8bed
-LocaleNames/zh_SG/sn=\u7ecd\u7eb3\u8bed
-LocaleNames/zh_SG/ss=\u65af\u74e6\u8482\u8bed
-LocaleNames/zh_SG/su=\u5dfd\u4ed6\u8bed
-LocaleNames/zh_SG/tl=\u4ed6\u52a0\u7984\u8bed
-LocaleNames/zh_SG/tn=\u8328\u74e6\u7eb3\u8bed
-LocaleNames/zh_SG/ts=\u806a\u52a0\u8bed
-LocaleNames/zh_SG/tt=\u9791\u977c\u8bed
-LocaleNames/zh_SG/tw=\u5951\u7ef4\u8bed
-LocaleNames/zh_SG/wa=\u74e6\u9686\u8bed
-LocaleNames/zh_SG/wo=\u6c83\u6d1b\u592b\u8bed
-LocaleNames/zh_SG/xh=\u79d1\u8428\u8bed
-LocaleNames/zh_SG/za=\u58ee\u8bed
-LocaleNames/zh_SG/BA=\u6ce2\u65af\u5c3c\u4e9a\u548c\u9ed1\u585e\u54e5\u7ef4\u90a3
-LocaleNames/zh_SG/CC=\u79d1\u79d1\u65af\uff08\u57fa\u6797\uff09\u7fa4\u5c9b
-LocaleNames/zh_SG/CD=\u521a\u679c\uff08\u91d1\uff09
-LocaleNames/zh_SG/CG=\u521a\u679c\uff08\u5e03\uff09
-LocaleNames/zh_SG/DM=\u591a\u7c73\u5c3c\u514b
-LocaleNames/zh_SG/KG=\u5409\u5c14\u5409\u65af\u65af\u5766
-LocaleNames/zh_SG/KP=\u671d\u9c9c
-LocaleNames/zh_SG/MQ=\u9a6c\u63d0\u5c3c\u514b
-LocaleNames/zh_SG/MQ=\u9a6c\u63d0\u5c3c\u514b
-LocaleNames/zh_SG/NC=\u65b0\u5580\u91cc\u591a\u5c3c\u4e9a
-LocaleNames/zh_SG/TF=\u6cd5\u5c5e\u5357\u90e8\u9886\u5730
+LocaleNames/mt/ZA=l-Afrika t’Isfel
+LocaleNames/mt/ZM=iż-Żambja
+LocaleNames/mt/ZW=iż-Żimbabwe
+LocaleNames/sr/ZA=Јужноафричка Република
+LocaleNames/zh_SG/bo=藏语
+LocaleNames/zh_SG/gd=苏格兰盖尔语
+LocaleNames/zh_SG/ho=希里莫图语
+LocaleNames/zh_SG/ia=国际语
+LocaleNames/zh_SG/ie=国际文字（E）
+LocaleNames/zh_SG/iu=因纽特语
+LocaleNames/zh_SG/kj=宽亚玛语
+LocaleNames/zh_SG/kn=卡纳达语
+LocaleNames/zh_SG/lv=拉脱维亚语
+LocaleNames/zh_SG/ny=齐切瓦语
+LocaleNames/zh_SG/oc=奥克语
+LocaleNames/zh_SG/om=奥罗莫语
+LocaleNames/zh_SG/rm=罗曼什语
+LocaleNames/zh_SG/sd=信德语
+LocaleNames/zh_SG/se=北方萨米语
+LocaleNames/zh_SG/sn=绍纳语
+LocaleNames/zh_SG/ss=斯瓦蒂语
+LocaleNames/zh_SG/su=巽他语
+LocaleNames/zh_SG/tl=他加禄语
+LocaleNames/zh_SG/tn=茨瓦纳语
+LocaleNames/zh_SG/ts=聪加语
+LocaleNames/zh_SG/tt=鞑靼语
+LocaleNames/zh_SG/tw=契维语
+LocaleNames/zh_SG/wa=瓦隆语
+LocaleNames/zh_SG/wo=沃洛夫语
+LocaleNames/zh_SG/xh=科萨语
+LocaleNames/zh_SG/za=壮语
+LocaleNames/zh_SG/BA=波斯尼亚和黑塞哥维那
+LocaleNames/zh_SG/CC=科科斯（基林）群岛
+LocaleNames/zh_SG/CD=刚果（金）
+LocaleNames/zh_SG/CG=刚果（布）
+LocaleNames/zh_SG/DM=多米尼克
+LocaleNames/zh_SG/KG=吉尔吉斯斯坦
+LocaleNames/zh_SG/KP=朝鲜
+LocaleNames/zh_SG/MQ=马提尼克
+LocaleNames/zh_SG/MQ=马提尼克
+LocaleNames/zh_SG/NC=新喀里多尼亚
+LocaleNames/zh_SG/TF=法属南部领地
 FormatData/es_US/AmPmMarkers/0=a.m.
 FormatData/es_US/AmPmMarkers/1=p.m.
 FormatData/es_US/latn.NumberElements/0=.
@@ -5099,18 +5099,18 @@ FormatData/es_US/latn.NumberElements/4=0
 FormatData/es_US/latn.NumberElements/5=#
 FormatData/es_US/latn.NumberElements/6=-
 FormatData/es_US/latn.NumberElements/7=E
-FormatData/es_US/latn.NumberElements/8=\u2030
-FormatData/es_US/latn.NumberElements/9=\u221e
+FormatData/es_US/latn.NumberElements/8=‰
+FormatData/es_US/latn.NumberElements/9=∞
 FormatData/es_US/latn.NumberElements/10=NaN
 FormatData/mt/AmPmMarkers/0=AM
 FormatData/mt/AmPmMarkers/1=PM
-FormatData/mt/DatePatterns/0=EEEE, d 'ta'\u2019 MMMM y
+FormatData/mt/DatePatterns/0=EEEE, d 'ta'’ MMMM y
 # bug# 6498742
 # make sure that the default en data is used for en_SG : CLDR1.4.1 demoted these data
-FormatData/en_SG/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/en_SG/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/en_SG/TimePatterns/2=h:mm:ss\u202fa
-FormatData/en_SG/TimePatterns/3=h:mm\u202fa
+FormatData/en_SG/TimePatterns/0=h:mm:ss a zzzz
+FormatData/en_SG/TimePatterns/1=h:mm:ss a z
+FormatData/en_SG/TimePatterns/2=h:mm:ss a
+FormatData/en_SG/TimePatterns/3=h:mm a
 FormatData/en_SG/DatePatterns/0=EEEE, d MMMM y
 FormatData/en_SG/DatePatterns/1=d MMMM y
 FormatData/en_SG/DatePatterns/2=d MMM y
@@ -5119,10 +5119,10 @@ FormatData/en_SG/DateTimePatterns/0={1}, {0}
 # Use approved data
 FormatData/ms/Eras/0=S.M.
 FormatData/ms/Eras/1=TM
-FormatData/sr_BA/MonthNames/5=\u0458\u0443\u043d
-FormatData/sr_BA/MonthNames/6=\u0458\u0443\u043b
-FormatData/sr_BA/DayNames/3=\u0441\u0440\u0435\u0434\u0430
-FormatData/sr_BA/DayAbbreviations/3=\u0441\u0440\u0435
+FormatData/sr_BA/MonthNames/5=јун
+FormatData/sr_BA/MonthNames/6=јул
+FormatData/sr_BA/DayNames/3=среда
+FormatData/sr_BA/DayAbbreviations/3=сре
 FormatData/sr_BA/TimePatterns/0=HH:mm:ss zzzz
 FormatData/sr_BA/TimePatterns/1=HH:mm:ss z
 FormatData/sr_BA/TimePatterns/2=HH:mm:ss
@@ -5134,31 +5134,31 @@ FormatData/sr_BA/DatePatterns/3=d. M. y.
 FormatData/sr_BA/DateTimePatterns/0={1} {0}
 LocaleNames/pt_BR/ce=checheno
 LocaleNames/pt_BR/ik=inupiaque
-LocaleNames/pt_BR/jv=javan\u00eas
+LocaleNames/pt_BR/jv=javanês
 LocaleNames/pt_BR/nd=ndebele do norte
 LocaleNames/pt_BR/nr=ndebele do sul
 LocaleNames/pt_BR/st=soto do sul
 LocaleNames/pt_BR/AX=Ilhas Aland
-LocaleNames/pt_BR/BA=B\u00f3snia e Herzegovina
+LocaleNames/pt_BR/BA=Bósnia e Herzegovina
 LocaleNames/pt_BR/BH=Barein
 LocaleNames/pt_BR/KP=Coreia do Norte
-LocaleNames/pt_BR/MK=Maced\u00f4nia do Norte
-LocaleNames/pt_BR/ZW=Zimb\u00e1bue
+LocaleNames/pt_BR/MK=Macedônia do Norte
+LocaleNames/pt_BR/ZW=Zimbábue
 LocaleNames/pt_PT/ee=ewe
-LocaleNames/pt_PT/fo=fero\u00eas
+LocaleNames/pt_PT/fo=feroês
 LocaleNames/pt_PT/gl=galego
-LocaleNames/pt_PT/ha=ha\u00fa\u00e7a
-LocaleNames/pt_PT/hy=arm\u00e9nio
+LocaleNames/pt_PT/ha=haúça
+LocaleNames/pt_PT/hy=arménio
 LocaleNames/pt_PT/ig=igbo
 LocaleNames/pt_PT/ki=quicuio
-LocaleNames/pt_PT/kl=groneland\u00eas
+LocaleNames/pt_PT/kl=gronelandês
 LocaleNames/pt_PT/km=khmer
-LocaleNames/pt_PT/mh=marshal\u00eas
-LocaleNames/pt_PT/mk=maced\u00f3nio
+LocaleNames/pt_PT/mh=marshalês
+LocaleNames/pt_PT/mk=macedónio
 LocaleNames/pt_PT/nr=ndebele do sul
-LocaleNames/pt_PT/os=oss\u00e9tico
+LocaleNames/pt_PT/os=ossético
 LocaleNames/pt_PT/st=sesoto
-LocaleNames/pt_PT/ta=t\u00e2mil
+LocaleNames/pt_PT/ta=tâmil
 LocaleNames/pt_PT/AI=Anguila
 LocaleNames/pt_PT/AX=Alanda
 
@@ -5176,7 +5176,7 @@ FormatData/nl/Eras/1=n.Chr.
 LocaleNames/da/da=dansk
 
 # bug 6485516
-LocaleNames/fr/GF=Guyane fran\u00e7aise
+LocaleNames/fr/GF=Guyane française
 
 # bug 6486607
 LocaleNames/fr/GY=Guyana
@@ -5190,9 +5190,9 @@ FormatData/fr_FR/DateTimePatternChars=GyMdkHmsSEDFwWahKzZ
 FormatData/fr_LU/DateTimePatternChars=GyMdkHmsSEDFwWahKzZ
 
 # bug 6547501
-FormatData/fr/latn.NumberPatterns/2=#,##0\u00a0%
+FormatData/fr/latn.NumberPatterns/2=#,##0 %
 # following two lines are also for bug 4494727
-FormatData/fr_CA/latn.NumberPatterns/2=#,##0\u00a0%
+FormatData/fr_CA/latn.NumberPatterns/2=#,##0 %
 FormatData/fr_CH/latn.NumberPatterns/2=#,##0%
 
 # bug 4494727
@@ -5206,27 +5206,27 @@ LocaleNames/de/ME=Montenegro
 LocaleNames/de/RS=Serbien
 LocaleNames/es/ME=Montenegro
 LocaleNames/es/RS=Serbia
-LocaleNames/fr/ME=Mont\u00e9n\u00e9gro
+LocaleNames/fr/ME=Monténégro
 LocaleNames/fr/RS=Serbie
 LocaleNames/it/ME=Montenegro
 LocaleNames/it/RS=Serbia
-LocaleNames/ja/ME=\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed
-LocaleNames/ja/RS=\u30bb\u30eb\u30d3\u30a2
-LocaleNames/ko/ME=\ubaac\ud14c\ub124\uadf8\ub85c
-LocaleNames/ko/RS=\uc138\ub974\ube44\uc544
+LocaleNames/ja/ME=モンテネグロ
+LocaleNames/ja/RS=セルビア
+LocaleNames/ko/ME=몬테네그로
+LocaleNames/ko/RS=세르비아
 LocaleNames/sv/ME=Montenegro
 LocaleNames/sv/RS=Serbien
-LocaleNames/zh/ME=\u9ed1\u5c71
-LocaleNames/zh/RS=\u585e\u5c14\u7ef4\u4e9a
-LocaleNames/zh_TW/ME=\u8499\u7279\u5167\u54e5\u7f85
-LocaleNames/zh_TW/RS=\u585e\u723e\u7dad\u4e9e
+LocaleNames/zh/ME=黑山
+LocaleNames/zh/RS=塞尔维亚
+LocaleNames/zh_TW/ME=蒙特內哥羅
+LocaleNames/zh_TW/RS=塞爾維亞
 
 # bug 6531591
-CurrencyNames/ar_SD/SDD=\u062f.\u0633.\u200f
-CurrencyNames/ar_SD/SDG=\u062c.\u0633.
+CurrencyNames/ar_SD/SDD=د.س.‏
+CurrencyNames/ar_SD/SDG=ج.س.
 
 # bug 6531593
-FormatData/is_IS/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
+FormatData/is_IS/latn.NumberPatterns/1=#,##0.00 ¤
 
 # bug 6509039
 FormatData/sv/AmPmMarkers/0=fm
@@ -5240,7 +5240,7 @@ FormatData/fi/AmPmMarkers/0=ap.
 FormatData/fi/AmPmMarkers/1=ip.
 
 # bug 6507067 8317979
-TimeZoneNames/zh_TW/Asia\/Taipei/1=\u53f0\u5317\u6a19\u6e96\u6642\u9593
+TimeZoneNames/zh_TW/Asia\/Taipei/1=台北標準時間
 TimeZoneNames/zh_TW/Asia\/Taipei/2=CST
 
 # bug 6645271
@@ -5248,10 +5248,10 @@ FormatData/hr_HR/DatePatterns/2=d. MMM y.
 FormatData/hr_HR/DatePatterns/3=dd. MM. y.
 
 # bug 6873931
-CurrencyNames/tr_TR/TRY=\u20ba
+CurrencyNames/tr_TR/TRY=₺
 
 #bug 6450945
-FormatData/ro/DayNames/6=s\u00e2mb\u0103t\u0103
+FormatData/ro/DayNames/6=sâmbătă
 
 #bug 6645268
 LocaleNames/fi/fr=ranska
@@ -5260,14 +5260,14 @@ LocaleNames/fi_FI/fr=ranska
 LocaleNames/fi_FI/FR=Ranska
 
 # bug 6646611, 6914413
-FormatData/be_BY/MonthNames/10=\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430
-FormatData/be_BY/MonthAbbreviations/10=\u043b\u0456\u0441
+FormatData/be_BY/MonthNames/10=лістапада
+FormatData/be_BY/MonthAbbreviations/10=ліс
 
 # bug 6645405
-FormatData/hu_HU/latn.NumberPatterns/1=#,##0.00\u00a0\u00a4
+FormatData/hu_HU/latn.NumberPatterns/1=#,##0.00 ¤
 
 # bug 6650730
-FormatData/lt/latn.NumberElements/1=\u00a0
+FormatData/lt/latn.NumberElements/1= 
 FormatData/lt/DatePatterns/2=y-MM-dd
 
 # bug 6573250
@@ -5276,7 +5276,7 @@ CurrencyNames/en_CA/USD=US$
 # bug 6870908
 FormatData/et/MonthNames/0=jaanuar
 FormatData/et/MonthNames/1=veebruar
-FormatData/et/MonthNames/2=m\u00e4rts
+FormatData/et/MonthNames/2=märts
 FormatData/et/MonthNames/3=aprill
 FormatData/et/MonthNames/4=mai
 FormatData/et/MonthNames/5=juuni
@@ -5288,7 +5288,7 @@ FormatData/et/MonthNames/10=november
 FormatData/et/MonthNames/11=detsember
 FormatData/et/MonthAbbreviations/0=jaan
 FormatData/et/MonthAbbreviations/1=veebr
-FormatData/et/MonthAbbreviations/2=m\u00e4rts
+FormatData/et/MonthAbbreviations/2=märts
 FormatData/et/MonthAbbreviations/3=apr
 FormatData/et/MonthAbbreviations/4=mai
 FormatData/et/MonthAbbreviations/5=juuni
@@ -5304,39 +5304,39 @@ LocaleNames/es/aa=afar
 LocaleNames/es/av=avar
 LocaleNames/es/az=azerbaiyano
 LocaleNames/es/ba=baskir
-LocaleNames/es/bn=bengal\u00ed
-LocaleNames/es/cu=eslavo eclesi\u00e1stico
+LocaleNames/es/bn=bengalí
+LocaleNames/es/cu=eslavo eclesiástico
 LocaleNames/es/dz=dzongkha
 LocaleNames/es/eu=euskera
 LocaleNames/es/fa=persa
 LocaleNames/es/ff=fula
 LocaleNames/es/fj=fiyiano
-LocaleNames/es/fo=fero\u00e9s
-LocaleNames/es/fy=fris\u00f3n occidental
-LocaleNames/es/gu=guyarat\u00ed
-LocaleNames/es/gv=man\u00e9s
+LocaleNames/es/fo=feroés
+LocaleNames/es/fy=frisón occidental
+LocaleNames/es/gu=guyaratí
+LocaleNames/es/gv=manés
 LocaleNames/es/hi=hindi
 LocaleNames/es/ho=hiri motu
 LocaleNames/es/ie=interlingue
 LocaleNames/es/ig=igbo
-LocaleNames/es/ii=yi de Sichu\u00e1n
+LocaleNames/es/ii=yi de Sichuán
 LocaleNames/es/ik=inupiaq
 LocaleNames/es/kg=kongo
 LocaleNames/es/ki=kikuyu
 LocaleNames/es/kj=kuanyama
 LocaleNames/es/kk=kazajo
 LocaleNames/es/km=jemer
-LocaleNames/es/kn=canar\u00e9s
+LocaleNames/es/kn=canarés
 LocaleNames/es/ks=cachemir
 LocaleNames/es/ku=kurdo
-LocaleNames/es/ky=kirgu\u00eds
+LocaleNames/es/ky=kirguís
 LocaleNames/es/lu=luba-katanga
-LocaleNames/es/mr=marat\u00ed
+LocaleNames/es/mr=maratí
 LocaleNames/es/nb=noruego bokmal
 LocaleNames/es/nd=ndebele septentrional
 LocaleNames/es/nn=noruego nynorsk
 LocaleNames/es/nr=ndebele meridional
-LocaleNames/es/os=os\u00e9tico
+LocaleNames/es/os=osético
 LocaleNames/es/rm=romanche
 LocaleNames/es/rn=kirundi
 LocaleNames/es/rw=kinyarwanda
@@ -5346,10 +5346,10 @@ LocaleNames/es/sl=esloveno
 LocaleNames/es/sn=shona
 LocaleNames/es/ss=suazi
 LocaleNames/es/st=sotho meridional
-LocaleNames/es/su=sundan\u00e9s
+LocaleNames/es/su=sundanés
 LocaleNames/es/sw=suajili
 LocaleNames/es/tg=tayiko
-LocaleNames/es/ti=tigri\u00f1a
+LocaleNames/es/ti=tigriña
 LocaleNames/es/tn=setsuana
 LocaleNames/es/to=tongano
 LocaleNames/es/tw=twi
@@ -5357,7 +5357,7 @@ LocaleNames/es/ty=tahitiano
 LocaleNames/es/ug=uigur
 LocaleNames/es/uk=ucraniano
 LocaleNames/es/uz=uzbeko
-LocaleNames/es/vo=volap\u00fck
+LocaleNames/es/vo=volapük
 LocaleNames/es/za=zhuang
 
 # bug 6716626 - language
@@ -5406,13 +5406,13 @@ LocaleNames/nl/fa=Perzisch
 LocaleNames/nl/ff=Fulah
 LocaleNames/nl/fi=Fins
 LocaleNames/nl/fj=Fijisch
-LocaleNames/nl/fo=Faer\u00f6ers
+LocaleNames/nl/fo=Faeröers
 LocaleNames/nl/fr=Frans
 LocaleNames/nl/fy=Fries
 LocaleNames/nl/ga=Iers
 LocaleNames/nl/gd=Schots-Gaelisch
 LocaleNames/nl/gl=Galicisch
-LocaleNames/nl/gn=Guaran\u00ed
+LocaleNames/nl/gn=Guaraní
 LocaleNames/nl/gu=Gujarati
 LocaleNames/nl/gv=Manx
 LocaleNames/nl/ha=Hausa
@@ -5420,7 +5420,7 @@ LocaleNames/nl/he=Hebreeuws
 LocaleNames/nl/hi=Hindi
 LocaleNames/nl/ho=Hiri Motu
 LocaleNames/nl/hr=Kroatisch
-LocaleNames/nl/ht=Ha\u00eftiaans Creools
+LocaleNames/nl/ht=Haïtiaans Creools
 LocaleNames/nl/hu=Hongaars
 LocaleNames/nl/hy=Armeens
 LocaleNames/nl/hz=Herero
@@ -5471,7 +5471,7 @@ LocaleNames/nl/ms=Maleis
 LocaleNames/nl/mt=Maltees
 LocaleNames/nl/my=Birmaans
 LocaleNames/nl/na=Nauruaans
-LocaleNames/nl/nb=Noors - Bokm\u00e5l
+LocaleNames/nl/nb=Noors - Bokmål
 LocaleNames/nl/nd=Noord-Ndebele
 LocaleNames/nl/ne=Nepalees
 LocaleNames/nl/ng=Ndonga
@@ -5530,12 +5530,12 @@ LocaleNames/nl/tt=Tataars
 LocaleNames/nl/tw=Twi
 LocaleNames/nl/ty=Tahitiaans
 LocaleNames/nl/ug=Oeigoers
-LocaleNames/nl/uk=Oekra\u00efens
+LocaleNames/nl/uk=Oekraïens
 LocaleNames/nl/ur=Urdu
 LocaleNames/nl/uz=Oezbeeks
 LocaleNames/nl/ve=Venda
 LocaleNames/nl/vi=Vietnamees
-LocaleNames/nl/vo=Volap\u00fck
+LocaleNames/nl/vo=Volapük
 LocaleNames/nl/wa=Waals
 LocaleNames/nl/wo=Wolof
 LocaleNames/nl/xh=Xhosa
@@ -5551,21 +5551,21 @@ LocaleNames/nl/AE=Verenigde Arabische Emiraten
 LocaleNames/nl/AF=Afghanistan
 LocaleNames/nl/AG=Antigua en Barbuda
 LocaleNames/nl/AI=Anguilla
-LocaleNames/nl/AL=Albani\u00eb
-LocaleNames/nl/AM=Armeni\u00eb
+LocaleNames/nl/AL=Albanië
+LocaleNames/nl/AM=Armenië
 LocaleNames/nl/AO=Angola
 LocaleNames/nl/AQ=Antarctica
-LocaleNames/nl/AR=Argentini\u00eb
+LocaleNames/nl/AR=Argentinië
 LocaleNames/nl/AS=Amerikaans-Samoa
 LocaleNames/nl/AT=Oostenrijk
-LocaleNames/nl/AU=Australi\u00eb
+LocaleNames/nl/AU=Australië
 LocaleNames/nl/AW=Aruba
-LocaleNames/nl/AX=\u00c5land
+LocaleNames/nl/AX=Åland
 LocaleNames/nl/AZ=Azerbeidzjan
-LocaleNames/nl/BA=Bosni\u00eb en Herzegovina
+LocaleNames/nl/BA=Bosnië en Herzegovina
 LocaleNames/nl/BB=Barbados
 LocaleNames/nl/BD=Bangladesh
-LocaleNames/nl/BE=Belgi\u00eb
+LocaleNames/nl/BE=België
 LocaleNames/nl/BF=Burkina Faso
 LocaleNames/nl/BG=Bulgarije
 LocaleNames/nl/BH=Bahrein
@@ -5574,8 +5574,8 @@ LocaleNames/nl/BJ=Benin
 LocaleNames/nl/BM=Bermuda
 LocaleNames/nl/BN=Brunei
 LocaleNames/nl/BO=Bolivia
-LocaleNames/nl/BR=Brazili\u00eb
-LocaleNames/nl/BS=Bahama\u2019s
+LocaleNames/nl/BR=Brazilië
+LocaleNames/nl/BS=Bahama’s
 LocaleNames/nl/BT=Bhutan
 LocaleNames/nl/BV=Bouveteiland
 LocaleNames/nl/BW=Botswana
@@ -5595,10 +5595,10 @@ LocaleNames/nl/CN=China
 LocaleNames/nl/CO=Colombia
 LocaleNames/nl/CR=Costa Rica
 LocaleNames/nl/CU=Cuba
-LocaleNames/nl/CV=Kaapverdi\u00eb
+LocaleNames/nl/CV=Kaapverdië
 LocaleNames/nl/CX=Christmaseiland
 LocaleNames/nl/CY=Cyprus
-LocaleNames/nl/CZ=Tsjechi\u00eb
+LocaleNames/nl/CZ=Tsjechië
 LocaleNames/nl/DE=Duitsland
 LocaleNames/nl/DJ=Djibouti
 LocaleNames/nl/DK=Denemarken
@@ -5611,17 +5611,17 @@ LocaleNames/nl/EG=Egypte
 LocaleNames/nl/EH=Westelijke Sahara
 LocaleNames/nl/ER=Eritrea
 LocaleNames/nl/ES=Spanje
-LocaleNames/nl/ET=Ethiopi\u00eb
+LocaleNames/nl/ET=Ethiopië
 LocaleNames/nl/FI=Finland
 LocaleNames/nl/FJ=Fiji
 LocaleNames/nl/FK=Falklandeilanden
 LocaleNames/nl/FM=Micronesia
-LocaleNames/nl/FO=Faer\u00f6er
+LocaleNames/nl/FO=Faeröer
 LocaleNames/nl/FR=Frankrijk
 LocaleNames/nl/GA=Gabon
 LocaleNames/nl/GB=Verenigd Koninkrijk
 LocaleNames/nl/GD=Grenada
-LocaleNames/nl/GE=Georgi\u00eb
+LocaleNames/nl/GE=Georgië
 LocaleNames/nl/GF=Frans-Guyana
 LocaleNames/nl/GH=Ghana
 LocaleNames/nl/GI=Gibraltar
@@ -5639,23 +5639,23 @@ LocaleNames/nl/GY=Guyana
 LocaleNames/nl/HK=Hongkong SAR van China
 LocaleNames/nl/HM=Heard en McDonaldeilanden
 LocaleNames/nl/HN=Honduras
-LocaleNames/nl/HR=Kroati\u00eb
-LocaleNames/nl/HT=Ha\u00efti
+LocaleNames/nl/HR=Kroatië
+LocaleNames/nl/HT=Haïti
 LocaleNames/nl/HU=Hongarije
-LocaleNames/nl/ID=Indonesi\u00eb
+LocaleNames/nl/ID=Indonesië
 LocaleNames/nl/IE=Ierland
-LocaleNames/nl/IL=Isra\u00ebl
+LocaleNames/nl/IL=Israël
 LocaleNames/nl/IN=India
 LocaleNames/nl/IO=Brits Indische Oceaanterritorium
 LocaleNames/nl/IQ=Irak
 LocaleNames/nl/IR=Iran
 LocaleNames/nl/IS=IJsland
-LocaleNames/nl/IT=Itali\u00eb
+LocaleNames/nl/IT=Italië
 LocaleNames/nl/JM=Jamaica
-LocaleNames/nl/JO=Jordani\u00eb
+LocaleNames/nl/JO=Jordanië
 LocaleNames/nl/JP=Japan
 LocaleNames/nl/KE=Kenia
-LocaleNames/nl/KG=Kirgizi\u00eb
+LocaleNames/nl/KG=Kirgizië
 LocaleNames/nl/KH=Cambodja
 LocaleNames/nl/KI=Kiribati
 LocaleNames/nl/KM=Comoren
@@ -5675,31 +5675,31 @@ LocaleNames/nl/LS=Lesotho
 LocaleNames/nl/LT=Litouwen
 LocaleNames/nl/LU=Luxemburg
 LocaleNames/nl/LV=Letland
-LocaleNames/nl/LY=Libi\u00eb
+LocaleNames/nl/LY=Libië
 LocaleNames/nl/MA=Marokko
 LocaleNames/nl/MC=Monaco
-LocaleNames/nl/MD=Moldavi\u00eb
+LocaleNames/nl/MD=Moldavië
 LocaleNames/nl/ME=Montenegro
 LocaleNames/nl/MG=Madagaskar
 LocaleNames/nl/MH=Marshalleilanden
-LocaleNames/nl/MK=Noord-Macedoni\u00eb
+LocaleNames/nl/MK=Noord-Macedonië
 LocaleNames/nl/ML=Mali
 LocaleNames/nl/MM=Myanmar (Birma)
-LocaleNames/nl/MN=Mongoli\u00eb
+LocaleNames/nl/MN=Mongolië
 LocaleNames/nl/MO=Macau SAR van China
 LocaleNames/nl/MP=Noordelijke Marianen
 LocaleNames/nl/MQ=Martinique
-LocaleNames/nl/MR=Mauritani\u00eb
+LocaleNames/nl/MR=Mauritanië
 LocaleNames/nl/MS=Montserrat
 LocaleNames/nl/MT=Malta
 LocaleNames/nl/MU=Mauritius
 LocaleNames/nl/MV=Maldiven
 LocaleNames/nl/MW=Malawi
 LocaleNames/nl/MX=Mexico
-LocaleNames/nl/MY=Maleisi\u00eb
+LocaleNames/nl/MY=Maleisië
 LocaleNames/nl/MZ=Mozambique
-LocaleNames/nl/NA=Namibi\u00eb
-LocaleNames/nl/NC=Nieuw-Caledoni\u00eb
+LocaleNames/nl/NA=Namibië
+LocaleNames/nl/NC=Nieuw-Caledonië
 LocaleNames/nl/NE=Niger
 LocaleNames/nl/NF=Norfolk
 LocaleNames/nl/NG=Nigeria
@@ -5713,7 +5713,7 @@ LocaleNames/nl/NZ=Nieuw-Zeeland
 LocaleNames/nl/OM=Oman
 LocaleNames/nl/PA=Panama
 LocaleNames/nl/PE=Peru
-LocaleNames/nl/PF=Frans-Polynesi\u00eb
+LocaleNames/nl/PF=Frans-Polynesië
 LocaleNames/nl/PG=Papoea-Nieuw-Guinea
 LocaleNames/nl/PH=Filipijnen
 LocaleNames/nl/PK=Pakistan
@@ -5726,29 +5726,29 @@ LocaleNames/nl/PT=Portugal
 LocaleNames/nl/PW=Palau
 LocaleNames/nl/PY=Paraguay
 LocaleNames/nl/QA=Qatar
-LocaleNames/nl/RE=R\u00e9union
-LocaleNames/nl/RO=Roemeni\u00eb
-LocaleNames/nl/RS=Servi\u00eb
+LocaleNames/nl/RE=Réunion
+LocaleNames/nl/RO=Roemenië
+LocaleNames/nl/RS=Servië
 LocaleNames/nl/RU=Rusland
 LocaleNames/nl/RW=Rwanda
-LocaleNames/nl/SA=Saoedi-Arabi\u00eb
+LocaleNames/nl/SA=Saoedi-Arabië
 LocaleNames/nl/SB=Salomonseilanden
 LocaleNames/nl/SC=Seychellen
 LocaleNames/nl/SD=Soedan
 LocaleNames/nl/SE=Zweden
 LocaleNames/nl/SG=Singapore
 LocaleNames/nl/SH=Sint-Helena
-LocaleNames/nl/SI=Sloveni\u00eb
+LocaleNames/nl/SI=Slovenië
 LocaleNames/nl/SJ=Spitsbergen en Jan Mayen
 LocaleNames/nl/SK=Slowakije
 LocaleNames/nl/SL=Sierra Leone
 LocaleNames/nl/SM=San Marino
 LocaleNames/nl/SN=Senegal
-LocaleNames/nl/SO=Somali\u00eb
+LocaleNames/nl/SO=Somalië
 LocaleNames/nl/SR=Suriname
-LocaleNames/nl/ST=Sao Tom\u00e9 en Principe
+LocaleNames/nl/ST=Sao Tomé en Principe
 LocaleNames/nl/SV=El Salvador
-LocaleNames/nl/SY=Syri\u00eb
+LocaleNames/nl/SY=Syrië
 LocaleNames/nl/SZ=Eswatini
 LocaleNames/nl/TC=Turks- en Caicoseilanden
 LocaleNames/nl/TD=Tsjaad
@@ -5759,14 +5759,14 @@ LocaleNames/nl/TJ=Tadzjikistan
 LocaleNames/nl/TK=Tokelau
 LocaleNames/nl/TL=Oost-Timor
 LocaleNames/nl/TM=Turkmenistan
-LocaleNames/nl/TN=Tunesi\u00eb
+LocaleNames/nl/TN=Tunesië
 LocaleNames/nl/TO=Tonga
 LocaleNames/nl/TR=Turkije
 LocaleNames/nl/TT=Trinidad en Tobago
 LocaleNames/nl/TV=Tuvalu
 LocaleNames/nl/TW=Taiwan
 LocaleNames/nl/TZ=Tanzania
-LocaleNames/nl/UA=Oekra\u00efne
+LocaleNames/nl/UA=Oekraïne
 LocaleNames/nl/UG=Oeganda
 LocaleNames/nl/UM=Kleine afgelegen eilanden van de Verenigde Staten
 LocaleNames/nl/US=Verenigde Staten
@@ -5800,18 +5800,18 @@ FormatData/sr-Latn-RS/MonthNames/8=septembar
 FormatData/sr-Latn/DayNames/1=ponedeljak
 FormatData/sr-Latn-BA/DayNames/2=utorak
 FormatData/sr-Latn-ME/DayNames/3=srijeda
-FormatData/sr-Latn-RS/DayNames/4=\u010detvrtak
+FormatData/sr-Latn-RS/DayNames/4=četvrtak
 #
 FormatData/sr-Latn/DayAbbreviations/1=pon
 FormatData/sr-Latn-BA/DayAbbreviations/2=uto
 FormatData/sr-Latn-ME/DayAbbreviations/3=srijeda
-FormatData/sr-Latn-RS/DayAbbreviations/4=\u010det
+FormatData/sr-Latn-RS/DayAbbreviations/4=čet
 #
-CurrencyNames/sr-Latn/EUR=\u20ac
-CurrencyNames/sr-Latn-BA/EUR=\u20ac
+CurrencyNames/sr-Latn/EUR=€
+CurrencyNames/sr-Latn-BA/EUR=€
 CurrencyNames/sr-Latn-BA/BAM=KM
-CurrencyNames/sr-Latn-ME/EUR=\u20ac
-CurrencyNames/sr-Latn-RS/EUR=\u20ac
+CurrencyNames/sr-Latn-ME/EUR=€
+CurrencyNames/sr-Latn-RS/EUR=€
 #
 FormatData/sr-Latn/TimePatterns/1=HH:mm:ss z
 FormatData/sr-Latn-BA/TimePatterns/2=HH:mm:ss
@@ -5820,81 +5820,81 @@ FormatData/sr-Latn-RS/DatePatterns/1=d. MMMM y.
 
 # bug 7019267
 CurrencyNames/pt/adp=Peseta de Andorra
-CurrencyNames/pt/aed=Dirham dos Emirados \u00c1rabes Unidos
-CurrencyNames/pt/afa=Afegane (1927\u20132002)
-CurrencyNames/pt/afn=Afegane afeg\u00e3o
-CurrencyNames/pt/all=Lek alban\u00eas
-CurrencyNames/pt/amd=Dram arm\u00eanio
+CurrencyNames/pt/aed=Dirham dos Emirados Árabes Unidos
+CurrencyNames/pt/afa=Afegane (1927–2002)
+CurrencyNames/pt/afn=Afegane afegão
+CurrencyNames/pt/all=Lek albanês
+CurrencyNames/pt/amd=Dram armênio
 CurrencyNames/pt/ang=Florim das Antilhas Holandesas
 CurrencyNames/pt/aoa=Kwanza angolano
 CurrencyNames/pt/ars=Peso argentino
-CurrencyNames/pt/ats=Xelim austr\u00edaco
-CurrencyNames/pt/aud=D\u00f3lar australiano
+CurrencyNames/pt/ats=Xelim austríaco
+CurrencyNames/pt/aud=Dólar australiano
 CurrencyNames/pt/awg=Florim arubano
-CurrencyNames/pt/azm=Manat azerbaijano (1993\u20132006)
+CurrencyNames/pt/azm=Manat azerbaijano (1993–2006)
 CurrencyNames/pt/azn=Manat azeri
-CurrencyNames/pt/bam=Marco convers\u00edvel da B\u00f3snia e Herzegovina
-CurrencyNames/pt/bbd=D\u00f3lar barbadense
+CurrencyNames/pt/bam=Marco conversível da Bósnia e Herzegovina
+CurrencyNames/pt/bbd=Dólar barbadense
 CurrencyNames/pt/bdt=Taka bengali
 CurrencyNames/pt/bef=Franco belga
-CurrencyNames/pt/bgl=Lev forte b\u00falgaro
-CurrencyNames/pt/bgn=Lev b\u00falgaro
+CurrencyNames/pt/bgl=Lev forte búlgaro
+CurrencyNames/pt/bgn=Lev búlgaro
 CurrencyNames/pt/bhd=Dinar bareinita
 CurrencyNames/pt/bif=Franco burundiano
-CurrencyNames/pt/bmd=D\u00f3lar bermudense
-CurrencyNames/pt/bnd=D\u00f3lar bruneano
+CurrencyNames/pt/bmd=Dólar bermudense
+CurrencyNames/pt/bnd=Dólar bruneano
 CurrencyNames/pt/bov=Mvdol boliviano
 CurrencyNames/pt/brl=Real brasileiro
-CurrencyNames/pt/bsd=D\u00f3lar bahamense
-CurrencyNames/pt/btn=Ngultrum butan\u00eas
+CurrencyNames/pt/bsd=Dólar bahamense
+CurrencyNames/pt/btn=Ngultrum butanês
 CurrencyNames/pt/bwp=Pula botsuanesa
-CurrencyNames/pt/byb=Rublo novo bielo-russo (1994\u20131999)
-CurrencyNames/pt/byr=Rublo bielorrusso (2000\u20132016)
-CurrencyNames/pt/bzd=D\u00f3lar belizenho
-CurrencyNames/pt/cad=D\u00f3lar canadense
-CurrencyNames/pt/cdf=Franco congol\u00eas
-CurrencyNames/pt/chf=Franco su\u00ed\u00e7o
+CurrencyNames/pt/byb=Rublo novo bielo-russo (1994–1999)
+CurrencyNames/pt/byr=Rublo bielorrusso (2000–2016)
+CurrencyNames/pt/bzd=Dólar belizenho
+CurrencyNames/pt/cad=Dólar canadense
+CurrencyNames/pt/cdf=Franco congolês
+CurrencyNames/pt/chf=Franco suíço
 CurrencyNames/pt/clf=Unidades de Fomento chilenas
 CurrencyNames/pt/clp=Peso chileno
-CurrencyNames/pt/cny=Yuan chin\u00eas
+CurrencyNames/pt/cny=Yuan chinês
 CurrencyNames/pt/cop=Peso colombiano
-CurrencyNames/pt/crc=Col\u00f3n costarriquenho
-CurrencyNames/pt/csd=Dinar s\u00e9rvio (2002\u20132006)
+CurrencyNames/pt/crc=Colón costarriquenho
+CurrencyNames/pt/csd=Dinar sérvio (2002–2006)
 CurrencyNames/pt/cup=Peso cubano
 CurrencyNames/pt/cve=Escudo cabo-verdiano
 CurrencyNames/pt/cyp=Libra cipriota
 CurrencyNames/pt/czk=Coroa tcheca
-CurrencyNames/pt/dem=Marco alem\u00e3o
+CurrencyNames/pt/dem=Marco alemão
 CurrencyNames/pt/djf=Franco djiboutiano
 CurrencyNames/pt/dkk=Coroa dinamarquesa
 CurrencyNames/pt/dop=Peso dominicano
 CurrencyNames/pt/dzd=Dinar argelino
 CurrencyNames/pt/eek=Coroa estoniana
-CurrencyNames/pt/egp=Libra eg\u00edpcia
+CurrencyNames/pt/egp=Libra egípcia
 CurrencyNames/pt/ern=Nakfa da Eritreia
 CurrencyNames/pt/esp=Peseta espanhola
-CurrencyNames/pt/etb=Birr et\u00edope
+CurrencyNames/pt/etb=Birr etíope
 CurrencyNames/pt/fim=Marca finlandesa
-CurrencyNames/pt/fjd=D\u00f3lar fijiano
+CurrencyNames/pt/fjd=Dólar fijiano
 CurrencyNames/pt/fkp=Libra malvinense
-CurrencyNames/pt/frf=Franco franc\u00eas
+CurrencyNames/pt/frf=Franco francês
 CurrencyNames/pt/gbp=Libra esterlina
 CurrencyNames/pt/gel=Lari georgiano
-CurrencyNames/pt/ghc=Cedi de Gana (1979\u20132007)
-CurrencyNames/pt/ghs=Cedi gan\u00eas
+CurrencyNames/pt/ghc=Cedi de Gana (1979–2007)
+CurrencyNames/pt/ghs=Cedi ganês
 CurrencyNames/pt/gip=Libra de Gibraltar
 CurrencyNames/pt/gmd=Dalasi gambiano
 CurrencyNames/pt/gnf=Franco guineano
 CurrencyNames/pt/grd=Dracma grego
 CurrencyNames/pt/gtq=Quetzal guatemalteco
-CurrencyNames/pt/gwp=Peso da Guin\u00e9-Bissau
-CurrencyNames/pt/gyd=D\u00f3lar guianense
-CurrencyNames/pt/hkd=D\u00f3lar de Hong Kong
+CurrencyNames/pt/gwp=Peso da Guiné-Bissau
+CurrencyNames/pt/gyd=Dólar guianense
+CurrencyNames/pt/hkd=Dólar de Hong Kong
 CurrencyNames/pt/hnl=Lempira hondurenha
 CurrencyNames/pt/hrk=Kuna croata
 CurrencyNames/pt/htg=Gourde haitiano
-CurrencyNames/pt/huf=Florim h\u00fangaro
-CurrencyNames/pt/idr=Rupia indon\u00e9sia
+CurrencyNames/pt/huf=Florim húngaro
+CurrencyNames/pt/idr=Rupia indonésia
 CurrencyNames/pt/iep=Libra irlandesa
 CurrencyNames/pt/ils=Novo shekel israelense
 CurrencyNames/pt/inr=Rupia indiana
@@ -5902,9 +5902,9 @@ CurrencyNames/pt/iqd=Dinar iraquiano
 CurrencyNames/pt/irr=Rial iraniano
 CurrencyNames/pt/isk=Coroa islandesa
 CurrencyNames/pt/itl=Lira italiana
-CurrencyNames/pt/jmd=D\u00f3lar jamaicano
+CurrencyNames/pt/jmd=Dólar jamaicano
 CurrencyNames/pt/jod=Dinar jordaniano
-CurrencyNames/pt/jpy=Iene japon\u00eas
+CurrencyNames/pt/jpy=Iene japonês
 CurrencyNames/pt/kes=Xelim queniano
 CurrencyNames/pt/kgs=Som quirguiz
 CurrencyNames/pt/khr=Riel cambojano
@@ -5912,26 +5912,26 @@ CurrencyNames/pt/kmf=Franco comoriano
 CurrencyNames/pt/kpw=Won norte-coreano
 CurrencyNames/pt/krw=Won sul-coreano
 CurrencyNames/pt/kwd=Dinar kuwaitiano
-CurrencyNames/pt/kyd=D\u00f3lar das Ilhas Cayman
+CurrencyNames/pt/kyd=Dólar das Ilhas Cayman
 CurrencyNames/pt/kzt=Tenge cazaque
 CurrencyNames/pt/lak=Kip laosiano
 CurrencyNames/pt/lbp=Libra libanesa
 CurrencyNames/pt/lkr=Rupia cingalesa
-CurrencyNames/pt/lrd=D\u00f3lar liberiano
+CurrencyNames/pt/lrd=Dólar liberiano
 CurrencyNames/pt/lsl=Loti lesotiano
 CurrencyNames/pt/ltl=Litas lituano
-CurrencyNames/pt/luf=Franco luxemburgu\u00eas
-CurrencyNames/pt/lvl=Lats let\u00e3o
-CurrencyNames/pt/lyd=Dinar l\u00edbio
+CurrencyNames/pt/luf=Franco luxemburguês
+CurrencyNames/pt/lvl=Lats letão
+CurrencyNames/pt/lyd=Dinar líbio
 CurrencyNames/pt/mad=Dirham marroquino
-CurrencyNames/pt/mdl=Leu mold\u00e1vio
+CurrencyNames/pt/mdl=Leu moldávio
 CurrencyNames/pt/mga=Ariary malgaxe
 CurrencyNames/pt/mgf=Franco de Madagascar
-CurrencyNames/pt/mkd=Dinar maced\u00f4nio
+CurrencyNames/pt/mkd=Dinar macedônio
 CurrencyNames/pt/mmk=Quiate mianmarense
 CurrencyNames/pt/mnt=Tugrik mongol
 CurrencyNames/pt/mop=Pataca macaense
-CurrencyNames/pt/mro=Ouguiya mauritana (1973\u20132017)
+CurrencyNames/pt/mro=Ouguiya mauritana (1973–2017)
 CurrencyNames/pt/mtl=Lira maltesa
 CurrencyNames/pt/mur=Rupia mauriciana
 CurrencyNames/pt/mvr=Rupia maldivana
@@ -5939,69 +5939,69 @@ CurrencyNames/pt/mwk=Kwacha malauiana
 CurrencyNames/pt/mxn=Peso mexicano
 CurrencyNames/pt/mxv=Unidade Mexicana de Investimento (UDI)
 CurrencyNames/pt/myr=Ringgit malaio
-CurrencyNames/pt/mzm=Metical de Mo\u00e7ambique (1980\u20132006)
-CurrencyNames/pt/mzn=Metical mo\u00e7ambicano
-CurrencyNames/pt/nad=D\u00f3lar namibiano
+CurrencyNames/pt/mzm=Metical de Moçambique (1980–2006)
+CurrencyNames/pt/mzn=Metical moçambicano
+CurrencyNames/pt/nad=Dólar namibiano
 CurrencyNames/pt/ngn=Naira nigeriana
-CurrencyNames/pt/nio=C\u00f3rdoba nicaraguense
-CurrencyNames/pt/nlg=Florim holand\u00eas
+CurrencyNames/pt/nio=Córdoba nicaraguense
+CurrencyNames/pt/nlg=Florim holandês
 CurrencyNames/pt/nok=Coroa norueguesa
 CurrencyNames/pt/npr=Rupia nepalesa
-CurrencyNames/pt/nzd=D\u00f3lar neozeland\u00eas
+CurrencyNames/pt/nzd=Dólar neozelandês
 CurrencyNames/pt/omr=Rial omanense
 CurrencyNames/pt/pab=Balboa panamenho
 CurrencyNames/pt/pen=Novo sol peruano
-CurrencyNames/pt/pgk=Kina papu\u00e1sia
+CurrencyNames/pt/pgk=Kina papuásia
 CurrencyNames/pt/php=Peso filipino
 CurrencyNames/pt/pkr=Rupia paquistanesa
-CurrencyNames/pt/pln=Zloty polon\u00eas
-CurrencyNames/pt/pte=Escudo portugu\u00eas
+CurrencyNames/pt/pln=Zloty polonês
+CurrencyNames/pt/pte=Escudo português
 CurrencyNames/pt/pyg=Guarani paraguaio
 CurrencyNames/pt/qar=Rial catariano
-CurrencyNames/pt/rol=Leu romeno (1952\u20132006)
+CurrencyNames/pt/rol=Leu romeno (1952–2006)
 CurrencyNames/pt/ron=Leu romeno
-CurrencyNames/pt/rsd=Dinar s\u00e9rvio
+CurrencyNames/pt/rsd=Dinar sérvio
 CurrencyNames/pt/rub=Rublo russo
-CurrencyNames/pt/rur=Rublo russo (1991\u20131998)
-CurrencyNames/pt/rwf=Franco ruand\u00eas
+CurrencyNames/pt/rur=Rublo russo (1991–1998)
+CurrencyNames/pt/rwf=Franco ruandês
 CurrencyNames/pt/sar=Riyal saudita
-CurrencyNames/pt/sbd=D\u00f3lar das Ilhas Salom\u00e3o
+CurrencyNames/pt/sbd=Dólar das Ilhas Salomão
 CurrencyNames/pt/scr=Rupia seichelense
-CurrencyNames/pt/sdd=Dinar sudan\u00eas (1992\u20132007)
+CurrencyNames/pt/sdd=Dinar sudanês (1992–2007)
 CurrencyNames/pt/sdg=Libra sudanesa
 CurrencyNames/pt/sek=Coroa sueca
-CurrencyNames/pt/sgd=D\u00f3lar singapuriano
+CurrencyNames/pt/sgd=Dólar singapuriano
 CurrencyNames/pt/shp=Libra de Santa Helena
 CurrencyNames/pt/sit=Tolar Bons esloveno
 CurrencyNames/pt/skk=Coroa eslovaca
-CurrencyNames/pt/sll=Leone de Serra Leoa (1964\u20142022)
+CurrencyNames/pt/sll=Leone de Serra Leoa (1964—2022)
 CurrencyNames/pt/sos=Xelim somali
-CurrencyNames/pt/srd=D\u00f3lar surinam\u00eas
+CurrencyNames/pt/srd=Dólar surinamês
 CurrencyNames/pt/srg=Florim do Suriname
-CurrencyNames/pt/std=Dobra de S\u00e3o Tom\u00e9 e Pr\u00edncipe (1977\u20132017)
+CurrencyNames/pt/std=Dobra de São Tomé e Príncipe (1977–2017)
 CurrencyNames/pt/svc=Colom salvadorenho
-CurrencyNames/pt/syp=Libra s\u00edria
+CurrencyNames/pt/syp=Libra síria
 CurrencyNames/pt/szl=Lilangeni suazi
-CurrencyNames/pt/thb=Baht tailand\u00eas
+CurrencyNames/pt/thb=Baht tailandês
 CurrencyNames/pt/tjs=Somoni tadjique
-CurrencyNames/pt/tmm=Manat do Turcomenist\u00e3o (1993\u20132009)
+CurrencyNames/pt/tmm=Manat do Turcomenistão (1993–2009)
 CurrencyNames/pt/tnd=Dinar tunisiano
-CurrencyNames/pt/top=Pa\u02bbanga tonganesa
+CurrencyNames/pt/top=Paʻanga tonganesa
 CurrencyNames/pt/tpe=Escudo timorense
-CurrencyNames/pt/trl=Lira turca (1922\u20132005)
+CurrencyNames/pt/trl=Lira turca (1922–2005)
 CurrencyNames/pt/try=Lira turca
-CurrencyNames/pt/ttd=D\u00f3lar de Trinidad e Tobago
-CurrencyNames/pt/twd=Novo d\u00f3lar taiwan\u00eas
+CurrencyNames/pt/ttd=Dólar de Trinidad e Tobago
+CurrencyNames/pt/twd=Novo dólar taiwanês
 CurrencyNames/pt/tzs=Xelim tanzaniano
 CurrencyNames/pt/uah=Hryvnia ucraniano
 CurrencyNames/pt/ugx=Xelim ugandense
-CurrencyNames/pt/usd=D\u00f3lar americano
-CurrencyNames/pt/usn=D\u00f3lar norte-americano (Dia seguinte)
-CurrencyNames/pt/uss=D\u00f3lar norte-americano (Mesmo dia)
+CurrencyNames/pt/usd=Dólar americano
+CurrencyNames/pt/usn=Dólar norte-americano (Dia seguinte)
+CurrencyNames/pt/uss=Dólar norte-americano (Mesmo dia)
 CurrencyNames/pt/uyu=Peso uruguaio
 CurrencyNames/pt/uzs=Som uzbeque
-CurrencyNames/pt/veb=Bol\u00edvar venezuelano (1871\u20132008)
-CurrencyNames/pt/vef=Bol\u00edvar venezuelano (2008\u20132018)
+CurrencyNames/pt/veb=Bolívar venezuelano (1871–2008)
+CurrencyNames/pt/vef=Bolívar venezuelano (2008–2018)
 CurrencyNames/pt/vnd=Dong vietnamita
 CurrencyNames/pt/vuv=Vatu de Vanuatu
 CurrencyNames/pt/wst=Tala samoano
@@ -6009,35 +6009,35 @@ CurrencyNames/pt/xaf=Franco CFA de BEAC
 CurrencyNames/pt/xag=Prata
 CurrencyNames/pt/xau=Ouro
 CurrencyNames/pt/xba=Unidade Composta Europeia
-CurrencyNames/pt/xbb=Unidade Monet\u00e1ria Europeia
+CurrencyNames/pt/xbb=Unidade Monetária Europeia
 CurrencyNames/pt/xbc=Unidade de Conta Europeia (XBC)
 CurrencyNames/pt/xbd=Unidade de Conta Europeia (XBD)
-CurrencyNames/pt/xcd=D\u00f3lar do Caribe Oriental
+CurrencyNames/pt/xcd=Dólar do Caribe Oriental
 CurrencyNames/pt/xdr=Direitos Especiais de Giro
-CurrencyNames/pt/xfo=Franco-ouro franc\u00eas
-CurrencyNames/pt/xfu=Franco UIC franc\u00eas
+CurrencyNames/pt/xfo=Franco-ouro francês
+CurrencyNames/pt/xfu=Franco UIC francês
 CurrencyNames/pt/xof=Franco CFA de BCEAO
-CurrencyNames/pt/xpd=Pal\u00e1dio
+CurrencyNames/pt/xpd=Paládio
 CurrencyNames/pt/xpf=Franco CFP
 CurrencyNames/pt/xpt=Platina
-CurrencyNames/pt/xts=C\u00f3digo de Moeda de Teste
+CurrencyNames/pt/xts=Código de Moeda de Teste
 CurrencyNames/pt/xxx=Moeda desconhecida
 CurrencyNames/pt/yer=Rial iemenita
-CurrencyNames/pt/yum=Dinar noviy iugoslavo (1994\u20132002)
+CurrencyNames/pt/yum=Dinar noviy iugoslavo (1994–2002)
 CurrencyNames/pt/zar=Rand sul-africano
-CurrencyNames/pt/zmk=Cuacha zambiano (1968\u20132012)
-CurrencyNames/pt/zwd=D\u00f3lar do Zimb\u00e1bue (1980\u20132008)
+CurrencyNames/pt/zmk=Cuacha zambiano (1968–2012)
+CurrencyNames/pt/zwd=Dólar do Zimbábue (1980–2008)
 
 # bug 7025837
-CurrencyNames/sr-Latn-BA/bam=Bosanskohercegova\u010dka konvertibilna marka
+CurrencyNames/sr-Latn-BA/bam=Bosanskohercegovačka konvertibilna marka
 CurrencyNames/sr-Latn-BA/eur=evro
 CurrencyNames/sr-Latn-ME/eur=evro
 CurrencyNames/sr-Latn-RS/rsd=srpski dinar
 
 # bug 7020583
-CurrencyNames/de/azm=Aserbaidschan-Manat (1993\u20132006)
+CurrencyNames/de/azm=Aserbaidschan-Manat (1993–2006)
 CurrencyNames/de/azn=Aserbaidschan-Manat
-CurrencyNames/de/csd=Serbischer Dinar (2002\u20132006)
+CurrencyNames/de/csd=Serbischer Dinar (2002–2006)
 CurrencyNames/de/cyp=Zypern-Pfund
 CurrencyNames/de/esp=Spanische Peseta
 CurrencyNames/de/fjd=Fidschi-Dollar
@@ -6052,11 +6052,11 @@ CurrencyNames/de/jmd=Jamaika-Dollar
 CurrencyNames/de/kes=Kenia-Schilling
 CurrencyNames/de/mgf=Madagaskar-Franc
 CurrencyNames/de/mur=Mauritius-Rupie
-CurrencyNames/de/mzm=Mosambikanischer Metical (1980\u20132006)
+CurrencyNames/de/mzm=Mosambikanischer Metical (1980–2006)
 CurrencyNames/de/mzn=Mosambikanischer Metical
 CurrencyNames/de/nad=Namibia-Dollar
 CurrencyNames/de/nzd=Neuseeland-Dollar
-CurrencyNames/de/ron=Rum\u00e4nischer Leu
+CurrencyNames/de/ron=Rumänischer Leu
 CurrencyNames/de/rsd=Serbischer Dinar
 CurrencyNames/de/rwf=Ruanda-Franc
 CurrencyNames/de/sbd=Salomonen-Dollar
@@ -6066,226 +6066,226 @@ CurrencyNames/de/sgd=Singapur-Dollar
 CurrencyNames/de/sos=Somalia-Schilling
 CurrencyNames/de/srd=Suriname-Dollar
 CurrencyNames/de/tpe=Timor-Escudo
-CurrencyNames/de/trl=T\u00fcrkische Lira (1922\u20132005)
-CurrencyNames/de/try=T\u00fcrkische Lira
+CurrencyNames/de/trl=Türkische Lira (1922–2005)
+CurrencyNames/de/try=Türkische Lira
 CurrencyNames/de/ttd=Trinidad-und-Tobago-Dollar
 CurrencyNames/de/twd=Neuer Taiwan-Dollar
 CurrencyNames/de/tzs=Tansania-Schilling
 CurrencyNames/de/ugx=Uganda-Schilling
 CurrencyNames/de/usd=US-Dollar
-CurrencyNames/de/vef=Venezolanischer Bol\u00edvar (2008\u20132018)
+CurrencyNames/de/vef=Venezolanischer Bolívar (2008–2018)
 CurrencyNames/de/xag=Unze Silber
 CurrencyNames/de/xau=Unze Gold
-CurrencyNames/de/xbb=Europ\u00e4ische W\u00e4hrungseinheit (XBB)
+CurrencyNames/de/xbb=Europäische Währungseinheit (XBB)
 CurrencyNames/de/xpd=Unze Palladium
 CurrencyNames/de/xpt=Unze Platin
-CurrencyNames/de/xts=Testw\u00e4hrung
-CurrencyNames/de/xxx=Unbekannte W\u00e4hrung
+CurrencyNames/de/xts=Testwährung
+CurrencyNames/de/xxx=Unbekannte Währung
 CurrencyNames/de/yer=Jemen-Rial
-CurrencyNames/de/zar=S\u00fcdafrikanischer Rand
-CurrencyNames/de/zwd=Simbabwe-Dollar (1980\u20132008)
+CurrencyNames/de/zar=Südafrikanischer Rand
+CurrencyNames/de/zwd=Simbabwe-Dollar (1980–2008)
 
-CurrencyNames/es/aed=d\u00edrham de los Emiratos \u00c1rabes Unidos
-CurrencyNames/es/azm=manat azer\u00ed (1993\u20132006)
+CurrencyNames/es/aed=dírham de los Emiratos Árabes Unidos
+CurrencyNames/es/azm=manat azerí (1993–2006)
 CurrencyNames/es/azn=manat azerbaiyano
 CurrencyNames/es/csd=antiguo dinar serbio
-CurrencyNames/es/ghc=cedi ghan\u00e9s (1979\u20132007)
-CurrencyNames/es/ghs=cedi ghan\u00e9s
-CurrencyNames/es/mzm=antiguo metical mozambique\u00f1o
-CurrencyNames/es/mzn=metical mozambique\u00f1o
+CurrencyNames/es/ghc=cedi ghanés (1979–2007)
+CurrencyNames/es/ghs=cedi ghanés
+CurrencyNames/es/mzm=antiguo metical mozambiqueño
+CurrencyNames/es/mzn=metical mozambiqueño
 CurrencyNames/es/rsd=dinar serbio
 CurrencyNames/es/sdg=libra sudanesa
-CurrencyNames/es/trl=lira turca (1922\u20132005)
-CurrencyNames/es/vef=bol\u00edvar venezolano (2008\u20132018)
+CurrencyNames/es/trl=lira turca (1922–2005)
+CurrencyNames/es/vef=bolívar venezolano (2008–2018)
 
-CurrencyNames/fr/afa=afghani (1927\u20132002)
+CurrencyNames/fr/afa=afghani (1927–2002)
 CurrencyNames/fr/all=lek albanais
 CurrencyNames/fr/ang=florin antillais
 CurrencyNames/fr/awg=florin arubais
-CurrencyNames/fr/azm=manat az\u00e9ri (1993\u20132006)
-CurrencyNames/fr/azn=manat az\u00e9ri
+CurrencyNames/fr/azm=manat azéri (1993–2006)
+CurrencyNames/fr/azn=manat azéri
 CurrencyNames/fr/bam=mark convertible bosniaque
 CurrencyNames/fr/bbd=dollar barbadien
 CurrencyNames/fr/bdt=taka bangladeshi
-CurrencyNames/fr/bgl=lev bulgare (1962\u20131999)
+CurrencyNames/fr/bgl=lev bulgare (1962–1999)
 CurrencyNames/fr/bgn=lev bulgare
-CurrencyNames/fr/bhd=dinar bahre\u00efni
+CurrencyNames/fr/bhd=dinar bahreïni
 CurrencyNames/fr/bif=franc burundais
 CurrencyNames/fr/bmd=dollar bermudien
-CurrencyNames/fr/bnd=dollar brun\u00e9ien
+CurrencyNames/fr/bnd=dollar brunéien
 CurrencyNames/fr/bov=mvdol bolivien
-CurrencyNames/fr/brl=r\u00e9al br\u00e9silien
-CurrencyNames/fr/bsd=dollar baham\u00e9en
+CurrencyNames/fr/brl=réal brésilien
+CurrencyNames/fr/bsd=dollar bahaméen
 CurrencyNames/fr/btn=ngultrum bouthanais
 CurrencyNames/fr/bwp=pula botswanais
-CurrencyNames/fr/bzd=dollar b\u00e9liz\u00e9en
+CurrencyNames/fr/bzd=dollar bélizéen
 CurrencyNames/fr/cny=yuan renminbi chinois
-CurrencyNames/fr/crc=col\u00f3n costaricain
-CurrencyNames/fr/csd=dinar serbo-mont\u00e9n\u00e9grin
+CurrencyNames/fr/crc=colón costaricain
+CurrencyNames/fr/csd=dinar serbo-monténégrin
 CurrencyNames/fr/cve=escudo capverdien
 CurrencyNames/fr/cyp=livre chypriote
 CurrencyNames/fr/dem=mark allemand
 CurrencyNames/fr/djf=franc djiboutien
-CurrencyNames/fr/ern=nafka \u00e9rythr\u00e9en
-CurrencyNames/fr/etb=birr \u00e9thiopien
+CurrencyNames/fr/ern=nafka érythréen
+CurrencyNames/fr/etb=birr éthiopien
 CurrencyNames/fr/fjd=dollar fidjien
-CurrencyNames/fr/fkp=livre des \u00eeles Malouines
-CurrencyNames/fr/gel=lari g\u00e9orgien
-CurrencyNames/fr/ghs=c\u00e9di ghan\u00e9en
+CurrencyNames/fr/fkp=livre des îles Malouines
+CurrencyNames/fr/gel=lari géorgien
+CurrencyNames/fr/ghs=cédi ghanéen
 CurrencyNames/fr/gmd=dalasi gambien
 CurrencyNames/fr/grd=drachme grecque
-CurrencyNames/fr/gtq=quetzal guat\u00e9malt\u00e8que
-CurrencyNames/fr/gwp=peso bissau-guin\u00e9en
+CurrencyNames/fr/gtq=quetzal guatémaltèque
+CurrencyNames/fr/gwp=peso bissau-guinéen
 CurrencyNames/fr/hnl=lempira hondurien
 CurrencyNames/fr/hrk=kuna croate
-CurrencyNames/fr/htg=gourde ha\u00eftienne
+CurrencyNames/fr/htg=gourde haïtienne
 CurrencyNames/fr/huf=forint hongrois
-CurrencyNames/fr/idr=roupie indon\u00e9sienne
-CurrencyNames/fr/ils=nouveau shekel isra\u00e9lien
+CurrencyNames/fr/idr=roupie indonésienne
+CurrencyNames/fr/ils=nouveau shekel israélien
 CurrencyNames/fr/iqd=dinar irakien
 CurrencyNames/fr/jpy=yen japonais
-CurrencyNames/fr/kes=shilling k\u00e9nyan
+CurrencyNames/fr/kes=shilling kényan
 CurrencyNames/fr/kgs=som kirghize
 CurrencyNames/fr/khr=riel cambodgien
 CurrencyNames/fr/kmf=franc comorien
-CurrencyNames/fr/kwd=dinar kowe\u00eftien
+CurrencyNames/fr/kwd=dinar koweïtien
 CurrencyNames/fr/kzt=tenge kazakh
 CurrencyNames/fr/lak=kip laotien
 CurrencyNames/fr/lkr=roupie srilankaise
 CurrencyNames/fr/lsl=loti lesothan
 CurrencyNames/fr/mga=ariary malgache
-CurrencyNames/fr/mkd=denar mac\u00e9donien
+CurrencyNames/fr/mkd=denar macédonien
 CurrencyNames/fr/mmk=kyat myanmarais
 CurrencyNames/fr/mnt=tugrik mongol
 CurrencyNames/fr/mop=pataca macanaise
-CurrencyNames/fr/mro=ouguiya mauritanien (1973\u20132017)
+CurrencyNames/fr/mro=ouguiya mauritanien (1973–2017)
 CurrencyNames/fr/mvr=rufiyaa maldivienne
 CurrencyNames/fr/mwk=kwacha malawite
 CurrencyNames/fr/myr=ringgit malais
 CurrencyNames/fr/mzn=metical mozambicain
-CurrencyNames/fr/ngn=naira nig\u00e9rian
-CurrencyNames/fr/nio=c\u00f3rdoba oro nicaraguayen
-CurrencyNames/fr/npr=roupie n\u00e9palaise
-CurrencyNames/fr/pab=balboa panam\u00e9en
-CurrencyNames/fr/pgk=kina papouan-n\u00e9o-guin\u00e9en
+CurrencyNames/fr/ngn=naira nigérian
+CurrencyNames/fr/nio=córdoba oro nicaraguayen
+CurrencyNames/fr/npr=roupie népalaise
+CurrencyNames/fr/pab=balboa panaméen
+CurrencyNames/fr/pgk=kina papouan-néo-guinéen
 CurrencyNames/fr/pkr=roupie pakistanaise
 CurrencyNames/fr/pln=zloty polonais
-CurrencyNames/fr/pyg=guaran\u00ed paraguayen
+CurrencyNames/fr/pyg=guaraní paraguayen
 CurrencyNames/fr/qar=riyal qatari
 CurrencyNames/fr/ron=leu roumain
 CurrencyNames/fr/rsd=dinar serbe
 CurrencyNames/fr/rub=rouble russe
-CurrencyNames/fr/rur=rouble russe (1991\u20131998)
-CurrencyNames/fr/sbd=dollar des \u00eeles Salomon
+CurrencyNames/fr/rur=rouble russe (1991–1998)
+CurrencyNames/fr/sbd=dollar des îles Salomon
 CurrencyNames/fr/sdg=livre soudanaise
-CurrencyNames/fr/sit=tolar slov\u00e8ne
-CurrencyNames/fr/sll=leone sierra-l\u00e9onais (1964\u20142022)
+CurrencyNames/fr/sit=tolar slovène
+CurrencyNames/fr/sll=leone sierra-léonais (1964—2022)
 CurrencyNames/fr/sos=shilling somalien
 CurrencyNames/fr/srg=florin surinamais
-CurrencyNames/fr/std=dobra santom\u00e9en (1977\u20132017)
-CurrencyNames/fr/svc=col\u00f3n salvadorien
+CurrencyNames/fr/std=dobra santoméen (1977–2017)
+CurrencyNames/fr/svc=colón salvadorien
 CurrencyNames/fr/szl=lilangeni swazi
-CurrencyNames/fr/thb=baht tha\u00eflandais
+CurrencyNames/fr/thb=baht thaïlandais
 CurrencyNames/fr/tjs=somoni tadjik
-CurrencyNames/fr/tmm=manat turkm\u00e8ne
-CurrencyNames/fr/top=pa\u2019anga tongan
+CurrencyNames/fr/tmm=manat turkmène
+CurrencyNames/fr/top=pa’anga tongan
 CurrencyNames/fr/tpe=escudo timorais
-CurrencyNames/fr/ttd=dollar de Trinit\u00e9-et-Tobago
-CurrencyNames/fr/twd=nouveau dollar ta\u00efwanais
+CurrencyNames/fr/ttd=dollar de Trinité-et-Tobago
+CurrencyNames/fr/twd=nouveau dollar taïwanais
 CurrencyNames/fr/tzs=shilling tanzanien
 CurrencyNames/fr/uah=hryvnia ukrainienne
 CurrencyNames/fr/uzs=sum ouzbek
-CurrencyNames/fr/vef=bolivar v\u00e9n\u00e9zu\u00e9lien (2008\u20132018)
-CurrencyNames/fr/vnd=d\u00f4ng vietnamien
+CurrencyNames/fr/vef=bolivar vénézuélien (2008–2018)
+CurrencyNames/fr/vnd=dông vietnamien
 CurrencyNames/fr/vuv=vatu vanuatuan
 CurrencyNames/fr/wst=tala samoan
 CurrencyNames/fr/xts=(devise de test)
 CurrencyNames/fr/xxx=devise inconnue ou non valide
-CurrencyNames/fr/yer=riyal y\u00e9m\u00e9nite
+CurrencyNames/fr/yer=riyal yéménite
 CurrencyNames/fr/zar=rand sud-africain
-CurrencyNames/fr/zmk=kwacha zambien (1968\u20132012)
-CurrencyNames/fr/zwd=dollar zimbabw\u00e9en
+CurrencyNames/fr/zmk=kwacha zambien (1968–2012)
+CurrencyNames/fr/zwd=dollar zimbabwéen
 
-CurrencyNames/it/azm=manat azero (1993\u20132006)
+CurrencyNames/it/azm=manat azero (1993–2006)
 CurrencyNames/it/ghs=cedi ghanese
 CurrencyNames/it/iep=sterlina irlandese
 CurrencyNames/it/mzn=metical mozambicano
 CurrencyNames/it/rsd=dinaro serbo
 CurrencyNames/it/sdg=sterlina sudanese
 CurrencyNames/it/srd=dollaro del Suriname
-CurrencyNames/it/vef=bol\u00edvar venezuelano (2008\u20132018)
+CurrencyNames/it/vef=bolívar venezuelano (2008–2018)
 CurrencyNames/it/xag=argento
 CurrencyNames/it/xpd=palladio
 
-CurrencyNames/ja/azm=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8 (1993\u20132006)
-CurrencyNames/ja/azn=\u30a2\u30bc\u30eb\u30d0\u30a4\u30b8\u30e3\u30f3 \u30de\u30ca\u30c8
-CurrencyNames/ja/ghc=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3 (1979\u20132007)
-CurrencyNames/ja/ghs=\u30ac\u30fc\u30ca \u30bb\u30c7\u30a3
-CurrencyNames/ja/mzn=\u30e2\u30b6\u30f3\u30d3\u30fc\u30af \u30e1\u30c6\u30a3\u30ab\u30eb
-CurrencyNames/ja/rol=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4 (1952\u20132006)
-CurrencyNames/ja/ron=\u30eb\u30fc\u30de\u30cb\u30a2 \u30ec\u30a4
-CurrencyNames/ja/rsd=\u30bb\u30eb\u30d3\u30a2 \u30c7\u30a3\u30ca\u30fc\u30eb
-CurrencyNames/ja/sdg=\u30b9\u30fc\u30c0\u30f3 \u30dd\u30f3\u30c9
-CurrencyNames/ja/srd=\u30b9\u30ea\u30ca\u30e0 \u30c9\u30eb
-CurrencyNames/ja/vef=\u30d9\u30cd\u30ba\u30a8\u30e9 \u30dc\u30ea\u30d0\u30eb (2008\u20132018)
-CurrencyNames/ja/xag=\u9280
-CurrencyNames/ja/xpd=\u30d1\u30e9\u30b8\u30a6\u30e0
-CurrencyNames/ja/xpt=\u30d7\u30e9\u30c1\u30ca
-CurrencyNames/ja/xts=\u30c6\u30b9\u30c8\u7528\u901a\u8ca8\u30b3\u30fc\u30c9
-CurrencyNames/ja/xxx=\u4e0d\u660e\u307e\u305f\u306f\u7121\u52b9\u306a\u901a\u8ca8
-CurrencyNames/ja/zmk=\u30b6\u30f3\u30d3\u30a2 \u30af\u30ef\u30c1\u30e3 (1968\u20132012)
-
-CurrencyNames/ko/aed=\uc544\ub78d\uc5d0\ubbf8\ub9ac\ud2b8 \ub514\ub974\ud568
-CurrencyNames/ko/ang=\ub124\ub35c\ub780\ub4dc\ub839 \uc548\ud2f8\ub808\uc2a4 \uae38\ub354
-CurrencyNames/ko/azm=\uc544\uc81c\ub974\ubc14\uc774\uc820 \ub9c8\ub098\ud2b8(1993\u20132006)
-CurrencyNames/ko/azn=\uc544\uc81c\ub974\ubc14\uc774\uc794 \ub9c8\ub098\ud2b8
-CurrencyNames/ko/bov=\ubcfc\ub9ac\ube44\uc544\ub178 Mvdol(\uae30\uae08)
-CurrencyNames/ko/chf=\uc2a4\uc704\uc2a4 \ud504\ub791
-CurrencyNames/ko/clf=\uce60\ub808 (UF)
-CurrencyNames/ko/csd=\uace0 \uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-CurrencyNames/ko/ghc=\uac00\ub098 \uc2dc\ub514 (1979\u20132007)
-CurrencyNames/ko/ghs=\uac00\ub098 \uc138\ub514
-CurrencyNames/ko/mxv=\uba55\uc2dc\ucf54 (UDI)
-CurrencyNames/ko/myr=\ub9d0\ub808\uc774\uc2dc\uc544 \ub9c1\uae43
-CurrencyNames/ko/mzm=\uace0 \ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-CurrencyNames/ko/mzn=\ubaa8\uc7a0\ube44\ud06c \uba54\ud2f0\uce7c
-CurrencyNames/ko/ron=\ub8e8\ub9c8\ub2c8\uc544 \ub808\uc6b0
-CurrencyNames/ko/rsd=\uc138\ub974\ube44\uc544 \ub514\ub098\ub974
-CurrencyNames/ko/sdg=\uc218\ub2e8 \ud30c\uc6b4\ub4dc
-CurrencyNames/ko/srd=\uc218\ub9ac\ub0a8 \ub2ec\ub7ec
-CurrencyNames/ko/top=\ud1b5\uac00 \ud30c\uc559\uac00
-CurrencyNames/ko/trl=\ud130\ud0a4 \ub9ac\ub77c(1922~2005)
-CurrencyNames/ko/try=\ud280\ub974\ud0a4\uc608 \ub9ac\ub77c
-CurrencyNames/ko/usn=\ubbf8\uad6d \ub2ec\ub7ec(\ub2e4\uc74c\ub0a0)
-CurrencyNames/ko/uss=\ubbf8\uad6d \ub2ec\ub7ec(\ub2f9\uc77c)
-CurrencyNames/ko/vef=\ubca0\ub124\uc218\uc5d8\ub77c \ubcfc\ub9ac\ubc14\ub974 (2008\u20132018)
-CurrencyNames/ko/xaf=\uc911\uc559\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-CurrencyNames/ko/xag=\uc740\ud654
-CurrencyNames/ko/xba=\uc720\ub974\ucf54 (\uc720\ub7fd \ud68c\uacc4 \ub2e8\uc704)
-CurrencyNames/ko/xbb=\uc720\ub7fd \ud1b5\ud654 \ub3d9\ub9f9
-CurrencyNames/ko/xbc=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBC)
-CurrencyNames/ko/xbd=\uc720\ub7fd \uacc4\uc0b0 \ub2e8\uc704 (XBD)
-CurrencyNames/ko/xof=\uc11c\uc544\ud504\ub9ac\uce74 CFA \ud504\ub791
-CurrencyNames/ko/xpd=\ud314\ub77c\ub4d0
-CurrencyNames/ko/xpf=CFP \ud504\ub791
-CurrencyNames/ko/xpt=\ubc31\uae08
-CurrencyNames/ko/xts=\ud14c\uc2a4\ud2b8 \ud1b5\ud654 \ucf54\ub4dc
-CurrencyNames/ko/xxx=\uc54c \uc218 \uc5c6\ub294 \ud1b5\ud654 \ub2e8\uc704
-CurrencyNames/ko/zwd=\uc9d0\ubc14\ube0c\uc6e8 \ub2ec\ub7ec
+CurrencyNames/ja/azm=アゼルバイジャン マナト (1993–2006)
+CurrencyNames/ja/azn=アゼルバイジャン マナト
+CurrencyNames/ja/ghc=ガーナ セディ (1979–2007)
+CurrencyNames/ja/ghs=ガーナ セディ
+CurrencyNames/ja/mzn=モザンビーク メティカル
+CurrencyNames/ja/rol=ルーマニア レイ (1952–2006)
+CurrencyNames/ja/ron=ルーマニア レイ
+CurrencyNames/ja/rsd=セルビア ディナール
+CurrencyNames/ja/sdg=スーダン ポンド
+CurrencyNames/ja/srd=スリナム ドル
+CurrencyNames/ja/vef=ベネズエラ ボリバル (2008–2018)
+CurrencyNames/ja/xag=銀
+CurrencyNames/ja/xpd=パラジウム
+CurrencyNames/ja/xpt=プラチナ
+CurrencyNames/ja/xts=テスト用通貨コード
+CurrencyNames/ja/xxx=不明または無効な通貨
+CurrencyNames/ja/zmk=ザンビア クワチャ (1968–2012)
+
+CurrencyNames/ko/aed=아랍에미리트 디르함
+CurrencyNames/ko/ang=네덜란드령 안틸레스 길더
+CurrencyNames/ko/azm=아제르바이젠 마나트(1993–2006)
+CurrencyNames/ko/azn=아제르바이잔 마나트
+CurrencyNames/ko/bov=볼리비아노 Mvdol(기금)
+CurrencyNames/ko/chf=스위스 프랑
+CurrencyNames/ko/clf=칠레 (UF)
+CurrencyNames/ko/csd=고 세르비아 디나르
+CurrencyNames/ko/ghc=가나 시디 (1979–2007)
+CurrencyNames/ko/ghs=가나 세디
+CurrencyNames/ko/mxv=멕시코 (UDI)
+CurrencyNames/ko/myr=말레이시아 링깃
+CurrencyNames/ko/mzm=고 모잠비크 메티칼
+CurrencyNames/ko/mzn=모잠비크 메티칼
+CurrencyNames/ko/ron=루마니아 레우
+CurrencyNames/ko/rsd=세르비아 디나르
+CurrencyNames/ko/sdg=수단 파운드
+CurrencyNames/ko/srd=수리남 달러
+CurrencyNames/ko/top=통가 파앙가
+CurrencyNames/ko/trl=터키 리라(1922~2005)
+CurrencyNames/ko/try=튀르키예 리라
+CurrencyNames/ko/usn=미국 달러(다음날)
+CurrencyNames/ko/uss=미국 달러(당일)
+CurrencyNames/ko/vef=베네수엘라 볼리바르 (2008–2018)
+CurrencyNames/ko/xaf=중앙아프리카 CFA 프랑
+CurrencyNames/ko/xag=은화
+CurrencyNames/ko/xba=유르코 (유럽 회계 단위)
+CurrencyNames/ko/xbb=유럽 통화 동맹
+CurrencyNames/ko/xbc=유럽 계산 단위 (XBC)
+CurrencyNames/ko/xbd=유럽 계산 단위 (XBD)
+CurrencyNames/ko/xof=서아프리카 CFA 프랑
+CurrencyNames/ko/xpd=팔라듐
+CurrencyNames/ko/xpf=CFP 프랑
+CurrencyNames/ko/xpt=백금
+CurrencyNames/ko/xts=테스트 통화 코드
+CurrencyNames/ko/xxx=알 수 없는 통화 단위
+CurrencyNames/ko/zwd=짐바브웨 달러
 
 CurrencyNames/sv/adp=andorransk peseta
 CurrencyNames/sv/aed=emiratisk dirham
-CurrencyNames/sv/afa=afghani (1927\u20132002)
+CurrencyNames/sv/afa=afghani (1927–2002)
 CurrencyNames/sv/afn=afghansk afghani
 CurrencyNames/sv/all=albansk lek
 CurrencyNames/sv/amd=armenisk dram
 CurrencyNames/sv/ang=antillergulden
 CurrencyNames/sv/aoa=angolansk kwanza
 CurrencyNames/sv/ars=argentinsk peso
-CurrencyNames/sv/ats=\u00f6sterrikisk schilling
+CurrencyNames/sv/ats=österrikisk schilling
 CurrencyNames/sv/aud=australisk dollar
 CurrencyNames/sv/awg=arubansk florin
-CurrencyNames/sv/azm=azerbajdzjansk manat (1993\u20132006)
+CurrencyNames/sv/azm=azerbajdzjansk manat (1993–2006)
 CurrencyNames/sv/azn=azerbajdzjansk manat
 CurrencyNames/sv/bam=bosnisk-hercegovinsk mark (konvertibel)
 CurrencyNames/sv/bbd=barbadisk dollar
@@ -6301,8 +6301,8 @@ CurrencyNames/sv/brl=brasiliansk real
 CurrencyNames/sv/bsd=bahamansk dollar
 CurrencyNames/sv/btn=bhutanesisk ngultrum
 CurrencyNames/sv/bwp=botswansk pula
-CurrencyNames/sv/byb=belarusisk ny rubel (1994\u20131999)
-CurrencyNames/sv/byr=belarusisk rubel (2000\u20132016)
+CurrencyNames/sv/byb=belarusisk ny rubel (1994–1999)
+CurrencyNames/sv/byr=belarusisk rubel (2000–2016)
 CurrencyNames/sv/bzd=belizisk dollar
 CurrencyNames/sv/cad=kanadensisk dollar
 CurrencyNames/sv/cdf=kongolesisk franc
@@ -6311,8 +6311,8 @@ CurrencyNames/sv/clf=chilensk unidad de fomento
 CurrencyNames/sv/clp=chilensk peso
 CurrencyNames/sv/cny=kinesisk yuan
 CurrencyNames/sv/cop=colombiansk peso
-CurrencyNames/sv/crc=costarikansk col\u00f3n
-CurrencyNames/sv/csd=serbisk dinar (2002\u20132006)
+CurrencyNames/sv/crc=costarikansk colón
+CurrencyNames/sv/csd=serbisk dinar (2002–2006)
 CurrencyNames/sv/cup=kubansk peso
 CurrencyNames/sv/cve=kapverdisk escudo
 CurrencyNames/sv/cyp=cypriotiskt pund
@@ -6333,7 +6333,7 @@ CurrencyNames/sv/fjd=Fijidollar
 CurrencyNames/sv/frf=fransk franc
 CurrencyNames/sv/gbp=brittiskt pund
 CurrencyNames/sv/gel=georgisk lari
-CurrencyNames/sv/ghc=ghanansk cedi (1979\u20132007)
+CurrencyNames/sv/ghc=ghanansk cedi (1979–2007)
 CurrencyNames/sv/ghs=ghanansk cedi
 CurrencyNames/sv/gip=gibraltiskt pund
 CurrencyNames/sv/gmd=gambisk dalasi
@@ -6346,12 +6346,12 @@ CurrencyNames/sv/hrk=kroatisk kuna
 CurrencyNames/sv/htg=haitisk gourde
 CurrencyNames/sv/huf=ungersk forint
 CurrencyNames/sv/idr=indonesisk rupie
-CurrencyNames/sv/iep=irl\u00e4ndskt pund
+CurrencyNames/sv/iep=irländskt pund
 CurrencyNames/sv/ils=israelisk ny shekel
 CurrencyNames/sv/inr=indisk rupie
 CurrencyNames/sv/iqd=irakisk dinar
 CurrencyNames/sv/irr=iransk rial
-CurrencyNames/sv/isk=isl\u00e4ndsk krona
+CurrencyNames/sv/isk=isländsk krona
 CurrencyNames/sv/itl=italiensk lire
 CurrencyNames/sv/jmd=jamaicansk dollar
 CurrencyNames/sv/jod=jordansk dinar
@@ -6379,9 +6379,9 @@ CurrencyNames/sv/mga=madagaskisk ariary
 CurrencyNames/sv/mgf=madagaskisk franc
 CurrencyNames/sv/mkd=makedonisk denar
 CurrencyNames/sv/mmk=myanmarisk kyat
-CurrencyNames/sv/mnt=mongolisk t\u00f6gr\u00f6g
+CurrencyNames/sv/mnt=mongolisk tögrög
 CurrencyNames/sv/mop=makanesisk pataca
-CurrencyNames/sv/mro=mauretansk ouguiya (1973\u20132017)
+CurrencyNames/sv/mro=mauretansk ouguiya (1973–2017)
 CurrencyNames/sv/mtl=maltesisk lire
 CurrencyNames/sv/mur=mauritisk rupie
 CurrencyNames/sv/mvr=maldivisk rufiyaa
@@ -6389,15 +6389,15 @@ CurrencyNames/sv/mwk=malawisk kwacha
 CurrencyNames/sv/mxn=mexikansk peso
 CurrencyNames/sv/mxv=mexikansk unidad de inversion
 CurrencyNames/sv/myr=malaysisk ringgit
-CurrencyNames/sv/mzm=gammal mo\u00e7ambikisk metical
-CurrencyNames/sv/mzn=mo\u00e7ambikisk metical
+CurrencyNames/sv/mzm=gammal moçambikisk metical
+CurrencyNames/sv/mzn=moçambikisk metical
 CurrencyNames/sv/nad=namibisk dollar
 CurrencyNames/sv/ngn=nigeriansk naira
-CurrencyNames/sv/nio=nicaraguansk c\u00f3rdoba
-CurrencyNames/sv/nlg=nederl\u00e4ndsk gulden
+CurrencyNames/sv/nio=nicaraguansk córdoba
+CurrencyNames/sv/nlg=nederländsk gulden
 CurrencyNames/sv/nok=norsk krona
 CurrencyNames/sv/npr=nepalesisk rupie
-CurrencyNames/sv/nzd=nyzeel\u00e4ndsk dollar
+CurrencyNames/sv/nzd=nyzeeländsk dollar
 CurrencyNames/sv/omr=omansk rial
 CurrencyNames/sv/pab=panamansk balboa
 CurrencyNames/sv/pen=peruansk sol
@@ -6408,34 +6408,34 @@ CurrencyNames/sv/pln=polsk zloty
 CurrencyNames/sv/pte=portugisisk escudo
 CurrencyNames/sv/pyg=paraguayansk guarani
 CurrencyNames/sv/qar=qatarisk rial
-CurrencyNames/sv/rol=rum\u00e4nsk leu (1952\u20132005)
-CurrencyNames/sv/ron=rum\u00e4nsk leu
+CurrencyNames/sv/rol=rumänsk leu (1952–2005)
+CurrencyNames/sv/ron=rumänsk leu
 CurrencyNames/sv/rsd=serbisk dinar
 CurrencyNames/sv/rub=rysk rubel
-CurrencyNames/sv/rur=rysk rubel (1991\u20131998)
+CurrencyNames/sv/rur=rysk rubel (1991–1998)
 CurrencyNames/sv/rwf=rwandisk franc
 CurrencyNames/sv/sar=saudisk riyal
 CurrencyNames/sv/scr=seychellisk rupie
-CurrencyNames/sv/sdd=sudansk dinar (1992\u20132007)
+CurrencyNames/sv/sdd=sudansk dinar (1992–2007)
 CurrencyNames/sv/sdg=sudanesiskt pund
 CurrencyNames/sv/sek=svensk krona
 CurrencyNames/sv/sgd=singaporiansk dollar
 CurrencyNames/sv/sit=slovensk tolar
 CurrencyNames/sv/skk=slovakisk koruna
-CurrencyNames/sv/sll=sierraleonsk leone (1964\u20142022)
+CurrencyNames/sv/sll=sierraleonsk leone (1964—2022)
 CurrencyNames/sv/sos=somalisk shilling
 CurrencyNames/sv/srd=surinamesisk dollar
 CurrencyNames/sv/srg=surinamesisk gulden
-CurrencyNames/sv/svc=salvadoransk col\u00f3n
+CurrencyNames/sv/svc=salvadoransk colón
 CurrencyNames/sv/syp=syriskt pund
-CurrencyNames/sv/szl=swazil\u00e4ndsk lilangeni
-CurrencyNames/sv/thb=thail\u00e4ndsk baht
+CurrencyNames/sv/szl=swaziländsk lilangeni
+CurrencyNames/sv/thb=thailändsk baht
 CurrencyNames/sv/tjs=tadzjikisk somoni
-CurrencyNames/sv/tmm=turkmenistansk manat (1993\u20132009)
+CurrencyNames/sv/tmm=turkmenistansk manat (1993–2009)
 CurrencyNames/sv/tnd=tunisisk dinar
-CurrencyNames/sv/top=tongansk pa\u02bbanga
-CurrencyNames/sv/tpe=\u00f6sttimoresisk escudo
-CurrencyNames/sv/trl=turkisk lire (1922\u20132005)
+CurrencyNames/sv/top=tongansk paʻanga
+CurrencyNames/sv/tpe=östtimoresisk escudo
+CurrencyNames/sv/trl=turkisk lire (1922–2005)
 CurrencyNames/sv/try=turkisk lira
 CurrencyNames/sv/ttd=Trinidaddollar
 CurrencyNames/sv/twd=taiwanesisk dollar
@@ -6444,94 +6444,94 @@ CurrencyNames/sv/uah=ukrainsk hryvnia
 CurrencyNames/sv/ugx=ugandisk shilling
 CurrencyNames/sv/uyu=uruguayansk peso
 CurrencyNames/sv/uzs=uzbekisk sum
-CurrencyNames/sv/veb=venezuelansk bolivar (1871\u20132008)
-CurrencyNames/sv/vef=venezuelansk bol\u00edvar (2008\u20132018)
+CurrencyNames/sv/veb=venezuelansk bolivar (1871–2008)
+CurrencyNames/sv/vef=venezuelansk bolívar (2008–2018)
 CurrencyNames/sv/vnd=vietnamesisk dong
 CurrencyNames/sv/vuv=vanuatisk vatu
-CurrencyNames/sv/wst=v\u00e4stsamoansk tala
+CurrencyNames/sv/wst=västsamoansk tala
 CurrencyNames/sv/xag=silver
 CurrencyNames/sv/xau=guld
 CurrencyNames/sv/xba=europeisk kompositenhet
-CurrencyNames/sv/xbb=europeisk monet\u00e4r enhet
+CurrencyNames/sv/xbb=europeisk monetär enhet
 CurrencyNames/sv/xbc=europeisk kontoenhet (XBC)
 CurrencyNames/sv/xbd=europeisk kontoenhet (XBD)
-CurrencyNames/sv/xcd=\u00f6stkaribisk dollar
-CurrencyNames/sv/xdr=IMF s\u00e4rskild dragningsr\u00e4tt
+CurrencyNames/sv/xcd=östkaribisk dollar
+CurrencyNames/sv/xdr=IMF särskild dragningsrätt
 CurrencyNames/sv/xfo=fransk guldfranc
 CurrencyNames/sv/xpd=palladium
 CurrencyNames/sv/xpt=platina
 CurrencyNames/sv/xts=testvalutaenhet
-CurrencyNames/sv/xxx=ok\u00e4nd valuta
+CurrencyNames/sv/xxx=okänd valuta
 CurrencyNames/sv/yer=jemenitisk rial
-CurrencyNames/sv/yum=jugoslavisk dinar (1994\u20132002)
+CurrencyNames/sv/yum=jugoslavisk dinar (1994–2002)
 CurrencyNames/sv/zar=sydafrikansk rand
-CurrencyNames/sv/zmk=zambisk kwacha (1968\u20132012)
+CurrencyNames/sv/zmk=zambisk kwacha (1968–2012)
 CurrencyNames/sv/zwd=Zimbabwe-dollar
 
-CurrencyNames/zh_CN/ang=\u8377\u5c5e\u5b89\u7684\u5217\u65af\u76fe
-CurrencyNames/zh_CN/azm=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279 (1993\u20132006)
-CurrencyNames/zh_CN/azn=\u963f\u585e\u62dc\u7586\u9a6c\u7eb3\u7279
-CurrencyNames/zh_CN/csd=\u65e7\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-CurrencyNames/zh_CN/ghs=\u52a0\u7eb3\u585e\u5730
-CurrencyNames/zh_CN/mzm=\u65e7\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-CurrencyNames/zh_CN/mzn=\u83ab\u6851\u6bd4\u514b\u7f8e\u63d0\u5361
-CurrencyNames/zh_CN/ron=\u7f57\u9a6c\u5c3c\u4e9a\u5217\u4f0a
-CurrencyNames/zh_CN/rsd=\u585e\u5c14\u7ef4\u4e9a\u7b2c\u7eb3\u5c14
-CurrencyNames/zh_CN/shp=\u5723\u8d6b\u52d2\u62ff\u7fa4\u5c9b\u78c5
-CurrencyNames/zh_CN/twd=\u65b0\u53f0\u5e01
-CurrencyNames/zh_CN/vef=\u59d4\u5185\u745e\u62c9\u73bb\u5229\u74e6\u5c14 (2008\u20132018)
-CurrencyNames/zh_CN/xxx=\u672a\u77e5\u8d27\u5e01
-
-CurrencyNames/zh_TW/afa=\u963f\u5bcc\u6c57\u5c3c (1927\u20132002)
-CurrencyNames/zh_TW/ang=\u8377\u5c6c\u5b89\u5730\u5217\u65af\u76fe
-CurrencyNames/zh_TW/azm=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279 (1993\u20132006)
-CurrencyNames/zh_TW/azn=\u4e9e\u585e\u62dc\u7136\u99ac\u7d0d\u7279
-CurrencyNames/zh_TW/bwp=\u6ce2\u672d\u90a3\u666e\u62c9
-CurrencyNames/zh_TW/bzd=\u8c9d\u91cc\u65af\u5143
-CurrencyNames/zh_TW/csd=\u820a\u585e\u723e\u7dad\u4e9e\u7b2c\u7d0d\u723e
-CurrencyNames/zh_TW/cyp=\u8cfd\u666e\u52d2\u65af\u938a
-CurrencyNames/zh_TW/ghc=\u8fe6\u7d0d\u8cfd\u5730 (1979\u20132007)
-CurrencyNames/zh_TW/ghs=\u8fe6\u7d0d\u585e\u5730
-CurrencyNames/zh_TW/gwp=\u5e7e\u5167\u4e9e\u6bd4\u7d22\u62ab\u7d22
-CurrencyNames/zh_TW/huf=\u5308\u7259\u5229\u798f\u6797
-CurrencyNames/zh_TW/idr=\u5370\u5c3c\u76fe
-CurrencyNames/zh_TW/inr=\u5370\u5ea6\u76e7\u6bd4
-CurrencyNames/zh_TW/kpw=\u5317\u97d3\u5143
-CurrencyNames/zh_TW/krw=\u97d3\u5143
-CurrencyNames/zh_TW/lak=\u5bee\u570b\u57fa\u666e
-CurrencyNames/zh_TW/mad=\u6469\u6d1b\u54e5\u8fea\u62c9\u59c6
-CurrencyNames/zh_TW/mxn=\u58a8\u897f\u54e5\u62ab\u7d22
-CurrencyNames/zh_TW/mxv=\u58a8\u897f\u54e5\u8f49\u63db\u55ae\u4f4d (UDI)
-CurrencyNames/zh_TW/myr=\u99ac\u4f86\u897f\u4e9e\u4ee4\u5409
-CurrencyNames/zh_TW/mzn=\u83ab\u4e09\u6bd4\u514b\u6885\u8482\u5361\u723e
-CurrencyNames/zh_TW/nio=\u5c3c\u52a0\u62c9\u74dc\u91d1\u79d1\u591a\u5df4
-CurrencyNames/zh_TW/rol=\u820a\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-CurrencyNames/zh_TW/ron=\u7f85\u99ac\u5c3c\u4e9e\u5217\u4f0a
-CurrencyNames/zh_TW/rsd=\u585e\u723e\u7dad\u4e9e\u6234\u7d0d
-CurrencyNames/zh_TW/scr=\u585e\u5e2d\u723e\u76e7\u6bd4
-CurrencyNames/zh_TW/sdg=\u8607\u4e39\u938a
-CurrencyNames/zh_TW/shp=\u8056\u8d6b\u52d2\u62ff\u938a
-CurrencyNames/zh_TW/srd=\u8607\u5229\u5357\u5143
-CurrencyNames/zh_TW/srg=\u8607\u5229\u5357\u57fa\u723e
-CurrencyNames/zh_TW/svc=\u85a9\u723e\u74e6\u591a\u79d1\u90ce
-CurrencyNames/zh_TW/szl=\u53f2\u74e6\u5e1d\u5c3c\u6717\u5409\u5c3c
-CurrencyNames/zh_TW/tpe=\u5e1d\u6c76\u57c3\u65af\u5eab\u591a
-CurrencyNames/zh_TW/ttd=\u5343\u91cc\u9054\u53ca\u6258\u5df4\u54e5\u5143
-CurrencyNames/zh_TW/tzs=\u5766\u5c1a\u5c3c\u4e9e\u5148\u4ee4
-CurrencyNames/zh_TW/uzs=\u70cf\u8332\u5225\u514b\u7d22\u59c6
-CurrencyNames/zh_TW/veb=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (1871\u20132008)
-CurrencyNames/zh_TW/vef=\u59d4\u5167\u745e\u62c9\u73bb\u5229\u74e6 (2008\u20132018)
-CurrencyNames/zh_TW/xaf=\u6cd5\u90ce (CFA\u2013BEAC)
-CurrencyNames/zh_TW/xag=\u767d\u9280
-CurrencyNames/zh_TW/xof=\u6cd5\u90ce (CFA\u2013BCEAO)
-CurrencyNames/zh_TW/xpd=\u5e15\u62c9\u72c4\u6602
-CurrencyNames/zh_TW/xpt=\u767d\u91d1
-CurrencyNames/zh_TW/xts=\u6e2c\u8a66\u7528\u8ca8\u5e63\u4ee3\u78bc
-CurrencyNames/zh_TW/xxx=\u672a\u77e5\u8ca8\u5e63
-CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u4e9e\u723e
+CurrencyNames/zh_CN/ang=荷属安的列斯盾
+CurrencyNames/zh_CN/azm=阿塞拜疆马纳特 (1993–2006)
+CurrencyNames/zh_CN/azn=阿塞拜疆马纳特
+CurrencyNames/zh_CN/csd=旧塞尔维亚第纳尔
+CurrencyNames/zh_CN/ghs=加纳塞地
+CurrencyNames/zh_CN/mzm=旧莫桑比克美提卡
+CurrencyNames/zh_CN/mzn=莫桑比克美提卡
+CurrencyNames/zh_CN/ron=罗马尼亚列伊
+CurrencyNames/zh_CN/rsd=塞尔维亚第纳尔
+CurrencyNames/zh_CN/shp=圣赫勒拿群岛磅
+CurrencyNames/zh_CN/twd=新台币
+CurrencyNames/zh_CN/vef=委内瑞拉玻利瓦尔 (2008–2018)
+CurrencyNames/zh_CN/xxx=未知货币
+
+CurrencyNames/zh_TW/afa=阿富汗尼 (1927–2002)
+CurrencyNames/zh_TW/ang=荷屬安地列斯盾
+CurrencyNames/zh_TW/azm=亞塞拜然馬納特 (1993–2006)
+CurrencyNames/zh_TW/azn=亞塞拜然馬納特
+CurrencyNames/zh_TW/bwp=波札那普拉
+CurrencyNames/zh_TW/bzd=貝里斯元
+CurrencyNames/zh_TW/csd=舊塞爾維亞第納爾
+CurrencyNames/zh_TW/cyp=賽普勒斯鎊
+CurrencyNames/zh_TW/ghc=迦納賽地 (1979–2007)
+CurrencyNames/zh_TW/ghs=迦納塞地
+CurrencyNames/zh_TW/gwp=幾內亞比索披索
+CurrencyNames/zh_TW/huf=匈牙利福林
+CurrencyNames/zh_TW/idr=印尼盾
+CurrencyNames/zh_TW/inr=印度盧比
+CurrencyNames/zh_TW/kpw=北韓元
+CurrencyNames/zh_TW/krw=韓元
+CurrencyNames/zh_TW/lak=寮國基普
+CurrencyNames/zh_TW/mad=摩洛哥迪拉姆
+CurrencyNames/zh_TW/mxn=墨西哥披索
+CurrencyNames/zh_TW/mxv=墨西哥轉換單位 (UDI)
+CurrencyNames/zh_TW/myr=馬來西亞令吉
+CurrencyNames/zh_TW/mzn=莫三比克梅蒂卡爾
+CurrencyNames/zh_TW/nio=尼加拉瓜金科多巴
+CurrencyNames/zh_TW/rol=舊羅馬尼亞列伊
+CurrencyNames/zh_TW/ron=羅馬尼亞列伊
+CurrencyNames/zh_TW/rsd=塞爾維亞戴納
+CurrencyNames/zh_TW/scr=塞席爾盧比
+CurrencyNames/zh_TW/sdg=蘇丹鎊
+CurrencyNames/zh_TW/shp=聖赫勒拿鎊
+CurrencyNames/zh_TW/srd=蘇利南元
+CurrencyNames/zh_TW/srg=蘇利南基爾
+CurrencyNames/zh_TW/svc=薩爾瓦多科郎
+CurrencyNames/zh_TW/szl=史瓦帝尼朗吉尼
+CurrencyNames/zh_TW/tpe=帝汶埃斯庫多
+CurrencyNames/zh_TW/ttd=千里達及托巴哥元
+CurrencyNames/zh_TW/tzs=坦尚尼亞先令
+CurrencyNames/zh_TW/uzs=烏茲別克索姆
+CurrencyNames/zh_TW/veb=委內瑞拉玻利瓦 (1871–2008)
+CurrencyNames/zh_TW/vef=委內瑞拉玻利瓦 (2008–2018)
+CurrencyNames/zh_TW/xaf=法郎 (CFA–BEAC)
+CurrencyNames/zh_TW/xag=白銀
+CurrencyNames/zh_TW/xof=法郎 (CFA–BCEAO)
+CurrencyNames/zh_TW/xpd=帕拉狄昂
+CurrencyNames/zh_TW/xpt=白金
+CurrencyNames/zh_TW/xts=測試用貨幣代碼
+CurrencyNames/zh_TW/xxx=未知貨幣
+CurrencyNames/zh_TW/yer=葉門里亞爾
 
 # bug 7036905
-CurrencyNames/de/afa=Afghanische Afghani (1927\u20132002)
+CurrencyNames/de/afa=Afghanische Afghani (1927–2002)
 CurrencyNames/de/afn=Afghanischer Afghani
 CurrencyNames/de/bob=Bolivianischer Boliviano
 CurrencyNames/de/dem=Deutsche Mark
@@ -6547,48 +6547,48 @@ CurrencyNames/de/zwl=Simbabwe-Dollar (2009)
 
 CurrencyNames/es/cuc=peso cubano convertible
 CurrencyNames/es/tmt=manat turcomano
-CurrencyNames/es/zwl=d\u00f3lar zimbabuense
+CurrencyNames/es/zwl=dólar zimbabuense
 
 CurrencyNames/es_CU/CUP=$
 
 CurrencyNames/et_EE/eek=Eesti kroon
-CurrencyNames/et_EE/EUR=\u20ac
+CurrencyNames/et_EE/EUR=€
 CurrencyNames/et_EE/eur=euro
 
 CurrencyNames/fr/cuc=peso cubain convertible
-CurrencyNames/fr/tmt=nouveau manat turkm\u00e8ne
+CurrencyNames/fr/tmt=nouveau manat turkmène
 
-CurrencyNames/ja/cuc=\u30ad\u30e5\u30fc\u30d0 \u514c\u63db\u30da\u30bd
-CurrencyNames/ja/tmt=\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3 \u30de\u30ca\u30c8
-CurrencyNames/ja/zwl=\u30b8\u30f3\u30d0\u30d6\u30a8 \u30c9\u30eb (2009)
+CurrencyNames/ja/cuc=キューバ 兌換ペソ
+CurrencyNames/ja/tmt=トルクメニスタン マナト
+CurrencyNames/ja/zwl=ジンバブエ ドル (2009)
 
-CurrencyNames/ko/cuc=\ucfe0\ubc14 \ud0dc\ud658 \ud398\uc18c
+CurrencyNames/ko/cuc=쿠바 태환 페소
 
-CurrencyNames/pt/bob=Boliviano da Bol\u00edvia
-CurrencyNames/pt/cuc=Peso cubano convers\u00edvel
+CurrencyNames/pt/bob=Boliviano da Bolívia
+CurrencyNames/pt/cuc=Peso cubano conversível
 CurrencyNames/pt/tmt=Manat turcomeno
-CurrencyNames/pt/zwl=D\u00f3lar do Zimb\u00e1bue (2009)
-CurrencyNames/pt/zwr=D\u00f3lar do Zimb\u00e1bue (2008)
+CurrencyNames/pt/zwl=Dólar do Zimbábue (2009)
+CurrencyNames/pt/zwr=Dólar do Zimbábue (2008)
 
-CurrencyNames/sk_SK/skk=slovensk\u00e1 koruna
-CurrencyNames/sk_SK/EUR=\u20ac
+CurrencyNames/sk_SK/skk=slovenská koruna
+CurrencyNames/sk_SK/EUR=€
 
-CurrencyNames/zh_CN/cuc=\u53e4\u5df4\u53ef\u5151\u6362\u6bd4\u7d22
-CurrencyNames/zh_CN/tmt=\u571f\u5e93\u66fc\u65af\u5766\u9a6c\u7eb3\u7279
-CurrencyNames/zh_CN/zwl=\u6d25\u5df4\u5e03\u97e6\u5143 (2009)
+CurrencyNames/zh_CN/cuc=古巴可兑换比索
+CurrencyNames/zh_CN/tmt=土库曼斯坦马纳特
+CurrencyNames/zh_CN/zwl=津巴布韦元 (2009)
 
-CurrencyNames/zh_TW/cuc=\u53e4\u5df4\u53ef\u8f49\u63db\u62ab\u7d22
-CurrencyNames/zh_TW/tmt=\u571f\u5eab\u66fc\u99ac\u7d0d\u7279
-CurrencyNames/zh_TW/zwl=\u8f9b\u5df4\u5a01\u5143 (2009)
+CurrencyNames/zh_TW/cuc=古巴可轉換披索
+CurrencyNames/zh_TW/tmt=土庫曼馬納特
+CurrencyNames/zh_TW/zwl=辛巴威元 (2009)
 
 # bug 7003124
-FormatData/bg/TimePatterns/0=H:mm:ss '\u0447'. zzzz
+FormatData/bg/TimePatterns/0=H:mm:ss 'ч'. zzzz
 FormatData/bg/TimePatterns/2=H:mm:ss
 FormatData/bg/TimePatterns/3=H:mm
-FormatData/bg/DatePatterns/0=EEEE, d MMMM y\u202f'\u0433'.
-FormatData/bg/DatePatterns/1=d MMMM y\u202f'\u0433'.
-FormatData/bg/DatePatterns/2=d.MM.y\u202f'\u0433'.
-FormatData/bg/DatePatterns/3=d.MM.yy\u202f'\u0433'.
+FormatData/bg/DatePatterns/0=EEEE, d MMMM y 'г'.
+FormatData/bg/DatePatterns/1=d MMMM y 'г'.
+FormatData/bg/DatePatterns/2=d.MM.y 'г'.
+FormatData/bg/DatePatterns/3=d.MM.yy 'г'.
 
 # bug 7085757
 LocaleNames/en/SS=South Sudan
@@ -6623,46 +6623,46 @@ FormatData//japanese.narrow.Eras/2=T
 FormatData//japanese.narrow.Eras/3=S
 FormatData//japanese.narrow.Eras/4=H
 
-FormatData/ar/DayNarrows/0=\u062d
-FormatData/ar/DayNarrows/1=\u0646
-FormatData/ar/DayNarrows/2=\u062b
-FormatData/ar/DayNarrows/3=\u0631
-FormatData/ar/DayNarrows/4=\u062e
-FormatData/ar/DayNarrows/5=\u062c
-FormatData/ar/DayNarrows/6=\u0633
-
-FormatData/be/standalone.MonthNarrows/0=\u0441
-FormatData/be/standalone.MonthNarrows/1=\u043b
-FormatData/be/standalone.MonthNarrows/2=\u0441
-FormatData/be/standalone.MonthNarrows/3=\u043a
-FormatData/be/standalone.MonthNarrows/4=\u043c
-FormatData/be/standalone.MonthNarrows/5=\u0447
-FormatData/be/standalone.MonthNarrows/6=\u043b
-FormatData/be/standalone.MonthNarrows/7=\u0436
-FormatData/be/standalone.MonthNarrows/8=\u0432
-FormatData/be/standalone.MonthNarrows/9=\u043a
-FormatData/be/standalone.MonthNarrows/10=\u043b
-FormatData/be/standalone.MonthNarrows/11=\u0441
+FormatData/ar/DayNarrows/0=ح
+FormatData/ar/DayNarrows/1=ن
+FormatData/ar/DayNarrows/2=ث
+FormatData/ar/DayNarrows/3=ر
+FormatData/ar/DayNarrows/4=خ
+FormatData/ar/DayNarrows/5=ج
+FormatData/ar/DayNarrows/6=س
+
+FormatData/be/standalone.MonthNarrows/0=с
+FormatData/be/standalone.MonthNarrows/1=л
+FormatData/be/standalone.MonthNarrows/2=с
+FormatData/be/standalone.MonthNarrows/3=к
+FormatData/be/standalone.MonthNarrows/4=м
+FormatData/be/standalone.MonthNarrows/5=ч
+FormatData/be/standalone.MonthNarrows/6=л
+FormatData/be/standalone.MonthNarrows/7=ж
+FormatData/be/standalone.MonthNarrows/8=в
+FormatData/be/standalone.MonthNarrows/9=к
+FormatData/be/standalone.MonthNarrows/10=л
+FormatData/be/standalone.MonthNarrows/11=с
 FormatData/be/standalone.MonthNarrows/12=
-FormatData/be/DayNarrows/0=\u043d
-FormatData/be/DayNarrows/1=\u043f
-FormatData/be/DayNarrows/2=\u0430
-FormatData/be/DayNarrows/3=\u0441
-FormatData/be/DayNarrows/4=\u0447
-FormatData/be/DayNarrows/5=\u043f
-FormatData/be/DayNarrows/6=\u0441
-
-FormatData/bg/DayNarrows/0=\u043d
-FormatData/bg/DayNarrows/1=\u043f
-FormatData/bg/DayNarrows/2=\u0432
-FormatData/bg/DayNarrows/3=\u0441
-FormatData/bg/DayNarrows/4=\u0447
-FormatData/bg/DayNarrows/5=\u043f
-FormatData/bg/DayNarrows/6=\u0441
+FormatData/be/DayNarrows/0=н
+FormatData/be/DayNarrows/1=п
+FormatData/be/DayNarrows/2=а
+FormatData/be/DayNarrows/3=с
+FormatData/be/DayNarrows/4=ч
+FormatData/be/DayNarrows/5=п
+FormatData/be/DayNarrows/6=с
+
+FormatData/bg/DayNarrows/0=н
+FormatData/bg/DayNarrows/1=п
+FormatData/bg/DayNarrows/2=в
+FormatData/bg/DayNarrows/3=с
+FormatData/bg/DayNarrows/4=ч
+FormatData/bg/DayNarrows/5=п
+FormatData/bg/DayNarrows/6=с
 
 FormatData/ca/standalone.MonthNarrows/0=GN
 FormatData/ca/standalone.MonthNarrows/1=FB
-FormatData/ca/standalone.MonthNarrows/2=M\u00c7
+FormatData/ca/standalone.MonthNarrows/2=MÇ
 FormatData/ca/standalone.MonthNarrows/3=AB
 FormatData/ca/standalone.MonthNarrows/4=MG
 FormatData/ca/standalone.MonthNarrows/5=JN
@@ -6691,9 +6691,9 @@ FormatData/ca/standalone.DayNarrows/6=ds.
 
 FormatData/cs/DayNarrows/0=N
 FormatData/cs/DayNarrows/1=P
-FormatData/cs/DayNarrows/2=\u00da
+FormatData/cs/DayNarrows/2=Ú
 FormatData/cs/DayNarrows/3=S
-FormatData/cs/DayNarrows/4=\u010c
+FormatData/cs/DayNarrows/4=Č
 FormatData/cs/DayNarrows/5=P
 FormatData/cs/DayNarrows/6=S
 
@@ -6713,13 +6713,13 @@ FormatData/de/DayNarrows/4=D
 FormatData/de/DayNarrows/5=F
 FormatData/de/DayNarrows/6=S
 
-FormatData/el/DayNarrows/0=\u039a
-FormatData/el/DayNarrows/1=\u0394
-FormatData/el/DayNarrows/2=\u03a4
-FormatData/el/DayNarrows/3=\u03a4
-FormatData/el/DayNarrows/4=\u03a0
-FormatData/el/DayNarrows/5=\u03a0
-FormatData/el/DayNarrows/6=\u03a3
+FormatData/el/DayNarrows/0=Κ
+FormatData/el/DayNarrows/1=Δ
+FormatData/el/DayNarrows/2=Τ
+FormatData/el/DayNarrows/3=Τ
+FormatData/el/DayNarrows/4=Π
+FormatData/el/DayNarrows/5=Π
+FormatData/el/DayNarrows/6=Σ
 
 FormatData/es/DayNarrows/0=D
 FormatData/es/DayNarrows/1=L
@@ -6775,13 +6775,13 @@ FormatData/fr/DayNarrows/4=J
 FormatData/fr/DayNarrows/5=V
 FormatData/fr/DayNarrows/6=S
 
-FormatData/hi_IN/DayNarrows/0=\u0930
-FormatData/hi_IN/DayNarrows/1=\u0938\u094b
-FormatData/hi_IN/DayNarrows/2=\u092e\u0902
-FormatData/hi_IN/DayNarrows/3=\u092c\u0941
-FormatData/hi_IN/DayNarrows/4=\u0917\u0941
-FormatData/hi_IN/DayNarrows/5=\u0936\u0941
-FormatData/hi_IN/DayNarrows/6=\u0936
+FormatData/hi_IN/DayNarrows/0=र
+FormatData/hi_IN/DayNarrows/1=सो
+FormatData/hi_IN/DayNarrows/2=मं
+FormatData/hi_IN/DayNarrows/3=बु
+FormatData/hi_IN/DayNarrows/4=गु
+FormatData/hi_IN/DayNarrows/5=शु
+FormatData/hi_IN/DayNarrows/6=श
 
 FormatData/hr/standalone.MonthNarrows/0=1.
 FormatData/hr/standalone.MonthNarrows/1=2.
@@ -6800,14 +6800,14 @@ FormatData/hr/DayNarrows/0=N
 FormatData/hr/DayNarrows/1=P
 FormatData/hr/DayNarrows/2=U
 FormatData/hr/DayNarrows/3=S
-FormatData/hr/DayNarrows/4=\u010c
+FormatData/hr/DayNarrows/4=Č
 FormatData/hr/DayNarrows/5=P
 FormatData/hr/DayNarrows/6=S
 FormatData/hr/standalone.DayNarrows/0=n
 FormatData/hr/standalone.DayNarrows/1=p
 FormatData/hr/standalone.DayNarrows/2=u
 FormatData/hr/standalone.DayNarrows/3=s
-FormatData/hr/standalone.DayNarrows/4=\u010d
+FormatData/hr/standalone.DayNarrows/4=č
 FormatData/hr/standalone.DayNarrows/5=p
 FormatData/hr/standalone.DayNarrows/6=s
 
@@ -6826,7 +6826,7 @@ FormatData/is/standalone.MonthNarrows/3=A
 FormatData/is/standalone.MonthNarrows/4=M
 FormatData/is/standalone.MonthNarrows/5=J
 FormatData/is/standalone.MonthNarrows/6=J
-FormatData/is/standalone.MonthNarrows/7=\u00c1
+FormatData/is/standalone.MonthNarrows/7=Á
 FormatData/is/standalone.MonthNarrows/8=S
 FormatData/is/standalone.MonthNarrows/9=O
 FormatData/is/standalone.MonthNarrows/10=N
@@ -6834,14 +6834,14 @@ FormatData/is/standalone.MonthNarrows/11=D
 FormatData/is/standalone.MonthNarrows/12=
 FormatData/is/DayNarrows/0=S
 FormatData/is/DayNarrows/1=M
-FormatData/is/DayNarrows/2=\u00de
+FormatData/is/DayNarrows/2=Þ
 FormatData/is/DayNarrows/3=M
 FormatData/is/DayNarrows/4=F
 FormatData/is/DayNarrows/5=F
 FormatData/is/DayNarrows/6=L
 FormatData/is/standalone.DayNarrows/0=S
 FormatData/is/standalone.DayNarrows/1=M
-FormatData/is/standalone.DayNarrows/2=\u00de
+FormatData/is/standalone.DayNarrows/2=Þ
 FormatData/is/standalone.DayNarrows/3=M
 FormatData/is/standalone.DayNarrows/4=F
 FormatData/is/standalone.DayNarrows/5=F
@@ -6855,36 +6855,36 @@ FormatData/it/DayNarrows/4=G
 FormatData/it/DayNarrows/5=V
 FormatData/it/DayNarrows/6=S
 
-FormatData/iw/DayNarrows/0=\u05d0\u05f3
-FormatData/iw/DayNarrows/1=\u05d1\u05f3
-FormatData/iw/DayNarrows/2=\u05d2\u05f3
-FormatData/iw/DayNarrows/3=\u05d3\u05f3
-FormatData/iw/DayNarrows/4=\u05d4\u05f3
-FormatData/iw/DayNarrows/5=\u05d5\u05f3
-FormatData/iw/DayNarrows/6=\u05e9\u05f3
-FormatData/iw/standalone.DayNarrows/0=\u05d0\u05f3
-FormatData/iw/standalone.DayNarrows/1=\u05d1\u05f3
-FormatData/iw/standalone.DayNarrows/2=\u05d2\u05f3
-FormatData/iw/standalone.DayNarrows/3=\u05d3\u05f3
-FormatData/iw/standalone.DayNarrows/4=\u05d4\u05f3
-FormatData/iw/standalone.DayNarrows/5=\u05d5\u05f3
-FormatData/iw/standalone.DayNarrows/6=\u05e9\u05f3
-
-FormatData/ja/DayNarrows/0=\u65e5
-FormatData/ja/DayNarrows/1=\u6708
-FormatData/ja/DayNarrows/2=\u706b
-FormatData/ja/DayNarrows/3=\u6c34
-FormatData/ja/DayNarrows/4=\u6728
-FormatData/ja/DayNarrows/5=\u91d1
-FormatData/ja/DayNarrows/6=\u571f
-
-FormatData/ko/DayNarrows/0=\uc77c
-FormatData/ko/DayNarrows/1=\uc6d4
-FormatData/ko/DayNarrows/2=\ud654
-FormatData/ko/DayNarrows/3=\uc218
-FormatData/ko/DayNarrows/4=\ubaa9
-FormatData/ko/DayNarrows/5=\uae08
-FormatData/ko/DayNarrows/6=\ud1a0
+FormatData/iw/DayNarrows/0=א׳
+FormatData/iw/DayNarrows/1=ב׳
+FormatData/iw/DayNarrows/2=ג׳
+FormatData/iw/DayNarrows/3=ד׳
+FormatData/iw/DayNarrows/4=ה׳
+FormatData/iw/DayNarrows/5=ו׳
+FormatData/iw/DayNarrows/6=ש׳
+FormatData/iw/standalone.DayNarrows/0=א׳
+FormatData/iw/standalone.DayNarrows/1=ב׳
+FormatData/iw/standalone.DayNarrows/2=ג׳
+FormatData/iw/standalone.DayNarrows/3=ד׳
+FormatData/iw/standalone.DayNarrows/4=ה׳
+FormatData/iw/standalone.DayNarrows/5=ו׳
+FormatData/iw/standalone.DayNarrows/6=ש׳
+
+FormatData/ja/DayNarrows/0=日
+FormatData/ja/DayNarrows/1=月
+FormatData/ja/DayNarrows/2=火
+FormatData/ja/DayNarrows/3=水
+FormatData/ja/DayNarrows/4=木
+FormatData/ja/DayNarrows/5=金
+FormatData/ja/DayNarrows/6=土
+
+FormatData/ko/DayNarrows/0=일
+FormatData/ko/DayNarrows/1=월
+FormatData/ko/DayNarrows/2=화
+FormatData/ko/DayNarrows/3=수
+FormatData/ko/DayNarrows/4=목
+FormatData/ko/DayNarrows/5=금
+FormatData/ko/DayNarrows/6=토
 
 FormatData/lt/standalone.MonthNarrows/0=S
 FormatData/lt/standalone.MonthNarrows/1=V
@@ -6906,14 +6906,14 @@ FormatData/lt/DayNarrows/2=A
 FormatData/lt/DayNarrows/3=T
 FormatData/lt/DayNarrows/4=K
 FormatData/lt/DayNarrows/5=P
-FormatData/lt/DayNarrows/6=\u0160
+FormatData/lt/DayNarrows/6=Š
 FormatData/lt/standalone.DayNarrows/0=S
 FormatData/lt/standalone.DayNarrows/1=P
 FormatData/lt/standalone.DayNarrows/2=A
 FormatData/lt/standalone.DayNarrows/3=T
 FormatData/lt/standalone.DayNarrows/4=K
 FormatData/lt/standalone.DayNarrows/5=P
-FormatData/lt/standalone.DayNarrows/6=\u0160
+FormatData/lt/standalone.DayNarrows/6=Š
 
 FormatData/lv/DayNarrows/0=S
 FormatData/lv/DayNarrows/1=P
@@ -6923,13 +6923,13 @@ FormatData/lv/DayNarrows/4=C
 FormatData/lv/DayNarrows/5=P
 FormatData/lv/DayNarrows/6=S
 
-FormatData/mk/DayNarrows/0=\u043d
-FormatData/mk/DayNarrows/1=\u043f
-FormatData/mk/DayNarrows/2=\u0432
-FormatData/mk/DayNarrows/3=\u0441
-FormatData/mk/DayNarrows/4=\u0447
-FormatData/mk/DayNarrows/5=\u043f
-FormatData/mk/DayNarrows/6=\u0441
+FormatData/mk/DayNarrows/0=н
+FormatData/mk/DayNarrows/1=п
+FormatData/mk/DayNarrows/2=в
+FormatData/mk/DayNarrows/3=с
+FormatData/mk/DayNarrows/4=ч
+FormatData/mk/DayNarrows/5=п
+FormatData/mk/DayNarrows/6=с
 
 FormatData/ms/standalone.MonthNarrows/0=J
 FormatData/ms/standalone.MonthNarrows/1=F
@@ -6959,12 +6959,12 @@ FormatData/ms/standalone.DayNarrows/4=K
 FormatData/ms/standalone.DayNarrows/5=J
 FormatData/ms/standalone.DayNarrows/6=S
 
-FormatData/mt/DayNarrows/0=\u0126d
+FormatData/mt/DayNarrows/0=Ħd
 FormatData/mt/DayNarrows/1=T
 FormatData/mt/DayNarrows/2=Tl
 FormatData/mt/DayNarrows/3=Er
-FormatData/mt/DayNarrows/4=\u0126m
-FormatData/mt/DayNarrows/5=\u0120m
+FormatData/mt/DayNarrows/4=Ħm
+FormatData/mt/DayNarrows/5=Ġm
 FormatData/mt/DayNarrows/6=Sb
 
 FormatData/nl/DayNarrows/0=Z
@@ -6978,7 +6978,7 @@ FormatData/nl/DayNarrows/6=Z
 FormatData/pl/DayNarrows/0=n
 FormatData/pl/DayNarrows/1=p
 FormatData/pl/DayNarrows/2=w
-FormatData/pl/DayNarrows/3=\u015b
+FormatData/pl/DayNarrows/3=ś
 FormatData/pl/DayNarrows/4=c
 FormatData/pl/DayNarrows/5=p
 FormatData/pl/DayNarrows/6=s
@@ -7020,28 +7020,28 @@ FormatData/ro/standalone.DayNarrows/4=J
 FormatData/ro/standalone.DayNarrows/5=V
 FormatData/ro/standalone.DayNarrows/6=S
 
-FormatData/ru/DayNarrows/0=\u0412
-FormatData/ru/DayNarrows/1=\u041f
-FormatData/ru/DayNarrows/2=\u0412
-FormatData/ru/DayNarrows/3=\u0421
-FormatData/ru/DayNarrows/4=\u0427
-FormatData/ru/DayNarrows/5=\u041f
+FormatData/ru/DayNarrows/0=В
+FormatData/ru/DayNarrows/1=П
+FormatData/ru/DayNarrows/2=В
+FormatData/ru/DayNarrows/3=С
+FormatData/ru/DayNarrows/4=Ч
+FormatData/ru/DayNarrows/5=П
 # Note: "sat" is an contributed item in CLDR.
-FormatData/ru/DayNarrows/6=\u0421
+FormatData/ru/DayNarrows/6=С
 
-FormatData/ru/standalone.DayNarrows/0=\u0412
-FormatData/ru/standalone.DayNarrows/1=\u041f
-FormatData/ru/standalone.DayNarrows/2=\u0412
-FormatData/ru/standalone.DayNarrows/3=\u0421
-FormatData/ru/standalone.DayNarrows/4=\u0427
-FormatData/ru/standalone.DayNarrows/5=\u041f
-FormatData/ru/standalone.DayNarrows/6=\u0421
+FormatData/ru/standalone.DayNarrows/0=В
+FormatData/ru/standalone.DayNarrows/1=П
+FormatData/ru/standalone.DayNarrows/2=В
+FormatData/ru/standalone.DayNarrows/3=С
+FormatData/ru/standalone.DayNarrows/4=Ч
+FormatData/ru/standalone.DayNarrows/5=П
+FormatData/ru/standalone.DayNarrows/6=С
 
 FormatData/sk/DayNarrows/0=n
 FormatData/sk/DayNarrows/1=p
 FormatData/sk/DayNarrows/2=u
 FormatData/sk/DayNarrows/3=s
-FormatData/sk/DayNarrows/4=\u0161
+FormatData/sk/DayNarrows/4=š
 FormatData/sk/DayNarrows/5=p
 FormatData/sk/DayNarrows/6=s
 
@@ -7049,7 +7049,7 @@ FormatData/sl/DayNarrows/0=n
 FormatData/sl/DayNarrows/1=p
 FormatData/sl/DayNarrows/2=t
 FormatData/sl/DayNarrows/3=s
-FormatData/sl/DayNarrows/4=\u010d
+FormatData/sl/DayNarrows/4=č
 FormatData/sl/DayNarrows/5=p
 FormatData/sl/DayNarrows/6=s
 
@@ -7061,15 +7061,15 @@ FormatData/sq/DayNarrows/4=e
 FormatData/sq/DayNarrows/5=p
 FormatData/sq/DayNarrows/6=sh
 
-FormatData/sr/DayNarrows/0=\u043d
-FormatData/sr/DayNarrows/1=\u043f
-FormatData/sr/DayNarrows/2=\u0443
-FormatData/sr/DayNarrows/3=\u0441
-FormatData/sr/DayNarrows/4=\u0447
-FormatData/sr/DayNarrows/5=\u043f
-FormatData/sr/DayNarrows/6=\u0441
-FormatData/sr/narrow.Eras/0=\u043f.\u043d.\u0435.
-FormatData/sr/narrow.Eras/1=\u043d.\u0435.
+FormatData/sr/DayNarrows/0=н
+FormatData/sr/DayNarrows/1=п
+FormatData/sr/DayNarrows/2=у
+FormatData/sr/DayNarrows/3=с
+FormatData/sr/DayNarrows/4=ч
+FormatData/sr/DayNarrows/5=п
+FormatData/sr/DayNarrows/6=с
+FormatData/sr/narrow.Eras/0=п.н.е.
+FormatData/sr/narrow.Eras/1=н.е.
 
 FormatData/sv/standalone.MonthNarrows/0=J
 FormatData/sv/standalone.MonthNarrows/1=F
@@ -7103,31 +7103,31 @@ FormatData/sv/narrow.Eras/1=e.Kr.
 FormatData/sv/narrow.AmPmMarkers/0=fm
 FormatData/sv/narrow.AmPmMarkers/1=em
 
-FormatData/th/standalone.MonthNarrows/0=\u0e21.\u0e04.
-FormatData/th/standalone.MonthNarrows/1=\u0e01.\u0e1e.
-FormatData/th/standalone.MonthNarrows/2=\u0e21\u0e35.\u0e04.
-FormatData/th/standalone.MonthNarrows/3=\u0e40\u0e21.\u0e22.
-FormatData/th/standalone.MonthNarrows/4=\u0e1e.\u0e04.
-FormatData/th/standalone.MonthNarrows/5=\u0e21\u0e34.\u0e22.
-FormatData/th/standalone.MonthNarrows/6=\u0e01.\u0e04.
-FormatData/th/standalone.MonthNarrows/7=\u0e2a.\u0e04.
-FormatData/th/standalone.MonthNarrows/8=\u0e01.\u0e22.
-FormatData/th/standalone.MonthNarrows/9=\u0e15.\u0e04.
-FormatData/th/standalone.MonthNarrows/10=\u0e1e.\u0e22.
-FormatData/th/standalone.MonthNarrows/11=\u0e18.\u0e04.
+FormatData/th/standalone.MonthNarrows/0=ม.ค.
+FormatData/th/standalone.MonthNarrows/1=ก.พ.
+FormatData/th/standalone.MonthNarrows/2=มี.ค.
+FormatData/th/standalone.MonthNarrows/3=เม.ย.
+FormatData/th/standalone.MonthNarrows/4=พ.ค.
+FormatData/th/standalone.MonthNarrows/5=มิ.ย.
+FormatData/th/standalone.MonthNarrows/6=ก.ค.
+FormatData/th/standalone.MonthNarrows/7=ส.ค.
+FormatData/th/standalone.MonthNarrows/8=ก.ย.
+FormatData/th/standalone.MonthNarrows/9=ต.ค.
+FormatData/th/standalone.MonthNarrows/10=พ.ย.
+FormatData/th/standalone.MonthNarrows/11=ธ.ค.
 FormatData/th/standalone.MonthNarrows/12=
-FormatData/th/DayNarrows/0=\u0e2d\u0e32
-FormatData/th/DayNarrows/1=\u0e08
-FormatData/th/DayNarrows/2=\u0e2d
-FormatData/th/DayNarrows/3=\u0e1e
-FormatData/th/DayNarrows/4=\u0e1e\u0e24
-FormatData/th/DayNarrows/5=\u0e28
-FormatData/th/DayNarrows/6=\u0e2a
-FormatData/th/narrow.Eras/0=\u0e01\u0e48\u0e2d\u0e19 \u0e04.\u0e28.
-FormatData/th/narrow.Eras/1=\u0e04.\u0e28.
+FormatData/th/DayNarrows/0=อา
+FormatData/th/DayNarrows/1=จ
+FormatData/th/DayNarrows/2=อ
+FormatData/th/DayNarrows/3=พ
+FormatData/th/DayNarrows/4=พฤ
+FormatData/th/DayNarrows/5=ศ
+FormatData/th/DayNarrows/6=ส
+FormatData/th/narrow.Eras/0=ก่อน ค.ศ.
+FormatData/th/narrow.Eras/1=ค.ศ.
 
 FormatData/tr/standalone.MonthNarrows/0=O
-FormatData/tr/standalone.MonthNarrows/1=\u015e
+FormatData/tr/standalone.MonthNarrows/1=Ş
 FormatData/tr/standalone.MonthNarrows/2=M
 FormatData/tr/standalone.MonthNarrows/3=N
 FormatData/tr/standalone.MonthNarrows/4=M
@@ -7142,18 +7142,18 @@ FormatData/tr/standalone.MonthNarrows/12=
 FormatData/tr/DayNarrows/0=P
 FormatData/tr/DayNarrows/1=P
 FormatData/tr/DayNarrows/2=S
-FormatData/tr/DayNarrows/3=\u00c7
+FormatData/tr/DayNarrows/3=Ç
 FormatData/tr/DayNarrows/4=P
 FormatData/tr/DayNarrows/5=C
 FormatData/tr/DayNarrows/6=C
 
-FormatData/uk/DayNarrows/0=\u041d
-FormatData/uk/DayNarrows/1=\u041f
-FormatData/uk/DayNarrows/2=\u0412
-FormatData/uk/DayNarrows/3=\u0421
-FormatData/uk/DayNarrows/4=\u0427
-FormatData/uk/DayNarrows/5=\u041f
-FormatData/uk/DayNarrows/6=\u0421
+FormatData/uk/DayNarrows/0=Н
+FormatData/uk/DayNarrows/1=П
+FormatData/uk/DayNarrows/2=В
+FormatData/uk/DayNarrows/3=С
+FormatData/uk/DayNarrows/4=Ч
+FormatData/uk/DayNarrows/5=П
+FormatData/uk/DayNarrows/6=С
 
 FormatData/vi/DayNarrows/0=CN
 FormatData/vi/DayNarrows/1=T2
@@ -7176,13 +7176,13 @@ FormatData/zh/standalone.MonthNarrows/9=10
 FormatData/zh/standalone.MonthNarrows/10=11
 FormatData/zh/standalone.MonthNarrows/11=12
 FormatData/zh/standalone.MonthNarrows/12=
-FormatData/zh/DayNarrows/0=\u65e5
-FormatData/zh/DayNarrows/1=\u4e00
-FormatData/zh/DayNarrows/2=\u4e8c
-FormatData/zh/DayNarrows/3=\u4e09
-FormatData/zh/DayNarrows/4=\u56db
-FormatData/zh/DayNarrows/5=\u4e94
-FormatData/zh/DayNarrows/6=\u516d
+FormatData/zh/DayNarrows/0=日
+FormatData/zh/DayNarrows/1=一
+FormatData/zh/DayNarrows/2=二
+FormatData/zh/DayNarrows/3=三
+FormatData/zh/DayNarrows/4=四
+FormatData/zh/DayNarrows/5=五
+FormatData/zh/DayNarrows/6=六
 
 # bug 7114053
 LocaleNames/sq/sq=shqip
@@ -7206,33 +7206,33 @@ FormatData/pt/MonthAbbreviations/10=nov.
 FormatData/pt/MonthAbbreviations/11=dez.
 
 # bug 8021121
-CurrencyNames/lv_LV/EUR=\u20ac
+CurrencyNames/lv_LV/EUR=€
 
 # bug # 6192407
-LocaleNames/ko/PT=\ud3ec\ub974\ud22c\uac08
+LocaleNames/ko/PT=포르투갈
 
 # bug 6931564
 LocaleNames/sv/ZA=Sydafrika
 
 # bug 8027695
-FormatData/sv_SE/latn.NumberPatterns/2=#,##0\u00a0%
+FormatData/sv_SE/latn.NumberPatterns/2=#,##0 %
 
 # bug 8017142
-FormatData/es_CL/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_CL/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_CL/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_CL/TimePatterns/3=h:mm\u202fa
-FormatData/es_EC/TimePatterns/0=h:mm:ss\u202fa zzzz
-FormatData/es_EC/TimePatterns/1=h:mm:ss\u202fa z
-FormatData/es_EC/TimePatterns/2=h:mm:ss\u202fa
-FormatData/es_EC/TimePatterns/3=h:mm\u202fa
+FormatData/es_CL/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_CL/TimePatterns/1=h:mm:ss a z
+FormatData/es_CL/TimePatterns/2=h:mm:ss a
+FormatData/es_CL/TimePatterns/3=h:mm a
+FormatData/es_EC/TimePatterns/0=h:mm:ss a zzzz
+FormatData/es_EC/TimePatterns/1=h:mm:ss a z
+FormatData/es_EC/TimePatterns/2=h:mm:ss a
+FormatData/es_EC/TimePatterns/3=h:mm a
 
 # bug 8037343
 FormatData/es_DO/DatePatterns/2=d MMM y
 FormatData/es_DO/DatePatterns/3=d/M/yy
 
 # bug 8055222
-CurrencyNames/lt_LT/EUR=\u20ac
+CurrencyNames/lt_LT/EUR=€
 
 # bug 8042126 + missing MonthNarrows data
 FormatData//MonthNarrows/0=1
@@ -7248,18 +7248,18 @@ FormatData//MonthNarrows/9=10
 FormatData//MonthNarrows/10=11
 FormatData//MonthNarrows/11=12
 FormatData//MonthNarrows/12=
-FormatData/bg/MonthNarrows/0=\u044f
-FormatData/bg/MonthNarrows/1=\u0444
-FormatData/bg/MonthNarrows/2=\u043c
-FormatData/bg/MonthNarrows/3=\u0430
-FormatData/bg/MonthNarrows/4=\u043c
-FormatData/bg/MonthNarrows/5=\u044e
-FormatData/bg/MonthNarrows/6=\u044e
-FormatData/bg/MonthNarrows/7=\u0430
-FormatData/bg/MonthNarrows/8=\u0441
-FormatData/bg/MonthNarrows/9=\u043e
-FormatData/bg/MonthNarrows/10=\u043d
-FormatData/bg/MonthNarrows/11=\u0434
+FormatData/bg/MonthNarrows/0=я
+FormatData/bg/MonthNarrows/1=ф
+FormatData/bg/MonthNarrows/2=м
+FormatData/bg/MonthNarrows/3=а
+FormatData/bg/MonthNarrows/4=м
+FormatData/bg/MonthNarrows/5=ю
+FormatData/bg/MonthNarrows/6=ю
+FormatData/bg/MonthNarrows/7=а
+FormatData/bg/MonthNarrows/8=с
+FormatData/bg/MonthNarrows/9=о
+FormatData/bg/MonthNarrows/10=н
+FormatData/bg/MonthNarrows/11=д
 FormatData/bg/MonthNarrows/12=
 FormatData/zh_TW/MonthNarrows/0=1
 FormatData/zh_TW/MonthNarrows/1=2
@@ -7287,31 +7287,31 @@ FormatData/it/MonthNarrows/9=O
 FormatData/it/MonthNarrows/10=N
 FormatData/it/MonthNarrows/11=D
 FormatData/it/MonthNarrows/12=
-FormatData/ko/MonthNarrows/0=1\uc6d4
-FormatData/ko/MonthNarrows/1=2\uc6d4
-FormatData/ko/MonthNarrows/2=3\uc6d4
-FormatData/ko/MonthNarrows/3=4\uc6d4
-FormatData/ko/MonthNarrows/4=5\uc6d4
-FormatData/ko/MonthNarrows/5=6\uc6d4
-FormatData/ko/MonthNarrows/6=7\uc6d4
-FormatData/ko/MonthNarrows/7=8\uc6d4
-FormatData/ko/MonthNarrows/8=9\uc6d4
-FormatData/ko/MonthNarrows/9=10\uc6d4
-FormatData/ko/MonthNarrows/10=11\uc6d4
-FormatData/ko/MonthNarrows/11=12\uc6d4
+FormatData/ko/MonthNarrows/0=1월
+FormatData/ko/MonthNarrows/1=2월
+FormatData/ko/MonthNarrows/2=3월
+FormatData/ko/MonthNarrows/3=4월
+FormatData/ko/MonthNarrows/4=5월
+FormatData/ko/MonthNarrows/5=6월
+FormatData/ko/MonthNarrows/6=7월
+FormatData/ko/MonthNarrows/7=8월
+FormatData/ko/MonthNarrows/8=9월
+FormatData/ko/MonthNarrows/9=10월
+FormatData/ko/MonthNarrows/10=11월
+FormatData/ko/MonthNarrows/11=12월
 FormatData/ko/MonthNarrows/12=
-FormatData/uk/MonthNarrows/0=\u0441
-FormatData/uk/MonthNarrows/1=\u043b
-FormatData/uk/MonthNarrows/2=\u0431
-FormatData/uk/MonthNarrows/3=\u043a
-FormatData/uk/MonthNarrows/4=\u0442
-FormatData/uk/MonthNarrows/5=\u0447
-FormatData/uk/MonthNarrows/6=\u043b
-FormatData/uk/MonthNarrows/7=\u0441
-FormatData/uk/MonthNarrows/8=\u0432
-FormatData/uk/MonthNarrows/9=\u0436
-FormatData/uk/MonthNarrows/10=\u043b
-FormatData/uk/MonthNarrows/11=\u0433
+FormatData/uk/MonthNarrows/0=с
+FormatData/uk/MonthNarrows/1=л
+FormatData/uk/MonthNarrows/2=б
+FormatData/uk/MonthNarrows/3=к
+FormatData/uk/MonthNarrows/4=т
+FormatData/uk/MonthNarrows/5=ч
+FormatData/uk/MonthNarrows/6=л
+FormatData/uk/MonthNarrows/7=с
+FormatData/uk/MonthNarrows/8=в
+FormatData/uk/MonthNarrows/9=ж
+FormatData/uk/MonthNarrows/10=л
+FormatData/uk/MonthNarrows/11=г
 FormatData/uk/MonthNarrows/12=
 FormatData/lv/MonthNarrows/0=J
 FormatData/lv/MonthNarrows/1=F
@@ -7352,18 +7352,18 @@ FormatData/sk/MonthNarrows/9=o
 FormatData/sk/MonthNarrows/10=n
 FormatData/sk/MonthNarrows/11=d
 FormatData/sk/MonthNarrows/12=
-FormatData/hi_IN/MonthNarrows/0=\u091c
-FormatData/hi_IN/MonthNarrows/1=\u092b\u093c
-FormatData/hi_IN/MonthNarrows/2=\u092e\u093e
-FormatData/hi_IN/MonthNarrows/3=\u0905
-FormatData/hi_IN/MonthNarrows/4=\u092e
-FormatData/hi_IN/MonthNarrows/5=\u091c\u0942
-FormatData/hi_IN/MonthNarrows/6=\u091c\u0941
-FormatData/hi_IN/MonthNarrows/7=\u0905
-FormatData/hi_IN/MonthNarrows/8=\u0938\u093f
-FormatData/hi_IN/MonthNarrows/9=\u0905
-FormatData/hi_IN/MonthNarrows/10=\u0928
-FormatData/hi_IN/MonthNarrows/11=\u0926\u093f
+FormatData/hi_IN/MonthNarrows/0=ज
+FormatData/hi_IN/MonthNarrows/1=फ़
+FormatData/hi_IN/MonthNarrows/2=मा
+FormatData/hi_IN/MonthNarrows/3=अ
+FormatData/hi_IN/MonthNarrows/4=म
+FormatData/hi_IN/MonthNarrows/5=जू
+FormatData/hi_IN/MonthNarrows/6=जु
+FormatData/hi_IN/MonthNarrows/7=अ
+FormatData/hi_IN/MonthNarrows/8=सि
+FormatData/hi_IN/MonthNarrows/9=अ
+FormatData/hi_IN/MonthNarrows/10=न
+FormatData/hi_IN/MonthNarrows/11=दि
 FormatData/hi_IN/MonthNarrows/12=
 FormatData/ga/MonthNarrows/0=E
 FormatData/ga/MonthNarrows/1=F
@@ -7417,23 +7417,23 @@ FormatData/cs/MonthNarrows/9=10
 FormatData/cs/MonthNarrows/10=11
 FormatData/cs/MonthNarrows/11=12
 FormatData/cs/MonthNarrows/12=
-FormatData/el/MonthNarrows/0=\u0399
-FormatData/el/MonthNarrows/1=\u03a6
-FormatData/el/MonthNarrows/2=\u039c
-FormatData/el/MonthNarrows/3=\u0391
-FormatData/el/MonthNarrows/4=\u039c
-FormatData/el/MonthNarrows/5=\u0399
-FormatData/el/MonthNarrows/6=\u0399
-FormatData/el/MonthNarrows/7=\u0391
-FormatData/el/MonthNarrows/8=\u03a3
-FormatData/el/MonthNarrows/9=\u039f
-FormatData/el/MonthNarrows/10=\u039d
-FormatData/el/MonthNarrows/11=\u0394
+FormatData/el/MonthNarrows/0=Ι
+FormatData/el/MonthNarrows/1=Φ
+FormatData/el/MonthNarrows/2=Μ
+FormatData/el/MonthNarrows/3=Α
+FormatData/el/MonthNarrows/4=Μ
+FormatData/el/MonthNarrows/5=Ι
+FormatData/el/MonthNarrows/6=Ι
+FormatData/el/MonthNarrows/7=Α
+FormatData/el/MonthNarrows/8=Σ
+FormatData/el/MonthNarrows/9=Ο
+FormatData/el/MonthNarrows/10=Ν
+FormatData/el/MonthNarrows/11=Δ
 FormatData/el/MonthNarrows/12=
 FormatData/hu/MonthNarrows/0=J
 FormatData/hu/MonthNarrows/1=F
 FormatData/hu/MonthNarrows/2=M
-FormatData/hu/MonthNarrows/3=\u00c1
+FormatData/hu/MonthNarrows/3=Á
 FormatData/hu/MonthNarrows/4=M
 FormatData/hu/MonthNarrows/5=J
 FormatData/hu/MonthNarrows/6=J
@@ -7457,7 +7457,7 @@ FormatData/es/MonthNarrows/10=N
 FormatData/es/MonthNarrows/11=D
 FormatData/es/MonthNarrows/12=
 FormatData/tr/MonthNarrows/0=O
-FormatData/tr/MonthNarrows/1=\u015e
+FormatData/tr/MonthNarrows/1=Ş
 FormatData/tr/MonthNarrows/2=M
 FormatData/tr/MonthNarrows/3=N
 FormatData/tr/MonthNarrows/4=M
@@ -7528,7 +7528,7 @@ FormatData/is/MonthNarrows/3=A
 FormatData/is/MonthNarrows/4=M
 FormatData/is/MonthNarrows/5=J
 FormatData/is/MonthNarrows/6=J
-FormatData/is/MonthNarrows/7=\u00c1
+FormatData/is/MonthNarrows/7=Á
 FormatData/is/MonthNarrows/8=S
 FormatData/is/MonthNarrows/9=O
 FormatData/is/MonthNarrows/10=N
@@ -7562,7 +7562,7 @@ FormatData/en/MonthNarrows/11=D
 FormatData/en/MonthNarrows/12=
 FormatData/ca/MonthNarrows/0=GN
 FormatData/ca/MonthNarrows/1=FB
-FormatData/ca/MonthNarrows/2=M\u00c7
+FormatData/ca/MonthNarrows/2=MÇ
 FormatData/ca/MonthNarrows/3=AB
 FormatData/ca/MonthNarrows/4=MG
 FormatData/ca/MonthNarrows/5=JN
@@ -7599,18 +7599,18 @@ FormatData/fi/MonthNarrows/9=L
 FormatData/fi/MonthNarrows/10=M
 FormatData/fi/MonthNarrows/11=J
 FormatData/fi/MonthNarrows/12=
-FormatData/mk/MonthNarrows/0=\u0458
-FormatData/mk/MonthNarrows/1=\u0444
-FormatData/mk/MonthNarrows/2=\u043c
-FormatData/mk/MonthNarrows/3=\u0430
-FormatData/mk/MonthNarrows/4=\u043c
-FormatData/mk/MonthNarrows/5=\u0458
-FormatData/mk/MonthNarrows/6=\u0458
-FormatData/mk/MonthNarrows/7=\u0430
-FormatData/mk/MonthNarrows/8=\u0441
-FormatData/mk/MonthNarrows/9=\u043e
-FormatData/mk/MonthNarrows/10=\u043d
-FormatData/mk/MonthNarrows/11=\u0434
+FormatData/mk/MonthNarrows/0=ј
+FormatData/mk/MonthNarrows/1=ф
+FormatData/mk/MonthNarrows/2=м
+FormatData/mk/MonthNarrows/3=а
+FormatData/mk/MonthNarrows/4=м
+FormatData/mk/MonthNarrows/5=ј
+FormatData/mk/MonthNarrows/6=ј
+FormatData/mk/MonthNarrows/7=а
+FormatData/mk/MonthNarrows/8=с
+FormatData/mk/MonthNarrows/9=о
+FormatData/mk/MonthNarrows/10=н
+FormatData/mk/MonthNarrows/11=д
 FormatData/mk/MonthNarrows/12=
 FormatData/sr-Latn/MonthNarrows/0=j
 FormatData/sr-Latn/MonthNarrows/1=f
@@ -7625,44 +7625,44 @@ FormatData/sr-Latn/MonthNarrows/9=o
 FormatData/sr-Latn/MonthNarrows/10=n
 FormatData/sr-Latn/MonthNarrows/11=d
 FormatData/sr-Latn/MonthNarrows/12=
-FormatData/th/MonthNarrows/0=\u0e21.\u0e04.
-FormatData/th/MonthNarrows/1=\u0e01.\u0e1e.
-FormatData/th/MonthNarrows/2=\u0e21\u0e35.\u0e04.
-FormatData/th/MonthNarrows/3=\u0e40\u0e21.\u0e22.
-FormatData/th/MonthNarrows/4=\u0e1e.\u0e04.
-FormatData/th/MonthNarrows/5=\u0e21\u0e34.\u0e22.
-FormatData/th/MonthNarrows/6=\u0e01.\u0e04.
-FormatData/th/MonthNarrows/7=\u0e2a.\u0e04.
-FormatData/th/MonthNarrows/8=\u0e01.\u0e22.
-FormatData/th/MonthNarrows/9=\u0e15.\u0e04.
-FormatData/th/MonthNarrows/10=\u0e1e.\u0e22.
-FormatData/th/MonthNarrows/11=\u0e18.\u0e04.
+FormatData/th/MonthNarrows/0=ม.ค.
+FormatData/th/MonthNarrows/1=ก.พ.
+FormatData/th/MonthNarrows/2=มี.ค.
+FormatData/th/MonthNarrows/3=เม.ย.
+FormatData/th/MonthNarrows/4=พ.ค.
+FormatData/th/MonthNarrows/5=มิ.ย.
+FormatData/th/MonthNarrows/6=ก.ค.
+FormatData/th/MonthNarrows/7=ส.ค.
+FormatData/th/MonthNarrows/8=ก.ย.
+FormatData/th/MonthNarrows/9=ต.ค.
+FormatData/th/MonthNarrows/10=พ.ย.
+FormatData/th/MonthNarrows/11=ธ.ค.
 FormatData/th/MonthNarrows/12=
-FormatData/ar/MonthNarrows/0=\u064a
-FormatData/ar/MonthNarrows/1=\u0641
-FormatData/ar/MonthNarrows/2=\u0645
-FormatData/ar/MonthNarrows/3=\u0623
-FormatData/ar/MonthNarrows/4=\u0648
-FormatData/ar/MonthNarrows/5=\u0646
-FormatData/ar/MonthNarrows/6=\u0644
-FormatData/ar/MonthNarrows/7=\u063a
-FormatData/ar/MonthNarrows/8=\u0633
-FormatData/ar/MonthNarrows/9=\u0643
-FormatData/ar/MonthNarrows/10=\u0628
-FormatData/ar/MonthNarrows/11=\u062f
+FormatData/ar/MonthNarrows/0=ي
+FormatData/ar/MonthNarrows/1=ف
+FormatData/ar/MonthNarrows/2=م
+FormatData/ar/MonthNarrows/3=أ
+FormatData/ar/MonthNarrows/4=و
+FormatData/ar/MonthNarrows/5=ن
+FormatData/ar/MonthNarrows/6=ل
+FormatData/ar/MonthNarrows/7=غ
+FormatData/ar/MonthNarrows/8=س
+FormatData/ar/MonthNarrows/9=ك
+FormatData/ar/MonthNarrows/10=ب
+FormatData/ar/MonthNarrows/11=د
 FormatData/ar/MonthNarrows/12=
-FormatData/ru/MonthNarrows/0=\u042f
-FormatData/ru/MonthNarrows/1=\u0424
-FormatData/ru/MonthNarrows/2=\u041c
-FormatData/ru/MonthNarrows/3=\u0410
-FormatData/ru/MonthNarrows/4=\u041c
-FormatData/ru/MonthNarrows/5=\u0418
-FormatData/ru/MonthNarrows/6=\u0418
-FormatData/ru/MonthNarrows/7=\u0410
-FormatData/ru/MonthNarrows/8=\u0421
-FormatData/ru/MonthNarrows/9=\u041e
-FormatData/ru/MonthNarrows/10=\u041d
-FormatData/ru/MonthNarrows/11=\u0414
+FormatData/ru/MonthNarrows/0=Я
+FormatData/ru/MonthNarrows/1=Ф
+FormatData/ru/MonthNarrows/2=М
+FormatData/ru/MonthNarrows/3=А
+FormatData/ru/MonthNarrows/4=М
+FormatData/ru/MonthNarrows/5=И
+FormatData/ru/MonthNarrows/6=И
+FormatData/ru/MonthNarrows/7=А
+FormatData/ru/MonthNarrows/8=С
+FormatData/ru/MonthNarrows/9=О
+FormatData/ru/MonthNarrows/10=Н
+FormatData/ru/MonthNarrows/11=Д
 FormatData/ru/MonthNarrows/12=
 FormatData/ms/MonthNarrows/0=J
 FormatData/ms/MonthNarrows/1=F
@@ -7703,25 +7703,25 @@ FormatData/vi/MonthNarrows/9=10
 FormatData/vi/MonthNarrows/10=11
 FormatData/vi/MonthNarrows/11=12
 FormatData/vi/MonthNarrows/12=
-FormatData/sr/MonthNarrows/0=\u0458
-FormatData/sr/MonthNarrows/1=\u0444
-FormatData/sr/MonthNarrows/2=\u043c
-FormatData/sr/MonthNarrows/3=\u0430
-FormatData/sr/MonthNarrows/4=\u043c
-FormatData/sr/MonthNarrows/5=\u0458
-FormatData/sr/MonthNarrows/6=\u0458
-FormatData/sr/MonthNarrows/7=\u0430
-FormatData/sr/MonthNarrows/8=\u0441
-FormatData/sr/MonthNarrows/9=\u043e
-FormatData/sr/MonthNarrows/10=\u043d
-FormatData/sr/MonthNarrows/11=\u0434
+FormatData/sr/MonthNarrows/0=ј
+FormatData/sr/MonthNarrows/1=ф
+FormatData/sr/MonthNarrows/2=м
+FormatData/sr/MonthNarrows/3=а
+FormatData/sr/MonthNarrows/4=м
+FormatData/sr/MonthNarrows/5=ј
+FormatData/sr/MonthNarrows/6=ј
+FormatData/sr/MonthNarrows/7=а
+FormatData/sr/MonthNarrows/8=с
+FormatData/sr/MonthNarrows/9=о
+FormatData/sr/MonthNarrows/10=н
+FormatData/sr/MonthNarrows/11=д
 FormatData/sr/MonthNarrows/12=
 FormatData/mt/MonthNarrows/0=J
 FormatData/mt/MonthNarrows/1=F
 FormatData/mt/MonthNarrows/2=M
 FormatData/mt/MonthNarrows/3=A
 FormatData/mt/MonthNarrows/4=M
-FormatData/mt/MonthNarrows/5=\u0120
+FormatData/mt/MonthNarrows/5=Ġ
 FormatData/mt/MonthNarrows/6=L
 FormatData/mt/MonthNarrows/7=A
 FormatData/mt/MonthNarrows/8=S
@@ -7815,33 +7815,33 @@ FormatData/fi/DatePatterns/2=d.M.y
 FormatData/fi/DatePatterns/3=d.M.y
 
 # bug #8075173
-FormatData/de/standalone.MonthAbbreviations/2=M\u00e4r
+FormatData/de/standalone.MonthAbbreviations/2=Mär
 
 # bug #8178872
 FormatData/pt_PT/latn.NumberElements/0=,
-FormatData/pt_PT/latn.NumberElements/1=\u00a0
+FormatData/pt_PT/latn.NumberElements/1= 
 FormatData/pt_AO/latn.NumberElements/0=,
-FormatData/pt_AO/latn.NumberElements/1=\u00a0
+FormatData/pt_AO/latn.NumberElements/1= 
 FormatData/pt_CH/latn.NumberElements/0=,
-FormatData/pt_CH/latn.NumberElements/1=\u00a0
+FormatData/pt_CH/latn.NumberElements/1= 
 FormatData/pt_CV/latn.NumberElements/0=,
-FormatData/pt_CV/latn.NumberElements/1=\u00a0
+FormatData/pt_CV/latn.NumberElements/1= 
 FormatData/pt_GQ/latn.NumberElements/0=,
-FormatData/pt_GQ/latn.NumberElements/1=\u00a0
+FormatData/pt_GQ/latn.NumberElements/1= 
 FormatData/pt_MO/latn.NumberElements/0=,
-FormatData/pt_MO/latn.NumberElements/1=\u00a0
+FormatData/pt_MO/latn.NumberElements/1= 
 FormatData/pt_LU/latn.NumberElements/0=,
-FormatData/pt_LU/latn.NumberElements/1=\u00a0
+FormatData/pt_LU/latn.NumberElements/1= 
 FormatData/pt_MZ/latn.NumberElements/0=,
-FormatData/pt_MZ/latn.NumberElements/1=\u00a0
+FormatData/pt_MZ/latn.NumberElements/1= 
 FormatData/pt_ST/latn.NumberElements/0=,
-FormatData/pt_ST/latn.NumberElements/1=\u00a0
+FormatData/pt_ST/latn.NumberElements/1= 
 FormatData/pt_TL/latn.NumberElements/0=,
-FormatData/pt_TL/latn.NumberElements/1=\u00a0
+FormatData/pt_TL/latn.NumberElements/1= 
 FormatData/kea/latn.NumberElements/0=,
-FormatData/kea/latn.NumberElements/1=\u00a0
+FormatData/kea/latn.NumberElements/1= 
 FormatData/kea_CV/latn.NumberElements/0=,
-FormatData/kea_CV/latn.NumberElements/1=\u00a0
+FormatData/kea_CV/latn.NumberElements/1= 
 
 # bug #8202537
 FormatData/ccp_IN/cakm.NumberElements/4=0
@@ -7860,11 +7860,11 @@ FormatData/fr_CH/latn.NumberElements/11=.
 
 # bug # 8295564
 FormatData/nb/latn.NumberElements/0=,
-FormatData/nb/latn.NumberElements/1=\u00a0
+FormatData/nb/latn.NumberElements/1= 
 FormatData/no/latn.NumberElements/0=,
-FormatData/no/latn.NumberElements/1=\u00a0
+FormatData/no/latn.NumberElements/1= 
 FormatData/nn/latn.NumberElements/0=,
-FormatData/nn/latn.NumberElements/1=\u00a0
+FormatData/nn/latn.NumberElements/1= 
 
 # CalendarData consolidated to root
 CalendarData//firstDayOfWeek=1: AG AS BD BR BS BT BW BZ CA CO DM DO ET GT GU HK HN ID IL IN JM JP KE KH KR LA MH MM MO MT MX MZ NI NP PA PE PH PK PR PT PY SA SG SV TH TT TW UM US VE VI WS YE ZA ZW;2: 001 AD AE AI AL AM AN AR AT AU AX AZ BA BE BG BM BN BY CH CL CM CN CR CY CZ DE DK EC EE ES FI FJ FO FR GB GE GF GP GR HR HU IE IS IT KG KZ LB LI LK LT LU LV MC MD ME MK MN MQ MY NL NO NZ PL RE RO RS RU SE SI SK SM TJ TM TR UA UY UZ VA VN XK;6: MV;7: AF BH DJ DZ EG IQ IR JO KW LY OM QA SD SY
@@ -7875,4 +7875,4 @@ TimeZoneNames/en/America\/Ojinaga/1=Central Standard Time
 TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time
 
 # bug 8303472
-LocaleNames/en/TR=T\u00fcrkiye
+LocaleNames/en/TR=Türkiye
diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
index 40c97d93169..009ba718de5 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
@@ -41,7 +41,7 @@
  *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
  *      8251317 8274658 8283277 8283805 8265315 8287868 8295564 8284840 8296715
- *      8301206 8303472 8317979 8306116 8174269 8333582 8357075
+ *      8301206 8303472 8317979 8306116 8174269 8333582 8357075 8357882
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @modules jdk.localedata
@@ -91,9 +91,8 @@
  *    pairs delimited by newline characters, with the keys separated from the values
  *    by = signs.  The keys are similar in syntax to a Unix pathname, with keys at
  *    successive levels of containment in the resource-data hierarchy separated by
- *    slashes.  The file is in ISO 8859-1 encoding, with control characters and
- *    non-ASCII characters denoted with backslash-u escape sequences.  The program also allows
- *    blank lines and comment lines to be interspersed with the data.  Comment lines
+ *    slashes.  The file is in UTF-8 encoding. The program also allows blank lines
+ *    and comment lines to be interspersed with the data.  Comment lines
  *    begin with '#'.
  *
  *    A data file for this test would look something like this:<pre>
@@ -102,8 +101,8 @@
  *        LocaleNames//US=United States
  *        LocaleNames//FR=France
  *        FormatData/fr_FR/MonthNames/0=janvier
- *        FormatData/fr_FR/MonthNames/1=f\u00e9vrier
- *        LocaleNames/fr_FR/US=\u00c9tats-Unis
+ *        FormatData/fr_FR/MonthNames/1=février
+ *        LocaleNames/fr_FR/US=États-Unis
  *        LocaleNames/fr_FR/FR=France</pre>
  *
  *    Second field which designates locale is in the form of:
@@ -144,7 +143,7 @@
  *    date/time format of SimpleDateFormat by making sure that the full date and time
  *    patterns include sufficient data.  The test of this is not whether changes were
  *    made to the locale data; it's whether using this data gives round-trip integrity.
- *    Likewise, changing the currency patterns to use \u00a4 instead of local currency
+ *    Likewise, changing the currency patterns to use ¤ instead of local currency
  *    symbols isn't something that can be tested by this test; instead, you want to
  *    actually format currency values and make sure the proper currency symbol was used.
  *
@@ -160,14 +159,10 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FilterReader;
-import java.io.FilterWriter;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -199,19 +194,17 @@ else if (args[i].equals("-nothrow"))
                 doThrow = false;
 
             else if (args[i].equals("-s") && in == null)
-                in = new BufferedReader(new EscapeReader(new InputStreamReader(System.in,
-                                "ISO8859_1")));
+                in = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
             else if (!args[i].startsWith("-") && in == null)
-                in = new BufferedReader(new EscapeReader(new InputStreamReader(new
-                                FileInputStream(args[i]), "ISO8859_1")));
+                in = new BufferedReader(new InputStreamReader(new
+                                FileInputStream(args[i]), StandardCharsets.UTF_8));
         }
         if (in == null) {
             File localeData = new File(System.getProperty("test.src", "."), DEFAULT_DATAFILE);
-            in = new BufferedReader(new EscapeReader(new InputStreamReader(new
-                            FileInputStream(localeData), "ISO8859_1")));
+            in = new BufferedReader(new InputStreamReader(new
+                            FileInputStream(localeData), StandardCharsets.UTF_8));
         }
-        out = new PrintWriter(new EscapeWriter(new OutputStreamWriter(System.out,
-                        "ISO8859_1")), true);
+        out = new PrintWriter(new OutputStreamWriter(System.out, StandardCharsets.UTF_8));
 
         // perform the actual test
         int errorCount = doTest(in, out, writeNewFile);
@@ -394,97 +387,3 @@ else if (resource instanceof String[][]) {
         return true;
     }
 }
-
-class EscapeReader extends FilterReader {
-    public EscapeReader(Reader in) {
-        super(in);
-    }
-
-    public int read() throws IOException {
-        if (buffer != null) {
-            String b = buffer.toString();
-            int result = b.charAt(0);
-            if (b.length() > 1)
-                buffer = new StringBuffer(b.substring(1));
-            else
-                buffer = null;
-            return result;
-        }
-        else {
-            int result = super.read();
-            if (result != '\\')
-                return result;
-            else {
-                buffer = new StringBuffer();
-                result = super.read();
-                buffer.append((char)result);
-                if (result == 'u') {
-                    for (int i = 0; i < 4; i++) {
-                        result = super.read();
-                        if (result == -1)
-                            break;
-                        buffer.append((char)result);
-                    }
-                    String number = buffer.toString().substring(1);
-                    result = Integer.parseInt(number, 16);
-                    buffer = null;
-                    return result;
-                }
-                return '\\';
-            }
-        }
-    }
-
-    public int read(char[] cbuf, int start, int len) throws IOException {
-        int p = start;
-        int end = start + len;
-        int c = 0;
-        while (c != -1 && p < end) {
-            c = read();
-            if (c != -1)
-                cbuf[p++] = (char)c;
-        }
-        if (c == -1 && p == start)
-            return -1;
-        else
-            return p - start;
-    }
-
-    private StringBuffer buffer = null;
-}
-
-class EscapeWriter extends FilterWriter {
-    public EscapeWriter(Writer out) {
-        super(out);
-    }
-
-    public void write(int c) throws IOException {
-        if ((c >= ' ' && c <= '\u007e') || c == '\r' || c == '\n')
-            super.write(c);
-        else {
-            super.write('\\');
-            super.write('u');
-            String number = Integer.toHexString(c);
-            if (number.length() < 4)
-                number = zeros.substring(0, 4 - number.length()) + number;
-            super.write(number.charAt(0));
-            super.write(number.charAt(1));
-            super.write(number.charAt(2));
-            super.write(number.charAt(3));
-        }
-    }
-
-    public void write(char[] cbuf, int off, int len) throws IOException {
-        int end = off + len;
-        while (off < end)
-            write(cbuf[off++]);
-    }
-
-    public void write(String str, int off, int len) throws IOException {
-        int end = off + len;
-        while (off < end)
-            write(str.charAt(off++));
-    }
-
-    private static String zeros = "0000";
-}

From 3cc630985d47be6ba4cf991698e999f17dbde203 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 30 May 2025 17:36:03 +0000
Subject: [PATCH 737/901] 8353955: nsk/jdi tests should be fixed to not always
 require includevirtualthreads=y

Reviewed-by: sspitsyn, amenkov, lmesnik
---
 .../thread/thread001/TestDescription.java     |  3 +-
 .../invokemethod011/TestDescription.java      |  3 +-
 .../invokemethod012/TestDescription.java      |  3 +-
 .../invokemethod013/TestDescription.java      |  3 +-
 .../request/request001/TestDescription.java   |  3 +-
 .../nextevent001/TestDescription.java         |  3 +-
 .../crstepreq005/TestDescription.java         |  3 +-
 .../crstepreq006/TestDescription.java         |  3 +-
 .../crstepreq007/TestDescription.java         |  3 +-
 .../crstepreq008/TestDescription.java         |  3 +-
 .../crstepreq009/TestDescription.java         |  3 +-
 .../crstepreq010/TestDescription.java         |  3 +-
 .../stepreq001/TestDescription.java           |  3 +-
 .../thread/thread001/TestDescription.java     |  3 +-
 .../invokemethod010/TestDescription.java      |  3 +-
 .../invokemethod011/TestDescription.java      |  3 +-
 .../invokemethod012/TestDescription.java      |  3 +-
 .../invokemethod013/TestDescription.java      |  3 +-
 .../waitingthreads002/TestDescription.java    |  3 +-
 .../thread/thread001/TestDescription.java     |  3 +-
 .../allthreads001/TestDescription.java        |  3 +-
 .../vmTestbase/nsk/share/ArgumentParser.java  |  4 +--
 .../vmTestbase/nsk/share/jdi/Binder.java      |  6 ++--
 .../share/jdi/SerialExecutionDebugger.java    |  5 ++--
 .../share/jpda/DebugeeArgumentHandler.java    | 29 ++++++++++++++-----
 25 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java
index cea844bba80..b6c9c93c485 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassPrepareEvent/thread/thread001/TestDescription.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
@@ -81,6 +81,7 @@
  * @run driver
  *      nsk.jdi.ClassPrepareEvent.thread.thread001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java
index adb7b99567c..4c72804bc41 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.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
@@ -56,6 +56,7 @@
  * @run driver
  *      nsk.jdi.ClassType.invokeMethod.invokemethod011
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java
index e675bf3c3fc..2bea9cc5209 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012/TestDescription.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
@@ -54,6 +54,7 @@
  * @run driver
  *      nsk.jdi.ClassType.invokeMethod.invokemethod012
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java
index ed341632008..5224d9350da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013/TestDescription.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
@@ -54,6 +54,7 @@
  * @run driver
  *      nsk.jdi.ClassType.invokeMethod.invokemethod013
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java
index 37f3750bee4..87f7d9f57aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/Event/request/request001/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.Event.request.request001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java
index 237158dd6fc..01d425015bf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventIterator/nextEvent/nextevent001/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.EventIterator.nextEvent.nextevent001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java
index e8c1809dec5..1d3ac400931 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq005/TestDescription.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
@@ -71,6 +71,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq005
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java
index 00f5b29388b..810483e0740 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq006/TestDescription.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
@@ -71,6 +71,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq006
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java
index 561e3fd5580..f1897446525 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq007/TestDescription.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
@@ -69,6 +69,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq007
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java
index 66f744debf8..47fa4bbb940 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq008/TestDescription.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
@@ -71,6 +71,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq008
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java
index 92a997a0b3d..bc059e87c86 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq009/TestDescription.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
@@ -71,6 +71,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq009
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java
index 793141637a1..9117c5dc640 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq010/TestDescription.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
@@ -70,6 +70,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.createStepRequest.crstepreq010
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java
index a95b34f511d..62362a737a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/stepRequests/stepreq001/TestDescription.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
@@ -51,6 +51,7 @@
  * @run driver
  *      nsk.jdi.EventRequestManager.stepRequests.stepreq001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java
index ff8bed293ad..e885341a1b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocatableEvent/thread/thread001/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.LocatableEvent.thread.thread001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java
index 951028bb112..da2c2d31fc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010/TestDescription.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
@@ -61,6 +61,7 @@
  * @run driver
  *      nsk.jdi.ObjectReference.invokeMethod.invokemethod010
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java
index d152338e488..3cda0572ff6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.ObjectReference.invokeMethod.invokemethod011
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java
index b39a8723c9f..fb0d9cb0345 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod012/TestDescription.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
@@ -58,6 +58,7 @@
  * @run driver
  *      nsk.jdi.ObjectReference.invokeMethod.invokemethod012
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java
index b18bc0a9fb1..94d7bf4f473 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod013/TestDescription.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
@@ -58,6 +58,7 @@
  * @run driver
  *      nsk.jdi.ObjectReference.invokeMethod.invokemethod013
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java
index 0edb28dd0e1..ac1e9e49672 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/waitingThreads/waitingthreads002/TestDescription.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,6 +62,7 @@
  * @run driver
  *      nsk.jdi.ObjectReference.waitingThreads.waitingthreads002
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java
index abcc5e8a18a..0b6ae5920c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001/TestDescription.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
@@ -88,6 +88,7 @@
  * @run driver
  *      nsk.jdi.ThreadStartEvent.thread.thread001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java
index 0156e863a31..fe5f9b09b00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/allThreads/allthreads001/TestDescription.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
@@ -73,6 +73,7 @@
  * @run driver
  *      nsk.jdi.VirtualMachine.allThreads.allthreads001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/ArgumentParser.java b/test/hotspot/jtreg/vmTestbase/nsk/share/ArgumentParser.java
index be92244b417..4c5ffe97e7b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/ArgumentParser.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/ArgumentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, 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
@@ -476,7 +476,7 @@ protected boolean checkOption(String option, String value) {
         if (option.equals("verbose")
                 || option.equals("vbs")
                 || option.equals("trace.time")) {
-            if (!(value == null || value.length() <= 0)) {
+            if (!(value == null || value.length() == 0)) {
                 throw new BadOption(option + ": no value must be specified");
             }
             return true;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
index 9879b68775f..646d6e9e39e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.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
@@ -518,7 +518,7 @@ private Map<String,? extends Argument> setupLaunchingConnector(LaunchingConnecto
 
         // This flag is needed so VirtualMachine.allThreads() includes known vthreads.
         arg = (Connector.StringArgument) arguments.get("includevirtualthreads");
-        arg.setValue("y");
+        arg.setValue(argumentHandler.isIncludeVirtualThreads() ? "y" : "n");
 
         String vmArgs = "";
 
@@ -750,4 +750,4 @@ private static byte[] readAllBytes(InputStream is) throws IOException {
         return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
     }
 
-}
\ No newline at end of file
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
index 48546cc6a63..52add61cdf6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/SerialExecutionDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, 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
@@ -111,8 +111,9 @@ protected String[] doInit(String args[], PrintStream out) {
             if (args[i].equals("-configFile") && (i < args.length - 1)) {
                 configFileName = args[i + 1];
                 i++;
-            } else
+            } else {
                 standardArgs.add(args[i]);
+            }
         }
 
         if (configFileName == null) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeArgumentHandler.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeArgumentHandler.java
index 72461a52309..72b8076f927 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeArgumentHandler.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeArgumentHandler.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
@@ -83,9 +83,9 @@
  */
 public class DebugeeArgumentHandler extends ArgumentParser {
 
-    public static final String DEFAULT_PIPE_PORT                                = "7123";
-    public static final String DEFAULT_TRANSPORT_PORT                   = "8123";
-    public static final String DEFAULT_BIND_PORT                                = "9123";
+    public static final String DEFAULT_PIPE_PORT      = "7123";
+    public static final String DEFAULT_TRANSPORT_PORT = "8123";
+    public static final String DEFAULT_BIND_PORT      = "9123";
 
 
     /**
@@ -103,6 +103,16 @@ public DebugeeArgumentHandler(String args[]) {
         super(args);
     }
 
+    /**
+     * Return <i>true</i> if <code>-includevirtualthreads</code> command line option
+     * is specified.
+     *
+     * @see #setRawArguments(String[])
+     */
+    public boolean isIncludeVirtualThreads() {
+        return options.getProperty("includevirtualthreads") != null;
+    }
+
     /**
      * Return name of the host where test executes, specified by
      * <code>-test.host</code> command line option or
@@ -471,7 +481,7 @@ public String getJVMDIStrictMode() {
     }
 
     /**
-     * Return <i>true</i> if JVMDI strict mode for launching debugeeVM is used^
+     * Return <i>true</i> if JVMDI strict mode for launching debugeeVM is used
      * either by specifying in command line or by default.
      *
      * @see #getJVMDIStrictMode()
@@ -648,8 +658,13 @@ public IOPipe createDebugeeIOPipe(Log log) {
      */
     protected boolean checkOption(String option, String value) {
 
-        if(option.equals("traceAll"))
-            return true;
+        if (option.equals("traceAll")
+            || option.equals("includevirtualthreads")) {
+            if (!(value == null || value.length() == 0)) {
+                throw new BadOption(option + ": no value must be specified");
+            }
+           return true;
+        }
 
         // option with any string value
         if (option.equals("debugee.vmkeys")) {

From 82807d43f8d18b186428be88a80ebe28892517cc Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 30 May 2025 17:58:46 +0000
Subject: [PATCH 738/901] 8357184: Test
 vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008/TestDescription.java
 fails with unreported exception

Reviewed-by: lmesnik, sspitsyn
---
 .../ExceptionEvent/_itself_/exevent008.java    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java
index ffd217b31bc..4efbd53c66a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ExceptionEvent/_itself_/exevent008.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
@@ -80,7 +80,7 @@ public class exevent008 {
     private ExceptionRequest eRequest;
     private ReferenceType rType, rTypeEx;
     private String cmd;
-    private int counter1 = 0, counter2 = 0;
+    private volatile boolean exception1Received = false, exception2Received = false;
     private volatile int tot_res = PASSED;
 
     public static void main (String argv[]) {
@@ -134,7 +134,6 @@ private int runIt(String argv[], PrintStream out) {
         elThread.start();
 
         log.display("Forcing debuggee to generate caught exception");
-        counter1 = 0;
         pipe.println(COMMAND_TEST1);
 
         if (!cmd.equals(COMMAND_READY)) {
@@ -145,7 +144,6 @@ private int runIt(String argv[], PrintStream out) {
         log.display("Exception caught");
 
         log.display("Forcing debuggee to generate uncaught exception");
-        counter1 = 0;
         pipe.println(COMMAND_TEST2);
 
         log.display("Waiting for debuggee exits due to uncaught exception");
@@ -161,12 +159,12 @@ private int runIt(String argv[], PrintStream out) {
             return quitDebuggee();
         }
 
-        if (counter1 == 0) {
+        if (!exception1Received) {
             log.complain("TEST FAILED: caught exception " + DEBUGGEE_EXCEPTION1 +
                      " was not reported by the debugger");
             tot_res = FAILED;
         }
-        if (counter2 == 0) {
+        if (!exception2Received) {
             log.complain("TEST FAILED: uncaught exception " + DEBUGGEE_EXCEPTION2 +
                      " was not reported by the debugger");
             tot_res = FAILED;
@@ -243,13 +241,13 @@ public void run() {
                                     if (exEvent.exception().referenceType().name().equals(DEBUGGEE_EXCEPTION1)) {
                                         log.display("CException event equals to expected for caught exception\n\t" +
                                                 exEvent.exception().referenceType().name());
-                                        counter1++;
-                                        log.display("\t" + "counter1 = " + counter1);
+                                        exception1Received = true;
+                                        log.display("\t" + "exception1Received = " + exception1Received);
                                     } else if (exEvent.exception().referenceType().name().equals(DEBUGGEE_EXCEPTION2)) {
                                         log.display("Exception event equals to expected for uncaught exception\n\t" +
                                                 exEvent.exception().referenceType().name());
-                                        counter2++;
-                                        log.display("\t" + "counter2 = " + counter2);
+                                        exception2Received = true;
+                                        log.display("\t" + "exception2Received = " + exception2Received);
                                     }
                                 }
                             } else {

From b7ca672d5c5f11f472110154868f08299f6e8796 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Fri, 30 May 2025 18:26:19 +0000
Subject: [PATCH 739/901] 8357047: [ubsan]
 AdapterFingerPrint::AdapterFingerPrint runtime error: index 3 out of bounds

Reviewed-by: kvn, adinn
---
 src/hotspot/share/runtime/sharedRuntime.cpp | 53 ++++++++++-----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index a3546e0f5a2..edb33b3500a 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -2177,7 +2177,6 @@ static int _lookups; // number of calls to lookup
 static int _equals;  // number of buckets checked with matching hash
 static int _archived_hits; // number of successful lookups in archived table
 static int _runtime_hits;  // number of successful lookups in runtime table
-static int _compact; // number of equals calls with compact signature
 #endif
 
 // A simple wrapper class around the calling convention information
@@ -2188,18 +2187,22 @@ class AdapterFingerPrint : public MetaspaceObj {
     _basic_type_bits = 4,
     _basic_type_mask = right_n_bits(_basic_type_bits),
     _basic_types_per_int = BitsPerInt / _basic_type_bits,
-    _compact_int_count = 3
   };
   // TO DO:  Consider integrating this with a more global scheme for compressing signatures.
   // For now, 4 bits per components (plus T_VOID gaps after double/long) is not excessive.
 
   int _length;
-  int _value[_compact_int_count];
+
+  static int data_offset() { return sizeof(AdapterFingerPrint); }
+  int* data_pointer() {
+    return (int*)((address)this + data_offset());
+  }
 
   // Private construtor. Use allocate() to get an instance.
   AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
+    int* data = data_pointer();
     // Pack the BasicTypes with 8 per int
-    _length = (total_args_passed + (_basic_types_per_int-1)) / _basic_types_per_int;
+    _length = length(total_args_passed);
     int sig_index = 0;
     for (int index = 0; index < _length; index++) {
       int value = 0;
@@ -2208,7 +2211,7 @@ class AdapterFingerPrint : public MetaspaceObj {
         assert((bt & _basic_type_mask) == bt, "must fit in 4 bits");
         value = (value << _basic_type_bits) | bt;
       }
-      _value[index] = value;
+      data[index] = value;
     }
   }
 
@@ -2217,6 +2220,15 @@ class AdapterFingerPrint : public MetaspaceObj {
     FreeHeap(this);
   }
 
+  static int length(int total_args) {
+    return (total_args + (_basic_types_per_int-1)) / _basic_types_per_int;
+  }
+
+  static int compute_size(int total_args_passed, BasicType* sig_bt) {
+    int len = length(total_args_passed);
+    return sizeof(AdapterFingerPrint) + (len * sizeof(int));
+  }
+
   // Remap BasicTypes that are handled equivalently by the adapters.
   // These are correct for the current system but someday it might be
   // necessary to make this mapping platform dependent.
@@ -2276,13 +2288,8 @@ class AdapterFingerPrint : public MetaspaceObj {
   }
 
  public:
-  static int allocation_size(int total_args_passed, BasicType* sig_bt) {
-    int len = (total_args_passed + (_basic_types_per_int-1)) / _basic_types_per_int;
-    return sizeof(AdapterFingerPrint) + (len > _compact_int_count ? (len - _compact_int_count) * sizeof(int) : 0);
-  }
-
   static AdapterFingerPrint* allocate(int total_args_passed, BasicType* sig_bt) {
-    int size_in_bytes = allocation_size(total_args_passed, sig_bt);
+    int size_in_bytes = compute_size(total_args_passed, sig_bt);
     return new (size_in_bytes) AdapterFingerPrint(total_args_passed, sig_bt);
   }
 
@@ -2291,18 +2298,14 @@ class AdapterFingerPrint : public MetaspaceObj {
   }
 
   int value(int index) {
-    return _value[index];
+    int* data = data_pointer();
+    return data[index];
   }
 
   int length() {
-    if (_length < 0) return -_length;
     return _length;
   }
 
-  bool is_compact() {
-    return _length <= _compact_int_count;
-  }
-
   unsigned int compute_hash() {
     int hash = 0;
     for (int i = 0; i < length(); i++) {
@@ -2405,7 +2408,7 @@ class AdapterFingerPrint : public MetaspaceObj {
       return false;
     } else {
       for (int i = 0; i < _length; i++) {
-        if (_value[i] != other->_value[i]) {
+        if (value(i) != other->value(i)) {
           return false;
         }
       }
@@ -2415,7 +2418,7 @@ class AdapterFingerPrint : public MetaspaceObj {
 
   // methods required by virtue of being a MetaspaceObj
   void metaspace_pointers_do(MetaspaceClosure* it) { return; /* nothing to do here */ }
-  int size() const { return (int)heap_word_size(sizeof(AdapterFingerPrint) + (_length > _compact_int_count ? (_length - _compact_int_count) * sizeof(int) : 0)); }
+  int size() const { return (int)heap_word_size(sizeof(AdapterFingerPrint) + (_length * sizeof(int))); }
   MetaspaceObj::Type type() const { return AdapterFingerPrintType; }
 
   static bool equals(AdapterFingerPrint* const& fp1, AdapterFingerPrint* const& fp2) {
@@ -2459,14 +2462,11 @@ AdapterHandlerEntry* AdapterHandlerLibrary::lookup(int total_args_passed, BasicT
   if (AOTCodeCache::is_using_adapter()) {
     // Search archived table first. It is read-only table so can be searched without lock
     entry = _aot_adapter_handler_table.lookup(fp, fp->compute_hash(), 0 /* unused */);
-    if (entry != nullptr) {
 #ifndef PRODUCT
-      if (fp->is_compact()) {
-        _compact++;
-      }
+    if (entry != nullptr) {
       _archived_hits++;
-#endif
     }
+#endif
   }
 #endif // INCLUDE_CDS
   if (entry == nullptr) {
@@ -2478,7 +2478,6 @@ AdapterHandlerEntry* AdapterHandlerLibrary::lookup(int total_args_passed, BasicT
              entry->fingerprint()->as_basic_args_string(), entry->fingerprint()->as_string(), entry->fingerprint()->compute_hash(),
              fp->as_basic_args_string(), fp->as_string(), fp->compute_hash());
   #ifndef PRODUCT
-      if (fp->is_compact()) _compact++;
       _runtime_hits++;
   #endif
     }
@@ -2497,8 +2496,8 @@ static void print_table_statistics() {
   tty->print_cr("AdapterHandlerTable (table_size=%d, entries=%d)",
                 _adapter_handler_table->table_size(), _adapter_handler_table->number_of_entries());
   int total_hits = _archived_hits + _runtime_hits;
-  tty->print_cr("AdapterHandlerTable: lookups %d equals %d hits %d (archived=%d+runtime=%d) compact %d",
-                _lookups, _equals, total_hits, _archived_hits, _runtime_hits, _compact);
+  tty->print_cr("AdapterHandlerTable: lookups %d equals %d hits %d (archived=%d+runtime=%d)",
+                _lookups, _equals, total_hits, _archived_hits, _runtime_hits);
 }
 #endif
 

From 94039e22bbe943888e858d8ae278145e2668526a Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Fri, 30 May 2025 19:16:17 +0000
Subject: [PATCH 740/901] 8353230: Emoji rendering regression after JDK-8208377

Reviewed-by: prr, honkar
---
 .../classes/sun/font/CCharToGlyphMapper.java  |  60 ++++---
 .../share/classes/sun/font/CMap.java          |  44 +----
 .../classes/sun/font/CharToGlyphMapper.java   |   9 +-
 .../sun/font/CompositeGlyphMapper.java        |  58 +++----
 .../share/classes/sun/font/Font2D.java        |  10 +-
 .../share/classes/sun/font/FontUtilities.java |  14 ++
 .../share/classes/sun/font/HBShaper.java      |   6 +-
 .../classes/sun/font/TrueTypeGlyphMapper.java |  38 ++--
 .../classes/sun/font/Type1GlyphMapper.java    |  24 ++-
 .../classes/sun/print/RasterPrinterJob.java   |   6 +-
 .../share/native/libfontmanager/sunFont.c     |   6 +-
 .../classes/sun/font/NativeGlyphMapper.java   |   6 +-
 .../font/GlyphVector/GlyphVectorGsubTest.java | 164 ++++++++++++++++++
 13 files changed, 318 insertions(+), 127 deletions(-)
 create mode 100644 test/jdk/java/awt/font/GlyphVector/GlyphVectorGsubTest.java

diff --git a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
index 5eb05a9f93e..7ce12b7d4f7 100644
--- a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
+++ b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
@@ -27,6 +27,9 @@
 
 import java.util.HashMap;
 
+import static sun.font.FontUtilities.isDefaultIgnorable;
+import static sun.font.FontUtilities.isIgnorableWhitespace;
+
 public class CCharToGlyphMapper extends CharToGlyphMapper {
     private static native int countGlyphs(final long nativeFontPtr);
 
@@ -47,12 +50,12 @@ public int getNumGlyphs() {
     }
 
     public boolean canDisplay(char ch) {
-        int glyph = charToGlyph(ch);
+        int glyph = charToGlyph(ch, false);
         return glyph != missingGlyph;
     }
 
     public boolean canDisplay(int cp) {
-        int glyph = charToGlyph(cp);
+        int glyph = charToGlyph(cp, false);
         return glyph != missingGlyph;
     }
 
@@ -89,17 +92,17 @@ public synchronized boolean charsToGlyphsNS(int count,
     }
 
     public synchronized int charToGlyph(char unicode) {
-        int glyph = cache.get(unicode);
+        return charToGlyph(unicode, false);
+    }
+
+    private int charToGlyph(char unicode, boolean raw) {
+        int glyph = cache.get(unicode, raw);
         if (glyph != 0) return glyph;
 
-        if (FontUtilities.isDefaultIgnorable(unicode) || isIgnorableWhitespace(unicode)) {
-            glyph = INVISIBLE_GLYPH_ID;
-        } else {
-            final char[] unicodeArray = new char[] { unicode };
-            final int[] glyphArray = new int[1];
-            nativeCharsToGlyphs(fFont.getNativeFontPtr(), 1, unicodeArray, glyphArray);
-            glyph = glyphArray[0];
-        }
+        final char[] unicodeArray = new char[] { unicode };
+        final int[] glyphArray = new int[1];
+        nativeCharsToGlyphs(fFont.getNativeFontPtr(), 1, unicodeArray, glyphArray);
+        glyph = glyphArray[0];
 
         cache.put(unicode, glyph);
 
@@ -107,35 +110,37 @@ public synchronized int charToGlyph(char unicode) {
     }
 
     public synchronized int charToGlyph(int unicode) {
+        return charToGlyph(unicode, false);
+    }
+
+    public synchronized int charToGlyphRaw(int unicode) {
+        return charToGlyph(unicode, true);
+    }
+
+    private int charToGlyph(int unicode, boolean raw) {
         if (unicode >= 0x10000) {
             int[] glyphs = new int[2];
             char[] surrogates = new char[2];
             int base = unicode - 0x10000;
             surrogates[0] = (char)((base >>> 10) + HI_SURROGATE_START);
             surrogates[1] = (char)((base % 0x400) + LO_SURROGATE_START);
-            charsToGlyphs(2, surrogates, glyphs);
+            cache.get(2, surrogates, glyphs, raw);
             return glyphs[0];
          } else {
-             return charToGlyph((char)unicode);
+             return charToGlyph((char) unicode, raw);
          }
     }
 
     public synchronized void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
-        cache.get(count, unicodes, glyphs);
+        cache.get(count, unicodes, glyphs, false);
     }
 
     public synchronized void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
         for (int i = 0; i < count; i++) {
-            glyphs[i] = charToGlyph(unicodes[i]);
+            glyphs[i] = charToGlyph(unicodes[i], false);
         }
     }
 
-    // Matches behavior in e.g. CMap.getControlCodeGlyph(int, boolean)
-    // and RasterPrinterJob.removeControlChars(String)
-    private static boolean isIgnorableWhitespace(int code) {
-        return code == 0x0009 || code == 0x000a || code == 0x000d;
-    }
-
     // This mapper returns either the glyph code, or if the character can be
     // replaced on-the-fly using CoreText substitution; the negative unicode
     // value. If this "glyph code int" is treated as an opaque code, it will
@@ -159,7 +164,11 @@ private class Cache {
             firstLayerCache[1] = 1;
         }
 
-        public synchronized int get(final int index) {
+        public synchronized int get(final int index, final boolean raw) {
+            if (isIgnorableWhitespace(index) || (isDefaultIgnorable(index) && !raw)) {
+                return INVISIBLE_GLYPH_ID;
+            }
+
             if (index < FIRST_LAYER_SIZE) {
                 // catch common glyphcodes
                 return firstLayerCache[index];
@@ -230,7 +239,7 @@ public void put(final int index, final int value) {
             }
         }
 
-        public synchronized void get(int count, char[] indices, int[] values)
+        public synchronized void get(int count, char[] indices, int[] values, boolean raw)
         {
             // "missed" is the count of 'char' that are not mapped.
             // Surrogates count for 2.
@@ -252,16 +261,13 @@ public synchronized void get(int count, char[] indices, int[] values)
                     }
                 }
 
-                final int value = get(code);
+                final int value = get(code, raw);
                 if (value != 0 && value != -1) {
                     values[i] = value;
                     if (code >= 0x10000) {
                         values[i+1] = INVISIBLE_GLYPH_ID;
                         i++;
                     }
-                } else if (FontUtilities.isDefaultIgnorable(code) || isIgnorableWhitespace(code)) {
-                    values[i] = INVISIBLE_GLYPH_ID;
-                    put(code, INVISIBLE_GLYPH_ID);
                 } else {
                     values[i] = 0;
                     put(code, -1);
diff --git a/src/java.desktop/share/classes/sun/font/CMap.java b/src/java.desktop/share/classes/sun/font/CMap.java
index 3cb1ad57751..2bb582a8a9a 100644
--- a/src/java.desktop/share/classes/sun/font/CMap.java
+++ b/src/java.desktop/share/classes/sun/font/CMap.java
@@ -546,9 +546,8 @@ char getGlyph(int charCode) {
             int index = 0;
             char glyphCode = 0;
 
-            int controlGlyph = getControlCodeGlyph(charCode, true);
-            if (controlGlyph >= 0) {
-                return (char)controlGlyph;
+            if (isSurrogate(charCode)) {
+                return 0;
             }
 
             /* presence of translation array indicates that this
@@ -633,13 +632,6 @@ static class CMapFormat0 extends CMap {
 
         char getGlyph(int charCode) {
             if (charCode < 256) {
-                if (charCode < 0x0010) {
-                    switch (charCode) {
-                    case 0x0009:
-                    case 0x000a:
-                    case 0x000d: return CharToGlyphMapper.INVISIBLE_GLYPH_ID;
-                    }
-                }
                 return (char)(0xff & cmap[charCode]);
             } else {
                 return 0;
@@ -778,10 +770,8 @@ static class CMapFormat2 extends CMap {
         }
 
         char getGlyph(int charCode) {
-            final int origCharCode = charCode;
-            int controlGlyph = getControlCodeGlyph(charCode, true);
-            if (controlGlyph >= 0) {
-                return (char)controlGlyph;
+            if (isSurrogate(charCode)) {
+                return 0;
             }
 
             if (xlat != null) {
@@ -858,11 +848,9 @@ static class CMapFormat6 extends CMap {
          }
 
          char getGlyph(int charCode) {
-            final int origCharCode = charCode;
-            int controlGlyph = getControlCodeGlyph(charCode, true);
-            if (controlGlyph >= 0) {
-                return (char)controlGlyph;
-            }
+             if (isSurrogate(charCode)) {
+                 return 0;
+             }
 
              if (xlat != null) {
                  charCode = xlat[charCode];
@@ -1020,11 +1008,6 @@ static class CMapFormat12 extends CMap {
         }
 
         char getGlyph(int charCode) {
-            final int origCharCode = charCode;
-            int controlGlyph = getControlCodeGlyph(charCode, false);
-            if (controlGlyph >= 0) {
-                return (char)controlGlyph;
-            }
             int probe = power;
             int range = 0;
 
@@ -1060,17 +1043,8 @@ char getGlyph(int charCode) {
 
     public static final NullCMapClass theNullCmap = new NullCMapClass();
 
-    final int getControlCodeGlyph(int charCode, boolean noSurrogates) {
-        if (charCode < 0x0010) {
-            switch (charCode) {
-            case 0x0009:
-            case 0x000a:
-            case 0x000d: return CharToGlyphMapper.INVISIBLE_GLYPH_ID;
-            }
-         } else if (noSurrogates && charCode >= 0xFFFF) {
-            return 0;
-        }
-        return -1;
+    private static boolean isSurrogate(int charCode) {
+        return charCode >= 0xFFFF;
     }
 
     static class UVS {
diff --git a/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java b/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java
index bac385d81db..3b50b0e8876 100644
--- a/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java
+++ b/src/java.desktop/share/classes/sun/font/CharToGlyphMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, 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
@@ -86,6 +86,13 @@ public int charToVariationGlyph(int unicode, int variationSelector) {
         return charToGlyph(unicode);
     }
 
+    public int charToVariationGlyphRaw(int unicode, int variationSelector) {
+        // Override this if variation selector is supported.
+        return charToGlyphRaw(unicode);
+    }
+
+    public abstract int charToGlyphRaw(int unicode);
+
     public abstract int getNumGlyphs();
 
     public abstract void charsToGlyphs(int count,
diff --git a/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java b/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
index cd53d96d0f4..673e2eb0d9f 100644
--- a/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
+++ b/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, 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
@@ -42,6 +42,9 @@
  * this appears to cause problems.
  */
 
+import static sun.font.FontUtilities.isDefaultIgnorable;
+import static sun.font.FontUtilities.isIgnorableWhitespace;
+
 public class CompositeGlyphMapper extends CharToGlyphMapper {
 
     public static final int SLOTMASK =  0xff000000;
@@ -51,7 +54,6 @@ public class CompositeGlyphMapper extends CharToGlyphMapper {
     public static final int BLOCKSZ = 256;
     public static final int MAXUNICODE = NBLOCKS*BLOCKSZ;
 
-
     CompositeFont font;
     CharToGlyphMapper[] slotMappers;
     int[][] glyphMaps;
@@ -96,7 +98,7 @@ private int getCachedGlyphCode(int unicode) {
 
     private void setCachedGlyphCode(int unicode, int glyphCode) {
         if (unicode >= MAXUNICODE) {
-            return;     // don't cache surrogates
+            return; // don't cache surrogates
         }
         int index0 = unicode >> 8;
         if (glyphMaps[index0] == null) {
@@ -117,12 +119,18 @@ private CharToGlyphMapper getSlotMapper(int slot) {
         return mapper;
     }
 
-    private int convertToGlyph(int unicode) {
-
+    private int getGlyph(int unicode, boolean raw) {
+        if (isIgnorableWhitespace(unicode) || (isDefaultIgnorable(unicode) && !raw)) {
+            return INVISIBLE_GLYPH_ID;
+        }
+        int glyphCode = getCachedGlyphCode(unicode);
+        if (glyphCode != UNINITIALIZED_GLYPH) {
+            return glyphCode;
+        }
         for (int slot = 0; slot < font.numSlots; slot++) {
             if (!hasExcludes || !font.isExcludedChar(slot, unicode)) {
                 CharToGlyphMapper mapper = getSlotMapper(slot);
-                int glyphCode = mapper.charToGlyph(unicode);
+                glyphCode = mapper.charToGlyphRaw(unicode);
                 if (glyphCode != mapper.getMissingGlyphCode()) {
                     glyphCode = compositeGlyphCode(slot, glyphCode);
                     setCachedGlyphCode(unicode, glyphCode);
@@ -155,12 +163,13 @@ public int getNumGlyphs() {
         return numGlyphs;
     }
 
-    public int charToGlyph(int unicode) {
+    public int charToGlyphRaw(int unicode) {
+        int glyphCode = getGlyph(unicode, true);
+        return glyphCode;
+    }
 
-        int glyphCode = getCachedGlyphCode(unicode);
-        if (glyphCode == UNINITIALIZED_GLYPH) {
-            glyphCode = convertToGlyph(unicode);
-        }
+    public int charToGlyph(int unicode) {
+        int glyphCode = getGlyph(unicode, false);
         return glyphCode;
     }
 
@@ -176,11 +185,7 @@ public int charToGlyph(int unicode, int prefSlot) {
     }
 
     public int charToGlyph(char unicode) {
-
-        int glyphCode  = getCachedGlyphCode(unicode);
-        if (glyphCode == UNINITIALIZED_GLYPH) {
-            glyphCode = convertToGlyph(unicode);
-        }
+        int glyphCode = getGlyph(unicode, false);
         return glyphCode;
     }
 
@@ -206,10 +211,7 @@ public boolean charsToGlyphsNS(int count, char[] unicodes, int[] glyphs) {
                 }
             }
 
-            int gc = glyphs[i] = getCachedGlyphCode(code);
-            if (gc == UNINITIALIZED_GLYPH) {
-                glyphs[i] = convertToGlyph(code);
-            }
+            glyphs[i] = getGlyph(code, false);
 
             if (code < FontUtilities.MIN_LAYOUT_CHARCODE) {
                 continue;
@@ -243,31 +245,21 @@ public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
                     code = (code - HI_SURROGATE_START) *
                         0x400 + low - LO_SURROGATE_START + 0x10000;
 
-                    int gc = glyphs[i] = getCachedGlyphCode(code);
-                    if (gc == UNINITIALIZED_GLYPH) {
-                        glyphs[i] = convertToGlyph(code);
-                    }
+                    glyphs[i] = getGlyph(code, false);
                     i += 1; // Empty glyph slot after surrogate
                     glyphs[i] = INVISIBLE_GLYPH_ID;
                     continue;
                 }
             }
 
-            int gc = glyphs[i] = getCachedGlyphCode(code);
-            if (gc == UNINITIALIZED_GLYPH) {
-                glyphs[i] = convertToGlyph(code);
-            }
+            glyphs[i] = getGlyph(code, false);
         }
     }
 
     public void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
         for (int i=0; i<count; i++) {
             int code = unicodes[i];
-
-            glyphs[i] = getCachedGlyphCode(code);
-            if (glyphs[i] == UNINITIALIZED_GLYPH) {
-                glyphs[i] = convertToGlyph(code);
-            }
+            glyphs[i] = getGlyph(code, false);
         }
     }
 
diff --git a/src/java.desktop/share/classes/sun/font/Font2D.java b/src/java.desktop/share/classes/sun/font/Font2D.java
index 64968086a3b..dd0f92ded2f 100644
--- a/src/java.desktop/share/classes/sun/font/Font2D.java
+++ b/src/java.desktop/share/classes/sun/font/Font2D.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
@@ -535,6 +535,14 @@ public int charToVariationGlyph(int wchar, int variationSelector) {
         return getMapper().charToVariationGlyph(wchar, variationSelector);
     }
 
+    public int charToGlyphRaw(int wchar) {
+        return getMapper().charToGlyphRaw(wchar);
+    }
+
+    public int charToVariationGlyphRaw(int wchar, int variationSelector) {
+        return getMapper().charToVariationGlyphRaw(wchar, variationSelector);
+    }
+
     public int getMissingGlyphCode() {
         return getMapper().getMissingGlyphCode();
     }
diff --git a/src/java.desktop/share/classes/sun/font/FontUtilities.java b/src/java.desktop/share/classes/sun/font/FontUtilities.java
index 06d760854a6..c2e3137e1b5 100644
--- a/src/java.desktop/share/classes/sun/font/FontUtilities.java
+++ b/src/java.desktop/share/classes/sun/font/FontUtilities.java
@@ -369,6 +369,20 @@ public static boolean isDefaultIgnorable(int charCode) {
         }
     }
 
+    /**
+     * Checks whether or not the specified codepoint is whitespace which is
+     * ignorable at the shaping stage of text rendering. These ignorable
+     * whitespace characters should be used prior to text shaping and
+     * rendering to determine the position of the text, but are not themselves
+     * rendered.
+     *
+     * @param ch the codepoint to check
+     * @return whether the specified codepoint is ignorable whitespace
+     */
+    public static boolean isIgnorableWhitespace(int ch) {
+        return ch == 0x0009 || ch == 0x000a || ch == 0x000d;
+    }
+
     public static PlatformLogger getLogger() {
         return logger;
     }
diff --git a/src/java.desktop/share/classes/sun/font/HBShaper.java b/src/java.desktop/share/classes/sun/font/HBShaper.java
index 16bfd1ba971..7d3f58fb88f 100644
--- a/src/java.desktop/share/classes/sun/font/HBShaper.java
+++ b/src/java.desktop/share/classes/sun/font/HBShaper.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
@@ -338,7 +338,7 @@ private static int get_nominal_glyph(
     ) {
 
         Font2D font2D = scopedVars.get().font();
-        int glyphID = font2D.charToGlyph(unicode);
+        int glyphID = font2D.charToGlyphRaw(unicode);
         @SuppressWarnings("restricted")
         MemorySegment glyphIDPtr = glyph.reinterpret(4);
         glyphIDPtr.setAtIndex(JAVA_INT, 0, glyphID);
@@ -354,7 +354,7 @@ private static int get_variation_glyph(
         MemorySegment user_data   /* Not used */
     ) {
         Font2D font2D = scopedVars.get().font();
-        int glyphID = font2D.charToVariationGlyph(unicode, variation_selector);
+        int glyphID = font2D.charToVariationGlyphRaw(unicode, variation_selector);
         @SuppressWarnings("restricted")
         MemorySegment glyphIDPtr = glyph.reinterpret(4);
         glyphIDPtr.setAtIndex(JAVA_INT, 0, glyphID);
diff --git a/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java b/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
index fe784ac4b97..bebb63a4d81 100644
--- a/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
+++ b/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java
@@ -28,6 +28,9 @@
 import java.nio.ByteBuffer;
 import java.util.Locale;
 
+import static sun.font.FontUtilities.isDefaultIgnorable;
+import static sun.font.FontUtilities.isIgnorableWhitespace;
+
 public class TrueTypeGlyphMapper extends CharToGlyphMapper {
 
     TrueTypeFont font;
@@ -57,8 +60,8 @@ public int getNumGlyphs() {
         return numGlyphs;
     }
 
-    private char getGlyphFromCMAP(int charCode) {
-        if (FontUtilities.isDefaultIgnorable(charCode)) {
+    private char getGlyphFromCMAP(int charCode, boolean raw) {
+        if (isIgnorableWhitespace(charCode) || (isDefaultIgnorable(charCode) && !raw)) {
             return INVISIBLE_GLYPH_ID;
         }
         try {
@@ -80,11 +83,11 @@ private char getGlyphFromCMAP(int charCode) {
         }
     }
 
-    private char getGlyphFromCMAP(int charCode, int variationSelector) {
+    private char getGlyphFromCMAP(int charCode, int variationSelector, boolean raw) {
         if (variationSelector == 0) {
-            return getGlyphFromCMAP(charCode);
+            return getGlyphFromCMAP(charCode, raw);
         }
-        if (FontUtilities.isDefaultIgnorable(charCode)) {
+        if (isIgnorableWhitespace(charCode) || (isDefaultIgnorable(charCode) && !raw)) {
             return INVISIBLE_GLYPH_ID;
         }
         try {
@@ -122,25 +125,36 @@ private void handleBadCMAP() {
         cmap = CMap.theNullCmap;
     }
 
+    public int charToGlyphRaw(int unicode) {
+        int glyph = getGlyphFromCMAP(unicode, true);
+        return glyph;
+    }
+
+    @Override
+    public int charToVariationGlyphRaw(int unicode, int variationSelector) {
+        int glyph = getGlyphFromCMAP(unicode, variationSelector, true);
+        return glyph;
+    }
+
     public int charToGlyph(char unicode) {
-        int glyph = getGlyphFromCMAP(unicode);
+        int glyph = getGlyphFromCMAP(unicode, false);
         return glyph;
     }
 
     public int charToGlyph(int unicode) {
-        int glyph = getGlyphFromCMAP(unicode);
+        int glyph = getGlyphFromCMAP(unicode, false);
         return glyph;
     }
 
     @Override
     public int charToVariationGlyph(int unicode, int variationSelector) {
-        int glyph = getGlyphFromCMAP(unicode, variationSelector);
+        int glyph = getGlyphFromCMAP(unicode, variationSelector, false);
         return glyph;
     }
 
     public void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
         for (int i=0;i<count;i++) {
-            glyphs[i] = getGlyphFromCMAP(unicodes[i]);
+            glyphs[i] = getGlyphFromCMAP(unicodes[i], false);
         }
     }
 
@@ -158,13 +172,13 @@ public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
                     code = (code - HI_SURROGATE_START) *
                         0x400 + low - LO_SURROGATE_START + 0x10000;
 
-                    glyphs[i] = getGlyphFromCMAP(code);
+                    glyphs[i] = getGlyphFromCMAP(code, false);
                     i += 1; // Empty glyph slot after surrogate
                     glyphs[i] = INVISIBLE_GLYPH_ID;
                     continue;
                 }
             }
-            glyphs[i] = getGlyphFromCMAP(code);
+            glyphs[i] = getGlyphFromCMAP(code, false);
 
         }
     }
@@ -191,7 +205,7 @@ public boolean charsToGlyphsNS(int count, char[] unicodes, int[] glyphs) {
                 }
             }
 
-            glyphs[i] = getGlyphFromCMAP(code);
+            glyphs[i] = getGlyphFromCMAP(code, false);
 
             if (code < FontUtilities.MIN_LAYOUT_CHARCODE) {
                 continue;
diff --git a/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java b/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
index 8325f7d0351..7685a512203 100644
--- a/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
+++ b/src/java.desktop/share/classes/sun/font/Type1GlyphMapper.java
@@ -31,6 +31,9 @@
  * in composites will be cached there.
  */
 
+import static sun.font.FontUtilities.isDefaultIgnorable;
+import static sun.font.FontUtilities.isIgnorableWhitespace;
+
 public final class Type1GlyphMapper extends CharToGlyphMapper {
 
     Type1Font font;
@@ -78,7 +81,7 @@ public boolean canDisplay(char ch) {
     }
 
     public int charToGlyph(char ch) {
-        if (FontUtilities.isDefaultIgnorable(ch) || isIgnorableWhitespace(ch)) {
+        if (isIgnorableWhitespace(ch) || isDefaultIgnorable(ch)) { // raw = false
             return INVISIBLE_GLYPH_ID;
         }
         try {
@@ -90,10 +93,20 @@ public int charToGlyph(char ch) {
     }
 
     public int charToGlyph(int ch) {
+        int glyph = charToGlyph(ch, false);
+        return glyph;
+    }
+
+    public int charToGlyphRaw(int ch) {
+        int glyph = charToGlyph(ch, true);
+        return glyph;
+    }
+
+    private int charToGlyph(int ch, boolean raw) {
         if (ch < 0 || ch > 0xffff) {
             return missingGlyph;
         } else {
-            if (FontUtilities.isDefaultIgnorable(ch) || isIgnorableWhitespace(ch)) {
+            if (isIgnorableWhitespace(ch) || (isDefaultIgnorable(ch) && !raw)) {
                 return INVISIBLE_GLYPH_ID;
             }
             try {
@@ -105,13 +118,6 @@ public int charToGlyph(int ch) {
         }
     }
 
-    // Matches behavior in e.g. CMap.getControlCodeGlyph(int, boolean)
-    // and RasterPrinterJob.removeControlChars(String)
-    // and CCharToGlyphMapper.isIgnorableWhitespace(int)
-    private static boolean isIgnorableWhitespace(int code) {
-        return code == 0x0009 || code == 0x000a || code == 0x000d;
-    }
-
     public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
         /* The conversion into surrogates is misleading.
          * The Type1 glyph mapper only accepts 16 bit unsigned shorts.
diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index dbd7999fdc0..2a6d45e2ba8 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.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
@@ -90,6 +90,8 @@
 import javax.print.attribute.standard.SheetCollate;
 import javax.print.attribute.standard.Sides;
 
+import static sun.font.FontUtilities.isIgnorableWhitespace;
+
 /**
  * A class which rasterizes a printer job.
  *
@@ -2482,7 +2484,7 @@ protected String removeControlChars(String s) {
 
         for (int i = 0; i < len; i++) {
             char c = in_chars[i];
-            if (c > '\r' || c < '\t' || c == '\u000b' || c == '\u000c')  {
+            if (!isIgnorableWhitespace(c)) {
                out_chars[pos++] = c;
             }
         }
diff --git a/src/java.desktop/share/native/libfontmanager/sunFont.c b/src/java.desktop/share/native/libfontmanager/sunFont.c
index e6082b69416..1fe4cc7dfd7 100644
--- a/src/java.desktop/share/native/libfontmanager/sunFont.c
+++ b/src/java.desktop/share/native/libfontmanager/sunFont.c
@@ -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
@@ -143,9 +143,9 @@ static void initFontIDs(JNIEnv *env) {
 
      CHECK_NULL(tmpClass = (*env)->FindClass(env, "sun/font/Font2D"));
      CHECK_NULL(sunFontIDs.f2dCharToGlyphMID =
-         (*env)->GetMethodID(env, tmpClass, "charToGlyph", "(I)I"));
+         (*env)->GetMethodID(env, tmpClass, "charToGlyphRaw", "(I)I"));
      CHECK_NULL(sunFontIDs.f2dCharToVariationGlyphMID =
-         (*env)->GetMethodID(env, tmpClass, "charToVariationGlyph", "(II)I"));
+         (*env)->GetMethodID(env, tmpClass, "charToVariationGlyphRaw", "(II)I"));
      CHECK_NULL(sunFontIDs.getMapperMID =
          (*env)->GetMethodID(env, tmpClass, "getMapper",
                              "()Lsun/font/CharToGlyphMapper;"));
diff --git a/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java b/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
index aecb2494f24..cec455e2e83 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2005, 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
@@ -75,6 +75,10 @@ public int charToGlyph(int unicode) {
         }
     }
 
+    public int charToGlyphRaw(int unicode) {
+        return charToGlyph(unicode);
+    }
+
     public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
         for (int i=0; i<count; i++) {
             char code = unicodes[i];
diff --git a/test/jdk/java/awt/font/GlyphVector/GlyphVectorGsubTest.java b/test/jdk/java/awt/font/GlyphVector/GlyphVectorGsubTest.java
new file mode 100644
index 00000000000..1211f13757a
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/GlyphVectorGsubTest.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.
+ */
+
+/**
+ * @test
+ * @bug 8353230
+ * @summary Regression test for TrueType font GSUB substitutions.
+ */
+
+import java.awt.Font;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+import java.awt.font.TextAttribute;
+import java.io.ByteArrayInputStream;
+import java.util.Base64;
+import java.util.Map;
+
+public class GlyphVectorGsubTest {
+
+    /**
+     * <p>Font created for this test which contains two GSUB substitutions: a
+     * "liga" ligature for "a" + "b" which requires that the ligature support
+     * be enabled, and a "ccmp" ligature for an emoji sequence which does not
+     * require that ligatures be explicitly enabled.
+     *
+     * <p>The following FontForge Python script was used to generate this font:
+     *
+     * <pre>
+     * import fontforge
+     * import base64
+     *
+     * def draw(glyph, width, height):
+     *   pen = glyph.glyphPen()
+     *   pen.moveTo((100, 100))
+     *   pen.lineTo((100, 100 + height))
+     *   pen.lineTo((100 + width, 100 + height))
+     *   pen.lineTo((100 + width, 100))
+     *   pen.closePath()
+     *   glyph.draw(pen)
+     *   pen = None
+     *
+     * font = fontforge.font()
+     * font.encoding = 'UnicodeFull'
+     * font.design_size = 16
+     * font.em = 2048
+     * font.ascent = 1638
+     * font.descent = 410
+     * font.familyname = 'Test'
+     * font.fontname = 'Test'
+     * font.fullname = 'Test'
+     * font.copyright = ''
+     * font.autoWidth(0, 0, 2048)
+     *
+     * font.addLookup('ligatures', 'gsub_ligature', (), (('liga',(('latn',('dflt')),)),))
+     * font.addLookupSubtable('ligatures', 'sub1')
+     *
+     * font.addLookup('sequences', 'gsub_ligature', (), (('ccmp',(('latn',('dflt')),)),))
+     * font.addLookupSubtable('sequences', 'sub2')
+     *
+     * space = font.createChar(0x20)
+     * space.width = 600
+     *
+     * # create glyphs: a, b, ab
+     *
+     * for char in list('ab'):
+     *   glyph = font.createChar(ord(char))
+     *   draw(glyph, 400, 100)
+     *   glyph.width = 600
+     *
+     * ab = font.createChar(-1, 'ab')
+     * ab.addPosSub('sub1', ('a', 'b'))
+     * draw(ab, 400, 400)
+     * ab.width = 600
+     *
+     * # create glyphs for "woman" emoji sequence
+     *
+     * components = []
+     * woman = '\U0001F471\U0001F3FD\u200D\u2640\uFE0F'
+     * for char in list(woman):
+     *   glyph = font.createChar(ord(char))
+     *   draw(glyph, 400, 800)
+     *   glyph.width = 600
+     *   components.append(glyph.glyphname)
+     *
+     * del components[-1] # remove last
+     * seq = font.createChar(-1, 'seq')
+     * seq.addPosSub('sub2', components)
+     * draw(seq, 400, 1200)
+     * seq.width = 600
+     *
+     * # save font to file
+     *
+     * ttf = 'test.ttf'     # TrueType
+     * t64 = 'test.ttf.txt' # TrueType Base64
+     *
+     * font.generate(ttf)
+     *
+     * with open(ttf, 'rb') as f1:
+     *   encoded = base64.b64encode(f1.read())
+     *   with open(t64, 'wb') as f2:
+     *     f2.write(encoded)
+     * </pre>
+     */
+    private static final String TTF_BYTES = "AAEAAAAQAQAABAAARkZUTaomGsgAAAiUAAAAHEdERUYAQQAZAAAHtAAAACRHUE9T4BjvnAAACFwAAAA2R1NVQkbjQAkAAAfYAAAAhE9TLzKik/GeAAABiAAAAGBjbWFwK+OB7AAAAgwAAAHWY3Z0IABEBREAAAPkAAAABGdhc3D//wADAAAHrAAAAAhnbHlmyBUElgAABAQAAAG4aGVhZCnqeTIAAAEMAAAANmhoZWEIcgJdAAABRAAAACRobXR4CPwB1AAAAegAAAAibG9jYQKIAxYAAAPoAAAAHG1heHAAUQA5AAABaAAAACBuYW1lQcPFIwAABbwAAAGGcG9zdIAWZOAAAAdEAAAAaAABAAAAAQAA7g5Qb18PPPUACwgAAAAAAOQSF3AAAAAA5BIXcABEAAACZAVVAAAACAACAAAAAAAAAAEAAAVVAAAAuAJYAAAAAAJkAAEAAAAAAAAAAAAAAAAAAAAEAAEAAAANAAgAAgAAAAAAAgAAAAEAAQAAAEAALgAAAAAABAJYAZAABQAABTMFmQAAAR4FMwWZAAAD1wBmAhIAAAIABQkAAAAAAACAAAABAgBAAAgAAAAAAAAAUGZFZACAACD//wZm/mYAuAVVAAAAAAABAAAAAADIAAAAAAAgAAQCWABEAAAAAAJYAAACWAAAAGQAZABkAGQAZABkAGQAZABkAAAAAAAFAAAAAwAAACwAAAAEAAAAbAABAAAAAADQAAMAAQAAACwAAwAKAAAAbAAEAEAAAAAMAAgAAgAEACAAYiANJkD+D///AAAAIABhIA0mQP4P////4/+j3/nZxwH5AAEAAAAAAAAAAAAAAAAADAAAAAAAZAAAAAAAAAAHAAAAIAAAACAAAAADAAAAYQAAAGIAAAAEAAAgDQAAIA0AAAAGAAAmQAAAJkAAAAAHAAD+DwAA/g8AAAAIAAHz/QAB8/0AAAAJAAH0cQAB9HEAAAAKAAABBgAAAQAAAAAAAAABAgAAAAIAAAAAAAAAAAAAAAAAAAABAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQFEQAAACwALAAsACwAPgBQAGQAeACMAKAAtADIANwAAgBEAAACZAVVAAMABwAusQEALzyyBwQA7TKxBgXcPLIDAgDtMgCxAwAvPLIFBADtMrIHBgH8PLIBAgDtMjMRIRElIREhRAIg/iQBmP5oBVX6q0QEzQAAAAIAZABkAfQAyAADAAcAADc1IRUhNSEVZAGQ/nABkGRkZGRkAAIAZABkAfQAyAADAAcAADc1IRUhNSEVZAGQ/nABkGRkZGRkAAIAZABkAfQDhAADAAcAADcRIREhESERZAGQ/nABkGQDIPzgAyD84AACAGQAZAH0A4QAAwAHAAA3ESERIREhEWQBkP5wAZBkAyD84AMg/OAAAgBkAGQB9AOEAAMABwAANxEhESERIRFkAZD+cAGQZAMg/OADIPzgAAIAZABkAfQDhAADAAcAADcRIREhESERZAGQ/nABkGQDIPzgAyD84AACAGQAZAH0A4QAAwAHAAA3ESERIREhEWQBkP5wAZBkAyD84AMg/OAAAgBkAGQB9AH0AAMABwAANxEhESERIRFkAZD+cAGQZAGQ/nABkP5wAAIAZABkAfQFFAADAAcAADcRIREhESERZAGQ/nABkGQEsPtQBLD7UAAAAA4ArgABAAAAAAAAAAAAAgABAAAAAAABAAQADQABAAAAAAACAAcAIgABAAAAAAADAB8AagABAAAAAAAEAAQAlAABAAAAAAAFAA8AuQABAAAAAAAGAAQA0wADAAEECQAAAAAAAAADAAEECQABAAgAAwADAAEECQACAA4AEgADAAEECQADAD4AKgADAAEECQAEAAgAigADAAEECQAFAB4AmQADAAEECQAGAAgAyQAAAABUAGUAcwB0AABUZXN0AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABGAG8AbgB0AEYAbwByAGcAZQAgADIALgAwACAAOgAgAFQAZQBzAHQAIAA6ACAAMQAtADQALQAyADAAMgA1AABGb250Rm9yZ2UgMi4wIDogVGVzdCA6IDEtNC0yMDI1AABUAGUAcwB0AABUZXN0AABWAGUAcgBzAGkAbwBuACAAMAAwADEALgAwADAAMAAAVmVyc2lvbiAwMDEuMDAwAABUAGUAcwB0AABUZXN0AAAAAAIAAAAAAAD/ZwBmAAAAAQAAAAAAAAAAAAAAAAAAAAAADQAAAAEAAgADAEQARQECAQMBBAEFAQYBBwEIB3VuaTIwMEQGZmVtYWxlB3VuaUZFMEYGdTFGM0ZEBnUxRjQ3MQJhYgNzZXEAAAAB//8AAgABAAAADAAAABwAAAACAAIAAwAKAAEACwAMAAIABAAAAAIAAAABAAAACgAgADoAAWxhdG4ACAAEAAAAAP//AAIAAAABAAJjY21wAA5saWdhABQAAAABAAAAAAABAAEAAgAGAA4ABAAAAAEAEAAEAAAAAQAkAAEAFgABAAgAAQAEAAwABAAJAAYABwABAAEACgABABIAAQAIAAEABAALAAIABQABAAEABAABAAAACgAeADQAAWxhdG4ACAAEAAAAAP//AAEAAAABc2l6ZQAIAAQAAACgAAAAAAAAAAAAAAAAAAAAAQAAAADiAevnAAAAAOQSF3AAAAAA5BIXcA==";
+
+    public static void main(String[] args) throws Exception {
+
+        byte[] ttfBytes = Base64.getDecoder().decode(TTF_BYTES);
+        ByteArrayInputStream ttfStream = new ByteArrayInputStream(ttfBytes);
+        Font f1 = Font.createFont(Font.TRUETYPE_FONT, ttfStream).deriveFont(80f);
+
+        // Test emoji sequence, using "ccmp" feature and ZWJ (zero-width joiner):
+        // - person with blonde hair
+        // - emoji modifier fitzpatrick type 4
+        // - zero-width joiner
+        // - female sign
+        // - variation selector 16
+        // Does not require the use of the TextAttribute.LIGATURES_ON attribute.
+        char[] text1 = "\ud83d\udc71\ud83c\udffd\u200d\u2640\ufe0f".toCharArray();
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+        GlyphVector gv1 = f1.layoutGlyphVector(frc, text1, 0, text1.length, 0);
+        checkOneGlyph(gv1, text1, 12);
+
+        // Test regular ligature, using "liga" feature: "ab" -> replacement
+        // Requires the use of the TextAttribute.LIGATURES_ON attribute.
+        char[] text2 = "ab".toCharArray();
+        Font f2 = f1.deriveFont(Map.of(TextAttribute.LIGATURES, TextAttribute.LIGATURES_ON));
+        GlyphVector gv2 = f2.layoutGlyphVector(frc, text2, 0, text2.length, 0);
+        checkOneGlyph(gv2, text2, 11);
+    }
+
+    private static void checkOneGlyph(GlyphVector gv, char[] text, int expectedCode) {
+        int glyphs = gv.getNumGlyphs();
+        if (glyphs != 1) {
+            throw new RuntimeException("Unexpected number of glyphs for text " +
+                new String(text) + ": " + glyphs);
+        }
+        int code = gv.getGlyphCode(0);
+        if (code != expectedCode) {
+            throw new RuntimeException("Unexpected glyph code for text " +
+                new String(text) + ": " + expectedCode + " != " + code);
+        }
+    }
+}

From c9d6e01233fbc9f3a95a4879feff906748649c54 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Fri, 30 May 2025 20:13:00 +0000
Subject: [PATCH 741/901] 8358076:
 KeyFactory.getInstance("EdDSA").generatePublic(null) throws NPE

Reviewed-by: weijun
---
 .../classes/sun/security/ec/ECKeyFactory.java |   4 +
 .../sun/security/ec/XDHKeyFactory.java        | 106 ++++++++-------
 .../sun/security/ec/ed/EdDSAKeyFactory.java   |  97 +++++++-------
 .../sun/security/rsa/RSAKeyFactory.java       | 122 ++++++++++--------
 4 files changed, 180 insertions(+), 149 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
index cd84fd4dec3..2530425fbd4 100644
--- a/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ECKeyFactory.java
@@ -219,6 +219,8 @@ private PublicKey implGeneratePublic(KeySpec keySpec)
                 }
                 yield new ECPublicKeyImpl(p8key.getPubKeyEncoded());
             }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
             default ->
                 throw new InvalidKeySpecException(keySpec.getClass().getName() +
                     " not supported.");
@@ -239,6 +241,8 @@ private PrivateKey implGeneratePrivate(KeySpec keySpec)
             }
             case ECPrivateKeySpec e ->
                 new ECPrivateKeyImpl(e.getS(), e.getParams());
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
             default ->
                 throw new InvalidKeySpecException(keySpec.getClass().getName() +
                     " not supported.");
diff --git a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
index 00eb5b4353d..c8fb6c0c11b 100644
--- a/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/XDHKeyFactory.java
@@ -144,64 +144,72 @@ protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
     private PublicKey generatePublicImpl(KeySpec keySpec)
         throws InvalidKeyException, InvalidKeySpecException {
 
-        if (keySpec instanceof X509EncodedKeySpec) {
-            X509EncodedKeySpec x509Spec = (X509EncodedKeySpec) keySpec;
-            XDHPublicKeyImpl result =
-                new XDHPublicKeyImpl(x509Spec.getEncoded());
-            checkLockedParams(InvalidKeySpecException::new,
-                result.getParams());
-            return result;
-        } else if (keySpec instanceof XECPublicKeySpec) {
-            XECPublicKeySpec publicKeySpec = (XECPublicKeySpec) keySpec;
-            XECParameters params = XECParameters.get(
-                InvalidKeySpecException::new, publicKeySpec.getParams());
-            checkLockedParams(InvalidKeySpecException::new, params);
-            return new XDHPublicKeyImpl(params, publicKeySpec.getU());
-        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
-            PKCS8Key p8key = new XDHPrivateKeyImpl(p8.getEncoded());
-            if (!p8key.hasPublicKey()) {
-                throw new InvalidKeySpecException("No public key found.");
+        return switch (keySpec) {
+            case X509EncodedKeySpec x509Spec -> {
+                XDHPublicKeyImpl result =
+                    new XDHPublicKeyImpl(x509Spec.getEncoded());
+                checkLockedParams(InvalidKeySpecException::new,
+                    result.getParams());
+                yield result;
             }
-            XDHPublicKeyImpl result =
-                new XDHPublicKeyImpl(p8key.getPubKeyEncoded());
-            checkLockedParams(InvalidKeySpecException::new,
-                result.getParams());
-            return result;
-        } else {
-            throw new InvalidKeySpecException(keySpec.getClass().getName() +
-                " not supported.");
-        }
+            case XECPublicKeySpec publicKeySpec -> {
+                XECParameters params = XECParameters.get(
+                    InvalidKeySpecException::new, publicKeySpec.getParams());
+                checkLockedParams(InvalidKeySpecException::new, params);
+                yield new XDHPublicKeyImpl(params, publicKeySpec.getU());
+            }
+            case PKCS8EncodedKeySpec p8 -> {
+                PKCS8Key p8key = new XDHPrivateKeyImpl(p8.getEncoded());
+                if (!p8key.hasPublicKey()) {
+                    throw new InvalidKeySpecException("No public key found.");
+                }
+                XDHPublicKeyImpl result =
+                    new XDHPublicKeyImpl(p8key.getPubKeyEncoded());
+                checkLockedParams(InvalidKeySpecException::new,
+                    result.getParams());
+                yield result;
+            }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     private PrivateKey generatePrivateImpl(KeySpec keySpec)
         throws InvalidKeyException, InvalidKeySpecException {
 
-        if (keySpec instanceof PKCS8EncodedKeySpec) {
-            PKCS8EncodedKeySpec pkcsSpec = (PKCS8EncodedKeySpec) keySpec;
-            byte[] encoded = pkcsSpec.getEncoded();
-            try {
-                XDHPrivateKeyImpl result = new XDHPrivateKeyImpl(encoded);
-                checkLockedParams(InvalidKeySpecException::new,
+        return switch (keySpec) {
+            case PKCS8EncodedKeySpec pkcsSpec -> {
+                byte[] encoded = pkcsSpec.getEncoded();
+                try {
+                    XDHPrivateKeyImpl result = new XDHPrivateKeyImpl(encoded);
+                    checkLockedParams(InvalidKeySpecException::new,
                         result.getParams());
-                return result;
-            } finally {
-                Arrays.fill(encoded, (byte) 0);
+                    yield result;
+                } finally {
+                    Arrays.fill(encoded, (byte) 0);
+                }
             }
-        } else if (keySpec instanceof XECPrivateKeySpec) {
-            XECPrivateKeySpec privateKeySpec = (XECPrivateKeySpec) keySpec;
-            XECParameters params = XECParameters.get(
-                InvalidKeySpecException::new, privateKeySpec.getParams());
-            checkLockedParams(InvalidKeySpecException::new, params);
-            byte[] scalar = privateKeySpec.getScalar();
-            try {
-                return new XDHPrivateKeyImpl(params, scalar);
-            } finally {
-                Arrays.fill(scalar, (byte)0);
+            case XECPrivateKeySpec privateKeySpec -> {
+                XECParameters params = XECParameters.get(
+                    InvalidKeySpecException::new, privateKeySpec.getParams());
+                checkLockedParams(InvalidKeySpecException::new, params);
+
+                byte[] scalar = privateKeySpec.getScalar();
+                try {
+                    yield new XDHPrivateKeyImpl(params, scalar);
+                } finally {
+                    Arrays.fill(scalar, (byte) 0);
+                }
             }
-        } else {
-            throw new InvalidKeySpecException(
-                "Only PKCS8EncodedKeySpec and XECPrivateKeySpec supported");
-        }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
diff --git a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
index b3316f5ffe0..71ec14ba06f 100644
--- a/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/ec/ed/EdDSAKeyFactory.java
@@ -137,61 +137,68 @@ protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
     private PublicKey generatePublicImpl(KeySpec keySpec)
         throws InvalidKeyException, InvalidKeySpecException {
 
-        if (keySpec instanceof X509EncodedKeySpec) {
-            X509EncodedKeySpec x509Spec = (X509EncodedKeySpec) keySpec;
-            EdDSAPublicKeyImpl result =
-                new EdDSAPublicKeyImpl(x509Spec.getEncoded());
-            checkLockedParams(InvalidKeySpecException::new,
-                result.getParams());
-            return result;
-        } else if (keySpec instanceof EdECPublicKeySpec) {
-            EdECPublicKeySpec publicKeySpec = (EdECPublicKeySpec) keySpec;
-            EdDSAParameters params = EdDSAParameters.get(
-                InvalidKeySpecException::new, publicKeySpec.getParams());
-            checkLockedParams(InvalidKeySpecException::new, params);
-            return new EdDSAPublicKeyImpl(params, publicKeySpec.getPoint());
-        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
-            PKCS8Key p8key = new EdDSAPrivateKeyImpl(p8.getEncoded());
-            if (!p8key.hasPublicKey()) {
-                throw new InvalidKeySpecException("No public key found.");
+        return switch (keySpec) {
+            case X509EncodedKeySpec x509Spec -> {
+                EdDSAPublicKeyImpl result =
+                    new EdDSAPublicKeyImpl(x509Spec.getEncoded());
+                checkLockedParams(InvalidKeySpecException::new,
+                    result.getParams());
+                yield result;
             }
-            return new EdDSAPublicKeyImpl(p8key.getPubKeyEncoded());
-        } else {
-            throw new InvalidKeySpecException(keySpec.getClass().getName() +
-                " not supported.");
-        }
+            case EdECPublicKeySpec publicKeySpec -> {
+                EdDSAParameters params = EdDSAParameters.get(
+                    InvalidKeySpecException::new, publicKeySpec.getParams());
+                checkLockedParams(InvalidKeySpecException::new, params);
+                yield new EdDSAPublicKeyImpl(params, publicKeySpec.getPoint());
+            }
+            case PKCS8EncodedKeySpec p8 -> {
+                PKCS8Key p8key = new EdDSAPrivateKeyImpl(p8.getEncoded());
+                if (!p8key.hasPublicKey()) {
+                    throw new InvalidKeySpecException("No public key found.");
+                }
+                yield new EdDSAPublicKeyImpl(p8key.getPubKeyEncoded());
+            }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     private PrivateKey generatePrivateImpl(KeySpec keySpec)
         throws InvalidKeyException, InvalidKeySpecException {
 
-        if (keySpec instanceof PKCS8EncodedKeySpec) {
-            PKCS8EncodedKeySpec pkcsSpec = (PKCS8EncodedKeySpec) keySpec;
-            byte[] encoded = pkcsSpec.getEncoded();
-            try {
-                EdDSAPrivateKeyImpl result =
+        return switch (keySpec) {
+            case PKCS8EncodedKeySpec pkcsSpec -> {
+                byte[] encoded = pkcsSpec.getEncoded();
+                try {
+                    EdDSAPrivateKeyImpl result =
                         new EdDSAPrivateKeyImpl(encoded);
-                checkLockedParams(InvalidKeySpecException::new,
+                    checkLockedParams(InvalidKeySpecException::new,
                         result.getParams());
-                return result;
-            } finally {
-                Arrays.fill(encoded, (byte) 0);
+                    yield result;
+                } finally {
+                    Arrays.fill(encoded, (byte) 0);
+                }
             }
-        } else if (keySpec instanceof EdECPrivateKeySpec) {
-            EdECPrivateKeySpec privateKeySpec = (EdECPrivateKeySpec) keySpec;
-            EdDSAParameters params = EdDSAParameters.get(
-                InvalidKeySpecException::new, privateKeySpec.getParams());
-            checkLockedParams(InvalidKeySpecException::new, params);
-            byte[] bytes = privateKeySpec.getBytes();
-            try {
-                return new EdDSAPrivateKeyImpl(params, bytes);
-            } finally {
-                Arrays.fill(bytes, (byte)0);
+            case EdECPrivateKeySpec privateKeySpec -> {
+                EdDSAParameters params = EdDSAParameters.get(
+                    InvalidKeySpecException::new, privateKeySpec.getParams());
+                checkLockedParams(InvalidKeySpecException::new, params);
+                byte[] bytes = privateKeySpec.getBytes();
+                try {
+                    yield new EdDSAPrivateKeyImpl(params, bytes);
+                } finally {
+                    Arrays.fill(bytes, (byte) 0);
+                }
             }
-        } else {
-            throw new InvalidKeySpecException(
-                "Only PKCS8EncodedKeySpec and EdECPrivateKeySpec supported");
-        }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java b/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
index f518bf5919b..0b8f2a0aded 100644
--- a/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
@@ -320,71 +320,83 @@ private PrivateKey translatePrivateKey(PrivateKey key)
     // internal implementation of generatePublic. See JCA doc
     private PublicKey generatePublic(KeySpec keySpec)
             throws GeneralSecurityException {
-        if (keySpec instanceof X509EncodedKeySpec) {
-            return RSAPublicKeyImpl.newKey(type, "X.509",
-                    ((X509EncodedKeySpec)keySpec).getEncoded());
-        } else if (keySpec instanceof RSAPublicKeySpec rsaSpec) {
-            try {
-                return new RSAPublicKeyImpl(
-                    type, rsaSpec.getParams(),
-                    rsaSpec.getModulus(),
-                    rsaSpec.getPublicExponent()
-                );
-            } catch (ProviderException e) {
-                throw new InvalidKeySpecException(e);
+        return switch (keySpec) {
+            case X509EncodedKeySpec x509 ->
+                RSAPublicKeyImpl.newKey(type, "X.509", x509.getEncoded());
+
+            case RSAPublicKeySpec rsaSpec -> {
+                try {
+                    yield new RSAPublicKeyImpl(
+                        type, rsaSpec.getParams(),
+                        rsaSpec.getModulus(),
+                        rsaSpec.getPublicExponent()
+                    );
+                } catch (ProviderException e) {
+                    throw new InvalidKeySpecException(e);
+                }
             }
-        } else if (keySpec instanceof PKCS8EncodedKeySpec p8) {
-            PKCS8Key p8key = new PKCS8Key(p8.getEncoded());
-            if (!p8key.hasPublicKey()) {
-                throw new InvalidKeySpecException("No public key found.");
+            case PKCS8EncodedKeySpec p8 -> {
+                PKCS8Key p8key = new PKCS8Key(p8.getEncoded());
+                if (!p8key.hasPublicKey()) {
+                    throw new InvalidKeySpecException("No public key found.");
+                }
+                yield RSAPublicKeyImpl.newKey(type, "X.509",
+                    p8key.getPubKeyEncoded());
             }
-            return RSAPublicKeyImpl.newKey(type, "X.509",
-                p8key.getPubKeyEncoded());
-        } else {
-            throw new InvalidKeySpecException(keySpec.getClass().getName() + " not supported.");
-        }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     // internal implementation of generatePrivate. See JCA doc
     private PrivateKey generatePrivate(KeySpec keySpec)
             throws GeneralSecurityException {
-        if (keySpec instanceof PKCS8EncodedKeySpec) {
-            byte[] encoded = ((PKCS8EncodedKeySpec)keySpec).getEncoded();
-            try {
-                return RSAPrivateCrtKeyImpl.newKey(type, "PKCS#8", encoded);
-            } finally {
-                Arrays.fill(encoded, (byte)0);
+        return switch (keySpec) {
+            case PKCS8EncodedKeySpec p8 -> {
+                byte[] encoded = p8.getEncoded();
+                try {
+                    yield RSAPrivateCrtKeyImpl.newKey(type, "PKCS#8", encoded);
+                } finally {
+                    Arrays.fill(encoded, (byte) 0);
+                }
             }
-        } else if (keySpec instanceof RSAPrivateCrtKeySpec rsaSpec) {
-            try {
-                return new RSAPrivateCrtKeyImpl(
-                    type, rsaSpec.getParams(),
-                    rsaSpec.getModulus(),
-                    rsaSpec.getPublicExponent(),
-                    rsaSpec.getPrivateExponent(),
-                    rsaSpec.getPrimeP(),
-                    rsaSpec.getPrimeQ(),
-                    rsaSpec.getPrimeExponentP(),
-                    rsaSpec.getPrimeExponentQ(),
-                    rsaSpec.getCrtCoefficient()
-                );
-            } catch (ProviderException e) {
-                throw new InvalidKeySpecException(e);
+            case RSAPrivateCrtKeySpec rsaSpec -> {
+                try {
+                    yield new RSAPrivateCrtKeyImpl(
+                        type, rsaSpec.getParams(),
+                        rsaSpec.getModulus(),
+                        rsaSpec.getPublicExponent(),
+                        rsaSpec.getPrivateExponent(),
+                        rsaSpec.getPrimeP(),
+                        rsaSpec.getPrimeQ(),
+                        rsaSpec.getPrimeExponentP(),
+                        rsaSpec.getPrimeExponentQ(),
+                        rsaSpec.getCrtCoefficient()
+                    );
+                } catch (ProviderException e) {
+                    throw new InvalidKeySpecException(e);
+                }
             }
-        } else if (keySpec instanceof RSAPrivateKeySpec rsaSpec) {
-            try {
-                return new RSAPrivateKeyImpl(
-                    type, rsaSpec.getParams(),
-                    rsaSpec.getModulus(),
-                    rsaSpec.getPrivateExponent()
-                );
-            } catch (ProviderException e) {
-                throw new InvalidKeySpecException(e);
+            case RSAPrivateKeySpec rsaSpec -> {
+                try {
+                    yield new RSAPrivateKeyImpl(
+                        type, rsaSpec.getParams(),
+                        rsaSpec.getModulus(),
+                        rsaSpec.getPrivateExponent()
+                    );
+                } catch (ProviderException e) {
+                    throw new InvalidKeySpecException(e);
+                }
             }
-        } else {
-            throw new InvalidKeySpecException("Only RSAPrivate(Crt)KeySpec "
-                + "and PKCS8EncodedKeySpec supported for RSA private keys");
-        }
+            case null -> throw new InvalidKeySpecException(
+                "keySpec must not be null");
+            default ->
+                throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                    " not supported.");
+        };
     }
 
     protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)

From 14e41ab055955ffd7cf9e8129cc3269b4e3807b7 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 30 May 2025 20:14:14 +0000
Subject: [PATCH 742/901] 8357172: Extend try block in nsk/jdi tests to capture
 exceptions thrown by Debuggee.classByName()

Reviewed-by: lmesnik, sspitsyn
---
 .../invokeMethod/invokemethod009.java         | 22 ++++-----
 .../invokeMethod/invokemethod010.java         | 39 ++++++---------
 .../invokeMethod/invokemethod014.java         | 26 +++++-----
 .../ClassType/newInstance/newinstance009.java | 43 +++++++---------
 .../invokeMethod/invokemethod002.java         | 18 +++----
 .../invokeMethod/invokemethod003.java         | 32 ++++++------
 .../invokeMethod/invokemethod004.java         | 37 ++++++--------
 .../invokeMethod/invokemethod005.java         | 24 ++++-----
 .../invokeMethod/invokemethod006.java         | 24 ++++-----
 .../invokeMethod/invokemethod007.java         | 24 ++++-----
 .../invokeMethod/invokemethod008.java         | 28 +++++------
 .../invokeMethod/invokemethod009.java         | 28 +++++------
 .../invokeMethod/invokemethod014.java         | 30 ++++++------
 .../ObjectReference/setValue/setvalue002.java | 36 ++++++--------
 .../ObjectReference/setValue/setvalue003.java | 37 ++++++--------
 .../ObjectReference/setValue/setvalue004.java | 37 ++++++--------
 .../ObjectReference/setValue/setvalue005.java | 39 ++++++---------
 .../setValue/setvalue005/setvalue005.java     | 24 ++++-----
 .../ownedMonitors/ownedmonitors002.java       | 49 ++++++++-----------
 .../popFrames/popframes006.java               | 24 ++++-----
 .../popFrames/popframes007.java               | 42 ++++++++--------
 .../nsk/jdi/ThreadReference/stop/stop002.java | 23 ++++-----
 22 files changed, 316 insertions(+), 370 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
index c5e1be8f4a3..fe96c69ace6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod009.java
@@ -112,19 +112,19 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
-        thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+            thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
             ClassType clsType = (ClassType) rType;
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
index 65621fb712c..f813a447192 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod010.java
@@ -111,36 +111,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+        try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
 
-        thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: unable to suspend debuggee thread");
+            thrRef = debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee thread suspension ...");
-            try {
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: unable to suspend debuggee thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee thread suspension ...");
                 Thread.currentThread().sleep(TIMEOUT_DELTA);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
-        try {
             // debuggee main class
             ClassType clsType = (ClassType) rType;
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
index c1b5a2a64ab..900a453a2da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod014.java
@@ -113,20 +113,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-        ClassType clsType = (ClassType) rType;
-
-        ThreadReference thrRef =
-            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+            ClassType clsType = (ClassType) rType;
+
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             for (int i=0; i<METH_NUM; i++) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
index d3562902c78..ecee24c930c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/newInstance/newinstance009.java
@@ -95,37 +95,30 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-        ClassType clsType = (ClassType) rType;
-
-        ThreadReference thrRef = debuggee.threadByFieldName(rType, "thread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: unable to suspend debuggee thread");
+        try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+            ClassType clsType = (ClassType) rType;
+
+            ThreadReference thrRef = debuggee.threadByFieldName(rType, "thread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee thread suspension ...");
-            try {
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: unable to suspend debuggee thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee thread suspension ...");
                 Thread.currentThread().sleep(DELAY);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
-        try {
             List methList = rType.methodsByName("<init>");
             if (methList.isEmpty()) {
                 log.complain("TEST FAILURE: the expected constructor "
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
index 7c43d0b2fa5..44189cb3c3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod002.java
@@ -124,18 +124,18 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             findObjRef(DEBUGGEE_LOCALVAR);
             rType[1] = objRef[1].referenceType(); // debuggee dummy class
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
index a348f9ff78c..537be5cde65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod003.java
@@ -135,24 +135,24 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[3];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
-        // debuggee dummy interface
-        rType[1] = debuggee.classByName(DEBUGGEE_INTERFACE);
-        // debuggee dummy abstract class
-        rType[2] = debuggee.classByName(DEBUGGEE_ABSTRACTCLASS);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[3];
+            // debuggee main class
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+            // debuggee dummy interface
+            rType[1] = debuggee.classByName(DEBUGGEE_INTERFACE);
+            // debuggee dummy abstract class
+            rType[2] = debuggee.classByName(DEBUGGEE_ABSTRACTCLASS);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
index 3b26eb2a010..61a78285a6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod004.java
@@ -111,36 +111,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: unable to suspend debuggee thread");
+            thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee thread suspension ...");
-            try {
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: unable to suspend debuggee thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee thread suspension ...");
                 Thread.currentThread().sleep(1000);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
 // Check the tested assersion
-        try {
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
             ReferenceType rType = objRef.referenceType(); // debuggee dummy class
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
index fcc13dc3b10..a6f7806753d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod005.java
@@ -113,20 +113,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[2];
+            // debuggee main class
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType[1] = objRef.referenceType(); // debuggee dummy class
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
index 0583cf62b53..d914b8bacfc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod006.java
@@ -111,20 +111,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[2];
+            // debuggee main class
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType[1] = objRef.referenceType(); // debuggee dummy class
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
index fa5c9ec3e17..9dc343d69a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod007.java
@@ -127,20 +127,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[2];
-        // debuggee main class
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[2];
+            // debuggee main class
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASS);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType[1] = objRef.referenceType(); // debuggee dummy class
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
index c0426229e5b..7572c5adefe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod008.java
@@ -120,22 +120,22 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[3];
-        // reference types of debuggee main & dummy classes
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
-        rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
-        rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[3];
+            // reference types of debuggee main & dummy classes
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
+            rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
+            rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
index ce3545ac228..72ea170440e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod009.java
@@ -120,22 +120,22 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[3];
-        // reference types of debuggee main & dummy classes
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
-        rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
-        rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
-
-        thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[3];
+            // reference types of debuggee main & dummy classes
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
+            rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
+            rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
+
+            thrRef = debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             ObjectReference objRef = findObjRef(DEBUGGEE_LOCALVAR);
             LinkedList<Value> argList = new LinkedList<Value>();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
index 3005ed87a64..0950b4064db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod014.java
@@ -143,23 +143,23 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType[] rType = new ReferenceType[3];
-        // debuggee main & dummy classes
-        rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
-        rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
-        rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
-
-        ThreadReference thrRef =
-            debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
+        try {
+            ReferenceType[] rType = new ReferenceType[3];
+            // debuggee main & dummy classes
+            rType[0] = debuggee.classByName(DEBUGGEE_CLASSES[0]);
+            rType[1] = debuggee.classByName(DEBUGGEE_CLASSES[1]);
+            rType[2] = debuggee.classByName(DEBUGGEE_CLASSES[2]);
+
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType[0], "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
 
 // Check the tested assersion
-        try {
             suspendAtBP(rType[0], DEBUGGEE_STOPATLINE);
             objRef = findObjRef(thrRef, DEBUGGEE_LOCALVAR);
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
index 1c4803cffef..b9c5a99a4ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue002.java
@@ -109,35 +109,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+            thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee's thread suspension ...");
-            try {
+            thrRef.suspend();
+            while (!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee's thread suspension ...");
                 Thread.currentThread().sleep(1000);
-            } catch(InterruptedException ie) {
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
 // Check the tested assersion
-        try {
             findObjRefs(DEBUGGEE_LOCALVAR);
             rType[0] = objRef[0].referenceType();
             rType[1] = objRef[1].referenceType();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
index 4fbe110ca96..8bb08f43c2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue003.java
@@ -142,36 +142,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+            thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee's thread suspension ...");
-            try {
+            thrRef.suspend();
+            while (!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee's thread suspension ...");
                 Thread.sleep(1000);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
-            }
         }
 
 // Check the tested assertion
-        try {
             objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType = objRef.referenceType();
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
index 0eed84859eb..1928e965e32 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue004.java
@@ -122,36 +122,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+            thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee's thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee's thread suspension ...");
-            try {
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: Unable to suspend debuggee's thread");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee's thread suspension ...");
                 Thread.currentThread().sleep(1000);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
 // Check the tested assersion
-        try {
             objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType = objRef.referenceType();
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
index b77ea99979d..25e1f0c37b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/setValue/setvalue005.java
@@ -109,37 +109,30 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
+        try {
+            ReferenceType debuggeeClass = debuggee.classByName(DEBUGGEE_CLASS); // debuggee main class
 
-        thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILED: Unable to suspend debuggee thread after "
-                    + ATTEMPTS + " attempts");
+            thrRef = debuggee.threadByFieldName(debuggeeClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: Method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee thread suspension ...");
-            try {
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILED: Unable to suspend debuggee thread after "
+                                 + ATTEMPTS + " attempts");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee thread suspension ...");
                 Thread.currentThread().sleep(1000);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILED: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
 // Check the tested assersion
-        try {
             objRef = findObjRef(DEBUGGEE_LOCALVAR);
             rType = objRef.referenceType();
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
index 3b8a49ac5d1..dd071f2e087 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/StackFrame/setValue/setvalue005/setvalue005.java
@@ -156,19 +156,19 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
-        ThreadReference thrRef =
-            debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_THRDNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRDNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_THRDNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRDNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // find a stack frame which belongs to the "setvalue005tMainThr" thread
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
index 068670202c5..a77c153ab5d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/ownedMonitors/ownedmonitors002.java
@@ -91,41 +91,34 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
-        ThreadReference thrRef =
-            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
-        int num = 0;
-        thrRef.suspend();
-        while(!thrRef.isSuspended()) {
-            num++;
-            if (num > ATTEMPTS) {
-                log.complain("TEST FAILURE: Unable to suspend debuggee thread after "
-                    + ATTEMPTS + " attempts");
+        try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
                 tot_res = Consts.TEST_FAILED;
                 return quitDebuggee();
             }
-            log.display("Waiting for debuggee thread suspension ...");
-            try {
+
+            int num = 0;
+            thrRef.suspend();
+            while(!thrRef.isSuspended()) {
+                num++;
+                if (num > ATTEMPTS) {
+                    log.complain("TEST FAILURE: Unable to suspend debuggee thread after "
+                                 + ATTEMPTS + " attempts");
+                    tot_res = Consts.TEST_FAILED;
+                    return quitDebuggee();
+                }
+                log.display("Waiting for debuggee thread suspension ...");
                 Thread.currentThread().sleep(DELAY);
-            } catch(InterruptedException ie) {
-                ie.printStackTrace();
-                log.complain("TEST FAILURE: caught: " + ie);
-                tot_res = Consts.TEST_FAILED;
-                return quitDebuggee();
             }
-        }
 
 // Check the tested assersion
-        try {
             List mons = thrRef.ownedMonitors();
             if (vm.canGetOwnedMonitorInfo()) {
                 log.display("CHECK PASSED: got a List of monitors owned by the thread,"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
index ed60d3abe53..fe0543fe11f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes006.java
@@ -106,20 +106,20 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
-        ThreadReference thrRef =
-            debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
         Field doExit = null;
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+            ThreadReference thrRef =
+                debuggee.threadByFieldName(rType, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // debuggee field used to indicate that popping has been done
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
index 350b89ef4b6..df086449bef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes007.java
@@ -106,29 +106,29 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
-
-        ThreadReference mainThread =
-            debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_MAIN_THREAD_NAME);
-        if (mainThread == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                         + DEBUGGEE_MAIN_THREAD_NAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
-        ThreadReference auxThread =
-            debuggee.threadByFieldName(rType, "auxThr", DEBUGGEE_AUX_THREAD_NAME);
-        if (auxThread == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                         + DEBUGGEE_AUX_THREAD_NAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
         Field doExit = null;
         try {
+            // debuggee main class
+            ReferenceType rType = debuggee.classByName(DEBUGGEE_CLASS);
+
+            ThreadReference mainThread =
+                debuggee.threadByFieldName(rType, "mainThread", DEBUGGEE_MAIN_THREAD_NAME);
+            if (mainThread == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_MAIN_THREAD_NAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
+            ThreadReference auxThread =
+                debuggee.threadByFieldName(rType, "auxThr", DEBUGGEE_AUX_THREAD_NAME);
+            if (auxThread == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_AUX_THREAD_NAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
             suspendAtBP(rType, DEBUGGEE_STOPATLINE);
 
             // debuggee field used to indicate that popping has been done
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
index fcf38c5c5ab..02a87d9c42b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/stop/stop002.java
@@ -115,22 +115,23 @@ private int runIt(String args[], PrintStream out) {
             return quitDebuggee();
         }
 
-        // debuggee main class
-        mainClass = debuggee.classByName(DEBUGGEE_CLASS);
-
-        ThreadReference thrRef = debuggee.threadByFieldName(mainClass, "testThread", DEBUGGEE_THRNAME);
-        if (thrRef == null) {
-            log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
-                + DEBUGGEE_THRNAME);
-            tot_res = Consts.TEST_FAILED;
-            return quitDebuggee();
-        }
-
         Field stopLoop1 = null;
         Field stopLoop2 = null;
         ObjectReference objRef = null;
         ObjectReference throwableRef = null;
+
         try {
+            // debuggee main class
+            mainClass = debuggee.classByName(DEBUGGEE_CLASS);
+
+            ThreadReference thrRef = debuggee.threadByFieldName(mainClass, "testThread", DEBUGGEE_THRNAME);
+            if (thrRef == null) {
+                log.complain("TEST FAILURE: method Debugee.threadByFieldName() returned null for debuggee thread "
+                             + DEBUGGEE_THRNAME);
+                tot_res = Consts.TEST_FAILED;
+                return quitDebuggee();
+            }
+
             suspendAtBP(mainClass, DEBUGGEE_STOPATLINE);
             objRef = findObjRef(thrRef, DEBUGGEE_NON_THROWABLE_VAR);
             throwableRef = findObjRef(thrRef, DEBUGGEE_THROWABLE_VAR);

From abbffc0103826a2e02fe52ef9b55890a57944933 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Fri, 30 May 2025 21:00:34 +0000
Subject: [PATCH 743/901] 8358202: ProblemList
 vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java

Reviewed-by: sspitsyn, cjplummer
---
 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 125ca887078..1f10d38240b 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -162,6 +162,7 @@ vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
 
+vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8358094 generic-all
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
 

From 09301c1dc03a44e5c56a91303de81ba01dabfe71 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Fri, 30 May 2025 21:11:38 +0000
Subject: [PATCH 744/901] 8356634: VectorShape#largestShapeFor should have
 public access

Reviewed-by: psandoz
---
 .../jdk/incubator/vector/VectorShape.java     | 19 +++++---
 .../vector/PreferredSpeciesTest.java          | 44 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
index 89e0d38bcb0..f6e36450ce0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
@@ -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
@@ -208,13 +208,22 @@ static VectorShape ofSwitchKey(int sk) {
         }
     }
 
-    // non-public support for computing preferred shapes
-
-    /*package-private*/
-    static VectorShape largestShapeFor(Class<?> etype) {
+    /**
+     * Finds the largest vector shape supported by the current
+     * platform for the element type {@code etype}.
+     *
+     * @param etype the element type
+     * @return the largest vector shape supported by the platform
+     *         for {@code etype}
+     * @throws IllegalArgumentException if no such vector shape exists
+     *         for the element type or the type is not a valid {@code ETYPE}.
+     */
+    public static VectorShape largestShapeFor(Class<?> etype) {
         return VectorShape.forBitSize(getMaxVectorBitSize(etype));
     }
 
+    // non-public support for computing preferred shapes
+
     /**
      * Finds the vector shape preferred by the current platform
      * for all vector element types.
diff --git a/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java b/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java
index f105df5756c..eb8b0358538 100644
--- a/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java
+++ b/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.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
@@ -29,6 +29,7 @@
 
 /**
  * @test
+ * @bug 8356549
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.vector
  * @run testng PreferredSpeciesTest
  */
@@ -126,4 +127,45 @@ void testVectorShape(Class<?> c) {
         Assert.assertEquals(largestSpecies.length(), maxLaneCount);
         Assert.assertEquals(largestSpecies.length(), Math.max(species.length(), maxLaneCount));
     }
+
+    // Testing VectorShape.largestShapeFor() for 8356549
+    @Test(dataProvider = "classesProvider")
+    void testLargestShapeFor(Class<?> c) {
+        final int S_64_BITS = 64;
+        int elemSize = 0;
+        VectorSpecies<?> maxVectorSpecies;
+        if (c == byte.class) {
+            elemSize = Byte.SIZE;
+            maxVectorSpecies = ByteVector.SPECIES_MAX;
+        } else if (c == short.class) {
+            elemSize = Short.SIZE;
+            maxVectorSpecies = ShortVector.SPECIES_MAX;
+        } else if (c == int.class) {
+            elemSize = Integer.SIZE;
+            maxVectorSpecies = IntVector.SPECIES_MAX;
+        } else if (c == long.class) {
+            elemSize = Long.SIZE;
+            maxVectorSpecies = LongVector.SPECIES_MAX;
+        } else if (c == float.class) {
+            elemSize = Float.SIZE;
+            maxVectorSpecies = FloatVector.SPECIES_MAX;
+        } else if (c == double.class) {
+            elemSize = Double.SIZE;
+            maxVectorSpecies = DoubleVector.SPECIES_MAX;
+        } else {
+            throw new IllegalArgumentException("Bad vector element type: " + c.getName());
+        }
+
+        VectorShape vs = VectorShape.largestShapeFor(c);
+
+        int maxLaneCount = VectorSupport.getMaxLaneCount(c);
+        int max = Math.max(maxLaneCount * elemSize, S_64_BITS);
+
+        //Assert we're using the same element when comparing shapes
+        Assert.assertEquals(c, maxVectorSpecies.elementType());
+
+        Assert.assertEquals(vs.vectorBitSize(), max);
+        Assert.assertEquals(vs.vectorBitSize(), maxVectorSpecies.vectorBitSize());
+
+    }
 }

From db340e54f83cf7bf72abb94c9cf9cdac007ed38a Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Fri, 30 May 2025 21:11:58 +0000
Subject: [PATCH 745/901] 8356222: Thread.print command reports waiting on the
 Class initialization monitor for both carrier and virtual threads

Reviewed-by: alanb, sspitsyn
---
 src/hotspot/share/runtime/javaThread.cpp      |   4 +-
 src/hotspot/share/runtime/vframe.cpp          |   7 +-
 src/hotspot/share/runtime/vframe.hpp          |   4 +-
 .../dcmd/thread/ClassInitMonitorVThread.java  | 134 ++++++++++++++++++
 4 files changed, 142 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/dcmd/thread/ClassInitMonitorVThread.java

diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 060c0a33cdf..57f93f87d47 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1795,7 +1795,7 @@ void JavaThread::print_stack_on(outputStream* st) {
 
       // Print out lock information
       if (JavaMonitorsInStackTrace) {
-        jvf->print_lock_info_on(st, count);
+        jvf->print_lock_info_on(st, false/*is_virtual*/, count);
       }
     } else {
       // Ignore non-Java frames
@@ -1837,7 +1837,7 @@ void JavaThread::print_vthread_stack_on(outputStream* st) {
 
       // Print out lock information
       if (JavaMonitorsInStackTrace) {
-        jvf->print_lock_info_on(st, count);
+        jvf->print_lock_info_on(st, true/*is_virtual*/, count);
       }
     } else {
       // Ignore non-Java frames
diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp
index 723ddbbb106..a3c0c41b1b1 100644
--- a/src/hotspot/share/runtime/vframe.cpp
+++ b/src/hotspot/share/runtime/vframe.cpp
@@ -169,7 +169,7 @@ void javaVFrame::print_locked_object_class_name(outputStream* st, Handle obj, co
   }
 }
 
-void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) {
+void javaVFrame::print_lock_info_on(outputStream* st, bool is_virtual, int frame_count) {
   Thread* current = Thread::current();
   ResourceMark rm(current);
   HandleMark hm(current);
@@ -204,8 +204,9 @@ void javaVFrame::print_lock_info_on(outputStream* st, int frame_count) {
       oop obj = thread()->current_park_blocker();
       Klass* k = obj->klass();
       st->print_cr("\t- %s <" INTPTR_FORMAT "> (a %s)", "parking to wait for ", p2i(obj), k->external_name());
-    }
-    else if (thread()->osthread()->get_state() == OBJECT_WAIT) {
+    } else if (thread()->osthread()->get_state() == OBJECT_WAIT &&
+        // If this is a carrier thread with mounted virtual thread this is reported for the virtual thread.
+        (is_virtual || !thread()->is_vthread_mounted())) {
       // We are waiting on an Object monitor but Object.wait() isn't the
       // top-frame, so we should be waiting on a Class initialization monitor.
       InstanceKlass* k = thread()->class_to_be_initialized();
diff --git a/src/hotspot/share/runtime/vframe.hpp b/src/hotspot/share/runtime/vframe.hpp
index de3fca7246b..c8c166f3236 100644
--- a/src/hotspot/share/runtime/vframe.hpp
+++ b/src/hotspot/share/runtime/vframe.hpp
@@ -139,8 +139,8 @@ class javaVFrame: public vframe {
 
   // printing used during stack dumps and diagnostics
   static void print_locked_object_class_name(outputStream* st, Handle obj, const char* lock_state);
-  void print_lock_info_on(outputStream* st, int frame_count);
-  void print_lock_info(int frame_count) { print_lock_info_on(tty, frame_count); }
+  void print_lock_info_on(outputStream* st, bool is_virtual, int frame_count);
+  void print_lock_info(bool is_virtual, int frame_count) { print_lock_info_on(tty, is_virtual, frame_count); }
 
 #ifndef PRODUCT
  public:
diff --git a/test/hotspot/jtreg/serviceability/dcmd/thread/ClassInitMonitorVThread.java b/test/hotspot/jtreg/serviceability/dcmd/thread/ClassInitMonitorVThread.java
new file mode 100644
index 00000000000..8fd5f02a9cb
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/dcmd/thread/ClassInitMonitorVThread.java
@@ -0,0 +1,134 @@
+/*
+ * 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.dcmd.PidJcmdExecutor;
+import jdk.test.lib.process.OutputAnalyzer;
+import java.util.concurrent.CountDownLatch;
+
+/*
+ * @test
+ * @bug 8356222
+ * @summary Test jcmd Thread.print command for "waiting on the Class initialization monitor" case
+ * @requires vm.continuations
+ * @library /test/lib
+ * @run main ClassInitMonitorVThread
+ */
+
+class LongInitClass {
+    static {
+        ClassInitMonitorVThread.longInitClass_waiting = true;
+        while (ClassInitMonitorVThread.longInitClass_wait) {
+            try {
+                Thread.sleep(10);
+            } catch (Exception ex) {
+            }
+        }
+        ClassInitMonitorVThread.longInitClass_waiting = false;
+    }
+
+    LongInitClass() {}
+}
+
+public class ClassInitMonitorVThread {
+    static volatile boolean longInitClass_wait;
+    static volatile boolean longInitClass_waiting;
+
+    public static void main(String[] args) throws InterruptedException {
+        try {
+            // 1st thread starts class initialization
+            longInitClass_wait = true;
+            longInitClass_waiting = false;
+            Thread vthread1 = Thread.ofVirtual().name("Loader1").start(new Loader(null));
+            while (!longInitClass_waiting) {
+                Thread.sleep(10);
+            }
+
+            // 2nd thread is blocked at class initialization
+            // thread state is "RUNNING", so just wait some time after the thread is ready
+            CountDownLatch loaderReady = new CountDownLatch(1);
+            Thread vthread2 = Thread.ofVirtual().name("Loader2").start(new Loader(loaderReady));
+            loaderReady.await();
+
+            Thread.sleep(100);
+            // try up to 20 times to avoid failures on slow environment
+            for (int iter = 20; iter > 0; iter--) {
+                try {
+                    verify(vthread2);
+                    break;
+                } catch (RuntimeException ex) {
+                    if (iter == 0) {
+                        throw ex;
+                    }
+                    System.out.println("Failed with: " + ex.getMessage() + ", retrying...");
+                    System.out.println();
+                }
+                Thread.sleep(1000);
+            }
+        } finally {
+            longInitClass_wait = false;
+        }
+    }
+
+    static void verify(Thread vthread2) {
+        boolean silent = true;
+        OutputAnalyzer output = new PidJcmdExecutor().execute("Thread.print -l", silent);
+        String out = output.getStdout();
+        String carrierPrefix = "Carrying virtual thread #" + vthread2.threadId();
+        String vthreadPrefix = "Mounted virtual thread " + "#" + vthread2.threadId();
+        int carrierStart = out.indexOf(carrierPrefix);
+        int vthreadStart = out.indexOf(vthreadPrefix);
+        int vthreadEnd = out.indexOf("\n\n", vthreadStart);
+        String carrierOut = out.substring(carrierStart, vthreadStart);
+        String vthreadOut = out.substring(vthreadStart, vthreadEnd);
+
+        System.out.println("carrier: " + carrierOut);
+        System.out.println("vthread: " + vthreadOut);
+
+        String waitText = "- waiting on the Class initialization monitor for LongInitClass";
+
+        if (!vthreadOut.contains(waitText)) {
+            throw new RuntimeException("Vthread does not contain the lock");
+        }
+        if (carrierOut.contains(waitText)) {
+            throw new RuntimeException("Carrier does contain the lock");
+        }
+    }
+
+    static class Loader implements Runnable {
+        CountDownLatch ready;
+        Loader(CountDownLatch ready) {
+            this.ready = ready;
+        }
+        public void run() {
+            try {
+                if (ready != null) {
+                    ready.countDown();
+                }
+                Class<?> myClass = Class.forName("LongInitClass");
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+    }
+
+}

From 0df8c9684b8782ef830e2bd425217864c3f51784 Mon Sep 17 00:00:00 2001
From: Mohamed Issa <mohamed.issa@intel.com>
Date: Fri, 30 May 2025 21:47:20 +0000
Subject: [PATCH 746/901] 8353686: Optimize Math.cbrt for x86 64 bit platforms

Reviewed-by: sviswanathan, sparasa, jbhateja
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |  19 +
 src/hotspot/cpu/x86/assembler_x86.hpp         |   4 +
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp   |  17 +-
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  10 +
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |   9 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |   3 +
 src/hotspot/cpu/x86/stubGenerator_x86_64.hpp  |   1 +
 .../cpu/x86/stubGenerator_x86_64_cbrt.cpp     | 366 ++++++++++++++++++
 .../templateInterpreterGenerator_x86_64.cpp   |   4 +
 src/hotspot/share/c1/c1_Compiler.cpp          |   1 +
 src/hotspot/share/c1/c1_GraphBuilder.cpp      |   1 +
 src/hotspot/share/c1/c1_LIRGenerator.cpp      |   1 +
 src/hotspot/share/c1/c1_Runtime1.cpp          |   1 +
 src/hotspot/share/classfile/vmIntrinsics.cpp  |   3 +
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   5 +-
 .../share/interpreter/abstractInterpreter.cpp |   3 +
 .../share/interpreter/abstractInterpreter.hpp |   6 +-
 .../templateInterpreterGenerator.cpp          |   3 +-
 .../zero/zeroInterpreterGenerator.cpp         |   2 +
 src/hotspot/share/jvmci/jvmciCompilerToVM.hpp |   3 +-
 .../share/jvmci/jvmciCompilerToVMInit.cpp     |   2 +
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   1 +
 src/hotspot/share/opto/c2compiler.cpp         |   1 +
 src/hotspot/share/opto/library_call.cpp       |   4 +
 .../share/runtime/stubDeclarations.hpp        |   2 +
 .../share/classes/java/lang/Math.java         |   1 +
 .../org/openjdk/bench/java/lang/CbrtPerf.java | 187 +++++++++
 27 files changed, 648 insertions(+), 12 deletions(-)
 create mode 100644 src/hotspot/cpu/x86/stubGenerator_x86_64_cbrt.cpp
 create mode 100644 test/micro/org/openjdk/bench/java/lang/CbrtPerf.java

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 1b17663971d..84c08dda848 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -2867,6 +2867,17 @@ void Assembler::mov(Register dst, Register src) {
   movq(dst, src);
 }
 
+void Assembler::movapd(XMMRegister dst, Address src) {
+  NOT_LP64(assert(VM_Version::supports_sse2(), ""));
+  InstructionMark im(this);
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ VM_Version::supports_evex(), /* 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.set_rex_vex_w_reverted();
+  simd_prefix(dst, xnoreg, src, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x28);
+  emit_operand(dst, src, 0);
+}
+
 void Assembler::movapd(XMMRegister dst, XMMRegister src) {
   int vector_len = VM_Version::supports_avx512novl() ? AVX_512bit : AVX_128bit;
   InstructionAttr attributes(vector_len, /* rex_w */ VM_Version::supports_evex(), /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
@@ -8072,6 +8083,14 @@ void Assembler::vandps(XMMRegister dst, XMMRegister nds, Address src, int vector
   emit_operand(dst, src, 0);
 }
 
+void Assembler::orpd(XMMRegister dst, XMMRegister src) {
+  NOT_LP64(assert(VM_Version::supports_sse2(), ""));
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ !_legacy_mode_dq, /* legacy_mode */ _legacy_mode_dq, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_rex_vex_w_reverted();
+  int encode = simd_prefix_and_encode(dst, dst, src, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x56, (0xC0 | encode));
+}
+
 void Assembler::unpckhpd(XMMRegister dst, XMMRegister src) {
   InstructionAttr attributes(AVX_128bit, /* rex_w */ VM_Version::supports_evex(), /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
   attributes.set_rex_vex_w_reverted();
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 719334701a5..10e6264160c 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -950,6 +950,7 @@ class Assembler : public AbstractAssembler  {
   // New cpus require use of movaps and movapd to avoid partial register stall
   // when moving between registers.
   void movaps(XMMRegister dst, XMMRegister src);
+  void movapd(XMMRegister dst, Address src);
   void movapd(XMMRegister dst, XMMRegister src);
 
   // End avoid using directly
@@ -2450,6 +2451,9 @@ class Assembler : public AbstractAssembler  {
   void vandpd(XMMRegister dst, XMMRegister nds, Address src, int vector_len);
   void vandps(XMMRegister dst, XMMRegister nds, Address src, int vector_len);
 
+  // Bitwise Logical OR of Packed Floating-Point Values
+  void orpd(XMMRegister dst, XMMRegister src);
+
   void unpckhpd(XMMRegister dst, XMMRegister src);
   void unpcklpd(XMMRegister dst, XMMRegister src);
 
diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index 60ce3419dfb..3ea2e99fe57 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -720,7 +720,8 @@ void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
   if (x->id() == vmIntrinsics::_dexp || x->id() == vmIntrinsics::_dlog ||
       x->id() == vmIntrinsics::_dpow || x->id() == vmIntrinsics::_dcos ||
       x->id() == vmIntrinsics::_dsin || x->id() == vmIntrinsics::_dtan ||
-      x->id() == vmIntrinsics::_dlog10 || x->id() == vmIntrinsics::_dtanh
+      x->id() == vmIntrinsics::_dlog10 || x->id() == vmIntrinsics::_dtanh ||
+      x->id() == vmIntrinsics::_dcbrt
       ) {
     do_LibmIntrinsic(x);
     return;
@@ -807,7 +808,7 @@ void LIRGenerator::do_LibmIntrinsic(Intrinsic* x) {
       }
       break;
     case vmIntrinsics::_dpow:
-       if (StubRoutines::dpow() != nullptr) {
+      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());
@@ -828,18 +829,24 @@ void LIRGenerator::do_LibmIntrinsic(Intrinsic* x) {
       }
       break;
     case vmIntrinsics::_dtan:
-       if (StubRoutines::dtan() != nullptr) {
+      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;
     case vmIntrinsics::_dtanh:
-       assert(StubRoutines::dtanh() != nullptr, "tanh intrinsic not found");
-       if (StubRoutines::dtanh() != nullptr) {
+      assert(StubRoutines::dtanh() != nullptr, "tanh intrinsic not found");
+      if (StubRoutines::dtanh() != nullptr) {
         __ call_runtime_leaf(StubRoutines::dtanh(), getThreadTemp(), result_reg, cc->args());
       }
       break;
+    case vmIntrinsics::_dcbrt:
+      assert(StubRoutines::dcbrt() != nullptr, "cbrt intrinsic not found");
+      if (StubRoutines::dcbrt() != nullptr) {
+        __ call_runtime_leaf(StubRoutines::dcbrt(), getThreadTemp(), result_reg, cc->args());
+      }
+      break;
     default:  ShouldNotReachHere();
   }
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index f58a8dca98e..803bce48945 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -2250,6 +2250,16 @@ void MacroAssembler::evmovdqaq(XMMRegister dst, AddressLiteral src, int vector_l
   }
 }
 
+void MacroAssembler::movapd(XMMRegister dst, AddressLiteral src, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    Assembler::movapd(dst, as_Address(src));
+  } else {
+    lea(rscratch, src);
+    Assembler::movapd(dst, Address(rscratch, 0));
+  }
+}
 
 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 efd1a4c154f..f7ac6fb4297 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.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
@@ -995,6 +995,8 @@ class MacroAssembler: public Assembler {
   void andpd(XMMRegister dst, Address        src) { Assembler::andpd(dst, src); }
   void andpd(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
 
+  void andnpd(XMMRegister dst, XMMRegister src) { Assembler::andnpd(dst, src); }
+
   void andps(XMMRegister dst, XMMRegister    src) { Assembler::andps(dst, src); }
   void andps(XMMRegister dst, Address        src) { Assembler::andps(dst, src); }
   void andps(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
@@ -1007,6 +1009,8 @@ class MacroAssembler: public Assembler {
   void comisd(XMMRegister dst, Address        src) { Assembler::comisd(dst, src); }
   void comisd(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
 
+  void orpd(XMMRegister dst, XMMRegister src) { Assembler::orpd(dst, src); }
+
   void cmp32_mxcsr_std(Address mxcsr_save, Register tmp, Register rscratch = noreg);
   void ldmxcsr(Address src) { Assembler::ldmxcsr(src); }
   void ldmxcsr(AddressLiteral src, Register rscratch = noreg);
@@ -1241,6 +1245,9 @@ class MacroAssembler: public Assembler {
   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);
 
+  using Assembler::movapd;
+  void movapd(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
+
   // Move Aligned Double Quadword
   void movdqa(XMMRegister dst, XMMRegister    src) { Assembler::movdqa(dst, src); }
   void movdqa(XMMRegister dst, Address        src) { Assembler::movdqa(dst, src); }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 413836840c5..1014c1c376f 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -3692,6 +3692,9 @@ void StubGenerator::generate_libm_stubs() {
     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtanh)) {
       StubRoutines::_dtanh = generate_libmTanh(); // from stubGenerator_x86_64_tanh.cpp
     }
+    if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcbrt)) {
+      StubRoutines::_dcbrt = generate_libmCbrt(); // from stubGenerator_x86_64_cbrt.cpp
+    }
     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dexp)) {
       StubRoutines::_dexp = generate_libmExp(); // from stubGenerator_x86_64_exp.cpp
     }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index 6069c9dbc8e..2f1e46f3132 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -556,6 +556,7 @@ class StubGenerator: public StubCodeGenerator {
   address generate_libmCos();
   address generate_libmTan();
   address generate_libmTanh();
+  address generate_libmCbrt();
   address generate_libmExp();
   address generate_libmPow();
   address generate_libmLog();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_cbrt.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_cbrt.cpp
new file mode 100644
index 00000000000..da60a9be276
--- /dev/null
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_cbrt.cpp
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2025, 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 "macroAssembler_x86.hpp"
+#include "stubGenerator_x86_64.hpp"
+
+/******************************************************************************/
+//                     ALGORITHM DESCRIPTION
+//                     ---------------------
+//
+// x=2^{3*k+j} * 1.b1 b2 ... b5 b6 ... b52
+// Let r=(x*2^{-3k-j} - 1.b1 b2 ... b5 1)* rcp[b1 b2 ..b5],
+// where rcp[b1 b2 .. b5]=1/(1.b1 b2 b3 b4 b5 1) in double precision
+// cbrt(2^j * 1. b1 b2 .. b5 1) is approximated as T[j][b1..b5]+D[j][b1..b5]
+// (T stores the high 53 bits, D stores the low order bits)
+// Result=2^k*T+(2^k*T*r)*P+2^k*D
+// where P=p1+p2*r+..+p8*r^7
+//
+// Special cases:
+//  cbrt(NaN) = quiet NaN
+//  cbrt(+/-INF) = +/-INF
+//  cbrt(+/-0) = +/-0
+//
+/******************************************************************************/
+
+ATTRIBUTE_ALIGNED(4) static const juint _SIG_MASK[] =
+{
+    0, 1032192
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _EXP_MASK[] =
+{
+    0, 3220176896
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _EXP_MSK2[] =
+{
+    0, 3220193280
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _EXP_MSK3[] =
+{
+    4294967295, 1048575
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _SCALE63[] =
+{
+    0, 1138753536
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _ZERON[] =
+{
+    0, 2147483648
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _INF[] =
+{
+    0, 2146435072
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _NEG_INF[] =
+{
+    0, 4293918720
+};
+
+ATTRIBUTE_ALIGNED(16) static const juint _coeff_table[] =
+{
+    1553778919, 3213899486, 3534952507, 3215266280, 1646371399,
+    3214412045, 477218588,  3216798151, 3582521621, 1066628362,
+    1007461464, 1068473053, 889629714,  1067378449, 1431655765,
+    1070945621
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _rcp_table[] =
+{
+    528611360,  3220144632, 2884679527, 3220082993, 1991868891, 3220024928,
+    2298714891, 3219970134, 58835168,   3219918343, 3035110223, 3219869313,
+    1617585086, 3219822831, 2500867033, 3219778702, 4241943008, 3219736752,
+    258732970,  3219696825, 404232216,  3219658776, 2172167368, 3219622476,
+    1544257904, 3219587808, 377579543,  3219554664, 1616385542, 3219522945,
+    813783277,  3219492562, 3940743189, 3219463431, 2689777499, 3219435478,
+    1700977147, 3219408632, 3169102082, 3219382828, 327235604,  3219358008,
+    1244336319, 3219334115, 1300311200, 3219311099, 3095471925, 3219288912,
+    2166487928, 3219267511, 2913108253, 3219246854, 293672978,  3219226904,
+    288737297,  3219207624, 1810275472, 3219188981, 174592167,  3219170945,
+    3539053052, 3219153485, 2164392968, 3219136576
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _cbrt_table[] =
+{
+    572345495,  1072698681, 1998204467, 1072709382, 3861501553, 1072719872,
+    2268192434, 1072730162, 2981979308, 1072740260, 270859143,  1072750176,
+    2958651392, 1072759916, 313113243,  1072769490, 919449400,  1072778903,
+    2809328903, 1072788162, 2222981587, 1072797274, 2352530781, 1072806244,
+    594152517,  1072815078, 1555767199, 1072823780, 4282421314, 1072832355,
+    2355578597, 1072840809, 1162590619, 1072849145, 797864051,  1072857367,
+    431273680,  1072865479, 2669831148, 1072873484, 733477752,  1072881387,
+    4280220604, 1072889189, 801961634,  1072896896, 2915370760, 1072904508,
+    1159613482, 1072912030, 2689944798, 1072919463, 1248687822, 1072926811,
+    2967951030, 1072934075, 630170432,  1072941259, 3760898254, 1072948363,
+    0,          1072955392, 2370273294, 1072962345, 1261754802, 1072972640,
+    546334065,  1072986123, 1054893830, 1072999340, 1571187597, 1073012304,
+    1107975175, 1073025027, 3606909377, 1073037519, 1113616747, 1073049792,
+    4154744632, 1073061853, 3358931423, 1073073713, 4060702372, 1073085379,
+    747576176,  1073096860, 3023138255, 1073108161, 1419988548, 1073119291,
+    1914185305, 1073130255, 294389948,  1073141060, 3761802570, 1073151710,
+    978281566,  1073162213, 823148820,  1073172572, 2420954441, 1073182792,
+    3815449908, 1073192878, 2046058587, 1073202835, 1807524753, 1073212666,
+    2628681401, 1073222375, 3225667357, 1073231966, 1555307421, 1073241443,
+    3454043099, 1073250808, 1208137896, 1073260066, 3659916772, 1073269218,
+    1886261264, 1073278269, 3593647839, 1073287220, 3086012205, 1073296075,
+    2769796922, 1073304836, 888716057,  1073317807, 2201465623, 1073334794,
+    164369365,  1073351447, 3462666733, 1073367780, 2773905457, 1073383810,
+    1342879088, 1073399550, 2543933975, 1073415012, 1684477781, 1073430209,
+    3532178543, 1073445151, 1147747300, 1073459850, 1928031793, 1073474314,
+    2079717015, 1073488553, 4016765315, 1073502575, 3670431139, 1073516389,
+    3549227225, 1073530002, 11637607,   1073543422, 588220169,  1073556654,
+    2635407503, 1073569705, 2042029317, 1073582582, 1925128962, 1073595290,
+    4136375664, 1073607834, 759964600,  1073620221, 4257606771, 1073632453,
+    297278907,  1073644538, 3655053093, 1073656477, 2442253172, 1073668277,
+    1111876799, 1073679941, 3330973139, 1073691472, 3438879452, 1073702875,
+    3671565478, 1073714153, 1317849547, 1073725310, 1642364115, 1073736348
+};
+
+ATTRIBUTE_ALIGNED(4) static const juint _D_table[] =
+{
+    4050900474, 1014427190, 1157977860, 1016444461, 1374568199, 1017271387,
+    2809163288, 1016882676, 3742377377, 1013168191, 3101606597, 1017541672,
+    65224358,   1017217597, 2691591250, 1017266643, 4020758549, 1017689313,
+    1316310992, 1018030788, 1031537856, 1014090882, 3261395239, 1016413641,
+    886424999,  1016313335, 3114776834, 1014195875, 1681120620, 1017825416,
+    1329600273, 1016625740, 465474623,  1017097119, 4251633980, 1017169077,
+    1986990133, 1017710645, 752958613,  1017159641, 2216216792, 1018020163,
+    4282860129, 1015924861, 1557627859, 1016039538, 3889219754, 1018086237,
+    3684996408, 1017353275, 723532103,  1017717141, 2951149676, 1012528470,
+    831890937,  1017830553, 1031212645, 1017387331, 2741737450, 1017604974,
+    2863311531, 1003776682, 4276736099, 1013153088, 4111778382, 1015673686,
+    1728065769, 1016413986, 2708718031, 1018078833, 1069335005, 1015291224,
+    700037144,  1016482032, 2904566452, 1017226861, 4074156649, 1017622651,
+    25019565,   1015245366, 3601952608, 1015771755, 3267129373, 1017904664,
+    503203103,  1014921629, 2122011730, 1018027866, 3927295461, 1014189456,
+    2790625147, 1016024251, 1330460186, 1016940346, 4033568463, 1015538390,
+    3695818227, 1017509621, 257573361,  1017208868, 3227697852, 1017337964,
+    234118548,  1017169577, 4009025803, 1017278524, 1948343394, 1017749310,
+    678398162,  1018144239, 3083864863, 1016669086, 2415453452, 1017890370,
+    175467344,  1017330033, 3197359580, 1010339928, 2071276951, 1015941358,
+    268372543,  1016737773, 938132959,  1017389108, 1816750559, 1017337448,
+    4119203749, 1017152174, 2578653878, 1013108497, 2470331096, 1014678606,
+    123855735,  1016553320, 1265650889, 1014782687, 3414398172, 1017182638,
+    1040773369, 1016158401, 3483628886, 1016886550, 4140499405, 1016191425,
+    3893477850, 1016964495, 3935319771, 1009634717, 2978982660, 1015027112,
+    2452709923, 1017990229, 3190365712, 1015835149, 4237588139, 1015832925,
+    2610678389, 1017962711, 2127316774, 1017405770, 824267502,  1017959463,
+    2165924042, 1017912225, 2774007076, 1013257418, 4123916326, 1017582284,
+    1976417958, 1016959909, 4092806412, 1017711279, 119251817,  1015363631,
+    3475418768, 1017675415, 1972580503, 1015470684, 815541017,  1017517969,
+    2429917451, 1017397776, 4062888482, 1016749897, 68284153,   1017925678,
+    2207779246, 1016320298, 1183466520, 1017408657, 143326427,  1017060403
+};
+
+#define __ _masm->
+
+address StubGenerator::generate_libmCbrt() {
+  StubGenStubId stub_id = StubGenStubId::dcbrt_id;
+  StubCodeMark mark(this, stub_id);
+  address start = __ pc();
+
+  Label L_2TAG_PACKET_0_0_1, L_2TAG_PACKET_1_0_1, L_2TAG_PACKET_2_0_1, L_2TAG_PACKET_3_0_1;
+  Label L_2TAG_PACKET_4_0_1, L_2TAG_PACKET_5_0_1, L_2TAG_PACKET_6_0_1;
+  Label B1_1, B1_2, B1_4;
+
+  address SIG_MASK        = (address)_SIG_MASK;
+  address EXP_MASK        = (address)_EXP_MASK;
+  address EXP_MSK2        = (address)_EXP_MSK2;
+  address EXP_MSK3        = (address)_EXP_MSK3;
+  address SCALE63         = (address)_SCALE63;
+  address ZERON           = (address)_ZERON;
+  address INF             = (address)_INF;
+  address NEG_INF         = (address)_NEG_INF;
+  address coeff_table     = (address)_coeff_table;
+  address rcp_table       = (address)_rcp_table;
+  address cbrt_table      = (address)_cbrt_table;
+  address D_table         = (address)_D_table;
+
+  __ enter(); // required for proper stackwalking of RuntimeStub frame
+
+  __ bind(B1_1);
+  __ subq(rsp, 24);
+  __ movsd(Address(rsp), xmm0);
+
+  __ bind(B1_2);
+  __ movq(xmm7, xmm0);
+  __ movl(rdx, 524032);
+  __ movsd(xmm5, ExternalAddress(EXP_MSK3), r11 /*rscratch*/);
+  __ movsd(xmm3, ExternalAddress(EXP_MSK2), r11 /*rscratch*/);
+  __ psrlq(xmm7, 44);
+  __ pextrw(rcx, xmm7, 0);
+  __ movdl(rax, xmm7);
+  __ movsd(xmm1, ExternalAddress(EXP_MASK), r11 /*rscratch*/);
+  __ movsd(xmm2, ExternalAddress(SIG_MASK), r11 /*rscratch*/);
+  __ andl(rcx, 248);
+  __ lea(r8, ExternalAddress(rcp_table));
+  __ movsd(xmm4, Address(rcx, r8, Address::times_1));
+  __ movq(r9, rax);
+  __ andl(rdx, rax);
+  __ cmpl(rdx, 0);
+  __ jcc(Assembler::equal, L_2TAG_PACKET_0_0_1); // Branch only if |x| is denormalized
+  __ cmpl(rdx, 524032);
+  __ jcc(Assembler::equal, L_2TAG_PACKET_1_0_1); // Branch only if |x| is INF or NaN
+  __ shrl(rdx, 8);
+  __ shrq(r9, 8);
+  __ andpd(xmm2, xmm0);
+  __ andpd(xmm0, xmm5);
+  __ orpd(xmm3, xmm2);
+  __ orpd(xmm1, xmm0);
+  __ movapd(xmm5, ExternalAddress(coeff_table), r11 /*rscratch*/);
+  __ movl(rax, 5462);
+  __ movapd(xmm6, ExternalAddress(coeff_table + 16), r11 /*rscratch*/);
+  __ mull(rdx);
+  __ movq(rdx, r9);
+  __ andq(r9, 2047);
+  __ shrl(rax, 14);
+  __ andl(rdx, 2048);
+  __ subq(r9, rax);
+  __ subq(r9, rax);
+  __ subq(r9, rax);
+  __ shlq(r9, 8);
+  __ addl(rax, 682);
+  __ orl(rax, rdx);
+  __ movdl(xmm7, rax);
+  __ addq(rcx, r9);
+  __ psllq(xmm7, 52);
+
+  __ bind(L_2TAG_PACKET_2_0_1);
+  __ movapd(xmm2, ExternalAddress(coeff_table + 32), r11 /*rscratch*/);
+  __ movapd(xmm0, ExternalAddress(coeff_table + 48), r11 /*rscratch*/);
+  __ subsd(xmm1, xmm3);
+  __ movq(xmm3, xmm7);
+  __ lea(r8, ExternalAddress(cbrt_table));
+  __ mulsd(xmm7, Address(rcx, r8, Address::times_1));
+  __ mulsd(xmm1, xmm4);
+  __ lea(r8, ExternalAddress(D_table));
+  __ mulsd(xmm3, Address(rcx, r8, Address::times_1));
+  __ movapd(xmm4, xmm1);
+  __ unpcklpd(xmm1, xmm1);
+  __ mulpd(xmm5, xmm1);
+  __ mulpd(xmm6, xmm1);
+  __ mulpd(xmm1, xmm1);
+  __ addpd(xmm2, xmm5);
+  __ addpd(xmm0, xmm6);
+  __ mulpd(xmm2, xmm1);
+  __ mulpd(xmm1, xmm1);
+  __ mulsd(xmm4, xmm7);
+  __ addpd(xmm0, xmm2);
+  __ mulsd(xmm1, xmm0);
+  __ unpckhpd(xmm0, xmm0);
+  __ addsd(xmm0, xmm1);
+  __ mulsd(xmm0, xmm4);
+  __ addsd(xmm0, xmm3);
+  __ addsd(xmm0, xmm7);
+  __ jmp(B1_4);
+
+  __ bind(L_2TAG_PACKET_0_0_1);
+  __ mulsd(xmm0, ExternalAddress(SCALE63), r11 /*rscratch*/);
+  __ movq(xmm7, xmm0);
+  __ movl(rdx, 524032);
+  __ psrlq(xmm7, 44);
+  __ pextrw(rcx, xmm7, 0);
+  __ movdl(rax, xmm7);
+  __ andl(rcx, 248);
+  __ lea(r8, ExternalAddress(rcp_table));
+  __ movsd(xmm4, Address(rcx, r8, Address::times_1));
+  __ movq(r9, rax);
+  __ andl(rdx, rax);
+  __ shrl(rdx, 8);
+  __ shrq(r9, 8);
+  __ cmpl(rdx, 0);
+  __ jcc(Assembler::equal, L_2TAG_PACKET_3_0_1); // Branch only if |x| is zero
+  __ andpd(xmm2, xmm0);
+  __ andpd(xmm0, xmm5);
+  __ orpd(xmm3, xmm2);
+  __ orpd(xmm1, xmm0);
+  __ movapd(xmm5, ExternalAddress(coeff_table), r11 /*rscratch*/);
+  __ movl(rax, 5462);
+  __ movapd(xmm6, ExternalAddress(coeff_table + 16), r11 /*rscratch*/);
+  __ mull(rdx);
+  __ movq(rdx, r9);
+  __ andq(r9, 2047);
+  __ shrl(rax, 14);
+  __ andl(rdx, 2048);
+  __ subq(r9, rax);
+  __ subq(r9, rax);
+  __ subq(r9, rax);
+  __ shlq(r9, 8);
+  __ addl(rax, 661);
+  __ orl(rax, rdx);
+  __ movdl(xmm7, rax);
+  __ addq(rcx, r9);
+  __ psllq(xmm7, 52);
+  __ jmp(L_2TAG_PACKET_2_0_1);
+
+  __ bind(L_2TAG_PACKET_3_0_1);
+  __ cmpq(r9, 0);
+  __ jcc(Assembler::notEqual, L_2TAG_PACKET_4_0_1); // Branch only if x is negative zero
+  __ xorpd(xmm0, xmm0);
+  __ jmp(B1_4);
+
+  __ bind(L_2TAG_PACKET_4_0_1);
+  __ movsd(xmm0, ExternalAddress(ZERON), r11 /*rscratch*/);
+  __ jmp(B1_4);
+
+  __ bind(L_2TAG_PACKET_1_0_1);
+  __ movl(rax, Address(rsp, 4));
+  __ movl(rdx, Address(rsp));
+  __ movl(rcx, rax);
+  __ andl(rcx, 2147483647);
+  __ cmpl(rcx, 2146435072);
+  __ jcc(Assembler::above, L_2TAG_PACKET_5_0_1); // Branch only if |x| is NaN
+  __ cmpl(rdx, 0);
+  __ jcc(Assembler::notEqual, L_2TAG_PACKET_5_0_1); // Branch only if |x| is NaN
+  __ cmpl(rax, 2146435072);
+  __ jcc(Assembler::notEqual, L_2TAG_PACKET_6_0_1); // Branch only if x is negative INF
+  __ movsd(xmm0, ExternalAddress(INF), r11 /*rscratch*/);
+  __ jmp(B1_4);
+
+  __ bind(L_2TAG_PACKET_6_0_1);
+  __ movsd(xmm0, ExternalAddress(NEG_INF), r11 /*rscratch*/);
+  __ jmp(B1_4);
+
+  __ bind(L_2TAG_PACKET_5_0_1);
+  __ movsd(xmm0, Address(rsp));
+  __ addsd(xmm0, xmm0);
+  __ movq(Address(rsp, 8), xmm0);
+
+  __ bind(B1_4);
+  __ addq(rsp, 24);
+  __ leave(); // required for proper stackwalking of RuntimeStub frame
+  __ ret(0);
+
+  return start;
+}
+
+#undef __
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
index 6be702f2699..9ea4aeeccfa 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
@@ -468,6 +468,10 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
       assert(StubRoutines::dtanh() != nullptr, "not initialized");
       __ movdbl(xmm0, Address(rsp, wordSize));
       __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dtanh())));
+  } else if (kind == Interpreter::java_lang_math_cbrt) {
+    assert(StubRoutines::dcbrt() != nullptr, "not initialized");
+    __ movdbl(xmm0, Address(rsp, wordSize));
+    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dcbrt())));
   } else if (kind == Interpreter::java_lang_math_abs) {
     assert(StubRoutines::x86::double_sign_mask() != nullptr, "not initialized");
     __ movdbl(xmm0, Address(rsp, wordSize));
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index dd13b84edf5..b5fa7dcf247 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -168,6 +168,7 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_dtan:
   #if defined(AMD64)
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   #endif
   case vmIntrinsics::_dlog:
   case vmIntrinsics::_dlog10:
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index 201ee695f69..8658bebdaee 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -3298,6 +3298,7 @@ GraphBuilder::GraphBuilder(Compilation* compilation, IRScope* scope)
   case vmIntrinsics::_dcos          : // fall through
   case vmIntrinsics::_dtan          : // fall through
   case vmIntrinsics::_dtanh         : // fall through
+  case vmIntrinsics::_dcbrt         : // fall through
   case vmIntrinsics::_dlog          : // fall through
   case vmIntrinsics::_dlog10        : // fall through
   case vmIntrinsics::_dexp          : // fall through
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index 214da537993..341de0ac0c2 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -2870,6 +2870,7 @@ void LIRGenerator::do_Intrinsic(Intrinsic* x) {
   case vmIntrinsics::_dtanh:          // fall through
   case vmIntrinsics::_dsin :          // fall through
   case vmIntrinsics::_dcos :          // fall through
+  case vmIntrinsics::_dcbrt :         // fall through
   case vmIntrinsics::_dexp :          // fall through
   case vmIntrinsics::_dpow :          do_MathIntrinsic(x); break;
   case vmIntrinsics::_arraycopy:      do_ArrayCopy(x);     break;
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 93b8ed4410b..7c41c09d378 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -365,6 +365,7 @@ const char* Runtime1::name_for_address(address entry) {
   FUNCTION_CASE(entry, StubRoutines::dcos());
   FUNCTION_CASE(entry, StubRoutines::dtan());
   FUNCTION_CASE(entry, StubRoutines::dtanh());
+  FUNCTION_CASE(entry, StubRoutines::dcbrt());
 
 #undef FUNCTION_CASE
 
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index f76458b2662..6fd5c07e137 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -92,6 +92,7 @@ bool vmIntrinsics::preserves_state(vmIntrinsics::ID id) {
   case vmIntrinsics::_dcos:
   case vmIntrinsics::_dtan:
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   case vmIntrinsics::_dlog:
   case vmIntrinsics::_dlog10:
   case vmIntrinsics::_dexp:
@@ -144,6 +145,7 @@ bool vmIntrinsics::can_trap(vmIntrinsics::ID id) {
   case vmIntrinsics::_dcos:
   case vmIntrinsics::_dtan:
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   case vmIntrinsics::_dlog:
   case vmIntrinsics::_dlog10:
   case vmIntrinsics::_dexp:
@@ -288,6 +290,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_dcos:
   case vmIntrinsics::_dtan:
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   case vmIntrinsics::_dlog:
   case vmIntrinsics::_dexp:
   case vmIntrinsics::_dpow:
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 2959f35ef2c..eeefddfedfc 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -135,7 +135,7 @@ class methodHandle;
   do_name(log_name,"log")       do_name(log10_name,"log10")     do_name(pow_name,"pow")                                 \
   do_name(exp_name,"exp")       do_name(min_name,"min")         do_name(max_name,"max")                                 \
   do_name(floor_name, "floor")  do_name(ceil_name, "ceil")      do_name(rint_name, "rint")                              \
-  do_name(round_name, "round")  do_name(tanh_name,"tanh")                                                               \
+  do_name(round_name, "round")  do_name(tanh_name,"tanh")       do_name(cbrt_name,"cbrt")                                                               \
                                                                                                                         \
   do_name(addExact_name,"addExact")                                                                                     \
   do_name(decrementExact_name,"decrementExact")                                                                         \
@@ -161,7 +161,8 @@ class methodHandle;
   do_intrinsic(_dcos,                     java_lang_Math,         cos_name,   double_double_signature,           F_S)   \
   do_intrinsic(_dtan,                     java_lang_Math,         tan_name,   double_double_signature,           F_S)   \
   do_intrinsic(_datan2,                   java_lang_Math,         atan2_name, double2_double_signature,          F_S)   \
-  do_intrinsic(_dtanh,                    java_lang_Math,         tanh_name,   double_double_signature,          F_S)   \
+  do_intrinsic(_dtanh,                    java_lang_Math,         tanh_name,  double_double_signature,           F_S)   \
+  do_intrinsic(_dcbrt,                    java_lang_Math,         cbrt_name,  double_double_signature,           F_S)   \
   do_intrinsic(_dsqrt,                    java_lang_Math,         sqrt_name,  double_double_signature,           F_S)   \
   do_intrinsic(_dlog,                     java_lang_Math,         log_name,   double_double_signature,           F_S)   \
   do_intrinsic(_dlog10,                   java_lang_Math,         log10_name, double_double_signature,           F_S)   \
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp
index 25e23a15a58..1de7dd824f8 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp
@@ -138,6 +138,7 @@ AbstractInterpreter::MethodKind AbstractInterpreter::method_kind(const methodHan
       case vmIntrinsics::_dcos:              return java_lang_math_cos;
       case vmIntrinsics::_dtan:              return java_lang_math_tan;
       case vmIntrinsics::_dtanh:             return java_lang_math_tanh;
+      case vmIntrinsics::_dcbrt:             return java_lang_math_cbrt;
       case vmIntrinsics::_dabs:              return java_lang_math_abs;
       case vmIntrinsics::_dlog:              return java_lang_math_log;
       case vmIntrinsics::_dlog10:            return java_lang_math_log10;
@@ -199,6 +200,7 @@ vmIntrinsics::ID AbstractInterpreter::method_intrinsic(MethodKind kind) {
   case java_lang_math_cos         : return vmIntrinsics::_dcos;
   case java_lang_math_tan         : return vmIntrinsics::_dtan;
   case java_lang_math_tanh        : return vmIntrinsics::_dtanh;
+  case java_lang_math_cbrt        : return vmIntrinsics::_dcbrt;
   case java_lang_math_abs         : return vmIntrinsics::_dabs;
   case java_lang_math_log         : return vmIntrinsics::_dlog;
   case java_lang_math_log10       : return vmIntrinsics::_dlog10;
@@ -303,6 +305,7 @@ void AbstractInterpreter::print_method_kind(MethodKind kind) {
     case java_lang_math_cos     : tty->print("java_lang_math_cos"     ); break;
     case java_lang_math_tan     : tty->print("java_lang_math_tan"     ); break;
     case java_lang_math_tanh    : tty->print("java_lang_math_tanh"    ); break;
+    case java_lang_math_cbrt    : tty->print("java_lang_math_cbrt"    ); break;
     case java_lang_math_abs     : tty->print("java_lang_math_abs"     ); break;
     case java_lang_math_log     : tty->print("java_lang_math_log"     ); break;
     case java_lang_math_log10   : tty->print("java_lang_math_log10"   ); break;
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp
index cc1a66f442d..b6876b3a2da 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.hpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.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
@@ -39,7 +39,7 @@
 
 // Organization of the interpreter(s). There exists two different interpreters in hotpot
 // an assembly language version (aka template interpreter) and a high level language version
-// (aka c++ interpreter). Th division of labor is as follows:
+// (aka c++ interpreter). The division of labor is as follows:
 
 // Template Interpreter          Zero Interpreter       Functionality
 //
@@ -73,6 +73,7 @@ class AbstractInterpreter: AllStatic {
     java_lang_math_cos,                                         // implementation of java.lang.Math.cos   (x)
     java_lang_math_tan,                                         // implementation of java.lang.Math.tan   (x)
     java_lang_math_tanh,                                        // implementation of java.lang.Math.tanh  (x)
+    java_lang_math_cbrt,                                        // implementation of java.lang.Math.cbrt  (x)
     java_lang_math_abs,                                         // implementation of java.lang.Math.abs   (x)
     java_lang_math_sqrt,                                        // implementation of java.lang.Math.sqrt  (x)
     java_lang_math_sqrt_strict,                                 // implementation of java.lang.StrictMath.sqrt(x)
@@ -152,6 +153,7 @@ class AbstractInterpreter: AllStatic {
       case vmIntrinsics::_dcos  : // fall thru
       case vmIntrinsics::_dtan  : // fall thru
       case vmIntrinsics::_dtanh : // fall thru
+      case vmIntrinsics::_dcbrt : // fall thru
       case vmIntrinsics::_dabs  : // fall thru
       case vmIntrinsics::_dsqrt : // fall thru
       case vmIntrinsics::_dsqrt_strict : // fall thru
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
index 1d3be066941..533c88cce9e 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
@@ -194,6 +194,7 @@ void TemplateInterpreterGenerator::generate_all() {
   method_entry(java_lang_math_cos  )
   method_entry(java_lang_math_tan  )
   method_entry(java_lang_math_tanh )
+  method_entry(java_lang_math_cbrt )
   method_entry(java_lang_math_abs  )
   method_entry(java_lang_math_sqrt )
   method_entry(java_lang_math_sqrt_strict)
@@ -453,6 +454,7 @@ address TemplateInterpreterGenerator::generate_intrinsic_entry(AbstractInterpret
   case Interpreter::java_lang_math_cos     : // fall thru
   case Interpreter::java_lang_math_tan     : // fall thru
   case Interpreter::java_lang_math_tanh    : // fall thru
+  case Interpreter::java_lang_math_cbrt    : // fall thru
   case Interpreter::java_lang_math_abs     : // fall thru
   case Interpreter::java_lang_math_log     : // fall thru
   case Interpreter::java_lang_math_log10   : // fall thru
@@ -487,4 +489,3 @@ address TemplateInterpreterGenerator::generate_intrinsic_entry(AbstractInterpret
   }
   return entry_point;
 }
-
diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp
index faa36fc1ab1..c4eeb3fa840 100644
--- a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp
+++ b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp
@@ -54,6 +54,7 @@ void ZeroInterpreterGenerator::generate_all() {
     method_entry(java_lang_math_cos   );
     method_entry(java_lang_math_tan   );
     method_entry(java_lang_math_tanh  );
+    method_entry(java_lang_math_cbrt  );
     method_entry(java_lang_math_abs   );
     method_entry(java_lang_math_sqrt  );
     method_entry(java_lang_math_sqrt_strict);
@@ -96,6 +97,7 @@ address ZeroInterpreterGenerator::generate_method_entry(
   case Interpreter::java_lang_math_cos     : // fall thru
   case Interpreter::java_lang_math_tan     : // fall thru
   case Interpreter::java_lang_math_tanh    : // fall thru
+  case Interpreter::java_lang_math_cbrt    : // fall thru
   case Interpreter::java_lang_math_abs     : // fall thru
   case Interpreter::java_lang_math_log     : // fall thru
   case Interpreter::java_lang_math_log10   : // fall thru
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index c71993b7414..41531b083fc 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.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
@@ -125,6 +125,7 @@ class CompilerToVM {
     static address dcos;
     static address dtan;
     static address dtanh;
+    static address dcbrt;
     static address dexp;
     static address dlog;
     static address dlog10;
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 7b28eea59d5..1beb1917b9a 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -145,6 +145,7 @@ address CompilerToVM::Data::dsin;
 address CompilerToVM::Data::dcos;
 address CompilerToVM::Data::dtan;
 address CompilerToVM::Data::dtanh;
+address CompilerToVM::Data::dcbrt;
 address CompilerToVM::Data::dexp;
 address CompilerToVM::Data::dlog;
 address CompilerToVM::Data::dlog10;
@@ -287,6 +288,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
   }
 
   SET_TRIGFUNC_OR_NULL(dtanh);
+  SET_TRIGFUNC_OR_NULL(dcbrt);
 
 #undef SET_TRIGFUNC_OR_NULL
 
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index fc5b80f1d2e..cf9e6ed46d5 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -141,6 +141,7 @@
   static_field(CompilerToVM::Data,             dcos,                                   address)                                      \
   static_field(CompilerToVM::Data,             dtan,                                   address)                                      \
   static_field(CompilerToVM::Data,             dtanh,                                  address)                                      \
+  static_field(CompilerToVM::Data,             dcbrt,                                  address)                                      \
   static_field(CompilerToVM::Data,             dexp,                                   address)                                      \
   static_field(CompilerToVM::Data,             dlog,                                   address)                                      \
   static_field(CompilerToVM::Data,             dlog10,                                 address)                                      \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 272692446ae..0c642211e1f 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -616,6 +616,7 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_dcos:
   case vmIntrinsics::_dtan:
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   case vmIntrinsics::_dabs:
   case vmIntrinsics::_fabs:
   case vmIntrinsics::_iabs:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 8a31711f85e..29f737bce08 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -245,6 +245,7 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_dcos:
   case vmIntrinsics::_dtan:
   case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
   case vmIntrinsics::_dabs:
   case vmIntrinsics::_fabs:
   case vmIntrinsics::_iabs:
@@ -1886,6 +1887,9 @@ bool LibraryCallKit::inline_math_native(vmIntrinsics::ID id) {
   case vmIntrinsics::_dtanh:
     return StubRoutines::dtanh() != nullptr ?
       runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dtanh(), "dtanh") : false;
+  case vmIntrinsics::_dcbrt:
+    return StubRoutines::dcbrt() != nullptr ?
+      runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dcbrt(), "dcbrt") : false;
   case vmIntrinsics::_dexp:
     return StubRoutines::dexp() != nullptr ?
       runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(),  "dexp") :
diff --git a/src/hotspot/share/runtime/stubDeclarations.hpp b/src/hotspot/share/runtime/stubDeclarations.hpp
index 46feaaf0175..5dc7d293662 100644
--- a/src/hotspot/share/runtime/stubDeclarations.hpp
+++ b/src/hotspot/share/runtime/stubDeclarations.hpp
@@ -591,6 +591,8 @@
   do_entry(initial, dtan, dtan, dtan)                                   \
   do_stub(initial, dtanh)                                               \
   do_entry(initial, dtanh, dtanh, dtanh)                                \
+  do_stub(initial, dcbrt)                                               \
+  do_entry(initial, dcbrt, dcbrt, dcbrt)                                \
   do_stub(initial, fmod)                                                \
   do_entry(initial, fmod, fmod, fmod)                                   \
   /* following generic entries should really be x86_32 only */          \
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 9956077bb09..9108ba7d944 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -445,6 +445,7 @@ public static double sqrt(double a) {
      * @return  the cube root of {@code a}.
      * @since 1.5
      */
+    @IntrinsicCandidate
     public static double cbrt(double a) {
         return StrictMath.cbrt(a);
     }
diff --git a/test/micro/org/openjdk/bench/java/lang/CbrtPerf.java b/test/micro/org/openjdk/bench/java/lang/CbrtPerf.java
new file mode 100644
index 00000000000..0143b76fe6c
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/CbrtPerf.java
@@ -0,0 +1,187 @@
+/*
+ * 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.java.lang;
+
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.Random;
+
+public class CbrtPerf {
+
+    @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.MILLISECONDS)
+    @Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.MILLISECONDS)
+    @Fork(2)
+    @BenchmarkMode(Mode.Throughput)
+    @State(Scope.Thread)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public static class CbrtPerfRanges {
+        public static int cbrtInputCount = 2048;
+
+        @Param({"0", "1"})
+        public int cbrtRangeIndex;
+
+        public double [] cbrtPosRandInputs;
+        public double [] cbrtNegRandInputs;
+        public int       cbrtInputIndex = 0;
+        public double    cbrtRangeInputs[][] = { {0.0, 0x1.0P-1022}, {0x1.0P-1022, 1.7976931348623157E308} };
+
+        @Setup
+        public void setupValues() {
+            Random random = new Random(1023);
+
+            // Fill the positive and negative cbrt vectors with random values
+            cbrtPosRandInputs = new double[cbrtInputCount];
+            cbrtNegRandInputs = new double[cbrtInputCount];
+
+            for (int i = 0; i < cbrtInputCount; i++) {
+                double cbrtLowerBound = cbrtRangeInputs[cbrtRangeIndex][0];
+                double cbrtUpperBound = cbrtRangeInputs[cbrtRangeIndex][1];
+                cbrtPosRandInputs[i] = random.nextDouble(cbrtLowerBound, cbrtUpperBound);
+                cbrtNegRandInputs[i] = random.nextDouble(-cbrtUpperBound, -cbrtLowerBound);
+            }
+        }
+
+        @Benchmark
+        @OperationsPerInvocation(2048)
+        public double  cbrtPosRangeDouble() {
+            double res = 0.0;
+            for (int i = 0; i < cbrtInputCount; i++) {
+                res += Math.cbrt(cbrtPosRandInputs[i]);
+            }
+            return res;
+        }
+
+        @Benchmark
+        @OperationsPerInvocation(2048)
+        public double  cbrtNegRangeDouble() {
+            double res = 0.0;
+            for (int i = 0; i < cbrtInputCount; i++) {
+                res += Math.cbrt(cbrtNegRandInputs[i]);
+            }
+            return res;
+        }
+    }
+
+    @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Fork(2)
+    @BenchmarkMode(Mode.Throughput)
+    @State(Scope.Thread)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public static class CbrtPerfConstant {
+        public static final double constDouble0   = 0.0;
+        public static final double constDouble1   = 1.0;
+        public static final double constDouble27  = 27.0;
+        public static final double constDouble512 = 512.0;
+
+        @Benchmark
+        public double  cbrtConstDouble0() {
+            return  Math.cbrt(constDouble0);
+        }
+
+        @Benchmark
+        public double  cbrtConstDouble1() {
+            return  Math.cbrt(constDouble1);
+        }
+
+        @Benchmark
+        public double  cbrtConstDouble27() {
+            return  Math.cbrt(constDouble27);
+        }
+
+        @Benchmark
+        public double  cbrtConstDouble512() {
+            return  Math.cbrt(constDouble512);
+        }
+    }
+
+    @Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Measurement(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS)
+    @Fork(2)
+    @BenchmarkMode(Mode.Throughput)
+    @State(Scope.Thread)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    public static class CbrtPerfSpecialValues {
+        public double double0           = 0.0;
+        public double doubleNegative0   = -0.0;
+        public double doubleInf         = Double.POSITIVE_INFINITY;
+        public double doubleNegativeInf = Double.NEGATIVE_INFINITY;
+        public double doubleNaN         = Double.NaN;
+
+        @Benchmark
+        public double  cbrtDouble0() {
+            return  Math.cbrt(double0);
+        }
+
+        @Benchmark
+        public double  cbrtDoubleNegative0() {
+            return  Math.cbrt(doubleNegative0);
+        }
+
+        @Benchmark
+        public double  cbrtDoubleInf() {
+            return  Math.cbrt(doubleInf);
+        }
+
+        @Benchmark
+        public double  cbrtDoubleNegativeInf() {
+            return  Math.cbrt(doubleNegativeInf);
+        }
+
+        @Benchmark
+        public double  cbrtDoubleNaN() {
+            return  Math.cbrt(doubleNaN);
+        }
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(CbrtPerfRanges.class.getSimpleName())
+                .build();
+
+        new Runner(opt).run();
+
+        opt = new OptionsBuilder()
+                .include(CbrtPerfConstant.class.getSimpleName())
+                .build();
+
+        new Runner(opt).run();
+    }
+}

From 2926435d228f21a227763ff4efcf32e511aa258a Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Fri, 30 May 2025 23:06:36 +0000
Subject: [PATCH 747/901] 8341346: Add support for exporting TLS Keying
 Material

Reviewed-by: hchao, jnimeh, weijun
---
 .../sun/crypto/provider/TlsPrfGenerator.java  |   6 +-
 .../javax/net/ssl/ExtendedSSLSession.java     | 112 +++-
 .../internal/spec/TlsPrfParameterSpec.java    |  48 +-
 .../classes/sun/security/ssl/Finished.java    |  12 +
 .../sun/security/ssl/SSLSessionImpl.java      | 297 ++++++++-
 .../classes/sun/security/ssl/ServerHello.java |   6 +
 .../security/pkcs11/P11SecretKeyFactory.java  |   1 +
 .../security/pkcs11/P11TlsPrfGenerator.java   |   8 +-
 .../ExportKeyingMaterialTests.java            | 573 ++++++++++++++++++
 9 files changed, 1043 insertions(+), 20 deletions(-)
 create mode 100644 test/jdk/javax/net/ssl/ExtendedSSLSession/ExportKeyingMaterialTests.java

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
index f8f733b6d2f..6ca019ae87b 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.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
@@ -147,7 +147,7 @@ protected void engineInit(int keysize, SecureRandom random) {
         throw new InvalidParameterException(MSG);
     }
 
-    SecretKey engineGenerateKey0(boolean tls12) {
+    protected SecretKey engineGenerateKey0(boolean tls12) {
         if (spec == null) {
             throw new IllegalStateException(
                 "TlsPrfGenerator must be initialized");
@@ -163,7 +163,7 @@ SecretKey engineGenerateKey0(boolean tls12) {
                     spec.getPRFBlockSize()) :
                 doTLS10PRF(secret, labelBytes, spec.getSeed(), n));
             try {
-                return new SecretKeySpec(prfBytes, "TlsPrf");
+                return new SecretKeySpec(prfBytes, spec.getKeyAlg());
             } finally {
                 Arrays.fill(prfBytes, (byte)0);
             }
diff --git a/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java b/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java
index 2b98f4845cf..980ff77d83a 100644
--- a/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.java
+++ b/src/java.base/share/classes/javax/net/ssl/ExtendedSSLSession.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
@@ -26,6 +26,7 @@
 package javax.net.ssl;
 
 import java.util.List;
+import javax.crypto.SecretKey;
 
 /**
  * Extends the {@code SSLSession} interface to support additional
@@ -163,4 +164,113 @@ public List<SNIServerName> getRequestedServerNames() {
     public List<byte[]> getStatusResponses() {
         throw new UnsupportedOperationException();
     }
+
+    /**
+     * Generates Exported Keying Material (EKM) calculated according to the
+     * algorithms defined in RFCs 5705/8446.
+     * <P>
+     * RFC 5705 (for (D)TLSv1.2 and earlier) calculates different EKM
+     * values depending on whether {@code context} is null or non-null/empty.
+     * RFC 8446 (TLSv1.3) treats a null context as non-null/empty.
+     * <P>
+     * {@code label} will be converted to bytes using
+     * the {@link java.nio.charset.StandardCharsets#UTF_8}
+     * character encoding.
+     *
+     * @spec https://www.rfc-editor.org/info/rfc5705
+     *     RFC 5705: Keying Material Exporters for Transport Layer
+     *     Security (TLS)
+     * @spec https://www.rfc-editor.org/info/rfc8446
+     *     RFC 8446: The Transport Layer Security (TLS) Protocol Version 1.3
+     *
+     * @implSpec The default implementation throws
+     *           {@code UnsupportedOperationException}.
+     *
+     * @param keyAlg  the algorithm of the resultant {@code SecretKey} object.
+     *                See the SecretKey Algorithms section in the
+     *                <a href="http://github.com/specs/security/standard-names.html#secretkey-algorithms">
+     *                Java Security Standard Algorithm Names Specification</a>
+     *                for information about standard secret key algorithm
+     *                names.
+     * @param label   the label bytes used in the EKM calculation.
+     *                {@code label} will be converted to a {@code byte[]}
+     *                before the operation begins.
+     * @param context the context bytes used in the EKM calculation, or null
+     * @param length  the number of bytes of EKM material needed
+     *
+     * @throws SSLKeyException if the key cannot be generated
+     * @throws IllegalArgumentException if {@code keyAlg} is empty,
+     *         {@code length} is non-positive, or if the {@code label} or
+     *         {@code context} length can not be accommodated
+     * @throws NullPointerException if {@code keyAlg} or {@code label} is null
+     * @throws IllegalStateException if this session does not have the
+     *         necessary key generation material (for example, a session
+     *         under construction during handshaking)
+     * @throws UnsupportedOperationException if the underlying provider
+     *         does not implement the operation
+     *
+     * @return a {@code SecretKey} that contains {@code length} bytes of the
+     *         EKM material
+     *
+     * @since 25
+     */
+    public SecretKey exportKeyingMaterialKey(String keyAlg,
+            String label, byte[] context, int length) throws SSLKeyException {
+        throw new UnsupportedOperationException(
+                "Underlying provider does not implement the method");
+    }
+
+    /**
+     * Generates Exported Keying Material (EKM) calculated according to the
+     * algorithms defined in RFCs 5705/8446.
+     * <P>
+     * RFC 5705 (for (D)TLSv1.2 and earlier) calculates different EKM
+     * values depending on whether {@code context} is null or non-null/empty.
+     * RFC 8446 (TLSv1.3) treats a null context as non-null/empty.
+     * <P>
+     * {@code label} will be converted to bytes using
+     * the {@link java.nio.charset.StandardCharsets#UTF_8}
+     * character encoding.
+     * <P>
+     * Depending on the chosen underlying key derivation mechanism, the
+     * raw bytes might not be extractable/exportable.  In such cases, the
+     * {@link #exportKeyingMaterialKey(String, String, byte[], int)} method
+     * should be used instead to access the generated key material.
+     *
+     * @spec https://www.rfc-editor.org/info/rfc5705
+     *     RFC 5705: Keying Material Exporters for Transport Layer
+     *     Security (TLS)
+     * @spec https://www.rfc-editor.org/info/rfc8446
+     *     RFC 8446: The Transport Layer Security (TLS) Protocol Version 1.3
+     *
+     * @implSpec The default implementation throws
+     *           {@code UnsupportedOperationException}.
+     *
+     * @param label   the label bytes used in the EKM calculation.
+     *                {@code label} will be converted to a {@code byte[]}
+     *                before the operation begins.
+     * @param context the context bytes used in the EKM calculation, or null
+     * @param length  the number of bytes of EKM material needed
+     *
+     * @throws SSLKeyException if the key cannot be generated
+     * @throws IllegalArgumentException if {@code length} is non-positive,
+     *         or if the {@code label} or {@code context} length can
+     *         not be accommodated
+     * @throws NullPointerException if {@code label} is null
+     * @throws IllegalStateException if this session does not have the
+     *         necessary key generation material (for example, a session
+     *         under construction during handshaking)
+     * @throws UnsupportedOperationException if the underlying provider
+     *         does not implement the operation, or if the derived
+     *         keying material is not extractable
+     *
+     * @return a byte array of size {@code length} that contains the EKM
+     *         material
+     * @since 25
+     */
+    public byte[] exportKeyingMaterialData(
+            String label, byte[] context, int length) throws SSLKeyException {
+        throw new UnsupportedOperationException(
+                "Underlying provider does not implement the method");
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java b/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
index f87579ebb70..14abf9f30dc 100644
--- a/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
+++ b/src/java.base/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.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
@@ -45,6 +45,7 @@
 public class TlsPrfParameterSpec implements AlgorithmParameterSpec {
 
     private final SecretKey secret;
+    private final String keyAlg;
     private final String label;
     private final byte[] seed;
     private final int outputLength;
@@ -72,13 +73,45 @@ public class TlsPrfParameterSpec implements AlgorithmParameterSpec {
     public TlsPrfParameterSpec(SecretKey secret, String label,
             byte[] seed, int outputLength,
             String prfHashAlg, int prfHashLength, int prfBlockSize) {
-        if ((label == null) || (seed == null)) {
-            throw new NullPointerException("label and seed must not be null");
+        this(secret, "TlsPrf", label, seed, outputLength, prfHashAlg,
+                prfHashLength, prfBlockSize);
+    }
+
+    /**
+     * Constructs a new TlsPrfParameterSpec.
+     *
+     * @param secret the secret to use in the calculation (or null)
+     * @param keyAlg the algorithm name for the generated {@code SecretKey}
+     * @param label the label to use in the calculation
+     * @param seed the random seed to use in the calculation
+     * @param outputLength the length in bytes of the output key to be produced
+     * @param prfHashAlg the name of the TLS PRF hash algorithm to use.
+     *        Used only for TLS 1.2+.  TLS1.1 and earlier use a fixed PRF.
+     * @param prfHashLength the output length of the TLS PRF hash algorithm.
+     *        Used only for TLS 1.2+.
+     * @param prfBlockSize the input block size of the TLS PRF hash algorithm.
+     *        Used only for TLS 1.2+.
+     *
+     * @throws NullPointerException if keyAlg, label or seed is null
+     * @throws IllegalArgumentException if outputLength is negative or
+     *         keyAlg is empty
+     */
+    public TlsPrfParameterSpec(SecretKey secret, String keyAlg,
+            String label, byte[] seed, int outputLength,
+            String prfHashAlg, int prfHashLength, int prfBlockSize) {
+
+        if ((keyAlg == null) || (label == null) || (seed == null)) {
+            throw new NullPointerException(
+                    "keyAlg, label or seed must not be null");
+        }
+        if (keyAlg.isEmpty()) {
+            throw new IllegalArgumentException("keyAlg can not be empty");
         }
         if (outputLength <= 0) {
             throw new IllegalArgumentException("outputLength must be positive");
         }
         this.secret = secret;
+        this.keyAlg = keyAlg;
         this.label = label;
         this.seed = seed.clone();
         this.outputLength = outputLength;
@@ -87,6 +120,15 @@ public TlsPrfParameterSpec(SecretKey secret, String label,
         this.prfBlockSize = prfBlockSize;
     }
 
+    /**
+     * Returns the key algorithm name to use when generating the SecretKey.
+     *
+     * @return the key algorithm name
+     */
+    public String getKeyAlg() {
+        return keyAlg;
+    }
+
     /**
      * Returns the secret to use in the PRF calculation, or null if there is no
      * secret.
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index dcb499b6d0c..e388672cb7f 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -745,6 +745,12 @@ private byte[] onProduceFinished(ClientHandshakeContext chc,
                         "Failure to derive application secrets", gse);
             }
 
+            // Calculate/save the exporter_master_secret.  It uses
+            // the same handshakeHash as the client/server app traffic.
+            SecretKey exporterSecret = kd.deriveKey(
+                    "TlsExporterMasterSecret");
+            chc.handshakeSession.setExporterMasterSecret(exporterSecret);
+
             // The resumption master secret is stored in the session so
             // it can be used after the handshake is completed.
             SSLSecretDerivation sd = ((SSLSecretDerivation) kd).forContext(chc);
@@ -1099,6 +1105,12 @@ private void onConsumeFinished(ServerHandshakeContext shc,
                 shc.baseReadSecret = readSecret;
                 shc.conContext.inputRecord.changeReadCiphers(readCipher);
 
+                // Calculate/save the exporter_master_secret.  It uses
+                // the same handshakeHash as the client/server app traffic.
+                SecretKey exporterSecret = kd.deriveKey(
+                        "TlsExporterMasterSecret");
+                shc.handshakeSession.setExporterMasterSecret(exporterSecret);
+
                 // The resumption master secret is stored in the session so
                 // it can be used after the handshake is completed.
                 shc.handshakeHash.update();
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 032aa7de5b3..5eb9f72af46 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -27,28 +27,32 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
-import java.security.Principal;
-import java.security.PrivateKey;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.zip.Adler32;
+import javax.crypto.KDF;
+import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.HKDFParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import javax.net.ssl.ExtendedSSLSession;
-import javax.net.ssl.SNIHostName;
-import javax.net.ssl.SNIServerName;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSessionBindingEvent;
-import javax.net.ssl.SSLSessionBindingListener;
-import javax.net.ssl.SSLSessionContext;
+import javax.net.ssl.*;
+
+import sun.security.ssl.CipherSuite.HashAlg;
+import sun.security.internal.spec.TlsPrfParameterSpec;
+import static sun.security.ssl.CipherSuite.HashAlg.H_NONE;
+import static sun.security.ssl.ProtocolVersion.*;
+import sun.security.util.KeyUtil;
 import sun.security.provider.X509Factory;
 import sun.security.ssl.X509Authentication.X509Possession;
 
@@ -99,6 +103,9 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     private Collection<SignatureScheme> peerSupportedSignAlgs; //for certificate
     private boolean             useDefaultPeerSignAlgs = false;
     private List<byte[]>        statusResponses;
+    private SecretKey           exporterMasterSecret;  // TLSv1.3+ exporter info
+    private RandomCookie        clientRandom;          // TLSv1.2- exporter info
+    private RandomCookie        serverRandom;
     private SecretKey           resumptionMasterSecret;
     private SecretKey           preSharedKey;
     private byte[]              pskIdentity;
@@ -612,6 +619,15 @@ void setMasterSecret(SecretKey secret) {
         masterSecret = secret;
     }
 
+    void setExporterMasterSecret(SecretKey secret) {
+        exporterMasterSecret = secret;
+    }
+
+    void setRandoms(RandomCookie client, RandomCookie server) {
+        clientRandom = client;
+        serverRandom = server;
+    }
+
     void setResumptionMasterSecret(SecretKey secret) {
         resumptionMasterSecret = secret;
     }
@@ -1397,6 +1413,269 @@ public List<SNIServerName> getRequestedServerNames() {
         return requestedServerNames;
     }
 
+    /*
+     * keyAlg is used for switching between Keys/Data.  If keyAlg is
+     * non-null, we are producing a Key, otherwise data.
+     */
+    public Object exportKeyingMaterial(
+            String keyAlg, String label, byte[] context, int length)
+            throws SSLKeyException {
+
+        // Global preconditions
+
+        Objects.requireNonNull(label, "label can not be null");
+        if (length < 1) {
+            throw new IllegalArgumentException(
+                    "length must be positive");
+        }
+
+        // Calculations are primarily based on protocol version.
+        if (protocolVersion.useTLS13PlusSpec()) {
+
+            // Unlikely, but check anyway.
+            if (exporterMasterSecret == null) {
+                throw new IllegalStateException(
+                        "Exporter master secret not captured");
+            }
+
+            // TLS 1.3+ using HKDF-based calcs.
+            //     TLS 1.3 (RFC 8446)
+
+            // Check the label/context lengths:
+            //       struct {
+            //           uint16 length = Length;
+            //           opaque label<7..255> = "tls13 " + Label;
+            //           opaque context<0..255> = Context;
+            //       } HkdfLabel;
+            // label can have 249 bytes (+6 for "tls13 "), and context 255
+
+            // RFC 8446 allows for length of 2^16-1 (65536), but RFC 5869
+            // states:
+            //
+            //     L    length of output keying material in octets
+            //          (<= 255*HashLen)
+            if (length > (255 * cipherSuite.hashAlg.hashLength )) {
+                throw new IllegalArgumentException(
+                        "length is too large");
+            }
+
+            byte[] hkdfInfoLabel =
+                        ("tls13 " + label).getBytes(StandardCharsets.UTF_8);
+            if ((hkdfInfoLabel.length < 7) || hkdfInfoLabel.length > 255) {
+                throw new IllegalArgumentException(
+                        "label length outside range");
+            }
+
+            // If no context (null) is provided, RFC 8446 requires an empty
+            // context be used, unlike RFC 5705.
+            context = (context != null ? context : new byte[0]);
+            if (context.length > 255) {
+                throw new IllegalArgumentException(
+                        "context length outside range");
+            }
+
+            // Do RFC 8446:7.1-7.5 calculations
+
+            /*
+             * TLS-Exporter(label, context_value, key_length) =
+             *     HKDF-Expand-Label(Derive-Secret(Secret, label, ""),
+             *         "exporter", Hash(context_value), key_length)
+             *
+             * Derive-Secret(Secret, Label, Messages) =
+             *     HKDF-Expand-Label(Secret, Label,
+             *         Transcript-Hash(Messages), Hash.length)
+             */
+
+            try {
+                // Use the ciphersuite's hashAlg for these calcs.
+                HashAlg hashAlg = cipherSuite.hashAlg;
+                KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
+
+                // First calculate the inner Derive-Secret(Secret, label, "")
+                MessageDigest md;
+                byte[] emptyHash;
+
+                // Create the "" digest...
+                try {
+                    md = MessageDigest.getInstance(hashAlg.toString());
+                    emptyHash = md.digest();
+                } catch (NoSuchAlgorithmException nsae) {
+                    throw new ProviderException(
+                            "Hash algorithm " + cipherSuite.hashAlg.name +
+                                    " is not available", nsae);
+                }
+
+                // ...then the hkdfInfo...
+                byte[] hkdfInfo = SSLSecretDerivation.createHkdfInfo(
+                        hkdfInfoLabel, emptyHash, hashAlg.hashLength);
+
+                // ...then the "inner" HKDF-Expand-Label() to get the
+                // derivedSecret that is used as the Secret in the "outer"
+                // HKDF-Expand-Label().
+                SecretKey derivedSecret = hkdf.deriveKey("TlsKey",
+                        HKDFParameterSpec.expandOnly(exporterMasterSecret,
+                        hkdfInfo, hashAlg.hashLength));
+                try {
+                    // Now do the "outer" HKDF-Expand-Label.
+                    //     HKDF-Expand-Label(derivedSecret, "exporter",
+                    //         Hash(context_value), key_length)
+
+                    // If a context was supplied, use it, otherwise, use the
+                    // previous hashed value of ""...
+                    byte[] hash = ((context.length > 0) ?
+                            md.digest(context) : emptyHash);
+
+                    // ...now the hkdfInfo...
+                    hkdfInfo = SSLSecretDerivation.createHkdfInfo(
+                            ("tls13 exporter").getBytes(StandardCharsets.UTF_8),
+                            hash, length);
+
+                    // ...now the final expand.
+                    return ((keyAlg != null) ?
+                            hkdf.deriveKey(keyAlg,
+                                    HKDFParameterSpec.expandOnly(derivedSecret,
+                                            hkdfInfo, length)) :
+                            hkdf.deriveData(
+                                    HKDFParameterSpec.expandOnly(derivedSecret,
+                                            hkdfInfo, length)));
+                } finally {
+                    KeyUtil.destroySecretKeys(derivedSecret);
+                }
+            } catch (Exception e) {
+                // For whatever reason, we couldn't generate.  Wrap and return.
+                throw new SSLKeyException("Couldn't generate Exporter/HKDF", e);
+            }
+        } else if (protocolVersion.useTLS10PlusSpec()) {
+
+            // Unlikely, but check if randoms were not captured.
+            if (clientRandom == null || serverRandom == null) {
+                throw new IllegalStateException("Random nonces not captured");
+            }
+
+            // RFC 7505 using PRF-based calcs.
+            //     TLS 1/1.1/1.2 (RFCs 2246/4346/5246) or
+            //     DTLS 1.0/1.2 (RFCs 4347/6347)
+
+            // Note:  In RFC 7627:
+            //
+            //   If a client or server chooses to continue with a full handshake
+            //   without the extended master secret extension ... they MUST NOT
+            //   export any key material based on the new master secret for any
+            //   subsequent application-level authentication ... it MUST
+            //   disable [RFC5705] ...
+            if (!useExtendedMasterSecret) {
+                throw new SSLKeyException(
+                        "Exporters require extended master secrets");
+            }
+
+            // Check for a "disambiguating label string" (i.e. non-empty).
+            // Don't see a max length restriction.
+            if (label.isEmpty()) {
+                throw new IllegalArgumentException(
+                        "label length outside range");
+            }
+
+            // context length must fit in 2 unsigned bytes.
+            if ((context != null) && (context.length > 0xFFFF)) {
+                throw new IllegalArgumentException(
+                        "Only 16-bit context lengths supported");
+            }
+
+            // Perform RFC 5705 calculations using the internal SunJCE PRF.
+            String prfAlg;
+            HashAlg hashAlg;
+            if (protocolVersion == TLS12) {
+                prfAlg = "SunTls12Prf";
+                hashAlg = cipherSuite.hashAlg;
+            } else {  //  all other cases
+                prfAlg = "SunTlsPrf";
+                hashAlg = H_NONE;
+            }
+
+            // Make a seed with randoms and optional context
+            // Note that if context is null, it is omitted from the calc
+            byte[] clientRandomBytes = clientRandom.randomBytes;
+            byte[] serverRandomBytes = serverRandom.randomBytes;
+            byte[] seed = new byte[
+                    clientRandomBytes.length + serverRandomBytes.length +
+                            ((context != null) ? (2 + context.length) : 0)];
+
+            int pos = 0;
+            System.arraycopy(
+                    clientRandomBytes, 0, seed, pos, clientRandomBytes.length);
+            pos += clientRandomBytes.length;
+            System.arraycopy(
+                    serverRandomBytes, 0, seed, pos, serverRandomBytes.length);
+            pos += serverRandomBytes.length;
+            if (context != null) {
+                // RFC 5705, "If no context is provided, ..."
+                seed[pos++] = (byte) ((context.length >> 8) & 0xFF);
+                seed[pos++] = (byte) ((context.length) & 0xFF);
+                System.arraycopy(
+                        context, 0, seed, pos, context.length);
+            }
+
+            // Call the PRF function.
+            try {
+                @SuppressWarnings("deprecation")
+                TlsPrfParameterSpec spec = new TlsPrfParameterSpec(
+                        masterSecret, (keyAlg == null) ? "TlsKey" : keyAlg,
+                        label, seed, length,
+                        hashAlg.name, hashAlg.hashLength, hashAlg.blockSize);
+                KeyGenerator kg = KeyGenerator.getInstance(prfAlg);
+                kg.init(spec);
+                SecretKey key = kg.generateKey();
+                if (keyAlg != null) {
+                    return key;
+                } else {
+                    byte[] b = key.getEncoded();
+                    if (b == null) {
+                        throw new UnsupportedOperationException(
+                                "Could not extract encoding from SecretKey");
+                    }
+                    return b;
+                }
+            } catch (NoSuchAlgorithmException |
+                     InvalidAlgorithmParameterException e) {
+                throw new SSLKeyException("Could not generate Exporter/PRF", e);
+            }
+        } else {
+            // SSLv3 is vulnerable to a triple handshake attack and can't be
+            // mitigated by RFC 7627.  Don't support this or any other
+            // unknown protocol.
+            throw new SSLKeyException(
+                    "Exporters not supported in " + protocolVersion);
+        }
+    }
+
+    /**
+     * Generate Exported Key Material (EKM) calculated according to the
+     * algorithms defined in RFCs 5705/8446.
+     */
+    @Override
+    public SecretKey exportKeyingMaterialKey(String keyAlg,
+            String label, byte[] context, int length) throws SSLKeyException {
+
+        Objects.requireNonNull(keyAlg, "keyAlg can not be null");
+        if (keyAlg.isEmpty()) {
+            throw new IllegalArgumentException(
+                    "keyAlg is empty");
+        }
+
+        return (SecretKey) exportKeyingMaterial(keyAlg, label, context,
+                length);
+    }
+
+    /**
+     * Generate Exported Key Material (EKM) calculated according to the
+     * algorithms defined in RFCs 5705/8446.
+     */
+    @Override
+    public byte[] exportKeyingMaterialData(
+            String label, byte[] context, int length) throws SSLKeyException {
+        return (byte[])exportKeyingMaterial(null, label, context, length);
+    }
+
     /** Returns a string representation of this SSL session */
     @Override
     public String toString() {
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 e38022f1c3e..d092d6c07de 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -356,6 +356,9 @@ public byte[] produce(ConnectionContext context,
                     clientHello);
             shc.serverHelloRandom = shm.serverRandom;
 
+            shc.handshakeSession.setRandoms(shc.clientHelloRandom,
+                    shc.serverHelloRandom);
+
             // Produce extensions for ServerHello handshake message.
             SSLExtension[] serverHelloExtensions =
                 shc.sslConfig.getEnabledExtensions(
@@ -1129,6 +1132,9 @@ public void consume(ConnectionContext context,
                         chc.sslConfig.maximumPacketSize);
             }
 
+            chc.handshakeSession.setRandoms(chc.clientHelloRandom,
+                    chc.serverHelloRandom);
+
             //
             // update
             //
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
index b80ccc35352..a2c7a072769 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java
@@ -276,6 +276,7 @@ static final class P12MacPBEKeyInfo extends PBEKeyInfo {
         putKeyInfo(new TLSKeyInfo("TlsClientAppTrafficSecret"));
         putKeyInfo(new TLSKeyInfo("TlsClientHandshakeTrafficSecret"));
         putKeyInfo(new TLSKeyInfo("TlsEarlySecret"));
+        putKeyInfo(new TLSKeyInfo("TlsExporterMasterSecret"));
         putKeyInfo(new TLSKeyInfo("TlsFinishedSecret"));
         putKeyInfo(new TLSKeyInfo("TlsHandshakeSecret"));
         putKeyInfo(new TLSKeyInfo("TlsKey"));
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
index 32f99b3fd5a..f6691a3d279 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.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
@@ -155,7 +155,7 @@ protected SecretKey engineGenerateKey() {
                     token.p11.C_SignUpdate(session.id(), 0, seed, 0, seed.length);
                     byte[] out = token.p11.C_SignFinal
                                         (session.id(), spec.getOutputLength());
-                    return new SecretKeySpec(out, "TlsPrf");
+                    return new SecretKeySpec(out, spec.getKeyAlg());
                 } catch (PKCS11Exception e) {
                     throw new ProviderException("Could not calculate PRF", e);
                 } finally {
@@ -181,7 +181,7 @@ protected SecretKey engineGenerateKey() {
                 token.p11.C_SignUpdate(session.id(), 0, seed, 0, seed.length);
                 byte[] out = token.p11.C_SignFinal
                                     (session.id(), spec.getOutputLength());
-                return new SecretKeySpec(out, "TlsPrf");
+                return new SecretKeySpec(out, spec.getKeyAlg());
             } catch (PKCS11Exception e) {
                 throw new ProviderException("Could not calculate PRF", e);
             } finally {
@@ -201,7 +201,7 @@ protected SecretKey engineGenerateKey() {
             session = token.getOpSession();
             token.p11.C_DeriveKey(session.id(),
                 new CK_MECHANISM(mechanism, params), keyID, null);
-            return new SecretKeySpec(out, "TlsPrf");
+            return new SecretKeySpec(out, spec.getKeyAlg());
         } catch (PKCS11Exception e) {
             throw new ProviderException("Could not calculate PRF", e);
         } finally {
diff --git a/test/jdk/javax/net/ssl/ExtendedSSLSession/ExportKeyingMaterialTests.java b/test/jdk/javax/net/ssl/ExtendedSSLSession/ExportKeyingMaterialTests.java
new file mode 100644
index 00000000000..77d47d07475
--- /dev/null
+++ b/test/jdk/javax/net/ssl/ExtendedSSLSession/ExportKeyingMaterialTests.java
@@ -0,0 +1,573 @@
+/*
+ * 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.
+ */
+
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
+/*
+ * @test
+ * @bug 8341346
+ * @summary Add support for exporting TLS Keying Material
+ * @library /javax/net/ssl/templates /test/lib /test/jdk/sun/security/pkcs11
+ * @build SSLEngineTemplate
+ * @run main/othervm ExportKeyingMaterialTests
+ * @run main/othervm ExportKeyingMaterialTests PKCS11
+ */
+
+import java.security.Security;
+import java.util.Arrays;
+import javax.crypto.SecretKey;
+import javax.net.ssl.*;
+import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import java.nio.ByteBuffer;
+import java.util.Random;
+
+import static jdk.test.lib.Asserts.*;
+
+/**
+ * A SSLEngine usage example which simplifies the presentation
+ * by removing the I/O and multi-threading concerns.
+ * <P>
+ * The test creates two SSLEngines, simulating a client and server.
+ * The "transport" layer consists two byte buffers:  think of them
+ * as directly connected pipes.
+ * <P>
+ * Note, this is a *very* simple example: real code will be much more
+ * involved.  For example, different threading and I/O models could be
+ * used, transport mechanisms could close unexpectedly, and so on.
+ * <P>
+ * When this application runs, notice that several messages
+ * (wrap/unwrap) pass before any application data is consumed or
+ * produced.
+ */
+public class ExportKeyingMaterialTests extends SSLEngineTemplate {
+
+    private String protocol;
+    private String ciphersuite;
+
+    protected ExportKeyingMaterialTests(String protocol, String ciphersuite)
+            throws Exception {
+        super();
+        this.protocol = protocol;
+        this.ciphersuite = ciphersuite;
+    }
+
+    /*
+     * Configure the engines.
+     */
+    private void configureEngines(SSLEngine clientEngine,
+            SSLEngine serverEngine) {
+
+        clientEngine.setUseClientMode(true);
+
+        // Get/set parameters if needed
+        SSLParameters paramsClient = clientEngine.getSSLParameters();
+        paramsClient.setProtocols(new String[] { protocol });
+        paramsClient.setCipherSuites(new String[] { ciphersuite });
+        clientEngine.setSSLParameters(paramsClient);
+
+        serverEngine.setUseClientMode(false);
+        serverEngine.setNeedClientAuth(true);
+
+        // Get/set parameters if needed
+        //
+        SSLParameters paramsServer = serverEngine.getSSLParameters();
+        paramsServer.setProtocols(new String[] {
+                "TLSv1.3", "TLSv1.2", "TLSv1.1", "TLSv1", "SSLv3"
+        });
+        serverEngine.setSSLParameters(paramsServer);
+    }
+
+    public static void main(String[] args) throws Exception {
+        // Turn off the disabled Algorithms so we can also test SSLv3/TLSv1/etc.
+        Security.setProperty("jdk.tls.disabledAlgorithms", "");
+
+        if ((args.length > 0) && (args[0].equals("PKCS11"))) {
+            Security.insertProviderAt(
+                    PKCS11Test.getSunPKCS11(PKCS11Test.getNssConfig()), 1);
+        }
+
+        // Exercise all of the triggers which capture data
+        // in the various key exchange algorithms.
+
+        // Use appropriate protocol/ciphersuite combos for TLSv1.3
+        new ExportKeyingMaterialTests(
+                "TLSv1.3", "TLS_AES_128_GCM_SHA256").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.3", "TLS_AES_256_GCM_SHA384").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.3", "TLS_CHACHA20_POLY1305_SHA256").runTest();
+
+        // Try the various GCM suites for TLSv1.2
+        new ExportKeyingMaterialTests(
+                "TLSv1.2", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.2", "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.2", "TLS_RSA_WITH_AES_256_GCM_SHA384").runTest();
+
+        // Try one TLSv1.2/CBC suite just for grins, the triggers are the same.
+        new ExportKeyingMaterialTests(
+                "TLSv1.2", "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256").runTest();
+
+        // Use appropriate protocol/ciphersuite combos.  Some of the 1.2
+        // suites (e.g. GCM) can't be used in earlier TLS versions.
+        new ExportKeyingMaterialTests(
+                "TLSv1.1", "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.1", "TLS_DHE_RSA_WITH_AES_256_CBC_SHA").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1.1", "TLS_RSA_WITH_AES_256_CBC_SHA").runTest();
+
+        new ExportKeyingMaterialTests(
+                "TLSv1", "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1", "TLS_DHE_RSA_WITH_AES_256_CBC_SHA").runTest();
+        new ExportKeyingMaterialTests(
+                "TLSv1", "TLS_RSA_WITH_AES_256_CBC_SHA").runTest();
+
+        try {
+            new ExportKeyingMaterialTests(
+                    "SSLv3", "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA").runTest();
+            throw new Exception("SSLv3 export test should not have passed");
+        } catch (SSLException e) {
+            System.out.println("SSLv3 test failed as expected");
+        }
+
+        System.out.println("All tests PASSED");
+    }
+
+    //
+    // Private methods that used to build the common part of the test.
+    //
+
+    private void runTest() throws Exception {
+        SSLEngineResult clientResult;
+        SSLEngineResult serverResult;
+
+        configureEngines(clientEngine, serverEngine);
+
+        boolean dataDone = false;
+        while (isOpen(clientEngine) || isOpen(serverEngine)) {
+            log("=================");
+
+            // client wrap
+            log("---Client Wrap---");
+            clientResult = clientEngine.wrap(clientOut, cTOs);
+            logEngineStatus(clientEngine, clientResult);
+            runDelegatedTasks(clientEngine);
+
+            // server wrap
+            log("---Server Wrap---");
+            serverResult = serverEngine.wrap(serverOut, sTOc);
+            logEngineStatus(serverEngine, serverResult);
+            runDelegatedTasks(serverEngine);
+
+            cTOs.flip();
+            sTOc.flip();
+
+            // client unwrap
+            log("---Client Unwrap---");
+            clientResult = clientEngine.unwrap(sTOc, clientIn);
+            logEngineStatus(clientEngine, clientResult);
+            runDelegatedTasks(clientEngine);
+
+            // server unwrap
+            log("---Server Unwrap---");
+            serverResult = serverEngine.unwrap(cTOs, serverIn);
+            logEngineStatus(serverEngine, serverResult);
+            runDelegatedTasks(serverEngine);
+
+            cTOs.compact();
+            sTOc.compact();
+
+            // After we've transferred all application data between the client
+            // and server, we close the clientEngine's outbound stream.
+            // This generates a close_notify handshake message, which the
+            // server engine receives and responds by closing itself.
+            if (!dataDone && (clientOut.limit() == serverIn.position()) &&
+                    (serverOut.limit() == clientIn.position())) {
+
+                runExporterTests(
+                        (ExtendedSSLSession) clientEngine.getSession(),
+                        (ExtendedSSLSession) serverEngine.getSession());
+
+                // A sanity check to ensure we got what was sent.
+                checkTransfer(serverOut, clientIn);
+                checkTransfer(clientOut, serverIn);
+
+                log("\tClosing clientEngine's *OUTBOUND*...");
+                clientEngine.closeOutbound();
+                logEngineStatus(clientEngine);
+
+                dataDone = true;
+                log("\tClosing serverEngine's *OUTBOUND*...");
+                serverEngine.closeOutbound();
+                logEngineStatus(serverEngine);
+            }
+        }
+    }
+
+    private static void runExporterTests(
+            ExtendedSSLSession clientSession,
+            ExtendedSSLSession serverSession) throws Exception {
+
+        SecretKey clientKey, serverKey;
+
+        // Create output arrays
+        byte[] clientBytes, serverBytes;
+
+        // Create various input arrays and fill with junk.
+        Random random = new Random();
+        byte[] bytes = new byte[20];
+        random.nextBytes(bytes);
+
+        // Slightly change 1 byte in the middle
+        byte[] bytesDiff = Arrays.copyOf(bytes, bytes.length);
+        bytesDiff[bytes.length/2]++;
+
+        byte[] bytesDiffSize = new byte[21];
+        random.nextBytes(bytesDiffSize);
+
+        // Run a bunch of similar derivations using both the Key/Data methods,
+        // exercising the various valid/invalid combinations.
+
+        // We may need to adjust if it turns out that this is run with
+        // non-extractable keys if .equals() doesn't work.
+
+        // Inputs exactly equal.
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        assertEquals(clientKey, serverKey,
+                "Key: Equal inputs but exporters are not equal");
+        log("Key: Equal inputs test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        assertEqualsByteArray(clientBytes, serverBytes,
+                "Data: Equal inputs but exporters are not equal");
+        log("Data: Equal inputs test passed");
+
+        // Different labels, now use exportKeyingMaterialData() for coverage
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "goodbye", bytes, 128);
+        assertNotEquals(clientKey, serverKey,
+                "Key: Different labels but exporters same");
+        log("Key: Different labels test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("goodbye",
+                bytes, 128);
+        assertNotEqualsByteArray(clientBytes, serverBytes,
+                "Data: Different labels but exporters same");
+        log("Data: Different labels test passed");
+
+        // Different output sizes
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 127);
+        assertNotEquals(clientKey, serverKey,
+                "Key: Different output sizes but exporters same");
+        log("Key: Different output size test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                bytes, 127);
+        assertEquals(clientBytes.length, 128, "client length != 128");
+        assertEquals(serverBytes.length, 127, "server length != 127");
+        assertNotEqualsByteArray(clientBytes, serverBytes,
+                "Data: Different output sizes but exporters same");
+        log("Data: Different output size test passed");
+
+        // Different context values
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytesDiff, 128);
+        assertNotEquals(clientKey, serverKey,
+                "Key: Different context but exporters same");
+        log("Key: Different context test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                bytesDiff, 128);
+        assertNotEqualsByteArray(clientBytes, serverBytes,
+                "Data: Different context but exporters same");
+        log("Data: Different context test passed");
+
+        // Different context sizes
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytesDiffSize, 128);
+        assertNotEquals(clientKey, serverKey,
+                "Key: Different context sizes but exporters same");
+        log("Key: Different context sizes test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                bytesDiffSize, 128);
+        assertNotEqualsByteArray(clientBytes, serverBytes,
+                "Data: Different context sizes but exporters same");
+        log("Data: Different context sizes test passed");
+
+        // No context, but otherwise the same
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", null, 128);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", null, 128);
+        assertEquals(clientKey, serverKey,
+                "Key: No context and exporters are not the same");
+        log("Key: No context test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                null, 128);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                null, 128);
+        assertEqualsByteArray(clientBytes, serverBytes,
+                "Data: No context and exporters are not the same");
+        log("Data: No context test passed");
+
+        // Smaller key size
+        clientKey = clientSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 5);
+        serverKey = serverSession.exportKeyingMaterialKey(
+                "Generic", "hello", bytes, 5);
+        assertEquals(clientKey, serverKey,
+                "Key: Smaller key size should be the same");
+        log("Key: Smaller key size test passed");
+
+        clientBytes = clientSession.exportKeyingMaterialData("hello",
+                bytes, 5);
+        serverBytes = serverSession.exportKeyingMaterialData("hello",
+                bytes, 5);
+        assertEqualsByteArray(clientBytes, serverBytes,
+                "Data: Smaller key size should be the same");
+        log("Data: Smaller key size test passed");
+
+        // Check error conditions
+
+        try {
+            clientSession.exportKeyingMaterialKey(null, "hello", bytes, 32);
+            throw new Exception("null keyAlg accepted");
+        } catch (NullPointerException e) {
+            log("null keyAlg test passed");
+        }
+
+        try {
+            clientSession.exportKeyingMaterialKey("", "hello", bytes, 32);
+            throw new Exception("empty keyAlg accepted");
+        } catch (IllegalArgumentException e) {
+            log("empty keyAlg test passed");
+        }
+
+        try {
+            clientSession.exportKeyingMaterialData("hello", bytes, -1);
+            throw new Exception("negative length accepted");
+        } catch (IllegalArgumentException e) {
+            log("negative length test passed");
+        }
+
+        try {
+            clientSession.exportKeyingMaterialData("hello", bytes, 0);
+            throw new Exception("zero length accepted");
+        } catch (IllegalArgumentException e) {
+            log("zero length test passed");
+        }
+
+        try {
+            clientSession.exportKeyingMaterialData(null, bytes, 128);
+            throw new Exception("null label accepted");
+        } catch (NullPointerException e) {
+            log("null label test passed");
+        }
+
+        try {
+            clientSession.exportKeyingMaterialData("", bytes, 128);
+            throw new Exception("empty label accepted");
+        } catch (IllegalArgumentException e) {
+            log("empty label test passed");
+        }
+
+        switch (clientSession.getProtocol()) {
+
+        case "TLSv1.3":
+            // 249 bytes is the max label we can accept (<7..255>, since
+            // "tls13 " is added in HkdfLabel)
+            String longString =
+                    "12345678901234567890123456789012345678901234567890" +
+                    "12345678901234567890123456789012345678901234567890" +
+                    "12345678901234567890123456789012345678901234567890" +
+                    "12345678901234567890123456789012345678901234567890" +
+                    "1234567890123456789012345678901234567890123456789";
+
+            clientSession.exportKeyingMaterialData(longString, bytes, 128);
+            log("large label test passed in TLSv1.3");
+
+            try {
+                clientSession.exportKeyingMaterialData(
+                        longString + "0", bytes, 128);
+                throw new Exception("too large label accepted in TLSv1.3");
+            } catch (IllegalArgumentException e) {
+                log("too large label test passed in TLSv1.3");
+            }
+
+            // 255 bytes is the max context we can accept (<0..255>)
+            clientSession.exportKeyingMaterialData(
+                    longString, new byte[255], 128);
+            log("large context test passed in TLSv1.3");
+
+            try {
+                clientSession.exportKeyingMaterialData(
+                        longString, new byte[256], 128);
+                throw new Exception("too large context accepted in TLSv1.3");
+            } catch (IllegalArgumentException e) {
+                log("too large context test passed in TLSv1.3");
+            }
+
+            // RFC 5869 says 255*HashLen bytes is the max length we can accept.
+            // So we'll choose something a bit bigger than the largest
+            // hashLen/ciphertext which is 384 (48 bytes) so this will always
+            // fail.
+            try {
+                clientSession.exportKeyingMaterialData(
+                        longString, new byte[256], 12240);
+                throw new Exception("too large length accepted in TLSv1.3");
+            } catch (IllegalArgumentException e) {
+                log("too large length test passed in TLSv1.3");
+            }
+
+            // Do a null/byte[0] comparison.  Exporters should be the same.
+            clientBytes = clientSession.exportKeyingMaterialData("hello",
+                    null, 128);
+            serverBytes = serverSession.exportKeyingMaterialData("hello",
+                    new byte[0], 128);
+            assertEqualsByteArray(clientBytes, serverBytes,
+                    "Data: null vs. empty context should be the same");
+
+            break;
+
+        case "TLSv1":
+        case "TLSv1.1":
+        case "TLSv1.2":
+            // Don't see a limit of the label.length or output length.
+
+            // Check for large context.length
+            try {
+                clientSession.exportKeyingMaterialData("hello",
+                        new byte[1 << 16], 128);
+                throw new Exception("large context accepted in " +
+                        "TLSv1/TLSv1.1/TLSv1.2");
+            } catch (IllegalArgumentException e) {
+                log("large context passed in TLSv1/TLSv1.1/TLSv1.2");
+            }
+
+            // Do a null/byte[0] comparison.  Should NOT be the same.
+            clientBytes = clientSession.exportKeyingMaterialData(
+                    "hello", null, 128);
+            serverBytes = serverSession.exportKeyingMaterialData(
+                    "hello", new byte[0], 128);
+            assertNotEqualsByteArray(clientBytes, serverBytes,
+                    "empty vs. null context but exporters same");
+            log("Data: empty vs. null context, " +
+                    "different exporters test passed");
+
+            break;
+
+        default:
+            throw new RuntimeException("Unknown protocol: " + clientSession.getProtocol());
+        }
+
+    }
+
+    static boolean isOpen(SSLEngine engine) {
+        return (!engine.isOutboundDone() || !engine.isInboundDone());
+    }
+
+    private static void logEngineStatus(SSLEngine engine) {
+        log("\tCurrent HS State: " + engine.getHandshakeStatus());
+        log("\tisInboundDone() : " + engine.isInboundDone());
+        log("\tisOutboundDone(): " + engine.isOutboundDone());
+    }
+
+    private static void logEngineStatus(
+            SSLEngine engine, SSLEngineResult result) {
+        log("\tResult Status    : " + result.getStatus());
+        log("\tResult HS Status : " + result.getHandshakeStatus());
+        log("\tEngine HS Status : " + engine.getHandshakeStatus());
+        log("\tisInboundDone()  : " + engine.isInboundDone());
+        log("\tisOutboundDone() : " + engine.isOutboundDone());
+        log("\tMore Result      : " + result);
+    }
+
+    private static void log(String message) {
+        System.err.println(message);
+    }
+
+    // If the result indicates that we have outstanding tasks to do,
+    // go ahead and run them in this thread.
+    protected static void runDelegatedTasks(SSLEngine engine) throws Exception {
+        if (engine.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+            Runnable runnable;
+            while ((runnable = engine.getDelegatedTask()) != null) {
+                log("    running delegated task...");
+                runnable.run();
+            }
+            HandshakeStatus hsStatus = engine.getHandshakeStatus();
+            if (hsStatus == HandshakeStatus.NEED_TASK) {
+                throw new Exception(
+                        "handshake shouldn't need additional tasks");
+            }
+            logEngineStatus(engine);
+        }
+    }
+
+    // Simple check to make sure everything came across as expected.
+    static void checkTransfer(ByteBuffer a, ByteBuffer b)
+            throws Exception {
+        a.flip();
+        b.flip();
+
+        if (!a.equals(b)) {
+            throw new Exception("Data didn't transfer cleanly");
+        } else {
+            log("\tData transferred cleanly");
+        }
+
+        a.position(a.limit());
+        b.position(b.limit());
+        a.limit(a.capacity());
+        b.limit(b.capacity());
+    }
+}

From 5ad02c98f1d9227bb6abdd37126f2a351d4e1a50 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sat, 31 May 2025 00:16:40 +0000
Subject: [PATCH 748/901] 8355004: Apply java.io.Serial annotations in
 java.compiler

Reviewed-by: liach, darcy
---
 .../annotation/processing/FilerException.java     |  8 ++++++--
 .../javax/lang/model/UnknownEntityException.java  |  5 ++++-
 .../element/UnknownAnnotationValueException.java  |  5 ++++-
 .../model/element/UnknownDirectiveException.java  |  5 ++++-
 .../model/element/UnknownElementException.java    |  5 ++++-
 .../lang/model/type/MirroredTypeException.java    | 11 +++++++----
 .../lang/model/type/MirroredTypesException.java   | 15 +++++++++------
 .../lang/model/type/UnknownTypeException.java     |  5 ++++-
 8 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java b/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java
index 26ee999e533..1561cf05a59 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java
+++ b/src/java.compiler/share/classes/javax/annotation/processing/FilerException.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
@@ -26,6 +26,7 @@
 package javax.annotation.processing;
 
 import java.io.IOException;
+import java.io.Serial;
 
 /**
  * Indicates a {@link Filer} detected an attempt to open a file that
@@ -38,7 +39,10 @@
  * @since 1.6
  */
 public class FilerException extends IOException {
-    static final long serialVersionUID = 8426423106453163293L;
+
+    @Serial
+    private static final long serialVersionUID = 8426423106453163293L;
+
     /**
      * Constructs an exception with the specified detail message.
      * @param s the detail message, which should include the name of
diff --git a/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java b/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
index 2ca3a1d988c..6bbf114c327 100644
--- a/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.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
@@ -25,6 +25,8 @@
 
 package javax.lang.model;
 
+import java.io.Serial;
+
 /**
  * Superclass of exceptions which indicate that an unknown kind of
  * entity was encountered.  This situation can occur if the language
@@ -39,6 +41,7 @@
  */
 public class UnknownEntityException extends RuntimeException {
 
+    @Serial
     private static final long serialVersionUID = 269L;
 
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
index 869235d88d3..6f672d014fb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.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
@@ -25,6 +25,8 @@
 
 package javax.lang.model.element;
 
+import java.io.Serial;
+
 import javax.lang.model.UnknownEntityException;
 
 /**
@@ -40,6 +42,7 @@
  */
 public class UnknownAnnotationValueException extends UnknownEntityException {
 
+    @Serial
     private static final long serialVersionUID = 269L;
 
     private transient AnnotationValue av;
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java
index 7139573824a..4cec97d79f2 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.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
@@ -25,6 +25,8 @@
 
 package javax.lang.model.element;
 
+import java.io.Serial;
+
 import javax.lang.model.UnknownEntityException;
 
 /**
@@ -39,6 +41,7 @@
  */
 public class UnknownDirectiveException extends UnknownEntityException {
 
+    @Serial
     private static final long serialVersionUID = 269L;
 
     private final transient ModuleElement.Directive directive;
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java b/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
index bb1f1d495b6..723724cd4a3 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.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
@@ -25,6 +25,8 @@
 
 package javax.lang.model.element;
 
+import java.io.Serial;
+
 import javax.lang.model.UnknownEntityException;
 
 /**
@@ -39,6 +41,7 @@
  */
 public class UnknownElementException extends UnknownEntityException {
 
+    @Serial
     private static final long serialVersionUID = 269L;
 
     private transient Element element;
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java
index 61117bc2cc6..dcf336d305b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.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
@@ -25,10 +25,11 @@
 
 package javax.lang.model.type;
 
-import java.io.ObjectInputStream;
 import java.io.IOException;
-import javax.lang.model.element.Element;
+import java.io.ObjectInputStream;
+import java.io.Serial;
 
+import javax.lang.model.element.Element;
 
 /**
  * Thrown when an application attempts to access the {@link Class} object
@@ -40,7 +41,8 @@
  */
 public class MirroredTypeException extends MirroredTypesException {
 
-    private static final long serialVersionUID = 269;
+    @Serial
+    private static final long serialVersionUID = 269L;
 
     private transient TypeMirror type;          // cannot be serialized
 
@@ -72,6 +74,7 @@ public TypeMirror getTypeMirror() {
      * deserialization
      * @throws IOException for an IO problem during deserialization
      */
+    @Serial
     private void readObject(ObjectInputStream s)
         throws IOException, ClassNotFoundException {
         s.defaultReadObject();
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java
index 9fa3c5e8c3c..b89654a453c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.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
@@ -25,13 +25,14 @@
 
 package javax.lang.model.type;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serial;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import javax.lang.model.element.Element;
+import java.util.List;
 
+import javax.lang.model.element.Element;
 
 /**
  * Thrown when an application attempts to access a sequence of {@link
@@ -43,7 +44,8 @@
  */
 public class MirroredTypesException extends RuntimeException {
 
-    private static final long serialVersionUID = 269;
+    @Serial
+    private static final long serialVersionUID = 269L;
 
     transient List<? extends TypeMirror> types; // cannot be serialized
 
@@ -87,6 +89,7 @@ public List<? extends TypeMirror> getTypeMirrors() {
      * deserialization
      * @throws IOException for an IO problem during deserialization
      */
+    @Serial
     private void readObject(ObjectInputStream s)
         throws IOException, ClassNotFoundException {
         s.defaultReadObject();
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java b/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java
index dac3fecf86c..9127e2a4efe 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.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
@@ -25,6 +25,8 @@
 
 package javax.lang.model.type;
 
+import java.io.Serial;
+
 import javax.lang.model.UnknownEntityException;
 
 /**
@@ -39,6 +41,7 @@
  */
 public class UnknownTypeException extends UnknownEntityException {
 
+    @Serial
     private static final long serialVersionUID = 269L;
 
     private transient TypeMirror type;

From d9d00d33a6a0d540a10e0a58f6df27cae46d2753 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sat, 31 May 2025 00:26:50 +0000
Subject: [PATCH 749/901] 8358107: Rollback JDK-8357299 changeset

Reviewed-by: psadhukhan
---
 .../share/native/libawt/java2d/loops/Blit.c   | 21 ++++---
 .../java/awt/Graphics/BrokenBoundsClip.java   | 60 -------------------
 2 files changed, 12 insertions(+), 69 deletions(-)
 delete mode 100644 test/jdk/java/awt/Graphics/BrokenBoundsClip.java

diff --git a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
index cbba3e4cacb..8a41584deef 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/Blit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,16 +74,19 @@ Java_sun_java2d_loops_Blit_Blit
 
     srcInfo.bounds.x1 = srcx;
     srcInfo.bounds.y1 = srcy;
-    srcInfo.bounds.x2 = UNSAFE_TO_ADD(srcx, width)
-                        ? clipInfo.bounds.x2 : (srcx + width);
-    srcInfo.bounds.y2 = UNSAFE_TO_ADD(srcy, height)
-                        ? clipInfo.bounds.y2 : (srcy + height);
+    if (UNSAFE_TO_ADD(srcx, width) ||
+        UNSAFE_TO_ADD(srcy, height) ||
+        UNSAFE_TO_ADD(dstx, width) ||
+        UNSAFE_TO_ADD(dsty, height)) {
+        return;
+    }
+
+    srcInfo.bounds.x2 = srcx + width;
+    srcInfo.bounds.y2 = srcy + height;
     dstInfo.bounds.x1 = dstx;
     dstInfo.bounds.y1 = dsty;
-    dstInfo.bounds.x2 = UNSAFE_TO_ADD(dstx, width)
-                        ? clipInfo.bounds.x2 : (dstx + width);
-    dstInfo.bounds.y2 = UNSAFE_TO_ADD(dsty, height)
-                        ? clipInfo.bounds.y2 : (dsty + height);
+    dstInfo.bounds.x2 = dstx + width;
+    dstInfo.bounds.y2 = dsty + height;
     if (UNSAFE_TO_SUB(srcx, dstx) ||
         UNSAFE_TO_SUB(srcy, dsty)) {
         return;
diff --git a/test/jdk/java/awt/Graphics/BrokenBoundsClip.java b/test/jdk/java/awt/Graphics/BrokenBoundsClip.java
deleted file mode 100644
index 3ba8ebe2e3f..00000000000
--- a/test/jdk/java/awt/Graphics/BrokenBoundsClip.java
+++ /dev/null
@@ -1,60 +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
- * @bug 8357299
- * @summary Verifies if Graphics copyArea doesn't copy any pixels
- *          when there is overflow
- * @run main BrokenBoundsClip
- */
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-
-import static java.awt.image.BufferedImage.TYPE_INT_RGB;
-
-public final class BrokenBoundsClip {
-
-     public static final int SIZE = 100;
-
-     public static void main(String[] args) {
-         BufferedImage bi = new BufferedImage(SIZE, SIZE, TYPE_INT_RGB);
-
-         Graphics2D g2d = bi.createGraphics();
-         g2d.setColor(Color.RED);
-         g2d.fillRect(SIZE / 2, SIZE / 2, SIZE / 2, SIZE / 2);
-
-         g2d.copyArea(bi.getWidth() / 2, bi.getHeight() / 2,
-                      Integer.MAX_VALUE , Integer.MAX_VALUE ,
-                      -bi.getWidth() / 2, -bi.getHeight() / 2);
-         int actual = bi.getRGB(0, 0);
-         int expected = Color.RED.getRGB();
-         if (actual != expected) {
-             System.err.println("Actual:   " + Integer.toHexString(actual));
-             System.err.println("Expected: " + Integer.toHexString(expected));
-             throw new RuntimeException("Wrong color");
-         }
-     }
-}

From c67fc735959ddd41a8d1116908ca7bae9b966016 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Sat, 31 May 2025 00:40:23 +0000
Subject: [PATCH 750/901] 8320189:
 vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001 memory corruption when
 using -Xcheck:jni

Reviewed-by: lmesnik, amenkov
---
 .../bcinstr/BI02/bi02t001/bi02t001.cpp        | 17 +++-----------
 .../bcinstr/BI03/bi03t001/bi03t001.cpp        | 16 +++-----------
 test/lib/jdk/test/lib/jvmti/jvmti_common.hpp  | 22 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
index ea558bc0cd4..955171446cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.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
@@ -49,7 +49,7 @@ const char* CLASS_NAME = "nsk/jvmti/scenarios/bcinstr/BI02/bi02t001a";
 /** callback functions **/
 
 static void JNICALL
-ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
+ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni,
         jclass class_being_redefined, jobject loader,
         const char* name, jobject protection_domain,
         jint class_data_len, const unsigned char* class_data,
@@ -61,18 +61,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
 
         if (class_being_redefined == nullptr) {
             /* sent by class load */
-
-            if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
-                    jni_env->GetArrayLength(classBytes)) > 0)) {
-                nsk_jvmti_setFailStatus();
-                return;
-            }
-
-            if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
-                    jni_env->GetByteArrayElements(classBytes, nullptr)) != nullptr)) {
-                nsk_jvmti_setFailStatus();
-                return;
-            }
+            *new_class_data = jni_array_to_jvmti_allocated(jvmti, jni, classBytes, new_class_data_len);
         }
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
index dddc47377ca..eacfe962217 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.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
@@ -49,7 +49,7 @@ const char* CLASS_NAME = "nsk/jvmti/scenarios/bcinstr/BI03/bi03t001a";
 /** callback functions **/
 
 static void JNICALL
-ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
+ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni,
         jclass class_being_redefined, jobject loader,
         const char* name, jobject protection_domain,
         jint class_data_len, const unsigned char* class_data,
@@ -62,17 +62,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
         if (class_being_redefined == nullptr) {
             /* sent by class load */
 
-            if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
-                    jni_env->GetArrayLength(classBytes)) > 0)) {
-                nsk_jvmti_setFailStatus();
-                return;
-            }
-
-            if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
-                    jni_env->GetByteArrayElements(classBytes, nullptr)) != nullptr)) {
-                nsk_jvmti_setFailStatus();
-                return;
-            }
+            *new_class_data = jni_array_to_jvmti_allocated(jvmti, jni, classBytes, new_class_data_len);
         }
     }
 }
diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
index 5efd58e7773..e77abb400e0 100644
--- a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
+++ b/test/lib/jdk/test/lib/jvmti/jvmti_common.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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -447,7 +447,27 @@ static jthread get_current_thread(jvmtiEnv *jvmti, JNIEnv* jni) {
   return thread;
 }
 
+/* Used in a couple of nsk/jvmti/scenarios tests to convert jbyteArray to a JVMTI allocated */
+static unsigned char* jni_array_to_jvmti_allocated(jvmtiEnv *jvmti, JNIEnv *jni, jbyteArray arr, jint* len_ptr) {
+    unsigned char* new_arr = nullptr;
 
+    jint len = jni->GetArrayLength(arr);
+    if (len <= 0) {
+      fatal(jni, "JNI GetArrayLength returned a non-positive value");
+    }
+    jbyte* jni_arr = jni->GetByteArrayElements(arr, nullptr);
+    if (jni_arr == nullptr) {
+      fatal(jni, "JNI GetByteArrayElements returned nullptr");
+    }
+    jvmtiError err = jvmti->Allocate(len, &new_arr);
+    check_jvmti_status(jni, err, "JVMTI Allocate returned an error code");
+
+    memcpy(new_arr, jni_arr, (size_t)len);
+    jni->ReleaseByteArrayElements(arr, jni_arr, JNI_ABORT);
+
+    *len_ptr = len;
+    return new_arr;
+}
 
 /* Commonly used helper functions */
 const char*

From c62223a5af747bc5cbdd3d970dd994f74aa08834 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Sat, 31 May 2025 00:41:16 +0000
Subject: [PATCH 751/901] 8358215: ProblemList
 jdk/incubator/vector/PreferredSpeciesTest.java

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d08d148a9f8..8caa521e896 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -765,6 +765,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/PreferredSpeciesTest.java                  8356634 generic-all
 
 ############################################################################
 

From 061b24d4f9d8635944683766532e9252c3ba0152 Mon Sep 17 00:00:00 2001
From: David Briemann <dbriemann@openjdk.org>
Date: Sat, 31 May 2025 02:47:26 +0000
Subject: [PATCH 752/901] 8357304: [PPC64] C2: Implement MinV, MaxV and
 Reduction nodes

Reviewed-by: mdoerr, varadam
---
 src/hotspot/cpu/ppc/assembler_ppc.hpp         |  18 +++
 src/hotspot/cpu/ppc/assembler_ppc.inline.hpp  |   9 ++
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp |  45 ++++++
 src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp |   2 +
 src/hotspot/cpu/ppc/ppc.ad                    | 135 ++++++++++++++++++
 .../loopopts/superword/MinMaxRed_Int.java     |   4 +
 6 files changed, 213 insertions(+)

diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index 491bd107819..314517fd56a 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -591,6 +591,10 @@ class Assembler : public AbstractAssembler {
     XVRDPIC_OPCODE = (60u << OPCODE_SHIFT |  235u << 2),
     XVRDPIM_OPCODE = (60u << OPCODE_SHIFT |  249u << 2),
     XVRDPIP_OPCODE = (60u << OPCODE_SHIFT |  233u << 2),
+    XVMINSP_OPCODE = (60u << OPCODE_SHIFT |  200u << 3),
+    XVMINDP_OPCODE = (60u << OPCODE_SHIFT |  232u << 3),
+    XVMAXSP_OPCODE = (60u << OPCODE_SHIFT |  192u << 3),
+    XVMAXDP_OPCODE = (60u << OPCODE_SHIFT |  224u << 3),
 
     // Deliver A Random Number (introduced with POWER9)
     DARN_OPCODE    = (31u << OPCODE_SHIFT |  755u << 1),
@@ -699,15 +703,19 @@ class Assembler : public AbstractAssembler {
     VMAXSB_OPCODE  = (4u  << OPCODE_SHIFT |  258u     ),
     VMAXSW_OPCODE  = (4u  << OPCODE_SHIFT |  386u     ),
     VMAXSH_OPCODE  = (4u  << OPCODE_SHIFT |  322u     ),
+    VMAXSD_OPCODE  = (4u  << OPCODE_SHIFT |  450u     ),
     VMAXUB_OPCODE  = (4u  << OPCODE_SHIFT |    2u     ),
     VMAXUW_OPCODE  = (4u  << OPCODE_SHIFT |  130u     ),
     VMAXUH_OPCODE  = (4u  << OPCODE_SHIFT |   66u     ),
+    VMAXUD_OPCODE  = (4u  << OPCODE_SHIFT |  194u     ),
     VMINSB_OPCODE  = (4u  << OPCODE_SHIFT |  770u     ),
     VMINSW_OPCODE  = (4u  << OPCODE_SHIFT |  898u     ),
     VMINSH_OPCODE  = (4u  << OPCODE_SHIFT |  834u     ),
+    VMINSD_OPCODE  = (4u  << OPCODE_SHIFT |  962u     ),
     VMINUB_OPCODE  = (4u  << OPCODE_SHIFT |  514u     ),
     VMINUW_OPCODE  = (4u  << OPCODE_SHIFT |  642u     ),
     VMINUH_OPCODE  = (4u  << OPCODE_SHIFT |  578u     ),
+    VMINUD_OPCODE  = (4u  << OPCODE_SHIFT |  706u     ),
 
     VCMPEQUB_OPCODE= (4u  << OPCODE_SHIFT |    6u     ),
     VCMPEQUH_OPCODE= (4u  << OPCODE_SHIFT |   70u     ),
@@ -2302,15 +2310,19 @@ class Assembler : public AbstractAssembler {
   inline void vmaxsb(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vmaxsw(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vmaxsh(   VectorRegister d, VectorRegister a, VectorRegister b);
+  inline void vmaxsd(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vmaxub(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vmaxuw(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vmaxuh(   VectorRegister d, VectorRegister a, VectorRegister b);
+  inline void vmaxud(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminsb(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminsw(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminsh(   VectorRegister d, VectorRegister a, VectorRegister b);
+  inline void vminsd(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminub(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminuw(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vminuh(   VectorRegister d, VectorRegister a, VectorRegister b);
+  inline void vminud(   VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vcmpequb( VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vcmpequh( VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vcmpequw( VectorRegister d, VectorRegister a, VectorRegister b);
@@ -2435,6 +2447,12 @@ class Assembler : public AbstractAssembler {
   inline void xvrdpim(  VectorSRegister d, VectorSRegister b);
   inline void xvrdpip(  VectorSRegister d, VectorSRegister b);
 
+  // The following functions do not match exactly the Java.math semantics.
+  inline void xvminsp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
+  inline void xvmindp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
+  inline void xvmaxsp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
+  inline void xvmaxdp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
+
   // VSX Extended Mnemonics
   inline void xxspltd(  VectorSRegister d, VectorSRegister a, int x);
   inline void xxmrghd(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index 176994cf92c..792e5d6d5ad 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -908,6 +908,11 @@ inline void Assembler::xvrdpic(   VectorSRegister d, VectorSRegister b)
 inline void Assembler::xvrdpim(   VectorSRegister d, VectorSRegister b)                  { emit_int32( XVRDPIM_OPCODE | vsrt(d) | vsrb(b)); }
 inline void Assembler::xvrdpip(   VectorSRegister d, VectorSRegister b)                  { emit_int32( XVRDPIP_OPCODE | vsrt(d) | vsrb(b)); }
 
+inline void Assembler::xvminsp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMINSP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+inline void Assembler::xvmindp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMINDP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+inline void Assembler::xvmaxsp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMAXSP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+inline void Assembler::xvmaxdp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMAXDP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+
 inline void Assembler::mtvrd(   VectorRegister d, Register a)               { emit_int32( MTVSRD_OPCODE  | vsrt(d->to_vsr()) | ra(a)); }
 inline void Assembler::mfvrd(   Register        a, VectorRegister d)         { emit_int32( MFVSRD_OPCODE  | vsrt(d->to_vsr()) | ra(a)); }
 inline void Assembler::mtvrwz(  VectorRegister  d, Register a)               { emit_int32( MTVSRWZ_OPCODE | vsrt(d->to_vsr()) | ra(a)); }
@@ -1022,15 +1027,19 @@ inline void Assembler::vavguh(  VectorRegister d, VectorRegister a, VectorRegist
 inline void Assembler::vmaxsb(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXSB_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vmaxsw(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXSW_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vmaxsh(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXSH_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
+inline void Assembler::vmaxsd(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXSD_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vmaxub(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXUB_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vmaxuw(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXUW_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vmaxuh(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXUH_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
+inline void Assembler::vmaxud(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMAXUD_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminsb(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINSB_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminsw(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINSW_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminsh(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINSH_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
+inline void Assembler::vminsd(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINSD_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminub(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINUB_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminuw(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINUW_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vminuh(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINUH_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
+inline void Assembler::vminud(  VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VMINUD_OPCODE   | vrt(d) | vra(a) | vrb(b)); }
 inline void Assembler::vcmpequb(VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VCMPEQUB_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(0)); }
 inline void Assembler::vcmpequh(VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VCMPEQUH_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(0)); }
 inline void Assembler::vcmpequw(VectorRegister d, VectorRegister a, VectorRegister b) { emit_int32( VCMPEQUW_OPCODE | vrt(d) | vra(a) | vrb(b) | vcmp_rc(0)); }
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index 5e18be552a9..eab3df03fde 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -619,3 +619,48 @@ void C2_MacroAssembler::count_positives(Register src, Register cnt, Register res
   bind(Ldone);
   subf(result, src, result);      // Result is offset from src.
 }
+
+void C2_MacroAssembler::reduceI(int opcode, Register dst, Register iSrc, VectorRegister vSrc,
+                                VectorRegister vTmp1, VectorRegister vTmp2) {
+
+  auto fn_vec_op = [this](int opcode, const VectorRegister &dst, const VectorRegister &a, const VectorRegister &b) {
+    switch(opcode) {
+      case Op_AddReductionVI: vadduwm(dst, a, b);  break;
+      case Op_MulReductionVI: vmuluwm(dst, a , b); break;
+      case Op_AndReductionV:  vand(dst, a, b);     break;
+      case Op_OrReductionV:   vor(dst, a, b);      break;
+      case Op_XorReductionV:  vxor(dst, a, b);     break;
+      case Op_MinReductionV:  vminsw(dst, a, b);   break;
+      case Op_MaxReductionV:  vmaxsw(dst, a, b);   break;
+      default: assert(false, "wrong opcode");
+    }
+  };
+
+  auto fn_scalar_op = [this](int opcode, const Register &dst, const Register &a, const Register &b) {
+    switch (opcode) {
+      case Op_AddReductionVI: add(dst, a, b);   break;
+      case Op_MulReductionVI: mullw(dst, a, b); break;
+      case Op_AndReductionV:  andr(dst, a, b);  break;
+      case Op_OrReductionV:   orr(dst, a, b);   break;
+      case Op_XorReductionV:  xorr(dst, a, b);  break;
+      case Op_MinReductionV:
+        cmpw(CR0, a, b);
+        isel(dst, CR0, Assembler::less, /*invert*/false, a, b);
+        break;
+      case Op_MaxReductionV:
+        cmpw(CR0, a, b);
+        isel(dst, CR0, Assembler::greater, /*invert*/false, a, b);
+        break;
+      default: assert(false, "wrong opcode");
+    }
+  };
+
+  // vSrc = [i0,i1,i2,i3]
+  vsldoi(vTmp1, vSrc, vSrc, 8);           // vTmp1 <- [i2,i3,i0,i1]
+  fn_vec_op(opcode, vTmp2, vSrc, vTmp1);  // vTmp2 <- [op(i0,i2), op(i1,i3), op(i2,i0), op(i3,i1)]
+  vsldoi(vTmp1, vTmp2, vTmp2, 4);         // vTmp1 <- [op(i1,i3), op(i2,i0), op(i3,i1), op(i0,i2)]
+  fn_vec_op(opcode, vTmp1, vTmp1, vTmp2); // vTmp1 <- [op(i0,i1,i2,i3), op(i0,i1,i2,i3), op(i0,i1,i2,i3), op(i0,i1,i2,i3)]
+  mfvsrwz(R0, vTmp1.to_vsr());            // R0    <- op(i0,i1,i2,i3)
+  fn_scalar_op(opcode, dst, iSrc, R0);    // dst   <- op(iSrc, R0)
+}
+
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 345d5a6350d..16b6d1935ba 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -73,4 +73,6 @@
 
   void count_positives(Register src, Register cnt, Register result, Register tmp1, Register tmp2);
 
+  void reduceI(int opcode, Register dst, Register iSrc, VectorRegister vSrc, VectorRegister vTmp1, VectorRegister vTmp2);
+
 #endif // CPU_PPC_C2_MACROASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 38bb150d6c7..128e566d0f3 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2399,6 +2399,18 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_SubVL:
     case Op_MulVI:
     case Op_RoundDoubleModeV:
+    case Op_MinV:
+    case Op_MaxV:
+    case Op_AndV:
+    case Op_OrV:
+    case Op_XorV:
+    case Op_AddReductionVI:
+    case Op_MulReductionVI:
+    case Op_AndReductionV:
+    case Op_OrReductionV:
+    case Op_XorReductionV:
+    case Op_MinReductionV:
+    case Op_MaxReductionV:
       return SuperwordUseVSX;
     case Op_PopCountVI:
     case Op_PopCountVL:
@@ -2440,6 +2452,22 @@ bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType bt) {
   if (!match_rule_supported(opcode) || !vector_size_supported(bt, vlen)) {
     return false;
   }
+  // Special cases
+  switch (opcode) {
+    // Reductions only support INT at the moment.
+    case Op_AddReductionVI:
+    case Op_MulReductionVI:
+    case Op_AndReductionV:
+    case Op_OrReductionV:
+    case Op_XorReductionV:
+    case Op_MinReductionV:
+    case Op_MaxReductionV:
+      return bt == T_INT;
+    // MaxV, MinV need types == INT || LONG.
+    case Op_MaxV:
+    case Op_MinV:
+      return bt == T_INT || bt == T_LONG;
+  }
   return true; // Per default match rules are supported.
 }
 
@@ -13485,6 +13513,113 @@ instruct vdiv2D_reg(vecX dst, vecX src1, vecX src2) %{
   ins_pipe(pipe_class_default);
 %}
 
+// Vector Min / Max Instructions
+
+instruct vmin_reg(vecX dst, vecX src1, vecX src2) %{
+  match(Set dst (MinV src1 src2));
+  format %{ "VMIN  $dst,$src1,$src2\t// vector min" %}
+  size(4);
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    switch (bt) {
+      case T_INT:
+        __ vminsw($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+        break;
+      case T_LONG:
+        __ vminsd($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct vmax_reg(vecX dst, vecX src1, vecX src2) %{
+  match(Set dst (MaxV src1 src2));
+  format %{ "VMAX  $dst,$src1,$src2\t// vector max" %}
+  size(4);
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    switch (bt) {
+      case T_INT:
+        __ vmaxsw($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+        break;
+      case T_LONG:
+        __ vmaxsd($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct vand(vecX dst, vecX src1, vecX src2) %{
+  match(Set dst (AndV src1 src2));
+  size(4);
+  format %{ "VAND   $dst,$src1,$src2\t// and vectors" %}
+  ins_encode %{
+    __ vand($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct vor(vecX dst, vecX src1, vecX src2) %{
+  match(Set dst (OrV src1 src2));
+  size(4);
+  format %{ "VOR   $dst,$src1,$src2\t// or vectors" %}
+  ins_encode %{
+    __ vor($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct vxor(vecX dst, vecX src1, vecX src2) %{
+  match(Set dst (XorV src1 src2));
+  size(4);
+  format %{ "VXOR   $dst,$src1,$src2\t// xor vectors" %}
+  ins_encode %{
+    __ vxor($dst$$VectorSRegister->to_vr(), $src1$$VectorSRegister->to_vr(), $src2$$VectorSRegister->to_vr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct reductionI_arith_logic(iRegIdst dst, iRegIsrc srcInt, vecX srcVec, vecX tmp1, vecX tmp2) %{
+  predicate(Matcher::vector_element_basic_type(n->in(2)) == T_INT);
+  match(Set dst (AddReductionVI srcInt srcVec));
+  match(Set dst (MulReductionVI srcInt srcVec));
+  match(Set dst (AndReductionV  srcInt srcVec));
+  match(Set dst ( OrReductionV  srcInt srcVec));
+  match(Set dst (XorReductionV  srcInt srcVec));
+  effect(TEMP tmp1, TEMP tmp2);
+  ins_cost(DEFAULT_COST * 6);
+  format %{ "REDUCEI_ARITH_LOGIC // $dst,$srcInt,$srcVec,$tmp1,$tmp2\t// reduce vector int add/mul/and/or/xor" %}
+  size(24);
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    __ reduceI(opcode, $dst$$Register, $srcInt$$Register, $srcVec$$VectorSRegister->to_vr(),
+        $tmp1$$VectorSRegister->to_vr(), $tmp2$$VectorSRegister->to_vr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct reductionI_min_max(iRegIdst dst, iRegIsrc srcInt, vecX srcVec, vecX tmp1, vecX tmp2, flagsRegCR0 cr0) %{
+  predicate(Matcher::vector_element_basic_type(n->in(2)) == T_INT);
+  match(Set dst (MinReductionV srcInt srcVec));
+  match(Set dst (MaxReductionV srcInt srcVec));
+  effect(TEMP tmp1, TEMP tmp2, KILL cr0);
+  ins_cost(DEFAULT_COST * 7);
+  format %{ "REDUCEI_MINMAX // $dst,$srcInt,$srcVec,$tmp1,$tmp2,cr0\t// reduce vector int min/max" %}
+  size(28);
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    __ reduceI(opcode, $dst$$Register, $srcInt$$Register, $srcVec$$VectorSRegister->to_vr(),
+        $tmp1$$VectorSRegister->to_vr(), $tmp2$$VectorSRegister->to_vr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // Vector Absolute Instructions
 
 instruct vabs4F_reg(vecX dst, vecX src) %{
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
index 54c1e4f1e46..0b84f4e346a 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
@@ -96,6 +96,8 @@ public static void ReductionInit(int[] a, int[] b) {
     @IR(applyIfPlatform = {"riscv64", "true"},
         applyIfCPUFeature = {"rvv", "true"},
         counts = {IRNode.MIN_REDUCTION_V, " > 0"})
+    @IR(applyIfPlatform = {"ppc", "true"},
+        counts = {IRNode.MIN_REDUCTION_V, " > 0"})
     public static int minReductionImplement(int[] a, int[] b, int res) {
         for (int i = 0; i < a.length; i++) {
             res = Math.min(res, a[i] * b[i]);
@@ -110,6 +112,8 @@ public static int minReductionImplement(int[] a, int[] b, int res) {
     @IR(applyIfPlatform = {"riscv64", "true"},
         applyIfCPUFeature = {"rvv", "true"},
         counts = {IRNode.MAX_REDUCTION_V, " > 0"})
+    @IR(applyIfPlatform = {"ppc", "true"},
+        counts = {IRNode.MAX_REDUCTION_V, " > 0"})
     public static int maxReductionImplement(int[] a, int[] b, int res) {
         for (int i = 0; i < a.length; i++) {
             res = Math.max(res, a[i] * b[i]);

From 19360a904b180f6608c6dcd574c77f78f1880673 Mon Sep 17 00:00:00 2001
From: Chad Rakoczy <chadrako@amazon.com>
Date: Sat, 31 May 2025 02:48:33 +0000
Subject: [PATCH 753/901] 8356949: AArch64: Tighten up template interpreter
 method entry code

Reviewed-by: aph, shade
---
 .../templateInterpreterGenerator_aarch64.cpp  | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index af41ab3ef69..0ed064f48ba 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -865,6 +865,10 @@ void TemplateInterpreterGenerator::lock_method() {
 //      rcpool: cp cache
 //      stack_pointer: previous sp
 void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
+  // Save ConstMethod* in r5_const_method for later use to avoid loading multiple times
+  Register r5_const_method = r5;
+  __ ldr(r5_const_method, Address(rmethod, Method::const_offset()));
+
   // initialize fixed part of activation frame
   if (native_call) {
     __ sub(esp, sp, 14 *  wordSize);
@@ -875,8 +879,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
     __ stp(zr, zr, Address(sp, 12 * wordSize));
   } else {
     __ sub(esp, sp, 12 *  wordSize);
-    __ ldr(rscratch1, Address(rmethod, Method::const_offset()));    // get ConstMethod
-    __ add(rbcp, rscratch1, in_bytes(ConstMethod::codes_offset())); // get codebase
+    __ add(rbcp, r5_const_method, in_bytes(ConstMethod::codes_offset())); // get codebase
     __ mov(rscratch1, frame::interpreter_frame_initial_sp_offset);
     __ stp(rscratch1, rbcp, Address(__ pre(sp, -12 * wordSize)));
   }
@@ -896,9 +899,10 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ stp(rfp, lr, Address(sp, 10 * wordSize));
   __ lea(rfp, Address(sp, 10 * wordSize));
 
-  __ ldr(rcpool, Address(rmethod, Method::const_offset()));
-  __ ldr(rcpool, Address(rcpool, ConstMethod::constants_offset()));
-  __ ldr(rcpool, Address(rcpool, ConstantPool::cache_offset()));
+  // Save ConstantPool* in r11_constants for later use to avoid loading multiple times
+  Register r11_constants = r11;
+  __ ldr(r11_constants, Address(r5_const_method, ConstMethod::constants_offset()));
+  __ ldr(rcpool, Address(r11_constants, ConstantPool::cache_offset()));
   __ sub(rscratch1, rlocals, rfp);
   __ lsr(rscratch1, rscratch1, Interpreter::logStackElementSize);   // rscratch1 = rlocals - fp();
   // Store relativized rlocals, see frame::interpreter_frame_locals().
@@ -908,11 +912,12 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   // leave last_sp as null
   __ stp(zr, r19_sender_sp, Address(sp, 8 * wordSize));
 
-  // Get mirror
-  __ load_mirror(r10, rmethod, r5, rscratch2);
+  // Get mirror. Resolve ConstantPool* -> InstanceKlass* -> Java mirror.
+  __ ldr(r10, Address(r11_constants, ConstantPool::pool_holder_offset()));
+  __ ldr(r10, Address(r10, in_bytes(Klass::java_mirror_offset())));
+  __ resolve_oop_handle(r10, rscratch1, rscratch2);
   if (! native_call) {
-    __ ldr(rscratch1, Address(rmethod, Method::const_offset()));
-    __ ldrh(rscratch1, Address(rscratch1, ConstMethod::max_stack_offset()));
+    __ ldrh(rscratch1, Address(r5_const_method, ConstMethod::max_stack_offset()));
     __ add(rscratch1, rscratch1, MAX2(3, Method::extra_stack_entries()));
     __ sub(rscratch1, sp, rscratch1, ext::uxtw, 3);
     __ andr(rscratch1, rscratch1, -16);

From 3a3ea7e17fff100e368c956350bb9aaa2261b8a9 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Sat, 31 May 2025 07:06:08 +0000
Subject: [PATCH 754/901] 8357598: Toolkit.removeAWTEventListener should handle
 null listener in AWTEventListenerProxy

Reviewed-by: aivanov, dnguyen
---
 .../share/classes/java/awt/Toolkit.java       |  2 +-
 .../AWTEventListenerProxyTest.java            | 51 ++++++++++++-------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index cc664f03cb1..d3d8fa2e268 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1735,7 +1735,7 @@ public void addAWTEventListener(AWTEventListener listener, long eventMask) {
     public void removeAWTEventListener(AWTEventListener listener) {
         AWTEventListener localL = deProxyAWTEventListener(listener);
 
-        if (listener == null) {
+        if (localL == null) {
             return;
         }
 
diff --git a/test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java b/test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java
index a2c8613efc9..3be61fd199b 100644
--- a/test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.java
+++ b/test/jdk/java/awt/Toolkit/AWTEventListenerProxyTest/AWTEventListenerProxyTest.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
@@ -23,7 +23,7 @@
 
 /*
   @test
-  @bug 4290704
+  @bug 4290704 8357598
   @summary Test use of AWTEventListenerProxyTest class
 */
 
@@ -38,33 +38,31 @@ public class AWTEventListenerProxyTest {
     public static void main(String[] args) throws Exception {
         EventQueue.invokeAndWait(() -> {
             Toolkit tk = Toolkit.getDefaultToolkit();
-            if ("sun.awt.X11.XToolkit".equals(tk.getClass().getName())) {
-                System.out.println("Do not test for XAWT Toolkit.");
-                System.out.println("Passing automatically.");
-                return;
-            }
 
             // check that if no listeners added, returns a 0-length array,
             // not null
-            AWTEventListener[] array1 = tk.getAWTEventListeners();
-            if (array1 == null || array1.length != 0) {
-                System.out.println("[Empty array test failed!!]");
-                throw new RuntimeException("Test failed -" +
-                    " didn't return 0-sized array");
-            }
+            verify(tk, 0);
             System.out.println("[Empty array test passed]");
 
+            // check that if a null listener is added, returns an empty array
+            tk.addAWTEventListener(null, AWTEvent.ACTION_EVENT_MASK);
+            verify(tk, 0);
+            NullProxyListener nl = new NullProxyListener();
+            tk.addAWTEventListener(nl, AWTEvent.ACTION_EVENT_MASK);
+            verify(tk, 0);
+            // check that if a null listener is removed, returns an empty array
+            tk.removeAWTEventListener(null);
+            verify(tk, 0);
+            tk.removeAWTEventListener(nl);
+            verify(tk, 0);
+
             // simple add/get test
             DumbListener dl1 = new DumbListener();
             final long dl1MASK = AWTEvent.ACTION_EVENT_MASK;
             tk.addAWTEventListener(dl1, dl1MASK);
+            verify(tk, 1);
 
-            array1 = tk.getAWTEventListeners();
-            if (array1 == null || array1.length != 1) {
-                System.out.println("[Simple add/get test failed!!]");
-                throw new RuntimeException("Test failed - didn't " +
-                    "return array of 1");
-            }
+            AWTEventListener[] array1 = tk.getAWTEventListeners();
             AWTEventListenerProxy dp1 = (AWTEventListenerProxy) array1[0];
             EventListener getdl1 = dp1.getListener();
             if (getdl1 != dl1) {
@@ -165,8 +163,23 @@ public static void main(String[] args) throws Exception {
         });
     }
 
+    private static void verify(Toolkit tk, int expected) {
+        AWTEventListener[] array = tk.getAWTEventListeners();
+        if (array == null || array.length != expected) {
+            System.out.println("[Simple test failed!!]");
+            throw new RuntimeException(
+                    "Test didn't return " + expected + "-sized array");
+        }
+    }
+
     public static class DumbListener implements AWTEventListener {
         public DumbListener() {}
         public void eventDispatched(AWTEvent e) {}
     }
+
+    public final static class NullProxyListener extends AWTEventListenerProxy {
+        public NullProxyListener() {
+            super(0, null);
+        }
+    }
 }

From 84002d12ed83c8254422fdda349aa647422d0768 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sat, 31 May 2025 13:02:58 +0000
Subject: [PATCH 755/901] 8228773: URLClassLoader constructors should include
 API note warning that the parent should not be null

Reviewed-by: alanb, mullan
---
 .../classes/java/net/URLClassLoader.java      | 50 +++++++++++++++----
 .../java/security/SecureClassLoader.java      | 22 ++++++--
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 90bb1c56f11..4b579554e0a 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 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
@@ -77,8 +77,15 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
      * the URL is assumed to refer to a JAR file which will be downloaded and
      * opened as needed.
      *
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
      * @param      urls the URLs from which to load classes and resources
-     * @param      parent the parent class loader for delegation
+     * @param      parent the parent class loader for delegation, can be {@code null}
+     *                    for the bootstrap class loader
      * @throws     NullPointerException if {@code urls} or any of its
      *             elements is {@code null}.
      */
@@ -89,12 +96,12 @@ public URLClassLoader(URL[] urls, ClassLoader parent) {
 
     /**
      * Constructs a new URLClassLoader for the specified URLs using the
-     * default delegation parent {@code ClassLoader}. The URLs will
-     * be searched in the order specified for classes and resources after
-     * first searching in the parent class loader. Any URL that ends with
-     * a '/' is assumed to refer to a directory. Otherwise, the URL is
-     * assumed to refer to a JAR file which will be downloaded and opened
-     * as needed.
+     * {@linkplain ClassLoader#getSystemClassLoader() system class loader
+     * as the parent}. The URLs will be searched in the order
+     * specified for classes and resources after first searching in the
+     * parent class loader. Any URL that ends with a '/' is assumed to
+     * refer to a directory. Otherwise, the URL is assumed to refer to
+     * a JAR file which will be downloaded and opened as needed.
      *
      * @param      urls the URLs from which to load classes and resources
      *
@@ -113,8 +120,15 @@ public URLClassLoader(URL[] urls) {
      * factory argument will be used as the stream handler factory to
      * obtain protocol handlers when creating new jar URLs.
      *
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
      * @param  urls the URLs from which to load classes and resources
-     * @param  parent the parent class loader for delegation
+     * @param  parent the parent class loader for delegation, can be {@code null}
+     *                for the bootstrap class loader
      * @param  factory the URLStreamHandlerFactory to use when creating URLs
      *
      * @throws NullPointerException if {@code urls} or any of its
@@ -135,9 +149,16 @@ public URLClassLoader(URL[] urls, ClassLoader parent,
      * Otherwise, the URL is assumed to refer to a JAR file which will be
      * downloaded and opened as needed.
      *
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
      * @param  name class loader name; or {@code null} if not named
      * @param  urls the URLs from which to load classes and resources
-     * @param  parent the parent class loader for delegation
+     * @param  parent the parent class loader for delegation, can be {@code null}
+     *                for the bootstrap class loader
      *
      * @throws IllegalArgumentException if the given name is empty.
      * @throws NullPointerException if {@code urls} or any of its
@@ -159,9 +180,16 @@ public URLClassLoader(String name,
      * The factory argument will be used as the stream handler factory to
      * obtain protocol handlers when creating new jar URLs.
      *
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
      * @param  name class loader name; or {@code null} if not named
      * @param  urls the URLs from which to load classes and resources
-     * @param  parent the parent class loader for delegation
+     * @param  parent the parent class loader for delegation, can be {@code null}
+     *                for the bootstrap class loader
      * @param  factory the URLStreamHandlerFactory to use when creating URLs
      *
      * @throws IllegalArgumentException if the given name is empty.
diff --git a/src/java.base/share/classes/java/security/SecureClassLoader.java b/src/java.base/share/classes/java/security/SecureClassLoader.java
index 8a6ba76e211..b398d7332d7 100644
--- a/src/java.base/share/classes/java/security/SecureClassLoader.java
+++ b/src/java.base/share/classes/java/security/SecureClassLoader.java
@@ -64,15 +64,22 @@ public class SecureClassLoader extends ClassLoader {
      * Creates a new {@code SecureClassLoader} using the specified parent
      * class loader for delegation.
      *
-     * @param parent the parent ClassLoader
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
+     * @param parent the parent ClassLoader, can be {@code null} for the bootstrap
+     *               class loader
      */
     protected SecureClassLoader(ClassLoader parent) {
         super(parent);
     }
 
     /**
-     * Creates a new {@code SecureClassLoader} using the default parent class
-     * loader for delegation.
+     * Creates a new {@code SecureClassLoader} using the
+     * {@linkplain ClassLoader#getSystemClassLoader() system class loader as the parent}.
      */
     protected SecureClassLoader() {
         super();
@@ -82,8 +89,15 @@ protected SecureClassLoader() {
      * Creates a new {@code SecureClassLoader} of the specified name and
      * using the specified parent class loader for delegation.
      *
+     * @apiNote If {@code parent} is specified as {@code null} (for the
+     * bootstrap class loader) then there is no guarantee that all platform
+     * classes are visible.
+     * See {@linkplain ClassLoader##builtinLoaders Run-time Built-in Class Loaders}
+     * for information on the bootstrap class loader and other built-in class loaders.
+     *
      * @param name class loader name; or {@code null} if not named
-     * @param parent the parent class loader
+     * @param parent the parent class loader, can be {@code null} for the bootstrap
+     *               class loader
      *
      * @throws IllegalArgumentException if the given name is empty.
      *

From a3f9e222632d29982ef1463e6c391d5896524705 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sat, 31 May 2025 16:31:24 +0000
Subject: [PATCH 756/901] 8358218: Problemlist
 jdk/incubator/vector/PreferredSpeciesTest.java#id0

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 8caa521e896..090b5eb71d7 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -765,7 +765,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/PreferredSpeciesTest.java                  8356634 generic-all
+jdk/incubator/vector/PreferredSpeciesTest.java#id0              8358217 generic-all
 
 ############################################################################
 

From fc3d3d9b303652275599e315b2d7e534d92080ea Mon Sep 17 00:00:00 2001
From: Srinivas Vamsi Parasa <sparasa@openjdk.org>
Date: Sat, 31 May 2025 23:07:55 +0000
Subject: [PATCH 757/901] 8351994: Enable Extended EVEX to REX2/REX demotion
 when src and dst are the same

Reviewed-by: sviswanathan, jbhateja, epeter
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |  595 +-
 src/hotspot/cpu/x86/assembler_x86.hpp         |   39 +-
 src/hotspot/cpu/x86/vm_version_x86.cpp        |   12 +-
 src/hotspot/cpu/x86/vm_version_x86.hpp        |    3 +-
 src/hotspot/cpu/x86/x86_64.ad                 |  135 -
 test/hotspot/gtest/x86/asmtest.out.h          | 5022 ++++++++++-------
 test/hotspot/gtest/x86/test_assembler_x86.cpp |    2 +-
 test/hotspot/gtest/x86/x86-asmtest.py         |  186 +-
 8 files changed, 3382 insertions(+), 2612 deletions(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 84c08dda848..3fb64c8f644 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -280,15 +280,14 @@ void Assembler::emit_arith_b(int op1, int op2, Register dst, int imm8) {
   emit_int24(op1, (op2 | encode(dst)), imm8);
 }
 
-
-void Assembler::emit_arith(int op1, int op2, Register dst, int32_t imm32) {
+void Assembler::emit_arith(int op1, int op2, Register dst, int32_t imm32, bool optimize_rax_dst) {
   assert(isByte(op1) && isByte(op2), "wrong opcode");
   assert(op1 == 0x81, "Unexpected opcode");
   if (is8bit(imm32)) {
     emit_int24(op1 | 0x02,        // set sign bit
                op2 | encode(dst),
                imm32 & 0xFF);
-  } else if (dst == rax) {
+  } else if (optimize_rax_dst && dst == rax) {
     switch (op2) {
       case 0xD0: emit_int8(0x15); break; // adc
       case 0xC0: emit_int8(0x05); break; // add
@@ -307,21 +306,6 @@ 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");
@@ -1364,7 +1348,7 @@ void Assembler::eaddl(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rax, src, imm32);
 }
 
@@ -1416,7 +1400,7 @@ void Assembler::eaddl(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x01);
   emit_operand(src2, src1, 0);
 }
@@ -1427,9 +1411,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_ndd(0x81, 0xC0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x81, 0xC0, no_flags);
 }
 
 void Assembler::addl(Register dst, Address src) {
@@ -1441,11 +1423,7 @@ void Assembler::addl(Register dst, Address src) {
 
 void Assembler::eaddl(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x03);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x03, no_flags);
 }
 
 void Assembler::addl(Register dst, Register src) {
@@ -1457,7 +1435,7 @@ void Assembler::eaddl(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void)evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void)emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x03, 0xC0, src1, src2);
 }
 
@@ -1647,7 +1625,7 @@ void Assembler::eandl(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rsp, src, imm32);
 }
 
@@ -1657,9 +1635,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_ndd(0x81, 0xE0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x81, 0xE0, no_flags);
 }
 
 void Assembler::andl(Address dst, Register src) {
@@ -1678,11 +1654,7 @@ void Assembler::andl(Register dst, Address src) {
 
 void Assembler::eandl(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x23);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x23, no_flags);
 }
 
 void Assembler::andl(Register dst, Register src) {
@@ -1694,7 +1666,7 @@ void Assembler::eandl(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x23, 0xC0, src1, src2);
 }
 
@@ -1841,9 +1813,7 @@ void Assembler::cmovl(Condition cc, Register dst, Register src) {
 }
 
 void Assembler::ecmovl(Condition cc, Register dst, Register src1, Register src2) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
-  emit_int16((0x40 | cc), (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x40 | cc, false /* no_flags */, true /* is_map1 */,  true /* swap */);
 }
 
 void Assembler::cmovl(Condition cc, Register dst, Address src) {
@@ -1855,11 +1825,7 @@ void Assembler::cmovl(Condition cc, Register dst, Address src) {
 
 void Assembler::ecmovl(Condition cc, Register dst, Register src1, Address src2) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
-  emit_int8((0x40 | cc));
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, (0x40 | cc) , false /* no_flags */, true /* is_map1 */);
 }
 
 void Assembler::cmpb(Address dst, Register reg) {
@@ -2029,7 +1995,7 @@ void Assembler::crc32(Register crc, Register v, int8_t sizeInBytes) {
   assert(VM_Version::supports_sse4_2(), "");
   if (needs_eevex(crc, v)) {
     InstructionAttr attributes(AVX_128bit, /* rex_w */ sizeInBytes == 8, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-    int encode = vex_prefix_and_encode(crc->encoding(), 0, v->encoding(), sizeInBytes == 2 ? VEX_SIMD_66 : VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, true);
+    int encode = vex_prefix_and_encode(crc->encoding(), 0, v->encoding(), sizeInBytes == 2 ? VEX_SIMD_66 : VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, true);
     emit_int16(sizeInBytes == 1 ? (unsigned char)0xF0 : (unsigned char)0xF1, (0xC0 | encode));
   } else {
     int8_t w = 0x01;
@@ -2076,7 +2042,7 @@ void Assembler::crc32(Register crc, Address adr, int8_t sizeInBytes) {
   if (needs_eevex(crc, adr.base(), adr.index())) {
     InstructionAttr attributes(AVX_128bit, /* vex_w */ sizeInBytes == 8, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
     attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-    vex_prefix(adr, 0, crc->encoding(), sizeInBytes == 2 ? VEX_SIMD_66 : VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+    vex_prefix(adr, 0, crc->encoding(), sizeInBytes == 2 ? VEX_SIMD_66 : VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes);
     emit_int8(sizeInBytes == 1 ? (unsigned char)0xF0 : (unsigned char)0xF1);
     emit_operand(crc, adr, 0);
   } else {
@@ -2473,7 +2439,7 @@ void Assembler::edecl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xFF);
   emit_operand(rcx, src, 0);
 }
@@ -2521,7 +2487,7 @@ void Assembler::idivl(Register src) {
 
 void Assembler::eidivl(Register src, bool no_flags) { // Signed
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xF8 | encode));
 }
 
@@ -2532,7 +2498,7 @@ void Assembler::divl(Register src) { // Unsigned
 
 void Assembler::edivl(Register src, bool no_flags) { // Unsigned
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xF0 | encode));
 }
 
@@ -2543,7 +2509,7 @@ void Assembler::imull(Register src) {
 
 void Assembler::eimull(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xE8 | encode));
 }
 
@@ -2553,9 +2519,7 @@ void Assembler::imull(Register dst, Register src) {
 }
 
 void Assembler::eimull(Register dst, Register src1, Register src2, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int16((unsigned char)0xAF, (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0xAF, no_flags, true /* is_map1 */,  true /* swap */);
 }
 
 void Assembler::imull(Register dst, Address src, int32_t value) {
@@ -2576,7 +2540,7 @@ void Assembler::eimull(Register dst, Address src, int32_t value, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (is8bit(value)) {
     emit_int8((unsigned char)0x6B);
     emit_operand(dst, src, 1);
@@ -2600,7 +2564,7 @@ void Assembler::imull(Register dst, Register src, int value) {
 
 void Assembler::eimull(Register dst, Register src, int value, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (is8bit(value)) {
     emit_int24(0x6B, (0xC0 | encode), value & 0xFF);
   } else {
@@ -2618,11 +2582,7 @@ void Assembler::imull(Register dst, Address src) {
 
 void Assembler::eimull(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8((unsigned char)0xAF);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, (unsigned char)0xAF, no_flags, true /* is_map1 */);
 }
 
 void Assembler::incl(Address dst) {
@@ -2638,7 +2598,7 @@ void Assembler::eincl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xFF);
   emit_operand(rax, src, 0);
 }
@@ -2830,7 +2790,7 @@ void Assembler::lzcntl(Register dst, Register src) {
 void Assembler::elzcntl(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_lzcnt(), "encoding is treated as BSR");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF5, (0xC0 | encode));
 }
 
@@ -2848,7 +2808,7 @@ void Assembler::elzcntl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF5);
   emit_operand(dst, src, 0);
 }
@@ -4066,7 +4026,7 @@ void Assembler::emull(Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF7);
   emit_operand(rsp, src, 0);
 }
@@ -4078,7 +4038,7 @@ void Assembler::mull(Register src) {
 
 void Assembler::emull(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xE0 | encode));
 }
 
@@ -4121,7 +4081,7 @@ void Assembler::negl(Register dst) {
 
 void Assembler::enegl(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xD8 | encode));
 }
 
@@ -4136,7 +4096,7 @@ void Assembler::enegl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF7);
   emit_operand(as_Register(3), src, 0);
 }
@@ -4454,7 +4414,7 @@ void Assembler::notl(Register dst) {
 
 void Assembler::enotl(Register dst, Register src) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes);
   emit_int16((unsigned char)0xF7, (0xD0 | encode));
 }
 
@@ -4462,7 +4422,7 @@ void Assembler::eorw(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_66, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x0B, 0xC0, src1, src2);
 }
 
@@ -4476,7 +4436,7 @@ void Assembler::eorl(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rcx, src, imm32);
 }
 
@@ -4486,9 +4446,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_ndd(0x81, 0xC8, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x81, 0xC8, no_flags);
 }
 
 void Assembler::orl(Register dst, Address src) {
@@ -4500,11 +4458,7 @@ void Assembler::orl(Register dst, Address src) {
 
 void Assembler::eorl(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x0B);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x0B, no_flags);
 }
 
 void Assembler::orl(Register dst, Register src) {
@@ -4516,7 +4470,7 @@ void Assembler::eorl(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x0B, 0xC0, src1, src2);
 }
 
@@ -4531,7 +4485,7 @@ void Assembler::eorl(Register dst, Address src1, Register src2, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x09);
   emit_operand(src2, src1, 0);
 }
@@ -4548,7 +4502,7 @@ void Assembler::eorb(Register dst, Address src, int imm8, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_8bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0x80);
   emit_operand(rcx, src, 1);
   emit_int8(imm8);
@@ -4565,7 +4519,7 @@ void Assembler::eorb(Register dst, Address src1, Register src2, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_8bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x08);
   emit_operand(src2, src1, 0);
 }
@@ -5693,7 +5647,7 @@ void Assembler::epopcntl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0x88);
   emit_operand(dst, src, 0);
 }
@@ -5708,7 +5662,7 @@ void Assembler::popcntl(Register dst, Register src) {
 void Assembler::epopcntl(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_popcnt(), "must support");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0x88, (0xC0 | encode));
 }
 
@@ -6259,7 +6213,7 @@ void Assembler::rcll(Register dst, int imm8) {
 void Assembler::ercll(Register dst, Register src, int imm8) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xD0 | encode));
   } else {
@@ -6342,7 +6296,7 @@ void Assembler::roll(Register dst, int imm8) {
 void Assembler::eroll(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
      emit_int16((unsigned char)0xD1, (0xC0 | encode));
    } else {
@@ -6357,7 +6311,7 @@ void Assembler::roll(Register dst) {
 
 void Assembler::eroll(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xC0 | encode));
 }
 
@@ -6374,7 +6328,7 @@ void Assembler::rorl(Register dst, int imm8) {
 void Assembler::erorl(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
      emit_int16((unsigned char)0xD1, (0xC8 | encode));
    } else {
@@ -6389,7 +6343,7 @@ void Assembler::rorl(Register dst) {
 
 void Assembler::erorl(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xC8 | encode));
 }
 
@@ -6400,7 +6354,7 @@ void Assembler::rorq(Register dst) {
 
 void Assembler::erorq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xC8 | encode));
 }
 
@@ -6417,7 +6371,7 @@ void Assembler::rorq(Register dst, int imm8) {
 void Assembler::erorq(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1) {
      emit_int16((unsigned char)0xD1, (0xC8 | encode));
    } else {
@@ -6432,7 +6386,7 @@ void Assembler::rolq(Register dst) {
 
 void Assembler::erolq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xC0 | encode));
 }
 
@@ -6449,7 +6403,7 @@ void Assembler::rolq(Register dst, int imm8) {
 void Assembler::erolq(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1) {
      emit_int16((unsigned char)0xD1, (0xC0 | encode));
    } else {
@@ -6477,7 +6431,7 @@ void Assembler::esall(Register dst, Address src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(4), src, 0);
@@ -6500,7 +6454,7 @@ void Assembler::esall(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(4), src, 0);
 }
@@ -6518,7 +6472,7 @@ void Assembler::sall(Register dst, int imm8) {
 void Assembler::esall(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xE0 | encode));
   } else {
@@ -6533,7 +6487,7 @@ void Assembler::sall(Register dst) {
 
 void Assembler::esall(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xE0 | encode));
 }
 
@@ -6557,7 +6511,7 @@ void Assembler::esarl(Register dst, Address src, int imm8, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(7), src, 0);
@@ -6580,7 +6534,7 @@ void Assembler::esarl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(7), src, 0);
 }
@@ -6598,7 +6552,7 @@ void Assembler::sarl(Register dst, int imm8) {
 void Assembler::esarl(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xF8 | encode));
   } else {
@@ -6613,7 +6567,7 @@ void Assembler::sarl(Register dst) {
 
 void Assembler::esarl(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xF8 | encode));
 }
 
@@ -6754,7 +6708,7 @@ void Assembler::shll(Register dst, int imm8) {
 void Assembler::eshll(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1 ) {
     emit_int16((unsigned char)0xD1, (0xE0 | encode));
   } else {
@@ -6769,7 +6723,7 @@ void Assembler::shll(Register dst) {
 
 void Assembler::eshll(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xE0 | encode));
 }
 
@@ -6787,7 +6741,7 @@ void Assembler::shrl(Register dst, int imm8) {
 void Assembler::eshrl(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xE8 | encode));
   }
@@ -6803,7 +6757,7 @@ void Assembler::shrl(Register dst) {
 
 void Assembler::eshrl(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xD3, (0xE8 | encode));
 }
 
@@ -6818,7 +6772,7 @@ void Assembler::eshrl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(5), src, 0);
 }
@@ -6843,7 +6797,7 @@ void Assembler::eshrl(Register dst, Address src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(5), src, 0);
@@ -6861,11 +6815,7 @@ void Assembler::shldl(Register dst, Register src) {
 }
 
 void Assembler::eshldl(Register dst, Register src1, Register src2, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int16(0xA5, (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0xA5, no_flags, true /* is_map1 */);
 }
 
 void Assembler::shldl(Register dst, Register src, int8_t imm8) {
@@ -6874,11 +6824,7 @@ void Assembler::shldl(Register dst, Register src, int8_t imm8) {
 }
 
 void Assembler::eshldl(Register dst, Register src1, Register src2, int8_t imm8, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int24(0x24, (0xC0 | encode), imm8);
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), imm8, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x24, no_flags, true /* is_map1 */);
 }
 
 void Assembler::shrdl(Register dst, Register src) {
@@ -6887,11 +6833,7 @@ void Assembler::shrdl(Register dst, Register src) {
 }
 
 void Assembler::eshrdl(Register dst, Register src1, Register src2, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int16(0xAD, (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0xAD, no_flags, true /* is_map1 */);
 }
 
 void Assembler::shrdl(Register dst, Register src, int8_t imm8) {
@@ -6900,11 +6842,7 @@ void Assembler::shrdl(Register dst, Register src, int8_t imm8) {
 }
 
 void Assembler::eshrdl(Register dst, Register src1, Register src2, int8_t imm8, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int24(0x2C, (0xC0 | encode), imm8);
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), imm8, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x2C, no_flags, true /* is_map1 */);
 }
 
 void Assembler::shldq(Register dst, Register src, int8_t imm8) {
@@ -6913,11 +6851,7 @@ void Assembler::shldq(Register dst, Register src, int8_t imm8) {
 }
 
 void Assembler::eshldq(Register dst, Register src1, Register src2, int8_t imm8, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int24(0x24, (0xC0 | encode), imm8);
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), imm8, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x24, no_flags, true /* is_map1 */);
 }
 
 void Assembler::shrdq(Register dst, Register src, int8_t imm8) {
@@ -6926,11 +6860,7 @@ void Assembler::shrdq(Register dst, Register src, int8_t imm8) {
 }
 
 void Assembler::eshrdq(Register dst, Register src1, Register src2, int8_t imm8, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  int encode = evex_prefix_and_encode_ndd(src2->encoding(), dst->encoding(), src1->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int24(0x2C, (0xC0 | encode), imm8);
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), imm8, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x2C, no_flags, true /* is_map1 */);
 }
 
 // copies a single word from [esi] to [edi]
@@ -7020,7 +6950,7 @@ void Assembler::esubl(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rbp, src, imm32);
 }
 
@@ -7035,7 +6965,7 @@ void Assembler::esubl(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x29);
   emit_operand(src2, src1, 0);
 }
@@ -7046,9 +6976,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_ndd(0x81, 0xE8, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x81, 0xE8, no_flags);
 }
 
 // Force generation of a 4 byte immediate value even if it fits into 8bit
@@ -7059,7 +6987,7 @@ void Assembler::subl_imm32(Register dst, int32_t imm32) {
 
 void Assembler::esubl_imm32(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);
+  (void) emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_imm32(0x81, 0xE8, src, imm32);
 }
 
@@ -7072,11 +7000,7 @@ void Assembler::subl(Register dst, Address src) {
 
 void Assembler::esubl(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x2B);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x2B, no_flags);
 }
 
 void Assembler::subl(Register dst, Register src) {
@@ -7088,7 +7012,7 @@ void Assembler::esubl(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x2B, 0xC0, src1, src2);
 }
 
@@ -7193,7 +7117,7 @@ void Assembler::tzcntl(Register dst, Register src) {
 void Assembler::etzcntl(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_bmi1(), "tzcnt instruction not supported");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF4, (0xC0 | encode));
 }
 
@@ -7211,7 +7135,7 @@ void Assembler::etzcntl(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF4);
   emit_operand(dst, src, 0);
 }
@@ -7226,7 +7150,7 @@ void Assembler::tzcntq(Register dst, Register src) {
 void Assembler::etzcntq(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_bmi1(), "tzcnt instruction not supported");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF4, (0xC0 | encode));
 }
 
@@ -7244,7 +7168,7 @@ void Assembler::etzcntq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF4);
   emit_operand(dst, src, 0);
 }
@@ -7368,7 +7292,7 @@ void Assembler::exorl(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, as_Register(6), src, imm32);
 }
 
@@ -7378,9 +7302,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_ndd(0x81, 0xF0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x81, 0xF0, no_flags);
 }
 
 void Assembler::xorl(Register dst, Address src) {
@@ -7392,11 +7314,7 @@ void Assembler::xorl(Register dst, Address src) {
 
 void Assembler::exorl(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x33);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_32bit, 0x33, no_flags);
 }
 
 void Assembler::xorl(Register dst, Register src) {
@@ -7408,7 +7326,7 @@ void Assembler::exorl(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith(0x33, 0xC0, src1, src2);
 }
 
@@ -7423,7 +7341,7 @@ void Assembler::exorl(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x31);
   emit_operand(src2, src1, 0);
 }
@@ -7437,11 +7355,7 @@ void Assembler::xorb(Register dst, Address src) {
 
 void Assembler::exorb(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_8bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x32);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_8bit, 0x32, no_flags);
 }
 
 void Assembler::xorb(Address dst, Register src) {
@@ -7455,7 +7369,7 @@ void Assembler::exorb(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_8bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x30);
   emit_operand(src2, src1, 0);
 }
@@ -7470,13 +7384,7 @@ void Assembler::xorw(Register dst, Address src) {
 
 void Assembler::exorw(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_16bit);
-  // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
-  // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_66, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x33);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_66, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_16bit, 0x33, no_flags);
 }
 
 // AVX 3-operands scalar float-point arithmetic instructions
@@ -12977,12 +12885,35 @@ void Assembler::vex_prefix(Address adr, int nds_enc, int xreg_enc, VexSimdPrefix
   }
 }
 
-void Assembler::evex_prefix_ndd(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags) {
+void Assembler::eevex_prefix_ndd(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags) {
   attributes->set_is_evex_instruction();
   vex_prefix(adr, ndd_enc, xreg_enc, pre, opc, attributes, /* nds_is_ndd */ true, no_flags);
 }
 
-void Assembler::evex_prefix_nf(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags) {
+void Assembler::emit_eevex_or_demote(Register dst, Register src1, Address src2, VexSimdPrefix pre, VexOpcode opc,
+                                     int size, int opcode_byte, bool no_flags, bool is_map1) {
+  if (is_demotable(no_flags, dst->encoding(), src1->encoding())) {
+    if (size == EVEX_64bit) {
+      emit_prefix_and_int8(get_prefixq(src2, dst, is_map1), opcode_byte);
+    } else {
+      // For 32-bit, 16-bit and 8-bit
+      if (size == EVEX_16bit) {
+        emit_int8(0x66);
+      }
+      prefix(src2, dst, false, is_map1);
+      emit_int8(opcode_byte);
+    }
+  } else {
+    bool vex_w = (size == EVEX_64bit) ? true : false;
+    InstructionAttr attributes(AVX_128bit, vex_w, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+    attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, size);
+    eevex_prefix_ndd(src2, dst->encoding(), src1->encoding(), pre, opc, &attributes, no_flags);
+    emit_int8(opcode_byte);
+  }
+  emit_operand(src1, src2, 0);
+}
+
+void Assembler::eevex_prefix_nf(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags) {
   attributes->set_is_evex_instruction();
   vex_prefix(adr, ndd_enc, xreg_enc, pre, opc, attributes, /* nds_is_ndd */ false, no_flags);
 }
@@ -13044,18 +12975,98 @@ int Assembler::vex_prefix_and_encode(int dst_enc, int nds_enc, int src_enc, VexS
   return (((dst_enc & 7) << 3) | (src_enc & 7));
 }
 
-int Assembler::evex_prefix_and_encode_ndd(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
-                           InstructionAttr *attributes, bool no_flags) {
+void Assembler::emit_eevex_or_demote(int dst_enc, int nds_enc, int src_enc, int8_t imm8, VexSimdPrefix pre, VexOpcode opc,
+                                     int size, int opcode_byte, bool no_flags, bool is_map1) {
+  bool is_prefixq = (size == EVEX_64bit) ? true : false;
+  if (is_demotable(no_flags, dst_enc, nds_enc)) {
+    int encode = is_prefixq ? prefixq_and_encode(src_enc, dst_enc, is_map1) : prefix_and_encode(src_enc, dst_enc, is_map1);
+    emit_opcode_prefix_and_encoding((unsigned char)(opcode_byte | 0x80), 0xC0, encode, imm8);
+  } else {
+    InstructionAttr attributes(AVX_128bit, is_prefixq, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+    attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, size);
+    int encode = emit_eevex_prefix_or_demote_ndd(src_enc, dst_enc, nds_enc, pre, opc, &attributes, no_flags);
+    emit_int24(opcode_byte, (0xC0 | encode), imm8);
+  }
+}
+
+void Assembler::emit_eevex_or_demote(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+                                     int size, int opcode_byte, bool no_flags, bool is_map1, bool swap) {
+  int encode;
+  bool is_prefixq = (size == EVEX_64bit) ? true : false;
+  if (is_demotable(no_flags, dst_enc, nds_enc)) {
+    if (size == EVEX_16bit) {
+      emit_int8(0x66);
+    }
+
+    if (swap) {
+      encode = is_prefixq ? prefixq_and_encode(dst_enc, src_enc, is_map1) : prefix_and_encode(dst_enc, src_enc, is_map1);
+    } else {
+      encode = is_prefixq ? prefixq_and_encode(src_enc, dst_enc, is_map1) : prefix_and_encode(src_enc, dst_enc, is_map1);
+    }
+    emit_opcode_prefix_and_encoding((unsigned char)opcode_byte, 0xC0, encode);
+  } else {
+    InstructionAttr attributes(AVX_128bit, is_prefixq, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+    attributes.set_is_evex_instruction();
+    if (swap) {
+      encode = vex_prefix_and_encode(nds_enc, dst_enc, src_enc, pre, opc, &attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
+    } else {
+      encode = vex_prefix_and_encode(src_enc, dst_enc, nds_enc, pre, opc, &attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
+    }
+    emit_int16(opcode_byte, (0xC0 | encode));
+  }
+}
+
+int Assembler::emit_eevex_prefix_or_demote_ndd(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+                                               InstructionAttr *attributes, bool no_flags, bool use_prefixq) {
+  if (is_demotable(no_flags, dst_enc, nds_enc)) {
+    if (pre == VEX_SIMD_66) {
+      emit_int8(0x66);
+    }
+    return use_prefixq ? prefixq_and_encode(dst_enc, src_enc) : prefix_and_encode(dst_enc, src_enc);
+  }
   attributes->set_is_evex_instruction();
   return vex_prefix_and_encode(dst_enc, nds_enc, src_enc, pre, opc, attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
 }
 
-int Assembler::evex_prefix_and_encode_nf(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
-                           InstructionAttr *attributes, bool no_flags) {
+int Assembler::emit_eevex_prefix_or_demote_ndd(int dst_enc, int nds_enc, VexSimdPrefix pre, VexOpcode opc,
+                                               InstructionAttr *attributes, bool no_flags, bool use_prefixq) {
+  //Demote RegReg and RegRegImm instructions
+  if (is_demotable(no_flags, dst_enc, nds_enc)) {
+    return use_prefixq ? prefixq_and_encode(dst_enc) : prefix_and_encode(dst_enc);
+  }
+  attributes->set_is_evex_instruction();
+  return vex_prefix_and_encode(0, dst_enc, nds_enc, pre, opc, attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
+}
+
+int Assembler::emit_eevex_prefix_ndd(int dst_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags) {
+  attributes->set_is_evex_instruction();
+  return vex_prefix_and_encode(0, 0, dst_enc, pre, opc, attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
+}
+
+int Assembler::eevex_prefix_and_encode_nf(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+                                          InstructionAttr *attributes, bool no_flags) {
   attributes->set_is_evex_instruction();
   return vex_prefix_and_encode(dst_enc, nds_enc, src_enc, pre, opc, attributes, /* src_is_gpr */ true, /* nds_is_ndd */ false, no_flags);
 }
 
+void Assembler::emit_eevex_prefix_or_demote_arith_ndd(Register dst, Register nds, int32_t imm32, VexSimdPrefix pre, VexOpcode opc,
+                                                      int size, int op1, int op2, bool no_flags) {
+  int dst_enc = dst->encoding();
+  int nds_enc = nds->encoding();
+  bool demote = is_demotable(no_flags, dst_enc, nds_enc);
+  if (demote) {
+    (size == EVEX_64bit) ? (void) prefixq_and_encode(dst_enc) : (void) prefix_and_encode(dst_enc);
+  } else {
+    bool vex_w = (size == EVEX_64bit) ? true : false;
+    InstructionAttr attributes(AVX_128bit, vex_w, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+    //attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, size);
+    attributes.set_is_evex_instruction();
+    vex_prefix_and_encode(0, dst_enc, nds_enc, pre, opc, &attributes, /* src_is_gpr */ true, /* nds_is_ndd */ true, no_flags);
+
+  }
+  emit_arith(op1, op2, nds, imm32, demote);
+}
+
 void Assembler::simd_prefix(XMMRegister xreg, XMMRegister nds, Address adr, VexSimdPrefix pre,
                             VexOpcode opc, InstructionAttr *attributes) {
   if (UseAVX > 0) {
@@ -13081,6 +13092,10 @@ int Assembler::simd_prefix_and_encode(XMMRegister dst, XMMRegister nds, XMMRegis
   }
 }
 
+bool Assembler::is_demotable(bool no_flags, int dst_enc, int nds_enc) {
+  return (!no_flags && dst_enc == nds_enc);
+}
+
 void Assembler::vmaxss(XMMRegister dst, XMMRegister nds, XMMRegister src) {
   assert(VM_Version::supports_avx(), "");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
@@ -14515,7 +14530,7 @@ void Assembler::eaddq(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rax, src, imm32);
 }
 
@@ -14529,7 +14544,7 @@ void Assembler::eaddq(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x01);
   emit_operand(src2, src1, 0);
 }
@@ -14540,9 +14555,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_ndd(0x81, 0xC0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x81, 0xC0, no_flags);
 }
 
 void Assembler::addq(Register dst, Address src) {
@@ -14553,11 +14566,7 @@ void Assembler::addq(Register dst, Address src) {
 
 void Assembler::eaddq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x03);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x03, no_flags);
 }
 
 void Assembler::addq(Register dst, Register src) {
@@ -14569,7 +14578,7 @@ void Assembler::eaddq(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith(0x03, 0xC0, src1, src2);
 }
 
@@ -14577,7 +14586,7 @@ void Assembler::adcxq(Register dst, Register src) {
   //assert(VM_Version::supports_adx(), "adx instructions not supported");
   if (needs_rex2(dst, src)) {
     InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-    int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3C, &attributes, true);
+    int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, true);
     emit_int16((unsigned char)0x66, (0xC0 | encode));
   } else {
     emit_int8(0x66);
@@ -14590,16 +14599,19 @@ void Assembler::adcxq(Register dst, Register src) {
 }
 
 void Assembler::eadcxq(Register dst, Register src1, Register src2) {
-    InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-    int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3C, &attributes);
-    emit_int16((unsigned char)0x66, (0xC0 | encode));
+  if (is_demotable(false, dst->encoding(), src1->encoding())) {
+    return adcxq(dst, src2);
+  }
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  int encode = emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, false /* no_flags */, true /* use_prefixq */);
+  emit_int16((unsigned char)0x66, (0xC0 | encode));
 }
 
 void Assembler::adoxq(Register dst, Register src) {
   //assert(VM_Version::supports_adx(), "adx instructions not supported");
   if (needs_rex2(dst, src)) {
     InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-    int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F_3C, &attributes, true);
+    int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, true);
     emit_int16((unsigned char)0x66, (0xC0 | encode));
   } else {
     emit_int8((unsigned char)0xF3);
@@ -14612,9 +14624,12 @@ void Assembler::adoxq(Register dst, Register src) {
 }
 
 void Assembler::eadoxq(Register dst, Register src1, Register src2) {
-    InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-    int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F_3C, &attributes);
-    emit_int16((unsigned char)0x66, (0xC0 | encode));
+  if (is_demotable(false, dst->encoding(), src1->encoding())) {
+    return adoxq(dst, src2);
+  }
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  int encode = emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, false /* no_flags */, true /* use_prefixq */);
+  emit_int16((unsigned char)0x66, (0xC0 | encode));
 }
 
 void Assembler::andq(Address dst, int32_t imm32) {
@@ -14627,7 +14642,7 @@ void Assembler::eandq(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, as_Register(4), src, imm32);
 }
 
@@ -14637,9 +14652,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_ndd(0x81, 0xE0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x81, 0xE0, no_flags);
 }
 
 void Assembler::andq(Register dst, Address src) {
@@ -14650,11 +14663,7 @@ void Assembler::andq(Register dst, Address src) {
 
 void Assembler::eandq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x23);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x23, no_flags);
 }
 
 void Assembler::andq(Register dst, Register src) {
@@ -14666,7 +14675,7 @@ void Assembler::eandq(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith(0x23, 0xC0, src1, src2);
 }
 
@@ -14680,7 +14689,7 @@ void Assembler::eandq(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x21);
   emit_operand(src2, src1, 0);
 }
@@ -14819,9 +14828,7 @@ void Assembler::cmovq(Condition cc, Register dst, Register src) {
 }
 
 void Assembler::ecmovq(Condition cc, Register dst, Register src1, Register src2) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
-  emit_int16((0x40 | cc), (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x40 | cc, false /* no_flags */, true /* is_map1 */, true /* swap */);
 }
 
 void Assembler::cmovq(Condition cc, Register dst, Address src) {
@@ -14833,11 +14840,7 @@ void Assembler::cmovq(Condition cc, Register dst, Address src) {
 
 void Assembler::ecmovq(Condition cc, Register dst, Register src1, Address src2) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
-  emit_int8((0x40 | cc));
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, (0x40 | cc) , false /* no_flags */, true /* is_map1 */);
 }
 
 void Assembler::cmpq(Address dst, int32_t imm32) {
@@ -14936,7 +14939,7 @@ void Assembler::decl(Register dst) {
 
 void Assembler::edecl(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xFF, (0xC8 | encode));
 }
 
@@ -14949,7 +14952,7 @@ void Assembler::decq(Register dst) {
 
 void Assembler::edecq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xFF, (0xC8 | encode));
 }
 
@@ -14964,7 +14967,7 @@ void Assembler::edecq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xFF);
   emit_operand(rcx, src, 0);
 }
@@ -15004,7 +15007,7 @@ void Assembler::idivq(Register src) {
 
 void Assembler::eidivq(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xF8 | encode));
 }
 
@@ -15015,7 +15018,7 @@ void Assembler::divq(Register src) {
 
 void Assembler::edivq(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xF0 | encode));
 }
 
@@ -15025,15 +15028,16 @@ void Assembler::imulq(Register dst, Register src) {
 }
 
 void Assembler::eimulq(Register dst, Register src, bool no_flags) {
+  if (is_demotable(no_flags, dst->encoding(), src->encoding())) {
+    return imulq(dst);
+  }
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xAF, (0xC0 | encode));
 }
 
 void Assembler::eimulq(Register dst, Register src1, Register src2, bool no_flags) {
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int16((unsigned char)0xAF, (0xC0 | encode));
+  emit_eevex_or_demote(dst->encoding(), src1->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0xAF, no_flags, true /* is_map1 */,  true /* swap */);
 }
 
 void Assembler::imulq(Register src) {
@@ -15043,7 +15047,7 @@ void Assembler::imulq(Register src) {
 
 void Assembler::eimulq(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xE8 | encode));
 }
 
@@ -15065,7 +15069,7 @@ void Assembler::eimulq(Register dst, Address src, int32_t value, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (is8bit(value)) {
     emit_int8((unsigned char)0x6B);
     emit_operand(dst, src, 1);
@@ -15089,7 +15093,7 @@ void Assembler::imulq(Register dst, Register src, int value) {
 
 void Assembler::eimulq(Register dst, Register src, int value, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (is8bit(value)) {
     emit_int24(0x6B, (0xC0 | encode), (value & 0xFF));
   } else {
@@ -15109,7 +15113,7 @@ void Assembler::eimulq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
 
   emit_int8((unsigned char)0xAF);
   emit_operand(dst, src, 0);
@@ -15117,11 +15121,7 @@ void Assembler::eimulq(Register dst, Address src, bool no_flags) {
 
 void Assembler::eimulq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_32bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8((unsigned char)0xAF);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, (unsigned char)0xAF, no_flags, true /* is_map1 */);
 }
 
 void Assembler::incl(Register dst) {
@@ -15135,8 +15135,7 @@ void Assembler::eincl(Register dst, Register src, bool no_flags) {
   // Don't use it directly. Use MacroAssembler::incrementl() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  // int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xFF, (0xC0 | encode));
 }
 
@@ -15151,7 +15150,7 @@ void Assembler::eincq(Register dst, Register src, bool no_flags) {
   // Don't use it directly. Use MacroAssembler::incrementq() instead.
   // Use two-byte form (one-byte from is a REX prefix in 64-bit mode)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xFF, (0xC0 | encode));
 }
 
@@ -15167,7 +15166,7 @@ void Assembler::eincq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char) 0xFF);
   emit_operand(rax, src, 0);
 }
@@ -15243,7 +15242,7 @@ void Assembler::lzcntq(Register dst, Register src) {
 void Assembler::elzcntq(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_lzcnt(), "encoding is treated as BSR");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF5, (0xC0 | encode));
 }
 
@@ -15261,7 +15260,7 @@ void Assembler::elzcntq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF5);
   emit_operand(dst, src, 0);
 }
@@ -15388,7 +15387,7 @@ void Assembler::emulq(Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_nf(src, 0, 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0xF7);
   emit_operand(rsp, src, 0);
 }
@@ -15400,7 +15399,7 @@ void Assembler::mulq(Register src) {
 
 void Assembler::emulq(Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(0, 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0xF7, (0xE0 | encode));
 }
 
@@ -15418,7 +15417,7 @@ void Assembler::negq(Register dst) {
 
 void Assembler::enegq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xF7, (0xD8 | encode));
 }
 
@@ -15432,7 +15431,7 @@ void Assembler::enegq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xF7);
   emit_operand(as_Register(3), src, 0);
 }
@@ -15444,7 +15443,7 @@ void Assembler::notq(Register dst) {
 
 void Assembler::enotq(Register dst, Register src) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, false /* no_flags */, true /* use_prefixq */);
   emit_int16((unsigned char)0xF7, (0xD0 | encode));
 }
 
@@ -15488,7 +15487,7 @@ void Assembler::eorq(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, as_Register(1), src, imm32);
 }
 
@@ -15502,7 +15501,7 @@ void Assembler::eorq(Register dst, Address src1, Register src2, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x09);
   emit_operand(src2, src1, 0);
 }
@@ -15513,9 +15512,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_ndd(0x81, 0xC8, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x81, 0xC8, no_flags);
 }
 
 void Assembler::orq_imm32(Register dst, int32_t imm32) {
@@ -15525,7 +15522,7 @@ void Assembler::orq_imm32(Register dst, int32_t imm32) {
 
 void Assembler::eorq_imm32(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);
+  (void) emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith_imm32(0x81, 0xC8, src, imm32);
 }
 
@@ -15537,11 +15534,7 @@ void Assembler::orq(Register dst, Address src) {
 
 void Assembler::eorq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x0B);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x0B, no_flags);
 }
 
 void Assembler::orq(Register dst, Register src) {
@@ -15553,7 +15546,7 @@ void Assembler::eorq(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith(0x0B, 0xC0, src1, src2);
 }
 
@@ -15570,7 +15563,7 @@ void Assembler::epopcntq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_nf(src, 0, dst->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char) 0x88);
   emit_operand(dst, src, 0);
 }
@@ -15585,7 +15578,7 @@ void Assembler::popcntq(Register dst, Register src) {
 void Assembler::epopcntq(Register dst, Register src, bool no_flags) {
   assert(VM_Version::supports_popcnt(), "must support");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = eevex_prefix_and_encode_nf(dst->encoding(), 0, src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int16((unsigned char)0x88, (0xC0 | encode));
 }
 
@@ -15810,7 +15803,7 @@ void Assembler::rclq(Register dst, int imm8) {
 void Assembler::erclq(Register dst, Register src, int imm8) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode =  evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+  int encode =  emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, false /* no_flags */, true /* use_prefixq */);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xD0 | encode));
   } else {
@@ -15831,7 +15824,7 @@ void Assembler::rcrq(Register dst, int imm8) {
 void Assembler::ercrq(Register dst, Register src, int imm8) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode =  evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes);
+  int encode =  emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, false /* no_flags */, true /* use_prefixq */);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xD8 | encode));
   } else {
@@ -15894,7 +15887,7 @@ void Assembler::esalq(Register dst, Address src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(4), src, 0);
@@ -15916,7 +15909,7 @@ void Assembler::esalq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(4), src, 0);
 }
@@ -15934,7 +15927,7 @@ void Assembler::salq(Register dst, int imm8) {
 void Assembler::esalq(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xE0 | encode));
   } else {
@@ -15949,7 +15942,7 @@ void Assembler::salq(Register dst) {
 
 void Assembler::esalq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xE0 | encode));
 }
 
@@ -15972,7 +15965,7 @@ void Assembler::esarq(Register dst, Address src, int imm8, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(7), src, 0);
@@ -15994,7 +15987,7 @@ void Assembler::esarq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(7), src, 0);
 }
@@ -16011,7 +16004,7 @@ void Assembler::sarq(Register dst, int imm8) {
 
 void Assembler::esarq(Register dst, Register src, int imm8, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xF8 | encode));
   } else {
@@ -16026,7 +16019,7 @@ void Assembler::sarq(Register dst) {
 
 void Assembler::esarq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xF8 | encode));
 }
 
@@ -16065,7 +16058,7 @@ void Assembler::shlq(Register dst, int imm8) {
 void Assembler::eshlq(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1 ) {
     emit_int16((unsigned char)0xD1, (0xE0 | encode));
   } else {
@@ -16080,7 +16073,7 @@ void Assembler::shlq(Register dst) {
 
 void Assembler::eshlq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xE0 | encode));
 }
 
@@ -16098,7 +16091,7 @@ void Assembler::shrq(Register dst, int imm8) {
 void Assembler::eshrq(Register dst, Register src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   if (imm8 == 1) {
     emit_int16((unsigned char)0xD1, (0xE8 | encode));
   }
@@ -16114,7 +16107,7 @@ void Assembler::shrq(Register dst) {
 
 void Assembler::eshrq(Register dst, Register src, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  int encode = evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  int encode = emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_int16((unsigned char)0xD3, (0xE8 | encode));
 }
 
@@ -16128,7 +16121,7 @@ void Assembler::eshrq(Register dst, Address src, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8((unsigned char)0xD3);
   emit_operand(as_Register(5), src, 0);
 }
@@ -16152,7 +16145,7 @@ void Assembler::eshrq(Register dst, Address src, int imm8, bool no_flags) {
   assert(isShiftCount(imm8 >> 1), "illegal shift count");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   if (imm8 == 1) {
     emit_int8((unsigned char)0xD1);
     emit_operand(as_Register(5), src, 0);
@@ -16174,7 +16167,7 @@ void Assembler::esubq(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, rbp, src, imm32);
 }
 
@@ -16188,7 +16181,7 @@ void Assembler::esubq(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x29);
   emit_operand(src2, src1, 0);
 }
@@ -16199,9 +16192,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_ndd(0x81, 0xE8, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x81, 0xE8, no_flags);
 }
 
 // Force generation of a 4 byte immediate value even if it fits into 8bit
@@ -16212,7 +16203,7 @@ void Assembler::subq_imm32(Register dst, int32_t imm32) {
 
 void Assembler::esubq_imm32(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);
+  (void) emit_eevex_prefix_or_demote_ndd(dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith_imm32(0x81, 0xE8, src, imm32);
 }
 
@@ -16224,11 +16215,7 @@ void Assembler::subq(Register dst, Address src) {
 
 void Assembler::esubq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x2B);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x2B, no_flags);
 }
 
 void Assembler::subq(Register dst, Register src) {
@@ -16240,7 +16227,7 @@ void Assembler::esubq(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith(0x2B, 0xC0, src1, src2);
 }
 
@@ -16305,7 +16292,7 @@ void Assembler::exorq(Register dst, Register src1, Register src2, bool no_flags)
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // NDD shares its encoding bits with NDS bits for regular EVEX instruction.
   // Therefore, DST is passed as the second argument to minimize changes in the leaf level routine.
-  (void) evex_prefix_and_encode_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, /* MAP4 */VEX_OPCODE_0F_3C, &attributes, no_flags);
+  (void) emit_eevex_prefix_or_demote_ndd(src1->encoding(), dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags, true /* use_prefixq */);
   emit_arith(0x33, 0xC0, src1, src2);
 }
 
@@ -16317,11 +16304,7 @@ void Assembler::xorq(Register dst, Address src) {
 
 void Assembler::exorq(Register dst, Register src1, Address src2, bool no_flags) {
   InstructionMark im(this);
-  InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
-  attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src2, dst->encoding(), src1->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_int8(0x33);
-  emit_operand(src1, src2, 0);
+  emit_eevex_or_demote(dst, src1, src2, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x33, no_flags);
 }
 
 void Assembler::xorq(Register dst, int32_t imm32) {
@@ -16330,9 +16313,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_ndd(0x81, 0xF0, src, imm32);
+  emit_eevex_prefix_or_demote_arith_ndd(dst, src, imm32, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, EVEX_64bit, 0x81, 0xF0, no_flags);
 }
 
 void Assembler::xorq(Address dst, int32_t imm32) {
@@ -16345,7 +16326,7 @@ void Assembler::exorq(Register dst, Address src, int32_t imm32, bool no_flags) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src, dst->encoding(), 0, VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_arith_operand(0x81, as_Register(6), src, imm32);
 }
 
@@ -16360,7 +16341,7 @@ void Assembler::esetzucc(Condition cc, Register dst) {
   assert(0 <= cc && cc < 16, "illegal cc");
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   // Encoding Format : eevex_prefix (4 bytes) | opcode_cc | modrm
-  int encode =  evex_prefix_and_encode_ndd(0, 0, dst->encoding(), VEX_SIMD_F2, /* MAP4 */VEX_OPCODE_0F_3C, &attributes);
+  int encode =  emit_eevex_prefix_ndd(dst->encoding(), VEX_SIMD_F2, VEX_OPCODE_0F_3C /* MAP4 */, &attributes); // demotion disabled
   emit_opcode_prefix_and_encoding((0x40 | cc), 0xC0, encode);
 }
 
@@ -16368,7 +16349,7 @@ void Assembler::exorq(Register dst, Address src1, Register src2, bool no_flags)
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   attributes.set_address_attributes(/* tuple_type */ EVEX_NOSCALE, /* input_size_in_bits */ EVEX_64bit);
-  evex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
+  eevex_prefix_ndd(src1, dst->encoding(), src2->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C /* MAP4 */, &attributes, no_flags);
   emit_int8(0x31);
   emit_operand(src2, src1, 0);
 }
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 10e6264160c..b1959e23722 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -772,25 +772,42 @@ class Assembler : public AbstractAssembler  {
   void evex_prefix(bool vex_r, bool vex_b, bool vex_x, bool evex_v, bool evex_r, bool evex_b,
                        bool eevex_x, int nds_enc, VexSimdPrefix pre, VexOpcode opc, bool no_flags = false);
 
-  void evex_prefix_ndd(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc,
-                       InstructionAttr *attributes, bool no_flags = false);
+  void eevex_prefix_ndd(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc,
+                        InstructionAttr *attributes, bool no_flags = false);
 
-  void evex_prefix_nf(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc,
-                      InstructionAttr *attributes, bool no_flags = false);
+  void eevex_prefix_nf(Address adr, int ndd_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc,
+                       InstructionAttr *attributes, bool no_flags = false);
 
   void vex_prefix(Address adr, int nds_enc, int xreg_enc, VexSimdPrefix pre, VexOpcode opc,
                   InstructionAttr *attributes, bool nds_is_ndd = false, bool no_flags = false);
 
-  int  vex_prefix_and_encode(int dst_enc, int nds_enc, int src_enc,
+  int vex_prefix_and_encode(int dst_enc, int nds_enc, int src_enc,
                              VexSimdPrefix pre, VexOpcode opc,
                              InstructionAttr *attributes, bool src_is_gpr = false, bool nds_is_ndd = false, bool no_flags = false);
 
-  int  evex_prefix_and_encode_ndd(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
-                                  InstructionAttr *attributes, bool no_flags = false);
-
-  int  evex_prefix_and_encode_nf(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+  int eevex_prefix_and_encode_nf(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
                                  InstructionAttr *attributes, bool no_flags = false);
 
+  int emit_eevex_prefix_ndd(int dst_enc, VexSimdPrefix pre, VexOpcode opc, InstructionAttr *attributes, bool no_flags = false);
+
+  int emit_eevex_prefix_or_demote_ndd(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+                                      InstructionAttr *attributes, bool no_flags = false, bool use_prefixq = false);
+
+  int emit_eevex_prefix_or_demote_ndd(int dst_enc, int nds_enc, VexSimdPrefix pre, VexOpcode opc,
+                                      InstructionAttr *attributes, bool no_flags = false, bool use_prefixq = false);
+
+  void emit_eevex_prefix_or_demote_arith_ndd(Register dst, Register nds, int32_t imm32, VexSimdPrefix pre, VexOpcode opc,
+                                             int size, int op1, int op2, bool no_flags);
+
+  void emit_eevex_or_demote(Register dst, Register src1, Address src2, VexSimdPrefix pre, VexOpcode opc,
+                            int size, int opcode_byte, bool no_flags = false, bool is_map1 = false);
+
+  void emit_eevex_or_demote(int dst_enc, int nds_enc, int src_enc, VexSimdPrefix pre, VexOpcode opc,
+                            int size, int opcode_byte, bool no_flags, bool is_map1 = false, bool swap = false);
+
+  void emit_eevex_or_demote(int dst_enc, int nds_enc, int src_enc, int8_t imm8, VexSimdPrefix pre, VexOpcode opc,
+                            int size, int opcode_byte, bool no_flags, bool is_map1 = false);
+
   void simd_prefix(XMMRegister xreg, XMMRegister nds, Address adr, VexSimdPrefix pre,
                    VexOpcode opc, InstructionAttr *attributes);
 
@@ -798,10 +815,10 @@ class Assembler : public AbstractAssembler  {
                              VexOpcode opc, InstructionAttr *attributes, bool src_is_gpr = false);
 
   // Helper functions for groups of instructions
+  bool is_demotable(bool no_flags, int dst_enc, int nds_enc);
   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);
+  void emit_arith(int op1, int op2, Register dst, int32_t imm32, bool optimize_rax_dst = true);
   // 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/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 3f126039684..152866e65f3 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -909,7 +909,7 @@ void VM_Version::get_processor_features() {
   }
 
   // Check if processor has Intel Ecore
-  if (FLAG_IS_DEFAULT(EnableX86ECoreOpts) && is_intel() && cpu_family() == 6 &&
+  if (FLAG_IS_DEFAULT(EnableX86ECoreOpts) && is_intel() && is_intel_server_family() &&
     (_model == 0x97 || _model == 0xAA || _model == 0xAC || _model == 0xAF ||
       _model == 0xCC || _model == 0xDD)) {
     FLAG_SET_DEFAULT(EnableX86ECoreOpts, true);
@@ -1594,7 +1594,7 @@ void VM_Version::get_processor_features() {
     if (FLAG_IS_DEFAULT(UseStoreImmI16)) {
       UseStoreImmI16 = false; // don't use it on Intel cpus
     }
-    if (cpu_family() == 6 || cpu_family() == 15) {
+    if (is_intel_server_family() || cpu_family() == 15) {
       if (FLAG_IS_DEFAULT(UseAddressNop)) {
         // Use it on all Intel cpus starting from PentiumPro
         UseAddressNop = true;
@@ -1610,7 +1610,7 @@ void VM_Version::get_processor_features() {
         UseXmmRegToRegMoveAll = false;
       }
     }
-    if (cpu_family() == 6 && supports_sse3()) { // New Intel cpus
+    if (is_intel_server_family() && supports_sse3()) { // New Intel cpus
 #ifdef COMPILER2
       if (FLAG_IS_DEFAULT(MaxLoopPad)) {
         // For new Intel cpus do the next optimization:
@@ -1848,7 +1848,7 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(AllocatePrefetchDistance, allocate_prefetch_distance(use_watermark_prefetch));
   }
 
-  if (is_intel() && cpu_family() == 6 && supports_sse3()) {
+  if (is_intel() && is_intel_server_family() && supports_sse3()) {
     if (FLAG_IS_DEFAULT(AllocatePrefetchLines) &&
         supports_sse4_2() && supports_ht()) { // Nehalem based cpus
       FLAG_SET_DEFAULT(AllocatePrefetchLines, 4);
@@ -3262,7 +3262,7 @@ int VM_Version::allocate_prefetch_distance(bool use_watermark_prefetch) {
       return 128; // Athlon
     }
   } else { // Intel
-    if (supports_sse3() && cpu_family() == 6) {
+    if (supports_sse3() && is_intel_server_family()) {
       if (supports_sse4_2() && supports_ht()) { // Nehalem based cpus
         return 192;
       } else if (use_watermark_prefetch) { // watermark prefetching on Core
@@ -3270,7 +3270,7 @@ int VM_Version::allocate_prefetch_distance(bool use_watermark_prefetch) {
       }
     }
     if (supports_sse2()) {
-      if (cpu_family() == 6) {
+      if (is_intel_server_family()) {
         return 256; // Pentium M, Core, Core2
       } else {
         return 512; // Pentium 4
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index a544eeb71b8..3c8971e474b 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -791,6 +791,7 @@ class VM_Version : public Abstract_VM_Version {
   static uint32_t cpu_stepping()          { return _cpuid_info.cpu_stepping(); }
   static int  cpu_family()        { return _cpu;}
   static bool is_P6()             { return cpu_family() >= 6; }
+  static bool is_intel_server_family()    { return cpu_family() == 6 || cpu_family() == 19; }
   static bool is_amd()            { assert_is_initialized(); return _cpuid_info.std_vendor_name_0 == 0x68747541; } // 'htuA'
   static bool is_hygon()          { assert_is_initialized(); return _cpuid_info.std_vendor_name_0 == 0x6F677948; } // 'ogyH'
   static bool is_amd_family()     { return is_amd() || is_hygon(); }
@@ -946,7 +947,7 @@ class VM_Version : public Abstract_VM_Version {
   }
 
   // Intel Core and newer cpus have fast IDIV instruction (excluding Atom).
-  static bool has_fast_idiv()     { return is_intel() && cpu_family() == 6 &&
+  static bool has_fast_idiv()     { return is_intel() && is_intel_server_family() &&
                                            supports_sse3() && _model != 0x1C; }
 
   static bool supports_compare_and_exchange() { return true; }
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 751e9bda513..22490ba7bb3 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -7052,21 +7052,6 @@ 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);
@@ -7370,21 +7355,6 @@ instruct addL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   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)));
@@ -8596,7 +8566,6 @@ instruct mulI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
 
 instruct mulI_rReg_imm(rRegI dst, rRegI src, immI imm, rFlagsReg cr)
 %{
-  predicate(!UseAPX);
   match(Set dst (MulI src imm));
   effect(KILL cr);
 
@@ -8608,20 +8577,6 @@ 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);
@@ -8652,7 +8607,6 @@ instruct mulI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
 
 instruct mulI_mem_imm(rRegI dst, memory src, immI imm, rFlagsReg cr)
 %{
-  predicate(!UseAPX);
   match(Set dst (MulI (LoadI src) imm));
   effect(KILL cr);
 
@@ -8664,20 +8618,6 @@ 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)));
@@ -8718,7 +8658,6 @@ instruct mulL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
 
 instruct mulL_rReg_imm(rRegL dst, rRegL src, immL32 imm, rFlagsReg cr)
 %{
-  predicate(!UseAPX);
   match(Set dst (MulL src imm));
   effect(KILL cr);
 
@@ -8730,20 +8669,6 @@ 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);
@@ -8774,7 +8699,6 @@ instruct mulL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
 
 instruct mulL_mem_imm(rRegL dst, memory src, immL32 imm, rFlagsReg cr)
 %{
-  predicate(!UseAPX);
   match(Set dst (MulL (LoadL src) imm));
   effect(KILL cr);
 
@@ -8786,20 +8710,6 @@ 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));
@@ -10689,21 +10599,6 @@ instruct xorI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr
   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)
 %{
@@ -10883,21 +10778,6 @@ instruct andL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   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)
 %{
@@ -11393,21 +11273,6 @@ instruct xorL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr
   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, $src2$$Register, false);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
 // Xor Memory with Register
 instruct xorL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
diff --git a/test/hotspot/gtest/x86/asmtest.out.h b/test/hotspot/gtest/x86/asmtest.out.h
index ac4a8a21aeb..a2071bafc20 100644
--- a/test/hotspot/gtest/x86/asmtest.out.h
+++ b/test/hotspot/gtest/x86/asmtest.out.h
@@ -191,547 +191,765 @@
     __ emull(Address(r22, r10, (Address::ScaleFactor)1, -0x3d379b56), false);   //    {EVEX}mul dword ptr [r22+r10*2-0x3d379b56]    IID177
     __ emull(Address(r11, -0x3249efaf), true);                                  //    {NF}mul dword ptr [r11-0x3249efaf]    IID178
     __ elzcntl(r9, r16, false);                                                 //    {EVEX}lzcnt r9d, r16d    IID179
-    __ elzcntl(r23, r28, true);                                                 //    {NF}lzcnt r23d, r28d    IID180
-    __ enegl(r8, r30, false);                                                   //    {EVEX}neg r8d, r30d    IID181
-    __ enegl(r23, r11, true);                                                   //    {NF}neg r23d, r11d    IID182
-    __ epopcntl(r13, r16, false);                                               //    {EVEX}popcnt r13d, r16d    IID183
-    __ epopcntl(r11, r11, true);                                                //    {NF}popcnt r11d, r11d    IID184
-    __ enotl(r26, rcx);                                                         //    {EVEX}not r26d, ecx    IID185
-    __ eroll(rbx, r10, false);                                                  //    {EVEX}rol ebx, r10d, cl    IID186
-    __ eroll(r14, r29, true);                                                   //    {NF}rol r14d, r29d, cl    IID187
-    __ erorl(r15, r20, false);                                                  //    {EVEX}ror r15d, r20d, cl    IID188
-    __ erorl(r17, r12, true);                                                   //    {NF}ror r17d, r12d, cl    IID189
-    __ esall(r12, rbx, false);                                                  //    {EVEX}sal r12d, ebx, cl    IID190
-    __ esall(r23, r27, true);                                                   //    {NF}sal r23d, r27d, cl    IID191
-    __ esarl(r29, r20, false);                                                  //    {EVEX}sar r29d, r20d, cl    IID192
-    __ esarl(r28, rdx, true);                                                   //    {NF}sar r28d, edx, cl    IID193
-    __ edecl(r8, r27, false);                                                   //    {EVEX}dec r8d, r27d    IID194
-    __ edecl(rbx, r15, true);                                                   //    {NF}dec ebx, r15d    IID195
-    __ eincl(r11, r27, false);                                                  //    {EVEX}inc r11d, r27d    IID196
-    __ eincl(r29, r25, true);                                                   //    {NF}inc r29d, r25d    IID197
-    __ eshll(r12, r8, false);                                                   //    {EVEX}shl r12d, r8d, cl    IID198
-    __ eshll(r11, r18, true);                                                   //    {NF}shl r11d, r18d, cl    IID199
-    __ eshrl(rdx, r13, false);                                                  //    {EVEX}shr edx, r13d, cl    IID200
-    __ eshrl(r23, r24, true);                                                   //    {NF}shr r23d, r24d, cl    IID201
-    __ etzcntl(r15, r15, false);                                                //    {EVEX}tzcnt r15d, r15d    IID202
-    __ etzcntl(r26, r28, true);                                                 //    {NF}tzcnt r26d, r28d    IID203
-    __ elzcntl(rbx, Address(r25, r14, (Address::ScaleFactor)0, +0x1c13fdb6), false); //    {EVEX}lzcnt ebx, dword ptr [r25+r14*1+0x1c13fdb6]    IID204
-    __ elzcntl(r9, Address(r31, r28, (Address::ScaleFactor)3, -0x30bf8b7f), true); //    {NF}lzcnt r9d, dword ptr [r31+r28*8-0x30bf8b7f]    IID205
-    __ enegl(r8, Address(r25, -0x9c80fe2), false);                              //    {EVEX}neg r8d, dword ptr [r25-0x9c80fe2]    IID206
-    __ enegl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true); //    {NF}neg r22d, dword ptr [r27+r19*4+0x38f27c09]    IID207
-    __ epopcntl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false); //    {EVEX}popcnt r21d, dword ptr [r14+r30*4+0x39f92c7b]    IID208
-    __ epopcntl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true); //    {NF}popcnt r26d, dword ptr [r23+r14*8-0x602e1b3d]    IID209
-    __ esall(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false); //    {EVEX}sal r25d, dword ptr [r28+r23*2+0x4ff120ef], cl    IID210
-    __ esall(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true); //    {NF}sal r29d, dword ptr [r24+r16*8-0x6821bb43], cl    IID211
-    __ esarl(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false); //    {EVEX}sar r23d, dword ptr [r11+r31*4+0x7f4224bb], cl    IID212
-    __ esarl(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true); //    {NF}sar r12d, dword ptr [r23+r31*2-0x28f87a8], cl    IID213
-    __ edecl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false); //    {EVEX}dec r19d, dword ptr [r16+r30*2-0x27b89e0d]    IID214
-    __ edecl(r26, Address(r25, +0x3d145d48), true);                             //    {NF}dec r26d, dword ptr [r25+0x3d145d48]    IID215
-    __ eincl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false); //    {EVEX}inc r13d, dword ptr [r27+r24*2+0x625f3862]    IID216
-    __ eincl(r11, Address(r22, +0x765904a6), true);                             //    {NF}inc r11d, dword ptr [r22+0x765904a6]    IID217
-    __ eshrl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false); //    {EVEX}shr r25d, dword ptr [rdx+r17*2-0x7d50376f], cl    IID218
-    __ eshrl(r22, Address(r12, -0x50325da9), true);                             //    {NF}shr r22d, dword ptr [r12-0x50325da9], cl    IID219
-    __ etzcntl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false); //    {EVEX}tzcnt r13d, dword ptr [r13+r20*1-0xbf3e86c]    IID220
-    __ etzcntl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true); //    {NF}tzcnt r26d, dword ptr [r14+r19*2-0x24c59cb9]    IID221
-    __ eaddl(r22, Address(r27, r31, (Address::ScaleFactor)2, -0x7f80902f), 1048576, false); //    {EVEX}add r22d, dword ptr [r27+r31*4-0x7f80902f], 1048576    IID222
-    __ eaddl(r31, Address(rdx, r21, (Address::ScaleFactor)3, -0x557cc036), 268435456, true); //    {NF}add r31d, dword ptr [rdx+r21*8-0x557cc036], 268435456    IID223
-    __ eandl(r10, Address(r26, +0x4e6bebf9), 4096, false);                      //    {EVEX}and r10d, dword ptr [r26+0x4e6bebf9], 4096    IID224
-    __ eandl(r13, Address(r30, +0x14f1a5fd), 256, true);                        //    {NF}and r13d, dword ptr [r30+0x14f1a5fd], 256    IID225
-    __ eimull(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false); //    {EVEX}imul r27d, dword ptr [r29+r8*1+0x37988799], 1    IID226
-    __ eimull(r27, Address(r9, -0x446d2dc1), 256, true);                        //    {NF}imul r27d, dword ptr [r9-0x446d2dc1], 256    IID227
-    __ eorl(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false); //    {EVEX}or r17d, dword ptr [r20+r25*1+0x4957b5db], 16    IID228
-    __ eorl(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true); //    {NF}or r25d, dword ptr [r29+r31*2+0x3c26a53e], 1    IID229
-    __ eorb(r15, Address(r9, -0x25974a1e), 64, false);                          //    {EVEX}or r15b, byte ptr [r9-0x25974a1e], 64    IID230
-    __ eorb(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4, true); //    {NF}or r11b, byte ptr [r16+r15*4+0x66a0329f], 4    IID231
-    __ esall(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false); //    {EVEX}sal ecx, dword ptr [rcx+r27*1+0x38c6485e], 1    IID232
-    __ esall(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 8, true); //    {NF}sal r25d, dword ptr [r8+r10*1+0x79131c34], 8    IID233
-    __ esarl(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false); //    {EVEX}sar r13d, dword ptr [r9+r31*4+0x12718ba9], 2    IID234
-    __ esarl(r15, Address(r25, -0x505836f3), 16, true);                         //    {NF}sar r15d, dword ptr [r25-0x505836f3], 16    IID235
-    __ eshrl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false); //    {EVEX}shr r15d, dword ptr [rcx+r19*1+0xc5c1510], 1    IID236
-    __ eshrl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true); //    {NF}shr r13d, dword ptr [r29+r21*4-0x6c67309c], 8    IID237
-    __ esubl(rbx, Address(r12, r8, (Address::ScaleFactor)1, -0x3575087f), 4096, false); //    {EVEX}sub ebx, dword ptr [r12+r8*2-0x3575087f], 4096    IID238
-    __ esubl(r28, Address(rbx, r21, (Address::ScaleFactor)3, -0x55f83db8), 65536, true); //    {NF}sub r28d, dword ptr [rbx+r21*8-0x55f83db8], 65536    IID239
-    __ exorl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false); //    {EVEX}xor r30d, dword ptr [r21+r26*1+0x3b4d14e1], 1    IID240
-    __ exorl(r28, Address(r18, -0x452348a1), 16777216, true);                   //    {NF}xor r28d, dword ptr [r18-0x452348a1], 16777216    IID241
-    __ eaddl(r18, Address(rdx, r10, (Address::ScaleFactor)2, -0x161e1d47), r16, false); //    {EVEX}add r18d, dword ptr [rdx+r10*4-0x161e1d47], r16d    IID242
-    __ eaddl(r27, Address(r25, r18, (Address::ScaleFactor)3, -0x679bb823), rdx, true); //    {NF}add r27d, dword ptr [r25+r18*8-0x679bb823], edx    IID243
-    __ eorl(r27, Address(r31, r29, (Address::ScaleFactor)3, +0x19ed7934), r9, false); //    {EVEX}or r27d, dword ptr [r31+r29*8+0x19ed7934], r9d    IID244
-    __ eorl(r22, Address(r8, r16, (Address::ScaleFactor)2, -0x1bf71f78), r17, true); //    {NF}or r22d, dword ptr [r8+r16*4-0x1bf71f78], r17d    IID245
-    __ eorb(rcx, Address(r15, r28, (Address::ScaleFactor)3, -0x6a4a3934), r16, false); //    {EVEX}or cl, byte ptr [r15+r28*8-0x6a4a3934], r16b    IID246
-    __ eorb(r28, Address(r23, r12, (Address::ScaleFactor)2, +0x3c2449f7), r16, true); //    {NF}or r28b, byte ptr [r23+r12*4+0x3c2449f7], r16b    IID247
-    __ esubl(r22, Address(r27, r10, (Address::ScaleFactor)1, -0x3c29396f), r9, false); //    {EVEX}sub r22d, dword ptr [r27+r10*2-0x3c29396f], r9d    IID248
-    __ esubl(r10, Address(r16, -0x165064ff), r17, true);                        //    {NF}sub r10d, dword ptr [r16-0x165064ff], r17d    IID249
-    __ exorl(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false); //    {EVEX}xor r28d, dword ptr [r30+r11*1+0x17281e3a], r20d    IID250
-    __ exorl(rdx, Address(rbx, r31, (Address::ScaleFactor)3, +0x7753d0dc), r17, true); //    {NF}xor edx, dword ptr [rbx+r31*8+0x7753d0dc], r17d    IID251
-    __ exorb(r9, Address(r31, +0x72a4f58e), r30, false);                        //    {EVEX}xor r9b, byte ptr [r31+0x72a4f58e], r30b    IID252
-    __ exorb(r24, Address(r25, r15, (Address::ScaleFactor)0, +0x20fc1a0a), r16, true); //    {NF}xor r24b, byte ptr [r25+r15*1+0x20fc1a0a], r16b    IID253
-    __ eaddl(r12, rbx, 65536, false);                                           //    {EVEX}add r12d, ebx, 65536    IID254
-    __ eaddl(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
+    __ elzcntl(r23, r23, false);                                                //    {EVEX}lzcnt r23d, r23d    IID180
+    __ elzcntl(r28, r8, true);                                                  //    {NF}lzcnt r28d, r8d    IID181
+    __ elzcntl(r30, r30, true);                                                 //    {NF}lzcnt r30d, r30d    IID182
+    __ enegl(r23, r11, false);                                                  //    {EVEX}neg r23d, r11d    IID183
+    __ enegl(r13, r13, false);                                                  //    neg r13d    IID184
+    __ enegl(r16, r11, true);                                                   //    {NF}neg r16d, r11d    IID185
+    __ enegl(r11, r11, true);                                                   //    {NF}neg r11d, r11d    IID186
+    __ epopcntl(r26, rcx, false);                                               //    {EVEX}popcnt r26d, ecx    IID187
 #endif // _LP64
-    __ esubl(rax, rbx, 16777216, true);                                         //    {NF}sub eax, ebx, 16777216    IID299
+    __ epopcntl(rbx, rbx, false);                                               //    {EVEX}popcnt ebx, ebx    IID188
 #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
+    __ epopcntl(r10, r14, true);                                                //    {NF}popcnt r10d, r14d    IID189
+    __ epopcntl(r29, r29, true);                                                //    {NF}popcnt r29d, r29d    IID190
+    __ enotl(r15, r20);                                                         //    {EVEX}not r15d, r20d    IID191
+    __ enotl(r17, r17);                                                         //    not r17d    IID192
+    __ eroll(r12, r12, false);                                                  //    rol r12d, cl    IID193
 #endif // _LP64
+    __ eroll(rbx, rbx, false);                                                  //    rol ebx, cl    IID194
 #ifdef _LP64
-    __ 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
+    __ eroll(r23, r27, true);                                                   //    {NF}rol r23d, r27d, cl    IID195
+    __ eroll(r29, r29, true);                                                   //    {NF}rol r29d, r29d, cl    IID196
+    __ erorl(r20, r28, false);                                                  //    {EVEX}ror r20d, r28d, cl    IID197
+#endif // _LP64
+    __ erorl(rdx, rdx, false);                                                  //    ror edx, cl    IID198
+#ifdef _LP64
+    __ erorl(r8, r27, true);                                                    //    {NF}ror r8d, r27d, cl    IID199
+#endif // _LP64
+    __ erorl(rbx, rbx, true);                                                   //    {NF}ror ebx, ebx, cl    IID200
+#ifdef _LP64
+    __ esall(r15, r11, false);                                                  //    {EVEX}sal r15d, r11d, cl    IID201
+    __ esall(r27, r27, false);                                                  //    sal r27d, cl    IID202
+    __ esall(r29, r25, true);                                                   //    {NF}sal r29d, r25d, cl    IID203
+    __ esall(r12, r12, true);                                                   //    {NF}sal r12d, r12d, cl    IID204
+    __ esarl(r8, r11, false);                                                   //    {EVEX}sar r8d, r11d, cl    IID205
+    __ esarl(r18, r18, false);                                                  //    sar r18d, cl    IID206
+    __ esarl(rdx, r13, true);                                                   //    {NF}sar edx, r13d, cl    IID207
+    __ esarl(r23, r23, true);                                                   //    {NF}sar r23d, r23d, cl    IID208
+    __ edecl(r24, r15, false);                                                  //    {EVEX}dec r24d, r15d    IID209
+    __ edecl(r15, r15, false);                                                  //    dec r15d    IID210
+    __ edecl(r26, r28, true);                                                   //    {NF}dec r26d, r28d    IID211
+#endif // _LP64
+    __ edecl(rbx, rbx, true);                                                   //    {NF}dec ebx, ebx    IID212
+#ifdef _LP64
+    __ eincl(r25, r14, false);                                                  //    {EVEX}inc r25d, r14d    IID213
+    __ eincl(r12, r12, false);                                                  //    inc r12d    IID214
+    __ eincl(rcx, r23, true);                                                   //    {NF}inc ecx, r23d    IID215
+    __ eincl(r29, r29, true);                                                   //    {NF}inc r29d, r29d    IID216
+    __ eshll(r22, r24, false);                                                  //    {EVEX}shl r22d, r24d, cl    IID217
+    __ eshll(r15, r15, false);                                                  //    shl r15d, cl    IID218
+    __ eshll(r9, r31, true);                                                    //    {NF}shl r9d, r31d, cl    IID219
+    __ eshll(r28, r28, true);                                                   //    {NF}shl r28d, r28d, cl    IID220
+    __ eshrl(r21, r18, false);                                                  //    {EVEX}shr r21d, r18d, cl    IID221
+    __ eshrl(r24, r24, false);                                                  //    shr r24d, cl    IID222
+    __ eshrl(r14, r19, true);                                                   //    {NF}shr r14d, r19d, cl    IID223
+    __ eshrl(r8, r8, true);                                                     //    {NF}shr r8d, r8d, cl    IID224
+    __ etzcntl(r25, r9, false);                                                 //    {EVEX}tzcnt r25d, r9d    IID225
+    __ etzcntl(r26, r26, false);                                                //    {EVEX}tzcnt r26d, r26d    IID226
+    __ etzcntl(r8, r30, true);                                                  //    {NF}tzcnt r8d, r30d    IID227
+    __ etzcntl(r26, r26, true);                                                 //    {NF}tzcnt r26d, r26d    IID228
+    __ elzcntl(r29, Address(r25, r20, (Address::ScaleFactor)3, -0x9c80fe2), false); //    {EVEX}lzcnt r29d, dword ptr [r25+r20*8-0x9c80fe2]    IID229
+    __ elzcntl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true); //    {NF}lzcnt r22d, dword ptr [r27+r19*4+0x38f27c09]    IID230
+    __ enegl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false); //    {EVEX}neg r21d, dword ptr [r14+r30*4+0x39f92c7b]    IID231
+    __ enegl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true); //    {NF}neg r26d, dword ptr [r23+r14*8-0x602e1b3d]    IID232
+    __ epopcntl(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false); //    {EVEX}popcnt r25d, dword ptr [r28+r23*2+0x4ff120ef]    IID233
+    __ epopcntl(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true); //    {NF}popcnt r29d, dword ptr [r24+r16*8-0x6821bb43]    IID234
+    __ esall(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false); //    {EVEX}sal r23d, dword ptr [r11+r31*4+0x7f4224bb], cl    IID235
+    __ esall(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true); //    {NF}sal r12d, dword ptr [r23+r31*2-0x28f87a8], cl    IID236
+    __ esarl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false); //    {EVEX}sar r19d, dword ptr [r16+r30*2-0x27b89e0d], cl    IID237
+    __ esarl(r26, Address(r25, +0x3d145d48), true);                             //    {NF}sar r26d, dword ptr [r25+0x3d145d48], cl    IID238
+    __ edecl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false); //    {EVEX}dec r13d, dword ptr [r27+r24*2+0x625f3862]    IID239
+    __ edecl(r11, Address(r22, +0x765904a6), true);                             //    {NF}dec r11d, dword ptr [r22+0x765904a6]    IID240
+    __ eincl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false); //    {EVEX}inc r25d, dword ptr [rdx+r17*2-0x7d50376f]    IID241
+    __ eincl(r22, Address(r12, -0x50325da9), true);                             //    {NF}inc r22d, dword ptr [r12-0x50325da9]    IID242
+    __ eshrl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false); //    {EVEX}shr r13d, dword ptr [r13+r20*1-0xbf3e86c], cl    IID243
+    __ eshrl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true); //    {NF}shr r26d, dword ptr [r14+r19*2-0x24c59cb9], cl    IID244
+    __ etzcntl(r16, Address(r22, r27, (Address::ScaleFactor)2, -0x7f80902f), false); //    {EVEX}tzcnt r16d, dword ptr [r22+r27*4-0x7f80902f]    IID245
+    __ etzcntl(r20, Address(r31, rdx, (Address::ScaleFactor)3, +0x12254818), true); //    {NF}tzcnt r20d, dword ptr [r31+rdx*8+0x12254818]    IID246
+    __ eaddl(r21, Address(r12, r10, (Address::ScaleFactor)3, +0x6417cf06), 1048576, false); //    {EVEX}add r21d, dword ptr [r12+r10*8+0x6417cf06], 1048576    IID247
+    __ eaddl(r9, Address(r13, +0x14f1a5fd), 4096, true);                        //    {NF}add r9d, dword ptr [r13+0x14f1a5fd], 4096    IID248
+    __ eandl(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false); //    {EVEX}and r27d, dword ptr [r29+r8*1+0x37988799], 1    IID249
+    __ eandl(r27, Address(r9, -0x446d2dc1), 256, true);                         //    {NF}and r27d, dword ptr [r9-0x446d2dc1], 256    IID250
+    __ eimull(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false); //    {EVEX}imul r17d, dword ptr [r20+r25*1+0x4957b5db], 16    IID251
+    __ eimull(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true); //    {NF}imul r25d, dword ptr [r29+r31*2+0x3c26a53e], 1    IID252
+    __ eorl(r15, Address(r9, -0x25974a1e), 268435456, false);                   //    {EVEX}or r15d, dword ptr [r9-0x25974a1e], 268435456    IID253
+    __ eorl(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4096, true); //    {NF}or r11d, dword ptr [r16+r15*4+0x66a0329f], 4096    IID254
+    __ eorb(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false); //    {EVEX}or cl, byte ptr [rcx+r27*1+0x38c6485e], 1    IID255
+    __ eorb(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 64, true); //    {NF}or r25b, byte ptr [r8+r10*1+0x79131c34], 64    IID256
+    __ esall(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false); //    {EVEX}sal r13d, dword ptr [r9+r31*4+0x12718ba9], 2    IID257
+    __ esall(r15, Address(r25, -0x505836f3), 16, true);                         //    {NF}sal r15d, dword ptr [r25-0x505836f3], 16    IID258
+    __ esarl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false); //    {EVEX}sar r15d, dword ptr [rcx+r19*1+0xc5c1510], 1    IID259
+    __ esarl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true); //    {NF}sar r13d, dword ptr [r29+r21*4-0x6c67309c], 8    IID260
+    __ eshrl(r11, Address(rbx, +0x749f67d0), 16, false);                        //    {EVEX}shr r11d, dword ptr [rbx+0x749f67d0], 16    IID261
+    __ eshrl(r14, Address(r14, -0x55f83db8), 4, true);                          //    {NF}shr r14d, dword ptr [r14-0x55f83db8], 4    IID262
+    __ esubl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false); //    {EVEX}sub r30d, dword ptr [r21+r26*1+0x3b4d14e1], 1    IID263
+    __ esubl(r28, Address(r18, -0x452348a1), 16777216, true);                   //    {NF}sub r28d, dword ptr [r18-0x452348a1], 16777216    IID264
+    __ exorl(rdx, Address(r10, r16, (Address::ScaleFactor)2, -0x161e1d47), 16777216, false); //    {EVEX}xor edx, dword ptr [r10+r16*4-0x161e1d47], 16777216    IID265
+    __ exorl(rdx, Address(r29, r23, (Address::ScaleFactor)1, +0x1b34e2f8), 16777216, true); //    {NF}xor edx, dword ptr [r29+r23*2+0x1b34e2f8], 16777216    IID266
+    __ eaddl(r19, Address(r27, r31, (Address::ScaleFactor)0, +0x1f3ce7d8), r29, false); //    {EVEX}add r19d, dword ptr [r27+r31*1+0x1f3ce7d8], r29d    IID267
+    __ eaddl(r28, Address(r24, rcx, (Address::ScaleFactor)3, -0x6053edc2), r28, false); //    {EVEX}add r28d, dword ptr [r24+rcx*8-0x6053edc2], r28d    IID268
+    __ eaddl(r17, Address(r18, r24, (Address::ScaleFactor)3, -0x1bf71f78), r29, true); //    {NF}add r17d, dword ptr [r18+r24*8-0x1bf71f78], r29d    IID269
+    __ eaddl(rcx, Address(r15, r28, (Address::ScaleFactor)1, +0x15b8216), rcx, true); //    {NF}add ecx, dword ptr [r15+r28*2+0x15b8216], ecx    IID270
+    __ eorl(r30, Address(rbx, rdx, (Address::ScaleFactor)3, -0x463540b4), r28, false); //    {EVEX}or r30d, dword ptr [rbx+rdx*8-0x463540b4], r28d    IID271
+    __ eorl(r18, Address(r28, r10, (Address::ScaleFactor)3, +0x3523a73b), r18, false); //    {EVEX}or r18d, dword ptr [r28+r10*8+0x3523a73b], r18d    IID272
+    __ eorl(r9, Address(r15, r15, (Address::ScaleFactor)1, -0x2a0bdd56), r21, true); //    {NF}or r9d, dword ptr [r15+r15*2-0x2a0bdd56], r21d    IID273
+    __ eorl(r16, Address(r23, -0x165064ff), r16, true);                         //    {NF}or r16d, dword ptr [r23-0x165064ff], r16d    IID274
+    __ eorb(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false); //    {EVEX}or r28b, byte ptr [r30+r11*1+0x17281e3a], r20b    IID275
+    __ eorb(rdx, Address(rbx, r31, (Address::ScaleFactor)2, +0x2477b5bb), rdx, false); //    {EVEX}or dl, byte ptr [rbx+r31*4+0x2477b5bb], dl    IID276
+    __ eorb(r16, Address(r11, rcx, (Address::ScaleFactor)1, -0x3175d1af), r24, true); //    {NF}or r16b, byte ptr [r11+rcx*2-0x3175d1af], r24b    IID277
+    __ eorb(rbx, Address(r11, r20, (Address::ScaleFactor)3, -0x22d67bd3), rbx, true); //    {NF}or bl, byte ptr [r11+r20*8-0x22d67bd3], bl    IID278
+    __ esubl(r26, Address(r27, r30, (Address::ScaleFactor)1, -0x3d9bce2e), rdx, false); //    {EVEX}sub r26d, dword ptr [r27+r30*2-0x3d9bce2e], edx    IID279
+    __ esubl(r31, Address(r22, r29, (Address::ScaleFactor)1, +0x14218519), r31, false); //    {EVEX}sub r31d, dword ptr [r22+r29*2+0x14218519], r31d    IID280
+    __ esubl(r21, Address(r9, -0x1050127a), r13, true);                         //    {NF}sub r21d, dword ptr [r9-0x1050127a], r13d    IID281
+    __ esubl(r31, Address(r9, r8, (Address::ScaleFactor)0, -0xae18961), r31, true); //    {NF}sub r31d, dword ptr [r9+r8*1-0xae18961], r31d    IID282
+    __ exorl(r15, Address(r18, +0x5c2bbce5), r12, false);                       //    {EVEX}xor r15d, dword ptr [r18+0x5c2bbce5], r12d    IID283
+    __ exorl(r27, Address(r25, r23, (Address::ScaleFactor)0, +0x5c6078b3), r27, false); //    {EVEX}xor r27d, dword ptr [r25+r23*1+0x5c6078b3], r27d    IID284
+    __ exorl(r18, Address(r8, rdx, (Address::ScaleFactor)3, -0x9ed3881), r14, true); //    {NF}xor r18d, dword ptr [r8+rdx*8-0x9ed3881], r14d    IID285
+    __ exorl(r9, Address(r15, +0x775acdad), r9, true);                          //    {NF}xor r9d, dword ptr [r15+0x775acdad], r9d    IID286
+    __ exorb(r21, Address(r18, r26, (Address::ScaleFactor)1, +0x2fe31fd5), r23, false); //    {EVEX}xor r21b, byte ptr [r18+r26*2+0x2fe31fd5], r23b    IID287
+    __ exorb(r10, Address(r27, +0xa3150de), r10, false);                        //    {EVEX}xor r10b, byte ptr [r27+0xa3150de], r10b    IID288
+    __ exorb(r18, Address(r22, r30, (Address::ScaleFactor)3, +0x1ad4e897), r24, true); //    {NF}xor r18b, byte ptr [r22+r30*8+0x1ad4e897], r24b    IID289
+    __ exorb(r8, Address(r16, r20, (Address::ScaleFactor)0, +0x626eae82), r8, true); //    {NF}xor r8b, byte ptr [r16+r20*1+0x626eae82], r8b    IID290
+    __ eaddl(r21, r15, 1048576, false);                                         //    {EVEX}add r21d, r15d, 1048576    IID291
+    __ eaddl(rax, r18, 1048576, false);                                         //    {EVEX}add eax, r18d, 1048576    IID292
+    __ eaddl(r18, r18, 256, false);                                             //    add r18d, 256    IID293
+    __ eaddl(r13, r19, 16, true);                                               //    {NF}add r13d, r19d, 16    IID294
+    __ eaddl(rax, r23, 16, true);                                               //    {NF}add eax, r23d, 16    IID295
+    __ eaddl(r25, r25, 16777216, true);                                         //    {NF}add r25d, r25d, 16777216    IID296
+    __ eandl(r29, r18, 1048576, false);                                         //    {EVEX}and r29d, r18d, 1048576    IID297
+    __ eandl(rax, r14, 1048576, false);                                         //    {EVEX}and eax, r14d, 1048576    IID298
+    __ eandl(r19, r19, 65536, false);                                           //    and r19d, 65536    IID299
+    __ eandl(r27, r25, 1048576, true);                                          //    {NF}and r27d, r25d, 1048576    IID300
+    __ eandl(rax, r20, 1048576, true);                                          //    {NF}and eax, r20d, 1048576    IID301
+    __ eandl(r28, r28, 16, true);                                               //    {NF}and r28d, r28d, 16    IID302
+    __ eimull(r31, r22, 4096, false);                                           //    {EVEX}imul r31d, r22d, 4096    IID303
+#endif // _LP64
+    __ eimull(rax, rbx, 4096, false);                                           //    {EVEX}imul eax, ebx, 4096    IID304
+#ifdef _LP64
+    __ eimull(r24, r24, 1048576, false);                                        //    {EVEX}imul r24d, r24d, 1048576    IID305
+    __ eimull(r21, r16, 65536, true);                                           //    {NF}imul r21d, r16d, 65536    IID306
+    __ eimull(rax, r24, 65536, true);                                           //    {NF}imul eax, r24d, 65536    IID307
+    __ eimull(r13, r13, 16, true);                                              //    {NF}imul r13d, r13d, 16    IID308
+    __ eorl(r29, r8, 16777216, false);                                          //    {EVEX}or r29d, r8d, 16777216    IID309
+    __ eorl(rax, r12, 16777216, false);                                         //    {EVEX}or eax, r12d, 16777216    IID310
+    __ eorl(r30, r30, 4096, false);                                             //    or r30d, 4096    IID311
+    __ eorl(r24, rdx, 16, true);                                                //    {NF}or r24d, edx, 16    IID312
+    __ eorl(rax, r8, 16, true);                                                 //    {NF}or eax, r8d, 16    IID313
+    __ eorl(r13, r13, 4096, true);                                              //    {NF}or r13d, r13d, 4096    IID314
+    __ ercll(r25, r13, 1);                                                      //    {EVEX}rcl r25d, r13d, 1    IID315
+    __ ercll(rax, r18, 1);                                                      //    {EVEX}rcl eax, r18d, 1    IID316
+    __ ercll(r9, r9, 16);                                                       //    rcl r9d, 16    IID317
+    __ eroll(r26, r25, 8, false);                                               //    {EVEX}rol r26d, r25d, 8    IID318
+#endif // _LP64
+    __ eroll(rax, rdx, 8, false);                                               //    {EVEX}rol eax, edx, 8    IID319
+#ifdef _LP64
+    __ eroll(r24, r24, 16, false);                                              //    rol r24d, 16    IID320
+    __ eroll(r24, rcx, 8, true);                                                //    {NF}rol r24d, ecx, 8    IID321
+    __ eroll(rax, r30, 8, true);                                                //    {NF}rol eax, r30d, 8    IID322
+    __ eroll(r28, r28, 16, true);                                               //    {NF}rol r28d, r28d, 16    IID323
+    __ erorl(r17, r28, 4, false);                                               //    {EVEX}ror r17d, r28d, 4    IID324
+#endif // _LP64
+    __ erorl(rax, rdx, 4, false);                                               //    {EVEX}ror eax, edx, 4    IID325
+#ifdef _LP64
+    __ erorl(r8, r8, 16, false);                                                //    ror r8d, 16    IID326
+    __ erorl(r19, rdx, 16, true);                                               //    {NF}ror r19d, edx, 16    IID327
+    __ erorl(rax, r31, 16, true);                                               //    {NF}ror eax, r31d, 16    IID328
+    __ erorl(r22, r22, 8, true);                                                //    {NF}ror r22d, r22d, 8    IID329
+    __ esall(r23, r25, 16, false);                                              //    {EVEX}sal r23d, r25d, 16    IID330
+    __ esall(rax, r14, 16, false);                                              //    {EVEX}sal eax, r14d, 16    IID331
+    __ esall(r31, r31, 8, false);                                               //    sal r31d, 8    IID332
+    __ esall(r30, r24, 2, true);                                                //    {NF}sal r30d, r24d, 2    IID333
+    __ esall(rax, r29, 2, true);                                                //    {NF}sal eax, r29d, 2    IID334
+    __ esall(r8, r8, 2, true);                                                  //    {NF}sal r8d, r8d, 2    IID335
+    __ esarl(r18, r24, 16, false);                                              //    {EVEX}sar r18d, r24d, 16    IID336
+    __ esarl(rax, r13, 16, false);                                              //    {EVEX}sar eax, r13d, 16    IID337
+    __ esarl(r24, r24, 1, false);                                               //    sar r24d, 1    IID338
+    __ esarl(r28, r17, 16, true);                                               //    {NF}sar r28d, r17d, 16    IID339
+    __ esarl(rax, r24, 16, true);                                               //    {NF}sar eax, r24d, 16    IID340
+    __ esarl(r17, r17, 4, true);                                                //    {NF}sar r17d, r17d, 4    IID341
+    __ eshll(r24, rcx, 4, false);                                               //    {EVEX}shl r24d, ecx, 4    IID342
+    __ eshll(rax, r16, 4, false);                                               //    {EVEX}shl eax, r16d, 4    IID343
+    __ eshll(r15, r15, 2, false);                                               //    shl r15d, 2    IID344
+    __ eshll(r14, r27, 4, true);                                                //    {NF}shl r14d, r27d, 4    IID345
+    __ eshll(rax, r23, 4, true);                                                //    {NF}shl eax, r23d, 4    IID346
+    __ eshll(r30, r30, 4, true);                                                //    {NF}shl r30d, r30d, 4    IID347
+    __ eshrl(r27, rdx, 2, false);                                               //    {EVEX}shr r27d, edx, 2    IID348
+    __ eshrl(rax, r19, 2, false);                                               //    {EVEX}shr eax, r19d, 2    IID349
+    __ eshrl(r20, r20, 2, false);                                               //    shr r20d, 2    IID350
+    __ eshrl(r21, r23, 1, true);                                                //    {NF}shr r21d, r23d, 1    IID351
+    __ eshrl(rax, r30, 1, true);                                                //    {NF}shr eax, r30d, 1    IID352
+    __ eshrl(r25, r25, 2, true);                                                //    {NF}shr r25d, r25d, 2    IID353
+    __ esubl(r24, r19, 1048576, false);                                         //    {EVEX}sub r24d, r19d, 1048576    IID354
+    __ esubl(rax, r14, 1048576, false);                                         //    {EVEX}sub eax, r14d, 1048576    IID355
+    __ esubl(r22, r22, 268435456, false);                                       //    sub r22d, 268435456    IID356
+    __ esubl(r24, r24, 65536, true);                                            //    {NF}sub r24d, r24d, 65536    IID357
+    __ esubl(rax, r14, 65536, true);                                            //    {NF}sub eax, r14d, 65536    IID358
+    __ esubl(r28, r28, 268435456, true);                                        //    {NF}sub r28d, r28d, 268435456    IID359
+    __ exorl(rbx, r20, 256, false);                                             //    {EVEX}xor ebx, r20d, 256    IID360
+    __ exorl(rax, r15, 256, false);                                             //    {EVEX}xor eax, r15d, 256    IID361
+#endif // _LP64
+    __ exorl(rbx, rbx, 4096, false);                                            //    xor ebx, 4096    IID362
+#ifdef _LP64
+    __ exorl(r24, r30, 65536, true);                                            //    {NF}xor r24d, r30d, 65536    IID363
+    __ exorl(rax, r31, 65536, true);                                            //    {NF}xor eax, r31d, 65536    IID364
+    __ exorl(r31, r31, 4096, true);                                             //    {NF}xor r31d, r31d, 4096    IID365
+    __ esubl_imm32(r20, r10, 1048576, false);                                   //    {EVEX}sub r20d, r10d, 1048576    IID366
+    __ esubl_imm32(rax, r13, 1048576, false);                                   //    {EVEX}sub eax, r13d, 1048576    IID367
+    __ esubl_imm32(r25, r25, 1048576, false);                                   //    sub r25d, 1048576    IID368
+    __ esubl_imm32(r23, r12, 1073741824, true);                                 //    {NF}sub r23d, r12d, 1073741824    IID369
+    __ esubl_imm32(rax, r16, 1073741824, true);                                 //    {NF}sub eax, r16d, 1073741824    IID370
+    __ esubl_imm32(r31, r31, 65536, true);                                      //    {NF}sub r31d, r31d, 65536    IID371
+    __ eaddl(r17, r13, Address(r9, +0x7fef2f98), false);                        //    {EVEX}add r17d, r13d, dword ptr [r9+0x7fef2f98]    IID372
+    __ eaddl(r29, r8, Address(r22, -0x4df70aac), true);                         //    {NF}add r29d, r8d, dword ptr [r22-0x4df70aac]    IID373
+    __ eandl(r13, r17, Address(r12, r15, (Address::ScaleFactor)3, +0x50a8a902), false); //    {EVEX}and r13d, r17d, dword ptr [r12+r15*8+0x50a8a902]    IID374
+    __ eandl(r22, r25, Address(r26, r10, (Address::ScaleFactor)2, +0x70ea2754), true); //    {NF}and r22d, r25d, dword ptr [r26+r10*4+0x70ea2754]    IID375
+    __ eimull(r19, r12, Address(r30, r8, (Address::ScaleFactor)0, +0x6a1a0a73), false); //    {EVEX}imul r19d, r12d, dword ptr [r30+r8*1+0x6a1a0a73]    IID376
+    __ eimull(r30, r18, Address(r18, r19, (Address::ScaleFactor)2, -0x7fcd28c7), true); //    {NF}imul r30d, r18d, dword ptr [r18+r19*4-0x7fcd28c7]    IID377
+    __ eorl(r16, r31, Address(r25, r11, (Address::ScaleFactor)3, +0x482d5dbc), false); //    {EVEX}or r16d, r31d, dword ptr [r25+r11*8+0x482d5dbc]    IID378
+    __ eorl(r9, r27, Address(r11, +0x43d5ee01), true);                          //    {NF}or r9d, r27d, dword ptr [r11+0x43d5ee01]    IID379
+    __ esubl(rcx, r23, Address(r21, r15, (Address::ScaleFactor)2, +0x2825c2bc), false); //    {EVEX}sub ecx, r23d, dword ptr [r21+r15*4+0x2825c2bc]    IID380
+    __ esubl(r27, r22, Address(r13, r15, (Address::ScaleFactor)1, +0x771f0da7), true); //    {NF}sub r27d, r22d, dword ptr [r13+r15*2+0x771f0da7]    IID381
+    __ exorl(r9, r30, Address(r9, r22, (Address::ScaleFactor)3, -0x4ad6c88e), false); //    {EVEX}xor r9d, r30d, dword ptr [r9+r22*8-0x4ad6c88e]    IID382
+    __ exorl(r11, r16, Address(rbx, r28, (Address::ScaleFactor)2, +0xb0223ee), true); //    {NF}xor r11d, r16d, dword ptr [rbx+r28*4+0xb0223ee]    IID383
+    __ exorb(r15, r29, Address(r15, r28, (Address::ScaleFactor)1, -0x1f297a69), false); //    {EVEX}xor r15b, r29b, byte ptr [r15+r28*2-0x1f297a69]    IID384
+    __ exorb(r17, r30, Address(r23, rbx, (Address::ScaleFactor)1, +0xadc7545), true); //    {NF}xor r17b, r30b, byte ptr [r23+rbx*2+0xadc7545]    IID385
+    __ exorw(r27, r9, Address(rdx, r22, (Address::ScaleFactor)2, -0x43d90f61), false); //    {EVEX}xor r27w, r9w, word ptr [rdx+r22*4-0x43d90f61]    IID386
+    __ exorw(rbx, r22, Address(r28, r22, (Address::ScaleFactor)0, -0x7d30a0b1), true); //    {NF}xor bx, r22w, word ptr [r28+r22*1-0x7d30a0b1]    IID387
+    __ eaddl(r14, r24, rcx, false);                                             //    {load}{EVEX}add r14d, r24d, ecx    IID388
+    __ eaddl(r8, r8, r17, false);                                               //    {load}add r8d, r17d    IID389
+    __ eaddl(r26, r24, r12, true);                                              //    {load}{NF}add r26d, r24d, r12d    IID390
+    __ eaddl(r24, r24, r23, true);                                              //    {load}{NF}add r24d, r24d, r23d    IID391
+    __ eandl(r13, r26, r31, false);                                             //    {load}{EVEX}and r13d, r26d, r31d    IID392
+    __ eandl(r11, r11, r8, false);                                              //    {load}and r11d, r8d    IID393
+    __ eandl(rcx, r19, r15, true);                                              //    {load}{NF}and ecx, r19d, r15d    IID394
+    __ eandl(r12, r12, r12, true);                                              //    {load}{NF}and r12d, r12d, r12d    IID395
+    __ eimull(r22, r20, r19, false);                                            //    {load}{EVEX}imul r22d, r20d, r19d    IID396
+    __ eimull(r8, r8, rdx, false);                                              //    {load}imul r8d, edx    IID397
+    __ eimull(r22, r27, r23, true);                                             //    {load}{NF}imul r22d, r27d, r23d    IID398
+    __ eimull(r9, r9, r18, true);                                               //    {load}{NF}imul r9d, r9d, r18d    IID399
+    __ eorw(rcx, r30, r13, false);                                              //    {load}{EVEX}or cx, r30w, r13w    IID400
+    __ eorw(r28, r28, r19, false);                                              //    {load}or r28w, r19w    IID401
+    __ eorw(r12, r30, r27, true);                                               //    {load}{NF}or r12w, r30w, r27w    IID402
+    __ eorw(r8, r8, r22, true);                                                 //    {load}{NF}or r8w, r8w, r22w    IID403
+    __ eorl(r16, rcx, r30, false);                                              //    {load}{EVEX}or r16d, ecx, r30d    IID404
+    __ eorl(r10, r10, r25, false);                                              //    {load}or r10d, r25d    IID405
+    __ eorl(r15, r17, r17, true);                                               //    {load}{NF}or r15d, r17d, r17d    IID406
+    __ eorl(r9, r9, r30, true);                                                 //    {load}{NF}or r9d, r9d, r30d    IID407
+    __ eshldl(r20, r21, r8, false);                                             //    {load}{EVEX}shld r20d, r21d, r8d, cl    IID408
+    __ eshldl(r26, r26, r14, false);                                            //    {load}shld r26d, r14d    IID409
+    __ eshldl(r16, rdx, r14, true);                                             //    {load}{NF}shld r16d, edx, r14d, cl    IID410
+    __ eshldl(r19, r19, r8, true);                                              //    {load}{NF}shld r19d, r19d, r8d, cl    IID411
+    __ eshrdl(r27, rbx, r26, false);                                            //    {load}{EVEX}shrd r27d, ebx, r26d, cl    IID412
+    __ eshrdl(r28, r28, r19, false);                                            //    {load}shrd r28d, r19d    IID413
+    __ eshrdl(rcx, r11, r14, true);                                             //    {load}{NF}shrd ecx, r11d, r14d, cl    IID414
+    __ eshrdl(r31, r31, r19, true);                                             //    {load}{NF}shrd r31d, r31d, r19d, cl    IID415
+    __ esubl(r26, r13, r25, false);                                             //    {load}{EVEX}sub r26d, r13d, r25d    IID416
+    __ esubl(r24, r24, r11, false);                                             //    {load}sub r24d, r11d    IID417
+    __ esubl(r18, r20, r13, true);                                              //    {load}{NF}sub r18d, r20d, r13d    IID418
+    __ esubl(r16, r16, r18, true);                                              //    {load}{NF}sub r16d, r16d, r18d    IID419
+    __ exorl(r19, r17, r8, false);                                              //    {load}{EVEX}xor r19d, r17d, r8d    IID420
+    __ exorl(r19, r19, r13, false);                                             //    {load}xor r19d, r13d    IID421
+    __ exorl(r23, r13, r15, true);                                              //    {load}{NF}xor r23d, r13d, r15d    IID422
+    __ exorl(r11, r11, r29, true);                                              //    {load}{NF}xor r11d, r11d, r29d    IID423
+    __ eshldl(r29, r17, r17, 1, false);                                         //    {EVEX}shld r29d, r17d, r17d, 1    IID424
+    __ eshldl(r22, r22, r24, 4, false);                                         //    shld r22d, r24d, 4    IID425
+    __ eshldl(r8, r28, r11, 16, true);                                          //    {NF}shld r8d, r28d, r11d, 16    IID426
+    __ eshldl(r15, r15, r23, 4, true);                                          //    {NF}shld r15d, r15d, r23d, 4    IID427
+    __ eshrdl(r29, r22, r16, 4, false);                                         //    {EVEX}shrd r29d, r22d, r16d, 4    IID428
+    __ eshrdl(r13, r13, r9, 4, false);                                          //    shrd r13d, r9d, 4    IID429
+    __ eshrdl(r15, r21, r12, 2, true);                                          //    {NF}shrd r15d, r21d, r12d, 2    IID430
+    __ eshrdl(r17, r17, r23, 2, true);                                          //    {NF}shrd r17d, r17d, r23d, 2    IID431
+    __ ecmovl (Assembler::Condition::overflow, rdx, r16, r29);                  //    cmovo edx, r16d, r29d    IID432
+    __ ecmovl (Assembler::Condition::overflow, r10, r10, r21);                  //    cmovo r10d, r21d    IID433
+    __ ecmovl (Assembler::Condition::noOverflow, r17, r29, r18);                //    cmovno r17d, r29d, r18d    IID434
+    __ ecmovl (Assembler::Condition::noOverflow, r28, r28, r24);                //    cmovno r28d, r24d    IID435
+    __ ecmovl (Assembler::Condition::below, r10, r20, r27);                     //    cmovb r10d, r20d, r27d    IID436
+    __ ecmovl (Assembler::Condition::below, r10, r10, r14);                     //    cmovb r10d, r14d    IID437
+    __ ecmovl (Assembler::Condition::aboveEqual, r11, r27, rcx);                //    cmovae r11d, r27d, ecx    IID438
+    __ ecmovl (Assembler::Condition::aboveEqual, r22, r22, r15);                //    cmovae r22d, r15d    IID439
+    __ ecmovl (Assembler::Condition::zero, r31, r30, r19);                      //    cmovz r31d, r30d, r19d    IID440
+    __ ecmovl (Assembler::Condition::zero, r19, r19, r26);                      //    cmovz r19d, r26d    IID441
+    __ ecmovl (Assembler::Condition::notZero, r21, r14, r26);                   //    cmovnz r21d, r14d, r26d    IID442
+    __ ecmovl (Assembler::Condition::notZero, r20, r20, r15);                   //    cmovnz r20d, r15d    IID443
+    __ ecmovl (Assembler::Condition::belowEqual, r12, r13, r23);                //    cmovbe r12d, r13d, r23d    IID444
+    __ ecmovl (Assembler::Condition::belowEqual, r28, r28, r20);                //    cmovbe r28d, r20d    IID445
+    __ ecmovl (Assembler::Condition::above, r20, r24, r11);                     //    cmova r20d, r24d, r11d    IID446
+    __ ecmovl (Assembler::Condition::above, r10, r10, r15);                     //    cmova r10d, r15d    IID447
+    __ ecmovl (Assembler::Condition::negative, r19, r20, r23);                  //    cmovs r19d, r20d, r23d    IID448
+    __ ecmovl (Assembler::Condition::negative, r15, r15, r26);                  //    cmovs r15d, r26d    IID449
+    __ ecmovl (Assembler::Condition::positive, r19, r24, r23);                  //    cmovns r19d, r24d, r23d    IID450
+    __ ecmovl (Assembler::Condition::positive, r28, r28, r11);                  //    cmovns r28d, r11d    IID451
+    __ ecmovl (Assembler::Condition::parity, r13, r13, rdx);                    //    cmovp r13d, edx    IID452
+    __ ecmovl (Assembler::Condition::parity, r31, r31, r23);                    //    cmovp r31d, r23d    IID453
+    __ ecmovl (Assembler::Condition::noParity, r23, r9, r27);                   //    cmovnp r23d, r9d, r27d    IID454
+    __ ecmovl (Assembler::Condition::noParity, r21, r21, r20);                  //    cmovnp r21d, r20d    IID455
+    __ ecmovl (Assembler::Condition::less, r24, r21, r29);                      //    cmovl r24d, r21d, r29d    IID456
+    __ ecmovl (Assembler::Condition::less, rbx, rbx, r11);                      //    cmovl ebx, r11d    IID457
+    __ ecmovl (Assembler::Condition::greaterEqual, r21, rbx, rcx);              //    cmovge r21d, ebx, ecx    IID458
+    __ ecmovl (Assembler::Condition::greaterEqual, r31, r31, r21);              //    cmovge r31d, r21d    IID459
+    __ ecmovl (Assembler::Condition::lessEqual, r15, r25, r30);                 //    cmovle r15d, r25d, r30d    IID460
+    __ ecmovl (Assembler::Condition::lessEqual, r23, r23, r25);                 //    cmovle r23d, r25d    IID461
+    __ ecmovl (Assembler::Condition::greater, r18, rcx, r10);                   //    cmovg r18d, ecx, r10d    IID462
+    __ ecmovl (Assembler::Condition::greater, rcx, rcx, r31);                   //    cmovg ecx, r31d    IID463
+    __ ecmovl (Assembler::Condition::overflow, r21, r19, Address(r26, -0x6e290873)); //    cmovo r21d, r19d, dword ptr [r26-0x6e290873]    IID464
+    __ ecmovl (Assembler::Condition::noOverflow, r24, r19, Address(r22, rcx, (Address::ScaleFactor)0, +0x11f85f9a)); //    cmovno r24d, r19d, dword ptr [r22+rcx*1+0x11f85f9a]    IID465
+    __ ecmovl (Assembler::Condition::below, r17, r24, Address(r20, +0x534d775e)); //    cmovb r17d, r24d, dword ptr [r20+0x534d775e]    IID466
+    __ ecmovl (Assembler::Condition::aboveEqual, r20, r18, Address(r20, -0x47c94ecd)); //    cmovae r20d, r18d, dword ptr [r20-0x47c94ecd]    IID467
+    __ ecmovl (Assembler::Condition::zero, r9, r13, Address(r23, -0x4b83c563)); //    cmovz r9d, r13d, dword ptr [r23-0x4b83c563]    IID468
+    __ ecmovl (Assembler::Condition::notZero, r11, r25, Address(r24, r14, (Address::ScaleFactor)1, -0x446507af)); //    cmovnz r11d, r25d, dword ptr [r24+r14*2-0x446507af]    IID469
+    __ ecmovl (Assembler::Condition::belowEqual, r14, r24, Address(r30, r13, (Address::ScaleFactor)2, +0xd0661d)); //    cmovbe r14d, r24d, dword ptr [r30+r13*4+0xd0661d]    IID470
+    __ ecmovl (Assembler::Condition::above, r13, r25, Address(r14, r27, (Address::ScaleFactor)3, +0x47e1403)); //    cmova r13d, r25d, dword ptr [r14+r27*8+0x47e1403]    IID471
+    __ ecmovl (Assembler::Condition::negative, r24, r19, Address(rcx, rdx, (Address::ScaleFactor)3, -0x644a5318)); //    cmovs r24d, r19d, dword ptr [rcx+rdx*8-0x644a5318]    IID472
+    __ ecmovl (Assembler::Condition::positive, r26, r24, Address(r22, r22, (Address::ScaleFactor)0, +0x70352446)); //    cmovns r26d, r24d, dword ptr [r22+r22*1+0x70352446]    IID473
+    __ ecmovl (Assembler::Condition::parity, r19, r26, Address(r8, r30, (Address::ScaleFactor)2, +0x78a12f5c)); //    cmovp r19d, r26d, dword ptr [r8+r30*4+0x78a12f5c]    IID474
+    __ ecmovl (Assembler::Condition::noParity, r29, r11, Address(r25, r20, (Address::ScaleFactor)0, +0x27a8303a)); //    cmovnp r29d, r11d, dword ptr [r25+r20*1+0x27a8303a]    IID475
+    __ ecmovl (Assembler::Condition::less, r22, r24, Address(r27, r16, (Address::ScaleFactor)1, +0x2541a10)); //    cmovl r22d, r24d, dword ptr [r27+r16*2+0x2541a10]    IID476
+    __ ecmovl (Assembler::Condition::greaterEqual, r31, r15, Address(r8, r16, (Address::ScaleFactor)3, +0x558e3251)); //    cmovge r31d, r15d, dword ptr [r8+r16*8+0x558e3251]    IID477
+    __ ecmovl (Assembler::Condition::lessEqual, r27, r18, Address(r8, r10, (Address::ScaleFactor)0, -0x471987b7)); //    cmovle r27d, r18d, dword ptr [r8+r10*1-0x471987b7]    IID478
+    __ ecmovl (Assembler::Condition::greater, r18, r16, Address(r18, r19, (Address::ScaleFactor)2, -0x120ae81e)); //    cmovg r18d, r16d, dword ptr [r18+r19*4-0x120ae81e]    IID479
+#endif // _LP64
+#ifdef _LP64
+    __ adcq(rbx, r31);                                                          //    {load}adc rbx, r31    IID480
+    __ cmpq(r30, r31);                                                          //    {load}cmp r30, r31    IID481
+    __ imulq(r29, r28);                                                         //    {load}imul r29, r28    IID482
+    __ popcntq(r25, r10);                                                       //    {load}popcnt r25, r10    IID483
+    __ sbbq(r24, r20);                                                          //    {load}sbb r24, r20    IID484
+    __ subq(r16, rdx);                                                          //    {load}sub r16, rdx    IID485
+    __ tzcntq(r26, r28);                                                        //    {load}tzcnt r26, r28    IID486
+    __ lzcntq(r28, r9);                                                         //    {load}lzcnt r28, r9    IID487
+    __ addq(r20, r24);                                                          //    {load}add r20, r24    IID488
+    __ andq(r24, r29);                                                          //    {load}and r24, r29    IID489
+    __ orq(r23, r27);                                                           //    {load}or r23, r27    IID490
+    __ xorq(r15, r12);                                                          //    {load}xor r15, r12    IID491
+    __ movq(r18, r19);                                                          //    {load}mov r18, r19    IID492
+    __ bsfq(r31, rcx);                                                          //    {load}bsf r31, rcx    IID493
+    __ bsrq(r9, r13);                                                           //    {load}bsr r9, r13    IID494
+    __ btq(r20, rcx);                                                           //    {load}bt r20, rcx    IID495
+    __ xchgq(r8, r21);                                                          //    {load}xchg r8, r21    IID496
+    __ testq(r24, r14);                                                         //    {load}test r24, r14    IID497
+    __ addq(Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d), r29);      //    add qword ptr [rcx+r23*4+0x4ff06c4d], r29    IID498
+    __ andq(Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189), r26);      //    and qword ptr [r24+r10*2-0x75d9a189], r26    IID499
+    __ cmpq(Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c), r17);      //    cmp qword ptr [rbx+rbx*1+0x4033d59c], r17    IID500
+    __ orq(Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d), r18);       //    or qword ptr [r22+r12*8-0x3893347d], r18    IID501
+    __ xorq(Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560), r12);      //    xor qword ptr [r20+r23*8+0x4b311560], r12    IID502
+    __ subq(Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657), r29);      //    sub qword ptr [r10+r28*4+0x5c3a2657], r29    IID503
+    __ movq(Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f), r22);      //    mov qword ptr [r13+r25*8+0x1a3d6f3f], r22    IID504
+    __ xaddq(Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8), r25);     //    xadd qword ptr [r17+r24*8-0x35addbd8], r25    IID505
+    __ andq(Address(r25, +0x632184c3), 16777216);                               //    and qword ptr [r25+0x632184c3], 16777216    IID506
+    __ addq(Address(r13, r13, (Address::ScaleFactor)0, -0x3972eac6), 16777216); //    add qword ptr [r13+r13*1-0x3972eac6], 16777216    IID507
+    __ cmpq(Address(r9, -0x13b4c806), 4096);                                    //    cmp qword ptr [r9-0x13b4c806], 4096    IID508
+    __ sarq(Address(r31, +0x4fa7f551), 1);                                      //    sar qword ptr [r31+0x4fa7f551], 1    IID509
+    __ salq(Address(r21, r31, (Address::ScaleFactor)2, +0x31aa8232), 1);        //    sal qword ptr [r21+r31*4+0x31aa8232], 1    IID510
+    __ sbbq(Address(r24, r31, (Address::ScaleFactor)2, -0x466538b7), 268435456); //    sbb qword ptr [r24+r31*4-0x466538b7], 268435456    IID511
+    __ shrq(Address(r28, r22, (Address::ScaleFactor)0, -0x3efe85b1), 2);        //    shr qword ptr [r28+r22*1-0x3efe85b1], 2    IID512
+    __ subq(Address(r16, -0x1389a3eb), 1048576);                                //    sub qword ptr [r16-0x1389a3eb], 1048576    IID513
+    __ xorq(Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615), 16);        //    xor qword ptr [r29+r8*1+0x1d022615], 16    IID514
+    __ orq(Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2), 1);         //    or qword ptr [r12+r28*2-0x34c898e2], 1    IID515
+    __ movq(Address(rcx, r24, (Address::ScaleFactor)2, -0x1644eb08), 256);      //    mov qword ptr [rcx+r24*4-0x1644eb08], 256    IID516
+    __ testq(Address(r29, -0x7d23890b), -65536);                                //    test qword ptr [r29-0x7d23890b], -65536    IID517
+    __ addq(r23, Address(rcx, r19, (Address::ScaleFactor)2, +0x70eac654));      //    add r23, qword ptr [rcx+r19*4+0x70eac654]    IID518
+    __ andq(rdx, Address(r24, r15, (Address::ScaleFactor)0, -0x204ddaa9));      //    and rdx, qword ptr [r24+r15*1-0x204ddaa9]    IID519
+    __ cmpq(rdx, Address(r23, r11, (Address::ScaleFactor)3, +0x32c930bd));      //    cmp rdx, qword ptr [r23+r11*8+0x32c930bd]    IID520
+    __ lzcntq(r28, Address(rdx, -0x5433c28f));                                  //    lzcnt r28, qword ptr [rdx-0x5433c28f]    IID521
+    __ orq(r22, Address(r19, r14, (Address::ScaleFactor)1, -0x2cc67d38));       //    or r22, qword ptr [r19+r14*2-0x2cc67d38]    IID522
+    __ adcq(r10, Address(r10, +0x3d7c59f));                                     //    adc r10, qword ptr [r10+0x3d7c59f]    IID523
+    __ imulq(r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d));        //    imul r10, qword ptr [r8+r8*8-0xe61862d]    IID524
+    __ popcntq(r23, Address(r29, -0x777ed96d));                                 //    popcnt r23, qword ptr [r29-0x777ed96d]    IID525
+    __ sbbq(rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb));      //    sbb rcx, qword ptr [rbx+r19*2+0x53c601cb]    IID526
+    __ subq(r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073));      //    sub r14, qword ptr [r17+rbx*1-0x768bf073]    IID527
+    __ tzcntq(r29, Address(r10, r19, (Address::ScaleFactor)1, +0x30c98d3c));    //    tzcnt r29, qword ptr [r10+r19*2+0x30c98d3c]    IID528
+    __ xorq(r10, Address(r16, r27, (Address::ScaleFactor)0, -0x3d08d602));      //    xor r10, qword ptr [r16+r27*1-0x3d08d602]    IID529
+    __ movq(r18, Address(r28, r28, (Address::ScaleFactor)3, -0x62fbac91));      //    mov r18, qword ptr [r28+r28*8-0x62fbac91]    IID530
+    __ leaq(rbx, Address(rcx, +0x450602a5));                                    //    lea rbx, qword ptr [rcx+0x450602a5]    IID531
+    __ cvttsd2siq(r12, Address(r30, r31, (Address::ScaleFactor)0, -0x6798a630)); //    cvttsd2si r12, qword ptr [r30+r31*1-0x6798a630]    IID532
+    __ xchgq(r31, Address(r24, r10, (Address::ScaleFactor)1, -0x706712ed));     //    xchg r31, qword ptr [r24+r10*2-0x706712ed]    IID533
+    __ testq(r14, Address(r13, r20, (Address::ScaleFactor)3, +0x171081f2));     //    test r14, qword ptr [r13+r20*8+0x171081f2]    IID534
+    __ addq(r31, 16);                                                           //    add r31, 16    IID535
+    __ andq(r25, 16);                                                           //    and r25, 16    IID536
+    __ adcq(r23, 256);                                                          //    adc r23, 256    IID537
+    __ cmpq(r19, 268435456);                                                    //    cmp r19, 268435456    IID538
+    __ rclq(r31, 1);                                                            //    rcl r31, 1    IID539
+    __ rcrq(r17, 1);                                                            //    rcr r17, 1    IID540
+    __ rolq(r25, 2);                                                            //    rol r25, 2    IID541
+    __ rorq(r17, 4);                                                            //    ror r17, 4    IID542
+    __ sarq(r28, 1);                                                            //    sar r28, 1    IID543
+    __ salq(r15, 4);                                                            //    sal r15, 4    IID544
+    __ sbbq(rbx, 65536);                                                        //    sbb rbx, 65536    IID545
+    __ shlq(r21, 1);                                                            //    shl r21, 1    IID546
+    __ shrq(r10, 1);                                                            //    shr r10, 1    IID547
+    __ subq(r14, 16);                                                           //    sub r14, 16    IID548
+    __ xorq(r18, 268435456);                                                    //    xor r18, 268435456    IID549
+    __ movq(r23, 16);                                                           //    mov r23, 16    IID550
+    __ mov64(r12, 1099511627776);                                               //    mov r12, 1099511627776    IID551
+    __ btq(r14, 4);                                                             //    bt r14, 4    IID552
+    __ testq(r24, -4096);                                                       //    test r24, -4096    IID553
+    __ orq_imm32(r19, 1048576);                                                 //    or r19, 1048576    IID554
+    __ subq_imm32(rcx, 268435456);                                              //    sub rcx, 268435456    IID555
+    __ cmovq(Assembler::Condition::overflow, rdx, Address(r19, rbx, (Address::ScaleFactor)3, +0x211c8c4)); //    cmovo rdx, qword ptr [r19+rbx*8+0x211c8c4]    IID556
+    __ cmovq(Assembler::Condition::noOverflow, rbx, Address(r21, +0x49267743)); //    cmovno rbx, qword ptr [r21+0x49267743]    IID557
+    __ cmovq(Assembler::Condition::below, r21, Address(r8, r28, (Address::ScaleFactor)1, -0x4c8c2946)); //    cmovb r21, qword ptr [r8+r28*2-0x4c8c2946]    IID558
+    __ cmovq(Assembler::Condition::aboveEqual, r12, Address(r26, r20, (Address::ScaleFactor)0, -0x264df89c)); //    cmovae r12, qword ptr [r26+r20*1-0x264df89c]    IID559
+    __ cmovq(Assembler::Condition::zero, r17, Address(r28, r9, (Address::ScaleFactor)2, +0x3497196b)); //    cmovz r17, qword ptr [r28+r9*4+0x3497196b]    IID560
+    __ cmovq(Assembler::Condition::notZero, r13, Address(r15, r23, (Address::ScaleFactor)1, -0x27a30999)); //    cmovnz r13, qword ptr [r15+r23*2-0x27a30999]    IID561
+    __ cmovq(Assembler::Condition::belowEqual, r22, Address(r22, +0xf39ab05));  //    cmovbe r22, qword ptr [r22+0xf39ab05]    IID562
+    __ cmovq(Assembler::Condition::above, rcx, Address(r22, r26, (Address::ScaleFactor)3, -0x48c954c)); //    cmova rcx, qword ptr [r22+r26*8-0x48c954c]    IID563
+    __ cmovq(Assembler::Condition::negative, r25, Address(r19, r21, (Address::ScaleFactor)0, +0xe405b0b)); //    cmovs r25, qword ptr [r19+r21*1+0xe405b0b]    IID564
+    __ cmovq(Assembler::Condition::positive, r12, Address(r19, r29, (Address::ScaleFactor)3, -0x7762044b)); //    cmovns r12, qword ptr [r19+r29*8-0x7762044b]    IID565
+    __ cmovq(Assembler::Condition::parity, rbx, Address(r30, r10, (Address::ScaleFactor)1, -0x19798323)); //    cmovp rbx, qword ptr [r30+r10*2-0x19798323]    IID566
+    __ cmovq(Assembler::Condition::noParity, r21, Address(r24, r31, (Address::ScaleFactor)0, -0x5731652b)); //    cmovnp r21, qword ptr [r24+r31*1-0x5731652b]    IID567
+    __ cmovq(Assembler::Condition::less, r18, Address(r8, r10, (Address::ScaleFactor)1, -0x5613be89)); //    cmovl r18, qword ptr [r8+r10*2-0x5613be89]    IID568
+    __ cmovq(Assembler::Condition::greaterEqual, r28, Address(r21, r21, (Address::ScaleFactor)3, +0x65a0fdc4)); //    cmovge r28, qword ptr [r21+r21*8+0x65a0fdc4]    IID569
+    __ cmovq(Assembler::Condition::lessEqual, r23, Address(r11, r18, (Address::ScaleFactor)0, -0x1d1af10c)); //    cmovle r23, qword ptr [r11+r18*1-0x1d1af10c]    IID570
+    __ cmovq(Assembler::Condition::greater, r22, Address(r18, r12, (Address::ScaleFactor)1, +0x1a5f1c38)); //    cmovg r22, qword ptr [r18+r12*2+0x1a5f1c38]    IID571
+    __ call(r23);                                                               //    call r23    IID572
+    __ divq(r30);                                                               //    div r30    IID573
+    __ idivq(r19);                                                              //    idiv r19    IID574
+    __ imulq(r9);                                                               //    imul r9    IID575
+    __ mulq(r13);                                                               //    mul r13    IID576
+    __ negq(r16);                                                               //    neg r16    IID577
+    __ notq(r29);                                                               //    not r29    IID578
+    __ rolq(rcx);                                                               //    rol rcx, cl    IID579
+    __ rorq(r25);                                                               //    ror r25, cl    IID580
+    __ sarq(r8);                                                                //    sar r8, cl    IID581
+    __ salq(r27);                                                               //    sal r27, cl    IID582
+    __ shlq(r30);                                                               //    shl r30, cl    IID583
+    __ shrq(r23);                                                               //    shr r23, cl    IID584
+    __ incrementq(rbx);                                                         //    inc rbx    IID585
+    __ decrementq(r14);                                                         //    dec r14    IID586
+    __ pushp(r21);                                                              //    pushp r21    IID587
+    __ popp(r21);                                                               //    popp r21    IID588
+    __ call(Address(r20, r21, (Address::ScaleFactor)1, +0x56c6af2f));           //    call qword ptr [r20+r21*2+0x56c6af2f]    IID589
+    __ mulq(Address(r31, r19, (Address::ScaleFactor)3, -0x1b4eb23));            //    mul qword ptr [r31+r19*8-0x1b4eb23]    IID590
+    __ negq(Address(r27, r27, (Address::ScaleFactor)0, -0x58dbfc1f));           //    neg qword ptr [r27+r27*1-0x58dbfc1f]    IID591
+    __ sarq(Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1));           //    sar qword ptr [rbx+r22*4-0x606349d1], cl    IID592
+    __ salq(Address(r26, r23, (Address::ScaleFactor)3, +0xb95a079));            //    sal qword ptr [r26+r23*8+0xb95a079], cl    IID593
+    __ shrq(Address(r14, r26, (Address::ScaleFactor)0, +0x3544e09));            //    shr qword ptr [r14+r26*1+0x3544e09], cl    IID594
+    __ incrementq(Address(r27, rdx, (Address::ScaleFactor)0, +0x120b3250));     //    inc qword ptr [r27+rdx*1+0x120b3250]    IID595
+    __ decrementq(Address(r9, r25, (Address::ScaleFactor)2, -0x34aaeccb));      //    dec qword ptr [r9+r25*4-0x34aaeccb]    IID596
+    __ imulq(r20, Address(r16, r28, (Address::ScaleFactor)1, -0x59de05a5), 1048576); //    imul r20, qword ptr [r16+r28*2-0x59de05a5], 1048576    IID597
+    __ imulq(r17, r23, 256);                                                    //    imul r17, r23, 256    IID598
+    __ shldq(r19, r11, 8);                                                      //    shld r19, r11, 8    IID599
+    __ shrdq(r28, r10, 8);                                                      //    shrd r28, r10, 8    IID600
+    __ pop2(r29, r26);                                                          //    {load}pop2 r26, r29    IID601
+    __ pop2p(r22, r10);                                                         //    {load}pop2p r10, r22    IID602
+    __ push2(r25, r30);                                                         //    {load}push2 r30, r25    IID603
+    __ push2p(r28, r15);                                                        //    {load}push2p r15, r28    IID604
+    __ movzbq(r11, Address(r29, r19, (Address::ScaleFactor)2, -0x12368d34));    //    movzx r11, byte ptr [r29+r19*4-0x12368d34]    IID605
+    __ movzwq(r14, Address(r8, r30, (Address::ScaleFactor)2, -0x4a9392de));     //    movzx r14, word ptr [r8+r30*4-0x4a9392de]    IID606
+    __ movsbq(r28, Address(r23, r15, (Address::ScaleFactor)0, +0x6189cb54));    //    movsx r28, byte ptr [r23+r15*1+0x6189cb54]    IID607
+    __ movswq(r28, Address(rbx, r23, (Address::ScaleFactor)3, -0x2de86561));    //    movsx r28, word ptr [rbx+r23*8-0x2de86561]    IID608
+    __ movzbq(r11, rcx);                                                        //    movzx r11, cl    IID609
+    __ movzwq(r30, r15);                                                        //    movzx r30, r15w    IID610
+    __ movsbq(r14, rcx);                                                        //    movsx r14, cl    IID611
+    __ movswq(r23, r9);                                                         //    movsx r23, r9w    IID612
+    __ cmpxchgq(r12, Address(r13, r10, (Address::ScaleFactor)1, -0x7c62c3a));   //    cmpxchg qword ptr [r13+r10*2-0x7c62c3a], r12    IID613
+    __ eidivq(rcx, false);                                                      //    {EVEX}idiv rcx    IID614
+    __ eidivq(r15, true);                                                       //    {NF}idiv r15    IID615
+    __ edivq(r23, false);                                                       //    {EVEX}div r23    IID616
+    __ edivq(r24, true);                                                        //    {NF}div r24    IID617
+    __ eimulq(r27, false);                                                      //    {EVEX}imul r27    IID618
+    __ eimulq(r30, true);                                                       //    {NF}imul r30    IID619
+    __ emulq(r12, false);                                                       //    {EVEX}mul r12    IID620
+    __ emulq(rcx, true);                                                        //    {NF}mul rcx    IID621
+    __ emulq(Address(r13, r9, (Address::ScaleFactor)3, -0x226aab94), false);    //    {EVEX}mul qword ptr [r13+r9*8-0x226aab94]    IID622
+    __ emulq(Address(r13, r24, (Address::ScaleFactor)3, -0x286c7605), true);    //    {NF}mul qword ptr [r13+r24*8-0x286c7605]    IID623
+    __ eimulq(r21, r30, false);                                                 //    {EVEX}imul r21, r30    IID624
+    __ eimulq(r17, r17, false);                                                 //    imul r17    IID625
+    __ eimulq(r29, r12, true);                                                  //    {NF}imul r29, r12    IID626
+    __ eimulq(r30, r30, true);                                                  //    {NF}imul r30, r30    IID627
+    __ elzcntq(r24, r15, false);                                                //    {EVEX}lzcnt r24, r15    IID628
+    __ elzcntq(r25, r25, false);                                                //    {EVEX}lzcnt r25, r25    IID629
+    __ elzcntq(r25, r21, true);                                                 //    {NF}lzcnt r25, r21    IID630
+    __ elzcntq(r22, r22, true);                                                 //    {NF}lzcnt r22, r22    IID631
+    __ enegq(r17, r30, false);                                                  //    {EVEX}neg r17, r30    IID632
+    __ enegq(r17, r17, false);                                                  //    neg r17    IID633
+    __ enegq(r31, r17, true);                                                   //    {NF}neg r31, r17    IID634
+    __ enegq(r29, r29, true);                                                   //    {NF}neg r29, r29    IID635
+    __ enotq(r10, r9);                                                          //    {EVEX}not r10, r9    IID636
+    __ enotq(r24, r24);                                                         //    not r24    IID637
+    __ epopcntq(r28, r15, false);                                               //    {EVEX}popcnt r28, r15    IID638
+    __ epopcntq(r10, r10, false);                                               //    {EVEX}popcnt r10, r10    IID639
+    __ epopcntq(r27, r30, true);                                                //    {NF}popcnt r27, r30    IID640
+    __ epopcntq(r28, r28, true);                                                //    {NF}popcnt r28, r28    IID641
+    __ erolq(r28, r14, false);                                                  //    {EVEX}rol r28, r14, cl    IID642
+    __ erolq(r23, r23, false);                                                  //    rol r23, cl    IID643
+    __ erolq(r23, r24, true);                                                   //    {NF}rol r23, r24, cl    IID644
+    __ erolq(r21, r21, true);                                                   //    {NF}rol r21, r21, cl    IID645
+    __ erorq(r31, r22, false);                                                  //    {EVEX}ror r31, r22, cl    IID646
+    __ erorq(r28, r28, false);                                                  //    ror r28, cl    IID647
+    __ erorq(r17, r10, true);                                                   //    {NF}ror r17, r10, cl    IID648
+    __ erorq(r9, r9, true);                                                     //    {NF}ror r9, r9, cl    IID649
+    __ esalq(r29, r30, false);                                                  //    {EVEX}sal r29, r30, cl    IID650
+    __ esalq(r11, r11, false);                                                  //    sal r11, cl    IID651
+    __ esalq(r26, r11, true);                                                   //    {NF}sal r26, r11, cl    IID652
+    __ esalq(r16, r16, true);                                                   //    {NF}sal r16, r16, cl    IID653
+    __ esarq(rbx, r15, false);                                                  //    {EVEX}sar rbx, r15, cl    IID654
+    __ esarq(r14, r14, false);                                                  //    sar r14, cl    IID655
+    __ esarq(r25, r16, true);                                                   //    {NF}sar r25, r16, cl    IID656
+    __ esarq(r8, r8, true);                                                     //    {NF}sar r8, r8, cl    IID657
+    __ edecq(r11, r13, false);                                                  //    {EVEX}dec r11, r13    IID658
+    __ edecq(rcx, rcx, false);                                                  //    dec rcx    IID659
+    __ edecq(r21, r18, true);                                                   //    {NF}dec r21, r18    IID660
+    __ edecq(r28, r28, true);                                                   //    {NF}dec r28, r28    IID661
+    __ eincq(r16, r16, false);                                                  //    inc r16    IID662
+    __ eincq(r29, r29, false);                                                  //    inc r29    IID663
+    __ eincq(r18, r9, true);                                                    //    {NF}inc r18, r9    IID664
+    __ eincq(r19, r19, true);                                                   //    {NF}inc r19, r19    IID665
+    __ eshlq(r19, r18, false);                                                  //    {EVEX}shl r19, r18, cl    IID666
+    __ eshlq(r8, r8, false);                                                    //    shl r8, cl    IID667
+    __ eshlq(r12, r15, true);                                                   //    {NF}shl r12, r15, cl    IID668
+    __ eshlq(r29, r29, true);                                                   //    {NF}shl r29, r29, cl    IID669
+    __ eshrq(r28, r24, false);                                                  //    {EVEX}shr r28, r24, cl    IID670
+    __ eshrq(r19, r19, false);                                                  //    shr r19, cl    IID671
+    __ eshrq(r8, r28, true);                                                    //    {NF}shr r8, r28, cl    IID672
+    __ eshrq(r17, r17, true);                                                   //    {NF}shr r17, r17, cl    IID673
+    __ etzcntq(r28, r16, false);                                                //    {EVEX}tzcnt r28, r16    IID674
+    __ etzcntq(r14, r14, false);                                                //    {EVEX}tzcnt r14, r14    IID675
+    __ etzcntq(r12, r31, true);                                                 //    {NF}tzcnt r12, r31    IID676
+    __ etzcntq(r14, r14, true);                                                 //    {NF}tzcnt r14, r14    IID677
+    __ eimulq(r31, Address(r13, -0x69c4b352), false);                           //    {EVEX}imul r31, qword ptr [r13-0x69c4b352]    IID678
+    __ eimulq(r17, Address(r18, -0x60ab1105), true);                            //    {NF}imul r17, qword ptr [r18-0x60ab1105]    IID679
+    __ elzcntq(r27, Address(r14, r25, (Address::ScaleFactor)2, +0x2798bf83), false); //    {EVEX}lzcnt r27, qword ptr [r14+r25*4+0x2798bf83]    IID680
+    __ elzcntq(r23, Address(r10, r11, (Address::ScaleFactor)0, -0x378e635d), true); //    {NF}lzcnt r23, qword ptr [r10+r11*1-0x378e635d]    IID681
+    __ enegq(rcx, Address(r19, r9, (Address::ScaleFactor)3, -0x6847d440), false); //    {EVEX}neg rcx, qword ptr [r19+r9*8-0x6847d440]    IID682
+    __ enegq(rcx, Address(rbx, rcx, (Address::ScaleFactor)0, +0x6f92d38d), true); //    {NF}neg rcx, qword ptr [rbx+rcx*1+0x6f92d38d]    IID683
+    __ epopcntq(r20, Address(r12, -0x2a8b27d6), false);                         //    {EVEX}popcnt r20, qword ptr [r12-0x2a8b27d6]    IID684
+    __ epopcntq(r31, Address(r30, +0x4603f6d0), true);                          //    {NF}popcnt r31, qword ptr [r30+0x4603f6d0]    IID685
+    __ esalq(rbx, Address(r24, +0x567d06f9), false);                            //    {EVEX}sal rbx, qword ptr [r24+0x567d06f9], cl    IID686
+    __ esalq(r12, Address(r24, r28, (Address::ScaleFactor)0, -0x1c4c584e), true); //    {NF}sal r12, qword ptr [r24+r28*1-0x1c4c584e], cl    IID687
+    __ esarq(r12, Address(r23, r24, (Address::ScaleFactor)2, -0x3157bcba), false); //    {EVEX}sar r12, qword ptr [r23+r24*4-0x3157bcba], cl    IID688
+    __ esarq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), true); //    {NF}sar r8, qword ptr [r14+r24*4-0x714290a5], cl    IID689
+    __ edecq(r23, Address(r8, r15, (Address::ScaleFactor)1, -0x5ae272dd), false); //    {EVEX}dec r23, qword ptr [r8+r15*2-0x5ae272dd]    IID690
+    __ edecq(r13, Address(r29, r9, (Address::ScaleFactor)3, -0x5b5174a9), true); //    {NF}dec r13, qword ptr [r29+r9*8-0x5b5174a9]    IID691
+    __ eincq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), false); //    {EVEX}inc r11, qword ptr [r21+r31*8-0x2176b4dc]    IID692
+    __ eincq(r13, Address(rcx, r16, (Address::ScaleFactor)0, -0x36b448c9), true); //    {NF}inc r13, qword ptr [rcx+r16*1-0x36b448c9]    IID693
+    __ eshrq(r26, Address(r25, rcx, (Address::ScaleFactor)2, -0x5f894993), false); //    {EVEX}shr r26, qword ptr [r25+rcx*4-0x5f894993], cl    IID694
+    __ eshrq(r25, Address(r9, +0x51798d21), true);                              //    {NF}shr r25, qword ptr [r9+0x51798d21], cl    IID695
+    __ etzcntq(r28, Address(r13, r26, (Address::ScaleFactor)2, +0x207196f6), false); //    {EVEX}tzcnt r28, qword ptr [r13+r26*4+0x207196f6]    IID696
+    __ etzcntq(rbx, Address(r19, r13, (Address::ScaleFactor)0, -0x24d937d5), true); //    {NF}tzcnt rbx, qword ptr [r19+r13*1-0x24d937d5]    IID697
+    __ eaddq(r17, Address(r30, +0x3935ccff), r31, false);                       //    {EVEX}add r17, qword ptr [r30+0x3935ccff], r31    IID698
+    __ eaddq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), r14, false); //    {EVEX}add r14, qword ptr [r27+r10*4-0x34ad9bab], r14    IID699
+    __ eaddq(r18, Address(r20, r23, (Address::ScaleFactor)0, +0x5ad3ed4b), r30, true); //    {NF}add r18, qword ptr [r20+r23*1+0x5ad3ed4b], r30    IID700
+    __ eaddq(r20, Address(rdx, -0x322a99e5), r20, true);                        //    {NF}add r20, qword ptr [rdx-0x322a99e5], r20    IID701
+    __ eandq(r31, Address(rbx, r27, (Address::ScaleFactor)3, +0x4ce247d2), r17, false); //    {EVEX}and r31, qword ptr [rbx+r27*8+0x4ce247d2], r17    IID702
+    __ eandq(r30, Address(r18, r19, (Address::ScaleFactor)1, -0x4ee3d14), r30, false); //    {EVEX}and r30, qword ptr [r18+r19*2-0x4ee3d14], r30    IID703
+    __ eandq(r28, Address(r11, rbx, (Address::ScaleFactor)3, -0x28994bbf), r24, true); //    {NF}and r28, qword ptr [r11+rbx*8-0x28994bbf], r24    IID704
+    __ eandq(r30, Address(r22, +0x7d21c24), r30, true);                         //    {NF}and r30, qword ptr [r22+0x7d21c24], r30    IID705
+    __ eorq(r26, Address(r15, r19, (Address::ScaleFactor)3, +0x58c21792), r20, false); //    {EVEX}or r26, qword ptr [r15+r19*8+0x58c21792], r20    IID706
+    __ eorq(r13, Address(r10, r27, (Address::ScaleFactor)2, -0x2c70d333), r13, false); //    {EVEX}or r13, qword ptr [r10+r27*4-0x2c70d333], r13    IID707
+    __ eorq(rbx, Address(r12, rbx, (Address::ScaleFactor)0, -0x1fb0f1bc), r26, true); //    {NF}or rbx, qword ptr [r12+rbx*1-0x1fb0f1bc], r26    IID708
+    __ eorq(r31, Address(r27, r31, (Address::ScaleFactor)1, +0x28d1756), r31, true); //    {NF}or r31, qword ptr [r27+r31*2+0x28d1756], r31    IID709
+    __ esubq(r24, Address(r28, r23, (Address::ScaleFactor)1, +0x6980f610), r27, false); //    {EVEX}sub r24, qword ptr [r28+r23*2+0x6980f610], r27    IID710
+    __ esubq(r15, Address(r11, r30, (Address::ScaleFactor)3, -0x49777e7), r15, false); //    {EVEX}sub r15, qword ptr [r11+r30*8-0x49777e7], r15    IID711
+    __ esubq(r17, Address(r25, r13, (Address::ScaleFactor)2, +0x31619e46), r31, true); //    {NF}sub r17, qword ptr [r25+r13*4+0x31619e46], r31    IID712
+    __ esubq(r18, Address(r11, r10, (Address::ScaleFactor)2, +0x1922861a), r18, true); //    {NF}sub r18, qword ptr [r11+r10*4+0x1922861a], r18    IID713
+    __ exorq(rbx, Address(r11, -0x4716d420), r21, false);                       //    {EVEX}xor rbx, qword ptr [r11-0x4716d420], r21    IID714
+    __ exorq(r8, Address(rdx, r9, (Address::ScaleFactor)2, -0x4cfe39c), r8, false); //    {EVEX}xor r8, qword ptr [rdx+r9*4-0x4cfe39c], r8    IID715
+    __ exorq(r16, Address(r14, r27, (Address::ScaleFactor)0, +0x7c6654d9), r25, true); //    {NF}xor r16, qword ptr [r14+r27*1+0x7c6654d9], r25    IID716
+    __ exorq(r29, Address(r15, -0x5efab479), r29, true);                        //    {NF}xor r29, qword ptr [r15-0x5efab479], r29    IID717
+    __ eaddq(r19, Address(r13, r22, (Address::ScaleFactor)2, +0x68b64559), 16777216, false); //    {EVEX}add r19, qword ptr [r13+r22*4+0x68b64559], 16777216    IID718
+    __ eaddq(r16, Address(r13, r31, (Address::ScaleFactor)3, -0x65143af5), 1, true); //    {NF}add r16, qword ptr [r13+r31*8-0x65143af5], 1    IID719
+    __ eandq(r31, Address(r24, r13, (Address::ScaleFactor)1, -0x25b16a0e), 1, false); //    {EVEX}and r31, qword ptr [r24+r13*2-0x25b16a0e], 1    IID720
+    __ eandq(r11, Address(r28, -0xf6d4b26), 65536, true);                       //    {NF}and r11, qword ptr [r28-0xf6d4b26], 65536    IID721
+    __ eimulq(rcx, Address(r18, r10, (Address::ScaleFactor)0, +0x46ec6da1), 16777216, false); //    {EVEX}imul rcx, qword ptr [r18+r10*1+0x46ec6da1], 16777216    IID722
+    __ eimulq(r15, Address(r9, r10, (Address::ScaleFactor)3, -0x7fc36af3), 16, true); //    {NF}imul r15, qword ptr [r9+r10*8-0x7fc36af3], 16    IID723
+    __ eorq(r17, Address(r27, r30, (Address::ScaleFactor)0, +0x1b4cda2c), 1, false); //    {EVEX}or r17, qword ptr [r27+r30*1+0x1b4cda2c], 1    IID724
+    __ eorq(rdx, Address(r25, r14, (Address::ScaleFactor)2, -0x59aa6b85), 4096, true); //    {NF}or rdx, qword ptr [r25+r14*4-0x59aa6b85], 4096    IID725
+    __ esalq(r17, Address(r26, r21, (Address::ScaleFactor)1, -0x6ab1f15f), 8, false); //    {EVEX}sal r17, qword ptr [r26+r21*2-0x6ab1f15f], 8    IID726
+    __ esalq(r12, Address(r22, r17, (Address::ScaleFactor)0, -0x43ac14ab), 2, true); //    {NF}sal r12, qword ptr [r22+r17*1-0x43ac14ab], 2    IID727
+    __ esarq(r29, Address(r18, r16, (Address::ScaleFactor)0, -0x59dc0c61), 4, false); //    {EVEX}sar r29, qword ptr [r18+r16*1-0x59dc0c61], 4    IID728
+    __ esarq(r16, Address(r11, -0x7bdd314), 4, true);                           //    {NF}sar r16, qword ptr [r11-0x7bdd314], 4    IID729
+    __ eshrq(r26, Address(r23, r27, (Address::ScaleFactor)3, -0x55b92314), 16, false); //    {EVEX}shr r26, qword ptr [r23+r27*8-0x55b92314], 16    IID730
+    __ eshrq(r23, Address(r16, r29, (Address::ScaleFactor)1, +0x71311a1d), 2, true); //    {NF}shr r23, qword ptr [r16+r29*2+0x71311a1d], 2    IID731
+    __ esubq(r25, Address(r9, -0x9532bac), 1048576, false);                     //    {EVEX}sub r25, qword ptr [r9-0x9532bac], 1048576    IID732
+    __ esubq(r17, Address(r8, r23, (Address::ScaleFactor)0, +0x55d06ca2), 1048576, true); //    {NF}sub r17, qword ptr [r8+r23*1+0x55d06ca2], 1048576    IID733
+    __ exorq(r29, Address(r9, r24, (Address::ScaleFactor)0, -0x2c141c1), 1048576, false); //    {EVEX}xor r29, qword ptr [r9+r24*1-0x2c141c1], 1048576    IID734
+    __ exorq(r28, Address(r22, r19, (Address::ScaleFactor)1, -0x2d9d9abd), 16, true); //    {NF}xor r28, qword ptr [r22+r19*2-0x2d9d9abd], 16    IID735
+    __ eaddq(r22, r14, 16, false);                                              //    {EVEX}add r22, r14, 16    IID736
+    __ eaddq(rax, r12, 16, false);                                              //    {EVEX}add rax, r12, 16    IID737
+    __ eaddq(r24, r24, 65536, false);                                           //    add r24, 65536    IID738
+    __ eaddq(r21, rbx, 65536, true);                                            //    {NF}add r21, rbx, 65536    IID739
+    __ eaddq(rax, rbx, 65536, true);                                            //    {NF}add rax, rbx, 65536    IID740
+    __ eaddq(r24, r24, 65536, true);                                            //    {NF}add r24, r24, 65536    IID741
+    __ eandq(r21, r27, 16777216, false);                                        //    {EVEX}and r21, r27, 16777216    IID742
+    __ eandq(rax, r27, 16777216, false);                                        //    {EVEX}and rax, r27, 16777216    IID743
+    __ eandq(r24, r24, 65536, false);                                           //    and r24, 65536    IID744
+    __ eandq(r13, r31, 1048576, true);                                          //    {NF}and r13, r31, 1048576    IID745
+    __ eandq(rax, r21, 1048576, true);                                          //    {NF}and rax, r21, 1048576    IID746
+    __ eandq(r30, r30, 1048576, true);                                          //    {NF}and r30, r30, 1048576    IID747
+    __ eimulq(r8, r13, 268435456, false);                                       //    {EVEX}imul r8, r13, 268435456    IID748
+    __ eimulq(rax, r31, 268435456, false);                                      //    {EVEX}imul rax, r31, 268435456    IID749
+    __ eimulq(r13, r13, 65536, false);                                          //    {EVEX}imul r13, r13, 65536    IID750
+    __ eimulq(r14, r29, 1048576, true);                                         //    {NF}imul r14, r29, 1048576    IID751
+    __ eimulq(rax, r22, 1048576, true);                                         //    {NF}imul rax, r22, 1048576    IID752
+    __ eimulq(r8, r8, 268435456, true);                                         //    {NF}imul r8, r8, 268435456    IID753
+    __ eorq(r30, r15, 4096, false);                                             //    {EVEX}or r30, r15, 4096    IID754
+    __ eorq(rax, r28, 4096, false);                                             //    {EVEX}or rax, r28, 4096    IID755
+    __ eorq(r26, r26, 1048576, false);                                          //    or r26, 1048576    IID756
+    __ eorq(r16, r12, 268435456, true);                                         //    {NF}or r16, r12, 268435456    IID757
+    __ eorq(rax, r9, 268435456, true);                                          //    {NF}or rax, r9, 268435456    IID758
+    __ eorq(r23, r23, 256, true);                                               //    {NF}or r23, r23, 256    IID759
+    __ erclq(r15, r9, 16);                                                      //    {EVEX}rcl r15, r9, 16    IID760
+    __ erclq(rax, r8, 16);                                                      //    {EVEX}rcl rax, r8, 16    IID761
+    __ erclq(r25, r25, 1);                                                      //    rcl r25, 1    IID762
+    __ erolq(r9, r17, 16, false);                                               //    {EVEX}rol r9, r17, 16    IID763
+    __ erolq(rax, r20, 16, false);                                              //    {EVEX}rol rax, r20, 16    IID764
+    __ erolq(r27, r27, 1, false);                                               //    rol r27, 1    IID765
+    __ erolq(r20, r31, 1, true);                                                //    {NF}rol r20, r31, 1    IID766
+    __ erolq(rax, r18, 1, true);                                                //    {NF}rol rax, r18, 1    IID767
+    __ erolq(r28, r28, 16, true);                                               //    {NF}rol r28, r28, 16    IID768
+    __ erorq(r26, r18, 16, false);                                              //    {EVEX}ror r26, r18, 16    IID769
+    __ erorq(rax, r24, 16, false);                                              //    {EVEX}ror rax, r24, 16    IID770
+    __ erorq(r22, r22, 16, false);                                              //    ror r22, 16    IID771
+    __ erorq(r27, r29, 1, true);                                                //    {NF}ror r27, r29, 1    IID772
+    __ erorq(rax, r18, 1, true);                                                //    {NF}ror rax, r18, 1    IID773
+    __ erorq(r21, r21, 1, true);                                                //    {NF}ror r21, r21, 1    IID774
+    __ esalq(r12, rcx, 2, false);                                               //    {EVEX}sal r12, rcx, 2    IID775
+    __ esalq(rax, r24, 2, false);                                               //    {EVEX}sal rax, r24, 2    IID776
+    __ esalq(r22, r22, 8, false);                                               //    sal r22, 8    IID777
+    __ esalq(r17, r23, 8, true);                                                //    {NF}sal r17, r23, 8    IID778
+    __ esalq(rax, r27, 8, true);                                                //    {NF}sal rax, r27, 8    IID779
+    __ esalq(r23, r23, 1, true);                                                //    {NF}sal r23, r23, 1    IID780
+    __ esarq(r8, r25, 16, false);                                               //    {EVEX}sar r8, r25, 16    IID781
+    __ esarq(rax, r23, 16, false);                                              //    {EVEX}sar rax, r23, 16    IID782
+    __ esarq(r9, r9, 4, false);                                                 //    sar r9, 4    IID783
+    __ esarq(r22, r13, 1, true);                                                //    {NF}sar r22, r13, 1    IID784
+    __ esarq(rax, r11, 1, true);                                                //    {NF}sar rax, r11, 1    IID785
+    __ esarq(r12, r12, 2, true);                                                //    {NF}sar r12, r12, 2    IID786
+    __ eshlq(rcx, r30, 8, false);                                               //    {EVEX}shl rcx, r30, 8    IID787
+    __ eshlq(rax, r19, 8, false);                                               //    {EVEX}shl rax, r19, 8    IID788
+    __ eshlq(r13, r13, 2, false);                                               //    shl r13, 2    IID789
+    __ eshlq(r18, r11, 8, true);                                                //    {NF}shl r18, r11, 8    IID790
+    __ eshlq(rax, r9, 8, true);                                                 //    {NF}shl rax, r9, 8    IID791
+    __ eshlq(rcx, rcx, 16, true);                                               //    {NF}shl rcx, rcx, 16    IID792
+    __ eshrq(r10, r22, 4, false);                                               //    {EVEX}shr r10, r22, 4    IID793
+    __ eshrq(rax, r9, 4, false);                                                //    {EVEX}shr rax, r9, 4    IID794
+    __ eshrq(r12, r12, 2, false);                                               //    shr r12, 2    IID795
+    __ eshrq(r26, r31, 8, true);                                                //    {NF}shr r26, r31, 8    IID796
+    __ eshrq(rax, r12, 8, true);                                                //    {NF}shr rax, r12, 8    IID797
+    __ eshrq(r28, r28, 1, true);                                                //    {NF}shr r28, r28, 1    IID798
+    __ esubq(r15, r30, 65536, false);                                           //    {EVEX}sub r15, r30, 65536    IID799
+    __ esubq(rax, rcx, 65536, false);                                           //    {EVEX}sub rax, rcx, 65536    IID800
+    __ esubq(r26, r26, 16, false);                                              //    sub r26, 16    IID801
+    __ esubq(r12, r14, 1, true);                                                //    {NF}sub r12, r14, 1    IID802
+    __ esubq(rax, r21, 1, true);                                                //    {NF}sub rax, r21, 1    IID803
+    __ esubq(r20, r20, 1048576, true);                                          //    {NF}sub r20, r20, 1048576    IID804
+    __ exorq(r11, rbx, 16777216, false);                                        //    {EVEX}xor r11, rbx, 16777216    IID805
+    __ exorq(rax, r23, 16777216, false);                                        //    {EVEX}xor rax, r23, 16777216    IID806
+    __ exorq(r31, r31, 268435456, false);                                       //    xor r31, 268435456    IID807
+    __ exorq(r29, r28, 4096, true);                                             //    {NF}xor r29, r28, 4096    IID808
+    __ exorq(rax, r19, 4096, true);                                             //    {NF}xor rax, r19, 4096    IID809
+    __ exorq(rdx, rdx, 268435456, true);                                        //    {NF}xor rdx, rdx, 268435456    IID810
+    __ eorq_imm32(rdx, rdx, 1048576, false);                                    //    or rdx, 1048576    IID811
+    __ eorq_imm32(rax, r22, 1048576, false);                                    //    {EVEX}or rax, r22, 1048576    IID812
+    __ eorq_imm32(r29, r29, 1048576, false);                                    //    or r29, 1048576    IID813
+    __ eorq_imm32(r17, rcx, 4194304, false);                                    //    {EVEX}or r17, rcx, 4194304    IID814
+    __ eorq_imm32(rax, r25, 4194304, false);                                    //    {EVEX}or rax, r25, 4194304    IID815
+    __ eorq_imm32(r27, r27, 1073741824, false);                                 //    or r27, 1073741824    IID816
+    __ esubq_imm32(r16, r19, 4194304, false);                                   //    {EVEX}sub r16, r19, 4194304    IID817
+    __ esubq_imm32(rax, r31, 4194304, false);                                   //    {EVEX}sub rax, r31, 4194304    IID818
+    __ esubq_imm32(r26, r26, 262144, false);                                    //    sub r26, 262144    IID819
+    __ esubq_imm32(r17, r22, 1073741824, true);                                 //    {NF}sub r17, r22, 1073741824    IID820
+    __ esubq_imm32(rax, r18, 1073741824, true);                                 //    {NF}sub rax, r18, 1073741824    IID821
+    __ esubq_imm32(r23, r23, 268435456, true);                                  //    {NF}sub r23, r23, 268435456    IID822
+    __ eaddq(r13, r30, Address(r24, r19, (Address::ScaleFactor)1, +0x56ea3a3b), false); //    {EVEX}add r13, r30, qword ptr [r24+r19*2+0x56ea3a3b]    IID823
+    __ eaddq(r29, r15, Address(r26, r27, (Address::ScaleFactor)3, -0x4b113958), true); //    {NF}add r29, r15, qword ptr [r26+r27*8-0x4b113958]    IID824
+    __ eandq(r12, r30, Address(r31, -0x46103c74), false);                       //    {EVEX}and r12, r30, qword ptr [r31-0x46103c74]    IID825
+    __ eandq(r27, r10, Address(r22, r25, (Address::ScaleFactor)1, +0x6a1ebee5), true); //    {NF}and r27, r10, qword ptr [r22+r25*2+0x6a1ebee5]    IID826
+    __ eorq(r30, r26, Address(r11, r18, (Address::ScaleFactor)2, -0x2b9fff29), false); //    {EVEX}or r30, r26, qword ptr [r11+r18*4-0x2b9fff29]    IID827
+    __ eorq(r9, r12, Address(r18, r17, (Address::ScaleFactor)0, +0xb4859f6), true); //    {NF}or r9, r12, qword ptr [r18+r17*1+0xb4859f6]    IID828
+    __ eimulq(rdx, r17, Address(r24, rdx, (Address::ScaleFactor)2, +0x3d284cd8), false); //    {EVEX}imul rdx, r17, qword ptr [r24+rdx*4+0x3d284cd8]    IID829
+    __ eimulq(r29, r26, Address(r30, r12, (Address::ScaleFactor)1, +0x6e813124), true); //    {NF}imul r29, r26, qword ptr [r30+r12*2+0x6e813124]    IID830
+    __ esubq(rbx, r13, Address(r22, -0x702a289e), false);                       //    {EVEX}sub rbx, r13, qword ptr [r22-0x702a289e]    IID831
+    __ esubq(r23, r29, Address(r25, rdx, (Address::ScaleFactor)0, -0x6252a7ed), true); //    {NF}sub r23, r29, qword ptr [r25+rdx*1-0x6252a7ed]    IID832
+    __ exorq(r8, r18, Address(r19, r14, (Address::ScaleFactor)2, -0xebfa697), false); //    {EVEX}xor r8, r18, qword ptr [r19+r14*4-0xebfa697]    IID833
+    __ exorq(r10, r28, Address(r26, +0x168381ca), true);                        //    {NF}xor r10, r28, qword ptr [r26+0x168381ca]    IID834
+    __ eaddq(rcx, r18, r8, false);                                              //    {load}{EVEX}add rcx, r18, r8    IID835
+    __ eaddq(rcx, rcx, r14, false);                                             //    {load}add rcx, r14    IID836
+    __ eaddq(r23, r10, r16, true);                                              //    {load}{NF}add r23, r10, r16    IID837
+    __ eaddq(r11, r11, r24, true);                                              //    {load}{NF}add r11, r11, r24    IID838
+    __ eadcxq(r9, r18, rdx);                                                    //    {load}{EVEX}adcx r9, r18, rdx    IID839
+    __ eadcxq(r8, r8, r15);                                                     //    {load}adcx r8, r15    IID840
+    __ eadoxq(r15, r22, r26);                                                   //    {load}{EVEX}adox r15, r22, r26    IID841
+    __ eadoxq(r11, r11, rdx);                                                   //    {load}adox r11, rdx    IID842
+    __ eandq(r19, rdx, r22, false);                                             //    {load}{EVEX}and r19, rdx, r22    IID843
+    __ eandq(r29, r29, r17, false);                                             //    {load}and r29, r17    IID844
+    __ eandq(r23, r27, r15, true);                                              //    {load}{NF}and r23, r27, r15    IID845
+    __ eandq(r9, r9, r13, true);                                                //    {load}{NF}and r9, r9, r13    IID846
+    __ eimulq(r18, r15, r16, false);                                            //    {load}{EVEX}imul r18, r15, r16    IID847
+    __ eimulq(rcx, rcx, r17, false);                                            //    {load}imul rcx, r17    IID848
+    __ eimulq(r23, r12, r20, true);                                             //    {load}{NF}imul r23, r12, r20    IID849
+    __ eimulq(r10, r10, r9, true);                                              //    {load}{NF}imul r10, r10, r9    IID850
+    __ eorq(rdx, r19, r14, false);                                              //    {load}{EVEX}or rdx, r19, r14    IID851
+    __ eorq(rcx, rcx, r13, false);                                              //    {load}or rcx, r13    IID852
+    __ eorq(r9, r25, r29, true);                                                //    {load}{NF}or r9, r25, r29    IID853
+    __ eorq(rdx, rdx, r25, true);                                               //    {load}{NF}or rdx, rdx, r25    IID854
+    __ esubq(r23, r8, r16, false);                                              //    {load}{EVEX}sub r23, r8, r16    IID855
+    __ esubq(r13, r13, r13, false);                                             //    {load}sub r13, r13    IID856
+    __ esubq(r19, r12, r15, true);                                              //    {load}{NF}sub r19, r12, r15    IID857
+    __ esubq(r9, r9, rdx, true);                                                //    {load}{NF}sub r9, r9, rdx    IID858
+    __ exorq(r13, r16, r31, false);                                             //    {load}{EVEX}xor r13, r16, r31    IID859
+    __ exorq(r17, r17, r30, false);                                             //    {load}xor r17, r30    IID860
+    __ exorq(r19, r30, r20, true);                                              //    {load}{NF}xor r19, r30, r20    IID861
+    __ exorq(r31, r31, r13, true);                                              //    {load}{NF}xor r31, r31, r13    IID862
+    __ eshldq(r22, r10, r13, 4, false);                                         //    {EVEX}shld r22, r10, r13, 4    IID863
+    __ eshldq(r24, r24, r21, 16, false);                                        //    shld r24, r21, 16    IID864
+    __ eshldq(r20, r13, r27, 16, true);                                         //    {NF}shld r20, r13, r27, 16    IID865
+    __ eshldq(r31, r31, r19, 2, true);                                          //    {NF}shld r31, r31, r19, 2    IID866
+    __ eshrdq(r30, r20, r11, 8, false);                                         //    {EVEX}shrd r30, r20, r11, 8    IID867
+    __ eshrdq(rdx, rdx, r15, 1, false);                                         //    shrd rdx, r15, 1    IID868
+    __ eshrdq(r28, r30, r14, 2, true);                                          //    {NF}shrd r28, r30, r14, 2    IID869
+    __ eshrdq(r20, r20, r16, 1, true);                                          //    {NF}shrd r20, r20, r16, 1    IID870
+    __ ecmovq (Assembler::Condition::overflow, r21, r17, r28);                  //    cmovo r21, r17, r28    IID871
+    __ ecmovq (Assembler::Condition::overflow, r15, r15, r30);                  //    cmovo r15, r30    IID872
+    __ ecmovq (Assembler::Condition::noOverflow, rcx, r15, r15);                //    cmovno rcx, r15, r15    IID873
+    __ ecmovq (Assembler::Condition::noOverflow, rcx, rcx, r13);                //    cmovno rcx, r13    IID874
+    __ ecmovq (Assembler::Condition::below, rdx, r26, r26);                     //    cmovb rdx, r26, r26    IID875
+    __ ecmovq (Assembler::Condition::below, r28, r28, r15);                     //    cmovb r28, r15    IID876
+    __ ecmovq (Assembler::Condition::aboveEqual, r8, rdx, rcx);                 //    cmovae r8, rdx, rcx    IID877
+    __ ecmovq (Assembler::Condition::aboveEqual, rcx, rcx, rcx);                //    cmovae rcx, rcx    IID878
+    __ ecmovq (Assembler::Condition::zero, r10, r13, r9);                       //    cmovz r10, r13, r9    IID879
+    __ ecmovq (Assembler::Condition::zero, r14, r14, r27);                      //    cmovz r14, r27    IID880
+    __ ecmovq (Assembler::Condition::notZero, r11, r23, r9);                    //    cmovnz r11, r23, r9    IID881
+    __ ecmovq (Assembler::Condition::notZero, r11, r11, rdx);                   //    cmovnz r11, rdx    IID882
+    __ ecmovq (Assembler::Condition::belowEqual, r31, r14, r25);                //    cmovbe r31, r14, r25    IID883
+    __ ecmovq (Assembler::Condition::belowEqual, r20, r20, r12);                //    cmovbe r20, r12    IID884
+    __ ecmovq (Assembler::Condition::above, rdx, r10, r28);                     //    cmova rdx, r10, r28    IID885
+    __ ecmovq (Assembler::Condition::above, r8, r8, r17);                       //    cmova r8, r17    IID886
+    __ ecmovq (Assembler::Condition::negative, rcx, r30, r23);                  //    cmovs rcx, r30, r23    IID887
+    __ ecmovq (Assembler::Condition::negative, r26, r26, r18);                  //    cmovs r26, r18    IID888
+    __ ecmovq (Assembler::Condition::positive, rdx, rbx, r18);                  //    cmovns rdx, rbx, r18    IID889
+    __ ecmovq (Assembler::Condition::positive, r21, r21, r13);                  //    cmovns r21, r13    IID890
+    __ ecmovq (Assembler::Condition::parity, r27, r28, r27);                    //    cmovp r27, r28, r27    IID891
+    __ ecmovq (Assembler::Condition::parity, r11, r11, r30);                    //    cmovp r11, r30    IID892
+    __ ecmovq (Assembler::Condition::noParity, rcx, r21, r18);                  //    cmovnp rcx, r21, r18    IID893
+    __ ecmovq (Assembler::Condition::noParity, rcx, rcx, r29);                  //    cmovnp rcx, r29    IID894
+    __ ecmovq (Assembler::Condition::less, rdx, r21, r12);                      //    cmovl rdx, r21, r12    IID895
+    __ ecmovq (Assembler::Condition::less, rdx, rdx, r26);                      //    cmovl rdx, r26    IID896
+    __ ecmovq (Assembler::Condition::greaterEqual, r17, rbx, r22);              //    cmovge r17, rbx, r22    IID897
+    __ ecmovq (Assembler::Condition::greaterEqual, rdx, rdx, r11);              //    cmovge rdx, r11    IID898
+    __ ecmovq (Assembler::Condition::lessEqual, rdx, r14, r8);                  //    cmovle rdx, r14, r8    IID899
+    __ ecmovq (Assembler::Condition::lessEqual, r14, r14, r8);                  //    cmovle r14, r8    IID900
+    __ ecmovq (Assembler::Condition::greater, r25, r29, r21);                   //    cmovg r25, r29, r21    IID901
+    __ ecmovq (Assembler::Condition::greater, r26, r26, r30);                   //    cmovg r26, r30    IID902
+    __ ecmovq (Assembler::Condition::overflow, r24, r21, Address(r13, r11, (Address::ScaleFactor)1, +0x439c521e)); //    cmovo r24, r21, qword ptr [r13+r11*2+0x439c521e]    IID903
+    __ ecmovq (Assembler::Condition::noOverflow, r11, r18, Address(r29, r16, (Address::ScaleFactor)0, +0x632127f)); //    cmovno r11, r18, qword ptr [r29+r16*1+0x632127f]    IID904
+    __ ecmovq (Assembler::Condition::below, r16, r8, Address(r8, r26, (Address::ScaleFactor)1, +0x10633def)); //    cmovb r16, r8, qword ptr [r8+r26*2+0x10633def]    IID905
+    __ ecmovq (Assembler::Condition::aboveEqual, r13, r14, Address(r18, -0x54f69e38)); //    cmovae r13, r14, qword ptr [r18-0x54f69e38]    IID906
+    __ ecmovq (Assembler::Condition::zero, r12, r8, Address(r31, r26, (Address::ScaleFactor)1, -0x7a1e447a)); //    cmovz r12, r8, qword ptr [r31+r26*2-0x7a1e447a]    IID907
+    __ ecmovq (Assembler::Condition::notZero, r29, r29, Address(r19, r11, (Address::ScaleFactor)2, -0x35d82dd2)); //    cmovnz r29, qword ptr [r19+r11*4-0x35d82dd2]    IID908
+    __ ecmovq (Assembler::Condition::belowEqual, rcx, r18, Address(r25, r28, (Address::ScaleFactor)0, +0x30be64a0)); //    cmovbe rcx, r18, qword ptr [r25+r28*1+0x30be64a0]    IID909
+    __ ecmovq (Assembler::Condition::above, r28, r12, Address(r10, r16, (Address::ScaleFactor)1, -0x22b8fefa)); //    cmova r28, r12, qword ptr [r10+r16*2-0x22b8fefa]    IID910
+    __ ecmovq (Assembler::Condition::negative, r11, r8, Address(rbx, r11, (Address::ScaleFactor)3, +0x25cc9e96)); //    cmovs r11, r8, qword ptr [rbx+r11*8+0x25cc9e96]    IID911
+    __ ecmovq (Assembler::Condition::positive, r12, r27, Address(r11, -0xc2d70fe)); //    cmovns r12, r27, qword ptr [r11-0xc2d70fe]    IID912
+    __ ecmovq (Assembler::Condition::parity, r8, r26, Address(r19, rbx, (Address::ScaleFactor)1, -0x486db7ea)); //    cmovp r8, r26, qword ptr [r19+rbx*2-0x486db7ea]    IID913
+    __ ecmovq (Assembler::Condition::noParity, r30, r10, Address(r14, r18, (Address::ScaleFactor)3, +0x14884884)); //    cmovnp r30, r10, qword ptr [r14+r18*8+0x14884884]    IID914
+    __ ecmovq (Assembler::Condition::less, r27, r8, Address(r29, r14, (Address::ScaleFactor)2, +0x92b7a8)); //    cmovl r27, r8, qword ptr [r29+r14*4+0x92b7a8]    IID915
+    __ ecmovq (Assembler::Condition::greaterEqual, r14, r28, Address(r19, rdx, (Address::ScaleFactor)0, +0x9c2d45)); //    cmovge r14, r28, qword ptr [r19+rdx*1+0x9c2d45]    IID916
+    __ ecmovq (Assembler::Condition::lessEqual, r25, r8, Address(rcx, r18, (Address::ScaleFactor)2, +0x6655c86b)); //    cmovle r25, r8, qword ptr [rcx+r18*4+0x6655c86b]    IID917
+    __ ecmovq (Assembler::Condition::greater, r19, r21, Address(r10, r25, (Address::ScaleFactor)0, -0x1005430b)); //    cmovg r19, r21, qword ptr [r10+r25*1-0x1005430b]    IID918
 #endif // _LP64
 
   static const uint8_t insns[] =
@@ -927,545 +1145,763 @@
     0x62, 0xbc, 0x7c, 0x08, 0xf7, 0xa4, 0x56, 0xaa, 0x64, 0xc8, 0xc2,                // IID177
     0x62, 0xd4, 0x7c, 0x0c, 0xf7, 0xa3, 0x51, 0x10, 0xb6, 0xcd,                      // IID178
     0x62, 0x7c, 0x7c, 0x08, 0xf5, 0xc8,                                              // IID179
-    0x62, 0xcc, 0x7c, 0x0c, 0xf5, 0xfc,                                              // IID180
-    0x62, 0xdc, 0x3c, 0x18, 0xf7, 0xde,                                              // IID181
-    0x62, 0xd4, 0x44, 0x14, 0xf7, 0xdb,                                              // IID182
-    0x62, 0x7c, 0x7c, 0x08, 0x88, 0xe8,                                              // IID183
-    0x62, 0x54, 0x7c, 0x0c, 0x88, 0xdb,                                              // IID184
-    0x62, 0xf4, 0x2c, 0x10, 0xf7, 0xd1,                                              // IID185
-    0x62, 0xd4, 0x64, 0x18, 0xd3, 0xc2,                                              // IID186
-    0x62, 0xdc, 0x0c, 0x1c, 0xd3, 0xc5,                                              // IID187
-    0x62, 0xfc, 0x04, 0x18, 0xd3, 0xcc,                                              // IID188
-    0x62, 0xd4, 0x74, 0x14, 0xd3, 0xcc,                                              // IID189
-    0x62, 0xf4, 0x1c, 0x18, 0xd3, 0xe3,                                              // IID190
-    0x62, 0xdc, 0x44, 0x14, 0xd3, 0xe3,                                              // IID191
-    0x62, 0xfc, 0x14, 0x10, 0xd3, 0xfc,                                              // IID192
-    0x62, 0xf4, 0x1c, 0x14, 0xd3, 0xfa,                                              // IID193
-    0x62, 0xdc, 0x3c, 0x18, 0xff, 0xcb,                                              // IID194
-    0x62, 0xd4, 0x64, 0x1c, 0xff, 0xcf,                                              // IID195
-    0x62, 0xdc, 0x24, 0x18, 0xff, 0xc3,                                              // IID196
-    0x62, 0xdc, 0x14, 0x14, 0xff, 0xc1,                                              // IID197
-    0x62, 0xd4, 0x1c, 0x18, 0xd3, 0xe0,                                              // IID198
-    0x62, 0xfc, 0x24, 0x1c, 0xd3, 0xe2,                                              // IID199
-    0x62, 0xd4, 0x6c, 0x18, 0xd3, 0xed,                                              // IID200
-    0x62, 0xdc, 0x44, 0x14, 0xd3, 0xe8,                                              // IID201
-    0x62, 0x54, 0x7c, 0x08, 0xf4, 0xff,                                              // IID202
-    0x62, 0x4c, 0x7c, 0x0c, 0xf4, 0xd4,                                              // IID203
-    0x62, 0x9c, 0x7c, 0x08, 0xf5, 0x9c, 0x31, 0xb6, 0xfd, 0x13, 0x1c,                // IID204
-    0x62, 0x1c, 0x78, 0x0c, 0xf5, 0x8c, 0xe7, 0x81, 0x74, 0x40, 0xcf,                // IID205
-    0x62, 0xdc, 0x3c, 0x18, 0xf7, 0x99, 0x1e, 0xf0, 0x37, 0xf6,                      // IID206
-    0x62, 0xdc, 0x48, 0x14, 0xf7, 0x9c, 0x9b, 0x09, 0x7c, 0xf2, 0x38,                // IID207
-    0x62, 0x84, 0x78, 0x08, 0x88, 0xac, 0xb6, 0x7b, 0x2c, 0xf9, 0x39,                // IID208
-    0x62, 0x2c, 0x7c, 0x0c, 0x88, 0x94, 0xf7, 0xc3, 0xe4, 0xd1, 0x9f,                // IID209
-    0x62, 0xdc, 0x30, 0x10, 0xd3, 0xa4, 0x7c, 0xef, 0x20, 0xf1, 0x4f,                // IID210
-    0x62, 0xdc, 0x10, 0x14, 0xd3, 0xa4, 0xc0, 0xbd, 0x44, 0xde, 0x97,                // IID211
-    0x62, 0x94, 0x40, 0x10, 0xd3, 0xbc, 0xbb, 0xbb, 0x24, 0x42, 0x7f,                // IID212
-    0x62, 0xbc, 0x18, 0x1c, 0xd3, 0xbc, 0x7f, 0x58, 0x78, 0x70, 0xfd,                // IID213
-    0x62, 0xbc, 0x60, 0x10, 0xff, 0x8c, 0x70, 0xf3, 0x61, 0x47, 0xd8,                // IID214
-    0x62, 0xdc, 0x2c, 0x14, 0xff, 0x89, 0x48, 0x5d, 0x14, 0x3d,                      // IID215
-    0x62, 0x9c, 0x10, 0x18, 0xff, 0x84, 0x43, 0x62, 0x38, 0x5f, 0x62,                // IID216
-    0x62, 0xfc, 0x24, 0x1c, 0xff, 0x86, 0xa6, 0x04, 0x59, 0x76,                      // IID217
-    0x62, 0xf4, 0x30, 0x10, 0xd3, 0xac, 0x4a, 0x91, 0xc8, 0xaf, 0x82,                // IID218
-    0x62, 0xd4, 0x4c, 0x14, 0xd3, 0xac, 0x24, 0x57, 0xa2, 0xcd, 0xaf,                // IID219
-    0x62, 0x54, 0x78, 0x08, 0xf4, 0xac, 0x25, 0x94, 0x17, 0x0c, 0xf4,                // IID220
-    0x62, 0x44, 0x78, 0x0c, 0xf4, 0x94, 0x5e, 0x47, 0x63, 0x3a, 0xdb,                // IID221
-    0x62, 0x9c, 0x48, 0x10, 0x81, 0x84, 0xbb, 0xd1, 0x6f, 0x7f, 0x80, 0x00, 0x00, 0x10, 0x00, // IID222
-    0x62, 0xf4, 0x00, 0x14, 0x81, 0x84, 0xea, 0xca, 0x3f, 0x83, 0xaa, 0x00, 0x00, 0x00, 0x10, // IID223
-    0x62, 0xdc, 0x2c, 0x18, 0x81, 0xa2, 0xf9, 0xeb, 0x6b, 0x4e, 0x00, 0x10, 0x00, 0x00, // IID224
-    0x62, 0xdc, 0x14, 0x1c, 0x81, 0xa6, 0xfd, 0xa5, 0xf1, 0x14, 0x00, 0x01, 0x00, 0x00, // IID225
-    0x62, 0x0c, 0x7c, 0x08, 0x6b, 0x9c, 0x05, 0x99, 0x87, 0x98, 0x37, 0x01,          // IID226
-    0x62, 0x44, 0x7c, 0x0c, 0x69, 0x99, 0x3f, 0xd2, 0x92, 0xbb, 0x00, 0x01, 0x00, 0x00, // IID227
-    0x62, 0xbc, 0x70, 0x10, 0x83, 0x8c, 0x0c, 0xdb, 0xb5, 0x57, 0x49, 0x10,          // IID228
-    0x62, 0x9c, 0x30, 0x14, 0x83, 0x8c, 0x7d, 0x3e, 0xa5, 0x26, 0x3c, 0x01,          // IID229
-    0x62, 0xd4, 0x04, 0x18, 0x80, 0x89, 0xe2, 0xb5, 0x68, 0xda, 0x40,                // IID230
-    0x62, 0xbc, 0x24, 0x1c, 0x80, 0x8c, 0xb8, 0x9f, 0x32, 0xa0, 0x66, 0x04,          // IID231
-    0x62, 0xb4, 0x70, 0x18, 0xd1, 0xa4, 0x19, 0x5e, 0x48, 0xc6, 0x38,                // IID232
-    0x62, 0x94, 0x34, 0x14, 0xc1, 0xa4, 0x10, 0x34, 0x1c, 0x13, 0x79, 0x08,          // IID233
-    0x62, 0x94, 0x10, 0x18, 0xc1, 0xbc, 0xb9, 0xa9, 0x8b, 0x71, 0x12, 0x02,          // IID234
-    0x62, 0xdc, 0x04, 0x1c, 0xc1, 0xb9, 0x0d, 0xc9, 0xa7, 0xaf, 0x10,                // IID235
-    0x62, 0xf4, 0x00, 0x18, 0xd1, 0xac, 0x19, 0x10, 0x15, 0x5c, 0x0c,                // IID236
-    0x62, 0xdc, 0x10, 0x1c, 0xc1, 0xac, 0xad, 0x64, 0xcf, 0x98, 0x93, 0x08,          // IID237
-    0x62, 0x94, 0x64, 0x18, 0x81, 0xac, 0x44, 0x81, 0xf7, 0x8a, 0xca, 0x00, 0x10, 0x00, 0x00, // IID238
-    0x62, 0xf4, 0x18, 0x14, 0x81, 0xac, 0xeb, 0x48, 0xc2, 0x07, 0xaa, 0x00, 0x00, 0x01, 0x00, // IID239
-    0x62, 0xbc, 0x08, 0x10, 0x83, 0xb4, 0x15, 0xe1, 0x14, 0x4d, 0x3b, 0x01,          // IID240
-    0x62, 0xfc, 0x1c, 0x14, 0x81, 0xb2, 0x5f, 0xb7, 0xdc, 0xba, 0x00, 0x00, 0x00, 0x01, // IID241
-    0x62, 0xa4, 0x6c, 0x10, 0x01, 0x84, 0x92, 0xb9, 0xe2, 0xe1, 0xe9,                // IID242
-    0x62, 0xdc, 0x20, 0x14, 0x01, 0x94, 0xd1, 0xdd, 0x47, 0x64, 0x98,                // IID243
-    0x62, 0x1c, 0x20, 0x10, 0x09, 0x8c, 0xef, 0x34, 0x79, 0xed, 0x19,                // IID244
-    0x62, 0xc4, 0x48, 0x14, 0x09, 0x8c, 0x80, 0x88, 0xe0, 0x08, 0xe4,                // IID245
-    0x62, 0x84, 0x70, 0x18, 0x08, 0x84, 0xe7, 0xcc, 0xc6, 0xb5, 0x95,                // IID246
-    0x62, 0xac, 0x1c, 0x14, 0x08, 0x84, 0xa7, 0xf7, 0x49, 0x24, 0x3c,                // IID247
-    0x62, 0x1c, 0x4c, 0x10, 0x29, 0x8c, 0x53, 0x91, 0xc6, 0xd6, 0xc3,                // IID248
-    0x62, 0xec, 0x2c, 0x1c, 0x29, 0x88, 0x01, 0x9b, 0xaf, 0xe9,                      // IID249
-    0x62, 0x8c, 0x1c, 0x10, 0x31, 0xa4, 0x1e, 0x3a, 0x1e, 0x28, 0x17,                // IID250
-    0x62, 0xa4, 0x68, 0x1c, 0x31, 0x8c, 0xfb, 0xdc, 0xd0, 0x53, 0x77,                // IID251
-    0x62, 0x4c, 0x34, 0x18, 0x30, 0xb7, 0x8e, 0xf5, 0xa4, 0x72,                      // IID252
-    0x62, 0x8c, 0x3c, 0x14, 0x30, 0x84, 0x39, 0x0a, 0x1a, 0xfc, 0x20,                // IID253
-    0x62, 0xf4, 0x1c, 0x18, 0x81, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID254
-    0x62, 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
+    0x62, 0xec, 0x7c, 0x08, 0xf5, 0xff,                                              // IID180
+    0x62, 0x44, 0x7c, 0x0c, 0xf5, 0xe0,                                              // IID181
+    0x62, 0x4c, 0x7c, 0x0c, 0xf5, 0xf6,                                              // IID182
+    0x62, 0xd4, 0x44, 0x10, 0xf7, 0xdb,                                              // IID183
+    0x41, 0xf7, 0xdd,                                                                // IID184
+    0x62, 0xd4, 0x7c, 0x14, 0xf7, 0xdb,                                              // IID185
+    0x62, 0xd4, 0x24, 0x1c, 0xf7, 0xdb,                                              // IID186
+    0x62, 0x64, 0x7c, 0x08, 0x88, 0xd1,                                              // IID187
+#endif // _LP64
+    0x62, 0xf4, 0x7c, 0x08, 0x88, 0xdb,                                              // IID188
+#ifdef _LP64
+    0x62, 0x54, 0x7c, 0x0c, 0x88, 0xd6,                                              // IID189
+    0x62, 0x4c, 0x7c, 0x0c, 0x88, 0xed,                                              // IID190
+    0x62, 0xfc, 0x04, 0x18, 0xf7, 0xd4,                                              // IID191
+    0xd5, 0x10, 0xf7, 0xd1,                                                          // IID192
+    0x41, 0xd3, 0xc4,                                                                // IID193
+#endif // _LP64
+    0xd3, 0xc3,                                                                      // IID194
+#ifdef _LP64
+    0x62, 0xdc, 0x44, 0x14, 0xd3, 0xc3,                                              // IID195
+    0x62, 0xdc, 0x14, 0x14, 0xd3, 0xc5,                                              // IID196
+    0x62, 0xdc, 0x5c, 0x10, 0xd3, 0xcc,                                              // IID197
+#endif // _LP64
+    0xd3, 0xca,                                                                      // IID198
+#ifdef _LP64
+    0x62, 0xdc, 0x3c, 0x1c, 0xd3, 0xcb,                                              // IID199
+#endif // _LP64
+    0x62, 0xf4, 0x64, 0x1c, 0xd3, 0xcb,                                              // IID200
+#ifdef _LP64
+    0x62, 0xd4, 0x04, 0x18, 0xd3, 0xe3,                                              // IID201
+    0xd5, 0x11, 0xd3, 0xe3,                                                          // IID202
+    0x62, 0xdc, 0x14, 0x14, 0xd3, 0xe1,                                              // IID203
+    0x62, 0xd4, 0x1c, 0x1c, 0xd3, 0xe4,                                              // IID204
+    0x62, 0xd4, 0x3c, 0x18, 0xd3, 0xfb,                                              // IID205
+    0xd5, 0x10, 0xd3, 0xfa,                                                          // IID206
+    0x62, 0xd4, 0x6c, 0x1c, 0xd3, 0xfd,                                              // IID207
+    0x62, 0xfc, 0x44, 0x14, 0xd3, 0xff,                                              // IID208
+    0x62, 0xd4, 0x3c, 0x10, 0xff, 0xcf,                                              // IID209
+    0x41, 0xff, 0xcf,                                                                // IID210
+    0x62, 0xdc, 0x2c, 0x14, 0xff, 0xcc,                                              // IID211
+#endif // _LP64
+    0x62, 0xf4, 0x64, 0x1c, 0xff, 0xcb,                                              // IID212
+#ifdef _LP64
+    0x62, 0xd4, 0x34, 0x10, 0xff, 0xc6,                                              // IID213
+    0x41, 0xff, 0xc4,                                                                // IID214
+    0x62, 0xfc, 0x74, 0x1c, 0xff, 0xc7,                                              // IID215
+    0x62, 0xdc, 0x14, 0x14, 0xff, 0xc5,                                              // IID216
+    0x62, 0xdc, 0x4c, 0x10, 0xd3, 0xe0,                                              // IID217
+    0x41, 0xd3, 0xe7,                                                                // IID218
+    0x62, 0xdc, 0x34, 0x1c, 0xd3, 0xe7,                                              // IID219
+    0x62, 0xdc, 0x1c, 0x14, 0xd3, 0xe4,                                              // IID220
+    0x62, 0xfc, 0x54, 0x10, 0xd3, 0xea,                                              // IID221
+    0xd5, 0x11, 0xd3, 0xe8,                                                          // IID222
+    0x62, 0xfc, 0x0c, 0x1c, 0xd3, 0xeb,                                              // IID223
+    0x62, 0xd4, 0x3c, 0x1c, 0xd3, 0xe8,                                              // IID224
+    0x62, 0x44, 0x7c, 0x08, 0xf4, 0xc9,                                              // IID225
+    0x62, 0x4c, 0x7c, 0x08, 0xf4, 0xd2,                                              // IID226
+    0x62, 0x5c, 0x7c, 0x0c, 0xf4, 0xc6,                                              // IID227
+    0x62, 0x4c, 0x7c, 0x0c, 0xf4, 0xd2,                                              // IID228
+    0x62, 0x4c, 0x78, 0x08, 0xf5, 0xac, 0xe1, 0x1e, 0xf0, 0x37, 0xf6,                // IID229
+    0x62, 0xcc, 0x78, 0x0c, 0xf5, 0xb4, 0x9b, 0x09, 0x7c, 0xf2, 0x38,                // IID230
+    0x62, 0x94, 0x50, 0x10, 0xf7, 0x9c, 0xb6, 0x7b, 0x2c, 0xf9, 0x39,                // IID231
+    0x62, 0xbc, 0x2c, 0x14, 0xf7, 0x9c, 0xf7, 0xc3, 0xe4, 0xd1, 0x9f,                // IID232
+    0x62, 0x4c, 0x78, 0x08, 0x88, 0x8c, 0x7c, 0xef, 0x20, 0xf1, 0x4f,                // IID233
+    0x62, 0x4c, 0x78, 0x0c, 0x88, 0xac, 0xc0, 0xbd, 0x44, 0xde, 0x97,                // IID234
+    0x62, 0x94, 0x40, 0x10, 0xd3, 0xa4, 0xbb, 0xbb, 0x24, 0x42, 0x7f,                // IID235
+    0x62, 0xbc, 0x18, 0x1c, 0xd3, 0xa4, 0x7f, 0x58, 0x78, 0x70, 0xfd,                // IID236
+    0x62, 0xbc, 0x60, 0x10, 0xd3, 0xbc, 0x70, 0xf3, 0x61, 0x47, 0xd8,                // IID237
+    0x62, 0xdc, 0x2c, 0x14, 0xd3, 0xb9, 0x48, 0x5d, 0x14, 0x3d,                      // IID238
+    0x62, 0x9c, 0x10, 0x18, 0xff, 0x8c, 0x43, 0x62, 0x38, 0x5f, 0x62,                // IID239
+    0x62, 0xfc, 0x24, 0x1c, 0xff, 0x8e, 0xa6, 0x04, 0x59, 0x76,                      // IID240
+    0x62, 0xf4, 0x30, 0x10, 0xff, 0x84, 0x4a, 0x91, 0xc8, 0xaf, 0x82,                // IID241
+    0x62, 0xd4, 0x4c, 0x14, 0xff, 0x84, 0x24, 0x57, 0xa2, 0xcd, 0xaf,                // IID242
+    0x62, 0xd4, 0x10, 0x18, 0xd3, 0xac, 0x25, 0x94, 0x17, 0x0c, 0xf4,                // IID243
+    0x62, 0xd4, 0x28, 0x14, 0xd3, 0xac, 0x5e, 0x47, 0x63, 0x3a, 0xdb,                // IID244
+    0x62, 0xac, 0x78, 0x08, 0xf4, 0x84, 0x9e, 0xd1, 0x6f, 0x7f, 0x80,                // IID245
+    0x62, 0xcc, 0x7c, 0x0c, 0xf4, 0xa4, 0xd7, 0x18, 0x48, 0x25, 0x12,                // IID246
+    0x62, 0x94, 0x54, 0x10, 0x81, 0x84, 0xd4, 0x06, 0xcf, 0x17, 0x64, 0x00, 0x00, 0x10, 0x00, // IID247
+    0x62, 0xd4, 0x34, 0x1c, 0x81, 0x85, 0xfd, 0xa5, 0xf1, 0x14, 0x00, 0x10, 0x00, 0x00, // IID248
+    0x62, 0x9c, 0x24, 0x10, 0x83, 0xa4, 0x05, 0x99, 0x87, 0x98, 0x37, 0x01,          // IID249
+    0x62, 0xd4, 0x24, 0x14, 0x81, 0xa1, 0x3f, 0xd2, 0x92, 0xbb, 0x00, 0x01, 0x00, 0x00, // IID250
+    0x62, 0xac, 0x78, 0x08, 0x6b, 0x8c, 0x0c, 0xdb, 0xb5, 0x57, 0x49, 0x10,          // IID251
+    0x62, 0x0c, 0x78, 0x0c, 0x6b, 0x8c, 0x7d, 0x3e, 0xa5, 0x26, 0x3c, 0x01,          // IID252
+    0x62, 0xd4, 0x04, 0x18, 0x81, 0x89, 0xe2, 0xb5, 0x68, 0xda, 0x00, 0x00, 0x00, 0x10, // IID253
+    0x62, 0xbc, 0x24, 0x1c, 0x81, 0x8c, 0xb8, 0x9f, 0x32, 0xa0, 0x66, 0x00, 0x10, 0x00, 0x00, // IID254
+    0x62, 0xb4, 0x70, 0x18, 0x80, 0x8c, 0x19, 0x5e, 0x48, 0xc6, 0x38, 0x01,          // IID255
+    0x62, 0x94, 0x34, 0x14, 0x80, 0x8c, 0x10, 0x34, 0x1c, 0x13, 0x79, 0x40,          // IID256
+    0x62, 0x94, 0x10, 0x18, 0xc1, 0xa4, 0xb9, 0xa9, 0x8b, 0x71, 0x12, 0x02,          // IID257
+    0x62, 0xdc, 0x04, 0x1c, 0xc1, 0xa1, 0x0d, 0xc9, 0xa7, 0xaf, 0x10,                // IID258
+    0x62, 0xf4, 0x00, 0x18, 0xd1, 0xbc, 0x19, 0x10, 0x15, 0x5c, 0x0c,                // IID259
+    0x62, 0xdc, 0x10, 0x1c, 0xc1, 0xbc, 0xad, 0x64, 0xcf, 0x98, 0x93, 0x08,          // IID260
+    0x62, 0xf4, 0x24, 0x18, 0xc1, 0xab, 0xd0, 0x67, 0x9f, 0x74, 0x10,                // IID261
+    0x62, 0xd4, 0x0c, 0x1c, 0xc1, 0xae, 0x48, 0xc2, 0x07, 0xaa, 0x04,                // IID262
+    0x62, 0xbc, 0x08, 0x10, 0x83, 0xac, 0x15, 0xe1, 0x14, 0x4d, 0x3b, 0x01,          // IID263
+    0x62, 0xfc, 0x1c, 0x14, 0x81, 0xaa, 0x5f, 0xb7, 0xdc, 0xba, 0x00, 0x00, 0x00, 0x01, // IID264
+    0x62, 0xd4, 0x68, 0x18, 0x81, 0xb4, 0x82, 0xb9, 0xe2, 0xe1, 0xe9, 0x00, 0x00, 0x00, 0x01, // IID265
+    0x62, 0xdc, 0x68, 0x1c, 0x81, 0xb4, 0x7d, 0xf8, 0xe2, 0x34, 0x1b, 0x00, 0x00, 0x00, 0x01, // IID266
+    0x62, 0x0c, 0x60, 0x10, 0x01, 0xac, 0x3b, 0xd8, 0xe7, 0x3c, 0x1f,                // IID267
+    0x62, 0x4c, 0x1c, 0x10, 0x01, 0xa4, 0xc8, 0x3e, 0x12, 0xac, 0x9f,                // IID268
+    0x62, 0x2c, 0x70, 0x14, 0x01, 0xac, 0xc2, 0x88, 0xe0, 0x08, 0xe4,                // IID269
+    0x62, 0x94, 0x70, 0x1c, 0x01, 0x8c, 0x67, 0x16, 0x82, 0x5b, 0x01,                // IID270
+    0x62, 0x64, 0x0c, 0x10, 0x09, 0xa4, 0xd3, 0x4c, 0xbf, 0xca, 0xb9,                // IID271
+    0x62, 0x8c, 0x6c, 0x10, 0x09, 0x94, 0xd4, 0x3b, 0xa7, 0x23, 0x35,                // IID272
+    0x62, 0x84, 0x34, 0x1c, 0x09, 0xac, 0x7f, 0xaa, 0x22, 0xf4, 0xd5,                // IID273
+    0x62, 0xec, 0x7c, 0x14, 0x09, 0x87, 0x01, 0x9b, 0xaf, 0xe9,                      // IID274
+    0x62, 0x8c, 0x1c, 0x10, 0x08, 0xa4, 0x1e, 0x3a, 0x1e, 0x28, 0x17,                // IID275
+    0x62, 0xb4, 0x68, 0x18, 0x08, 0x94, 0xbb, 0xbb, 0xb5, 0x77, 0x24,                // IID276
+    0x62, 0x44, 0x7c, 0x14, 0x08, 0x84, 0x4b, 0x51, 0x2e, 0x8a, 0xce,                // IID277
+    0x62, 0xd4, 0x60, 0x1c, 0x08, 0x9c, 0xe3, 0x2d, 0x84, 0x29, 0xdd,                // IID278
+    0x62, 0x9c, 0x28, 0x10, 0x29, 0x94, 0x73, 0xd2, 0x31, 0x64, 0xc2,                // IID279
+    0x62, 0x2c, 0x00, 0x10, 0x29, 0xbc, 0x6e, 0x19, 0x85, 0x21, 0x14,                // IID280
+    0x62, 0x54, 0x54, 0x14, 0x29, 0xa9, 0x86, 0xed, 0xaf, 0xef,                      // IID281
+    0x62, 0x04, 0x04, 0x14, 0x29, 0xbc, 0x01, 0x9f, 0x76, 0x1e, 0xf5,                // IID282
+    0x62, 0x7c, 0x04, 0x18, 0x31, 0xa2, 0xe5, 0xbc, 0x2b, 0x5c,                      // IID283
+    0x62, 0x4c, 0x20, 0x10, 0x31, 0x9c, 0x39, 0xb3, 0x78, 0x60, 0x5c,                // IID284
+    0x62, 0x54, 0x6c, 0x14, 0x31, 0xb4, 0xd0, 0x7f, 0xc7, 0x12, 0xf6,                // IID285
+    0x62, 0x54, 0x34, 0x1c, 0x31, 0x8f, 0xad, 0xcd, 0x5a, 0x77,                      // IID286
+    0x62, 0xac, 0x50, 0x10, 0x30, 0xbc, 0x52, 0xd5, 0x1f, 0xe3, 0x2f,                // IID287
+    0x62, 0x5c, 0x2c, 0x18, 0x30, 0x93, 0xde, 0x50, 0x31, 0x0a,                      // IID288
+    0x62, 0x2c, 0x68, 0x14, 0x30, 0x84, 0xf6, 0x97, 0xe8, 0xd4, 0x1a,                // IID289
+    0x62, 0x7c, 0x38, 0x1c, 0x30, 0x84, 0x20, 0x82, 0xae, 0x6e, 0x62,                // IID290
+    0x62, 0xd4, 0x54, 0x10, 0x81, 0xc7, 0x00, 0x00, 0x10, 0x00,                      // IID291
+    0x62, 0xfc, 0x7c, 0x18, 0x81, 0xc2, 0x00, 0x00, 0x10, 0x00,                      // IID292
+    0xd5, 0x10, 0x81, 0xc2, 0x00, 0x01, 0x00, 0x00,                                  // IID293
+    0x62, 0xfc, 0x14, 0x1c, 0x83, 0xc3, 0x10,                                        // IID294
+    0x62, 0xfc, 0x7c, 0x1c, 0x83, 0xc7, 0x10,                                        // IID295
+    0x62, 0xdc, 0x34, 0x14, 0x81, 0xc1, 0x00, 0x00, 0x00, 0x01,                      // IID296
+    0x62, 0xfc, 0x14, 0x10, 0x81, 0xe2, 0x00, 0x00, 0x10, 0x00,                      // IID297
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xe6, 0x00, 0x00, 0x10, 0x00,                      // IID298
+    0xd5, 0x10, 0x81, 0xe3, 0x00, 0x00, 0x01, 0x00,                                  // IID299
+    0x62, 0xdc, 0x24, 0x14, 0x81, 0xe1, 0x00, 0x00, 0x10, 0x00,                      // IID300
+    0x62, 0xfc, 0x7c, 0x1c, 0x81, 0xe4, 0x00, 0x00, 0x10, 0x00,                      // IID301
+    0x62, 0xdc, 0x1c, 0x14, 0x83, 0xe4, 0x10,                                        // IID302
+    0x62, 0x6c, 0x7c, 0x08, 0x69, 0xfe, 0x00, 0x10, 0x00, 0x00,                      // IID303
 #endif // _LP64
-    0x62, 0xf4, 0x7c, 0x1c, 0x81, 0xeb, 0x00, 0x00, 0x00, 0x01,                      // IID299
+    0x62, 0xf4, 0x7c, 0x08, 0x69, 0xc3, 0x00, 0x10, 0x00, 0x00,                      // IID304
 #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
+    0x62, 0x4c, 0x7c, 0x08, 0x69, 0xc0, 0x00, 0x00, 0x10, 0x00,                      // IID305
+    0x62, 0xec, 0x7c, 0x0c, 0x69, 0xe8, 0x00, 0x00, 0x01, 0x00,                      // IID306
+    0x62, 0xdc, 0x7c, 0x0c, 0x69, 0xc0, 0x00, 0x00, 0x01, 0x00,                      // IID307
+    0x62, 0x54, 0x7c, 0x0c, 0x6b, 0xed, 0x10,                                        // IID308
+    0x62, 0xd4, 0x14, 0x10, 0x81, 0xc8, 0x00, 0x00, 0x00, 0x01,                      // IID309
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xcc, 0x00, 0x00, 0x00, 0x01,                      // IID310
+    0xd5, 0x11, 0x81, 0xce, 0x00, 0x10, 0x00, 0x00,                                  // IID311
+    0x62, 0xf4, 0x3c, 0x14, 0x83, 0xca, 0x10,                                        // IID312
+    0x62, 0xd4, 0x7c, 0x1c, 0x83, 0xc8, 0x10,                                        // IID313
+    0x62, 0xd4, 0x14, 0x1c, 0x81, 0xcd, 0x00, 0x10, 0x00, 0x00,                      // IID314
+    0x62, 0xd4, 0x34, 0x10, 0xd1, 0xd5,                                              // IID315
+    0x62, 0xfc, 0x7c, 0x18, 0xd1, 0xd2,                                              // IID316
+    0x41, 0xc1, 0xd1, 0x10,                                                          // IID317
+    0x62, 0xdc, 0x2c, 0x10, 0xc1, 0xc1, 0x08,                                        // IID318
+#endif // _LP64
+    0x62, 0xf4, 0x7c, 0x18, 0xc1, 0xc2, 0x08,                                        // IID319
+#ifdef _LP64
+    0xd5, 0x11, 0xc1, 0xc0, 0x10,                                                    // IID320
+    0x62, 0xf4, 0x3c, 0x14, 0xc1, 0xc1, 0x08,                                        // IID321
+    0x62, 0xdc, 0x7c, 0x1c, 0xc1, 0xc6, 0x08,                                        // IID322
+    0x62, 0xdc, 0x1c, 0x14, 0xc1, 0xc4, 0x10,                                        // IID323
+    0x62, 0xdc, 0x74, 0x10, 0xc1, 0xcc, 0x04,                                        // IID324
+#endif // _LP64
+    0x62, 0xf4, 0x7c, 0x18, 0xc1, 0xca, 0x04,                                        // IID325
+#ifdef _LP64
+    0x41, 0xc1, 0xc8, 0x10,                                                          // IID326
+    0x62, 0xf4, 0x64, 0x14, 0xc1, 0xca, 0x10,                                        // IID327
+    0x62, 0xdc, 0x7c, 0x1c, 0xc1, 0xcf, 0x10,                                        // IID328
+    0x62, 0xfc, 0x4c, 0x14, 0xc1, 0xce, 0x08,                                        // IID329
+    0x62, 0xdc, 0x44, 0x10, 0xc1, 0xe1, 0x10,                                        // IID330
+    0x62, 0xd4, 0x7c, 0x18, 0xc1, 0xe6, 0x10,                                        // IID331
+    0xd5, 0x11, 0xc1, 0xe7, 0x08,                                                    // IID332
+    0x62, 0xdc, 0x0c, 0x14, 0xc1, 0xe0, 0x02,                                        // IID333
+    0x62, 0xdc, 0x7c, 0x1c, 0xc1, 0xe5, 0x02,                                        // IID334
+    0x62, 0xd4, 0x3c, 0x1c, 0xc1, 0xe0, 0x02,                                        // IID335
+    0x62, 0xdc, 0x6c, 0x10, 0xc1, 0xf8, 0x10,                                        // IID336
+    0x62, 0xd4, 0x7c, 0x18, 0xc1, 0xfd, 0x10,                                        // IID337
+    0xd5, 0x11, 0xd1, 0xf8,                                                          // IID338
+    0x62, 0xfc, 0x1c, 0x14, 0xc1, 0xf9, 0x10,                                        // IID339
+    0x62, 0xdc, 0x7c, 0x1c, 0xc1, 0xf8, 0x10,                                        // IID340
+    0x62, 0xfc, 0x74, 0x14, 0xc1, 0xf9, 0x04,                                        // IID341
+    0x62, 0xf4, 0x3c, 0x10, 0xc1, 0xe1, 0x04,                                        // IID342
+    0x62, 0xfc, 0x7c, 0x18, 0xc1, 0xe0, 0x04,                                        // IID343
+    0x41, 0xc1, 0xe7, 0x02,                                                          // IID344
+    0x62, 0xdc, 0x0c, 0x1c, 0xc1, 0xe3, 0x04,                                        // IID345
+    0x62, 0xfc, 0x7c, 0x1c, 0xc1, 0xe7, 0x04,                                        // IID346
+    0x62, 0xdc, 0x0c, 0x14, 0xc1, 0xe6, 0x04,                                        // IID347
+    0x62, 0xf4, 0x24, 0x10, 0xc1, 0xea, 0x02,                                        // IID348
+    0x62, 0xfc, 0x7c, 0x18, 0xc1, 0xeb, 0x02,                                        // IID349
+    0xd5, 0x10, 0xc1, 0xec, 0x02,                                                    // IID350
+    0x62, 0xfc, 0x54, 0x14, 0xd1, 0xef,                                              // IID351
+    0x62, 0xdc, 0x7c, 0x1c, 0xd1, 0xee,                                              // IID352
+    0x62, 0xdc, 0x34, 0x14, 0xc1, 0xe9, 0x02,                                        // IID353
+    0x62, 0xfc, 0x3c, 0x10, 0x81, 0xeb, 0x00, 0x00, 0x10, 0x00,                      // IID354
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xee, 0x00, 0x00, 0x10, 0x00,                      // IID355
+    0xd5, 0x10, 0x81, 0xee, 0x00, 0x00, 0x00, 0x10,                                  // IID356
+    0x62, 0xdc, 0x3c, 0x14, 0x81, 0xe8, 0x00, 0x00, 0x01, 0x00,                      // IID357
+    0x62, 0xd4, 0x7c, 0x1c, 0x81, 0xee, 0x00, 0x00, 0x01, 0x00,                      // IID358
+    0x62, 0xdc, 0x1c, 0x14, 0x81, 0xec, 0x00, 0x00, 0x00, 0x10,                      // IID359
+    0x62, 0xfc, 0x64, 0x18, 0x81, 0xf4, 0x00, 0x01, 0x00, 0x00,                      // IID360
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xf7, 0x00, 0x01, 0x00, 0x00,                      // IID361
+#endif // _LP64
+    0x81, 0xf3, 0x00, 0x10, 0x00, 0x00,                                              // IID362
+#ifdef _LP64
+    0x62, 0xdc, 0x3c, 0x14, 0x81, 0xf6, 0x00, 0x00, 0x01, 0x00,                      // IID363
+    0x62, 0xdc, 0x7c, 0x1c, 0x81, 0xf7, 0x00, 0x00, 0x01, 0x00,                      // IID364
+    0x62, 0xdc, 0x04, 0x14, 0x81, 0xf7, 0x00, 0x10, 0x00, 0x00,                      // IID365
+    0x62, 0xd4, 0x5c, 0x10, 0x81, 0xea, 0x00, 0x00, 0x10, 0x00,                      // IID366
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xed, 0x00, 0x00, 0x10, 0x00,                      // IID367
+    0xd5, 0x11, 0x81, 0xe9, 0x00, 0x00, 0x10, 0x00,                                  // IID368
+    0x62, 0xd4, 0x44, 0x14, 0x81, 0xec, 0x00, 0x00, 0x00, 0x40,                      // IID369
+    0x62, 0xfc, 0x7c, 0x1c, 0x81, 0xe8, 0x00, 0x00, 0x00, 0x40,                      // IID370
+    0x62, 0xdc, 0x04, 0x14, 0x81, 0xef, 0x00, 0x00, 0x01, 0x00,                      // IID371
+    0x62, 0x54, 0x74, 0x10, 0x03, 0xa9, 0x98, 0x2f, 0xef, 0x7f,                      // IID372
+    0x62, 0x7c, 0x14, 0x14, 0x03, 0x86, 0x54, 0xf5, 0x08, 0xb2,                      // IID373
+    0x62, 0x84, 0x14, 0x18, 0x23, 0x8c, 0xfc, 0x02, 0xa9, 0xa8, 0x50,                // IID374
+    0x62, 0x0c, 0x4c, 0x14, 0x23, 0x8c, 0x92, 0x54, 0x27, 0xea, 0x70,                // IID375
+    0x62, 0x1c, 0x64, 0x10, 0xaf, 0xa4, 0x06, 0x73, 0x0a, 0x1a, 0x6a,                // IID376
+    0x62, 0xec, 0x08, 0x14, 0xaf, 0x94, 0x9a, 0x39, 0xd7, 0x32, 0x80,                // IID377
+    0x62, 0x0c, 0x7c, 0x10, 0x0b, 0xbc, 0xd9, 0xbc, 0x5d, 0x2d, 0x48,                // IID378
+    0x62, 0x44, 0x34, 0x1c, 0x0b, 0x9b, 0x01, 0xee, 0xd5, 0x43,                      // IID379
+    0x62, 0xac, 0x74, 0x18, 0x2b, 0xbc, 0xbd, 0xbc, 0xc2, 0x25, 0x28,                // IID380
+    0x62, 0x84, 0x24, 0x14, 0x2b, 0xb4, 0x7d, 0xa7, 0x0d, 0x1f, 0x77,                // IID381
+    0x62, 0x44, 0x30, 0x18, 0x33, 0xb4, 0xf1, 0x72, 0x37, 0x29, 0xb5,                // IID382
+    0x62, 0xa4, 0x20, 0x1c, 0x33, 0x84, 0xa3, 0xee, 0x23, 0x02, 0x0b,                // IID383
+    0x62, 0x04, 0x00, 0x18, 0x32, 0xac, 0x67, 0x97, 0x85, 0xd6, 0xe0,                // IID384
+    0x62, 0x6c, 0x74, 0x14, 0x32, 0xb4, 0x5f, 0x45, 0x75, 0xdc, 0x0a,                // IID385
+    0x62, 0x74, 0x21, 0x10, 0x33, 0x8c, 0xb2, 0x9f, 0xf0, 0x26, 0xbc,                // IID386
+    0x62, 0xcc, 0x61, 0x1c, 0x33, 0xb4, 0x34, 0x4f, 0x5f, 0xcf, 0x82,                // IID387
+    0x62, 0x64, 0x0c, 0x18, 0x03, 0xc1,                                              // IID388
+    0xd5, 0x14, 0x03, 0xc1,                                                          // IID389
+    0x62, 0x44, 0x2c, 0x14, 0x03, 0xc4,                                              // IID390
+    0x62, 0x6c, 0x3c, 0x14, 0x03, 0xc7,                                              // IID391
+    0x62, 0x4c, 0x14, 0x18, 0x23, 0xd7,                                              // IID392
+    0x45, 0x23, 0xd8,                                                                // IID393
+    0x62, 0xc4, 0x74, 0x1c, 0x23, 0xdf,                                              // IID394
+    0x62, 0x54, 0x1c, 0x1c, 0x23, 0xe4,                                              // IID395
+    0x62, 0xec, 0x4c, 0x10, 0xaf, 0xe3,                                              // IID396
+    0x44, 0x0f, 0xaf, 0xc2,                                                          // IID397
+    0x62, 0x6c, 0x4c, 0x14, 0xaf, 0xdf,                                              // IID398
+    0x62, 0x7c, 0x34, 0x1c, 0xaf, 0xca,                                              // IID399
+    0x62, 0x44, 0x75, 0x18, 0x0b, 0xf5,                                              // IID400
+    0x66, 0xd5, 0x54, 0x0b, 0xe3,                                                    // IID401
+    0x62, 0x4c, 0x1d, 0x1c, 0x0b, 0xf3,                                              // IID402
+    0x62, 0x7c, 0x3d, 0x1c, 0x0b, 0xc6,                                              // IID403
+    0x62, 0xdc, 0x7c, 0x10, 0x0b, 0xce,                                              // IID404
+    0xd5, 0x15, 0x0b, 0xd1,                                                          // IID405
+    0x62, 0xec, 0x04, 0x1c, 0x0b, 0xc9,                                              // IID406
+    0x62, 0x5c, 0x34, 0x1c, 0x0b, 0xce,                                              // IID407
+    0x62, 0x7c, 0x5c, 0x10, 0xa5, 0xc5,                                              // IID408
+    0xd5, 0x95, 0xa5, 0xf2,                                                          // IID409
+    0x62, 0x74, 0x7c, 0x14, 0xa5, 0xf2,                                              // IID410
+    0x62, 0x7c, 0x64, 0x14, 0xa5, 0xc3,                                              // IID411
+    0x62, 0x64, 0x24, 0x10, 0xad, 0xd3,                                              // IID412
+    0xd5, 0xd1, 0xad, 0xdc,                                                          // IID413
+    0x62, 0x54, 0x74, 0x1c, 0xad, 0xf3,                                              // IID414
+    0x62, 0xcc, 0x04, 0x14, 0xad, 0xdf,                                              // IID415
+    0x62, 0x5c, 0x2c, 0x10, 0x2b, 0xe9,                                              // IID416
+    0xd5, 0x45, 0x2b, 0xc3,                                                          // IID417
+    0x62, 0xc4, 0x6c, 0x14, 0x2b, 0xe5,                                              // IID418
+    0x62, 0xec, 0x7c, 0x14, 0x2b, 0xc2,                                              // IID419
+    0x62, 0xc4, 0x64, 0x10, 0x33, 0xc8,                                              // IID420
+    0xd5, 0x41, 0x33, 0xdd,                                                          // IID421
+    0x62, 0x54, 0x44, 0x14, 0x33, 0xef,                                              // IID422
+    0x62, 0x5c, 0x24, 0x1c, 0x33, 0xdd,                                              // IID423
+    0x62, 0xec, 0x14, 0x10, 0x24, 0xc9, 0x01,                                        // IID424
+    0xd5, 0xd4, 0xa4, 0xc6, 0x04,                                                    // IID425
+    0x62, 0x5c, 0x3c, 0x1c, 0x24, 0xdc, 0x10,                                        // IID426
+    0x62, 0xc4, 0x04, 0x1c, 0x24, 0xff, 0x04,                                        // IID427
+    0x62, 0xec, 0x14, 0x10, 0x2c, 0xc6, 0x04,                                        // IID428
+    0x45, 0x0f, 0xac, 0xcd, 0x04,                                                    // IID429
+    0x62, 0x7c, 0x04, 0x1c, 0x2c, 0xe5, 0x02,                                        // IID430
+    0x62, 0xec, 0x74, 0x14, 0x2c, 0xf9, 0x02,                                        // IID431
+    0x62, 0xcc, 0x6c, 0x18, 0x40, 0xc5,                                              // IID432
+    0xd5, 0x94, 0x40, 0xd5,                                                          // IID433
+    0x62, 0x6c, 0x74, 0x10, 0x41, 0xea,                                              // IID434
+    0xd5, 0xd5, 0x41, 0xe0,                                                          // IID435
+    0x62, 0xcc, 0x2c, 0x18, 0x42, 0xe3,                                              // IID436
+    0x45, 0x0f, 0x42, 0xd6,                                                          // IID437
+    0x62, 0x64, 0x24, 0x18, 0x43, 0xd9,                                              // IID438
+    0xd5, 0xc1, 0x43, 0xf7,                                                          // IID439
+    0x62, 0x6c, 0x04, 0x10, 0x44, 0xf3,                                              // IID440
+    0xd5, 0xd1, 0x44, 0xda,                                                          // IID441
+    0x62, 0x5c, 0x54, 0x10, 0x45, 0xf2,                                              // IID442
+    0xd5, 0xc1, 0x45, 0xe7,                                                          // IID443
+    0x62, 0x7c, 0x1c, 0x18, 0x46, 0xef,                                              // IID444
+    0xd5, 0xd4, 0x46, 0xe4,                                                          // IID445
+    0x62, 0x44, 0x5c, 0x10, 0x47, 0xc3,                                              // IID446
+    0x45, 0x0f, 0x47, 0xd7,                                                          // IID447
+    0x62, 0xec, 0x64, 0x10, 0x48, 0xe7,                                              // IID448
+    0xd5, 0x95, 0x48, 0xfa,                                                          // IID449
+    0x62, 0x6c, 0x64, 0x10, 0x49, 0xc7,                                              // IID450
+    0xd5, 0xc5, 0x49, 0xe3,                                                          // IID451
+    0x44, 0x0f, 0x4a, 0xea,                                                          // IID452
+    0xd5, 0xd4, 0x4a, 0xff,                                                          // IID453
+    0x62, 0x5c, 0x44, 0x10, 0x4b, 0xcb,                                              // IID454
+    0xd5, 0xd0, 0x4b, 0xec,                                                          // IID455
+    0x62, 0xcc, 0x3c, 0x10, 0x4c, 0xed,                                              // IID456
+    0x41, 0x0f, 0x4c, 0xdb,                                                          // IID457
+    0x62, 0xf4, 0x54, 0x10, 0x4d, 0xd9,                                              // IID458
+    0xd5, 0xd4, 0x4d, 0xfd,                                                          // IID459
+    0x62, 0x4c, 0x04, 0x18, 0x4e, 0xce,                                              // IID460
+    0xd5, 0xd1, 0x4e, 0xf9,                                                          // IID461
+    0x62, 0xd4, 0x6c, 0x10, 0x4f, 0xca,                                              // IID462
+    0xd5, 0x91, 0x4f, 0xcf,                                                          // IID463
+    0x62, 0xcc, 0x54, 0x10, 0x40, 0x9a, 0x8d, 0xf7, 0xd6, 0x91,                      // IID464
+    0x62, 0xec, 0x3c, 0x10, 0x41, 0x9c, 0x0e, 0x9a, 0x5f, 0xf8, 0x11,                // IID465
+    0x62, 0x6c, 0x74, 0x10, 0x42, 0x84, 0x24, 0x5e, 0x77, 0x4d, 0x53,                // IID466
+    0x62, 0xec, 0x5c, 0x10, 0x43, 0x94, 0x24, 0x33, 0xb1, 0x36, 0xb8,                // IID467
+    0x62, 0x7c, 0x34, 0x18, 0x44, 0xaf, 0x9d, 0x3a, 0x7c, 0xb4,                      // IID468
+    0x62, 0x0c, 0x24, 0x18, 0x45, 0x8c, 0x70, 0x51, 0xf8, 0x9a, 0xbb,                // IID469
+    0x62, 0x0c, 0x0c, 0x18, 0x46, 0x84, 0xae, 0x1d, 0x66, 0xd0, 0x00,                // IID470
+    0x62, 0x04, 0x10, 0x18, 0x47, 0x8c, 0xde, 0x03, 0x14, 0x7e, 0x04,                // IID471
+    0x62, 0xe4, 0x3c, 0x10, 0x48, 0x9c, 0xd1, 0xe8, 0xac, 0xb5, 0x9b,                // IID472
+    0x62, 0x6c, 0x28, 0x10, 0x49, 0x84, 0x36, 0x46, 0x24, 0x35, 0x70,                // IID473
+    0x62, 0x04, 0x60, 0x10, 0x4a, 0x94, 0xb0, 0x5c, 0x2f, 0xa1, 0x78,                // IID474
+    0x62, 0x5c, 0x10, 0x10, 0x4b, 0x9c, 0x21, 0x3a, 0x30, 0xa8, 0x27,                // IID475
+    0x62, 0x4c, 0x48, 0x10, 0x4c, 0x84, 0x43, 0x10, 0x1a, 0x54, 0x02,                // IID476
+    0x62, 0x54, 0x00, 0x10, 0x4d, 0xbc, 0xc0, 0x51, 0x32, 0x8e, 0x55,                // IID477
+    0x62, 0x84, 0x24, 0x10, 0x4e, 0x94, 0x10, 0x49, 0x78, 0xe6, 0xb8,                // IID478
+    0x62, 0xec, 0x68, 0x10, 0x4f, 0x84, 0x9a, 0xe2, 0x17, 0xf5, 0xed,                // IID479
+    0xd5, 0x19, 0x13, 0xdf,                                                          // IID480
+    0xd5, 0x5d, 0x3b, 0xf7,                                                          // IID481
+    0xd5, 0xdd, 0xaf, 0xec,                                                          // IID482
+    0xf3, 0xd5, 0xcd, 0xb8, 0xca,                                                    // IID483
+    0xd5, 0x5c, 0x1b, 0xc4,                                                          // IID484
+    0xd5, 0x48, 0x2b, 0xc2,                                                          // IID485
+    0xf3, 0xd5, 0xdd, 0xbc, 0xd4,                                                    // IID486
+    0xf3, 0xd5, 0xcd, 0xbd, 0xe1,                                                    // IID487
+    0xd5, 0x59, 0x03, 0xe0,                                                          // IID488
+    0xd5, 0x5d, 0x23, 0xc5,                                                          // IID489
+    0xd5, 0x59, 0x0b, 0xfb,                                                          // IID490
+    0x4d, 0x33, 0xfc,                                                                // IID491
+    0xd5, 0x58, 0x8b, 0xd3,                                                          // IID492
+    0xd5, 0xcc, 0xbc, 0xf9,                                                          // IID493
+    0x4d, 0x0f, 0xbd, 0xcd,                                                          // IID494
+    0xd5, 0x98, 0xa3, 0xcc,                                                          // IID495
+    0xd5, 0x1c, 0x87, 0xc5,                                                          // IID496
+    0xd5, 0x4d, 0x85, 0xc6,                                                          // IID497
+    0xd5, 0x6c, 0x01, 0xac, 0xb9, 0x4d, 0x6c, 0xf0, 0x4f,                            // IID498
+    0xd5, 0x5f, 0x21, 0x94, 0x50, 0x77, 0x5e, 0x26, 0x8a,                            // IID499
+    0xd5, 0x48, 0x39, 0x8c, 0x1b, 0x9c, 0xd5, 0x33, 0x40,                            // IID500
+    0xd5, 0x5a, 0x09, 0x94, 0xe6, 0x83, 0xcb, 0x6c, 0xc7,                            // IID501
+    0xd5, 0x3c, 0x31, 0xa4, 0xfc, 0x60, 0x15, 0x31, 0x4b,                            // IID502
+    0xd5, 0x6f, 0x29, 0xac, 0xa2, 0x57, 0x26, 0x3a, 0x5c,                            // IID503
+    0xd5, 0x6b, 0x89, 0xb4, 0xcd, 0x3f, 0x6f, 0x3d, 0x1a,                            // IID504
+    0xd5, 0xfe, 0xc1, 0x8c, 0xc1, 0x28, 0x24, 0x52, 0xca,                            // IID505
+    0xd5, 0x19, 0x81, 0xa1, 0xc3, 0x84, 0x21, 0x63, 0x00, 0x00, 0x00, 0x01,          // IID506
+    0x4b, 0x81, 0x84, 0x2d, 0x3a, 0x15, 0x8d, 0xc6, 0x00, 0x00, 0x00, 0x01,          // IID507
+    0x49, 0x81, 0xb9, 0xfa, 0x37, 0x4b, 0xec, 0x00, 0x10, 0x00, 0x00,                // IID508
+    0xd5, 0x19, 0xd1, 0xbf, 0x51, 0xf5, 0xa7, 0x4f,                                  // IID509
+    0xd5, 0x3a, 0xd1, 0xa4, 0xbd, 0x32, 0x82, 0xaa, 0x31,                            // IID510
+    0xd5, 0x3b, 0x81, 0x9c, 0xb8, 0x49, 0xc7, 0x9a, 0xb9, 0x00, 0x00, 0x00, 0x10,    // IID511
+    0xd5, 0x39, 0xc1, 0xac, 0x34, 0x4f, 0x7a, 0x01, 0xc1, 0x02,                      // IID512
+    0xd5, 0x18, 0x81, 0xa8, 0x15, 0x5c, 0x76, 0xec, 0x00, 0x00, 0x10, 0x00,          // IID513
+    0xd5, 0x1b, 0x83, 0xb4, 0x05, 0x15, 0x26, 0x02, 0x1d, 0x10,                      // IID514
+    0xd5, 0x2b, 0x83, 0x8c, 0x64, 0x1e, 0x67, 0x37, 0xcb, 0x01,                      // IID515
+    0xd5, 0x2a, 0xc7, 0x84, 0x81, 0xf8, 0x14, 0xbb, 0xe9, 0x00, 0x01, 0x00, 0x00,    // IID516
+    0xd5, 0x19, 0xf7, 0x85, 0xf5, 0x76, 0xdc, 0x82, 0x00, 0x00, 0xff, 0xff,          // IID517
+    0xd5, 0x68, 0x03, 0xbc, 0x99, 0x54, 0xc6, 0xea, 0x70,                            // IID518
+    0xd5, 0x1b, 0x23, 0x94, 0x38, 0x57, 0x25, 0xb2, 0xdf,                            // IID519
+    0xd5, 0x1a, 0x3b, 0x94, 0xdf, 0xbd, 0x30, 0xc9, 0x32,                            // IID520
+    0xf3, 0xd5, 0xcc, 0xbd, 0xa2, 0x71, 0x3d, 0xcc, 0xab,                            // IID521
+    0xd5, 0x5a, 0x0b, 0xb4, 0x73, 0xc8, 0x82, 0x39, 0xd3,                            // IID522
+    0x4d, 0x13, 0x92, 0x9f, 0xc5, 0xd7, 0x03,                                        // IID523
+    0x4f, 0x0f, 0xaf, 0x94, 0xc0, 0xd3, 0x79, 0x9e, 0xf1,                            // IID524
+    0xf3, 0xd5, 0xd9, 0xb8, 0xbd, 0x93, 0x26, 0x81, 0x88,                            // IID525
+    0xd5, 0x28, 0x1b, 0x8c, 0x5b, 0xcb, 0x01, 0xc6, 0x53,                            // IID526
+    0xd5, 0x1c, 0x2b, 0xb4, 0x19, 0x8d, 0x0f, 0x74, 0x89,                            // IID527
+    0xf3, 0xd5, 0xed, 0xbc, 0xac, 0x5a, 0x3c, 0x8d, 0xc9, 0x30,                      // IID528
+    0xd5, 0x3e, 0x33, 0x94, 0x18, 0xfe, 0x29, 0xf7, 0xc2,                            // IID529
+    0xd5, 0x7b, 0x8b, 0x94, 0xe4, 0x6f, 0x53, 0x04, 0x9d,                            // IID530
+    0x48, 0x8d, 0x99, 0xa5, 0x02, 0x06, 0x45,                                        // IID531
+    0xf2, 0xd5, 0xbf, 0x2c, 0xa4, 0x3e, 0xd0, 0x59, 0x67, 0x98,                      // IID532
+    0xd5, 0x5f, 0x87, 0xbc, 0x50, 0x13, 0xed, 0x98, 0x8f,                            // IID533
+    0xd5, 0x2d, 0x85, 0xb4, 0xe5, 0xf2, 0x81, 0x10, 0x17,                            // IID534
+    0xd5, 0x19, 0x83, 0xc7, 0x10,                                                    // IID535
+    0xd5, 0x19, 0x83, 0xe1, 0x10,                                                    // IID536
+    0xd5, 0x18, 0x81, 0xd7, 0x00, 0x01, 0x00, 0x00,                                  // IID537
+    0xd5, 0x18, 0x81, 0xfb, 0x00, 0x00, 0x00, 0x10,                                  // IID538
+    0xd5, 0x19, 0xd1, 0xd7,                                                          // IID539
+    0xd5, 0x18, 0xd1, 0xd9,                                                          // IID540
+    0xd5, 0x19, 0xc1, 0xc1, 0x02,                                                    // IID541
+    0xd5, 0x18, 0xc1, 0xc9, 0x04,                                                    // IID542
+    0xd5, 0x19, 0xd1, 0xfc,                                                          // IID543
+    0x49, 0xc1, 0xe7, 0x04,                                                          // IID544
+    0x48, 0x81, 0xdb, 0x00, 0x00, 0x01, 0x00,                                        // IID545
+    0xd5, 0x18, 0xd1, 0xe5,                                                          // IID546
+    0x49, 0xd1, 0xea,                                                                // IID547
+    0x49, 0x83, 0xee, 0x10,                                                          // IID548
+    0xd5, 0x18, 0x81, 0xf2, 0x00, 0x00, 0x00, 0x10,                                  // IID549
+    0xd5, 0x18, 0xc7, 0xc7, 0x10, 0x00, 0x00, 0x00,                                  // IID550
+    0x49, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,                      // IID551
+    0x49, 0x0f, 0xba, 0xe6, 0x04,                                                    // IID552
+    0xd5, 0x19, 0xf7, 0xc0, 0x00, 0xf0, 0xff, 0xff,                                  // IID553
+    0xd5, 0x18, 0x81, 0xcb, 0x00, 0x00, 0x10, 0x00,                                  // IID554
+    0x48, 0x81, 0xe9, 0x00, 0x00, 0x00, 0x10,                                        // IID555
+    0xd5, 0x98, 0x40, 0x94, 0xdb, 0xc4, 0xc8, 0x11, 0x02,                            // IID556
+    0xd5, 0x98, 0x41, 0x9d, 0x43, 0x77, 0x26, 0x49,                                  // IID557
+    0xd5, 0xeb, 0x42, 0xac, 0x60, 0xba, 0xd6, 0x73, 0xb3,                            // IID558
+    0xd5, 0xbd, 0x43, 0xa4, 0x22, 0x64, 0x07, 0xb2, 0xd9,                            // IID559
+    0xd5, 0xdb, 0x44, 0x8c, 0x8c, 0x6b, 0x19, 0x97, 0x34,                            // IID560
+    0xd5, 0xad, 0x45, 0xac, 0x7f, 0x67, 0xf6, 0x5c, 0xd8,                            // IID561
+    0xd5, 0xd8, 0x46, 0xb6, 0x05, 0xab, 0x39, 0x0f,                                  // IID562
+    0xd5, 0xba, 0x47, 0x8c, 0xd6, 0xb4, 0x6a, 0x73, 0xfb,                            // IID563
+    0xd5, 0xfc, 0x48, 0x8c, 0x2b, 0x0b, 0x5b, 0x40, 0x0e,                            // IID564
+    0xd5, 0xbe, 0x49, 0xa4, 0xeb, 0xb5, 0xfb, 0x9d, 0x88,                            // IID565
+    0xd5, 0x9b, 0x4a, 0x9c, 0x56, 0xdd, 0x7c, 0x86, 0xe6,                            // IID566
+    0xd5, 0xfb, 0x4b, 0xac, 0x38, 0xd5, 0x9a, 0xce, 0xa8,                            // IID567
+    0xd5, 0xcb, 0x4c, 0x94, 0x50, 0x77, 0x41, 0xec, 0xa9,                            // IID568
+    0xd5, 0xfc, 0x4d, 0xa4, 0xed, 0xc4, 0xfd, 0xa0, 0x65,                            // IID569
+    0xd5, 0xe9, 0x4e, 0xbc, 0x13, 0xf4, 0x0e, 0xe5, 0xe2,                            // IID570
+    0xd5, 0xda, 0x4f, 0xb4, 0x62, 0x38, 0x1c, 0x5f, 0x1a,                            // IID571
+    0xd5, 0x10, 0xff, 0xd7,                                                          // IID572
+    0xd5, 0x19, 0xf7, 0xf6,                                                          // IID573
+    0xd5, 0x18, 0xf7, 0xfb,                                                          // IID574
+    0x49, 0xf7, 0xe9,                                                                // IID575
+    0x49, 0xf7, 0xe5,                                                                // IID576
+    0xd5, 0x18, 0xf7, 0xd8,                                                          // IID577
+    0xd5, 0x19, 0xf7, 0xd5,                                                          // IID578
+    0x48, 0xd3, 0xc1,                                                                // IID579
+    0xd5, 0x19, 0xd3, 0xc9,                                                          // IID580
+    0x49, 0xd3, 0xf8,                                                                // IID581
+    0xd5, 0x19, 0xd3, 0xe3,                                                          // IID582
+    0xd5, 0x19, 0xd3, 0xe6,                                                          // IID583
+    0xd5, 0x18, 0xd3, 0xef,                                                          // IID584
+    0x48, 0xff, 0xc3,                                                                // IID585
+    0x49, 0xff, 0xce,                                                                // IID586
+    0xd5, 0x18, 0x55,                                                                // IID587
+    0xd5, 0x18, 0x5d,                                                                // IID588
+    0xd5, 0x30, 0xff, 0x94, 0x6c, 0x2f, 0xaf, 0xc6, 0x56,                            // IID589
+    0xd5, 0x39, 0xf7, 0xa4, 0xdf, 0xdd, 0x14, 0x4b, 0xfe,                            // IID590
+    0xd5, 0x3b, 0xf7, 0x9c, 0x1b, 0xe1, 0x03, 0x24, 0xa7,                            // IID591
+    0xd5, 0x28, 0xd3, 0xbc, 0xb3, 0x2f, 0xb6, 0x9c, 0x9f,                            // IID592
+    0xd5, 0x39, 0xd3, 0xa4, 0xfa, 0x79, 0xa0, 0x95, 0x0b,                            // IID593
+    0xd5, 0x2b, 0xd3, 0xac, 0x16, 0x09, 0x4e, 0x54, 0x03,                            // IID594
+    0xd5, 0x19, 0xff, 0x84, 0x13, 0x50, 0x32, 0x0b, 0x12,                            // IID595
+    0xd5, 0x2b, 0xff, 0x8c, 0x89, 0x35, 0x13, 0x55, 0xcb,                            // IID596
+    0xd5, 0x7a, 0x69, 0xa4, 0x60, 0x5b, 0xfa, 0x21, 0xa6, 0x00, 0x00, 0x10, 0x00,    // IID597
+    0xd5, 0x58, 0x69, 0xcf, 0x00, 0x01, 0x00, 0x00,                                  // IID598
+    0xd5, 0x9c, 0xa4, 0xdb, 0x08,                                                    // IID599
+    0xd5, 0x9d, 0xac, 0xd4, 0x08,                                                    // IID600
+    0x62, 0xdc, 0x2c, 0x10, 0x8f, 0xc5,                                              // IID601
+    0x62, 0xfc, 0xac, 0x18, 0x8f, 0xc6,                                              // IID602
+    0x62, 0xdc, 0x0c, 0x10, 0xff, 0xf1,                                              // IID603
+    0x62, 0xdc, 0x84, 0x18, 0xff, 0xf4,                                              // IID604
+    0xd5, 0xbd, 0xb6, 0x9c, 0x9d, 0xcc, 0x72, 0xc9, 0xed,                            // IID605
+    0xd5, 0xaf, 0xb7, 0xb4, 0xb0, 0x22, 0x6d, 0x6c, 0xb5,                            // IID606
+    0xd5, 0xde, 0xbe, 0xa4, 0x3f, 0x54, 0xcb, 0x89, 0x61,                            // IID607
+    0xd5, 0xec, 0xbf, 0xa4, 0xfb, 0x9f, 0x9a, 0x17, 0xd2,                            // IID608
+    0x4c, 0x0f, 0xb6, 0xd9,                                                          // IID609
+    0xd5, 0xcd, 0xb7, 0xf7,                                                          // IID610
+    0x4c, 0x0f, 0xbe, 0xf1,                                                          // IID611
+    0xd5, 0xc9, 0xbf, 0xf9,                                                          // IID612
+    0x4f, 0x0f, 0xb1, 0xa4, 0x55, 0xc6, 0xd3, 0x39, 0xf8,                            // IID613
+    0x62, 0xf4, 0xfc, 0x08, 0xf7, 0xf9,                                              // IID614
+    0x62, 0xd4, 0xfc, 0x0c, 0xf7, 0xff,                                              // IID615
+    0x62, 0xfc, 0xfc, 0x08, 0xf7, 0xf7,                                              // IID616
+    0x62, 0xdc, 0xfc, 0x0c, 0xf7, 0xf0,                                              // IID617
+    0x62, 0xdc, 0xfc, 0x08, 0xf7, 0xeb,                                              // IID618
+    0x62, 0xdc, 0xfc, 0x0c, 0xf7, 0xee,                                              // IID619
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xe4,                                              // IID620
+    0x62, 0xf4, 0xfc, 0x0c, 0xf7, 0xe1,                                              // IID621
+    0x62, 0x94, 0xfc, 0x08, 0xf7, 0xa4, 0xcd, 0x6c, 0x54, 0x95, 0xdd,                // IID622
+    0x62, 0x94, 0xf8, 0x0c, 0xf7, 0xa4, 0xc5, 0xfb, 0x89, 0x93, 0xd7,                // IID623
+    0x62, 0xcc, 0xfc, 0x08, 0xaf, 0xee,                                              // IID624
+    0xd5, 0x18, 0xf7, 0xe9,                                                          // IID625
+    0x62, 0x44, 0xfc, 0x0c, 0xaf, 0xec,                                              // IID626
+    0x62, 0x4c, 0xfc, 0x0c, 0xaf, 0xf6,                                              // IID627
+    0x62, 0x44, 0xfc, 0x08, 0xf5, 0xc7,                                              // IID628
+    0x62, 0x4c, 0xfc, 0x08, 0xf5, 0xc9,                                              // IID629
+    0x62, 0x6c, 0xfc, 0x0c, 0xf5, 0xcd,                                              // IID630
+    0x62, 0xec, 0xfc, 0x0c, 0xf5, 0xf6,                                              // IID631
+    0x62, 0xdc, 0xf4, 0x10, 0xf7, 0xde,                                              // IID632
+    0xd5, 0x18, 0xf7, 0xd9,                                                          // IID633
+    0x62, 0xfc, 0x84, 0x14, 0xf7, 0xd9,                                              // IID634
+    0x62, 0xdc, 0x94, 0x14, 0xf7, 0xdd,                                              // IID635
+    0x62, 0xd4, 0xac, 0x18, 0xf7, 0xd1,                                              // IID636
+    0xd5, 0x19, 0xf7, 0xd0,                                                          // IID637
+    0x62, 0x44, 0xfc, 0x08, 0x88, 0xe7,                                              // IID638
+    0x62, 0x54, 0xfc, 0x08, 0x88, 0xd2,                                              // IID639
+    0x62, 0x4c, 0xfc, 0x0c, 0x88, 0xde,                                              // IID640
+    0x62, 0x4c, 0xfc, 0x0c, 0x88, 0xe4,                                              // IID641
+    0x62, 0xd4, 0x9c, 0x10, 0xd3, 0xc6,                                              // IID642
+    0xd5, 0x18, 0xd3, 0xc7,                                                          // IID643
+    0x62, 0xdc, 0xc4, 0x14, 0xd3, 0xc0,                                              // IID644
+    0x62, 0xfc, 0xd4, 0x14, 0xd3, 0xc5,                                              // IID645
+    0x62, 0xfc, 0x84, 0x10, 0xd3, 0xce,                                              // IID646
+    0xd5, 0x19, 0xd3, 0xcc,                                                          // IID647
+    0x62, 0xd4, 0xf4, 0x14, 0xd3, 0xca,                                              // IID648
+    0x62, 0xd4, 0xb4, 0x1c, 0xd3, 0xc9,                                              // IID649
+    0x62, 0xdc, 0x94, 0x10, 0xd3, 0xe6,                                              // IID650
+    0x49, 0xd3, 0xe3,                                                                // IID651
+    0x62, 0xd4, 0xac, 0x14, 0xd3, 0xe3,                                              // IID652
+    0x62, 0xfc, 0xfc, 0x14, 0xd3, 0xe0,                                              // IID653
+    0x62, 0xd4, 0xe4, 0x18, 0xd3, 0xff,                                              // IID654
+    0x49, 0xd3, 0xfe,                                                                // IID655
+    0x62, 0xfc, 0xb4, 0x14, 0xd3, 0xf8,                                              // IID656
+    0x62, 0xd4, 0xbc, 0x1c, 0xd3, 0xf8,                                              // IID657
+    0x62, 0xd4, 0xa4, 0x18, 0xff, 0xcd,                                              // IID658
+    0x48, 0xff, 0xc9,                                                                // IID659
+    0x62, 0xfc, 0xd4, 0x14, 0xff, 0xca,                                              // IID660
+    0x62, 0xdc, 0x9c, 0x14, 0xff, 0xcc,                                              // IID661
+    0xd5, 0x18, 0xff, 0xc0,                                                          // IID662
+    0xd5, 0x19, 0xff, 0xc5,                                                          // IID663
+    0x62, 0xd4, 0xec, 0x14, 0xff, 0xc1,                                              // IID664
+    0x62, 0xfc, 0xe4, 0x14, 0xff, 0xc3,                                              // IID665
+    0x62, 0xfc, 0xe4, 0x10, 0xd3, 0xe2,                                              // IID666
+    0x49, 0xd3, 0xe0,                                                                // IID667
+    0x62, 0xd4, 0x9c, 0x1c, 0xd3, 0xe7,                                              // IID668
+    0x62, 0xdc, 0x94, 0x14, 0xd3, 0xe5,                                              // IID669
+    0x62, 0xdc, 0x9c, 0x10, 0xd3, 0xe8,                                              // IID670
+    0xd5, 0x18, 0xd3, 0xeb,                                                          // IID671
+    0x62, 0xdc, 0xbc, 0x1c, 0xd3, 0xec,                                              // IID672
+    0x62, 0xfc, 0xf4, 0x14, 0xd3, 0xe9,                                              // IID673
+    0x62, 0x6c, 0xfc, 0x08, 0xf4, 0xe0,                                              // IID674
+    0x62, 0x54, 0xfc, 0x08, 0xf4, 0xf6,                                              // IID675
+    0x62, 0x5c, 0xfc, 0x0c, 0xf4, 0xe7,                                              // IID676
+    0x62, 0x54, 0xfc, 0x0c, 0xf4, 0xf6,                                              // IID677
+    0x62, 0x44, 0xfc, 0x08, 0xaf, 0xbd, 0xae, 0x4c, 0x3b, 0x96,                      // IID678
+    0x62, 0xec, 0xfc, 0x0c, 0xaf, 0x8a, 0xfb, 0xee, 0x54, 0x9f,                      // IID679
+    0x62, 0x04, 0xf8, 0x08, 0xf5, 0x9c, 0x8e, 0x83, 0xbf, 0x98, 0x27,                // IID680
+    0x62, 0x84, 0xfc, 0x0c, 0xf5, 0xbc, 0x1a, 0xa3, 0x9c, 0x71, 0xc8,                // IID681
+    0x62, 0xbc, 0xf4, 0x18, 0xf7, 0x9c, 0xcb, 0xc0, 0x2b, 0xb8, 0x97,                // IID682
+    0x62, 0xf4, 0xf4, 0x1c, 0xf7, 0x9c, 0x0b, 0x8d, 0xd3, 0x92, 0x6f,                // IID683
+    0x62, 0xc4, 0xfc, 0x08, 0x88, 0xa4, 0x24, 0x2a, 0xd8, 0x74, 0xd5,                // IID684
+    0x62, 0x4c, 0xfc, 0x0c, 0x88, 0xbe, 0xd0, 0xf6, 0x03, 0x46,                      // IID685
+    0x62, 0xdc, 0xe4, 0x18, 0xd3, 0xa0, 0xf9, 0x06, 0x7d, 0x56,                      // IID686
+    0x62, 0x9c, 0x98, 0x1c, 0xd3, 0xa4, 0x20, 0xb2, 0xa7, 0xb3, 0xe3,                // IID687
+    0x62, 0xbc, 0x98, 0x18, 0xd3, 0xbc, 0x87, 0x46, 0x43, 0xa8, 0xce,                // IID688
+    0x62, 0x94, 0xb8, 0x1c, 0xd3, 0xbc, 0x86, 0x5b, 0x6f, 0xbd, 0x8e,                // IID689
+    0x62, 0x94, 0xc4, 0x10, 0xff, 0x8c, 0x78, 0x23, 0x8d, 0x1d, 0xa5,                // IID690
+    0x62, 0x9c, 0x94, 0x1c, 0xff, 0x8c, 0xcd, 0x57, 0x8b, 0xae, 0xa4,                // IID691
+    0x62, 0xbc, 0xa0, 0x18, 0xff, 0x84, 0xfd, 0x24, 0x4b, 0x89, 0xde,                // IID692
+    0x62, 0xf4, 0x90, 0x1c, 0xff, 0x84, 0x01, 0x37, 0xb7, 0x4b, 0xc9,                // IID693
+    0x62, 0xdc, 0xac, 0x10, 0xd3, 0xac, 0x89, 0x6d, 0xb6, 0x76, 0xa0,                // IID694
+    0x62, 0xd4, 0xb4, 0x14, 0xd3, 0xa9, 0x21, 0x8d, 0x79, 0x51,                      // IID695
+    0x62, 0x04, 0xf8, 0x08, 0xf4, 0xa4, 0x95, 0xf6, 0x96, 0x71, 0x20,                // IID696
+    0x62, 0xbc, 0xfc, 0x0c, 0xf4, 0x9c, 0x2b, 0x2b, 0xc8, 0x26, 0xdb,                // IID697
+    0x62, 0x4c, 0xf4, 0x10, 0x01, 0xbe, 0xff, 0xcc, 0x35, 0x39,                      // IID698
+    0x62, 0x1c, 0x8c, 0x18, 0x01, 0xb4, 0x93, 0x55, 0x64, 0x52, 0xcb,                // IID699
+    0x62, 0x6c, 0xe8, 0x14, 0x01, 0xb4, 0x3c, 0x4b, 0xed, 0xd3, 0x5a,                // IID700
+    0x62, 0xe4, 0xdc, 0x14, 0x01, 0xa2, 0x1b, 0x66, 0xd5, 0xcd,                      // IID701
+    0x62, 0xa4, 0x80, 0x10, 0x21, 0x8c, 0xdb, 0xd2, 0x47, 0xe2, 0x4c,                // IID702
+    0x62, 0x6c, 0x88, 0x10, 0x21, 0xb4, 0x5a, 0xec, 0xc2, 0x11, 0xfb,                // IID703
+    0x62, 0x44, 0x9c, 0x14, 0x21, 0x84, 0xdb, 0x41, 0xb4, 0x66, 0xd7,                // IID704
+    0x62, 0x6c, 0x8c, 0x14, 0x21, 0xb6, 0x24, 0x1c, 0xd2, 0x07,                      // IID705
+    0x62, 0xc4, 0xa8, 0x10, 0x09, 0xa4, 0xdf, 0x92, 0x17, 0xc2, 0x58,                // IID706
+    0x62, 0x14, 0x90, 0x18, 0x09, 0xac, 0x9a, 0xcd, 0x2c, 0x8f, 0xd3,                // IID707
+    0x62, 0x44, 0xe4, 0x1c, 0x09, 0x94, 0x1c, 0x44, 0x0e, 0x4f, 0xe0,                // IID708
+    0x62, 0x0c, 0x80, 0x14, 0x09, 0xbc, 0x7b, 0x56, 0x17, 0x8d, 0x02,                // IID709
+    0x62, 0x4c, 0xb8, 0x10, 0x29, 0x9c, 0x7c, 0x10, 0xf6, 0x80, 0x69,                // IID710
+    0x62, 0x14, 0x80, 0x18, 0x29, 0xbc, 0xf3, 0x19, 0x88, 0x68, 0xfb,                // IID711
+    0x62, 0x0c, 0xf4, 0x14, 0x29, 0xbc, 0xa9, 0x46, 0x9e, 0x61, 0x31,                // IID712
+    0x62, 0x84, 0xec, 0x14, 0x29, 0x94, 0x93, 0x1a, 0x86, 0x22, 0x19,                // IID713
+    0x62, 0xc4, 0xe4, 0x18, 0x31, 0xab, 0xe0, 0x2b, 0xe9, 0xb8,                      // IID714
+    0x62, 0x34, 0xbc, 0x18, 0x31, 0x84, 0x8a, 0x64, 0x1c, 0x30, 0xfb,                // IID715
+    0x62, 0x04, 0xf8, 0x14, 0x31, 0x8c, 0x1e, 0xd9, 0x54, 0x66, 0x7c,                // IID716
+    0x62, 0x44, 0x94, 0x14, 0x31, 0xaf, 0x87, 0x4b, 0x05, 0xa1,                      // IID717
+    0x62, 0xd4, 0xe0, 0x10, 0x81, 0x84, 0xb5, 0x59, 0x45, 0xb6, 0x68, 0x00, 0x00, 0x00, 0x01, // IID718
+    0x62, 0x94, 0xf8, 0x14, 0x83, 0x84, 0xfd, 0x0b, 0xc5, 0xeb, 0x9a, 0x01,          // IID719
+    0x62, 0x9c, 0x84, 0x10, 0x83, 0xa4, 0x68, 0xf2, 0x95, 0x4e, 0xda, 0x01,          // IID720
+    0x62, 0xdc, 0xa4, 0x1c, 0x81, 0xa4, 0x24, 0xda, 0xb4, 0x92, 0xf0, 0x00, 0x00, 0x01, 0x00, // IID721
+    0x62, 0xbc, 0xfc, 0x08, 0x69, 0x8c, 0x12, 0xa1, 0x6d, 0xec, 0x46, 0x00, 0x00, 0x00, 0x01, // IID722
+    0x62, 0x14, 0xfc, 0x0c, 0x6b, 0xbc, 0xd1, 0x0d, 0x95, 0x3c, 0x80, 0x10,          // IID723
+    0x62, 0x9c, 0xf0, 0x10, 0x83, 0x8c, 0x33, 0x2c, 0xda, 0x4c, 0x1b, 0x01,          // IID724
+    0x62, 0x9c, 0xec, 0x1c, 0x81, 0x8c, 0xb1, 0x7b, 0x94, 0x55, 0xa6, 0x00, 0x10, 0x00, 0x00, // IID725
+    0x62, 0xdc, 0xf0, 0x10, 0xc1, 0xa4, 0x6a, 0xa1, 0x0e, 0x4e, 0x95, 0x08,          // IID726
+    0x62, 0xfc, 0x98, 0x1c, 0xc1, 0xa4, 0x0e, 0x55, 0xeb, 0x53, 0xbc, 0x02,          // IID727
+    0x62, 0xfc, 0x90, 0x10, 0xc1, 0xbc, 0x02, 0x9f, 0xf3, 0x23, 0xa6, 0x04,          // IID728
+    0x62, 0xd4, 0xfc, 0x14, 0xc1, 0xbb, 0xec, 0x2c, 0x42, 0xf8, 0x04,                // IID729
+    0x62, 0xbc, 0xa8, 0x10, 0xc1, 0xac, 0xdf, 0xec, 0xdc, 0x46, 0xaa, 0x10,          // IID730
+    0x62, 0xbc, 0xc0, 0x14, 0xc1, 0xac, 0x68, 0x1d, 0x1a, 0x31, 0x71, 0x02,          // IID731
+    0x62, 0xd4, 0xb4, 0x10, 0x81, 0xa9, 0x54, 0xd4, 0xac, 0xf6, 0x00, 0x00, 0x10, 0x00, // IID732
+    0x62, 0xd4, 0xf0, 0x14, 0x81, 0xac, 0x38, 0xa2, 0x6c, 0xd0, 0x55, 0x00, 0x00, 0x10, 0x00, // IID733
+    0x62, 0x94, 0x90, 0x10, 0x81, 0xb4, 0x01, 0x3f, 0xbe, 0x3e, 0xfd, 0x00, 0x00, 0x10, 0x00, // IID734
+    0x62, 0xfc, 0x98, 0x14, 0x83, 0xb4, 0x5e, 0x43, 0x65, 0x62, 0xd2, 0x10,          // IID735
+    0x62, 0xd4, 0xcc, 0x10, 0x83, 0xc6, 0x10,                                        // IID736
+    0x62, 0xd4, 0xfc, 0x18, 0x83, 0xc4, 0x10,                                        // IID737
+    0xd5, 0x19, 0x81, 0xc0, 0x00, 0x00, 0x01, 0x00,                                  // IID738
+    0x62, 0xf4, 0xd4, 0x14, 0x81, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID739
+    0x62, 0xf4, 0xfc, 0x1c, 0x81, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID740
+    0x62, 0xdc, 0xbc, 0x14, 0x81, 0xc0, 0x00, 0x00, 0x01, 0x00,                      // IID741
+    0x62, 0xdc, 0xd4, 0x10, 0x81, 0xe3, 0x00, 0x00, 0x00, 0x01,                      // IID742
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xe3, 0x00, 0x00, 0x00, 0x01,                      // IID743
+    0xd5, 0x19, 0x81, 0xe0, 0x00, 0x00, 0x01, 0x00,                                  // IID744
+    0x62, 0xdc, 0x94, 0x1c, 0x81, 0xe7, 0x00, 0x00, 0x10, 0x00,                      // IID745
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xe5, 0x00, 0x00, 0x10, 0x00,                      // IID746
+    0x62, 0xdc, 0x8c, 0x14, 0x81, 0xe6, 0x00, 0x00, 0x10, 0x00,                      // IID747
+    0x62, 0x54, 0xfc, 0x08, 0x69, 0xc5, 0x00, 0x00, 0x00, 0x10,                      // IID748
+    0x62, 0xdc, 0xfc, 0x08, 0x69, 0xc7, 0x00, 0x00, 0x00, 0x10,                      // IID749
+    0x62, 0x54, 0xfc, 0x08, 0x69, 0xed, 0x00, 0x00, 0x01, 0x00,                      // IID750
+    0x62, 0x5c, 0xfc, 0x0c, 0x69, 0xf5, 0x00, 0x00, 0x10, 0x00,                      // IID751
+    0x62, 0xfc, 0xfc, 0x0c, 0x69, 0xc6, 0x00, 0x00, 0x10, 0x00,                      // IID752
+    0x62, 0x54, 0xfc, 0x0c, 0x69, 0xc0, 0x00, 0x00, 0x00, 0x10,                      // IID753
+    0x62, 0xd4, 0x8c, 0x10, 0x81, 0xcf, 0x00, 0x10, 0x00, 0x00,                      // IID754
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xcc, 0x00, 0x10, 0x00, 0x00,                      // IID755
+    0xd5, 0x19, 0x81, 0xca, 0x00, 0x00, 0x10, 0x00,                                  // IID756
+    0x62, 0xd4, 0xfc, 0x14, 0x81, 0xcc, 0x00, 0x00, 0x00, 0x10,                      // IID757
+    0x62, 0xd4, 0xfc, 0x1c, 0x81, 0xc9, 0x00, 0x00, 0x00, 0x10,                      // IID758
+    0x62, 0xfc, 0xc4, 0x14, 0x81, 0xcf, 0x00, 0x01, 0x00, 0x00,                      // IID759
+    0x62, 0xd4, 0x84, 0x18, 0xc1, 0xd1, 0x10,                                        // IID760
+    0x62, 0xd4, 0xfc, 0x18, 0xc1, 0xd0, 0x10,                                        // IID761
+    0xd5, 0x19, 0xd1, 0xd1,                                                          // IID762
+    0x62, 0xfc, 0xb4, 0x18, 0xc1, 0xc1, 0x10,                                        // IID763
+    0x62, 0xfc, 0xfc, 0x18, 0xc1, 0xc4, 0x10,                                        // IID764
+    0xd5, 0x19, 0xd1, 0xc3,                                                          // IID765
+    0x62, 0xdc, 0xdc, 0x14, 0xd1, 0xc7,                                              // IID766
+    0x62, 0xfc, 0xfc, 0x1c, 0xd1, 0xc2,                                              // IID767
+    0x62, 0xdc, 0x9c, 0x14, 0xc1, 0xc4, 0x10,                                        // IID768
+    0x62, 0xfc, 0xac, 0x10, 0xc1, 0xca, 0x10,                                        // IID769
+    0x62, 0xdc, 0xfc, 0x18, 0xc1, 0xc8, 0x10,                                        // IID770
+    0xd5, 0x18, 0xc1, 0xce, 0x10,                                                    // IID771
+    0x62, 0xdc, 0xa4, 0x14, 0xd1, 0xcd,                                              // IID772
+    0x62, 0xfc, 0xfc, 0x1c, 0xd1, 0xca,                                              // IID773
+    0x62, 0xfc, 0xd4, 0x14, 0xd1, 0xcd,                                              // IID774
+    0x62, 0xf4, 0x9c, 0x18, 0xc1, 0xe1, 0x02,                                        // IID775
+    0x62, 0xdc, 0xfc, 0x18, 0xc1, 0xe0, 0x02,                                        // IID776
+    0xd5, 0x18, 0xc1, 0xe6, 0x08,                                                    // IID777
+    0x62, 0xfc, 0xf4, 0x14, 0xc1, 0xe7, 0x08,                                        // IID778
+    0x62, 0xdc, 0xfc, 0x1c, 0xc1, 0xe3, 0x08,                                        // IID779
+    0x62, 0xfc, 0xc4, 0x14, 0xd1, 0xe7,                                              // IID780
+    0x62, 0xdc, 0xbc, 0x18, 0xc1, 0xf9, 0x10,                                        // IID781
+    0x62, 0xfc, 0xfc, 0x18, 0xc1, 0xff, 0x10,                                        // IID782
+    0x49, 0xc1, 0xf9, 0x04,                                                          // IID783
+    0x62, 0xd4, 0xcc, 0x14, 0xd1, 0xfd,                                              // IID784
+    0x62, 0xd4, 0xfc, 0x1c, 0xd1, 0xfb,                                              // IID785
+    0x62, 0xd4, 0x9c, 0x1c, 0xc1, 0xfc, 0x02,                                        // IID786
+    0x62, 0xdc, 0xf4, 0x18, 0xc1, 0xe6, 0x08,                                        // IID787
+    0x62, 0xfc, 0xfc, 0x18, 0xc1, 0xe3, 0x08,                                        // IID788
+    0x49, 0xc1, 0xe5, 0x02,                                                          // IID789
+    0x62, 0xd4, 0xec, 0x14, 0xc1, 0xe3, 0x08,                                        // IID790
+    0x62, 0xd4, 0xfc, 0x1c, 0xc1, 0xe1, 0x08,                                        // IID791
+    0x62, 0xf4, 0xf4, 0x1c, 0xc1, 0xe1, 0x10,                                        // IID792
+    0x62, 0xfc, 0xac, 0x18, 0xc1, 0xee, 0x04,                                        // IID793
+    0x62, 0xd4, 0xfc, 0x18, 0xc1, 0xe9, 0x04,                                        // IID794
+    0x49, 0xc1, 0xec, 0x02,                                                          // IID795
+    0x62, 0xdc, 0xac, 0x14, 0xc1, 0xef, 0x08,                                        // IID796
+    0x62, 0xd4, 0xfc, 0x1c, 0xc1, 0xec, 0x08,                                        // IID797
+    0x62, 0xdc, 0x9c, 0x14, 0xd1, 0xec,                                              // IID798
+    0x62, 0xdc, 0x84, 0x18, 0x81, 0xee, 0x00, 0x00, 0x01, 0x00,                      // IID799
+    0x62, 0xf4, 0xfc, 0x18, 0x81, 0xe9, 0x00, 0x00, 0x01, 0x00,                      // IID800
+    0xd5, 0x19, 0x83, 0xea, 0x10,                                                    // IID801
+    0x62, 0xd4, 0x9c, 0x1c, 0x83, 0xee, 0x01,                                        // IID802
+    0x62, 0xfc, 0xfc, 0x1c, 0x83, 0xed, 0x01,                                        // IID803
+    0x62, 0xfc, 0xdc, 0x14, 0x81, 0xec, 0x00, 0x00, 0x10, 0x00,                      // IID804
+    0x62, 0xf4, 0xa4, 0x18, 0x81, 0xf3, 0x00, 0x00, 0x00, 0x01,                      // IID805
+    0x62, 0xfc, 0xfc, 0x18, 0x81, 0xf7, 0x00, 0x00, 0x00, 0x01,                      // IID806
+    0xd5, 0x19, 0x81, 0xf7, 0x00, 0x00, 0x00, 0x10,                                  // IID807
+    0x62, 0xdc, 0x94, 0x14, 0x81, 0xf4, 0x00, 0x10, 0x00, 0x00,                      // IID808
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xf3, 0x00, 0x10, 0x00, 0x00,                      // IID809
+    0x62, 0xf4, 0xec, 0x1c, 0x81, 0xf2, 0x00, 0x00, 0x00, 0x10,                      // IID810
+    0x48, 0x81, 0xca, 0x00, 0x00, 0x10, 0x00,                                        // IID811
+    0x62, 0xfc, 0xfc, 0x18, 0x81, 0xce, 0x00, 0x00, 0x10, 0x00,                      // IID812
+    0xd5, 0x19, 0x81, 0xcd, 0x00, 0x00, 0x10, 0x00,                                  // IID813
+    0x62, 0xf4, 0xf4, 0x10, 0x81, 0xc9, 0x00, 0x00, 0x40, 0x00,                      // IID814
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xc9, 0x00, 0x00, 0x40, 0x00,                      // IID815
+    0xd5, 0x19, 0x81, 0xcb, 0x00, 0x00, 0x00, 0x40,                                  // IID816
+    0x62, 0xfc, 0xfc, 0x10, 0x81, 0xeb, 0x00, 0x00, 0x40, 0x00,                      // IID817
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xef, 0x00, 0x00, 0x40, 0x00,                      // IID818
+    0xd5, 0x19, 0x81, 0xea, 0x00, 0x00, 0x04, 0x00,                                  // IID819
+    0x62, 0xfc, 0xf4, 0x14, 0x81, 0xee, 0x00, 0x00, 0x00, 0x40,                      // IID820
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xea, 0x00, 0x00, 0x00, 0x40,                      // IID821
+    0x62, 0xfc, 0xc4, 0x14, 0x81, 0xef, 0x00, 0x00, 0x00, 0x10,                      // IID822
+    0x62, 0x4c, 0x90, 0x18, 0x03, 0xb4, 0x58, 0x3b, 0x3a, 0xea, 0x56,                // IID823
+    0x62, 0x1c, 0x90, 0x14, 0x03, 0xbc, 0xda, 0xa8, 0xc6, 0xee, 0xb4,                // IID824
+    0x62, 0x4c, 0x9c, 0x18, 0x23, 0xb7, 0x8c, 0xc3, 0xef, 0xb9,                      // IID825
+    0x62, 0x3c, 0xa0, 0x14, 0x23, 0x94, 0x4e, 0xe5, 0xbe, 0x1e, 0x6a,                // IID826
+    0x62, 0x44, 0x88, 0x10, 0x0b, 0x94, 0x93, 0xd7, 0x00, 0x60, 0xd4,                // IID827
+    0x62, 0x7c, 0xb0, 0x1c, 0x0b, 0xa4, 0x0a, 0xf6, 0x59, 0x48, 0x0b,                // IID828
+    0x62, 0xcc, 0xec, 0x18, 0xaf, 0x8c, 0x90, 0xd8, 0x4c, 0x28, 0x3d,                // IID829
+    0x62, 0x0c, 0x94, 0x14, 0xaf, 0x94, 0x66, 0x24, 0x31, 0x81, 0x6e,                // IID830
+    0x62, 0x7c, 0xe4, 0x18, 0x2b, 0xae, 0x62, 0xd7, 0xd5, 0x8f,                      // IID831
+    0x62, 0x4c, 0xc4, 0x14, 0x2b, 0xac, 0x11, 0x13, 0x58, 0xad, 0x9d,                // IID832
+    0x62, 0xac, 0xbc, 0x18, 0x33, 0x94, 0xb3, 0x69, 0x59, 0x40, 0xf1,                // IID833
+    0x62, 0x4c, 0xac, 0x1c, 0x33, 0xa2, 0xca, 0x81, 0x83, 0x16,                      // IID834
+    0x62, 0xc4, 0xf4, 0x18, 0x03, 0xd0,                                              // IID835
+    0x49, 0x03, 0xce,                                                                // IID836
+    0x62, 0x7c, 0xc4, 0x14, 0x03, 0xd0,                                              // IID837
+    0x62, 0x5c, 0xa4, 0x1c, 0x03, 0xd8,                                              // IID838
+    0x62, 0xe4, 0xb5, 0x18, 0x66, 0xd2,                                              // IID839
+    0x66, 0x4d, 0x0f, 0x38, 0xf6, 0xc7,                                              // IID840
+    0x62, 0xcc, 0x86, 0x18, 0x66, 0xf2,                                              // IID841
+    0xf3, 0x4c, 0x0f, 0x38, 0xf6, 0xda,                                              // IID842
+    0x62, 0xfc, 0xe4, 0x10, 0x23, 0xd6,                                              // IID843
+    0xd5, 0x5c, 0x23, 0xe9,                                                          // IID844
+    0x62, 0x44, 0xc4, 0x14, 0x23, 0xdf,                                              // IID845
+    0x62, 0x54, 0xb4, 0x1c, 0x23, 0xcd,                                              // IID846
+    0x62, 0x7c, 0xec, 0x10, 0xaf, 0xf8,                                              // IID847
+    0xd5, 0x98, 0xaf, 0xc9,                                                          // IID848
+    0x62, 0x7c, 0xc4, 0x14, 0xaf, 0xe4,                                              // IID849
+    0x62, 0x54, 0xac, 0x1c, 0xaf, 0xd1,                                              // IID850
+    0x62, 0xc4, 0xec, 0x18, 0x0b, 0xde,                                              // IID851
+    0x49, 0x0b, 0xcd,                                                                // IID852
+    0x62, 0x4c, 0xb4, 0x1c, 0x0b, 0xcd,                                              // IID853
+    0x62, 0xdc, 0xec, 0x1c, 0x0b, 0xd1,                                              // IID854
+    0x62, 0x7c, 0xc4, 0x10, 0x2b, 0xc0,                                              // IID855
+    0x4d, 0x2b, 0xed,                                                                // IID856
+    0x62, 0x54, 0xe4, 0x14, 0x2b, 0xe7,                                              // IID857
+    0x62, 0x74, 0xb4, 0x1c, 0x2b, 0xca,                                              // IID858
+    0x62, 0xcc, 0x94, 0x18, 0x33, 0xc7,                                              // IID859
+    0xd5, 0x59, 0x33, 0xce,                                                          // IID860
+    0x62, 0x6c, 0xe4, 0x14, 0x33, 0xf4,                                              // IID861
+    0x62, 0x44, 0x84, 0x14, 0x33, 0xfd,                                              // IID862
+    0x62, 0x54, 0xcc, 0x10, 0x24, 0xea, 0x04,                                        // IID863
+    0xd5, 0xd9, 0xa4, 0xe8, 0x10,                                                    // IID864
+    0x62, 0x44, 0xdc, 0x14, 0x24, 0xdd, 0x10,                                        // IID865
+    0x62, 0xcc, 0x84, 0x14, 0x24, 0xdf, 0x02,                                        // IID866
+    0x62, 0x7c, 0x8c, 0x10, 0x2c, 0xdc, 0x08,                                        // IID867
+    0x4c, 0x0f, 0xac, 0xfa, 0x01,                                                    // IID868
+    0x62, 0x5c, 0x9c, 0x14, 0x2c, 0xf6, 0x02,                                        // IID869
+    0x62, 0xec, 0xdc, 0x14, 0x2c, 0xc4, 0x01,                                        // IID870
+    0x62, 0xcc, 0xd4, 0x10, 0x40, 0xcc,                                              // IID871
+    0xd5, 0x9d, 0x40, 0xfe,                                                          // IID872
+    0x62, 0x54, 0xf4, 0x18, 0x41, 0xff,                                              // IID873
+    0x49, 0x0f, 0x41, 0xcd,                                                          // IID874
+    0x62, 0x4c, 0xec, 0x18, 0x42, 0xd2,                                              // IID875
+    0xd5, 0xcd, 0x42, 0xe7,                                                          // IID876
+    0x62, 0xf4, 0xbc, 0x18, 0x43, 0xd1,                                              // IID877
+    0x48, 0x0f, 0x43, 0xc9,                                                          // IID878
+    0x62, 0x54, 0xac, 0x18, 0x44, 0xe9,                                              // IID879
+    0xd5, 0x9d, 0x44, 0xf3,                                                          // IID880
+    0x62, 0xc4, 0xa4, 0x18, 0x45, 0xf9,                                              // IID881
+    0x4c, 0x0f, 0x45, 0xda,                                                          // IID882
+    0x62, 0x5c, 0x84, 0x10, 0x46, 0xf1,                                              // IID883
+    0xd5, 0xc9, 0x46, 0xe4,                                                          // IID884
+    0x62, 0x5c, 0xec, 0x18, 0x47, 0xd4,                                              // IID885
+    0xd5, 0x9c, 0x47, 0xc1,                                                          // IID886
+    0x62, 0x6c, 0xf4, 0x18, 0x48, 0xf7,                                              // IID887
+    0xd5, 0xdc, 0x48, 0xd2,                                                          // IID888
+    0x62, 0xfc, 0xec, 0x18, 0x49, 0xda,                                              // IID889
+    0xd5, 0xc9, 0x49, 0xed,                                                          // IID890
+    0x62, 0x4c, 0xa4, 0x10, 0x4a, 0xe3,                                              // IID891
+    0xd5, 0x9d, 0x4a, 0xde,                                                          // IID892
+    0x62, 0xec, 0xf4, 0x18, 0x4b, 0xea,                                              // IID893
+    0xd5, 0x99, 0x4b, 0xcd,                                                          // IID894
+    0x62, 0xc4, 0xec, 0x18, 0x4c, 0xec,                                              // IID895
+    0xd5, 0x99, 0x4c, 0xd2,                                                          // IID896
+    0x62, 0xfc, 0xf4, 0x10, 0x4d, 0xde,                                              // IID897
+    0x49, 0x0f, 0x4d, 0xd3,                                                          // IID898
+    0x62, 0x54, 0xec, 0x18, 0x4e, 0xf0,                                              // IID899
+    0x4d, 0x0f, 0x4e, 0xf0,                                                          // IID900
+    0x62, 0x6c, 0xb4, 0x10, 0x4f, 0xed,                                              // IID901
+    0xd5, 0xdd, 0x4f, 0xd6,                                                          // IID902
+    0x62, 0x84, 0xbc, 0x10, 0x40, 0xac, 0x5d, 0x1e, 0x52, 0x9c, 0x43,                // IID903
+    0x62, 0xcc, 0xa0, 0x18, 0x41, 0x94, 0x05, 0x7f, 0x12, 0x32, 0x06,                // IID904
+    0x62, 0x14, 0xf8, 0x10, 0x42, 0x84, 0x50, 0xef, 0x3d, 0x63, 0x10,                // IID905
+    0x62, 0x7c, 0x94, 0x18, 0x43, 0xb2, 0xc8, 0x61, 0x09, 0xab,                      // IID906
+    0x62, 0x1c, 0x98, 0x18, 0x44, 0x84, 0x57, 0x86, 0xbb, 0xe1, 0x85,                // IID907
+    0xd5, 0xde, 0x45, 0xac, 0x9b, 0x2e, 0xd2, 0x27, 0xca,                            // IID908
+    0x62, 0x8c, 0xf0, 0x18, 0x46, 0x94, 0x21, 0xa0, 0x64, 0xbe, 0x30,                // IID909
+    0x62, 0x54, 0x98, 0x10, 0x47, 0xa4, 0x42, 0x06, 0x01, 0x47, 0xdd,                // IID910
+    0x62, 0x34, 0xa4, 0x18, 0x48, 0x84, 0xdb, 0x96, 0x9e, 0xcc, 0x25,                // IID911
+    0x62, 0x44, 0x9c, 0x18, 0x49, 0x9b, 0x02, 0x8f, 0xd2, 0xf3,                      // IID912
+    0x62, 0x6c, 0xbc, 0x18, 0x4a, 0x94, 0x5b, 0x16, 0x48, 0x92, 0xb7,                // IID913
+    0x62, 0x54, 0x88, 0x10, 0x4b, 0x94, 0xd6, 0x84, 0x48, 0x88, 0x14,                // IID914
+    0x62, 0x1c, 0xa4, 0x10, 0x4c, 0x84, 0xb5, 0xa8, 0xb7, 0x92, 0x00,                // IID915
+    0x62, 0x6c, 0x8c, 0x18, 0x4d, 0xa4, 0x13, 0x45, 0x2d, 0x9c, 0x00,                // IID916
+    0x62, 0x74, 0xb0, 0x10, 0x4e, 0x84, 0x91, 0x6b, 0xc8, 0x55, 0x66,                // IID917
+    0x62, 0x84, 0xe0, 0x10, 0x4f, 0xac, 0x0a, 0xf5, 0xbc, 0xfa, 0xef,                // IID918
 #endif // _LP64
   };
 
@@ -1666,541 +2102,759 @@
     6,    // IID181
     6,    // IID182
     6,    // IID183
-    6,    // IID184
+    3,    // IID184
     6,    // IID185
     6,    // IID186
     6,    // IID187
+#endif // _LP64
     6,    // IID188
+#ifdef _LP64
     6,    // IID189
     6,    // IID190
     6,    // IID191
-    6,    // IID192
-    6,    // IID193
-    6,    // IID194
+    4,    // IID192
+    3,    // IID193
+#endif // _LP64
+    2,    // IID194
+#ifdef _LP64
     6,    // IID195
     6,    // IID196
     6,    // IID197
-    6,    // IID198
+#endif // _LP64
+    2,    // IID198
+#ifdef _LP64
     6,    // IID199
+#endif // _LP64
     6,    // IID200
+#ifdef _LP64
     6,    // IID201
-    6,    // IID202
+    4,    // IID202
     6,    // IID203
-    11,   // IID204
-    11,   // IID205
-    10,   // IID206
-    11,   // IID207
-    11,   // IID208
-    11,   // IID209
-    11,   // IID210
-    11,   // IID211
-    11,   // IID212
-    11,   // IID213
-    11,   // IID214
-    10,   // IID215
-    11,   // IID216
-    10,   // IID217
-    11,   // IID218
-    11,   // IID219
-    11,   // IID220
-    11,   // IID221
-    15,   // IID222
-    15,   // IID223
-    14,   // IID224
-    14,   // IID225
-    12,   // IID226
-    14,   // IID227
-    12,   // IID228
-    12,   // IID229
+    6,    // IID204
+    6,    // IID205
+    4,    // IID206
+    6,    // IID207
+    6,    // IID208
+    6,    // IID209
+    3,    // IID210
+    6,    // IID211
+#endif // _LP64
+    6,    // IID212
+#ifdef _LP64
+    6,    // IID213
+    3,    // IID214
+    6,    // IID215
+    6,    // IID216
+    6,    // IID217
+    3,    // IID218
+    6,    // IID219
+    6,    // IID220
+    6,    // IID221
+    4,    // IID222
+    6,    // IID223
+    6,    // IID224
+    6,    // IID225
+    6,    // IID226
+    6,    // IID227
+    6,    // IID228
+    11,   // IID229
     11,   // IID230
-    12,   // IID231
+    11,   // IID231
     11,   // IID232
-    12,   // IID233
-    12,   // IID234
+    11,   // IID233
+    11,   // IID234
     11,   // IID235
     11,   // IID236
-    12,   // IID237
-    15,   // IID238
-    15,   // IID239
-    12,   // IID240
-    14,   // IID241
+    11,   // IID237
+    10,   // IID238
+    11,   // IID239
+    10,   // IID240
+    11,   // IID241
     11,   // IID242
     11,   // IID243
     11,   // IID244
     11,   // IID245
     11,   // IID246
-    11,   // IID247
-    11,   // IID248
-    10,   // IID249
-    11,   // IID250
-    11,   // IID251
-    10,   // IID252
-    11,   // IID253
-    10,   // IID254
-    10,   // IID255
-    10,   // IID256
-    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
-    7,    // IID275
-    6,    // IID276
-    6,    // IID277
-    7,    // IID278
-    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
+    15,   // IID247
+    14,   // IID248
+    12,   // IID249
+    14,   // IID250
+    12,   // IID251
+    12,   // IID252
+    14,   // IID253
+    15,   // IID254
+    12,   // IID255
+    12,   // IID256
+    12,   // IID257
+    11,   // IID258
+    11,   // IID259
+    12,   // IID260
+    11,   // IID261
+    11,   // IID262
+    12,   // IID263
+    14,   // IID264
+    15,   // IID265
+    15,   // IID266
+    11,   // IID267
+    11,   // IID268
+    11,   // IID269
+    11,   // IID270
+    11,   // IID271
+    11,   // IID272
+    11,   // IID273
+    10,   // IID274
+    11,   // IID275
+    11,   // IID276
+    11,   // IID277
+    11,   // IID278
+    11,   // IID279
+    11,   // IID280
+    10,   // IID281
+    11,   // IID282
+    10,   // IID283
+    11,   // IID284
+    11,   // IID285
+    10,   // IID286
+    11,   // IID287
+    10,   // IID288
+    11,   // IID289
+    11,   // IID290
+    10,   // IID291
+    10,   // IID292
+    8,    // IID293
     7,    // IID294
     7,    // IID295
     10,   // IID296
     10,   // IID297
     10,   // IID298
-#endif // _LP64
-    10,   // IID299
-#ifdef _LP64
+    8,    // IID299
     10,   // IID300
     10,   // IID301
-    10,   // IID302
+    7,    // IID302
     10,   // IID303
+#endif // _LP64
     10,   // IID304
+#ifdef _LP64
     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
-    6,    // IID327
-    6,    // IID328
-    6,    // IID329
-    6,    // IID330
-    6,    // IID331
-    6,    // IID332
-    6,    // IID333
-    6,    // IID334
-    6,    // IID335
-    6,    // IID336
-    6,    // IID337
-    6,    // IID338
-    6,    // IID339
-    6,    // IID340
-    6,    // IID341
+    7,    // IID308
+    10,   // IID309
+    10,   // IID310
+    8,    // IID311
+    7,    // IID312
+    7,    // IID313
+    10,   // IID314
+    6,    // IID315
+    6,    // IID316
+    4,    // IID317
+    7,    // IID318
+#endif // _LP64
+    7,    // IID319
+#ifdef _LP64
+    5,    // IID320
+    7,    // IID321
+    7,    // IID322
+    7,    // IID323
+    7,    // IID324
+#endif // _LP64
+    7,    // IID325
+#ifdef _LP64
+    4,    // IID326
+    7,    // IID327
+    7,    // IID328
+    7,    // IID329
+    7,    // IID330
+    7,    // IID331
+    5,    // IID332
+    7,    // IID333
+    7,    // IID334
+    7,    // IID335
+    7,    // IID336
+    7,    // IID337
+    4,    // IID338
+    7,    // IID339
+    7,    // IID340
+    7,    // IID341
     7,    // IID342
     7,    // IID343
-    7,    // IID344
+    4,    // IID344
     7,    // IID345
-    6,    // IID346
-    6,    // IID347
-    6,    // IID348
-    6,    // IID349
-    6,    // IID350
+    7,    // IID346
+    7,    // IID347
+    7,    // IID348
+    7,    // IID349
+    5,    // 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
+    7,    // IID353
+    10,   // IID354
+    10,   // IID355
+    8,    // IID356
+    10,   // IID357
+    10,   // IID358
+    10,   // IID359
+    10,   // IID360
+    10,   // IID361
+#endif // _LP64
+    6,    // IID362
+#ifdef _LP64
+    10,   // IID363
     10,   // IID364
-    11,   // IID365
-    11,   // IID366
-    11,   // IID367
-    11,   // IID368
+    10,   // IID365
+    10,   // IID366
+    10,   // IID367
+    8,    // IID368
     10,   // IID369
-    11,   // IID370
-    11,   // IID371
-    11,   // IID372
-    11,   // IID373
+    10,   // IID370
+    10,   // IID371
+    10,   // IID372
+    10,   // 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
-    8,    // IID398
-    8,    // IID399
-    9,    // IID400
-    9,    // IID401
-    9,    // IID402
-    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
-    9,    // IID422
-    10,   // IID423
-    9,    // IID424
-    9,    // IID425
-    10,   // IID426
-    9,    // IID427
-    9,    // IID428
-    9,    // IID429
-    10,   // IID430
-    8,    // IID431
-    9,    // IID432
-    8,    // IID433
-    4,    // IID434
-    7,    // IID435
-    8,    // IID436
+    11,   // IID378
+    10,   // IID379
+    11,   // IID380
+    11,   // IID381
+    11,   // IID382
+    11,   // IID383
+    11,   // IID384
+    11,   // IID385
+    11,   // IID386
+    11,   // IID387
+    6,    // IID388
+    4,    // IID389
+    6,    // IID390
+    6,    // IID391
+    6,    // IID392
+    3,    // IID393
+    6,    // IID394
+    6,    // IID395
+    6,    // IID396
+    4,    // IID397
+    6,    // IID398
+    6,    // IID399
+    6,    // IID400
+    5,    // IID401
+    6,    // IID402
+    6,    // IID403
+    6,    // IID404
+    4,    // IID405
+    6,    // IID406
+    6,    // IID407
+    6,    // IID408
+    4,    // IID409
+    6,    // IID410
+    6,    // IID411
+    6,    // IID412
+    4,    // IID413
+    6,    // IID414
+    6,    // IID415
+    6,    // IID416
+    4,    // IID417
+    6,    // IID418
+    6,    // IID419
+    6,    // IID420
+    4,    // IID421
+    6,    // IID422
+    6,    // IID423
+    7,    // IID424
+    5,    // IID425
+    7,    // IID426
+    7,    // IID427
+    7,    // IID428
+    5,    // IID429
+    7,    // IID430
+    7,    // IID431
+    6,    // IID432
+    4,    // IID433
+    6,    // IID434
+    4,    // IID435
+    6,    // IID436
     4,    // IID437
-    4,    // IID438
-    5,    // IID439
-    5,    // IID440
+    6,    // IID438
+    4,    // IID439
+    6,    // 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
-    8,    // IID461
-    9,    // IID462
-    9,    // IID463
-    8,    // IID464
-    9,    // IID465
-    8,    // IID466
-    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
+    6,    // IID442
+    4,    // IID443
+    6,    // IID444
+    4,    // IID445
+    6,    // IID446
+    4,    // IID447
+    6,    // IID448
+    4,    // IID449
+    6,    // IID450
+    4,    // IID451
+    4,    // IID452
+    4,    // IID453
+    6,    // IID454
+    4,    // IID455
+    6,    // IID456
+    4,    // IID457
+    6,    // IID458
+    4,    // IID459
+    6,    // IID460
+    4,    // IID461
+    6,    // IID462
+    4,    // IID463
+    10,   // IID464
+    11,   // IID465
+    11,   // IID466
+    11,   // IID467
+    10,   // IID468
+    11,   // IID469
+    11,   // IID470
+    11,   // IID471
+    11,   // IID472
+    11,   // IID473
+    11,   // IID474
+    11,   // IID475
+    11,   // IID476
+    11,   // IID477
+    11,   // IID478
+    11,   // IID479
+    4,    // IID480
+    4,    // IID481
+    4,    // IID482
+    5,    // 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
+    4,    // IID485
+    5,    // IID486
+    5,    // IID487
+    4,    // IID488
+    4,    // IID489
+    4,    // IID490
+    3,    // IID491
+    4,    // IID492
+    4,    // IID493
+    4,    // IID494
+    4,    // IID495
+    4,    // IID496
+    4,    // IID497
+    9,    // IID498
+    9,    // IID499
+    9,    // IID500
+    9,    // IID501
+    9,    // IID502
     9,    // IID503
     9,    // IID504
     9,    // IID505
-    9,    // IID506
-    4,    // IID507
-    4,    // IID508
-    4,    // IID509
-    4,    // IID510
-    8,    // IID511
-    6,    // IID512
-    6,    // IID513
-    6,    // IID514
-    6,    // IID515
-    6,    // IID516
-    6,    // IID517
-    6,    // IID518
-    6,    // IID519
-    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
+    12,   // IID506
+    12,   // IID507
+    11,   // IID508
+    8,    // IID509
+    9,    // IID510
+    13,   // IID511
+    10,   // IID512
+    12,   // IID513
+    10,   // IID514
+    10,   // IID515
+    13,   // IID516
+    12,   // IID517
+    9,    // IID518
+    9,    // IID519
+    9,    // IID520
+    9,    // IID521
+    9,    // IID522
+    7,    // IID523
+    9,    // IID524
+    9,    // IID525
+    9,    // IID526
+    9,    // IID527
+    10,   // IID528
+    9,    // IID529
+    9,    // IID530
+    7,    // IID531
+    10,   // IID532
+    9,    // IID533
+    9,    // IID534
+    5,    // IID535
+    5,    // IID536
+    8,    // IID537
+    8,    // IID538
+    4,    // IID539
+    4,    // IID540
+    5,    // IID541
+    5,    // IID542
+    4,    // IID543
+    4,    // IID544
+    7,    // IID545
+    4,    // IID546
+    3,    // IID547
+    4,    // IID548
+    8,    // IID549
+    8,    // IID550
     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
-    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
-    10,   // IID599
-    10,   // IID600
-    10,   // IID601
-    10,   // IID602
-    10,   // IID603
-    10,   // IID604
-    10,   // IID605
-    10,   // IID606
-    10,   // IID607
-    10,   // IID608
-    10,   // IID609
-    10,   // IID610
-    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
-    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
-    10,   // IID654
-    11,   // IID655
-    11,   // IID656
-    11,   // IID657
-    11,   // IID658
-    11,   // IID659
-    11,   // IID660
-    10,   // IID661
-    10,   // IID662
-    10,   // IID663
-    11,   // IID664
-    11,   // IID665
-    11,   // IID666
-    6,    // IID667
+    5,    // IID552
+    8,    // IID553
+    8,    // IID554
+    7,    // IID555
+    9,    // IID556
+    8,    // IID557
+    9,    // IID558
+    9,    // IID559
+    9,    // IID560
+    9,    // IID561
+    8,    // IID562
+    9,    // IID563
+    9,    // IID564
+    9,    // IID565
+    9,    // IID566
+    9,    // IID567
+    9,    // IID568
+    9,    // IID569
+    9,    // IID570
+    9,    // IID571
+    4,    // IID572
+    4,    // IID573
+    4,    // IID574
+    3,    // IID575
+    3,    // IID576
+    4,    // IID577
+    4,    // IID578
+    3,    // IID579
+    4,    // IID580
+    3,    // IID581
+    4,    // IID582
+    4,    // IID583
+    4,    // IID584
+    3,    // IID585
+    3,    // IID586
+    3,    // IID587
+    3,    // IID588
+    9,    // IID589
+    9,    // IID590
+    9,    // IID591
+    9,    // IID592
+    9,    // IID593
+    9,    // IID594
+    9,    // IID595
+    9,    // IID596
+    13,   // IID597
+    8,    // IID598
+    5,    // IID599
+    5,    // IID600
+    6,    // IID601
+    6,    // IID602
+    6,    // IID603
+    6,    // IID604
+    9,    // IID605
+    9,    // IID606
+    9,    // IID607
+    9,    // IID608
+    4,    // IID609
+    4,    // IID610
+    4,    // IID611
+    4,    // IID612
+    9,    // IID613
+    6,    // IID614
+    6,    // IID615
+    6,    // IID616
+    6,    // IID617
+    6,    // IID618
+    6,    // IID619
+    6,    // IID620
+    6,    // IID621
+    11,   // IID622
+    11,   // IID623
+    6,    // IID624
+    4,    // IID625
+    6,    // IID626
+    6,    // IID627
+    6,    // IID628
+    6,    // IID629
+    6,    // IID630
+    6,    // IID631
+    6,    // IID632
+    4,    // IID633
+    6,    // IID634
+    6,    // IID635
+    6,    // IID636
+    4,    // IID637
+    6,    // IID638
+    6,    // IID639
+    6,    // IID640
+    6,    // IID641
+    6,    // IID642
+    4,    // IID643
+    6,    // IID644
+    6,    // IID645
+    6,    // IID646
+    4,    // IID647
+    6,    // IID648
+    6,    // IID649
+    6,    // IID650
+    3,    // IID651
+    6,    // IID652
+    6,    // IID653
+    6,    // IID654
+    3,    // IID655
+    6,    // IID656
+    6,    // IID657
+    6,    // IID658
+    3,    // IID659
+    6,    // IID660
+    6,    // IID661
+    4,    // IID662
+    4,    // IID663
+    6,    // IID664
+    6,    // IID665
+    6,    // IID666
+    3,    // IID667
     6,    // IID668
     6,    // IID669
     6,    // IID670
-    6,    // IID671
+    4,    // 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
+    10,   // IID678
+    10,   // IID679
+    11,   // IID680
+    11,   // IID681
+    11,   // IID682
+    11,   // IID683
+    11,   // IID684
+    10,   // IID685
+    10,   // IID686
+    11,   // IID687
+    11,   // IID688
+    11,   // IID689
+    11,   // IID690
+    11,   // IID691
+    11,   // IID692
+    11,   // IID693
+    11,   // IID694
+    10,   // IID695
+    11,   // IID696
+    11,   // IID697
+    10,   // IID698
+    11,   // IID699
+    11,   // IID700
+    10,   // IID701
     11,   // IID702
     11,   // IID703
     11,   // IID704
-    11,   // IID705
-    10,   // IID706
+    10,   // IID705
+    11,   // IID706
     11,   // IID707
-    10,   // IID708
-    10,   // IID709
+    11,   // IID708
+    11,   // IID709
     11,   // IID710
     11,   // IID711
     11,   // IID712
-    10,   // IID713
-    11,   // IID714
+    11,   // IID713
+    10,   // IID714
     11,   // IID715
     11,   // IID716
+    10,   // IID717
+    15,   // IID718
+    12,   // IID719
+    12,   // IID720
+    15,   // IID721
+    15,   // IID722
+    12,   // IID723
+    12,   // IID724
+    15,   // IID725
+    12,   // IID726
+    12,   // IID727
+    12,   // IID728
+    11,   // IID729
+    12,   // IID730
+    12,   // IID731
+    14,   // IID732
+    15,   // IID733
+    15,   // IID734
+    12,   // IID735
+    7,    // IID736
+    7,    // IID737
+    8,    // IID738
+    10,   // IID739
+    10,   // IID740
+    10,   // IID741
+    10,   // IID742
+    10,   // IID743
+    8,    // IID744
+    10,   // IID745
+    10,   // IID746
+    10,   // IID747
+    10,   // IID748
+    10,   // IID749
+    10,   // IID750
+    10,   // IID751
+    10,   // IID752
+    10,   // IID753
+    10,   // IID754
+    10,   // IID755
+    8,    // IID756
+    10,   // IID757
+    10,   // IID758
+    10,   // IID759
+    7,    // IID760
+    7,    // IID761
+    4,    // IID762
+    7,    // IID763
+    7,    // IID764
+    4,    // IID765
+    6,    // IID766
+    6,    // IID767
+    7,    // IID768
+    7,    // IID769
+    7,    // IID770
+    5,    // IID771
+    6,    // IID772
+    6,    // IID773
+    6,    // IID774
+    7,    // IID775
+    7,    // IID776
+    5,    // IID777
+    7,    // IID778
+    7,    // IID779
+    6,    // IID780
+    7,    // IID781
+    7,    // IID782
+    4,    // IID783
+    6,    // IID784
+    6,    // IID785
+    7,    // IID786
+    7,    // IID787
+    7,    // IID788
+    4,    // IID789
+    7,    // IID790
+    7,    // IID791
+    7,    // IID792
+    7,    // IID793
+    7,    // IID794
+    4,    // IID795
+    7,    // IID796
+    7,    // IID797
+    6,    // IID798
+    10,   // IID799
+    10,   // IID800
+    5,    // IID801
+    7,    // IID802
+    7,    // IID803
+    10,   // IID804
+    10,   // IID805
+    10,   // IID806
+    8,    // IID807
+    10,   // IID808
+    10,   // IID809
+    10,   // IID810
+    7,    // IID811
+    10,   // IID812
+    8,    // IID813
+    10,   // IID814
+    10,   // IID815
+    8,    // IID816
+    10,   // IID817
+    10,   // IID818
+    8,    // IID819
+    10,   // IID820
+    10,   // IID821
+    10,   // IID822
+    11,   // IID823
+    11,   // IID824
+    10,   // IID825
+    11,   // IID826
+    11,   // IID827
+    11,   // IID828
+    11,   // IID829
+    11,   // IID830
+    10,   // IID831
+    11,   // IID832
+    11,   // IID833
+    10,   // IID834
+    6,    // IID835
+    3,    // IID836
+    6,    // IID837
+    6,    // IID838
+    6,    // IID839
+    6,    // IID840
+    6,    // IID841
+    6,    // IID842
+    6,    // IID843
+    4,    // IID844
+    6,    // IID845
+    6,    // IID846
+    6,    // IID847
+    4,    // IID848
+    6,    // IID849
+    6,    // IID850
+    6,    // IID851
+    3,    // IID852
+    6,    // IID853
+    6,    // IID854
+    6,    // IID855
+    3,    // IID856
+    6,    // IID857
+    6,    // IID858
+    6,    // IID859
+    4,    // IID860
+    6,    // IID861
+    6,    // IID862
+    7,    // IID863
+    5,    // IID864
+    7,    // IID865
+    7,    // IID866
+    7,    // IID867
+    5,    // IID868
+    7,    // IID869
+    7,    // IID870
+    6,    // IID871
+    4,    // IID872
+    6,    // IID873
+    4,    // IID874
+    6,    // IID875
+    4,    // IID876
+    6,    // IID877
+    4,    // IID878
+    6,    // IID879
+    4,    // IID880
+    6,    // IID881
+    4,    // IID882
+    6,    // IID883
+    4,    // IID884
+    6,    // IID885
+    4,    // IID886
+    6,    // IID887
+    4,    // IID888
+    6,    // IID889
+    4,    // IID890
+    6,    // IID891
+    4,    // IID892
+    6,    // IID893
+    4,    // IID894
+    6,    // IID895
+    4,    // IID896
+    6,    // IID897
+    4,    // IID898
+    6,    // IID899
+    4,    // IID900
+    6,    // IID901
+    4,    // IID902
+    11,   // IID903
+    11,   // IID904
+    11,   // IID905
+    10,   // IID906
+    11,   // IID907
+    9,    // IID908
+    11,   // IID909
+    11,   // IID910
+    11,   // IID911
+    10,   // IID912
+    11,   // IID913
+    11,   // IID914
+    11,   // IID915
+    11,   // IID916
+    11,   // IID917
+    11,   // IID918
 #endif // _LP64
   };
 
@@ -2397,545 +3051,763 @@
     "__ emull(Address(r22, r10, (Address::ScaleFactor)1, -0x3d379b56), false);",          // IID177
     "__ emull(Address(r11, -0x3249efaf), true);",                                         // IID178
     "__ elzcntl(r9, r16, false);",                                                        // IID179
-    "__ elzcntl(r23, r28, true);",                                                        // IID180
-    "__ enegl(r8, r30, false);",                                                          // IID181
-    "__ enegl(r23, r11, true);",                                                          // IID182
-    "__ epopcntl(r13, r16, false);",                                                      // IID183
-    "__ epopcntl(r11, r11, true);",                                                       // IID184
-    "__ enotl(r26, rcx);",                                                                // IID185
-    "__ eroll(rbx, r10, false);",                                                         // IID186
-    "__ eroll(r14, r29, true);",                                                          // IID187
-    "__ erorl(r15, r20, false);",                                                         // IID188
-    "__ erorl(r17, r12, true);",                                                          // IID189
-    "__ esall(r12, rbx, false);",                                                         // IID190
-    "__ esall(r23, r27, true);",                                                          // IID191
-    "__ esarl(r29, r20, false);",                                                         // IID192
-    "__ esarl(r28, rdx, true);",                                                          // IID193
-    "__ edecl(r8, r27, false);",                                                          // IID194
-    "__ edecl(rbx, r15, true);",                                                          // IID195
-    "__ eincl(r11, r27, false);",                                                         // IID196
-    "__ eincl(r29, r25, true);",                                                          // IID197
-    "__ eshll(r12, r8, false);",                                                          // IID198
-    "__ eshll(r11, r18, true);",                                                          // IID199
-    "__ eshrl(rdx, r13, false);",                                                         // IID200
-    "__ eshrl(r23, r24, true);",                                                          // IID201
-    "__ etzcntl(r15, r15, false);",                                                       // IID202
-    "__ etzcntl(r26, r28, true);",                                                        // IID203
-    "__ elzcntl(rbx, Address(r25, r14, (Address::ScaleFactor)0, +0x1c13fdb6), false);",   // IID204
-    "__ elzcntl(r9, Address(r31, r28, (Address::ScaleFactor)3, -0x30bf8b7f), true);",     // IID205
-    "__ enegl(r8, Address(r25, -0x9c80fe2), false);",                                     // IID206
-    "__ enegl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true);",      // IID207
-    "__ epopcntl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false);",  // IID208
-    "__ epopcntl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true);",   // IID209
-    "__ esall(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false);",     // IID210
-    "__ esall(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true);",      // IID211
-    "__ esarl(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false);",     // IID212
-    "__ esarl(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true);",       // IID213
-    "__ edecl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false);",     // IID214
-    "__ edecl(r26, Address(r25, +0x3d145d48), true);",                                    // IID215
-    "__ eincl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false);",     // IID216
-    "__ eincl(r11, Address(r22, +0x765904a6), true);",                                    // IID217
-    "__ eshrl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false);",     // IID218
-    "__ eshrl(r22, Address(r12, -0x50325da9), true);",                                    // IID219
-    "__ etzcntl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false);",    // IID220
-    "__ etzcntl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true);",    // IID221
-    "__ eaddl(r22, Address(r27, r31, (Address::ScaleFactor)2, -0x7f80902f), 1048576, false);", // IID222
-    "__ eaddl(r31, Address(rdx, r21, (Address::ScaleFactor)3, -0x557cc036), 268435456, true);", // IID223
-    "__ eandl(r10, Address(r26, +0x4e6bebf9), 4096, false);",                             // IID224
-    "__ eandl(r13, Address(r30, +0x14f1a5fd), 256, true);",                               // IID225
-    "__ eimull(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false);",  // IID226
-    "__ eimull(r27, Address(r9, -0x446d2dc1), 256, true);",                               // IID227
-    "__ eorl(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false);",  // IID228
-    "__ eorl(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true);",    // IID229
-    "__ eorb(r15, Address(r9, -0x25974a1e), 64, false);",                                 // IID230
-    "__ eorb(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4, true);",    // IID231
-    "__ esall(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false);",  // IID232
-    "__ esall(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 8, true);",    // IID233
-    "__ esarl(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false);",   // IID234
-    "__ esarl(r15, Address(r25, -0x505836f3), 16, true);",                                // IID235
-    "__ eshrl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false);",   // IID236
-    "__ eshrl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true);",   // IID237
-    "__ esubl(rbx, Address(r12, r8, (Address::ScaleFactor)1, -0x3575087f), 4096, false);", // IID238
-    "__ esubl(r28, Address(rbx, r21, (Address::ScaleFactor)3, -0x55f83db8), 65536, true);", // IID239
-    "__ exorl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false);",  // IID240
-    "__ exorl(r28, Address(r18, -0x452348a1), 16777216, true);",                          // IID241
-    "__ eaddl(r18, Address(rdx, r10, (Address::ScaleFactor)2, -0x161e1d47), r16, false);", // IID242
-    "__ eaddl(r27, Address(r25, r18, (Address::ScaleFactor)3, -0x679bb823), rdx, true);", // IID243
-    "__ eorl(r27, Address(r31, r29, (Address::ScaleFactor)3, +0x19ed7934), r9, false);",  // IID244
-    "__ eorl(r22, Address(r8, r16, (Address::ScaleFactor)2, -0x1bf71f78), r17, true);",   // IID245
-    "__ eorb(rcx, Address(r15, r28, (Address::ScaleFactor)3, -0x6a4a3934), r16, false);", // IID246
-    "__ eorb(r28, Address(r23, r12, (Address::ScaleFactor)2, +0x3c2449f7), r16, true);",  // IID247
-    "__ esubl(r22, Address(r27, r10, (Address::ScaleFactor)1, -0x3c29396f), r9, false);", // IID248
-    "__ esubl(r10, Address(r16, -0x165064ff), r17, true);",                               // IID249
-    "__ exorl(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false);", // IID250
-    "__ exorl(rdx, Address(rbx, r31, (Address::ScaleFactor)3, +0x7753d0dc), r17, true);", // IID251
-    "__ exorb(r9, Address(r31, +0x72a4f58e), r30, false);",                               // IID252
-    "__ exorb(r24, Address(r25, r15, (Address::ScaleFactor)0, +0x20fc1a0a), r16, true);", // IID253
-    "__ eaddl(r12, rbx, 65536, false);",                                                  // IID254
-    "__ eaddl(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
+    "__ elzcntl(r23, r23, false);",                                                       // IID180
+    "__ elzcntl(r28, r8, true);",                                                         // IID181
+    "__ elzcntl(r30, r30, true);",                                                        // IID182
+    "__ enegl(r23, r11, false);",                                                         // IID183
+    "__ enegl(r13, r13, false);",                                                         // IID184
+    "__ enegl(r16, r11, true);",                                                          // IID185
+    "__ enegl(r11, r11, true);",                                                          // IID186
+    "__ epopcntl(r26, rcx, false);",                                                      // IID187
+#endif // _LP64
+    "__ epopcntl(rbx, rbx, false);",                                                      // IID188
+#ifdef _LP64
+    "__ epopcntl(r10, r14, true);",                                                       // IID189
+    "__ epopcntl(r29, r29, true);",                                                       // IID190
+    "__ enotl(r15, r20);",                                                                // IID191
+    "__ enotl(r17, r17);",                                                                // IID192
+    "__ eroll(r12, r12, false);",                                                         // IID193
+#endif // _LP64
+    "__ eroll(rbx, rbx, false);",                                                         // IID194
+#ifdef _LP64
+    "__ eroll(r23, r27, true);",                                                          // IID195
+    "__ eroll(r29, r29, true);",                                                          // IID196
+    "__ erorl(r20, r28, false);",                                                         // IID197
+#endif // _LP64
+    "__ erorl(rdx, rdx, false);",                                                         // IID198
+#ifdef _LP64
+    "__ erorl(r8, r27, true);",                                                           // IID199
+#endif // _LP64
+    "__ erorl(rbx, rbx, true);",                                                          // IID200
+#ifdef _LP64
+    "__ esall(r15, r11, false);",                                                         // IID201
+    "__ esall(r27, r27, false);",                                                         // IID202
+    "__ esall(r29, r25, true);",                                                          // IID203
+    "__ esall(r12, r12, true);",                                                          // IID204
+    "__ esarl(r8, r11, false);",                                                          // IID205
+    "__ esarl(r18, r18, false);",                                                         // IID206
+    "__ esarl(rdx, r13, true);",                                                          // IID207
+    "__ esarl(r23, r23, true);",                                                          // IID208
+    "__ edecl(r24, r15, false);",                                                         // IID209
+    "__ edecl(r15, r15, false);",                                                         // IID210
+    "__ edecl(r26, r28, true);",                                                          // IID211
+#endif // _LP64
+    "__ edecl(rbx, rbx, true);",                                                          // IID212
+#ifdef _LP64
+    "__ eincl(r25, r14, false);",                                                         // IID213
+    "__ eincl(r12, r12, false);",                                                         // IID214
+    "__ eincl(rcx, r23, true);",                                                          // IID215
+    "__ eincl(r29, r29, true);",                                                          // IID216
+    "__ eshll(r22, r24, false);",                                                         // IID217
+    "__ eshll(r15, r15, false);",                                                         // IID218
+    "__ eshll(r9, r31, true);",                                                           // IID219
+    "__ eshll(r28, r28, true);",                                                          // IID220
+    "__ eshrl(r21, r18, false);",                                                         // IID221
+    "__ eshrl(r24, r24, false);",                                                         // IID222
+    "__ eshrl(r14, r19, true);",                                                          // IID223
+    "__ eshrl(r8, r8, true);",                                                            // IID224
+    "__ etzcntl(r25, r9, false);",                                                        // IID225
+    "__ etzcntl(r26, r26, false);",                                                       // IID226
+    "__ etzcntl(r8, r30, true);",                                                         // IID227
+    "__ etzcntl(r26, r26, true);",                                                        // IID228
+    "__ elzcntl(r29, Address(r25, r20, (Address::ScaleFactor)3, -0x9c80fe2), false);",    // IID229
+    "__ elzcntl(r22, Address(r27, r19, (Address::ScaleFactor)2, +0x38f27c09), true);",    // IID230
+    "__ enegl(r21, Address(r14, r30, (Address::ScaleFactor)2, +0x39f92c7b), false);",     // IID231
+    "__ enegl(r26, Address(r23, r14, (Address::ScaleFactor)3, -0x602e1b3d), true);",      // IID232
+    "__ epopcntl(r25, Address(r28, r23, (Address::ScaleFactor)1, +0x4ff120ef), false);",  // IID233
+    "__ epopcntl(r29, Address(r24, r16, (Address::ScaleFactor)3, -0x6821bb43), true);",   // IID234
+    "__ esall(r23, Address(r11, r31, (Address::ScaleFactor)2, +0x7f4224bb), false);",     // IID235
+    "__ esall(r12, Address(r23, r31, (Address::ScaleFactor)1, -0x28f87a8), true);",       // IID236
+    "__ esarl(r19, Address(r16, r30, (Address::ScaleFactor)1, -0x27b89e0d), false);",     // IID237
+    "__ esarl(r26, Address(r25, +0x3d145d48), true);",                                    // IID238
+    "__ edecl(r13, Address(r27, r24, (Address::ScaleFactor)1, +0x625f3862), false);",     // IID239
+    "__ edecl(r11, Address(r22, +0x765904a6), true);",                                    // IID240
+    "__ eincl(r25, Address(rdx, r17, (Address::ScaleFactor)1, -0x7d50376f), false);",     // IID241
+    "__ eincl(r22, Address(r12, -0x50325da9), true);",                                    // IID242
+    "__ eshrl(r13, Address(r13, r20, (Address::ScaleFactor)0, -0xbf3e86c), false);",      // IID243
+    "__ eshrl(r26, Address(r14, r19, (Address::ScaleFactor)1, -0x24c59cb9), true);",      // IID244
+    "__ etzcntl(r16, Address(r22, r27, (Address::ScaleFactor)2, -0x7f80902f), false);",   // IID245
+    "__ etzcntl(r20, Address(r31, rdx, (Address::ScaleFactor)3, +0x12254818), true);",    // IID246
+    "__ eaddl(r21, Address(r12, r10, (Address::ScaleFactor)3, +0x6417cf06), 1048576, false);", // IID247
+    "__ eaddl(r9, Address(r13, +0x14f1a5fd), 4096, true);",                               // IID248
+    "__ eandl(r27, Address(r29, r8, (Address::ScaleFactor)0, +0x37988799), 1, false);",   // IID249
+    "__ eandl(r27, Address(r9, -0x446d2dc1), 256, true);",                                // IID250
+    "__ eimull(r17, Address(r20, r25, (Address::ScaleFactor)0, +0x4957b5db), 16, false);", // IID251
+    "__ eimull(r25, Address(r29, r31, (Address::ScaleFactor)1, +0x3c26a53e), 1, true);",  // IID252
+    "__ eorl(r15, Address(r9, -0x25974a1e), 268435456, false);",                          // IID253
+    "__ eorl(r11, Address(r16, r15, (Address::ScaleFactor)2, +0x66a0329f), 4096, true);", // IID254
+    "__ eorb(rcx, Address(rcx, r27, (Address::ScaleFactor)0, +0x38c6485e), 1, false);",   // IID255
+    "__ eorb(r25, Address(r8, r10, (Address::ScaleFactor)0, +0x79131c34), 64, true);",    // IID256
+    "__ esall(r13, Address(r9, r31, (Address::ScaleFactor)2, +0x12718ba9), 2, false);",   // IID257
+    "__ esall(r15, Address(r25, -0x505836f3), 16, true);",                                // IID258
+    "__ esarl(r15, Address(rcx, r19, (Address::ScaleFactor)0, +0xc5c1510), 1, false);",   // IID259
+    "__ esarl(r13, Address(r29, r21, (Address::ScaleFactor)2, -0x6c67309c), 8, true);",   // IID260
+    "__ eshrl(r11, Address(rbx, +0x749f67d0), 16, false);",                               // IID261
+    "__ eshrl(r14, Address(r14, -0x55f83db8), 4, true);",                                 // IID262
+    "__ esubl(r30, Address(r21, r26, (Address::ScaleFactor)0, +0x3b4d14e1), 1, false);",  // IID263
+    "__ esubl(r28, Address(r18, -0x452348a1), 16777216, true);",                          // IID264
+    "__ exorl(rdx, Address(r10, r16, (Address::ScaleFactor)2, -0x161e1d47), 16777216, false);", // IID265
+    "__ exorl(rdx, Address(r29, r23, (Address::ScaleFactor)1, +0x1b34e2f8), 16777216, true);", // IID266
+    "__ eaddl(r19, Address(r27, r31, (Address::ScaleFactor)0, +0x1f3ce7d8), r29, false);", // IID267
+    "__ eaddl(r28, Address(r24, rcx, (Address::ScaleFactor)3, -0x6053edc2), r28, false);", // IID268
+    "__ eaddl(r17, Address(r18, r24, (Address::ScaleFactor)3, -0x1bf71f78), r29, true);", // IID269
+    "__ eaddl(rcx, Address(r15, r28, (Address::ScaleFactor)1, +0x15b8216), rcx, true);",  // IID270
+    "__ eorl(r30, Address(rbx, rdx, (Address::ScaleFactor)3, -0x463540b4), r28, false);", // IID271
+    "__ eorl(r18, Address(r28, r10, (Address::ScaleFactor)3, +0x3523a73b), r18, false);", // IID272
+    "__ eorl(r9, Address(r15, r15, (Address::ScaleFactor)1, -0x2a0bdd56), r21, true);",   // IID273
+    "__ eorl(r16, Address(r23, -0x165064ff), r16, true);",                                // IID274
+    "__ eorb(r28, Address(r30, r11, (Address::ScaleFactor)0, +0x17281e3a), r20, false);", // IID275
+    "__ eorb(rdx, Address(rbx, r31, (Address::ScaleFactor)2, +0x2477b5bb), rdx, false);", // IID276
+    "__ eorb(r16, Address(r11, rcx, (Address::ScaleFactor)1, -0x3175d1af), r24, true);",  // IID277
+    "__ eorb(rbx, Address(r11, r20, (Address::ScaleFactor)3, -0x22d67bd3), rbx, true);",  // IID278
+    "__ esubl(r26, Address(r27, r30, (Address::ScaleFactor)1, -0x3d9bce2e), rdx, false);", // IID279
+    "__ esubl(r31, Address(r22, r29, (Address::ScaleFactor)1, +0x14218519), r31, false);", // IID280
+    "__ esubl(r21, Address(r9, -0x1050127a), r13, true);",                                // IID281
+    "__ esubl(r31, Address(r9, r8, (Address::ScaleFactor)0, -0xae18961), r31, true);",    // IID282
+    "__ exorl(r15, Address(r18, +0x5c2bbce5), r12, false);",                              // IID283
+    "__ exorl(r27, Address(r25, r23, (Address::ScaleFactor)0, +0x5c6078b3), r27, false);", // IID284
+    "__ exorl(r18, Address(r8, rdx, (Address::ScaleFactor)3, -0x9ed3881), r14, true);",   // IID285
+    "__ exorl(r9, Address(r15, +0x775acdad), r9, true);",                                 // IID286
+    "__ exorb(r21, Address(r18, r26, (Address::ScaleFactor)1, +0x2fe31fd5), r23, false);", // IID287
+    "__ exorb(r10, Address(r27, +0xa3150de), r10, false);",                               // IID288
+    "__ exorb(r18, Address(r22, r30, (Address::ScaleFactor)3, +0x1ad4e897), r24, true);", // IID289
+    "__ exorb(r8, Address(r16, r20, (Address::ScaleFactor)0, +0x626eae82), r8, true);",   // IID290
+    "__ eaddl(r21, r15, 1048576, false);",                                                // IID291
+    "__ eaddl(rax, r18, 1048576, false);",                                                // IID292
+    "__ eaddl(r18, r18, 256, false);",                                                    // IID293
+    "__ eaddl(r13, r19, 16, true);",                                                      // IID294
+    "__ eaddl(rax, r23, 16, true);",                                                      // IID295
+    "__ eaddl(r25, r25, 16777216, true);",                                                // IID296
+    "__ eandl(r29, r18, 1048576, false);",                                                // IID297
+    "__ eandl(rax, r14, 1048576, false);",                                                // IID298
+    "__ eandl(r19, r19, 65536, false);",                                                  // IID299
+    "__ eandl(r27, r25, 1048576, true);",                                                 // IID300
+    "__ eandl(rax, r20, 1048576, true);",                                                 // IID301
+    "__ eandl(r28, r28, 16, true);",                                                      // IID302
+    "__ eimull(r31, r22, 4096, false);",                                                  // IID303
+#endif // _LP64
+    "__ eimull(rax, rbx, 4096, false);",                                                  // IID304
+#ifdef _LP64
+    "__ eimull(r24, r24, 1048576, false);",                                               // IID305
+    "__ eimull(r21, r16, 65536, true);",                                                  // IID306
+    "__ eimull(rax, r24, 65536, true);",                                                  // IID307
+    "__ eimull(r13, r13, 16, true);",                                                     // IID308
+    "__ eorl(r29, r8, 16777216, false);",                                                 // IID309
+    "__ eorl(rax, r12, 16777216, false);",                                                // IID310
+    "__ eorl(r30, r30, 4096, false);",                                                    // IID311
+    "__ eorl(r24, rdx, 16, true);",                                                       // IID312
+    "__ eorl(rax, r8, 16, true);",                                                        // IID313
+    "__ eorl(r13, r13, 4096, true);",                                                     // IID314
+    "__ ercll(r25, r13, 1);",                                                             // IID315
+    "__ ercll(rax, r18, 1);",                                                             // IID316
+    "__ ercll(r9, r9, 16);",                                                              // IID317
+    "__ eroll(r26, r25, 8, false);",                                                      // IID318
+#endif // _LP64
+    "__ eroll(rax, rdx, 8, false);",                                                      // IID319
+#ifdef _LP64
+    "__ eroll(r24, r24, 16, false);",                                                     // IID320
+    "__ eroll(r24, rcx, 8, true);",                                                       // IID321
+    "__ eroll(rax, r30, 8, true);",                                                       // IID322
+    "__ eroll(r28, r28, 16, true);",                                                      // IID323
+    "__ erorl(r17, r28, 4, false);",                                                      // IID324
+#endif // _LP64
+    "__ erorl(rax, rdx, 4, false);",                                                      // IID325
+#ifdef _LP64
+    "__ erorl(r8, r8, 16, false);",                                                       // IID326
+    "__ erorl(r19, rdx, 16, true);",                                                      // IID327
+    "__ erorl(rax, r31, 16, true);",                                                      // IID328
+    "__ erorl(r22, r22, 8, true);",                                                       // IID329
+    "__ esall(r23, r25, 16, false);",                                                     // IID330
+    "__ esall(rax, r14, 16, false);",                                                     // IID331
+    "__ esall(r31, r31, 8, false);",                                                      // IID332
+    "__ esall(r30, r24, 2, true);",                                                       // IID333
+    "__ esall(rax, r29, 2, true);",                                                       // IID334
+    "__ esall(r8, r8, 2, true);",                                                         // IID335
+    "__ esarl(r18, r24, 16, false);",                                                     // IID336
+    "__ esarl(rax, r13, 16, false);",                                                     // IID337
+    "__ esarl(r24, r24, 1, false);",                                                      // IID338
+    "__ esarl(r28, r17, 16, true);",                                                      // IID339
+    "__ esarl(rax, r24, 16, true);",                                                      // IID340
+    "__ esarl(r17, r17, 4, true);",                                                       // IID341
+    "__ eshll(r24, rcx, 4, false);",                                                      // IID342
+    "__ eshll(rax, r16, 4, false);",                                                      // IID343
+    "__ eshll(r15, r15, 2, false);",                                                      // IID344
+    "__ eshll(r14, r27, 4, true);",                                                       // IID345
+    "__ eshll(rax, r23, 4, true);",                                                       // IID346
+    "__ eshll(r30, r30, 4, true);",                                                       // IID347
+    "__ eshrl(r27, rdx, 2, false);",                                                      // IID348
+    "__ eshrl(rax, r19, 2, false);",                                                      // IID349
+    "__ eshrl(r20, r20, 2, false);",                                                      // IID350
+    "__ eshrl(r21, r23, 1, true);",                                                       // IID351
+    "__ eshrl(rax, r30, 1, true);",                                                       // IID352
+    "__ eshrl(r25, r25, 2, true);",                                                       // IID353
+    "__ esubl(r24, r19, 1048576, false);",                                                // IID354
+    "__ esubl(rax, r14, 1048576, false);",                                                // IID355
+    "__ esubl(r22, r22, 268435456, false);",                                              // IID356
+    "__ esubl(r24, r24, 65536, true);",                                                   // IID357
+    "__ esubl(rax, r14, 65536, true);",                                                   // IID358
+    "__ esubl(r28, r28, 268435456, true);",                                               // IID359
+    "__ exorl(rbx, r20, 256, false);",                                                    // IID360
+    "__ exorl(rax, r15, 256, false);",                                                    // IID361
 #endif // _LP64
-    "__ esubl(rax, rbx, 16777216, true);",                                                // IID299
+    "__ exorl(rbx, rbx, 4096, false);",                                                   // IID362
 #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
+    "__ exorl(r24, r30, 65536, true);",                                                   // IID363
+    "__ exorl(rax, r31, 65536, true);",                                                   // IID364
+    "__ exorl(r31, r31, 4096, true);",                                                    // IID365
+    "__ esubl_imm32(r20, r10, 1048576, false);",                                          // IID366
+    "__ esubl_imm32(rax, r13, 1048576, false);",                                          // IID367
+    "__ esubl_imm32(r25, r25, 1048576, false);",                                          // IID368
+    "__ esubl_imm32(r23, r12, 1073741824, true);",                                        // IID369
+    "__ esubl_imm32(rax, r16, 1073741824, true);",                                        // IID370
+    "__ esubl_imm32(r31, r31, 65536, true);",                                             // IID371
+    "__ eaddl(r17, r13, Address(r9, +0x7fef2f98), false);",                               // IID372
+    "__ eaddl(r29, r8, Address(r22, -0x4df70aac), true);",                                // IID373
+    "__ eandl(r13, r17, Address(r12, r15, (Address::ScaleFactor)3, +0x50a8a902), false);", // IID374
+    "__ eandl(r22, r25, Address(r26, r10, (Address::ScaleFactor)2, +0x70ea2754), true);", // IID375
+    "__ eimull(r19, r12, Address(r30, r8, (Address::ScaleFactor)0, +0x6a1a0a73), false);", // IID376
+    "__ eimull(r30, r18, Address(r18, r19, (Address::ScaleFactor)2, -0x7fcd28c7), true);", // IID377
+    "__ eorl(r16, r31, Address(r25, r11, (Address::ScaleFactor)3, +0x482d5dbc), false);", // IID378
+    "__ eorl(r9, r27, Address(r11, +0x43d5ee01), true);",                                 // IID379
+    "__ esubl(rcx, r23, Address(r21, r15, (Address::ScaleFactor)2, +0x2825c2bc), false);", // IID380
+    "__ esubl(r27, r22, Address(r13, r15, (Address::ScaleFactor)1, +0x771f0da7), true);", // IID381
+    "__ exorl(r9, r30, Address(r9, r22, (Address::ScaleFactor)3, -0x4ad6c88e), false);",  // IID382
+    "__ exorl(r11, r16, Address(rbx, r28, (Address::ScaleFactor)2, +0xb0223ee), true);",  // IID383
+    "__ exorb(r15, r29, Address(r15, r28, (Address::ScaleFactor)1, -0x1f297a69), false);", // IID384
+    "__ exorb(r17, r30, Address(r23, rbx, (Address::ScaleFactor)1, +0xadc7545), true);",  // IID385
+    "__ exorw(r27, r9, Address(rdx, r22, (Address::ScaleFactor)2, -0x43d90f61), false);", // IID386
+    "__ exorw(rbx, r22, Address(r28, r22, (Address::ScaleFactor)0, -0x7d30a0b1), true);", // IID387
+    "__ eaddl(r14, r24, rcx, false);",                                                    // IID388
+    "__ eaddl(r8, r8, r17, false);",                                                      // IID389
+    "__ eaddl(r26, r24, r12, true);",                                                     // IID390
+    "__ eaddl(r24, r24, r23, true);",                                                     // IID391
+    "__ eandl(r13, r26, r31, false);",                                                    // IID392
+    "__ eandl(r11, r11, r8, false);",                                                     // IID393
+    "__ eandl(rcx, r19, r15, true);",                                                     // IID394
+    "__ eandl(r12, r12, r12, true);",                                                     // IID395
+    "__ eimull(r22, r20, r19, false);",                                                   // IID396
+    "__ eimull(r8, r8, rdx, false);",                                                     // IID397
+    "__ eimull(r22, r27, r23, true);",                                                    // IID398
+    "__ eimull(r9, r9, r18, true);",                                                      // IID399
+    "__ eorw(rcx, r30, r13, false);",                                                     // IID400
+    "__ eorw(r28, r28, r19, false);",                                                     // IID401
+    "__ eorw(r12, r30, r27, true);",                                                      // IID402
+    "__ eorw(r8, r8, r22, true);",                                                        // IID403
+    "__ eorl(r16, rcx, r30, false);",                                                     // IID404
+    "__ eorl(r10, r10, r25, false);",                                                     // IID405
+    "__ eorl(r15, r17, r17, true);",                                                      // IID406
+    "__ eorl(r9, r9, r30, true);",                                                        // IID407
+    "__ eshldl(r20, r21, r8, false);",                                                    // IID408
+    "__ eshldl(r26, r26, r14, false);",                                                   // IID409
+    "__ eshldl(r16, rdx, r14, true);",                                                    // IID410
+    "__ eshldl(r19, r19, r8, true);",                                                     // IID411
+    "__ eshrdl(r27, rbx, r26, false);",                                                   // IID412
+    "__ eshrdl(r28, r28, r19, false);",                                                   // IID413
+    "__ eshrdl(rcx, r11, r14, true);",                                                    // IID414
+    "__ eshrdl(r31, r31, r19, true);",                                                    // IID415
+    "__ esubl(r26, r13, r25, false);",                                                    // IID416
+    "__ esubl(r24, r24, r11, false);",                                                    // IID417
+    "__ esubl(r18, r20, r13, true);",                                                     // IID418
+    "__ esubl(r16, r16, r18, true);",                                                     // IID419
+    "__ exorl(r19, r17, r8, false);",                                                     // IID420
+    "__ exorl(r19, r19, r13, false);",                                                    // IID421
+    "__ exorl(r23, r13, r15, true);",                                                     // IID422
+    "__ exorl(r11, r11, r29, true);",                                                     // IID423
+    "__ eshldl(r29, r17, r17, 1, false);",                                                // IID424
+    "__ eshldl(r22, r22, r24, 4, false);",                                                // IID425
+    "__ eshldl(r8, r28, r11, 16, true);",                                                 // IID426
+    "__ eshldl(r15, r15, r23, 4, true);",                                                 // IID427
+    "__ eshrdl(r29, r22, r16, 4, false);",                                                // IID428
+    "__ eshrdl(r13, r13, r9, 4, false);",                                                 // IID429
+    "__ eshrdl(r15, r21, r12, 2, true);",                                                 // IID430
+    "__ eshrdl(r17, r17, r23, 2, true);",                                                 // IID431
+    "__ ecmovl (Assembler::Condition::overflow, rdx, r16, r29);",                         // IID432
+    "__ ecmovl (Assembler::Condition::overflow, r10, r10, r21);",                         // IID433
+    "__ ecmovl (Assembler::Condition::noOverflow, r17, r29, r18);",                       // IID434
+    "__ ecmovl (Assembler::Condition::noOverflow, r28, r28, r24);",                       // IID435
+    "__ ecmovl (Assembler::Condition::below, r10, r20, r27);",                            // IID436
+    "__ ecmovl (Assembler::Condition::below, r10, r10, r14);",                            // IID437
+    "__ ecmovl (Assembler::Condition::aboveEqual, r11, r27, rcx);",                       // IID438
+    "__ ecmovl (Assembler::Condition::aboveEqual, r22, r22, r15);",                       // IID439
+    "__ ecmovl (Assembler::Condition::zero, r31, r30, r19);",                             // IID440
+    "__ ecmovl (Assembler::Condition::zero, r19, r19, r26);",                             // IID441
+    "__ ecmovl (Assembler::Condition::notZero, r21, r14, r26);",                          // IID442
+    "__ ecmovl (Assembler::Condition::notZero, r20, r20, r15);",                          // IID443
+    "__ ecmovl (Assembler::Condition::belowEqual, r12, r13, r23);",                       // IID444
+    "__ ecmovl (Assembler::Condition::belowEqual, r28, r28, r20);",                       // IID445
+    "__ ecmovl (Assembler::Condition::above, r20, r24, r11);",                            // IID446
+    "__ ecmovl (Assembler::Condition::above, r10, r10, r15);",                            // IID447
+    "__ ecmovl (Assembler::Condition::negative, r19, r20, r23);",                         // IID448
+    "__ ecmovl (Assembler::Condition::negative, r15, r15, r26);",                         // IID449
+    "__ ecmovl (Assembler::Condition::positive, r19, r24, r23);",                         // IID450
+    "__ ecmovl (Assembler::Condition::positive, r28, r28, r11);",                         // IID451
+    "__ ecmovl (Assembler::Condition::parity, r13, r13, rdx);",                           // IID452
+    "__ ecmovl (Assembler::Condition::parity, r31, r31, r23);",                           // IID453
+    "__ ecmovl (Assembler::Condition::noParity, r23, r9, r27);",                          // IID454
+    "__ ecmovl (Assembler::Condition::noParity, r21, r21, r20);",                         // IID455
+    "__ ecmovl (Assembler::Condition::less, r24, r21, r29);",                             // IID456
+    "__ ecmovl (Assembler::Condition::less, rbx, rbx, r11);",                             // IID457
+    "__ ecmovl (Assembler::Condition::greaterEqual, r21, rbx, rcx);",                     // IID458
+    "__ ecmovl (Assembler::Condition::greaterEqual, r31, r31, r21);",                     // IID459
+    "__ ecmovl (Assembler::Condition::lessEqual, r15, r25, r30);",                        // IID460
+    "__ ecmovl (Assembler::Condition::lessEqual, r23, r23, r25);",                        // IID461
+    "__ ecmovl (Assembler::Condition::greater, r18, rcx, r10);",                          // IID462
+    "__ ecmovl (Assembler::Condition::greater, rcx, rcx, r31);",                          // IID463
+    "__ ecmovl (Assembler::Condition::overflow, r21, r19, Address(r26, -0x6e290873));",   // IID464
+    "__ ecmovl (Assembler::Condition::noOverflow, r24, r19, Address(r22, rcx, (Address::ScaleFactor)0, +0x11f85f9a));", // IID465
+    "__ ecmovl (Assembler::Condition::below, r17, r24, Address(r20, +0x534d775e));",      // IID466
+    "__ ecmovl (Assembler::Condition::aboveEqual, r20, r18, Address(r20, -0x47c94ecd));", // IID467
+    "__ ecmovl (Assembler::Condition::zero, r9, r13, Address(r23, -0x4b83c563));",        // IID468
+    "__ ecmovl (Assembler::Condition::notZero, r11, r25, Address(r24, r14, (Address::ScaleFactor)1, -0x446507af));", // IID469
+    "__ ecmovl (Assembler::Condition::belowEqual, r14, r24, Address(r30, r13, (Address::ScaleFactor)2, +0xd0661d));", // IID470
+    "__ ecmovl (Assembler::Condition::above, r13, r25, Address(r14, r27, (Address::ScaleFactor)3, +0x47e1403));", // IID471
+    "__ ecmovl (Assembler::Condition::negative, r24, r19, Address(rcx, rdx, (Address::ScaleFactor)3, -0x644a5318));", // IID472
+    "__ ecmovl (Assembler::Condition::positive, r26, r24, Address(r22, r22, (Address::ScaleFactor)0, +0x70352446));", // IID473
+    "__ ecmovl (Assembler::Condition::parity, r19, r26, Address(r8, r30, (Address::ScaleFactor)2, +0x78a12f5c));", // IID474
+    "__ ecmovl (Assembler::Condition::noParity, r29, r11, Address(r25, r20, (Address::ScaleFactor)0, +0x27a8303a));", // IID475
+    "__ ecmovl (Assembler::Condition::less, r22, r24, Address(r27, r16, (Address::ScaleFactor)1, +0x2541a10));", // IID476
+    "__ ecmovl (Assembler::Condition::greaterEqual, r31, r15, Address(r8, r16, (Address::ScaleFactor)3, +0x558e3251));", // IID477
+    "__ ecmovl (Assembler::Condition::lessEqual, r27, r18, Address(r8, r10, (Address::ScaleFactor)0, -0x471987b7));", // IID478
+    "__ ecmovl (Assembler::Condition::greater, r18, r16, Address(r18, r19, (Address::ScaleFactor)2, -0x120ae81e));", // IID479
+    "__ adcq(rbx, r31);",                                                                 // IID480
+    "__ cmpq(r30, r31);",                                                                 // IID481
+    "__ imulq(r29, r28);",                                                                // IID482
+    "__ popcntq(r25, r10);",                                                              // IID483
+    "__ sbbq(r24, r20);",                                                                 // IID484
+    "__ subq(r16, rdx);",                                                                 // IID485
+    "__ tzcntq(r26, r28);",                                                               // IID486
+    "__ lzcntq(r28, r9);",                                                                // IID487
+    "__ addq(r20, r24);",                                                                 // IID488
+    "__ andq(r24, r29);",                                                                 // IID489
+    "__ orq(r23, r27);",                                                                  // IID490
+    "__ xorq(r15, r12);",                                                                 // IID491
+    "__ movq(r18, r19);",                                                                 // IID492
+    "__ bsfq(r31, rcx);",                                                                 // IID493
+    "__ bsrq(r9, r13);",                                                                  // IID494
+    "__ btq(r20, rcx);",                                                                  // IID495
+    "__ xchgq(r8, r21);",                                                                 // IID496
+    "__ testq(r24, r14);",                                                                // IID497
+    "__ addq(Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d), r29);",             // IID498
+    "__ andq(Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189), r26);",             // IID499
+    "__ cmpq(Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c), r17);",             // IID500
+    "__ orq(Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d), r18);",              // IID501
+    "__ xorq(Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560), r12);",             // IID502
+    "__ subq(Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657), r29);",             // IID503
+    "__ movq(Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f), r22);",             // IID504
+    "__ xaddq(Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8), r25);",            // IID505
+    "__ andq(Address(r25, +0x632184c3), 16777216);",                                      // IID506
+    "__ addq(Address(r13, r13, (Address::ScaleFactor)0, -0x3972eac6), 16777216);",        // IID507
+    "__ cmpq(Address(r9, -0x13b4c806), 4096);",                                           // IID508
+    "__ sarq(Address(r31, +0x4fa7f551), 1);",                                             // IID509
+    "__ salq(Address(r21, r31, (Address::ScaleFactor)2, +0x31aa8232), 1);",               // IID510
+    "__ sbbq(Address(r24, r31, (Address::ScaleFactor)2, -0x466538b7), 268435456);",       // IID511
+    "__ shrq(Address(r28, r22, (Address::ScaleFactor)0, -0x3efe85b1), 2);",               // IID512
+    "__ subq(Address(r16, -0x1389a3eb), 1048576);",                                       // IID513
+    "__ xorq(Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615), 16);",               // IID514
+    "__ orq(Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2), 1);",                // IID515
+    "__ movq(Address(rcx, r24, (Address::ScaleFactor)2, -0x1644eb08), 256);",             // IID516
+    "__ testq(Address(r29, -0x7d23890b), -65536);",                                       // IID517
+    "__ addq(r23, Address(rcx, r19, (Address::ScaleFactor)2, +0x70eac654));",             // IID518
+    "__ andq(rdx, Address(r24, r15, (Address::ScaleFactor)0, -0x204ddaa9));",             // IID519
+    "__ cmpq(rdx, Address(r23, r11, (Address::ScaleFactor)3, +0x32c930bd));",             // IID520
+    "__ lzcntq(r28, Address(rdx, -0x5433c28f));",                                         // IID521
+    "__ orq(r22, Address(r19, r14, (Address::ScaleFactor)1, -0x2cc67d38));",              // IID522
+    "__ adcq(r10, Address(r10, +0x3d7c59f));",                                            // IID523
+    "__ imulq(r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d));",               // IID524
+    "__ popcntq(r23, Address(r29, -0x777ed96d));",                                        // IID525
+    "__ sbbq(rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb));",             // IID526
+    "__ subq(r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073));",             // IID527
+    "__ tzcntq(r29, Address(r10, r19, (Address::ScaleFactor)1, +0x30c98d3c));",           // IID528
+    "__ xorq(r10, Address(r16, r27, (Address::ScaleFactor)0, -0x3d08d602));",             // IID529
+    "__ movq(r18, Address(r28, r28, (Address::ScaleFactor)3, -0x62fbac91));",             // IID530
+    "__ leaq(rbx, Address(rcx, +0x450602a5));",                                           // IID531
+    "__ cvttsd2siq(r12, Address(r30, r31, (Address::ScaleFactor)0, -0x6798a630));",       // IID532
+    "__ xchgq(r31, Address(r24, r10, (Address::ScaleFactor)1, -0x706712ed));",            // IID533
+    "__ testq(r14, Address(r13, r20, (Address::ScaleFactor)3, +0x171081f2));",            // IID534
+    "__ addq(r31, 16);",                                                                  // IID535
+    "__ andq(r25, 16);",                                                                  // IID536
+    "__ adcq(r23, 256);",                                                                 // IID537
+    "__ cmpq(r19, 268435456);",                                                           // IID538
+    "__ rclq(r31, 1);",                                                                   // IID539
+    "__ rcrq(r17, 1);",                                                                   // IID540
+    "__ rolq(r25, 2);",                                                                   // IID541
+    "__ rorq(r17, 4);",                                                                   // IID542
+    "__ sarq(r28, 1);",                                                                   // IID543
+    "__ salq(r15, 4);",                                                                   // IID544
+    "__ sbbq(rbx, 65536);",                                                               // IID545
+    "__ shlq(r21, 1);",                                                                   // IID546
+    "__ shrq(r10, 1);",                                                                   // IID547
+    "__ subq(r14, 16);",                                                                  // IID548
+    "__ xorq(r18, 268435456);",                                                           // IID549
+    "__ movq(r23, 16);",                                                                  // IID550
+    "__ mov64(r12, 1099511627776);",                                                      // IID551
+    "__ btq(r14, 4);",                                                                    // IID552
+    "__ testq(r24, -4096);",                                                              // IID553
+    "__ orq_imm32(r19, 1048576);",                                                        // IID554
+    "__ subq_imm32(rcx, 268435456);",                                                     // IID555
+    "__ cmovq(Assembler::Condition::overflow, rdx, Address(r19, rbx, (Address::ScaleFactor)3, +0x211c8c4));", // IID556
+    "__ cmovq(Assembler::Condition::noOverflow, rbx, Address(r21, +0x49267743));",        // IID557
+    "__ cmovq(Assembler::Condition::below, r21, Address(r8, r28, (Address::ScaleFactor)1, -0x4c8c2946));", // IID558
+    "__ cmovq(Assembler::Condition::aboveEqual, r12, Address(r26, r20, (Address::ScaleFactor)0, -0x264df89c));", // IID559
+    "__ cmovq(Assembler::Condition::zero, r17, Address(r28, r9, (Address::ScaleFactor)2, +0x3497196b));", // IID560
+    "__ cmovq(Assembler::Condition::notZero, r13, Address(r15, r23, (Address::ScaleFactor)1, -0x27a30999));", // IID561
+    "__ cmovq(Assembler::Condition::belowEqual, r22, Address(r22, +0xf39ab05));",         // IID562
+    "__ cmovq(Assembler::Condition::above, rcx, Address(r22, r26, (Address::ScaleFactor)3, -0x48c954c));", // IID563
+    "__ cmovq(Assembler::Condition::negative, r25, Address(r19, r21, (Address::ScaleFactor)0, +0xe405b0b));", // IID564
+    "__ cmovq(Assembler::Condition::positive, r12, Address(r19, r29, (Address::ScaleFactor)3, -0x7762044b));", // IID565
+    "__ cmovq(Assembler::Condition::parity, rbx, Address(r30, r10, (Address::ScaleFactor)1, -0x19798323));", // IID566
+    "__ cmovq(Assembler::Condition::noParity, r21, Address(r24, r31, (Address::ScaleFactor)0, -0x5731652b));", // IID567
+    "__ cmovq(Assembler::Condition::less, r18, Address(r8, r10, (Address::ScaleFactor)1, -0x5613be89));", // IID568
+    "__ cmovq(Assembler::Condition::greaterEqual, r28, Address(r21, r21, (Address::ScaleFactor)3, +0x65a0fdc4));", // IID569
+    "__ cmovq(Assembler::Condition::lessEqual, r23, Address(r11, r18, (Address::ScaleFactor)0, -0x1d1af10c));", // IID570
+    "__ cmovq(Assembler::Condition::greater, r22, Address(r18, r12, (Address::ScaleFactor)1, +0x1a5f1c38));", // IID571
+    "__ call(r23);",                                                                      // IID572
+    "__ divq(r30);",                                                                      // IID573
+    "__ idivq(r19);",                                                                     // IID574
+    "__ imulq(r9);",                                                                      // IID575
+    "__ mulq(r13);",                                                                      // IID576
+    "__ negq(r16);",                                                                      // IID577
+    "__ notq(r29);",                                                                      // IID578
+    "__ rolq(rcx);",                                                                      // IID579
+    "__ rorq(r25);",                                                                      // IID580
+    "__ sarq(r8);",                                                                       // IID581
+    "__ salq(r27);",                                                                      // IID582
+    "__ shlq(r30);",                                                                      // IID583
+    "__ shrq(r23);",                                                                      // IID584
+    "__ incrementq(rbx);",                                                                // IID585
+    "__ decrementq(r14);",                                                                // IID586
+    "__ pushp(r21);",                                                                     // IID587
+    "__ popp(r21);",                                                                      // IID588
+    "__ call(Address(r20, r21, (Address::ScaleFactor)1, +0x56c6af2f));",                  // IID589
+    "__ mulq(Address(r31, r19, (Address::ScaleFactor)3, -0x1b4eb23));",                   // IID590
+    "__ negq(Address(r27, r27, (Address::ScaleFactor)0, -0x58dbfc1f));",                  // IID591
+    "__ sarq(Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1));",                  // IID592
+    "__ salq(Address(r26, r23, (Address::ScaleFactor)3, +0xb95a079));",                   // IID593
+    "__ shrq(Address(r14, r26, (Address::ScaleFactor)0, +0x3544e09));",                   // IID594
+    "__ incrementq(Address(r27, rdx, (Address::ScaleFactor)0, +0x120b3250));",            // IID595
+    "__ decrementq(Address(r9, r25, (Address::ScaleFactor)2, -0x34aaeccb));",             // IID596
+    "__ imulq(r20, Address(r16, r28, (Address::ScaleFactor)1, -0x59de05a5), 1048576);",   // IID597
+    "__ imulq(r17, r23, 256);",                                                           // IID598
+    "__ shldq(r19, r11, 8);",                                                             // IID599
+    "__ shrdq(r28, r10, 8);",                                                             // IID600
+    "__ pop2(r29, r26);",                                                                 // IID601
+    "__ pop2p(r22, r10);",                                                                // IID602
+    "__ push2(r25, r30);",                                                                // IID603
+    "__ push2p(r28, r15);",                                                               // IID604
+    "__ movzbq(r11, Address(r29, r19, (Address::ScaleFactor)2, -0x12368d34));",           // IID605
+    "__ movzwq(r14, Address(r8, r30, (Address::ScaleFactor)2, -0x4a9392de));",            // IID606
+    "__ movsbq(r28, Address(r23, r15, (Address::ScaleFactor)0, +0x6189cb54));",           // IID607
+    "__ movswq(r28, Address(rbx, r23, (Address::ScaleFactor)3, -0x2de86561));",           // IID608
+    "__ movzbq(r11, rcx);",                                                               // IID609
+    "__ movzwq(r30, r15);",                                                               // IID610
+    "__ movsbq(r14, rcx);",                                                               // IID611
+    "__ movswq(r23, r9);",                                                                // IID612
+    "__ cmpxchgq(r12, Address(r13, r10, (Address::ScaleFactor)1, -0x7c62c3a));",          // IID613
+    "__ eidivq(rcx, false);",                                                             // IID614
+    "__ eidivq(r15, true);",                                                              // IID615
+    "__ edivq(r23, false);",                                                              // IID616
+    "__ edivq(r24, true);",                                                               // IID617
+    "__ eimulq(r27, false);",                                                             // IID618
+    "__ eimulq(r30, true);",                                                              // IID619
+    "__ emulq(r12, false);",                                                              // IID620
+    "__ emulq(rcx, true);",                                                               // IID621
+    "__ emulq(Address(r13, r9, (Address::ScaleFactor)3, -0x226aab94), false);",           // IID622
+    "__ emulq(Address(r13, r24, (Address::ScaleFactor)3, -0x286c7605), true);",           // IID623
+    "__ eimulq(r21, r30, false);",                                                        // IID624
+    "__ eimulq(r17, r17, false);",                                                        // IID625
+    "__ eimulq(r29, r12, true);",                                                         // IID626
+    "__ eimulq(r30, r30, true);",                                                         // IID627
+    "__ elzcntq(r24, r15, false);",                                                       // IID628
+    "__ elzcntq(r25, r25, false);",                                                       // IID629
+    "__ elzcntq(r25, r21, true);",                                                        // IID630
+    "__ elzcntq(r22, r22, true);",                                                        // IID631
+    "__ enegq(r17, r30, false);",                                                         // IID632
+    "__ enegq(r17, r17, false);",                                                         // IID633
+    "__ enegq(r31, r17, true);",                                                          // IID634
+    "__ enegq(r29, r29, true);",                                                          // IID635
+    "__ enotq(r10, r9);",                                                                 // IID636
+    "__ enotq(r24, r24);",                                                                // IID637
+    "__ epopcntq(r28, r15, false);",                                                      // IID638
+    "__ epopcntq(r10, r10, false);",                                                      // IID639
+    "__ epopcntq(r27, r30, true);",                                                       // IID640
+    "__ epopcntq(r28, r28, true);",                                                       // IID641
+    "__ erolq(r28, r14, false);",                                                         // IID642
+    "__ erolq(r23, r23, false);",                                                         // IID643
+    "__ erolq(r23, r24, true);",                                                          // IID644
+    "__ erolq(r21, r21, true);",                                                          // IID645
+    "__ erorq(r31, r22, false);",                                                         // IID646
+    "__ erorq(r28, r28, false);",                                                         // IID647
+    "__ erorq(r17, r10, true);",                                                          // IID648
+    "__ erorq(r9, r9, true);",                                                            // IID649
+    "__ esalq(r29, r30, false);",                                                         // IID650
+    "__ esalq(r11, r11, false);",                                                         // IID651
+    "__ esalq(r26, r11, true);",                                                          // IID652
+    "__ esalq(r16, r16, true);",                                                          // IID653
+    "__ esarq(rbx, r15, false);",                                                         // IID654
+    "__ esarq(r14, r14, false);",                                                         // IID655
+    "__ esarq(r25, r16, true);",                                                          // IID656
+    "__ esarq(r8, r8, true);",                                                            // IID657
+    "__ edecq(r11, r13, false);",                                                         // IID658
+    "__ edecq(rcx, rcx, false);",                                                         // IID659
+    "__ edecq(r21, r18, true);",                                                          // IID660
+    "__ edecq(r28, r28, true);",                                                          // IID661
+    "__ eincq(r16, r16, false);",                                                         // IID662
+    "__ eincq(r29, r29, false);",                                                         // IID663
+    "__ eincq(r18, r9, true);",                                                           // IID664
+    "__ eincq(r19, r19, true);",                                                          // IID665
+    "__ eshlq(r19, r18, false);",                                                         // IID666
+    "__ eshlq(r8, r8, false);",                                                           // IID667
+    "__ eshlq(r12, r15, true);",                                                          // IID668
+    "__ eshlq(r29, r29, true);",                                                          // IID669
+    "__ eshrq(r28, r24, false);",                                                         // IID670
+    "__ eshrq(r19, r19, false);",                                                         // IID671
+    "__ eshrq(r8, r28, true);",                                                           // IID672
+    "__ eshrq(r17, r17, true);",                                                          // IID673
+    "__ etzcntq(r28, r16, false);",                                                       // IID674
+    "__ etzcntq(r14, r14, false);",                                                       // IID675
+    "__ etzcntq(r12, r31, true);",                                                        // IID676
+    "__ etzcntq(r14, r14, true);",                                                        // IID677
+    "__ eimulq(r31, Address(r13, -0x69c4b352), false);",                                  // IID678
+    "__ eimulq(r17, Address(r18, -0x60ab1105), true);",                                   // IID679
+    "__ elzcntq(r27, Address(r14, r25, (Address::ScaleFactor)2, +0x2798bf83), false);",   // IID680
+    "__ elzcntq(r23, Address(r10, r11, (Address::ScaleFactor)0, -0x378e635d), true);",    // IID681
+    "__ enegq(rcx, Address(r19, r9, (Address::ScaleFactor)3, -0x6847d440), false);",      // IID682
+    "__ enegq(rcx, Address(rbx, rcx, (Address::ScaleFactor)0, +0x6f92d38d), true);",      // IID683
+    "__ epopcntq(r20, Address(r12, -0x2a8b27d6), false);",                                // IID684
+    "__ epopcntq(r31, Address(r30, +0x4603f6d0), true);",                                 // IID685
+    "__ esalq(rbx, Address(r24, +0x567d06f9), false);",                                   // IID686
+    "__ esalq(r12, Address(r24, r28, (Address::ScaleFactor)0, -0x1c4c584e), true);",      // IID687
+    "__ esarq(r12, Address(r23, r24, (Address::ScaleFactor)2, -0x3157bcba), false);",     // IID688
+    "__ esarq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), true);",       // IID689
+    "__ edecq(r23, Address(r8, r15, (Address::ScaleFactor)1, -0x5ae272dd), false);",      // IID690
+    "__ edecq(r13, Address(r29, r9, (Address::ScaleFactor)3, -0x5b5174a9), true);",       // IID691
+    "__ eincq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), false);",     // IID692
+    "__ eincq(r13, Address(rcx, r16, (Address::ScaleFactor)0, -0x36b448c9), true);",      // IID693
+    "__ eshrq(r26, Address(r25, rcx, (Address::ScaleFactor)2, -0x5f894993), false);",     // IID694
+    "__ eshrq(r25, Address(r9, +0x51798d21), true);",                                     // IID695
+    "__ etzcntq(r28, Address(r13, r26, (Address::ScaleFactor)2, +0x207196f6), false);",   // IID696
+    "__ etzcntq(rbx, Address(r19, r13, (Address::ScaleFactor)0, -0x24d937d5), true);",    // IID697
+    "__ eaddq(r17, Address(r30, +0x3935ccff), r31, false);",                              // IID698
+    "__ eaddq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), r14, false);", // IID699
+    "__ eaddq(r18, Address(r20, r23, (Address::ScaleFactor)0, +0x5ad3ed4b), r30, true);", // IID700
+    "__ eaddq(r20, Address(rdx, -0x322a99e5), r20, true);",                               // IID701
+    "__ eandq(r31, Address(rbx, r27, (Address::ScaleFactor)3, +0x4ce247d2), r17, false);", // IID702
+    "__ eandq(r30, Address(r18, r19, (Address::ScaleFactor)1, -0x4ee3d14), r30, false);", // IID703
+    "__ eandq(r28, Address(r11, rbx, (Address::ScaleFactor)3, -0x28994bbf), r24, true);", // IID704
+    "__ eandq(r30, Address(r22, +0x7d21c24), r30, true);",                                // IID705
+    "__ eorq(r26, Address(r15, r19, (Address::ScaleFactor)3, +0x58c21792), r20, false);", // IID706
+    "__ eorq(r13, Address(r10, r27, (Address::ScaleFactor)2, -0x2c70d333), r13, false);", // IID707
+    "__ eorq(rbx, Address(r12, rbx, (Address::ScaleFactor)0, -0x1fb0f1bc), r26, true);",  // IID708
+    "__ eorq(r31, Address(r27, r31, (Address::ScaleFactor)1, +0x28d1756), r31, true);",   // IID709
+    "__ esubq(r24, Address(r28, r23, (Address::ScaleFactor)1, +0x6980f610), r27, false);", // IID710
+    "__ esubq(r15, Address(r11, r30, (Address::ScaleFactor)3, -0x49777e7), r15, false);", // IID711
+    "__ esubq(r17, Address(r25, r13, (Address::ScaleFactor)2, +0x31619e46), r31, true);", // IID712
+    "__ esubq(r18, Address(r11, r10, (Address::ScaleFactor)2, +0x1922861a), r18, true);", // IID713
+    "__ exorq(rbx, Address(r11, -0x4716d420), r21, false);",                              // IID714
+    "__ exorq(r8, Address(rdx, r9, (Address::ScaleFactor)2, -0x4cfe39c), r8, false);",    // IID715
+    "__ exorq(r16, Address(r14, r27, (Address::ScaleFactor)0, +0x7c6654d9), r25, true);", // IID716
+    "__ exorq(r29, Address(r15, -0x5efab479), r29, true);",                               // IID717
+    "__ eaddq(r19, Address(r13, r22, (Address::ScaleFactor)2, +0x68b64559), 16777216, false);", // IID718
+    "__ eaddq(r16, Address(r13, r31, (Address::ScaleFactor)3, -0x65143af5), 1, true);",   // IID719
+    "__ eandq(r31, Address(r24, r13, (Address::ScaleFactor)1, -0x25b16a0e), 1, false);",  // IID720
+    "__ eandq(r11, Address(r28, -0xf6d4b26), 65536, true);",                              // IID721
+    "__ eimulq(rcx, Address(r18, r10, (Address::ScaleFactor)0, +0x46ec6da1), 16777216, false);", // IID722
+    "__ eimulq(r15, Address(r9, r10, (Address::ScaleFactor)3, -0x7fc36af3), 16, true);",  // IID723
+    "__ eorq(r17, Address(r27, r30, (Address::ScaleFactor)0, +0x1b4cda2c), 1, false);",   // IID724
+    "__ eorq(rdx, Address(r25, r14, (Address::ScaleFactor)2, -0x59aa6b85), 4096, true);", // IID725
+    "__ esalq(r17, Address(r26, r21, (Address::ScaleFactor)1, -0x6ab1f15f), 8, false);",  // IID726
+    "__ esalq(r12, Address(r22, r17, (Address::ScaleFactor)0, -0x43ac14ab), 2, true);",   // IID727
+    "__ esarq(r29, Address(r18, r16, (Address::ScaleFactor)0, -0x59dc0c61), 4, false);",  // IID728
+    "__ esarq(r16, Address(r11, -0x7bdd314), 4, true);",                                  // IID729
+    "__ eshrq(r26, Address(r23, r27, (Address::ScaleFactor)3, -0x55b92314), 16, false);", // IID730
+    "__ eshrq(r23, Address(r16, r29, (Address::ScaleFactor)1, +0x71311a1d), 2, true);",   // IID731
+    "__ esubq(r25, Address(r9, -0x9532bac), 1048576, false);",                            // IID732
+    "__ esubq(r17, Address(r8, r23, (Address::ScaleFactor)0, +0x55d06ca2), 1048576, true);", // IID733
+    "__ exorq(r29, Address(r9, r24, (Address::ScaleFactor)0, -0x2c141c1), 1048576, false);", // IID734
+    "__ exorq(r28, Address(r22, r19, (Address::ScaleFactor)1, -0x2d9d9abd), 16, true);",  // IID735
+    "__ eaddq(r22, r14, 16, false);",                                                     // IID736
+    "__ eaddq(rax, r12, 16, false);",                                                     // IID737
+    "__ eaddq(r24, r24, 65536, false);",                                                  // IID738
+    "__ eaddq(r21, rbx, 65536, true);",                                                   // IID739
+    "__ eaddq(rax, rbx, 65536, true);",                                                   // IID740
+    "__ eaddq(r24, r24, 65536, true);",                                                   // IID741
+    "__ eandq(r21, r27, 16777216, false);",                                               // IID742
+    "__ eandq(rax, r27, 16777216, false);",                                               // IID743
+    "__ eandq(r24, r24, 65536, false);",                                                  // IID744
+    "__ eandq(r13, r31, 1048576, true);",                                                 // IID745
+    "__ eandq(rax, r21, 1048576, true);",                                                 // IID746
+    "__ eandq(r30, r30, 1048576, true);",                                                 // IID747
+    "__ eimulq(r8, r13, 268435456, false);",                                              // IID748
+    "__ eimulq(rax, r31, 268435456, false);",                                             // IID749
+    "__ eimulq(r13, r13, 65536, false);",                                                 // IID750
+    "__ eimulq(r14, r29, 1048576, true);",                                                // IID751
+    "__ eimulq(rax, r22, 1048576, true);",                                                // IID752
+    "__ eimulq(r8, r8, 268435456, true);",                                                // IID753
+    "__ eorq(r30, r15, 4096, false);",                                                    // IID754
+    "__ eorq(rax, r28, 4096, false);",                                                    // IID755
+    "__ eorq(r26, r26, 1048576, false);",                                                 // IID756
+    "__ eorq(r16, r12, 268435456, true);",                                                // IID757
+    "__ eorq(rax, r9, 268435456, true);",                                                 // IID758
+    "__ eorq(r23, r23, 256, true);",                                                      // IID759
+    "__ erclq(r15, r9, 16);",                                                             // IID760
+    "__ erclq(rax, r8, 16);",                                                             // IID761
+    "__ erclq(r25, r25, 1);",                                                             // IID762
+    "__ erolq(r9, r17, 16, false);",                                                      // IID763
+    "__ erolq(rax, r20, 16, false);",                                                     // IID764
+    "__ erolq(r27, r27, 1, false);",                                                      // IID765
+    "__ erolq(r20, r31, 1, true);",                                                       // IID766
+    "__ erolq(rax, r18, 1, true);",                                                       // IID767
+    "__ erolq(r28, r28, 16, true);",                                                      // IID768
+    "__ erorq(r26, r18, 16, false);",                                                     // IID769
+    "__ erorq(rax, r24, 16, false);",                                                     // IID770
+    "__ erorq(r22, r22, 16, false);",                                                     // IID771
+    "__ erorq(r27, r29, 1, true);",                                                       // IID772
+    "__ erorq(rax, r18, 1, true);",                                                       // IID773
+    "__ erorq(r21, r21, 1, true);",                                                       // IID774
+    "__ esalq(r12, rcx, 2, false);",                                                      // IID775
+    "__ esalq(rax, r24, 2, false);",                                                      // IID776
+    "__ esalq(r22, r22, 8, false);",                                                      // IID777
+    "__ esalq(r17, r23, 8, true);",                                                       // IID778
+    "__ esalq(rax, r27, 8, true);",                                                       // IID779
+    "__ esalq(r23, r23, 1, true);",                                                       // IID780
+    "__ esarq(r8, r25, 16, false);",                                                      // IID781
+    "__ esarq(rax, r23, 16, false);",                                                     // IID782
+    "__ esarq(r9, r9, 4, false);",                                                        // IID783
+    "__ esarq(r22, r13, 1, true);",                                                       // IID784
+    "__ esarq(rax, r11, 1, true);",                                                       // IID785
+    "__ esarq(r12, r12, 2, true);",                                                       // IID786
+    "__ eshlq(rcx, r30, 8, false);",                                                      // IID787
+    "__ eshlq(rax, r19, 8, false);",                                                      // IID788
+    "__ eshlq(r13, r13, 2, false);",                                                      // IID789
+    "__ eshlq(r18, r11, 8, true);",                                                       // IID790
+    "__ eshlq(rax, r9, 8, true);",                                                        // IID791
+    "__ eshlq(rcx, rcx, 16, true);",                                                      // IID792
+    "__ eshrq(r10, r22, 4, false);",                                                      // IID793
+    "__ eshrq(rax, r9, 4, false);",                                                       // IID794
+    "__ eshrq(r12, r12, 2, false);",                                                      // IID795
+    "__ eshrq(r26, r31, 8, true);",                                                       // IID796
+    "__ eshrq(rax, r12, 8, true);",                                                       // IID797
+    "__ eshrq(r28, r28, 1, true);",                                                       // IID798
+    "__ esubq(r15, r30, 65536, false);",                                                  // IID799
+    "__ esubq(rax, rcx, 65536, false);",                                                  // IID800
+    "__ esubq(r26, r26, 16, false);",                                                     // IID801
+    "__ esubq(r12, r14, 1, true);",                                                       // IID802
+    "__ esubq(rax, r21, 1, true);",                                                       // IID803
+    "__ esubq(r20, r20, 1048576, true);",                                                 // IID804
+    "__ exorq(r11, rbx, 16777216, false);",                                               // IID805
+    "__ exorq(rax, r23, 16777216, false);",                                               // IID806
+    "__ exorq(r31, r31, 268435456, false);",                                              // IID807
+    "__ exorq(r29, r28, 4096, true);",                                                    // IID808
+    "__ exorq(rax, r19, 4096, true);",                                                    // IID809
+    "__ exorq(rdx, rdx, 268435456, true);",                                               // IID810
+    "__ eorq_imm32(rdx, rdx, 1048576, false);",                                           // IID811
+    "__ eorq_imm32(rax, r22, 1048576, false);",                                           // IID812
+    "__ eorq_imm32(r29, r29, 1048576, false);",                                           // IID813
+    "__ eorq_imm32(r17, rcx, 4194304, false);",                                           // IID814
+    "__ eorq_imm32(rax, r25, 4194304, false);",                                           // IID815
+    "__ eorq_imm32(r27, r27, 1073741824, false);",                                        // IID816
+    "__ esubq_imm32(r16, r19, 4194304, false);",                                          // IID817
+    "__ esubq_imm32(rax, r31, 4194304, false);",                                          // IID818
+    "__ esubq_imm32(r26, r26, 262144, false);",                                           // IID819
+    "__ esubq_imm32(r17, r22, 1073741824, true);",                                        // IID820
+    "__ esubq_imm32(rax, r18, 1073741824, true);",                                        // IID821
+    "__ esubq_imm32(r23, r23, 268435456, true);",                                         // IID822
+    "__ eaddq(r13, r30, Address(r24, r19, (Address::ScaleFactor)1, +0x56ea3a3b), false);", // IID823
+    "__ eaddq(r29, r15, Address(r26, r27, (Address::ScaleFactor)3, -0x4b113958), true);", // IID824
+    "__ eandq(r12, r30, Address(r31, -0x46103c74), false);",                              // IID825
+    "__ eandq(r27, r10, Address(r22, r25, (Address::ScaleFactor)1, +0x6a1ebee5), true);", // IID826
+    "__ eorq(r30, r26, Address(r11, r18, (Address::ScaleFactor)2, -0x2b9fff29), false);", // IID827
+    "__ eorq(r9, r12, Address(r18, r17, (Address::ScaleFactor)0, +0xb4859f6), true);",    // IID828
+    "__ eimulq(rdx, r17, Address(r24, rdx, (Address::ScaleFactor)2, +0x3d284cd8), false);", // IID829
+    "__ eimulq(r29, r26, Address(r30, r12, (Address::ScaleFactor)1, +0x6e813124), true);", // IID830
+    "__ esubq(rbx, r13, Address(r22, -0x702a289e), false);",                              // IID831
+    "__ esubq(r23, r29, Address(r25, rdx, (Address::ScaleFactor)0, -0x6252a7ed), true);", // IID832
+    "__ exorq(r8, r18, Address(r19, r14, (Address::ScaleFactor)2, -0xebfa697), false);",  // IID833
+    "__ exorq(r10, r28, Address(r26, +0x168381ca), true);",                               // IID834
+    "__ eaddq(rcx, r18, r8, false);",                                                     // IID835
+    "__ eaddq(rcx, rcx, r14, false);",                                                    // IID836
+    "__ eaddq(r23, r10, r16, true);",                                                     // IID837
+    "__ eaddq(r11, r11, r24, true);",                                                     // IID838
+    "__ eadcxq(r9, r18, rdx);",                                                           // IID839
+    "__ eadcxq(r8, r8, r15);",                                                            // IID840
+    "__ eadoxq(r15, r22, r26);",                                                          // IID841
+    "__ eadoxq(r11, r11, rdx);",                                                          // IID842
+    "__ eandq(r19, rdx, r22, false);",                                                    // IID843
+    "__ eandq(r29, r29, r17, false);",                                                    // IID844
+    "__ eandq(r23, r27, r15, true);",                                                     // IID845
+    "__ eandq(r9, r9, r13, true);",                                                       // IID846
+    "__ eimulq(r18, r15, r16, false);",                                                   // IID847
+    "__ eimulq(rcx, rcx, r17, false);",                                                   // IID848
+    "__ eimulq(r23, r12, r20, true);",                                                    // IID849
+    "__ eimulq(r10, r10, r9, true);",                                                     // IID850
+    "__ eorq(rdx, r19, r14, false);",                                                     // IID851
+    "__ eorq(rcx, rcx, r13, false);",                                                     // IID852
+    "__ eorq(r9, r25, r29, true);",                                                       // IID853
+    "__ eorq(rdx, rdx, r25, true);",                                                      // IID854
+    "__ esubq(r23, r8, r16, false);",                                                     // IID855
+    "__ esubq(r13, r13, r13, false);",                                                    // IID856
+    "__ esubq(r19, r12, r15, true);",                                                     // IID857
+    "__ esubq(r9, r9, rdx, true);",                                                       // IID858
+    "__ exorq(r13, r16, r31, false);",                                                    // IID859
+    "__ exorq(r17, r17, r30, false);",                                                    // IID860
+    "__ exorq(r19, r30, r20, true);",                                                     // IID861
+    "__ exorq(r31, r31, r13, true);",                                                     // IID862
+    "__ eshldq(r22, r10, r13, 4, false);",                                                // IID863
+    "__ eshldq(r24, r24, r21, 16, false);",                                               // IID864
+    "__ eshldq(r20, r13, r27, 16, true);",                                                // IID865
+    "__ eshldq(r31, r31, r19, 2, true);",                                                 // IID866
+    "__ eshrdq(r30, r20, r11, 8, false);",                                                // IID867
+    "__ eshrdq(rdx, rdx, r15, 1, false);",                                                // IID868
+    "__ eshrdq(r28, r30, r14, 2, true);",                                                 // IID869
+    "__ eshrdq(r20, r20, r16, 1, true);",                                                 // IID870
+    "__ ecmovq (Assembler::Condition::overflow, r21, r17, r28);",                         // IID871
+    "__ ecmovq (Assembler::Condition::overflow, r15, r15, r30);",                         // IID872
+    "__ ecmovq (Assembler::Condition::noOverflow, rcx, r15, r15);",                       // IID873
+    "__ ecmovq (Assembler::Condition::noOverflow, rcx, rcx, r13);",                       // IID874
+    "__ ecmovq (Assembler::Condition::below, rdx, r26, r26);",                            // IID875
+    "__ ecmovq (Assembler::Condition::below, r28, r28, r15);",                            // IID876
+    "__ ecmovq (Assembler::Condition::aboveEqual, r8, rdx, rcx);",                        // IID877
+    "__ ecmovq (Assembler::Condition::aboveEqual, rcx, rcx, rcx);",                       // IID878
+    "__ ecmovq (Assembler::Condition::zero, r10, r13, r9);",                              // IID879
+    "__ ecmovq (Assembler::Condition::zero, r14, r14, r27);",                             // IID880
+    "__ ecmovq (Assembler::Condition::notZero, r11, r23, r9);",                           // IID881
+    "__ ecmovq (Assembler::Condition::notZero, r11, r11, rdx);",                          // IID882
+    "__ ecmovq (Assembler::Condition::belowEqual, r31, r14, r25);",                       // IID883
+    "__ ecmovq (Assembler::Condition::belowEqual, r20, r20, r12);",                       // IID884
+    "__ ecmovq (Assembler::Condition::above, rdx, r10, r28);",                            // IID885
+    "__ ecmovq (Assembler::Condition::above, r8, r8, r17);",                              // IID886
+    "__ ecmovq (Assembler::Condition::negative, rcx, r30, r23);",                         // IID887
+    "__ ecmovq (Assembler::Condition::negative, r26, r26, r18);",                         // IID888
+    "__ ecmovq (Assembler::Condition::positive, rdx, rbx, r18);",                         // IID889
+    "__ ecmovq (Assembler::Condition::positive, r21, r21, r13);",                         // IID890
+    "__ ecmovq (Assembler::Condition::parity, r27, r28, r27);",                           // IID891
+    "__ ecmovq (Assembler::Condition::parity, r11, r11, r30);",                           // IID892
+    "__ ecmovq (Assembler::Condition::noParity, rcx, r21, r18);",                         // IID893
+    "__ ecmovq (Assembler::Condition::noParity, rcx, rcx, r29);",                         // IID894
+    "__ ecmovq (Assembler::Condition::less, rdx, r21, r12);",                             // IID895
+    "__ ecmovq (Assembler::Condition::less, rdx, rdx, r26);",                             // IID896
+    "__ ecmovq (Assembler::Condition::greaterEqual, r17, rbx, r22);",                     // IID897
+    "__ ecmovq (Assembler::Condition::greaterEqual, rdx, rdx, r11);",                     // IID898
+    "__ ecmovq (Assembler::Condition::lessEqual, rdx, r14, r8);",                         // IID899
+    "__ ecmovq (Assembler::Condition::lessEqual, r14, r14, r8);",                         // IID900
+    "__ ecmovq (Assembler::Condition::greater, r25, r29, r21);",                          // IID901
+    "__ ecmovq (Assembler::Condition::greater, r26, r26, r30);",                          // IID902
+    "__ ecmovq (Assembler::Condition::overflow, r24, r21, Address(r13, r11, (Address::ScaleFactor)1, +0x439c521e));", // IID903
+    "__ ecmovq (Assembler::Condition::noOverflow, r11, r18, Address(r29, r16, (Address::ScaleFactor)0, +0x632127f));", // IID904
+    "__ ecmovq (Assembler::Condition::below, r16, r8, Address(r8, r26, (Address::ScaleFactor)1, +0x10633def));", // IID905
+    "__ ecmovq (Assembler::Condition::aboveEqual, r13, r14, Address(r18, -0x54f69e38));", // IID906
+    "__ ecmovq (Assembler::Condition::zero, r12, r8, Address(r31, r26, (Address::ScaleFactor)1, -0x7a1e447a));", // IID907
+    "__ ecmovq (Assembler::Condition::notZero, r29, r29, Address(r19, r11, (Address::ScaleFactor)2, -0x35d82dd2));", // IID908
+    "__ ecmovq (Assembler::Condition::belowEqual, rcx, r18, Address(r25, r28, (Address::ScaleFactor)0, +0x30be64a0));", // IID909
+    "__ ecmovq (Assembler::Condition::above, r28, r12, Address(r10, r16, (Address::ScaleFactor)1, -0x22b8fefa));", // IID910
+    "__ ecmovq (Assembler::Condition::negative, r11, r8, Address(rbx, r11, (Address::ScaleFactor)3, +0x25cc9e96));", // IID911
+    "__ ecmovq (Assembler::Condition::positive, r12, r27, Address(r11, -0xc2d70fe));",    // IID912
+    "__ ecmovq (Assembler::Condition::parity, r8, r26, Address(r19, rbx, (Address::ScaleFactor)1, -0x486db7ea));", // IID913
+    "__ ecmovq (Assembler::Condition::noParity, r30, r10, Address(r14, r18, (Address::ScaleFactor)3, +0x14884884));", // IID914
+    "__ ecmovq (Assembler::Condition::less, r27, r8, Address(r29, r14, (Address::ScaleFactor)2, +0x92b7a8));", // IID915
+    "__ ecmovq (Assembler::Condition::greaterEqual, r14, r28, Address(r19, rdx, (Address::ScaleFactor)0, +0x9c2d45));", // IID916
+    "__ ecmovq (Assembler::Condition::lessEqual, r25, r8, Address(rcx, r18, (Address::ScaleFactor)2, +0x6655c86b));", // IID917
+    "__ ecmovq (Assembler::Condition::greater, r19, r21, Address(r10, r25, (Address::ScaleFactor)0, -0x1005430b));", // IID918
 #endif // _LP64
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/gtest/x86/test_assembler_x86.cpp b/test/hotspot/gtest/x86/test_assembler_x86.cpp
index 32315e06fde..1382d0c243f 100644
--- a/test/hotspot/gtest/x86/test_assembler_x86.cpp
+++ b/test/hotspot/gtest/x86/test_assembler_x86.cpp
@@ -71,7 +71,7 @@ TEST_VM(AssemblerX86, validate) {
   VM_Version::set_evex_cpuFeatures();
   VM_Version::set_avx_cpuFeatures();
   VM_Version::set_apx_cpuFeatures();
-  BufferBlob* b = BufferBlob::create("x64Test", 500000);
+  BufferBlob* b = BufferBlob::create("x64Test", 5000000);
   CodeBuffer code(b);
   MacroAssembler _masm(&code);
   address entry = __ pc();
diff --git a/test/hotspot/gtest/x86/x86-asmtest.py b/test/hotspot/gtest/x86/x86-asmtest.py
index 51932988fb2..7081c64e604 100644
--- a/test/hotspot/gtest/x86/x86-asmtest.py
+++ b/test/hotspot/gtest/x86/x86-asmtest.py
@@ -30,6 +30,7 @@
 X86_AS = "as"
 X86_OBJCOPY = "objcopy"
 SEED = 1327
+TEST_DEMOTION = True
 
 random.seed(SEED)
 
@@ -301,12 +302,18 @@ def __init__(self, name, aname, width, cond, reg1, reg2, reg3):
         self.reg3 = Register().generate(reg3, width)
         self.cond = cond
         self.generate_operands(self.reg1, self.reg2, self.reg3)
+        self.demote = True
     
     def cstr(self):
         return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
     
     def astr(self):
-        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in self.operands])
+        operands = self.operands
+        if self.demote:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1]:
+                operands = operands[1:]
+        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in operands])
 
 class CondRegRegMemInstruction(Instruction):
     def __init__(self, name, aname, width, cond, reg1, reg2, mem_base, mem_idx):
@@ -316,12 +323,18 @@ def __init__(self, name, aname, width, cond, reg1, reg2, mem_base, mem_idx):
         self.mem = Address().generate(mem_base, mem_idx, width)
         self.cond = cond
         self.generate_operands(self.reg1, self.reg2, self.mem)
+        self.demote = True
     
     def cstr(self):
         return f'__ {self._name} (' + 'Assembler::Condition::' + self.cond + ', ' + ', '.join([reg.cstr() for reg in self.operands]) + ');'
     
     def astr(self):
-        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in self.operands])
+        operands = self.operands
+        if self.demote:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1]:
+                operands = operands[1:]
+        return f'{self._aname}' + cond_to_suffix[self.cond] + ' ' + ', '.join([reg.astr() for reg in operands])
 
 class MoveRegMemInstruction(Instruction):
     def __init__(self, name, aname, width, mem_width, reg, mem_base, mem_idx):
@@ -355,6 +368,15 @@ def __init__(self, name, aname, width, no_flag, reg1, reg2):
         self.reg1 = Register().generate(reg1, width)
         self.reg2 = Register().generate(reg2, width)
         self.generate_operands(self.reg1, self.reg2)
+        self.demote = True
+
+    def astr(self):
+        if self.demote and self._aname not in ['popcnt', 'lzcnt', 'tzcnt']:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1] and (not self.no_flag):
+                cl_str = (', cl' if self._name in shift_rot_ops and len(self.operands) == 2 else '')
+                return  f'{self._aname} ' + ', '.join([op.astr() for op in self.operands[1:]]) + cl_str
+        return super().astr()
 
 class RegMemNddInstruction(NFInstruction):
     def __init__(self, name, aname, width, no_flag, reg, mem_base, mem_idx):
@@ -386,6 +408,14 @@ def __init__(self, name, aname, width, no_flag, reg1, reg2, imm):
         self.reg2 = Register().generate(reg2, width)
         self.imm = Immediate().generate(imm)
         self.generate_operands(self.reg1, self.reg2, self.imm)
+        self.demote = True
+
+    def astr(self):
+        if self.demote and self._aname not in ['imul']:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1] and (not self.no_flag):
+                return  f'{self._aname} ' + ', '.join([op.astr() for op in self.operands[1:]])
+        return super().astr()
 
 class RegRegMemNddInstruction(NFInstruction):
     def __init__(self, name, aname, width, no_flag, reg1, reg2, mem_base, mem_idx):
@@ -394,6 +424,14 @@ def __init__(self, name, aname, width, no_flag, reg1, reg2, mem_base, mem_idx):
         self.reg2 = Register().generate(reg2, width)
         self.mem = Address().generate(mem_base, mem_idx, width)
         self.generate_operands(self.reg1, self.reg2, self.mem)
+        self.demote = True
+
+    def astr(self):
+        if self.demote:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1] and (not self.no_flag):
+                return  f'{self._aname} ' + ', '.join([op.astr() for op in self.operands[1:]])
+        return super().astr()
 
 class RegRegRegNddInstruction(NFInstruction):
     def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3):
@@ -402,9 +440,15 @@ def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3):
         self.reg2 = Register().generate(reg2, width)
         self.reg3 = Register().generate(reg3, width)
         self.generate_operands(self.reg1, self.reg2, self.reg3)
+        self.demote = True
 
     def astr(self):
-        return f'{{load}}' + super().astr()
+        hdr = f'{{load}}'
+        if self.demote:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1] and (not self.no_flag):
+                return  hdr + f'{self._aname} ' + ', '.join([op.astr() for op in self.operands[1:]])
+        return hdr + super().astr()
 
 class RegRegRegImmNddInstruction(NFInstruction):
     def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3, imm):
@@ -414,6 +458,15 @@ def __init__(self, name, aname, width, no_flag, reg1, reg2, reg3, imm):
         self.reg3 = Register().generate(reg3, width)
         self.imm = Immediate().generate(imm)
         self.generate_operands(self.reg1, self.reg2, self.reg3, self.imm)
+        self.demote = True
+
+    def astr(self):
+        if self.demote:
+            ops = [op.cstr() for op in self.operands]
+            if ops[0] == ops[1] and (not self.no_flag):
+                return (f'{self._aname} ' + ', '.join([op.astr() for op in self.operands[1:]]))
+        return super().astr()
+
 
 test_regs = [key for key in registers_mapping.keys() if key != 'rax']
 
@@ -499,36 +552,28 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [TwoRegInstruction, MoveRegRegInstruction, RegRegNddInstruction]:
-            if full_set:
-                for i in range(len(test_regs)):
-                    test_reg1 = test_regs[i]
-                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
+            demote_options = [False, True] if TEST_DEMOTION and RegOp in [RegRegNddInstruction]  else [False]
+            for demote in demote_options:
+                for i in range(len(test_regs) if full_set else 1):
+                    test_reg1 = test_regs[i] if full_set else random.choice(test_regs)
+                    test_reg2 = test_reg1 if demote \
+                                          else test_regs[(i + 1) % len(test_regs)] if full_set \
+                                          else 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)
                     print_instruction(instr, lp64_flag, print_lp64_flag)
-            else:
-                test_reg1 = random.choice(test_regs)
-                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)
-                print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [RegRegRegNddInstruction, CondRegRegRegInstruction]:
-            if full_set:
-                for i in range(len(test_regs)):
-                    test_reg1 = test_regs[i]
-                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
-                    test_reg3 = test_regs[(i + 2) % len(test_regs)]
+            for demote in [False, True] if TEST_DEMOTION else [False]:
+                for i in range(len(test_regs) if full_set else 1):
+                    test_reg1 = test_regs[i] if full_set else random.choice(test_regs)
+                    test_reg2 = test_reg1 if demote \
+                                          else test_regs[(i + 1) % len(test_regs)] if full_set \
+                                          else random.choice(test_regs)
+                    test_reg3 = test_regs[(i + 2) % len(test_regs)] if full_set else random.choice(test_regs)
                     lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
                     instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3)
                     print_instruction(instr, lp64_flag, print_lp64_flag)
-            else:
-                test_reg1 = random.choice(test_regs)
-                test_reg2 = random.choice(test_regs)
-                test_reg3 = random.choice(test_regs)
-                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
-                instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3)
-                print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [MemRegInstruction, RegMemInstruction, MoveRegMemInstruction, CmpxchgInstruction, CondRegMemInstruction, RegMemNddInstruction]:
             if full_set:
@@ -607,30 +652,28 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [RegRegImmInstruction, RegRegImmNddInstruction]:
-            if full_set:
+            demote_options = [False, True] if TEST_DEMOTION and RegOp in [RegRegImmNddInstruction] else [False]
+            for demote in demote_options:
                 imm_list = get_immediate_list(op_name, width)
-                for i in range(len(test_regs)):
-                    test_reg1 = test_regs[i]
-                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
+                if not full_set:
+                    imm_list = [random.choice(imm_list)]
+                for i in range(len(test_regs) if full_set else 1):
+                    test_reg1 = test_regs[i] if full_set else random.choice(test_regs)
+                    test_reg2 = test_reg1 if demote \
+                                          else test_regs[(i + 1) % len(test_regs)] if full_set \
+                                          else random.choice(test_regs)
                     lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2)
                     for imm in imm_list:
                         instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, imm=imm)
                         print_instruction(instr, lp64_flag, print_lp64_flag)
-            else:
-                imm = random.choice(get_immediate_list(op_name, width))
-                test_reg1 = random.choice(test_regs)
-                test_reg2 = random.choice(test_regs)
-                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)
 
-                # 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)
+                    # additional tests with rax as destination
+                    if RegOp in [RegRegImmNddInstruction] and not demote and not full_set:
+                        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:
@@ -656,46 +699,37 @@ def generate(RegOp, ops, print_lp64_flag=True, full_set=False):
                 print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [RegMemRegNddInstruction, RegRegMemNddInstruction, CondRegRegMemInstruction]:
-            if full_set:
-                for i in range(len(test_regs)):
-                    test_reg1 = test_regs[i]
-                    test_mem_base = test_regs[(i + 1) % len(test_regs)]
-                    test_mem_idx = test_regs[(i + 2) % len(test_regs)]
-                    test_reg2 = test_regs[(i + 3) % len(test_regs)]
+            demote_options = [False] if TEST_DEMOTION and RegOp not in [RegMemRegNddInstruction] else [False, True]
+            for demote in demote_options:
+                for i in range(len(test_regs) if full_set else 1):
+                    test_reg1 = test_regs[i] if full_set else random.choice(test_regs)
+                    test_mem_base = test_regs[(i + 1) % len(test_regs)] if full_set else random.choice(test_regs)
+                    test_mem_idx = test_regs[(i + 2) % len(test_regs)] if full_set \
+                                   else random.choice([reg for reg in test_regs if reg != 'rsp'])
+                    test_reg2 = test_reg1 if demote \
+                                          else test_regs[(i + 3) % len(test_regs)] if full_set \
+                                          else random.choice(test_regs)
                     if test_mem_idx == 'rsp':
                         continue
                     lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_mem_base, test_mem_idx, test_reg2)
                     instr = RegOp(*op, reg1=test_reg1, mem_base=test_mem_base, mem_idx=test_mem_idx, reg2=test_reg2)
                     print_instruction(instr, lp64_flag, print_lp64_flag)
-            else:
-                filtered_regs = [reg for reg in test_regs if reg != 'rsp']
-                test_reg1 = random.choice(test_regs)
-                test_mem_base = random.choice(test_regs)
-                test_mem_idx = random.choice(filtered_regs)
-                test_reg2 = random.choice(test_regs)
-                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_mem_base, test_mem_idx, test_reg2)
-                instr = RegOp(*op, reg1=test_reg1, mem_base=test_mem_base, mem_idx=test_mem_idx, reg2=test_reg2)
-                print_instruction(instr, lp64_flag, print_lp64_flag)
-        
+
         elif RegOp in [RegRegRegImmNddInstruction]:
-            if full_set:
+            for demote in [False, True] if TEST_DEMOTION else [False]:
                 imm_list = get_immediate_list(op_name, width)
-                for i in range(len(test_regs)):
-                    test_reg1 = test_regs[i]
-                    test_reg2 = test_regs[(i + 1) % len(test_regs)]
-                    test_reg3 = test_regs[(i + 2) % len(test_regs)]
+                if not full_set:
+                    imm_list = [random.choice(imm_list)]
+                for i in range(len(test_regs) if full_set else 1):
+                    test_reg1 = test_regs[i] if full_set else random.choice(test_regs)
+                    test_reg2 = test_reg1 if demote \
+                                          else test_regs[(i + 1) % len(test_regs)] if full_set \
+                                          else random.choice(test_regs)
+                    test_reg3 = test_regs[(i + 2) % len(test_regs)] if full_set else random.choice(test_regs)
                     lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
                     for imm in imm_list:
                         instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3, imm=imm)
                         print_instruction(instr, lp64_flag, print_lp64_flag)
-            else:
-                imm = random.choice(get_immediate_list(op_name, width))
-                test_reg1 = random.choice(test_regs)
-                test_reg2 = random.choice(test_regs)
-                test_reg3 = random.choice(test_regs)
-                lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2, test_reg3)
-                instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, reg3=test_reg3, imm=imm)
-                print_instruction(instr, lp64_flag, print_lp64_flag)
 
         elif RegOp in [Push2Instruction, Pop2Instruction]:
             if full_set:
@@ -936,7 +970,7 @@ def print_with_ifdef(ifdef_flags, items, item_formatter, width):
         ('edecl', 'dec', 32, False),
         ('edecl', 'dec', 32, True),
         ('eincl', 'inc', 32, False),
-        ('eincl', 'inc', 32, True), 
+        ('eincl', 'inc', 32, True),
         ('eshll', 'shl', 32, False),
         ('eshll', 'shl', 32, True),
         ('eshrl', 'shr', 32, False),
@@ -1357,8 +1391,8 @@ def print_with_ifdef(ifdef_flags, items, item_formatter, width):
         ('exorq', 'xor', 64, True),
         ('eorq_imm32', 'or', 64, False),
         ('eorq_imm32', 'or', 64, False),
-        ('esubq_imm32', 'sub', 64, False), 
-        ('esubq_imm32', 'sub', 64, True), 
+        ('esubq_imm32', 'sub', 64, False),
+        ('esubq_imm32', 'sub', 64, True),
     ],
     RegRegMemNddInstruction: [
         ('eaddq', 'add', 64, False),
@@ -1422,7 +1456,7 @@ def print_with_ifdef(ifdef_flags, items, item_formatter, width):
 
     for RegOp, ops in instruction_set.items():
         generate(RegOp, ops, True, full_set)
-        
+
     if lp64_flag:
         lp64_flag = False
         print("#endif // _LP64")

From 59dc849909c1edc892c94a27b0340fcf53db3a98 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Sun, 1 Jun 2025 01:04:54 +0000
Subject: [PATCH 758/901] 8358230: Incorrect location for the assert for blob
 != nullptr in CodeBlob::create

Reviewed-by: kvn
---
 src/hotspot/share/code/codeBlob.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index da0408d1270..185b6c06598 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -301,6 +301,8 @@ CodeBlob* CodeBlob::create(CodeBlob* archived_blob,
                                     name,
                                     archived_reloc_data,
                                     archived_oop_maps);
+      assert(blob != nullptr, "sanity check");
+
 #ifndef PRODUCT
       blob->use_remarks(archived_asm_remarks);
       archived_asm_remarks.clear();
@@ -308,7 +310,6 @@ CodeBlob* CodeBlob::create(CodeBlob* archived_blob,
       archived_dbg_strings.clear();
 #endif // PRODUCT
 
-      assert(blob != nullptr, "sanity check");
       // Flush the code block
       ICache::invalidate_range(blob->code_begin(), blob->code_size());
       CodeCache::commit(blob); // Count adapters

From 470ffeedda45b6f75ce0c794a965428b7859be6f Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Sun, 1 Jun 2025 03:50:39 +0000
Subject: [PATCH 759/901] 8230016: re-visit test
 sun/security/pkcs11/Serialize/SerializeProvider.java

Reviewed-by: rhalade
---
 .../sun/security/pkcs11/Serialize/SerializeProvider.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java b/test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java
index 495da8e6f38..2b268fe8fea 100644
--- a/test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java
+++ b/test/jdk/sun/security/pkcs11/Serialize/SerializeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, 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,9 +41,9 @@
 public class SerializeProvider extends PKCS11Test {
 
     public void main(Provider p) throws Exception {
+
         if (Security.getProvider(p.getName()) != p) {
-            System.out.println("Provider not installed in Security, skipping");
-            return;
+            Security.addProvider(p);
         }
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -57,7 +57,7 @@ public void main(Provider p) throws Exception {
         InputStream in = new ByteArrayInputStream(data);
         ObjectInputStream oin = new ObjectInputStream(in);
 
-        Provider p2 = (Provider)oin.readObject();
+        Provider p2 = (Provider) oin.readObject();
 
         System.out.println("Reconstituted: " + p2);
 

From e3eb089d47d62ae6feeba3dc6b3752a025e27bed Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Sun, 1 Jun 2025 03:57:28 +0000
Subject: [PATCH 760/901] 8357175: Failure to generate or load AOT code should
 be handled gracefully

Reviewed-by: iveresov, asmehra
---
 src/hotspot/share/code/aotCodeCache.cpp | 158 ++++++++++++------------
 src/hotspot/share/code/aotCodeCache.hpp |  15 +--
 2 files changed, 84 insertions(+), 89 deletions(-)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 4db16fdbc70..674d71d1bfc 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -125,6 +125,8 @@ uint AOTCodeCache::max_aot_code_size() {
   return _max_aot_code_size;
 }
 
+// This method is called during universe_init()
+// and does final AOT state and flags settings.
 void AOTCodeCache::initialize() {
 #if defined(ZERO) || !(defined(AMD64) || defined(AARCH64))
   log_info(aot, codecache, init)("AOT Code Cache is not supported on this platform.");
@@ -197,31 +199,40 @@ void AOTCodeCache::initialize() {
 #endif // defined(AMD64) || defined(AARCH64)
 }
 
+static AOTCodeCache*  opened_cache = nullptr; // Use this until we verify the cache
+AOTCodeCache* AOTCodeCache::_cache = nullptr;
+
+// This method is called after universe_init()
+// when all GC settings are finalized.
 void AOTCodeCache::init2() {
-  if (!is_on()) {
+  if (opened_cache == nullptr) {
     return;
   }
-  if (!verify_vm_config()) {
-    close();
+  if (!opened_cache->verify_config()) {
+    delete opened_cache;
+    opened_cache = nullptr;
     report_load_failure();
+    return;
   }
 
   // initialize the table of external routines so we can save
   // generated code blobs that reference them
-  init_extrs_table();
-  init_early_stubs_table();
-}
+  AOTCodeAddressTable* table = opened_cache->_table;
+  assert(table != nullptr, "should be initialized already");
+  table->init_extrs();
+  table->init_early_stubs();
 
-AOTCodeCache* AOTCodeCache::_cache = nullptr;
+  // Now cache and address table are ready for AOT code generation
+  _cache = opened_cache;
+}
 
 bool AOTCodeCache::open_cache(bool is_dumping, bool is_using) {
-  AOTCodeCache* cache = new AOTCodeCache(is_dumping, is_using);
-  if (cache->failed()) {
-    delete cache;
-    _cache = nullptr;
+  opened_cache = new AOTCodeCache(is_dumping, is_using);
+  if (opened_cache->failed()) {
+    delete opened_cache;
+    opened_cache = nullptr;
     return false;
   }
-  _cache = cache;
   return true;
 }
 
@@ -229,6 +240,7 @@ void AOTCodeCache::close() {
   if (is_on()) {
     delete _cache; // Free memory
     _cache = nullptr;
+    opened_cache = nullptr;
   }
 }
 
@@ -276,7 +288,7 @@ AOTCodeCache::AOTCodeCache(bool is_dumping, bool is_using) :
     log_debug(aot, codecache, init)("Mapped %u bytes at address " INTPTR_FORMAT " at AOT Code Cache", _load_size, p2i(_load_buffer));
 
     _load_header = (Header*)addr(0);
-    if (!_load_header->verify_config(_load_size)) {
+    if (!_load_header->verify(_load_size)) {
       set_failed();
       return;
     }
@@ -300,20 +312,6 @@ AOTCodeCache::AOTCodeCache(bool is_dumping, bool is_using) :
   _table = new AOTCodeAddressTable();
 }
 
-void AOTCodeCache::init_extrs_table() {
-  AOTCodeAddressTable* table = addr_table();
-  if (table != nullptr) {
-    table->init_extrs();
-  }
-}
-
-void AOTCodeCache::init_early_stubs_table() {
-  AOTCodeAddressTable* table = addr_table();
-  if (table != nullptr) {
-    table->init_early_stubs();
-  }
-}
-
 void AOTCodeCache::init_shared_blobs_table() {
   AOTCodeAddressTable* table = addr_table();
   if (table != nullptr) {
@@ -381,11 +379,11 @@ void AOTCodeCache::Config::record() {
   _compressedOopBase     = CompressedOops::base();
   _compressedKlassShift  = CompressedKlassPointers::shift();
   _contendedPaddingWidth = ContendedPaddingWidth;
-  _objectAlignment       = ObjectAlignmentInBytes;
   _gc                    = (uint)Universe::heap()->kind();
 }
 
 bool AOTCodeCache::Config::verify() const {
+  // First checks affect all cached AOT code
 #ifdef ASSERT
   if ((_flags & debugVM) == 0) {
     log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created by product VM, it can't be used by debug VM");
@@ -404,47 +402,24 @@ bool AOTCodeCache::Config::verify() const {
     return false;
   }
 
-  if (((_flags & compressedOops) != 0) != UseCompressedOops) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedOops = %s", UseCompressedOops ? "false" : "true");
-    return false;
-  }
   if (((_flags & compressedClassPointers) != 0) != UseCompressedClassPointers) {
     log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedClassPointers = %s", UseCompressedClassPointers ? "false" : "true");
     return false;
   }
-
-  if (((_flags & systemClassAssertions) != 0) != JavaAssertions::systemClassDefault()) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with JavaAssertions::systemClassDefault() = %s", JavaAssertions::systemClassDefault() ? "disabled" : "enabled");
-    return false;
-  }
-  if (((_flags & userClassAssertions) != 0) != JavaAssertions::userClassDefault()) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with JavaAssertions::userClassDefault() = %s", JavaAssertions::userClassDefault() ? "disabled" : "enabled");
+  if (_compressedKlassShift != (uint)CompressedKlassPointers::shift()) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedKlassPointers::shift() = %d vs current %d", _compressedKlassShift, CompressedKlassPointers::shift());
     return false;
   }
 
-  if (((_flags & enableContendedPadding) != 0) != EnableContended) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with EnableContended = %s", EnableContended ? "false" : "true");
-    return false;
-  }
-  if (((_flags & restrictContendedPadding) != 0) != RestrictContended) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with RestrictContended = %s", RestrictContended ? "false" : "true");
-    return false;
+  // The following checks do not affect AOT adapters caching
+
+  if (((_flags & compressedOops) != 0) != UseCompressedOops) {
+    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedOops = %s", UseCompressedOops ? "false" : "true");
+    AOTStubCaching = false;
   }
   if (_compressedOopShift != (uint)CompressedOops::shift()) {
     log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with different CompressedOops::shift(): %d vs current %d", _compressedOopShift, CompressedOops::shift());
-    return false;
-  }
-  if (_compressedKlassShift != (uint)CompressedKlassPointers::shift()) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedKlassPointers::shift() = %d vs current %d", _compressedKlassShift, CompressedKlassPointers::shift());
-    return false;
-  }
-  if (_contendedPaddingWidth != (uint)ContendedPaddingWidth) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with ContendedPaddingWidth = %d vs current %d", _contendedPaddingWidth, ContendedPaddingWidth);
-    return false;
-  }
-  if (_objectAlignment != (uint)ObjectAlignmentInBytes) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with ObjectAlignmentInBytes = %d vs current %d", _objectAlignment, ObjectAlignmentInBytes);
-    return false;
+    AOTStubCaching = false;
   }
 
   // This should be the last check as it only disables AOTStubCaching
@@ -456,7 +431,7 @@ bool AOTCodeCache::Config::verify() const {
   return true;
 }
 
-bool AOTCodeCache::Header::verify_config(uint load_size) const {
+bool AOTCodeCache::Header::verify(uint load_size) const {
   if (_version != AOT_CODE_VERSION) {
     log_debug(aot, codecache, init)("AOT Code Cache disabled: different AOT Code version %d vs %d recorded in AOT Code header", AOT_CODE_VERSION, _version);
     return false;
@@ -857,6 +832,10 @@ bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind
 #endif /* PRODUCT */
 
   if (!cache->write_relocations(blob)) {
+    if (!cache->failed()) {
+      // We may miss an address in AOT table - skip this code blob.
+      cache->set_write_position(entry_position);
+    }
     return false;
   }
 
@@ -985,6 +964,10 @@ CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_co
 
 // ------------ process code and data --------------
 
+// Can't use -1. It is valid value for jump to iteself destination
+// used by static call stub: see NativeJump::jump_destination().
+#define BAD_ADDRESS_ID -2
+
 bool AOTCodeCache::write_relocations(CodeBlob& code_blob) {
   GrowableArray<uint> reloc_data;
   RelocIterator iter(&code_blob);
@@ -1001,16 +984,24 @@ bool AOTCodeCache::write_relocations(CodeBlob& code_blob) {
         if (dest == r->addr()) { // possible call via trampoline on Aarch64
           dest = (address)-1;    // do nothing in this case when loading this relocation
         }
-        reloc_data.at_put(idx, _table->id_for_address(dest, iter, &code_blob));
+        int id = _table->id_for_address(dest, iter, &code_blob);
+        if (id == BAD_ADDRESS_ID) {
+          return false;
+        }
+        reloc_data.at_put(idx, id);
         break;
       }
       case relocInfo::runtime_call_w_cp_type:
-        fatal("runtime_call_w_cp_type unimplemented");
-        break;
+        log_debug(aot, codecache, reloc)("runtime_call_w_cp_type relocation is not implemented");
+        return false;
       case relocInfo::external_word_type: {
         // Record offset of runtime target
         address target = ((external_word_Relocation*)iter.reloc())->target();
-        reloc_data.at_put(idx, _table->id_for_address(target, iter, &code_blob));
+        int id = _table->id_for_address(target, iter, &code_blob);
+        if (id == BAD_ADDRESS_ID) {
+          return false;
+        }
+        reloc_data.at_put(idx, id);
         break;
       }
       case relocInfo::internal_word_type:
@@ -1020,7 +1011,8 @@ bool AOTCodeCache::write_relocations(CodeBlob& code_blob) {
       case relocInfo::post_call_nop_type:
         break;
       default:
-        fatal("relocation %d unimplemented", (int)iter.type());
+        log_debug(aot, codecache, reloc)("relocation %d unimplemented", (int)iter.type());
+        return false;
         break;
     }
     if (log.is_enabled()) {
@@ -1069,7 +1061,8 @@ void AOTCodeReader::fix_relocations(CodeBlob* code_blob) {
         break;
       }
       case relocInfo::runtime_call_w_cp_type:
-        fatal("runtime_call_w_cp_type unimplemented");
+        // this relocation should not be in cache (see write_relocations)
+        assert(false, "runtime_call_w_cp_type relocation is not implemented");
         break;
       case relocInfo::external_word_type: {
         address target = _cache->address_for_id(reloc_data[j]);
@@ -1095,7 +1088,7 @@ void AOTCodeReader::fix_relocations(CodeBlob* code_blob) {
       case relocInfo::post_call_nop_type:
         break;
       default:
-        fatal("relocation %d unimplemented", (int)iter.type());
+        assert(false,"relocation %d unimplemented", (int)iter.type());
         break;
     }
     if (log.is_enabled()) {
@@ -1397,9 +1390,13 @@ void AOTCodeAddressTable::init_shared_blobs() {
   if (_complete || initializing_shared_blobs) return; // Done already
   initializing_shared_blobs = true;
   address* blobs_addr = NEW_C_HEAP_ARRAY(address, _blobs_max, mtCode);
+
+  // Divide _shared_blobs_addr array to chunks because they could be initialized in parrallel
   _shared_blobs_addr = blobs_addr;
   _C1_blobs_addr = _shared_blobs_addr + _shared_blobs_max;
-  _shared_blobs_length = _C1_blobs_length = 0;
+
+  _shared_blobs_length = 0;
+  _C1_blobs_length = 0;
 
   // clear the address table
   memset(blobs_addr, 0, sizeof(address)* _blobs_max);
@@ -1556,7 +1553,7 @@ const char* AOTCodeAddressTable::add_C_string(const char* str) {
       }
       return dup;
     } else {
-      fatal("Number of C strings >= MAX_STR_COUNT");
+      assert(false, "Number of C strings >= MAX_STR_COUNT");
     }
   }
   return str;
@@ -1595,13 +1592,11 @@ static int search_address(address addr, address* table, uint length) {
       return i;
     }
   }
-  return -1;
+  return BAD_ADDRESS_ID;
 }
 
 address AOTCodeAddressTable::address_for_id(int idx) {
-  if (!_extrs_complete) {
-    fatal("AOT Code Cache VM runtime addresses table is not complete");
-  }
+  assert(_extrs_complete, "AOT Code Cache VM runtime addresses table is not complete");
   if (idx == -1) {
     return (address)-1;
   }
@@ -1612,6 +1607,7 @@ address AOTCodeAddressTable::address_for_id(int idx) {
   }
   if (idx < 0) {
     fatal("Incorrect id %d for AOT Code Cache addresses table", id);
+    return nullptr;
   }
   // no need to compare unsigned id against 0
   if (/* id >= _extrs_base && */ id < _extrs_length) {
@@ -1634,9 +1630,7 @@ address AOTCodeAddressTable::address_for_id(int idx) {
 }
 
 int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeBlob* code_blob) {
-  if (!_extrs_complete) {
-    fatal("AOT Code Cache VM runtime addresses table is not complete");
-  }
+  assert(_extrs_complete, "AOT Code Cache VM runtime addresses table is not complete");
   int id = -1;
   if (addr == (address)-1) { // Static call stub has jump to itself
     return id;
@@ -1655,7 +1649,7 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
         desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
       }
       const char* sub_name = (desc != nullptr) ? desc->name() : "<unknown>";
-      fatal("Address " INTPTR_FORMAT " for Stub:%s is missing in AOT Code Cache addresses table", p2i(addr), sub_name);
+      assert(false, "Address " INTPTR_FORMAT " for Stub:%s is missing in AOT Code Cache addresses table", p2i(addr), sub_name);
     } else {
       return id + _stubs_base;
     }
@@ -1666,7 +1660,7 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
       int id_base = _shared_blobs_base;
       id = search_address(addr, _shared_blobs_addr, _blobs_max);
       if (id < 0) {
-        fatal("Address " INTPTR_FORMAT " for Blob:%s is missing in AOT Code Cache addresses table", p2i(addr), cb->name());
+        assert(false, "Address " INTPTR_FORMAT " for Blob:%s is missing in AOT Code Cache addresses table", p2i(addr), cb->name());
       } else {
         return id_base + id;
       }
@@ -1687,16 +1681,20 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
             assert(dist > (uint)(_all_max + MAX_STR_COUNT), "change encoding of distance");
             return dist;
           }
+#ifdef ASSERT
           reloc.print_current_on(tty);
           code_blob->print_on(tty);
           code_blob->print_code_on(tty);
-          fatal("Address " INTPTR_FORMAT " for runtime target '%s+%d' is missing in AOT Code Cache addresses table", p2i(addr), func_name, offset);
+          assert(false, "Address " INTPTR_FORMAT " for runtime target '%s+%d' is missing in AOT Code Cache addresses table", p2i(addr), func_name, offset);
+#endif
         } else {
+#ifdef ASSERT
           reloc.print_current_on(tty);
           code_blob->print_on(tty);
           code_blob->print_code_on(tty);
           os::find(addr, tty);
-          fatal("Address " INTPTR_FORMAT " for <unknown>/('%s') is missing in AOT Code Cache addresses table", p2i(addr), (const char*)addr);
+          assert(false, "Address " INTPTR_FORMAT " for <unknown>/('%s') is missing in AOT Code Cache addresses table", p2i(addr), (const char*)addr);
+#endif
         }
       } else {
         return _extrs_base + id;
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
index 0956a37d3b9..e7b056ac974 100644
--- a/src/hotspot/share/code/aotCodeCache.hpp
+++ b/src/hotspot/share/code/aotCodeCache.hpp
@@ -169,7 +169,6 @@ class AOTCodeCache : public CHeapObj<mtCode> {
     uint _compressedOopShift;
     uint _compressedKlassShift;
     uint _contendedPaddingWidth;
-    uint _objectAlignment;
     uint _gc;
     enum Flags {
       none                     = 0,
@@ -206,7 +205,7 @@ class AOTCodeCache : public CHeapObj<mtCode> {
     uint   _C2_blobs_count;
     Config _config;
 
-public:
+  public:
     void init(uint cache_size,
               uint strings_count,  uint strings_offset,
               uint entries_count,  uint entries_offset,
@@ -236,8 +235,8 @@ class AOTCodeCache : public CHeapObj<mtCode> {
     uint C1_blobs_count() const { return _C1_blobs_count; }
     uint C2_blobs_count() const { return _C2_blobs_count; }
 
-    bool verify_config(uint load_size)  const;
-    bool verify_vm_config() const { // Called after Universe initialized
+    bool verify(uint load_size)  const;
+    bool verify_config() const { // Called after Universe initialized
       return _config.verify();
     }
   };
@@ -298,8 +297,6 @@ class AOTCodeCache : public CHeapObj<mtCode> {
   void load_strings();
   int store_strings();
 
-  static void init_extrs_table() NOT_CDS_RETURN;
-  static void init_early_stubs_table() NOT_CDS_RETURN;
   static void init_shared_blobs_table() NOT_CDS_RETURN;
   static void init_early_c1_table() NOT_CDS_RETURN;
 
@@ -352,9 +349,9 @@ class AOTCodeCache : public CHeapObj<mtCode> {
   static AOTCodeCache*  _cache;
 
   static bool open_cache(bool is_dumping, bool is_using);
-  static bool verify_vm_config() {
-    if (is_on_for_use()) {
-      return _cache->_load_header->verify_vm_config();
+  bool verify_config() {
+    if (for_use()) {
+      return _load_header->verify_config();
     }
     return true;
   }

From ac9af69eee9636ff98c2b60224964e518aebb421 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Sun, 1 Jun 2025 06:17:50 +0000
Subject: [PATCH 761/901] 8357637: Native resources cached in thread locals not
 released when FJP common pool threads clears thread locals

Reviewed-by: vklang
---
 .../java/lang/InheritableThreadLocal.java     |  6 +--
 .../share/classes/java/lang/System.java       |  4 --
 .../share/classes/java/lang/Thread.java       | 35 ++++++++++--
 .../share/classes/java/lang/ThreadLocal.java  | 36 +++++--------
 .../jdk/internal/access/JavaLangAccess.java   |  6 ---
 .../jdk/internal/misc/CarrierThreadLocal.java |  6 +--
 .../internal/misc/TerminatingThreadLocal.java | 23 ++++----
 .../classes/sun/nio/ch/IOVecWrapper.java      |  3 +-
 .../TestTerminatingThreadLocal.java           | 53 ++++++++++++++++++-
 9 files changed, 112 insertions(+), 60 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/InheritableThreadLocal.java b/src/java.base/share/classes/java/lang/InheritableThreadLocal.java
index 10543314ead..ebc95e58418 100644
--- a/src/java.base/share/classes/java/lang/InheritableThreadLocal.java
+++ b/src/java.base/share/classes/java/lang/InheritableThreadLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, 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
@@ -80,7 +80,7 @@ protected T childValue(T parentValue) {
      */
     @Override
     ThreadLocalMap getMap(Thread t) {
-        return t.inheritableThreadLocals;
+        return t.inheritableThreadLocals();
     }
 
     /**
@@ -91,6 +91,6 @@ ThreadLocalMap getMap(Thread t) {
      */
     @Override
     void createMap(Thread t, T firstValue) {
-        t.inheritableThreadLocals = new ThreadLocalMap(this, firstValue);
+        t.setInheritableThreadLocals(new ThreadLocalMap(this, firstValue));
     }
 }
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 882b5f6945f..bcdbc39e665 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2254,10 +2254,6 @@ public void removeCarrierThreadLocal(CarrierThreadLocal<?> local) {
                 ((ThreadLocal<?>)local).removeCarrierThreadLocal();
             }
 
-            public boolean isCarrierThreadLocalPresent(CarrierThreadLocal<?> local) {
-                return ((ThreadLocal<?>)local).isCarrierThreadLocalPresent();
-            }
-
             public Object[] scopedValueCache() {
                 return Thread.scopedValueCache();
             }
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 9daae01676f..2fc20a94f1d 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -235,7 +235,7 @@ public class Thread implements Runnable {
     private volatile ClassLoader contextClassLoader;
 
     // Additional fields for platform threads.
-    // All fields, except task, are accessed directly by the VM.
+    // All fields, except task and terminatingThreadLocals, are accessed directly by the VM.
     private static class FieldHolder {
         final ThreadGroup group;
         final Runnable task;
@@ -244,6 +244,9 @@ private static class FieldHolder {
         volatile boolean daemon;
         volatile int threadStatus;
 
+        // This map is maintained by the ThreadLocal class
+        ThreadLocal.ThreadLocalMap terminatingThreadLocals;
+
         FieldHolder(ThreadGroup group,
                     Runnable task,
                     long stackSize,
@@ -259,17 +262,41 @@ private static class FieldHolder {
     }
     private final FieldHolder holder;
 
+    ThreadLocal.ThreadLocalMap terminatingThreadLocals() {
+        return holder.terminatingThreadLocals;
+    }
+
+    void setTerminatingThreadLocals(ThreadLocal.ThreadLocalMap map) {
+        holder.terminatingThreadLocals = map;
+    }
+
     /*
      * ThreadLocal values pertaining to this thread. This map is maintained
      * by the ThreadLocal class.
      */
-    ThreadLocal.ThreadLocalMap threadLocals;
+    private ThreadLocal.ThreadLocalMap threadLocals;
+
+    ThreadLocal.ThreadLocalMap threadLocals() {
+        return threadLocals;
+    }
+
+    void setThreadLocals(ThreadLocal.ThreadLocalMap map) {
+        threadLocals = map;
+    }
 
     /*
      * InheritableThreadLocal values pertaining to this thread. This map is
      * maintained by the InheritableThreadLocal class.
      */
-    ThreadLocal.ThreadLocalMap inheritableThreadLocals;
+    private ThreadLocal.ThreadLocalMap inheritableThreadLocals;
+
+    ThreadLocal.ThreadLocalMap inheritableThreadLocals() {
+        return inheritableThreadLocals;
+    }
+
+    void setInheritableThreadLocals(ThreadLocal.ThreadLocalMap map) {
+        inheritableThreadLocals = map;
+    }
 
     /*
      * Scoped value bindings are maintained by the ScopedValue class.
@@ -1492,7 +1519,7 @@ private void exit() {
         }
 
         try {
-            if (threadLocals != null && TerminatingThreadLocal.REGISTRY.isPresent()) {
+            if (terminatingThreadLocals() != null) {
                 TerminatingThreadLocal.threadTerminated();
             }
         } finally {
diff --git a/src/java.base/share/classes/java/lang/ThreadLocal.java b/src/java.base/share/classes/java/lang/ThreadLocal.java
index fae322d2b73..2fb427d8611 100644
--- a/src/java.base/share/classes/java/lang/ThreadLocal.java
+++ b/src/java.base/share/classes/java/lang/ThreadLocal.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
@@ -193,27 +193,6 @@ private T get(Thread t) {
         return setInitialValue(t);
     }
 
-    /**
-     * Returns {@code true} if there is a value in the current carrier thread's copy of
-     * this thread-local variable, even if that values is {@code null}.
-     *
-     * @return {@code true} if current carrier thread has associated value in this
-     *         thread-local variable; {@code false} if not
-     */
-    boolean isCarrierThreadLocalPresent() {
-        assert this instanceof CarrierThreadLocal<T>;
-        return isPresent(Thread.currentCarrierThread());
-    }
-
-    private boolean isPresent(Thread t) {
-        ThreadLocalMap map = getMap(t);
-        if (map != null) {
-            return map.getEntry(this) != null;
-        } else {
-            return false;
-        }
-    }
-
     /**
      * Variant of set() to establish initialValue. Used instead
      * of set() in case user has overridden the set() method.
@@ -302,7 +281,11 @@ private void remove(Thread t) {
      * @return the map
      */
     ThreadLocalMap getMap(Thread t) {
-        return t.threadLocals;
+        if (this instanceof TerminatingThreadLocal<T>) {
+            return t.terminatingThreadLocals();
+        } else {
+            return t.threadLocals();
+        }
     }
 
     /**
@@ -313,7 +296,12 @@ ThreadLocalMap getMap(Thread t) {
      * @param firstValue value for the initial entry of the map
      */
     void createMap(Thread t, T firstValue) {
-        t.threadLocals = new ThreadLocalMap(this, firstValue);
+        var map = new ThreadLocalMap(this, firstValue);
+        if (this instanceof TerminatingThreadLocal<T>) {
+            t.setTerminatingThreadLocals(map);
+        } else {
+            t.setThreadLocals(map);
+        }
     }
 
     /**
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 1f60f85464b..5109e7b2a5b 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -546,12 +546,6 @@ public interface JavaLangAccess {
      */
     void removeCarrierThreadLocal(CarrierThreadLocal<?> local);
 
-    /**
-     * Returns {@code true} if there is a value in the current carrier thread's copy of
-     * thread-local, even if that values is {@code null}.
-     */
-    boolean isCarrierThreadLocalPresent(CarrierThreadLocal<?> local);
-
     /**
      * Returns the current thread's scoped values cache
      */
diff --git a/src/java.base/share/classes/jdk/internal/misc/CarrierThreadLocal.java b/src/java.base/share/classes/jdk/internal/misc/CarrierThreadLocal.java
index b14ecaffa2e..9396521cad5 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CarrierThreadLocal.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CarrierThreadLocal.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
@@ -49,9 +49,5 @@ public void remove() {
         JLA.removeCarrierThreadLocal(this);
     }
 
-    public boolean isPresent() {
-        return JLA.isCarrierThreadLocalPresent(this);
-    }
-
     private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/TerminatingThreadLocal.java b/src/java.base/share/classes/jdk/internal/misc/TerminatingThreadLocal.java
index eeb1a77e226..beee5b78d1a 100644
--- a/src/java.base/share/classes/jdk/internal/misc/TerminatingThreadLocal.java
+++ b/src/java.base/share/classes/jdk/internal/misc/TerminatingThreadLocal.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
@@ -29,10 +29,9 @@
 import java.util.IdentityHashMap;
 
 /**
- * A per-carrier-thread-local variable that is notified when a thread terminates and
- * it has been initialized in the terminating carrier thread or a virtual thread
- * that had the terminating carrier thread as its carrier thread (even if it was
- * initialized with a null value).
+ * A platform thread-local variable that is notified when a platform thread terminates,
+ * and it has been initialized in the terminating thread (or a mounted virtual thread in
+ * the case of a carrier thread), and even if it was initialized with a null value.
  */
 public class TerminatingThreadLocal<T> extends CarrierThreadLocal<T> {
 
@@ -44,8 +43,8 @@ public void set(T value) {
 
     @Override
     public void remove() {
-        super.remove();
         unregister(this);
+        super.remove();
     }
 
     /**
@@ -80,7 +79,9 @@ public static void threadTerminated() {
      * @param tl the ThreadLocal to register
      */
     public static void register(TerminatingThreadLocal<?> tl) {
-        REGISTRY.get().add(tl);
+        if (tl != REGISTRY) {
+            REGISTRY.get().add(tl);
+        }
     }
 
     /**
@@ -93,11 +94,11 @@ private static void unregister(TerminatingThreadLocal<?> tl) {
     }
 
     /**
-     * a per-carrier-thread registry of TerminatingThreadLocal(s) that have been registered
-     * but later not unregistered in a particular carrier-thread.
+     * A per-platform-thread registry of TerminatingThreadLocal(s). The registry is
+     * itself a TerminatingThreadLocal to keep it reachable until the thread terminates.
      */
-    public static final CarrierThreadLocal<Collection<TerminatingThreadLocal<?>>> REGISTRY =
-        new CarrierThreadLocal<>() {
+    public static final TerminatingThreadLocal<Collection<TerminatingThreadLocal<?>>> REGISTRY =
+        new TerminatingThreadLocal<>() {
             @Override
             protected Collection<TerminatingThreadLocal<?>> initialValue() {
                 return Collections.newSetFromMap(new IdentityHashMap<>(4));
diff --git a/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java b/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java
index 1c78e45a2d8..6d551462ce8 100644
--- a/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.java
+++ b/src/java.base/share/classes/sun/nio/ch/IOVecWrapper.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
@@ -79,6 +79,7 @@ protected IOVecWrapper[] initialValue() {
         protected void threadTerminated(IOVecWrapper[] cache) {
             IOVecWrapper wrapper = cache[0];
             if (wrapper != null) {
+                cache[0] = null;
                 wrapper.vecArray.free();
             }
         }
diff --git a/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java b/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
index 00bddec6b56..cf46c5b1d22 100644
--- a/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java
+++ b/test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.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
@@ -24,6 +24,7 @@
 import jdk.internal.misc.TerminatingThreadLocal;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
@@ -31,6 +32,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -41,7 +43,7 @@
 
 /*
  * @test
- * @bug 8202788 8291897
+ * @bug 8202788 8291897 8357637
  * @summary TerminatingThreadLocal unit test
  * @modules java.base/java.lang:+open java.base/jdk.internal.misc
  * @requires vm.continuations
@@ -154,6 +156,53 @@ protected T initialValue() {
         assertEquals(terminatedValues, expectedTerminatedValues);
     }
 
+    /**
+     * Test TerminatingThreadLocal when thread locals are "cleared" by null'ing the
+     * threadLocal field of the current Thread.
+     */
+    @Test
+    public void testClearingThreadLocals() throws Throwable {
+        var terminatedValues = new CopyOnWriteArrayList<Object>();
+
+        var tl = new ThreadLocal<String>();
+        var ttl = new TerminatingThreadLocal<String>() {
+            @Override
+            protected void threadTerminated(String value) {
+                terminatedValues.add(value);
+            }
+        };
+        var throwableRef = new AtomicReference<Throwable>();
+
+        String tlValue = "abc";
+        String ttlValue = "xyz";
+
+        Thread thread = Thread.ofPlatform().start(() -> {
+            try {
+                tl.set(tlValue);
+                ttl.set(ttlValue);
+
+                assertEquals(tl.get(), tlValue);
+                assertEquals(ttl.get(), ttlValue);
+
+                // set Thread.threadLocals to null
+                Field f = Thread.class.getDeclaredField("threadLocals");
+                f.setAccessible(true);
+                f.set(Thread.currentThread(), null);
+
+                assertNull(tl.get());
+                assertEquals(ttl.get(), ttlValue);
+            } catch (Throwable t) {
+                throwableRef.set(t);
+            }
+        });
+        thread.join();
+        if (throwableRef.get() instanceof Throwable t) {
+            throw t;
+        }
+
+        assertEquals(terminatedValues, List.of(ttlValue));
+    }
+
     /**
      * Returns a builder to create virtual threads that use the given scheduler.
      */

From c1b5f62a8c30038d3b1a14d184535ba0642d51c9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Sun, 1 Jun 2025 09:06:04 +0000
Subject: [PATCH 762/901] 8358136: Make
 langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
 intermittent

Reviewed-by: jpai, nbenalla, syan
---
 .../jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
index a6a04c80834..9a80ca4d089 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8190312
+ * @key intermittent
  * @summary test redirected URLs for -link
  * @library /tools/lib ../../lib /test/lib
  * @modules jdk.compiler/com.sun.tools.javac.api

From 85e36d79246913abb8b85c2be719670655d619ab Mon Sep 17 00:00:00 2001
From: Igor Veresov <iveresov@openjdk.org>
Date: Sun, 1 Jun 2025 21:21:27 +0000
Subject: [PATCH 763/901] 8358236: [AOT] Graal crashes when trying to use
 persisted MDOs

Reviewed-by: kvn
---
 src/hotspot/share/oops/methodData.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index 0f8b8a8275a..deb67e2e90b 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -1996,6 +1996,9 @@ void MethodData::release_C_heap_structures() {
 #if INCLUDE_CDS
 void MethodData::remove_unshareable_info() {
   _extra_data_lock = nullptr;
+#if INCLUDE_JVMCI
+  _failed_speculations = nullptr;
+#endif
 }
 
 void MethodData::restore_unshareable_info(TRAPS) {

From 3193a28c532d8536d621c99bb661304c49ca13e1 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Sun, 1 Jun 2025 23:36:25 +0000
Subject: [PATCH 764/901] 8358259: ProblemList
 compiler/startup/StartupOutput.java on Windows

Reviewed-by: darcy
---
 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 1f10d38240b..62fdbdbaa06 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -79,6 +79,8 @@ compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
 
 compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all
 
+compiler/startup/StartupOutput.java 8358129 windows-all
+
 #############################################################################
 
 # :hotspot_gc

From 90d6ad015714b81064dd16d0e64f1b774e68d4f3 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 2 Jun 2025 02:06:06 +0000
Subject: [PATCH 765/901] 8356594: JSplitPane loses divider location when
 reopened via JOptionPane.createDialog()

Reviewed-by: kizune
---
 .../share/classes/javax/swing/JSplitPane.java |  35 ++--
 .../TestSplitPaneResetDividerLoc.java         | 185 ++++++++++++++++++
 2 files changed, 204 insertions(+), 16 deletions(-)
 create mode 100644 test/jdk/javax/swing/JSplitPane/TestSplitPaneResetDividerLoc.java

diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index 90f3efb3e69..f21b2b3339a 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.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
@@ -369,22 +369,25 @@ public JSplitPane(int newOrientation,
      */
     @Override
     public void setComponentOrientation(ComponentOrientation orientation) {
+        ComponentOrientation curOrn = this.getComponentOrientation();
         super.setComponentOrientation(orientation);
-        Component leftComponent = this.getLeftComponent();
-        Component rightComponent = this.getRightComponent();
-        if (!this.getComponentOrientation().isLeftToRight()) {
-            if (rightComponent != null) {
-                setLeftComponent(rightComponent);
-            }
-            if (leftComponent != null) {
-                setRightComponent(leftComponent);
-            }
-        } else {
-            if (leftComponent != null) {
-                setLeftComponent(leftComponent);
-            }
-            if (rightComponent != null) {
-                setRightComponent(rightComponent);
+        if (!orientation.equals(curOrn)) {
+            Component leftComponent = this.getLeftComponent();
+            Component rightComponent = this.getRightComponent();
+            if (!this.getComponentOrientation().isLeftToRight()) {
+                if (rightComponent != null) {
+                    setLeftComponent(rightComponent);
+                }
+                if (leftComponent != null) {
+                    setRightComponent(leftComponent);
+                }
+            } else {
+                if (leftComponent != null) {
+                    setLeftComponent(leftComponent);
+                }
+                if (rightComponent != null) {
+                    setRightComponent(rightComponent);
+                }
             }
         }
     }
diff --git a/test/jdk/javax/swing/JSplitPane/TestSplitPaneResetDividerLoc.java b/test/jdk/javax/swing/JSplitPane/TestSplitPaneResetDividerLoc.java
new file mode 100644
index 00000000000..e43691f243c
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/TestSplitPaneResetDividerLoc.java
@@ -0,0 +1,185 @@
+/*
+ * 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 8356594
+ * @key headful
+ * @summary Verifies if JSplitPane loses divider location when
+ *          reopened via JOptionPane.createDialog()
+ * @run main TestSplitPaneResetDividerLoc
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class TestSplitPaneResetDividerLoc {
+
+    private static JPanel lazyPanel;
+    private static JSplitPane splitPane;
+    private static JButton openDialogButton;
+    private static JDialog dialog;
+    private static JFrame frame;
+    private static volatile Point point;
+    private static volatile Rectangle size;
+    private static volatile int setLoc;
+    private static volatile int curLoc;
+
+    private static boolean setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+            return true;
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported LAF: " + laf.getClassName());
+            return false;
+        } catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            System.out.println("Testing LAF : " + laf.getClassName());
+            try {
+                if (!setLookAndFeel(laf)) {
+                    continue;
+                }
+                SwingUtilities.invokeAndWait(TestSplitPaneResetDividerLoc::createAndShowUI);
+
+                Robot robot = new Robot();
+                robot.waitForIdle();
+                robot.delay(1000);
+                SwingUtilities.invokeAndWait(() -> {
+                    point = openDialogButton.getLocationOnScreen();
+                    size = openDialogButton.getBounds();
+                });
+                robot.mouseMove(point.x + size.width / 2, point.y + size.height / 2);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+                robot.waitForIdle();
+                robot.delay(1000);
+
+                SwingUtilities.invokeAndWait(() -> {
+                    int divLoc = splitPane.getDividerLocation();
+                    splitPane.setDividerLocation(divLoc + 200);
+                });
+                robot.waitForIdle();
+                robot.delay(1000);
+                robot.keyPress(KeyEvent.VK_ESCAPE);
+                robot.keyRelease(KeyEvent.VK_ESCAPE);
+
+                SwingUtilities.invokeAndWait(() -> {
+                    setLoc = splitPane.getDividerLocation();
+                    System.out.println(setLoc);
+                });
+
+                robot.waitForIdle();
+                robot.delay(1000);
+                robot.mouseMove(point.x + size.width / 2, point.y + size.height / 2);
+                robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+                robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+                robot.waitForIdle();
+                robot.delay(1000);
+
+                SwingUtilities.invokeAndWait(() -> {
+                    curLoc = splitPane.getDividerLocation();
+                    System.out.println(curLoc);
+                });
+
+                robot.keyPress(KeyEvent.VK_ESCAPE);
+                robot.keyRelease(KeyEvent.VK_ESCAPE);
+
+                if (curLoc != setLoc) {
+                    throw new RuntimeException("Divider location is not preserved");
+                }
+            } finally {
+                SwingUtilities.invokeAndWait(() -> {
+                    if (frame != null) {
+                        frame.dispose();
+                    }
+                    lazyPanel = null;
+                });
+            }
+        }
+    }
+
+    private static void createAndShowUI() {
+        frame = new JFrame("JSplitPane Divider Location");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+         openDialogButton = new JButton(new AbstractAction("Open Dialog") {
+            public void actionPerformed(ActionEvent e) {
+                openDialogFromOptionPane(frame);
+            }
+        });
+
+        frame.getContentPane().add(openDialogButton, BorderLayout.CENTER);
+        frame.setSize(400, 100);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    private static void openDialogFromOptionPane(JFrame parent) {
+        if (lazyPanel == null) {
+            System.out.println("Creating lazy panel...");
+            lazyPanel = new JPanel(new BorderLayout());
+
+            JPanel left = new JPanel();
+            left.setBackground(Color.ORANGE);
+            JPanel right = new JPanel();
+            right.setBackground(Color.LIGHT_GRAY);
+
+            splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, left, right);
+            splitPane.setPreferredSize(new Dimension(400, 200));
+
+            // Set initial divider location — not preserved across dialog openings in OpenJDK 24
+            splitPane.setDividerLocation(120);
+
+            lazyPanel.add(splitPane, BorderLayout.CENTER);
+        }
+
+        JOptionPane optionPane = new JOptionPane(lazyPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.DEFAULT_OPTION);
+        dialog = optionPane.createDialog(parent, "SplitPane Dialog (JOptionPane)");
+        dialog.setModal(false);
+        dialog.setVisible(true);
+    }
+}

From c5a1543ee3e68775f09ca29fb07efd9aebfdb33e Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Mon, 2 Jun 2025 05:43:20 +0000
Subject: [PATCH 766/901] 8357968: RISC-V: Interpreter volatile reference
 stores with G1 are not sequentially consistent

Reviewed-by: eosterlund, fbredberg, shade, fyang
---
 src/hotspot/cpu/riscv/templateTable_riscv.cpp | 36 +++++--------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index 547a1ad35c5..f6bf1e79f92 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -125,24 +125,6 @@ static inline Address at_tos_p5() {
   return Address(esp, Interpreter::expr_offset_in_bytes(5));
 }
 
-// Miscellaneous helper routines
-// Store an oop (or null) at the Address described by obj.
-// If val == noreg this means store a null
-static void do_oop_store(InterpreterMacroAssembler* _masm,
-                         Address dst,
-                         Register val,
-                         DecoratorSet decorators) {
-  assert(val == noreg || val == x10, "parameter is just for looks");
-  __ store_heap_oop(dst, val, x28, x29, x13, decorators);
-}
-
-static void do_oop_load(InterpreterMacroAssembler* _masm,
-                        Address src,
-                        Register dst,
-                        DecoratorSet decorators) {
-  __ load_heap_oop(dst, src, x28, x29, decorators);
-}
-
 Address TemplateTable::at_bcp(int offset) {
   assert(_desc->uses_bcp(), "inconsistent uses_bcp information");
   return Address(xbcp, offset);
@@ -787,7 +769,7 @@ void TemplateTable::aaload() {
   index_check(x10, x11); // leaves index in x11
   __ addi(x11, x11, arrayOopDesc::base_offset_in_bytes(T_OBJECT) >> LogBytesPerHeapOop);
   __ shadd(x10, x11, x10, t0, LogBytesPerHeapOop);
-  do_oop_load(_masm, Address(x10), x10, IS_ARRAY);
+  __ load_heap_oop(x10, Address(x10), x28, x29, IS_ARRAY);
 }
 
 void TemplateTable::baload() {
@@ -1099,7 +1081,7 @@ void TemplateTable::aastore() {
   // Get the value we will store
   __ ld(x10, at_tos());
   // Now store using the appropriate barrier
-  do_oop_store(_masm, element_address, x10, IS_ARRAY);
+  __ store_heap_oop(element_address, x10, x28, x29, x13, IS_ARRAY);
   __ j(done);
 
   // Have a null in x10, x13=array, x12=index.  Store null at ary[idx]
@@ -1107,7 +1089,7 @@ void TemplateTable::aastore() {
   __ profile_null_seen(x12);
 
   // Store a null
-  do_oop_store(_masm, element_address, noreg, IS_ARRAY);
+  __ store_heap_oop(element_address, noreg, x28, x29, x13, IS_ARRAY);
 
   // Pop stack arguments
   __ bind(done);
@@ -2565,7 +2547,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ subi(t0, tos_state, (u1)atos);
   __ bnez(t0, notObj);
   // atos
-  do_oop_load(_masm, field, x10, IN_HEAP);
+  __ load_heap_oop(x10, field, x28, x29, IN_HEAP);
   __ push(atos);
   if (rc == may_rewrite) {
     patch_bytecode(Bytecodes::_fast_agetfield, bc, x11);
@@ -2809,7 +2791,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
     __ add(off, obj, off); // if static, obj from cache, else obj from stack.
     const Address field(off, 0);
     // Store into the field
-    do_oop_store(_masm, field, x10, IN_HEAP);
+    __ store_heap_oop(field, x10, x28, x29, x13, IN_HEAP);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_aputfield, bc, x11, true, byte_no);
     }
@@ -3051,10 +3033,10 @@ void TemplateTable::fast_storefield(TosState state) {
   __ add(x11, x12, x11);
   const Address field(x11, 0);
 
-  // access field
+  // access field, must not clobber x13 - flags
   switch (bytecode()) {
     case Bytecodes::_fast_aputfield:
-      do_oop_store(_masm, field, x10, IN_HEAP);
+      __ store_heap_oop(field, x10, x28, x29, x15, IN_HEAP);
       break;
     case Bytecodes::_fast_lputfield:
       __ access_store_at(T_LONG, IN_HEAP, field, x10, noreg, noreg, noreg);
@@ -3133,7 +3115,7 @@ void TemplateTable::fast_accessfield(TosState state) {
   // access field
   switch (bytecode()) {
     case Bytecodes::_fast_agetfield:
-      do_oop_load(_masm, field, x10, IN_HEAP);
+      __ load_heap_oop(x10, field, x28, x29, IN_HEAP);
       __ verify_oop(x10);
       break;
     case Bytecodes::_fast_lgetfield:
@@ -3191,7 +3173,7 @@ void TemplateTable::fast_xaccess(TosState state) {
       break;
     case atos:
       __ add(x10, x10, x11);
-      do_oop_load(_masm, Address(x10, 0), x10, IN_HEAP);
+      __ load_heap_oop(x10, Address(x10, 0), x28, x29, IN_HEAP);
       __ verify_oop(x10);
       break;
     case ftos:

From 3f59bfd2e1b35e10fe736e2fa6886cff74ecd35d Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 2 Jun 2025 07:59:10 +0000
Subject: [PATCH 767/901] 8334759: gc/g1/TestMixedGCLiveThreshold.java fails on
 Windows with JTREG_TEST_THREAD_FACTORY=Virtual due to extra memory allocation

Reviewed-by: ayang, iwalulya
---
 test/hotspot/jtreg/ProblemList-Virtual.txt             | 5 -----
 test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index 2239a10f3e7..cb5b92b96cf 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -83,11 +83,6 @@ vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemor
 # to make progress when all other threads are currently suspended.
 vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java 8338713 generic-all
 
-###
-# Fails on Windows because of additional memory allocation.
-
-gc/g1/TestMixedGCLiveThreshold.java#25percent 8334759 windows-x64
-
 ##########
 ## Tests incompatible with  with virtual test thread factory.
 ## There is no goal to run all test with virtual test thread factory.
diff --git a/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
index efaea7a097e..66b726223cc 100644
--- a/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
+++ b/test/hotspot/jtreg/gc/g1/TestMixedGCLiveThreshold.java
@@ -28,6 +28,7 @@
  * @summary Test G1MixedGCLiveThresholdPercent=0. Fill up a region to at least 33 percent,
  * the region should not be selected for mixed GC cycle.
  * @requires vm.gc.G1
+ * @requires test.thread.factory != "Virtual"
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
@@ -39,6 +40,7 @@
  * @summary Test G1MixedGCLiveThresholdPercent=25. Fill up a region to at least 33 percent,
  * the region should not be selected for mixed GC cycle.
  * @requires vm.gc.G1
+ * @requires test.thread.factory != "Virtual"
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
@@ -50,6 +52,7 @@
  * @summary Test G1MixedGCLiveThresholdPercent=100. Fill up a region to at least 33 percent,
  * the region should be selected for mixed GC cycle.
  * @requires vm.gc.G1
+ * @requires test.thread.factory != "Virtual"
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox

From 6418306211be47063a9b06bad8003dee1d81570c Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 2 Jun 2025 08:23:06 +0000
Subject: [PATCH 768/901] 8357944: Remove unused
 CollectedHeap::is_maximal_no_gc

Reviewed-by: jsikstro, tschatzl
---
 src/hotspot/share/gc/epsilon/epsilonHeap.hpp           | 5 -----
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp            | 2 +-
 src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp | 6 ------
 src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp | 5 -----
 src/hotspot/share/gc/parallel/psOldGen.hpp             | 4 ----
 src/hotspot/share/gc/serial/serialHeap.cpp             | 5 -----
 src/hotspot/share/gc/serial/serialHeap.hpp             | 5 -----
 src/hotspot/share/gc/serial/tenuredGeneration.hpp      | 6 ------
 src/hotspot/share/gc/shared/collectedHeap.hpp          | 5 -----
 src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp     | 2 --
 src/hotspot/share/gc/z/zCollectedHeap.cpp              | 6 ------
 src/hotspot/share/gc/z/zCollectedHeap.hpp              | 1 -
 12 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index 129e81c1c34..0022d50cbb9 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -80,11 +80,6 @@ class EpsilonHeap : public CollectedHeap {
 
   bool requires_barriers(stackChunkOop obj) const override { return false; }
 
-  bool is_maximal_no_gc() const override {
-    // No GC is going to happen. Return "we are at max", when we are about to fail.
-    return used() == capacity();
-  }
-
   // Allocation
   HeapWord* allocate_work(size_t size, bool verbose = true);
   HeapWord* mem_allocate(size_t size, bool* gc_overhead_limit_was_exceeded) override;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 71aab49864e..965d01c7089 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -966,7 +966,7 @@ class G1CollectedHeap : public CollectedHeap {
   // end fields defining the extent of the contiguous allocation region.)
   // But G1CollectedHeap doesn't yet support this.
 
-  bool is_maximal_no_gc() const override {
+  bool is_maximal_no_gc() const {
     return _hrm.num_inactive_regions() == 0;
   }
 
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 683f4e13b47..0235864992f 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -207,12 +207,6 @@ size_t ParallelScavengeHeap::used() const {
   return value;
 }
 
-bool ParallelScavengeHeap::is_maximal_no_gc() const {
-  // We don't expand young-gen except at a GC.
-  return old_gen()->is_maximal_no_gc();
-}
-
-
 size_t ParallelScavengeHeap::max_capacity() const {
   size_t estimated = reserved_region().byte_size();
   if (UseAdaptiveSizePolicy) {
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index 887b78758cf..2ce36a6f961 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -158,11 +158,6 @@ class ParallelScavengeHeap : public CollectedHeap {
   size_t capacity() const override;
   size_t used() const override;
 
-  // Return "true" if all generations have reached the
-  // maximal committed limit that they can reach, without a garbage
-  // collection.
-  bool is_maximal_no_gc() const override;
-
   void register_nmethod(nmethod* nm) override;
   void unregister_nmethod(nmethod* nm) override;
   void verify_nmethod(nmethod* nm) override;
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index f4815e67179..c1bfe2f1972 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -109,10 +109,6 @@ class PSOldGen : public CHeapObj<mtGC> {
   size_t capacity_in_bytes() const        { return object_space()->capacity_in_bytes(); }
   size_t used_in_bytes() const            { return object_space()->used_in_bytes(); }
 
-  bool is_maximal_no_gc() const {
-    return virtual_space()->uncommitted_size() == 0;
-  }
-
   void complete_loaded_archive_space(MemRegion archive_space);
 
   // Calculating new sizes
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 5b2ce8d0415..27d94593765 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -766,11 +766,6 @@ void SerialHeap::prepare_for_verify() {
   ensure_parsability(false);        // no need to retire TLABs
 }
 
-bool SerialHeap::is_maximal_no_gc() const {
-  // We don't expand young-gen except at a GC.
-  return _old_gen->is_maximal_no_gc();
-}
-
 void SerialHeap::save_marks() {
   _young_gen_saved_top = _young_gen->to()->top();
   _old_gen_saved_top = _old_gen->space()->top();
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 30b7b9a0085..34c79ac0a18 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -216,11 +216,6 @@ class SerialHeap : public CollectedHeap {
 
   void print_heap_change(const PreGenGCValues& pre_gc_values) const;
 
-  // Return "true" if all generations have reached the
-  // maximal committed limit that they can reach, without a garbage
-  // collection.
-  virtual bool is_maximal_no_gc() const override;
-
   // This function returns the CardTableRS object that allows us to scan
   // generations in a fully generational heap.
   CardTableRS* rem_set() { return _rem_set; }
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 88bfe6ecf46..1f6871d8ee2 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -102,12 +102,6 @@ class TenuredGeneration: public Generation {
   MemRegion prev_used_region() const { return _prev_used_region; }
   void save_used_region()   { _prev_used_region = used_region(); }
 
-  // Returns true if this generation cannot be expanded further
-  // without a GC.
-  bool is_maximal_no_gc() const {
-    return _virtual_space.uncommitted_size() == 0;
-  }
-
   HeapWord* block_start(const void* addr) const;
 
   void scan_old_to_young_refs(HeapWord* saved_top_in_old_gen);
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 30ee35a34a7..d50c09f70a7 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -259,11 +259,6 @@ class CollectedHeap : public CHeapObj<mtGC> {
   size_t used_at_last_gc() const { return _used_at_last_gc; }
   void update_capacity_and_used_at_gc();
 
-  // Return "true" if the part of the heap that allocates Java
-  // objects has reached the maximal committed limit that it can
-  // reach, without a garbage collection.
-  virtual bool is_maximal_no_gc() const = 0;
-
   // Support for java.lang.Runtime.maxMemory():  return the maximum amount of
   // memory that the vm could make available for storing 'normal' java objects.
   // This is based on the reserved address space, but should not include space
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 78d507c0f7d..4124bf8be7f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -614,8 +614,6 @@ class ShenandoahHeap : public CollectedHeap {
 // and can be stubbed out.
 //
 public:
-  bool is_maximal_no_gc() const override shenandoah_not_implemented_return(false);
-
   // Check the pointer is in active part of Java heap.
   // Use is_in_reserved to check if object is within heap bounds.
   bool is_in(const void* p) const override;
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index f69f8492eed..87cfeb012ec 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -126,12 +126,6 @@ size_t ZCollectedHeap::unused() const {
   return _heap.unused();
 }
 
-bool ZCollectedHeap::is_maximal_no_gc() const {
-  // Not supported
-  ShouldNotReachHere();
-  return false;
-}
-
 bool ZCollectedHeap::is_in(const void* p) const {
   return _heap.is_in((uintptr_t)p);
 }
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp
index 9ae3da39dd9..871ff81bfdf 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.hpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp
@@ -70,7 +70,6 @@ class ZCollectedHeap : public CollectedHeap {
   size_t used() const override;
   size_t unused() const override;
 
-  bool is_maximal_no_gc() const override;
   bool is_in(const void* p) const override;
   bool requires_barriers(stackChunkOop obj) const override;
 

From 40ce05d4080a9a2b4876c21f83a184f9b8a580a2 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Mon, 2 Jun 2025 08:28:10 +0000
Subject: [PATCH 769/901] 8358231: Template interpreter generator crashes with
 ShouldNotReachHere on some platforms after 8353686

Reviewed-by: shade, amitkumar, mbaesken, kvn
---
 src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp   | 1 +
 src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp   | 1 +
 src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
index 30d88a4db91..db4a5c8625c 100644
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
@@ -175,6 +175,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
   case Interpreter::java_lang_math_fmaD:
   case Interpreter::java_lang_math_fmaF:
   case Interpreter::java_lang_math_tanh:
+  case Interpreter::java_lang_math_cbrt:
     // TODO: Implement intrinsic
     break;
   default:
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 020590d414f..ab4f35f4d8c 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1090,6 +1090,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     case Interpreter::java_lang_math_cos  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);   break;
     case Interpreter::java_lang_math_tan  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);   break;
     case Interpreter::java_lang_math_tanh : /* run interpreted */ break;
+    case Interpreter::java_lang_math_cbrt : /* run interpreted */ break;
     case Interpreter::java_lang_math_abs  : /* run interpreted */ break;
     case Interpreter::java_lang_math_sqrt : /* run interpreted */  break;
     case Interpreter::java_lang_math_log  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);   break;
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index c953ab38713..e387d60b594 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1240,6 +1240,7 @@ address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::M
     case Interpreter::java_lang_math_cos  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dcos);   break;
     case Interpreter::java_lang_math_tan  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dtan);   break;
     case Interpreter::java_lang_math_tanh : /* run interpreted */ break;
+    case Interpreter::java_lang_math_cbrt : /* run interpreted */ break;
     case Interpreter::java_lang_math_abs  : /* run interpreted */ break;
     case Interpreter::java_lang_math_sqrt : /* runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dsqrt); not available */ break;
     case Interpreter::java_lang_math_log  : runtime_entry = CAST_FROM_FN_PTR(address, SharedRuntime::dlog);   break;

From ba9f44c90fe8da2d97d67b6878ac2c0c14e35bd0 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Mon, 2 Jun 2025 08:31:10 +0000
Subject: [PATCH 770/901] 8357793: [PPC64] VM crashes with -XX:-UseSIGTRAP
 -XX:-ImplicitNullChecks

Reviewed-by: shade, dbriemann
---
 src/hotspot/cpu/ppc/methodHandles_ppc.cpp    | 4 +++-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/ppc/methodHandles_ppc.cpp b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
index 13fb8ef79d6..803bb6bfe69 100644
--- a/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
+++ b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
@@ -359,7 +359,9 @@ void MethodHandles::generate_method_handle_dispatch(MacroAssembler* _masm,
         ? -1                                  // enforce receiver null check
         : oopDesc::klass_offset_in_bytes();   // regular null-checking behavior
 
-      __ null_check_throw(receiver_reg, klass_offset, temp1, Interpreter::throw_NullPointerException_entry());
+      address NullPointerException_entry = for_compiler_entry ? SharedRuntime::throw_NullPointerException_at_call_entry()
+                                                              : Interpreter::throw_NullPointerException_entry();
+      __ null_check_throw(receiver_reg, klass_offset, temp1, NullPointerException_entry);
 
       if (iid != vmIntrinsics::_linkToSpecial || VerifyMethodHandles) {
         __ load_klass(temp1_recv_klass, receiver_reg);
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 1667fa3aba3..7431f77aeff 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -1035,7 +1035,7 @@ void TemplateTable::bastore() {
 
   // Need to check whether array is boolean or byte
   // since both types share the bastore bytecode.
-  __ load_klass(Rscratch, Rarray);
+  __ load_klass_check_null_throw(Rscratch, Rarray, Rscratch);
   __ lwz(Rscratch, in_bytes(Klass::layout_helper_offset()), Rscratch);
   int diffbit = exact_log2(Klass::layout_helper_boolean_diffbit());
   __ testbitdi(CR0, R0, Rscratch, diffbit);

From a9e7a74d00fe1c8d3179392738bb15d8e3508b3a Mon Sep 17 00:00:00 2001
From: Guoxiong Li <gli@openjdk.org>
Date: Mon, 2 Jun 2025 08:47:36 +0000
Subject: [PATCH 771/901] 8357109: Parallel: Fix typo in YoungedGeneration

Reviewed-by: ayang, zgu, tschatzl
---
 src/hotspot/share/gc/shared/gc_globals.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 56b8bc4e4ff..f693ab910ba 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_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
@@ -362,11 +362,11 @@
           range(0, 100)                                                     \
                                                                             \
   product(uint, YoungGenerationSizeSupplement, 80,                          \
-          "Supplement to YoungedGenerationSizeIncrement used at startup")   \
+          "Supplement to YoungGenerationSizeIncrement used at startup")     \
           range(0, 100)                                                     \
                                                                             \
   product(uintx, YoungGenerationSizeSupplementDecay, 8,                     \
-          "Decay factor to YoungedGenerationSizeSupplement")                \
+          "Decay factor to YoungGenerationSizeSupplement")                  \
           range(1, max_uintx)                                               \
                                                                             \
   product(uint, TenuredGenerationSizeIncrement, 20,                         \

From eb9badd8a4ea6dca834525fd49429e2ce771a76c Mon Sep 17 00:00:00 2001
From: Roman Kennke <rkennke@openjdk.org>
Date: Mon, 2 Jun 2025 08:57:16 +0000
Subject: [PATCH 772/901] 8358169: Shenandoah/JVMCI: Export GC state constants

Reviewed-by: dnsimon, shade
---
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index cf9e6ed46d5..4302c0ce6ad 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -54,6 +54,7 @@
 #include "gc/z/zThreadLocalData.hpp"
 #endif
 #if INCLUDE_SHENANDOAHGC
+#include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahRuntime.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 #endif
@@ -969,6 +970,13 @@
    declare_constant_with_value("ShenandoahThreadLocalData::satb_mark_queue_index_offset", in_bytes(ShenandoahThreadLocalData::satb_mark_queue_index_offset())) \
    declare_constant_with_value("ShenandoahThreadLocalData::satb_mark_queue_buffer_offset", in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset())) \
    declare_constant_with_value("ShenandoahThreadLocalData::card_table_offset", in_bytes(ShenandoahThreadLocalData::card_table_offset())) \
+   declare_constant_with_value("ShenandoahHeap::HAS_FORWARDED", ShenandoahHeap::HAS_FORWARDED)                                           \
+   declare_constant_with_value("ShenandoahHeap::MARKING", ShenandoahHeap::MARKING)                                                       \
+   declare_constant_with_value("ShenandoahHeap::EVACUATION", ShenandoahHeap::EVACUATION)                                                 \
+   declare_constant_with_value("ShenandoahHeap::UPDATE_REFS", ShenandoahHeap::UPDATE_REFS)                                               \
+   declare_constant_with_value("ShenandoahHeap::WEAK_ROOTS", ShenandoahHeap::WEAK_ROOTS)                                                 \
+   declare_constant_with_value("ShenandoahHeap::YOUNG_MARKING", ShenandoahHeap::YOUNG_MARKING)                                           \
+   declare_constant_with_value("ShenandoahHeap::OLD_MARKING", ShenandoahHeap::OLD_MARKING)                                               \
 
 #endif
 

From 612f2c0c0b75466c60d4b54dab6aa793a810c846 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Mon, 2 Jun 2025 09:21:31 +0000
Subject: [PATCH 773/901] 8357981: [PPC64] Remove old instructions from
 VM_Version::determine_features()

Reviewed-by: dbriemann, mbaesken
---
 src/hotspot/cpu/ppc/vm_version_ppc.cpp | 40 ++------------------------
 src/hotspot/cpu/ppc/vm_version_ppc.hpp | 39 ++-----------------------
 2 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 79efc9a05c1..6a3d88c48ae 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -479,29 +479,10 @@ void VM_Version::determine_features() {
   // Emit code.
   void (*test)(address addr, uint64_t offset)=(void(*)(address addr, uint64_t offset))(void *)a->function_entry();
   uint32_t *code = (uint32_t *)a->pc();
-  // Don't use R0 in ldarx.
   // Keep R3_ARG1 unmodified, it contains &field (see below).
   // Keep R4_ARG2 unmodified, it contains offset = 0 (see below).
-  a->fsqrt(F3, F4);                            // code[0]  -> fsqrt_m
-  a->fsqrts(F3, F4);                           // code[1]  -> fsqrts_m
-  a->isel(R7, R5, R6, 0);                      // code[2]  -> isel_m
-  a->ldarx_unchecked(R7, R3_ARG1, R4_ARG2, 1); // code[3]  -> lxarx_m
-  a->cmpb(R7, R5, R6);                         // code[4]  -> cmpb
-  a->popcntb(R7, R5);                          // code[5]  -> popcntb
-  a->popcntw(R7, R5);                          // code[6]  -> popcntw
-  a->fcfids(F3, F4);                           // code[7]  -> fcfids
-  a->vand(VR0, VR0, VR0);                      // code[8]  -> vand
-  // arg0 of lqarx must be an even register, (arg1 + arg2) must be a multiple of 16
-  a->lqarx_unchecked(R6, R3_ARG1, R4_ARG2, 1); // code[9]  -> lqarx_m
-  a->vcipher(VR0, VR1, VR2);                   // code[10] -> vcipher
-  a->vpmsumb(VR0, VR1, VR2);                   // code[11] -> vpmsumb
-  a->mfdscr(R0);                               // code[12] -> mfdscr
-  a->lxvd2x(VSR0, R3_ARG1);                    // code[13] -> vsx
-  a->ldbrx(R7, R3_ARG1, R4_ARG2);              // code[14] -> ldbrx
-  a->stdbrx(R7, R3_ARG1, R4_ARG2);             // code[15] -> stdbrx
-  a->vshasigmaw(VR0, VR1, 1, 0xF);             // code[16] -> vshasig
-  a->darn(R7);                                 // code[17] -> darn
-  a->brw(R5, R6);                              // code[18] -> brw
+  a->darn(R7);
+  a->brw(R5, R6);
   a->blr();
 
   // Emit function to set one cache line to zero. Emit function descriptor and get pointer to it.
@@ -536,23 +517,6 @@ void VM_Version::determine_features() {
 
   // determine which instructions are legal.
   int feature_cntr = 0;
-  if (code[feature_cntr++]) features |= fsqrt_m;
-  if (code[feature_cntr++]) features |= fsqrts_m;
-  if (code[feature_cntr++]) features |= isel_m;
-  if (code[feature_cntr++]) features |= lxarxeh_m;
-  if (code[feature_cntr++]) features |= cmpb_m;
-  if (code[feature_cntr++]) features |= popcntb_m;
-  if (code[feature_cntr++]) features |= popcntw_m;
-  if (code[feature_cntr++]) features |= fcfids_m;
-  if (code[feature_cntr++]) features |= vand_m;
-  if (code[feature_cntr++]) features |= lqarx_m;
-  if (code[feature_cntr++]) features |= vcipher_m;
-  if (code[feature_cntr++]) features |= vpmsumb_m;
-  if (code[feature_cntr++]) features |= mfdscr_m;
-  if (code[feature_cntr++]) features |= vsx_m;
-  if (code[feature_cntr++]) features |= ldbrx_m;
-  if (code[feature_cntr++]) features |= stdbrx_m;
-  if (code[feature_cntr++]) features |= vshasig_m;
   if (code[feature_cntr++]) features |= darn_m;
   if (code[feature_cntr++]) features |= brw_m;
 
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
index a92aa5ca5e3..18dfd843c19 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. 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
@@ -32,46 +32,12 @@
 class VM_Version: public Abstract_VM_Version {
 protected:
   enum Feature_Flag {
-    fsqrt,
-    fsqrts,
-    isel,
-    lxarxeh,
-    cmpb,
-    popcntb,
-    popcntw,
-    fcfids,
-    vand,
-    lqarx,
-    vcipher,
-    vpmsumb,
-    mfdscr,
-    vsx,
-    ldbrx,
-    stdbrx,
-    vshasig,
     darn,
     brw,
     num_features // last entry to count features
   };
   enum Feature_Flag_Set {
     unknown_m             = 0,
-    fsqrt_m               = (1 << fsqrt  ),
-    fsqrts_m              = (1 << fsqrts ),
-    isel_m                = (1 << isel   ),
-    lxarxeh_m             = (1 << lxarxeh),
-    cmpb_m                = (1 << cmpb   ),
-    popcntb_m             = (1 << popcntb),
-    popcntw_m             = (1 << popcntw),
-    fcfids_m              = (1 << fcfids ),
-    vand_m                = (1 << vand   ),
-    lqarx_m               = (1 << lqarx  ),
-    vcipher_m             = (1 << vcipher),
-    vpmsumb_m             = (1 << vpmsumb),
-    mfdscr_m              = (1 << mfdscr ),
-    vsx_m                 = (1 << vsx    ),
-    ldbrx_m               = (1 << ldbrx  ),
-    stdbrx_m              = (1 << stdbrx ),
-    vshasig_m             = (1 << vshasig),
     darn_m                = (1 << darn   ),
     brw_m                 = (1 << brw    ),
     all_features_m        = (unsigned long)-1
@@ -101,7 +67,6 @@ class VM_Version: public Abstract_VM_Version {
 
   static bool is_determine_features_test_running() { return _is_determine_features_test_running; }
   // CPU instruction support
-  static bool has_mfdscr()  { return (_features & mfdscr_m) != 0; }
   static bool has_darn()    { return (_features & darn_m) != 0; }
   static bool has_brw()     { return (_features & brw_m) != 0; }
 

From 83cb0c6de5988de526545d0926c2c6ef60efc1c7 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Mon, 2 Jun 2025 09:22:37 +0000
Subject: [PATCH 774/901] 8358151: Harden JSR166 Test case
 testShutdownNow_delayedTasks

Reviewed-by: alanb, shade
---
 test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java | 8 +++++---
 .../concurrent/tck/ScheduledExecutorSubclassTest.java     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
index 9e26ec11d72..69073ef9dab 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
@@ -546,11 +546,13 @@ public void testScheduleWithFixedDelay_overflow() throws Exception {
     public void testShutdownNow_delayedTasks() throws InterruptedException {
         final ForkJoinPool p = new ForkJoinPool(2);
         List<ScheduledFuture<?>> tasks = new ArrayList<>();
+        final int DELAY = 100;
+
         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));
+            tasks.add(p.schedule(r, DELAY, SECONDS));
+            tasks.add(p.scheduleAtFixedRate(r, DELAY, DELAY, SECONDS));
+            tasks.add(p.scheduleWithFixedDelay(r, DELAY, DELAY, SECONDS));
         }
         p.shutdownNow();
         assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
diff --git a/test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java b/test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java
index 43091f9e8f7..588eeabb35f 100644
--- a/test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java
+++ b/test/jdk/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java
@@ -741,11 +741,13 @@ public void testShutdownNow() throws InterruptedException {
     public void testShutdownNow_delayedTasks() throws InterruptedException {
         final CustomExecutor p = new CustomExecutor(1);
         List<ScheduledFuture<?>> tasks = new ArrayList<>();
+        final int DELAY = 100;
+
         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));
+            tasks.add(p.schedule(r, DELAY, SECONDS));
+            tasks.add(p.scheduleAtFixedRate(r, DELAY, DELAY, SECONDS));
+            tasks.add(p.scheduleWithFixedDelay(r, DELAY, DELAY, SECONDS));
         }
         if (testImplementationDetails)
             assertEquals(new HashSet<Object>(tasks), new HashSet<Object>(p.getQueue()));

From c22af0c29ea89857c5cf57dd127b5c739130b2f1 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 2 Jun 2025 11:50:50 +0000
Subject: [PATCH 775/901] 8358205: Remove unused JFR array allocation code

Reviewed-by: kbarrett, mgronlun
---
 src/hotspot/share/jfr/jni/jfrJavaCall.cpp    | 17 ++---------
 src/hotspot/share/jfr/jni/jfrJavaCall.hpp    |  6 +---
 src/hotspot/share/jfr/jni/jfrJavaSupport.cpp | 30 +-------------------
 src/hotspot/share/jfr/jni/jfrJavaSupport.hpp |  1 -
 src/hotspot/share/memory/oopFactory.cpp      |  1 -
 5 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/hotspot/share/jfr/jni/jfrJavaCall.cpp b/src/hotspot/share/jfr/jni/jfrJavaCall.cpp
index 9c0bcb415b4..5f4489ce745 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaCall.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaCall.cpp
@@ -179,7 +179,7 @@ void JfrJavaArguments::Parameters::copy(JavaCallArguments& args, TRAPS) const {
   }
 }
 
-JfrJavaArguments::JfrJavaArguments(JavaValue* result) : _result(result), _klass(nullptr), _name(nullptr), _signature(nullptr), _array_length(-1) {
+JfrJavaArguments::JfrJavaArguments(JavaValue* result) : _result(result), _klass(nullptr), _name(nullptr), _signature(nullptr) {
   assert(result != nullptr, "invariant");
 }
 
@@ -187,8 +187,7 @@ JfrJavaArguments::JfrJavaArguments(JavaValue* result, const char* klass_name, co
   _result(result),
   _klass(nullptr),
   _name(nullptr),
-  _signature(nullptr),
-  _array_length(-1) {
+  _signature(nullptr) {
   assert(result != nullptr, "invariant");
   if (klass_name != nullptr) {
     set_klass(klass_name, CHECK);
@@ -204,8 +203,7 @@ JfrJavaArguments::JfrJavaArguments(JavaValue* result, const char* klass_name, co
 JfrJavaArguments::JfrJavaArguments(JavaValue* result, const Klass* klass, const Symbol* name, const Symbol* signature) : _result(result),
   _klass(nullptr),
   _name(nullptr),
-  _signature(nullptr),
-  _array_length(-1) {
+  _signature(nullptr) {
   assert(result != nullptr, "invariant");
   if (klass != nullptr) {
     set_klass(klass);
@@ -268,15 +266,6 @@ void JfrJavaArguments::set_signature(const Symbol* signature) {
   _signature = signature;
 }
 
-int JfrJavaArguments::array_length() const {
-  return _array_length;
-}
-
-void JfrJavaArguments::set_array_length(int length) {
-  assert(length >= 0, "invariant");
-  _array_length = length;
-}
-
 JavaValue* JfrJavaArguments::result() const {
   assert(_result != nullptr, "invariant");
   return const_cast<JavaValue*>(_result);
diff --git a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
index 8ea69559427..f5f33100c10 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp
@@ -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
@@ -55,9 +55,6 @@ class JfrJavaArguments : public StackObj {
   void set_signature(const char* signature);
   void set_signature(const Symbol* signature);
 
-  int array_length() const;
-  void set_array_length(int length);
-
   JavaValue* result() const;
 
   bool has_receiver() const;
@@ -117,7 +114,6 @@ class JfrJavaArguments : public StackObj {
   const Klass* _klass;
   const Symbol* _name;
   const Symbol* _signature;
-  int _array_length;
 
   int java_call_arg_slots() const;
   void copy(JavaCallArguments& args, TRAPS);
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
index 1dd7168e9e5..3b566868f07 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -178,19 +178,6 @@ static void object_construction(JfrJavaArguments* args, JavaValue* result, Insta
   result->set_oop(h_obj());
 }
 
-static void array_construction(JfrJavaArguments* args, JavaValue* result, InstanceKlass* klass, int array_length, TRAPS) {
-  assert(args != nullptr, "invariant");
-  assert(result != nullptr, "invariant");
-  assert(klass != nullptr, "invariant");
-  assert(klass->is_initialized(), "invariant");
-
-  Klass* const ak = klass->array_klass(THREAD);
-  ObjArrayKlass::cast(ak)->initialize(THREAD);
-  HandleMark hm(THREAD);
-  objArrayOop arr = ObjArrayKlass::cast(ak)->allocate(array_length, CHECK);
-  result->set_oop(arr);
-}
-
 static void create_object(JfrJavaArguments* args, JavaValue* result, TRAPS) {
   assert(args != nullptr, "invariant");
   assert(result != nullptr, "invariant");
@@ -200,13 +187,7 @@ static void create_object(JfrJavaArguments* args, JavaValue* result, TRAPS) {
   InstanceKlass* const klass = static_cast<InstanceKlass*>(args->klass());
   klass->initialize(CHECK);
 
-  const int array_length = args->array_length();
-
-  if (array_length >= 0) {
-    array_construction(args, result, klass, array_length, CHECK);
-  } else {
-    object_construction(args, result, klass, THREAD);
-  }
+  object_construction(args, result, klass, THREAD);
 }
 
 static void handle_result(JavaValue* result, bool global_ref, JavaThread* t) {
@@ -252,15 +233,6 @@ jstring JfrJavaSupport::new_string(const char* c_str, TRAPS) {
   return (jstring)local_jni_handle(result, THREAD);
 }
 
-jobjectArray JfrJavaSupport::new_string_array(int length, TRAPS) {
-  DEBUG_ONLY(check_java_thread_in_vm(THREAD));
-  JavaValue result(T_OBJECT);
-  JfrJavaArguments args(&result, "java/lang/String", "<init>", "()V", CHECK_NULL);
-  args.set_array_length(length);
-  new_object_local_ref(&args, THREAD);
-  return (jobjectArray)args.result()->get_jobject();
-}
-
 jobject JfrJavaSupport::new_java_lang_Boolean(bool value, TRAPS) {
   DEBUG_ONLY(check_java_thread_in_vm(THREAD));
   JavaValue result(T_OBJECT);
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
index 118782bc61e..35c2414168f 100644
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
@@ -69,7 +69,6 @@ class JfrJavaSupport : public AllStatic {
   static void get_field_local_ref(JfrJavaArguments* args, TRAPS);
 
   static jstring new_string(const char* c_str, TRAPS);
-  static jobjectArray new_string_array(int length, TRAPS);
 
   static jobject new_java_lang_Boolean(bool value, TRAPS);
   static jobject new_java_lang_Integer(jint value, TRAPS);
diff --git a/src/hotspot/share/memory/oopFactory.cpp b/src/hotspot/share/memory/oopFactory.cpp
index 83140aa44f5..949b4fe134b 100644
--- a/src/hotspot/share/memory/oopFactory.cpp
+++ b/src/hotspot/share/memory/oopFactory.cpp
@@ -107,7 +107,6 @@ typeArrayOop oopFactory::new_typeArray_nozero(BasicType type, int length, TRAPS)
 
 
 objArrayOop oopFactory::new_objArray(Klass* klass, int length, TRAPS) {
-  assert(klass->is_klass(), "must be instance class");
   if (klass->is_array_klass()) {
     return ArrayKlass::cast(klass)->allocate_arrayArray(1, length, THREAD);
   } else {

From 83b15da2eb3cb6c8937f517c9b75eaa9eeece314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Mon, 2 Jun 2025 12:26:08 +0000
Subject: [PATCH 776/901] 8351997: AArch64: Interpreter volatile reference
 stores with G1 are not sequentially consistent

Reviewed-by: shade, aph, fbredberg
---
 src/hotspot/cpu/aarch64/templateTable_aarch64.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index 4c1e4ce3a05..fcfe153a9a5 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -1144,6 +1144,7 @@ void TemplateTable::aastore() {
   // Get the value we will store
   __ ldr(r0, at_tos());
   // Now store using the appropriate barrier
+  // Clobbers: r10, r11, r3
   do_oop_store(_masm, element_address, r0, IS_ARRAY);
   __ b(done);
 
@@ -1152,6 +1153,7 @@ void TemplateTable::aastore() {
   __ profile_null_seen(r2);
 
   // Store a null
+  // Clobbers: r10, r11, r3
   do_oop_store(_masm, element_address, noreg, IS_ARRAY);
 
   // Pop stack arguments
@@ -2882,6 +2884,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static, RewriteContr
     __ pop(atos);
     if (!is_static) pop_and_check_object(obj);
     // Store into the field
+    // Clobbers: r10, r11, r3
     do_oop_store(_masm, field, r0, IN_HEAP);
     if (rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_aputfield, bc, r1, true, byte_no);
@@ -3077,12 +3080,12 @@ void TemplateTable::fast_storefield(TosState state)
   // access constant pool cache
   __ load_field_entry(r2, r1);
 
-  // R1: field offset, R2: field holder, R3: flags
-  load_resolved_field_entry(r2, r2, noreg, r1, r3);
+  // R1: field offset, R2: field holder, R5: flags
+  load_resolved_field_entry(r2, r2, noreg, r1, r5);
 
   {
     Label notVolatile;
-    __ tbz(r3, ResolvedFieldEntry::is_volatile_shift, notVolatile);
+    __ tbz(r5, ResolvedFieldEntry::is_volatile_shift, notVolatile);
     __ membar(MacroAssembler::StoreStore | MacroAssembler::LoadStore);
     __ bind(notVolatile);
   }
@@ -3098,6 +3101,7 @@ void TemplateTable::fast_storefield(TosState state)
   // access field
   switch (bytecode()) {
   case Bytecodes::_fast_aputfield:
+    // Clobbers: r10, r11, r3
     do_oop_store(_masm, field, r0, IN_HEAP);
     break;
   case Bytecodes::_fast_lputfield:
@@ -3130,7 +3134,7 @@ void TemplateTable::fast_storefield(TosState state)
 
   {
     Label notVolatile;
-    __ tbz(r3, ResolvedFieldEntry::is_volatile_shift, notVolatile);
+    __ tbz(r5, ResolvedFieldEntry::is_volatile_shift, notVolatile);
     __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
     __ bind(notVolatile);
   }

From b3594c9e5508101a39d10099830f04b0c09ad41f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 2 Jun 2025 13:08:41 +0000
Subject: [PATCH 777/901] 8357481: Excessive CompileTask wait/notify monitor
 creation

Reviewed-by: vlivanov, kvn
---
 src/hotspot/share/compiler/compileBroker.cpp | 12 ++++++------
 src/hotspot/share/compiler/compileTask.cpp   |  3 ---
 src/hotspot/share/compiler/compileTask.hpp   | 16 +++++-----------
 src/hotspot/share/runtime/mutexLocker.cpp    |  5 ++++-
 src/hotspot/share/runtime/mutexLocker.hpp    |  1 +
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index d23d2e4febe..b5f02b2d9a2 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -231,7 +231,7 @@ CompileTaskWrapper::~CompileTaskWrapper() {
   if (task->is_blocking()) {
     bool free_task = false;
     {
-      MutexLocker notifier(thread, task->lock());
+      MutexLocker notifier(thread, CompileTaskWait_lock);
       task->mark_complete();
 #if INCLUDE_JVMCI
       if (CompileBroker::compiler(task->comp_level())->is_jvmci()) {
@@ -245,7 +245,7 @@ CompileTaskWrapper::~CompileTaskWrapper() {
       if (!free_task) {
         // Notify the waiting thread that the compilation has completed
         // so that it can free the task.
-        task->lock()->notify_all();
+        CompileTaskWait_lock->notify_all();
       }
     }
     if (free_task) {
@@ -375,12 +375,12 @@ void CompileQueue::free_all() {
     next = current->next();
     bool found_waiter = false;
     {
-      MutexLocker ct_lock(current->lock());
+      MutexLocker ct_lock(CompileTaskWait_lock);
       assert(current->waiting_for_completion_count() <= 1, "more than one thread are waiting for task");
       if (current->waiting_for_completion_count() > 0) {
         // If another thread waits for this task, we must wake them up
         // so they will stop waiting and free the task.
-        current->lock()->notify();
+        CompileTaskWait_lock->notify_all();
         found_waiter = true;
       }
     }
@@ -1655,7 +1655,7 @@ static const int JVMCI_COMPILATION_PROGRESS_WAIT_ATTEMPTS = 10;
  */
 bool CompileBroker::wait_for_jvmci_completion(JVMCICompiler* jvmci, CompileTask* task, JavaThread* thread) {
   assert(UseJVMCICompiler, "sanity");
-  MonitorLocker ml(thread, task->lock());
+  MonitorLocker ml(thread, CompileTaskWait_lock);
   int progress_wait_attempts = 0;
   jint thread_jvmci_compilation_ticks = 0;
   jint global_jvmci_compilation_ticks = jvmci->global_compilation_ticks();
@@ -1723,7 +1723,7 @@ void CompileBroker::wait_for_completion(CompileTask* task) {
   } else
 #endif
   {
-    MonitorLocker ml(thread, task->lock());
+    MonitorLocker ml(thread, CompileTaskWait_lock);
     free_task = true;
     task->inc_waiting_for_completion();
     while (!task->is_complete() && !is_compilation_disabled_forever()) {
diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index 4f91984f7a5..b955a250fae 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -65,7 +65,6 @@ CompileTask* CompileTask::allocate() {
 void CompileTask::free(CompileTask* task) {
   MutexLocker locker(CompileTaskAlloc_lock);
   if (!task->is_free()) {
-    assert(!task->lock()->is_locked(), "Should not be locked when freed");
     if ((task->_method_holder != nullptr && JNIHandles::is_weak_global_handle(task->_method_holder))) {
       JNIHandles::destroy_weak_global(task->_method_holder);
     } else {
@@ -90,8 +89,6 @@ void CompileTask::initialize(int compile_id,
                              int hot_count,
                              CompileTask::CompileReason compile_reason,
                              bool is_blocking) {
-  assert(!_lock->is_locked(), "bad locking");
-
   Thread* thread = Thread::current();
   _compile_id = compile_id;
   _method = method();
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index d615885e51c..166f6497f2b 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -29,6 +29,7 @@
 #include "code/nmethod.hpp"
 #include "compiler/compileLog.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/mutexLocker.hpp"
 #include "utilities/xmlstream.hpp"
 
 class CompileTrainingData;
@@ -82,7 +83,6 @@ class CompileTask : public CHeapObj<mtCompiler> {
 
  private:
   static CompileTask*  _task_free_list;
-  Monitor*             _lock;
   int                  _compile_id;
   Method*              _method;
   jobject              _method_holder;
@@ -116,11 +116,7 @@ class CompileTask : public CHeapObj<mtCompiler> {
   size_t               _arena_bytes;  // peak size of temporary memory during compilation (e.g. node arenas)
 
  public:
-  CompileTask() : _failure_reason(nullptr), _failure_reason_on_C_heap(false) {
-    // May hold MethodCompileQueue_lock
-    _lock = new Monitor(Mutex::safepoint-1, "CompileTask_lock");
-  }
-
+  CompileTask() : _failure_reason(nullptr), _failure_reason_on_C_heap(false) {}
   void initialize(int compile_id, const methodHandle& method, int osr_bci, int comp_level,
                   int hot_count,
                   CompileTask::CompileReason compile_reason, bool is_blocking);
@@ -172,21 +168,19 @@ class CompileTask : public CHeapObj<mtCompiler> {
   }
 #endif
 
-  Monitor*     lock() const                      { return _lock; }
-
   // See how many threads are waiting for this task. Must have lock to read this.
   int waiting_for_completion_count() {
-    assert(_lock->owned_by_self(), "must have lock to use waiting_for_completion_count()");
+    assert(CompileTaskWait_lock->owned_by_self(), "must have lock to use waiting_for_completion_count()");
     return _waiting_count;
   }
   // Indicates that a thread is waiting for this task to complete. Must have lock to use this.
   void inc_waiting_for_completion() {
-    assert(_lock->owned_by_self(), "must have lock to use inc_waiting_for_completion()");
+    assert(CompileTaskWait_lock->owned_by_self(), "must have lock to use inc_waiting_for_completion()");
     _waiting_count++;
   }
   // Indicates that a thread stopped waiting for this task to complete. Must have lock to use this.
   void dec_waiting_for_completion() {
-    assert(_lock->owned_by_self(), "must have lock to use dec_waiting_for_completion()");
+    assert(CompileTaskWait_lock->owned_by_self(), "must have lock to use dec_waiting_for_completion()");
     assert(_waiting_count > 0, "waiting count is not positive");
     _waiting_count--;
   }
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index eb57d0f9744..36e0cfe1125 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -79,6 +79,7 @@ Mutex*   MarkStackChunkList_lock      = nullptr;
 Mutex*   MonitoringSupport_lock       = nullptr;
 Monitor* ConcurrentGCBreakpoints_lock = nullptr;
 Mutex*   Compile_lock                 = nullptr;
+Monitor* CompileTaskWait_lock         = nullptr;
 Monitor* MethodCompileQueue_lock      = nullptr;
 Monitor* CompileThread_lock           = nullptr;
 Monitor* Compilation_lock             = nullptr;
@@ -342,7 +343,9 @@ void mutex_init() {
     MUTEX_DEFL(G1RareEvent_lock             , PaddedMutex  , Threads_lock, true);
   }
 
-  MUTEX_DEFL(CompileTaskAlloc_lock          , PaddedMutex  ,  MethodCompileQueue_lock);
+  MUTEX_DEFL(CompileTaskAlloc_lock          , PaddedMutex  , MethodCompileQueue_lock);
+  MUTEX_DEFL(CompileTaskWait_lock           , PaddedMonitor, MethodCompileQueue_lock);
+
 #if INCLUDE_PARALLELGC
   if (UseParallelGC) {
     MUTEX_DEFL(PSOldGenExpand_lock          , PaddedMutex  , Heap_lock, true);
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index bc36db00dc3..6baa93b2579 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -86,6 +86,7 @@ extern Monitor* Compilation_lock;                // a lock used to pause compila
 extern Mutex*   TrainingData_lock;               // a lock used when accessing training records
 extern Monitor* TrainingReplayQueue_lock;        // a lock held when class are added/removed to the training replay queue
 extern Mutex*   CompileTaskAlloc_lock;           // a lock held when CompileTasks are allocated
+extern Monitor* CompileTaskWait_lock;            // a lock held when CompileTasks are waited/notified
 extern Mutex*   CompileStatistics_lock;          // a lock held when updating compilation statistics
 extern Mutex*   DirectivesStack_lock;            // a lock held when mutating the dirstack and ref counting directives
 extern Monitor* Terminator_lock;                 // a lock used to guard termination of the vm

From a4eb15195ceeadf311fe81e622a54f4733b90df2 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 2 Jun 2025 15:24:09 +0000
Subject: [PATCH 778/901] 8357672: Extreme font sizes can cause font
 substitution

Reviewed-by: dmarkov, jdv
---
 .../classes/sun/font/FileFontStrike.java      |   1 -
 .../native/libfontmanager/freetypeScaler.c    |   1 -
 .../awt/FontMetrics/ExtremeFontSizeTest.java  | 112 ++++++++++++++++--
 3 files changed, 102 insertions(+), 12 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index 37910a41272..01e682e8390 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -193,7 +193,6 @@ public class FileFontStrike extends PhysicalStrike {
             this.disposer = new FontStrikeDisposer(fileFont, desc);
             initGlyphCache();
             pScalerContext = NullFontScaler.getNullScalerContext();
-            SunFontManager.getInstance().deRegisterBadFont(fileFont);
             return;
         }
         /* First, see if native code should be used to create the glyph.
diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
index 8b7e147c72c..f46b8a45aca 100644
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -532,7 +532,6 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
 
     if (context == NULL) {
         free(context);
-        invalidateJavaScaler(env, scaler, NULL);
         return (jlong) 0;
     }
     (*env)->GetDoubleArrayRegion(env, matrix, 0, 4, dmat);
diff --git a/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
index caa365a3f21..f596f710831 100644
--- a/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.java
+++ b/test/jdk/java/awt/FontMetrics/ExtremeFontSizeTest.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
@@ -24,16 +24,19 @@
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Map;
 
 /*
  * @test
- * @bug 8328896
+ * @bug 8328896 8357672
  * @summary test that using very large font sizes used don't break later uses
  */
 
@@ -49,34 +52,106 @@ public class ExtremeFontSizeTest {
     static double[] scales = { 1.0, 900.0};
     static boolean[] fms = { false, true };
 
+    static class Key {
+        int fontSize;
+        double scale;
+        boolean fm;
+        String str;
+
+
+        Key(int fs, double sc, boolean f, String s) {
+            fontSize = fs;
+            scale = sc;
+            fm = f;
+            str = s;
+        }
+
+        public boolean equals(Object o) {
+           return
+               (o instanceof Key k) &&
+                this.fontSize == k.fontSize &&
+                this.scale == k.scale &&
+                this.fm == k.fm &&
+                this.str.equals(k.str);
+        }
+
+        public int hashCode() {
+           return fontSize + (int)scale + (fm ? 1 : 0) + str.hashCode();
+        }
+    }
+
+    static class Value {
+        int height;
+        double strBounds;
+        Rectangle pixelBounds;
+        Rectangle2D visualBounds;
+
+        Value(int h, double sb, Rectangle pb, Rectangle2D vb) {
+            height = h;
+            strBounds = sb;
+            pixelBounds = pb;
+            visualBounds = vb;
+        }
+
+        public boolean equals(Object o) {
+           return
+               (o instanceof Value v) &&
+                this.height == v.height &&
+                this.strBounds == v.strBounds &&
+                this.pixelBounds.equals(v.pixelBounds) &&
+                this.visualBounds.equals(v.visualBounds);
+        }
+
+        public int hashCode() {
+           return height + (int)strBounds + pixelBounds.hashCode() + visualBounds.hashCode();
+        }
+    }
+
+    static Map<Key, Value> metricsMap = new HashMap<Key, Value>();
+
     public static void main(String[] args) {
+        Font[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
+        for (Font f : fonts) {
+            font = f.deriveFont(Font.PLAIN, 12);
+            System.out.println("Test font : " + font);
+            if (font.canDisplayUpTo(testString) != -1) {
+                System.out.println("Skipping since cannot display test string");
+                continue;
+            }
+            metricsMap = new HashMap<Key, Value>();
+            testFont();
+        }
+    }
+
+    static void testFont() {
 
         /* run tests validating bounds etc are non-zero
          * then run with extreme scales for which zero is allowed - but not required
          * then run the first tests again to be sure they are still reasonable.
         */
-        runTests();
-        test(5_000_000, 10_000, false, testString, false);
-        test(5_000_000, 10_000, true, testString, false);
-        test(0, 0.00000001, false, testString, false);
-        runTests();
+        runTests(true, false);
+        test(5_000_000, 10_000, false, testString, false, false, false);
+        test(5_000_000, 10_000, true, testString, false, false, false);
+        test(0, 0.00000001, false, testString, false, false, false);
+        runTests(false, true);
 
         if (failed) {
             throw new RuntimeException("Test failed. Check stdout log.");
         }
     }
 
-    static void runTests() {
+    static void runTests(boolean add, boolean check) {
         for (int fontSize : fontSizes) {
             for (double scale : scales) {
                 for (boolean fm : fms) {
-                    test(fontSize, scale, fm, testString, true);
+                    test(fontSize, scale, fm, testString, true, add, check);
                 }
             }
         }
     }
 
-    static void test(int size, double scale, boolean fm, String str, boolean checkAll) {
+    static void test(int size, double scale, boolean fm, String str,
+                     boolean checkAll, boolean add, boolean check) {
 
         AffineTransform at = AffineTransform.getScaleInstance(scale, scale);
         FontRenderContext frc = new FontRenderContext(at, false, fm);
@@ -114,5 +189,22 @@ static void test(int size, double scale, boolean fm, String str, boolean checkAl
             System.out.println(" *** RESULTS NOT AS EXPECTED  *** ");
         }
         System.out.println();
+
+        Key k = null;
+        Value v = null;
+        if (add || check) {
+             k = new Key(size, scale, fm, str);
+             v = new Value(height, width, pixelBounds, visualBounds);
+        }
+        if (add) {
+             metricsMap.put(k, v);
+        }
+        if (check) {
+            Value vmap = metricsMap.get(k);
+            if (!v.equals(vmap)) {
+               failed = true;
+               System.out.println("Values differ");
+            }
+        }
     }
 }

From daab7b5ceeb12222bda709e35699e620b98cb74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 2 Jun 2025 15:27:14 +0000
Subject: [PATCH 779/901] 8357796: Stylesheet adjustments after JDK-8357452

Reviewed-by: rriggs
---
 .../internal/doclets/formats/html/resources/stylesheet.css     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 08cd78dad78..2c10cb3bc6f 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
@@ -23,7 +23,7 @@
     /* Base font sizes for body and code elements */
     --body-font-size: 14.2px;
     --block-font-size: 14.4px;
-    --code-font-size: 13.9px;
+    --code-font-size: 14px;
     --nav-font-size: 13.4px;
     /* Line height for continuous text blocks */
     --block-line-height: 1.5;
@@ -606,6 +606,7 @@ 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;

From 1b6ae2059b0475ec78559d2d6612f3b6ec68309f Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Mon, 2 Jun 2025 15:29:30 +0000
Subject: [PATCH 780/901] 8357576: FieldInfo::_index is not initialized by the
 constructor

Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/oops/fieldInfo.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/oops/fieldInfo.hpp b/src/hotspot/share/oops/fieldInfo.hpp
index d2fd79332a9..8740d539c8f 100644
--- a/src/hotspot/share/oops/fieldInfo.hpp
+++ b/src/hotspot/share/oops/fieldInfo.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
@@ -137,7 +137,8 @@ class FieldInfo {
 
  public:
 
-  FieldInfo() : _name_index(0),
+  FieldInfo() : _index(0),
+                _name_index(0),
                 _signature_index(0),
                 _offset(0),
                 _access_flags(AccessFlags(0)),
@@ -147,6 +148,7 @@ class FieldInfo {
                 _contention_group(0) { }
 
   FieldInfo(AccessFlags access_flags, u2 name_index, u2 signature_index, u2 initval_index, FieldInfo::FieldFlags fflags) :
+            _index(0),
             _name_index(name_index),
             _signature_index(signature_index),
             _offset(0),

From 99a4b22ae7dc2755df1780cc7d74c5d6e3cd4cd4 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Mon, 2 Jun 2025 16:48:16 +0000
Subject: [PATCH 781/901] 8358102: GenShen: Age tables could be seeded with
 cumulative values

Reviewed-by: ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
index d393c17f64a..b1d474fa78d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacTracker.cpp
@@ -154,7 +154,7 @@ ShenandoahCycleStats ShenandoahEvacuationTracker::flush_cycle_to_global() {
     // for use in the next cycle.
     // The first argument is used for any age 0 cohort population that we may otherwise have
     // missed during the census. This is non-zero only when census happens at marking.
-    ShenandoahGenerationalHeap::heap()->age_census()->update_census(0, _mutators_global.age_table(), _workers_global.age_table());
+    ShenandoahGenerationalHeap::heap()->age_census()->update_census(0, mutators.age_table(), workers.age_table());
   }
 
   return {workers, mutators};

From ab5de45636f0bf96e52c0ae0dcf080f279d9caee Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 2 Jun 2025 16:50:10 +0000
Subject: [PATCH 782/901] 8357991: make bootcycle-images is broken after
 JDK-8349665

Reviewed-by: erikj
---
 make/Main.gmk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index 6a800a2edd5..c1b84dc1855 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -417,12 +417,22 @@ $(eval $(call SetupTarget, create-source-revision-tracker, \
 ))
 
 BOOTCYCLE_TARGET := product-images
+BOOTCYCLE_SPEC := $(dir $(SPEC))bootcycle-spec.gmk
+
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
+          # We need to create essential files for the bootcycle spec dir
+	  ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \
+	         SPEC=$(BOOTCYCLE_SPEC))
+	  ( cd $(TOPDIR) && \
+	        $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \
+	        SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	        create-main-targets-include )
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
-	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif

From 8b6a11f7e05ee0cece798c5ff6646bddbee04900 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Mon, 2 Jun 2025 16:51:44 +0000
Subject: [PATCH 783/901] 8352187: Don't start management agent during AOT
 cache creation

Reviewed-by: shade, iklam, kvn
---
 src/hotspot/share/runtime/threads.cpp         | 23 +++++--
 .../cds/appcds/aotCache/ManagementAgent.java  | 64 +++++++++++++++++++
 2 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/ManagementAgent.java

diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 987db37e9d5..8d8d4782e94 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -847,13 +847,22 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   JFR_ONLY(Jfr::on_create_vm_3();)
 
 #if INCLUDE_MANAGEMENT
-  Management::initialize(THREAD);
-
-  if (HAS_PENDING_EXCEPTION) {
-    // management agent fails to start possibly due to
-    // configuration problem and is responsible for printing
-    // stack trace if appropriate. Simply exit VM.
-    vm_exit(1);
+  bool start_agent = true;
+#if INCLUDE_CDS
+  start_agent = !CDSConfig::is_dumping_final_static_archive();
+  if (!start_agent) {
+    log_info(aot)("Not starting management agent during creation of AOT cache.");
+  }
+#endif // INCLUDE_CDS
+  if (start_agent) {
+    Management::initialize(THREAD);
+
+    if (HAS_PENDING_EXCEPTION) {
+      // management agent fails to start possibly due to
+      // configuration problem and is responsible for printing
+      // stack trace if appropriate. Simply exit VM.
+      vm_exit(1);
+    }
   }
 #endif // INCLUDE_MANAGEMENT
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ManagementAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ManagementAgent.java
new file mode 100644
index 00000000000..abbdd3551b7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ManagementAgent.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+
+/*
+ * @test
+ * @bug 8352187
+ * @summary ManagementAgent will not be started during AOT cache creation.
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/lib
+ * @build HelloAOTCache
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar HelloAOTCacheApp
+ * @run driver ManagementAgent
+ */
+
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ManagementAgent {
+    public static void main(String... args) throws Exception {
+        SimpleCDSAppTester.of("HelloAOTCache-with-management-agent")
+            // test with the initialization of a management agent
+            .addVmArgs("-Xlog:class+load", "-Dcom.sun.management.jmxremote=true")
+            .classpath("app.jar")
+            .appCommandLine("HelloAOTCacheApp")
+            .setAssemblyChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("Not starting management agent during creation of AOT cache.");
+                })
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldMatch("class,load.*HelloAOTCacheApp.*shared objects");
+                    out.shouldContain("HelloWorld");
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class HelloAOTCacheApp {
+    public static void main(String[] args) {
+        System.out.println("HelloWorld");
+    }
+}

From bce2bd24ef64e71d895bbf4d91693b30a285746b Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 2 Jun 2025 16:52:05 +0000
Subject: [PATCH 784/901] 8356308: Assert with -Xlog:class+path when classpath
 has an empty element

Reviewed-by: dholmes, ccheung
---
 src/hotspot/share/cds/aotClassLocation.cpp    | 37 ++++++++---
 src/hotspot/share/cds/aotClassLocation.hpp    |  3 +-
 src/hotspot/share/cds/filemap.cpp             |  2 +-
 .../share/utilities/classpathStream.cpp       | 38 ++++++++---
 .../share/utilities/classpathStream.hpp       | 23 +++----
 .../cds/appcds/PrintSharedArchiveAndExit.java |  6 +-
 .../cds/appcds/aotCache/ClassPathLogging.java | 64 +++++++++++++++++++
 7 files changed, 138 insertions(+), 35 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotCache/ClassPathLogging.java

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index 192791ebd9c..b662c5a1b47 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -464,6 +464,7 @@ void AOTClassLocationConfig::dumptime_init_helper(TRAPS) {
   AOTClassLocation* jrt = AOTClassLocation::allocate(THREAD, ClassLoader::get_jrt_entry()->name(),
                                                0, Group::MODULES_IMAGE,
                                                /*from_cpattr*/false, /*is_jrt*/true);
+  log_info(class, path)("path [%d] = (modules image)", tmp_array.length());
   tmp_array.append(jrt);
 
   parse(THREAD, tmp_array, all_css.boot_cp(), Group::BOOT_CLASSPATH, /*parse_manifest*/true);
@@ -573,6 +574,7 @@ void AOTClassLocationConfig::parse(JavaThread* current, GrowableClassLocationArr
 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);
+  log_info(class, path)("path [%d] = %s%s", tmp_array.length(), path, from_cpattr ? " (from cpattr)" : "");
   tmp_array.append(cs);
 
   if (!parse_manifest) {
@@ -726,6 +728,8 @@ bool AOTClassLocationConfig::is_valid_classpath_index(int classpath_index, Insta
 }
 
 AOTClassLocationConfig* AOTClassLocationConfig::write_to_archive() const {
+  log_locations(CDSConfig::output_archive_path(), /*is_write=*/true);
+
   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());
@@ -773,7 +777,7 @@ bool AOTClassLocationConfig::check_classpaths(bool is_boot_classpath, bool has_a
       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(),
+    log_info(class, path)("Checking [%d] '%s' %s%s", i, 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()) {
@@ -961,11 +965,14 @@ bool AOTClassLocationConfig::need_lcp_match_helper(int start, int end, ClassLoca
   return true;
 }
 
-bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_extra_module_paths) const {
+bool AOTClassLocationConfig::validate(const char* cache_filename, bool has_aot_linked_classes, bool* has_extra_module_paths) const {
   ResourceMark rm;
   AllClassLocationStreams all_css;
 
+  log_locations(cache_filename, /*is_write=*/false);
+
   const char* jrt = ClassLoader::get_jrt_entry()->name();
+  log_info(class, path)("Checking [0] (modules image)");
   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) {
@@ -1036,6 +1043,17 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
   return success;
 }
 
+void AOTClassLocationConfig::log_locations(const char* cache_filename, bool is_write) const {
+  if (log_is_enabled(Info, class, path)) {
+    LogStreamHandle(Info, class, path) st;
+    st.print_cr("%s classpath(s) %s %s (size = %d)",
+                is_write ? "Writing" : "Reading",
+                is_write ? "into" : "from",
+                cache_filename, class_locations()->length());
+    print_on(&st);
+  }
+}
+
 void AOTClassLocationConfig::print() {
   if (CDSConfig::is_dumping_archive()) {
     tty->print_cr("AOTClassLocationConfig::_dumptime_instance = %p", _dumptime_instance);
@@ -1052,8 +1070,15 @@ void AOTClassLocationConfig::print() {
 }
 
 void AOTClassLocationConfig::print_on(outputStream* st) const {
+  const char* type = "boot";
   int n = class_locations()->length();
   for (int i = 0; i < n; i++) {
+    if (i >= boot_cp_end_index()) {
+      type = "app";
+    }
+    if (i >= app_cp_end_index()) {
+      type = "module";
+    }
     const AOTClassLocation* cs = class_location_at(i);
     const char* path;
     if (i == 0) {
@@ -1061,12 +1086,6 @@ void AOTClassLocationConfig::print_on(outputStream* st) const {
     } else {
       path = cs->path();
     }
-    st->print_cr("[%d] = %s", i, path);
-    if (i == boot_cp_end_index() && i < n) {
-      st->print_cr("--- end of boot");
-    }
-    if (i == app_cp_end_index() && i < n) {
-      st->print_cr("--- end of app");
-    }
+    st->print_cr("(%-6s) [%d] = %s", type, i, path);
   }
 }
diff --git a/src/hotspot/share/cds/aotClassLocation.hpp b/src/hotspot/share/cds/aotClassLocation.hpp
index f93bb899a4c..460788930a4 100644
--- a/src/hotspot/share/cds/aotClassLocation.hpp
+++ b/src/hotspot/share/cds/aotClassLocation.hpp
@@ -204,6 +204,7 @@ class AOTClassLocationConfig : public CHeapObj<mtClassShared> {
                                 const char* prepend, size_t prepend_len) const;
 
   void print_on(outputStream* st) const;
+  void log_locations(const char* cache_filename, bool is_writing) const;
 
 public:
   static AOTClassLocationConfig* dumptime() {
@@ -269,7 +270,7 @@ class AOTClassLocationConfig : public CHeapObj<mtClassShared> {
   AOTClassLocationConfig* write_to_archive() const;
 
   // Functions used only during runtime
-  bool validate(bool has_aot_linked_classes, bool* has_extra_module_paths) const;
+  bool validate(const char* cache_filename, bool has_aot_linked_classes, bool* has_extra_module_paths) const;
 
   bool is_valid_classpath_index(int classpath_index, InstanceKlass* ik);
 
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 723b5298646..a413aa2d8e8 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -325,7 +325,7 @@ bool FileMapInfo::validate_class_location() {
 
   AOTClassLocationConfig* config = header()->class_location_config();
   bool has_extra_module_paths = false;
-  if (!config->validate(header()->has_aot_linked_classes(), &has_extra_module_paths)) {
+  if (!config->validate(full_path(), header()->has_aot_linked_classes(), &has_extra_module_paths)) {
     if (PrintSharedArchiveAndExit) {
       MetaspaceShared::set_archive_loading_failed();
       return true;
diff --git a/src/hotspot/share/utilities/classpathStream.cpp b/src/hotspot/share/utilities/classpathStream.cpp
index cf0b84b18fb..8581c7831ab 100644
--- a/src/hotspot/share/utilities/classpathStream.cpp
+++ b/src/hotspot/share/utilities/classpathStream.cpp
@@ -26,18 +26,40 @@
 #include "runtime/os.hpp"
 #include "utilities/classpathStream.hpp"
 
+ClasspathStream::ClasspathStream(const char* classpath) {
+  _cp = classpath;
+  skip_blank_paths();
+}
+
+char ClasspathStream::separator() {
+  // All supported platforms have a single character path separator.
+  return os::path_separator()[0];
+}
+
+void ClasspathStream::skip_blank_paths() {
+  while (*_cp == separator()) {
+    _cp++;
+  }
+}
+
 const char* ClasspathStream::get_next() {
-  while (_class_path[_end] != '\0' && _class_path[_end] != os::path_separator()[0]) {
-    _end++;
+  assert(has_next(), "call this only after you checked has_next()");
+  assert(*_cp != separator(), "ensured by constructor and get_next()");
+
+  const char* end = _cp + 1;
+  while (*end != separator() && *end != '\0') {
+    end++;
   }
-  int path_len = _end - _start;
+
+  int path_len = end - _cp;
   char* path = NEW_RESOURCE_ARRAY(char, path_len + 1);
-  strncpy(path, &_class_path[_start], path_len);
+  strncpy(path, _cp, path_len);
   path[path_len] = '\0';
 
-  while (_class_path[_end] == os::path_separator()[0]) {
-    _end++;
-  }
-  _start = _end;
+  assert(strlen(path) > 0, "must be");
+
+  _cp = end;
+  skip_blank_paths();
+
   return path;
 }
diff --git a/src/hotspot/share/utilities/classpathStream.hpp b/src/hotspot/share/utilities/classpathStream.hpp
index 3c29a07262d..87f7649872d 100644
--- a/src/hotspot/share/utilities/classpathStream.hpp
+++ b/src/hotspot/share/utilities/classpathStream.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 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
@@ -26,23 +26,20 @@
 #define SHARE_UTILITIES_CLASSPATHSTREAM_HPP
 
 class ClasspathStream : public StackObj {
-  const char* _class_path;
-  int _len;
-  int _start;
-  int _end;
-
+  const char* _cp;
+  static char separator();
+  void skip_blank_paths();
 public:
-  ClasspathStream(const char* class_path) {
-    _class_path = class_path;
-    _len = (int)strlen(class_path);
-    _start = 0;
-    _end = 0;
-  }
+  // The caller should ensure that class_path is alive during the
+  // lifetime of this ClasspathStream.
+  ClasspathStream(const char* class_path);
 
   bool has_next() {
-    return _start < _len;
+    return *_cp != '\0';
   }
 
+  // Call this only after you checked has_next().
+  // Returns a resource-allocated string.
   const char* get_next();
 };
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
index c0dce14ab82..23dcc7e5fcf 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
@@ -59,9 +59,9 @@ 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 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
+    String firstCheckShortMsg = "Checking [1] 'hello.jar' file"; // the first JAR to check (without directory prefix)
+    String firstCheckMsg = "Checking [1] '" + appJar + "' file"; // the first JAR to check
+    String lastCheckMsg = "Checking [2] '" + appJar2 + "' file"; // the last JAR to check
 
     TestCommon.testDump(cp, TestCommon.list("Hello", "HelloMore"));
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ClassPathLogging.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ClassPathLogging.java
new file mode 100644
index 00000000000..0d5bca34d68
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ClassPathLogging.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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+
+/*
+ * @test
+ * @summary verify the output of -Xlog:class+path when using AOT cache
+ * @bug 8356308
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.flagless
+ * @library /test/lib
+ * @build ClassPathLogging
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar ClassPathLoggingApp
+ * @run driver ClassPathLogging
+ */
+
+import java.io.File;
+import jdk.test.lib.cds.SimpleCDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ClassPathLogging {
+    public static void main(String... args) throws Exception {
+        String sep = File.pathSeparator;
+        SimpleCDSAppTester.of("ClassPathLogging")
+            .addVmArgs("-Xlog:class+path=debug")
+            .classpath(sep + "foo.jar" + sep + sep + sep + "app.jar" + sep) // all empty paths should be skipped.
+            .appCommandLine("ClassPathLoggingApp")
+            .setProductionChecker((OutputAnalyzer out) -> {
+                    out.shouldContain("HelloWorld")
+                       .shouldContain("Reading classpath(s) from ClassPathLogging.aot (size = 3)")
+                       .shouldMatch("boot.*0.*=.*modules")
+                       .shouldContain("(app   ) [1] = foo.jar")
+                       .shouldContain("(app   ) [2] = app.jar");
+                })
+            .runAOTWorkflow();
+    }
+}
+
+class ClassPathLoggingApp {
+    public static void main(String[] args) {
+        System.out.println("HelloWorld");
+    }
+}

From a7671e7360ce23df9577110266e66a1c1a790196 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 2 Jun 2025 17:06:45 +0000
Subject: [PATCH 785/901] 8358337: JDK-8357991 was committed with incorrect
 indentation

Reviewed-by: shade
---
 make/Main.gmk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index c1b84dc1855..386bd226842 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -425,12 +425,12 @@ bootcycle-images:
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
           # We need to create essential files for the bootcycle spec dir
 	  ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \
-	         SPEC=$(BOOTCYCLE_SPEC))
+	      $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \
+	      SPEC=$(BOOTCYCLE_SPEC))
 	  ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \
-	        SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \
-	        create-main-targets-include )
+	      $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \
+	      SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	      create-main-targets-include )
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
 	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
         else

From ec02a87aeef008f6b2f94001fa33bac66bf24627 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Mon, 2 Jun 2025 18:13:24 +0000
Subject: [PATCH 786/901] 8345745: Update mode of the Attach API communication
 pipe.

Reviewed-by: sspitsyn, kevinw
---
 .../windows/native/libattach/VirtualMachineImpl.c        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
index dc1b0f6e79a..b5b87b2cc91 100644
--- a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
@@ -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
@@ -291,11 +291,12 @@ JNIEXPORT jlong JNICALL Java_sun_tools_attach_VirtualMachineImpl_createPipe
 
     hPipe = CreateNamedPipe(
           name,                         // pipe name
-          ver == 1 ? PIPE_ACCESS_INBOUND  // read access
-                   : PIPE_ACCESS_DUPLEX,  // read-write access
+          (ver == 1 ? PIPE_ACCESS_INBOUND : PIPE_ACCESS_DUPLEX) | // read or read-write access
+            FILE_FLAG_FIRST_PIPE_INSTANCE,
           PIPE_TYPE_BYTE |              // byte mode
             PIPE_READMODE_BYTE |
-            PIPE_WAIT,                  // blocking mode
+            PIPE_WAIT |                 // blocking mode
+            PIPE_REJECT_REMOTE_CLIENTS,
           1,                            // max. instances
           128,                          // output buffer size
           8192,                         // input buffer size

From 1373ceb7f3040a03ae142cfaab0f74894fc6a0a3 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 2 Jun 2025 18:22:35 +0000
Subject: [PATCH 787/901] 8356698: JFR: @Contextual

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/Contextual.java     |  67 +++
 .../jdk/jfr/events/MethodTraceEvent.java      |   2 +
 .../jdk/jfr/internal/MetadataRepository.java  |   6 +-
 .../jdk/jfr/internal/tool/PrettyWriter.java   | 182 +++++++-
 .../jdk/jfr/snippet-files/Snippets.java       |  34 ++
 .../jdk/jdk/jfr/tool/TestPrintContextual.java | 420 ++++++++++++++++++
 6 files changed, 703 insertions(+), 8 deletions(-)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/Contextual.java
 create mode 100644 test/jdk/jdk/jfr/tool/TestPrintContextual.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Contextual.java b/src/jdk.jfr/share/classes/jdk/jfr/Contextual.java
new file mode 100644
index 00000000000..92deeb8d562
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Contextual.java
@@ -0,0 +1,67 @@
+package jdk.jfr;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Event field annotation, specifies that the value carries contextual
+ * information.
+ * <p>
+ * Contextual information is data that applies to all events happening in the
+ * same thread from the beginning to the end of the event with a field annotated
+ * with {@code Contextual}.
+ * <p>
+ * For example, to trace requests or transactions in a system, a trace event can
+ * be created to provide context.
+ * {@snippet class = "Snippets" region = "ContextualTrace"}
+ * <p>
+ * To track details within an order service, an order event can be created where
+ * only the order ID provides context.
+ * {@snippet class = "Snippets" region = "ContextualOrder"}
+ * <p>
+ * If an order in the order service stalls due to lock contention, a user
+ * interface can display contextual information together with the
+ * JavaMonitorEnter event to simplify troubleshooting, for example:
+ * {@snippet lang=text :
+ *   $ jfr print --events JavaMonitorEnter recording.jfr
+ *   jdk.JavaMonitorEnter {
+ *     Context: Trace.id = "00-0af7651916cd43dd8448eb211c80319c-00f067aa0ba902b7-01"
+ *     Context: Trace.name = "POST /checkout/place-order"
+ *     Context: Order.id = 314159
+ *     startTime = 17:51:29.038 (2025-02-07)
+ *     duration = 50.56 ms
+ *     monitorClass = java.util.ArrayDeque (classLoader = bootstrap)
+ *    previousOwner = "Order Thread" (javaThreadId = 56209, virtual = true)
+ *    address = 0x60000232ECB0
+ *    eventThread = "Order Thread" (javaThreadId = 52613, virtual = true)
+ *    stackTrace = [
+ *      java.util.zip.ZipFile$CleanableResource.getInflater() line: 685
+ *      java.util.zip.ZipFile$ZipFileInflaterInputStream.<init>(ZipFile) line: 388
+ *      java.util.zip.ZipFile.getInputStream(ZipEntry) line: 355
+ *      java.util.jar.JarFile.getInputStream(ZipEntry) line: 833
+ *      ...
+ *    ]
+ *   }
+ * }
+ * <p>
+ * The difference between {@link Relational} and {@link Contextual} annotations
+ * is that {@link Relational} ties event data together to form a global data
+ * structure, similar to a foreign key in a relational database, but
+ * {@link Contextual} represents a state that applies to all events that happen
+ * at the same time, in the same thread. A field can be both contextual and
+ * relational at the same time.
+ * <p>
+ * A contextual field may incur overhead on a parser reading a recording file,
+ * since it must track active context, so it should be used sparingly and only
+ * where appropriate.
+ *
+ * @since 25
+ */
+@MetadataDefinition
+@Label("Context")
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface Contextual {
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java
index b76c6c41738..a56de3e6fca 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTraceEvent.java
@@ -25,6 +25,7 @@
 package jdk.jfr.events;
 
 import jdk.jfr.Category;
+import jdk.jfr.Contextual;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
@@ -35,6 +36,7 @@
 @StackTrace(true)
 public final class MethodTraceEvent extends AbstractJDKEvent {
 
+    @Contextual
     @Label("Method")
     private long method;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 1c9c985fb26..5dcf07f719d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -205,7 +205,11 @@ private EventConfiguration makeConfiguration(Class<? extends jdk.internal.event.
                     nativeEventTypes.remove(n);
                     nativeControls.remove(n);
                     TypeLibrary.removeType(nativeType.getId());
-                    pEventType.setFields(nativeType.getFields());
+                    PrivateAccess access = PrivateAccess.getInstance();
+                    for (int i = 0; i < nativeFields.size(); i++) {
+                        access.setAnnotations(nativeFields.get(i), eventFields.get(i).getAnnotationElements());
+                    }
+                    pEventType.setFields(nativeFields);
                 }
             }
         }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
index faa4a8ec23a..274a21d9b49 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.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
@@ -25,15 +25,26 @@
 
 package jdk.jfr.internal.tool;
 
+import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.file.Path;
 import java.time.Duration;
+import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.SequencedSet;
 import java.util.StringJoiner;
 
+import jdk.jfr.Contextual;
 import jdk.jfr.DataAmount;
+import jdk.jfr.EventType;
 import jdk.jfr.Frequency;
 import jdk.jfr.MemoryAddress;
 import jdk.jfr.Percentage;
@@ -46,7 +57,7 @@
 import jdk.jfr.consumer.RecordedObject;
 import jdk.jfr.consumer.RecordedStackTrace;
 import jdk.jfr.consumer.RecordedThread;
-import jdk.jfr.internal.Type;
+import jdk.jfr.consumer.RecordingFile;
 import jdk.jfr.internal.util.ValueFormatter;
 
 /**
@@ -55,10 +66,60 @@
  * This class is also used by {@link RecordedObject#toString()}
  */
 public final class PrettyWriter extends EventPrintWriter {
-    private static final String TYPE_OLD_OBJECT = Type.TYPES_PREFIX + "OldObject";
+    private static record Timestamp(RecordedEvent event, long seconds, int nanosCompare, boolean contextual) implements Comparable<Timestamp> {
+        // If the start timestamp from a contextual event has the same start timestamp
+        // as an ordinary instant event, the contextual event should be processed first
+        // One way to ensure this is to multiply the nanos value and add 1 ns to the end
+        // timestamp so the context event always comes first in a comparison.
+        // This also prevents a contextual start time to be processed after a contextual
+        // end time, if the event is instantaneous.
+        public static Timestamp createStart(RecordedEvent event, boolean contextual) {
+            Instant time = event.getStartTime(); // Method allocates, so store seconds and nanos
+            return new Timestamp(event, time.getEpochSecond(), 2 * time.getNano(), contextual);
+        }
+
+        public static Timestamp createEnd(RecordedEvent event, boolean contextual) {
+            Instant time = event.getEndTime(); // Method allocates, so store seconds and nanos
+            return new Timestamp(event, time.getEpochSecond(), 2 * time.getNano() + 1, contextual);
+        }
+
+        public boolean start() {
+            return (nanosCompare & 1L) == 0;
+        }
+
+        @Override
+        public int compareTo(Timestamp that) {
+            // This is taken from Instant::compareTo
+            int cmp = Long.compare(seconds, that.seconds);
+            if (cmp != 0) {
+                return cmp;
+            }
+            return nanosCompare - that.nanosCompare;
+        }
+    }
+
+    private static record TypeInformation(Long id, List<ValueDescriptor> contextualFields, boolean contextual, String simpleName) {
+    }
+
+    private static final SequencedSet<RecordedEvent> EMPTY_SET = new LinkedHashSet<>();
+    private static final String TYPE_OLD_OBJECT = "jdk.types.OldObject";
     private static final DateTimeFormatter TIME_FORMAT_EXACT = DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSSSSS (yyyy-MM-dd)");
     private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss.SSS (yyyy-MM-dd)");
     private static final Long ZERO = 0L;
+    // Rationale for using one million events in the window.
+    // Events in JFR arrive in batches. The commit time (end time) of an
+    // event in batch N typically doesn't come before any events in batch N - 1,
+    // but it can't be ruled out completely. Data is also partitioned into chunks,
+    // typically 16 MB each. Within a chunk, there must be at least one batch.
+    // The size of an event is typically more than 16 bytes, so an
+    // EVENT_WINDOW_SIZE of 1 000 000 events will likely cover more than one batch.
+    // Having at least two batches in a window avoids boundary issues.
+    // At the same time, a too large window, means it will take more time
+    // before the first event is printed and the tool will feel unresponsive.
+    private static final int EVENT_WINDOW_SIZE = 1_000_000;
+    private final PriorityQueue<Timestamp> timeline = new PriorityQueue<>(EVENT_WINDOW_SIZE + 4);
+    private final Map<Long, TypeInformation> typeInformation = new HashMap<>();
+    private final Map<Long, SequencedSet<RecordedEvent>> contexts = new HashMap<>();
     private final boolean showExact;
     private RecordedEvent currentEvent;
 
@@ -71,19 +132,110 @@ public PrettyWriter(PrintWriter destination) {
         this(destination, false);
     }
 
+    void print(Path source) throws IOException {
+        printBegin();
+        int counter = 0;
+        try (RecordingFile file = new RecordingFile(source)) {
+            while (file.hasMoreEvents()) {
+                RecordedEvent event = file.readEvent();
+                if (typeInformation(event).contextual()) {
+                    timeline.add(Timestamp.createStart(event, true));
+                    timeline.add(Timestamp.createEnd(event, true));
+                }
+                if (acceptEvent(event)) {
+                    timeline.add(Timestamp.createEnd(event, false));
+                }
+                // There should not be a limit on the size of the recording files that
+                // the 'jfr' tool can process. To avoid OutOfMemoryError and time complexity
+                // issues on large recordings, a window size must be set when sorting
+                // and processing contextual events.
+                while (timeline.size() > EVENT_WINDOW_SIZE) {
+                    print(timeline.remove());
+                    flush(false);
+                }
+                if ((++counter % EVENT_WINDOW_SIZE) == 0) {
+                    contexts.entrySet().removeIf(c -> c.getValue().isEmpty());
+                }
+            }
+            while (!timeline.isEmpty()) {
+                print(timeline.remove());
+            }
+        }
+        printEnd();
+        flush(true);
+    }
+
+    private TypeInformation typeInformation(RecordedEvent event) {
+        long id = event.getEventType().getId();
+        TypeInformation ti = typeInformation.get(id);
+        if (ti == null) {
+            ti = createTypeInformation(event.getEventType());
+            typeInformation.put(ti.id(), ti);
+        }
+        return ti;
+    }
+
+    private TypeInformation createTypeInformation(EventType eventType) {
+        ArrayList<ValueDescriptor> contextualFields = new ArrayList<>();
+        for (ValueDescriptor v : eventType.getFields()) {
+            if (v.getAnnotation(Contextual.class) != null) {
+                contextualFields.add(v);
+            }
+        }
+        contextualFields.trimToSize();
+        String name = eventType.getName();
+        String simpleName = name.substring(name.lastIndexOf(".") + 1);
+        boolean contextual = contextualFields.size() > 0;
+        return new TypeInformation(eventType.getId(), contextualFields, contextual, simpleName);
+    }
+
+    private void print(Timestamp t) {
+        RecordedEvent event = t.event();
+        RecordedThread rt = event.getThread();
+        if (rt != null) {
+            processThreadedTimestamp(rt, t);
+        } else {
+            if (!t.contextual()) {
+                print(event);
+            }
+        }
+    }
+
+    public void processThreadedTimestamp(RecordedThread thread, Timestamp t) {
+        RecordedEvent event = t.event();
+        var contextEvents = contexts.computeIfAbsent(thread.getId(), k -> new LinkedHashSet<>(1));
+        if (t.contextual) {
+            if (t.start()) {
+                contextEvents.add(event);
+            } else {
+                contextEvents.remove(event);
+            }
+            return;
+        }
+        if (typeInformation(event).contextual()) {
+            print(event);
+        } else {
+            print(event, contextEvents);
+        }
+    }
+
     @Override
     protected void print(List<RecordedEvent> events) {
-        for (RecordedEvent e : events) {
-            print(e);
-            flush(false);
-        }
+        throw new InternalError("Should not reach here!");
     }
 
     public void print(RecordedEvent event) {
+        print(event, EMPTY_SET);
+    }
+
+    public void print(RecordedEvent event, SequencedSet<RecordedEvent> context) {
         currentEvent = event;
         print(event.getEventType().getName(), " ");
         println("{");
         indent();
+        if (!context.isEmpty()) {
+            printContexts(context);
+        }
         for (ValueDescriptor v : event.getFields()) {
             String name = v.getName();
             if (!isZeroDuration(event, name) && !isLateField(name)) {
@@ -106,6 +258,22 @@ public void print(RecordedEvent event) {
         println();
     }
 
+    private void printContexts(SequencedSet<RecordedEvent> contextEvents) {
+        for (RecordedEvent e : contextEvents) {
+            printContextFields(e);
+        }
+    }
+
+    private void printContextFields(RecordedEvent contextEvent) {
+        TypeInformation ti = typeInformation(contextEvent);
+        for (ValueDescriptor v : ti.contextualFields()) {
+            printIndent();
+            String name = "Context: " + ti.simpleName() + "." + v.getName();
+            print(name, " = ");
+            printValue(getValue(contextEvent, v), v, "");
+        }
+    }
+
     private boolean isZeroDuration(RecordedEvent event, String name) {
         return name.equals("duration") && ZERO.equals(event.getValue("duration"));
     }
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 a8cb6f0111d..e89d69f4668 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
@@ -26,6 +26,7 @@
 
 import jdk.jfr.AnnotationElement;
 import jdk.jfr.BooleanFlag;
+import jdk.jfr.Contextual;
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.EventFactory;
 import jdk.jfr.EventType;
@@ -251,6 +252,39 @@ void printTemperaturesInCelsius(Path file) throws IOException {
     }
     // @end
 
+    // @start region="ContextualTrace"
+    @Label("Trace")
+    @Name("com.example.Trace")
+    class TraceEvent extends Event {
+        @Label("ID")
+        @Contextual
+        String id;
+
+        @Label("Name")
+        @Contextual
+        String name;
+    }
+    // @end
+
+    void hello() {
+        // @start region="ContextualOrder"
+        @Label("Order")
+        @Name("com.example.Order")
+        class OrderEvent extends Event {
+            @Label("Order ID")
+            @Contextual
+            long id;
+
+            @Label("Order Date")
+            @Timestamp(Timestamp.MILLISECONDS_SINCE_EPOCH)
+            long date;
+
+            @Label("Payment Method")
+            String paymentMethod;
+        }
+        // @end
+    }
+
     // @start region="DataAmountOverview"
     @Name("com.example.ImageRender")
     @Label("Image Render")
diff --git a/test/jdk/jdk/jfr/tool/TestPrintContextual.java b/test/jdk/jdk/jfr/tool/TestPrintContextual.java
new file mode 100644
index 00000000000..efecc31cb16
--- /dev/null
+++ b/test/jdk/jdk/jfr/tool/TestPrintContextual.java
@@ -0,0 +1,420 @@
+/*
+ * 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.tool;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import jdk.jfr.Contextual;
+import jdk.jfr.Event;
+import jdk.jfr.Name;
+import jdk.jfr.Recording;
+import jdk.jfr.StackTrace;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.tool.TestPrintContextual
+ */
+public class TestPrintContextual {
+    private static final int WINDOW_SIZE = 1_000_000;
+    private static final String CONTEXT_MARKER = "Context: ";
+
+    private static final class PrintedEvent {
+        private final List<Map.Entry<String, String>> contextValues = new ArrayList<>();
+        private final List<Map.Entry<String, String>> values = new ArrayList<>();
+        private final String name;
+
+        public PrintedEvent(String name) {
+            this.name = name;
+        }
+
+        public void addValue(String key, String value) {
+            values.add(new AbstractMap.SimpleEntry<>(key, value));
+        }
+
+        public void addContextValue(String key, String value) {
+            contextValues.add(new AbstractMap.SimpleEntry<>(key, value));
+        }
+
+        public List<Map.Entry<String, String>> getContextValues() {
+            return contextValues;
+        }
+
+        public String getContextValue(String key) {
+            for (var entry : contextValues) {
+                if (entry.getKey().equals(key)) {
+                    return entry.getValue();
+                }
+            }
+            return null;
+        }
+    }
+
+    @Name("Span")
+    static class SpanEvent extends Event {
+        @Contextual
+        String name;
+        @Contextual
+        long spanId;
+    }
+
+    @Name("Trace")
+    static class TraceEvent extends Event {
+        long traceId;
+        @Contextual
+        String name;
+    }
+
+    @Name("Filler")
+    @StackTrace(false)
+    static class FillerEvent extends Event {
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        testContextValues();
+        testInterleaved();
+        testDeepContext();
+        testThreadedContext();
+        testFiltered();
+    }
+
+    // Tests that context values are injected into non-contextual events
+    private static void testContextValues() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("Trace").withoutStackTrace();
+            r.enable("Span").withoutStackTrace();
+            r.enable("jdk.SystemGC").withoutStackTrace();
+            r.start();
+
+            SpanEvent span = new SpanEvent();
+            span.name = "span";
+            span.spanId = 4711;
+            span.begin();
+            System.gc();
+            span.commit();
+
+            TraceEvent trace = new TraceEvent();
+            trace.name = "trace";
+            trace.traceId = 17;
+            trace.begin();
+            System.gc();
+            trace.commit();
+
+            r.stop();
+
+            List<PrintedEvent> events = dumpPrintedEvents(r, Path.of("context-values.jfr"));
+
+            PrintedEvent e0 = events.get(0);
+            assertName(e0, "jdk.SystemGC");
+            assertContextValue(e0, "Span.name", "span");
+            assertContextValue(e0, "Span.spanId", "4711");
+
+            PrintedEvent e1 = events.get(1);
+            assertName(e1, "Span");
+            assertMissingContextValues(e1);
+
+            PrintedEvent e2 = events.get(2);
+            assertName(e2, "jdk.SystemGC");
+            assertContextValue(e2, "Trace.name", "trace");
+            assertMissingContextValue(e2, "Trace.traceId");
+
+            PrintedEvent e3 = events.get(3);
+            assertName(e3, "Trace");
+            assertMissingContextValues(e3);
+        }
+    }
+
+    // Tests that two contexts can interleave and injection still works
+    private static void testInterleaved() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("Trace").withoutStackTrace();
+            r.enable("Span").withoutStackTrace();
+            r.enable("jdk.SystemGC").withoutStackTrace();
+            r.start();
+
+            System.gc(); // Event 0
+            SpanEvent span = new SpanEvent();
+            span.name = "span";
+            span.spanId = 56;
+            span.begin();
+            System.gc(); // Event 1
+            TraceEvent trace = new TraceEvent();
+            trace.name = "trace";
+            trace.traceId = 58;
+            trace.begin();
+            System.gc(); // Event 2
+            span.commit(); // Event 3
+            System.gc(); // Event 4
+            trace.commit(); // Event 5
+            System.gc(); // Event 6
+
+            r.stop();
+
+            List<PrintedEvent> events = dumpPrintedEvents(r, Path.of("interleaved.jfr"));
+
+            PrintedEvent e0 = events.get(0);
+            assertName(e0, "jdk.SystemGC");
+            assertMissingContextValues(e0);
+
+            PrintedEvent e1 = events.get(1);
+            assertName(e1, "jdk.SystemGC");
+            assertContextValue(e1, "Span.name", "span");
+            assertContextValue(e1, "Span.spanId", "56");
+            assertMissingContextValue(e1, "trace.name");
+
+            PrintedEvent e2 = events.get(2);
+            assertName(e2, "jdk.SystemGC");
+            assertContextValue(e2, "Span.name", "span");
+            assertContextValue(e2, "Span.spanId", "56");
+            assertContextValue(e2, "Trace.name", "trace");
+
+            PrintedEvent e3 = events.get(3);
+            assertName(e3, "Span");
+
+            PrintedEvent e4 = events.get(4);
+            assertName(e4, "jdk.SystemGC");
+            assertMissingContextValue(e4, "Span.name");
+            assertMissingContextValue(e4, "Span.spanId");
+            assertContextValue(e4, "Trace.name", "trace");
+
+            PrintedEvent e5 = events.get(5);
+            assertName(e5, "Trace");
+
+            PrintedEvent e6 = events.get(6);
+            assertName(e6, "jdk.SystemGC");
+            assertMissingContextValues(e6);
+        }
+    }
+
+    // Tests hundred nested contexts in one event
+    private static void testDeepContext() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("Trace").withoutStackTrace();
+            r.enable("Span").withoutStackTrace();
+            r.enable("jdk.SystemGC").withoutStackTrace();
+            r.start();
+            TraceEvent trace = new TraceEvent();
+            trace.name = "trace";
+            trace.traceId = 58;
+            trace.begin();
+            span(99);
+            trace.commit();
+            r.stop();
+            List<PrintedEvent> events = dumpPrintedEvents(r, Path.of("deep-context.jfr"));
+
+            PrintedEvent e0 = events.get(0);
+            assertName(e0, "jdk.SystemGC");
+            int counter = 100;
+            for (var e : e0.getContextValues()) {
+                String key = e.getKey();
+                String value = e.getValue();
+                if (counter == 100) {
+                    if (!key.equals("Trace.name")) {
+                        throw new Exception("Expected trace context to be printed first, but name was " + key);
+                    }
+                    if ("name".equals(value)) {
+                        throw new Exception("Expected trace context name to be 'trace', but was " + value);
+                    }
+                    counter--;
+                    continue;
+                }
+                if (key.equals("Span.spanId")) {
+                    if (!String.valueOf(counter).equals(value)) {
+                        throw new Exception("Expected spanId to be " + counter + ", but was " + value);
+                    }
+                    counter--;
+                    continue;
+                }
+                if (!key.equals("Span.name")) {
+                    throw new Exception("Expected span context name, but was " + key);
+                }
+            }
+        }
+    }
+
+    private static void span(int depth) {
+        SpanEvent span = new SpanEvent();
+        span.name = "span";
+        span.spanId = depth;
+        span.begin();
+        if (depth == 0) {
+            System.gc();
+            return;
+        }
+        span(depth - 1);
+        span.commit();
+    }
+
+    // Tests that context values are only inhjected into events in the same thread.
+    private static void testThreadedContext() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("Trace").withoutStackTrace();
+            r.enable("jdk.SystemGC").withoutStackTrace();
+            r.start();
+            TraceEvent trace = new TraceEvent();
+            trace.name = "trace";
+            trace.traceId = 42;
+            trace.begin();
+            Thread t = Thread.ofPlatform().name("not-main").start(() -> {
+                System.gc();
+            });
+            t.join();
+            System.gc();
+            trace.commit();
+            r.stop();
+
+            List<PrintedEvent> events = dumpPrintedEvents(r, Path.of("threaded-context.jfr"));
+
+            PrintedEvent e0 = events.get(0);
+            assertName(e0, "jdk.SystemGC");
+            assertMissingContextValues(e0);
+
+            PrintedEvent e1 = events.get(1);
+            assertName(e1, "jdk.SystemGC");
+            assertContextValue(e1, "Trace.name", "trace");
+
+            PrintedEvent e2 = events.get(2);
+            assertName(e2, "Trace");
+            assertMissingContextValues(e2);
+        }
+    }
+
+    // Tests that context values are injected when context events are filtered out
+    private static void testFiltered() throws Exception {
+        try (Recording r = new Recording()) {
+            r.enable("Trace").withoutStackTrace();
+            r.enable("jdk.SystemGC").withoutStackTrace();
+            r.start();
+
+            TraceEvent trace = new TraceEvent();
+            trace.name = "trace";
+            trace.traceId = 22;
+            trace.begin();
+            SpanEvent span = new SpanEvent();
+            span.spanId = 11;
+            span.name = "span";
+            span.begin();
+
+            System.gc();
+
+            span.commit();
+            trace.commit();
+
+            r.stop();
+            Path file = Path.of("filtered.jfr");
+            r.dump(file);
+            List<PrintedEvent> events = parseEvents(readPrintedLines(file, "--events", "jdk.SystemGC"));
+            if (events.size() != 1) {
+                throw new Exception("Only expected one event");
+            }
+            PrintedEvent e0 = events.get(0);
+            assertName(e0, "jdk.SystemGC");
+            assertContextValue(e0, "Trace.name", "trace");
+            assertContextValue(e0, "Span.name", "span");
+            assertContextValue(e0, "Span.spanId", "11");
+        }
+    }
+
+    private static void assertName(PrintedEvent event, String name) throws Exception {
+        if (!event.name.equals(name)) {
+            throw new Exception("Expected event name " + name + ", but was " + event.name);
+        }
+    }
+
+    private static void assertContextValue(PrintedEvent event, String field, String expectedValue) throws Exception {
+        String value = event.getContextValue(field);
+        if (value == null) {
+            throw new Exception("No value found for field " + field + " in event " + event.name);
+        }
+        if (!expectedValue.equals(value)) {
+            throw new Exception("Expected context value " + expectedValue + " for " + field + ", it was " + value);
+        }
+    }
+
+    private static void assertMissingContextValue(PrintedEvent event, String field) throws Exception {
+        if (event.getContextValue(field) != null) {
+            throw new Exception("Didn't expect to find context field " + field);
+        }
+    }
+
+    private static void assertMissingContextValues(PrintedEvent event) throws Exception {
+        if (!event.contextValues.isEmpty()) {
+            throw new Exception("Didn't expect context values in event " + event.name);
+        }
+    }
+
+    private static List<PrintedEvent> dumpPrintedEvents(Recording r, Path file) throws Exception {
+        r.dump(file);
+        return parseEvents(readPrintedLines(file));
+    }
+
+    private static List<PrintedEvent> parseEvents(List<String> lines) {
+        List<PrintedEvent> events = new ArrayList<>();
+        PrintedEvent pe = null;
+        for (String line : lines) {
+            if (line.endsWith("{")) {
+                String[] texts = line.split(" ");
+                pe = new PrintedEvent(texts[0]);
+                events.add(pe);
+            } else if (line.startsWith("}")) {
+                pe = null;
+            } else if (pe != null) {
+                int index = line.indexOf("=");
+                String field = line.substring(0, index).trim();
+                String value = line.substring(index + 1).trim();
+                if (value.startsWith("\"") && value.endsWith("\"")) {
+                    value = value.substring(1, value.length() - 1);
+                }
+                if (field.startsWith(CONTEXT_MARKER)) {
+                    pe.addContextValue(field.substring(CONTEXT_MARKER.length()), value);
+                } else {
+                    pe.addValue(field, value);
+                }
+            }
+        }
+        return events;
+    }
+
+    private static List<String> readPrintedLines(Path file, String... options) throws Exception {
+        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jfr");
+        launcher.addToolArg("print");
+        for (String option : options) {
+            launcher.addToolArg(option);
+        }
+        launcher.addToolArg(file.toAbsolutePath().toString());
+        OutputAnalyzer output = ProcessTools.executeCommand(launcher.getCommand());
+        return output.asLines();
+    }
+}

From 5243f3851b0345b874ff51ea3a07e82f73741546 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 2 Jun 2025 19:07:29 +0000
Subject: [PATCH 788/901] 8357924: Remove
 runtime/ErrorHandling/CreateCoredumpOnCrash.java from problem list for
 macosx-x64

Reviewed-by: syan, dholmes
---
 test/hotspot/jtreg/ProblemList.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 62fdbdbaa06..3038daf090d 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -108,7 +108,6 @@ runtime/os/TestTracePageSizes.java#compiler-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64
-runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
 runtime/NMT/VirtualAllocCommitMerge.java 8309698 linux-s390x

From 0418b3295a199af66700521f571c9b2c1051cac6 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Mon, 2 Jun 2025 20:23:14 +0000
Subject: [PATCH 789/901] 8357696: Enhance code consistency: java.desktop/unix

Reviewed-by: prr
---
 .../unix/classes/sun/font/DelegateStrike.java | 13 +++++++-
 .../classes/sun/font/DoubleByteEncoder.java   |  2 ++
 .../classes/sun/font/FcFontConfiguration.java |  2 +-
 .../classes/sun/font/FontConfigManager.java   |  8 ++---
 .../classes/sun/font/MFontConfiguration.java  | 11 ++++++-
 .../unix/classes/sun/font/NativeFont.java     | 13 +++++++-
 .../classes/sun/font/NativeGlyphMapper.java   |  9 +++++-
 .../unix/classes/sun/font/NativeStrike.java   |  9 ++++++
 .../sun/font/NativeStrikeDisposer.java        |  3 +-
 .../unix/classes/sun/font/X11Dingbats.java    | 10 +++++--
 .../unix/classes/sun/font/X11GB18030_0.java   |  9 ++++--
 .../unix/classes/sun/font/X11GB18030_1.java   |  9 ++++--
 .../unix/classes/sun/font/X11GB2312.java      | 13 ++++++--
 .../unix/classes/sun/font/X11GBK.java         |  9 ++++--
 .../unix/classes/sun/font/X11Johab.java       |  8 +++--
 .../unix/classes/sun/font/X11KSC5601.java     | 13 ++++++--
 .../classes/sun/font/X11SunUnicode_0.java     |  8 +++--
 .../classes/sun/font/X11TextRenderer.java     |  5 +++-
 .../unix/classes/sun/font/XMap.java           |  2 +-
 .../unix/classes/sun/font/XRGlyphCache.java   |  3 +-
 .../classes/sun/font/XRGlyphCacheEntry.java   |  2 +-
 .../unix/classes/sun/font/XRTextRenderer.java |  3 +-
 .../sun/java2d/opengl/GLXGraphicsConfig.java  |  9 ++++--
 .../sun/java2d/opengl/GLXSurfaceData.java     | 11 +++++--
 .../opengl/GLXVolatileSurfaceManager.java     |  4 ++-
 .../sun/java2d/x11/X11PMBlitBgLoops.java      |  2 +-
 .../sun/java2d/x11/X11PMBlitLoops.java        |  6 ++--
 .../classes/sun/java2d/x11/X11Renderer.java   | 30 ++++++++++++++++++-
 .../sun/java2d/x11/X11SurfaceData.java        | 17 ++++++++++-
 .../sun/java2d/x11/X11SurfaceDataProxy.java   |  6 ++--
 .../java2d/x11/X11VolatileSurfaceManager.java |  5 +++-
 .../classes/sun/java2d/xr/DirtyRegion.java    |  3 +-
 .../sun/java2d/xr/GrowableByteArray.java      |  2 +-
 .../sun/java2d/xr/GrowableEltArray.java       |  3 +-
 .../sun/java2d/xr/GrowablePointArray.java     |  2 +-
 .../sun/java2d/xr/GrowableRectArray.java      |  2 +-
 .../unix/classes/sun/java2d/xr/MaskTile.java  |  2 +-
 .../sun/java2d/xr/MaskTileManager.java        |  2 +-
 .../classes/sun/java2d/xr/MutableInteger.java |  4 ++-
 .../classes/sun/java2d/xr/XIDGenerator.java   |  2 +-
 .../sun/java2d/xr/XRBackendNative.java        | 28 ++++++++++++++++-
 .../unix/classes/sun/java2d/xr/XRColor.java   |  3 +-
 .../sun/java2d/xr/XRCompositeManager.java     |  2 +-
 .../classes/sun/java2d/xr/XRDrawImage.java    |  2 +-
 .../classes/sun/java2d/xr/XRDrawLine.java     |  2 +-
 .../sun/java2d/xr/XRGraphicsConfig.java       |  3 +-
 .../classes/sun/java2d/xr/XRMaskBlit.java     |  3 +-
 .../classes/sun/java2d/xr/XRMaskFill.java     |  3 +-
 .../classes/sun/java2d/xr/XRMaskImage.java    |  2 +-
 .../classes/sun/java2d/xr/XRPMBlitLoops.java  | 18 +++++++----
 .../unix/classes/sun/java2d/xr/XRPaints.java  |  8 ++---
 .../classes/sun/java2d/xr/XRRenderer.java     | 21 +++++++++++--
 .../classes/sun/java2d/xr/XRSolidSrcPict.java |  2 +-
 .../classes/sun/java2d/xr/XRSurfaceData.java  | 28 ++++++++++++++---
 .../sun/java2d/xr/XRSurfaceDataProxy.java     |  3 +-
 .../unix/classes/sun/java2d/xr/XRUtils.java   |  2 +-
 .../java2d/xr/XRVolatileSurfaceManager.java   |  5 +++-
 .../sun/java2d/xr/XcbRequestCounter.java      |  2 +-
 .../classes/sun/print/AttributeClass.java     |  3 +-
 .../unix/classes/sun/print/CUPSPrinter.java   |  2 +-
 .../classes/sun/print/IPPPrintService.java    | 23 ++++++++++++--
 .../sun/print/PrintServiceLookupProvider.java | 10 +++++--
 .../unix/classes/sun/print/UnixPrintJob.java  | 14 +++++++--
 .../classes/sun/print/UnixPrintService.java   | 22 +++++++++++++-
 64 files changed, 391 insertions(+), 96 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/font/DelegateStrike.java b/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
index 4f2de5ebc2f..ea9c6b0eb0a 100644
--- a/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
+++ b/src/java.desktop/unix/classes/sun/font/DelegateStrike.java
@@ -37,7 +37,7 @@
  * appropriately.
  */
 
-class DelegateStrike extends NativeStrike {
+final class DelegateStrike extends NativeStrike {
 
     private FontStrike delegateStrike;
 
@@ -55,6 +55,7 @@ class DelegateStrike extends NativeStrike {
      * the metrics and transform them. But currently in such a case it
      * gets the metrics from a different font - its glyph delegate font.
      */
+    @Override
    StrikeMetrics getFontMetrics() {
        if (strikeMetrics == null) {
            if (pScalerContext != 0) {
@@ -67,31 +68,38 @@ StrikeMetrics getFontMetrics() {
         return strikeMetrics;
     }
 
+    @Override
     void getGlyphImagePtrs(int[] glyphCodes, long[] images,int  len) {
         delegateStrike.getGlyphImagePtrs(glyphCodes, images, len);
     }
 
+    @Override
     long getGlyphImagePtr(int glyphCode) {
         return delegateStrike.getGlyphImagePtr(glyphCode);
     }
 
+    @Override
     void getGlyphImageBounds(int glyphCode,
                              Point2D.Float pt, Rectangle result) {
         delegateStrike.getGlyphImageBounds(glyphCode, pt, result);
     }
 
+    @Override
     Point2D.Float getGlyphMetrics(int glyphCode) {
         return delegateStrike.getGlyphMetrics(glyphCode);
     }
 
+    @Override
     float getGlyphAdvance(int glyphCode) {
         return delegateStrike.getGlyphAdvance(glyphCode);
     }
 
+     @Override
      Point2D.Float getCharMetrics(char ch) {
         return delegateStrike.getCharMetrics(ch);
     }
 
+    @Override
     float getCodePointAdvance(int cp) {
         if (cp < 0 || cp >= 0x10000) {
             cp = 0xffff;
@@ -99,14 +107,17 @@ float getCodePointAdvance(int cp) {
         return delegateStrike.getGlyphAdvance(cp);
     }
 
+    @Override
     Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
         return delegateStrike.getGlyphOutlineBounds(glyphCode);
     }
 
+    @Override
     GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
         return delegateStrike.getGlyphOutline(glyphCode, x, y);
     }
 
+    @Override
     GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
         return delegateStrike.getGlyphVectorOutline(glyphs, x, y);
     }
diff --git a/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
index 36b298a8004..d42b6eda80d 100644
--- a/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
+++ b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java
@@ -76,6 +76,7 @@ protected DoubleByteEncoder(Charset cs,
         this.index2 = index2;
     }
 
+    @Override
     public boolean canEncode(char c) {
         return (encodeSingle(c) != -1 ||
                 encodeDouble(c) != 0);
@@ -198,6 +199,7 @@ private CoderResult encodeBufferLoop(CharBuffer src, ByteBuffer dst) {
         }
     }
 
+    @Override
     protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
         if (src.hasArray() && dst.hasArray())
             return encodeArrayLoop(src, dst);
diff --git a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
index bfd8acf7739..328e2454842 100644
--- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java
@@ -50,7 +50,7 @@
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
-public class FcFontConfiguration extends FontConfiguration {
+public final class FcFontConfiguration extends FontConfiguration {
 
     /** Version of the cache file format understood by this code.
      * Its part of the file name so that we can rev this at
diff --git a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
index 6e3b83f4b66..c70fe7dd940 100644
--- a/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
+++ b/src/java.desktop/unix/classes/sun/font/FontConfigManager.java
@@ -34,7 +34,7 @@
 /**
  * Small utility class to manage FontConfig.
  */
-public class FontConfigManager {
+public final class FontConfigManager {
 
     static boolean fontConfigFailed = false;
 
@@ -47,14 +47,14 @@ public class FontConfigManager {
 
     /* These next three classes are just data structures.
      */
-    public static class FontConfigFont {
+    public static final class FontConfigFont {
         public String familyName;        // eg Bitstream Vera Sans
         public String styleStr;          // eg Bold
         public String fullName;          // eg Bitstream Vera Sans Bold
         public String fontFile;          // eg /usr/X11/lib/fonts/foo.ttf
     }
 
-    public static class FcCompFont {
+    public static final class FcCompFont {
         public String fcName;            // eg sans
         public String fcFamily;          // eg sans
         public String jdkName;           // eg sansserif
@@ -65,7 +65,7 @@ public static class FcCompFont {
         public CompositeFont compFont;   // null if not yet created/known.
     }
 
-    public static class FontConfigInfo {
+    public static final class FontConfigInfo {
         public int fcVersion;
         public String[] cacheDirs = new String[4];
     }
diff --git a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
index 15dc97a1d4f..3d7e68d8dea 100644
--- a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
+++ b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java
@@ -39,7 +39,7 @@
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
-public class MFontConfiguration extends FontConfiguration {
+public final class MFontConfiguration extends FontConfiguration {
 
     private static FontConfiguration fontConfig = null;
     private static PlatformLogger logger;
@@ -66,6 +66,7 @@ public MFontConfiguration(SunFontManager fm,
     /* Needs to be kept in sync with updates in the languages used in
      * the fontconfig files.
      */
+    @Override
     protected void initReorderMap() {
         reorderMap = new HashMap<>();
 
@@ -84,6 +85,7 @@ protected void initReorderMap() {
     /**
      * Sets the OS name and version from environment information.
      */
+    @Override
     protected void setOsNameAndVersion(){
         super.setOsNameAndVersion();
 
@@ -157,6 +159,7 @@ private String extractInfo(String s) {
 
     private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
 
+    @Override
     protected String mapFileName(String fileName) {
         if (fileName != null && fileName.startsWith(fontsDirPrefix)) {
             return SunFontManager.jreFontDirName
@@ -166,6 +169,7 @@ protected String mapFileName(String fileName) {
     }
 
     // overrides FontConfiguration.getFallbackFamilyName
+    @Override
     public String getFallbackFamilyName(String fontName, String defaultFallback) {
         // maintain compatibility with old font.properties files, which
         // either had aliases for TimesRoman & Co. or defined mappings for them.
@@ -176,6 +180,7 @@ public String getFallbackFamilyName(String fontName, String defaultFallback) {
         return defaultFallback;
     }
 
+    @Override
     protected String getEncoding(String awtFontName,
             String characterSubsetName) {
         // extract encoding field from XLFD
@@ -202,14 +207,17 @@ protected String getEncoding(String awtFontName,
         return encoding;
     }
 
+    @Override
     protected Charset getDefaultFontCharset(String fontName) {
         return ISO_8859_1;
     }
 
+    @Override
     protected String getFaceNameFromComponentFontName(String componentFontName) {
         return null;
     }
 
+    @Override
     protected String getFileNameFromComponentFontName(String componentFontName) {
         // for X11, component font name is XLFD
         // if we have a file name already, just use it; otherwise let's see
@@ -222,6 +230,7 @@ protected String getFileNameFromComponentFontName(String componentFontName) {
         return ((X11FontManager) fontManager).getFileNameFromXLFD(componentFontName);
     }
 
+    @Override
     public HashSet<String> getAWTFontPathSet() {
         HashSet<String> fontDirs = new HashSet<String>();
         short[] scripts = getCoreScripts(0);
diff --git a/src/java.desktop/unix/classes/sun/font/NativeFont.java b/src/java.desktop/unix/classes/sun/font/NativeFont.java
index 337d38c095a..871db2a70d1 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeFont.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeFont.java
@@ -54,7 +54,7 @@
  * to perform limited operations by using bitmaps from X11 helps here.
  */
 
-public class NativeFont extends PhysicalFont {
+public final class NativeFont extends PhysicalFont {
 
     String encoding;
 
@@ -223,6 +223,7 @@ public static boolean fontExists(String xlfd) {
     private static native boolean haveBitmapFonts(byte[] xlfd);
     private static native boolean fontExists(byte[] xlfd);
 
+    @Override
     public CharToGlyphMapper getMapper() {
         if (mapper == null) {
             if (isBitmapDelegate) {
@@ -238,6 +239,7 @@ public CharToGlyphMapper getMapper() {
         return mapper;
     }
 
+    @Override
     FontStrike createStrike(FontStrikeDesc desc) {
         if (isBitmapDelegate) {
             return new NativeStrike(this, desc);
@@ -261,15 +263,19 @@ public Rectangle2D getMaxCharBounds(FontRenderContext frc) {
             return null;
     }
 
+    @Override
     native StrikeMetrics getFontMetrics(long pScalerContext);
 
+    @Override
     native float getGlyphAdvance(long pContext, int glyphCode);
 
+    @Override
     Rectangle2D.Float getGlyphOutlineBounds(long pScalerContext,
                                             int glyphCode) {
         return new Rectangle2D.Float(0f, 0f, 0f, 0f);
     }
 
+    @Override
     public GeneralPath getGlyphOutline(long pScalerContext,
                                        int glyphCode,
                                        float x,
@@ -277,15 +283,18 @@ public GeneralPath getGlyphOutline(long pScalerContext,
         return null;
     }
 
+    @Override
     native long getGlyphImage(long pScalerContext, int glyphCode);
 
     native long getGlyphImageNoDefault(long pScalerContext, int glyphCode);
 
+    @Override
     void getGlyphMetrics(long pScalerContext, int glyphCode,
                         Point2D.Float metrics) {
         throw new RuntimeException("this should be called on the strike");
     }
 
+    @Override
     public  GeneralPath getGlyphVectorOutline(long pScalerContext,
                                               int[] glyphs, int numGlyphs,
                                               float x,  float y) {
@@ -294,6 +303,7 @@ public  GeneralPath getGlyphVectorOutline(long pScalerContext,
 
     private native int countGlyphs(byte[] platformNameBytes, int ptSize);
 
+    @Override
     public int getNumGlyphs() {
         if (numGlyphs == -1) {
             byte[] bytes = getPlatformNameBytes(8);
@@ -371,6 +381,7 @@ byte[] getPlatformNameBytes(int ptSize) {
         return xlfd.getBytes(UTF_8);
     }
 
+    @Override
     public String toString() {
         return " ** Native Font: Family="+familyName+ " Name="+fullName+
             " style="+style+" nativeName="+platName;
diff --git a/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java b/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
index cec455e2e83..f1756900245 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeGlyphMapper.java
@@ -42,7 +42,7 @@
  * XMap classes could be merged, however its cleaner to make them separate
  * classes so we can build caches for a particular font.
  */
-public class NativeGlyphMapper extends CharToGlyphMapper {
+public final class NativeGlyphMapper extends CharToGlyphMapper {
 
     NativeFont font;
     XMap xmapper;
@@ -55,10 +55,12 @@ public class NativeGlyphMapper extends CharToGlyphMapper {
         missingGlyph = 0;
     }
 
+    @Override
     public int getNumGlyphs() {
         return numGlyphs;
     }
 
+    @Override
     public int charToGlyph(char unicode) {
         if (unicode >= xmapper.convertedGlyphs.length) {
             return 0;
@@ -67,6 +69,7 @@ public int charToGlyph(char unicode) {
         }
     }
 
+    @Override
     public int charToGlyph(int unicode) {
         if (unicode >= xmapper.convertedGlyphs.length) {
             return 0;
@@ -75,10 +78,12 @@ public int charToGlyph(int unicode) {
         }
     }
 
+    @Override
     public int charToGlyphRaw(int unicode) {
         return charToGlyph(unicode);
     }
 
+    @Override
     public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
         for (int i=0; i<count; i++) {
             char code = unicodes[i];
@@ -90,11 +95,13 @@ public void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
         }
     }
 
+    @Override
     public boolean charsToGlyphsNS(int count, char[] unicodes, int[] glyphs) {
         charsToGlyphs(count, unicodes, glyphs);
         return false;
     }
 
+    @Override
     public void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
         for (int i=0; i<count; i++) {
             char code = (char)unicodes[i];
diff --git a/src/java.desktop/unix/classes/sun/font/NativeStrike.java b/src/java.desktop/unix/classes/sun/font/NativeStrike.java
index bc735367b99..3e6996d83fe 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeStrike.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeStrike.java
@@ -191,6 +191,7 @@ private long[] getLongGlyphImages() {
       * the metrics and transform them. But currently in such a case it
       * gets the metrics from a different font - its glyph delegate font.
       */
+     @Override
      StrikeMetrics getFontMetrics() {
          if (strikeMetrics == null) {
              if (pScalerContext != 0) {
@@ -210,12 +211,14 @@ private native long createScalerContext(byte[] nameBytes,
 
      private native long createNullScalerContext();
 
+     @Override
      void getGlyphImagePtrs(int[] glyphCodes, long[] images,int  len) {
          for (int i=0; i<len; i++) {
              images[i] = getGlyphImagePtr(glyphCodes[i]);
          }
      }
 
+     @Override
      long getGlyphImagePtr(int glyphCode) {
          long glyphPtr;
 
@@ -267,27 +270,33 @@ long getGlyphImagePtrNoCache(int glyphCode) {
          return nativeFont.getGlyphImageNoDefault(pScalerContext, glyphCode);
      }
 
+     @Override
      void getGlyphImageBounds(int glyphcode, Point2D.Float pt,
                               Rectangle result) {
      }
 
+     @Override
      Point2D.Float getGlyphMetrics(int glyphCode) {
          Point2D.Float pt = new Point2D.Float(getGlyphAdvance(glyphCode), 0f);
          return pt;
      }
 
+     @Override
      float getGlyphAdvance(int glyphCode) {
          return nativeFont.getGlyphAdvance(pScalerContext, glyphCode);
      }
 
+     @Override
      Rectangle2D.Float getGlyphOutlineBounds(int glyphCode) {
          return nativeFont.getGlyphOutlineBounds(pScalerContext, glyphCode);
      }
 
+     @Override
      GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
          return new GeneralPath();
      }
 
+     @Override
      GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y) {
          return new GeneralPath();
      }
diff --git a/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java b/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
index 37ac6a108fe..b19995a34f6 100644
--- a/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
+++ b/src/java.desktop/unix/classes/sun/font/NativeStrikeDisposer.java
@@ -47,7 +47,7 @@
  * entries would be removed much more promptly than we need.
  */
 
-class NativeStrikeDisposer extends FontStrikeDisposer {
+final class NativeStrikeDisposer extends FontStrikeDisposer {
 
     long pNativeScalerContext;
 
@@ -73,6 +73,7 @@ public NativeStrikeDisposer(Font2D font2D, FontStrikeDesc desc) {
         super(font2D, desc);
     }
 
+    @Override
     public synchronized void dispose() {
         if (!disposed) {
             if (pNativeScalerContext != 0L) {
diff --git a/src/java.desktop/unix/classes/sun/font/X11Dingbats.java b/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
index 32725ade36c..cef94fdf9c8 100644
--- a/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
+++ b/src/java.desktop/unix/classes/sun/font/X11Dingbats.java
@@ -29,11 +29,12 @@
 import java.nio.CharBuffer;
 import java.nio.charset.*;
 
-public class X11Dingbats extends Charset {
+public final class X11Dingbats extends Charset {
     public X11Dingbats () {
         super("X11Dingbats", null);
     }
 
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
@@ -41,19 +42,22 @@ public CharsetEncoder newEncoder() {
     /* Seems like supporting a decoder is required, but we aren't going
      * to be publicly exposing this class, so no need to waste work
      */
+    @Override
     public CharsetDecoder newDecoder() {
         throw new Error("Decoder is not supported by X11Dingbats Charset");
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11Dingbats;
     }
 
-    private static class Encoder extends CharsetEncoder {
+    private static final class Encoder extends CharsetEncoder {
         public Encoder(Charset cs) {
             super(cs, 1.0f, 1.0f);
         }
 
+        @Override
         public boolean canEncode(char ch) {
             if (ch >= 0x2701 && ch <= 0x275e) { // direct map
                 return true;
@@ -64,6 +68,7 @@ public boolean canEncode(char ch) {
             return false;
         }
 
+        @Override
         protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
             char[] sa = src.array();
             int sp = src.arrayOffset() + src.position();
@@ -125,6 +130,7 @@ protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
             (byte)0x00, (byte)0x00, (byte)0x00};
 
         /* The default implementation creates a decoder and we don't have one */
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
index e96615bfa36..7b06d785d99 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java
@@ -29,11 +29,12 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CharsetDecoder;
 
-public class X11GB18030_0 extends Charset {
+public final class X11GB18030_0 extends Charset {
     public X11GB18030_0 () {
         super("X11GB18030_0", null);
     }
 
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
@@ -41,18 +42,21 @@ public CharsetEncoder newEncoder() {
     /* Seems like supporting a decoder is required, but we aren't going
      * to be publicly exposing this class, so no need to waste work
      */
+    @Override
     public CharsetDecoder newDecoder() {
         throw new Error("Decoder is not implemented for X11GB18030_0 Charset");
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11GB18030_0;
     }
 
-    private static class Encoder extends DoubleByteEncoder {
+    private static final class Encoder extends DoubleByteEncoder {
         public Encoder(Charset cs) {
             super(cs, index1, index2);
         }
+        @Override
         protected int encodeSingle(char inputChar) {
             return -1;
         }
@@ -4266,6 +4270,7 @@ protected int encodeSingle(char inputChar) {
         };
 
         /* The default implementation creates a decoder and we don't have one */
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
index 1666da96317..9f06ea30ac7 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java
@@ -29,11 +29,12 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CharsetDecoder;
 
-public class X11GB18030_1 extends Charset {
+public final class X11GB18030_1 extends Charset {
     public X11GB18030_1 () {
         super("X11GB18030_1", null);
     }
 
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
@@ -41,17 +42,20 @@ public CharsetEncoder newEncoder() {
     /* Seems like supporting a decoder is required, but we aren't going
      * to be publicly exposing this class, so no need to waste work
      */
+    @Override
     public CharsetDecoder newDecoder() {
         throw new Error("Decoder is not implemented for X11GB18030_1 Charset");
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11GB18030_1;
     }
-    private static class Encoder extends DoubleByteEncoder {
+    private static final class Encoder extends DoubleByteEncoder {
         public Encoder(Charset cs) {
             super(cs, index1, index2);
         }
+        @Override
         protected int encodeSingle(char inputChar) {
             return -1;
         }
@@ -5263,6 +5267,7 @@ protected int encodeSingle(char inputChar) {
         };
 
         /* The default implementation creates a decoder and we don't have one */
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/font/X11GB2312.java b/src/java.desktop/unix/classes/sun/font/X11GB2312.java
index e1d64cbe54d..70643edbea3 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GB2312.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GB2312.java
@@ -31,28 +31,32 @@
 import sun.nio.cs.*;
 import static sun.nio.cs.CharsetMapping.*;
 
-public class X11GB2312 extends Charset {
+public final class X11GB2312 extends Charset {
     public X11GB2312 () {
         super("X11GB2312", null);
     }
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
+    @Override
     public CharsetDecoder newDecoder() {
         return new Decoder(this);
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11GB2312;
     }
 
-    private static class Encoder extends CharsetEncoder {
+    private static final class Encoder extends CharsetEncoder {
         private DoubleByte.Encoder enc = (DoubleByte.Encoder)new EUC_CN().newEncoder();
 
         public Encoder(Charset cs) {
             super(cs, 2.0f, 2.0f);
         }
 
+        @Override
         public boolean canEncode(char c) {
             if (c <= 0x7F) {
                 return false;
@@ -64,6 +68,7 @@ protected int encodeDouble(char c) {
             return enc.encodeChar(c);
         }
 
+        @Override
         protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
             char[] sa = src.array();
             int sp = src.arrayOffset() + src.position();
@@ -93,12 +98,13 @@ protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
                 dst.position(dp - dst.arrayOffset());
             }
         }
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
     }
 
-    private static class Decoder extends  CharsetDecoder {
+    private static final class Decoder extends  CharsetDecoder {
         private DoubleByte.Decoder dec = (DoubleByte.Decoder)new EUC_CN().newDecoder();
 
         public Decoder(Charset cs) {
@@ -109,6 +115,7 @@ protected char decodeDouble(int b1, int b2) {
             return dec.decodeDouble(b1, b2);
         }
 
+        @Override
         protected CoderResult decodeLoop(ByteBuffer src, CharBuffer dst) {
             byte[] sa = src.array();
             int sp = src.arrayOffset() + src.position();
diff --git a/src/java.desktop/unix/classes/sun/font/X11GBK.java b/src/java.desktop/unix/classes/sun/font/X11GBK.java
index effe8f54f9c..612b41c95c0 100644
--- a/src/java.desktop/unix/classes/sun/font/X11GBK.java
+++ b/src/java.desktop/unix/classes/sun/font/X11GBK.java
@@ -29,22 +29,25 @@
 import sun.nio.cs.*;
 import static sun.nio.cs.CharsetMapping.*;
 
-public class X11GBK extends Charset {
+public final class X11GBK extends Charset {
     public X11GBK () {
         super("X11GBK", null);
     }
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
+    @Override
     public CharsetDecoder newDecoder() {
         return new GBK().newDecoder();
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11GBK;
     }
 
-    private static class Encoder extends DoubleByte.Encoder {
+    private static final class Encoder extends DoubleByte.Encoder {
 
         private DoubleByte.Encoder enc = (DoubleByte.Encoder)new GBK().newEncoder();
 
@@ -52,11 +55,13 @@ private static class Encoder extends DoubleByte.Encoder {
             super(cs, (char[])null, (char[])null);
         }
 
+        @Override
         public boolean canEncode(char ch){
             if (ch < 0x80) return false;
             return enc.canEncode(ch);
         }
 
+        @Override
         public int encodeChar(char ch) {
             if (ch < 0x80)
                 return UNMAPPABLE_ENCODING;
diff --git a/src/java.desktop/unix/classes/sun/font/X11Johab.java b/src/java.desktop/unix/classes/sun/font/X11Johab.java
index 9768275b437..ff79e4833f5 100644
--- a/src/java.desktop/unix/classes/sun/font/X11Johab.java
+++ b/src/java.desktop/unix/classes/sun/font/X11Johab.java
@@ -29,28 +29,32 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CharsetDecoder;
 
-public class X11Johab extends Charset {
+public final class X11Johab extends Charset {
     public X11Johab () {
         super("X11Johab", null);
     }
 
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
 
+    @Override
     public CharsetDecoder newDecoder() {
         throw new Error("Decoder is not supported by X11Johab Charset");
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11GB18030_1;
     }
 
-    private static class Encoder extends DoubleByteEncoder {
+    private static final class Encoder extends DoubleByteEncoder {
         public Encoder(Charset cs) {
             super(cs, index1, index2);
         }
 
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/font/X11KSC5601.java b/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
index 1a7cc310bbf..e1ffd133215 100644
--- a/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
+++ b/src/java.desktop/unix/classes/sun/font/X11KSC5601.java
@@ -31,28 +31,32 @@
 import sun.nio.cs.*;
 import static sun.nio.cs.CharsetMapping.*;
 
-public class X11KSC5601 extends Charset {
+public final class X11KSC5601 extends Charset {
     public X11KSC5601 () {
         super("X11KSC5601", null);
     }
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
+    @Override
     public CharsetDecoder newDecoder() {
         return new Decoder(this);
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11KSC5601;
     }
 
-    private static class Encoder extends CharsetEncoder {
+    private static final class Encoder extends CharsetEncoder {
         private DoubleByte.Encoder enc = (DoubleByte.Encoder)new EUC_KR().newEncoder();
 
         public Encoder(Charset cs) {
             super(cs, 2.0f, 2.0f);
         }
 
+        @Override
         public boolean canEncode(char c) {
             if (c <= 0x7F) {
                 return false;
@@ -64,6 +68,7 @@ protected int encodeDouble(char c) {
             return enc.encodeChar(c);
         }
 
+        @Override
         protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
             char[] sa = src.array();
             int sp = src.arrayOffset() + src.position();
@@ -92,12 +97,13 @@ protected CoderResult encodeLoop(CharBuffer src, ByteBuffer dst) {
                 dst.position(dp - dst.arrayOffset());
             }
         }
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
     }
 
-    private static class Decoder extends  CharsetDecoder {
+    private static final class Decoder extends  CharsetDecoder {
         private DoubleByte.Decoder dec = (DoubleByte.Decoder)new EUC_KR().newDecoder();
 
         public Decoder(Charset cs) {
@@ -108,6 +114,7 @@ protected char decodeDouble(int b1, int b2) {
             return dec.decodeDouble(b1, b2);
         }
 
+        @Override
         protected CoderResult decodeLoop(ByteBuffer src, CharBuffer dst) {
             byte[] sa = src.array();
             int sp = src.arrayOffset() + src.position();
diff --git a/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
index a6267416a39..89b568ecd0f 100644
--- a/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
+++ b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java
@@ -30,11 +30,12 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CharsetDecoder;
 
-public class X11SunUnicode_0 extends Charset {
+public final class X11SunUnicode_0 extends Charset {
     public X11SunUnicode_0 () {
         super("X11SunUnicode_0", null);
     }
 
+    @Override
     public CharsetEncoder newEncoder() {
         return new Encoder(this);
     }
@@ -42,15 +43,17 @@ public CharsetEncoder newEncoder() {
     /* Seems like supporting a decoder is required, but we aren't going
      * to be publicly exposing this class, so no need to waste work
      */
+    @Override
     public CharsetDecoder newDecoder() {
         throw new Error("Decoder is not implemented for X11SunUnicode_0 Charset");
     }
 
+    @Override
     public boolean contains(Charset cs) {
         return cs instanceof X11SunUnicode_0;
     }
 
-    private static class Encoder extends DoubleByteEncoder {
+    private static final class Encoder extends DoubleByteEncoder {
         public Encoder(Charset cs) {
             super(cs, index1, index2);
         }
@@ -145,6 +148,7 @@ public Encoder(Charset cs) {
         };
 
         /* The default implementation creates a decoder and we don't have one */
+        @Override
         public boolean isLegalReplacement(byte[] repl) {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java b/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
index bac23128cd8..86c9fd26a7f 100644
--- a/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
+++ b/src/java.desktop/unix/classes/sun/font/X11TextRenderer.java
@@ -47,6 +47,7 @@ public class X11TextRenderer extends GlyphListPipe {
      * Override super class method to call the AA pipe if
      * AA is specified in the GlyphVector's FontRenderContext
      */
+    @Override
     public void drawGlyphVector(SunGraphics2D sg2d, GlyphVector g,
                                 float x, float y)
     {
@@ -70,6 +71,7 @@ public void drawGlyphVector(SunGraphics2D sg2d, GlyphVector g,
     native void doDrawGlyphList(long dstData, long xgc,
                                 Region clip, GlyphList gl);
 
+    @Override
     protected void drawGlyphList(SunGraphics2D sg2d, GlyphList gl) {
         SunToolkit.awtLock();
         try {
@@ -88,7 +90,8 @@ public X11TextRenderer traceWrap() {
         return new Tracer();
     }
 
-    public static class Tracer extends X11TextRenderer {
+    public static final class Tracer extends X11TextRenderer {
+        @Override
         void doDrawGlyphList(long dstData, long xgc,
                              Region clip, GlyphList gl)
         {
diff --git a/src/java.desktop/unix/classes/sun/font/XMap.java b/src/java.desktop/unix/classes/sun/font/XMap.java
index ba34cff199b..5935ce1aa97 100644
--- a/src/java.desktop/unix/classes/sun/font/XMap.java
+++ b/src/java.desktop/unix/classes/sun/font/XMap.java
@@ -30,7 +30,7 @@
 import java.nio.CharBuffer;
 import java.nio.ByteBuffer;
 
-class XMap {
+final class XMap {
 
     private static HashMap<String, XMap> xMappers = new HashMap<>();
 
diff --git a/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
index 04b5c1a9504..6c8ce7960cd 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCache.java
@@ -37,7 +37,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRGlyphCache implements GlyphDisposedListener {
+public final class XRGlyphCache implements GlyphDisposedListener {
     XRBackend con;
     XRCompositeManager maskBuffer;
     HashMap<MutableInteger, XRGlyphCacheEntry> cacheMap = new HashMap<MutableInteger, XRGlyphCacheEntry>(256);
@@ -66,6 +66,7 @@ public XRGlyphCache(XRCompositeManager maskBuf) {
         StrikeCache.addGlyphDisposedListener(this);
     }
 
+    @Override
     public void glyphDisposed(ArrayList<Long> glyphPtrList) {
         try {
             SunToolkit.awtLock();
diff --git a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
index 94733316fbd..62956f488a8 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
@@ -33,7 +33,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRGlyphCacheEntry {
+public final class XRGlyphCacheEntry {
     long glyphInfoPtr;
 
     int lastUsed;
diff --git a/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
index 6f23bf10899..8662b48cf3f 100644
--- a/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
+++ b/src/java.desktop/unix/classes/sun/font/XRTextRenderer.java
@@ -36,7 +36,7 @@
  *
  * @author Clemens Eisserer
  */
-public class XRTextRenderer extends GlyphListPipe {
+public final class XRTextRenderer extends GlyphListPipe {
     // Workaround for a bug in libXrender.
     // In case the number of glyphs of an ELT is a multiple of 254,
     // a few garbage bytes are sent to the XServer causing hangs.
@@ -55,6 +55,7 @@ public XRTextRenderer(XRCompositeManager buffer) {
         eltList = new GrowableEltArray(64);
     }
 
+    @Override
     protected void drawGlyphList(SunGraphics2D sg2d, GlyphList gl) {
         if (gl.getNumGlyphs() == 0) {
             return;
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
index 2ea076f8051..1b7a4364ce4 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java
@@ -149,7 +149,7 @@ public void run() {
      * This is a small helper class that allows us to execute
      * getGLXConfigInfo() on the queue flushing thread.
      */
-    private static class GLXGetConfigInfo implements Runnable {
+    private static final class GLXGetConfigInfo implements Runnable {
         private int screen;
         private int visual;
         private long cfginfo;
@@ -157,6 +157,7 @@ private GLXGetConfigInfo(int screen, int visual) {
             this.screen = screen;
             this.visual = visual;
         }
+        @Override
         public void run() {
             cfginfo = getGLXConfigInfo(screen, visual);
         }
@@ -212,6 +213,7 @@ public ColorModel getColorModel(int transparency) {
         }
     }
 
+    @Override
     public String toString() {
         return ("GLXGraphicsConfig[dev="+getDevice()+
                 ",vis=0x"+Integer.toHexString(visual)+
@@ -359,7 +361,7 @@ public void flip(X11ComponentPeer peer,
         }
     }
 
-    private static class GLXBufferCaps extends BufferCapabilities {
+    private static final class GLXBufferCaps extends BufferCapabilities {
         public GLXBufferCaps(boolean dblBuf) {
             super(imageCaps, imageCaps,
                   dblBuf ? FlipContents.UNDEFINED : null);
@@ -374,10 +376,11 @@ public BufferCapabilities getBufferCapabilities() {
         return bufferCaps;
     }
 
-    private static class GLXImageCaps extends ImageCapabilities {
+    private static final class GLXImageCaps extends ImageCapabilities {
         private GLXImageCaps() {
             super(true);
         }
+        @Override
         public boolean isTrueVolatile() {
             return true;
         }
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
index 790a0c38f0c..b810a4d1e9a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXSurfaceData.java
@@ -52,6 +52,7 @@ protected GLXSurfaceData(X11ComponentPeer peer, GLXGraphicsConfig gc,
         initOps(gc, peer, graphicsConfig.getAData());
     }
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsConfig;
     }
@@ -112,7 +113,7 @@ public static GLXGraphicsConfig getGC(X11ComponentPeer peer) {
         }
     }
 
-    public static class GLXWindowSurfaceData extends GLXSurfaceData {
+    public static final class GLXWindowSurfaceData extends GLXSurfaceData {
         protected final int scale;
 
         public GLXWindowSurfaceData(X11ComponentPeer peer,
@@ -122,10 +123,12 @@ public GLXWindowSurfaceData(X11ComponentPeer peer,
             scale = gc.getScale();
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return peer.getSurfaceData();
         }
 
+        @Override
         public Rectangle getBounds() {
             Rectangle r = peer.getBounds();
             r.x = r.y = 0;
@@ -137,6 +140,7 @@ public Rectangle getBounds() {
         /**
          * Returns destination Component associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return peer.getTarget();
         }
@@ -161,7 +165,7 @@ public double getDefaultScaleY() {
      * belongs to is showed, it is first copied to the real private
      * FLIP_BACKBUFFER, which is then flipped.
      */
-    public static class GLXVSyncOffScreenSurfaceData extends
+    public static final class GLXVSyncOffScreenSurfaceData extends
         GLXOffScreenSurfaceData
     {
         private GLXOffScreenSurfaceData flipSurface;
@@ -210,10 +214,12 @@ public GLXOffScreenSurfaceData(X11ComponentPeer peer,
             initSurface(this.width, this.height);
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return restoreContents(offscreenImage);
         }
 
+        @Override
         public Rectangle getBounds() {
             if (type == FLIP_BACKBUFFER) {
                 Rectangle r = peer.getBounds();
@@ -229,6 +235,7 @@ public Rectangle getBounds() {
         /**
          * Returns destination Image associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return offscreenImage;
         }
diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
index 3657b46373b..73974ab2703 100644
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java
@@ -44,7 +44,7 @@
 import static sun.java2d.pipe.hw.AccelSurface.*;
 import static sun.java2d.pipe.hw.ExtendedBufferCapabilities.VSyncType.*;
 
-public class GLXVolatileSurfaceManager extends VolatileSurfaceManager {
+public final class GLXVolatileSurfaceManager extends VolatileSurfaceManager {
 
     private final boolean accelerationEnabled;
 
@@ -63,6 +63,7 @@ public GLXVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
                 && transparency != Transparency.BITMASK;
     }
 
+    @Override
     protected boolean isAccelerationEnabled() {
         return accelerationEnabled;
     }
@@ -71,6 +72,7 @@ protected boolean isAccelerationEnabled() {
      * Create a FBO-based SurfaceData object (or init the backbuffer
      * of an existing window if this is a double buffered GraphicsConfig)
      */
+    @Override
     protected SurfaceData initAcceleratedSurface() {
         SurfaceData sData;
         Component comp = vImg.getComponent();
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
index c01595a1e52..f8ea7dd759a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitBgLoops.java
@@ -45,7 +45,7 @@
  * this type of BlitBg will accelerated double-buffer copies between those
  * two surfaces.
 */
-public class X11PMBlitBgLoops extends BlitBg {
+public final class X11PMBlitBgLoops extends BlitBg {
 
     public static void register()
     {
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
index 486bc0e69ff..a6effd74fe8 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11PMBlitLoops.java
@@ -47,7 +47,7 @@
  * this type of Blit will accelerated double-buffer copies between those
  * two surfaces.
 */
-public class X11PMBlitLoops extends Blit {
+public final class X11PMBlitLoops extends Blit {
 
     public static void register()
     {
@@ -144,6 +144,7 @@ public X11PMBlitLoops(SurfaceType srcType, SurfaceType dstType,
               dstType);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst,
                      Composite comp, Region clip,
                      int sx, int sy,
@@ -180,7 +181,7 @@ private native void nativeBlit(long srcData, long dstData,
      * the pixel data and then updates the X11 clipping bitmask from
      * the transparent pixels in the source.
      */
-    static class DelegateBlitLoop extends Blit {
+    static final class DelegateBlitLoop extends Blit {
         SurfaceType dstType;
 
         /**
@@ -194,6 +195,7 @@ public DelegateBlitLoop(SurfaceType realDstType, SurfaceType delegateDstType) {
             this.dstType = delegateDstType;
         }
 
+        @Override
         public void Blit(SurfaceData src, SurfaceData dst,
                          Composite comp, Region clip,
                          int sx, int sy, int dx, int dy, int w, int h)
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
index bd55d001a2a..5c65c2f51da 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java
@@ -81,6 +81,7 @@ private long validate(SunGraphics2D sg2d) {
     native void XDrawLine(long pXSData, long xgc,
                           int x1, int y1, int x2, int y2);
 
+    @Override
     public void drawLine(SunGraphics2D sg2d, int x1, int y1, int x2, int y2) {
         SunToolkit.awtLock();
         try {
@@ -97,6 +98,7 @@ public void drawLine(SunGraphics2D sg2d, int x1, int y1, int x2, int y2) {
     native void XDrawRect(long pXSData, long xgc,
                           int x, int y, int w, int h);
 
+    @Override
     public void drawRect(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -114,6 +116,7 @@ native void XDrawRoundRect(long pXSData, long xgc,
                                int x, int y, int w, int h,
                                int arcW, int arcH);
 
+    @Override
     public void drawRoundRect(SunGraphics2D sg2d,
                               int x, int y, int width, int height,
                               int arcWidth, int arcHeight)
@@ -132,6 +135,7 @@ public void drawRoundRect(SunGraphics2D sg2d,
     native void XDrawOval(long pXSData, long xgc,
                           int x, int y, int w, int h);
 
+    @Override
     public void drawOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -149,6 +153,7 @@ native void XDrawArc(long pXSData, long xgc,
                          int x, int y, int w, int h,
                          int angleStart, int angleExtent);
 
+    @Override
     public void drawArc(SunGraphics2D sg2d,
                         int x, int y, int width, int height,
                         int startAngle, int arcAngle)
@@ -169,6 +174,7 @@ native void XDrawPoly(long pXSData, long xgc,
                           int[] xpoints, int[] ypoints,
                           int npoints, boolean isclosed);
 
+    @Override
     public void drawPolyline(SunGraphics2D sg2d,
                              int[] xpoints, int[] ypoints,
                              int npoints)
@@ -184,6 +190,7 @@ public void drawPolyline(SunGraphics2D sg2d,
         }
     }
 
+    @Override
     public void drawPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints,
                             int npoints)
@@ -202,6 +209,7 @@ public void drawPolygon(SunGraphics2D sg2d,
     native void XFillRect(long pXSData, long xgc,
                           int x, int y, int w, int h);
 
+    @Override
     public void fillRect(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -219,6 +227,7 @@ native void XFillRoundRect(long pXSData, long xgc,
                                int x, int y, int w, int h,
                                int arcW, int arcH);
 
+    @Override
     public void fillRoundRect(SunGraphics2D sg2d,
                               int x, int y, int width, int height,
                               int arcWidth, int arcHeight)
@@ -237,6 +246,7 @@ public void fillRoundRect(SunGraphics2D sg2d,
     native void XFillOval(long pXSData, long xgc,
                           int x, int y, int w, int h);
 
+    @Override
     public void fillOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height)
     {
@@ -254,6 +264,7 @@ native void XFillArc(long pXSData, long xgc,
                          int x, int y, int w, int h,
                          int angleStart, int angleExtent);
 
+    @Override
     public void fillArc(SunGraphics2D sg2d,
                         int x, int y, int width, int height,
                         int startAngle, int arcAngle)
@@ -274,6 +285,7 @@ native void XFillPoly(long pXSData, long xgc,
                           int[] xpoints, int[] ypoints,
                           int npoints);
 
+    @Override
     public void fillPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints,
                             int npoints)
@@ -322,6 +334,7 @@ private void doPath(SunGraphics2D sg2d, Shape s, boolean isFill) {
         }
     }
 
+    @Override
     public void draw(SunGraphics2D sg2d, Shape s) {
         if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) {
             // Delegate to drawPolygon() if possible...
@@ -359,6 +372,7 @@ public void draw(SunGraphics2D sg2d, Shape s) {
         }
     }
 
+    @Override
     public void fill(SunGraphics2D sg2d, Shape s) {
         if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) {
             // Delegate to fillPolygon() if possible...
@@ -418,19 +432,22 @@ native void devCopyArea(long sdOps, long xgc,
                             int dstx, int dsty,
                             int w, int h);
 
-    public static class X11TracingRenderer extends X11Renderer {
+    public static final class X11TracingRenderer extends X11Renderer {
+        @Override
         void XDrawLine(long pXSData, long xgc,
                        int x1, int y1, int x2, int y2)
         {
             GraphicsPrimitive.tracePrimitive("X11DrawLine");
             super.XDrawLine(pXSData, xgc, x1, y1, x2, y2);
         }
+        @Override
         void XDrawRect(long pXSData, long xgc,
                        int x, int y, int w, int h)
         {
             GraphicsPrimitive.tracePrimitive("X11DrawRect");
             super.XDrawRect(pXSData, xgc, x, y, w, h);
         }
+        @Override
         void XDrawRoundRect(long pXSData, long xgc,
                             int x, int y, int w, int h,
                             int arcW, int arcH)
@@ -438,12 +455,14 @@ void XDrawRoundRect(long pXSData, long xgc,
             GraphicsPrimitive.tracePrimitive("X11DrawRoundRect");
             super.XDrawRoundRect(pXSData, xgc, x, y, w, h, arcW, arcH);
         }
+        @Override
         void XDrawOval(long pXSData, long xgc,
                        int x, int y, int w, int h)
         {
             GraphicsPrimitive.tracePrimitive("X11DrawOval");
             super.XDrawOval(pXSData, xgc, x, y, w, h);
         }
+        @Override
         void XDrawArc(long pXSData, long xgc,
                       int x, int y, int w, int h,
                       int angleStart, int angleExtent)
@@ -452,6 +471,7 @@ void XDrawArc(long pXSData, long xgc,
             super.XDrawArc(pXSData, xgc,
                            x, y, w, h, angleStart, angleExtent);
         }
+        @Override
         void XDrawPoly(long pXSData, long xgc,
                        int transx, int transy,
                        int[] xpoints, int[] ypoints,
@@ -461,6 +481,7 @@ void XDrawPoly(long pXSData, long xgc,
             super.XDrawPoly(pXSData, xgc, transx, transy,
                             xpoints, ypoints, npoints, isclosed);
         }
+        @Override
         void XDoPath(SunGraphics2D sg2d, long pXSData, long xgc,
                      int transX, int transY, Path2D.Float p2df,
                      boolean isFill)
@@ -470,12 +491,14 @@ void XDoPath(SunGraphics2D sg2d, long pXSData, long xgc,
                                              "X11DrawPath");
             super.XDoPath(sg2d, pXSData, xgc, transX, transY, p2df, isFill);
         }
+        @Override
         void XFillRect(long pXSData, long xgc,
                        int x, int y, int w, int h)
         {
             GraphicsPrimitive.tracePrimitive("X11FillRect");
             super.XFillRect(pXSData, xgc, x, y, w, h);
         }
+        @Override
         void XFillRoundRect(long pXSData, long xgc,
                             int x, int y, int w, int h,
                             int arcW, int arcH)
@@ -483,12 +506,14 @@ void XFillRoundRect(long pXSData, long xgc,
             GraphicsPrimitive.tracePrimitive("X11FillRoundRect");
             super.XFillRoundRect(pXSData, xgc, x, y, w, h, arcW, arcH);
         }
+        @Override
         void XFillOval(long pXSData, long xgc,
                        int x, int y, int w, int h)
         {
             GraphicsPrimitive.tracePrimitive("X11FillOval");
             super.XFillOval(pXSData, xgc, x, y, w, h);
         }
+        @Override
         void XFillArc(long pXSData, long xgc,
                       int x, int y, int w, int h,
                       int angleStart, int angleExtent)
@@ -497,6 +522,7 @@ void XFillArc(long pXSData, long xgc,
             super.XFillArc(pXSData, xgc,
                            x, y, w, h, angleStart, angleExtent);
         }
+        @Override
         void XFillPoly(long pXSData, long xgc,
                        int transx, int transy,
                        int[] xpoints, int[] ypoints,
@@ -506,6 +532,7 @@ void XFillPoly(long pXSData, long xgc,
             super.XFillPoly(pXSData, xgc,
                             transx, transy, xpoints, ypoints, npoints);
         }
+        @Override
         void XFillSpans(long pXSData, long xgc,
                         SpanIterator si, long iterator, int transx, int transy)
         {
@@ -513,6 +540,7 @@ void XFillSpans(long pXSData, long xgc,
             super.XFillSpans(pXSData, xgc,
                              si, iterator, transx, transy);
         }
+        @Override
         void devCopyArea(long sdOps, long xgc,
                          int srcx, int srcy,
                          int dstx, int dsty,
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
index 862baf6ce4f..39e34e40b16 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceData.java
@@ -196,6 +196,7 @@ protected native void initSurface(int depth, int width, int height,
 
     private static Boolean accelerationEnabled = null;
 
+    @Override
     public Raster getRaster(int x, int y, int w, int h) {
         throw new InternalError("not implemented yet");
     }
@@ -272,6 +273,7 @@ public SurfaceDataProxy makeProxyFor(SurfaceData srcData) {
         return X11SurfaceDataProxy.createProxy(srcData, graphicsConfig);
     }
 
+    @Override
     public void validatePipe(SunGraphics2D sg2d) {
         if (sg2d.antialiasHint != SunHints.INTVAL_ANTIALIAS_ON &&
             sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
@@ -376,6 +378,7 @@ public void validatePipe(SunGraphics2D sg2d) {
         }
     }
 
+    @Override
     public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
             sg2d.compositeState <= SunGraphics2D.COMP_ISCOPY)
@@ -385,6 +388,7 @@ public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         return super.getRenderLoops(sg2d);
     }
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsConfig;
     }
@@ -458,6 +462,7 @@ public static X11GraphicsConfig getGC(X11ComponentPeer peer) {
      */
     public abstract boolean canSourceSendExposures(int x, int y, int w, int h);
 
+    @Override
     public boolean copyArea(SunGraphics2D sg2d,
                             int x, int y, int w, int h, int dx, int dy)
     {
@@ -591,6 +596,7 @@ public static SurfaceType getSurfaceType(X11GraphicsConfig gc,
         return sType;
     }
 
+    @Override
     public void invalidate() {
         if (isValid()) {
             setInvalid();
@@ -707,10 +713,12 @@ public X11WindowSurfaceData(X11ComponentPeer peer,
             }
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return peer.getSurfaceData();
         }
 
+        @Override
         public Rectangle getBounds() {
             Rectangle r = peer.getBounds();
             r.x = r.y = 0;
@@ -727,6 +735,7 @@ public boolean canSourceSendExposures(int x, int y, int w, int h) {
         /**
          * Returns destination Component associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return peer.getTarget();
         }
@@ -767,6 +776,7 @@ public X11PixmapSurfaceData(X11GraphicsConfig gc,
             makePipes();
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return restoreContents(offscreenImage);
         }
@@ -779,10 +789,12 @@ public SurfaceData getReplacement() {
          * it could choose wrong loop (blit instead of blitbg,
          * for example).
          */
+        @Override
         public int getTransparency() {
             return transparency;
         }
 
+        @Override
         public Rectangle getBounds() {
             return new Rectangle(width, height);
         }
@@ -792,6 +804,7 @@ public boolean canSourceSendExposures(int x, int y, int w, int h) {
             return (x < 0 || y < 0 || (x+w) > width || (y+h) > height);
         }
 
+        @Override
         public void flush() {
             /*
              * We need to invalidate the surface before disposing the
@@ -808,6 +821,7 @@ public void flush() {
         /**
          * Returns destination Image associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return offscreenImage;
         }
@@ -825,7 +839,8 @@ public double getDefaultScaleY() {
 
     private static LazyPipe lazypipe = new LazyPipe();
 
-    public static class LazyPipe extends ValidatePipe {
+    public static final class LazyPipe extends ValidatePipe {
+        @Override
         public boolean validate(SunGraphics2D sg2d) {
             X11SurfaceData xsd = (X11SurfaceData) sg2d.surfaceData;
             if (!xsd.isDrawableValid()) {
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
index e55c663181f..70ec7f8724a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11SurfaceDataProxy.java
@@ -115,11 +115,12 @@ public SurfaceData validateSurfaceData(SurfaceData srcData,
      * Proxy for opaque source images.
      * This proxy can accelerate unscaled Src copies.
      */
-    public static class Opaque extends X11SurfaceDataProxy {
+    public static final class Opaque extends X11SurfaceDataProxy {
         public Opaque(X11GraphicsConfig x11gc) {
             super(x11gc);
         }
 
+        @Override
         public int getTransparency() {
             return Transparency.OPAQUE;
         }
@@ -141,11 +142,12 @@ public boolean isSupportedOperation(SurfaceData srcData,
      * This proxy can accelerate unscaled Src copies or
      * unscaled SrcOver copies that use an opaque bgColor.
      */
-    public static class Bitmask extends X11SurfaceDataProxy {
+    public static final class Bitmask extends X11SurfaceDataProxy {
         public Bitmask(X11GraphicsConfig x11gc) {
             super(x11gc);
         }
 
+        @Override
         public int getTransparency() {
             return Transparency.BITMASK;
         }
diff --git a/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
index 27b79c00a4a..88609597f05 100644
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11VolatileSurfaceManager.java
@@ -44,7 +44,7 @@
  * (BufImgSurfaceData) that will be used until the accelerated
  * SurfaceData can be restored.
  */
-public class X11VolatileSurfaceManager extends VolatileSurfaceManager {
+public final class X11VolatileSurfaceManager extends VolatileSurfaceManager {
 
     private boolean accelerationEnabled;
 
@@ -73,6 +73,7 @@ public X11VolatileSurfaceManager(SunVolatileImage vImg, Object context) {
         }
     }
 
+    @Override
     protected boolean isAccelerationEnabled() {
         return accelerationEnabled;
     }
@@ -80,6 +81,7 @@ protected boolean isAccelerationEnabled() {
     /**
      * Create a pixmap-based SurfaceData object
      */
+    @Override
     protected SurfaceData initAcceleratedSurface() {
         SurfaceData sData;
 
@@ -103,6 +105,7 @@ protected SurfaceData initAcceleratedSurface() {
         return sData;
     }
 
+    @Override
     protected boolean isConfigValid(GraphicsConfiguration gc) {
         // REMIND: we might be too paranoid here, requiring that
         // the GC be exactly the same as the original one.  The
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java b/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
index bc855aa4940..bc0cc0b7b77 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/DirtyRegion.java
@@ -35,7 +35,7 @@
  * @author Clemens Eisserer
  */
 
-public class DirtyRegion implements Cloneable {
+public final class DirtyRegion implements Cloneable {
     int x, y, x2, y2;
 
     public DirtyRegion() {
@@ -116,6 +116,7 @@ public void translate(int x, int y) {
         }
     }
 
+    @Override
     public String toString() {
         return this.getClass().getName() +
                 "(x: " + x + ", y:" + y + ", x2:" + x2 + ", y2:" + y2 + ")";
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
index 652dbd20637..1a5b615c96d 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableByteArray.java
@@ -34,7 +34,7 @@
  * @author Clemens Eisserer
  */
 
-public class GrowableByteArray
+public final class GrowableByteArray
 {
 
         byte[] array;
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
index bb2070ec9d0..7ec0665db5c 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableEltArray.java
@@ -31,7 +31,7 @@
  *
  * @author Clemens Eisserer
  */
-public class GrowableEltArray extends GrowableIntArray {
+public final class GrowableEltArray extends GrowableIntArray {
     private static final int ELT_SIZE = 4;
     GrowableIntArray glyphs;
 
@@ -77,6 +77,7 @@ public GrowableIntArray getGlyphs() {
         return glyphs;
     }
 
+    @Override
     public void clear() {
         glyphs.clear();
         super.clear();
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
index bdcd3bd235b..1f3eb88e91c 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowablePointArray.java
@@ -30,7 +30,7 @@
  *
  * @author Clemens Eisserer
  */
-public class GrowablePointArray extends GrowableIntArray
+public final class GrowablePointArray extends GrowableIntArray
 {
 
         private static final int POINT_SIZE = 2;
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
index 031fe5914f4..e611aae4e3b 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/GrowableRectArray.java
@@ -30,7 +30,7 @@
  *
  * @author Clemens Eisserer
  */
-public class GrowableRectArray extends GrowableIntArray {
+public final class GrowableRectArray extends GrowableIntArray {
 
     private static final int RECT_SIZE = 4;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
index 35deca44e18..d2d0f09ad0a 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTile.java
@@ -31,7 +31,7 @@
  *
  * @author Clemens Eisserer
  */
-public class MaskTile {
+public final class MaskTile {
     GrowableRectArray rects;
     DirtyRegion dirtyArea;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
index 947919f9247..7e58e530353 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MaskTileManager.java
@@ -38,7 +38,7 @@
  * @author Clemens Eisserer
  */
 
-public class MaskTileManager {
+public final class MaskTileManager {
 
     public static final int MASK_SIZE = 256;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java b/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
index be5f8891be9..62bb8c255e9 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/MutableInteger.java
@@ -31,17 +31,19 @@
  * @author Clemens Eisserer
  */
 
-public class MutableInteger {
+public final class MutableInteger {
     private int value;
 
     public MutableInteger(int value) {
         this.setValue(value);
     }
 
+    @Override
     public int hashCode() {
         return getValue();
     }
 
+    @Override
     public boolean equals(Object o) {
         return (o instanceof MutableInteger) &&
                (((MutableInteger) o).getValue() == getValue());
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java b/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
index b99666bb3b0..359c4d9f536 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XIDGenerator.java
@@ -33,7 +33,7 @@
  * @author Clemens Eisserer
  */
 
-public class XIDGenerator {
+public final class XIDGenerator {
     private static final int XID_BUFFER_SIZE = 512;
 
     int[] xidBuffer = new int[XID_BUFFER_SIZE];
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
index e5f337d3415..589f17968c4 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRBackendNative.java
@@ -40,7 +40,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRBackendNative implements XRBackend {
+public final class XRBackendNative implements XRBackend {
 
     static {
         initIDs();
@@ -52,34 +52,45 @@ public class XRBackendNative implements XRBackend {
 
     private static native void initIDs();
 
+    @Override
     public native long createGC(int drawable);
 
+    @Override
     public native void freeGC(long gc);
 
+    @Override
     public native int createPixmap(int drawable, int depth,
                                    int width, int height);
 
     private native int createPictureNative(int drawable, long formatID);
 
+    @Override
     public native void freePicture(int picture);
 
+    @Override
     public native void freePixmap(int pixmap);
 
+    @Override
     public native void setGCExposures(long gc, boolean exposure);
 
+    @Override
     public native void setGCForeground(long gc, int pixel);
 
+    @Override
     public native void setPictureRepeat(int picture, int repeat);
 
+    @Override
     public native void copyArea(int src, int dst, long gc,
                                 int srcx, int srcy, int width, int height,
                                  int dstx, int dsty);
 
+    @Override
     public native void setGCMode(long gc, boolean copy);
 
     private static native void GCRectanglesNative(int drawable, long gc,
                                                   int[] rectArray, int rectCnt);
 
+    @Override
     public native void renderComposite(byte op, int src, int mask,
                                        int dst, int srcX, int srcY,
                                        int maskX, int maskY, int dstX, int dstY,
@@ -113,20 +124,24 @@ private native void XRSetTransformNative(int pic,
                                           int innerRadius, int outerRadius,
                                           int repeat);
 
+    @Override
     public native void setFilter(int picture, int filter);
 
     private static native void XRSetClipNative(long dst,
                                                int x1, int y1, int x2, int y2,
                                                Region clip, boolean isGC);
 
+    @Override
     public void GCRectangles(int drawable, long gc, GrowableRectArray rects) {
         GCRectanglesNative(drawable, gc, rects.getArray(), rects.getSize());
     }
 
+    @Override
     public int createPicture(int drawable, int formatID) {
         return createPictureNative(drawable, getFormatPtr(formatID));
     }
 
+    @Override
     public void setPictureTransform(int picture, AffineTransform transform) {
         XRSetTransformNative(picture,
                              XDoubleToFixed(transform.getScaleX()),
@@ -137,6 +152,7 @@ public void setPictureTransform(int picture, AffineTransform transform) {
                              XDoubleToFixed(transform.getTranslateY()));
     }
 
+    @Override
     public void renderRectangle(int dst, byte op, XRColor color,
                                 int x, int y, int width, int height) {
         renderRectangle(dst, op, (short)color.red, (short)color.green,
@@ -170,6 +186,7 @@ private static long getFormatPtr(int formatID) {
         return 0L;
     }
 
+    @Override
     public int createLinearGradient(Point2D p1, Point2D p2, float[] fractions,
                               int[] pixels,  int repeat) {
 
@@ -182,6 +199,7 @@ public int createLinearGradient(Point2D p1, Point2D p2, float[] fractions,
         return gradient;
     }
 
+    @Override
     public int createRadialGradient(float centerX, float centerY,
                                    float innerRadius, float outerRadius,
                                    float[] fractions, int[] pixels, int repeat) {
@@ -196,12 +214,14 @@ public int createRadialGradient(float centerX, float centerY,
               repeat);
     }
 
+    @Override
     public void setGCClipRectangles(long gc, Region clip) {
         XRSetClipNative(gc, clip.getLoX(), clip.getLoY(),
                         clip.getHiX(), clip.getHiY(),
                         clip.isRectangular() ? null : clip, true);
     }
 
+    @Override
     public void setClipRectangles(int picture, Region clip) {
         if (clip != null) {
             XRSetClipNative(picture, clip.getLoX(), clip.getLoY(),
@@ -212,6 +232,7 @@ public void setClipRectangles(int picture, Region clip) {
         }
     }
 
+    @Override
     public void renderRectangles(int dst, byte op, XRColor color,
                                  GrowableRectArray rects) {
         XRenderRectanglesNative(dst, op,
@@ -229,6 +250,7 @@ private static long[] getGlyphInfoPtrs(List<XRGlyphCacheEntry> cacheEntries) {
         return glyphInfoPtrs;
     }
 
+    @Override
     public void XRenderAddGlyphs(int glyphSet, GlyphList gl,
                                  List<XRGlyphCacheEntry> cacheEntries,
                                  byte[] pixelData) {
@@ -237,6 +259,7 @@ public void XRenderAddGlyphs(int glyphSet, GlyphList gl,
                           glyphInfoPtrs.length, pixelData, pixelData.length);
     }
 
+    @Override
     public void XRenderFreeGlyphs(int glyphSet, int[] gids) {
         XRFreeGlyphsNative(glyphSet, gids, gids.length);
     }
@@ -256,12 +279,14 @@ private static native void XRFreeGlyphsNative(int glyphSet,
                                    int[] eltArray, int[] glyphIDs, int eltCnt,
                                    int glyphCnt);
 
+    @Override
     public int XRenderCreateGlyphSet(int formatID) {
         return XRenderCreateGlyphSetNative(getFormatPtr(formatID));
     }
 
     private static native int XRenderCreateGlyphSetNative(long format);
 
+    @Override
     public void XRenderCompositeText(byte op, int src, int dst,
                                      int maskFormatID,
                                      int sx, int sy, int dx, int dy,
@@ -273,6 +298,7 @@ public void XRenderCompositeText(byte op, int src, int dst,
                                    glyphs.getSize());
     }
 
+    @Override
     public void putMaskImage(int drawable, long gc, byte[] imageData,
                              int sx, int sy, int dx, int dy,
                              int width, int height, int maskOff,
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
index d983b8d1336..eb1604374bb 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRColor.java
@@ -33,7 +33,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRColor {
+public final class XRColor {
     public static final XRColor FULL_ALPHA = new XRColor(0xffff, 0, 0, 0);
     public static final XRColor NO_ALPHA = new XRColor(0, 0, 0, 0);
 
@@ -109,6 +109,7 @@ public static int byteToXRColorValue(int byteValue) {
         return xrValue;
     }
 
+    @Override
     public String toString(){
         return "A:"+alpha+"  R:"+red+"  G:"+green+" B:"+blue;
     }
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
index 20f09ed5de6..14182011345 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRCompositeManager.java
@@ -44,7 +44,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRCompositeManager {
+public final class XRCompositeManager {
     private static boolean enableGradCache = true;
     private static XRCompositeManager instance;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
index 69502f2ee2a..c78303236c6 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
@@ -37,7 +37,7 @@
  * Class used for re-routing transformed blits to the accelerated loops.
  */
 
-public class XRDrawImage extends DrawImage {
+public final class XRDrawImage extends DrawImage {
 
     @Override
     protected void renderImageXform(SunGraphics2D sg, Image img,
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
index f2d6b3f15ff..6b76e4ee388 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawLine.java
@@ -32,7 +32,7 @@
  */
 package sun.java2d.xr;
 
-public class XRDrawLine {
+public final class XRDrawLine {
     static final int BIG_MAX = ((1 << 29) - 1);
     static final int BIG_MIN = (-(1 << 29));
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
index 43f17e11ae1..748286a0828 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRGraphicsConfig.java
@@ -34,7 +34,7 @@
 import sun.awt.image.VolatileSurfaceManager;
 import sun.java2d.SurfaceData;
 
-public class XRGraphicsConfig extends X11GraphicsConfig implements
+public final class XRGraphicsConfig extends X11GraphicsConfig implements
         SurfaceManager.ProxiedGraphicsConfig {
     private final SurfaceManager.ProxyCache surfaceDataProxyCache =
             new SurfaceManager.ProxyCache();
@@ -44,6 +44,7 @@ private XRGraphicsConfig(X11GraphicsDevice device, int visualnum,
         super(device, visualnum, depth, colormap, doubleBuffer);
     }
 
+    @Override
     public SurfaceData createSurfaceData(X11ComponentPeer peer) {
         return XRSurfaceData.createData(peer);
     }
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
index 247faa876a3..0600f6c4bcf 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskBlit.java
@@ -41,7 +41,7 @@
  *
  * @author Clemens Eisserer
  */
-public class XRMaskBlit extends MaskBlit {
+public final class XRMaskBlit extends MaskBlit {
     static void register() {
         GraphicsPrimitive[] primitives = {
                 new XRMaskBlit(XRSurfaceData.IntArgbPreX11, SrcOver,
@@ -65,6 +65,7 @@ protected native void maskBlit(long srcXsdo, long dstxsdo, int srcx,
             int srcy, int dstx, int dsty, int w, int h, int maskoff,
             int maskscan, int masklen, byte[] mask);
 
+    @Override
     public void MaskBlit(SurfaceData src, SurfaceData dst, Composite comp,
             Region clip, int srcx, int srcy, int dstx, int dsty, int width,
             int height, byte[] mask, int maskoff, int maskscan) {
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
index 24632983767..993b329e3bc 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskFill.java
@@ -44,7 +44,7 @@
 import sun.java2d.*;
 import sun.java2d.loops.*;
 
-public class XRMaskFill extends MaskFill {
+public final class XRMaskFill extends MaskFill {
     static void register() {
         GraphicsPrimitive[] primitives = {
                 new XRMaskFill(AnyColor, SrcOver, XRSurfaceData.IntRgbX11),
@@ -93,6 +93,7 @@ protected XRMaskFill(SurfaceType srcType, CompositeType compType,
     protected native void maskFill(long xsdo, int x, int y, int w, int h,
             int maskoff, int maskscan, int masklen, byte[] mask);
 
+    @Override
     public void MaskFill(SunGraphics2D sg2d, SurfaceData sData, Composite comp,
             final int x, final int y, final int w, final int h,
             final byte[] mask, final int maskoff, final int maskscan) {
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
index bf1c14b1e05..cae3b6af563 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRMaskImage.java
@@ -34,7 +34,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRMaskImage {
+public final class XRMaskImage {
 
     private static final int MASK_SCALE_FACTOR = 8;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
index abff8138ca8..260bd629094 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java
@@ -162,11 +162,12 @@ protected static XRSurfaceData cacheToTmpSurface(SurfaceData src, XRSurfaceData
     }
 }
 
-class XRPMBlit extends Blit {
+final class XRPMBlit extends Blit {
     public XRPMBlit(SurfaceType srcType, SurfaceType dstType) {
         super(srcType, CompositeType.AnyAlpha, dstType);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst, Composite comp, Region clip, int sx, int sy, int dx, int dy, int w, int h) {
         try {
             SunToolkit.awtLock();
@@ -185,11 +186,12 @@ public void Blit(SurfaceData src, SurfaceData dst, Composite comp, Region clip,
     }
 }
 
-class XRPMScaledBlit extends ScaledBlit {
+final class XRPMScaledBlit extends ScaledBlit {
     public XRPMScaledBlit(SurfaceType srcType, SurfaceType dstType) {
         super(srcType, CompositeType.AnyAlpha, dstType);
     }
 
+    @Override
     @SuppressWarnings("cast")
     public void Scale(SurfaceData src, SurfaceData dst, Composite comp, Region clip, int sx1, int sy1, int sx2, int sy2, double dx1, double dy1,
             double dx2, double dy2) {
@@ -229,7 +231,7 @@ public void Scale(SurfaceData src, SurfaceData dst, Composite comp, Region clip,
  *
  * @author Clemens Eisserer
  */
-class XRPMTransformedBlit extends TransformBlit {
+final class XRPMTransformedBlit extends TransformBlit {
     final Rectangle compositeBounds = new Rectangle();
     final double[] srcCoords = new double[8];
     final double[] dstCoords = new double[8];
@@ -290,6 +292,7 @@ protected void adjustCompositeBounds(boolean isQuadrantRotated, AffineTransform
         compositeBounds.height = (int) (maxY - minY);
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst, Composite comp, Region clip, AffineTransform xform,
             int hint, int srcx, int srcy, int dstx, int dsty, int width, int height) {
         try {
@@ -346,7 +349,7 @@ public void Transform(SurfaceData src, SurfaceData dst, Composite comp, Region c
     }
 }
 
-class XrSwToPMBlit extends Blit {
+final class XrSwToPMBlit extends Blit {
     Blit pmToSurfaceBlit;
 
     XrSwToPMBlit(SurfaceType srcType, SurfaceType dstType) {
@@ -354,6 +357,7 @@ class XrSwToPMBlit extends Blit {
         pmToSurfaceBlit = new XRPMBlit(dstType, dstType);
     }
 
+    @Override
     public void Blit(SurfaceData src, SurfaceData dst, Composite comp, Region clip, int sx, int sy, int dx, int dy, int w, int h) {
         try {
             SunToolkit.awtLock();
@@ -366,7 +370,7 @@ public void Blit(SurfaceData src, SurfaceData dst, Composite comp, Region clip,
     }
 }
 
-class XrSwToPMScaledBlit extends ScaledBlit {
+final class XrSwToPMScaledBlit extends ScaledBlit {
     ScaledBlit pmToSurfaceBlit;
 
     XrSwToPMScaledBlit(SurfaceType srcType, SurfaceType dstType) {
@@ -374,6 +378,7 @@ class XrSwToPMScaledBlit extends ScaledBlit {
         pmToSurfaceBlit = new XRPMScaledBlit(dstType, dstType);
     }
 
+    @Override
     public void Scale(SurfaceData src, SurfaceData dst, Composite comp, Region clip, int sx1, int sy1, int sx2, int sy2, double dx1, double dy1,
             double dx2, double dy2) {
         {
@@ -391,7 +396,7 @@ public void Scale(SurfaceData src, SurfaceData dst, Composite comp, Region clip,
     }
 }
 
-class XrSwToPMTransformedBlit extends TransformBlit {
+final class XrSwToPMTransformedBlit extends TransformBlit {
     TransformBlit pmToSurfaceBlit;
 
     XrSwToPMTransformedBlit(SurfaceType srcType, SurfaceType dstType) {
@@ -399,6 +404,7 @@ class XrSwToPMTransformedBlit extends TransformBlit {
         pmToSurfaceBlit = new XRPMTransformedBlit(dstType, dstType);
     }
 
+    @Override
     public void Transform(SurfaceData src, SurfaceData dst, Composite comp, Region clip, AffineTransform xform, int hint, int sx, int sy, int dstx,
             int dsty, int w, int h) {
         try {
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
index 1b8576c385d..8720dca6094 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java
@@ -91,7 +91,7 @@ static void setPaint(SunGraphics2D sg2d, Paint paint) {
 
     abstract void setXRPaint(SunGraphics2D sg2d, Paint paint);
 
-    private static class XRGradient extends XRPaints {
+    private static final class XRGradient extends XRPaints {
         private XRGradient() {
         }
 
@@ -126,7 +126,7 @@ public int getGradientLength(Point2D pt1, Point2D pt2) {
            return (int) Math.ceil(Math.sqrt(xDiff*xDiff + yDiff*yDiff));
     }
 
-    private static class XRLinearGradient extends XRPaints {
+    private static final class XRLinearGradient extends XRPaints {
 
         @Override
         boolean isPaintValid(SunGraphics2D sg2d) {
@@ -163,7 +163,7 @@ void setXRPaint(SunGraphics2D sg2d, Paint pt) {
         }
     }
 
-    private static class XRRadialGradient extends XRPaints {
+    private static final class XRRadialGradient extends XRPaints {
 
         @Override
         boolean isPaintValid(SunGraphics2D sg2d) {
@@ -204,7 +204,7 @@ void setXRPaint(SunGraphics2D sg2d, Paint pt) {
         }
     }
 
-    private static class XRTexture extends XRPaints {
+    private static final class XRTexture extends XRPaints {
 
         private XRSurfaceData getAccSrcSurface(XRSurfaceData dstData, BufferedImage bi) {
             // REMIND: this is a hack that attempts to cache the system
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
index 07c8a1d877d..a142d9efda7 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java
@@ -51,7 +51,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRRenderer implements PixelDrawPipe, PixelFillPipe, ShapeDrawPipe {
+public final class XRRenderer implements PixelDrawPipe, PixelFillPipe, ShapeDrawPipe {
     XRDrawHandler drawHandler;
     MaskTileManager tileManager;
     XRDrawLine lineGen;
@@ -77,6 +77,7 @@ private void validateSurface(SunGraphics2D sg2d) {
                                                sg2d.paint, sg2d);
     }
 
+    @Override
     public void drawLine(SunGraphics2D sg2d, int x1, int y1, int x2, int y2) {
         Region compClip = sg2d.getCompClip();
         int transX1 = Region.clipAdd(x1, sg2d.transX);
@@ -96,11 +97,13 @@ public void drawLine(SunGraphics2D sg2d, int x1, int y1, int x2, int y2) {
         }
     }
 
+    @Override
     public void drawRect(SunGraphics2D sg2d,
                          int x, int y, int width, int height) {
         draw(sg2d, new Rectangle2D.Float(x, y, width, height));
     }
 
+    @Override
     public void drawPolyline(SunGraphics2D sg2d,
                              int[] xpoints, int[] ypoints, int npoints) {
         Path2D.Float p2d = new Path2D.Float();
@@ -114,11 +117,13 @@ public void drawPolyline(SunGraphics2D sg2d,
         draw(sg2d, p2d);
     }
 
+    @Override
     public void drawPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints, int npoints) {
         draw(sg2d, new Polygon(xpoints, ypoints, npoints));
     }
 
+    @Override
     public void fillRect(SunGraphics2D sg2d, int x, int y, int width, int height) {
         x = Region.clipAdd(x, sg2d.transX);
         y = Region.clipAdd(y, sg2d.transY);
@@ -158,11 +163,13 @@ public void fillRect(SunGraphics2D sg2d, int x, int y, int width, int height) {
         }
     }
 
+    @Override
     public void fillPolygon(SunGraphics2D sg2d,
                             int[] xpoints, int[] ypoints, int npoints) {
         fill(sg2d, new Polygon(xpoints, ypoints, npoints));
     }
 
+    @Override
     public void drawRoundRect(SunGraphics2D sg2d,
                               int x, int y, int width, int height,
                               int arcWidth, int arcHeight) {
@@ -170,6 +177,7 @@ public void drawRoundRect(SunGraphics2D sg2d,
                                               arcWidth, arcHeight));
     }
 
+    @Override
     public void fillRoundRect(SunGraphics2D sg2d, int x, int y,
                               int width, int height,
                               int arcWidth, int arcHeight) {
@@ -177,16 +185,19 @@ public void fillRoundRect(SunGraphics2D sg2d, int x, int y,
                                               arcWidth, arcHeight));
     }
 
+    @Override
     public void drawOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height) {
         draw(sg2d, new Ellipse2D.Float(x, y, width, height));
     }
 
+    @Override
     public void fillOval(SunGraphics2D sg2d,
                          int x, int y, int width, int height) {
         fill(sg2d, new Ellipse2D.Float(x, y, width, height));
     }
 
+    @Override
     public void drawArc(SunGraphics2D sg2d,
                        int x, int y, int width, int height,
                         int startAngle, int arcAngle) {
@@ -194,6 +205,7 @@ public void drawArc(SunGraphics2D sg2d,
                                    startAngle, arcAngle, Arc2D.OPEN));
     }
 
+    @Override
     public void fillArc(SunGraphics2D sg2d,
                          int x, int y, int width, int height,
                          int startAngle, int arcAngle) {
@@ -201,7 +213,7 @@ public void fillArc(SunGraphics2D sg2d,
              startAngle, arcAngle, Arc2D.PIE));
     }
 
-    private class XRDrawHandler extends ProcessPath.DrawHandler {
+    private final class XRDrawHandler extends ProcessPath.DrawHandler {
         DirtyRegion region;
 
         XRDrawHandler() {
@@ -222,6 +234,7 @@ void validate(SunGraphics2D sg2d) {
             validateSurface(sg2d);
         }
 
+        @Override
         public void drawLine(int x1, int y1, int x2, int y2) {
             region.setDirtyLineRegion(x1, y1, x2, y2);
             int xDiff = region.x2 - region.x;
@@ -243,10 +256,12 @@ public void drawLine(int x1, int y1, int x2, int y2) {
             }
         }
 
+        @Override
         public void drawPixel(int x, int y) {
             rectBuffer.pushRectValues(x, y, 1, 1);
         }
 
+        @Override
         public void drawScanline(int x1, int x2, int y) {
             rectBuffer.pushRectValues(x1, y, x2 - x1 + 1, 1);
         }
@@ -296,6 +311,7 @@ protected void fillSpans(SunGraphics2D sg2d, SpanIterator si,
         }
     }
 
+    @Override
     public void draw(SunGraphics2D sg2d, Shape s) {
         if (sg2d.strokeState == SunGraphics2D.STROKE_THIN) {
             Path2D.Float p2df;
@@ -326,6 +342,7 @@ public void draw(SunGraphics2D sg2d, Shape s) {
         }
     }
 
+    @Override
     public void fill(SunGraphics2D sg2d, Shape s) {
         int transx, transy;
 
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
index 69732a42475..8acad667203 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSolidSrcPict.java
@@ -25,7 +25,7 @@
 
 package sun.java2d.xr;
 
-public class XRSolidSrcPict {
+public final class XRSolidSrcPict {
     XRBackend con;
 
     XRSurfaceData srcPict;
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
index f4dcee17f7a..54ad6334076 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceData.java
@@ -88,6 +88,7 @@ protected native void XRInitSurface(int depth, int width, int height,
     public static final SurfaceType
         IntArgbPreX11 = SurfaceType.IntArgbPre.deriveSubType(DESC_INT_ARGB_X11);
 
+    @Override
     public Raster getRaster(int x, int y, int w, int h) {
         throw new InternalError("not implemented yet");
     }
@@ -206,6 +207,7 @@ protected TextPipe getTextPipe(SunGraphics2D sg2d) {
         return (supportedPaint && supportedCompOp) ? xrtextpipe : null;
     }
 
+    @Override
     protected MaskFill getMaskFill(SunGraphics2D sg2d) {
         AlphaComposite aComp = null;
         if (sg2d.composite instanceof AlphaComposite alphaComposite) {
@@ -224,6 +226,7 @@ protected MaskFill getMaskFill(SunGraphics2D sg2d) {
         return (supportedPaint && supportedCompOp) ?  super.getMaskFill(sg2d) : null;
     }
 
+    @Override
     public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         if (sg2d.paintState <= SunGraphics2D.PAINT_ALPHACOLOR &&
             sg2d.compositeState <= SunGraphics2D.COMP_ALPHA)
@@ -234,6 +237,7 @@ public RenderLoops getRenderLoops(SunGraphics2D sg2d) {
         return super.getRenderLoops(sg2d);
     }
 
+    @Override
     public GraphicsConfiguration getDeviceConfiguration() {
         return graphicsConfig;
     }
@@ -366,6 +370,7 @@ public void validateCopyAreaGC(Region gcClip, boolean needExposures) {
         }
     }
 
+    @Override
     public boolean copyArea(SunGraphics2D sg2d, int x, int y, int w, int h,
                             int dx, int dy) {
         if (xrpipe == null) {
@@ -412,6 +417,7 @@ public static SurfaceType getPixmapSurfaceType(int transparency) {
         return sType;
     }
 
+    @Override
     public void invalidate() {
         if (isValid()) {
             setInvalid();
@@ -543,7 +549,7 @@ public synchronized void makePipes() { /*
         }
     }
 
-    public static class XRWindowSurfaceData extends XRSurfaceData {
+    public static final class XRWindowSurfaceData extends XRSurfaceData {
 
         protected final int scale;
 
@@ -571,10 +577,12 @@ public XRWindowSurfaceData(X11ComponentPeer peer,
             }
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return peer.getSurfaceData();
         }
 
+        @Override
         public Rectangle getBounds() {
             Rectangle r = peer.getBounds();
             r.x = r.y = 0;
@@ -591,10 +599,12 @@ public boolean canSourceSendExposures(int x, int y, int w, int h) {
         /**
          * Returns destination Component associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return peer.getTarget();
         }
 
+       @Override
        public void invalidate() {
            try {
                SunToolkit.awtLock();
@@ -617,31 +627,35 @@ public double getDefaultScaleY() {
         }
     }
 
-    public static class XRInternalSurfaceData extends XRSurfaceData {
+    public static final class XRInternalSurfaceData extends XRSurfaceData {
         public XRInternalSurfaceData(XRBackend renderQueue, int pictXid) {
           super(renderQueue);
           this.picture = pictXid;
           this.transformInUse = false;
         }
 
+        @Override
         public boolean canSourceSendExposures(int x, int y, int w, int h) {
             return false;
         }
 
+        @Override
         public Rectangle getBounds() {
             return null;
         }
 
+        @Override
         public Object getDestination() {
             return null;
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return null;
         }
     }
 
-    public static class XRPixmapSurfaceData extends XRSurfaceData {
+    public static final class XRPixmapSurfaceData extends XRSurfaceData {
         Image offscreenImage;
         int width;
         int height;
@@ -675,6 +689,7 @@ public void initSurface(int depth, int width, int height,
             }
         }
 
+        @Override
         public SurfaceData getReplacement() {
             return restoreContents(offscreenImage);
         }
@@ -685,10 +700,12 @@ public SurfaceData getReplacement() {
          * choose loops based on the transparency on the source SD, so it could
          * choose wrong loop (blit instead of blitbg, for example).
          */
+        @Override
         public int getTransparency() {
             return transparency;
         }
 
+        @Override
         public Rectangle getBounds() {
             return new Rectangle(width, height);
         }
@@ -698,6 +715,7 @@ public boolean canSourceSendExposures(int x, int y, int w, int h) {
             return (x < 0 || y < 0 || (x + w) > width || (y + h) > height);
         }
 
+        @Override
         public void flush() {
             /*
              * We need to invalidate the surface before disposing the native
@@ -714,6 +732,7 @@ public void flush() {
         /**
          * Returns destination Image associated with this SurfaceData.
          */
+        @Override
         public Object getDestination() {
             return offscreenImage;
         }
@@ -733,7 +752,8 @@ public long getGC() {
         return xgc;
     }
 
-    public static class LazyPipe extends ValidatePipe {
+    public static final class LazyPipe extends ValidatePipe {
+        @Override
         public boolean validate(SunGraphics2D sg2d) {
             XRSurfaceData xsd = (XRSurfaceData) sg2d.surfaceData;
             if (!xsd.isXRDrawableValid()) {
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
index 2c82e30197e..b05b90fe267 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRSurfaceDataProxy.java
@@ -35,7 +35,7 @@
  * The proxy class contains the logic if to replace a SurfaceData with a
  * cached X11 Pixmap and the code to create the accelerated surfaces.
  */
-public class XRSurfaceDataProxy extends SurfaceDataProxy implements Transparency {
+public final class XRSurfaceDataProxy extends SurfaceDataProxy implements Transparency {
 
     public static SurfaceDataProxy createProxy(SurfaceData srcData,
             XRGraphicsConfig dstConfig) {
@@ -81,6 +81,7 @@ public boolean isSupportedOperation(SurfaceData srcData, int txtype,
         return (bgColor == null || transparency == Transparency.TRANSLUCENT);
     }
 
+    @Override
     public int getTransparency() {
         return transparency;
     }
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
index 9f2aad97a09..3a4887e167f 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRUtils.java
@@ -39,7 +39,7 @@
  * @author Clemens Eisserer
  */
 
-public class XRUtils {
+public final class XRUtils {
     public static final int None = 0;
 
     /* Composition Operators */
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java b/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
index 0a09c6e35e2..ad29d553055 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRVolatileSurfaceManager.java
@@ -35,12 +35,13 @@
 /**
  * XRender platform implementation of the VolatileSurfaceManager class.
  */
-public class XRVolatileSurfaceManager extends VolatileSurfaceManager {
+public final class XRVolatileSurfaceManager extends VolatileSurfaceManager {
 
     public XRVolatileSurfaceManager(SunVolatileImage vImg, Object context) {
         super(vImg, context);
     }
 
+    @Override
     protected boolean isAccelerationEnabled() {
         return true;
     }
@@ -48,6 +49,7 @@ protected boolean isAccelerationEnabled() {
     /**
      * Create a pixmap-based SurfaceData object
      */
+    @Override
     protected SurfaceData initAcceleratedSurface() {
         SurfaceData sData;
 
@@ -74,6 +76,7 @@ protected SurfaceData initAcceleratedSurface() {
     * XRender should allow copies between different formats and depths.
     * TODO: verify that this assumption is correct.
     */
+    @Override
     protected boolean isConfigValid(GraphicsConfiguration gc) {
         return true;
     }
diff --git a/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java b/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
index 3bd4bf4702f..58369b5a866 100644
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XcbRequestCounter.java
@@ -31,7 +31,7 @@
  * @author Clemens Eisserer
  */
 
-public class XcbRequestCounter {
+public final class XcbRequestCounter {
     private static final long MAX_UINT = 4294967295L;
 
     long value;
diff --git a/src/java.desktop/unix/classes/sun/print/AttributeClass.java b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
index 0fb27909a26..f8eee08411b 100644
--- a/src/java.desktop/unix/classes/sun/print/AttributeClass.java
+++ b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
@@ -30,7 +30,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-public class AttributeClass {
+public final class AttributeClass {
     private String myName;
     private int myType;
     private int nameLen;
@@ -266,6 +266,7 @@ public int hashCode() {
         return Objects.hash(myType, myName, myValue);
     }
 
+    @Override
     public String toString() {
         return myName;
     }
diff --git a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
index 11e0b45014e..a7f8d3dc24d 100644
--- a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
+++ b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
@@ -48,7 +48,7 @@
 import javax.print.attribute.standard.PrinterName;
 
 
-public class CUPSPrinter  {
+public final class CUPSPrinter  {
     private static final String debugPrefix = "CUPSPrinter>> ";
     private static final double PRINTER_DPI = 72.0;
     private boolean initialized;
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index 96fcdef3a52..cdc8d6e4a0e 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -106,7 +106,7 @@
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-public class IPPPrintService implements PrintService, SunPrinterJobService {
+public final class IPPPrintService implements PrintService, SunPrinterJobService {
 
     public static final boolean debugPrint;
     private static final String debugPrefix = "IPPPrintService>> ";
@@ -510,12 +510,14 @@ private void initAttributes() {
     }
 
 
+    @Override
     public DocPrintJob createPrintJob() {
         // REMIND: create IPPPrintJob
         return new UnixPrintJob(this);
     }
 
 
+    @Override
     public synchronized Object
         getSupportedAttributeValues(Class<? extends Attribute> category,
                                     DocFlavor flavor,
@@ -836,7 +838,7 @@ public DocPrintJob createPrintJob() {
 
     //This class is for getting all pre-defined Finishings
     @SuppressWarnings("serial") // JDK implementation class
-    private static class ExtFinishing extends Finishings {
+    private static final class ExtFinishing extends Finishings {
         ExtFinishing(int value) {
             super(100); // 100 to avoid any conflicts with predefined values.
         }
@@ -848,6 +850,7 @@ EnumSyntax[] getAll() {
     }
 
 
+    @Override
     public AttributeSet getUnsupportedAttributes(DocFlavor flavor,
                                                  AttributeSet attributes) {
         if (flavor != null && !isDocFlavorSupported(flavor)) {
@@ -882,6 +885,7 @@ public AttributeSet getUnsupportedAttributes(DocFlavor flavor,
     }
 
 
+    @Override
     public synchronized DocFlavor[] getSupportedDocFlavors() {
 
         if (supportedDocFlavors != null) {
@@ -978,6 +982,7 @@ public synchronized DocFlavor[] getSupportedDocFlavors() {
     }
 
 
+    @Override
     public boolean isDocFlavorSupported(DocFlavor flavor) {
         if (supportedDocFlavors == null) {
             getSupportedDocFlavors();
@@ -1075,6 +1080,7 @@ private OutputBin[] getSupportedOutputBins() {
         return null;
     }
 
+    @Override
     public synchronized Class<?>[] getSupportedAttributeCategories() {
         if (supportedCats != null) {
             Class<?> [] copyCats = new Class<?>[supportedCats.length];
@@ -1151,6 +1157,7 @@ public synchronized Class<?>[] getSupportedAttributeCategories() {
     }
 
 
+    @Override
     public boolean
         isAttributeCategorySupported(Class<? extends Attribute> category)
     {
@@ -1188,6 +1195,7 @@ public synchronized Class<?>[] getSupportedAttributeCategories() {
         return false;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public synchronized <T extends PrintServiceAttribute>
         T getAttribute(Class<T> category)
@@ -1257,6 +1265,7 @@ T getAttribute(Class<T> category)
     }
 
 
+    @Override
     public synchronized PrintServiceAttributeSet getAttributes() {
         if (!init) {
             // get all attributes for the first time.
@@ -1377,6 +1386,7 @@ private synchronized boolean isSupportedMedia(MediaSizeName msn) {
     }
 
 
+    @Override
     public boolean isAttributeValueSupported(Attribute attr,
                                              DocFlavor flavor,
                                              AttributeSet attributes) {
@@ -1526,6 +1536,7 @@ public boolean isAttributeValueSupported(Attribute attr,
     }
 
 
+    @Override
     public synchronized Object
         getDefaultAttributeValue(Class<? extends Attribute> category)
     {
@@ -1716,6 +1727,7 @@ private boolean isSupportedResolution(PrinterResolution res) {
         return false;
     }
 
+    @Override
     public ServiceUIFactory getServiceUIFactory() {
         return null;
     }
@@ -1728,6 +1740,7 @@ public void wakeNotifier() {
         }
     }
 
+    @Override
     public void addPrintServiceAttributeListener(
                                  PrintServiceAttributeListener listener) {
         synchronized (this) {
@@ -1741,6 +1754,7 @@ public void addPrintServiceAttributeListener(
         }
     }
 
+    @Override
     public void removePrintServiceAttributeListener(
                                   PrintServiceAttributeListener listener) {
         synchronized (this) {
@@ -1759,6 +1773,7 @@ String getDest() {
         return printer;
     }
 
+    @Override
     public String getName() {
         /*
          * Mac is using printer-info IPP attribute for its human-readable printer
@@ -1777,6 +1792,7 @@ public String getName() {
     }
 
 
+    @Override
     public boolean usesClass(Class<?> c) {
         return (c == sun.print.PSPrinterJob.class);
     }
@@ -2103,16 +2119,19 @@ private static String toHex(byte v) {
         return (s.length() == 2) ? s :  "0"+s;
     }
 
+    @Override
     public String toString() {
         return "IPP Printer : " + getName();
     }
 
+    @Override
     public boolean equals(Object obj) {
         return  (obj == this ||
                  (obj instanceof IPPPrintService &&
                   ((IPPPrintService)obj).getName().equals(getName())));
     }
 
+    @Override
     public int hashCode() {
         return this.getClass().hashCode()+getName().hashCode();
     }
diff --git a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
index 3eb02bc7f23..d96894660b9 100644
--- a/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
+++ b/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
@@ -56,7 +56,7 @@
  * Remind: This class uses solaris commands. We also need a linux
  * version
  */
-public class PrintServiceLookupProvider extends PrintServiceLookup
+public final class PrintServiceLookupProvider extends PrintServiceLookup
     implements BackgroundServiceLookup, Runnable {
 
     /* Remind: the current implementation is static, as its assumed
@@ -209,6 +209,7 @@ public PrintServiceLookupProvider() {
      * This isn't required by the API and there's a risk doing this will
      * lead people to assume its guaranteed.
      */
+    @Override
     public synchronized PrintService[] getPrintServices() {
         if (printServices == null || !pollServices) {
             refreshServices();
@@ -541,6 +542,7 @@ private PrintService getServiceByName(PrinterName nameAttr) {
      * If service attributes are specified then there must be additional
      * filtering.
      */
+    @Override
     public PrintService[] getPrintServices(DocFlavor flavor,
                                            AttributeSet attributes) {
         PrintRequestAttributeSet requestSet = null;
@@ -599,6 +601,7 @@ public PrintService[] getPrintServices(DocFlavor flavor,
     /*
      * return empty array as don't support multi docs
      */
+    @Override
     public MultiDocPrintService[]
         getMultiDocPrintServices(DocFlavor[] flavors,
                                  AttributeSet attributes) {
@@ -606,6 +609,7 @@ public PrintService[] getPrintServices(DocFlavor flavor,
     }
 
 
+    @Override
     public synchronized PrintService getDefaultPrintService() {
         // clear defaultPrintService
         defaultPrintService = null;
@@ -665,6 +669,7 @@ public synchronized PrintService getDefaultPrintService() {
         return defaultPrintService;
     }
 
+    @Override
     public synchronized void
         getServicesInbackground(BackgroundLookupListener listener) {
         if (printServices != null) {
@@ -695,6 +700,7 @@ private PrintService[] copyOf(PrintService[] inArr) {
         }
     }
 
+    @Override
     public void run() {
         PrintService[] services = getPrintServices();
         synchronized (this) {
@@ -897,7 +903,7 @@ static String[] execCmd(final String command) {
         }
     }
 
-    private class PrinterChangeListener implements Runnable {
+    private final class PrinterChangeListener implements Runnable {
 
         @Override
         public void run() {
diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
index 3cd353141a4..4604167a0e4 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
@@ -86,7 +86,7 @@
 import java.awt.print.PrinterException;
 
 
-public class UnixPrintJob implements CancelablePrintJob {
+public final class UnixPrintJob implements CancelablePrintJob {
     private static String debugPrefix = "UnixPrintJob>> ";
 
     private transient ArrayList<PrintJobListener> jobListeners;
@@ -132,10 +132,12 @@ public class UnixPrintJob implements CancelablePrintJob {
         }
     }
 
+    @Override
     public PrintService getPrintService() {
         return service;
     }
 
+    @Override
     public PrintJobAttributeSet getAttributes() {
         synchronized (this) {
             if (jobAttrSet == null) {
@@ -148,6 +150,7 @@ public PrintJobAttributeSet getAttributes() {
         }
     }
 
+    @Override
     public void addPrintJobListener(PrintJobListener listener) {
         synchronized (this) {
             if (listener == null) {
@@ -160,6 +163,7 @@ public void addPrintJobListener(PrintJobListener listener) {
         }
     }
 
+    @Override
     public void removePrintJobListener(PrintJobListener listener) {
         synchronized (this) {
             if (listener == null || jobListeners == null ) {
@@ -269,6 +273,7 @@ private void notifyEvent(int reason) {
        }
     }
 
+    @Override
     public void addPrintJobAttributeListener(
                                   PrintJobAttributeListener listener,
                                   PrintJobAttributeSet attributes) {
@@ -288,6 +293,7 @@ public void addPrintJobAttributeListener(
         }
     }
 
+    @Override
     public void removePrintJobAttributeListener(
                                         PrintJobAttributeListener listener) {
         synchronized (this) {
@@ -308,6 +314,7 @@ public void removePrintJobAttributeListener(
         }
     }
 
+    @Override
     public void print(Doc doc, PrintRequestAttributeSet attributes)
         throws PrintException {
 
@@ -894,7 +901,7 @@ private String[] printExecCmd(String printer, String options,
     private String mDestination, mOptions="";
     private boolean mNoJobSheet = false;
 
-    private class PrinterOpener {
+    private final class PrinterOpener {
         PrintException pex;
         OutputStream result;
 
@@ -922,7 +929,7 @@ public OutputStream run() {
         }
     }
 
-    private class PrinterSpooler {
+    private final class PrinterSpooler {
         PrintException pex;
 
         private void handleProcessFailure(final Process failedProcess,
@@ -984,6 +991,7 @@ public Object run() {
         }
     }
 
+    @Override
     public void cancel() throws PrintException {
         synchronized (this) {
             if (!printing) {
diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
index a5c81362485..46211ba5960 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
@@ -74,7 +74,7 @@
 import javax.print.event.PrintServiceAttributeListener;
 
 
-public class UnixPrintService implements PrintService, AttributeUpdater,
+public final class UnixPrintService implements PrintService, AttributeUpdater,
                                          SunPrinterJobService {
 
     /* define doc flavors for text types in the default encoding of
@@ -207,6 +207,7 @@ public void invalidateService() {
         isInvalid = true;
     }
 
+    @Override
     public String getName() {
         return printer;
     }
@@ -415,6 +416,7 @@ private boolean isSupportedMedia(MediaSizeName msn) {
         return false;
     }
 
+    @Override
     public DocPrintJob createPrintJob() {
         return new UnixPrintJob(this);
     }
@@ -427,6 +429,7 @@ private PrintServiceAttributeSet getDynamicAttributes() {
         }
     }
 
+    @Override
     public PrintServiceAttributeSet getUpdatedAttributes() {
         PrintServiceAttributeSet currSet = getDynamicAttributes();
         if (lastSet == null) {
@@ -456,6 +459,7 @@ public void wakeNotifier() {
         }
     }
 
+    @Override
     public void addPrintServiceAttributeListener(
                                  PrintServiceAttributeListener listener) {
         synchronized (this) {
@@ -469,6 +473,7 @@ public void addPrintServiceAttributeListener(
         }
     }
 
+    @Override
     public void removePrintServiceAttributeListener(
                                   PrintServiceAttributeListener listener) {
         synchronized (this) {
@@ -483,6 +488,7 @@ public void removePrintServiceAttributeListener(
         }
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T extends PrintServiceAttribute>
         T getAttribute(Class<T> category)
@@ -509,6 +515,7 @@ T getAttribute(Class<T> category)
         }
     }
 
+    @Override
     public PrintServiceAttributeSet getAttributes() {
         PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
         attrs.add(getPrinterName());
@@ -545,6 +552,7 @@ private void initSupportedDocFlavors() {
         }
     }
 
+    @Override
     public DocFlavor[] getSupportedDocFlavors() {
         if (supportedDocFlavors == null) {
             initSupportedDocFlavors();
@@ -556,6 +564,7 @@ public DocFlavor[] getSupportedDocFlavors() {
         return flavors;
     }
 
+    @Override
     public boolean isDocFlavorSupported(DocFlavor flavor) {
         if (supportedDocFlavors == null) {
             initSupportedDocFlavors();
@@ -568,6 +577,7 @@ public boolean isDocFlavorSupported(DocFlavor flavor) {
         return false;
     }
 
+    @Override
     public Class<?>[] getSupportedAttributeCategories() {
         ArrayList<Class<?>> categList = new ArrayList<>(otherAttrCats.length);
         for (Class<?> c : otherAttrCats) {
@@ -580,6 +590,7 @@ public Class<?>[] getSupportedAttributeCategories() {
         return categList.toArray(new Class<?>[categList.size()]);
     }
 
+    @Override
     public boolean
         isAttributeCategorySupported(Class<? extends Attribute> category)
     {
@@ -602,6 +613,7 @@ public Class<?>[] getSupportedAttributeCategories() {
     /* return defaults for all attributes for which there is a default
      * value
      */
+    @Override
     public Object
         getDefaultAttributeValue(Class<? extends Attribute> category)
     {
@@ -681,6 +693,7 @@ private boolean isAutoSense(DocFlavor flavor) {
         }
     }
 
+    @Override
     public Object
         getSupportedAttributeValues(Class<? extends Attribute> category,
                                     DocFlavor flavor,
@@ -885,6 +898,7 @@ private boolean isServiceFormattedFlavor(DocFlavor flavor) {
             flavor.equals(DocFlavor.URL.PNG);
     }
 
+    @Override
     public boolean isAttributeValueSupported(Attribute attr,
                                              DocFlavor flavor,
                                              AttributeSet attributes) {
@@ -976,6 +990,7 @@ else if (attr.getCategory() == Copies.class) {
         return true;
     }
 
+    @Override
     public AttributeSet getUnsupportedAttributes(DocFlavor flavor,
                                                  AttributeSet attributes) {
 
@@ -1010,24 +1025,29 @@ public AttributeSet getUnsupportedAttributes(DocFlavor flavor,
         }
     }
 
+    @Override
     public ServiceUIFactory getServiceUIFactory() {
         return null;
     }
 
+    @Override
     public String toString() {
         return "Unix Printer : " + getName();
     }
 
+    @Override
     public boolean equals(Object obj) {
         return  (obj == this ||
                  (obj instanceof UnixPrintService &&
                   ((UnixPrintService)obj).getName().equals(getName())));
     }
 
+    @Override
     public int hashCode() {
         return this.getClass().hashCode()+getName().hashCode();
     }
 
+    @Override
     public boolean usesClass(Class<?> c) {
         return (c == sun.print.PSPrinterJob.class);
     }

From e490b4f04dd094db996cdc4f664c2ed1a7ea2ade Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 2 Jun 2025 21:52:08 +0000
Subject: [PATCH 790/901] 8357082: Stabilize and add debug logs to
 CopyAreaOOB.java

Reviewed-by: serb
---
 test/jdk/ProblemList.txt                      |   1 -
 test/jdk/java/awt/Graphics2D/CopyAreaOOB.java | 152 ++++++++++++------
 2 files changed, 103 insertions(+), 50 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 090b5eb71d7..28bb2a1f033 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -488,7 +488,6 @@ java/awt/MenuBar/TestNoScreenMenuBar.java 8265987 macosx-all
 
 java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java 8266283 generic-all
 java/awt/Graphics2D/DrawString/RotTransText.java 8316878 linux-all
-java/awt/Graphics2D/CopyAreaOOB.java 8343106 macosx-aarch64
 java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java 8257529 windows-x64
 java/awt/KeyboardFocusmanager/ConsumeNextMnemonicKeyTypedTest/ConsumeForModalDialogTest/ConsumeForModalDialogTest.java 8302787 windows-all
 java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java 8302787 windows-all
diff --git a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
index 8d218d9f189..27a1a3a868a 100644
--- a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
+++ b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.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.
  * 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,17 +26,75 @@
  * @key headful
  * @bug 6430601 8198613
  * @summary Verifies that copyArea() works properly when the
- * destination parameters are outside the destination bounds.
+ *          destination parameters are outside the destination bounds.
  * @run main/othervm CopyAreaOOB
- * @author campbelc
  */
 
-import java.awt.*;
-import java.awt.image.*;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
+import java.awt.image.MultiResolutionImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.imageio.ImageIO;
 
 public class CopyAreaOOB extends Canvas {
+    private static Frame frame;
+    private static Robot robot;
+    private static BufferedImage captureImg;
 
-    private static Robot robot = null;
+    private static StringBuffer errorLog = new StringBuffer();
+
+    private static final Point OFF_FRAME_LOC = new Point(50, 50);
+    private static final int SIZE = 400;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+
+            // added to move mouse pointer away from test UI
+            // so that it is not captured in the screenshot
+            robot.mouseMove(OFF_FRAME_LOC.x, OFF_FRAME_LOC.y);
+            robot.waitForIdle();
+            robot.delay(100);
+
+            createTestUI();
+            robot.delay(1000);
+
+            if (!errorLog.isEmpty()) {
+                saveImages();
+                throw new RuntimeException("Test failed: \n" + errorLog.toString());
+            }
+        } finally {
+            if (frame != null) {
+                frame.dispose();
+            }
+        }
+    }
+
+    private static void createTestUI() {
+        CopyAreaOOB canvas = new CopyAreaOOB();
+        frame = new Frame();
+        frame.setUndecorated(true);
+        frame.add(canvas);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
 
     public void paint(Graphics g) {
         int w = getWidth();
@@ -50,73 +108,69 @@ public void paint(Graphics g) {
         g2d.fillRect(0, 0, w, 10);
 
         g2d.setColor(Color.red);
-        g2d.fillRect(0, 10, 50, h-10);
+        g2d.fillRect(0, 10, 50, h - 10);
 
         // copy the region such that part of it goes below the bottom of the
         // destination surface
-        g2d.copyArea(0, 10, 50, h-10, 60, 10);
+        g2d.copyArea(0, 10, 50, h - 10, 60, 10);
 
         Toolkit.getDefaultToolkit().sync();
 
-        BufferedImage capture = null;
-        try {
-            Thread.sleep(500);
-            if (robot == null) robot = new Robot();
-            Point pt1 = getLocationOnScreen();
-            Rectangle rect = new Rectangle(pt1.x, pt1.y, 400, 400);
-            capture = robot.createScreenCapture(rect);
-        } catch (Exception e) {
-            throw new RuntimeException("Problems handling Robot");
-        }
+        robot.delay(500);
+
+        Point pt1 = this.getLocationOnScreen();
+        Rectangle rect = new Rectangle(pt1.x, pt1.y, SIZE, SIZE);
+        captureImg = robot.createScreenCapture(rect);
+
         // Test pixels
-        testRegion(capture, "green",          0,   0, 400,  10, 0xff00ff00);
-        testRegion(capture, "original red",   0,  10,  50, 400, 0xffff0000);
-        testRegion(capture, "background",    50,  10,  60, 400, 0xff000000);
-        testRegion(capture, "in-between",    60,  10, 110,  20, 0xff000000);
-        testRegion(capture, "copied red",    60,  20, 110, 400, 0xffff0000);
-        testRegion(capture, "background",   110,  10, 400, 400, 0xff000000);
+        testRegion("green", 0, 0, 400, 10, 0xff00ff00);
+        testRegion("original-red", 0, 10, 50, 400, 0xffff0000);
+        testRegion("background", 50, 10, 60, 400, 0xff000000);
+        testRegion("in-between", 60, 10, 110, 20, 0xff000000);
+        testRegion("copied-red", 60, 20, 110, 400, 0xffff0000);
+        testRegion("background", 110, 10, 400, 400, 0xff000000);
     }
 
     public Dimension getPreferredSize() {
-        return new Dimension(400, 400);
+        return new Dimension(SIZE, SIZE);
     }
 
-    private static void testRegion(BufferedImage bi, String name,
+    private static void testRegion(String region,
                                    int x1, int y1, int x2, int y2,
-                                   int expected)
-    {
+                                   int expected) {
+        System.out.print("Test region: " + region);
         for (int y = y1; y < y2; y++) {
             for (int x = x1; x < x2; x++) {
-                int actual = bi.getRGB(x, y);
+                int actual = captureImg.getRGB(x, y);
                 if (actual != expected) {
-                    throw new RuntimeException("Test failed for " + name +
-                                                       " region at x="+x+" y="+y+
-                                                       " (expected="+
-                                                       Integer.toHexString(expected) +
-                                                       " actual="+
-                                                       Integer.toHexString(actual) +
-                                                       ")");
+                    System.out.print(" Status: FAILED\n");
+                    errorLog.append("Test failed for " + region
+                                                + " region at x: " + x + " y: " + y
+                                                + " (expected: "
+                                                + Integer.toHexString(expected)
+                                                + " actual: "
+                                                + Integer.toHexString(actual) + ")\n");
+                    return;
                 }
             }
         }
+        System.out.print(" Status: PASSED\n");
     }
 
-    public static void main(String[] args) {
-        boolean show = (args.length == 1) && ("-show".equals(args[0]));
+    private static void saveImages() {
+        GraphicsConfiguration ge = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                                                      .getDefaultScreenDevice()
+                                                      .getDefaultConfiguration();
 
-        CopyAreaOOB test = new CopyAreaOOB();
-        Frame frame = new Frame();
-        frame.setUndecorated(true);
-        frame.add(test);
-        frame.pack();
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
+        MultiResolutionImage mrImage = robot.createMultiResolutionScreenCapture(ge.getBounds());
+        List<Image> variants = mrImage.getResolutionVariants();
+        RenderedImage screenCapture = (RenderedImage) variants.get(variants.size() - 1);
 
         try {
-            Thread.sleep(3000);
-        } catch (InterruptedException ex) {}
-        if (!show) {
-            frame.dispose();
+            ImageIO.write(screenCapture, "png", new File("fullscreen.png"));
+            ImageIO.write(captureImg, "png", new File("canvas.png"));
+        } catch (IOException e) {
+            System.err.println("Can't write image " + e);
         }
     }
 }

From c96803dc8b480427bca5b1c6b8c4e8693bc90b92 Mon Sep 17 00:00:00 2001
From: Qizheng Xing <qxing@openjdk.org>
Date: Tue, 3 Jun 2025 03:09:18 +0000
Subject: [PATCH 791/901] 8358035: Remove unused `compute_fingerprint`
 declaration in `ClassFileStream`

Reviewed-by: ccheung, iklam
---
 src/hotspot/share/classfile/classFileStream.cpp | 1 -
 src/hotspot/share/classfile/classFileStream.hpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/hotspot/share/classfile/classFileStream.cpp b/src/hotspot/share/classfile/classFileStream.cpp
index 382bd58af2b..dc5329a65f2 100644
--- a/src/hotspot/share/classfile/classFileStream.cpp
+++ b/src/hotspot/share/classfile/classFileStream.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "classfile/classFileStream.hpp"
-#include "classfile/classLoader.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "memory/resourceArea.hpp"
 
diff --git a/src/hotspot/share/classfile/classFileStream.hpp b/src/hotspot/share/classfile/classFileStream.hpp
index 135a34bdeee..7f7e4ccacd5 100644
--- a/src/hotspot/share/classfile/classFileStream.hpp
+++ b/src/hotspot/share/classfile/classFileStream.hpp
@@ -156,8 +156,6 @@ class ClassFileStream: public ResourceObj {
   // Tells whether eos is reached
   bool at_eos() const { return _current == _buffer_end; }
 
-  uint64_t compute_fingerprint() const;
-
   bool from_class_file_load_hook() const { return _from_class_file_load_hook; }
 };
 

From 24edd3b2c1324fd58575a6273e5cae17e3d6fbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <mhaessig@openjdk.org>
Date: Tue, 3 Jun 2025 03:19:19 +0000
Subject: [PATCH 792/901] 8354930: IGV: dump C2 graph before and after live
 range stretching

Reviewed-by: rcastanedalo, chagedorn
---
 src/hotspot/share/opto/chaitin.cpp                           | 5 +++--
 src/hotspot/share/opto/phasetype.hpp                         | 1 +
 .../jtreg/compiler/lib/ir_framework/CompilePhase.java        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 7832cbd42f8..e14d63c7651 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -406,6 +406,8 @@ void PhaseChaitin::Register_Allocate() {
     _live = &live;                // Mark LIVE as being available
   }
 
+  C->print_method(PHASE_INITIAL_LIVENESS, 4);
+
   // Base pointers are currently "used" by instructions which define new
   // derived pointers.  This makes base pointers live up to the where the
   // derived pointer is made, but not beyond.  Really, they need to be live
@@ -422,10 +424,9 @@ void PhaseChaitin::Register_Allocate() {
     gather_lrg_masks(false);
     live.compute(_lrg_map.max_lrg_id());
     _live = &live;
+    C->print_method(PHASE_LIVE_RANGE_STRETCHING, 4);
   }
 
-  C->print_method(PHASE_INITIAL_LIVENESS, 4);
-
   // Create the interference graph using virtual copies
   build_ifg_virtual();  // Include stack slots this time
 
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index b3076dd8091..2546b319762 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -100,6 +100,7 @@
   flags(MATCHING,                       "After matching") \
   flags(GLOBAL_CODE_MOTION,             "Global code motion") \
   flags(INITIAL_LIVENESS,               "Initial liveness") \
+  flags(LIVE_RANGE_STRETCHING,          "Live range stretching") \
   flags(AGGRESSIVE_COALESCING,          "Aggressive coalescing") \
   flags(INITIAL_SPILLING,               "Initial spilling") \
   flags(CONSERVATIVE_COALESCING,        "Conservative coalescing") \
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
index ad32f6a94b9..46900085b12 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
@@ -108,6 +108,7 @@ public enum CompilePhase {
     MATCHING("After matching", RegexType.MACH),
     GLOBAL_CODE_MOTION("Global code motion", RegexType.MACH),
     INITIAL_LIVENESS("Initial liveness", RegexType.MACH),
+    LIVE_RANGE_STRETCHING("Live range stretching", RegexType.MACH),
     AGGRESSIVE_COALESCING("Aggressive coalescing", RegexType.MACH),
     INITIAL_SPILLING("Initial spilling", RegexType.MACH),
     CONSERVATIVE_COALESCING("Conservative coalescing", RegexType.MACH, ActionOnRepeat.KEEP_FIRST),

From 832c5b06e8f278d70398e07d32d63d094a06967c Mon Sep 17 00:00:00 2001
From: David Beaumont <david.beaumont@oracle.com>
Date: Tue, 3 Jun 2025 04:01:09 +0000
Subject: [PATCH 793/901] 8350880: (zipfs) Add support for read-only zip file
 systems

Reviewed-by: lancea, alanb, jpai
---
 .../classes/jdk/nio/zipfs/ZipFileSystem.java  | 143 ++++++++++++------
 src/jdk.zipfs/share/classes/module-info.java  |  56 ++++++-
 .../jdk/jdk/nio/zipfs/NewFileSystemTests.java | 100 +++++++++++-
 test/jdk/jdk/nio/zipfs/TestPosix.java         |  76 ++++++++++
 test/jdk/jdk/nio/zipfs/Utils.java             |  56 +++++--
 5 files changed, 363 insertions(+), 68 deletions(-)

diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index 9ea935551b8..ab471694890 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.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
@@ -81,18 +81,24 @@ class ZipFileSystem extends FileSystem {
     private static final boolean isWindows = System.getProperty("os.name")
                                              .startsWith("Windows");
     private static final byte[] ROOTPATH = new byte[] { '/' };
+
+    // Global access mode for "mounted" file system ("readOnly" or "readWrite").
+    private static final String PROPERTY_ACCESS_MODE = "accessMode";
+
+    // Posix file permissions allow per-file access control in a posix-like fashion.
+    // Using a "readOnly" access mode will change the posix permissions of any
+    // underlying entries (they may still show as "writable", but will not be).
     private static final String PROPERTY_POSIX = "enablePosixFileAttributes";
     private static final String PROPERTY_DEFAULT_OWNER = "defaultOwner";
     private static final String PROPERTY_DEFAULT_GROUP = "defaultGroup";
     private static final String PROPERTY_DEFAULT_PERMISSIONS = "defaultPermissions";
     // Property used to specify the entry version to use for a multi-release JAR
     private static final String PROPERTY_RELEASE_VERSION = "releaseVersion";
+
     // Original property used to specify the entry version to use for a
     // multi-release JAR which is kept for backwards compatibility.
     private static final String PROPERTY_MULTI_RELEASE = "multi-release";
 
-    private static final Set<PosixFilePermission> DEFAULT_PERMISSIONS =
-        PosixFilePermissions.fromString("rwxrwxrwx");
     // Property used to specify the compression mode to use
     private static final String PROPERTY_COMPRESSION_METHOD = "compressionMethod";
     // Value specified for compressionMethod property to compress Zip entries
@@ -104,7 +110,8 @@ class ZipFileSystem extends FileSystem {
     private final Path zfpath;
     final ZipCoder zc;
     private final ZipPath rootdir;
-    private boolean readOnly; // readonly file system, false by default
+    // Starts in readOnly (safe mode), but might be reset at the end of initialization.
+    private boolean readOnly = true;
 
     // default time stamp for pseudo entries
     private final long zfsDefaultTimeStamp = System.currentTimeMillis();
@@ -129,10 +136,37 @@ class ZipFileSystem extends FileSystem {
     final boolean supportPosix;
     private final UserPrincipal defaultOwner;
     private final GroupPrincipal defaultGroup;
+    // Unmodifiable set.
     private final Set<PosixFilePermission> defaultPermissions;
 
     private final Set<String> supportedFileAttributeViews;
 
+    private enum ZipAccessMode {
+        // Creates a file system for read-write access.
+        READ_WRITE("readWrite"),
+        // Creates a file system for read-only access.
+        READ_ONLY("readOnly");
+
+        private final String label;
+
+        ZipAccessMode(String label) {
+            this.label = label;
+        }
+
+        // Parses the access mode from an environmental parameter.
+        // Returns null for missing value to indicate default behavior.
+        static ZipAccessMode from(Object value) {
+            if (value == null) {
+                return null;
+            } else if (READ_WRITE.label.equals(value)) {
+                return ZipAccessMode.READ_WRITE;
+            } else if (READ_ONLY.label.equals(value)) {
+                return ZipAccessMode.READ_ONLY;
+            }
+            throw new IllegalArgumentException("Unknown file system access mode: " + value);
+        }
+    }
+
     ZipFileSystem(ZipFileSystemProvider provider,
                   Path zfpath,
                   Map<String, ?> env) throws IOException
@@ -144,15 +178,28 @@ class ZipFileSystem extends FileSystem {
         this.useTempFile  = isTrue(env, "useTempFile");
         this.forceEnd64 = isTrue(env, "forceZIP64End");
         this.defaultCompressionMethod = getDefaultCompressionMethod(env);
+
+        ZipAccessMode accessMode = ZipAccessMode.from(env.get(PROPERTY_ACCESS_MODE));
+        boolean forceReadOnly = (accessMode == ZipAccessMode.READ_ONLY);
+
         this.supportPosix = isTrue(env, PROPERTY_POSIX);
         this.defaultOwner = supportPosix ? initOwner(zfpath, env) : null;
         this.defaultGroup = supportPosix ? initGroup(zfpath, env) : null;
-        this.defaultPermissions = supportPosix ? initPermissions(env) : null;
+        this.defaultPermissions = supportPosix ? Collections.unmodifiableSet(initPermissions(env)) : null;
         this.supportedFileAttributeViews = supportPosix ?
-            Set.of("basic", "posix", "zip") : Set.of("basic", "zip");
+                Set.of("basic", "posix", "zip") : Set.of("basic", "zip");
+
+        // 'create=true' is semantically the same as StandardOpenOption.CREATE,
+        // and can only be used to create a writable file system (whether the
+        // underlying ZIP file exists or not), and is always incompatible with
+        // 'accessMode=readOnly').
+        boolean shouldCreate = isTrue(env, "create");
+        if (shouldCreate && forceReadOnly) {
+            throw new IllegalArgumentException(
+                    "Specifying 'accessMode=readOnly' is incompatible with 'create=true'");
+        }
         if (Files.notExists(zfpath)) {
-            // create a new zip if it doesn't exist
-            if (isTrue(env, "create")) {
+            if (shouldCreate) {
                 try (OutputStream os = Files.newOutputStream(zfpath, CREATE_NEW, WRITE)) {
                     new END().write(os, 0, forceEnd64);
                 }
@@ -160,12 +207,9 @@ class ZipFileSystem extends FileSystem {
                 throw new NoSuchFileException(zfpath.toString());
             }
         }
-        // sm and existence check
+        // Existence check
         zfpath.getFileSystem().provider().checkAccess(zfpath, AccessMode.READ);
-        boolean writeable = Files.isWritable(zfpath);
-        this.readOnly = !writeable;
         this.zc = ZipCoder.get(nameEncoding);
-        this.rootdir = new ZipPath(this, new byte[]{'/'});
         this.ch = Files.newByteChannel(zfpath, READ);
         try {
             this.cen = initCEN();
@@ -179,13 +223,29 @@ class ZipFileSystem extends FileSystem {
         }
         this.provider = provider;
         this.zfpath = zfpath;
+        this.rootdir = new ZipPath(this, new byte[]{'/'});
+
+        // Determining a release version uses 'this' instance to read paths etc.
+        Optional<Integer> multiReleaseVersion = determineReleaseVersion(env);
+
+        // Set the version-based lookup function for multi-release JARs.
+        this.entryLookup =
+                multiReleaseVersion.map(this::createVersionedLinks).orElse(Function.identity());
 
-        initializeReleaseVersion(env);
+        // We only allow read-write zip/jar files if they are not multi-release
+        // JARs and the underlying file is writable.
+        this.readOnly = forceReadOnly || multiReleaseVersion.isPresent() || !Files.isWritable(zfpath);
+        if (readOnly && accessMode == ZipAccessMode.READ_WRITE) {
+            String reason = multiReleaseVersion.isPresent()
+                    ? "the multi-release JAR file is not writable"
+                    : "the ZIP file is not writable";
+            throw new IOException(reason);
+        }
     }
 
     /**
      * Return the compression method to use (STORED or DEFLATED).  If the
-     * property {@code commpressionMethod} is set use its value to determine
+     * property {@code compressionMethod} is set use its value to determine
      * the compression method to use.  If the property is not set, then the
      * default compression is DEFLATED unless the property {@code noCompression}
      * is set which is supported for backwards compatibility.
@@ -293,12 +353,12 @@ private GroupPrincipal initGroup(Path zfpath, Map<String, ?> env) throws IOExcep
             " or " + GroupPrincipal.class);
     }
 
-    // Initialize the default permissions for files inside the zip archive.
+    // Return the default permissions for files inside the zip archive.
     // If not specified in env, it will return 777.
     private Set<PosixFilePermission> initPermissions(Map<String, ?> env) {
         Object o = env.get(PROPERTY_DEFAULT_PERMISSIONS);
         if (o == null) {
-            return DEFAULT_PERMISSIONS;
+            return PosixFilePermissions.fromString("rwxrwxrwx");
         }
         if (o instanceof String) {
             return PosixFilePermissions.fromString((String)o);
@@ -346,10 +406,6 @@ private void checkWritable() {
         }
     }
 
-    void setReadOnly() {
-        this.readOnly = true;
-    }
-
     @Override
     public Iterable<Path> getRootDirectories() {
         return List.of(rootdir);
@@ -1383,33 +1439,24 @@ private void removeFromTree(IndexNode inode) {
      * Checks if the Zip File System property "releaseVersion" has been specified. If it has,
      * use its value to determine the requested version. If not use the value of the "multi-release" property.
      */
-    private void initializeReleaseVersion(Map<String, ?> env) throws IOException {
+    private Optional<Integer> determineReleaseVersion(Map<String, ?> env) throws IOException {
         Object o = env.containsKey(PROPERTY_RELEASE_VERSION) ?
             env.get(PROPERTY_RELEASE_VERSION) :
             env.get(PROPERTY_MULTI_RELEASE);
 
-        if (o != null && isMultiReleaseJar()) {
-            int version;
-            if (o instanceof String) {
-                String s = (String)o;
-                if (s.equals("runtime")) {
-                    version = Runtime.version().feature();
-                } else if (s.matches("^[1-9][0-9]*$")) {
-                    version = Version.parse(s).feature();
-                } else {
-                    throw new IllegalArgumentException("Invalid runtime version");
-                }
-            } else if (o instanceof Integer) {
-                version = Version.parse(((Integer)o).toString()).feature();
-            } else if (o instanceof Version) {
-                version = ((Version)o).feature();
-            } else {
-                throw new IllegalArgumentException("env parameter must be String, " +
-                    "Integer, or Version");
-            }
-            createVersionedLinks(version < 0 ? 0 : version);
-            setReadOnly();
+        if (o == null || !isMultiReleaseJar()) {
+            return Optional.empty();
         }
+        int version = switch (o) {
+            case String s when s.equals("runtime") -> Runtime.version().feature();
+            case String s when s.matches("^[1-9][0-9]*$") -> Version.parse(s).feature();
+            case Integer i -> Version.parse(i.toString()).feature();
+            case Version v -> v.feature();
+            case String s -> throw new IllegalArgumentException("Invalid runtime version: " + s);
+            default -> throw new IllegalArgumentException("env parameter must be String, " +
+                    "Integer, or Version");
+        };
+        return Optional.of(Math.max(version, 0));
     }
 
     /**
@@ -1435,11 +1482,11 @@ private boolean isMultiReleaseJar() throws IOException {
      * Then wrap the map in a function that getEntry can use to override root
      * entry lookup for entries that have corresponding versioned entries.
      */
-    private void createVersionedLinks(int version) {
+    private Function<byte[], byte[]> createVersionedLinks(int version) {
         IndexNode verdir = getInode(getBytes("/META-INF/versions"));
         // nothing to do, if no /META-INF/versions
         if (verdir == null) {
-            return;
+            return Function.identity();
         }
         // otherwise, create a map and for each META-INF/versions/{n} directory
         // put all the leaf inodes, i.e. entries, into the alias map
@@ -1451,10 +1498,7 @@ private void createVersionedLinks(int version) {
                     getOrCreateInode(getRootName(entryNode, versionNode), entryNode.isdir),
                     entryNode.name))
         );
-        entryLookup = path -> {
-            byte[] entry = aliasMap.get(IndexNode.keyOf(path));
-            return entry == null ? path : entry;
-        };
+        return path -> aliasMap.getOrDefault(IndexNode.keyOf(path), path);
     }
 
     /**
@@ -3551,7 +3595,8 @@ public GroupPrincipal group() {
 
         @Override
         public Set<PosixFilePermission> permissions() {
-            return storedPermissions().orElse(Set.copyOf(defaultPermissions));
+            // supportPosix ==> (defaultPermissions != null)
+            return storedPermissions().orElse(defaultPermissions);
         }
     }
 
diff --git a/src/jdk.zipfs/share/classes/module-info.java b/src/jdk.zipfs/share/classes/module-info.java
index 52a5aed98f9..db7ae3eec81 100644
--- a/src/jdk.zipfs/share/classes/module-info.java
+++ b/src/jdk.zipfs/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
@@ -153,8 +153,8 @@
  *   <td>{@link java.lang.String} or {@link java.lang.Boolean}</td>
  *   <td>false</td>
  *   <td>
- *       If the value is {@code true}, the ZIP file system provider
- *       creates a new ZIP or JAR file if it does not exist.
+ *       If the value is {@code true}, the ZIP file system provider creates a
+ *       new ZIP or JAR file if it does not exist.
  *   </td>
  * </tr>
  * <tr>
@@ -225,8 +225,8 @@
  *           </li>
  *           <li>
  *               If the value is not {@code "STORED"} or {@code "DEFLATED"}, an
- *               {@code IllegalArgumentException} will be thrown when the Zip
- *               filesystem is created.
+ *               {@code IllegalArgumentException} will be thrown when creating the
+ *               ZIP file system.
  *           </li>
  *       </ul>
  *   </td>
@@ -260,12 +260,54 @@
  *           <li>
  *               If the value does not represent a valid
  *               {@linkplain Runtime.Version Java SE Platform version number},
- *               an {@code IllegalArgumentException} will be thrown.
+ *               an {@code IllegalArgumentException} will be thrown when creating
+ *               the ZIP file system.
  *           </li>
  *       </ul>
  *   </td>
  * </tr>
- *  </tbody>
+ * <tr>
+ *   <th scope="row">accessMode</th>
+ *   <td>{@link java.lang.String}</td>
+ *   <td>null/unset</td>
+ *   <td>
+ *       A value defining the desired access mode of the file system.
+ *       ZIP file systems can be created to allow for <em>read-write</em> or
+ *       <em>read-only</em> access.
+ *       <ul>
+ *           <li>
+ *               If no value is set, the file system is created as <em>read-write</em>
+ *               if possible. Use {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} to determine the actual access mode.
+ *           </li>
+ *           <li>
+ *               If the value is {@code "readOnly"}, the file system is created
+ *               <em>read-only</em>, and {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} will always return {@code true}. Creating a
+ *               <em>read-only</em> file system requires the underlying ZIP file to
+ *               already exist.
+ *               Specifying the {@code create} property as {@code true} with the
+ *               {@code accessMode} as {@code readOnly} will cause an {@code
+ *               IllegalArgumentException} to be thrown when creating the ZIP file
+ *               system.
+ *           </li>
+ *           <li>
+ *               If the value is {@code "readWrite"}, the file system is created
+ *               <em>read-write</em>, and {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} will always return {@code false}. If a writable file
+ *               system cannot be created, an {@code IOException} will be thrown
+ *               when creating the ZIP file system.
+ *           </li>
+ *           <li>
+ *               Any other values will cause an {@code IllegalArgumentException}
+ *               to be thrown when creating the ZIP file system.
+ *           </li>
+ *       </ul>
+ *       The {@code accessMode} property has no effect on reported POSIX file
+ *       permissions (in cases where POSIX support is enabled).
+ *   </td>
+ * </tr>
+ * </tbody>
  * </table>
  *
  * <h2>Examples:</h2>
diff --git a/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java b/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java
index 44fe2686aba..d15988176e3 100644
--- a/test/jdk/jdk/nio/zipfs/NewFileSystemTests.java
+++ b/test/jdk/jdk/nio/zipfs/NewFileSystemTests.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
@@ -31,11 +31,17 @@
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.Map;
 
-import static org.testng.Assert.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
 
 /**
  * @test
@@ -170,6 +176,96 @@ public void testNewFileSystemPathNullMap() {
                 FileSystems.newFileSystem(Path.of("basic.jar"), nullMap));
     }
 
+    /**
+     * Validate that without {@code "create" = true}, a ZIP file system cannot be
+     * opened if the underlying file is missing, but even with this set, a ZIP
+     * file system cannot be opened for conflicting or invalid access modes.
+     */
+    @DataProvider(name = "badEnvMap")
+    protected Object[][] badEnvMap() {
+        return new Object[][]{
+                {Map.of(), NoSuchFileException.class},
+                {Map.of("accessMode", "readOnly"), NoSuchFileException.class},
+                {Map.of("accessMode", "readWrite"), NoSuchFileException.class},
+                {Map.of("create", true, "accessMode", "readOnly"), IllegalArgumentException.class},
+                {Map.of("create", true, "accessMode", "badValue"), IllegalArgumentException.class},
+        };
+    }
+    @Test(dataProvider = "badEnvMap")
+    public void badArgumentsFailure(Map<String, String> env, Class<? extends Throwable> exception) throws IOException {
+        assertThrows(exception, () -> FileSystems.newFileSystem(Path.of("no_such.zip"), env));
+    }
+
+    /**
+     * Validate that multi-release JARs can be opened read-write if no release
+     * version is specified.
+     */
+    @Test
+    public void multiReleaseJarReadWriteSuccess() throws IOException {
+        // Multi-release JARs, when opened with a specified version are inherently read-only.
+        Path multiReleaseJar = createMultiReleaseJar();
+        try (FileSystem fs = FileSystems.newFileSystem(multiReleaseJar, Map.of("accessMode", "readWrite"))) {
+            assertFalse(fs.isReadOnly());
+            assertEquals(
+                    Files.readString(fs.getPath("file.txt"), UTF_8),
+                    "Default version",
+                    "unexpected file content");
+        }
+    }
+
+    /**
+     * Validate that when the underlying file is read-only, it cannot be opened in
+     * read-write mode.
+     */
+    @Test
+    public void readOnlyZipFileFailure() throws IOException {
+        // Underlying file is read-only.
+        Path readOnlyZip = Utils.createJarFile("read_only.zip", Map.of("file.txt", "Hello World"));
+        // In theory this can fail, and we should avoid unwanted false-negatives.
+        if (readOnlyZip.toFile().setReadOnly()) {
+            assertThrows(IOException.class,
+                    () -> FileSystems.newFileSystem(readOnlyZip, Map.of("accessMode", "readWrite")));
+        }
+    }
+
+    /**
+     * Validate that multi-release JAR is opened read-only by default if a release
+     * version is specified.
+     */
+    @Test
+    public void multiReleaseJarDefaultReadOnly() throws IOException {
+        Path multiReleaseJar = createMultiReleaseJar();
+        try (FileSystem fs = FileSystems.newFileSystem(multiReleaseJar, Map.of("releaseVersion", "1"))) {
+            assertTrue(fs.isReadOnly());
+            assertEquals(
+                    Files.readString(fs.getPath("file.txt"), UTF_8),
+                    "First version",
+                    "unexpected file content");
+        }
+    }
+
+    /**
+     * Validate that multi-release JARs cannot be opened read-write if a release
+     * version is specified.
+     */
+    @Test
+    public void multiReleaseJarReadWriteFailure() throws IOException {
+        Path multiReleaseJar = createMultiReleaseJar();
+        assertThrows(IOException.class,
+                () -> FileSystems.newFileSystem(
+                        multiReleaseJar,
+                        Map.of("accessMode", "readWrite", "releaseVersion", "1")));
+    }
+
+    private static Path createMultiReleaseJar() throws IOException {
+        return Utils.createJarFile("multi_release.jar", Map.of(
+                // Newline required for attribute to be read from Manifest file.
+                "META-INF/MANIFEST.MF", "Multi-Release: true\n",
+                "META-INF/versions/1/file.txt", "First version",
+                "META-INF/versions/2/file.txt", "Second version",
+                "file.txt", "Default version"));
+    }
+
     /*
      * DataProvider used to verify that a Zip file system may be returned
      * when specifying a class loader
diff --git a/test/jdk/jdk/nio/zipfs/TestPosix.java b/test/jdk/jdk/nio/zipfs/TestPosix.java
index 420c1618e12..ff6f9c4920f 100644
--- a/test/jdk/jdk/nio/zipfs/TestPosix.java
+++ b/test/jdk/jdk/nio/zipfs/TestPosix.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019, 2024, SAP SE. 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 +36,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.spi.ToolProvider;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -50,8 +52,11 @@
 import static java.nio.file.attribute.PosixFilePermission.OWNER_READ;
 import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+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;
 
@@ -96,6 +101,8 @@ public class TestPosix {
     // FS open options
     private static final Map<String, Object> ENV_DEFAULT = Collections.<String, Object>emptyMap();
     private static final Map<String, Object> ENV_POSIX = Map.of("enablePosixFileAttributes", true);
+    private static final Map<String, Object> ENV_READ_ONLY = Map.of("accessMode", "readOnly");
+    private static final Map<String, Object> ENV_POSIX_READ_ONLY = Map.of("enablePosixFileAttributes", true, "accessMode", "readOnly");
 
     // misc
     private static final CopyOption[] COPY_ATTRIBUTES = {StandardCopyOption.COPY_ATTRIBUTES};
@@ -398,6 +405,37 @@ private void checkEntries(Path path, checkExpects expected) throws IOException {
         doCheckEntries(path, expected);
     }
 
+    private void checkReadOnlyFileSystem(FileSystem fs) throws IOException {
+        assertTrue(fs.isReadOnly(), "File system should be read-only");
+        Path root = fs.getPath("/");
+
+        // Rather than calling something like "addOwnerRead(root)", we walk all
+        // files to ensure that all operations fail, not some arbitrary first one.
+        Set<PosixFilePermission> badPerms = Set.of(OTHERS_EXECUTE, OTHERS_WRITE);
+        FileTime anyTime = FileTime.from(Instant.now());
+        try (Stream<Path> paths = Files.walk(root)) {
+            paths.forEach(p -> {
+                assertFalse(Files.isWritable(p), "File should not be writable: " + p);
+                assertSame(fs, p.getFileSystem());
+                assertThrows(
+                        AccessDeniedException.class,
+                        () -> fs.provider().checkAccess(p, AccessMode.WRITE));
+                assertThrows(
+                        ReadOnlyFileSystemException.class,
+                        () -> fs.provider().setAttribute(p, "zip:permissions", badPerms));
+
+                // These fail because there is not corresponding File for a zip path (they will
+                // currently fail for read-write ZIP file systems too, but we sanity-check here).
+                assertThrows(UnsupportedOperationException.class,
+                        () -> Files.setLastModifiedTime(p, anyTime));
+                assertThrows(UnsupportedOperationException.class,
+                        () -> Files.setAttribute(p, "zip:permissions", badPerms));
+                assertThrows(UnsupportedOperationException.class,
+                        () -> Files.setPosixFilePermissions(p, badPerms));
+            });
+        }
+    }
+
     private boolean throwsUOE(Executor e) throws IOException {
         try {
             e.doIt();
@@ -440,6 +478,25 @@ public void testDefault() throws IOException {
         }
     }
 
+    /**
+     * As {@code testDefault()} but with {@code "accessMode"="readOnly"}.
+     */
+    @Test
+    public void testDefaultReadOnly() throws IOException {
+        // create zip file using zipfs with default option
+        createTestZipFile(ZIP_FILE, ENV_DEFAULT).close();
+        // check entries on zipfs with read-only options
+        try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_READ_ONLY)) {
+            checkEntries(zip, checkExpects.permsInZip);
+            checkReadOnlyFileSystem(zip);
+        }
+        // check entries on zipfs with posix and read-only options
+        try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX_READ_ONLY)) {
+            checkEntries(zip, checkExpects.permsPosix);
+            checkReadOnlyFileSystem(zip);
+        }
+    }
+
     /**
      * This tests whether the entries in a zip file created w/
      * Posix support are correct.
@@ -460,6 +517,25 @@ public void testPosix() throws IOException {
         }
     }
 
+    /**
+     * As {@code testPosix()} but with {@code "accessMode"="readOnly"}.
+     */
+    @Test
+    public void testPosixReadOnly() throws IOException {
+        // create zip file using zipfs with posix option
+        createTestZipFile(ZIP_FILE, ENV_POSIX).close();
+        // check entries on zipfs with read-only options
+        try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_READ_ONLY)) {
+            checkEntries(zip, checkExpects.permsInZip);
+            checkReadOnlyFileSystem(zip);
+        }
+        // check entries on zipfs with posix and read-only options
+        try (FileSystem zip = FileSystems.newFileSystem(ZIP_FILE, ENV_POSIX_READ_ONLY)) {
+            checkEntries(zip, checkExpects.permsPosix);
+            checkReadOnlyFileSystem(zip);
+        }
+    }
+
     /**
      * This tests whether the entries in a zip file copied from another
      * are correct.
diff --git a/test/jdk/jdk/nio/zipfs/Utils.java b/test/jdk/jdk/nio/zipfs/Utils.java
index a561535dc5a..71cc1117a2f 100644
--- a/test/jdk/jdk/nio/zipfs/Utils.java
+++ b/test/jdk/jdk/nio/zipfs/Utils.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
@@ -23,25 +23,35 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
 import java.util.Random;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
- * Utility class for zipfs tests.
+ * Utility class for {@code ZipFileSystem} tests.
  */
-
-class Utils {
-    private Utils() { }
+final class Utils {
+    private Utils() {}
 
     /**
-     * Creates a JAR file of the given name with 0 or more named entries.
+     * Creates a JAR file of the given name with 0 or more named entries with
+     * random content.
      *
-     * @return Path to the newly created JAR file
+     * <p>If an existing file of the same name already exists, it is silently
+     * overwritten.
+     *
+     * @param name the file name of the jar file to create in the working directory.
+     * @param entries entries JAR file entry names, whose content will be populated
+     *                with random bytes
+     * @return the absolute path to the newly created JAR file.
      */
     static Path createJarFile(String name, String... entries) throws IOException {
-        Path jarFile = Paths.get("basic.jar");
+        Path jarFile = Path.of(name);
         Random rand = new Random();
         try (OutputStream out = Files.newOutputStream(jarFile);
              JarOutputStream jout = new JarOutputStream(out)) {
@@ -56,6 +66,32 @@ static Path createJarFile(String name, String... entries) throws IOException {
                 len += 1024;
             }
         }
-        return jarFile;
+        return jarFile.toAbsolutePath();
+    }
+
+    /**
+     * Creates a JAR file of the given name with 0 or more entries with specified
+     * content.
+     *
+     * <p>If an existing file of the same name already exists, it is silently
+     * overwritten.
+     *
+     * @param name the file name of the jar file to create in the working directory.
+     * @param entries a map of JAR file entry names to entry content (stored as
+     *                UTF-8 encoded bytes).
+     * @return the absolute path to the newly created JAR file.
+     */
+    static Path createJarFile(String name, Map<String, String> entries) throws IOException {
+        Path jarFile = Path.of(name);
+        try (OutputStream out = Files.newOutputStream(jarFile);
+             JarOutputStream jout = new JarOutputStream(out)) {
+            for (var entry : entries.entrySet()) {
+                JarEntry je = new JarEntry(entry.getKey());
+                jout.putNextEntry(je);
+                jout.write(entry.getValue().getBytes(UTF_8));
+                jout.closeEntry();
+            }
+        }
+        return jarFile.toAbsolutePath();
     }
 }

From c5f235c000db6654493ea109008dbccf97f01678 Mon Sep 17 00:00:00 2001
From: Roman Marchenko <rmarchenko@openjdk.org>
Date: Tue, 3 Jun 2025 06:00:28 +0000
Subject: [PATCH 794/901] 8347826: Introspector shows wrong method list after
 8071693

Reviewed-by: azvegint, serb, aivanov
---
 .../com/sun/beans/introspect/MethodInfo.java  |  14 +-
 .../sun/beans/introspect/PropertyInfo.java    |  20 +-
 .../classes/java/beans/Introspector.java      |  10 +-
 .../DefaultMethodBeanPropertyTest.java        | 460 ++++++++++++++++--
 4 files changed, 447 insertions(+), 57 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java
index 25c95988393..496cbd3cd6b 100644
--- a/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.java
+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/MethodInfo.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
@@ -31,10 +31,11 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Deque;
 import java.util.List;
 import java.util.Set;
 
@@ -105,13 +106,16 @@ static List<Method> get(Class<?> type) {
                 }
             }
 
-            // Add default methods inherited from interfaces
-            for (Class<?> iface : type.getInterfaces()) {
+            // Add methods inherited from interfaces
+            Deque<Class<?>> ifaceDeque = new ArrayDeque<>(List.of(type.getInterfaces()));
+            while (!ifaceDeque.isEmpty()) {
+                Class<?> iface = ifaceDeque.removeLast();
                 if (IGNORABLE_INTERFACES.contains(iface)) {
                     continue;
                 }
+                ifaceDeque.addAll(List.of(iface.getInterfaces()));
                 for (Method method : iface.getMethods()) {
-                    if (!Modifier.isAbstract(method.getModifiers())) {
+                    if (!Modifier.isAbstract(method.getModifiers()) && !method.isBridge()) {
                         (list = createIfNeeded(list)).add(method);
                     }
                 }
diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java b/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
index 833aeb7265c..f894a5ca1f2 100644
--- a/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.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
@@ -78,7 +78,8 @@ private boolean initialize() {
         }
         if (!isInitedToIsGetter && this.readList != null) {
             for (MethodInfo info : this.readList) {
-                if ((this.read == null) || this.read.type.isAssignableFrom(info.type)) {
+                if ((this.read == null) || (!info.method.isDefault()
+                                            && this.read.type.isAssignableFrom(info.type))) {
                     this.read = info;
                     this.type = info.type;
                 }
@@ -91,6 +92,9 @@ private boolean initialize() {
                 if (writeType == null) {
                     this.write = info;
                     writeType = info.type;
+                } else if (isParentOfIncoming(this.write, info)) {
+                    this.write = info;
+                    writeType = info.type;
                 } else if (writeType.isAssignableFrom(info.type)) {
                     if ((this.write == null) || this.write.type.isAssignableFrom(info.type)) {
                         this.write = info;
@@ -307,4 +311,16 @@ public static Map<String,PropertyInfo> get(Class<?> type) {
                 ? Collections.unmodifiableMap(map)
                 : Collections.emptyMap();
     }
+
+    private static boolean isParentOfIncoming(MethodInfo current, MethodInfo incoming) {
+        if (null == current) {
+            return false;
+        }
+        Class<?> currentClass = current.method.getDeclaringClass();
+        Class<?> incomingClass = incoming.method.getDeclaringClass();
+        if (currentClass == incomingClass) {
+            return false;
+        }
+        return currentClass.isAssignableFrom(incomingClass);
+    }
 }
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
index c526190808e..564021104a7 100644
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 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
@@ -1052,8 +1052,12 @@ private void addMethod(MethodDescriptor md) {
             }
         }
         if (match) {
-            MethodDescriptor composite = new MethodDescriptor(old, md);
-            methods.put(name, composite);
+            Class<?> oldClass = old.getMethod().getDeclaringClass();
+            Class<?> mdClass = md.getMethod().getDeclaringClass();
+            if (oldClass == mdClass || oldClass.isAssignableFrom(mdClass) || !mdClass.isAssignableFrom(oldClass)) {
+                MethodDescriptor composite = new MethodDescriptor(old, md);
+                methods.put(name, composite);
+            }
             return;
         }
 
diff --git a/test/jdk/java/beans/Introspector/DefaultMethodBeanPropertyTest.java b/test/jdk/java/beans/Introspector/DefaultMethodBeanPropertyTest.java
index a1e528880ef..2e79faa2d91 100644
--- a/test/jdk/java/beans/Introspector/DefaultMethodBeanPropertyTest.java
+++ b/test/jdk/java/beans/Introspector/DefaultMethodBeanPropertyTest.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,20 +23,26 @@
 
 /*
  * @test
- * @bug 8071693
+ * @bug 8071693 8347826
  * @summary Verify that the Introspector finds default methods inherited
  *          from interfaces
  */
 
+import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
+import java.beans.MethodDescriptor;
 import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.NavigableSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class DefaultMethodBeanPropertyTest {
 
@@ -78,11 +84,17 @@ public Float getObj() {
     }
 
     public static void testScenario1() {
+        verifyMethods(D1.class,
+            "public static int DefaultMethodBeanPropertyTest$A1.getStaticValue()",
+            "public default int DefaultMethodBeanPropertyTest$A1.getValue()",
+            "public java.lang.Integer DefaultMethodBeanPropertyTest$D1.getFoo()",
+            "public java.lang.Float DefaultMethodBeanPropertyTest$D1.getObj()"
+        );
         verifyProperties(D1.class,
-            "getClass",     // inherited method
-            "getValue",     // inherited default method
-            "getFoo",       // overridden interface method
-            "getObj"        // overridden default method
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public default int DefaultMethodBeanPropertyTest$A1.getValue()",
+            "public java.lang.Integer DefaultMethodBeanPropertyTest$D1.getFoo()",
+            "public java.lang.Float DefaultMethodBeanPropertyTest$D1.getObj()"
         );
     }
 
@@ -108,9 +120,12 @@ public class D2 implements B2, C2 {
     }
 
     public static void testScenario2() {
+        verifyMethods(D2.class,
+            "public default java.lang.Object DefaultMethodBeanPropertyTest$A2.getFoo()"
+        );
         verifyProperties(D2.class,
-            "getClass",
-            "getFoo"
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public default java.lang.Object DefaultMethodBeanPropertyTest$A2.getFoo()"
         );
     }
 
@@ -144,60 +159,404 @@ public NavigableSet<?> getFoo() {
     }
 
     public static void testScenario3() {
+        verifyMethods(D3.class,
+            "public java.util.NavigableSet DefaultMethodBeanPropertyTest$D3.getFoo()"
+        );
         verifyProperties(D3.class,
-            "getClass",
-            "getFoo"
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public java.util.NavigableSet DefaultMethodBeanPropertyTest$D3.getFoo()"
         );
     }
 
-// Helper methods
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 4              //
+//                                  //
+//////////////////////////////////////
+
+    public interface A4 {
+        default Object getDefault0() {
+            return null;
+        }
+        default Object getDefault1() {
+            return null;
+        }
+        default Object getDefault2() {
+            return null;
+        }
+        default Object getDefault3() {
+            return null;
+        }
+        Object getNonDefault();
+    }
+
+    public class B4 implements A4 {
+        @Override
+        public Object getDefault1() {
+            return new B4();
+        }
+        @Override
+        public String getDefault2() {
+            return null;
+        }
+        @Override
+        public Float getDefault3() {
+            return null;
+        }
+        public Long getNonDefault() {
+            return null;
+        }
+    }
+
+    public static void testScenario4() {
+        verifyMethods(B4.class,
+            "public default java.lang.Object DefaultMethodBeanPropertyTest$A4.getDefault0()",
+            "public java.lang.Object DefaultMethodBeanPropertyTest$B4.getDefault1()",
+            "public java.lang.String DefaultMethodBeanPropertyTest$B4.getDefault2()",
+            "public java.lang.Float DefaultMethodBeanPropertyTest$B4.getDefault3()",
+            "public java.lang.Long DefaultMethodBeanPropertyTest$B4.getNonDefault()"
+        );
+        verifyProperties(B4.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public default java.lang.Object DefaultMethodBeanPropertyTest$A4.getDefault0()",
+            "public java.lang.Object DefaultMethodBeanPropertyTest$B4.getDefault1()",
+            "public java.lang.String DefaultMethodBeanPropertyTest$B4.getDefault2()",
+            "public java.lang.Float DefaultMethodBeanPropertyTest$B4.getDefault3()",
+            "public java.lang.Long DefaultMethodBeanPropertyTest$B4.getNonDefault()"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 5              //
+//                                  //
+//////////////////////////////////////
+
+    public interface A5 {
+        public default void setParentFoo(Integer num) {
+        }
+        public default void setFoo(String num) {
+        }
+        public static int getStaticValue() {
+            return 0;
+        }
+        private int getPrivateValue() {
+            return 0;
+        }
+    }
+
+    public class B5 implements A5 {
+        public void setFoo(Number num) {
+        }
+        public void setLocalFoo(Long num) {
+        }
+        public static int getStaticValue() {
+            return 0;
+        }
+    }
+
+    public static void testScenario5() {
+        verifyMethods(B5.class,
+            "public static int DefaultMethodBeanPropertyTest$B5.getStaticValue()",
+            "public default void DefaultMethodBeanPropertyTest$A5.setFoo(java.lang.String)",
+            "public default void DefaultMethodBeanPropertyTest$A5.setParentFoo(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$B5.setFoo(java.lang.Number)",
+            "public void DefaultMethodBeanPropertyTest$B5.setLocalFoo(java.lang.Long)"
+        );
+        verifyProperties(B5.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public default void DefaultMethodBeanPropertyTest$A5.setParentFoo(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$B5.setFoo(java.lang.Number)",
+            "public void DefaultMethodBeanPropertyTest$B5.setLocalFoo(java.lang.Long)"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 6              //
+//                                  //
+//////////////////////////////////////
+
+    public class A6 {
+        public void setParentFoo(Integer num) {
+        }
+        public void setFoo(Integer num) {
+        }
+        public static int getStaticValue() {
+            return 0;
+        }
+        private int getPrivateValue() {
+            return 0;
+        }
+    }
+
+    public class B6 extends A6 {
+        public void setFoo(String num) {
+        }
+        public void setLocalFoo(Long num) {
+        }
+        public static int getStaticValue() {
+            return 0;
+        }
+    }
+
+    public static void testScenario6() {
+        verifyMethods(B6.class,
+            "public static int DefaultMethodBeanPropertyTest$B6.getStaticValue()",
+            "public void DefaultMethodBeanPropertyTest$A6.setFoo(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$A6.setParentFoo(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$B6.setFoo(java.lang.String)",
+            "public void DefaultMethodBeanPropertyTest$B6.setLocalFoo(java.lang.Long)"
+        );
+        verifyProperties(B6.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public void DefaultMethodBeanPropertyTest$A6.setParentFoo(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$B6.setFoo(java.lang.String)",
+            "public void DefaultMethodBeanPropertyTest$B6.setLocalFoo(java.lang.Long)"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 7              //
+//                                  //
+//////////////////////////////////////
+
+    interface A7<T> {
+        T getValue();
+    }
+
+    interface B7 {
+        Runnable getValue();
+    }
+
+    interface AB7 extends B7, A7<Object> {
+        Runnable getValue();
+    }
+
+    abstract class D7 implements AB7 {
+        public void setValue(Runnable value) {
+        }
+    }
+
+    public static void testScenario7() {
+        verifyMethods(D7.class,
+            "public void DefaultMethodBeanPropertyTest$D7.setValue(java.lang.Runnable)"
+        );
+        verifyProperties(D7.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public void DefaultMethodBeanPropertyTest$D7.setValue(java.lang.Runnable)"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 8              //
+//                                  //
+//////////////////////////////////////
+
+    public interface A8 {
+        public default void setFoo(Float num) {
+        }
+        public default void setFoo2(Integer num) {
+        }
+    }
+    public interface B8 extends A8 {
+        public default void setFoo(Integer num) {
+        }
+        public default void setFoo2(Float num) {
+        }
+    }
+
+    public class C8 implements B8 {
+    }
+
+    public static void testScenario8() {
+        verifyMethods(C8.class,
+            "public default void DefaultMethodBeanPropertyTest$A8.setFoo(java.lang.Float)",
+            "public default void DefaultMethodBeanPropertyTest$A8.setFoo2(java.lang.Integer)",
+            "public default void DefaultMethodBeanPropertyTest$B8.setFoo(java.lang.Integer)",
+            "public default void DefaultMethodBeanPropertyTest$B8.setFoo2(java.lang.Float)"
+        );
+        verifyProperties(C8.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public default void DefaultMethodBeanPropertyTest$B8.setFoo(java.lang.Integer)",
+            "public default void DefaultMethodBeanPropertyTest$B8.setFoo2(java.lang.Float)"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 9              //
+//                                  //
+//////////////////////////////////////
+
+    public class A9 {
+        public void setFoo(Object value) {
+        }
+        public void setFoo(String value) {
+        }
+        public void setFoo2(Object value) {
+        }
+        public void setFoo2(Integer value) {
+        }
+        // For the same setters with inconvertible arg types PropertyInfo behavior is undefined.
+        // public void setLocalFoo3(Long num) { }
+        // public void setLocalFoo3(Float num) { }
+    }
+
+    public static void testScenario9() {
+        verifyMethods(A9.class,
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo(java.lang.String)",
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo(java.lang.Object)",
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo2(java.lang.Integer)",
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo2(java.lang.Object)"
+        );
+        verifyProperties(A9.class,
+            "public final native java.lang.Class java.lang.Object.getClass()",
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo(java.lang.String)",
+            "public void DefaultMethodBeanPropertyTest$A9.setFoo2(java.lang.Integer)"
+        );
+    }
+
+//////////////////////////////////////
+//                                  //
+//          SCENARIO 10              //
+//                                  //
+//////////////////////////////////////
+
+    public static class A10 {
+        public Object getProp() {
+            return null;
+        }
+    }
+
+    public static interface B10 {
+        Object getProp();
+    }
 
-    public static void verifyProperties(Class<?> type, String... getterNames) {
+    public static class C10_1 extends A10 implements B10 {
+    }
+
+    public static class C10_2 extends A10 implements B10 {
+    }
+
+    public static class A10BeanInfo extends SimpleBeanInfo {
+        public MethodDescriptor[] getMethodDescriptors() {
+            try {
+                Class params[] = {};
+                MethodDescriptor md = new MethodDescriptor(A10.class.getDeclaredMethod("getProp", params));
+                md.setDisplayName("display name");
+                MethodDescriptor res[] = { md };
+                return res;
+            } catch (Exception exception) {
+                throw new Error("unexpected exception", exception);
+            }
+        }
+    }
 
-        // Gather expected properties
-        final HashSet<PropertyDescriptor> expected = new HashSet<>();
-        for (String methodName : getterNames) {
-            final String suffix = methodName.substring(3);
-            final String propName = Introspector.decapitalize(suffix);
-            final Method getter;
+    public static class C10_1BeanInfo extends SimpleBeanInfo {
+        public BeanInfo[] getAdditionalBeanInfo() {
             try {
-                getter = type.getMethod(methodName);
-            } catch (NoSuchMethodException e) {
-                throw new Error("unexpected error", e);
+                BeanInfo res[] = {
+                    Introspector.getBeanInfo(A10.class),
+                    Introspector.getBeanInfo(B10.class)
+                };
+                return res;
+            } catch (IntrospectionException exception) {
+                throw new Error("unexpected exception", exception);
             }
-            final PropertyDescriptor propDesc;
+        }
+    }
+
+    public static class C10_2BeanInfo extends SimpleBeanInfo {
+        public BeanInfo[] getAdditionalBeanInfo() {
             try {
-                propDesc = new PropertyDescriptor(propName, getter, null);
-            } catch (IntrospectionException e) {
-                throw new Error("unexpected error", e);
+                BeanInfo res[] = {
+                    Introspector.getBeanInfo(B10.class),
+                    Introspector.getBeanInfo(A10.class)
+                };
+                return res;
+            } catch (IntrospectionException exception) {
+                throw new Error("unexpected exception", exception);
             }
-            expected.add(propDesc);
         }
+    }
 
-        // Verify properties can be found directly
-        expected.stream()
-                .map(PropertyDescriptor::getName)
-                .filter(name -> BeanUtils.getPropertyDescriptor(type, name) == null)
-                .findFirst()
-                .ifPresent(name -> {
-                    throw new Error("property \"" + name + "\" not found in " + type);
-                });
+    public static void testScenario10() {
+        {
+            var md = getMethodDescriptor(C10_1.class, A10.class, "getProp");
+            assertEquals("display name", md.getDisplayName(), "getDisplayName()");
+        }
+        {
+            var md = getMethodDescriptor(C10_2.class, A10.class, "getProp");
+            assertEquals("display name", md.getDisplayName(), "getDisplayName()");
+        }
+    }
 
-        // Gather actual properties
-        final Set<PropertyDescriptor> actual =
-                Set.of(BeanUtils.getPropertyDescriptors(type));
+// Helper methods
 
-        // Verify the two sets are the same
+    private static void verifyEquality(String title, Set<String> expected, Set<String> actual) {
         if (!actual.equals(expected)) {
-            throw new Error("mismatch: " + type
-              + "\nACTUAL:\n  "
-              + actual.stream()
-                      .map(Object::toString)
-                      .collect(Collectors.joining("\n  "))
-              + "\nEXPECTED:\n  "
-              + expected.stream()
-                        .map(Object::toString)
-                        .collect(Collectors.joining("\n  ")));
+            throw new Error(title + " mismatch: "
+                    + "\nACTUAL:\n  "
+                    + actual.stream()
+                            .map(Object::toString)
+                            .collect(Collectors.joining("\n  "))
+                    + "\nEXPECTED:\n  "
+                    + expected.stream()
+                              .map(Object::toString)
+                              .collect(Collectors.joining("\n  ")));
+        }
+    }
+
+    public static void verifyProperties(Class<?> type,  String... methodNames) {
+        try {
+            final Set<String> expected = new HashSet<>(Arrays.asList(methodNames));
+            final Set<String> actual = Arrays
+                    .stream(Introspector.getBeanInfo(type)
+                                        .getPropertyDescriptors())
+                    .flatMap(pd -> Stream.of(pd.getReadMethod(), pd.getWriteMethod()))
+                    .filter(Objects::nonNull)
+                    .map((Method m) -> m.toString())
+                    .collect(Collectors.toSet());
+            verifyEquality("properties", expected, actual);
+        } catch (IntrospectionException exception) {
+            throw new Error("unexpected exception", exception);
+        }
+    }
+
+    public static void verifyMethods(Class<?> type, String... methodNames) {
+        try {
+            final Set<String> expected = new HashSet<>(Arrays.asList(methodNames));
+            final Set<String> actual = Arrays
+                    .stream(Introspector.getBeanInfo(type, Object.class)
+                                        .getMethodDescriptors())
+                    .map(MethodDescriptor::getMethod)
+                    .map(Method::toString)
+                    .collect(Collectors.toSet());
+            verifyEquality("methods", expected, actual);
+        } catch (IntrospectionException exception) {
+            throw new Error("unexpected exception", exception);
+        }
+    }
+
+    private static MethodDescriptor getMethodDescriptor(Class cls, Class stop, String name) {
+        try {
+            for (var md : Introspector.getBeanInfo(cls, stop).getMethodDescriptors()) {
+                if (md.getName().equals(name)) {
+                    return md;
+                }
+            }
+            return null;
+        } catch (IntrospectionException exception) {
+            throw new Error("unexpected exception", exception);
+        }
+    }
+
+    private static void assertEquals(Object expected, Object actual, String msg) {
+        if (!expected.equals(actual)) {
+            throw new Error(msg + ":\nACTUAL: " + actual + "\nEXPECTED: " + expected);
         }
     }
 
@@ -207,5 +566,12 @@ public static void main(String[] args) throws Exception {
         testScenario1();
         testScenario2();
         testScenario3();
+        testScenario4();
+        testScenario5();
+        testScenario6();
+        testScenario7();
+        testScenario8();
+        testScenario9();
+        testScenario10();
     }
 }

From 497a1822cabcc0475ce0495d56430f1e99b1fb13 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 3 Jun 2025 06:19:23 +0000
Subject: [PATCH 795/901] 8358254: [AOT]
 runtime/cds/appcds/applications/JavacBench.java#aot crashes with SEGV in
 ClassLoaderData::holder

Reviewed-by: never
---
 src/hotspot/share/ci/ciMethodData.cpp              |  6 +-----
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp      |  9 +++++++--
 src/hotspot/share/oops/trainingData.hpp            |  8 ++++++++
 .../jdk/vm/ci/hotspot/HotSpotMethodData.java       | 14 +-------------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
index 096a674ad56..533e8659968 100644
--- a/src/hotspot/share/ci/ciMethodData.cpp
+++ b/src/hotspot/share/ci/ciMethodData.cpp
@@ -57,11 +57,7 @@ ciMethodData::ciMethodData(MethodData* md)
 
 
 static bool is_klass_loaded(Klass* k) {
-  if (TrainingData::have_data()) {
-    // If we're running in AOT mode some classes may not be loaded yet
-    return !k->is_instance_klass() || InstanceKlass::cast(k)->is_loaded();
-  }
-  return true;
+  return TrainingData::is_klass_loaded(k);
 }
 
 // Check for entries that reference an unloaded method
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index b4b8150917d..6ad039d8839 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -49,6 +49,7 @@
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/objArrayKlass.inline.hpp"
+#include "oops/trainingData.hpp"
 #include "oops/typeArrayOop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
@@ -505,11 +506,15 @@ C2V_VMENTRY_NULL(jobject, getResolvedJavaType0, (JNIEnv* env, jobject, jobject b
       }
     } else if (JVMCIENV->isa_HotSpotMethodData(base_object)) {
       jlong base_address = (intptr_t) JVMCIENV->asMethodData(base_object);
-      klass = *((Klass**) (intptr_t) (base_address + offset));
-      if (klass == nullptr || !klass->is_loader_alive()) {
+      Klass* k = *((Klass**) (intptr_t) (base_address + offset));
+      if (k == nullptr || k->class_loader_data() == nullptr || !TrainingData::is_klass_loaded(k)) {
+        return nullptr;
+      }
+      if (!k->is_loader_alive()) {
         // Klasses in methodData might be concurrently unloading so return null in that case.
         return nullptr;
       }
+      klass = k;
     } else {
       goto unexpected;
     }
diff --git a/src/hotspot/share/oops/trainingData.hpp b/src/hotspot/share/oops/trainingData.hpp
index d79ffaef13e..2be3026881a 100644
--- a/src/hotspot/share/oops/trainingData.hpp
+++ b/src/hotspot/share/oops/trainingData.hpp
@@ -283,6 +283,14 @@ class TrainingData : public Metadata {
   static bool need_data() { return AOTRecordTraining;  } // Going to write
   static bool assembling_data() { return have_data() && CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes(); }
 
+  static bool is_klass_loaded(Klass* k) {
+    if (have_data()) {
+      // If we're running in AOT mode some classes may not be loaded yet
+      return !k->is_instance_klass() || InstanceKlass::cast(k)->is_loaded();
+    }
+    return true;
+  }
+
   template<typename Function>
   static void iterate(const Function& fn) { iterate(const_cast<Function&>(fn)); }
 
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 454949a2e25..2478b97a5b2 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
@@ -443,19 +443,7 @@ public StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos)
         }
     }
 
-    static class RawItemProfile<T> {
-        final int entries;
-        final T[] items;
-        final long[] counts;
-        final long totalCount;
-
-        RawItemProfile(int entries, T[] items, long[] counts, long totalCount) {
-            this.entries = entries;
-            this.items = items;
-            this.counts = counts;
-            this.totalCount = totalCount;
-        }
-    }
+    record RawItemProfile<T>(int entries, T[] items, long[] counts, long totalCount) {}
 
     abstract static class AbstractTypeData extends CounterData {
 

From 6cfd4057dce9262f54e71a3930e16da84aa0d9f1 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 3 Jun 2025 06:20:29 +0000
Subject: [PATCH 796/901] 8357619: [JVMCI] Revisit phantom_ref parameter in
 JVMCINMethodData::get_nmethod_mirror

Reviewed-by: eosterlund, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  4 ++--
 src/hotspot/share/jvmci/jvmciRuntime.cpp      | 14 +++++---------
 src/hotspot/share/jvmci/jvmciRuntime.hpp      |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 6ad039d8839..2256a0edc99 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -2836,7 +2836,7 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jbool
         if (data != nullptr) {
           // Only the mirror in the HotSpot heap is accessible
           // through JVMCINMethodData
-          oop nmethod_mirror = data->get_nmethod_mirror(nm, /* phantom_ref */ true);
+          oop nmethod_mirror = data->get_nmethod_mirror(nm);
           if (nmethod_mirror != nullptr) {
             result = HotSpotJVMCI::wrap(nmethod_mirror);
           }
@@ -2868,7 +2868,7 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jbool
           if (data == nullptr) {
             JVMCI_THROW_MSG_0(IllegalArgumentException, "Missing HotSpotNmethod data");
           }
-          if (data->get_nmethod_mirror(nm, /* phantom_ref */ false) != nullptr) {
+          if (data->get_nmethod_mirror(nm) != nullptr) {
             JVMCI_THROW_MSG_0(IllegalArgumentException, "Cannot overwrite existing HotSpotNmethod mirror for nmethod");
           }
           oop nmethod_mirror = HotSpotJVMCI::resolve(result);
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 15fb0d6ed3a..bee5f4ea445 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -776,15 +776,11 @@ void JVMCINMethodData::add_failed_speculation(nmethod* nm, jlong speculation) {
   FailedSpeculation::add_failed_speculation(nm, _failed_speculations, data, length);
 }
 
-oop JVMCINMethodData::get_nmethod_mirror(nmethod* nm, bool phantom_ref) {
+oop JVMCINMethodData::get_nmethod_mirror(nmethod* nm) {
   if (_nmethod_mirror_index == -1) {
     return nullptr;
   }
-  if (phantom_ref) {
-    return nm->oop_at_phantom(_nmethod_mirror_index);
-  } else {
-    return nm->oop_at(_nmethod_mirror_index);
-  }
+  return nm->oop_at(_nmethod_mirror_index);
 }
 
 void JVMCINMethodData::set_nmethod_mirror(nmethod* nm, oop new_mirror) {
@@ -802,7 +798,7 @@ void JVMCINMethodData::set_nmethod_mirror(nmethod* nm, oop new_mirror) {
 }
 
 void JVMCINMethodData::invalidate_nmethod_mirror(nmethod* nm) {
-  oop nmethod_mirror = get_nmethod_mirror(nm, /* phantom_ref */ false);
+  oop nmethod_mirror = get_nmethod_mirror(nm);
   if (nmethod_mirror == nullptr) {
     return;
   }
@@ -2178,7 +2174,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
         JVMCINMethodData* data = nm->jvmci_nmethod_data();
         assert(data != nullptr, "must be");
         if (install_default) {
-          assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm, /* phantom_ref */ false) == nullptr, "must be");
+          assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm) == nullptr, "must be");
           if (entry_bci == InvocationEntryBci) {
             // If there is an old version we're done with it
             nmethod* old = method->code();
@@ -2221,7 +2217,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
             }
           }
         } else {
-          assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm, /* phantom_ref */ false) == HotSpotJVMCI::resolve(nmethod_mirror), "must be");
+          assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm) == HotSpotJVMCI::resolve(nmethod_mirror), "must be");
           MutexLocker ml(NMethodState_lock, Mutex::_no_safepoint_check_flag);
           if (!nm->make_in_use()) {
             result = JVMCI::nmethod_reclaimed;
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index aa4685c5818..b49e09a1884 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -124,7 +124,7 @@ class JVMCINMethodData : public ResourceObj {
   void invalidate_nmethod_mirror(nmethod* nm);
 
   // Gets the mirror from nm's oops table.
-  oop get_nmethod_mirror(nmethod* nm, bool phantom_ref);
+  oop get_nmethod_mirror(nmethod* nm);
 
   // Sets the mirror in nm's oops table.
   void set_nmethod_mirror(nmethod* nm, oop mirror);

From dbf562c72502ab8da96eb130ff8222bba66c72cc Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 3 Jun 2025 07:25:54 +0000
Subject: [PATCH 797/901] 8358313: G1: Refactor
 G1CollectedHeap::is_maximal_no_gc

Reviewed-by: jsikstro, tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 4 ++--
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 8aaab14ad75..705dcd7895b 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1004,7 +1004,7 @@ bool G1CollectedHeap::expand(size_t expand_bytes, WorkerThreads* pretouch_worker
   log_debug(gc, ergo, heap)("Expand the heap. requested expansion amount: %zuB expansion amount: %zuB",
                             expand_bytes, aligned_expand_bytes);
 
-  if (is_maximal_no_gc()) {
+  if (num_inactive_regions() == 0) {
     log_debug(gc, ergo, heap)("Did not expand the heap (heap already fully expanded)");
     return false;
   }
@@ -1031,7 +1031,7 @@ bool G1CollectedHeap::expand_single_region(uint node_index) {
   uint expanded_by = _hrm.expand_on_preferred_node(node_index);
 
   if (expanded_by == 0) {
-    assert(is_maximal_no_gc(), "Should be no regions left, available: %u", _hrm.num_inactive_regions());
+    assert(num_inactive_regions() == 0, "Should be no regions left, available: %u", num_inactive_regions());
     log_debug(gc, ergo, heap)("Did not expand the heap (heap already fully expanded)");
     return false;
   }
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 965d01c7089..fbd1fe6165f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -966,16 +966,15 @@ class G1CollectedHeap : public CollectedHeap {
   // end fields defining the extent of the contiguous allocation region.)
   // But G1CollectedHeap doesn't yet support this.
 
-  bool is_maximal_no_gc() const {
-    return _hrm.num_inactive_regions() == 0;
-  }
-
   // Returns true if an incremental GC should be upgrade to a full gc. This
   // is done when there are no free regions and the heap can't be expanded.
   bool should_upgrade_to_full_gc() const {
-    return is_maximal_no_gc() && num_free_regions() == 0;
+    return num_inactive_regions() == 0 && num_free_regions() == 0;
   }
 
+  // The number of inactive regions.
+  uint num_inactive_regions() const { return _hrm.num_inactive_regions(); }
+
   // The current number of regions in the heap.
   uint num_committed_regions() const { return _hrm.num_committed_regions(); }
 

From be923a8b7229cb7a705e72ebbb3046e9f2085048 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Tue, 3 Jun 2025 08:06:43 +0000
Subject: [PATCH 798/901] 8353266: C2: Wrong execution with
 Integer.bitCount(int) intrinsic on AArch64

Reviewed-by: aph, thartmann
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  6 +-
 .../BitCountIAarch64PreservesArgument.java    | 80 +++++++++++++++++++
 2 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/intrinsics/BitCountIAarch64PreservesArgument.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 690210a8c40..f367362b4d8 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -7761,14 +7761,12 @@ instruct popCountI(iRegINoSp dst, iRegIorL2I src, vRegF tmp) %{
   effect(TEMP tmp);
   ins_cost(INSN_COST * 13);
 
-  format %{ "movw   $src, $src\n\t"
-            "mov    $tmp, $src\t# vector (1D)\n\t"
+  format %{ "fmovs  $tmp, $src\t# vector (1S)\n\t"
             "cnt    $tmp, $tmp\t# vector (8B)\n\t"
             "addv   $tmp, $tmp\t# vector (8B)\n\t"
             "mov    $dst, $tmp\t# vector (1D)" %}
   ins_encode %{
-    __ movw($src$$Register, $src$$Register); // ensure top 32 bits 0
-    __ mov($tmp$$FloatRegister, __ D, 0, $src$$Register);
+    __ fmovs($tmp$$FloatRegister, $src$$Register);
     __ cnt($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
     __ addv($tmp$$FloatRegister, __ T8B, $tmp$$FloatRegister);
     __ mov($dst$$Register, $tmp$$FloatRegister, __ D, 0);
diff --git a/test/hotspot/jtreg/compiler/intrinsics/BitCountIAarch64PreservesArgument.java b/test/hotspot/jtreg/compiler/intrinsics/BitCountIAarch64PreservesArgument.java
new file mode 100644
index 00000000000..eb048e0e8ca
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/BitCountIAarch64PreservesArgument.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 8353266
+ * @summary Integer.bitCount modifies input register
+ * @library /test/lib /
+ *
+ * @run main/othervm
+ *      -Xbatch
+ *      -XX:CompileOnly=compiler.intrinsics.BitCountIAarch64PreservesArgument::test
+ *      compiler.intrinsics.BitCountIAarch64PreservesArgument
+ */
+
+/**
+ * @test
+ * @bug 8353266
+ * @library /test/lib /
+ *
+ * @run main compiler.intrinsics.BitCountIAarch64PreservesArgument
+ */
+
+package compiler.intrinsics;
+
+import static compiler.lib.generators.Generators.G;
+
+public class BitCountIAarch64PreservesArgument {
+    static long lFld;
+    static long result;
+
+    public static void main(String[] args) {
+        lFld = 0xfedc_ba98_7654_3210L;
+        for (int i = 0; i < 10_000; i++) {
+            test();
+            if (result != 0xfedc_ba98_7654_3210L) {
+                // Wrongly outputs the cut input 0x7654_3210 == 1985229328
+                throw new RuntimeException("Wrong result. Expected result = " + lFld + "; Actual result = " + result);
+            }
+        }
+
+        lFld = G.longs().next();
+        for (int i = 0; i < 10_000; i++) {
+            test();
+            if (result != lFld) {
+                throw new RuntimeException("Wrong result. Expected result = " + lFld + "; Actual result = " + result);
+            }
+        }
+    }
+
+    static void test() {
+        long x = lFld;
+        try {
+            result = Integer.bitCount((int) x); // Cut input: 0x7654_3210 == 1985229328
+            throw new RuntimeException();
+        } catch (RuntimeException _) {
+        }
+        result = x;
+    }
+}

From cff75eb60628827541ea6c08eb1970401f606ebc Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 3 Jun 2025 08:14:05 +0000
Subject: [PATCH 799/901] 8358316: PKCS8Key.getEncoded() can throw NPE after
 JDK-8298420

Reviewed-by: ascarpino
---
 src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
index 5aa859c58e3..b7cc5e7057f 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
@@ -256,7 +256,8 @@ public AlgorithmId getAlgorithmId () {
      * or {@code null} if an encoding error occurs.
      */
     public byte[] getEncoded() {
-        return getEncodedInternal().clone();
+        byte[] b = getEncodedInternal();
+        return (b != null) ? b.clone() : null;
     }
 
     /**

From 6f783e5fab0e98da6c41e3c22d4523733f060d68 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 3 Jun 2025 08:14:23 +0000
Subject: [PATCH 800/901] 8358319: Pem.decode should cache the Pattern

Reviewed-by: ascarpino
---
 .../share/classes/sun/security/util/Pem.java       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java
index 0acbec8281a..c6e56381771 100644
--- a/src/java.base/share/classes/sun/security/util/Pem.java
+++ b/src/java.base/share/classes/sun/security/util/Pem.java
@@ -49,7 +49,10 @@ public class Pem {
     public static final String DEFAULT_ALGO;
 
     // Pattern matching for EKPI operations
-    private static final Pattern pbePattern;
+    private static final Pattern PBE_PATTERN;
+
+    // Pattern matching for stripping whitespace.
+    private static final Pattern STRIP_WHITESPACE_PATTERN;
 
     // Lazy initialized PBES2 OID value
     private static ObjectIdentifier PBES2OID;
@@ -61,8 +64,9 @@ public class Pem {
         String algo = Security.getProperty("jdk.epkcs8.defaultAlgorithm");
         DEFAULT_ALGO = (algo == null || algo.isBlank()) ?
             "PBEWithHmacSHA256AndAES_128" : algo;
-        pbePattern = Pattern.compile("^PBEWith.*And.*",
+        PBE_PATTERN = Pattern.compile("^PBEWith.*And.*",
             Pattern.CASE_INSENSITIVE);
+        STRIP_WHITESPACE_PATTERN = Pattern.compile("\\s+");
     }
 
     public static final String CERTIFICATE = "CERTIFICATE";
@@ -84,9 +88,9 @@ public class Pem {
      * @return the decoded bytes
      */
     public static byte[] decode(String input) {
-        byte[] src = input.replaceAll("\\s+", "").
+        byte[] src = STRIP_WHITESPACE_PATTERN.matcher(input).replaceAll("").
             getBytes(StandardCharsets.ISO_8859_1);
-            return Base64.getDecoder().decode(src);
+        return Base64.getDecoder().decode(src);
     }
 
     /**
@@ -100,7 +104,7 @@ public static byte[] decode(String input) {
     public static ObjectIdentifier getPBEID(String algorithm) {
 
         // Verify pattern matches PBE Standard Name spec
-        if (!pbePattern.matcher(algorithm).matches()) {
+        if (!PBE_PATTERN.matcher(algorithm).matches()) {
             throw new IllegalArgumentException("Invalid algorithm format.");
         }
 

From 8674f49127d75d20c074fb8c4f0736bfe190f8b8 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 3 Jun 2025 08:30:17 +0000
Subject: [PATCH 801/901] 8358318: JFR: Tighten up PlatformTracer
 initialization

Reviewed-by: egahlin
---
 .../jdk/jfr/internal/settings/MethodSetting.java   |  5 -----
 .../jdk/jfr/internal/tracing/PlatformTracer.java   | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java
index f819b1b951d..f4f3d93c01c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/MethodSetting.java
@@ -41,7 +41,6 @@
 @Name(Type.SETTINGS_PREFIX + "Filter")
 public final class MethodSetting extends FilterSetting {
     private final Modification modification;
-    private static volatile boolean initialized;
 
     public MethodSetting(PlatformEventType eventType, Modification modification, String defaultValue) {
         super(eventType, defaultValue);
@@ -54,10 +53,6 @@ public boolean isValid(String text) {
 
     @Override
     protected void apply(PlatformEventType eventType, List<String> filters) {
-        if (!initialized) {
-            PlatformTracer.initialize();
-            initialized = true;
-        }
         PlatformTracer.setFilters(modification, filters);
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
index 9ebbec5d451..608fe865147 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
@@ -53,6 +53,8 @@ public final class PlatformTracer {
     private static List<Filter> timingFilters = List.of();
     private static TimedMethod OBJECT;
 
+    private static boolean initialized;
+
     public static byte[] onMethodTrace(Module module, ClassLoader classLoader, String className,
                                        byte[] oldBytecode, long[] ids, String[] names, String[] signatures,
                                        int[] modifications) {
@@ -159,6 +161,7 @@ public static boolean isValidFilter(String text) {
     }
 
     public static void setFilters(Modification modification, List<String> filters) {
+        ensureInitialized();
         publishClasses(applyFilter(modification, filters));
     }
 
@@ -251,6 +254,15 @@ private static void reset() {
         timedClasses.clear();
     }
 
+    // Expected to be called when holding external lock, so no extra
+    // synchronization is required here.
+    private static void ensureInitialized() {
+        if (!initialized) {
+            initialize();
+            initialized = true;
+        }
+    }
+
     // This method has three purposes:
     //
     // 1) Load classes before instrumentation to avoid recursion in class
@@ -264,7 +276,7 @@ private static void reset() {
     // This method takes 1-10 milliseconds to run and is only executed once,
     // provided a user has specified a non-empty filter for the MethodTrace or
     // MethodTiming event.
-    public static void initialize() {
+    private static void initialize() {
         try {
             Logger.log(LogTag.JFR_METHODTRACE, LogLevel.DEBUG, "Method tracer initialization started.");
             Thread current = Thread.currentThread();

From 4402527683ed08eebf4953a9d83f72f64a5ff4fa Mon Sep 17 00:00:00 2001
From: Chad Rakoczy <chadrako@amazon.com>
Date: Tue, 3 Jun 2025 08:55:34 +0000
Subject: [PATCH 802/901] 8357223: AArch64: Optimize interpreter profile
 updates

Reviewed-by: shade, aph
---
 .../cpu/aarch64/interp_masm_aarch64.cpp       | 50 +++----------------
 .../cpu/aarch64/interp_masm_aarch64.hpp       |  7 +--
 2 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 48f92d28e03..276fdd013db 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -926,60 +926,26 @@ void InterpreterMacroAssembler::set_mdp_data_at(Register mdp_in,
 
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      int constant,
-                                                      bool decrement) {
-  increment_mdp_data_at(mdp_in, noreg, constant, decrement);
+                                                      int constant) {
+  increment_mdp_data_at(mdp_in, noreg, constant);
 }
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      Register reg,
-                                                      int constant,
-                                                      bool decrement) {
+                                                      Register index,
+                                                      int constant) {
   assert(ProfileInterpreter, "must be profiling interpreter");
-  // %%% this does 64bit counters at best it is wasting space
-  // at worst it is a rare bug when counters overflow
 
-  assert_different_registers(rscratch2, rscratch1, mdp_in, reg);
+  assert_different_registers(rscratch2, rscratch1, mdp_in, index);
 
   Address addr1(mdp_in, constant);
-  Address addr2(rscratch2, reg, Address::lsl(0));
+  Address addr2(rscratch2, index, Address::lsl(0));
   Address &addr = addr1;
-  if (reg != noreg) {
+  if (index != noreg) {
     lea(rscratch2, addr1);
     addr = addr2;
   }
 
-  if (decrement) {
-    // Decrement the register.  Set condition codes.
-    // Intel does this
-    // addptr(data, (int32_t) -DataLayout::counter_increment);
-    // If the decrement causes the counter to overflow, stay negative
-    // Label L;
-    // jcc(Assembler::negative, L);
-    // addptr(data, (int32_t) DataLayout::counter_increment);
-    // so we do this
-    ldr(rscratch1, addr);
-    subs(rscratch1, rscratch1, (unsigned)DataLayout::counter_increment);
-    Label L;
-    br(Assembler::LO, L);       // skip store if counter underflow
-    str(rscratch1, addr);
-    bind(L);
-  } else {
-    assert(DataLayout::counter_increment == 1,
-           "flow-free idiom only works with 1");
-    // Intel does this
-    // Increment the register.  Set carry flag.
-    // addptr(data, DataLayout::counter_increment);
-    // If the increment causes the counter to overflow, pull back by 1.
-    // sbbptr(data, (int32_t)0);
-    // so we do this
-    ldr(rscratch1, addr);
-    adds(rscratch1, rscratch1, DataLayout::counter_increment);
-    Label L;
-    br(Assembler::CS, L);       // skip store if counter overflow
-    str(rscratch1, addr);
-    bind(L);
-  }
+  increment(addr, DataLayout::counter_increment);
 }
 
 void InterpreterMacroAssembler::set_mdp_flag_at(Register mdp_in,
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index 58a7ed03150..447d4f8244e 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -247,11 +247,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void verify_method_data_pointer();
 
   void set_mdp_data_at(Register mdp_in, int constant, Register value);
-  void increment_mdp_data_at(Address data, bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, int constant,
-                             bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, Register reg, int constant,
-                             bool decrement = false);
+  void increment_mdp_data_at(Register mdp_in, int constant);
+  void increment_mdp_data_at(Register mdp_in, Register index, int constant);
   void increment_mask_and_jump(Address counter_addr,
                                int increment, Address mask,
                                Register scratch, Register scratch2,

From 457d9de81d0f65455e3292fafea03f0e83184029 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Tue, 3 Jun 2025 09:24:13 +0000
Subject: [PATCH 803/901] 8358013: [PPC64] VSX has poor performance on Power8

Reviewed-by: dbriemann, clanger
---
 src/hotspot/cpu/ppc/globals_ppc.hpp                        | 4 ++--
 src/hotspot/cpu/ppc/vm_version_ppc.cpp                     | 7 +++++++
 .../compiler/c2/irTests/TestAutoVectorization2DArray.java  | 5 +++--
 .../jtreg/compiler/loopopts/superword/MinMaxRed_Int.java   | 2 ++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/ppc/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp
index 597d7e2100a..f944408fe29 100644
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp
@@ -115,8 +115,8 @@ define_pd_global(intx, InitArrayShortSize, 9*BytesPerLong);
           "Use static branch prediction hints for uncommon paths.")         \
                                                                             \
   /* special instructions */                                                \
-  product(bool, SuperwordUseVSX, true,                                      \
-          "Use Power8 VSX instructions for superword optimization.")        \
+  product(bool, SuperwordUseVSX, false,                                     \
+          "Use VSX instructions for superword optimization.")               \
                                                                             \
   product(bool, UseByteReverseInstructions, false, DIAGNOSTIC,              \
           "Use byte reverse instructions.")                                 \
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 6a3d88c48ae..ad5e915a838 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -95,6 +95,13 @@ void VM_Version::initialize() {
     FLAG_SET_ERGO(TrapBasedRangeChecks, false);
   }
 
+  if (PowerArchitecturePPC64 >= 9) {
+    // Performance is good since Power9.
+    if (FLAG_IS_DEFAULT(SuperwordUseVSX)) {
+      FLAG_SET_ERGO(SuperwordUseVSX, true);
+    }
+  }
+
   MaxVectorSize = SuperwordUseVSX ? 16 : 8;
   if (FLAG_IS_DEFAULT(AlignVector)) {
     FLAG_SET_ERGO(AlignVector, false);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
index 9aedc64eff6..ac622e3bcc3 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
@@ -29,8 +29,9 @@
  * @test
  * @bug 8279258
  * @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")
+ * @requires (os.arch != "x86" & os.arch != "i386" & os.arch != "ppc64" & os.arch != "ppc64le" & os.arch != "riscv64")
+ *           | ((os.arch == "x86" | os.arch == "i386") & (vm.opt.UseSSE == "null" | vm.opt.UseSSE >= 2))
+ *           | ((os.arch == "ppc64" | os.arch == "ppc64le") & vm.cpu.features ~= ".*darn.*")
  *           | (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestAutoVectorization2DArray
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
index 0b84f4e346a..4e15c0de6e9 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Int.java
@@ -97,6 +97,7 @@ public static void ReductionInit(int[] a, int[] b) {
         applyIfCPUFeature = {"rvv", "true"},
         counts = {IRNode.MIN_REDUCTION_V, " > 0"})
     @IR(applyIfPlatform = {"ppc", "true"},
+        applyIf = {"SuperwordUseVSX", "true"},
         counts = {IRNode.MIN_REDUCTION_V, " > 0"})
     public static int minReductionImplement(int[] a, int[] b, int res) {
         for (int i = 0; i < a.length; i++) {
@@ -113,6 +114,7 @@ public static int minReductionImplement(int[] a, int[] b, int res) {
         applyIfCPUFeature = {"rvv", "true"},
         counts = {IRNode.MAX_REDUCTION_V, " > 0"})
     @IR(applyIfPlatform = {"ppc", "true"},
+        applyIf = {"SuperwordUseVSX", "true"},
         counts = {IRNode.MAX_REDUCTION_V, " > 0"})
     public static int maxReductionImplement(int[] a, int[] b, int res) {
         for (int i = 0; i < a.length; i++) {

From def7355cc97c7099dd04778a7dd7fd4ba5a7a630 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 3 Jun 2025 09:36:21 +0000
Subject: [PATCH 804/901] 8356716: ZGC: Cleanup Uncommit Logic

Reviewed-by: eosterlund, jsikstro
---
 src/hotspot/share/gc/z/zMappedCache.cpp       |  18 +-
 src/hotspot/share/gc/z/zMappedCache.hpp       |   8 +-
 src/hotspot/share/gc/z/zPageAllocator.cpp     | 102 +----
 src/hotspot/share/gc/z/zPageAllocator.hpp     |   6 +-
 .../share/gc/z/zPhysicalMemoryManager.cpp     |   5 +
 src/hotspot/share/gc/z/zUncommitter.cpp       | 363 +++++++++++++++++-
 src/hotspot/share/gc/z/zUncommitter.hpp       |  28 ++
 test/hotspot/jtreg/gc/z/TestUncommit.java     |   4 +-
 8 files changed, 395 insertions(+), 139 deletions(-)

diff --git a/src/hotspot/share/gc/z/zMappedCache.cpp b/src/hotspot/share/gc/z/zMappedCache.cpp
index 3fc54087daa..173adfbc010 100644
--- a/src/hotspot/share/gc/z/zMappedCache.cpp
+++ b/src/hotspot/share/gc/z/zMappedCache.cpp
@@ -405,7 +405,7 @@ ZVirtualMemory ZMappedCache::remove_vmem(ZMappedCacheEntry* const entry, size_t
 
   // Update statistics
   _size -= to_remove;
-  _min = MIN2(_size, _min);
+  _min_size_watermark = MIN2(_size, _min_size_watermark);
 
   postcond(to_remove == vmem.size());
   return vmem;
@@ -558,7 +558,7 @@ ZMappedCache::ZMappedCache()
   : _tree(),
     _size_class_lists(),
     _size(0),
-    _min(_size) {}
+    _min_size_watermark(_size) {}
 
 void ZMappedCache::insert(const ZVirtualMemory& vmem) {
   _size += vmem.size();
@@ -688,17 +688,15 @@ size_t ZMappedCache::remove_discontiguous(size_t size, ZArray<ZVirtualMemory>* o
   return remove_discontiguous_with_strategy<RemovalStrategy::SizeClasses>(size, out);
 }
 
-size_t ZMappedCache::reset_min() {
-  const size_t old_min = _min;
-
-  _min = _size;
-
-  return old_min;
+void ZMappedCache::reset_min_size_watermark() {
+  _min_size_watermark = _size;
 }
 
-size_t ZMappedCache::remove_from_min(size_t max_size, ZArray<ZVirtualMemory>* out) {
-  const size_t size = MIN2(_min, max_size);
+size_t ZMappedCache::min_size_watermark() {
+  return _min_size_watermark;
+}
 
+size_t ZMappedCache::remove_for_uncommit(size_t size, ZArray<ZVirtualMemory>* out) {
   if (size == 0) {
     return 0;
   }
diff --git a/src/hotspot/share/gc/z/zMappedCache.hpp b/src/hotspot/share/gc/z/zMappedCache.hpp
index 40dfeab2f66..cf1ddbc7289 100644
--- a/src/hotspot/share/gc/z/zMappedCache.hpp
+++ b/src/hotspot/share/gc/z/zMappedCache.hpp
@@ -92,7 +92,7 @@ class ZMappedCache {
   Tree          _tree;
   SizeClassList _size_class_lists[NumSizeClasses];
   size_t        _size;
-  size_t        _min;
+  size_t        _min_size_watermark;
 
   static int size_class_index(size_t size);
   static int guaranteed_size_class_index(size_t size);
@@ -132,8 +132,10 @@ class ZMappedCache {
   ZVirtualMemory remove_contiguous_power_of_2(size_t min_size, size_t max_size);
   size_t remove_discontiguous(size_t size, ZArray<ZVirtualMemory>* out);
 
-  size_t reset_min();
-  size_t remove_from_min(size_t max_size, ZArray<ZVirtualMemory>* out);
+  // ZUncommitter support
+  void reset_min_size_watermark();
+  size_t min_size_watermark();
+  size_t remove_for_uncommit(size_t size, ZArray<ZVirtualMemory>* out);
 
   void print_on(outputStream* st) const;
   void print_extended_on(outputStream* st) const;
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index 61f44ec1c84..80a53feed71 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -630,9 +630,6 @@ ZPartition::ZPartition(uint32_t numa_id, ZPageAllocator* page_allocator)
     _capacity(0),
     _claimed(0),
     _used(0),
-    _last_commit(0.0),
-    _last_uncommit(0.0),
-    _to_uncommit(0),
     _numa_id(numa_id) {}
 
 uint32_t ZPartition::numa_id() const {
@@ -650,9 +647,7 @@ size_t ZPartition::increase_capacity(size_t size) {
     // Update atomically since we have concurrent readers
     Atomic::add(&_capacity, increased);
 
-    _last_commit = os::elapsedTime();
-    _last_uncommit = 0;
-    _cache.reset_min();
+    _uncommitter.cancel_uncommit_cycle();
   }
 
   return increased;
@@ -787,101 +782,6 @@ bool ZPartition::claim_capacity_fast_medium(ZMemoryAllocation* allocation) {
   return true;
 }
 
-size_t ZPartition::uncommit(uint64_t* timeout) {
-  ZArray<ZVirtualMemory> flushed_vmems;
-  size_t flushed = 0;
-
-  {
-    // We need to join the suspendible thread set while manipulating capacity
-    // and used, to make sure GC safepoints will have a consistent view.
-    SuspendibleThreadSetJoiner sts_joiner;
-    ZLocker<ZLock> locker(&_page_allocator->_lock);
-
-    const double now = os::elapsedTime();
-    const double time_since_last_commit = std::floor(now - _last_commit);
-    const double time_since_last_uncommit = std::floor(now - _last_uncommit);
-
-    if (time_since_last_commit < double(ZUncommitDelay)) {
-      // We have committed within the delay, stop uncommitting.
-      *timeout = uint64_t(double(ZUncommitDelay) - time_since_last_commit);
-      return 0;
-    }
-
-    // We flush out and uncommit chunks at a time (~0.8% of the max capacity,
-    // but at least one granule and at most 256M), in case demand for memory
-    // increases while we are uncommitting.
-    const size_t limit_upper_bound = MAX2(ZGranuleSize, align_down(256 * M / ZNUMA::count(), ZGranuleSize));
-    const size_t limit = MIN2(align_up(_current_max_capacity >> 7, ZGranuleSize), limit_upper_bound);
-
-    if (limit == 0) {
-      // This may occur if the current max capacity for this partition is 0
-
-      // Set timeout to ZUncommitDelay
-      *timeout = ZUncommitDelay;
-      return 0;
-    }
-
-    if (time_since_last_uncommit < double(ZUncommitDelay)) {
-      // We are in the uncommit phase
-      const size_t num_uncommits_left = _to_uncommit / limit;
-      const double time_left = double(ZUncommitDelay) - time_since_last_uncommit;
-      if (time_left < *timeout * num_uncommits_left) {
-        // Running out of time, speed up.
-        uint64_t new_timeout = uint64_t(std::floor(time_left / double(num_uncommits_left + 1)));
-        *timeout = new_timeout;
-      }
-    } else {
-      // We are about to start uncommitting
-      _to_uncommit = _cache.reset_min();
-      _last_uncommit = now;
-
-      const size_t split = _to_uncommit / limit + 1;
-      uint64_t new_timeout = ZUncommitDelay / split;
-      *timeout = new_timeout;
-    }
-
-    // Never uncommit below min capacity.
-    const size_t retain = MAX2(_used, _min_capacity);
-    const size_t release = _capacity - retain;
-    const size_t flush = MIN3(release, limit, _to_uncommit);
-
-    if (flush == 0) {
-      // Nothing to flush
-      return 0;
-    }
-
-    // Flush memory from the mapped cache to uncommit
-    flushed = _cache.remove_from_min(flush, &flushed_vmems);
-    if (flushed == 0) {
-      // Nothing flushed
-      return 0;
-    }
-
-    // Record flushed memory as claimed and how much we've flushed for this partition
-    Atomic::add(&_claimed, flushed);
-    _to_uncommit -= flushed;
-  }
-
-  // Unmap and uncommit flushed memory
-  for (const ZVirtualMemory vmem : flushed_vmems) {
-    unmap_virtual(vmem);
-    uncommit_physical(vmem);
-    free_physical(vmem);
-    free_virtual(vmem);
-  }
-
-  {
-    SuspendibleThreadSetJoiner sts_joiner;
-    ZLocker<ZLock> locker(&_page_allocator->_lock);
-
-    // Adjust claimed and capacity to reflect the uncommit
-    Atomic::sub(&_claimed, flushed);
-    decrease_capacity(flushed, false /* set_max_capacity */);
-  }
-
-  return flushed;
-}
-
 void ZPartition::sort_segments_physical(const ZVirtualMemory& vmem) {
   verify_virtual_memory_association(vmem, true /* check_multi_partition */);
 
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index 85ce59a8913..c5d1bedd863 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -57,6 +57,7 @@ class ZWorkers;
 class ZPartition {
   friend class VMStructs;
   friend class ZPageAllocator;
+  friend class ZUncommitter;
 
 private:
   ZPageAllocator* const _page_allocator;
@@ -68,9 +69,6 @@ class ZPartition {
   volatile size_t       _capacity;
   volatile size_t       _claimed;
   size_t                _used;
-  double                _last_commit;
-  double                _last_uncommit;
-  size_t                _to_uncommit;
   const uint32_t        _numa_id;
 
   const ZVirtualMemoryManager& virtual_memory_manager() const;
@@ -103,8 +101,6 @@ class ZPartition {
   bool claim_capacity(ZMemoryAllocation* allocation);
   bool claim_capacity_fast_medium(ZMemoryAllocation* allocation);
 
-  size_t uncommit(uint64_t* timeout);
-
   void sort_segments_physical(const ZVirtualMemory& vmem);
 
   void claim_physical(const ZVirtualMemory& vmem);
diff --git a/src/hotspot/share/gc/z/zPhysicalMemoryManager.cpp b/src/hotspot/share/gc/z/zPhysicalMemoryManager.cpp
index 8f9b8f2a285..2c2f9988d4b 100644
--- a/src/hotspot/share/gc/z/zPhysicalMemoryManager.cpp
+++ b/src/hotspot/share/gc/z/zPhysicalMemoryManager.cpp
@@ -113,6 +113,11 @@ void ZPhysicalMemoryManager::try_enable_uncommit(size_t min_capacity, size_t max
     return;
   }
 
+  const size_t max_delay_without_overflow = std::numeric_limits<uint64_t>::max() / MILLIUNITS;
+  if (ZUncommitDelay > max_delay_without_overflow) {
+    FLAG_SET_ERGO(ZUncommitDelay, max_delay_without_overflow);
+  }
+
   log_info_p(gc, init)("Uncommit: Enabled");
   log_info_p(gc, init)("Uncommit Delay: %zus", ZUncommitDelay);
 }
diff --git a/src/hotspot/share/gc/z/zUncommitter.cpp b/src/hotspot/share/gc/z/zUncommitter.cpp
index 7993bbd56a9..7e9cad5ab0a 100644
--- a/src/hotspot/share/gc/z/zUncommitter.cpp
+++ b/src/hotspot/share/gc/z/zUncommitter.cpp
@@ -22,12 +22,21 @@
  */
 
 #include "gc/shared/gc_globals.hpp"
+#include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zLock.inline.hpp"
+#include "gc/z/zMappedCache.hpp"
+#include "gc/z/zNUMA.inline.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zUncommitter.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.hpp"
+
+#include <cmath>
 
 static const ZStatCounter ZCounterUncommit("Memory", "Uncommit", ZStatUnitBytesPerSecond);
 
@@ -35,7 +44,13 @@ ZUncommitter::ZUncommitter(uint32_t id, ZPartition* partition)
   : _id(id),
     _partition(partition),
     _lock(),
-    _stop(false) {
+    _stop(false),
+    _cancel_time(0.0),
+    _next_cycle_timeout(0),
+    _next_uncommit_timeout(0),
+    _cycle_start(0.0),
+    _to_uncommit(0),
+    _uncommitted(0) {
   set_name("ZUncommitter#%u", id);
   create_and_start();
 }
@@ -47,8 +62,27 @@ bool ZUncommitter::wait(uint64_t timeout) const {
   }
 
   if (!_stop && timeout > 0) {
-    log_debug(gc, heap)("Uncommitter (%u) Timeout: " UINT64_FORMAT "s", _id, timeout);
-    _lock.wait(timeout * MILLIUNITS);
+    if (!uncommit_cycle_is_finished()) {
+      log_trace(gc, heap)("Uncommitter (%u) Timeout: " UINT64_FORMAT "ms left to uncommit: "
+                          EXACTFMT, _id, timeout, EXACTFMTARGS(_to_uncommit));
+    } else {
+      log_debug(gc, heap)("Uncommitter (%u) Timeout: " UINT64_FORMAT "ms", _id, timeout);
+    }
+
+    double now = os::elapsedTime();
+    const double wait_until = now + double(timeout) / MILLIUNITS;
+    do {
+      const uint64_t remaining_timeout_ms = to_millis(wait_until - now);
+      if (remaining_timeout_ms == 0) {
+        // Less than a millisecond left to wait, just return early
+        break;
+      }
+
+      // Wait
+      _lock.wait(remaining_timeout_ms);
+
+      now = os::elapsedTime();
+    } while (!_stop && now < wait_until);
   }
 
   return !_stop;
@@ -59,33 +93,78 @@ bool ZUncommitter::should_continue() const {
   return !_stop;
 }
 
+void ZUncommitter::update_statistics(size_t uncommitted, Ticks start, Tickspan* accumulated_time) const {
+  // Update counter
+  ZStatInc(ZCounterUncommit, uncommitted);
+
+  Ticks end = Ticks::now();
+
+  // Send event
+  EventZUncommit::commit(start, end, uncommitted);
+
+  // Track accumulated time
+  *accumulated_time += end - start;
+}
+
 void ZUncommitter::run_thread() {
-  uint64_t timeout = 0;
+  // Initialize first cycle timeout
+  _next_cycle_timeout = to_millis(ZUncommitDelay);
+
+  while (wait(_next_cycle_timeout)) {
+    // Counters for event and statistics
+    Ticks start = Ticks::now();
+    size_t uncommitted_since_last_timeout = 0;
+    Tickspan accumulated_time;
 
-  while (wait(timeout)) {
-    EventZUncommit event;
-    size_t total_uncommitted = 0;
+    if (!activate_uncommit_cycle()) {
+      // We failed activating a new cycle, continue until next cycle
+      continue;
+    }
 
     while (should_continue()) {
       // Uncommit chunk
-      const size_t uncommitted = _partition->uncommit(&timeout);
-      if (uncommitted == 0) {
+      const size_t uncommitted = uncommit();
+
+      // Update uncommitted counter
+      uncommitted_since_last_timeout += uncommitted;
+
+      // 'uncommitted == 0' is a proxy for uncommit_cycle_is_canceled() without
+      // having to take the page allocator lock
+      if (uncommitted == 0 || uncommit_cycle_is_finished()) {
         // Done
         break;
       }
 
-      total_uncommitted += uncommitted;
+      if (_next_uncommit_timeout != 0) {
+        // Update statistics
+        update_statistics(uncommitted_since_last_timeout, start, &accumulated_time);
+
+        // Wait until next uncommit
+        wait(_next_uncommit_timeout);
+
+        // Reset event and statistics counters
+        start = Ticks::now();
+        uncommitted_since_last_timeout = 0;
+      }
     }
 
-    if (total_uncommitted > 0) {
-      // Update statistics
-      ZStatInc(ZCounterUncommit, total_uncommitted);
-      log_info(gc, heap)("Uncommitter (%u) Uncommitted: %zuM(%.0f%%)",
-                         _id, total_uncommitted / M, percent_of(total_uncommitted, ZHeap::heap()->max_capacity()));
+    if (_uncommitted > 0) {
+      if (uncommitted_since_last_timeout > 0) {
+        // Update statistics
+        update_statistics(uncommitted_since_last_timeout, start, &accumulated_time);
+      }
+
+      log_info(gc, heap)("Uncommitter (%u) Uncommitted: %zuM(%.0f%%) in %.3fms",
+                         _id, _uncommitted / M, percent_of(_uncommitted, ZHeap::heap()->max_capacity()),
+                         accumulated_time.seconds() * MILLIUNITS);
+    }
 
-      // Send event
-      event.commit(total_uncommitted);
+    if (!should_continue()) {
+      // We are terminating
+      return;
     }
+
+    deactivate_uncommit_cycle();
   }
 }
 
@@ -94,3 +173,253 @@ void ZUncommitter::terminate() {
   _stop = true;
   _lock.notify_all();
 }
+
+void ZUncommitter::reset_uncommit_cycle() {
+  _to_uncommit = 0;
+  _uncommitted = 0;
+  _cycle_start = 0.0;
+  _cancel_time = 0.0;
+
+  postcond(uncommit_cycle_is_finished());
+  postcond(!uncommit_cycle_is_canceled());
+  postcond(!uncommit_cycle_is_active());
+}
+
+void ZUncommitter::deactivate_uncommit_cycle() {
+  ZLocker<ZLock> locker(&_partition->_page_allocator->_lock);
+
+  precond(uncommit_cycle_is_active());
+  precond(uncommit_cycle_is_finished() || uncommit_cycle_is_canceled());
+
+  // Update the next timeout
+  if (uncommit_cycle_is_canceled()) {
+    update_next_cycle_timeout_on_cancel();
+  } else {
+    update_next_cycle_timeout_on_finish();
+  }
+
+  // Reset the cycle
+  reset_uncommit_cycle();
+}
+
+bool ZUncommitter::activate_uncommit_cycle() {
+  ZLocker<ZLock> locker(&_partition->_page_allocator->_lock);
+
+  precond(uncommit_cycle_is_finished());
+  precond(!uncommit_cycle_is_active());
+
+  if (uncommit_cycle_is_canceled()) {
+    // We were canceled before we managed to activate, update the timeout
+    update_next_cycle_timeout_on_cancel();
+
+    // Reset the cycle
+    reset_uncommit_cycle();
+
+    return false;
+  }
+
+  ZMappedCache* const cache = &_partition->_cache;
+
+  // Claim and reset the cache cycle tracking and register the cycle start time.
+  _cycle_start = os::elapsedTime();
+
+  // Read watermark from cache
+  const size_t uncommit_watermark = cache->min_size_watermark();
+
+  // Keep 10% as a headroom
+  const size_t to_uncommit = align_up(size_t(double(uncommit_watermark) * 0.9), ZGranuleSize);
+
+  // Never uncommit below min capacity
+  const size_t uncommit_limit = _partition->_capacity - _partition->_min_capacity;
+
+  _to_uncommit = MIN2(uncommit_limit, to_uncommit);
+  _uncommitted = 0;
+
+  // Reset watermark for next uncommit cycle
+  cache->reset_min_size_watermark();
+
+  postcond(is_aligned(_to_uncommit, ZGranuleSize));
+
+  return true;
+}
+
+uint64_t ZUncommitter::to_millis(double seconds) const {
+  return uint64_t(std::floor(seconds * double(MILLIUNITS)));
+}
+
+void ZUncommitter::update_next_cycle_timeout(double from_time) {
+  const double now = os::elapsedTime();
+
+  if (now < from_time + double(ZUncommitDelay)) {
+    _next_cycle_timeout = to_millis(ZUncommitDelay) - to_millis(now - from_time);
+  } else {
+    // ZUncommitDelay has already expired
+    _next_cycle_timeout = 0;
+  }
+}
+
+void ZUncommitter::update_next_cycle_timeout_on_cancel() {
+  precond(uncommit_cycle_is_canceled());
+
+  update_next_cycle_timeout(_cancel_time);
+
+  // Skip logging if there is no delay
+  if (ZUncommitDelay > 0) {
+    log_debug(gc, heap)("Uncommitter (%u) Cancel Next Cycle Timeout: " UINT64_FORMAT "ms",
+                        _id, _next_cycle_timeout);
+  }
+}
+
+void ZUncommitter::update_next_cycle_timeout_on_finish() {
+  precond(uncommit_cycle_is_active());
+  precond(uncommit_cycle_is_finished());
+
+  update_next_cycle_timeout(_cycle_start);
+
+  // Skip logging if there is no delay
+  if (ZUncommitDelay > 0) {
+    log_debug(gc, heap)("Uncommitter (%u) Finish Next Cycle Timeout: " UINT64_FORMAT "ms",
+                        _id, _next_cycle_timeout);
+  }
+}
+
+void ZUncommitter::cancel_uncommit_cycle() {
+  // Reset the cache cycle tracking and register the cancel time.
+  _partition->_cache.reset_min_size_watermark();
+  _cancel_time = os::elapsedTime();
+}
+
+void ZUncommitter::register_uncommit(size_t size) {
+  precond(uncommit_cycle_is_active());
+  precond(size > 0);
+  precond(size <= _to_uncommit);
+  precond(is_aligned(size, ZGranuleSize));
+
+  _to_uncommit -= size;
+  _uncommitted += size;
+
+  if (uncommit_cycle_is_canceled()) {
+    // Uncommit cycle got canceled while uncommitting.
+    return;
+  }
+
+  if (uncommit_cycle_is_finished()) {
+    // Everything has been uncommitted.
+    return;
+  }
+
+  const double now = os::elapsedTime();
+  const double time_since_start = now - _cycle_start;
+
+  if (time_since_start == 0.0) {
+    // Handle degenerate case where no time has elapsed.
+    _next_uncommit_timeout = 0;
+    return;
+  }
+
+  const double uncommit_rate = double(_uncommitted) / time_since_start;
+  const double time_to_complete = double(_to_uncommit) / uncommit_rate;
+  const double time_left = double(ZUncommitDelay) - time_since_start;
+
+  if (time_left < time_to_complete) {
+    // Too slow, work as fast as we can.
+    _next_uncommit_timeout = 0;
+    return;
+  }
+
+  const size_t uncommits_remaining_estimate = _to_uncommit / size + 1;
+  const uint64_t millis_left_rounded_down = to_millis(time_left);
+
+  if (uncommits_remaining_estimate < millis_left_rounded_down) {
+    // We have at least one millisecond per uncommit, spread them out.
+    _next_uncommit_timeout = millis_left_rounded_down / uncommits_remaining_estimate;
+    return;
+  }
+
+  // Randomly distribute the extra time, one millisecond at a time.
+  const double extra_time = time_left - time_to_complete;
+  const double random = double(uint32_t(os::random())) / double(std::numeric_limits<uint32_t>::max());
+
+  _next_uncommit_timeout = random < (extra_time / time_left) ? 1 : 0;
+}
+
+bool ZUncommitter::uncommit_cycle_is_finished() const {
+  return _to_uncommit == 0;
+}
+
+bool ZUncommitter::uncommit_cycle_is_active() const {
+  return _cycle_start != 0.0;
+}
+
+bool ZUncommitter::uncommit_cycle_is_canceled() const {
+  return _cancel_time != 0.0;
+}
+
+size_t ZUncommitter::uncommit() {
+  precond(uncommit_cycle_is_active());
+
+  ZArray<ZVirtualMemory> flushed_vmems;
+  size_t flushed = 0;
+
+  {
+    // We need to join the suspendible thread set while manipulating capacity
+    // and used, to make sure GC safepoints will have a consistent view.
+    SuspendibleThreadSetJoiner sts_joiner;
+    ZLocker<ZLock> locker(&_partition->_page_allocator->_lock);
+
+    if (uncommit_cycle_is_canceled()) {
+      // We have committed within the delay, stop uncommitting.
+      return 0;
+    }
+
+    // We flush out and uncommit chunks at a time (~0.8% of the max capacity,
+    // but at least one granule and at most 256M), in case demand for memory
+    // increases while we are uncommitting.
+    const size_t current_max_capacity = _partition->_current_max_capacity;
+    const size_t limit_upper_bound = MAX2(ZGranuleSize, align_down(256 * M / ZNUMA::count(), ZGranuleSize));
+    const size_t limit = MIN2(align_up(current_max_capacity >> 7, ZGranuleSize), limit_upper_bound);
+
+    ZMappedCache& cache = _partition->_cache;
+
+    // Never uncommit more than the current uncommit watermark,
+    // (adjusted by what has already been uncommitted).
+    const size_t allowed_to_uncommit = MAX2(cache.min_size_watermark(), _uncommitted) - _uncommitted;
+    const size_t to_uncommit = MIN2(_to_uncommit, allowed_to_uncommit);
+
+    // Never uncommit below min capacity.
+    const size_t retain = MAX2(_partition->_used, _partition->_min_capacity);
+    const size_t release = _partition->_capacity - retain;
+    const size_t flush = MIN3(release, limit, to_uncommit);
+
+    // Flush memory from the mapped cache for uncommit
+    flushed = cache.remove_for_uncommit(flush, &flushed_vmems);
+    if (flushed == 0) {
+      // Nothing flushed
+      cancel_uncommit_cycle();
+      return 0;
+    }
+
+    // Record flushed memory as claimed and how much we've flushed for this partition
+    Atomic::add(&_partition->_claimed, flushed);
+  }
+
+  // Unmap and uncommit flushed memory
+  for (const ZVirtualMemory vmem : flushed_vmems) {
+    _partition->unmap_virtual(vmem);
+    _partition->uncommit_physical(vmem);
+    _partition->free_physical(vmem);
+    _partition->free_virtual(vmem);
+  }
+
+  {
+    SuspendibleThreadSetJoiner sts_joiner;
+    ZLocker<ZLock> locker(&_partition->_page_allocator->_lock);
+
+    // Adjust claimed and capacity to reflect the uncommit
+    Atomic::sub(&_partition->_claimed, flushed);
+    _partition->decrease_capacity(flushed, false /* set_max_capacity */);
+    register_uncommit(flushed);
+  }
+
+  return flushed;
+}
diff --git a/src/hotspot/share/gc/z/zUncommitter.hpp b/src/hotspot/share/gc/z/zUncommitter.hpp
index f8630f7b7fb..a3cd2b17e23 100644
--- a/src/hotspot/share/gc/z/zUncommitter.hpp
+++ b/src/hotspot/share/gc/z/zUncommitter.hpp
@@ -26,6 +26,7 @@
 
 #include "gc/z/zLock.hpp"
 #include "gc/z/zThread.hpp"
+#include "utilities/ticks.hpp"
 
 class ZPartition;
 
@@ -35,16 +36,43 @@ class ZUncommitter : public ZThread {
   ZPartition* const      _partition;
   mutable ZConditionLock _lock;
   bool                   _stop;
+  double                 _cancel_time;
+  uint64_t               _next_cycle_timeout;
+  uint64_t               _next_uncommit_timeout;
+  double                 _cycle_start;
+  size_t                 _to_uncommit;
+  size_t                 _uncommitted;
 
   bool wait(uint64_t timeout) const;
   bool should_continue() const;
 
+  uint64_t to_millis(double seconds) const;
+
+  void update_next_cycle_timeout(double from_time);
+  void update_next_cycle_timeout_on_cancel();
+  void update_next_cycle_timeout_on_finish();
+
+  void reset_uncommit_cycle();
+  void deactivate_uncommit_cycle();
+  bool activate_uncommit_cycle();
+  void register_uncommit(size_t size);
+
+  bool uncommit_cycle_is_finished() const;
+  bool uncommit_cycle_is_active() const;
+  bool uncommit_cycle_is_canceled() const;
+
+  size_t uncommit();
+
+  void update_statistics(size_t uncommitted, Ticks start, Tickspan* accumulated_time) const;
+
 protected:
   virtual void run_thread();
   virtual void terminate();
 
 public:
   ZUncommitter(uint32_t id, ZPartition* partition);
+
+  void cancel_uncommit_cycle();
 };
 
 #endif // SHARE_GC_Z_ZUNCOMMITTER_HPP
diff --git a/test/hotspot/jtreg/gc/z/TestUncommit.java b/test/hotspot/jtreg/gc/z/TestUncommit.java
index c07cff85744..0ba4c55f22a 100644
--- a/test/hotspot/jtreg/gc/z/TestUncommit.java
+++ b/test/hotspot/jtreg/gc/z/TestUncommit.java
@@ -27,12 +27,10 @@
  * @test TestUncommit
  * @requires vm.gc.Z
  * @summary Test ZGC uncommit unused memory
- * @library /test/lib
  * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=5 gc.z.TestUncommit
  */
 
 import java.util.ArrayList;
-import jdk.test.lib.Utils;
 
 public class TestUncommit {
     private static final int delay = 5 * 1000; // milliseconds
@@ -110,7 +108,7 @@ private static void test(int objectSize) throws Exception {
             throw new Exception("Uncommitted too fast");
         }
 
-        if (actualDelay > delay * 2 * Utils.TIMEOUT_FACTOR) {
+        if (actualDelay > delay * 3) {
             throw new Exception("Uncommitted too slow");
         }
 

From c1a81cfb51f9c4e7c32a44126746e8655adc349e Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 3 Jun 2025 10:08:32 +0000
Subject: [PATCH 805/901] 8358284: doc/testing.html is not up to date after
 JDK-8355003

Reviewed-by: jwaters, dholmes, erikj
---
 doc/testing.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index 6288a552bf0..b9d1f4ed22f 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -72,9 +72,11 @@ <h1 class="title">Testing the JDK</h1>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+</ul></li>
 <li><a href="#testing-ahead-of-time-optimizations"
-id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</a></li>
+id="toc-testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</a>
+<ul>
 <li><a href="#testing-with-alternative-security-providers"
 id="toc-testing-with-alternative-security-providers">Testing with
 alternative security providers</a></li>
@@ -599,8 +601,8 @@ <h3 id="pkcs11-tests">PKCS11 Tests</h3>
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
-<h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</h3>
+<h2 id="testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</h2>
 <p>One way to improve test coverage of ahead-of-time (AOT) optimizations
 in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
 mode. Example:</p>

From 78a392aa3b0cda52cfacfa15250fa61010519424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Tue, 3 Jun 2025 11:42:10 +0000
Subject: [PATCH 806/901] 8356880: ZGC: Backoff in ZLiveMap::reset spin-loop

Reviewed-by: stefank, eosterlund, aboldtch
---
 src/hotspot/share/gc/z/zLiveMap.cpp | 55 +++++++++++++++++------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp
index 5b9e0a932c3..18b44dacab9 100644
--- a/src/hotspot/share/gc/z/zLiveMap.cpp
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp
@@ -30,6 +30,7 @@
 #include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/powerOfTwo.hpp"
+#include "utilities/spinYield.hpp"
 
 static const ZStatCounter ZCounterMarkSeqNumResetContention("Contention", "Mark SeqNum Reset Contention", ZStatUnitOpsPerSecond);
 static const ZStatCounter ZCounterMarkSegmentResetContention("Contention", "Mark Segment Reset Contention", ZStatUnitOpsPerSecond);
@@ -55,33 +56,40 @@ void ZLiveMap::reset(ZGenerationId id) {
   const uint32_t seqnum_initializing = (uint32_t)-1;
   bool contention = false;
 
+  SpinYield yielder(0, 0, 1000);
+
   // Multiple threads can enter here, make sure only one of them
   // resets the marking information while the others busy wait.
   for (uint32_t seqnum = Atomic::load_acquire(&_seqnum);
        seqnum != generation->seqnum();
        seqnum = Atomic::load_acquire(&_seqnum)) {
-    if ((seqnum != seqnum_initializing) &&
-        (Atomic::cmpxchg(&_seqnum, seqnum, seqnum_initializing) == seqnum)) {
-      // Reset marking information
-      _live_bytes = 0;
-      _live_objects = 0;
-
-      // Clear segment claimed/live bits
-      segment_live_bits().clear();
-      segment_claim_bits().clear();
-
-      // 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.
-      initialize_bitmap();
-
-      assert(_seqnum == seqnum_initializing, "Invalid");
-
-      // Make sure the newly reset marking information is ordered
-      // before the update of the page seqnum, such that when the
-      // up-to-date seqnum is load acquired, the bit maps will not
-      // contain stale information.
-      Atomic::release_store(&_seqnum, generation->seqnum());
-      break;
+
+    if (seqnum != seqnum_initializing) {
+      // No one has claimed initialization of the livemap yet
+      if (Atomic::cmpxchg(&_seqnum, seqnum, seqnum_initializing) == seqnum) {
+        // This thread claimed the initialization
+
+        // Reset marking information
+        _live_bytes = 0;
+        _live_objects = 0;
+
+        // Clear segment claimed/live bits
+        segment_live_bits().clear();
+        segment_claim_bits().clear();
+
+        // 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.
+        initialize_bitmap();
+
+        assert(_seqnum == seqnum_initializing, "Invalid");
+
+        // Make sure the newly reset marking information is ordered
+        // before the update of the page seqnum, such that when the
+        // up-to-date seqnum is load acquired, the bit maps will not
+        // contain stale information.
+        Atomic::release_store(&_seqnum, generation->seqnum());
+        break;
+      }
     }
 
     // Mark reset contention
@@ -93,6 +101,9 @@ void ZLiveMap::reset(ZGenerationId id) {
       log_trace(gc)("Mark seqnum reset contention, thread: " PTR_FORMAT " (%s), map: " PTR_FORMAT,
                     p2i(Thread::current()), ZUtils::thread_name(), p2i(this));
     }
+
+    // "Yield" to allow the thread that's resetting the livemap to finish
+    yielder.wait();
   }
 }
 

From 4618374269e8636c772d921ad0c2c2d9e5e3e643 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 3 Jun 2025 12:15:08 +0000
Subject: [PATCH 807/901] 8358310: ZGC: riscv, ppc ZPlatformAddressOffsetBits
 may return a too large value

Reviewed-by: eosterlund, mdoerr, fyang
---
 src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp     | 8 +++++---
 src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
index f3a7a948f70..89417c4691d 100644
--- a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
@@ -34,9 +34,11 @@
 #include <sys/mman.h>
 #endif // LINUX
 
-// Default value if probing is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of ZForwardingEntry or Partial array entry (see ZMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fail
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {
diff --git a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
index 5f783e6fb8b..9df0a431c45 100644
--- a/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zAddress_riscv.cpp
@@ -36,9 +36,11 @@
 #include <sys/mman.h>
 #endif // LINUX
 
-// Default value if probe is not implemented for a certain platform: 128TB
-static const size_t DEFAULT_MAX_ADDRESS_BIT = 47;
-// Minimum value returned, if probing fails: 64GB
+// Default value if probing is not implemented for a certain platform
+// Max address bit is restricted by implicit assumptions in the code, for instance
+// the bit layout of ZForwardingEntry or Partial array entry (see ZMarkStackEntry) in mark stack
+static const size_t DEFAULT_MAX_ADDRESS_BIT = 46;
+// Minimum value returned, if probing fail
 static const size_t MINIMUM_MAX_ADDRESS_BIT = 36;
 
 static size_t probe_valid_max_address_bit() {

From d3f54dae30e377b9fb4aaa06bc123b71de444a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Tue, 3 Jun 2025 14:27:41 +0000
Subject: [PATCH 808/901] 8357954: G1: No SATB barriers applied for runtime
 IN_NATIVE atomics

Reviewed-by: shade, kbarrett, tschatzl
---
 src/hotspot/share/gc/g1/g1BarrierSet.hpp      |  5 +++++
 .../share/gc/g1/g1BarrierSet.inline.hpp       | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index 8c2605b9746..2b1074fcd7a 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -112,6 +112,11 @@ class G1BarrierSet: public CardTableBarrierSet {
     // Defensive: will catch weak oops at addresses in heap
     template <typename T>
     static oop oop_load_in_heap(T* addr);
+
+    template <typename T>
+    static oop oop_atomic_cmpxchg_not_in_heap(T* addr, oop compare_value, oop new_value);
+    template <typename T>
+    static oop oop_atomic_xchg_not_in_heap(T* addr, oop new_value);
   };
 };
 
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index a032f072aed..33c153e9e5d 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -132,4 +132,26 @@ oop_store_not_in_heap(T* addr, oop new_value) {
   Raw::oop_store(addr, new_value);
 }
 
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_atomic_cmpxchg_not_in_heap(T* addr, oop compare_value, oop new_value) {
+  // Apply SATB barriers for all non-heap references, to allow
+  // concurrent scanning of such references.
+  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
+  bs->write_ref_field_pre<decorators>(addr);
+  return Raw::oop_atomic_cmpxchg(addr, compare_value, new_value);
+}
+
+template <DecoratorSet decorators, typename BarrierSetT>
+template <typename T>
+inline oop G1BarrierSet::AccessBarrier<decorators, BarrierSetT>::
+oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {
+  // Apply SATB barriers for all non-heap references, to allow
+  // concurrent scanning of such references.
+  G1BarrierSet *bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
+  bs->write_ref_field_pre<decorators>(addr);
+  return Raw::oop_atomic_xchg(addr, new_value);
+}
+
 #endif // SHARE_GC_G1_G1BARRIERSET_INLINE_HPP

From e2f736658fbd03d2dc2186dbd9ba9b13b1f1a8ac Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Tue, 3 Jun 2025 14:35:17 +0000
Subject: [PATCH 809/901] 8329951: `var` emits deprecation warnings that do not
 point to the file or position

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Analyzer.java    |  8 ++---
 .../com/sun/tools/javac/comp/Attr.java        |  4 +--
 .../tools/javac/tree/VarWarnPosition.java     | 29 +++++++++++++++++++
 .../tools/javac/tree/VarWarnPosition.out      |  6 ++++
 4 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 test/langtools/tools/javac/tree/VarWarnPosition.java
 create mode 100644 test/langtools/tools/javac/tree/VarWarnPosition.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
index 514de5e2fe8..1aea9f77a20 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
@@ -365,10 +365,6 @@ abstract class RedundantLocalVarTypeAnalyzerBase<X extends JCStatement> extends
             super(AnalyzerMode.LOCAL, tag);
         }
 
-        boolean isImplicitlyTyped(JCVariableDecl decl) {
-            return decl.vartype.pos == Position.NOPOS;
-        }
-
         /**
          * Map a variable tree into a new declaration using implicit type.
          */
@@ -401,7 +397,7 @@ class RedundantLocalVarTypeAnalyzer extends RedundantLocalVarTypeAnalyzerBase<JC
 
         boolean match(JCVariableDecl tree){
             return tree.sym.owner.kind == Kind.MTH &&
-                    tree.init != null && !isImplicitlyTyped(tree) &&
+                    tree.init != null && !tree.declaredUsingVar() &&
                     attr.canInferLocalVarType(tree) == null;
         }
         @Override
@@ -425,7 +421,7 @@ class RedundantLocalVarTypeAnalyzerForEach extends RedundantLocalVarTypeAnalyzer
 
         @Override
         boolean match(JCEnhancedForLoop tree){
-            return !isImplicitlyTyped(tree.var);
+            return !tree.var.declaredUsingVar();
         }
         @Override
         List<JCEnhancedForLoop> rewrite(JCEnhancedForLoop oldTree) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index a9293b2d135..9c9672151c7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -5716,9 +5716,9 @@ private Type capture(Type type) {
 
     private void setSyntheticVariableType(JCVariableDecl tree, Type type) {
         if (type.isErroneous()) {
-            tree.vartype = make.at(Position.NOPOS).Erroneous();
+            tree.vartype = make.at(tree.pos()).Erroneous();
         } else {
-            tree.vartype = make.at(Position.NOPOS).Type(type);
+            tree.vartype = make.at(tree.pos()).Type(type);
         }
     }
 
diff --git a/test/langtools/tools/javac/tree/VarWarnPosition.java b/test/langtools/tools/javac/tree/VarWarnPosition.java
new file mode 100644
index 00000000000..7dae84f3542
--- /dev/null
+++ b/test/langtools/tools/javac/tree/VarWarnPosition.java
@@ -0,0 +1,29 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8329951
+ * @summary Check that "var" variable synthetic types have a source position
+ * @compile/process/ref=VarWarnPosition.out -Xlint:deprecation -XDrawDiagnostics VarWarnPosition.java
+ */
+
+import java.util.*;
+import java.util.function.*;
+
+public class VarWarnPosition {
+
+    VarWarnPosition() {
+
+        // Test 1
+        @SuppressWarnings("deprecation")
+        List<Depr> deprecatedList = null;
+        for (var deprValue : deprecatedList) { }
+
+        // Test 2
+        Consumer<Depr> c = d -> { };
+
+        // Test 3
+        Consumer<Depr> c2 = (var d) -> { };
+    }
+}
+
+@Deprecated
+class Depr {}
diff --git a/test/langtools/tools/javac/tree/VarWarnPosition.out b/test/langtools/tools/javac/tree/VarWarnPosition.out
new file mode 100644
index 00000000000..2200c8b4ae0
--- /dev/null
+++ b/test/langtools/tools/javac/tree/VarWarnPosition.out
@@ -0,0 +1,6 @@
+VarWarnPosition.java:18:14: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:21:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:21:28: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:24:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+VarWarnPosition.java:24:30: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
+5 warnings

From faf19abd312ac461f9f74035fec61af7d834ffc1 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Tue, 3 Jun 2025 15:10:53 +0000
Subject: [PATCH 810/901] 8358333: Use VEX2 prefix in Assembler::psllq

Reviewed-by: jbhateja, thartmann
---
 src/hotspot/cpu/x86/assembler_x86.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 3fb64c8f644..897b06e94df 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -9140,7 +9140,8 @@ void Assembler::pslld(XMMRegister dst, int shift) {
 }
 
 void Assembler::psllq(XMMRegister dst, int shift) {
-  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ VM_Version::supports_evex(), /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_rex_vex_w_reverted();
   // XMM6 is for /6 encoding: 66 0F 73 /6 ib
   int encode = simd_prefix_and_encode(xmm6, dst, dst, VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
   emit_int24(0x73, (0xC0 | encode), shift & 0xFF);

From 01f01b6f7b8a2f0dbe940bffd567ff2b46732787 Mon Sep 17 00:00:00 2001
From: Igor Veresov <iveresov@openjdk.org>
Date: Tue, 3 Jun 2025 15:31:07 +0000
Subject: [PATCH 811/901] 8358283: Inconsistent failure mode for
 MetaspaceObj::operator new(size_t, MemTag)

Reviewed-by: kvn, kbarrett
---
 src/hotspot/share/memory/allocation.cpp | 2 +-
 src/hotspot/share/memory/allocation.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index b01ab4014ed..0d99c1bea68 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -86,7 +86,7 @@ void* MetaspaceObj::operator new(size_t size, ClassLoaderData* loader_data,
 }
 
 // This is used for allocating training data. We are allocating training data in many cases where a GC cannot be triggered.
-void* MetaspaceObj::operator new(size_t size, MemTag flags) throw() {
+void* MetaspaceObj::operator new(size_t size, MemTag flags) {
   void* p = AllocateHeap(size, flags, CALLER_PC);
   memset(p, 0, size);
   return p;
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 8cd6e6d4207..9e500135d0b 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -358,7 +358,7 @@ class MetaspaceObj {
                      size_t word_size,
                      Type type) throw();
   // This is used for allocating training data. We are allocating training data in many cases where a GC cannot be triggered.
-  void* operator new(size_t size, MemTag flags) throw();
+  void* operator new(size_t size, MemTag flags);
   void operator delete(void* p) = delete;
 
   // Declare a *static* method with the same signature in any subclass of MetaspaceObj

From b6f827ef054959662190e21ce63fc3d3c45b92f3 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Tue, 3 Jun 2025 15:36:29 +0000
Subject: [PATCH 812/901] 8348986: Improve coverage of enhanced exception
 messages

Reviewed-by: dfuchs
---
 .../share/classes/java/net/HostPortrange.java |  42 ++-
 .../classes/java/net/Inet4AddressImpl.java    |   6 +-
 .../share/classes/java/net/Inet6Address.java  |   8 +-
 .../share/classes/java/net/InetAddress.java   |  56 +--
 .../classes/java/net/NetworkInterface.java    |   6 +-
 .../share/classes/java/net/Proxy.java         |  11 +-
 .../classes/java/net/SocketPermission.java    |  14 +-
 .../classes/java/net/SocksSocketImpl.java     |   8 +-
 src/java.base/share/classes/java/net/URI.java |  14 +-
 src/java.base/share/classes/java/net/URL.java |   7 +-
 .../classes/java/net/URLStreamHandler.java    |  13 +-
 .../classes/jdk/internal/util/Exceptions.java | 322 ++++++++++++++++++
 src/java.base/share/classes/module-info.java  |   4 +
 .../classes/sun/net/util/IPAddressUtil.java   |   8 +-
 .../sun/net/util/SocketExceptions.java        |  96 ------
 .../share/classes/sun/net/www/ParseUtil.java  |   4 +-
 .../net/www/protocol/https/HttpsClient.java   |   9 +-
 .../sun/net/www/protocol/jar/Handler.java     |  24 +-
 .../net/www/protocol/jar/JarFileFactory.java  |   6 +-
 .../www/protocol/jar/JarURLConnection.java    |  17 +-
 .../sun/net/www/protocol/jmod/Handler.java    |   2 +-
 .../sun/nio/ch/DatagramSocketAdaptor.java     |   7 +-
 .../classes/sun/nio/ch/NioSocketImpl.java     |   9 +-
 .../classes/sun/nio/ch/SocketAdaptor.java     |   6 +-
 .../classes/sun/nio/ch/SocketChannelImpl.java |   8 +-
 .../share/conf/security/java.security         |  30 +-
 src/java.base/share/native/libnet/net_util.c  |  29 +-
 src/java.base/share/native/libnet/net_util.h  |   4 +-
 .../ch/UnixAsynchronousSocketChannelImpl.java |   9 +-
 .../sun/nio/fs/UnixUserPrincipals.java        |  12 +-
 .../unix/native/libnet/net_util_md.c          |  31 +-
 .../WindowsAsynchronousSocketChannelImpl.java |  12 +-
 .../sun/nio/fs/WindowsSecurityDescriptor.java |   8 +-
 .../sun/nio/fs/WindowsUserPrincipals.java     |  12 +-
 .../windows/native/libnet/Inet4AddressImpl.c  |   7 +-
 .../windows/native/libnet/Inet6AddressImpl.c  |   4 +-
 .../classes/com/sun/jndi/ldap/LdapURL.java    |   5 +-
 .../classes/com/sun/jndi/toolkit/url/Uri.java |  34 +-
 .../net/http/HttpRequestBuilderImpl.java      |   7 +-
 .../net/http/ResponseBodyHandlers.java        |  10 +-
 .../net/http/websocket/OpeningHandshake.java  |  12 +-
 .../share/classes/java/rmi/Naming.java        |  29 +-
 .../httpserver/simpleserver/JWebServer.java   |  11 +
 .../simpleserver/CommandLineNegativeTest.java |   6 +-
 test/jdk/java/net/URI/Test.java               |   1 +
 .../TestJDKIncludeInExceptions.java           |   6 +-
 test/jdk/sun/net/util/ExceptionsTest.java     | 172 ++++++++++
 47 files changed, 883 insertions(+), 275 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/util/Exceptions.java
 delete mode 100644 src/java.base/share/classes/sun/net/util/SocketExceptions.java
 create mode 100644 test/jdk/sun/net/util/ExceptionsTest.java

diff --git a/src/java.base/share/classes/java/net/HostPortrange.java b/src/java.base/share/classes/java/net/HostPortrange.java
index fd516b8d2d7..289846841c9 100644
--- a/src/java.base/share/classes/java/net/HostPortrange.java
+++ b/src/java.base/share/classes/java/net/HostPortrange.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,9 @@
 import java.util.Locale;
 import sun.net.util.IPAddressUtil;
 
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
+
 /**
  * Parses a string containing a host/domain name and port range
  */
@@ -56,7 +59,7 @@ public int hashCode() {
         return hostname.hashCode() + portrange[0] + portrange[1];
     }
 
-    HostPortrange(String scheme, String str) {
+    HostPortrange(String scheme, String host) {
         // Parse the host name.  A name has up to three components, the
         // hostname, a port number, or two numbers representing a port
         // range.   "www.example.com:8080-9090" is a valid host name.
@@ -67,21 +70,23 @@ public int hashCode() {
         // Refer to RFC 2732 for more information.
 
         // first separate string into two fields: hoststr, portstr
-        String hoststr, portstr = null;
+        String hoststr = null, portstr = null;
         this.scheme = scheme;
 
         // check for IPv6 address
-        if (str.charAt(0) == '[') {
+        if (host.charAt(0) == '[') {
             ipv6 = literal = true;
-            int rb = str.indexOf(']');
+            int rb = host.indexOf(']');
             if (rb != -1) {
-                hoststr = str.substring(1, rb);
+                hoststr = host.substring(1, rb);
             } else {
-                throw new IllegalArgumentException("invalid IPv6 address: " + str);
+                throw new IllegalArgumentException(
+                       formatMsg("invalid IPv6 address%s",
+                                 filterNonSocketInfo(host).prefixWith(": ")));
             }
-            int sep = str.indexOf(':', rb + 1);
-            if (sep != -1 && str.length() > sep) {
-                portstr = str.substring(sep + 1);
+            int sep = host.indexOf(':', rb + 1);
+            if (sep != -1 && host.length() > sep) {
+                portstr = host.substring(sep + 1);
             }
             // need to normalize hoststr now
             byte[] ip = IPAddressUtil.textToNumericFormatV6(hoststr);
@@ -94,16 +99,16 @@ public int hashCode() {
                     + "%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
                     ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7], ip[8],
                     ip[9], ip[10], ip[11], ip[12], ip[13], ip[14], ip[15]);
-            hostname = sb.toString();
+            this.hostname = sb.toString();
         } else {
             // not IPv6 therefore ':' is the port separator
 
-            int sep = str.indexOf(':');
-            if (sep != -1 && str.length() > sep) {
-                hoststr = str.substring(0, sep);
-                portstr = str.substring(sep + 1);
+            int sep = host.indexOf(':');
+            if (sep != -1 && host.length() > sep) {
+                hoststr = host.substring(0, sep);
+                portstr = host.substring(sep + 1);
             } else {
-                hoststr = sep == -1 ? str : str.substring(0, sep);
+                hoststr = sep == -1 ? host : host.substring(0, sep);
             }
             // is this a domain wildcard specification?
             if (hoststr.lastIndexOf('*') > 0) {
@@ -150,13 +155,14 @@ public int hashCode() {
                     }
                 }
             }
-            hostname = hoststr;
+            this.hostname = hoststr;
         }
 
         try {
             portrange = parsePort(portstr);
         } catch (Exception e) {
-            throw new IllegalArgumentException("invalid port range: " + portstr);
+            throw new IllegalArgumentException(
+                formatMsg("invalid port range%s", filterNonSocketInfo(portstr).prefixWith(": ")));
         }
     }
 
diff --git a/src/java.base/share/classes/java/net/Inet4AddressImpl.java b/src/java.base/share/classes/java/net/Inet4AddressImpl.java
index c7feaf4c195..3d8ea56d99f 100644
--- a/src/java.base/share/classes/java/net/Inet4AddressImpl.java
+++ b/src/java.base/share/classes/java/net/Inet4AddressImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, 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
@@ -27,6 +27,8 @@
 import java.net.spi.InetAddressResolver.LookupPolicy;
 
 import static java.net.spi.InetAddressResolver.LookupPolicy.IPV4;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /*
  * Package private implementation of InetAddressImpl for IPv4.
@@ -38,7 +40,7 @@ final class Inet4AddressImpl implements InetAddressImpl {
     public InetAddress[] lookupAllHostAddr(String hostname, LookupPolicy lookupPolicy)
             throws UnknownHostException {
         if ((lookupPolicy.characteristics() & IPV4) == 0) {
-            throw new UnknownHostException(hostname);
+            throw new UnknownHostException(formatMsg("%s", filterNonSocketInfo(hostname)));
         }
         return lookupAllHostAddr(hostname);
     }
diff --git a/src/java.base/share/classes/java/net/Inet6Address.java b/src/java.base/share/classes/java/net/Inet6Address.java
index 06a74ca3adc..f0f386a9d29 100644
--- a/src/java.base/share/classes/java/net/Inet6Address.java
+++ b/src/java.base/share/classes/java/net/Inet6Address.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,6 +35,8 @@
 import java.util.Enumeration;
 import java.util.Arrays;
 import java.util.Objects;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class represents an Internet Protocol version 6 (IPv6) address.
@@ -581,7 +583,9 @@ static InetAddress parseAddressString(String addressLiteral, boolean removeSqBra
         if (addrBytes.length == Inet4Address.INADDRSZ) {
             if (numericZone != -1 || ifname != null) {
                 // IPv4-mapped address must not contain zone-id
-                throw new UnknownHostException(addressLiteral + ": invalid IPv4-mapped address");
+                throw new UnknownHostException(
+                    formatMsg("%sinvalid IPv4-mapped address",
+                              filterNonSocketInfo(addressLiteral).suffixWith(": ")));
             }
             return new Inet4Address(null, addrBytes);
         }
diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 4bceebdcd0e..4d8a00249a9 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.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
@@ -54,6 +54,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Stream;
 
+import jdk.internal.util.Exceptions;
 import jdk.internal.access.JavaNetInetAddressAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Blocker;
@@ -68,6 +69,8 @@
 import static java.net.spi.InetAddressResolver.LookupPolicy.IPV4_FIRST;
 import static java.net.spi.InetAddressResolver.LookupPolicy.IPV6;
 import static java.net.spi.InetAddressResolver.LookupPolicy.IPV6_FIRST;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class represents an Internet Protocol (IP) address.
@@ -382,6 +385,7 @@ public byte[] addressBytes(Inet6Address inet6Address) {
                     }
                 }
         );
+        Exceptions.setup(); // needed for native exceptions
         init();
     }
 
@@ -902,7 +906,7 @@ private static class CachedLookup implements Addresses, Comparable<CachedLookup>
         @Override
         public InetAddress[] get() throws UnknownHostException {
             if (inetAddresses == null) {
-                throw new UnknownHostException(host);
+                throw new UnknownHostException(formatMsg("%s", filterNonSocketInfo(host)));
             }
             return inetAddresses;
         }
@@ -1095,7 +1099,9 @@ public InetAddress[] get() throws UnknownHostException {
                         }
                     }
                     if (inetAddresses == null || inetAddresses.length == 0) {
-                        throw ex == null ? new UnknownHostException(host) : ex;
+                        throw ex == null
+                            ? new UnknownHostException(formatMsg("%s", filterNonSocketInfo(host)))
+                            : ex;
                     }
                     return inetAddresses;
                 }
@@ -1203,16 +1209,19 @@ public String lookupByAddress(byte[] addr) throws UnknownHostException {
                     }
                 }
             } catch (IOException e) {
-                throw new UnknownHostException("Unable to resolve address "
-                        + Arrays.toString(addr) + " as hosts file " + hostsFile
-                        + " not found ");
+                throw new UnknownHostException(
+                    formatMsg("Unable to resolve address %s as hosts file %s not found",
+                              filterNonSocketInfo(Arrays.toString(addr)),
+                              filterNonSocketInfo(hostsFile)
+                                   .replaceWith("from ${jdk.net.hosts.file} system property")));
             }
 
             if ((host == null) || (host.isEmpty()) || (host.equals(" "))) {
-                throw new UnknownHostException("Requested address "
-                        + Arrays.toString(addr)
-                        + " resolves to an invalid entry in hosts file "
-                        + hostsFile);
+                throw new UnknownHostException(
+                    formatMsg("Requested address %s resolves to an invalid entry in hosts file %s",
+                              filterNonSocketInfo(Arrays.toString(addr)),
+                              filterNonSocketInfo(hostsFile)
+                                   .replaceWith("from ${jdk.net.hosts.file} system property")));
             }
             return host;
         }
@@ -1273,8 +1282,11 @@ public Stream<InetAddress> lookupByName(String host, LookupPolicy lookupPolicy)
                     }
                 }
             } catch (IOException e) {
-                throw new UnknownHostException("Unable to resolve host " + host
-                        + " as hosts file " + hostsFile + " not found ");
+                throw new UnknownHostException(
+                    formatMsg("Unable to resolve host %s as hosts file %s not found",
+                              filterNonSocketInfo(host), filterNonSocketInfo(hostsFile)
+                                   .replaceWith("from ${jdk.net.hosts.file} system property")));
+
             }
             // Check if only IPv4 addresses are requested
             if (needIPv4 && !needIPv6) {
@@ -1305,8 +1317,10 @@ public Stream<InetAddress> lookupByName(String host, LookupPolicy lookupPolicy)
         private void checkResultsList(List<InetAddress> addressesList, String hostName)
                 throws UnknownHostException {
             if (addressesList.isEmpty()) {
-                throw new UnknownHostException("Unable to resolve host " + hostName
-                        + " in hosts file " + hostsFile);
+                throw new UnknownHostException(
+                    formatMsg("Unable to resolve host %s in hosts file %s",
+                              filterNonSocketInfo(hostName), filterNonSocketInfo(hostsFile)
+                                   .replaceWith("from ${jdk.net.hosts.file} system property")));
             }
         }
 
@@ -1543,7 +1557,7 @@ public static InetAddress[] getAllByName(String host)
                     // Here we check the address string for ambiguity only
                     inetAddress = Inet4Address.parseAddressString(host, false);
                 } catch (IllegalArgumentException iae) {
-                    var uhe = new UnknownHostException(host);
+                    var uhe = new UnknownHostException(formatMsg("%s", filterNonSocketInfo(host)));
                     uhe.initCause(iae);
                     throw uhe;
                 }
@@ -1570,7 +1584,8 @@ public static InetAddress[] getAllByName(String host)
 
     private static UnknownHostException invalidIPv6LiteralException(String host, boolean wrapInBrackets) {
         String hostString = wrapInBrackets ? "[" + host + "]" : host;
-        return new UnknownHostException(hostString + ": invalid IPv6 address literal");
+        return new UnknownHostException(formatMsg("%sinvalid IPv6 address literal",
+                                                  filterNonSocketInfo(hostString).suffixWith(": ")));
     }
 
     /**
@@ -1708,7 +1723,8 @@ static InetAddress[] getAddressesFromNameService(String host)
         InetAddress[] result = addresses == null ? null
                 : addresses.toArray(InetAddress[]::new);
         if (result == null || result.length == 0) {
-            throw ex == null ? new UnknownHostException(host) : ex;
+            throw ex == null ? new UnknownHostException(formatMsg("%s", filterNonSocketInfo(host)))
+                             : ex;
         }
         return result;
     }
@@ -1780,9 +1796,9 @@ public static InetAddress getLocalHost() throws UnknownHostException {
                 localAddr = getAllByName0(local, false)[0];
             } catch (UnknownHostException uhe) {
                 // Rethrow with a more informative error message.
-                UnknownHostException uhe2 =
-                        new UnknownHostException(local + ": " +
-                                uhe.getMessage());
+                    UnknownHostException uhe2 =
+                        new UnknownHostException(formatMsg(filterNonSocketInfo(local)
+                                                               .suffixWith(": ") + uhe.getMessage()));
                 uhe2.initCause(uhe);
                 throw uhe2;
             }
diff --git a/src/java.base/share/classes/java/net/NetworkInterface.java b/src/java.base/share/classes/java/net/NetworkInterface.java
index 8e0f7137315..f6f7d438864 100644
--- a/src/java.base/share/classes/java/net/NetworkInterface.java
+++ b/src/java.base/share/classes/java/net/NetworkInterface.java
@@ -34,6 +34,8 @@
 import java.util.Spliterators;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class represents a Network Interface.
@@ -323,7 +325,9 @@ public static NetworkInterface getByInetAddress(InetAddress addr) throws SocketE
                         + addr.holder.family);
             }
         } else {
-            throw new IllegalArgumentException("invalid address type: " + addr);
+            throw new IllegalArgumentException(
+                formatMsg("invalid address type%s",
+                          filterNonSocketInfo(addr.toString()).prefixWith(": ")));
         }
         return getByInetAddress0(addr);
     }
diff --git a/src/java.base/share/classes/java/net/Proxy.java b/src/java.base/share/classes/java/net/Proxy.java
index db434238558..4109c586058 100644
--- a/src/java.base/share/classes/java/net/Proxy.java
+++ b/src/java.base/share/classes/java/net/Proxy.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
@@ -26,6 +26,8 @@
 package java.net;
 
 import java.util.Objects;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class represents a proxy setting, typically a type (http, socks) and
@@ -93,8 +95,11 @@ private Proxy() {
      * incompatible
      */
     public Proxy(Type type, SocketAddress sa) {
-        if ((type == Type.DIRECT) || !(sa instanceof InetSocketAddress))
-            throw new IllegalArgumentException("type " + type + " is not compatible with address " + sa);
+        if ((type == Type.DIRECT) || !(sa instanceof InetSocketAddress)) {
+            throw new IllegalArgumentException(
+                formatMsg("type " + type + " is not compatible with address %s",
+                          filterNonSocketInfo(String.valueOf(sa))));
+        }
         this.type = type;
         this.sa = sa;
     }
diff --git a/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java
index e3a85bbf856..eb14099f686 100644
--- a/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/src/java.base/share/classes/java/net/SocketPermission.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
@@ -46,6 +46,8 @@
 import sun.security.util.SecurityConstants;
 import sun.security.util.Debug;
 
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class represents access to a network via sockets.
@@ -392,8 +394,8 @@ private void init(String host, int mask) {
             if (rb != -1) {
                 host = host.substring(start, rb);
             } else {
-                throw new
-                    IllegalArgumentException("invalid host/port: "+host);
+                throw new IllegalArgumentException(
+                    formatMsg("invalid host/port%s", filterNonSocketInfo(host).prefixWith(": ")));
             }
             sep = hostport.indexOf(':', rb+1);
         } else {
@@ -410,8 +412,8 @@ private void init(String host, int mask) {
             try {
                 portrange = parsePort(port);
             } catch (Exception e) {
-                throw new
-                    IllegalArgumentException("invalid port range: "+port);
+                throw new IllegalArgumentException(
+                    formatMsg("invalid port range%s", filterNonSocketInfo(port).prefixWith(": ")));
             }
         } else {
             portrange = new int[] { PORT_MIN, PORT_MAX };
@@ -784,7 +786,7 @@ void getIP()
             throw uhe;
         }  catch (IndexOutOfBoundsException iobe) {
             invalid = true;
-            throw new UnknownHostException(getName());
+            throw new UnknownHostException(formatMsg("%s", filterNonSocketInfo(getName())));
         }
     }
 
diff --git a/src/java.base/share/classes/java/net/SocksSocketImpl.java b/src/java.base/share/classes/java/net/SocksSocketImpl.java
index 54ff612be02..71794d7a0a6 100644
--- a/src/java.base/share/classes/java/net/SocksSocketImpl.java
+++ b/src/java.base/share/classes/java/net/SocksSocketImpl.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
@@ -37,6 +37,8 @@
 import sun.net.www.ParseUtil;
 
 import static sun.net.util.IPAddressUtil.isIPv6LiteralAddress;
+import static jdk.internal.util.Exceptions.filterSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * SOCKS (V4 & V5) TCP socket implementation (RFC 1928).
@@ -330,7 +332,7 @@ protected void connect(SocketAddress endpoint, int timeout) throws IOException {
             // SOCKS Protocol version 4 doesn't know how to deal with
             // DOMAIN type of addresses (unresolved addresses here)
             if (epoint.isUnresolved())
-                throw new UnknownHostException(epoint.toString());
+                throw new UnknownHostException(formatMsg("%s", filterSocketInfo(epoint.toString())));
             connectV4(in, out, epoint, deadlineMillis);
             return;
         }
@@ -349,7 +351,7 @@ protected void connect(SocketAddress endpoint, int timeout) throws IOException {
             // SOCKS Protocol version 4 doesn't know how to deal with
             // DOMAIN type of addresses (unresolved addresses here)
             if (epoint.isUnresolved())
-                throw new UnknownHostException(epoint.toString());
+                throw new UnknownHostException(formatMsg("%s", filterSocketInfo(epoint.toString())));
             connectV4(in, out, epoint, deadlineMillis);
             return;
         }
diff --git a/src/java.base/share/classes/java/net/URI.java b/src/java.base/share/classes/java/net/URI.java
index cd116f3877b..daf63d19032 100644
--- a/src/java.base/share/classes/java/net/URI.java
+++ b/src/java.base/share/classes/java/net/URI.java
@@ -42,8 +42,12 @@
 import java.text.Normalizer;
 import jdk.internal.access.JavaNetUriAccess;
 import jdk.internal.access.SharedSecrets;
+import jdk.internal.util.Exceptions;
 import sun.nio.cs.UTF_8;
 
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
+
 /**
  * Represents a Uniform Resource Identifier (URI) reference.
  *
@@ -2032,7 +2036,8 @@ private static void checkPath(String s, String scheme, String path)
     {
         if (scheme != null) {
             if (path != null && !path.isEmpty() && path.charAt(0) != '/')
-                throw new URISyntaxException(s, "Relative path in absolute URI");
+                throw new URISyntaxException(formatMsg("%s", filterNonSocketInfo(s)),
+                                             "Relative path in absolute URI");
         }
     }
 
@@ -2988,11 +2993,14 @@ private class Parser {
         // -- Methods for throwing URISyntaxException in various ways --
 
         private void fail(String reason) throws URISyntaxException {
-            throw new URISyntaxException(input, reason);
+            throw new URISyntaxException(formatMsg("%s", filterNonSocketInfo(input)), reason);
         }
 
         private void fail(String reason, int p) throws URISyntaxException {
-            throw new URISyntaxException(input, reason, p);
+            if (!Exceptions.enhancedNonSocketExceptions()) {
+                p = -1;
+            }
+            throw new URISyntaxException(formatMsg("%s", filterNonSocketInfo(input)), reason, p);
         }
 
         private void failExpecting(String expected, int p)
diff --git a/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java
index be4daa28f33..9266b6c94f1 100644
--- a/src/java.base/share/classes/java/net/URL.java
+++ b/src/java.base/share/classes/java/net/URL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 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
@@ -44,6 +44,8 @@
 import jdk.internal.misc.ThreadTracker;
 import jdk.internal.misc.VM;
 import sun.net.util.IPAddressUtil;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * Class {@code URL} represents a Uniform Resource
@@ -1168,7 +1170,8 @@ public URI toURI() throws URISyntaxException {
         URI uri = new URI(toString());
         if (authority != null && isBuiltinStreamHandler(handler)) {
             String s = IPAddressUtil.checkAuthority(this);
-            if (s != null) throw new URISyntaxException(authority, s);
+            if (s != null)
+                throw new URISyntaxException(formatMsg("%s", filterNonSocketInfo(authority)), s);
         }
         return uri;
     }
diff --git a/src/java.base/share/classes/java/net/URLStreamHandler.java b/src/java.base/share/classes/java/net/URLStreamHandler.java
index 1400741b2bb..f66902a451e 100644
--- a/src/java.base/share/classes/java/net/URLStreamHandler.java
+++ b/src/java.base/share/classes/java/net/URLStreamHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2023, 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
@@ -30,6 +30,9 @@
 import java.util.Objects;
 import sun.net.util.IPAddressUtil;
 
+import static jdk.internal.util.Exceptions.formatMsg;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+
 /**
  * The abstract class {@code URLStreamHandler} is the common
  * superclass for all stream protocol handlers. A stream protocol
@@ -206,7 +209,7 @@ protected void parseURL(URL u, String spec, int start, int limit) {
                         if (!IPAddressUtil.
                             isIPv6LiteralAddress(host.substring(1, ind))) {
                             throw new IllegalArgumentException(
-                                "Invalid host: "+ host);
+                                formatMsg("Invalid host%s", filterNonSocketInfo(host).prefixWith(": ")));
                         }
 
                         port = -1 ;
@@ -220,12 +223,14 @@ protected void parseURL(URL u, String spec, int start, int limit) {
                                 }
                             } else {
                                 throw new IllegalArgumentException(
-                                    "Invalid authority field: " + authority);
+                                    formatMsg("Invalid authority field%s",
+                                               filterNonSocketInfo(authority).prefixWith(": ")));
                             }
                         }
                     } else {
                         throw new IllegalArgumentException(
-                            "Invalid authority field: " + authority);
+                            formatMsg("Invalid authority field%s",
+                                       filterNonSocketInfo(authority).prefixWith(": ")));
                     }
                 } else {
                     ind = host.indexOf(':');
diff --git a/src/java.base/share/classes/jdk/internal/util/Exceptions.java b/src/java.base/share/classes/jdk/internal/util/Exceptions.java
new file mode 100644
index 00000000000..eb4286cd1af
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/util/Exceptions.java
@@ -0,0 +1,322 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.io.IOException;
+import java.lang.reflect.Constructor;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnixDomainSocketAddress;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import sun.security.util.SecurityProperties;
+import jdk.internal.misc.VM;
+
+/**
+ * Contains static utility methods which can filter exception
+ * message strings for sensitive information.
+ *
+ * Code using this mechanism should use formatMsg()
+ * to generate a formatted (enhanced or restricted) string for exception
+ * messages.
+ *
+ * The methods above take variable numbers of SensitiveInfo objects
+ * as parameters which contain the text that may have to be filtered.
+ *
+ * The SensitiveInfo objects should be generated with one of the following:
+ *     public static SensitiveInfo filterSocketInfo(String s)
+ *     public static SensitiveInfo filterNonSocketInfo(String s)
+ *     public static SensitiveInfo filterJarName(String name)
+ *     public static SensitiveInfo filterUserName(String name)
+ */
+public final class Exceptions {
+    private Exceptions() {}
+
+    private static volatile boolean enhancedSocketExceptionText;
+    private static volatile boolean enhancedNonSocketExceptionText;
+    private static volatile boolean enhancedUserExceptionText;
+    private static volatile boolean enhancedJarExceptionText;
+    private static volatile boolean initialized = false;
+
+    /**
+     * Base class for generating exception messages that may
+     * contain sensitive information which in certain contexts
+     * needs to be filtered out, in case it gets revealed in
+     * unexpected places. Exception messages are either enhanced
+     * or restricted. Enhanced messages include sensitive information.
+     * Restricted messages don't.
+     *
+     * Sub-class for any new category that needs to be independently
+     * controlled. Consider using a unique value for the
+     * SecurityProperties.includedInExceptions(String value) mechanism
+     * Current values defined are "jar", "userInfo"
+     * "hostInfo", "hostInfoExclSocket".
+     *
+     * New code can also piggy back on existing categories
+     *
+     * A SensitiveInfo contains the following components
+     * all of which default to empty strings.
+     *
+     * prefix, the sensitive info itself, a suffix
+     * and a replacement string.
+     *
+     * The composeFilteredText(boolean enhance) method generates
+     * an enhanced string when enhance is true.
+     * This comprises (enhance == true)
+     *     prefix + info + suffix
+     * When (enhance == false), then by default the output is:
+     *     "" empty string
+     * However, if a replacement is set, then when enhance == false
+     * the output is the replacement string.
+     */
+    public abstract static class SensitiveInfo {
+        String info, suffix, prefix, replacement;
+        boolean enhanced;
+
+        SensitiveInfo(String info) {
+            this.info = info;
+            prefix = suffix = replacement = "";
+        }
+        public SensitiveInfo prefixWith(String prefix) {
+            this.prefix = prefix;
+            return this;
+        }
+        public SensitiveInfo suffixWith(String suffix) {
+            this.suffix = suffix;
+            return this;
+        }
+        public SensitiveInfo replaceWith(String replacement) {
+            this.replacement = replacement;
+            return this;
+        }
+
+        public boolean enhanced() {
+            return enhanced;
+        }
+
+        /**
+         * Implementation should call composeFilteredText(boolean flag)
+         * where flag contains the boolean value of whether
+         * the category is enabled or not.
+         */
+        public abstract String output();
+
+        protected String composeFilteredText(boolean enhance) {
+            if (enhance) {
+                this.enhanced = true;
+                return prefix + info + suffix;
+            } else {
+                return replacement;
+            }
+        }
+    }
+
+    static final class SocketInfo extends SensitiveInfo {
+        public SocketInfo(String host) {
+             super(host);
+        }
+        @Override
+        public String output() {
+            setup();
+            return super.composeFilteredText(enhancedSocketExceptionText);
+        }
+    }
+
+    static final class NonSocketInfo extends SensitiveInfo {
+        public NonSocketInfo(String host) {
+             super(host);
+        }
+        @Override
+        public String output() {
+            setup();
+            return super.composeFilteredText(enhancedNonSocketExceptionText);
+        }
+    }
+
+    static final class JarInfo extends SensitiveInfo {
+        public JarInfo(String name) {
+             super(name);
+        }
+        @Override
+        public String output() {
+            setup();
+            return super.composeFilteredText(enhancedJarExceptionText);
+        }
+    }
+
+    static final class UserInfo extends SensitiveInfo {
+        public UserInfo(String host) {
+             super(host);
+        }
+        @Override
+        public String output() {
+            setup();
+            return super.composeFilteredText(enhancedUserExceptionText);
+        }
+    }
+
+    // remove leading, trailing and duplicated space characters
+    static String trim(String s) {
+        int len = s.length();
+        if (len == 0) return s;
+
+        StringBuilder sb = new StringBuilder();
+
+        // initial value deals with leading spaces
+        boolean inSpace = true;
+        for (int i=0; i<len; i++) {
+            char c = s.charAt(i);
+            if (c == ' ') {
+                if (inSpace)
+                    continue;
+                inSpace = true;
+            } else
+                inSpace = false;
+            sb.append(c);
+        }
+        int sblen = sb.length();
+        // last char could be a space
+        if (sblen > 0 && sb.charAt(sblen - 1) == ' ')
+            sb.deleteCharAt(sblen - 1);
+        return sb.toString();
+    }
+
+    public static SensitiveInfo filterSocketInfo(String host) {
+        return new SocketInfo(host);
+    }
+
+    public static SensitiveInfo filterNonSocketInfo(String host) {
+        return new NonSocketInfo(host);
+    }
+
+    public static SensitiveInfo filterJarName(String name) {
+        return new JarInfo(name);
+    }
+
+    public static SensitiveInfo filterUserName(String name) {
+        return new UserInfo(name);
+    }
+
+    /**
+     * Transform each SensitiveInfo into a String argument which is passed
+     * to String.format(). This string is then trimmed.
+     */
+    public static String formatMsg(String format, SensitiveInfo... infos) {
+        String[] args = new String[infos.length];
+
+        int i = 0;
+
+        for (SensitiveInfo info : infos) {
+            args[i++] = info.output();
+        }
+        return trim(String.format(format, (Object[])args));
+    }
+
+    /**
+     * Simplification of above. Equivalent to:
+     *       formatMsg("%s", SensitiveInfo[1]); // ie with one arg
+     */
+    public static String formatMsg(SensitiveInfo info) {
+        return trim(info.output());
+    }
+
+    public static void setup() {
+        if (initialized || !VM.isBooted())
+            return;
+        enhancedSocketExceptionText = SecurityProperties.includedInExceptions("hostInfo");
+        enhancedNonSocketExceptionText = SecurityProperties.includedInExceptions("hostInfoExclSocket")
+                                      | enhancedSocketExceptionText;
+
+        enhancedUserExceptionText = SecurityProperties.includedInExceptions("userInfo");
+        enhancedJarExceptionText = SecurityProperties.INCLUDE_JAR_NAME_IN_EXCEPTIONS;
+        initialized = true;
+    }
+
+    public static boolean enhancedNonSocketExceptions() {
+        setup();
+        return enhancedNonSocketExceptionText;
+    }
+
+    public static boolean enhancedSocketExceptions() {
+        setup();
+        return enhancedSocketExceptionText;
+    }
+
+    /**
+     * The enhanced message text is the socket address appended to
+     * the original IOException message
+     */
+    public static IOException ioException(IOException e, SocketAddress addr) {
+        setup();
+        if (addr == null) {
+            return e;
+        }
+        if (!enhancedSocketExceptionText) {
+            return create(e, e.getMessage());
+        }
+        if (addr instanceof UnixDomainSocketAddress) {
+            return ofUnixDomain(e, (UnixDomainSocketAddress)addr);
+        } else if (addr instanceof InetSocketAddress) {
+            return ofInet(e, (InetSocketAddress)addr);
+        } else {
+            return e;
+        }
+    }
+
+    private static IOException ofInet(IOException e, InetSocketAddress addr) {
+        return create(e, String.join(": ", e.getMessage(), addr.toString()));
+    }
+
+    private static IOException ofUnixDomain(IOException e, UnixDomainSocketAddress addr) {
+        String path = addr.getPath().toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append(e.getMessage());
+        sb.append(": ");
+        sb.append(path);
+        String enhancedMsg = sb.toString();
+        return create(e, enhancedMsg);
+    }
+
+    // return a new instance of the same type with the given detail
+    // msg, or if the type doesn't support detail msgs, return given
+    // instance.
+    private static <T extends Exception> T create(T e, String msg) {
+        try {
+            Class<? extends Exception> clazz = e.getClass();
+            @SuppressWarnings("unchecked")
+            Constructor<T> ctor = (Constructor<T>)clazz.getConstructor(String.class);
+            T e1 = (ctor.newInstance(msg));
+            e1.setStackTrace(e.getStackTrace());
+            return e1;
+        } catch (Exception e0) {
+            // Some eg AsynchronousCloseException have no detail msg
+            return e;
+        }
+    }
+}
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index bbcdfef65ec..07de3f2c57f 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -270,9 +270,13 @@
         java.prefs,
         java.security.jgss,
         java.smartcardio,
+        java.naming,
+        java.rmi,
+        java.net.http,
         jdk.charsets,
         jdk.incubator.vector,
         jdk.internal.vm.ci,
+        jdk.httpserver,
         jdk.jlink,
         jdk.jpackage,
         jdk.net;
diff --git a/src/java.base/share/classes/sun/net/util/IPAddressUtil.java b/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
index b3da295c4a7..21bbc5ac455 100644
--- a/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
+++ b/src/java.base/share/classes/sun/net/util/IPAddressUtil.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
@@ -37,6 +37,9 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static jdk.internal.util.Exceptions.formatMsg;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+
 public class IPAddressUtil {
     private static final int INADDR4SZ = 4;
     private static final int INADDR16SZ = 16;
@@ -161,7 +164,8 @@ public static byte[] validateNumericFormatV4(String src, boolean throwIAE) {
      * @return an {@code IllegalArgumentException} instance
      */
     public static IllegalArgumentException invalidIpAddressLiteral(String src) {
-        return new IllegalArgumentException("Invalid IP address literal: " + src);
+        return new IllegalArgumentException(
+            formatMsg("Invalid IP address literal%s", filterNonSocketInfo(src).prefixWith(": ")));
     }
 
     /*
diff --git a/src/java.base/share/classes/sun/net/util/SocketExceptions.java b/src/java.base/share/classes/sun/net/util/SocketExceptions.java
deleted file mode 100644
index 1198898edcb..00000000000
--- a/src/java.base/share/classes/sun/net/util/SocketExceptions.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.net.util;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.net.InetSocketAddress;
-import java.net.UnixDomainSocketAddress;
-import java.net.SocketAddress;
-
-import sun.security.util.SecurityProperties;
-
-public final class SocketExceptions {
-    private SocketExceptions() {}
-
-    private static final boolean enhancedExceptionText =
-        SecurityProperties.includedInExceptions("hostInfo");
-
-    /**
-     * Utility which takes an exception and returns either the same exception
-     * or a new exception of the same type with the same stack trace
-     * and detail message enhanced with addressing information from the
-     * given InetSocketAddress.
-     *
-     * If the system/security property "jdk.includeInExceptions" is not
-     * set or does not contain the category hostInfo,
-     * then the original exception is returned.
-     *
-     * Only specific IOException subtypes are supported.
-     */
-    public static IOException of(IOException e, SocketAddress addr) {
-        if (!enhancedExceptionText || addr == null) {
-            return e;
-        }
-        if (addr instanceof UnixDomainSocketAddress) {
-            return ofUnixDomain(e, (UnixDomainSocketAddress)addr);
-        } else if (addr instanceof InetSocketAddress) {
-            return ofInet(e, (InetSocketAddress)addr);
-        } else {
-            return e;
-        }
-    }
-
-    private static IOException ofInet(IOException e, InetSocketAddress addr) {
-        return create(e, String.join(": ", e.getMessage(), addr.toString()));
-    }
-
-    private static IOException ofUnixDomain(IOException e, UnixDomainSocketAddress addr) {
-        String path = addr.getPath().toString();
-        StringBuilder sb = new StringBuilder();
-        sb.append(e.getMessage());
-        sb.append(": ");
-        sb.append(path);
-        String enhancedMsg = sb.toString();
-        return create(e, enhancedMsg);
-    }
-
-    // return a new instance of the same type with the given detail
-    // msg, or if the type doesn't support detail msgs, return given
-    // instance.
-    private static IOException create(final IOException e, final String msg) {
-        try {
-            Class<?> clazz = e.getClass();
-            Constructor<?> ctor = clazz.getConstructor(String.class);
-            IOException e1 = (IOException)(ctor.newInstance(msg));
-            e1.setStackTrace(e.getStackTrace());
-            return e1;
-        } catch (Exception e0) {
-            // Some eg AsynchronousCloseException have no detail msg
-            return e;
-        }
-    }
-}
diff --git a/src/java.base/share/classes/sun/net/www/ParseUtil.java b/src/java.base/share/classes/sun/net/www/ParseUtil.java
index 51d1b8398b6..cac32e53288 100644
--- a/src/java.base/share/classes/sun/net/www/ParseUtil.java
+++ b/src/java.base/share/classes/sun/net/www/ParseUtil.java
@@ -40,6 +40,8 @@
 import java.util.HexFormat;
 
 import sun.nio.cs.UTF_8;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * A class that contains useful routines common to sun.net.www
@@ -502,7 +504,7 @@ private static void checkPath(String s, String scheme, String path)
     {
         if (scheme != null) {
             if (path != null && !path.isEmpty() && path.charAt(0) != '/')
-                throw new URISyntaxException(s,
+                throw new URISyntaxException(formatMsg("%s", filterNonSocketInfo(s)),
                                              "Relative path in absolute URI");
         }
     }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
index fb2dfe6fff3..2f011f5805b 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
@@ -53,7 +53,8 @@
 
 import sun.util.logging.PlatformLogger;
 import static sun.net.www.protocol.http.HttpURLConnection.TunnelState.*;
-
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * This class provides HTTPS client URL support, building on the standard
@@ -559,8 +560,10 @@ private void checkURLSpoofing(HostnameVerifier hostnameVerifier)
         serverSocket.close();
         session.invalidate();
 
-        throw new IOException("HTTPS hostname wrong:  should be <"
-                              + url.getHost() + ">");
+        throw new IOException(formatMsg("Wrong HTTPS hostname%s",
+                                        filterNonSocketInfo(url.getHost())
+                                            .prefixWith(": should be <")
+                                            .suffixWith(">")));
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java
index 2884f825b84..381d4244238 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jar/Handler.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
@@ -27,6 +27,8 @@
 
 import java.io.IOException;
 import java.net.*;
+import static jdk.internal.util.Exceptions.filterJarName;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /*
  * Jar URL Handler
@@ -181,8 +183,11 @@ private String parseAbsoluteSpec(String spec) {
             String innerSpec = spec.substring(0, index - 1);
             newURL(innerSpec);
         } catch (MalformedURLException e) {
-            throw new NullPointerException("invalid url: " +
-                                           spec + " (" + e + ")");
+            throw new NullPointerException(
+                formatMsg("invalid url: %s %s", filterJarName(spec),
+                                                filterJarName(e.getMessage())
+                                                    .prefixWith("(")
+                                                    .suffixWith(")")));
         }
         return spec;
     }
@@ -193,19 +198,18 @@ private String parseContextSpec(URL url, String spec) {
         if (spec.startsWith("/")) {
             int bangSlash = indexOfBangSlash(ctxFile);
             if (bangSlash == -1) {
-                throw new NullPointerException("malformed " +
-                                               "context url:" +
-                                               url +
-                                               ": no !/");
+                throw new NullPointerException(
+                    formatMsg("malformed context url%s : no !/",
+                              filterJarName(String.valueOf(url)).prefixWith(": ")));
             }
             ctxFile = ctxFile.substring(0, bangSlash);
         } else {
             // chop up the last component
             int lastSlash = ctxFile.lastIndexOf('/');
             if (lastSlash == -1) {
-                throw new NullPointerException("malformed " +
-                                               "context url:" +
-                                               url);
+                throw new NullPointerException(
+                    formatMsg("malformed context url%s",
+                              filterJarName(String.valueOf(url)).prefixWith(": ")));
             } else if (lastSlash < ctxFile.length() - 1) {
                 ctxFile = ctxFile.substring(0, lastSlash + 1);
             }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/JarFileFactory.java b/src/java.base/share/classes/sun/net/www/protocol/jar/JarFileFactory.java
index 4d695c8d4e8..741854349d7 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jar/JarFileFactory.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jar/JarFileFactory.java
@@ -35,6 +35,8 @@
 import jdk.internal.util.OperatingSystem;
 import sun.net.util.URLUtil;
 import sun.net.www.ParseUtil;
+import static jdk.internal.util.Exceptions.filterJarName;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /* A factory for cached JAR file. This class is used to both retrieve
  * and cache Jar files.
@@ -108,7 +110,7 @@ JarFile getOrCreate(URL url, boolean useCaches) throws IOException {
             result = URLJarFile.getJarFile(patched, this);
         }
         if (result == null)
-            throw new FileNotFoundException(url.toString());
+            throw new FileNotFoundException(formatMsg("%s", filterJarName(url.toString())));
         return result;
     }
 
@@ -200,7 +202,7 @@ JarFile get(URL url, boolean useCaches) throws IOException {
             result = URLJarFile.getJarFile(url, this);
         }
         if (result == null)
-            throw new FileNotFoundException(url.toString());
+            throw new FileNotFoundException(formatMsg("%s", filterJarName(url.toString())));
 
         return result;
     }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
index 3a346308f71..96c04132551 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
@@ -37,6 +37,9 @@
 import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import static jdk.internal.util.Exceptions.filterJarName;
+import static jdk.internal.util.Exceptions.formatMsg;
+
 
 /**
  * @author Benjamin Renaud
@@ -129,9 +132,10 @@ public void connect() throws IOException {
                         factory.closeIfNotCached(url, jarFile);
                     } catch (Exception e) {
                     }
-                    throw new FileNotFoundException("JAR entry " + entryName +
-                            " not found in " +
-                            jarFile.getName());
+                    throw new FileNotFoundException(
+                        formatMsg("JAR entry %s not found in jar file %s",
+                                  filterJarName(entryName),
+                                  filterJarName(jarFile.getName())));
                 }
             }
 
@@ -169,9 +173,10 @@ public InputStream getInputStream() throws IOException {
             throw new IOException("no entry name specified");
         } else {
             if (jarEntry == null) {
-                throw new FileNotFoundException("JAR entry " + entryName +
-                                                " not found in " +
-                                                jarFile.getName());
+                throw new FileNotFoundException(
+                    formatMsg("JAR entry %s not found in jar file %s",
+                              filterJarName(entryName),
+                              filterJarName(jarFile.getName())));
             }
             result = new JarURLInputStream (jarFile.getInputStream(jarEntry));
         }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java
index 95bc2179a31..51a88cb229d 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jmod/Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 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
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
index 4930e1447a3..44b05f97472 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.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
@@ -53,6 +53,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static jdk.internal.util.Exceptions.formatMsg;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
 
 /**
  * A multicast datagram socket based on a datagram channel.
@@ -490,7 +492,8 @@ public void setInterface(InetAddress inf) throws SocketException {
         NetworkInterface ni = NetworkInterface.getByInetAddress(inf);
         if (ni == null) {
             String address = inf.getHostAddress();
-            throw new SocketException("No network interface with address " + address);
+            throw new SocketException(formatMsg("No network interface found with address %s",
+                                                filterNonSocketInfo(address)));
         }
         synchronized (outgoingInterfaceLock) {
             // set interface and update cached values
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 b3939f2ca05..6705134648d 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -58,10 +58,12 @@
 import sun.net.NetHooks;
 import sun.net.PlatformSocketImpl;
 import sun.net.ext.ExtendedSocketOptions;
-import sun.net.util.SocketExceptions;
+import jdk.internal.util.Exceptions;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * NIO based SocketImpl.
@@ -554,7 +556,8 @@ protected void connect(SocketAddress remote, int millis) throws IOException {
             throw new IOException("Unsupported address type");
         InetSocketAddress isa = (InetSocketAddress) remote;
         if (isa.isUnresolved()) {
-            throw new UnknownHostException(isa.getHostName());
+            throw new UnknownHostException(
+                formatMsg(filterNonSocketInfo(isa.getHostName())));
         }
 
         InetAddress address = isa.getAddress();
@@ -604,7 +607,7 @@ protected void connect(SocketAddress remote, int millis) throws IOException {
                 assert Thread.currentThread().isVirtual();
                 throw new SocketException("Closed by interrupt");
             } else {
-                throw SocketExceptions.of(ioe, isa);
+                throw Exceptions.ioException(ioe, isa);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
index d8ed1cfb675..bf777ed23e4 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java
@@ -40,6 +40,9 @@
 import java.util.Set;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
+
 
 // Make a socket channel look like a socket.
 //
@@ -92,7 +95,8 @@ public void connect(SocketAddress remote, int timeout) throws IOException {
             if (sc.isConnected())
                 throw new SocketException("Already connected");
             close();
-            throw new UnknownHostException(remote.toString());
+            throw new UnknownHostException(
+                formatMsg(filterNonSocketInfo(remote.toString())));
         }
         if (timeout < 0)
             throw new IllegalArgumentException("connect: timeout can't be negative");
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 0980592abab..c1241a51f85 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -64,7 +64,7 @@
 import sun.net.ConnectionResetException;
 import sun.net.NetHooks;
 import sun.net.ext.ExtendedSocketOptions;
-import sun.net.util.SocketExceptions;
+import jdk.internal.util.Exceptions;
 
 /**
  * An implementation of SocketChannels
@@ -975,7 +975,7 @@ public boolean connect(SocketAddress remote) throws IOException {
         } catch (IOException ioe) {
             // connect failed, close the channel
             close();
-            throw SocketExceptions.of(ioe, sa);
+            throw Exceptions.ioException(ioe, sa);
         }
     }
 
@@ -1065,7 +1065,7 @@ public boolean finishConnect() throws IOException {
         } catch (IOException ioe) {
             // connect failed, close the channel
             close();
-            throw SocketExceptions.of(ioe, remoteAddress);
+            throw Exceptions.ioException(ioe, remoteAddress);
         }
     }
 
@@ -1313,7 +1313,7 @@ void blockingConnect(SocketAddress remote, long nanos) throws IOException {
         } catch (IOException ioe) {
             // connect failed, close the channel
             close();
-            throw SocketExceptions.of(ioe, sa);
+            throw Exceptions.ioException(ioe, sa);
         }
     }
 
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index b750c1b82b0..61e8aaaf6d1 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -1277,8 +1277,13 @@ jceks.key.serialFilter = java.base/java.lang.Enum;java.base/java.security.KeyRep
 #
 # Enhanced exception message information
 #
-# By default, exception messages should not include potentially sensitive
-# information such as file names, host names, or port numbers. This property
+# Exception messages may include potentially sensitive information such as file
+# names, host names, or port numbers. By default, socket related exceptions
+# have this information restricted (meaning the sensitive details are removed).
+# Exception messages relating to JAR files and exceptions containing user
+# identity information are also restricted by default.
+# This property can be used to relax this restriction or to place further
+# restrictions on other categories, defined below. The property
 # accepts one or more comma separated values, each of which represents a
 # category of enhanced exception message information to enable. Values are
 # case-insensitive. Leading and trailing whitespaces, surrounding each value,
@@ -1291,17 +1296,28 @@ jceks.key.serialFilter = java.base/java.lang.Enum;java.base/java.security.KeyRep
 #
 # The categories are:
 #
-#  hostInfo - IOExceptions thrown by java.net.Socket and the socket types in the
-#             java.nio.channels package will contain enhanced exception
-#             message information
+#  hostInfo - All networking related exceptions will contain enhanced
+#             exception message information.
+#
+#  hostInfoExclSocket - The hostInfo category defined above, excluding
+#             IOExceptions thrown by java.net.Socket and the NetworkChannel
+#             types in the java.nio.channels package, will contain enhanced
+#             exception message information
 #
 #  jar      - enables more detailed information in the IOExceptions thrown
 #             by classes in the java.util.jar package
 #
+#  userInfo - enables more detailed information in exceptions which may contain
+#             user identity information
+#
 # The property setting in this file can be overridden by a system property of
 # the same name, with the same syntax and possible values.
 #
-#jdk.includeInExceptions=hostInfo,jar
+# If the property is not set or set to an empty string, then this is the most
+# restricted setting with all categories disabled. The following is the default
+# (out of the box) setting, meaning these categories are not restricted.
+#
+jdk.includeInExceptions=hostInfoExclSocket
 
 #
 # Disabled mechanisms for the Simple Authentication and Security Layer (SASL)
@@ -1557,4 +1573,4 @@ jdk.tls.alpnCharset=ISO_8859_1
 # java.security.PEMEncoder when configured for encryption with the
 # withEncryption method.
 #
-jdk.epkcs8.defaultAlgorithm=PBEWithHmacSHA256AndAES_128
\ No newline at end of file
+jdk.epkcs8.defaultAlgorithm=PBEWithHmacSHA256AndAES_128
diff --git a/src/java.base/share/native/libnet/net_util.c b/src/java.base/share/native/libnet/net_util.c
index a198152563a..9c0f14b0d90 100644
--- a/src/java.base/share/native/libnet/net_util.c
+++ b/src/java.base/share/native/libnet/net_util.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
@@ -86,9 +86,36 @@ DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
     /* check if SO_REUSEPORT is supported on this platform */
     REUSEPORT_available = reuseport_supported(IPv6_available);
 
+
     return JNI_VERSION_1_2;
 }
 
+static int enhancedExceptionsInitialized = 0;
+static int enhancedExceptionsAllowed = -1;
+
+#define CHECK_NULL_THROW_ERROR(X) \
+    if (X == NULL) {                                        \
+        JNU_ThrowByName(env, "java/lang/InternalError",     \
+            "can't initialize enhanced exceptions");        \
+        return -1;                                          \
+    }
+
+int getEnhancedExceptionsAllowed(JNIEnv *env) {
+    jclass cls;
+    jfieldID fid;
+
+    if (enhancedExceptionsInitialized) {
+        return enhancedExceptionsAllowed;
+    }
+    cls = (*env)->FindClass(env, "jdk/internal/util/Exceptions");
+    CHECK_NULL_THROW_ERROR(cls);
+    fid = (*env)->GetStaticFieldID(env, cls, "enhancedNonSocketExceptionText", "Z");
+    CHECK_NULL_THROW_ERROR(fid);
+    enhancedExceptionsAllowed = (*env)->GetStaticBooleanField(env, cls, fid);
+    enhancedExceptionsInitialized = 1;
+    return enhancedExceptionsAllowed;
+}
+
 static int initialized = 0;
 
 JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env) {
diff --git a/src/java.base/share/native/libnet/net_util.h b/src/java.base/share/native/libnet/net_util.h
index a1fa9571821..89537a7f47d 100644
--- a/src/java.base/share/native/libnet/net_util.h
+++ b/src/java.base/share/native/libnet/net_util.h
@@ -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
@@ -183,4 +183,6 @@ int lookupCharacteristicsToAddressFamily(int characteristics);
 
 int addressesInSystemOrder(int characteristics);
 
+int getEnhancedExceptionsAllowed(JNIEnv *env);
+
 #endif /* NET_UTILS_H */
diff --git a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
index b9c099ef92f..5e75e3b2486 100644
--- a/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.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
@@ -32,9 +32,10 @@
 import java.io.IOException;
 import java.io.FileDescriptor;
 
+import jdk.internal.util.Exceptions;
+
 import sun.net.ConnectionResetException;
 import sun.net.NetHooks;
-import sun.net.util.SocketExceptions;
 
 /**
  * Unix implementation of AsynchronousSocketChannel
@@ -264,7 +265,7 @@ private void finishConnect(boolean mayInvokeDirect) {
         if (e != null) {
             if (e instanceof IOException) {
                 var isa = (InetSocketAddress)pendingRemote;
-                e = SocketExceptions.of((IOException)e, isa);
+                e = Exceptions.ioException((IOException)e, isa);
             }
             // close channel if connection cannot be established
             try {
@@ -355,7 +356,7 @@ <A> Future<Void> implConnect(SocketAddress remote,
         // close channel if connect fails
         if (e != null) {
             if (e instanceof IOException) {
-                e = SocketExceptions.of((IOException)e, isa);
+                e = Exceptions.ioException((IOException)e, isa);
             }
             try {
                 close();
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java b/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java
index f50dea108b0..b1e7b7cbcc4 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.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
@@ -29,6 +29,9 @@
 import java.io.IOException;
 import static sun.nio.fs.UnixNativeDispatcher.*;
 
+import static jdk.internal.util.Exceptions.filterUserName;
+import static jdk.internal.util.Exceptions.formatMsg;
+
 /**
  * Unix implementation of java.nio.file.attribute.UserPrincipal
  */
@@ -132,18 +135,19 @@ public static Group fromGid(int gid) {
     private static int lookupName(String name, boolean isGroup)
         throws IOException
     {
-        int id;
+        int id = -1;
         try {
             id = (isGroup) ? getgrnam(name) : getpwnam(name);
         } catch (UnixException x) {
-            throw new IOException(name + ": " + x.errorString());
+            throw new IOException(formatMsg("%s " + x.errorString(),
+                                            filterUserName(name).suffixWith(": ")));
         }
         if (id == -1) {
             // lookup failed, allow input to be uid or gid
             try {
                 id = Integer.parseInt(name);
             } catch (NumberFormatException ignore) {
-                throw new UserPrincipalNotFoundException(name);
+                throw new UserPrincipalNotFoundException(formatMsg("%s", filterUserName(name)));
             }
         }
         return id;
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 1713d0a8ccd..d50130d188b 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -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
@@ -184,23 +184,36 @@ void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
 {
     int size;
     char *buf;
-    const char *format = "%s: %s";
     const char *error_string = gai_strerror(gai_error);
     if (error_string == NULL)
         error_string = "unknown error";
+    int enhancedExceptions = getEnhancedExceptionsAllowed(env);
+
+    if (enhancedExceptions) {
+        size = strlen(hostname);
+    } else {
+        size = 0;
+    }
+    size += strlen(error_string) + 3;
 
-    size = strlen(format) + strlen(hostname) + strlen(error_string) + 2;
     buf = (char *) malloc(size);
     if (buf) {
         jstring s;
-        snprintf(buf, size, format, hostname, error_string);
-        s = JNU_NewStringPlatform(env, buf);
-        if (s != NULL) {
-            jobject x = JNU_NewObjectByName(env,
+        int n;
+        if (enhancedExceptions) {
+            n = snprintf(buf, size, "%s: %s", hostname, error_string);
+        } else {
+            n = snprintf(buf, size, " %s", error_string);
+        }
+        if (n >= 0) {
+            s = JNU_NewStringPlatform(env, buf);
+            if (s != NULL) {
+                jobject x = JNU_NewObjectByName(env,
                                             "java/net/UnknownHostException",
                                             "(Ljava/lang/String;)V", s);
-            if (x != NULL)
-                (*env)->Throw(env, x);
+                if (x != NULL)
+                    (*env)->Throw(env, x);
+            }
         }
         free(buf);
     }
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
index f8b5fab4316..36065f040a0 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.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
@@ -33,9 +33,9 @@
 import java.net.*;
 import java.util.concurrent.*;
 import java.io.IOException;
+import jdk.internal.util.Exceptions;
 import jdk.internal.invoke.MhUtil;
 import jdk.internal.misc.Unsafe;
-import sun.net.util.SocketExceptions;
 
 /**
  * Windows implementation of AsynchronousSocketChannel using overlapped I/O.
@@ -253,7 +253,7 @@ public void run() {
 
             if (exc != null) {
                 closeChannel();
-                exc = SocketExceptions.of(toIOException(exc), remote);
+                exc = Exceptions.ioException(toIOException(exc), remote);
                 result.setFailure(exc);
             }
             Invoker.invoke(result);
@@ -280,7 +280,7 @@ public void completed(int bytesTransferred, boolean canInvokeDirect) {
             if (exc != null) {
                 closeChannel();
                 IOException ee = toIOException(exc);
-                ee = SocketExceptions.of(ee, remote);
+                ee = Exceptions.ioException(ee, remote);
                 result.setFailure(ee);
             }
 
@@ -296,12 +296,12 @@ public void completed(int bytesTransferred, boolean canInvokeDirect) {
          */
         @Override
         public void failed(int error, IOException x) {
-            x = SocketExceptions.of(x, remote);
+            x = Exceptions.ioException(x, remote);
             if (isOpen()) {
                 closeChannel();
                 result.setFailure(x);
             } else {
-                x = SocketExceptions.of(new AsynchronousCloseException(), remote);
+                x = Exceptions.ioException(new AsynchronousCloseException(), remote);
                 result.setFailure(x);
             }
             Invoker.invoke(result);
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
index da3460592f4..8c3dfa5546e 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, 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
@@ -33,6 +33,8 @@
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
+import static jdk.internal.util.Exceptions.filterUserName;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * A SecurityDescriptor for use when setting a file's ACL or creating a file
@@ -136,8 +138,8 @@ private WindowsSecurityDescriptor(List<AclEntry> acl) throws IOException {
                         Math.max(SIZEOF_ACCESS_ALLOWED_ACE, SIZEOF_ACCESS_DENIED_ACE);
 
                 } catch (WindowsException x) {
-                    throw new IOException("Failed to get SID for " + user.getName()
-                        + ": " + x.errorString());
+                    throw new IOException(formatMsg("Failed to get SID %s : " + x.errorString(),
+                                                    filterUserName(user.getName()).prefixWith("for ")));
                 }
             }
 
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java b/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java
index 336bbe22cfb..0a4e2b9c9fa 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsUserPrincipals.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
@@ -29,6 +29,8 @@
 
 import static sun.nio.fs.WindowsConstants.*;
 import static sun.nio.fs.WindowsNativeDispatcher.*;
+import static jdk.internal.util.Exceptions.formatMsg;
+import static jdk.internal.util.Exceptions.filterUserName;
 
 class WindowsUserPrincipals {
     private WindowsUserPrincipals() { }
@@ -132,13 +134,14 @@ static UserPrincipal fromSid(long sidAddress) throws IOException {
 
     static UserPrincipal lookup(String name) throws IOException {
         // invoke LookupAccountName to get buffer size needed for SID
-        int size;
+        int size = 0;
         try {
             size = LookupAccountName(name, 0L, 0);
         } catch (WindowsException x) {
             if (x.lastError() == ERROR_NONE_MAPPED)
                 throw new UserPrincipalNotFoundException(name);
-            throw new IOException(name + ": " + x.errorString());
+            throw new IOException(formatMsg("%s " + x.errorString(),
+                                            filterUserName(name).suffixWith(": ")));
         }
         assert size > 0;
 
@@ -153,7 +156,8 @@ static UserPrincipal lookup(String name) throws IOException {
             // return user principal
             return fromSid(sidBuffer.address());
         } catch (WindowsException x) {
-            throw new IOException(name + ": " + x.errorString());
+            throw new IOException(formatMsg("%s " + x.errorString(),
+                                            filterUserName(name).suffixWith(": ")));
         }
     }
 }
diff --git a/src/java.base/windows/native/libnet/Inet4AddressImpl.c b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
index 0e2d6a3455f..0ef0cae5be7 100644
--- a/src/java.base/windows/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet4AddressImpl.c
@@ -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
@@ -88,8 +88,9 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
 
     if (error) {
         // report error
-        NET_ThrowByNameWithLastError(env, "java/net/UnknownHostException",
-                                     hostname);
+        NET_ThrowByNameWithLastError(
+            env, "java/net/UnknownHostException",
+            getEnhancedExceptionsAllowed(env) ? hostname : "");
         goto cleanupAndReturn;
     } else {
         int i = 0;
diff --git a/src/java.base/windows/native/libnet/Inet6AddressImpl.c b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
index 244e2fefa9b..0281e2ddecb 100644
--- a/src/java.base/windows/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/windows/native/libnet/Inet6AddressImpl.c
@@ -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
@@ -84,7 +84,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
     if (error) {
         // report error
         NET_ThrowByNameWithLastError(env, "java/net/UnknownHostException",
-                                     hostname);
+            getEnhancedExceptionsAllowed(env) ? hostname : "");
         goto cleanupAndReturn;
     } else {
         int i = 0, inetCount = 0, inet6Count = 0, inetIndex = 0,
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java
index 140f025b779..d9319818801 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapURL.java
@@ -33,6 +33,8 @@
 import java.util.StringTokenizer;
 import com.sun.jndi.toolkit.url.Uri;
 import com.sun.jndi.toolkit.url.UrlUtil;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /*
  * Extract components of an LDAP URL.
@@ -119,7 +121,8 @@ public LdapURL(String url) throws NamingException {
 
     @Override
     protected MalformedURLException newInvalidURISchemeException(String uri) {
-        return new MalformedURLException("Not an LDAP URL: " + uri);
+        return new MalformedURLException(formatMsg("Not an LDAP URL%s",
+                                                   filterNonSocketInfo(uri).prefixWith(": ")));
     }
 
     @Override
diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java
index 10316b1ca69..a4db62868b0 100644
--- a/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java
+++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java
@@ -29,6 +29,8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 
 /**
@@ -232,6 +234,12 @@ private void parse(String uri, ParseMode mode) throws MalformedURLException {
         }
     }
 
+    private MalformedURLException newMalformedURLException(String prefix, String msg) {
+        return new MalformedURLException(prefix +
+                                         formatMsg(filterNonSocketInfo(msg)
+                                             .prefixWith(prefix.isEmpty()? "" : ": ")));
+    }
+
     /*
      * Parses a URI string and sets this object's fields accordingly.
      * Use java.net.URI to validate the uri string syntax
@@ -241,7 +249,7 @@ private void parseStrict(String uri) throws MalformedURLException {
             if (!isSchemeOnly(uri)) {
                 URI u = new URI(uri);
                 scheme = u.getScheme();
-                if (scheme == null) throw new MalformedURLException("Invalid URI: " + uri);
+                if (scheme == null) throw newMalformedURLException("Invalid URI", uri);
                 var auth = u.getRawAuthority();
                 hasAuthority = auth != null;
                 if (hasAuthority) {
@@ -253,7 +261,7 @@ private void parseStrict(String uri) throws MalformedURLException {
                             + (port == -1 ? "" : (":" + port));
                     if (!hostport.equals(auth)) {
                         // throw if we have user info or regname
-                        throw new MalformedURLException("unsupported authority: " + auth);
+                        throw newMalformedURLException("unsupported authority", auth);
                     }
                 }
                 path = u.getRawPath();
@@ -262,7 +270,7 @@ private void parseStrict(String uri) throws MalformedURLException {
                 }
                 if (u.getRawFragment() != null) {
                     if (!acceptsFragment()) {
-                        throw new MalformedURLException("URI fragments not supported: " + uri);
+                        throw newMalformedURLException("URI fragments not supported", uri);
                     }
                     fragment = "#" + u.getRawFragment();
                 }
@@ -279,7 +287,7 @@ private void parseStrict(String uri) throws MalformedURLException {
                 path = "";
             }
         } catch (URISyntaxException e) {
-            var mue =  new MalformedURLException(e.getMessage());
+            var mue =  newMalformedURLException("", e.getMessage());
             mue.initCause(e);
             throw mue;
         }
@@ -299,11 +307,11 @@ private void parseCompat(String uri) throws MalformedURLException {
         int qmark = uri.indexOf('?');
         int fmark = uri.indexOf('#');
         if (i < 0 || slash > 0 && i > slash || qmark > 0 && i > qmark || fmark > 0 && i > fmark) {
-            throw new MalformedURLException("Invalid URI: " + uri);
+            throw newMalformedURLException("Invalid URI", uri);
         }
         if (fmark > -1) {
             if (!acceptsFragment()) {
-                throw new MalformedURLException("URI fragments not supported: " + uri);
+                throw newMalformedURLException("URI fragments not supported", uri);
             }
         }
         if (i == uri.length() - 1) {
@@ -349,26 +357,26 @@ private void parseCompat(String uri) throws MalformedURLException {
                     String f = u.getRawFragment();
                     String ui = u.getRawUserInfo();
                     if (ui != null) {
-                        throw new MalformedURLException("user info not supported in authority: " + ui);
+                        throw newMalformedURLException("user info not supported in authority", ui);
                     }
                     if (!"/".equals(p)) {
-                        throw new MalformedURLException("invalid authority: " + auth);
+                        throw newMalformedURLException("invalid authority", auth);
                     }
                     if (q != null) {
-                        throw new MalformedURLException("invalid trailing characters in authority: ?" + q);
+                        throw newMalformedURLException("invalid trailing characters in authority '?'", "?" + q);
                     }
                     if (f != null) {
-                        throw new MalformedURLException("invalid trailing characters in authority: #" + f);
+                        throw newMalformedURLException("invalid trailing characters in authority: '#'", "#" + f);
                     }
                     String hostport = (host == null ? "" : host)
                             + (port == -1?"":(":" + port));
                     if (!auth.equals(hostport)) {
                         // throw if we have user info or regname
-                        throw new MalformedURLException("Authority component is not server-based, " +
-                                              "or contains user info. Unsupported authority: " + auth);
+                        throw newMalformedURLException("Authority component is not server-based, " +
+                                              "or contains user info. Unsupported authority", auth);
                     }
                 } catch (URISyntaxException e) {
-                    var mue = new MalformedURLException(e.getMessage());
+                    var mue = newMalformedURLException("", e.getMessage());
                     mue.initCause(e);
                     throw mue;
                 }
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
index e4dee55d8ea..a495fcce1ee 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.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
@@ -39,6 +39,8 @@
 import static jdk.internal.net.http.common.Utils.isValidName;
 import static jdk.internal.net.http.common.Utils.isValidValue;
 import static jdk.internal.net.http.common.Utils.newIAE;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 public class HttpRequestBuilderImpl implements HttpRequest.Builder {
 
@@ -82,7 +84,8 @@ static void checkURI(URI uri) {
             throw newIAE("invalid URI scheme %s", scheme);
         }
         if (uri.getHost() == null) {
-            throw newIAE("unsupported URI %s", uri);
+            throw new IllegalArgumentException(
+                formatMsg("unsupported URI %s", filterNonSocketInfo(uri.toString())));
         }
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java
index 79b2332ae37..a74c632c218 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseBodyHandlers.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
@@ -46,6 +46,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import jdk.internal.net.http.ResponseSubscribers.PathSubscriber;
+import jdk.internal.util.Exceptions;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 public final class ResponseBodyHandlers {
@@ -190,7 +191,12 @@ static boolean allowedInToken(char c) {
 
         static final UncheckedIOException unchecked(ResponseInfo rinfo,
                                                     String msg) {
-            String s = String.format("%s in response [%d, %s]", msg, rinfo.statusCode(), rinfo.headers());
+            String s;
+            if (Exceptions.enhancedNonSocketExceptions()) {
+                s = String.format("%s in response [%d, %s]", msg, rinfo.statusCode(), rinfo.headers());
+            } else {
+                s = String.format("%s in response [%d]", msg, rinfo.statusCode());
+            }
             return new UncheckedIOException(new IOException(s));
         }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
index c1c0853504c..6e76a272cd0 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.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,6 +61,8 @@
 import static java.lang.String.format;
 import static jdk.internal.net.http.common.Utils.isValidName;
 import static jdk.internal.net.http.common.Utils.stringOf;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 public class OpeningHandshake {
 
@@ -336,9 +338,13 @@ private static URI checkURI(URI uri) {
         if (!("ws".equalsIgnoreCase(scheme) || "wss".equalsIgnoreCase(scheme)))
             throw illegal("invalid URI scheme: " + scheme);
         if (uri.getHost() == null)
-            throw illegal("URI must contain a host: " + uri);
+            throw new IllegalArgumentException(
+                formatMsg("URI must contain a host%s",
+                          filterNonSocketInfo(uri.toString()).prefixWith(": ")));
         if (uri.getFragment() != null)
-            throw illegal("URI must not contain a fragment: " + uri);
+            throw new IllegalArgumentException(
+                formatMsg("URI must not contain a fragment%s",
+                          filterNonSocketInfo(uri.toString()).prefixWith(": ")));
         return uri;
     }
 
diff --git a/src/java.rmi/share/classes/java/rmi/Naming.java b/src/java.rmi/share/classes/java/rmi/Naming.java
index c4677991770..cb8766564a9 100644
--- a/src/java.rmi/share/classes/java/rmi/Naming.java
+++ b/src/java.rmi/share/classes/java/rmi/Naming.java
@@ -28,6 +28,8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
 
 /**
  * The <code>Naming</code> class provides methods for storing and obtaining
@@ -221,6 +223,11 @@ private static Registry getRegistry(ParsedNamingURL parsed)
         return LocateRegistry.getRegistry(parsed.host, parsed.port);
     }
 
+    private static MalformedURLException newMalformedURLException(String prefix, String msg) {
+        return new MalformedURLException(
+            prefix + formatMsg(filterNonSocketInfo(msg).prefixWith(": ")));
+    }
+
     /**
      * Dissect Naming URL strings to obtain referenced host, port and
      * object name.
@@ -240,8 +247,8 @@ private static ParsedNamingURL parseURL(String str)
              * '//:<port>' forms will result in a URI syntax exception
              * Convert the authority to a localhost:<port> form
              */
-            MalformedURLException mue = new MalformedURLException(
-                "invalid URL String: " + str);
+            MalformedURLException mue = newMalformedURLException(
+                "invalid URL String", str);
             mue.initCause(ex);
             int indexSchemeEnd = str.indexOf(':');
             int indexAuthorityBegin = str.indexOf("//:");
@@ -272,22 +279,22 @@ private static ParsedNamingURL intParseURL(String str)
     {
         URI uri = new URI(str);
         if (uri.isOpaque()) {
-            throw new MalformedURLException(
-                "not a hierarchical URL: " + str);
+            throw newMalformedURLException(
+                "not a hierarchical URL", str);
         }
         if (uri.getFragment() != null) {
-            throw new MalformedURLException(
-                "invalid character, '#', in URL name: " + str);
+            throw newMalformedURLException(
+                "invalid character, '#', in URL name", str);
         } else if (uri.getQuery() != null) {
-            throw new MalformedURLException(
-                "invalid character, '?', in URL name: " + str);
+            throw newMalformedURLException(
+                "invalid character, '?', in URL name", str);
         } else if (uri.getUserInfo() != null) {
-            throw new MalformedURLException(
-                "invalid character, '@', in URL host: " + str);
+            throw newMalformedURLException(
+                "invalid character, '@', in URL host", str);
         }
         String scheme = uri.getScheme();
         if (scheme != null && !scheme.equals("rmi")) {
-            throw new MalformedURLException("invalid URL scheme: " + str);
+            throw newMalformedURLException("invalid URL scheme", str);
         }
 
         String name = uri.getPath();
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
index c97162ef9bd..d6a42d366c8 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
@@ -35,6 +35,8 @@ public class JWebServer {
     private static final String SYS_PROP_MAX_CONNECTIONS = "jdk.httpserver.maxConnections";
     private static final String DEFAULT_JWEBSERVER_MAX_CONNECTIONS = "200";
 
+    private static final String SYS_PROP_ENHANCED_EXCEP = "jdk.includeInExceptions";
+    private static final String DEFAULT_ENHANCED_EXCEP = "net";
     /**
      * This constructor should never be called.
      */
@@ -61,6 +63,7 @@ public class JWebServer {
      */
     public static void main(String... args) {
         setMaxReqTime();
+        setEnhancedExceptions();
         setMaxConnectionsIfNotSet();
 
         int ec = SimpleFileServerImpl.start(new PrintWriter(System.out, true), "jwebserver", args);
@@ -80,6 +83,14 @@ private static void setMaxReqTime() {
         }
     }
 
+    static void setEnhancedExceptions() {
+        if (System.getProperty(SYS_PROP_ENHANCED_EXCEP) != null) {
+            // an explicit value has already been set, so we don't override it
+            return;
+        }
+        System.setProperty(SYS_PROP_ENHANCED_EXCEP, DEFAULT_ENHANCED_EXCEP);
+    }
+
     static void setMaxConnectionsIfNotSet() {
         if (System.getProperty(SYS_PROP_MAX_CONNECTIONS) == null) {
             System.setProperty(SYS_PROP_MAX_CONNECTIONS, DEFAULT_JWEBSERVER_MAX_CONNECTIONS);
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
index 5a16bedc29d..a82b0bf5a6f 100644
--- a/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/CommandLineNegativeTest.java
@@ -226,7 +226,11 @@ static String getJava(Path image) {
     }
 
     static OutputAnalyzer simpleserver(String... args) throws Throwable {
-        var pb = new ProcessBuilder(args)
+        String[] nargs = new String[args.length + 1];
+        nargs[0] = args[0];
+        System.arraycopy(args, 1, nargs, 2, args.length-1);
+        nargs[1] = "-Djdk.includeInExceptions=hostInfo";
+        var pb = new ProcessBuilder(nargs)
                 .directory(TEST_DIR.toFile());
         var outputAnalyser = ProcessTools.executeCommand(pb)
                 .outputTo(System.out)
diff --git a/test/jdk/java/net/URI/Test.java b/test/jdk/java/net/URI/Test.java
index 95dd49ea34f..57da0ac3607 100644
--- a/test/jdk/java/net/URI/Test.java
+++ b/test/jdk/java/net/URI/Test.java
@@ -26,6 +26,7 @@
  * @bug 4464135 4505046 4503239 4438319 4991359 4866303 7023363 7041800
  *      7171415 6339649 6933879 8037396 8272072 8051627 8297687 8353013
  * @author Mark Reinhold
+ * @run main/othervm Test
  */
 
 import java.io.ByteArrayInputStream;
diff --git a/test/jdk/jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.java b/test/jdk/jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.java
index 353309c1654..011fc6bbaf4 100644
--- a/test/jdk/jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.java
+++ b/test/jdk/jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.java
@@ -28,7 +28,7 @@
  * @bug 8207846 8208691
  * @summary Test the default setting of the jdk.net.includeInExceptions
  *          security property
- * @comment In OpenJDK, this property is empty by default and on purpose.
+ * @comment In OpenJDK, this property has value "hostInfoExclSocket" by default
  *          This test assures the default is not changed.
  * @run main TestJDKIncludeInExceptions
  */
@@ -36,9 +36,9 @@ public class TestJDKIncludeInExceptions {
 
     public static void main(String args[]) throws Exception {
         String incInExc = Security.getProperty("jdk.includeInExceptions");
-        if (incInExc != null) {
+        if (incInExc == null || !incInExc.equals("hostInfoExclSocket")) {
             throw new RuntimeException("Test failed: default value of " +
-                "jdk.includeInExceptions security property is not null: " +
+                "jdk.includeInExceptions security property does not have expected value: " +
                 incInExc);
         }
     }
diff --git a/test/jdk/sun/net/util/ExceptionsTest.java b/test/jdk/sun/net/util/ExceptionsTest.java
new file mode 100644
index 00000000000..d6717763afb
--- /dev/null
+++ b/test/jdk/sun/net/util/ExceptionsTest.java
@@ -0,0 +1,172 @@
+/*
+ * 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.net.InetAddress;
+import java.util.Arrays;
+import jdk.internal.util.Exceptions;
+import jdk.internal.util.Exceptions.SensitiveInfo;
+import static jdk.internal.util.Exceptions.formatMsg;
+import static jdk.internal.util.Exceptions.filterNonSocketInfo;
+import static jdk.internal.util.Exceptions.enhancedNonSocketExceptions;
+
+/*
+ * @test
+ * @bug 8348986
+ * @summary Improve coverage of enhanced exception messages
+ * @modules java.base/jdk.internal.util
+ * @run main/othervm -Djdk.includeInExceptions=hostInfo ExceptionsTest
+ * @run main/othervm ExceptionsTest
+ * @run main/othervm -Djdk.includeInExceptions=userInfo ExceptionsTest
+ * @run main/othervm -Djdk.net.hosts.file=does.not.exist -Djdk.includeInExceptions=userInfo ExceptionsTest
+ * @run main/othervm -Djdk.net.hosts.file=does.not.exist -Djdk.includeInExceptions=hostInfo ExceptionsTest
+ */
+public class ExceptionsTest {
+
+    static boolean netEnabled() {
+        System.out.printf("netEnabled = %b\n", enhancedNonSocketExceptions());
+        return enhancedNonSocketExceptions();
+    }
+
+    static boolean dnsEnabled() {
+        System.out.printf("dnsEnabled = %b\n", enhancedNonSocketExceptions());
+        return enhancedNonSocketExceptions();
+    }
+
+    static boolean hostFileEnabled() {
+        return System.getProperty("jdk.net.hosts.file", "").length() > 0;
+    }
+
+    static String[][][] tests = {
+    //
+    // If a format argument is of the form ".pre(xxx)" or ".suf(yyy)", then that is
+    // interpreted as a .prefixWith("xxx") or .suffixWith("yyy") call to the preceding
+    // argument. .rep() signifies .replaceWith()
+    //
+    //                  Number of elements in array
+    //                  ---------------------------
+    //                1              N                 2
+    //
+    //       Format string         args to format                  Enhanced o/p     non-enhanced o/p
+    //
+    /*  1 */ {{"foo: %s bar"},     {"abc"},                        {"foo: abc bar", "foo: bar"}},
+    /*  2 */ {{"foo: %s bar"},     {"a", "b"},                     {"foo: a bar", "foo: bar"}},
+    /*  3 */ {{"foo: %s bar"},     {null},                         {"foo: null bar", "foo: bar"}},
+    /*  4 */ {{"foo: %s bar"},     {""},                           {"foo: bar", "foo: bar"}},
+    /*  5 */ {{"%s foo: %s bar"},  {"a", "b"},                     {"a foo: b bar", "foo: bar"}},
+    /*  6 */ {{"foo: %s bar %s"},  {"a", "b"},                     {"foo: a bar b", "foo: bar"}},
+    /*  7 */ {{"foo: %s bar %s"},  {"abc", "def"},                 {"foo: abc bar def", "foo: bar"}},
+    /*  8 */ {{"%s bar %s"},       {"abc", ".pre(foo: )", "def"},  {"foo: abc bar def", "bar"}},
+    /*  9 */ {{"%s baz"},          {"abc", ".suf(: bar)"},         {"abc: bar baz", "baz"}},
+    /* 10 */ {{"%s baz"},          {"abc", ".suf(: bar)"
+                                         , ".rep(bob)"},           {"abc: bar baz", "bob baz"}}
+    };
+
+
+    static void dnsTest() {
+        String host = "fub.z.a.bar.foo";
+        try {
+            var addr = InetAddress.getByName(host);
+        } catch (IOException e) {
+            if (!dnsEnabled() && e.toString().contains(host))
+                throw new RuntimeException("Name lookup failed");
+        }
+    }
+
+    static void hostFileTest() {
+        String result1 = "Unable to resolve host www.rte.ie as hosts file does.not.exist not found";
+        String result2 = "Unable to resolve host as hosts file " +
+                         "from ${jdk.net.hosts.file} system property not found";
+
+        try {
+            var a = InetAddress.getByName("www.rte.ie");
+        } catch (IOException e) {
+            if (dnsEnabled() && !e.toString().contains(result1)) {
+                System.out.println("Lookup failed: " + e.toString());
+                throw new RuntimeException("Name lookup failed");
+            }
+            if (!dnsEnabled() && !e.toString().contains(result2)) {
+                System.out.println("Lookup failed: " + e.toString());
+                throw new RuntimeException("Name lookup failed");
+            }
+        }
+    }
+
+
+    final static String PRE = ".pre(";
+    final static String SUF = ".suf(";
+    final static String REP = ".rep(";
+
+    static SensitiveInfo[] getArgs(String[] args) {
+        SensitiveInfo[] sa = new SensitiveInfo[args.length];
+
+        int index = 0;
+        for (String s : args) {
+            if (s != null && s.startsWith(PRE)) {
+                var preArg = s.substring(PRE.length(), s.indexOf(')'));
+                sa[index-1] = sa[index-1].prefixWith(preArg);
+            } else if (s != null && s.startsWith(SUF)) {
+                var sufArg = s.substring(SUF.length(), s.indexOf(')'));
+                sa[index-1] = sa[index-1].suffixWith(sufArg);
+            } else if (s != null && s.startsWith(REP)) {
+                var repArg = s.substring(REP.length(), s.indexOf(')'));
+                sa[index-1] = sa[index-1].replaceWith(repArg);
+            } else {
+                sa[index++] = filterNonSocketInfo(s);
+            }
+        }
+        return Arrays.copyOf(sa, index);
+    }
+
+    public static void main(String[] a) {
+        if (!hostFileEnabled()) {
+            dnsTest();
+        } else {
+            hostFileTest();
+            return;
+        }
+
+        int count = 1;
+        for (String[][] test : tests) {
+            String format = test[0][0];
+            String expectedEnhanced = test[2][0];
+            String expectedNormal = test[2][1];
+            SensitiveInfo[] args = getArgs(test[1]);
+
+            String output = formatMsg(format, args);
+            if (netEnabled()) {
+                if (!output.equals(expectedEnhanced)) {
+                    var msg = String.format("FAIL %d: got: \"%s\" Expected: \"%s\"", count,
+                                output, expectedEnhanced);
+                    throw new RuntimeException(msg);
+                }
+            } else {
+                if (!output.equals(expectedNormal)) {
+                    var msg = String.format("FAIL %d: got: \"%s\" Expected: \"%s\"", count,
+                                output, expectedNormal);
+                    throw new RuntimeException(msg);
+                }
+            }
+            count++;
+        }
+    }
+}

From 4604c86d2fced32c186680788ba98f74df071b23 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 3 Jun 2025 15:43:26 +0000
Subject: [PATCH 813/901] 8357425: (fs) SecureDirectoryStream setPermissions
 should use fchmodat

Reviewed-by: alanb
---
 .../sun/nio/fs/UnixNativeDispatcher.java      | 22 +++++-
 .../sun/nio/fs/UnixSecureDirectoryStream.java | 25 ++++---
 .../native/libnio/fs/UnixNativeDispatcher.c   | 23 +++++++
 .../nio/file/DirectoryStream/SecureDS.java    | 67 ++++++++++++++++++-
 4 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
index 046f843371d..09611f23298 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 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
@@ -347,6 +347,18 @@ static void fchmod(int fd, int mode) throws UnixException {
     }
     private static native void fchmod0(int fd, int mode) throws UnixException;
 
+    /**
+     * fchmodat(int fd, const char *path, mode_t mode, int flag)
+     */
+    static void fchmodat(int fd, UnixPath path, int mode, int flag)
+        throws UnixException {
+        try (NativeBuffer buffer = copyToNativeBuffer(path)) {
+            fchmodat0(fd, buffer.address(), mode, flag);
+        }
+    }
+    private static native void fchmodat0(int fd, long pathAddress, int mode, int flag)
+        throws UnixException;
+
     /**
      * futimens(int fildes, const struct timespec times[2])
      */
@@ -558,6 +570,14 @@ static boolean xattrSupported() {
         return (capabilities & SUPPORTS_XATTR) != 0;
     }
 
+    /**
+     * Supports fchmodat with AT_SYMLINK_NOFOLLOW flag
+     */
+    static boolean fchmodatNoFollowSupported() {
+        return fchmodatNoFollowSupported0();
+    }
+    private static native boolean fchmodatNoFollowSupported0();
+
     private static native int init();
     static {
         jdk.internal.loader.BootLoader.loadLibrary("nio");
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
index c583afb588a..5c0693870e6 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
@@ -414,15 +414,24 @@ public void setPermissions(Set<PosixFilePermission> perms)
                 if (!ds.isOpen())
                     throw new ClosedDirectoryStreamException();
 
-                int fd = (file == null) ? dfd : open();
-                try {
-                    fchmod(fd, UnixFileModeAttribute.toUnixMode(perms));
-                } catch (UnixException x) {
-                    x.rethrowAsIOException(file);
-                } finally {
-                    if (file != null && fd >= 0)
-                        UnixNativeDispatcher.close(fd, e-> null);
+                int mode = UnixFileModeAttribute.toUnixMode(perms);
+                if (file == null)
+                    fchmod(dfd, mode);
+                else if (followLinks)
+                    fchmodat(dfd, file, mode, 0);
+                else if (fchmodatNoFollowSupported())
+                    fchmodat(dfd, file, mode, AT_SYMLINK_NOFOLLOW);
+                else {
+                    int fd = open();
+                    try {
+                        fchmod(fd, mode);
+                    } finally {
+                        if (fd >= 0)
+                            UnixNativeDispatcher.close(fd, e-> null);
+                    }
                 }
+            } catch (UnixException x) {
+                x.rethrowAsIOException(file);
             } finally {
                 ds.readLock().unlock();
             }
diff --git a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
index fefaac94b48..fbf996886ae 100644
--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
+++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
@@ -398,6 +398,16 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
     return capabilities;
 }
 
+JNIEXPORT jboolean JNICALL
+Java_sun_nio_fs_UnixNativeDispatcher_fchmodatNoFollowSupported0(JNIEnv* env, jclass this) {
+#if defined(__linux__)
+    // Linux recognizes but does not support the AT_SYMLINK_NOFOLLOW flag
+    return JNI_FALSE;
+#else
+    return JNI_TRUE;
+#endif
+}
+
 JNIEXPORT jbyteArray JNICALL
 Java_sun_nio_fs_UnixNativeDispatcher_getcwd(JNIEnv* env, jclass this) {
     jbyteArray result = NULL;
@@ -797,6 +807,19 @@ Java_sun_nio_fs_UnixNativeDispatcher_fchmod0(JNIEnv* env, jclass this, jint file
     }
 }
 
+JNIEXPORT void JNICALL
+Java_sun_nio_fs_UnixNativeDispatcher_fchmodat0(JNIEnv* env, jclass this,
+    jint fd, jlong pathAddress, jint mode, jint flag)
+{
+    int err;
+    const char* path = (const char*)jlong_to_ptr(pathAddress);
+
+    RESTARTABLE(fchmodat((int)fd, path, (mode_t)mode, (int)flag), err);
+    if (err == -1) {
+        throwUnixException(env, errno);
+    }
+}
+
 JNIEXPORT void JNICALL
 Java_sun_nio_fs_UnixNativeDispatcher_chown0(JNIEnv* env, jclass this,
     jlong pathAddress, jint uid, jint gid)
diff --git a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java
index e058d782c52..6199596b30c 100644
--- a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java
+++ b/test/jdk/java/nio/file/DirectoryStream/SecureDS.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,10 +22,12 @@
  */
 
 /* @test
- * @bug 4313887 6838333 8343020
+ * @bug 4313887 6838333 8343020 8357425
  * @summary Unit test for java.nio.file.SecureDirectoryStream
  * @requires (os.family == "linux" | os.family == "mac")
- * @library ..
+ * @library .. /test/lib
+ * @build jdk.test.lib.Platform
+ * @run main SecureDS
  */
 
 import java.nio.file.*;
@@ -37,6 +39,8 @@
 import java.io.IOException;
 import java.util.*;
 
+import jdk.test.lib.Platform;
+
 public class SecureDS {
     static boolean supportsSymbolicLinks;
 
@@ -54,6 +58,7 @@ public static void main(String[] args) throws IOException {
             // run tests
             doBasicTests(dir);
             doMoveTests(dir);
+            doSetPermissions(dir);
             miscTests(dir);
 
         } finally {
@@ -172,6 +177,62 @@ static void doBasicTests(Path dir) throws IOException {
         delete(dir2);
     }
 
+    // Exercise setting permisions on the SecureDirectoryStream's view
+    static void doSetPermissions(Path dir) throws IOException {
+        Path aDir = createDirectory(dir.resolve("dir"));
+
+        Set<PosixFilePermission> noperms = EnumSet.noneOf(PosixFilePermission.class);
+        Set<PosixFilePermission> permsDir = getPosixFilePermissions(aDir);
+
+        try (SecureDirectoryStream<Path> stream =
+             (SecureDirectoryStream<Path>)newDirectoryStream(aDir);) {
+
+            // Test setting permission on directory with no permissions
+            setPosixFilePermissions(aDir, noperms);
+            assertTrue(getPosixFilePermissions(aDir).equals(noperms));
+            PosixFileAttributeView view = stream.getFileAttributeView(PosixFileAttributeView.class);
+            view.setPermissions(permsDir);
+            assertTrue(getPosixFilePermissions(aDir).equals(permsDir));
+
+            if (supportsSymbolicLinks) {
+                // Create a file and a link to the file
+                Path fileEntry = Path.of("file");
+                Path file = createFile(aDir.resolve(fileEntry));
+                Set<PosixFilePermission> permsFile = getPosixFilePermissions(file);
+                Path linkEntry = Path.of("link");
+                Path link = createSymbolicLink(aDir.resolve(linkEntry), fileEntry);
+                Set<PosixFilePermission> permsLink = getPosixFilePermissions(link, NOFOLLOW_LINKS);
+
+                // Test following link to file
+                view = stream.getFileAttributeView(link, PosixFileAttributeView.class);
+                view.setPermissions(noperms);
+                assertTrue(getPosixFilePermissions(file).equals(noperms));
+                assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
+                view.setPermissions(permsFile);
+                assertTrue(getPosixFilePermissions(file).equals(permsFile));
+                assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
+
+                // Symbolic link permissions do not apply on Linux
+                if (!Platform.isLinux()) {
+                    // Test not following link to file
+                    view = stream.getFileAttributeView(link, PosixFileAttributeView.class, NOFOLLOW_LINKS);
+                    view.setPermissions(noperms);
+                    assertTrue(getPosixFilePermissions(file).equals(permsFile));
+                    assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(noperms));
+                    view.setPermissions(permsLink);
+                    assertTrue(getPosixFilePermissions(file).equals(permsFile));
+                    assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
+                }
+
+                delete(link);
+                delete(file);
+            }
+
+            // clean-up
+            delete(aDir);
+        }
+    }
+
     // Exercise SecureDirectoryStream's move method
     static void doMoveTests(Path dir) throws IOException {
         Path dir1 = createDirectory(dir.resolve("dir1"));

From d7def20afa045a0bb154655b02e56346f7f51347 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 3 Jun 2025 16:02:14 +0000
Subject: [PATCH 814/901] 8358448: JFR: Incorrect time unit for MethodTiming
 event

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

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
index 3eb3116db55..cc1d8f681c7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
@@ -43,7 +43,7 @@ public final class MethodTimingEvent extends AbstractJDKEvent {
     public long invocations;
 
     @Label("Average Time")
-    @Timespan
+    @Timespan(Timespan.TICKS)
     public long average;
 
     public static void commit(long start, long method, long invocations, long average) {

From 16e120b00842e340401b6930354edfb1515f6ca4 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Tue, 3 Jun 2025 16:12:53 +0000
Subject: [PATCH 815/901] 8357910: LoaderConstraintsTest.java fails when run
 with TEST_THREAD_FACTORY=Virtual

Reviewed-by: dholmes, coleenp
---
 test/hotspot/jtreg/ProblemList-Virtual.txt      |  1 -
 .../runtime/logging/LoaderConstraintsTest.java  | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index cb5b92b96cf..dbd555c1cdd 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -92,7 +92,6 @@ gc/arguments/TestNewSizeThreadIncrease.java 0000000 generic-all
 gc/g1/TestSkipRebuildRemsetPhase.java 0000000 generic-all
 runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java 8346442 generic-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 0000000 generic-all
-runtime/logging/LoaderConstraintsTest.java 8346442 generic-all
 runtime/Thread/AsyncExceptionOnMonitorEnter.java 0000000 generic-all
 runtime/Thread/StopAtExit.java 0000000 generic-all
 runtime/handshake/HandshakeWalkStackTest.java 0000000 generic-all
diff --git a/test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.java b/test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.java
index 39ad3b872a2..f1c493e5e93 100644
--- a/test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.java
+++ b/test/hotspot/jtreg/runtime/logging/LoaderConstraintsTest.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
@@ -38,6 +38,7 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -49,22 +50,25 @@ public class LoaderConstraintsTest {
     private static ProcessBuilder pb;
     private static class ClassUnloadTestMain {
         public static void main(String... args) throws Exception {
-            String className = "test.Empty";
             ClassLoader cl = ClassUnloadCommon.newClassLoader();
-            Class<?> c = cl.loadClass(className);
-            cl = null; c = null;
-            ClassUnloadCommon.triggerUnloading();
+            Class<?> c = cl.loadClass("test.Empty");
+            // Causes class test.Empty to be linked, which triggers the
+            // constraint on class String due to override of toString().
+            Constructor<?> constructor = c.getDeclaredConstructor();
         }
     }
 
     // Use the same command-line heap size setting as ../ClassUnload/UnloadTest.java
     static ProcessBuilder exec(String... args) throws Exception {
+        String classPath = System.getProperty("test.class.path", ".");
+
         List<String> argsList = new ArrayList<>();
         Collections.addAll(argsList, args);
         Collections.addAll(argsList, "-Xmn8m");
         Collections.addAll(argsList, "-Xbootclasspath/a:.");
         Collections.addAll(argsList, "-XX:+UnlockDiagnosticVMOptions");
         Collections.addAll(argsList, "-XX:+WhiteBoxAPI");
+        Collections.addAll(argsList, "-Dtest.class.path=" + classPath);
         Collections.addAll(argsList, ClassUnloadTestMain.class.getName());
         return ProcessTools.createLimitedTestJavaProcessBuilder(argsList);
     }
@@ -75,13 +79,12 @@ public static void main(String... args) throws Exception {
         pb = exec("-Xlog:class+loader+constraints=info");
         out = new OutputAnalyzer(pb.start());
         out.shouldHaveExitValue(0);
-        out.shouldContain("[class,loader,constraints] adding new constraint for name: java/lang/Class, loader[0]: 'app', loader[1]: 'bootstrap'");
+        out.stdoutShouldMatch("\\[class,loader,constraints\\] adding new constraint for name: java/lang/String, loader\\[0\\]: 'ClassUnloadCommonClassLoader' @[\\da-f]+, loader\\[1\\]: 'bootstrap'");
 
         // -Xlog:class+loader+constraints=off
         pb = exec("-Xlog:class+loader+constraints=off");
         out = new OutputAnalyzer(pb.start());
         out.shouldHaveExitValue(0);
         out.shouldNotContain("[class,loader,constraints]");
-
     }
 }

From 04c15466f68f1208084ee6e5f2322ace707d0446 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 3 Jun 2025 16:13:14 +0000
Subject: [PATCH 816/901] 8358095: Cleanup tests with explicit locale provider
 set to only CLDR

Reviewed-by: bpb, naoto
---
 .../Format/NumberFormat/CurrencyFormat.java   |  4 +-
 test/jdk/java/util/Calendar/Bug8007038.java   |  4 +-
 test/jdk/java/util/Calendar/Bug8167273.java   |  4 +-
 .../util/Calendar/CldrFormatNamesTest.java    |  4 +-
 .../Calendar/GenericTimeZoneNamesTest.java    |  7 +---
 .../util/Calendar/JapaneseEraNameTest.java    |  5 +--
 .../java/util/Calendar/NarrowNamesTest.java   |  4 +-
 .../util/Formatter/BasicTestLauncher.java     |  7 ++--
 .../AliasesShouldBeRecognizedInCLDR.java      |  4 +-
 .../Locale/RequiredAvailableLocalesTest.java  |  4 +-
 .../Locale/bcp47u/CurrencyFormatTests.java    |  4 +-
 .../util/Locale/bcp47u/DisplayNameTests.java  |  4 +-
 .../java/util/Locale/bcp47u/FormatTests.java  |  4 +-
 .../java/util/Locale/bcp47u/SymbolsTests.java |  4 +-
 test/jdk/java/util/TimeZone/Bug8167143.java   | 42 +++++++++----------
 .../util/TimeZone/CLDRDisplayNamesTest.java   |  2 +-
 .../TimeZone/ChineseTimeZoneNameTest.java     |  4 +-
 .../sun/util/resources/cldr/Bug8134250.java   |  4 +-
 .../sun/util/resources/cldr/Bug8134384.java   |  2 +-
 .../cldr/LikelySubtagLocalesTest.java         |  2 +-
 .../resources/cldr/TimeZoneNamesTest.java     |  2 +-
 21 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java
index fa50ecde2aa..6d7a906e394 100644
--- a/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.java
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencyFormat.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
@@ -28,7 +28,7 @@
  * @summary Basic tests for currency formatting.
  *          Tests both COMPAT and CLDR data.
  * @modules jdk.localedata
- * @run junit/othervm -Djava.locale.providers=CLDR CurrencyFormat
+ * @run junit CurrencyFormat
  */
 
 import java.io.File;
diff --git a/test/jdk/java/util/Calendar/Bug8007038.java b/test/jdk/java/util/Calendar/Bug8007038.java
index 874aaf10922..310c3e8c2a0 100644
--- a/test/jdk/java/util/Calendar/Bug8007038.java
+++ b/test/jdk/java/util/Calendar/Bug8007038.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
@@ -29,7 +29,7 @@
  * @modules java.base/sun.util.locale.provider
  * @modules jdk.localedata
  * @compile -XDignore.symbol.file Bug8007038.java
- * @run main/othervm -Djava.locale.providers=CLDR Bug8007038 CLDR
+ * @run main Bug8007038 CLDR
  */
 
 import java.util.*;
diff --git a/test/jdk/java/util/Calendar/Bug8167273.java b/test/jdk/java/util/Calendar/Bug8167273.java
index e4de858d4da..de9a72f5dc8 100644
--- a/test/jdk/java/util/Calendar/Bug8167273.java
+++ b/test/jdk/java/util/Calendar/Bug8167273.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
@@ -35,7 +35,7 @@
  *          java.base/sun.util.spi
  *          jdk.localedata
  * @run main Bug8167273 testEraName
- * @run main/othervm -Djava.locale.providers=CLDR Bug8167273 testCldr
+ * @run main Bug8167273 testCldr
  * @run main Bug8167273 testEmptyEraNames
  */
 import java.text.DateFormatSymbols;
diff --git a/test/jdk/java/util/Calendar/CldrFormatNamesTest.java b/test/jdk/java/util/Calendar/CldrFormatNamesTest.java
index ea6db600640..36369bef8a7 100644
--- a/test/jdk/java/util/Calendar/CldrFormatNamesTest.java
+++ b/test/jdk/java/util/Calendar/CldrFormatNamesTest.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,7 +28,7 @@
  * @modules java.base/sun.util.locale.provider
  *          jdk.localedata
  * @compile -XDignore.symbol.file CldrFormatNamesTest.java
- * @run main/othervm -Djava.locale.providers=CLDR CldrFormatNamesTest
+ * @run main CldrFormatNamesTest
  */
 
 import java.util.*;
diff --git a/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.java b/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.java
index 17fd09d4458..4c0e6c73585 100644
--- a/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.java
+++ b/test/jdk/java/util/Calendar/GenericTimeZoneNamesTest.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
@@ -26,12 +26,9 @@
  * @bug 8003267
  * @summary Unit test for generic time zone names support. This test is locale
  *          data-dependent and assumes that both JRE and CLDR have the same
- *          geneic time zone names in English.
+ *          generic time zone names in English.
  * @modules java.base/sun.util.locale.provider
- * @comment Locale providers: default
  * @run main GenericTimeZoneNamesTest en-US
- * @comment Locale providers: CLDR
- * @run main/othervm -Djava.locale.providers=CLDR GenericTimeZoneNamesTest en-US
 */
 
 import java.util.Locale;
diff --git a/test/jdk/java/util/Calendar/JapaneseEraNameTest.java b/test/jdk/java/util/Calendar/JapaneseEraNameTest.java
index 8fccfe7bb16..11e35927adf 100644
--- a/test/jdk/java/util/Calendar/JapaneseEraNameTest.java
+++ b/test/jdk/java/util/Calendar/JapaneseEraNameTest.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
@@ -27,8 +27,7 @@
  * @summary Test the localized Japanese new era name (May 1st. 2019-)
  *      is retrieved no matter CLDR provider contains the name or not.
  * @modules jdk.localedata
- * @run testng/othervm JapaneseEraNameTest
- * @run testng/othervm -Djava.locale.providers=CLDR JapaneseEraNameTest
+ * @run testng JapaneseEraNameTest
  */
 
 import static java.util.Calendar.*;
diff --git a/test/jdk/java/util/Calendar/NarrowNamesTest.java b/test/jdk/java/util/Calendar/NarrowNamesTest.java
index ab79e339444..2be43fdc1c0 100644
--- a/test/jdk/java/util/Calendar/NarrowNamesTest.java
+++ b/test/jdk/java/util/Calendar/NarrowNamesTest.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
@@ -31,7 +31,7 @@
  * @comment Locale providers: CLDR,SPI
  * @run main/othervm -Djava.locale.providers=CLDR,SPI NarrowNamesTest CLDR,SPI
  * @comment Locale providers: CLDR
- * @run main/othervm -Djava.locale.providers=CLDR NarrowNamesTest CLDR
+ * @run main NarrowNamesTest CLDR
  */
 
 import java.time.LocalDateTime;
diff --git a/test/jdk/java/util/Formatter/BasicTestLauncher.java b/test/jdk/java/util/Formatter/BasicTestLauncher.java
index 4dfc0e36743..3fa35c901cb 100644
--- a/test/jdk/java/util/Formatter/BasicTestLauncher.java
+++ b/test/jdk/java/util/Formatter/BasicTestLauncher.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
@@ -58,8 +58,7 @@
  * @run junit BasicTestLauncher
  */
 public class BasicTestLauncher {
-    // Locale flag for testJVM
-    private static final String JAVA_OPTS = "-Djava.locale.providers=CLDR";
+
     // Test class
     private static final String TEST_CLASS = "Basic";
 
@@ -82,7 +81,7 @@ void testTimeZone(String timeZone) throws IOException{
      */
     private static OutputAnalyzer RunTest(String timeZone) throws IOException{
         // Build and run Basic class with correct configuration
-        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(JAVA_OPTS, TEST_CLASS);
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(TEST_CLASS);
         pb.environment().put("TZ", timeZone);
         Process process = pb.start();
         return new OutputAnalyzer(process);
diff --git a/test/jdk/java/util/Locale/AliasesShouldBeRecognizedInCLDR.java b/test/jdk/java/util/Locale/AliasesShouldBeRecognizedInCLDR.java
index fa41aeea07c..5af83062fba 100644
--- a/test/jdk/java/util/Locale/AliasesShouldBeRecognizedInCLDR.java
+++ b/test/jdk/java/util/Locale/AliasesShouldBeRecognizedInCLDR.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
@@ -26,7 +26,7 @@
  * @bug 8179071 8202537 8231273 8251317
  * @summary Test that language aliases of CLDR supplemental metadata are handled correctly.
  * @modules jdk.localedata
- * @run junit/othervm -Djava.locale.providers=CLDR AliasesShouldBeRecognizedInCLDR
+ * @run junit AliasesShouldBeRecognizedInCLDR
  */
 
 /*
diff --git a/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java b/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java
index a1d6edd5d70..017e8af0fde 100644
--- a/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java
+++ b/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.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
@@ -25,7 +25,7 @@
  * @bug 8276186 8174269
  * @summary Checks whether getAvailableLocales() returns at least Locale.ROOT and
  *      Locale.US instances.
- * @run testng/othervm -Djava.locale.providers=CLDR RequiredAvailableLocalesTest
+ * @run testng RequiredAvailableLocalesTest
  */
 
 import java.lang.invoke.MethodHandles;
diff --git a/test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.java b/test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.java
index d3e14fb0d5a..feb52a49df5 100644
--- a/test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/CurrencyFormatTests.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
@@ -27,7 +27,7 @@
  * @bug 8215181 8230284 8231273 8284840
  * @summary Tests the "u-cf" extension
  * @modules jdk.localedata
- * @run testng/othervm -Djava.locale.providers=CLDR CurrencyFormatTests
+ * @run testng CurrencyFormatTests
  */
 
 import static org.testng.Assert.assertEquals;
diff --git a/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java b/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
index 11c4272f160..1f1a4d3e8ca 100644
--- a/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/DisplayNameTests.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
@@ -27,7 +27,7 @@
  * @bug 8176841 8202537
  * @summary Tests the display names for BCP 47 U extensions
  * @modules jdk.localedata
- * @run testng/othervm -Djava.locale.providers=CLDR DisplayNameTests
+ * @run testng DisplayNameTests
  */
 
 import static org.testng.Assert.assertEquals;
diff --git a/test/jdk/java/util/Locale/bcp47u/FormatTests.java b/test/jdk/java/util/Locale/bcp47u/FormatTests.java
index 774d1e3dee1..3e4b0bf5ea0 100644
--- a/test/jdk/java/util/Locale/bcp47u/FormatTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/FormatTests.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 @@
  * @summary Tests *Format class deals with Unicode extensions
  *      correctly.
  * @modules jdk.localedata
- * @run testng/othervm -Djava.locale.providers=CLDR FormatTests
+ * @run testng FormatTests
  */
 
 import static org.testng.Assert.assertEquals;
diff --git a/test/jdk/java/util/Locale/bcp47u/SymbolsTests.java b/test/jdk/java/util/Locale/bcp47u/SymbolsTests.java
index 2a8e8bf8e1e..451eac4c050 100644
--- a/test/jdk/java/util/Locale/bcp47u/SymbolsTests.java
+++ b/test/jdk/java/util/Locale/bcp47u/SymbolsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, 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 @@
  * @summary Tests *FormatSymbols class deals with Unicode extensions
  *      correctly.
  * @modules jdk.localedata
- * @run testng/othervm -Djava.locale.providers=CLDR SymbolsTests
+ * @run testng SymbolsTests
  */
 
 import static org.testng.Assert.assertEquals;
diff --git a/test/jdk/java/util/TimeZone/Bug8167143.java b/test/jdk/java/util/TimeZone/Bug8167143.java
index b8ce459a5de..fb94c94214f 100644
--- a/test/jdk/java/util/TimeZone/Bug8167143.java
+++ b/test/jdk/java/util/TimeZone/Bug8167143.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
@@ -35,7 +35,7 @@
  *          java.base/sun.util.spi
  *          jdk.localedata
  * @run main Bug8167143 testTimeZone
- * @run main/othervm -Djava.locale.providers=CLDR Bug8167143 testCldr
+ * @run main Bug8167143 testCldr
  * @run main Bug8167143 testCache
  * @run main Bug8167143 testCandidateLocales
  */
@@ -236,40 +236,40 @@ private static void reportDifference(List<Locale> got, List<Locale> expected, St
     private static void testImplicitCompatLocales() {
         LocaleProviderAdapter jre = LocaleProviderAdapter.forJRE();
         checkPresenceCompat("BreakIteratorProvider",
-            jre.getBreakIteratorProvider().getAvailableLocales());
+                jre.getBreakIteratorProvider().getAvailableLocales());
         checkPresenceCompat("CollatorProvider",
-            jre.getCollatorProvider().getAvailableLocales());
+                jre.getCollatorProvider().getAvailableLocales());
         checkPresenceCompat("DateFormatProvider",
-            jre.getDateFormatProvider().getAvailableLocales());
+                jre.getDateFormatProvider().getAvailableLocales());
         checkPresenceCompat("DateFormatSymbolsProvider",
-            jre.getDateFormatSymbolsProvider().getAvailableLocales());
+                jre.getDateFormatSymbolsProvider().getAvailableLocales());
         checkPresenceCompat("DecimalFormatSymbolsProvider",
-            jre.getDecimalFormatSymbolsProvider().getAvailableLocales());
+                jre.getDecimalFormatSymbolsProvider().getAvailableLocales());
         checkPresenceCompat("NumberFormatProvider",
-            jre.getNumberFormatProvider().getAvailableLocales());
+                jre.getNumberFormatProvider().getAvailableLocales());
         checkPresenceCompat("CurrencyNameProvider",
-            jre.getCurrencyNameProvider().getAvailableLocales());
+                jre.getCurrencyNameProvider().getAvailableLocales());
         checkPresenceCompat("LocaleNameProvider",
-            jre.getLocaleNameProvider().getAvailableLocales());
+                jre.getLocaleNameProvider().getAvailableLocales());
         checkPresenceCompat("TimeZoneNameProvider",
-            jre.getTimeZoneNameProvider().getAvailableLocales());
+                jre.getTimeZoneNameProvider().getAvailableLocales());
         checkPresenceCompat("CalendarDataProvider",
-            jre.getCalendarDataProvider().getAvailableLocales());
+                jre.getCalendarDataProvider().getAvailableLocales());
         checkPresenceCompat("CalendarNameProvider",
-            jre.getCalendarNameProvider().getAvailableLocales());
+                jre.getCalendarNameProvider().getAvailableLocales());
         checkPresenceCompat("CalendarProvider",
-            jre.getCalendarProvider().getAvailableLocales());
+                jre.getCalendarProvider().getAvailableLocales());
     }
 
     private static void checkPresenceCompat(String testName, Locale[] got) {
         List<Locale> gotLocalesList = Arrays.asList(got);
         List<Locale> gotList = new ArrayList<>(gotLocalesList);
-            if (!gotList.removeAll(COMPAT_IMPLICIT_LOCS)) {
-                // check which Implicit locale are not present in retrievedLocales List.
-                List<Locale> implicitLocales = new ArrayList<>(COMPAT_IMPLICIT_LOCS);
-                implicitLocales.removeAll(gotList);
-                throw new RuntimeException("Locales those not correctly reflected are "
-                        + implicitLocales + " for test " + testName);
-            }
+        if (!gotList.removeAll(COMPAT_IMPLICIT_LOCS)) {
+            // check which Implicit locale are not present in retrievedLocales List.
+            List<Locale> implicitLocales = new ArrayList<>(COMPAT_IMPLICIT_LOCS);
+            implicitLocales.removeAll(gotList);
+            throw new RuntimeException("Locales those not correctly reflected are "
+                    + implicitLocales + " for test " + testName);
+        }
     }
 }
diff --git a/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
index c1200445407..b6c80b6d7d0 100644
--- a/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
+++ b/test/jdk/java/util/TimeZone/CLDRDisplayNamesTest.java
@@ -26,7 +26,7 @@
  * @bug 8005471 8008577 8129881 8130845 8136518 8181157 8210490 8220037
  *      8234347 8236548 8317979
  * @modules jdk.localedata
- * @run main/othervm -Djava.locale.providers=CLDR CLDRDisplayNamesTest
+ * @run main CLDRDisplayNamesTest
  * @summary Make sure that localized time zone names of CLDR are used
  * if specified.
  */
diff --git a/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java b/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java
index f874da18df3..335d147f9ab 100644
--- a/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.java
+++ b/test/jdk/sun/util/resources/TimeZone/ChineseTimeZoneNameTest.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,7 +26,7 @@
  * @bug 8275721 8174269
  * @modules jdk.localedata
  * @summary Checks Chinese time zone names for `UTC` using CLDR are consistent
- * @run testng/othervm -Djava.locale.providers=CLDR ChineseTimeZoneNameTest
+ * @run testng ChineseTimeZoneNameTest
  */
 
 import java.time.Instant;
diff --git a/test/jdk/sun/util/resources/cldr/Bug8134250.java b/test/jdk/sun/util/resources/cldr/Bug8134250.java
index d38fce53352..bbc385cb870 100644
--- a/test/jdk/sun/util/resources/cldr/Bug8134250.java
+++ b/test/jdk/sun/util/resources/cldr/Bug8134250.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
@@ -26,7 +26,7 @@
  * @bug 8134250 8134520
  * @modules jdk.localedata
  * @summary Tests CLDR/LDML features are correctly reflected in JDK.
- * @run main/othervm -Djava.locale.providers=CLDR Bug8134250
+ * @run main Bug8134250
  */
 
 // Note this test highly depends on a particular version of CLDR. Results
diff --git a/test/jdk/sun/util/resources/cldr/Bug8134384.java b/test/jdk/sun/util/resources/cldr/Bug8134384.java
index f27b587ca98..17f41ba4c8d 100644
--- a/test/jdk/sun/util/resources/cldr/Bug8134384.java
+++ b/test/jdk/sun/util/resources/cldr/Bug8134384.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8134384 8234347 8236548 8347841
  * @summary Tests CLDR TimeZoneNames has English names for all tzids
- * @run main/othervm -Djava.locale.providers=CLDR Bug8134384
+ * @run main Bug8134384
  */
 
 import java.text.*;
diff --git a/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java b/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java
index 0e66db5c5da..c717e099f06 100644
--- a/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java
+++ b/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java
@@ -26,7 +26,7 @@
  * @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
+ * @run junit LikelySubtagLocalesTest
  */
 import java.util.Arrays;
 import java.util.List;
diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
index 4fe1a7d25a9..ed6fb2a58d8 100644
--- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
@@ -27,7 +27,7 @@
  * @modules jdk.localedata
  * @summary Checks CLDR time zone names are generated correctly at
  * either build or runtime
- * @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest
+ * @run testng TimeZoneNamesTest
  */
 
 import java.text.DateFormatSymbols;

From 57862005f9914ce60aa389a6e35d2e0cd38f8c35 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Tue, 3 Jun 2025 16:32:12 +0000
Subject: [PATCH 817/901] 8354450: A File should be invalid if an element of
 its name sequence ends with a space

Reviewed-by: alanb
---
 .../classes/java/io/WinNTFileSystem.java      | 25 +++---
 test/jdk/java/io/File/WinTrailingSpace.java   | 83 +++++++++++++++++++
 2 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 test/jdk/java/io/File/WinTrailingSpace.java

diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index 56aa27c004d..e053f7f004c 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -365,27 +365,28 @@ public boolean isAbsolute(File f) {
 
     @Override
     public boolean isInvalid(File f) {
-        if (f.getPath().indexOf('\u0000') >= 0)
+        final String pathname = f.getPath();
+
+        // Invalid if the pathname string contains a null character or if
+        // any name in the pathname's name sequence ends with a space
+        if (pathname.indexOf('\u0000') >= 0 || pathname.endsWith(" ")
+            || pathname.contains(" \\"))
             return true;
 
+        // The remaining checks are irrelevant for alternate data streams (ADS)
         if (ENABLE_ADS)
             return false;
 
-        // Invalid if there is a ":" at a position greater than 1, or if there
+        // Invalid if there is a ":" at a position other than 1, or if there
         // is a ":" at position 1 and the first character is not a letter
-        String pathname = f.getPath();
         int lastColon = pathname.lastIndexOf(":");
+        if (lastColon >= 0 &&
+            (lastColon != 1 || !isLetter(pathname.charAt(0))))
+            return true;
 
-        // Valid if there is no ":" present or if the last ":" present is
-        // at index 1 and the first character is a latter
-        if (lastColon < 0 ||
-            (lastColon == 1 && isLetter(pathname.charAt(0))))
-            return false;
-
-        // Invalid if path creation fails
-        Path path = null;
+        // Invalid if the path string cannot be converted to a Path
         try {
-            path = sun.nio.fs.DefaultFileSystemProvider.theFileSystem().getPath(pathname);
+            Path path = sun.nio.fs.DefaultFileSystemProvider.theFileSystem().getPath(pathname);
             return false;
         } catch (InvalidPathException ignored) {
         }
diff --git a/test/jdk/java/io/File/WinTrailingSpace.java b/test/jdk/java/io/File/WinTrailingSpace.java
new file mode 100644
index 00000000000..1997a867195
--- /dev/null
+++ b/test/jdk/java/io/File/WinTrailingSpace.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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/* @test
+ * @bug 8354450
+ * @requires os.family == "windows"
+ * @summary Verify behavior for file names with a trailing space
+ * @run junit WinTrailingSpace
+ */
+public class WinTrailingSpace {
+    private static final String FILENAME_NO_TRAILING_SPACE = "foobargus";
+    private static final String FILENAME_TRAILING_SPACE = "foobargus ";
+    private static final String DIRNAME_TRAILING_SPACE = "foo \\bar\\gus";
+
+    @Test
+    public void noTrailingSpace() throws IOException {
+        File f = null;
+        try {
+            f = new File(".", FILENAME_NO_TRAILING_SPACE);
+            f.delete();
+            f.createNewFile();
+            assertTrue(f.exists());
+        } finally {
+            if (f != null)
+                f.delete();
+        }
+    }
+
+    @Test
+    public void trailingSpace() throws IOException {
+        File f = null;
+        try {
+            f = new File(".", FILENAME_TRAILING_SPACE);
+            f.delete();
+            f.createNewFile();
+            assertFalse(f.exists(), "Creation of " + f + " should have failed");
+        } catch (IOException expected) {
+        } finally {
+            if (f != null)
+                f.delete();
+        }
+    }
+
+    @Test
+    public void dirTrailingSpace() throws IOException {
+        File f = null;
+        try {
+            f = new File(".", DIRNAME_TRAILING_SPACE);
+            f.delete();
+            assertFalse(f.mkdirs(), "Creation of " + f + " should have failed");
+        } finally {
+            if (f != null)
+                f.delete();
+        }
+    }
+}

From d7e58ac480b06c6340a65e67731d8f6dc179acfb Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Tue, 3 Jun 2025 17:00:54 +0000
Subject: [PATCH 818/901] 8351635: C2 ROR/ROL: assert failed: Long constant
 expected

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/vectornode.cpp         |   3 +-
 .../TestVectorRotateScalarCount.java          | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/TestVectorRotateScalarCount.java

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 05ef64af704..2b40ca77198 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1722,8 +1722,7 @@ Node* VectorNode::degenerate_vector_rotate(Node* src, Node* cnt, bool is_rotate_
       if (cnt->Opcode() == Op_ConvI2L) {
          cnt = cnt->in(1);
       } else {
-         assert(cnt->bottom_type()->isa_long() &&
-                cnt->bottom_type()->is_long()->is_con(), "Long constant expected");
+         assert(cnt->bottom_type()->isa_long(), "long type shift count expected");
          cnt = phase->transform(new ConvL2INode(cnt));
       }
     }
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorRotateScalarCount.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorRotateScalarCount.java
new file mode 100644
index 00000000000..f9b14b9f130
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorRotateScalarCount.java
@@ -0,0 +1,127 @@
+/*
+ * 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.Verify;
+import jdk.incubator.vector.*;
+
+/*
+ * @test
+ * @bug 8351635
+ * @summary Test missing pattern in vector rotate generation
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run driver compiler.vectorapi.TestVectorRotateScalarCount
+ */
+public class TestVectorRotateScalarCount {
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:UseAVX=2");
+    }
+
+    public static long long_shift = 31L;
+    public static int int_shift = 12;
+
+    static final Object GOLD_PATTERN1a = pattern1a();
+    static final Object GOLD_PATTERN1b = pattern1b();
+    static final Object GOLD_PATTERN2 = pattern2();
+    static final Object GOLD_PATTERN3 = pattern3();
+    static final Object GOLD_PATTERN4 = pattern4();
+
+    @Test
+    @IR(counts = {IRNode.URSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.LSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.OR_VL, IRNode.VECTOR_SIZE_2, "1"},
+                  applyIfCPUFeatureAnd = {"avx2", "true", "avx512f", "false", "avx512vl", "false"})
+    public static Object pattern1a() {
+        LongVector lv1 = LongVector.broadcast(LongVector.SPECIES_128, 1);
+        long x = Long.divideUnsigned(long_shift, Long.MIN_VALUE);
+        return lv1.lanewise(VectorOperators.ROL, x);
+    }
+
+    @Check(test = "pattern1a")
+    public static void check_pattern1a(Object param) {
+        Verify.checkEQ(GOLD_PATTERN1a, param);
+    }
+
+    @Test
+    @IR(counts = {IRNode.URSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.LSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.OR_VL, IRNode.VECTOR_SIZE_2, "1"},
+                  applyIfCPUFeatureAnd = {"avx2", "true", "avx512f", "false", "avx512vl", "false"})
+    public static Object pattern1b() {
+        LongVector lv1 = LongVector.broadcast(LongVector.SPECIES_128, 1);
+        long x = Long.min(32, Long.max(Long.reverse(long_shift), 0));
+        return lv1.lanewise(VectorOperators.ROR, x);
+    }
+
+    @Check(test = "pattern1b")
+    public static void check_pattern1b(Object param) {
+        Verify.checkEQ(GOLD_PATTERN1b, param);
+    }
+
+    @Test
+    @IR(counts = {IRNode.URSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.LSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.OR_VL, IRNode.VECTOR_SIZE_2, "1"},
+                  applyIfCPUFeatureAnd = {"avx2", "true", "avx512f", "false", "avx512vl", "false"})
+    public static Object pattern2() {
+        LongVector lv1 = LongVector.broadcast(LongVector.SPECIES_128, 1);
+        return lv1.lanewise(VectorOperators.ROL, int_shift);
+    }
+
+    @Check(test = "pattern2")
+    public static void check_pattern2(Object param) {
+       Verify.checkEQ(GOLD_PATTERN2, param);
+    }
+
+    @Test
+    @IR(counts = {IRNode.URSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.LSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.OR_VL, IRNode.VECTOR_SIZE_2, "1"},
+                  applyIfCPUFeatureAnd = {"avx2", "true", "avx512f", "false", "avx512vl", "false"})
+    public static Object pattern3() {
+        LongVector lv1 = LongVector.broadcast(LongVector.SPECIES_128, 1);
+        return lv1.lanewise(VectorOperators.ROL, lv1);
+    }
+
+    @Check(test = "pattern3")
+    public static void check_pattern3(Object param) {
+       Verify.checkEQ(GOLD_PATTERN3, param);
+    }
+    @Test
+    @IR(counts = {IRNode.URSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.LSHIFT_VL, IRNode.VECTOR_SIZE_2, "1",
+                  IRNode.OR_VL, IRNode.VECTOR_SIZE_2, "1"},
+                  applyIfCPUFeatureAnd = {"avx2", "true", "avx512f", "false", "avx512vl", "false"})
+    public static Object pattern4() {
+        LongVector lv1 = LongVector.broadcast(LongVector.SPECIES_128, 1);
+        return lv1.lanewise(VectorOperators.ROL, 15L);
+    }
+
+    @Check(test = "pattern4")
+    public static void check_pattern4(Object param) {
+       Verify.checkEQ(GOLD_PATTERN4, param);
+    }
+}

From 44d62c8e21fb09381f9f86a081f70549cc321b1e Mon Sep 17 00:00:00 2001
From: Larry Cable <larry.cable@oracle.com>
Date: Tue, 3 Jun 2025 17:13:22 +0000
Subject: [PATCH 819/901] 8358077:
 sun.tools.attach.VirtualMachineImpl::checkCatchesAndSendQuitTo on Linux leaks
 file handles after JDK-8327114

Reviewed-by: kevinw, sspitsyn, syan
---
 .../classes/sun/tools/attach/VirtualMachineImpl.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 820af57ec37..af8870ecf64 100644
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -35,6 +35,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import java.util.Optional;
+
 import java.util.regex.Pattern;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -358,7 +360,11 @@ private static boolean checkCatchesAndSendQuitTo(int pid, boolean throwIfNotRead
         if (okToSendQuit) {
             sendQuitTo(pid);
         } else if (throwIfNotReady) {
-            final var cmdline = Files.lines(procPid.resolve("cmdline")).findFirst();
+            Optional<String> cmdline = Optional.empty();
+
+            try (final var clf = Files.lines(procPid.resolve("cmdline"))) {
+                cmdline = clf.findFirst();
+            }
 
             var cmd = "null"; // default
 

From c382da579884c28f2765b2c6ba68c0ad4fdcb2ce Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 3 Jun 2025 17:19:31 +0000
Subject: [PATCH 820/901] 8358178: Some nsk/jdi tests should be run with
 includevirtualthreads=y even though they pass without

Reviewed-by: sspitsyn, lmesnik
---
 .../nsk/jdi/EventSet/resume/resume001/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume002/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume003/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume004/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume005/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume006/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume007/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume008/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume009/TestDescription.java     | 3 ++-
 .../nsk/jdi/EventSet/resume/resume010/TestDescription.java     | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java
index 5c86dc74fbc..87d47222fc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume001/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume001
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java
index 5d79a05338e..b2bafcff62d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume002/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume002
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java
index d19aff7885e..7e36d18e21e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume003/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume003
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java
index d0c405c19e8..e435cd78796 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume004/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume004
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java
index eef8e00a5d4..6a41ca7ebff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume005/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume005
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java
index 67536af919a..74a92b22a7c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume006/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume006
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java
index 61239470b7d..fc708b63343 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume007/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume007
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java
index 3a331640279..498fe9ba1da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume008/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume008
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java
index bd8e7cf0977..e030264986e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume009/TestDescription.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
@@ -66,6 +66,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume009
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java
index 15abd8db247..ed2a97533e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventSet/resume/resume010/TestDescription.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
@@ -65,6 +65,7 @@
  * @run driver
  *      nsk.jdi.EventSet.resume.resume010
  *      -verbose
+ *      -includevirtualthreads
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
  *      -debugee.vmkind=java

From 461cb84277b40d01c5d04be3c74f25d8667a207c Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 3 Jun 2025 18:02:47 +0000
Subject: [PATCH 821/901] 8345538: Robot.mouseMove doesn't clamp bounds on
 macOS when trying to move mouse off screen

Reviewed-by: honkar, prr
---
 .../classes/sun/lwawt/macosx/CRobot.java      | 40 ++++++++-
 .../java/awt/Robot/MouseMoveOffScreen.java    | 83 +++++++++++++++++++
 2 files changed, 121 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/Robot/MouseMoveOffScreen.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java
index 5dba06cb612..036da04a7cb 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.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,6 +25,8 @@
 
 package sun.lwawt.macosx;
 
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.peer.RobotPeer;
@@ -63,7 +65,41 @@ public void mouseMove(int x, int y) {
         mouseLastX = x;
         mouseLastY = y;
 
-        mouseEvent(mouseLastX, mouseLastY, mouseButtonsState, true, true);
+        int leastDiff = Integer.MAX_VALUE;
+        int finX = x;
+        int finY = y;
+
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] gs = ge.getScreenDevices();
+        Rectangle[] allScreenBounds = new Rectangle[gs.length];
+
+        for (int i = 0; i < gs.length; i++) {
+            allScreenBounds[i] = gs[i].getDefaultConfiguration().getBounds();
+        }
+
+        for (Rectangle screenBounds : allScreenBounds) {
+            Point cP = calcClosestPoint(x, y, screenBounds);
+
+            int currXDiff = Math.abs(x - cP.x);
+            int currYDiff = Math.abs(y - cP.y);
+            int currDiff = (int) Math.round(Math.hypot(currXDiff, currYDiff));
+
+            if (currDiff == 0) {
+                mouseEvent(mouseLastX, mouseLastY, mouseButtonsState, true, true);
+                return;
+            } if (currDiff < leastDiff) {
+                finX = cP.x;
+                finY = cP.y;
+                leastDiff = currDiff;
+            }
+        }
+
+        mouseEvent(finX, finY, mouseButtonsState, true, true);
+    }
+
+    private Point calcClosestPoint(int x, int y, Rectangle screenBounds) {
+        return new Point(Math.min(Math.max(x, screenBounds.x), screenBounds.x + screenBounds.width - 1),
+                Math.min(Math.max(y, screenBounds.y), screenBounds.y + screenBounds.height - 1));
     }
 
     /**
diff --git a/test/jdk/java/awt/Robot/MouseMoveOffScreen.java b/test/jdk/java/awt/Robot/MouseMoveOffScreen.java
new file mode 100644
index 00000000000..809e3dd1ff1
--- /dev/null
+++ b/test/jdk/java/awt/Robot/MouseMoveOffScreen.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.
+ */
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.MouseInfo;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+
+/*
+ * @test
+ * @bug 8345538
+ * @summary Tests mouseMove clamping to screen bounds when set to move offscreen
+ * @requires (os.family == "mac")
+ * @key headful
+ * @run main MouseMoveOffScreen
+ */
+
+public class MouseMoveOffScreen {
+    private static final Point STARTING_LOC = new Point(200, 200);
+    private static final Point OFF_SCREEN_LOC = new Point(20000, 200);
+    private static Rectangle[] r;
+
+    public static void main(String[] args) throws Exception {
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] gs = ge.getScreenDevices();
+        r = new Rectangle[gs.length];
+
+        for (int i = 0; i < gs.length; i++) {
+            r[i] = gs[i].getDefaultConfiguration().getBounds();
+            System.out.println("Screen: "+ gs[i].getIDstring() + "  Bounds: " + r[i]);
+        }
+
+        Point offsc = validateOffScreen(OFF_SCREEN_LOC);
+        Robot robot = new Robot();
+        robot.mouseMove(STARTING_LOC.x, STARTING_LOC.y);
+        robot.delay(500);
+        robot.mouseMove(offsc.x, offsc.y);
+        robot.delay(500);
+
+        Point currLoc = MouseInfo.getPointerInfo().getLocation();
+
+        if (currLoc == null) {
+            throw new RuntimeException("Test Failed, getLocation returned null.");
+        }
+
+        System.out.println("Current mouse location: " + currLoc);
+        if (currLoc.equals(OFF_SCREEN_LOC)) {
+            throw new RuntimeException("Test Failed, robot moved mouse off screen.");
+        }
+    }
+
+    private static Point validateOffScreen(Point p) {
+        for (Rectangle rect : r) {
+            if (rect.contains(p)) {
+                return validateOffScreen(new Point(p.x * 2, p.y));
+            }
+        }
+        return p;
+    }
+}

From e984fa7997dda922708edf556d1839b866e44e55 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Tue, 3 Jun 2025 18:41:05 +0000
Subject: [PATCH 822/901] 8358539: ProblemList
 jdk/jfr/api/consumer/TestRecordingFileWrite.java

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

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 28bb2a1f033..f44dd5c7a7d 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -774,6 +774,7 @@ 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/TestRecordingFileWrite.java                8358536 generic-all
 
 ############################################################################
 

From 406f1bc5b94408778063b885cdac807fd1501e44 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 3 Jun 2025 18:46:55 +0000
Subject: [PATCH 823/901] 8357650: ThreadSnapshot to take snapshot of thread
 for thread dumps

Co-authored-by: Alan Bateman <alanb@openjdk.org>
Co-authored-by: Alex Menkov <amenkov@openjdk.org>
Reviewed-by: sspitsyn, kevinw
---
 src/hotspot/share/classfile/javaClasses.cpp   |   2 +-
 src/hotspot/share/classfile/vmSymbols.hpp     |   6 +
 src/hotspot/share/include/jvm.h               |   3 +
 src/hotspot/share/prims/jvm.cpp               |   9 +
 src/hotspot/share/prims/jvmtiThreadState.hpp  |   2 +-
 .../share/services/diagnosticCommand.cpp      |   2 +
 src/hotspot/share/services/threadService.cpp  | 436 +++++++++++++++++-
 src/hotspot/share/services/threadService.hpp  |   7 +
 .../jdk/internal/vm/ThreadSnapshot.java       | 217 +++++++++
 .../share/native/libjava/ThreadSnapshot.c     |  36 ++
 10 files changed, 716 insertions(+), 4 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
 create mode 100644 src/java.base/share/native/libjava/ThreadSnapshot.c

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 3b34edf416e..8d32d73fb47 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1872,7 +1872,7 @@ ByteSize java_lang_Thread::thread_id_offset() {
 }
 
 oop java_lang_Thread::park_blocker(oop java_thread) {
-  return java_thread->obj_field(_park_blocker_offset);
+  return java_thread->obj_field_access<MO_RELAXED>(_park_blocker_offset);
 }
 
 oop java_lang_Thread::async_get_stack_trace(oop java_thread, TRAPS) {
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index f9f6bd07254..dc9ce61627b 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -742,6 +742,12 @@ class SerializeClosure;
   template(jdk_internal_vm_ThreadDumper,           "jdk/internal/vm/ThreadDumper")                                \
   template(dumpThreads_name,                       "dumpThreads")                                                 \
   template(dumpThreadsToJson_name,                 "dumpThreadsToJson")                                           \
+  template(jdk_internal_vm_ThreadSnapshot,         "jdk/internal/vm/ThreadSnapshot")                              \
+  template(jdk_internal_vm_ThreadLock,             "jdk/internal/vm/ThreadSnapshot$ThreadLock")                   \
+  template(jdk_internal_vm_ThreadLock_signature,   "Ljdk/internal/vm/ThreadSnapshot$ThreadLock;")                 \
+  template(jdk_internal_vm_ThreadLock_array,       "[Ljdk/internal/vm/ThreadSnapshot$ThreadLock;")                \
+  template(java_lang_StackTraceElement_of_name,    "of")                                                          \
+  template(java_lang_StackTraceElement_of_signature, "([Ljava/lang/StackTraceElement;)[Ljava/lang/StackTraceElement;") \
                                                                                                                   \
   /* jcmd Thread.vthread_scheduler and Thread.vthread_pollers */                                                  \
   template(jdk_internal_vm_JcmdVThreadCommands,    "jdk/internal/vm/JcmdVThreadCommands")                         \
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index 61857ac3ccd..73f60765a70 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -301,6 +301,9 @@ JVM_HoldsLock(JNIEnv *env, jclass threadClass, jobject obj);
 JNIEXPORT jobject JNICALL
 JVM_GetStackTrace(JNIEnv *env, jobject thread);
 
+JNIEXPORT jobject JNICALL
+JVM_CreateThreadSnapshot(JNIEnv* env, jobject thread);
+
 JNIEXPORT jobjectArray JNICALL
 JVM_GetAllThreads(JNIEnv *env, jclass dummy);
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index e50318c90b6..d669d7bf5ec 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -2961,6 +2961,15 @@ JVM_ENTRY(jobject, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
   return JNIHandles::make_local(THREAD, trace);
 JVM_END
 
+JVM_ENTRY(jobject, JVM_CreateThreadSnapshot(JNIEnv* env, jobject jthread))
+#if INCLUDE_JVMTI
+  oop snapshot = ThreadSnapshotFactory::get_thread_snapshot(jthread, THREAD);
+  return JNIHandles::make_local(THREAD, snapshot);
+#else
+  return nullptr;
+#endif
+JVM_END
+
 JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
   // We don't use a ThreadsListHandle here because the current thread
   // must be alive.
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index cb0a779bd5a..62d0c45e337 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp
@@ -77,7 +77,7 @@ class JvmtiEnvThreadStateIterator : public StackObj {
 //
 // Virtual Thread Mount State Transition (VTMS transition) mechanism
 //
-class JvmtiVTMSTransitionDisabler {
+class JvmtiVTMSTransitionDisabler : public AnyObj {
  private:
   static volatile int _VTMS_transition_disable_for_one_count; // transitions for one virtual thread are disabled while it is positive
   static volatile int _VTMS_transition_disable_for_all_count; // transitions for all virtual threads are disabled while it is positive
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 26a762fa109..8b6fa392c95 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -127,7 +127,9 @@ void DCmd::register_dcmds(){
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIDataDumpDCmd>(full_export, true, false));
 #endif // INCLUDE_JVMTI
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(full_export, true, false));
+#if INCLUDE_JVMTI
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpToFileDCmd>(full_export, true, false));
+#endif // INCLUDE_JVMTI
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadSchedulerDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VThreadPollersDCmd>(full_export, true, false));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderStatsDCmd>(full_export, true, false));
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index d320e17fafb..8e0c955bff8 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -34,21 +34,25 @@
 #include "nmt/memTag.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/oopHandle.inline.hpp"
 #include "prims/jvmtiRawMonitor.hpp"
+#include "prims/jvmtiThreadState.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
+#include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
 #include "runtime/objectMonitor.inline.hpp"
-#include "runtime/synchronizer.hpp"
+#include "runtime/synchronizer.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.inline.hpp"
-#include "runtime/vframe.hpp"
+#include "runtime/vframe.inline.hpp"
 #include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
 #include "services/threadService.hpp"
@@ -1115,3 +1119,431 @@ ThreadsListEnumerator::ThreadsListEnumerator(Thread* cur_thread,
     _threads_array->append(h);
   }
 }
+
+
+// jdk.internal.vm.ThreadSnapshot support
+#if INCLUDE_JVMTI
+
+class GetThreadSnapshotClosure: public HandshakeClosure {
+private:
+  static OopStorage* oop_storage() {
+    assert(_thread_service_storage != nullptr, "sanity");
+    return _thread_service_storage;
+  }
+
+public:
+  struct OwnedLock {
+    // should be synced with ordinals of jdk.internal.vm.ThreadSnapshot.OwnedLockType enum
+    enum Type {
+      NOTHING = -1,
+      LOCKED = 0,
+      ELIMINATED = 1,
+    };
+
+    int _frame_depth;
+    Type _type;
+    // synchronization object (when type == LOCKED) or its klass (type == ELIMINATED)
+    OopHandle _obj;
+
+    OwnedLock(int depth, Type type, OopHandle obj): _frame_depth(depth), _type(type), _obj(obj) {}
+    OwnedLock(): _frame_depth(0), _type(NOTHING), _obj(nullptr) {}
+  };
+
+  struct Blocker {
+    // should be synced with ordinals of jdk.internal.vm.ThreadSnapshot.BlockerLockType enum
+    enum Type {
+      NOTHING = -1,
+      PARK_BLOCKER = 0,
+      WAITING_TO_LOCK = 1,
+      WAITING_ON = 2,
+    };
+
+    Type _type;
+    // park blocker or an object the thread waiting on/trying to lock
+    OopHandle _obj;
+
+    Blocker(Type type, OopHandle obj): _type(type), _obj(obj) {}
+    Blocker(): _type(NOTHING), _obj(nullptr) {}
+
+    bool is_empty() const {
+      return _type == NOTHING;
+    }
+  };
+
+  Handle _thread_h;
+  JavaThread* _java_thread;
+  int _frame_count; // length of _methods and _bcis arrays
+  GrowableArray<Method*>* _methods;
+  GrowableArray<int>* _bcis;
+  JavaThreadStatus _thread_status;
+  OopHandle _thread_name;
+  GrowableArray<OwnedLock>* _locks;
+  Blocker _blocker;
+
+  GetThreadSnapshotClosure(Handle thread_h, JavaThread* java_thread):
+    HandshakeClosure("GetThreadSnapshotClosure"),
+    _thread_h(thread_h), _java_thread(java_thread),
+    _frame_count(0), _methods(nullptr), _bcis(nullptr),
+    _thread_status(), _thread_name(nullptr),
+    _locks(nullptr), _blocker() {
+  }
+  virtual ~GetThreadSnapshotClosure() {
+    delete _methods;
+    delete _bcis;
+    _thread_name.release(oop_storage());
+    if (_locks != nullptr) {
+      for (int i = 0; i < _locks->length(); i++) {
+        _locks->at(i)._obj.release(oop_storage());
+      }
+      delete _locks;
+    }
+    _blocker._obj.release(oop_storage());
+  }
+
+private:
+  void detect_locks(javaVFrame* jvf, int depth) {
+    Thread* current = Thread::current();
+
+    if (depth == 0 && _blocker.is_empty()) {
+      // If this is the first frame and it is java.lang.Object.wait(...)
+      // then print out the receiver.
+      if (jvf->method()->name() == vmSymbols::wait_name() &&
+        jvf->method()->method_holder()->name() == vmSymbols::java_lang_Object()) {
+        OopHandle lock_object;
+        StackValueCollection* locs = jvf->locals();
+        if (!locs->is_empty()) {
+          StackValue* sv = locs->at(0);
+          if (sv->type() == T_OBJECT) {
+            Handle o = locs->at(0)->get_obj();
+            lock_object = OopHandle(oop_storage(), o());
+          }
+        }
+        _blocker = Blocker(Blocker::WAITING_ON, lock_object);
+      }
+    }
+
+    GrowableArray<MonitorInfo*>* mons = jvf->monitors();
+    if (!mons->is_empty()) {
+      for (int index = (mons->length() - 1); index >= 0; index--) {
+        MonitorInfo* monitor = mons->at(index);
+        if (monitor->eliminated() && jvf->is_compiled_frame()) { // Eliminated in compiled code
+          if (monitor->owner_is_scalar_replaced()) {
+            Klass* k = java_lang_Class::as_Klass(monitor->owner_klass());
+            _locks->push(OwnedLock(depth, OwnedLock::ELIMINATED, OopHandle(oop_storage(), k->klass_holder())));
+          } else {
+            Handle owner(current, monitor->owner());
+            if (owner.not_null()) {
+              Klass* k = owner->klass();
+              _locks->push(OwnedLock(depth, OwnedLock::ELIMINATED, OopHandle(oop_storage(), k->klass_holder())));
+            }
+          }
+          continue;
+        }
+        if (monitor->owner() != nullptr) {
+          // the monitor is associated with an object, i.e., it is locked
+
+          if (depth == 0 && _blocker.is_empty()) {
+            ObjectMonitor* pending_moninor = java_lang_VirtualThread::is_instance(_thread_h())
+              ? java_lang_VirtualThread::current_pending_monitor(_thread_h())
+              : jvf->thread()->current_pending_monitor();
+
+            markWord mark = monitor->owner()->mark();
+            // The first stage of async deflation does not affect any field
+            // used by this comparison so the ObjectMonitor* is usable here.
+            if (mark.has_monitor()) {
+              ObjectMonitor* mon = ObjectSynchronizer::read_monitor(current, monitor->owner(), mark);
+              if (// if the monitor is null we must be in the process of locking
+                  mon == nullptr ||
+                  // we have marked ourself as pending on this monitor
+                  mon == pending_moninor ||
+                  // we are not the owner of this monitor
+                  (_java_thread != nullptr && !mon->is_entered(_java_thread))) {
+                _blocker = Blocker(Blocker::WAITING_TO_LOCK, OopHandle(oop_storage(), monitor->owner()));
+                continue; // go to next monitor
+              }
+            }
+          }
+          _locks->push(OwnedLock(depth, OwnedLock::LOCKED, OopHandle(oop_storage(), monitor->owner())));
+        }
+      }
+    }
+  }
+
+public:
+  void do_thread(Thread* th) override {
+    Thread* current = Thread::current();
+
+    bool is_virtual = java_lang_VirtualThread::is_instance(_thread_h());
+    if (_java_thread != nullptr) {
+      if (is_virtual) {
+        // mounted vthread, use carrier thread state
+        oop carrier_thread = java_lang_VirtualThread::carrier_thread(_thread_h());
+        _thread_status = java_lang_Thread::get_thread_status(carrier_thread);
+      } else {
+        _thread_status = java_lang_Thread::get_thread_status(_thread_h());
+      }
+    } else {
+      // unmounted vthread
+      int vt_state = java_lang_VirtualThread::state(_thread_h());
+      _thread_status = java_lang_VirtualThread::map_state_to_thread_status(vt_state);
+    }
+    _thread_name = OopHandle(oop_storage(), java_lang_Thread::name(_thread_h()));
+
+    if (_java_thread != nullptr && !_java_thread->has_last_Java_frame()) {
+      // stack trace is empty
+      return;
+    }
+
+    bool vthread_carrier = !is_virtual && (_java_thread != nullptr) && (_java_thread->vthread_continuation() != nullptr);
+
+    oop park_blocker = java_lang_Thread::park_blocker(_thread_h());
+    if (park_blocker != nullptr) {
+      _blocker = Blocker(Blocker::PARK_BLOCKER, OopHandle(oop_storage(), park_blocker));
+    }
+
+    ResourceMark rm(current);
+    HandleMark hm(current);
+
+    const int max_depth = MaxJavaStackTraceDepth;
+    const bool skip_hidden = !ShowHiddenFrames;
+
+    // Pick minimum length that will cover most cases
+    int init_length = 64;
+    _methods = new (mtInternal) GrowableArray<Method*>(init_length, mtInternal);
+    _bcis = new (mtInternal) GrowableArray<int>(init_length, mtInternal);
+    _locks = new (mtInternal) GrowableArray<OwnedLock>(init_length, mtInternal);
+    int total_count = 0;
+
+    vframeStream vfst(_java_thread != nullptr
+      ? vframeStream(_java_thread, false, true, vthread_carrier)
+      : vframeStream(java_lang_VirtualThread::continuation(_thread_h())));
+
+    for (;
+      !vfst.at_end() && (max_depth == 0 || max_depth != total_count);
+      vfst.next()) {
+
+      detect_locks(vfst.asJavaVFrame(), total_count);
+
+      if (skip_hidden && (vfst.method()->is_hidden() ||
+        vfst.method()->is_continuation_enter_intrinsic())) {
+        continue;
+      }
+      _methods->push(vfst.method());
+      _bcis->push(vfst.bci());
+      total_count++;
+    }
+
+    _frame_count = total_count;
+  }
+};
+
+class jdk_internal_vm_ThreadLock: AllStatic {
+  static bool _inited;
+  static int _depth_offset;
+  static int _typeOrdinal_offset;
+  static int _obj_offset;
+
+  static void compute_offsets(InstanceKlass* klass, TRAPS) {
+    JavaClasses::compute_offset(_depth_offset, klass, "depth", vmSymbols::int_signature(), false);
+    JavaClasses::compute_offset(_typeOrdinal_offset, klass, "typeOrdinal", vmSymbols::int_signature(), false);
+    JavaClasses::compute_offset(_obj_offset, klass, "obj", vmSymbols::object_signature(), false);
+  }
+public:
+  static void init(InstanceKlass* klass, TRAPS) {
+    if (!_inited) {
+      compute_offsets(klass, CHECK);
+      _inited = true;
+    }
+  }
+
+  static Handle create(InstanceKlass* klass, int depth, int type_ordinal, OopHandle obj, TRAPS) {
+    init(klass, CHECK_NH);
+    Handle result = klass->allocate_instance_handle(CHECK_NH);
+    result->int_field_put(_depth_offset, depth);
+    result->int_field_put(_typeOrdinal_offset, type_ordinal);
+    result->obj_field_put(_obj_offset, obj.resolve());
+    return result;
+  }
+};
+
+bool jdk_internal_vm_ThreadLock::_inited = false;
+int jdk_internal_vm_ThreadLock::_depth_offset;
+int jdk_internal_vm_ThreadLock::_typeOrdinal_offset;
+int jdk_internal_vm_ThreadLock::_obj_offset;
+
+class jdk_internal_vm_ThreadSnapshot: AllStatic {
+  static bool _inited;
+  static int _name_offset;
+  static int _threadStatus_offset;
+  static int _carrierThread_offset;
+  static int _stackTrace_offset;
+  static int _locks_offset;
+  static int _blockerTypeOrdinal_offset;
+  static int _blockerObject_offset;
+
+  static void compute_offsets(InstanceKlass* klass, TRAPS) {
+    JavaClasses::compute_offset(_name_offset, klass, "name", vmSymbols::string_signature(), false);
+    JavaClasses::compute_offset(_threadStatus_offset, klass, "threadStatus", vmSymbols::int_signature(), false);
+    JavaClasses::compute_offset(_carrierThread_offset, klass, "carrierThread", vmSymbols::thread_signature(), false);
+    JavaClasses::compute_offset(_stackTrace_offset, klass, "stackTrace", vmSymbols::java_lang_StackTraceElement_array(), false);
+    JavaClasses::compute_offset(_locks_offset, klass, "locks", vmSymbols::jdk_internal_vm_ThreadLock_array(), false);
+    JavaClasses::compute_offset(_blockerTypeOrdinal_offset, klass, "blockerTypeOrdinal", vmSymbols::int_signature(), false);
+    JavaClasses::compute_offset(_blockerObject_offset, klass, "blockerObject", vmSymbols::object_signature(), false);
+  }
+public:
+  static void init(InstanceKlass* klass, TRAPS) {
+    if (!_inited) {
+      compute_offsets(klass, CHECK);
+      _inited = true;
+    }
+  }
+
+  static Handle allocate(InstanceKlass* klass, TRAPS) {
+    init(klass, CHECK_NH);
+    Handle h_k = klass->allocate_instance_handle(CHECK_NH);
+    return h_k;
+  }
+
+  static void set_name(oop snapshot, oop name) {
+    snapshot->obj_field_put(_name_offset, name);
+  }
+  static void set_thread_status(oop snapshot, int status) {
+    snapshot->int_field_put(_threadStatus_offset, status);
+  }
+  static void set_carrier_thread(oop snapshot, oop carrier_thread) {
+    snapshot->obj_field_put(_carrierThread_offset, carrier_thread);
+  }
+  static void set_stack_trace(oop snapshot, oop trace) {
+    snapshot->obj_field_put(_stackTrace_offset, trace);
+  }
+  static void set_locks(oop snapshot, oop locks) {
+    snapshot->obj_field_put(_locks_offset, locks);
+  }
+  static void set_blocker(oop snapshot, int type_ordinal, oop lock) {
+    snapshot->int_field_put(_blockerTypeOrdinal_offset, type_ordinal);
+    snapshot->obj_field_put(_blockerObject_offset, lock);
+  }
+};
+
+bool jdk_internal_vm_ThreadSnapshot::_inited = false;
+int jdk_internal_vm_ThreadSnapshot::_name_offset;
+int jdk_internal_vm_ThreadSnapshot::_threadStatus_offset;
+int jdk_internal_vm_ThreadSnapshot::_carrierThread_offset;
+int jdk_internal_vm_ThreadSnapshot::_stackTrace_offset;
+int jdk_internal_vm_ThreadSnapshot::_locks_offset;
+int jdk_internal_vm_ThreadSnapshot::_blockerTypeOrdinal_offset;
+int jdk_internal_vm_ThreadSnapshot::_blockerObject_offset;
+
+oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
+  ThreadsListHandle tlh(THREAD);
+
+  ResourceMark rm(THREAD);
+  HandleMark   hm(THREAD);
+  Handle thread_h(THREAD, JNIHandles::resolve(jthread));
+
+  // wrapper to auto delete JvmtiVTMSTransitionDisabler
+  class TransitionDisabler {
+    JvmtiVTMSTransitionDisabler* _transition_disabler;
+  public:
+    TransitionDisabler(): _transition_disabler(nullptr) {}
+    ~TransitionDisabler() {
+      reset();
+    }
+    void init(jobject jthread) {
+      _transition_disabler = new (mtInternal) JvmtiVTMSTransitionDisabler(jthread);
+    }
+    void reset() {
+      if (_transition_disabler != nullptr) {
+        delete _transition_disabler;
+        _transition_disabler = nullptr;
+      }
+    }
+  } transition_disabler;
+
+  JavaThread* java_thread = nullptr;
+  bool is_virtual = java_lang_VirtualThread::is_instance(thread_h());
+  Handle carrier_thread;
+  if (is_virtual) {
+    // 1st need to disable mount/unmount transitions
+    transition_disabler.init(jthread);
+
+    carrier_thread = Handle(THREAD, java_lang_VirtualThread::carrier_thread(thread_h()));
+    if (carrier_thread != nullptr) {
+      java_thread = java_lang_Thread::thread(carrier_thread());
+    }
+  } else {
+    java_thread = java_lang_Thread::thread(thread_h());
+  }
+
+  // Handshake with target
+  GetThreadSnapshotClosure cl(thread_h, java_thread);
+  if (java_thread == nullptr) {
+    // unmounted vthread, execute on the current thread
+    cl.do_thread(nullptr);
+  } else {
+    Handshake::execute(&cl, &tlh, java_thread);
+  }
+
+  // all info is collected, can enable transitions.
+  transition_disabler.reset();
+
+  // StackTrace
+  InstanceKlass* ste_klass = vmClasses::StackTraceElement_klass();
+  assert(ste_klass != nullptr, "must be loaded");
+
+  objArrayHandle trace = oopFactory::new_objArray_handle(ste_klass, cl._frame_count, CHECK_NULL);
+
+  for (int i = 0; i < cl._frame_count; i++) {
+    methodHandle method(THREAD, cl._methods->at(i));
+    oop element = java_lang_StackTraceElement::create(method, cl._bcis->at(i), CHECK_NULL);
+    trace->obj_at_put(i, element);
+  }
+
+  // Locks
+  Symbol* lock_sym = vmSymbols::jdk_internal_vm_ThreadLock();
+  Klass* lock_k = SystemDictionary::resolve_or_fail(lock_sym, true, CHECK_NULL);
+  InstanceKlass* lock_klass = InstanceKlass::cast(lock_k);
+
+  objArrayHandle locks;
+  if (cl._locks != nullptr && cl._locks->length() > 0) {
+    locks = oopFactory::new_objArray_handle(lock_klass, cl._locks->length(), CHECK_NULL);
+    for (int n = 0; n < cl._locks->length(); n++) {
+      GetThreadSnapshotClosure::OwnedLock* lock_info = cl._locks->adr_at(n);
+
+      Handle lock = jdk_internal_vm_ThreadLock::create(lock_klass,
+        lock_info->_frame_depth, lock_info->_type, lock_info->_obj, CHECK_NULL);
+      locks->obj_at_put(n, lock());
+    }
+  }
+
+  // call static StackTraceElement[] StackTraceElement.of(StackTraceElement[] stackTrace)
+  // to properly initialize STEs.
+  JavaValue result(T_OBJECT);
+  JavaCalls::call_static(&result,
+    ste_klass,
+    vmSymbols::java_lang_StackTraceElement_of_name(),
+    vmSymbols::java_lang_StackTraceElement_of_signature(),
+    trace,
+    CHECK_NULL);
+  // the method return the same trace array
+
+  Symbol* snapshot_klass_name = vmSymbols::jdk_internal_vm_ThreadSnapshot();
+  Klass* snapshot_klass = SystemDictionary::resolve_or_fail(snapshot_klass_name, true, CHECK_NULL);
+  if (snapshot_klass->should_be_initialized()) {
+    snapshot_klass->initialize(CHECK_NULL);
+  }
+
+  Handle snapshot = jdk_internal_vm_ThreadSnapshot::allocate(InstanceKlass::cast(snapshot_klass), CHECK_NULL);
+  jdk_internal_vm_ThreadSnapshot::set_name(snapshot(), cl._thread_name.resolve());
+  jdk_internal_vm_ThreadSnapshot::set_thread_status(snapshot(), (int)cl._thread_status);
+  jdk_internal_vm_ThreadSnapshot::set_carrier_thread(snapshot(), carrier_thread());
+  jdk_internal_vm_ThreadSnapshot::set_stack_trace(snapshot(), trace());
+  jdk_internal_vm_ThreadSnapshot::set_locks(snapshot(), locks());
+  if (!cl._blocker.is_empty()) {
+    jdk_internal_vm_ThreadSnapshot::set_blocker(snapshot(), cl._blocker._type, cl._blocker._obj.resolve());
+  }
+  return snapshot();
+}
+
+#endif // INCLUDE_JVMTI
+
diff --git a/src/hotspot/share/services/threadService.hpp b/src/hotspot/share/services/threadService.hpp
index 17d8ba9b3cc..b1de4bc8703 100644
--- a/src/hotspot/share/services/threadService.hpp
+++ b/src/hotspot/share/services/threadService.hpp
@@ -631,4 +631,11 @@ class JavaThreadSleepState : public JavaThreadStatusChanger {
   }
 };
 
+
+// jdk.internal.vm.ThreadSnapshot support
+class ThreadSnapshotFactory: AllStatic {
+public:
+  JVMTI_ONLY(static oop get_thread_snapshot(jobject jthread, TRAPS);)
+};
+
 #endif // SHARE_SERVICES_THREADSERVICE_HPP
diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
new file mode 100644
index 00000000000..205bfde5449
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
@@ -0,0 +1,217 @@
+/*
+ * 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.internal.vm;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+/**
+ * Represents a snapshot of information about a Thread.
+ */
+class ThreadSnapshot {
+    private static final StackTraceElement[] EMPTY_STACK = new StackTraceElement[0];
+    private static final ThreadLock[] EMPTY_LOCKS = new ThreadLock[0];
+
+    // filled by VM
+    private String name;
+    private int threadStatus;
+    private Thread carrierThread;
+    private StackTraceElement[] stackTrace;
+    // owned monitors
+    private ThreadLock[] locks;
+    // an object the thread is blocked/waiting on, converted to ThreadBlocker by ThreadSnapshot.of()
+    private int blockerTypeOrdinal;
+    private Object blockerObject;
+
+    // set by ThreadSnapshot.of()
+    private ThreadBlocker blocker;
+
+    private ThreadSnapshot() {}
+
+    /**
+     * Take a snapshot of a Thread to get all information about the thread.
+     */
+    static ThreadSnapshot of(Thread thread) {
+        ThreadSnapshot snapshot = create(thread);
+        if (snapshot.stackTrace == null) {
+            snapshot.stackTrace = EMPTY_STACK;
+        }
+        if (snapshot.locks != null) {
+            Arrays.stream(snapshot.locks).forEach(ThreadLock::finishInit);
+        } else {
+            snapshot.locks = EMPTY_LOCKS;
+        }
+        if (snapshot.blockerObject != null) {
+            snapshot.blocker = new ThreadBlocker(snapshot.blockerTypeOrdinal, snapshot.blockerObject);
+            snapshot.blockerObject = null; // release
+        }
+        return snapshot;
+    }
+
+    /**
+     * Returns the thread name.
+     */
+    String threadName() {
+        return name;
+    }
+
+    /**
+     * Returns the thread state.
+     */
+    Thread.State threadState() {
+        return jdk.internal.misc.VM.toThreadState(threadStatus);
+    }
+
+    /**
+     * Returns the thread stack trace.
+     */
+    StackTraceElement[] stackTrace() {
+        return stackTrace;
+    }
+
+    /**
+     * Returns the thread's parkBlocker.
+     */
+    Object parkBlocker() {
+        return getBlocker(BlockerLockType.PARK_BLOCKER);
+    }
+
+    /**
+     * Returns the object that the thread is blocked on.
+     * @throws IllegalStateException if not in the blocked state
+     */
+    Object blockedOn() {
+        if (threadState() != Thread.State.BLOCKED) {
+            throw new IllegalStateException();
+        }
+        return getBlocker(BlockerLockType.WAITING_TO_LOCK);
+    }
+
+    /**
+     * Returns the object that the thread is waiting on.
+     * @throws IllegalStateException if not in the waiting state
+     */
+    Object waitingOn() {
+        if (threadState() != Thread.State.WAITING
+                && threadState() != Thread.State.TIMED_WAITING) {
+            throw new IllegalStateException();
+        }
+        return getBlocker(BlockerLockType.WAITING_ON);
+    }
+
+    private Object getBlocker(BlockerLockType type) {
+        return (blocker != null && blocker.type == type) ? blocker.obj : null;
+    }
+
+    /**
+     * Returns true if the thread owns any object monitors.
+     */
+    boolean ownsMonitors() {
+        return locks.length > 0;
+    }
+
+    /**
+     * Returns the objects that the thread locked at the given depth. The stream
+     * will contain a null element for a monitor that has been eliminated.
+     */
+    Stream<Object> ownedMonitorsAt(int depth) {
+        return Arrays.stream(locks)
+                .filter(lock -> lock.depth() == depth)
+                .map(lock -> (lock.type == OwnedLockType.LOCKED)
+                        ? lock.lockObject()
+                        : /*eliminated*/ null);
+    }
+
+    /**
+     * If the thread is a mounted virtual thread then return its carrier.
+     */
+    Thread carrierThread() {
+        return carrierThread;
+    }
+
+    /**
+     * Represents information about a locking operation.
+     */
+    private enum OwnedLockType {
+        LOCKED,
+        // Lock object is a class of the eliminated monitor
+        ELIMINATED,
+    }
+
+    private enum BlockerLockType {
+        // Park blocker
+        PARK_BLOCKER,
+        WAITING_TO_LOCK,
+        // Object.wait()
+        WAITING_ON,
+    }
+
+    /**
+     * Represents a locking operation of a thread at a specific stack depth.
+     */
+    private class ThreadLock {
+        private static final OwnedLockType[] lockTypeValues = OwnedLockType.values(); // cache
+
+        // set by the VM
+        private int depth;
+        private int typeOrdinal;
+        private Object obj;
+
+        // set by ThreadLock.of()
+        private OwnedLockType type;
+
+        private ThreadLock() {}
+
+        void finishInit() {
+            type = lockTypeValues[typeOrdinal];
+        }
+
+        int depth() {
+            return depth;
+        }
+
+        OwnedLockType type() {
+            return type;
+        }
+
+        Object lockObject() {
+            if (type == OwnedLockType.ELIMINATED) {
+                // we have no lock object, lock contains lock class
+                return null;
+            }
+            return obj;
+        }
+    }
+
+    private record ThreadBlocker(BlockerLockType type, Object obj) {
+        private static final BlockerLockType[] lockTypeValues = BlockerLockType.values(); // cache
+
+        ThreadBlocker(int typeOrdinal, Object obj) {
+            this(lockTypeValues[typeOrdinal], obj);
+        }
+    }
+
+    private static native ThreadSnapshot create(Thread thread);
+}
diff --git a/src/java.base/share/native/libjava/ThreadSnapshot.c b/src/java.base/share/native/libjava/ThreadSnapshot.c
new file mode 100644
index 00000000000..feea629f4c7
--- /dev/null
+++ b/src/java.base/share/native/libjava/ThreadSnapshot.c
@@ -0,0 +1,36 @@
+/*
+ * 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 "jni.h"
+#include "jvm.h"
+
+#include "jdk_internal_vm_ThreadSnapshot.h"
+
+
+JNIEXPORT jobject JNICALL
+Java_jdk_internal_vm_ThreadSnapshot_create(JNIEnv *env, jclass cls, jobject thread)
+{
+  return JVM_CreateThreadSnapshot(env, thread);
+}

From cc11b7d1f560d42d1de123e650470362f1f2aabb Mon Sep 17 00:00:00 2001
From: Stefan Lobbenmeier <stefan.lobbenmeier@gmail.com>
Date: Tue, 3 Jun 2025 19:22:52 +0000
Subject: [PATCH 824/901] 8356128: Correct documentation for
 --linux-package-deps

Reviewed-by: asemenyuk, almatvee
---
 .../jdk/jpackage/internal/resources/HelpResources.properties    | 2 +-
 .../jdk/jpackage/internal/resources/HelpResources_de.properties | 2 +-
 .../jdk/jpackage/internal/resources/HelpResources_ja.properties | 2 +-
 .../jpackage/internal/resources/HelpResources_zh_CN.properties  | 2 +-
 src/jdk.jpackage/share/man/jpackage.md                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
index c21daab30d0..0f0d9fd5a17 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
@@ -295,7 +295,7 @@ MSG_Help_linux_install=\
 \          Maintainer for .deb package\n\
 \  --linux-menu-group <menu-group-name>\n\
 \          Menu group this application is placed in\n\
-\  --linux-package-deps\n\
+\  --linux-package-deps <package-dep-string>\n\
 \          Required packages or capabilities for the application\n\
 \  --linux-rpm-license-type <type string>\n\
 \          Type of the license ("License: <value>" of the RPM .spec)\n\
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
index 31d6e11d70c..3c66e8bb151 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_de.properties
@@ -33,7 +33,7 @@ MSG_Help_win_install=\  --win-dir-chooser\n          Fügt ein Dialogfeld hinzu,
 MSG_Help_win_install_dir=Relativer Unterpfad unter dem Standardinstallationsverzeichnis\n
 MSG_Help_mac_install=\  --mac-dmg-content <Pfad zu zusätzlichem Inhalt>[,<Pfad zu zusätzlichem Inhalt>...]\n          Nimmt den gesamten referenzierten Inhalt in die DMG-Datei auf.\n          Diese Option kann mehrmals verwendet werden. \n
 MSG_Help_mac_launcher=\  --mac-package-identifier <ID-Zeichenfolge>\n          Eine ID, die die Anwendung für macOS eindeutig identifiziert\n          Standardwert ist der Hauptklassenname.\n          Es dürfen nur alphanumerische Zeichen (A-Z, a-z, 0-9), Bindestriche (-)\n          und Punkte (.) verwendet werden.\n  --mac-package-name <Namenszeichenfolge>\n          Name der Anwendung, wie in der Menüleiste angezeigt\n          Dieser kann vom Anwendungsnamen abweichen.\n          Er darf maximal 15 Zeichen enthalten und muss für die Anzeige\n          in der Menüleiste und im Infofenster der Anwendung geeignet sein.\n          Standardwert: Anwendungsname.\n  --mac-package-signing-prefix <Präfixzeichenfolge>\n          Beim Signieren des Anwendungspackages wird dieser Wert\n          allen zu signierenden Komponenten ohne vorhandene\n          Package-ID als Präfix vorangestellt.\n  --mac-sign\n          Anforderung zum Signieren des Packages oder des vordefinierten\nAnwendungsimages\n  --mac-signing-keychain <Schlüsselbundname>\n          Name des Schlüsselbundes für die Suche nach der Signaturidentität\n          Bei fehlender Angabe werden die Standardschlüsselbunde verwendet.\n  --mac-signing-key-user-name <Teamname>\n          Team- oder Benutzernamensteil der Apple-Signaturidentitäten. Um direkt zu steuern,\n          welche Signaturidentität zum Signieren eines Anwendungsimages oder\n          Installationsprogramms verwendet wird, verwenden Sie --mac-app-image-sign-identity und/oder\n          --mac-installer-sign-identity. Diese Option kann nicht mit\n          --mac-app-image-sign-identity oder --mac-installer-sign-identity kombiniert werden.\n  --mac-app-image-sign-identity <identity>\n          Zum Signieren des Anwendungsimages verwendete Identität. Dieser Wert wird\n          direkt an die Option --sign des Tools "codesign" übergeben. Diese Option kann nicht\n          mit --mac-signing-key-user-name kombiniert werden.\n  --mac-installer-sign-identity <identity>\n          Zum Signieren des Installationsprogramms "pkg" verwendete Identität. Dieser Wert wird\n          direkt an die Option --sign des Tools "productbuild" übergeben. Diese Option\n          kann nicht mit --mac-signing-key-user-name kombiniert werden.\n  --mac-app-store\n          Gibt an, dass die jpackage-Ausgabe für den\n          Mac App Store bestimmt ist.\n  --mac-entitlements <Dateipfad>\n          Pfad zu einer Datei mit Berechtigungen, die beim Signieren\n          von ausführbaren Dateien und Librarys im Bundle verwendet werden sollen.\n  --mac-app-category <Kategoriezeichenfolge>\n          Zeichenfolge für das Erstellen von LSApplicationCategoryType in\n          Anwendungs-plist. Standardwert: "utilities".\n
-MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name für das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer für .deb-Package\n  --linux-menu-group <Menügruppenname>\n          Menügruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps\n          Erforderliche Packages oder Funktionen für die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verknüpfung für die Anwendung.\n
+MSG_Help_linux_install=\  --linux-package-name <Packagename>\n          Name für das Linux-Package, Standardwert: Anwendungsname\n  --linux-deb-maintainer <E-Mail-Adresse>\n          Maintainer für .deb-Package\n  --linux-menu-group <Menügruppenname>\n          Menügruppe, in der diese Anwendung abgelegt wird\n  --linux-package-deps <package-dep-string>\n          Erforderliche Packages oder Funktionen für die Anwendung\n  --linux-rpm-license-type <Typzeichenfolge>\n          Typ der Lizenz ("License: <Wert>" der RPM-SPEC-Datei)\n  --linux-app-release <Releasewert>\n          Releasewert der RPM-SPEC-Datei <Name> oder \n          Debian-Revisionswert der DEB-Kontrolldatei\n  --linux-app-category <Kategoriewert>\n          Gruppenwert der RPM-SPEC-Datei <Name> oder \n          Abschnittswert der DEB-Kontrolldatei\n  --linux-shortcut\n          Erstellt eine Verknüpfung für die Anwendung.\n
 MSG_Help_mac_linux_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung\n
 MSG_Help_default_install_dir=Absoluter Pfad des Installationsverzeichnisses der Anwendung auf OS X\n          oder Linux. Relativer Unterpfad des Installationsverzeichnisses der\n          Anwendung wie "Programme" oder "AppData" unter Windows.\n
 MSG_Help_no_args=Verwendung: jpackage <Optionen>\nVerwenden Sie jpackage --help (oder -h), um eine Liste möglicher Optionen aufzurufen
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
index 39483b8f116..cae6ae216d3 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
@@ -36,7 +36,7 @@ MSG_Help_win_install_dir=デフォルトのインストール場所の下の相
 MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          dmgに参照されたコンテンツをすべて含めます。\n          このオプションは複数回使用できます。 \n
 MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          macOSのアプリケーションを一意に識別するID\n          メイン・クラス名にデフォルト設定されています。\n          英数字(A-Z、a-z、0-9)、ハイフン(-)およびピリオド(.)文字のみ\n          使用できます。\n  --mac-package-name <name string>\n          メニュー・バーに表示されるアプリケーションの名前\n          アプリケーション名とは異なります。\n          この名前は16文字未満にする必要があり、メニュー・バーおよびアプリケーション情報ウィンドウに\n          表示するのに適している必要があります。\n          アプリケーション名にデフォルト設定されています。\n  --mac-package-signing-prefix <prefix string>\n          アプリケーション・パッケージに署名する際、\n          既存のパッケージIDのない署名が必要なすべてのコンポーネントに、\n          この値が接頭辞として付けられます。\n  --mac-sign\n          パッケージまたは事前定義済アプリケーション・イメージに署名するよう\n          リクエストします。\n  --mac-signing-keychain <keychain name>\n          署名アイデンティティを検索するキーチェーンの名前\n          指定しなかった場合、標準のキーチェーンが使用されます。\n  --mac-signing-key-user-name <team name>\n          Apple署名アイデンティティのチームまたはユーザー名部分。\n          アプリケーション・イメージまたはインストーラの署名に使用する署名アイデンティティの\n          直接制御には、--mac-app-image-sign-identityまたは\n          --mac-installer-sign-identity(あるいは両方)を使用します。このオプションは\n          --mac-app-image-sign-identityまたは--mac-installer-sign-identityと組み合せることはできません。\n  --mac-app-image-sign-identity <identity>\n          アプリケーション・イメージの署名に使用するアイデンティティ。この値は直接\n          "codesign"ツールの--signオプションに渡されます。このオプションは\n          \
 --mac-signing-key-user-nameと組み合せることはできません。\n  --mac-installer-sign-identity <identity>\n          "pkg"インストーラの署名に使用するアイデンティティ。この値は直接\n          "productbuild"ツールの--signオプションに渡されます。このオプションは\n          --mac-signing-key-user-nameと組み合せることはできません。\n  --mac-app-store\n          jpackage出力がMac App Store用であること\n          を示します。\n  --mac-entitlements <file path>\n          バンドルの実行可能ファイルおよびライブラリの署名時に\n          使用する権限を含むファイルのパス。\n  --mac-app-category <category string>\n          アプリケーションのplistのLSApplicationCategoryTypeを生成する際に使用する文字列。\n          デフォルト値は"utilities"です。\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linuxパッケージの名前。アプリケーション名にデフォルト設定されています\n  --linux-deb-maintainer <email address>\n          .debパッケージのMaintainer\n  --linux-menu-group <menu-group-name>\n          このアプリケーションが配置されているメニュー・グループ\n  --linux-package-deps\n          アプリケーションに必要なパッケージまたは機能\n  --linux-rpm-license-type <type string>\n          ライセンスのタイプ(RPM .specの"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.specファイルのリリース値または\n          DEBコントロール・ファイルのDebianリビジョン値。\n  --linux-app-category <category value>\n          RPM <name>.specファイルのグループ値または \n           DEBコントロール・ファイルのセクション値\n  --linux-shortcut\n          アプリケーションのショートカットを作成します。\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linuxパッケージの名前。アプリケーション名にデフォルト設定されています\n  --linux-deb-maintainer <email address>\n          .debパッケージのMaintainer\n  --linux-menu-group <menu-group-name>\n          このアプリケーションが配置されているメニュー・グループ\n  --linux-package-deps <package-dep-string>\n          アプリケーションに必要なパッケージまたは機能\n  --linux-rpm-license-type <type string>\n          ライセンスのタイプ(RPM .specの"License: <value>")\n  --linux-app-release <release value>\n          RPM <name>.specファイルのリリース値または\n          DEBコントロール・ファイルのDebianリビジョン値。\n  --linux-app-category <category value>\n          RPM <name>.specファイルのグループ値または \n           DEBコントロール・ファイルのセクション値\n  --linux-shortcut\n          アプリケーションのショートカットを作成します。\n
 MSG_Help_mac_linux_install_dir=アプリケーションのインストール・ディレクトリの絶対パス\n
 MSG_Help_default_install_dir=OS XまたはLinux上のアプリケーションのインストール・ディレクトリの絶対パス。\n          "プログラム・ファイル"や"AppData"など、Windows上のアプリケーションの\n          インストール場所の相対サブパス。\n
 MSG_Help_no_args=使用方法: jpackage <options>\n利用可能なオプションのリストについては、jpackage --help (or -h)を使用します
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
index 482381dd624..6adf62ef1f8 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
@@ -34,7 +34,7 @@ MSG_Help_win_install=\  --win-dir-chooser\n          添加一个对话框以允
 MSG_Help_win_install_dir=默认安装位置下面的相对子路径\n
 MSG_Help_mac_install=\  --mac-dmg-content <additional content path>[,<additional content path>...]\n          包括 DMG 中引用的所有内容。\n          此选项可以使用多次。\n
 MSG_Help_mac_launcher=\  --mac-package-identifier <ID string>\n          用来唯一地标识 macOS 应用程序的标识符\n          默认为主类名称。\n          只能使用字母数字 (A-Z,a-z,0-9)、连字符 (-) 和\n          句点 (.) 字符。\n  --mac-package-name <name string>\n          出现在菜单栏中的应用程序名称\n          这可以与应用程序名称不同。\n          此名称的长度必须小于 16 个字符，适合\n          显示在菜单栏中和应用程序“信息”窗口中。\n          默认为应用程序名称。\n  --mac-package-signing-prefix <prefix string>\n          在对应用程序包签名时，会在所有需要签名\n          但当前没有程序包标识符的组件的\n          前面加上此值。\n  --mac-sign\n          请求对程序包或预定义的应用程序映像\n          进行签名。\n  --mac-signing-keychain <keychain name>\n          要用来搜索签名身份的密钥链的名称\n          如果未指定，则使用标准的密钥链。\n  --mac-signing-key-user-name <team name>\n          Apple 签名身份的团队或用户名称部分。为了直接\n          控制用于对应用程序映像或安装程序进行签名的\n          签名身份，请使用 --mac-app-image-sign-identity 和/或\n          --mac-installer-sign-identity。此选项不能与\n          --mac-app-image-sign-identity 或 --mac-installer-sign-identity 结合使用。\n  --mac-app-image-sign-identity <identity>\n          用于对应用程序映像进行签名的身份。此值将直接\n          传递至 "codesign" 工具的 --sign 选项。此选项不能\n          与 --mac-signing-key-user-name 结合使用。\n  --mac-installer-sign-identity <identity>\n          用于对 "pkg" 安装程序进行签名的身份。此值将直接\n          传递至 "productbuild" 工具的 --sign 选项。此选项不能\n          与 --mac-signing-key-user-name 结合使用。\n  --mac-app-store\n          指示 jpackage 输出面向\n          Mac App Store。\n  --mac-entitlements <file path>\n          包含一些权利的文件的路径，在对捆绑包中的可执行文件\n          和库进行签名时会使用这些权利。\n  --mac-app-category <category string>\n          用于构造应用程序 plist 中 LSApplicationCategoryType 的\n          字符串。默认值为 "utilities"。\n
-MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux 程序包的名称，默认为应用程序名称\n  --linux-deb-maintainer <email address>\n          .deb 程序包的维护程序\n  --linux-menu-group <menu-group-name>\n          此应用程序所在的菜单组\n  --linux-package-deps\n          应用程序所需的程序包或功能\n  --linux-rpm-license-type <type string>\n          许可证的类型（RPM .spec 的 "License: <value>"）\n  --linux-app-release <release value>\n          RPM <name>.spec 文件的发行版值或 \n          DEB 控制文件的 Debian 修订版值\n  --linux-app-category <category value>\n          RPM <name>.spec 文件的组值或 \n          DEB 控制文件的节值\n  --linux-shortcut\n          为应用程序创建快捷方式。\n
+MSG_Help_linux_install=\  --linux-package-name <package name>\n          Linux 程序包的名称，默认为应用程序名称\n  --linux-deb-maintainer <email address>\n          .deb 程序包的维护程序\n  --linux-menu-group <menu-group-name>\n          此应用程序所在的菜单组\n  --linux-package-deps <package-dep-string>\n          应用程序所需的程序包或功能\n  --linux-rpm-license-type <type string>\n          许可证的类型（RPM .spec 的 "License: <value>"）\n  --linux-app-release <release value>\n          RPM <name>.spec 文件的发行版值或 \n          DEB 控制文件的 Debian 修订版值\n  --linux-app-category <category value>\n          RPM <name>.spec 文件的组值或 \n          DEB 控制文件的节值\n  --linux-shortcut\n          为应用程序创建快捷方式。\n
 MSG_Help_mac_linux_install_dir=应用程序安装目录的绝对路径\n
 MSG_Help_default_install_dir=OS X 或 Linux 上应用程序安装目录的绝对路径。\n          Windows 上应用程序安装位置的相对子路径\n          （如 "Program Files" 或 "AppData"）。\n
 MSG_Help_no_args=用法：jpackage <options>\n使用 jpackage --help（或 -h）可获取可能选项的列表
diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md
index 34e524f9eee..e49b04e204e 100644
--- a/src/jdk.jpackage/share/man/jpackage.md
+++ b/src/jdk.jpackage/share/man/jpackage.md
@@ -446,7 +446,7 @@ The `jpackage` tool will take as input a Java application and a Java run-time im
 
 :   Menu group this application is placed in
 
-<a id="option-linux-package-deps">`--linux-package-deps`</a>
+<a id="option-linux-package-deps">`--linux-package-deps` *package-dep-string*</a>
 
 :   Required packages or capabilities for the application
 

From a44a470052aff3b17fa53165f043ccce36c1ef9b Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 3 Jun 2025 19:23:29 +0000
Subject: [PATCH 825/901] 8358515: make cmp-baseline is broken after
 JDK-8349665

Reviewed-by: erikj
---
 make/Init.gmk    | 22 ++++++++++++++--------
 make/Main.gmk    |  8 --------
 make/PreInit.gmk |  3 ++-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 32624d7dee6..38959323628 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -110,7 +110,18 @@ reconfigure:
 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
 	    $(RECONFIGURE_COMMAND) )
 
-.PHONY: print-modules print-targets print-tests print-configuration reconfigure
+# Create files that are needed to run most targets in Main.gmk
+create-make-helpers:
+	( cd $(TOPDIR) && \
+	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
+	    $(USER_MAKE_VARS) )
+	( cd $(TOPDIR) && \
+	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
+	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	    create-main-targets-include )
+
+.PHONY: print-modules print-targets print-tests print-configuration \
+    reconfigure create-make-helpers
 
 ##############################################################################
 # The main target. This will delegate all other targets into Main.gmk.
@@ -130,7 +141,7 @@ TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
 # variables are explicitly propagated using $(USER_MAKE_VARS).
 main: MAKEOVERRIDES :=
 
-main: $(INIT_TARGETS)
+main: $(INIT_TARGETS) create-make-helpers
         ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
 	  $(call RotateLogFiles)
 	  $(ECHO) "Building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE)
@@ -142,12 +153,7 @@ main: $(INIT_TARGETS)
 	        $(SEQUENTIAL_TARGETS) )
             # We might have cleaned away essential files, recreate them.
 	    ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
-	        $(USER_MAKE_VARS) )
-	    ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
-	        UPDATE_MODULE_DEPS=true NO_RECIPES=true \
-	        create-main-targets-include )
+	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)
diff --git a/make/Main.gmk b/make/Main.gmk
index 386bd226842..d0568509a4e 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -423,14 +423,6 @@ bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
-          # We need to create essential files for the bootcycle spec dir
-	  ( cd $(TOPDIR) && \
-	      $(MAKE) $(MAKE_ARGS) -f make/GenerateFindTests.gmk \
-	      SPEC=$(BOOTCYCLE_SPEC))
-	  ( cd $(TOPDIR) && \
-	      $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Main.gmk \
-	      SPEC=$(BOOTCYCLE_SPEC) UPDATE_MODULE_DEPS=true NO_RECIPES=true \
-	      create-main-targets-include )
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
 	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
         else
diff --git a/make/PreInit.gmk b/make/PreInit.gmk
index bce61ccde5f..3df44308dd9 100644
--- a/make/PreInit.gmk
+++ b/make/PreInit.gmk
@@ -50,7 +50,8 @@ include $(TOPDIR)/make/Global.gmk
 
 # Targets provided by Init.gmk.
 ALL_INIT_TARGETS := print-modules print-targets print-configuration \
-    print-tests reconfigure pre-compare-build post-compare-build
+    print-tests reconfigure pre-compare-build post-compare-build \
+    create-make-helpers
 
 # CALLED_TARGETS is the list of targets that the user provided,
 # or "default" if unspecified.

From e235b61a8bb70462921c09d197adc4b60267d327 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Tue, 3 Jun 2025 19:38:58 +0000
Subject: [PATCH 826/901] 8357987: [JVMCI] Add support for retrieving all
 methods of a ResolvedJavaType

Reviewed-by: dnsimon, yzheng, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 21 +++++++++++++++++++
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  1 +
 .../jdk/vm/ci/hotspot/CompilerToVM.java       | 12 ++++++++++-
 .../HotSpotResolvedJavaMethodImpl.java        | 13 ++++++++++++
 .../HotSpotResolvedObjectTypeImpl.java        |  8 +++++++
 .../hotspot/HotSpotResolvedPrimitiveType.java |  5 +++++
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  1 +
 .../jdk/vm/ci/meta/ResolvedJavaMethod.java    |  6 ++++++
 .../jdk/vm/ci/meta/ResolvedJavaType.java      | 12 +++++++++++
 .../runtime/test/TestResolvedJavaMethod.java  | 13 ++++++++++++
 .../ci/runtime/test/TestResolvedJavaType.java | 12 +++++++++++
 11 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 2256a0edc99..4f6d4aaa099 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -2224,6 +2224,26 @@ C2V_VMENTRY_NULL(jobjectArray, getDeclaredMethods, (JNIEnv* env, jobject, ARGUME
   return JVMCIENV->get_jobjectArray(methods);
 C2V_END
 
+C2V_VMENTRY_NULL(jobjectArray, getAllMethods, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass)))
+  Klass* klass = UNPACK_PAIR(Klass, klass);
+  if (klass == nullptr) {
+    JVMCI_THROW_NULL(NullPointerException);
+  }
+  if (!klass->is_instance_klass()) {
+    JVMCIObjectArray methods = JVMCIENV->new_ResolvedJavaMethod_array(0, JVMCI_CHECK_NULL);
+    return JVMCIENV->get_jobjectArray(methods);
+  }
+
+  InstanceKlass* iklass = InstanceKlass::cast(klass);
+  JVMCIObjectArray methods = JVMCIENV->new_ResolvedJavaMethod_array(iklass->methods()->length(), JVMCI_CHECK_NULL);
+  for (int i = 0; i < iklass->methods()->length(); i++) {
+    methodHandle mh(THREAD, iklass->methods()->at(i));
+    JVMCIObject method = JVMCIENV->get_jvmci_method(mh, JVMCI_CHECK_NULL);
+    JVMCIENV->put_object_at(methods, i, method);
+  }
+  return JVMCIENV->get_jobjectArray(methods);
+C2V_END
+
 C2V_VMENTRY_NULL(jobjectArray, getDeclaredFieldsInfo, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass)))
   Klass* klass = UNPACK_PAIR(Klass, klass);
   if (klass == nullptr) {
@@ -3359,6 +3379,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "boxPrimitive",                                 CC "(" OBJECT ")" OBJECTCONSTANT,                                                     FN_PTR(boxPrimitive)},
   {CC "getDeclaredConstructors",                      CC "(" HS_KLASS2 ")[" RESOLVED_METHOD,                                                FN_PTR(getDeclaredConstructors)},
   {CC "getDeclaredMethods",                           CC "(" HS_KLASS2 ")[" RESOLVED_METHOD,                                                FN_PTR(getDeclaredMethods)},
+  {CC "getAllMethods",                                CC "(" HS_KLASS2 ")[" RESOLVED_METHOD,                                                FN_PTR(getAllMethods)},
   {CC "getDeclaredFieldsInfo",                        CC "(" HS_KLASS2 ")[" FIELDINFO,                                                      FN_PTR(getDeclaredFieldsInfo)},
   {CC "readStaticFieldValue",                         CC "(" HS_KLASS2 "JC)" JAVACONSTANT,                                                  FN_PTR(readStaticFieldValue)},
   {CC "readFieldValue",                               CC "(" OBJECTCONSTANT HS_KLASS2 "JC)" JAVACONSTANT,                                   FN_PTR(readFieldValue)},
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 4302c0ce6ad..e26c815946d 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -693,6 +693,7 @@
   declare_constant(ConstMethodFlags::_misc_reserved_stack_access)         \
   declare_constant(ConstMethodFlags::_misc_changes_current_thread)        \
   declare_constant(ConstMethodFlags::_misc_is_scoped)                     \
+  declare_constant(ConstMethodFlags::_misc_is_overpass)                   \
                                                                           \
   declare_constant(CounterData::count_off)                                \
                                                                           \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index d7356659296..045b1f0fc12 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -1148,7 +1148,8 @@ ResolvedJavaMethod[] getDeclaredConstructors(HotSpotResolvedObjectTypeImpl klass
     native ResolvedJavaMethod[] getDeclaredConstructors(HotSpotResolvedObjectTypeImpl klass, long klassPointer);
 
     /**
-     * Gets the {@link ResolvedJavaMethod}s for all the non-constructor methods of {@code klass}.
+     * Gets the {@link ResolvedJavaMethod}s for all non-overpass and non-initializer
+     * methods of {@code klass}.
      */
     ResolvedJavaMethod[] getDeclaredMethods(HotSpotResolvedObjectTypeImpl klass) {
         return getDeclaredMethods(klass, klass.getKlassPointer());
@@ -1156,6 +1157,15 @@ ResolvedJavaMethod[] getDeclaredMethods(HotSpotResolvedObjectTypeImpl klass) {
 
     native ResolvedJavaMethod[] getDeclaredMethods(HotSpotResolvedObjectTypeImpl klass, long klassPointer);
 
+    /**
+     * Gets the {@link ResolvedJavaMethod}s for all methods of {@code klass}.
+     */
+    ResolvedJavaMethod[] getAllMethods(HotSpotResolvedObjectTypeImpl klass) {
+        return getAllMethods(klass, klass.getKlassPointer());
+    }
+
+    native ResolvedJavaMethod[] getAllMethods(HotSpotResolvedObjectTypeImpl klass, long klassPointer);
+
     HotSpotResolvedObjectTypeImpl.FieldInfo[] getDeclaredFieldsInfo(HotSpotResolvedObjectTypeImpl klass) {
         return getDeclaredFieldsInfo(klass, klass.getKlassPointer());
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 59f5320cc54..9440a719dd4 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -573,6 +573,19 @@ public boolean isDefault() {
         return ((getModifiers() & mask) == Modifier.PUBLIC) && getDeclaringClass().isInterface();
     }
 
+    /*
+     * Currently in hotspot a method can either be a "normal" or an "overpass"
+     * method. Overpass methods are instance methods which are created when
+     * otherwise a valid candidate for method resolution would not be found.
+     */
+    @Override
+    public boolean isDeclared() {
+        if (isConstructor() || isClassInitializer()) {
+            return false;
+        }
+        return (getConstMethodFlags() & config().constMethodFlagsIsOverpass) == 0;
+    }
+
     @Override
     public Type[] getGenericParameterTypes() {
         if (isClassInitializer()) {
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 8d3b9f48b4c..17eede6f490 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
@@ -1067,6 +1067,14 @@ public ResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
         return runtime().compilerToVm.getDeclaredMethods(this);
     }
 
+    @Override
+    public List<ResolvedJavaMethod> getAllMethods(boolean forceLink) {
+        if (forceLink) {
+            link();
+        }
+        return List.of(runtime().compilerToVm.getAllMethods(this));
+    }
+
     @Override
     public ResolvedJavaMethod getClassInitializer() {
         if (!isArray()) {
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 4425ade0880..b707906af08 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
@@ -296,6 +296,11 @@ public ResolvedJavaMethod[] getDeclaredMethods() {
         return new ResolvedJavaMethod[0];
     }
 
+    @Override
+    public List<ResolvedJavaMethod> getAllMethods(boolean forceLink) {
+        return List.of();
+    }
+
     @Override
     public ResolvedJavaMethod getClassInitializer() {
         return null;
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 e93b98042b6..bc2e121fe90 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
@@ -196,6 +196,7 @@ long prototypeMarkWord() {
     final int constMethodFlagsCallerSensitive = getConstant("ConstMethodFlags::_misc_caller_sensitive", Integer.class);
     final int constMethodFlagsIntrinsicCandidate = getConstant("ConstMethodFlags::_misc_intrinsic_candidate", Integer.class);
     final int constMethodFlagsIsScoped = getConstant("ConstMethodFlags::_misc_is_scoped", Integer.class);
+    final int constMethodFlagsIsOverpass = getConstant("ConstMethodFlags::_misc_is_overpass", Integer.class);
     final int constMethodHasLineNumberTable = getConstant("ConstMethodFlags::_misc_has_linenumber_table", Integer.class);
     final int constMethodHasLocalVariableTable = getConstant("ConstMethodFlags::_misc_has_localvariable_table", Integer.class);
     final int constMethodHasMethodAnnotations = getConstant("ConstMethodFlags::_misc_has_method_annotations", Integer.class);
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
index 8758dbb3bb6..f401bc30f83 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -114,6 +114,12 @@ default boolean isFinal() {
      */
     boolean isDefault();
 
+    /**
+     * Returns {@code true} if this method is contained in the array returned by
+     * {@code getDeclaringClass().getDeclaredMethods()}
+     */
+    boolean isDeclared();
+
     /**
      * Checks whether this method is a class initializer.
      *
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 b5d29733a69..929a4713330 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
@@ -23,6 +23,7 @@
 package jdk.vm.ci.meta;
 
 import java.lang.reflect.AnnotatedElement;
+import java.util.List;
 
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 
@@ -365,6 +366,17 @@ default ResolvedJavaMethod[] getDeclaredMethods(boolean forceLink) {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Returns a list containing all methods present within this type. This list can
+     * include methods implicitly created and used by the VM that are not present in
+     * {@link #getDeclaredMethods}. The returned List is unmodifiable; calls to any
+     * mutator method will always cause {@code UnsupportedOperationException} to be
+     * thrown.
+     *
+     * @param forceLink if {@code true}, forces this type to be {@link #link linked}
+     */
+    List<ResolvedJavaMethod> getAllMethods(boolean forceLink);
+
     /**
      * Returns the {@code <clinit>} method for this class if there is one.
      */
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
index 75f074ad09d..6151ae68ce7 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
@@ -425,6 +425,19 @@ public void isDefaultTest() {
         }
     }
 
+    @Test
+    public void isDeclaredTest() {
+        for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
+            ResolvedJavaMethod m = e.getValue();
+            boolean expectedDeclared = Arrays.stream(m.getDeclaringClass().getDeclaredMethods()).anyMatch(i -> i.equals(m));
+            assertEquals(expectedDeclared, m.isDeclared());
+        }
+        for (Map.Entry<Constructor<?>, ResolvedJavaMethod> e : constructors.entrySet()) {
+            ResolvedJavaMethod m = e.getValue();
+            assertFalse(m.isDeclared());
+        }
+    }
+
     @Test
     public void hasReceiverTest() {
         for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
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 456c4a5fd88..ee48724b71d 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
@@ -1019,6 +1019,18 @@ public void getDeclaredMethodsTest() {
         }
     }
 
+    @Test
+    public void getAllMethodsTest() {
+        for (Class<?> c : classes) {
+            ResolvedJavaType type = metaAccess.lookupJavaType(c);
+            Set<ResolvedJavaMethod> allMethods = new HashSet<>(type.getAllMethods(true));
+            Stream<ResolvedJavaMethod> allKnownMethods = Stream.concat(Arrays.stream(type.getDeclaredMethods()), Arrays.stream(type.getDeclaredConstructors()));
+            allKnownMethods = Stream.concat(allKnownMethods, Stream.ofNullable(type.getClassInitializer()));
+            List<ResolvedJavaMethod> missingMethods = allKnownMethods.filter(m -> !allMethods.contains(m)).toList();
+            assertTrue(missingMethods.toString(), missingMethods.isEmpty());
+        }
+    }
+
     static class A {
         static String name = "foo";
     }

From 704b5990a750719ca927e156553db7982637e590 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Tue, 3 Jun 2025 20:15:20 +0000
Subject: [PATCH 827/901] 8358534: Bailout in Conv2B::Ideal when type of cmp
 input is not supported

Reviewed-by: shade
---
 src/hotspot/share/opto/convertnode.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/hotspot/share/opto/convertnode.cpp b/src/hotspot/share/opto/convertnode.cpp
index 5df79a36edb..c468c66fdfd 100644
--- a/src/hotspot/share/opto/convertnode.cpp
+++ b/src/hotspot/share/opto/convertnode.cpp
@@ -79,6 +79,11 @@ Node* Conv2BNode::Ideal(PhaseGVN* phase, bool can_reshape) {
         assert(false, "Unrecognized comparison for Conv2B: %s", NodeClassNames[in(1)->Opcode()]);
       }
 
+      // Skip the transformation if input is unexpected.
+      if (cmp == nullptr) {
+        return nullptr;
+      }
+
       // Replace Conv2B with the cmove
       Node* bol = phase->transform(new BoolNode(cmp, BoolTest::eq));
       return new CMoveINode(bol, phase->intcon(1), phase->intcon(0), TypeInt::BOOL);

From da49fa5e15b137c086ad8fd438bf448da42121cb Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 3 Jun 2025 20:47:17 +0000
Subject: [PATCH 828/901] 8354460: Streaming output for attach API should be
 turned on by default

Reviewed-by: sspitsyn, kevinw
---
 src/hotspot/share/services/attachListener.cpp                 | 4 ++--
 .../share/classes/sun/tools/attach/HotSpotVirtualMachine.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index d13a2e70b2b..92d3c302ded 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -172,8 +172,8 @@ 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;
+// Default is true (if jdk.attach.vm.streaming property is not set).
+bool AttachListener::_default_streaming_output = true;
 
 static bool get_bool_sys_prop(const char* name, bool default_value, TRAPS) {
   ResourceMark rm(THREAD);
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 e0ac0edda51..97139a5a206 100644
--- a/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
+++ b/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
@@ -63,9 +63,8 @@ private static long pid() {
     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);
+        ALLOW_STREAMING_OUTPUT = !("false".equals(s2));
     }
 
     private final boolean selfAttach;

From 939753579b80d2910c78d8bbb1c97bd56afa21ba Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Tue, 3 Jun 2025 23:27:44 +0000
Subject: [PATCH 829/901] 8356803: Test TextLayout/TestControls fails on
 windows & linux: line and paragraph separator show non-zero advance 8356812:
 Create an automated version of TextLayout/TestControls

Reviewed-by: prr, honkar
---
 .../share/classes/sun/font/FontUtilities.java |  12 +-
 .../TextLayout/FormatCharAdvanceTest.java     |  56 ++++--
 .../awt/font/TextLayout/TestControls.java     | 161 ------------------
 3 files changed, 54 insertions(+), 175 deletions(-)
 delete mode 100644 test/jdk/java/awt/font/TextLayout/TestControls.java

diff --git a/src/java.desktop/share/classes/sun/font/FontUtilities.java b/src/java.desktop/share/classes/sun/font/FontUtilities.java
index c2e3137e1b5..a14214ab751 100644
--- a/src/java.desktop/share/classes/sun/font/FontUtilities.java
+++ b/src/java.desktop/share/classes/sun/font/FontUtilities.java
@@ -370,17 +370,25 @@ public static boolean isDefaultIgnorable(int charCode) {
     }
 
     /**
-     * Checks whether or not the specified codepoint is whitespace which is
+     * <p>Checks whether or not the specified codepoint is whitespace which is
      * ignorable at the shaping stage of text rendering. These ignorable
      * whitespace characters should be used prior to text shaping and
      * rendering to determine the position of the text, but are not themselves
      * rendered.
      *
+     * <p>Includes 0x0009 (horizontal tab / TAB), 0x000A (line feed / LF),
+     * 0x000B (vertical tab / VT), 0x000C (form feed / FF),
+     * 0x000D (carriage return / CR), 0x0085 (next line / NEL),
+     * 0x2028 (line separator / LS), 0x2029 (paragraph separator / PS).
+     *
      * @param ch the codepoint to check
      * @return whether the specified codepoint is ignorable whitespace
      */
     public static boolean isIgnorableWhitespace(int ch) {
-        return ch == 0x0009 || ch == 0x000a || ch == 0x000d;
+        return (ch >= 0x0009 && ch <= 0x000d)
+            || ch == 0x0085
+            || ch == 0x2028
+            || ch == 0x2029;
     }
 
     public static PlatformLogger getLogger() {
diff --git a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
index b37f7e02707..63cd890f1db 100644
--- a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
+++ b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
@@ -21,10 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug 8208377 6562489 8270265
- * @summary Confirm that format-category glyphs are not rendered or measured.
+ * @bug 8208377 6562489 8270265 8356803 8356812 4517298
+ * @summary Confirm that default-ignorable and ignorable-whitespace
+ *          glyphs are not rendered or measured.
  */
 
 import java.awt.Color;
@@ -48,9 +49,11 @@
 public class FormatCharAdvanceTest {
 
     /**
-     * <p>Font created for this test which contains glyphs for 0-9, a-z, A-Z, space, and most
-     * characters with Unicode general category = Format (Cf); the tests will pass if these
-     * format glyphs and their advances are ignored during text measurement and text drawing.
+     * <p>Font created for this test which contains glyphs for 0-9, a-z, A-Z,
+     * some whitespace characters, and most characters with Unicode "Format"
+     * (Cf) general category; the tests will pass if the font glyphs and
+     * advances for default-ignorable and ignorable-whitespace characters
+     * are ignored during text measurement and text drawing.
      *
      * <p>The following FontForge Python script was used to generate this font:
      *
@@ -87,9 +90,11 @@ public class FormatCharAdvanceTest {
      * chars = 'bcdefghijklmnopqrstuvwxyz' \
      *         'ABCDEFGHIJKLMNOPQRSTUVWXYZ' \
      *         '1234567890' \
-     *         '\u00AD\u0600\u0601\u0602\u0603\u0604\u0605\u061C\u06DD\u070F\u0890\u0891\u08E2\u180E' \
-     *         '\u200B\u200C\u200D\u200E\u200F\u202A\u202B\u202C\u202D\u202E\u2060\u2061\u2062\u2063\u2064' \
-     *         '\u2066\u2067\u2068\u2069\u206A\u206B\u206C\u206D\u206E\u206F\uFEFF\uFFF9\uFFFA\uFFFB' \
+     *         '\u0009\u000A\u000B\u000C\u000D\u0085\u00AD' \
+     *         '\u0600\u0601\u0602\u0603\u0604\u0605\u061C\u06DD\u070F\u0890\u0891\u08E2\u180E' \
+     *         '\u200B\u200C\u200D\u200E\u200F\u2028\u2029\u202A\u202B\u202C\u202D\u202E\u202F' \
+     *         '\u2060\u2061\u2062\u2063\u2064\u2065\u2066\u2067\u2068\u2069\u206A\u206B\u206C' \
+     *         '\u206D\u206E\u206F\uFEFF\uFFF9\uFFFA\uFFFB' \
      *         '\U000110BD\U000110CD\U00013430\U00013431\U00013432\U00013433\U00013434\U00013435\U00013436' \
      *         '\U00013437\U00013438\U00013439\U0001343A\U0001343B\U0001343C\U0001343D\U0001343E\U0001343F' \
      *         '\U0001BCA0\U0001BCA1\U0001BCA2\U0001BCA3\U0001D173\U0001D174\U0001D175\U0001D176\U0001D177' \
@@ -119,12 +124,12 @@ public class FormatCharAdvanceTest {
      *     f4.write(encoded)
      * </pre>
      */
-    private static final String TTF_BYTES = "AAEAAAANAIAAAwBQRkZUTaj5NMoAABWEAAAAHE9TLzKEBfqWAAABWAAAAGBjbWFw6BKIbQAAAuQAAAMoY3Z0IABEBREAAAYMAAAABGdhc3D//wADAAAVfAAAAAhnbHlmcb+r/AAABzQAAAksaGVhZCi9kzQAAADcAAAANmhoZWEIcgJeAAABFAAAACRobXR4JX8bnAAAAbgAAAEqbG9jYam4p4gAAAYQAAABIm1heHAA1wBCAAABOAAAACBuYW1lImUC5wAAEGAAAAGJcG9zdBd/2qEAABHsAAADjwABAAAAAQAAEAez8l8PPPUACwgAAAAAAON7pHEAAAAA43ukcQBEAAACZAVVAAAACAACAAAAAAAAAAEAAAVVAAAAuAJYAAAAAAJkAAEAAAAAAAAAAAAAAAAAAAAFAAEAAACQAAgAAgAIAAIAAgAAAAEAAQAAAEAALgABAAEABAJXAZAABQAABTMFmQAAAR4FMwWZAAAD1wBmAhIAAAIABQMAAAAAAACAACADAgAAABECAKgAAAAAUGZFZACAACD//wZm/mYAuAVVAAAAAAABAAAAAADIAMgAAAAgAAEC7ABEAAAAAAKqAAACOQAAAlgAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAAAAAAAFAAAAAwAAACwAAAAEAAAA2gABAAAAAAIiAAMAAQAAACwAAwAKAAAA2gAEAK4AAAAmACAABAAGACAAOQBaAHoArQYFBhwG3QcPCJEI4hgOIA8gLiBkIG/+///7//8AAAAgADAAQQBhAK0GAAYcBt0HDwiQCOIYDiALICogYCBm/v//+f///+P/1P/N/8f/lfpD+i35bfk897z3bOhB4EXgK9/63/kBagAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAABqAGsAbAAMAAAAAAFIAAAAAAAAABoAAAAgAAAAIAAAAAMAAAAwAAAAOQAAAAQAAABBAAAAWgAAAA4AAABhAAAAegAAACgAAACtAAAArQAAAEIAAAYAAAAGBQAAAEMAAAYcAAAGHAAAAEkAAAbdAAAG3QAAAEoAAAcPAAAHDwAAAEsAAAiQAAAIkQAAAEwAAAjiAAAI4gAAAE4AABgOAAAYDgAAAE8AACALAAAgDwAAAFAAACAqAAAgLgAAAFUAACBgAAAgZAAAAFoAACBmAAAgbwAAAF8AAP7/AAD+/wAAAGkAAP/5AAD/+wAAAGoAARC9AAEQvQAAAG0AARDNAAEQzQAAAG4AATQwAAE0PwAAAG8AAbygAAG8owAAAH8AAdFzAAHRegAAAIMADgABAA4AAQAAAIsADgAgAA4AIQAAAIwADgB+AA4AfwAAAI4AAAEGAAABAAAAAAAAAAECAAAAAgAAAAAAAAAAAAAAAAAAAAEAAAMAAAAAAAAAAAAAAAAAAAAEBQYHCAkKCwwNAAAAAAAAAA4PEBESExQVFhcYGRobHB0eHyAhIiMkJSYnAAAAAAAAKCkqKywtLi8wMTIzNDU2Nzg5Ojs8PT4/QEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQFEQAAACwALAAsACwANAA8AEQATABUAFwAZABsAHQAfACEAIwAlACcAKQArAC0ALwAxADMANQA3ADkAOwA9AD8AQQBDAEUARwBJAEsATQBPAFEAUwBXgFmAW4BdgF+AYYBjgGWAZ4BpgGuAbYBvgHGAc4B1gHeAeYB7gH2Af4CBgIOAhYCHgImAi4CNgI+AkYCTgJWAl4CZgJuAnYCfgKGAo4ClgKeAqYCrgK2Ar4CxgLOAtYC3gLmAu4C9gL+AwYDDgMWAx4DJgMuAzYDPgNGA04DVgNeA2YDbgN2A34DhgOOA5YDngOmA64DtgO+A8YDzgPWA94D5gPuA/YD/gQGBA4EFgQeBCYELgQ2BD4ERgROBFYEXgRmBG4EdgR+BIYEjgSWAAAAAgBEAAACZAVVAAMABwAusQEALzyyBwQA7TKxBgXcPLIDAgDtMgCxAwAvPLIFBADtMrIHBgH8PLIBAgDtMjMRIRElIREhRAIg/iQBmP5oBVX6q0QEzQAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAAAAIAZABkAfQAyAADAAcAADc1IRUhNSEVZAGQ/nABkGRkZGRk//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAP//AGQAZAH0AMgSBgAoAAD//wBkAGQB9ADIEgYAKAAA//8AZABkAfQAyBIGACgAAAAAAA4ArgABAAAAAAAAAAAAAgABAAAAAAABAAQADQABAAAAAAACAAcAIgABAAAAAAADACAAbAABAAAAAAAEAAQAlwABAAAAAAAFAA8AvAABAAAAAAAGAAQA1gADAAEECQAAAAAAAAADAAEECQABAAgAAwADAAEECQACAA4AEgADAAEECQADAEAAKgADAAEECQAEAAgAjQADAAEECQAFAB4AnAADAAEECQAGAAgAzAAAAABUAGUAcwB0AABUZXN0AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABGAG8AbgB0AEYAbwByAGcAZQAgADIALgAwACAAOgAgAFQAZQBzAHQAIAA6ACAAOAAtADEAMgAtADIAMAAyADQAAEZvbnRGb3JnZSAyLjAgOiBUZXN0IDogOC0xMi0yMDI0AABUAGUAcwB0AABUZXN0AABWAGUAcgBzAGkAbwBuACAAMAAwADEALgAwADAAMAAAVmVyc2lvbiAwMDEuMDAwAABUAGUAcwB0AABUZXN0AAAAAAACAAAAAAAA/2cAZgAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAABAAIAAwATABQAFQAWABcAGAAZABoAGwAcACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0BAgEDAQQBBQEGAQcBCAEJAQoBCwEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhASIBIwEkASUBJgEnASgBKQEqASsBLAEtAS4BLwEwATEBMgEzATQBNQE2ATcBOAE5AToBOwE8AT0BPgE/AUABQQFCAUMBRAFFAUYBRwFIAUkBSgFLAUwBTQFOAU8HdW5pMDBBRAd1bmkwNjAwB3VuaTA2MDEHdW5pMDYwMgd1bmkwNjAzB3VuaTA2MDQHdW5pMDYwNQd1bmkwNjFDB3VuaTA2REQHdW5pMDcwRgd1bmkwODkwB3VuaTA4OTEHdW5pMDhFMgd1bmkxODBFB3VuaTIwMEIHdW5pMjAwQwd1bmkyMDBEB3VuaTIwMEUHdW5pMjAwRgd1bmkyMDJBB3VuaTIwMkIHdW5pMjAyQwd1bmkyMDJEB3VuaTIwMkUHdW5pMjA2MAd1bmkyMDYxB3VuaTIwNjIHdW5pMjA2Mwd1bmkyMDY0B3VuaTIwNjYHdW5pMjA2Nwd1bmkyMDY4B3VuaTIwNjkHdW5pMjA2QQd1bmkyMDZCB3VuaTIwNkMHdW5pMjA2RAd1bmkyMDZFB3VuaTIwNkYHdW5pRkVGRgd1bmlGRkY5B3VuaUZGRkEHdW5pRkZGQgZ1MTEwQkQGdTExMENEBnUxMzQzMAZ1MTM0MzEGdTEzNDMyBnUxMzQzMwZ1MTM0MzQGdTEzNDM1BnUxMzQzNgZ1MTM0MzcGdTEzNDM4BnUxMzQzOQZ1MTM0M0EGdTEzNDNCBnUxMzQzQwZ1MTM0M0QGdTEzNDNFBnUxMzQzRgZ1MUJDQTAGdTFCQ0ExBnUxQkNBMgZ1MUJDQTMGdTFEMTczBnUxRDE3NAZ1MUQxNzUGdTFEMTc2BnUxRDE3NwZ1MUQxNzgGdTFEMTc5BnUxRDE3QQZ1RTAwMDEGdUUwMDIwBnVFMDAyMQZ1RTAwN0UGdUUwMDdGAAAAAAH//wACAAAAAQAAAADiAevnAAAAAON7pHEAAAAA43ukcQ==";
+    private static final String TTF_BYTES = "AAEAAAANAIAAAwBQRkZUTarBS1AAABbcAAAAHE9TLzKD7vqWAAABWAAAAGBjbWFw11zF/AAAAvwAAANSY3Z0IABEBREAAAZQAAAABGdhc3D//wADAAAW1AAAAAhnbHlmgVJ3qAAAB4gAAAnMaGVhZCqFqboAAADcAAAANmhoZWEIcgJiAAABFAAAACRobXR4L1UevAAAAbgAAAFEbG9jYb8EwZoAAAZUAAABNG1heHAA4ABCAAABOAAAACBuYW1lJWcF2wAAEVQAAAGJcG9zdBSfZd0AABLgAAAD8QABAAAAAQAAzMHptF8PPPUACwgAAAAAAORfr7QAAAAA5F+vtABEAAACZAVVAAAACAACAAAAAAAAAAEAAAVVAAAAuAJYAAAAAAJkAAEAAAAAAAAAAAAAAAAAAAAJAAEAAACZAAgAAgAIAAIAAgAAAAEAAQAAAEAALgABAAEABAJXAZAABQAABTMFmQAAAR4FMwWZAAAD1wBmAhIAAAIABQMAAAAAAACAACADAgAAABECAKgAAAAAUGZFZACAAAn//wZm/mYAuAVVAAAAAAABAAAAAADIAMgAAAAgAAEC7ABEAAAAAAJYAGQCWABkAlgAZAJYAGQCWABkAjkAAAJYAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAAAAFAAAAAwAAACwAAAAEAAAA7AABAAAAAAJMAAMAAQAAACwAAwAKAAAA7AAEAMAAAAAoACAABAAIAA0AIAA5AFoAegCFAK0GBQYcBt0HDwiRCOIYDiAPIC8gb/7///v//wAAAAkAIAAwAEEAYQCFAK0GAAYcBt0HDwiQCOIYDiALICggYP7///n//wAA/+f/2P/R/8v/wf+a+kj6Mvly+UH3wfdx6EbgSuAy4AIBcwAAAAEAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAMABAAFAAYAAgBzAHQAdQAMAAAAAAFgAAAAAAAAABwAAAAJAAAADAAAAAMAAAANAAAADQAAAAIAAAAgAAAAIAAAAAcAAAAwAAAAOQAAAAgAAABBAAAAWgAAABIAAABhAAAAegAAACwAAACFAAAAhQAAAEYAAACtAAAArQAAAEcAAAYAAAAGBQAAAEgAAAYcAAAGHAAAAE4AAAbdAAAG3QAAAE8AAAcPAAAHDwAAAFAAAAiQAAAIkQAAAFEAAAjiAAAI4gAAAFMAABgOAAAYDgAAAFQAACALAAAgDwAAAFUAACAoAAAgLwAAAFoAACBgAAAgbwAAAGIAAP7/AAD+/wAAAHIAAP/5AAD/+wAAAHMAARC9AAEQvQAAAHYAARDNAAEQzQAAAHcAATQwAAE0PwAAAHgAAbygAAG8owAAAIgAAdFzAAHRegAAAIwADgABAA4AAQAAAJQADgAgAA4AIQAAAJUADgB+AA4AfwAAAJcAAAEGAAABAAAAAAAAAAEDBAUGAgAAAAAAAAAAAAAAAAAAAAEAAAcAAAAAAAAAAAAAAAAAAAAICQoLDA0ODxARAAAAAAAAABITFBUWFxgZGhscHR4fICEiIyQlJicoKSorAAAAAAAALC0uLzAxMjM0NTY3ODk6Ozw9Pj9AQUJDREUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAURAAAALAAsADQAPABEAEwAVABUAFwAZABsAHQAfACEAIwAlACcAKQArAC0ALwAxADMANQA3ADkAOwA9AD8AQQBDAEUARwBJAEsATQBPAFEAUwBVAFcAWQBbAF0AYYBjgGWAZ4BpgGuAbYBvgHGAc4B1gHeAeYB7gH2Af4CBgIOAhYCHgImAi4CNgI+AkYCTgJWAl4CZgJuAnYCfgKGAo4ClgKeAqYCrgK2Ar4CxgLOAtYC3gLmAu4C9gL+AwYDDgMWAx4DJgMuAzYDPgNGA04DVgNeA2YDbgN2A34DhgOOA5YDngOmA64DtgO+A8YDzgPWA94D5gPuA/YD/gQGBA4EFgQeBCYELgQ2BD4ERgROBFYEXgRmBG4EdgR+BIYEjgSWBJ4EpgSuBLYEvgTGBM4E1gTeBOYAAgBEAAACZAVVAAMABwAusQEALzyyBwQA7TKxBgXcPLIDAgDtMgCxAwAvPLIFBADtMrIHBgH8PLIBAgDtMjMRIRElIREhRAIg/iQBmP5oBVX6q0QEzQAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAgBkAGQB9ADIAAMABwAANzUhFSE1IRVkAZD+cAGQZGRkZGT//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAAAOAK4AAQAAAAAAAAAAAAIAAQAAAAAAAQAEAA0AAQAAAAAAAgAHACIAAQAAAAAAAwAgAGwAAQAAAAAABAAEAJcAAQAAAAAABQAPALwAAQAAAAAABgAEANYAAwABBAkAAAAAAAAAAwABBAkAAQAIAAMAAwABBAkAAgAOABIAAwABBAkAAwBAACoAAwABBAkABAAIAI0AAwABBAkABQAeAJwAAwABBAkABgAIAMwAAAAAVABlAHMAdAAAVGVzdAAAUgBlAGcAdQBsAGEAcgAAUmVndWxhcgAARgBvAG4AdABGAG8AcgBnAGUAIAAyAC4AMAAgADoAIABUAGUAcwB0ACAAOgAgADMAMAAtADUALQAyADAAMgA1AABGb250Rm9yZ2UgMi4wIDogVGVzdCA6IDMwLTUtMjAyNQAAVABlAHMAdAAAVGVzdAAAVgBlAHIAcwBpAG8AbgAgADAAMAAxAC4AMAAwADAAAFZlcnNpb24gMDAxLjAwMAAAVABlAHMAdAAAVGVzdAAAAAAAAgAAAAAAAP9nAGYAAAAAAAAAAAAAAAAAAAAAAAAAAACZAAAAAQECAQMBBAEFAQYAAwATABQAFQAWABcAGAAZABoAGwAcACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0BBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZB3VuaTAwMEQHdW5pMDAwOQd1bmkwMDBBB3VuaTAwMEIHdW5pMDAwQwd1bmkwMDg1B3VuaTAwQUQHdW5pMDYwMAd1bmkwNjAxB3VuaTA2MDIHdW5pMDYwMwd1bmkwNjA0B3VuaTA2MDUHdW5pMDYxQwd1bmkwNkREB3VuaTA3MEYHdW5pMDg5MAd1bmkwODkxB3VuaTA4RTIHdW5pMTgwRQd1bmkyMDBCB3VuaTIwMEMHdW5pMjAwRAd1bmkyMDBFB3VuaTIwMEYHdW5pMjAyOAd1bmkyMDI5B3VuaTIwMkEHdW5pMjAyQgd1bmkyMDJDB3VuaTIwMkQHdW5pMjAyRQd1bmkyMDJGB3VuaTIwNjAHdW5pMjA2MQd1bmkyMDYyB3VuaTIwNjMHdW5pMjA2NAd1bmkyMDY1B3VuaTIwNjYHdW5pMjA2Nwd1bmkyMDY4B3VuaTIwNjkHdW5pMjA2QQd1bmkyMDZCB3VuaTIwNkMHdW5pMjA2RAd1bmkyMDZFB3VuaTIwNkYHdW5pRkVGRgd1bmlGRkY5B3VuaUZGRkEHdW5pRkZGQgZ1MTEwQkQGdTExMENEBnUxMzQzMAZ1MTM0MzEGdTEzNDMyBnUxMzQzMwZ1MTM0MzQGdTEzNDM1BnUxMzQzNgZ1MTM0MzcGdTEzNDM4BnUxMzQzOQZ1MTM0M0EGdTEzNDNCBnUxMzQzQwZ1MTM0M0QGdTEzNDNFBnUxMzQzRgZ1MUJDQTAGdTFCQ0ExBnUxQkNBMgZ1MUJDQTMGdTFEMTczBnUxRDE3NAZ1MUQxNzUGdTFEMTc2BnUxRDE3NwZ1MUQxNzgGdTFEMTc5BnUxRDE3QQZ1RTAwMDEGdUUwMDIwBnVFMDAyMQZ1RTAwN0UGdUUwMDdGAAAAAAAAAf//AAIAAAABAAAAAOIB6+cAAAAA5F+vtAAAAADkX6+0";
 
     /**
      * Same font as above, but in PostScript Type1 (PFB) format.
      */
-    private static final String TYPE1_BYTES = "gAHhBgAAJSFQUy1BZG9iZUZvbnQtMS4wOiBUZXN0IDAwMS4wMDAKJSVUaXRsZTogVGVzdAolVmVyc2lvbjogMDAxLjAwMAolJUNyZWF0aW9uRGF0ZTogVHVlIERlYyAxMCAwMDo0Mzo1MCAyMDI0CiUlQ3JlYXRvcjogRGFuaWVsIEdyZWRsZXIKJSAyMDI0LTEyLTEwOiBDcmVhdGVkIHdpdGggRm9udEZvcmdlIChodHRwOi8vZm9udGZvcmdlLm9yZykKJSBHZW5lcmF0ZWQgYnkgRm9udEZvcmdlIDIwMjMwMTAxIChodHRwOi8vZm9udGZvcmdlLnNmLm5ldC8pCiUlRW5kQ29tbWVudHMKCjEwIGRpY3QgYmVnaW4KL0ZvbnRUeXBlIDEgZGVmCi9Gb250TWF0cml4IFswLjAwMDQ4ODI4MSAwIDAgMC4wMDA0ODgyODEgMCAwIF1yZWFkb25seSBkZWYKL0ZvbnROYW1lIC9UZXN0IGRlZgovRm9udEJCb3ggezEwMCAxMDAgNTAwIDIwMCB9cmVhZG9ubHkgZGVmCi9QYWludFR5cGUgMCBkZWYKL0ZvbnRJbmZvIDEwIGRpY3QgZHVwIGJlZ2luCiAvdmVyc2lvbiAoMDAxLjAwMCkgcmVhZG9ubHkgZGVmCiAvTm90aWNlICgpIHJlYWRvbmx5IGRlZgogL0Z1bGxOYW1lIChUZXN0KSByZWFkb25seSBkZWYKIC9GYW1pbHlOYW1lIChUZXN0KSByZWFkb25seSBkZWYKIC9XZWlnaHQgKFJlZ3VsYXIpIHJlYWRvbmx5IGRlZgogL0ZTVHlwZSAwIGRlZgogL0l0YWxpY0FuZ2xlIDAgZGVmCiAvaXNGaXhlZFBpdGNoIGZhbHNlIGRlZgogL1VuZGVybGluZVBvc2l0aW9uIC0yMDQuOCBkZWYKIC9VbmRlcmxpbmVUaGlja25lc3MgMTAyLjQgZGVmCmVuZCByZWFkb25seSBkZWYKL0VuY29kaW5nIDI1NiBhcnJheQogMCAxIDI1NSB7IDEgaW5kZXggZXhjaCAvLm5vdGRlZiBwdXR9IGZvcgpkdXAgMzIvc3BhY2UgcHV0CmR1cCA0OC96ZXJvIHB1dApkdXAgNDkvb25lIHB1dApkdXAgNTAvdHdvIHB1dApkdXAgNTEvdGhyZWUgcHV0CmR1cCA1Mi9mb3VyIHB1dApkdXAgNTMvZml2ZSBwdXQKZHVwIDU0L3NpeCBwdXQKZHVwIDU1L3NldmVuIHB1dApkdXAgNTYvZWlnaHQgcHV0CmR1cCA1Ny9uaW5lIHB1dApkdXAgNjUvQSBwdXQKZHVwIDY2L0IgcHV0CmR1cCA2Ny9DIHB1dApkdXAgNjgvRCBwdXQKZHVwIDY5L0UgcHV0CmR1cCA3MC9GIHB1dApkdXAgNzEvRyBwdXQKZHVwIDcyL0ggcHV0CmR1cCA3My9JIHB1dApkdXAgNzQvSiBwdXQKZHVwIDc1L0sgcHV0CmR1cCA3Ni9MIHB1dApkdXAgNzcvTSBwdXQKZHVwIDc4L04gcHV0CmR1cCA3OS9PIHB1dApkdXAgODAvUCBwdXQKZHVwIDgxL1EgcHV0CmR1cCA4Mi9SIHB1dApkdXAgODMvUyBwdXQKZHVwIDg0L1QgcHV0CmR1cCA4NS9VIHB1dApkdXAgODYvViBwdXQKZHVwIDg3L1cgcHV0CmR1cCA4OC9YIHB1dApkdXAgODkvWSBwdXQKZHVwIDkwL1ogcHV0CmR1cCA5Ny9hIHB1dApkdXAgOTgvYiBwdXQKZHVwIDk5L2MgcHV0CmR1cCAxMDAvZCBwdXQKZHVwIDEwMS9lIHB1dApkdXAgMTAyL2YgcHV0CmR1cCAxMDMvZyBwdXQKZHVwIDEwNC9oIHB1dApkdXAgMTA1L2kgcHV0CmR1cCAxMDYvaiBwdXQKZHVwIDEwNy9rIHB1dApkdXAgMTA4L2wgcHV0CmR1cCAxMDkvbSBwdXQKZHVwIDExMC9uIHB1dApkdXAgMTExL28gcHV0CmR1cCAxMTIvcCBwdXQKZHVwIDExMy9xIHB1dApkdXAgMTE0L3IgcHV0CmR1cCAxMTUvcyBwdXQKZHVwIDExNi90IHB1dApkdXAgMTE3L3UgcHV0CmR1cCAxMTgvdiBwdXQKZHVwIDExOS93IHB1dApkdXAgMTIwL3ggcHV0CmR1cCAxMjEveSBwdXQKZHVwIDEyMi96IHB1dApkdXAgMTczL3VuaTAwQUQgcHV0CnJlYWRvbmx5IGRlZgpjdXJyZW50ZGljdCBlbmQKY3VycmVudGZpbGUgZWV4ZWMKgAI5FQAAdD+EE/NjbKhan/77ULS7JzAqXMCrbi+Vm/INMgw3PCEo0KDOcHKx9nKgqjjDwOzrBLRMsXShwxYS1x/6IMkJVCVjeDcveVsL8pQfQ38Fn0GuBZjABRX+8YczNVfzLOMqnufUurZdpTQ/knB+LPzz6M5Eblraw5/Dfs5ktos1bODXEPRbHn8s12iryhQ2CDZodhoQCUZBYtBUwfa/LEajGbPGZFKHYxbBOpJkVtNmKVj9VnQNWFZzbmEE+BPtMZFWd3k07rHFRFrmv27lnlsZcItCh9tLm6+YgpGrwG/ed/zDHuFzCpT7xs7MdEpZqfajjiw9JKNtvO6XgdQ7y2rxwhv69q6/DIarClaEsha9+rFXfYTEkK8BcaUY1RI7beRwxnGx8Mt8pafG9aKKUpeQEJnqFv6Bk9Kz6/t+fAPkHdv8KUIErVw3AxMUFg63Ti+yeRa+1QQ7vDTTkV3O3Obim9olUKuQDhfmH2uWx+K3iBXFqwCLQTC/S/W/LDn9UCsxsphc4HA1txBMdO2NO8rPec0i5GLWOZZI5tOxhUsjPXLloUXLWOkU3I0wBTXW8TlAV2yBn+EPJ4XV14tyCoWHanYChLFqYcChHUHj+0GKluGz0gfPNQ4xf3u6+jyJLmvDFxiNxtSNAud0yBZx12ouXbVSeHGYXWk84KA/Sus2DDbG/E6H+kx2MfnEVMz2yZm/lW6a4w5Pevvdoxfj9BMLm1dBkDCxHQsjw1dbv7yBz3j6kibdv2I4JFxLoEW8qsxcH2SXXgJpM3KrNQlPRIqq8IKmxH3ZllsL/QQ8YJFg+KJjygCl9QOmrL/1FXx/JXmx0m6ynXaUfF1PwtiP7e1ISNfaExaiL1C9OtTK2T4h2WhRPW57ycPj/dYRfjKD7OvXXYQ+Co+s+jCWDRpbwGTLlDP0XQFMBNxx4cBogjdx6ouFfm8lXgfeQf/GC0CtQolv6YH1O06mdXeZ1hqAFwHALulGBr2WdAoV9wBD5SBSeMeIV3waNCP5P0xB7rP7uXTZv/oscgXK/61/3tsjyAXyZASQxvMf8uyWsThQA9TTEOM1o28z9bj6Yhs0Snwl2CxemFy3xgyidcNyBDRsCDFwYKjsejtr9sZGIXAFJK2djcN8aUa549kahghsM9NAB65fQFOwjWjPAZEnunfOsU/LXlWK30nIkQBl+0U0yDsCS6VOi3PKI5fFU4AoRKo71Ax77FoD2fNw16GFRgRagDsfvPWGHutBKIxwbPNTOks4YU8I+pzT3AGdID63P/cLQNDKDfhj2MX+jsr9J7cbAr9GipMFwap2Jls4jSt7wmKqfH/3aQYFwr0OL4EWYKcPGngbKXZU8/q4CkEc2Udvd+jwSDZGPSrMD/dd1b1WuZJfach8jzjYSrqBYqw9fJ1TN/TAr6bltKUFoIHGMArP5qH2RSGq289zzT5GO1vVBHCpBHHGdEYyKBGnYtcOJ+HXNzynHxP7pT+CbBux+zWpg681ryr4TTuVQj2nnBDxfoFmuWIx1wnANhjGXI3Hm/H/X031UQHeONr6mjapeuElW7P85UsunaWeI7Kaz20CH3jEZSq0Olc/qrT6pY5rb7Dtg0Hiue+VXSZquOKbTBMlbWL9zEkrTWWApXDmKjSlRkbf9IlVFebl/KO14wADGp5Q6BjOkl57wNPS/JI/amh72Acy5LEfYHXGMFvMfZ0ZElZLNlstV9YMGD5hPz4M/ZA2O9TMIhj7cVMacHAmV/GTyFIGkONjEM7Z6Cz6NOVBFmkolHa5SHOZMZ2NIy6RVaVi+agAZWSMz6Gt+h1zb7+B9feaArb92rJNha/+T5CR/0p+1fW01vDHSwbX8tkR9CS87ijM0VB/HV9ZHV5OsOqU5NbaIKESihbglj772nnG0iLqt55ZY34M818JpnnCU1oTG26tcbLOGcnfg1z9gSCcD05uG5oI1QmTLlY8iOlbbDf5sZeSTcQp/mWobcEXsTzx3tLH9nk6FZSnUp7Os67Eb3zhe69rLsEBsQrOAV/uKm+Iq4YUQQPjtj3vClIyIMT3i9Be9Yug4qZbl1BiTRLeLICi29JrbQvDBb2t17fIU1f6QmeNVnoT9UuvTBxsUOc2TgmO6SjHP56iAhwfdzIL8RWyMTfR/gaoQ+nwABwi0Z5+9+/hJAzTQby9VRd46WnCVTe+JuUjNt+P1gBa8UfpKlsW9D0PxMtBmY2k4POt3bYDzWnotzEyqBfTksuH7xhZJE5l96VnsBmmJU0qdUFymA6rHunbcaxZXYWa5KlnQvAqM2/Osz5YkNwWUheteEOc8czbDaL7PFZW8kKSAWKBVbCU17oU1sidYJhQ7hy1Bn39pJJcJi7zHnYs9E1Qn0IDcP2YylXdU6i685jTKaLA6dWcFuoHhhHF8tiEcWFyxj+P7wx15mbl1B6kwh3Omot4fA9sPtxbbATz0ElHXM7eTB8jsQBuH8CShTwM7X6wG+M0W0aT4MBE5IjD0n5et7A3cJD1vxo9Td149OWBycfpsmcCwyQfwrvpo6p4dCgju+x5GJ/E3DjzU1lKqmdcEl+wuTP/7Cl2vE60lg8hyeVf99lhycgB85UD0ZDQY+H5zHMF0sH4PJ9CXJFDZdaaeSJTCYpFc73Ttk/syOd91qMjfNFOXua+3pzJnwoz/iis54sbgLCfnGX3yGivMOrgGb2HcOWoVWOhGhzjE3fna21bAS2O5mMsvJGl1vpB0g9qZqSE0afF9KLi+SvoH9yu/Ui9NE3fgz4oxawafRJpoPubIG3ZBDTSxuSIcLfSfMu4eUXTsfB7n2/8DXdb6GqkH1du8ZaJ/KrfgHxa8z+AUaXDfKfJC6RT3f9AgKNMX+Dhzlc71ly1Lcmr6toErG32VKnvdIwMjStMTDxvLiMExCkpIkz1LI1zNPHThh4dgCpYOYmcGBr0tQ/sbw+Bj9Ra1z7maiQs09OoI5bAwkkGQhK8cMVL/DR6tIfcxxAUzjo7Bb706q2qr5TrVGF7/DbQbbDFCj/+OeUBA6NyuMO26mA7+T9KA22UVP5r05R5z2HA6yVZ3o/zCBD3p0HvlpiV3MnIhppxgShfOKXzQRoGcCmhxbHJtsFgs+/BMUPrXdwvArl882UbAyNWTXM/N99crf24ATi7mekTfYrupH+imr6ay1JLqVsbb5V3TJNibiRsVoJI8RG4Ymqu+pJHvjXU7aIuX/OHLMGznB7JP6LV2O0IAk4MItP7q2N6u3I3MIRhbtyrE3N2NkvLwEi2oK7inxqDzwbWlX4L5RalxBO4PLgQUjX01RxykUBsSg2GRbHxX3vT1Qxiyi1C/N5WP/fu8jMzT/X3Akx1yEinQFK9JvuC0f2U/paJamt3kab0Lap4HVnoga+emmxIkjz3UzC+zsGg0cLwEMY7dR8bFivfroAMgynqfgCYwSeFYCWbOrA8Wo12UNGSl3oE+xCMfz6vLvkotp0Woegf5XKshlqLJslQjSBxnjks/k/nGt2cABNZ38L4C8J1IZn7kHnCcIWn6ALn7D0AC5//Mjc+NH+TxAAJ9xnCrgwSf3xIpMt3nQkjXkkT/Rvh1Hk/v7RwYHlU4s5b3acCDJWN3HsMKKjESakM4+5i4+I3WNjnVGUqS4x17pX0KkHLfywKVg5IKjqW7eM6Kz6lG36xOgbG78vySxSiu+9xh97Bv6Ev2e0nYjtTRBwZuwPKGUymrlmKBgwU/kvi4SapC/xXsVWqaS+RM0CstLvu00UbuVNhYRfuEO7bYN3lgQicxK1pXqf6bz1lYZ3fMm0kr9wNetnMl+/wsQV3qVfoC7Z3ykW4mMxtYz6IkfJ6i5lTGytU3UGyQEXvaKb0WvywSiJt6ieXXpJN/z9/m+AHFAPq7OzGqDkri+Ce8NxLU3vHl8QpaJtX/4zZp1Q6/SKGcWe+rAriU5aIy6WYYogaJfgRfYXO4kddrDBEfy09PpeI+nMDTWO/HD/IeXHY1z2HpyZJsGo9SM7CaE/Z+ovSXjIjh3YlPSMG+apFiNXe1Aq66s/1dk3f+3YO1rRGNsTYhiLSFVWQSvzE/xM2UOeoOC5k3nAKB38SoveuX8EvbdVP8YgEkMClJUjinSjZvZY3esyLQjMPd45/1ZcoX6u7EnUNMP+9hyUZ2Owb7YV4RTmPAf9hkXE7bK7qVnFsTgLoarRfeYjgXLf9kez7Z/GQi/HqJRyX3Voh6RhEN8fJ61d8tAMC2vy5IoQLyPqyVnq3L5qeA6vKMSEeLF/i9zBqUJA4T1rfEfWMOPjXydg/VRoj3zS+91gtXM6bshSIHUKUrrHjK/bq9Oa4mEtP9bfoWKcybuZgENB/uatiUGtYFB8nFbO2qgSuJ8YdmHXhABG+mt1QZvHD0EstfjbC8zaT1o9GOPqwbv/F60lRDbIOXRjn9IENptVRZI/ZeYHB6pyOxDmFGlQcxs3axa1bX5yBlmYvr96Gm9gIL0rCw7kO8NHB7aTOUQm3j8MBTe54h1TgDSpsK+W60t/DDX0WDlXcqxev422fFEm3URF9Cipw/NJSXSV4ELwnT6ZjV0xnI7ooz6PBPcfVTEJtymuYd5oWBAGK3QgpNg41c09DuiAST797/UOO8HK8zhK06nF/jWzyPAtbXXCgvqSH2yk8zJDKk/d+Xncb5UsH6VUmEzZbiie38gysjOevISf3d7yi7hu/YEgiwGND2+AlLYV+5d/pMWthxGpHWmEAfBVY4b83VTNDlD6z51akm+RY06HkKM+Mn0byZlopP2MIxZluvfxVK/SiOm5TM+7T0SBlkCEBQEhx5X4h2W1lfIGOHA8RLHfXWLjX7b/PS0rIOZsjplYwg7SA7n/HzukyYassHdDP67wDmMG3bGFYYCsB+9M5JumEGhDpCoYC5SOd6lST+1YGyNs9xiF9hYRtp1Q+7blpsx5OVpdQwctuLEJnciPc5F5hJ7D1qWLFLStTbCPnNxqUtTUAD8mGbBvve0ic+YlKrM8ZdPIzmX0Y0R8GqcEw5wHXoOxedf6kpppOEO+9J1xCKNdAxFbTZqkRplSc96M4rNn8JRTP7g7hecqGaMkL/7rS+fCJj7oBIggyGK9iKvzO9/qx/WCcXf39LgzzT3ZyQa61S0T4z+bNe0nnXzrQmaDMSXyuzNpCR8woWEq5u5dh3ZY/ygwB953URXyjyO9g6RfDaZ7TXPdzrbeQ8Oo9avQTLapa77v3fGyF2mrrz2KgBF+AW99iDh/0pVCtwsRvA6QZMkCBl54O1TEb3Lmrd9dlGFLkRpRfap3Mi1zFqyjRl+c5ENgyfiqVwo/omZS/kjVqQqtAXRw6p/cIaEQRffxvQ3DVJwPplyujMqHb8oiE/fLYVY/qSFTAh5vs60AiZAVpq7h5vqtQtXdiEDs0auIupihC/uxKajYHQ/DohM1QHE+M4DF2itDJf9Go8gy/mRY47vK6IwwNy9TSFZCioIKOlR3LOde+6GcGwYn3i5mSCknfQVydkPHxkHWXIj4gg78y1RUBFgdV3/b7wJ2c+FCQHu/+4RZ8FwlbLBa+zotTpMtU2XGJbQ3KDYYkmjDvXkurqevIZMqjuBOF30b0xqxjC/kNgaczjsj3maTG5yjvCqov98LQIZN7IimQanoM6RMfof3+eZLIV6Uay/xQwl4Hr/LualgYI68MCRKr/h8J/V/o+0OtfLgbTp+UGn2949BtVwxNbR1Few28a6cRrNKTvCFC/AnRTPmUoXgYM2z7/P67ZAJusnLkrTfNoavXFOVgM1hmxCeTtSsBeN/S4cVCUPjg5/UX5uEaIdssVtQk6rTwABW88l6SRsBr1y57hSAXxqCbzvmNi1vbe0icG0MPR/3FuipycvW8w8dxpp86gAGGBG9n/wa0/jWNc8P3kbWbILfMGt8iCjMaAm495oK9cQHrRs6Yp9IJikCzPQk8GaqiZ6V2i9tsOjxyUXuG8MJegMH+3xwncHTfIU/Xw4Y9XmfrNTw1DtcmRgfY0MqkcNa/IwBjB/U7Xx9GLcflIF2T6VcsYFyJiyW3FDLNLOqWkVTG/t82TAs1jzIBz9ZL6lxRm/vcEQql5ApmAU69DCulf1FciksWVGuvpSplApgSeRlfDvRgj0OZ1ViV/nFZJUok9n2V3Qi+BFM3qUWE6s5jD4rl+RaaM+dSo3yKi3ykpuqs0lhvPZMyFYwP8OeQH7rKf+oP3N4LMmAj7Aw+9PcdxarZYQFWY1X93oY7vWm5OIUYHE1lTT8fD4e317PuJnkAh5Mf40fVMJdiMkFU6L4lWK0T1cLWanSG57RaLugCV51wz/LwkliHf5BQkg5yWdm7kDUYj5YIjFyOPtnA23yLoQG6lkAG/G132Y5lh3yJ+8wfQjJVxRO4eTnMNr5shz+2RmDvVVgvGcWXnjLkin8tx12F+8hjgCDnHFJGarimNsyLXAmzH4k5jAaYUBN+soYtTZNTkKScuIcGpcjK9+9gkTTkU0Y18trJfoof94R9kE2s6pTa+QmVYhY2AuI1Po1xmAtdkwjO6VhJl3dHDC/8MVsF2qgbNasaaXFnjvRRZCoszskgYDgQAOiySLt4j7wkaR4m8OzQb2h9DOEMHg4opCHf+ac3+T7l53E8ZBb6teOCHsOVHr9uPwTuhcs5/whJmrDypKUKWVC1rfpFE7HBuiPIftm2OYmgszWMlSWQDJRRWdec/R39T8N1cLo8rAkGF89/wIPasWhgGrv6hjS95LlB/z4NhVDK3/IvsNvDei8H2eCFWZzWBdM49CfcEmzSJKLOrN4053kkFM87XskTJIxBQOVKnX700J3K+ZERkyjS03t4xPCgaE6A3mzxNC3nsbXk5GHUE3C7k2esm7VZeixJQg6VUAkED8enaP3y0Jzz+qVLfuNrg+kzJoyaKlyTId6lAoftXv58qn+TuLJbPONek+Vda36Da6UxrcHjhEnN9QklI9e/RXUt58RUiVXrOKncsPvSQZTvCKKZWEK/6J66oE0h5JBbNIU0U18SqzmN/dWAV/2yBemo0YQ2lptRJ2ayS83C8xSnuQH3q31jaxwnC1hxXmRIjWWe5Lo4QIGnuZbKnoZNkffZ0k+c3Z8epK/V1W+EqUyxIw1CqymYlBYB5PDYqTe527xNVpn51EE6VeyhQpepKYACPNQb9VCHjwT5kjX4xdxKCqfkE27HKYn9g2EsU+f9B1upDybnpzyXbhA23JBHrbonaBrF6vXzCi8KVur+/3eGTZXRhy+xTtzpHDMjpK51SoEiLIntftx+LFsw/C/HgAEVAgAACjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMApjbGVhcnRvbWFyawqAAw==";
+    private static final String TYPE1_BYTES = "gAFSBwAAJSFQUy1BZG9iZUZvbnQtMS4wOiBUZXN0IDAwMS4wMDAKJSVUaXRsZTogVGVzdAolVmVyc2lvbjogMDAxLjAwMAolJUNyZWF0aW9uRGF0ZTogRnJpIE1heSAzMCAyMDo1NTo0OCAyMDI1CiUlQ3JlYXRvcjogRGFuaWVsIEdyZWRsZXIKJSAyMDI1LTUtMzA6IENyZWF0ZWQgd2l0aCBGb250Rm9yZ2UgKGh0dHA6Ly9mb250Zm9yZ2Uub3JnKQolIEdlbmVyYXRlZCBieSBGb250Rm9yZ2UgMjAyMzAxMDEgKGh0dHA6Ly9mb250Zm9yZ2Uuc2YubmV0LykKJSVFbmRDb21tZW50cwoKMTAgZGljdCBiZWdpbgovRm9udFR5cGUgMSBkZWYKL0ZvbnRNYXRyaXggWzAuMDAwNDg4MjgxIDAgMCAwLjAwMDQ4ODI4MSAwIDAgXXJlYWRvbmx5IGRlZgovRm9udE5hbWUgL1Rlc3QgZGVmCi9Gb250QkJveCB7MTAwIDEwMCA1MDAgMjAwIH1yZWFkb25seSBkZWYKL1BhaW50VHlwZSAwIGRlZgovRm9udEluZm8gMTAgZGljdCBkdXAgYmVnaW4KIC92ZXJzaW9uICgwMDEuMDAwKSByZWFkb25seSBkZWYKIC9Ob3RpY2UgKCkgcmVhZG9ubHkgZGVmCiAvRnVsbE5hbWUgKFRlc3QpIHJlYWRvbmx5IGRlZgogL0ZhbWlseU5hbWUgKFRlc3QpIHJlYWRvbmx5IGRlZgogL1dlaWdodCAoUmVndWxhcikgcmVhZG9ubHkgZGVmCiAvRlNUeXBlIDAgZGVmCiAvSXRhbGljQW5nbGUgMCBkZWYKIC9pc0ZpeGVkUGl0Y2ggZmFsc2UgZGVmCiAvVW5kZXJsaW5lUG9zaXRpb24gLTIwNC44IGRlZgogL1VuZGVybGluZVRoaWNrbmVzcyAxMDIuNCBkZWYKZW5kIHJlYWRvbmx5IGRlZgovRW5jb2RpbmcgMjU2IGFycmF5CiAwIDEgMjU1IHsgMSBpbmRleCBleGNoIC8ubm90ZGVmIHB1dH0gZm9yCmR1cCA5L3VuaTAwMDkgcHV0CmR1cCAxMC91bmkwMDBBIHB1dApkdXAgMTEvdW5pMDAwQiBwdXQKZHVwIDEyL3VuaTAwMEMgcHV0CmR1cCAxMy91bmkwMDBEIHB1dApkdXAgMzIvc3BhY2UgcHV0CmR1cCA0OC96ZXJvIHB1dApkdXAgNDkvb25lIHB1dApkdXAgNTAvdHdvIHB1dApkdXAgNTEvdGhyZWUgcHV0CmR1cCA1Mi9mb3VyIHB1dApkdXAgNTMvZml2ZSBwdXQKZHVwIDU0L3NpeCBwdXQKZHVwIDU1L3NldmVuIHB1dApkdXAgNTYvZWlnaHQgcHV0CmR1cCA1Ny9uaW5lIHB1dApkdXAgNjUvQSBwdXQKZHVwIDY2L0IgcHV0CmR1cCA2Ny9DIHB1dApkdXAgNjgvRCBwdXQKZHVwIDY5L0UgcHV0CmR1cCA3MC9GIHB1dApkdXAgNzEvRyBwdXQKZHVwIDcyL0ggcHV0CmR1cCA3My9JIHB1dApkdXAgNzQvSiBwdXQKZHVwIDc1L0sgcHV0CmR1cCA3Ni9MIHB1dApkdXAgNzcvTSBwdXQKZHVwIDc4L04gcHV0CmR1cCA3OS9PIHB1dApkdXAgODAvUCBwdXQKZHVwIDgxL1EgcHV0CmR1cCA4Mi9SIHB1dApkdXAgODMvUyBwdXQKZHVwIDg0L1QgcHV0CmR1cCA4NS9VIHB1dApkdXAgODYvViBwdXQKZHVwIDg3L1cgcHV0CmR1cCA4OC9YIHB1dApkdXAgODkvWSBwdXQKZHVwIDkwL1ogcHV0CmR1cCA5Ny9hIHB1dApkdXAgOTgvYiBwdXQKZHVwIDk5L2MgcHV0CmR1cCAxMDAvZCBwdXQKZHVwIDEwMS9lIHB1dApkdXAgMTAyL2YgcHV0CmR1cCAxMDMvZyBwdXQKZHVwIDEwNC9oIHB1dApkdXAgMTA1L2kgcHV0CmR1cCAxMDYvaiBwdXQKZHVwIDEwNy9rIHB1dApkdXAgMTA4L2wgcHV0CmR1cCAxMDkvbSBwdXQKZHVwIDExMC9uIHB1dApkdXAgMTExL28gcHV0CmR1cCAxMTIvcCBwdXQKZHVwIDExMy9xIHB1dApkdXAgMTE0L3IgcHV0CmR1cCAxMTUvcyBwdXQKZHVwIDExNi90IHB1dApkdXAgMTE3L3UgcHV0CmR1cCAxMTgvdiBwdXQKZHVwIDExOS93IHB1dApkdXAgMTIwL3ggcHV0CmR1cCAxMjEveSBwdXQKZHVwIDEyMi96IHB1dApkdXAgMTMzL3VuaTAwODUgcHV0CmR1cCAxNzMvdW5pMDBBRCBwdXQKcmVhZG9ubHkgZGVmCmN1cnJlbnRkaWN0IGVuZApjdXJyZW50ZmlsZSBlZXhlYwqAAo0WAAB0P4QT82NsqFqf/vtQtLsnMCpcwKtuL5Wb8g0yDDc8ISjQoM5wcrH2cqCqOMPA7OsEtEyxdKHDFhLXH/ogyQlUJWN4Ny95WwvylB9DfwWfQa4FmMAFFf7xhzM1V/Ms4yqe59S6tl2lND+ScH4s/PPozkRuWtrDn8N+zmS2izVs4NcQ9FsefyzXaKvKFDYINmh2GhAJRkFi0FTB9r8sRqMZs8ZkUodjFsE6kmRW02YpWP1WdA1YVnNuYQT4E+0xkVZ3eTTuscVEWua/buWeWxlwi0KH20ubr5iCkavAb953/MMe4XMKlPvGzsx0Slmp9qOOLD0ko2287peB1DvLavHCG/r2rr8MhqsKVoSyFr36sVd9hMSQrwFxpRjVEjtt5HDGcbHwy3ylp8b1oopSl5AQmeoW/oGT0rPr+358A+Qd2/wpQgStXDcDExQWDrdOL7J5Fr7VBDu8NNORXc7c5uKb2iVQq5AOF+Yfa5bH4reIFcWrAItBML9L9b8sOf1QKzGymFzgcDW3EEx07Y07ys95zSLkYtY5lkjm07GFSyM9cuWhRctY6RTcjTAFNdbxOUBXbIGf4Q8nhdXXi3IKhYdqdgKEsWphwKEdQeP7QYqW4bPSB881DjF/e7r6PIkua8MXGI3G1I0C53TIFnHXai5dtVJ4cZhdaTzgoD9K6zYMNsb8Tof6THYx+cRUzPbJmb+VbprjDk96+92jF+P0EwubV0GQMLEdCyPDV1u/vIHPePqSJt2/YjgkXEugRbyqzFwfZJdeAmkzcqs1CU9EiqrwgqbEfdmWWwv9BDxgkWD4omPKAKX1A6asv/UVfH8lebHSbrKddpR8XU/C2I/t7UhI19oTFqIvUL061MrZPiHZaFE9bnvJw+P91hF+MoPs69ddhD4Kj6z6MJYNGlvAZMuUM/RdAUwE3HHhwGiCN3Hqi4V+byVeB95B/8YLQK1CiW/pgfU7TqZ1d5nWGoAXAcAu6UYGvZZ0ChX3AEPlIFJ4x4hXfBo0I/k/TEHus/u5dNm/+ixyBcr/rX/e2yPIBfJkBJDG8x/y7JaxOFAD1NMQ4zWjbzP1uPpiGzRKfCXYLF6YXLfGDKJ1w3IENGwIMXBgqOx6O2v2xkYhcAUkrZ2Nw3xpRrnj2RqGCGwz00AHrl9AU7CNaM8BkSe6d86xT8teVYuOk926Xj4/+Kx6rfu526Ylz91kxebopcMvql6ysRVzzSGsW2ec9ZPJo1Q/WKb+tCvBm8OdUnRi+DldIajpytyl08TmlS+IRUcHZbxoIjxb7ZCvF8hd03yDhs9bsUSO6h7jbhegenLIiQPX7RtsGAg3logZLD0NUjcAm2tKBieMHhMxAD89lVmuMkNj5r6EaixXvkvhgqzhjPExdu30Knife5IEnlCvIlMCh1EXQsY9KRkzeTRTKfnZTJ/idze+cX0nCEGcFrvCCjZRfNuaLRHx73o2KlDHmoYBm1mFEEvfUReQxS987AiVfSF7cs8IrLEqV9qe2mCAv7ATbVUFbnvYxTBYvHL9sc4892rLrjSu/yP5RZmmIMOpTH8CStLw1zGAcXH3W3ZfPjQkEA4jzvo1U5Oi9EkBKqlgqjj2pFLWepwuNG/L3Iyr36frW6NFtqCxyVQYcNwOTnmQjY0LXPAKxyz2l+xyo/gcDY8nqtWms5aqINgemqM0pG2wBt3GawARbEVkkKllyB/WJbRw0GGHktmj73ixkTulD6nHZ+vMd+aS8iKXPa2ASEOPpxp515DZxg+VYZIrM0h4mDdRff4To/8NKs7Kx4IZx2qzlhIKS2zHpLwuY/U2Wt80e9nqMCFEtnS8sKpcy1rrE9FzXsFUNtYE6LdIat4ygQxoq24Y6D3bfDpl3E8wMvECaVCJX8lfBhQcGGU6+Jba1qfQ7jonjQM0zfoOwHrApk/dkPkSdjQy7UM+dZNMtgZf2N46UuWC2YCtcqCN1X+o5SpojTgXNmTjUy3KOy6L4GNYOxutsDhWiah6rJ+FGVL9D51MJvT3l02T1+LpNt8ZeZQSkZpx7NdFFTFA4/SE8zycfBLNm71Q9pjQKa30TnCY9ZkMEH9rnArLV0w2Gi6LoJoWpT7GoAB2Cdvi3x9wGDdt60K6oABWiD5mpAv4KfrJMBn5dRDJVyRPARXxwBUROAc3BxY8St3WuWKqDqqef0t0rlqAXGynPrcAjqFMXc/GBWORQ7W/dTvbu/eZb+apjKEX7szjaY4cSRsNge4gTyCEsfhLrdBkncM7up9jj206tIaqZQILxHAnrVwYplJ5D2EvSSLYvxFEVHSrI19aNJEvDK64tzXCV+P4yOCOuXpBmc15PDlrMQEauqrD+xneCO+CrCbudHXOJsbmvQq56+ovLp5SNBfdEPQpqo5tBgQaNHcEjg/iVt++uLxT3vAEFW5d7WXPMYdy+XqoMmdRDOzey0Mdx5BZ92rNM/LthQa6F54nvzkypM64HdxCYlri8cO3k0G6bp2eWdseP0P4zMc5QikuXc/Dr4NztBYe2yJLbLLesWSB8nOWcl+gd0GMX5PY4P5mn5WJDNStLWPdD9NapzMsyx6lZwR9Tfv/XSmay9LEo9YaaxysWfllDIasUCdvhZVi7LJvPu/0GbuHLOz9mP6prkF8h8KmjBYMlMktouA23G74M+Pkdfbj9KAM8zOYCgQFZUaXx3iZ4m3uBtDPeKjUcdFZSnHdW11eSv5aCz2fMbExV/qnPOSMbkR5rvpR71WwVZP6j3tNWr8jlPQ8d60k8jXPy7d8wjw9obnDEpvKzKreEzjfA0wCovNt7FLH9oxWmO5TF8JMg/U7+ToEv0fPAW475dXTXdue98/k/c+3+LCJNbHzBBx14CzpteKXKqGNA3jwgJUhfDsTISiN4gF222zIi1deY9BspjPl7jergbwh+ZPdfk2BLaPTDeNUycKdeiFoJEd8gKLvjMrnPa9IX4HwR9gJSjsQ0UWhnYuaXdk12zk8sVkGJAJLrphh5tHcd4LwG2rWcVXwM/2zw1YXQR+jffC1uxUEPVaq1fSf9RB6iEb8LgIollE+gDEybc+Dw3Q/gxVe5/Nu0vHHur6B+4YEcxvz3O5cYKUQTxDgG4mXJhqZ6z7etSWINChQyP6PUFFbsUIDXjfuHZ9oF4ce1NNOnn/RIwm/u/+AduDTtqloUooZjqak4VbvmBEZcW75liKm0MggeilL0nl5arItzTwE8OudJDBkJ/xnf1yZIgeFKSODIz5aQrIiSMJX3BGRxHEEQrm1xtwCfjtMPpFhFtG+o5fjMlCnowJ6+/HrG3FdZKn4/gv7qCxF2/3NW2J4OWuXbjEsUlSHu57DFvhrVl/q8jv81OfXhZKutYQWjaDWwOQHR+ym6wvMyQ9YfiiJpBXa+Ig9uGAbERyApc8wsCLcy0d8Msxx9PAfhrDa+Gf2yhYGA57t8iGxEcoI0A4B8zKVqYXKf4AdsrVzE9cUpfRN/HH8OGWyv9mKMTJyGJQql/OH5hYHnvJVKZXIz6l3nL/7gnpYaGtASiV1q+JwO7WSk1pfwT9SE4sFl7uS7f3pu4BwPhcz/wyN82f144yav11mrGqypOMaMDR27/L0sW1c3hWBBa8BMU/EuwF7ldclS9nxmFHOc35RLruyQ26cp1niukcpK42wg3ozqGQLoQRIoin0AWnUwnOmkdBEkILqFCiWgERDZuCB7G3pZJW/32HPgD3byO0lH8JF6OiINsUmM+75Y3qdvuepTHxXwpDa9Isero3x/f+UWGGUO12s+Ou2yQKtLsQaBNSTaGEBVCAtpJ58TgZ+KfVyhgRQdINr7GuGq9iRPQBY00anspxvsrhfffggqOariHO8h0jdEZPJarJJAufQbYgKiACtJ8iG6jlIs3GfWRI0jRYDw+kHPc2/A6fS5XGF360aX1I6iy5J1pZpN+6stJq5MQ8QRHopTJWQ0DW1Pq46BglmHH9av/X4tvLFFyyC4X6OB2jDb9+XwwcuJ2t/352IcJC06IsWKDsr6E6vF3hC3GUBUy9I7JbqlAh7zlYK52MITQzGINZD2p8+TJjmDycEr/UM/JHqBzbJniUzxg8vo2/FjpZggU8NuBsTZ5P/YZSgRsZcVKkhkGYAn+euvrQIiZ2LMwOygD0gW/zy7v+Z1aHfxKig7kkOR1ZuVCFE8FWx1unCnFHtkjFIx9JY4cYHboveIlF2IzNhfnKJncBt7DuZORqfAT3gQDZlIFNx06tSnTe1v5l7u7VSKMXRhc3bbeCqfvO/NSOqfLz1QYlj2b0C5sm0AcUe1RpC7rOu6muPLeJ38DOIhJHzs+wpqBZTHJr9zdnjZl+OyXaAAbgCsxamEQW91iGdRmVHqyT+0+XQxssYOF795eGYpsXy9Bik6Z4apt/AcuZQFu3XthVXvjyVCi0Rj3gXjOkFdT1YaiRe6yPRdBB2GorcxCzQQvjZXTuh5P4a7MD/6W0mJYoh0BzQHYC0O/T9v3d8GepAbQTytL7MWIWk9C2qZ0pPciuIfXNmGRWBUkCCts1BAsW39l4giNBCwDQ6CauWkz8iWaxx2krBQpKl0WyBBSd/SIJUFM4psvYNaGNk+xR18s0OrPqvxQvc3NNgVwpAljSM/wt3IzIcIsJHF/u0T60hXgEv4H0f44/SzROL0iGUZIfRZK6sJRGBQH2ZVrFCJ6ageJX7WTBLVwKAtxgIUK2dXAemsYgGm/CIe3JCmwL/YmEh8I8W4LrWzXq4vNF6/Sq1hQ2r4dndAO+HEZ8nYpPr+9pUCUgSvnN7aVWZpc/xJaj5L4U6W28hVZ2mb+UUKDpq0bSxKdkVr2SC/7Q/8WimMNDYCaExzXQ+RzZyv/4227pn/k3y1avulXGz3ujy+lqdciVVWHmPYyJPhqeoyDEkM6g46KL9kg912jsB1SGP7Yc2l7XENW59mh5RE+fNiW8wWjxW0Oa+xSe2+RTOgRA+Ojq2L8+g9sL7jKw7BPAPjnYTo8gMat4DurAKbJrtaRLZMzXkFyE7heHr9NsLJl/d1JLRwNoGDpnvLjyPNBUjW/2CTEEIyI6yq3oOJivAwe1yiJib7IUTkh5MCBSnEssvxOYJRUaR/ILAHMJpAoEV/VOCfBlh/I55gVYZWa+Y/5/AMs5Po1w9/18Q6V4ichv80Qr+Up7+2s8sV6zM7m78WMmQp3IR6uTJasqI2Vnr99KAY31BJVpBelRq2xjIruSHx/BAr2kSHA+Kuk1I9+Y1dEaSbfUpjcly0WDUh9x1VTkrUu1u6XN/i/SkFeO1k8o2o7s0rVXNI+VipXQt69H+yVDea7AYuvy9Rp2kKuq7o7mgcFCVq1Vbeyv++vDSKdYmKbyQ2N7ubU6u41Td59YNfRldl56ec0bl7hgyMUb/7/ifjdRXOVl1sTTMUiETnT+44vuAiiUeOHRgKmRlLgHp9iMnPPZVF3DqExLV1IPraZO/olA9QIc4bM2g6SPebITaH94rZn80oQzWzBAFUzK/B2vY39XGdPSTAZTFn1yAYcRHIhqWZs9+FtJvBN9f9lUxPFHUs3vyKBC8sFph/yee7KNIKyTinMNAs1+jcnVS4LPqR4L4cn3ancasZ6wBgexKIjjwf8KPkgUcMwZqk+KwDeJbmyGblqsRzSuhrwPq0U+n4n1ktcqI11Y4D/u93UrU04LgZwWPEZPrgjGUgciPrRa3BIJb6oT1s5VSfgiupwHaFYgF5sJ3VD0ZcT1zwdet8tPprxRq00SIZMZKZeVSIWD0ai82pPxH4PYLUGwUbW3ocaYouILRf9sF9DP1gaVfd4SDRUuKUtZRiG6lpSopmFO24N1vWq90caknzY91uUWX2v4+C/JHDd47e4h/g1Lf13euI6csefzsnQDTDsyrh5zSJDo26B81kY5RyKv+AnsvTnTl8uroRsh1KqeIUywpWImmlnnWT8rpNg822BjraGaWc9NHFzkUSmOmD/iJRdfRjno1JaeDVk8KBniY0vnMqdBG1BWRMsnUAhWxHJ4Jn5fXCltO2C5OV+x+jYocNhWw4Mgu3CVZp9erAEPsDEUsY4qaMitjRq6yJPn3nwkQRpFHGbXv187fPU/z8+BQ5/W4Qfg/qEmJKcp1T5VcrwLAlZQTomKAt/7xNlJIxlx9bCMVXnvk3Y8hB7kCTaSQmvjC8IXCHbJyMCFQV7qAKdmaihyV7zmpqWcDqfELQChm2KxmQJ1dPYJ1+jR+aYm3an5bPEoCdbsZauFF8qXHIhx8JKvRGgxPrTGHi8N5FcfuNsCA3xOkoSGX9Sxg6h5KEtoeFdkwf5BKqhJj5pcsBewAHkWng86BzAqt7R+a9TnyvLMWvmpI/0fkpRkbg731aWOnWOvbpz6f+nXSxGgrvs/B6xSgFPDo6Ty3ivL+CGitfK6XwdHA07TV/eK5vd5oyNe/Ay5wMdXiypEUWukN+jiuGmrVMkke/0DmXmtqqY3T45iLrqfgwRhXsT9kEdzcWVqM4OkAEqEzpjI0NHG74cslhQvDPbX/ZRp57/bcOuarHpCDakvzajblF2NXf0Wp0dO0NltExHFoY8myAlBu/SMn3VN6GF5faMq370MevoNi4eNRD8XiGUYh+QzVphqtLIeqyyt6W4MzTjwSLgAB0kITRYcG0KVi89iUgZMQdwIOfMUBmS/q1GpBtTFKqI2TwC3dz9oBnNzwi3Ru9yyNuX1mw1p0Sd8UNY0yVbdb7UrLrd0ldVrx2FWNVCEedkn0npe9xstIJvgMuRLA0DNN7vex3hfvGvV7qCuQi5ssNVYUkoyEjlFR3xCThuVCgwzK77JmvWMpeB0eR0O3SH9KK/1qaAkXK/bhyazFdT+WHrexsFYZuO5I1MiQWJzNDQ9r3act5mt0senky0dQ+Sb233mB+RX2AWxOf9SUcRtkKjiTvfSdcKHmLx7ns2F8MQdwFoKz7j4a7sPsuruL+BMHWuDj/VTfnVmG6nlzIjs92LVWKnZ010UOv156HJYQvhlSV+WzPv8EC/2A2LhBx0g1ZJ3vYQIu2G1AuhcZurtEOfbhcIsS6cq9P2YoRYTYTHeiXHNzKot/25uSAFs85GQhWyMz+2L3HBiszTmSdwtf0ZzHgGEBc90JD6yNfjwqF4FJ7AcuLYw5euNz/VEON3z2C021shibn6LGd4RjflA8XmBGSakJ0nkpplflYaQ9Awcv2eKYR4ebAVjhyErm4zHikUC5Vgtz/0UbghbNcX0RIEESW2GaGtFNYIYNPHJNtj4QMYLK7BrUOnzITF+Kx/FZG6oIeySnU+TJoZIkJBIqGLOYSkw+QuEbCbf1BM5nERddA8z+IFxYz7Goxg4XMpc3+L/Hx29UZzkNSY55Y2Swii1qxBWgBaRGpzI66cKfr6mHES+cbb9vNAdFPuBgJttyT/t3Jf+W5yRYt8M4VyIlEiUjAGqL3bqakDP5IwywMSpYeS1PmqWBsbUcV9bAavsLMnnEHvUue8GboIr+EeBMCk6XPBKFahrRZBTQq802IGDYOi++VjG7805Tleu2pX6H/IY/LDQVLnqVhxDaVonTvQqMffVvSwXp7EFNvR/XKxh+IJxO/W3tQeAi8Jn77E3itRU+tQEl8QQ65psW7FBQXujG6YYWK9XbPUPI/AkdVmaAuQQt7RPni0MhxB0Q8k6BqzhwbpyLMPa/XCkHdJLrO2xGupnrwYvt0OcF7Ia/hN9+HAekLtq8l+HcNGIY/JA2RPYOYGSEgAEVAgAACjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMApjbGVhcnRvbWFyawqAAw==";
 
     public static void main(String[] args) throws Exception {
 
@@ -162,12 +167,20 @@ public static void main(String[] args) throws Exception {
     }
 
     private static void testChars(BufferedImage image, Graphics2D g2d, Font font) {
+        testChar('\t',     image, g2d, font); // horizontal tab (TAB)
+        testChar('\n',     image, g2d, font); // line feed (LF)
+        testChar('\u000B', image, g2d, font); // vertical tab (VT)
+        testChar('\u000C', image, g2d, font); // form feed (FF)
+        testChar('\r',     image, g2d, font); // carriage return (CR)
+        testChar('\u0085', image, g2d, font); // next line (NEL)
         testChar('\u00AD', image, g2d, font); // soft hyphen (SHY)
         testChar('\u200B', image, g2d, font); // zero width space (ZWSP)
         testChar('\u200C', image, g2d, font); // zero width non-joiner (ZWNJ)
         testChar('\u200D', image, g2d, font); // zero width joiner (ZWJ)
         testChar('\u200E', image, g2d, font); // left-to-right mark (LRM)
         testChar('\u200F', image, g2d, font); // right-to-left mark (RLM)
+        testChar('\u2028', image, g2d, font); // line separator (LS)
+        testChar('\u2029', image, g2d, font); // paragraph separator (PS)
         testChar('\u202A', image, g2d, font); // left-to-right embedding (LRE)
         testChar('\u202B', image, g2d, font); // right-to-left embedding (RLE)
         testChar('\u202C', image, g2d, font); // pop directional formatting (PDF)
@@ -181,6 +194,12 @@ private static void testChars(BufferedImage image, Graphics2D g2d, Font font) {
         testChar('\u2067', image, g2d, font); // right-to-left isolate (RLI)
         testChar('\u2068', image, g2d, font); // first strong isolate (FSI)
         testChar('\u2069', image, g2d, font); // pop directional isolate (PDI)
+        testChar('\u206A', image, g2d, font); // inhibit symmetric swapping
+        testChar('\u206B', image, g2d, font); // activate symmetric swapping
+        testChar('\u206C', image, g2d, font); // inhibit arabic form shaping
+        testChar('\u206D', image, g2d, font); // activate arabic form shaping
+        testChar('\u206E', image, g2d, font); // national digit shapes
+        testChar('\u206F', image, g2d, font); // nominal digit shapes
         testChar('\uFEFF', image, g2d, font); // zero width no-break space (ZWNBSP/BOM)
     }
 
@@ -191,8 +210,9 @@ private static void testChar(char c, BufferedImage image, Graphics2D g2d, Font f
         int h = image.getHeight();
         FontRenderContext frc = g2d.getFontRenderContext();
         FontMetrics metrics = g2d.getFontMetrics(font);
-        String c5 = String.valueOf(c).repeat(5);
+        assertEqual(0, metrics.charWidth(c), "charWidth", c, font);
 
+        String c5 = String.valueOf(c).repeat(5);
         int ab1 = metrics.stringWidth("AB");
         int ab2 = metrics.stringWidth("A" + c5 + "B");
         assertEqual(ab1, ab2, "stringWidth", c, font);
@@ -226,6 +246,18 @@ private static void testChar(char c, BufferedImage image, Graphics2D g2d, Font f
         ab2 = (int) layout2.getAdvance();
         assertEqual(ab1, ab2, "getAdvance", c, font);
 
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        layout1.draw(g2d, w / 2, h / 2);
+        ab1 = findTextBoundingBox(image).width;
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.BLACK);
+        layout2.draw(g2d, w / 2, h / 2);
+        ab2 = findTextBoundingBox(image).width;
+        assertEqual(ab1, ab2, "TextLayout.draw", c, font);
+
         g2d.setColor(Color.WHITE);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(Color.BLACK);
diff --git a/test/jdk/java/awt/font/TextLayout/TestControls.java b/test/jdk/java/awt/font/TextLayout/TestControls.java
deleted file mode 100644
index ee15038a845..00000000000
--- a/test/jdk/java/awt/font/TextLayout/TestControls.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.
- */
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.Panel;
-import java.awt.ScrollPane;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextLayout;
-
-/*
- * @test
- * @bug 4517298
- * @summary Display special control characters using both TextLayout.draw and
- *          Graphics.drawString. In no case should a missing glyph appear.
- *          Also display the advance of the control characters, in all cases
- *          these should be 0. The space character is also displayed as a reference.
- *          Note, the character is rendered between '><' but owing to the directional
- *          properties of two of the characters, the second '<' is rendered as '>'.
- *          This is correct behavior.
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @run main/manual TestControls
- */
-
-public class TestControls {
-    private static String fontName = Font.DIALOG;
-
-    public static void main(String[] args) throws Exception {
-        final String INSTRUCTIONS = """
-                A number of control characters are displayed, one per line.
-                Each line displays the hex value of the character, the character
-                between '><' as rendered by TextLayout, the character between '><'
-                as rendered by drawString, and the advance of the character.
-                The first line renders the space character, as a reference.
-                The following lines all render the controls.
-                All controls should not render (even as space) and report a zero advance.
-
-                Pass the test if this is true.
-
-                Note: two of the control characters have the effect of changing the '<'
-                following the control character so that it renders as '>'.
-                This is not an error.""";
-
-        PassFailJFrame.builder()
-                .title("TestControls Instruction")
-                .instructions(INSTRUCTIONS)
-                .columns(45)
-                .testUI(TestControls::createUI)
-                .build()
-                .awaitAndCheck();
-    }
-
-    private static Frame createUI() {
-        Frame f = new Frame("TestControls Test UI");
-        Panel panel = new ControlPanel(fontName);
-        ScrollPane sp = new ScrollPane();
-        sp.add("Center", panel);
-        f.add(sp);
-        f.setSize(450, 400);
-        return f;
-    }
-
-    static class ControlPanel extends Panel {
-
-        static final char[] chars = {
-            (char)0x0020, (char)0x0009,
-            (char)0x000A, (char)0x000D, (char)0x200C, (char)0x200D, (char)0x200E,
-            (char)0x200F, (char)0x2028, (char)0x2029, (char)0x202A, (char)0x202B,
-            (char)0x202C, (char)0x202D, (char)0x202E, (char)0x206A, (char)0x206B,
-            (char)0x206C, (char)0x206D, (char)0x206E, (char)0x206F
-        };
-
-        ControlPanel(String fontName) {
-            Font font = new Font(fontName, Font.PLAIN, 24);
-            System.out.println("using font: " + font);
-            setFont(font);
-            setForeground(Color.BLACK);
-            setBackground(Color.WHITE);
-        }
-
-        @Override
-        public Dimension getPreferredSize() {
-            return new Dimension(400, 750);
-        }
-
-        @Override
-        public Dimension getMaximumSize() {
-            return getPreferredSize();
-        }
-
-        @Override
-        public void paint(Graphics g) {
-            Graphics2D g2d = (Graphics2D)g;
-            FontRenderContext frc = g2d.getFontRenderContext();
-            Font font = g2d.getFont();
-            FontMetrics fm = g2d.getFontMetrics();
-            Insets insets = getInsets();
-
-            String jvmString = System.getProperty("java.version");
-            String osString = System.getProperty("os.name") + " / " +
-                System.getProperty("os.arch") + " / " +
-                System.getProperty("os.version");
-
-            int x = insets.left + 10;
-            int y = insets.top;
-
-            y += 30;
-            g2d.drawString("jvm: " + jvmString, x, y);
-
-            y += 30;
-            g2d.drawString("os: " + osString, x, y);
-
-            y += 30;
-            g2d.drawString("font: " + font.getFontName(), x, y);
-
-            for (int i = 0; i < chars.length; ++i) {
-                String s = ">" + chars[i] + "<";
-                x = insets.left + 10;
-                y += 30;
-
-                g2d.drawString(Integer.toHexString(chars[i]), x, y);
-                x += 100;
-
-                new TextLayout(s, font, frc).draw(g2d, x, y);
-                x += 100;
-
-                g2d.drawString(s, x, y);
-                x += 100;
-
-                g2d.drawString(Integer.toString(fm.charWidth(chars[i])), x, y);
-            }
-        }
-    }
-}

From 9c74d545147c2eeec187df552037a12b6b476a61 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 3 Jun 2025 23:28:00 +0000
Subject: [PATCH 830/901] 8358158: test/jdk/java/io/Console/CharsetTest.java
 failing with NoClassDefFoundError: jtreg/SkippedException

Reviewed-by: joehw, jlu, iris
---
 test/jdk/java/io/Console/CharsetTest.java     | 73 ------------------
 .../java/io/Console/ConsolePromptTest.java    |  5 +-
 test/jdk/java/io/Console/RestoreEchoTest.java |  5 +-
 .../java/io/Console/StdinEncodingTest.java    |  4 +-
 .../java/io/Console/StdoutEncodingTest.java   | 75 +++++++++++++++++++
 .../{script.exp => stdoutEncoding.exp}        |  6 +-
 6 files changed, 83 insertions(+), 85 deletions(-)
 delete mode 100644 test/jdk/java/io/Console/CharsetTest.java
 create mode 100644 test/jdk/java/io/Console/StdoutEncodingTest.java
 rename test/jdk/java/io/Console/{script.exp => stdoutEncoding.exp} (88%)

diff --git a/test/jdk/java/io/Console/CharsetTest.java b/test/jdk/java/io/Console/CharsetTest.java
deleted file mode 100644
index c8c756def81..00000000000
--- a/test/jdk/java/io/Console/CharsetTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.io.Console;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import static jdk.test.lib.Utils.*;
-
-/**
- * @test
- * @bug 8264208 8265918 8356985
- * @summary Tests Console.charset() method. "expect" command in Windows/Cygwin
- *          does not work as expected. Ignoring tests on Windows.
- * @requires (os.family == "linux") | (os.family == "mac")
- * @library /test/lib
- * @run main CharsetTest en_US.ISO8859-1 ISO-8859-1
- * @run main CharsetTest en_US.US-ASCII US-ASCII
- * @run main CharsetTest en_US.UTF-8 UTF-8
- */
-public class CharsetTest {
-    public static void main(String... args) throws Throwable {
-        if (args.length == 0) {
-            // no arg means child java process being tested.
-            Console con = System.console();
-            System.out.println(con.charset());
-            return;
-        } else {
-            // check "expect" command availability
-            var expect = Paths.get("/usr/bin/expect");
-            if (!Files.exists(expect) || !Files.isExecutable(expect)) {
-                throw new jtreg.SkippedException("'expect' command not found. Test ignored.");
-            }
-
-            // invoking "expect" command
-            OutputAnalyzer output = ProcessTools.executeProcess(
-                    "expect",
-                    "-n",
-                    TEST_SRC + "/script.exp",
-                    TEST_JDK + "/bin/java",
-                    args[0],
-                    args[1],
-                    TEST_CLASSES);
-            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/ConsolePromptTest.java b/test/jdk/java/io/Console/ConsolePromptTest.java
index 1e4f73b65d2..0c59aaccac4 100644
--- a/test/jdk/java/io/Console/ConsolePromptTest.java
+++ b/test/jdk/java/io/Console/ConsolePromptTest.java
@@ -104,10 +104,7 @@ void doRunConsoleTest(String testName) throws Exception {
 
         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);
-        }
+        output.shouldHaveExitValue(0);
     }
 
     public static class ConsoleTest {
diff --git a/test/jdk/java/io/Console/RestoreEchoTest.java b/test/jdk/java/io/Console/RestoreEchoTest.java
index 78d36faa537..6ccc434e7ad 100644
--- a/test/jdk/java/io/Console/RestoreEchoTest.java
+++ b/test/jdk/java/io/Console/RestoreEchoTest.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,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
-import static org.junit.jupiter.api.Assertions.*;
 
 
 /**
@@ -72,7 +71,7 @@ private static void expectRunner(String initialEcho) throws Throwable {
                 "-classpath", testClasses,
                 "RestoreEchoTest");
         output.reportDiagnosticSummary();
-        assertEquals(0, output.getExitValue());
+        output.shouldHaveExitValue(0);
     }
 
     public static void main(String... args) throws Throwable {
diff --git a/test/jdk/java/io/Console/StdinEncodingTest.java b/test/jdk/java/io/Console/StdinEncodingTest.java
index 1f2ea225f96..55811ac912a 100644
--- a/test/jdk/java/io/Console/StdinEncodingTest.java
+++ b/test/jdk/java/io/Console/StdinEncodingTest.java
@@ -31,7 +31,6 @@
 
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @test
@@ -64,8 +63,7 @@ public void testStdinEncoding() throws Throwable {
             "-Dstdin.encoding=Uppercasing", // <- gist of this test
             "StdinEncodingTest");
         output.reportDiagnosticSummary();
-        var eval = output.getExitValue();
-        assertEquals(0, eval, "Test failed. Exit value from 'expect' command: " + eval);
+        output.shouldHaveExitValue(0);
     }
 
     public static void main(String... args) throws Throwable {
diff --git a/test/jdk/java/io/Console/StdoutEncodingTest.java b/test/jdk/java/io/Console/StdoutEncodingTest.java
new file mode 100644
index 00000000000..38deddae8b6
--- /dev/null
+++ b/test/jdk/java/io/Console/StdoutEncodingTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.file.Files;
+import java.nio.file.Paths;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import static jdk.test.lib.Utils.*;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+/**
+ * @test
+ * @bug 8264208 8265918 8356985 8358158
+ * @summary Tests if "stdout.encoding" property is reflected in
+ *          Console.charset() method. "expect" command in Windows/Cygwin
+ *          does not work as expected. Ignoring tests on Windows.
+ * @requires (os.family == "linux") | (os.family == "mac")
+ * @library /test/lib
+ * @run junit StdoutEncodingTest
+ */
+public class StdoutEncodingTest {
+
+    @ParameterizedTest
+    @CsvSource({
+        "en_US.ISO8859-1, ISO-8859-1",
+        "en_US.US-ASCII, US-ASCII",
+        "en_US.UTF-8, UTF-8"
+    })
+    void testCharset(String locale, String expectedCharset) throws Exception {
+        // check "expect" command availability
+        var expect = Paths.get("/usr/bin/expect");
+        Assumptions.assumeTrue(Files.exists(expect) && Files.isExecutable(expect),
+            "'" + expect + "' not found. Test ignored.");
+
+        // invoking "expect" command
+        OutputAnalyzer output = ProcessTools.executeProcess(
+                "expect",
+                "-n",
+                TEST_SRC + "/stdoutEncoding.exp",
+                TEST_JDK + "/bin/java",
+                locale,
+                expectedCharset,
+                TEST_CLASSES);
+        output.reportDiagnosticSummary();
+        output.shouldHaveExitValue(0);
+    }
+
+    public static void main(String... args) {
+        System.out.println(System.console().charset());
+    }
+}
diff --git a/test/jdk/java/io/Console/script.exp b/test/jdk/java/io/Console/stdoutEncoding.exp
similarity index 88%
rename from test/jdk/java/io/Console/script.exp
rename to test/jdk/java/io/Console/stdoutEncoding.exp
index c416990cbe9..4e23fd5fcd8 100644
--- a/test/jdk/java/io/Console/script.exp
+++ b/test/jdk/java/io/Console/stdoutEncoding.exp
@@ -21,12 +21,14 @@
 # questions.
 #
 
+# `expect` script for StdoutEncodingTest
+
 set java [lrange $argv 0 0]
 set locale [lrange $argv 1 1]
 set expected [lrange $argv 2 2]
-set args [lrange $argv 3 end]
+set classpath [lrange $argv 3 end]
 regexp {([a-zA-Z_]*).([a-zA-Z0-9\-]*)} $locale dummy lang_region encoding
 
-eval spawn $java -Dstdout.encoding=$encoding -classpath $args CharsetTest
+eval spawn $java -Dstdout.encoding=$encoding -classpath $classpath StdoutEncodingTest
 expect $expected
 expect eof

From 2345065166c56a958365a6362af356e7c95fcaff Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Tue, 3 Jun 2025 23:39:32 +0000
Subject: [PATCH 831/901] 8357600: Patch nmethod flushing message to include
 more details

Reviewed-by: shade, kvn
---
 src/hotspot/share/code/nmethod.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 83afc02cdfc..d82e31fd855 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -2143,10 +2143,19 @@ void nmethod::purge(bool unregister_nmethod) {
 
   // completely deallocate this method
   Events::log_nmethod_flush(Thread::current(), "flushing %s nmethod " INTPTR_FORMAT, is_osr_method() ? "osr" : "", p2i(this));
-  log_debug(codecache)("*flushing %s nmethod %3d/" INTPTR_FORMAT ". Live blobs:" UINT32_FORMAT
-                       "/Free CodeCache:%zuKb",
-                       is_osr_method() ? "osr" : "",_compile_id, p2i(this), CodeCache::blob_count(),
-                       CodeCache::unallocated_capacity(CodeCache::get_code_blob_type(this))/1024);
+
+  LogTarget(Debug, codecache) lt;
+  if (lt.is_enabled()) {
+    ResourceMark rm;
+    LogStream ls(lt);
+    const char* method_name = method()->name()->as_C_string();
+    const size_t codecache_capacity = CodeCache::capacity()/1024;
+    const size_t codecache_free_space = CodeCache::unallocated_capacity(CodeCache::get_code_blob_type(this))/1024;
+    ls.print("Flushing nmethod %6d/" INTPTR_FORMAT ", level=%d, osr=%d, cold=%d, epoch=" UINT64_FORMAT ", cold_count=" UINT64_FORMAT ". "
+              "Cache capacity: %zuKb, free space: %zuKb. method %s (%s)",
+              _compile_id, p2i(this), _comp_level, is_osr_method(), is_cold(), _gc_epoch, CodeCache::cold_gc_count(),
+              codecache_capacity, codecache_free_space, method_name, compiler_name());
+  }
 
   // We need to deallocate any ExceptionCache data.
   // Note that we do not need to grab the nmethod lock for this, it

From 939521b8e4120357108220d177228b683af3334f Mon Sep 17 00:00:00 2001
From: Anjian Wen <wenanjian@openjdk.org>
Date: Wed, 4 Jun 2025 02:03:22 +0000
Subject: [PATCH 832/901] 8358105: RISC-V: Optimize interpreter profile updates

Reviewed-by: fjiang, fyang
---
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp | 38 ++++++---------------
 src/hotspot/cpu/riscv/interp_masm_riscv.hpp |  7 ++--
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 2a01a6d209d..fae34a9c770 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -955,47 +955,29 @@ void InterpreterMacroAssembler::set_mdp_data_at(Register mdp_in,
 
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      int constant,
-                                                      bool decrement) {
-  increment_mdp_data_at(mdp_in, noreg, constant, decrement);
+                                                      int constant) {
+  increment_mdp_data_at(mdp_in, noreg, constant);
 }
 
 void InterpreterMacroAssembler::increment_mdp_data_at(Register mdp_in,
-                                                      Register reg,
-                                                      int constant,
-                                                      bool decrement) {
+                                                      Register index,
+                                                      int constant) {
   assert(ProfileInterpreter, "must be profiling interpreter");
-  // %%% this does 64bit counters at best it is wasting space
-  // at worst it is a rare bug when counters overflow
 
-  assert_different_registers(t1, t0, mdp_in, reg);
+  assert_different_registers(t1, t0, mdp_in, index);
 
   Address addr1(mdp_in, constant);
   Address addr2(t1, 0);
   Address &addr = addr1;
-  if (reg != noreg) {
+  if (index != noreg) {
     la(t1, addr1);
-    add(t1, t1, reg);
+    add(t1, t1, index);
     addr = addr2;
   }
 
-  if (decrement) {
-    ld(t0, addr);
-    subi(t0, t0, DataLayout::counter_increment);
-    Label L;
-    bltz(t0, L);      // skip store if counter underflow
-    sd(t0, addr);
-    bind(L);
-  } else {
-    assert(DataLayout::counter_increment == 1,
-           "flow-free idiom only works with 1");
-    ld(t0, addr);
-    addi(t0, t0, DataLayout::counter_increment);
-    Label L;
-    blez(t0, L);       // skip store if counter overflow
-    sd(t0, addr);
-    bind(L);
-  }
+  ld(t0, addr);
+  addi(t0, t0, DataLayout::counter_increment);
+  sd(t0, addr);
 }
 
 void InterpreterMacroAssembler::set_mdp_flag_at(Register mdp_in,
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index 7a3e6764aaa..891db16b243 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -233,11 +233,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void verify_method_data_pointer();
 
   void set_mdp_data_at(Register mdp_in, int constant, Register value);
-  void increment_mdp_data_at(Address data, bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, int constant,
-                             bool decrement = false);
-  void increment_mdp_data_at(Register mdp_in, Register reg, int constant,
-                             bool decrement = false);
+  void increment_mdp_data_at(Register mdp_in, int constant);
+  void increment_mdp_data_at(Register mdp_in, Register index, int constant);
   void increment_mask_and_jump(Address counter_addr,
                                int increment, Address mask,
                                Register tmp1, Register tmp2,

From ebd85288ce309b7dc7ff8b36558dd9f2a2300209 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Wed, 4 Jun 2025 02:14:17 +0000
Subject: [PATCH 833/901] 8358289: [asan]
 runtime/cds/appcds/aotCode/AOTCodeFlags.java reports heap-buffer-overflow in
 ArchiveBuilder

Reviewed-by: shade, iklam, asmehra
---
 src/hotspot/share/runtime/sharedRuntime.cpp | 23 ++++++++++++---------
 src/hotspot/share/runtime/sharedRuntime.hpp |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index edb33b3500a..9c710fc98e4 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -2199,10 +2199,11 @@ class AdapterFingerPrint : public MetaspaceObj {
   }
 
   // Private construtor. Use allocate() to get an instance.
-  AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
+  AdapterFingerPrint(int total_args_passed, BasicType* sig_bt, int len) {
     int* data = data_pointer();
     // Pack the BasicTypes with 8 per int
-    _length = length(total_args_passed);
+    assert(len == length(total_args_passed), "sanity");
+    _length = len;
     int sig_index = 0;
     for (int index = 0; index < _length; index++) {
       int value = 0;
@@ -2217,16 +2218,15 @@ class AdapterFingerPrint : public MetaspaceObj {
 
   // Call deallocate instead
   ~AdapterFingerPrint() {
-    FreeHeap(this);
+    ShouldNotCallThis();
   }
 
   static int length(int total_args) {
     return (total_args + (_basic_types_per_int-1)) / _basic_types_per_int;
   }
 
-  static int compute_size(int total_args_passed, BasicType* sig_bt) {
-    int len = length(total_args_passed);
-    return sizeof(AdapterFingerPrint) + (len * sizeof(int));
+  static int compute_size_in_words(int len) {
+    return (int)heap_word_size(sizeof(AdapterFingerPrint) + (len * sizeof(int)));
   }
 
   // Remap BasicTypes that are handled equivalently by the adapters.
@@ -2289,12 +2289,15 @@ class AdapterFingerPrint : public MetaspaceObj {
 
  public:
   static AdapterFingerPrint* allocate(int total_args_passed, BasicType* sig_bt) {
-    int size_in_bytes = compute_size(total_args_passed, sig_bt);
-    return new (size_in_bytes) AdapterFingerPrint(total_args_passed, sig_bt);
+    int len = length(total_args_passed);
+    int size_in_bytes = BytesPerWord * compute_size_in_words(len);
+    AdapterFingerPrint* afp = new (size_in_bytes) AdapterFingerPrint(total_args_passed, sig_bt, len);
+    assert((afp->size() * BytesPerWord) == size_in_bytes, "should match");
+    return afp;
   }
 
   static void deallocate(AdapterFingerPrint* fp) {
-    fp->~AdapterFingerPrint();
+    FreeHeap(fp);
   }
 
   int value(int index) {
@@ -2418,7 +2421,7 @@ class AdapterFingerPrint : public MetaspaceObj {
 
   // methods required by virtue of being a MetaspaceObj
   void metaspace_pointers_do(MetaspaceClosure* it) { return; /* nothing to do here */ }
-  int size() const { return (int)heap_word_size(sizeof(AdapterFingerPrint) + (_length * sizeof(int))); }
+  int size() const { return compute_size_in_words(_length); }
   MetaspaceObj::Type type() const { return AdapterFingerPrintType; }
 
   static bool equals(AdapterFingerPrint* const& fp1, AdapterFingerPrint* const& fp2) {
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 86074ac7aca..eb2ffb82e5a 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -711,6 +711,7 @@ class AdapterHandlerEntry : public MetaspaceObj {
   // Dummy argument is used to avoid C++ warning about using
   // deleted opearator MetaspaceObj::delete().
   void* operator new(size_t size, size_t dummy) throw() {
+    assert(size == BytesPerWord * heap_word_size(sizeof(AdapterHandlerEntry)), "should match");
     void* p = AllocateHeap(size, mtCode);
     memset(p, 0, size);
     return p;

From f17b2bc06ad358933481c0e2cffd57c842bc0e76 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 4 Jun 2025 04:10:10 +0000
Subject: [PATCH 834/901] 8356870: HotSpotDiagnosticMXBean.dumpThreads and jcmd
 Thread.dump_to_file updates

Reviewed-by: sspitsyn, kevinw
---
 .../classes/jdk/internal/vm/ThreadDumper.java | 589 ++++++++++-----
 .../jdk/internal/vm/ThreadSnapshot.java       |   4 +
 .../management/HotSpotDiagnosticMXBean.java   |  10 +-
 .../doc-files/threadDump.schema.json          | 171 +++++
 .../internal/HotSpotDiagnostic.java           |   4 +-
 .../dcmd/thread/ThreadDumpToFileTest.java     |  27 +-
 .../HotSpotDiagnosticMXBean/DumpThreads.java  | 712 ++++++++++++++----
 .../DumpThreadsWithEliminatedLock.java        | 171 +++++
 .../jdk/test/lib/threaddump/ThreadDump.java   | 280 ++++---
 9 files changed, 1547 insertions(+), 421 deletions(-)
 create mode 100644 src/jdk.management/share/classes/com/sun/management/doc-files/threadDump.schema.json
 create mode 100644 test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java

diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadDumper.java b/src/java.base/share/classes/jdk/internal/vm/ThreadDumper.java
index d0705bc2457..58729774f24 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ThreadDumper.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadDumper.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
@@ -24,11 +24,13 @@
  */
 package jdk.internal.vm;
 
-import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.OutputStreamWriter;
+import java.io.UncheckedIOException;
+import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
@@ -36,15 +38,19 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.time.Instant;
-import java.util.ArrayList;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Thread dump support.
  *
- * This class defines methods to dump threads to an output stream or file in plain
- * text or JSON format.
+ * This class defines static methods to support the Thread.dump_to_file diagnostic command
+ * and the HotSpotDiagnosticMXBean.dumpThreads API. It defines methods to generate a
+ * thread dump to a file or byte array in plain text or JSON format.
  */
 public class ThreadDumper {
     private ThreadDumper() { }
@@ -53,13 +59,12 @@ private ThreadDumper() { }
     private static final int MAX_BYTE_ARRAY_SIZE = 16_000;
 
     /**
-     * Generate a thread dump in plain text format to a byte array or file, UTF-8 encoded.
-     *
+     * Generate a thread dump in plain text format to a file or byte array, UTF-8 encoded.
      * This method is invoked by the VM for the Thread.dump_to_file diagnostic command.
      *
      * @param file the file path to the file, null or "-" to return a byte array
      * @param okayToOverwrite true to overwrite an existing file
-     * @return the UTF-8 encoded thread dump or message to return to the user
+     * @return the UTF-8 encoded thread dump or message to return to the tool user
      */
     public static byte[] dumpThreads(String file, boolean okayToOverwrite) {
         if (file == null || file.equals("-")) {
@@ -70,13 +75,12 @@ public static byte[] dumpThreads(String file, boolean okayToOverwrite) {
     }
 
     /**
-     * Generate a thread dump in JSON format to a byte array or file, UTF-8 encoded.
-     *
+     * Generate a thread dump in JSON format to a file or byte array, UTF-8 encoded.
      * This method is invoked by the VM for the Thread.dump_to_file diagnostic command.
      *
      * @param file the file path to the file, null or "-" to return a byte array
      * @param okayToOverwrite true to overwrite an existing file
-     * @return the UTF-8 encoded thread dump or message to return to the user
+     * @return the UTF-8 encoded thread dump or message to return to the tool user
      */
     public static byte[] dumpThreadsToJson(String file, boolean okayToOverwrite) {
         if (file == null || file.equals("-")) {
@@ -88,21 +92,32 @@ public static byte[] dumpThreadsToJson(String file, boolean okayToOverwrite) {
 
     /**
      * Generate a thread dump in plain text or JSON format to a byte array, UTF-8 encoded.
+     * This method is the implementation of the Thread.dump_to_file diagnostic command
+     * when a file path is not specified. It returns the thread dump and/or message to
+     * send to the tool user.
      */
     private static byte[] dumpThreadsToByteArray(boolean json, int maxSize) {
-        try (var out = new BoundedByteArrayOutputStream(maxSize);
-             PrintStream ps = new PrintStream(out, true, StandardCharsets.UTF_8)) {
+        var out = new BoundedByteArrayOutputStream(maxSize);
+        try (out; var writer = new TextWriter(out)) {
             if (json) {
-                dumpThreadsToJson(ps);
+                dumpThreadsToJson(writer);
             } else {
-                dumpThreads(ps);
+                dumpThreads(writer);
             }
-            return out.toByteArray();
+        } catch (Exception ex) {
+            if (ex instanceof UncheckedIOException ioe) {
+                ex = ioe.getCause();
+            }
+            String reply = String.format("Failed: %s%n", ex);
+            return reply.getBytes(StandardCharsets.UTF_8);
         }
+        return out.toByteArray();
     }
 
     /**
      * Generate a thread dump in plain text or JSON format to the given file, UTF-8 encoded.
+     * This method is the implementation of the Thread.dump_to_file diagnostic command.
+     * It returns the thread dump and/or message to send to the tool user.
      */
     private static byte[] dumpThreadsToFile(String file, boolean okayToOverwrite, boolean json) {
         Path path = Path.of(file).toAbsolutePath();
@@ -110,224 +125,412 @@ private static byte[] dumpThreadsToFile(String file, boolean okayToOverwrite, bo
                 ? new OpenOption[0]
                 : new OpenOption[] { StandardOpenOption.CREATE_NEW };
         String reply;
-        try (OutputStream out = Files.newOutputStream(path, options);
-             BufferedOutputStream bos = new BufferedOutputStream(out);
-             PrintStream ps = new PrintStream(bos, false, StandardCharsets.UTF_8)) {
-            if (json) {
-                dumpThreadsToJson(ps);
-            } else {
-                dumpThreads(ps);
+        try (OutputStream out = Files.newOutputStream(path, options)) {
+            try (var writer = new TextWriter(out)) {
+                if (json) {
+                    dumpThreadsToJson(writer);
+                } else {
+                    dumpThreads(writer);
+                }
+                reply = String.format("Created %s%n", path);
+            } catch (UncheckedIOException e) {
+                reply = String.format("Failed: %s%n", e.getCause());
             }
-            reply = String.format("Created %s%n", path);
-        } catch (FileAlreadyExistsException e) {
+        } catch (FileAlreadyExistsException _) {
             reply = String.format("%s exists, use -overwrite to overwrite%n", path);
-        } catch (IOException ioe) {
-            reply = String.format("Failed: %s%n", ioe);
+        } catch (Exception ex) {
+            reply = String.format("Failed: %s%n", ex);
         }
         return reply.getBytes(StandardCharsets.UTF_8);
     }
 
     /**
-     * Generate a thread dump in plain text format to the given output stream,
-     * UTF-8 encoded.
-     *
-     * This method is invoked by HotSpotDiagnosticMXBean.dumpThreads.
+     * Generate a thread dump in plain text format to the given output stream, UTF-8
+     * encoded. This method is invoked by HotSpotDiagnosticMXBean.dumpThreads.
+     * @throws IOException if an I/O error occurs
      */
-    public static void dumpThreads(OutputStream out) {
-        BufferedOutputStream bos = new BufferedOutputStream(out);
-        PrintStream ps = new PrintStream(bos, false, StandardCharsets.UTF_8);
+    public static void dumpThreads(OutputStream out) throws IOException {
+        var writer = new TextWriter(out);
         try {
-            dumpThreads(ps);
-        } finally {
-            ps.flush();  // flushes underlying stream
+            dumpThreads(writer);
+            writer.flush();
+        } catch (UncheckedIOException e) {
+            IOException ioe = e.getCause();
+            throw ioe;
         }
     }
 
     /**
-     * Generate a thread dump in plain text format to the given print stream.
+     * Generate a thread dump in plain text format to the given text stream.
+     * @throws UncheckedIOException if an I/O error occurs
      */
-    private static void dumpThreads(PrintStream ps) {
-        ps.println(processId());
-        ps.println(Instant.now());
-        ps.println(Runtime.version());
-        ps.println();
-        dumpThreads(ThreadContainers.root(), ps);
+    private static void dumpThreads(TextWriter writer) {
+        writer.println(processId());
+        writer.println(Instant.now());
+        writer.println(Runtime.version());
+        writer.println();
+        dumpThreads(ThreadContainers.root(), writer);
     }
 
-    private static void dumpThreads(ThreadContainer container, PrintStream ps) {
-        container.threads().forEach(t -> dumpThread(t, ps));
-        container.children().forEach(c -> dumpThreads(c, ps));
+    private static void dumpThreads(ThreadContainer container, TextWriter writer) {
+        container.threads().forEach(t -> dumpThread(t, writer));
+        container.children().forEach(c -> dumpThreads(c, writer));
     }
 
-    private static void dumpThread(Thread thread, PrintStream ps) {
-        String suffix = thread.isVirtual() ? " virtual" : "";
-        ps.println("#" + thread.threadId() + " \"" + thread.getName() + "\"" + suffix);
-        for (StackTraceElement ste : thread.getStackTrace()) {
-            ps.print("      ");
-            ps.println(ste);
+    private static void dumpThread(Thread thread, TextWriter writer) {
+        ThreadSnapshot snapshot = ThreadSnapshot.of(thread);
+        Instant now = Instant.now();
+        Thread.State state = snapshot.threadState();
+        writer.println("#" + thread.threadId() + " \"" + snapshot.threadName()
+                + "\" " + (thread.isVirtual() ? "virtual " : "") + state + " " + now);
+
+        StackTraceElement[] stackTrace = snapshot.stackTrace();
+        int depth = 0;
+        while (depth < stackTrace.length) {
+            writer.print("    at ");
+            writer.println(stackTrace[depth]);
+            snapshot.ownedMonitorsAt(depth).forEach(o -> {
+                if (o != null) {
+                    writer.println("    - locked " + decorateObject(o));
+                } else {
+                    writer.println("    - lock is eliminated");
+                }
+            });
+
+            // if parkBlocker set, or blocked/waiting on monitor, then print after top frame
+            if (depth == 0) {
+                // park blocker
+                Object parkBlocker = snapshot.parkBlocker();
+                if (parkBlocker != null) {
+                    writer.println("    - parking to wait for " + decorateObject(parkBlocker));
+                }
+
+                // blocked on monitor enter or Object.wait
+                if (state == Thread.State.BLOCKED && snapshot.blockedOn() instanceof Object obj) {
+                    writer.println("    - waiting to lock " + decorateObject(obj));
+                } else if ((state == Thread.State.WAITING || state == Thread.State.TIMED_WAITING)
+                        && snapshot.waitingOn() instanceof Object obj) {
+                    writer.println("    - waiting on " + decorateObject(obj));
+                }
+            }
+
+            depth++;
         }
-        ps.println();
+        writer.println();
+    }
+
+    /**
+     * Returns the identity string for the given object in a form suitable for the plain
+     * text format thread dump.
+     */
+    private static String decorateObject(Object obj) {
+        return "<" + Objects.toIdentityString(obj) + ">";
     }
 
     /**
      * Generate a thread dump in JSON format to the given output stream, UTF-8 encoded.
-     *
      * This method is invoked by HotSpotDiagnosticMXBean.dumpThreads.
+     * @throws IOException if an I/O error occurs
      */
-    public static void dumpThreadsToJson(OutputStream out) {
-        BufferedOutputStream bos = new BufferedOutputStream(out);
-        PrintStream ps = new PrintStream(bos, false, StandardCharsets.UTF_8);
+    public static void dumpThreadsToJson(OutputStream out) throws IOException {
+        var writer = new TextWriter(out);
         try {
-            dumpThreadsToJson(ps);
-        } finally {
-            ps.flush();  // flushes underlying stream
+            dumpThreadsToJson(writer);
+            writer.flush();
+        } catch (UncheckedIOException e) {
+            IOException ioe = e.getCause();
+            throw ioe;
         }
     }
 
     /**
-     * Generate a thread dump to the given print stream in JSON format.
+     * Generate a thread dump to the given text stream in JSON format.
+     * @throws UncheckedIOException if an I/O error occurs
      */
-    private static void dumpThreadsToJson(PrintStream out) {
-        out.println("{");
-        out.println("  \"threadDump\": {");
-
-        String now = Instant.now().toString();
-        String runtimeVersion = Runtime.version().toString();
-        out.format("    \"processId\": \"%d\",%n", processId());
-        out.format("    \"time\": \"%s\",%n", escape(now));
-        out.format("    \"runtimeVersion\": \"%s\",%n", escape(runtimeVersion));
-
-        out.println("    \"threadContainers\": [");
-        List<ThreadContainer> containers = allContainers();
-        Iterator<ThreadContainer> iterator = containers.iterator();
-        while (iterator.hasNext()) {
-            ThreadContainer container = iterator.next();
-            boolean more = iterator.hasNext();
-            dumpThreadsToJson(container, out, more);
-        }
-        out.println("    ]");   // end of threadContainers
-
-        out.println("  }");   // end threadDump
-        out.println("}");  // end object
+    private static void dumpThreadsToJson(TextWriter textWriter) {
+        var jsonWriter = new JsonWriter(textWriter);
+
+        jsonWriter.startObject();  // top-level object
+
+        jsonWriter.startObject("threadDump");
+
+        jsonWriter.writeProperty("processId", processId());
+        jsonWriter.writeProperty("time", Instant.now());
+        jsonWriter.writeProperty("runtimeVersion", Runtime.version());
+
+        jsonWriter.startArray("threadContainers");
+        dumpThreads(ThreadContainers.root(), jsonWriter);
+        jsonWriter.endArray();
+
+        jsonWriter.endObject();  // threadDump
+
+        jsonWriter.endObject();  // end of top-level object
     }
 
     /**
-     * Dump the given thread container to the print stream in JSON format.
+     * Write a thread container to the given JSON writer.
+     * @throws UncheckedIOException if an I/O error occurs
      */
-    private static void dumpThreadsToJson(ThreadContainer container,
-                                          PrintStream out,
-                                          boolean more) {
-        out.println("      {");
-        out.format("        \"container\": \"%s\",%n", escape(container.toString()));
-
-        ThreadContainer parent = container.parent();
-        if (parent == null) {
-            out.format("        \"parent\": null,%n");
-        } else {
-            out.format("        \"parent\": \"%s\",%n", escape(parent.toString()));
-        }
+    private static void dumpThreads(ThreadContainer container, JsonWriter jsonWriter) {
+        jsonWriter.startObject();
+        jsonWriter.writeProperty("container", container);
+        jsonWriter.writeProperty("parent", container.parent());
 
         Thread owner = container.owner();
-        if (owner == null) {
-            out.format("        \"owner\": null,%n");
-        } else {
-            out.format("        \"owner\": \"%d\",%n", owner.threadId());
-        }
+        jsonWriter.writeProperty("owner", (owner != null) ? owner.threadId() : null);
 
         long threadCount = 0;
-        out.println("        \"threads\": [");
+        jsonWriter.startArray("threads");
         Iterator<Thread> threads = container.threads().iterator();
         while (threads.hasNext()) {
             Thread thread = threads.next();
-            dumpThreadToJson(thread, out, threads.hasNext());
+            dumpThread(thread, jsonWriter);
             threadCount++;
         }
-        out.println("        ],");   // end of threads
+        jsonWriter.endArray(); // threads
 
         // thread count
         if (!ThreadContainers.trackAllThreads()) {
             threadCount = Long.max(threadCount, container.threadCount());
         }
-        out.format("        \"threadCount\": \"%d\"%n", threadCount);
+        jsonWriter.writeProperty("threadCount", threadCount);
 
-        if (more) {
-            out.println("      },");
-        } else {
-            out.println("      }");  // last container, no trailing comma
-        }
+        jsonWriter.endObject();
+
+        // the children of the thread container follow
+        container.children().forEach(c -> dumpThreads(c, jsonWriter));
     }
 
     /**
-     * Dump the given thread and its stack trace to the print stream in JSON format.
+     * Write a thread to the given JSON writer.
+     * @throws UncheckedIOException if an I/O error occurs
      */
-    private static void dumpThreadToJson(Thread thread, PrintStream out, boolean more) {
-        out.println("         {");
-        out.println("           \"tid\": \"" + thread.threadId() + "\",");
-        out.println("           \"name\": \"" + escape(thread.getName()) + "\",");
-        out.println("           \"stack\": [");
-
-        int i = 0;
-        StackTraceElement[] stackTrace = thread.getStackTrace();
-        while (i < stackTrace.length) {
-            out.print("              \"");
-            out.print(escape(stackTrace[i].toString()));
-            out.print("\"");
-            i++;
-            if (i < stackTrace.length) {
-                out.println(",");
-            } else {
-                out.println();  // last element, no trailing comma
+    private static void dumpThread(Thread thread, JsonWriter jsonWriter) {
+        Instant now = Instant.now();
+        ThreadSnapshot snapshot = ThreadSnapshot.of(thread);
+        Thread.State state = snapshot.threadState();
+        StackTraceElement[] stackTrace = snapshot.stackTrace();
+
+        jsonWriter.startObject();
+        jsonWriter.writeProperty("tid", thread.threadId());
+        jsonWriter.writeProperty("time", now);
+        if (thread.isVirtual()) {
+            jsonWriter.writeProperty("virtual", Boolean.TRUE);
+        }
+        jsonWriter.writeProperty("name", snapshot.threadName());
+        jsonWriter.writeProperty("state", state);
+
+        // park blocker
+        Object parkBlocker = snapshot.parkBlocker();
+        if (parkBlocker != null) {
+            // parkBlocker is an object to allow for exclusiveOwnerThread in the future
+            jsonWriter.startObject("parkBlocker");
+            jsonWriter.writeProperty("object", Objects.toIdentityString(parkBlocker));
+            jsonWriter.endObject();
+        }
+
+        // blocked on monitor enter or Object.wait
+        if (state == Thread.State.BLOCKED && snapshot.blockedOn() instanceof Object obj) {
+            jsonWriter.writeProperty("blockedOn", Objects.toIdentityString(obj));
+        } else if ((state == Thread.State.WAITING || state == Thread.State.TIMED_WAITING)
+                && snapshot.waitingOn() instanceof Object obj) {
+            jsonWriter.writeProperty("waitingOn", Objects.toIdentityString(obj));
+        }
+
+        // stack trace
+        jsonWriter.startArray("stack");
+        Arrays.stream(stackTrace).forEach(jsonWriter::writeProperty);
+        jsonWriter.endArray();
+
+        // monitors owned, skip if none
+        if (snapshot.ownsMonitors()) {
+            jsonWriter.startArray("monitorsOwned");
+            int depth = 0;
+            while (depth < stackTrace.length) {
+                List<Object> objs = snapshot.ownedMonitorsAt(depth).toList();
+                if (!objs.isEmpty()) {
+                    jsonWriter.startObject();
+                    jsonWriter.writeProperty("depth", depth);
+                    jsonWriter.startArray("locks");
+                    snapshot.ownedMonitorsAt(depth)
+                            .map(o -> (o != null) ? Objects.toIdentityString(o) : null)
+                            .forEach(jsonWriter::writeProperty);
+                    jsonWriter.endArray();
+                    jsonWriter.endObject();
+                }
+                depth++;
             }
+            jsonWriter.endArray();
         }
-        out.println("           ]");
-        if (more) {
-            out.println("         },");
-        } else {
-            out.println("         }");  // last thread, no trailing comma
+
+        // thread identifier of carrier, when mounted
+        if (thread.isVirtual() && snapshot.carrierThread() instanceof Thread carrier) {
+            jsonWriter.writeProperty("carrier", carrier.threadId());
         }
+
+        jsonWriter.endObject();
     }
 
     /**
-     * Returns a list of all thread containers that are "reachable" from
-     * the root container.
+     * Simple JSON writer to stream objects/arrays to a TextWriter with formatting.
+     * This class is not intended to be a fully featured JSON writer.
      */
-    private static List<ThreadContainer> allContainers() {
-        List<ThreadContainer> containers = new ArrayList<>();
-        collect(ThreadContainers.root(), containers);
-        return containers;
-    }
+    private static class JsonWriter {
+        private static class Node {
+            final boolean isArray;
+            int propertyCount;
+            Node(boolean isArray) {
+                this.isArray = isArray;
+            }
+            boolean isArray() {
+                return isArray;
+            }
+            int propertyCount() {
+                return propertyCount;
+            }
+            int getAndIncrementPropertyCount() {
+                int old = propertyCount;
+                propertyCount++;
+                return old;
+            }
+        }
+        private final Deque<Node> stack = new ArrayDeque<>();
+        private final TextWriter writer;
 
-    private static void collect(ThreadContainer container, List<ThreadContainer> containers) {
-        containers.add(container);
-        container.children().forEach(c -> collect(c, containers));
-    }
+        JsonWriter(TextWriter writer) {
+            this.writer = writer;
+        }
 
-    /**
-     * Escape any characters that need to be escape in the JSON output.
-     */
-    private static String escape(String value) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < value.length(); i++) {
-            char c = value.charAt(i);
-            switch (c) {
-                case '"'  -> sb.append("\\\"");
-                case '\\' -> sb.append("\\\\");
-                case '/'  -> sb.append("\\/");
-                case '\b' -> sb.append("\\b");
-                case '\f' -> sb.append("\\f");
-                case '\n' -> sb.append("\\n");
-                case '\r' -> sb.append("\\r");
-                case '\t' -> sb.append("\\t");
-                default -> {
-                    if (c <= 0x1f) {
-                        sb.append(String.format("\\u%04x", c));
-                    } else {
-                        sb.append(c);
+        private void indent() {
+            int indent = stack.size() * 2;
+            writer.print(" ".repeat(indent));
+        }
+
+        /**
+         * Start of object or array.
+         */
+        private void startObject(String name, boolean isArray) {
+            if (!stack.isEmpty()) {
+                Node node = stack.peek();
+                if (node.getAndIncrementPropertyCount() > 0) {
+                    writer.println(",");
+                }
+            }
+            indent();
+            if (name != null) {
+                writer.print("\"" + name + "\": ");
+            }
+            writer.println(isArray ? "[" : "{");
+            stack.push(new Node(isArray));
+        }
+
+        /**
+         * End of object or array.
+         */
+        private void endObject(boolean isArray) {
+            Node node = stack.pop();
+            if (node.isArray() != isArray)
+                throw new IllegalStateException();
+            if (node.propertyCount() > 0) {
+                writer.println();
+            }
+            indent();
+            writer.print(isArray ? "]" : "}");
+        }
+
+        /**
+         * Write a property.
+         * @param name the property name, null for an unnamed property
+         * @param obj the value or null
+         */
+        void writeProperty(String name, Object obj) {
+            Node node = stack.peek();
+            if (node.getAndIncrementPropertyCount() > 0) {
+                writer.println(",");
+            }
+            indent();
+            if (name != null) {
+                writer.print("\"" + name + "\": ");
+            }
+            switch (obj) {
+                // Long may be larger than safe range of JSON integer value
+                case Long   _  -> writer.print("\"" + obj + "\"");
+                case Number _  -> writer.print(obj);
+                case Boolean _ -> writer.print(obj);
+                case null      -> writer.print("null");
+                default        -> writer.print("\"" + escape(obj.toString()) + "\"");
+            }
+        }
+
+        /**
+         * Write an unnamed property.
+         */
+        void writeProperty(Object obj) {
+            writeProperty(null, obj);
+        }
+
+        /**
+         * Start named object.
+         */
+        void startObject(String name) {
+            startObject(name, false);
+        }
+
+        /**
+         * Start unnamed object.
+         */
+        void startObject() {
+            startObject(null);
+        }
+
+        /**
+         * End of object.
+         */
+        void endObject() {
+            endObject(false);
+        }
+
+        /**
+         * Start named array.
+         */
+        void startArray(String name) {
+            startObject(name, true);
+        }
+
+        /**
+         * End of array.
+         */
+        void endArray() {
+            endObject(true);
+        }
+
+        /**
+         * Escape any characters that need to be escape in the JSON output.
+         */
+        private static String escape(String value) {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < value.length(); i++) {
+                char c = value.charAt(i);
+                switch (c) {
+                    case '"'  -> sb.append("\\\"");
+                    case '\\' -> sb.append("\\\\");
+                    case '/'  -> sb.append("\\/");
+                    case '\b' -> sb.append("\\b");
+                    case '\f' -> sb.append("\\f");
+                    case '\n' -> sb.append("\\n");
+                    case '\r' -> sb.append("\\r");
+                    case '\t' -> sb.append("\\t");
+                    default -> {
+                        if (c <= 0x1f) {
+                            sb.append(String.format("\\u%04x", c));
+                        } else {
+                            sb.append(c);
+                        }
                     }
                 }
             }
+            return sb.toString();
         }
-        return sb.toString();
     }
 
     /**
@@ -357,6 +560,56 @@ public void close() {
         }
     }
 
+    /**
+     * Simple Writer implementation for printing text. The print/println methods
+     * throw UncheckedIOException if an I/O error occurs.
+     */
+    private static class TextWriter extends Writer {
+        private final Writer delegate;
+
+        TextWriter(OutputStream out) {
+            delegate = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
+        }
+
+        @Override
+        public void write(char[] cbuf, int off, int len) throws IOException {
+            delegate.write(cbuf, off, len);
+        }
+
+        void print(Object obj) {
+            String s = String.valueOf(obj);
+            try {
+                write(s, 0, s.length());
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            }
+        }
+
+        void println() {
+            print(System.lineSeparator());
+        }
+
+        void println(String s) {
+            print(s);
+            println();
+        }
+
+        void println(Object obj) {
+            print(obj);
+            println();
+        }
+
+        @Override
+        public void flush() throws IOException {
+            delegate.flush();
+        }
+
+        @Override
+        public void close() throws IOException {
+            delegate.close();
+        }
+    }
+
     /**
      * Returns the process ID or -1 if not supported.
      */
diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
index 205bfde5449..b5607059abc 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
@@ -52,9 +52,13 @@ private ThreadSnapshot() {}
 
     /**
      * Take a snapshot of a Thread to get all information about the thread.
+     * @throws UnsupportedOperationException if not supported by VM
      */
     static ThreadSnapshot of(Thread thread) {
         ThreadSnapshot snapshot = create(thread);
+        if (snapshot == null) {
+            throw new UnsupportedOperationException();
+        }
         if (snapshot.stackTrace == null) {
             snapshot.stackTrace = EMPTY_STACK;
         }
diff --git a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index fba64846155..067cfffb158 100644
--- a/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 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
@@ -116,6 +116,13 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
      * {@code outputFile} parameter must be an absolute path to a file that
      * does not exist.
      *
+     * <p> When the format is specified as {@link ThreadDumpFormat#JSON JSON}, the
+     * thread dump is generated in JavaScript Object Notation.
+     * <a href="http://github.com/doc-files/threadDump.schema.json">threadDump.schema.json</a>
+     * describes the thread dump format in draft
+     * <a href="https://tools.ietf.org/html/draft-json-schema-language-02">
+     * JSON Schema Language version 2</a>.
+     *
      * <p> The thread dump will include output for all platform threads. It may
      * include output for some or all virtual threads.
      *
@@ -151,6 +158,7 @@ public static enum ThreadDumpFormat {
         TEXT_PLAIN,
         /**
          * JSON (JavaScript Object Notation) format.
+         * @spec https://datatracker.ietf.org/doc/html/rfc8259 JavaScript Object Notation
          */
         JSON,
     }
diff --git a/src/jdk.management/share/classes/com/sun/management/doc-files/threadDump.schema.json b/src/jdk.management/share/classes/com/sun/management/doc-files/threadDump.schema.json
new file mode 100644
index 00000000000..57ef5c8b859
--- /dev/null
+++ b/src/jdk.management/share/classes/com/sun/management/doc-files/threadDump.schema.json
@@ -0,0 +1,171 @@
+{
+  "type": "object",
+  "properties": {
+    "threadDump": {
+      "type": "object",
+      "properties": {
+        "processId": {
+          "type": "string",
+          "description": "The native process id of the Java virtual machine."
+        },
+        "time": {
+          "type": "string",
+          "description": "The time in ISO 8601 format when the thread dump was generated."
+        },
+        "runtimeVersion": {
+          "type": "string",
+          "description": "The runtime version, see java.lang.Runtime.Version"
+        },
+        "threadContainers": {
+          "type": "array",
+          "description": "The array of thread containers (thread groupings).",
+          "items": [
+            {
+              "type": "object",
+              "properties": {
+                "container": {
+                  "type": "string",
+                  "description": "The container name. The container name is unique."
+                },
+                "parent": {
+                  "type": [
+                    "string",
+                    "null"
+                  ],
+                  "description": "The parent container name or null for the root container."
+                },
+                "owner": {
+                  "type": [
+                    "string",
+                    "null"
+                  ],
+                  "description": "The thread identifier of the owner thread if owned."
+                },
+                "threads": {
+                  "type": "array",
+                  "description": "The array of threads in the thread container.",
+                  "items": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "tid": {
+                          "type": "string",
+                          "description": "The thread identifier."
+                        },
+                        "time": {
+                          "type": "string",
+                          "description": "The time in ISO 8601 format that the thread was sampled."
+                        },
+                        "name": {
+                          "type": "string",
+                          "description": "The thread name."
+                        },
+                        "state": {
+                          "type": "string",
+                          "description": "The thread state (Thread::getState)."
+                        },
+                        "virtual" : {
+                          "type": "boolean",
+                          "description": "true for a virtual thread."
+                        },
+                        "parkBlocker": {
+                          "type": [
+                            "object"
+                          ],
+                          "properties": {
+                            "object": {
+                              "type": "string",
+                              "description": "The blocker object responsible for the thread parking."
+                            }
+                          },
+                          "required": [
+                            "object"
+                          ]
+                        },
+                        "blockedOn": {
+                          "type": "string",
+                          "description": "The object that the thread is blocked on waiting to enter/re-enter a synchronization block/method."
+                        },
+                        "waitingOn": {
+                          "type": "string",
+                          "description": "The object that the thread is waiting to be notified (Object.wait)."
+                        },
+                        "stack": {
+                          "type": "array",
+                          "description": "The thread stack. The first element is the top of the stack.",
+                          "items": [
+                            {
+                              "type": "string",
+                              "description": "A stack trace element (java.lang.StackTraceElement)."
+                            }
+                          ]
+                        },
+                        "monitorsOwned": {
+                          "type": "array",
+                          "description": "The objects for which monitors are owned by the thread.",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "depth": {
+                                "type": "integer",
+                                "description": "The stack depth at which the monitors are owned."
+                              },
+                              "locks": {
+                                "type": "array",
+                                "items": {
+                                  "type": [
+                                    "string",
+                                    null
+                                  ],
+                                  "description": "The object for which the monitor is owned by the thread, null if eliminated"
+                                }
+                              }
+                            },
+                            "required": [
+                              "depth",
+                              "locks"
+                            ]
+                          }
+                        },
+                        "carrier":  {
+                          "type": "string",
+                          "description": "The thread identifier of the carrier thread if mounted."
+                        }
+                      },
+                      "required": [
+                        "tid",
+                        "time",
+                        "name",
+                        "state",
+                        "stack"
+                      ]
+                    }
+                  ]
+                },
+                "threadCount": {
+                  "type": "string",
+                  "description": "The number of threads in the thread container."
+                }
+              },
+              "required": [
+                "container",
+                "parent",
+                "owner",
+                "threads"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "processId",
+        "time",
+        "runtimeVersion",
+        "threadContainers"
+      ]
+    }
+  },
+  "required": [
+    "threadDump"
+  ]
+}
diff --git a/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java
index 855e800a794..4e5f20fa141 100644
--- a/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java
+++ b/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.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
@@ -153,7 +153,7 @@ public void dumpThreads(String outputFile, ThreadDumpFormat format) throws IOExc
             throw new IllegalArgumentException("'outputFile' not absolute path");
 
         try (OutputStream out = Files.newOutputStream(file, StandardOpenOption.CREATE_NEW)) {
-                dumpThreads(out, format);
+            dumpThreads(out, format);
         }
     }
 
diff --git a/test/hotspot/jtreg/serviceability/dcmd/thread/ThreadDumpToFileTest.java b/test/hotspot/jtreg/serviceability/dcmd/thread/ThreadDumpToFileTest.java
index f6002a32968..1fcc609114a 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/thread/ThreadDumpToFileTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/thread/ThreadDumpToFileTest.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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8284161 8287008
  * @summary Basic test for jcmd Thread.dump_to_file
+ * @modules jdk.jcmd
  * @library /test/lib
  * @run junit/othervm ThreadDumpToFileTest
  */
@@ -66,7 +67,8 @@ void testPlainThreadDump() throws IOException {
     @Test
     void testJsonThreadDump() throws IOException {
         Path file = genThreadDumpPath(".json");
-        jcmdThreadDumpToFile(file, "-format=json").shouldMatch("Created");
+        jcmdThreadDumpToFile(file, "-format=json")
+                .shouldMatch("Created");
 
         // parse the JSON text
         String jsonText = Files.readString(file);
@@ -89,7 +91,8 @@ void testDoNotOverwriteFile() throws IOException {
         Path file = genThreadDumpPath(".txt");
         Files.writeString(file, "xxx");
 
-        jcmdThreadDumpToFile(file, "").shouldMatch("exists");
+        jcmdThreadDumpToFile(file, "")
+                .shouldMatch("exists");
 
         // file should not be overridden
         assertEquals("xxx", Files.readString(file));
@@ -102,7 +105,23 @@ void testDoNotOverwriteFile() throws IOException {
     void testOverwriteFile() throws IOException {
         Path file = genThreadDumpPath(".txt");
         Files.writeString(file, "xxx");
-        jcmdThreadDumpToFile(file, "-overwrite");
+        jcmdThreadDumpToFile(file, "-overwrite")
+                .shouldMatch("Created");
+    }
+
+    /**
+     * Test output file cannot be created.
+     */
+    @Test
+    void testFileCreateFails() throws IOException {
+        Path badFile = Path.of(".").toAbsolutePath()
+                .resolve("does-not-exist")
+                .resolve("does-not-exist")
+                .resolve("threads.bad");
+        jcmdThreadDumpToFile(badFile, "-format=plain")
+                .shouldMatch("Failed");
+        jcmdThreadDumpToFile(badFile, "-format=json")
+                .shouldMatch("Failed");
     }
 
     /**
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java
index a4072f2f7ff..adf643749c7 100644
--- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.java
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreads.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
@@ -21,41 +21,64 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @bug 8284161 8287008 8309406
+ * @bug 8284161 8287008 8309406 8356870
  * @summary Basic test for com.sun.management.HotSpotDiagnosticMXBean.dumpThreads
  * @requires vm.continuations
- * @modules jdk.management
+ * @modules java.base/jdk.internal.vm jdk.management
  * @library /test/lib
- * @run junit/othervm DumpThreads
- * @run junit/othervm -Djdk.trackAllThreads DumpThreads
- * @run junit/othervm -Djdk.trackAllThreads=true DumpThreads
- * @run junit/othervm -Djdk.trackAllThreads=false DumpThreads
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run junit/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *         --enable-native-access=ALL-UNNAMED DumpThreads
+ * @run junit/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *         --enable-native-access=ALL-UNNAMED -Djdk.trackAllThreads DumpThreads
+ * @run junit/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *        --enable-native-access=ALL-UNNAMED -Djdk.trackAllThreads=true DumpThreads
+ * @run junit/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *        --enable-native-access=ALL-UNNAMED -Djdk.trackAllThreads=false DumpThreads
  */
 
 import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Path;
-import java.util.Objects;
 import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
 import com.sun.management.HotSpotDiagnosticMXBean;
 import com.sun.management.HotSpotDiagnosticMXBean.ThreadDumpFormat;
 import jdk.test.lib.threaddump.ThreadDump;
+import jdk.test.lib.thread.VThreadPinner;
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.whitebox.WhiteBox;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 class DumpThreads {
     private static boolean trackAllThreads;
@@ -64,6 +87,56 @@ class DumpThreads {
     static void setup() throws Exception {
         String s = System.getProperty("jdk.trackAllThreads");
         trackAllThreads = (s == null) || s.isEmpty() || Boolean.parseBoolean(s);
+
+        // need >=2 carriers for testing pinning
+        VThreadRunner.ensureParallelism(2);
+    }
+
+    /**
+     * Test thread dump in plain text format.
+     */
+    @Test
+    void testPlainText() throws Exception {
+        List<String> lines = dumpThreadsToPlainText();
+
+        // pid should be on the first line
+        String pid = Long.toString(ProcessHandle.current().pid());
+        assertEquals(pid, lines.get(0));
+
+        // timestamp should be on the second line
+        String secondLine = lines.get(1);
+        ZonedDateTime.parse(secondLine);
+
+        // runtime version should be on third line
+        String vs = Runtime.version().toString();
+        assertEquals(vs, lines.get(2));
+
+        // dump should include current thread
+        Thread currentThread = Thread.currentThread();
+        if (trackAllThreads || !currentThread.isVirtual()) {
+            ThreadFields fields = findThread(currentThread.threadId(), lines);
+            assertNotNull(fields, "current thread not found");
+            assertEquals(currentThread.getName(), fields.name());
+            assertEquals(currentThread.isVirtual(), fields.isVirtual());
+        }
+    }
+
+    /**
+     * Test thread dump in JSON format.
+     */
+    @Test
+    void testJsonFormat() throws Exception {
+        ThreadDump threadDump = dumpThreadsToJson();
+
+        // dump should include current thread in the root container
+        Thread currentThread = Thread.currentThread();
+        if (trackAllThreads || !currentThread.isVirtual()) {
+            ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                    .findThread(currentThread.threadId())
+                    .orElse(null);
+            assertNotNull(ti, "current thread not found");
+            assertEquals(currentThread.isVirtual(), ti.isVirtual());
+        }
     }
 
     /**
@@ -78,180 +151,438 @@ static Stream<ExecutorService> executors() {
     }
 
     /**
-     * Test thread dump in plain text format contains information about the current
-     * thread and a virtual thread created directly with the Thread API.
+     * Test that a thread container for an executor service is in the JSON format thread dump.
      */
-    @Test
-    void testRootContainerPlainTextFormat() throws Exception {
-        Thread vthread = Thread.ofVirtual().start(LockSupport::park);
-        try {
-            testDumpThreadsPlainText(vthread, trackAllThreads);
-        } finally {
-            LockSupport.unpark(vthread);
+    @ParameterizedTest
+    @MethodSource("executors")
+    void testThreadContainer(ExecutorService executor) throws Exception {
+        try (executor) {
+            testThreadContainer(executor, Objects.toIdentityString(executor));
         }
     }
 
     /**
-     * Test thread dump in JSON format contains information about the current
-     * thread and a virtual thread created directly with the Thread API.
+     * Test that a thread container for the common pool is in the JSON format thread dump.
      */
     @Test
-    void testRootContainerJsonFormat() throws Exception {
-        Thread vthread = Thread.ofVirtual().start(LockSupport::park);
+    void testCommonPool() throws Exception {
+        testThreadContainer(ForkJoinPool.commonPool(), "ForkJoinPool.commonPool");
+    }
+
+    /**
+     * Test that the JSON thread dump has a thread container for the given executor.
+     */
+    private void testThreadContainer(ExecutorService executor, String name) throws Exception {
+        var threadRef = new AtomicReference<Thread>();
+
+        executor.submit(() -> {
+            threadRef.set(Thread.currentThread());
+            LockSupport.park();
+        });
+
+        // capture Thread
+        Thread thread;
+        while ((thread = threadRef.get()) == null) {
+            Thread.sleep(20);
+        }
+
         try {
-            testDumpThreadsJson(null, vthread, trackAllThreads);
+            // dump threads to file and parse as JSON object
+            ThreadDump threadDump = dumpThreadsToJson();
+
+            // find the thread container corresponding to the executor
+            var container = threadDump.findThreadContainer(name).orElse(null);
+            assertNotNull(container, name + " not found");
+            assertFalse(container.owner().isPresent());
+            var parent = container.parent().orElse(null);
+            assertEquals(threadDump.rootThreadContainer(), parent);
+
+            // find the thread in the thread container
+            ThreadDump.ThreadInfo ti = container.findThread(thread.threadId()).orElse(null);
+            assertNotNull(ti, "thread not found");
+
         } finally {
-            LockSupport.unpark(vthread);
+            LockSupport.unpark(thread);
         }
     }
 
     /**
-     * Test thread dump in plain text format includes a thread executing a task in the
-     * given ExecutorService.
+     * ThreadFactory implementations for tests.
      */
-    @ParameterizedTest
-    @MethodSource("executors")
-    void testExecutorServicePlainTextFormat(ExecutorService executor) throws Exception {
-        try (executor) {
-            Thread thread = forkParker(executor);
-            try {
-                testDumpThreadsPlainText(thread, true);
-            } finally {
-                LockSupport.unpark(thread);
-            }
+    static Stream<ThreadFactory> threadFactories() {
+        Stream<ThreadFactory> s = Stream.of(Thread.ofPlatform().factory());
+        if (trackAllThreads) {
+            return Stream.concat(s, Stream.of(Thread.ofVirtual().factory()));
+        } else {
+            return s;
         }
     }
 
     /**
-     * Test thread dump in JSON format includes a thread executing a task in the
-     * given ExecutorService.
+     * Test thread dump with a thread blocked on monitor enter.
      */
     @ParameterizedTest
-    @MethodSource("executors")
-    void testExecutorServiceJsonFormat(ExecutorService executor) throws Exception {
-        try (executor) {
-            Thread thread = forkParker(executor);
-            try {
-                testDumpThreadsJson(Objects.toIdentityString(executor), thread, true);
-            } finally {
-                LockSupport.unpark(thread);
-            }
-        }
+    @MethodSource("threadFactories")
+    void testBlockedThread(ThreadFactory factory) throws Exception {
+        testBlockedThread(factory, false);
     }
 
     /**
-     * Test thread dump in JSON format includes a thread executing a task in the
-     * fork-join common pool.
+     * Test thread dump with a thread blocked on monitor enter when pinned.
      */
     @Test
-    void testForkJoinPool() throws Exception {
-        ForkJoinPool pool = ForkJoinPool.commonPool();
-        Thread thread = forkParker(pool);
+    void testBlockedThreadWhenPinned() throws Exception {
+        assumeTrue(trackAllThreads, "This test requires all threads to be tracked");
+        testBlockedThread(Thread.ofVirtual().factory(), true);
+    }
+
+    void testBlockedThread(ThreadFactory factory, boolean pinned) throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+
+        Thread thread = factory.newThread(() -> {
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    started.countDown();
+                    synchronized (lock) { }  // blocks
+                });
+            } else {
+                started.countDown();
+                synchronized (lock) { }  // blocks
+            }
+        });
+
         try {
-            testDumpThreadsJson("ForkJoinPool.commonPool", thread, true);
+            synchronized (lock) {
+                // start thread and wait for it to block
+                thread.start();
+                started.await();
+                await(thread, Thread.State.BLOCKED);
+
+                long tid = thread.threadId();
+                String lockAsString = Objects.toIdentityString(lock);
+
+                // thread dump in plain text should include thread
+                List<String> lines = dumpThreadsToPlainText();
+                ThreadFields fields = findThread(tid, lines);
+                assertNotNull(fields, "thread not found");
+                assertEquals("BLOCKED", fields.state());
+                assertTrue(contains(lines, "- waiting to lock <" + lockAsString));
+
+                // thread dump in JSON format should include thread in root container
+                ThreadDump threadDump = dumpThreadsToJson();
+                ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                        .findThread(tid)
+                        .orElse(null);
+                assertNotNull(ti, "thread not found");
+                assertEquals("BLOCKED", ti.state());
+                assertEquals(lockAsString, ti.blockedOn());
+                if (pinned) {
+                    long carrierTid = ti.carrier().orElse(-1L);
+                    assertNotEquals(-1L, carrierTid, "carrier not found");
+                    assertForkJoinWorkerThread(carrierTid);
+                }
+            }
         } finally {
-            LockSupport.unpark(thread);
+            thread.join();
         }
     }
 
     /**
-     * Invoke HotSpotDiagnosticMXBean.dumpThreads to create a thread dump in plain text
-     * format, then sanity check that the thread dump includes expected strings, the
-     * current thread, and maybe the given thread.
-     * @param thread the thread to test if included
-     * @param expectInDump true if the thread is expected to be included
+     * Test thread dump with a thread waiting in Object.wait.
      */
-    private void testDumpThreadsPlainText(Thread thread, boolean expectInDump) throws Exception {
-        Path file = genOutputPath(".txt");
-        var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
-        mbean.dumpThreads(file.toString(), ThreadDumpFormat.TEXT_PLAIN);
-        System.err.format("Dumped to %s%n", file);
+    @ParameterizedTest
+    @MethodSource("threadFactories")
+    void testWaitingThread(ThreadFactory factory) throws Exception {
+        testWaitingThread(factory, false);
+    }
 
-        // pid should be on the first line
-        String line1 = line(file, 0);
-        String pid = Long.toString(ProcessHandle.current().pid());
-        assertTrue(line1.contains(pid));
+    /**
+     * Test thread dump with a thread waiting in Object.wait when pinned.
+     */
+    @Test
+    void testWaitingThreadWhenPinned() throws Exception {
+        assumeTrue(trackAllThreads, "This test requires all threads to be tracked");
+        testWaitingThread(Thread.ofVirtual().factory(), true);
+    }
 
-        // timestamp should be on the second line
-        String line2 = line(file, 1);
-        ZonedDateTime.parse(line2);
+    void testWaitingThread(ThreadFactory factory, boolean pinned) throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
 
-        // runtime version should be on third line
-        String line3 = line(file, 2);
-        String vs = Runtime.version().toString();
-        assertTrue(line3.contains(vs));
+        Thread thread = factory.newThread(() -> {
+            try {
+                synchronized (lock) {
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            started.countDown();
+                            lock.wait();
+                        });
+                    } else {
+                        started.countDown();
+                        lock.wait();
+                    }
+                }
+            } catch (InterruptedException e) { }
+        });
 
-        // test if thread is included in thread dump
-        assertEquals(expectInDump, isPresent(file, thread));
+        try {
+            // start thread and wait for it to wait in Object.wait
+            thread.start();
+            started.await();
+            await(thread, Thread.State.WAITING);
+
+            long tid = thread.threadId();
+            String lockAsString = Objects.toIdentityString(lock);
+
+            // thread dump in plain text should include thread
+            List<String> lines = dumpThreadsToPlainText();
+            ThreadFields fields = findThread(tid, lines);
+            assertNotNull(fields, "thread not found");
+            assertEquals("WAITING", fields.state());
+
+            // thread dump in JSON format should include thread in root container
+            ThreadDump threadDump = dumpThreadsToJson();
+            ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                    .findThread(thread.threadId())
+                    .orElse(null);
+            assertNotNull(ti, "thread not found");
+            assertEquals(ti.isVirtual(), thread.isVirtual());
+            assertEquals("WAITING", ti.state());
+            if (pinned) {
+                long carrierTid = ti.carrier().orElse(-1L);
+                assertNotEquals(-1L, carrierTid, "carrier not found");
+                assertForkJoinWorkerThread(carrierTid);
+            }
 
-        // current thread should be included if platform thread or tracking all threads
-        Thread currentThread = Thread.currentThread();
-        boolean currentThreadExpected = trackAllThreads || !currentThread.isVirtual();
-        assertEquals(currentThreadExpected, isPresent(file, currentThread));
+            // Compiled native frames have no locals. If Object.wait0 has been compiled
+            // then we don't have the object that the thread is waiting on
+            Method wait0 = Object.class.getDeclaredMethod("wait0", long.class);
+            boolean expectWaitingOn = !WhiteBox.getWhiteBox().isMethodCompiled(wait0);
+            if (expectWaitingOn) {
+                // plain text dump should have "waiting on" line
+                assertTrue(contains(lines, "- waiting on <" + lockAsString));
+
+                // JSON thread dump should have waitingOn property
+                assertEquals(lockAsString, ti.waitingOn());
+            }
+
+        } finally {
+            synchronized (lock) {
+                lock.notifyAll();
+            }
+            thread.join();
+        }
     }
 
     /**
-     * Invoke HotSpotDiagnosticMXBean.dumpThreads to create a thread dump in JSON format.
-     * The thread dump is parsed as a JSON object and checked to ensure that it contains
-     * expected data, the current thread, and maybe the given thread.
-     * @param containerName the name of the container or null for the root container
-     * @param thread the thread to test if included
-     * @param expect true if the thread is expected to be included
+     * Test thread dump with a thread parked on a j.u.c. lock.
      */
-    private void testDumpThreadsJson(String containerName,
-                                     Thread thread,
-                                     boolean expectInDump) throws Exception {
-        Path file = genOutputPath(".json");
-        var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
-        mbean.dumpThreads(file.toString(), ThreadDumpFormat.JSON);
-        System.err.format("Dumped to %s%n", file);
+    @ParameterizedTest
+    @MethodSource("threadFactories")
+    void testParkedThread(ThreadFactory factory) throws Exception {
+        testParkedThread(factory, false);
+    }
 
-        // parse the JSON text
-        String jsonText = Files.readString(file);
-        ThreadDump threadDump = ThreadDump.parse(jsonText);
+    /**
+     * Test thread dump with a thread parked on a j.u.c. lock and pinned.
+     */
+    @Test
+    void testParkedThreadWhenPinned() throws Exception {
+        assumeTrue(trackAllThreads, "This test requires all threads to be tracked");
+        testParkedThread(Thread.ofVirtual().factory(), true);
+    }
 
-        // test threadDump/processId
-        assertTrue(threadDump.processId() == ProcessHandle.current().pid());
+    void testParkedThread(ThreadFactory factory, boolean pinned) throws Exception {
+        var lock = new ReentrantLock();
+        var started = new CountDownLatch(1);
+
+        Thread thread = factory.newThread(() -> {
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    started.countDown();
+                    lock.lock();
+                    lock.unlock();
+                });
+            } else {
+                started.countDown();
+                lock.lock();
+                lock.unlock();
+            }
+        });
 
-        // test threadDump/time can be parsed
-        ZonedDateTime.parse(threadDump.time());
+        lock.lock();
+        try {
+            // start thread and wait for it to park
+            thread.start();
+            started.await();
+            await(thread, Thread.State.WAITING);
+
+            long tid = thread.threadId();
+
+            // thread dump in plain text should include thread
+            List<String> lines = dumpThreadsToPlainText();
+            ThreadFields fields = findThread(tid, lines);
+            assertNotNull(fields, "thread not found");
+            assertEquals("WAITING", fields.state());
+            assertTrue(contains(lines, "- parking to wait for <java.util.concurrent.locks.ReentrantLock"));
+
+            // thread dump in JSON format should include thread in root container
+            ThreadDump threadDump = dumpThreadsToJson();
+            ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                    .findThread(thread.threadId())
+                    .orElse(null);
+            assertNotNull(ti, "thread not found");
+            assertEquals(ti.isVirtual(), thread.isVirtual());
+
+            // thread should be waiting on the ReentrantLock
+            assertEquals("WAITING", ti.state());
+            String parkBlocker = ti.parkBlocker();
+            assertNotNull(parkBlocker);
+            assertTrue(parkBlocker.contains("java.util.concurrent.locks.ReentrantLock"));
+            if (pinned) {
+                long carrierTid = ti.carrier().orElse(-1L);
+                assertNotEquals(-1L, carrierTid, "carrier not found");
+                assertForkJoinWorkerThread(carrierTid);
+            }
+        } finally {
+            lock.unlock();
+            thread.join();
+        }
+    }
 
-        // test threadDump/runtimeVersion
-        assertEquals(Runtime.version().toString(), threadDump.runtimeVersion());
+    /**
+     * Test thread dump with a thread owning a monitor.
+     */
+    @ParameterizedTest
+    @MethodSource("threadFactories")
+    void testThreadOwnsMonitor(ThreadFactory factory) throws Exception {
+        testThreadOwnsMonitor(factory, false);
+    }
 
-        // test root container, has no parent and no owner
-        var rootContainer = threadDump.rootThreadContainer();
-        assertFalse(rootContainer.owner().isPresent());
-        assertFalse(rootContainer.parent().isPresent());
+    @Test
+    void testThreadOwnsMonitorWhenPinned() throws Exception {
+        assumeTrue(trackAllThreads, "This test requires all threads to be tracked");
+        testThreadOwnsMonitor(Thread.ofVirtual().factory(), true);
+    }
 
-        // test that the container contains the given thread
-        ThreadDump.ThreadContainer container;
-        if (containerName == null) {
-            // root container, the thread should be found if trackAllThreads is true
-            container = rootContainer;
-        } else {
-            // find the container
-            container = threadDump.findThreadContainer(containerName).orElse(null);
-            assertNotNull(container, containerName + " not found");
-            assertFalse(container.owner().isPresent());
-            assertTrue(container.parent().get() == rootContainer);
+    void testThreadOwnsMonitor(ThreadFactory factory, boolean pinned) throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+
+        Thread thread = factory.newThread(() -> {
+            synchronized (lock) {
+                if (pinned) {
+                    VThreadPinner.runPinned(() -> {
+                        started.countDown();
+                        LockSupport.park();
+                    });
+                } else {
+                    started.countDown();
+                    LockSupport.park();
+                }
+            }
+        });
 
+        try {
+            // start thread and wait for it to park
+            thread.start();
+            started.await();
+            await(thread, Thread.State.WAITING);
+
+            long tid = thread.threadId();
+            String lockAsString = Objects.toIdentityString(lock);
+
+            // thread dump in plain text should include thread
+            List<String> lines = dumpThreadsToPlainText();
+            ThreadFields fields = findThread(tid, lines);
+            assertNotNull(fields, "thread not found");
+            assertEquals("WAITING", fields.state());
+            assertTrue(contains(lines, "- locked <" + lockAsString));
+
+            // thread dump in JSON format should include thread in root container
+            ThreadDump threadDump = dumpThreadsToJson();
+            ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                    .findThread(tid)
+                    .orElse(null);
+            assertNotNull(ti, "thread not found");
+            assertEquals(ti.isVirtual(), thread.isVirtual());
+
+            // the lock should be in the ownedMonitors array
+            Set<String> ownedMonitors = ti.ownedMonitors().values()
+                    .stream()
+                    .flatMap(List::stream)
+                    .collect(Collectors.toSet());
+            assertTrue(ownedMonitors.contains(lockAsString), lockAsString + " not found");
+        } finally {
+            LockSupport.unpark(thread);
+            thread.join();
         }
-        boolean found = container.findThread(thread.threadId()).isPresent();
-        assertEquals(expectInDump, found);
+    }
 
-        // current thread should be in root container if platform thread or tracking all threads
-        Thread currentThread = Thread.currentThread();
-        boolean currentThreadExpected = trackAllThreads || !currentThread.isVirtual();
-        found = rootContainer.findThread(currentThread.threadId()).isPresent();
-        assertEquals(currentThreadExpected, found);
+    /**
+     * Test mounted virtual thread.
+     */
+    @Test
+    void testMountedVirtualThread() throws Exception {
+        assumeTrue(trackAllThreads, "This test requires all threads to be tracked");
+
+        // start virtual thread that spins until done
+        var started = new AtomicBoolean();
+        var done = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            started.set(true);
+            while (!done.get()) {
+                Thread.onSpinWait();
+            }
+        });
+
+        try {
+            // wait for thread to start
+            awaitTrue(started);
+            long tid = thread.threadId();
+
+            // thread dump in plain text should include thread
+            List<String> lines = dumpThreadsToPlainText();
+            ThreadFields fields = findThread(tid, lines);
+            assertNotNull(fields, "thread not found");
+            assertTrue(fields.isVirtual());
+
+            // thread dump in JSON format should include thread in root container
+            ThreadDump threadDump = dumpThreadsToJson();
+            ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                    .findThread(tid)
+                    .orElse(null);
+            assertNotNull(ti, "thread not found");
+            assertTrue(ti.isVirtual());
+            long carrierTid = ti.carrier().orElse(-1L);
+            assertNotEquals(-1L, carrierTid, "carrier not found");
+            assertForkJoinWorkerThread(carrierTid);
+        } finally {
+            done.set(true);
+            thread.join();
+        }
+    }
+
+    /**
+     * Asserts that the given thread identifier is a ForkJoinWorkerThread.
+     */
+    private void assertForkJoinWorkerThread(long tid) {
+        Thread thread = Thread.getAllStackTraces()
+                .keySet()
+                .stream()
+                .filter(t -> t.threadId() == tid)
+                .findAny()
+                .orElse(null);
+        assertNotNull(thread, "thread " + tid + " not found");
+        assertTrue(thread instanceof ForkJoinWorkerThread, "not a ForkJoinWorkerThread");
     }
 
     /**
      * Test that dumpThreads throws if the output file already exists.
      */
     @Test
-    void testFileAlreadyExsists() throws Exception {
+    void testFileAlreadyExists() throws Exception {
         var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
         String file = Files.createFile(genOutputPath("txt")).toString();
         assertThrows(FileAlreadyExistsException.class,
@@ -260,11 +591,44 @@ void testFileAlreadyExsists() throws Exception {
                 () -> mbean.dumpThreads(file, ThreadDumpFormat.JSON));
     }
 
+    /**
+     * Test that dumpThreads throws IOException when the output file cannot be created.
+     */
+    @Test
+    void testFileCreateFails() {
+        var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        String badFile = Path.of(".").toAbsolutePath()
+                .resolve("does-not-exist")
+                .resolve("does-not-exist")
+                .resolve("threads.bad")
+                .toString();
+        assertThrows(IOException.class,
+                () -> mbean.dumpThreads(badFile, ThreadDumpFormat.TEXT_PLAIN));
+        assertThrows(IOException.class,
+                () -> mbean.dumpThreads(badFile, ThreadDumpFormat.JSON));
+    }
+
+    /**
+     * Test that dumpThreads throws IOException if writing to output file fails.
+     */
+    @Test
+    void testFileWriteFails() {
+        var out = new OutputStream() {
+            @Override
+            public void write(int b) throws IOException {
+                throw new IOException("There is not enough space on the disk");
+            }
+        };
+        // need to invoke internal API directly to test this
+        assertThrows(IOException.class, () -> jdk.internal.vm.ThreadDumper.dumpThreads(out));
+        assertThrows(IOException.class, () -> jdk.internal.vm.ThreadDumper.dumpThreadsToJson(out));
+    }
+
     /**
      * Test that dumpThreads throws if the file path is relative.
      */
     @Test
-    void testRelativePath() throws Exception {
+    void testRelativePath() {
         var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
         assertThrows(IllegalArgumentException.class,
                 () -> mbean.dumpThreads("threads.txt", ThreadDumpFormat.TEXT_PLAIN));
@@ -276,7 +640,7 @@ void testRelativePath() throws Exception {
      * Test that dumpThreads throws with null parameters.
      */
     @Test
-    void testNull() throws Exception {
+    void testNull() {
         var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
         assertThrows(NullPointerException.class,
                 () -> mbean.dumpThreads(null, ThreadDumpFormat.TEXT_PLAIN));
@@ -285,31 +649,63 @@ void testNull() throws Exception {
     }
 
     /**
-     * Submits a parking task to the given executor, returns the Thread object of
-     * the parked thread.
+     * Represents the data for a thread found in a plain text thread dump.
      */
-    private static Thread forkParker(ExecutorService executor) {
-        class Box { static volatile Thread thread;}
-        var latch = new CountDownLatch(1);
-        executor.submit(() -> {
-            Box.thread = Thread.currentThread();
-            latch.countDown();
-            LockSupport.park();
-        });
-        try {
-            latch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+    private record ThreadFields(long tid, String name, boolean isVirtual, String state) { }
+
+    /**
+     * Find a thread in the lines of a plain text thread dump.
+     */
+    private ThreadFields findThread(long tid, List<String> lines) {
+        String line = lines.stream()
+                .filter(l -> l.startsWith("#" + tid + " "))
+                .findFirst()
+                .orElse(null);
+        if (line == null) {
+            return null;
         }
-        return Box.thread;
+
+        // #3 "main" RUNNABLE 2025-04-18T15:22:12.012450Z
+        // #36 "" virtual WAITING 2025-04-18T15:22:12.012450Z
+        Pattern pattern = Pattern.compile("#(\\d+)\\s+\"([^\"]*)\"\\s+(virtual\\s+)?(\\w+)\\s+(.*)");
+        Matcher matcher = pattern.matcher(line);
+        assertTrue(matcher.matches());
+        String name = matcher.group(2);
+        boolean isVirtual = "virtual ".equals(matcher.group(3));
+        String state = matcher.group(4);
+        return new ThreadFields(tid, name, isVirtual, state);
     }
 
     /**
-     * Returns true if a Thread is present in a plain text thread dump.
+     * Returns true if lines of a plain text thread dump contain the given text.
      */
-    private static boolean isPresent(Path file, Thread thread) throws Exception {
-        String expect = "#" + thread.threadId();
-        return count(file, expect) > 0;
+    private boolean contains(List<String> lines, String text) {
+        return lines.stream().map(String::trim)
+                .anyMatch(l -> l.contains(text));
+    }
+
+    /**
+     * Dump threads to a file in plain text format, return the lines in the file.
+     */
+    private List<String> dumpThreadsToPlainText() throws Exception {
+        Path file = genOutputPath(".txt");
+        var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        mbean.dumpThreads(file.toString(), HotSpotDiagnosticMXBean.ThreadDumpFormat.TEXT_PLAIN);
+        System.err.format("Dumped to %s%n", file.getFileName());
+        List<String> lines = Files.readAllLines(file);
+        return lines;
+    }
+
+    /**
+     * Dump threads to a file in JSON format, parse and return as JSON object.
+     */
+    private static ThreadDump dumpThreadsToJson() throws Exception {
+        Path file = genOutputPath(".json");
+        var mbean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+        mbean.dumpThreads(file.toString(), HotSpotDiagnosticMXBean.ThreadDumpFormat.JSON);
+        System.err.format("Dumped to %s%n", file.getFileName());
+        String jsonText = Files.readString(file);
+        return ThreadDump.parse(jsonText);
     }
 
     /**
@@ -323,21 +719,23 @@ private static Path genOutputPath(String suffix) throws Exception {
     }
 
     /**
-     * Return the count of the number of files in the given file that contain
-     * the given character sequence.
+     * Waits for the given thread to get to a given state.
      */
-    static long count(Path file, CharSequence cs) throws Exception {
-        try (Stream<String> stream = Files.lines(file)) {
-            return stream.filter(line -> line.contains(cs)).count();
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
         }
     }
 
     /**
-     * Return line $n of the given file.
+     * Waits for the boolean value to become true.
      */
-    private String line(Path file, long n) throws Exception {
-        try (Stream<String> stream = Files.lines(file)) {
-            return stream.skip(n).findFirst().orElseThrow();
+    private static void awaitTrue(AtomicBoolean ref) throws Exception {
+        while (!ref.get()) {
+            Thread.sleep(20);
         }
     }
 }
diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java
new file mode 100644
index 00000000000..a2dce62792b
--- /dev/null
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpThreadsWithEliminatedLock.java
@@ -0,0 +1,171 @@
+/*
+ * 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 8356870
+ * @summary Test HotSpotDiagnosticMXBean.dumpThreads with a thread owning a monitor for
+ *     an object that is scalar replaced
+ * @requires !vm.debug & (vm.compMode != "Xcomp")
+ * @requires (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ * @modules jdk.management
+ * @library /test/lib
+ * @run main/othervm DumpThreadsWithEliminatedLock plain platform
+ * @run main/othervm DumpThreadsWithEliminatedLock plain virtual
+ * @run main/othervm DumpThreadsWithEliminatedLock json platform
+ * @run main/othervm DumpThreadsWithEliminatedLock json virtual
+ */
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+import com.sun.management.HotSpotDiagnosticMXBean;
+import jdk.test.lib.threaddump.ThreadDump;
+import jdk.test.lib.thread.VThreadRunner;
+
+public class DumpThreadsWithEliminatedLock {
+
+    public static void main(String[] args) throws Exception {
+        boolean plain = switch (args[0]) {
+            case "plain" -> true;
+            case "json"  -> false;
+            default      -> throw new RuntimeException("Unknown dump format");
+        };
+
+        ThreadFactory factory = switch (args[1]) {
+            case "platform" -> Thread.ofPlatform().factory();
+            case "virtual"  -> Thread.ofVirtual().factory();
+            default         -> throw new RuntimeException("Unknown thread kind");
+        };
+
+        // need at least two carriers for JTREG_TEST_THREAD_FACTORY=Virtual
+        if (Thread.currentThread().isVirtual()) {
+            VThreadRunner.ensureParallelism(2);
+        }
+
+        // A thread that spins creating and adding to a StringBuffer. StringBuffer is
+        // synchronized, assume object will be scalar replaced and the lock eliminated.
+        var done = new AtomicBoolean();
+        var ref = new AtomicReference<String>();
+        Thread thread = factory.newThread(() -> {
+            while (!done.get()) {
+                StringBuffer sb = new StringBuffer();
+                sb.append(System.currentTimeMillis());
+                String s = sb.toString();
+                ref.set(s);
+            }
+        });
+        try {
+            thread.start();
+            if (plain) {
+                testPlainFormat();
+            } else {
+                testJsonFormat(thread.threadId());
+            }
+        } finally {
+            done.set(true);
+            thread.join();
+        }
+    }
+
+    /**
+     * Invoke HotSpotDiagnosticMXBean.dumpThreads to generate a thread dump in plain text
+     * format until "lock is eliminated" is found in the output.
+     */
+    private static void testPlainFormat() {
+        try {
+            Path file = genOutputPath(".txt");
+            boolean found = false;
+            int attempts = 0;
+            while (!found) {
+                attempts++;
+                Files.deleteIfExists(file);
+                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                        .dumpThreads(file.toString(), HotSpotDiagnosticMXBean.ThreadDumpFormat.TEXT_PLAIN);
+                try (Stream<String> stream = Files.lines(file)) {
+                    found = stream.map(String::trim)
+                            .anyMatch(l -> l.contains("- lock is eliminated"));
+                }
+                System.out.format("%s Attempt %d, found: %b%n", Instant.now(), attempts, found);
+            }
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
+    }
+
+    /**
+     * Invoke HotSpotDiagnosticMXBean.dumpThreads to generate a thread dump in JSON format
+     * until the monitorsOwned.locks array for the given thread has a null lock.
+     */
+    private static void testJsonFormat(long tid) {
+        try {
+            Path file = genOutputPath(".json");
+            boolean found = false;
+            int attempts = 0;
+            while (!found) {
+                attempts++;
+                Files.deleteIfExists(file);
+                ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
+                        .dumpThreads(file.toString(), HotSpotDiagnosticMXBean.ThreadDumpFormat.JSON);
+
+                // parse thread dump as JSON and find thread
+                String jsonText = Files.readString(file);
+                ThreadDump threadDump = ThreadDump.parse(jsonText);
+                ThreadDump.ThreadInfo ti = threadDump.rootThreadContainer()
+                        .findThread(tid)
+                        .orElse(null);
+                if (ti == null) {
+                    throw new RuntimeException("Thread " + tid + " not found in thread dump");
+                }
+
+                // look for null element in ownedMonitors/locks array
+                found = ti.ownedMonitors()
+                        .values()
+                        .stream()
+                        .flatMap(List::stream)
+                        .anyMatch(o -> o == null);
+                System.out.format("%s Attempt %d, found: %b%n", Instant.now(), attempts, found);
+            }
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
+    }
+
+    /**
+     * Generate a file path with the given suffix to use as an output file.
+     */
+    private static Path genOutputPath(String suffix) throws IOException {
+        Path dir = Path.of(".").toAbsolutePath();
+        Path file = Files.createTempFile(dir, "dump", suffix);
+        Files.delete(file);
+        return file;
+    }
+}
\ No newline at end of file
diff --git a/test/lib/jdk/test/lib/threaddump/ThreadDump.java b/test/lib/jdk/test/lib/threaddump/ThreadDump.java
index 5e4f6ebc10f..f4964a9521f 100644
--- a/test/lib/jdk/test/lib/threaddump/ThreadDump.java
+++ b/test/lib/jdk/test/lib/threaddump/ThreadDump.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
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -62,6 +63,7 @@
  *          {
  *            "tid": "8",
  *            "name": "Reference Handler",
+ *            "state": "RUNNABLE",
  *            "stack": [
  *               "java.base\/java.lang.ref.Reference.waitForReferencePendingList(Native Method)",
  *               "java.base\/java.lang.ref.Reference.processPendingReferences(Reference.java:245)",
@@ -113,23 +115,46 @@
  * }</pre>
  */
 public final class ThreadDump {
-    private final long processId;
-    private final String time;
-    private final String runtimeVersion;
-    private ThreadContainer rootThreadContainer;
+    private final ThreadContainer rootThreadContainer;
+    private final Map<String, ThreadContainer> nameToThreadContainer;
+    private final JSONValue threadDumpObj;
+
+    private ThreadDump(ThreadContainer rootThreadContainer,
+                       Map<String, ThreadContainer> nameToThreadContainer,
+                       JSONValue threadDumpObj) {
+        this.rootThreadContainer = rootThreadContainer;
+        this.nameToThreadContainer = nameToThreadContainer;
+        this.threadDumpObj = threadDumpObj;
+    }
 
     /**
      * Represents an element in the threadDump/threadContainers array.
      */
     public static class ThreadContainer {
         private final String name;
-        private long owner;
-        private ThreadContainer parent;
-        private Set<ThreadInfo> threads;
+        private final ThreadContainer parent;
         private final Set<ThreadContainer> children = new HashSet<>();
+        private final JSONValue containerObj;
 
-        ThreadContainer(String name) {
+        ThreadContainer(String name, ThreadContainer parent, JSONValue containerObj) {
             this.name = name;
+            this.parent = parent;
+            this.containerObj = containerObj;
+        }
+
+        /**
+         * Add a child thread container.
+         */
+        void addChild(ThreadContainer container) {
+            children.add(container);
+        }
+
+        /**
+         * Returns the value of a property of this thread container, as a string.
+         */
+        private String getStringProperty(String propertyName) {
+            JSONValue value = containerObj.get(propertyName);
+            return (value != null) ? value.asString() : null;
         }
 
         /**
@@ -143,7 +168,10 @@ public String name() {
          * Return the thread identifier of the owner or empty OptionalLong if not owned.
          */
         public OptionalLong owner() {
-           return (owner != 0) ? OptionalLong.of(owner) : OptionalLong.empty();
+            String owner = getStringProperty("owner");
+            return (owner != null)
+                    ? OptionalLong.of(Long.parseLong(owner))
+                    : OptionalLong.empty();
         }
 
         /**
@@ -164,7 +192,12 @@ public Stream<ThreadContainer> children() {
          * Returns a stream of {@code ThreadInfo} objects for the threads in this container.
          */
         public Stream<ThreadInfo> threads() {
-            return threads.stream();
+            JSONValue.JSONArray threadsObj = containerObj.get("threads").asArray();
+            Set<ThreadInfo> threadInfos = new HashSet<>();
+            for (JSONValue threadObj : threadsObj) {
+                threadInfos.add(new ThreadInfo(threadObj));
+            }
+            return threadInfos.stream();
         }
 
         /**
@@ -176,21 +209,6 @@ public Optional<ThreadInfo> findThread(long tid) {
                     .findAny();
         }
 
-        /**
-         * Helper method to recursively find a container with the given name.
-         */
-        ThreadContainer findThreadContainer(String name) {
-            if (name().equals(name))
-                return this;
-            if (name().startsWith(name + "/"))
-                return this;
-            return children()
-                    .map(c -> c.findThreadContainer(name))
-                    .filter(c -> c != null)
-                    .findAny()
-                    .orElse(null);
-        }
-
         @Override
         public int hashCode() {
             return name.hashCode();
@@ -216,13 +234,30 @@ public String toString() {
      */
     public static final class ThreadInfo {
         private final long tid;
-        private final String name;
-        private final List<String> stack;
+        private final JSONValue threadObj;
 
-        ThreadInfo(long tid, String name, List<String> stack) {
-            this.tid = tid;
-            this.name = name;
-            this.stack = stack;
+        ThreadInfo(JSONValue threadObj) {
+            this.tid = Long.parseLong(threadObj.get("tid").asString());
+            this.threadObj = threadObj;
+        }
+
+        /**
+         * Returns the value of a property of this thread object, as a string.
+         */
+        private String getStringProperty(String propertyName) {
+            JSONValue value = threadObj.get(propertyName);
+            return (value != null) ? value.asString() : null;
+        }
+
+        /**
+         * Returns the value of a property of an object in this thread object, as a string.
+         */
+        private String getStringProperty(String objectName, String propertyName) {
+            if (threadObj.get(objectName) instanceof JSONValue.JSONObject obj
+                    && obj.get(propertyName) instanceof JSONValue value) {
+                return value.asString();
+            }
+            return null;
         }
 
         /**
@@ -236,16 +271,86 @@ public long tid() {
          * Returns the thread name.
          */
         public String name() {
-            return name;
+            return getStringProperty("name");
+        }
+
+        /**
+         * Returns the thread state.
+         */
+        public String state() {
+            return getStringProperty("state");
+        }
+
+        /**
+         * Returns true if virtual thread.
+         */
+        public boolean isVirtual() {
+            String s = getStringProperty("virtual");
+            return (s != null) ? Boolean.parseBoolean(s) : false;
+        }
+
+        /**
+         * Returns the thread's parkBlocker.
+         */
+        public String parkBlocker() {
+            return getStringProperty("parkBlocker", "object");
+        }
+
+        /**
+         * Returns the object that the thread is blocked entering its monitor.
+         */
+        public String blockedOn() {
+            return getStringProperty("blockedOn");
+        }
+
+        /**
+         * Return the object that is the therad is waiting on with Object.wait.
+         */
+        public String waitingOn() {
+            return getStringProperty("waitingOn");
         }
 
         /**
          * Returns the thread stack.
          */
         public Stream<String> stack() {
+            JSONValue.JSONArray stackObj = threadObj.get("stack").asArray();
+            List<String> stack = new ArrayList<>();
+            for (JSONValue steObject : stackObj) {
+                stack.add(steObject.asString());
+            }
             return stack.stream();
         }
 
+        /**
+         * Return a map of monitors owned.
+         */
+        public Map<Integer, List<String>> ownedMonitors() {
+            Map<Integer, List<String>> ownedMonitors = new HashMap<>();
+            JSONValue monitorsOwnedObj = threadObj.get("monitorsOwned");
+            if (monitorsOwnedObj != null) {
+                for (JSONValue obj : monitorsOwnedObj.asArray()) {
+                    int depth = Integer.parseInt(obj.get("depth").asString());
+                    for (JSONValue lock : obj.get("locks").asArray()) {
+                        ownedMonitors.computeIfAbsent(depth, _ -> new ArrayList<>())
+                                .add(lock.asString());
+                    }
+                }
+            }
+            return ownedMonitors;
+        }
+
+        /**
+         * If the thread is a mounted virtual thread, return the thread identifier of
+         * its carrier.
+         */
+        public OptionalLong carrier() {
+            String s = getStringProperty("carrier");
+            return (s != null)
+                    ? OptionalLong.of(Long.parseLong(s))
+                    : OptionalLong.empty();
+        }
+
         @Override
         public int hashCode() {
             return Long.hashCode(tid);
@@ -264,84 +369,42 @@ public boolean equals(Object obj) {
         public String toString() {
             StringBuilder sb = new StringBuilder("#");
             sb.append(tid);
+            String name = name();
             if (name.length() > 0) {
-                sb.append(",");
-                sb.append(name);
+                sb.append(",")
+                  .append(name);
             }
             return sb.toString();
         }
     }
 
     /**
-     * Parses the given JSON text as a thread dump.
+     * Returns the value of a property of this thread dump, as a string.
      */
-    private ThreadDump(String json) {
-        JSONValue threadDumpObj = JSONValue.parse(json).get("threadDump");
-
-        // maps container name to ThreadContainer
-        Map<String, ThreadContainer> map = new HashMap<>();
-
-        // threadContainers array
-        JSONValue threadContainersObj = threadDumpObj.get("threadContainers");
-        for (JSONValue containerObj : threadContainersObj.asArray()) {
-            String name = containerObj.get("container").asString();
-            String parentName = containerObj.get("parent").asString();
-            String owner = containerObj.get("owner").asString();
-            JSONValue.JSONArray threadsObj = containerObj.get("threads").asArray();
-
-            // threads array
-            Set<ThreadInfo> threadInfos = new HashSet<>();
-            for (JSONValue threadObj : threadsObj) {
-                long tid = Long.parseLong(threadObj.get("tid").asString());
-                String threadName = threadObj.get("name").asString();
-                JSONValue.JSONArray stackObj = threadObj.get("stack").asArray();
-                List<String> stack = new ArrayList<>();
-                for (JSONValue steObject : stackObj) {
-                    stack.add(steObject.asString());
-                }
-                threadInfos.add(new ThreadInfo(tid, threadName, stack));
-            }
-
-            // add to map if not already encountered
-            var container = map.computeIfAbsent(name, k -> new ThreadContainer(name));
-            if (owner != null)
-                container.owner = Long.parseLong(owner);
-            container.threads = threadInfos;
-
-            if (parentName == null) {
-                rootThreadContainer = container;
-            } else {
-                // add parent to map if not already encountered and add to its set of children
-                var parent = map.computeIfAbsent(parentName, k -> new ThreadContainer(parentName));
-                container.parent = parent;
-                parent.children.add(container);
-            }
-        }
-
-        this.processId = Long.parseLong(threadDumpObj.get("processId").asString());
-        this.time = threadDumpObj.get("time").asString();
-        this.runtimeVersion = threadDumpObj.get("runtimeVersion").asString();
+    private String getStringProperty(String propertyName) {
+        JSONValue value = threadDumpObj.get(propertyName);
+        return (value != null) ? value.asString() : null;
     }
 
     /**
      * Returns the value of threadDump/processId.
      */
     public long processId() {
-        return processId;
+        return Long.parseLong(getStringProperty("processId"));
     }
 
     /**
      * Returns the value of threadDump/time.
      */
     public String time() {
-        return time;
+        return getStringProperty("time");
     }
 
     /**
      * Returns the value of threadDump/runtimeVersion.
      */
     public String runtimeVersion() {
-        return runtimeVersion;
+        return getStringProperty("runtimeVersion");
     }
 
     /**
@@ -355,8 +418,17 @@ public ThreadContainer rootThreadContainer() {
      * Finds a container in the threadDump/threadContainers array with the given name.
      */
     public Optional<ThreadContainer> findThreadContainer(String name) {
-        ThreadContainer container = rootThreadContainer.findThreadContainer(name);
-        return Optional.ofNullable(container);
+        ThreadContainer container = nameToThreadContainer.get(name);
+        if (container == null) {
+            // may be name/identity format
+            container = nameToThreadContainer.entrySet()
+                    .stream()
+                    .filter(e -> e.getKey().startsWith(name + "/"))
+                    .map(e -> e.getValue())
+                    .findAny()
+                    .orElse(null);
+        }
+        return Optional.of(container);
     }
 
     /**
@@ -364,6 +436,36 @@ public Optional<ThreadContainer> findThreadContainer(String name) {
      * @throws RuntimeException if an error occurs
      */
     public static ThreadDump parse(String json) {
-        return new ThreadDump(json);
+        JSONValue threadDumpObj = JSONValue.parse(json).get("threadDump");
+
+        // threadContainers array, preserve insertion order (parents are added before children)
+        Map<String, JSONValue> containerObjs = new LinkedHashMap<>();
+        JSONValue threadContainersObj = threadDumpObj.get("threadContainers");
+        for (JSONValue containerObj : threadContainersObj.asArray()) {
+            String name = containerObj.get("container").asString();
+            containerObjs.put(name, containerObj);
+        }
+
+        // find root and create tree of thread containers
+        ThreadContainer root = null;
+        Map<String, ThreadContainer> map = new HashMap<>();
+        for (String name : containerObjs.keySet()) {
+            JSONValue containerObj = containerObjs.get(name);
+            String parentName = containerObj.get("parent").asString();
+            if (parentName == null) {
+                root = new ThreadContainer(name, null, containerObj);
+                map.put(name, root);
+            } else {
+                var parent = map.get(parentName);
+                if (parent == null) {
+                    throw new RuntimeException("Thread container " + name + " found before " + parentName);
+                }
+                var container = new ThreadContainer(name, parent, containerObj);
+                parent.addChild(container);
+                map.put(name, container);
+            }
+        }
+
+        return new ThreadDump(root, map, threadDumpObj);
     }
-}
+}
\ No newline at end of file

From b918dc84ec8364321a5a6d9f6835edcb1d9ad62f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 4 Jun 2025 06:02:49 +0000
Subject: [PATCH 835/901] 8357434: x86: Simplify
 Interpreter::profile_taken_branch

Reviewed-by: kvn, vlivanov
---
 src/hotspot/cpu/x86/interp_masm_x86.cpp   | 16 +++-------------
 src/hotspot/cpu/x86/interp_masm_x86.hpp   |  2 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp |  4 +---
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 6d638ab67ef..92233ee0d07 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1355,25 +1355,15 @@ void InterpreterMacroAssembler::update_mdp_for_ret(Register return_bci) {
 }
 
 
-void InterpreterMacroAssembler::profile_taken_branch(Register mdp,
-                                                     Register bumped_count) {
+void InterpreterMacroAssembler::profile_taken_branch(Register mdp) {
   if (ProfileInterpreter) {
     Label profile_continue;
 
     // If no method data exists, go to profile_continue.
-    // Otherwise, assign to mdp
     test_method_data_pointer(mdp, profile_continue);
 
     // We are taking a branch.  Increment the taken count.
-    // We inline increment_mdp_data_at to return bumped_count in a register
-    //increment_mdp_data_at(mdp, in_bytes(JumpData::taken_offset()));
-    Address data(mdp, in_bytes(JumpData::taken_offset()));
-    movptr(bumped_count, data);
-    assert(DataLayout::counter_increment == 1,
-            "flow-free idiom only works with 1");
-    addptr(bumped_count, DataLayout::counter_increment);
-    sbbptr(bumped_count, 0);
-    movptr(data, bumped_count); // Store back out
+    increment_mdp_data_at(mdp, in_bytes(JumpData::taken_offset()));
 
     // The method data pointer needs to be updated to reflect the new target.
     update_mdp_by_offset(mdp, in_bytes(JumpData::displacement_offset()));
@@ -1389,7 +1379,7 @@ void InterpreterMacroAssembler::profile_not_taken_branch(Register mdp) {
     // If no method data exists, go to profile_continue.
     test_method_data_pointer(mdp, profile_continue);
 
-    // We are taking a branch.  Increment the not taken count.
+    // We are not taking a branch.  Increment the not taken count.
     increment_mdp_data_at(mdp, in_bytes(BranchData::not_taken_offset()));
 
     // The method data pointer needs to be updated to correspond to
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 47d54b54d7f..a36a697eebf 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -236,7 +236,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void update_mdp_by_constant(Register mdp_in, int constant);
   void update_mdp_for_ret(Register return_bci);
 
-  void profile_taken_branch(Register mdp, Register bumped_count);
+  void profile_taken_branch(Register mdp);
   void profile_not_taken_branch(Register mdp);
   void profile_call(Register mdp);
   void profile_final_call(Register mdp);
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 9f568904ae2..82ca18d8a1f 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -1687,8 +1687,7 @@ void TemplateTable::float_cmp(bool is_float, int unordered_result) {
 
 void TemplateTable::branch(bool is_jsr, bool is_wide) {
   __ get_method(rcx); // rcx holds method
-  __ profile_taken_branch(rax, rbx); // rax holds updated MDP, rbx
-                                     // holds bumped taken count
+  __ profile_taken_branch(rax); // rax holds updated MDP
 
   const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
                              InvocationCounter::counter_offset();
@@ -1739,7 +1738,6 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
   if (UseLoopCounter) {
     // increment backedge counter for backward branches
     // rax: MDO
-    // rbx: MDO bumped taken-count
     // rcx: method
     // rdx: target offset
     // r13: target bcp

From 683319f25cbea83e28b9a0ad22e1c3e781e78165 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 4 Jun 2025 06:04:05 +0000
Subject: [PATCH 836/901] 8357798: ReverseOrderListView uses Boolean boxes
 after JDK-8356080

Reviewed-by: liach, smarks
---
 .../share/classes/java/util/ReverseOrderListView.java          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/ReverseOrderListView.java b/src/java.base/share/classes/java/util/ReverseOrderListView.java
index 75d69f38aaf..6ecbac66ed8 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderListView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderListView.java
@@ -42,8 +42,7 @@ class ReverseOrderListView<E> implements List<E> {
 
     @Stable
     final List<E> base;
-    @Stable
-    final Boolean modifiable;
+    final boolean modifiable;
 
     public static <T> List<T> of(List<T> list, boolean modifiable) {
         if (list instanceof RandomAccess) {

From b5cfd76c047392788b6a5c25ebadc463b2c8ce90 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 4 Jun 2025 06:38:06 +0000
Subject: [PATCH 837/901] 8358456: ZipFile.getInputStream(ZipEntry) throws
 unspecified IllegalArgumentException

Reviewed-by: lancea
---
 .../share/classes/java/util/zip/ZipFile.java  |  16 +--
 .../ZipFile/InvalidCompressedSizeTest.java    | 124 ++++++++++++++++++
 2 files changed, 132 insertions(+), 8 deletions(-)
 create mode 100644 test/jdk/java/util/zip/ZipFile/InvalidCompressedSizeTest.java

diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index b7d6f1ff714..17382181876 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -351,11 +351,11 @@ public InputStream getInputStream(ZipEntry entry) throws IOException {
                 case DEFLATED:
                     // Inflater likes a bit of slack
                     // MORE: Compute good size for inflater stream:
-                    long size = CENSIZ(zsrc.cen, pos);
-                    if (size > 65536) {
-                        size = 8192;
+                    long inputBufSize = CENSIZ(zsrc.cen, pos);
+                    if (inputBufSize > 65536 || inputBufSize <= 0) {
+                        inputBufSize = 8192;
                     }
-                    InputStream is = new ZipFileInflaterInputStream(in, res, (int) size);
+                    InputStream is = new ZipFileInflaterInputStream(in, res, (int) inputBufSize);
                     synchronized (istreams) {
                         istreams.add(is);
                     }
@@ -416,14 +416,14 @@ private class ZipFileInflaterInputStream extends InflaterInputStream {
         private final Cleanable cleanable;
 
         ZipFileInflaterInputStream(ZipFileInputStream zfin,
-                                   CleanableResource res, int size) {
-            this(zfin, res, res.getInflater(), size);
+                                   CleanableResource res, int inputBufSize) {
+            this(zfin, res, res.getInflater(), inputBufSize);
         }
 
         private ZipFileInflaterInputStream(ZipFileInputStream zfin,
                                            CleanableResource res,
-                                           Inflater inf, int size) {
-            super(zfin, inf, size);
+                                           Inflater inf, int inputBufSize) {
+            super(zfin, inf, inputBufSize);
             this.cleanable = CleanerFactory.cleaner().register(this,
                     new InflaterCleanupAction(inf, res));
         }
diff --git a/test/jdk/java/util/zip/ZipFile/InvalidCompressedSizeTest.java b/test/jdk/java/util/zip/ZipFile/InvalidCompressedSizeTest.java
new file mode 100644
index 00000000000..37c9916ee5e
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/InvalidCompressedSizeTest.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.
+ *
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HexFormat;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import org.junit.jupiter.api.Test;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/*
+ * @test
+ * @bug 8358456
+ * @summary verify that ZipFile.getInputStream(ZipFile) doesn't throw an unspecified exception
+ *          for invalid compressed size of an entry
+ * @run junit InvalidCompressedSizeTest
+ */
+class InvalidCompressedSizeTest {
+
+    private static final String ENTRY_NAME = "foo-bar";
+    private static final byte[] ENTRY_CONTENT = new byte[]{0x42, 0x42};
+
+    // created through a call to createZIPContent()
+    private static final String ZIP_CONTENT_HEX = """
+            504b03041400080808005053c35a00000000000000000000000007000000666f6f2d6261727
+            3720200504b0708c41f441b0400000002000000504b010214001400080808005053c35ac41f
+            441b0400000002000000070000000000000000000000000000000000666f6f2d626172504b0
+            506000000000100010035000000390000000000
+            """;
+
+
+    //    0039 CENTRAL HEADER #1     02014B50
+    //    ...
+    //    0043 Compression Method    0008 'Deflated'
+    //    ...
+    //    004D Compressed Length     00000004
+    //    0051 Uncompressed Length   00000002
+    //    ...
+    //    0067 Filename              'foo-bar'
+    // this is the offset in the ZIP content stream for the compressed size field
+    // for the entry of interest
+    private static final int COMP_SIZE_OFFSET = 0x004D;
+
+    // intentionally unused but left here to allow for constructing newer/updated
+    // ZIP_CONTENT_HEX, when necessary
+    private static String createZIPContent() throws IOException {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (final ZipOutputStream zos = new ZipOutputStream(baos)) {
+            final ZipEntry ze = new ZipEntry(ENTRY_NAME);
+            zos.putNextEntry(ze);
+            zos.write(ENTRY_CONTENT);
+            zos.closeEntry();
+        }
+        return HexFormat.of().formatHex(baos.toByteArray());
+    }
+
+    /*
+     * Calls ZipFile.getInputStream(ZipEntry) on a ZIP entry whose compressed size is
+     * intentionally set to 0. The test then verifies that the call to getInputStream()
+     * doesn't throw an unspecified exception.
+     */
+    @Test
+    void testInvalidCompressedSize() throws Exception {
+        final byte[] originalZIPContent = HexFormat.of().parseHex(ZIP_CONTENT_HEX.replace("\n", ""));
+        final ByteBuffer zipContent = ByteBuffer.wrap(originalZIPContent).order(LITTLE_ENDIAN);
+
+        // overwrite the compressed size value in the entry's CEN to an invalid value of 0
+        zipContent.position(COMP_SIZE_OFFSET);
+        final int invalidCompressedSize = 0;
+        zipContent.putInt(invalidCompressedSize);
+        zipContent.rewind();
+
+        // write out the ZIP content so that it can be read through ZipFile
+        final Path zip = Files.createTempFile(Path.of("."), "8358456-", ".zip");
+        Files.write(zip, zipContent.array());
+        System.out.println("created ZIP " + zip + " with an invalid compressed size for entry");
+
+        try (final ZipFile zf = new ZipFile(zip.toFile())) {
+            final ZipEntry entry = zf.getEntry(ENTRY_NAME);
+            assertNotNull(entry, "missing entry " + ENTRY_NAME + " in ZIP file " + zip);
+            // verify that we are indeed testing a ZIP file with an invalid
+            // compressed size for the entry
+            assertEquals(0, entry.getCompressedSize(), "unexpected compressed size");
+            // merely open and close the InputStream to exercise the code which
+            // would incorrectly raise an exception. we don't read the contents
+            // of the stream because we have (intentionally) corrupted the metadata
+            // of the ZIP and that will cause the reading to fail.
+            try (final InputStream is = zf.getInputStream(entry)) {
+                System.out.println("successfully opened input stream " + is
+                        + " for entry " + entry.getName());
+            }
+        }
+    }
+}

From edf92721c2db4cfba091cf4901af603db8486951 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 4 Jun 2025 08:10:42 +0000
Subject: [PATCH 838/901] 8356977: UTF-8 cleanups

Reviewed-by: naoto, prr
---
 src/java.base/share/classes/java/util/Locale.java             | 4 ++--
 src/java.base/share/classes/java/util/LocaleISOData.java      | 2 +-
 .../share/classes/java/util/PropertyResourceBundle.java       | 4 ++--
 src/java.base/share/classes/sun/security/util/DomainName.java | 2 +-
 src/java.desktop/share/classes/javax/swing/Action.java        | 2 +-
 test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java | 2 +-
 .../RemotePrinterStatusRefresh.java                           | 2 +-
 test/jdk/java/nio/file/Path/UriImportExport.java              | 2 +-
 test/jdk/java/util/Currency/ValidateISO4217.java              | 2 +-
 test/jdk/java/util/Locale/LocaleProvidersFormat.java          | 2 +-
 .../jpackage/helpers/jdk/jpackage/test/FileAssociations.java  | 2 +-
 .../langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java | 2 +-
 test/langtools/tools/javac/api/guide/Test.java                | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index a5ac0ae5bf7..9c745c1731b 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -385,10 +385,10 @@
  * {@snippet lang = java:
  *     var number = 1000;
  *     NumberFormat.getCurrencyInstance(Locale.US).format(number); // returns "$1,000.00"
- *     NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "\u00A51,000""
+ *     NumberFormat.getCurrencyInstance(Locale.JAPAN).format(number); // returns "¥1,000""
  *     var date = LocalDate.of(2024, 1, 1);
  *     DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.US).format(date); // returns "January 1, 2024"
- *     DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024\u5e741\u67081\u65e5"
+ *     DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).localizedBy(Locale.JAPAN).format(date); // returns "2024年1月1日"
  * }
  *
  * <h2><a id="LocaleMatching">Locale Matching</a></h2>
diff --git a/src/java.base/share/classes/java/util/LocaleISOData.java b/src/java.base/share/classes/java/util/LocaleISOData.java
index 403e3f90bea..c2090d3be19 100644
--- a/src/java.base/share/classes/java/util/LocaleISOData.java
+++ b/src/java.base/share/classes/java/util/LocaleISOData.java
@@ -239,7 +239,7 @@ class LocaleISOData {
         + "AT" + "AUT"  // Austria, Republic of
         + "AU" + "AUS"  // Australia, Commonwealth of
         + "AW" + "ABW"  // Aruba
-        + "AX" + "ALA"  // \u00c5land Islands
+        + "AX" + "ALA"  // Åland Islands
         + "AZ" + "AZE"  // Azerbaijan, Republic of
         + "BA" + "BIH"  // Bosnia and Herzegovina
         + "BB" + "BRB"  // Barbados
diff --git a/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
index d8cc1fac198..9b832a70577 100644
--- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java
+++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
@@ -81,7 +81,7 @@
  * Keys are case-sensitive.
  * {@snippet lang=properties :
  *     # MessageFormat pattern
- *     s1=Die Platte \"{1}\" enth\u00E4lt {0}.
+ *     s1=Die Platte \"{1}\" enthält {0}.
  *     # location of {0} in pattern
  *     s2=1
  *     # sample disk name
@@ -93,7 +93,7 @@
  *     # third ChoiceFormat choice
  *     s6={0,number} Dateien
  *     # sample date
- *     s7=3. M\u00E4rz 1996
+ *     s7=3. März 1996
  * }
  *
  * @apiNote
diff --git a/src/java.base/share/classes/sun/security/util/DomainName.java b/src/java.base/share/classes/sun/security/util/DomainName.java
index 53a646c8102..4f577f1114c 100644
--- a/src/java.base/share/classes/sun/security/util/DomainName.java
+++ b/src/java.base/share/classes/sun/security/util/DomainName.java
@@ -61,7 +61,7 @@
  *      co.uk
  *      k12.ak.us
  *      com.tw
- *      \u7db2\u8def.tw
+ *      網路.tw
  *
  * Public suffixes effectively denote registration authorities.
  *
diff --git a/src/java.desktop/share/classes/javax/swing/Action.java b/src/java.desktop/share/classes/javax/swing/Action.java
index 3942d3309d4..b1b092e2104 100644
--- a/src/java.desktop/share/classes/javax/swing/Action.java
+++ b/src/java.desktop/share/classes/javax/swing/Action.java
@@ -263,7 +263,7 @@ public interface Action extends ActionListener {
      * commonly used to specify a mnemonic.  For example:
      * <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A)</code>
      * sets the mnemonic of <code>myAction</code> to 'a', while
-     * <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('\u0444'))</code>
+     * <code>myAction.putValue(Action.MNEMONIC_KEY, KeyEvent.getExtendedKeyCodeForChar('ф'))</code>
      * sets the mnemonic of <code>myAction</code> to Cyrillic letter "Ef".
      *
      * @since 1.3
diff --git a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
index 6410fc4bad8..51fb3fedaba 100644
--- a/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
+++ b/test/jdk/java/awt/event/KeyEvent/KeyTyped/EscapeKeyTyped.java
@@ -87,7 +87,7 @@ public void keyTyped(KeyEvent e) {
             public void keyPressed(KeyEvent e) {
                 printKey(e);
                 int keychar = e.getKeyChar();
-                if (keychar == 27) { // Escape character is 27 or \u0021
+                if (keychar == 27) { // Escape character is 27 or \u001b
                     escapeKeyTypedReceived = true;
                 }
             }
diff --git a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
index 7768c54481a..33fe9fc86d3 100644
--- a/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
+++ b/test/jdk/java/awt/print/RemotePrinterStatusRefresh/RemotePrinterStatusRefresh.java
@@ -185,7 +185,7 @@ public Component getListCellRendererComponent(JList<?> list,
                     + "Step 3: Compare the list of printers in \"Before\" and "
                     +          "\"After\" lists.\n"
                     + "              Added printers are highlighted with "
-                    +               "green color, removed ones \u2014 with "
+                    +               "green color, removed ones with "
                     +               "red color.\n"
                     + "Step 4: Click Pass if the list of printers is correctly "
                     +          "updated.\n"
diff --git a/test/jdk/java/nio/file/Path/UriImportExport.java b/test/jdk/java/nio/file/Path/UriImportExport.java
index 934098096b6..2ab93ee399e 100644
--- a/test/jdk/java/nio/file/Path/UriImportExport.java
+++ b/test/jdk/java/nio/file/Path/UriImportExport.java
@@ -128,7 +128,7 @@ public static void main(String[] args) throws Exception {
             testUri("file:///foo/bar/doesnotexist");
             testUri("file:/foo/bar/doesnotexist");
 
-            // file:///foo/bar/\u0440\u0443\u0441\u0441\u043A\u0438\u0439 (Russian)
+            // file:///foo/bar/русский (Russian)
             testUri("file:///foo/bar/%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9");
 
             // invalid
diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
index 6996045fc3a..67793dcbecb 100644
--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
@@ -131,7 +131,7 @@ public class ValidateISO4217 {
              */
             {"GS", "GBP", "826", "2"},      // South Georgia And The South Sandwich Islands
             /* Not defined in ISO 4217 list, but defined in .properties file. */
-            {"AX", "EUR", "978", "2"},      // \u00c5LAND ISLANDS
+            {"AX", "EUR", "978", "2"},      // ÅLAND ISLANDS
             {"PS", "ILS", "376", "2"},      // Palestinian Territory, Occupied
             /* Not defined in ISO 4217 list, but added in ISO 3166 country code list */
             {"JE", "GBP", "826", "2"},      // Jersey
diff --git a/test/jdk/java/util/Locale/LocaleProvidersFormat.java b/test/jdk/java/util/Locale/LocaleProvidersFormat.java
index 5d3f1fc2e2e..157e92ce8a3 100644
--- a/test/jdk/java/util/Locale/LocaleProvidersFormat.java
+++ b/test/jdk/java/util/Locale/LocaleProvidersFormat.java
@@ -85,7 +85,7 @@ public void windowsJapaneseDateFields() throws Throwable {
 
     /*
      * 8027289: Ensure if underlying system format locale is zh_CN, the Window's currency
-     * symbol under HOST provider is \u00A5, the yen (yuan) sign.
+     * symbol under HOST provider is ¥, the yen (yuan) sign.
      */
     @Test
     @EnabledOnOs(WINDOWS)
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
index f8dc10c3dd0..ebdbb474006 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java
@@ -135,7 +135,7 @@ List<String> openFiles(List<Path> testFiles) throws IOException {
 
             // To test unicode arguments on Windows manually:
             // 1. add the following argument ("Hello" in Bulgarian) to the
-            //    additionalArgs list: "\u0417\u0434\u0440\u0430\u0432\u0435\u0439\u0442\u0435"
+            //    additionalArgs list: "Здравейте"
             // 2. in Control Panel -> Region -> Administrative -> Language for non-Unicode programs
             //    change the system locale to "Bulgarian (Bulgaria)"
             // 3. reboot Windows and re-run the test
diff --git a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
index e2f2d1f6f43..79a09b4f240 100644
--- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
+++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/pkg/C.java
@@ -33,7 +33,7 @@
 public class C {
 
     /**
-     * Here is a relative link in a field:\u0130
+     * Here is a relative link in a field:
      * <a href="http://github.com/relative-field-link.html">relative field link</a>.
      */
     public C field = null;
diff --git a/test/langtools/tools/javac/api/guide/Test.java b/test/langtools/tools/javac/api/guide/Test.java
index 64b2a304016..5bf881a590c 100644
--- a/test/langtools/tools/javac/api/guide/Test.java
+++ b/test/langtools/tools/javac/api/guide/Test.java
@@ -25,7 +25,7 @@
  * @test
  * @bug     6427274 6347778 6469079
  * @summary Various bugs fixed while writing Compiler API Guide
- * @author  Peter von der Ah\u0081
+ * @author  Peter von der Ahé
  * @library ../lib
  * @modules java.compiler
  *          jdk.compiler

From 955bfcd5502b3555c2c91db876be8e7535f2289a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 4 Jun 2025 08:19:24 +0000
Subject: [PATCH 839/901] 8357671: JFR: Remove JfrTraceIdEpoch synchronizing

Reviewed-by: egahlin
---
 .../checkpoint/jfrCheckpointManager.cpp       |  9 ++-----
 .../checkpoint/jfrCheckpointManager.hpp       |  3 +--
 .../types/traceid/jfrTraceIdEpoch.cpp         | 21 +++------------
 .../types/traceid/jfrTraceIdEpoch.hpp         | 26 +++++++++----------
 .../recorder/service/jfrRecorderService.cpp   |  6 ++---
 .../jfr/recorder/stringpool/jfrStringPool.cpp |  5 +---
 .../classes/jdk/jfr/internal/StringPool.java  |  4 +--
 7 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index 7736d3f4565..b0f4461a82c 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -497,15 +497,10 @@ typedef CompositeOperation<MutexedWriteOperation, ReleaseOperation> WriteRelease
 typedef VirtualThreadLocalCheckpointWriteOp<JfrCheckpointManager::Buffer> VirtualThreadLocalCheckpointOperation;
 typedef MutexedWriteOp<VirtualThreadLocalCheckpointOperation> VirtualThreadLocalWriteOperation;
 
-void JfrCheckpointManager::begin_epoch_shift() {
-  assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  JfrTraceIdEpoch::begin_epoch_shift();
-}
-
-void JfrCheckpointManager::end_epoch_shift() {
+void JfrCheckpointManager::shift_epoch() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
   DEBUG_ONLY(const u1 current_epoch = JfrTraceIdEpoch::current();)
-  JfrTraceIdEpoch::end_epoch_shift();
+  JfrTraceIdEpoch::shift_epoch();
   assert(current_epoch != JfrTraceIdEpoch::current(), "invariant");
   JfrStringPool::on_epoch_shift();
 }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
index 53fa064e267..f9f8f1c26cf 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
@@ -96,8 +96,7 @@ class JfrCheckpointManager : public JfrCHeapObj {
   void clear_type_set();
   void write_type_set();
 
-  void begin_epoch_shift();
-  void end_epoch_shift();
+  void shift_epoch();
 
   static void on_unloading_classes();
   void on_rotation();
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
index 8c2b8cdd0ec..a4ada594700 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.cpp
@@ -31,7 +31,7 @@
 /*
  * The epoch generation is the range [1-32767].
  *
- * When the epoch value is stored in a thread object,
+ * When the epoch value is stored in a vthread object,
  * the most significant bit of the u2 is used to denote
  * thread exclusion, i.e  1 << 15 == 32768 denotes exclusion.
 */
@@ -39,32 +39,17 @@ u2 JfrTraceIdEpoch::_generation = 0;
 JfrSignal JfrTraceIdEpoch::_tag_state;
 bool JfrTraceIdEpoch::_method_tracer_state = false;
 bool JfrTraceIdEpoch::_epoch_state = false;
-bool JfrTraceIdEpoch::_synchronizing = false;
 
 static constexpr const u2 epoch_generation_overflow = excluded_bit;
 
-void JfrTraceIdEpoch::begin_epoch_shift() {
+void JfrTraceIdEpoch::shift_epoch() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  _synchronizing = true;
-  OrderAccess::fence();
-}
-
-void JfrTraceIdEpoch::end_epoch_shift() {
-  assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  assert(_synchronizing, "invariant");
   _epoch_state = !_epoch_state;
-  ++_generation;
-  if (epoch_generation_overflow == _generation) {
+  if (++_generation == epoch_generation_overflow) {
     _generation = 1;
   }
   assert(_generation != 0, "invariant");
   assert(_generation < epoch_generation_overflow, "invariant");
-  OrderAccess::storestore();
-  _synchronizing = false;
-}
-
-bool JfrTraceIdEpoch::is_synchronizing() {
-  return Atomic::load_acquire(&_synchronizing);
 }
 
 void JfrTraceIdEpoch::set_method_tracer_tag_state() {
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
index 10ea9643971..9e2d2f0708a 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
@@ -26,7 +26,6 @@
 #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
 
 #include "jfr/utilities/jfrSignal.hpp"
-#include "jfr/utilities/jfrTypes.hpp"
 #include "memory/allStatic.hpp"
 
 #define BIT                                  1
@@ -41,16 +40,17 @@
 #define EPOCH_0_METHOD_AND_CLASS_BITS        (METHOD_AND_CLASS_BITS << EPOCH_0_SHIFT)
 #define EPOCH_1_METHOD_AND_CLASS_BITS        (METHOD_AND_CLASS_BITS << EPOCH_1_SHIFT)
 
- // Epoch alternation on each rotation allow for concurrent tagging.
- // The epoch shift happens only during a safepoint.
- //
- // _synchronizing is a transition state, the purpose of which is to
- // have JavaThreads that run _thread_in_native (i.e. Compiler threads)
- // respect the current epoch shift in-progress during the safepoint.
- //
- // _changed_tag_state == true signals an incremental modification to artifact tagging
- // (klasses, methods, CLDs, etc), purpose of which is to trigger collection of artifacts.
- //
+/*
+ * An epoch shift or alternation on each rotation enables concurrent tagging.
+ * The epoch shift happens only during a safepoint.
+ *
+ *   _generation - mainly used with virtual threads, but also for the generational string pool in Java.
+ *   _tag_state  - signals an incremental modification to artifact tagging (klasses, methods, CLDs, etc)
+ *                   purpose of which is to trigger a collection of artifacts.
+ *   _method_tracer_state - a special notification state only used with method timing and tracing.
+ *   _epoch_state - the fundamental binary epoch state that shifts on each rotation during a safepoint.
+ */
+
 class JfrTraceIdEpoch : AllStatic {
   friend class JfrCheckpointManager;
  private:
@@ -58,10 +58,8 @@ class JfrTraceIdEpoch : AllStatic {
   static JfrSignal _tag_state;
   static bool _method_tracer_state;
   static bool _epoch_state;
-  static bool _synchronizing;
 
-  static void begin_epoch_shift();
-  static void end_epoch_shift();
+  static void shift_epoch();
 
  public:
   static bool epoch() {
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 07fe019c9af..7d1d7ac0a05 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -484,13 +484,12 @@ void JfrRecorderService::invoke_safepoint_clear() {
 
 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();
-  _checkpoint_manager.end_epoch_shift();
+  _checkpoint_manager.shift_epoch();
 }
 
 void JfrRecorderService::post_safepoint_clear() {
@@ -593,14 +592,13 @@ void JfrRecorderService::invoke_safepoint_write() {
 
 void JfrRecorderService::safepoint_write() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  _checkpoint_manager.begin_epoch_shift();
   JfrStackTraceRepository::clear_leak_profiler();
   _checkpoint_manager.on_rotation();
   _storage.write_at_safepoint();
   _chunkwriter.set_time_stamp();
   JfrDeprecationManager::on_safepoint_write();
   write_stacktrace(_stack_trace_repository, _chunkwriter, true);
-  _checkpoint_manager.end_epoch_shift();
+  _checkpoint_manager.shift_epoch();
 }
 
 void JfrRecorderService::post_safepoint_write() {
diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
index a9e39094f79..dc28818b0f9 100644
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.cpp
@@ -44,8 +44,6 @@
 static int generation_offset = invalid_offset;
 static jobject string_pool = nullptr;
 
-static unsigned short generation = 0;
-
 static bool setup_string_pool_offsets(TRAPS) {
   const char class_name[] = "jdk/jfr/internal/StringPool";
   Symbol* const k_sym = SymbolTable::new_symbol(class_name);
@@ -281,9 +279,8 @@ void JfrStringPool::register_full(BufferPtr buffer, Thread* thread) {
 
 void JfrStringPool::on_epoch_shift() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
-  assert(!JfrTraceIdEpoch::is_synchronizing(), "invariant");
   assert(string_pool != nullptr, "invariant");
   oop mirror = JfrJavaSupport::resolve_non_null(string_pool);
   assert(mirror != nullptr, "invariant");
-  mirror->short_field_put(generation_offset, generation++);
+  mirror->short_field_put(generation_offset, JfrTraceIdEpoch::epoch_generation());
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/StringPool.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/StringPool.java
index c0dc4e6ba58..41e8a48cfe6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/StringPool.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/StringPool.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
@@ -51,7 +51,7 @@ public final class StringPool {
     private static int preCacheOld = 0;
     /* max size bytes */
     private static long currentSizeUTF16;
-    /* string pool generation (0-65535) set by the JVM on epoch shift. Not private to avoid being optimized away. */
+    /* The string pool epoch generation is the range [1-32767] set by the JVM on epoch shift. Not private to avoid being optimized away. */
     static short generation = 0;
 
     /* internalSid is a composite id [48-bit externalSid][16-bit generation]. */

From b6d60280e789436c7f9e3cd1447c8f77b77e77b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 4 Jun 2025 08:20:48 +0000
Subject: [PATCH 840/901] 8358429: JFR: minimize the time the Threads_lock is
 held for sampling

Reviewed-by: egahlin
---
 .../periodic/sampling/jfrSampleMonitor.hpp    | 74 ++++++++++++++
 .../periodic/sampling/jfrSampleRequest.hpp    |  9 +-
 .../periodic/sampling/jfrThreadSampler.cpp    | 97 +++++++++++--------
 .../periodic/sampling/jfrThreadSampling.cpp   | 29 ++----
 4 files changed, 146 insertions(+), 63 deletions(-)
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrSampleMonitor.hpp

diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleMonitor.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleMonitor.hpp
new file mode 100644
index 00000000000..a9e0b1728a3
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleMonitor.hpp
@@ -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.
+ *
+ */
+
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEMONITOR_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEMONITOR_HPP
+
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrTime.hpp"
+#include "memory/allocation.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/mutex.hpp"
+
+class JfrSampleMonitor : public StackObj {
+ private:
+  JfrThreadLocal* const _tl;
+  Monitor* const _sample_monitor;
+  mutable bool _waiting;
+ public:
+  JfrSampleMonitor(JfrThreadLocal* tl) :
+    _tl(tl), _sample_monitor(tl->sample_monitor()), _waiting(false) {
+    assert(tl != nullptr, "invariant");
+    assert(_sample_monitor != nullptr, "invariant");
+    _sample_monitor->lock_without_safepoint_check();
+  }
+
+  bool is_waiting() const {
+    assert_lock_strong(_sample_monitor);
+    _waiting = _tl->sample_state() == WAITING_FOR_NATIVE_SAMPLE;
+    return _waiting;
+  }
+
+  void install_java_sample_request() {
+    assert_lock_strong(_sample_monitor);
+    assert(_waiting, "invariant");
+    assert(_tl->sample_state() == WAITING_FOR_NATIVE_SAMPLE, "invariant");
+    JfrSampleRequest request;
+    request._sample_ticks = JfrTicks::now();
+    _tl->set_sample_request(request);
+    _tl->set_sample_state(JAVA_SAMPLE);
+    _sample_monitor->notify_all();
+  }
+
+  ~JfrSampleMonitor() {
+    assert_lock_strong(_sample_monitor);
+    if (!_waiting) {
+      _tl->set_sample_state(NO_SAMPLE);
+      _sample_monitor->notify_all();
+    }
+    _sample_monitor->unlock();
+  }
+};
+
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEMONITOR_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
index 8cc2b66aa9e..6567e7f8bff 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
@@ -48,10 +48,11 @@ enum JfrSampleResult {
 };
 
 enum JfrSampleRequestType {
-  NO_SAMPLE = 0,
-  NATIVE_SAMPLE = 1,
-  JAVA_SAMPLE = 2,
-  NOF_SAMPLE_TYPES
+  NO_SAMPLE,
+  JAVA_SAMPLE,
+  NATIVE_SAMPLE,
+  WAITING_FOR_NATIVE_SAMPLE,
+  NOF_SAMPLE_STATES
 };
 
 struct JfrSampleRequest {
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index 3efa0b0d581..4c44c43772d 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -24,6 +24,7 @@
 
 #include "jfr/metadata/jfrSerializer.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
+#include "jfr/periodic/sampling/jfrSampleMonitor.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampling.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
@@ -230,38 +231,41 @@ void JfrSamplerThread::task_stacktrace(JfrSampleRequestType type, JavaThread** l
   JavaThread* start = nullptr;
   elapsedTimer sample_time;
   sample_time.start();
-  {
-    MutexLocker tlock(Threads_lock);
-    ThreadsListHandle tlh;
-    // Resolve a sample session relative start position index into the thread list array.
-    // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
-    _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
-    JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
-
-    while (num_samples < sample_limit) {
-      current = next_thread(tlh.list(), start, current);
-      if (current == nullptr) {
-        break;
-      }
-      if (is_excluded(current)) {
-        continue;
-      }
-      if (start == nullptr) {
-        start = current; // remember the thread where we started to attempt sampling
-      }
-      bool success;
-      if (JAVA_SAMPLE == type) {
-        success = sample_java_thread(current);
-      } else {
-        assert(type == NATIVE_SAMPLE, "invariant");
-        success = sample_native_thread(current);
-      }
-      if (success) {
-        num_samples++;
-      }
+  ThreadsListHandle tlh;
+  // Resolve a sample session relative start position index into the thread list array.
+  // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
+  _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
+  JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
+
+  while (num_samples < sample_limit) {
+    current = next_thread(tlh.list(), start, current);
+    if (current == nullptr) {
+      break;
+    }
+    if (is_excluded(current)) {
+      continue;
+    }
+    if (start == nullptr) {
+      start = current; // remember the thread where we started to attempt sampling
+    }
+    bool success;
+    if (JAVA_SAMPLE == type) {
+      success = sample_java_thread(current);
+    } else {
+      assert(type == NATIVE_SAMPLE, "invariant");
+      success = sample_native_thread(current);
+    }
+    if (success) {
+      num_samples++;
+    }
+    if (SafepointSynchronize::is_at_safepoint()) {
+      // For _thread_in_native, we cannot get the Threads_lock.
+      // For _thread_in_Java, well, there are none.
+      break;
     }
-    *last_thread = current; // remember the thread we last attempted to sample
   }
+
+  *last_thread = current; // remember the thread we last attempted to sample
   sample_time.stop();
   log_trace(jfr)("JFR thread sampling done in %3.7f secs with %d java %d native samples",
     sample_time.seconds(), type == JAVA_SAMPLE ? num_samples : 0, type == NATIVE_SAMPLE ? num_samples : 0);
@@ -338,17 +342,32 @@ bool JfrSamplerThread::sample_native_thread(JavaThread* jt) {
 
   SafepointMechanism::arm_local_poll_release(jt);
 
-  // Barriers needed to keep the next read of thread state from floating up.
-  if (UseSystemMemoryBarrier) {
-    SystemMemoryBarrier::emit();
-  } else {
-    OrderAccess::storeload();
+  // Take the Threads_lock for two purposes:
+  // 1) Avoid sampling through a safepoint which could result
+  //    in touching oops in case of virtual threads.
+  // 2) Prevent JFR from issuing an epoch rotation while the sampler thread
+  //    is actively processing a thread in native, as both threads are now
+  //    outside the safepoint protocol.
+
+  // OrderAccess::fence() as part of acquiring the lock prevents loads from floating up.
+  JfrMutexTryLock threads_lock(Threads_lock);
+
+  if (!threads_lock.acquired() || !jt->has_last_Java_frame()) {
+    // Remove the native sample request and release the potentially waiting thread.
+    JfrSampleMonitor jsm(tl);
+    return false;
   }
 
-  if (jt->thread_state() != _thread_in_native || !jt->has_last_Java_frame()) {
-    MonitorLocker lock(tl->sample_monitor(), Monitor::_no_safepoint_check_flag);
-    tl->set_sample_state(NO_SAMPLE);
-    lock.notify_all();
+  if (jt->thread_state() != _thread_in_native) {
+    assert_lock_strong(Threads_lock);
+    JfrSampleMonitor jsm(tl);
+    if (jsm.is_waiting()) {
+      // The thread has already returned from native,
+      // now in _thread_in_vm and is waiting to be sampled.
+      // Convert the native sample request into a java sample request
+      // and let the thread process the ljf on its own.
+      jsm.install_java_sample_request();
+    }
     return false;
   }
 
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index 9bae25bcb3c..aa72c29cf50 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -28,6 +28,7 @@
 #include "code/nmethod.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrSampleMonitor.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampling.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTrace.hpp"
@@ -307,24 +308,6 @@ static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, Jav
   assert(!tl->has_enqueued_requests(), "invariant");
 }
 
-class SampleMonitor : public StackObj {
- private:
-  JfrThreadLocal* const _tl;
-  Monitor* const _sample_monitor;
- public:
-  SampleMonitor(JfrThreadLocal* tl) : _tl(tl), _sample_monitor(tl->sample_monitor()) {
-    assert(tl != nullptr, "invariant");
-    assert(_sample_monitor != nullptr, "invariant");
-    _sample_monitor->lock_without_safepoint_check();
-  }
-  ~SampleMonitor() {
-    assert_lock_strong(_sample_monitor);
-    _tl->set_sample_state(NO_SAMPLE);
-    _sample_monitor->notify_all();
-    _sample_monitor->unlock();
-  }
-};
-
 // Only entered by the JfrSampler thread.
 bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread) {
   assert(tl != nullptr, "invairant");
@@ -334,7 +317,9 @@ bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaTh
   assert(tl == jt->jfr_thread_local(), "invariant");
   assert(jt != sampler_thread, "only asynchronous processing of native samples");
   assert(jt->has_last_Java_frame(), "invariant");
-  assert(tl->sample_state() == NATIVE_SAMPLE, "invariant");
+  assert(tl->sample_state() >= NATIVE_SAMPLE, "invariant");
+
+  assert_lock_strong(Threads_lock);
 
   const JfrTicks start_time = JfrTicks::now();
 
@@ -342,7 +327,7 @@ bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaTh
   traceid sid;
 
   {
-    SampleMonitor sm(tl);
+    JfrSampleMonitor sm(tl);
 
     // Because the thread was in native, it is in a walkable state, because
     // it will hit a safepoint poll on the way back from native. To ensure timely
@@ -384,10 +369,14 @@ void JfrThreadSampling::process_sample_request(JavaThread* jt) {
   for (;;) {
     const int sample_state = tl->sample_state();
     if (sample_state == NATIVE_SAMPLE) {
+      tl->set_sample_state(WAITING_FOR_NATIVE_SAMPLE);
       // Wait until stack trace is processed.
       ml.wait();
     } else if (sample_state == JAVA_SAMPLE) {
       tl->enqueue_request();
+    } else if (sample_state == WAITING_FOR_NATIVE_SAMPLE) {
+      // Handle spurious wakeups. Again wait until stack trace is processed.
+      ml.wait();
     } else {
       // State has been processed.
       break;

From f141674d1619d95053d38a9cd8f93a8959b4a211 Mon Sep 17 00:00:00 2001
From: "He-Pin(kerr)" <hepin1989@gmail.com>
Date: Wed, 4 Jun 2025 08:28:29 +0000
Subject: [PATCH 841/901] 8347491: IllegalArgumentationException thrown by
 ThreadPoolExecutor doesn't have a useful message

Reviewed-by: vklang, liach, pminborg
---
 .../concurrent/AbstractExecutorService.java   |  19 +-
 .../concurrent/ExecutorCompletionService.java |  13 +-
 .../util/concurrent/ThreadPoolExecutor.java   |  46 +--
 .../tck/ThreadPoolExecutorTest.java           | 269 +++++++++++++-----
 4 files changed, 248 insertions(+), 99 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
index 1b1ba4b29a0..0d26607591d 100644
--- a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
+++ b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
@@ -41,6 +41,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Provides default implementations of {@link ExecutorService}
@@ -119,7 +120,7 @@ protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
      */
     @Override
     public Future<?> submit(Runnable task) {
-        if (task == null) throw new NullPointerException();
+        Objects.requireNonNull(task, "task");
         RunnableFuture<Void> ftask = newTaskFor(task, null);
         execute(ftask);
         return ftask;
@@ -131,7 +132,7 @@ public Future<?> submit(Runnable task) {
      */
     @Override
     public <T> Future<T> submit(Runnable task, T result) {
-        if (task == null) throw new NullPointerException();
+        Objects.requireNonNull(task, "task");
         RunnableFuture<T> ftask = newTaskFor(task, result);
         execute(ftask);
         return ftask;
@@ -143,7 +144,7 @@ public <T> Future<T> submit(Runnable task, T result) {
      */
     @Override
     public <T> Future<T> submit(Callable<T> task) {
-        if (task == null) throw new NullPointerException();
+        Objects.requireNonNull(task, "task");
         RunnableFuture<T> ftask = newTaskFor(task);
         execute(ftask);
         return ftask;
@@ -155,11 +156,10 @@ public <T> Future<T> submit(Callable<T> task) {
     private <T> T doInvokeAny(Collection<? extends Callable<T>> tasks,
                               boolean timed, long nanos)
         throws InterruptedException, ExecutionException, TimeoutException {
-        if (tasks == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(tasks, "tasks");
         int ntasks = tasks.size();
         if (ntasks == 0)
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("tasks is empty");
         ArrayList<Future<T>> futures = new ArrayList<>(ntasks);
         ExecutorCompletionService<T> ecs =
             new ExecutorCompletionService<T>(this);
@@ -262,8 +262,7 @@ public <T> T invokeAny(Collection<? extends Callable<T>> tasks,
     @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
         throws InterruptedException {
-        if (tasks == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(tasks, "tasks");
         ArrayList<Future<T>> futures = new ArrayList<>(tasks.size());
         try {
             for (Callable<T> t : tasks) {
@@ -294,8 +293,8 @@ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks,
                                          long timeout, TimeUnit unit)
         throws InterruptedException {
-        if (tasks == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(tasks, "tasks");
+        Objects.requireNonNull(unit, "unit");
         final long nanos = unit.toNanos(timeout);
         final long deadline = System.nanoTime() + nanos;
         ArrayList<Future<T>> futures = new ArrayList<>(tasks.size());
diff --git a/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java b/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
index 3c09b4882d0..249c2ebf4d9 100644
--- a/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
+++ b/src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
@@ -35,6 +35,8 @@
 
 package java.util.concurrent;
 
+import java.util.Objects;
+
 /**
  * A {@link CompletionService} that uses a supplied {@link Executor}
  * to execute tasks.  This class arranges that submitted tasks are,
@@ -145,8 +147,7 @@ private RunnableFuture<V> newTaskFor(Runnable task, V result) {
      * @throws NullPointerException if executor is {@code null}
      */
     public ExecutorCompletionService(Executor executor) {
-        if (executor == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(executor, "executor");
         this.executor = executor;
         this.aes = (executor instanceof AbstractExecutorService) ?
             (AbstractExecutorService) executor : null;
@@ -168,8 +169,8 @@ public ExecutorCompletionService(Executor executor) {
      */
     public ExecutorCompletionService(Executor executor,
                                      BlockingQueue<Future<V>> completionQueue) {
-        if (executor == null || completionQueue == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(executor, "executor");
+        Objects.requireNonNull(completionQueue, "completionQueue");
         this.executor = executor;
         this.aes = (executor instanceof AbstractExecutorService) ?
             (AbstractExecutorService) executor : null;
@@ -181,7 +182,7 @@ public ExecutorCompletionService(Executor executor,
      * @throws NullPointerException       {@inheritDoc}
      */
     public Future<V> submit(Callable<V> task) {
-        if (task == null) throw new NullPointerException();
+        Objects.requireNonNull(task, "task");
         RunnableFuture<V> f = newTaskFor(task);
         executor.execute(new QueueingFuture<V>(f, completionQueue));
         return f;
@@ -192,7 +193,7 @@ public Future<V> submit(Callable<V> task) {
      * @throws NullPointerException       {@inheritDoc}
      */
     public Future<V> submit(Runnable task, V result) {
-        if (task == null) throw new NullPointerException();
+        Objects.requireNonNull(task, "task");
         RunnableFuture<V> f = newTaskFor(task, result);
         executor.execute(new QueueingFuture<V>(f, completionQueue));
         return f;
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
index 0bf5669b6e1..029e31ef9f6 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
@@ -1251,13 +1251,19 @@ public ThreadPoolExecutor(int corePoolSize,
                               BlockingQueue<Runnable> workQueue,
                               ThreadFactory threadFactory,
                               RejectedExecutionHandler handler) {
-        if (corePoolSize < 0 ||
-            maximumPoolSize <= 0 ||
-            maximumPoolSize < corePoolSize ||
-            keepAliveTime < 0)
-            throw new IllegalArgumentException();
-        if (workQueue == null || threadFactory == null || handler == null)
-            throw new NullPointerException();
+        if (corePoolSize < 0) {
+            throw new IllegalArgumentException("corePoolSize must be non-negative");
+        } else if (maximumPoolSize <= 0) {
+            throw new IllegalArgumentException("maximumPoolSize must be positive");
+        } else if (maximumPoolSize < corePoolSize) {
+            throw new IllegalArgumentException("maximumPoolSize must be greater than or equal to corePoolSize");
+        } else if (keepAliveTime < 0) {
+            throw new IllegalArgumentException("keepAliveTime must be non-negative");
+        }
+        Objects.requireNonNull(unit, "unit");
+        Objects.requireNonNull(workQueue, "workQueue");
+        Objects.requireNonNull(threadFactory, "threadFactory");
+        Objects.requireNonNull(handler, "handler");
         this.corePoolSize = corePoolSize;
         this.maximumPoolSize = maximumPoolSize;
         this.workQueue = workQueue;
@@ -1284,8 +1290,7 @@ public ThreadPoolExecutor(int corePoolSize,
      * @throws NullPointerException if {@code command} is null
      */
     public void execute(Runnable command) {
-        if (command == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(command, "command");
         /*
          * Proceed in 3 steps:
          *
@@ -1446,8 +1451,7 @@ protected void finalize() {}
      * @see #getThreadFactory
      */
     public void setThreadFactory(ThreadFactory threadFactory) {
-        if (threadFactory == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(threadFactory, "threadFactory");
         this.threadFactory = threadFactory;
     }
 
@@ -1469,8 +1473,7 @@ public ThreadFactory getThreadFactory() {
      * @see #getRejectedExecutionHandler
      */
     public void setRejectedExecutionHandler(RejectedExecutionHandler handler) {
-        if (handler == null)
-            throw new NullPointerException();
+        Objects.requireNonNull(handler, "handler");
         this.handler = handler;
     }
 
@@ -1498,8 +1501,11 @@ public RejectedExecutionHandler getRejectedExecutionHandler() {
      * @see #getCorePoolSize
      */
     public void setCorePoolSize(int corePoolSize) {
-        if (corePoolSize < 0 || maximumPoolSize < corePoolSize)
-            throw new IllegalArgumentException();
+        if (corePoolSize < 0) {
+            throw new IllegalArgumentException("corePoolSize must be non-negative");
+        } else if (corePoolSize > maximumPoolSize) {
+            throw new IllegalArgumentException("corePoolSize must be less than or equal to maximumPoolSize");
+        }
         int delta = corePoolSize - this.corePoolSize;
         this.corePoolSize = corePoolSize;
         if (workerCountOf(ctl.get()) > corePoolSize)
@@ -1623,8 +1629,11 @@ public void allowCoreThreadTimeOut(boolean value) {
      * @see #getMaximumPoolSize
      */
     public void setMaximumPoolSize(int maximumPoolSize) {
-        if (maximumPoolSize <= 0 || maximumPoolSize < corePoolSize)
-            throw new IllegalArgumentException();
+        if (maximumPoolSize <= 0) {
+            throw new IllegalArgumentException("maximumPoolSize must be positive");
+        } else if (maximumPoolSize < corePoolSize) {
+            throw new IllegalArgumentException("maximumPoolSize must be greater than or equal to corePoolSize");
+        }
         this.maximumPoolSize = maximumPoolSize;
         if (workerCountOf(ctl.get()) > maximumPoolSize)
             interruptIdleWorkers();
@@ -1658,9 +1667,10 @@ public int getMaximumPoolSize() {
      */
     public void setKeepAliveTime(long time, TimeUnit unit) {
         if (time < 0)
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException("time must be non-negative");
         if (time == 0 && allowsCoreThreadTimeOut())
             throw new IllegalArgumentException("Core threads must have nonzero keep alive times");
+        Objects.requireNonNull(unit, "unit");
         long keepAliveTime = unit.toNanos(time);
         long delta = keepAliveTime - this.keepAliveTime;
         this.keepAliveTime = keepAliveTime;
diff --git a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
index 73e6deda987..d9ce643a26d 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
@@ -41,22 +41,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-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.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.*;
 import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
 import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy;
@@ -66,6 +51,7 @@
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import org.junit.Assert;
 
 public class ThreadPoolExecutorTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -304,7 +290,9 @@ public void testSetThreadFactoryNull() {
             try {
                 p.setThreadFactory(null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("threadFactory", success.getMessage());
+            }
         }
     }
 
@@ -364,7 +352,9 @@ public void testSetRejectedExecutionHandlerNull() {
             try {
                 p.setRejectedExecutionHandler(null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("handler", success.getMessage());
+            }
         }
     }
 
@@ -737,7 +727,9 @@ public void testConstructor1() {
             new ThreadPoolExecutor(-1, 1, 1L, SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("corePoolSize must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -748,7 +740,9 @@ public void testConstructor2() {
             new ThreadPoolExecutor(1, -1, 1L, SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -759,7 +753,9 @@ public void testConstructor3() {
             new ThreadPoolExecutor(1, 0, 1L, SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -770,7 +766,9 @@ public void testConstructor4() {
             new ThreadPoolExecutor(1, 2, -1L, SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("keepAliveTime must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -781,7 +779,12 @@ public void testConstructor5() {
             new ThreadPoolExecutor(2, 1, 1L, SECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals(
+                "maximumPoolSize must be greater than or equal to corePoolSize",
+                success.getMessage()
+            );
+        }
     }
 
     /**
@@ -792,7 +795,9 @@ public void testConstructorNullPointerException() {
             new ThreadPoolExecutor(1, 2, 1L, SECONDS,
                                    (BlockingQueue<Runnable>) null);
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("workQueue", success.getMessage());
+        }
     }
 
     /**
@@ -804,7 +809,9 @@ public void testConstructor6() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("corePoolSize must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -816,7 +823,9 @@ public void testConstructor7() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -828,7 +837,9 @@ public void testConstructor8() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -840,7 +851,9 @@ public void testConstructor9() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("keepAliveTime must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -852,7 +865,12 @@ public void testConstructor10() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals(
+                "maximumPoolSize must be greater than or equal to corePoolSize",
+                success.getMessage()
+            );
+        }
     }
 
     /**
@@ -864,7 +882,9 @@ public void testConstructorNullPointerException2() {
                                    (BlockingQueue<Runnable>) null,
                                    new SimpleThreadFactory());
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("workQueue", success.getMessage());
+        }
     }
 
     /**
@@ -876,7 +896,9 @@ public void testConstructorNullPointerException3() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    (ThreadFactory) null);
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("threadFactory", success.getMessage());
+        }
     }
 
     /**
@@ -888,7 +910,9 @@ public void testConstructor11() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("corePoolSize must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -900,7 +924,9 @@ public void testConstructor12() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -912,7 +938,9 @@ public void testConstructor13() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -924,7 +952,9 @@ public void testConstructor14() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("keepAliveTime must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -936,7 +966,12 @@ public void testConstructor15() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals(
+                "maximumPoolSize must be greater than or equal to corePoolSize",
+                success.getMessage()
+            );
+        }
     }
 
     /**
@@ -948,7 +983,9 @@ public void testConstructorNullPointerException4() {
                                    (BlockingQueue<Runnable>) null,
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("workQueue", success.getMessage());
+        }
     }
 
     /**
@@ -960,7 +997,9 @@ public void testConstructorNullPointerException5() {
                                    new ArrayBlockingQueue<Runnable>(10),
                                    (RejectedExecutionHandler) null);
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("handler", success.getMessage());
+        }
     }
 
     /**
@@ -973,7 +1012,9 @@ public void testConstructor16() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("corePoolSize must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -986,7 +1027,9 @@ public void testConstructor17() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -999,7 +1042,9 @@ public void testConstructor18() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("maximumPoolSize must be positive", success.getMessage());
+        }
     }
 
     /**
@@ -1012,7 +1057,9 @@ public void testConstructor19() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals("keepAliveTime must be non-negative", success.getMessage());
+        }
     }
 
     /**
@@ -1025,7 +1072,12 @@ public void testConstructor20() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        } catch (IllegalArgumentException success) {
+            assertEquals(
+                "maximumPoolSize must be greater than or equal to corePoolSize",
+                success.getMessage()
+            );
+        }
     }
 
     /**
@@ -1038,7 +1090,9 @@ public void testConstructorNullPointerException6() {
                                    new SimpleThreadFactory(),
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("workQueue", success.getMessage());
+        }
     }
 
     /**
@@ -1051,7 +1105,9 @@ public void testConstructorNullPointerException7() {
                                    new SimpleThreadFactory(),
                                    (RejectedExecutionHandler) null);
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("handler", success.getMessage());
+        }
     }
 
     /**
@@ -1064,7 +1120,24 @@ public void testConstructorNullPointerException8() {
                                    (ThreadFactory) null,
                                    new NoOpREHandler());
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (NullPointerException success) {
+            assertEquals("threadFactory", success.getMessage());
+        }
+    }
+
+    /**
+     * Constructor throws if unit is null
+     */
+    public void testConstructorNullPointerException9() {
+        try {
+            new ThreadPoolExecutor(1, 2, 1L, (TimeUnit) null,
+                new ArrayBlockingQueue<Runnable>(10),
+                new SimpleThreadFactory(),
+                new NoOpREHandler());
+            shouldThrow();
+        } catch (NullPointerException success) {
+            assertEquals("unit", success.getMessage());
+        }
     }
 
     /**
@@ -1228,7 +1301,9 @@ public void testCorePoolSizeIllegalArgumentException() {
             try {
                 p.setCorePoolSize(-1);
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals("corePoolSize must be non-negative", success.getMessage());
+            }
         }
     }
 
@@ -1245,7 +1320,12 @@ public void testMaximumPoolSizeIllegalArgumentException() {
             try {
                 p.setMaximumPoolSize(1);
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals(
+                    "maximumPoolSize must be greater than or equal to corePoolSize",
+                    success.getMessage()
+                );
+            }
         }
     }
 
@@ -1262,7 +1342,9 @@ public void testMaximumPoolSizeIllegalArgumentException2() {
             try {
                 p.setMaximumPoolSize(-1);
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals("maximumPoolSize must be positive", success.getMessage());
+            }
         }
     }
 
@@ -1282,13 +1364,25 @@ public void testPoolSizeInvariants() {
                 try {
                     p.setMaximumPoolSize(s - 1);
                     shouldThrow();
-                } catch (IllegalArgumentException success) {}
+                } catch (IllegalArgumentException success) {
+                    assertEquals(
+                        s == 1
+                        ? "maximumPoolSize must be positive"
+                        : "maximumPoolSize must be greater than or equal to corePoolSize",
+                        success.getMessage()
+                    );
+                }
                 assertEquals(s, p.getCorePoolSize());
                 assertEquals(s, p.getMaximumPoolSize());
                 try {
                     p.setCorePoolSize(s + 1);
                     shouldThrow();
-                } catch (IllegalArgumentException success) {}
+                } catch (IllegalArgumentException success) {
+                    assertEquals(
+                        "corePoolSize must be less than or equal to maximumPoolSize",
+                        success.getMessage()
+                    );
+                }
                 assertEquals(s, p.getCorePoolSize());
                 assertEquals(s, p.getMaximumPoolSize());
             }
@@ -1299,7 +1393,7 @@ public void testPoolSizeInvariants() {
      * setKeepAliveTime throws IllegalArgumentException
      * when given a negative value
      */
-    public void testKeepAliveTimeIllegalArgumentException() {
+    public void testKeepAliveTimeInvalidLengthIllegalArgumentException() {
         final ThreadPoolExecutor p =
             new ThreadPoolExecutor(2, 3,
                                    LONG_DELAY_MS, MILLISECONDS,
@@ -1308,7 +1402,28 @@ public void testKeepAliveTimeIllegalArgumentException() {
             try {
                 p.setKeepAliveTime(-1, MILLISECONDS);
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals("time must be non-negative", success.getMessage());
+            }
+        }
+    }
+
+    /**
+     * setKeepAliveTime throws IllegalArgumentException
+     * when given a null unit
+     */
+    public void testKeepAliveTimeNullTimeUnitIllegalArgumentException() {
+        final ThreadPoolExecutor p =
+            new ThreadPoolExecutor(2, 3,
+                LONG_DELAY_MS, MILLISECONDS,
+                new ArrayBlockingQueue<Runnable>(10));
+        try (PoolCleaner cleaner = cleaner(p)) {
+            try {
+                p.setKeepAliveTime(1, (TimeUnit) null);
+                shouldThrow();
+            } catch (NullPointerException success) {
+                assertEquals("unit", success.getMessage());
+            }
         }
     }
 
@@ -1399,7 +1514,9 @@ public void testInvokeAny1() throws Exception {
             try {
                 e.invokeAny(null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("tasks", success.getMessage());
+            }
         }
     }
 
@@ -1415,7 +1532,9 @@ public void testInvokeAny2() throws Exception {
             try {
                 e.invokeAny(new ArrayList<Callable<String>>());
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals("tasks is empty", success.getMessage());
+            }
         }
     }
 
@@ -1435,7 +1554,9 @@ public void testInvokeAny3() throws Exception {
             try {
                 e.invokeAny(l);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("task", success.getMessage());
+            }
             latch.countDown();
         }
     }
@@ -1489,7 +1610,9 @@ public void testInvokeAll1() throws Exception {
             try {
                 e.invokeAll(null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("tasks", success.getMessage());
+            }
         }
     }
 
@@ -1524,7 +1647,9 @@ public void testInvokeAll3() throws Exception {
             try {
                 e.invokeAll(l);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals(null, success.getMessage());
+            }
         }
     }
 
@@ -1581,7 +1706,9 @@ public void testTimedInvokeAny1() throws Exception {
             try {
                 e.invokeAny(null, randomTimeout(), randomTimeUnit());
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("tasks", success.getMessage());
+            }
         }
     }
 
@@ -1599,7 +1726,9 @@ public void testTimedInvokeAnyNullTimeUnit() throws Exception {
             try {
                 e.invokeAny(l, randomTimeout(), null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("Cannot invoke \"java.util.concurrent.TimeUnit.toNanos(long)\" because \"unit\" is null", success.getMessage());
+            }
         }
     }
 
@@ -1616,7 +1745,9 @@ public void testTimedInvokeAny2() throws Exception {
                 e.invokeAny(new ArrayList<Callable<String>>(),
                             randomTimeout(), randomTimeUnit());
                 shouldThrow();
-            } catch (IllegalArgumentException success) {}
+            } catch (IllegalArgumentException success) {
+                assertEquals("tasks is empty", success.getMessage());
+            }
         }
     }
 
@@ -1636,7 +1767,9 @@ public void testTimedInvokeAny3() throws Exception {
             try {
                 e.invokeAny(l, randomTimeout(), randomTimeUnit());
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("task", success.getMessage());
+            }
             latch.countDown();
         }
     }
@@ -1694,7 +1827,9 @@ public void testTimedInvokeAll1() throws Exception {
             try {
                 e.invokeAll(null, randomTimeout(), randomTimeUnit());
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("tasks", success.getMessage());
+            }
         }
     }
 
@@ -1712,7 +1847,9 @@ public void testTimedInvokeAllNullTimeUnit() throws Exception {
             try {
                 e.invokeAll(l, randomTimeout(), null);
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals("unit", success.getMessage());
+            }
         }
     }
 
@@ -1748,7 +1885,9 @@ public void testTimedInvokeAll3() throws Exception {
             try {
                 e.invokeAll(l, randomTimeout(), randomTimeUnit());
                 shouldThrow();
-            } catch (NullPointerException success) {}
+            } catch (NullPointerException success) {
+                assertEquals(null, success.getMessage());
+            }
         }
     }
 

From ab235000349bfd268e80a7cb99bf07a229406119 Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Wed, 4 Jun 2025 08:31:37 +0000
Subject: [PATCH 842/901] 8354636: [PPC64] Clean up comments regarding frame
 manager

Reviewed-by: amitkumar, rrich
---
 src/hotspot/cpu/ppc/register_ppc.hpp      |  4 ++--
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp |  2 +-
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp | 18 ++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/ppc/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp
index 2b5b25f449e..b7949750dcc 100644
--- a/src/hotspot/cpu/ppc/register_ppc.hpp
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp
@@ -523,7 +523,7 @@ constexpr FloatRegister F11_ARG11  = F11; // volatile
 constexpr FloatRegister F12_ARG12  = F12; // volatile
 constexpr FloatRegister F13_ARG13  = F13; // volatile
 
-// Register declarations to be used in frame manager assembly code.
+// Register declarations to be used in template interpreter assembly code.
 // Use only non-volatile registers in order to keep values across C-calls.
 constexpr Register R14_bcp       = R14;
 constexpr Register R15_esp       = R15;      // slot below top of expression stack for ld/st with update
@@ -533,7 +533,7 @@ constexpr Register R17_tos       = R17;      // The interpreter's top of (expres
 constexpr Register R18_locals    = R18;      // address of first param slot (receiver).
 constexpr Register R19_method    = R19;      // address of current method
 
-// Temporary registers to be used within frame manager. We can use
+// Temporary registers to be used within template interpreter. We can use
 // the non-volatiles because the call stub has saved them.
 // Use only non-volatile registers in order to keep values across C-calls.
 constexpr Register R21_tmp1 = R21;
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index a7e759d770b..4ec2483b267 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -2935,7 +2935,7 @@ static void push_skeleton_frames(MacroAssembler* masm, bool deopt,
   __ cmpdi(CR0, number_of_frames_reg, 0);
   __ bne(CR0, loop);
 
-  // Get the return address pointing into the frame manager.
+  // Get the return address pointing into the template interpreter.
   __ ld(R0, 0, pcs_reg);
   // Store it in the top interpreter frame.
   __ std(R0, _abi0(lr), R1_SP);
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 7fc807bb9ce..2624131033c 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -86,7 +86,7 @@ class StubGenerator: public StubCodeGenerator {
   //   R10 - thread                   : Thread*
   //
   address generate_call_stub(address& return_address) {
-    // Setup a new c frame, copy java arguments, call frame manager or
+    // Setup a new c frame, copy java arguments, call template interpreter or
     // native_entry, and process result.
 
     StubGenStubId stub_id = StubGenStubId::call_stub_id;
@@ -215,11 +215,10 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     {
-      BLOCK_COMMENT("Call frame manager or native entry.");
-      // Call frame manager or native entry.
+      BLOCK_COMMENT("Call template interpreter or native entry.");
       assert_different_registers(r_arg_entry, r_top_of_arguments_addr, r_arg_method, r_arg_thread);
 
-      // Register state on entry to frame manager / native entry:
+      // Register state on entry to template interpreter / native entry:
       //
       //   tos         -  intptr_t*    sender tos (prepushed) Lesp = (SP) + copied_arguments_offset - 8
       //   R19_method  -  Method
@@ -242,7 +241,7 @@ class StubGenerator: public StubCodeGenerator {
 
       // Set R15_prev_state to 0 for simplifying checks in callee.
       __ load_const_optimized(R25_templateTableBase, (address)Interpreter::dispatch_table((TosState)0), R0);
-      // Stack on entry to frame manager / native entry:
+      // Stack on entry to template interpreter / native entry:
       //
       //      F0      [TOP_IJAVA_FRAME_ABI]
       //              alignment (optional)
@@ -262,7 +261,7 @@ class StubGenerator: public StubCodeGenerator {
       __ mr(R21_sender_SP, R1_SP);
 
       // Do a light-weight C-call here, r_arg_entry holds the address
-      // of the interpreter entry point (frame manager or native entry)
+      // of the interpreter entry point (template interpreter or native entry)
       // and save runtime-value of LR in return_address.
       assert(r_arg_entry != tos && r_arg_entry != R19_method && r_arg_entry != R16_thread,
              "trashed r_arg_entry");
@@ -270,11 +269,10 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     {
-      BLOCK_COMMENT("Returned from frame manager or native entry.");
-      // Returned from frame manager or native entry.
+      BLOCK_COMMENT("Returned from template interpreter or native entry.");
       // Now pop frame, process result, and return to caller.
 
-      // Stack on exit from frame manager / native entry:
+      // Stack on exit from template interpreter / native entry:
       //
       //      F0      [ABI]
       //              ...
@@ -295,7 +293,7 @@ class StubGenerator: public StubCodeGenerator {
       Register r_cr = R12_scratch2;
 
       // Reload some volatile registers which we've spilled before the call
-      // to frame manager / native entry.
+      // to template interpreter / native entry.
       // Access all locals via frame pointer, because we know nothing about
       // the topmost frame's size.
       __ ld(r_entryframe_fp, _abi0(callers_sp), R1_SP); // restore after call

From cd16b6896222a623dc99b9e63bb917a9d2980e88 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 4 Jun 2025 09:06:46 +0000
Subject: [PATCH 843/901] 8357155: [asan] ZGC does not work (x86_64 and ppc64)

Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org>
Reviewed-by: mdoerr, aboldtch
---
 src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp | 5 +++++
 src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
index 89417c4691d..20d96f6e937 100644
--- a/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zAddress_ppc.cpp
@@ -93,10 +93,15 @@ static size_t probe_valid_max_address_bit() {
 size_t ZPlatformAddressOffsetBits() {
   static const size_t valid_max_address_offset_bits = probe_valid_max_address_bit() + 1;
   const size_t max_address_offset_bits = valid_max_address_offset_bits - 3;
+#ifdef ADDRESS_SANITIZER
+  // The max supported value is 44 because of other internal data structures.
+  return MIN2(valid_max_address_offset_bits, (size_t)44);
+#else
   const size_t min_address_offset_bits = max_address_offset_bits - 2;
   const size_t address_offset = ZGlobalsPointers::min_address_offset_request();
   const size_t address_offset_bits = log2i_exact(address_offset);
   return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
+#endif
 }
 
 size_t ZPlatformAddressHeapBaseShift() {
diff --git a/src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp b/src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp
index 6b5b64d3036..db35a4efe08 100644
--- a/src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zAddress_x86.cpp
@@ -30,11 +30,15 @@
 size_t ZPointerLoadShift;
 
 size_t ZPlatformAddressOffsetBits() {
+#ifdef ADDRESS_SANITIZER
+  return 44;
+#else
   const size_t min_address_offset_bits = 42; // 4TB
   const size_t max_address_offset_bits = 44; // 16TB
   const size_t address_offset = ZGlobalsPointers::min_address_offset_request();
   const size_t address_offset_bits = log2i_exact(address_offset);
   return clamp(address_offset_bits, min_address_offset_bits, max_address_offset_bits);
+#endif
 }
 
 size_t ZPlatformAddressHeapBaseShift() {

From 42f48a39e867ae1683708dda3e158c24a6957180 Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Wed, 4 Jun 2025 09:41:51 +0000
Subject: [PATCH 844/901] 8350689: Turn on timestamp and thread metadata by
 default for java.security.debug

Reviewed-by: mullan
---
 .../doc-files/debug-system-property.html      | 18 +---
 .../classes/sun/security/util/Debug.java      | 81 +++--------------
 .../security/krb5/auto/LoginModuleDebug.java  | 20 ++---
 .../SSLLogger/DebugPropertyValuesTest.java    | 18 ++--
 .../sun/security/util/Debug/DebugOptions.java | 86 ++++++-------------
 5 files changed, 54 insertions(+), 169 deletions(-)

diff --git a/src/java.base/share/classes/java/security/doc-files/debug-system-property.html b/src/java.base/share/classes/java/security/doc-files/debug-system-property.html
index 4ea34252b3c..ac325b2ef62 100644
--- a/src/java.base/share/classes/java/security/doc-files/debug-system-property.html
+++ b/src/java.base/share/classes/java/security/doc-files/debug-system-property.html
@@ -52,24 +52,10 @@ <h1><B>{@systemProperty java.security.debug}</B></h1>
 <p> To monitor security access, you can set the <code>java.security.debug</code>
     system property, which determines what trace messages are printed during
     execution. The value of the property is one or more options separated by a
-    comma.
+    comma. Each trace message includes the thread id, caller information, and
+    timestamp.
 </p>
 
-<h2>Printing Thread and Timestamp Information</h2>
-<p>
-    You can append the following strings to any option specified in the
-    <code>java.security.debug</code> system property to print additional
-    information:
-<ul>
-    <li><code>+thread</code>: Print thread and caller information</li>
-    <li><code>+timestamp</code>: Print timestamp information</li>
-</ul>
-<p>
-    For example, to add thread, caller, and timestamp information to all
-    debugging output, set the <code>java.security.debug</code> system property
-    on the command line as follows:
-    <pre><code>java -Djava.security.debug=all+thread+timestamp MyApp</code></pre>
-
 <p>The following table lists the <code>java.security.debug</code> options:</p>
 
 <table id="debug">
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 f6c0c523165..9f7649fc73c 100644
--- a/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
@@ -41,14 +41,7 @@
 public class Debug {
 
     private String prefix;
-    private boolean printDateTime;
-    private boolean printThreadDetails;
-
     private static String args;
-    private static boolean threadInfoAll;
-    private static boolean timeStampInfoAll;
-    private static final String TIMESTAMP_OPTION = "+timestamp";
-    private static final String THREAD_OPTION = "+thread";
 
     static {
         args = System.getProperty("java.security.debug");
@@ -66,16 +59,6 @@ public class Debug {
             args = args.toLowerCase(Locale.ENGLISH);
             if (args.equals("help")) {
                 Help();
-            } else if (args.contains("all")) {
-                // "all" option has special handling for decorator options
-                // If the thread or timestamp decorator option is detected
-                // with the "all" option, then it impacts decorator options
-                // for other categories
-                int beginIndex = args.lastIndexOf("all") + "all".length();
-                int commaIndex = args.indexOf(',', beginIndex);
-                if (commaIndex == -1) commaIndex = args.length();
-                threadInfoAll = args.substring(beginIndex, commaIndex).contains(THREAD_OPTION);
-                timeStampInfoAll = args.substring(beginIndex, commaIndex).contains(TIMESTAMP_OPTION);
             }
         }
     }
@@ -106,11 +89,6 @@ public static void Help() {
         System.err.println("ts            timestamping");
         System.err.println("x509          X.509 certificate debugging");
         System.err.println();
-        System.err.println("+timestamp can be appended to any of above options to print");
-        System.err.println("              a timestamp for that debug option");
-        System.err.println("+thread can be appended to any of above options to print");
-        System.err.println("              thread and caller information for that debug option");
-        System.err.println();
         System.err.println("The following can be used with provider:");
         System.err.println();
         System.err.println("engine=<engines>");
@@ -151,7 +129,6 @@ public static Debug getInstance(String option, String prefix) {
         if (isOn(option)) {
             Debug d = new Debug();
             d.prefix = prefix;
-            d.configureExtras(option);
             return d;
         } else {
             return null;
@@ -166,32 +143,6 @@ private static String formatCaller() {
                         .findFirst().orElse("unknown caller"));
     }
 
-    // parse an option string to determine if extra details,
-    // like thread and timestamp, should be printed
-    private void configureExtras(String option) {
-        // treat "all" as special case, only used for java.security.debug property
-        this.printDateTime = timeStampInfoAll;
-        this.printThreadDetails = threadInfoAll;
-
-        if (printDateTime && printThreadDetails) {
-            // nothing left to configure
-            return;
-        }
-
-        // args is converted to lower case for the most part via marshal method
-        int optionIndex = args.lastIndexOf(option);
-        if (optionIndex == -1) {
-            // option not in args list. Only here since "all" was present
-            // in debug property argument. "all" option already parsed
-            return;
-        }
-        int beginIndex = optionIndex + option.length();
-        int commaIndex = args.indexOf(',', beginIndex);
-        if (commaIndex == -1) commaIndex = args.length();
-        String subOpt = args.substring(beginIndex, commaIndex);
-        printDateTime = printDateTime || subOpt.contains(TIMESTAMP_OPTION);
-        printThreadDetails = printThreadDetails || subOpt.contains(THREAD_OPTION);
-    }
 
     /**
      * Get a Debug object corresponding to the given option on the given
@@ -208,11 +159,6 @@ private void configureExtras(String option) {
      * Debug debug = Debug.of("login", property);
      * }
      *
-     * +timestamp string can be appended to property value
-     * to print timestamp information. (e.g. true+timestamp)
-     * +thread string can be appended to property value
-     * to print thread and caller information. (e.g. true+thread)
-     *
      * @param prefix the debug option name
      * @param property debug setting for this option
      * @return a new Debug object if the property is true
@@ -221,8 +167,6 @@ public static Debug of(String prefix, String property) {
         if (property != null && property.toLowerCase(Locale.ROOT).startsWith("true")) {
             Debug d = new Debug();
             d.prefix = prefix;
-            d.printThreadDetails = property.contains(THREAD_OPTION);
-            d.printDateTime = property.contains(TIMESTAMP_OPTION);
             return d;
         }
         return null;
@@ -285,23 +229,18 @@ public void println(String prefix, String message) {
     }
 
     /**
-     * If thread debug option enabled, include information containing
-     * hex value of threadId and the current thread name
-     * If timestamp debug option enabled, include timestamp string
-     * @return extra info if debug option enabled.
+     * Include information containing:
+     * - hex value of threadId
+     * - the current thread name
+     * - timestamp string
+     * @return String with above metadata
      */
     private String extraInfo() {
-        String retString = "";
-        if (printThreadDetails) {
-            retString = "0x" + Long.toHexString(
-                    Thread.currentThread().threadId()).toUpperCase(Locale.ROOT) +
-                    "|" + Thread.currentThread().getName() + "|" + formatCaller();
-        }
-        if (printDateTime) {
-            retString += (retString.isEmpty() ? "" : "|")
-                    + FormatHolder.DATE_TIME_FORMATTER.format(Instant.now());
-        }
-        return retString.isEmpty() ? "" : "[" + retString + "]";
+        return String.format("[0x%s|%s|%s|%s]",
+                Long.toHexString(Thread.currentThread().threadId()).toUpperCase(Locale.ROOT),
+                Thread.currentThread().getName(),
+                formatCaller(),
+                FormatHolder.DATE_TIME_FORMATTER.format(Instant.now()));
     }
 
     /**
diff --git a/test/jdk/sun/security/krb5/auto/LoginModuleDebug.java b/test/jdk/sun/security/krb5/auto/LoginModuleDebug.java
index 42ddf72ec50..b34e8b42282 100644
--- a/test/jdk/sun/security/krb5/auto/LoginModuleDebug.java
+++ b/test/jdk/sun/security/krb5/auto/LoginModuleDebug.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,8 +47,8 @@ private static Stream<Arguments> patternMatches() {
                 // debug option set to true - no extra info
                 Arguments.of("debug",
                         "true",
-                        "krb5loginmodule:",
-                        "krb5loginmodule\\["),
+                        "krb5loginmodule\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
+                        "krb5loginmodule:"),
                 // debug option set to false
                 Arguments.of("debug",
                         "false",
@@ -59,19 +59,9 @@ private static Stream<Arguments> patternMatches() {
                         "bar",
                         "",
                         "krb5loginmodule"),
-                // thread info only
+                // test for thread and timestamp info
                 Arguments.of("debug",
                         "true+thread",
-                        "krb5loginmodule\\[.*\\|main|\\.*java.*]:",
-                        "\\|" + DATE_REGEX + ".*\\]:"),
-                // timestamp info only
-                Arguments.of("debug",
-                        "true+timestamp",
-                        "krb5loginmodule\\[" + DATE_REGEX + ".*\\]",
-                        "\\|main\\]:"),
-                // both thread and timestamp
-                Arguments.of("debug",
-                        "true+timestamp+thread",
                         "krb5loginmodule\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
                         "krb5loginmodule:")
         );
@@ -104,4 +94,4 @@ public static void main(String[] args) throws Exception {
                     new Subject(), null, Map.of(), Map.of(args[0], args[1]));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
index c9ad335a45e..424a460914c 100644
--- a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
+++ b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
@@ -51,8 +51,11 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
 
     private static final Path LOG_FILE = Path.of("logging.conf");
     private static final HashMap<String, List<String>> debugMessages = new HashMap<>();
+    private static final String DATE_REGEX = "\\d{4}-\\d{2}-\\d{2}";
 
     static {
+
+
         debugMessages.put("handshake",
                 List.of("Produced ClientHello handshake message",
                         "supported_versions"));
@@ -74,10 +77,10 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
         debugMessages.put("help",
                 List.of("print the help messages",
                         "debugging can be widened with:"));
-        debugMessages.put("javax.net.debug",
-                List.of("properties: Initial security property:",
-                        "certpath: Cert path validation succeeded"));
-        debugMessages.put("logger",
+        debugMessages.put("java.security.debug",
+                List.of("properties\\[.*\\|main\\|.*" + DATE_REGEX + ".*\\]:",
+                        "certpath\\[.*\\|main\\|.*" + DATE_REGEX + ".*\\]:"));
+        debugMessages.put("javax.net.debug.logger",
                 List.of("FINE: adding as trusted certificates",
                         "FINE: WRITE: TLSv1.3 application_data"));
     }
@@ -151,14 +154,15 @@ private static Stream<Arguments> patternMatches() {
                 // add in javax.net.debug sanity test
                 Arguments.of(List.of("-Djavax.net.debug=ssl:trustmanager",
                                 "-Djava.security.debug=all"),
-                        List.of("handshake", "javax.net.debug", "keymanager",
+                        List.of("handshake", "java.security.debug", "keymanager",
                                 "record", "session", "ssl", "sslctx",
                                 "trustmanager", "verbose")),
                 // empty invokes System.Logger use
                 Arguments.of(List.of("-Djavax.net.debug",
                         "-Djava.util.logging.config.file=" + LOG_FILE),
-                        List.of("handshake", "keymanager", "logger", "packet",
-                                "plaintext", "record", "session", "ssl",
+                        List.of("handshake", "javax.net.debug.logger",
+                                "keymanager", "packet",  "plaintext",
+                                "record", "session", "ssl",
                                 "sslctx", "trustmanager", "verbose"))
         );
     }
diff --git a/test/jdk/sun/security/util/Debug/DebugOptions.java b/test/jdk/sun/security/util/Debug/DebugOptions.java
index a52566e7aeb..5fa02af5112 100644
--- a/test/jdk/sun/security/util/Debug/DebugOptions.java
+++ b/test/jdk/sun/security/util/Debug/DebugOptions.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 8051959
+ * @bug 8051959 8350689
  * @summary Option to print extra information in java.security.debug output
  * @library /test/lib
  * @run junit DebugOptions
@@ -43,75 +43,41 @@
 public class DebugOptions {
 
     static final String DATE_REGEX = "\\d{4}-\\d{2}-\\d{2}";
+    static final String EXPECTED_PROP_REGEX =
+            "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:";
+    static final String EXPECTED_PROP_KEYSTORE_REGEX =
+            "properties\\[.*\\|main|" + DATE_REGEX +
+                    ".*\\Rkeystore\\[.*\\|main|" + DATE_REGEX + ".*\\]:";
+    static final String EXPECTED_ALL_REGEX =
+            "properties\\[.*\\|main.*\\|" + DATE_REGEX +
+                    ".*\\]((.*\\R)*)keystore\\[.*\\|main.*\\|"
+                    + DATE_REGEX + ".*\\]:";
 
     private static Stream<Arguments> patternMatches() {
         return Stream.of(
-                // no extra info present
+                // test for thread and timestamp info
                 Arguments.of("properties",
-                        "properties: Initial",
-                        "properties\\["),
-                // thread info only
+                        EXPECTED_PROP_REGEX,
+                        "properties:"),
+                // test for thread and timestamp info
                 Arguments.of("properties+thread",
-                        "properties\\[.*\\|main\\|.*java.*]:",
-                        "properties\\[" + DATE_REGEX),
-                // timestamp info only
-                Arguments.of("properties+timestamp",
-                        "properties\\[" + DATE_REGEX + ".*\\]",
-                        "\\|main\\]:"),
-                // both thread and timestamp
-                Arguments.of("properties+timestamp+thread",
-                        "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
+                        EXPECTED_PROP_REGEX,
                         "properties:"),
                 // flip the arguments of previous test
                 Arguments.of("properties+thread+timestamp",
-                        "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
+                        EXPECTED_PROP_REGEX,
                         "properties:"),
-                // comma not valid separator, ignore extra info printing request
-                Arguments.of("properties,thread,timestamp",
-                        "properties:",
-                        "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:"),
-                // no extra info for keystore debug prints
-                Arguments.of("properties+thread+timestamp,keystore",
-                        "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
-                        "keystore\\["),
-                // flip arguments around in last test - same outcome expected
-                Arguments.of("keystore,properties+thread+timestamp",
-                        "properties\\[.*\\|main|" + DATE_REGEX + ".*\\]:",
-                        "keystore\\["),
-                // turn on thread info for both keystore and properties components
-                Arguments.of("keystore+thread,properties+thread",
-                        "properties\\[.*\\|main|.*\\Rkeystore\\[.*\\|main|.*\\]:",
-                        "\\|" + DATE_REGEX + ".*\\]:"),
-                // same as above with erroneous comma at end of string. same output expected
-                Arguments.of("keystore+thread,properties+thread,",
-                        "properties\\[.*\\|main|.*\\Rkeystore\\[.*\\|main|.*\\]:",
-                        "\\|" + DATE_REGEX + ".*\\]:"),
-                // turn on thread info for properties and timestamp for keystore
-                Arguments.of("keystore+timestamp,properties+thread",
-                        "properties\\[.*\\|main|.*\\Rkeystore\\[" + DATE_REGEX + ".*\\]:",
-                        "properties\\[.*\\|" + DATE_REGEX + ".*\\]:"),
-                // turn on thread info for all components
-                Arguments.of("all+thread",
-                        "properties\\[.*\\|main.*((.*\\R)*)keystore\\[.*\\|main.*java.*\\]:",
-                        "properties\\[" + DATE_REGEX + ".*\\]:"),
-                // turn on thread info and timestamp for all components
-                Arguments.of("all+thread+timestamp",
-                        "properties\\[.*\\|main.*\\|" + DATE_REGEX +
-                                ".*\\]((.*\\R)*)keystore\\[.*\\|main.*\\|" + DATE_REGEX + ".*\\]:",
+                // regular keystore,properties component string
+                Arguments.of("keystore,properties",
+                        EXPECTED_PROP_KEYSTORE_REGEX,
                         "properties:"),
-                // all decorator option should override other component options
-                Arguments.of("all+thread+timestamp,properties",
-                        "properties\\[.*\\|main.*\\|" + DATE_REGEX +
-                                ".*\\]((.*\\R)*)keystore\\[.*\\|main.*\\|" + DATE_REGEX + ".*\\]:",
+                // turn on all
+                Arguments.of("all",
+                        EXPECTED_ALL_REGEX,
                         "properties:"),
-                // thread details should only be printed for properties option
-                Arguments.of("properties+thread,all",
-                        "properties\\[.*\\|main\\|.*\\]:",
-                        "keystore\\[.*\\|main\\|.*\\]:"),
-                // thread details should be printed for all statements
-                Arguments.of("properties,all+thread",
-                        "properties\\[.*\\|main.*java" +
-                                ".*\\]((.*\\R)*)keystore\\[.*\\|main.*java.*\\]:",
+                // expect thread and timestamp info
+                Arguments.of("all+thread",
+                        EXPECTED_ALL_REGEX,
                         "properties:")
         );
     }

From 7838321b74276e45b92c54904ea31ef70ed9e33f Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 4 Jun 2025 09:52:45 +0000
Subject: [PATCH 845/901] 8358496: Concurrent reading from Socket with timeout
 executes sequentially

Reviewed-by: dfuchs
---
 .../classes/sun/nio/ch/NioSocketImpl.java     |  23 +-
 test/jdk/java/net/Socket/Timeouts.java        | 246 +++++++++++-------
 2 files changed, 163 insertions(+), 106 deletions(-)

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 6705134648d..dd81b356738 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -288,7 +288,7 @@ private int timedRead(FileDescriptor fd, byte[] b, int off, int len, long nanos)
      * @throws SocketException if the socket is closed or a socket I/O error occurs
      * @throws SocketTimeoutException if the read timeout elapses
      */
-    private int implRead(byte[] b, int off, int len) throws IOException {
+    private int implRead(byte[] b, int off, int len, long remainingNanos) throws IOException {
         int n = 0;
         FileDescriptor fd = beginRead();
         try {
@@ -296,11 +296,10 @@ private int implRead(byte[] b, int off, int len) throws IOException {
                 throw new SocketException("Connection reset");
             if (isInputClosed)
                 return -1;
-            int timeout = this.timeout;
-            configureNonBlockingIfNeeded(fd, timeout > 0);
-            if (timeout > 0) {
+            configureNonBlockingIfNeeded(fd, remainingNanos > 0);
+            if (remainingNanos > 0) {
                 // read with timeout
-                n = timedRead(fd, b, off, len, MILLISECONDS.toNanos(timeout));
+                n = timedRead(fd, b, off, len, remainingNanos);
             } else {
                 // read, no timeout
                 n = tryRead(fd, b, off, len);
@@ -335,14 +334,24 @@ private int read(byte[] b, int off, int len) throws IOException {
         if (len == 0) {
             return 0;
         } else {
-            readLock.lock();
+            long remainingNanos = 0;
+            int timeout = this.timeout;
+            if (timeout > 0) {
+                remainingNanos = tryLock(readLock, timeout, MILLISECONDS);
+                if (remainingNanos <= 0) {
+                    assert !readLock.isHeldByCurrentThread();
+                    throw new SocketTimeoutException("Read timed out");
+                }
+            } else {
+                readLock.lock();
+            }
             try {
                 // emulate legacy behavior to return -1, even if socket is closed
                 if (readEOF)
                     return -1;
                 // read up to MAX_BUFFER_SIZE bytes
                 int size = Math.min(len, MAX_BUFFER_SIZE);
-                int n = implRead(b, off, size);
+                int n = implRead(b, off, size, remainingNanos);
                 if (n == -1)
                     readEOF = true;
                 return n;
diff --git a/test/jdk/java/net/Socket/Timeouts.java b/test/jdk/java/net/Socket/Timeouts.java
index 83bf01ebf50..f8fcfb86d0f 100644
--- a/test/jdk/java/net/Socket/Timeouts.java
+++ b/test/jdk/java/net/Socket/Timeouts.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
@@ -23,11 +23,10 @@
 
 /*
  * @test
- * @bug 8221481
+ * @bug 8221481 8358496
  * @library /test/lib
  * @build jdk.test.lib.Utils
- * @compile Timeouts.java
- * @run testng/othervm/timeout=180 Timeouts
+ * @run junit/othervm/timeout=180 Timeouts
  * @summary Test Socket timeouts
  */
 
@@ -43,25 +42,27 @@
 import java.net.SocketAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.testng.SkipException;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 import jdk.test.lib.Utils;
 
-@Test
-public class Timeouts {
+class Timeouts {
 
     /**
-     * Test timed connect where connection is established
+     * Test timed connect where connection is established.
      */
-    public void testTimedConnect1() throws IOException {
+    @Test
+    void testTimedConnect1() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             try (Socket s = new Socket()) {
                 s.connect(ss.getLocalSocketAddress(), 2000);
@@ -70,21 +71,21 @@ public void testTimedConnect1() throws IOException {
     }
 
     /**
-     * Test timed connect where connection is refused
+     * Test timed connect where connection is refused.
      */
-    public void testTimedConnect2() throws IOException {
+    @Test
+    void testTimedConnect2() throws IOException {
         try (Socket s = new Socket()) {
             SocketAddress remote = Utils.refusingEndpoint();
-            try {
-                s.connect(remote, 10000);
-            } catch (ConnectException expected) { }
+            assertThrows(ConnectException.class,  () -> s.connect(remote, 10000));
         }
     }
 
     /**
-     * Test connect with a timeout of Integer.MAX_VALUE
+     * Test connect with a timeout of Integer.MAX_VALUE.
      */
-    public void testTimedConnect3() throws IOException {
+    @Test
+    void testTimedConnect3() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             try (Socket s = new Socket()) {
                 s.connect(ss.getLocalSocketAddress(), Integer.MAX_VALUE);
@@ -95,141 +96,183 @@ public void testTimedConnect3() throws IOException {
     /**
      * Test connect with a negative timeout.
      */
-    public void testTimedConnect4() throws IOException {
+    @Test
+    void testTimedConnect4() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             try (Socket s = new Socket()) {
-                expectThrows(IllegalArgumentException.class,
+                assertThrows(IllegalArgumentException.class,
                              () -> s.connect(ss.getLocalSocketAddress(), -1));
             }
         }
     }
 
     /**
-     * Test timed read where the read succeeds immediately
+     * Test timed read where the read succeeds immediately.
      */
-    public void testTimedRead1() throws IOException {
+    @Test
+    void testTimedRead1() throws IOException {
         withConnection((s1, s2) -> {
             s1.getOutputStream().write(99);
             s2.setSoTimeout(30*1000);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
-     * Test timed read where the read succeeds after a delay
+     * Test timed read where the read succeeds after a delay.
      */
-    public void testTimedRead2() throws IOException {
+    @Test
+    void testTimedRead2() throws IOException {
         withConnection((s1, s2) -> {
             scheduleWrite(s1.getOutputStream(), 99, 2000);
             s2.setSoTimeout(30*1000);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
-     * Test timed read where the read times out
+     * Test timed read where the read times out.
      */
-    public void testTimedRead3() throws IOException {
+    @Test
+    void testTimedRead3() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(2000);
             long startMillis = millisTime();
-            expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
             int timeout = s2.getSoTimeout();
             checkDuration(startMillis, timeout-100, timeout+20_000);
         });
     }
 
     /**
-     * Test timed read that succeeds after a previous read has timed out
+     * Test timed read that succeeds after a previous read has timed out.
      */
-    public void testTimedRead4() throws IOException {
+    @Test
+    void testTimedRead4() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(2000);
-            expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
             s1.getOutputStream().write(99);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
      * Test timed read that succeeds after a previous read has timed out and
-     * after a short delay
+     * after a short delay.
      */
-    public void testTimedRead5() throws IOException {
+    @Test
+    void testTimedRead5() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(2000);
-            expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
             s2.setSoTimeout(30*3000);
             scheduleWrite(s1.getOutputStream(), 99, 2000);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
-     * Test untimed read that succeeds after a previous read has timed out
+     * Test untimed read that succeeds after a previous read has timed out.
      */
-    public void testTimedRead6() throws IOException {
+    @Test
+    void testTimedRead6() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(2000);
-            expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
             s1.getOutputStream().write(99);
             s2.setSoTimeout(0);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
      * Test untimed read that succeeds after a previous read has timed out and
-     * after a short delay
+     * after a short delay.
      */
-    public void testTimedRead7() throws IOException {
+    @Test
+    void testTimedRead7() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(2000);
-            expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
             scheduleWrite(s1.getOutputStream(), 99, 2000);
             s2.setSoTimeout(0);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
         });
     }
 
     /**
-     * Test async close of timed read
+     * Test async close of timed read.
      */
-    public void testTimedRead8() throws IOException {
+    @Test
+    void testTimedRead8() throws IOException {
         withConnection((s1, s2) -> {
             s2.setSoTimeout(30*1000);
             scheduleClose(s2, 2000);
-            expectThrows(SocketException.class, () -> s2.getInputStream().read());
+            assertThrows(SocketException.class, () -> s2.getInputStream().read());
         });
     }
 
     /**
-     * Test read with a timeout of Integer.MAX_VALUE
+     * Test read with a timeout of Integer.MAX_VALUE.
      */
-    public void testTimedRead9() throws IOException {
+    @Test
+    void testTimedRead9() throws IOException {
         withConnection((s1, s2) -> {
             scheduleWrite(s1.getOutputStream(), 99, 2000);
             s2.setSoTimeout(Integer.MAX_VALUE);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
+        });
+    }
+
+    /**
+     * Test 100 threads concurrently reading the same Socket with a timeout of 2s.
+     * Each read should throw SocketTimeoutException after 2s, not 2s for the first,
+     * 4s for the second, 6s for the third, up to 200s for the last thread.
+     */
+    @Test
+    void testTimedRead10() throws Exception {
+        var futures = new ArrayList<Future<?>>();
+        withConnection((_, s) -> {
+            s.setSoTimeout(2000);
+            Callable<?> timedReadTask = () -> {
+                long startMillis = millisTime();
+                assertThrows(SocketTimeoutException.class,
+                        () -> s.getInputStream().read());
+                int timeout = s.getSoTimeout();
+                checkDuration(startMillis, timeout-100, timeout+20_000);
+                return null;
+            };
+            // start 100 virtual threads to read from the socket
+            try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+                for (int i = 0; i < 100; i++) {
+                    Future<?> future = executor.submit(timedReadTask);
+                    futures.add(future);
+                }
+            }
         });
+        for (Future<?> future : futures) {
+            future.get();
+        }
     }
 
     /**
      * Test writing after a timed read.
      */
-    public void testTimedWrite1() throws IOException {
+    @Test
+    void testTimedWrite1() throws IOException {
         withConnection((s1, s2) -> {
             s1.getOutputStream().write(99);
             s2.setSoTimeout(3000);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
 
             // schedule thread to read s1 to EOF
             scheduleReadToEOF(s1.getInputStream(), 3000);
@@ -245,12 +288,13 @@ public void testTimedWrite1() throws IOException {
     /**
      * Test async close of writer (after a timed read).
      */
-    public void testTimedWrite2() throws IOException {
+    @Test
+    void testTimedWrite2() throws IOException {
         withConnection((s1, s2) -> {
             s1.getOutputStream().write(99);
             s2.setSoTimeout(3000);
             int b = s2.getInputStream().read();
-            assertTrue(b == 99);
+            assertEquals(99, b);
 
             // schedule s2 to be closed
             scheduleClose(s2, 3000);
@@ -266,9 +310,10 @@ public void testTimedWrite2() throws IOException {
     }
 
     /**
-     * Test timed accept where a connection is established immediately
+     * Test timed accept where a connection is established immediately.
      */
-    public void testTimedAccept1() throws IOException {
+    @Test
+    void testTimedAccept1() throws IOException {
         Socket s1 = null;
         Socket s2 = null;
         try (ServerSocket ss = boundServerSocket()) {
@@ -283,9 +328,10 @@ public void testTimedAccept1() throws IOException {
     }
 
     /**
-     * Test timed accept where a connection is established after a short delay
+     * Test timed accept where a connection is established after a short delay.
      */
-    public void testTimedAccept2() throws IOException {
+    @Test
+    void testTimedAccept2() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(30*1000);
             scheduleConnect(ss.getLocalSocketAddress(), 2000);
@@ -297,7 +343,8 @@ public void testTimedAccept2() throws IOException {
     /**
      * Test timed accept where the accept times out
      */
-    public void testTimedAccept3() throws IOException {
+    @Test
+    void testTimedAccept3() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(2000);
             long startMillis = millisTime();
@@ -316,7 +363,8 @@ public void testTimedAccept3() throws IOException {
      * Test timed accept where a connection is established immediately after a
      * previous accept timed out.
      */
-    public void testTimedAccept4() throws IOException {
+    @Test
+    void testTimedAccept4() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(2000);
             try {
@@ -334,9 +382,10 @@ public void testTimedAccept4() throws IOException {
 
     /**
      * Test untimed accept where a connection is established after a previous
-     * accept timed out
+     * accept timed out.
      */
-    public void testTimedAccept5() throws IOException {
+    @Test
+    void testTimedAccept5() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(2000);
             try {
@@ -355,9 +404,10 @@ public void testTimedAccept5() throws IOException {
 
     /**
      * Test untimed accept where a connection is established after a previous
-     * accept timed out and after a short delay
+     * accept timed out and after a short delay.
      */
-    public void testTimedAccept6() throws IOException {
+    @Test
+    void testTimedAccept6() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(2000);
             try {
@@ -373,9 +423,10 @@ public void testTimedAccept6() throws IOException {
     }
 
     /**
-     * Test async close of a timed accept
+     * Test async close of a timed accept.
      */
-    public void testTimedAccept7() throws IOException {
+    @Test
+    void testTimedAccept7() throws IOException {
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(30*1000);
             long delay = 2000;
@@ -393,9 +444,9 @@ public void testTimedAccept7() throws IOException {
     /**
      * Test timed accept with the thread interrupt status set.
      */
-    public void testTimedAccept8() throws IOException {
-        if (Thread.currentThread().isVirtual())
-            throw new SkipException("Main test is a virtual thread");
+    @Test
+    void testTimedAccept8() throws IOException {
+        assumeFalse(Thread.currentThread().isVirtual(), "Main test is a virtual thread");
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(2000);
             Thread.currentThread().interrupt();
@@ -418,9 +469,9 @@ public void testTimedAccept8() throws IOException {
     /**
      * Test interrupt of thread blocked in timed accept.
      */
-    public void testTimedAccept9() throws IOException {
-        if (Thread.currentThread().isVirtual())
-            throw new SkipException("Main test is a virtual thread");
+    @Test
+    void testTimedAccept9() throws IOException {
+        assumeFalse(Thread.currentThread().isVirtual(), "Main test is a virtual thread");
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(4000);
             // interrupt thread after 1 second
@@ -445,7 +496,8 @@ public void testTimedAccept9() throws IOException {
     /**
      * Test two threads blocked in timed accept where no connection is established.
      */
-    public void testTimedAccept10() throws Exception {
+    @Test
+    void testTimedAccept10() throws Exception {
         ExecutorService pool = Executors.newFixedThreadPool(2);
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(4000);
@@ -456,9 +508,9 @@ public void testTimedAccept10() throws Exception {
             Future<Socket> result2 = pool.submit(ss::accept);
 
             // both tasks should complete with SocketTimeoutException
-            Throwable e = expectThrows(ExecutionException.class, result1::get);
+            Throwable e = assertThrows(ExecutionException.class, result1::get);
             assertTrue(e.getCause() instanceof SocketTimeoutException);
-            e = expectThrows(ExecutionException.class, result2::get);
+            e = assertThrows(ExecutionException.class, result2::get);
             assertTrue(e.getCause() instanceof SocketTimeoutException);
 
             // should get here in 4 seconds, not 8 seconds
@@ -472,7 +524,8 @@ public void testTimedAccept10() throws Exception {
     /**
      * Test two threads blocked in timed accept where one connection is established.
      */
-    public void testTimedAccept11() throws Exception {
+    @Test
+    void testTimedAccept11() throws Exception {
         ExecutorService pool = Executors.newFixedThreadPool(2);
         try (ServerSocket ss = boundServerSocket()) {
             ss.setSoTimeout(4000);
@@ -514,25 +567,25 @@ public void testTimedAccept11() throws Exception {
     /**
      * Test Socket setSoTimeout with a negative timeout.
      */
-    @Test(expectedExceptions = { IllegalArgumentException.class })
-    public void testBadTimeout1() throws IOException {
+    @Test
+    void testBadTimeout1() throws IOException {
         try (Socket s = new Socket()) {
-            s.setSoTimeout(-1);
+            assertThrows(IllegalArgumentException.class, () -> s.setSoTimeout(-1));
         }
     }
 
     /**
      * Test ServerSocket setSoTimeout with a negative timeout.
      */
-    @Test(expectedExceptions = { IllegalArgumentException.class })
-    public void testBadTimeout2() throws IOException {
+    @Test
+    void testBadTimeout2() throws IOException {
         try (ServerSocket ss = new ServerSocket()) {
-            ss.setSoTimeout(-1);
+            assertThrows(IllegalArgumentException.class, () -> ss.setSoTimeout(-1));
         }
     }
 
     /**
-     * Returns a ServerSocket bound to a port on the loopback address
+     * Returns a ServerSocket bound to a port on the loopback address.
      */
     static ServerSocket boundServerSocket() throws IOException {
         var loopback = InetAddress.getLoopbackAddress();
@@ -542,14 +595,14 @@ static ServerSocket boundServerSocket() throws IOException {
     }
 
     /**
-     * An operation that accepts two arguments and may throw IOException
+     * An operation that accepts two arguments and may throw IOException.
      */
     interface ThrowingBiConsumer<T, U> {
         void accept(T t, U u) throws IOException;
     }
 
     /**
-     * Invokes the consumer with a connected pair of sockets
+     * Invokes the consumer with a connected pair of sockets.
      */
     static void withConnection(ThrowingBiConsumer<Socket, Socket> consumer)
         throws IOException
@@ -568,7 +621,7 @@ static void withConnection(ThrowingBiConsumer<Socket, Socket> consumer)
     }
 
     /**
-     * Schedule c to be closed after a delay
+     * Schedule c to be closed after a delay.
      */
     static void scheduleClose(Closeable c, long delay) {
         schedule(() -> {
@@ -579,14 +632,14 @@ static void scheduleClose(Closeable c, long delay) {
     }
 
     /**
-     * Schedule thread to be interrupted after a delay
+     * Schedule thread to be interrupted after a delay.
      */
     static Future<?> scheduleInterrupt(Thread thread, long delay) {
         return schedule(() -> thread.interrupt(), delay);
     }
 
     /**
-     * Schedule a thread to connect to the given end point after a delay
+     * Schedule a thread to connect to the given end point after a delay.
      */
     static void scheduleConnect(SocketAddress remote, long delay) {
         schedule(() -> {
@@ -597,7 +650,7 @@ static void scheduleConnect(SocketAddress remote, long delay) {
     }
 
     /**
-     * Schedule a thread to read to EOF after a delay
+     * Schedule a thread to read to EOF after a delay.
      */
     static void scheduleReadToEOF(InputStream in, long delay) {
         schedule(() -> {
@@ -609,7 +662,7 @@ static void scheduleReadToEOF(InputStream in, long delay) {
     }
 
     /**
-     * Schedule a thread to write after a delay
+     * Schedule a thread to write after a delay.
      */
     static void scheduleWrite(OutputStream out, byte[] data, long delay) {
         schedule(() -> {
@@ -623,12 +676,7 @@ static void scheduleWrite(OutputStream out, int b, long delay) {
     }
 
     static Future<?> schedule(Runnable task, long delay) {
-        ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-        try {
-            return executor.schedule(task, delay, TimeUnit.MILLISECONDS);
-        } finally {
-            executor.shutdown();
-        }
+        return ForkJoinPool.commonPool().schedule(task, delay, TimeUnit.MILLISECONDS);
     }
 
     /**
@@ -640,7 +688,7 @@ private static long millisTime() {
     }
 
     /**
-     * Check the duration of a task
+     * Check the duration of a task.
      * @param start start time, in milliseconds
      * @param min minimum expected duration, in milliseconds
      * @param max maximum expected duration, in milliseconds

From dc961609f84a38164d10852cb92c005c3eb077e4 Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Wed, 4 Jun 2025 12:43:23 +0000
Subject: [PATCH 846/901] 8356159: RISC-V: Add Zabha

Reviewed-by: fyang, fjiang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     | 304 +++++++---
 src/hotspot/cpu/riscv/globals_riscv.hpp       |   1 +
 .../cpu/riscv/macroAssembler_riscv.cpp        |  40 +-
 .../cpu/riscv/macroAssembler_riscv.hpp        |  16 +-
 src/hotspot/cpu/riscv/riscv.ad                | 525 +++++++++++++-----
 .../gtest/riscv/test_assembler_riscv.cpp      | 143 ++++-
 6 files changed, 764 insertions(+), 265 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 3cdc9b70d52..3317ccc3b53 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -961,81 +961,239 @@ class Assembler : public AbstractAssembler {
 
 #undef INSN
 
-enum Aqrl {relaxed = 0b00, rl = 0b01, aq = 0b10, aqrl = 0b11};
-
-#define INSN(NAME, op, funct3, funct7)                                                  \
-  void NAME(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {        \
-    unsigned insn = 0;                                                                  \
-    patch((address)&insn, 6, 0, op);                                                    \
-    patch((address)&insn, 14, 12, funct3);                                              \
-    patch_reg((address)&insn, 7, Rd);                                                   \
-    patch_reg((address)&insn, 15, Rs1);                                                 \
-    patch_reg((address)&insn, 20, Rs2);                                                 \
-    patch((address)&insn, 31, 27, funct7);                                              \
-    patch((address)&insn, 26, 25, memory_order);                                        \
-    emit(insn);                                                                         \
-  }
-
-  INSN(amoswap_w, 0b0101111, 0b010, 0b00001);
-  INSN(amoadd_w,  0b0101111, 0b010, 0b00000);
-  INSN(amoxor_w,  0b0101111, 0b010, 0b00100);
-  INSN(amoand_w,  0b0101111, 0b010, 0b01100);
-  INSN(amoor_w,   0b0101111, 0b010, 0b01000);
-  INSN(amomin_w,  0b0101111, 0b010, 0b10000);
-  INSN(amomax_w,  0b0101111, 0b010, 0b10100);
-  INSN(amominu_w, 0b0101111, 0b010, 0b11000);
-  INSN(amomaxu_w, 0b0101111, 0b010, 0b11100);
-  INSN(amoswap_d, 0b0101111, 0b011, 0b00001);
-  INSN(amoadd_d,  0b0101111, 0b011, 0b00000);
-  INSN(amoxor_d,  0b0101111, 0b011, 0b00100);
-  INSN(amoand_d,  0b0101111, 0b011, 0b01100);
-  INSN(amoor_d,   0b0101111, 0b011, 0b01000);
-  INSN(amomin_d,  0b0101111, 0b011, 0b10000);
-  INSN(amomax_d , 0b0101111, 0b011, 0b10100);
-  INSN(amominu_d, 0b0101111, 0b011, 0b11000);
-  INSN(amomaxu_d, 0b0101111, 0b011, 0b11100);
-  INSN(amocas_w,  0b0101111, 0b010, 0b00101);
-  INSN(amocas_d,  0b0101111, 0b011, 0b00101);
-#undef INSN
-
-enum operand_size { int8, int16, int32, uint32, int64 };
-
-#define INSN(NAME, op, funct3, funct7)                                              \
-  void NAME(Register Rd, Register Rs1, Aqrl memory_order = relaxed) {               \
-    unsigned insn = 0;                                                              \
-    uint32_t val = memory_order & 0x3;                                              \
-    patch((address)&insn, 6, 0, op);                                                \
-    patch((address)&insn, 14, 12, funct3);                                          \
-    patch_reg((address)&insn, 7, Rd);                                               \
-    patch_reg((address)&insn, 15, Rs1);                                             \
-    patch((address)&insn, 25, 20, 0b00000);                                         \
-    patch((address)&insn, 31, 27, funct7);                                          \
-    patch((address)&insn, 26, 25, val);                                             \
-    emit(insn);                                                                     \
-  }
-
-  INSN(lr_w, 0b0101111, 0b010, 0b00010);
-  INSN(lr_d, 0b0101111, 0b011, 0b00010);
-
-#undef INSN
-
-#define INSN(NAME, op, funct3, funct7)                                                      \
-  void NAME(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = relaxed) {         \
-    unsigned insn = 0;                                                                      \
-    uint32_t val = memory_order & 0x3;                                                      \
-    patch((address)&insn, 6, 0, op);                                                        \
-    patch((address)&insn, 14, 12, funct3);                                                  \
-    patch_reg((address)&insn, 7, Rd);                                                       \
-    patch_reg((address)&insn, 15, Rs2);                                                     \
-    patch_reg((address)&insn, 20, Rs1);                                                     \
-    patch((address)&insn, 31, 27, funct7);                                                  \
-    patch((address)&insn, 26, 25, val);                                                     \
-    emit(insn);                                                                             \
+  enum Aqrl {relaxed = 0b00, rl = 0b01, aq = 0b10, aqrl = 0b11};
+
+ private:
+
+  enum AmoWidthFunct3 : uint8_t {
+    AMO_WIDTH_BYTE        = 0b000, // Zabha extension
+    AMO_WIDTH_HALFWORD    = 0b001, // Zabha extension
+    AMO_WIDTH_WORD        = 0b010,
+    AMO_WIDTH_DOUBLEWORD  = 0b011,
+    AMO_WIDTH_QUADWORD    = 0b100,
+    // 0b101 to 0b111 are reserved
+  };
+
+  enum AmoOperationFunct5 : uint8_t {
+    AMO_ADD  = 0b00000,
+    AMO_SWAP = 0b00001,
+    AMO_LR   = 0b00010,
+    AMO_SC   = 0b00011,
+    AMO_XOR  = 0b00100,
+    AMO_OR   = 0b01000,
+    AMO_AND  = 0b01100,
+    AMO_MIN  = 0b10000,
+    AMO_MAX  = 0b10100,
+    AMO_MINU = 0b11000,
+    AMO_MAXU = 0b11100,
+    AMO_CAS  = 0b00101 // Zacas
+  };
+
+  static constexpr uint32_t OP_AMO_MAJOR = 0b0101111;
+
+  template <AmoOperationFunct5 funct5, AmoWidthFunct3 width>
+  void amo_base(Register Rd, Register Rs1, uint8_t Rs2, Aqrl memory_order = aqrl) {
+    assert(width > AMO_WIDTH_HALFWORD || UseZabha, "Must be");
+    assert(funct5 != AMO_CAS || UseZacas, "Must be");
+    unsigned insn = 0;
+    patch((address)&insn,  6,  0, OP_AMO_MAJOR);
+    patch_reg((address)&insn,  7, Rd);
+    patch((address)&insn, 14, 12, width);
+    patch_reg((address)&insn, 15, Rs1);
+    patch((address)&insn, 24, 20, Rs2);
+    patch((address)&insn, 26, 25, memory_order);
+    patch((address)&insn, 31, 27, funct5);
+    emit(insn);
   }
 
-  INSN(sc_w, 0b0101111, 0b010, 0b00011);
-  INSN(sc_d, 0b0101111, 0b011, 0b00011);
-#undef INSN
+  template <AmoOperationFunct5 funct5, AmoWidthFunct3 width>
+  void amo_base(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<funct5, width>(Rd, Rs1, Rs2->raw_encoding(), memory_order);
+  }
+
+ public:
+
+  void amoadd_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_ADD, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoadd_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_ADD, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoadd_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_ADD, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoadd_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_ADD, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoswap_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SWAP, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoswap_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SWAP, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoswap_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SWAP, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoswap_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SWAP, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoxor_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_XOR, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoxor_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_XOR, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoxor_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_XOR, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoxor_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_XOR, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoor_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_OR, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoor_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_OR, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoor_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_OR, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoor_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_OR, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoand_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_AND, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoand_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_AND, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoand_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_AND, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amoand_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_AND, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomin_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MIN, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomin_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MIN, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomin_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MIN, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomin_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MIN, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amominu_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MINU, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amominu_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MINU, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amominu_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MINU, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amominu_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MINU, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomax_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAX, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomax_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAX, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomax_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAX, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomax_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAX, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomaxu_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAXU, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomaxu_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAXU, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomaxu_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAXU, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amomaxu_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_MAXU, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+ protected:
+
+  void lr_w(Register Rd, Register Rs1, Aqrl memory_order = aqrl) {
+    amo_base<AMO_LR, AMO_WIDTH_WORD>(Rd, Rs1, 0, memory_order);
+  }
+
+  void lr_d(Register Rd, Register Rs1, Aqrl memory_order = aqrl) {
+    amo_base<AMO_LR, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, 0, memory_order);
+  }
+
+  void sc_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SC, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void sc_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_SC, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amocas_b(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_CAS, AMO_WIDTH_BYTE>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amocas_h(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_CAS, AMO_WIDTH_HALFWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amocas_w(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_CAS, AMO_WIDTH_WORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+  void amocas_d(Register Rd, Register Rs1, Register Rs2, Aqrl memory_order = aqrl) {
+    amo_base<AMO_CAS, AMO_WIDTH_DOUBLEWORD>(Rd, Rs1, Rs2, memory_order);
+  }
+
+ public:
+
+  enum operand_size { int8, int16, int32, uint32, int64 };
 
 // Immediate Instruction
 #define INSN(NAME, op, funct3)                                                              \
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 3ef084d30fc..d67e05bbb6d 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -107,6 +107,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseZfh, false, DIAGNOSTIC, "Use Zfh instructions")               \
   product(bool, UseZfhmin, false, DIAGNOSTIC, "Use Zfhmin instructions")         \
   product(bool, UseZacas, false, EXPERIMENTAL, "Use Zacas instructions")         \
+  product(bool, UseZabha, false, EXPERIMENTAL, "Use UseZabha instructions")      \
   product(bool, UseZcb, false, EXPERIMENTAL, "Use Zcb instructions")             \
   product(bool, UseZic64b, false, EXPERIMENTAL, "Use Zic64b instructions")       \
   product(bool, UseZicbom, false, EXPERIMENTAL, "Use Zicbom instructions")       \
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index bc6bf88d0ad..c755d9ae23d 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3798,7 +3798,7 @@ void MacroAssembler::cmpxchg_obj_header(Register oldv, Register newv, Register o
 
 void MacroAssembler::load_reserved(Register dst,
                                    Register addr,
-                                   enum operand_size size,
+                                   Assembler::operand_size size,
                                    Assembler::Aqrl acquire) {
   switch (size) {
     case int64:
@@ -3819,15 +3819,15 @@ void MacroAssembler::load_reserved(Register dst,
 void MacroAssembler::store_conditional(Register dst,
                                        Register new_val,
                                        Register addr,
-                                       enum operand_size size,
+                                       Assembler::operand_size size,
                                        Assembler::Aqrl release) {
   switch (size) {
     case int64:
-      sc_d(dst, new_val, addr, release);
+      sc_d(dst, addr, new_val, release);
       break;
     case int32:
     case uint32:
-      sc_w(dst, new_val, addr, release);
+      sc_w(dst, addr, new_val, release);
       break;
     default:
       ShouldNotReachHere();
@@ -3836,7 +3836,7 @@ void MacroAssembler::store_conditional(Register dst,
 
 
 void MacroAssembler::cmpxchg_narrow_value_helper(Register addr, Register expected, Register new_val,
-                                                 enum operand_size size,
+                                                 Assembler::operand_size size,
                                                  Register shift, Register mask, Register aligned_addr) {
   assert(size == int8 || size == int16, "unsupported operand size");
 
@@ -3866,10 +3866,11 @@ void MacroAssembler::cmpxchg_narrow_value_helper(Register addr, Register expecte
 // which are forced to work with 4-byte aligned address.
 void MacroAssembler::cmpxchg_narrow_value(Register addr, Register expected,
                                           Register new_val,
-                                          enum operand_size size,
+                                          Assembler::operand_size size,
                                           Assembler::Aqrl acquire, Assembler::Aqrl release,
                                           Register result, bool result_as_bool,
                                           Register tmp1, Register tmp2, Register tmp3) {
+  assert(!(UseZacas && UseZabha), "Use amocas");
   assert_different_registers(addr, expected, new_val, result, tmp1, tmp2, tmp3, t0, t1);
 
   Register scratch0 = t0, aligned_addr = t1;
@@ -3902,13 +3903,13 @@ void MacroAssembler::cmpxchg_narrow_value(Register addr, Register expected,
     notr(scratch1, mask);
     bind(retry);
 
-    lr_w(result, aligned_addr, acquire);
+    load_reserved(result, aligned_addr, operand_size::int32, acquire);
     andr(scratch0, result, mask);
     bne(scratch0, expected, fail);
 
     andr(scratch0, result, scratch1); // scratch1 is ~mask
     orr(scratch0, scratch0, new_val);
-    sc_w(scratch0, scratch0, aligned_addr, release);
+    store_conditional(scratch0, scratch0, aligned_addr, operand_size::int32, release);
     bnez(scratch0, retry);
   }
 
@@ -3940,10 +3941,11 @@ void MacroAssembler::cmpxchg_narrow_value(Register addr, Register expected,
 // failed.
 void MacroAssembler::weak_cmpxchg_narrow_value(Register addr, Register expected,
                                                Register new_val,
-                                               enum operand_size size,
+                                               Assembler::operand_size size,
                                                Assembler::Aqrl acquire, Assembler::Aqrl release,
                                                Register result,
                                                Register tmp1, Register tmp2, Register tmp3) {
+  assert(!(UseZacas && UseZabha), "Use amocas");
   assert_different_registers(addr, expected, new_val, result, tmp1, tmp2, tmp3, t0, t1);
 
   Register scratch0 = t0, aligned_addr = t1;
@@ -3974,13 +3976,13 @@ void MacroAssembler::weak_cmpxchg_narrow_value(Register addr, Register expected,
   } else {
     notr(scratch1, mask);
 
-    lr_w(result, aligned_addr, acquire);
+    load_reserved(result, aligned_addr, operand_size::int32, acquire);
     andr(scratch0, result, mask);
     bne(scratch0, expected, fail);
 
     andr(scratch0, result, scratch1); // scratch1 is ~mask
     orr(scratch0, scratch0, new_val);
-    sc_w(scratch0, scratch0, aligned_addr, release);
+    store_conditional(scratch0, scratch0, aligned_addr, operand_size::int32, release);
     bnez(scratch0, fail);
   }
 
@@ -3997,10 +3999,10 @@ void MacroAssembler::weak_cmpxchg_narrow_value(Register addr, Register expected,
 
 void MacroAssembler::cmpxchg(Register addr, Register expected,
                              Register new_val,
-                             enum operand_size size,
+                             Assembler::operand_size size,
                              Assembler::Aqrl acquire, Assembler::Aqrl release,
                              Register result, bool result_as_bool) {
-  assert(size != int8 && size != int16, "unsupported operand size");
+  assert((UseZacas && UseZabha) || (size != int8 && size != int16), "unsupported operand size");
   assert_different_registers(addr, t0);
   assert_different_registers(expected, t0);
   assert_different_registers(new_val, t0);
@@ -4058,10 +4060,10 @@ void MacroAssembler::cmpxchg(Register addr, Register expected,
 
 void MacroAssembler::weak_cmpxchg(Register addr, Register expected,
                                   Register new_val,
-                                  enum operand_size size,
+                                  Assembler::operand_size size,
                                   Assembler::Aqrl acquire, Assembler::Aqrl release,
                                   Register result) {
-
+  assert((UseZacas && UseZabha) || (size != int8 && size != int16), "unsupported operand size");
   assert_different_registers(addr, t0);
   assert_different_registers(expected, t0);
   assert_different_registers(new_val, t0);
@@ -4134,7 +4136,7 @@ ATOMIC_XCHGU(xchgalwu, xchgalw)
 #undef ATOMIC_XCHGU
 
 void MacroAssembler::atomic_cas(Register prev, Register newv, Register addr,
-                                enum operand_size size, Assembler::Aqrl acquire, Assembler::Aqrl release) {
+                                Assembler::operand_size size, Assembler::Aqrl acquire, Assembler::Aqrl release) {
   switch (size) {
     case int64:
       amocas_d(prev, addr, newv, (Assembler::Aqrl)(acquire | release));
@@ -4146,6 +4148,12 @@ void MacroAssembler::atomic_cas(Register prev, Register newv, Register addr,
       amocas_w(prev, addr, newv, (Assembler::Aqrl)(acquire | release));
       zext(prev, prev, 32);
       break;
+    case int16:
+      amocas_h(prev, addr, newv, (Assembler::Aqrl)(acquire | release));
+      break;
+    case int8:
+      amocas_b(prev, addr, newv, (Assembler::Aqrl)(acquire | release));
+      break;
     default:
       ShouldNotReachHere();
   }
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 6f80a02ddc6..f302b3602ad 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1187,26 +1187,26 @@ class MacroAssembler: public Assembler {
   void cmpxchgptr(Register oldv, Register newv, Register addr, Register tmp, Label &succeed, Label *fail);
   void cmpxchg(Register addr, Register expected,
                Register new_val,
-               enum operand_size size,
+               Assembler::operand_size size,
                Assembler::Aqrl acquire, Assembler::Aqrl release,
                Register result, bool result_as_bool = false);
   void weak_cmpxchg(Register addr, Register expected,
                     Register new_val,
-                    enum operand_size size,
+                    Assembler::operand_size size,
                     Assembler::Aqrl acquire, Assembler::Aqrl release,
                     Register result);
   void cmpxchg_narrow_value_helper(Register addr, Register expected, Register new_val,
-                                   enum operand_size size,
+                                   Assembler::operand_size size,
                                    Register shift, Register mask, Register aligned_addr);
   void cmpxchg_narrow_value(Register addr, Register expected,
                             Register new_val,
-                            enum operand_size size,
+                            Assembler::operand_size size,
                             Assembler::Aqrl acquire, Assembler::Aqrl release,
                             Register result, bool result_as_bool,
                             Register tmp1, Register tmp2, Register tmp3);
   void weak_cmpxchg_narrow_value(Register addr, Register expected,
                                  Register new_val,
-                                 enum operand_size size,
+                                 Assembler::operand_size size,
                                  Assembler::Aqrl acquire, Assembler::Aqrl release,
                                  Register result,
                                  Register tmp1, Register tmp2, Register tmp3);
@@ -1223,7 +1223,7 @@ class MacroAssembler: public Assembler {
   void atomic_xchgwu(Register prev, Register newv, Register addr);
   void atomic_xchgalwu(Register prev, Register newv, Register addr);
 
-  void atomic_cas(Register prev, Register newv, Register addr, enum operand_size size,
+  void atomic_cas(Register prev, Register newv, Register addr, Assembler::operand_size size,
               Assembler::Aqrl acquire = Assembler::relaxed, Assembler::Aqrl release = Assembler::relaxed);
 
   // Emit a far call/jump. Only invalidates the tmp register which
@@ -1636,8 +1636,8 @@ class MacroAssembler: public Assembler {
   int bitset_to_regs(unsigned int bitset, unsigned char* regs);
   Address add_memory_helper(const Address dst, Register tmp);
 
-  void load_reserved(Register dst, Register addr, enum operand_size size, Assembler::Aqrl acquire);
-  void store_conditional(Register dst, Register new_val, Register addr, enum operand_size size, Assembler::Aqrl release);
+  void load_reserved(Register dst, Register addr, Assembler::operand_size size, Assembler::Aqrl acquire);
+  void store_conditional(Register dst, Register new_val, Register addr, Assembler::operand_size size, Assembler::Aqrl release);
 
 public:
   void lightweight_lock(Register basic_lock, Register obj, Register tmp1, Register tmp2, Register tmp3, Label& slow);
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index c711d2db640..e838ee184fb 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2304,42 +2304,6 @@ encode %{
     }
   %}
 
-  enc_class riscv_enc_cmpxchgw(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
-               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
-  enc_class riscv_enc_cmpxchgn(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
-               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
-  enc_class riscv_enc_cmpxchg(iRegINoSp res, memory mem, iRegL oldval, iRegL newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
-               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
-  enc_class riscv_enc_cmpxchgw_acq(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
-               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
-  enc_class riscv_enc_cmpxchgn_acq(iRegINoSp res, memory mem, iRegI oldval, iRegI newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
-               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
-  enc_class riscv_enc_cmpxchg_acq(iRegINoSp res, memory mem, iRegL oldval, iRegL newval) %{
-    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
-               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
-               /*result as bool*/ true);
-  %}
-
   // compare and branch instruction encodings
 
   enc_class riscv_enc_j(label lbl) %{
@@ -5250,18 +5214,20 @@ instruct prefetchalloc( memory mem ) %{
 
 // standard CompareAndSwapX when we are using barriers
 // these have higher priority than the rules selected by a predicate
-instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                         iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndSwapB_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (CompareAndSwapB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 10 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3, KILL cr);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
-    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapB"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapB_narrow"
   %}
 
   ins_encode %{
@@ -5273,18 +5239,42 @@ instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R1
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                         iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapB"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+               Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result as bool */);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapS_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (CompareAndSwapS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 11 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3, KILL cr);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
-    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapS"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapS_narrow"
   %}
 
   ins_encode %{
@@ -5296,18 +5286,44 @@ instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R1
   ins_pipe(pipe_slow);
 %}
 
+instruct compareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapS"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+               Assembler::relaxed /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result as bool */);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct compareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   match(Set res (CompareAndSwapI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapI"
   %}
 
-  ins_encode(riscv_enc_cmpxchgw(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5316,14 +5332,18 @@ instruct compareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL newval
 %{
   match(Set res (CompareAndSwapL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapL"
   %}
 
-  ins_encode(riscv_enc_cmpxchg(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5334,14 +5354,18 @@ instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval
 
   match(Set res (CompareAndSwapP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapP"
   %}
 
-  ins_encode(riscv_enc_cmpxchg(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5349,35 +5373,40 @@ instruct compareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval
 instruct compareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval)
 %{
   predicate(n->as_LoadStore()->barrier_data() == 0);
+
   match(Set res (CompareAndSwapN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 8 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapN"
   %}
 
-  ins_encode(riscv_enc_cmpxchgn(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
 
 // alternative CompareAndSwapX when we are eliding barriers
-instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                            iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndSwapBAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                   iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndSwapB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 10 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
-    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapBAcq"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapBAcq_narrow"
   %}
 
   ins_encode %{
@@ -5389,20 +5418,42 @@ instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                            iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (byte) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapBAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+               Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result as bool */);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndSwapSAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                   iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+%{
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndSwapS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 11 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
-    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapSAcq"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapSAcq_narrow"
   %}
 
   ins_encode %{
@@ -5414,20 +5465,46 @@ instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI
   ins_pipe(pipe_slow);
 %}
 
+instruct compareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $mem, $oldval, $newval\t# (short) if $mem == $oldval then $mem <-- $newval\n\t"
+    "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapSAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+               Assembler::aq /* acquire */, Assembler::rl /* release */, $res$$Register,
+               true /* result as bool */);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct compareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   predicate(needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndSwapI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (int) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapIAcq"
   %}
 
-  ins_encode(riscv_enc_cmpxchgw_acq(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5438,14 +5515,18 @@ instruct compareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL new
 
   match(Set res (CompareAndSwapL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (long) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapLAcq"
   %}
 
-  ins_encode(riscv_enc_cmpxchg_acq(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5456,14 +5537,18 @@ instruct compareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP new
 
   match(Set res (CompareAndSwapP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 6 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapPAcq"
   %}
 
-  ins_encode(riscv_enc_cmpxchg_acq(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int64,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5474,14 +5559,18 @@ instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN new
 
   match(Set res (CompareAndSwapN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + ALU_COST * 8 + BRANCH_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $mem, $oldval, $newval\t# (narrow oop) if $mem == $oldval then $mem <-- $newval\n\t"
     "mv $res, $res == $oldval\t# $res <-- ($res == $oldval ? 1 : 0), #@compareAndSwapNAcq"
   %}
 
-  ins_encode(riscv_enc_cmpxchgn_acq(res, mem, oldval, newval));
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::uint32,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register,
+               /*result as bool*/ true);
+  %}
 
   ins_pipe(pipe_slow);
 %}
@@ -5492,17 +5581,19 @@ instruct compareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN new
 // no trailing StoreLoad barrier emitted by C2.  Unfortunately we
 // can't check the type of memory ordering here, so we always emit a
 // sc_d(w) with rl bit set.
-instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                             iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndExchangeB_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                    iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 5);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeB"
+    "cmpxchg $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeB_narrow"
   %}
 
   ins_encode %{
@@ -5514,17 +5605,39 @@ instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iReg
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                             iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndExchangeB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeB"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeS_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                    iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+%{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 6);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
-    "cmpxchg $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeS"
+    "cmpxchg $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeS_narrow"
   %}
 
   ins_encode %{
@@ -5536,13 +5649,31 @@ instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iReg
   ins_pipe(pipe_slow);
 %}
 
+instruct compareAndExchangeS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeS"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct compareAndExchangeI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeI"
@@ -5560,9 +5691,7 @@ instruct compareAndExchangeL(iRegLNoSp res, indirect mem, iRegL oldval, iRegL ne
 %{
   match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeL"
@@ -5579,11 +5708,10 @@ instruct compareAndExchangeL(iRegLNoSp res, indirect mem, iRegL oldval, iRegL ne
 instruct compareAndExchangeN(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval)
 %{
   predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 3);
+  match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
 
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeN"
@@ -5600,11 +5728,10 @@ instruct compareAndExchangeN(iRegNNoSp res, indirect mem, iRegN oldval, iRegN ne
 instruct compareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval)
 %{
   predicate(n->as_LoadStore()->barrier_data() == 0);
-  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
+  match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
 
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeP"
@@ -5618,19 +5745,19 @@ instruct compareAndExchangeP(iRegPNoSp res, indirect mem, iRegP oldval, iRegP ne
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndExchangeBAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                       iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 5);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeBAcq"
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeBAcq_narrow"
   %}
 
   ins_encode %{
@@ -5642,19 +5769,39 @@ instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, i
   ins_pipe(pipe_slow);
 %}
 
-instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct compareAndExchangeBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeBAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct compareAndExchangeSAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                       iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+%{
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST * 6);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
-    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeSAcq"
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeSAcq_narrow"
   %}
 
   ins_encode %{
@@ -5666,15 +5813,33 @@ instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, i
   ins_pipe(pipe_slow);
 %}
 
+instruct compareAndExchangeSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (CompareAndExchangeS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "cmpxchg_acq $res = $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeSAcq"
+  %}
+
+  ins_encode %{
+    __ cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+               /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct compareAndExchangeIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   predicate(needs_acquiring_load_reserved(n));
 
   match(Set res (CompareAndExchangeI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $res = $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeIAcq"
@@ -5694,9 +5859,7 @@ instruct compareAndExchangeLAcq(iRegLNoSp res, indirect mem, iRegL oldval, iRegL
 
   match(Set res (CompareAndExchangeL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $res = $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeLAcq"
@@ -5716,9 +5879,7 @@ instruct compareAndExchangeNAcq(iRegNNoSp res, indirect mem, iRegN oldval, iRegN
 
   match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangeNAcq"
@@ -5738,9 +5899,7 @@ instruct compareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP
 
   match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 3 + ALU_COST);
-
-  effect(TEMP_DEF res);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "cmpxchg_acq $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval, #@compareAndExchangePAcq"
@@ -5754,18 +5913,20 @@ instruct compareAndExchangePAcq(iRegPNoSp res, indirect mem, iRegP oldval, iRegP
   ins_pipe(pipe_slow);
 %}
 
-instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                             iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct weakCompareAndSwapB_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                    iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 6);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
-    "# $res == 1 when success, #@weakCompareAndSwapB"
+    "# $res == 1 when success, #@weakCompareAndSwapB_narrow"
   %}
 
   ins_encode %{
@@ -5777,18 +5938,41 @@ instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI_R12 oldval, iReg
   ins_pipe(pipe_slow);
 %}
 
-instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                             iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct weakCompareAndSwapB(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "weak_cmpxchg $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "# $res == 1 when success, #@weakCompareAndSwapB"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapS_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                    iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
+  predicate(!UseZabha || !UseZacas);
+
   match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 7);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
-    "# $res == 1 when success, #@weakCompareAndSwapS"
+    "# $res == 1 when success, #@weakCompareAndSwapS_narrow"
   %}
 
   ins_encode %{
@@ -5800,11 +5984,32 @@ instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI_R12 oldval, iReg
   ins_pipe(pipe_slow);
 %}
 
+instruct weakCompareAndSwapS(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate(UseZabha && UseZacas);
+
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "weak_cmpxchg $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "# $res == 1 when success, #@weakCompareAndSwapS"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                    /*acquire*/ Assembler::relaxed, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct weakCompareAndSwapI(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5823,7 +6028,7 @@ instruct weakCompareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL ne
 %{
   match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5841,9 +6046,10 @@ instruct weakCompareAndSwapL(iRegINoSp res, indirect mem, iRegL oldval, iRegL ne
 instruct weakCompareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval)
 %{
   predicate(n->as_LoadStore()->barrier_data() == 0);
+
   match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5861,9 +6067,10 @@ instruct weakCompareAndSwapN(iRegINoSp res, indirect mem, iRegN oldval, iRegN ne
 instruct weakCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval)
 %{
   predicate(n->as_LoadStore()->barrier_data() == 0);
+
   match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5878,20 +6085,20 @@ instruct weakCompareAndSwapP(iRegINoSp res, indirect mem, iRegP oldval, iRegP ne
   ins_pipe(pipe_slow);
 %}
 
-instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct weakCompareAndSwapBAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                       iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 6);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
-    "# $res == 1 when success, #@weakCompareAndSwapBAcq"
+    "# $res == 1 when success, #@weakCompareAndSwapBAcq_narrow"
   %}
 
   ins_encode %{
@@ -5903,20 +6110,41 @@ instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, i
   ins_pipe(pipe_slow);
 %}
 
-instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
-                                iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+instruct weakCompareAndSwapBAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
-  predicate(needs_acquiring_load_reserved(n));
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapB mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "weak_cmpxchg_acq $mem, $oldval, $newval\t# (byte, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "# $res == 1 when success, #@weakCompareAndSwapBAcq"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int8,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct weakCompareAndSwapSAcq_narrow(iRegINoSp res, indirect mem, iRegI_R12 oldval, iRegI_R13 newval,
+                                       iRegINoSp tmp1, iRegINoSp tmp2, iRegINoSp tmp3, rFlagsReg cr)
+%{
+  predicate((!UseZabha || !UseZacas) && needs_acquiring_load_reserved(n));
 
   match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 7);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   effect(TEMP_DEF res, KILL cr, USE_KILL oldval, USE_KILL newval, TEMP tmp1, TEMP tmp2, TEMP tmp3);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
-    "# $res == 1 when success, #@weakCompareAndSwapSAcq"
+    "# $res == 1 when success, #@weakCompareAndSwapSAcq_narrow"
   %}
 
   ins_encode %{
@@ -5928,13 +6156,34 @@ instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI_R12 oldval, i
   ins_pipe(pipe_slow);
 %}
 
+instruct weakCompareAndSwapSAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
+%{
+  predicate((UseZabha && UseZacas) && needs_acquiring_load_reserved(n));
+
+  match(Set res (WeakCompareAndSwapS mem (Binary oldval newval)));
+
+  ins_cost(2 * VOLATILE_REF_COST);
+
+  format %{
+    "weak_cmpxchg_acq $mem, $oldval, $newval\t# (short, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+    "# $res == 1 when success, #@weakCompareAndSwapSAcq"
+  %}
+
+  ins_encode %{
+    __ weak_cmpxchg(as_Register($mem$$base), $oldval$$Register, $newval$$Register, Assembler::int16,
+                    /*acquire*/ Assembler::aq, /*release*/ Assembler::rl, $res$$Register);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
 instruct weakCompareAndSwapIAcq(iRegINoSp res, indirect mem, iRegI oldval, iRegI newval)
 %{
   predicate(needs_acquiring_load_reserved(n));
 
   match(Set res (WeakCompareAndSwapI mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (int, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5955,7 +6204,7 @@ instruct weakCompareAndSwapLAcq(iRegINoSp res, indirect mem, iRegL oldval, iRegL
 
   match(Set res (WeakCompareAndSwapL mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (long, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5976,7 +6225,7 @@ instruct weakCompareAndSwapNAcq(iRegINoSp res, indirect mem, iRegN oldval, iRegN
 
   match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 4);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval\n\t"
@@ -5997,7 +6246,7 @@ instruct weakCompareAndSwapPAcq(iRegINoSp res, indirect mem, iRegP oldval, iRegP
 
   match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
 
-  ins_cost(LOAD_COST + STORE_COST + BRANCH_COST * 2 + ALU_COST * 2);
+  ins_cost(2 * VOLATILE_REF_COST);
 
   format %{
     "weak_cmpxchg_acq $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval\n\t"
diff --git a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
index 45f0ed390bd..c6754eacae6 100644
--- a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
+++ b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp
@@ -107,6 +107,14 @@ TEST_VM(RiscV, cmov) {
   }
 }
 
+template <Assembler::operand_size ASMSIZE>
+bool using_narrow() {
+  if (ASMSIZE == Assembler::int8 || ASMSIZE == Assembler::int16) {
+    return !(UseZacas && UseZabha);
+  }
+  return false;
+}
+
 template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
 class CmpxchgTester {
   // The functions expect arguments to be type represented, not C-ABI argument representation.
@@ -126,7 +134,7 @@ class CmpxchgTester {
     CodeBuffer code(_bb);
     MacroAssembler _masm(&code);
     address entry = _masm.pc();
-    if (ASMSIZE == Assembler::int8 || ASMSIZE == Assembler::int16) {
+    if (using_narrow<ASMSIZE>()) {
         address entry = _masm.pc();
        _masm.cmpxchg_narrow_value(/*addr*/ c_rarg0, /*expected*/ c_rarg1, /*new_value*/c_rarg2,
                         ASMSIZE, Assembler::relaxed, Assembler::relaxed,
@@ -176,7 +184,7 @@ class CmpxchgTester {
   }
 
   TESTSIZE cmpxchg(intptr_t addr, TESTSIZE expected, TESTSIZE new_value) {
-    if (ASMSIZE == Assembler::int8 || ASMSIZE == Assembler::int16) {
+    if (using_narrow<ASMSIZE>()) {
       return _narrow(addr, expected, new_value, /* dummy result */ 67, -1, -1, -1);
     } else {
       return _func(addr, expected, new_value, /* dummy result */ 67);
@@ -197,7 +205,7 @@ template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
 static void run_plain_cmpxchg_tests() {
   TESTSIZE max = std::numeric_limits<TESTSIZE>::max();
   TESTSIZE min = std::numeric_limits<TESTSIZE>::min();
-  TESTSIZE val[] = {1337, min, max};
+  TESTSIZE val[] = {37, min, max};
   for (int i = 0; i < 3; i++) {
     // Normal
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     0 /* variant */ , val[i] /* start value */,
@@ -205,7 +213,7 @@ static void run_plain_cmpxchg_tests() {
                                           val[i] /* return */  ,     42 /* end value*/, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     0 /* variant */ , val[i] /* start value */,
-                                            1336 /* expected */,     42 /* new value */,
+                                              36 /* expected */,     42 /* new value */,
                                           val[i] /* return */  , val[i] /* end value */, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     0 /* variant */ , val[i] /* start value */,
@@ -213,7 +221,7 @@ static void run_plain_cmpxchg_tests() {
                                                1 /* return */  ,     42 /* end value*/, true /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     0 /* variant */ , val[i] /* start value */,
-                                            1336 /* expected */,     42 /* new value */,
+                                              36 /* expected */,     42 /* new value */,
                                                0 /* return */  , val[i] /* end value */, true /* boolean ret*/);
 
     // result == expected register
@@ -222,7 +230,7 @@ static void run_plain_cmpxchg_tests() {
                                           val[i] /* return */  ,      42 /* end value*/, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     1 /* variant */ ,  val[i] /* start value */,
-                                            1336 /* expected */,      42 /* new value */,
+                                              36 /* expected */,      42 /* new value */,
                                           val[i] /* return */  ,  val[i] /* end value */, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     1 /* variant */ , val[i] /* start value */,
@@ -230,7 +238,7 @@ static void run_plain_cmpxchg_tests() {
                                                1 /* return */  ,     42 /* end value*/, true /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     1 /* variant */ , val[i] /* start value */,
-                                            1336 /* expected */,     42 /* new value */,
+                                              36 /* expected */,     42 /* new value */,
                                                0 /* return */  , val[i] /* end value */, true /* boolean ret*/);
 
     // new_value == result register
@@ -239,7 +247,7 @@ static void run_plain_cmpxchg_tests() {
                                           val[i] /* return */  ,     42 /* end value*/, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     2 /* variant */ , val[i] /* start value */,
-                                            1336 /* expected */,     42 /* new value */,
+                                              36 /* expected */,     42 /* new value */,
                                           val[i] /* return */  , val[i] /* end value */, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     2 /* variant */ , val[i] /* start value */,
@@ -247,7 +255,7 @@ static void run_plain_cmpxchg_tests() {
                                                1 /* return */  ,     42 /* end value*/, true /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(    2 /* variant */ , val[i] /* start value */,
-                                           1336 /* expected */,     42 /* new value */,
+                                             36 /* expected */,     42 /* new value */,
                                               0 /* return */  , val[i] /* end value */, true /* boolean ret*/);
 
     // expected == new_value register
@@ -256,7 +264,7 @@ static void run_plain_cmpxchg_tests() {
                                           val[i] /* return */  , val[i] /* end value */, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     3 /* variant */ , val[i] /* start value */,
-                                            1336 /* expected */,     42 /* new value */,
+                                              36 /* expected */,     42 /* new value */,
                                           val[i] /* return */  , val[i] /* end value */, false /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(     3 /* variant */ , val[i] /* start value */,
@@ -264,7 +272,7 @@ static void run_plain_cmpxchg_tests() {
                                                1 /* return */  , val[i] /* end value */, true /* boolean ret*/);
 
     plain_cmpxchg_test<TESTSIZE, ASMSIZE>(    3 /* variant */ , val[i] /* start value */,
-                                           1336 /* expected */,     42 /* new value */,
+                                             36 /* expected */,     42 /* new value */,
                                               0 /* return */  , val[i] /* end value */, true /* boolean ret*/);
   }
 }
@@ -308,6 +316,18 @@ TEST_VM(RiscV, cmpxchg_uint32_maybe_zacas) {
   }
 }
 
+TEST_VM(RiscV, cmpxchg_int16_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
+    run_plain_cmpxchg_tests<int16_t, Assembler::int16>();
+  }
+}
+
+TEST_VM(RiscV, cmpxchg_int8_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
+    run_plain_cmpxchg_tests<int8_t, Assembler::int8>();
+  }
+}
+
 template <typename TESTSIZE, Assembler::operand_size ASMSIZE>
 static void run_narrow_cmpxchg_tests() {
   CmpxchgTester<TESTSIZE, ASMSIZE> cmpxchg(0, false);
@@ -320,7 +340,6 @@ static void run_narrow_cmpxchg_tests() {
   TESTSIZE val[] = {121, min, max};
   for (int i = 0; i < 3; i++) {
     for (int j = 0; j < 7; j++) {
-      // printf("%lu %lX\n", (uint64_t)val[i], (uint64_t)val[i]);
       memset(data, -1, sizeof(data));
       data[i] = val[i];
       ret = cmpxchg.cmpxchg((intptr_t)&data[i], val[i], 42);
@@ -345,29 +364,35 @@ static void run_narrow_cmpxchg_tests() {
   }
 }
 
-TEST_VM(RiscV, cmpxchg_int16_lr_sc) {
+TEST_VM(RiscV, cmpxchg_narrow_int16_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_narrow_cmpxchg_tests<int16_t, Assembler::int16>();
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, cmpxchg_int16_maybe_zacas) {
+TEST_VM(RiscV, cmpxchg_narrow_int16_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
     run_narrow_cmpxchg_tests<int16_t, Assembler::int16>();
+    UseZabha = zabha;
   }
 }
 
-TEST_VM(RiscV, cmpxchg_int8_lr_sc) {
+TEST_VM(RiscV, cmpxchg_narrow_int8_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_narrow_cmpxchg_tests<int8_t, Assembler::int8>();
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, cmpxchg_int8_maybe_zacas) {
+TEST_VM(RiscV, cmpxchg_narrow_int8_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
     run_narrow_cmpxchg_tests<int8_t, Assembler::int8>();
+    UseZabha = zabha;
   }
 }
 
@@ -486,7 +511,7 @@ TEST_VM(RiscV, cmpxchg_uint32_concurrent_maybe_zacas) {
   }
 }
 
-TEST_VM(RiscV, cmpxchg_int16_concurrent_lr_sc) {
+TEST_VM(RiscV, cmpxchg_narrow_int16_concurrent_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_concurrent_cmpxchg_tests<int16_t, Assembler::int16>();
@@ -494,14 +519,17 @@ TEST_VM(RiscV, cmpxchg_int16_concurrent_lr_sc) {
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, cmpxchg_int16_concurrent_maybe_zacas) {
+TEST_VM(RiscV, cmpxchg_narrow_int16_concurrent_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
     run_concurrent_cmpxchg_tests<int16_t, Assembler::int16>();
     run_concurrent_alt_cmpxchg_tests<int16_t, Assembler::int16>();
+    UseZabha = zabha;
   }
 }
 
-TEST_VM(RiscV, cmpxchg_int8_concurrent_lr_sc) {
+TEST_VM(RiscV, cmpxchg_narrow_int8_concurrent_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_concurrent_cmpxchg_tests<int8_t, Assembler::int8>();
@@ -509,8 +537,25 @@ TEST_VM(RiscV, cmpxchg_int8_concurrent_lr_sc) {
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, cmpxchg_int8_concurrent_maybe_zacas) {
+TEST_VM(RiscV, cmpxchg_narrow_int8_concurrent_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
+    run_concurrent_cmpxchg_tests<int8_t, Assembler::int8>();
+    run_concurrent_alt_cmpxchg_tests<int8_t, Assembler::int8>();
+    UseZabha = zabha;
+  }
+}
+
+TEST_VM(RiscV, cmpxchg_int16_concurrent_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
+    run_concurrent_cmpxchg_tests<int16_t, Assembler::int16>();
+    run_concurrent_alt_cmpxchg_tests<int16_t, Assembler::int16>();
+  }
+}
+
+TEST_VM(RiscV, cmpxchg_int8_concurrent_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
     run_concurrent_cmpxchg_tests<int8_t, Assembler::int8>();
     run_concurrent_alt_cmpxchg_tests<int8_t, Assembler::int8>();
   }
@@ -534,7 +579,7 @@ class WeakCmpxchgTester {
     _bb = BufferBlob::create("riscvTest", 128);
     CodeBuffer code(_bb);
     MacroAssembler _masm(&code);
-    if (ASMSIZE == Assembler::int8 || ASMSIZE == Assembler::int16) {
+    if (using_narrow<ASMSIZE>()) {
         address entry = _masm.pc();
        _masm.weak_cmpxchg_narrow_value(/*addr*/ c_rarg0, /*expected*/ c_rarg1, /*new_value*/ c_rarg2,
                                       ASMSIZE, Assembler::relaxed, Assembler::relaxed,
@@ -554,7 +599,7 @@ class WeakCmpxchgTester {
   }
 
   TESTSIZE weak_cmpxchg(intptr_t addr, TESTSIZE expected, TESTSIZE new_value) {
-    if (ASMSIZE == Assembler::int8 || ASMSIZE == Assembler::int16) {
+    if (using_narrow<ASMSIZE>()) {
       return _narrow_weak(addr, expected, new_value, /* dummy result */ 67, -1, -1, -1);
     } else {
       return _weak(addr, expected, new_value, /* dummy result */ 67);
@@ -624,28 +669,46 @@ TEST_VM(RiscV, weak_cmpxchg_uint32_maybe_zacas) {
   }
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int16_lr_sc) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int16_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_weak_cmpxchg_tests<int16_t, Assembler::int16>();
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int8_lr_sc) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int8_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_weak_cmpxchg_tests<int8_t, Assembler::int8>();
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int16_maybe_zacas) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int16_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
     run_weak_cmpxchg_tests<int16_t, Assembler::int16>();
+    UseZabha = zabha;
   }
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int8_maybe_zacas) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int8_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
+    run_weak_cmpxchg_tests<int8_t, Assembler::int8>();
+    UseZabha = zabha;
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int16_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
+    run_weak_cmpxchg_tests<int16_t, Assembler::int16>();
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int8_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
     run_weak_cmpxchg_tests<int8_t, Assembler::int8>();
   }
 }
@@ -724,7 +787,7 @@ TEST_VM(RiscV, weak_cmpxchg_int32_concurrent_maybe_zacas) {
   }
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int16_concurrent_lr_sc) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int16_concurrent_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_concurrent_weak_cmpxchg_tests<int16_t, Assembler::int16>();
@@ -732,14 +795,17 @@ TEST_VM(RiscV, weak_cmpxchg_int16_concurrent_lr_sc) {
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int16_concurrent_maybe_zacas) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int16_concurrent_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
     run_concurrent_weak_cmpxchg_tests<int16_t, Assembler::int16>();
     run_concurrent_alt_weak_cmpxchg_tests<int16_t, Assembler::int16>();
+    UseZabha = zabha;
   }
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int8_concurrent_lr_sc) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int8_concurrent_lr_sc) {
   bool zacas = UseZacas;
   UseZacas = false;
   run_concurrent_weak_cmpxchg_tests<int8_t, Assembler::int8>();
@@ -747,8 +813,25 @@ TEST_VM(RiscV, weak_cmpxchg_int8_concurrent_lr_sc) {
   UseZacas = zacas;
 }
 
-TEST_VM(RiscV, weak_cmpxchg_int8_concurrent_maybe_zacas) {
+TEST_VM(RiscV, weak_cmpxchg_narrow_int8_concurrent_maybe_zacas) {
   if (UseZacas) {
+    bool zabha = UseZabha;
+    UseZabha = false;
+    run_concurrent_weak_cmpxchg_tests<int8_t, Assembler::int8>();
+    run_concurrent_alt_weak_cmpxchg_tests<int8_t, Assembler::int8>();
+    UseZabha = zabha;
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int16_concurrent_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
+    run_concurrent_weak_cmpxchg_tests<int16_t, Assembler::int16>();
+    run_concurrent_alt_weak_cmpxchg_tests<int16_t, Assembler::int16>();
+  }
+}
+
+TEST_VM(RiscV, weak_cmpxchg_int8_concurrent_maybe_zacas_zabha) {
+  if (UseZacas && UseZabha) {
     run_concurrent_weak_cmpxchg_tests<int8_t, Assembler::int8>();
     run_concurrent_alt_weak_cmpxchg_tests<int8_t, Assembler::int8>();
   }

From 09ec4de74d495560ffb9ec529df7ec818c1d617c Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 4 Jun 2025 12:56:18 +0000
Subject: [PATCH 847/901] 8358066: Non-ascii package names gives compilation
 error "import requires canonical name"

Reviewed-by: jlahoda, naoto
---
 .../com/sun/tools/javac/util/Convert.java     |  8 +--
 .../javac/nametable/TestUtfNumChars.java      | 70 +++++++++++++++++++
 2 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 test/langtools/tools/javac/nametable/TestUtfNumChars.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
index 16127224dc8..7d5f878b676 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Convert.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
@@ -224,10 +224,8 @@ public static String utf2string(byte[] src, int sindex, int len, Validation vali
     public static int utfNumChars(byte[] buf, int off, int len) {
         int numChars = 0;
         while (len-- > 0) {
-            int byte1 = buf[off++];
-            if (byte1 < 0)
-                len -= ((byte1 & 0xe0) == 0xc0) ? 1 : 2;
-            numChars++;
+            if ((buf[off++] & 0xc0) != 0x80)
+                numChars++;
         }
         return numChars;
     }
diff --git a/test/langtools/tools/javac/nametable/TestUtfNumChars.java b/test/langtools/tools/javac/nametable/TestUtfNumChars.java
new file mode 100644
index 00000000000..de9530ec4c4
--- /dev/null
+++ b/test/langtools/tools/javac/nametable/TestUtfNumChars.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 8358066
+ * @summary Test for bug in Convert.utfNumChars()
+ * @modules jdk.compiler/com.sun.tools.javac.util
+ * @run main TestUtfNumChars
+ */
+
+import com.sun.tools.javac.util.Convert;
+
+import java.util.function.IntPredicate;
+import java.util.stream.IntStream;
+
+public class TestUtfNumChars {
+
+    public static void main(String[] args) {
+
+        // This is the string "ab«cd≤ef🟢gh"
+        String s = "ab\u00ABcd\u2264ef\ud83d\udd34gh";
+
+        // This is its modified UTF-8 encoding
+        byte[] utf8 = Convert.string2utf(s);    // UTF-8: 61 62 c2 ab 63 64 e2 89 a4 65 66 ed a0 bd ed b4 b4 67 68
+                                                // Bytes: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18
+                                                // Chars: 00 01 02 .. 03 04 05 .. .. 06 07 08 .. .. 09 .. .. 10 11
+
+        // These are the offsets in "utf8" marking the boundaries of encoded Java charcters
+        int[] offsets = new int[] {
+            0, 1, 2, 4, 5, 6, 9, 10, 11, 14, 17, 18
+        };
+        IntPredicate boundary = off -> off == utf8.length || IntStream.of(offsets).anyMatch(off2 -> off2 == off);
+
+        // Check Convert.utfNumChars() on every subsequence
+        for (int i = 0; i < offsets.length; i++) {
+            int i_off = offsets[i];
+            if (!boundary.test(i_off))
+                continue;
+            for (int j = i; j < offsets.length; j++) {
+                int j_off = offsets[j];
+                if (!boundary.test(j_off))
+                    continue;
+                int nchars = Convert.utfNumChars(utf8, i_off, j_off - i_off);
+                if (nchars != j - i)
+                    throw new AssertionError(String.format("nchars %d != %d for [%d, %d)", nchars, j - i, i_off, j_off));
+            }
+        }
+    }
+}

From 248341d372ba9c1031729a65eb10d8def52de641 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 4 Jun 2025 13:16:24 +0000
Subject: [PATCH 848/901] 8344942: Template-Based Testing Framework
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tobias Hartmann <thartmann@openjdk.org>
Co-authored-by: Tobias Holenstein <tholenstein@openjdk.org>
Co-authored-by: Theo Weidmann <tweidmann@openjdk.org>
Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org>
Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Co-authored-by: Manuel Hässig <mhaessig@openjdk.org>
Reviewed-by: chagedorn, mhaessig, rcastanedalo
---
 .../lib/template_framework/AddNameToken.java  |   26 +
 .../compiler/lib/template_framework/Code.java |   51 +
 .../lib/template_framework/CodeFrame.java     |  156 ++
 .../lib/template_framework/DataName.java      |  227 ++
 .../compiler/lib/template_framework/Hook.java |  100 +
 .../template_framework/HookAnchorToken.java   |   28 +
 .../template_framework/HookInsertToken.java   |   26 +
 .../compiler/lib/template_framework/Name.java |   50 +
 .../lib/template_framework/NameSet.java       |  151 ++
 .../lib/template_framework/NothingToken.java  |   26 +
 .../compiler/lib/template_framework/README.md |   12 +
 .../lib/template_framework/Renderer.java      |  437 ++++
 .../template_framework/RendererException.java |   35 +
 .../lib/template_framework/StringToken.java   |   26 +
 .../template_framework/StructuralName.java    |  200 ++
 .../lib/template_framework/Template.java      |  844 ++++++
 .../template_framework/TemplateBinding.java   |   70 +
 .../lib/template_framework/TemplateBody.java  |   34 +
 .../lib/template_framework/TemplateFrame.java |   99 +
 .../lib/template_framework/TemplateToken.java |  169 ++
 .../lib/template_framework/Token.java         |   78 +
 .../lib/template_framework/library/Hooks.java |   46 +
 .../examples/TestAdvanced.java                |  162 ++
 .../examples/TestSimple.java                  |   78 +
 .../examples/TestTutorial.java                | 1227 +++++++++
 .../template_framework/tests/TestFormat.java  |  111 +
 .../tests/TestTemplate.java                   | 2253 +++++++++++++++++
 27 files changed, 6722 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Code.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Name.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/README.md
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/RendererException.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/StringToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Template.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/TemplateBinding.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/Token.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/template_framework/library/Hooks.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java

diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
new file mode 100644
index 00000000000..4f1f7e569bf
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/AddNameToken.java
@@ -0,0 +1,26 @@
+/*
+ * 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.template_framework;
+
+record AddNameToken(Name name) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Code.java b/test/hotspot/jtreg/compiler/lib/template_framework/Code.java
new file mode 100644
index 00000000000..5806460ac88
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Code.java
@@ -0,0 +1,51 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+
+/**
+ * This class collects code, i.e. {@link String}s or {@link List}s of {@link String}s.
+ * All the {@link String}s are later collected in a {@link StringBuilder}. If we used a {@link StringBuilder}
+ * directly to collect the {@link String}s, we could not as easily insert code at an "earlier" position, i.e.
+ * reaching out to a {@link Hook#anchor}.
+ */
+sealed interface Code permits Code.Token, Code.CodeList {
+
+    record Token(String s) implements Code {
+        @Override
+        public void renderTo(StringBuilder builder) {
+            builder.append(s);
+        }
+    }
+
+    record CodeList(List<Code> list) implements Code {
+        @Override
+        public void renderTo(StringBuilder builder) {
+            list.forEach(code -> code.renderTo(builder));
+        }
+    }
+
+    void renderTo(StringBuilder builder);
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java b/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
new file mode 100644
index 00000000000..5c4ff55614f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/CodeFrame.java
@@ -0,0 +1,156 @@
+/*
+ * 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.template_framework;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The {@link CodeFrame} represents a frame (i.e. scope) of code, appending {@link Code} to the {@code 'codeList'}
+ * as {@link Token}s are rendered, and adding names to the {@link NameSet}s with {@link Template#addStructuralName}/
+ * {@link Template#addDataName}. {@link Hook}s can be added to a frame, which allows code to be inserted at that
+ * location later. When a {@link Hook} is {@link Hook#anchor}ed, it separates the Template into an outer and inner
+ * {@link CodeFrame}, ensuring that names that are added inside the inner frame are only available inside that frame.
+ *
+ * <p>
+ * On the other hand, each {@link TemplateFrame} represents the frame (or scope) of exactly one use of a
+ * Template.
+ *
+ * <p>
+ * For simple Template nesting, the {@link CodeFrame}s and {@link TemplateFrame}s overlap exactly.
+ * However, when using {@link Hook#insert}, we simply nest {@link TemplateFrame}s, going further "in",
+ * but we jump to an outer {@link CodeFrame}, ensuring that we insert {@link Code} at the outer frame,
+ * and operating on the names of the outer frame. Once the {@link Hook#insert}ion is complete, we jump
+ * back to the caller {@link TemplateFrame} and {@link CodeFrame}.
+ */
+class CodeFrame {
+    public final CodeFrame parent;
+    private final List<Code> codeList = new ArrayList<>();
+    private final Map<Hook, Code.CodeList> hookCodeLists = new HashMap<>();
+
+    /**
+     * The {@link NameSet} is used for variable and fields etc.
+     */
+    private final NameSet names;
+
+    private CodeFrame(CodeFrame parent, boolean isTransparentForNames) {
+        this.parent = parent;
+        if (parent == null) {
+            // NameSet without any parent.
+            this.names = new NameSet(null);
+        } else if (isTransparentForNames) {
+            // We use the same NameSet as the parent - makes it transparent.
+            this.names = parent.names;
+        } else {
+            // New NameSet, to make sure we have a nested scope for the names.
+            this.names = new NameSet(parent.names);
+        }
+    }
+
+    /**
+     * Creates a base frame, which has no {@link #parent}.
+     */
+    public static CodeFrame makeBase() {
+        return new CodeFrame(null, false);
+    }
+
+    /**
+     * Creates a normal frame, which has a {@link #parent} and which defines an inner
+     * {@link NameSet}, for the names that are generated inside this frame. Once this
+     * frame is exited, the name from inside this frame are not available anymore.
+     */
+    public static CodeFrame make(CodeFrame parent) {
+        return new CodeFrame(parent, false);
+    }
+
+    /**
+     * Creates a special frame, which has a {@link #parent} but uses the {@link NameSet}
+     * from the parent frame, allowing {@link Template#addDataName}/
+     * {@link Template#addStructuralName} to persist in the outer frame when the current frame
+     * is exited. This is necessary for {@link Hook#insert},  where we would possibly want to
+     * make field or variable definitions during the insertion that are not just local to the
+     * insertion but affect the {@link CodeFrame} that we {@link Hook#anchor} earlier and are
+     * now {@link Hook#insert}ing into.
+     */
+    public static CodeFrame makeTransparentForNames(CodeFrame parent) {
+        return new CodeFrame(parent, true);
+    }
+
+    void addString(String s) {
+        codeList.add(new Code.Token(s));
+    }
+
+    void addCode(Code code) {
+        codeList.add(code);
+    }
+
+    void addHook(Hook hook) {
+        if (hasHook(hook)) {
+            // This should never happen, as we add a dedicated CodeFrame for each hook.
+            throw new RuntimeException("Internal error: Duplicate Hook in CodeFrame: " + hook.name());
+        }
+        hookCodeLists.put(hook, new Code.CodeList(new ArrayList<>()));
+    }
+
+    private boolean hasHook(Hook hook) {
+        return hookCodeLists.containsKey(hook);
+    }
+
+    CodeFrame codeFrameForHook(Hook hook) {
+        CodeFrame current = this;
+        while (current != null) {
+            if (current.hasHook(hook)) {
+                return current;
+            }
+            current = current.parent;
+        }
+        return null;
+    }
+
+    void addName(Name name) {
+        names.add(name);
+    }
+
+    Name sampleName(NameSet.Predicate predicate) {
+        return names.sample(predicate);
+    }
+
+    int countNames(NameSet.Predicate predicate) {
+        return names.count(predicate);
+    }
+
+    boolean hasAnyNames(NameSet.Predicate predicate) {
+        return names.hasAny(predicate);
+    }
+
+    List<Name> listNames(NameSet.Predicate predicate) {
+        return names.toList(predicate);
+    }
+
+    Code getCode() {
+        return new Code.CodeList(codeList);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java b/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
new file mode 100644
index 00000000000..f45a4db8a1e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/DataName.java
@@ -0,0 +1,227 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+
+/**
+ * {@link DataName}s represent things like fields and local variables, and can be added to the local
+ * scope with {@link Template#addDataName}, and accessed with {@link Template#dataNames}, to
+ * count, list or even sample random {@link DataName}s. Every {@link DataName} has a {@link DataName.Type},
+ * so that sampling can be restricted to these types.
+ *
+ * <p>
+ * For method and class names and alike, there are the analogous {@link StructuralName}s.
+ *
+ * @param name The {@link String} name used in code.
+ * @param type The type of the {@link DataName}.
+ * @param mutable Defines if the {@link DataName} is considered mutable or immutable.
+ * @param weight The weight of the {@link DataName}, it corresponds to the probability of choosing this
+ *               {@link DataName} when sampling later on.
+ */
+public record DataName(String name, DataName.Type type, boolean mutable, int weight) implements Name {
+
+    /**
+     * {@link Mutability} defines the possible states of {@link DataName}s, or the
+     * desired state when filtering.
+     */
+    public enum Mutability {
+        /**
+         * Used for mutable fields and variables, i.e. writing is allowed.
+         */
+        MUTABLE,
+        /**
+         * Used for immutable fields and variables, i.e. writing is not allowed,
+         * for example because the field or variable is final.
+         */
+        IMMUTABLE,
+        /**
+         * When filtering, we sometimes want to indicate that we accept
+         * mutable and immutable fields and variables, for example when
+         * we are only reading, the mutability state does not matter.
+         */
+        MUTABLE_OR_IMMUTABLE
+    }
+
+    /**
+     * Creates a new {@link DataName}.
+     */
+    public DataName {
+    }
+
+    /**
+     * The interface for the type of a {@link DataName}.
+     */
+    public interface Type extends Name.Type {
+        /**
+         * The name of the type, that can be used in code.
+         *
+         * @return The {@link String} representation of the type, that can be used in code.
+         */
+        String name();
+
+        /**
+         * Defines the subtype relationship with other types, which is used to filter {@link DataName}s
+         * in {@link FilteredSet#exactOf}, {@link FilteredSet#subtypeOf}, and {@link FilteredSet#supertypeOf}.
+         *
+         * @param other The other type, where we check if it is the supertype of {@code 'this'}.
+         * @return If {@code 'this'} is a subtype of {@code 'other'}.
+         */
+        boolean isSubtypeOf(DataName.Type other);
+    }
+
+    /**
+     * The {@link FilteredSet} represents a filtered set of {@link DataName}s in the current scope.
+     * It can be obtained with {@link Template#dataNames}. It can be used to count the
+     * available {@link DataName}s, or sample a random {@link DataName} according to the
+     * weights of the {@link DataName}s in the filtered set.
+     * Note: The {@link FilteredSet} is only a filtered view on the set of {@link DataName}s,
+     * and may return different results in different contexts.
+     */
+    public static final class FilteredSet {
+        private final Mutability mutability;
+        private final DataName.Type subtype;
+        private final DataName.Type supertype;
+
+        FilteredSet(Mutability mutability, DataName.Type subtype, DataName.Type supertype) {
+            this.mutability = mutability;
+            this.subtype = subtype;
+            this.supertype = supertype;
+        }
+
+        FilteredSet(Mutability mutability) {
+            this(mutability, null, null);
+        }
+
+        NameSet.Predicate predicate() {
+            if (subtype == null && supertype == null) {
+                throw new UnsupportedOperationException("Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
+            }
+            return (Name name) -> {
+                if (!(name instanceof DataName dataName)) { return false; }
+                if (mutability == Mutability.MUTABLE && !dataName.mutable()) { return false; }
+                if (mutability == Mutability.IMMUTABLE && dataName.mutable()) { return false; }
+                if (subtype != null && !dataName.type().isSubtypeOf(subtype)) { return false; }
+                if (supertype != null && !supertype.isSubtypeOf(dataName.type())) { return false; }
+                return true;
+            };
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link DataName}s must be subtypes of {@code type}.
+         *
+         * @param type The type of which all {@link DataName}s must be subtypes of.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #subtypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet subtypeOf(DataName.Type type) {
+            if (subtype != null) {
+                throw new UnsupportedOperationException("Cannot constrain to subtype " + type + ", is already constrained: " + subtype);
+            }
+            return new FilteredSet(mutability, type, supertype);
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link DataName}s must be supertypes of {@code type}.
+         *
+         * @param type The type of which all {@link DataName}s must be supertype of.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet supertypeOf(DataName.Type type) {
+            if (supertype != null) {
+                throw new UnsupportedOperationException("Cannot constrain to supertype " + type + ", is already constrained: " + supertype);
+            }
+            return new FilteredSet(mutability, subtype, type);
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link DataName}s must be of exact {@code type},
+         * hence it must be both subtype and supertype thereof.
+         *
+         * @param type The type of which all {@link DataName}s must be.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet exactOf(DataName.Type type) {
+            return subtypeOf(type).supertypeOf(type);
+        }
+
+        /**
+         * Samples a random {@link DataName} from the filtered set, according to the weights
+         * of the contained {@link DataName}s.
+         *
+         * @return The sampled {@link DataName}.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         * @throws RendererException If the set was empty.
+         */
+        public DataName sample() {
+            DataName n = (DataName)Renderer.getCurrent().sampleName(predicate());
+            if (n == null) {
+                String msg1 = (subtype == null) ? "" : ", subtypeOf(" + subtype + ")";
+                String msg2 = (supertype == null) ? "" : ", supertypeOf(" + supertype + ")";
+                throw new RendererException("No variable: " + mutability + msg1 + msg2 + ".");
+            }
+            return n;
+        }
+
+        /**
+         * Counts the number of {@link DataName}s in the filtered set.
+         *
+         * @return The number of {@link DataName}s in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public int count() {
+            return Renderer.getCurrent().countNames(predicate());
+        }
+
+        /**
+         * Checks if there are any {@link DataName}s in the filtered set.
+         *
+         * @return Returns {@code true} iff there is at least one {@link DataName} in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public boolean hasAny() {
+            return Renderer.getCurrent().hasAnyNames(predicate());
+        }
+
+        /**
+         * Collects all {@link DataName}s in the filtered set.
+         *
+         * @return A {@link List} of all {@link DataName}s in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public List<DataName> toList() {
+            List<Name> list = Renderer.getCurrent().listNames(predicate());
+            return list.stream().map(n -> (DataName)n).toList();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java b/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
new file mode 100644
index 00000000000..48f7852d509
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Hook.java
@@ -0,0 +1,100 @@
+/*
+ * 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.template_framework;
+
+/**
+ * {@link Hook}s can be {@link #anchor}ed for a certain scope in a Template, and all nested
+ * Templates in this scope, and then from within this scope, any Template can
+ * {@link #insert} code to where the {@link Hook} was {@link #anchor}ed. This can be useful to reach
+ * "back" or to some outer scope, e.g. while generating code for a method, one can reach out
+ * to the class scope to insert fields.
+ *
+ * <p>
+ * Example:
+ * {@snippet lang=java :
+ * var myHook = new Hook("MyHook");
+ *
+ * var template1 = Template.make("name", (String name) -> body(
+ *     """
+ *     public static int #name = 42;
+ *     """
+ * ));
+ *
+ * var template2 = Template.make(() -> body(
+ *     """
+ *     public class Test {
+ *     """,
+ *     // Anchor the hook here.
+ *     myHook.anchor(
+ *         """
+ *         public static void main(String[] args) {
+ *         System.out.println("$field: " + $field)
+ *         """,
+ *         // Reach out to where the hook was anchored, and insert the code of template1.
+ *         myHook.insert(template1.asToken($("field"))),
+ *         """
+ *         }
+ *         """
+ *     ),
+ *     """
+ *     }
+ *     """
+ * ));
+ * }
+ *
+ * @param name The name of the Hook, for debugging purposes only.
+ */
+public record Hook(String name) {
+    /**
+     * Anchor this {@link Hook} for the scope of the provided {@code 'tokens'}.
+     * From anywhere inside this scope, even in nested Templates, code can be
+     * {@link #insert}ed back to the location where this {@link Hook} was {@link #anchor}ed.
+     *
+     * @param tokens A list of tokens, which have the same restrictions as {@link Template#body}.
+     * @return A {@link Token} that captures the anchoring of the scope and the list of validated {@link Token}s.
+     */
+    public Token anchor(Object... tokens) {
+        return new HookAnchorToken(this, Token.parse(tokens));
+    }
+
+    /**
+     * Inserts a {@link TemplateToken} to the innermost location where this {@link Hook} was {@link #anchor}ed.
+     * This could be in the same Template, or one nested further out.
+     *
+     * @param templateToken The Template with applied arguments to be inserted at the {@link Hook}.
+     * @return The {@link Token} which when used inside a {@link Template#body} performs the code insertion into the {@link Hook}.
+     */
+    public Token insert(TemplateToken templateToken) {
+        return new HookInsertToken(this, templateToken);
+    }
+
+    /**
+     * Checks if the {@link Hook} was {@link Hook#anchor}ed for the current scope or an outer scope.
+     *
+     * @return If the {@link Hook} was {@link Hook#anchor}ed for the current scope or an outer scope.
+     */
+    public boolean isAnchored() {
+        return Renderer.getCurrent().isAnchored(this);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
new file mode 100644
index 00000000000..b025c5ff041
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/HookAnchorToken.java
@@ -0,0 +1,28 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+
+record HookAnchorToken(Hook hook, List<Token> tokens) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
new file mode 100644
index 00000000000..de8b60bbf24
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/HookInsertToken.java
@@ -0,0 +1,26 @@
+/*
+ * 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.template_framework;
+
+record HookInsertToken(Hook hook, TemplateToken templateToken) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Name.java b/test/hotspot/jtreg/compiler/lib/template_framework/Name.java
new file mode 100644
index 00000000000..b969ecaa13a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Name.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.
+ */
+
+package compiler.lib.template_framework;
+
+sealed interface Name permits DataName, StructuralName {
+    /**
+     * The name of the name, that can be used in code.
+     *
+     * @return The {@link String} name of the name, that can be used in code.
+     */
+    String name();
+
+    /**
+     * The type of the name, allowing for filtering by type.
+     *
+     * @return The type of the name.
+     */
+    Type type();
+
+    /**
+     * The weight of the name, corresponds to the probability of
+     * choosing this name when sampling.
+     *
+     * @return The weight of the name.
+     */
+    int weight();
+
+    interface Type {}
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java b/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
new file mode 100644
index 00000000000..ef79c33d48a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NameSet.java
@@ -0,0 +1,151 @@
+/*
+ * 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.template_framework;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.Optional;
+
+import jdk.test.lib.Utils;
+
+/**
+ * The {@link NameSet} defines a set of {@link Name}s (e.g. fields or variable names). They extend the
+ * set of the {@code 'parent'} set.
+ */
+class NameSet {
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    private final NameSet parent;
+    private final List<NameSet> children = new ArrayList<>();
+    private final List<Name> names = new ArrayList<>();
+
+    interface Predicate {
+        boolean check(Name type);
+    }
+
+    NameSet(NameSet parent) {
+        this.parent = parent;
+        if (parent != null) { parent.registerChild(this); }
+    }
+
+    void registerChild(NameSet child) {
+        children.add(child);
+    }
+
+    private long weight(Predicate predicate) {
+        long w = names.stream().filter(predicate::check).mapToInt(Name::weight).sum();
+        if (parent != null) { w += parent.weight(predicate); }
+        return w;
+    }
+
+    public int count(Predicate predicate) {
+        int c = (int)names.stream().filter(predicate::check).count();
+        if (parent != null) { c += parent.count(predicate); }
+        return c;
+    }
+
+    public boolean hasAny(Predicate predicate) {
+        return names.stream().anyMatch(predicate::check) ||
+               (parent != null && parent.hasAny(predicate));
+    }
+
+    public List<Name> toList(Predicate predicate) {
+        List<Name> list = (parent != null) ? parent.toList(predicate)
+                                           : new ArrayList<>();
+        list.addAll(names.stream().filter(predicate::check).toList());
+        return list;
+    }
+
+    /**
+     * Randomly sample a name from this set or a parent set, restricted to the predicate.
+     */
+    public Name sample(Predicate predicate) {
+        long w = weight(predicate);
+        if (w <= 0) {
+            // Negative weight should never happen, as all names have positive weight.
+            if (w < 0) {
+                throw new RuntimeException("Negative weight not allowed: " + w);
+            }
+            // If the weight is zero, there is no matching Name available.
+            // Return null, and let the caller handle the situation, e.g.
+            // throw an exception.
+            return null;
+        }
+
+        long r = RANDOM.nextLong(w);
+        return sample(predicate, r);
+    }
+
+    private Name sample(Predicate predicate, long r) {
+        for (var name : names) {
+            if (predicate.check(name)) {
+                r -= name.weight();
+                if (r < 0) { return name; }
+            }
+        }
+        return parent.sample(predicate, r);
+    }
+
+    private Name findLocal(String name) {
+        Optional<Name> opt = names.stream().filter(n -> n.name().equals(name)).findAny();
+        return opt.orElse(null);
+    }
+
+    private Name findParents(String name) {
+        if (parent == null) { return null; }
+        Name n = parent.findLocal(name);
+        if (n != null) { return n; }
+        return parent.findParents(name);
+    }
+
+    private Name findChildren(String name) {
+        for (NameSet child : children) {
+            Name n1 = child.findLocal(name);
+            if (n1 != null) { return n1; }
+            Name n2 = child.findChildren(name);
+            if (n2 != null) { return n2; }
+        }
+        return null;
+    }
+
+    private Name find(String name) {
+        Name n1 = findLocal(name);
+        if (n1 != null) { return n1; }
+        Name n2 = findParents(name);
+        if (n2 != null) { return n2; }
+        return findChildren(name);
+    }
+
+    /**
+     * Add a variable of a specified type to the set.
+     */
+    public void add(Name name) {
+        Name other = find(name.name());
+        if (other != null) {
+            throw new RendererException("Duplicate name: " + name + ", previously: " + other);
+        }
+        names.add(name);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java
new file mode 100644
index 00000000000..540eaf1e14c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/NothingToken.java
@@ -0,0 +1,26 @@
+/*
+ * 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.template_framework;
+
+record NothingToken() implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/README.md b/test/hotspot/jtreg/compiler/lib/template_framework/README.md
new file mode 100644
index 00000000000..bc09d34b928
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/README.md
@@ -0,0 +1,12 @@
+# Template Framework
+The Template Framework allows the generation of code with Templates. The goal is that these Templates are easy to write, and allow regression tests to cover a larger scope, and to make template based fuzzing easy to extend.
+
+We want to make it easy to generate variants of tests. Often, we would like to have a set of tests, corresponding to a set of types, a set of operators, a set of constants, etc. Writing all the tests by hand is cumbersome or even impossible. When generating such tests with scripts, it would be preferable if the code generation happens automatically, and the generator script was checked into the code base. Code generation can go beyond simple regression tests, and one might want to generate random code from a list of possible templates, to fuzz individual Java features and compiler optimizations.
+
+The Template Framework provides a facility to generate code with Templates. Templates are essentially a list of tokens that are concatenated (i.e. rendered) to a String. The Templates can have "holes", which are filled (replaced) by different values at each Template instantiation. For example, these "holes" can be filled with different types, operators or constants. Templates can also be nested, allowing a modular use of Templates.
+
+Detailed documentation can be found in [Template.java](./Template.java).
+
+The Template Framework only generates code in the form of a String. This code can then be compiled and executed, for example with the help of the [Compile Framework](../compile_framework/README.md).
+
+The basic functionalities of the Template Framework are described in the [Template Interface](./Template.java), together with some examples. More examples can be found in [TestSimple.java](../../../testlibrary_tests/template_framework/examples/TestSimple.java), [TestAdvanced.java](../../../testlibrary_tests/template_framework/examples/TestAdvanced.java) and [TestTutorial.java](../../../testlibrary_tests/template_framework/examples/TestTutorial.java).
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
new file mode 100644
index 00000000000..14adfc81d3f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
@@ -0,0 +1,437 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * The {@link Renderer} class renders a tokenized {@link Template} in the form of a {@link TemplateToken}.
+ * It also keeps track of the states during a nested Template rendering. There can only be a single
+ * {@link Renderer} active at any point, since there are static methods that reference
+ * {@link Renderer#getCurrent}.
+ *
+ * <p>
+ * The {@link Renderer} instance keeps track of the current frames.
+ *
+ * @see TemplateFrame
+ * @see CodeFrame
+ */
+final class Renderer {
+    private static final String NAME_CHARACTERS = "[a-zA-Z_][a-zA-Z0-9_]*";
+    private static final Pattern NAME_PATTERN = Pattern.compile(
+        // We are parsing patterns:
+        //   #name
+        //   #{name}
+        //   $name
+        //   ${name}
+        // But the "#" or "$" have already been removed, and the String
+        // starts at the character after that.
+        // The pattern must be at the beginning of the String part.
+        "^" +
+        // We either have "name" or "{name}"
+        "(?:" + // non-capturing group for the OR
+            // capturing group for "name"
+            "(" + NAME_CHARACTERS + ")" +
+        "|" + // OR
+            // We want to trim off the brackets, so have
+            // another non-capturing group.
+            "(?:\\{" +
+                // capturing group for "name" inside "{name}"
+                "(" + NAME_CHARACTERS + ")" +
+            "\\})" +
+        ")");
+    private static final Pattern NAME_CHARACTERS_PATTERN = Pattern.compile("^" + NAME_CHARACTERS + "$");
+
+    static boolean isValidHashtagOrDollarName(String name) {
+        return NAME_CHARACTERS_PATTERN.matcher(name).find();
+    }
+
+    /**
+     * There can be at most one Renderer instance at any time.
+     *
+     * <p>
+     * When using nested templates, the user of the Template Framework may be tempted to first render
+     * the nested template to a {@link String}, and then use this {@link String} as a token in an outer
+     * {@link Template#body}. This would be a bad pattern: the outer and nested {@link Template} would
+     * be rendered separately, and could not interact. For example, the nested {@link Template} would
+     * not have access to the scopes of the outer {@link Template}. The inner {@link Template} could
+     * not access {@link Name}s and {@link Hook}s from the outer {@link Template}. The user might assume
+     * that the inner {@link Template} has access to the outer {@link Template}, but they would actually
+     * be separated. This could lead to unexpected behavior or even bugs.
+     *
+     * <p>
+     * Instead, the user should create a {@link TemplateToken} from the inner {@link Template}, and
+     * use that {@link TemplateToken} in the {@link Template#body} of the outer {@link Template}.
+     * This way, the inner and outer {@link Template}s get rendered together, and the inner {@link Template}
+     * has access to the {@link Name}s and {@link Hook}s of the outer {@link Template}.
+     *
+     * <p>
+     * The {@link Renderer} instance exists during the whole rendering process. Should the user ever
+     * attempt to render a nested {@link Template} to a {@link String}, we would detect that there is
+     * already a {@link Renderer} instance for the outer {@link Template}, and throw a {@link RendererException}.
+     */
+    private static Renderer renderer = null;
+
+    private int nextTemplateFrameId;
+    private final TemplateFrame baseTemplateFrame;
+    private TemplateFrame currentTemplateFrame;
+    private final CodeFrame baseCodeFrame;
+    private CodeFrame currentCodeFrame;
+
+    // We do not want any other instances, so we keep it private.
+    private Renderer(float fuel) {
+        nextTemplateFrameId = 0;
+        baseTemplateFrame = TemplateFrame.makeBase(nextTemplateFrameId++, fuel);
+        currentTemplateFrame = baseTemplateFrame;
+        baseCodeFrame = CodeFrame.makeBase();
+        currentCodeFrame = baseCodeFrame;
+    }
+
+    static Renderer getCurrent() {
+        if (renderer == null) {
+            throw new RendererException("A Template method such as '$', 'let', 'sample', 'count' etc. was called outside a template rendering.");
+        }
+        return renderer;
+    }
+
+    static String render(TemplateToken templateToken) {
+        return render(templateToken, Template.DEFAULT_FUEL);
+    }
+
+    static String render(TemplateToken templateToken, float fuel) {
+        // Check nobody else is using the Renderer.
+        if (renderer != null) {
+            throw new RendererException("Nested render not allowed. Please only use 'asToken' inside Templates, and call 'render' only once at the end.");
+        }
+        try {
+            renderer = new Renderer(fuel);
+            renderer.renderTemplateToken(templateToken);
+            renderer.checkFrameConsistencyAfterRendering();
+            return renderer.collectCode();
+        } finally {
+            // Release the Renderer.
+            renderer = null;
+        }
+    }
+
+    private void checkFrameConsistencyAfterRendering() {
+        // Ensure CodeFrame consistency.
+        if (baseCodeFrame != currentCodeFrame) {
+            throw new RuntimeException("Internal error: Renderer did not end up at base CodeFrame.");
+        }
+        // Ensure TemplateFrame consistency.
+        if (baseTemplateFrame != currentTemplateFrame) {
+            throw new RuntimeException("Internal error: Renderer did not end up at base TemplateFrame.");
+        }
+    }
+
+    private String collectCode() {
+        StringBuilder builder = new StringBuilder();
+        baseCodeFrame.getCode().renderTo(builder);
+        return builder.toString();
+    }
+
+    String $(String name) {
+        return currentTemplateFrame.$(name);
+    }
+
+    void addHashtagReplacement(String key, Object value) {
+        currentTemplateFrame.addHashtagReplacement(key, format(value));
+    }
+
+    private String getHashtagReplacement(String key) {
+        return currentTemplateFrame.getHashtagReplacement(key);
+    }
+
+    float fuel() {
+        return currentTemplateFrame.fuel;
+    }
+
+    void setFuelCost(float fuelCost) {
+        currentTemplateFrame.setFuelCost(fuelCost);
+    }
+
+    Name sampleName(NameSet.Predicate predicate) {
+        return currentCodeFrame.sampleName(predicate);
+    }
+
+    int countNames(NameSet.Predicate predicate) {
+        return currentCodeFrame.countNames(predicate);
+    }
+
+    boolean hasAnyNames(NameSet.Predicate predicate) {
+        return currentCodeFrame.hasAnyNames(predicate);
+    }
+
+    List<Name> listNames(NameSet.Predicate predicate) {
+        return currentCodeFrame.listNames(predicate);
+    }
+
+    /**
+     * Formats values to {@link String} with the goal of using them in Java code.
+     * By default, we use the overrides of {@link Object#toString}.
+     * But for some boxed primitives we need to create a special formatting.
+     */
+    static String format(Object value) {
+        return switch (value) {
+            case String s -> s;
+            case Integer i -> i.toString();
+            // We need to append the "L" so that the values are not interpreted as ints,
+            // and then javac might complain that the values are too large for an int.
+            case Long l -> l.toString() + "L";
+            // Some Float and Double values like Infinity and NaN need a special representation.
+            case Float f -> formatFloat(f);
+            case Double d -> formatDouble(d);
+            default -> value.toString();
+        };
+    }
+
+    private static String formatFloat(Float f) {
+        if (Float.isFinite(f)) {
+            return f.toString() + "f";
+        } else if (f.isNaN()) {
+            return "Float.intBitsToFloat(" + Float.floatToRawIntBits(f) + " /* NaN */)";
+        } else if (f.isInfinite()) {
+            if (f > 0) {
+                return "Float.POSITIVE_INFINITY";
+            } else {
+                return "Float.NEGATIVE_INFINITY";
+            }
+        } else {
+            throw new RuntimeException("Not handled: " + f);
+        }
+    }
+
+    private static String formatDouble(Double d) {
+        if (Double.isFinite(d)) {
+            return d.toString();
+        } else if (d.isNaN()) {
+            return "Double.longBitsToDouble(" + Double.doubleToRawLongBits(d) + "L /* NaN */)";
+        } else if (d.isInfinite()) {
+            if (d > 0) {
+                return "Double.POSITIVE_INFINITY";
+            } else {
+                return "Double.NEGATIVE_INFINITY";
+            }
+        } else {
+            throw new RuntimeException("Not handled: " + d);
+        }
+    }
+
+    private void renderTemplateToken(TemplateToken templateToken) {
+        TemplateFrame templateFrame = TemplateFrame.make(currentTemplateFrame, nextTemplateFrameId++);
+        currentTemplateFrame = templateFrame;
+
+        templateToken.visitArguments((name, value) -> addHashtagReplacement(name, format(value)));
+        TemplateBody body = templateToken.instantiate();
+        renderTokenList(body.tokens());
+
+        if (currentTemplateFrame != templateFrame) {
+            throw new RuntimeException("Internal error: TemplateFrame mismatch!");
+        }
+        currentTemplateFrame = currentTemplateFrame.parent;
+    }
+
+    private void renderToken(Token token) {
+        switch (token) {
+            case StringToken(String s) -> {
+                renderStringWithDollarAndHashtagReplacements(s);
+            }
+            case NothingToken() -> {
+                // Nothing.
+            }
+            case HookAnchorToken(Hook hook, List<Token> tokens) -> {
+                CodeFrame outerCodeFrame = currentCodeFrame;
+
+                // We need a CodeFrame to which the hook can insert code. That way, name
+                // definitions at the hook cannot escape the hookCodeFrame.
+                CodeFrame hookCodeFrame = CodeFrame.make(outerCodeFrame);
+                hookCodeFrame.addHook(hook);
+
+                // We need a CodeFrame where the tokens can be rendered. That way, name
+                // definitions from the tokens cannot escape the innerCodeFrame to the
+                // hookCodeFrame.
+                CodeFrame innerCodeFrame = CodeFrame.make(hookCodeFrame);
+                currentCodeFrame = innerCodeFrame;
+
+                renderTokenList(tokens);
+
+                // Close the hookCodeFrame and innerCodeFrame. hookCodeFrame code comes before the
+                // innerCodeFrame code from the tokens.
+                currentCodeFrame = outerCodeFrame;
+                currentCodeFrame.addCode(hookCodeFrame.getCode());
+                currentCodeFrame.addCode(innerCodeFrame.getCode());
+            }
+            case HookInsertToken(Hook hook, TemplateToken templateToken) -> {
+                // Switch to hook CodeFrame.
+                CodeFrame callerCodeFrame = currentCodeFrame;
+                CodeFrame hookCodeFrame = codeFrameForHook(hook);
+
+                // Use a transparent nested CodeFrame. We need a CodeFrame so that the code generated
+                // by the TemplateToken can be collected, and hook insertions from it can still
+                // be made to the hookCodeFrame before the code from the TemplateToken is added to
+                // the hookCodeFrame.
+                // But the CodeFrame must be transparent, so that its name definitions go out to
+                // the hookCodeFrame, and are not limited to the CodeFrame for the TemplateToken.
+                currentCodeFrame = CodeFrame.makeTransparentForNames(hookCodeFrame);
+
+                renderTemplateToken(templateToken);
+
+                hookCodeFrame.addCode(currentCodeFrame.getCode());
+
+                // Switch back from hook CodeFrame to caller CodeFrame.
+                currentCodeFrame = callerCodeFrame;
+            }
+            case TemplateToken templateToken -> {
+                // Use a nested CodeFrame.
+                CodeFrame callerCodeFrame = currentCodeFrame;
+                currentCodeFrame = CodeFrame.make(currentCodeFrame);
+
+                renderTemplateToken(templateToken);
+
+                callerCodeFrame.addCode(currentCodeFrame.getCode());
+                currentCodeFrame = callerCodeFrame;
+            }
+            case AddNameToken(Name name) -> {
+                currentCodeFrame.addName(name);
+            }
+        }
+    }
+
+    private void renderTokenList(List<Token> tokens) {
+        CodeFrame codeFrame = currentCodeFrame;
+        for (Token t : tokens) {
+            renderToken(t);
+        }
+        if (codeFrame != currentCodeFrame) {
+            throw new RuntimeException("Internal error: CodeFrame mismatch.");
+        }
+    }
+
+    /**
+     * We split a {@link String} by "#" and "$", and then look at each part.
+     * Example:
+     *
+     *  s:    "abcdefghijklmnop #name abcdefgh${var_name} 12345#{name2}_con $field_name something"
+     *  parts: --------0-------- ------1------ --------2------- ------3----- ----------4---------
+     *  start: ^                 ^             ^                ^            ^
+     *  next:                   ^             ^                ^            ^                    ^
+     *         none             hashtag       dollar           hashtag      dollar               done
+     */
+    private void renderStringWithDollarAndHashtagReplacements(final String s) {
+        int count = 0; // First part needs special handling
+        int start = 0;
+        boolean startIsAfterDollar = false;
+        do {
+            // Find the next "$" or "#", after start.
+            int dollar  = s.indexOf("$", start);
+            int hashtag = s.indexOf("#", start);
+            // If the character was not found, we want to have the rest of the
+            // String s, so instead of "-1" take the end/length of the String.
+            dollar  = (dollar == -1)  ? s.length() : dollar;
+            hashtag = (hashtag == -1) ? s.length() : hashtag;
+            // Take the first one.
+            int next = Math.min(dollar, hashtag);
+            String part = s.substring(start, next);
+
+            if (count == 0) {
+                // First part has no "#" or "$" before it.
+                currentCodeFrame.addString(part);
+            } else {
+                // All others must do the replacement.
+                renderStringWithDollarAndHashtagReplacementsPart(s, part, startIsAfterDollar);
+            }
+
+            if (next == s.length()) {
+                // No new "#" or "$" was found, we just processed the rest of the String,
+                // terminate now.
+                return;
+            }
+            start = next + 1; // skip over the "#" or "$"
+            startIsAfterDollar = next == dollar; // remember which character we just split with
+            count++;
+        } while (true);
+    }
+
+    /**
+     * We are parsing a part now. Before the part, there was either a "#" or "$":
+     * isDollar = false:
+     *   "#part"
+     *   "#name abcdefgh"
+     *     ----
+     *   "#{name2}_con "
+     *     -------
+     *
+     * isDollar = true:
+     *   "$part"
+     *   "${var_name} 12345"
+     *     ----------
+     *   "$field_name something"
+     *     ----------
+     *
+     * We now want to find the name pattern at the beginning of the part, and replace
+     * it according to the hashtag or dollar replacement strategy.
+     */
+    private void renderStringWithDollarAndHashtagReplacementsPart(final String s, final String part, final boolean isDollar) {
+        Matcher matcher = NAME_PATTERN.matcher(part);
+        // If the string has a "#" or "$" that is not followed by a correct name
+        // pattern, then the matcher will not match. These can be cases like:
+        //   "##name" -> the first hashtag leads to an empty part, and an empty name.
+        //   "#1name" -> the name pattern does not allow a digit as the first character.
+        //   "anything#" -> a hashtag at the end of the string leads to an empty name.
+        if (!matcher.find()) {
+            String replacement = isDollar ? "$" : "#";
+            throw new RendererException("Is not a valid '" + replacement + "' replacement pattern: '" +
+                                        replacement + part + "' in '" + s + "'.");
+        }
+        // We know that there is a correct pattern, and now we replace it.
+        currentCodeFrame.addString(matcher.replaceFirst(
+            (MatchResult result) -> {
+                // There are two groups: (1) for "name" and (2) for "{name}"
+                String name = result.group(1) != null ? result.group(1) : result.group(2);
+                if (isDollar) {
+                    return $(name);
+                } else {
+                    // replaceFirst needs some special escaping of backslashes and ollar signs.
+                    return getHashtagReplacement(name).replace("\\", "\\\\").replace("$", "\\$");
+                }
+            }
+        ));
+    }
+
+    boolean isAnchored(Hook hook) {
+        return currentCodeFrame.codeFrameForHook(hook) != null;
+    }
+
+    private CodeFrame codeFrameForHook(Hook hook) {
+        CodeFrame codeFrame = currentCodeFrame.codeFrameForHook(hook);
+        if (codeFrame == null) {
+            throw new RendererException("Hook '" + hook.name() + "' was referenced but not found!");
+        }
+        return codeFrame;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/RendererException.java b/test/hotspot/jtreg/compiler/lib/template_framework/RendererException.java
new file mode 100644
index 00000000000..2ab542b6fe8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/RendererException.java
@@ -0,0 +1,35 @@
+/*
+ * 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.template_framework;
+
+/**
+ * This exception is thrown when something goes wrong during Template
+ * rendering, or in the use of any of its static methods.
+ * It most likely indicates a wrong use of the Templates.
+ */
+public class RendererException extends RuntimeException {
+    RendererException(String message) {
+        super(message);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/StringToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/StringToken.java
new file mode 100644
index 00000000000..4926748e51a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/StringToken.java
@@ -0,0 +1,26 @@
+/*
+ * 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.template_framework;
+
+record StringToken(String value) implements Token {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java b/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
new file mode 100644
index 00000000000..866ac6dbfb8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/StructuralName.java
@@ -0,0 +1,200 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+
+/**
+ * {@link StructuralName}s represent things like method and class names, and can be added to the local
+ * scope with {@link Template#addStructuralName}, and accessed with {@link Template#structuralNames}, from where
+ * count, list or even sample random {@link StructuralName}s. Every {@link StructuralName} has a {@link StructuralName.Type},
+ * so that sampling can be restricted to these types.
+ *
+ * <p>
+ * For field and variable names and alike, there are the analogous {@link DataName}s.
+ *
+ * @param name The {@link String} name used in code.
+ * @param type The type of the {@link StructuralName}.
+ * @param weight The weight of the {@link StructuralName}, it corresponds to the probability of choosing this
+ *               {@link StructuralName} when sampling later on.
+ */
+public record StructuralName(String name, StructuralName.Type type, int weight) implements Name {
+
+    /**
+     * Creates a new {@link StructuralName}.
+     */
+    public StructuralName {
+    }
+
+    /**
+     * The interface for the type of a {@link StructuralName}.
+     */
+    public interface Type extends Name.Type {
+        /**
+         * The name of the type, that can be used in code.
+         *
+         * @return The {@link String} representation of the type, that can be used in code.
+         */
+        String name();
+
+        /**
+         * Defines the subtype relationship with other types, which is used to filter {@link StructuralName}s
+         * in {@link FilteredSet#exactOf}, {@link FilteredSet#subtypeOf}, and {@link FilteredSet#supertypeOf}.
+         *
+         * @param other The other type, where we check if it is the supertype of {@code 'this'}.
+         * @return If {@code 'this'} is a subtype of {@code 'other'}.
+         */
+        boolean isSubtypeOf(StructuralName.Type other);
+    }
+
+    /**
+     * The {@link FilteredSet} represents a filtered set of {@link StructuralName}s in the current scope.
+     * It can be obtained with {@link Template#structuralNames}. It can be used to count the
+     * available {@link StructuralName}s, or sample a random {@link StructuralName} according to the
+     * weights of the {@link StructuralName}s in the filtered set.
+     * Note: The {@link FilteredSet} is only a filtered view on the set of {@link StructuralName}s,
+     * and may return different results in different contexts.
+     */
+    public static final class FilteredSet {
+        private final StructuralName.Type subtype;
+        private final StructuralName.Type supertype;
+
+        FilteredSet(StructuralName.Type subtype, StructuralName.Type supertype) {
+            this.subtype = subtype;
+            this.supertype = supertype;
+        }
+
+        FilteredSet() {
+            this(null, null);
+        }
+
+        NameSet.Predicate predicate() {
+            if (subtype == null && supertype == null) {
+                throw new UnsupportedOperationException("Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
+            }
+            return (Name name) -> {
+                if (!(name instanceof StructuralName structuralName)) { return false; }
+                if (subtype != null && !structuralName.type().isSubtypeOf(subtype)) { return false; }
+                if (supertype != null && !supertype.isSubtypeOf(structuralName.type())) { return false; }
+                return true;
+            };
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link StructuralName}s must be subtypes of {@code type}.
+         *
+         * @param type The type of which all {@link StructuralName}s must be subtypes of.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #subtypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet subtypeOf(StructuralName.Type type) {
+            if (subtype != null) {
+                throw new UnsupportedOperationException("Cannot constrain to subtype " + type + ", is already constrained: " + subtype);
+            }
+            return new FilteredSet(type, supertype);
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link StructuralName}s must be supertypes of {@code type}.
+         *
+         * @param type The type of which all {@link StructuralName}s must be supertype of.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet supertypeOf(StructuralName.Type type) {
+            if (supertype != null) {
+                throw new UnsupportedOperationException("Cannot constrain to supertype " + type + ", is already constrained: " + supertype);
+            }
+            return new FilteredSet(subtype, type);
+        }
+
+        /**
+         * Create a {@link FilteredSet}, where all {@link StructuralName}s must be of exact {@code type},
+         * hence it must be both subtype and supertype thereof.
+         *
+         * @param type The type of which all {@link StructuralName}s must be.
+         * @return The updated filtered set.
+         * @throws UnsupportedOperationException If this {@link FilteredSet} was already filtered with
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public FilteredSet exactOf(StructuralName.Type type) {
+            return subtypeOf(type).supertypeOf(type);
+        }
+
+        /**
+         * Samples a random {@link StructuralName} from the filtered set, according to the weights
+         * of the contained {@link StructuralName}s.
+         *
+         * @return The sampled {@link StructuralName}.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         * @throws RendererException If the set was empty.
+         */
+        public StructuralName sample() {
+            StructuralName n = (StructuralName)Renderer.getCurrent().sampleName(predicate());
+            if (n == null) {
+                String msg1 = (subtype == null) ? "" : " subtypeOf(" + subtype + ")";
+                String msg2 = (supertype == null) ? "" : " supertypeOf(" + supertype + ")";
+                throw new RendererException("No variable:" + msg1 + msg2 + ".");
+            }
+            return n;
+        }
+
+        /**
+         * Counts the number of {@link StructuralName}s in the filtered set.
+         *
+         * @return The number of {@link StructuralName}s in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public int count() {
+            return Renderer.getCurrent().countNames(predicate());
+        }
+
+        /**
+         * Checks if there are any {@link StructuralName}s in the filtered set.
+         *
+         * @return Returns {@code true} iff there is at least one {@link StructuralName} in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public boolean hasAny() {
+            return Renderer.getCurrent().hasAnyNames(predicate());
+        }
+
+        /**
+         * Collects all {@link StructuralName}s in the filtered set.
+         *
+         * @return A {@link List} of all {@link StructuralName}s in the filtered set.
+         * @throws UnsupportedOperationException If the type was not constrained with either of
+         *                                       {@link #subtypeOf}, {@link #supertypeOf} or {@link #exactOf}.
+         */
+        public List<StructuralName> toList() {
+            List<Name> list = Renderer.getCurrent().listNames(predicate());
+            return list.stream().map(n -> (StructuralName)n).toList();
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Template.java b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
new file mode 100644
index 00000000000..f01c5ccffd3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
@@ -0,0 +1,844 @@
+/*
+ * 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.template_framework;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import java.util.List;
+
+import compiler.lib.compile_framework.CompileFramework;
+import compiler.lib.ir_framework.TestFramework;
+
+/**
+ * The Template Framework allows the generation of code with Templates. The goal is that these Templates are
+ * easy to write, and allow regression tests to cover a larger scope, and to make template based fuzzing easy
+ * to extend.
+ *
+ * <p>
+ * <strong>Motivation:</strong> We want to make it easy to generate variants of tests. Often, we would like to
+ * have a set of tests, corresponding to a set of types, a set of operators, a set of constants, etc. Writing all
+ * the tests by hand is cumbersome or even impossible. When generating such tests with scripts, it would be
+ * preferable if the code generation happens automatically, and the generator script was checked into the code
+ * base. Code generation can go beyond simple regression tests, and one might want to generate random code from
+ * a list of possible templates, to fuzz individual Java features and compiler optimizations.
+ *
+ * <p>
+ * The Template Framework provides a facility to generate code with Templates. A Template is essentially a list
+ * of tokens that are concatenated (i.e. rendered) to a {@link String}. The Templates can have "holes", which are
+ * filled (replaced) by different values at each Template instantiation. For example, these "holes" can
+ * be filled with different types, operators or constants. Templates can also be nested, allowing a modular
+ * use of Templates.
+ *
+ * <p>
+ * Once we rendered the source code to a {@link String}, we can compile it with the {@link CompileFramework}.
+ *
+ * <p>
+ * <strong>Example:</strong>
+ * The following snippets are from the example test {@code TestAdvanced.java}.
+ * First, we define a template that generates a {@code @Test} method for a given type, operator and
+ * constant generator. We define two constants {@code con1} and {@code con2}, and then use a multiline
+ * string with hashtags {@code #} (i.e. "holes")  that are then replaced by the template arguments and the
+ * {@link #let} definitions.
+ *
+ * <p>
+ * {@snippet lang=java :
+ * var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> body(
+ *     let("con1", generator.next()),
+ *     let("con2", generator.next()),
+ *     """
+ *     // #typeName #operator #con1 #con2
+ *     public static #typeName $GOLD = $test();
+ *
+ *     @Test
+ *     public static #typeName $test() {
+ *         return (#typeName)(#con1 #operator #con2);
+ *     }
+ *
+ *     @Check(test = "$test")
+ *     public static void $check(#typeName result) {
+ *         Verify.checkEQ(result, $GOLD);
+ *     }
+ *     """
+ * ));
+ * }
+ *
+ * <p>
+ * To get an executable test, we define a {@link Template} that produces a class body with a main method. The Template
+ * takes a list of types, and calls the {@code testTemplate} defined above for each type and operator. We use
+ * the {@link TestFramework} to call our {@code @Test} methods.
+ *
+ * <p>
+ * {@snippet lang=java :
+ * var classTemplate = Template.make("types", (List<Type> types) -> body(
+ *     let("classpath", comp.getEscapedClassPathOfCompiledClasses()),
+ *     """
+ *     package p.xyz;
+ *
+ *     import compiler.lib.ir_framework.*;
+ *     import compiler.lib.verify.*;
+ *
+ *     public class InnerTest {
+ *         public static void main() {
+ *             // Set the classpath, so that the TestFramework test VM knows where
+ *             // the CompileFramework put the class files of the compiled source code.
+ *             TestFramework framework = new TestFramework(InnerTest.class);
+ *             framework.addFlags("-classpath", "#classpath");
+ *             framework.start();
+ *         }
+ *
+ *     """,
+ *     // Call the testTemplate for each type and operator, generating a
+ *     // list of lists of TemplateToken:
+ *     types.stream().map((Type type) ->
+ *         type.operators().stream().map((String operator) ->
+ *             testTemplate.asToken(type.name(), operator, type.generator())).toList()
+ *     ).toList(),
+ *     """
+ *     }
+ *     """
+ * ));
+ * }
+ *
+ * <p>
+ * Finally, we generate the list of types, and pass it to the class template:
+ *
+ * <p>
+ * {@snippet lang=java :
+ * List<Type> types = List.of(
+ *     new Type("byte",   GEN_BYTE::next,   List.of("+", "-", "*", "&", "|", "^")),
+ *     new Type("char",   GEN_CHAR::next,   List.of("+", "-", "*", "&", "|", "^")),
+ *     new Type("short",  GEN_SHORT::next,  List.of("+", "-", "*", "&", "|", "^")),
+ *     new Type("int",    GEN_INT::next,    List.of("+", "-", "*", "&", "|", "^")),
+ *     new Type("long",   GEN_LONG::next,   List.of("+", "-", "*", "&", "|", "^")),
+ *     new Type("float",  GEN_FLOAT::next,  List.of("+", "-", "*", "/")),
+ *     new Type("double", GEN_DOUBLE::next, List.of("+", "-", "*", "/"))
+ * );
+ *
+ * // Use the template with one argument, and render it to a String.
+ * return classTemplate.render(types);
+ * }
+ *
+ * <p>
+ * <strong>Details:</strong>
+ * <p>
+ * A {@link Template} can have zero or more arguments. A template can be created with {@code make} methods like
+ * {@link Template#make(String, Function)}. For each number of arguments there is an implementation
+ * (e.g. {@link Template.TwoArgs} for two arguments). This allows the use of generics for the
+ * {@link Template} argument types which enables type checking of the {@link Template} arguments.
+ *  It is currently only allowed to use up to three arguments.
+ *
+ * <p>
+ * A {@link Template} can be rendered to a {@link String} (e.g. {@link Template.ZeroArgs#render()}).
+ * Alternatively, we can generate a {@link Token} (more specifically, a {@link TemplateToken}) with {@code asToken()}
+ * (e.g. {@link Template.ZeroArgs#asToken()}), and use the {@link Token} inside another {@link Template#body}.
+ *
+ * <p>
+ * Ideally, we would have used <a href="https://openjdk.org/jeps/430">string templates</a> to inject these Template
+ * arguments into the strings. But since string templates are not (yet) available, the Templates provide
+ * <strong>hashtag replacements</strong> in the {@link String}s: the Template argument names are captured, and
+ * the argument values automatically replace any {@code "#name"} in the {@link String}s. See the different overloads
+ * of {@link #make} for examples. Additional hashtag replacements can be defined with {@link #let}.
+ *
+ * <p>
+ * When using nested Templates, there can be collisions with identifiers (e.g. variable names and method names).
+ * For this, Templates provide <strong>dollar replacements</strong>, which automatically rename any
+ * {@code "$name"} in the {@link String} with a {@code "name_ID"}, where the {@code "ID"} is unique for every use of
+ * a Template. The dollar replacement can also be captured with {@link #$}, and passed to nested
+ * Templates, which allows sharing of these identifier names between Templates.
+ *
+ * <p>
+ * The dollar and hashtag names must have at least one character. The first character must be a letter
+ * or underscore (i.e. {@code a-zA-Z_}), the other characters can also be digits (i.e. {@code a-zA-Z0-9_}).
+ * One can use them with or without curly braces, e.g. {@code #name}, {@code #{name}}, {@code $name}, or
+ * {@code #{name}}.
+ *
+ * <p>
+ * A {@link TemplateToken} cannot just be used in {@link Template#body}, but it can also be
+ * {@link Hook#insert}ed to where a {@link Hook} was {@link Hook#anchor}ed earlier (in some outer scope of the code).
+ * For example, while generating code in a method, one can reach out to the scope of the class, and insert a
+ * new field, or define a utility method.
+ *
+ * <p>
+ * A {@link TemplateBinding} allows the recursive use of Templates. With the indirection of such a binding,
+ * a Template can reference itself.
+ *
+ * <p>
+ * The writer of recursive {@link Template}s must ensure that this recursion terminates. To unify the
+ * approach across {@link Template}s, we introduce the concept of {@link #fuel}. Templates are rendered starting
+ * with a limited amount of {@link #fuel} (default: 100, see {@link #DEFAULT_FUEL}), which is decreased at each
+ * Template nesting by a certain amount (default: 10, see {@link #DEFAULT_FUEL_COST}). The default fuel for a
+ * template can be changed when we {@code render()} it (e.g. {@link ZeroArgs#render(float)}) and the default
+ * fuel cost with {@link #setFuelCost}) when defining the {@link #body(Object...)}. Recursive templates are
+ * supposed to terminate once the {@link #fuel} is depleted (i.e. reaches zero).
+ *
+ * <p>
+ * Code generation can involve keeping track of fields and variables, as well as the scopes in which they
+ * are available, and if they are mutable or immutable. We model fields and variables with {@link DataName}s,
+ * which we can add to the current scope with {@link #addDataName}. We can access the {@link DataName}s with
+ * {@link #dataNames}. We can filter for {@link DataName}s of specific {@link DataName.Type}s, and then
+ * we can call {@link DataName.FilteredSet#count}, {@link DataName.FilteredSet#sample},
+ * {@link DataName.FilteredSet#toList}, etc. There are many use-cases for this mechanism, especially
+ * facilitating communication between the code of outer and inner {@link Template}s. Especially for fuzzing,
+ * it may be useful to be able to add fields and variables, and sample them randomly, to create a random data
+ * flow graph.
+ *
+ * <p>
+ * Similarly, we may want to model method and class names, and possibly other structural names. We model
+ * these names with {@link StructuralName}, which works analogously to {@link DataName}, except that they
+ * are not concerned about mutability.
+ *
+ * <p>
+ * When working with {@link DataName}s and {@link StructuralName}s, it is important to be aware of the
+ * relevant scopes, as well as the execution order of the {@link Template} lambdas and the evaluation
+ * of the {@link Template#body} tokens. When a {@link Template} is rendered, its lambda is invoked. In the
+ * lambda, we generate the tokens, and create the {@link Template#body}. Once the lambda returns, the
+ * tokens are evaluated one by one. While evaluating the tokens, the {@link Renderer} might encounter a nested
+ * {@link TemplateToken}, which in turn triggers the evaluation of that nested {@link Template}, i.e.
+ * the evaluation of its lambda and later the evaluation of its tokens. It is important to keep in mind
+ * that the lambda is always executed first, and the tokens are evaluated afterwards. A method like
+ * {@code dataNames(MUTABLE).exactOf(type).count()} is a method that is executed during the evaluation
+ * of the lambda. But a method like {@link #addDataName} returns a token, and does not immediately add
+ * the {@link DataName}. This ensures that the {@link DataName} is only inserted when the tokens are
+ * evaluated, so that it is inserted at the exact scope where we would expect it.
+ *
+ * <p>
+ * Let us look at the following example to better understand the execution order.
+ *
+ * <p>
+ * {@snippet lang=java :
+ * var testTemplate = Template.make(() -> body(
+ *     // The lambda has just been invoked.
+ *     // We count the DataNames and assign the count to the hashtag replacement "c1".
+ *     let("c1", dataNames(MUTABLE).exactOf(someType).count()),
+ *     // We want to define a DataName "v1", and create a token for it.
+ *     addDataName($("v1"), someType, MUTABLE),
+ *     // We count the DataNames again, but the count does NOT change compared to "c1".
+ *     // This is because the token for "v1" is only evaluated later.
+ *     let("c2", dataNames(MUTABLE).exactOf(someType).count()),
+ *     // Create a nested scope.
+ *     METHOD_HOOK.anchor(
+ *         // We want to define a DataName "v2", which is only valid inside this
+ *         // nested scope.
+ *         addDataName($("v2"), someType, MUTABLE),
+ *         // The count is still not different to "c1".
+ *         let("c3", dataNames(MUTABLE).exactOf(someType).count()),
+ *         // We nest a Template. This creates a TemplateToken, which is later evaluated.
+ *         // By the time the TemplateToken is evaluated, the tokens from above will
+ *         // be already evaluated. Hence, "v1" and "v2" are added by then, and if the
+ *         // "otherTemplate" were to count the DataNames, the count would be increased
+ *         // by 2 compared to "c1".
+ *         otherTemplate.asToken()
+ *     ),
+ *     // After closing the scope, "v2" is no longer available.
+ *     // The count is still the same as "c1", since "v1" is still only a token.
+ *     let("c4", dataNames(MUTABLE).exactOf(someType).count()),
+ *     // We nest another Template. Again, this creates a TemplateToken, which is only
+ *     // evaluated later. By that time, the token for "v1" is evaluated, and so the
+ *     // nested Template would observe an increment in the count.
+ *     anotherTemplate.asToken()
+ *     // By this point, all methods are called, and the tokens generated.
+ *     // The lambda returns the "body", which is all of the tokens that we just
+ *     // generated. After returning from the lambda, the tokens will be evaluated
+ *     // one by one.
+ * ));
+ * }
+
+ * <p>
+ * More examples for these functionalities can be found in {@code TestTutorial.java}, {@code TestSimple.java},
+ * and {@code TestAdvanced.java}, which all produce compilable Java code. Additional examples can be found in
+ * the tests, such as {@code TestTemplate.java} and {@code TestFormat.java}, which do not necessarily generate
+ * valid Java code, but generate deterministic Strings which are easier to verify, and may also serve as a
+ * reference when learning about these functionalities.
+ */
+public sealed interface Template permits Template.ZeroArgs,
+                                         Template.OneArg,
+                                         Template.TwoArgs,
+                                         Template.ThreeArgs {
+
+    /**
+     * A {@link Template} with no arguments.
+     *
+     * @param function The {@link Supplier} that creates the {@link TemplateBody}.
+     */
+    record ZeroArgs(Supplier<TemplateBody> function) implements Template {
+        TemplateBody instantiate() {
+            return function.get();
+        }
+
+        /**
+         * Creates a {@link TemplateToken} which can be used as a {@link Token} inside
+         * a {@link Template} for nested code generation.
+         *
+         * @return The {@link TemplateToken} to use the {@link Template} inside another
+         *         {@link Template}.
+         */
+        public TemplateToken asToken() {
+            return new TemplateToken.ZeroArgs(this);
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render() {
+            return new TemplateToken.ZeroArgs(this).render();
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param fuel The amount of fuel provided for recursive Template instantiations.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(float fuel) {
+            return new TemplateToken.ZeroArgs(this).render(fuel);
+        }
+    }
+
+    /**
+     * A {@link Template} with one argument.
+     *
+     * @param arg1Name The name of the (first) argument, used for hashtag replacements in the {@link Template}.
+     * @param <T1> The type of the (first) argument.
+     * @param function The {@link Function} that creates the {@link TemplateBody} given the template argument.
+     */
+    record OneArg<T1>(String arg1Name, Function<T1, TemplateBody> function) implements Template {
+        TemplateBody instantiate(T1 arg1) {
+            return function.apply(arg1);
+        }
+
+        /**
+         * Creates a {@link TemplateToken} which can be used as a {@link Token} inside
+         * a {@link Template} for nested code generation.
+         *
+         * @param arg1 The value for the (first) argument.
+         * @return The {@link TemplateToken} to use the {@link Template} inside another
+         *         {@link Template}.
+         */
+        public TemplateToken asToken(T1 arg1) {
+            return new TemplateToken.OneArg<>(this, arg1);
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(T1 arg1) {
+            return new TemplateToken.OneArg<>(this, arg1).render();
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @param fuel The amount of fuel provided for recursive Template instantiations.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(float fuel, T1 arg1) {
+            return new TemplateToken.OneArg<>(this, arg1).render(fuel);
+        }
+    }
+
+    /**
+     * A {@link Template} with two arguments.
+     *
+     * @param arg1Name The name of the first argument, used for hashtag replacements in the {@link Template}.
+     * @param arg2Name The name of the second argument, used for hashtag replacements in the {@link Template}.
+     * @param <T1> The type of the first argument.
+     * @param <T2> The type of the second argument.
+     * @param function The {@link BiFunction} that creates the {@link TemplateBody} given the template arguments.
+     */
+    record TwoArgs<T1, T2>(String arg1Name, String arg2Name, BiFunction<T1, T2, TemplateBody> function) implements Template {
+        TemplateBody instantiate(T1 arg1, T2 arg2) {
+            return function.apply(arg1, arg2);
+        }
+
+        /**
+         * Creates a {@link TemplateToken} which can be used as a {@link Token} inside
+         * a {@link Template} for nested code generation.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @return The {@link TemplateToken} to use the {@link Template} inside another
+         *         {@link Template}.
+         */
+        public TemplateToken asToken(T1 arg1, T2 arg2) {
+            return new TemplateToken.TwoArgs<>(this, arg1, arg2);
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(T1 arg1, T2 arg2) {
+            return new TemplateToken.TwoArgs<>(this, arg1, arg2).render();
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @param fuel The amount of fuel provided for recursive Template instantiations.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(float fuel, T1 arg1, T2 arg2) {
+            return new TemplateToken.TwoArgs<>(this, arg1, arg2).render(fuel);
+        }
+    }
+
+    /**
+     * Interface for function with three arguments.
+     *
+     * @param <T> Type of the first argument.
+     * @param <U> Type of the second argument.
+     * @param <V> Type of the third argument.
+     * @param <R> Type of the return value.
+     */
+    @FunctionalInterface
+    interface TriFunction<T, U, V, R> {
+
+        /**
+         * Function definition for the three argument functions.
+         *
+         * @param t The first argument.
+         * @param u The second argument.
+         * @param v The third argument.
+         * @return Return value of the three argument function.
+         */
+        R apply(T t, U u, V v);
+    }
+
+    /**
+     * A {@link Template} with three arguments.
+     *
+     * @param arg1Name The name of the first argument, used for hashtag replacements in the {@link Template}.
+     * @param arg2Name The name of the second argument, used for hashtag replacements in the {@link Template}.
+     * @param arg3Name The name of the third argument, used for hashtag replacements in the {@link Template}.
+     * @param <T1> The type of the first argument.
+     * @param <T2> The type of the second argument.
+     * @param <T3> The type of the third argument.
+     * @param function The function with three arguments that creates the {@link TemplateBody} given the template arguments.
+     */
+    record ThreeArgs<T1, T2, T3>(String arg1Name, String arg2Name, String arg3Name, TriFunction<T1, T2, T3, TemplateBody> function) implements Template {
+        TemplateBody instantiate(T1 arg1, T2 arg2, T3 arg3) {
+            return function.apply(arg1, arg2, arg3);
+        }
+
+        /**
+         * Creates a {@link TemplateToken} which can be used as a {@link Token} inside
+         * a {@link Template} for nested code generation.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @param arg3 The value for the third argument.
+         * @return The {@link TemplateToken} to use the {@link Template} inside another
+         *         {@link Template}.
+         */
+        public TemplateToken asToken(T1 arg1, T2 arg2, T3 arg3) {
+            return new TemplateToken.ThreeArgs<>(this, arg1, arg2, arg3);
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @param arg3 The value for the third argument.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(T1 arg1, T2 arg2, T3 arg3) {
+            return new TemplateToken.ThreeArgs<>(this, arg1, arg2, arg3).render();
+        }
+
+        /**
+         * Renders the {@link Template} to a {@link String}.
+         *
+         * @param arg1 The value for the first argument.
+         * @param arg2 The value for the second argument.
+         * @param arg3 The value for the third argument.
+         * @param fuel The amount of fuel provided for recursive Template instantiations.
+         * @return The {@link String}, resulting from rendering the {@link Template}.
+         */
+        public String render(float fuel, T1 arg1, T2 arg2, T3 arg3) {
+            return new TemplateToken.ThreeArgs<>(this, arg1, arg2, arg3).render(fuel);
+        }
+    }
+
+    /**
+     * Creates a {@link Template} with no arguments.
+     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     *
+     * <p>
+     * Example:
+     * {@snippet lang=java :
+     * var template = Template.make(() -> body(
+     *     """
+     *     Multi-line string or other tokens.
+     *     """
+     * ));
+     * }
+     *
+     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @return A {@link Template} with zero arguments.
+     */
+    static Template.ZeroArgs make(Supplier<TemplateBody> body) {
+        return new Template.ZeroArgs(body);
+    }
+
+    /**
+     * Creates a {@link Template} with one argument.
+     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * Good practice but not enforced but not enforced: {@code arg1Name} should match the lambda argument name.
+     *
+     * <p>
+     * Here is an example with template argument {@code 'a'}, captured once as string name
+     * for use in hashtag replacements, and captured once as lambda argument with the corresponding type
+     * of the generic argument.
+     * {@snippet lang=java :
+     * var template = Template.make("a", (Integer a) -> body(
+     *     """
+     *     Multi-line string or other tokens.
+     *     We can use the hashtag replacement #a to directly insert the String value of a.
+     *     """,
+     *     "We can also use the captured parameter of a: " + a
+     * ));
+     * }
+     *
+     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param <T1> Type of the (first) argument.
+     * @param arg1Name The name of the (first) argument for hashtag replacement.
+     * @return A {@link Template} with one argument.
+     */
+    static <T1> Template.OneArg<T1> make(String arg1Name, Function<T1, TemplateBody> body) {
+        return new Template.OneArg<>(arg1Name, body);
+    }
+
+    /**
+     * Creates a {@link Template} with two arguments.
+     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * Good practice but not enforced: {@code arg1Name} and {@code arg2Name} should match the lambda argument names.
+     *
+     * <p>
+     * Here is an example with template arguments {@code 'a'} and {@code 'b'}, captured once as string names
+     * for use in hashtag replacements, and captured once as lambda arguments with the corresponding types
+     * of the generic arguments.
+     * {@snippet lang=java :
+     * var template = Template.make("a", "b", (Integer a, String b) -> body(
+     *     """
+     *     Multi-line string or other tokens.
+     *     We can use the hashtag replacement #a and #b to directly insert the String value of a and b.
+     *     """,
+     *     "We can also use the captured parameter of a and b: " + a + " and " + b
+     * ));
+     * }
+     *
+     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param <T1> Type of the first argument.
+     * @param arg1Name The name of the first argument for hashtag replacement.
+     * @param <T2> Type of the second argument.
+     * @param arg2Name The name of the second argument for hashtag replacement.
+     * @return A {@link Template} with two arguments.
+     */
+    static <T1, T2> Template.TwoArgs<T1, T2> make(String arg1Name, String arg2Name, BiFunction<T1, T2, TemplateBody> body) {
+        return new Template.TwoArgs<>(arg1Name, arg2Name, body);
+    }
+
+    /**
+     * Creates a {@link Template} with three arguments.
+     * See {@link #body} for more details about how to construct a Template with {@link Token}s.
+     * Good practice but not enforced: {@code arg1Name}, {@code arg2Name}, and {@code arg3Name} should match the lambda argument names.
+     *
+     * @param body The {@link TemplateBody} created by {@link Template#body}.
+     * @param <T1> Type of the first argument.
+     * @param arg1Name The name of the first argument for hashtag replacement.
+     * @param <T2> Type of the second argument.
+     * @param arg2Name The name of the second argument for hashtag replacement.
+     * @param <T3> Type of the third argument.
+     * @param arg3Name The name of the third argument for hashtag replacement.
+     * @return A {@link Template} with three arguments.
+     */
+    static <T1, T2, T3> Template.ThreeArgs<T1, T2, T3> make(String arg1Name, String arg2Name, String arg3Name, Template.TriFunction<T1, T2, T3, TemplateBody> body) {
+        return new Template.ThreeArgs<>(arg1Name, arg2Name, arg3Name, body);
+    }
+
+    /**
+     * Creates a {@link TemplateBody} from a list of tokens, which can be {@link String}s,
+     * boxed primitive types (for example {@link Integer} or auto-boxed {@code int}), any {@link Token},
+     * or {@link List}s of any of these.
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make(() -> body(
+     *     """
+     *     Multi-line string
+     *     """,
+     *     "normal string ", Integer.valueOf(3), 3, Float.valueOf(1.5f), 1.5f,
+     *     List.of("abc", "def"),
+     *     nestedTemplate.asToken(42)
+     * ));
+     * }
+     *
+     * @param tokens A list of tokens, which can be {@link String}s, boxed primitive types
+     *               (for example {@link Integer}), any {@link Token}, or {@link List}s
+     *               of any of these.
+     * @return The {@link TemplateBody} which captures the list of validated {@link Token}s.
+     * @throws IllegalArgumentException if the list of tokens contains an unexpected object.
+     */
+    static TemplateBody body(Object... tokens) {
+        return new TemplateBody(Token.parse(tokens));
+    }
+
+    /**
+     * Retrieves the dollar replacement of the {@code 'name'} for the
+     * current Template that is being instantiated. It returns the same
+     * dollar replacement as the string use {@code "$name"}.
+     *
+     * <p>
+     * Here is an example where a Template creates a local variable {@code 'var'},
+     * with an implicit dollar replacement, and then captures that dollar replacement
+     * using {@link #$} for the use inside a nested template.
+     * {@snippet lang=java :
+     * var template = Template.make(() -> body(
+     *     """
+     *     int $var = 42;
+     *     """,
+     *     otherTemplate.asToken($("var"))
+     * ));
+     * }
+     *
+     * @param name The {@link String} name of the name.
+     * @return The dollar replacement for the {@code 'name'}.
+     */
+    static String $(String name) {
+        return Renderer.getCurrent().$(name);
+    }
+
+    /**
+     * Define a hashtag replacement for {@code "#key"}, with a specific value.
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make("a", (Integer a) -> body(
+     *     let("b", a * 5),
+     *     """
+     *     System.out.println("Use a and b with hashtag replacement: #a and #b");
+     *     """
+     * ));
+     * }
+     *
+     * @param key Name for the hashtag replacement.
+     * @param value The value that the hashtag is replaced with.
+     * @return A token that does nothing, so that the {@link #let} can easily be put in a list of tokens
+     *         inside a {@link Template#body}.
+     * @throws RendererException if there is a duplicate hashtag {@code key}.
+     */
+    static Token let(String key, Object value) {
+        Renderer.getCurrent().addHashtagReplacement(key, value);
+        return new NothingToken();
+    }
+
+    /**
+     * Define a hashtag replacement for {@code "#key"}, with a specific value, which is also captured
+     * by the provided {@code function} with type {@code <T>}.
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var template = Template.make("a", (Integer a) -> let("b", a * 2, (Integer b) -> body(
+     *     """
+     *     System.out.println("Use a and b with hashtag replacement: #a and #b");
+     *     """,
+     *     "System.out.println(\"Use a and b as capture variables:\"" + a + " and " + b + ");\n"
+     * )));
+     * }
+     *
+     * @param key Name for the hashtag replacement.
+     * @param value The value that the hashtag is replaced with.
+     * @param <T> The type of the value.
+     * @param function The function that is applied with the provided {@code value}.
+     * @return A {@link TemplateBody}.
+     * @throws RendererException if there is a duplicate hashtag {@code key}.
+     */
+    static <T> TemplateBody let(String key, T value, Function<T, TemplateBody> function) {
+        Renderer.getCurrent().addHashtagReplacement(key, value);
+        return function.apply(value);
+    }
+
+    /**
+     * Default amount of fuel for Template rendering. It guides the nesting depth of Templates. Can be changed when
+     * rendering a template with {@code render(fuel)} (e.g. {@link ZeroArgs#render(float)}).
+     */
+    float DEFAULT_FUEL = 100.0f;
+
+    /**
+     * The default amount of fuel spent per Template. It is subtracted from the current {@link #fuel} at every
+     * nesting level, and once the {@link #fuel} reaches zero, the nesting is supposed to terminate. Can be changed
+     * with {@link #setFuelCost(float)} inside {@link #body(Object...)}.
+     */
+    float DEFAULT_FUEL_COST = 10.0f;
+
+    /**
+     * The current remaining fuel for nested Templates. Every level of Template nesting
+     * subtracts a certain amount of fuel, and when it reaches zero, Templates are supposed to
+     * stop nesting, if possible. This is not a hard rule, but a guide, and a mechanism to ensure
+     * termination in recursive Template instantiations.
+     *
+     * <p>
+     * Example of a recursive Template, which checks the remaining {@link #fuel} at every level,
+     * and terminates if it reaches zero. It also demonstrates the use of {@link TemplateBinding} for
+     * the recursive use of Templates. We {@link Template.OneArg#render} with {@code 30} total fuel,
+     * and spend {@code 5} fuel at each recursion level.
+     *
+     * <p>
+     * {@snippet lang=java :
+     * var binding = new TemplateBinding<Template.OneArg<Integer>>();
+     * var template = Template.make("depth", (Integer depth) -> body(
+     *     setFuelCost(5.0f),
+     *     let("fuel", fuel()),
+     *     """
+     *     System.out.println("Currently at depth #depth with fuel #fuel");
+     *     """,
+     *     (fuel() > 0) ? binding.get().asToken(depth + 1) :
+     *                    "// terminate\n"
+     * ));
+     * binding.bind(template);
+     * String code = template.render(30.0f, 0);
+     * }
+     *
+     * @return The amount of fuel left for nested Template use.
+     */
+    static float fuel() {
+        return Renderer.getCurrent().fuel();
+    }
+
+    /**
+     * Changes the amount of fuel used for the current Template, where the default is
+     * {@link Template#DEFAULT_FUEL_COST}.
+     *
+     * @param fuelCost The amount of fuel used for the current Template.
+     * @return A token for convenient use in {@link Template#body}.
+     */
+    static Token setFuelCost(float fuelCost) {
+        Renderer.getCurrent().setFuelCost(fuelCost);
+        return new NothingToken();
+    }
+
+    /**
+     * Add a {@link DataName} in the current scope, that is the innermost of either
+     * {@link Template#body} or {@link Hook#anchor}.
+     *
+     * @param name The name of the {@link DataName}, i.e. the {@link String} used in code.
+     * @param type The type of the {@link DataName}.
+     * @param mutability Indicates if the {@link DataName} is to be mutable or immutable,
+     *                   i.e. if we intend to use the {@link DataName} only for reading
+     *                   or if we also allow it to be mutated.
+     * @param weight The weight of the {@link DataName}, which correlates to the probability
+     *               of this {@link DataName} being chosen when we sample.
+     *               Must be a value from 1 to 1000.
+     * @return The token that performs the defining action.
+     */
+    static Token addDataName(String name, DataName.Type type, DataName.Mutability mutability, int weight) {
+        if (mutability != DataName.Mutability.MUTABLE &&
+            mutability != DataName.Mutability.IMMUTABLE) {
+            throw new IllegalArgumentException("Unexpected mutability: " + mutability);
+        }
+        boolean mutable = mutability == DataName.Mutability.MUTABLE;
+        if (weight <= 0 || 1000 < weight) {
+            throw new IllegalArgumentException("Unexpected weight: " + weight);
+        }
+        return new AddNameToken(new DataName(name, type, mutable, weight));
+    }
+
+    /**
+     * Add a {@link DataName} in the current scope, that is the innermost of either
+     * {@link Template#body} or {@link Hook#anchor}, with a {@code weight} of 1.
+     *
+     * @param name The name of the {@link DataName}, i.e. the {@link String} used in code.
+     * @param type The type of the {@link DataName}.
+     * @param mutability Indicates if the {@link DataName} is to be mutable or immutable,
+     *                   i.e. if we intend to use the {@link DataName} only for reading
+     *                   or if we also allow it to be mutated.
+     * @return The token that performs the defining action.
+     */
+    static Token addDataName(String name, DataName.Type type, DataName.Mutability mutability) {
+        return addDataName(name, type, mutability, 1);
+    }
+
+    /**
+     * Access the set of {@link DataName}s, for sampling, counting, etc.
+     *
+     * @param mutability Indicates if we only sample from mutable, immutable or either {@link DataName}s.
+     * @return A view on the {@link DataName}s, on which we can sample, count, etc.
+     */
+    static DataName.FilteredSet dataNames(DataName.Mutability mutability) {
+        return new DataName.FilteredSet(mutability);
+    }
+
+    /**
+     * Add a {@link StructuralName} in the current scope, that is the innermost of either
+     * {@link Template#body} or {@link Hook#anchor}.
+     *
+     * @param name The name of the {@link StructuralName}, i.e. the {@link String} used in code.
+     * @param type The type of the {@link StructuralName}.
+     * @param weight The weight of the {@link StructuralName}, which correlates to the probability
+     *               of this {@link StructuralName} being chosen when we sample.
+     *               Must be a value from 1 to 1000.
+     * @return The token that performs the defining action.
+     */
+    static Token addStructuralName(String name, StructuralName.Type type, int weight) {
+        if (weight <= 0 || 1000 < weight) {
+            throw new IllegalArgumentException("Unexpected weight: " + weight);
+        }
+        return new AddNameToken(new StructuralName(name, type, weight));
+    }
+
+    /**
+     * Add a {@link StructuralName} in the current scope, that is the innermost of either
+     * {@link Template#body} or {@link Hook#anchor}, with a {@code weight} of 1.
+     *
+     * @param name The name of the {@link StructuralName}, i.e. the {@link String} used in code.
+     * @param type The type of the {@link StructuralName}.
+     * @return The token that performs the defining action.
+     */
+    static Token addStructuralName(String name, StructuralName.Type type) {
+        return addStructuralName(name, type, 1);
+    }
+
+    /**
+     * Access the set of {@link StructuralName}s, for sampling, counting, etc.
+     *
+     * @return A view on the {@link StructuralName}s, on which we can sample, count, etc.
+     */
+    static StructuralName.FilteredSet structuralNames() {
+        return new StructuralName.FilteredSet();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBinding.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBinding.java
new file mode 100644
index 00000000000..2073b788e71
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBinding.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.
+ */
+
+package compiler.lib.template_framework;
+
+/**
+ * To facilitate recursive uses of Templates, for example where a template uses
+ * itself and needs to be referenced before it is fully defined,
+ * one can use the indirection of a {@link TemplateBinding}. The {@link TemplateBinding}
+ * is allocated first without any Template bound to it yet. At this stage,
+ * it can be used with {@link #get} inside a Template. Later, we can {@link #bind}
+ * a Template to the binding, such that {@link #get} returns that bound
+ * Template.
+ *
+ * @param <T> Type of the template.
+ */
+public class TemplateBinding<T extends Template> {
+    private T template = null;
+
+    /**
+     * Creates a new {@link TemplateBinding} that has no Template bound to it yet.
+     */
+    public TemplateBinding() {}
+
+    /**
+     * Retrieve the Template that was previously bound to the binding.
+     *
+     * @return The Template that was previously bound with {@link #bind}.
+     * @throws RendererException if no Template was bound yet.
+     */
+    public T get() {
+        if (template == null) {
+            throw new RendererException("Cannot 'get' before 'bind'.");
+        }
+        return template;
+    }
+
+    /**
+     * Binds a Template for future reference using {@link #get}.
+     *
+     * @param template The Template to be bound.
+     * @throws RendererException if a Template was already bound.
+     */
+    public void bind(T template) {
+         if (this.template != null) {
+            throw new RendererException("Duplicate 'bind' not allowed.");
+        }
+        this.template = template;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java
new file mode 100644
index 00000000000..440766b3f79
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateBody.java
@@ -0,0 +1,34 @@
+/*
+ * 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.template_framework;
+
+import java.util.List;
+
+/**
+ * A Template generates a {@link TemplateBody}, which is a list of {@link Token}s,
+ * which are then later rendered to {@link String}s.
+ *
+ * @param tokens The list of {@link Token}s that are later rendered to {@link String}s.
+ */
+public record TemplateBody(List<Token> tokens) {}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.java
new file mode 100644
index 00000000000..cf8c4afb321
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateFrame.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.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The {@link TemplateFrame} is the frame for a {@link Template}, i.e. the corresponding
+ * {@link TemplateToken}. It ensures that each template use has its own unique {@link #id}
+ * used to deconflict names using {@link Template#$}. It also has a set of hashtag
+ * replacements, which combine the key-value pairs from the template argument and the
+ * {@link Template#let} definitions. The {@link #parent} relationship provides a trace
+ * for the use chain of templates. The {@link #fuel} is reduced over this chain, to give
+ * a heuristic on how much time is spent on the code from the template corresponding to
+ * the frame, and to give a termination criterion to avoid nesting templates too deeply.
+ *
+ * <p>
+ * See also {@link CodeFrame} for more explanations about the frames.
+ */
+class TemplateFrame {
+    final TemplateFrame parent;
+    private final int id;
+    private final Map<String, String> hashtagReplacements = new HashMap<>();
+    final float fuel;
+    private float fuelCost;
+
+    public static TemplateFrame makeBase(int id, float fuel) {
+        return new TemplateFrame(null, id, fuel, 0.0f);
+    }
+
+    public static TemplateFrame make(TemplateFrame parent, int id) {
+        return new TemplateFrame(parent, id, parent.fuel - parent.fuelCost, Template.DEFAULT_FUEL_COST);
+    }
+
+    private TemplateFrame(TemplateFrame parent, int id, float fuel, float fuelCost) {
+        this.parent = parent;
+        this.id = id;
+        this.fuel = fuel;
+        this.fuelCost = fuelCost;
+    }
+
+    public String $(String name) {
+        if (name == null) {
+            throw new RendererException("A '$' name should not be null.");
+        }
+        if (!Renderer.isValidHashtagOrDollarName(name)) {
+            throw new RendererException("Is not a valid '$' name: '" + name + "'.");
+        }
+        return name + "_" + id;
+    }
+
+    void addHashtagReplacement(String key, String value) {
+        if (key == null) {
+            throw new RendererException("A hashtag replacement should not be null.");
+        }
+        if (!Renderer.isValidHashtagOrDollarName(key)) {
+            throw new RendererException("Is not a valid hashtag replacement name: '" + key + "'.");
+        }
+        if (hashtagReplacements.putIfAbsent(key, value) != null) {
+            throw new RendererException("Duplicate hashtag replacement for #" + key);
+        }
+    }
+
+    String getHashtagReplacement(String key) {
+        if (!Renderer.isValidHashtagOrDollarName(key)) {
+            throw new RendererException("Is not a valid hashtag replacement name: '" + key + "'.");
+        }
+        if (hashtagReplacements.containsKey(key)) {
+            return hashtagReplacements.get(key);
+        }
+        throw new RendererException("Missing hashtag replacement for #" + key);
+    }
+
+    void setFuelCost(float fuelCost) {
+        this.fuelCost = fuelCost;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
new file mode 100644
index 00000000000..47262f152d4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/TemplateToken.java
@@ -0,0 +1,169 @@
+/*
+ * 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.template_framework;
+
+/**
+ * Represents a tokenized {@link Template} (after calling {@code asToken()}) ready for
+ * instantiation either as a {@link Token} inside another {@link Template} or as
+ * a {@link String} with {@link #render}.
+ */
+public sealed abstract class TemplateToken implements Token
+                                           permits TemplateToken.ZeroArgs,
+                                                   TemplateToken.OneArg,
+                                                   TemplateToken.TwoArgs,
+                                                   TemplateToken.ThreeArgs
+{
+    private TemplateToken() {}
+
+    /**
+     * Represents a tokenized zero-argument {@link Template} ready for instantiation
+     * either as a {@link Token} inside another {@link Template} or as a {@link String}
+     * with {@link #render}.
+     */
+    static final class ZeroArgs extends TemplateToken implements Token {
+        private final Template.ZeroArgs zeroArgs;
+
+        ZeroArgs(Template.ZeroArgs zeroArgs) {
+            this.zeroArgs = zeroArgs;
+        }
+
+        @Override
+        public TemplateBody instantiate() {
+            return zeroArgs.instantiate();
+        }
+
+        @Override
+        public void visitArguments(ArgumentVisitor visitor) {}
+    }
+
+    /**
+     * Represents a tokenized one-argument {@link Template}, already filled with arguments, ready for
+     * instantiation either as a {@link Token} inside another {@link Template} or as a {@link String}
+     * with {@link #render}.
+     *
+     * @param <T1> The type of the (first) argument.
+     */
+    static final class OneArg<T1> extends TemplateToken implements Token {
+        private final Template.OneArg<T1> oneArgs;
+        private final T1 arg1;
+
+        OneArg(Template.OneArg<T1> oneArgs, T1 arg1) {
+            this.oneArgs = oneArgs;
+            this.arg1 = arg1;
+        }
+
+        @Override
+        public TemplateBody instantiate() {
+            return oneArgs.instantiate(arg1);
+        }
+
+        @Override
+        public void visitArguments(ArgumentVisitor visitor) {
+            visitor.visit(oneArgs.arg1Name(), arg1);
+        }
+    }
+
+    /**
+     * Represents a tokenized two-argument {@link Template}, already filled with arguments, ready for
+     * instantiation either as a {@link Token} inside another {@link Template} or as a {@link String}
+     * with {@link #render}.
+     *
+     * @param <T1> The type of the first argument.
+     * @param <T2> The type of the second argument.
+     */
+    static final class TwoArgs<T1, T2> extends TemplateToken implements Token {
+        private final Template.TwoArgs<T1, T2> twoArgs;
+        private final T1 arg1;
+        private final T2 arg2;
+
+        TwoArgs(Template.TwoArgs<T1, T2> twoArgs, T1 arg1, T2 arg2) {
+            this.twoArgs = twoArgs;
+            this.arg1 = arg1;
+            this.arg2 = arg2;
+        }
+
+        @Override
+        public TemplateBody instantiate() {
+            return twoArgs.instantiate(arg1, arg2);
+        }
+
+        @Override
+        public void visitArguments(ArgumentVisitor visitor) {
+            visitor.visit(twoArgs.arg1Name(), arg1);
+            visitor.visit(twoArgs.arg2Name(), arg2);
+        }
+    }
+
+    /**
+     * Represents a tokenized three-argument {@link TemplateToken}, already filled with arguments, ready for
+     * instantiation either as a {@link Token} inside another {@link Template} or as a {@link String}
+     * with {@link #render}.
+     *
+     * @param <T1> The type of the first argument.
+     * @param <T2> The type of the second argument.
+     * @param <T3> The type of the second argument.
+     */
+    static final class ThreeArgs<T1, T2, T3> extends TemplateToken implements Token {
+        private final Template.ThreeArgs<T1, T2, T3> threeArgs;
+        private final T1 arg1;
+        private final T2 arg2;
+        private final T3 arg3;
+
+        ThreeArgs(Template.ThreeArgs<T1, T2, T3> threeArgs, T1 arg1, T2 arg2, T3 arg3) {
+            this.threeArgs = threeArgs;
+            this.arg1 = arg1;
+            this.arg2 = arg2;
+            this.arg3 = arg3;
+        }
+
+        @Override
+        public TemplateBody instantiate() {
+            return threeArgs.instantiate(arg1, arg2, arg3);
+        }
+
+        @Override
+        public void visitArguments(ArgumentVisitor visitor) {
+            visitor.visit(threeArgs.arg1Name(), arg1);
+            visitor.visit(threeArgs.arg2Name(), arg2);
+            visitor.visit(threeArgs.arg3Name(), arg3);
+        }
+    }
+
+    abstract TemplateBody instantiate();
+
+    @FunctionalInterface
+    interface ArgumentVisitor {
+        void visit(String name, Object value);
+    }
+
+    abstract void visitArguments(ArgumentVisitor visitor);
+
+    final String render() {
+        return Renderer.render(this);
+    }
+
+    final String render(float fuel) {
+        return Renderer.render(this, fuel);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Token.java b/test/hotspot/jtreg/compiler/lib/template_framework/Token.java
new file mode 100644
index 00000000000..dc750c7f79f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Token.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.
+ */
+
+package compiler.lib.template_framework;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The {@link Template#body} and {@link Hook#anchor} are given a list of tokens, which are either
+ * {@link Token}s or {@link String}s or some permitted boxed primitives. These are then parsed
+ * and all non-{@link Token}s are converted to {@link StringToken}s. The parsing also flattens
+ * {@link List}s.
+ */
+sealed interface Token permits StringToken,
+                               TemplateToken,
+                               TemplateToken.ZeroArgs,
+                               TemplateToken.OneArg,
+                               TemplateToken.TwoArgs,
+                               TemplateToken.ThreeArgs,
+                               HookAnchorToken,
+                               HookInsertToken,
+                               AddNameToken,
+                               NothingToken
+{
+    static List<Token> parse(Object[] objects) {
+        if (objects == null) {
+            throw new IllegalArgumentException("Unexpected tokens: null");
+        }
+        List<Token> outputList = new ArrayList<>();
+        parseToken(Arrays.asList(objects), outputList);
+        return outputList;
+    }
+
+    private static void parseList(List<?> inputList, List<Token> outputList) {
+        for (Object o : inputList) {
+            parseToken(o, outputList);
+        }
+    }
+
+    private static void parseToken(Object o, List<Token> outputList) {
+        if (o == null) {
+            throw new IllegalArgumentException("Unexpected token: null");
+        }
+        switch (o) {
+            case Token t   -> outputList.add(t);
+            case String s  -> outputList.add(new StringToken(Renderer.format(s)));
+            case Integer s -> outputList.add(new StringToken(Renderer.format(s)));
+            case Long s    -> outputList.add(new StringToken(Renderer.format(s)));
+            case Double s  -> outputList.add(new StringToken(Renderer.format(s)));
+            case Float s   -> outputList.add(new StringToken(Renderer.format(s)));
+            case Boolean s -> outputList.add(new StringToken(Renderer.format(s)));
+            case List<?> l -> parseList(l, outputList);
+            default -> throw new IllegalArgumentException("Unexpected token: " + o);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/Hooks.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/Hooks.java
new file mode 100644
index 00000000000..410b790e3b5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/Hooks.java
@@ -0,0 +1,46 @@
+/*
+ * 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.template_framework.library;
+
+import compiler.lib.template_framework.Hook;
+
+/**
+ * Provides a hook for class and method scopes, to be used in Templates.
+ */
+public final class Hooks {
+    private Hooks() {} // Avoid instantiation and need for documentation.
+
+    /**
+     * Template {@link Hook} used by the Template Library for class scopes, to insert
+     * fields and methods.
+     */
+    public static final Hook CLASS_HOOK = new Hook("Class");
+
+    /**
+     * Template {@link Hook} used by the Template Library for method scopes, to insert
+     * local variables, and computations for local variables at the beginning of a
+     * method.
+     */
+    public static final Hook METHOD_HOOK = new Hook("Method");
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
new file mode 100644
index 00000000000..c5a4528f63d
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestAdvanced.java
@@ -0,0 +1,162 @@
+/*
+ * 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 8344942
+ * @summary Test simple use of Templates with the Compile Framework.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @compile ../../../compiler/lib/ir_framework/TestFramework.java
+ * @compile ../../../compiler/lib/verify/Verify.java
+ * @run main template_framework.examples.TestAdvanced
+ */
+
+package template_framework.examples;
+
+import java.util.List;
+import jdk.test.lib.Utils;
+
+import compiler.lib.generators.Generator;
+import compiler.lib.generators.Generators;
+import compiler.lib.generators.RestrictableGenerator;
+
+import compiler.lib.compile_framework.*;
+import compiler.lib.template_framework.Template;
+import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.let;
+
+/**
+ * This is a basic example for Templates, using them to cover a list of test variants.
+ * <p>
+ * The "@compile" command for JTREG is required so that the frameworks used in the Template code
+ * are compiled and available for the Test-VM.
+ * <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 TestAdvanced {
+    public static final RestrictableGenerator<Integer> GEN_BYTE = Generators.G.safeRestrict(Generators.G.ints(), Byte.MIN_VALUE, Byte.MAX_VALUE);
+    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<Integer> GEN_INT = Generators.G.ints();
+    public static final RestrictableGenerator<Long> GEN_LONG = Generators.G.longs();
+    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) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add a java source file.
+        comp.addJavaSourceCode("p.xyz.InnerTest", generate(comp));
+
+        // Compile the source file.
+        comp.compile();
+
+        // Object ret = p.xyz.InnerTest.main();
+        comp.invoke("p.xyz.InnerTest", "main", new Object[] {});
+    }
+
+    interface MyGenerator {
+        Object next();
+    }
+
+    record Type(String name, MyGenerator generator, List<String> operators) {}
+
+    // Generate a source Java file as String
+    public static String generate(CompileFramework comp) {
+
+        // The test template:
+        // - For a chosen type, operator, and generator.
+        // - The variable name "GOLD" and the test name "test" would get conflicts
+        //   if we instantiate the template multiple times. Thus, we use the $ prefix
+        //   so that the Template Framework can replace the names and make them unique
+        //   for each Template instantiation.
+        // - The GOLD value is computed at the beginning, hopefully by the interpreter.
+        // - The test method is eventually compiled, and the values are verified by the
+        //   check method.
+        var testTemplate = Template.make("typeName", "operator", "generator", (String typeName, String operator, MyGenerator generator) -> body(
+            let("con1", generator.next()),
+            let("con2", generator.next()),
+            """
+            // #typeName #operator #con1 #con2
+            public static #typeName $GOLD = $test();
+
+            @Test
+            public static #typeName $test() {
+                return (#typeName)(#con1 #operator #con2);
+            }
+
+            @Check(test = "$test")
+            public static void $check(#typeName result) {
+                Verify.checkEQ(result, $GOLD);
+            }
+            """
+        ));
+
+        // Template for the Class.
+        var classTemplate = Template.make("types", (List<Type> types) -> body(
+            let("classpath", comp.getEscapedClassPathOfCompiledClasses()),
+            """
+            package p.xyz;
+
+            import compiler.lib.ir_framework.*;
+            import compiler.lib.verify.*;
+
+            public class InnerTest {
+                public static void main() {
+                    TestFramework framework = new TestFramework(InnerTest.class);
+                    // Set the classpath, so that the TestFramework test VM knows where
+                    // the CompileFramework put the class files of the compiled source code.
+                    framework.addFlags("-classpath", "#classpath");
+                    framework.start();
+                }
+
+            """,
+            // Call the testTemplate for each type and operator, generating a
+            // list of lists of TemplateToken:
+            types.stream().map((Type type) ->
+                type.operators().stream().map((String operator) ->
+                    testTemplate.asToken(type.name(), operator, type.generator())).toList()
+            ).toList(),
+            """
+            }
+            """
+        ));
+
+        // For each type, we choose a list of operators that do not throw exceptions.
+        List<Type> types = List.of(
+            new Type("byte",   GEN_BYTE::next,   List.of("+", "-", "*", "&", "|", "^")),
+            new Type("char",   GEN_CHAR::next,   List.of("+", "-", "*", "&", "|", "^")),
+            new Type("short",  GEN_SHORT::next,  List.of("+", "-", "*", "&", "|", "^")),
+            new Type("int",    GEN_INT::next,    List.of("+", "-", "*", "&", "|", "^")),
+            new Type("long",   GEN_LONG::next,   List.of("+", "-", "*", "&", "|", "^")),
+            new Type("float",  GEN_FLOAT::next,  List.of("+", "-", "*", "/")),
+            new Type("double", GEN_DOUBLE::next, List.of("+", "-", "*", "/"))
+        );
+
+        // Use the template with one argument and render it to a String.
+        return classTemplate.render(types);
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.java
new file mode 100644
index 00000000000..e06671ca951
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestSimple.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 8344942
+ * @summary Test simple use of Templates with the Compile Framework.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main template_framework.examples.TestSimple
+ */
+
+package template_framework.examples;
+
+import compiler.lib.compile_framework.*;
+import compiler.lib.template_framework.Template;
+import static compiler.lib.template_framework.Template.body;
+
+public class TestSimple {
+
+    public static void main(String[] args) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add a java source file.
+        comp.addJavaSourceCode("p.xyz.InnerTest", generate());
+
+        // Compile the source file.
+        comp.compile();
+
+        // Object ret = p.xyz.InnerTest.test();
+        Object ret = comp.invoke("p.xyz.InnerTest", "test", new Object[] {});
+        System.out.println("res: " + ret);
+
+        // Check that the return value is the sum of the two arguments.
+        if ((42 + 7) != (int)ret) {
+            throw new RuntimeException("Unexpected result");
+        }
+    }
+
+    // Generate a source Java file as String
+    public static String generate() {
+        // Create a Template with two arguments.
+        var template = Template.make("arg1", "arg2", (Integer arg1, String arg2) -> body(
+            """
+            package p.xyz;
+            public class InnerTest {
+                public static int test() {
+                    return #arg1 + #arg2;
+                }
+            }
+            """
+        ));
+
+        // Use the template with two arguments, and render it to a String.
+        return template.render(42, "7");
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
new file mode 100644
index 00000000000..faa05b29d82
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
@@ -0,0 +1,1227 @@
+/*
+ * 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 8344942
+ * @summary Demonstrate the use of Templates with the Compile Framework.
+ *          It displays the use of most features in the Template Framework.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main template_framework.examples.TestTutorial
+ */
+
+package template_framework.examples;
+
+import java.util.Collections;
+import java.util.List;
+
+import compiler.lib.compile_framework.*;
+
+import compiler.lib.template_framework.Template;
+import compiler.lib.template_framework.Hook;
+import compiler.lib.template_framework.TemplateBinding;
+import compiler.lib.template_framework.DataName;
+import compiler.lib.template_framework.StructuralName;
+import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.let;
+import static compiler.lib.template_framework.Template.$;
+import static compiler.lib.template_framework.Template.fuel;
+import static compiler.lib.template_framework.Template.addDataName;
+import static compiler.lib.template_framework.Template.dataNames;
+import static compiler.lib.template_framework.Template.addStructuralName;
+import static compiler.lib.template_framework.Template.structuralNames;
+import static compiler.lib.template_framework.DataName.Mutability.MUTABLE;
+import static compiler.lib.template_framework.DataName.Mutability.IMMUTABLE;
+import static compiler.lib.template_framework.DataName.Mutability.MUTABLE_OR_IMMUTABLE;
+
+import compiler.lib.template_framework.library.Hooks;
+
+public class TestTutorial {
+
+    public static void main(String[] args) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add Java source files.
+        comp.addJavaSourceCode("p.xyz.InnerTest1",  generateWithListOfTokens());
+        comp.addJavaSourceCode("p.xyz.InnerTest2",  generateWithTemplateArguments());
+        comp.addJavaSourceCode("p.xyz.InnerTest3",  generateWithHashtagAndDollarReplacements());
+        comp.addJavaSourceCode("p.xyz.InnerTest3b", generateWithHashtagAndDollarReplacements2());
+        comp.addJavaSourceCode("p.xyz.InnerTest4",  generateWithCustomHooks());
+        comp.addJavaSourceCode("p.xyz.InnerTest5",  generateWithLibraryHooks());
+        comp.addJavaSourceCode("p.xyz.InnerTest6",  generateWithRecursionAndBindingsAndFuel());
+        comp.addJavaSourceCode("p.xyz.InnerTest7",  generateWithDataNamesSimple());
+        comp.addJavaSourceCode("p.xyz.InnerTest8",  generateWithDataNamesForFieldsAndVariables());
+        comp.addJavaSourceCode("p.xyz.InnerTest9a", generateWithDataNamesAndScopes1());
+        comp.addJavaSourceCode("p.xyz.InnerTest9b", generateWithDataNamesAndScopes2());
+        comp.addJavaSourceCode("p.xyz.InnerTest10", generateWithDataNamesForFuzzing());
+        comp.addJavaSourceCode("p.xyz.InnerTest11", generateWithStructuralNamesForMethods());
+
+        // Compile the source files.
+        // Hint: if you want to see the generated source code, you can enable
+        //       printing of the source code that the CompileFramework receives,
+        //       with -DCompileFrameworkVerbose=true
+        //       The code may not be nicely formatted, especially regarding
+        //       indentation. You might consider dumping the generated code
+        //       into an IDE or other auto-formatting tool.
+        comp.compile();
+
+        comp.invoke("p.xyz.InnerTest1",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest2",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest3",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest3b", "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest4",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest5",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest6",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest7",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest8",  "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest9a", "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest9b", "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest10", "main", new Object[] {});
+        comp.invoke("p.xyz.InnerTest11", "main", new Object[] {});
+    }
+
+    // This example shows the use of various Tokens.
+    public static String generateWithListOfTokens() {
+        // A Template is essentially a function / lambda that produces a
+        // token body, which is a list of Tokens that are concatenated.
+        var templateClass = Template.make(() -> body(
+            // The "body" method is filled by a sequence of "Tokens".
+            // These can be Strings and multi-line Strings, but also
+            // boxed primitives.
+            """
+            package p.xyz;
+
+            public class InnerTest1 {
+                public static void main() {
+                    System.out.println("Hello World!");
+            """,
+            "int a = ", 1, ";\n",
+            "float b = ", 1.5f, ";\n",
+            // Special Float values are "smartly" formatted!
+            "float nan = ", Float.POSITIVE_INFINITY, ";\n",
+            "boolean c = ", true, ";\n",
+            // Lists of Tokens are also allowed:
+            List.of("int ", "d = 5", ";\n"),
+            // We can also stream / map over an existing list, or one created on
+            // the fly:
+            List.of(3, 5, 7, 11).stream().map(i -> "System.out.println(" + i + ");\n").toList(),
+            """
+                    System.out.println(a + " " + b + " " + nan + " " + c + " " + d);
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // This example shows the use of Templates, with and without arguments.
+    public static String generateWithTemplateArguments() {
+        // A Template with no arguments.
+        var templateHello = Template.make(() -> body(
+            """
+            System.out.println("Hello");
+            """
+        ));
+
+        // A Template with a single Integer argument.
+        var templateCompare = Template.make("arg", (Integer arg) -> body(
+            "System.out.println(", arg, ");\n",  // capture arg via lambda argument
+            "System.out.println(#arg);\n",       // capture arg via hashtag replacement
+            "System.out.println(#{arg});\n",     // capture arg via hashtag replacement with brackets
+            // It would have been optimal to use Java String Templates to format
+            // argument values into Strings. However, since these are not (yet)
+            // available, the Template Framework provides two alternative ways of
+            // formatting Strings:
+            // 1) By appending to the comma-separated list of Tokens passed to body().
+            //    Appending as a Token works whenever one has a reference to the Object
+            //    in Java code. But often, this is rather cumbersome and looks awkward,
+            //    given all the additional quotes and commands required. Hence, it
+            //    is encouraged to only use this method when necessary.
+            // 2) By hashtag replacements inside a single string. One can either
+            //    use "#arg" directly, or use brackets "#{arg}". When possible, one
+            //    should prefer avoiding the brackets, as they create additional
+            //    noise. However, there are cases where they are useful, for
+            //    example "#TYPE_CON" would be parsed as a hashtag replacement
+            //    for the hashtag name "TYPE_CON", whereas "#{TYPE}_CON" is
+            //    parsed as hashtag name "TYPE", followed by literal string "_CON".
+            //    See also: generateWithHashtagAndDollarReplacements2
+            //    There are two ways to define the value of a hashtag replacement:
+            //    a) Capturing Template arguments as Strings.
+            //    b) Using a "let" definition (see examples further down).
+            // Which one should be preferred is a code style question. Generally, we
+            // prefer the use of hashtag replacements because that allows easy use of
+            // multiline strings (i.e. text blocks).
+            "if (#arg != ", arg, ") { throw new RuntimeException(\"mismatch\"); }\n"
+        ));
+
+        // A Template that creates the body of the Class and main method, and then
+        // uses the two Templates above inside it.
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest2 {
+                public static void main() {
+            """,
+                    templateHello.asToken(),
+                    templateCompare.asToken(7),
+                    templateCompare.asToken(42),
+            """
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // Example with hashtag replacements (arguments and let), and $-name renamings.
+    // Note: hashtag replacements are a workaround for the missing string templates.
+    //       If we had string templates, we could just capture the typed lambda
+    //       arguments, and use them directly in the String via string templating.
+    public static String generateWithHashtagAndDollarReplacements() {
+        var template1 = Template.make("x", (Integer x) -> body(
+            // We have the "#x" hashtag replacement from the argument capture above.
+            // Additionally, we can define "#con" as a hashtag replacement from let:
+            let("con", 3 * x),
+            // In the code below, we use "var" as a local variable. But if we were
+            // to instantiate this template twice, the names could conflict. Hence,
+            // we automatically rename the names that have a $ prepended with
+            // var_1, var_2, etc.
+            """
+            int $var = #con;
+            System.out.println("T1: #x, #con, " + $var);
+            """
+        ));
+
+        var template2 = Template.make("x", (Integer x) ->
+            // Sometimes it can be helpful to not just create a hashtag replacement
+            // with let, but also to capture the variable to use it as lambda parameter.
+            let("y", 11 * x, y ->
+                body(
+                    """
+                    System.out.println("T2: #x, #y");
+                    """,
+                    template1.asToken(y)
+                )
+            )
+        );
+
+        // This template generates an int variable and assigns it a value.
+        // Together with template4, we see that each template has a unique renaming
+        // for a $-name replacement.
+        var template3 = Template.make("name", "value", (String name, Integer value) -> body(
+            """
+            int #name = #value; // Note: $var is not #name
+            """
+        ));
+
+        var template4 = Template.make(() -> body(
+            """
+            // We will define the variable $var:
+            """,
+            // We can capture the $-name programmatically, and pass it to other templates:
+            template3.asToken($("var"), 42),
+            """
+            if ($var != 42) { throw new RuntimeException("Wrong value!"); }
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            // The Template Framework API only guarantees that every Template use
+            // has a unique ID. When using the Templates, all we need is that
+            // variables from different Template uses do not conflict. But it can
+            // be helpful to understand how the IDs are produced. The implementation
+            // simply gives the first Template use the ID=1, and increments from there.
+            //
+            // In this example, the templateClass is the first Template use, and
+            // has ID=1. We never use a dollar replacement here, so the code will
+            // not show any "_1".
+            """
+            package p.xyz;
+
+            public class InnerTest3 {
+                public static void main() {
+            """,
+                    // Second Template use: ID=2 -> var_2
+                    template1.asToken(1),
+                    // Third Template use: ID=3 -> var_3
+                    template1.asToken(7),
+                    // Fourth Template use with template2, no use of dollar, so
+                    // no "_4" shows up in the generated code. Internally, it
+                    // calls template1, which is the fifth Template use, with
+                    // ID = 5 -> var_5
+                    template2.asToken(2),
+                    // Sixth and Seventh Template use -> var_7
+                    template2.asToken(5),
+                    // Eighth Template use with template4 -> var_8.
+                    // Ninth Template use with internal call to template3,
+                    // The local "$var" turns to "var_9", but the Template
+                    // argument captured value = "var_8" from the outer
+                    // template use of $("var").
+                    template4.asToken(),
+            """
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // In some cases, you may want to transform string arguments. You may
+    // be working with types "int" and "long", and want to create names like
+    // "INT_CON" and "LONG_CON".
+    public static String generateWithHashtagAndDollarReplacements2() {
+        // Let us define some final static variables of a specific type.
+        var template1 = Template.make("type", (String type) -> body(
+            // The type (e.g. "int") is lower case, let us create the upper case "INT_CON" from it.
+            let("TYPE", type.toUpperCase()),
+            """
+            static final #type #{TYPE}_CON = 42;
+            """
+        ));
+
+        // Let's write a simple class to demonstrate that this works, i.e. produces compilable code.
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest3b {
+            """,
+            template1.asToken("int"),
+            template1.asToken("long"),
+            """
+                public static void main() {
+                    if (INT_CON != 42 || LONG_CON != 42) {
+                        throw new RuntimeException("Wrong result!");
+                    }
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // In this example, we look at the use of Hooks. They allow us to reach back, to outer
+    // scopes. For example, we can reach out from inside a method body to a hook anchored at
+    // the top of the class, and insert a field.
+    public static String generateWithCustomHooks() {
+        // We can define a custom hook.
+        // Note: generally we prefer using the pre-defined CLASS_HOOK and METHOD_HOOK from the library,
+        //       whenever possible. See also the example after this one.
+        var myHook = new Hook("MyHook");
+
+        var template1 = Template.make("name", "value", (String name, Integer value) -> body(
+            """
+            public static int #name = #value;
+            """
+        ));
+
+        var template2 = Template.make("x", (Integer x) -> body(
+            """
+            // Let us go back to where we anchored the hook with anchor() and define a field named $field there.
+            // Note that in the Java code we have not defined anchor() on the hook, yet. But since it's a lambda
+            // expression, it is not evaluated, yet! Eventually, anchor() will be evaluated before insert() in
+            // this example.
+            """,
+            myHook.insert(template1.asToken($("field"), x)),
+            """
+            System.out.println("$field: " + $field);
+            if ($field != #x) { throw new RuntimeException("Wrong value!"); }
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest4 {
+            """,
+            // We anchor a Hook outside the main method, but inside the Class.
+            // Anchoring a Hook creates a scope, spanning the braces of the
+            // "anchor" call. Any Hook.insert that happens inside this scope
+            // goes to the top of that scope.
+            myHook.anchor(
+                // Any Hook.insert goes here.
+                //
+                // <-------- field_X = 5 ------------------+
+                // <-------- field_Y = 7 -------------+    |
+                //                                    |    |
+                """
+                public static void main() {
+                """, //                               ^    ^
+                    template2.asToken(5), // -------- | ---+
+                    template2.asToken(7), // ---------+
+                """
+                }
+                """
+            ), // The Hook scope ends here.
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // We saw the use of custom hooks above, but now we look at the use of CLASS_HOOK and METHOD_HOOK.
+    // By convention, we use the CLASS_HOOK for class scopes, and METHOD_HOOK for method scopes.
+    // Whenever we open a class scope, we should anchor a CLASS_HOOK for that scope, and whenever we
+    // open a method, we should anchor a METHOD_HOOK. Conversely, this allows us to check if we are
+    // inside a class or method scope by querying "isAnchored". This convention helps us when building
+    // a large library of Templates. But if you are writing your own self-contained set of Templates,
+    // you do not have to follow this convention.
+    //
+    // Hooks are "re-entrant", that is we can anchor the same hook inside a scope that we already
+    // anchored it previously. The "Hook.insert" always goes to the innermost anchoring of that
+    // hook. There are cases where "re-entrant" Hooks are helpful such as nested classes, where
+    // there is a class scope inside another class scope. Similarly, we can nest lambda bodies
+    // inside method bodies, so also METHOD_HOOK can be used in such a "re-entrant" way.
+    public static String generateWithLibraryHooks() {
+        var templateStaticField = Template.make("name", "value", (String name, Integer value) -> body(
+            """
+            static { System.out.println("Defining static field #name"); }
+            public static int #name = #value;
+            """
+        ));
+
+        var templateLocalVariable = Template.make("name", "value", (String name, Integer value) -> body(
+            """
+            System.out.println("Defining local variable #name");
+            int #name = #value;
+            """
+        ));
+
+        var templateMethodBody = Template.make(() -> body(
+            """
+            // Let's define a local variable $var and a static field $field.
+            """,
+            Hooks.CLASS_HOOK.insert(templateStaticField.asToken($("field"), 5)),
+            Hooks.METHOD_HOOK.insert(templateLocalVariable.asToken($("var"), 11)),
+            """
+            System.out.println("$field: " + $field);
+            System.out.println("$var: " + $var);
+            if ($field * $var != 55) { throw new RuntimeException("Wrong value!"); }
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest5 {
+            """,
+            // Class Hook for fields.
+            Hooks.CLASS_HOOK.anchor(
+                """
+                public static void main() {
+                """,
+                // Method Hook for local variables, and earlier computations.
+                Hooks.METHOD_HOOK.anchor(
+                    """
+                    // This is the beginning of the "main" method body.
+                    System.out.println("Welcome to main!");
+                    """,
+                    templateMethodBody.asToken(),
+                    """
+                    System.out.println("Going to call other...");
+                    other();
+                    """
+                ),
+                """
+                }
+
+                private static void other() {
+                """,
+                // Have a separate method hook for other, so that it can insert
+                // its own local variables.
+                Hooks.METHOD_HOOK.anchor(
+                    """
+                    System.out.println("Welcome to other!");
+                    """,
+                    templateMethodBody.asToken(),
+                    """
+                    System.out.println("Done with other.");
+                    """
+                ),
+                """
+                }
+                """
+            ),
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // This example shows the use of bindings to allow cyclic references of Templates,
+    // allowing recursive template generation. We also show the use of fuel to limit
+    // recursion.
+    public static String generateWithRecursionAndBindingsAndFuel() {
+        // Binding allows the use of template1 inside of template1, via the binding indirection.
+        var binding1 = new TemplateBinding<Template.OneArg<Integer>>();
+        var template1 = Template.make("depth", (Integer depth) -> body(
+            let("fuel", fuel()),
+            """
+            System.out.println("At depth #depth with fuel #fuel.");
+            """,
+            // We cannot yet use template1 directly, as it is being defined.
+            // So we use binding1 instead.
+            // For every recursion depth, some fuel is automatically subtracted
+            // so that the fuel slowly depletes with the depth.
+            // We keep the recursion going until the fuel is depleted.
+            //
+            // Note: if we forget to check the fuel(), the renderer causes a
+            //       StackOverflowException, because the recursion never ends.
+            (fuel() > 0) ? binding1.get().asToken(depth + 1)
+                        : "System.out.println(\"Fuel depleted.\");\n",
+            """
+            System.out.println("Exit depth #depth.");
+            """
+        ));
+        binding1.bind(template1);
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest6 {
+                public static void main() {
+                    System.out.println("Welcome to main!");
+                    """,
+                    template1.asToken(0),
+                    """
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // Below, we introduce the concept of "DataNames". Code generation often involves defining
+    // fields and variables, which are then available inside a defined scope. "DataNames" can
+    // be registered at a certain scope with addDataName. This "DataName" is then available
+    // in this scope, and in any nested scope, including nested Templates. This allows us to
+    // add some fields and variables in one Template, and later on, in another Template, we
+    // can access these fields and variables again with "dataNames()".
+    //
+    // Here are a few use-cases:
+    // - You are writing some inner Template, and would like to access a random field or
+    //   variable from an outer Template. Luckily, the outer Templates have added their
+    //   fields and variables, and you can now access them with "dataNames()". You can
+    //   count them, get a list of them, or sample a random one.
+    // - You are writing some outer Template, and would like to generate a variable that
+    //   an inner Template could read from or even write to. You can "addDataName" the
+    //   variable, and the inner Template can then find that variable in "dataNames()".
+    //   If the inner Template wants to find a random field or variable, it may sample
+    //   from "dataNodes()", and with some probability, it would sample your variable.
+    //
+    // A "DataName" captures the name of the field or variable in a String. It also
+    // stores the type of the field or variable, as well as its "mutability", i.e.
+    // an indication if the field or variable is only for reading, or if writing to
+    // it is also allowed. If a field or variable is final, we must make sure that the
+    // "DataName" is immutable, otherwise we risk that some Template attempts to generate
+    // code that writes to the final field or variable, and then we get a compilation
+    // error from "javac" later on.
+    //
+    // To get started, we show an example where all DataNames have the same type, and where
+    // all Names are mutable. For simplicity, our type represents the primitive int type.
+    private record MySimpleInt() implements DataName.Type {
+        // The type is only subtype of itself. This is relevant when sampling or weighing
+        // DataNames, because we do not just sample from the given type, but also its subtypes.
+        @Override
+        public boolean isSubtypeOf(DataName.Type other) {
+            return other instanceof MySimpleInt();
+        }
+
+        // The name of the type can later be accessed, and used in code. We are working
+        // with ints, so that is what we return.
+        @Override
+        public String name() { return "int"; }
+    }
+    private static final MySimpleInt mySimpleInt = new MySimpleInt();
+
+    // In this example, we generate 3 fields, and add their names to the
+    // current scope. In a nested Template, we can then sample one of these
+    // DataNames, which gives us one of the fields. We increment that randomly
+    // chosen field. At the end, we print all three fields.
+    public static String generateWithDataNamesSimple() {
+        var templateMain = Template.make(() -> body(
+            // Sample a random DataName, i.e. field, and assign its name to
+            // the hashtag replacement "#f".
+            // We are picking a mutable DataName, because we are not just
+            // reading but also writing to the field.
+            let("f", dataNames(MUTABLE).exactOf(mySimpleInt).sample().name()),
+            """
+            // Let us now sample a random field #f, and increment it.
+            #f += 42;
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            // Let us define the names for the three fields.
+            // We can then sample from these names in a nested Template.
+            // We make all DataNames mutable, and with the same weight of 1,
+            // so that they have equal probability of being sampled.
+            // Note: the default weight is 1, so we can also omit the weight.
+            addDataName($("f1"), mySimpleInt, MUTABLE, 1),
+            addDataName($("f2"), mySimpleInt, MUTABLE, 1),
+            addDataName($("f3"), mySimpleInt, MUTABLE), // omit weight, default is 1.
+            """
+            package p.xyz;
+
+            public class InnerTest7 {
+                // Let us define some fields.
+                public static int $f1 = 0;
+                public static int $f2 = 0;
+                public static int $f3 = 0;
+
+                public static void main() {
+                    // Let us now call the nested template that samples
+                    // a random field and increments it.
+                    """,
+                    templateMain.asToken(),
+                    """
+                    // Now, we can print all three fields, and see which
+                    // one was incremented.
+                    System.out.println("f1: " + $f1);
+                    System.out.println("f2: " + $f2);
+                    System.out.println("f3: " + $f3);
+                    // We have two zeros, and one 42.
+                    if ($f1 + $f2 + $f3 != 42) { throw new RuntimeException("wrong result!"); }
+                }
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // In the example above, we could have easily kept track of the three fields ourselves,
+    // and would not have had to rely on the Template Framework's DataNames for this. However,
+    // with more complicated examples, this gets more and more difficult, if not impossible.
+    //
+    // In the example below, we make the scenario a little more realistic. We work with an
+    // int and a long type. In the main method, we add some fields and local variables, and
+    // register their DataNames. When sampling from the main method, we should be able to see
+    // both fields and variables that we just registered. But from another method, we should
+    // only see the fields, but the local variables from main should not be sampled.
+    //
+    // Let us now define the wrapper for primitive types such as int and long.
+    private record MyPrimitive(String name) implements DataName.Type {
+        @Override
+        public boolean isSubtypeOf(DataName.Type other) {
+            return other instanceof MyPrimitive(String n) && n.equals(name());
+        }
+
+        // Note: the name method is automatically overridden by the record
+        //       field accessor.
+        // But we would like to also directly use the type in the templates,
+        // hence we let "toString" return "int" or "long".
+        @Override
+        public String toString() { return name(); }
+    }
+    private static final MyPrimitive myInt = new MyPrimitive("int");
+    private static final MyPrimitive myLong = new MyPrimitive("long");
+
+    public static String generateWithDataNamesForFieldsAndVariables() {
+        // Define a static field.
+        var templateStaticField = Template.make("type", (DataName.Type type) -> body(
+            addDataName($("field"), type, MUTABLE),
+            // Note: since we have overridden MyPrimitive::toString, we can use
+            //       the type directly as "#type" in the template, which then
+            //       gets hashtag replaced with "int" or "long".
+            """
+            public static #type $field = 0;
+            """
+        ));
+
+        // Define a local variable.
+        var templateLocalVariable = Template.make("type", (DataName.Type type) -> body(
+            addDataName($("var"), type, MUTABLE),
+            """
+            #type $var = 0;
+            """
+        ));
+
+        // Sample a random field or variable, from those that are available at
+        // the current scope.
+        var templateSample = Template.make("type", (DataName.Type type) -> body(
+            let("name", dataNames(MUTABLE).exactOf(type).sample().name()),
+            // Note: we could also sample from MUTABLE_OR_IMMUTABLE, we will
+            //       cover the concept of mutability in an example further down.
+            """
+            System.out.println("Sampling type #type: #name = " + #name);
+            """
+        ));
+
+        // Check how many fields and variables are available at the current scope.
+        var templateStatus = Template.make(() -> body(
+            let("ints", dataNames(MUTABLE).exactOf(myInt).count()),
+            let("longs", dataNames(MUTABLE).exactOf(myLong).count()),
+            // Note: we could also count the MUTABLE_OR_IMMUTABLE, we will
+            //       cover the concept of mutability in an example further down.
+            """
+            System.out.println("Status: #ints ints, #longs longs.");
+            """
+        ));
+
+        // Definition of the main method body.
+        var templateMain = Template.make(() -> body(
+            """
+            System.out.println("Starting inside main...");
+            """,
+            // Check the initial status, there should be nothing available.
+            templateStatus.asToken(),
+            // Define some local variables. We place them at the beginning of
+            // the method, by using the METHOD_HOOK.
+            Hooks.METHOD_HOOK.insert(templateLocalVariable.asToken(myInt)),
+            Hooks.METHOD_HOOK.insert(templateLocalVariable.asToken(myLong)),
+            // Define some static fields. We place them at the top of the class,
+            // by using the CLASS_HOOK.
+            Hooks.CLASS_HOOK.insert(templateStaticField.asToken(myInt)),
+            Hooks.CLASS_HOOK.insert(templateStaticField.asToken(myLong)),
+            // If we check the status now, we should see two int and two
+            // long names, corresponding to our two fields and variables.
+            templateStatus.asToken(),
+            // Now, we sample 5 int and 5 long names. We should get a mix
+            // of fields and variables. We have access to the fields because
+            // we inserted them to the class scope. We have access to the
+            // variables because we inserted them to the current method
+            // body.
+            Collections.nCopies(5, templateSample.asToken(myInt)),
+            Collections.nCopies(5, templateSample.asToken(myLong)),
+            // The status should not have changed since we last checked.
+            templateStatus.asToken(),
+            """
+            System.out.println("Finishing inside main.");
+            """
+        ));
+
+        // Definition of another method's body. It is in the same class
+        // as the main method, so it has access to the same static fields.
+        var templateOther = Template.make(() -> body(
+            """
+            System.out.println("Starting inside other...");
+            """,
+            // We should see the fields defined in the main body,
+            // one int and one long field.
+            templateStatus.asToken(),
+            // Sampling 5 random int and 5 random long DataNames. We should
+            // only see the fields, and not the local variables from main.
+            Collections.nCopies(5, templateSample.asToken(myInt)),
+            Collections.nCopies(5, templateSample.asToken(myLong)),
+            // The status should not have changed since we last checked.
+            templateStatus.asToken(),
+            """
+            System.out.println("Finishing inside other.");
+            """
+        ));
+
+        // Finally, we put it all together in a class.
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest8 {
+            """,
+            // Class Hook for fields.
+            Hooks.CLASS_HOOK.anchor(
+                """
+                public static void main() {
+                """,
+                // Method Hook for local variables.
+                Hooks.METHOD_HOOK.anchor(
+                    """
+                    // This is the beginning of the "main" method body.
+                    System.out.println("Welcome to main!");
+                    """,
+                    templateMain.asToken(),
+                    """
+                    System.out.println("Going to call other...");
+                    other();
+                    """
+                ),
+                """
+                }
+
+                private static void other() {
+                """,
+                // Have a separate method hook for other, where it could insert
+                // its own local variables (but happens not to).
+                Hooks.METHOD_HOOK.anchor(
+                    """
+                    System.out.println("Welcome to other!");
+                    """,
+                    templateOther.asToken(),
+                    """
+                    System.out.println("Done with other.");
+                    """
+                ),
+                """
+                }
+                """
+            ),
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // Let us have a closer look at how DataNames interact with scopes created by
+    // Templates and Hooks. Additionally, we see how the execution order of the
+    // lambdas and token evaluation affects the availability of DataNames.
+    //
+    // We inject the results directly into verification inside the code, so it
+    // is relatively simple to see what the expected results are.
+    //
+    // For simplicity, we define a simple "list" function. It collects all
+    // field and variable names, and immediately returns the comma separated
+    // list of the names. We can use that to visualize the available names
+    // at any point.
+    public static String listNames() {
+        return "{" + String.join(", ", dataNames(MUTABLE).exactOf(myInt).toList()
+                                       .stream().map(DataName::name).toList()) + "}";
+    }
+
+    // Even simpler: count the available variables and return the count immediately.
+    public static int countNames() {
+        return dataNames(MUTABLE).exactOf(myInt).count();
+    }
+
+    // Having defined these helper methods, let us start with the first example.
+    // You should start reading this example bottom-up, starting at
+    // templateClass, then going to templateMain and last to templateInner.
+    public static String generateWithDataNamesAndScopes1() {
+
+        var templateInner = Template.make(() -> body(
+            // We just got called from the templateMain. All tokens from there
+            // are already evaluated, so "v1" is now available:
+            let("l1", listNames()),
+            """
+            if (!"{v1}".equals("#l1")) { throw new RuntimeException("l1 should have been '{v1}' but was '#l1'"); }
+            """
+        ));
+
+        var templateMain = Template.make(() -> body(
+            // So far, no names were defined. We expect "c1" to be zero.
+            let("c1", countNames()),
+            """
+            if (#c1 != 0) { throw new RuntimeException("c1 was not zero but #c1"); }
+            """,
+            // We now add a local variable "v1" to the scope of this templateMain.
+            // This only generates a token, and does not immediately add the name.
+            // The name is only added once we evaluate the tokens, and arrive at
+            // this particular token.
+            addDataName("v1", myInt, MUTABLE),
+            // We count again with "c2". The variable "v1" is at this point still
+            // in token form, hence it is not yet made available while executing
+            // the template lambda of templateMain.
+            let("c2", countNames()),
+            """
+            if (#c2 != 0) { throw new RuntimeException("c2 was not zero but #c2"); }
+            """,
+            // But now we call an inner Template. This is added as a TemplateToken.
+            // This means it is not evaluated immediately, but only once we evaluate
+            // the tokens. By that time, all tokens from above are already evaluated
+            // and we see that "v1" is available.
+            templateInner.asToken()
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest9a {
+            """,
+            Hooks.CLASS_HOOK.anchor(
+            """
+                public static void main() {
+            """,
+                Hooks.METHOD_HOOK.anchor(
+                    templateMain.asToken()
+                ),
+            """
+                }
+            """
+            ),
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+    // Now that we understand this simple example, we go to a more complicated one
+    // where we use Hook.insert. Just as above, you should read this example
+    // bottom-up, starting at templateClass.
+    public static String generateWithDataNamesAndScopes2() {
+
+        var templateFields = Template.make(() -> body(
+            // We were just called from templateMain. But the code is not
+            // generated into the main scope, rather into the class scope
+            // out in templateClass.
+            // Let us now add a field "f1".
+            addDataName("f1", myInt, MUTABLE),
+            // And let's also generate the code for it.
+            """
+            public static int f1 = 42;
+            """,
+            // But why is this DataName now available inside the scope of
+            // templateInner? Does that not mean that "f1" escapes this
+            // templateFields here? Yes it does!
+            // For normal template nesting, the names do not escape the
+            // scope of the nested template. But this here is no normal
+            // template nesting, rather it is an insertion into a Hook,
+            // and we treat those differently. We make the scope of the
+            // inserted templateFields transparent, so that any added
+            // DataNames are added to the scope of the Hook we just
+            // inserted into, i.e. the CLASS_HOOK. This is very important,
+            // if we did not make that scope transparent, we could not
+            // add any DataNames to the class scope anymore, and we could
+            // not add any fields that would be available in the class
+            // scope.
+            Hooks.METHOD_HOOK.anchor(
+                // We now create a separate scope. This one is not the
+                // template scope from above, and it is not transparent.
+                // Hence, "f2" will not be available outside of this
+                // scope.
+                addDataName("f2", myInt, MUTABLE),
+                // And let's also generate the code for it.
+                """
+                public static int f2 = 666;
+                """
+                // Similarly, if we called any nested Template here,
+                // and added DataNames inside, this would happen inside
+                // nested scopes that are not transparent. If one wanted
+                // to add names to the CLASS_HOOK from there, one would
+                // have to do another Hook.insert, and make sure that
+                // the names are added from the outermost scope of that
+                // inserted Template, because only that outermost scope
+                // is transparent to the CLASS_HOOK.
+            )
+        ));
+
+        var templateInner = Template.make(() -> body(
+            // We just got called from the templateMain. All tokens from there
+            // are already evaluated, so there should be some fields available.
+            // We can see field "f1".
+            let("l1", listNames()),
+            """
+            if (!"{f1}".equals("#l1")) { throw new RuntimeException("l1 should have been '{f1}' but was '#l1'"); }
+            """
+            // Now go and have a look at templateFields, to understand how that
+            // field was added, and why not any others.
+        ));
+
+        var templateMain = Template.make(() -> body(
+            // So far, no names were defined. We expect "c1" to be zero.
+            let("c1", countNames()),
+            """
+            if (#c1 != 0) { throw new RuntimeException("c1 was not zero but #c1"); }
+            """,
+            // We would now like to add some fields to the class scope, out in the
+            // templateClass. This creates a token, which is only evaluated after
+            // the completion of the templateMain lambda. Before you go and look
+            // at templateFields, just assume that it does add some fields, and
+            // continue reading in templateMain.
+            Hooks.CLASS_HOOK.insert(templateFields.asToken()),
+            // We count again with "c2". The fields we wanted to add above are not
+            // yet available, because the token is not yet evaluated. Hence, we
+            // still only count zero names.
+            let("c2", countNames()),
+            """
+            if (#c2 != 0) { throw new RuntimeException("c2 was not zero but #c2"); }
+            """,
+            // Now we call an inner Template. This also creates a token, and so it
+            // is not evaluated immediately. And by the time this token is evaluated
+            // the tokens from above are already evaluated, and so the fields should
+            // be available. Go have a look at templateInner now.
+            templateInner.asToken()
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest9b {
+            """,
+            Hooks.CLASS_HOOK.anchor(
+            """
+                public static void main() {
+            """,
+                Hooks.METHOD_HOOK.anchor(
+                    templateMain.asToken()
+                ),
+            """
+                }
+            """
+            ),
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+
+
+    // There are two more concepts to understand more deeply with DataNames.
+    //
+    // One is the use of mutable and immutable DataNames.
+    // In some cases, we only want to sample DataNames that are mutable, because
+    // we want to store to a field or variable. We have to make sure that we
+    // do not generate code that tries to store to a final field or variable.
+    // In other cases, we only want to load, and we do not care if the
+    // fields or variables are final or non-final.
+    //
+    // Another concept is subtyping of DataName Types. With primitive types, this
+    // is irrelevant, but with instances of Objects, this becomes relevant.
+    // We may want to load an object of any field or variable of a certain
+    // class, or any subclass. When a value is of a given class, we can only
+    // store it to fields and variables of that class or any superclass.
+    //
+    // Let us look at an example that demonstrates these two concepts.
+    //
+    // First, we define a DataName Type that represents different classes, that
+    // may or may not be in a subtype relation. Subtypes start with the name
+    // of the super type.
+    private record MyClass(String name) implements DataName.Type {
+        @Override
+        public boolean isSubtypeOf(DataName.Type other) {
+            return other instanceof MyClass(String n) && name().startsWith(n);
+        }
+
+        @Override
+        public String toString() { return name(); }
+    }
+    private static final MyClass myClassA   = new MyClass("MyClassA");
+    private static final MyClass myClassA1  = new MyClass("MyClassA1");
+    private static final MyClass myClassA2  = new MyClass("MyClassA2");
+    private static final MyClass myClassA11 = new MyClass("MyClassA11");
+    private static final MyClass myClassB   = new MyClass("MyClassB");
+    private static final List<MyClass> myClassList = List.of(myClassA, myClassA1, myClassA2, myClassA11, myClassB);
+
+    public static String generateWithDataNamesForFuzzing() {
+        var templateStaticField = Template.make("type", "mutable", (DataName.Type type, Boolean mutable) -> body(
+            addDataName($("field"), type, mutable ? MUTABLE : IMMUTABLE),
+            let("isFinal", mutable ? "" : "final"),
+            """
+            public static #isFinal #type $field = new #type();
+            """
+        ));
+
+        var templateLoad = Template.make("type", (DataName.Type type) -> body(
+            // We only load from the field, so we do not need a mutable one,
+            // we can load from final and non-final fields.
+            // We want to find any field from which we can read the value and store
+            // it in our variable v of our given type. Hence, we can take a field
+            // of the given type or any subtype thereof.
+            let("field", dataNames(MUTABLE_OR_IMMUTABLE).subtypeOf(type).sample().name()),
+            """
+            #type $v = #field;
+            System.out.println("#field: " + $v);
+            """
+        ));
+
+        var templateStore = Template.make("type", (DataName.Type type) -> body(
+            // We are storing to a field, so it better be non-final, i.e. mutable.
+            // We want to store a new instance of our given type to a field. This
+            // field must be of the given type or any supertype.
+            let("field", dataNames(MUTABLE).supertypeOf(type).sample().name()),
+            """
+            #field = new #type();
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest10 {
+                // First, we define our classes.
+                public static class MyClassA {}
+                public static class MyClassA1 extends MyClassA {}
+                public static class MyClassA2 extends MyClassA {}
+                public static class MyClassA11 extends MyClassA1 {}
+                public static class MyClassB {}
+
+                // Now, we define a list of static fields. Some of them are final, others not.
+                """,
+                // We must create a CLASS_HOOK and insert the fields to it. Otherwise,
+                // addDataName is restricted to the scope of the templateStaticField. But
+                // with the insertion to CLASS_HOOK, the addDataName goes through the scope
+                // of the templateStaticField out to the scope of the CLASS_HOOK.
+                Hooks.CLASS_HOOK.anchor(
+                    myClassList.stream().map(c ->
+                        (Object)Hooks.CLASS_HOOK.insert(templateStaticField.asToken(c, true))
+                    ).toList(),
+                    myClassList.stream().map(c ->
+                        (Object)Hooks.CLASS_HOOK.insert(templateStaticField.asToken(c, false))
+                    ).toList(),
+                    """
+
+                    public static void main() {
+                        // All fields are still in their initial state.
+                        """,
+                        myClassList.stream().map(templateLoad::asToken).toList(),
+                        """
+                        // Now let us mutate some fields.
+                        """,
+                        myClassList.stream().map(templateStore::asToken).toList(),
+                        """
+                        // And now some fields are different than before.
+                        """,
+                        myClassList.stream().map(templateLoad::asToken).toList(),
+                        """
+                    }
+                    """
+                ),
+            """
+            }
+            """
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+
+    }
+
+    // "DataNames" are useful for modeling fields and variables. They hold data,
+    // and we can read and write to them, they may be mutable or immutable.
+    // We now introduce another set of "Names", the "StructuralNames". They are
+    // useful for modeling method names and class names, and possibly more. Anything
+    // that has a fixed name in the Java code, for which mutability is inapplicable.
+    // Some use-cases for "StructuralNames":
+    // - Method names. The Type could represent the signature of the static method
+    //                 or the class of the non-static method.
+    // - Class names. Type could represent the signature of the constructor, so
+    //                that we could instantiate random instances.
+    // - try/catch blocks. If a specific Exception is caught in the scope, we could
+    //                     register that Exception, and in the inner scope we can
+    //                     check if there is any "StructuralName" for an Exception
+    //                     and its subtypes - if so, we know the exception would be
+    //                     caught.
+    //
+    // Let us look at an example with Method names. But for simplicity, we assume they
+    // all have the same signature: they take two int arguments and return an int.
+    //
+    // Should you ever work on a test where there are methods with different signatures,
+    // then you would have to very carefully study and design the subtype relation between
+    // methods. You may want to read up about covariance and contravariance. This
+    // example ignores all of that, because we only have "(II)I" methods.
+    private record MyMethodType() implements StructuralName.Type {
+        @Override
+        public boolean isSubtypeOf(StructuralName.Type other) {
+            return other instanceof MyMethodType();
+        }
+
+        @Override
+        public String name() { return "<not used, don't worry>"; }
+    }
+    private static final MyMethodType myMethodType = new MyMethodType();
+
+    public static String generateWithStructuralNamesForMethods() {
+        // Define a method, which takes two ints, returns the result of op.
+        var templateMethod = Template.make("op", (String op) -> body(
+            // Register the method name, so we can later sample.
+            addStructuralName($("methodName"), myMethodType),
+            """
+            public static int $methodName(int a, int b) {
+                return a #op b;
+            }
+            """
+        ));
+
+        var templateSample = Template.make(() -> body(
+            // Sample a random method, and retrieve its name.
+            let("methodName", structuralNames().exactOf(myMethodType).sample().name()),
+            """
+            System.out.println("Calling #methodName with inputs 7 and 11");
+            System.out.println("  result: " + #methodName(7, 11));
+            """
+        ));
+
+        var templateClass = Template.make(() -> body(
+            """
+            package p.xyz;
+
+            public class InnerTest11 {
+                // Let us define some methods that we can sample from later.
+            """,
+            // We must anchor a CLASS_HOOK here, and insert the method definitions to that hook.
+            Hooks.CLASS_HOOK.anchor(
+                // If we directly nest the templateMethod, then the addStructuralName goes to the nested
+                // scope, and is not available at the class scope, i.e. it is not visible
+                // for sampleStructuralName outside of the templateMethod.
+                // DO NOT DO THIS, the nested addStructuralName will not be visible:
+                "// We cannot sample from the following methods:\n",
+                templateMethod.asToken("+"),
+                templateMethod.asToken("-"),
+                // However, if we insert to the CLASS_HOOK, then the Renderer makes the
+                // scope of the inserted templateMethod transparent, and the addStructuralName
+                // goes out to the scope of the CLASS_HOOK (but no further than that).
+                // RATHER, DO THIS to ensure the addStructuralName is visible:
+                Hooks.CLASS_HOOK.insert(templateMethod.asToken("*")),
+                Hooks.CLASS_HOOK.insert(templateMethod.asToken("|")),
+                Hooks.CLASS_HOOK.insert(templateMethod.asToken("&")),
+                """
+
+                    public static void main() {
+                        // Now, we call some random methods, but only those that were inserted
+                        // to the CLASS_HOOK.
+                        """,
+                        Collections.nCopies(10, templateSample.asToken()),
+                        """
+                    }
+                }
+                """
+            )
+        ));
+
+        // Render templateClass to String.
+        return templateClass.render();
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
new file mode 100644
index 00000000000..fe267a3ff63
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestFormat.java
@@ -0,0 +1,111 @@
+/*
+ * 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 8344942
+ * @summary Test formatting of Integer, Long, Float and Double.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main template_framework.tests.TestFormat
+ */
+
+package template_framework.tests;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import compiler.lib.compile_framework.*;
+import compiler.lib.generators.*;
+import compiler.lib.verify.*;
+import compiler.lib.template_framework.Template;
+import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.let;
+
+public class TestFormat {
+    record FormatInfo(int id, String type, Object value) {}
+
+    public static void main(String[] args) {
+        List<FormatInfo> list = new ArrayList<>();
+
+        for (int i = 0; i < 1000; i++) {
+            int v = Generators.G.ints().next();
+            list.add(new FormatInfo(i, "int", v));
+        }
+
+        for (int i = 1000; i < 2000; i++) {
+            long v = Generators.G.longs().next();
+            list.add(new FormatInfo(i, "long", v));
+        }
+
+        for (int i = 2000; i < 3000; i++) {
+            float v = Generators.G.floats().next();
+            list.add(new FormatInfo(i, "float", v));
+        }
+
+        for (int i = 3000; i < 4000; i++) {
+            double v = Generators.G.doubles().next();
+            list.add(new FormatInfo(i, "double", v));
+        }
+
+        CompileFramework comp = new CompileFramework();
+        comp.addJavaSourceCode("p.xyz.InnerTest", generate(list));
+        comp.compile();
+
+        // Run each of the "get" methods, and check the result.
+        for (FormatInfo info : list) {
+            Object ret1 = comp.invoke("p.xyz.InnerTest", "get_let_" + info.id, new Object[] {});
+            Object ret2 = comp.invoke("p.xyz.InnerTest", "get_token_" + info.id, new Object[] {});
+            System.out.println("id: " + info.id + " -> " + info.value + " == " + ret1 + " == " + ret2);
+            Verify.checkEQ(ret1, info.value);
+            Verify.checkEQ(ret2, info.value);
+        }
+    }
+
+    private static String generate(List<FormatInfo> list) {
+        // Generate 2 "get" methods, one that formats via "let" (hashtag), the other via direct token.
+        var template1 = Template.make("info", (FormatInfo info) -> body(
+            let("id", info.id()),
+            let("type", info.type()),
+            let("value", info.value()),
+            """
+            public static #type get_let_#id() { return #value; }
+            """,
+            "public static #type get_token_#id() { return ", info.value(), "; }\n"
+        ));
+
+        // For each FormatInfo in list, generate the "get" methods inside InnerTest class.
+        var template2 = Template.make(() -> body(
+            """
+            package p.xyz;
+            public class InnerTest {
+            """,
+            list.stream().map(info -> template1.asToken(info)).toList(),
+            """
+            }
+            """
+        ));
+
+        return template2.render();
+    }
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
new file mode 100644
index 00000000000..35d020b6080
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
@@ -0,0 +1,2253 @@
+/*
+ * 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 8344942
+ * @summary Test some basic Template instantiations. We do not necessarily generate correct
+ *          java code, we just test that the code generation deterministically creates the
+ *          expected String.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main template_framework.tests.TestTemplate
+ */
+
+package template_framework.tests;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.HashSet;
+
+import compiler.lib.template_framework.Template;
+import compiler.lib.template_framework.DataName;
+import compiler.lib.template_framework.StructuralName;
+import compiler.lib.template_framework.Hook;
+import compiler.lib.template_framework.TemplateBinding;
+import compiler.lib.template_framework.RendererException;
+import static compiler.lib.template_framework.Template.body;
+import static compiler.lib.template_framework.Template.$;
+import static compiler.lib.template_framework.Template.let;
+import static compiler.lib.template_framework.Template.fuel;
+import static compiler.lib.template_framework.Template.setFuelCost;
+import static compiler.lib.template_framework.Template.addDataName;
+import static compiler.lib.template_framework.Template.dataNames;
+import static compiler.lib.template_framework.Template.addStructuralName;
+import static compiler.lib.template_framework.Template.structuralNames;
+import static compiler.lib.template_framework.DataName.Mutability.MUTABLE;
+import static compiler.lib.template_framework.DataName.Mutability.IMMUTABLE;
+import static compiler.lib.template_framework.DataName.Mutability.MUTABLE_OR_IMMUTABLE;
+
+/**
+ * The tests in this file are mostly there to ensure that the Template Rendering
+ * works correctly, and not that we produce compilable Java code. Rather, we
+ * produce deterministic output, and compare it to the expected String.
+ * Still, this file may be helpful for learning more about how Templates
+ * work and can be used.
+ *
+ * We assume that you have already studied {@code TestTutorial.java}.
+ */
+public class TestTemplate {
+    // Interface for failing tests.
+    interface FailingTest {
+        void run();
+    }
+
+    // Define a simple type to model primitive types.
+    private record MyPrimitive(String name) implements DataName.Type {
+        @Override
+        public boolean isSubtypeOf(DataName.Type other) {
+            return other instanceof MyPrimitive(String n) && n.equals(name());
+        }
+
+        @Override
+        public String toString() { return name(); }
+    }
+    private static final MyPrimitive myInt = new MyPrimitive("int");
+    private static final MyPrimitive myLong = new MyPrimitive("long");
+
+    // Simulate classes. Subtypes start with the name of the super type.
+    private record MyClass(String name) implements DataName.Type {
+        @Override
+        public boolean isSubtypeOf(DataName.Type other) {
+            return other instanceof MyClass(String n) && name().startsWith(n);
+        }
+
+        @Override
+        public String toString() { return name(); }
+    }
+    private static final MyClass myClassA   = new MyClass("myClassA");
+    private static final MyClass myClassA1  = new MyClass("myClassA1");
+    private static final MyClass myClassA2  = new MyClass("myClassA2");
+    private static final MyClass myClassA11 = new MyClass("myClassA11");
+    private static final MyClass myClassB   = new MyClass("myClassB");
+
+    // Simulate some structural types.
+    private record MyStructuralType(String name) implements StructuralName.Type {
+        @Override
+        public boolean isSubtypeOf(StructuralName.Type other) {
+            return other instanceof MyStructuralType(String n) && name().startsWith(n);
+        }
+
+        @Override
+        public String toString() { return name(); }
+    }
+    private static final MyStructuralType myStructuralTypeA = new MyStructuralType("StructuralA");
+    private static final MyStructuralType myStructuralTypeA1 = new MyStructuralType("StructuralA1");
+    private static final MyStructuralType myStructuralTypeA2 = new MyStructuralType("StructuralA2");
+    private static final MyStructuralType myStructuralTypeA11 = new MyStructuralType("StructuralA11");
+    private static final MyStructuralType myStructuralTypeB = new MyStructuralType("StructuralB");
+
+    public static void main(String[] args) {
+        // The following tests all pass, i.e. have no errors during rendering.
+        testSingleLine();
+        testMultiLine();
+        testBodyTokens();
+        testWithOneArgument();
+        testWithTwoArguments();
+        testWithThreeArguments();
+        testNested();
+        testHookSimple();
+        testHookIsAnchored();
+        testHookNested();
+        testHookWithNestedTemplates();
+        testHookRecursion();
+        testDollar();
+        testLet();
+        testDollarAndHashtagBrackets();
+        testSelector();
+        testRecursion();
+        testFuel();
+        testFuelCustom();
+        testDataNames1();
+        testDataNames2();
+        testDataNames3();
+        testDataNames4();
+        testDataNames5();
+        testStructuralNames1();
+        testStructuralNames2();
+        testListArgument();
+
+        // The following tests should all fail, with an expected exception and message.
+        expectRendererException(() -> testFailingNestedRendering(), "Nested render not allowed.");
+        expectRendererException(() -> $("name"),                          "A Template method such as");
+        expectRendererException(() -> let("x","y"),                       "A Template method such as");
+        expectRendererException(() -> fuel(),                             "A Template method such as");
+        expectRendererException(() -> setFuelCost(1.0f),                  "A Template method such as");
+        expectRendererException(() -> dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).count(),  "A Template method such as");
+        expectRendererException(() -> dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).sample(), "A Template method such as");
+        expectRendererException(() -> (new Hook("abc")).isAnchored(),     "A Template method such as");
+        expectRendererException(() -> testFailingDollarName1(), "Is not a valid '$' name: ''.");
+        expectRendererException(() -> testFailingDollarName2(), "Is not a valid '$' name: '#abc'.");
+        expectRendererException(() -> testFailingDollarName3(), "Is not a valid '$' name: 'abc#'.");
+        expectRendererException(() -> testFailingDollarName4(), "A '$' name should not be null.");
+        expectRendererException(() -> testFailingDollarName5(), "Is not a valid '$' replacement pattern: '$' in '$'.");
+        expectRendererException(() -> testFailingDollarName6(), "Is not a valid '$' replacement pattern: '$' in 'asdf$'.");
+        expectRendererException(() -> testFailingDollarName7(), "Is not a valid '$' replacement pattern: '$1' in 'asdf$1'.");
+        expectRendererException(() -> testFailingDollarName8(), "Is not a valid '$' replacement pattern: '$' in 'abc$$abc'.");
+        expectRendererException(() -> testFailingLetName1(), "A hashtag replacement should not be null.");
+        expectRendererException(() -> testFailingHashtagName1(), "Is not a valid hashtag replacement name: ''.");
+        expectRendererException(() -> testFailingHashtagName2(), "Is not a valid hashtag replacement name: 'abc#abc'.");
+        expectRendererException(() -> testFailingHashtagName3(), "Is not a valid hashtag replacement name: ''.");
+        expectRendererException(() -> testFailingHashtagName4(), "Is not a valid hashtag replacement name: 'xyz#xyz'.");
+        expectRendererException(() -> testFailingHashtagName5(), "Is not a valid '#' replacement pattern: '#' in '#'.");
+        expectRendererException(() -> testFailingHashtagName6(), "Is not a valid '#' replacement pattern: '#' in 'asdf#'.");
+        expectRendererException(() -> testFailingHashtagName7(), "Is not a valid '#' replacement pattern: '#1' in 'asdf#1'.");
+        expectRendererException(() -> testFailingHashtagName8(), "Is not a valid '#' replacement pattern: '#' in 'abc##abc'.");
+        expectRendererException(() -> testFailingDollarHashtagName1(), "Is not a valid '#' replacement pattern: '#' in '#$'.");
+        expectRendererException(() -> testFailingDollarHashtagName2(), "Is not a valid '$' replacement pattern: '$' in '$#'.");
+        expectRendererException(() -> testFailingDollarHashtagName3(), "Is not a valid '#' replacement pattern: '#' in '#$name'.");
+        expectRendererException(() -> testFailingDollarHashtagName4(), "Is not a valid '$' replacement pattern: '$' in '$#name'.");
+        expectRendererException(() -> testFailingHook(), "Hook 'Hook1' was referenced but not found!");
+        expectRendererException(() -> testFailingSample1(),  "No variable: MUTABLE, subtypeOf(int), supertypeOf(int).");
+        expectRendererException(() -> testFailingHashtag1(), "Duplicate hashtag replacement for #a");
+        expectRendererException(() -> testFailingHashtag2(), "Duplicate hashtag replacement for #a");
+        expectRendererException(() -> testFailingHashtag3(), "Duplicate hashtag replacement for #a");
+        expectRendererException(() -> testFailingHashtag4(), "Missing hashtag replacement for #a");
+        expectRendererException(() -> testFailingBinding1(), "Duplicate 'bind' not allowed.");
+        expectRendererException(() -> testFailingBinding2(), "Cannot 'get' before 'bind'.");
+        expectIllegalArgumentException(() -> body(null),              "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> body("x", null),         "Unexpected token: null");
+        expectIllegalArgumentException(() -> body(new Hook("Hook1")), "Unexpected token:");
+        Hook hook1 = new Hook("Hook1");
+        expectIllegalArgumentException(() -> hook1.anchor(null),      "Unexpected tokens: null");
+        expectIllegalArgumentException(() -> hook1.anchor("x", null), "Unexpected token: null");
+        expectIllegalArgumentException(() -> hook1.anchor(hook1),     "Unexpected token:");
+        expectIllegalArgumentException(() -> testFailingAddDataName1(), "Unexpected mutability: MUTABLE_OR_IMMUTABLE");
+        expectIllegalArgumentException(() -> testFailingAddDataName2(), "Unexpected weight: ");
+        expectIllegalArgumentException(() -> testFailingAddDataName3(), "Unexpected weight: ");
+        expectIllegalArgumentException(() -> testFailingAddDataName4(), "Unexpected weight: ");
+        expectIllegalArgumentException(() -> testFailingAddStructuralName1(), "Unexpected weight: ");
+        expectIllegalArgumentException(() -> testFailingAddStructuralName2(), "Unexpected weight: ");
+        expectIllegalArgumentException(() -> testFailingAddStructuralName3(), "Unexpected weight: ");
+        expectUnsupportedOperationException(() -> testFailingSample2(), "Must first call 'subtypeOf', 'supertypeOf', or 'exactOf'.");
+        expectRendererException(() -> testFailingAddNameDuplication1(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication2(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication3(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication4(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication5(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication6(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication7(), "Duplicate name:");
+        expectRendererException(() -> testFailingAddNameDuplication8(), "Duplicate name:");
+    }
+
+    public static void testSingleLine() {
+        var template = Template.make(() -> body("Hello World!"));
+        String code = template.render();
+        checkEQ(code, "Hello World!");
+    }
+
+    public static void testMultiLine() {
+        var template = Template.make(() -> body(
+            """
+            Code on more
+            than a single line
+            """
+        ));
+        String code = template.render();
+        String expected =
+            """
+            Code on more
+            than a single line
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testBodyTokens() {
+        // We can fill the body with Objects of different types, and they get concatenated.
+        // Lists get flattened into the body.
+        var template = Template.make(() -> body(
+            "start ",
+            Integer.valueOf(1), 1,
+            Long.valueOf(2), 2L,
+            Double.valueOf(3.4), 3.4,
+            Float.valueOf(5.6f), 5.6f,
+            List.of(" ", 1, " and ", 2),
+            " end"
+        ));
+        String code = template.render();
+        checkEQ(code, "start 112L2L3.43.45.6f5.6f 1 and 2 end");
+    }
+
+    public static void testWithOneArgument() {
+        // Capture String argument via String name.
+        var template1 = Template.make("a", (String a) -> body("start #a end"));
+        checkEQ(template1.render("x"), "start x end");
+        checkEQ(template1.render("a"), "start a end");
+        checkEQ(template1.render("" ), "start  end");
+
+        // Capture String argument via typed lambda argument.
+        var template2 = Template.make("a", (String a) -> body("start ", a, " end"));
+        checkEQ(template2.render("x"), "start x end");
+        checkEQ(template2.render("a"), "start a end");
+        checkEQ(template2.render("" ), "start  end");
+
+        // Capture Integer argument via String name.
+        var template3 = Template.make("a", (Integer a) -> body("start #a end"));
+        checkEQ(template3.render(0  ), "start 0 end");
+        checkEQ(template3.render(22 ), "start 22 end");
+        checkEQ(template3.render(444), "start 444 end");
+
+        // Capture Integer argument via templated lambda argument.
+        var template4 = Template.make("a", (Integer a) -> body("start ", a, " end"));
+        checkEQ(template4.render(0  ), "start 0 end");
+        checkEQ(template4.render(22 ), "start 22 end");
+        checkEQ(template4.render(444), "start 444 end");
+
+        // Test Strings with backslashes:
+        var template5 = Template.make("a", (String a) -> body("start #a " + a + " end"));
+        checkEQ(template5.render("/"), "start / / end");
+        checkEQ(template5.render("\\"), "start \\ \\ end");
+        checkEQ(template5.render("\\\\"), "start \\\\ \\\\ end");
+    }
+
+    public static void testWithTwoArguments() {
+        // Capture 2 String arguments via String names.
+        var template1 = Template.make("a1", "a2", (String a1, String a2) -> body("start #a1 #a2 end"));
+        checkEQ(template1.render("x", "y"), "start x y end");
+        checkEQ(template1.render("a", "b"), "start a b end");
+        checkEQ(template1.render("",  "" ), "start   end");
+
+        // Capture 2 String arguments via typed lambda arguments.
+        var template2 = Template.make("a1", "a2", (String a1, String a2) -> body("start ", a1, " ", a2, " end"));
+        checkEQ(template2.render("x", "y"), "start x y end");
+        checkEQ(template2.render("a", "b"), "start a b end");
+        checkEQ(template2.render("",  "" ), "start   end");
+
+        // Capture 2 Integer arguments via String names.
+        var template3 = Template.make("a1", "a2", (Integer a1, Integer a2) -> body("start #a1 #a2 end"));
+        checkEQ(template3.render(0,   1  ), "start 0 1 end");
+        checkEQ(template3.render(22,  33 ), "start 22 33 end");
+        checkEQ(template3.render(444, 555), "start 444 555 end");
+
+        // Capture 2 Integer arguments via templated lambda arguments.
+        var template4 = Template.make("a1", "a2", (Integer a1, Integer a2) -> body("start ", a1, " ", a2, " end"));
+        checkEQ(template4.render(0,   1  ), "start 0 1 end");
+        checkEQ(template4.render(22,  33 ), "start 22 33 end");
+        checkEQ(template4.render(444, 555), "start 444 555 end");
+    }
+
+    public static void testWithThreeArguments() {
+        // Capture 3 String arguments via String names.
+        var template1 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> body("start #a1 #a2 #a3 end"));
+        checkEQ(template1.render("x", "y", "z"), "start x y z end");
+        checkEQ(template1.render("a", "b", "c"), "start a b c end");
+        checkEQ(template1.render("",  "", "" ),  "start    end");
+
+        // Capture 3 String arguments via typed lambda arguments.
+        var template2 = Template.make("a1", "a2", "a3", (String a1, String a2, String a3) -> body("start ", a1, " ", a2, " ", a3, " end"));
+        checkEQ(template1.render("x", "y", "z"), "start x y z end");
+        checkEQ(template1.render("a", "b", "c"), "start a b c end");
+        checkEQ(template1.render("",  "", "" ),  "start    end");
+
+        // Capture 3 Integer arguments via String names.
+        var template3 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> body("start #a1 #a2 #a3 end"));
+        checkEQ(template3.render(0,   1  , 2  ), "start 0 1 2 end");
+        checkEQ(template3.render(22,  33 , 44 ), "start 22 33 44 end");
+        checkEQ(template3.render(444, 555, 666), "start 444 555 666 end");
+
+        // Capture 2 Integer arguments via templated lambda arguments.
+        var template4 = Template.make("a1", "a2", "a3", (Integer a1, Integer a2, Integer a3) -> body("start ", a1, " ", a2, " ", a3, " end"));
+        checkEQ(template3.render(0,   1  , 2  ), "start 0 1 2 end");
+        checkEQ(template3.render(22,  33 , 44 ), "start 22 33 44 end");
+        checkEQ(template3.render(444, 555, 666), "start 444 555 666 end");
+    }
+
+    public static void testNested() {
+        var template1 = Template.make(() -> body("proton"));
+
+        var template2 = Template.make("a1", "a2", (String a1, String a2) -> body(
+            "electron #a1\n",
+            "neutron #a2\n"
+        ));
+
+        var template3 = Template.make("a1", "a2", (String a1, String a2) -> body(
+            "Universe ", template1.asToken(), " {\n",
+                template2.asToken("up", "down"),
+                template2.asToken(a1, a2),
+            "}\n"
+        ));
+
+        var template4 = Template.make(() -> body(
+            template3.asToken("low", "high"),
+            "{\n",
+                template3.asToken("42", "24"),
+            "}"
+        ));
+
+        String code = template4.render();
+        String expected =
+            """
+            Universe proton {
+            electron up
+            neutron down
+            electron low
+            neutron high
+            }
+            {
+            Universe proton {
+            electron up
+            neutron down
+            electron 42
+            neutron 24
+            }
+            }""";
+        checkEQ(code, expected);
+    }
+
+    public static void testHookSimple() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make(() -> body("Hello\n"));
+
+        var template2 = Template.make(() -> body(
+            "{\n",
+            hook1.anchor(
+                "World\n",
+                // Note: "Hello" from the template below will be inserted
+                // above "World" above.
+                hook1.insert(template1.asToken())
+            ),
+            "}"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            {
+            Hello
+            World
+            }""";
+        checkEQ(code, expected);
+    }
+
+    public static void testHookIsAnchored() {
+        var hook1 = new Hook("Hook1");
+
+        var template0 = Template.make(() -> body("isAnchored: ", hook1.isAnchored(), "\n"));
+
+        var template1 = Template.make(() -> body("Hello\n", template0.asToken()));
+
+        var template2 = Template.make(() -> body(
+            "{\n",
+            template0.asToken(),
+            hook1.anchor(
+                "World\n",
+                template0.asToken(),
+                hook1.insert(template1.asToken())
+            ),
+            template0.asToken(),
+            "}"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            {
+            isAnchored: false
+            Hello
+            isAnchored: true
+            World
+            isAnchored: true
+            isAnchored: false
+            }""";
+        checkEQ(code, expected);
+    }
+
+    public static void testHookNested() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+
+        // Test nested use of hooks in the same template.
+        var template2 = Template.make(() -> body(
+            "{\n",
+            hook1.anchor(), // empty
+            "zero\n",
+            hook1.anchor(
+                template1.asToken("one"),
+                template1.asToken("two"),
+                hook1.insert(template1.asToken("intoHook1a")),
+                hook1.insert(template1.asToken("intoHook1b")),
+                template1.asToken("three"),
+                hook1.anchor(
+                    template1.asToken("four"),
+                    hook1.insert(template1.asToken("intoHook1c")),
+                    template1.asToken("five")
+                ),
+                template1.asToken("six"),
+                hook1.anchor(), // empty
+                template1.asToken("seven"),
+                hook1.insert(template1.asToken("intoHook1d")),
+                template1.asToken("eight"),
+                hook1.anchor(
+                    template1.asToken("nine"),
+                    hook1.insert(template1.asToken("intoHook1e")),
+                    template1.asToken("ten")
+                ),
+                template1.asToken("eleven")
+            ),
+            "}"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            {
+            zero
+            x intoHook1a x
+            x intoHook1b x
+            x intoHook1d x
+            x one x
+            x two x
+            x three x
+            x intoHook1c x
+            x four x
+            x five x
+            x six x
+            x seven x
+            x eight x
+            x intoHook1e x
+            x nine x
+            x ten x
+            x eleven x
+            }""";
+        checkEQ(code, expected);
+    }
+
+    public static void testHookWithNestedTemplates() {
+        var hook1 = new Hook("Hook1");
+        var hook2 = new Hook("Hook2");
+
+        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+
+        var template2 = Template.make("b", (String b) -> body(
+            "{\n",
+            template1.asToken(b + "A"),
+            hook1.insert(template1.asToken(b + "B")),
+            hook2.insert(template1.asToken(b + "C")),
+            template1.asToken(b + "D"),
+            hook1.anchor(
+                template1.asToken(b + "E"),
+                hook1.insert(template1.asToken(b + "F")),
+                hook2.insert(template1.asToken(b + "G")),
+                template1.asToken(b + "H"),
+                hook2.anchor(
+                    template1.asToken(b + "I"),
+                    hook1.insert(template1.asToken(b + "J")),
+                    hook2.insert(template1.asToken(b + "K")),
+                    template1.asToken(b + "L")
+                ),
+                template1.asToken(b + "M"),
+                hook1.insert(template1.asToken(b + "N")),
+                hook2.insert(template1.asToken(b + "O")),
+                template1.asToken(b + "O")
+            ),
+            template1.asToken(b + "P"),
+            hook1.insert(template1.asToken(b + "Q")),
+            hook2.insert(template1.asToken(b + "R")),
+            template1.asToken(b + "S"),
+            "}\n"
+        ));
+
+        // Test use of hooks across templates.
+        var template3 = Template.make(() -> body(
+            "{\n",
+            "base-A\n",
+            hook1.anchor(
+                "base-B\n",
+                hook2.anchor(
+                    "base-C\n",
+                    template2.asToken("sub-"),
+                    "base-D\n"
+                ),
+                "base-E\n"
+            ),
+            "base-F\n",
+            "}\n"
+        ));
+
+        String code = template3.render();
+        String expected =
+            """
+            {
+            base-A
+            x sub-B x
+            x sub-Q x
+            base-B
+            x sub-C x
+            x sub-G x
+            x sub-O x
+            x sub-R x
+            base-C
+            {
+            x sub-A x
+            x sub-D x
+            x sub-F x
+            x sub-J x
+            x sub-N x
+            x sub-E x
+            x sub-H x
+            x sub-K x
+            x sub-I x
+            x sub-L x
+            x sub-M x
+            x sub-O x
+            x sub-P x
+            x sub-S x
+            }
+            base-D
+            base-E
+            base-F
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testHookRecursion() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("a", (String a) -> body("x #a x\n"));
+
+        var template2 = Template.make("b", (String b) -> body(
+            "<\n",
+            template1.asToken(b + "A"),
+            hook1.insert(template1.asToken(b + "B")), // sub-B is rendered before template2.
+            template1.asToken(b + "C"),
+            "inner-hook-start\n",
+            hook1.anchor(
+                "inner-hook-end\n",
+                template1.asToken(b + "E"),
+                hook1.insert(template1.asToken(b + "E")),
+                template1.asToken(b + "F")
+            ),
+            ">\n"
+        ));
+
+        // Test use of hooks across templates.
+        var template3 = Template.make(() -> body(
+            "{\n",
+            "hook-start\n",
+            hook1.anchor(
+                "hook-end\n",
+                hook1.insert(template2.asToken("sub-")),
+                "base-C\n"
+            ),
+            "base-D\n",
+            "}\n"
+        ));
+
+        String code = template3.render();
+        String expected =
+            """
+            {
+            hook-start
+            x sub-B x
+            <
+            x sub-A x
+            x sub-C x
+            inner-hook-start
+            x sub-E x
+            inner-hook-end
+            x sub-E x
+            x sub-F x
+            >
+            hook-end
+            base-C
+            base-D
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDollar() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("a", (String a) -> body("x $name #a x\n"));
+
+        var template2 = Template.make("a", (String a) -> body(
+            "{\n",
+            "y $name #a y\n",
+            template1.asToken($("name")),
+            "}\n"
+        ));
+
+        var template3 = Template.make(() -> body(
+            "{\n",
+            "$name\n",
+            "$name", "\n",
+            "z $name z\n",
+            "z$name z\n",
+            template1.asToken("name"),     // does not capture -> literal "$name"
+            template1.asToken("$name"),    // does not capture -> literal "$name"
+            template1.asToken($("name")),  // capture replacement name "name_1"
+            hook1.anchor(
+                "$name\n"
+            ),
+            "break\n",
+            hook1.anchor(
+                "one\n",
+                hook1.insert(template1.asToken($("name"))),
+                "two\n",
+                template1.asToken($("name")),
+                "three\n",
+                hook1.insert(template2.asToken($("name"))),
+                "four\n"
+            ),
+            "}\n"
+        ));
+
+        String code = template3.render();
+        String expected =
+            """
+            {
+            name_1
+            name_1
+            z name_1 z
+            zname_1 z
+            x name_2 name x
+            x name_3 $name x
+            x name_4 name_1 x
+            name_1
+            break
+            x name_5 name_1 x
+            {
+            y name_7 name_1 y
+            x name_8 name_7 x
+            }
+            one
+            two
+            x name_6 name_1 x
+            three
+            four
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testLet() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("a", (String a) -> body(
+            "{\n",
+            "y #a y\n",
+            let("b", "<" + a + ">"),
+            "y #b y\n",
+            "}\n"
+        ));
+
+        var template2 = Template.make("a", (Integer a) -> let("b", a * 10, b ->
+            body(
+                let("c", b * 3),
+                "abc = #a #b #c\n"
+            )
+        ));
+
+        var template3 = Template.make(() -> body(
+            "{\n",
+            let("x", "abc"),
+            template1.asToken("alpha"),
+            "break\n",
+            "x1 = #x\n",
+            hook1.anchor(
+                "x2 = #x\n", // leaks inside
+                template1.asToken("beta"),
+                let("y", "one"),
+                "y1 = #y\n"
+            ),
+            "break\n",
+            "y2 = #y\n", // leaks outside
+            "break\n",
+            template2.asToken(5),
+            "}\n"
+        ));
+
+        String code = template3.render();
+        String expected =
+            """
+            {
+            {
+            y alpha y
+            y <alpha> y
+            }
+            break
+            x1 = abc
+            x2 = abc
+            {
+            y beta y
+            y <beta> y
+            }
+            y1 = one
+            break
+            y2 = one
+            break
+            abc = 5 50 150
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDollarAndHashtagBrackets() {
+        var template1 = Template.make(() -> body(
+            let("xyz", "abc"),
+            let("xyz_", "def"),
+            let("xyz_klm", "ghi"),
+            let("klm", "jkl"),
+            """
+            no bracket: #xyz #xyz_klm #xyz_#klm
+            no bracket: $var $var_two $var_$two
+            with bracket: #{xyz} #{xyz_klm} #{xyz}_#{klm}
+            with bracket: ${var} ${var_two} ${var}_${two}
+            """
+        ));
+
+        String code = template1.render();
+        String expected =
+            """
+            no bracket: abc ghi defjkl
+            no bracket: var_1 var_two_1 var__1two_1
+            with bracket: abc ghi abc_jkl
+            with bracket: var_1 var_two_1 var_1_two_1
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testSelector() {
+        var template1 = Template.make("a", (String a) -> body(
+            "<\n",
+            "x #a x\n",
+            ">\n"
+        ));
+
+        var template2 = Template.make("a", (String a) -> body(
+            "<\n",
+            "y #a y\n",
+            ">\n"
+        ));
+
+        var template3 = Template.make("a", (Integer a) -> body(
+            "[\n",
+            "z #a z\n",
+            // Select which template should be used:
+            a > 0 ? template1.asToken("A_" + a)
+                  : template2.asToken("B_" + a),
+            "]\n"
+        ));
+
+        var template4 = Template.make(() -> body(
+            "{\n",
+            template3.asToken(-1),
+            "break\n",
+            template3.asToken(0),
+            "break\n",
+            template3.asToken(1),
+            "break\n",
+            template3.asToken(2),
+            "}\n"
+        ));
+
+        String code = template4.render();
+        String expected =
+            """
+            {
+            [
+            z -1 z
+            <
+            y B_-1 y
+            >
+            ]
+            break
+            [
+            z 0 z
+            <
+            y B_0 y
+            >
+            ]
+            break
+            [
+            z 1 z
+            <
+            x A_1 x
+            >
+            ]
+            break
+            [
+            z 2 z
+            <
+            x A_2 x
+            >
+            ]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testRecursion() {
+        // Binding allows use of template1 inside template1, via the Binding indirection.
+        var binding1 = new TemplateBinding<Template.OneArg<Integer>>();
+
+        var template1 = Template.make("i", (Integer i) -> body(
+            "[ #i\n",
+            // We cannot yet use the template1 directly, as it is being defined.
+            // So we use binding1 instead.
+            i < 0 ? "done\n" : binding1.get().asToken(i - 1),
+            "] #i\n"
+        ));
+        binding1.bind(template1);
+
+        var template2 = Template.make(() -> body(
+            "{\n",
+            // Now, we can use template1 normally, as it is already defined.
+            template1.asToken(3),
+            "}\n"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            {
+            [ 3
+            [ 2
+            [ 1
+            [ 0
+            [ -1
+            done
+            ] -1
+            ] 0
+            ] 1
+            ] 2
+            ] 3
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testFuel() {
+        var template1 = Template.make(() -> body(
+            let("f", fuel()),
+
+            "<#f>\n"
+        ));
+
+        // Binding allows use of template2 inside template2, via the Binding indirection.
+        var binding2 = new TemplateBinding<Template.OneArg<Integer>>();
+        var template2 = Template.make("i", (Integer i) -> body(
+            let("f", fuel()),
+
+            "[ #i #f\n",
+            template1.asToken(),
+            fuel() <= 60.f ? "done" : binding2.get().asToken(i - 1),
+            "] #i #f\n"
+        ));
+        binding2.bind(template2);
+
+        var template3 = Template.make(() -> body(
+            "{\n",
+            template2.asToken(3),
+            "}\n"
+        ));
+
+        String code = template3.render();
+        String expected =
+            """
+            {
+            [ 3 90.0f
+            <80.0f>
+            [ 2 80.0f
+            <70.0f>
+            [ 1 70.0f
+            <60.0f>
+            [ 0 60.0f
+            <50.0f>
+            done] 0 60.0f
+            ] 1 70.0f
+            ] 2 80.0f
+            ] 3 90.0f
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testFuelCustom() {
+        var template1 = Template.make(() -> body(
+            setFuelCost(2.0f),
+            let("f", fuel()),
+
+            "<#f>\n"
+        ));
+
+        // Binding allows use of template2 inside template2, via the Binding indirection.
+        var binding2 = new TemplateBinding<Template.OneArg<Integer>>();
+        var template2 = Template.make("i", (Integer i) -> body(
+            setFuelCost(3.0f),
+            let("f", fuel()),
+
+            "[ #i #f\n",
+            template1.asToken(),
+            fuel() <= 5.f ? "done\n" : binding2.get().asToken(i - 1),
+            "] #i #f\n"
+        ));
+        binding2.bind(template2);
+
+        var template3 = Template.make(() -> body(
+            setFuelCost(5.0f),
+            let("f", fuel()),
+
+            "{ #f\n",
+            template2.asToken(3),
+            "} #f\n"
+        ));
+
+        String code = template3.render(20.0f);
+        String expected =
+            """
+            { 20.0f
+            [ 3 15.0f
+            <12.0f>
+            [ 2 12.0f
+            <9.0f>
+            [ 1 9.0f
+            <6.0f>
+            [ 0 6.0f
+            <3.0f>
+            [ -1 3.0f
+            <0.0f>
+            done
+            ] -1 3.0f
+            ] 0 6.0f
+            ] 1 9.0f
+            ] 2 12.0f
+            ] 3 15.0f
+            } 20.0f
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames1() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make(() -> body(
+            "[",
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).hasAny(),
+            ", ",
+            dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).count(),
+            ", names: {",
+            String.join(", ", dataNames(MUTABLE_OR_IMMUTABLE).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            "}]\n"
+        ));
+
+        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> body(
+            addDataName(name, type, MUTABLE),
+            "define #type #name\n",
+            template1.asToken()
+        ));
+
+        var template3 = Template.make(() -> body(
+            "<\n",
+            hook1.insert(template2.asToken($("name"), myInt)),
+            "$name = 5\n",
+            ">\n"
+        ));
+
+        var template4 = Template.make(() -> body(
+            "{\n",
+            template1.asToken(),
+            hook1.anchor(
+                template1.asToken(),
+                "something\n",
+                template3.asToken(),
+                "more\n",
+                template1.asToken(),
+                "more\n",
+                template2.asToken($("name"), myInt),
+                "more\n",
+                template1.asToken()
+            ),
+            template1.asToken(),
+            "}\n"
+        ));
+
+        String code = template4.render();
+        String expected =
+            """
+            {
+            [false, 0, names: {}]
+            define int name_4
+            [true, 1, names: {name_4}]
+            [false, 0, names: {}]
+            something
+            <
+            name_4 = 5
+            >
+            more
+            [true, 1, names: {name_4}]
+            more
+            define int name_1
+            [true, 2, names: {name_4, name_1}]
+            more
+            [true, 1, names: {name_4}]
+            [false, 0, names: {}]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames2() {
+        var hook1 = new Hook("Hook1");
+
+        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> body(
+            "  #mutability: [",
+            dataNames(mutability).exactOf(myInt).hasAny(),
+            ", ",
+            dataNames(mutability).exactOf(myInt).count(),
+            ", names: {",
+            String.join(", ", dataNames(mutability).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            "}]\n"
+        ));
+
+        var template1 = Template.make("type", (DataName.Type type) -> body(
+            "[#type:\n",
+            template0.asToken(type, MUTABLE),
+            template0.asToken(type, IMMUTABLE),
+            template0.asToken(type, MUTABLE_OR_IMMUTABLE),
+            "]\n"
+        ));
+
+        var template2 = Template.make("name", "type", (String name, DataName.Type type) -> body(
+            addDataName(name, type, MUTABLE),
+            "define mutable #type #name\n",
+            template1.asToken(type)
+        ));
+
+        var template3 = Template.make("name", "type", (String name, DataName.Type type) -> body(
+            addDataName(name, type, IMMUTABLE),
+            "define immutable #type #name\n",
+            template1.asToken(type)
+        ));
+
+        var template4 = Template.make("type", (DataName.Type type) -> body(
+            "{ $store\n",
+            hook1.insert(template2.asToken($("name"), type)),
+            "$name = 5\n",
+            "} $store\n"
+        ));
+
+        var template5 = Template.make("type", (DataName.Type type) -> body(
+            "{ $load\n",
+            hook1.insert(template3.asToken($("name"), type)),
+            "blackhole($name)\n",
+            "} $load\n"
+        ));
+
+        var template6 = Template.make("type", (DataName.Type type) -> body(
+            let("v", dataNames(MUTABLE).exactOf(type).sample().name()),
+            "{ $sample\n",
+            "#v = 7\n",
+            "} $sample\n"
+        ));
+
+        var template7 = Template.make("type", (DataName.Type type) -> body(
+            let("v", dataNames(MUTABLE_OR_IMMUTABLE).exactOf(type).sample().name()),
+            "{ $sample\n",
+            "blackhole(#v)\n",
+            "} $sample\n"
+        ));
+
+        var template8 = Template.make(() -> body(
+            "class $X {\n",
+            template1.asToken(myInt),
+            hook1.anchor(
+                "begin $body\n",
+                template1.asToken(myInt),
+                "start with immutable\n",
+                template5.asToken(myInt),
+                "then load from it\n",
+                template7.asToken(myInt),
+                template1.asToken(myInt),
+                "now make something mutable\n",
+                template4.asToken(myInt),
+                "then store to it\n",
+                template6.asToken(myInt),
+                template1.asToken(myInt)
+            ),
+            template1.asToken(myInt),
+            "}\n"
+        ));
+
+        String code = template8.render();
+        String expected =
+            """
+            class X_1 {
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            define immutable int name_10
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [true, 1, names: {name_10}]
+              MUTABLE_OR_IMMUTABLE: [true, 1, names: {name_10}]
+            ]
+            define mutable int name_21
+            [int:
+              MUTABLE: [true, 1, names: {name_21}]
+              IMMUTABLE: [true, 1, names: {name_10}]
+              MUTABLE_OR_IMMUTABLE: [true, 2, names: {name_10, name_21}]
+            ]
+            begin body_1
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            start with immutable
+            { load_10
+            blackhole(name_10)
+            } load_10
+            then load from it
+            { sample_16
+            blackhole(name_10)
+            } sample_16
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [true, 1, names: {name_10}]
+              MUTABLE_OR_IMMUTABLE: [true, 1, names: {name_10}]
+            ]
+            now make something mutable
+            { store_21
+            name_21 = 5
+            } store_21
+            then store to it
+            { sample_27
+            name_21 = 7
+            } sample_27
+            [int:
+              MUTABLE: [true, 1, names: {name_21}]
+              IMMUTABLE: [true, 1, names: {name_10}]
+              MUTABLE_OR_IMMUTABLE: [true, 2, names: {name_10, name_21}]
+            ]
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames3() {
+        var hook1 = new Hook("Hook1");
+
+        var template0 = Template.make("type", "mutability", (DataName.Type type, DataName.Mutability mutability) -> body(
+            "  #mutability: [",
+            dataNames(mutability).exactOf(myInt).hasAny(),
+            ", ",
+            dataNames(mutability).exactOf(myInt).count(),
+            ", names: {",
+            String.join(", ", dataNames(mutability).exactOf(myInt).toList().stream().map(DataName::name).toList()),
+            "}]\n"
+        ));
+
+        var template1 = Template.make("type", (DataName.Type type) -> body(
+            "[#type:\n",
+            template0.asToken(type, MUTABLE),
+            template0.asToken(type, IMMUTABLE),
+            template0.asToken(type, MUTABLE_OR_IMMUTABLE),
+            "]\n"
+        ));
+
+        var template2 = Template.make(() -> body(
+            "class $Y {\n",
+            template1.asToken(myInt),
+            hook1.anchor(
+                "begin $body\n",
+                template1.asToken(myInt),
+                "define mutable $v1\n",
+                addDataName($("v1"), myInt, MUTABLE),
+                template1.asToken(myInt),
+                "define immutable $v2\n",
+                addDataName($("v2"), myInt, IMMUTABLE),
+                template1.asToken(myInt)
+            ),
+            template1.asToken(myInt),
+            "}\n"
+        ));
+
+        String code = template2.render();
+        String expected =
+            """
+            class Y_1 {
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            begin body_1
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            define mutable v1_1
+            [int:
+              MUTABLE: [true, 1, names: {v1_1}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [true, 1, names: {v1_1}]
+            ]
+            define immutable v2_1
+            [int:
+              MUTABLE: [true, 1, names: {v1_1}]
+              IMMUTABLE: [true, 1, names: {v2_1}]
+              MUTABLE_OR_IMMUTABLE: [true, 2, names: {v1_1, v2_1}]
+            ]
+            [int:
+              MUTABLE: [false, 0, names: {}]
+              IMMUTABLE: [false, 0, names: {}]
+              MUTABLE_OR_IMMUTABLE: [false, 0, names: {}]
+            ]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testDataNames4() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("type", (DataName.Type type) -> body(
+            "[#type:\n",
+            "  exact: ",
+            dataNames(MUTABLE).exactOf(type).hasAny(),
+            ", ",
+            dataNames(MUTABLE).exactOf(type).count(),
+            ", {",
+            String.join(", ", dataNames(MUTABLE).exactOf(type).toList().stream().map(DataName::name).toList()),
+            "}\n",
+            "  subtype: ",
+            dataNames(MUTABLE).subtypeOf(type).hasAny(),
+            ", ",
+            dataNames(MUTABLE).subtypeOf(type).count(),
+            ", {",
+            String.join(", ", dataNames(MUTABLE).subtypeOf(type).toList().stream().map(DataName::name).toList()),
+            "}\n",
+            "  supertype: ",
+            dataNames(MUTABLE).supertypeOf(type).hasAny(),
+            ", ",
+            dataNames(MUTABLE).supertypeOf(type).count(),
+            ", {",
+            String.join(", ", dataNames(MUTABLE).supertypeOf(type).toList().stream().map(DataName::name).toList()),
+            "}\n",
+            "]\n"
+        ));
+
+        List<DataName.Type> types = List.of(myClassA, myClassA1, myClassA2, myClassA11, myClassB);
+        var template2 = Template.make(() -> body(
+            "DataNames:\n",
+            types.stream().map(t -> template1.asToken(t)).toList()
+        ));
+
+        var template3 = Template.make("type", (DataName.Type type) -> body(
+            let("name", dataNames(MUTABLE).subtypeOf(type).sample()),
+            "Sample #type: #name\n"
+        ));
+
+        var template4 = Template.make(() -> body(
+            "class $W {\n",
+            template2.asToken(),
+            hook1.anchor(
+                "Create name for myClassA11, should be visible for the super classes\n",
+                addDataName($("v1"), myClassA11, MUTABLE),
+                template3.asToken(myClassA11),
+                template3.asToken(myClassA1),
+                template3.asToken(myClassA),
+                "Create name for myClassA, should never be visible for the sub classes\n",
+                addDataName($("v2"), myClassA, MUTABLE),
+                template3.asToken(myClassA11),
+                template3.asToken(myClassA1),
+                template2.asToken()
+            ),
+            template2.asToken(),
+            "}\n"
+        ));
+
+        String code = template4.render();
+        String expected =
+            """
+            class W_1 {
+            DataNames:
+            [myClassA:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA1:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA11:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            Create name for myClassA11, should be visible for the super classes
+            Sample myClassA11: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA1: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Create name for myClassA, should never be visible for the sub classes
+            Sample myClassA11: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            Sample myClassA1: DataName[name=v1_1, type=myClassA11, mutable=true, weight=1]
+            DataNames:
+            [myClassA:
+              exact: true, 1, {v2_1}
+              subtype: true, 2, {v1_1, v2_1}
+              supertype: true, 1, {v2_1}
+            ]
+            [myClassA1:
+              exact: false, 0, {}
+              subtype: true, 1, {v1_1}
+              supertype: true, 1, {v2_1}
+            ]
+            [myClassA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: true, 1, {v2_1}
+            ]
+            [myClassA11:
+              exact: true, 1, {v1_1}
+              subtype: true, 1, {v1_1}
+              supertype: true, 2, {v1_1, v2_1}
+            ]
+            [myClassB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            DataNames:
+            [myClassA:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA1:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassA11:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [myClassB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    // Test duplicate names in safe cases.
+    public static void testDataNames5() {
+        var hook1 = new Hook("Hook1");
+        var hook2 = new Hook("Hook2");
+
+        // It is safe in separate Hook scopes.
+        var template1 = Template.make(() -> body(
+            hook1.anchor(
+                addDataName("name1", myInt, MUTABLE)
+            ),
+            hook1.anchor(
+                addDataName("name1", myInt, MUTABLE)
+            )
+        ));
+
+        // It is safe in separate Template scopes.
+        var template2 = Template.make(() -> body(
+            addDataName("name2", myInt, MUTABLE)
+        ));
+        var template3 = Template.make(() -> body(
+            template2.asToken(),
+            template2.asToken()
+        ));
+
+        var template4 = Template.make(() -> body(
+            // The following is not safe, it would collide
+            // with (1), because it would be inserted to the
+            // hook1.anchor in template5, and hence be available
+            // inside the scope where (1) is available.
+            // See: testFailingAddNameDuplication8
+            // addDataName("name", myInt, MUTABLE),
+            hook2.anchor(
+                // (2) This one is added second. Since it is
+                //     inside the hook2.anchor, it does not go
+                //     out to the hook1.anchor, and is not
+                //     available inside the scope of (1).
+                addDataName("name3", myInt, MUTABLE)
+            )
+        ));
+        var template5 = Template.make(() -> body(
+            hook1.anchor(
+                // (1) this is the first one we add.
+                addDataName("name3", myInt, MUTABLE)
+            )
+        ));
+
+        // Put it all together into a single test.
+        var template6 = Template.make(() -> body(
+            template1.asToken(),
+            template3.asToken(),
+            template5.asToken()
+        ));
+
+        String code = template1.render();
+        String expected = "";
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames1() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("type", (StructuralName.Type type) -> body(
+            "[#type:\n",
+            "  exact: ",
+            structuralNames().exactOf(type).hasAny(),
+            ", ",
+            structuralNames().exactOf(type).count(),
+            ", {",
+            String.join(", ", structuralNames().exactOf(type).toList().stream().map(StructuralName::name).toList()),
+            "}\n",
+            "  subtype: ",
+            structuralNames().subtypeOf(type).hasAny(),
+            ", ",
+            structuralNames().subtypeOf(type).count(),
+            ", {",
+            String.join(", ", structuralNames().subtypeOf(type).toList().stream().map(StructuralName::name).toList()),
+            "}\n",
+            "  supertype: ",
+            structuralNames().supertypeOf(type).hasAny(),
+            ", ",
+            structuralNames().supertypeOf(type).count(),
+            ", {",
+            String.join(", ", structuralNames().supertypeOf(type).toList().stream().map(StructuralName::name).toList()),
+            "}\n",
+            "]\n"
+        ));
+
+        List<StructuralName.Type> types = List.of(myStructuralTypeA,
+                                                  myStructuralTypeA1,
+                                                  myStructuralTypeA2,
+                                                  myStructuralTypeA11,
+                                                  myStructuralTypeB);
+        var template2 = Template.make(() -> body(
+            "StructuralNames:\n",
+            types.stream().map(t -> template1.asToken(t)).toList()
+        ));
+
+        var template3 = Template.make("type", (StructuralName.Type type) -> body(
+            let("name", structuralNames().subtypeOf(type).sample()),
+            "Sample #type: #name\n"
+        ));
+
+        var template4 = Template.make(() -> body(
+            "class $Q {\n",
+            template2.asToken(),
+            hook1.anchor(
+                "Create name for myStructuralTypeA11, should be visible for the supertypes\n",
+                addStructuralName($("v1"), myStructuralTypeA11),
+                template3.asToken(myStructuralTypeA11),
+                template3.asToken(myStructuralTypeA1),
+                template3.asToken(myStructuralTypeA),
+                "Create name for myStructuralTypeA, should never be visible for the subtypes\n",
+                addStructuralName($("v2"), myStructuralTypeA),
+                template3.asToken(myStructuralTypeA11),
+                template3.asToken(myStructuralTypeA1),
+                template2.asToken()
+            ),
+            template2.asToken(),
+            "}\n"
+        ));
+
+        String code = template4.render();
+        String expected =
+            """
+            class Q_1 {
+            StructuralNames:
+            [StructuralA:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA1:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA11:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            Create name for myStructuralTypeA11, should be visible for the supertypes
+            Sample StructuralA11: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA1: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Create name for myStructuralTypeA, should never be visible for the subtypes
+            Sample StructuralA11: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            Sample StructuralA1: StructuralName[name=v1_1, type=StructuralA11, weight=1]
+            StructuralNames:
+            [StructuralA:
+              exact: true, 1, {v2_1}
+              subtype: true, 2, {v1_1, v2_1}
+              supertype: true, 1, {v2_1}
+            ]
+            [StructuralA1:
+              exact: false, 0, {}
+              subtype: true, 1, {v1_1}
+              supertype: true, 1, {v2_1}
+            ]
+            [StructuralA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: true, 1, {v2_1}
+            ]
+            [StructuralA11:
+              exact: true, 1, {v1_1}
+              subtype: true, 1, {v1_1}
+              supertype: true, 2, {v1_1, v2_1}
+            ]
+            [StructuralB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            StructuralNames:
+            [StructuralA:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA1:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA2:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralA11:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            [StructuralB:
+              exact: false, 0, {}
+              subtype: false, 0, {}
+              supertype: false, 0, {}
+            ]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testStructuralNames2() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make("type", (StructuralName.Type type) -> body(
+            "[#type: ",
+            structuralNames().exactOf(type).hasAny(),
+            ", ",
+            structuralNames().exactOf(type).count(),
+            ", names: {",
+            String.join(", ", structuralNames().exactOf(type).toList().stream().map(StructuralName::name).toList()),
+            "}]\n"
+        ));
+
+        var template2 = Template.make("name", "type", (String name, StructuralName.Type type) -> body(
+            addStructuralName(name, type),
+            "define #type #name\n"
+        ));
+
+        var template3 = Template.make("type", (StructuralName.Type type) -> body(
+            "{ $access\n",
+            hook1.insert(template2.asToken($("name"), type)),
+            "$name = 5\n",
+            "} $access\n"
+        ));
+
+        var template4 = Template.make("type", (StructuralName.Type type) -> body(
+            let("v", structuralNames().exactOf(type).sample().name()),
+            "{ $sample\n",
+            "blackhole(#v)\n",
+            "} $sample\n"
+        ));
+
+        var template8 = Template.make(() -> body(
+            "class $X {\n",
+            template1.asToken(myStructuralTypeA),
+            template1.asToken(myStructuralTypeB),
+            hook1.anchor(
+                "begin $body\n",
+                template1.asToken(myStructuralTypeA),
+                template1.asToken(myStructuralTypeB),
+                "start with A\n",
+                template3.asToken(myStructuralTypeA),
+                "then access it\n",
+                template4.asToken(myStructuralTypeA),
+                template1.asToken(myStructuralTypeA),
+                template1.asToken(myStructuralTypeB),
+                "now make a B\n",
+                template3.asToken(myStructuralTypeB),
+                "then access to it\n",
+                template4.asToken(myStructuralTypeB),
+                template1.asToken(myStructuralTypeA),
+                template1.asToken(myStructuralTypeB)
+            ),
+            template1.asToken(myStructuralTypeA),
+            template1.asToken(myStructuralTypeB),
+            "}\n"
+        ));
+
+        String code = template8.render();
+        String expected =
+            """
+            class X_1 {
+            [StructuralA: false, 0, names: {}]
+            [StructuralB: false, 0, names: {}]
+            define StructuralA name_6
+            define StructuralB name_11
+            begin body_1
+            [StructuralA: false, 0, names: {}]
+            [StructuralB: false, 0, names: {}]
+            start with A
+            { access_6
+            name_6 = 5
+            } access_6
+            then access it
+            { sample_8
+            blackhole(name_6)
+            } sample_8
+            [StructuralA: true, 1, names: {name_6}]
+            [StructuralB: false, 0, names: {}]
+            now make a B
+            { access_11
+            name_11 = 5
+            } access_11
+            then access to it
+            { sample_13
+            blackhole(name_11)
+            } sample_13
+            [StructuralA: true, 1, names: {name_6}]
+            [StructuralB: true, 1, names: {name_11}]
+            [StructuralA: false, 0, names: {}]
+            [StructuralB: false, 0, names: {}]
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    record MyItem(DataName.Type type, String op) {}
+
+    public static void testListArgument() {
+        var template1 = Template.make("item", (MyItem item) -> body(
+            let("type", item.type()),
+            let("op", item.op()),
+            "#type apply #op\n"
+        ));
+
+        var template2 = Template.make("list", (List<MyItem> list) -> body(
+            "class $Z {\n",
+            // Use template1 for every item in the list.
+            list.stream().map(item -> template1.asToken(item)).toList(),
+            "}\n"
+        ));
+
+        List<MyItem> list = List.of(new MyItem(myInt, "+"),
+                                    new MyItem(myInt, "-"),
+                                    new MyItem(myInt, "*"),
+                                    new MyItem(myInt, "/"),
+                                    new MyItem(myLong, "+"),
+                                    new MyItem(myLong, "-"),
+                                    new MyItem(myLong, "*"),
+                                    new MyItem(myLong, "/"));
+
+        String code = template2.render(list);
+        String expected =
+            """
+            class Z_1 {
+            int apply +
+            int apply -
+            int apply *
+            int apply /
+            long apply +
+            long apply -
+            long apply *
+            long apply /
+            }
+            """;
+        checkEQ(code, expected);
+    }
+
+    public static void testFailingNestedRendering() {
+        var template1 = Template.make(() -> body(
+            "alpha\n"
+        ));
+
+        var template2 = Template.make(() -> body(
+            "beta\n",
+            // Nested "render" call not allowed!
+            template1.render(),
+            "gamma\n"
+        ));
+
+        String code = template2.render();
+    }
+
+    public static void testFailingDollarName1() {
+        var template1 = Template.make(() -> body(
+            let("x", $("")) // empty string not allowed
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName2() {
+        var template1 = Template.make(() -> body(
+            let("x", $("#abc")) // "#" character not allowed
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName3() {
+        var template1 = Template.make(() -> body(
+            let("x", $("abc#")) // "#" character not allowed
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName4() {
+        var template1 = Template.make(() -> body(
+            let("x", $(null)) // Null input to dollar
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName5() {
+        var template1 = Template.make(() -> body(
+            "$" // empty dollar name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName6() {
+        var template1 = Template.make(() -> body(
+            "asdf$" // empty dollar name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName7() {
+        var template1 = Template.make(() -> body(
+            "asdf$1" // Bad pattern after dollar
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarName8() {
+        var template1 = Template.make(() -> body(
+            "abc$$abc" // empty dollar name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingLetName1() {
+        var template1 = Template.make(() -> body(
+            let(null, $("abc")) // Null input for hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName1() {
+        // Empty Template argument
+        var template1 = Template.make("", (String x) -> body(
+        ));
+        String code = template1.render("abc");
+    }
+
+    public static void testFailingHashtagName2() {
+        // "#" character not allowed in template argument
+        var template1 = Template.make("abc#abc", (String x) -> body(
+        ));
+        String code = template1.render("abc");
+    }
+
+    public static void testFailingHashtagName3() {
+        var template1 = Template.make(() -> body(
+            // Empty let hashtag name not allowed
+            let("", "abc")
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName4() {
+        var template1 = Template.make(() -> body(
+            // "#" character not allowed in let hashtag name
+            let("xyz#xyz", "abc")
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName5() {
+        var template1 = Template.make(() -> body(
+            "#" // empty hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName6() {
+        var template1 = Template.make(() -> body(
+            "asdf#" // empty hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName7() {
+        var template1 = Template.make(() -> body(
+            "asdf#1" // Bad pattern after hashtag
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtagName8() {
+        var template1 = Template.make(() -> body(
+            "abc##abc" // empty hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName1() {
+        var template1 = Template.make(() -> body(
+            "#$" // empty hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName2() {
+        var template1 = Template.make(() -> body(
+            "$#" // empty dollar name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName3() {
+        var template1 = Template.make(() -> body(
+            "#$name" // empty hashtag name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName4() {
+        var template1 = Template.make(() -> body(
+            "$#name" // empty dollar name
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingHook() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make(() -> body(
+            "alpha\n"
+        ));
+
+        var template2 = Template.make(() -> body(
+            "beta\n",
+            // Use hook without hook1.anchor
+            hook1.insert(template1.asToken()),
+            "gamma\n"
+        ));
+
+        String code = template2.render();
+    }
+
+    public static void testFailingSample1() {
+        var template1 = Template.make(() -> body(
+            // No variable added yet.
+            let("v", dataNames(MUTABLE).exactOf(myInt).sample().name()),
+            "v is #v\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingSample2() {
+        var template1 = Template.make(() -> body(
+            // no type restriction
+            let("v", dataNames(MUTABLE).sample().name()),
+            "v is #v\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtag1() {
+        // Duplicate hashtag definition from arguments.
+        var template1 = Template.make("a", "a", (String _, String _) -> body(
+            "nothing\n"
+        ));
+
+        String code = template1.render("x", "y");
+    }
+
+    public static void testFailingHashtag2() {
+        var template1 = Template.make("a", (String _) -> body(
+            // Duplicate hashtag name
+            let("a", "x"),
+            "nothing\n"
+        ));
+
+        String code = template1.render("y");
+    }
+
+    public static void testFailingHashtag3() {
+        var template1 = Template.make(() -> body(
+            let("a", "x"),
+            // Duplicate hashtag name
+            let("a", "y"),
+            "nothing\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingHashtag4() {
+        var template1 = Template.make(() -> body(
+            // Missing hashtag name definition
+            "#a\n"
+        ));
+
+        String code = template1.render();
+    }
+
+    public static void testFailingBinding1() {
+        var binding = new TemplateBinding<Template.ZeroArgs>();
+        var template1 = Template.make(() -> body(
+            "nothing\n"
+        ));
+        binding.bind(template1);
+        // Duplicate bind
+        binding.bind(template1);
+    }
+
+    public static void testFailingBinding2() {
+        var binding = new TemplateBinding<Template.ZeroArgs>();
+        var template1 = Template.make(() -> body(
+            "nothing\n",
+            // binding was never bound.
+            binding.get()
+        ));
+        // Should have bound the binding here.
+        String code = template1.render();
+    }
+
+    public static void testFailingAddDataName1() {
+        var template1 = Template.make(() -> body(
+            // Must pick either MUTABLE or IMMUTABLE.
+            addDataName("name", myInt, MUTABLE_OR_IMMUTABLE)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddDataName2() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addDataName("name", myInt, MUTABLE, 0)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddDataName3() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addDataName("name", myInt, MUTABLE, -1)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddDataName4() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addDataName("name", myInt, MUTABLE, 1001)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddStructuralName1() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addStructuralName("name", myStructuralTypeA, 0)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddStructuralName2() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addStructuralName("name", myStructuralTypeA, -1)
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingAddStructuralName3() {
+        var template1 = Template.make(() -> body(
+            // weight out of bounds [0..1000]
+            addStructuralName("name", myStructuralTypeA, 1001)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in the same scope, name identical -> expect RendererException.
+    public static void testFailingAddNameDuplication1() {
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE),
+            addDataName("name", myInt, MUTABLE)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in the same scope, names have different mutability -> expect RendererException.
+    public static void testFailingAddNameDuplication2() {
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE),
+            addDataName("name", myInt, IMMUTABLE)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in the same scope, names have different type -> expect RendererException.
+    public static void testFailingAddNameDuplication3() {
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE),
+            addDataName("name", myLong, MUTABLE)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in the same scope, name identical -> expect RendererException.
+    public static void testFailingAddNameDuplication4() {
+        var template1 = Template.make(() -> body(
+            addStructuralName("name", myStructuralTypeA),
+            addStructuralName("name", myStructuralTypeA)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in the same scope, names have different type -> expect RendererException.
+    public static void testFailingAddNameDuplication5() {
+        var template1 = Template.make(() -> body(
+            addStructuralName("name", myStructuralTypeA),
+            addStructuralName("name", myStructuralTypeB)
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in inner Template, name identical -> expect RendererException.
+    public static void testFailingAddNameDuplication6() {
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE)
+        ));
+        var template2 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE),
+            template1.asToken()
+        ));
+        String code = template2.render();
+    }
+
+    // Duplicate name in Hook scope, name identical -> expect RendererException.
+    public static void testFailingAddNameDuplication7() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE),
+            hook1.anchor(
+                addDataName("name", myInt, MUTABLE)
+            )
+        ));
+        String code = template1.render();
+    }
+
+    // Duplicate name in Hook.insert, name identical -> expect RendererException.
+    public static void testFailingAddNameDuplication8() {
+        var hook1 = new Hook("Hook1");
+
+        var template1 = Template.make(() -> body(
+            addDataName("name", myInt, MUTABLE)
+        ));
+
+        var template2 = Template.make(() -> body(
+            hook1.anchor(
+                addDataName("name", myInt, MUTABLE),
+                hook1.insert(template1.asToken())
+            )
+        ));
+        String code = template2.render();
+    }
+
+    public static void expectRendererException(FailingTest test, String errorPrefix) {
+        try {
+            test.run();
+            System.out.println("Should have thrown RendererException with prefix: " + errorPrefix);
+            throw new RuntimeException("Should have thrown!");
+        } catch(RendererException e) {
+            if (!e.getMessage().startsWith(errorPrefix)) {
+                System.out.println("Should have thrown with prefix: " + errorPrefix);
+                System.out.println("got: " + e.getMessage());
+                throw new RuntimeException("Prefix mismatch", e);
+            }
+        }
+    }
+
+    public static void expectIllegalArgumentException(FailingTest test, String errorPrefix) {
+        try {
+            test.run();
+            System.out.println("Should have thrown IllegalArgumentException with prefix: " + errorPrefix);
+            throw new RuntimeException("Should have thrown!");
+        } catch(IllegalArgumentException e) {
+            if (!e.getMessage().startsWith(errorPrefix)) {
+                System.out.println("Should have thrown with prefix: " + errorPrefix);
+                System.out.println("got: " + e.getMessage());
+                throw new RuntimeException("Prefix mismatch", e);
+            }
+        }
+    }
+
+    public static void expectUnsupportedOperationException(FailingTest test, String errorPrefix) {
+        try {
+            test.run();
+            System.out.println("Should have thrown UnsupportedOperationException with prefix: " + errorPrefix);
+            throw new RuntimeException("Should have thrown!");
+        } catch(UnsupportedOperationException e) {
+            if (!e.getMessage().startsWith(errorPrefix)) {
+                System.out.println("Should have thrown with prefix: " + errorPrefix);
+                System.out.println("got: " + e.getMessage());
+                throw new RuntimeException("Prefix mismatch", e);
+            }
+        }
+    }
+
+    public static void checkEQ(String code, String expected) {
+        if (!code.equals(expected)) {
+            System.out.println("\"" + code + "\"");
+            System.out.println("\"" + expected + "\"");
+            throw new RuntimeException("Template rendering mismatch!");
+        }
+    }
+}

From a653ff48933bfd72c7c3d004ccc5bd0d9c1162cb Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 4 Jun 2025 13:39:31 +0000
Subject: [PATCH 849/901] 8358536:
 jdk/jfr/api/consumer/TestRecordingFileWrite.java times out

Reviewed-by: mgronlun
---
 .../classes/jdk/jfr/internal/tool/PrettyWriter.java      | 9 ++++++---
 test/jdk/ProblemList.txt                                 | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
index 274a21d9b49..10f50095247 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
@@ -117,11 +117,11 @@ private static record TypeInformation(Long id, List<ValueDescriptor> contextualF
     // At the same time, a too large window, means it will take more time
     // before the first event is printed and the tool will feel unresponsive.
     private static final int EVENT_WINDOW_SIZE = 1_000_000;
-    private final PriorityQueue<Timestamp> timeline = new PriorityQueue<>(EVENT_WINDOW_SIZE + 4);
-    private final Map<Long, TypeInformation> typeInformation = new HashMap<>();
-    private final Map<Long, SequencedSet<RecordedEvent>> contexts = new HashMap<>();
     private final boolean showExact;
     private RecordedEvent currentEvent;
+    private PriorityQueue<Timestamp> timeline;
+    private Map<Long, TypeInformation> typeInformation;
+    private Map<Long, SequencedSet<RecordedEvent>> contexts;
 
     public PrettyWriter(PrintWriter destination, boolean showExact) {
         super(destination);
@@ -133,6 +133,9 @@ public PrettyWriter(PrintWriter destination) {
     }
 
     void print(Path source) throws IOException {
+        timeline = new PriorityQueue<>(EVENT_WINDOW_SIZE + 4);
+        typeInformation = new HashMap<>();
+        contexts = new HashMap<>();
         printBegin();
         int counter = 0;
         try (RecordingFile file = new RecordingFile(source)) {
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index f44dd5c7a7d..28bb2a1f033 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -774,7 +774,6 @@ 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/TestRecordingFileWrite.java                8358536 generic-all
 
 ############################################################################
 

From 0352477ff5977b0010e62000adbde88026a49a7e Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Wed, 4 Jun 2025 13:50:36 +0000
Subject: [PATCH 850/901] 8357660: [JVMCI] Add support for retrieving all
 BootstrapMethodInvocations directly from ConstantPool

Reviewed-by: dnsimon, yzheng
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  9 ++++
 .../jdk/vm/ci/hotspot/CompilerToVM.java       | 14 ++++-
 .../vm/ci/hotspot/HotSpotConstantPool.java    | 51 +++++++++++++++++--
 .../classes/jdk/vm/ci/meta/ConstantPool.java  | 35 ++++++++++++-
 .../ci/hotspot/test/TestDynamicConstant.java  | 47 +++++++++++++++--
 5 files changed, 144 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 4f6d4aaa099..d45036ced94 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -813,6 +813,14 @@ C2V_VMENTRY_NULL(jobject, lookupConstantInPool, (JNIEnv* env, jobject, ARGUMENT_
   return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(obj));
 C2V_END
 
+C2V_VMENTRY_0(jint, getNumIndyEntries, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp)))
+  constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
+  if (cp->cache()->resolved_indy_entries() == nullptr) {
+    return 0;
+  }
+  return cp->resolved_indy_entries_length();
+C2V_END
+
 C2V_VMENTRY_NULL(jobjectArray, resolveBootstrapMethod, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint index))
   constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
   constantTag tag = cp->tag_at(index);
@@ -3320,6 +3328,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "lookupAppendixInPool",                         CC "(" HS_CONSTANT_POOL2 "II)" OBJECTCONSTANT,                                        FN_PTR(lookupAppendixInPool)},
   {CC "lookupMethodInPool",                           CC "(" HS_CONSTANT_POOL2 "IB" HS_METHOD2 ")" HS_METHOD,                               FN_PTR(lookupMethodInPool)},
   {CC "lookupConstantInPool",                         CC "(" HS_CONSTANT_POOL2 "IZ)" JAVACONSTANT,                                          FN_PTR(lookupConstantInPool)},
+  {CC "getNumIndyEntries",                            CC "(" HS_CONSTANT_POOL2 ")I",                                                        FN_PTR(getNumIndyEntries)},
   {CC "resolveBootstrapMethod",                       CC "(" HS_CONSTANT_POOL2 "I)[" OBJECT,                                                FN_PTR(resolveBootstrapMethod)},
   {CC "bootstrapArgumentIndexAt",                     CC "(" HS_CONSTANT_POOL2 "II)I",                                                      FN_PTR(bootstrapArgumentIndexAt)},
   {CC "getUncachedStringInPool",                      CC "(" HS_CONSTANT_POOL2 "I)" JAVACONSTANT,                                           FN_PTR(getUncachedStringInPool)},
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index 045b1f0fc12..0cb56354498 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -468,9 +468,19 @@ int decodeFieldIndexToCPIndex(HotSpotConstantPool constantPool, int rawIndex) {
      */
     int decodeMethodIndexToCPIndex(HotSpotConstantPool constantPool, int rawIndex) {
       return decodeMethodIndexToCPIndex(constantPool, constantPool.getConstantPoolPointer(), rawIndex);
-  }
+    }
+
+    private native int decodeMethodIndexToCPIndex(HotSpotConstantPool constantPool, long constantPoolPointer, int rawIndex);
+
+    /**
+     * Returns the number of {@code ResolvedIndyEntry}s present within this constant
+     * pool.
+     */
+    int getNumIndyEntries(HotSpotConstantPool constantPool) {
+        return getNumIndyEntries(constantPool, constantPool.getConstantPoolPointer());
+    }
 
-  private native int decodeMethodIndexToCPIndex(HotSpotConstantPool constantPool, long constantPoolPointer, int rawIndex);
+    private native int getNumIndyEntries(HotSpotConstantPool constantPool, long constantPoolPointer);
 
     /**
      * Resolves the details for invoking the bootstrap method associated with the
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 84fb21d1948..20e3915527d 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
@@ -25,6 +25,7 @@
 import java.util.AbstractList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import jdk.vm.ci.common.JVMCIError;
 import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
@@ -530,19 +531,21 @@ public int size() {
         }
     }
 
-    static class BootstrapMethodInvocationImpl implements BootstrapMethodInvocation {
+    class BootstrapMethodInvocationImpl implements BootstrapMethodInvocation {
         private final boolean indy;
         private final ResolvedJavaMethod method;
         private final String name;
         private final JavaConstant type;
         private final List<JavaConstant> staticArguments;
+        private final int cpiOrIndyIndex;
 
-        BootstrapMethodInvocationImpl(boolean indy, ResolvedJavaMethod method, String name, JavaConstant type, List<JavaConstant> staticArguments) {
+        BootstrapMethodInvocationImpl(boolean indy, ResolvedJavaMethod method, String name, JavaConstant type, List<JavaConstant> staticArguments, int cpiOrIndyIndex) {
             this.indy = indy;
             this.method = method;
             this.name = name;
             this.type = type;
             this.staticArguments = staticArguments;
+            this.cpiOrIndyIndex = cpiOrIndyIndex;
         }
 
         @Override
@@ -570,6 +573,24 @@ public List<JavaConstant> getStaticArguments() {
             return staticArguments;
         }
 
+        @Override
+        public void resolve() {
+            if (isInvokeDynamic()) {
+                loadReferencedType(cpiOrIndyIndex, Bytecodes.INVOKEDYNAMIC);
+            } else {
+                lookupConstant(cpiOrIndyIndex, true);
+            }
+        }
+
+        @Override
+        public JavaConstant lookup() {
+            if (isInvokeDynamic()) {
+                return lookupAppendix(cpiOrIndyIndex, Bytecodes.INVOKEDYNAMIC);
+            } else {
+                return (JavaConstant) lookupConstant(cpiOrIndyIndex, false);
+            }
+        }
+
         @Override
         public String toString() {
             String static_args = staticArguments.stream().map(BootstrapMethodInvocationImpl::argumentAsString).collect(Collectors.joining(", ", "[", "]"));
@@ -612,12 +633,36 @@ public BootstrapMethodInvocation lookupBootstrapMethodInvocation(int index, int
                     int bss_index = bsciArgs[1];
                     staticArgumentsList = new CachedBSMArgs(this, bss_index, argCount);
                 }
-                return new BootstrapMethodInvocationImpl(tag.name.equals("InvokeDynamic"), method, name, type, staticArgumentsList);
+                boolean isIndy = tag.name.equals("InvokeDynamic");
+                return new BootstrapMethodInvocationImpl(isIndy, method, name, type, staticArgumentsList, isIndy ? index : cpi);
             default:
                 return null;
         }
     }
 
+    private boolean isDynamicEntry(int cpi) {
+        JvmConstant tagAt = getTagAt(cpi);
+        return tagAt != null && tagAt.name.equals("Dynamic");
+    }
+
+    @Override
+    public List<BootstrapMethodInvocation> lookupBootstrapMethodInvocations(boolean invokeDynamic){
+        if (invokeDynamic) {
+            int numIndys = compilerToVM().getNumIndyEntries(this);
+            if (numIndys == 0) {
+                return List.of();
+            }
+            return IntStream.range(0, numIndys)
+                            .mapToObj(i -> lookupBootstrapMethodInvocation(i, Bytecodes.INVOKEDYNAMIC))
+                            .toList();
+        } else {
+            return IntStream.range(1, length())
+                            .filter(this::isDynamicEntry)
+                            .mapToObj(cpi -> lookupBootstrapMethodInvocation(cpi, -1))
+                            .toList();
+        }
+    }
+
     /**
      * Gets the {@link JavaConstant} for the {@code ConstantValue} attribute of a field.
      */
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
index 2273b256f03..0b7fd70762d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ConstantPool.java
@@ -186,11 +186,28 @@ interface BootstrapMethodInvocation {
          * }
          * </pre>
          *
-         * The other types of entries are already resolved an can be used directly.
+         * The other types of entries are already resolved and can be used directly.
          *
          * @jvms 5.4.3.6
          */
         List<JavaConstant> getStaticArguments();
+
+        /**
+         * Resolves the element corresponding to this bootstrap. If
+         * {@code isInvokeDynamic()}, then the corresponding invoke dynamic is resolved.
+         * If {@code !isInvokeDynamic()}, then the dynamic constant pool entry will be
+         * resolved.
+         *
+         * @jvms 5.4.3.6
+         */
+        void resolve();
+
+        /**
+         * If {@code isInvokeDynamic()}, then this method looks up the corresponding
+         * invoke dynamic's appendix. If {@code !isInvokeDynamic()}, then this will
+         * return the constant pool entry's value.
+         */
+        JavaConstant lookup();
     }
 
     /**
@@ -204,13 +221,27 @@ interface BootstrapMethodInvocation {
      * @param opcode must be {@code Bytecodes.INVOKEDYNAMIC}, or -1 if
      *            {@code index} was not decoded from a bytecode stream
      * @return the bootstrap method invocation details or {@code null} if the entry specified by {@code index}
-     *         is not a {@code CONSTANT_Dynamic_info} or @{code CONSTANT_InvokeDynamic_info}
+     *         is not a {@code CONSTANT_Dynamic_info} or {@code CONSTANT_InvokeDynamic_info}
      * @jvms 4.7.23 The {@code BootstrapMethods} Attribute
      */
     default BootstrapMethodInvocation lookupBootstrapMethodInvocation(int index, int opcode) {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Returns either the BootstrapMethodInvocation instances for all invokedynamic
+     * bytecodes which reference this constant pool, or all
+     * {@code CONSTANT_Dynamic_info} BootstrapMethodInvocations within this constant
+     * pool. The returned List is unmodifiable; calls to any mutator method will
+     * always cause {@code UnsupportedOperationException} to be thrown.
+     *
+     * @param invokeDynamic when true, return all invokedynamic
+     *                      BootstrapMethodInvocations; otherwise, return all
+     *                      {@code CONSTANT_Dynamic_info}
+     *                      BootstrapMethodInvocations.
+     */
+    List<BootstrapMethodInvocation> lookupBootstrapMethodInvocations(boolean invokeDynamic);
+
     /**
      * Looks up a reference to a type. If {@code opcode} is non-negative, then resolution checks
      * specific to the bytecode it denotes are performed if the type is already resolved. Should any
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java
index b22cb01d81a..b6e4f9cf2ef 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java
@@ -49,7 +49,7 @@
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -376,9 +376,10 @@ private void testLookupBootstrapMethodInvocation(CondyType condyType, MetaAccess
         ResolvedJavaMethod concat = metaAccess.lookupJavaMethod(m);
         ConstantPool cp = concat.getConstantPool();
 
-        Set<String> expectedBSMs = Set.of(
-            "jdk.vm.ci.hotspot.test.TestDynamicConstant.shouldNotBeCalledBSM",
-            "java.lang.invoke.StringConcatFactory.makeConcatWithConstants"
+        // Contains a map of (bootstrap method names, resolvable) values.
+        Map<String, Boolean> expectedIndyBSMs = Map.of(
+            "jdk.vm.ci.hotspot.test.TestDynamicConstant.shouldNotBeCalledBSM", false,
+            "java.lang.invoke.StringConcatFactory.makeConcatWithConstants", true
         );
 
         for (int cpi = 1; cpi < cp.length(); cpi++) {
@@ -389,9 +390,10 @@ private void testLookupBootstrapMethodInvocation(CondyType condyType, MetaAccess
                 String bsm = bsmi.getMethod().format("%H.%n");
                 if (tag.equals("InvokeDynamic")) {
                     Assert.assertTrue(bsmi.isInvokeDynamic());
-                    Assert.assertTrue(expectedBSMs.contains(bsm), expectedBSMs.toString());
+                    Assert.assertTrue(expectedIndyBSMs.containsKey(bsm), expectedIndyBSMs.toString());
                 } else {
                     Assert.assertFalse(bsmi.isInvokeDynamic());
+                    Assert.assertNull(bsmi.lookup());
                     checkBsmName(condyType, bsm);
                     List<JavaConstant> staticArguments = bsmi.getStaticArguments();
                     for (int i = 0; i < staticArguments.size(); ++i) {
@@ -423,6 +425,41 @@ private void testLookupBootstrapMethodInvocation(CondyType condyType, MetaAccess
         }
 
         testLoadReferencedType(concat, cp);
+
+        testLookupBootstrapMethodInvocations(condyType, cp, expectedIndyBSMs);
+    }
+
+    private static void testLookupBootstrapMethodInvocations(CondyType condyType, ConstantPool cp, Map<String, Boolean> expectedIndyBSMs) {
+        List<BootstrapMethodInvocation> indyBSMs = cp.lookupBootstrapMethodInvocations(true);
+        Assert.assertEquals(indyBSMs.size(), 2);
+        for (var bsmi : indyBSMs) {
+            String bsm = bsmi.getMethod().format("%H.%n");
+            Assert.assertTrue(expectedIndyBSMs.containsKey(bsm), expectedIndyBSMs.toString());
+            Assert.assertTrue(bsmi.isInvokeDynamic());
+            if (expectedIndyBSMs.get(bsm)) {
+                bsmi.resolve();
+                Assert.assertNotNull(bsmi.lookup());
+            } else {
+                try {
+                    bsmi.resolve();
+                } catch (BootstrapMethodError bme) {
+                    // expected error
+                }
+                Assert.assertNull(bsmi.lookup());
+            }
+        }
+
+        List<BootstrapMethodInvocation> condyBSMs = cp.lookupBootstrapMethodInvocations(false);
+        int expectedNumCondys = switch(condyType) {
+            case CALL_DIRECT_BSM, CALL_INDIRECT_BSM -> 1;
+            case CALL_DIRECT_WITH_ARGS_BSM, CALL_INDIRECT_WITH_ARGS_BSM -> 2;
+        };
+        Assert.assertEquals(condyBSMs.size(), expectedNumCondys);
+        for (var bsmi : condyBSMs) {
+            Assert.assertTrue(!bsmi.isInvokeDynamic());
+            bsmi.resolve();
+            Assert.assertNotNull(bsmi.lookup());
+        }
     }
 
     private static void checkBsmName(CondyType condyType, String bsm) {

From ae1892fb0fb6b7646f9ca60067d6945ccea7f888 Mon Sep 17 00:00:00 2001
From: Igor Veresov <iveresov@openjdk.org>
Date: Wed, 4 Jun 2025 14:07:49 +0000
Subject: [PATCH 851/901] 8358003: KlassTrainingData initializer reads garbage
 holder

Reviewed-by: coleenp, shade, vlivanov
---
 src/hotspot/share/oops/trainingData.cpp | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/oops/trainingData.cpp b/src/hotspot/share/oops/trainingData.cpp
index 543462b1182..2ae1ac18699 100644
--- a/src/hotspot/share/oops/trainingData.cpp
+++ b/src/hotspot/share/oops/trainingData.cpp
@@ -432,24 +432,11 @@ void KlassTrainingData::print_on(outputStream* st, bool name_only) const {
 }
 
 KlassTrainingData::KlassTrainingData(InstanceKlass* klass) : TrainingData(klass) {
-  if (holder() == klass) {
-    return;   // no change to make
-  }
-
-  jobject hmj = _holder_mirror;
-  if (hmj != nullptr) {   // clear out previous handle, if any
-    _holder_mirror = nullptr;
-    assert(JNIHandles::is_global_handle(hmj), "");
-    JNIHandles::destroy_global(hmj);
-  }
-
-  if (klass != nullptr) {
-    Handle hm(JavaThread::current(), klass->java_mirror());
-    hmj = JNIHandles::make_global(hm);
-    Atomic::release_store(&_holder_mirror, hmj);
-  }
-
-  Atomic::release_store(&_holder, const_cast<InstanceKlass*>(klass));
+  assert(klass != nullptr, "");
+  Handle hm(JavaThread::current(), klass->java_mirror());
+  jobject hmj = JNIHandles::make_global(hm);
+  _holder_mirror = hmj;
+  _holder = klass;
   assert(holder() == klass, "");
 }
 

From a2723d91dfba2850e3070083fa94dc3fecc46a00 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Wed, 4 Jun 2025 14:16:20 +0000
Subject: [PATCH 852/901] 8345347: Test
 runtime/cds/TestDefaultArchiveLoading.java should accept VM flags or be
 marked as flagless

Reviewed-by: lmesnik, stefank, ccheung
---
 .../jtreg/runtime/cds/TestDefaultArchiveLoading.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
index ddc3603b16d..d90618b51f2 100644
--- a/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
+++ b/test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.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.
  * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
  * @test id=nocoops_nocoh
  * @summary Test Loading of default archives in all configurations
  * @requires vm.cds
+ * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -37,6 +38,7 @@
  * @test id=nocoops_coh
  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
  * @requires vm.cds
+ * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -48,6 +50,7 @@
  * @test id=coops_nocoh
  * @summary Test Loading of default archives in all configurations
  * @requires vm.cds
+ * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -59,6 +62,7 @@
  * @test id=coops_coh
  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
  * @requires vm.cds
+ * @requires vm.cds.write.archived.java.heap
  * @requires vm.bits == 64
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -131,7 +135,7 @@ public static void main(String[] args) throws Exception {
             default: throw new RuntimeException("Invalid argument " + args[0]);
         }
 
-        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
                 "-XX:" + coh + "UseCompactObjectHeaders",
                 "-XX:" + coops + "UseCompressedOops",
                 "-Xlog:cds",

From 4e314cb9e025672b2f7b68cc021fa516ee219ad8 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 4 Jun 2025 14:21:34 +0000
Subject: [PATCH 853/901] 8356000: C1/C2-only modes use 2 compiler threads on
 low CPU count machines

Reviewed-by: kvn, dfenacci, galder
---
 .../share/compiler/compilationPolicy.cpp      |  11 +-
 .../arguments/TestCompilerCounts.java         | 177 ++++++++++++++++++
 2 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/arguments/TestCompilerCounts.java

diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index d95debeda44..39c90281c79 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -550,6 +550,7 @@ void CompilationPolicy::initialize() {
     int count = CICompilerCount;
     bool c1_only = CompilerConfig::is_c1_only();
     bool c2_only = CompilerConfig::is_c2_or_jvmci_compiler_only();
+    int min_count = (c1_only || c2_only) ? 1 : 2;
 
 #ifdef _LP64
     // Turn on ergonomic compiler count selection
@@ -560,7 +561,7 @@ void CompilationPolicy::initialize() {
       // Simple log n seems to grow too slowly for tiered, try something faster: log n * log log n
       int log_cpu = log2i(os::active_processor_count());
       int loglog_cpu = log2i(MAX2(log_cpu, 1));
-      count = MAX2(log_cpu * loglog_cpu * 3 / 2, 2);
+      count = MAX2(log_cpu * loglog_cpu * 3 / 2, min_count);
       // Make sure there is enough space in the code cache to hold all the compiler buffers
       size_t c1_size = 0;
 #ifdef COMPILER1
@@ -574,7 +575,7 @@ void CompilationPolicy::initialize() {
       int max_count = (ReservedCodeCacheSize - (CodeCacheMinimumUseSpace DEBUG_ONLY(* 3))) / (int)buffer_size;
       if (count > max_count) {
         // Lower the compiler count such that all buffers fit into the code cache
-        count = MAX2(max_count, c1_only ? 1 : 2);
+        count = MAX2(max_count, min_count);
       }
       FLAG_SET_ERGO(CICompilerCount, count);
     }
@@ -593,9 +594,10 @@ void CompilationPolicy::initialize() {
 #endif
 
     if (c1_only) {
-      // No C2 compiler thread required
+      // No C2 compiler threads are needed
       set_c1_count(count);
     } else if (c2_only) {
+      // No C1 compiler threads are needed
       set_c2_count(count);
     } else {
 #if INCLUDE_JVMCI
@@ -613,6 +615,9 @@ void CompilationPolicy::initialize() {
     }
     assert(count == c1_count() + c2_count(), "inconsistent compiler thread count");
     set_increase_threshold_at_ratio();
+  } else {
+    // Interpreter mode creates no compilers
+    FLAG_SET_ERGO(CICompilerCount, 0);
   }
   set_start_time(nanos_to_millis(os::javaTimeNanos()));
 }
diff --git a/test/hotspot/jtreg/compiler/arguments/TestCompilerCounts.java b/test/hotspot/jtreg/compiler/arguments/TestCompilerCounts.java
new file mode 100644
index 00000000000..420dc2b3414
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arguments/TestCompilerCounts.java
@@ -0,0 +1,177 @@
+/*
+ * 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
+ * @library /test/lib /
+ * @bug 8356000
+ * @requires vm.flagless
+ * @requires vm.bits == "64"
+ * @run driver compiler.arguments.TestCompilerCounts
+ */
+
+package compiler.arguments;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.function.Function;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.cli.CommandLineOptionTest;
+
+public class TestCompilerCounts {
+
+    // Try not to go over max CPU count on the machine, since we do not
+    // know if the rest of runtime would accept it.
+    // For local testing, feel free to override this to a larger value
+    // if you want to see how heuristics works on even larger machines.
+    static final int MAX_CPUS = Runtime.getRuntime().availableProcessors();
+
+    // Test at most 16 CPUs linearly, to limit test execution time.
+    // After this limit, go for exponential steps.
+    static final int MAX_LINEAR_CPUS = Math.min(16, MAX_CPUS);
+
+    public static void main(String[] args) throws Throwable {
+        // CICompilerCount=0 is incorrect in default modes.
+        fail("-XX:CICompilerCount=0");
+
+        // Interpreter-only mode accepts all values, but sets 0 threads
+        pass(0, "-XX:CICompilerCount=1", "-XX:TieredStopAtLevel=0");
+
+        // C1/C2 only modes accept CICompilerCount=1
+        pass(1, "-XX:CICompilerCount=1", "-XX:TieredStopAtLevel=1");
+        pass(1, "-XX:CICompilerCount=1", "-XX:TieredStopAtLevel=2");
+        pass(1, "-XX:CICompilerCount=1", "-XX:TieredStopAtLevel=3");
+        pass(1, "-XX:CICompilerCount=1", "-XX:-TieredCompilation");
+
+        // C1+C2 modes need at least 2 threads
+        fail("-XX:CICompilerCount=1");
+        fail("-XX:CICompilerCount=1", "-XX:TieredStopAtLevel=4");
+
+        // Overriding the CICompilerCount overrides compiler counts hard.
+        for (int count = 2; count <= MAX_CPUS; count += (count >= MAX_LINEAR_CPUS ? count : 1)) {
+            String opt = "-XX:CICompilerCount=" + count;
+
+            // Interpreter-only mode always sets 0 threads
+            pass(0, opt, "-XX:TieredStopAtLevel=0");
+
+            // All compiled modes accept reasonable CICompilerCount
+            pass(count, opt);
+            pass(count, opt, "-XX:TieredStopAtLevel=1");
+            pass(count, opt, "-XX:TieredStopAtLevel=2");
+            pass(count, opt, "-XX:TieredStopAtLevel=3");
+            pass(count, opt, "-XX:TieredStopAtLevel=4");
+            pass(count, opt, "-XX:-TieredCompilation");
+        }
+
+        // Per CPU heuristics is disabled, we are going to set up defaults.
+
+        for (int cpus = 2; cpus <= MAX_CPUS; cpus += (cpus >= MAX_LINEAR_CPUS ? cpus : 1)) {
+            String opt = "-XX:ActiveProcessorCount=" + cpus;
+            String opt2 = "-XX:-CICompilerCountPerCPU";
+
+            // Interpreter-only mode always set 0 threads
+            pass(0, opt, opt2, "-XX:TieredStopAtLevel=0");
+
+            // All compiled modes default to 2 threads, statically compiled in
+            pass(2, opt, opt2);
+            pass(2, opt, opt2, "-XX:TieredStopAtLevel=1");
+            pass(2, opt, opt2, "-XX:TieredStopAtLevel=2");
+            pass(2, opt, opt2, "-XX:TieredStopAtLevel=3");
+            pass(2, opt, opt2, "-XX:TieredStopAtLevel=4");
+            pass(2, opt, opt2, "-XX:-TieredCompilation");
+        }
+
+        // Otherwise, we set CICompilerCount heuristically.
+
+        // Check hitting the lower values exactly first.
+        for (int cpus = 1; cpus <= 3; cpus++) {
+            String opt = "-XX:ActiveProcessorCount=" + cpus;
+
+            // Interpreter-only mode always set 0 threads
+            pass(0, opt, "-XX:TieredStopAtLevel=0");
+
+            // Non-tiered modes set 1 thread
+            pass(1, opt, "-XX:TieredStopAtLevel=1");
+            pass(1, opt, "-XX:TieredStopAtLevel=2");
+            pass(1, opt, "-XX:TieredStopAtLevel=3");
+            pass(1, opt, "-XX:-TieredCompilation");
+
+            // Tiered modes set 2 threads
+            pass(2, opt);
+            pass(2, opt, "-XX:TieredStopAtLevel=4");
+        }
+
+        // Check what heuristics sets past the trivial number of CPUs.
+        for (int cpus = 4; cpus <= MAX_CPUS; cpus += (cpus >= MAX_LINEAR_CPUS ? cpus : 1)) {
+            String opt = "-XX:ActiveProcessorCount=" + cpus;
+
+            // Interpreter-only mode always set 0 threads
+            pass(0, opt, "-XX:TieredStopAtLevel=0");
+
+            // Non-tiered modes
+            int nonTieredCount = heuristicCount(cpus, false);
+            pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=1");
+            pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=2");
+            pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=3");
+            pass(nonTieredCount, opt, "-XX:-TieredCompilation");
+
+            // Tiered modes
+            int tieredCount = heuristicCount(cpus, true);
+            pass(tieredCount, opt);
+            pass(tieredCount, opt, "-XX:TieredStopAtLevel=4");
+
+            // Also check that heuristics did not set up more threads than CPUs available
+            Asserts.assertTrue(nonTieredCount <= cpus,
+                "Non-tiered count is larger than number of CPUs: " + nonTieredCount + " > " + cpus);
+            Asserts.assertTrue(tieredCount <= cpus,
+                "Tiered count is larger than number of CPUs: " + tieredCount + " > " + cpus);
+        }
+    }
+
+    // Direct translation from CompilationPolicy::initialize:
+    public static int heuristicCount(int cpus, boolean tiered) {
+        int log_cpu = log2(cpus);
+        int loglog_cpu = log2(Math.max(log_cpu, 1));
+        int min_count = tiered ? 2 : 1;
+        return Math.max(log_cpu * loglog_cpu * 3 / 2, min_count);
+    }
+
+    public static int log2(int v) {
+        return (int)(Math.log(v) / Math.log(2));
+    }
+
+    public static void pass(int count, String... args) throws Throwable {
+        CommandLineOptionTest.verifyOptionValueForSameVM("CICompilerCount", "" + count, "", args);
+    }
+
+    public static void fail(String... args) throws Throwable {
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(args);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldNotHaveExitValue(0);
+    }
+
+}

From c90921644643bc731cab4c014a5144a74e670df1 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Wed, 4 Jun 2025 14:56:20 +0000
Subject: [PATCH 854/901] 8357443: ZGC: Optimize old page iteration in remap
 remembered phase

Reviewed-by: aboldtch, eosterlund
---
 src/hotspot/share/gc/z/zGeneration.cpp |  19 +++--
 src/hotspot/share/gc/z/zGeneration.hpp |   6 ++
 src/hotspot/share/gc/z/zRemembered.cpp | 104 +++++++++++++------------
 src/hotspot/share/gc/z/zRemembered.hpp |  22 ++++++
 4 files changed, 93 insertions(+), 58 deletions(-)

diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index 78860bbe4cb..772c5a0a98b 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -948,6 +948,14 @@ void ZGenerationYoung::register_with_remset(ZPage* page) {
   _remembered.register_found_old(page);
 }
 
+ZRemembered* ZGenerationYoung::remembered() {
+  return &_remembered;
+}
+
+void ZGenerationYoung::remap_current_remset(ZRemsetTableIterator* iter) {
+  _remembered.remap_current(iter);
+}
+
 ZGenerationTracer* ZGenerationYoung::jfr_tracer() {
   return &_jfr_tracer;
 }
@@ -1435,7 +1443,7 @@ typedef ClaimingCLDToOopClosure<ClassLoaderData::_claim_none> ZRemapCLDClosure;
 
 class ZRemapYoungRootsTask : public ZTask {
 private:
-  ZGenerationPagesParallelIterator _old_pages_parallel_iterator;
+  ZRemsetTableIterator             _remset_table_iterator;
 
   ZRootsIteratorAllColored         _roots_colored;
   ZRootsIteratorAllUncolored       _roots_uncolored;
@@ -1449,7 +1457,7 @@ class ZRemapYoungRootsTask : public ZTask {
 public:
   ZRemapYoungRootsTask(ZPageTable* page_table, ZPageAllocator* page_allocator)
     : ZTask("ZRemapYoungRootsTask"),
-      _old_pages_parallel_iterator(page_table, ZGenerationId::old, page_allocator),
+      _remset_table_iterator(ZGeneration::young()->remembered(), false /* previous */),
       _roots_colored(ZGenerationIdOptional::old),
       _roots_uncolored(ZGenerationIdOptional::old),
       _cl_colored(),
@@ -1472,11 +1480,8 @@ class ZRemapYoungRootsTask : public ZTask {
 
     {
       ZStatTimerWorker timer(ZSubPhaseConcurrentRemapRememberedOld);
-      _old_pages_parallel_iterator.do_pages([&](ZPage* page) {
-        // Visit all object fields that potentially pointing into young generation
-        page->oops_do_current_remembered(ZBarrier::load_barrier_on_oop_field);
-        return true;
-      });
+      // Visit all object fields that potentially pointing into young generation
+      ZGeneration::young()->remap_current_remset(&_remset_table_iterator);
     }
   }
 };
diff --git a/src/hotspot/share/gc/z/zGeneration.hpp b/src/hotspot/share/gc/z/zGeneration.hpp
index 922efe5ef9e..13adc06b123 100644
--- a/src/hotspot/share/gc/z/zGeneration.hpp
+++ b/src/hotspot/share/gc/z/zGeneration.hpp
@@ -191,6 +191,7 @@ class ZGenerationYoung : public ZGeneration {
   friend class VM_ZMarkStartYoung;
   friend class VM_ZMarkStartYoungAndOld;
   friend class VM_ZRelocateStartYoung;
+  friend class ZRemapYoungRootsTask;
   friend class ZYoungTypeSetter;
 
 private:
@@ -219,6 +220,8 @@ class ZGenerationYoung : public ZGeneration {
   void pause_relocate_start();
   void concurrent_relocate();
 
+  ZRemembered* remembered();
+
 public:
   ZGenerationYoung(ZPageTable* page_table,
                    const ZForwardingTable* old_forwarding_table,
@@ -252,6 +255,9 @@ class ZGenerationYoung : public ZGeneration {
   // Register old pages with remembered set
   void register_with_remset(ZPage* page);
 
+  // Remap the oops of the current remembered set
+  void remap_current_remset(ZRemsetTableIterator* iter);
+
   // Serviceability
   ZGenerationTracer* jfr_tracer();
 
diff --git a/src/hotspot/share/gc/z/zRemembered.cpp b/src/hotspot/share/gc/z/zRemembered.cpp
index b94d676242c..815b914dd8d 100644
--- a/src/hotspot/share/gc/z/zRemembered.cpp
+++ b/src/hotspot/share/gc/z/zRemembered.cpp
@@ -392,69 +392,71 @@ struct ZRemsetTableEntry {
   ZForwarding* _forwarding;
 };
 
-class ZRemsetTableIterator {
-private:
-  ZRemembered* const            _remembered;
-  ZPageTable* const             _page_table;
-  const ZForwardingTable* const _old_forwarding_table;
-  volatile BitMap::idx_t        _claimed;
-
-public:
-  ZRemsetTableIterator(ZRemembered* remembered)
-    : _remembered(remembered),
-      _page_table(remembered->_page_table),
-      _old_forwarding_table(remembered->_old_forwarding_table),
-      _claimed(0) {}
+ZRemsetTableIterator::ZRemsetTableIterator(ZRemembered* remembered, bool previous)
+  : _remembered(remembered),
+    _bm(previous
+        ? _remembered->_found_old.previous_bitmap()
+        : _remembered->_found_old.current_bitmap()),
+    _page_table(remembered->_page_table),
+    _old_forwarding_table(remembered->_old_forwarding_table),
+    _claimed(0) {}
 
   // This iterator uses the "found old" optimization.
-  bool next(ZRemsetTableEntry* entry_addr)  {
-    BitMap* const bm = _remembered->_found_old.previous_bitmap();
+bool ZRemsetTableIterator::next(ZRemsetTableEntry* entry_addr) {
+  BitMap::idx_t prev = Atomic::load(&_claimed);
 
-    BitMap::idx_t prev = Atomic::load(&_claimed);
+  for (;;) {
+    if (prev == _bm->size()) {
+      return false;
+    }
 
-    for (;;) {
-      if (prev == bm->size()) {
-        return false;
-      }
+    const BitMap::idx_t page_index = _bm->find_first_set_bit(_claimed);
+    if (page_index == _bm->size()) {
+      Atomic::cmpxchg(&_claimed, prev, page_index, memory_order_relaxed);
+      return false;
+    }
 
-      const BitMap::idx_t page_index = bm->find_first_set_bit(_claimed);
-      if (page_index == bm->size()) {
-        Atomic::cmpxchg(&_claimed, prev, page_index, memory_order_relaxed);
-        return false;
-      }
+    const BitMap::idx_t res = Atomic::cmpxchg(&_claimed, prev, page_index + 1, memory_order_relaxed);
+    if (res != prev) {
+      // Someone else claimed
+      prev = res;
+      continue;
+    }
 
-      const BitMap::idx_t res = Atomic::cmpxchg(&_claimed, prev, page_index + 1, memory_order_relaxed);
-      if (res != prev) {
-        // Someone else claimed
-        prev = res;
-        continue;
-      }
+    // Found bit - look around for page or forwarding to scan
 
-      // Found bit - look around for page or forwarding to scan
+    ZForwarding* forwarding = nullptr;
+    if (ZGeneration::old()->is_phase_relocate()) {
+      forwarding = _old_forwarding_table->at(page_index);
+    }
 
-      ZForwarding* forwarding = nullptr;
-      if (ZGeneration::old()->is_phase_relocate()) {
-        forwarding = _old_forwarding_table->at(page_index);
-      }
+    ZPage* page = _page_table->at(page_index);
+    if (page != nullptr && !page->is_old()) {
+      page = nullptr;
+    }
 
-      ZPage* page = _page_table->at(page_index);
-      if (page != nullptr && !page->is_old()) {
-        page = nullptr;
-      }
+    if (page == nullptr && forwarding == nullptr) {
+      // Nothing to scan
+      continue;
+    }
 
-      if (page == nullptr && forwarding == nullptr) {
-        // Nothing to scan
-        continue;
-      }
+    // Found old page or old forwarding
+    entry_addr->_forwarding = forwarding;
+    entry_addr->_page = page;
 
-      // Found old page or old forwarding
-      entry_addr->_forwarding = forwarding;
-      entry_addr->_page = page;
+    return true;
+  }
+}
 
-      return true;
-    }
+void ZRemembered::remap_current(ZRemsetTableIterator* iter) {
+  for (ZRemsetTableEntry entry; iter->next(&entry);) {
+    assert(entry._forwarding == nullptr, "Shouldn't be looking for forwardings");
+    assert(entry._page != nullptr, "Must have found a page");
+    assert(entry._page->is_old(), "Should only have found old pages");
+
+    entry._page->oops_do_current_remembered(ZBarrier::load_barrier_on_oop_field);
   }
-};
+}
 
 // This task scans the remembered set and follows pointers when possible.
 // Interleaving remembered set scanning with marking makes the marking times
@@ -470,7 +472,7 @@ class ZRememberedScanMarkFollowTask : public ZRestartableTask {
     : ZRestartableTask("ZRememberedScanMarkFollowTask"),
       _remembered(remembered),
       _mark(mark),
-      _remset_table_iterator(remembered)  {
+      _remset_table_iterator(remembered, true /* previous */) {
     _mark->prepare_work();
     _remembered->_page_allocator->enable_safe_destroy();
   }
diff --git a/src/hotspot/share/gc/z/zRemembered.hpp b/src/hotspot/share/gc/z/zRemembered.hpp
index 1400472f2bc..6cc76f5dc26 100644
--- a/src/hotspot/share/gc/z/zRemembered.hpp
+++ b/src/hotspot/share/gc/z/zRemembered.hpp
@@ -35,7 +35,9 @@ class ZMark;
 class ZPage;
 class ZPageAllocator;
 class ZPageTable;
+class ZRemsetTableIterator;
 struct ZRememberedSetContaining;
+struct ZRemsetTableEntry;
 
 class ZRemembered {
   friend class ZRememberedScanMarkFollowTask;
@@ -99,6 +101,26 @@ class ZRemembered {
 
   // Register pages with the remembered set
   void register_found_old(ZPage* page);
+
+  // Remap the current remembered set
+  void remap_current(ZRemsetTableIterator* iter);
+};
+
+// This iterator uses the "found old" optimization to skip having to iterate
+// over the entire page table. Make sure to check where and how the FoundOld
+// data is cycled before using this iterator.
+class ZRemsetTableIterator {
+private:
+  ZRemembered* const            _remembered;
+  BitMap* const                 _bm;
+  ZPageTable* const             _page_table;
+  const ZForwardingTable* const _old_forwarding_table;
+  volatile BitMap::idx_t        _claimed;
+
+public:
+  ZRemsetTableIterator(ZRemembered* remembered, bool previous);
+
+  bool next(ZRemsetTableEntry* entry_addr);
 };
 
 #endif // SHARE_GC_Z_ZREMEMBERED_HPP

From ef47635d5a27b003937d865ad9067dbd151db888 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Wed, 4 Jun 2025 16:14:31 +0000
Subject: [PATCH 855/901] 8358015: Fix SequencedMap sequenced view method
 specifications

Reviewed-by: jpai, bchristi
---
 .../share/classes/java/util/AbstractMap.java  |  8 +++
 .../share/classes/java/util/SequencedMap.java | 65 +++++++++++++++++--
 .../util/SequencedCollection/BasicMap.java    | 10 +--
 3 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/src/java.base/share/classes/java/util/AbstractMap.java b/src/java.base/share/classes/java/util/AbstractMap.java
index 7c0b4d9dd1b..afc5b339354 100644
--- a/src/java.base/share/classes/java/util/AbstractMap.java
+++ b/src/java.base/share/classes/java/util/AbstractMap.java
@@ -877,6 +877,14 @@ public String toString() {
      */
     /* non-public */ abstract static class ViewCollection<E> implements Collection<E> {
         UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
+        // convert null entry return values into NSEE
+        static <T extends Map.Entry<?,?>> T nsee(T entry) {
+            if (entry == null) {
+                throw new NoSuchElementException();
+            } else {
+                return entry;
+            }
+        }
         abstract Collection<E> view();
 
         public boolean add(E t) { throw uoe(); }
diff --git a/src/java.base/share/classes/java/util/SequencedMap.java b/src/java.base/share/classes/java/util/SequencedMap.java
index 6bff204b65d..cf27b82896b 100644
--- a/src/java.base/share/classes/java/util/SequencedMap.java
+++ b/src/java.base/share/classes/java/util/SequencedMap.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
@@ -263,8 +263,15 @@ default V putLast(K k, V v) {
      *
      * @implSpec
      * The implementation in this interface returns a {@code SequencedSet} instance
-     * that behaves as follows. Its {@link SequencedSet#add add} and {@link
-     * SequencedSet#addAll addAll} methods throw {@link UnsupportedOperationException}.
+     * that behaves as follows. Its {@link SequencedSet#add add}, {@link
+     * SequencedSet#addAll addAll}, {@link SequencedSet#addFirst addFirst}, and {@link
+     * SequencedSet#addLast addLast} methods throw {@link UnsupportedOperationException}.
+     * Its {@link SequencedSet#getFirst getFirst} and {@link SequencedSet#getLast getLast}
+     * methods are implemented in terms of the {@link #firstEntry firstEntry} and {@link
+     * #lastEntry lastEntry} methods of this interface, respectively. Its {@link
+     * SequencedSet#removeFirst removeFirst} and {@link SequencedSet#removeLast removeLast}
+     * methods are implemented in terms of the {@link #pollFirstEntry pollFirstEntry} and
+     * {@link #pollLastEntry pollLastEntry} methods of this interface, respectively.
      * Its {@link SequencedSet#reversed reversed} method returns the {@link
      * #sequencedKeySet sequencedKeySet} view of the {@link #reversed reversed} view of
      * this map. Each of its other methods calls the corresponding method of the {@link
@@ -286,6 +293,16 @@ public boolean equals(Object other) {
             public int hashCode() {
                 return view().hashCode();
             }
+            public void addFirst(K k) { throw new UnsupportedOperationException(); }
+            public void addLast(K k) { throw new UnsupportedOperationException(); }
+            public K getFirst() { return nsee(SequencedMap.this.firstEntry()).getKey(); }
+            public K getLast() { return nsee(SequencedMap.this.lastEntry()).getKey(); }
+            public K removeFirst() {
+                return nsee(SequencedMap.this.pollFirstEntry()).getKey();
+            }
+            public K removeLast() {
+                return nsee(SequencedMap.this.pollLastEntry()).getKey();
+            }
         }
         return new SeqKeySet();
     }
@@ -295,8 +312,15 @@ public int hashCode() {
      *
      * @implSpec
      * The implementation in this interface returns a {@code SequencedCollection} instance
-     * that behaves as follows. Its {@link SequencedCollection#add add} and {@link
-     * SequencedCollection#addAll addAll} methods throw {@link UnsupportedOperationException}.
+     * that behaves as follows. Its {@link SequencedCollection#add add}, {@link
+     * SequencedCollection#addAll addAll}, {@link SequencedCollection#addFirst addFirst}, and {@link
+     * SequencedCollection#addLast addLast} methods throw {@link UnsupportedOperationException}.
+     * Its {@link SequencedCollection#getFirst getFirst} and {@link SequencedCollection#getLast getLast}
+     * methods are implemented in terms of the {@link #firstEntry firstEntry} and {@link
+     * #lastEntry lastEntry} methods of this interface, respectively. Its {@link
+     * SequencedCollection#removeFirst removeFirst} and {@link SequencedCollection#removeLast removeLast}
+     * methods are implemented in terms of the {@link #pollFirstEntry pollFirstEntry} and
+     * {@link #pollLastEntry pollLastEntry} methods of this interface, respectively.
      * Its {@link SequencedCollection#reversed reversed} method returns the {@link
      * #sequencedValues sequencedValues} view of the {@link #reversed reversed} view of
      * this map. Its {@link Object#equals equals} and {@link Object#hashCode hashCode} methods
@@ -313,6 +337,16 @@ Collection<V> view() {
             public SequencedCollection<V> reversed() {
                 return SequencedMap.this.reversed().sequencedValues();
             }
+            public void addFirst(V v) { throw new UnsupportedOperationException(); }
+            public void addLast(V v) { throw new UnsupportedOperationException(); }
+            public V getFirst() { return nsee(SequencedMap.this.firstEntry()).getValue(); }
+            public V getLast() { return nsee(SequencedMap.this.lastEntry()).getValue(); }
+            public V removeFirst() {
+                return nsee(SequencedMap.this.pollFirstEntry()).getValue();
+            }
+            public V removeLast() {
+                return nsee(SequencedMap.this.pollLastEntry()).getValue();
+            }
         }
         return new SeqValues();
     }
@@ -322,8 +356,15 @@ public SequencedCollection<V> reversed() {
      *
      * @implSpec
      * The implementation in this interface returns a {@code SequencedSet} instance
-     * that behaves as follows. Its {@link SequencedSet#add add} and {@link
-     * SequencedSet#addAll addAll} methods throw {@link UnsupportedOperationException}.
+     * that behaves as follows. Its {@link SequencedSet#add add}, {@link
+     * SequencedSet#addAll addAll}, {@link SequencedSet#addFirst addFirst}, and {@link
+     * SequencedSet#addLast addLast} methods throw {@link UnsupportedOperationException}.
+     * Its {@link SequencedSet#getFirst getFirst} and {@link SequencedSet#getLast getLast}
+     * methods are implemented in terms of the {@link #firstEntry firstEntry} and {@link
+     * #lastEntry lastEntry} methods of this interface, respectively. Its {@link
+     * SequencedSet#removeFirst removeFirst} and {@link SequencedSet#removeLast removeLast}
+     * methods are implemented in terms of the {@link #pollFirstEntry pollFirstEntry} and
+     * {@link #pollLastEntry pollLastEntry} methods of this interface, respectively.
      * Its {@link SequencedSet#reversed reversed} method returns the {@link
      * #sequencedEntrySet sequencedEntrySet} view of the {@link #reversed reversed} view of
      * this map. Each of its other methods calls the corresponding method of the {@link
@@ -346,6 +387,16 @@ public boolean equals(Object other) {
             public int hashCode() {
                 return view().hashCode();
             }
+            public void addFirst(Map.Entry<K, V> e) { throw new UnsupportedOperationException(); }
+            public void addLast(Map.Entry<K, V> e) { throw new UnsupportedOperationException(); }
+            public Map.Entry<K, V> getFirst() { return nsee(SequencedMap.this.firstEntry()); }
+            public Map.Entry<K, V> getLast() { return nsee(SequencedMap.this.lastEntry()); }
+            public Map.Entry<K, V> removeFirst() {
+                return nsee(SequencedMap.this.pollFirstEntry());
+            }
+            public Map.Entry<K, V> removeLast() {
+                return nsee(SequencedMap.this.pollLastEntry());
+            }
         }
         return new SeqEntrySet();
     }
diff --git a/test/jdk/java/util/SequencedCollection/BasicMap.java b/test/jdk/java/util/SequencedCollection/BasicMap.java
index 028ae4e42c2..40bc2aa99dd 100644
--- a/test/jdk/java/util/SequencedCollection/BasicMap.java
+++ b/test/jdk/java/util/SequencedCollection/BasicMap.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
@@ -563,12 +563,12 @@ public void checkChecked(SequencedMap<String, Integer> map) {
         SequencedMap<Object, Object> objMap = (SequencedMap<Object, Object>)(SequencedMap)map;
         assertThrows(CCE, () -> { objMap.put(new Object(), 99); });
         assertThrows(CCE, () -> { objMap.put("x", new Object()); });
-        assertThrows(CCE, () -> { objMap.sequencedEntrySet().getFirst().setValue(new Object()); });
-        assertThrows(CCE, () -> { objMap.sequencedEntrySet().reversed().getFirst().setValue(new Object()); });
+        assertThrows(CCE, () -> { objMap.sequencedEntrySet().iterator().next().setValue(new Object()); });
+        assertThrows(CCE, () -> { objMap.sequencedEntrySet().reversed().iterator().next().setValue(new Object()); });
         assertThrows(CCE, () -> { objMap.reversed().put(new Object(), 99); });
         assertThrows(CCE, () -> { objMap.reversed().put("x", new Object()); });
-        assertThrows(CCE, () -> { objMap.reversed().sequencedEntrySet().getFirst().setValue(new Object()); });
-        assertThrows(CCE, () -> { objMap.reversed().sequencedEntrySet().reversed().getFirst().setValue(new Object()); });
+        assertThrows(CCE, () -> { objMap.reversed().sequencedEntrySet().iterator().next().setValue(new Object()); });
+        assertThrows(CCE, () -> { objMap.reversed().sequencedEntrySet().reversed().iterator().next().setValue(new Object()); });
     }
 
     public void checkEntry(Map.Entry<String, Integer> entry, String key, Integer value) {

From 8a79ac88639c35a6938f82a391c4b5d77e6eda32 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 4 Jun 2025 16:40:22 +0000
Subject: [PATCH 856/901] 8358449: Locale.getISOCountries does not specify the
 returned set is unmodifiable

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

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 9c745c1731b..993495ff5ab 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -1310,7 +1310,7 @@ public static String[] getISOCountries() {
     }
 
     /**
-     * {@return a {@code Set} of ISO3166 country codes for the specified type}
+     * {@return an unmodifiable {@code Set} of ISO3166 country codes for the specified type}
      *
      * @param type {@link Locale.IsoCountryCode} specified ISO code type.
      * @see java.util.Locale.IsoCountryCode

From fd0ab043677d103628afde628e3e75e23fb518b2 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Wed, 4 Jun 2025 16:52:38 +0000
Subject: [PATCH 857/901] 8358330: AsmRemarks and DbgStrings clear() method may
 not get called before their destructor

Reviewed-by: kvn
---
 src/hotspot/share/asm/codeBuffer.cpp    | 14 ++++++++++++--
 src/hotspot/share/asm/codeBuffer.hpp    |  4 ++++
 src/hotspot/share/code/aotCodeCache.cpp | 18 +++++++-----------
 src/hotspot/share/code/codeBlob.cpp     | 11 -----------
 src/hotspot/share/code/codeBlob.hpp     |  7 +------
 5 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index ca25cf56be0..3d2d97d1e45 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -1099,7 +1099,8 @@ CHeapString::~CHeapString() {
 // offset is a byte offset into an instruction stream (CodeBuffer, CodeBlob or
 // other memory buffer) and remark is a string (comment).
 //
-AsmRemarks::AsmRemarks() : _remarks(new AsmRemarkCollection()) {
+AsmRemarks::AsmRemarks() {
+  init();
   assert(_remarks != nullptr, "Allocation failure!");
 }
 
@@ -1107,6 +1108,10 @@ AsmRemarks::~AsmRemarks() {
   assert(_remarks == nullptr, "Must 'clear()' before deleting!");
 }
 
+void AsmRemarks::init() {
+  _remarks = new AsmRemarkCollection();
+}
+
 const char* AsmRemarks::insert(uint offset, const char* remstr) {
   precond(remstr != nullptr);
   return _remarks->insert(offset, remstr);
@@ -1151,7 +1156,8 @@ uint AsmRemarks::print(uint offset, outputStream* strm) const {
 // Acting as interface to reference counted collection of (debug) strings used
 // in the code generated, and thus requiring a fixed address.
 //
-DbgStrings::DbgStrings() : _strings(new DbgStringCollection()) {
+DbgStrings::DbgStrings() {
+  init();
   assert(_strings != nullptr, "Allocation failure!");
 }
 
@@ -1159,6 +1165,10 @@ DbgStrings::~DbgStrings() {
   assert(_strings == nullptr, "Must 'clear()' before deleting!");
 }
 
+void DbgStrings::init() {
+  _strings = new DbgStringCollection();
+}
+
 const char* DbgStrings::insert(const char* dbgstr) {
   const char* str = _strings->lookup(dbgstr);
   return str != nullptr ? str : _strings->insert(dbgstr);
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index e6dac484649..96e9a77a923 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -426,6 +426,8 @@ class AsmRemarks {
   AsmRemarks();
  ~AsmRemarks();
 
+  void init();
+
   const char* insert(uint offset, const char* remstr);
 
   bool is_empty() const;
@@ -452,6 +454,8 @@ class DbgStrings {
   DbgStrings();
  ~DbgStrings();
 
+  void init();
+
   const char* insert(const char* dbgstr);
 
   bool is_empty() const;
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 674d71d1bfc..6d8faa10a38 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -915,26 +915,22 @@ CodeBlob* AOTCodeReader::compile_code_blob(const char* name, int entry_offset_co
     oop_maps = read_oop_map_set();
   }
 
-#ifndef PRODUCT
-  AsmRemarks asm_remarks;
-  read_asm_remarks(asm_remarks);
-  DbgStrings dbg_strings;
-  read_dbg_strings(dbg_strings);
-#endif // PRODUCT
-
   CodeBlob* code_blob = CodeBlob::create(archived_blob,
                                          stored_name,
                                          reloc_data,
                                          oop_maps
-#ifndef PRODUCT
-                                         , asm_remarks
-                                         , dbg_strings
-#endif
                                         );
   if (code_blob == nullptr) { // no space left in CodeCache
     return nullptr;
   }
 
+#ifndef PRODUCT
+  code_blob->asm_remarks().init();
+  read_asm_remarks(code_blob->asm_remarks());
+  code_blob->dbg_strings().init();
+  read_dbg_strings(code_blob->dbg_strings());
+#endif // PRODUCT
+
   fix_relocations(code_blob);
 
   // Read entries offsets
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 185b6c06598..5bb37c198d0 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -281,10 +281,6 @@ CodeBlob* CodeBlob::create(CodeBlob* archived_blob,
                            const char* name,
                            address archived_reloc_data,
                            ImmutableOopMapSet* archived_oop_maps
-#ifndef PRODUCT
-                           , AsmRemarks& archived_asm_remarks
-                           , DbgStrings& archived_dbg_strings
-#endif // PRODUCT
                           )
 {
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
@@ -303,13 +299,6 @@ CodeBlob* CodeBlob::create(CodeBlob* archived_blob,
                                     archived_oop_maps);
       assert(blob != nullptr, "sanity check");
 
-#ifndef PRODUCT
-      blob->use_remarks(archived_asm_remarks);
-      archived_asm_remarks.clear();
-      blob->use_strings(archived_dbg_strings);
-      archived_dbg_strings.clear();
-#endif // PRODUCT
-
       // Flush the code block
       ICache::invalidate_range(blob->code_begin(), blob->code_size());
       CodeCache::commit(blob); // Count adapters
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index f813752e01e..f1920a829fc 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -318,12 +318,7 @@ class CodeBlob {
   static CodeBlob* create(CodeBlob* archived_blob,
                           const char* name,
                           address archived_reloc_data,
-                          ImmutableOopMapSet* archived_oop_maps
-#ifndef PRODUCT
-                          , AsmRemarks& archived_asm_remarks
-                          , DbgStrings& archived_dbg_strings
-#endif // PRODUCT
-                         );
+                          ImmutableOopMapSet* archived_oop_maps);
 };
 
 //----------------------------------------------------------------------------------------------------

From 8939acc8ab0e45b82252f0f2de37e9bd5c3e1493 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Wed, 4 Jun 2025 17:53:17 +0000
Subject: [PATCH 858/901] 8358057: Update validation of ICC_Profile header data

Reviewed-by: honkar
---
 .../classes/java/awt/color/ICC_Profile.java   | 42 +++-----
 .../java/awt/image/ColorConvertOp.java        | 13 +--
 .../RenderingIntentStressTest.java            | 97 +++++++++++++++++++
 .../ValidateICCHeaderData.java                | 21 +++-
 4 files changed, 135 insertions(+), 38 deletions(-)
 create mode 100644 test/jdk/java/awt/color/ICC_Profile/RenderingIntentStressTest.java

diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
index a3e60217d15..c641e469972 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java
@@ -811,12 +811,12 @@ public static ICC_Profile getInstance(byte[] data) {
         }
 
         try {
-            if (getColorSpaceType(p) == ColorSpace.TYPE_GRAY
+            if (getColorSpaceType(data) == ColorSpace.TYPE_GRAY
                     && getData(p, icSigMediaWhitePointTag) != null
                     && getData(p, icSigGrayTRCTag) != null) {
                 return new ICC_ProfileGray(p);
             }
-            if (getColorSpaceType(p) == ColorSpace.TYPE_RGB
+            if (getColorSpaceType(data) == ColorSpace.TYPE_RGB
                     && getData(p, icSigMediaWhitePointTag) != null
                     && getData(p, icSigRedColorantTag) != null
                     && getData(p, icSigGreenColorantTag) != null
@@ -1028,13 +1028,8 @@ public int getColorSpaceType() {
         if (info != null) {
             return info.colorSpaceType;
         }
-        return getColorSpaceType(cmmProfile());
-    }
-
-    private static int getColorSpaceType(Profile p) {
-        byte[] theHeader = getData(p, icSigHead);
-        int theColorSpaceSig = intFromBigEndian(theHeader, icHdrColorSpace);
-        return iccCStoJCS(theColorSpaceSig);
+        byte[] theHeader = getData(cmmProfile(), icSigHead);
+        return getColorSpaceType(theHeader);
     }
 
     private static int getColorSpaceType(byte[] theHeader) {
@@ -1057,8 +1052,7 @@ private static int getColorSpaceType(byte[] theHeader) {
      */
     public int getPCSType() {
         byte[] theHeader = getData(icSigHead);
-        int thePCSSig = intFromBigEndian(theHeader, icHdrPcs);
-        return iccCStoJCS(thePCSSig);
+        return getPCSType(theHeader);
     }
 
     private static int getPCSType(byte[] theHeader) {
@@ -1189,23 +1183,19 @@ private static void verifyHeader(byte[] data) {
         checkRenderingIntent(data);
     }
 
-    private static boolean checkRenderingIntent(byte[] header) {
+    private static void checkRenderingIntent(byte[] header) {
         int index = ICC_Profile.icHdrRenderingIntent;
-
-        /* According to ICC spec, only the least-significant 16 bits shall be
-         * used to encode the rendering intent. The most significant 16 bits
-         * shall be set to zero. Thus, we are ignoring two most significant
-         * bytes here. Please refer ICC Spec Document for more details.
+        /*
+         * ICC spec: only the least-significant 16 bits encode the rendering
+         * intent. The most significant 16 bits must be zero and can be ignored.
+         * https://www.color.org/specification/ICC.1-2022-05.pdf, section 7.2.15
          */
-        int renderingIntent = ((header[index+2] & 0xff) <<  8) |
-                              (header[index+3] & 0xff);
-
-        switch (renderingIntent) {
-            case icPerceptual, icMediaRelativeColorimetric,
-                    icSaturation, icAbsoluteColorimetric -> {
-                return true;
-            }
-            default -> throw new IllegalArgumentException("Unknown Rendering Intent");
+        // Extract 16-bit unsigned rendering intent (0–65535)
+        int intent = (header[index + 2] & 0xff) << 8 | header[index + 3] & 0xff;
+        // Only check upper bound since intent can't be negative
+        if (intent > icICCAbsoluteColorimetric) {
+            throw new IllegalArgumentException(
+                    "Unknown Rendering Intent: %d".formatted(intent));
         }
     }
 
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
index 3202d2d690d..c1c60397198 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.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
@@ -684,13 +684,10 @@ public final Point2D getPoint2D (Point2D srcPt, Point2D dstPt) {
     private int getRenderingIntent (ICC_Profile profile) {
         byte[] header = profile.getData(ICC_Profile.icSigHead);
         int index = ICC_Profile.icHdrRenderingIntent;
-
-        /* According to ICC spec, only the least-significant 16 bits shall be
-         * used to encode the rendering intent. The most significant 16 bits
-         * shall be set to zero. Thus, we are ignoring two most significant
-         * bytes here.
-         *
-         *  See https://www.color.org/ICC1v42_2006-05.pdf, section 7.2.15.
+        /*
+         * ICC spec: only the least-significant 16 bits encode the rendering
+         * intent. The most significant 16 bits must be zero and can be ignored.
+         * https://www.color.org/specification/ICC.1-2022-05.pdf, section 7.2.15
          */
         return ((header[index+2] & 0xff) <<  8) |
                 (header[index+3] & 0xff);
diff --git a/test/jdk/java/awt/color/ICC_Profile/RenderingIntentStressTest.java b/test/jdk/java/awt/color/ICC_Profile/RenderingIntentStressTest.java
new file mode 100644
index 00000000000..05ec6d0d112
--- /dev/null
+++ b/test/jdk/java/awt/color/ICC_Profile/RenderingIntentStressTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_Profile;
+
+import static java.awt.color.ICC_Profile.icAbsoluteColorimetric;
+import static java.awt.color.ICC_Profile.icICCAbsoluteColorimetric;
+import static java.awt.color.ICC_Profile.icMediaRelativeColorimetric;
+import static java.awt.color.ICC_Profile.icPerceptual;
+import static java.awt.color.ICC_Profile.icRelativeColorimetric;
+import static java.awt.color.ICC_Profile.icSaturation;
+
+/**
+ * @test
+ * @bug 8358057
+ * @summary Stress test for ICC_Profile rendering intent parsing and validation
+ */
+public final class RenderingIntentStressTest {
+
+    public static void main(String[] args) {
+        ICC_Profile builtin = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+        ICC_Profile profile = ICC_Profile.getInstance(builtin.getData());
+        // some random combinations that should be ignored
+        int[] upperBytes = {0x0000, 0xFFFF, 0xA5A5, 0x8000, 0x0001, 0x8080,
+                            0x0101, 0xAA55, 0x550A, 0xFF00};
+        for (int up : upperBytes) {
+            for (int low = 0; low <= 0xFFFF; low++) {
+                test(profile, up, low);
+            }
+        }
+    }
+
+    private static int getRenderingIntent(byte[] header) {
+        // replicate the logic we have in jdk
+        int index = ICC_Profile.icHdrRenderingIntent;
+        return (header[index + 2] & 0xff) << 8 | header[index + 3] & 0xff;
+    }
+
+    private static void test(ICC_Profile profile, int up, int low) {
+        byte[] header = profile.getData(ICC_Profile.icSigHead);
+        // These bytes should be ignored
+        header[ICC_Profile.icHdrRenderingIntent + 0] = (byte) (up >> 8 & 0xFF);
+        header[ICC_Profile.icHdrRenderingIntent + 1] = (byte) (up & 0xFF);
+        // This is the actual intent
+        header[ICC_Profile.icHdrRenderingIntent + 2] = (byte) (low >> 8 & 0xFF);
+        header[ICC_Profile.icHdrRenderingIntent + 3] = (byte) (low & 0xFF);
+
+        boolean isValid = isValidIntent(low);
+        try {
+            profile.setData(ICC_Profile.icSigHead, header);
+            if (!isValid) {
+                throw new RuntimeException("IAE is expected");
+            }
+        } catch (IllegalArgumentException e) {
+            if (isValid) {
+                throw e;
+            }
+            return;
+        }
+        // verify that the intent is correctly stored in the profile by the CMM
+        byte[] data = profile.getData(ICC_Profile.icSigHead);
+        int actualIntent = getRenderingIntent(data);
+        if (actualIntent != low) {
+            System.out.println("Expected: " + low);
+            System.out.println("Actual: " + actualIntent);
+            throw new RuntimeException("Unexpected intent");
+        }
+    }
+
+    private static boolean isValidIntent(int intent) {
+        return intent == icPerceptual || intent == icRelativeColorimetric
+                || intent == icMediaRelativeColorimetric
+                || intent == icSaturation || intent == icAbsoluteColorimetric
+                || intent == icICCAbsoluteColorimetric;
+    }
+}
diff --git a/test/jdk/java/awt/color/ICC_Profile/ValidateICCHeaderData/ValidateICCHeaderData.java b/test/jdk/java/awt/color/ICC_Profile/ValidateICCHeaderData/ValidateICCHeaderData.java
index 28831a422b0..9867b727a09 100644
--- a/test/jdk/java/awt/color/ICC_Profile/ValidateICCHeaderData/ValidateICCHeaderData.java
+++ b/test/jdk/java/awt/color/ICC_Profile/ValidateICCHeaderData/ValidateICCHeaderData.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8337703
+ * @bug 8347377 8358057
  * @summary To verify if ICC_Profile's setData() and getInstance() methods
  *          validate header data and throw IAE for invalid values.
  * @run main ValidateICCHeaderData
@@ -144,9 +144,7 @@ public static void main(String[] args) throws Exception {
         System.out.println("CASE 10: Passed \n");
 
         System.out.println("CASE 11: Testing INVALID Rendering Intent ...");
-        //valid rendering intent values are 0-3
-        int invalidRenderIntent = 5;
-        testInvalidHeaderData(invalidRenderIntent, RENDER_INTENT_START_INDEX, 4);
+        testInvalidIntent();
         System.out.println("CASE 11: Passed \n");
 
         System.out.println("CASE 12: Testing INVALID Header Size ...");
@@ -187,6 +185,21 @@ private static void testInvalidHeaderData(int invalidData, int startIndex,
         }
     }
 
+    private static void testInvalidIntent() {
+        //valid rendering intent values are 0-3
+        int invalidRenderIntent = 5;
+        try {
+            setTag(invalidRenderIntent, RENDER_INTENT_START_INDEX, 4);
+            throw new RuntimeException("Test Failed ! Expected IAE NOT thrown");
+        } catch (IllegalArgumentException iae) {
+            String message = iae.getMessage();
+            System.out.println("Expected IAE thrown: " + message);
+            if (!message.contains(": " + invalidRenderIntent)) {
+                throw new RuntimeException("Test Failed ! Unexpected text");
+            }
+        }
+    }
+
     private static void setTag(int value, int startIndex, int fieldLength) {
         byte[] byteArray;
         if (startIndex == RENDER_INTENT_START_INDEX) {

From 5ed246d17d9f40489ed715b7df104ec6a832841e Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Wed, 4 Jun 2025 18:07:07 +0000
Subject: [PATCH 859/901] 8357592: Update output parsing in
 test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java

Reviewed-by: rhalade
---
 .../tools/jarsigner/compatibility/Compatibility.java        | 6 +++---
 test/jdk/sun/security/tools/jarsigner/warnings/Test.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
index 3be1e74d972..25bb67c230b 100644
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -516,7 +516,7 @@ private static String[] list(String listProp) throws IOException {
             String line;
             while ((line = reader.readLine()) != null) {
                 String item = line.trim();
-                if (!item.isEmpty()) {
+                if (!item.isEmpty() && !item.startsWith("#")) {
                     list.add(item);
                 }
             }
@@ -718,8 +718,8 @@ private static void verifying(SignItem signItem, VerifyItem verifyItem)
             String match = "^  ("
                     + "  Signature algorithm: " + signItem.certInfo.
                             expectedSigalg(signItem) + ", " + signItem.certInfo.
-                            expectedKeySize() + "-bit " + signItem.certInfo.
-                            expectedKeyAlgorithm() + " key"
+                            expectedKeySize() + "-bit (" + signItem.certInfo.
+                            expectedKeyAlgorithm() + " key|key)"
                     + ")|("
                     + "  Digest algorithm: " + signItem.expectedDigestAlg()
                     + (isWeakAlg(signItem.expectedDigestAlg()) ? " \\(weak\\)" : "")
diff --git a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
index 0683c03c10c..224fa754eec 100644
--- a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
+++ b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
@@ -149,7 +149,7 @@ public abstract class Test {
             + "This algorithm will be disabled in a future update.";
 
     static final String WEAK_KEY_WARNING
-            = "It will be disabled in a future update.";
+            = "will be disabled in a future update.";
 
     static final String JAR_SIGNED = "jar signed.";
 

From 8f821175cc4484d651151818cc518ef608ebcc83 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 4 Jun 2025 18:46:31 +0000
Subject: [PATCH 860/901] 8358170: Repurpose testCompat in
 test/jdk/java/util/TimeZone/Bug8167143.java

Reviewed-by: naoto
---
 test/jdk/java/util/TimeZone/Bug8167143.java | 56 +++++++--------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/test/jdk/java/util/TimeZone/Bug8167143.java b/test/jdk/java/util/TimeZone/Bug8167143.java
index fb94c94214f..c1b9b5a813a 100644
--- a/test/jdk/java/util/TimeZone/Bug8167143.java
+++ b/test/jdk/java/util/TimeZone/Bug8167143.java
@@ -23,14 +23,14 @@
 
 /*
  * @test
- * @bug 8167143 8174269
+ * @bug 8167143 8174269 8358170
  * @summary Test
  * Timezone parsing works for all locales for default providers preference
  * CLDR implicit locales are correctly reflected,
  * th_TH bundle is not wrongly cached in DateFormatSymbols,
  * correct candidate locale list is retrieved for
  * zh_Hant and zh_Hans and
- * Implicit COMPAT Locales nn-NO, nb-NO are reflected in available locales
+ * Implicit FALLBACK Locales nn-NO, nb-NO are reflected in available locales
  * @modules java.base/sun.util.locale.provider
  *          java.base/sun.util.spi
  *          jdk.localedata
@@ -38,6 +38,7 @@
  * @run main Bug8167143 testCldr
  * @run main Bug8167143 testCache
  * @run main Bug8167143 testCandidateLocales
+ * @run main Bug8167143 testFallback
  */
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -64,7 +65,7 @@ public class Bug8167143 {
             Locale.forLanguageTag("zh-Hant-TW"),
             Locale.forLanguageTag("zh-Hant-MO"));
 
-    private static final List<Locale> COMPAT_IMPLICIT_LOCS = List.of(Locale.forLanguageTag("nn-NO"),
+    private static final List<Locale> FALLBACK_IMPLICIT_LOCS = List.of(Locale.forLanguageTag("nn-NO"),
             Locale.forLanguageTag("nb-NO"));
     /**
      * List of candidate locales for zh_Hant
@@ -97,8 +98,8 @@ public static void main(String[] args) {
             case "testCandidateLocales":
                 testCandidateLocales();
                 break;
-            case "testCompat":
-                testImplicitCompatLocales();
+            case "testFallback":
+                testImplicitFallbackLocales();
                 break;
             default:
                 throw new RuntimeException("no test was specified.");
@@ -230,45 +231,26 @@ private static void reportDifference(List<Locale> got, List<Locale> expected, St
     }
 
     /**
-     * checks that locales nn-NO  and nb-NO should be present in list of supported locales for
-     * all Providers for COMPAT.
+     * Checks that locales (nn-NO  and nb-NO) implicitly supported in FALLBACK
+     * provider should be present in output of getAvailableLocales() for
+     * BreakIteratorProvider and CollatorProvider.
      */
-    private static void testImplicitCompatLocales() {
-        LocaleProviderAdapter jre = LocaleProviderAdapter.forJRE();
-        checkPresenceCompat("BreakIteratorProvider",
-                jre.getBreakIteratorProvider().getAvailableLocales());
-        checkPresenceCompat("CollatorProvider",
-                jre.getCollatorProvider().getAvailableLocales());
-        checkPresenceCompat("DateFormatProvider",
-                jre.getDateFormatProvider().getAvailableLocales());
-        checkPresenceCompat("DateFormatSymbolsProvider",
-                jre.getDateFormatSymbolsProvider().getAvailableLocales());
-        checkPresenceCompat("DecimalFormatSymbolsProvider",
-                jre.getDecimalFormatSymbolsProvider().getAvailableLocales());
-        checkPresenceCompat("NumberFormatProvider",
-                jre.getNumberFormatProvider().getAvailableLocales());
-        checkPresenceCompat("CurrencyNameProvider",
-                jre.getCurrencyNameProvider().getAvailableLocales());
-        checkPresenceCompat("LocaleNameProvider",
-                jre.getLocaleNameProvider().getAvailableLocales());
-        checkPresenceCompat("TimeZoneNameProvider",
-                jre.getTimeZoneNameProvider().getAvailableLocales());
-        checkPresenceCompat("CalendarDataProvider",
-                jre.getCalendarDataProvider().getAvailableLocales());
-        checkPresenceCompat("CalendarNameProvider",
-                jre.getCalendarNameProvider().getAvailableLocales());
-        checkPresenceCompat("CalendarProvider",
-                jre.getCalendarProvider().getAvailableLocales());
+    private static void testImplicitFallbackLocales() {
+        LocaleProviderAdapter fallback = LocaleProviderAdapter.forType(Type.FALLBACK);
+        checkPresenceFallback("BreakIteratorProvider",
+                fallback.getBreakIteratorProvider().getAvailableLocales());
+        checkPresenceFallback("CollatorProvider",
+                fallback.getCollatorProvider().getAvailableLocales());
     }
 
-    private static void checkPresenceCompat(String testName, Locale[] got) {
+    private static void checkPresenceFallback(String testName, Locale[] got) {
         List<Locale> gotLocalesList = Arrays.asList(got);
         List<Locale> gotList = new ArrayList<>(gotLocalesList);
-        if (!gotList.removeAll(COMPAT_IMPLICIT_LOCS)) {
+        if (!gotList.removeAll(FALLBACK_IMPLICIT_LOCS)) {
             // check which Implicit locale are not present in retrievedLocales List.
-            List<Locale> implicitLocales = new ArrayList<>(COMPAT_IMPLICIT_LOCS);
+            List<Locale> implicitLocales = new ArrayList<>(FALLBACK_IMPLICIT_LOCS);
             implicitLocales.removeAll(gotList);
-            throw new RuntimeException("Locales those not correctly reflected are "
+            throw new RuntimeException("Locale(s) not correctly reflected are "
                     + implicitLocales + " for test " + testName);
         }
     }

From 901144ee0d3e984aa8b8f047498440450942f3e5 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Wed, 4 Jun 2025 19:46:30 +0000
Subject: [PATCH 861/901] 8358217:
 jdk/incubator/vector/PreferredSpeciesTest.java#id0 failures - expected [128]
 but found [256]

Co-authored-by: Paul Sandoz <psandoz@openjdk.org>
Co-authored-by: Jaikiran Pai <jpai@openjdk.org>
Reviewed-by: syan, psandoz
---
 test/jdk/ProblemList.txt                             |  1 -
 .../jdk/incubator/vector/PreferredSpeciesTest.java   | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 28bb2a1f033..c1303377ddb 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -764,7 +764,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/PreferredSpeciesTest.java#id0              8358217 generic-all
 
 ############################################################################
 
diff --git a/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java b/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java
index eb8b0358538..32d44d28ee1 100644
--- a/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java
+++ b/test/jdk/jdk/incubator/vector/PreferredSpeciesTest.java
@@ -133,25 +133,18 @@ void testVectorShape(Class<?> c) {
     void testLargestShapeFor(Class<?> c) {
         final int S_64_BITS = 64;
         int elemSize = 0;
-        VectorSpecies<?> maxVectorSpecies;
         if (c == byte.class) {
             elemSize = Byte.SIZE;
-            maxVectorSpecies = ByteVector.SPECIES_MAX;
         } else if (c == short.class) {
             elemSize = Short.SIZE;
-            maxVectorSpecies = ShortVector.SPECIES_MAX;
         } else if (c == int.class) {
             elemSize = Integer.SIZE;
-            maxVectorSpecies = IntVector.SPECIES_MAX;
         } else if (c == long.class) {
             elemSize = Long.SIZE;
-            maxVectorSpecies = LongVector.SPECIES_MAX;
         } else if (c == float.class) {
             elemSize = Float.SIZE;
-            maxVectorSpecies = FloatVector.SPECIES_MAX;
         } else if (c == double.class) {
             elemSize = Double.SIZE;
-            maxVectorSpecies = DoubleVector.SPECIES_MAX;
         } else {
             throw new IllegalArgumentException("Bad vector element type: " + c.getName());
         }
@@ -161,11 +154,6 @@ void testLargestShapeFor(Class<?> c) {
         int maxLaneCount = VectorSupport.getMaxLaneCount(c);
         int max = Math.max(maxLaneCount * elemSize, S_64_BITS);
 
-        //Assert we're using the same element when comparing shapes
-        Assert.assertEquals(c, maxVectorSpecies.elementType());
-
         Assert.assertEquals(vs.vectorBitSize(), max);
-        Assert.assertEquals(vs.vectorBitSize(), maxVectorSpecies.vectorBitSize());
-
     }
 }

From 77c110c309739c2e10c9b321914309affe749e6d Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 4 Jun 2025 20:03:48 +0000
Subject: [PATCH 862/901] 8357000: Write overview documentation for start of
 release changes

Reviewed-by: erikj, iris, ihse, dholmes
---
 doc/starting-next-release.html | 127 +++++++++++++++++++++++++++++++++
 doc/starting-next-release.md   |  68 ++++++++++++++++++
 2 files changed, 195 insertions(+)
 create mode 100644 doc/starting-next-release.html
 create mode 100644 doc/starting-next-release.md

diff --git a/doc/starting-next-release.html b/doc/starting-next-release.html
new file mode 100644
index 00000000000..421229f9fbc
--- /dev/null
+++ b/doc/starting-next-release.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<head>
+  <meta charset="utf-8" />
+  <meta name="generator" content="pandoc" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+  <title>Explanation of start of release changes</title>
+  <style>
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    div.columns{display: flex; gap: min(4vw, 1.5em);}
+    div.column{flex: auto; overflow-x: auto;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    /* The extra [class] is a hack that increases specificity enough to
+       override a similar rule in reveal.js */
+    ul.task-list[class]{list-style: none;}
+    ul.task-list li input[type="checkbox"] {
+      font-size: inherit;
+      width: 0.8em;
+      margin: 0 0.8em 0.2em -1.6em;
+      vertical-align: middle;
+    }
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+  </style>
+  <link rel="stylesheet" href="http://github.com/make/data/docs-resources/resources/jdk-default.css" />
+  <!--[if lt IE 9]>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+<header id="title-block-header">
+<h1 class="title">Explanation of start of release changes</h1>
+</header>
+<nav id="TOC" role="doc-toc">
+<ul>
+<li><a href="#overview" id="toc-overview">Overview</a></li>
+<li><a href="#details-and-file-updates"
+id="toc-details-and-file-updates">Details and file updates</a>
+<ul>
+<li><a href="#meta-data-files" id="toc-meta-data-files">Meta-data
+files</a></li>
+<li><a href="#src-files" id="toc-src-files"><code>src</code>
+files</a></li>
+<li><a href="#test-files" id="toc-test-files"><code>test</code>
+files</a></li>
+</ul></li>
+</ul>
+</nav>
+<h2 id="overview">Overview</h2>
+<p>The start of release changes, the changes that turn JDK <em>N</em>
+into JDK (<em>N</em>+1), are primarily small updates to various files
+along with new files to store symbol information to allow
+<code>javac --release N ...</code> to run on JDK (<em>N</em>+1).</p>
+<p>The updates include changes to files holding meta-data about the
+release, files under the <code>src</code> directory for API and tooling
+updates, and incidental updates under the <code>test</code>
+directory.</p>
+<h2 id="details-and-file-updates">Details and file updates</h2>
+<p>As a matter of policy, there are a number of semantically distinct
+concepts which get incremented separately at the start of a new
+release:</p>
+<ul>
+<li>Feature value of <code>Runtime.version()</code></li>
+<li>Highest source version modeled by
+<code>javax.lang.model.SourceVersion</code></li>
+<li>Highest class file format major version recognized by the
+platform</li>
+<li>Highest
+<code>-source</code>/<code>-target</code>/<code>--release</code>
+argument recognized by <code>javac</code> and related tools</li>
+</ul>
+<p>The expected file updates are listed below. Additional files may need
+to be updated for a particular release.</p>
+<h3 id="meta-data-files">Meta-data files</h3>
+<ul>
+<li><code>jcheck/conf</code>: update meta-data used by
+<code>jcheck</code> and the Skara tooling</li>
+<li><code>make/conf/version-numbers.conf</code>: update to meta-data
+used in the build</li>
+</ul>
+<h3 id="src-files"><code>src</code> files</h3>
+<ul>
+<li><code>src/hotspot/share/classfile/classFileParser.cpp</code>: add a
+<code>#define</code> for the new version</li>
+<li><code>src/java.base/share/classes/java/lang/classfile/ClassFile.java</code>:
+add a constant for the new class file format version</li>
+<li><code>src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java</code>:
+add an <code>enum</code> constant for the new class file format
+version</li>
+<li><code>src/java.compiler/share/classes/javax/lang/model/SourceVersion.java</code>:
+add an <code>enum</code> constant for the new source version</li>
+<li><code>src/java.compiler/share/classes/javax/lang/model/util/*</code>
+visitors: Update <code>@SupportedSourceVersion</code> annotations to
+latest value. Note this update is done in lieu of introducing another
+set of visitors for each Java SE release.</li>
+<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java</code>:
+add an <code>enum</code> constant for the new source version internal to
+<code>javac</code></li>
+<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java</code>:
+add an <code>enum</code> constant for the new class file format version
+internal to <code>javac</code></li>
+<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java</code>:
+add an <code>enum</code> constant for the new target version internal to
+<code>javac</code></li>
+<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java</code>
+update printing processor to support the new source version</li>
+<li>The symbol information for <code>--release</code> is stored as new
+text files in the <code>src/jdk.compiler/share/data/symbols</code>
+directory, one file per module. The README file in that directory
+contains directions on how to create the files.</li>
+</ul>
+<h3 id="test-files"><code>test</code> files</h3>
+<ul>
+<li><code>test/langtools/tools/javac/api/TestGetSourceVersions.java</code>:
+add new <code>SourceVersion</code> constant to test matrix.</li>
+<li><code>test/langtools/tools/javac/classfiles/ClassVersionChecker.java</code>:
+add new enum constant for the new class file version</li>
+<li><code>test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java</code>
+update annotation processor extended by <code>javac</code> tests to
+cover the new source version</li>
+<li><code>test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out</code>
+and
+<code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
+update expected messages for preview errors and warnings</li>
+</ul>
+</body>
+</html>
diff --git a/doc/starting-next-release.md b/doc/starting-next-release.md
new file mode 100644
index 00000000000..10bc364a3e4
--- /dev/null
+++ b/doc/starting-next-release.md
@@ -0,0 +1,68 @@
+% Explanation of start of release changes
+
+## Overview
+
+The start of release changes, the changes that turn JDK _N_ into JDK
+(_N_+1), are primarily small updates to various files along with new files to
+store symbol information to allow `javac --release N ...` to run on
+JDK (_N_+1).
+
+The updates include changes to files holding meta-data about the
+release, files under the `src` directory for API and tooling updates,
+and incidental updates under the `test` directory.
+
+## Details and file updates
+
+As a matter of policy, there are a number of semantically distinct
+concepts which get incremented separately at the start of a new
+release:
+
+* Feature value of `Runtime.version()`
+* Highest source version modeled by `javax.lang.model.SourceVersion`
+* Highest class file format major version recognized by the platform
+* Highest `-source`/`-target`/`--release` argument recognized by
+  `javac` and related tools
+
+The expected file updates are listed below. Additional files may need
+to be updated for a particular release.
+
+### Meta-data files
+
+* `jcheck/conf`: update meta-data used by `jcheck` and the Skara tooling
+* `make/conf/version-numbers.conf`: update to meta-data used in the build
+
+### `src` files
+
+* `src/hotspot/share/classfile/classFileParser.cpp`: add a `#define`
+  for the new version
+* `src/java.base/share/classes/java/lang/classfile/ClassFile.java`:
+  add a constant for the new class file format version
+* `src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java`:
+   add an `enum` constant for the new class file format version
+* `src/java.compiler/share/classes/javax/lang/model/SourceVersion.java`:
+  add an `enum` constant for the new source version
+* `src/java.compiler/share/classes/javax/lang/model/util/*` visitors: Update
+  `@SupportedSourceVersion` annotations to latest value. Note this update
+  is done in lieu of introducing another set of visitors for each Java
+  SE release.
+* `src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java`:
+   add an `enum` constant for the new source version internal to `javac`
+* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java`:
+   add an `enum` constant for the new class file format version internal to `javac`
+* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java`:
+   add an `enum` constant for the new target version internal to `javac`
+* `src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java`
+   update printing processor to support the new source version
+* The symbol information for `--release` is stored as new text files in the
+  `src/jdk.compiler/share/data/symbols` directory, one file per
+  module. The README file in that directory contains directions on how
+  to create the files.
+
+### `test` files
+
+* `test/langtools/tools/javac/api/TestGetSourceVersions.java`: add new `SourceVersion` constant to test matrix.
+* `test/langtools/tools/javac/classfiles/ClassVersionChecker.java`: add new enum constant for the new class file version
+* `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
+   update annotation processor extended by `javac` tests to cover the new source version
+* `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
+

From 3cf3e4bbec26a84d77cb7a3125a60ba1e1e4ee97 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 4 Jun 2025 21:32:29 +0000
Subject: [PATCH 863/901] 8358339: Handle MethodCounters::_method backlinks
 after JDK-8355003

Reviewed-by: coleenp, kvn, iveresov
---
 src/hotspot/share/asm/codeBuffer.cpp | 7 +++++++
 src/hotspot/share/code/nmethod.cpp   | 2 ++
 src/hotspot/share/oops/metadata.hpp  | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 3d2d97d1e45..81bfc932147 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -29,6 +29,7 @@
 #include "compiler/disassembler.hpp"
 #include "logging/log.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/methodCounters.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/icache.hpp"
@@ -537,6 +538,9 @@ void CodeBuffer::finalize_oop_references(const methodHandle& mh) {
             if (m->is_methodData()) {
               m = ((MethodData*)m)->method();
             }
+            if (m->is_methodCounters()) {
+              m = ((MethodCounters*)m)->method();
+            }
             if (m->is_method()) {
               m = ((Method*)m)->method_holder();
             }
@@ -561,6 +565,9 @@ void CodeBuffer::finalize_oop_references(const methodHandle& mh) {
         if (m->is_methodData()) {
           m = ((MethodData*)m)->method();
         }
+        if (m->is_methodCounters()) {
+          m = ((MethodCounters*)m)->method();
+        }
         if (m->is_method()) {
           m = ((Method*)m)->method_holder();
         }
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index d82e31fd855..510160a6667 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -788,6 +788,8 @@ class CheckClass : public MetadataClosure {
       klass = ((Method*)md)->method_holder();
     } else if (md->is_methodData()) {
       klass = ((MethodData*)md)->method()->method_holder();
+    } else if (md->is_methodCounters()) {
+      klass = ((MethodCounters*)md)->method()->method_holder();
     } else {
       md->print();
       ShouldNotReachHere();
diff --git a/src/hotspot/share/oops/metadata.hpp b/src/hotspot/share/oops/metadata.hpp
index ff18cef60a7..5a890a27fa1 100644
--- a/src/hotspot/share/oops/metadata.hpp
+++ b/src/hotspot/share/oops/metadata.hpp
@@ -44,6 +44,7 @@ class Metadata : public MetaspaceObj {
   virtual bool is_method()             const { return false; }
   virtual bool is_methodData()         const { return false; }
   virtual bool is_constantPool()       const { return false; }
+  virtual bool is_methodCounters()     const { return false; }
   virtual int  size()                  const = 0;
   virtual MetaspaceObj::Type type()    const = 0;
   virtual const char* internal_name()  const = 0;

From 5b27e9c2df8b386b38b0553d941469cd8aa65c28 Mon Sep 17 00:00:00 2001
From: Johannes Bechberger <jbechberger@openjdk.org>
Date: Wed, 4 Jun 2025 22:08:58 +0000
Subject: [PATCH 864/901] 8342818: Implement JEP 509: JFR CPU-Time Profiling

Reviewed-by: mgronlun, mdoerr, pchilanomate, apangin, shade
---
 src/hotspot/os/posix/signals_posix.cpp        |   8 +
 src/hotspot/os/posix/signals_posix.hpp        |   2 +
 src/hotspot/share/jfr/jfr.inline.hpp          |   3 +-
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   6 +
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp    |   2 +
 .../jfr/jni/jfrJniMethodRegistration.cpp      |   1 +
 src/hotspot/share/jfr/metadata/metadata.xml   |  16 +
 .../sampling/jfrCPUTimeThreadSampler.cpp      | 769 ++++++++++++++++++
 .../sampling/jfrCPUTimeThreadSampler.hpp      | 152 ++++
 .../periodic/sampling/jfrSampleRequest.cpp    |  33 +-
 .../periodic/sampling/jfrSampleRequest.hpp    |   5 +
 .../periodic/sampling/jfrThreadSampling.cpp   |  92 ++-
 .../periodic/sampling/jfrThreadSampling.hpp   |   2 +
 .../share/jfr/recorder/jfrRecorder.cpp        |  15 +
 .../share/jfr/recorder/jfrRecorder.hpp        |   1 +
 .../recorder/service/jfrEventThrottler.cpp    |  12 +-
 .../share/jfr/support/jfrThreadLocal.cpp      |  98 ++-
 .../share/jfr/support/jfrThreadLocal.hpp      |  53 ++
 src/hotspot/share/runtime/thread.hpp          |   1 +
 src/hotspot/share/runtime/vmOperation.hpp     |   2 +
 src/hotspot/share/utilities/ticks.hpp         |   1 +
 .../jdk/jfr/internal/EventControl.java        |   4 +
 .../share/classes/jdk/jfr/internal/JVM.java   |  10 +
 .../jdk/jfr/internal/PlatformEventType.java   |  19 +
 .../classes/jdk/jfr/internal/query/view.ini   |  25 +-
 .../internal/settings/CPUThrottleSetting.java |  89 ++
 .../classes/jdk/jfr/internal/util/Rate.java   |   4 +
 .../jdk/jfr/internal/util/TimespanRate.java   |  68 ++
 src/jdk.jfr/share/conf/jfr/default.jfc        |  10 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  10 +
 .../metadata/TestLookForUntestedEvents.java   |   9 +-
 .../profiling/BaseTestFullStackTrace.java     | 176 ++++
 .../TestCPUTimeAndExecutionSample.java        |  65 ++
 .../TestCPUTimeSampleFullStackTrace.java      |  41 +
 .../TestCPUTimeSampleMultipleRecordings.java  |  70 ++
 .../profiling/TestCPUTimeSampleNative.java    |  66 ++
 .../TestCPUTimeSampleThrottling.java          | 111 +++
 .../TestCPUTimeSamplingLongPeriod.java        |  58 ++
 .../event/profiling/TestFullStackTrace.java   | 131 +--
 .../classes/test/RecursiveMethods.java        |  76 ++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   2 +
 41 files changed, 2178 insertions(+), 140 deletions(-)
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index e900d5695ae..0157d354f40 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1505,6 +1505,14 @@ bool PosixSignals::is_sig_ignored(int sig) {
   }
 }
 
+void* PosixSignals::get_signal_handler_for_signal(int sig) {
+  struct sigaction oact;
+  if (sigaction(sig, (struct sigaction*)nullptr, &oact) == -1) {
+    return nullptr;
+  }
+  return get_signal_handler(&oact);
+}
+
 static void signal_sets_init() {
   sigemptyset(&preinstalled_sigs);
 
diff --git a/src/hotspot/os/posix/signals_posix.hpp b/src/hotspot/os/posix/signals_posix.hpp
index 9deade4db18..c1cb70df153 100644
--- a/src/hotspot/os/posix/signals_posix.hpp
+++ b/src/hotspot/os/posix/signals_posix.hpp
@@ -52,6 +52,8 @@ class PosixSignals : public AllStatic {
 
   static bool is_sig_ignored(int sig);
 
+  static void* get_signal_handler_for_signal(int sig);
+
   static void hotspot_sigmask(Thread* thread);
 
   static void print_signal_handler(outputStream* st, int sig, char* buf, size_t buflen);
diff --git a/src/hotspot/share/jfr/jfr.inline.hpp b/src/hotspot/share/jfr/jfr.inline.hpp
index bdb47f600e6..5b6fc62d0ea 100644
--- a/src/hotspot/share/jfr/jfr.inline.hpp
+++ b/src/hotspot/share/jfr/jfr.inline.hpp
@@ -32,7 +32,8 @@
 
 inline bool Jfr::has_sample_request(JavaThread* jt) {
   assert(jt != nullptr, "invariant");
-  return jt->jfr_thread_local()->has_sample_request();
+  JfrThreadLocal* tl = jt->jfr_thread_local();
+  return tl->has_sample_request() || tl->has_cpu_time_jfr_requests();
 }
 
 inline void Jfr::check_and_process_sample_request(JavaThread* jt) {
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index 6f1c1936574..bc2412a90c1 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -24,6 +24,7 @@
 
 #include "jfr/jfr.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrEventSetting.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -169,6 +170,11 @@ NO_TRANSITION(jboolean, jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_ty
   return JNI_TRUE;
 NO_TRANSITION_END
 
+JVM_ENTRY_NO_ENV(void, jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt))
+  JfrEventSetting::set_enabled(JfrCPUTimeSampleEvent, rate > 0);
+  JfrCPUTimeThreadSampling::set_rate(rate, auto_adapt == JNI_TRUE);
+JVM_END
+
 NO_TRANSITION(void, jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong event_type_id, jlong value))
   JfrEventSetting::set_miscellaneous(event_type_id, value);
   const JfrEventId typed_event_id = (JfrEventId)event_type_id;
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 9c78c6239d4..dbea7f0180d 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -129,6 +129,8 @@ jlong JNICALL jfr_get_unloaded_event_classes_count(JNIEnv* env, jclass jvm);
 
 jboolean JNICALL jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_type_id, jlong event_sample_size, jlong period_ms);
 
+void JNICALL jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt);
+
 void JNICALL jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong id, jlong value);
 
 void JNICALL jfr_emit_old_object_samples(JNIEnv* env, jclass jvm, jlong cutoff_ticks, jboolean, jboolean);
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index 33a564dee2f..82ef93d95b2 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -83,6 +83,7 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) {
       (char*)"getUnloadedEventClassCount", (char*)"()J", (void*)jfr_get_unloaded_event_classes_count,
       (char*)"setMiscellaneous", (char*)"(JJ)V", (void*)jfr_set_miscellaneous,
       (char*)"setThrottle", (char*)"(JJJ)Z", (void*)jfr_set_throttle,
+      (char*)"setCPUThrottle", (char*)"(DZ)V", (void*)jfr_set_cpu_throttle,
       (char*)"emitOldObjectSamples", (char*)"(JZZ)V", (void*)jfr_emit_old_object_samples,
       (char*)"shouldRotateDisk", (char*)"()Z", (void*)jfr_should_rotate_disk,
       (char*)"exclude", (char*)"(Ljava/lang/Thread;)V", (void*)jfr_exclude_thread,
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 9c04ec3dca1..03daca946f6 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -962,6 +962,22 @@
     <Field type="ThreadState" name="state" label="Thread State" />
   </Event>
 
+  <Event name="CPUTimeSample" category="Java Virtual Machine, Profiling" label="CPU Time Method Sample"
+    description="Snapshot of a threads state from the CPU time sampler. The throttle can be either an upper bound for the event emission rate, e.g. 100/s, or the cpu-time period, e.g. 10ms, with s, ms, us and ns supported as time units."
+    throttle="true" thread="false" experimental="true" startTime="false">
+    <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
+    <Field type="Thread" name="eventThread" label="Thread" />
+    <Field type="boolean" name="failed" label="Failed" description="Failed to obtain the stack trace" />
+    <Field type="Tickspan" name="samplingPeriod" label="CPU Time Sampling Period"/>
+    <Field type="boolean" name="biased" label="Biased" description="The sample is safepoint-biased" />
+  </Event>
+
+  <Event name="CPUTimeSamplesLost" category="Java Virtual Machine, Profiling" label="CPU Time Method Profiling Lost Samples" description="Records that the CPU time sampler lost samples"
+    thread="false" stackTrace="false" startTime="false" experimental="true">
+    <Field type="int" name="lostSamples" label="Lost Samples" />
+    <Field type="Thread" name="eventThread" label="Thread" />
+  </Event>
+
   <Event name="ThreadDump" category="Java Virtual Machine, Runtime" label="Thread Dump" period="everyChunk">
     <Field type="string" name="result" label="Thread Dump" />
   </Event>
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
new file mode 100644
index 00000000000..ae8877ee3f2
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
@@ -0,0 +1,769 @@
+/*
+ * 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.
+ *
+ */
+
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
+#include "logging/log.hpp"
+
+
+#if defined(LINUX)
+#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
+#include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/utilities/jfrTime.hpp"
+#include "jfr/utilities/jfrThreadIterator.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+#include "jfrfiles/jfrEventClasses.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/safepointMechanism.inline.hpp"
+#include "runtime/threadSMR.hpp"
+#include "runtime/vmOperation.hpp"
+#include "runtime/vmThread.hpp"
+#include "utilities/ticks.hpp"
+
+#include "signals_posix.hpp"
+
+static const int64_t AUTOADAPT_INTERVAL_MS = 100;
+
+static bool is_excluded(JavaThread* jt) {
+  return jt->is_hidden_from_external_view() ||
+         jt->jfr_thread_local()->is_excluded() ||
+         jt->is_JfrRecorder_thread();
+}
+
+static JavaThread* get_java_thread_if_valid() {
+  Thread* raw_thread = Thread::current_or_null_safe();
+  if (raw_thread == nullptr) {
+    // probably while shutting down
+    return nullptr;
+  }
+  assert(raw_thread->is_Java_thread(), "invariant");
+  JavaThread* jt = JavaThread::cast(raw_thread);
+  if (is_excluded(jt) || jt->is_exiting()) {
+    return nullptr;
+  }
+  return jt;
+}
+
+JfrCPUTimeTraceQueue::JfrCPUTimeTraceQueue(u4 capacity) :
+  _capacity(capacity), _head(0), _lost_samples(0) {
+  _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
+}
+
+JfrCPUTimeTraceQueue::~JfrCPUTimeTraceQueue() {
+  JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
+}
+
+bool JfrCPUTimeTraceQueue::enqueue(JfrCPUTimeSampleRequest& request) {
+  assert(JavaThread::current()->jfr_thread_local()->is_cpu_time_jfr_enqueue_locked(), "invariant");
+  assert(&JavaThread::current()->jfr_thread_local()->cpu_time_jfr_queue() == this, "invariant");
+  u4 elementIndex;
+  do {
+    elementIndex = Atomic::load_acquire(&_head);
+    if (elementIndex >= _capacity) {
+      return false;
+    }
+  } while (Atomic::cmpxchg(&_head, elementIndex, elementIndex + 1) != elementIndex);
+  _data[elementIndex] = request;
+  return true;
+}
+
+JfrCPUTimeSampleRequest& JfrCPUTimeTraceQueue::at(u4 index) {
+  assert(index < _head, "invariant");
+  return _data[index];
+}
+
+static volatile u4 _lost_samples_sum = 0;
+
+u4 JfrCPUTimeTraceQueue::size() const {
+  return Atomic::load_acquire(&_head);
+}
+
+void JfrCPUTimeTraceQueue::set_size(u4 size) {
+  Atomic::release_store(&_head, size);
+}
+
+u4 JfrCPUTimeTraceQueue::capacity() const {
+  return _capacity;
+}
+
+void JfrCPUTimeTraceQueue::set_capacity(u4 capacity) {
+  _head = 0;
+  JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
+  _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
+  _capacity = capacity;
+}
+
+bool JfrCPUTimeTraceQueue::is_empty() const {
+  return Atomic::load_acquire(&_head) == 0;
+}
+
+u4 JfrCPUTimeTraceQueue::lost_samples() const {
+  return Atomic::load(&_lost_samples);
+}
+
+void JfrCPUTimeTraceQueue::increment_lost_samples() {
+  Atomic::inc(&_lost_samples_sum);
+  Atomic::inc(&_lost_samples);
+}
+
+u4 JfrCPUTimeTraceQueue::get_and_reset_lost_samples() {
+  return Atomic::xchg(&_lost_samples, (u4)0);
+}
+
+void JfrCPUTimeTraceQueue::resize(u4 capacity) {
+  if (capacity != _capacity) {
+    set_capacity(capacity);
+  }
+}
+
+void JfrCPUTimeTraceQueue::resize_for_period(u4 period_millis) {
+  u4 capacity = CPU_TIME_QUEUE_CAPACITY;
+  if (period_millis > 0 && period_millis < 10) {
+    capacity = (u4) ((double) capacity * 10 / period_millis);
+  }
+  resize(capacity);
+}
+
+void JfrCPUTimeTraceQueue::clear() {
+  Atomic::release_store(&_head, (u4)0);
+}
+
+static int64_t compute_sampling_period(double rate) {
+  if (rate == 0) {
+    return 0;
+  }
+  return os::active_processor_count() * 1000000000.0 / rate;
+}
+
+class JfrCPUSamplerThread : public NonJavaThread {
+  friend class JfrCPUTimeThreadSampling;
+ private:
+  Semaphore _sample;
+  NonJavaThread* _sampler_thread;
+  double _rate;
+  bool _auto_adapt;
+  volatile int64_t _current_sampling_period_ns;
+  volatile bool _disenrolled;
+  // top bit is used to indicate that no signal handler should proceed
+  volatile u4 _active_signal_handlers;
+  volatile bool _is_async_processing_of_cpu_time_jfr_requests_triggered;
+  volatile bool _warned_about_timer_creation_failure;
+  volatile bool _signal_handler_installed;
+
+  static const u4 STOP_SIGNAL_BIT = 0x80000000;
+
+  JfrCPUSamplerThread(double rate, bool auto_adapt);
+
+  void start_thread();
+
+  void enroll();
+  void disenroll();
+  void update_all_thread_timers();
+
+  void auto_adapt_period_if_needed();
+
+  void set_rate(double rate, bool auto_adapt);
+  int64_t get_sampling_period() const { return Atomic::load(&_current_sampling_period_ns); };
+
+  void sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now);
+
+  // process the queues for all threads that are in native state (and requested to be processed)
+  void stackwalk_threads_in_native();
+  bool create_timer_for_thread(JavaThread* thread, timer_t &timerid);
+
+  void stop_signal_handlers();
+
+  // returns false if the stop signal bit was set, true otherwise
+  bool increment_signal_handler_count();
+
+  void decrement_signal_handler_count();
+
+  void initialize_active_signal_handler_counter();
+
+protected:
+  virtual void post_run();
+public:
+  virtual const char* name() const { return "JFR CPU Sampler Thread"; }
+  virtual const char* type_name() const { return "JfrCPUTimeSampler"; }
+  void run();
+  void on_javathread_create(JavaThread* thread);
+  void on_javathread_terminate(JavaThread* thread);
+
+  void handle_timer_signal(siginfo_t* info, void* context);
+  bool init_timers();
+  void stop_timer();
+
+  void trigger_async_processing_of_cpu_time_jfr_requests();
+};
+
+JfrCPUSamplerThread::JfrCPUSamplerThread(double rate, bool auto_adapt) :
+  _sample(),
+  _sampler_thread(nullptr),
+  _rate(rate),
+  _auto_adapt(auto_adapt),
+  _current_sampling_period_ns(compute_sampling_period(rate)),
+  _disenrolled(true),
+  _active_signal_handlers(STOP_SIGNAL_BIT),
+  _is_async_processing_of_cpu_time_jfr_requests_triggered(false),
+  _warned_about_timer_creation_failure(false),
+  _signal_handler_installed(false) {
+  assert(rate >= 0, "invariant");
+}
+
+void JfrCPUSamplerThread::trigger_async_processing_of_cpu_time_jfr_requests() {
+  Atomic::release_store(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true);
+}
+
+void JfrCPUSamplerThread::on_javathread_create(JavaThread* thread) {
+  if (thread->is_hidden_from_external_view() || thread->is_JfrRecorder_thread() ||
+      !Atomic::load_acquire(&_signal_handler_installed)) {
+    return;
+  }
+  JfrThreadLocal* tl = thread->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+  tl->cpu_time_jfr_queue().resize_for_period(_current_sampling_period_ns / 1000000);
+  timer_t timerid;
+  if (create_timer_for_thread(thread, timerid)) {
+    tl->set_cpu_timer(&timerid);
+  } else {
+    if (!Atomic::or_then_fetch(&_warned_about_timer_creation_failure, true)) {
+      log_warning(jfr)("Failed to create timer for a thread");
+    }
+    tl->deallocate_cpu_time_jfr_queue();
+  }
+}
+
+void JfrCPUSamplerThread::on_javathread_terminate(JavaThread* thread) {
+  JfrThreadLocal* tl = thread->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+  timer_t* timer = tl->cpu_timer();
+  if (timer == nullptr) {
+    return; // no timer was created for this thread
+  }
+  tl->unset_cpu_timer();
+  tl->deallocate_cpu_time_jfr_queue();
+  s4 lost_samples = tl->cpu_time_jfr_queue().lost_samples();
+  if (lost_samples > 0) {
+    JfrCPUTimeThreadSampling::send_lost_event(JfrTicks::now(), JfrThreadLocal::thread_id(thread), lost_samples);
+  }
+}
+
+void JfrCPUSamplerThread::start_thread() {
+  if (os::create_thread(this, os::os_thread)) {
+    os::start_thread(this);
+  } else {
+    log_error(jfr)("Failed to create thread for thread sampling");
+  }
+}
+
+void JfrCPUSamplerThread::enroll() {
+  if (Atomic::cmpxchg(&_disenrolled, true, false)) {
+    Atomic::store(&_warned_about_timer_creation_failure, false);
+    initialize_active_signal_handler_counter();
+    log_trace(jfr)("Enrolling CPU thread sampler");
+    _sample.signal();
+    if (!init_timers()) {
+      log_error(jfr)("Failed to initialize timers for CPU thread sampler");
+      disenroll();
+      return;
+    }
+    log_trace(jfr)("Enrolled CPU thread sampler");
+  }
+}
+
+void JfrCPUSamplerThread::disenroll() {
+  if (!Atomic::cmpxchg(&_disenrolled, false, true)) {
+    log_trace(jfr)("Disenrolling CPU thread sampler");
+    if (Atomic::load_acquire(&_signal_handler_installed)) {
+      stop_timer();
+      stop_signal_handlers();
+    }
+    _sample.wait();
+    log_trace(jfr)("Disenrolled CPU thread sampler");
+  }
+}
+
+void JfrCPUSamplerThread::run() {
+  assert(_sampler_thread == nullptr, "invariant");
+  _sampler_thread = this;
+  int64_t last_auto_adapt_check = os::javaTimeNanos();
+  while (true) {
+    if (!_sample.trywait()) {
+      // disenrolled
+      _sample.wait();
+    }
+    _sample.signal();
+
+    if (os::javaTimeNanos() - last_auto_adapt_check > AUTOADAPT_INTERVAL_MS * 1000000) {
+      auto_adapt_period_if_needed();
+      last_auto_adapt_check = os::javaTimeNanos();
+    }
+
+    if (Atomic::cmpxchg(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true, false)) {
+      stackwalk_threads_in_native();
+    }
+    os::naked_sleep(100);
+  }
+}
+
+void JfrCPUSamplerThread::stackwalk_threads_in_native() {
+  ResourceMark rm;
+  // Required to prevent JFR from sampling through an ongoing safepoint
+  MutexLocker tlock(Threads_lock);
+  ThreadsListHandle tlh;
+  Thread* current = Thread::current();
+  for (size_t i = 0; i < tlh.list()->length(); i++) {
+    JavaThread* jt = tlh.list()->thread_at(i);
+    JfrThreadLocal* tl = jt->jfr_thread_local();
+    if (tl->wants_async_processing_of_cpu_time_jfr_requests()) {
+      if (jt->thread_state() != _thread_in_native || !tl->try_acquire_cpu_time_jfr_dequeue_lock()) {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+        continue;
+      }
+      if (jt->has_last_Java_frame()) {
+        JfrThreadSampling::process_cpu_time_request(jt, tl, current, false);
+      } else {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+      }
+      tl->release_cpu_time_jfr_queue_lock();
+    }
+  }
+}
+
+static volatile size_t count = 0;
+
+void JfrCPUTimeThreadSampling::send_empty_event(const JfrTicks &start_time, traceid tid, Tickspan cpu_time_period) {
+  EventCPUTimeSample event(UNTIMED);
+  event.set_failed(true);
+  event.set_starttime(start_time);
+  event.set_eventThread(tid);
+  event.set_stackTrace(0);
+  event.set_samplingPeriod(cpu_time_period);
+  event.set_biased(false);
+  event.commit();
+}
+
+
+static volatile size_t biased_count = 0;
+
+void JfrCPUTimeThreadSampling::send_event(const JfrTicks &start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased) {
+  EventCPUTimeSample event(UNTIMED);
+  event.set_failed(false);
+  event.set_starttime(start_time);
+  event.set_eventThread(tid);
+  event.set_stackTrace(sid);
+  event.set_samplingPeriod(cpu_time_period);
+  event.set_biased(biased);
+  event.commit();
+  Atomic::inc(&count);
+  if (biased) {
+    Atomic::inc(&biased_count);
+  }
+  if (Atomic::load(&count) % 1000 == 0) {
+    log_debug(jfr)("CPU thread sampler sent %zu events, lost %d, biased %zu\n", Atomic::load(&count), Atomic::load(&_lost_samples_sum), Atomic::load(&biased_count));
+  }
+}
+
+void JfrCPUTimeThreadSampling::send_lost_event(const JfrTicks &time, traceid tid, s4 lost_samples) {
+  if (!EventCPUTimeSamplesLost::is_enabled()) {
+    return;
+  }
+  EventCPUTimeSamplesLost event(UNTIMED);
+  event.set_starttime(time);
+  event.set_lostSamples(lost_samples);
+  event.set_eventThread(tid);
+  event.commit();
+}
+
+void JfrCPUSamplerThread::post_run() {
+  this->NonJavaThread::post_run();
+  delete this;
+}
+
+static JfrCPUTimeThreadSampling* _instance = nullptr;
+
+JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
+  return *_instance;
+}
+
+JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
+  assert(_instance == nullptr, "invariant");
+  _instance = new JfrCPUTimeThreadSampling();
+  return _instance;
+}
+
+void JfrCPUTimeThreadSampling::destroy() {
+  if (_instance != nullptr) {
+    delete _instance;
+    _instance = nullptr;
+  }
+}
+
+JfrCPUTimeThreadSampling::JfrCPUTimeThreadSampling() : _sampler(nullptr) {}
+
+JfrCPUTimeThreadSampling::~JfrCPUTimeThreadSampling() {
+  if (_sampler != nullptr) {
+    _sampler->disenroll();
+  }
+}
+
+void JfrCPUTimeThreadSampling::create_sampler(double rate, bool auto_adapt) {
+  assert(_sampler == nullptr, "invariant");
+  _sampler = new JfrCPUSamplerThread(rate, auto_adapt);
+  _sampler->start_thread();
+  _sampler->enroll();
+}
+
+void JfrCPUTimeThreadSampling::update_run_state(double rate, bool auto_adapt) {
+  if (rate != 0) {
+    if (_sampler == nullptr) {
+      create_sampler(rate, auto_adapt);
+    } else {
+      _sampler->set_rate(rate, auto_adapt);
+      _sampler->enroll();
+    }
+    return;
+  }
+  if (_sampler != nullptr) {
+    _sampler->set_rate(rate /* 0 */, auto_adapt);
+    _sampler->disenroll();
+  }
+}
+
+void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
+  assert(rate >= 0, "invariant");
+  if (_instance == nullptr) {
+    return;
+  }
+  instance().set_rate_value(rate, auto_adapt);
+}
+
+void JfrCPUTimeThreadSampling::set_rate_value(double rate, bool auto_adapt) {
+  if (_sampler != nullptr) {
+    _sampler->set_rate(rate, auto_adapt);
+  }
+  update_run_state(rate, auto_adapt);
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread *thread) {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->on_javathread_create(thread);
+  }
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread *thread) {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->on_javathread_terminate(thread);
+  }
+}
+
+void JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests() {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->trigger_async_processing_of_cpu_time_jfr_requests();
+  }
+}
+
+void handle_timer_signal(int signo, siginfo_t* info, void* context) {
+  assert(_instance != nullptr, "invariant");
+  _instance->handle_timer_signal(info, context);
+}
+
+
+void JfrCPUTimeThreadSampling::handle_timer_signal(siginfo_t* info, void* context) {
+  if (info->si_code != SI_TIMER) {
+    // not the signal we are interested in
+    return;
+  }
+  assert(_sampler != nullptr, "invariant");
+
+  if (!_sampler->increment_signal_handler_count()) {
+    return;
+  }
+  _sampler->handle_timer_signal(info, context);
+  _sampler->decrement_signal_handler_count();
+}
+
+void JfrCPUSamplerThread::sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now) {
+  JfrSampleRequestBuilder::build_cpu_time_sample_request(request, ucontext, jt, jt->jfr_thread_local(), now);
+}
+
+static bool check_state(JavaThread* thread) {
+  switch (thread->thread_state()) {
+    case _thread_in_Java:
+    case _thread_in_native:
+      return true;
+    default:
+      return false;
+  }
+}
+
+void JfrCPUSamplerThread::handle_timer_signal(siginfo_t* info, void* context) {
+  JfrTicks now = JfrTicks::now();
+  JavaThread* jt = get_java_thread_if_valid();
+  if (jt == nullptr) {
+    return;
+  }
+  JfrThreadLocal* tl = jt->jfr_thread_local();
+  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
+  if (!check_state(jt)) {
+    queue.increment_lost_samples();
+    return;
+  }
+  if (!tl->try_acquire_cpu_time_jfr_enqueue_lock()) {
+    queue.increment_lost_samples();
+    return;
+  }
+
+  JfrCPUTimeSampleRequest request;
+  // the sampling period might be too low for the current Linux configuration
+  // so samples might be skipped and we have to compute the actual period
+  int64_t period = get_sampling_period() * (info->si_overrun + 1);
+  request._cpu_time_period = Ticks(period / 1000000000.0 * JfrTime::frequency()) - Ticks(0);
+  sample_thread(request._request, context, jt, tl, now);
+
+  if (queue.enqueue(request)) {
+    if (queue.size() == 1) {
+      tl->set_has_cpu_time_jfr_requests(true);
+      SafepointMechanism::arm_local_poll_release(jt);
+    }
+  } else {
+    queue.increment_lost_samples();
+  }
+
+  if (jt->thread_state() == _thread_in_native) {
+      if (!tl->wants_async_processing_of_cpu_time_jfr_requests()) {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(true);
+        JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests();
+      }
+  } else {
+    tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+  }
+
+  tl->release_cpu_time_jfr_queue_lock();
+}
+
+static const int SIG = SIGPROF;
+
+static void set_timer_time(timer_t timerid, int64_t period_nanos) {
+  struct itimerspec its;
+  if (period_nanos == 0) {
+    its.it_interval.tv_sec = 0;
+    its.it_interval.tv_nsec = 0;
+  } else {
+    its.it_interval.tv_sec = period_nanos / NANOSECS_PER_SEC;
+    its.it_interval.tv_nsec = period_nanos % NANOSECS_PER_SEC;
+  }
+  its.it_value = its.it_interval;
+  if (timer_settime(timerid, 0, &its, nullptr) == -1) {
+    warning("Failed to set timer for thread sampling: %s", os::strerror(os::get_last_error()));
+  }
+}
+
+bool JfrCPUSamplerThread::create_timer_for_thread(JavaThread* thread, timer_t& timerid) {
+  struct sigevent sev;
+  sev.sigev_notify = SIGEV_THREAD_ID;
+  sev.sigev_signo = SIG;
+  sev.sigev_value.sival_ptr = nullptr;
+  ((int*)&sev.sigev_notify)[1] = thread->osthread()->thread_id();
+  clockid_t clock;
+  int err = pthread_getcpuclockid(thread->osthread()->pthread_id(), &clock);
+  if (err != 0) {
+    log_error(jfr)("Failed to get clock for thread sampling: %s", os::strerror(err));
+    return false;
+  }
+  if (timer_create(clock, &sev, &timerid) < 0) {
+    return false;
+  }
+  int64_t period = get_sampling_period();
+  if (period != 0) {
+    set_timer_time(timerid, period);
+  }
+  return true;
+}
+
+
+void JfrCPUSamplerThread::stop_signal_handlers() {
+  // set the stop signal bit
+  Atomic::or_then_fetch(&_active_signal_handlers, STOP_SIGNAL_BIT, memory_order_acq_rel);
+  while (Atomic::load_acquire(&_active_signal_handlers) > STOP_SIGNAL_BIT) {
+    // wait for all signal handlers to finish
+    os::naked_short_nanosleep(1000);
+  }
+}
+
+// returns false if the stop signal bit was set, true otherwise
+bool JfrCPUSamplerThread::increment_signal_handler_count() {
+  // increment the count of active signal handlers
+  u4 old_value = Atomic::fetch_then_add(&_active_signal_handlers, (u4)1, memory_order_acq_rel);
+  if ((old_value & STOP_SIGNAL_BIT) != 0) {
+    // if the stop signal bit was set, we are not allowed to increment
+    Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
+    return false;
+  }
+  return true;
+}
+
+void JfrCPUSamplerThread::decrement_signal_handler_count() {
+  Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
+}
+
+void JfrCPUSamplerThread::initialize_active_signal_handler_counter() {
+  Atomic::release_store(&_active_signal_handlers, (u4)0);
+}
+
+class VM_JFRInitializeCPUTimeSampler : public VM_Operation {
+ private:
+  JfrCPUSamplerThread* const _sampler;
+
+ public:
+  VM_JFRInitializeCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
+
+  VMOp_Type type() const { return VMOp_JFRInitializeCPUTimeSampler; }
+  void doit() {
+    JfrJavaThreadIterator iter;
+    while (iter.has_next()) {
+      _sampler->on_javathread_create(iter.next());
+    }
+  };
+};
+
+bool JfrCPUSamplerThread::init_timers() {
+  // install sig handler for sig
+  void* prev_handler = PosixSignals::get_signal_handler_for_signal(SIG);
+  if ((prev_handler != SIG_DFL && prev_handler != SIG_IGN && prev_handler != (void*)::handle_timer_signal) ||
+      PosixSignals::install_generic_signal_handler(SIG, (void*)::handle_timer_signal) == (void*)-1) {
+    log_error(jfr)("Conflicting SIGPROF handler found: %p. CPUTimeSample events will not be recorded", prev_handler);
+    return false;
+  }
+  Atomic::release_store(&_signal_handler_installed, true);
+  VM_JFRInitializeCPUTimeSampler op(this);
+  VMThread::execute(&op);
+  return true;
+}
+
+class VM_JFRTerminateCPUTimeSampler : public VM_Operation {
+ private:
+  JfrCPUSamplerThread* const _sampler;
+
+ public:
+  VM_JFRTerminateCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
+
+  VMOp_Type type() const { return VMOp_JFRTerminateCPUTimeSampler; }
+  void doit() {
+    JfrJavaThreadIterator iter;
+    while (iter.has_next()) {
+      JavaThread *thread = iter.next();
+      JfrThreadLocal* tl = thread->jfr_thread_local();
+      timer_t* timer = tl->cpu_timer();
+      if (timer == nullptr) {
+        continue;
+      }
+      timer_delete(*timer);
+      tl->deallocate_cpu_time_jfr_queue();
+      tl->unset_cpu_timer();
+    }
+  };
+};
+
+void JfrCPUSamplerThread::stop_timer() {
+  VM_JFRTerminateCPUTimeSampler op(this);
+  VMThread::execute(&op);
+}
+
+void JfrCPUSamplerThread::auto_adapt_period_if_needed() {
+  int64_t current_period = get_sampling_period();
+  if (_auto_adapt || current_period == -1) {
+    int64_t period = compute_sampling_period(_rate);
+    if (period != current_period) {
+      Atomic::store(&_current_sampling_period_ns, period);
+      update_all_thread_timers();
+    }
+  }
+}
+
+void JfrCPUSamplerThread::set_rate(double rate, bool auto_adapt) {
+  _rate = rate;
+  _auto_adapt = auto_adapt;
+  if (_rate > 0 && Atomic::load_acquire(&_disenrolled) == false) {
+    auto_adapt_period_if_needed();
+  } else {
+    Atomic::store(&_current_sampling_period_ns, compute_sampling_period(rate));
+  }
+}
+
+void JfrCPUSamplerThread::update_all_thread_timers() {
+  int64_t period_millis = get_sampling_period();
+  ThreadsListHandle tlh;
+  for (size_t i = 0; i < tlh.length(); i++) {
+    JavaThread* thread = tlh.thread_at(i);
+    JfrThreadLocal* tl = thread->jfr_thread_local();
+    assert(tl != nullptr, "invariant");
+    timer_t* timer = tl->cpu_timer();
+    if (timer != nullptr) {
+      set_timer_time(*timer, period_millis);
+    }
+  }
+}
+
+#else
+
+static void warn() {
+  static bool displayed_warning = false;
+  if (!displayed_warning) {
+    warning("CPU time method sampling not supported in JFR on your platform");
+    displayed_warning = true;
+  }
+}
+
+static JfrCPUTimeThreadSampling* _instance = nullptr;
+
+JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
+  return *_instance;
+}
+
+JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
+  _instance = new JfrCPUTimeThreadSampling();
+  return _instance;
+}
+
+void JfrCPUTimeThreadSampling::destroy() {
+  delete _instance;
+  _instance = nullptr;
+}
+
+void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
+  if (rate != 0) {
+    warn();
+  }
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread* thread) {
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread* thread) {
+}
+
+#endif // defined(LINUX) && defined(INCLUDE_JFR)
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
new file mode 100644
index 00000000000..7c0545f4772
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
+
+#include "jfr/utilities/jfrAllocation.hpp"
+
+class JavaThread;
+
+#if defined(LINUX)
+
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+
+struct JfrCPUTimeSampleRequest {
+  JfrSampleRequest _request;
+  Tickspan _cpu_time_period;
+
+  JfrCPUTimeSampleRequest() {}
+};
+
+// Fixed size async-signal-safe SPSC linear queue backed by an array.
+// Designed to be only used under lock and read linearly
+class JfrCPUTimeTraceQueue {
+
+  // the default queue capacity, scaled if the sampling period is smaller than 10ms
+  // when the thread is started
+  static const u4 CPU_TIME_QUEUE_CAPACITY = 500;
+
+  JfrCPUTimeSampleRequest* _data;
+  u4 _capacity;
+  // next unfilled index
+  volatile u4 _head;
+
+  volatile u4 _lost_samples;
+
+public:
+  JfrCPUTimeTraceQueue(u4 capacity);
+
+  ~JfrCPUTimeTraceQueue();
+
+  // signal safe, but can't be interleaved with dequeue
+  bool enqueue(JfrCPUTimeSampleRequest& trace);
+
+  JfrCPUTimeSampleRequest& at(u4 index);
+
+  u4 size() const;
+
+  void set_size(u4 size);
+
+  u4 capacity() const;
+
+  // deletes all samples in the queue
+  void set_capacity(u4 capacity);
+
+  bool is_empty() const;
+
+  u4 lost_samples() const;
+
+  void increment_lost_samples();
+
+  // returns the previous lost samples count
+  u4 get_and_reset_lost_samples();
+
+  void resize(u4 capacity);
+
+  void resize_for_period(u4 period_millis);
+
+  void clear();
+
+};
+
+
+class JfrCPUSamplerThread;
+
+class JfrCPUTimeThreadSampling : public JfrCHeapObj {
+  friend class JfrRecorder;
+ private:
+
+  JfrCPUSamplerThread* _sampler;
+
+  void create_sampler(double rate, bool auto_adapt);
+  void set_rate_value(double rate, bool auto_adapt);
+
+  JfrCPUTimeThreadSampling();
+  ~JfrCPUTimeThreadSampling();
+
+  static JfrCPUTimeThreadSampling& instance();
+  static JfrCPUTimeThreadSampling* create();
+  static void destroy();
+
+  void update_run_state(double rate, bool auto_adapt);
+
+ public:
+  static void set_rate(double rate, bool auto_adapt);
+
+  static void on_javathread_create(JavaThread* thread);
+  static void on_javathread_terminate(JavaThread* thread);
+  void handle_timer_signal(siginfo_t* info, void* context);
+
+  static void send_empty_event(const JfrTicks& start_time, traceid tid, Tickspan cpu_time_period);
+  static void send_event(const JfrTicks& start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased);
+  static void send_lost_event(const JfrTicks& time, traceid tid, s4 lost_samples);
+
+  static void trigger_async_processing_of_cpu_time_jfr_requests();
+};
+
+#else
+
+// a basic implementation on other platforms that
+// emits warnings
+
+class JfrCPUTimeThreadSampling : public JfrCHeapObj {
+  friend class JfrRecorder;
+private:
+  static JfrCPUTimeThreadSampling& instance();
+  static JfrCPUTimeThreadSampling* create();
+  static void destroy();
+
+ public:
+  static void set_rate(double rate, bool auto_adapt);
+
+  static void on_javathread_create(JavaThread* thread);
+  static void on_javathread_terminate(JavaThread* thread);
+};
+
+#endif // defined(LINUX)
+
+
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
index f8e63e2e344..7049df0198b 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
@@ -24,6 +24,7 @@
 #include "asm/codeBuffer.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrTime.hpp"
 #include "runtime/continuationEntry.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
@@ -171,7 +172,7 @@ static bool build(JfrSampleRequest& request, intptr_t* fp, JavaThread* jt) {
   assert(request._sample_sp != nullptr, "invariant");
   assert(request._sample_pc != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
-  assert(jt->thread_state() == _thread_in_Java, "invariant");
+  assert(jt->thread_state() == _thread_in_Java || jt->thread_state() == _thread_in_native, "invariant");
 
   // 1. Interpreter frame?
   if (is_interpreter(request)) {
@@ -303,3 +304,33 @@ JfrSampleResult JfrSampleRequestBuilder::build_java_sample_request(const void* u
   }
   return set_biased_java_sample(request, tl, jt);
 }
+
+
+// A biased sample request is denoted by an empty bcp and an empty pc.
+static inline void set_cpu_time_biased_sample(JfrSampleRequest& request, JavaThread* jt) {
+  if (request._sample_bcp != nullptr) {
+    request._sample_bcp = nullptr;
+  }
+  assert(request._sample_bcp == nullptr, "invariant");
+  request._sample_pc = nullptr;
+}
+
+void JfrSampleRequestBuilder::build_cpu_time_sample_request(JfrSampleRequest& request,
+                                                            void* ucontext,
+                                                            JavaThread* jt,
+                                                            JfrThreadLocal* tl,
+                                                            JfrTicks& now) {
+  assert(jt != nullptr, "invariant");
+  request._sample_ticks = now;
+
+  // Prioritize the ljf, if one exists.
+  request._sample_sp = jt->last_Java_sp();
+  if (request._sample_sp == nullptr || !build_from_ljf(request, tl, jt)) {
+    intptr_t* fp;
+    request._sample_pc = os::fetch_frame_from_context(ucontext, reinterpret_cast<intptr_t**>(&request._sample_sp), &fp);
+    assert(sp_in_stack(request, jt), "invariant");
+    if (!build(request, fp, jt)) {
+      set_cpu_time_biased_sample(request, jt);
+    }
+  }
+}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
index 6567e7f8bff..20e737e0cbf 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
@@ -81,6 +81,11 @@ class JfrSampleRequestBuilder : AllStatic {
   static JfrSampleResult build_java_sample_request(const void* ucontext,
                                                    JfrThreadLocal* tl,
                                                    JavaThread* jt);
+  static void build_cpu_time_sample_request(JfrSampleRequest &request,
+                                            void* ucontext,
+                                            JavaThread* jt,
+                                            JfrThreadLocal* tl,
+                                            JfrTicks& now);
 };
 
 #endif // SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index aa72c29cf50..ddc9d59b295 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -28,6 +28,7 @@
 #include "code/nmethod.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrSampleMonitor.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampling.hpp"
@@ -161,7 +162,7 @@ static inline bool is_valid(const PcDesc* pc_desc) {
   return pc_desc != nullptr && pc_desc->scope_decode_offset() != DebugInformationRecorder::serialized_null;
 }
 
-static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt) {
+static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt, bool& biased) {
   assert(jt != nullptr, "invariant");
 
   if (!jt->has_last_Java_frame()) {
@@ -178,6 +179,7 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
     // A biased sample is requested or no code blob.
     top_frame = jt->last_frame();
     in_continuation = is_in_continuation(top_frame, jt);
+    biased = true;
     return true;
   }
 
@@ -227,6 +229,8 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
 
   assert(!stream.current()->is_safepoint_blob_frame(), "invariant");
 
+  biased = true;
+
   // Search the first frame that is above the sampled sp.
   for (; !stream.is_done(); stream.next()) {
     frame* const current = stream.current();
@@ -250,6 +254,7 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
         const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
         if (is_valid(pc_desc)) {
           current->adjust_pc(pc_desc->real_pc(sampled_nm));
+          biased = false;
         }
       }
     }
@@ -270,8 +275,9 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   assert(current != nullptr, "invariant");
 
   frame top_frame;
+  bool biased = false;
   bool in_continuation;
-  if (!compute_top_frame(request, top_frame, in_continuation, jt)) {
+  if (!compute_top_frame(request, top_frame, in_continuation, jt, biased)) {
     return;
   }
 
@@ -293,6 +299,42 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   }
 }
 
+#ifdef LINUX
+static void record_cpu_time_thread(const JfrCPUTimeSampleRequest& request, const JfrTicks& now, const JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(jt != nullptr, "invariant");
+  assert(tl != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+  frame top_frame;
+  bool biased = false;
+  bool in_continuation = false;
+  bool could_compute_top_frame = compute_top_frame(request._request, top_frame, in_continuation, jt, biased);
+  const traceid tid = in_continuation ? tl->vthread_id_with_epoch_update(jt) : JfrThreadLocal::jvm_thread_id(jt);
+
+  if (!could_compute_top_frame) {
+    JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
+    return;
+  }
+  traceid sid;
+  {
+    ResourceMark rm(current);
+    JfrStackTrace stacktrace;
+    if (!stacktrace.record(jt, top_frame, in_continuation, request._request)) {
+      // Unable to record stacktrace. Fail.
+      JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
+      return;
+    }
+    sid = JfrStackTraceRepository::add(stacktrace);
+  }
+  assert(sid != 0, "invariant");
+
+
+  JfrCPUTimeThreadSampling::send_event(request._request._sample_ticks, sid, tid, request._cpu_time_period, biased);
+  if (current == jt) {
+    send_safepoint_latency_event(request._request, now, sid, jt);
+  }
+}
+#endif
+
 static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
   assert(tl != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
@@ -308,6 +350,49 @@ static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, Jav
   assert(!tl->has_enqueued_requests(), "invariant");
 }
 
+static void drain_enqueued_cpu_time_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current, bool lock) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+#ifdef LINUX
+  tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+  if (lock) {
+    tl->acquire_cpu_time_jfr_dequeue_lock();
+  }
+  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
+  for (u4 i = 0; i < queue.size(); i++) {
+    record_cpu_time_thread(queue.at(i), now, tl, jt, current);
+  }
+  queue.clear();
+  assert(queue.is_empty(), "invariant");
+  tl->set_has_cpu_time_jfr_requests(false);
+  if (queue.lost_samples() > 0) {
+    JfrCPUTimeThreadSampling::send_lost_event( now, JfrThreadLocal::thread_id(jt), queue.get_and_reset_lost_samples());
+  }
+  if (lock) {
+    tl->release_cpu_time_jfr_queue_lock();
+  }
+#endif
+}
+
+// Entry point for a thread that has been sampled in native code and has a pending JFR CPU time request.
+void JfrThreadSampling::process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock) {
+  assert(jt != nullptr, "invariant");
+
+  const JfrTicks now = JfrTicks::now();
+  drain_enqueued_cpu_time_requests(now, tl, jt, current, lock);
+}
+
+static void drain_all_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+  drain_enqueued_requests(now, tl, jt, current);
+  if (tl->has_cpu_time_jfr_requests()) {
+    drain_enqueued_cpu_time_requests(now, tl, jt, current, true);
+  }
+}
+
 // Only entered by the JfrSampler thread.
 bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread) {
   assert(tl != nullptr, "invairant");
@@ -382,5 +467,6 @@ void JfrThreadSampling::process_sample_request(JavaThread* jt) {
       break;
     }
   }
-  drain_enqueued_requests(now, tl, jt, jt);
+  drain_all_enqueued_requests(now, tl, jt, jt);
 }
+
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
index d4c4bc0d873..3c4d1a126b0 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
@@ -33,8 +33,10 @@ class Thread;
 
 class JfrThreadSampling : AllStatic {
   friend class JfrSamplerThread;
+  friend class JfrCPUSamplerThread;
  private:
   static bool process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread);
+  static void process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock);
  public:
   static void process_sample_request(JavaThread* jt);
 };
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index 384305862ca..dd75cb2929f 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -29,6 +29,7 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/sampling/objectSampler.hpp"
 #include "jfr/periodic/jfrOSInterface.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
@@ -304,6 +305,9 @@ bool JfrRecorder::create_components() {
   if (!create_thread_sampler()) {
     return false;
   }
+  if (!create_cpu_time_thread_sampling()) {
+    return false;
+  }
   if (!create_event_throttler()) {
     return false;
   }
@@ -318,6 +322,7 @@ static JfrStackTraceRepository* _stack_trace_repository;
 static JfrStringPool* _stringpool = nullptr;
 static JfrOSInterface* _os_interface = nullptr;
 static JfrThreadSampler* _thread_sampler = nullptr;
+static JfrCPUTimeThreadSampling* _cpu_time_thread_sampling = nullptr;
 static JfrCheckpointManager* _checkpoint_manager = nullptr;
 
 bool JfrRecorder::create_java_event_writer() {
@@ -390,6 +395,12 @@ bool JfrRecorder::create_thread_sampler() {
   return _thread_sampler != nullptr;
 }
 
+bool JfrRecorder::create_cpu_time_thread_sampling() {
+  assert(_cpu_time_thread_sampling == nullptr, "invariant");
+  _cpu_time_thread_sampling = JfrCPUTimeThreadSampling::create();
+  return _cpu_time_thread_sampling != nullptr;
+}
+
 bool JfrRecorder::create_event_throttler() {
   return JfrEventThrottler::create();
 }
@@ -428,6 +439,10 @@ void JfrRecorder::destroy_components() {
     JfrThreadSampler::destroy();
     _thread_sampler = nullptr;
   }
+  if (_cpu_time_thread_sampling != nullptr) {
+    JfrCPUTimeThreadSampling::destroy();
+    _cpu_time_thread_sampling = nullptr;
+  }
   JfrEventThrottler::destroy();
 }
 
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index b917904c5fb..3099c8ad344 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -54,6 +54,7 @@ class JfrRecorder : public JfrCHeapObj {
   static bool create_storage();
   static bool create_stringpool();
   static bool create_thread_sampler();
+  static bool create_cpu_time_thread_sampling();
   static bool create_event_throttler();
   static bool create_components();
   static void destroy_components();
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
index 0befaae7751..f660a01c04c 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
@@ -34,6 +34,7 @@ constexpr static const JfrSamplerParams _disabled_params = {
                                                              false // reconfigure
                                                            };
 
+static JfrEventThrottler* _disabled_cpu_time_sample_throttler = nullptr;
 static JfrEventThrottler* _object_allocation_throttler = nullptr;
 static JfrEventThrottler* _safepoint_latency_throttler = nullptr;
 
@@ -48,6 +49,9 @@ JfrEventThrottler::JfrEventThrottler(JfrEventId event_id) :
   _update(false) {}
 
 bool JfrEventThrottler::create() {
+  assert(_disabled_cpu_time_sample_throttler == nullptr, "invariant");
+  _disabled_cpu_time_sample_throttler = new JfrEventThrottler(JfrCPUTimeSampleEvent);
+  _disabled_cpu_time_sample_throttler->_disabled = true;
   assert(_object_allocation_throttler == nullptr, "invariant");
   _object_allocation_throttler = new JfrEventThrottler(JfrObjectAllocationSampleEvent);
   if (_object_allocation_throttler == nullptr || !_object_allocation_throttler->initialize()) {
@@ -59,6 +63,8 @@ bool JfrEventThrottler::create() {
 }
 
 void JfrEventThrottler::destroy() {
+  delete _disabled_cpu_time_sample_throttler;
+  _disabled_cpu_time_sample_throttler = nullptr;
   delete _object_allocation_throttler;
   _object_allocation_throttler = nullptr;
   delete _safepoint_latency_throttler;
@@ -69,15 +75,19 @@ void JfrEventThrottler::destroy() {
 // and another for the SamplingLatency event.
 // When introducing many more throttlers, consider adding a lookup map keyed by event id.
 JfrEventThrottler* JfrEventThrottler::for_event(JfrEventId event_id) {
+  assert(_disabled_cpu_time_sample_throttler != nullptr, "Disabled CPU time throttler has not been properly initialized");
   assert(_object_allocation_throttler != nullptr, "ObjectAllocation throttler has not been properly initialized");
   assert(_safepoint_latency_throttler != nullptr, "SafepointLatency throttler has not been properly initialized");
-  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent, "Event type has an unconfigured throttler");
+  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent || event_id == JfrCPUTimeSampleEvent, "Event type has an unconfigured throttler");
   if (event_id == JfrObjectAllocationSampleEvent) {
     return _object_allocation_throttler;
   }
   if (event_id == JfrSafepointLatencyEvent) {
     return _safepoint_latency_throttler;
   }
+  if (event_id == JfrCPUTimeSampleEvent) {
+    return _disabled_cpu_time_sample_throttler;
+  }
   return nullptr;
 }
 
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 503aa85e02f..4b805a98a32 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -26,6 +26,7 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
 #include "jfr/periodic/jfrThreadCPULoadEvent.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrOopTraceId.inline.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -78,7 +79,15 @@ JfrThreadLocal::JfrThreadLocal() :
   _enqueued_requests(false),
   _vthread(false),
   _notified(false),
-  _dead(false) {
+  _dead(false)
+#ifdef LINUX
+  ,_cpu_timer(nullptr),
+  _cpu_time_jfr_locked(UNLOCKED),
+  _has_cpu_time_jfr_requests(false),
+  _cpu_time_jfr_queue(0),
+  _do_async_processing_of_cpu_time_jfr_requests(false)
+#endif
+  {
   Thread* thread = Thread::current_or_null();
   _parent_trace_id = thread != nullptr ? jvm_thread_id(thread) : (traceid)0;
 }
@@ -129,7 +138,9 @@ void JfrThreadLocal::on_start(Thread* t) {
   if (JfrRecorder::is_recording()) {
     JfrCheckpointManager::write_checkpoint(t);
     if (t->is_Java_thread()) {
-      send_java_thread_start_event(JavaThread::cast(t));
+      JavaThread *const jt = JavaThread::cast(t);
+      JfrCPUTimeThreadSampling::on_javathread_create(jt);
+      send_java_thread_start_event(jt);
     }
   }
   if (t->jfr_thread_local()->has_cached_stack_trace()) {
@@ -221,6 +232,7 @@ void JfrThreadLocal::on_exit(Thread* t) {
   if (t->is_Java_thread()) {
     JavaThread* const jt = JavaThread::cast(t);
     send_java_thread_end_event(jt, JfrThreadLocal::jvm_thread_id(jt));
+    JfrCPUTimeThreadSampling::on_javathread_terminate(jt);
     JfrThreadCPULoadEvent::send_event_for_thread(jt);
   }
   release(tl, Thread::current()); // because it could be that Thread::current() != t
@@ -537,3 +549,85 @@ Arena* JfrThreadLocal::dcmd_arena(JavaThread* jt) {
   tl->_dcmd_arena = arena;
   return arena;
 }
+
+
+#ifdef LINUX
+
+void JfrThreadLocal::set_cpu_timer(timer_t* timer) {
+  if (_cpu_timer == nullptr) {
+    _cpu_timer = JfrCHeapObj::new_array<timer_t>(1);
+  }
+  *_cpu_timer = *timer;
+}
+
+void JfrThreadLocal::unset_cpu_timer() {
+  if (_cpu_timer != nullptr) {
+    timer_delete(*_cpu_timer);
+    JfrCHeapObj::free(_cpu_timer, sizeof(timer_t));
+    _cpu_timer = nullptr;
+  }
+}
+
+timer_t* JfrThreadLocal::cpu_timer() const {
+  return _cpu_timer;
+}
+
+bool JfrThreadLocal::is_cpu_time_jfr_enqueue_locked() {
+  return Atomic::load_acquire(&_cpu_time_jfr_locked) == ENQUEUE;
+}
+
+bool JfrThreadLocal::is_cpu_time_jfr_dequeue_locked() {
+  return Atomic::load_acquire(&_cpu_time_jfr_locked) == DEQUEUE;
+}
+
+bool JfrThreadLocal::try_acquire_cpu_time_jfr_enqueue_lock() {
+  return Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, ENQUEUE) == UNLOCKED;
+}
+
+bool JfrThreadLocal::try_acquire_cpu_time_jfr_dequeue_lock() {
+  CPUTimeLockState got;
+  while (true)  {
+    CPUTimeLockState got = Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE);
+    if (got == UNLOCKED) {
+      return true; // successfully locked for dequeue
+    }
+    if (got == DEQUEUE) {
+      return false; // already locked for dequeue
+    }
+    // else wait for the lock to be released from a signal handler
+  }
+}
+
+void JfrThreadLocal::acquire_cpu_time_jfr_dequeue_lock() {
+  while (Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE) != UNLOCKED);
+}
+
+void JfrThreadLocal::release_cpu_time_jfr_queue_lock() {
+  Atomic::release_store(&_cpu_time_jfr_locked, UNLOCKED);
+}
+
+void JfrThreadLocal::set_has_cpu_time_jfr_requests(bool has_requests) {
+  Atomic::release_store(&_has_cpu_time_jfr_requests, has_requests);
+}
+
+bool JfrThreadLocal::has_cpu_time_jfr_requests() {
+  return Atomic::load_acquire(&_has_cpu_time_jfr_requests);
+}
+
+JfrCPUTimeTraceQueue& JfrThreadLocal::cpu_time_jfr_queue() {
+  return _cpu_time_jfr_queue;
+}
+
+void JfrThreadLocal::deallocate_cpu_time_jfr_queue() {
+  cpu_time_jfr_queue().resize(0);
+}
+
+void JfrThreadLocal::set_do_async_processing_of_cpu_time_jfr_requests(bool wants) {
+  Atomic::release_store(&_do_async_processing_of_cpu_time_jfr_requests, wants);
+}
+
+bool JfrThreadLocal::wants_async_processing_of_cpu_time_jfr_requests() {
+  return Atomic::load_acquire(&_do_async_processing_of_cpu_time_jfr_requests);
+}
+
+#endif
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index 8e545d9c429..715a2c44f93 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -33,6 +33,10 @@
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 
+#ifdef LINUX
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
+#endif
+
 class Arena;
 class JavaThread;
 class JfrBuffer;
@@ -79,6 +83,22 @@ class JfrThreadLocal {
   bool _dead;
   bool _sampling_critical_section;
 
+#ifdef LINUX
+  timer_t* _cpu_timer;
+
+  enum CPUTimeLockState {
+    UNLOCKED,
+    // locked for enqueuing
+    ENQUEUE,
+    // locked for dequeuing
+    DEQUEUE
+  };
+  volatile CPUTimeLockState _cpu_time_jfr_locked;
+  volatile bool _has_cpu_time_jfr_requests;
+  JfrCPUTimeTraceQueue _cpu_time_jfr_queue;
+  volatile bool _do_async_processing_of_cpu_time_jfr_requests;
+#endif
+
   JfrBuffer* install_native_buffer() const;
   JfrBuffer* install_java_buffer() const;
   void release(Thread* t);
@@ -342,6 +362,39 @@ class JfrThreadLocal {
   void set_thread_blob(const JfrBlobHandle& handle);
   const JfrBlobHandle& thread_blob() const;
 
+  // CPU time sampling
+#ifdef LINUX
+  void set_cpu_timer(timer_t* timer);
+  void unset_cpu_timer();
+  timer_t* cpu_timer() const;
+
+  // The CPU time JFR lock has three different states:
+  // - ENQUEUE: lock for enqueuing CPU time requests
+  // - DEQUEUE: lock for dequeuing CPU time requests
+  // - UNLOCKED: no lock held
+  // This ensures that we can safely enqueue and dequeue CPU time requests,
+  // without interleaving
+
+  bool is_cpu_time_jfr_enqueue_locked();
+  bool is_cpu_time_jfr_dequeue_locked();
+
+  bool try_acquire_cpu_time_jfr_enqueue_lock();
+  bool try_acquire_cpu_time_jfr_dequeue_lock();
+  void acquire_cpu_time_jfr_dequeue_lock();
+  void release_cpu_time_jfr_queue_lock();
+
+  void set_has_cpu_time_jfr_requests(bool has_events);
+  bool has_cpu_time_jfr_requests();
+
+  JfrCPUTimeTraceQueue& cpu_time_jfr_queue();
+  void deallocate_cpu_time_jfr_queue();
+
+  void set_do_async_processing_of_cpu_time_jfr_requests(bool wants);
+  bool wants_async_processing_of_cpu_time_jfr_requests();
+#else
+  bool has_cpu_time_jfr_requests() { return false; }
+#endif
+
   // Hooks
   static void on_start(Thread* t);
   static void on_exit(Thread* t);
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index f3a06d5efd2..772ef7bbe82 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -78,6 +78,7 @@ class JavaThread;
 //       - WorkerThread
 //     - WatcherThread
 //     - JfrThreadSampler
+//     - JfrCPUSamplerThread
 //     - LogAsyncWriter
 //
 // All Thread subclasses must be either JavaThread or NonJavaThread.
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 50d85944485..ac5d37381f9 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -115,6 +115,8 @@
   template(JFROldObject)                          \
   template(JvmtiPostObjectFree)                   \
   template(RendezvousGCThreads)                   \
+  template(JFRInitializeCPUTimeSampler)       \
+  template(JFRTerminateCPUTimeSampler)        \
   template(ReinitializeMDO)
 
 class Thread;
diff --git a/src/hotspot/share/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp
index 8d2bbc7ce1f..88dc9a787f9 100644
--- a/src/hotspot/share/utilities/ticks.hpp
+++ b/src/hotspot/share/utilities/ticks.hpp
@@ -236,6 +236,7 @@ class TimeInstant : public Rep<TimeSource> {
   friend class TimePartitionsTest;
   friend class GCTimerTest;
   friend class CompilerEvent;
+  friend class JfrCPUSamplerThread;
 };
 
 #if INCLUDE_JFR
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index f43e45b724e..2ea4725abc8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -51,6 +51,7 @@
 import jdk.jfr.internal.settings.LevelSetting;
 import jdk.jfr.internal.settings.MethodSetting;
 import jdk.jfr.internal.settings.PeriodSetting;
+import jdk.jfr.internal.settings.CPUThrottleSetting;
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 import jdk.jfr.internal.settings.ThrottleSetting;
@@ -326,6 +327,9 @@ private static Control defineCutoff(PlatformEventType type) {
     private static Control defineThrottle(PlatformEventType type) {
         String def = type.getAnnotationValue(Throttle.class, ThrottleSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
+        if (type.getName().equals("jdk.CPUTimeSample")) {
+            return new Control(new CPUThrottleSetting(type), def);
+        }
         return new Control(new ThrottleSetting(type, def), def);
     }
 
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 e0eaef74b4c..b91f0c337b2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -270,6 +270,16 @@ public final class JVM {
      */
     public static native void setMethodSamplingPeriod(long type, long periodMillis);
 
+    /**
+     * Set the maximum event emission rate for the CPU time sampler
+     *
+     * Setting rate to 0 turns off the CPU time sampler.
+     *
+     * @param rate the new rate in events per second
+     * @param autoAdapt true if the rate should be adapted automatically
+     */
+    public static native void setCPUThrottle(double rate, boolean autoAdapt);
+
     /**
      * Sets the file where data should be written.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index 32b59bca4c0..769e7055305 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -30,8 +30,10 @@
 import java.util.Objects;
 
 import jdk.jfr.SettingDescriptor;
+import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.ImplicitFields;
+import jdk.jfr.internal.util.TimespanRate;
 import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.tracing.Modification;
 
@@ -45,6 +47,7 @@ public final class PlatformEventType extends Type {
     private final boolean isJVM;
     private final boolean isJDK;
     private final boolean isMethodSampling;
+    private final boolean isCPUTimeMethodSampling;
     private final List<SettingDescriptor> settings = new ArrayList<>(5);
     private final boolean dynamicSettings;
     private final int stackTraceOffset;
@@ -56,6 +59,7 @@ public final class PlatformEventType extends Type {
     private boolean stackTraceEnabled = true;
     private long thresholdTicks = 0;
     private long period = 0;
+    private TimespanRate cpuRate;
     private boolean hasHook;
 
     private boolean beginChunk;
@@ -75,6 +79,7 @@ public final class PlatformEventType extends Type {
         this.dynamicSettings = dynamicSettings;
         this.isJVM = Type.isDefinedByJVM(id);
         this.isMethodSampling = determineMethodSampling();
+        this.isCPUTimeMethodSampling = isJVM && name.equals(Type.EVENT_NAME_PREFIX + "CPUTimeSample");
         this.isJDK = isJDK;
         this.stackTraceOffset = determineStackTraceOffset();
     }
@@ -191,6 +196,13 @@ public void setThrottle(long eventSampleSize, long period_ms) {
         }
     }
 
+    public void setCPUThrottle(TimespanRate rate) {
+        if (isCPUTimeMethodSampling) {
+            this.cpuRate = rate;
+            JVM.setCPUThrottle(rate.rate(), rate.autoAdapt());
+        }
+    }
+
     public void setHasPeriod(boolean hasPeriod) {
         this.hasPeriod = hasPeriod;
     }
@@ -251,6 +263,9 @@ public void setEnabled(boolean enabled) {
             if (isMethodSampling) {
                 long p = enabled ? period : 0;
                 JVM.setMethodSamplingPeriod(getId(), p);
+            } else if (isCPUTimeMethodSampling) {
+                TimespanRate r = enabled ? cpuRate : new TimespanRate(0, false);
+                JVM.setCPUThrottle(r.rate(), r.autoAdapt());
             } else {
                 JVM.setEnabled(getId(), enabled);
             }
@@ -388,6 +403,10 @@ public boolean isMethodSampling() {
         return isMethodSampling;
     }
 
+    public boolean isCPUTimeMethodSampling() {
+        return isCPUTimeMethodSampling;
+    }
+
     public void setStackFilterId(long id) {
         startFilterId = id;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index a6192db1ab0..a2ac74142f4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -39,7 +39,8 @@ label = "Active Settings"
 table = "COLUMN 'Event Type', 'Enabled', 'Threshold',
                 'Stack Trace','Period','Cutoff', 'Throttle'
          FORMAT none, missing:whitespace, missing:whitespace, missing:whitespace,
-                missing:whitespace, missing:whitespace, missing:whitespace
+                missing:whitespace, missing:whitespace, missing:whitespace,
+                missing:whitespace
          SELECT E.id, LAST_BATCH(E.value), LAST_BATCH(T.value),
                 LAST_BATCH(S.value), LAST_BATCH(P.value),
                 LAST_BATCH(C.value), LAST_BATCH(U.value)
@@ -400,6 +401,28 @@ table = "COLUMN 'Method', 'Samples', 'Percent'
          SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
          FROM ExecutionSample GROUP BY T LIMIT 25"
 
+[application.cpu-time-hot-methods]
+label = "Java Methods that Execute the Most from CPU Time Sampler"
+table = "COLUMN 'Method', 'Samples', 'Percent'
+         FORMAT none, none, normalized
+         SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
+         FROM CPUTimeSample GROUP BY T LIMIT 25"
+
+[application.cpu-time-statistics]
+label = "CPU Time Sample Statistics"
+form = "COLUMN 'Successful Samples', 'Failed Samples', 'Biased Samples', 'Total Samples', 'Lost Samples'
+        SELECT COUNT(S.startTime), COUNT(F.startTime), COUNT(B.startTime), Count(A.startTime), SUM(L.lostSamples)
+        FROM
+          CPUTimeSample AS S,
+          CPUTimeSample AS F,
+          CPUTimeSample AS A,
+          CPUTimeSample AS B,
+          CPUTimeSamplesLost AS L
+        WHERE
+          S.failed = 'false' AND
+          F.failed = 'true'  AND
+          B.biased = 'true'"
+
 [jvm.jdk-agents]
 label = "JDK Agents"
 table = "COLUMN 'Time', 'Initialization', 'Name', 'Options'
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
new file mode 100644
index 00000000000..c18aeef2132
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, Datadog, Inc. 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.settings;
+
+import static jdk.jfr.internal.util.TimespanUnit.SECONDS;
+import static jdk.jfr.internal.util.TimespanUnit.MILLISECONDS;
+
+import java.util.Objects;
+import java.util.Set;
+
+import jdk.jfr.Description;
+import jdk.jfr.SettingControl;
+import jdk.jfr.Label;
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.Name;
+import jdk.jfr.internal.PlatformEventType;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.util.TimespanRate;
+import jdk.jfr.internal.util.Utils;
+
+@MetadataDefinition
+@Label("CPUThrottleSetting")
+@Description("Upper bounds the emission rate for CPU time samples")
+@Name(Type.SETTINGS_PREFIX + "Rate")
+public final class CPUThrottleSetting extends SettingControl {
+    public static final String DEFAULT_VALUE = "0/s";
+    private final PlatformEventType eventType;
+    private String value = DEFAULT_VALUE;
+
+    public CPUThrottleSetting(PlatformEventType eventType) {
+       this.eventType = Objects.requireNonNull(eventType);
+    }
+
+    @Override
+    public String combine(Set<String> values) {
+        TimespanRate max = null;
+        for (String value : values) {
+            TimespanRate rate = TimespanRate.of(value);
+            if (rate != null) {
+                if (max == null || rate.isHigher(max)) {
+                    max = rate;
+                }
+                max = new TimespanRate(max.rate(), max.autoAdapt() || rate.autoAdapt());
+            }
+        }
+        // "off" is not supported
+        return Objects.requireNonNullElse(max.toString(), DEFAULT_VALUE);
+    }
+
+    @Override
+    public void setValue(String value) {
+        TimespanRate rate = TimespanRate.of(value);
+        if (rate != null) {
+            eventType.setCPUThrottle(rate);
+            this.value = value;
+        }
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+}
+
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
index f32436a5e0f..2632cd63848 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
@@ -55,4 +55,8 @@ public boolean isHigher(Rate that) {
     private double inNanos() {
         return (double) amount / unit.nanos;
     }
+
+    public double perSecond() {
+        return inNanos() * 1_000_000_000.0;
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
new file mode 100644
index 00000000000..5d671310e3c
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.util;
+
+import jdk.jfr.internal.settings.CPUThrottleSetting;
+
+/**
+ * A rate or fixed period, see {@link jdk.jfr.internal.Rate}
+ */
+public record TimespanRate(double rate, boolean autoAdapt) {
+
+    public static TimespanRate of(String text) {
+        if (text.equals("off")) {
+            text = CPUThrottleSetting.DEFAULT_VALUE;
+        }
+        boolean isPeriod = !text.contains("/");
+        if (isPeriod) {
+            var period = ValueParser.parseTimespanWithInfinity(text, Long.MAX_VALUE);
+            if (period == Long.MAX_VALUE) {
+                return null;
+            }
+            if (period == 0) {
+                return new TimespanRate(0, false);
+            }
+            return new TimespanRate(Runtime.getRuntime().availableProcessors() / (period / 1_000_000_000.0), false);
+        }
+        Rate r = Rate.of(text);
+        if (r == null) {
+            return null;
+        }
+        return new TimespanRate(r.perSecond(), true);
+    }
+
+    public boolean isHigher(TimespanRate that) {
+        return rate() > that.rate();
+    }
+
+    @Override
+    public String toString() {
+        if (autoAdapt) {
+            return String.format("%d/ns", (long)(rate * 1_000_000_000L));
+        }
+        return String.format("%dns", (long)(Runtime.getRuntime().availableProcessors() / rate * 1_000_000_000L));
+    }
+}
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 293af26746f..541d1d3aa2f 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -226,6 +226,16 @@
       <setting name="throttle">off</setting>
     </event>
 
+    <event name="jdk.CPUTimeSample">
+      <setting name="enabled" control="method-sampling-enabled">false</setting>
+      <setting name="throttle">500/s</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.CPUTimeSamplesLost">
+      <setting name="enabled" control="method-sampling-enabled">true</setting>
+    </event>
+
     <event name="jdk.SafepointBegin">
       <setting name="enabled">true</setting>
       <setting name="threshold">10 ms</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 89a9022d11e..9cec2d9a70f 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -206,6 +206,16 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.CPUTimeSample">
+      <setting name="enabled">false</setting>
+      <setting name="throttle">10ms</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.CPUTimeSamplesLost">
+      <setting name="enabled">true</setting>
+    </event>
+
     <event name="jdk.MethodTrace">
       <setting name="enabled">true</setting>
       <setting name="filter" control="method-trace"></setting>
diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index 5b8aacfb1d2..d6e126a493f 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -89,7 +89,10 @@ public class TestLookForUntestedEvents {
 
     // Experimental events
     private static final Set<String> experimentalEvents = Set.of(
-        "Flush", "SyncOnValueBasedClass");
+        "Flush", "SyncOnValueBasedClass", "CPUTimeSample", "CPUTimeSamplesLost");
+
+    // Subset of the experimental events that should have tests
+    private static final Set<String> experimentalButTestedEvents = Set.of("CPUTimeSample");
 
     public static void main(String[] args) throws Exception {
         for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
@@ -110,7 +113,9 @@ private static void lookForEventsNotCoveredByTests() throws Exception {
             .collect(Collectors.toList());
 
         Set<String> eventsNotCoveredByTest = new HashSet<>(jfrEventTypes);
-        for (String event : jfrEventTypes) {
+        Set<String> checkedEvents = new HashSet<>(jfrEventTypes);
+        checkedEvents.addAll(experimentalButTestedEvents);
+        for (String event : checkedEvents) {
             for (Path p : paths) {
                 if (findStringInFile(p, event)) {
                     eventsNotCoveredByTest.remove(event);
diff --git a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
new file mode 100644
index 00000000000..de211b8c454
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.profiling;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedStackTrace;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.RecurseThread;
+
+public class BaseTestFullStackTrace {
+    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
+
+    private final String eventName;
+    private final String threadFieldName;
+
+    public BaseTestFullStackTrace(String eventName, String threadFieldName) {
+        this.eventName = eventName;
+        this.threadFieldName = threadFieldName;
+    }
+
+    public void run() throws Throwable {
+        RecurseThread[] threads = new RecurseThread[3];
+        for (int i = 0; i < threads.length; ++i) {
+            int depth = MAX_DEPTH - 1 + i;
+            threads[i] = new RecurseThread(depth);
+            threads[i].setName("recursethread-" + depth);
+            threads[i].start();
+        }
+
+        for (RecurseThread thread : threads) {
+            while (!thread.isInRunLoop()) {
+                Thread.sleep(20);
+            }
+        }
+
+        assertStackTraces(threads);
+
+        for (RecurseThread thread : threads) {
+            thread.quit();
+            thread.join();
+        }
+    }
+
+    private void assertStackTraces(RecurseThread[] threads) throws Throwable {
+        while (true) {
+            try (Recording recording = new Recording()) {
+                if (eventName.equals(EventNames.CPUTimeSample)) {
+                    recording.enable(eventName).with("throttle", "50ms");
+                } else {
+                    recording.enable(eventName).withPeriod(Duration.ofMillis(50));
+                }
+                recording.start();
+                Thread.sleep(500);
+                recording.stop();
+                if (hasValidStackTraces(recording, threads)) {
+                    break;
+                }
+            }
+        };
+    }
+
+    private boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
+        boolean[] isEventFound = new boolean[threads.length];
+
+        for (RecordedEvent event : Events.fromRecording(recording)) {
+            System.out.println("Event: " + event);
+            String threadName = Events.assertField(event, threadFieldName + ".javaName").getValue();
+            long threadId = Events.assertField(event, threadFieldName + ".javaThreadId").getValue();
+
+            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
+                RecurseThread currThread = threads[threadIndex];
+                if (threadId == currThread.getId()) {
+                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
+                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
+                    if ("recurseEnd".equals(getTopMethodName(event))) {
+                        isEventFound[threadIndex] = true;
+                        checkEvent(event, currThread.totalDepth);
+                        break;
+                    }
+                }
+            }
+        }
+
+        for (int i = 0; i < threads.length; ++i) {
+            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
+            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
+        }
+        for (int i = 0; i < threads.length; ++i) {
+            if(!isEventFound[i]) {
+               // no assertion, let's retry.
+               // Could be race condition, i.e safe point during Thread.sleep
+               System.out.println("Failed to validate all threads, will retry.");
+               return false;
+            }
+        }
+        return true;
+    }
+
+    public String getTopMethodName(RecordedEvent event) {
+        List<RecordedFrame> frames = event.getStackTrace().getFrames();
+        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
+        return frames.getFirst().getMethod().getName();
+    }
+
+    private void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
+        RecordedStackTrace stacktrace = null;
+        try {
+            stacktrace = event.getStackTrace();
+            List<RecordedFrame> frames = stacktrace.getFrames();
+            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
+            List<String> expectedMethods = getExpectedMethods(expectedDepth);
+            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
+
+            for (int i = 0; i < frames.size(); ++i) {
+                String name = frames.get(i).getMethod().getName();
+                String expectedName = expectedMethods.get(i);
+                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
+                Asserts.assertEquals(name, expectedName, "Wrong method name");
+            }
+
+            boolean isTruncated = stacktrace.isTruncated();
+            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
+            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
+
+            String firstMethod = frames.getLast().getMethod().getName();
+            boolean isFullTrace = "run".equals(firstMethod);
+            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
+            Asserts.assertTrue(isTruncated != isFullTrace, msg);
+        } catch (Throwable t) {
+            System.out.println(String.format("stacktrace:%n%s", stacktrace));
+            throw t;
+        }
+    }
+
+    private List<String> getExpectedMethods(int depth) {
+        List<String> methods = new ArrayList<>();
+        methods.add("recurseEnd");
+        for (int i = 0; i < depth - 2; ++i) {
+            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
+        }
+        methods.add("run");
+        if (depth > MAX_DEPTH) {
+            methods = methods.subList(0, MAX_DEPTH);
+        }
+        return methods;
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
new file mode 100644
index 00000000000..eb8d33832b5
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.RecurseThread;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main/timeout=30 jdk.jfr.event.profiling.TestCPUTimeAndExecutionSample
+ */
+public class TestCPUTimeAndExecutionSample {
+
+    static String sampleEvent = EventNames.CPUTimeSample;
+
+    // The period is set to 1100 ms to provoke the 1000 ms
+    // threshold in the JVM for os::naked_short_sleep().
+    public static void main(String[] args) throws Exception {
+        run(EventNames.ExecutionSample);
+        run(EventNames.CPUTimeSample);
+        run(EventNames.ExecutionSample);
+        run(EventNames.CPUTimeSample);
+    }
+
+    private static void run(String eventType) {
+        RecurseThread t = new RecurseThread(50);
+        t.setDaemon(true);
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(sampleEvent).with("throttle", "1000/s");
+            rs.onEvent(sampleEvent, e -> {
+                t.quit();
+                rs.close();
+            });
+            t.start();
+            rs.start();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
new file mode 100644
index 00000000000..0d1108346ab
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
@@ -0,0 +1,41 @@
+/*
+ * 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.event.profiling;
+
+import jdk.test.lib.jfr.EventNames;
+
+/**
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
+ * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleFullStackTrace
+ */
+public class TestCPUTimeSampleFullStackTrace {
+
+    public static void main(String[] args) throws Throwable {
+        new BaseTestFullStackTrace(EventNames.CPUTimeSample, "eventThread").run();
+    }
+
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
new file mode 100644
index 00000000000..133df36684c
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.internal.JVM;
+import jdk.test.lib.jfr.EventNames;
+
+/*
+ * Tests that creating multiple recordings after another is possible.
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSampleMultipleRecordings
+ */
+public class TestCPUTimeSampleMultipleRecordings {
+
+    static String nativeEvent = EventNames.CPUTimeSample;
+
+    static volatile boolean alive = true;
+
+    public static void main(String[] args) throws Exception {
+        Thread t = new Thread(TestCPUTimeSampleMultipleRecordings::nativeMethod);
+        t.setDaemon(true);
+        t.start();
+        for (int i = 0; i < 2; i++) {
+            try (RecordingStream rs = new RecordingStream()) {
+                rs.enable(nativeEvent).with("throttle", "1ms");
+                rs.onEvent(nativeEvent, e -> {
+                    alive = false;
+                    rs.close();
+                });
+
+                rs.start();
+            }
+        }
+        alive = false;
+    }
+
+    public static void nativeMethod() {
+        while (alive) {
+            JVM.getPid();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
new file mode 100644
index 00000000000..1617bce4ba3
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.internal.JVM;
+import jdk.test.lib.jfr.EventNames;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSampleNative
+ */
+public class TestCPUTimeSampleNative {
+
+    static String nativeEvent = EventNames.CPUTimeSample;
+
+    static volatile boolean alive = true;
+
+    public static void main(String[] args) throws Exception {
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(nativeEvent).with("throttle", "1ms");
+            rs.onEvent(nativeEvent, e -> {
+                alive = false;
+                rs.close();
+            });
+            Thread t = new Thread(TestCPUTimeSampleNative::nativeMethod);
+            t.setDaemon(true);
+            t.start();
+            rs.start();
+        }
+
+    }
+
+    public static void nativeMethod() {
+        while (alive) {
+            JVM.getPid();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
new file mode 100644
index 00000000000..55b350ad096
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+import java.lang.management.ManagementFactory;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Comparator;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleThrottling
+ */
+public class TestCPUTimeSampleThrottling {
+
+    public static void main(String[] args) throws Exception {
+        testZeroPerSecond();
+        testThrottleSettings();
+        testThrottleSettingsPeriod();
+    }
+
+    private static void testZeroPerSecond() throws Exception {
+        Asserts.assertTrue(0L == countEvents(1000, "0/s").count());
+    }
+
+    private static void testThrottleSettings() throws Exception {
+        long count = countEvents(1000,
+            Runtime.getRuntime().availableProcessors() * 2 + "/s").count();
+        Asserts.assertTrue(count > 0 && count < 3,
+            "Expected between 0 and 3 events, got " + count);
+    }
+
+    private static void testThrottleSettingsPeriod() throws Exception {
+        float rate = countEvents(1000, "10ms").rate();
+        Asserts.assertTrue(rate > 90 && rate < 110, "Expected around 100 events per second, got " + rate);
+    }
+
+    private record EventCount(long count, float time) {
+        float rate() {
+            return count / time;
+        }
+    }
+
+    private static EventCount countEvents(int timeMs, String rate) throws Exception {
+        try(Recording recording = new Recording()) {
+            recording.enable(EventNames.CPUTimeSample)
+                    .with("throttle", rate);
+
+            var bean = ManagementFactory.getThreadMXBean();
+
+            recording.start();
+
+            long startThreadCpuTime = bean.getCurrentThreadCpuTime();
+
+            wasteCPU(timeMs);
+
+            long spendCPUTime = bean.getCurrentThreadCpuTime() - startThreadCpuTime;
+
+            recording.stop();
+
+            long eventCount = Events.fromRecording(recording).stream()
+                    .filter(e -> e.getThread().getJavaName()
+                                .equals(Thread.currentThread().getName()))
+                    .count();
+
+            System.out.println("Event count: " + eventCount + ", CPU time: " + spendCPUTime / 1_000_000_000f + "s");
+
+            return new EventCount(eventCount, spendCPUTime / 1_000_000_000f);
+        }
+    }
+
+    private static void wasteCPU(int durationMs) {
+        long start = System.currentTimeMillis();
+        double i = 0;
+        while (System.currentTimeMillis() - start < durationMs) {
+            for (int j = 0; j < 100000; j++) {
+                i = Math.sqrt(i * Math.pow(Math.sqrt(Math.random()), Math.random()));
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
new file mode 100644
index 00000000000..69d32d48282
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.RecurseThread;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSamplingLongPeriod
+ */
+public class TestCPUTimeSamplingLongPeriod {
+
+    static String sampleEvent = EventNames.CPUTimeSample;
+
+    // The period is set to 1100 ms to provoke the 1000 ms
+    // threshold in the JVM for os::naked_short_sleep().
+    public static void main(String[] args) throws Exception {
+        RecurseThread t = new RecurseThread(50);
+        t.setDaemon(true);
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(sampleEvent).with("throttle", "1100ms");
+            rs.onEvent(sampleEvent, e -> {
+                t.quit();
+                rs.close();
+            });
+            t.start();
+            rs.start();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index b06f9eed03d..c337a8128ab 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -23,147 +23,20 @@
 
 package jdk.jfr.event.profiling;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordedFrame;
-import jdk.jfr.consumer.RecordedStackTrace;
-import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.Events;
-import jdk.test.lib.jfr.RecurseThread;
 
 /**
  * @test
  * @requires vm.hasJFR
  * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
+ * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
  */
 public class TestFullStackTrace {
-    private final static String EVENT_NAME = EventNames.ExecutionSample;
-    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
 
     public static void main(String[] args) throws Throwable {
-        RecurseThread[] threads = new RecurseThread[3];
-        for (int i = 0; i < threads.length; ++i) {
-            int depth = MAX_DEPTH - 1 + i;
-            threads[i] = new RecurseThread(depth);
-            threads[i].setName("recursethread-" + depth);
-            threads[i].start();
-        }
-
-        for (RecurseThread thread : threads) {
-            while (!thread.isInRunLoop()) {
-                Thread.sleep(20);
-            }
-        }
-
-        assertStackTraces(threads);
-
-        for (RecurseThread thread : threads) {
-            thread.quit();
-            thread.join();
-        }
-    }
-
-    private static void assertStackTraces( RecurseThread[] threads) throws Throwable {
-        Recording recording= null;
-        do {
-            recording = new Recording();
-            recording.enable(EVENT_NAME).withPeriod(Duration.ofMillis(50));
-            recording.start();
-            Thread.sleep(500);
-            recording.stop();
-        } while (!hasValidStackTraces(recording, threads));
+        new BaseTestFullStackTrace(EventNames.ExecutionSample, "sampledThread").run();
     }
 
-    private static boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
-        boolean[] isEventFound = new boolean[threads.length];
-
-        for (RecordedEvent event : Events.fromRecording(recording)) {
-            //System.out.println("Event: " + event);
-            String threadName = Events.assertField(event, "sampledThread.javaName").getValue();
-            long threadId = Events.assertField(event, "sampledThread.javaThreadId").getValue();
-
-            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
-                RecurseThread currThread = threads[threadIndex];
-                if (threadId == currThread.getId()) {
-                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
-                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
-                    if ("recurseEnd".equals(getTopMethodName(event))) {
-                        isEventFound[threadIndex] = true;
-                        checkEvent(event, currThread.totalDepth);
-                        break;
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < threads.length; ++i) {
-            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
-            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
-        }
-        for (int i = 0; i < threads.length; ++i) {
-            if(!isEventFound[i]) {
-               // no assertion, let's retry.
-               // Could be race condition, i.e safe point during Thread.sleep
-               System.out.println("Failed to validate all threads, will retry.");
-               return false;
-            }
-        }
-        return true;
-    }
-
-    public static String getTopMethodName(RecordedEvent event) {
-        List<RecordedFrame> frames = event.getStackTrace().getFrames();
-        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
-        return frames.getFirst().getMethod().getName();
-    }
-
-    private static void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
-        RecordedStackTrace stacktrace = null;
-        try {
-            stacktrace = event.getStackTrace();
-            List<RecordedFrame> frames = stacktrace.getFrames();
-            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
-            List<String> expectedMethods = getExpectedMethods(expectedDepth);
-            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
-
-            for (int i = 0; i < frames.size(); ++i) {
-                String name = frames.get(i).getMethod().getName();
-                String expectedName = expectedMethods.get(i);
-                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
-                Asserts.assertEquals(name, expectedName, "Wrong method name");
-            }
-
-            boolean isTruncated = stacktrace.isTruncated();
-            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
-            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
-
-            String firstMethod = frames.getLast().getMethod().getName();
-            boolean isFullTrace = "run".equals(firstMethod);
-            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
-            Asserts.assertTrue(isTruncated != isFullTrace, msg);
-        } catch (Throwable t) {
-            System.out.println(String.format("stacktrace:%n%s", stacktrace));
-            throw t;
-        }
-    }
-
-    private static List<String> getExpectedMethods(int depth) {
-        List<String> methods = new ArrayList<>();
-        methods.add("recurseEnd");
-        for (int i = 0; i < depth - 2; ++i) {
-            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
-        }
-        methods.add("run");
-        if (depth > MAX_DEPTH) {
-            methods = methods.subList(0, MAX_DEPTH);
-        }
-        return methods;
-    }
 }
diff --git a/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java b/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
new file mode 100644
index 00000000000..8dc77fd38da
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+ package test;
+
+ import java.time.Duration;
+
+ /*
+  * A class used to create a simple deep call stack for testing purposes
+  */
+ public class RecursiveMethods {
+
+    /** Method that uses recursion to produce a call stack of at least {@code depth} depth */
+    public static int entry(int depth) {
+        return method2(--depth);
+    }
+
+    private static int method2(int depth) {
+        return method3(--depth);
+    }
+
+    private static int method3(int depth) {
+        return method4(--depth);
+    }
+
+    private static int method4(int depth) {
+        return method5(--depth);
+    }
+
+    private static int method5(int depth) {
+        return method6(--depth);
+    }
+
+    private static int method6(int depth) {
+        return method7(--depth);
+    }
+
+    private static int method7(int depth) {
+        return method8(--depth);
+    }
+
+    private static int method8(int depth) {
+        return method9(--depth);
+    }
+
+    private static int method9(int depth) {
+        return method10(--depth);
+    }
+
+    private static int method10(int depth) {
+        if (depth > 0) {
+            return entry(--depth);
+        }
+        return depth;
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 904abe8e3e2..a00898358a8 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -77,6 +77,8 @@ public class EventNames {
     public static final String ThreadAllocationStatistics = PREFIX + "ThreadAllocationStatistics";
     public static final String ExecutionSample = PREFIX + "ExecutionSample";
     public static final String NativeMethodSample = PREFIX + "NativeMethodSample";
+    public static final String CPUTimeSample = PREFIX + "CPUTimeSample";
+    public static final String CPUTimeSamplesLost = PREFIX + "CPUTimeSamplesLost";
     public static final String ThreadDump = PREFIX + "ThreadDump";
     public static final String OldObjectSample = PREFIX + "OldObjectSample";
     public static final String SymbolTableStatistics = PREFIX + "SymbolTableStatistics";

From b787ff6def08a050b690b60e4a0ceb3aec2b73c8 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 4 Jun 2025 23:19:33 +0000
Subject: [PATCH 865/901] 8358538: Update GHA Windows runner to 2025

Reviewed-by: shade
---
 .github/workflows/build-windows.yml | 6 +++---
 .github/workflows/main.yml          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index d02ef91ad86..9bb43a8b83c 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -63,7 +63,7 @@ env:
 jobs:
   build-windows:
     name: build
-    runs-on: windows-2019
+    runs-on: windows-2025
     defaults:
       run:
         shell: bash
@@ -102,7 +102,7 @@ jobs:
         id: toolchain-check
         run: |
           set +e
-          '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
+          '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
           if [ $? -eq 0 ]; then
             echo "Toolchain is already installed"
             echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -115,7 +115,7 @@ jobs:
         run: |
           # Run Visual Studio Installer
           '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
+            modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
             --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
         if: steps.toolchain-check.outputs.toolchain-installed != 'true'
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ca64bb82d0..0e64ad78625 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -310,7 +310,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-x64
-      msvc-toolset-version: '14.29'
+      msvc-toolset-version: '14.43'
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -322,7 +322,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-aarch64
-      msvc-toolset-version: '14.29'
+      msvc-toolset-version: '14.43'
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@@ -393,5 +393,5 @@ jobs:
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
-      runs-on: windows-2019
+      runs-on: windows-2025
       debug-suffix: -debug

From 9186cc7310c0cca2fca776031280f08d84e43b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 4 Jun 2025 23:55:18 +0000
Subject: [PATCH 866/901] 8358628: [BACKOUT] 8342818: Implement JEP 509: JFR
 CPU-Time Profiling

Reviewed-by: pchilanomate, dholmes
---
 src/hotspot/os/posix/signals_posix.cpp        |   8 -
 src/hotspot/os/posix/signals_posix.hpp        |   2 -
 src/hotspot/share/jfr/jfr.inline.hpp          |   3 +-
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   6 -
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp    |   2 -
 .../jfr/jni/jfrJniMethodRegistration.cpp      |   1 -
 src/hotspot/share/jfr/metadata/metadata.xml   |  16 -
 .../sampling/jfrCPUTimeThreadSampler.cpp      | 769 ------------------
 .../sampling/jfrCPUTimeThreadSampler.hpp      | 152 ----
 .../periodic/sampling/jfrSampleRequest.cpp    |  33 +-
 .../periodic/sampling/jfrSampleRequest.hpp    |   5 -
 .../periodic/sampling/jfrThreadSampling.cpp   |  92 +--
 .../periodic/sampling/jfrThreadSampling.hpp   |   2 -
 .../share/jfr/recorder/jfrRecorder.cpp        |  15 -
 .../share/jfr/recorder/jfrRecorder.hpp        |   1 -
 .../recorder/service/jfrEventThrottler.cpp    |  12 +-
 .../share/jfr/support/jfrThreadLocal.cpp      |  98 +--
 .../share/jfr/support/jfrThreadLocal.hpp      |  53 --
 src/hotspot/share/runtime/thread.hpp          |   1 -
 src/hotspot/share/runtime/vmOperation.hpp     |   2 -
 src/hotspot/share/utilities/ticks.hpp         |   1 -
 .../jdk/jfr/internal/EventControl.java        |   4 -
 .../share/classes/jdk/jfr/internal/JVM.java   |  10 -
 .../jdk/jfr/internal/PlatformEventType.java   |  19 -
 .../classes/jdk/jfr/internal/query/view.ini   |  25 +-
 .../internal/settings/CPUThrottleSetting.java |  89 --
 .../classes/jdk/jfr/internal/util/Rate.java   |   4 -
 .../jdk/jfr/internal/util/TimespanRate.java   |  68 --
 src/jdk.jfr/share/conf/jfr/default.jfc        |  10 -
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  10 -
 .../metadata/TestLookForUntestedEvents.java   |   9 +-
 .../profiling/BaseTestFullStackTrace.java     | 176 ----
 .../TestCPUTimeAndExecutionSample.java        |  65 --
 .../TestCPUTimeSampleFullStackTrace.java      |  41 -
 .../TestCPUTimeSampleMultipleRecordings.java  |  70 --
 .../profiling/TestCPUTimeSampleNative.java    |  66 --
 .../TestCPUTimeSampleThrottling.java          | 111 ---
 .../TestCPUTimeSamplingLongPeriod.java        |  58 --
 .../event/profiling/TestFullStackTrace.java   | 131 ++-
 .../classes/test/RecursiveMethods.java        |  76 --
 test/lib/jdk/test/lib/jfr/EventNames.java     |   2 -
 41 files changed, 140 insertions(+), 2178 deletions(-)
 delete mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
 delete mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
 delete mode 100644 test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 0157d354f40..e900d5695ae 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1505,14 +1505,6 @@ bool PosixSignals::is_sig_ignored(int sig) {
   }
 }
 
-void* PosixSignals::get_signal_handler_for_signal(int sig) {
-  struct sigaction oact;
-  if (sigaction(sig, (struct sigaction*)nullptr, &oact) == -1) {
-    return nullptr;
-  }
-  return get_signal_handler(&oact);
-}
-
 static void signal_sets_init() {
   sigemptyset(&preinstalled_sigs);
 
diff --git a/src/hotspot/os/posix/signals_posix.hpp b/src/hotspot/os/posix/signals_posix.hpp
index c1cb70df153..9deade4db18 100644
--- a/src/hotspot/os/posix/signals_posix.hpp
+++ b/src/hotspot/os/posix/signals_posix.hpp
@@ -52,8 +52,6 @@ class PosixSignals : public AllStatic {
 
   static bool is_sig_ignored(int sig);
 
-  static void* get_signal_handler_for_signal(int sig);
-
   static void hotspot_sigmask(Thread* thread);
 
   static void print_signal_handler(outputStream* st, int sig, char* buf, size_t buflen);
diff --git a/src/hotspot/share/jfr/jfr.inline.hpp b/src/hotspot/share/jfr/jfr.inline.hpp
index 5b6fc62d0ea..bdb47f600e6 100644
--- a/src/hotspot/share/jfr/jfr.inline.hpp
+++ b/src/hotspot/share/jfr/jfr.inline.hpp
@@ -32,8 +32,7 @@
 
 inline bool Jfr::has_sample_request(JavaThread* jt) {
   assert(jt != nullptr, "invariant");
-  JfrThreadLocal* tl = jt->jfr_thread_local();
-  return tl->has_sample_request() || tl->has_cpu_time_jfr_requests();
+  return jt->jfr_thread_local()->has_sample_request();
 }
 
 inline void Jfr::check_and_process_sample_request(JavaThread* jt) {
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index bc2412a90c1..6f1c1936574 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -24,7 +24,6 @@
 
 #include "jfr/jfr.hpp"
 #include "jfr/jfrEvents.hpp"
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrEventSetting.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -170,11 +169,6 @@ NO_TRANSITION(jboolean, jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_ty
   return JNI_TRUE;
 NO_TRANSITION_END
 
-JVM_ENTRY_NO_ENV(void, jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt))
-  JfrEventSetting::set_enabled(JfrCPUTimeSampleEvent, rate > 0);
-  JfrCPUTimeThreadSampling::set_rate(rate, auto_adapt == JNI_TRUE);
-JVM_END
-
 NO_TRANSITION(void, jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong event_type_id, jlong value))
   JfrEventSetting::set_miscellaneous(event_type_id, value);
   const JfrEventId typed_event_id = (JfrEventId)event_type_id;
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index dbea7f0180d..9c78c6239d4 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -129,8 +129,6 @@ jlong JNICALL jfr_get_unloaded_event_classes_count(JNIEnv* env, jclass jvm);
 
 jboolean JNICALL jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_type_id, jlong event_sample_size, jlong period_ms);
 
-void JNICALL jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt);
-
 void JNICALL jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong id, jlong value);
 
 void JNICALL jfr_emit_old_object_samples(JNIEnv* env, jclass jvm, jlong cutoff_ticks, jboolean, jboolean);
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index 82ef93d95b2..33a564dee2f 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -83,7 +83,6 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) {
       (char*)"getUnloadedEventClassCount", (char*)"()J", (void*)jfr_get_unloaded_event_classes_count,
       (char*)"setMiscellaneous", (char*)"(JJ)V", (void*)jfr_set_miscellaneous,
       (char*)"setThrottle", (char*)"(JJJ)Z", (void*)jfr_set_throttle,
-      (char*)"setCPUThrottle", (char*)"(DZ)V", (void*)jfr_set_cpu_throttle,
       (char*)"emitOldObjectSamples", (char*)"(JZZ)V", (void*)jfr_emit_old_object_samples,
       (char*)"shouldRotateDisk", (char*)"()Z", (void*)jfr_should_rotate_disk,
       (char*)"exclude", (char*)"(Ljava/lang/Thread;)V", (void*)jfr_exclude_thread,
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 03daca946f6..9c04ec3dca1 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -962,22 +962,6 @@
     <Field type="ThreadState" name="state" label="Thread State" />
   </Event>
 
-  <Event name="CPUTimeSample" category="Java Virtual Machine, Profiling" label="CPU Time Method Sample"
-    description="Snapshot of a threads state from the CPU time sampler. The throttle can be either an upper bound for the event emission rate, e.g. 100/s, or the cpu-time period, e.g. 10ms, with s, ms, us and ns supported as time units."
-    throttle="true" thread="false" experimental="true" startTime="false">
-    <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
-    <Field type="Thread" name="eventThread" label="Thread" />
-    <Field type="boolean" name="failed" label="Failed" description="Failed to obtain the stack trace" />
-    <Field type="Tickspan" name="samplingPeriod" label="CPU Time Sampling Period"/>
-    <Field type="boolean" name="biased" label="Biased" description="The sample is safepoint-biased" />
-  </Event>
-
-  <Event name="CPUTimeSamplesLost" category="Java Virtual Machine, Profiling" label="CPU Time Method Profiling Lost Samples" description="Records that the CPU time sampler lost samples"
-    thread="false" stackTrace="false" startTime="false" experimental="true">
-    <Field type="int" name="lostSamples" label="Lost Samples" />
-    <Field type="Thread" name="eventThread" label="Thread" />
-  </Event>
-
   <Event name="ThreadDump" category="Java Virtual Machine, Runtime" label="Thread Dump" period="everyChunk">
     <Field type="string" name="result" label="Thread Dump" />
   </Event>
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
deleted file mode 100644
index ae8877ee3f2..00000000000
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
+++ /dev/null
@@ -1,769 +0,0 @@
-/*
- * 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.
- *
- */
-
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
-#include "logging/log.hpp"
-
-
-#if defined(LINUX)
-#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
-#include "jfr/support/jfrThreadLocal.hpp"
-#include "jfr/utilities/jfrTime.hpp"
-#include "jfr/utilities/jfrThreadIterator.hpp"
-#include "jfr/utilities/jfrTypes.hpp"
-#include "jfrfiles/jfrEventClasses.hpp"
-#include "memory/resourceArea.hpp"
-#include "runtime/atomic.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/osThread.hpp"
-#include "runtime/safepointMechanism.inline.hpp"
-#include "runtime/threadSMR.hpp"
-#include "runtime/vmOperation.hpp"
-#include "runtime/vmThread.hpp"
-#include "utilities/ticks.hpp"
-
-#include "signals_posix.hpp"
-
-static const int64_t AUTOADAPT_INTERVAL_MS = 100;
-
-static bool is_excluded(JavaThread* jt) {
-  return jt->is_hidden_from_external_view() ||
-         jt->jfr_thread_local()->is_excluded() ||
-         jt->is_JfrRecorder_thread();
-}
-
-static JavaThread* get_java_thread_if_valid() {
-  Thread* raw_thread = Thread::current_or_null_safe();
-  if (raw_thread == nullptr) {
-    // probably while shutting down
-    return nullptr;
-  }
-  assert(raw_thread->is_Java_thread(), "invariant");
-  JavaThread* jt = JavaThread::cast(raw_thread);
-  if (is_excluded(jt) || jt->is_exiting()) {
-    return nullptr;
-  }
-  return jt;
-}
-
-JfrCPUTimeTraceQueue::JfrCPUTimeTraceQueue(u4 capacity) :
-  _capacity(capacity), _head(0), _lost_samples(0) {
-  _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
-}
-
-JfrCPUTimeTraceQueue::~JfrCPUTimeTraceQueue() {
-  JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
-}
-
-bool JfrCPUTimeTraceQueue::enqueue(JfrCPUTimeSampleRequest& request) {
-  assert(JavaThread::current()->jfr_thread_local()->is_cpu_time_jfr_enqueue_locked(), "invariant");
-  assert(&JavaThread::current()->jfr_thread_local()->cpu_time_jfr_queue() == this, "invariant");
-  u4 elementIndex;
-  do {
-    elementIndex = Atomic::load_acquire(&_head);
-    if (elementIndex >= _capacity) {
-      return false;
-    }
-  } while (Atomic::cmpxchg(&_head, elementIndex, elementIndex + 1) != elementIndex);
-  _data[elementIndex] = request;
-  return true;
-}
-
-JfrCPUTimeSampleRequest& JfrCPUTimeTraceQueue::at(u4 index) {
-  assert(index < _head, "invariant");
-  return _data[index];
-}
-
-static volatile u4 _lost_samples_sum = 0;
-
-u4 JfrCPUTimeTraceQueue::size() const {
-  return Atomic::load_acquire(&_head);
-}
-
-void JfrCPUTimeTraceQueue::set_size(u4 size) {
-  Atomic::release_store(&_head, size);
-}
-
-u4 JfrCPUTimeTraceQueue::capacity() const {
-  return _capacity;
-}
-
-void JfrCPUTimeTraceQueue::set_capacity(u4 capacity) {
-  _head = 0;
-  JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
-  _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
-  _capacity = capacity;
-}
-
-bool JfrCPUTimeTraceQueue::is_empty() const {
-  return Atomic::load_acquire(&_head) == 0;
-}
-
-u4 JfrCPUTimeTraceQueue::lost_samples() const {
-  return Atomic::load(&_lost_samples);
-}
-
-void JfrCPUTimeTraceQueue::increment_lost_samples() {
-  Atomic::inc(&_lost_samples_sum);
-  Atomic::inc(&_lost_samples);
-}
-
-u4 JfrCPUTimeTraceQueue::get_and_reset_lost_samples() {
-  return Atomic::xchg(&_lost_samples, (u4)0);
-}
-
-void JfrCPUTimeTraceQueue::resize(u4 capacity) {
-  if (capacity != _capacity) {
-    set_capacity(capacity);
-  }
-}
-
-void JfrCPUTimeTraceQueue::resize_for_period(u4 period_millis) {
-  u4 capacity = CPU_TIME_QUEUE_CAPACITY;
-  if (period_millis > 0 && period_millis < 10) {
-    capacity = (u4) ((double) capacity * 10 / period_millis);
-  }
-  resize(capacity);
-}
-
-void JfrCPUTimeTraceQueue::clear() {
-  Atomic::release_store(&_head, (u4)0);
-}
-
-static int64_t compute_sampling_period(double rate) {
-  if (rate == 0) {
-    return 0;
-  }
-  return os::active_processor_count() * 1000000000.0 / rate;
-}
-
-class JfrCPUSamplerThread : public NonJavaThread {
-  friend class JfrCPUTimeThreadSampling;
- private:
-  Semaphore _sample;
-  NonJavaThread* _sampler_thread;
-  double _rate;
-  bool _auto_adapt;
-  volatile int64_t _current_sampling_period_ns;
-  volatile bool _disenrolled;
-  // top bit is used to indicate that no signal handler should proceed
-  volatile u4 _active_signal_handlers;
-  volatile bool _is_async_processing_of_cpu_time_jfr_requests_triggered;
-  volatile bool _warned_about_timer_creation_failure;
-  volatile bool _signal_handler_installed;
-
-  static const u4 STOP_SIGNAL_BIT = 0x80000000;
-
-  JfrCPUSamplerThread(double rate, bool auto_adapt);
-
-  void start_thread();
-
-  void enroll();
-  void disenroll();
-  void update_all_thread_timers();
-
-  void auto_adapt_period_if_needed();
-
-  void set_rate(double rate, bool auto_adapt);
-  int64_t get_sampling_period() const { return Atomic::load(&_current_sampling_period_ns); };
-
-  void sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now);
-
-  // process the queues for all threads that are in native state (and requested to be processed)
-  void stackwalk_threads_in_native();
-  bool create_timer_for_thread(JavaThread* thread, timer_t &timerid);
-
-  void stop_signal_handlers();
-
-  // returns false if the stop signal bit was set, true otherwise
-  bool increment_signal_handler_count();
-
-  void decrement_signal_handler_count();
-
-  void initialize_active_signal_handler_counter();
-
-protected:
-  virtual void post_run();
-public:
-  virtual const char* name() const { return "JFR CPU Sampler Thread"; }
-  virtual const char* type_name() const { return "JfrCPUTimeSampler"; }
-  void run();
-  void on_javathread_create(JavaThread* thread);
-  void on_javathread_terminate(JavaThread* thread);
-
-  void handle_timer_signal(siginfo_t* info, void* context);
-  bool init_timers();
-  void stop_timer();
-
-  void trigger_async_processing_of_cpu_time_jfr_requests();
-};
-
-JfrCPUSamplerThread::JfrCPUSamplerThread(double rate, bool auto_adapt) :
-  _sample(),
-  _sampler_thread(nullptr),
-  _rate(rate),
-  _auto_adapt(auto_adapt),
-  _current_sampling_period_ns(compute_sampling_period(rate)),
-  _disenrolled(true),
-  _active_signal_handlers(STOP_SIGNAL_BIT),
-  _is_async_processing_of_cpu_time_jfr_requests_triggered(false),
-  _warned_about_timer_creation_failure(false),
-  _signal_handler_installed(false) {
-  assert(rate >= 0, "invariant");
-}
-
-void JfrCPUSamplerThread::trigger_async_processing_of_cpu_time_jfr_requests() {
-  Atomic::release_store(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true);
-}
-
-void JfrCPUSamplerThread::on_javathread_create(JavaThread* thread) {
-  if (thread->is_hidden_from_external_view() || thread->is_JfrRecorder_thread() ||
-      !Atomic::load_acquire(&_signal_handler_installed)) {
-    return;
-  }
-  JfrThreadLocal* tl = thread->jfr_thread_local();
-  assert(tl != nullptr, "invariant");
-  tl->cpu_time_jfr_queue().resize_for_period(_current_sampling_period_ns / 1000000);
-  timer_t timerid;
-  if (create_timer_for_thread(thread, timerid)) {
-    tl->set_cpu_timer(&timerid);
-  } else {
-    if (!Atomic::or_then_fetch(&_warned_about_timer_creation_failure, true)) {
-      log_warning(jfr)("Failed to create timer for a thread");
-    }
-    tl->deallocate_cpu_time_jfr_queue();
-  }
-}
-
-void JfrCPUSamplerThread::on_javathread_terminate(JavaThread* thread) {
-  JfrThreadLocal* tl = thread->jfr_thread_local();
-  assert(tl != nullptr, "invariant");
-  timer_t* timer = tl->cpu_timer();
-  if (timer == nullptr) {
-    return; // no timer was created for this thread
-  }
-  tl->unset_cpu_timer();
-  tl->deallocate_cpu_time_jfr_queue();
-  s4 lost_samples = tl->cpu_time_jfr_queue().lost_samples();
-  if (lost_samples > 0) {
-    JfrCPUTimeThreadSampling::send_lost_event(JfrTicks::now(), JfrThreadLocal::thread_id(thread), lost_samples);
-  }
-}
-
-void JfrCPUSamplerThread::start_thread() {
-  if (os::create_thread(this, os::os_thread)) {
-    os::start_thread(this);
-  } else {
-    log_error(jfr)("Failed to create thread for thread sampling");
-  }
-}
-
-void JfrCPUSamplerThread::enroll() {
-  if (Atomic::cmpxchg(&_disenrolled, true, false)) {
-    Atomic::store(&_warned_about_timer_creation_failure, false);
-    initialize_active_signal_handler_counter();
-    log_trace(jfr)("Enrolling CPU thread sampler");
-    _sample.signal();
-    if (!init_timers()) {
-      log_error(jfr)("Failed to initialize timers for CPU thread sampler");
-      disenroll();
-      return;
-    }
-    log_trace(jfr)("Enrolled CPU thread sampler");
-  }
-}
-
-void JfrCPUSamplerThread::disenroll() {
-  if (!Atomic::cmpxchg(&_disenrolled, false, true)) {
-    log_trace(jfr)("Disenrolling CPU thread sampler");
-    if (Atomic::load_acquire(&_signal_handler_installed)) {
-      stop_timer();
-      stop_signal_handlers();
-    }
-    _sample.wait();
-    log_trace(jfr)("Disenrolled CPU thread sampler");
-  }
-}
-
-void JfrCPUSamplerThread::run() {
-  assert(_sampler_thread == nullptr, "invariant");
-  _sampler_thread = this;
-  int64_t last_auto_adapt_check = os::javaTimeNanos();
-  while (true) {
-    if (!_sample.trywait()) {
-      // disenrolled
-      _sample.wait();
-    }
-    _sample.signal();
-
-    if (os::javaTimeNanos() - last_auto_adapt_check > AUTOADAPT_INTERVAL_MS * 1000000) {
-      auto_adapt_period_if_needed();
-      last_auto_adapt_check = os::javaTimeNanos();
-    }
-
-    if (Atomic::cmpxchg(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true, false)) {
-      stackwalk_threads_in_native();
-    }
-    os::naked_sleep(100);
-  }
-}
-
-void JfrCPUSamplerThread::stackwalk_threads_in_native() {
-  ResourceMark rm;
-  // Required to prevent JFR from sampling through an ongoing safepoint
-  MutexLocker tlock(Threads_lock);
-  ThreadsListHandle tlh;
-  Thread* current = Thread::current();
-  for (size_t i = 0; i < tlh.list()->length(); i++) {
-    JavaThread* jt = tlh.list()->thread_at(i);
-    JfrThreadLocal* tl = jt->jfr_thread_local();
-    if (tl->wants_async_processing_of_cpu_time_jfr_requests()) {
-      if (jt->thread_state() != _thread_in_native || !tl->try_acquire_cpu_time_jfr_dequeue_lock()) {
-        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
-        continue;
-      }
-      if (jt->has_last_Java_frame()) {
-        JfrThreadSampling::process_cpu_time_request(jt, tl, current, false);
-      } else {
-        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
-      }
-      tl->release_cpu_time_jfr_queue_lock();
-    }
-  }
-}
-
-static volatile size_t count = 0;
-
-void JfrCPUTimeThreadSampling::send_empty_event(const JfrTicks &start_time, traceid tid, Tickspan cpu_time_period) {
-  EventCPUTimeSample event(UNTIMED);
-  event.set_failed(true);
-  event.set_starttime(start_time);
-  event.set_eventThread(tid);
-  event.set_stackTrace(0);
-  event.set_samplingPeriod(cpu_time_period);
-  event.set_biased(false);
-  event.commit();
-}
-
-
-static volatile size_t biased_count = 0;
-
-void JfrCPUTimeThreadSampling::send_event(const JfrTicks &start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased) {
-  EventCPUTimeSample event(UNTIMED);
-  event.set_failed(false);
-  event.set_starttime(start_time);
-  event.set_eventThread(tid);
-  event.set_stackTrace(sid);
-  event.set_samplingPeriod(cpu_time_period);
-  event.set_biased(biased);
-  event.commit();
-  Atomic::inc(&count);
-  if (biased) {
-    Atomic::inc(&biased_count);
-  }
-  if (Atomic::load(&count) % 1000 == 0) {
-    log_debug(jfr)("CPU thread sampler sent %zu events, lost %d, biased %zu\n", Atomic::load(&count), Atomic::load(&_lost_samples_sum), Atomic::load(&biased_count));
-  }
-}
-
-void JfrCPUTimeThreadSampling::send_lost_event(const JfrTicks &time, traceid tid, s4 lost_samples) {
-  if (!EventCPUTimeSamplesLost::is_enabled()) {
-    return;
-  }
-  EventCPUTimeSamplesLost event(UNTIMED);
-  event.set_starttime(time);
-  event.set_lostSamples(lost_samples);
-  event.set_eventThread(tid);
-  event.commit();
-}
-
-void JfrCPUSamplerThread::post_run() {
-  this->NonJavaThread::post_run();
-  delete this;
-}
-
-static JfrCPUTimeThreadSampling* _instance = nullptr;
-
-JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
-  return *_instance;
-}
-
-JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
-  assert(_instance == nullptr, "invariant");
-  _instance = new JfrCPUTimeThreadSampling();
-  return _instance;
-}
-
-void JfrCPUTimeThreadSampling::destroy() {
-  if (_instance != nullptr) {
-    delete _instance;
-    _instance = nullptr;
-  }
-}
-
-JfrCPUTimeThreadSampling::JfrCPUTimeThreadSampling() : _sampler(nullptr) {}
-
-JfrCPUTimeThreadSampling::~JfrCPUTimeThreadSampling() {
-  if (_sampler != nullptr) {
-    _sampler->disenroll();
-  }
-}
-
-void JfrCPUTimeThreadSampling::create_sampler(double rate, bool auto_adapt) {
-  assert(_sampler == nullptr, "invariant");
-  _sampler = new JfrCPUSamplerThread(rate, auto_adapt);
-  _sampler->start_thread();
-  _sampler->enroll();
-}
-
-void JfrCPUTimeThreadSampling::update_run_state(double rate, bool auto_adapt) {
-  if (rate != 0) {
-    if (_sampler == nullptr) {
-      create_sampler(rate, auto_adapt);
-    } else {
-      _sampler->set_rate(rate, auto_adapt);
-      _sampler->enroll();
-    }
-    return;
-  }
-  if (_sampler != nullptr) {
-    _sampler->set_rate(rate /* 0 */, auto_adapt);
-    _sampler->disenroll();
-  }
-}
-
-void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
-  assert(rate >= 0, "invariant");
-  if (_instance == nullptr) {
-    return;
-  }
-  instance().set_rate_value(rate, auto_adapt);
-}
-
-void JfrCPUTimeThreadSampling::set_rate_value(double rate, bool auto_adapt) {
-  if (_sampler != nullptr) {
-    _sampler->set_rate(rate, auto_adapt);
-  }
-  update_run_state(rate, auto_adapt);
-}
-
-void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread *thread) {
-  if (_instance != nullptr && _instance->_sampler != nullptr) {
-    _instance->_sampler->on_javathread_create(thread);
-  }
-}
-
-void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread *thread) {
-  if (_instance != nullptr && _instance->_sampler != nullptr) {
-    _instance->_sampler->on_javathread_terminate(thread);
-  }
-}
-
-void JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests() {
-  if (_instance != nullptr && _instance->_sampler != nullptr) {
-    _instance->_sampler->trigger_async_processing_of_cpu_time_jfr_requests();
-  }
-}
-
-void handle_timer_signal(int signo, siginfo_t* info, void* context) {
-  assert(_instance != nullptr, "invariant");
-  _instance->handle_timer_signal(info, context);
-}
-
-
-void JfrCPUTimeThreadSampling::handle_timer_signal(siginfo_t* info, void* context) {
-  if (info->si_code != SI_TIMER) {
-    // not the signal we are interested in
-    return;
-  }
-  assert(_sampler != nullptr, "invariant");
-
-  if (!_sampler->increment_signal_handler_count()) {
-    return;
-  }
-  _sampler->handle_timer_signal(info, context);
-  _sampler->decrement_signal_handler_count();
-}
-
-void JfrCPUSamplerThread::sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now) {
-  JfrSampleRequestBuilder::build_cpu_time_sample_request(request, ucontext, jt, jt->jfr_thread_local(), now);
-}
-
-static bool check_state(JavaThread* thread) {
-  switch (thread->thread_state()) {
-    case _thread_in_Java:
-    case _thread_in_native:
-      return true;
-    default:
-      return false;
-  }
-}
-
-void JfrCPUSamplerThread::handle_timer_signal(siginfo_t* info, void* context) {
-  JfrTicks now = JfrTicks::now();
-  JavaThread* jt = get_java_thread_if_valid();
-  if (jt == nullptr) {
-    return;
-  }
-  JfrThreadLocal* tl = jt->jfr_thread_local();
-  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
-  if (!check_state(jt)) {
-    queue.increment_lost_samples();
-    return;
-  }
-  if (!tl->try_acquire_cpu_time_jfr_enqueue_lock()) {
-    queue.increment_lost_samples();
-    return;
-  }
-
-  JfrCPUTimeSampleRequest request;
-  // the sampling period might be too low for the current Linux configuration
-  // so samples might be skipped and we have to compute the actual period
-  int64_t period = get_sampling_period() * (info->si_overrun + 1);
-  request._cpu_time_period = Ticks(period / 1000000000.0 * JfrTime::frequency()) - Ticks(0);
-  sample_thread(request._request, context, jt, tl, now);
-
-  if (queue.enqueue(request)) {
-    if (queue.size() == 1) {
-      tl->set_has_cpu_time_jfr_requests(true);
-      SafepointMechanism::arm_local_poll_release(jt);
-    }
-  } else {
-    queue.increment_lost_samples();
-  }
-
-  if (jt->thread_state() == _thread_in_native) {
-      if (!tl->wants_async_processing_of_cpu_time_jfr_requests()) {
-        tl->set_do_async_processing_of_cpu_time_jfr_requests(true);
-        JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests();
-      }
-  } else {
-    tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
-  }
-
-  tl->release_cpu_time_jfr_queue_lock();
-}
-
-static const int SIG = SIGPROF;
-
-static void set_timer_time(timer_t timerid, int64_t period_nanos) {
-  struct itimerspec its;
-  if (period_nanos == 0) {
-    its.it_interval.tv_sec = 0;
-    its.it_interval.tv_nsec = 0;
-  } else {
-    its.it_interval.tv_sec = period_nanos / NANOSECS_PER_SEC;
-    its.it_interval.tv_nsec = period_nanos % NANOSECS_PER_SEC;
-  }
-  its.it_value = its.it_interval;
-  if (timer_settime(timerid, 0, &its, nullptr) == -1) {
-    warning("Failed to set timer for thread sampling: %s", os::strerror(os::get_last_error()));
-  }
-}
-
-bool JfrCPUSamplerThread::create_timer_for_thread(JavaThread* thread, timer_t& timerid) {
-  struct sigevent sev;
-  sev.sigev_notify = SIGEV_THREAD_ID;
-  sev.sigev_signo = SIG;
-  sev.sigev_value.sival_ptr = nullptr;
-  ((int*)&sev.sigev_notify)[1] = thread->osthread()->thread_id();
-  clockid_t clock;
-  int err = pthread_getcpuclockid(thread->osthread()->pthread_id(), &clock);
-  if (err != 0) {
-    log_error(jfr)("Failed to get clock for thread sampling: %s", os::strerror(err));
-    return false;
-  }
-  if (timer_create(clock, &sev, &timerid) < 0) {
-    return false;
-  }
-  int64_t period = get_sampling_period();
-  if (period != 0) {
-    set_timer_time(timerid, period);
-  }
-  return true;
-}
-
-
-void JfrCPUSamplerThread::stop_signal_handlers() {
-  // set the stop signal bit
-  Atomic::or_then_fetch(&_active_signal_handlers, STOP_SIGNAL_BIT, memory_order_acq_rel);
-  while (Atomic::load_acquire(&_active_signal_handlers) > STOP_SIGNAL_BIT) {
-    // wait for all signal handlers to finish
-    os::naked_short_nanosleep(1000);
-  }
-}
-
-// returns false if the stop signal bit was set, true otherwise
-bool JfrCPUSamplerThread::increment_signal_handler_count() {
-  // increment the count of active signal handlers
-  u4 old_value = Atomic::fetch_then_add(&_active_signal_handlers, (u4)1, memory_order_acq_rel);
-  if ((old_value & STOP_SIGNAL_BIT) != 0) {
-    // if the stop signal bit was set, we are not allowed to increment
-    Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
-    return false;
-  }
-  return true;
-}
-
-void JfrCPUSamplerThread::decrement_signal_handler_count() {
-  Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
-}
-
-void JfrCPUSamplerThread::initialize_active_signal_handler_counter() {
-  Atomic::release_store(&_active_signal_handlers, (u4)0);
-}
-
-class VM_JFRInitializeCPUTimeSampler : public VM_Operation {
- private:
-  JfrCPUSamplerThread* const _sampler;
-
- public:
-  VM_JFRInitializeCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
-
-  VMOp_Type type() const { return VMOp_JFRInitializeCPUTimeSampler; }
-  void doit() {
-    JfrJavaThreadIterator iter;
-    while (iter.has_next()) {
-      _sampler->on_javathread_create(iter.next());
-    }
-  };
-};
-
-bool JfrCPUSamplerThread::init_timers() {
-  // install sig handler for sig
-  void* prev_handler = PosixSignals::get_signal_handler_for_signal(SIG);
-  if ((prev_handler != SIG_DFL && prev_handler != SIG_IGN && prev_handler != (void*)::handle_timer_signal) ||
-      PosixSignals::install_generic_signal_handler(SIG, (void*)::handle_timer_signal) == (void*)-1) {
-    log_error(jfr)("Conflicting SIGPROF handler found: %p. CPUTimeSample events will not be recorded", prev_handler);
-    return false;
-  }
-  Atomic::release_store(&_signal_handler_installed, true);
-  VM_JFRInitializeCPUTimeSampler op(this);
-  VMThread::execute(&op);
-  return true;
-}
-
-class VM_JFRTerminateCPUTimeSampler : public VM_Operation {
- private:
-  JfrCPUSamplerThread* const _sampler;
-
- public:
-  VM_JFRTerminateCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
-
-  VMOp_Type type() const { return VMOp_JFRTerminateCPUTimeSampler; }
-  void doit() {
-    JfrJavaThreadIterator iter;
-    while (iter.has_next()) {
-      JavaThread *thread = iter.next();
-      JfrThreadLocal* tl = thread->jfr_thread_local();
-      timer_t* timer = tl->cpu_timer();
-      if (timer == nullptr) {
-        continue;
-      }
-      timer_delete(*timer);
-      tl->deallocate_cpu_time_jfr_queue();
-      tl->unset_cpu_timer();
-    }
-  };
-};
-
-void JfrCPUSamplerThread::stop_timer() {
-  VM_JFRTerminateCPUTimeSampler op(this);
-  VMThread::execute(&op);
-}
-
-void JfrCPUSamplerThread::auto_adapt_period_if_needed() {
-  int64_t current_period = get_sampling_period();
-  if (_auto_adapt || current_period == -1) {
-    int64_t period = compute_sampling_period(_rate);
-    if (period != current_period) {
-      Atomic::store(&_current_sampling_period_ns, period);
-      update_all_thread_timers();
-    }
-  }
-}
-
-void JfrCPUSamplerThread::set_rate(double rate, bool auto_adapt) {
-  _rate = rate;
-  _auto_adapt = auto_adapt;
-  if (_rate > 0 && Atomic::load_acquire(&_disenrolled) == false) {
-    auto_adapt_period_if_needed();
-  } else {
-    Atomic::store(&_current_sampling_period_ns, compute_sampling_period(rate));
-  }
-}
-
-void JfrCPUSamplerThread::update_all_thread_timers() {
-  int64_t period_millis = get_sampling_period();
-  ThreadsListHandle tlh;
-  for (size_t i = 0; i < tlh.length(); i++) {
-    JavaThread* thread = tlh.thread_at(i);
-    JfrThreadLocal* tl = thread->jfr_thread_local();
-    assert(tl != nullptr, "invariant");
-    timer_t* timer = tl->cpu_timer();
-    if (timer != nullptr) {
-      set_timer_time(*timer, period_millis);
-    }
-  }
-}
-
-#else
-
-static void warn() {
-  static bool displayed_warning = false;
-  if (!displayed_warning) {
-    warning("CPU time method sampling not supported in JFR on your platform");
-    displayed_warning = true;
-  }
-}
-
-static JfrCPUTimeThreadSampling* _instance = nullptr;
-
-JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
-  return *_instance;
-}
-
-JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
-  _instance = new JfrCPUTimeThreadSampling();
-  return _instance;
-}
-
-void JfrCPUTimeThreadSampling::destroy() {
-  delete _instance;
-  _instance = nullptr;
-}
-
-void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
-  if (rate != 0) {
-    warn();
-  }
-}
-
-void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread* thread) {
-}
-
-void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread* thread) {
-}
-
-#endif // defined(LINUX) && defined(INCLUDE_JFR)
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
deleted file mode 100644
index 7c0545f4772..00000000000
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.
- *
- */
-
-#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
-#define SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
-
-#include "jfr/utilities/jfrAllocation.hpp"
-
-class JavaThread;
-
-#if defined(LINUX)
-
-#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
-#include "jfr/utilities/jfrTypes.hpp"
-
-struct JfrCPUTimeSampleRequest {
-  JfrSampleRequest _request;
-  Tickspan _cpu_time_period;
-
-  JfrCPUTimeSampleRequest() {}
-};
-
-// Fixed size async-signal-safe SPSC linear queue backed by an array.
-// Designed to be only used under lock and read linearly
-class JfrCPUTimeTraceQueue {
-
-  // the default queue capacity, scaled if the sampling period is smaller than 10ms
-  // when the thread is started
-  static const u4 CPU_TIME_QUEUE_CAPACITY = 500;
-
-  JfrCPUTimeSampleRequest* _data;
-  u4 _capacity;
-  // next unfilled index
-  volatile u4 _head;
-
-  volatile u4 _lost_samples;
-
-public:
-  JfrCPUTimeTraceQueue(u4 capacity);
-
-  ~JfrCPUTimeTraceQueue();
-
-  // signal safe, but can't be interleaved with dequeue
-  bool enqueue(JfrCPUTimeSampleRequest& trace);
-
-  JfrCPUTimeSampleRequest& at(u4 index);
-
-  u4 size() const;
-
-  void set_size(u4 size);
-
-  u4 capacity() const;
-
-  // deletes all samples in the queue
-  void set_capacity(u4 capacity);
-
-  bool is_empty() const;
-
-  u4 lost_samples() const;
-
-  void increment_lost_samples();
-
-  // returns the previous lost samples count
-  u4 get_and_reset_lost_samples();
-
-  void resize(u4 capacity);
-
-  void resize_for_period(u4 period_millis);
-
-  void clear();
-
-};
-
-
-class JfrCPUSamplerThread;
-
-class JfrCPUTimeThreadSampling : public JfrCHeapObj {
-  friend class JfrRecorder;
- private:
-
-  JfrCPUSamplerThread* _sampler;
-
-  void create_sampler(double rate, bool auto_adapt);
-  void set_rate_value(double rate, bool auto_adapt);
-
-  JfrCPUTimeThreadSampling();
-  ~JfrCPUTimeThreadSampling();
-
-  static JfrCPUTimeThreadSampling& instance();
-  static JfrCPUTimeThreadSampling* create();
-  static void destroy();
-
-  void update_run_state(double rate, bool auto_adapt);
-
- public:
-  static void set_rate(double rate, bool auto_adapt);
-
-  static void on_javathread_create(JavaThread* thread);
-  static void on_javathread_terminate(JavaThread* thread);
-  void handle_timer_signal(siginfo_t* info, void* context);
-
-  static void send_empty_event(const JfrTicks& start_time, traceid tid, Tickspan cpu_time_period);
-  static void send_event(const JfrTicks& start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased);
-  static void send_lost_event(const JfrTicks& time, traceid tid, s4 lost_samples);
-
-  static void trigger_async_processing_of_cpu_time_jfr_requests();
-};
-
-#else
-
-// a basic implementation on other platforms that
-// emits warnings
-
-class JfrCPUTimeThreadSampling : public JfrCHeapObj {
-  friend class JfrRecorder;
-private:
-  static JfrCPUTimeThreadSampling& instance();
-  static JfrCPUTimeThreadSampling* create();
-  static void destroy();
-
- public:
-  static void set_rate(double rate, bool auto_adapt);
-
-  static void on_javathread_create(JavaThread* thread);
-  static void on_javathread_terminate(JavaThread* thread);
-};
-
-#endif // defined(LINUX)
-
-
-#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
index 7049df0198b..f8e63e2e344 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
@@ -24,7 +24,6 @@
 #include "asm/codeBuffer.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
-#include "jfr/utilities/jfrTime.hpp"
 #include "runtime/continuationEntry.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
@@ -172,7 +171,7 @@ static bool build(JfrSampleRequest& request, intptr_t* fp, JavaThread* jt) {
   assert(request._sample_sp != nullptr, "invariant");
   assert(request._sample_pc != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
-  assert(jt->thread_state() == _thread_in_Java || jt->thread_state() == _thread_in_native, "invariant");
+  assert(jt->thread_state() == _thread_in_Java, "invariant");
 
   // 1. Interpreter frame?
   if (is_interpreter(request)) {
@@ -304,33 +303,3 @@ JfrSampleResult JfrSampleRequestBuilder::build_java_sample_request(const void* u
   }
   return set_biased_java_sample(request, tl, jt);
 }
-
-
-// A biased sample request is denoted by an empty bcp and an empty pc.
-static inline void set_cpu_time_biased_sample(JfrSampleRequest& request, JavaThread* jt) {
-  if (request._sample_bcp != nullptr) {
-    request._sample_bcp = nullptr;
-  }
-  assert(request._sample_bcp == nullptr, "invariant");
-  request._sample_pc = nullptr;
-}
-
-void JfrSampleRequestBuilder::build_cpu_time_sample_request(JfrSampleRequest& request,
-                                                            void* ucontext,
-                                                            JavaThread* jt,
-                                                            JfrThreadLocal* tl,
-                                                            JfrTicks& now) {
-  assert(jt != nullptr, "invariant");
-  request._sample_ticks = now;
-
-  // Prioritize the ljf, if one exists.
-  request._sample_sp = jt->last_Java_sp();
-  if (request._sample_sp == nullptr || !build_from_ljf(request, tl, jt)) {
-    intptr_t* fp;
-    request._sample_pc = os::fetch_frame_from_context(ucontext, reinterpret_cast<intptr_t**>(&request._sample_sp), &fp);
-    assert(sp_in_stack(request, jt), "invariant");
-    if (!build(request, fp, jt)) {
-      set_cpu_time_biased_sample(request, jt);
-    }
-  }
-}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
index 20e737e0cbf..6567e7f8bff 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
@@ -81,11 +81,6 @@ class JfrSampleRequestBuilder : AllStatic {
   static JfrSampleResult build_java_sample_request(const void* ucontext,
                                                    JfrThreadLocal* tl,
                                                    JavaThread* jt);
-  static void build_cpu_time_sample_request(JfrSampleRequest &request,
-                                            void* ucontext,
-                                            JavaThread* jt,
-                                            JfrThreadLocal* tl,
-                                            JfrTicks& now);
 };
 
 #endif // SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index ddc9d59b295..aa72c29cf50 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -28,7 +28,6 @@
 #include "code/nmethod.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/jfrEvents.hpp"
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrSampleMonitor.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampling.hpp"
@@ -162,7 +161,7 @@ static inline bool is_valid(const PcDesc* pc_desc) {
   return pc_desc != nullptr && pc_desc->scope_decode_offset() != DebugInformationRecorder::serialized_null;
 }
 
-static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt, bool& biased) {
+static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt) {
   assert(jt != nullptr, "invariant");
 
   if (!jt->has_last_Java_frame()) {
@@ -179,7 +178,6 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
     // A biased sample is requested or no code blob.
     top_frame = jt->last_frame();
     in_continuation = is_in_continuation(top_frame, jt);
-    biased = true;
     return true;
   }
 
@@ -229,8 +227,6 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
 
   assert(!stream.current()->is_safepoint_blob_frame(), "invariant");
 
-  biased = true;
-
   // Search the first frame that is above the sampled sp.
   for (; !stream.is_done(); stream.next()) {
     frame* const current = stream.current();
@@ -254,7 +250,6 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
         const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
         if (is_valid(pc_desc)) {
           current->adjust_pc(pc_desc->real_pc(sampled_nm));
-          biased = false;
         }
       }
     }
@@ -275,9 +270,8 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   assert(current != nullptr, "invariant");
 
   frame top_frame;
-  bool biased = false;
   bool in_continuation;
-  if (!compute_top_frame(request, top_frame, in_continuation, jt, biased)) {
+  if (!compute_top_frame(request, top_frame, in_continuation, jt)) {
     return;
   }
 
@@ -299,42 +293,6 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   }
 }
 
-#ifdef LINUX
-static void record_cpu_time_thread(const JfrCPUTimeSampleRequest& request, const JfrTicks& now, const JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
-  assert(jt != nullptr, "invariant");
-  assert(tl != nullptr, "invariant");
-  assert(current != nullptr, "invariant");
-  frame top_frame;
-  bool biased = false;
-  bool in_continuation = false;
-  bool could_compute_top_frame = compute_top_frame(request._request, top_frame, in_continuation, jt, biased);
-  const traceid tid = in_continuation ? tl->vthread_id_with_epoch_update(jt) : JfrThreadLocal::jvm_thread_id(jt);
-
-  if (!could_compute_top_frame) {
-    JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
-    return;
-  }
-  traceid sid;
-  {
-    ResourceMark rm(current);
-    JfrStackTrace stacktrace;
-    if (!stacktrace.record(jt, top_frame, in_continuation, request._request)) {
-      // Unable to record stacktrace. Fail.
-      JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
-      return;
-    }
-    sid = JfrStackTraceRepository::add(stacktrace);
-  }
-  assert(sid != 0, "invariant");
-
-
-  JfrCPUTimeThreadSampling::send_event(request._request._sample_ticks, sid, tid, request._cpu_time_period, biased);
-  if (current == jt) {
-    send_safepoint_latency_event(request._request, now, sid, jt);
-  }
-}
-#endif
-
 static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
   assert(tl != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
@@ -350,49 +308,6 @@ static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, Jav
   assert(!tl->has_enqueued_requests(), "invariant");
 }
 
-static void drain_enqueued_cpu_time_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current, bool lock) {
-  assert(tl != nullptr, "invariant");
-  assert(jt != nullptr, "invariant");
-  assert(current != nullptr, "invariant");
-#ifdef LINUX
-  tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
-  if (lock) {
-    tl->acquire_cpu_time_jfr_dequeue_lock();
-  }
-  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
-  for (u4 i = 0; i < queue.size(); i++) {
-    record_cpu_time_thread(queue.at(i), now, tl, jt, current);
-  }
-  queue.clear();
-  assert(queue.is_empty(), "invariant");
-  tl->set_has_cpu_time_jfr_requests(false);
-  if (queue.lost_samples() > 0) {
-    JfrCPUTimeThreadSampling::send_lost_event( now, JfrThreadLocal::thread_id(jt), queue.get_and_reset_lost_samples());
-  }
-  if (lock) {
-    tl->release_cpu_time_jfr_queue_lock();
-  }
-#endif
-}
-
-// Entry point for a thread that has been sampled in native code and has a pending JFR CPU time request.
-void JfrThreadSampling::process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock) {
-  assert(jt != nullptr, "invariant");
-
-  const JfrTicks now = JfrTicks::now();
-  drain_enqueued_cpu_time_requests(now, tl, jt, current, lock);
-}
-
-static void drain_all_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
-  assert(tl != nullptr, "invariant");
-  assert(jt != nullptr, "invariant");
-  assert(current != nullptr, "invariant");
-  drain_enqueued_requests(now, tl, jt, current);
-  if (tl->has_cpu_time_jfr_requests()) {
-    drain_enqueued_cpu_time_requests(now, tl, jt, current, true);
-  }
-}
-
 // Only entered by the JfrSampler thread.
 bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread) {
   assert(tl != nullptr, "invairant");
@@ -467,6 +382,5 @@ void JfrThreadSampling::process_sample_request(JavaThread* jt) {
       break;
     }
   }
-  drain_all_enqueued_requests(now, tl, jt, jt);
+  drain_enqueued_requests(now, tl, jt, jt);
 }
-
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
index 3c4d1a126b0..d4c4bc0d873 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
@@ -33,10 +33,8 @@ class Thread;
 
 class JfrThreadSampling : AllStatic {
   friend class JfrSamplerThread;
-  friend class JfrCPUSamplerThread;
  private:
   static bool process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread);
-  static void process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock);
  public:
   static void process_sample_request(JavaThread* jt);
 };
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index dd75cb2929f..384305862ca 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -29,7 +29,6 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/sampling/objectSampler.hpp"
 #include "jfr/periodic/jfrOSInterface.hpp"
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
@@ -305,9 +304,6 @@ bool JfrRecorder::create_components() {
   if (!create_thread_sampler()) {
     return false;
   }
-  if (!create_cpu_time_thread_sampling()) {
-    return false;
-  }
   if (!create_event_throttler()) {
     return false;
   }
@@ -322,7 +318,6 @@ static JfrStackTraceRepository* _stack_trace_repository;
 static JfrStringPool* _stringpool = nullptr;
 static JfrOSInterface* _os_interface = nullptr;
 static JfrThreadSampler* _thread_sampler = nullptr;
-static JfrCPUTimeThreadSampling* _cpu_time_thread_sampling = nullptr;
 static JfrCheckpointManager* _checkpoint_manager = nullptr;
 
 bool JfrRecorder::create_java_event_writer() {
@@ -395,12 +390,6 @@ bool JfrRecorder::create_thread_sampler() {
   return _thread_sampler != nullptr;
 }
 
-bool JfrRecorder::create_cpu_time_thread_sampling() {
-  assert(_cpu_time_thread_sampling == nullptr, "invariant");
-  _cpu_time_thread_sampling = JfrCPUTimeThreadSampling::create();
-  return _cpu_time_thread_sampling != nullptr;
-}
-
 bool JfrRecorder::create_event_throttler() {
   return JfrEventThrottler::create();
 }
@@ -439,10 +428,6 @@ void JfrRecorder::destroy_components() {
     JfrThreadSampler::destroy();
     _thread_sampler = nullptr;
   }
-  if (_cpu_time_thread_sampling != nullptr) {
-    JfrCPUTimeThreadSampling::destroy();
-    _cpu_time_thread_sampling = nullptr;
-  }
   JfrEventThrottler::destroy();
 }
 
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index 3099c8ad344..b917904c5fb 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -54,7 +54,6 @@ class JfrRecorder : public JfrCHeapObj {
   static bool create_storage();
   static bool create_stringpool();
   static bool create_thread_sampler();
-  static bool create_cpu_time_thread_sampling();
   static bool create_event_throttler();
   static bool create_components();
   static void destroy_components();
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
index f660a01c04c..0befaae7751 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
@@ -34,7 +34,6 @@ constexpr static const JfrSamplerParams _disabled_params = {
                                                              false // reconfigure
                                                            };
 
-static JfrEventThrottler* _disabled_cpu_time_sample_throttler = nullptr;
 static JfrEventThrottler* _object_allocation_throttler = nullptr;
 static JfrEventThrottler* _safepoint_latency_throttler = nullptr;
 
@@ -49,9 +48,6 @@ JfrEventThrottler::JfrEventThrottler(JfrEventId event_id) :
   _update(false) {}
 
 bool JfrEventThrottler::create() {
-  assert(_disabled_cpu_time_sample_throttler == nullptr, "invariant");
-  _disabled_cpu_time_sample_throttler = new JfrEventThrottler(JfrCPUTimeSampleEvent);
-  _disabled_cpu_time_sample_throttler->_disabled = true;
   assert(_object_allocation_throttler == nullptr, "invariant");
   _object_allocation_throttler = new JfrEventThrottler(JfrObjectAllocationSampleEvent);
   if (_object_allocation_throttler == nullptr || !_object_allocation_throttler->initialize()) {
@@ -63,8 +59,6 @@ bool JfrEventThrottler::create() {
 }
 
 void JfrEventThrottler::destroy() {
-  delete _disabled_cpu_time_sample_throttler;
-  _disabled_cpu_time_sample_throttler = nullptr;
   delete _object_allocation_throttler;
   _object_allocation_throttler = nullptr;
   delete _safepoint_latency_throttler;
@@ -75,19 +69,15 @@ void JfrEventThrottler::destroy() {
 // and another for the SamplingLatency event.
 // When introducing many more throttlers, consider adding a lookup map keyed by event id.
 JfrEventThrottler* JfrEventThrottler::for_event(JfrEventId event_id) {
-  assert(_disabled_cpu_time_sample_throttler != nullptr, "Disabled CPU time throttler has not been properly initialized");
   assert(_object_allocation_throttler != nullptr, "ObjectAllocation throttler has not been properly initialized");
   assert(_safepoint_latency_throttler != nullptr, "SafepointLatency throttler has not been properly initialized");
-  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent || event_id == JfrCPUTimeSampleEvent, "Event type has an unconfigured throttler");
+  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent, "Event type has an unconfigured throttler");
   if (event_id == JfrObjectAllocationSampleEvent) {
     return _object_allocation_throttler;
   }
   if (event_id == JfrSafepointLatencyEvent) {
     return _safepoint_latency_throttler;
   }
-  if (event_id == JfrCPUTimeSampleEvent) {
-    return _disabled_cpu_time_sample_throttler;
-  }
   return nullptr;
 }
 
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 4b805a98a32..503aa85e02f 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -26,7 +26,6 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
 #include "jfr/periodic/jfrThreadCPULoadEvent.hpp"
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrOopTraceId.inline.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -79,15 +78,7 @@ JfrThreadLocal::JfrThreadLocal() :
   _enqueued_requests(false),
   _vthread(false),
   _notified(false),
-  _dead(false)
-#ifdef LINUX
-  ,_cpu_timer(nullptr),
-  _cpu_time_jfr_locked(UNLOCKED),
-  _has_cpu_time_jfr_requests(false),
-  _cpu_time_jfr_queue(0),
-  _do_async_processing_of_cpu_time_jfr_requests(false)
-#endif
-  {
+  _dead(false) {
   Thread* thread = Thread::current_or_null();
   _parent_trace_id = thread != nullptr ? jvm_thread_id(thread) : (traceid)0;
 }
@@ -138,9 +129,7 @@ void JfrThreadLocal::on_start(Thread* t) {
   if (JfrRecorder::is_recording()) {
     JfrCheckpointManager::write_checkpoint(t);
     if (t->is_Java_thread()) {
-      JavaThread *const jt = JavaThread::cast(t);
-      JfrCPUTimeThreadSampling::on_javathread_create(jt);
-      send_java_thread_start_event(jt);
+      send_java_thread_start_event(JavaThread::cast(t));
     }
   }
   if (t->jfr_thread_local()->has_cached_stack_trace()) {
@@ -232,7 +221,6 @@ void JfrThreadLocal::on_exit(Thread* t) {
   if (t->is_Java_thread()) {
     JavaThread* const jt = JavaThread::cast(t);
     send_java_thread_end_event(jt, JfrThreadLocal::jvm_thread_id(jt));
-    JfrCPUTimeThreadSampling::on_javathread_terminate(jt);
     JfrThreadCPULoadEvent::send_event_for_thread(jt);
   }
   release(tl, Thread::current()); // because it could be that Thread::current() != t
@@ -549,85 +537,3 @@ Arena* JfrThreadLocal::dcmd_arena(JavaThread* jt) {
   tl->_dcmd_arena = arena;
   return arena;
 }
-
-
-#ifdef LINUX
-
-void JfrThreadLocal::set_cpu_timer(timer_t* timer) {
-  if (_cpu_timer == nullptr) {
-    _cpu_timer = JfrCHeapObj::new_array<timer_t>(1);
-  }
-  *_cpu_timer = *timer;
-}
-
-void JfrThreadLocal::unset_cpu_timer() {
-  if (_cpu_timer != nullptr) {
-    timer_delete(*_cpu_timer);
-    JfrCHeapObj::free(_cpu_timer, sizeof(timer_t));
-    _cpu_timer = nullptr;
-  }
-}
-
-timer_t* JfrThreadLocal::cpu_timer() const {
-  return _cpu_timer;
-}
-
-bool JfrThreadLocal::is_cpu_time_jfr_enqueue_locked() {
-  return Atomic::load_acquire(&_cpu_time_jfr_locked) == ENQUEUE;
-}
-
-bool JfrThreadLocal::is_cpu_time_jfr_dequeue_locked() {
-  return Atomic::load_acquire(&_cpu_time_jfr_locked) == DEQUEUE;
-}
-
-bool JfrThreadLocal::try_acquire_cpu_time_jfr_enqueue_lock() {
-  return Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, ENQUEUE) == UNLOCKED;
-}
-
-bool JfrThreadLocal::try_acquire_cpu_time_jfr_dequeue_lock() {
-  CPUTimeLockState got;
-  while (true)  {
-    CPUTimeLockState got = Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE);
-    if (got == UNLOCKED) {
-      return true; // successfully locked for dequeue
-    }
-    if (got == DEQUEUE) {
-      return false; // already locked for dequeue
-    }
-    // else wait for the lock to be released from a signal handler
-  }
-}
-
-void JfrThreadLocal::acquire_cpu_time_jfr_dequeue_lock() {
-  while (Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE) != UNLOCKED);
-}
-
-void JfrThreadLocal::release_cpu_time_jfr_queue_lock() {
-  Atomic::release_store(&_cpu_time_jfr_locked, UNLOCKED);
-}
-
-void JfrThreadLocal::set_has_cpu_time_jfr_requests(bool has_requests) {
-  Atomic::release_store(&_has_cpu_time_jfr_requests, has_requests);
-}
-
-bool JfrThreadLocal::has_cpu_time_jfr_requests() {
-  return Atomic::load_acquire(&_has_cpu_time_jfr_requests);
-}
-
-JfrCPUTimeTraceQueue& JfrThreadLocal::cpu_time_jfr_queue() {
-  return _cpu_time_jfr_queue;
-}
-
-void JfrThreadLocal::deallocate_cpu_time_jfr_queue() {
-  cpu_time_jfr_queue().resize(0);
-}
-
-void JfrThreadLocal::set_do_async_processing_of_cpu_time_jfr_requests(bool wants) {
-  Atomic::release_store(&_do_async_processing_of_cpu_time_jfr_requests, wants);
-}
-
-bool JfrThreadLocal::wants_async_processing_of_cpu_time_jfr_requests() {
-  return Atomic::load_acquire(&_do_async_processing_of_cpu_time_jfr_requests);
-}
-
-#endif
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index 715a2c44f93..8e545d9c429 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -33,10 +33,6 @@
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 
-#ifdef LINUX
-#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
-#endif
-
 class Arena;
 class JavaThread;
 class JfrBuffer;
@@ -83,22 +79,6 @@ class JfrThreadLocal {
   bool _dead;
   bool _sampling_critical_section;
 
-#ifdef LINUX
-  timer_t* _cpu_timer;
-
-  enum CPUTimeLockState {
-    UNLOCKED,
-    // locked for enqueuing
-    ENQUEUE,
-    // locked for dequeuing
-    DEQUEUE
-  };
-  volatile CPUTimeLockState _cpu_time_jfr_locked;
-  volatile bool _has_cpu_time_jfr_requests;
-  JfrCPUTimeTraceQueue _cpu_time_jfr_queue;
-  volatile bool _do_async_processing_of_cpu_time_jfr_requests;
-#endif
-
   JfrBuffer* install_native_buffer() const;
   JfrBuffer* install_java_buffer() const;
   void release(Thread* t);
@@ -362,39 +342,6 @@ class JfrThreadLocal {
   void set_thread_blob(const JfrBlobHandle& handle);
   const JfrBlobHandle& thread_blob() const;
 
-  // CPU time sampling
-#ifdef LINUX
-  void set_cpu_timer(timer_t* timer);
-  void unset_cpu_timer();
-  timer_t* cpu_timer() const;
-
-  // The CPU time JFR lock has three different states:
-  // - ENQUEUE: lock for enqueuing CPU time requests
-  // - DEQUEUE: lock for dequeuing CPU time requests
-  // - UNLOCKED: no lock held
-  // This ensures that we can safely enqueue and dequeue CPU time requests,
-  // without interleaving
-
-  bool is_cpu_time_jfr_enqueue_locked();
-  bool is_cpu_time_jfr_dequeue_locked();
-
-  bool try_acquire_cpu_time_jfr_enqueue_lock();
-  bool try_acquire_cpu_time_jfr_dequeue_lock();
-  void acquire_cpu_time_jfr_dequeue_lock();
-  void release_cpu_time_jfr_queue_lock();
-
-  void set_has_cpu_time_jfr_requests(bool has_events);
-  bool has_cpu_time_jfr_requests();
-
-  JfrCPUTimeTraceQueue& cpu_time_jfr_queue();
-  void deallocate_cpu_time_jfr_queue();
-
-  void set_do_async_processing_of_cpu_time_jfr_requests(bool wants);
-  bool wants_async_processing_of_cpu_time_jfr_requests();
-#else
-  bool has_cpu_time_jfr_requests() { return false; }
-#endif
-
   // Hooks
   static void on_start(Thread* t);
   static void on_exit(Thread* t);
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 772ef7bbe82..f3a06d5efd2 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -78,7 +78,6 @@ class JavaThread;
 //       - WorkerThread
 //     - WatcherThread
 //     - JfrThreadSampler
-//     - JfrCPUSamplerThread
 //     - LogAsyncWriter
 //
 // All Thread subclasses must be either JavaThread or NonJavaThread.
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index ac5d37381f9..50d85944485 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -115,8 +115,6 @@
   template(JFROldObject)                          \
   template(JvmtiPostObjectFree)                   \
   template(RendezvousGCThreads)                   \
-  template(JFRInitializeCPUTimeSampler)       \
-  template(JFRTerminateCPUTimeSampler)        \
   template(ReinitializeMDO)
 
 class Thread;
diff --git a/src/hotspot/share/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp
index 88dc9a787f9..8d2bbc7ce1f 100644
--- a/src/hotspot/share/utilities/ticks.hpp
+++ b/src/hotspot/share/utilities/ticks.hpp
@@ -236,7 +236,6 @@ class TimeInstant : public Rep<TimeSource> {
   friend class TimePartitionsTest;
   friend class GCTimerTest;
   friend class CompilerEvent;
-  friend class JfrCPUSamplerThread;
 };
 
 #if INCLUDE_JFR
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 2ea4725abc8..f43e45b724e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -51,7 +51,6 @@
 import jdk.jfr.internal.settings.LevelSetting;
 import jdk.jfr.internal.settings.MethodSetting;
 import jdk.jfr.internal.settings.PeriodSetting;
-import jdk.jfr.internal.settings.CPUThrottleSetting;
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 import jdk.jfr.internal.settings.ThrottleSetting;
@@ -327,9 +326,6 @@ private static Control defineCutoff(PlatformEventType type) {
     private static Control defineThrottle(PlatformEventType type) {
         String def = type.getAnnotationValue(Throttle.class, ThrottleSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
-        if (type.getName().equals("jdk.CPUTimeSample")) {
-            return new Control(new CPUThrottleSetting(type), def);
-        }
         return new Control(new ThrottleSetting(type, def), def);
     }
 
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 b91f0c337b2..e0eaef74b4c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -270,16 +270,6 @@ public final class JVM {
      */
     public static native void setMethodSamplingPeriod(long type, long periodMillis);
 
-    /**
-     * Set the maximum event emission rate for the CPU time sampler
-     *
-     * Setting rate to 0 turns off the CPU time sampler.
-     *
-     * @param rate the new rate in events per second
-     * @param autoAdapt true if the rate should be adapted automatically
-     */
-    public static native void setCPUThrottle(double rate, boolean autoAdapt);
-
     /**
      * Sets the file where data should be written.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index 769e7055305..32b59bca4c0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -30,10 +30,8 @@
 import java.util.Objects;
 
 import jdk.jfr.SettingDescriptor;
-import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.ImplicitFields;
-import jdk.jfr.internal.util.TimespanRate;
 import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.tracing.Modification;
 
@@ -47,7 +45,6 @@ public final class PlatformEventType extends Type {
     private final boolean isJVM;
     private final boolean isJDK;
     private final boolean isMethodSampling;
-    private final boolean isCPUTimeMethodSampling;
     private final List<SettingDescriptor> settings = new ArrayList<>(5);
     private final boolean dynamicSettings;
     private final int stackTraceOffset;
@@ -59,7 +56,6 @@ public final class PlatformEventType extends Type {
     private boolean stackTraceEnabled = true;
     private long thresholdTicks = 0;
     private long period = 0;
-    private TimespanRate cpuRate;
     private boolean hasHook;
 
     private boolean beginChunk;
@@ -79,7 +75,6 @@ public final class PlatformEventType extends Type {
         this.dynamicSettings = dynamicSettings;
         this.isJVM = Type.isDefinedByJVM(id);
         this.isMethodSampling = determineMethodSampling();
-        this.isCPUTimeMethodSampling = isJVM && name.equals(Type.EVENT_NAME_PREFIX + "CPUTimeSample");
         this.isJDK = isJDK;
         this.stackTraceOffset = determineStackTraceOffset();
     }
@@ -196,13 +191,6 @@ public void setThrottle(long eventSampleSize, long period_ms) {
         }
     }
 
-    public void setCPUThrottle(TimespanRate rate) {
-        if (isCPUTimeMethodSampling) {
-            this.cpuRate = rate;
-            JVM.setCPUThrottle(rate.rate(), rate.autoAdapt());
-        }
-    }
-
     public void setHasPeriod(boolean hasPeriod) {
         this.hasPeriod = hasPeriod;
     }
@@ -263,9 +251,6 @@ public void setEnabled(boolean enabled) {
             if (isMethodSampling) {
                 long p = enabled ? period : 0;
                 JVM.setMethodSamplingPeriod(getId(), p);
-            } else if (isCPUTimeMethodSampling) {
-                TimespanRate r = enabled ? cpuRate : new TimespanRate(0, false);
-                JVM.setCPUThrottle(r.rate(), r.autoAdapt());
             } else {
                 JVM.setEnabled(getId(), enabled);
             }
@@ -403,10 +388,6 @@ public boolean isMethodSampling() {
         return isMethodSampling;
     }
 
-    public boolean isCPUTimeMethodSampling() {
-        return isCPUTimeMethodSampling;
-    }
-
     public void setStackFilterId(long id) {
         startFilterId = id;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index a2ac74142f4..a6192db1ab0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -39,8 +39,7 @@ label = "Active Settings"
 table = "COLUMN 'Event Type', 'Enabled', 'Threshold',
                 'Stack Trace','Period','Cutoff', 'Throttle'
          FORMAT none, missing:whitespace, missing:whitespace, missing:whitespace,
-                missing:whitespace, missing:whitespace, missing:whitespace,
-                missing:whitespace
+                missing:whitespace, missing:whitespace, missing:whitespace
          SELECT E.id, LAST_BATCH(E.value), LAST_BATCH(T.value),
                 LAST_BATCH(S.value), LAST_BATCH(P.value),
                 LAST_BATCH(C.value), LAST_BATCH(U.value)
@@ -401,28 +400,6 @@ table = "COLUMN 'Method', 'Samples', 'Percent'
          SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
          FROM ExecutionSample GROUP BY T LIMIT 25"
 
-[application.cpu-time-hot-methods]
-label = "Java Methods that Execute the Most from CPU Time Sampler"
-table = "COLUMN 'Method', 'Samples', 'Percent'
-         FORMAT none, none, normalized
-         SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
-         FROM CPUTimeSample GROUP BY T LIMIT 25"
-
-[application.cpu-time-statistics]
-label = "CPU Time Sample Statistics"
-form = "COLUMN 'Successful Samples', 'Failed Samples', 'Biased Samples', 'Total Samples', 'Lost Samples'
-        SELECT COUNT(S.startTime), COUNT(F.startTime), COUNT(B.startTime), Count(A.startTime), SUM(L.lostSamples)
-        FROM
-          CPUTimeSample AS S,
-          CPUTimeSample AS F,
-          CPUTimeSample AS A,
-          CPUTimeSample AS B,
-          CPUTimeSamplesLost AS L
-        WHERE
-          S.failed = 'false' AND
-          F.failed = 'true'  AND
-          B.biased = 'true'"
-
 [jvm.jdk-agents]
 label = "JDK Agents"
 table = "COLUMN 'Time', 'Initialization', 'Name', 'Options'
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
deleted file mode 100644
index c18aeef2132..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, Datadog, Inc. 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.settings;
-
-import static jdk.jfr.internal.util.TimespanUnit.SECONDS;
-import static jdk.jfr.internal.util.TimespanUnit.MILLISECONDS;
-
-import java.util.Objects;
-import java.util.Set;
-
-import jdk.jfr.Description;
-import jdk.jfr.SettingControl;
-import jdk.jfr.Label;
-import jdk.jfr.MetadataDefinition;
-import jdk.jfr.Name;
-import jdk.jfr.internal.PlatformEventType;
-import jdk.jfr.internal.Type;
-import jdk.jfr.internal.util.TimespanRate;
-import jdk.jfr.internal.util.Utils;
-
-@MetadataDefinition
-@Label("CPUThrottleSetting")
-@Description("Upper bounds the emission rate for CPU time samples")
-@Name(Type.SETTINGS_PREFIX + "Rate")
-public final class CPUThrottleSetting extends SettingControl {
-    public static final String DEFAULT_VALUE = "0/s";
-    private final PlatformEventType eventType;
-    private String value = DEFAULT_VALUE;
-
-    public CPUThrottleSetting(PlatformEventType eventType) {
-       this.eventType = Objects.requireNonNull(eventType);
-    }
-
-    @Override
-    public String combine(Set<String> values) {
-        TimespanRate max = null;
-        for (String value : values) {
-            TimespanRate rate = TimespanRate.of(value);
-            if (rate != null) {
-                if (max == null || rate.isHigher(max)) {
-                    max = rate;
-                }
-                max = new TimespanRate(max.rate(), max.autoAdapt() || rate.autoAdapt());
-            }
-        }
-        // "off" is not supported
-        return Objects.requireNonNullElse(max.toString(), DEFAULT_VALUE);
-    }
-
-    @Override
-    public void setValue(String value) {
-        TimespanRate rate = TimespanRate.of(value);
-        if (rate != null) {
-            eventType.setCPUThrottle(rate);
-            this.value = value;
-        }
-    }
-
-    @Override
-    public String getValue() {
-        return value;
-    }
-}
-
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
index 2632cd63848..f32436a5e0f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
@@ -55,8 +55,4 @@ public boolean isHigher(Rate that) {
     private double inNanos() {
         return (double) amount / unit.nanos;
     }
-
-    public double perSecond() {
-        return inNanos() * 1_000_000_000.0;
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
deleted file mode 100644
index 5d671310e3c..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2025 SAP SE. All rights reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.util;
-
-import jdk.jfr.internal.settings.CPUThrottleSetting;
-
-/**
- * A rate or fixed period, see {@link jdk.jfr.internal.Rate}
- */
-public record TimespanRate(double rate, boolean autoAdapt) {
-
-    public static TimespanRate of(String text) {
-        if (text.equals("off")) {
-            text = CPUThrottleSetting.DEFAULT_VALUE;
-        }
-        boolean isPeriod = !text.contains("/");
-        if (isPeriod) {
-            var period = ValueParser.parseTimespanWithInfinity(text, Long.MAX_VALUE);
-            if (period == Long.MAX_VALUE) {
-                return null;
-            }
-            if (period == 0) {
-                return new TimespanRate(0, false);
-            }
-            return new TimespanRate(Runtime.getRuntime().availableProcessors() / (period / 1_000_000_000.0), false);
-        }
-        Rate r = Rate.of(text);
-        if (r == null) {
-            return null;
-        }
-        return new TimespanRate(r.perSecond(), true);
-    }
-
-    public boolean isHigher(TimespanRate that) {
-        return rate() > that.rate();
-    }
-
-    @Override
-    public String toString() {
-        if (autoAdapt) {
-            return String.format("%d/ns", (long)(rate * 1_000_000_000L));
-        }
-        return String.format("%dns", (long)(Runtime.getRuntime().availableProcessors() / rate * 1_000_000_000L));
-    }
-}
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 541d1d3aa2f..293af26746f 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -226,16 +226,6 @@
       <setting name="throttle">off</setting>
     </event>
 
-    <event name="jdk.CPUTimeSample">
-      <setting name="enabled" control="method-sampling-enabled">false</setting>
-      <setting name="throttle">500/s</setting>
-      <setting name="stackTrace">true</setting>
-    </event>
-
-    <event name="jdk.CPUTimeSamplesLost">
-      <setting name="enabled" control="method-sampling-enabled">true</setting>
-    </event>
-
     <event name="jdk.SafepointBegin">
       <setting name="enabled">true</setting>
       <setting name="threshold">10 ms</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 9cec2d9a70f..89a9022d11e 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -206,16 +206,6 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
-    <event name="jdk.CPUTimeSample">
-      <setting name="enabled">false</setting>
-      <setting name="throttle">10ms</setting>
-      <setting name="stackTrace">true</setting>
-    </event>
-
-    <event name="jdk.CPUTimeSamplesLost">
-      <setting name="enabled">true</setting>
-    </event>
-
     <event name="jdk.MethodTrace">
       <setting name="enabled">true</setting>
       <setting name="filter" control="method-trace"></setting>
diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index d6e126a493f..5b8aacfb1d2 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -89,10 +89,7 @@ public class TestLookForUntestedEvents {
 
     // Experimental events
     private static final Set<String> experimentalEvents = Set.of(
-        "Flush", "SyncOnValueBasedClass", "CPUTimeSample", "CPUTimeSamplesLost");
-
-    // Subset of the experimental events that should have tests
-    private static final Set<String> experimentalButTestedEvents = Set.of("CPUTimeSample");
+        "Flush", "SyncOnValueBasedClass");
 
     public static void main(String[] args) throws Exception {
         for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
@@ -113,9 +110,7 @@ private static void lookForEventsNotCoveredByTests() throws Exception {
             .collect(Collectors.toList());
 
         Set<String> eventsNotCoveredByTest = new HashSet<>(jfrEventTypes);
-        Set<String> checkedEvents = new HashSet<>(jfrEventTypes);
-        checkedEvents.addAll(experimentalButTestedEvents);
-        for (String event : checkedEvents) {
+        for (String event : jfrEventTypes) {
             for (Path p : paths) {
                 if (findStringInFile(p, event)) {
                     eventsNotCoveredByTest.remove(event);
diff --git a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
deleted file mode 100644
index de211b8c454..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.profiling;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordedFrame;
-import jdk.jfr.consumer.RecordedStackTrace;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.Events;
-import jdk.test.lib.jfr.RecurseThread;
-
-public class BaseTestFullStackTrace {
-    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
-
-    private final String eventName;
-    private final String threadFieldName;
-
-    public BaseTestFullStackTrace(String eventName, String threadFieldName) {
-        this.eventName = eventName;
-        this.threadFieldName = threadFieldName;
-    }
-
-    public void run() throws Throwable {
-        RecurseThread[] threads = new RecurseThread[3];
-        for (int i = 0; i < threads.length; ++i) {
-            int depth = MAX_DEPTH - 1 + i;
-            threads[i] = new RecurseThread(depth);
-            threads[i].setName("recursethread-" + depth);
-            threads[i].start();
-        }
-
-        for (RecurseThread thread : threads) {
-            while (!thread.isInRunLoop()) {
-                Thread.sleep(20);
-            }
-        }
-
-        assertStackTraces(threads);
-
-        for (RecurseThread thread : threads) {
-            thread.quit();
-            thread.join();
-        }
-    }
-
-    private void assertStackTraces(RecurseThread[] threads) throws Throwable {
-        while (true) {
-            try (Recording recording = new Recording()) {
-                if (eventName.equals(EventNames.CPUTimeSample)) {
-                    recording.enable(eventName).with("throttle", "50ms");
-                } else {
-                    recording.enable(eventName).withPeriod(Duration.ofMillis(50));
-                }
-                recording.start();
-                Thread.sleep(500);
-                recording.stop();
-                if (hasValidStackTraces(recording, threads)) {
-                    break;
-                }
-            }
-        };
-    }
-
-    private boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
-        boolean[] isEventFound = new boolean[threads.length];
-
-        for (RecordedEvent event : Events.fromRecording(recording)) {
-            System.out.println("Event: " + event);
-            String threadName = Events.assertField(event, threadFieldName + ".javaName").getValue();
-            long threadId = Events.assertField(event, threadFieldName + ".javaThreadId").getValue();
-
-            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
-                RecurseThread currThread = threads[threadIndex];
-                if (threadId == currThread.getId()) {
-                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
-                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
-                    if ("recurseEnd".equals(getTopMethodName(event))) {
-                        isEventFound[threadIndex] = true;
-                        checkEvent(event, currThread.totalDepth);
-                        break;
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < threads.length; ++i) {
-            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
-            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
-        }
-        for (int i = 0; i < threads.length; ++i) {
-            if(!isEventFound[i]) {
-               // no assertion, let's retry.
-               // Could be race condition, i.e safe point during Thread.sleep
-               System.out.println("Failed to validate all threads, will retry.");
-               return false;
-            }
-        }
-        return true;
-    }
-
-    public String getTopMethodName(RecordedEvent event) {
-        List<RecordedFrame> frames = event.getStackTrace().getFrames();
-        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
-        return frames.getFirst().getMethod().getName();
-    }
-
-    private void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
-        RecordedStackTrace stacktrace = null;
-        try {
-            stacktrace = event.getStackTrace();
-            List<RecordedFrame> frames = stacktrace.getFrames();
-            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
-            List<String> expectedMethods = getExpectedMethods(expectedDepth);
-            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
-
-            for (int i = 0; i < frames.size(); ++i) {
-                String name = frames.get(i).getMethod().getName();
-                String expectedName = expectedMethods.get(i);
-                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
-                Asserts.assertEquals(name, expectedName, "Wrong method name");
-            }
-
-            boolean isTruncated = stacktrace.isTruncated();
-            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
-            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
-
-            String firstMethod = frames.getLast().getMethod().getName();
-            boolean isFullTrace = "run".equals(firstMethod);
-            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
-            Asserts.assertTrue(isTruncated != isFullTrace, msg);
-        } catch (Throwable t) {
-            System.out.println(String.format("stacktrace:%n%s", stacktrace));
-            throw t;
-        }
-    }
-
-    private List<String> getExpectedMethods(int depth) {
-        List<String> methods = new ArrayList<>();
-        methods.add("recurseEnd");
-        for (int i = 0; i < depth - 2; ++i) {
-            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
-        }
-        methods.add("run");
-        if (depth > MAX_DEPTH) {
-            methods = methods.subList(0, MAX_DEPTH);
-        }
-        return methods;
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
deleted file mode 100644
index eb8d33832b5..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package jdk.jfr.event.profiling;
-
-import java.time.Duration;
-
-import jdk.jfr.consumer.RecordingStream;
-import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.RecurseThread;
-
-/*
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @modules jdk.jfr/jdk.jfr.internal
- * @run main/timeout=30 jdk.jfr.event.profiling.TestCPUTimeAndExecutionSample
- */
-public class TestCPUTimeAndExecutionSample {
-
-    static String sampleEvent = EventNames.CPUTimeSample;
-
-    // The period is set to 1100 ms to provoke the 1000 ms
-    // threshold in the JVM for os::naked_short_sleep().
-    public static void main(String[] args) throws Exception {
-        run(EventNames.ExecutionSample);
-        run(EventNames.CPUTimeSample);
-        run(EventNames.ExecutionSample);
-        run(EventNames.CPUTimeSample);
-    }
-
-    private static void run(String eventType) {
-        RecurseThread t = new RecurseThread(50);
-        t.setDaemon(true);
-        try (RecordingStream rs = new RecordingStream()) {
-            rs.enable(sampleEvent).with("throttle", "1000/s");
-            rs.onEvent(sampleEvent, e -> {
-                t.quit();
-                rs.close();
-            });
-            t.start();
-            rs.start();
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
deleted file mode 100644
index 0d1108346ab..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
+++ /dev/null
@@ -1,41 +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 jdk.jfr.event.profiling;
-
-import jdk.test.lib.jfr.EventNames;
-
-/**
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
- * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleFullStackTrace
- */
-public class TestCPUTimeSampleFullStackTrace {
-
-    public static void main(String[] args) throws Throwable {
-        new BaseTestFullStackTrace(EventNames.CPUTimeSample, "eventThread").run();
-    }
-
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
deleted file mode 100644
index 133df36684c..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-
-package jdk.jfr.event.profiling;
-
-import java.time.Duration;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordingStream;
-import jdk.jfr.internal.JVM;
-import jdk.test.lib.jfr.EventNames;
-
-/*
- * Tests that creating multiple recordings after another is possible.
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @modules jdk.jfr/jdk.jfr.internal
- * @run main jdk.jfr.event.profiling.TestCPUTimeSampleMultipleRecordings
- */
-public class TestCPUTimeSampleMultipleRecordings {
-
-    static String nativeEvent = EventNames.CPUTimeSample;
-
-    static volatile boolean alive = true;
-
-    public static void main(String[] args) throws Exception {
-        Thread t = new Thread(TestCPUTimeSampleMultipleRecordings::nativeMethod);
-        t.setDaemon(true);
-        t.start();
-        for (int i = 0; i < 2; i++) {
-            try (RecordingStream rs = new RecordingStream()) {
-                rs.enable(nativeEvent).with("throttle", "1ms");
-                rs.onEvent(nativeEvent, e -> {
-                    alive = false;
-                    rs.close();
-                });
-
-                rs.start();
-            }
-        }
-        alive = false;
-    }
-
-    public static void nativeMethod() {
-        while (alive) {
-            JVM.getPid();
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
deleted file mode 100644
index 1617bce4ba3..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.jfr.event.profiling;
-
-import java.time.Duration;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordingStream;
-import jdk.jfr.internal.JVM;
-import jdk.test.lib.jfr.EventNames;
-
-/*
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @modules jdk.jfr/jdk.jfr.internal
- * @run main jdk.jfr.event.profiling.TestCPUTimeSampleNative
- */
-public class TestCPUTimeSampleNative {
-
-    static String nativeEvent = EventNames.CPUTimeSample;
-
-    static volatile boolean alive = true;
-
-    public static void main(String[] args) throws Exception {
-        try (RecordingStream rs = new RecordingStream()) {
-            rs.enable(nativeEvent).with("throttle", "1ms");
-            rs.onEvent(nativeEvent, e -> {
-                alive = false;
-                rs.close();
-            });
-            Thread t = new Thread(TestCPUTimeSampleNative::nativeMethod);
-            t.setDaemon(true);
-            t.start();
-            rs.start();
-        }
-
-    }
-
-    public static void nativeMethod() {
-        while (alive) {
-            JVM.getPid();
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
deleted file mode 100644
index 55b350ad096..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.
- */
-
-package jdk.jfr.event.profiling;
-import java.lang.management.ManagementFactory;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.List;
-import java.util.Comparator;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.Events;
-
-/**
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleThrottling
- */
-public class TestCPUTimeSampleThrottling {
-
-    public static void main(String[] args) throws Exception {
-        testZeroPerSecond();
-        testThrottleSettings();
-        testThrottleSettingsPeriod();
-    }
-
-    private static void testZeroPerSecond() throws Exception {
-        Asserts.assertTrue(0L == countEvents(1000, "0/s").count());
-    }
-
-    private static void testThrottleSettings() throws Exception {
-        long count = countEvents(1000,
-            Runtime.getRuntime().availableProcessors() * 2 + "/s").count();
-        Asserts.assertTrue(count > 0 && count < 3,
-            "Expected between 0 and 3 events, got " + count);
-    }
-
-    private static void testThrottleSettingsPeriod() throws Exception {
-        float rate = countEvents(1000, "10ms").rate();
-        Asserts.assertTrue(rate > 90 && rate < 110, "Expected around 100 events per second, got " + rate);
-    }
-
-    private record EventCount(long count, float time) {
-        float rate() {
-            return count / time;
-        }
-    }
-
-    private static EventCount countEvents(int timeMs, String rate) throws Exception {
-        try(Recording recording = new Recording()) {
-            recording.enable(EventNames.CPUTimeSample)
-                    .with("throttle", rate);
-
-            var bean = ManagementFactory.getThreadMXBean();
-
-            recording.start();
-
-            long startThreadCpuTime = bean.getCurrentThreadCpuTime();
-
-            wasteCPU(timeMs);
-
-            long spendCPUTime = bean.getCurrentThreadCpuTime() - startThreadCpuTime;
-
-            recording.stop();
-
-            long eventCount = Events.fromRecording(recording).stream()
-                    .filter(e -> e.getThread().getJavaName()
-                                .equals(Thread.currentThread().getName()))
-                    .count();
-
-            System.out.println("Event count: " + eventCount + ", CPU time: " + spendCPUTime / 1_000_000_000f + "s");
-
-            return new EventCount(eventCount, spendCPUTime / 1_000_000_000f);
-        }
-    }
-
-    private static void wasteCPU(int durationMs) {
-        long start = System.currentTimeMillis();
-        double i = 0;
-        while (System.currentTimeMillis() - start < durationMs) {
-            for (int j = 0; j < 100000; j++) {
-                i = Math.sqrt(i * Math.pow(Math.sqrt(Math.random()), Math.random()));
-            }
-        }
-    }
-
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
deleted file mode 100644
index 69d32d48282..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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.profiling;
-
-import java.time.Duration;
-
-import jdk.jfr.consumer.RecordingStream;
-import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.RecurseThread;
-
-/*
- * @test
- * @requires vm.hasJFR & os.family == "linux"
- * @library /test/lib
- * @modules jdk.jfr/jdk.jfr.internal
- * @run main jdk.jfr.event.profiling.TestCPUTimeSamplingLongPeriod
- */
-public class TestCPUTimeSamplingLongPeriod {
-
-    static String sampleEvent = EventNames.CPUTimeSample;
-
-    // The period is set to 1100 ms to provoke the 1000 ms
-    // threshold in the JVM for os::naked_short_sleep().
-    public static void main(String[] args) throws Exception {
-        RecurseThread t = new RecurseThread(50);
-        t.setDaemon(true);
-        try (RecordingStream rs = new RecordingStream()) {
-            rs.enable(sampleEvent).with("throttle", "1100ms");
-            rs.onEvent(sampleEvent, e -> {
-                t.quit();
-                rs.close();
-            });
-            t.start();
-            rs.start();
-        }
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index c337a8128ab..b06f9eed03d 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -23,20 +23,147 @@
 
 package jdk.jfr.event.profiling;
 
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedStackTrace;
+import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.RecurseThread;
 
 /**
  * @test
  * @requires vm.hasJFR
  * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
- * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
  */
 public class TestFullStackTrace {
+    private final static String EVENT_NAME = EventNames.ExecutionSample;
+    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
 
     public static void main(String[] args) throws Throwable {
-        new BaseTestFullStackTrace(EventNames.ExecutionSample, "sampledThread").run();
+        RecurseThread[] threads = new RecurseThread[3];
+        for (int i = 0; i < threads.length; ++i) {
+            int depth = MAX_DEPTH - 1 + i;
+            threads[i] = new RecurseThread(depth);
+            threads[i].setName("recursethread-" + depth);
+            threads[i].start();
+        }
+
+        for (RecurseThread thread : threads) {
+            while (!thread.isInRunLoop()) {
+                Thread.sleep(20);
+            }
+        }
+
+        assertStackTraces(threads);
+
+        for (RecurseThread thread : threads) {
+            thread.quit();
+            thread.join();
+        }
+    }
+
+    private static void assertStackTraces( RecurseThread[] threads) throws Throwable {
+        Recording recording= null;
+        do {
+            recording = new Recording();
+            recording.enable(EVENT_NAME).withPeriod(Duration.ofMillis(50));
+            recording.start();
+            Thread.sleep(500);
+            recording.stop();
+        } while (!hasValidStackTraces(recording, threads));
     }
 
+    private static boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
+        boolean[] isEventFound = new boolean[threads.length];
+
+        for (RecordedEvent event : Events.fromRecording(recording)) {
+            //System.out.println("Event: " + event);
+            String threadName = Events.assertField(event, "sampledThread.javaName").getValue();
+            long threadId = Events.assertField(event, "sampledThread.javaThreadId").getValue();
+
+            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
+                RecurseThread currThread = threads[threadIndex];
+                if (threadId == currThread.getId()) {
+                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
+                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
+                    if ("recurseEnd".equals(getTopMethodName(event))) {
+                        isEventFound[threadIndex] = true;
+                        checkEvent(event, currThread.totalDepth);
+                        break;
+                    }
+                }
+            }
+        }
+
+        for (int i = 0; i < threads.length; ++i) {
+            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
+            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
+        }
+        for (int i = 0; i < threads.length; ++i) {
+            if(!isEventFound[i]) {
+               // no assertion, let's retry.
+               // Could be race condition, i.e safe point during Thread.sleep
+               System.out.println("Failed to validate all threads, will retry.");
+               return false;
+            }
+        }
+        return true;
+    }
+
+    public static String getTopMethodName(RecordedEvent event) {
+        List<RecordedFrame> frames = event.getStackTrace().getFrames();
+        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
+        return frames.getFirst().getMethod().getName();
+    }
+
+    private static void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
+        RecordedStackTrace stacktrace = null;
+        try {
+            stacktrace = event.getStackTrace();
+            List<RecordedFrame> frames = stacktrace.getFrames();
+            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
+            List<String> expectedMethods = getExpectedMethods(expectedDepth);
+            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
+
+            for (int i = 0; i < frames.size(); ++i) {
+                String name = frames.get(i).getMethod().getName();
+                String expectedName = expectedMethods.get(i);
+                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
+                Asserts.assertEquals(name, expectedName, "Wrong method name");
+            }
+
+            boolean isTruncated = stacktrace.isTruncated();
+            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
+            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
+
+            String firstMethod = frames.getLast().getMethod().getName();
+            boolean isFullTrace = "run".equals(firstMethod);
+            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
+            Asserts.assertTrue(isTruncated != isFullTrace, msg);
+        } catch (Throwable t) {
+            System.out.println(String.format("stacktrace:%n%s", stacktrace));
+            throw t;
+        }
+    }
+
+    private static List<String> getExpectedMethods(int depth) {
+        List<String> methods = new ArrayList<>();
+        methods.add("recurseEnd");
+        for (int i = 0; i < depth - 2; ++i) {
+            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
+        }
+        methods.add("run");
+        if (depth > MAX_DEPTH) {
+            methods = methods.subList(0, MAX_DEPTH);
+        }
+        return methods;
+    }
 }
diff --git a/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java b/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
deleted file mode 100644
index 8dc77fd38da..00000000000
--- a/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
- package test;
-
- import java.time.Duration;
-
- /*
-  * A class used to create a simple deep call stack for testing purposes
-  */
- public class RecursiveMethods {
-
-    /** Method that uses recursion to produce a call stack of at least {@code depth} depth */
-    public static int entry(int depth) {
-        return method2(--depth);
-    }
-
-    private static int method2(int depth) {
-        return method3(--depth);
-    }
-
-    private static int method3(int depth) {
-        return method4(--depth);
-    }
-
-    private static int method4(int depth) {
-        return method5(--depth);
-    }
-
-    private static int method5(int depth) {
-        return method6(--depth);
-    }
-
-    private static int method6(int depth) {
-        return method7(--depth);
-    }
-
-    private static int method7(int depth) {
-        return method8(--depth);
-    }
-
-    private static int method8(int depth) {
-        return method9(--depth);
-    }
-
-    private static int method9(int depth) {
-        return method10(--depth);
-    }
-
-    private static int method10(int depth) {
-        if (depth > 0) {
-            return entry(--depth);
-        }
-        return depth;
-    }
-}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index a00898358a8..904abe8e3e2 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -77,8 +77,6 @@ public class EventNames {
     public static final String ThreadAllocationStatistics = PREFIX + "ThreadAllocationStatistics";
     public static final String ExecutionSample = PREFIX + "ExecutionSample";
     public static final String NativeMethodSample = PREFIX + "NativeMethodSample";
-    public static final String CPUTimeSample = PREFIX + "CPUTimeSample";
-    public static final String CPUTimeSamplesLost = PREFIX + "CPUTimeSamplesLost";
     public static final String ThreadDump = PREFIX + "ThreadDump";
     public static final String OldObjectSample = PREFIX + "OldObjectSample";
     public static final String SymbolTableStatistics = PREFIX + "SymbolTableStatistics";

From 8f8b367ae3c9afca3581f6aced7f9855ef0d541d Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 5 Jun 2025 00:35:26 +0000
Subject: [PATCH 867/901] 8350029: Illegal invokespecial interface not caught
 by verification

Reviewed-by: coleenp, matsaave
---
 .../share/classfile/verificationType.cpp      | 56 ++++++-----
 .../share/classfile/verificationType.hpp      | 23 +++--
 src/hotspot/share/classfile/verifier.cpp      | 51 ++++++----
 .../share/interpreter/linkResolver.cpp        |  4 +-
 .../runtime/verifier/invokespecial/Run.java   | 29 ++++++
 .../TestInvokeSpecialInterface.java           | 99 +++++++++++++++++++
 .../invokespecial/UseInterfaceMethodRef.jasm  | 37 +++++++
 .../verifier/invokespecial/UseMethodRef.jasm  | 37 +++++++
 8 files changed, 286 insertions(+), 50 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/verifier/invokespecial/Run.java
 create mode 100644 test/hotspot/jtreg/runtime/verifier/invokespecial/TestInvokeSpecialInterface.java
 create mode 100644 test/hotspot/jtreg/runtime/verifier/invokespecial/UseInterfaceMethodRef.jasm
 create mode 100644 test/hotspot/jtreg/runtime/verifier/invokespecial/UseMethodRef.jasm

diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp
index e6115dfce9b..aedb620aabe 100644
--- a/src/hotspot/share/classfile/verificationType.cpp
+++ b/src/hotspot/share/classfile/verificationType.cpp
@@ -48,41 +48,50 @@ VerificationType VerificationType::from_tag(u1 tag) {
   }
 }
 
-bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Symbol* name,
-         Symbol* from_name, bool from_field_is_protected, bool from_is_array, bool from_is_object, TRAPS) {
+// Potentially resolve the target class and from class, and check whether the from class is assignable
+// to the target class. The current_klass is the class being verified - it could also be the target in some
+// cases, and otherwise is needed to obtain the correct classloader for resolving the other classes.
+bool VerificationType::resolve_and_check_assignability(InstanceKlass* current_klass, Symbol* target_name, Symbol* from_name,
+                                                       bool from_field_is_protected, bool from_is_array,
+                                                       bool from_is_object, bool* target_is_interface, TRAPS) {
   HandleMark hm(THREAD);
-  Klass* this_class;
-  if (klass->is_hidden() && klass->name() == name) {
-    this_class = klass;
+  Klass* target_klass;
+  if (current_klass->is_hidden() && current_klass->name() == target_name) {
+    target_klass = current_klass;
   } else {
-    this_class = SystemDictionary::resolve_or_fail(
-      name, Handle(THREAD, klass->class_loader()), true, CHECK_false);
+    target_klass = SystemDictionary::resolve_or_fail(
+      target_name, Handle(THREAD, current_klass->class_loader()), true, CHECK_false);
     if (log_is_enabled(Debug, class, resolve)) {
-      Verifier::trace_class_resolution(this_class, klass);
+      Verifier::trace_class_resolution(target_klass, current_klass);
     }
   }
 
-  if (this_class->is_interface() && (!from_field_is_protected ||
+  bool is_intf = target_klass->is_interface();
+  if (target_is_interface != nullptr) {
+    *target_is_interface = is_intf;
+  }
+
+  if (is_intf && (!from_field_is_protected ||
       from_name != vmSymbols::java_lang_Object())) {
     // If we are not trying to access a protected field or method in
     // java.lang.Object then, for arrays, we only allow assignability
     // to interfaces java.lang.Cloneable and java.io.Serializable.
     // Otherwise, we treat interfaces as java.lang.Object.
     return !from_is_array ||
-      this_class == vmClasses::Cloneable_klass() ||
-      this_class == vmClasses::Serializable_klass();
+      target_klass == vmClasses::Cloneable_klass() ||
+      target_klass == vmClasses::Serializable_klass();
   } else if (from_is_object) {
-    Klass* from_class;
-    if (klass->is_hidden() && klass->name() == from_name) {
-      from_class = klass;
+    Klass* from_klass;
+    if (current_klass->is_hidden() && current_klass->name() == from_name) {
+      from_klass = current_klass;
     } else {
-      from_class = SystemDictionary::resolve_or_fail(
-        from_name, Handle(THREAD, klass->class_loader()), true, CHECK_false);
+      from_klass = SystemDictionary::resolve_or_fail(
+        from_name, Handle(THREAD, current_klass->class_loader()), true, CHECK_false);
       if (log_is_enabled(Debug, class, resolve)) {
-        Verifier::trace_class_resolution(from_class, klass);
+        Verifier::trace_class_resolution(from_klass, current_klass);
       }
     }
-    return from_class->is_subclass_of(this_class);
+    return from_klass->is_subclass_of(target_klass);
   }
 
   return false;
@@ -90,8 +99,8 @@ bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Sym
 
 bool VerificationType::is_reference_assignable_from(
     const VerificationType& from, ClassVerifier* context,
-    bool from_field_is_protected, TRAPS) const {
-  InstanceKlass* klass = context->current_class();
+    bool from_field_is_protected, bool* this_is_interface, TRAPS) const {
+
   if (from.is_null()) {
     // null is assignable to any reference
     return true;
@@ -109,7 +118,7 @@ bool VerificationType::is_reference_assignable_from(
 #if INCLUDE_CDS
     if (CDSConfig::is_dumping_archive()) {
       bool skip_assignability_check = false;
-      SystemDictionaryShared::add_verification_constraint(klass,
+      SystemDictionaryShared::add_verification_constraint(context->current_class(),
               name(), from.name(), from_field_is_protected, from.is_array(),
               from.is_object(), &skip_assignability_check);
       if (skip_assignability_check) {
@@ -119,8 +128,9 @@ bool VerificationType::is_reference_assignable_from(
       }
     }
 #endif
-    return resolve_and_check_assignability(klass, name(), from.name(),
-          from_field_is_protected, from.is_array(), from.is_object(), THREAD);
+    return resolve_and_check_assignability(context->current_class(), name(), from.name(),
+                                           from_field_is_protected, from.is_array(),
+                                           from.is_object(), this_is_interface, THREAD);
   } else if (is_array() && from.is_array()) {
     VerificationType comp_this = get_component(context);
     VerificationType comp_from = from.get_component(context);
diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp
index 4f0609f0cce..788e0029fad 100644
--- a/src/hotspot/share/classfile/verificationType.hpp
+++ b/src/hotspot/share/classfile/verificationType.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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -288,7 +288,7 @@ class VerificationType {
           if (is_reference() && from.is_reference()) {
             return is_reference_assignable_from(from, context,
                                                 from_field_is_protected,
-                                                THREAD);
+                                                nullptr, THREAD);
           } else {
             return false;
           }
@@ -327,17 +327,24 @@ class VerificationType {
 
   void print_on(outputStream* st) const;
 
- private:
+  bool is_reference_assignable_from(const VerificationType& from, ClassVerifier* context,
+                                    bool from_field_is_protected, bool* this_is_interface, TRAPS) const;
 
-  bool is_reference_assignable_from(
-    const VerificationType&, ClassVerifier*, bool from_field_is_protected,
-    TRAPS) const;
+  static bool resolve_and_check_assignability(InstanceKlass* current_klass, Symbol* target_name,
+                                              Symbol* from_name, bool from_field_is_protected,
+                                              bool from_is_array, bool from_is_object,
+                                              TRAPS) {
+    return resolve_and_check_assignability(current_klass, target_name, from_name, from_field_is_protected,
+                                           from_is_array, from_is_object, nullptr, THREAD);
+  }
 
- public:
-  static bool resolve_and_check_assignability(InstanceKlass* klass, Symbol* name,
+ private:
+  static bool resolve_and_check_assignability(InstanceKlass* current_klass, Symbol* target_name,
                                               Symbol* from_name, bool from_field_is_protected,
                                               bool from_is_array, bool from_is_object,
+                                              bool* target_is_interface,
                                               TRAPS);
+
 };
 
 #endif // SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 98c05909b82..0f1468f0309 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -2891,26 +2891,43 @@ void ClassVerifier::verify_invoke_instructions(
           "Illegal call to internal method");
       return;
     }
-  } else if (opcode == Bytecodes::_invokespecial
-             && !is_same_or_direct_interface(current_class(), current_type(), ref_class_type)
-             && !ref_class_type.equals(VerificationType::reference_type(
-                  current_class()->super()->name()))) {
-    bool subtype = false;
-    bool have_imr_indirect = cp->tag_at(index).value() == JVM_CONSTANT_InterfaceMethodref;
-    subtype = ref_class_type.is_assignable_from(
-               current_type(), this, false, CHECK_VERIFY(this));
-    if (!subtype) {
-      verify_error(ErrorContext::bad_code(bci),
-          "Bad invokespecial instruction: "
-          "current class isn't assignable to reference class.");
-       return;
-    } else if (have_imr_indirect) {
+  }
+  // invokespecial, when not <init>, must be to a method in the current class, a direct superinterface,
+  // or any superclass (including Object).
+  else if (opcode == Bytecodes::_invokespecial
+           && !is_same_or_direct_interface(current_class(), current_type(), ref_class_type)
+           && !ref_class_type.equals(VerificationType::reference_type(current_class()->super()->name()))) {
+
+    // We know it is not current class, direct superinterface or immediate superclass. That means it
+    // could be:
+    // - a totally unrelated class or interface
+    // - an indirect superinterface
+    // - an indirect superclass (including Object)
+    // We use the assignability test to see if it is a superclass, or else an interface, and keep track
+    // of the latter. Note that subtype can be true if we are dealing with an interface that is not actually
+    // implemented as assignability treats all interfaces as Object.
+
+    bool is_interface = false; // This can only be set true if the assignability check will return true
+                               // and we loaded the class. For any other "true" returns (e.g. same class
+                               // or Object) we either can't get here (same class already excluded above)
+                               // or we know it is not an interface (i.e. Object).
+    bool subtype = ref_class_type.is_reference_assignable_from(current_type(), this, false,
+                                                               &is_interface, CHECK_VERIFY(this));
+    if (!subtype) {  // Totally unrelated class
       verify_error(ErrorContext::bad_code(bci),
-          "Bad invokespecial instruction: "
-          "interface method reference is in an indirect superinterface.");
+                   "Bad invokespecial instruction: "
+                   "current class isn't assignable to reference class.");
       return;
+    } else {
+      // Indirect superclass (including Object), indirect interface, or unrelated interface.
+      // Any interface use is an error.
+      if (is_interface) {
+        verify_error(ErrorContext::bad_code(bci),
+                     "Bad invokespecial instruction: "
+                     "interface method to invoke is not in a direct superinterface.");
+        return;
+      }
     }
-
   }
 
   // Get the verification types for the method's arguments.
diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
index b26c643d15f..22199baef8e 100644
--- a/src/hotspot/share/interpreter/linkResolver.cpp
+++ b/src/hotspot/share/interpreter/linkResolver.cpp
@@ -1200,7 +1200,7 @@ Method* LinkResolver::linktime_resolve_special_method(const LinkInfo& link_info,
   }
 
   // ensure that invokespecial's interface method reference is in
-  // a direct superinterface, not an indirect superinterface
+  // a direct superinterface, not an indirect superinterface or unrelated interface
   Klass* current_klass = link_info.current_klass();
   if (current_klass != nullptr && resolved_klass->is_interface()) {
     InstanceKlass* klass_to_check = InstanceKlass::cast(current_klass);
@@ -1209,7 +1209,7 @@ Method* LinkResolver::linktime_resolve_special_method(const LinkInfo& link_info,
       stringStream ss;
       ss.print("Interface method reference: '");
       resolved_method->print_external_name(&ss);
-      ss.print("', is in an indirect superinterface of %s",
+      ss.print("', is not in a direct superinterface of %s",
                current_klass->external_name());
       THROW_MSG_NULL(vmSymbols::java_lang_IncompatibleClassChangeError(), ss.as_string());
     }
diff --git a/test/hotspot/jtreg/runtime/verifier/invokespecial/Run.java b/test/hotspot/jtreg/runtime/verifier/invokespecial/Run.java
new file mode 100644
index 00000000000..df9a1d157b0
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/verifier/invokespecial/Run.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+/**
+ * A class with a run()V method that doesn't implement Runnable.
+ */
+public class Run {
+    public void run() { }
+}
diff --git a/test/hotspot/jtreg/runtime/verifier/invokespecial/TestInvokeSpecialInterface.java b/test/hotspot/jtreg/runtime/verifier/invokespecial/TestInvokeSpecialInterface.java
new file mode 100644
index 00000000000..caced8b3b51
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/verifier/invokespecial/TestInvokeSpecialInterface.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.
+ */
+
+/*
+ * @test id=verified
+ * @compile Run.java UseMethodRef.jasm UseInterfaceMethodRef.jasm TestInvokeSpecialInterface.java
+ * @run main/othervm TestInvokeSpecialInterface true
+ */
+
+/*
+ * @test id=unverified
+ * @compile Run.java UseMethodRef.jasm UseInterfaceMethodRef.jasm TestInvokeSpecialInterface.java
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote TestInvokeSpecialInterface false
+ */
+
+public class TestInvokeSpecialInterface {
+    public static void main(String[] args) throws Throwable {
+        if (args[0].equals("true")) {
+            check_verified();
+        } else {
+            check_unverified();
+        }
+    }
+
+    static void check_verified() {
+        String veMsg = "interface method to invoke is not in a direct superinterface";
+        try {
+            UseMethodRef t = new UseMethodRef();
+            UseMethodRef.test(t);
+        }
+        catch(VerifyError ve) {
+            if (ve.getMessage().contains(veMsg)) {
+                System.out.println("Got expected: " + ve);
+            } else {
+                throw new RuntimeException("Unexpected VerifyError thrown", ve);
+            }
+        }
+
+        try {
+            UseInterfaceMethodRef t = new UseInterfaceMethodRef();
+            UseInterfaceMethodRef.test(t);
+        }
+        catch(VerifyError ve) {
+            if (ve.getMessage().contains(veMsg)) {
+                System.out.println("Got expected: " + ve);
+            } else {
+                throw new RuntimeException("Unexpected VerifyError thrown", ve);
+            }
+        }
+    }
+
+    static void check_unverified() {
+        try {
+            UseMethodRef t = new UseMethodRef();
+            UseMethodRef.test(t);
+        }
+        catch(IncompatibleClassChangeError icce) {
+            String icceMsg = "Method 'void java.lang.Runnable.run()' must be InterfaceMethodref constant";
+            if (icce.getMessage().contains(icceMsg)) {
+                System.out.println("Got expected: " + icce);
+            } else {
+                throw new RuntimeException("Unexpected IncompatibleClassChangeError", icce);
+            }
+        }
+
+        try {
+            UseInterfaceMethodRef t = new UseInterfaceMethodRef();
+            UseInterfaceMethodRef.test(t);
+        }
+        catch(IncompatibleClassChangeError icce) {
+            String icceMsg = "Interface method reference: 'void java.lang.Runnable.run()', is not in a direct superinterface of UseInterfaceMethodRef";
+            if (icce.getMessage().contains(icceMsg)) {
+                System.out.println("Got expected: " + icce);
+            } else {
+                throw new RuntimeException("Unexpected IncompatibleClassChangeError", icce);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/verifier/invokespecial/UseInterfaceMethodRef.jasm b/test/hotspot/jtreg/runtime/verifier/invokespecial/UseInterfaceMethodRef.jasm
new file mode 100644
index 00000000000..49290b3c1bc
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/verifier/invokespecial/UseInterfaceMethodRef.jasm
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+class UseInterfaceMethodRef extends Run version 52:0 {
+
+    public Method "<init>":"()V" stack 1 locals 1 {
+        aload_0;
+        invokespecial   Method Run."<init>":"()V";
+        return;
+    }
+
+    public static Method test:"(LUseInterfaceMethodRef;)V" stack 2 {
+        aload_0;
+        invokespecial InterfaceMethod java/lang/Runnable.run:()V; // VerifyError
+        return;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/verifier/invokespecial/UseMethodRef.jasm b/test/hotspot/jtreg/runtime/verifier/invokespecial/UseMethodRef.jasm
new file mode 100644
index 00000000000..cf1ebec115b
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/verifier/invokespecial/UseMethodRef.jasm
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+class UseMethodRef extends Run version 52:0 {
+
+    public Method "<init>":"()V" stack 1 locals 1 {
+        aload_0;
+        invokespecial   Method Run."<init>":"()V";
+        return;
+    }
+
+    public static Method test:"(LUseMethodRef;)V" stack 2 {
+        aload_0;
+        invokespecial Method java/lang/Runnable.run:()V; // VerifyError
+        return;
+    }
+}

From 575806c0e5584ea24cda80158070579b88c477f7 Mon Sep 17 00:00:00 2001
From: Hannes Greule <hgreule@openjdk.org>
Date: Thu, 5 Jun 2025 01:41:21 +0000
Subject: [PATCH 868/901] 8358078: javap crashes with NPE on preview class file

Reviewed-by: liach
---
 .../com/sun/tools/javap/ClassWriter.java      |  6 +-
 .../tools/javap/ClassFileVersionTest.java     | 98 +++++++++++++++++++
 2 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javap/ClassFileVersionTest.java

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
index 4036a185ab1..c5c75d8848c 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -118,9 +118,11 @@ protected void setMethod(MethodModel m) {
     protected ClassFileFormatVersion cffv() {
         var major = classModel.majorVersion();
         if (major < JAVA_1_VERSION || major > ClassFile.latestMajorVersion())
-            return null;
+            // something not representable by CFFV, let's fall back
+            return ClassFileFormatVersion.latest();
         if (major >= JAVA_12_VERSION && classModel.minorVersion() != 0) {
-            return null;
+            // preview versions aren't explicitly supported, but latest is good enough for now
+            return ClassFileFormatVersion.latest();
         }
         return ClassFileFormatVersion.fromMajor(major);
     }
diff --git a/test/langtools/tools/javap/ClassFileVersionTest.java b/test/langtools/tools/javap/ClassFileVersionTest.java
new file mode 100644
index 00000000000..c5968dfd84e
--- /dev/null
+++ b/test/langtools/tools/javap/ClassFileVersionTest.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
+ * @bug 8358078
+ * @summary javap should not crash due to class file versions
+ * @library /tools/lib
+ * @modules jdk.jdeps/com.sun.tools.javap
+ * @run junit ClassFileVersionTest
+ */
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+import java.lang.classfile.ClassFile;
+import java.lang.constant.ClassDesc;
+import java.lang.reflect.AccessFlag;
+import java.lang.reflect.ClassFileFormatVersion;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.params.provider.Arguments.of;
+
+public class ClassFileVersionTest {
+
+    final ToolBox toolBox = new ToolBox();
+
+    public static Stream<Arguments> classFiles() {
+        int major17 = ClassFileFormatVersion.RELEASE_17.major();
+        int preview = Character.MAX_VALUE;
+        int majorLatest = ClassFileFormatVersion.latest().major();
+        AccessFlag[] noFlags = {};
+        return Stream.of(
+            of(false, major17, 0, noFlags),
+            of(false, major17, preview, noFlags),
+            of(false, 0, 0, noFlags),
+            of(false, major17, 0, new AccessFlag[]{AccessFlag.PUBLIC}),
+            of(false, major17, preview, new AccessFlag[]{AccessFlag.PUBLIC}),
+            of(false, majorLatest, preview, new AccessFlag[]{AccessFlag.PUBLIC}),
+            of(true, majorLatest, 0, new AccessFlag[]{AccessFlag.BRIDGE}), // misplaced access flag
+            of(true, majorLatest, preview, new AccessFlag[]{AccessFlag.BRIDGE}) // misplaced access flag
+        );
+    }
+
+    private static byte[] createClassFile(int major, int minor, AccessFlag[] classFlags) {
+        return ClassFile.of().build(ClassDesc.of("Test"), (builder) -> {
+            // manually assemble flag bits to avoid exception in ClassFile api
+            int flags = 0;
+            for (AccessFlag classFlag : classFlags) {
+                flags |= classFlag.mask();
+            }
+            builder.withVersion(major, minor).withFlags(flags);
+        });
+    }
+
+    @ParameterizedTest
+    @MethodSource("classFiles")
+    void test(boolean shouldError, int major, int minor, AccessFlag[] classFlags) throws Throwable {
+
+        Files.write(Path.of("cf.class"), createClassFile(major, minor, classFlags));
+
+        var lines = new JavapTask(toolBox)
+            .classes("cf.class")
+            .options("-c", "-p", "-v")
+            .run(shouldError ? Task.Expect.FAIL : Task.Expect.SUCCESS)
+            .writeAll()
+            .getOutputLines(Task.OutputKind.DIRECT);
+
+        assertEquals(shouldError, lines.stream().anyMatch(l -> l.startsWith("Error: Access Flags:")), "printed error");
+    }
+}

From 849655a145a40b056a751528cebc78a11481514c Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Thu, 5 Jun 2025 03:25:46 +0000
Subject: [PATCH 869/901] 8358632: [asan] reports heap-buffer-overflow in
 AOTCodeCache::copy_bytes

Reviewed-by: vlivanov, iveresov
---
 src/hotspot/share/code/aotCodeCache.cpp           | 15 +++------------
 .../appcds/aotCode/AOTCodeCompressedOopsTest.java |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 6d8faa10a38..d0692ee678b 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -460,18 +460,9 @@ AOTCodeCache* AOTCodeCache::open_for_dump() {
 }
 
 void copy_bytes(const char* from, address to, uint size) {
-  assert(size > 0, "sanity");
-  bool by_words = true;
-  if ((size > 2 * HeapWordSize) && (((intptr_t)from | (intptr_t)to) & (HeapWordSize - 1)) == 0) {
-    // Use wordwise copies if possible:
-    Copy::disjoint_words((HeapWord*)from,
-                         (HeapWord*)to,
-                         ((size_t)size + HeapWordSize-1) / HeapWordSize);
-  } else {
-    by_words = false;
-    Copy::conjoint_jbytes(from, to, (size_t)size);
-  }
-  log_trace(aot, codecache)("Copied %d bytes as %s from " INTPTR_FORMAT " to " INTPTR_FORMAT, size, (by_words ? "HeapWord" : "bytes"), p2i(from), p2i(to));
+  assert((int)size > 0, "sanity");
+  memcpy(to, from, size);
+  log_trace(aot, codecache)("Copied %d bytes from " INTPTR_FORMAT " to " INTPTR_FORMAT, size, p2i(from), p2i(to));
 }
 
 AOTCodeReader::AOTCodeReader(AOTCodeCache* cache, AOTCodeEntry* entry) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
index 267b9a267b2..4587eeae5e5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
@@ -173,7 +173,7 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception
                   *    [0.022s][info][cds]     narrow_oop_mode = 3, narrow_oop_base = 0x0000000300000000, narrow_oop_shift = 3
                   *    [0.022s][info][cds]     heap range = [0x0000000301000000 - 0x0000000ac1000000]
                   */
-                 Pattern p = Pattern.compile("narrow_oop_base = 0x(\\d+), narrow_oop_shift = (\\d)");
+                 Pattern p = Pattern.compile("narrow_oop_base = 0x([0-9a-fA-F]+), narrow_oop_shift = (\\d)");
                  for (int i = 0; i < list.size(); i++) {
                      String line = list.get(i);
                      if (line.indexOf("CDS archive was created with max heap size") != -1) {

From 08023481edec4c0cacc79a608c573856f0718e58 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 5 Jun 2025 04:24:05 +0000
Subject: [PATCH 870/901] 8358558: (zipfs) Reorder the listing of "accessMode"
 property in the ZIP file system's documentation

Reviewed-by: dfuchs, vyazici, alanb, lancea
---
 src/jdk.zipfs/share/classes/module-info.java | 83 ++++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/jdk.zipfs/share/classes/module-info.java b/src/jdk.zipfs/share/classes/module-info.java
index db7ae3eec81..0716fdf8266 100644
--- a/src/jdk.zipfs/share/classes/module-info.java
+++ b/src/jdk.zipfs/share/classes/module-info.java
@@ -149,12 +149,52 @@
  *
  * <tbody>
  * <tr>
+ *   <th scope="row">accessMode</th>
+ *   <td>{@link java.lang.String}</td>
+ *   <td>null/unset</td>
+ *   <td>
+ *       A value defining the desired access mode of the file system.
+ *       ZIP file systems can be created to allow for <em>read-write</em> or
+ *       <em>read-only</em> access.
+ *       <ul>
+ *           <li>
+ *               If no value is set, the file system is created as <em>read-write</em>
+ *               if possible. Use {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} to determine the actual access mode.
+ *           </li>
+ *           <li>
+ *               If the value is {@code "readOnly"}, the file system is created
+ *               <em>read-only</em>, and {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} will always return {@code true}. Creating a
+ *               <em>read-only</em> file system requires the underlying ZIP file to
+ *               already exist.
+ *           </li>
+ *           <li>
+ *               If the value is {@code "readWrite"}, the file system is created
+ *               <em>read-write</em>, and {@link java.nio.file.FileSystem#isReadOnly()
+ *               isReadOnly()} will always return {@code false}. If a writable file
+ *               system cannot be created, an {@code IOException} will be thrown
+ *               when creating the ZIP file system.
+ *           </li>
+ *           <li>
+ *               Any other values will cause an {@code IllegalArgumentException}
+ *               to be thrown when creating the ZIP file system.
+ *           </li>
+ *       </ul>
+ *       The {@code accessMode} property has no effect on reported POSIX file
+ *       permissions (in cases where POSIX support is enabled).
+ *   </td>
+ * </tr>
+ * <tr>
  *   <th scope="row">create</th>
  *   <td>{@link java.lang.String} or {@link java.lang.Boolean}</td>
  *   <td>false</td>
  *   <td>
  *       If the value is {@code true}, the ZIP file system provider creates a
- *       new ZIP or JAR file if it does not exist.
+ *       new ZIP or JAR file if it does not exist. Specifying the {@code create}
+ *       property as {@code true} with the {@code accessMode} as {@code "readOnly"}
+ *       will cause an {@code IllegalArgumentException} to be thrown when creating
+ *       the ZIP file system.
  *   </td>
  * </tr>
  * <tr>
@@ -266,47 +306,6 @@
  *       </ul>
  *   </td>
  * </tr>
- * <tr>
- *   <th scope="row">accessMode</th>
- *   <td>{@link java.lang.String}</td>
- *   <td>null/unset</td>
- *   <td>
- *       A value defining the desired access mode of the file system.
- *       ZIP file systems can be created to allow for <em>read-write</em> or
- *       <em>read-only</em> access.
- *       <ul>
- *           <li>
- *               If no value is set, the file system is created as <em>read-write</em>
- *               if possible. Use {@link java.nio.file.FileSystem#isReadOnly()
- *               isReadOnly()} to determine the actual access mode.
- *           </li>
- *           <li>
- *               If the value is {@code "readOnly"}, the file system is created
- *               <em>read-only</em>, and {@link java.nio.file.FileSystem#isReadOnly()
- *               isReadOnly()} will always return {@code true}. Creating a
- *               <em>read-only</em> file system requires the underlying ZIP file to
- *               already exist.
- *               Specifying the {@code create} property as {@code true} with the
- *               {@code accessMode} as {@code readOnly} will cause an {@code
- *               IllegalArgumentException} to be thrown when creating the ZIP file
- *               system.
- *           </li>
- *           <li>
- *               If the value is {@code "readWrite"}, the file system is created
- *               <em>read-write</em>, and {@link java.nio.file.FileSystem#isReadOnly()
- *               isReadOnly()} will always return {@code false}. If a writable file
- *               system cannot be created, an {@code IOException} will be thrown
- *               when creating the ZIP file system.
- *           </li>
- *           <li>
- *               Any other values will cause an {@code IllegalArgumentException}
- *               to be thrown when creating the ZIP file system.
- *           </li>
- *       </ul>
- *       The {@code accessMode} property has no effect on reported POSIX file
- *       permissions (in cases where POSIX support is enabled).
- *   </td>
- * </tr>
  * </tbody>
  * </table>
  *

From 48b97ac0e006362528423ffd657b2ea3afa46a6e Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dzhang@openjdk.org>
Date: Thu, 5 Jun 2025 07:34:48 +0000
Subject: [PATCH 871/901] 8358634: RISC-V: Fix several broken documentation
 web-links

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.hpp | 2 +-
 src/hotspot/cpu/riscv/vm_version_riscv.hpp     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index f302b3602ad..7fa7f931044 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -666,7 +666,7 @@ class MacroAssembler: public Assembler {
   // We try to follow risc-v asm menomics.
   // But as we don't layout a reachable GOT,
   // we often need to resort to movptr, li <48imm>.
-  // https://github.com/riscv-non-isa/riscv-asm-manual/blob/master/riscv-asm.md
+  // https://github.com/riscv-non-isa/riscv-asm-manual/blob/main/src/asm-manual.adoc
 
   // Hotspot only use the standard calling convention using x1/ra.
   // The alternative calling convection using x5/t0 is not used.
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 4214d6c53dc..a0a42fb5463 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -221,13 +221,13 @@ class VM_Version : public Abstract_VM_Version {
       FLAG_SET_DEFAULT(UseExtension, true);     \
     }                                           \
 
-  // https://github.com/riscv/riscv-profiles/blob/main/profiles.adoc#rva20-profiles
+  // https://github.com/riscv/riscv-profiles/blob/main/src/profiles.adoc#rva20-profiles
   #define RV_USE_RVA20U64                            \
     RV_ENABLE_EXTENSION(UseRVC)                      \
 
   static void useRVA20U64Profile();
 
-  // https://github.com/riscv/riscv-profiles/blob/main/profiles.adoc#rva22-profiles
+  // https://github.com/riscv/riscv-profiles/blob/main/src/profiles.adoc#rva22-profiles
   #define RV_USE_RVA22U64                            \
     RV_ENABLE_EXTENSION(UseRVC)                      \
     RV_ENABLE_EXTENSION(UseZba)                      \
@@ -241,7 +241,7 @@ class VM_Version : public Abstract_VM_Version {
 
   static void useRVA22U64Profile();
 
-  // https://github.com/riscv/riscv-profiles/blob/main/rva23-profile.adoc#rva23u64-profile
+  // https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc#rva23u64-profile
   #define RV_USE_RVA23U64                           \
     RV_ENABLE_EXTENSION(UseRVC)                     \
     RV_ENABLE_EXTENSION(UseRVV)                     \

From ace70a6d6aca619da34b2f9cac2586cc88cefb5a Mon Sep 17 00:00:00 2001
From: Johannes Bechberger <jbechberger@openjdk.org>
Date: Thu, 5 Jun 2025 08:18:18 +0000
Subject: [PATCH 872/901] 8358666: [REDO] Implement JEP 509: JFR CPU-Time
 Profiling

Reviewed-by: mgronlun
---
 src/hotspot/os/posix/signals_posix.cpp        |   8 +
 src/hotspot/os/posix/signals_posix.hpp        |   2 +
 src/hotspot/share/jfr/jfr.inline.hpp          |   3 +-
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    |   6 +
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp    |   2 +
 .../jfr/jni/jfrJniMethodRegistration.cpp      |   1 +
 src/hotspot/share/jfr/metadata/metadata.xml   |  16 +
 .../sampling/jfrCPUTimeThreadSampler.cpp      | 780 ++++++++++++++++++
 .../sampling/jfrCPUTimeThreadSampler.hpp      | 152 ++++
 .../periodic/sampling/jfrSampleRequest.cpp    |  33 +-
 .../periodic/sampling/jfrSampleRequest.hpp    |   5 +
 .../periodic/sampling/jfrThreadSampling.cpp   |  92 ++-
 .../periodic/sampling/jfrThreadSampling.hpp   |   2 +
 .../share/jfr/recorder/jfrRecorder.cpp        |  15 +
 .../share/jfr/recorder/jfrRecorder.hpp        |   1 +
 .../recorder/service/jfrEventThrottler.cpp    |  12 +-
 .../share/jfr/support/jfrThreadLocal.cpp      |  98 ++-
 .../share/jfr/support/jfrThreadLocal.hpp      |  53 ++
 src/hotspot/share/runtime/thread.hpp          |   1 +
 src/hotspot/share/runtime/vmOperation.hpp     |   2 +
 src/hotspot/share/utilities/ticks.hpp         |   1 +
 .../jdk/jfr/internal/EventControl.java        |   4 +
 .../share/classes/jdk/jfr/internal/JVM.java   |  10 +
 .../jdk/jfr/internal/PlatformEventType.java   |  21 +
 .../classes/jdk/jfr/internal/query/view.ini   |  25 +-
 .../internal/settings/CPUThrottleSetting.java |  89 ++
 .../classes/jdk/jfr/internal/util/Rate.java   |   4 +
 .../jdk/jfr/internal/util/TimespanRate.java   |  68 ++
 src/jdk.jfr/share/conf/jfr/default.jfc        |  10 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  10 +
 .../metadata/TestLookForUntestedEvents.java   |   9 +-
 .../profiling/BaseTestFullStackTrace.java     | 176 ++++
 .../TestCPUTimeAndExecutionSample.java        |  65 ++
 .../TestCPUTimeSampleFullStackTrace.java      |  41 +
 .../TestCPUTimeSampleMultipleRecordings.java  |  70 ++
 .../profiling/TestCPUTimeSampleNative.java    |  66 ++
 .../TestCPUTimeSampleThrottling.java          | 111 +++
 .../TestCPUTimeSamplingLongPeriod.java        |  58 ++
 .../event/profiling/TestFullStackTrace.java   | 131 +--
 .../classes/test/RecursiveMethods.java        |  76 ++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   2 +
 41 files changed, 2191 insertions(+), 140 deletions(-)
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
 create mode 100644 src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
 create mode 100644 test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index e900d5695ae..0157d354f40 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1505,6 +1505,14 @@ bool PosixSignals::is_sig_ignored(int sig) {
   }
 }
 
+void* PosixSignals::get_signal_handler_for_signal(int sig) {
+  struct sigaction oact;
+  if (sigaction(sig, (struct sigaction*)nullptr, &oact) == -1) {
+    return nullptr;
+  }
+  return get_signal_handler(&oact);
+}
+
 static void signal_sets_init() {
   sigemptyset(&preinstalled_sigs);
 
diff --git a/src/hotspot/os/posix/signals_posix.hpp b/src/hotspot/os/posix/signals_posix.hpp
index 9deade4db18..c1cb70df153 100644
--- a/src/hotspot/os/posix/signals_posix.hpp
+++ b/src/hotspot/os/posix/signals_posix.hpp
@@ -52,6 +52,8 @@ class PosixSignals : public AllStatic {
 
   static bool is_sig_ignored(int sig);
 
+  static void* get_signal_handler_for_signal(int sig);
+
   static void hotspot_sigmask(Thread* thread);
 
   static void print_signal_handler(outputStream* st, int sig, char* buf, size_t buflen);
diff --git a/src/hotspot/share/jfr/jfr.inline.hpp b/src/hotspot/share/jfr/jfr.inline.hpp
index bdb47f600e6..5b6fc62d0ea 100644
--- a/src/hotspot/share/jfr/jfr.inline.hpp
+++ b/src/hotspot/share/jfr/jfr.inline.hpp
@@ -32,7 +32,8 @@
 
 inline bool Jfr::has_sample_request(JavaThread* jt) {
   assert(jt != nullptr, "invariant");
-  return jt->jfr_thread_local()->has_sample_request();
+  JfrThreadLocal* tl = jt->jfr_thread_local();
+  return tl->has_sample_request() || tl->has_cpu_time_jfr_requests();
 }
 
 inline void Jfr::check_and_process_sample_request(JavaThread* jt) {
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index 6f1c1936574..bc2412a90c1 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -24,6 +24,7 @@
 
 #include "jfr/jfr.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrEventSetting.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -169,6 +170,11 @@ NO_TRANSITION(jboolean, jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_ty
   return JNI_TRUE;
 NO_TRANSITION_END
 
+JVM_ENTRY_NO_ENV(void, jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt))
+  JfrEventSetting::set_enabled(JfrCPUTimeSampleEvent, rate > 0);
+  JfrCPUTimeThreadSampling::set_rate(rate, auto_adapt == JNI_TRUE);
+JVM_END
+
 NO_TRANSITION(void, jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong event_type_id, jlong value))
   JfrEventSetting::set_miscellaneous(event_type_id, value);
   const JfrEventId typed_event_id = (JfrEventId)event_type_id;
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index 9c78c6239d4..dbea7f0180d 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -129,6 +129,8 @@ jlong JNICALL jfr_get_unloaded_event_classes_count(JNIEnv* env, jclass jvm);
 
 jboolean JNICALL jfr_set_throttle(JNIEnv* env, jclass jvm, jlong event_type_id, jlong event_sample_size, jlong period_ms);
 
+void JNICALL jfr_set_cpu_throttle(JNIEnv* env, jclass jvm, jdouble rate, jboolean auto_adapt);
+
 void JNICALL jfr_set_miscellaneous(JNIEnv* env, jclass jvm, jlong id, jlong value);
 
 void JNICALL jfr_emit_old_object_samples(JNIEnv* env, jclass jvm, jlong cutoff_ticks, jboolean, jboolean);
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index 33a564dee2f..82ef93d95b2 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -83,6 +83,7 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) {
       (char*)"getUnloadedEventClassCount", (char*)"()J", (void*)jfr_get_unloaded_event_classes_count,
       (char*)"setMiscellaneous", (char*)"(JJ)V", (void*)jfr_set_miscellaneous,
       (char*)"setThrottle", (char*)"(JJJ)Z", (void*)jfr_set_throttle,
+      (char*)"setCPUThrottle", (char*)"(DZ)V", (void*)jfr_set_cpu_throttle,
       (char*)"emitOldObjectSamples", (char*)"(JZZ)V", (void*)jfr_emit_old_object_samples,
       (char*)"shouldRotateDisk", (char*)"()Z", (void*)jfr_should_rotate_disk,
       (char*)"exclude", (char*)"(Ljava/lang/Thread;)V", (void*)jfr_exclude_thread,
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 9c04ec3dca1..03daca946f6 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -962,6 +962,22 @@
     <Field type="ThreadState" name="state" label="Thread State" />
   </Event>
 
+  <Event name="CPUTimeSample" category="Java Virtual Machine, Profiling" label="CPU Time Method Sample"
+    description="Snapshot of a threads state from the CPU time sampler. The throttle can be either an upper bound for the event emission rate, e.g. 100/s, or the cpu-time period, e.g. 10ms, with s, ms, us and ns supported as time units."
+    throttle="true" thread="false" experimental="true" startTime="false">
+    <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
+    <Field type="Thread" name="eventThread" label="Thread" />
+    <Field type="boolean" name="failed" label="Failed" description="Failed to obtain the stack trace" />
+    <Field type="Tickspan" name="samplingPeriod" label="CPU Time Sampling Period"/>
+    <Field type="boolean" name="biased" label="Biased" description="The sample is safepoint-biased" />
+  </Event>
+
+  <Event name="CPUTimeSamplesLost" category="Java Virtual Machine, Profiling" label="CPU Time Method Profiling Lost Samples" description="Records that the CPU time sampler lost samples"
+    thread="false" stackTrace="false" startTime="false" experimental="true">
+    <Field type="int" name="lostSamples" label="Lost Samples" />
+    <Field type="Thread" name="eventThread" label="Thread" />
+  </Event>
+
   <Event name="ThreadDump" category="Java Virtual Machine, Runtime" label="Thread Dump" period="everyChunk">
     <Field type="string" name="result" label="Thread Dump" />
   </Event>
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
new file mode 100644
index 00000000000..2f063123a3d
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.cpp
@@ -0,0 +1,780 @@
+/*
+ * 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.
+ *
+ */
+
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
+#include "logging/log.hpp"
+
+
+#if defined(LINUX)
+#include "jfr/periodic/sampling/jfrThreadSampling.hpp"
+#include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/utilities/jfrTime.hpp"
+#include "jfr/utilities/jfrThreadIterator.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+#include "jfrfiles/jfrEventClasses.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/javaThread.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/safepointMechanism.inline.hpp"
+#include "runtime/threadSMR.hpp"
+#include "runtime/vmOperation.hpp"
+#include "runtime/vmThread.hpp"
+#include "utilities/ticks.hpp"
+
+#include "signals_posix.hpp"
+
+static const int64_t AUTOADAPT_INTERVAL_MS = 100;
+
+static bool is_excluded(JavaThread* jt) {
+  return jt->is_hidden_from_external_view() ||
+         jt->jfr_thread_local()->is_excluded() ||
+         jt->is_JfrRecorder_thread();
+}
+
+static JavaThread* get_java_thread_if_valid() {
+  Thread* raw_thread = Thread::current_or_null_safe();
+  if (raw_thread == nullptr) {
+    // probably while shutting down
+    return nullptr;
+  }
+  assert(raw_thread->is_Java_thread(), "invariant");
+  JavaThread* jt = JavaThread::cast(raw_thread);
+  if (is_excluded(jt) || jt->is_exiting()) {
+    return nullptr;
+  }
+  return jt;
+}
+
+JfrCPUTimeTraceQueue::JfrCPUTimeTraceQueue(u4 capacity) :
+   _data(nullptr), _capacity(capacity), _head(0), _lost_samples(0) {
+  if (capacity != 0) {
+    _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
+  }
+}
+
+JfrCPUTimeTraceQueue::~JfrCPUTimeTraceQueue() {
+  if (_data != nullptr) {
+    assert(_capacity != 0, "invariant");
+    JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
+  }
+}
+
+bool JfrCPUTimeTraceQueue::enqueue(JfrCPUTimeSampleRequest& request) {
+  assert(JavaThread::current()->jfr_thread_local()->is_cpu_time_jfr_enqueue_locked(), "invariant");
+  assert(&JavaThread::current()->jfr_thread_local()->cpu_time_jfr_queue() == this, "invariant");
+  u4 elementIndex;
+  do {
+    elementIndex = Atomic::load_acquire(&_head);
+    if (elementIndex >= _capacity) {
+      return false;
+    }
+  } while (Atomic::cmpxchg(&_head, elementIndex, elementIndex + 1) != elementIndex);
+  _data[elementIndex] = request;
+  return true;
+}
+
+JfrCPUTimeSampleRequest& JfrCPUTimeTraceQueue::at(u4 index) {
+  assert(index < _head, "invariant");
+  return _data[index];
+}
+
+static volatile u4 _lost_samples_sum = 0;
+
+u4 JfrCPUTimeTraceQueue::size() const {
+  return Atomic::load_acquire(&_head);
+}
+
+void JfrCPUTimeTraceQueue::set_size(u4 size) {
+  Atomic::release_store(&_head, size);
+}
+
+u4 JfrCPUTimeTraceQueue::capacity() const {
+  return _capacity;
+}
+
+void JfrCPUTimeTraceQueue::set_capacity(u4 capacity) {
+  _head = 0;
+  if (_data != nullptr) {
+    assert(_capacity != 0, "invariant");
+    JfrCHeapObj::free(_data, _capacity * sizeof(JfrCPUTimeSampleRequest));
+  }
+  if (capacity != 0) {
+    _data = JfrCHeapObj::new_array<JfrCPUTimeSampleRequest>(capacity);
+  } else {
+    _data = nullptr;
+  }
+  _capacity = capacity;
+}
+
+bool JfrCPUTimeTraceQueue::is_empty() const {
+  return Atomic::load_acquire(&_head) == 0;
+}
+
+u4 JfrCPUTimeTraceQueue::lost_samples() const {
+  return Atomic::load(&_lost_samples);
+}
+
+void JfrCPUTimeTraceQueue::increment_lost_samples() {
+  Atomic::inc(&_lost_samples_sum);
+  Atomic::inc(&_lost_samples);
+}
+
+u4 JfrCPUTimeTraceQueue::get_and_reset_lost_samples() {
+  return Atomic::xchg(&_lost_samples, (u4)0);
+}
+
+void JfrCPUTimeTraceQueue::resize(u4 capacity) {
+  if (capacity != _capacity) {
+    set_capacity(capacity);
+  }
+}
+
+void JfrCPUTimeTraceQueue::resize_for_period(u4 period_millis) {
+  u4 capacity = CPU_TIME_QUEUE_CAPACITY;
+  if (period_millis > 0 && period_millis < 10) {
+    capacity = (u4) ((double) capacity * 10 / period_millis);
+  }
+  resize(capacity);
+}
+
+void JfrCPUTimeTraceQueue::clear() {
+  Atomic::release_store(&_head, (u4)0);
+}
+
+static int64_t compute_sampling_period(double rate) {
+  if (rate == 0) {
+    return 0;
+  }
+  return os::active_processor_count() * 1000000000.0 / rate;
+}
+
+class JfrCPUSamplerThread : public NonJavaThread {
+  friend class JfrCPUTimeThreadSampling;
+ private:
+  Semaphore _sample;
+  NonJavaThread* _sampler_thread;
+  double _rate;
+  bool _auto_adapt;
+  volatile int64_t _current_sampling_period_ns;
+  volatile bool _disenrolled;
+  // top bit is used to indicate that no signal handler should proceed
+  volatile u4 _active_signal_handlers;
+  volatile bool _is_async_processing_of_cpu_time_jfr_requests_triggered;
+  volatile bool _warned_about_timer_creation_failure;
+  volatile bool _signal_handler_installed;
+
+  static const u4 STOP_SIGNAL_BIT = 0x80000000;
+
+  JfrCPUSamplerThread(double rate, bool auto_adapt);
+
+  void start_thread();
+
+  void enroll();
+  void disenroll();
+  void update_all_thread_timers();
+
+  void auto_adapt_period_if_needed();
+
+  void set_rate(double rate, bool auto_adapt);
+  int64_t get_sampling_period() const { return Atomic::load(&_current_sampling_period_ns); };
+
+  void sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now);
+
+  // process the queues for all threads that are in native state (and requested to be processed)
+  void stackwalk_threads_in_native();
+  bool create_timer_for_thread(JavaThread* thread, timer_t &timerid);
+
+  void stop_signal_handlers();
+
+  // returns false if the stop signal bit was set, true otherwise
+  bool increment_signal_handler_count();
+
+  void decrement_signal_handler_count();
+
+  void initialize_active_signal_handler_counter();
+
+protected:
+  virtual void post_run();
+public:
+  virtual const char* name() const { return "JFR CPU Sampler Thread"; }
+  virtual const char* type_name() const { return "JfrCPUTimeSampler"; }
+  void run();
+  void on_javathread_create(JavaThread* thread);
+  void on_javathread_terminate(JavaThread* thread);
+
+  void handle_timer_signal(siginfo_t* info, void* context);
+  bool init_timers();
+  void stop_timer();
+
+  void trigger_async_processing_of_cpu_time_jfr_requests();
+};
+
+JfrCPUSamplerThread::JfrCPUSamplerThread(double rate, bool auto_adapt) :
+  _sample(),
+  _sampler_thread(nullptr),
+  _rate(rate),
+  _auto_adapt(auto_adapt),
+  _current_sampling_period_ns(compute_sampling_period(rate)),
+  _disenrolled(true),
+  _active_signal_handlers(STOP_SIGNAL_BIT),
+  _is_async_processing_of_cpu_time_jfr_requests_triggered(false),
+  _warned_about_timer_creation_failure(false),
+  _signal_handler_installed(false) {
+  assert(rate >= 0, "invariant");
+}
+
+void JfrCPUSamplerThread::trigger_async_processing_of_cpu_time_jfr_requests() {
+  Atomic::release_store(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true);
+}
+
+void JfrCPUSamplerThread::on_javathread_create(JavaThread* thread) {
+  if (thread->is_hidden_from_external_view() || thread->is_JfrRecorder_thread() ||
+      !Atomic::load_acquire(&_signal_handler_installed)) {
+    return;
+  }
+  JfrThreadLocal* tl = thread->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+  tl->cpu_time_jfr_queue().resize_for_period(_current_sampling_period_ns / 1000000);
+  timer_t timerid;
+  if (create_timer_for_thread(thread, timerid)) {
+    tl->set_cpu_timer(&timerid);
+  } else {
+    if (!Atomic::or_then_fetch(&_warned_about_timer_creation_failure, true)) {
+      log_warning(jfr)("Failed to create timer for a thread");
+    }
+    tl->deallocate_cpu_time_jfr_queue();
+  }
+}
+
+void JfrCPUSamplerThread::on_javathread_terminate(JavaThread* thread) {
+  JfrThreadLocal* tl = thread->jfr_thread_local();
+  assert(tl != nullptr, "invariant");
+  timer_t* timer = tl->cpu_timer();
+  if (timer == nullptr) {
+    return; // no timer was created for this thread
+  }
+  tl->unset_cpu_timer();
+  tl->deallocate_cpu_time_jfr_queue();
+  s4 lost_samples = tl->cpu_time_jfr_queue().lost_samples();
+  if (lost_samples > 0) {
+    JfrCPUTimeThreadSampling::send_lost_event(JfrTicks::now(), JfrThreadLocal::thread_id(thread), lost_samples);
+  }
+}
+
+void JfrCPUSamplerThread::start_thread() {
+  if (os::create_thread(this, os::os_thread)) {
+    os::start_thread(this);
+  } else {
+    log_error(jfr)("Failed to create thread for thread sampling");
+  }
+}
+
+void JfrCPUSamplerThread::enroll() {
+  if (Atomic::cmpxchg(&_disenrolled, true, false)) {
+    Atomic::store(&_warned_about_timer_creation_failure, false);
+    initialize_active_signal_handler_counter();
+    log_trace(jfr)("Enrolling CPU thread sampler");
+    _sample.signal();
+    if (!init_timers()) {
+      log_error(jfr)("Failed to initialize timers for CPU thread sampler");
+      disenroll();
+      return;
+    }
+    log_trace(jfr)("Enrolled CPU thread sampler");
+  }
+}
+
+void JfrCPUSamplerThread::disenroll() {
+  if (!Atomic::cmpxchg(&_disenrolled, false, true)) {
+    log_trace(jfr)("Disenrolling CPU thread sampler");
+    if (Atomic::load_acquire(&_signal_handler_installed)) {
+      stop_timer();
+      stop_signal_handlers();
+    }
+    _sample.wait();
+    log_trace(jfr)("Disenrolled CPU thread sampler");
+  }
+}
+
+void JfrCPUSamplerThread::run() {
+  assert(_sampler_thread == nullptr, "invariant");
+  _sampler_thread = this;
+  int64_t last_auto_adapt_check = os::javaTimeNanos();
+  while (true) {
+    if (!_sample.trywait()) {
+      // disenrolled
+      _sample.wait();
+    }
+    _sample.signal();
+
+    if (os::javaTimeNanos() - last_auto_adapt_check > AUTOADAPT_INTERVAL_MS * 1000000) {
+      auto_adapt_period_if_needed();
+      last_auto_adapt_check = os::javaTimeNanos();
+    }
+
+    if (Atomic::cmpxchg(&_is_async_processing_of_cpu_time_jfr_requests_triggered, true, false)) {
+      stackwalk_threads_in_native();
+    }
+    os::naked_sleep(100);
+  }
+}
+
+void JfrCPUSamplerThread::stackwalk_threads_in_native() {
+  ResourceMark rm;
+  // Required to prevent JFR from sampling through an ongoing safepoint
+  MutexLocker tlock(Threads_lock);
+  ThreadsListHandle tlh;
+  Thread* current = Thread::current();
+  for (size_t i = 0; i < tlh.list()->length(); i++) {
+    JavaThread* jt = tlh.list()->thread_at(i);
+    JfrThreadLocal* tl = jt->jfr_thread_local();
+    if (tl->wants_async_processing_of_cpu_time_jfr_requests()) {
+      if (jt->thread_state() != _thread_in_native || !tl->try_acquire_cpu_time_jfr_dequeue_lock()) {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+        continue;
+      }
+      if (jt->has_last_Java_frame()) {
+        JfrThreadSampling::process_cpu_time_request(jt, tl, current, false);
+      } else {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+      }
+      tl->release_cpu_time_jfr_queue_lock();
+    }
+  }
+}
+
+static volatile size_t count = 0;
+
+void JfrCPUTimeThreadSampling::send_empty_event(const JfrTicks &start_time, traceid tid, Tickspan cpu_time_period) {
+  EventCPUTimeSample event(UNTIMED);
+  event.set_failed(true);
+  event.set_starttime(start_time);
+  event.set_eventThread(tid);
+  event.set_stackTrace(0);
+  event.set_samplingPeriod(cpu_time_period);
+  event.set_biased(false);
+  event.commit();
+}
+
+
+static volatile size_t biased_count = 0;
+
+void JfrCPUTimeThreadSampling::send_event(const JfrTicks &start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased) {
+  EventCPUTimeSample event(UNTIMED);
+  event.set_failed(false);
+  event.set_starttime(start_time);
+  event.set_eventThread(tid);
+  event.set_stackTrace(sid);
+  event.set_samplingPeriod(cpu_time_period);
+  event.set_biased(biased);
+  event.commit();
+  Atomic::inc(&count);
+  if (biased) {
+    Atomic::inc(&biased_count);
+  }
+  if (Atomic::load(&count) % 1000 == 0) {
+    log_debug(jfr)("CPU thread sampler sent %zu events, lost %d, biased %zu\n", Atomic::load(&count), Atomic::load(&_lost_samples_sum), Atomic::load(&biased_count));
+  }
+}
+
+void JfrCPUTimeThreadSampling::send_lost_event(const JfrTicks &time, traceid tid, s4 lost_samples) {
+  if (!EventCPUTimeSamplesLost::is_enabled()) {
+    return;
+  }
+  EventCPUTimeSamplesLost event(UNTIMED);
+  event.set_starttime(time);
+  event.set_lostSamples(lost_samples);
+  event.set_eventThread(tid);
+  event.commit();
+}
+
+void JfrCPUSamplerThread::post_run() {
+  this->NonJavaThread::post_run();
+  delete this;
+}
+
+static JfrCPUTimeThreadSampling* _instance = nullptr;
+
+JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
+  return *_instance;
+}
+
+JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
+  assert(_instance == nullptr, "invariant");
+  _instance = new JfrCPUTimeThreadSampling();
+  return _instance;
+}
+
+void JfrCPUTimeThreadSampling::destroy() {
+  if (_instance != nullptr) {
+    delete _instance;
+    _instance = nullptr;
+  }
+}
+
+JfrCPUTimeThreadSampling::JfrCPUTimeThreadSampling() : _sampler(nullptr) {}
+
+JfrCPUTimeThreadSampling::~JfrCPUTimeThreadSampling() {
+  if (_sampler != nullptr) {
+    _sampler->disenroll();
+  }
+}
+
+void JfrCPUTimeThreadSampling::create_sampler(double rate, bool auto_adapt) {
+  assert(_sampler == nullptr, "invariant");
+  _sampler = new JfrCPUSamplerThread(rate, auto_adapt);
+  _sampler->start_thread();
+  _sampler->enroll();
+}
+
+void JfrCPUTimeThreadSampling::update_run_state(double rate, bool auto_adapt) {
+  if (rate != 0) {
+    if (_sampler == nullptr) {
+      create_sampler(rate, auto_adapt);
+    } else {
+      _sampler->set_rate(rate, auto_adapt);
+      _sampler->enroll();
+    }
+    return;
+  }
+  if (_sampler != nullptr) {
+    _sampler->set_rate(rate /* 0 */, auto_adapt);
+    _sampler->disenroll();
+  }
+}
+
+void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
+  assert(rate >= 0, "invariant");
+  if (_instance == nullptr) {
+    return;
+  }
+  instance().set_rate_value(rate, auto_adapt);
+}
+
+void JfrCPUTimeThreadSampling::set_rate_value(double rate, bool auto_adapt) {
+  if (_sampler != nullptr) {
+    _sampler->set_rate(rate, auto_adapt);
+  }
+  update_run_state(rate, auto_adapt);
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread *thread) {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->on_javathread_create(thread);
+  }
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread *thread) {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->on_javathread_terminate(thread);
+  }
+}
+
+void JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests() {
+  if (_instance != nullptr && _instance->_sampler != nullptr) {
+    _instance->_sampler->trigger_async_processing_of_cpu_time_jfr_requests();
+  }
+}
+
+void handle_timer_signal(int signo, siginfo_t* info, void* context) {
+  assert(_instance != nullptr, "invariant");
+  _instance->handle_timer_signal(info, context);
+}
+
+
+void JfrCPUTimeThreadSampling::handle_timer_signal(siginfo_t* info, void* context) {
+  if (info->si_code != SI_TIMER) {
+    // not the signal we are interested in
+    return;
+  }
+  assert(_sampler != nullptr, "invariant");
+
+  if (!_sampler->increment_signal_handler_count()) {
+    return;
+  }
+  _sampler->handle_timer_signal(info, context);
+  _sampler->decrement_signal_handler_count();
+}
+
+void JfrCPUSamplerThread::sample_thread(JfrSampleRequest& request, void* ucontext, JavaThread* jt, JfrThreadLocal* tl, JfrTicks& now) {
+  JfrSampleRequestBuilder::build_cpu_time_sample_request(request, ucontext, jt, jt->jfr_thread_local(), now);
+}
+
+static bool check_state(JavaThread* thread) {
+  switch (thread->thread_state()) {
+    case _thread_in_Java:
+    case _thread_in_native:
+      return true;
+    default:
+      return false;
+  }
+}
+
+void JfrCPUSamplerThread::handle_timer_signal(siginfo_t* info, void* context) {
+  JfrTicks now = JfrTicks::now();
+  JavaThread* jt = get_java_thread_if_valid();
+  if (jt == nullptr) {
+    return;
+  }
+  JfrThreadLocal* tl = jt->jfr_thread_local();
+  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
+  if (!check_state(jt)) {
+    queue.increment_lost_samples();
+    return;
+  }
+  if (!tl->try_acquire_cpu_time_jfr_enqueue_lock()) {
+    queue.increment_lost_samples();
+    return;
+  }
+
+  JfrCPUTimeSampleRequest request;
+  // the sampling period might be too low for the current Linux configuration
+  // so samples might be skipped and we have to compute the actual period
+  int64_t period = get_sampling_period() * (info->si_overrun + 1);
+  request._cpu_time_period = Ticks(period / 1000000000.0 * JfrTime::frequency()) - Ticks(0);
+  sample_thread(request._request, context, jt, tl, now);
+
+  if (queue.enqueue(request)) {
+    if (queue.size() == 1) {
+      tl->set_has_cpu_time_jfr_requests(true);
+      SafepointMechanism::arm_local_poll_release(jt);
+    }
+  } else {
+    queue.increment_lost_samples();
+  }
+
+  if (jt->thread_state() == _thread_in_native) {
+      if (!tl->wants_async_processing_of_cpu_time_jfr_requests()) {
+        tl->set_do_async_processing_of_cpu_time_jfr_requests(true);
+        JfrCPUTimeThreadSampling::trigger_async_processing_of_cpu_time_jfr_requests();
+      }
+  } else {
+    tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+  }
+
+  tl->release_cpu_time_jfr_queue_lock();
+}
+
+static const int SIG = SIGPROF;
+
+static void set_timer_time(timer_t timerid, int64_t period_nanos) {
+  struct itimerspec its;
+  if (period_nanos == 0) {
+    its.it_interval.tv_sec = 0;
+    its.it_interval.tv_nsec = 0;
+  } else {
+    its.it_interval.tv_sec = period_nanos / NANOSECS_PER_SEC;
+    its.it_interval.tv_nsec = period_nanos % NANOSECS_PER_SEC;
+  }
+  its.it_value = its.it_interval;
+  if (timer_settime(timerid, 0, &its, nullptr) == -1) {
+    warning("Failed to set timer for thread sampling: %s", os::strerror(os::get_last_error()));
+  }
+}
+
+bool JfrCPUSamplerThread::create_timer_for_thread(JavaThread* thread, timer_t& timerid) {
+  struct sigevent sev;
+  sev.sigev_notify = SIGEV_THREAD_ID;
+  sev.sigev_signo = SIG;
+  sev.sigev_value.sival_ptr = nullptr;
+  ((int*)&sev.sigev_notify)[1] = thread->osthread()->thread_id();
+  clockid_t clock;
+  int err = pthread_getcpuclockid(thread->osthread()->pthread_id(), &clock);
+  if (err != 0) {
+    log_error(jfr)("Failed to get clock for thread sampling: %s", os::strerror(err));
+    return false;
+  }
+  if (timer_create(clock, &sev, &timerid) < 0) {
+    return false;
+  }
+  int64_t period = get_sampling_period();
+  if (period != 0) {
+    set_timer_time(timerid, period);
+  }
+  return true;
+}
+
+
+void JfrCPUSamplerThread::stop_signal_handlers() {
+  // set the stop signal bit
+  Atomic::or_then_fetch(&_active_signal_handlers, STOP_SIGNAL_BIT, memory_order_acq_rel);
+  while (Atomic::load_acquire(&_active_signal_handlers) > STOP_SIGNAL_BIT) {
+    // wait for all signal handlers to finish
+    os::naked_short_nanosleep(1000);
+  }
+}
+
+// returns false if the stop signal bit was set, true otherwise
+bool JfrCPUSamplerThread::increment_signal_handler_count() {
+  // increment the count of active signal handlers
+  u4 old_value = Atomic::fetch_then_add(&_active_signal_handlers, (u4)1, memory_order_acq_rel);
+  if ((old_value & STOP_SIGNAL_BIT) != 0) {
+    // if the stop signal bit was set, we are not allowed to increment
+    Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
+    return false;
+  }
+  return true;
+}
+
+void JfrCPUSamplerThread::decrement_signal_handler_count() {
+  Atomic::dec(&_active_signal_handlers, memory_order_acq_rel);
+}
+
+void JfrCPUSamplerThread::initialize_active_signal_handler_counter() {
+  Atomic::release_store(&_active_signal_handlers, (u4)0);
+}
+
+class VM_JFRInitializeCPUTimeSampler : public VM_Operation {
+ private:
+  JfrCPUSamplerThread* const _sampler;
+
+ public:
+  VM_JFRInitializeCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
+
+  VMOp_Type type() const { return VMOp_JFRInitializeCPUTimeSampler; }
+  void doit() {
+    JfrJavaThreadIterator iter;
+    while (iter.has_next()) {
+      _sampler->on_javathread_create(iter.next());
+    }
+  };
+};
+
+bool JfrCPUSamplerThread::init_timers() {
+  // install sig handler for sig
+  void* prev_handler = PosixSignals::get_signal_handler_for_signal(SIG);
+  if ((prev_handler != SIG_DFL && prev_handler != SIG_IGN && prev_handler != (void*)::handle_timer_signal) ||
+      PosixSignals::install_generic_signal_handler(SIG, (void*)::handle_timer_signal) == (void*)-1) {
+    log_error(jfr)("Conflicting SIGPROF handler found: %p. CPUTimeSample events will not be recorded", prev_handler);
+    return false;
+  }
+  Atomic::release_store(&_signal_handler_installed, true);
+  VM_JFRInitializeCPUTimeSampler op(this);
+  VMThread::execute(&op);
+  return true;
+}
+
+class VM_JFRTerminateCPUTimeSampler : public VM_Operation {
+ private:
+  JfrCPUSamplerThread* const _sampler;
+
+ public:
+  VM_JFRTerminateCPUTimeSampler(JfrCPUSamplerThread* sampler) : _sampler(sampler) {}
+
+  VMOp_Type type() const { return VMOp_JFRTerminateCPUTimeSampler; }
+  void doit() {
+    JfrJavaThreadIterator iter;
+    while (iter.has_next()) {
+      JavaThread *thread = iter.next();
+      JfrThreadLocal* tl = thread->jfr_thread_local();
+      timer_t* timer = tl->cpu_timer();
+      if (timer == nullptr) {
+        continue;
+      }
+      tl->deallocate_cpu_time_jfr_queue();
+      tl->unset_cpu_timer();
+    }
+  };
+};
+
+void JfrCPUSamplerThread::stop_timer() {
+  VM_JFRTerminateCPUTimeSampler op(this);
+  VMThread::execute(&op);
+}
+
+void JfrCPUSamplerThread::auto_adapt_period_if_needed() {
+  int64_t current_period = get_sampling_period();
+  if (_auto_adapt || current_period == -1) {
+    int64_t period = compute_sampling_period(_rate);
+    if (period != current_period) {
+      Atomic::store(&_current_sampling_period_ns, period);
+      update_all_thread_timers();
+    }
+  }
+}
+
+void JfrCPUSamplerThread::set_rate(double rate, bool auto_adapt) {
+  _rate = rate;
+  _auto_adapt = auto_adapt;
+  if (_rate > 0 && Atomic::load_acquire(&_disenrolled) == false) {
+    auto_adapt_period_if_needed();
+  } else {
+    Atomic::store(&_current_sampling_period_ns, compute_sampling_period(rate));
+  }
+}
+
+void JfrCPUSamplerThread::update_all_thread_timers() {
+  int64_t period_millis = get_sampling_period();
+  ThreadsListHandle tlh;
+  for (size_t i = 0; i < tlh.length(); i++) {
+    JavaThread* thread = tlh.thread_at(i);
+    JfrThreadLocal* tl = thread->jfr_thread_local();
+    assert(tl != nullptr, "invariant");
+    timer_t* timer = tl->cpu_timer();
+    if (timer != nullptr) {
+      set_timer_time(*timer, period_millis);
+    }
+  }
+}
+
+#else
+
+static void warn() {
+  static bool displayed_warning = false;
+  if (!displayed_warning) {
+    warning("CPU time method sampling not supported in JFR on your platform");
+    displayed_warning = true;
+  }
+}
+
+static JfrCPUTimeThreadSampling* _instance = nullptr;
+
+JfrCPUTimeThreadSampling& JfrCPUTimeThreadSampling::instance() {
+  return *_instance;
+}
+
+JfrCPUTimeThreadSampling* JfrCPUTimeThreadSampling::create() {
+  _instance = new JfrCPUTimeThreadSampling();
+  return _instance;
+}
+
+void JfrCPUTimeThreadSampling::destroy() {
+  delete _instance;
+  _instance = nullptr;
+}
+
+void JfrCPUTimeThreadSampling::set_rate(double rate, bool auto_adapt) {
+  if (rate != 0) {
+    warn();
+  }
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_create(JavaThread* thread) {
+}
+
+void JfrCPUTimeThreadSampling::on_javathread_terminate(JavaThread* thread) {
+}
+
+#endif // defined(LINUX) && defined(INCLUDE_JFR)
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
new file mode 100644
index 00000000000..7c0545f4772
--- /dev/null
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
+
+#include "jfr/utilities/jfrAllocation.hpp"
+
+class JavaThread;
+
+#if defined(LINUX)
+
+#include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrTypes.hpp"
+
+struct JfrCPUTimeSampleRequest {
+  JfrSampleRequest _request;
+  Tickspan _cpu_time_period;
+
+  JfrCPUTimeSampleRequest() {}
+};
+
+// Fixed size async-signal-safe SPSC linear queue backed by an array.
+// Designed to be only used under lock and read linearly
+class JfrCPUTimeTraceQueue {
+
+  // the default queue capacity, scaled if the sampling period is smaller than 10ms
+  // when the thread is started
+  static const u4 CPU_TIME_QUEUE_CAPACITY = 500;
+
+  JfrCPUTimeSampleRequest* _data;
+  u4 _capacity;
+  // next unfilled index
+  volatile u4 _head;
+
+  volatile u4 _lost_samples;
+
+public:
+  JfrCPUTimeTraceQueue(u4 capacity);
+
+  ~JfrCPUTimeTraceQueue();
+
+  // signal safe, but can't be interleaved with dequeue
+  bool enqueue(JfrCPUTimeSampleRequest& trace);
+
+  JfrCPUTimeSampleRequest& at(u4 index);
+
+  u4 size() const;
+
+  void set_size(u4 size);
+
+  u4 capacity() const;
+
+  // deletes all samples in the queue
+  void set_capacity(u4 capacity);
+
+  bool is_empty() const;
+
+  u4 lost_samples() const;
+
+  void increment_lost_samples();
+
+  // returns the previous lost samples count
+  u4 get_and_reset_lost_samples();
+
+  void resize(u4 capacity);
+
+  void resize_for_period(u4 period_millis);
+
+  void clear();
+
+};
+
+
+class JfrCPUSamplerThread;
+
+class JfrCPUTimeThreadSampling : public JfrCHeapObj {
+  friend class JfrRecorder;
+ private:
+
+  JfrCPUSamplerThread* _sampler;
+
+  void create_sampler(double rate, bool auto_adapt);
+  void set_rate_value(double rate, bool auto_adapt);
+
+  JfrCPUTimeThreadSampling();
+  ~JfrCPUTimeThreadSampling();
+
+  static JfrCPUTimeThreadSampling& instance();
+  static JfrCPUTimeThreadSampling* create();
+  static void destroy();
+
+  void update_run_state(double rate, bool auto_adapt);
+
+ public:
+  static void set_rate(double rate, bool auto_adapt);
+
+  static void on_javathread_create(JavaThread* thread);
+  static void on_javathread_terminate(JavaThread* thread);
+  void handle_timer_signal(siginfo_t* info, void* context);
+
+  static void send_empty_event(const JfrTicks& start_time, traceid tid, Tickspan cpu_time_period);
+  static void send_event(const JfrTicks& start_time, traceid sid, traceid tid, Tickspan cpu_time_period, bool biased);
+  static void send_lost_event(const JfrTicks& time, traceid tid, s4 lost_samples);
+
+  static void trigger_async_processing_of_cpu_time_jfr_requests();
+};
+
+#else
+
+// a basic implementation on other platforms that
+// emits warnings
+
+class JfrCPUTimeThreadSampling : public JfrCHeapObj {
+  friend class JfrRecorder;
+private:
+  static JfrCPUTimeThreadSampling& instance();
+  static JfrCPUTimeThreadSampling* create();
+  static void destroy();
+
+ public:
+  static void set_rate(double rate, bool auto_adapt);
+
+  static void on_javathread_create(JavaThread* thread);
+  static void on_javathread_terminate(JavaThread* thread);
+};
+
+#endif // defined(LINUX)
+
+
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCPUTIMETHREADSAMPLER_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
index f8e63e2e344..7049df0198b 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
@@ -24,6 +24,7 @@
 #include "asm/codeBuffer.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
+#include "jfr/utilities/jfrTime.hpp"
 #include "runtime/continuationEntry.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
@@ -171,7 +172,7 @@ static bool build(JfrSampleRequest& request, intptr_t* fp, JavaThread* jt) {
   assert(request._sample_sp != nullptr, "invariant");
   assert(request._sample_pc != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
-  assert(jt->thread_state() == _thread_in_Java, "invariant");
+  assert(jt->thread_state() == _thread_in_Java || jt->thread_state() == _thread_in_native, "invariant");
 
   // 1. Interpreter frame?
   if (is_interpreter(request)) {
@@ -303,3 +304,33 @@ JfrSampleResult JfrSampleRequestBuilder::build_java_sample_request(const void* u
   }
   return set_biased_java_sample(request, tl, jt);
 }
+
+
+// A biased sample request is denoted by an empty bcp and an empty pc.
+static inline void set_cpu_time_biased_sample(JfrSampleRequest& request, JavaThread* jt) {
+  if (request._sample_bcp != nullptr) {
+    request._sample_bcp = nullptr;
+  }
+  assert(request._sample_bcp == nullptr, "invariant");
+  request._sample_pc = nullptr;
+}
+
+void JfrSampleRequestBuilder::build_cpu_time_sample_request(JfrSampleRequest& request,
+                                                            void* ucontext,
+                                                            JavaThread* jt,
+                                                            JfrThreadLocal* tl,
+                                                            JfrTicks& now) {
+  assert(jt != nullptr, "invariant");
+  request._sample_ticks = now;
+
+  // Prioritize the ljf, if one exists.
+  request._sample_sp = jt->last_Java_sp();
+  if (request._sample_sp == nullptr || !build_from_ljf(request, tl, jt)) {
+    intptr_t* fp;
+    request._sample_pc = os::fetch_frame_from_context(ucontext, reinterpret_cast<intptr_t**>(&request._sample_sp), &fp);
+    assert(sp_in_stack(request, jt), "invariant");
+    if (!build(request, fp, jt)) {
+      set_cpu_time_biased_sample(request, jt);
+    }
+  }
+}
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
index 6567e7f8bff..20e737e0cbf 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.hpp
@@ -81,6 +81,11 @@ class JfrSampleRequestBuilder : AllStatic {
   static JfrSampleResult build_java_sample_request(const void* ucontext,
                                                    JfrThreadLocal* tl,
                                                    JavaThread* jt);
+  static void build_cpu_time_sample_request(JfrSampleRequest &request,
+                                            void* ucontext,
+                                            JavaThread* jt,
+                                            JfrThreadLocal* tl,
+                                            JfrTicks& now);
 };
 
 #endif // SHARE_JFR_PERIODIC_SAMPLING_JFRSAMPLEREQUEST_HPP
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index aa72c29cf50..ddc9d59b295 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -28,6 +28,7 @@
 #include "code/nmethod.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrSampleMonitor.hpp"
 #include "jfr/periodic/sampling/jfrSampleRequest.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampling.hpp"
@@ -161,7 +162,7 @@ static inline bool is_valid(const PcDesc* pc_desc) {
   return pc_desc != nullptr && pc_desc->scope_decode_offset() != DebugInformationRecorder::serialized_null;
 }
 
-static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt) {
+static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame, bool& in_continuation, JavaThread* jt, bool& biased) {
   assert(jt != nullptr, "invariant");
 
   if (!jt->has_last_Java_frame()) {
@@ -178,6 +179,7 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
     // A biased sample is requested or no code blob.
     top_frame = jt->last_frame();
     in_continuation = is_in_continuation(top_frame, jt);
+    biased = true;
     return true;
   }
 
@@ -227,6 +229,8 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
 
   assert(!stream.current()->is_safepoint_blob_frame(), "invariant");
 
+  biased = true;
+
   // Search the first frame that is above the sampled sp.
   for (; !stream.is_done(); stream.next()) {
     frame* const current = stream.current();
@@ -250,6 +254,7 @@ static bool compute_top_frame(const JfrSampleRequest& request, frame& top_frame,
         const PcDesc* const pc_desc = get_pc_desc(sampled_nm, sampled_pc);
         if (is_valid(pc_desc)) {
           current->adjust_pc(pc_desc->real_pc(sampled_nm));
+          biased = false;
         }
       }
     }
@@ -270,8 +275,9 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   assert(current != nullptr, "invariant");
 
   frame top_frame;
+  bool biased = false;
   bool in_continuation;
-  if (!compute_top_frame(request, top_frame, in_continuation, jt)) {
+  if (!compute_top_frame(request, top_frame, in_continuation, jt, biased)) {
     return;
   }
 
@@ -293,6 +299,42 @@ static void record_thread_in_java(const JfrSampleRequest& request, const JfrTick
   }
 }
 
+#ifdef LINUX
+static void record_cpu_time_thread(const JfrCPUTimeSampleRequest& request, const JfrTicks& now, const JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(jt != nullptr, "invariant");
+  assert(tl != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+  frame top_frame;
+  bool biased = false;
+  bool in_continuation = false;
+  bool could_compute_top_frame = compute_top_frame(request._request, top_frame, in_continuation, jt, biased);
+  const traceid tid = in_continuation ? tl->vthread_id_with_epoch_update(jt) : JfrThreadLocal::jvm_thread_id(jt);
+
+  if (!could_compute_top_frame) {
+    JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
+    return;
+  }
+  traceid sid;
+  {
+    ResourceMark rm(current);
+    JfrStackTrace stacktrace;
+    if (!stacktrace.record(jt, top_frame, in_continuation, request._request)) {
+      // Unable to record stacktrace. Fail.
+      JfrCPUTimeThreadSampling::send_empty_event(request._request._sample_ticks, tid, request._cpu_time_period);
+      return;
+    }
+    sid = JfrStackTraceRepository::add(stacktrace);
+  }
+  assert(sid != 0, "invariant");
+
+
+  JfrCPUTimeThreadSampling::send_event(request._request._sample_ticks, sid, tid, request._cpu_time_period, biased);
+  if (current == jt) {
+    send_safepoint_latency_event(request._request, now, sid, jt);
+  }
+}
+#endif
+
 static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
   assert(tl != nullptr, "invariant");
   assert(jt != nullptr, "invariant");
@@ -308,6 +350,49 @@ static void drain_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, Jav
   assert(!tl->has_enqueued_requests(), "invariant");
 }
 
+static void drain_enqueued_cpu_time_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current, bool lock) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+#ifdef LINUX
+  tl->set_do_async_processing_of_cpu_time_jfr_requests(false);
+  if (lock) {
+    tl->acquire_cpu_time_jfr_dequeue_lock();
+  }
+  JfrCPUTimeTraceQueue& queue = tl->cpu_time_jfr_queue();
+  for (u4 i = 0; i < queue.size(); i++) {
+    record_cpu_time_thread(queue.at(i), now, tl, jt, current);
+  }
+  queue.clear();
+  assert(queue.is_empty(), "invariant");
+  tl->set_has_cpu_time_jfr_requests(false);
+  if (queue.lost_samples() > 0) {
+    JfrCPUTimeThreadSampling::send_lost_event( now, JfrThreadLocal::thread_id(jt), queue.get_and_reset_lost_samples());
+  }
+  if (lock) {
+    tl->release_cpu_time_jfr_queue_lock();
+  }
+#endif
+}
+
+// Entry point for a thread that has been sampled in native code and has a pending JFR CPU time request.
+void JfrThreadSampling::process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock) {
+  assert(jt != nullptr, "invariant");
+
+  const JfrTicks now = JfrTicks::now();
+  drain_enqueued_cpu_time_requests(now, tl, jt, current, lock);
+}
+
+static void drain_all_enqueued_requests(const JfrTicks& now, JfrThreadLocal* tl, JavaThread* jt, Thread* current) {
+  assert(tl != nullptr, "invariant");
+  assert(jt != nullptr, "invariant");
+  assert(current != nullptr, "invariant");
+  drain_enqueued_requests(now, tl, jt, current);
+  if (tl->has_cpu_time_jfr_requests()) {
+    drain_enqueued_cpu_time_requests(now, tl, jt, current, true);
+  }
+}
+
 // Only entered by the JfrSampler thread.
 bool JfrThreadSampling::process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread) {
   assert(tl != nullptr, "invairant");
@@ -382,5 +467,6 @@ void JfrThreadSampling::process_sample_request(JavaThread* jt) {
       break;
     }
   }
-  drain_enqueued_requests(now, tl, jt, jt);
+  drain_all_enqueued_requests(now, tl, jt, jt);
 }
+
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
index d4c4bc0d873..3c4d1a126b0 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.hpp
@@ -33,8 +33,10 @@ class Thread;
 
 class JfrThreadSampling : AllStatic {
   friend class JfrSamplerThread;
+  friend class JfrCPUSamplerThread;
  private:
   static bool process_native_sample_request(JfrThreadLocal* tl, JavaThread* jt, Thread* sampler_thread);
+  static void process_cpu_time_request(JavaThread* jt, JfrThreadLocal* tl, Thread* current, bool lock);
  public:
   static void process_sample_request(JavaThread* jt);
 };
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index 384305862ca..dd75cb2929f 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -29,6 +29,7 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/sampling/objectSampler.hpp"
 #include "jfr/periodic/jfrOSInterface.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
@@ -304,6 +305,9 @@ bool JfrRecorder::create_components() {
   if (!create_thread_sampler()) {
     return false;
   }
+  if (!create_cpu_time_thread_sampling()) {
+    return false;
+  }
   if (!create_event_throttler()) {
     return false;
   }
@@ -318,6 +322,7 @@ static JfrStackTraceRepository* _stack_trace_repository;
 static JfrStringPool* _stringpool = nullptr;
 static JfrOSInterface* _os_interface = nullptr;
 static JfrThreadSampler* _thread_sampler = nullptr;
+static JfrCPUTimeThreadSampling* _cpu_time_thread_sampling = nullptr;
 static JfrCheckpointManager* _checkpoint_manager = nullptr;
 
 bool JfrRecorder::create_java_event_writer() {
@@ -390,6 +395,12 @@ bool JfrRecorder::create_thread_sampler() {
   return _thread_sampler != nullptr;
 }
 
+bool JfrRecorder::create_cpu_time_thread_sampling() {
+  assert(_cpu_time_thread_sampling == nullptr, "invariant");
+  _cpu_time_thread_sampling = JfrCPUTimeThreadSampling::create();
+  return _cpu_time_thread_sampling != nullptr;
+}
+
 bool JfrRecorder::create_event_throttler() {
   return JfrEventThrottler::create();
 }
@@ -428,6 +439,10 @@ void JfrRecorder::destroy_components() {
     JfrThreadSampler::destroy();
     _thread_sampler = nullptr;
   }
+  if (_cpu_time_thread_sampling != nullptr) {
+    JfrCPUTimeThreadSampling::destroy();
+    _cpu_time_thread_sampling = nullptr;
+  }
   JfrEventThrottler::destroy();
 }
 
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index b917904c5fb..3099c8ad344 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -54,6 +54,7 @@ class JfrRecorder : public JfrCHeapObj {
   static bool create_storage();
   static bool create_stringpool();
   static bool create_thread_sampler();
+  static bool create_cpu_time_thread_sampling();
   static bool create_event_throttler();
   static bool create_components();
   static void destroy_components();
diff --git a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
index 0befaae7751..f660a01c04c 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrEventThrottler.cpp
@@ -34,6 +34,7 @@ constexpr static const JfrSamplerParams _disabled_params = {
                                                              false // reconfigure
                                                            };
 
+static JfrEventThrottler* _disabled_cpu_time_sample_throttler = nullptr;
 static JfrEventThrottler* _object_allocation_throttler = nullptr;
 static JfrEventThrottler* _safepoint_latency_throttler = nullptr;
 
@@ -48,6 +49,9 @@ JfrEventThrottler::JfrEventThrottler(JfrEventId event_id) :
   _update(false) {}
 
 bool JfrEventThrottler::create() {
+  assert(_disabled_cpu_time_sample_throttler == nullptr, "invariant");
+  _disabled_cpu_time_sample_throttler = new JfrEventThrottler(JfrCPUTimeSampleEvent);
+  _disabled_cpu_time_sample_throttler->_disabled = true;
   assert(_object_allocation_throttler == nullptr, "invariant");
   _object_allocation_throttler = new JfrEventThrottler(JfrObjectAllocationSampleEvent);
   if (_object_allocation_throttler == nullptr || !_object_allocation_throttler->initialize()) {
@@ -59,6 +63,8 @@ bool JfrEventThrottler::create() {
 }
 
 void JfrEventThrottler::destroy() {
+  delete _disabled_cpu_time_sample_throttler;
+  _disabled_cpu_time_sample_throttler = nullptr;
   delete _object_allocation_throttler;
   _object_allocation_throttler = nullptr;
   delete _safepoint_latency_throttler;
@@ -69,15 +75,19 @@ void JfrEventThrottler::destroy() {
 // and another for the SamplingLatency event.
 // When introducing many more throttlers, consider adding a lookup map keyed by event id.
 JfrEventThrottler* JfrEventThrottler::for_event(JfrEventId event_id) {
+  assert(_disabled_cpu_time_sample_throttler != nullptr, "Disabled CPU time throttler has not been properly initialized");
   assert(_object_allocation_throttler != nullptr, "ObjectAllocation throttler has not been properly initialized");
   assert(_safepoint_latency_throttler != nullptr, "SafepointLatency throttler has not been properly initialized");
-  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent, "Event type has an unconfigured throttler");
+  assert(event_id == JfrObjectAllocationSampleEvent || event_id == JfrSafepointLatencyEvent || event_id == JfrCPUTimeSampleEvent, "Event type has an unconfigured throttler");
   if (event_id == JfrObjectAllocationSampleEvent) {
     return _object_allocation_throttler;
   }
   if (event_id == JfrSafepointLatencyEvent) {
     return _safepoint_latency_throttler;
   }
+  if (event_id == JfrCPUTimeSampleEvent) {
+    return _disabled_cpu_time_sample_throttler;
+  }
   return nullptr;
 }
 
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 503aa85e02f..4b805a98a32 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -26,6 +26,7 @@
 #include "jfr/jni/jfrJavaSupport.hpp"
 #include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
 #include "jfr/periodic/jfrThreadCPULoadEvent.hpp"
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrOopTraceId.inline.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
@@ -78,7 +79,15 @@ JfrThreadLocal::JfrThreadLocal() :
   _enqueued_requests(false),
   _vthread(false),
   _notified(false),
-  _dead(false) {
+  _dead(false)
+#ifdef LINUX
+  ,_cpu_timer(nullptr),
+  _cpu_time_jfr_locked(UNLOCKED),
+  _has_cpu_time_jfr_requests(false),
+  _cpu_time_jfr_queue(0),
+  _do_async_processing_of_cpu_time_jfr_requests(false)
+#endif
+  {
   Thread* thread = Thread::current_or_null();
   _parent_trace_id = thread != nullptr ? jvm_thread_id(thread) : (traceid)0;
 }
@@ -129,7 +138,9 @@ void JfrThreadLocal::on_start(Thread* t) {
   if (JfrRecorder::is_recording()) {
     JfrCheckpointManager::write_checkpoint(t);
     if (t->is_Java_thread()) {
-      send_java_thread_start_event(JavaThread::cast(t));
+      JavaThread *const jt = JavaThread::cast(t);
+      JfrCPUTimeThreadSampling::on_javathread_create(jt);
+      send_java_thread_start_event(jt);
     }
   }
   if (t->jfr_thread_local()->has_cached_stack_trace()) {
@@ -221,6 +232,7 @@ void JfrThreadLocal::on_exit(Thread* t) {
   if (t->is_Java_thread()) {
     JavaThread* const jt = JavaThread::cast(t);
     send_java_thread_end_event(jt, JfrThreadLocal::jvm_thread_id(jt));
+    JfrCPUTimeThreadSampling::on_javathread_terminate(jt);
     JfrThreadCPULoadEvent::send_event_for_thread(jt);
   }
   release(tl, Thread::current()); // because it could be that Thread::current() != t
@@ -537,3 +549,85 @@ Arena* JfrThreadLocal::dcmd_arena(JavaThread* jt) {
   tl->_dcmd_arena = arena;
   return arena;
 }
+
+
+#ifdef LINUX
+
+void JfrThreadLocal::set_cpu_timer(timer_t* timer) {
+  if (_cpu_timer == nullptr) {
+    _cpu_timer = JfrCHeapObj::new_array<timer_t>(1);
+  }
+  *_cpu_timer = *timer;
+}
+
+void JfrThreadLocal::unset_cpu_timer() {
+  if (_cpu_timer != nullptr) {
+    timer_delete(*_cpu_timer);
+    JfrCHeapObj::free(_cpu_timer, sizeof(timer_t));
+    _cpu_timer = nullptr;
+  }
+}
+
+timer_t* JfrThreadLocal::cpu_timer() const {
+  return _cpu_timer;
+}
+
+bool JfrThreadLocal::is_cpu_time_jfr_enqueue_locked() {
+  return Atomic::load_acquire(&_cpu_time_jfr_locked) == ENQUEUE;
+}
+
+bool JfrThreadLocal::is_cpu_time_jfr_dequeue_locked() {
+  return Atomic::load_acquire(&_cpu_time_jfr_locked) == DEQUEUE;
+}
+
+bool JfrThreadLocal::try_acquire_cpu_time_jfr_enqueue_lock() {
+  return Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, ENQUEUE) == UNLOCKED;
+}
+
+bool JfrThreadLocal::try_acquire_cpu_time_jfr_dequeue_lock() {
+  CPUTimeLockState got;
+  while (true)  {
+    CPUTimeLockState got = Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE);
+    if (got == UNLOCKED) {
+      return true; // successfully locked for dequeue
+    }
+    if (got == DEQUEUE) {
+      return false; // already locked for dequeue
+    }
+    // else wait for the lock to be released from a signal handler
+  }
+}
+
+void JfrThreadLocal::acquire_cpu_time_jfr_dequeue_lock() {
+  while (Atomic::cmpxchg(&_cpu_time_jfr_locked, UNLOCKED, DEQUEUE) != UNLOCKED);
+}
+
+void JfrThreadLocal::release_cpu_time_jfr_queue_lock() {
+  Atomic::release_store(&_cpu_time_jfr_locked, UNLOCKED);
+}
+
+void JfrThreadLocal::set_has_cpu_time_jfr_requests(bool has_requests) {
+  Atomic::release_store(&_has_cpu_time_jfr_requests, has_requests);
+}
+
+bool JfrThreadLocal::has_cpu_time_jfr_requests() {
+  return Atomic::load_acquire(&_has_cpu_time_jfr_requests);
+}
+
+JfrCPUTimeTraceQueue& JfrThreadLocal::cpu_time_jfr_queue() {
+  return _cpu_time_jfr_queue;
+}
+
+void JfrThreadLocal::deallocate_cpu_time_jfr_queue() {
+  cpu_time_jfr_queue().resize(0);
+}
+
+void JfrThreadLocal::set_do_async_processing_of_cpu_time_jfr_requests(bool wants) {
+  Atomic::release_store(&_do_async_processing_of_cpu_time_jfr_requests, wants);
+}
+
+bool JfrThreadLocal::wants_async_processing_of_cpu_time_jfr_requests() {
+  return Atomic::load_acquire(&_do_async_processing_of_cpu_time_jfr_requests);
+}
+
+#endif
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index 8e545d9c429..715a2c44f93 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -33,6 +33,10 @@
 #include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 
+#ifdef LINUX
+#include "jfr/periodic/sampling/jfrCPUTimeThreadSampler.hpp"
+#endif
+
 class Arena;
 class JavaThread;
 class JfrBuffer;
@@ -79,6 +83,22 @@ class JfrThreadLocal {
   bool _dead;
   bool _sampling_critical_section;
 
+#ifdef LINUX
+  timer_t* _cpu_timer;
+
+  enum CPUTimeLockState {
+    UNLOCKED,
+    // locked for enqueuing
+    ENQUEUE,
+    // locked for dequeuing
+    DEQUEUE
+  };
+  volatile CPUTimeLockState _cpu_time_jfr_locked;
+  volatile bool _has_cpu_time_jfr_requests;
+  JfrCPUTimeTraceQueue _cpu_time_jfr_queue;
+  volatile bool _do_async_processing_of_cpu_time_jfr_requests;
+#endif
+
   JfrBuffer* install_native_buffer() const;
   JfrBuffer* install_java_buffer() const;
   void release(Thread* t);
@@ -342,6 +362,39 @@ class JfrThreadLocal {
   void set_thread_blob(const JfrBlobHandle& handle);
   const JfrBlobHandle& thread_blob() const;
 
+  // CPU time sampling
+#ifdef LINUX
+  void set_cpu_timer(timer_t* timer);
+  void unset_cpu_timer();
+  timer_t* cpu_timer() const;
+
+  // The CPU time JFR lock has three different states:
+  // - ENQUEUE: lock for enqueuing CPU time requests
+  // - DEQUEUE: lock for dequeuing CPU time requests
+  // - UNLOCKED: no lock held
+  // This ensures that we can safely enqueue and dequeue CPU time requests,
+  // without interleaving
+
+  bool is_cpu_time_jfr_enqueue_locked();
+  bool is_cpu_time_jfr_dequeue_locked();
+
+  bool try_acquire_cpu_time_jfr_enqueue_lock();
+  bool try_acquire_cpu_time_jfr_dequeue_lock();
+  void acquire_cpu_time_jfr_dequeue_lock();
+  void release_cpu_time_jfr_queue_lock();
+
+  void set_has_cpu_time_jfr_requests(bool has_events);
+  bool has_cpu_time_jfr_requests();
+
+  JfrCPUTimeTraceQueue& cpu_time_jfr_queue();
+  void deallocate_cpu_time_jfr_queue();
+
+  void set_do_async_processing_of_cpu_time_jfr_requests(bool wants);
+  bool wants_async_processing_of_cpu_time_jfr_requests();
+#else
+  bool has_cpu_time_jfr_requests() { return false; }
+#endif
+
   // Hooks
   static void on_start(Thread* t);
   static void on_exit(Thread* t);
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index f3a06d5efd2..772ef7bbe82 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -78,6 +78,7 @@ class JavaThread;
 //       - WorkerThread
 //     - WatcherThread
 //     - JfrThreadSampler
+//     - JfrCPUSamplerThread
 //     - LogAsyncWriter
 //
 // All Thread subclasses must be either JavaThread or NonJavaThread.
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 50d85944485..ac5d37381f9 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -115,6 +115,8 @@
   template(JFROldObject)                          \
   template(JvmtiPostObjectFree)                   \
   template(RendezvousGCThreads)                   \
+  template(JFRInitializeCPUTimeSampler)       \
+  template(JFRTerminateCPUTimeSampler)        \
   template(ReinitializeMDO)
 
 class Thread;
diff --git a/src/hotspot/share/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp
index 8d2bbc7ce1f..88dc9a787f9 100644
--- a/src/hotspot/share/utilities/ticks.hpp
+++ b/src/hotspot/share/utilities/ticks.hpp
@@ -236,6 +236,7 @@ class TimeInstant : public Rep<TimeSource> {
   friend class TimePartitionsTest;
   friend class GCTimerTest;
   friend class CompilerEvent;
+  friend class JfrCPUSamplerThread;
 };
 
 #if INCLUDE_JFR
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index f43e45b724e..2ea4725abc8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -51,6 +51,7 @@
 import jdk.jfr.internal.settings.LevelSetting;
 import jdk.jfr.internal.settings.MethodSetting;
 import jdk.jfr.internal.settings.PeriodSetting;
+import jdk.jfr.internal.settings.CPUThrottleSetting;
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 import jdk.jfr.internal.settings.ThrottleSetting;
@@ -326,6 +327,9 @@ private static Control defineCutoff(PlatformEventType type) {
     private static Control defineThrottle(PlatformEventType type) {
         String def = type.getAnnotationValue(Throttle.class, ThrottleSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
+        if (type.getName().equals("jdk.CPUTimeSample")) {
+            return new Control(new CPUThrottleSetting(type), def);
+        }
         return new Control(new ThrottleSetting(type, def), def);
     }
 
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 e0eaef74b4c..b91f0c337b2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -270,6 +270,16 @@ public final class JVM {
      */
     public static native void setMethodSamplingPeriod(long type, long periodMillis);
 
+    /**
+     * Set the maximum event emission rate for the CPU time sampler
+     *
+     * Setting rate to 0 turns off the CPU time sampler.
+     *
+     * @param rate the new rate in events per second
+     * @param autoAdapt true if the rate should be adapted automatically
+     */
+    public static native void setCPUThrottle(double rate, boolean autoAdapt);
+
     /**
      * Sets the file where data should be written.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index 32b59bca4c0..b65a26f3aad 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -30,8 +30,10 @@
 import java.util.Objects;
 
 import jdk.jfr.SettingDescriptor;
+import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.ImplicitFields;
+import jdk.jfr.internal.util.TimespanRate;
 import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.tracing.Modification;
 
@@ -45,6 +47,7 @@ public final class PlatformEventType extends Type {
     private final boolean isJVM;
     private final boolean isJDK;
     private final boolean isMethodSampling;
+    private final boolean isCPUTimeMethodSampling;
     private final List<SettingDescriptor> settings = new ArrayList<>(5);
     private final boolean dynamicSettings;
     private final int stackTraceOffset;
@@ -56,6 +59,7 @@ public final class PlatformEventType extends Type {
     private boolean stackTraceEnabled = true;
     private long thresholdTicks = 0;
     private long period = 0;
+    private TimespanRate cpuRate;
     private boolean hasHook;
 
     private boolean beginChunk;
@@ -75,6 +79,7 @@ public final class PlatformEventType extends Type {
         this.dynamicSettings = dynamicSettings;
         this.isJVM = Type.isDefinedByJVM(id);
         this.isMethodSampling = determineMethodSampling();
+        this.isCPUTimeMethodSampling = isJVM && name.equals(Type.EVENT_NAME_PREFIX + "CPUTimeSample");
         this.isJDK = isJDK;
         this.stackTraceOffset = determineStackTraceOffset();
     }
@@ -191,6 +196,15 @@ public void setThrottle(long eventSampleSize, long period_ms) {
         }
     }
 
+    public void setCPUThrottle(TimespanRate rate) {
+        if (isCPUTimeMethodSampling) {
+            this.cpuRate = rate;
+            if (isEnabled()) {
+                JVM.setCPUThrottle(rate.rate(), rate.autoAdapt());
+            }
+        }
+    }
+
     public void setHasPeriod(boolean hasPeriod) {
         this.hasPeriod = hasPeriod;
     }
@@ -251,6 +265,9 @@ public void setEnabled(boolean enabled) {
             if (isMethodSampling) {
                 long p = enabled ? period : 0;
                 JVM.setMethodSamplingPeriod(getId(), p);
+            } else if (isCPUTimeMethodSampling) {
+                TimespanRate r = enabled ? cpuRate : new TimespanRate(0, false);
+                JVM.setCPUThrottle(r.rate(), r.autoAdapt());
             } else {
                 JVM.setEnabled(getId(), enabled);
             }
@@ -388,6 +405,10 @@ public boolean isMethodSampling() {
         return isMethodSampling;
     }
 
+    public boolean isCPUTimeMethodSampling() {
+        return isCPUTimeMethodSampling;
+    }
+
     public void setStackFilterId(long id) {
         startFilterId = id;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index a6192db1ab0..a2ac74142f4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -39,7 +39,8 @@ label = "Active Settings"
 table = "COLUMN 'Event Type', 'Enabled', 'Threshold',
                 'Stack Trace','Period','Cutoff', 'Throttle'
          FORMAT none, missing:whitespace, missing:whitespace, missing:whitespace,
-                missing:whitespace, missing:whitespace, missing:whitespace
+                missing:whitespace, missing:whitespace, missing:whitespace,
+                missing:whitespace
          SELECT E.id, LAST_BATCH(E.value), LAST_BATCH(T.value),
                 LAST_BATCH(S.value), LAST_BATCH(P.value),
                 LAST_BATCH(C.value), LAST_BATCH(U.value)
@@ -400,6 +401,28 @@ table = "COLUMN 'Method', 'Samples', 'Percent'
          SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
          FROM ExecutionSample GROUP BY T LIMIT 25"
 
+[application.cpu-time-hot-methods]
+label = "Java Methods that Execute the Most from CPU Time Sampler"
+table = "COLUMN 'Method', 'Samples', 'Percent'
+         FORMAT none, none, normalized
+         SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
+         FROM CPUTimeSample GROUP BY T LIMIT 25"
+
+[application.cpu-time-statistics]
+label = "CPU Time Sample Statistics"
+form = "COLUMN 'Successful Samples', 'Failed Samples', 'Biased Samples', 'Total Samples', 'Lost Samples'
+        SELECT COUNT(S.startTime), COUNT(F.startTime), COUNT(B.startTime), Count(A.startTime), SUM(L.lostSamples)
+        FROM
+          CPUTimeSample AS S,
+          CPUTimeSample AS F,
+          CPUTimeSample AS A,
+          CPUTimeSample AS B,
+          CPUTimeSamplesLost AS L
+        WHERE
+          S.failed = 'false' AND
+          F.failed = 'true'  AND
+          B.biased = 'true'"
+
 [jvm.jdk-agents]
 label = "JDK Agents"
 table = "COLUMN 'Time', 'Initialization', 'Name', 'Options'
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
new file mode 100644
index 00000000000..c18aeef2132
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CPUThrottleSetting.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, Datadog, Inc. 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.settings;
+
+import static jdk.jfr.internal.util.TimespanUnit.SECONDS;
+import static jdk.jfr.internal.util.TimespanUnit.MILLISECONDS;
+
+import java.util.Objects;
+import java.util.Set;
+
+import jdk.jfr.Description;
+import jdk.jfr.SettingControl;
+import jdk.jfr.Label;
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.Name;
+import jdk.jfr.internal.PlatformEventType;
+import jdk.jfr.internal.Type;
+import jdk.jfr.internal.util.TimespanRate;
+import jdk.jfr.internal.util.Utils;
+
+@MetadataDefinition
+@Label("CPUThrottleSetting")
+@Description("Upper bounds the emission rate for CPU time samples")
+@Name(Type.SETTINGS_PREFIX + "Rate")
+public final class CPUThrottleSetting extends SettingControl {
+    public static final String DEFAULT_VALUE = "0/s";
+    private final PlatformEventType eventType;
+    private String value = DEFAULT_VALUE;
+
+    public CPUThrottleSetting(PlatformEventType eventType) {
+       this.eventType = Objects.requireNonNull(eventType);
+    }
+
+    @Override
+    public String combine(Set<String> values) {
+        TimespanRate max = null;
+        for (String value : values) {
+            TimespanRate rate = TimespanRate.of(value);
+            if (rate != null) {
+                if (max == null || rate.isHigher(max)) {
+                    max = rate;
+                }
+                max = new TimespanRate(max.rate(), max.autoAdapt() || rate.autoAdapt());
+            }
+        }
+        // "off" is not supported
+        return Objects.requireNonNullElse(max.toString(), DEFAULT_VALUE);
+    }
+
+    @Override
+    public void setValue(String value) {
+        TimespanRate rate = TimespanRate.of(value);
+        if (rate != null) {
+            eventType.setCPUThrottle(rate);
+            this.value = value;
+        }
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+}
+
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
index f32436a5e0f..2632cd63848 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
@@ -55,4 +55,8 @@ public boolean isHigher(Rate that) {
     private double inNanos() {
         return (double) amount / unit.nanos;
     }
+
+    public double perSecond() {
+        return inNanos() * 1_000_000_000.0;
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
new file mode 100644
index 00000000000..5d671310e3c
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanRate.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.util;
+
+import jdk.jfr.internal.settings.CPUThrottleSetting;
+
+/**
+ * A rate or fixed period, see {@link jdk.jfr.internal.Rate}
+ */
+public record TimespanRate(double rate, boolean autoAdapt) {
+
+    public static TimespanRate of(String text) {
+        if (text.equals("off")) {
+            text = CPUThrottleSetting.DEFAULT_VALUE;
+        }
+        boolean isPeriod = !text.contains("/");
+        if (isPeriod) {
+            var period = ValueParser.parseTimespanWithInfinity(text, Long.MAX_VALUE);
+            if (period == Long.MAX_VALUE) {
+                return null;
+            }
+            if (period == 0) {
+                return new TimespanRate(0, false);
+            }
+            return new TimespanRate(Runtime.getRuntime().availableProcessors() / (period / 1_000_000_000.0), false);
+        }
+        Rate r = Rate.of(text);
+        if (r == null) {
+            return null;
+        }
+        return new TimespanRate(r.perSecond(), true);
+    }
+
+    public boolean isHigher(TimespanRate that) {
+        return rate() > that.rate();
+    }
+
+    @Override
+    public String toString() {
+        if (autoAdapt) {
+            return String.format("%d/ns", (long)(rate * 1_000_000_000L));
+        }
+        return String.format("%dns", (long)(Runtime.getRuntime().availableProcessors() / rate * 1_000_000_000L));
+    }
+}
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 293af26746f..541d1d3aa2f 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -226,6 +226,16 @@
       <setting name="throttle">off</setting>
     </event>
 
+    <event name="jdk.CPUTimeSample">
+      <setting name="enabled" control="method-sampling-enabled">false</setting>
+      <setting name="throttle">500/s</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.CPUTimeSamplesLost">
+      <setting name="enabled" control="method-sampling-enabled">true</setting>
+    </event>
+
     <event name="jdk.SafepointBegin">
       <setting name="enabled">true</setting>
       <setting name="threshold">10 ms</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 89a9022d11e..9cec2d9a70f 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -206,6 +206,16 @@
       <setting name="period" control="method-sampling-native-interval">20 ms</setting>
     </event>
 
+    <event name="jdk.CPUTimeSample">
+      <setting name="enabled">false</setting>
+      <setting name="throttle">10ms</setting>
+      <setting name="stackTrace">true</setting>
+    </event>
+
+    <event name="jdk.CPUTimeSamplesLost">
+      <setting name="enabled">true</setting>
+    </event>
+
     <event name="jdk.MethodTrace">
       <setting name="enabled">true</setting>
       <setting name="filter" control="method-trace"></setting>
diff --git a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index 5b8aacfb1d2..d6e126a493f 100644
--- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -89,7 +89,10 @@ public class TestLookForUntestedEvents {
 
     // Experimental events
     private static final Set<String> experimentalEvents = Set.of(
-        "Flush", "SyncOnValueBasedClass");
+        "Flush", "SyncOnValueBasedClass", "CPUTimeSample", "CPUTimeSamplesLost");
+
+    // Subset of the experimental events that should have tests
+    private static final Set<String> experimentalButTestedEvents = Set.of("CPUTimeSample");
 
     public static void main(String[] args) throws Exception {
         for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
@@ -110,7 +113,9 @@ private static void lookForEventsNotCoveredByTests() throws Exception {
             .collect(Collectors.toList());
 
         Set<String> eventsNotCoveredByTest = new HashSet<>(jfrEventTypes);
-        for (String event : jfrEventTypes) {
+        Set<String> checkedEvents = new HashSet<>(jfrEventTypes);
+        checkedEvents.addAll(experimentalButTestedEvents);
+        for (String event : checkedEvents) {
             for (Path p : paths) {
                 if (findStringInFile(p, event)) {
                     eventsNotCoveredByTest.remove(event);
diff --git a/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
new file mode 100644
index 00000000000..de211b8c454
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/BaseTestFullStackTrace.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.profiling;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedStackTrace;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.RecurseThread;
+
+public class BaseTestFullStackTrace {
+    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
+
+    private final String eventName;
+    private final String threadFieldName;
+
+    public BaseTestFullStackTrace(String eventName, String threadFieldName) {
+        this.eventName = eventName;
+        this.threadFieldName = threadFieldName;
+    }
+
+    public void run() throws Throwable {
+        RecurseThread[] threads = new RecurseThread[3];
+        for (int i = 0; i < threads.length; ++i) {
+            int depth = MAX_DEPTH - 1 + i;
+            threads[i] = new RecurseThread(depth);
+            threads[i].setName("recursethread-" + depth);
+            threads[i].start();
+        }
+
+        for (RecurseThread thread : threads) {
+            while (!thread.isInRunLoop()) {
+                Thread.sleep(20);
+            }
+        }
+
+        assertStackTraces(threads);
+
+        for (RecurseThread thread : threads) {
+            thread.quit();
+            thread.join();
+        }
+    }
+
+    private void assertStackTraces(RecurseThread[] threads) throws Throwable {
+        while (true) {
+            try (Recording recording = new Recording()) {
+                if (eventName.equals(EventNames.CPUTimeSample)) {
+                    recording.enable(eventName).with("throttle", "50ms");
+                } else {
+                    recording.enable(eventName).withPeriod(Duration.ofMillis(50));
+                }
+                recording.start();
+                Thread.sleep(500);
+                recording.stop();
+                if (hasValidStackTraces(recording, threads)) {
+                    break;
+                }
+            }
+        };
+    }
+
+    private boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
+        boolean[] isEventFound = new boolean[threads.length];
+
+        for (RecordedEvent event : Events.fromRecording(recording)) {
+            System.out.println("Event: " + event);
+            String threadName = Events.assertField(event, threadFieldName + ".javaName").getValue();
+            long threadId = Events.assertField(event, threadFieldName + ".javaThreadId").getValue();
+
+            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
+                RecurseThread currThread = threads[threadIndex];
+                if (threadId == currThread.getId()) {
+                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
+                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
+                    if ("recurseEnd".equals(getTopMethodName(event))) {
+                        isEventFound[threadIndex] = true;
+                        checkEvent(event, currThread.totalDepth);
+                        break;
+                    }
+                }
+            }
+        }
+
+        for (int i = 0; i < threads.length; ++i) {
+            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
+            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
+        }
+        for (int i = 0; i < threads.length; ++i) {
+            if(!isEventFound[i]) {
+               // no assertion, let's retry.
+               // Could be race condition, i.e safe point during Thread.sleep
+               System.out.println("Failed to validate all threads, will retry.");
+               return false;
+            }
+        }
+        return true;
+    }
+
+    public String getTopMethodName(RecordedEvent event) {
+        List<RecordedFrame> frames = event.getStackTrace().getFrames();
+        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
+        return frames.getFirst().getMethod().getName();
+    }
+
+    private void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
+        RecordedStackTrace stacktrace = null;
+        try {
+            stacktrace = event.getStackTrace();
+            List<RecordedFrame> frames = stacktrace.getFrames();
+            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
+            List<String> expectedMethods = getExpectedMethods(expectedDepth);
+            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
+
+            for (int i = 0; i < frames.size(); ++i) {
+                String name = frames.get(i).getMethod().getName();
+                String expectedName = expectedMethods.get(i);
+                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
+                Asserts.assertEquals(name, expectedName, "Wrong method name");
+            }
+
+            boolean isTruncated = stacktrace.isTruncated();
+            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
+            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
+
+            String firstMethod = frames.getLast().getMethod().getName();
+            boolean isFullTrace = "run".equals(firstMethod);
+            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
+            Asserts.assertTrue(isTruncated != isFullTrace, msg);
+        } catch (Throwable t) {
+            System.out.println(String.format("stacktrace:%n%s", stacktrace));
+            throw t;
+        }
+    }
+
+    private List<String> getExpectedMethods(int depth) {
+        List<String> methods = new ArrayList<>();
+        methods.add("recurseEnd");
+        for (int i = 0; i < depth - 2; ++i) {
+            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
+        }
+        methods.add("run");
+        if (depth > MAX_DEPTH) {
+            methods = methods.subList(0, MAX_DEPTH);
+        }
+        return methods;
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
new file mode 100644
index 00000000000..eb8d33832b5
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeAndExecutionSample.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.RecurseThread;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main/timeout=30 jdk.jfr.event.profiling.TestCPUTimeAndExecutionSample
+ */
+public class TestCPUTimeAndExecutionSample {
+
+    static String sampleEvent = EventNames.CPUTimeSample;
+
+    // The period is set to 1100 ms to provoke the 1000 ms
+    // threshold in the JVM for os::naked_short_sleep().
+    public static void main(String[] args) throws Exception {
+        run(EventNames.ExecutionSample);
+        run(EventNames.CPUTimeSample);
+        run(EventNames.ExecutionSample);
+        run(EventNames.CPUTimeSample);
+    }
+
+    private static void run(String eventType) {
+        RecurseThread t = new RecurseThread(50);
+        t.setDaemon(true);
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(sampleEvent).with("throttle", "1000/s");
+            rs.onEvent(sampleEvent, e -> {
+                t.quit();
+                rs.close();
+            });
+            t.start();
+            rs.start();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
new file mode 100644
index 00000000000..0d1108346ab
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleFullStackTrace.java
@@ -0,0 +1,41 @@
+/*
+ * 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.event.profiling;
+
+import jdk.test.lib.jfr.EventNames;
+
+/**
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
+ * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleFullStackTrace
+ */
+public class TestCPUTimeSampleFullStackTrace {
+
+    public static void main(String[] args) throws Throwable {
+        new BaseTestFullStackTrace(EventNames.CPUTimeSample, "eventThread").run();
+    }
+
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
new file mode 100644
index 00000000000..133df36684c
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleMultipleRecordings.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.internal.JVM;
+import jdk.test.lib.jfr.EventNames;
+
+/*
+ * Tests that creating multiple recordings after another is possible.
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSampleMultipleRecordings
+ */
+public class TestCPUTimeSampleMultipleRecordings {
+
+    static String nativeEvent = EventNames.CPUTimeSample;
+
+    static volatile boolean alive = true;
+
+    public static void main(String[] args) throws Exception {
+        Thread t = new Thread(TestCPUTimeSampleMultipleRecordings::nativeMethod);
+        t.setDaemon(true);
+        t.start();
+        for (int i = 0; i < 2; i++) {
+            try (RecordingStream rs = new RecordingStream()) {
+                rs.enable(nativeEvent).with("throttle", "1ms");
+                rs.onEvent(nativeEvent, e -> {
+                    alive = false;
+                    rs.close();
+                });
+
+                rs.start();
+            }
+        }
+        alive = false;
+    }
+
+    public static void nativeMethod() {
+        while (alive) {
+            JVM.getPid();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
new file mode 100644
index 00000000000..1617bce4ba3
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleNative.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.internal.JVM;
+import jdk.test.lib.jfr.EventNames;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSampleNative
+ */
+public class TestCPUTimeSampleNative {
+
+    static String nativeEvent = EventNames.CPUTimeSample;
+
+    static volatile boolean alive = true;
+
+    public static void main(String[] args) throws Exception {
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(nativeEvent).with("throttle", "1ms");
+            rs.onEvent(nativeEvent, e -> {
+                alive = false;
+                rs.close();
+            });
+            Thread t = new Thread(TestCPUTimeSampleNative::nativeMethod);
+            t.setDaemon(true);
+            t.start();
+            rs.start();
+        }
+
+    }
+
+    public static void nativeMethod() {
+        while (alive) {
+            JVM.getPid();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
new file mode 100644
index 00000000000..55b350ad096
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSampleThrottling.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package jdk.jfr.event.profiling;
+import java.lang.management.ManagementFactory;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Comparator;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.profiling.TestCPUTimeSampleThrottling
+ */
+public class TestCPUTimeSampleThrottling {
+
+    public static void main(String[] args) throws Exception {
+        testZeroPerSecond();
+        testThrottleSettings();
+        testThrottleSettingsPeriod();
+    }
+
+    private static void testZeroPerSecond() throws Exception {
+        Asserts.assertTrue(0L == countEvents(1000, "0/s").count());
+    }
+
+    private static void testThrottleSettings() throws Exception {
+        long count = countEvents(1000,
+            Runtime.getRuntime().availableProcessors() * 2 + "/s").count();
+        Asserts.assertTrue(count > 0 && count < 3,
+            "Expected between 0 and 3 events, got " + count);
+    }
+
+    private static void testThrottleSettingsPeriod() throws Exception {
+        float rate = countEvents(1000, "10ms").rate();
+        Asserts.assertTrue(rate > 90 && rate < 110, "Expected around 100 events per second, got " + rate);
+    }
+
+    private record EventCount(long count, float time) {
+        float rate() {
+            return count / time;
+        }
+    }
+
+    private static EventCount countEvents(int timeMs, String rate) throws Exception {
+        try(Recording recording = new Recording()) {
+            recording.enable(EventNames.CPUTimeSample)
+                    .with("throttle", rate);
+
+            var bean = ManagementFactory.getThreadMXBean();
+
+            recording.start();
+
+            long startThreadCpuTime = bean.getCurrentThreadCpuTime();
+
+            wasteCPU(timeMs);
+
+            long spendCPUTime = bean.getCurrentThreadCpuTime() - startThreadCpuTime;
+
+            recording.stop();
+
+            long eventCount = Events.fromRecording(recording).stream()
+                    .filter(e -> e.getThread().getJavaName()
+                                .equals(Thread.currentThread().getName()))
+                    .count();
+
+            System.out.println("Event count: " + eventCount + ", CPU time: " + spendCPUTime / 1_000_000_000f + "s");
+
+            return new EventCount(eventCount, spendCPUTime / 1_000_000_000f);
+        }
+    }
+
+    private static void wasteCPU(int durationMs) {
+        long start = System.currentTimeMillis();
+        double i = 0;
+        while (System.currentTimeMillis() - start < durationMs) {
+            for (int j = 0; j < 100000; j++) {
+                i = Math.sqrt(i * Math.pow(Math.sqrt(Math.random()), Math.random()));
+            }
+        }
+    }
+
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
new file mode 100644
index 00000000000..69d32d48282
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/TestCPUTimeSamplingLongPeriod.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.profiling;
+
+import java.time.Duration;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.RecurseThread;
+
+/*
+ * @test
+ * @requires vm.hasJFR & os.family == "linux"
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main jdk.jfr.event.profiling.TestCPUTimeSamplingLongPeriod
+ */
+public class TestCPUTimeSamplingLongPeriod {
+
+    static String sampleEvent = EventNames.CPUTimeSample;
+
+    // The period is set to 1100 ms to provoke the 1000 ms
+    // threshold in the JVM for os::naked_short_sleep().
+    public static void main(String[] args) throws Exception {
+        RecurseThread t = new RecurseThread(50);
+        t.setDaemon(true);
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(sampleEvent).with("throttle", "1100ms");
+            rs.onEvent(sampleEvent, e -> {
+                t.quit();
+                rs.close();
+            });
+            t.start();
+            rs.start();
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index b06f9eed03d..c337a8128ab 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -23,147 +23,20 @@
 
 package jdk.jfr.event.profiling;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.jfr.consumer.RecordedFrame;
-import jdk.jfr.consumer.RecordedStackTrace;
-import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.Events;
-import jdk.test.lib.jfr.RecurseThread;
 
 /**
  * @test
  * @requires vm.hasJFR
  * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
+ * @build jdk.jfr.event.profiling.BaseTestFullStackTrace
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
  */
 public class TestFullStackTrace {
-    private final static String EVENT_NAME = EventNames.ExecutionSample;
-    private final static int MAX_DEPTH = 64; // currently hardcoded in jvm
 
     public static void main(String[] args) throws Throwable {
-        RecurseThread[] threads = new RecurseThread[3];
-        for (int i = 0; i < threads.length; ++i) {
-            int depth = MAX_DEPTH - 1 + i;
-            threads[i] = new RecurseThread(depth);
-            threads[i].setName("recursethread-" + depth);
-            threads[i].start();
-        }
-
-        for (RecurseThread thread : threads) {
-            while (!thread.isInRunLoop()) {
-                Thread.sleep(20);
-            }
-        }
-
-        assertStackTraces(threads);
-
-        for (RecurseThread thread : threads) {
-            thread.quit();
-            thread.join();
-        }
-    }
-
-    private static void assertStackTraces( RecurseThread[] threads) throws Throwable {
-        Recording recording= null;
-        do {
-            recording = new Recording();
-            recording.enable(EVENT_NAME).withPeriod(Duration.ofMillis(50));
-            recording.start();
-            Thread.sleep(500);
-            recording.stop();
-        } while (!hasValidStackTraces(recording, threads));
+        new BaseTestFullStackTrace(EventNames.ExecutionSample, "sampledThread").run();
     }
 
-    private static boolean hasValidStackTraces(Recording recording, RecurseThread[] threads) throws Throwable {
-        boolean[] isEventFound = new boolean[threads.length];
-
-        for (RecordedEvent event : Events.fromRecording(recording)) {
-            //System.out.println("Event: " + event);
-            String threadName = Events.assertField(event, "sampledThread.javaName").getValue();
-            long threadId = Events.assertField(event, "sampledThread.javaThreadId").getValue();
-
-            for (int threadIndex = 0; threadIndex < threads.length; ++threadIndex) {
-                RecurseThread currThread = threads[threadIndex];
-                if (threadId == currThread.getId()) {
-                    System.out.println("ThreadName=" + currThread.getName() + ", depth=" + currThread.totalDepth);
-                    Asserts.assertEquals(threadName, currThread.getName(), "Wrong thread name");
-                    if ("recurseEnd".equals(getTopMethodName(event))) {
-                        isEventFound[threadIndex] = true;
-                        checkEvent(event, currThread.totalDepth);
-                        break;
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < threads.length; ++i) {
-            String msg = "threadIndex=%d, recurseDepth=%d, isEventFound=%b%n";
-            System.out.printf(msg, i, threads[i].totalDepth, isEventFound[i]);
-        }
-        for (int i = 0; i < threads.length; ++i) {
-            if(!isEventFound[i]) {
-               // no assertion, let's retry.
-               // Could be race condition, i.e safe point during Thread.sleep
-               System.out.println("Failed to validate all threads, will retry.");
-               return false;
-            }
-        }
-        return true;
-    }
-
-    public static String getTopMethodName(RecordedEvent event) {
-        List<RecordedFrame> frames = event.getStackTrace().getFrames();
-        Asserts.assertFalse(frames.isEmpty(), "JavaFrames was empty");
-        return frames.getFirst().getMethod().getName();
-    }
-
-    private static void checkEvent(RecordedEvent event, int expectedDepth) throws Throwable {
-        RecordedStackTrace stacktrace = null;
-        try {
-            stacktrace = event.getStackTrace();
-            List<RecordedFrame> frames = stacktrace.getFrames();
-            Asserts.assertEquals(Math.min(MAX_DEPTH, expectedDepth), frames.size(), "Wrong stacktrace depth. Expected:" + expectedDepth);
-            List<String> expectedMethods = getExpectedMethods(expectedDepth);
-            Asserts.assertEquals(expectedMethods.size(), frames.size(), "Wrong expectedMethods depth. Test error.");
-
-            for (int i = 0; i < frames.size(); ++i) {
-                String name = frames.get(i).getMethod().getName();
-                String expectedName = expectedMethods.get(i);
-                System.out.printf("method[%d]=%s, expected=%s%n", i, name, expectedName);
-                Asserts.assertEquals(name, expectedName, "Wrong method name");
-            }
-
-            boolean isTruncated = stacktrace.isTruncated();
-            boolean isTruncateExpected = expectedDepth > MAX_DEPTH;
-            Asserts.assertEquals(isTruncated, isTruncateExpected, "Wrong value for isTruncated. Expected:" + isTruncateExpected);
-
-            String firstMethod = frames.getLast().getMethod().getName();
-            boolean isFullTrace = "run".equals(firstMethod);
-            String msg = String.format("Wrong values for isTruncated=%b, isFullTrace=%b", isTruncated, isFullTrace);
-            Asserts.assertTrue(isTruncated != isFullTrace, msg);
-        } catch (Throwable t) {
-            System.out.println(String.format("stacktrace:%n%s", stacktrace));
-            throw t;
-        }
-    }
-
-    private static List<String> getExpectedMethods(int depth) {
-        List<String> methods = new ArrayList<>();
-        methods.add("recurseEnd");
-        for (int i = 0; i < depth - 2; ++i) {
-            methods.add((i % 2) == 0 ? "recurseA" : "recurseB");
-        }
-        methods.add("run");
-        if (depth > MAX_DEPTH) {
-            methods = methods.subList(0, MAX_DEPTH);
-        }
-        return methods;
-    }
 }
diff --git a/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java b/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
new file mode 100644
index 00000000000..8dc77fd38da
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/profiling/classes/test/RecursiveMethods.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+ package test;
+
+ import java.time.Duration;
+
+ /*
+  * A class used to create a simple deep call stack for testing purposes
+  */
+ public class RecursiveMethods {
+
+    /** Method that uses recursion to produce a call stack of at least {@code depth} depth */
+    public static int entry(int depth) {
+        return method2(--depth);
+    }
+
+    private static int method2(int depth) {
+        return method3(--depth);
+    }
+
+    private static int method3(int depth) {
+        return method4(--depth);
+    }
+
+    private static int method4(int depth) {
+        return method5(--depth);
+    }
+
+    private static int method5(int depth) {
+        return method6(--depth);
+    }
+
+    private static int method6(int depth) {
+        return method7(--depth);
+    }
+
+    private static int method7(int depth) {
+        return method8(--depth);
+    }
+
+    private static int method8(int depth) {
+        return method9(--depth);
+    }
+
+    private static int method9(int depth) {
+        return method10(--depth);
+    }
+
+    private static int method10(int depth) {
+        if (depth > 0) {
+            return entry(--depth);
+        }
+        return depth;
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 904abe8e3e2..a00898358a8 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -77,6 +77,8 @@ public class EventNames {
     public static final String ThreadAllocationStatistics = PREFIX + "ThreadAllocationStatistics";
     public static final String ExecutionSample = PREFIX + "ExecutionSample";
     public static final String NativeMethodSample = PREFIX + "NativeMethodSample";
+    public static final String CPUTimeSample = PREFIX + "CPUTimeSample";
+    public static final String CPUTimeSamplesLost = PREFIX + "CPUTimeSamplesLost";
     public static final String ThreadDump = PREFIX + "ThreadDump";
     public static final String OldObjectSample = PREFIX + "OldObjectSample";
     public static final String SymbolTableStatistics = PREFIX + "SymbolTableStatistics";

From dc949003ded278805d10c7b630e82348a7d998fe Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 5 Jun 2025 09:02:23 +0000
Subject: [PATCH 873/901] 8358588: ThreadSnapshot.ThreadLock should be static
 nested class

Reviewed-by: alanb, sspitsyn, amenkov
---
 src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
index b5607059abc..e0dd4bbc508 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
@@ -175,7 +175,7 @@ private enum BlockerLockType {
     /**
      * Represents a locking operation of a thread at a specific stack depth.
      */
-    private class ThreadLock {
+    private static class ThreadLock {
         private static final OwnedLockType[] lockTypeValues = OwnedLockType.values(); // cache
 
         // set by the VM

From 66feb490bdf670c9b101f36b2fa1d0a923c0c3df Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 5 Jun 2025 09:30:44 +0000
Subject: [PATCH 874/901] 8358543: Remove CommentChecker.java and DirDiff.java

Reviewed-by: erikj
---
 .../tools/commentchecker/CommentChecker.java  | 217 --------------
 .../src/build/tools/dirdiff/DirDiff.java      | 275 ------------------
 2 files changed, 492 deletions(-)
 delete mode 100644 src/utils/src/build/tools/commentchecker/CommentChecker.java
 delete mode 100644 src/utils/src/build/tools/dirdiff/DirDiff.java

diff --git a/src/utils/src/build/tools/commentchecker/CommentChecker.java b/src/utils/src/build/tools/commentchecker/CommentChecker.java
deleted file mode 100644
index 5de89e00646..00000000000
--- a/src/utils/src/build/tools/commentchecker/CommentChecker.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 1998, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.commentchecker;
-
-import java.io.*;
-import java.util.StringTokenizer;
-
-/**
- * CommentChecker is a utility which verifies that there aren't
- * "/*" or "/**" tokens inside any comment blocks in one or more
- * Java source files.  Although it is legal to have beginning
- * comment delimiters inside of a comment block (JLS 3.7), there
- * have been errors where a dropped end-comment delimiter in a
- * method'd doc-comment effectively "erased" that method.  We're
- * therefore restricting beginning comment delimiters inside of
- * JDK source (at least the Swing team is for their portion).
- *
- * To scan a few files, run CommentChecker as follows:
- *
- *     java CommentChecker file1.java file2.java ...
- *
- * There are too many Java files in the JDK base for most shells
- * to support listing in a single command, so CommentChecker also
- * supports cpio and tar-style filename passing, where "-"
- * indicates that the list of files is read from stdin:
- *
- *     find . -name SCCS -prune -o -name '*.java' -print | \
- *        java CommentChecker -
- *
- * @author Thomas Ball
- */
-public class CommentChecker {
-
-    static int errors = 0;
-
-    // Turn on this flag and recompile to dump this tool's state changes.
-    static final boolean verbose = false;
-
-    static void check(String fileName) {
-        BufferedReader in = null;
-        boolean inComment = false;
-        boolean inLineComment = false;
-        boolean inQuote = false;
-        boolean inEscape = false;
-        int lastChar = -1;
-        int lineNumber = 1;
-
-        try {
-            in = new BufferedReader(new FileReader(fileName));
-            while (true) {
-                int ch = in.read();
-                if (ch == -1) {
-                    if (inQuote || inComment) {
-                        error(fileName + ": premature EOF.");
-                    }
-                    return;
-                }
-
-                if (verbose) {
-                    System.out.print((char)ch);
-                }
-
-                switch (ch) {
-                  case '\n':
-                    if (inQuote && !inComment) {
-                        error(fileName + ":" + lineNumber +
-                              " dangling quote.");
-                        inQuote = false;
-                    }
-                    if (inLineComment) {
-                        inLineComment = false;
-                        if (verbose) {
-                            System.out.println("\ninLineComment=false");
-                        }
-                    }
-                    lineNumber++;
-                    break;
-
-                  case '\"':
-                    if (!inComment && !inLineComment && !inEscape &&
-                        !(!inQuote && lastChar == '\'')) {
-                        inQuote = !inQuote;
-                        if (verbose) {
-                            System.out.println("\ninQuote=" + inQuote);
-                        }
-                    }
-                    break;
-
-                  case '/':
-                    if (!inQuote && lastChar == '*') {
-                        inComment = false;
-                        if (verbose) {
-                            System.out.println("\ninComment=false");
-                        }
-                    }
-                    if (!inQuote && lastChar == '/') {
-                        inLineComment = true;
-                        if (verbose) {
-                            System.out.println("\ninLineComment=true");
-                        }
-                    }
-                    break;
-
-                  case '*':
-                    if (!inQuote && lastChar == '/') {
-                        if (inComment) {
-                            error(fileName + ":" + lineNumber +
-                                  " nested comment.");
-                        }
-                        inComment = true;
-                        if (verbose) {
-                            System.out.println("\ninComment=true");
-                        }
-                    }
-                    break;
-                }
-
-                lastChar = ch;
-
-                // Watch for escaped characters, such as '\"'.
-                if (ch == '\\' && !inEscape) {
-                    inEscape = true;
-                    if (verbose) {
-                        System.out.println("\ninEscape set");
-                    }
-                } else {
-                    inEscape = false;
-                }
-            }
-        } catch (FileNotFoundException fnfe) {
-            error(fileName + " not found.");
-        } catch (IOException ioe) {
-            error(fileName + ": " + ioe);
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    error(fileName + ": " + e);
-                }
-            }
-        }
-    }
-
-    static void error(String description) {
-        System.err.println(description);
-        errors++;
-    }
-
-    static void exit() {
-        if (errors != 1) {
-            System.out.println("There were " + errors + " errors.");
-        } else {
-            System.out.println("There was 1 error.");
-        }
-        System.exit(errors);
-    }
-
-    public static void main(String[] args) {
-        if (args.length == 0) {
-            System.err.println("usage: java CommentChecker [-] file.java ...");
-            System.exit(1);
-        }
-
-        if (args.length == 1 && args[0].equals("-")) {
-            /* read filenames in one per line from stdin, ala cpio.
-             * This is good for checking the whole JDK in one pass:
-             *
-             *    cpio . -name SCCS -prune -o -name '*.java' -print | \
-             *        java CommentChecker -
-             */
-            try {
-                BufferedReader br =
-                    new BufferedReader(new InputStreamReader(System.in));
-                while (true) {
-                    String fileName = br.readLine();
-                    if (fileName == null) {
-                        break;
-                    }
-                    check(fileName);
-                }
-                br.close();
-            } catch (Exception e) {
-                error("error reading System.in: " + e);
-            }
-        } else {
-            for (int i = 0; i < args.length; i++) {
-                check(args[i]);
-            }
-        }
-
-        exit();
-    }
-}
diff --git a/src/utils/src/build/tools/dirdiff/DirDiff.java b/src/utils/src/build/tools/dirdiff/DirDiff.java
deleted file mode 100644
index 149f4eba3af..00000000000
--- a/src/utils/src/build/tools/dirdiff/DirDiff.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.dirdiff;
-
-import java.io.File;
-import java.util.TreeSet;
-
-public class DirDiff implements Runnable {
-    private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-    private static final boolean traversSccsDirs;
-    private static final boolean recurseExtraDirs;
-    private static final boolean verboseMode;
-    private static final boolean checkSizes;
-    private static long SizeTolerance = 0;
-    private File goldenDir = null;
-    private File testDir = null;
-
-    // static initializer:
-      static {
-          String traversePropertyValue = System.getProperty("sccs");
-          traversSccsDirs = (traversePropertyValue != null &&
-                              traversePropertyValue.toLowerCase().equals("true"))? true : false;
-          if (traversSccsDirs) {
-              System.err.println("traversing SCCS directories...");
-          }
-
-          String verbosePropertyValue = System.getProperty("verbose");
-          verboseMode = (verbosePropertyValue != null &&
-                              verbosePropertyValue.toLowerCase().equals("true"))? true : false;
-          if (verboseMode) {
-              System.err.println("verbose mode truned on...");
-          }
-
-          String noRecurseExtraDirsPropertyValue = System.getProperty("recurse");
-          recurseExtraDirs = (noRecurseExtraDirsPropertyValue != null &&
-                              noRecurseExtraDirsPropertyValue.toLowerCase().equals("true"))? true : false;
-          if (recurseExtraDirs) {
-              System.err.println("recursing extra directories...");
-          }
-
-          String sizeToleranceValue = System.getProperty("sizeTolerance");
-          checkSizes = (sizeToleranceValue != null);
-          if (checkSizes) {
-              try {
-                  SizeTolerance = Long.parseLong(sizeToleranceValue);
-              }
-              catch (NumberFormatException e) {
-                  System.err.println("Invlalid sizeTolerance value: " + sizeToleranceValue);
-                  System.err.println("Expecting a long value.  Exiting.");
-                  System.exit(1);
-              }
-              System.err.println("checking matching files for size differences of at least " + SizeTolerance);
-          }
-      }
-
-  public DirDiff(File inGoldenDir, File inTestDir) {
-      goldenDir = inGoldenDir;
-      testDir = inTestDir;
-  }
-
-  private void whatToDoWithMatchingFiles(File goldenChild, File testChild) {
-      if (verboseMode) {
-          System.out.println("Files Match:\t" + goldenChild.getAbsolutePath() +
-                             " and " + testChild.getAbsolutePath());
-      }
-      if (checkSizes) {
-          // compare file sizes...
-          long goldenLength = 0;
-          long testLength = 0;
-          try {
-              goldenLength = goldenChild.length();
-              testLength = testChild.length();
-          }
-          catch (Exception e) {
-              System.err.println("Error: exception thrown and caught:");
-              e.printStackTrace();
-          }
-          if (java.lang.Math.abs(goldenLength - testLength) > SizeTolerance) {
-              if (goldenLength > testLength) {
-                  System.out.println("File short [" + (testLength - goldenLength) + "]:\t" + testChild.getAbsolutePath());
-              } else {
-                  System.out.println("File long [" + (testLength - goldenLength) + "]:\t" + testChild.getAbsolutePath());
-              }
-          }
-      }
-  }
-
-
-  private void whatToDoWithMatchingDirs(File goldenChild, File testChild) {
-      if (verboseMode) {
-          System.out.println("Dirs Match:\t" + goldenChild.getAbsolutePath() +
-                             " and " + testChild.getAbsolutePath());
-      }
-  }
-
-  private void whatToDoWithMissingFiles(File missingFile) {
-      long length = 0;
-      try {
-          length = missingFile.length();
-      }
-      catch (Exception e) {
-          System.err.println("Error: exception thrown and caught:");
-          e.printStackTrace();
-      }
-
-      System.out.println("Missing File [" + length + "]:\t" + missingFile.getAbsolutePath());
-  }
-
-  private void whatToDoWithExtraFiles(File extraFile) {
-      long length = 0;
-      try {
-          length = extraFile.length();
-      }
-      catch (Exception e) {
-          System.err.println("Error: exception thrown and caught:");
-          e.printStackTrace();
-      }
-
-      System.out.println("Extra File [" + length + "]:\t" + extraFile.getAbsolutePath());
-  }
-
-  private void whatToDoWithMissingDirs(File missingDir) {
-      System.out.println("Missing Dir:\t" + missingDir.getAbsolutePath());
-  }
-
-  private void whatToDoWithExtraDirs(File extraDir) {
-      System.out.println("Extra Dir:\t" + extraDir.getAbsolutePath());
-  }
-
-  private void whatToDoWithNonMatchingChildren(File goldenChild, File testChild) {
-      System.out.println("Type Mismatch:\t" + goldenChild.getAbsolutePath() + " is a " +
-                         (goldenChild.isDirectory()? "directory" : "file") +
-                         " and " + testChild.getAbsolutePath() + " is a " +
-                         (testChild.isDirectory()? "directory" : "file"));
-  }
-
-  public void run() {
-      File[] currentTestDirs = null;
-      if (testDir != null) {
-          currentTestDirs = testDir.listFiles();
-      }
-
-      File[] currentGoldenDirs = null;
-      TreeSet<String> goldDirSet = new TreeSet<>();
-      if (goldenDir != null) {
-          currentGoldenDirs = goldenDir.listFiles();
-          for (int i=0; i<currentGoldenDirs.length; i++) {
-              goldDirSet.add(currentGoldenDirs[i].getName());
-          }
-      }
-
-      // now go through the list of members
-      if (currentGoldenDirs != null) {
-          for (int i=0; i<currentGoldenDirs.length; i++) {
-              File newGoldenDir = currentGoldenDirs[i];
-
-              // do not traverse SCCS directories...
-              if (!(newGoldenDir.getAbsolutePath().endsWith("SCCS")) || traversSccsDirs ) {
-                  // start a compare of this child and the like-named test child...
-                  File newTestDir = new File(testDir.getAbsolutePath() + FILE_SEPARATOR +
-                                             newGoldenDir.getName());
-
-                  if (newTestDir.exists()) {
-                      if (newGoldenDir.isDirectory()) {
-                          if (newTestDir.isDirectory()) {
-                              whatToDoWithMatchingDirs(newGoldenDir, newTestDir);
-                              Thread t = new Thread( new DirDiff(newGoldenDir, newTestDir));
-                              t.start();
-                          } else {
-                              whatToDoWithNonMatchingChildren(newGoldenDir, newTestDir);
-                          }
-                      } else { // of... newGoldenDir.isDirectory()...
-                          if (newTestDir.isDirectory()) {
-                              whatToDoWithNonMatchingChildren(newGoldenDir, newTestDir);
-                          }
-                           whatToDoWithMatchingFiles(newGoldenDir, newTestDir);
-                      }
-                  } else { // of... newTestDir.exists()...
-                      if (newGoldenDir.isDirectory()) {
-                          whatToDoWithMissingDirs(newTestDir);
-                          Thread t = new Thread( new DirDiff(newGoldenDir, newTestDir));
-                          t.start();
-                      } else {
-                          whatToDoWithMissingFiles(newTestDir);
-                      }
-                  }
-              }
-          }
-      }
-
-      // look for extra test objs...
-      if (currentTestDirs != null) {
-          for (int i=0; i<currentTestDirs.length; i++) {
-              // do not traverse SCCS directories...
-              if (!(currentTestDirs[i].getAbsolutePath().endsWith("SCCS")) || traversSccsDirs ) {
-                  if (!goldDirSet.contains(currentTestDirs[i].getName())) {
-                      if (currentTestDirs[i].isDirectory()) {
-                          whatToDoWithExtraDirs(currentTestDirs[i]);
-                          if (recurseExtraDirs) {
-                              Thread t = new Thread( new DirDiff( null, currentTestDirs[i]));
-                              t.start();
-                          }
-                      } else {
-                          whatToDoWithExtraFiles(currentTestDirs[i]);
-                      }
-                  }
-              }
-          }
-      }
-  }
-
-  public static void main(String[] args) {
-      if (args.length != 2) {
-          System.err.println("You must provide two directory names on the command line.");
-          System.err.println("Usage:\tDirDiff dir1 dir2");
-          System.err.println("\tJava Runtime Properties (set to \"true\"):");
-          System.err.println("\t\tsccs\trecurse SCCS directories");
-          System.err.println("\t\tverbose\tprint verbose diagnostics");
-          System.err.println("\t\trecurse\trecursing extra directories showing extra files");
-          System.err.println("\t\tsizeTolerance\tset tolerance for size differences - default is infinite");
-
-          System.exit(0);
-      } else {
-          File golden = new File(args[0]);
-          File test = new File(args[1]);
-
-          if (!golden.exists()) {
-              System.err.println("Error: path " + golden.getAbsolutePath() +
-                                 " does not exist. Skipping.");
-              System.exit(0);
-          }
-          if (!golden.isDirectory()) {
-              System.err.println("Error: path " + golden.getAbsolutePath() +
-                                 " must be a directory. Skipping.");
-              System.exit(0);
-          }
-          if (!test.exists()) {
-              System.err.println("Error: path " + test.getAbsolutePath() +
-                                 " does not exist. Skipping.");
-              System.exit(0);
-          }
-          if (!test.isDirectory()) {
-              System.err.println("Error: path " + test.getAbsolutePath() +
-                                 " must be a directory. Skipping.");
-              System.exit(0);
-          }
-
-          Thread t = new Thread( new DirDiff(golden, test));
-          t.start();
-      }
-  }
-}

From d450e341c7af910b618f3dd3e1f77e2e37702c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Thu, 5 Jun 2025 10:14:41 +0000
Subject: [PATCH 875/901] 8357962: JFR Cooperative Sampling reveals
 inconsistent interpreter frames as part of JVMTI PopFrame

Reviewed-by: dholmes, eosterlund
---
 src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp | 1 +
 src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp     | 1 +
 src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 0ed064f48ba..710970d1ea2 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1893,6 +1893,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
 
   Interpreter::_remove_activation_preserving_args_entry = __ pc();
   __ empty_expression_stack();
+  __ restore_bcp(); // We could have returned from deoptimizing this frame, so restore rbcp.
   // Set the popframe_processing bit in pending_popframe_condition
   // indicating that we are currently handling popframe, so that
   // call_VMs that may happen later do not trigger new popframe
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 75469ea40e9..b8de3547c83 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1646,6 +1646,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
 
   Interpreter::_remove_activation_preserving_args_entry = __ pc();
   __ empty_expression_stack();
+  __ restore_bcp(); // We could have returned from deoptimizing this frame, so restore rbcp.
   // Set the popframe_processing bit in pending_popframe_condition
   // indicating that we are currently handling popframe, so that
   // call_VMs that may happen later do not trigger new popframe
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index d4691c9874c..bd061d45fbd 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -1441,6 +1441,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
 
   Interpreter::_remove_activation_preserving_args_entry = __ pc();
   __ empty_expression_stack();
+  __ restore_bcp(); // We could have returned from deoptimizing this frame, so restore rbcp.
   // Set the popframe_processing bit in pending_popframe_condition
   // indicating that we are currently handling popframe, so that
   // call_VMs that may happen later do not trigger new popframe

From bd08932d5b9d1a363d8229ea72df4c6dbfd4571d Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 5 Jun 2025 10:31:23 +0000
Subject: [PATCH 876/901] 8356633: Incorrect use of {@link} in jdk.jshell

Reviewed-by: rgiulietti, vyazici
---
 src/jdk.jshell/share/classes/jdk/jshell/Snippet.java          | 4 ++--
 .../share/classes/jdk/jshell/SourceCodeAnalysis.java          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index 8e5971bedf8..cfbd4fe4ef5 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 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
@@ -524,7 +524,7 @@ public enum Status {
 
         /**
          * The snippet is inactive because it does not yet exist.
-         * Used only in {@link SnippetEvent#previousStatus} for new
+         * Used only in {@link SnippetEvent#previousStatus()} for new
          * snippets.
          * {@link jdk.jshell.JShell#status(jdk.jshell.Snippet) JShell.status(Snippet)}
          * will never return this {@code Status}.
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
index 0375a2ead65..10da664cd03 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysis.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
@@ -150,7 +150,7 @@ public abstract class SourceCodeAnalysis {
      * They will not appear in queries for snippets --
      * for example, {@link JShell#snippets() }.
      * <p>
-     * Restrictions on the input are as in {@link JShell#eval}.
+     * Restrictions on the input are as in {@link JShell#eval(String)}.
      * <p>
      * Only preliminary compilation is performed, sufficient to build the
      * {@code Snippet}.  Snippets known to be erroneous, are returned as

From c5daf890534dfdbe5f66189ef6b08af8ffd4de47 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 5 Jun 2025 11:05:52 +0000
Subject: [PATCH 877/901] 8349369:
 test/docs/jdk/javadoc/doccheck/checks/jdkCheckLinks.java did not report on
 missing man page files

Reviewed-by: hannesw
---
 .../doccheck/checks/jdkCheckLinks.java        |  4 +--
 .../doccheck/doccheckutils/FileProcessor.java |  8 ++---
 .../doccheckutils/checkers/LinkChecker.java   | 30 ++++++++++---------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/test/docs/jdk/javadoc/doccheck/checks/jdkCheckLinks.java b/test/docs/jdk/javadoc/doccheck/checks/jdkCheckLinks.java
index bd818923d9f..3db1cdf6cb9 100644
--- a/test/docs/jdk/javadoc/doccheck/checks/jdkCheckLinks.java
+++ b/test/docs/jdk/javadoc/doccheck/checks/jdkCheckLinks.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 8337109
+ * @bug 8337109 8349369
  * @summary Check Links in the generated documentation
  * @library /test/langtools/tools/lib ../../doccheck /test/lib ../../../../tools/tester
  * @build DocTester toolbox.TestRunner
diff --git a/test/docs/jdk/javadoc/doccheck/doccheckutils/FileProcessor.java b/test/docs/jdk/javadoc/doccheck/doccheckutils/FileProcessor.java
index 6ae3a473bdb..2291d649c3a 100644
--- a/test/docs/jdk/javadoc/doccheck/doccheckutils/FileProcessor.java
+++ b/test/docs/jdk/javadoc/doccheck/doccheckutils/FileProcessor.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
@@ -44,16 +44,16 @@ public List<Path> getFiles() {
 
     public void processFiles(Path directory) {
         try {
-            Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+            Files.walkFileTree(directory, new SimpleFileVisitor<>() {
                 @Override
-                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
                     if (file.toString().endsWith(".html"))
                         files.add(file);
                     return FileVisitResult.CONTINUE;
                 }
 
                 @Override
-                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
                     return FileVisitResult.CONTINUE;
                 }
             });
diff --git a/test/docs/jdk/javadoc/doccheck/doccheckutils/checkers/LinkChecker.java b/test/docs/jdk/javadoc/doccheck/doccheckutils/checkers/LinkChecker.java
index 62ead5a25d3..ed0098d2714 100644
--- a/test/docs/jdk/javadoc/doccheck/doccheckutils/checkers/LinkChecker.java
+++ b/test/docs/jdk/javadoc/doccheck/doccheckutils/checkers/LinkChecker.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
@@ -220,20 +220,14 @@ private void reportMissingFile(Path file) {
 
     @Override
     public boolean isOK() {
-        return duplicateIds == 0
-                && missingIds == 0
-                && missingFiles == 0
-                && badSchemes == 0;
+        return log.noErrors() && (missingFiles == 0);
     }
 
     @Override
     public void close() {
-        report();
-        if (!isOK()) {
-            throw new RuntimeException(
-                    "LinkChecker encountered errors. Duplicate IDs: "
-                            + duplicateIds + ", Missing IDs: " + missingIds
-                            + ", Missing Files: " + missingFiles + ", Bad Schemes: " + badSchemes);
+        if (!log.noErrors()) {
+            report();
+            throw new RuntimeException("LinkChecker encountered errors; see log above.");
         }
     }
 
@@ -276,6 +270,11 @@ private void foundReference(int line, String ref) {
                     p = currFile.getParent().resolve(resolvedUriPath).normalize();
                 }
 
+                if (!Files.exists(p)) {
+                    log.log(currFile, line, "missing file reference: " + log.relativize(p));
+                    return;
+                }
+
                 if (fragment != null && !fragment.isEmpty()) {
                     foundReference(line, p, fragment);
                 }
@@ -392,7 +391,7 @@ class IDTable {
 
         void addID(int line, String name) {
             if (checked) {
-                throw new IllegalStateException("Adding ID after file has been");
+                throw new IllegalStateException("Adding ID after file has been checked");
             }
             Objects.requireNonNull(name);
             IDInfo info = map.computeIfAbsent(name, _ -> new IDInfo());
@@ -413,7 +412,9 @@ void addReference(String name, Path from, int line) {
                 if (name != null) {
                     IDInfo id = map.get(name);
                     if (id == null || !id.declared) {
-                        log.log(log.relativize(from), line, "id not found: " + this.pathOrURI + "#" + name);
+                        log.log(log.relativize(from), line,
+                                "id not found: " + this.pathOrURI + "#" + name);
+                        LinkChecker.this.missingIds++;
                     }
                 }
             } else {
@@ -429,7 +430,8 @@ void check() {
             map.forEach((name, id) -> {
                 if (name != null && !id.declared) {
                     for (Position ref : id.references) {
-                        log.log(log.relativize(ref.path), ref.line, "id not found: " + this.pathOrURI + "#" + name);
+                        log.log(log.relativize(ref.path), ref.line,
+                                "id not found: " + this.pathOrURI + "#" + name);
                     }
                     missingIds++;
                 }

From eb770a060ad86d69b38df7d11622e9e25a528e1d Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 5 Jun 2025 11:36:08 +0000
Subject: [PATCH 878/901] 8351594: JFR: Rate-limited sampling of Java events

Reviewed-by: mgronlun, alanb
---
 .../classes/java/io/FileInputStream.java      |  25 +-
 .../classes/java/io/FileOutputStream.java     |  18 +-
 .../classes/java/io/RandomAccessFile.java     |  41 +--
 .../share/classes/java/lang/Throwable.java    |   4 +-
 .../share/classes/java/net/Socket.java        |  10 +-
 .../internal/event/ExceptionThrownEvent.java  |   7 +-
 .../jdk/internal/event/FileReadEvent.java     |  26 +-
 .../jdk/internal/event/FileWriteEvent.java    |  25 +-
 .../jdk/internal/event/SocketReadEvent.java   |  10 +-
 .../jdk/internal/event/SocketWriteEvent.java  |  14 +-
 .../jdk/internal/event/ThrowableTracer.java   |  22 +-
 .../classes/sun/nio/ch/FileChannelImpl.java   |  65 +---
 .../jdk/jfr/{internal => }/Throttle.java      |  52 ++--
 .../jdk/jfr/events/ExceptionThrownEvent.java  |   4 +-
 .../classes/jdk/jfr/events/FileReadEvent.java |   4 +-
 .../jdk/jfr/events/FileWriteEvent.java        |   4 +-
 .../jdk/jfr/events/SocketReadEvent.java       |   4 +-
 .../jdk/jfr/events/SocketWriteEvent.java      |   4 +-
 .../jdk/jfr/internal/ClassInspector.java      |  16 +
 .../jdk/jfr/internal/EventControl.java        |   3 +
 .../jfr/internal/EventInstrumentation.java    | 107 ++++++-
 .../classes/jdk/jfr/internal/JVMSupport.java  |   2 +-
 .../jdk/jfr/internal/MetadataLoader.java      |   5 +-
 .../jdk/jfr/internal/MetadataRepository.java  |   6 +-
 .../jdk/jfr/internal/PlatformEventType.java   |  16 +-
 .../internal/event/EventConfiguration.java    |  29 ++
 .../internal/settings/ThrottleSetting.java    |   3 +-
 .../jdk/jfr/internal/settings/Throttler.java  | 233 ++++++++++++++
 .../settings/ThrottlerParameters.java         |  94 ++++++
 .../internal/settings/ThrottlerWindow.java    |  99 ++++++
 .../share/classes/jdk/jfr/package-info.java   |  24 +-
 src/jdk.jfr/share/conf/jfr/default.jfc        |  36 ++-
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  38 ++-
 .../metadata/annotations/TestThrottle.java    | 290 ++++++++++++++++++
 .../settings/TestSettingsAvailability.java    |  14 +-
 .../jfr/startupargs/TestEventSettings.java    |   4 +-
 36 files changed, 1120 insertions(+), 238 deletions(-)
 rename src/jdk.jfr/share/classes/jdk/jfr/{internal => }/Throttle.java (58%)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/Throttler.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerParameters.java
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerWindow.java
 create mode 100644 test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java

diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java
index ab312fc8c5b..b5b4813cbb5 100644
--- a/src/java.base/share/classes/java/io/FileInputStream.java
+++ b/src/java.base/share/classes/java/io/FileInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,22 +205,17 @@ public int read() throws IOException {
 
     private int traceRead0() throws IOException {
         int result = 0;
-        boolean endOfFile = false;
         long bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             result = read0();
             if (result < 0) {
-                endOfFile = true;
+                bytesRead = -1;
             } else {
                 bytesRead = 1;
             }
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                FileReadEvent.commit(start, duration, path, bytesRead, endOfFile);
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return result;
     }
@@ -236,19 +231,11 @@ private int traceRead0() throws IOException {
 
     private int traceReadBytes(byte b[], int off, int len) throws IOException {
         int bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             bytesRead = readBytes(b, off, len);
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                if (bytesRead < 0) {
-                    FileReadEvent.commit(start, duration, path, 0L, true);
-                } else {
-                    FileReadEvent.commit(start, duration, path, bytesRead, false);
-                }
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return bytesRead;
     }
diff --git a/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java
index 6c5a30ea432..022aa44397a 100644
--- a/src/java.base/share/classes/java/io/FileOutputStream.java
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -266,16 +266,12 @@ private void open(String name, boolean append) throws FileNotFoundException {
 
     private void traceWrite(int b, boolean append) throws IOException {
         long bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             write(b, append);
             bytesWritten = 1;
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                FileWriteEvent.commit(start, duration, path, bytesWritten);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
     }
 
@@ -310,16 +306,12 @@ private native void writeBytes(byte[] b, int off, int len, boolean append)
 
     private void traceWriteBytes(byte b[], int off, int len, boolean append) throws IOException {
         long bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             writeBytes(b, off, len, append);
             bytesWritten = len;
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                FileWriteEvent.commit(start, duration, path, bytesWritten);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
     }
 
diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java
index c09f87afcdc..339030e022c 100644
--- a/src/java.base/share/classes/java/io/RandomAccessFile.java
+++ b/src/java.base/share/classes/java/io/RandomAccessFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -367,21 +367,16 @@ public int read() throws IOException {
     private int traceRead0() throws IOException {
         int result = 0;
         long bytesRead = 0;
-        boolean endOfFile = false;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             result = read0();
             if (result < 0) {
-                endOfFile = true;
+                bytesRead = -1;
             } else {
                 bytesRead = 1;
             }
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                FileReadEvent.commit(start, duration, path, bytesRead, endOfFile);
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return result;
     }
@@ -404,19 +399,11 @@ private int readBytes(byte[] b, int off, int len) throws IOException {
 
     private int traceReadBytes0(byte b[], int off, int len) throws IOException {
         int bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             bytesRead = readBytes0(b, off, len);
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                if (bytesRead < 0) {
-                    FileReadEvent.commit(start, duration, path, 0L, true);
-                } else {
-                    FileReadEvent.commit(start, duration, path, bytesRead, false);
-                }
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return bytesRead;
     }
@@ -582,16 +569,12 @@ private void implWrite(int b) throws IOException {
 
     private void traceImplWrite(int b) throws IOException {
         long bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             implWrite(b);
             bytesWritten = 1;
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                FileWriteEvent.commit(start, duration, path, bytesWritten);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
     }
 
@@ -624,16 +607,12 @@ private void implWriteBytes(byte[] b, int off, int len) throws IOException {
 
     private void traceImplWriteBytes(byte b[], int off, int len) throws IOException {
         long bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             implWriteBytes(b, off, len);
             bytesWritten = len;
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                FileWriteEvent.commit(start, duration, path, bytesWritten);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
     }
 
diff --git a/src/java.base/share/classes/java/lang/Throwable.java b/src/java.base/share/classes/java/lang/Throwable.java
index 8c0ce29dbee..ac3325fc514 100644
--- a/src/java.base/share/classes/java/lang/Throwable.java
+++ b/src/java.base/share/classes/java/lang/Throwable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +121,7 @@ public class Throwable implements Serializable {
      * Flag set by jdk.internal.event.JFRTracing to indicate if
      * exceptions should be traced by JFR.
      */
-    static volatile boolean jfrTracing;
+    static boolean jfrTracing;
 
     /**
      * The JVM saves some indication of the stack backtrace in this slot.
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index d2afa166a88..2905a51b402 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -965,10 +965,7 @@ public int read(byte[] b, int off, int len) throws IOException {
             }
             long start = SocketReadEvent.timestamp();
             int nbytes = implRead(b, off, len);
-            long duration = SocketReadEvent.timestamp() - start;
-            if (SocketReadEvent.shouldCommit(duration)) {
-                SocketReadEvent.emit(start, duration, nbytes, parent.getRemoteSocketAddress(), getSoTimeout());
-            }
+            SocketReadEvent.offer(start, nbytes, parent.getRemoteSocketAddress(), getSoTimeout());
             return nbytes;
         }
 
@@ -1081,10 +1078,7 @@ public void write(byte[] b, int off, int len) throws IOException {
             }
             long start = SocketWriteEvent.timestamp();
             implWrite(b, off, len);
-            long duration = SocketWriteEvent.timestamp() - start;
-            if (SocketWriteEvent.shouldCommit(duration)) {
-                SocketWriteEvent.emit(start, duration, len, parent.getRemoteSocketAddress());
-            }
+            SocketWriteEvent.offer(start, len, parent.getRemoteSocketAddress());
         }
 
         private void implWrite(byte[] b, int off, int len) throws IOException {
diff --git a/src/java.base/share/classes/jdk/internal/event/ExceptionThrownEvent.java b/src/java.base/share/classes/jdk/internal/event/ExceptionThrownEvent.java
index 45c13e3010d..355ee81c0fc 100644
--- a/src/java.base/share/classes/jdk/internal/event/ExceptionThrownEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/ExceptionThrownEvent.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
@@ -31,6 +31,11 @@ public final class ExceptionThrownEvent extends Event {
     public String message;
     public Class<?> thrownClass;
 
+    public static boolean shouldThrottleCommit(long timestamp) {
+        // Generated by JFR
+        return false;
+    }
+
     public static void commit(long start, String message, Class<?> thrownClass) {
         // Generated by JFR
     }
diff --git a/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java b/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java
index 34ff4e9d4ed..77b2568802e 100644
--- a/src/java.base/share/classes/jdk/internal/event/FileReadEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/FileReadEvent.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
@@ -45,11 +45,33 @@ public static long timestamp() {
         return 0L;
     }
 
-    public static boolean shouldCommit(long duration) {
+    public static boolean shouldThrottleCommit(long duration, long end) {
         // Generated by JFR
         return false;
     }
 
+    /**
+     * Helper method to offer the data needed to potentially commit an event.
+     * The duration of the operation is computed using the current
+     * timestamp and the given start time. If the duration meets
+     * or exceeds the configured value and is not throttled (determined by calling the
+     * generated method {@link #shouldThrottleCommit(long, long)}), an event will be
+     * emitted by calling {@link #commit(long, long, String, long, boolean)}
+     *
+     * @param start  the start time
+     * @param path  the path
+     * @param bytesRead  the number of bytes that were read, or -1 if the end of the file was reached
+     */
+    public static void offer(long start, String path, long bytesRead) {
+        long end = timestamp();
+        long duration = end - start;
+        if (shouldThrottleCommit(duration, end)) {
+            boolean endOfFile = bytesRead < 0;
+            long bytes = endOfFile ? 0 : bytesRead;
+            commit(start, duration, path, bytes, endOfFile);
+        }
+    }
+
     public static void commit(long start, long duration, String path, long bytesRead, boolean endOfFile) {
         // Generated by JFR
     }
diff --git a/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java b/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java
index f6c27960430..3fa7dbe9822 100644
--- a/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/FileWriteEvent.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
@@ -44,11 +44,32 @@ public static long timestamp() {
         return 0L;
     }
 
-    public static boolean shouldCommit(long duration) {
+    public static boolean shouldThrottleCommit(long duration, long end) {
         // Generated by JFR
         return false;
     }
 
+    /**
+     * Helper method to offer the data needed to potentially commit an event.
+     * The duration of the operation is computed using the current
+     * timestamp and the given start time. If the duration meets
+     * or exceeds the configured value and is not throttled (determined by calling the
+     * generated method {@link #shouldThrottleCommit(long, long)}), an event will be
+     * emitted by calling {@link #commit(long, long, String, long)}
+     *
+     * @param start  the start time
+     * @param path  the path
+     * @param bytesRead  the number of bytes that were written, or -1 if the end of the file was reached
+     */
+    public static void offer(long start, String path, long bytesWritten) {
+        long end = timestamp();
+        long duration = end - start;
+        if (shouldThrottleCommit(duration, end)) {
+            long bytes = bytesWritten > 0 ? bytesWritten : 0;
+            commit(start, duration, path, bytes);
+        }
+    }
+
     public static void commit(long start, long duration, String path, long bytesWritten) {
         // Generated by JFR
     }
diff --git a/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java b/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java
index d5f6c3241d9..09b3f23b07f 100644
--- a/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/SocketReadEvent.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
@@ -74,9 +74,10 @@ public static void commit(long start, long duration, String host, String address
      * of this method is generated automatically if jfr is enabled.
      *
      * @param duration  time in nanoseconds to complete the operation
+     * @param end  timestamp at the end of the operation
      * @return  true if the event should be commited
      */
-    public static boolean shouldCommit(long duration) {
+    public static boolean shouldThrottleCommit(long duration, long end) {
         // Generated by JFR
         return false;
     }
@@ -118,8 +119,9 @@ public static long timestamp() {
      * @param timeout  maximum time to wait
      */
     public static void offer(long start, long nbytes, SocketAddress remote, long timeout) {
-        long duration = timestamp() - start;
-        if (shouldCommit(duration)) {
+        long end = timestamp();
+        long duration = end - start;
+        if (shouldThrottleCommit(duration, end)) {
             emit(start, duration, nbytes, remote, timeout);
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java b/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java
index 7c56ef826a5..12d8ffbf65b 100644
--- a/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.java
+++ b/src/java.base/share/classes/jdk/internal/event/SocketWriteEvent.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
@@ -68,10 +68,11 @@ public static void commit(long start, long duration, String host, String address
      * must exceed some threshold in order to commit the event.  The implementation
      * of this method is generated automatically if jfr is enabled.
      *
-     * @param duration  time in nanoseconds to complete the operation
+     * @param duration  time to complete the operation
+     * @param end  timestamp at the end of the operation
      * @return  true if the event should be commited
      */
-    public static boolean shouldCommit(long duration) {
+    public static boolean shouldThrottleCommit(long duration, long end) {
         // Generated by JFR
         return false;
     }
@@ -104,7 +105,7 @@ public static long timestamp() {
      * The duration of the operation is computed using the current
      * timestamp and the given start time.  If the duration is meets
      * or exceeds the configured value (determined by calling the generated method
-     * {@link #shouldCommit(long)}), an event will be emitted by calling
+     * {@link #shouldThrottleCommit(long)}), an event will be emitted by calling
      * {@link #emit(long, long, long, SocketAddress)}.
      *
      * @param start  the start time
@@ -112,8 +113,9 @@ public static long timestamp() {
      * @param remote  the address of the remote socket being written to
      */
     public static void offer(long start, long bytesWritten, SocketAddress remote) {
-        long duration = timestamp() - start;
-        if (shouldCommit(duration)) {
+        long end = timestamp();
+        long duration = end - start;
+        if (shouldThrottleCommit(duration, end)) {
             emit(start, duration, bytesWritten, remote);
         }
     }
diff --git a/src/java.base/share/classes/jdk/internal/event/ThrowableTracer.java b/src/java.base/share/classes/jdk/internal/event/ThrowableTracer.java
index f7076b44e90..6502cbc8002 100644
--- a/src/java.base/share/classes/jdk/internal/event/ThrowableTracer.java
+++ b/src/java.base/share/classes/jdk/internal/event/ThrowableTracer.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
@@ -37,22 +37,24 @@ public static void traceError(Class<?> clazz, String message) {
         if (OutOfMemoryError.class.isAssignableFrom(clazz)) {
             return;
         }
-
-        if (ErrorThrownEvent.enabled()) {
+        if (ErrorThrownEvent.enabled() || ExceptionThrownEvent.enabled()) {
             long timestamp = ErrorThrownEvent.timestamp();
-            ErrorThrownEvent.commit(timestamp, message, clazz);
-        }
-        if (ExceptionThrownEvent.enabled()) {
-            long timestamp = ExceptionThrownEvent.timestamp();
-            ExceptionThrownEvent.commit(timestamp, message, clazz);
+            if (ErrorThrownEvent.enabled()) {
+                ErrorThrownEvent.commit(timestamp, message, clazz);
+            }
+            if (ExceptionThrownEvent.shouldThrottleCommit(timestamp)) {
+                ExceptionThrownEvent.commit(timestamp, message, clazz);
+            }
         }
         numThrowables.incrementAndGet();
     }
 
     public static void traceThrowable(Class<?> clazz, String message) {
         if (ExceptionThrownEvent.enabled()) {
-            long timestamp = ExceptionThrownEvent.timestamp();
-            ExceptionThrownEvent.commit(timestamp, message, clazz);
+            long timestamp = ErrorThrownEvent.timestamp();
+            if (ExceptionThrownEvent.shouldThrottleCommit(timestamp)) {
+                ExceptionThrownEvent.commit(timestamp, message, clazz);
+            }
         }
         numThrowables.incrementAndGet();
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
index 72de217a83c..240405c2f7c 100644
--- a/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/FileChannelImpl.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
@@ -264,19 +264,11 @@ private int implRead(ByteBuffer dst) throws IOException {
 
     private int traceImplRead(ByteBuffer dst) throws IOException {
         int bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             bytesRead = implRead(dst);
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                if (bytesRead < 0) {
-                    FileReadEvent.commit(start, duration, path, 0L, true);
-                } else {
-                    FileReadEvent.commit(start, duration, path, bytesRead, false);
-                }
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return bytesRead;
     }
@@ -326,19 +318,11 @@ private long implRead(ByteBuffer[] dsts, int offset, int length)
 
     private long traceImplRead(ByteBuffer[] dsts, int offset, int length) throws IOException {
         long bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             bytesRead = implRead(dsts, offset, length);
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                if (bytesRead < 0) {
-                    FileReadEvent.commit(start, duration, path, 0L, true);
-                } else {
-                    FileReadEvent.commit(start, duration, path, bytesRead, false);
-                }
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return bytesRead;
     }
@@ -385,16 +369,11 @@ private int implWrite(ByteBuffer src) throws IOException {
 
     private int traceImplWrite(ByteBuffer src) throws IOException {
         int bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             bytesWritten = implWrite(src);
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                long bytes = bytesWritten > 0 ? bytesWritten : 0;
-                FileWriteEvent.commit(start, duration, path, bytes);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
         return bytesWritten;
     }
@@ -441,16 +420,11 @@ private long implWrite(ByteBuffer[] srcs, int offset, int length) throws IOExcep
 
     private long traceImplWrite(ByteBuffer[] srcs, int offset, int length) throws IOException {
         long bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             bytesWritten = implWrite(srcs, offset, length);
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                long bytes = bytesWritten > 0 ? bytesWritten : 0;
-                FileWriteEvent.commit(start, duration, path, bytes);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
         return bytesWritten;
     }
@@ -1199,19 +1173,11 @@ private int implRead(ByteBuffer dst, long position) throws IOException {
 
     private int traceImplRead(ByteBuffer dst, long position) throws IOException {
         int bytesRead = 0;
-        long start = 0;
+        long start = FileReadEvent.timestamp();
         try {
-            start = FileReadEvent.timestamp();
             bytesRead = implRead(dst, position);
         } finally {
-            long duration = FileReadEvent.timestamp() - start;
-            if (FileReadEvent.shouldCommit(duration)) {
-                if (bytesRead < 0) {
-                    FileReadEvent.commit(start, duration, path, 0L, true);
-                } else {
-                    FileReadEvent.commit(start, duration, path, bytesRead, false);
-                }
-            }
+            FileReadEvent.offer(start, path, bytesRead);
         }
         return bytesRead;
     }
@@ -1271,16 +1237,11 @@ private int implWrite(ByteBuffer src, long position) throws IOException {
 
     private int traceImplWrite(ByteBuffer src, long position) throws IOException {
         int bytesWritten = 0;
-        long start = 0;
+        long start = FileWriteEvent.timestamp();
         try {
-            start = FileWriteEvent.timestamp();
             bytesWritten = implWrite(src, position);
         } finally {
-            long duration = FileWriteEvent.timestamp() - start;
-            if (FileWriteEvent.shouldCommit(duration)) {
-                long bytes = bytesWritten > 0 ? bytesWritten : 0;
-                FileWriteEvent.commit(start, duration, path, bytes);
-            }
+            FileWriteEvent.offer(start, path, bytesWritten);
         }
         return bytesWritten;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Throttle.java b/src/jdk.jfr/share/classes/jdk/jfr/Throttle.java
similarity index 58%
rename from src/jdk.jfr/share/classes/jdk/jfr/internal/Throttle.java
rename to src/jdk.jfr/share/classes/jdk/jfr/Throttle.java
index 39409d008ab..7b9771eba2b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Throttle.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Throttle.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, Datadog, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,7 +24,7 @@
  * questions.
  */
 
-package jdk.jfr.internal;
+package jdk.jfr;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -32,14 +32,15 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jdk.jfr.MetadataDefinition;
-
 /**
- * Event annotation, determines the event emission rate in events per time unit.
- *
- * This setting is only supported for JVM events.
+ * Event annotation, specifies the maximum rate of events per time unit, (for
+ * example, {@code "100/s"}).
+ * <p>
+ * If the event class annotated with {@code Throttle} is filtered by other
+ * settings, such as a {@link jdk.jfr.Threshold} or a user-defined setting, the
+ * throttling will happen after those settings have been applied.
  *
- * @since 16
+ * @since 25
  */
 @MetadataDefinition
 @Target({ ElementType.TYPE })
@@ -47,30 +48,33 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Throttle {
     /**
-     * Settings name {@code "throttle"} for configuring an event emission rate in events per time unit.
+     * Setting name {@code "throttle"} for configuring throttled events.
      */
     public static final String NAME = "throttle";
-    public static final String DEFAULT = "off";
 
     /**
-     * Throttle, for example {@code "100/s"}.
+     * The throttle rate, for example {@code "100/s"}.
      * <p>
-     * String representation of a non-negative {@code Long} value followed by a slash ("/")
-     * and one of the following units<br>
-     * {@code "ns"} (nanoseconds)<br>
-     * {@code "us"} (microseconds)<br>
-     * {@code "ms"} (milliseconds)<br>
-     * {@code "s"} (seconds)<br>
-     * {@code "m"} (minutes)<br>
-     * {@code "h"} (hours)<br>
-     * {@code "d"} (days)<br>
+     * String representation of a non-negative {@code long} value followed by a
+     * forward slash ("/") and one of the following units: <br>
+     * <ul style="list-style-type:none">
+     * <li>{@code "ns"} (nanoseconds)</li>
+     * <li>{@code "us"} (microseconds)</li>
+     * <li>{@code "ms"} (milliseconds)</li>
+     * <li>{@code "s"} (seconds)</li>
+     * <li>{@code "m"} (minutes)</li>
+     * <li>{@code "h"} (hours)</li>
+     * <li>{@code "d"} (days)</li>
+     * </ul>
      * <p>
      * Example values, {@code "6000/m"}, {@code "10/ms"} and {@code "200/s"}.
-     * When zero is specified, for example {@code "0/s"}, no events are emitted.
-     * When {@code "off"} is specified, all events are emitted.
+     * <p>
+     * Specifying zero, for example {@code "0/s"}, results in no events being
+     * emitted.
+     * <p>
+     * Specifying {@code "off"} (case-sensitive) results in all events being emitted.
      *
      * @return the throttle value, default {@code "off"} not {@code null}
-     *
      */
-    String value() default DEFAULT;
+    String value() default "off";
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
index 22c87f3132d..41945aaf66c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionThrownEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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
@@ -29,6 +29,7 @@
 import jdk.jfr.Description;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
@@ -38,6 +39,7 @@
 @Category("Java Application")
 @Description("An object derived from java.lang.Exception has been created")
 @RemoveFields("duration")
+@Throttle
 public final class ExceptionThrownEvent extends MirrorEvent {
 
     @Label("Message")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java
index 84886d2493a..bd9926c08d3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.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,6 +30,7 @@
 import jdk.jfr.Label;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.MirrorEvent;
 
@@ -38,6 +39,7 @@
 @Category("Java Application")
 @Description("Reading data from a file")
 @StackFilter({"java.io.FileInputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@Throttle
 public final class FileReadEvent extends MirrorEvent {
 
     @Label("Path")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java
index 990f1845168..e7861eef1b6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.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,6 +30,7 @@
 import jdk.jfr.Label;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.MirrorEvent;
 
@@ -38,6 +39,7 @@
 @Category("Java Application")
 @Description("Writing data to a file")
 @StackFilter({"java.io.FileOutputStream", "java.io.RandomAccessFile", "sun.nio.ch.FileChannelImpl"})
+@Throttle
 public final class FileWriteEvent extends MirrorEvent {
 
     @Label("Path")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
index 917eabd9206..b2cdee4f8dc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketReadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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
@@ -31,6 +31,7 @@
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
 import jdk.jfr.Timespan;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.Type;
 
@@ -38,6 +39,7 @@
 @Label("Socket Read")
 @Category("Java Application")
 @Description("Reading data from a socket")
+@Throttle
 public final class SocketReadEvent extends MirrorEvent {
 
     @Label("Remote Host")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
index 92c85c132d4..661a4d1a68e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/SocketWriteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 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,6 +30,7 @@
 import jdk.jfr.Label;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.Type;
 
@@ -37,6 +38,7 @@
 @Label("Socket Write")
 @Category("Java Application")
 @Description("Writing data to a socket")
+@Throttle
 public final class SocketWriteEvent extends MirrorEvent {
 
     @Label("Remote Host")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
index d310c505da6..3646162e8f7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
@@ -51,6 +51,7 @@
 import jdk.jfr.Registered;
 import jdk.jfr.SettingControl;
 import jdk.jfr.SettingDefinition;
+import jdk.jfr.Throttle;
 import jdk.jfr.internal.util.Bytecode;
 import jdk.jfr.internal.util.ImplicitFields;
 import jdk.jfr.internal.util.Bytecode.FieldDesc;
@@ -64,6 +65,7 @@ final class ClassInspector {
     private static final ClassDesc ANNOTATION_NAME = classDesc(Name.class);
     private static final ClassDesc ANNOTATION_ENABLED = classDesc(Enabled.class);
     private static final ClassDesc ANNOTATION_REMOVE_FIELDS = classDesc(RemoveFields.class);
+    private static final ClassDesc ANNOTATION_THROTTLE = classDesc(Throttle.class);
     private static final String[] EMPTY_STRING_ARRAY = {};
 
     private final ClassModel classModel;
@@ -138,6 +140,20 @@ boolean isEnabled() {
         return true;
     }
 
+    boolean isThrottled() {
+        String result = annotationValue(ANNOTATION_THROTTLE, String.class, "off");
+        if (result != null) {
+            return true;
+        }
+        if (superClass != null) {
+            Throttle t = superClass.getAnnotation(Throttle.class);
+            if (t != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     boolean hasStaticMethod(MethodDesc method) {
         for (MethodModel m : classModel.methods()) {
             if (Modifier.isStatic(m.flags().flagsMask())) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 2ea4725abc8..02775b7707a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -44,6 +44,7 @@
 import jdk.jfr.SettingDefinition;
 import jdk.jfr.StackTrace;
 import jdk.jfr.Threshold;
+import jdk.jfr.Throttle;
 import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.events.StackFilter;
 import jdk.jfr.internal.settings.CutoffSetting;
@@ -55,6 +56,7 @@
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 import jdk.jfr.internal.settings.ThrottleSetting;
+import jdk.jfr.internal.settings.Throttler;
 import jdk.jfr.internal.tracing.Modification;
 import jdk.jfr.internal.util.Utils;
 
@@ -95,6 +97,7 @@ record NamedControl(String name, Control control) {
         }
         if (eventType.hasThrottle()) {
             addControl(Throttle.NAME, defineThrottle(eventType));
+            eventType.setThrottler(new Throttler(eventType));
         }
         if (eventType.hasLevel()) {
             addControl(Level.NAME, defineLevel(eventType));
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 96e6f36e5c8..7f0ed76586a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -60,7 +60,14 @@
  * Class responsible for adding instrumentation to a subclass of {@link Event}.
  *
  */
-final class EventInstrumentation {
+public final class EventInstrumentation {
+    public static final long MASK_THROTTLE               = 1 << 62;
+    public static final long MASK_THROTTLE_CHECK         = 1 << 63;
+    public static final long MASK_THROTTLE_BITS          = MASK_THROTTLE | MASK_THROTTLE_CHECK;
+    public static final long MASK_THROTTLE_CHECK_SUCCESS = MASK_THROTTLE_CHECK | MASK_THROTTLE;
+    public static final long MASK_THROTTLE_CHECK_FAIL    = MASK_THROTTLE_CHECK | 0;
+    public static final long MASK_NON_THROTTLE_BITS      = ~MASK_THROTTLE_BITS;
+
     private static final FieldDesc FIELD_EVENT_CONFIGURATION = FieldDesc.of(Object.class, "eventConfiguration");
 
     private static final ClassDesc TYPE_EVENT_CONFIGURATION = classDesc(EventConfiguration.class);
@@ -71,11 +78,17 @@ final class EventInstrumentation {
     private static final MethodDesc METHOD_BEGIN = MethodDesc.of("begin", "()V");
     private static final MethodDesc METHOD_COMMIT = MethodDesc.of("commit", "()V");
     private static final MethodDesc METHOD_DURATION = MethodDesc.of("duration", "(J)J");
+    private static final MethodDesc METHOD_THROTTLE = MethodDesc.of("throttle", "(JJ)J");
     private static final MethodDesc METHOD_ENABLED = MethodDesc.of("enabled", "()Z");
     private static final MethodDesc METHOD_END = MethodDesc.of("end", "()V");
-    private static final MethodDesc METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT = MethodDesc.of("shouldCommit", "(J)Z");
+    private static final MethodDesc METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT_LONG = MethodDesc.of("shouldCommit", "(J)Z");
+    private static final MethodDesc METHOD_EVENT_CONFIGURATION_SHOULD_THROTTLE_COMMIT_LONG_LONG = MethodDesc.of("shouldThrottleCommit", "(JJ)Z");
+    private static final MethodDesc METHOD_EVENT_CONFIGURATION_SHOULD_THROTTLE_COMMIT_LONG = MethodDesc.of("shouldThrottleCommit", "(J)Z");
+
     private static final MethodDesc METHOD_EVENT_CONFIGURATION_GET_SETTING = MethodDesc.of("getSetting", SettingControl.class, int.class);
     private static final MethodDesc METHOD_EVENT_SHOULD_COMMIT = MethodDesc.of("shouldCommit", "()Z");
+    private static final MethodDesc METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG = MethodDesc.of("shouldThrottleCommit", "(JJ)Z");
+    private static final MethodDesc METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG = MethodDesc.of("shouldThrottleCommit", "(J)Z");
     private static final MethodDesc METHOD_GET_EVENT_WRITER = MethodDesc.of("getEventWriter", "()" + TYPE_EVENT_WRITER.descriptorString());
     private static final MethodDesc METHOD_IS_ENABLED = MethodDesc.of("isEnabled", "()Z");
     private static final MethodDesc METHOD_RESET = MethodDesc.of("reset", "()V");
@@ -88,6 +101,7 @@ final class EventInstrumentation {
     private final MethodDesc staticCommitMethod;
     private final boolean untypedEventConfiguration;
     private final boolean guardEventConfiguration;
+    private final boolean throttled;
 
     /**
      * Creates an EventInstrumentation object.
@@ -110,6 +124,11 @@ final class EventInstrumentation {
         this.eventClassDesc = inspector.getClassDesc();
         this.staticCommitMethod = inspector.findStaticCommitMethod();
         this.untypedEventConfiguration = hasUntypedConfiguration();
+        if (inspector.isJDK()) {
+            this.throttled = inspector.hasStaticMethod(METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG);
+        } else {
+            this.throttled = inspector.isThrottled();
+        }
     }
 
     byte[] buildInstrumented() {
@@ -147,6 +166,12 @@ private Consumer<CodeBuilder> instrumentable(MethodModel method) {
             if (isMethod(method, METHOD_SHOULD_COMMIT_LONG)) {
                 return this::methodShouldCommitStatic;
             }
+            if (isMethod(method, METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG)) {
+                return this::methodShouldCommitThrottleStaticLongLong;
+            }
+            if (isMethod(method, METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG)) {
+                return this::methodShouldCommitThrottleStaticLong;
+            }
             if (isMethod(method, METHOD_TIME_STAMP)) {
                 return this::methodTimestamp;
             }
@@ -188,11 +213,11 @@ private void methodEnd(CodeBuilder codeBuilder) {
         if (!inspector.hasDuration()) {
             throwMissingDuration(codeBuilder, "end");
         } else {
-            codeBuilder.aload(0);
-            codeBuilder.aload(0);
-            getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
-            invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_DURATION);
-            putfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+            setDuration(codeBuilder, cb -> {
+                codeBuilder.aload(0);
+                getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
+                invokestatic(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_DURATION);
+            });
             codeBuilder.return_();
         }
     }
@@ -205,9 +230,8 @@ private void methodShouldCommit(CodeBuilder codeBuilder) {
         }
         // if (!eventConfiguration.shouldCommit(duration) goto fail;
         getEventConfiguration(codeBuilder);
-        codeBuilder.aload(0);
-        getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
-        invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT);
+        getDuration(codeBuilder);
+        invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT_LONG);
         codeBuilder.ifeq(fail);
         List<SettingDesc> settingDescs = inspector.getSettings();
         for (int index = 0; index < settingDescs.size(); index++) {
@@ -222,6 +246,30 @@ private void methodShouldCommit(CodeBuilder codeBuilder) {
             codeBuilder.invokevirtual(eventClassDesc, sd.methodName(), mdesc);
             codeBuilder.ifeq(fail);
         }
+        if (throttled) {
+            // long d =  eventConfiguration.throttle(this.duration);
+            // this.duration = d;
+            // if (d & MASK_THROTTLE_BIT == 0) {
+            //   goto fail;
+            // }
+            getEventConfiguration(codeBuilder);
+            codeBuilder.aload(0);
+            getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_START_TIME);
+            codeBuilder.aload(0);
+            getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+            Bytecode.invokevirtual(codeBuilder, TYPE_EVENT_CONFIGURATION, METHOD_THROTTLE);
+            int result = codeBuilder.allocateLocal(TypeKind.LONG);
+            codeBuilder.lstore(result);
+            codeBuilder.aload(0);
+            codeBuilder.lload(result);
+            putfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+            codeBuilder.lload(result);
+            codeBuilder.ldc(MASK_THROTTLE);
+            codeBuilder.land();
+            codeBuilder.lconst_0();
+            codeBuilder.lcmp();
+            codeBuilder.ifeq(fail);
+         }
         // return true
         codeBuilder.iconst_1();
         codeBuilder.ireturn();
@@ -294,6 +342,17 @@ private void methodTimestamp(CodeBuilder codeBuilder) {
     }
 
     private void methodShouldCommitStatic(CodeBuilder codeBuilder) {
+        methodShouldCommitStatic(codeBuilder, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT_LONG);
+    }
+
+    private void methodShouldCommitThrottleStaticLongLong(CodeBuilder codeBuilder) {
+        methodShouldCommitStatic(codeBuilder, METHOD_EVENT_CONFIGURATION_SHOULD_THROTTLE_COMMIT_LONG_LONG);
+    }
+    private void methodShouldCommitThrottleStaticLong(CodeBuilder codeBuilder) {
+        methodShouldCommitStatic(codeBuilder, METHOD_EVENT_CONFIGURATION_SHOULD_THROTTLE_COMMIT_LONG);
+    }
+
+    private void methodShouldCommitStatic(CodeBuilder codeBuilder, MethodDesc method) {
         Label fail = codeBuilder.newLabel();
         if (guardEventConfiguration) {
             // if (eventConfiguration == null) goto fail;
@@ -302,8 +361,10 @@ private void methodShouldCommitStatic(CodeBuilder codeBuilder) {
         }
         // return eventConfiguration.shouldCommit(duration);
         getEventConfiguration(codeBuilder);
-        codeBuilder.lload(0);
-        codeBuilder.invokevirtual(TYPE_EVENT_CONFIGURATION, METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.name(), METHOD_EVENT_CONFIGURATION_SHOULD_COMMIT.descriptor());
+        for (int i = 0 ; i < method.descriptor().parameterCount(); i++) {
+            codeBuilder.lload(2 * i);
+        }
+        codeBuilder.invokevirtual(TYPE_EVENT_CONFIGURATION, method.name(), method.descriptor());
         codeBuilder.ireturn();
         // fail:
         codeBuilder.labelBinding(fail);
@@ -515,6 +576,28 @@ private static boolean isMethod(MethodModel m, MethodDesc desc) {
         return desc.matches(m);
     }
 
+    private void getDuration(CodeBuilder codeBuilder) {
+        codeBuilder.aload(0);
+        getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+        if (throttled) {
+            codeBuilder.loadConstant(MASK_NON_THROTTLE_BITS);
+            codeBuilder.land();
+        }
+    }
+
+    private void setDuration(CodeBuilder codeBuilder, Consumer<CodeBuilder> expression) {
+        codeBuilder.aload(0);
+        expression.accept(codeBuilder);
+        if (throttled) {
+            codeBuilder.aload(0);
+            getfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+            codeBuilder.loadConstant(MASK_THROTTLE_BITS);
+            codeBuilder.land();
+            codeBuilder.lor();
+        }
+        putfield(codeBuilder, eventClassDesc, ImplicitFields.FIELD_DURATION);
+    }
+
     private static void getEventWriter(CodeBuilder codeBuilder) {
         invokestatic(codeBuilder, TYPE_EVENT_WRITER, METHOD_GET_EVENT_WRITER);
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
index ded1f78b76e..8314437ce72 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
@@ -98,7 +98,7 @@ public static boolean isNotAvailable() {
     public static void tryToInitializeJVM() {
     }
 
-    static long nanosToTicks(long nanos) {
+    public static long nanosToTicks(long nanos) {
         return (long) (nanos * JVM.getTimeConversionFactor());
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataLoader.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataLoader.java
index 60db375c876..2d1332aed06 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataLoader.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataLoader.java
@@ -45,11 +45,12 @@
 import jdk.jfr.Relational;
 import jdk.jfr.StackTrace;
 import jdk.jfr.Threshold;
+import jdk.jfr.Throttle;
 import jdk.jfr.TransitionFrom;
 import jdk.jfr.TransitionTo;
 import jdk.jfr.Unsigned;
 import jdk.jfr.internal.util.Utils;
-
+import jdk.jfr.internal.settings.ThrottleSetting;
 public final class MetadataLoader {
 
     // Caching to reduce allocation pressure and heap usage
@@ -320,7 +321,7 @@ private Map<String, Type> buildTypeMap() {
                     aes.add(new AnnotationElement(Cutoff.class, Cutoff.INFINITY));
                 }
                 if (t.throttle) {
-                    aes.add(new AnnotationElement(Throttle.class, Throttle.DEFAULT));
+                    aes.add(new AnnotationElement(Throttle.class, ThrottleSetting.DEFAULT_VALUE));
                 }
             }
             if (t.experimental) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 5dcf07f719d..e574ab47992 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -45,11 +45,13 @@
 import jdk.jfr.Name;
 import jdk.jfr.Period;
 import jdk.jfr.SettingControl;
+import jdk.jfr.Throttle;
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.internal.consumer.RepositoryFiles;
 import jdk.jfr.internal.event.EventConfiguration;
 import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.periodic.PeriodicEvents;
+import jdk.jfr.internal.settings.Throttler;
 import jdk.jfr.internal.util.Utils;
 
 public final class MetadataRepository {
@@ -214,9 +216,11 @@ private EventConfiguration makeConfiguration(Class<? extends jdk.internal.event.
             }
         }
         EventType eventType = PrivateAccess.getInstance().newEventType(pEventType);
+        pEventType.setHasThrottle(pEventType.getAnnotation(Throttle.class) != null);
         EventControl ec = new EventControl(pEventType, eventClass);
         SettingControl[] settings = ec.getSettingControls().toArray(new SettingControl[0]);
-        EventConfiguration configuration = new EventConfiguration(pEventType, eventType, ec, settings, eventType.getId());
+        Throttler throttler = pEventType.getThrottler();
+        EventConfiguration configuration = new EventConfiguration(pEventType, eventType, ec, settings, throttler, eventType.getId());
         pEventType.setRegistered(true);
         // If class is instrumented or should not be instrumented, mark as instrumented.
         if (JVM.isInstrumented(eventClass) || !JVMSupport.shouldInstrument(pEventType.isJDK(), pEventType.getName())) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
index b65a26f3aad..ff3e0238cf0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -35,6 +35,7 @@
 import jdk.jfr.internal.util.ImplicitFields;
 import jdk.jfr.internal.util.TimespanRate;
 import jdk.jfr.internal.util.Utils;
+import jdk.jfr.internal.settings.Throttler;
 import jdk.jfr.internal.tracing.Modification;
 
 /**
@@ -72,6 +73,7 @@ public final class PlatformEventType extends Type {
     private boolean registered = true;
     private boolean committable = enabled && registered;
     private boolean hasLevel = false;
+    private Throttler throttler;
 
     // package private
     PlatformEventType(String name, long id, boolean isJDK, boolean dynamicSettings) {
@@ -190,9 +192,11 @@ private void setMiscellaneous(long value) {
         }
     }
 
-    public void setThrottle(long eventSampleSize, long period_ms) {
+    public void setThrottle(long eventSampleSize, long periodInMillis) {
         if (isJVM) {
-            JVM.setThrottle(getId(), eventSampleSize, period_ms);
+            JVM.setThrottle(getId(), eventSampleSize, periodInMillis);
+        } else {
+            throttler.configure(eventSampleSize, periodInMillis);
         }
     }
 
@@ -420,4 +424,12 @@ public boolean hasStackFilters() {
     public long getStackFilterId() {
         return startFilterId;
     }
+
+    public Throttler getThrottler() {
+        return throttler;
+    }
+
+    public void setThrottler(Throttler throttler) {
+       this.throttler = throttler;
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventConfiguration.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventConfiguration.java
index 4b0f2fba3da..f16e153fe43 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventConfiguration.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/event/EventConfiguration.java
@@ -28,14 +28,17 @@
 import jdk.jfr.EventType;
 import jdk.jfr.SettingControl;
 import jdk.jfr.internal.EventControl;
+import jdk.jfr.internal.EventInstrumentation;
 import jdk.jfr.internal.JVM;
 import jdk.jfr.internal.PlatformEventType;
+import jdk.jfr.internal.settings.Throttler;
 
 public record EventConfiguration(
     PlatformEventType platformEventType,
     EventType eventType,
     EventControl eventControl,
     SettingControl[] settings,
+    Throttler throttler,
     long id) {
 
     // Accessed by generated code in event class
@@ -43,6 +46,19 @@ public boolean shouldCommit(long duration) {
         return isEnabled() && duration >= platformEventType.getThresholdTicks();
     }
 
+    // Accessed by generated code in event class. Used by:
+    // static boolean shouldThrottleCommit(long duration, long timestamp)
+    public boolean shouldThrottleCommit(long duration, long timestamp) {
+        return isEnabled() && duration >= platformEventType.getThresholdTicks() && throttler.sample(timestamp);
+    }
+
+    // Caller must of Event::shouldThrottleCommit must check enablement.
+    // Accessed by generated code in event class. Used by:
+    // static boolean shouldThrottleCommit(long timestamp)
+    public boolean shouldThrottleCommit(long timestamp) {
+        return throttler.sample(timestamp);
+    }
+
     // Accessed by generated code in event class
     public SettingControl getSetting(int index) {
         return settings[index];
@@ -53,6 +69,19 @@ public boolean isEnabled() {
         return platformEventType.isCommittable();
     }
 
+    public long throttle(long startTime, long rawDuration) {
+        // We have already tried to throttle, return as is
+        if ((rawDuration & EventInstrumentation.MASK_THROTTLE_BITS) != 0) {
+            return rawDuration;
+        }
+        long endTime = startTime + rawDuration;
+        if (throttler.sample(endTime)) {
+            return rawDuration | EventInstrumentation.MASK_THROTTLE_CHECK_SUCCESS;
+        } else {
+            return rawDuration | EventInstrumentation.MASK_THROTTLE_CHECK_FAIL;
+        }
+    }
+
     // Not really part of the configuration, but the method
     // needs to be somewhere the event class can access,
     // but not part of the public API.
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 800443cfaed..ab26b5fcd31 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
@@ -38,7 +38,6 @@
 import jdk.jfr.Name;
 import jdk.jfr.SettingControl;
 import jdk.jfr.internal.PlatformEventType;
-import jdk.jfr.internal.Throttle;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.Rate;
 import jdk.jfr.internal.util.TimespanUnit;
@@ -49,7 +48,7 @@
 @Description("Throttles the emission rate for an event")
 @Name(Type.SETTINGS_PREFIX + "Throttle")
 public final class ThrottleSetting extends SettingControl {
-    public static final String DEFAULT_VALUE = Throttle.DEFAULT;
+    public static final String DEFAULT_VALUE = "off";
     private final PlatformEventType eventType;
     private final String defaultValue;
     private String value;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/Throttler.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/Throttler.java
new file mode 100644
index 00000000000..df8f5a58700
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/Throttler.java
@@ -0,0 +1,233 @@
+/*
+ * 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.settings;
+
+import java.util.Random;
+import java.util.concurrent.locks.ReentrantLock;
+import jdk.jfr.internal.PlatformEventType;
+public final class Throttler {
+    private static final ThrottlerParameters DISABLED_PARAMETERS = new ThrottlerParameters(0, 0, 0);
+    private static final long MILLIUNITS = 1000;
+    private static final long MINUTE = 60 * MILLIUNITS;
+    private static final long TEN_PER_1000_MS_IN_MINUTES = 600;
+    private static final long HOUR = 60 * MINUTE;
+    private static final long TEN_PER_1000_MS_IN_HOURS = 36000;
+    private static final long TEN_PER_1000_MS_IN_DAYS = 864000;
+    private static final long EVENT_THROTTLER_OFF = -2;
+
+    private final ReentrantLock lock = new ReentrantLock();
+    private final Random randomGenerator = new Random();
+    private final ThrottlerWindow window0 = new ThrottlerWindow();
+    private final ThrottlerWindow window1 = new ThrottlerWindow();
+
+    private volatile ThrottlerWindow activeWindow = window0;
+
+    // Guarded by lock
+    private double averagePopulationSize;
+    private double ewmaPopulationSize;
+    private long accumulatedDebtCarryLimit;
+    private long accumulatedDebtCarryCount;
+    private ThrottlerParameters lastParameters = new ThrottlerParameters(0, 0, 0);
+    private long sampleSize;
+    private long periodMillis;
+    private boolean disabled;
+    private boolean update = true;
+
+    public Throttler(PlatformEventType t) {
+    }
+    // Not synchronized in fast path, but uses volatile reads.
+    public boolean sample(long ticks) {
+        if (disabled) {
+            return true;
+        }
+        ThrottlerWindow current = activeWindow;
+        if (current.isExpired(ticks)) {
+            if (lock.tryLock()) {
+                try {
+                    rotateWindow(ticks);
+                } finally {
+                    lock.unlock();
+                }
+            }
+            return activeWindow.sample();
+        }
+        return current.sample();
+    }
+
+    public void configure(long sampleSize, long periodMillis) {
+        lock.lock();
+        try {
+            this.sampleSize = sampleSize;
+            this.periodMillis = periodMillis;
+            this.update = true;
+            this.activeWindow = configure(nextWindowParameters(), activeWindow);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private ThrottlerWindow configure(ThrottlerParameters parameters, ThrottlerWindow expired) {
+        if (parameters.reconfigure) {
+            // Store updated params once to both windows
+            expired.parameters = parameters;
+            nextWindow(expired).parameters = parameters;
+            configure(parameters);
+        }
+        ThrottlerWindow next = setRate(parameters, expired);
+        next.initialize(parameters);
+        return next;
+    }
+
+    private void configure(ThrottlerParameters parameters) {
+        averagePopulationSize = 0;
+        ewmaPopulationSize = computeEwmaAlphaCoefficient(parameters.windowLookBackCount);
+        accumulatedDebtCarryLimit = computeAccumulatedDebtCarryLimit(parameters);
+        accumulatedDebtCarryCount = accumulatedDebtCarryLimit;
+        parameters.reconfigure = false;
+    }
+
+    private void rotateWindow(long ticks) {
+        ThrottlerWindow current = activeWindow;
+        if (current.isExpired(ticks)) {
+            activeWindow = configure(current.parameters.copy(), current);
+        }
+    }
+
+    private ThrottlerWindow setRate(ThrottlerParameters parameters, ThrottlerWindow expired) {
+        ThrottlerWindow next = nextWindow(expired);
+        long projectedSampleSize = parameters.samplePointsPerWindow + amortizeDebt(expired);
+        if (projectedSampleSize == 0) {
+            next.projectedPopulationSize = 0;
+            return next;
+        }
+        next.samplingInterval = deriveSamplingInterval(projectedSampleSize, expired);
+        next.projectedPopulationSize = projectedSampleSize * next.samplingInterval;
+        return next;
+    }
+
+    private long amortizeDebt(ThrottlerWindow expired) {
+        long accumulatedDebt = expired.accumulatedDebt();
+        if (accumulatedDebtCarryCount == accumulatedDebtCarryLimit) {
+            accumulatedDebtCarryCount = 1;
+            return 0;
+        }
+        accumulatedDebtCarryCount++;
+        return -accumulatedDebt;
+    }
+
+    private long deriveSamplingInterval(double sampleSize, ThrottlerWindow expired) {
+        double populationSize = projectPopulationSize(expired);
+        if (populationSize <= sampleSize) {
+            return 1;
+        }
+        double projectProbability = sampleSize / populationSize;
+        return nextGeometric(projectProbability, randomGenerator.nextDouble());
+    }
+
+    private double projectPopulationSize(ThrottlerWindow expired) {
+        averagePopulationSize = exponentiallyWeightedMovingAverage(expired.populationSize(), ewmaPopulationSize, averagePopulationSize);
+        return averagePopulationSize;
+    }
+
+    private static long nextGeometric(double p, double u) {
+        return (long) Math.ceil(Math.log(1.0 - adjustBoundary(u)) / Math.log(1.0 - p));
+    }
+
+    private static double adjustBoundary(double u) {
+        if (u == 0.0) {
+            return 0.01;
+        }
+        if (u == 1.0) {
+            return 0.99;
+        }
+        return u;
+    }
+
+    private void normalize() {
+        if (periodMillis == MILLIUNITS) {
+            return;
+        }
+        if (periodMillis == MINUTE) {
+            if (sampleSize >= TEN_PER_1000_MS_IN_MINUTES) {
+                sampleSize /= 60;
+                periodMillis /= 60;
+            }
+            return;
+        }
+        if (periodMillis == HOUR) {
+            if (sampleSize >= TEN_PER_1000_MS_IN_HOURS) {
+                sampleSize /= 3600;
+                periodMillis /= 3600;
+            }
+            return;
+        }
+        if (sampleSize >= TEN_PER_1000_MS_IN_DAYS) {
+            sampleSize /= 86400;
+            periodMillis /= 86400;
+        }
+    }
+
+    private ThrottlerParameters nextWindowParameters() {
+        if (update) {
+            return updateParameters();
+        }
+        return disabled ? DISABLED_PARAMETERS : lastParameters;
+    }
+
+    private ThrottlerParameters updateParameters() {
+        disabled = is_disabled(sampleSize);
+        if (disabled) {
+            return DISABLED_PARAMETERS;
+        }
+        normalize();
+        lastParameters.setSamplePointsAndWindowDuration(sampleSize, periodMillis);
+        lastParameters.reconfigure = true;
+        update = false;
+        return lastParameters;
+    }
+
+    private boolean is_disabled(long eventSampleSize) {
+        return eventSampleSize == EVENT_THROTTLER_OFF;
+    }
+
+    private double exponentiallyWeightedMovingAverage(double y, double alpha, double s) {
+        return alpha * y + (1 - alpha) * s;
+    }
+
+    private double computeEwmaAlphaCoefficient(long lookBackCount) {
+        return lookBackCount <= 1 ? 1.0 : 1.0 / lookBackCount;
+    }
+
+    private long computeAccumulatedDebtCarryLimit(ThrottlerParameters parameters) {
+        if (parameters.windowDurationMillis == 0 || parameters.windowDurationMillis >= 1000) {
+            return 1;
+        }
+        return 1000 / parameters.windowDurationMillis;
+    }
+
+    private ThrottlerWindow nextWindow(ThrottlerWindow expired) {
+        return expired == window0 ? window1 : window0;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerParameters.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerParameters.java
new file mode 100644
index 00000000000..68908fda2a6
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerParameters.java
@@ -0,0 +1,94 @@
+/*
+ * 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.settings;
+
+final class ThrottlerParameters {
+    private static final long LOW_RATE_UPPER_BOUND = 9;
+    private static final long WINDOW_DIVISOR = 5;
+    private static final long MILLIUNITS = 1000;
+    private static final long MINUTE = 60 * MILLIUNITS;
+    private static final long TEN_PER_1000_MS_IN_MINUTES = 600;
+    private static final long HOUR = 60 * MINUTE;
+    private static final long TEN_PER_1000_MS_IN_HOURS = 36000;
+    private static final long DAY = 24 * HOUR;
+    private static final long TEN_PER_1000_MS_IN_DAYS = 864000;
+    private static final long DEFAULT_WINDOWS_LOOKBACK_COUNT = 25; // 25 windows == 5 seconds (for default window duration of 200 ms)
+
+    long samplePointsPerWindow;
+    long windowDurationMillis;
+    long windowLookBackCount;
+    boolean reconfigure;
+
+    ThrottlerParameters(long samplePointsPerWindow, long windowDuration, long windowLockBackCount) {
+        this.samplePointsPerWindow = samplePointsPerWindow;
+        this.windowDurationMillis = windowDuration;
+        this.windowLookBackCount = windowLockBackCount;
+    }
+
+    public ThrottlerParameters copy() {
+        return new ThrottlerParameters(samplePointsPerWindow, windowDurationMillis, windowLookBackCount);
+    }
+
+    void setSamplePointsAndWindowDuration(long sampleSize, long periodMillis) {
+        try {
+            if (sampleSize <= LOW_RATE_UPPER_BOUND) {
+                samplePointsPerWindow = sampleSize;
+                windowDurationMillis = periodMillis;
+                return;
+            }
+            if (periodMillis == MINUTE && sampleSize < TEN_PER_1000_MS_IN_MINUTES) {
+                samplePointsPerWindow = sampleSize;
+                windowDurationMillis = periodMillis;
+                return;
+            }
+            if (periodMillis == HOUR && sampleSize < TEN_PER_1000_MS_IN_HOURS) {
+                samplePointsPerWindow = sampleSize;
+                windowDurationMillis = periodMillis;
+                return;
+            }
+            if (periodMillis == DAY && sampleSize < TEN_PER_1000_MS_IN_DAYS) {
+                samplePointsPerWindow = sampleSize;
+                windowDurationMillis = periodMillis;
+                return;
+            }
+            samplePointsPerWindow = sampleSize / WINDOW_DIVISOR;
+            windowDurationMillis = periodMillis / WINDOW_DIVISOR;
+        } finally {
+            updateWindowLookback();
+        }
+    }
+
+    private void updateWindowLookback() {
+        if (windowDurationMillis <= MILLIUNITS) {
+            windowLookBackCount = DEFAULT_WINDOWS_LOOKBACK_COUNT; // 5 seconds
+            return;
+        }
+        if (windowDurationMillis == MINUTE) {
+            windowLookBackCount = 5; // 5 windows == 5 minutes
+            return;
+        }
+        windowLookBackCount = 1; // 1 window == 1 hour or 1 day
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerWindow.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerWindow.java
new file mode 100644
index 00000000000..31fb6cab63c
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottlerWindow.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.settings;
+
+import jdk.jfr.internal.JVMSupport;
+
+import java.util.StringJoiner;
+import java.util.concurrent.atomic.AtomicLong;
+import jdk.jfr.internal.JVM;
+
+final class ThrottlerWindow {
+    private final AtomicLong measuredPopulationSize = new AtomicLong();
+    // Guarded by Throttler.lock.
+    ThrottlerParameters parameters = new ThrottlerParameters(0, 0, 0);
+    long samplingInterval = 1;
+    long projectedPopulationSize;
+
+    private volatile long endTicks;
+
+    void initialize(ThrottlerParameters parameters) {
+        if (parameters.windowDurationMillis == 0) {
+            endTicks = 0;
+            return;
+        }
+        measuredPopulationSize.set(0);
+        endTicks = JVM.counterTime() + JVMSupport.nanosToTicks(1_000_000L * parameters.windowDurationMillis);
+    }
+
+    boolean isExpired(long timestamp) {
+        long endTicks = this.endTicks;
+        if (timestamp == 0) {
+            return JVM.counterTime() >= endTicks;
+        } else {
+            return timestamp >= endTicks;
+        }
+    }
+
+    boolean sample() {
+        long ordinal = measuredPopulationSize.incrementAndGet();
+        return ordinal <= projectedPopulationSize && ordinal % samplingInterval == 0;
+    }
+
+    long maxSampleSize() {
+        return samplingInterval == 0 ? 0 : projectedPopulationSize / samplingInterval;
+    }
+
+    long sampleSize() {
+        long size = populationSize();
+        return size > projectedPopulationSize ? maxSampleSize() : size / samplingInterval;
+    }
+
+    long populationSize() {
+        return measuredPopulationSize.get();
+    }
+
+    long accumulatedDebt() {
+        if (projectedPopulationSize == 0) {
+            return 0;
+        }
+        return parameters.samplePointsPerWindow - maxSampleSize() + debt();
+    }
+
+    long debt() {
+        if (projectedPopulationSize == 0) {
+            return 0;
+        }
+        return sampleSize() - parameters.samplePointsPerWindow;
+    }
+
+    public String toString() {
+        StringJoiner sb = new StringJoiner(", ");
+        sb.add("measuredPopulationSize=" + measuredPopulationSize);
+        sb.add("samplingInterval=" + samplingInterval);
+        sb.add("projectedPopulationSize=" + projectedPopulationSize);
+        return sb.toString();
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/package-info.java b/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
index bd5b197d7fc..54866ec508f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, 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
@@ -177,6 +177,28 @@
  * {@code "false"}</td>
  * </tr>
  * <tr>
+ *   <th scope="row">{@code throttle}</th>
+ *   <td>Specifies the maximum rate of events per time unit.</td>
+ *   <td>{@code "off"} (no throttling)</td>
+ *   <td>
+ *     "off", if events should not be throttled, otherwise a string representation of a positive {@code Long} value followed by forward slash ("/") and one of the following units:
+ *     <ul style="list-style-type:none">
+ *       <li>{@code "ns"} (nanoseconds)
+ *       <li>{@code "us"} (microseconds)
+ *       <li>{@code "ms"} (milliseconds)</li>
+ *       <li>{@code "s"} (seconds)</li>
+ *       <li>{@code "m"} (minutes)</li>
+ *       <li>{@code "h"} (hours)</li>
+ *       <li>{@code "d"} (days)</li>
+ *     </ul>
+ *   </td>
+ *    <td>
+ *     {@code "off"}<br>
+ *     {@code "100/s"}<br>
+ *     {@code "1000/m"}
+ *   </td>
+ * </tr>
+ * <tr>
  * <th scope="row">{@code filter}</th>
  * <td>Specifies the filter for the event</td>
  * <td>{@code ""} (empty string)</td>
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 541d1d3aa2f..565dfbdee05 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -769,31 +769,35 @@
     <event name="jdk.FileForce">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">20 ms</setting>
+      <setting name="threshold">20 ms</setting>
     </event>
 
     <event name="jdk.FileRead">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">20 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">100/s</setting>
     </event>
 
     <event name="jdk.FileWrite">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">20 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">100/s</setting>
     </event>
 
     <event name="jdk.SocketRead">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="socket-threshold">20 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">100/s</setting>
     </event>
 
     <event name="jdk.SocketWrite">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="socket-threshold">20 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">100/s</setting>
     </event>
 
     <event name="jdk.Deserialization">
@@ -836,8 +840,9 @@
     </event>
 
     <event name="jdk.JavaExceptionThrow">
-      <setting name="enabled" control="enable-exceptions">false</setting>
+      <setting name="enabled" control="enable-exceptions">true</setting>
       <setting name="stackTrace">true</setting>
+      <setting name="throttle" control="exceptions-throttle-rate">100/s</setting>
     </event>
 
     <event name="jdk.JavaErrorThrow">
@@ -1136,20 +1141,27 @@
         <test name="thread-dump" operator="equal" value="999 d"/>
       </condition>
 
-      <selection name="exceptions" default="errors" label="Exceptions">
+      <selection name="exceptions" default="throttled" label="Exceptions">
         <option label="Off" name="off">off</option>
-        <option label="Errors Only" name="errors">errors</option>
-        <option label="All Exceptions, including Errors" name="all">all</option>
+        <option label="Errors and 100 Exceptions Per Second" name="throttled">throttled</option>
+        <option label="Errors and All Exceptions" name="all">all</option>
       </selection>
 
       <condition name="enable-errors" true="true" false="false">
         <or>
-          <test name="exceptions" operator="equal" value="errors"/>
+          <test name="exceptions" operator="equal" value="throttled"/>
           <test name="exceptions" operator="equal" value="all"/>
         </or>
       </condition>
 
       <condition name="enable-exceptions" true="true" false="false">
+        <or>
+          <test name="exceptions" operator="equal" value="throttled"/>
+          <test name="exceptions" operator="equal" value="all"/>
+        </or>
+      </condition>
+
+      <condition name="exceptions-throttle-rate" true="off" false="100/s">
         <test name="exceptions" operator="equal" value="all"/>
       </condition>
 
@@ -1177,10 +1189,6 @@
 
       <text name="locking-threshold" label="Locking Threshold" contentType="timespan" minimum="0 s">20 ms</text>
 
-      <text name="file-threshold" label="File I/O Threshold" contentType="timespan" minimum="0 s">20 ms</text>
-
-      <text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">20 ms</text>
-
       <text name="method-timing" label="Method Timing" contentType="text"></text>
 
       <text name="method-trace" label="Method Trace" contentType="text"></text>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 9cec2d9a70f..2c0812e75fe 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -769,31 +769,35 @@
     <event name="jdk.FileForce">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">10 ms</setting>
+      <setting name="threshold">10 ms</setting>
     </event>
 
     <event name="jdk.FileRead">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">10 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">300/s</setting>
     </event>
 
     <event name="jdk.FileWrite">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="file-threshold">10 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">300/s</setting>
     </event>
 
     <event name="jdk.SocketRead">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="socket-threshold">10 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">300/s</setting>
     </event>
 
     <event name="jdk.SocketWrite">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="socket-threshold">10 ms</setting>
+      <setting name="threshold">1 ms</setting>
+      <setting name="throttle">300/s</setting>
     </event>
 
     <event name="jdk.Deserialization">
@@ -836,8 +840,9 @@
     </event>
 
     <event name="jdk.JavaExceptionThrow">
-      <setting name="enabled" control="enable-exceptions">false</setting>
+      <setting name="enabled" control="enable-exceptions">true</setting>
       <setting name="stackTrace">true</setting>
+      <setting name="throttle" control="exceptions-throttle-rate">300/s</setting>
     </event>
 
     <event name="jdk.JavaErrorThrow">
@@ -1135,21 +1140,28 @@
         <test name="thread-dump" operator="equal" value="999 d"/>
       </condition>
 
-      <selection name="exceptions" default="errors" label="Exceptions">
+      <selection name="exceptions" default="throttled" label="Exceptions">
         <option label="Off" name="off">off</option>
-        <option label="Errors Only" name="errors">errors</option>
-        <option label="All Exceptions, including Errors" name="all">all</option>
+        <option label="Errors and 300 Exceptions Per Second" name="throttled">throttled</option>
+        <option label="Errors and All Exceptions" name="all">all</option>
       </selection>
 
       <condition name="enable-errors" true="true" false="false">
         <or>
-          <test name="exceptions" operator="equal" value="errors"/>
+          <test name="exceptions" operator="equal" value="throttled"/>
           <test name="exceptions" operator="equal" value="all"/>
         </or>
       </condition>
 
       <condition name="enable-exceptions" true="true" false="false">
-        <test name="exceptions" operator="equal" value="all"/>
+        <or>
+          <test name="exceptions" operator="equal" value="throttled"/>
+          <test name="exceptions" operator="equal" value="all"/>
+        </or>
+      </condition>
+
+      <condition name="exceptions-throttle-rate" true="off" false="300/s">
+         <test name="exceptions" operator="equal" value="all"/>
       </condition>
 
       <selection name="memory-leaks" default="stack-traces" label="Memory Leak Detection">
@@ -1176,10 +1188,6 @@
 
       <text name="locking-threshold" label="Locking Threshold" contentType="timespan" minimum="0 s">10 ms</text>
 
-      <text name="file-threshold" label="File I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>
-
-      <text name="socket-threshold" label="Socket I/O Threshold" contentType="timespan" minimum="0 s">10 ms</text>
-
       <text name="method-timing" label="Method Timing" contentType="text"></text>
 
       <text name="method-trace" label="Method Trace" contentType="text"></text>
diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java
new file mode 100644
index 00000000000..da3bd311abb
--- /dev/null
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.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.jfr.api.metadata.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Constructor;
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jdk.jfr.AnnotationElement;
+import jdk.jfr.Event;
+import jdk.jfr.EventType;
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.Name;
+import jdk.jfr.Threshold;
+import jdk.jfr.Enabled;
+import jdk.jfr.Recording;
+import jdk.jfr.SettingDefinition;
+import jdk.jfr.SettingDescriptor;
+import jdk.jfr.Throttle;
+import jdk.jfr.ValueDescriptor;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.Events;
+import jdk.jfr.SettingControl;
+
+/**
+ * @test
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.metadata.annotations.TestThrottle
+ */
+public class TestThrottle {
+
+    @Throttle("off")
+    @Enabled(false)
+    public static class ThrottledDisabledEvent extends Event {
+    }
+
+    @Throttle("off")
+    public static class ThrottledOffEvent extends Event {
+    }
+
+    @Throttle("0/s")
+    public static class ThrottledZeroRateEvent extends Event {
+    }
+
+    @Throttle("10000000/s")
+    public static class ThrottledHighRateEvent extends Event {
+    }
+
+    @Throttle("off")
+    @Threshold("5 h")
+    public static class ThrottledThresholdedEvent extends Event {
+    }
+
+    @Throttle("50/s")
+    public static class ThrottledNormalRateEvent extends Event {
+        public int index;
+    }
+
+    static class TestSetting extends SettingControl {
+        private boolean value;
+
+        @Override
+        public String combine(Set<String> values) {
+            if (values.contains("true")) {
+                return "true";
+            }
+            if (values.contains("false")) {
+                return "false";
+            }
+            return "true";
+        }
+
+        @Override
+        public void setValue(String text) {
+            value = Boolean.parseBoolean(text);
+        }
+
+        @Override
+        public String getValue() {
+            return "" + value;
+        }
+    }
+
+    @Throttle("10000000/s")
+    public static class ThrottledUserdefinedEvent extends Event {
+        @SettingDefinition
+        public boolean test(TestSetting control) {
+            return control.value;
+        }
+    }
+
+    @Throttle("50/s")
+    public static class ThrottledReuseEvent extends Event {
+        public int index;
+    }
+
+    public static void main(String[] args) throws Exception {
+        testThrottleDisabled();
+        testThrottledOff();
+        testThottleZeroRate();
+        testThrottleHighRate();
+        testThrottleThresholded();
+        testThrottleNormalRate();
+        testThrottleUserdefined();
+    }
+
+    private static void testThrottleDisabled() throws Exception {
+        testEvent(ThrottledDisabledEvent.class, false);
+    }
+
+    private static void testThrottledOff() throws Exception {
+        testEvent(ThrottledOffEvent.class, true);
+    }
+
+    private static void testThottleZeroRate() throws Exception {
+        testEvent(ThrottledZeroRateEvent.class, false);
+    }
+
+    private static void testThrottleHighRate() throws Exception {
+        testEvent(ThrottledHighRateEvent.class, true);
+    }
+
+    private static void testThrottleThresholded() throws Exception {
+        testEvent(ThrottledThresholdedEvent.class, false);
+    }
+
+    private static void testThrottleNormalRate() throws Exception {
+        try (RecordingStream rs = new RecordingStream()) {
+            AtomicInteger lastIndex = new AtomicInteger();
+            AtomicInteger throttled = new AtomicInteger();
+            rs.onEvent(ThrottledNormalRateEvent.class.getName(), e -> {
+                int index = e.getInt("index");
+                if (lastIndex.get() + 1 != index) {
+                    throttled.incrementAndGet();
+                }
+                lastIndex.set(index);
+            });
+            rs.startAsync();
+            int index = 1;
+            while (throttled.get() < 30) {
+                ThrottledNormalRateEvent e = new ThrottledNormalRateEvent();
+                e.index = index;
+                e.commit();
+                index++;
+                Thread.sleep(3);
+            }
+        }
+    }
+
+    private static void testThrottleUserdefined() throws Exception {
+        testThrottleUserdefined("false", "1000000/s", false);
+        testThrottleUserdefined("true", "10000000/s", true);
+        testThrottleUserdefined("true", "0/s", false);
+        testThrottleUserdefined("true", "off", true);
+        testThrottleUserdefined("false", "off", false);
+    }
+
+    private static void testThrottleUserdefined(String test, String throttle, boolean emit) throws Exception {
+        String eventName = ThrottledUserdefinedEvent.class.getName();
+        try (Recording r = new Recording()) {
+            r.enable(eventName).with("test", test).with("throttle", throttle);
+            r.start();
+
+            ThrottledUserdefinedEvent e1 = new ThrottledUserdefinedEvent();
+            e1.commit();
+
+            ThrottledUserdefinedEvent e2 = new ThrottledUserdefinedEvent();
+            e2.begin();
+            e2.commit();
+
+            ThrottledUserdefinedEvent e3 = new ThrottledUserdefinedEvent();
+            e3.begin();
+            e3.end();
+            e3.commit();
+
+            ThrottledUserdefinedEvent e4 = new ThrottledUserdefinedEvent();
+            if (e4.shouldCommit()) {
+                e4.commit();
+            }
+            assertShouldCommit(e4, emit);
+
+            ThrottledUserdefinedEvent e5 = new ThrottledUserdefinedEvent();
+            assertShouldCommit(e5, emit);
+            if (e5.shouldCommit()) {
+                e5.commit();
+            }
+
+            r.stop();
+            assertEvents(r, eventName, emit ? 5 : 0);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void testEvent(Class<? extends Event> eventClass, boolean shouldCommit) throws Exception {
+        try (Recording r = new Recording()) {
+            r.start();
+            Constructor<Event> c = (Constructor<Event>) eventClass.getConstructor();
+            for (int i = 0; i < 17; i++) {
+                Event e = c.newInstance();
+                if (i % 5 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+                e.commit();
+                if (i % 3 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+            }
+            for (int i = 0; i < 50; i++) {
+                Event e = c.newInstance();
+                e.begin();
+                if (i % 5 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+                e.end();
+                if (i % 3 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+                e.commit();
+                if (i % 7 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+            }
+            for (int i = 0; i < 11; i++) {
+                Event e = c.newInstance();
+                e.begin();
+                e.commit();
+                if (i % 7 == 0) {
+                    assertShouldCommit(e, shouldCommit);
+                }
+            }
+            if (shouldCommit) {
+                assertEvents(r, eventClass.getName(), 17 + 50 + 11);
+            }
+        }
+    }
+
+    private static void assertEvents(Recording r, String name, int expected) throws Exception {
+        int count = 0;
+        for (RecordedEvent event : Events.fromRecording(r)) {
+            if (event.getEventType().getName().equals(name)) {
+                count++;
+            }
+        }
+        if (count != expected) {
+            throw new Exception("Expected " + expected + " " + name + " events, but found " + count);
+        }
+    }
+
+    private static void assertShouldCommit(Event e, boolean expected) throws Exception {
+        if (e.shouldCommit() != expected) {
+            throw new Exception("Expected " + e.getClass() + "::shouldCommit() to return " + expected);
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java b/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
index dc22644b4d0..7c6e6fa276b 100644
--- a/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
@@ -66,7 +66,7 @@ private static void testSettingPersistence() throws IOException, Exception {
                 for (EventType parsedType : rf.readEventTypes()) {
                     EventType inMem = inMemoryTypes.get(parsedType.getName());
                     if (inMem == null) {
-                        throw new Exception("Superflous event type " + parsedType.getName() + " in recording");
+                        throw new Exception("Superfluous event type " + parsedType.getName() + " in recording");
                     }
                     Set<String> inMemsettings = new HashSet<>();
                     for (SettingDescriptor sd : inMem.getSettingDescriptors()) {
@@ -75,7 +75,7 @@ private static void testSettingPersistence() throws IOException, Exception {
 
                     for (SettingDescriptor parsedSetting : parsedType.getSettingDescriptors()) {
                         if (!inMemsettings.contains(parsedSetting.getName())) {
-                            throw new Exception("Superflous setting " + parsedSetting.getName() + " in " + parsedType.getName());
+                            throw new Exception("Superfluous setting " + parsedSetting.getName() + " in " + parsedType.getName());
                         }
                         inMemsettings.remove(parsedSetting.getName());
                     }
@@ -89,14 +89,14 @@ private static void testSettingPersistence() throws IOException, Exception {
 
     private static void testKnownSettings() throws Exception {
         testSetting(EventNames.JVMInformation, "enabled", "period");
-        testSetting(EventNames.FileRead, "enabled", "threshold", "stackTrace");
-        testSetting(EventNames.FileWrite, "enabled", "threshold","stackTrace");
+        testSetting(EventNames.FileRead, "enabled", "threshold", "stackTrace", "throttle");
+        testSetting(EventNames.FileWrite, "enabled", "threshold", "stackTrace", "throttle");
         testSetting(EventNames.ExceptionStatistics, "enabled", "period");
-        testSetting(EventNames.SocketRead, "enabled", "threshold", "stackTrace");
-        testSetting(EventNames.SocketWrite, "enabled", "threshold", "stackTrace");
+        testSetting(EventNames.SocketRead, "enabled", "threshold", "stackTrace", "throttle");
+        testSetting(EventNames.SocketWrite, "enabled", "threshold", "stackTrace", "throttle");
         testSetting(EventNames.ActiveRecording, "enabled");
         testSetting(EventNames.ActiveSetting, "enabled");
-        testSetting(EventNames.JavaExceptionThrow, "enabled", "stackTrace");
+        testSetting(EventNames.JavaExceptionThrow, "enabled", "stackTrace", "throttle");
     }
 
     private static void testSetting(String eventName, String... settingNames) throws Exception {
diff --git a/test/jdk/jdk/jfr/startupargs/TestEventSettings.java b/test/jdk/jdk/jfr/startupargs/TestEventSettings.java
index 37af394affd..c86a6331c52 100644
--- a/test/jdk/jdk/jfr/startupargs/TestEventSettings.java
+++ b/test/jdk/jdk/jfr/startupargs/TestEventSettings.java
@@ -51,7 +51,7 @@
  *      jdk.jfr.startupargs.TestEventSettings multipleSettings
  *
  * @run main/othervm
- *      -XX:StartFlightRecording:class-loading=true,socket-threshold=100ms
+ *      -XX:StartFlightRecording:class-loading=true,locking-threshold=100ms
  *      jdk.jfr.startupargs.TestEventSettings jfcOptions
  */
 public class TestEventSettings {
@@ -70,7 +70,7 @@ public static void main(String... args) throws Exception {
         }
         case "jfcOptions" -> {
             assertSetting("jdk.ClassDefine#enabled","true");
-            assertSetting("jdk.SocketRead#threshold", "100 ms");
+            assertSetting("jdk.JavaMonitorEnter#threshold", "100 ms");
         }
         default -> throw new Exception("Uknown tes " + subTest);
         }

From 6cdfd36ac80ad889ddbcfc702115b750a32d9645 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 5 Jun 2025 11:42:31 +0000
Subject: [PATCH 879/901] 8358590: JFR: Include min and max in MethodTiming
 event

Reviewed-by: mgronlun
---
 src/hotspot/share/jfr/metadata/metadata.xml   |  4 ++-
 .../jdk/jfr/events/MethodTimingEvent.java     | 10 ++++++-
 .../classes/jdk/jfr/internal/query/view.ini   |  4 +--
 .../jfr/internal/tracing/PlatformTracer.java  |  2 ++
 .../jdk/jfr/internal/tracing/TimedClass.java  |  7 ++++-
 .../jdk/jfr/internal/tracing/TimedMethod.java | 29 +++++++++++++++++--
 6 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 03daca946f6..d7287adb1a6 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1315,7 +1315,9 @@
   <Event name="MethodTiming" category="Java Application" label="Method Timing" thread="false" stackTrace="false" startTime="false" period="everyChunk">
     <Field type="Method" name="method" label="Method" />
     <Field type="long" name="invocations" label="Invocations" description="The number of times the method was invoked" />
-    <Field type="Tickspan" name="average" label="Average" description="An approximation of the wall-clock time it took for the method to execute" />
+    <Field type="Tickspan" name="minimum" label="Minimum" description="An approximation of the minimum wall-clock time it took for the method to execute" />
+    <Field type="Tickspan" name="average" label="Average" description="An approximation of the average wall-clock time it took for the method to execute" />
+    <Field type="Tickspan" name="maximum" label="Maximum" description="An approximation of the maximum wall-clock time it took for the method to execute" />
   </Event>
 
   <Type name="DeoptimizationReason" label="Deoptimization Reason">
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
index cc1d8f681c7..4998966939b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/MethodTimingEvent.java
@@ -42,11 +42,19 @@ public final class MethodTimingEvent extends AbstractJDKEvent {
     @Label("Invocations")
     public long invocations;
 
+    @Label("Minimum Time")
+    @Timespan(Timespan.TICKS)
+    public long minimum;
+
     @Label("Average Time")
     @Timespan(Timespan.TICKS)
     public long average;
 
-    public static void commit(long start, long method, long invocations, long average) {
+    @Label("Maximum Time")
+    @Timespan(Timespan.TICKS)
+    public long maximum;
+
+    public static void commit(long start, long method, long invocations, long minimum, long average, long maximum) {
         // Generated by JFR
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index a2ac74142f4..018f41bbf22 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -471,9 +471,9 @@ table = "COLUMN 'Alloc. Time', 'Application Method', 'Object Age', 'Heap Usage'
 
 [application.method-timing]
 label = "Method Timing"
-table = "COLUMN 'Timed Method', 'Invocations', 'Average Time'
+table = "COLUMN 'Timed Method', 'Invocations', 'Min. Tim', 'Max. Time', 'Average Time'
          FORMAT none, none, ms-precision:6
-         SELECT LAST_BATCH(method) AS M, LAST_BATCH(invocations), LAST_BATCH(average)
+         SELECT LAST_BATCH(method) AS M, LAST_BATCH(invocations), LAST_BATCH(minimum), LAST_BATCH(maximum), LAST_BATCH(average)
          FROM jdk.MethodTiming GROUP BY method ORDER BY average"
 
 [application.method-calls]
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
index 608fe865147..abc3b0f8cd0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/PlatformTracer.java
@@ -146,6 +146,7 @@ public static void emitTiming() {
     public static void addObjectTiming(long duration) {
         OBJECT.invocations().getAndIncrement();
         OBJECT.time().addAndGet(duration);
+        OBJECT.updateMinMax(duration);
     }
 
     public static void addTiming(long id, long duration) {
@@ -153,6 +154,7 @@ public static void addTiming(long id, long duration) {
         if (entry != null) {
             entry.invocations().getAndIncrement();
             entry.time().addAndGet(duration);
+            entry.updateMinMax(duration);
         }
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java
index 936a8cf835d..ed592fec645 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedClass.java
@@ -61,7 +61,12 @@ public void emit(long timestamp) {
                 long invocations = tm.invocations().get();
                 long time = tm.time().get();
                 long average = invocations == 0 ? Long.MIN_VALUE : time / invocations;
-                MethodTimingEvent.commit(timestamp, methodId, invocations, average);
+                long min = tm.minimum().get();
+                if (min == Long.MAX_VALUE) {
+                    min = Long.MIN_VALUE; // Signals that the value is missing
+                }
+                long max = tm.maximum().get();
+                MethodTimingEvent.commit(timestamp, methodId, invocations, min, average, max);
                 tm.method().log("Emitted event");
             }
         }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
index 185fab62421..be7f0c8f084 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tracing/TimedMethod.java
@@ -33,8 +33,33 @@
  * <p>
  * Fields in record classes are truly final so might help to have a record here.
  */
-record TimedMethod(AtomicLong invocations, AtomicLong time, Method method, AtomicBoolean published) {
+record TimedMethod(AtomicLong invocations, AtomicLong time, AtomicLong minimum, AtomicLong maximum, Method method, AtomicBoolean published) {
     TimedMethod(Method method) {
-        this(new AtomicLong(), new AtomicLong(), method, new AtomicBoolean());
+        this(new AtomicLong(), new AtomicLong(), new AtomicLong(Long.MAX_VALUE), new AtomicLong(Long.MIN_VALUE), method, new AtomicBoolean());
+    }
+
+    public void updateMinMax(long duration) {
+        if (duration > maximum.getPlain()) {
+            while (true) {
+                long max = maximum.get();
+                if (duration <= max) {
+                    return;
+                }
+                if (maximum.weakCompareAndSetVolatile(max, duration)) {
+                    return;
+                }
+            }
+        }
+        if (duration < minimum.getPlain()) {
+            while (true) {
+                long min = minimum.get();
+                if (duration >= min) {
+                    return;
+                }
+                if (minimum.weakCompareAndSetVolatile(min, duration)) {
+                    return;
+                }
+            }
+        }
     }
 }

From 782bbca439cd0d6db9366b4bd8d4861b8f780203 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Thu, 5 Jun 2025 12:04:57 +0000
Subject: [PATCH 880/901] 8358633: Test
 ThreadPoolExecutorTest::testTimedInvokeAnyNullTimeUnit is broken by
 JDK-8347491

Reviewed-by: alanb
---
 test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
index d9ce643a26d..2bc66b1e9e3 100644
--- a/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
+++ b/test/jdk/java/util/concurrent/tck/ThreadPoolExecutorTest.java
@@ -1727,7 +1727,7 @@ public void testTimedInvokeAnyNullTimeUnit() throws Exception {
                 e.invokeAny(l, randomTimeout(), null);
                 shouldThrow();
             } catch (NullPointerException success) {
-                assertEquals("Cannot invoke \"java.util.concurrent.TimeUnit.toNanos(long)\" because \"unit\" is null", success.getMessage());
+                // Do not check the message, as ThreadPoolExecutor does not override invokeAny
             }
         }
     }

From 33ed7c1842e61664c1ad0ea4d29f20728c89e06c Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 5 Jun 2025 13:08:48 +0000
Subject: [PATCH 881/901] 8358689:
 test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java does not build
  after JDK-8351594

Reviewed-by: alanb
---
 .../bench/java/net/SocketEventOverhead.java   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
index c405de0af3c..0ba577f49d7 100644
--- a/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java
+++ b/test/micro/org/openjdk/bench/java/net/SocketEventOverhead.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
@@ -65,7 +65,7 @@ public int socketWriteJFREnabledEventDisabled(SkeletonFixture fixture) {
     @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
-        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s"})
+        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s,jdk.SocketWrite#throttle=off"})
     @Benchmark
     public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) {
         return fixture.write();
@@ -73,7 +73,7 @@ public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) {
 
     @Fork(value = 1, jvmArgs = {
         "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
-        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false"})
+        "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false,jdk.SocketWrite#throttle=off"})
     @Benchmark
     public int socketWriteJFREnabledEventEmitted(SkeletonFixture fixture) {
         return fixture.write();
@@ -99,7 +99,7 @@ public int socketReadJFREnabledEventDisabled(SkeletonFixture fixture) {
     @Fork(value = 1, jvmArgs = {
         "--add-exports",
         "java.base/jdk.internal.event=ALL-UNNAMED",
-        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s"})
+        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s,jdk.SocketRead#throttle=off"})
     @Benchmark
     public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) {
         return fixture.read();
@@ -107,7 +107,7 @@ public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) {
 
     @Fork(value = 1, jvmArgs = {
         "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
-        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false"})
+        "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false,jdk.SocketRead#throttle=off"})
     @Benchmark
     public int socketReadJFREnabledEventEmitted(SkeletonFixture fixture) {
         return fixture.read();
@@ -137,10 +137,7 @@ public int write() {
             try {
                 nbytes = write0();
             } finally {
-                long duration = start - SocketWriteEvent.timestamp();
-                if (SocketWriteEvent.shouldCommit(duration)) {
-                    SocketWriteEvent.emit(start, duration, nbytes, getRemoteAddress());
-                }
+                SocketWriteEvent.offer(start, nbytes, getRemoteAddress());
             }
             return nbytes;
         }
@@ -158,10 +155,7 @@ public int read() {
             try {
                 nbytes = read0();
             } finally {
-                long duration = start - SocketReadEvent.timestamp();
-                if (SocketReadEvent.shouldCommit(duration)) {
-                    SocketReadEvent.emit(start, duration, nbytes, getRemoteAddress(), 0);
-                }
+                SocketReadEvent.offer(start, nbytes, getRemoteAddress(), 0);
             }
             return nbytes;
         }

From 23f1d4f9a993033596ff17751c877f2bb3f792ed Mon Sep 17 00:00:00 2001
From: Dmitry Chuyko <dchuyko@openjdk.org>
Date: Thu, 5 Jun 2025 14:28:27 +0000
Subject: [PATCH 882/901] 8337666: AArch64: SHA3 GPR intrinsic

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/globals_aarch64.hpp   |   4 +-
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |  21 +
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 370 +++++++++++++++++-
 .../cpu/aarch64/vm_version_aarch64.cpp        |   2 +-
 .../sha/sanity/TestSHA3Intrinsics.java        | 128 +++++-
 .../sanity/TestSHA3MultiBlockIntrinsics.java  | 230 ++++++++++-
 6 files changed, 749 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 632bba728a1..b316103d656 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_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) 2015, 2019, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -95,6 +95,8 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use simplest and shortest implementation for array equals")  \
   product(bool, UseSIMDForBigIntegerShiftIntrinsics, true,              \
           "Use SIMD instructions for left/right shift of BigInteger")   \
+  product(bool, UseSIMDForSHA3Intrinsic, true,                          \
+          "Use SIMD SHA3 instructions for SHA3 intrinsic")              \
   product(bool, AvoidUnalignedAccesses, false,                          \
           "Avoid generating unaligned memory accesses")                 \
   product(bool, UseLSE, false,                                          \
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 32506c49cfa..d77bc92875f 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -323,6 +323,27 @@ class MacroAssembler: public Assembler {
     extr(Rd, Rn, Rn, imm);
   }
 
+  inline void rolw(Register Rd, Register Rn, unsigned imm) {
+    extrw(Rd, Rn, Rn, (32 - imm));
+  }
+
+  inline void rol(Register Rd, Register Rn, unsigned imm) {
+    extr(Rd, Rn, Rn, (64 - imm));
+  }
+
+  using Assembler::rax1;
+  using Assembler::eor3;
+
+  inline void rax1(Register Rd, Register Rn, Register Rm) {
+    eor(Rd, Rn, Rm, ROR, 63); // Rd = Rn ^ rol(Rm, 1)
+  }
+
+  inline void eor3(Register Rd, Register Rn, Register Rm, Register Rk) {
+    assert(Rd != Rn, "Use tmp register");
+    eor(Rd, Rm, Rk);
+    eor(Rd, Rd, Rn);
+  }
+
   inline void sxtbw(Register Rd, Register Rn) {
     sbfmw(Rd, Rn, 0, 7);
   }
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 1b6f6d489f3..a0d1e22ff96 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -7081,6 +7081,366 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  void bcax5(Register a0, Register a1, Register a2, Register a3, Register a4,
+             Register tmp0, Register tmp1, Register tmp2) {
+    __ bic(tmp0, a2, a1); // for a0
+    __ bic(tmp1, a3, a2); // for a1
+    __ bic(tmp2, a4, a3); // for a2
+    __ eor(a2, a2, tmp2);
+    __ bic(tmp2, a0, a4); // for a3
+    __ eor(a3, a3, tmp2);
+    __ bic(tmp2, a1, a0); // for a4
+    __ eor(a0, a0, tmp0);
+    __ eor(a1, a1, tmp1);
+    __ eor(a4, a4, tmp2);
+  }
+
+  void keccak_round_gpr(bool can_use_fp, bool can_use_r18, Register rc,
+                        Register a0, Register a1, Register a2, Register a3, Register a4,
+                        Register a5, Register a6, Register a7, Register a8, Register a9,
+                        Register a10, Register a11, Register a12, Register a13, Register a14,
+                        Register a15, Register a16, Register a17, Register a18, Register a19,
+                        Register a20, Register a21, Register a22, Register a23, Register a24,
+                        Register tmp0, Register tmp1, Register tmp2) {
+    __ eor3(tmp1, a4, a9, a14);
+    __ eor3(tmp0, tmp1, a19, a24); // tmp0 = a4^a9^a14^a19^a24 = c4
+    __ eor3(tmp2, a1, a6, a11);
+    __ eor3(tmp1, tmp2, a16, a21); // tmp1 = a1^a6^a11^a16^a21 = c1
+    __ rax1(tmp2, tmp0, tmp1); // d0
+    {
+
+      Register tmp3, tmp4;
+      if (can_use_fp && can_use_r18) {
+        tmp3 = rfp;
+        tmp4 = r18_tls;
+      } else {
+        tmp3 = a4;
+        tmp4 = a9;
+        __ stp(tmp3, tmp4, __ pre(sp, -16));
+      }
+
+      __ eor3(tmp3, a0, a5, a10);
+      __ eor3(tmp4, tmp3, a15, a20); // tmp4 = a0^a5^a10^a15^a20 = c0
+      __ eor(a0, a0, tmp2);
+      __ eor(a5, a5, tmp2);
+      __ eor(a10, a10, tmp2);
+      __ eor(a15, a15, tmp2);
+      __ eor(a20, a20, tmp2); // d0(tmp2)
+      __ eor3(tmp3, a2, a7, a12);
+      __ eor3(tmp2, tmp3, a17, a22); // tmp2 = a2^a7^a12^a17^a22 = c2
+      __ rax1(tmp3, tmp4, tmp2); // d1
+      __ eor(a1, a1, tmp3);
+      __ eor(a6, a6, tmp3);
+      __ eor(a11, a11, tmp3);
+      __ eor(a16, a16, tmp3);
+      __ eor(a21, a21, tmp3); // d1(tmp3)
+      __ rax1(tmp3, tmp2, tmp0); // d3
+      __ eor3(tmp2, a3, a8, a13);
+      __ eor3(tmp0, tmp2, a18, a23);  // tmp0 = a3^a8^a13^a18^a23 = c3
+      __ eor(a3, a3, tmp3);
+      __ eor(a8, a8, tmp3);
+      __ eor(a13, a13, tmp3);
+      __ eor(a18, a18, tmp3);
+      __ eor(a23, a23, tmp3);
+      __ rax1(tmp2, tmp1, tmp0); // d2
+      __ eor(a2, a2, tmp2);
+      __ eor(a7, a7, tmp2);
+      __ eor(a12, a12, tmp2);
+      __ rax1(tmp0, tmp0, tmp4); // d4
+      if (!can_use_fp || !can_use_r18) {
+        __ ldp(tmp3, tmp4, __ post(sp, 16));
+      }
+      __ eor(a17, a17, tmp2);
+      __ eor(a22, a22, tmp2);
+      __ eor(a4, a4, tmp0);
+      __ eor(a9, a9, tmp0);
+      __ eor(a14, a14, tmp0);
+      __ eor(a19, a19, tmp0);
+      __ eor(a24, a24, tmp0);
+    }
+
+    __ rol(tmp0, a10, 3);
+    __ rol(a10, a1, 1);
+    __ rol(a1, a6, 44);
+    __ rol(a6, a9, 20);
+    __ rol(a9, a22, 61);
+    __ rol(a22, a14, 39);
+    __ rol(a14, a20, 18);
+    __ rol(a20, a2, 62);
+    __ rol(a2, a12, 43);
+    __ rol(a12, a13, 25);
+    __ rol(a13, a19, 8) ;
+    __ rol(a19, a23, 56);
+    __ rol(a23, a15, 41);
+    __ rol(a15, a4, 27);
+    __ rol(a4, a24, 14);
+    __ rol(a24, a21, 2);
+    __ rol(a21, a8, 55);
+    __ rol(a8, a16, 45);
+    __ rol(a16, a5, 36);
+    __ rol(a5, a3, 28);
+    __ rol(a3, a18, 21);
+    __ rol(a18, a17, 15);
+    __ rol(a17, a11, 10);
+    __ rol(a11, a7, 6);
+    __ mov(a7, tmp0);
+
+    bcax5(a0, a1, a2, a3, a4, tmp0, tmp1, tmp2);
+    bcax5(a5, a6, a7, a8, a9, tmp0, tmp1, tmp2);
+    bcax5(a10, a11, a12, a13, a14, tmp0, tmp1, tmp2);
+    bcax5(a15, a16, a17, a18, a19, tmp0, tmp1, tmp2);
+    bcax5(a20, a21, a22, a23, a24, tmp0, tmp1, tmp2);
+
+    __ ldr(tmp1, __ post(rc, 8));
+    __ eor(a0, a0, tmp1);
+
+  }
+
+  // Arguments:
+  //
+  // Inputs:
+  //   c_rarg0   - byte[]  source+offset
+  //   c_rarg1   - byte[]  SHA.state
+  //   c_rarg2   - int     block_size
+  //   c_rarg3   - int     offset
+  //   c_rarg4   - int     limit
+  //
+  address generate_sha3_implCompress_gpr(StubGenStubId stub_id) {
+    bool multi_block;
+    switch (stub_id) {
+    case sha3_implCompress_id:
+      multi_block = false;
+      break;
+    case sha3_implCompressMB_id:
+      multi_block = true;
+      break;
+    default:
+      ShouldNotReachHere();
+    }
+
+    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
+    };
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+
+    Register buf           = c_rarg0;
+    Register state         = c_rarg1;
+    Register block_size    = c_rarg2;
+    Register ofs           = c_rarg3;
+    Register limit         = c_rarg4;
+
+    // use r3.r17,r19..r28 to keep a0..a24.
+    // a0..a24 are respective locals from SHA3.java
+    Register a0 = r25,
+             a1 = r26,
+             a2 = r27,
+             a3 = r3,
+             a4 = r4,
+             a5 = r5,
+             a6 = r6,
+             a7 = r7,
+             a8 = rscratch1, // r8
+             a9 = rscratch2, // r9
+             a10 = r10,
+             a11 = r11,
+             a12 = r12,
+             a13 = r13,
+             a14 = r14,
+             a15 = r15,
+             a16 = r16,
+             a17 = r17,
+             a18 = r28,
+             a19 = r19,
+             a20 = r20,
+             a21 = r21,
+             a22 = r22,
+             a23 = r23,
+             a24 = r24;
+
+    Register tmp0 = block_size, tmp1 = buf, tmp2 = state, tmp3 = r30;
+
+    Label sha3_loop, rounds24_preloop, loop_body;
+    Label sha3_512_or_sha3_384, shake128;
+
+    bool can_use_r18 = false;
+#ifndef R18_RESERVED
+    can_use_r18 = true;
+#endif
+    bool can_use_fp = !PreserveFramePointer;
+
+    __ enter();
+
+    // save almost all yet unsaved gpr registers on stack
+    __ str(block_size, __ pre(sp, -128));
+    if (multi_block) {
+      __ stpw(ofs, limit, Address(sp, 8));
+    }
+    // 8 bytes at sp+16 will be used to keep buf
+    __ stp(r19, r20, Address(sp, 32));
+    __ stp(r21, r22, Address(sp, 48));
+    __ stp(r23, r24, Address(sp, 64));
+    __ stp(r25, r26, Address(sp, 80));
+    __ stp(r27, r28, Address(sp, 96));
+    if (can_use_r18 && can_use_fp) {
+      __ stp(r18_tls, state, Address(sp, 112));
+    } else {
+      __ str(state, Address(sp, 112));
+    }
+
+    // begin sha3 calculations: loading a0..a24 from state arrary
+    __ ldp(a0, a1, state);
+    __ ldp(a2, a3, Address(state, 16));
+    __ ldp(a4, a5, Address(state, 32));
+    __ ldp(a6, a7, Address(state, 48));
+    __ ldp(a8, a9, Address(state, 64));
+    __ ldp(a10, a11, Address(state, 80));
+    __ ldp(a12, a13, Address(state, 96));
+    __ ldp(a14, a15, Address(state, 112));
+    __ ldp(a16, a17, Address(state, 128));
+    __ ldp(a18, a19, Address(state, 144));
+    __ ldp(a20, a21, Address(state, 160));
+    __ ldp(a22, a23, Address(state, 176));
+    __ ldr(a24, Address(state, 192));
+
+    __ BIND(sha3_loop);
+
+    // load input
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a0, a0, tmp3);
+    __ eor(a1, a1, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a2, a2, tmp3);
+    __ eor(a3, a3, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a4, a4, tmp3);
+    __ eor(a5, a5, tmp2);
+    __ ldr(tmp3, __ post(buf, 8));
+    __ eor(a6, a6, tmp3);
+
+    // block_size == 72, SHA3-512; block_size == 104, SHA3-384
+    __ tbz(block_size, 7, sha3_512_or_sha3_384);
+
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a7, a7, tmp3);
+    __ eor(a8, a8, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a9, a9, tmp3);
+    __ eor(a10, a10, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a11, a11, tmp3);
+    __ eor(a12, a12, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a13, a13, tmp3);
+    __ eor(a14, a14, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a15, a15, tmp3);
+    __ eor(a16, a16, tmp2);
+
+    // block_size == 136, bit4 == 0 and bit5 == 0, SHA3-256 or SHAKE256
+    __ andw(tmp2, block_size, 48);
+    __ cbzw(tmp2, rounds24_preloop);
+    __ tbnz(block_size, 5, shake128);
+    // block_size == 144, bit5 == 0, SHA3-244
+    __ ldr(tmp3, __ post(buf, 8));
+    __ eor(a17, a17, tmp3);
+    __ b(rounds24_preloop);
+
+    __ BIND(shake128);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a17, a17, tmp3);
+    __ eor(a18, a18, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a19, a19, tmp3);
+    __ eor(a20, a20, tmp2);
+    __ b(rounds24_preloop); // block_size == 168, SHAKE128
+
+    __ BIND(sha3_512_or_sha3_384);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a7, a7, tmp3);
+    __ eor(a8, a8, tmp2);
+    __ tbz(block_size, 5, rounds24_preloop); // SHA3-512
+
+    // SHA3-384
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a9, a9, tmp3);
+    __ eor(a10, a10, tmp2);
+    __ ldp(tmp3, tmp2, __ post(buf, 16));
+    __ eor(a11, a11, tmp3);
+    __ eor(a12, a12, tmp2);
+
+    __ BIND(rounds24_preloop);
+    __ fmovs(v0, 24.0); // float loop counter,
+    __ fmovs(v1, 1.0);  // exact representation
+
+    __ str(buf, Address(sp, 16));
+    __ lea(tmp3, ExternalAddress((address) round_consts));
+
+    __ BIND(loop_body);
+    keccak_round_gpr(can_use_fp, can_use_r18, tmp3,
+                     a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
+                     a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24,
+                     tmp0, tmp1, tmp2);
+    __ fsubs(v0, v0, v1);
+    __ fcmps(v0, 0.0);
+    __ br(__ NE, loop_body);
+
+    if (multi_block) {
+      __ ldrw(block_size, sp); // block_size
+      __ ldpw(tmp2, tmp1, Address(sp, 8)); // offset, limit
+      __ addw(tmp2, tmp2, block_size);
+      __ cmpw(tmp2, tmp1);
+      __ strw(tmp2, Address(sp, 8)); // store offset in case we're jumping
+      __ ldr(buf, Address(sp, 16)); // restore buf in case we're jumping
+      __ br(Assembler::LE, sha3_loop);
+      __ movw(c_rarg0, tmp2); // return offset
+    }
+    if (can_use_fp && can_use_r18) {
+      __ ldp(r18_tls, state, Address(sp, 112));
+    } else {
+      __ ldr(state, Address(sp, 112));
+    }
+    // save calculated sha3 state
+    __ stp(a0, a1, Address(state));
+    __ stp(a2, a3, Address(state, 16));
+    __ stp(a4, a5, Address(state, 32));
+    __ stp(a6, a7, Address(state, 48));
+    __ stp(a8, a9, Address(state, 64));
+    __ stp(a10, a11, Address(state, 80));
+    __ stp(a12, a13, Address(state, 96));
+    __ stp(a14, a15, Address(state, 112));
+    __ stp(a16, a17, Address(state, 128));
+    __ stp(a18, a19, Address(state, 144));
+    __ stp(a20, a21, Address(state, 160));
+    __ stp(a22, a23, Address(state, 176));
+    __ str(a24, Address(state, 192));
+
+    // restore required registers from stack
+    __ ldp(r19, r20, Address(sp, 32));
+    __ ldp(r21, r22, Address(sp, 48));
+    __ ldp(r23, r24, Address(sp, 64));
+    __ ldp(r25, r26, Address(sp, 80));
+    __ ldp(r27, r28, Address(sp, 96));
+    if (can_use_fp && can_use_r18) {
+      __ add(rfp, sp, 128); // leave() will copy rfp to sp below
+    } // else no need to recalculate rfp, since it wasn't changed
+
+    __ leave();
+
+    __ ret(lr);
+
+    return start;
+  }
+
   /**
    *  Arguments:
    *
@@ -11512,9 +11872,15 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_sha512_implCompressMB = generate_sha512_implCompress(StubGenStubId::sha512_implCompressMB_id);
     }
     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);
+      if (UseSIMDForSHA3Intrinsic) {
+         StubRoutines::_sha3_implCompress     = generate_sha3_implCompress(StubGenStubId::sha3_implCompress_id);
+         StubRoutines::_sha3_implCompressMB   = generate_sha3_implCompress(StubGenStubId::sha3_implCompressMB_id);
+      } else {
+         StubRoutines::_sha3_implCompress     = generate_sha3_implCompress_gpr(StubGenStubId::sha3_implCompress_id);
+         StubRoutines::_sha3_implCompressMB   = generate_sha3_implCompress_gpr(StubGenStubId::sha3_implCompressMB_id);
+      }
     }
 
     if (UsePoly1305Intrinsics) {
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 6ed7a6be585..941cb254532 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -379,7 +379,7 @@ void VM_Version::initialize() {
         FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
       }
     }
-  } else if (UseSHA3Intrinsics) {
+  } else if (UseSHA3Intrinsics && UseSIMDForSHA3Intrinsic) {
     warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
     FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
   }
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3Intrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3Intrinsics.java
index f4d16af854e..44bfa10e36d 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3Intrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3Intrinsics.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.
  * Copyright (c) 2020, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -40,6 +40,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -Dalgorithm=SHA3-224
  *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -58,6 +59,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -Dalgorithm=SHA3-256
  *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -76,6 +78,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -Dalgorithm=SHA3-384
  *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -94,6 +97,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -Dalgorithm=SHA3-512
  *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -110,6 +114,128 @@
  *                    negative_224.log negative_256.log negative_384.log negative_512.log
  */
 
+/**
+ * @test
+ * @bug 8337666
+ * @requires os.arch == "aarch64"
+ * @summary Verify that SHA3-224, SHA3-256, SHA3-384, SHA3-512 intrinsic is actually used.
+ *          -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *
+ * @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 main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -Dalgorithm=SHA3-224
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -Dalgorithm=SHA3-256
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -Dalgorithm=SHA3-384
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -Dalgorithm=SHA3-512
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
+ *                    compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log positive_384.log positive_512.log
+ */
+
+/**
+ * @test
+ * @bug 8337666
+ * @requires os.arch == "aarch64"
+ * @summary Verify that SHA3-224, SHA3-256, SHA3-384, SHA3-512 intrinsic is actually used.
+ *          -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *
+ * @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 main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -Dalgorithm=SHA3-224
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -Dalgorithm=SHA3-256
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -Dalgorithm=SHA3-384
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -Dalgorithm=SHA3-512
+ *                   compiler.intrinsics.sha.sanity.TestSHA3Intrinsics
+ * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
+ *                    compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log positive_384.log positive_512.log
+ */
+
 package compiler.intrinsics.sha.sanity;
 
 import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3MultiBlockIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3MultiBlockIntrinsics.java
index d350a5f0b13..b6b3fb22dd5 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3MultiBlockIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3MultiBlockIntrinsics.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.
  * Copyright (c) 2020, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -40,6 +40,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
  *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-224
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
@@ -50,6 +51,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-224
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
@@ -67,6 +69,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
  *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-256
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
@@ -77,6 +80,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-256
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
@@ -94,6 +98,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
  *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-384
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
@@ -104,6 +109,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-384
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
@@ -121,6 +127,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
  *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-512
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
@@ -131,6 +138,7 @@
  *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
  *                   -XX:CompileOnly=sun.security.provider.SHA3::*
  *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-512
+ *                   -XX:+IgnoreUnrecognizedVMOptions -XX:+UseSIMDForSHA3Intrinsic
  *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
@@ -147,6 +155,226 @@
  *                    negative_384.log negative_512.log
  */
 
+/**
+ * @test
+ * @bug 8337666
+ * @requires os.arch == "aarch64"
+ * @summary Verify that SHA3-224, SHA3-256, SHA3-384, SHA3-512 multi block intrinsic is actually used.
+ *          -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *
+ * @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 main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-224
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-224
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-256
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-256
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-384
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-384
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-512
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-512
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:-PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
+ *                    compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
+ *                    positive_384.log positive_512.log positive_224_def.log positive_256_def.log
+ *                    positive_384_def.log positive_512_def.log
+ */
+
+/**
+ * @test
+ * @bug 8337666
+ * @requires os.arch == "aarch64"
+ * @summary Verify that SHA3-224, SHA3-256, SHA3-384, SHA3-512 multi block intrinsic is actually used.
+ *          -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *
+ * @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 main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-224
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_224_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-224
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-256
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_256_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-256
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-384
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_384_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-384
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -XX:-UseMD5Intrinsics
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   -XX:-UseSHA1Intrinsics -XX:-UseSHA256Intrinsics
+ *                   -XX:-UseSHA512Intrinsics -Dalgorithm=SHA3-512
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
+ *                   -XX:Tier4InvocationThreshold=500
+ *                   -XX:+LogCompilation -XX:LogFile=positive_512_def.log
+ *                   -XX:CompileOnly=sun.security.provider.DigestBase::*
+ *                   -XX:CompileOnly=sun.security.provider.SHA3::*
+ *                   -XX:+UseSHA3Intrinsics -Dalgorithm=SHA3-512
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-UseSIMDForSHA3Intrinsic -XX:+PreserveFramePointer
+ *                   compiler.intrinsics.sha.sanity.TestSHA3MultiBlockIntrinsics
+ * @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
+ *                    compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
+ *                    positive_384.log positive_512.log positive_224_def.log positive_256_def.log
+ *                    positive_384_def.log positive_512_def.log
+ */
+
 package compiler.intrinsics.sha.sanity;
 
 import compiler.testlibrary.sha.predicate.IntrinsicPredicates;

From c59e44a7aa2aeff0823830b698d524523b996650 Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Thu, 5 Jun 2025 15:02:02 +0000
Subject: [PATCH 883/901] 8357914: TestEmptyBootstrapMethodsAttr.java fails
 when run with TEST_THREAD_FACTORY=Virtual

Reviewed-by: lmesnik, dholmes, sspitsyn, syan
---
 test/hotspot/jtreg/ProblemList-Virtual.txt       |  1 -
 .../TestEmptyBootstrapMethodsAttr.java           | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index dbd555c1cdd..4216eddb885 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -90,7 +90,6 @@ vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.ja
 
 gc/arguments/TestNewSizeThreadIncrease.java 0000000 generic-all
 gc/g1/TestSkipRebuildRemsetPhase.java 0000000 generic-all
-runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java 8346442 generic-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 0000000 generic-all
 runtime/Thread/AsyncExceptionOnMonitorEnter.java 0000000 generic-all
 runtime/Thread/StopAtExit.java 0000000 generic-all
diff --git a/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java b/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java
index 53c85d53c44..33d42a31a04 100644
--- a/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java
+++ b/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.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
@@ -54,8 +54,13 @@ public static void main(String args[]) throws Throwable {
                 "-Duser.language=en", "-Duser.country=US", className);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldNotContain("java.lang.ClassFormatError");
-        output.shouldContain("Main method not found in class " + className);
         output.shouldHaveExitValue(1);
+        boolean vthreadMode = pb.command().toString().contains("test.thread.factory=Virtual");
+        if (vthreadMode) {
+            output.shouldContain("java.lang.NoSuchMethodException: " + className + ".main");
+        } else {
+            output.shouldContain("Main method not found in class " + className);
+        }
 
         // Test case #2:
         // Try loading class with empty bootstrap_methods table where an
@@ -69,7 +74,12 @@ public static void main(String args[]) throws Throwable {
                 "-Duser.language=en", "-Duser.country=US", className);
         output = new OutputAnalyzer(pb.start());
         output.shouldNotContain("java.lang.ClassFormatError");
-        output.shouldContain("Main method not found in class " + className);
         output.shouldHaveExitValue(1);
+        vthreadMode = pb.command().toString().contains("test.thread.factory=Virtual");
+        if (vthreadMode) {
+            output.shouldContain("java.lang.NoSuchMethodException: " + className + ".main");
+        } else {
+            output.shouldContain("Main method not found in class " + className);
+        }
     }
 }

From af87035b713f8bfe05a007a4d4670cefc6a6aaf2 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 5 Jun 2025 16:01:32 +0000
Subject: [PATCH 884/901] 8355746: Start of release updates for JDK 26 8355748:
 Add SourceVersion.RELEASE_26 8355751: Add source 26 and target 26 to javac

Co-authored-by: Joe Darcy <darcy@openjdk.org>
Reviewed-by: iris, coleenp, darcy
---
 .jcheck/conf                                  |   2 +-
 make/conf/version-numbers.conf                |  10 +-
 .../share/classfile/classFileParser.cpp       |   2 +
 .../java/lang/classfile/ClassFile.java        |  10 +-
 .../lang/reflect/ClassFileFormatVersion.java  |  14 +-
 .../javax/lang/model/SourceVersion.java       |  16 +-
 .../AbstractAnnotationValueVisitor14.java     |   4 +-
 ...AbstractAnnotationValueVisitorPreview.java |   4 +-
 .../model/util/AbstractElementVisitor14.java  |   4 +-
 .../util/AbstractElementVisitorPreview.java   |   4 +-
 .../model/util/AbstractTypeVisitor14.java     |   4 +-
 .../util/AbstractTypeVisitorPreview.java      |   4 +-
 .../lang/model/util/ElementKindVisitor14.java |   4 +-
 .../model/util/ElementKindVisitorPreview.java |   4 +-
 .../lang/model/util/ElementScanner14.java     |   4 +-
 .../model/util/ElementScannerPreview.java     |   4 +-
 .../util/SimpleAnnotationValueVisitor14.java  |   4 +-
 .../SimpleAnnotationValueVisitorPreview.java  |   4 +-
 .../model/util/SimpleElementVisitor14.java    |   4 +-
 .../util/SimpleElementVisitorPreview.java     |   4 +-
 .../lang/model/util/SimpleTypeVisitor14.java  |   4 +-
 .../model/util/SimpleTypeVisitorPreview.java  |   4 +-
 .../lang/model/util/TypeKindVisitor14.java    |   4 +-
 .../model/util/TypeKindVisitorPreview.java    |   4 +-
 .../com/sun/tools/javac/code/Source.java      |   7 +
 .../com/sun/tools/javac/jvm/ClassFile.java    |   3 +-
 .../com/sun/tools/javac/jvm/Target.java       |   3 +
 .../javac/processing/PrintingProcessor.java   |   2 +-
 .../share/data/symbols/java.base-P.sym.txt    | 829 ++++++++++++++++++
 .../data/symbols/java.compiler-P.sym.txt      |  85 ++
 .../share/data/symbols/java.desktop-P.sym.txt |  43 +
 .../share/data/symbols/java.logging-P.sym.txt |  44 +
 .../data/symbols/java.management-P.sym.txt    |  57 ++
 .../data/symbols/java.net.http-P.sym.txt      |  37 +
 .../data/symbols/java.security.jgss-P.sym.txt |  36 +
 .../data/symbols/java.xml.crypto-P.sym.txt    |  34 +
 .../share/data/symbols/jdk.attach-P.sym.txt   |  32 +
 .../share/data/symbols/jdk.compiler-P.sym.txt |  32 +
 .../symbols/jdk.crypto.cryptoki-P.sym.txt     |  31 +
 .../symbols/jdk.incubator.foreign-P.sym.txt   | 105 +++
 .../symbols/jdk.incubator.vector-P.sym.txt    | 113 +++
 .../share/data/symbols/jdk.jdi-P.sym.txt      |  32 +
 .../share/data/symbols/jdk.jfr-P.sym.txt      |  31 +
 .../share/data/symbols/jdk.jpackage-P.sym.txt |  31 +
 .../share/data/symbols/jdk.jshell-P.sym.txt   |  46 +
 .../share/data/symbols/jdk.net-P.sym.txt      |  31 +
 .../data/symbols/jdk.security.jgss-P.sym.txt  |  31 +
 src/jdk.compiler/share/data/symbols/symbols   |   5 +-
 test/hotspot/jtreg/ProblemList.txt            |   5 +
 .../CommandLine/VMDeprecatedOptions.java      |  17 +-
 .../asm/org/objectweb/asm/ClassReader.java    |   2 +-
 .../asm/org/objectweb/asm/Opcodes.java        |   1 +
 test/jdk/ProblemList.txt                      |   6 +
 .../javac/api/TestGetSourceVersions.java      |   6 +-
 .../javac/classfiles/ClassVersionChecker.java |   5 +-
 .../lib/JavacTestingAbstractProcessor.java    |  20 +-
 .../options/HelpOutputColumnWidthTest.java    |   4 +-
 .../classReaderTest/Client.nopreview.out      |   2 +-
 .../classReaderTest/Client.preview.out        |   2 +-
 .../tools/javac/versions/Versions.java        |   8 +-
 60 files changed, 1814 insertions(+), 90 deletions(-)
 create mode 100644 src/jdk.compiler/share/data/symbols/java.base-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.compiler-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.desktop-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.logging-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.management-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.net.http-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.security.jgss-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/java.xml.crypto-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.attach-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.compiler-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.incubator.vector-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.jdi-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.jfr-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.jpackage-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.jshell-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.net-P.sym.txt
 create mode 100644 src/jdk.compiler/share/data/symbols/jdk.security.jgss-P.sym.txt

diff --git a/.jcheck/conf b/.jcheck/conf
index 6ab5c2d64c2..60881e74d2a 100644
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=25
+version=26
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright
diff --git a/make/conf/version-numbers.conf b/make/conf/version-numbers.conf
index ce9e32315a9..38d6e42dff9 100644
--- a/make/conf/version-numbers.conf
+++ b/make/conf/version-numbers.conf
@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=25
+DEFAULT_VERSION_FEATURE=26
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2025-09-16
-DEFAULT_VERSION_CLASSFILE_MAJOR=69  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2026-03-17
+DEFAULT_VERSION_CLASSFILE_MAJOR=70  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=25
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25 26"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=26
 DEFAULT_PROMOTED_VERSION_PRE=ea
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 0f021c0ef4d..bfb41f8384a 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -154,6 +154,8 @@
 
 #define JAVA_25_VERSION                   69
 
+#define JAVA_26_VERSION                   70
+
 void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
   assert((bad_constant == JVM_CONSTANT_Module ||
           bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION,
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFile.java b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
index 4b529c39099..216facbdddf 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFile.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFile.java
@@ -1030,6 +1030,14 @@ default List<VerifyError> verify(Path path) throws IOException {
      */
     int JAVA_25_VERSION = 69;
 
+    /**
+     * The class major version introduced by Java SE 26, {@value}.
+     *
+     * @see ClassFileFormatVersion#RELEASE_26
+     * @since 26
+     */
+    int JAVA_26_VERSION = 70;
+
     /**
      * A minor version number {@value} indicating a class uses preview features
      * of a Java SE release since 12, for major versions {@value
@@ -1041,7 +1049,7 @@ default List<VerifyError> verify(Path path) throws IOException {
      * {@return the latest class major version supported by the current runtime}
      */
     static int latestMajorVersion() {
-        return JAVA_25_VERSION;
+        return JAVA_26_VERSION;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
index 70eb921a124..4a63dd157f8 100644
--- a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
+++ b/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java
@@ -371,6 +371,18 @@ public enum ClassFileFormatVersion {
      * <cite>The Java Virtual Machine Specification, Java SE 25 Edition</cite></a>
      */
     RELEASE_25(69),
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 26.
+     *
+     * @since 26
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jvms/se26/html/index.html">
+     * <cite>The Java Virtual Machine Specification, Java SE 26 Edition</cite></a>
+     */
+    RELEASE_26(70),
     ; // Reduce code churn when appending new constants
 
     // Note to maintainers: when adding constants for newer releases,
@@ -386,7 +398,7 @@ private ClassFileFormatVersion(int major) {
      * {@return the latest class file format version}
      */
     public static ClassFileFormatVersion latest() {
-        return RELEASE_25;
+        return RELEASE_26;
     }
 
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index 46d1a2cf9c9..6b4ae119504 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -468,6 +468,18 @@ public enum SourceVersion {
      * JEP 513: Flexible Constructor Bodies</a>
      */
     RELEASE_25,
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 26.
+     *
+     * @since 26
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jls/se26/html/index.html">
+     * <cite>The Java Language Specification, Java SE 26 Edition</cite></a>
+     */
+    RELEASE_26,
     ; // Reduce code churn when appending new constants
 
     // Note that when adding constants for newer releases, the
@@ -477,7 +489,7 @@ public enum SourceVersion {
      * {@return the latest source version that can be modeled}
      */
     public static SourceVersion latest() {
-        return RELEASE_25;
+        return RELEASE_26;
     }
 
     private static final SourceVersion latestSupported = getLatestSupported();
@@ -492,7 +504,7 @@ public static SourceVersion latest() {
     private static SourceVersion getLatestSupported() {
         int intVersion = Runtime.version().feature();
         return (intVersion >= 11) ?
-            valueOf("RELEASE_" + Math.min(25, intVersion)):
+            valueOf("RELEASE_" + Math.min(26, intVersion)):
             RELEASE_10;
     }
 
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java
index 4d36781c584..2b2f80358b0 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.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
@@ -44,7 +44,7 @@
  * @see AbstractAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public abstract class AbstractAnnotationValueVisitor14<R, P> extends AbstractAnnotationValueVisitor9<R, P> {
 
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
index 4afcc7fbf1d..59d1eb28282 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitorPreview.java
@@ -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
@@ -50,7 +50,7 @@
  * @see AbstractAnnotationValueVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractAnnotationValueVisitorPreview<R, P> extends AbstractAnnotationValueVisitor14<R, P> {
 
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
index 3a57ef18c5b..b624bb9f999 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.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
@@ -50,7 +50,7 @@
  * @see AbstractElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public abstract class AbstractElementVisitor14<R, P> extends AbstractElementVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
index b9642b203fe..761916a1434 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitorPreview.java
@@ -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
@@ -53,7 +53,7 @@
  * @see AbstractElementVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractElementVisitorPreview<R, P> extends AbstractElementVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java
index eb96f4abb99..1860cd09ac5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.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
@@ -47,7 +47,7 @@
  * @see AbstractTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public abstract class AbstractTypeVisitor14<R, P> extends AbstractTypeVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
index 74b007356d4..6b701262a4f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitorPreview.java
@@ -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
@@ -53,7 +53,7 @@
  * @see AbstractTypeVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public abstract class AbstractTypeVisitorPreview<R, P> extends AbstractTypeVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
index d7941d6e153..cb0e1cfbc9f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.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
@@ -61,7 +61,7 @@
  * @see ElementKindVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class ElementKindVisitor14<R, P> extends ElementKindVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
index 868e89c23eb..0f436e6d1e5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitorPreview.java
@@ -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
@@ -67,7 +67,7 @@
  * @see ElementKindVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class ElementKindVisitorPreview<R, P> extends ElementKindVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
index e0c05ab228e..946cf97b092 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.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
@@ -77,7 +77,7 @@
  * @see ElementScanner9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class ElementScanner14<R, P> extends ElementScanner9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
index 6d80aa8c661..a9d8e7c1f3f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScannerPreview.java
@@ -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
@@ -81,7 +81,7 @@
  * @see ElementScanner14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class ElementScannerPreview<R, P> extends ElementScanner14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java
index 4682e2a7ee8..9320e18d5dd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.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
@@ -52,7 +52,7 @@
  * @see SimpleAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class SimpleAnnotationValueVisitor14<R, P> extends SimpleAnnotationValueVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
index a477f33017c..01509c0c4a5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitorPreview.java
@@ -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
@@ -58,7 +58,7 @@
  * @see SimpleAnnotationValueVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleAnnotationValueVisitorPreview<R, P> extends SimpleAnnotationValueVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
index db97e59152f..dff1731d3c9 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.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
@@ -58,7 +58,7 @@
  * @see SimpleElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class SimpleElementVisitor14<R, P> extends SimpleElementVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
index 0d9914f3852..c3896a794c0 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitorPreview.java
@@ -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
@@ -61,7 +61,7 @@
  * @see SimpleElementVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleElementVisitorPreview<R, P> extends SimpleElementVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java
index 3f962137987..d06f5d673d3 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.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,7 +56,7 @@
  * @see SimpleTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class SimpleTypeVisitor14<R, P> extends SimpleTypeVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses; uses {@code null} for the
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
index 13a0ad41d7e..11e2e8a50d5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitorPreview.java
@@ -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,7 +62,7 @@
  * @see SimpleTypeVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class SimpleTypeVisitorPreview<R, P> extends SimpleTypeVisitor14<R, P> {
     /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java
index 57d43e77500..295ceb200b8 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.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
@@ -61,7 +61,7 @@
  * @see TypeKindVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 public class TypeKindVisitor14<R, P> extends TypeKindVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call; uses {@code null}
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
index 3ae19353a0b..c0ca3a0450a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitorPreview.java
@@ -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
@@ -66,7 +66,7 @@
  * @see TypeKindVisitor14
  * @since 23
  */
-@SupportedSourceVersion(RELEASE_25)
+@SupportedSourceVersion(RELEASE_26)
 @PreviewFeature(feature=PreviewFeature.Feature.LANGUAGE_MODEL, reflective=true)
 public class TypeKindVisitorPreview<R, P> extends TypeKindVisitor14<R, P> {
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index b0b82fa5734..063d37be4e2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -153,6 +153,11 @@ public enum Source {
       * 25, tbd
       */
     JDK25("25"),
+
+    /**
+      * 26, tbd
+      */
+    JDK26("26"),
     ; // Reduce code churn when appending new constants
 
     private static final Context.Key<Source> sourceKey = new Context.Key<>();
@@ -205,6 +210,7 @@ public boolean isSupported() {
 
     public Target requiredTarget() {
         return switch(this) {
+        case JDK26  -> Target.JDK1_26;
         case JDK25  -> Target.JDK1_25;
         case JDK24  -> Target.JDK1_24;
         case JDK23  -> Target.JDK1_23;
@@ -358,6 +364,7 @@ public static SourceVersion toSourceVersion(Source source) {
         case JDK23  -> RELEASE_23;
         case JDK24  -> RELEASE_24;
         case JDK25  -> RELEASE_25;
+        case JDK26  -> RELEASE_26;
         default     -> null;
         };
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
index 202d92f63bc..e5adecdb107 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -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
@@ -129,6 +129,7 @@ public enum Version {
         V67(67, 0),   // JDK 23
         V68(68, 0),   // JDK 24
         V69(69, 0),   // JDK 25
+        V70(70, 0),   // JDK 26
         ; // Reduce code churn when appending new constants
         Version(int major, int minor) {
             this.major = major;
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 eeca1dadc1b..f60adcb3b80 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
@@ -110,6 +110,9 @@ public enum Target {
 
     /** JDK 25. */
     JDK1_25("25", 69, 0),
+
+    /** JDK 26. */
+    JDK1_26("26", 70, 0),
     ; // Reduce code churn when appending new constants
 
     private static final Context.Key<Target> targetKey = new Context.Key<>();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
index 72a2b564ec5..7aaf035fd36 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
@@ -55,7 +55,7 @@
  * deletion without notice.</b>
  */
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_25)
+@SupportedSourceVersion(SourceVersion.RELEASE_26)
 public class PrintingProcessor extends AbstractProcessor {
     PrintWriter writer;
 
diff --git a/src/jdk.compiler/share/data/symbols/java.base-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-P.sym.txt
new file mode 100644
index 00000000000..95544fc3cac
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.base-P.sym.txt
@@ -0,0 +1,829 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+module name java.base
+header exports java/io,java/lang,java/lang/annotation,java/lang/classfile,java/lang/classfile/attribute,java/lang/classfile/constantpool,java/lang/classfile/instruction,java/lang/constant,java/lang/foreign,java/lang/invoke,java/lang/module,java/lang/ref,java/lang/reflect,java/lang/runtime,java/math,java/net,java/net/spi,java/nio,java/nio/channels,java/nio/channels/spi,java/nio/charset,java/nio/charset/spi,java/nio/file,java/nio/file/attribute,java/nio/file/spi,java/security,java/security/cert,java/security/interfaces,java/security/spec,java/text,java/text/spi,java/time,java/time/chrono,java/time/format,java/time/temporal,java/time/zone,java/util,java/util/concurrent,java/util/concurrent/atomic,java/util/concurrent/locks,java/util/function,java/util/jar,java/util/random,java/util/regex,java/util/spi,java/util/stream,java/util/zip,javax/crypto,javax/crypto/interfaces,javax/crypto/spec,javax/net,javax/net/ssl,javax/security/auth,javax/security/auth/callback,javax/security/auth/login,javax/security/auth/spi,javax/security/auth/x500,javax/security/cert,jdk/internal/event[jdk.jfr],jdk/internal/javac[java.compiler\u005C;u002C;java.desktop\u005C;u002C;jdk.compiler\u005C;u002C;jdk.incubator.vector\u005C;u002C;jdk.jartool\u005C;u002C;jdk.jdeps\u005C;u002C;jdk.jfr\u005C;u002C;jdk.jlink\u005C;u002C;jdk.jshell],jdk/internal/vm/vector[jdk.incubator.vector] extraModulePackages jdk/internal/access/foreign,jdk/internal/classfile/impl,jdk/internal/constant,jdk/internal/foreign/abi,jdk/internal/foreign/abi/aarch64/linux,jdk/internal/foreign/abi/aarch64/macos,jdk/internal/foreign/abi/aarch64/windows,jdk/internal/foreign/abi/fallback,jdk/internal/foreign/abi/ppc64/aix,jdk/internal/foreign/abi/ppc64/linux,jdk/internal/foreign/abi/riscv64/linux,jdk/internal/foreign/abi/s390/linux,jdk/internal/foreign/abi/x64/sysv,jdk/internal/foreign/abi/x64/windows,jdk/internal/foreign/layout,jdk/internal/lang/stable,sun/nio/ch,sun/net,jdk/internal/foreign,jdk/internal/foreign,sun/net,sun/nio/ch uses java/lang/System$LoggerFinder,java/net/ContentHandlerFactory,java/net/spi/InetAddressResolverProvider,java/net/spi/URLStreamHandlerProvider,java/nio/channels/spi/AsynchronousChannelProvider,java/nio/channels/spi/SelectorProvider,java/nio/charset/spi/CharsetProvider,java/nio/file/spi/FileSystemProvider,java/nio/file/spi/FileTypeDetector,java/security/Provider,java/text/spi/BreakIteratorProvider,java/text/spi/CollatorProvider,java/text/spi/DateFormatProvider,java/text/spi/DateFormatSymbolsProvider,java/text/spi/DecimalFormatSymbolsProvider,java/text/spi/NumberFormatProvider,java/time/chrono/AbstractChronology,java/time/chrono/Chronology,java/time/zone/ZoneRulesProvider,java/util/spi/CalendarDataProvider,java/util/spi/CalendarNameProvider,java/util/spi/CurrencyNameProvider,java/util/spi/LocaleNameProvider,java/util/spi/ResourceBundleControlProvider,java/util/spi/ResourceBundleProvider,java/util/spi/TimeZoneNameProvider,java/util/spi/ToolProvider,javax/security/auth/spi/LoginModule,jdk/internal/io/JdkConsoleProvider,jdk/internal/logger/DefaultLoggerFinder,sun/text/spi/JavaTimeDateTimePatternProvider,sun/util/locale/provider/LocaleDataMetaInfo,sun/util/resources/LocaleData$CommonResourceBundleProvider,sun/util/resources/LocaleData$SupplementaryResourceBundleProvider,sun/util/spi/CalendarProvider provides interface\u0020;java/nio/file/spi/FileSystemProvider\u0020;impls\u0020;jdk/internal/jrtfs/JrtFileSystemProvider target macos-aarch64 flags 8000
+
+class name java/io/Console
+-method name println descriptor (Ljava/lang/Object;)Ljava/io/Console;
+-method name print descriptor (Ljava/lang/Object;)Ljava/io/Console;
+-method name readln descriptor (Ljava/lang/String;)Ljava/lang/String;
+-method name println descriptor ()Ljava/io/Console;
+-method name readln descriptor ()Ljava/lang/String;
+
+class name java/io/FilePermission
+header extends java/security/Permission implements java/io/Serializable flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+-class name java/io/IO
+
+class name java/io/OptionalDataException
+header extends java/io/ObjectStreamException flags 31
+
+class name java/io/ProxyingConsole
+-method name println descriptor (Ljava/lang/Object;)Ljava/io/Console;
+-method name print descriptor (Ljava/lang/Object;)Ljava/io/Console;
+-method name readln descriptor (Ljava/lang/String;)Ljava/lang/String;
+-method name readln descriptor ()Ljava/lang/String;
+
+class name java/io/SerializablePermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/lang/Boolean
+-method name <init> descriptor (Z)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (Z)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/Byte
+-method name <init> descriptor (B)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (B)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/CharSequence
+method name getChars descriptor (II[CI)V flags 1
+
+class name java/lang/Character
+-method name <init> descriptor (C)V
+method name <init> descriptor (C)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/Class
+-method name isInterface descriptor ()Z
+-method name isArray descriptor ()Z
+-method name isPrimitive descriptor ()Z
+-method name getModifiers descriptor ()I
+method name isInterface descriptor ()Z flags 1
+method name isArray descriptor ()Z flags 1
+method name isPrimitive descriptor ()Z flags 1
+method name getModifiers descriptor ()I flags 1
+
+class name java/lang/Double
+-method name <init> descriptor (D)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (D)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/Float
+-method name <init> descriptor (F)V
+-method name <init> descriptor (D)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (F)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (D)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/IO
+header extends java/lang/Object flags 31
+method name println descriptor (Ljava/lang/Object;)V flags 9
+method name println descriptor ()V flags 9
+method name print descriptor (Ljava/lang/Object;)V flags 9
+method name readln descriptor ()Ljava/lang/String; flags 9
+method name readln descriptor (Ljava/lang/String;)Ljava/lang/String; flags 9
+
+class name java/lang/Integer
+-method name <init> descriptor (I)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (I)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/Long
+-method name <init> descriptor (J)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (J)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/Math
+-method name max descriptor (JJ)J
+-method name min descriptor (JJ)J
+method name max descriptor (JJ)J flags 9 runtimeAnnotations @Ljdk/internal/vm/annotation/IntrinsicCandidate;
+method name min descriptor (JJ)J flags 9 runtimeAnnotations @Ljdk/internal/vm/annotation/IntrinsicCandidate;
+method name unsignedMultiplyExact descriptor (II)I flags 9
+method name unsignedMultiplyExact descriptor (JI)J flags 9
+method name unsignedMultiplyExact descriptor (JJ)J flags 9
+method name powExact descriptor (II)I flags 9
+method name unsignedPowExact descriptor (II)I flags 9
+method name powExact descriptor (JI)J flags 9
+method name unsignedPowExact descriptor (JI)J flags 9
+
+class name java/lang/Package
+header extends java/lang/NamedPackage implements java/lang/reflect/AnnotatedElement flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/lang/ProcessHandle
+header extends java/lang/Object implements java/lang/Comparable nestMembers java/lang/ProcessHandle$Info flags 601 signature Ljava/lang/Object;Ljava/lang/Comparable<Ljava/lang/ProcessHandle;>;
+innerclass innerClass java/lang/ProcessHandle$Info outerClass java/lang/ProcessHandle innerClassName Info flags 609
+
+class name java/lang/Runtime
+header extends java/lang/Object nestMembers java/lang/Runtime$Version flags 31
+innerclass innerClass java/lang/Runtime$Version outerClass java/lang/Runtime innerClassName Version flags 19
+
+class name java/lang/RuntimePermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/lang/Short
+-method name <init> descriptor (S)V
+-method name <init> descriptor (Ljava/lang/String;)V
+method name <init> descriptor (S)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes java/lang/NumberFormatException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
+
+class name java/lang/StableValue
+header extends java/lang/Object sealed true permittedSubclasses jdk/internal/lang/stable/StableValueImpl flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STABLE_VALUES;)
+method name trySet descriptor (Ljava/lang/Object;)Z flags 401 signature (TT;)Z
+method name orElse descriptor (Ljava/lang/Object;)Ljava/lang/Object; flags 401 signature (TT;)TT;
+method name orElseThrow descriptor ()Ljava/lang/Object; flags 401 signature ()TT;
+method name isSet descriptor ()Z flags 401
+method name orElseSet descriptor (Ljava/util/function/Supplier;)Ljava/lang/Object; flags 401 signature (Ljava/util/function/Supplier<+TT;>;)TT;
+method name setOrThrow descriptor (Ljava/lang/Object;)V flags 401 signature (TT;)V
+method name equals descriptor (Ljava/lang/Object;)Z flags 401
+method name hashCode descriptor ()I flags 401
+method name of descriptor ()Ljava/lang/StableValue; flags 9 signature <T:Ljava/lang/Object;>()Ljava/lang/StableValue<TT;>;
+method name of descriptor (Ljava/lang/Object;)Ljava/lang/StableValue; flags 9 signature <T:Ljava/lang/Object;>(TT;)Ljava/lang/StableValue<TT;>;
+method name supplier descriptor (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; flags 9 signature <T:Ljava/lang/Object;>(Ljava/util/function/Supplier<+TT;>;)Ljava/util/function/Supplier<TT;>;
+method name intFunction descriptor (ILjava/util/function/IntFunction;)Ljava/util/function/IntFunction; flags 9 signature <R:Ljava/lang/Object;>(ILjava/util/function/IntFunction<+TR;>;)Ljava/util/function/IntFunction<TR;>;
+method name function descriptor (Ljava/util/Set;Ljava/util/function/Function;)Ljava/util/function/Function; flags 9 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/Set<+TT;>;Ljava/util/function/Function<-TT;+TR;>;)Ljava/util/function/Function<TT;TR;>;
+method name list descriptor (ILjava/util/function/IntFunction;)Ljava/util/List; flags 9 signature <E:Ljava/lang/Object;>(ILjava/util/function/IntFunction<+TE;>;)Ljava/util/List<TE;>;
+method name map descriptor (Ljava/util/Set;Ljava/util/function/Function;)Ljava/util/Map; flags 9 signature <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Set<TK;>;Ljava/util/function/Function<-TK;+TV;>;)Ljava/util/Map<TK;TV;>;
+
+class name java/lang/StrictMath
+method name unsignedMultiplyExact descriptor (II)I flags 9
+method name unsignedMultiplyExact descriptor (JI)J flags 9
+method name unsignedMultiplyExact descriptor (JJ)J flags 9
+method name powExact descriptor (II)I flags 9
+method name unsignedPowExact descriptor (II)I flags 9
+method name powExact descriptor (JI)J flags 9
+method name unsignedPowExact descriptor (JI)J flags 9
+
+class name java/lang/classfile/ClassFile
+field name JAVA_25_VERSION descriptor I constantValue 69 flags 19
+
+class name java/lang/classfile/CodeElement
+header extends java/lang/Object implements java/lang/classfile/ClassFileElement sealed true permittedSubclasses java/lang/classfile/Instruction,java/lang/classfile/PseudoInstruction,java/lang/classfile/CustomAttribute,java/lang/classfile/attribute/RuntimeVisibleTypeAnnotationsAttribute,java/lang/classfile/attribute/RuntimeInvisibleTypeAnnotationsAttribute,java/lang/classfile/attribute/StackMapTableAttribute,java/lang/classfile/attribute/UnknownAttribute flags 601
+
+class name java/lang/classfile/attribute/UnknownAttribute
+header extends java/lang/Object implements java/lang/classfile/Attribute,java/lang/classfile/ClassElement,java/lang/classfile/MethodElement,java/lang/classfile/FieldElement,java/lang/classfile/CodeElement sealed true permittedSubclasses jdk/internal/classfile/impl/BoundAttribute$BoundUnknownAttribute flags 601 signature Ljava/lang/Object;Ljava/lang/classfile/Attribute<Ljava/lang/classfile/attribute/UnknownAttribute;>;Ljava/lang/classfile/ClassElement;Ljava/lang/classfile/MethodElement;Ljava/lang/classfile/FieldElement;Ljava/lang/classfile/CodeElement;
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundUnknownAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundUnknownAttribute flags 19
+
+class name java/lang/classfile/constantpool/ClassEntry
+method name matches descriptor (Ljava/lang/constant/ClassDesc;)Z flags 401
+
+class name java/lang/classfile/constantpool/ConstantPoolBuilder
+header extends java/lang/Object implements java/lang/classfile/constantpool/ConstantPool sealed true permittedSubclasses jdk/internal/classfile/impl/SplitConstantPool,jdk/internal/classfile/impl/TemporaryConstantPool flags 601
+innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$ClassEntryImpl outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName ClassEntryImpl flags 19
+innerclass innerClass java/lang/constant/DirectMethodHandleDesc$Kind outerClass java/lang/constant/DirectMethodHandleDesc innerClassName Kind flags 4019
+innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$MethodHandleEntryImpl outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName MethodHandleEntryImpl flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$InvokeDynamicEntryImpl outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName InvokeDynamicEntryImpl flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$ConstantDynamicEntryImpl outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName ConstantDynamicEntryImpl flags 19
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/lang/classfile/constantpool/MethodTypeEntry
+method name matches descriptor (Ljava/lang/constant/MethodTypeDesc;)Z flags 401
+
+class name java/lang/classfile/constantpool/ModuleEntry
+method name matches descriptor (Ljava/lang/constant/ModuleDesc;)Z flags 401
+
+class name java/lang/classfile/constantpool/PackageEntry
+method name matches descriptor (Ljava/lang/constant/PackageDesc;)Z flags 401
+
+class name java/lang/classfile/constantpool/StringEntry
+method name equalsString descriptor (Ljava/lang/String;)Z flags 401
+
+class name java/lang/classfile/constantpool/Utf8Entry
+method name isFieldType descriptor (Ljava/lang/constant/ClassDesc;)Z flags 401
+method name isMethodType descriptor (Ljava/lang/constant/MethodTypeDesc;)Z flags 401
+
+class name java/lang/constant/DynamicCallSiteDesc
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/lang/foreign/Linker$Option
+header extends java/lang/Object nestHost java/lang/foreign/Linker sealed true permittedSubclasses jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl flags 601
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName FirstVariadicArg flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$CaptureCallState outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName CaptureCallState flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$Critical outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName Critical flags 4019
+innerclass innerClass java/lang/foreign/Linker$Option outerClass java/lang/foreign/Linker innerClassName Option flags 609
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName LinkerOptionImpl flags 609
+
+class name java/lang/invoke/MethodHandleProxies
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+innerclass innerClass java/lang/classfile/ClassFile$Option outerClass java/lang/classfile/ClassFile innerClassName Option flags 609
+innerclass innerClass java/lang/classfile/ClassFile$ClassHierarchyResolverOption outerClass java/lang/classfile/ClassFile innerClassName ClassHierarchyResolverOption flags 609
+innerclass innerClass java/lang/module/ModuleDescriptor$Modifier outerClass java/lang/module/ModuleDescriptor innerClassName Modifier flags 4019
+innerclass innerClass java/lang/module/ModuleDescriptor$Builder outerClass java/lang/module/ModuleDescriptor innerClassName Builder flags 19
+innerclass innerClass java/lang/classfile/CodeBuilder$CatchBuilder outerClass java/lang/classfile/CodeBuilder innerClassName CatchBuilder flags 609
+innerclass innerClass java/lang/classfile/CodeBuilder$BlockCodeBuilder outerClass java/lang/classfile/CodeBuilder innerClassName BlockCodeBuilder flags 609
+innerclass innerClass java/lang/invoke/TypeDescriptor$OfField outerClass java/lang/invoke/TypeDescriptor innerClassName OfField flags 609
+
+class name java/lang/invoke/MethodHandles
+header extends java/lang/Object nestMembers java/lang/invoke/MethodHandles$Lookup,java/lang/invoke/MethodHandles$Lookup$ClassOption flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+innerclass innerClass java/lang/invoke/VarHandle$AccessMode outerClass java/lang/invoke/VarHandle innerClassName AccessMode flags 4019
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup$ClassOption outerClass java/lang/invoke/MethodHandles$Lookup innerClassName ClassOption flags 4019
+
+class name java/lang/invoke/SegmentVarHandle
+header extends java/lang/invoke/VarHandle flags 30
+method name withInvokeExactBehavior descriptor ()Ljava/lang/invoke/SegmentVarHandle; flags 1
+method name withInvokeBehavior descriptor ()Ljava/lang/invoke/SegmentVarHandle; flags 1
+method name withInvokeBehavior descriptor ()Ljava/lang/invoke/VarHandle; flags 1041
+method name withInvokeExactBehavior descriptor ()Ljava/lang/invoke/VarHandle; flags 1041
+
+class name java/lang/invoke/VarHandle
+header extends java/lang/Object implements java/lang/constant/Constable nestMembers java/lang/invoke/VarHandle$VarHandleDesc,java/lang/invoke/VarHandle$AccessMode sealed true permittedSubclasses java/lang/invoke/IndirectVarHandle,java/lang/invoke/LazyInitializingVarHandle,java/lang/invoke/SegmentVarHandle,java/lang/invoke/VarHandleByteArrayAsChars$ByteArrayViewVarHandle,java/lang/invoke/VarHandleByteArrayAsDoubles$ByteArrayViewVarHandle,java/lang/invoke/VarHandleByteArrayAsFloats$ByteArrayViewVarHandle,java/lang/invoke/VarHandleByteArrayAsInts$ByteArrayViewVarHandle,java/lang/invoke/VarHandleByteArrayAsLongs$ByteArrayViewVarHandle,java/lang/invoke/VarHandleByteArrayAsShorts$ByteArrayViewVarHandle,java/lang/invoke/VarHandleBooleans$Array,java/lang/invoke/VarHandleBooleans$FieldInstanceReadOnly,java/lang/invoke/VarHandleBooleans$FieldStaticReadOnly,java/lang/invoke/VarHandleBytes$Array,java/lang/invoke/VarHandleBytes$FieldInstanceReadOnly,java/lang/invoke/VarHandleBytes$FieldStaticReadOnly,java/lang/invoke/VarHandleChars$Array,java/lang/invoke/VarHandleChars$FieldInstanceReadOnly,java/lang/invoke/VarHandleChars$FieldStaticReadOnly,java/lang/invoke/VarHandleDoubles$Array,java/lang/invoke/VarHandleDoubles$FieldInstanceReadOnly,java/lang/invoke/VarHandleDoubles$FieldStaticReadOnly,java/lang/invoke/VarHandleFloats$Array,java/lang/invoke/VarHandleFloats$FieldInstanceReadOnly,java/lang/invoke/VarHandleFloats$FieldStaticReadOnly,java/lang/invoke/VarHandleInts$Array,java/lang/invoke/VarHandleInts$FieldInstanceReadOnly,java/lang/invoke/VarHandleInts$FieldStaticReadOnly,java/lang/invoke/VarHandleLongs$Array,java/lang/invoke/VarHandleLongs$FieldInstanceReadOnly,java/lang/invoke/VarHandleLongs$FieldStaticReadOnly,java/lang/invoke/VarHandleReferences$Array,java/lang/invoke/VarHandleReferences$FieldInstanceReadOnly,java/lang/invoke/VarHandleReferences$FieldStaticReadOnly,java/lang/invoke/VarHandleShorts$Array,java/lang/invoke/VarHandleShorts$FieldInstanceReadOnly,java/lang/invoke/VarHandleShorts$FieldStaticReadOnly flags 421
+innerclass innerClass java/lang/invoke/VarHandle$AccessMode outerClass java/lang/invoke/VarHandle innerClassName AccessMode flags 4019
+innerclass innerClass java/lang/invoke/VarHandle$VarHandleDesc outerClass java/lang/invoke/VarHandle innerClassName VarHandleDesc flags 19
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsChars$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsChars innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsDoubles$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsDoubles innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsFloats$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsFloats innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsInts$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsInts innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsLongs$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsLongs innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleByteArrayAsShorts$ByteArrayViewVarHandle outerClass java/lang/invoke/VarHandleByteArrayAsShorts innerClassName ByteArrayViewVarHandle flags 408
+innerclass innerClass java/lang/invoke/VarHandleBooleans$Array outerClass java/lang/invoke/VarHandleBooleans innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleBooleans$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleBooleans innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleBooleans$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleBooleans innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleBytes$Array outerClass java/lang/invoke/VarHandleBytes innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleBytes$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleBytes innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleBytes$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleBytes innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleChars$Array outerClass java/lang/invoke/VarHandleChars innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleChars$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleChars innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleChars$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleChars innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleDoubles$Array outerClass java/lang/invoke/VarHandleDoubles innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleDoubles$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleDoubles innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleDoubles$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleDoubles innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleFloats$Array outerClass java/lang/invoke/VarHandleFloats innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleFloats$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleFloats innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleFloats$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleFloats innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleInts$Array outerClass java/lang/invoke/VarHandleInts innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleInts$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleInts innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleInts$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleInts innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleLongs$Array outerClass java/lang/invoke/VarHandleLongs innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleLongs$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleLongs innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleLongs$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleLongs innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleReferences$Array outerClass java/lang/invoke/VarHandleReferences innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleReferences$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleReferences innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleReferences$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleReferences innerClassName FieldStaticReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleShorts$Array outerClass java/lang/invoke/VarHandleShorts innerClassName Array flags 18
+innerclass innerClass java/lang/invoke/VarHandleShorts$FieldInstanceReadOnly outerClass java/lang/invoke/VarHandleShorts innerClassName FieldInstanceReadOnly flags 8
+innerclass innerClass java/lang/invoke/VarHandleShorts$FieldStaticReadOnly outerClass java/lang/invoke/VarHandleShorts innerClassName FieldStaticReadOnly flags 8
+
+-class name java/lang/invoke/VarHandleSegmentAsBytes
+
+-class name java/lang/invoke/VarHandleSegmentAsChars
+
+-class name java/lang/invoke/VarHandleSegmentAsDoubles
+
+-class name java/lang/invoke/VarHandleSegmentAsFloats
+
+-class name java/lang/invoke/VarHandleSegmentAsInts
+
+-class name java/lang/invoke/VarHandleSegmentAsLongs
+
+-class name java/lang/invoke/VarHandleSegmentAsShorts
+
+-class name java/lang/invoke/VarHandleSegmentViewBase
+
+class name java/lang/module/ModuleDescriptor
+header extends java/lang/Object implements java/lang/Comparable nestMembers java/lang/module/ModuleDescriptor$Builder,java/lang/module/ModuleDescriptor$Version,java/lang/module/ModuleDescriptor$Provides,java/lang/module/ModuleDescriptor$Opens,java/lang/module/ModuleDescriptor$Opens$Modifier,java/lang/module/ModuleDescriptor$Exports,java/lang/module/ModuleDescriptor$Exports$Modifier,java/lang/module/ModuleDescriptor$Requires,java/lang/module/ModuleDescriptor$Requires$Modifier,java/lang/module/ModuleDescriptor$Modifier flags 31 signature Ljava/lang/Object;Ljava/lang/Comparable<Ljava/lang/module/ModuleDescriptor;>;
+innerclass innerClass java/lang/module/ModuleDescriptor$Version outerClass java/lang/module/ModuleDescriptor innerClassName Version flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Modifier outerClass java/lang/module/ModuleDescriptor innerClassName Modifier flags 4019
+innerclass innerClass java/lang/reflect/AccessFlag$Location outerClass java/lang/reflect/AccessFlag innerClassName Location flags 4019
+innerclass innerClass java/lang/module/ModuleDescriptor$Builder outerClass java/lang/module/ModuleDescriptor innerClassName Builder flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Provides outerClass java/lang/module/ModuleDescriptor innerClassName Provides flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Opens outerClass java/lang/module/ModuleDescriptor innerClassName Opens flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Exports outerClass java/lang/module/ModuleDescriptor innerClassName Exports flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Requires outerClass java/lang/module/ModuleDescriptor innerClassName Requires flags 19
+innerclass innerClass java/lang/module/ModuleDescriptor$Opens$Modifier outerClass java/lang/module/ModuleDescriptor$Opens innerClassName Modifier flags 4019
+innerclass innerClass java/lang/module/ModuleDescriptor$Exports$Modifier outerClass java/lang/module/ModuleDescriptor$Exports innerClassName Modifier flags 4019
+innerclass innerClass java/lang/module/ModuleDescriptor$Requires$Modifier outerClass java/lang/module/ModuleDescriptor$Requires innerClassName Modifier flags 4019
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/lang/ref/Cleaner
+-method name register descriptor (Ljava/lang/Object;Ljava/lang/Runnable;)Ljava/lang/ref/Cleaner$Cleanable;
+method name register descriptor (Ljava/lang/Object;Ljava/lang/Runnable;)Ljava/lang/ref/Cleaner$Cleanable; flags 1 runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;;
+
+class name java/lang/ref/PhantomReference
+header extends java/lang/ref/Reference flags 21 signature <T:Ljava/lang/Object;>Ljava/lang/ref/Reference<TT;>; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+-method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V
+method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V flags 1 signature (TT;Ljava/lang/ref/ReferenceQueue<-TT;>;)V runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;;
+
+class name java/lang/ref/Reference
+header extends java/lang/Object sealed true permittedSubclasses java/lang/ref/PhantomReference,java/lang/ref/SoftReference,java/lang/ref/WeakReference,java/lang/ref/FinalReference flags 421 signature <T:Ljava/lang/Object;>Ljava/lang/Object; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+
+class name java/lang/ref/ReferenceQueue
+header extends java/lang/Object flags 21 signature <T:Ljava/lang/Object;>Ljava/lang/Object; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+
+class name java/lang/ref/SoftReference
+header extends java/lang/ref/Reference flags 21 signature <T:Ljava/lang/Object;>Ljava/lang/ref/Reference<TT;>; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+-method name <init> descriptor (Ljava/lang/Object;)V
+-method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V
+method name <init> descriptor (Ljava/lang/Object;)V flags 1 signature (TT;)V runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;
+method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V flags 1 signature (TT;Ljava/lang/ref/ReferenceQueue<-TT;>;)V runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;;
+
+class name java/lang/ref/WeakReference
+header extends java/lang/ref/Reference flags 21 signature <T:Ljava/lang/Object;>Ljava/lang/ref/Reference<TT;>; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+-method name <init> descriptor (Ljava/lang/Object;)V
+-method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V
+method name <init> descriptor (Ljava/lang/Object;)V flags 1 signature (TT;)V runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;
+method name <init> descriptor (Ljava/lang/Object;Ljava/lang/ref/ReferenceQueue;)V flags 1 signature (TT;Ljava/lang/ref/ReferenceQueue<-TT;>;)V runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;;
+
+class name java/lang/reflect/AccessFlag
+header extends java/lang/Enum nestMembers java/lang/reflect/AccessFlag$Location flags 4031 signature Ljava/lang/Enum<Ljava/lang/reflect/AccessFlag;>;
+innerclass innerClass java/lang/reflect/AccessFlag$Location outerClass java/lang/reflect/AccessFlag innerClassName Location flags 4019
+innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
+method name maskToAccessFlags descriptor (ILjava/lang/reflect/AccessFlag$Location;Ljava/lang/reflect/ClassFileFormatVersion;)Ljava/util/Set; flags 9 signature (ILjava/lang/reflect/AccessFlag$Location;Ljava/lang/reflect/ClassFileFormatVersion;)Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+
+class name java/lang/reflect/AccessFlag$Location
+header extends java/lang/Enum nestHost java/lang/reflect/AccessFlag flags 4031 signature Ljava/lang/Enum<Ljava/lang/reflect/AccessFlag$Location;>;
+innerclass innerClass java/lang/reflect/AccessFlag$Location outerClass java/lang/reflect/AccessFlag innerClassName Location flags 4019
+innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
+method name flagsMask descriptor ()I flags 1
+method name flagsMask descriptor (Ljava/lang/reflect/ClassFileFormatVersion;)I flags 1
+method name flags descriptor ()Ljava/util/Set; flags 1 signature ()Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+method name flags descriptor (Ljava/lang/reflect/ClassFileFormatVersion;)Ljava/util/Set; flags 1 signature (Ljava/lang/reflect/ClassFileFormatVersion;)Ljava/util/Set<Ljava/lang/reflect/AccessFlag;>;
+
+class name java/lang/reflect/ClassFileFormatVersion
+field name RELEASE_25 descriptor Ljava/lang/reflect/ClassFileFormatVersion; flags 4019
+
+class name java/lang/reflect/Modifier
+header extends java/lang/Object flags 31
+
+class name java/lang/reflect/ReflectPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/lang/runtime/ObjectMethods
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/lang/runtime/SwitchBootstraps
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+innerclass innerClass java/lang/Enum$EnumDesc outerClass java/lang/Enum innerClassName EnumDesc flags 19
+innerclass innerClass java/lang/classfile/ClassFile$Option outerClass java/lang/classfile/ClassFile innerClassName Option flags 609
+innerclass innerClass java/lang/classfile/ClassFile$StackMapsOption outerClass java/lang/classfile/ClassFile innerClassName StackMapsOption flags 4019
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup$ClassOption outerClass java/lang/invoke/MethodHandles$Lookup innerClassName ClassOption flags 4019
+innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$SimpleVerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName SimpleVerificationTypeInfo flags 4019
+innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$ObjectVerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName ObjectVerificationTypeInfo flags 609
+innerclass innerClass java/lang/classfile/attribute/StackMapFrameInfo$VerificationTypeInfo outerClass java/lang/classfile/attribute/StackMapFrameInfo innerClassName VerificationTypeInfo flags 609
+
+class name java/net/HttpURLConnection
+-method name getPermission descriptor ()Ljava/security/Permission;
+method name getPermission descriptor ()Ljava/security/Permission; thrownTypes java/io/IOException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/net/InterfaceAddress
+header extends java/lang/Object flags 31
+
+class name java/net/NetPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/net/URLConnection
+-method name getPermission descriptor ()Ljava/security/Permission;
+method name getPermission descriptor ()Ljava/security/Permission; thrownTypes java/io/IOException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/net/URLDecoder
+header extends java/lang/Object flags 31
+
+class name java/net/URLEncoder
+header extends java/lang/Object flags 31
+
+class name java/net/URLPermission
+header extends java/security/Permission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
+
+class name java/nio/CharBuffer
+method name getChars descriptor (II[CI)V flags 1
+
+class name java/nio/charset/CoderResult
+header extends java/lang/Object flags 31
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/nio/charset/CodingErrorAction
+header extends java/lang/Object flags 31
+
+class name java/nio/file/LinkPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/security/DrbgParameters
+header extends java/lang/Object nestMembers java/security/DrbgParameters$Reseed,java/security/DrbgParameters$NextBytes,java/security/DrbgParameters$Instantiation,java/security/DrbgParameters$Capability flags 31
+innerclass innerClass java/security/DrbgParameters$Instantiation outerClass java/security/DrbgParameters innerClassName Instantiation flags 19
+innerclass innerClass java/security/DrbgParameters$Capability outerClass java/security/DrbgParameters innerClassName Capability flags 4019
+innerclass innerClass java/security/DrbgParameters$NextBytes outerClass java/security/DrbgParameters innerClassName NextBytes flags 19
+innerclass innerClass java/security/DrbgParameters$Reseed outerClass java/security/DrbgParameters innerClassName Reseed flags 19
+
+class name java/security/SecurityPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/security/UnresolvedPermission
+header extends java/security/Permission implements java/io/Serializable flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/time/ZoneOffset
+header extends java/time/ZoneId implements java/time/temporal/TemporalAccessor,java/time/temporal/TemporalAdjuster,java/lang/Comparable,java/io/Serializable flags 31 signature Ljava/time/ZoneId;Ljava/time/temporal/TemporalAccessor;Ljava/time/temporal/TemporalAdjuster;Ljava/lang/Comparable<Ljava/time/ZoneOffset;>;Ljava/io/Serializable; runtimeAnnotations @Ljdk/internal/ValueBased;
+
+class name java/time/format/DecimalStyle
+header extends java/lang/Object flags 31
+innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
+
+class name java/util/Base64
+header extends java/lang/Object nestMembers java/util/Base64$Decoder,java/util/Base64$Encoder flags 31
+innerclass innerClass java/util/Base64$Encoder outerClass java/util/Base64 innerClassName Encoder flags 9
+innerclass innerClass java/util/Base64$Decoder outerClass java/util/Base64 innerClassName Decoder flags 9
+
+class name java/util/Collections
+header extends java/lang/Object flags 31
+
+class name java/util/Currency
+method name availableCurrencies descriptor ()Ljava/util/stream/Stream; flags 9 signature ()Ljava/util/stream/Stream<Ljava/util/Currency;>;
+
+class name java/util/FormattableFlags
+header extends java/lang/Object flags 31
+
+class name java/util/PropertyPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name java/util/TimeZone
+-method name getTimeZone descriptor (Ljava/lang/String;)Ljava/util/TimeZone;
+-method name getAvailableIDs descriptor (I)[Ljava/lang/String;
+-method name getAvailableIDs descriptor ()[Ljava/lang/String;
+method name getTimeZone descriptor (Ljava/lang/String;)Ljava/util/TimeZone; flags 9
+method name getAvailableIDs descriptor (I)[Ljava/lang/String; flags 9
+method name getAvailableIDs descriptor ()[Ljava/lang/String; flags 9
+method name availableIDs descriptor (I)Ljava/util/stream/Stream; flags 9 signature (I)Ljava/util/stream/Stream<Ljava/lang/String;>;
+method name availableIDs descriptor ()Ljava/util/stream/Stream; flags 9 signature ()Ljava/util/stream/Stream<Ljava/lang/String;>;
+
+class name java/util/WeakHashMap
+header extends java/util/AbstractMap implements java/util/Map flags 21 signature <K:Ljava/lang/Object;V:Ljava/lang/Object;>Ljava/util/AbstractMap<TK;TV;>;Ljava/util/Map<TK;TV;>; runtimeTypeAnnotations @Ljdk/internal/RequiresIdentity;{typeParameterIndex=I0,targetType="CLASS_TYPE_PARAMETER"}
+innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
+-method name put descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+method name put descriptor (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (TK;TV;)TV; runtimeParameterAnnotations @Ljdk/internal/RequiresIdentity;;;
+
+class name java/util/concurrent/Executors
+header extends java/lang/Object flags 31
+innerclass innerClass java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory outerClass java/util/concurrent/ForkJoinPool innerClassName ForkJoinWorkerThreadFactory flags 609
+innerclass innerClass java/lang/Thread$UncaughtExceptionHandler outerClass java/lang/Thread innerClassName UncaughtExceptionHandler flags 609
+innerclass innerClass java/lang/Thread$Builder outerClass java/lang/Thread innerClassName Builder flags 609
+innerclass innerClass java/lang/Thread$Builder$OfVirtual outerClass java/lang/Thread$Builder innerClassName OfVirtual flags 609
+
+class name java/util/concurrent/ForkJoinPool
+header extends java/util/concurrent/AbstractExecutorService implements java/util/concurrent/ScheduledExecutorService nestMembers java/util/concurrent/ForkJoinPool$ManagedBlocker,java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory flags 21
+innerclass innerClass java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory outerClass java/util/concurrent/ForkJoinPool innerClassName ForkJoinWorkerThreadFactory flags 609
+innerclass innerClass java/util/concurrent/ForkJoinPool$ManagedBlocker outerClass java/util/concurrent/ForkJoinPool innerClassName ManagedBlocker flags 609
+innerclass innerClass java/lang/Thread$UncaughtExceptionHandler outerClass java/lang/Thread innerClassName UncaughtExceptionHandler flags 609
+method name schedule descriptor (Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture; flags 1 signature (Ljava/lang/Runnable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture<*>;
+method name schedule descriptor (Ljava/util/concurrent/Callable;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture; flags 1 signature <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;JLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture<TV;>;
+method name scheduleAtFixedRate descriptor (Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture; flags 1 signature (Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture<*>;
+method name scheduleWithFixedDelay descriptor (Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture; flags 1 signature (Ljava/lang/Runnable;JJLjava/util/concurrent/TimeUnit;)Ljava/util/concurrent/ScheduledFuture<*>;
+method name submitWithTimeout descriptor (Ljava/util/concurrent/Callable;JLjava/util/concurrent/TimeUnit;Ljava/util/function/Consumer;)Ljava/util/concurrent/ForkJoinTask; flags 1 signature <V:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TV;>;JLjava/util/concurrent/TimeUnit;Ljava/util/function/Consumer<-Ljava/util/concurrent/ForkJoinTask<TV;>;>;)Ljava/util/concurrent/ForkJoinTask<TV;>;
+method name cancelDelayedTasksOnShutdown descriptor ()V flags 1
+method name getDelayedTaskCount descriptor ()J flags 1
+
+class name java/util/concurrent/StructuredTaskScope
+header extends java/lang/Object implements java/lang/AutoCloseable nestMembers java/util/concurrent/StructuredTaskScope$TimeoutException,java/util/concurrent/StructuredTaskScope$FailedException,java/util/concurrent/StructuredTaskScope$Configuration,java/util/concurrent/StructuredTaskScope$Joiner,java/util/concurrent/StructuredTaskScope$Subtask,java/util/concurrent/StructuredTaskScope$Subtask$State sealed true permittedSubclasses java/util/concurrent/StructuredTaskScopeImpl flags 601 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object;Ljava/lang/AutoCloseable; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;)
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Joiner outerClass java/util/concurrent/StructuredTaskScope innerClassName Joiner flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$TimeoutException outerClass java/util/concurrent/StructuredTaskScope innerClassName TimeoutException flags 19
+innerclass innerClass java/util/concurrent/StructuredTaskScope$FailedException outerClass java/util/concurrent/StructuredTaskScope innerClassName FailedException flags 19
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Configuration outerClass java/util/concurrent/StructuredTaskScope innerClassName Configuration flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
+-method name <init> descriptor (Ljava/lang/String;Ljava/util/concurrent/ThreadFactory;)V
+-method name <init> descriptor ()V
+-method name ensureOwnerAndJoined descriptor ()V
+-method name handleComplete descriptor (Ljava/util/concurrent/StructuredTaskScope$Subtask;)V
+-method name fork descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/StructuredTaskScope$Subtask;
+-method name join descriptor ()Ljava/util/concurrent/StructuredTaskScope;
+-method name joinUntil descriptor (Ljava/time/Instant;)Ljava/util/concurrent/StructuredTaskScope;
+-method name shutdown descriptor ()V
+-method name isShutdown descriptor ()Z
+-method name close descriptor ()V
+-method name toString descriptor ()Ljava/lang/String;
+method name open descriptor (Ljava/util/concurrent/StructuredTaskScope$Joiner;Ljava/util/function/Function;)Ljava/util/concurrent/StructuredTaskScope; flags 9 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/concurrent/StructuredTaskScope$Joiner<-TT;+TR;>;Ljava/util/function/Function<Ljava/util/concurrent/StructuredTaskScope$Configuration;Ljava/util/concurrent/StructuredTaskScope$Configuration;>;)Ljava/util/concurrent/StructuredTaskScope<TT;TR;>;
+method name open descriptor (Ljava/util/concurrent/StructuredTaskScope$Joiner;)Ljava/util/concurrent/StructuredTaskScope; flags 9 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/concurrent/StructuredTaskScope$Joiner<-TT;+TR;>;)Ljava/util/concurrent/StructuredTaskScope<TT;TR;>;
+method name open descriptor ()Ljava/util/concurrent/StructuredTaskScope; flags 9 signature <T:Ljava/lang/Object;>()Ljava/util/concurrent/StructuredTaskScope<TT;Ljava/lang/Void;>;
+method name fork descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/StructuredTaskScope$Subtask; flags 401 signature <U:TT;>(Ljava/util/concurrent/Callable<+TU;>;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
+method name fork descriptor (Ljava/lang/Runnable;)Ljava/util/concurrent/StructuredTaskScope$Subtask; flags 401 signature <U:TT;>(Ljava/lang/Runnable;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
+method name join descriptor ()Ljava/lang/Object; thrownTypes java/lang/InterruptedException flags 401 signature ()TR;
+method name isCancelled descriptor ()Z flags 401
+method name close descriptor ()V flags 401
+
+class name java/util/concurrent/StructuredTaskScope$Configuration
+header extends java/lang/Object nestHost java/util/concurrent/StructuredTaskScope sealed true permittedSubclasses java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl flags 601 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;)
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Configuration outerClass java/util/concurrent/StructuredTaskScope innerClassName Configuration flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName ConfigImpl flags 18
+method name withThreadFactory descriptor (Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 401
+method name withName descriptor (Ljava/lang/String;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 401
+method name withTimeout descriptor (Ljava/time/Duration;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 401
+
+class name java/util/concurrent/StructuredTaskScope$FailedException
+header extends java/lang/RuntimeException nestHost java/util/concurrent/StructuredTaskScope flags 31 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;)
+innerclass innerClass java/util/concurrent/StructuredTaskScope$FailedException outerClass java/util/concurrent/StructuredTaskScope innerClassName FailedException flags 19
+
+class name java/util/concurrent/StructuredTaskScope$Joiner
+header extends java/lang/Object nestHost java/util/concurrent/StructuredTaskScope flags 601 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;) runtimeAnnotations @Ljava/lang/FunctionalInterface;
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Joiner outerClass java/util/concurrent/StructuredTaskScope innerClassName Joiner flags 609
+method name onFork descriptor (Ljava/util/concurrent/StructuredTaskScope$Subtask;)Z flags 1 signature (Ljava/util/concurrent/StructuredTaskScope$Subtask<+TT;>;)Z
+method name onComplete descriptor (Ljava/util/concurrent/StructuredTaskScope$Subtask;)Z flags 1 signature (Ljava/util/concurrent/StructuredTaskScope$Subtask<+TT;>;)Z
+method name result descriptor ()Ljava/lang/Object; thrownTypes java/lang/Throwable flags 401 signature ()TR;
+method name allSuccessfulOrThrow descriptor ()Ljava/util/concurrent/StructuredTaskScope$Joiner; flags 9 signature <T:Ljava/lang/Object;>()Ljava/util/concurrent/StructuredTaskScope$Joiner<TT;Ljava/util/stream/Stream<Ljava/util/concurrent/StructuredTaskScope$Subtask<TT;>;>;>;
+method name anySuccessfulResultOrThrow descriptor ()Ljava/util/concurrent/StructuredTaskScope$Joiner; flags 9 signature <T:Ljava/lang/Object;>()Ljava/util/concurrent/StructuredTaskScope$Joiner<TT;TT;>;
+method name awaitAllSuccessfulOrThrow descriptor ()Ljava/util/concurrent/StructuredTaskScope$Joiner; flags 9 signature <T:Ljava/lang/Object;>()Ljava/util/concurrent/StructuredTaskScope$Joiner<TT;Ljava/lang/Void;>;
+method name awaitAll descriptor ()Ljava/util/concurrent/StructuredTaskScope$Joiner; flags 9 signature <T:Ljava/lang/Object;>()Ljava/util/concurrent/StructuredTaskScope$Joiner<TT;Ljava/lang/Void;>;
+method name allUntil descriptor (Ljava/util/function/Predicate;)Ljava/util/concurrent/StructuredTaskScope$Joiner; flags 9 signature <T:Ljava/lang/Object;>(Ljava/util/function/Predicate<Ljava/util/concurrent/StructuredTaskScope$Subtask<+TT;>;>;)Ljava/util/concurrent/StructuredTaskScope$Joiner<TT;Ljava/util/stream/Stream<Ljava/util/concurrent/StructuredTaskScope$Subtask<TT;>;>;>;
+
+-class name java/util/concurrent/StructuredTaskScope$ShutdownOnFailure
+
+-class name java/util/concurrent/StructuredTaskScope$ShutdownOnSuccess
+
+class name java/util/concurrent/StructuredTaskScope$Subtask
+header extends java/lang/Object implements java/util/function/Supplier nestHost java/util/concurrent/StructuredTaskScope sealed true permittedSubclasses java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/function/Supplier<TT;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;)
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName SubtaskImpl flags 18
+-method name task descriptor ()Ljava/util/concurrent/Callable;
+
+-class name java/util/concurrent/StructuredTaskScope$SubtaskImpl
+
+class name java/util/concurrent/StructuredTaskScope$TimeoutException
+header extends java/lang/RuntimeException nestHost java/util/concurrent/StructuredTaskScope flags 31 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;STRUCTURED_CONCURRENCY;)
+innerclass innerClass java/util/concurrent/StructuredTaskScope$TimeoutException outerClass java/util/concurrent/StructuredTaskScope innerClassName TimeoutException flags 19
+
+class name java/util/concurrent/StructuredTaskScopeImpl
+header extends java/lang/Object implements java/util/concurrent/StructuredTaskScope nestMembers java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl,java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl flags 30 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/concurrent/StructuredTaskScope<TT;TR;>;
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Joiner outerClass java/util/concurrent/StructuredTaskScope innerClassName Joiner flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName ConfigImpl flags 18
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Configuration outerClass java/util/concurrent/StructuredTaskScope innerClassName Configuration flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName SubtaskImpl flags 18
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
+innerclass innerClass java/util/concurrent/StructuredTaskScope$TimeoutException outerClass java/util/concurrent/StructuredTaskScope innerClassName TimeoutException flags 19
+innerclass innerClass java/util/concurrent/StructuredTaskScope$FailedException outerClass java/util/concurrent/StructuredTaskScope innerClassName FailedException flags 19
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+method name fork descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/StructuredTaskScope$Subtask; flags 1 signature <U:TT;>(Ljava/util/concurrent/Callable<+TU;>;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
+method name fork descriptor (Ljava/lang/Runnable;)Ljava/util/concurrent/StructuredTaskScope$Subtask; flags 1 signature <U:TT;>(Ljava/lang/Runnable;)Ljava/util/concurrent/StructuredTaskScope$Subtask<TU;>;
+method name join descriptor ()Ljava/lang/Object; thrownTypes java/lang/InterruptedException flags 1 signature ()TR;
+method name isCancelled descriptor ()Z flags 1
+method name close descriptor ()V flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+
+class name java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl
+header extends java/lang/Record implements java/util/concurrent/StructuredTaskScope$Configuration nestHost java/util/concurrent/StructuredTaskScopeImpl record true flags 30
+recordcomponent name threadFactory descriptor Ljava/util/concurrent/ThreadFactory;
+recordcomponent name name descriptor Ljava/lang/String;
+recordcomponent name timeout descriptor Ljava/time/Duration;
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$ConfigImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName ConfigImpl flags 18
+innerclass innerClass java/lang/Thread$Builder outerClass java/lang/Thread innerClassName Builder flags 609
+innerclass innerClass java/lang/Thread$Builder$OfVirtual outerClass java/lang/Thread$Builder innerClassName OfVirtual flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Configuration outerClass java/util/concurrent/StructuredTaskScope innerClassName Configuration flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+method name withThreadFactory descriptor (Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 1
+method name withName descriptor (Ljava/lang/String;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 1
+method name withTimeout descriptor (Ljava/time/Duration;)Ljava/util/concurrent/StructuredTaskScope$Configuration; flags 1
+method name toString descriptor ()Ljava/lang/String; flags 11
+method name hashCode descriptor ()I flags 11
+method name equals descriptor (Ljava/lang/Object;)Z flags 11
+method name threadFactory descriptor ()Ljava/util/concurrent/ThreadFactory; flags 1
+method name name descriptor ()Ljava/lang/String; flags 1
+method name timeout descriptor ()Ljava/time/Duration; flags 1
+
+class name java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl
+header extends java/lang/Object implements java/util/concurrent/StructuredTaskScope$Subtask,java/lang/Runnable nestHost java/util/concurrent/StructuredTaskScopeImpl flags 30 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/concurrent/StructuredTaskScope$Subtask<TT;>;Ljava/lang/Runnable;
+innerclass innerClass java/util/concurrent/StructuredTaskScopeImpl$SubtaskImpl outerClass java/util/concurrent/StructuredTaskScopeImpl innerClassName SubtaskImpl flags 18
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask outerClass java/util/concurrent/StructuredTaskScope innerClassName Subtask flags 609
+innerclass innerClass java/util/concurrent/StructuredTaskScope$Subtask$State outerClass java/util/concurrent/StructuredTaskScope$Subtask innerClassName State flags 4019
+method name run descriptor ()V flags 1
+method name state descriptor ()Ljava/util/concurrent/StructuredTaskScope$Subtask$State; flags 1
+method name get descriptor ()Ljava/lang/Object; flags 1 signature ()TT;
+method name exception descriptor ()Ljava/lang/Throwable; flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+
+class name java/util/concurrent/locks/LockSupport
+header extends java/lang/Object flags 31
+
+class name java/util/concurrent/locks/ReentrantReadWriteLock
+header extends java/lang/Object implements java/util/concurrent/locks/ReadWriteLock,java/io/Serializable nestMembers java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock,java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock flags 21
+innerclass innerClass java/util/concurrent/locks/ReentrantReadWriteLock$ReadLock outerClass java/util/concurrent/locks/ReentrantReadWriteLock innerClassName ReadLock flags 9
+innerclass innerClass java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock outerClass java/util/concurrent/locks/ReentrantReadWriteLock innerClassName WriteLock flags 9
+innerclass innerClass java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject outerClass java/util/concurrent/locks/AbstractQueuedLongSynchronizer innerClassName ConditionObject flags 1
+
+class name java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock
+header extends java/lang/Object implements java/util/concurrent/locks/Lock,java/io/Serializable nestHost java/util/concurrent/locks/ReentrantReadWriteLock flags 21
+innerclass innerClass java/util/concurrent/locks/ReentrantReadWriteLock$WriteLock outerClass java/util/concurrent/locks/ReentrantReadWriteLock innerClassName WriteLock flags 9
+innerclass innerClass java/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject outerClass java/util/concurrent/locks/AbstractQueuedLongSynchronizer innerClassName ConditionObject flags 1
+
+class name java/util/zip/Deflater
+header extends java/lang/Object implements java/lang/AutoCloseable flags 21
+method name close descriptor ()V flags 1
+
+class name java/util/zip/Inflater
+header extends java/lang/Object implements java/lang/AutoCloseable flags 21
+method name close descriptor ()V flags 1
+
+class name javax/crypto/KDF
+header extends java/lang/Object flags 31
+innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
+
+class name javax/crypto/KDFParameters
+header extends java/lang/Object flags 601
+
+class name javax/crypto/KDFSpi
+header extends java/lang/Object flags 421
+
+class name javax/crypto/spec/HKDFParameterSpec
+header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec nestMembers javax/crypto/spec/HKDFParameterSpec$ExtractThenExpand,javax/crypto/spec/HKDFParameterSpec$Expand,javax/crypto/spec/HKDFParameterSpec$Extract,javax/crypto/spec/HKDFParameterSpec$Builder flags 601
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Builder outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Builder flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Expand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Expand flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$ExtractThenExpand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName ExtractThenExpand flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Extract outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Extract flags 19
+
+class name javax/crypto/spec/HKDFParameterSpec$Builder
+header extends java/lang/Object nestHost javax/crypto/spec/HKDFParameterSpec flags 31
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Builder outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Builder flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Extract outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Extract flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$ExtractThenExpand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName ExtractThenExpand flags 19
+
+class name javax/crypto/spec/HKDFParameterSpec$Expand
+header extends java/lang/Object implements javax/crypto/spec/HKDFParameterSpec nestHost javax/crypto/spec/HKDFParameterSpec flags 31
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Expand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Expand flags 19
+
+class name javax/crypto/spec/HKDFParameterSpec$Extract
+header extends java/lang/Object implements javax/crypto/spec/HKDFParameterSpec nestHost javax/crypto/spec/HKDFParameterSpec flags 31
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Extract outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Extract flags 19
+
+class name javax/crypto/spec/HKDFParameterSpec$ExtractThenExpand
+header extends java/lang/Object implements javax/crypto/spec/HKDFParameterSpec nestHost javax/crypto/spec/HKDFParameterSpec flags 31
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$ExtractThenExpand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName ExtractThenExpand flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Extract outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Extract flags 19
+innerclass innerClass javax/crypto/spec/HKDFParameterSpec$Expand outerClass javax/crypto/spec/HKDFParameterSpec innerClassName Expand flags 19
+
+class name javax/net/ssl/SSLPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name javax/security/auth/AuthPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name javax/security/auth/PrivateCredentialPermission
+header extends java/security/Permission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$ClassEntryImpl
+method name matches descriptor (Ljava/lang/constant/ClassDesc;)Z flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$ConstantDynamicEntryImpl
+field name sym descriptor Ljava/lang/constant/DynamicConstantDesc; flags 1 signature Ljava/lang/constant/DynamicConstantDesc<*>; runtimeAnnotations @Ljdk/internal/vm/annotation/Stable;
+method name asSymbol descriptor ()Ljava/lang/constant/DynamicConstantDesc; flags 1 signature ()Ljava/lang/constant/DynamicConstantDesc<*>;
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$InvokeDynamicEntryImpl
+field name sym descriptor Ljava/lang/constant/DynamicCallSiteDesc; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/Stable;
+method name asSymbol descriptor ()Ljava/lang/constant/DynamicCallSiteDesc; flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$MethodHandleEntryImpl
+field name sym descriptor Ljava/lang/constant/DirectMethodHandleDesc; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/Stable;
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$MethodTypeEntryImpl
+method name matches descriptor (Ljava/lang/constant/MethodTypeDesc;)Z flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$ModuleEntryImpl
+method name matches descriptor (Ljava/lang/constant/ModuleDesc;)Z flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$PackageEntryImpl
+method name matches descriptor (Ljava/lang/constant/PackageDesc;)Z flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$StringEntryImpl
+method name equalsString descriptor (Ljava/lang/String;)Z flags 1
+
+class name jdk/internal/classfile/impl/AbstractPoolEntry$Utf8EntryImpl
+method name isFieldType descriptor (Ljava/lang/constant/ClassDesc;)Z flags 1
+method name isMethodType descriptor (Ljava/lang/constant/MethodTypeDesc;)Z flags 1
+
+class name jdk/internal/classfile/impl/BlockCodeBuilderImpl
+header extends jdk/internal/classfile/impl/NonterminalCodeBuilder implements java/lang/classfile/CodeBuilder$BlockCodeBuilder flags 31
+innerclass innerClass java/lang/classfile/CodeBuilder$BlockCodeBuilder outerClass java/lang/classfile/CodeBuilder innerClassName BlockCodeBuilder flags 609
+
+class name jdk/internal/classfile/impl/BoundAttribute$BoundStackMapTableAttribute
+method name writeTo descriptor (Ljdk/internal/classfile/impl/BufWriterImpl;)V flags 1
+
+class name jdk/internal/classfile/impl/BufWriterImpl
+-method name setLabelContext descriptor (Ljdk/internal/classfile/impl/LabelContext;)V
+method name setLabelContext descriptor (Ljdk/internal/classfile/impl/LabelContext;Z)V flags 1
+method name labelsMatch descriptor (Ljdk/internal/classfile/impl/LabelContext;)Z flags 1
+
+class name jdk/internal/classfile/impl/ChainedClassBuilder
+header extends java/lang/Object implements java/lang/classfile/ClassBuilder,java/util/function/Consumer flags 31 signature Ljava/lang/Object;Ljava/lang/classfile/ClassBuilder;Ljava/util/function/Consumer<Ljava/lang/classfile/ClassElement;>;
+
+class name jdk/internal/classfile/impl/ChainedFieldBuilder
+header extends java/lang/Object implements java/lang/classfile/FieldBuilder flags 31
+
+class name jdk/internal/classfile/impl/ChainedMethodBuilder
+header extends java/lang/Object implements java/lang/classfile/MethodBuilder flags 31
+
+class name jdk/internal/classfile/impl/CodeImpl
+header extends jdk/internal/classfile/impl/BoundAttribute$BoundCodeAttribute implements jdk/internal/classfile/impl/LabelContext nestMembers jdk/internal/classfile/impl/CodeImpl$ExceptionHandlerAction flags 31
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundCodeAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundCodeAttribute flags 409
+innerclass innerClass jdk/internal/classfile/impl/CodeImpl$ExceptionHandlerAction outerClass jdk/internal/classfile/impl/CodeImpl innerClassName ExceptionHandlerAction flags 609
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundLineNumberTableAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundLineNumberTableAttribute flags 19
+innerclass innerClass java/lang/classfile/Opcode$Kind outerClass java/lang/classfile/Opcode innerClassName Kind flags 4019
+innerclass innerClass java/lang/classfile/instruction/DiscontinuedInstruction$JsrInstruction outerClass java/lang/classfile/instruction/DiscontinuedInstruction innerClassName JsrInstruction flags 609
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundCharacterRangeTableAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundCharacterRangeTableAttribute flags 19
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundLocalVariableTableAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundLocalVariableTableAttribute flags 19
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundLocalVariableTypeTableAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundLocalVariableTypeTableAttribute flags 19
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundRuntimeVisibleTypeAnnotationsAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundRuntimeVisibleTypeAnnotationsAttribute flags 19
+innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundRuntimeInvisibleTypeAnnotationsAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundRuntimeInvisibleTypeAnnotationsAttribute flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundArgumentConstantInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundArgumentConstantInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundLoadConstantInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundLoadConstantInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundLoadInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundLoadInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundStoreInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundStoreInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundIncrementInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundIncrementInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundBranchInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundBranchInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundTableSwitchInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundTableSwitchInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundLookupSwitchInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundLookupSwitchInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundFieldInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundFieldInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundInvokeInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundInvokeInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundInvokeInterfaceInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundInvokeInterfaceInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundInvokeDynamicInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundInvokeDynamicInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundNewObjectInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundNewObjectInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundNewPrimitiveArrayInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundNewPrimitiveArrayInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundNewReferenceArrayInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundNewReferenceArrayInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundTypeCheckInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundTypeCheckInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundRetInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundRetInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundNewMultidimensionalArrayInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundNewMultidimensionalArrayInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$BoundJsrInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName BoundJsrInstruction flags 19
+innerclass innerClass java/lang/classfile/instruction/ConstantInstruction$IntrinsicConstantInstruction outerClass java/lang/classfile/instruction/ConstantInstruction innerClassName IntrinsicConstantInstruction flags 609
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$UnboundLoadInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName UnboundLoadInstruction flags 19
+innerclass innerClass jdk/internal/classfile/impl/AbstractInstruction$UnboundStoreInstruction outerClass jdk/internal/classfile/impl/AbstractInstruction innerClassName UnboundStoreInstruction flags 19
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name jdk/internal/classfile/impl/DirectCodeBuilder
+method name withMaxs descriptor (Ljava/lang/classfile/CodeBuilder;II)V flags 9
+
+class name jdk/internal/classfile/impl/LabelContext
+method name canWriteDirect descriptor (Ljdk/internal/classfile/impl/LabelContext;)Z flags 1
+
+class name jdk/internal/classfile/impl/NonterminalCodeBuilder
+header extends java/lang/Object implements java/lang/classfile/CodeBuilder sealed true permittedSubclasses jdk/internal/classfile/impl/ChainedCodeBuilder,jdk/internal/classfile/impl/BlockCodeBuilderImpl flags 421
+
+class name jdk/internal/foreign/layout/ValueLayouts$AbstractValueLayout
+header extends jdk/internal/foreign/layout/AbstractLayout nestHost jdk/internal/foreign/layout/ValueLayouts sealed true permittedSubclasses jdk/internal/foreign/layout/ValueLayouts$OfBooleanImpl,jdk/internal/foreign/layout/ValueLayouts$OfByteImpl,jdk/internal/foreign/layout/ValueLayouts$OfCharImpl,jdk/internal/foreign/layout/ValueLayouts$OfShortImpl,jdk/internal/foreign/layout/ValueLayouts$OfIntImpl,jdk/internal/foreign/layout/ValueLayouts$OfFloatImpl,jdk/internal/foreign/layout/ValueLayouts$OfLongImpl,jdk/internal/foreign/layout/ValueLayouts$OfDoubleImpl,jdk/internal/foreign/layout/ValueLayouts$OfAddressImpl flags 420 signature <V:Ljdk/internal/foreign/layout/ValueLayouts$AbstractValueLayout<TV;>;:Ljava/lang/foreign/ValueLayout;>Ljdk/internal/foreign/layout/AbstractLayout<TV;>;
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$AbstractValueLayout outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName AbstractValueLayout flags 408
+innerclass innerClass java/lang/foreign/MemoryLayout$PathElement outerClass java/lang/foreign/MemoryLayout innerClassName PathElement flags 609
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfBooleanImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfBooleanImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfByteImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfByteImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfCharImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfCharImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfShortImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfShortImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfIntImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfIntImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfFloatImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfFloatImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfLongImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfLongImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfDoubleImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfDoubleImpl flags 19
+innerclass innerClass jdk/internal/foreign/layout/ValueLayouts$OfAddressImpl outerClass jdk/internal/foreign/layout/ValueLayouts innerClassName OfAddressImpl flags 19
+
+class name jdk/internal/lang/stable/StableValueImpl
+header extends java/lang/Object implements java/lang/StableValue flags 31 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/lang/StableValue<TT;>;
+method name trySet descriptor (Ljava/lang/Object;)Z flags 1 signature (TT;)Z runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name setOrThrow descriptor (Ljava/lang/Object;)V flags 1 signature (TT;)V runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name orElseThrow descriptor ()Ljava/lang/Object; flags 1 signature ()TT; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name orElse descriptor (Ljava/lang/Object;)Ljava/lang/Object; flags 1 signature (TT;)TT; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name isSet descriptor ()Z flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name orElseSet descriptor (Ljava/util/function/Supplier;)Ljava/lang/Object; flags 1 signature (Ljava/util/function/Supplier<+TT;>;)TT; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name toString descriptor ()Ljava/lang/String; flags 1
+method name of descriptor ()Ljdk/internal/lang/stable/StableValueImpl; flags 9 signature <T:Ljava/lang/Object;>()Ljdk/internal/lang/stable/StableValueImpl<TT;>;
+method name wrappedContentsAcquire descriptor ()Ljava/lang/Object; flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+
+class name jdk/internal/vm/vector/VectorSupport
+header extends java/lang/Object nestMembers jdk/internal/vm/vector/VectorSupport$VectorMask,jdk/internal/vm/vector/VectorSupport$VectorShuffle,jdk/internal/vm/vector/VectorSupport$Vector,jdk/internal/vm/vector/VectorSupport$VectorPayload,jdk/internal/vm/vector/VectorSupport$VectorSpecies flags 21
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorSpecies outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorSpecies flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorPayload outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorPayload flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorMask outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorMask flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$Vector outerClass jdk/internal/vm/vector/VectorSupport innerClassName Vector flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorShuffle outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorShuffle flags 9
+-method name isNonCapturingLambda descriptor (Ljava/lang/Object;)Z
+-method name shuffleIota descriptor (Ljava/lang/Class;Ljava/lang/Class;Ljdk/internal/vm/vector/VectorSupport$VectorSpecies;IIIILjdk/internal/vm/vector/VectorSupport$ShuffleIotaOperation;)Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;
+-method name shuffleToVector descriptor (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;ILjdk/internal/vm/vector/VectorSupport$ShuffleToVectorOperation;)Ljdk/internal/vm/vector/VectorSupport$Vector;
+-method name wrapShuffleIndexes descriptor (Ljava/lang/Class;Ljava/lang/Class;Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;ILjdk/internal/vm/vector/VectorSupport$WrapShuffleIndexesOperation;)Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;
+field name VECTOR_OP_MATHLIB_FIRST descriptor I constantValue 101 flags 19
+field name VECTOR_OP_MATHLIB_LAST descriptor I constantValue 118 flags 19
+method name libraryUnaryOp descriptor (JLjava/lang/Class;Ljava/lang/Class;ILjava/lang/String;Ljdk/internal/vm/vector/VectorSupport$Vector;Ljdk/internal/vm/vector/VectorSupport$UnaryOperation;)Ljdk/internal/vm/vector/VectorSupport$Vector; flags 9 signature <V:Ljdk/internal/vm/vector/VectorSupport$Vector<TE;>;E:Ljava/lang/Object;>(JLjava/lang/Class<+TV;>;Ljava/lang/Class<TE;>;ILjava/lang/String;TV;Ljdk/internal/vm/vector/VectorSupport$UnaryOperation<TV;*>;)TV; runtimeAnnotations @Ljdk/internal/vm/annotation/IntrinsicCandidate;
+method name libraryBinaryOp descriptor (JLjava/lang/Class;Ljava/lang/Class;ILjava/lang/String;Ljdk/internal/vm/vector/VectorSupport$VectorPayload;Ljdk/internal/vm/vector/VectorSupport$VectorPayload;Ljdk/internal/vm/vector/VectorSupport$BinaryOperation;)Ljdk/internal/vm/vector/VectorSupport$VectorPayload; flags 9 signature <V:Ljdk/internal/vm/vector/VectorSupport$VectorPayload;E:Ljava/lang/Object;>(JLjava/lang/Class<+TV;>;Ljava/lang/Class<TE;>;ILjava/lang/String;TV;TV;Ljdk/internal/vm/vector/VectorSupport$BinaryOperation<TV;*>;)TV; runtimeAnnotations @Ljdk/internal/vm/annotation/IntrinsicCandidate;
+method name getCPUFeatures descriptor ()Ljava/lang/String; flags 109
+method name loadNativeLibrary descriptor (Ljava/lang/String;)V flags 9
+
diff --git a/src/jdk.compiler/share/data/symbols/java.compiler-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.compiler-P.sym.txt
new file mode 100644
index 00000000000..2bb9c846013
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.compiler-P.sym.txt
@@ -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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/lang/model/SourceVersion
+field name RELEASE_25 descriptor Ljavax/lang/model/SourceVersion; flags 4019
+
+class name javax/lang/model/util/AbstractAnnotationValueVisitor14
+header extends javax/lang/model/util/AbstractAnnotationValueVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/AbstractAnnotationValueVisitorPreview
+header extends javax/lang/model/util/AbstractAnnotationValueVisitor14 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractAnnotationValueVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/AbstractElementVisitor14
+header extends javax/lang/model/util/AbstractElementVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/AbstractElementVisitorPreview
+header extends javax/lang/model/util/AbstractElementVisitor14 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractElementVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/AbstractTypeVisitor14
+header extends javax/lang/model/util/AbstractTypeVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/AbstractTypeVisitorPreview
+header extends javax/lang/model/util/AbstractTypeVisitor14 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/ElementKindVisitor14
+header extends javax/lang/model/util/ElementKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/ElementKindVisitorPreview
+header extends javax/lang/model/util/ElementKindVisitor14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementKindVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/ElementScanner14
+header extends javax/lang/model/util/ElementScanner9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementScanner9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/ElementScannerPreview
+header extends javax/lang/model/util/ElementScanner14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementScanner14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleAnnotationValueVisitor14
+header extends javax/lang/model/util/SimpleAnnotationValueVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleAnnotationValueVisitorPreview
+header extends javax/lang/model/util/SimpleAnnotationValueVisitor14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleAnnotationValueVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleElementVisitor14
+header extends javax/lang/model/util/SimpleElementVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleElementVisitorPreview
+header extends javax/lang/model/util/SimpleElementVisitor14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleElementVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleTypeVisitor14
+header extends javax/lang/model/util/SimpleTypeVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/SimpleTypeVisitorPreview
+header extends javax/lang/model/util/SimpleTypeVisitor14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleTypeVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/TypeKindVisitor14
+header extends javax/lang/model/util/TypeKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/TypeKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
+class name javax/lang/model/util/TypeKindVisitorPreview
+header extends javax/lang/model/util/TypeKindVisitor14 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/TypeKindVisitor14<TR;TP;>; classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;LANGUAGE_MODEL;,reflective=Ztrue) runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_25;)
+
diff --git a/src/jdk.compiler/share/data/symbols/java.desktop-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-P.sym.txt
new file mode 100644
index 00000000000..23b567b6c05
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.desktop-P.sym.txt
@@ -0,0 +1,43 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/awt/Color
+-method name createContext descriptor (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext;
+method name createContext descriptor (Ljava/awt/image/ColorModel;Ljava/awt/Rectangle;Ljava/awt/geom/Rectangle2D;Ljava/awt/geom/AffineTransform;Ljava/awt/RenderingHints;)Ljava/awt/PaintContext; flags 1
+
+class name javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener
+header extends java/lang/Object implements java/awt/event/ActionListener nestHost javax/swing/plaf/basic/BasicScrollBarUI flags 21
+innerclass innerClass javax/swing/plaf/basic/BasicScrollBarUI$ScrollListener outerClass javax/swing/plaf/basic/BasicScrollBarUI innerClassName ScrollListener flags 4
+innerclass innerClass javax/swing/plaf/basic/BasicScrollBarUI$TrackListener outerClass javax/swing/plaf/basic/BasicScrollBarUI innerClassName TrackListener flags 4
+
+class name javax/swing/plaf/basic/BasicSliderUI
+-method name <init> descriptor ()V
+
+class name javax/swing/plaf/synth/SynthLookAndFeel
+-method name load descriptor (Ljava/net/URL;)V
+
diff --git a/src/jdk.compiler/share/data/symbols/java.logging-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.logging-P.sym.txt
new file mode 100644
index 00000000000..dfcaa64bef7
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.logging-P.sym.txt
@@ -0,0 +1,44 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/util/logging/FileHandler
+-method name publish descriptor (Ljava/util/logging/LogRecord;)V
+method name publish descriptor (Ljava/util/logging/LogRecord;)V flags 1
+
+class name java/util/logging/LoggingPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name java/util/logging/SocketHandler
+-method name publish descriptor (Ljava/util/logging/LogRecord;)V
+method name publish descriptor (Ljava/util/logging/LogRecord;)V flags 1
+
+class name java/util/logging/StreamHandler
+-method name publish descriptor (Ljava/util/logging/LogRecord;)V
+method name publish descriptor (Ljava/util/logging/LogRecord;)V flags 1
+
diff --git a/src/jdk.compiler/share/data/symbols/java.management-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.management-P.sym.txt
new file mode 100644
index 00000000000..459df392e02
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.management-P.sym.txt
@@ -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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/lang/management/ManagementPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/management/MBeanPermission
+header extends java/security/Permission flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/management/MBeanServerPermission
+header extends java/security/BasicPermission flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/management/MBeanTrustPermission
+header extends java/security/BasicPermission flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/management/modelmbean/DescriptorSupport
+-method name <init> descriptor (Ljava/lang/String;)V
+-method name toXMLString descriptor ()Ljava/lang/String;
+method name <init> descriptor (Ljava/lang/String;)V thrownTypes javax/management/MBeanException,javax/management/RuntimeOperationsException,javax/management/modelmbean/XMLParseException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+method name toXMLString descriptor ()Ljava/lang/String; flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
+class name javax/management/modelmbean/XMLParseException
+header extends java/lang/Exception flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/management/remote/SubjectDelegationPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
diff --git a/src/jdk.compiler/share/data/symbols/java.net.http-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.net.http-P.sym.txt
new file mode 100644
index 00000000000..19ddbb72a38
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.net.http-P.sym.txt
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name java/net/http/HttpResponse
+method name connectionLabel descriptor ()Ljava/util/Optional; flags 1 signature ()Ljava/util/Optional<Ljava/lang/String;>;
+
+class name java/net/http/HttpResponse$BodyHandlers
+method name limiting descriptor (Ljava/net/http/HttpResponse$BodyHandler;J)Ljava/net/http/HttpResponse$BodyHandler; flags 9 signature <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodyHandler<TT;>;J)Ljava/net/http/HttpResponse$BodyHandler<TT;>;
+
+class name java/net/http/HttpResponse$BodySubscribers
+method name limiting descriptor (Ljava/net/http/HttpResponse$BodySubscriber;J)Ljava/net/http/HttpResponse$BodySubscriber; flags 9 signature <T:Ljava/lang/Object;>(Ljava/net/http/HttpResponse$BodySubscriber<TT;>;J)Ljava/net/http/HttpResponse$BodySubscriber<TT;>;
+
diff --git a/src/jdk.compiler/share/data/symbols/java.security.jgss-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.security.jgss-P.sym.txt
new file mode 100644
index 00000000000..3023fbddc6c
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.security.jgss-P.sym.txt
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/security/auth/kerberos/DelegationPermission
+header extends java/security/BasicPermission implements java/io/Serializable flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name javax/security/auth/kerberos/ServicePermission
+header extends java/security/Permission implements java/io/Serializable flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/java.xml.crypto-P.sym.txt b/src/jdk.compiler/share/data/symbols/java.xml.crypto-P.sym.txt
new file mode 100644
index 00000000000..a6cbe487e88
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/java.xml.crypto-P.sym.txt
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/xml/crypto/dsig/SignatureMethod
+field name ECDSA_SHA3_224 descriptor Ljava/lang/String; constantValue http://www.w3.org/2021/04/xmldsig-more#ecdsa-sha3-224 flags 19
+field name ECDSA_SHA3_256 descriptor Ljava/lang/String; constantValue http://www.w3.org/2021/04/xmldsig-more#ecdsa-sha3-256 flags 19
+field name ECDSA_SHA3_384 descriptor Ljava/lang/String; constantValue http://www.w3.org/2021/04/xmldsig-more#ecdsa-sha3-384 flags 19
+field name ECDSA_SHA3_512 descriptor Ljava/lang/String; constantValue http://www.w3.org/2021/04/xmldsig-more#ecdsa-sha3-512 flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.attach-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.attach-P.sym.txt
new file mode 100644
index 00000000000..d947c4babfb
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.attach-P.sym.txt
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name com/sun/tools/attach/AttachPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.compiler-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.compiler-P.sym.txt
new file mode 100644
index 00000000000..eaeedda8287
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.compiler-P.sym.txt
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name com/sun/source/tree/ImportTree
+-method name isModule descriptor ()Z
+method name isModule descriptor ()Z flags 401
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-P.sym.txt
new file mode 100644
index 00000000000..55667354e09
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.crypto.cryptoki-P.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+module name jdk.crypto.cryptoki
+header requires name\u0020;java.base\u0020;flags\u0020;8000 provides interface\u0020;java/security/Provider\u0020;impls\u0020;sun/security/pkcs11/SunPKCS11 target macos-aarch64 flags 8000 classAnnotations @Ljdk/internal/javac/ParticipatesInPreview;
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-P.sym.txt
new file mode 100644
index 00000000000..0f7866c462b
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.incubator.foreign-P.sym.txt
@@ -0,0 +1,105 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/internal/foreign/AbstractMemorySegmentImpl
+-method name reinterpret descriptor (JLjava/lang/foreign/Arena;Ljava/util/function/Consumer;)Ljava/lang/foreign/MemorySegment;
+-method name reinterpret descriptor (J)Ljava/lang/foreign/MemorySegment;
+-method name reinterpret descriptor (Ljava/lang/foreign/Arena;Ljava/util/function/Consumer;)Ljava/lang/foreign/MemorySegment;
+method name reinterpret descriptor (JLjava/lang/foreign/Arena;Ljava/util/function/Consumer;)Ljava/lang/foreign/MemorySegment; flags 11 signature (JLjava/lang/foreign/Arena;Ljava/util/function/Consumer<Ljava/lang/foreign/MemorySegment;>;)Ljava/lang/foreign/MemorySegment; runtimeAnnotations @Ljdk/internal/reflect/CallerSensitive;@Ljdk/internal/vm/annotation/ForceInline;
+method name reinterpret descriptor (J)Ljava/lang/foreign/MemorySegment; flags 11 runtimeAnnotations @Ljdk/internal/reflect/CallerSensitive;@Ljdk/internal/vm/annotation/ForceInline;
+method name reinterpret descriptor (Ljava/lang/foreign/Arena;Ljava/util/function/Consumer;)Ljava/lang/foreign/MemorySegment; flags 11 signature (Ljava/lang/foreign/Arena;Ljava/util/function/Consumer<Ljava/lang/foreign/MemorySegment;>;)Ljava/lang/foreign/MemorySegment; runtimeAnnotations @Ljdk/internal/reflect/CallerSensitive;@Ljdk/internal/vm/annotation/ForceInline;
+
+class name jdk/internal/foreign/LayoutPath
+header extends java/lang/Object nestMembers jdk/internal/foreign/LayoutPath$DereferenceElement,jdk/internal/foreign/LayoutPath$SequenceElement,jdk/internal/foreign/LayoutPath$SequenceElementByRange,jdk/internal/foreign/LayoutPath$SequenceElementByIndex,jdk/internal/foreign/LayoutPath$GroupElementByIndex,jdk/internal/foreign/LayoutPath$GroupElementByName flags 21
+innerclass innerClass java/lang/invoke/VarHandle$AccessMode outerClass java/lang/invoke/VarHandle innerClassName AccessMode flags 4019
+innerclass innerClass java/lang/foreign/MemoryLayout$PathElement outerClass java/lang/foreign/MemoryLayout innerClassName PathElement flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$DereferenceElement outerClass jdk/internal/foreign/LayoutPath innerClassName DereferenceElement flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$SequenceElement outerClass jdk/internal/foreign/LayoutPath innerClassName SequenceElement flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$SequenceElementByRange outerClass jdk/internal/foreign/LayoutPath innerClassName SequenceElementByRange flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$SequenceElementByIndex outerClass jdk/internal/foreign/LayoutPath innerClassName SequenceElementByIndex flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$GroupElementByIndex outerClass jdk/internal/foreign/LayoutPath innerClassName GroupElementByIndex flags 19
+innerclass innerClass jdk/internal/foreign/LayoutPath$GroupElementByName outerClass jdk/internal/foreign/LayoutPath innerClassName GroupElementByName flags 19
+field name EMPTY_PATH_ELEMENTS descriptor [Ljava/lang/foreign/MemoryLayout$PathElement; flags 19
+
+class name jdk/internal/foreign/abi/LinkerOptions
+header extends java/lang/Object nestMembers jdk/internal/foreign/abi/LinkerOptions$Critical,jdk/internal/foreign/abi/LinkerOptions$CaptureCallState,jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg,jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl flags 21
+innerclass innerClass java/lang/foreign/Linker$Option outerClass java/lang/foreign/Linker innerClassName Option flags 609
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName LinkerOptionImpl flags 609
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName FirstVariadicArg flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$CaptureCallState outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName CaptureCallState flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$Critical outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName Critical flags 4019
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name capturedCallState descriptor ()Ljava/util/stream/Stream;
+method name capturedCallStateMask descriptor ()I flags 1
+
+class name jdk/internal/foreign/abi/LinkerOptions$CaptureCallState
+header extends java/lang/Record implements jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl nestHost jdk/internal/foreign/abi/LinkerOptions record true flags 31
+recordcomponent name mask descriptor I
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$CaptureCallState outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName CaptureCallState flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName LinkerOptionImpl flags 609
+-method name <init> descriptor (Ljava/util/Set;)V
+-method name toString descriptor ()Ljava/lang/String;
+-method name hashCode descriptor ()I
+-method name equals descriptor (Ljava/lang/Object;)Z
+-method name saved descriptor ()Ljava/util/Set;
+method name <init> descriptor (I)V flags 1 methodParameters 0:compact
+method name equals descriptor (Ljava/lang/Object;)Z flags 1
+method name hashCode descriptor ()I flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
+method name mask descriptor ()I flags 1
+
+class name jdk/internal/foreign/abi/LinkerOptions$Critical
+header extends java/lang/Enum implements jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl nestHost jdk/internal/foreign/abi/LinkerOptions flags 4031 signature Ljava/lang/Enum<Ljdk/internal/foreign/abi/LinkerOptions$Critical;>;Ljdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl;
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$Critical outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName Critical flags 4019
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName LinkerOptionImpl flags 609
+-field name ALLOW_HEAP descriptor Ljdk/internal/foreign/abi/LinkerOptions$Critical;
+-field name DONT_ALLOW_HEAP descriptor Ljdk/internal/foreign/abi/LinkerOptions$Critical;
+-method name <init> descriptor (Z)V
+-method name toString descriptor ()Ljava/lang/String;
+-method name hashCode descriptor ()I
+-method name equals descriptor (Ljava/lang/Object;)Z
+field name ALLOW_HEAP descriptor Ljdk/internal/foreign/abi/LinkerOptions$Critical; flags 4019
+field name DONT_ALLOW_HEAP descriptor Ljdk/internal/foreign/abi/LinkerOptions$Critical; flags 4019
+method name values descriptor ()[Ljdk/internal/foreign/abi/LinkerOptions$Critical; flags 9
+method name valueOf descriptor (Ljava/lang/String;)Ljdk/internal/foreign/abi/LinkerOptions$Critical; flags 9 methodParameters 8000:null
+
+class name jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg
+-method name hashCode descriptor ()I
+-method name equals descriptor (Ljava/lang/Object;)Z
+method name hashCode descriptor ()I flags 1
+method name equals descriptor (Ljava/lang/Object;)Z flags 1
+
+class name jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl
+header extends java/lang/Object implements java/lang/foreign/Linker$Option nestHost jdk/internal/foreign/abi/LinkerOptions sealed true permittedSubclasses jdk/internal/foreign/abi/LinkerOptions$CaptureCallState,jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg,jdk/internal/foreign/abi/LinkerOptions$Critical flags 601
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$LinkerOptionImpl outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName LinkerOptionImpl flags 609
+innerclass innerClass java/lang/foreign/Linker$Option outerClass java/lang/foreign/Linker innerClassName Option flags 609
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$CaptureCallState outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName CaptureCallState flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$FirstVariadicArg outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName FirstVariadicArg flags 19
+innerclass innerClass jdk/internal/foreign/abi/LinkerOptions$Critical outerClass jdk/internal/foreign/abi/LinkerOptions innerClassName Critical flags 4019
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-P.sym.txt
new file mode 100644
index 00000000000..cae81b02a3d
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.incubator.vector-P.sym.txt
@@ -0,0 +1,113 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/incubator/vector/AbstractVector
+header extends jdk/incubator/vector/Vector flags 420 signature <E:Ljava/lang/Object;>Ljdk/incubator/vector/Vector<TE;>;
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorPayload outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorPayload flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorSpecies outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorSpecies flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Associative outerClass jdk/incubator/vector/VectorOperators innerClassName Associative flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Binary outerClass jdk/incubator/vector/VectorOperators innerClassName Binary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Conversion outerClass jdk/incubator/vector/VectorOperators innerClassName Conversion flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name jdk/incubator/vector/DoubleVector
+header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Double;>;
+innerclass innerClass jdk/incubator/vector/VectorOperators$Operator outerClass jdk/incubator/vector/VectorOperators innerClassName Operator flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfDouble outerClass java/lang/foreign/ValueLayout innerClassName OfDouble flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorSpecies outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorSpecies flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorPayload outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorPayload flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Unary outerClass jdk/incubator/vector/VectorOperators innerClassName Unary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Comparison outerClass jdk/incubator/vector/VectorOperators innerClassName Comparison flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$Vector outerClass jdk/internal/vm/vector/VectorSupport innerClassName Vector flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorMask outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorMask flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Associative outerClass jdk/incubator/vector/VectorOperators innerClassName Associative flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Binary outerClass jdk/incubator/vector/VectorOperators innerClassName Binary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Ternary outerClass jdk/incubator/vector/VectorOperators innerClassName Ternary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Test outerClass jdk/incubator/vector/VectorOperators innerClassName Test flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorShuffle outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorShuffle flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Conversion outerClass jdk/incubator/vector/VectorOperators innerClassName Conversion flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name jdk/incubator/vector/Float16
+header extends java/lang/Number implements java/lang/Comparable flags 31 signature Ljava/lang/Number;Ljava/lang/Comparable<Ljdk/incubator/vector/Float16;>; runtimeAnnotations @Ljdk/internal/ValueBased;
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name valueOf descriptor (F)Ljdk/incubator/vector/Float16;
+-method name byteValue descriptor ()B
+-method name shortValue descriptor ()S
+-method name intValue descriptor ()I
+-method name floatValue descriptor ()F
+-method name doubleValue descriptor ()D
+method name valueOf descriptor (F)Ljdk/incubator/vector/Float16; flags 9 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name byteValue descriptor ()B flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name shortValue descriptor ()S flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name intValue descriptor ()I flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name floatValue descriptor ()F flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name doubleValue descriptor ()D flags 1 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+
+class name jdk/incubator/vector/FloatVector
+header extends jdk/incubator/vector/AbstractVector flags 421 signature Ljdk/incubator/vector/AbstractVector<Ljava/lang/Float;>;
+innerclass innerClass jdk/incubator/vector/VectorOperators$Operator outerClass jdk/incubator/vector/VectorOperators innerClassName Operator flags 609
+innerclass innerClass java/lang/foreign/ValueLayout$OfFloat outerClass java/lang/foreign/ValueLayout innerClassName OfFloat flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorSpecies outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorSpecies flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorPayload outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorPayload flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Unary outerClass jdk/incubator/vector/VectorOperators innerClassName Unary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Comparison outerClass jdk/incubator/vector/VectorOperators innerClassName Comparison flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$Vector outerClass jdk/internal/vm/vector/VectorSupport innerClassName Vector flags 9
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorMask outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorMask flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Associative outerClass jdk/incubator/vector/VectorOperators innerClassName Associative flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Binary outerClass jdk/incubator/vector/VectorOperators innerClassName Binary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Ternary outerClass jdk/incubator/vector/VectorOperators innerClassName Ternary flags 609
+innerclass innerClass jdk/incubator/vector/VectorOperators$Test outerClass jdk/incubator/vector/VectorOperators innerClassName Test flags 609
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorShuffle outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorShuffle flags 9
+innerclass innerClass jdk/incubator/vector/VectorOperators$Conversion outerClass jdk/incubator/vector/VectorOperators innerClassName Conversion flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
+class name jdk/incubator/vector/VectorShape
+-method name forBitSize descriptor (I)Ljdk/incubator/vector/VectorShape;
+method name forBitSize descriptor (I)Ljdk/incubator/vector/VectorShape; flags 9 runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+
+class name jdk/incubator/vector/VectorShuffle
+header extends jdk/internal/vm/vector/VectorSupport$VectorShuffle flags 421 signature <E:Ljava/lang/Object;>Ljdk/internal/vm/vector/VectorSupport$VectorShuffle<TE;>;
+innerclass innerClass jdk/internal/vm/vector/VectorSupport$VectorShuffle outerClass jdk/internal/vm/vector/VectorSupport innerClassName VectorShuffle flags 9
+innerclass innerClass java/lang/foreign/ValueLayout$OfInt outerClass java/lang/foreign/ValueLayout innerClassName OfInt flags 609
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+-method name laneSource descriptor (I)I
+method name laneSource descriptor (I)I flags 401
+method name fromMemorySegment descriptor (Ljdk/incubator/vector/VectorSpecies;Ljava/lang/foreign/MemorySegment;JLjava/nio/ByteOrder;)Ljdk/incubator/vector/VectorShuffle; flags 19 signature <E:Ljava/lang/Object;>(Ljdk/incubator/vector/VectorSpecies<TE;>;Ljava/lang/foreign/MemorySegment;JLjava/nio/ByteOrder;)Ljdk/incubator/vector/VectorShuffle<TE;>; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name intoMemorySegment descriptor (Ljava/lang/foreign/MemorySegment;JLjava/nio/ByteOrder;)V flags 401
+
+class name jdk/incubator/vector/VectorSpecies
+-method name of descriptor (Ljava/lang/Class;Ljdk/incubator/vector/VectorShape;)Ljdk/incubator/vector/VectorSpecies;
+-method name ofLargestShape descriptor (Ljava/lang/Class;)Ljdk/incubator/vector/VectorSpecies;
+-method name ofPreferred descriptor (Ljava/lang/Class;)Ljdk/incubator/vector/VectorSpecies;
+-method name elementSize descriptor (Ljava/lang/Class;)I
+method name of descriptor (Ljava/lang/Class;Ljdk/incubator/vector/VectorShape;)Ljdk/incubator/vector/VectorSpecies; flags 9 signature <E:Ljava/lang/Object;>(Ljava/lang/Class<TE;>;Ljdk/incubator/vector/VectorShape;)Ljdk/incubator/vector/VectorSpecies<TE;>; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name ofLargestShape descriptor (Ljava/lang/Class;)Ljdk/incubator/vector/VectorSpecies; flags 9 signature <E:Ljava/lang/Object;>(Ljava/lang/Class<TE;>;)Ljdk/incubator/vector/VectorSpecies<TE;>; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name ofPreferred descriptor (Ljava/lang/Class;)Ljdk/incubator/vector/VectorSpecies; flags 9 signature <E:Ljava/lang/Object;>(Ljava/lang/Class<TE;>;)Ljdk/incubator/vector/VectorSpecies<TE;>; runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+method name elementSize descriptor (Ljava/lang/Class;)I flags 9 signature (Ljava/lang/Class<*>;)I runtimeAnnotations @Ljdk/internal/vm/annotation/ForceInline;
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.jdi-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jdi-P.sym.txt
new file mode 100644
index 00000000000..153c13b1967
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.jdi-P.sym.txt
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name com/sun/jdi/JDIPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.jfr-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jfr-P.sym.txt
new file mode 100644
index 00000000000..8f7fe9f5699
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.jfr-P.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/jfr/FlightRecorderPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.jpackage-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jpackage-P.sym.txt
new file mode 100644
index 00000000000..fca76c0b895
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.jpackage-P.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+module name jdk.jpackage
+header requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;jdk.internal.opt\u0020;flags\u0020;0,name\u0020;jdk.jlink\u0020;flags\u0020;0,name\u0020;java.naming\u0020;flags\u0020;0,name\u0020;java.desktop\u0020;flags\u0020;0 uses jdk/jpackage/internal/Bundler,jdk/jpackage/internal/Bundlers provides interface\u0020;java/util/spi/ToolProvider\u0020;impls\u0020;jdk/jpackage/internal/JPackageToolProvider,interface\u0020;jdk/jpackage/internal/Bundler\u0020;impls\u0020;jdk/jpackage/internal/MacAppBundler\u005C;u002C;jdk/jpackage/internal/MacDmgBundler\u005C;u002C;jdk/jpackage/internal/MacPkgBundler,interface\u0020;jdk/jpackage/internal/Bundlers\u0020;impls\u0020;jdk/jpackage/internal/BasicBundlers target macos-aarch64 moduleMainClass jdk/jpackage/main/Main flags 8000
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.jshell-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.jshell-P.sym.txt
new file mode 100644
index 00000000000..116976017d6
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.jshell-P.sym.txt
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/jshell/JShellConsole
+-method name readLine descriptor ()Ljava/lang/String;
+
+class name jdk/jshell/Snippet$SubKind
+-field name MODULE_IMPORT_SUBKIND descriptor Ljdk/jshell/Snippet$SubKind;
+field name MODULE_IMPORT_SUBKIND descriptor Ljdk/jshell/Snippet$SubKind; flags 4019
+
+class name jdk/jshell/execution/LocalExecutionControl
+header extends jdk/jshell/execution/DirectExecutionControl flags 21
+innerclass innerClass jdk/jshell/spi/ExecutionControl$ClassBytecodes outerClass jdk/jshell/spi/ExecutionControl innerClassName ClassBytecodes flags 19
+innerclass innerClass jdk/jshell/spi/ExecutionControl$StoppedException outerClass jdk/jshell/spi/ExecutionControl innerClassName StoppedException flags 9
+innerclass innerClass jdk/jshell/spi/ExecutionControl$InternalException outerClass jdk/jshell/spi/ExecutionControl innerClassName InternalException flags 9
+innerclass innerClass java/lang/classfile/CodeBuilder$BlockCodeBuilder outerClass java/lang/classfile/CodeBuilder innerClassName BlockCodeBuilder flags 609
+innerclass innerClass jdk/jshell/spi/ExecutionControl$ClassInstallException outerClass jdk/jshell/spi/ExecutionControl innerClassName ClassInstallException flags 9
+innerclass innerClass jdk/jshell/spi/ExecutionControl$NotImplementedException outerClass jdk/jshell/spi/ExecutionControl innerClassName NotImplementedException flags 9
+innerclass innerClass jdk/jshell/spi/ExecutionControl$EngineTerminationException outerClass jdk/jshell/spi/ExecutionControl innerClassName EngineTerminationException flags 9
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.net-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.net-P.sym.txt
new file mode 100644
index 00000000000..377aa5fb5df
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.net-P.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/net/NetworkPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
diff --git a/src/jdk.compiler/share/data/symbols/jdk.security.jgss-P.sym.txt b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-P.sym.txt
new file mode 100644
index 00000000000..3c4839b8f7a
--- /dev/null
+++ b/src/jdk.compiler/share/data/symbols/jdk.security.jgss-P.sym.txt
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name com/sun/security/jgss/InquireSecContextPermission
+header extends java/security/BasicPermission flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="25")
+
diff --git a/src/jdk.compiler/share/data/symbols/symbols b/src/jdk.compiler/share/data/symbols/symbols
index f7f2946d582..7793033d22f 100644
--- a/src/jdk.compiler/share/data/symbols/symbols
+++ b/src/jdk.compiler/share/data/symbols/symbols
@@ -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 @@
 #command used to generate this file:
 #build.tools.symbolgenerator.CreateSymbols build-description-incremental symbols include.list
 #
-generate platforms 8:9:A:B:C:D:E:F:G:H:I:J:K:L:M:N:O
+generate platforms 8:9:A:B:C:D:E:F:G:H:I:J:K:L:M:N:O:P
 platform version 8 files java.activation-8.sym.txt:java.base-8.sym.txt:java.compiler-8.sym.txt:java.corba-8.sym.txt:java.datatransfer-8.sym.txt:java.desktop-8.sym.txt:java.instrument-8.sym.txt:java.logging-8.sym.txt:java.management-8.sym.txt:java.management.rmi-8.sym.txt:java.naming-8.sym.txt:java.prefs-8.sym.txt:java.rmi-8.sym.txt:java.scripting-8.sym.txt:java.security.jgss-8.sym.txt:java.security.sasl-8.sym.txt:java.sql-8.sym.txt:java.sql.rowset-8.sym.txt:java.transaction-8.sym.txt:java.xml-8.sym.txt:java.xml.bind-8.sym.txt:java.xml.crypto-8.sym.txt:java.xml.ws-8.sym.txt:java.xml.ws.annotation-8.sym.txt:jdk.httpserver-8.sym.txt:jdk.management-8.sym.txt:jdk.scripting.nashorn-8.sym.txt:jdk.sctp-8.sym.txt:jdk.security.auth-8.sym.txt:jdk.security.jgss-8.sym.txt
 platform version 9 base 8 files java.activation-9.sym.txt:java.base-9.sym.txt:java.compiler-9.sym.txt:java.corba-9.sym.txt:java.datatransfer-9.sym.txt:java.desktop-9.sym.txt:java.instrument-9.sym.txt:java.logging-9.sym.txt:java.management-9.sym.txt:java.management.rmi-9.sym.txt:java.naming-9.sym.txt:java.prefs-9.sym.txt:java.rmi-9.sym.txt:java.scripting-9.sym.txt:java.se-9.sym.txt:java.se.ee-9.sym.txt:java.security.jgss-9.sym.txt:java.security.sasl-9.sym.txt:java.smartcardio-9.sym.txt:java.sql-9.sym.txt:java.sql.rowset-9.sym.txt:java.transaction-9.sym.txt:java.xml-9.sym.txt:java.xml.bind-9.sym.txt:java.xml.crypto-9.sym.txt:java.xml.ws-9.sym.txt:java.xml.ws.annotation-9.sym.txt:jdk.accessibility-9.sym.txt:jdk.attach-9.sym.txt:jdk.charsets-9.sym.txt:jdk.compiler-9.sym.txt:jdk.crypto.cryptoki-9.sym.txt:jdk.crypto.ec-9.sym.txt:jdk.dynalink-9.sym.txt:jdk.editpad-9.sym.txt:jdk.hotspot.agent-9.sym.txt:jdk.httpserver-9.sym.txt:jdk.incubator.httpclient-9.sym.txt:jdk.jartool-9.sym.txt:jdk.javadoc-9.sym.txt:jdk.jcmd-9.sym.txt:jdk.jconsole-9.sym.txt:jdk.jdeps-9.sym.txt:jdk.jdi-9.sym.txt:jdk.jdwp.agent-9.sym.txt:jdk.jlink-9.sym.txt:jdk.jshell-9.sym.txt:jdk.jsobject-9.sym.txt:jdk.jstatd-9.sym.txt:jdk.localedata-9.sym.txt:jdk.management-9.sym.txt:jdk.management.agent-9.sym.txt:jdk.naming.dns-9.sym.txt:jdk.naming.rmi-9.sym.txt:jdk.net-9.sym.txt:jdk.pack-9.sym.txt:jdk.policytool-9.sym.txt:jdk.rmic-9.sym.txt:jdk.scripting.nashorn-9.sym.txt:jdk.sctp-9.sym.txt:jdk.security.auth-9.sym.txt:jdk.security.jgss-9.sym.txt:jdk.unsupported-9.sym.txt:jdk.xml.dom-9.sym.txt:jdk.zipfs-9.sym.txt
 platform version A base 9 files java.activation-A.sym.txt:java.base-A.sym.txt:java.compiler-A.sym.txt:java.corba-A.sym.txt:java.datatransfer-A.sym.txt:java.desktop-A.sym.txt:java.instrument-A.sym.txt:java.logging-A.sym.txt:java.management-A.sym.txt:java.management.rmi-A.sym.txt:java.naming-A.sym.txt:java.prefs-A.sym.txt:java.rmi-A.sym.txt:java.scripting-A.sym.txt:java.se-A.sym.txt:java.se.ee-A.sym.txt:java.security.jgss-A.sym.txt:java.security.sasl-A.sym.txt:java.smartcardio-A.sym.txt:java.sql-A.sym.txt:java.sql.rowset-A.sym.txt:java.transaction-A.sym.txt:java.xml-A.sym.txt:java.xml.bind-A.sym.txt:java.xml.crypto-A.sym.txt:java.xml.ws-A.sym.txt:java.xml.ws.annotation-A.sym.txt:jdk.accessibility-A.sym.txt:jdk.attach-A.sym.txt:jdk.charsets-A.sym.txt:jdk.compiler-A.sym.txt:jdk.crypto.cryptoki-A.sym.txt:jdk.crypto.ec-A.sym.txt:jdk.dynalink-A.sym.txt:jdk.editpad-A.sym.txt:jdk.hotspot.agent-A.sym.txt:jdk.httpserver-A.sym.txt:jdk.incubator.httpclient-A.sym.txt:jdk.jartool-A.sym.txt:jdk.javadoc-A.sym.txt:jdk.jcmd-A.sym.txt:jdk.jconsole-A.sym.txt:jdk.jdeps-A.sym.txt:jdk.jdi-A.sym.txt:jdk.jdwp.agent-A.sym.txt:jdk.jlink-A.sym.txt:jdk.jshell-A.sym.txt:jdk.jsobject-A.sym.txt:jdk.jstatd-A.sym.txt:jdk.localedata-A.sym.txt:jdk.management-A.sym.txt:jdk.management.agent-A.sym.txt:jdk.naming.dns-A.sym.txt:jdk.naming.rmi-A.sym.txt:jdk.net-A.sym.txt:jdk.pack-A.sym.txt:jdk.policytool-A.sym.txt:jdk.rmic-A.sym.txt:jdk.scripting.nashorn-A.sym.txt:jdk.sctp-A.sym.txt:jdk.security.auth-A.sym.txt:jdk.security.jgss-A.sym.txt:jdk.unsupported-A.sym.txt:jdk.xml.dom-A.sym.txt:jdk.zipfs-A.sym.txt
@@ -47,3 +47,4 @@ platform version L base K files java.base-L.sym.txt:java.compiler-L.sym.txt:java
 platform version M base L files java.base-M.sym.txt:java.compiler-M.sym.txt:java.desktop-M.sym.txt:java.xml-M.sym.txt:java.xml.crypto-M.sym.txt:jdk.compiler-M.sym.txt:jdk.crypto.cryptoki-M.sym.txt:jdk.crypto.ec-M.sym.txt:jdk.incubator.foreign-M.sym.txt:jdk.incubator.vector-M.sym.txt:jdk.jartool-M.sym.txt:jdk.jdeps-M.sym.txt:jdk.jfr-M.sym.txt:jdk.jlink-M.sym.txt:jdk.jpackage-M.sym.txt:jdk.jshell-M.sym.txt:jdk.jstatd-M.sym.txt:jdk.unsupported-M.sym.txt
 platform version N base M files java.base-N.sym.txt:java.compiler-N.sym.txt:java.desktop-N.sym.txt:java.management-N.sym.txt:java.management.rmi-N.sym.txt:jdk.compiler-N.sym.txt:jdk.httpserver-N.sym.txt:jdk.incubator.foreign-N.sym.txt:jdk.javadoc-N.sym.txt:jdk.jshell-N.sym.txt:jdk.localedata-N.sym.txt:jdk.unsupported-N.sym.txt
 platform version O base N files java.base-O.sym.txt:java.compiler-O.sym.txt:java.datatransfer-O.sym.txt:java.desktop-O.sym.txt:java.instrument-O.sym.txt:java.logging-O.sym.txt:java.management-O.sym.txt:java.management.rmi-O.sym.txt:java.naming-O.sym.txt:java.net.http-O.sym.txt:java.prefs-O.sym.txt:java.rmi-O.sym.txt:java.scripting-O.sym.txt:java.se-O.sym.txt:java.security.jgss-O.sym.txt:java.security.sasl-O.sym.txt:java.smartcardio-O.sym.txt:java.sql-O.sym.txt:java.sql.rowset-O.sym.txt:java.transaction.xa-O.sym.txt:java.xml-O.sym.txt:java.xml.crypto-O.sym.txt:jdk.accessibility-O.sym.txt:jdk.attach-O.sym.txt:jdk.charsets-O.sym.txt:jdk.compiler-O.sym.txt:jdk.crypto.cryptoki-O.sym.txt:jdk.dynalink-O.sym.txt:jdk.editpad-O.sym.txt:jdk.hotspot.agent-O.sym.txt:jdk.httpserver-O.sym.txt:jdk.incubator.foreign-O.sym.txt:jdk.incubator.vector-O.sym.txt:jdk.jartool-O.sym.txt:jdk.javadoc-O.sym.txt:jdk.jcmd-O.sym.txt:jdk.jconsole-O.sym.txt:jdk.jdeps-O.sym.txt:jdk.jdi-O.sym.txt:jdk.jdwp.agent-O.sym.txt:jdk.jfr-O.sym.txt:jdk.jlink-O.sym.txt:jdk.jpackage-O.sym.txt:jdk.jshell-O.sym.txt:jdk.jsobject-O.sym.txt:jdk.jstatd-O.sym.txt:jdk.localedata-O.sym.txt:jdk.management-O.sym.txt:jdk.management.agent-O.sym.txt:jdk.management.jfr-O.sym.txt:jdk.naming.dns-O.sym.txt:jdk.naming.rmi-O.sym.txt:jdk.net-O.sym.txt:jdk.nio.mapmode-O.sym.txt:jdk.sctp-O.sym.txt:jdk.security.auth-O.sym.txt:jdk.security.jgss-O.sym.txt:jdk.unsupported-O.sym.txt:jdk.xml.dom-O.sym.txt:jdk.zipfs-O.sym.txt
+platform version P base O files java.base-P.sym.txt:java.compiler-P.sym.txt:java.desktop-P.sym.txt:java.logging-P.sym.txt:java.management-P.sym.txt:java.net.http-P.sym.txt:java.security.jgss-P.sym.txt:java.xml.crypto-P.sym.txt:jdk.attach-P.sym.txt:jdk.compiler-P.sym.txt:jdk.incubator.foreign-P.sym.txt:jdk.incubator.vector-P.sym.txt:jdk.jdi-P.sym.txt:jdk.jfr-P.sym.txt:jdk.jpackage-P.sym.txt:jdk.jshell-P.sym.txt:jdk.net-P.sym.txt:jdk.security.jgss-P.sym.txt
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 3038daf090d..f0e50e58b2b 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -142,6 +142,11 @@ serviceability/sa/TestJmapCoreMetaspace.java      8318754 macosx-aarch64
 
 serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java 8315980 linux-all,windows-x64
 
+serviceability/sa/JhsdbThreadInfoTest.java              8344261 generic-all
+serviceability/sa/TestJhsdbJstackLock.java              8344261 generic-all
+serviceability/sa/sadebugd/DebugdConnectTest.java       8344261 generic-all
+serviceability/attach/RemovingUnixDomainSocketTest.java 8344261 generic-all
+
 #############################################################################
 
 # :hotspot_misc
diff --git a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
index 5456f560fa1..99c2d27f8d3 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.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
@@ -58,26 +58,11 @@ public class VMDeprecatedOptions {
             // { <flag name> , <expected default value> }
             // deprecated non-alias flags:
             {"AllowRedefinitionToAddDeleteMethods", "true"},
-            {"LockingMode", "1"},
 
             // deprecated alias flags (see also aliased_jvm_flags):
             {"CreateMinidumpOnCrash", "false"}
           }
         ));
-        if (Platform.is64bit()) {
-          deprecated.addAll(
-            Arrays.asList(new String[][] {
-              {"UseCompressedClassPointers", "false"},
-            })
-          );
-        }
-        if (Platform.isLinux()) {
-          deprecated.addAll(
-            Arrays.asList(new String[][] {
-              {"UseOprofile", "false"}
-            })
-          );
-        }
         if (Platform.isX86() || Platform.isX64()) {
           deprecated.addAll(
             Arrays.asList(new String[][] {
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 7e499412dc2..d84c39112db 100644
--- a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java
@@ -226,7 +226,7 @@ public ClassReader(
         this.b = classFileBuffer;
         // Check the class' major_version. This field is after the magic and minor_version fields, which
         // use 4 and 2 bytes respectively.
-        if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V25) {
+        if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V26) {
             throw new IllegalArgumentException(
                     "Unsupported class file major version " + readShort(classFileOffset + 6));
         }
diff --git a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java
index d6d8e36fc15..da68deacf90 100644
--- a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/Opcodes.java
@@ -315,6 +315,7 @@ public interface Opcodes {
     int V23 = 0 << 16 | 67;
     int V24 = 0 << 16 | 68;
     int V25 = 0 << 16 | 69;
+    int V26 = 0 << 16 | 70;
 
     /**
       * Version flag indicating that the class is using 'preview' features.
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index c1303377ddb..8c0e0bccde0 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -834,3 +834,9 @@ java/awt/Checkbox/CheckboxNullLabelTest.java 8340870 windows-all
 java/awt/dnd/WinMoveFileToShellTest.java 8341665 windows-all
 java/awt/Menu/MenuVisibilityTest.java 8161110 macosx-all
 java/awt/Modal/NativeDialogToFrontBackTest.java 7188049 windows-all,linux-all
+
+############################################################################
+
+# jdk_since_checks
+
+tools/sincechecker/modules/java.base/JavaBaseCheckSince.java 8358627 generic-all
diff --git a/test/langtools/tools/javac/api/TestGetSourceVersions.java b/test/langtools/tools/javac/api/TestGetSourceVersions.java
index 26892eca0a1..4df60355aad 100644
--- a/test/langtools/tools/javac/api/TestGetSourceVersions.java
+++ b/test/langtools/tools/javac/api/TestGetSourceVersions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, 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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug     6395981 6458819 7025784 8028543 8028544 8193291 8193292 8193292 8205393 8245585 8245585 8245585 8286034
- *          8296150 8306585 8319414 8330183 8342982
+ *          8296150 8306585 8319414 8330183 8342982 8355748
  * @summary JavaCompilerTool and Tool must specify version of JLS and JVMS
  * @author  Peter von der Ahé
  * @modules java.compiler
@@ -37,7 +37,7 @@
  *                                      RELEASE_8  RELEASE_9  RELEASE_10 RELEASE_11 RELEASE_12
  *                                      RELEASE_13 RELEASE_14 RELEASE_15 RELEASE_16 RELEASE_17
  *                                      RELEASE_18 RELEASE_19 RELEASE_20 RELEASE_21 RELEASE_22
- *                                      RELEASE_23 RELEASE_24 RELEASE_25
+ *                                      RELEASE_23 RELEASE_24 RELEASE_25 RELEASE_26
  */
 
 import java.util.EnumSet;
diff --git a/test/langtools/tools/javac/classfiles/ClassVersionChecker.java b/test/langtools/tools/javac/classfiles/ClassVersionChecker.java
index c12ff311bdb..6afa7ad9e30 100644
--- a/test/langtools/tools/javac/classfiles/ClassVersionChecker.java
+++ b/test/langtools/tools/javac/classfiles/ClassVersionChecker.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
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 7157626 8001112 8188870 8173382 8193290 8205619 8245586 8257453 8306586 8330184
- *      8342983
+ *      8342983 8355751
  * @summary Test major version for all legal combinations for -source and -target
  * @author sgoel
  *
@@ -61,6 +61,7 @@ private static enum Version {
         TWENTY_THREE("23", 67),
         TWENTY_FOUR("24", 68),
         TWENTY_FIVE("25", 69),
+        TWENTY_SIX("26", 70),
         ; // Reduce code churn when appending new constants
 
         private Version(String release, int classFileVer) {
diff --git a/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java b/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java
index 081a156d6a0..e181ef8bf63 100644
--- a/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java
+++ b/test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.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
@@ -113,7 +113,7 @@ protected void addExports(String moduleName, String... packageNames) {
      * corresponding platform visitor type.
      */
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static abstract class AbstractAnnotationValueVisitor<R, P> extends AbstractAnnotationValueVisitorPreview<R, P> {
 
@@ -125,7 +125,7 @@ protected AbstractAnnotationValueVisitor() {
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static abstract class AbstractElementVisitor<R, P> extends AbstractElementVisitorPreview<R, P> {
         /**
@@ -136,7 +136,7 @@ protected AbstractElementVisitor(){
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static abstract class AbstractTypeVisitor<R, P> extends AbstractTypeVisitorPreview<R, P> {
         /**
@@ -147,7 +147,7 @@ protected AbstractTypeVisitor() {
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class ElementKindVisitor<R, P> extends ElementKindVisitorPreview<R, P> {
         /**
@@ -169,7 +169,7 @@ protected ElementKindVisitor(R defaultValue) {
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class ElementScanner<R, P> extends ElementScannerPreview<R, P> {
         /**
@@ -189,7 +189,7 @@ protected ElementScanner(R defaultValue){
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class SimpleAnnotationValueVisitor<R, P> extends SimpleAnnotationValueVisitorPreview<R, P> {
         /**
@@ -211,7 +211,7 @@ protected SimpleAnnotationValueVisitor(R defaultValue) {
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class SimpleElementVisitor<R, P> extends SimpleElementVisitorPreview<R, P> {
         /**
@@ -233,7 +233,7 @@ protected SimpleElementVisitor(R defaultValue){
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class SimpleTypeVisitor<R, P> extends SimpleTypeVisitorPreview<R, P> {
         /**
@@ -255,7 +255,7 @@ protected SimpleTypeVisitor(R defaultValue){
         }
     }
 
-    @SupportedSourceVersion(RELEASE_25)
+    @SupportedSourceVersion(RELEASE_26)
     @SuppressWarnings("preview")
     public static class TypeKindVisitor<R, P> extends TypeKindVisitorPreview<R, P> {
         /**
diff --git a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
index ecc8218b5f5..4cef7e1916b 100644
--- a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
+++ b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.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
@@ -47,7 +47,7 @@
 
 public class HelpOutputColumnWidthTest extends TestRunner {
 
-    public static final int MAX_COLUMNS = 80;
+    public static final int MAX_COLUMNS = 84;
 
     protected ToolBox tb;
 
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out b/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
index 46c55fa62f3..8c455009ae5 100644
--- a/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out
@@ -1,2 +1,2 @@
-- compiler.err.preview.feature.disabled.classfile: Bar.class, 25
+- compiler.err.preview.feature.disabled.classfile: Bar.class, 26
 1 error
diff --git a/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out b/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
index 539b128efd2..26ff05b085a 100644
--- a/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
+++ b/test/langtools/tools/javac/preview/classReaderTest/Client.preview.out
@@ -1,4 +1,4 @@
-- compiler.warn.preview.feature.use.classfile: Bar.class, 25
+- compiler.warn.preview.feature.use.classfile: Bar.class, 26
 - compiler.err.warnings.and.werror
 1 error
 1 warning
diff --git a/test/langtools/tools/javac/versions/Versions.java b/test/langtools/tools/javac/versions/Versions.java
index 52b0f0d366d..43fcb0353d0 100644
--- a/test/langtools/tools/javac/versions/Versions.java
+++ b/test/langtools/tools/javac/versions/Versions.java
@@ -26,7 +26,7 @@
  * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545
  * 8000961 8030610 8028546 8188870 8173382 8173382 8193290 8205619 8028563
  * 8245147 8245586 8257453 8286035 8306586 8320806 8306586 8319414 8330183
- * 8342982 8356108
+ * 8342982 8355748 8356108
  * @summary Check interpretation of -target and -source options
  * @modules java.compiler
  *          jdk.compiler
@@ -73,9 +73,9 @@ public static void main(String... args) throws IOException {
     public static final Set<String> VALID_SOURCES =
         Set.of("1.8", "1.9", "1.10", "11", "12", "13", "14",
                "15", "16", "17", "18", "19", "20", "21", "22",
-               "23", "24", "25");
+               "23", "24", "25", "26");
 
-    public static final String LATEST_MAJOR_VERSION = "69.0";
+    public static final String LATEST_MAJOR_VERSION = "70.0";
 
     static enum SourceTarget {
         EIGHT(true,      "52.0",  "8"),
@@ -96,6 +96,7 @@ static enum SourceTarget {
         TWENTY_THREE(false,"67.0", "23"),
         TWENTY_FOUR(false,"68.0", "24"),
         TWENTY_FIVE(false,"69.0", "25"),
+        TWENTY_SIX(false, "70.0", "26"),
         ; // Reduce code churn when appending new constants
 
         private final boolean dotOne;
@@ -566,4 +567,3 @@ protected void genSourceFiles() throws IOException{
         return false;
     }
 }
-

From 62fde687088ce72ef33b94e73babf4bfe1395c17 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Thu, 5 Jun 2025 16:43:29 +0000
Subject: [PATCH 885/901] 8357396: Refactor nmethod::make_not_entrant to use
 Enum instead of "const char*"

Reviewed-by: mhaessig, shade
---
 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            | 14 ++-
 src/hotspot/share/code/nmethod.hpp            | 85 ++++++++++++++++++-
 .../share/compiler/compilationPolicy.cpp      |  4 +-
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  9 +-
 src/hotspot/share/jvmci/jvmciEnv.cpp          |  6 +-
 src/hotspot/share/jvmci/jvmciEnv.hpp          |  2 +-
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  2 +-
 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 +-
 15 files changed, 111 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 7c41c09d378..e2760689daa 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -818,7 +818,7 @@ JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* current, jint trap_request))
   Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request);
 
   if (action == Deoptimization::Action_make_not_entrant) {
-    if (nm->make_not_entrant("C1 deoptimize")) {
+    if (nm->make_not_entrant(nmethod::ChangeReason::C1_deoptimize)) {
       if (reason == Deoptimization::Reason_tenured) {
         MethodData* trap_mdo = Deoptimization::get_method_data(current, method, true /*create_if_missing*/);
         if (trap_mdo != nullptr) {
@@ -1110,7 +1110,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* current, C1StubId stub_id ))
     // safepoint, but if it's still alive then make it not_entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant("C1 code patch");
+      nm->make_not_entrant(nmethod::ChangeReason::C1_codepatch);
     }
 
     Deoptimization::deoptimize_frame(current, caller_frame.id());
@@ -1358,7 +1358,7 @@ void Runtime1::patch_code(JavaThread* current, C1StubId stub_id) {
     // Make sure the nmethod is invalidated, i.e. made not entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant("C1 deoptimize for patching");
+      nm->make_not_entrant(nmethod::ChangeReason::C1_deoptimize_for_patching);
     }
   }
 
@@ -1486,7 +1486,7 @@ JRT_ENTRY(void, Runtime1::predicate_failed_trap(JavaThread* current))
 
   nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
   assert (nm != nullptr, "no more nmethod?");
-  nm->make_not_entrant("C1 predicate failed trap");
+  nm->make_not_entrant(nmethod::ChangeReason::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 5ea4336f35e..f9829e88c4a 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("CI replay");
+      nm->make_not_entrant(nmethod::ChangeReason::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 902d4345622..3a5da1d7cd2 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("marked for deoptimization");
+      nm->make_not_entrant(nmethod::ChangeReason::marked_for_deoptimization);
       nm->make_deoptimized();
     }
   }
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 510160a6667..acebaae6ba4 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1975,14 +1975,12 @@ void nmethod::invalidate_osr_method() {
   }
 }
 
-void nmethod::log_state_change(const char* reason) const {
-  assert(reason != nullptr, "Must provide a reason");
-
+void nmethod::log_state_change(ChangeReason change_reason) const {
   if (LogCompilation) {
     if (xtty != nullptr) {
       ttyLocker ttyl;  // keep the following output all in one block
       xtty->begin_elem("make_not_entrant thread='%zu' reason='%s'",
-                       os::current_thread_id(), reason);
+                       os::current_thread_id(), change_reason_to_string(change_reason));
       log_identity(xtty);
       xtty->stamp();
       xtty->end_elem();
@@ -1991,7 +1989,7 @@ void nmethod::log_state_change(const char* reason) const {
 
   ResourceMark rm;
   stringStream ss(NEW_RESOURCE_ARRAY(char, 256), 256);
-  ss.print("made not entrant: %s", reason);
+  ss.print("made not entrant: %s", change_reason_to_string(change_reason));
 
   CompileTask::print_ul(this, ss.freeze());
   if (PrintCompilation) {
@@ -2006,9 +2004,7 @@ void nmethod::unlink_from_method() {
 }
 
 // Invalidate code
-bool nmethod::make_not_entrant(const char* reason) {
-  assert(reason != nullptr, "Must provide a reason");
-
+bool nmethod::make_not_entrant(ChangeReason change_reason) {
   // This can be called while the system is already at a safepoint which is ok
   NoSafepointVerifier nsv;
 
@@ -2077,7 +2073,7 @@ bool nmethod::make_not_entrant(const char* reason) {
     assert(success, "Transition can't fail");
 
     // Log the transition once
-    log_state_change(reason);
+    log_state_change(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 2ce6e5cd361..7453bdfa0ef 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -471,6 +471,85 @@ class nmethod : public CodeBlob {
   void oops_do_set_strong_done(nmethod* old_head);
 
 public:
+  enum class ChangeReason : u1 {
+    C1_codepatch,
+    C1_deoptimize,
+    C1_deoptimize_for_patching,
+    C1_predicate_failed_trap,
+    CI_replay,
+    JVMCI_invalidate_nmethod,
+    JVMCI_invalidate_nmethod_mirror,
+    JVMCI_materialize_virtual_object,
+    JVMCI_new_installation,
+    JVMCI_register_method,
+    JVMCI_replacing_with_new_code,
+    JVMCI_reprofile,
+    marked_for_deoptimization,
+    missing_exception_handler,
+    not_used,
+    OSR_invalidation_back_branch,
+    OSR_invalidation_for_compiling_with_C1,
+    OSR_invalidation_of_lower_level,
+    set_native_function,
+    uncommon_trap,
+    whitebox_deoptimization,
+    zombie,
+  };
+
+
+  static const char* change_reason_to_string(ChangeReason change_reason) {
+    switch (change_reason) {
+      case ChangeReason::C1_codepatch:
+        return "C1 code patch";
+      case ChangeReason::C1_deoptimize:
+        return "C1 deoptimized";
+      case ChangeReason::C1_deoptimize_for_patching:
+        return "C1 deoptimize for patching";
+      case ChangeReason::C1_predicate_failed_trap:
+        return "C1 predicate failed trap";
+      case ChangeReason::CI_replay:
+        return "CI replay";
+      case ChangeReason::JVMCI_invalidate_nmethod:
+        return "JVMCI invalidate nmethod";
+      case ChangeReason::JVMCI_invalidate_nmethod_mirror:
+        return "JVMCI invalidate nmethod mirror";
+      case ChangeReason::JVMCI_materialize_virtual_object:
+        return "JVMCI materialize virtual object";
+      case ChangeReason::JVMCI_new_installation:
+        return "JVMCI new installation";
+      case ChangeReason::JVMCI_register_method:
+        return "JVMCI register method";
+      case ChangeReason::JVMCI_replacing_with_new_code:
+        return "JVMCI replacing with new code";
+      case ChangeReason::JVMCI_reprofile:
+        return "JVMCI reprofile";
+      case ChangeReason::marked_for_deoptimization:
+        return "marked for deoptimization";
+      case ChangeReason::missing_exception_handler:
+        return "missing exception handler";
+      case ChangeReason::not_used:
+        return "not used";
+      case ChangeReason::OSR_invalidation_back_branch:
+        return "OSR invalidation back branch";
+      case ChangeReason::OSR_invalidation_for_compiling_with_C1:
+        return "OSR invalidation for compiling with C1";
+      case ChangeReason::OSR_invalidation_of_lower_level:
+        return "OSR invalidation of lower level";
+      case ChangeReason::set_native_function:
+        return "set native function";
+      case ChangeReason::uncommon_trap:
+        return "uncommon trap";
+      case ChangeReason::whitebox_deoptimization:
+        return "whitebox deoptimization";
+      case ChangeReason::zombie:
+        return "zombie";
+      default: {
+        assert(false, "Unhandled reason");
+        return "Unknown";
+      }
+    }
+  }
+
   // create nmethod with entry_bci
   static nmethod* new_nmethod(const methodHandle& method,
                               int compile_id,
@@ -633,8 +712,8 @@ class nmethod : public CodeBlob {
   // 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(const char* reason);
-  bool  make_not_used()    { return make_not_entrant("not used"); }
+  bool  make_not_entrant(ChangeReason change_reason);
+  bool  make_not_used() { return make_not_entrant(ChangeReason::not_used); }
 
   bool  is_marked_for_deoptimization() const { return deoptimization_status() != not_marked; }
   bool  has_been_deoptimized() const { return deoptimization_status() == deoptimize_done; }
@@ -947,7 +1026,7 @@ class nmethod : public CodeBlob {
   // Logging
   void log_identity(xmlStream* log) const;
   void log_new_nmethod() const;
-  void log_state_change(const char* reason) const;
+  void log_state_change(ChangeReason change_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 39c90281c79..bab437eaade 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -924,7 +924,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 invalidation for compiling with C1");
+          osr_nm->make_not_entrant(nmethod::ChangeReason::OSR_invalidation_for_compiling_with_C1);
         }
         compile(mh, bci, CompLevel_simple, THREAD);
       }
@@ -1516,7 +1516,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("OSR invalidation, back branch");
+            nm->make_not_entrant(nmethod::ChangeReason::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 d45036ced94..001a40f74bc 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -27,6 +27,7 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
+#include "code/nmethod.hpp"
 #include "code/scopeDesc.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerEvent.hpp"
@@ -1206,7 +1207,7 @@ C2V_VMENTRY_0(jint, installCode0, (JNIEnv *env, jobject,
         assert(JVMCIENV->isa_HotSpotNmethod(installed_code_handle), "wrong type");
         // Clear the link to an old nmethod first
         JVMCIObject nmethod_mirror = installed_code_handle;
-        JVMCIENV->invalidate_nmethod_mirror(nmethod_mirror, true, JVMCI_CHECK_0);
+        JVMCIENV->invalidate_nmethod_mirror(nmethod_mirror, true, nmethod::ChangeReason::JVMCI_replacing_with_new_code, JVMCI_CHECK_0);
       } else {
         assert(JVMCIENV->isa_InstalledCode(installed_code_handle), "wrong type");
       }
@@ -1382,7 +1383,7 @@ C2V_VMENTRY(void, reprofile, (JNIEnv* env, jobject, ARGUMENT_PAIR(method)))
 
   nmethod* code = method->code();
   if (code != nullptr) {
-    code->make_not_entrant("JVMCI reprofile");
+    code->make_not_entrant(nmethod::ChangeReason::JVMCI_reprofile);
   }
 
   MethodData* method_data = method->method_data();
@@ -1397,7 +1398,7 @@ C2V_END
 
 C2V_VMENTRY(void, invalidateHotSpotNmethod, (JNIEnv* env, jobject, jobject hs_nmethod, jboolean deoptimize))
   JVMCIObject nmethod_mirror = JVMCIENV->wrap(hs_nmethod);
-  JVMCIENV->invalidate_nmethod_mirror(nmethod_mirror, deoptimize, JVMCI_CHECK);
+  JVMCIENV->invalidate_nmethod_mirror(nmethod_mirror, deoptimize, nmethod::ChangeReason::JVMCI_invalidate_nmethod, JVMCI_CHECK);
 C2V_END
 
 C2V_VMENTRY_NULL(jlongArray, collectCounters, (JNIEnv* env, jobject))
@@ -1822,7 +1823,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("JVMCI materialize virtual objects");
+    fst.current()->cb()->as_nmethod()->make_not_entrant(nmethod::ChangeReason::JVMCI_materialize_virtual_object);
   }
   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 b8474552256..8c9facf8489 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -1750,7 +1750,7 @@ void JVMCIEnv::initialize_installed_code(JVMCIObject installed_code, CodeBlob* c
 }
 
 
-void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, JVMCI_TRAPS) {
+void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, nmethod::ChangeReason change_reason, JVMCI_TRAPS) {
   if (mirror.is_null()) {
     JVMCI_THROW(NullPointerException);
   }
@@ -1773,7 +1773,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("JVMCI invalidate nmethod mirror");
+    nm->make_not_entrant(change_reason);
 
     // Do not clear the address field here as the Java code may still
     // want to later call this method with deoptimize == true. That requires
@@ -1782,7 +1782,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("JVMCI invalidate nmethod mirror");
+    nm->make_not_entrant(change_reason);
     nm->make_deoptimized();
     deopt_scope.deoptimize_marked();
 
diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp
index 69f6647b0d6..b7b7c8f6771 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp
@@ -462,7 +462,7 @@ class JVMCIEnv : public ResourceObj {
   // field of `mirror` to prevent it from being called.
   // If `deoptimize` is true, the nmethod is immediately deoptimized.
   // The HotSpotNmethod.address field is zero upon returning.
-  void invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimze, JVMCI_TRAPS);
+  void invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimze, nmethod::ChangeReason change_reason, JVMCI_TRAPS);
 
   void initialize_installed_code(JVMCIObject installed_code, CodeBlob* cb, JVMCI_TRAPS);
 
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index bee5f4ea445..1f10e132eff 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -2184,7 +2184,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
               tty->print_cr("Replacing method %s", method_name);
             }
             if (old != nullptr) {
-              old->make_not_entrant("JVMCI register method");
+              old->make_not_entrant(nmethod::ChangeReason::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 b3d896b6863..32d7943e1e8 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -3492,7 +3492,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("OSR invalidation of lower levels");
+      inv->make_not_entrant(nmethod::ChangeReason::OSR_invalidation_of_lower_level);
     }
   }
 }
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index d13458dfa93..1a36fce23aa 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1028,7 +1028,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("set native function");
+    nm->make_not_entrant(nmethod::ChangeReason::set_native_function);
   }
 }
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index f14c5efc65d..cf3b48c11b5 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -794,7 +794,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("Whitebox deoptimization");
+                nm->make_not_entrant(nmethod::ChangeReason::whitebox_deoptimization);
             }
             ++_result;
           }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 4042bb01c58..a0d9dd00339 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1826,7 +1826,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("missing exception handler");
+  nm->make_not_entrant(nmethod::ChangeReason::missing_exception_handler);
 
   // Use Deoptimization::deoptimize for all of its side-effects:
   // gathering traps statistics, logging...
@@ -2455,7 +2455,7 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr
 
     // Recompile
     if (make_not_entrant) {
-      if (!nm->make_not_entrant("uncommon trap")) {
+      if (!nm->make_not_entrant(nmethod::ChangeReason::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 57f93f87d47..f3ad0e0a325 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1337,7 +1337,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("zombie");
+      nm->make_not_entrant(nmethod::ChangeReason::zombie);
     }
   }
 }

From fe3be498b83e70a9f4739ddad6642c3aa04a97d3 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Thu, 5 Jun 2025 17:30:01 +0000
Subject: [PATCH 886/901] 8357141: Update to use jtreg 7.5.2

Reviewed-by: erikj, ihse, iris
---
 make/autoconf/lib-tests.m4    | 2 +-
 make/conf/github-actions.conf | 2 +-
 make/conf/jib-profiles.js     | 4 ++--
 test/docs/TEST.ROOT           | 2 +-
 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       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index d2a4fcbb191..9eb5ee5a046 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.5.1
+JTREG_MINIMUM_VERSION=7.5.2
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index 27845ffbd7a..d2b6cd23128 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=7.5.1+1
+JTREG_VERSION=7.5.2+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 9bedc77cc28..91876878046 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1174,9 +1174,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "7.5.1",
+            version: "7.5.2",
             build_number: "1",
-            file: "bundles/jtreg-7.5.1+1.zip",
+            file: "bundles/jtreg-7.5.2+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 9be915dd4ff..5ca9b1f144f 100644
--- a/test/docs/TEST.ROOT
+++ b/test/docs/TEST.ROOT
@@ -38,7 +38,7 @@
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.5.1+1
+requiredVersion=7.5.2+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 59dd48e5af7..8f4ef153907 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -100,7 +100,7 @@ requires.properties= \
     jdk.static
 
 # Minimum jtreg version
-requiredVersion=7.5.1+1
+requiredVersion=7.5.2+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 7a457d87b69..6398c399f0a 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.5.1+1
+requiredVersion=7.5.2+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 30e2f7cab41..97efc340019 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -119,7 +119,7 @@ requires.properties= \
     jdk.static
 
 # Minimum jtreg version
-requiredVersion=7.5.1+1
+requiredVersion=7.5.2+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 9b1c5368e66..e3bd3b74bcf 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.5.1+1
+requiredVersion=7.5.2+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT
index 21b6fba41f2..162e6e15ec2 100644
--- a/test/lib-test/TEST.ROOT
+++ b/test/lib-test/TEST.ROOT
@@ -29,7 +29,7 @@
 keys=randomness
 
 # Minimum jtreg version
-requiredVersion=7.5.1+1
+requiredVersion=7.5.2+1
 
 # Allow querying of various System properties in @requires clauses
 requires.extraPropDefns = ../jtreg-ext/requires/VMProps.java

From 15178aa298e43be3e27121343432f25884db4e5d Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Thu, 5 Jun 2025 20:19:53 +0000
Subject: [PATCH 887/901] 8357688: Remove unnecessary List.get before remove in
 PopupFactory

Reviewed-by: azvegint, kizune, serb
---
 .../classes/javax/swing/PopupFactory.java     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
index 9789e95e7ff..682cdbd005b 100644
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.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
@@ -433,10 +433,8 @@ private static HeavyWeightPopup getRecycledHeavyWeightPopup(Window w) {
                 } else {
                     return null;
                 }
-                if (cache.size() > 0) {
-                    HeavyWeightPopup r = cache.get(0);
-                    cache.remove(0);
-                    return r;
+                if (!cache.isEmpty()) {
+                    return cache.removeFirst();
                 }
                 return null;
             }
@@ -776,10 +774,8 @@ private static void recycleLightWeightPopup(LightWeightPopup popup) {
         private static LightWeightPopup getRecycledLightWeightPopup() {
             synchronized (LightWeightPopup.class) {
                 List<LightWeightPopup> lightPopupCache = getLightWeightPopupCache();
-                if (lightPopupCache.size() > 0) {
-                    LightWeightPopup r = lightPopupCache.get(0);
-                    lightPopupCache.remove(0);
-                    return r;
+                if (!lightPopupCache.isEmpty()) {
+                    return lightPopupCache.removeFirst();
                 }
                 return null;
             }
@@ -934,10 +930,8 @@ private static void recycleMediumWeightPopup(MediumWeightPopup popup) {
         private static MediumWeightPopup getRecycledMediumWeightPopup() {
             synchronized (MediumWeightPopup.class) {
                 List<MediumWeightPopup> mediumPopupCache = getMediumWeightPopupCache();
-                if (mediumPopupCache.size() > 0) {
-                    MediumWeightPopup r = mediumPopupCache.get(0);
-                    mediumPopupCache.remove(0);
-                    return r;
+                if (!mediumPopupCache.isEmpty()) {
+                    return mediumPopupCache.removeFirst();
                 }
                 return null;
             }

From c793de989facdb532021e1d5ddd01eb0e089b8e6 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Thu, 5 Jun 2025 21:57:33 +0000
Subject: [PATCH 888/901] 8350212: Track source end positions of declarations
 that support @SuppressWarnings

Co-authored-by: Jan Lahoda <jlahoda@openjdk.org>
Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Lower.java       |   4 +-
 .../classes/com/sun/tools/javac/jvm/Gen.java  |   8 +-
 .../sun/tools/javac/parser/JavacParser.java   | 196 +++++++-----------
 .../com/sun/tools/javac/tree/EndPosTable.java |  31 ++-
 .../com/sun/tools/javac/tree/JCTree.java      |   8 +-
 .../com/sun/tools/javac/tree/TreeInfo.java    |  27 +--
 .../share/classes/jdk/jshell/ReplParser.java  |   3 +-
 .../MissingLNTEntryForFinalizerTest.java      |   4 +-
 .../javac/parser/DeclarationEndPositions.java | 119 +++++++++++
 .../tools/javac/parser/JavacParserTest.java   |   9 +-
 .../javac/parser/extend/TrialParser.java      |   3 +-
 11 files changed, 252 insertions(+), 160 deletions(-)
 create mode 100644 test/langtools/tools/javac/parser/DeclarationEndPositions.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 a544b3948e5..54226155cf8 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
@@ -3697,7 +3697,7 @@ private void visitIterableForeachLoop(JCEnhancedForLoop tree) {
                                                   vardefinit).setType(tree.var.type);
             indexDef.sym = tree.var.sym;
             JCBlock body = make.Block(0, List.of(indexDef, tree.body));
-            body.endpos = TreeInfo.endPos(tree.body);
+            body.bracePos = TreeInfo.endPos(tree.body);
             result = translate(make.
                 ForLoop(List.of(init),
                         cond,
@@ -4158,7 +4158,7 @@ else if (oneCase == nullCase) {
                 stmtList.append(switch2);
 
                 JCBlock res = make.Block(0L, stmtList.toList());
-                res.endpos = TreeInfo.endPos(tree);
+                res.bracePos = TreeInfo.endPos(tree);
                 return res;
             } else {
                 JCSwitchExpression switch2 = make.SwitchExpression(make.Ident(dollar_tmp), lb.toList());
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index 725c7f8063b..14c5420c7c0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -500,7 +500,7 @@ else if ((block.flags & SYNTHETIC) == 0)
             c.members().enter(clinit);
             List<JCStatement> clinitStats = clinitCode.toList();
             JCBlock block = make.at(clinitStats.head.pos()).Block(0, clinitStats);
-            block.endpos = TreeInfo.endPos(clinitStats.last());
+            block.bracePos = TreeInfo.endPos(clinitStats.last());
             methodDefs.append(make.MethodDef(clinit, block));
 
             if (!clinitTAs.isEmpty())
@@ -553,8 +553,8 @@ void normalizeMethod(JCMethodDecl md, List<JCStatement> initCode, List<TypeCompo
             // Find the super() invocation and append the given initializer code.
             TreeInfo.mapSuperCalls(md.body, supercall -> make.Block(0, initCode.prepend(supercall)));
 
-            if (md.body.endpos == Position.NOPOS)
-                md.body.endpos = TreeInfo.endPos(md.body.stats.last());
+            if (md.body.bracePos == Position.NOPOS)
+                md.body.bracePos = TreeInfo.endPos(md.body.stats.last());
 
             md.sym.appendUniqueTypeAttributes(initTAs);
         }
@@ -1121,7 +1121,7 @@ private void internalVisitBlock(JCBlock tree) {
         genStats(tree.stats, localEnv);
         // End the scope of all block-local variables in variable info.
         if (!env.tree.hasTag(METHODDEF)) {
-            code.statBegin(tree.endpos);
+            code.statBegin(tree.bracePos);
             code.endScopes(limit);
             code.pendingStatPos = Position.NOPOS;
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 1383baa57b8..7ebcd0c844b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -231,8 +231,8 @@ protected JavacParser(JavacParser parser,
 
     protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
         return  keepEndPositions
-                ? new SimpleEndPosTable(this)
-                : new EmptyEndPosTable(this);
+                ? new SimpleEndPosTable()
+                : new MinimalEndPosTable();
     }
 
     protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) {
@@ -633,12 +633,14 @@ private void saveDanglingDocComments(Comment dc) {
      *
      *  @param tree   The tree to be used as index in the hashtable
      *  @param dc     The doc comment to associate with the tree, or null.
+     *  @return {@code tree}
      */
-    protected void attach(JCTree tree, Comment dc) {
+    protected <T extends JCTree> T attach(T tree, Comment dc) {
         if (keepDocComments && dc != null) {
             docComments.putComment(tree, dc);
         }
         reportDanglingComments(tree, dc);
+        return tree;
     }
 
     /** Reports all dangling comments associated with the
@@ -702,16 +704,35 @@ protected void setErrorEndPos(int errPos) {
         endPosTable.setErrorEndPos(errPos);
     }
 
-    protected void storeEnd(JCTree tree, int endpos) {
-        endPosTable.storeEnd(tree, endpos);
+    /**
+     * Store ending position for a tree, the value of which is the greater of
+     * last error position in {@link #endPosTable} and the given ending position.
+     * @param tree tree node
+     * @param endpos the ending position to associate with {@code tree}
+     * @return {@code tree}
+     */
+    protected <T extends JCTree> T storeEnd(T tree, int endpos) {
+        return endPosTable.storeEnd(tree, endpos);
     }
 
-    protected <T extends JCTree> T to(T t) {
-        return endPosTable.to(t);
+    /**
+     * Store current token's ending position for a tree, the value of which
+     * will be the greater of last error position in {@link #endPosTable}
+     * and the ending position of the current token.
+     * @param tree tree node
+     */
+    protected <T extends JCTree> T to(T tree) {
+        return storeEnd(tree, token.endPos);
     }
 
-    protected <T extends JCTree> T toP(T t) {
-        return endPosTable.toP(t);
+    /**
+     * Store current token's ending position for a tree, the value of which
+     * will be the greater of last error position in {@link #endPosTable}
+     * and the ending position of the previous token.
+     * @param tree tree node
+     */
+    protected <T extends JCTree> T toP(T tree) {
+        return storeEnd(tree, S.prevToken().endPos);
     }
 
     /** Get the start position for a tree node.  The start position is
@@ -1741,7 +1762,7 @@ protected JCExpression term3() {
                 case RBRACE: case EOF:
                     JCSwitchExpression e = to(F.at(switchPos).SwitchExpression(selector,
                                                                                cases.toList()));
-                    e.endpos = token.pos;
+                    e.bracePos = token.pos;
                     accept(RBRACE);
                     return e;
                 default:
@@ -2819,9 +2840,9 @@ JCBlock block(int pos, long flags) {
             syntaxError(token.pos, Errors.Orphaned(token.kind));
             switchBlockStatementGroups();
         }
-        // the Block node has a field "endpos" for first char of last token, which is
+        // the Block node has a field "bracePos" for first char of last token, which is
         // usually but not necessarily the last char of the last token.
-        t.endpos = token.pos;
+        t.bracePos = token.pos;
         accept(RBRACE);
         return toP(t);
     }
@@ -3142,7 +3163,7 @@ public JCStatement parseSimpleStatement() {
             accept(LBRACE);
             List<JCCase> cases = switchBlockStatementGroups();
             JCSwitch t = to(F.at(pos).Switch(selector, cases));
-            t.endpos = token.endPos;
+            t.bracePos = token.endPos;
             accept(RBRACE);
             return t;
         }
@@ -3658,9 +3679,7 @@ JCAnnotation annotation(int pos, Tag kind) {
         } else {
             throw new AssertionError("Unhandled annotation kind: " + kind);
         }
-
-        storeEnd(ann, S.prevToken().endPos);
-        return ann;
+        return toP(ann);
     }
 
     List<JCExpression> annotationFieldValuesOpt() {
@@ -3835,9 +3854,8 @@ JCVariableDecl variableDeclaratorRest(int pos, JCModifiers mods, JCExpression ty
             }
         }
         JCVariableDecl result = toP(F.at(pos).VarDef(mods, name, type, init, declaredUsingVar));
-        attach(result, dc);
         result.startPos = startPos;
-        return result;
+        return attach(result, dc);
     }
 
     Name restrictedTypeName(JCExpression e, boolean shouldWarn) {
@@ -4131,7 +4149,7 @@ public JCTree.JCCompilationUnit parseCompilationUnit() {
                 firstTypeDecl = false;
             }
         }
-        List<JCTree> topLevelDefs = isImplicitClass ?  constructImplicitClass(defs.toList()) : defs.toList();
+        List<JCTree> topLevelDefs = isImplicitClass ? constructImplicitClass(defs.toList(), S.prevToken().endPos) : defs.toList();
         JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(topLevelDefs);
         if (!consumedToplevelDoc)
             attach(toplevel, firstToken.docComment());
@@ -4141,13 +4159,12 @@ public JCTree.JCCompilationUnit parseCompilationUnit() {
             toplevel.docComments = docComments;
         if (keepLineMap)
             toplevel.lineMap = S.getLineMap();
-        this.endPosTable.setParser(null); // remove reference to parser
         toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
 
     // Restructure top level to be an implicitly declared class.
-    private List<JCTree> constructImplicitClass(List<JCTree> origDefs) {
+    private List<JCTree> constructImplicitClass(List<JCTree> origDefs, int endPos) {
         ListBuffer<JCTree> topDefs = new ListBuffer<>();
         ListBuffer<JCTree> defs = new ListBuffer<>();
 
@@ -4177,6 +4194,7 @@ private List<JCTree> constructImplicitClass(List<JCTree> origDefs) {
         JCClassDecl implicit = F.at(primaryPos).ClassDef(
                 implicitMods, name, List.nil(), null, List.nil(), List.nil(),
                 defs.toList());
+        storeEnd(implicit, endPos);
         topDefs.append(implicit);
         return topDefs.toList();
     }
@@ -4192,11 +4210,12 @@ JCModuleDecl moduleDecl(JCModifiers mods, ModuleKind kind, Comment dc) {
         accept(LBRACE);
         directives = moduleDirectiveList();
         accept(RBRACE);
+        int endPos = S.prevToken().endPos;
         accept(EOF);
 
-        JCModuleDecl result = toP(F.at(pos).ModuleDef(mods, kind, name, directives));
-        attach(result, dc);
-        return result;
+        JCModuleDecl result = F.at(pos).ModuleDef(mods, kind, name, directives);
+        storeEnd(result, endPos);
+        return attach(result, dc);
     }
 
     List<JCDirective> moduleDirectiveList() {
@@ -4386,8 +4405,7 @@ protected JCClassDecl classDeclaration(JCModifiers mods, Comment dc) {
         List<JCTree> defs = classInterfaceOrRecordBody(name, false, false);
         JCClassDecl result = toP(F.at(pos).ClassDef(
             mods, name, typarams, extending, implementing, permitting, defs));
-        attach(result, dc);
-        return result;
+        return attach(result, dc);
     }
 
     protected JCClassDecl recordDeclaration(JCModifiers mods, Comment dc) {
@@ -4434,8 +4452,7 @@ protected JCClassDecl recordDeclaration(JCModifiers mods, Comment dc) {
             defs = defs.prepend(field);
         }
         JCClassDecl result = toP(F.at(pos).ClassDef(mods, name, typarams, null, implementing, defs));
-        attach(result, dc);
-        return result;
+        return attach(result, dc);
     }
 
     Name typeName() {
@@ -4474,8 +4491,7 @@ protected JCClassDecl interfaceDeclaration(JCModifiers mods, Comment dc) {
         defs = classInterfaceOrRecordBody(name, true, false);
         JCClassDecl result = toP(F.at(pos).ClassDef(
             mods, name, typarams, null, extending, permitting, defs));
-        attach(result, dc);
-        return result;
+        return attach(result, dc);
     }
 
     List<JCExpression> permitsClause(JCModifiers mods, String classOrInterface) {
@@ -4522,8 +4538,7 @@ protected JCClassDecl enumDeclaration(JCModifiers mods, Comment dc) {
         JCClassDecl result = toP(F.at(pos).
             ClassDef(mods, name, List.nil(),
                      null, implementing, defs));
-        attach(result, dc);
-        return result;
+        return attach(result, dc);
     }
 
     /** EnumBody = "{" { EnumeratorDeclarationList } [","]
@@ -4664,8 +4679,7 @@ JCTree enumeratorDeclaration(Name enumName) {
             storeEnd(create, S.prevToken().endPos);
         ident = F.at(identPos).Ident(enumName);
         JCTree result = toP(F.at(pos).VarDef(mods, name, ident, create));
-        attach(result, dc);
-        return result;
+        return attach(result, dc);
     }
 
     /** TypeList = Type {"," Type}
@@ -5097,8 +5111,7 @@ protected JCTree methodDeclaratorRest(int pos,
                     toP(F.at(pos).MethodDef(mods, name, type, typarams,
                                             receiverParam, params, thrown,
                                             body, defaultValue));
-            attach(result, dc);
-            return result;
+            return attach(result, dc);
         } finally {
             this.receiverParam = prevReceiverParam;
         }
@@ -5395,8 +5408,7 @@ private JCExpression insertAnnotationsToMostInner(
             return mostInnerTypeToReturn;
         } else {
             mostInnerArrayType.elemtype = mostInnerTypeToReturn;
-            storeEnd(type, origEndPos);
-            return type;
+            return storeEnd(type, origEndPos);
         }
     }
 
@@ -5622,121 +5634,69 @@ private void updateUnexpectedTopLevelDefinitionStartError(boolean hasPackageDecl
         }
     }
 
-    /*
-     * a functional source tree and end position mappings
+    /**
+     * A straightforward {@link EndPosTable} implementation.
      */
     protected static class SimpleEndPosTable extends AbstractEndPosTable {
 
-        private final IntHashTable endPosMap;
-
-        SimpleEndPosTable(JavacParser parser) {
-            super(parser);
-            endPosMap = new IntHashTable();
-        }
-
-        public void storeEnd(JCTree tree, int endpos) {
-            endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
-        }
+        private final IntHashTable endPosMap = new IntHashTable();
 
-        protected <T extends JCTree> T to(T t) {
-            storeEnd(t, parser.token.endPos);
-            return t;
-        }
-
-        protected <T extends JCTree> T toP(T t) {
-            storeEnd(t, parser.S.prevToken().endPos);
-            return t;
+        @Override
+        public <T extends JCTree> T storeEnd(T tree, int endpos) {
+            endPosMap.put(tree, Math.max(endpos, errorEndPos));
+            return tree;
         }
 
+        @Override
         public int getEndPos(JCTree tree) {
             int value = endPosMap.get(tree);
             // As long as Position.NOPOS==-1, this just returns value.
             return (value == -1) ? Position.NOPOS : value;
         }
 
+        @Override
         public int replaceTree(JCTree oldTree, JCTree newTree) {
             int pos = endPosMap.remove(oldTree);
-            if (pos != -1) {
+            if (pos != -1 && newTree != null) {
                 storeEnd(newTree, pos);
-                return pos;
             }
-            return Position.NOPOS;
+            return pos;
         }
     }
 
-    /*
-     * a default skeletal implementation without any mapping overhead.
+    /**
+     * A minimal implementation that only stores what's required.
      */
-    protected static class EmptyEndPosTable extends AbstractEndPosTable {
-
-        EmptyEndPosTable(JavacParser parser) {
-            super(parser);
-        }
-
-        public void storeEnd(JCTree tree, int endpos) { /* empty */ }
-
-        protected <T extends JCTree> T to(T t) {
-            return t;
-        }
-
-        protected <T extends JCTree> T toP(T t) {
-            return t;
-        }
-
-        public int getEndPos(JCTree tree) {
-            return Position.NOPOS;
-        }
+    protected static class MinimalEndPosTable extends SimpleEndPosTable {
 
-        public int replaceTree(JCTree oldTree, JCTree newTree) {
-            return Position.NOPOS;
+        @Override
+        public <T extends JCTree> T storeEnd(T tree, int endpos) {
+            switch (tree.getTag()) {
+            case MODULEDEF:
+            case PACKAGEDEF:
+            case CLASSDEF:
+            case METHODDEF:
+            case VARDEF:
+                break;
+            default:
+                return tree;
+            }
+            return super.storeEnd(tree, endpos);
         }
-
     }
 
     protected abstract static class AbstractEndPosTable implements EndPosTable {
-        /**
-         * The current parser.
-         */
-        protected JavacParser parser;
 
         /**
          * Store the last error position.
          */
         public int errorEndPos = Position.NOPOS;
 
-        public AbstractEndPosTable(JavacParser parser) {
-            this.parser = parser;
-        }
-
-        /**
-         * Store current token's ending position for a tree, the value of which
-         * will be the greater of last error position and the ending position of
-         * the current token.
-         * @param t The tree.
-         */
-        protected abstract <T extends JCTree> T to(T t);
-
-        /**
-         * Store current token's ending position for a tree, the value of which
-         * will be the greater of last error position and the ending position of
-         * the previous token.
-         * @param t The tree.
-         */
-        protected abstract <T extends JCTree> T toP(T t);
-
-        /**
-         * Set the error position during the parsing phases, the value of which
-         * will be set only if it is greater than the last stored error position.
-         * @param errPos The error position
-         */
+        @Override
         public void setErrorEndPos(int errPos) {
             if (errPos > errorEndPos) {
                 errorEndPos = errPos;
             }
         }
-
-        public void setParser(JavacParser parser) {
-            this.parser = parser;
-        }
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
index d68ba838ba1..83fe402c0a7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.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
@@ -25,8 +25,21 @@
 
 package com.sun.tools.javac.tree;
 
+import com.sun.tools.javac.util.Position;
+
 /**
  * Specifies the methods to access a mappings of syntax trees to end positions.
+ *
+ * <p>
+ * Implementations <b>must</b> store end positions for at least these node types:
+ * <ul>
+ *  <li>{@link JCTree.JCModuleDecl}
+ *  <li>{@link JCTree.JCPackageDecl}
+ *  <li>{@link JCTree.JCClassDecl}
+ *  <li>{@link JCTree.JCMethodDecl}
+ *  <li>{@link JCTree.JCVariableDecl}
+ * </ul>
+ *
  * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
@@ -40,23 +53,31 @@ public interface EndPosTable {
      * @param tree JCTree
      * @return position of the source tree or Positions.NOPOS for non-existent mapping
      */
-    public int getEndPos(JCTree tree);
+    int getEndPos(JCTree tree);
 
     /**
      * Store ending position for a tree, the value of which is the greater of
      * last error position and the given ending position.
      * @param tree The tree.
      * @param endpos The ending position to associate with the tree.
+     * @return the {@code tree}
+     */
+    <T extends JCTree> T storeEnd(T tree, int endpos);
+
+    /**
+     * Set the error position during the parsing phases, the value of which
+     * will be set only if it is greater than the last stored error position.
+     * @param errPos The error position
      */
-    public abstract void storeEnd(JCTree tree, int endpos);
+    void setErrorEndPos(int errPos);
 
     /**
      * Give an old tree and a new tree, the old tree will be replaced with
      * the new tree, the position of the new tree will be that of the old
      * tree.
      * @param oldtree a JCTree to be replaced
-     * @param newtree a JCTree to be replaced with
+     * @param newtree a JCTree to be replaced with, or null to just remove {@code oldtree}
      * @return position of the old tree or Positions.NOPOS for non-existent mapping
      */
-    public int replaceTree(JCTree oldtree, JCTree newtree);
+    int replaceTree(JCTree oldtree, JCTree newtree);
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
index de86b7e2c57..debc10c9ff8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -1121,7 +1121,7 @@ public static class JCBlock extends JCStatement implements BlockTree {
         /** statements */
         public List<JCStatement> stats;
         /** Position of closing brace, optional. */
-        public int endpos = Position.NOPOS;
+        public int bracePos = Position.NOPOS;
         /** If this block contains record pattern, it is necessary to catch
          *  exceptions from the deconstructors and wrap them.
          * The {@code patternMatchingCatch} keeps the list of the deconstructor
@@ -1330,7 +1330,7 @@ public static class JCSwitch extends JCStatement implements SwitchTree {
         public JCExpression selector;
         public List<JCCase> cases;
         /** Position of closing brace, optional. */
-        public int endpos = Position.NOPOS;
+        public int bracePos = Position.NOPOS;
         public boolean hasUnconditionalPattern;
         public boolean isExhaustive;
         public boolean patternSwitch;
@@ -1430,7 +1430,7 @@ public static class JCSwitchExpression extends JCPolyExpression implements Switc
         public JCExpression selector;
         public List<JCCase> cases;
         /** Position of closing brace, optional. */
-        public int endpos = Position.NOPOS;
+        public int bracePos = Position.NOPOS;
         public boolean hasUnconditionalPattern;
         public boolean isExhaustive;
         public boolean patternSwitch;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 5e3b043fb11..ae946c5b6d6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 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
@@ -500,12 +500,12 @@ public static int firstStatPos(JCTree tree) {
             return tree.pos;
     }
 
-    /** The end position of given tree, if it is a block with
-     *  defined endpos.
+    /** The closing brace position of given tree, if it is a block with
+     *  defined bracePos.
      */
     public static int endPos(JCTree tree) {
-        if (tree.hasTag(BLOCK) && ((JCBlock) tree).endpos != Position.NOPOS)
-            return ((JCBlock) tree).endpos;
+        if (tree.hasTag(BLOCK) && ((JCBlock) tree).bracePos != Position.NOPOS)
+            return ((JCBlock) tree).bracePos;
         else if (tree.hasTag(SYNCHRONIZED))
             return endPos(((JCSynchronized) tree).body);
         else if (tree.hasTag(TRY)) {
@@ -513,11 +513,11 @@ else if (tree.hasTag(TRY)) {
             return endPos((t.finalizer != null) ? t.finalizer
                           : (t.catchers.nonEmpty() ? t.catchers.last().body : t.body));
         } else if (tree.hasTag(SWITCH) &&
-                   ((JCSwitch) tree).endpos != Position.NOPOS) {
-            return ((JCSwitch) tree).endpos;
+                   ((JCSwitch) tree).bracePos != Position.NOPOS) {
+            return ((JCSwitch) tree).bracePos;
         } else if (tree.hasTag(SWITCH_EXPRESSION) &&
-                   ((JCSwitchExpression) tree).endpos != Position.NOPOS) {
-            return ((JCSwitchExpression) tree).endpos;
+                   ((JCSwitchExpression) tree).bracePos != Position.NOPOS) {
+            return ((JCSwitchExpression) tree).bracePos;
         } else
             return tree.pos;
     }
@@ -646,11 +646,6 @@ public static int getEndPos(JCTree tree, EndPosTable endPosTable) {
         if (tree == null)
             return Position.NOPOS;
 
-        if (endPosTable == null) {
-            // fall back on limited info in the tree
-            return endPos(tree);
-        }
-
         int mapPos = endPosTable.getEndPos(tree);
         if (mapPos != Position.NOPOS)
             return mapPos;
@@ -731,8 +726,8 @@ public static int getEndPos(JCTree tree, EndPosTable endPosTable) {
 
 
     /** A DiagnosticPosition with the preferred position set to the
-     *  end position of given tree, if it is a block with
-     *  defined endpos.
+     *  closing brace position of given tree, if it is a block with
+     *  defined closing brace position.
      */
     public static DiagnosticPosition diagEndPos(final JCTree tree) {
         final int endPos = TreeInfo.endPos(tree);
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
index 2968bc3e173..0219fa0eaf8 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.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
@@ -141,7 +141,6 @@ public ReplUnit(List<JCTree> defs) {
             storeEnd(toplevel, S.prevToken().endPos);
         }
         toplevel.lineMap = S.getLineMap();
-        this.endPosTable.setParser(null); // remove reference to parser
         toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
diff --git a/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java b/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java
index ff3f2cf3200..95a9ef2dd53 100644
--- a/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.java
+++ b/test/langtools/tools/javac/T8180660/MissingLNTEntryForFinalizerTest.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
@@ -151,7 +151,7 @@ public com.sun.tools.javac.code.Type attribStat(JCTree tree, Env<AttrContext> en
             com.sun.tools.javac.code.Type result = super.attribStat(tree, env);
             if (tree.hasTag(TRY)) {
                 JCTry tryTree = (JCTry)tree;
-                lineNumber = env.toplevel.lineMap.getLineNumber(tryTree.finalizer.endpos);
+                lineNumber = env.toplevel.lineMap.getLineNumber(tryTree.finalizer.bracePos);
             }
             return result;
         }
diff --git a/test/langtools/tools/javac/parser/DeclarationEndPositions.java b/test/langtools/tools/javac/parser/DeclarationEndPositions.java
new file mode 100644
index 00000000000..473d6bc2712
--- /dev/null
+++ b/test/langtools/tools/javac/parser/DeclarationEndPositions.java
@@ -0,0 +1,119 @@
+/*
+ * 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 8350212
+ * @summary Verify ending source positions are calculated for declarations supporting SuppressWarnings
+ * @modules jdk.compiler/com.sun.tools.javac.tree
+ * @run main DeclarationEndPositions
+ */
+
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.Tree;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreeScanner;
+import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.*;
+import com.sun.tools.javac.tree.TreeInfo;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class DeclarationEndPositions {
+
+    public static void checkEndPosition(Class<? extends JCTree> nodeType, String input, String marker) throws IOException {
+
+        // Create source
+        var source = new SimpleJavaFileObject(URI.create("file://T.java"), JavaFileObject.Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return input;
+            }
+        };
+
+        // Parse source
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        JavaCompiler.CompilationTask task = compiler.getTask(null, null, null, List.of(), List.of(), List.of(source));
+        Iterable<? extends CompilationUnitTree> units = ((JavacTask)task).parse();
+
+        // Find node and check end position
+        JCTree.JCCompilationUnit unit = (JCTree.JCCompilationUnit)units.iterator().next();
+        unit.accept(new TreeScanner<Void, Void>() {
+            @Override
+            public Void scan(Tree node, Void aVoid) {
+                if (nodeType.isInstance(node)) {
+                    JCTree tree = (JCTree)node;
+                    int actual = TreeInfo.getEndPos(tree, unit.endPositions);
+                    int expected = marker.indexOf('^') + 1;
+                    if (actual != expected) {
+                        throw new AssertionError(String.format(
+                          "wrong end pos %d != %d for \"%s\" @ %d", actual, expected, input, tree.pos));
+                    }
+                }
+                return super.scan(node, aVoid);
+            }
+        }, null);
+    }
+
+    public static void main(String... args) throws Exception {
+
+        // JCModuleDecl
+        checkEndPosition(JCModuleDecl.class,
+           "/* comment */ module fred { /* comment */ } /* comment */",
+           "                                          ^              ");
+
+        // JCPackageDecl
+        checkEndPosition(JCPackageDecl.class,
+           "/* comment */ package fred; /* comment */",
+           "                          ^              ");
+
+        // JCClassDecl
+        checkEndPosition(JCClassDecl.class,
+           "/* comment */ class Fred { /* comment */ } /* comment */",
+           "                                         ^              ");
+
+        // JCMethodDecl
+        checkEndPosition(JCMethodDecl.class,
+           "/* comment */ class Fred { void m() { /* comment */ } } /* comment */",
+           "                                                    ^                ");
+
+        // JCVariableDecl
+        checkEndPosition(JCVariableDecl.class,
+           "/* comment */ class Fred { int x; } /* comment */",
+           "                                ^                ");
+        checkEndPosition(JCVariableDecl.class,
+           "/* comment */ class Fred { int x = 123; } /* comment */",
+           "                                      ^                ");
+        checkEndPosition(JCVariableDecl.class,
+           "/* comment */ class A { try {} catch (Error err) {} } /* comment */",
+           "                                              ^                    ");
+    }
+}
diff --git a/test/langtools/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java
index 6a2850fc8dd..9c6ad617132 100644
--- a/test/langtools/tools/javac/parser/JavacParserTest.java
+++ b/test/langtools/tools/javac/parser/JavacParserTest.java
@@ -2298,10 +2298,9 @@ public Void visitCase(CaseTree node, Void p) {
 
     @Test //JDK-8310326
     void testUnnamedClassPositions() throws IOException {
-        String code = """
-                      void main() {
-                      }
-                      """;
+        //             0         1         2
+        //             012345678901234567890
+        String code = "void main() { }";
         DiagnosticCollector<JavaFileObject> coll =
                 new DiagnosticCollector<>();
         JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null,
@@ -2313,7 +2312,7 @@ void main() {
             @Override
             public Void visitClass(ClassTree node, Void p) {
                 assertEquals("Wrong start position", 0, sp.getStartPosition(cut, node));
-                assertEquals("Wrong end position", -1, sp.getEndPosition(cut, node));
+                assertEquals("Wrong end position", 15, sp.getEndPosition(cut, node));
                 assertEquals("Wrong modifiers start position", -1, sp.getStartPosition(cut, node.getModifiers()));
                 assertEquals("Wrong modifiers end position", -1, sp.getEndPosition(cut, node.getModifiers()));
                 return super.visitClass(node, p);
diff --git a/test/langtools/tools/javac/parser/extend/TrialParser.java b/test/langtools/tools/javac/parser/extend/TrialParser.java
index 539676a90fb..c9a858fbc47 100644
--- a/test/langtools/tools/javac/parser/extend/TrialParser.java
+++ b/test/langtools/tools/javac/parser/extend/TrialParser.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
@@ -139,7 +139,6 @@ public TrialUnit(List<JCTree> defs) {
             storeEnd(toplevel, S.prevToken().endPos);
         }
         toplevel.lineMap = S.getLineMap();
-        this.endPosTable.setParser(null); // remove reference to parser
         toplevel.endPositions = this.endPosTable;
         return toplevel;
     }

From 78158f30aee51e14ab203b0127aeb883c010319c Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Thu, 5 Jun 2025 22:13:24 +0000
Subject: [PATCH 889/901] 8358099: PEM spec updates

Reviewed-by: mullan
---
 .../classes/java/security/PEMDecoder.java     | 40 ++++++-------
 .../classes/java/security/PEMEncoder.java     |  7 ++-
 .../classes/java/security/PEMRecord.java      | 56 +++++++------------
 .../sun/security/provider/X509Factory.java    |  2 +-
 .../share/classes/sun/security/util/Pem.java  |  2 +-
 .../jdk/java/security/PEM/PEMDecoderTest.java |  8 +--
 6 files changed, 48 insertions(+), 67 deletions(-)

diff --git a/src/java.base/share/classes/java/security/PEMDecoder.java b/src/java.base/share/classes/java/security/PEMDecoder.java
index eeb6decdf40..7279e75cc98 100644
--- a/src/java.base/share/classes/java/security/PEMDecoder.java
+++ b/src/java.base/share/classes/java/security/PEMDecoder.java
@@ -81,24 +81,24 @@
  * {@link PEMRecord}.
  *
  * <p> The {@linkplain #decode(String, Class)} and
- * {@linkplain #decode(InputStream, Class)} methods take a Class parameter
+ * {@linkplain #decode(InputStream, Class)} methods take a class parameter
  * which determines the type of {@code DEREncodable} that is returned. These
  * methods are useful when extracting or changing the return class.
  * For example, if the PEM contains both public and private keys, the
- * Class parameter can specify which to return. Use
+ * class parameter can specify which to return. Use
  * {@code PrivateKey.class} to return only the private key.
- * If the Class parameter is set to {@code X509EncodedKeySpec.class}, the
+ * If the class parameter is set to {@code X509EncodedKeySpec.class}, the
  * public key will be returned in that format.  Any type of PEM data can be
  * decoded into a {@code PEMRecord} by specifying {@code PEMRecord.class}.
- * If the Class parameter doesn't match the PEM content, an
- * {@code IllegalArgumentException} will be thrown.
+ * If the class parameter doesn't match the PEM content, a
+ * {@linkplain ClassCastException} will be thrown.
  *
  * <p> A new {@code PEMDecoder} instance is created when configured
  * with {@linkplain #withFactory(Provider)} and/or
  * {@linkplain #withDecryption(char[])}. {@linkplain #withFactory(Provider)}
  * configures the decoder to use only {@linkplain KeyFactory} and
  * {@linkplain CertificateFactory} instances from the given {@code Provider}.
- * {@link#withDecryption(char[])} configures the decoder to decrypt all
+ * {@linkplain #withDecryption(char[])} configures the decoder to decrypt all
  * encrypted private key PEM data using the given password.
  * Configuring an instance for decryption does not prevent decoding with
  * unencrypted PEM. Any encrypted PEM that fails decryption
@@ -117,15 +117,15 @@
  * <p> Here is an example of a {@code PEMDecoder} configured with decryption
  * and a factory provider:
  * {@snippet lang = java:
- *     PEMDecoder pe = PEMDecoder.of().withDecryption(password).
+ *     PEMDecoder pd = PEMDecoder.of().withDecryption(password).
  *         withFactory(provider);
- *     byte[] pemData = pe.decode(privKey);
+ *     byte[] pemData = pd.decode(privKey);
  * }
  *
  * @implNote An implementation may support other PEM types and
- * {@code DEREncodables}. This implementation additionally supports PEM types:
- * {@code X509 CERTIFICATE}, {@code X.509 CERTIFICATE}, {@code CRL},
- * and {@code RSA PRIVATE KEY}.
+ * {@code DEREncodable} objects. This implementation additionally supports
+ * the following PEM types:  {@code X509 CERTIFICATE},
+ * {@code X.509 CERTIFICATE}, {@code CRL}, and {@code RSA PRIVATE KEY}.
  *
  * @see PEMEncoder
  * @see PEMRecord
@@ -179,13 +179,13 @@ private DEREncodable decode(PEMRecord pem) {
             return switch (pem.type()) {
                 case Pem.PUBLIC_KEY -> {
                     X509EncodedKeySpec spec =
-                        new X509EncodedKeySpec(decoder.decode(pem.pem()));
+                        new X509EncodedKeySpec(decoder.decode(pem.content()));
                     yield getKeyFactory(
                         KeyUtil.getAlgorithm(spec.getEncoded())).
                         generatePublic(spec);
                 }
                 case Pem.PRIVATE_KEY -> {
-                    PKCS8Key p8key = new PKCS8Key(decoder.decode(pem.pem()));
+                    PKCS8Key p8key = new PKCS8Key(decoder.decode(pem.content()));
                     String algo = p8key.getAlgorithm();
                     KeyFactory kf = getKeyFactory(algo);
                     DEREncodable d = kf.generatePrivate(
@@ -216,27 +216,27 @@ yield new KeyPair(getKeyFactory(algo).
                 case Pem.ENCRYPTED_PRIVATE_KEY -> {
                     if (password == null) {
                         yield new EncryptedPrivateKeyInfo(decoder.decode(
-                            pem.pem()));
+                            pem.content()));
                     }
-                    yield new EncryptedPrivateKeyInfo(decoder.decode(pem.pem())).
+                    yield new EncryptedPrivateKeyInfo(decoder.decode(pem.content())).
                         getKey(password.getPassword());
                 }
                 case Pem.CERTIFICATE, Pem.X509_CERTIFICATE,
                      Pem.X_509_CERTIFICATE -> {
                     CertificateFactory cf = getCertFactory("X509");
                     yield (X509Certificate) cf.generateCertificate(
-                        new ByteArrayInputStream(decoder.decode(pem.pem())));
+                        new ByteArrayInputStream(decoder.decode(pem.content())));
                 }
                 case Pem.X509_CRL, Pem.CRL -> {
                     CertificateFactory cf = getCertFactory("X509");
                     yield (X509CRL) cf.generateCRL(
-                        new ByteArrayInputStream(decoder.decode(pem.pem())));
+                        new ByteArrayInputStream(decoder.decode(pem.content())));
                 }
                 case Pem.RSA_PRIVATE_KEY -> {
                     KeyFactory kf = getKeyFactory("RSA");
                     yield kf.generatePrivate(
                         RSAPrivateCrtKeyImpl.getKeySpec(decoder.decode(
-                            pem.pem())));
+                            pem.content())));
                 }
                 default -> pem;
             };
@@ -271,7 +271,6 @@ yield new EncryptedPrivateKeyInfo(decoder.decode(pem.pem())).
      */
     public DEREncodable decode(String str) {
         Objects.requireNonNull(str);
-        DEREncodable de;
         try {
             return decode(new ByteArrayInputStream(
                 str.getBytes(StandardCharsets.UTF_8)));
@@ -483,9 +482,6 @@ private CertificateFactory getCertFactory(String algorithm) {
      * from the specified {@link Provider} to produce cryptographic objects.
      * Any errors using the {@code Provider} will occur during decoding.
      *
-     * <p>If {@code provider} is {@code null}, a new instance is returned with
-     * the default provider configuration.
-     *
      * @param provider the factory provider
      * @return a new PEMEncoder instance configured to the {@code Provider}.
      * @throws NullPointerException if {@code provider} is null
diff --git a/src/java.base/share/classes/java/security/PEMEncoder.java b/src/java.base/share/classes/java/security/PEMEncoder.java
index d5465083330..95fcffe967b 100644
--- a/src/java.base/share/classes/java/security/PEMEncoder.java
+++ b/src/java.base/share/classes/java/security/PEMEncoder.java
@@ -71,7 +71,7 @@
  * OneAsymmetricKey structure using the "PRIVATE KEY" type.
  *
  * <p> When encoding a {@link PEMRecord}, the API surrounds the
- * {@linkplain PEMRecord#pem()} with the PEM header and footer
+ * {@linkplain PEMRecord#content()} with the PEM header and footer
  * from {@linkplain PEMRecord#type()}. {@linkplain PEMRecord#leadingData()} is
  * not included in the encoding.  {@code PEMRecord} will not perform
  * validity checks on the data.
@@ -108,7 +108,8 @@
  *     byte[] pemData = pe.encode(privKey);
  * }
  *
- * @implNote An implementation may support other PEM types and DEREncodables.
+ * @implNote An implementation may support other PEM types and
+ * {@code DEREncodable} objects.
  *
  *
  * @see PEMDecoder
@@ -287,7 +288,7 @@ private String buildKey(byte[] privateBytes, byte[] publicBytes) {
         }
 
         // If `keySpec` is non-null, then `key` hasn't been established.
-        // Setting a `key' prevents repeated key generations operations.
+        // Setting a `key` prevents repeated key generation operations.
         // withEncryption() is a configuration method and cannot throw an
         // exception; therefore generation is delayed.
         if (keySpec != null) {
diff --git a/src/java.base/share/classes/java/security/PEMRecord.java b/src/java.base/share/classes/java/security/PEMRecord.java
index dfe951a0963..2ce567f9fde 100644
--- a/src/java.base/share/classes/java/security/PEMRecord.java
+++ b/src/java.base/share/classes/java/security/PEMRecord.java
@@ -29,7 +29,6 @@
 
 import sun.security.util.Pem;
 
-import java.util.Base64;
 import java.util.Objects;
 
 /**
@@ -39,20 +38,20 @@
  * cryptographic object is not desired or the type has no
  * {@code DEREncodable}.
  *
- * <p> {@code type} and {@code pem} may not be {@code null}.
+ * <p> {@code type} and {@code content} may not be {@code null}.
  * {@code leadingData} may be null if no non-PEM data preceded PEM header
  * during decoding.  {@code leadingData} may be useful for reading metadata
  * that accompanies PEM data.
  *
  * <p> No validation is performed during instantiation to ensure that
- * {@code type} conforms to {@code RFC 7468}, that {@code pem} is valid Base64,
- * or that {@code pem} matches the {@code type}.  {@code leadingData} is not
- * defensively copied and does not return a clone when
- * {@linkplain #leadingData()} is called.
+ * {@code type} conforms to {@code RFC 7468}, that {@code content} is valid
+ * Base64, or that {@code content} matches the {@code type}.
+ * {@code leadingData} is not defensively copied and does not return a
+ * clone when {@linkplain #leadingData()} is called.
  *
  * @param type the type identifier in the PEM header without PEM syntax labels.
  *           For a public key, {@code type} would be "PUBLIC KEY".
- * @param pem any data between the PEM header and footer.
+ * @param content the Base64-encoded data, excluding the PEM header and footer
  * @param leadingData any non-PEM data preceding the PEM header when decoding.
  *
  * @spec https://www.rfc-editor.org/info/rfc7468
@@ -64,25 +63,25 @@
  * @since 25
  */
 @PreviewFeature(feature = PreviewFeature.Feature.PEM_API)
-public record PEMRecord(String type, String pem, byte[] leadingData)
+public record PEMRecord(String type, String content, byte[] leadingData)
     implements DEREncodable {
 
     /**
      * Creates a {@code PEMRecord} instance with the given parameters.
      *
      * @param type the type identifier
-     * @param pem the Base64-encoded data encapsulated by the PEM header and
-     *           footer.
+     * @param content the Base64-encoded data, excluding the PEM header and
+     *               footer
      * @param leadingData any non-PEM data read during the decoding process
      *                    before the PEM header.  This value maybe {@code null}.
-     * @throws IllegalArgumentException if the {@code type} is incorrectly
+     * @throws IllegalArgumentException if {@code type} is incorrectly
      * formatted.
-     * @throws NullPointerException if {@code type} and/or {@code pem} are
+     * @throws NullPointerException if {@code type} and/or {@code content} are
      * {@code null}.
      */
-    public PEMRecord(String type, String pem, byte[] leadingData) {
+    public PEMRecord {
         Objects.requireNonNull(type, "\"type\" cannot be null.");
-        Objects.requireNonNull(pem, "\"pem\" cannot be null.");
+        Objects.requireNonNull(content, "\"content\" cannot be null.");
 
         // With no validity checking on `type`, the constructor accept anything
         // including lowercase.  The onus is on the caller.
@@ -92,37 +91,22 @@ public PEMRecord(String type, String pem, byte[] leadingData) {
                 "Only the PEM type identifier is allowed");
         }
 
-        this.type = type;
-        this.pem = pem;
-        this.leadingData = leadingData;
     }
 
     /**
      * Creates a {@code PEMRecord} instance with a given {@code type} and
-     * {@code pem} data in String form.  {@code leadingData} is set to null.
+     * {@code content} data in String form.  {@code leadingData} is set to null.
      *
      * @param type the PEM type identifier
-     * @param pem the Base64-encoded data encapsulated by the PEM header and
-     *           footer.
-     * @throws IllegalArgumentException if the {@code type} is incorrectly
+     * @param content the Base64-encoded data, excluding the PEM header and
+     *               footer
+     * @throws IllegalArgumentException if {@code type} is incorrectly
      * formatted.
-     * @throws NullPointerException if {@code type} and/or {@code pem} are
+     * @throws NullPointerException if {@code type} and/or {@code content} are
      * {@code null}.
      */
-    public PEMRecord(String type, String pem) {
-        this(type, pem, null);
-    }
-
-    /**
-     * Returns the binary encoding from the Base64 data contained in
-     * {@code pem}.
-     *
-     * @throws IllegalArgumentException if {@code pem} cannot be decoded.
-     * @return a new array of the binary encoding each time this
-     * method is called.
-     */
-    public byte[] getEncoded() {
-        return Base64.getMimeDecoder().decode(pem);
+    public PEMRecord(String type, String content) {
+        this(type, content, null);
     }
 
     /**
diff --git a/src/java.base/share/classes/sun/security/provider/X509Factory.java b/src/java.base/share/classes/sun/security/provider/X509Factory.java
index ec7a1ac998a..1a8ace55fc8 100644
--- a/src/java.base/share/classes/sun/security/provider/X509Factory.java
+++ b/src/java.base/share/classes/sun/security/provider/X509Factory.java
@@ -565,7 +565,7 @@ private static byte[] readOneBlock(InputStream is) throws IOException {
                 } catch (EOFException e) {
                     return null;
                 }
-                return Base64.getDecoder().decode(rec.pem());
+                return Base64.getDecoder().decode(rec.content());
             } catch (IllegalArgumentException e) {
                 throw new IOException(e);
             }
diff --git a/src/java.base/share/classes/sun/security/util/Pem.java b/src/java.base/share/classes/sun/security/util/Pem.java
index c6e56381771..492017eca29 100644
--- a/src/java.base/share/classes/sun/security/util/Pem.java
+++ b/src/java.base/share/classes/sun/security/util/Pem.java
@@ -343,7 +343,7 @@ public static String pemEncoded(String type, byte[] der) {
      * @return PEM in a string
      */
     public static String pemEncoded(PEMRecord pem) {
-        String p = pem.pem().replaceAll("(.{64})", "$1\r\n");
+        String p = pem.content().replaceAll("(.{64})", "$1\r\n");
         return pemEncoded(pem.type(), p);
     }
 }
diff --git a/test/jdk/java/security/PEM/PEMDecoderTest.java b/test/jdk/java/security/PEM/PEMDecoderTest.java
index 6486bfc83c7..2ee9d1a69b3 100644
--- a/test/jdk/java/security/PEM/PEMDecoderTest.java
+++ b/test/jdk/java/security/PEM/PEMDecoderTest.java
@@ -107,8 +107,8 @@ public static void main(String[] args) throws IOException {
                 System.err.println("received: " + new String(rec.leadingData()));
                 throw new AssertionError("ecCSRWithData preData wrong");
             }
-            if (rec.pem().lastIndexOf("F") > rec.pem().length() - 5) {
-                System.err.println("received: " + rec.pem());
+            if (rec.content().lastIndexOf("F") > rec.content().length() - 5) {
+                System.err.println("received: " + rec.content());
                 throw new AssertionError("ecCSRWithData: " +
                     "End of PEM data has an unexpected character");
             }
@@ -235,10 +235,10 @@ static void testPEMRecord(PEMData.Entry entry) {
         PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
         String expected = entry.pem().split("-----")[2].replace(System.lineSeparator(), "");
         try {
-            PEMData.checkResults(expected, r.pem());
+            PEMData.checkResults(expected, r.content());
         } catch (AssertionError e) {
             System.err.println("expected:\n" + expected);
-            System.err.println("received:\n" + r.pem());
+            System.err.println("received:\n" + r.content());
             throw e;
         }
 

From 029e3bf8f582f7399b80c592421b2fd72737e264 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Fri, 6 Jun 2025 02:07:51 +0000
Subject: [PATCH 890/901] 8349914: ZipFile::entries and ZipFile::getInputStream
 not consistent with each other when there are duplicate entries

Co-authored-by: Lance Andersen <lancea@openjdk.org>
Reviewed-by: lancea
---
 .../share/classes/java/util/zip/ZipEntry.java |   7 +-
 .../share/classes/java/util/zip/ZipFile.java  |  18 +-
 .../zip/ZipFile/DupEntriesGetInputStream.java | 216 ++++++++++++++++++
 3 files changed, 237 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/java/util/zip/ZipFile/DupEntriesGetInputStream.java

diff --git a/src/java.base/share/classes/java/util/zip/ZipEntry.java b/src/java.base/share/classes/java/util/zip/ZipEntry.java
index 836dda141b7..bf0bf55ff98 100644
--- a/src/java.base/share/classes/java/util/zip/ZipEntry.java
+++ b/src/java.base/share/classes/java/util/zip/ZipEntry.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
@@ -60,6 +60,10 @@ public class ZipEntry implements ZipConstants, Cloneable {
     byte[] extra;       // optional extra field data for entry
     String comment;     // optional comment string for entry
     int externalFileAttributes = -1; // File type, setuid, setgid, sticky, POSIX permissions
+
+    // entry's LOC offset as noted in the entry's central header, -1 implies undetermined
+    long locOffset = -1;
+
     /**
      * Compression method for uncompressed entries.
      */
@@ -138,6 +142,7 @@ public ZipEntry(ZipEntry e) {
         extra = e.extra;
         comment = e.comment;
         externalFileAttributes = e.externalFileAttributes;
+        locOffset = e.locOffset;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index 17382181876..7fa507980c2 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -341,7 +341,7 @@ public InputStream getInputStream(ZipEntry entry) throws IOException {
             if (pos == -1) {
                 return null;
             }
-            in = new ZipFileInputStream(zsrc.cen, pos);
+            in = new ZipFileInputStream(zsrc.cen, pos, entry.locOffset);
             switch (CENHOW(zsrc.cen, pos)) {
                 case STORED:
                     synchronized (istreams) {
@@ -653,6 +653,7 @@ private ZipEntry getZipEntry(String name, int pos) {
             // read all bits in this field, including sym link attributes
             e.externalFileAttributes = CENATX_PERMS(cen, pos) & 0xFFFF;
         }
+        e.locOffset = CENOFF(cen, pos);
 
         int nlen = CENNAM(cen, pos);
         int elen = CENEXT(cen, pos);
@@ -847,10 +848,21 @@ private class ZipFileInputStream extends InputStream {
         protected long rem;     // number of remaining bytes within entry
         protected long size;    // uncompressed size of this entry
 
-        ZipFileInputStream(byte[] cen, int cenpos) {
+        /**
+         * @param cen       the ZIP's CEN
+         * @param cenpos    the entry's offset within the CEN
+         * @param locOffset the entry's LOC offset in the ZIP stream. If -1 is passed
+         *                  then the LOC offset for the entry will be read from the
+         *                  entry's central header
+         */
+        ZipFileInputStream(byte[] cen, int cenpos, long locOffset) {
             rem = CENSIZ(cen, cenpos);
             size = CENLEN(cen, cenpos);
-            pos = CENOFF(cen, cenpos);
+            if (locOffset == -1) {
+                pos = CENOFF(cen, cenpos);
+            } else {
+                pos = locOffset;
+            }
             // ZIP64
             if (rem == ZIP64_MAGICVAL || size == ZIP64_MAGICVAL ||
                 pos == ZIP64_MAGICVAL) {
diff --git a/test/jdk/java/util/zip/ZipFile/DupEntriesGetInputStream.java b/test/jdk/java/util/zip/ZipFile/DupEntriesGetInputStream.java
new file mode 100644
index 00000000000..cbab0b2d910
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/DupEntriesGetInputStream.java
@@ -0,0 +1,216 @@
+/*
+ * 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.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HexFormat;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static java.nio.ByteOrder.LITTLE_ENDIAN;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/*
+ * @test
+ * @bug 8349914
+ * @summary Validate ZipFile::getFileInputStream returns the correct data when
+ *          there are multiple entries with the same filename
+ * @run junit DupEntriesGetInputStream
+ */
+class DupEntriesGetInputStream {
+
+    // created through a call to createNormalZIP()
+    private static final String NORMAL_ZIP_CONTENT_HEX = """
+            504b03041400080808009195c35a00000000000000000000000006000000456e747279310bc9c8
+            2c560022d7bc92a24a054300504b07089bc0e55b0f0000000f000000504b030414000808080091
+            95c35a00000000000000000000000006000000456e747279320bc9c82c560022d7bc92a24a85bc
+            d2dca4d4228590f27c00504b0708ebda8deb1800000018000000504b03041400080808009195c3
+            5a00000000000000000000000006000000456e747279330bc9c82c560022d7bc92a24a05650563
+            00504b0708d1eafe7d1100000011000000504b010214001400080808009195c35a9bc0e55b0f00
+            00000f000000060000000000000000000000000000000000456e74727931504b01021400140008
+            0808009195c35aebda8deb1800000018000000060000000000000000000000000043000000456e
+            74727932504b010214001400080808009195c35ad1eafe7d110000001100000006000000000000
+            000000000000008f000000456e74727933504b050600000000030003009c000000d40000000000
+            """;
+
+    // intentionally unused but left here to allow for constructing newer/updated
+    // NORMAL_ZIP_CONTENT_HEX, when necessary
+    private static String createNormalZIP() throws IOException {
+        final ByteArrayOutputStream zipContent = new ByteArrayOutputStream();
+        try (ZipOutputStream zos = new ZipOutputStream(zipContent)) {
+            zos.putNextEntry(new ZipEntry(ENTRY1_NAME));
+            zos.write(ENTRY1.getBytes(US_ASCII));
+            zos.putNextEntry(new ZipEntry(ENTRY2_NAME));
+            zos.write(ENTRY2.getBytes(US_ASCII));
+            zos.putNextEntry(new ZipEntry(ENTRY3_NAME));
+            zos.write(ENTRY3.getBytes(US_ASCII));
+        }
+        return HexFormat.of().formatHex(zipContent.toByteArray());
+    }
+
+    // Entry Names and their data to be added to the ZIP File
+    private static final String ENTRY1_NAME = "Entry1";
+    private static final String ENTRY1 = "This is Entry 1";
+
+    private static final String ENTRY2_NAME = "Entry2";
+    private static final String ENTRY2 = "This is Entry number Two";
+
+    private static final String ENTRY3_NAME = "Entry3";
+    private static final String ENTRY3 = "This is Entry # 3";
+
+    // ZIP entry and its expected data
+    record ZIP_ENTRY(String entryName, String data) {
+    }
+
+    private static final ZIP_ENTRY[] ZIP_ENTRIES = new ZIP_ENTRY[]{
+            new ZIP_ENTRY(ENTRY1_NAME, ENTRY1),
+            new ZIP_ENTRY(ENTRY2_NAME, ENTRY2),
+            new ZIP_ENTRY(ENTRY1_NAME, ENTRY3)
+    };
+
+    private static Path dupEntriesZipFile;
+
+    // 008F LOCAL HEADER #3       04034B50
+    // ...
+    // 00A1 Compressed Length     00000000
+    // 00A5 Uncompressed Length   00000000
+    // 00A9 Filename Length       0006
+    // ...
+    // 00AD Filename              'Entry3'
+    private static final int ENTRY3_FILENAME_LOC_OFFSET = 0x00AD;
+
+    // 013C CENTRAL HEADER #3     02014B50
+    // ...
+    // 0150 Compressed Length     00000011
+    // 0154 Uncompressed Length   00000011
+    // 0158 Filename Length       0006
+    // ...
+    // 016A Filename              'Entry3'
+    private static final int ENTRY3_FILENAME_CEN_OFFSET = 0x016A;
+
+    @BeforeAll
+    static void createDupEntriesZIP() throws Exception {
+        final byte[] originalZIPContent = HexFormat.of().parseHex(
+                NORMAL_ZIP_CONTENT_HEX.replace("\n", ""));
+        final ByteBuffer buf = ByteBuffer.wrap(originalZIPContent).order(LITTLE_ENDIAN);
+        // replace the file name literal "Entry3" with the literal "Entry1", both in the
+        // LOC header and the CEN of Entry3
+        final int locEntry3LastCharOffset = ENTRY3_FILENAME_LOC_OFFSET + ENTRY3_NAME.length() - 1;
+        buf.put(locEntry3LastCharOffset, (byte) 49); // 49 represents the character "1"
+        final int cenEntry3LastCharOffset = ENTRY3_FILENAME_CEN_OFFSET + ENTRY3_NAME.length() - 1;
+        buf.put(cenEntry3LastCharOffset, (byte) 49); // 49 represents the character "1"
+        buf.rewind();
+        // write out the manipulated ZIP content, containing duplicate entries, into a file
+        // so that it can be read using ZipFile
+        dupEntriesZipFile = Files.createTempFile(Path.of("."), "8349914-", ".zip");
+        Files.write(dupEntriesZipFile, buf.array());
+        System.out.println("created ZIP file with duplicate entries at " + dupEntriesZipFile);
+    }
+
+    /*
+     * Validate that the correct ZipEntry data is returned when a List is used
+     * to access entries returned from ZipFile::entries
+     *
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testUsingListEntries() throws IOException {
+        System.out.println("Processing entries via Collections.list()");
+        try (ZipFile zf = new ZipFile(dupEntriesZipFile.toFile())) {
+            var entryNumber = 0;
+            for (var e : Collections.list(zf.entries())) {
+                verifyEntry(entryNumber++, zf, e);
+            }
+        }
+    }
+
+    /*
+     * Validate that the correct ZipEntry data is returned when a ZipEntryIterator
+     * is used to access entries returned from ZipFile::entries
+     *
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testUsingZipEntryIterator() throws IOException {
+        System.out.println("Processing entries via a ZipEntryIterator");
+        try (ZipFile zf = new ZipFile(dupEntriesZipFile.toFile())) {
+            Enumeration<? extends ZipEntry> entries = zf.entries();
+            var entryNumber = 0;
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                verifyEntry(entryNumber++, zf, entry);
+            }
+        }
+    }
+
+    /*
+     * Validate that the correct ZipEntry data is returned when a EntrySpliterator
+     * is used to access entries returned from ZipFile::stream
+     *
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void testUsingEntrySpliterator() throws IOException {
+        System.out.println("Processing entries via a EntrySpliterator");
+        AtomicInteger eNumber = new AtomicInteger(0);
+        try (ZipFile zf = new ZipFile(dupEntriesZipFile.toFile())) {
+            zf.stream().forEach(e -> {
+                try {
+                    verifyEntry(eNumber.getAndIncrement(), zf, e);
+                } catch (Exception ex) {
+                    throw new RuntimeException(ex);
+                }
+            });
+        }
+    }
+
+    /*
+     * Verify the ZipEntry returned matches what is expected
+     *
+     * @param entryNumber offset into ZIP_ENTRIES containing the expected value
+     *                    to be returned
+     * @param zf          ZipFile containing the entry
+     * @param e           ZipEntry to validate
+     * @throws IOException
+     */
+    private static void verifyEntry(int entryNumber, ZipFile zf, ZipEntry e) throws IOException {
+        System.out.println("Validating Entry: " + entryNumber);
+        assertEquals(ZIP_ENTRIES[entryNumber].entryName(), e.getName());
+        try (var in = zf.getInputStream(e)) {
+            var entryData = new String(in.readAllBytes(), StandardCharsets.UTF_8);
+            assertEquals(ZIP_ENTRIES[entryNumber].data(), entryData);
+        }
+    }
+}

From 28acca609bbb8ade0af88b536c8c88b7fa43849a Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Fri, 6 Jun 2025 03:50:06 +0000
Subject: [PATCH 891/901] 8358653: [s390] Clean up comments regarding frame
 manager

Reviewed-by: mdoerr
---
 src/hotspot/cpu/s390/frame_s390.hpp              |  2 +-
 src/hotspot/cpu/s390/register_s390.hpp           |  6 +++---
 src/hotspot/cpu/s390/runtime_s390.cpp            |  2 +-
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp      |  2 +-
 src/hotspot/cpu/s390/stubGenerator_s390.cpp      | 16 ++++++++--------
 .../s390/templateInterpreterGenerator_s390.cpp   |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 85e957fe992..ad754706367 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -410,7 +410,7 @@
 
   // C2I adapter frames:
   //
-  // STACK (interpreted called from compiled, on entry to frame manager):
+  // STACK (interpreted called from compiled, on entry to template interpreter):
   //
   //       [TOP_C2I_FRAME]
   //       [JIT_FRAME]
diff --git a/src/hotspot/cpu/s390/register_s390.hpp b/src/hotspot/cpu/s390/register_s390.hpp
index e7fdaa58d1a..a33145db02c 100644
--- a/src/hotspot/cpu/s390/register_s390.hpp
+++ b/src/hotspot/cpu/s390/register_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, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -414,7 +414,7 @@ constexpr FloatRegister  Z_FARG2   = Z_F2;
 constexpr FloatRegister  Z_FARG3   = Z_F4;
 constexpr FloatRegister  Z_FARG4   = Z_F6;
 
-// Register declarations to be used in frame manager assembly code.
+// Register declarations to be used in template interpreter assembly code.
 // Use only non-volatile registers in order to keep values across C-calls.
 
 // Register to cache the integer value on top of the operand stack.
@@ -439,7 +439,7 @@ constexpr Register      Z_bcp          = Z_R13;
 // Bytecode which is dispatched (short lived!).
 constexpr Register      Z_bytecode     = Z_R14;
 
-// Temporary registers to be used within frame manager. We can use
+// Temporary registers to be used within template interpreter. We can use
 // the nonvolatile ones because the call stub has saved them.
 // Use only non-volatile registers in order to keep values across C-calls.
 constexpr Register Z_tmp_1 =  Z_R10;
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index 8f96ff55ccb..99a33716b8b 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -118,7 +118,7 @@ ExceptionBlob* OptoRuntime::generate_exception_blob() {
   __ z_lgr(Z_SP, saved_sp);
 
   // [Z_RET] isn't null was possible in hotspot5 but not in sapjvm6.
-  // C2I adapter extensions are now removed by a resize in the frame manager
+  // C2I adapter extensions are now removed by a resize in the template interpreter
   // (unwind_initial_activation_pending_exception).
 #ifdef ASSERT
   __ z_ltgr(handle_exception, handle_exception);
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index bd5bbf4c7e5..cb1f12504fd 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2139,7 +2139,7 @@ static address gen_c2i_adapter(MacroAssembler  *masm,
   Register  value       = Z_R12;
 
   // Remember the senderSP so we can pop the interpreter arguments off of the stack.
-  // In addition, frame manager expects initial_caller_sp in Z_R10.
+  // In addition, template interpreter expects initial_caller_sp in Z_R10.
   __ z_lgr(sender_SP, Z_SP);
 
   // This should always fit in 14 bit immediate.
diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index 1e9136cdca9..d3f6540a3ea 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -115,7 +115,7 @@ class StubGenerator: public StubCodeGenerator {
   //   [SP+176]  - thread                   : Thread*
   //
   address generate_call_stub(address& return_address) {
-    // Set up a new C frame, copy Java arguments, call frame manager
+    // Set up a new C frame, copy Java arguments, call template interpreter
     // or native_entry, and process result.
 
     StubGenStubId stub_id = StubGenStubId::call_stub_id;
@@ -272,10 +272,10 @@ class StubGenerator: public StubCodeGenerator {
 
     BLOCK_COMMENT("call {");
     {
-      // Call frame manager or native entry.
+      // Call template interpreter or native entry.
 
       //
-      // Register state on entry to frame manager / native entry:
+      // Register state on entry to template interpreter / native entry:
       //
       //   Z_ARG1 = r_top_of_arguments_addr  - intptr_t *sender tos (prepushed)
       //                                       Lesp = (SP) + copied_arguments_offset - 8
@@ -290,7 +290,7 @@ class StubGenerator: public StubCodeGenerator {
       __ z_lgr(Z_esp, r_top_of_arguments_addr);
 
       //
-      // Stack on entry to frame manager / native entry:
+      // Stack on entry to template interpreter / native entry:
       //
       //     F0      [TOP_IJAVA_FRAME_ABI]
       //             [outgoing Java arguments]
@@ -300,7 +300,7 @@ class StubGenerator: public StubCodeGenerator {
       //
 
       // Do a light-weight C-call here, r_new_arg_entry holds the address
-      // of the interpreter entry point (frame manager or native entry)
+      // of the interpreter entry point (template interpreter or native entry)
       // and save runtime-value of return_pc in return_address
       // (call by reference argument).
       return_address = __ call_stub(r_new_arg_entry);
@@ -309,11 +309,11 @@ class StubGenerator: public StubCodeGenerator {
 
     {
       BLOCK_COMMENT("restore registers {");
-      // Returned from frame manager or native entry.
+      // Returned from template interpreter or native entry.
       // Now pop frame, process result, and return to caller.
 
       //
-      // Stack on exit from frame manager / native entry:
+      // Stack on exit from template interpreter / native entry:
       //
       //     F0      [ABI]
       //             ...
@@ -330,7 +330,7 @@ class StubGenerator: public StubCodeGenerator {
       __ pop_frame();
 
       // Reload some volatile registers which we've spilled before the call
-      // to frame manager / native entry.
+      // to template interpreter / native entry.
       // Access all locals via frame pointer, because we know nothing about
       // the topmost frame's size.
       __ z_lg(r_arg_result_addr, result_address_offset, r_entryframe_fp);
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index e387d60b594..e03d891496a 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -1217,7 +1217,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
 
 // Various method entries
 
-// Math function, frame manager must set up an interpreter state, etc.
+// Math function, template interpreter must set up an interpreter state, etc.
 address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
 
   // Decide what to do: Use same platform specific instructions and runtime calls as compilers.

From e918a59b1dacf273620aee334517bebfb1fb1a0f Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 6 Jun 2025 06:26:09 +0000
Subject: [PATCH 892/901] 8357821: Revert incorrectly named
 JavaLangAccess::unchecked* methods

Reviewed-by: pminborg
---
 .../share/classes/java/io/DataInputStream.java |  4 ++--
 .../classes/java/io/ObjectInputStream.java     |  4 ++--
 .../share/classes/java/lang/System.java        |  6 +++---
 .../share/classes/java/util/zip/ZipCoder.java  |  2 +-
 .../jdk/internal/access/JavaLangAccess.java    | 18 +++++++++---------
 .../classfile/impl/AbstractPoolEntry.java      |  4 ++--
 .../share/classes/sun/nio/cs/CESU_8.java       |  2 +-
 .../share/classes/sun/nio/cs/DoubleByte.java   |  2 +-
 .../share/classes/sun/nio/cs/ISO_8859_1.java   |  2 +-
 .../share/classes/sun/nio/cs/SingleByte.java   |  2 +-
 .../share/classes/sun/nio/cs/US_ASCII.java     |  2 +-
 .../share/classes/sun/nio/cs/UTF_8.java        |  2 +-
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java
index fa6fecf83da..daf75b1318f 100644
--- a/src/java.base/share/classes/java/io/DataInputStream.java
+++ b/src/java.base/share/classes/java/io/DataInputStream.java
@@ -595,7 +595,7 @@ public static final String readUTF(DataInput in) throws IOException {
         int chararr_count=0;
 
         in.readFully(bytearr, 0, utflen);
-        int ascii = JLA.uncheckedCountPositives(bytearr, 0, utflen);
+        int ascii = JLA.countPositives(bytearr, 0, utflen);
         if (ascii == utflen) {
             String str;
             if (trusted) {
@@ -621,7 +621,7 @@ public static final String readUTF(DataInput in) throws IOException {
         }
 
         if (ascii != 0) {
-            JLA.uncheckedInflateBytesToChars(bytearr, 0, chararr, 0, ascii);
+            JLA.inflateBytesToChars(bytearr, 0, chararr, 0, ascii);
             count += ascii;
             chararr_count += ascii;
         }
diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java
index b9593fa2c2f..daed5f3cce5 100644
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java
@@ -3536,7 +3536,7 @@ private String readUTFBody(long utflen) throws IOException {
             if (utflen > 0 && utflen < Integer.MAX_VALUE) {
                 // Scan for leading ASCII chars
                 int avail = end - pos;
-                int ascii = JLA.uncheckedCountPositives(buf, pos, Math.min(avail, (int)utflen));
+                int ascii = JLA.countPositives(buf, pos, Math.min(avail, (int)utflen));
                 if (ascii == utflen) {
                     // Complete match, consume the buf[pos ... pos + ascii] range and return.
                     // Modified UTF-8 and ISO-8859-1 are both ASCII-compatible encodings bytes
@@ -3549,7 +3549,7 @@ private String readUTFBody(long utflen) throws IOException {
                 // Avoid allocating a StringBuilder if there's enough data in buf and
                 // cbuf is large enough
                 if (avail >= utflen && utflen <= CHAR_BUF_SIZE) {
-                    JLA.uncheckedInflateBytesToChars(buf, pos, cbuf, 0, ascii);
+                    JLA.inflateBytesToChars(buf, pos, cbuf, 0, ascii);
                     pos += ascii;
                     int cbufPos = readUTFSpan(ascii, utflen - ascii);
                     return new String(cbuf, 0, cbufPos);
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index bcdbc39e665..0175558d313 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2118,7 +2118,7 @@ public Stream<ModuleLayer> layers(ClassLoader loader) {
                 return ModuleLayer.layers(loader);
             }
 
-            public int uncheckedCountPositives(byte[] bytes, int offset, int length) {
+            public int countPositives(byte[] bytes, int offset, int length) {
                 return StringCoding.countPositives(bytes, offset, length);
             }
             public int countNonZeroAscii(String s) {
@@ -2145,11 +2145,11 @@ public byte[] getBytesUTF8NoRepl(String s) {
                 return String.getBytesUTF8NoRepl(s);
             }
 
-            public void uncheckedInflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+            public void inflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
                 StringLatin1.inflate(src, srcOff, dst, dstOff, len);
             }
 
-            public int uncheckedDecodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+            public int decodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
                 return String.decodeASCII(src, srcOff, dst, dstOff, len);
             }
 
diff --git a/src/java.base/share/classes/java/util/zip/ZipCoder.java b/src/java.base/share/classes/java/util/zip/ZipCoder.java
index bbf1c10112a..0c3282e3518 100644
--- a/src/java.base/share/classes/java/util/zip/ZipCoder.java
+++ b/src/java.base/share/classes/java/util/zip/ZipCoder.java
@@ -266,7 +266,7 @@ int checkedHash(byte[] a, int off, int len) throws Exception {
                 return 0;
             }
             int end = off + len;
-            int asciiLen = JLA.uncheckedCountPositives(a, off, len);
+            int asciiLen = JLA.countPositives(a, off, len);
             if (asciiLen != len) {
                 // Non-ASCII, fall back to decoding a String
                 // We avoid using decoder() here since the UTF8ZipCoder is
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 5109e7b2a5b..e8343274cac 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -302,10 +302,10 @@ public interface JavaLangAccess {
 
     /**
      * Count the number of leading positive bytes in the range.
-     * <p>
-     * <b>WARNING: This method does not perform any bound checks.</b>
+     *
+     * @implSpec Implementations of this method must perform bounds checks.
      */
-    int uncheckedCountPositives(byte[] ba, int off, int len);
+    int countPositives(byte[] ba, int off, int len);
 
     /**
      * Count the number of leading non-zero ascii chars in the String.
@@ -390,20 +390,20 @@ public interface JavaLangAccess {
     /**
      * Inflated copy from {@code byte[]} to {@code char[]}, as defined by
      * {@code StringLatin1.inflate}.
-     * <p>
-     * <b>WARNING: This method does not perform any bound checks.</b>
+     *
+     * @implSpec Implementations of this method must perform bounds checks.
      */
-    void uncheckedInflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len);
+    void inflateBytesToChars(byte[] src, int srcOff, char[] dst, int dstOff, int len);
 
     /**
      * Decodes ASCII from the source byte array into the destination
      * char array.
-     * <p>
-     * <b>WARNING: This method does not perform any bound checks.</b>
+     *
+     * @implSpec Implementations of this method must perform bounds checks.
      *
      * @return the number of bytes successfully decoded, at most len
      */
-    int uncheckedDecodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len);
+    int decodeASCII(byte[] src, int srcOff, char[] dst, int dstOff, int len);
 
     /**
      * Returns the initial `System.in` to determine if it is replaced
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index ab7f0847bbd..962a2057585 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -218,7 +218,7 @@ public int tag() {
          * two-times-three-byte format instead.
          */
         private void inflate() {
-            int singleBytes = JLA.uncheckedCountPositives(rawBytes, offset, rawLen);
+            int singleBytes = JLA.countPositives(rawBytes, offset, rawLen);
             int hash = ArraysSupport.hashCodeOfUnsigned(rawBytes, offset, singleBytes, 0);
             if (singleBytes == rawLen) {
                 this.contentHash = hash;
@@ -233,7 +233,7 @@ private void inflateNonAscii(int singleBytes, int hash) {
             char[] chararr = new char[rawLen];
             int chararr_count = singleBytes;
             // Inflate prefix of bytes to characters
-            JLA.uncheckedInflateBytesToChars(rawBytes, offset, chararr, 0, singleBytes);
+            JLA.inflateBytesToChars(rawBytes, offset, chararr, 0, singleBytes);
 
             int px = offset + singleBytes;
             int utfend = offset + rawLen;
diff --git a/src/java.base/share/classes/sun/nio/cs/CESU_8.java b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
index a6e233873a8..a9a25e151ad 100644
--- a/src/java.base/share/classes/sun/nio/cs/CESU_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
@@ -196,7 +196,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dp = doff + dst.position();
             int dl = doff + dst.limit();
 
-            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
index c4c9856a60b..4738f51515b 100644
--- a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
@@ -168,7 +168,7 @@ protected CoderResult decodeArrayLoop(ByteBuffer src, CharBuffer dst) {
 
             try {
                 if (isASCIICompatible) {
-                    int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     dp += n;
                     sp += n;
                 }
diff --git a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
index 241171d8deb..39215bfa93d 100644
--- a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
@@ -87,7 +87,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dl = doff + dst.limit();
 
             int decodeLen = Math.min(sl - sp, dl - dp);
-            JLA.uncheckedInflateBytesToChars(sa, sp, da, dp, decodeLen);
+            JLA.inflateBytesToChars(sa, sp, da, dp, decodeLen);
             sp += decodeLen;
             dp += decodeLen;
             src.position(sp - soff);
diff --git a/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
index fe66f3216a4..d802cc85aa8 100644
--- a/src/java.base/share/classes/sun/nio/cs/SingleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
@@ -95,7 +95,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src, CharBuffer dst) {
             }
 
             if (isASCIICompatible) {
-                int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                 sp += n;
                 dp += n;
             }
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index 627b1433d61..bb84ab1bd4b 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
@@ -83,7 +83,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dl = doff + dst.limit();
 
             // ASCII only loop
-            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
             src.position(sp - soff);
diff --git a/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
index 89a199db99b..54e479f838a 100644
--- a/src/java.base/share/classes/sun/nio/cs/UTF_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
@@ -227,7 +227,7 @@ private CoderResult decodeArrayLoop(ByteBuffer src,
             int dp = doff + dst.position();
             int dl = doff + dst.limit();
 
-            int n = JLA.uncheckedDecodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.decodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 

From bb2611ad43a2feaebc2246fdbac2179a40115d67 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 6 Jun 2025 06:53:10 +0000
Subject: [PATCH 893/901] 8357993: Use "stdin.encoding" for reading System.in
 with InputStreamReader/Scanner [hotspot]

Reviewed-by: cjplummer, sspitsyn
---
 .../share/classes/sun/jvm/hotspot/CLHSDB.java              | 7 ++++---
 .../classes/jdk/jfr/internal/jfc/model/UserInterface.java  | 6 ++++--
 .../jvmti/AttachOnDemand/attach010/attach010Agent00.java   | 5 +++--
 .../jtreg/vmTestbase/nsk/share/jpda/BindServer.java        | 4 ++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java
index 3ed34ef1ae9..565d9e83329 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CLHSDB.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
@@ -28,6 +28,7 @@
 import sun.jvm.hotspot.debugger.*;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.util.*;
 
 public class CLHSDB {
@@ -106,8 +107,8 @@ public void reattach() {
             };
 
 
-        BufferedReader in =
-            new BufferedReader(new InputStreamReader(System.in));
+        Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
+        BufferedReader in = new BufferedReader(new InputStreamReader(System.in, charset));
         CommandProcessor cp = new CommandProcessor(di, in, System.out, System.err);
         cp.run(true);
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.java
index 7d9fc2478ba..f397fc4ec7d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/UserInterface.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
@@ -27,6 +27,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 public final class UserInterface {
 
@@ -40,7 +41,8 @@ public void println(String text) {
 
     public String readLine() throws AbortException {
         try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
+            Charset charset = Charset.forName(System.getProperty("stdin.encoding"), Charset.defaultCharset());
+            BufferedReader br = new BufferedReader(new InputStreamReader(System.in, charset));
             String line = br.readLine();
             if (line == null || line.equalsIgnoreCase("Q")) {
                 println();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
index 877c1e3862e..1e0abf4e11e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach010/attach010Agent00.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, 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
@@ -60,7 +60,8 @@ protected void agentActions() throws Throwable {
         FileInputStream newInputStream = new FileInputStream(inStreamFileName);
         System.setIn(newInputStream);
 
-        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(System.in));
+        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(
+                System.in, System.getProperty("stdin.encoding")));
         int readValue = Integer.parseInt(inputStreamReader.readLine());
 
         if (readValue != valueToWrite) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
index 2ed334e0386..58a7ca2a703 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/BindServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 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
@@ -173,7 +173,7 @@ private int runIt(String argv[], PrintStream out) {
         }
 
         BufferedReader stdIn = new BufferedReader(
-            new InputStreamReader(System.in));
+            new InputStreamReader(System.in, System.getProperty("stdin.encoding")));
         try (ListeningThread listeningThread = new ListeningThread(this)) {
             listeningThread.bind();
             listeningThread.start();

From d1b788005bdf11f1426baa8e811c121a956482c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Maillard?= <benoit.maillard@oracle.com>
Date: Fri, 6 Jun 2025 08:16:15 +0000
Subject: [PATCH 894/901] 8357951: Remove the IdealLoopTree* loop parameter
 from PhaseIdealLoop::loop_iv_phi

Reviewed-by: thartmann, mhaessig
---
 src/hotspot/share/opto/loopnode.cpp | 12 ++++++------
 src/hotspot/share/opto/loopnode.hpp |  4 ++--
 src/hotspot/share/opto/loopopts.cpp |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 195d48b37c6..3130df54681 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -458,7 +458,7 @@ Node* PhaseIdealLoop::loop_iv_incr(Node* incr, Node* x, IdealLoopTree* loop, Nod
   return incr;
 }
 
-Node* PhaseIdealLoop::loop_iv_stride(Node* incr, IdealLoopTree* loop, Node*& xphi) {
+Node* PhaseIdealLoop::loop_iv_stride(Node* incr, Node*& xphi) {
   assert(incr->Opcode() == Op_AddI || incr->Opcode() == Op_AddL, "caller resp.");
   // Get merge point
   xphi = incr->in(1);
@@ -474,7 +474,7 @@ Node* PhaseIdealLoop::loop_iv_stride(Node* incr, IdealLoopTree* loop, Node*& xph
   return stride;
 }
 
-PhiNode* PhaseIdealLoop::loop_iv_phi(Node* xphi, Node* phi_incr, Node* x, IdealLoopTree* loop) {
+PhiNode* PhaseIdealLoop::loop_iv_phi(Node* xphi, Node* phi_incr, Node* x) {
   if (!xphi->is_Phi()) {
     return nullptr; // Too much math on the trip counter
   }
@@ -1481,11 +1481,11 @@ void PhaseIdealLoop::check_counted_loop_shape(IdealLoopTree* loop, Node* x, Basi
   assert(incr != nullptr && incr->Opcode() == Op_Add(bt), "no incr");
 
   Node* xphi = nullptr;
-  Node* stride = loop_iv_stride(incr, loop, xphi);
+  Node* stride = loop_iv_stride(incr, xphi);
 
   assert(stride != nullptr, "no stride");
 
-  PhiNode* phi = loop_iv_phi(xphi, phi_incr, x, loop);
+  PhiNode* phi = loop_iv_phi(xphi, phi_incr, x);
 
   assert(phi != nullptr && phi->in(LoopNode::LoopBackControl) == incr, "No phi");
 
@@ -1650,7 +1650,7 @@ bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_
   assert(incr->Opcode() == Op_Add(iv_bt), "wrong increment code");
 
   Node* xphi = nullptr;
-  Node* stride = loop_iv_stride(incr, loop, xphi);
+  Node* stride = loop_iv_stride(incr, xphi);
 
   if (stride == nullptr) {
     return false;
@@ -1664,7 +1664,7 @@ bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_
   jlong stride_con = stride->get_integer_as_long(iv_bt);
   assert(stride_con != 0, "missed some peephole opt");
 
-  PhiNode* phi = loop_iv_phi(xphi, phi_incr, x, loop);
+  PhiNode* phi = loop_iv_phi(xphi, phi_incr, x);
 
   if (phi == nullptr ||
       (trunc1 == nullptr && phi->in(LoopNode::LoopBackControl) != incr) ||
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 0f87ed6763d..7670f6c620e 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1280,8 +1280,8 @@ class PhaseIdealLoop : public PhaseTransform {
   Node* loop_exit_control(Node* x, IdealLoopTree* loop);
   Node* loop_exit_test(Node* back_control, IdealLoopTree* loop, Node*& incr, Node*& limit, BoolTest::mask& bt, float& cl_prob);
   Node* loop_iv_incr(Node* incr, Node* x, IdealLoopTree* loop, Node*& phi_incr);
-  Node* loop_iv_stride(Node* incr, IdealLoopTree* loop, Node*& xphi);
-  PhiNode* loop_iv_phi(Node* xphi, Node* phi_incr, Node* x, IdealLoopTree* loop);
+  Node* loop_iv_stride(Node* incr, Node*& xphi);
+  PhiNode* loop_iv_phi(Node* xphi, Node* phi_incr, Node* x);
 
   bool is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_bt);
 
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 070749cfe1f..912d8452d21 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -4271,13 +4271,13 @@ bool PhaseIdealLoop::duplicate_loop_backedge(IdealLoopTree *loop, Node_List &old
       }
       assert(in->Opcode() == Op_AddI, "wrong increment code");
       Node* xphi = nullptr;
-      Node* stride = loop_iv_stride(in, loop, xphi);
+      Node* stride = loop_iv_stride(in, xphi);
 
       if (stride == nullptr) {
         continue;
       }
 
-      PhiNode* phi = loop_iv_phi(xphi, nullptr, head, loop);
+      PhiNode* phi = loop_iv_phi(xphi, nullptr, head);
       if (phi == nullptr ||
           (trunc1 == nullptr && phi->in(LoopNode::LoopBackControl) != incr) ||
           (trunc1 != nullptr && phi->in(LoopNode::LoopBackControl) != trunc1)) {

From 65fda5c02aeb1832bc88dc83ee8465cd8ad89179 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Fri, 6 Jun 2025 08:16:37 +0000
Subject: [PATCH 895/901] 8358593: Add ucontext accessors for *BSD on Aarch64

Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kurt Miller <bsdkurt@gmail.com>
Reviewed-by: aph
---
 .../os_cpu/bsd_aarch64/os_bsd_aarch64.cpp     | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index ae352641516..ad32ee150e8 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -81,14 +81,12 @@
 #endif
 
 #define SPELL_REG_SP "sp"
-#define SPELL_REG_FP "fp"
 
 #ifdef __APPLE__
 // see darwin-xnu/osfmk/mach/arm/_structs.h
 
 // 10.5 UNIX03 member name prefixes
 #define DU3_PREFIX(s, m) __ ## s.__ ## m
-#endif
 
 #define context_x    uc_mcontext->DU3_PREFIX(ss,x)
 #define context_fp   uc_mcontext->DU3_PREFIX(ss,fp)
@@ -97,6 +95,31 @@
 #define context_pc   uc_mcontext->DU3_PREFIX(ss,pc)
 #define context_cpsr uc_mcontext->DU3_PREFIX(ss,cpsr)
 #define context_esr  uc_mcontext->DU3_PREFIX(es,esr)
+#endif
+
+#ifdef __FreeBSD__
+# define context_x  uc_mcontext.mc_gpregs.gp_x
+# define context_fp context_x[REG_FP]
+# define context_lr uc_mcontext.mc_gpregs.gp_lr
+# define context_sp uc_mcontext.mc_gpregs.gp_sp
+# define context_pc uc_mcontext.mc_gpregs.gp_elr
+#endif
+
+#ifdef __NetBSD__
+# define context_x  uc_mcontext.__gregs
+# define context_fp uc_mcontext.__gregs[_REG_FP]
+# define context_lr uc_mcontext.__gregs[_REG_LR]
+# define context_sp uc_mcontext.__gregs[_REG_SP]
+# define context_pc uc_mcontext.__gregs[_REG_ELR]
+#endif
+
+#ifdef __OpenBSD__
+# define context_x  sc_x
+# define context_fp sc_x[REG_FP]
+# define context_lr sc_lr
+# define context_sp sc_sp
+# define context_pc sc_elr
+#endif
 
 #define REG_BCP context_x[22]
 
@@ -497,9 +520,11 @@ int os::extra_bang_size_in_bytes() {
   return 0;
 }
 
+#ifdef __APPLE__
 void os::current_thread_enable_wx(WXMode mode) {
   pthread_jit_write_protect_np(mode == WXExec);
 }
+#endif
 
 static inline void atomic_copy64(const volatile void *src, volatile void *dst) {
   *(jlong *) dst = *(const jlong *) src;

From b2e7cda6a0bd21fa3c4ffe2a67da4953f1ca3f1f Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Fri, 6 Jun 2025 09:53:25 +0000
Subject: [PATCH 896/901] 8358171: Additional code coverage for PEM API

Reviewed-by: ascarpino
---
 test/jdk/java/security/PEM/PEMData.java       | 221 +++++++++++++++---
 .../jdk/java/security/PEM/PEMDecoderTest.java |  80 ++++++-
 .../jdk/java/security/PEM/PEMEncoderTest.java |  77 +++++-
 .../java/security/PEM/PEMMultiThreadTest.java |  97 ++++++++
 .../security/PEM/java.security-anotherAlgo    |   1 +
 .../java/security/PEM/java.security-emptyAlgo |   1 +
 .../EncryptedPrivateKeyInfo/EncryptKey.java   |  45 ++++
 .../EncryptedPrivateKeyInfo/GetKey.java       |  33 ++-
 .../sun/security/pkcs/pkcs8/PKCS8Test.java    |  15 +-
 .../jdk/test/lib/security/SecurityUtils.java  |   6 +-
 10 files changed, 533 insertions(+), 43 deletions(-)
 create mode 100644 test/jdk/java/security/PEM/PEMMultiThreadTest.java
 create mode 100644 test/jdk/java/security/PEM/java.security-anotherAlgo
 create mode 100644 test/jdk/java/security/PEM/java.security-emptyAlgo

diff --git a/test/jdk/java/security/PEM/PEMData.java b/test/jdk/java/security/PEM/PEMData.java
index e1f32cdbb7c..2c8c60fcccc 100644
--- a/test/jdk/java/security/PEM/PEMData.java
+++ b/test/jdk/java/security/PEM/PEMData.java
@@ -27,6 +27,7 @@
 import java.security.DEREncodable;
 import java.security.KeyPair;
 import java.security.PEMRecord;
+import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.*;
 import java.util.ArrayList;
@@ -45,7 +46,7 @@ class PEMData {
         KwDdi3cNwu7YYD/QtJ+9+AEBdoqhRANCAASL+REY4vvAI9M3gonaml5K3lRgHq5w
         +OO4oO0VNduC44gUN1nrk7/wdNSpL+xXNEX52Dsff+2RD/fop224ANvB
         -----END PRIVATE KEY-----
-        """, KeyPair.class);
+        """, KeyPair.class, "SunEC");
 
     public static final Entry rsapriv = new Entry("rsapriv",
         """
@@ -65,7 +66,68 @@ class PEMData {
         6onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8Ob
         WqcWcoJqfdLEyBT+
         -----END PRIVATE KEY-----
-        """, RSAPrivateKey.class);
+        """, RSAPrivateKey.class, "SunRsaSign");
+
+    public static final Entry rsaCrtCoefZeroPriv = new Entry("rsaCrtCoefZeroPriv",
+        """
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEIwIBAAKCAQEAuZAPiPMlA5R0oOIbxbq+gOmBRcvptIT+0pmG6rZ6H//r7A/Z
+        MRwen0iO2GuhlyUgOk9Fja/TMBrNX99boVDEZtL4oxRTJibdLNjfQqPeFhs3NNvv
+        CJJEGD91Dq/fGbWv1TMZcEywqqYSdERDEA7yluw87I7YZc9kXVBwRw5AedvoXOL/
+        z5yPjK8W7FTCLHSVKiD/X3P3ZX9TmFjTIbRH15Do5sRxsPdrZczYjWdXFXNQEUuF
+        sVFGHFbB/AJiZlGYqMU+hEIErE35sHrKpZYkj9YovYQe0SBJyuROPl8wmz0Cd69s
+        rhg142Qf23RPhclBuCNAQQOkefeCppg4IFFh7QIDAQABAoIBADlKHlm4Q7m2uElB
+        dbSWwqEXNnefjJBUrT3E84/8dXjysNppTDNqzJN9uchcdn+tESWfeshTO97yr2yF
+        j4se3fwm72ed60vwnMFvVYKECBmIHoO90S8yxT49PT0jFDyiSN6IT7bJnpOZAUKP
+        HqtTCheJaQfZ1DqejIx4vKlbX5GfShwPQV0Q7KeKnfxhryhAbM5Y5UT8grQGBQU7
+        aQUZuasQV10APVRaz39VU8/hzBc081LR3O0tjnZcrMAQ7ANsP9Gu3My04cnQ5WBo
+        P8uCCaSPSkrzCvjd9YYkdnwXMbVCfALOa+MxBddMi4IQG0qI28Bpw6dkKziPxage
+        KcAQnAsCgYEA0/CwzUlyrG6f+FF3uAvPVn/jEhWatJb7Me7lkhO3suV92brb1pQo
+        1W1jHdx0OqMuCVfIJ4bXkTwKuvLQGcWJzNWUVh4Tij/ZAV0Ssw2cKbBSCQGNIFsx
+        Ux0V9tDSYJsEdk+Y5grloDNJokYYCCpF5bz/6QYmX+t3yzjyVSvcNeMCgYEA4COU
+        ezUXKLSWD+jJZXpS5yopB7oXAg7mmonlc1DRuaIxspwBrbXPLQ/neN8Sefpz9Nxn
+        4ksPxGbLnJh0wGCnxSu0Qfn4eNVSsulag4IQmbCO2UBsdXNCJB5KlDpRlVhvvviH
+        Zpz2Dkdx+itLf1EV841MCtPAHZJwrs6i6JntEe8CgYEAgJYdjs+rJXcQ04YKDr4L
+        k72PtR8qd7rKuObqnhAcegvGqV03mB7YD3WIl0tzsUfj3INHysOC8njtQbOkEp7J
+        Fl/W2dDxpgVK0gr4F26AesKhYxlv2Fu7t2OEOfVETpx+vpFYgOnHm8TCPhQs7HdJ
+        ZTOgSG8UxUmFquToEkjEGGUCgYB6AMP8wKxHeuzH4iVl+EySCa/lxdRqSWQasH7V
+        4yMVkYTNvP9o57LKy4Jql7n97Wca3LIrSkJd3LpuFcpPQQ1xVNW8p+0pEK0AN+cN
+        +ElC7wkCln+y+rcA5AAiaRApY8cHw04oe72vjhIrY0+oEKILPVkr95D2R9TQQigI
+        xmh1vwIBAA==
+        -----END RSA PRIVATE KEY-----
+        """, RSAPrivateKey.class, "SunRsaSign");
+
+    public static final Entry rsapsspriv = new Entry("rsapsspriv",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIIEugIBADALBgkqhkiG9w0BAQoEggSmMIIEogIBAAKCAQEAn3qFQtvj9JVqVPRh
+        mMMRyT17GiUY+NWOwUHx5bHqfhlHJoCllctSU/YXzrH4Da1w7sSeaMmAKYMW4X5k
+        rn9hnKOhgHnm2nkZBaVNQeyrseuDnfwWtLXjnj8rEKpgf9UPRUeXGRSoAb1qpwBf
+        epFtLSKZrzswZY2u2UEUGJERABi6Qp+cIZ8uXzBkIsMgrhb50xsdysZ9+qq95z0i
+        N1vh/V+Yi2fYpSYVDE8aMWdpvs0oWGvoLQjRgElJx/SknndAfLD42HPYZyyXevyJ
+        RgUf+NP0V7c+UtE7m7pgMs1hhxHSmUNdfH9GnOSg9m3+L3WqhaNNWB4aKMqFyhlM
+        EsAuawIDAQABAoIBAAMJ9yXIgeYEaN54j67fsg7nJIQ228HLc/5xGWvFQaYofidu
+        K87twm0GKKWlf4gR24U5QEQtPst2YNu9fav+PRJv4yEgcYqNOdxWg4veN4Fa7wr2
+        JZ/zmARJHjLMRFgl67YSwKmCMBdkZXa24PA5et6cJQM7+gFIELe5b+lt7j3VsxQ7
+        JpTJyp3I73lXcJrzcb/OCTxobFPLtkVSgKUNwae26xlNqXX4fQfLp99LHGnkmG3k
+        Wlzjs6dUi4fl4yLAJYMxEwxQbSbmY66ZKnM4SkT/YHx67gyJw2CMRp4FQDg94Sor
+        0IDDKiSMGzcjuCuUl27/qTuv+iMgCqNB7CSPXtECgYEAvqN8ZuZXeUKz4tn6wxJk
+        k1utCl3pSM5PLMF4J43uvX49HF1i3svXrwxzJqug6kPXvB7cuB6U2DFIM3lh2jNE
+        u2w0U/5zVz2yEI9EaRjnOXePLsSWjOiC+5MGTafJWy5vZ8+zaWL9tjtUH5hsg1cB
+        ZMlXtWrI+AmAUAv6FFDZaHECgYEA1igXzRMGgXAT+YX0wdZQcRMy9jD5WIYIiCex
+        6/WRE2LDM855ZBwTU5gyqZC2MWC3yn1ASDraxKdH1m3872Q0NVJfsOaLvBk1HuPk
+        dlSHRKO2GeO9m5/YzrZm9jpGs0IH6DKOah/t0aCd2CFxt6qef2wOUmXTCK6tyCXN
+        EiUmEpsCgYAMue85E1Ftl+VYVILn+Ndb+ve/RGupX5RrgXLa+R+h6MZ9mUJbazI3
+        zlX1k+mHGgZR2aGUbP40vH18ajL9FQUWme+YV9ktTsIPVvETLwVokbGuRpNiTrdH
+        whXeoz/O5Xesb3Ijq+cR/j3sagl8bxd5ufMv+jP2UvQM4+/K4WbSEQKBgGuZeVvw
+        UzR1u5ODWpaJt6EYpGJN+PohXegLCbokh9/Vn35IH3XNJWi677mCnAfzMGTsyX+B
+        Eqn74nw6hvtAvXqNCMc5DrxTbf03Q3KwxcYW+0fGxV2L0sMJonHUlfE7G/3uaN+p
+        azQIH0aYhypg74HWKNv9jSqvmWEWnRKg16BBAoGAGLAqCRCP8wxqRVZZjhUJ+5JN
+        b6PrykDxCKhlA6JqZKuCYzvXhLABq/7miNDg0CmRREl+yKXlkEoFl4g9LtP7wfjX
+        n4us/WNmh+GPZYxlCJSNRTjgk7pm5TjVH5YWURDEnjIHZ7yxbAFlvNUhI1mF5g97
+        KVcB4fjBitP1h8P+MoY=
+        -----END PRIVATE KEY-----
+        """, RSAPrivateKey.class, "SunRsaSign");
 
     public static final Entry rsaprivbc = new Entry("rsaprivbc",
         """
@@ -85,14 +147,14 @@ class PEMData {
         6onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8Ob
         WqcWcoJqfdLEyBT+
         -----END PRIVATE KEY-----
-        """, RSAPrivateKey.class);
+        """, RSAPrivateKey.class, "SunRsaSign");
 
     public static final Entry ec25519priv = new Entry("ed25519priv",
         """
         -----BEGIN PRIVATE KEY-----
         MC4CAQAwBQYDK2VwBCIEIFFZsmD+OKk67Cigc84/2fWtlKsvXWLSoMJ0MHh4jI4I
         -----END PRIVATE KEY-----
-        """, EdECPrivateKey.class);
+        """, EdECPrivateKey.class, "SunEC");
 
     public static final Entry rsapub = new Entry("rsapub",
         """
@@ -102,7 +164,20 @@ class PEMData {
         MtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarbD6D4yRY1hWHluiuOtzhxuueCuf9h
         XCYEHZS1cqd8wokFPwIDAQAB
         -----END PUBLIC KEY-----
-        """, RSAPublicKey.class);
+        """, RSAPublicKey.class, "SunRsaSign");
+
+    public static final Entry rsapsspub = new Entry("rsapsspub",
+        """
+        -----BEGIN PUBLIC KEY-----
+        MIIBIDALBgkqhkiG9w0BAQoDggEPADCCAQoCggEBAJ96hULb4/SValT0YZjDEck9
+        exolGPjVjsFB8eWx6n4ZRyaApZXLUlP2F86x+A2tcO7EnmjJgCmDFuF+ZK5/YZyj
+        oYB55tp5GQWlTUHsq7Hrg538FrS1454/KxCqYH/VD0VHlxkUqAG9aqcAX3qRbS0i
+        ma87MGWNrtlBFBiREQAYukKfnCGfLl8wZCLDIK4W+dMbHcrGffqqvec9Ijdb4f1f
+        mItn2KUmFQxPGjFnab7NKFhr6C0I0YBJScf0pJ53QHyw+Nhz2Gcsl3r8iUYFH/jT
+        9Fe3PlLRO5u6YDLNYYcR0plDXXx/RpzkoPZt/i91qoWjTVgeGijKhcoZTBLALmsC
+        AwEAAQ==
+        -----END PUBLIC KEY-----
+        """, RSAPublicKey.class, "SunRsaSign");
 
     public static final Entry rsapubbc = new Entry("rsapubbc",
         """
@@ -112,14 +187,14 @@ class PEMData {
         MtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarbD6D4yRY1hWHluiuOtzhxuueCuf9h
         XCYEHZS1cqd8wokFPwIDAQAB
         -----END PUBLIC KEY-----
-        """, RSAPublicKey.class);
+        """, RSAPublicKey.class, "SunRsaSign");
 
     public static final Entry ecsecp256pub = new Entry("ecsecp256pub", """
         -----BEGIN PUBLIC KEY-----
         MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEi/kRGOL7wCPTN4KJ2ppeSt5UYB6u
         cPjjuKDtFTXbguOIFDdZ65O/8HTUqS/sVzRF+dg7H3/tkQ/36KdtuADbwQ==
         -----END PUBLIC KEY-----
-        """, ECPublicKey.class);
+        """, ECPublicKey.class, "SunEC");
 
     // EC key with explicit parameters -- Not currently supported by SunEC
     public static final String pubec_explicit = """
@@ -152,7 +227,7 @@ class PEMData {
         P4c4mySRy5N3plFQUp3pIB7wqshi1t6hkdg7gRGjMtJpIPIXynEqRy2mIw2GrKTtu3dqrW+ndarb
         D6D4yRY1hWHluiuOtzhxuueCuf9hXCYEHZS1cqd8wokFPwIDAQAB
         -----END PRIVATE KEY-----
-        """, KeyPair.class);
+        """, KeyPair.class, "SunRsaSign");
 
     public static final Entry oasrfc8410 = new Entry("oasrfc8410",
         """
@@ -161,7 +236,24 @@ class PEMData {
         oB8wHQYKKoZIhvcNAQkJFDEPDA1DdXJkbGUgQ2hhaXJzgSEAGb9ECWmEzf6FQbrB
         Z9w7lshQhqowtrbLDFw4rXAxZuE=
         -----END PRIVATE KEY-----
-        """, KeyPair.class);
+        """, KeyPair.class, "SunEC");
+
+    public static final Entry oasxdh = new Entry("oasxdh",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MFECAQEwBQYDK2VuBCIEIIrMS7w5YxuBTyPFiaFvp6ILiGET7wY9ybk7Qqhe3hSq
+        gSEAB7ODPxRePrPnJMaj3f47blVx6c5bfxcllQzLp4bW5x4=
+        -----END PRIVATE KEY-----
+        """, KeyPair.class, "SunEC");
+
+    public static final Entry oasec = new Entry("oasec",
+        """
+        -----BEGIN PRIVATE KEY-----
+        MIGFAgEBMBMGByqGSM49AgEGCCqGSM49AwEHBCcwJQIBAQQgkGEVbZE1yAiO11Ya
+        eepcrBQL+HpVE4fy0V6jbpJcmkiBQgAERCqYYmN9uNT9Z1O2Z2VC3Zag9eUAhz7G
+        p8DqC21VrIgpqVQ4BrcWsieNg9fSd4N2hgfMpk9PCQwJQ8ifCMiBVQ==
+        -----END PRIVATE KEY-----
+        """, KeyPair.class, "SunEC");
 
     public static final Entry rsaOpenSSL = new Entry("rsaOpenSSL",
         """
@@ -192,7 +284,7 @@ class PEMData {
         EcgIOtkvoTrJ9Cquvuj+O7/d2yNoH0SZQ4IYJKq47/Z4kKhwXzJnBCCCBKgkjfub
         RTQSNnSEgTaBD29l7FrhNRHX9lIKFZ23caCTBS6o3q3+KgPbq7ao
         -----END RSA PRIVATE KEY-----
-        """, RSAPrivateKey.class);
+        """, RSAPrivateKey.class, "SunRsaSign");
 
     static final Entry ed25519ep8 = new Entry("ed25519ep8",
         """
@@ -202,11 +294,11 @@ class PEMData {
         vdMyi46+Dw7cOjwEQLtx5ME0NOOo7vlCGm3H/4j+Tf5UXrMb1UrkPjqc8OiLbC0n
         IycFtI70ciPjgwDSjtCcPxR8fSxJPrm2yOJsRVo=
         -----END ENCRYPTED PRIVATE KEY-----
-        """, EdECPrivateKey.class, "fish".toCharArray());
+        """, EdECPrivateKey.class, "SunEC", "fish".toCharArray());
 
     // This is not meant to be decrypted and to stay as an EKPI
     static final Entry ed25519ekpi = new Entry("ed25519ekpi",
-        ed25519ep8.pem(), EncryptedPrivateKeyInfo.class, null);
+        ed25519ep8.pem(), EncryptedPrivateKeyInfo.class, "SunEC", null);
 
     static final Entry rsaCert = new Entry("rsaCert",
         """
@@ -237,7 +329,7 @@ class PEMData {
         8gOYV33zkPhziWJt4uFMFIi7N2DLEk5UVZv1KTLZlfPl55DRs7j/Sb4vKHpB17AO
         meVknxVvifDVY0TIz57t28Accsk6ClBCxNPluPU/8YLGAZJYsdDXjGcndQ13s5G7
         -----END CERTIFICATE-----
-        """, X509Certificate.class);
+        """, X509Certificate.class, "SUN");
 
     static final Entry ecCert = new Entry("ecCert",
         """
@@ -249,7 +341,68 @@ class PEMData {
         lU3G9QAwCgYIKoZIzj0EAwIDSAAwRQIgMwYld7aBzkcRt9mn27YOed5+n0xN1y8Q
         VEcFjLI/tBYCIQDU3szDZ/PK2mUZwtgQxLqHdh+f1JY0UwQS6M8QUvoDHw==
         -----END CERTIFICATE-----
-        """, X509Certificate.class);
+        """, X509Certificate.class, "SUN");
+
+    private static final Entry rsaCrl = new Entry("rsaCrl",
+            """
+            -----BEGIN X509 CRL-----
+            MIIBRTCBrwIBATANBgkqhkiG9w0BAQUFADBMMQswCQYDVQQGEwJVUzEaMBgGA1UE
+            ChMRVGVzdCBDZXJ0aWZpY2F0ZXMxITAfBgNVBAMTGEJhc2ljIEhUVFAgVVJJIFBl
+            ZXIgMSBDQRcNMDUwNjAzMjE0NTQ3WhcNMTUwNjAxMjE0NTQ3WqAvMC0wHwYDVR0j
+            BBgwFoAUa+bxcvx1zVdUhvIEd9hcfbmFdw4wCgYDVR0UBAMCAQEwDQYJKoZIhvcN
+            AQEFBQADgYEAZ+21yt1pJn2FU6vBwpFtAKVeBCCCqJVFiRxT84XbUw0BpLrCFvlk
+            FOo6tC95aoV7vPGwOEyUNbKJJOCzLliIwV1PPfgZQV20xohSIPISHdUjmlyttglv
+            AuEvltGnbP7ENxw18HxvM20XmHz+akuFu6npI6MkBjfoxvlq1bcdTrI=
+            -----END X509 CRL-----
+            """, X509CRL.class, "SUN");
+
+    // Few random manipulated Base64 characters in PEM content
+    private static final Entry invalidDer = new Entry("invalidDER", """
+        -----BEGIN PRIVATE KEY-----
+        MIICeAIBADANBhkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAOtjMnCzPy4jCeZb
+        OdOvmvU3jl7+cvPFgL5MfqDCM5a8yI0yImg/hzibJJHLk3emUVBSnekgHvCqyGLW
+        3qGR2DuBEaMy0mkg8hfKcSpHLaYjDYaspO27d2qtb6d1qtsPoPjJFjWFYeW6K463
+        OHG654K5/2FcJgQdlLVyp3zCiQU/AgMBAAECgYEAwNkDkTv5rlX8nWLuLJV5kh/T
+        H9a93SRZxw8qy5Bv7bZ7ZNfHP7uUkHbi7iPojKWRhwo43692SdzR0dCSk7LGgN9q
+        CYvndsYR6gifVGBi0WF+St4+NdtcQ3VlNdsojy2BdIx0oC+r7i3bn+zc968O/kI+
+        EgdgrMcjjFqyx6tMHpECQQD8TYPKGHyN7Jdy28llCoUX/sL/yZ2vIi5mnDAFE5ae
+        KZQSkNAXG+8i9Qbs/Wdd5S3oZDqu+6DBn9gib80pYY05AkEA7tY59Oy8ka7nBlGP
+        g6Wo1usF2bKqk8vjko9ioZQay7f86aB10QFcAjCr+cCUm16Lc9DwzWl02nNggRZa
+        Jz8eNwJBAO+1zfLjFOPb14F/JHdlaVKE8EwKCFDuztsapd0M4Vtf8Zk6ERsDpU63
+        Ml9T2zOwnM9g+whpdjDAZ59ATdJ1JrECQQDReJQ2SxeL0lGPCiOLu9RcQp7L81aF
+        79G1bgp8WlAyEjlAkloiqEWRKiz7DDuKFR7Lwhognng9S+n87aS+PS57AkBh75t8
+        6onPAs4hkm+63dfzCojvEkALevO8J3OVX7YS5q9J1r75wDn60Ob0Zh+iiorpx8Ob
+        WqcWcoJqfdLEyBT+
+        -----END PRIVATE KEY-----
+        """, DEREncodable.class, null);
+
+    private static final Entry invalidPEM = new Entry("invalidPEM", """
+        -----BEGIN INVALID PEM-----
+        MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBVS52ZSKZ0oES7twD2
+        GGwRIVu3uHlGIwlu0xzFe7sgIPntca2bHfYMhgGxrlCm0q+hZANiAAQNWgwWfLX8
+        8pYVjvwbfvDF9f+Oa9w6JjrfpWwFAUI6b1OPgrNUh+yXtUXnQNXnfUcIu0Os53bM
+        """, DEREncodable.class, null);
+
+    private static final Entry invalidHeader = new Entry("invalidHeader", """
+        ---BEGIN PRIVATE KEY---
+        MC4CAQAwBQYDK2VwBCIEIFFZsmD+OKk67Cigc84/2fWtlKsvXWLSoMJ0MHh4jI4I
+        -----END PRIVATE KEY-----
+        """, DEREncodable.class, null);
+
+    private static final Entry invalidFooter = new Entry("invalidFooter", """
+        -----BEGIN PRIVATE KEY-----
+        MC4CAQAwBQYDK2VwBCIEIFFZsmD+OKk67Cigc84/2fWtlKsvXWLSoMJ0MHh4jI4I
+        ---END PRIVATE KEY---
+        """, DEREncodable.class, null);
+
+    private static final Entry incorrectFooter = new Entry("incorrectFooter", """
+        -----BEGIN PRIVATE KEY-----
+        MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBVS52ZSKZ0oES7twD2
+        GGwRIVu3uHlGIwlu0xzFe7sgIPntca2bHfYMhgGxrlCm0q+hZANiAAQNWgwWfLX8
+        8pYVjvwbfvDF9f+Oa9w6JjrfpWwFAUI6b1OPgrNUh+yXtUXnQNXnfUcIu0Os53bM
+        8fTqPkQl6RyWEDHeXqJK8zTBHMeBq9nLfDPSbzQgLDyC64Orn0D8exM=
+        -----END PUBLIC KEY-----
+        """, DEREncodable.class, null);
 
     // EC cert with explicit parameters -- Not currently supported by SunEC
     static final String ecCertEX = """
@@ -280,7 +433,7 @@ class PEMData {
         8pYVjvwbfvDF9f+Oa9w6JjrfpWwFAUI6b1OPgrNUh+yXtUXnQNXnfUcIu0Os53bM
         8fTqPkQl6RyWEDHeXqJK8zTBHMeBq9nLfDPSbzQgLDyC64Orn0D8exM=
         -----END PRIVATE KEY-----
-        """, KeyPair.class);
+        """, KeyPair.class, "SunEC");
 
     public static final Entry ecCSR = new Entry("ecCSR",
         """
@@ -297,7 +450,7 @@ class PEMData {
         MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
         kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
         -----END CERTIFICATE REQUEST-----
-        """, PEMRecord.class);
+        """, PEMRecord.class, "SunEC");
 
     public static final String preData = "TEXT BLAH TEXT BLAH" +
         System.lineSeparator();
@@ -318,39 +471,41 @@ class PEMData {
         MQYMBGZpc2gwCgYIKoZIzj0EAwIDRwAwRAIgUBTdrMDE4BqruYRh1rRyKQBf48WR
         kIX8R4dBK9h1VRcCIEBR2Mzvku/huTbWTwKVlXBZeEmwIlxKwpRepPtViXcW
         -----END CERTIFICATE REQUEST-----
-        """ + postData, PEMRecord.class);
+        """ + postData, PEMRecord.class, "SunEC");
 
     final static Pattern CR = Pattern.compile("\r");
     final static Pattern LF = Pattern.compile("\n");
     final static Pattern LSDEFAULT = Pattern.compile(System.lineSeparator());
 
 
-    public record Entry(String name, String pem, Class clazz, char[] password,
+    public record Entry(String name, String pem, Class clazz, String provider, char[] password,
                         byte[] der) {
 
-        public Entry(String name, String pem, Class clazz, char[] password,
+        public Entry(String name, String pem, Class clazz, String provider, char[] password,
             byte[] der) {
             this.name = name;
             this.pem = pem;
             this.clazz = clazz;
+            this.provider = provider;
             this.password = password;
-            if (pem != null && pem.length() > 0) {
+            if (pem != null && pem.length() > 0 &&
+                    !name.contains("incorrect") && !name.contains("invalid")) {
                 String[] pemtext = pem.split("-----");
                 this.der = Base64.getMimeDecoder().decode(pemtext[2]);
             } else {
                 this.der = null;
             }
         }
-        Entry(String name, String pem, Class clazz, char[] password) {
-            this(name, pem, clazz, password, null);
+        Entry(String name, String pem, Class clazz, String provider, char[] password) {
+            this(name, pem, clazz, provider, password, null);
         }
 
-        Entry(String name, String pem, Class clazz) {
-            this(name, pem, clazz, null, null);
+        Entry(String name, String pem, Class clazz, String provider) {
+            this(name, pem, clazz, provider, null, null);
         }
 
         public Entry newClass(String name, Class c) {
-            return new Entry(name, pem, c, password);
+            return new Entry(name, pem, c, provider, password);
         }
 
         public Entry newClass(Class c) {
@@ -360,20 +515,20 @@ public Entry newClass(Class c) {
         Entry makeCRLF(String name) {
             return new Entry(name,
                 Pattern.compile(System.lineSeparator()).matcher(pem).replaceAll("\r\n"),
-                clazz, password());
+                clazz, provider, password());
         }
 
         Entry makeCR(String name) {
             return new Entry(name,
                 Pattern.compile(System.lineSeparator()).matcher(pem).replaceAll("\r"),
-                clazz, password());
+                clazz, provider, password());
         }
 
         Entry makeNoCRLF(String name) {
             return new Entry(name,
                 LF.matcher(CR.matcher(pem).replaceAll("")).
                     replaceAll(""),
-                clazz, password());
+                clazz, provider, password());
         }
     }
 
@@ -401,10 +556,12 @@ static public Entry getEntry(List<Entry> list, String varname) {
 
     static {
         pubList.add(rsapub);
+        pubList.add(rsapsspub);
         pubList.add(rsapubbc);
         pubList.add(ecsecp256pub.makeCR("ecsecp256pub-r"));
         pubList.add(ecsecp256pub.makeCRLF("ecsecp256pub-rn"));
         privList.add(rsapriv);
+        privList.add(rsapsspriv);
         privList.add(rsaprivbc);
         privList.add(ecsecp256);
         privList.add(ecsecp384);
@@ -413,9 +570,12 @@ static public Entry getEntry(List<Entry> list, String varname) {
         privList.add(rsaOpenSSL);
         oasList.add(oasrfc8410);
         oasList.add(oasbcpem);
+        oasList.add(oasec);
+        oasList.add(oasxdh);
 
         certList.add(rsaCert);
         certList.add(ecCert);
+        certList.add(rsaCrl);
 
         entryList.addAll(pubList);
         entryList.addAll(privList);
@@ -429,6 +589,11 @@ static public Entry getEntry(List<Entry> list, String varname) {
 
         failureEntryList.add(new Entry("emptyPEM", "", DEREncodable.class, null));
         failureEntryList.add(new Entry("nullPEM", null, DEREncodable.class, null));
+        failureEntryList.add(incorrectFooter);
+        failureEntryList.add(invalidPEM);
+        failureEntryList.add(invalidDer);
+        failureEntryList.add(invalidHeader);
+        failureEntryList.add(invalidFooter);
     }
 
     static void checkResults(PEMData.Entry entry, String result) {
diff --git a/test/jdk/java/security/PEM/PEMDecoderTest.java b/test/jdk/java/security/PEM/PEMDecoderTest.java
index 2ee9d1a69b3..90d67af2f8d 100644
--- a/test/jdk/java/security/PEM/PEMDecoderTest.java
+++ b/test/jdk/java/security/PEM/PEMDecoderTest.java
@@ -26,6 +26,7 @@
 /*
  * @test
  * @bug 8298420
+ * @library /test/lib
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.util
  * @summary Testing basic PEM API decoding
@@ -37,23 +38,27 @@
 import java.lang.Class;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.*;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
+import java.security.spec.*;
 import java.util.*;
 import java.util.Arrays;
 
+import jdk.test.lib.Asserts;
+import sun.security.pkcs.PKCS8Key;
 import sun.security.util.Pem;
 
 public class PEMDecoderTest {
 
     static HexFormat hex = HexFormat.of();
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws Exception {
         System.out.println("Decoder test:");
-        PEMData.entryList.forEach(PEMDecoderTest::test);
+        PEMData.entryList.forEach(entry -> test(entry, false));
+        System.out.println("Decoder test withFactory:");
+        PEMData.entryList.forEach(entry -> test(entry, true));
         System.out.println("Decoder test returning DEREncodable class:");
         PEMData.entryList.forEach(entry -> test(entry, DEREncodable.class));
         System.out.println("Decoder test with encrypted PEM:");
@@ -95,7 +100,11 @@ public static void main(String[] args) throws IOException {
 
         System.out.println("Check a Signature/Verify op is successful:");
         PEMData.privList.forEach(PEMDecoderTest::testSignature);
-        PEMData.oasList.forEach(PEMDecoderTest::testSignature);
+        PEMData.oasList.stream().filter(e -> !e.name().endsWith("xdh"))
+                .forEach(PEMDecoderTest::testSignature);
+
+        System.out.println("Checking if decode() returns a PKCS8Key and can generate a pub");
+        PEMData.oasList.forEach(PEMDecoderTest::testPKCS8Key);
 
         System.out.println("Checking if ecCSR:");
         test(PEMData.ecCSR);
@@ -182,6 +191,10 @@ public static void main(String[] args) throws IOException {
         } catch (Exception e) {
             throw new AssertionError("error getting key", e);
         }
+        testCertTypeConverter(PEMData.ecCert);
+
+        System.out.println("Decoder test testCoefZero:");
+        testCoefZero(PEMData.rsaCrtCoefZeroPriv);
     }
 
     static void testInputStream() throws IOException {
@@ -231,6 +244,24 @@ static void testInputStream() throws IOException {
         throw new AssertionError("Failed");
     }
 
+    // test that X509 CERTIFICATE is converted to CERTIFICATE in PEM
+    static void testCertTypeConverter(PEMData.Entry entry) throws CertificateEncodingException {
+        String certPem = entry.pem().replace("CERTIFICATE", "X509 CERTIFICATE");
+        Asserts.assertEqualsByteArray(entry.der(),
+                PEMDecoder.of().decode(certPem, X509Certificate.class).getEncoded());
+
+        certPem = entry.pem().replace("CERTIFICATE", "X.509 CERTIFICATE");
+        Asserts.assertEqualsByteArray(entry.der(),
+                PEMDecoder.of().decode(certPem, X509Certificate.class).getEncoded());
+    }
+
+    // test that when the crtCoeff is zero, the key is decoded but only the modulus and private
+    // exponent are used resulting in a different der
+    static void testCoefZero(PEMData.Entry entry) {
+        RSAPrivateKey decoded = PEMDecoder.of().decode(entry.pem(), RSAPrivateKey.class);
+        Asserts.assertNotEqualsByteArray(decoded.getEncoded(), entry.der());
+    }
+
     static void testPEMRecord(PEMData.Entry entry) {
         PEMRecord r = PEMDecoder.of().decode(entry.pem(), PEMRecord.class);
         String expected = entry.pem().split("-----")[2].replace(System.lineSeparator(), "");
@@ -333,13 +364,26 @@ static DEREncodable testEncrypted(PEMData.Entry entry) {
 
     // Change the Entry to use the given class as the expected class returned
     static DEREncodable test(PEMData.Entry entry, Class c) {
-        return test(entry.newClass(c));
+        return test(entry.newClass(c), false);
     }
 
     // Run test with a given Entry
     static DEREncodable test(PEMData.Entry entry) {
+        return test(entry, false);
+    }
+
+    // Run test with a given Entry
+    static DEREncodable test(PEMData.Entry entry, boolean withFactory) {
+        System.out.printf("Testing %s %s%n", entry.name(), entry.provider());
         try {
-            DEREncodable r = test(entry.pem(), entry.clazz(), PEMDecoder.of());
+            PEMDecoder pemDecoder;
+            if (withFactory) {
+                Provider provider = Security.getProvider(entry.provider());
+                pemDecoder = PEMDecoder.of().withFactory(provider);
+            } else {
+                pemDecoder = PEMDecoder.of();
+            }
+            DEREncodable r = test(entry.pem(), entry.clazz(), pemDecoder);
             System.out.println("PASS (" + entry.name() + ")");
             return r;
         } catch (Exception | AssertionError e) {
@@ -412,6 +456,19 @@ static void testTwoKeys() throws IOException {
         }
     }
 
+    private static void testPKCS8Key(PEMData.Entry entry) {
+        try {
+            PKCS8Key key = PEMDecoder.of().decode(entry.pem(), PKCS8Key.class);
+            PKCS8EncodedKeySpec spec =
+                    new PKCS8EncodedKeySpec(key.getEncoded());
+
+            KeyFactory kf = KeyFactory.getInstance(key.getAlgorithm());
+            kf.generatePublic(spec);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
     static void testClass(PEMData.Entry entry, Class clazz) throws IOException {
         var pk = PEMDecoder.of().decode(entry.pem(), clazz);
     }
@@ -472,9 +529,15 @@ static void testSignature(PEMData.Entry entry) {
                 "should not be null");
         }
 
+        AlgorithmParameterSpec spec = null;
         String algorithm = switch(privateKey.getAlgorithm()) {
             case "EC" -> "SHA256withECDSA";
             case "EdDSA" -> "EdDSA";
+            case "RSASSA-PSS" -> {
+                spec = new PSSParameterSpec(
+                        "SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 32, 1);
+                yield "RSASSA-PSS";
+            }
             case null -> {
                 System.out.println("Algorithm is null " +
                     entry.name());
@@ -487,6 +550,9 @@ static void testSignature(PEMData.Entry entry) {
         try {
             if (d instanceof PrivateKey) {
                 s = Signature.getInstance(algorithm);
+                if (spec != null) {
+                    s.setParameter(spec);
+                }
                 s.initSign(privateKey);
                 s.update(data);
                 s.sign();
diff --git a/test/jdk/java/security/PEM/PEMEncoderTest.java b/test/jdk/java/security/PEM/PEMEncoderTest.java
index c8b19c313a5..3d1948ba2fe 100644
--- a/test/jdk/java/security/PEM/PEMEncoderTest.java
+++ b/test/jdk/java/security/PEM/PEMEncoderTest.java
@@ -26,9 +26,15 @@
 /*
  * @test
  * @bug 8298420
+ * @library /test/lib
  * @summary Testing basic PEM API encoding
  * @enablePreview
  * @modules java.base/sun.security.util
+ * @run main PEMEncoderTest PBEWithHmacSHA256AndAES_128
+ * @run main/othervm -Djava.security.properties=${test.src}/java.security-anotherAlgo
+ *      PEMEncoderTest PBEWithHmacSHA512AndAES_256
+ * @run main/othervm -Djava.security.properties=${test.src}/java.security-emptyAlgo
+ *      PEMEncoderTest PBEWithHmacSHA256AndAES_128
  */
 
 import sun.security.util.Pem;
@@ -39,13 +45,22 @@
 import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.spec.InvalidParameterSpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
 import java.util.*;
 
+import jdk.test.lib.security.SecurityUtils;
+
+import static jdk.test.lib.Asserts.assertEquals;
+import static jdk.test.lib.Asserts.assertThrows;
+
 public class PEMEncoderTest {
 
     static Map<String, DEREncodable> keymap;
+    static String pkcs8DefaultAlgExpect;
 
     public static void main(String[] args) throws Exception {
+        pkcs8DefaultAlgExpect = args[0];
         PEMEncoder encoder = PEMEncoder.of();
 
         // These entries are removed
@@ -63,7 +78,12 @@ public static void main(String[] args) throws Exception {
         System.out.println("New instance re-encode testToString:");
         keymap.keySet().stream().forEach(key -> testToString(key,
             PEMEncoder.of()));
-
+        System.out.println("Same instance Encoder testEncodedKeySpec:");
+        testEncodedKeySpec(encoder);
+        System.out.println("New instance Encoder testEncodedKeySpec:");
+        testEncodedKeySpec(PEMEncoder.of());
+        System.out.println("Same instance Encoder testEmptyKey:");
+        testEmptyAndNullKey(encoder);
         keymap = generateObjKeyMap(PEMData.encryptedList);
         System.out.println("Same instance Encoder match test:");
         keymap.keySet().stream().forEach(key -> testEncryptedMatch(key, encoder));
@@ -86,6 +106,13 @@ public static void main(String[] args) throws Exception {
         PEMRecord pemRecord =
             d.decode(PEMData.ed25519ep8.pem(), PEMRecord.class);
         PEMData.checkResults(PEMData.ed25519ep8, pemRecord.toString());
+
+        // test PemRecord is encapsulated with PEM header and footer on encoding
+        String[] pemLines = PEMData.ed25519ep8.pem().split("\n");
+        String[] pemNoHeaderFooter = Arrays.copyOfRange(pemLines, 1, pemLines.length - 1);
+        PEMRecord pemR = new PEMRecord("ENCRYPTED PRIVATE KEY", String.join("\n",
+                pemNoHeaderFooter));
+        PEMData.checkResults(PEMData.ed25519ep8.pem(), encoder.encodeToString(pemR));
     }
 
     static Map generateObjKeyMap(List<PEMData.Entry> list) {
@@ -145,10 +172,12 @@ static void testToString(String key, PEMEncoder encoder) {
     static void testEncrypted(String key, PEMEncoder encoder) {
         PEMData.Entry entry = PEMData.getEntry(key);
         try {
-            encoder.withEncryption(
+            String pem = encoder.withEncryption(
                     (entry.password() != null ? entry.password() :
                         "fish".toCharArray()))
                 .encodeToString(keymap.get(key));
+
+            verifyEncriptionAlg(pem);
         } catch (RuntimeException e) {
             throw new AssertionError("Encrypted encoder failed with " +
                 entry.name(), e);
@@ -157,6 +186,11 @@ static void testEncrypted(String key, PEMEncoder encoder) {
         System.out.println("PASS: " + entry.name());
     }
 
+    private static void verifyEncriptionAlg(String pem) {
+        var epki = PEMDecoder.of().decode(pem, EncryptedPrivateKeyInfo.class);
+        assertEquals(epki.getAlgName(), pkcs8DefaultAlgExpect);
+    }
+
     /*
      Test cannot verify PEM was the same as known PEM because we have no
      public access to the AlgoritmID.params and PBES2Parameters.
@@ -195,5 +229,42 @@ static void testEncryptedMatch(String key, PEMEncoder encoder) {
         PEMData.checkResults(entry, result);
         System.out.println("PASS: " + entry.name());
     }
-}
 
+    static void testEncodedKeySpec(PEMEncoder encoder) throws NoSuchAlgorithmException {
+        KeyPair kp = getKeyPair();
+        encoder.encodeToString(new X509EncodedKeySpec(kp.getPublic().getEncoded()));
+        encoder.encodeToString(new PKCS8EncodedKeySpec(kp.getPrivate().getEncoded()));
+        System.out.println("PASS: testEncodedKeySpec");
+    }
+    private static void testEmptyAndNullKey(PEMEncoder encoder) throws NoSuchAlgorithmException {
+        KeyPair kp = getKeyPair();
+        assertThrows(IllegalArgumentException.class, () -> encoder.encode(
+                new KeyPair(kp.getPublic(), new EmptyKey())));
+        assertThrows(IllegalArgumentException.class, () -> encoder.encode(
+                new KeyPair(kp.getPublic(), null)));
+
+        assertThrows(IllegalArgumentException.class, () -> encoder.encode(
+                new KeyPair(new EmptyKey(), kp.getPrivate())));
+        assertThrows(IllegalArgumentException.class, () -> encoder.encode(
+                new KeyPair(null, kp.getPrivate())));
+        System.out.println("PASS: testEmptyKey");
+    }
+
+    private static KeyPair getKeyPair() throws NoSuchAlgorithmException {
+        Provider provider = Security.getProvider("SunRsaSign");
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", provider);
+        kpg.initialize(SecurityUtils.getTestKeySize("RSA"));
+        return kpg.generateKeyPair();
+    }
+
+    private static class EmptyKey implements PublicKey, PrivateKey {
+        @Override
+        public String getAlgorithm() { return "Test"; }
+
+        @Override
+        public String getFormat() { return "Test"; }
+
+        @Override
+        public byte[] getEncoded() { return new byte[0]; }
+    }
+}
diff --git a/test/jdk/java/security/PEM/PEMMultiThreadTest.java b/test/jdk/java/security/PEM/PEMMultiThreadTest.java
new file mode 100644
index 00000000000..f345a3c129d
--- /dev/null
+++ b/test/jdk/java/security/PEM/PEMMultiThreadTest.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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8298420
+ * @library /test/lib
+ * @summary Testing PEM API is thread safe
+ * @enablePreview
+ * @modules java.base/sun.security.util
+ */
+
+import java.security.*;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import jdk.test.lib.security.SecurityUtils;
+
+public class PEMMultiThreadTest {
+    static final int THREAD_COUNT = 5;
+    static final int KEYS_COUNT = 50;
+
+    public static void main(String[] args) throws Exception {
+        PEMEncoder encoder = PEMEncoder.of();
+        try (ExecutorService ex = Executors.newFixedThreadPool(THREAD_COUNT)) {
+            Map<Integer, PublicKey> keys = new HashMap<>();
+            Map<Integer, String> encoded = Collections.synchronizedMap(new HashMap<>());
+            Map<Integer, String> decoded = Collections.synchronizedMap(new HashMap<>());
+            final CountDownLatch encodingComplete = new CountDownLatch(KEYS_COUNT);
+            final CountDownLatch decodingComplete = new CountDownLatch(KEYS_COUNT);
+
+            // Generate keys and encode them in parallel
+            for (int i = 0; i < KEYS_COUNT; i++) {
+                final int finalI = i;
+                KeyPair kp = getKeyPair();
+                keys.put(finalI, kp.getPublic());
+
+                ex.submit(() -> {
+                    encoded.put(finalI, encoder.encodeToString(kp.getPublic()));
+                    encodingComplete.countDown();
+                });
+            }
+            encodingComplete.await();
+
+            // Decode keys in parallel
+            PEMDecoder decoder = PEMDecoder.of();
+            for (Map.Entry<Integer, String> entry : encoded.entrySet()) {
+                ex.submit(() -> {
+                    decoded.put(entry.getKey(), decoder.decode(entry.getValue(), PublicKey.class)
+                            .toString());
+                    decodingComplete.countDown();
+                });
+            }
+            decodingComplete.await();
+
+            // verify all keys were properly encoded and decoded comparing with the original key map
+            for (Map.Entry<Integer, PublicKey> kp : keys.entrySet()) {
+                if (!decoded.get(kp.getKey()).equals(kp.getValue().toString())) {
+                    throw new RuntimeException("a key was not properly encoded and decoded: " + decoded);
+                }
+            }
+        }
+
+        System.out.println("PASS: testThreadSafety");
+    }
+
+    private static KeyPair getKeyPair() throws NoSuchAlgorithmException {
+        String alg = "EC";
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance(alg);
+        kpg.initialize(SecurityUtils.getTestKeySize(alg));
+        return kpg.generateKeyPair();
+    }
+}
diff --git a/test/jdk/java/security/PEM/java.security-anotherAlgo b/test/jdk/java/security/PEM/java.security-anotherAlgo
new file mode 100644
index 00000000000..c084f465fa2
--- /dev/null
+++ b/test/jdk/java/security/PEM/java.security-anotherAlgo
@@ -0,0 +1 @@
+jdk.epkcs8.defaultAlgorithm=PBEWithHmacSHA512AndAES_256
diff --git a/test/jdk/java/security/PEM/java.security-emptyAlgo b/test/jdk/java/security/PEM/java.security-emptyAlgo
new file mode 100644
index 00000000000..deb2ab7aa45
--- /dev/null
+++ b/test/jdk/java/security/PEM/java.security-emptyAlgo
@@ -0,0 +1 @@
+jdk.epkcs8.defaultAlgorithm=
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
index d1fccd9730a..3fe8cfcfbfa 100644
--- a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/EncryptKey.java
@@ -25,11 +25,15 @@
 
 /**
  * @test
+ * @library /test/lib
+ * @modules java.base/sun.security.util
  * @bug 8298420
  * @summary Testing encryptKey
  * @enablePreview
  */
 
+import sun.security.util.Pem;
+
 import javax.crypto.EncryptedPrivateKeyInfo;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEParameterSpec;
@@ -37,8 +41,13 @@
 import java.security.AlgorithmParameters;
 import java.security.PEMDecoder;
 import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.Security;
 import java.util.Arrays;
 
+import static jdk.test.lib.Asserts.assertEquals;
+
 public class EncryptKey {
 
     private static final String encEdECKey =
@@ -56,6 +65,8 @@ public class EncryptKey {
         passwdText.getBytes(), "PBE");
 
     public static void main(String[] args) throws Exception {
+        Provider p = Security.getProvider(System.getProperty("test.provider.name", "SunJCE"));
+
         EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(encEdECKey,
             EncryptedPrivateKeyInfo.class);
         PrivateKey priKey = PEMDecoder.of().withDecryption(password).
@@ -71,6 +82,19 @@ public static void main(String[] args) throws Exception {
                 " with expected.");
         }
 
+        // Test encryptKey(PrivateKey, char[], String, ...) with provider
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, password, ekpi.getAlgName(),
+                ap.getParameterSpec(PBEParameterSpec.class), p);
+        if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
+            throw new AssertionError("encryptKey() didn't match" +
+                    " with expected.");
+        }
+
+        // Test encryptKey(PrivateKey, char[], String, ...) with provider and null algorithm
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, password, null, null,
+                p);
+        assertEquals(e.getAlgName(), Pem.DEFAULT_ALGO);
+
         // Test encryptKey(PrivateKey, Key, String, ...)
         e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
             ap.getParameterSpec(PBEParameterSpec.class),null, null);
@@ -78,5 +102,26 @@ public static void main(String[] args) throws Exception {
             throw new AssertionError("encryptKey() didn't match" +
                 " with expected.");
         }
+
+        // Test encryptKey(PrivateKey, Key, String, ...) with provider and null random
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
+                ap.getParameterSpec(PBEParameterSpec.class), p, null);
+        if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
+            throw new AssertionError("encryptKey() didn't match" +
+                    " with expected.");
+        }
+
+        // Test encryptKey(PrivateKey, Key, String, ...) with provider and SecureRandom
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, ekpi.getAlgName(),
+                ap.getParameterSpec(PBEParameterSpec.class), p, new SecureRandom());
+        if (!Arrays.equals(ekpi.getEncryptedData(), e.getEncryptedData())) {
+            throw new AssertionError("encryptKey() didn't match" +
+                    " with expected.");
+        }
+
+        // Test encryptKey(PrivateKey, Key, String, ...) with provider and null algorithm
+        e = EncryptedPrivateKeyInfo.encryptKey(priKey, key, null, null,
+                p, new SecureRandom());
+        assertEquals(e.getAlgName(), Pem.DEFAULT_ALGO);
     }
 }
diff --git a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
index 7c8951b3417..b1917ffa84d 100644
--- a/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
+++ b/test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKey.java
@@ -35,6 +35,8 @@
 import javax.crypto.spec.SecretKeySpec;
 import java.security.PEMDecoder;
 import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
 import java.util.Arrays;
 
 public class GetKey {
@@ -48,12 +50,29 @@ public class GetKey {
         IycFtI70ciPjgwDSjtCcPxR8fSxJPrm2yOJsRVo=
         -----END ENCRYPTED PRIVATE KEY-----
         """;
+    private static final String encDHECKey =
+        """
+        -----BEGIN ENCRYPTED PRIVATE KEY-----
+        MIIBvDBmBgkqhkiG9w0BBQ0wWTA4BgkqhkiG9w0BBQwwKwQUN8pkErJx7aqH0fJF
+        BcOadPKiuRoCAhAAAgEQMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBAT1Vwd
+        gU4rTd6zy7lKr4wmBIIBUMe+2+O0AG6t4CMSHcDVceRg2jvbs5PmPjW4Ka5mDich
+        hVEsjSpJLbUyJdbji6UaiUpuWgvYSMLZ10pfhOFw/ssXwCw+JrlXUqDpQGLaW8ZR
+        zSL3CoozTI2Y6EBdWt53KbySwtZMoTpW/W3vPi98bJXtR635msf6gYXmSUP7DyoJ
+        79dxz3pRYsnOuBe0yZ2wTq9iMgTMudzLJAFX2qyi+3KOb1g5Va9DYAqJmzCYOd74
+        +I+0gGNFtSc1vGQYr3cAfcKT8AZ1RHE4IkpnpgFD5HsZ8f4hy0yK8juk9NE9Gzuy
+        B929LBXk6V3L0MKzIABS3QvAlhWETM6XtGBDugzAgsooo9lEHLwYRldvOlL+QYyE
+        CtqDmXOrgEMWvxWGEFCTKYhKkqMKjU3y3GiozEEdb9j2okW1s30yHQjIoj0OR4nB
+        D8GeP0QnY73NfbOw7z81TA==
+        -----END ENCRYPTED PRIVATE KEY-----
+        """;
     private static final String passwdText = "fish";
     private static final char[] password = passwdText.toCharArray();
     private static final SecretKey key = new SecretKeySpec(
         passwdText.getBytes(), "PBE");
 
     public static void main(String[] args) throws Exception {
+        Provider p = Security.getProvider(System.getProperty("test.provider.name", "SunJCE"));
+
         EncryptedPrivateKeyInfo ekpi = PEMDecoder.of().decode(encEdECKey,
             EncryptedPrivateKeyInfo.class);
         PrivateKey priKey = PEMDecoder.of().withDecryption(password).
@@ -66,11 +85,23 @@ public static void main(String[] args) throws Exception {
                 + "match with expected.");
         }
 
-        // Test getKey(key, provider)
+        // Test getKey(key, provider) provider null
         if (!Arrays.equals(priKey.getEncoded(),
             ekpi.getKey(key, null).getEncoded())) {
             throw new AssertionError("getKey(key, provider) " +
                 "didn't match with expected.");
         }
+
+        // Test getKey(key, provider) with provider
+        EncryptedPrivateKeyInfo ekpiDH = PEMDecoder.of().decode(encDHECKey,
+                EncryptedPrivateKeyInfo.class);
+        PrivateKey priKeyDH = PEMDecoder.of().withDecryption(password).
+                decode(encDHECKey, PrivateKey.class);
+
+        if (!Arrays.equals(priKeyDH.getEncoded(),
+                ekpiDH.getKey(key, p).getEncoded())) {
+            throw new AssertionError("getKey(key, provider) " +
+                    "didn't match with expected.");
+        }
     }
 }
diff --git a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
index 49cca69971f..9bb5502ad9f 100644
--- a/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
+++ b/test/jdk/sun/security/pkcs/pkcs8/PKCS8Test.java
@@ -31,10 +31,13 @@
  *          java.base/sun.security.provider
  *          java.base/sun.security.x509
  * @run main PKCS8Test
+ * @run main/othervm -Dtest.provider.name=SunJCE PKCS8Test
  */
 
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
+import java.security.Provider;
+import java.security.Security;
 import java.util.Arrays;
 import java.util.HexFormat;
 
@@ -45,6 +48,7 @@
 
 public class PKCS8Test {
 
+    static Provider provider;
     static final String FORMAT = "PKCS#8";
     static final String EXPECTED_ALG_ID_CHRS = "DSA, \n" +
             "\tp:     02\n\tq:     03\n\tg:     04\n";
@@ -59,7 +63,7 @@ public class PKCS8Test {
                 "0403020101");  // PrivateKey OCTET int x = 1
 
     public static void main(String[] args) throws Exception {
-
+        provider = Security.getProvider(System.getProperty("test.provider.name"));
         byte[] encodedKey = new DSAPrivateKey(
                 BigInteger.valueOf(1),
                 BigInteger.valueOf(2),
@@ -73,7 +77,8 @@ public static void main(String[] args) throws Exception {
                     .toString(encodedKey));
         }
 
-        PKCS8Key decodedKey = (PKCS8Key)PKCS8Key.parseKey(encodedKey);
+        PKCS8Key decodedKey = provider == null ? (PKCS8Key)PKCS8Key.parseKey(encodedKey) :
+                (PKCS8Key)PKCS8Key.parseKey(encodedKey, provider);
 
         assert(ALGORITHM.equalsIgnoreCase(decodedKey.getAlgorithm()));
         assert(FORMAT.equalsIgnoreCase(decodedKey.getFormat()));
@@ -126,7 +131,11 @@ static void enlarge(int newVersion, String... fields) {
         original[1] = (byte) (length - 2);   // the length field inside DER
         original[4] = (byte) newVersion;     // the version inside DER
         try {
-            PKCS8Key.parseKey(original);
+            if (provider == null) {
+                PKCS8Key.parseKey(original);
+            } else {
+                PKCS8Key.parseKey(original, provider);
+            }
         } catch (InvalidKeyException e) {
             throw new RuntimeException(e);
         }
diff --git a/test/lib/jdk/test/lib/security/SecurityUtils.java b/test/lib/jdk/test/lib/security/SecurityUtils.java
index 7509488225e..be6ff1cc0e3 100644
--- a/test/lib/jdk/test/lib/security/SecurityUtils.java
+++ b/test/lib/jdk/test/lib/security/SecurityUtils.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
@@ -45,6 +45,8 @@ public final class SecurityUtils {
     private enum KeySize{
         RSA(2048),
         DSA(2048),
+        Ed25519(256),
+        EC(256),
         DH(2048);
 
         private final int keySize;
@@ -145,6 +147,8 @@ public static int getTestKeySize(String algo) {
         return switch (algo) {
             case "RSA" -> KeySize.RSA.keySize;
             case "DSA" -> KeySize.DSA.keySize;
+            case "Ed25519" -> KeySize.Ed25519.keySize;
+            case "EC" -> KeySize.EC.keySize;
             case "DH", "DiffieHellman" -> KeySize.DH.keySize;
             default -> throw new RuntimeException("Test key size not defined for " + algo);
         };

From 9658cecde34a6e9cd39656d21a4ae8bc42da5956 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 6 Jun 2025 13:59:17 +0000
Subject: [PATCH 897/901] 8358685: [TEST] AOTLoggingTag.java failed with
 missing log message

Reviewed-by: iklam, shade
---
 .../runtime/cds/appcds/aotCache/AOTLoggingTag.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
index 5499063ebbd..896df7ca496 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTLoggingTag.java
@@ -34,7 +34,6 @@
  * @run driver AOTLoggingTag
  */
 
-import java.io.File;
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.helpers.ClassFileInstaller;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -59,7 +58,7 @@ public static void main(String[] args) throws Exception {
             "-cp", appJar, helloClass);
 
         out = CDSTestUtils.executeAndLog(pb, "train");
-        out.shouldContain("[info][aot] Writing binary AOTConfiguration file:");
+        out.shouldContain("[aot] Writing binary AOTConfiguration file:");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -71,7 +70,7 @@ public static void main(String[] args) throws Exception {
             "-Xlog:aot",
             "-cp", appJar);
         out = CDSTestUtils.executeAndLog(pb, "asm");
-        out.shouldContain("[info][aot] Opened AOT configuration file hello.aotconfig");
+        out.shouldContain("[aot] Opened AOT configuration file hello.aotconfig");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -81,7 +80,7 @@ public static void main(String[] args) throws Exception {
             "-Xlog:aot",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
-        out.shouldContain("[info][aot] Opened AOT cache hello.aot");
+        out.shouldContain("[aot] Opened AOT cache hello.aot");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -92,7 +91,7 @@ public static void main(String[] args) throws Exception {
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldNotContain("No tag set matches selection: aot+heap");
-        out.shouldContain("[info][aot,heap] resolve subgraph java.lang.Integer$IntegerCache");
+        out.shouldContain("[aot,heap] resolve subgraph java.lang.Integer$IntegerCache");
         out.shouldHaveExitValue(0);
 
         //----------------------------------------------------------------------
@@ -102,7 +101,7 @@ public static void main(String[] args) throws Exception {
             "-XX:AOTMode=on",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
-        out.shouldContain("[error][aot] An error has occurred while processing the AOT cache. Run with -Xlog:aot for details.");
+        out.shouldContain("[aot] An error has occurred while processing the AOT cache. Run with -Xlog:aot for details.");
         out.shouldNotHaveExitValue(0);
     }
 

From 8adb052b46f90e8a0605cfc5ddc667acb7c61952 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Fri, 6 Jun 2025 14:11:27 +0000
Subject: [PATCH 898/901] 8341778: Some javac tests ignore the result of
 JavacTask::call

Reviewed-by: shade
---
 .../gc/g1/unloading/GenClassPoolJar.java      |  4 ++-
 test/langtools/tools/javac/T6358024.java      |  4 ++-
 test/langtools/tools/javac/T6358166.java      |  4 ++-
 test/langtools/tools/javac/T6361619.java      |  7 +++--
 test/langtools/tools/javac/T6395974.java      |  4 ++-
 test/langtools/tools/javac/T6397286.java      |  1 +
 .../tools/javac/T6458823/T6458823.java        |  4 ++-
 .../TryWithResources/TwrAvoidNullCheck.java   |  4 ++-
 .../TryWithResources/TwrSimpleClose.java      |  4 ++-
 .../tools/javac/api/6406133/T6406133.java     |  4 ++-
 .../tools/javac/api/6410643/T6410643.java     |  1 +
 .../tools/javac/api/6412656/T6412656.java     |  4 ++-
 .../tools/javac/api/6423003/T6423003.java     |  3 +-
 .../tools/javac/api/6731573/T6731573.java     |  4 ++-
 .../tools/javac/api/7086261/T7086261.java     |  4 ++-
 .../tools/javac/api/8007344/Test.java         | 19 +++++++++---
 test/langtools/tools/javac/api/DiagSpans.java | 30 ++++++++++++-------
 test/langtools/tools/javac/api/T6357331.java  |  4 ++-
 .../tools/javac/api/TestTreePath.java         |  4 ++-
 .../api/taskListeners/EventsBalancedTest.java |  4 ++-
 .../ImproveFatalErrorHandling.java            |  4 ++-
 test/langtools/tools/javac/lib/DPrinter.java  |  4 ++-
 .../tools/javac/modules/QueryBeforeEnter.java |  4 ++-
 .../patterns/SOEDeeplyNestedBlocksTest.java   |  6 ++--
 .../tools/javac/positions/TreeEndPosTest.java |  4 ++-
 .../javac/processing/6348499/T6348499.java    |  4 ++-
 .../javac/processing/6414633/T6414633.java    |  4 ++-
 .../javac/processing/6430209/T6430209.java    |  4 ++-
 .../tools/javac/processing/T6439826.java      |  4 ++-
 .../tools/javac/processing/T8142931.java      |  4 ++-
 .../processing/model/LocalInAnonymous.java    | 12 ++++++--
 .../options/TestNoteOnImplicitProcessing.java |  8 +++--
 .../processing/rounds/CompleteOnClosed.java   |  4 ++-
 33 files changed, 135 insertions(+), 48 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
index fb3fb4d0e8e..cea00fc2efc 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/g1/unloading/GenClassPoolJar.java
@@ -187,7 +187,9 @@ void compile(File[] files, String destDir) throws IOException {
         StandardJavaFileManager sjfm = compiler.getStandardFileManager(null, null, null);
         Iterable<? extends JavaFileObject> fileObjects = sjfm.getJavaFileObjects(files);
         JavaCompiler.CompilationTask task = compiler.getTask(null, null, null, optionList, null, fileObjects);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         sjfm.close();
     }
 
diff --git a/test/langtools/tools/javac/T6358024.java b/test/langtools/tools/javac/T6358024.java
index 86bc37afda9..7388ce55cef 100644
--- a/test/langtools/tools/javac/T6358024.java
+++ b/test/langtools/tools/javac/T6358024.java
@@ -87,7 +87,9 @@ static void test(JavacFileManager fm, JavaFileObject f, Option[] opts, int expec
                                                           Arrays.asList(f));
         MyTaskListener tl = new MyTaskListener();
         task.setTaskListener(tl);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         if (tl.started != expect)
             throw new AssertionError("Unexpected number of TaskListener events; "
                                      + "expected " + expect + ", found " + tl.started);
diff --git a/test/langtools/tools/javac/T6358166.java b/test/langtools/tools/javac/T6358166.java
index e1aa2e00bbf..d3d4b2ae162 100644
--- a/test/langtools/tools/javac/T6358166.java
+++ b/test/langtools/tools/javac/T6358166.java
@@ -75,7 +75,9 @@ static void test(JavacFileManager fm, JavaFileObject f, List<String> addExports,
 
         JavacTool tool = JavacTool.create();
         JavacTaskImpl task = (JavacTaskImpl) tool.getTask(null, fm, null, allArgs, null, List.of(f), context);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
 
         JavaCompiler c = JavaCompiler.instance(context);
         if (c.errorCount() != 0)
diff --git a/test/langtools/tools/javac/T6361619.java b/test/langtools/tools/javac/T6361619.java
index 67450129e3e..1f299a8f4c3 100644
--- a/test/langtools/tools/javac/T6361619.java
+++ b/test/langtools/tools/javac/T6361619.java
@@ -50,7 +50,8 @@ public static void main(String... args) throws Throwable {
 
         final PrintWriter out = new PrintWriter(System.err, true);
 
-        Iterable<String> flags = Arrays.asList("-processorpath", testClassDir,
+        Iterable<String> flags = Arrays.asList("--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+                                               "-processorpath", testClassDir,
                                                "-processor", self,
                                                "-d", ".");
         DiagnosticListener<JavaFileObject> dl = new DiagnosticListener<JavaFileObject>() {
@@ -69,7 +70,9 @@ public void report(Diagnostic<? extends JavaFileObject> m) {
             task.setTaskListener(tl);
 
             // should complete, without exceptions
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
         }
     }
 
diff --git a/test/langtools/tools/javac/T6395974.java b/test/langtools/tools/javac/T6395974.java
index e8d2b716735..623a9563695 100644
--- a/test/langtools/tools/javac/T6395974.java
+++ b/test/langtools/tools/javac/T6395974.java
@@ -63,7 +63,9 @@ public static void main(String... args) throws Throwable {
             MyTaskListener tl = new MyTaskListener();
             task.setTaskListener(tl);
 
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
         }
     }
 
diff --git a/test/langtools/tools/javac/T6397286.java b/test/langtools/tools/javac/T6397286.java
index 5153a61aa77..8e8ef882aa2 100644
--- a/test/langtools/tools/javac/T6397286.java
+++ b/test/langtools/tools/javac/T6397286.java
@@ -56,6 +56,7 @@ public void finished(TaskEvent e) {
                 });
 
             try {
+                // no need to check the result of JavacTask::call, reevaluate if the test is modified
                 task.call();
                 throw new AssertionError("no exception thrown");
             } catch (RuntimeException e) {
diff --git a/test/langtools/tools/javac/T6458823/T6458823.java b/test/langtools/tools/javac/T6458823/T6458823.java
index 91736229e5a..cd23066edc8 100644
--- a/test/langtools/tools/javac/T6458823/T6458823.java
+++ b/test/langtools/tools/javac/T6458823/T6458823.java
@@ -66,7 +66,9 @@ public static void main(String[] args) throws Exception {
             files.add(new File(T6458823.class.getResource("TestClass.java").toURI()));
             final CompilationTask task = compiler.getTask(null, fm, diagColl,
                 options, null, fm.getJavaFileObjectsFromFiles(files));
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
             int diagCount = 0;
             for (Diagnostic<? extends JavaFileObject> diag : diagColl.getDiagnostics()) {
                 if (diag.getKind() != Diagnostic.Kind.WARNING) {
diff --git a/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java b/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
index f095b92b571..045558374c7 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrAvoidNullCheck.java
@@ -76,7 +76,9 @@ void run(String resourceSpecification, boolean expected) throws IOException {
         DumpLower.preRegister(ctx);
         Iterable<ToolBox.JavaSource> files = Arrays.asList(new ToolBox.JavaSource(code));
         JavacTask task = JavacTool.create().getTask(null, null, null, null, null, files, ctx);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
 
         boolean hasNullCheck = ((DumpLower) DumpLower.instance(ctx)).hasNullCheck;
 
diff --git a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
index af3f4ea19ef..11691a43040 100644
--- a/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
+++ b/test/langtools/tools/javac/TryWithResources/TwrSimpleClose.java
@@ -89,7 +89,9 @@ void run(String trySpec, int expectedCloseCount) throws Exception {
              JFMImpl fm = new JFMImpl(sfm)) {
             Iterable<ToolBox.JavaSource> files = Arrays.asList(new ToolBox.JavaSource(code));
             JavacTask task = (JavacTask) compiler.getTask(null, fm, null, null, null, files);
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
 
             if (fm.classBytes.size() != 1) {
                 throw new AssertionError();
diff --git a/test/langtools/tools/javac/api/6406133/T6406133.java b/test/langtools/tools/javac/api/6406133/T6406133.java
index 70e2fbe5fe6..24ddba1e602 100644
--- a/test/langtools/tools/javac/api/6406133/T6406133.java
+++ b/test/langtools/tools/javac/api/6406133/T6406133.java
@@ -90,7 +90,9 @@ String exec(boolean useListener, Locale locale) {
         task = tool.getTask(pw, fm, listener, null, null, compilationUnits);
         task.setProcessors(Arrays.asList(processor));
         task.setLocale(locale); //6443132
-        task.call();
+        if (task.call()) {
+            throw new AssertionError("test compilation was expected to fail");
+        }
         if (!processor.locale.equals(locale))
             throw new AssertionError("Error in diagnostic localization during annotation processing");
         String res = useListener ? listener.result : pw.toString();
diff --git a/test/langtools/tools/javac/api/6410643/T6410643.java b/test/langtools/tools/javac/api/6410643/T6410643.java
index a551f802d62..d8f5c798249 100644
--- a/test/langtools/tools/javac/api/6410643/T6410643.java
+++ b/test/langtools/tools/javac/api/6410643/T6410643.java
@@ -53,6 +53,7 @@ void testGetTask(Iterable<String> options,
     void test(String... args) {
         task = tool.getTask(null, null, null, null, null, null);
         try {
+            // no need to check the result of JavacTask::call, reevaluate if the test is modified
             task.call();
             throw new AssertionError("Error expected");
         } catch (IllegalStateException e) {
diff --git a/test/langtools/tools/javac/api/6412656/T6412656.java b/test/langtools/tools/javac/api/6412656/T6412656.java
index b7976e036fd..cfea162ae98 100644
--- a/test/langtools/tools/javac/api/6412656/T6412656.java
+++ b/test/langtools/tools/javac/api/6412656/T6412656.java
@@ -47,7 +47,9 @@ void test(String... args) {
         task = tool.getTask(null, fm, null, null,
                             Collections.singleton(T6412656.class.getName()), null);
         task.setProcessors(Collections.singleton(new MyProc(this)));
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         if (count == 0)
             throw new AssertionError("Annotation processor not run");
         System.out.println("OK");
diff --git a/test/langtools/tools/javac/api/6423003/T6423003.java b/test/langtools/tools/javac/api/6423003/T6423003.java
index 893f2dd6344..58d055e9685 100644
--- a/test/langtools/tools/javac/api/6423003/T6423003.java
+++ b/test/langtools/tools/javac/api/6423003/T6423003.java
@@ -41,11 +41,12 @@ public class T6423003 extends ToolTester {
     void test(String... args) {
         task = tool.getTask(null, fm, null, Arrays.asList("-Xlint:all"), null, null);
         try {
+            // no need to check the result of JavacTask::call, reevaluate if the test is modified
             task.call();
+            throw new AssertionError("Expected IllegalStateException not thrown");
         } catch (IllegalStateException ex) {
             return;
         }
-        throw new AssertionError("Expected IllegalStateException not thrown");
     }
     public static void main(String... args) throws IOException {
         try (T6423003 t = new T6423003()) {
diff --git a/test/langtools/tools/javac/api/6731573/T6731573.java b/test/langtools/tools/javac/api/6731573/T6731573.java
index 0d7ceb8fd2f..892b8e63ffb 100644
--- a/test/langtools/tools/javac/api/6731573/T6731573.java
+++ b/test/langtools/tools/javac/api/6731573/T6731573.java
@@ -93,7 +93,9 @@ void exec(DiagnosticType diagType, SourceLine sourceLine) {
         if (sourceLine.optValue != null)
             options.add(sourceLine.optValue);
         task = tool.getTask(pw, fm, null, options, null, compilationUnits);
-        task.call();
+        if (task.call()) {
+            throw new AssertionError("test compilation was expected to fail");
+        }
         checkErrorLine(pw.toString(),
                 diagType.shouldDisplaySource(sourceLine),
                 options);
diff --git a/test/langtools/tools/javac/api/7086261/T7086261.java b/test/langtools/tools/javac/api/7086261/T7086261.java
index 1bc2d1a2dc8..391e71c94a7 100644
--- a/test/langtools/tools/javac/api/7086261/T7086261.java
+++ b/test/langtools/tools/javac/api/7086261/T7086261.java
@@ -71,7 +71,9 @@ void test() throws Throwable {
         try (JavaFileManager jfm = javac.getStandardFileManager(null, null, null)) {
             JavaCompiler.CompilationTask task =
                     javac.getTask(null, jfm, new DiagnosticChecker(), null, null, Arrays.asList(new ErroneousSource()));
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
         }
     }
 
diff --git a/test/langtools/tools/javac/api/8007344/Test.java b/test/langtools/tools/javac/api/8007344/Test.java
index c99b77a101f..d230fb6086b 100644
--- a/test/langtools/tools/javac/api/8007344/Test.java
+++ b/test/langtools/tools/javac/api/8007344/Test.java
@@ -38,6 +38,7 @@
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 
 import javax.annotation.processing.RoundEnvironment;
@@ -75,6 +76,12 @@ public static void main(String... args) throws Exception {
         }
     }
 
+    static final List<String> OPTIONS = List.of(
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-exports", "jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED");
+
     PrintWriter out;
     int errors;
 
@@ -102,10 +109,12 @@ void testAnnoProcessor(JavacTool javac, StandardJavaFileManager fm,
             Iterable<? extends JavaFileObject> files, PrintWriter out,
             int expectedDocComments) {
         out.println("Test annotation processor");
-        JavacTask task = javac.getTask(out, fm, null, null, null, files);
+        JavacTask task = javac.getTask(out, fm, null, OPTIONS, null, files);
         AnnoProc ap = new AnnoProc(DocTrees.instance(task));
         task.setProcessors(Arrays.asList(ap));
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         ap.checker.checkDocComments(expectedDocComments);
     }
 
@@ -113,10 +122,12 @@ void testTaskListener(JavacTool javac, StandardJavaFileManager fm,
             Iterable<? extends JavaFileObject> files, PrintWriter out,
             int expectedDocComments) {
         out.println("Test task listener");
-        JavacTask task = javac.getTask(out, fm, null, null, null, files);
+        JavacTask task = javac.getTask(out, fm, null, OPTIONS, null, files);
         TaskListnr tl = new TaskListnr(DocTrees.instance(task));
         task.addTaskListener(tl);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         tl.checker.checkDocComments(expectedDocComments);
     }
 
diff --git a/test/langtools/tools/javac/api/DiagSpans.java b/test/langtools/tools/javac/api/DiagSpans.java
index e4cdc6a5f07..527fe1aad62 100644
--- a/test/langtools/tools/javac/api/DiagSpans.java
+++ b/test/langtools/tools/javac/api/DiagSpans.java
@@ -72,7 +72,8 @@ public void exception() {
                         }
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -87,7 +88,8 @@ public void exception() {
                         }
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -102,7 +104,8 @@ public void exception() {
                         }
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -118,7 +121,8 @@ public void exception() {
                         }
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -134,7 +138,8 @@ public void exception() {
                         }
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -158,7 +163,8 @@ class Base2 extends Exception {}
                         class Sub2 extends Base2 {}
                         """,
                         '/',
-                        '^');
+                        '^',
+                        true);
     }
 
     @Test
@@ -175,7 +181,8 @@ class Base1 extends Exception {}
                         class Sub1 extends Base1 {}
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
     @Test
@@ -192,10 +199,11 @@ class Base1 extends Exception {}
                         class Sub1 extends Base1 {}
                         """,
                         '/',
-                        '^');
+                        '^',
+                        false);
     }
 
-    private void runDiagSpanTest(String code, char spanMarker, char prefMarker) throws Exception {
+    private void runDiagSpanTest(String code, char spanMarker, char prefMarker, boolean succCompilationExpected) throws Exception {
         var realCode = new StringBuilder();
         var expectedError = new ArrayList<String>();
         int startPos = -1;
@@ -238,7 +246,9 @@ private void runDiagSpanTest(String code, char spanMarker, char prefMarker) thro
         };
         var sourceFiles = List.of(new JFOImpl(realCode.toString()));
         var task = compiler.getTask(null, null, dl, null, null, sourceFiles);
-        task.call();
+        if (task.call() != succCompilationExpected) {
+            throw new AssertionError("unexpected compilation result");
+        }
         if (!Objects.equals(expectedError, actualErrors)) {
             throw new AssertionError("Expected error spans not found, expected: " +
                                      expectedError + ", actual: " + actualErrors);
diff --git a/test/langtools/tools/javac/api/T6357331.java b/test/langtools/tools/javac/api/T6357331.java
index 5253ebededd..0bc4ff98a53 100644
--- a/test/langtools/tools/javac/api/T6357331.java
+++ b/test/langtools/tools/javac/api/T6357331.java
@@ -53,7 +53,9 @@ public void started(TaskEvent e) {
                     public void finished(TaskEvent e) { }
                 });
 
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
 
             // now the compilation is over, we expect IllegalStateException (not NPE)
             try {
diff --git a/test/langtools/tools/javac/api/TestTreePath.java b/test/langtools/tools/javac/api/TestTreePath.java
index b3887619947..7a016f42545 100644
--- a/test/langtools/tools/javac/api/TestTreePath.java
+++ b/test/langtools/tools/javac/api/TestTreePath.java
@@ -116,7 +116,9 @@ public void run() throws IOException {
                         null, null, null,
                         Arrays.asList("-processor", this.getClass().getName()), null,
                         tests);
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
         }
     }
 
diff --git a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
index bd01d192b6e..759ec8d66ac 100644
--- a/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
+++ b/test/langtools/tools/javac/api/taskListeners/EventsBalancedTest.java
@@ -79,7 +79,9 @@ void test(List<String> options, List<JavaFileObject> files) throws IOException {
 
         task.setTaskListener(listener);
 
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
 
         for (Entry<Kind, Integer> e : listener.kind2Count.entrySet()) {
             if (e.getValue() != null && e.getValue() != 0) {
diff --git a/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
index de55cd8d5f7..278d8863b4a 100644
--- a/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
+++ b/test/langtools/tools/javac/fatalErrors/ImproveFatalErrorHandling.java
@@ -76,7 +76,9 @@ public void testIOExceptionInMethodClose() throws Exception {
                 .getSystemJavaCompiler()
                 .getTask(null, null, null, null, null, files);
         Context context = task.getContext();
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         JavaCompiler compiler = context.get(compilerKey);
         compiler.closeables = com.sun.tools.javac.util.List.of(
                 new CloseException1(), new CloseException2(),
diff --git a/test/langtools/tools/javac/lib/DPrinter.java b/test/langtools/tools/javac/lib/DPrinter.java
index 6fa2f17dc67..5092e0698c2 100644
--- a/test/langtools/tools/javac/lib/DPrinter.java
+++ b/test/langtools/tools/javac/lib/DPrinter.java
@@ -1602,7 +1602,9 @@ private void handle(TaskEvent e) {
                 }
             });
 
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("compilation failed at DPrinter.Main::run");
+            }
         }
 
         TaskEvent.Kind getKind(String s) {
diff --git a/test/langtools/tools/javac/modules/QueryBeforeEnter.java b/test/langtools/tools/javac/modules/QueryBeforeEnter.java
index 226c6aed8e3..293b6302eec 100644
--- a/test/langtools/tools/javac/modules/QueryBeforeEnter.java
+++ b/test/langtools/tools/javac/modules/QueryBeforeEnter.java
@@ -359,7 +359,9 @@ public void testTooSoon(Path base) throws Exception {
                                                                             "-Xplugin:test"),
                                                               null,
                                                               fm.getJavaFileObjects(testSource));
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
         }
 
         Main.compile(new String[] {"--processor-path", processorPath,
diff --git a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
index 4e738cce028..8f64b4cff37 100644
--- a/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
+++ b/test/langtools/tools/javac/patterns/SOEDeeplyNestedBlocksTest.java
@@ -34,7 +34,7 @@
 
 public class SOEDeeplyNestedBlocksTest {
 
-    static final int NESTING_DEPTH = 1000;
+    static final int NESTING_DEPTH = 500;
 
     public static void main(String... args) {
         var lines = new ArrayList<String>();
@@ -48,7 +48,9 @@ public static void main(String... args) {
         var source = SimpleJavaFileObject.forSource(URI.create("mem://Test.java"), String.join("\n", lines));
         var compiler = ToolProvider.getSystemJavaCompiler();
         var task = compiler.getTask(null, null, noErrors, null, null, List.of(source));
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
     }
 
     static DiagnosticListener<? super JavaFileObject> noErrors = d -> {
diff --git a/test/langtools/tools/javac/positions/TreeEndPosTest.java b/test/langtools/tools/javac/positions/TreeEndPosTest.java
index 990053a7d4e..dc87409f4b2 100644
--- a/test/langtools/tools/javac/positions/TreeEndPosTest.java
+++ b/test/langtools/tools/javac/positions/TreeEndPosTest.java
@@ -174,7 +174,9 @@ static void compile(JavaSource src) throws IOException {
                     compiler.getTask(writer, javaFileManager,
                     dc, options, null,
                     sources);
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
             for (Diagnostic diagnostic : (List<Diagnostic>) dc.getDiagnostics()) {
                 long actualStart = diagnostic.getStartPosition();
                 long actualEnd = diagnostic.getEndPosition();
diff --git a/test/langtools/tools/javac/processing/6348499/T6348499.java b/test/langtools/tools/javac/processing/6348499/T6348499.java
index f8f8c30bdd7..266caa1e14f 100644
--- a/test/langtools/tools/javac/processing/6348499/T6348499.java
+++ b/test/langtools/tools/javac/processing/6348499/T6348499.java
@@ -61,7 +61,9 @@ public static void main(String... args) throws IOException {
                                                   "-processorpath", testClassPath);
             StringWriter out = new StringWriter();
             JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
             String s = out.toString();
             System.err.print(s);
             // Expect the following 1 multi-line diagnostic, and no output to log
diff --git a/test/langtools/tools/javac/processing/6414633/T6414633.java b/test/langtools/tools/javac/processing/6414633/T6414633.java
index d38d1acdd82..5ee7b5e646d 100644
--- a/test/langtools/tools/javac/processing/6414633/T6414633.java
+++ b/test/langtools/tools/javac/processing/6414633/T6414633.java
@@ -60,7 +60,9 @@ public static void main(String... args) throws IOException {
             String[] opts = { "-proc:only",
                               "-processor", A.class.getName() };
             JavacTask task = tool.getTask(null, fm, dl, Arrays.asList(opts), null, files);
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
 
             // two annotations on the same element -- expect 2 diags from the processor
             if (dl.diags != 2)
diff --git a/test/langtools/tools/javac/processing/6430209/T6430209.java b/test/langtools/tools/javac/processing/6430209/T6430209.java
index 2f79b36a3e1..1371b7c09d6 100644
--- a/test/langtools/tools/javac/processing/6430209/T6430209.java
+++ b/test/langtools/tools/javac/processing/6430209/T6430209.java
@@ -66,7 +66,9 @@ public static void main(String... args) throws IOException {
                                                   "-processorpath", testClassPath);
             StringWriter out = new StringWriter();
             JavacTask task = tool.getTask(out, fm, null, opts, null, files);
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
             String s = out.toString();
             System.err.print(s);
             s = s.replace(System.getProperty("line.separator"), "\n");
diff --git a/test/langtools/tools/javac/processing/T6439826.java b/test/langtools/tools/javac/processing/T6439826.java
index 846d77c3a7e..fed293d4e5e 100644
--- a/test/langtools/tools/javac/processing/T6439826.java
+++ b/test/langtools/tools/javac/processing/T6439826.java
@@ -55,7 +55,9 @@ public static void main(String... args) throws IOException {
                                                   "-processorpath", testClasses);
             StringWriter out = new StringWriter();
             JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
-            task.call();
+            if (task.call()) {
+                throw new AssertionError("test compilation was expected to fail");
+            }
             String s = out.toString();
             System.err.print(s);
             // Expect the following 2 diagnostics, and no output to log
diff --git a/test/langtools/tools/javac/processing/T8142931.java b/test/langtools/tools/javac/processing/T8142931.java
index 5abeac83687..8ade5e19767 100644
--- a/test/langtools/tools/javac/processing/T8142931.java
+++ b/test/langtools/tools/javac/processing/T8142931.java
@@ -62,7 +62,9 @@ public static void main(String... args) throws IOException {
                 "-processorpath", testClasses);
             StringWriter out = new StringWriter();
             JavacTask task = (JavacTask)tool.getTask(out, fm, dl, opts, null, files);
-            task.call();
+            if (!task.call()) {
+                throw new AssertionError("test failed due to a compilation error");
+            }
             String s = out.toString();
             System.err.print(s);
             System.err.println(dl.count + " diagnostics; " + s.length() + " characters");
diff --git a/test/langtools/tools/javac/processing/model/LocalInAnonymous.java b/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
index 6cbbe512784..616062bb542 100644
--- a/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
+++ b/test/langtools/tools/javac/processing/model/LocalInAnonymous.java
@@ -81,7 +81,9 @@ public static void main(String[] args) throws Exception {
         List<String> options = Arrays.asList("-d", classes.toString());
         StringWriter out = new StringWriter();
         JavacTask task = (JavacTask) compiler.getTask(out, null, noErrors, options, null, files);
-        task.call();
+        if (!task.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         if (!out.toString().isEmpty()) {
             throw new AssertionError("Unexpected output: " + out);
         }
@@ -103,7 +105,9 @@ public void finished(TaskEvent te) {
                 }
             }
         });
-        task2.call();
+        if (!task2.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         if (!out.toString().isEmpty()) {
             throw new AssertionError("Unexpected output: " + out);
         }
@@ -112,7 +116,9 @@ public void finished(TaskEvent te) {
                                 "-processorpath", System.getProperty("test.classes"),
                                 "-processor", Processor.class.getName());
         JavacTask task3 = (JavacTask) compiler.getTask(out, null, noErrors, options, null, files);
-        task3.call();
+        if (!task3.call()) {
+            throw new AssertionError("test failed due to a compilation error");
+        }
         if (!out.toString().isEmpty()) {
             throw new AssertionError("Unexpected output: " + out);
         }
diff --git a/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java b/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
index 73089a9a3cf..181c29eeb56 100644
--- a/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
+++ b/test/langtools/tools/javac/processing/options/TestNoteOnImplicitProcessing.java
@@ -323,7 +323,9 @@ public void processorsViaAPI(Path base, Path jarFile) throws Exception {
                 List<String> options = List.of("-classpath", jarFile.toString(), "-XDrawDiagnostics");
                 CompilationTask task = provider.getTask(compilerOut, null, null, options, null, inputFile);
 
-                task.call();
+                if (!task.call()) {
+                    throw new AssertionError("test failed due to a compilation error");
+                }
 
                 verifyMessages(out, compilerOut, false, false);
             }
@@ -335,7 +337,9 @@ public void processorsViaAPI(Path base, Path jarFile) throws Exception {
                         (Processor) processorClass.getDeclaredConstructor().newInstance();
 
                 task.setProcessors(List.of(processor));
-                task.call();
+                if (!task.call()) {
+                    throw new AssertionError("test failed due to a compilation error");
+                }
 
                 verifyMessages(out, compilerOut, false, true);
             }
diff --git a/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java b/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
index 1ebc6b2acec..f724d605e51 100644
--- a/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
+++ b/test/langtools/tools/javac/processing/rounds/CompleteOnClosed.java
@@ -56,7 +56,9 @@ public static void main(String... args) {
         Iterable<JavaFileObject> files = Arrays.<JavaFileObject>asList(new ToolBox.JavaSource(source));
         Iterable<String> options = Arrays.asList("-processor", "CompleteOnClosed");
         CompilationTask task = compiler.getTask(null, null, collector, options, null, files);
-        task.call();
+        if (task.call()) {
+            throw new AssertionError("test compilation was expected to fail");
+        }
         for (Diagnostic<? extends JavaFileObject> d : collector.getDiagnostics()) {
             System.out.println(d.toString());
         }

From 026975a1aa290613934ae421bbc56326627bad8d Mon Sep 17 00:00:00 2001
From: Alexandre Iline <shurailine@openjdk.org>
Date: Fri, 6 Jun 2025 15:05:43 +0000
Subject: [PATCH 899/901] 8358721: Update JCov for class file version 70

Reviewed-by: iris, alanb, erikj
---
 make/conf/jib-profiles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 91876878046..d4877604a90 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1192,8 +1192,8 @@ var getJibProfilesDependencies = function (input, common) {
             server: "jpg",
             product: "jcov",
             version: "3.0",
-            build_number: "1",
-            file: "bundles/jcov-3.0+1.zip",
+            build_number: "3",
+            file: "bundles/jcov-3.0+3.zip",
             environment_name: "JCOV_HOME",
         },
 

From d024f58e61ec27f6c13fde5dadb95c31875815d6 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Fri, 6 Jun 2025 20:07:43 +0000
Subject: [PATCH 900/901] 8358809: Improve link to stdin.encoding from
 java.lang.IO

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

diff --git a/src/java.base/share/classes/java/lang/IO.java b/src/java.base/share/classes/java/lang/IO.java
index 1f88de7e238..4630d8a3be2 100644
--- a/src/java.base/share/classes/java/lang/IO.java
+++ b/src/java.base/share/classes/java/lang/IO.java
@@ -38,7 +38,7 @@
  * <p>
  * The {@link #readln()} and {@link #readln(String)} methods decode bytes read from
  * {@code System.in} into characters. The charset used for decoding is specified by the
- * {@link System#getProperties stdin.encoding} property. If this property is not present,
+ * {@link System##stdin.encoding stdin.encoding} property. If this property is not present,
  * or if the charset it names cannot be loaded, then UTF-8 is used instead. Decoding
  * always replaces malformed and unmappable byte sequences with the charset's default
  * replacement string.

From d7352559195b9e052c3eb24d773c0d6c10dc23ad Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Fri, 6 Jun 2025 21:35:21 +0000
Subject: [PATCH 901/901] 8345414: Google CAInterop test failures

Reviewed-by: weijun
Backport-of: 8e9ba788ae04a9a617a393709bf2c51a0c157206
---
 .../certification/CAInterop.java              | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
index 2bfd3ea7603..5612ad4a8a2 100644
--- a/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
+++ b/test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
@@ -635,20 +635,20 @@ private CATestURLs getTestURLs(String alias) {
                     "https://revoked.sfig2.catest.starfieldtech.com/");
 
             case "globalsigneccrootcar4" ->
-                    new CATestURLs("https://good.gsr4.demo.pki.goog/",
-                    "https://revoked.gsr4.demo.pki.goog/");
+                    new CATestURLs("https://good.gsr4.demosite.pki.goog/",
+                    "https://revoked.gsr4.demosite.pki.goog/");
             case "gtsrootcar1" ->
-                    new CATestURLs("https://good.gtsr1.demo.pki.goog/",
-                    "https://revoked.gtsr1.demo.pki.goog/");
+                    new CATestURLs("https://good.gtsr1.demosite.pki.goog/",
+                    "https://revoked.gtsr1.demosite.pki.goog/");
             case "gtsrootcar2" ->
-                    new CATestURLs("https://good.gtsr2.demo.pki.goog/",
-                    "https://revoked.gtsr2.demo.pki.goog/");
+                    new CATestURLs("https://good.gtsr2.demosite.pki.goog/",
+                    "https://revoked.gtsr2.demosite.pki.goog/");
             case "gtsrootecccar3" ->
-                    new CATestURLs("https://good.gtsr3.demo.pki.goog/",
-                    "https://revoked.gtsr3.demo.pki.goog/");
+                    new CATestURLs("https://good.gtsr3.demosite.pki.goog/",
+                    "https://revoked.gtsr3.demosite.pki.goog/");
             case "gtsrootecccar4" ->
-                    new CATestURLs("https://good.gtsr4.demo.pki.goog/",
-                    "https://revoked.gtsr4.demo.pki.goog/");
+                    new CATestURLs("https://good.gtsr4.demosite.pki.goog/",
+                    "https://revoked.gtsr4.demosite.pki.goog/");
 
             case "microsoftecc2017" ->
                     new CATestURLs("https://acteccroot2017.pki.microsoft.com/",